diff --git a/.appveyor.yml b/.appveyor.yml
deleted file mode 100644
index 0a25dceab43a46..00000000000000
--- a/.appveyor.yml
+++ /dev/null
@@ -1,133 +0,0 @@
----
-version: '{build}'
-init:
-  - git config --global user.name git
-  - git config --global user.email svn-admin@ruby-lang.org
-  - git config --global core.autocrlf false
-  - git config --global core.eol lf
-  - git config --global advice.detachedHead 0
-shallow_clone: true
-clone_depth: 10
-platform:
-  - x64
-skip_commits:
-  message: /\[DOC\]/
-  files:
-    - doc/*
-    - '**/*.md'
-    - '**/*.rdoc'
-    - '**/.document'
-    - '**/*.[1-8]'
-    - '**/*.ronn'
-environment:
-  ruby_version: "25-%Platform%"
-  matrix:
-    # Test only the oldest supported version because AppVeyor is unstable, its concurrency
-    # is limited, and compatibility issues that happen only in newer versions are rare.
-    # You may test some other stuff on GitHub Actions instead.
-    - build: vs
-      vs: 120 # Visual Studio 2013
-      ssl: OpenSSL-v111
-      # The worker image name. This is NOT the Visual Studio version we're using here.
-      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
-      GEMS_FOR_TEST: ""
-  RELINE_TEST_ENCODING: "UTF-8"
-cache:
-  - c:\Tools\vcpkg\installed\
-for:
--
-  matrix:
-    only:
-      - build: vs
-  install:
-    - ver
-    - chcp
-    - SET BITS=%Platform:x86=32%
-    - SET BITS=%BITS:x=%
-    - SET OPENSSL_DIR=C:\%ssl%-Win%BITS%
-    - cd C:\Tools\vcpkg
-    - git pull -q
-    - .\bootstrap-vcpkg.bat
-    - cd %APPVEYOR_BUILD_FOLDER%
-    - vcpkg --triplet %Platform%-windows install --x-use-aria2 libffi libyaml readline zlib
-    - CALL SET vcvars=%%^VS%VS%COMNTOOLS^%%..\..\VC\vcvarsall.bat
-    - SET vcvars
-    - '"%vcvars%" %Platform:x64=amd64%'
-    - SET ruby_path=C:\Ruby%ruby_version:-x86=%
-    - SET PATH=\usr\local\bin;%ruby_path%\bin;%PATH%;C:\msys64\mingw64\bin;C:\msys64\usr\bin
-    - ruby --version
-    - 'cl'
-    - echo> Makefile srcdir=.
-    - echo>> Makefile MSC_VER=0
-    - echo>> Makefile RT=none
-    - echo>> Makefile RT_VER=0
-    - echo>> Makefile BUILTIN_ENCOBJS=nul
-    - type win32\Makefile.sub >> Makefile
-    - nmake %mflags% up VCSUP="echo Update OK"
-    - nmake %mflags% extract-extlibs
-    - del Makefile
-    - mkdir \usr\local\bin
-    - mkdir \usr\local\include
-    - mkdir \usr\local\lib
-    - for %%I in (%OPENSSL_DIR%\*.dll) do mklink /h \usr\local\bin\%%~nxI %%I
-    - for %%I in (c:\Tools\vcpkg\installed\%Platform%-windows\bin\*.dll) do (
-        if not %%~nI == readline mklink \usr\local\bin\%%~nxI %%I
-      )
-    - attrib +r /s /d
-    - mkdir %Platform%-mswin_%vs%
-  build_script:
-    - set HAVE_GIT=no
-    - cd %APPVEYOR_BUILD_FOLDER%
-    - cd %Platform%-mswin_%vs%
-    - >-
-      ..\win32\configure.bat
-      --with-opt-dir="/usr/local;c:/Tools/vcpkg/installed/%Platform%-windows"
-      --with-openssl-dir=%OPENSSL_DIR:\=/%
-    - nmake -l
-    - nmake install-nodoc
-    - \usr\bin\ruby -v -e "p :locale => Encoding.find('locale'), :filesystem => Encoding.find('filesystem')"
-    - if not "%GEMS_FOR_TEST%" == "" \usr\bin\gem install --no-document %GEMS_FOR_TEST%
-    - \usr\bin\ruby -ropenssl -e "puts 'Build    ' + OpenSSL::OPENSSL_VERSION, 'Runtime  ' + OpenSSL::OPENSSL_LIBRARY_VERSION"
-  test_script:
-    - set /a JOBS=%NUMBER_OF_PROCESSORS%
-    - nmake -l "TESTOPTS=-v -q" btest
-    - nmake -l "TESTOPTS=-v -q" test-basic
-    - >-
-      nmake -l "TESTOPTS=--timeout-scale=3.0
-      --excludes=../test/.excludes/_appveyor -j%JOBS%
-      --exclude win32ole
-      --exclude test_bignum
-      --exclude test_syntax
-      --exclude test_open-uri
-      --exclude test_bundled_ca
-      " test-all
-    # separately execute tests without -j which may crash worker with -j.
-    - >-
-      nmake -l
-      "TESTOPTS=--timeout-scale=3.0 --excludes=../test/.excludes/_appveyor"
-      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
-      " test-all
-    - nmake -l test-spec # not using `-j` because sometimes `mspec -j` silently dies on Windows
-notifications:
-  - provider: Webhook
-    method: POST
-    url:
-      secure: CcFlJNDJ/a6to7u3Z4Fnz6dScEPNx7hTha2GkSRlV+1U6dqmxY/7uBcLXYb9gR3jfQk6w+2o/HrjNAyXMNGU/JOka3s2WRI4VKitzM+lQ08owvJIh0R7LxrGH0J2e81U # ruby-lang slack: ruby/simpler-alerts-bot
-    body: >-
-      {{^isPullRequest}}
-        {
-          "ci": "AppVeyor CI",
-          "env": "Visual Studio 2013",
-          "url": "{{buildUrl}}",
-          "commit": "{{commitId}}",
-          "branch": "{{branch}}"
-        }
-      {{/isPullRequest}}
-    on_build_success: false
-    on_build_failure: true
-    on_build_status_changed: false
diff --git a/.cirrus.yml b/.cirrus.yml
deleted file mode 100644
index 7ea0932a16f9bf..00000000000000
--- a/.cirrus.yml
+++ /dev/null
@@ -1,109 +0,0 @@
-# This CI is used to test Arm cases. We can set the maximum 16 tasks.
-# The entire testing design is inspired from .github/workflows/compilers.yml.
-
-# By default, Cirrus mounts an empty volume to `/tmp`
-# which triggers all sorts of warnings like "system temporary path is world-writable: /tmp".
-# Lets workaround it by specifying a custom volume mount point.
-env:
-  CIRRUS_VOLUME: /cirrus-ci-volume
-  CIRRUS_CLONE_DEPTH: 50
-  LANG: C.UTF-8
-  optflags: '-O1'
-  debugflags: '-ggdb3'
-  RUBY_PREFIX: /tmp/ruby-prefix
-  RUBY_DEBUG: ci rgengc
-  RUBY_TESTOPTS: >-
-    -q
-    --color=always
-    --tty=no
-  RUST_BACKTRACE: 1
-  INIT_ENV:
-
-config_template: &CONFIG_TEMPLATE
-  only_if: changesInclude('.cirrus.yml', 'yjit.{c,h,rb}', 'yjit/**.{mk,rs,toml}')
-  skip: >-
-    $CIRRUS_CHANGE_MESSAGE =~ '.*\[DOC\].*' ||
-    $CIRRUS_PR_LABELS =~ '.*Documentation.*' ||
-    changesIncludeOnly('doc/**', '**.{md,rdoc,ronn,[1-8]}', '.document')
-  arm_container:
-    # We use the arm64 images at https://github.com/ruby/ruby-ci-image/pkgs/container/ruby-ci-image .
-    image: ghcr.io/ruby/ruby-ci-image:$CC
-    # Define the used cpu core in each matrix task. We can use total 16 cpu
-    # cores in entire matrix. [cpu] = [total cpu: 16] / [number of tasks]
-    cpu: 8
-    # We can request maximum 4 GB per cpu.
-    # [memory per task] = [memory per cpu: 4 GB] * [cpu]
-    memory: 32G
-
-  id_script: id
-  info_script: |
-    nproc
-    free -h
-  set_env_script:
-    # Set `GNUMAKEFLAGS`, because the flags are GNU make specific.
-    - echo "GNUMAKEFLAGS=-s -j$((1 + $CIRRUS_CPU))" >> "$CIRRUS_ENV"
-    - '[ -z "$INIT_ENV" ] || printenv | sort | comm -13 - <(set -x; source $INIT_ENV && printenv | sort) | tee -a "$CIRRUS_ENV"'
-    - cat "$CIRRUS_ENV"
-  bundled_gems_cache:
-    folder: .downloaded-cache
-    fingerprint_script:
-      sed 's/  */ /g;s/ *#.*//;/^$/d;s/\([^ ]*\) \([^ ]*\)/\1-\2.gem/;s/ .*//' gems/bundled_gems
-    populate_script: |
-      sudo apt-get install --no-install-recommends -q -y wget
-      mkdir -p .downloaded-cache
-      sed 's/  */ /g;s/ *#.*//;/^$/d;s/\([^ ]*\) \([^ ]*\)/\1-\2.gem/;s/ .*//' gems/bundled_gems |
-      wget -nv -P .downloaded-cache -nd -B https://rubygems.org/downloads/ -i -
-  # Arm containers are executed in AWS's EKS, and it's not yet supporting IPv6
-  # See https://github.com/aws/containers-roadmap/issues/835
-  disable_ipv6_script: sudo ./tool/disable_ipv6.sh
-  autogen_script: ./autogen.sh
-  configure_script: >-
-    ./configure -C
-    --enable-debug-env
-    --disable-install-doc
-    --with-ext=-test-/cxxanyargs,+
-    --prefix="$RUBY_PREFIX"
-    $configure
-
-task:
-  name: Arm64 Graviton2 / $CC
-  env:
-    matrix:
-      CC: gcc-11
-  << : *CONFIG_TEMPLATE
-  make_extract-extlibs_script: make extract-extlibs
-  make_incs_script: make incs
-  make_script: make
-  make_test_script: make test
-  make_install_script: make install
-  install_gems_for_test_script: $RUBY_PREFIX/bin/gem install --no-doc timezone tzinfo
-  make_test-tool_script: make test-tool
-  make_test-all_script: make test-all
-  make_test-spec_script: make test-spec
-
-# The following is to test YJIT on ARM64 CPUs available on Cirrus CI
-yjit_task:
-  name: Arm64 Graviton2 / $CC YJIT
-  env:
-    INIT_ENV: $HOME/.cargo/env
-    matrix:
-      - CC: gcc-11
-        configure: --enable-yjit
-  << : *CONFIG_TEMPLATE
-  make_miniruby_script: make miniruby
-  make_bindgen_script: |
-    if [[ "$CC" = "clang-12" ]]; then
-      make yjit-bindgen
-    else
-      echo "only running bindgen on clang image"
-    fi
-  boot_miniruby_script: ./miniruby --yjit-call-threshold=1 -e0
-  test_dump_insns_script: ./miniruby --yjit-call-threshold=1 --yjit-dump-insns -e0
-  output_stats_script: ./miniruby --yjit-call-threshold=1 --yjit-stats -e0
-  full_build_script: make
-  cargo_test_script: cd yjit && cargo test
-  make_test_script: make test RUN_OPTS="--yjit-call-threshold=1 --yjit-verify-ctx"
-  make_test_all_script: make test-all RUN_OPTS="--yjit-call-threshold=1 --yjit-verify-ctx" TESTOPTS="$RUBY_TESTOPTS"
-  make_test_spec_script: make test-spec RUN_OPTS="--yjit-call-threshold=1 --yjit-verify-ctx"
-  # Cirrus Rust environments don't have enough permission to run `rustup component add clippy`.
-  # clippy_script: cd yjit && rustup component add clippy && cargo clippy --all-targets --all-features
diff --git a/.document b/.document
index e875e42546727b..2345776518b087 100644
--- a/.document
+++ b/.document
@@ -15,10 +15,10 @@ array.rb
 ast.rb
 dir.rb
 gc.rb
+hash.rb
 io.rb
 kernel.rb
 marshal.rb
-rjit.rb
 numeric.rb
 nilclass.rb
 pack.rb
@@ -30,6 +30,10 @@ thread_sync.rb
 trace_point.rb
 warning.rb
 yjit.rb
+zjit.rb
+
+# Errno::*
+known_errors.inc
 
 # the lib/ directory (which has its own .document file)
 lib
diff --git a/.gdbinit b/.gdbinit
index 7dd3336e286115..f624456d048352 100644
--- a/.gdbinit
+++ b/.gdbinit
@@ -1,23 +1,7 @@
-set startup-with-shell off
-
-define hook-run
-  set $color_type = 0
-  set $color_highlite = 0
-  set $color_end = 0
-end
-
 define ruby_gdb_init
-  if !$color_type
-    set $color_type = "\033[31m"
-  end
-  if !$color_highlite
-    set $color_highlite = "\033[36m"
-  end
-  if !$color_end
-    set $color_end = "\033[m"
-  end
-  if ruby_dummy_gdb_enums.special_consts
-  end
+  init-if-undefined $color_type = "\033[31m"
+  init-if-undefined $color_highlite = "\033[36m"
+  init-if-undefined $color_end = "\033[m"
 end
 
 # set prompt \033[36m(gdb)\033[m\040
@@ -99,13 +83,11 @@ define rp
     set $regsrc = ((struct RRegexp*)($arg0))->src
     set $rsflags = ((struct RBasic*)$regsrc)->flags
     printf "%sT_REGEXP%s: ", $color_type, $color_end
-    set $len = ($rsflags & RUBY_FL_USER1) ? \
-            ((struct RString*)$regsrc)->as.heap.len : \
-            (($rsflags & (RUBY_FL_USER2|RUBY_FL_USER3|RUBY_FL_USER4|RUBY_FL_USER5|RUBY_FL_USER6)) >> RUBY_FL_USHIFT+2)
+    set $len = ((struct RString*)($arg0))->len
     set print address off
     output *(char *)(($rsflags & RUBY_FL_USER1) ? \
             ((struct RString*)$regsrc)->as.heap.ptr : \
-            ((struct RString*)$regsrc)->as.ary) @ $len
+            ((struct RString*)$regsrc)->as.embed.ary) @ $len
     set print address on
     printf " len:%ld ", $len
     if $flags & RUBY_FL_USER6
@@ -157,13 +139,15 @@ define rp
   if ($flags & RUBY_T_MASK) == RUBY_T_HASH
     printf "%sT_HASH%s: ", $color_type, $color_end,
     if (((struct RHash *)($arg0))->basic.flags & RHASH_ST_TABLE_FLAG)
-      printf "st len=%ld ", ((struct RHash *)($arg0))->as.st->num_entries
+      set $st = (struct st_table *)((uintptr_t)($arg0) + sizeof(struct RHash))
+      printf "st len=%ld ", $st->num_entries
+      print $st
     else
       printf "li len=%ld bound=%ld ", \
         ((((struct RHash *)($arg0))->basic.flags & RHASH_AR_TABLE_SIZE_MASK) >> RHASH_AR_TABLE_SIZE_SHIFT), \
         ((((struct RHash *)($arg0))->basic.flags & RHASH_AR_TABLE_BOUND_MASK) >> RHASH_AR_TABLE_BOUND_SHIFT)
+	print (struct ar_table_struct *)((uintptr_t)($arg0) + sizeof(struct RHash))
     end
-    print (struct RHash *)($arg0)
   else
   if ($flags & RUBY_T_MASK) == RUBY_T_STRUCT
     set $len = (($flags & (RUBY_FL_USER1|RUBY_FL_USER2)) ? \
@@ -201,8 +185,8 @@ define rp
     print (struct RBasic *)($arg0)
   else
   if ($flags & RUBY_T_MASK) == RUBY_T_DATA
-    if ((struct RTypedData *)($arg0))->typed_flag == 1
-      printf "%sT_DATA%s(%s): ", $color_type, $color_end, ((struct RTypedData *)($arg0))->type->wrap_struct_name
+    if ((struct RTypedData *)($arg0))->type & 1
+      printf "%sT_DATA%s(%s): ", $color_type, $color_end, ((const rb_data_type_t *)(((struct RTypedData *)($arg0))->type & ~1))->wrap_struct_name
       print (struct RTypedData *)($arg0)
     else
       printf "%sT_DATA%s: ", $color_type, $color_end
@@ -440,13 +424,11 @@ end
 
 define output_string
   set $flags = ((struct RBasic*)($arg0))->flags
-  set $len = ($flags & RUBY_FL_USER1) ? \
-          ((struct RString*)($arg0))->as.heap.len : \
-          (($flags & (RUBY_FL_USER2|RUBY_FL_USER3|RUBY_FL_USER4|RUBY_FL_USER5|RUBY_FL_USER6)) >> RUBY_FL_USHIFT+2)
+  set $len = ((struct RString*)($arg0))->len
   if $len > 0
     output *(char *)(($flags & RUBY_FL_USER1) ? \
             ((struct RString*)($arg0))->as.heap.ptr : \
-            ((struct RString*)($arg0))->as.ary) @ $len
+            ((struct RString*)($arg0))->as.embed.ary) @ $len
   else
     output ""
   end
@@ -454,13 +436,11 @@ end
 
 define print_string
   set $flags = ((struct RBasic*)($arg0))->flags
-  set $len = ($flags & RUBY_FL_USER1) ? \
-          ((struct RString*)($arg0))->as.heap.len : \
-          (($flags & (RUBY_FL_USER2|RUBY_FL_USER3|RUBY_FL_USER4|RUBY_FL_USER5|RUBY_FL_USER6)) >> RUBY_FL_USHIFT+2)
+  set $len = ((struct RString*)($arg0))->len
   if $len > 0
     printf "%s", *(char *)(($flags & RUBY_FL_USER1) ? \
             ((struct RString*)($arg0))->as.heap.ptr : \
-            ((struct RString*)($arg0))->as.ary) @ $len
+            ((struct RString*)($arg0))->as.embed.ary) @ $len
   end
 end
 
@@ -543,14 +523,14 @@ document rp_bignum
 end
 
 define rp_class
+  set $class_and_classext = (struct RClass_and_rb_classext_t *)($arg0)
   printf "(struct RClass *) %p", (void*)$arg0
-  if RCLASS_ORIGIN((struct RClass *)($arg0)) != $arg0
-    printf " -> %p", RCLASS_ORIGIN((struct RClass *)($arg0))
+  if $class_and_classext->classext->origin_ != (VALUE)$arg0
+    printf " -> %p", $class_and_classext->classext->origin_
   end
   printf "\n"
   rb_classname $arg0
-  print/x *(struct RClass *)($arg0)
-  print *RCLASS_EXT((struct RClass *)($arg0))
+  print/x *$class_and_classext
 end
 document rp_class
   Print the content of a Class/Module.
@@ -916,10 +896,10 @@ document rb_method_entry
 end
 
 define rb_classname
-  # up to 128bit int
-  set $rb_classname = rb_mod_name($arg0)
-  if $rb_classname != RUBY_Qnil
-    rp $rb_classname
+  set $rb_classname = ((struct RClass_and_rb_classext_t*)$arg0)->classext->classpath
+  if $rb_classname != RUBY_Qfalse
+    print_string $rb_classname
+    printf "\n"
   else
     echo anonymous class/module\n
   end
@@ -1126,7 +1106,7 @@ define rb_ps_thread
   set $ps_thread = (struct RTypedData*)$arg0
   set $ps_thread_th = (rb_thread_t*)$ps_thread->data
   printf "* #<Thread:%p rb_thread_t:%p native_thread:%p>\n", \
-    $ps_thread, $ps_thread_th, $ps_thread_th->thread_id
+    $ps_thread, $ps_thread_th, $ps_thread_th->nt
   set $cfp = $ps_thread_th->ec->cfp
   set $cfpend = (rb_control_frame_t *)($ps_thread_th->ec->vm_stack + $ps_thread_th->ec->vm_stack_size)-1
   while $cfp < $cfpend
@@ -1311,13 +1291,12 @@ define dump_node
   set $flags = ((struct RBasic*)($str))->flags
   printf "%s", (char *)(($flags & RUBY_FL_USER1) ? \
                         ((struct RString*)$str)->as.heap.ptr : \
-                        ((struct RString*)$str)->as.ary)
+                        ((struct RString*)$str)->as.embed.ary)
 end
 
 define print_flags
   printf "RUBY_FL_WB_PROTECTED: %s\n", ((struct RBasic*)($arg0))->flags & RUBY_FL_WB_PROTECTED ? "1" : "0"
-  printf "RUBY_FL_PROMOTED0   : %s\n", ((struct RBasic*)($arg0))->flags & RUBY_FL_PROMOTED0 ? "1" : "0"
-  printf "RUBY_FL_PROMOTED1   : %s\n", ((struct RBasic*)($arg0))->flags & RUBY_FL_PROMOTED1 ? "1" : "0"
+  printf "RUBY_FL_PROMOTED    : %s\n", ((struct RBasic*)($arg0))->flags & RUBY_FL_PROMOTED ? "1" : "0"
   printf "RUBY_FL_FINALIZE    : %s\n", ((struct RBasic*)($arg0))->flags & RUBY_FL_FINALIZE ? "1" : "0"
   printf "RUBY_FL_SHAREABLE   : %s\n", ((struct RBasic*)($arg0))->flags & RUBY_FL_SHAREABLE ? "1" : "0"
   printf "RUBY_FL_EXIVAR      : %s\n", ((struct RBasic*)($arg0))->flags & RUBY_FL_EXIVAR ? "1" : "0"
@@ -1344,4 +1323,7 @@ define print_flags
   printf "RUBY_FL_USER18      : %s\n", ((struct RBasic*)($arg0))->flags & RUBY_FL_USER18 ? "1" : "0"
 end
 
-source misc/gdb.py
+source -s misc/gdb.py
+
+# Moved from beginning, since it fails on older gdbs
+set startup-with-shell off
diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs
index 6c35dbcf831a92..5fb9ba5f7dd3ac 100644
--- a/.git-blame-ignore-revs
+++ b/.git-blame-ignore-revs
@@ -6,6 +6,10 @@
 # Expand tabs
 5b21e94bebed90180d8ff63dad03b8b948361089
 c5e9af9c9d890578182a21e7b71b50334cd5579e
+e63a2115f64433b21cb5dd67c5bf8b30f87ef293
+712ac99e4d0384a941c80a9f48f62943ba7d97c0
+d1474affa8e105bece209cc9d594bb0a989859e1
+2da92388b948821269b18d6b178a680f17e41750
 
 # Enable Style/StringLiterals cop for RubyGems/Bundler
 d7ffd3fea402239b16833cc434404a7af82d44f3
@@ -22,3 +26,13 @@ f28287d34c03f472ffe90ea262bdde9affd4b965
 
 # Make benchmark indentation consistent
 fc4acf8cae82e5196186d3278d831f2438479d91
+
+# Make prism_compile.c indentation consistent
+40b2c8e5e7e6e5f83cee9276dc9c1922a69292d6
+d2c5867357ed88eccc28c2b3bd4a46e206e7ff85
+
+# Miss-and-revived commits
+a0f7de814ae5c299d6ce99bed5fb308a05d50ba0
+d4e24021d39e1f80f0055b55d91f8d5f22e15084
+7a56c316418980b8a41fcbdc94067b2bda2ad112
+e90282be7ba1bc8e3119f6e1a2c80356ceb3f80a
diff --git a/.gitattributes b/.gitattributes
index d0c2d266b4a154..6ac6e6fcc3f579 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,5 +1,6 @@
 *.gemspec diff=ruby
 *.rb diff=ruby
+*.inc.rs linguist-generated=true
 bin svn-properties=svn:ignore=ruby
 bin/* diff=ruby
 tool/update-deps diff=ruby
diff --git a/.github/actions/compilers/action.yml b/.github/actions/compilers/action.yml
new file mode 100644
index 00000000000000..30ccd25a12f487
--- /dev/null
+++ b/.github/actions/compilers/action.yml
@@ -0,0 +1,126 @@
+name: Compiles ruby in a container
+description: >-
+  Makes ruby using a dedicated container
+
+inputs:
+  tag:
+    required: false
+    default: clang-18
+    description: >-
+      container image tag to use in this run.
+
+  with_gcc:
+    required: false
+    description: >-
+      override compiler path & flags.
+
+  CFLAGS:
+    required: false
+    description: >-
+      C compiler flags to override.
+
+  CXXFLAGS:
+    required: false
+    description: >-
+      C++ compiler flags to override.
+
+  optflags:
+    required: false
+    # -O1 is faster than -O3 in our tests... Majority of time are consumed trying
+    # to optimize binaries.  Also GitHub Actions run on relatively modern CPUs
+    # compared to, say, GCC 4 or Clang 3.  We don't specify `-march=native`
+    # because compilers tend not understand what the CPU is.
+    default: '-O1'
+    description: >-
+      Compiler flags for optimisations.
+
+  cppflags:
+    required: false
+    description: >-
+      Additional preprocessor flags.
+
+  append_configure:
+    required: false
+    default: >-
+      --without-valgrind
+      --without-jemalloc
+      --without-gmp
+    description: >-
+      flags to append to configure.
+
+  enable_shared:
+    required: false
+    default: true
+    description: >-
+      Whether to build libruby.so.
+
+  check:
+    required: false
+    default: ''
+    description: >-
+      Whether to run `make check`
+
+  mspecopt:
+    required: false
+    default: ''
+    description: >-
+      Additional options for mspec.
+
+  static_exts:
+    required: false
+    description: >-
+      whitespace separated list of extensions that need be linked statically.
+
+runs:
+  using: composite
+  steps:
+    - shell: bash
+      run: docker pull --quiet 'ghcr.io/ruby/ruby-ci-image:${{ inputs.tag }}'
+
+    - name: Enable Launchable conditionally
+      id: enable-launchable
+      run: echo "enable-launchable=true" >> $GITHUB_OUTPUT
+      shell: bash
+      if: >-
+        ${{
+        github.repository == 'ruby/ruby' ||
+        (github.repository != 'ruby/ruby' && env.LAUNCHABLE_TOKEN)
+        }}
+
+    - name: compile
+      shell: bash
+      run: >-
+        docker run
+        --rm
+        --user=root
+        --volume '${{ github.workspace }}:/github/workspace:ro'
+        --workdir=/github/workspace
+        --entrypoint=/github/workspace/.github/actions/compilers/entrypoint.sh
+        --env CI
+        --env GITHUB_ACTION
+        --env INPUT_WITH_GCC='${{ inputs.with_gcc || inputs.tag }}'
+        --env INPUT_CFLAGS='${{ inputs.CFLAGS }}'
+        --env INPUT_CXXFLAGS='${{ inputs.CXXFLAGS }}'
+        --env INPUT_OPTFLAGS='${{ inputs.OPTFLAGS }}'
+        --env INPUT_CPPFLAGS='${{ inputs.cppflags }}'
+        --env INPUT_APPEND_CONFIGURE='${{ inputs.append_configure }}'
+        --env INPUT_CHECK='${{ inputs.check }}'
+        --env INPUT_MSPECOPT='${{ inputs.mspecopt }}'
+        --env INPUT_ENABLE_SHARED='${{ inputs.enable_shared }}'
+        --env INPUT_STATIC_EXTS='${{ inputs.static_exts }}'
+        --env LAUNCHABLE_ORGANIZATION='${{ github.repository_owner }}'
+        --env LAUNCHABLE_WORKSPACE='${{ github.event.repository.name }}'
+        --env LAUNCHABLE_ENABLED='${{ steps.enable-launchable.outputs.enable-launchable || false }}'
+        --env GITHUB_PR_HEAD_SHA='${{ github.event.pull_request.head.sha || github.sha }}'
+        --env GITHUB_PULL_REQUEST_URL='${{ github.event.pull_request.html_url }}'
+        --env GITHUB_REF='${{ github.ref }}'
+        --env GITHUB_ACTIONS
+        --env GITHUB_RUN_ID
+        --env GITHUB_REPOSITORY
+        --env GITHUB_WORKFLOW
+        --env GITHUB_RUN_NUMBER
+        --env GITHUB_EVENT_NAME
+        --env GITHUB_SHA
+        --env GITHUB_HEAD_REF
+        --env GITHUB_SERVER_URL
+        'ghcr.io/ruby/ruby-ci-image:${{ inputs.tag }}'
diff --git a/.github/actions/compilers/entrypoint.sh b/.github/actions/compilers/entrypoint.sh
new file mode 100755
index 00000000000000..17f749d69ebf60
--- /dev/null
+++ b/.github/actions/compilers/entrypoint.sh
@@ -0,0 +1,94 @@
+#! /bin/bash
+
+# Copyright (c) 2024 Ruby developers.  All rights reserved.
+#
+# 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.
+
+grouped()
+{
+    echo "::group::${@}"
+    "${@}"
+    echo "::endgroup::"
+}
+
+set -e
+set -u
+set -o pipefail
+
+srcdir="/github/workspace/src"
+builddir="$(mktemp -dt)"
+
+export GITHUB_WORKFLOW='Compilations'
+export CONFIGURE_TTY='never'
+export RUBY_DEBUG='ci rgengc'
+export RUBY_TESTOPTS='-q --color=always --tty=no'
+export RUBY_DEBUG_COUNTER_DISABLE='1'
+export GNUMAKEFLAGS="-j$((1 + $(nproc --all)))"
+
+case "x${INPUT_ENABLE_SHARED}" in
+x | xno | xfalse )
+    enable_shared='--disable-shared'
+    ;;
+*)
+    enable_shared='--enable-shared'
+    ;;
+esac
+
+pushd ${builddir}
+
+grouped git config --global --add safe.directory ${srcdir}
+
+grouped ${srcdir}/configure        \
+    -C                             \
+    --with-gcc="${INPUT_WITH_GCC}" \
+    --enable-debug-env             \
+    --disable-install-doc          \
+    --with-ext=-test-/cxxanyargs,+ \
+    ${enable_shared}               \
+    ${INPUT_APPEND_CONFIGURE}      \
+    CFLAGS="${INPUT_CFLAGS}"       \
+    CXXFLAGS="${INPUT_CXXFLAGS}"   \
+    optflags="${INPUT_OPTFLAGS}"   \
+    cppflags="${INPUT_CPPFLAGS}"   \
+    debugflags='-ggdb3' # -g0 disables backtraces when SEGV.  Do not set that.
+
+popd
+
+if [[ -n "${INPUT_STATIC_EXTS}" ]]; then
+    echo "::group::ext/Setup"
+    set -x
+    mkdir ${builddir}/ext
+    (
+        for ext in ${INPUT_STATIC_EXTS}; do
+            echo "${ext}"
+        done
+    ) >> ${builddir}/ext/Setup
+    set +x
+    echo "::endgroup::"
+fi
+
+btests=''
+tests=''
+spec_opts=''
+
+pushd ${builddir}
+
+grouped make showflags
+grouped make all
+grouped make test BTESTS="${btests}"
+
+[[ -z "${INPUT_CHECK}" ]] && exit 0
+
+if [ "$INPUT_CHECK" = "true" ]; then
+  tests+=" -- ruby -ext-"
+else
+  tests+=" -- $INPUT_CHECK"
+fi
+
+# grouped make install
+grouped make test-tool
+grouped make test-all TESTS="$tests"
+grouped env CHECK_LEAKS=true make test-spec MSPECOPT="$INPUT_MSPECOPT" SPECOPTS="${spec_opts}"
diff --git a/.github/actions/launchable/setup/action.yml b/.github/actions/launchable/setup/action.yml
new file mode 100644
index 00000000000000..3a939452a36bd1
--- /dev/null
+++ b/.github/actions/launchable/setup/action.yml
@@ -0,0 +1,289 @@
+name: Set up Launchable
+description: >-
+  Install the required dependencies and execute the necessary Launchable commands for test recording
+
+inputs:
+  os:
+    required: true
+    description: The operating system that CI runs on. This value is used in Launchable flavor.
+
+  test-opts:
+    default: none
+    required: false
+    description: >-
+      Test options that determine how tests are run.
+      This value is used in the Launchable flavor.
+
+  launchable-token:
+    required: false
+    description: >-
+      Launchable token is needed if you want to run Launchable on your forked repository.
+      See https://github.com/ruby/ruby/wiki/CI-Servers#launchable-ci for details.
+
+  builddir:
+    required: false
+    default: ${{ github.workspace }}
+    description: >-
+      Directory to create Launchable report file.
+
+  srcdir:
+    required: false
+    default: ${{ github.workspace }}
+    description: >-
+      Directory to (re-)checkout source codes. Launchable retrieves the commit information
+      from the directory.
+
+  test-task:
+    required: false
+    default: ${{ matrix.test_task }}
+    description: >-
+      Specifies a single test task to be executed.
+      This value is used in the Launchable flavor.
+      Either 'test-task' or 'multi-test-tasks' must be configured.
+
+  test-tasks:
+    required: false
+    default: '[]'
+    description: >-
+      Specifies an array of multiple test tasks to be executed.
+      For example: '["test", "test-all"]'.
+      If you want to run a single test task, use the 'test-task' input instead.
+
+  is-yjit:
+    required: false
+    default: 'false'
+    description: >-
+      Whether this workflow is executed on YJIT.
+
+outputs:
+  stdout_report_path:
+    value: ${{ steps.global.outputs.stdout_report_path }}
+    description: >-
+      Report file path for standard output.
+
+  stderr_report_path:
+    value: ${{ steps.global.outputs.stderr_report_path }}
+    description: >-
+      Report file path for standard error.
+
+runs:
+  using: composite
+
+  steps:
+    - name: Enable Launchable conditionally
+      id: enable-launchable
+      run: echo "enable-launchable=true" >> $GITHUB_OUTPUT
+      shell: bash
+      if: >-
+        ${{
+        (github.repository == 'ruby/ruby'
+          || (github.repository != 'ruby/ruby'
+          && env.LAUNCHABLE_TOKEN))
+        && (inputs.test-task == 'check'
+          || inputs.test-task == 'test-all'
+          || inputs.test-task == 'test'
+          || contains(fromJSON(inputs.test-tasks), 'test-all')
+          || contains(fromJSON(inputs.test-tasks), 'test'))
+        }}
+
+    # Launchable CLI requires Python and Java.
+    # https://www.launchableinc.com/docs/resources/cli-reference/
+    - name: Set up Python
+      uses: actions/setup-python@871daa956ca9ea99f3c3e30acb424b7960676734 # v5.0.0
+      with:
+        python-version: "3.x"
+      if: steps.enable-launchable.outputs.enable-launchable
+
+    - name: Set up Java
+      uses: actions/setup-java@7a445ee88d4e23b52c33fdc7601e40278616c7f8 # v4.0.0
+      with:
+        distribution: 'temurin'
+        java-version: '17'
+      if: steps.enable-launchable.outputs.enable-launchable
+
+    - name: Set global vars
+      id: global
+      shell: bash
+      run: |
+        test_all_enabled="${{ inputs.test-task == 'check' ||  inputs.test-task == 'test-all' || contains(fromJSON(inputs.test-tasks), 'test-all') }}"
+        btest_enabled="${{ inputs.test-task == 'check' ||  inputs.test-task == 'test' || contains(fromJSON(inputs.test-tasks), 'test') }}"
+        test_spec_enabled="${{ inputs.test-task == 'check' ||  inputs.test-task == 'test-spec' || contains(fromJSON(inputs.test-tasks), 'test-spec') }}"
+        echo test_all_enabled="${test_all_enabled}" >> $GITHUB_OUTPUT
+        echo btest_enabled="${btest_enabled}" >> $GITHUB_OUTPUT
+        echo test_spec_enabled="${test_spec_enabled}" >> $GITHUB_OUTPUT
+        echo test_all_report_file='launchable_test_all_report.json' >> $GITHUB_OUTPUT
+        echo btest_report_file='launchable_btest_report.json' >> $GITHUB_OUTPUT
+        echo test_spec_report_dir='launchable_test_spec_report' >> $GITHUB_OUTPUT
+        echo stdout_report_path="launchable_stdout.log" >> $GITHUB_OUTPUT
+        echo stderr_report_path="launchable_stderr.log" >> $GITHUB_OUTPUT
+      if: steps.enable-launchable.outputs.enable-launchable
+
+    - name: Set environment variables for Launchable
+      shell: bash
+      run: |
+        : # GITHUB_PULL_REQUEST_URL are used for commenting test reports in Launchable Github App.
+        : # https://github.com/launchableinc/cli/blob/v1.80.1/launchable/utils/link.py#L42
+        echo "GITHUB_PULL_REQUEST_URL=${{ github.event.pull_request.html_url }}" >> $GITHUB_ENV
+        : # The following envs are necessary in Launchable tokenless authentication.
+        : # https://github.com/launchableinc/cli/blob/v1.80.1/launchable/utils/authentication.py#L20
+        echo "LAUNCHABLE_ORGANIZATION=${{ github.repository_owner }}" >> $GITHUB_ENV
+        echo "LAUNCHABLE_WORKSPACE=${{ github.event.repository.name }}" >> $GITHUB_ENV
+        : # https://github.com/launchableinc/cli/blob/v1.80.1/launchable/utils/authentication.py#L71
+        echo "GITHUB_PR_HEAD_SHA=${{ github.event.pull_request.head.sha || github.sha }}" >> $GITHUB_ENV
+        echo "LAUNCHABLE_TOKEN=${{ inputs.launchable-token }}" >> $GITHUB_ENV
+        : # To prevent a slowdown in CI, disable request retries when the Launchable server is unstable.
+        echo "LAUNCHABLE_SKIP_TIMEOUT_RETRY=1" >> $GITHUB_ENV
+        echo "LAUNCHABLE_COMMIT_TIMEOUT=1" >> $GITHUB_ENV
+      if: steps.enable-launchable.outputs.enable-launchable
+
+    - name: Set up path
+      shell: bash
+      working-directory: ${{ inputs.srcdir }}
+      # Since updated PATH variable will be available in only subsequent actions, we need to add the path beforehand.
+      # https://docs.github.com/en/actions/using-workflows/workflow-commands-for-github-actions#adding-a-system-path
+      run: echo "$(python -msite --user-base)/bin" >> $GITHUB_PATH
+      if: steps.enable-launchable.outputs.enable-launchable && startsWith(inputs.os, 'macos')
+
+    - name: Set up Launchable
+      id: setup-launchable
+      shell: bash
+      working-directory: ${{ inputs.srcdir }}
+      run: |
+        set -x
+        pip install --user launchable
+        : # The build name cannot include a slash, so we replace the string here.
+        github_ref="${{ github.ref }}"
+        github_ref="${github_ref//\//_}"
+        : # With the --name option, we need to configure a unique identifier for this build.
+        : # To avoid setting the same build name as the CI which runs on other branches, we use the branch name here.
+        build_name="${github_ref}_${GITHUB_PR_HEAD_SHA}"
+        test_opts="${{ inputs.test-opts }}"
+        test_opts="${test_opts// /}"
+        test_opts="${test_opts//=/:}"
+        test_all_test_suite='test-all'
+        btest_test_suite='btest'
+        test_spec_test_suite='test-spec'
+        if [ "${{ inputs.is-yjit }}" = "true" ]; then
+          test_all_test_suite="yjit-${test_all_test_suite}"
+          btest_test_suite="yjit-${btest_test_suite}"
+          test_spec_test_suite="yjit-${test_spec_test_suite}"
+        fi
+        # launchable_setup target var -- refers ${target} prefixed variables
+        launchable_setup() {
+          local target=$1 session
+          eval [ "\${${target}_enabled}" = "true" ] || return
+          eval local suite=\${${target}_test_suite}
+          session=$(launchable record session \
+            --build "${build_name}" \
+            --observation \
+            --flavor os="${{ inputs.os }}" \
+            --flavor test_task="${{ inputs.test-task }}" \
+            --flavor test_opts="${test_opts}" \
+            --flavor workflow="${{ github.workflow }}" \
+            --test-suite ${suite} \
+            )
+          launchable subset \
+            --get-tests-from-previous-sessions \
+            --non-blocking \
+            --target 90% \
+            --session "${session}" \
+            raw > /dev/null
+          echo "${target}_session=${session}" >> $GITHUB_OUTPUT
+        }
+
+        launchable record build --name "${build_name}"
+        if launchable_setup test_all; then
+          echo "TESTS=${TESTS:+$TESTS }--launchable-test-reports=${test_all_report_file}" >> $GITHUB_ENV
+        fi
+        if launchable_setup btest; then
+          echo "BTESTS=${BTESTS:+$BTESTS }--launchable-test-reports=${btest_report_file}" >> $GITHUB_ENV
+        fi
+        if launchable_setup test_spec; then
+          echo "SPECOPTS=${SPECOPTS:$SPECOPTS }--launchable-test-reports=${test_spec_report_dir}" >> $GITHUB_ENV
+          echo test_spec_enabled=true >> $GITHUB_OUTPUT
+        fi
+
+        echo launchable_setup_dir=$(pwd) >> $GITHUB_OUTPUT
+      if: steps.enable-launchable.outputs.enable-launchable
+      env:
+        test_all_enabled: ${{ steps.global.outputs.test_all_enabled }}
+        btest_enabled: ${{ steps.global.outputs.btest_enabled }}
+        test_spec_enabled: ${{ steps.global.outputs.test_spec_enabled }}
+        test_all_report_file: ${{ steps.global.outputs.test_all_report_file }}
+        btest_report_file: ${{ steps.global.outputs.btest_report_file }}
+        test_spec_report_dir: ${{ steps.global.outputs.test_spec_report_dir }}
+
+    - name: make test-spec report directory in build directory
+      shell: bash
+      working-directory: ${{ inputs.builddir }}
+      run: mkdir "${test_spec_report_dir}"
+      if: ${{ steps.setup-launchable.outputs.test_spec_enabled == 'true' }}
+      env:
+        test_spec_report_dir: ${{ steps.global.outputs.test_spec_report_dir }}
+
+    - name: Clean up test results in Launchable
+      uses: gacts/run-and-post-run@674528335da98a7afc80915ff2b4b860a0b3553a # v1.4.0
+      with:
+        shell: bash
+        working-directory: ${{ inputs.builddir }}
+        post: |
+          rm -f "${test_all_report_file}"
+          rm -f "${btest_report_file}"
+          rm -fr "${test_spec_report_dir}"
+          rm -f launchable_stdout.log
+          rm -f launchable_stderr.log
+      if: always() && steps.setup-launchable.outcome == 'success'
+      env:
+        test_all_report_file: ${{ steps.global.outputs.test_all_report_file }}
+        btest_report_file: ${{ steps.global.outputs.btest_report_file }}
+        test_spec_report_dir: ${{ steps.global.outputs.test_spec_report_dir }}
+
+    - name: Record test results in Launchable
+      uses: gacts/run-and-post-run@674528335da98a7afc80915ff2b4b860a0b3553a # v1.4.0
+      with:
+        shell: bash
+        working-directory: ${{ inputs.builddir }}
+        post: |
+          if [[ "${test_all_enabled}" = "true" ]]; then \
+            launchable record attachment \
+              --session "${test_all_session}" \
+              "${stdout_report_path}" \
+              "${stderr_report_path}"; \
+            launchable record tests \
+              --session "${test_all_session}" \
+              raw "${test_all_report_file}" || true; \
+          fi
+
+          if [[ "${btest_enabled}" = "true" ]]; then \
+            launchable record attachment \
+              --session "${btest_session}" \
+              "${stdout_report_path}" \
+              "${stderr_report_path}"; \
+            launchable record tests \
+              --session "${btest_session}" \
+              raw "${btest_report_file}" || true; \
+          fi
+
+          if [[ "${test_spec_enabled}" = "true" ]]; then \
+            launchable record attachment \
+              --session "${test_spec_session}" \
+              "${stdout_report_path}" \
+              "${stderr_report_path}"; \
+            launchable record tests \
+              --session "${test_spec_session}" \
+              raw ${test_spec_report_dir}/* || true; \
+          fi
+      if: ${{ always() && steps.setup-launchable.outcome == 'success' }}
+      env:
+        test_all_report_file: ${{ steps.global.outputs.test_all_report_file }}
+        btest_report_file: ${{ steps.global.outputs.btest_report_file }}
+        test_spec_report_dir: ${{ steps.global.outputs.test_spec_report_dir }}
+        test_all_enabled: ${{ steps.global.outputs.test_all_enabled }}
+        btest_enabled: ${{ steps.global.outputs.btest_enabled }}
+        test_spec_enabled: ${{ steps.global.outputs.test_spec_enabled }}
+        test_all_session: ${{ steps.setup-launchable.outputs.test_all_session }}
+        btest_session: ${{ steps.setup-launchable.outputs.btest_session }}
+        test_spec_session: ${{ steps.setup-launchable.outputs.test_spec_session }}
+        stdout_report_path: ${{ steps.global.outputs.stdout_report_path }}
+        stderr_report_path: ${{ steps.global.outputs.stderr_report_path }}
+        LAUNCHABLE_SETUP_DIR: ${{ steps.setup-launchable.outputs.launchable_setup_dir }}
diff --git a/.github/actions/setup/directories/action.yml b/.github/actions/setup/directories/action.yml
index ea5f2720ef343e..f16ce21e0ef66e 100644
--- a/.github/actions/setup/directories/action.yml
+++ b/.github/actions/setup/directories/action.yml
@@ -29,6 +29,33 @@ inputs:
     description: >-
       If set to true, additionally runs `make up`.
 
+  checkout:
+    required: false
+    type: boolean
+    default: true
+    description: >-
+      If set to '' (false), skip running actions/checkout. This is useful when
+      you don't want to overwrite a GitHub token that is already set up.
+
+  dummy-files:
+    required: false
+    type: boolean
+    default: ''
+    description: >-
+      If set to true, creates dummy files in build dir.
+
+  fetch-depth:
+    required: false
+    default: '1'
+    description: The depth of commit history fetched from the remote repository
+
+  clean:
+    required: false
+    type: boolean
+    default: ''
+    description: >-
+      If set to true, clean build directory.
+
 outputs: {} # nothing?
 
 runs:
@@ -60,11 +87,13 @@ runs:
         git config --global advice.detachedHead 0
         git config --global init.defaultBranch garbage
 
-    - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
+    - if: inputs.checkout
+      uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
       with:
         path: ${{ inputs.srcdir }}
+        fetch-depth: ${{ inputs.fetch-depth }}
 
-    - uses: actions/cache@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 # v3.3.1
+    - uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
       with:
         path: ${{ inputs.srcdir }}/.downloaded-cache
         key: downloaded-cache
@@ -72,7 +101,7 @@ runs:
     - if: steps.which.outputs.autoreconf
       shell: bash
       working-directory: ${{ inputs.srcdir }}
-      run: ./autogen.sh
+      run: ./autogen.sh --install
 
     # This is for MinGW.
     - if: runner.os == 'Windows'
@@ -92,21 +121,67 @@ runs:
       shell: bash
       working-directory: ${{ inputs.srcdir }}
       run: |
-        touch config.status
-        touch .rbconfig.time
-        sed -f tool/prereq.status template/Makefile.in > Makefile
-        sed -f tool/prereq.status template/GNUmakefile.in > GNUmakefile
+        touch config.status .rbconfig.time
+        for mk in Makefile GNUmakefile; do
+          sed -f tool/prereq.status template/$mk.in > $mk
+        done
         make up
 
     # Cleanup, runs even on failure
     - if: always() && inputs.makeup
       shell: bash
       working-directory: ${{ inputs.srcdir }}
-      run: rm -f config.status Makefile rbconfig.rb .rbconfig.time
+      run: |
+        rm -f config.status .rbconfig.time \
+          Makefile GNUmakefile uncommon.mk enc.mk noarch-fake.rb
 
     - if: steps.which.outputs.sudo
       shell: bash
       run: |
         sudo chmod -R go-w /usr/share
         chmod -v go-w $HOME $HOME/.config || :
-        sudo bash -c 'IFS=:; for d in '"$PATH"'; do chmod -v go-w $d; done' || :
+        declare -a dirs # -A is not supported by old bash, e.g. macos
+        SAVE_IFS="$IFS" IFS=:; set $PATH
+        for d do
+          while [ -d "$d" ]; do
+            case "$IFS${dirs[*]}$IFS" in *"$IFS$d$IFS"*) ;; *) dirs+=("$d");; esac
+            d="${d%/*}"
+          done
+        done
+        IFS="$SAVE_IFS"
+        sudo chmod -v go-w "${dirs[@]}" || :
+
+    - if: inputs.dummy-files == 'true'
+      shell: bash
+      id: dummy-files
+      working-directory: ${{ inputs.builddir }}
+      run: |
+        : Create dummy files in build dir
+        set {{a..z},{A..Z},{0..9},foo,bar,test,zzz}.rb
+        for file; do \
+          echo > $file "raise 'do not load $file'"; \
+        done
+        # drop {a..z}.rb if case-insensitive filesystem
+        grep -F A.rb a.rb > /dev/null && set "${@:27}"
+        echo clean="cd ${{ inputs.builddir }} && rm $*" >> $GITHUB_OUTPUT
+
+    - if: inputs.clean == 'true'
+      shell: bash
+      id: clean
+      run: |
+        echo distclean='make -C ${{ inputs.builddir }} distclean' >> $GITHUB_OUTPUT
+        echo remained-files='find ${{ inputs.builddir }} -ls' >> $GITHUB_OUTPUT
+        [ "${{ inputs.builddir }}" = "${{ inputs.srcdir }}" ] ||
+        echo final='rmdir ${{ inputs.builddir }}' >> $GITHUB_OUTPUT
+
+    - name: clean
+      uses: gacts/run-and-post-run@d803f6920adc9a47eeac4cb6c93dbc2e2890c684 # v1.4.2
+      with:
+        working-directory:
+        post: |
+          ${{ steps.dummy-files.outputs.clean }}
+          ${{ steps.clean.outputs.distclean }}
+          ${{ steps.clean.outputs.remained-files }}
+          ${{ steps.clean.outputs.final }}
+      # rmdir randomly fails due to launchable files
+      continue-on-error: true
diff --git a/.github/actions/setup/macos/action.yml b/.github/actions/setup/macos/action.yml
index 3649a648760324..d0072ff82890c4 100644
--- a/.github/actions/setup/macos/action.yml
+++ b/.github/actions/setup/macos/action.yml
@@ -13,12 +13,17 @@ runs:
     - name: brew
       shell: bash
       run: |
-        brew install --quiet gmp libffi openssl@1.1 zlib autoconf automake libtool readline
+        brew install --quiet jemalloc gmp libffi openssl@3 zlib autoconf automake libtool
 
     - name: Set ENV
       shell: bash
       run: |
-        for lib in openssl@1.1 readline; do
-          CONFIGURE_ARGS="${CONFIGURE_ARGS:+$CONFIGURE_ARGS }--with-${lib%@*}-dir=$(brew --prefix $lib)"
-        done
-        echo CONFIGURE_ARGS="${CONFIGURE_ARGS}" >> $GITHUB_ENV
+        dir_config() {
+          local args=() lib var="$1"; shift
+          for lib in "$@"; do
+            args+=("--with-${lib%@*}-dir=$(brew --prefix $lib)")
+          done
+          echo "$var=${args[*]}" >> $GITHUB_ENV
+        }
+        dir_config ruby_configure_args gmp
+        dir_config CONFIGURE_ARGS openssl@3
diff --git a/.github/actions/slack/action.yml b/.github/actions/slack/action.yml
index d1dd7f5def8105..98171efc5eed37 100644
--- a/.github/actions/slack/action.yml
+++ b/.github/actions/slack/action.yml
@@ -9,7 +9,7 @@ inputs:
     required: true
     description: >-
       The URL to post the payload.  This is an input because it tends
-      to be stored in a secrets valut and a composite action cannot
+      to be stored in a secrets vault and a composite action cannot
       look into one.
 
   label:
@@ -24,7 +24,7 @@ runs:
   using: composite
 
   steps:
-    - uses: ruby/action-slack@0bd85c72233cdbb6a0fe01d37aaeff1d21b5fce1 # v3.2.1
+    - uses: ruby/action-slack@54175162371f1f7c8eb94d7c8644ee2479fcd375 # v3.2.2
       with:
         payload: |
           {
@@ -36,3 +36,4 @@ runs:
           }
       env:
         SLACK_WEBHOOK_URL: ${{ inputs.SLACK_WEBHOOK_URL }}
+      if: ${{github.event_name == 'push' && startsWith(github.repository, 'ruby/')}}
diff --git a/.github/auto_request_review.yml b/.github/auto_request_review.yml
index 8726df577d39eb..c4c94681f0e387 100644
--- a/.github/auto_request_review.yml
+++ b/.github/auto_request_review.yml
@@ -1,13 +1,19 @@
 files:
-  'yjit*': [team:yjit]
-  'yjit/**/*': [team:yjit]
+  'yjit*': [team:jit]
+  'yjit/**/*': [team:jit]
   'yjit/src/cruby_bindings.inc.rs': []
-  'doc/yjit/*': [team:yjit]
-  'bootstraptest/test_yjit*': [team:yjit]
-  'test/ruby/test_yjit*': [team:yjit]
+  'doc/yjit/*': [team:jit]
+  'bootstraptest/test_yjit*': [team:jit]
+  'test/ruby/test_yjit*': [team:jit]
+  'zjit*': [team:jit]
+  'zjit/**/*': [team:jit]
+  'zjit/src/cruby_bindings.inc.rs': []
+  'doc/zjit*': [team:jit]
+  'test/ruby/test_zjit*': [team:jit]
+  'defs/jit.mk': [team:jit]
 options:
   ignore_draft: true
   # This currently doesn't work as intended. We want to skip reviews when only
   # cruby_bingings.inc.rs is modified, but this skips reviews even when other
-  # yjit files are modified as well. To be enabled after fixing the behavior.
+  # files are modified as well. To be enabled after fixing the behavior.
   #last_files_match_only: true
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index 6778b0493a160f..426893be2af281 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -4,3 +4,15 @@ updates:
     directory: '/'
     schedule:
       interval: 'daily'
+  - package-ecosystem: 'github-actions'
+    directory: '/.github/actions/slack'
+    schedule:
+      interval: 'daily'
+  - package-ecosystem: 'github-actions'
+    directory: '/.github/actions/setup/directories'
+    schedule:
+      interval: 'daily'
+  - package-ecosystem: 'cargo'
+    directory: '/yjit'
+    schedule:
+      interval: 'daily'
diff --git a/.github/labeler.yml b/.github/labeler.yml
new file mode 100644
index 00000000000000..e81aed8e986284
--- /dev/null
+++ b/.github/labeler.yml
@@ -0,0 +1,6 @@
+Documentation:
+- changed-files:
+  - all-globs-to-all-files: doc/**
+
+Backport:
+- base-branch: 'ruby_3_\d'
diff --git a/.github/workflows/annocheck.yml b/.github/workflows/annocheck.yml
index 2f5ece83280727..a890fc442f09fb 100644
--- a/.github/workflows/annocheck.yml
+++ b/.github/workflows/annocheck.yml
@@ -4,24 +4,20 @@ on:
   push:
     paths-ignore:
       - 'doc/**'
-      - '**/man'
+      - '**/man/*'
       - '**.md'
       - '**.rdoc'
       - '**/.document'
+      - '.*.yml'
   pull_request:
     paths-ignore:
       - 'doc/**'
-      - '**/man'
+      - '**/man/*'
       - '**.md'
       - '**.rdoc'
       - '**/.document'
+      - '.*.yml'
   merge_group:
-    paths-ignore:
-      - 'doc/**'
-      - '**/man'
-      - '**.md'
-      - '**.rdoc'
-      - '**/.document'
 
 concurrency:
   group: ${{ github.workflow }} / ${{ startsWith(github.event_name, 'pull') && github.ref_name || github.sha }}
@@ -32,7 +28,7 @@ permissions:
 
 jobs:
   compile:
-    name: gcc-11 annocheck
+    name: test-annocheck
 
     runs-on: ubuntu-latest
 
@@ -43,9 +39,11 @@ jobs:
     if: >-
       ${{!(false
       || contains(github.event.head_commit.message, '[DOC]')
+      || contains(github.event.head_commit.message, 'Document')
       || contains(github.event.pull_request.title, '[DOC]')
+      || contains(github.event.pull_request.title, 'Document')
       || contains(github.event.pull_request.labels.*.name, 'Documentation')
-      || (github.event_name == 'push' && github.actor == 'dependabot[bot]')
+      || (github.event_name == 'push' && github.event.pull_request.user.login == 'dependabot[bot]')
       )}}
 
     env:
@@ -65,7 +63,7 @@ jobs:
       - run: id
         working-directory:
 
-      - uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           sparse-checkout-cone-mode: false
           sparse-checkout: /.github
@@ -76,6 +74,11 @@ jobs:
           builddir: build
           makeup: true
 
+      - uses: ruby/setup-ruby@a4effe49ee8ee5b8b5091268c473a4628afb5651 # v1.245.0
+        with:
+          ruby-version: '3.1'
+          bundler: none
+
       # Minimal flags to pass the check.
       # -g0 disables backtraces when SEGV.  Do not set that.
       - name: Run configure
@@ -97,26 +100,12 @@ jobs:
 
       - run: make
 
-      - run: make test
-
-      - run: make install
-
-      - run: make test-tool
-
-      ### test-all doesn't work: https://github.com/ruby/ruby/actions/runs/4340112185/jobs/7578344307
-      # - run: make test-all TESTS='-- ruby -ext-'
-
-      ### test-spec doesn't work: https://github.com/ruby/ruby/actions/runs/4340193212/jobs/7578505652
-      # - run: make test-spec
-      #   env:
-      #     CHECK_LEAKS: true
-
       - run: make test-annocheck
 
       - uses: ./.github/actions/slack
         with:
           SLACK_WEBHOOK_URL: ${{ secrets.SIMPLER_ALERTS_URL }} # ruby-lang slack: ruby/simpler-alerts-bot
-        if: ${{ failure() && github.event_name == 'push' }}
+        if: ${{ failure() }}
 
 defaults:
   run:
diff --git a/.github/workflows/auto_request_review.yml b/.github/workflows/auto_request_review.yml
index d9eb774e3f41f2..207315a084cc59 100644
--- a/.github/workflows/auto_request_review.yml
+++ b/.github/workflows/auto_request_review.yml
@@ -2,6 +2,7 @@ name: Auto Request Review
 on:
   pull_request_target:
     types: [opened, ready_for_review, reopened]
+    branches: [master]
 
 permissions:
   contents: read
@@ -10,10 +11,10 @@ jobs:
   auto-request-review:
     name: Auto Request Review
     runs-on: ubuntu-latest
-    if: ${{ github.repository == 'ruby/ruby' }}
+    if: ${{ github.repository == 'ruby/ruby' && github.base_ref == 'master' }}
     steps:
       - name: Request review based on files changes and/or groups the author belongs to
-        uses: necojackarc/auto-request-review@6a51cebffe2c084705d9a7b394abd802e0119633 # v0.12.0
+        uses: necojackarc/auto-request-review@e89da1a8cd7c8c16d9de9c6e763290b6b0e3d424 # v0.13.0
         with:
           # scope: public_repo
-          token: ${{ secrets.MATZBOT_GITHUB_TOKEN }}
+          token: ${{ secrets.MATZBOT_AUTO_REQUEST_REVIEW_TOKEN }}
diff --git a/.github/workflows/baseruby.yml b/.github/workflows/baseruby.yml
index 50176b3eb0d8bc..8b77b0188934f9 100644
--- a/.github/workflows/baseruby.yml
+++ b/.github/workflows/baseruby.yml
@@ -4,24 +4,20 @@ on:
   push:
     paths-ignore:
       - 'doc/**'
-      - '**/man'
+      - '**/man/*'
       - '**.md'
       - '**.rdoc'
       - '**/.document'
+      - '.*.yml'
   pull_request:
     paths-ignore:
       - 'doc/**'
-      - '**/man'
+      - '**/man/*'
       - '**.md'
       - '**.rdoc'
       - '**/.document'
+      - '.*.yml'
   merge_group:
-    paths-ignore:
-      - 'doc/**'
-      - '**/man'
-      - '**.md'
-      - '**.rdoc'
-      - '**/.document'
 
 concurrency:
   group: ${{ github.workflow }} / ${{ startsWith(github.event_name, 'pull') && github.ref_name || github.sha }}
@@ -34,33 +30,32 @@ jobs:
   baseruby:
     name: BASERUBY
 
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
 
     if: >-
       ${{!(false
       || contains(github.event.head_commit.message, '[DOC]')
+      || contains(github.event.head_commit.message, 'Document')
       || contains(github.event.pull_request.title, '[DOC]')
+      || contains(github.event.pull_request.title, 'Document')
       || contains(github.event.pull_request.labels.*.name, 'Documentation')
-      || (github.event_name == 'push' && github.actor == 'dependabot[bot]')
+      || (github.event_name == 'push' && github.event.pull_request.user.login == 'dependabot[bot]')
       )}}
 
     strategy:
       matrix:
         ruby:
-          - ruby-2.5
-#         - ruby-2.6
-#         - ruby-2.7
-          - ruby-3.0
           - ruby-3.1
           - ruby-3.2
+          - ruby-3.3
 
     steps:
-      - uses: ruby/setup-ruby@250fcd6a742febb1123a77a841497ccaa8b9e939 # v1.152.0
+      - uses: ruby/setup-ruby@a4effe49ee8ee5b8b5091268c473a4628afb5651 # v1.245.0
         with:
           ruby-version: ${{ matrix.ruby }}
           bundler: none
 
-      - uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
 
       - uses: ./.github/actions/setup/ubuntu
 
@@ -78,4 +73,4 @@ jobs:
         with:
           label: ${{ matrix.ruby }}
           SLACK_WEBHOOK_URL: ${{ secrets.SIMPLER_ALERTS_URL }} # ruby-lang slack: ruby/simpler-alerts-bot
-        if: ${{ failure() && github.event_name == 'push' }}
+        if: ${{ failure() }}
diff --git a/.github/workflows/bundled_gems.yml b/.github/workflows/bundled_gems.yml
index 8c78e3905b1fda..27ad55307bef76 100644
--- a/.github/workflows/bundled_gems.yml
+++ b/.github/workflows/bundled_gems.yml
@@ -12,10 +12,6 @@ on:
       - '.github/workflows/bundled_gems.yml'
       - 'gems/bundled_gems'
   merge_group:
-    branches: ['master']
-    paths:
-      - '.github/workflows/bundled_gems.yml'
-      - 'gems/bundled_gems'
   schedule:
     - cron: '45 6 * * *'
   workflow_dispatch:
@@ -35,9 +31,14 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+        with:
+          token: ${{ (github.repository == 'ruby/ruby' && !startsWith(github.event_name, 'pull')) && secrets.MATZBOT_AUTO_UPDATE_TOKEN || secrets.GITHUB_TOKEN }}
 
       - uses: ./.github/actions/setup/directories
+        with:
+          # Skip overwriting MATZBOT_AUTO_UPDATE_TOKEN
+          checkout: '' # false (ref: https://github.com/actions/runner/issues/2238)
 
       - name: Set ENV
         run: |
@@ -45,14 +46,23 @@ jobs:
 
       - name: Download previous gems list
         run: |
-          data=bundled_gems.json
           mkdir -p .downloaded-cache
-          ln -s .downloaded-cache/$data .
-          curl -O -R -z ./$data https://stdgems.org/$data
+          for data in bundled_gems.json default_gems.json; do
+            ln -s .downloaded-cache/$data .
+            curl -O -R -z ./$data https://stdgems.org/$data
+          done
 
       - name: Update bundled gems list
+        id: bundled_gems
+        run: |
+          ruby -i~ tool/update-bundled_gems.rb gems/bundled_gems >> $GITHUB_OUTPUT
+
+      - name: Update spec/bundler/support/builders.rb
         run: |
-          ruby -i~ tool/update-bundled_gems.rb gems/bundled_gems
+          #!ruby
+          rake_version = File.read("gems/bundled_gems")[/^rake\s+(\S+)/, 1]
+          print ARGF.read.sub(/^ *def rake_version\s*\K".*?"/) {rake_version.dump}
+        shell: ruby -i~ {0} spec/bundler/support/builders.rb
 
       - name: Maintain updated gems list in NEWS
         run: |
@@ -61,59 +71,66 @@ jobs:
       - name: Check diffs
         id: diff
         run: |
-          git add -- NEWS.md
-          git diff --no-ext-diff --ignore-submodules --quiet -- gems/bundled_gems
-        continue-on-error: true
+          news= gems=
+          git diff --color --no-ext-diff --ignore-submodules --exit-code -- NEWS.md ||
+          news=true
+          git diff --color --no-ext-diff --ignore-submodules --exit-code -- gems/bundled_gems ||
+          gems=true
+          git add -- NEWS.md gems/bundled_gems
+          git add -- spec/bundler/support/builders.rb
+          echo news=$news >> $GITHUB_OUTPUT
+          echo gems=$gems >> $GITHUB_OUTPUT
+          echo update=${news:-$gems} >> $GITHUB_OUTPUT
 
       - name: Install libraries
         uses: ./.github/actions/setup/ubuntu
-        if: ${{ steps.diff.outcome == 'failure' }}
+        if: ${{ steps.diff.outputs.gems }}
 
       - name: Build
         run: |
           ./autogen.sh
           ./configure -C --disable-install-doc
           make
-        if: ${{ steps.diff.outcome == 'failure' }}
+        if: ${{ steps.diff.outputs.gems }}
 
       - name: Prepare bundled gems
         run: |
           make -s prepare-gems
-        if: ${{ steps.diff.outcome == 'failure' }}
+        if: ${{ steps.diff.outputs.gems }}
 
       - name: Test bundled gems
         run: |
           make -s test-bundled-gems
-          git add -- gems/bundled_gems
         timeout-minutes: 30
         env:
           RUBY_TESTOPTS: '-q --tty=no'
           TEST_BUNDLED_GEMS_ALLOW_FAILURES: ''
-        if: ${{ steps.diff.outcome == 'failure' }}
-
-      - name: Show diffs
-        id: show
-        run: |
-          git diff --cached --color --no-ext-diff --ignore-submodules --exit-code --
-        continue-on-error: true
+        if: ${{ steps.diff.outputs.gems }}
 
       - name: Commit
         run: |
           git pull --ff-only origin ${GITHUB_REF#refs/heads/}
-          message="Update bundled gems list at "
-          if [ ${{ steps.diff.outcome }} = success ]; then
-            git commit --message="${message}${GITHUB_SHA:0:30} [ci skip]"
+          message="Update bundled gems list"
+          if [ -z "${gems}" ]; then
+            git commit --message="[DOC] ${message} at ${GITHUB_SHA:0:30}"
           else
-            git commit --message="${message}${TODAY}"
+            git commit --message="${message} as of ${TODAY}"
           fi
           git push origin ${GITHUB_REF#refs/heads/}
         env:
+          TODAY: ${{ steps.bundled_gems.outputs.latest_date || env.TODAY }}
           EMAIL: svn-admin@ruby-lang.org
           GIT_AUTHOR_NAME: git
           GIT_COMMITTER_NAME: git
-        if: ${{ github.repository == 'ruby/ruby' && !startsWith(github.event_name, 'pull') && steps.show.outcome == 'failure' }}
+          gems: ${{ steps.diff.outputs.gems }}
+        if: >-
+          ${{
+          github.repository == 'ruby/ruby' &&
+          !startsWith(github.event_name, 'pull') &&
+          steps.diff.outputs.update
+          }}
 
       - uses: ./.github/actions/slack
         with:
           SLACK_WEBHOOK_URL: ${{ secrets.SIMPLER_ALERTS_URL }} # ruby-lang slack: ruby/simpler-alerts-bot
-        if: ${{ failure() && github.event_name == 'push' }}
+        if: ${{ failure() }}
diff --git a/.github/workflows/check_dependencies.yml b/.github/workflows/check_dependencies.yml
index ac065faaa0165c..22452a3b9e822e 100644
--- a/.github/workflows/check_dependencies.yml
+++ b/.github/workflows/check_dependencies.yml
@@ -3,24 +3,13 @@ on:
   push:
     paths-ignore:
       - 'doc/**'
-      - '**/man'
+      - '**/man/*'
       - '**.md'
       - '**.rdoc'
       - '**/.document'
+      - '.*.yml'
   pull_request:
-    paths-ignore:
-      - 'doc/**'
-      - '**/man'
-      - '**.md'
-      - '**.rdoc'
-      - '**/.document'
   merge_group:
-    paths-ignore:
-      - 'doc/**'
-      - '**/man'
-      - '**.md'
-      - '**.rdoc'
-      - '**/.document'
 
 concurrency:
   group: ${{ github.workflow }} / ${{ startsWith(github.event_name, 'pull') && github.ref_name || github.sha }}
@@ -31,23 +20,17 @@ permissions:
 
 jobs:
   update-deps:
+    name: Dependency checks
+
     strategy:
       matrix:
-        os: [ubuntu-20.04]
+        os: [ubuntu-latest]
       fail-fast: true
 
     runs-on: ${{ matrix.os }}
 
-    if: >-
-      ${{!(false
-      || contains(github.event.head_commit.message, '[DOC]')
-      || contains(github.event.pull_request.title, '[DOC]')
-      || contains(github.event.pull_request.labels.*.name, 'Documentation')
-      || (github.event_name == 'push' && github.actor == 'dependabot[bot]')
-      )}}
-
     steps:
-      - uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
 
       - uses: ./.github/actions/setup/ubuntu
         if: ${{ contains(matrix.os, 'ubuntu') }}
@@ -57,11 +40,18 @@ jobs:
 
       - uses: ./.github/actions/setup/directories
 
+      - uses: ruby/setup-ruby@a4effe49ee8ee5b8b5091268c473a4628afb5651 # v1.245.0
+        with:
+          ruby-version: '3.1'
+          bundler: none
+
       - name: Run configure
         run: ./configure -C --disable-install-doc --disable-rubygems --with-gcc 'optflags=-O0' 'debugflags=-save-temps=obj -g'
 
       - run: make all golf
 
+      - run: ./goruby -veh
+
       - run: ruby tool/update-deps --fix
 
       - run: git diff --no-ext-diff --ignore-submodules --exit-code
@@ -70,4 +60,4 @@ jobs:
         with:
           label: ${{ matrix.os }} / Dependencies need to update
           SLACK_WEBHOOK_URL: ${{ secrets.SIMPLER_ALERTS_URL }} # ruby-lang slack: ruby/simpler-alerts-bot
-        if: ${{ failure() && github.event_name == 'push' }}
+        if: ${{ failure() }}
diff --git a/.github/workflows/check_misc.yml b/.github/workflows/check_misc.yml
index e64a93189371bb..630ba3e4dca3de 100644
--- a/.github/workflows/check_misc.yml
+++ b/.github/workflows/check_misc.yml
@@ -1,4 +1,4 @@
-name: Miscellaneous checks
+name: Misc
 on: [push, pull_request, merge_group]
 
 concurrency:
@@ -10,26 +10,41 @@ permissions:
 
 jobs:
   checks:
+    name: Miscellaneous checks
+
     permissions:
       contents: write # for Git to git push
 
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+        with:
+          token: ${{ (github.repository == 'ruby/ruby' && !startsWith(github.event_name, 'pull')) && secrets.MATZBOT_AUTO_UPDATE_TOKEN || secrets.GITHUB_TOKEN }}
 
       - uses: ./.github/actions/setup/directories
         with:
           makeup: true
+          # Skip overwriting MATZBOT_AUTO_UPDATE_TOKEN
+          checkout: '' # false (ref: https://github.com/actions/runner/issues/2238)
 
-      - name: Check if C-sources are US-ASCII
+      # Run this step first to make sure auto-style commits are pushed
+      - name: ${{ github.ref == 'refs/heads/master' && 'Auto-correct' || 'Check for' }} code styles
         run: |
-          grep -r -n '[^	 -~]' -- *.[chy] include internal win32/*.[ch] && exit 1 || :
+          set -x
+          ruby tool/auto-style.rb "$GITHUB_OLD_SHA" "$GITHUB_NEW_SHA" "$PUSH_REF"
+        env:
+          EMAIL: svn-admin@ruby-lang.org
+          GIT_AUTHOR_NAME: git
+          GIT_COMMITTER_NAME: git
+          GITHUB_OLD_SHA: ${{ github.event.pull_request.base.sha }}
+          GITHUB_NEW_SHA: ${{ github.event.pull_request.merge_commit_sha }}
+          PUSH_REF: ${{ github.ref == 'refs/heads/master' && github.ref || '' }}
+        if: ${{ github.repository == 'ruby/ruby' && startsWith(github.event_name, 'pull') }}
 
-      - name: Check for trailing spaces
+      - name: Check if C-sources are US-ASCII
         run: |
-          git grep -I -n '[	 ]$' -- '*.rb' '*.[chy]' '*.rs' && exit 1 || :
-          git grep -n '^[	 ][	 ]*$' -- '*.md' && exit 1 || :
+          grep -r -n --include='*.[chyS]' --include='*.asm' $'[^\t-~]' -- . && exit 1 || :
 
       - name: Check for bash specific substitution in configure.ac
         run: |
@@ -46,61 +61,30 @@ jobs:
           exit $fail
         working-directory: include
 
-      - id: gems
-        run: true
-        if: ${{ github.ref == 'refs/heads/master' }}
-
-      - name: Download previous gems list
-        run: |
-          data=default_gems.json
-          mkdir -p .downloaded-cache
-          ln -s .downloaded-cache/$data .
-          curl -O -R -z ./$data https://stdgems.org/$data
-        if: ${{ steps.gems.outcome == 'success' }}
-
-      - name: Make default gems list
+      - name: Generate docs
+        id: docs
         run: |
-          #!ruby
-          require 'rubygems'
-          $:.unshift "lib"
-          rgver = File.foreach("lib/rubygems.rb") do |line|
-            break $1 if /^\s*VERSION\s*=\s*"([^"]+)"/ =~ line
-          end
-          gems = Dir.glob("{ext,lib}/**/*.gemspec").map do |f|
-            spec = Gem::Specification.load(f)
-            "#{spec.name} #{spec.version}"
-          end.sort
-          File.open("gems/default_gems", "w") do |f|
-            f.puts "RubyGems #{rgver}"
-            f.puts gems
-          end
-        shell: ruby --disable=gems {0}
-        if: ${{ steps.gems.outcome == 'success' }}
-
-      - name: Maintain updated gems list in NEWS
-        run: |
-          ruby tool/update-NEWS-gemlist.rb default
-        if: ${{ steps.gems.outcome == 'success' }}
-
-      - name: Check diffs
-        id: diff
-        run: |
-          git diff --color --no-ext-diff --ignore-submodules --exit-code NEWS.md
-        continue-on-error: true
-        if: ${{ steps.gems.outcome == 'success' }}
-
-      - name: Commit
-        run: |
-          git pull --ff-only origin ${GITHUB_REF#refs/heads/}
-          git commit --message="Update default gems list at ${GITHUB_SHA:0:30} [ci skip]" NEWS.md
-          git push origin ${GITHUB_REF#refs/heads/}
-        env:
-          EMAIL: svn-admin@ruby-lang.org
-          GIT_AUTHOR_NAME: git
-          GIT_COMMITTER_NAME: git
-        if: ${{ github.repository == 'ruby/ruby' && !startsWith(github.event_name, 'pull') && steps.diff.outcome == 'failure' }}
+          ruby -W0 --disable-gems -I./lib tool/rdoc-srcdir -q --op html .
+          echo htmlout=ruby-html-${GITHUB_SHA:0:10} >> $GITHUB_OUTPUT
+        # Generate only when document commit/PR
+        if: >-
+          ${{false
+          || contains(github.event.head_commit.message, '[ruby/rdoc]')
+          || contains(github.event.head_commit.message, '[DOC]')
+          || contains(github.event.head_commit.message, 'Document')
+          || contains(github.event.pull_request.title, '[DOC]')
+          || contains(github.event.pull_request.title, 'Document')
+          || contains(github.event.pull_request.labels.*.name, 'Documentation')
+          }}
+
+      - name: Upload docs
+        uses: actions/upload-artifact@v4
+        with:
+          path: html
+          name: ${{ steps.docs.outputs.htmlout }}
+        if: ${{ steps.docs.outcome == 'success' }}
 
       - uses: ./.github/actions/slack
         with:
           SLACK_WEBHOOK_URL: ${{ secrets.SIMPLER_ALERTS_URL }} # ruby-lang slack: ruby/simpler-alerts-bot
-        if: ${{ failure() && github.event_name == 'push' }}
+        if: ${{ failure() }}
diff --git a/.github/workflows/cirrus-notify.yml b/.github/workflows/cirrus-notify.yml
deleted file mode 100644
index 295562ac638173..00000000000000
--- a/.github/workflows/cirrus-notify.yml
+++ /dev/null
@@ -1,52 +0,0 @@
-on:
-  check_suite:
-    types: ['completed']
-name: Cirrus CI failure notification
-
-permissions:
-  contents: read
-
-jobs:
-  cirrus-notify:
-    name: After Cirrus CI Failure
-    if: >-
-      github.event.check_suite.app.name == 'Cirrus CI'
-      && github.event.check_suite.conclusion != 'success'
-      && github.event.check_suite.conclusion != 'cancelled'
-      && github.event.check_suite.conclusion != 'neutral'
-      && github.event.check_suite.conclusion != 'skipped'
-      && github.event.check_suite.head_branch == 'master'
-
-    runs-on: ubuntu-latest
-
-    steps:
-      - uses: octokit/request-action@89697eb6635e52c6e1e5559f15b5c91ba5100cb0 # v2.1.9
-        id: get_failed_check_run
-        with:
-          route: GET /repos/${{ github.repository }}/check-suites/${{ github.event.check_suite.id }}/check-runs?status=completed
-          mediaType: '{"previews": ["antiope"]}'
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Dump GitHub context
-        env:
-          GITHUB_CONTEXT: ${{ toJson(github) }}
-        run: echo "$GITHUB_CONTEXT"
-
-      - name: Dump check_runs
-        env:
-          CHECK_RUNS: ${{ steps.get_failed_check_run.outputs.data }}
-        run: echo "$CHECK_RUNS"
-
-      - uses: ruby/action-slack@0bd85c72233cdbb6a0fe01d37aaeff1d21b5fce1 # v3.2.1
-        with:
-          payload: |
-            {
-              "ci": "Cirrus CI",
-              "env": "Cirrus CI",
-              "url": "${{ fromJson(steps.get_failed_check_run.outputs.data).check_runs[0].html_url }}",
-              "commit": "${{ github.event.check_suite.head_commit.id }}",
-              "branch": "${{ github.event.check_suite.head_branch }}"
-            }
-        env:
-          SLACK_WEBHOOK_URL: ${{ secrets.SIMPLER_ALERTS_URL }} # ruby-lang slack: ruby/simpler-alerts-bot
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index dcf3ee87062c54..0dfae7f045220b 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -5,17 +5,19 @@ on:
     branches: ['master']
     paths-ignore:
       - 'doc/**'
-      - '**/man'
+      - '**/man/*'
       - '**.md'
       - '**.rdoc'
       - '**/.document'
+      - '.*.yml'
   pull_request:
     paths-ignore:
       - 'doc/**'
-      - '**/man'
+      - '**/man/*'
       - '**.md'
       - '**.rdoc'
       - '**/.document'
+      - '.*.yml'
   schedule:
     - cron: '0 12 * * *'
   workflow_dispatch:
@@ -39,9 +41,11 @@ jobs:
     if: >-
       ${{!(false
       || contains(github.event.head_commit.message, '[DOC]')
+      || contains(github.event.head_commit.message, 'Document')
       || contains(github.event.pull_request.title, '[DOC]')
+      || contains(github.event.pull_request.title, 'Document')
       || contains(github.event.pull_request.labels.*.name, 'Documentation')
-      || (github.event_name == 'push' && github.actor == 'dependabot[bot]')
+      || (github.event_name == 'push' && github.event.pull_request.user.login == 'dependabot[bot]')
       )}}
 
     env:
@@ -50,38 +54,47 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        language: ['cpp', 'ruby']
+        include:
+          - language: cpp
+          - language: ruby
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
 
       - name: Install libraries
+        if: ${{ contains(matrix.os, 'macos') }}
+        uses: ./.github/actions/setup/macos
+
+      - name: Install libraries
+        if : ${{ matrix.os == 'ubuntu-latest' }}
         uses: ./.github/actions/setup/ubuntu
 
       - uses: ./.github/actions/setup/directories
 
       - name: Remove an obsolete rubygems vendored file
+        if: ${{ matrix.os == 'ubuntu-latest' }}
         run: sudo rm /usr/lib/ruby/vendor_ruby/rubygems/defaults/operating_system.rb
 
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@cdcdbb579706841c47f7063dda365e292e5cad7a # v2.13.4
+        uses: github/codeql-action/init@df409f7d9260372bd5f19e5b04e83cb3c43714ae # v3.27.9
         with:
           languages: ${{ matrix.language }}
+          trap-caching: false
+          debug: true
 
       - name: Autobuild
-        uses: github/codeql-action/autobuild@cdcdbb579706841c47f7063dda365e292e5cad7a # v2.13.4
+        uses: github/codeql-action/autobuild@df409f7d9260372bd5f19e5b04e83cb3c43714ae # v3.27.9
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@cdcdbb579706841c47f7063dda365e292e5cad7a # v2.13.4
+        uses: github/codeql-action/analyze@df409f7d9260372bd5f19e5b04e83cb3c43714ae # v3.27.9
         with:
           category: '/language:${{ matrix.language }}'
           upload: False
           output: sarif-results
-          ram: 8192
 
       - name: filter-sarif
-        uses: advanced-security/filter-sarif@f3b8118a9349d88f7b1c0c488476411145b6270d # v1.0
+        uses: advanced-security/filter-sarif@f3b8118a9349d88f7b1c0c488476411145b6270d # v1.0.1
         with:
           patterns: |
             +**/*.rb
@@ -101,8 +114,10 @@ jobs:
           input: sarif-results/${{ matrix.language }}.sarif
           output: sarif-results/${{ matrix.language }}.sarif
         if: ${{ matrix.language == 'ruby' }}
+        continue-on-error: true
 
       - name: Upload SARIF
-        uses: github/codeql-action/upload-sarif@cdcdbb579706841c47f7063dda365e292e5cad7a # v2.13.4
+        uses: github/codeql-action/upload-sarif@df409f7d9260372bd5f19e5b04e83cb3c43714ae # v3.27.9
         with:
           sarif_file: sarif-results/${{ matrix.language }}.sarif
+        continue-on-error: true
diff --git a/.github/workflows/compilers.yml b/.github/workflows/compilers.yml
index f39d3090cc22bc..d0be762ceeb7c2 100644
--- a/.github/workflows/compilers.yml
+++ b/.github/workflows/compilers.yml
@@ -1,292 +1,337 @@
+# Some tests depending on this name 'Compilations' via $GITHUB_WORKFLOW. Make sure to update such tests when renaming this workflow.
 name: Compilations
 
 on:
   push:
     paths-ignore:
       - 'doc/**'
-      - '**/man'
+      - '**/man/*'
       - '**.md'
       - '**.rdoc'
       - '**/.document'
+      - '.*.yml'
   pull_request:
     paths-ignore:
       - 'doc/**'
-      - '**/man'
+      - '**/man/*'
       - '**.md'
       - '**.rdoc'
       - '**/.document'
+      - '.*.yml'
   merge_group:
-    paths-ignore:
-      - 'doc/**'
-      - '**/man'
-      - '**.md'
-      - '**.rdoc'
-      - '**/.document'
 
 concurrency:
   group: ${{ github.workflow }} / ${{ startsWith(github.event_name, 'pull') && github.ref_name || github.sha }}
   cancel-in-progress: ${{ startsWith(github.event_name, 'pull') }}
 
-# GitHub actions does not support YAML anchors.  This creative use of
-# environment variables (plus the "echo $GITHUB_ENV" hack) is to reroute that
-# restriction.
-env:
-  default_cc: clang-17
-  append_cc: ''
-
-  # -O1 is faster than -O3 in our tests... Majority of time are consumed trying
-  # to optimize binaries.  Also GitHub Actions run on relatively modern CPUs
-  # compared to, say, GCC 4 or Clang 3.  We don't specify `-march=native`
-  # because compilers tend not understand what the CPU is.
-  optflags: '-O1'
-
-  # -g0 disables backtraces when SEGV.  Do not set that.
-  debugflags: '-ggdb3'
-
-  default_configure: >-
-    --enable-debug-env
-    --disable-install-doc
-    --with-ext=-test-/cxxanyargs,+
-  append_configure: >-
-    --without-valgrind
-    --without-jemalloc
-    --without-gmp
-
-  CONFIGURE_TTY: never
-  GITPULLOPTIONS: --no-tags origin ${{ github.ref }}
-  RUBY_DEBUG: ci rgengc
-  RUBY_TESTOPTS: >-
-    -q
-    --color=always
-    --tty=no
-
 permissions:
   contents: read
 
+# Each job is split so that they roughly take 30min to run through.
 jobs:
-  compile:
-    strategy:
-      fail-fast: false
-      matrix:
-        env:
-          - {}
-        entry:
-          - { name: gcc-13,    env: { default_cc: gcc-13 } }
-          - { name: gcc-12,    env: { default_cc: gcc-12 } }
-          - { name: gcc-11,    env: { default_cc: gcc-11 } }
-          - { name: gcc-10,    env: { default_cc: gcc-10 } }
-          - { name: gcc-9,     env: { default_cc: gcc-9 } }
-          - { name: gcc-8,     env: { default_cc: gcc-8 } }
-          - { name: gcc-7,     env: { default_cc: gcc-7 } }
-          - name: 'gcc-13 LTO'
-            container: gcc-13
-            env:
-              default_cc: 'gcc-13 -flto=auto -ffat-lto-objects -Werror=lto-type-mismatch'
-              optflags: '-O2'
-            shared: disable
-            # check: true
-          - { name: clang-18,  env: { default_cc: clang-18 } }
-          - { name: clang-17,  env: { default_cc: clang-17 } }
-          - { name: clang-16,  env: { default_cc: clang-16 } }
-          - { name: clang-15,  env: { default_cc: clang-15 } }
-          - { name: clang-14,  env: { default_cc: clang-14 } }
-          - { name: clang-13,  env: { default_cc: clang-13 } }
-          - { name: clang-12,  env: { default_cc: clang-12 } }
-          - { name: clang-11,  env: { default_cc: clang-11 } }
-          - { name: clang-10,  env: { default_cc: clang-10 } }
-          # llvm-objcopy<=9 doesn't have --wildcard. It compiles, but leaves Rust symbols in libyjit.o.
-          - { name: clang-9,   env: { default_cc: clang-9,   append_configure: '--disable-yjit' } }
-          - { name: clang-8,   env: { default_cc: clang-8,   append_configure: '--disable-yjit' } }
-          - { name: clang-7,   env: { default_cc: clang-7,   append_configure: '--disable-yjit' } }
-          - { name: clang-6.0, env: { default_cc: clang-6.0, append_configure: '--disable-yjit' } }
-          - name: 'clang-16 LTO'
-            container: clang-16
-            env:
-              default_cc: 'clang-16 -flto=auto'
-              optflags: '-O2'
-            shared: disable
-            # check: true
-
-          - { name: ext/Setup }
-
-#         - { name: aarch64-linux-gnu,     crosshost: aarch64-linux-gnu, container: crossbuild-essential-arm64 }
-#         - { name: arm-linux-gnueabi,     crosshost: arm-linux-gnueabi }
-#         - { name: arm-linux-gnueabihf,   crosshost: arm-linux-gnueabihf }
-#         - { name: i686-w64-mingw32,      crosshost: i686-w64-mingw32 }
-#         - { name: powerpc-linux-gnu,     crosshost: powerpc-linux-gnu }
-#         - { name: powerpc64le-linux-gnu, crosshost: powerpc64le-linux-gnu, container: crossbuild-essential-ppc64el }
-#         - { name: s390x-linux-gnu,       crosshost: s390x-linux-gnu, container: crossbuild-essential-s390x }
-#         - { name: x86_64-w64-mingw32,    crosshost: x86_64-w64-mingw32, container: mingw-w64 }
-
-          # -Wno-strict-prototypes is necessary with current clang-15 since
-          # older autoconf generate functions without prototype and -pedantic
-          # now implies strict-prototypes. Disabling the error but leaving the
-          # warning generates a lot of noise from use of ANYARGS in
-          # rb_define_method() and friends.
-          # See: https://github.com/llvm/llvm-project/commit/11da1b53d8cd3507959022cd790d5a7ad4573d94
-          - { name: c99,   env: { CFLAGS:   '-std=c99   -Werror=pedantic -pedantic-errors -Wno-strict-prototypes' } }
-#         - { name: c11,   env: { CFLAGS:   '-std=c11   -Werror=pedantic -pedantic-errors -Wno-strict-prototypes' } }
-#         - { name: c17,   env: { CFLAGS:   '-std=c17   -Werror=pedantic -pedantic-errors -Wno-strict-prototypes' } }
-          - { name: c23,   env: { CFLAGS:   '-std=c2x   -Werror=pedantic -pedantic-errors -Wno-strict-prototypes' } }
-          - { name: c++98, env: { CXXFLAGS: '-std=c++98 -Werror=pedantic -pedantic-errors -Wno-c++11-long-long' } }
-#         - { name: c++11, env: { CXXFLAGS: '-std=c++11 -Werror=pedantic -pedantic-errors -Wno-c++11-long-long' } }
-#         - { name: c++14, env: { CXXFLAGS: '-std=c++14 -Werror=pedantic -pedantic-errors -Wno-c++11-long-long' } }
-#         - { name: c++17, env: { CXXFLAGS: '-std=c++17 -Werror=pedantic -pedantic-errors -Wno-c++11-long-long' } }
-#         - { name: c++20, env: { CXXFLAGS: '-std=c++20 -Werror=pedantic -pedantic-errors -Wno-c++11-long-long' } }
-#         - { name: c++23, env: { CXXFLAGS: '-std=c++23 -Werror=pedantic -pedantic-errors -Wno-c++11-long-long' } }
-          - { name: c++26, env: { CXXFLAGS: '-std=c++26 -Werror=pedantic -pedantic-errors -Wno-c++11-long-long' } }
-
-          - { name: '-O0', env: { optflags: '-O0 -march=x86-64 -mtune=generic' } }
-#         - { name: '-O3', env: { optflags: '-O3 -march=x86-64 -mtune=generic' }, check: true }
-
-          - { name: gmp,                  env: { append_configure: '--with-gmp' } }
-          - { name: jemalloc,             env: { append_configure: '--with-jemalloc' } }
-          - { name: valgrind,             env: { append_configure: '--with-valgrind' } }
-          - { name: 'coroutine=ucontext', env: { append_configure: '--with-coroutine=ucontext' } }
-          - { name: 'coroutine=pthread',  env: { append_configure: '--with-coroutine=pthread' } }
-          - { name: disable-jit-support,  env: { append_configure: '--disable-jit-support' } }
-          - { name: disable-dln,          env: { append_configure: '--disable-dln' } }
-          - { name: enable-mkmf-verbose,  env: { append_configure: '--enable-mkmf-verbose' } }
-          - { name: disable-rubygems,     env: { append_configure: '--disable-rubygems' } }
-          - { name: RUBY_DEVEL,           env: { append_configure: '--enable-devel' } }
-
-          - { name: OPT_THREADED_CODE=1,            env: { cppflags: '-DOPT_THREADED_CODE=1' } }
-          - { name: OPT_THREADED_CODE=2,            env: { cppflags: '-DOPT_THREADED_CODE=2' } }
-          - { name: OPT_THREADED_CODE=3,            env: { cppflags: '-DOPT_THREADED_CODE=3' } }
-
-          - { name: NDEBUG,                         env: { cppflags: '-DNDEBUG' } }
-          - { name: RUBY_DEBUG,                     env: { cppflags: '-DRUBY_DEBUG' } }
-#         - { name: ARRAY_DEBUG,                    env: { cppflags: '-DARRAY_DEBUG' } }
-#         - { name: BIGNUM_DEBUG,                   env: { cppflags: '-DBIGNUM_DEBUG' } }
-#         - { name: CCAN_LIST_DEBUG,                env: { cppflags: '-DCCAN_LIST_DEBUG' } }
-#         - { name: CPDEBUG=-1,                     env: { cppflags: '-DCPDEBUG=-1' } }
-#         - { name: ENC_DEBUG,                      env: { cppflags: '-DENC_DEBUG' } }
-#         - { name: GC_DEBUG,                       env: { cppflags: '-DGC_DEBUG' } }
-#         - { name: HASH_DEBUG,                     env: { cppflags: '-DHASH_DEBUG' } }
-#         - { name: ID_TABLE_DEBUG,                 env: { cppflags: '-DID_TABLE_DEBUG' } }
-#         - { name: RGENGC_DEBUG=-1,                env: { cppflags: '-DRGENGC_DEBUG=-1' } }
-#         - { name: SYMBOL_DEBUG,                   env: { cppflags: '-DSYMBOL_DEBUG' } }
-
-#         - { name: RGENGC_CHECK_MODE,              env: { cppflags: '-DRGENGC_CHECK_MODE' } }
-#         - { name: VM_CHECK_MODE,                  env: { cppflags: '-DVM_CHECK_MODE' } }
-
-#         - { name: USE_EMBED_CI=0,                 env: { cppflags: '-DUSE_EMBED_CI=0' } }
-          - name: USE_FLONUM=0
-            env:
-              cppflags: '-DUSE_FLONUM=0'
-              # yjit requires FLONUM for the pointer tagging scheme
-              append_configure: '--disable-yjit'
-#         - { name: USE_GC_MALLOC_OBJ_INFO_DETAILS, env: { cppflags: '-DUSE_GC_MALLOC_OBJ_INFO_DETAILS' } }
-#         - { name: USE_LAZY_LOAD,                  env: { cppflags: '-DUSE_LAZY_LOAD' } }
-#         - { name: USE_SYMBOL_GC=0,                env: { cppflags: '-DUSE_SYMBOL_GC=0' } }
-#         - { name: USE_THREAD_CACHE=0,             env: { cppflags: '-DUSE_THREAD_CACHE=0' } }
-          - { name: USE_RUBY_DEBUG_LOG=1,           env: { cppflags: '-DUSE_RUBY_DEBUG_LOG=1' } }
-#         - { name: USE_DEBUG_COUNTER,              env: { cppflags: '-DUSE_DEBUG_COUNTER=1', RUBY_DEBUG_COUNTER_DISABLE: '1' } }
-          - { name: SHARABLE_MIDDLE_SUBSTRING,      env: { cppflags: '-DSHARABLE_MIDDLE_SUBSTRING=1' } }
-
-#         - { name: DEBUG_FIND_TIME_NUMGUESS,       env: { cppflags: '-DDEBUG_FIND_TIME_NUMGUESS' } }
-#         - { name: DEBUG_INTEGER_PACK,             env: { cppflags: '-DDEBUG_INTEGER_PACK' } }
-#         - { name: ENABLE_PATH_CHECK,              env: { cppflags: '-DENABLE_PATH_CHECK' } }
-
-#         - { name: GC_DEBUG_STRESS_TO_CLASS,       env: { cppflags: '-DGC_DEBUG_STRESS_TO_CLASS' } }
-#         - { name: GC_ENABLE_LAZY_SWEEP=0,         env: { cppflags: '-DGC_ENABLE_LAZY_SWEEP=0' } }
-#         - { name: GC_PROFILE_DETAIL_MEMOTY,       env: { cppflags: '-DGC_PROFILE_DETAIL_MEMOTY' } }
-#         - { name: GC_PROFILE_MORE_DETAIL,         env: { cppflags: '-DGC_PROFILE_MORE_DETAIL' } }
-
-#         - { name: CALC_EXACT_MALLOC_SIZE,         env: { cppflags: '-DCALC_EXACT_MALLOC_SIZE' } }
-#         - { name: MALLOC_ALLOCATED_SIZE_CHECK,    env: { cppflags: '-DMALLOC_ALLOCATED_SIZE_CHECK' } }
-
-#         - { name: IBF_ISEQ_ENABLE_LOCAL_BUFFER,   env: { cppflags: '-DIBF_ISEQ_ENABLE_LOCAL_BUFFER' } }
-
-#         - { name: RGENGC_ESTIMATE_OLDMALLOC,      env: { cppflags: '-DRGENGC_ESTIMATE_OLDMALLOC' } }
-#         - { name: RGENGC_FORCE_MAJOR_GC,          env: { cppflags: '-DRGENGC_FORCE_MAJOR_GC' } }
-#         - { name: RGENGC_OBJ_INFO,                env: { cppflags: '-DRGENGC_OBJ_INFO' } }
-#         - { name: RGENGC_PROFILE,                 env: { cppflags: '-DRGENGC_PROFILE' } }
-
-#         - { name: VM_DEBUG_BP_CHECK,              env: { cppflags: '-DVM_DEBUG_BP_CHECK' } }
-#         - { name: VM_DEBUG_VERIFY_METHOD_CACHE,   env: { cppflags: '-DVM_DEBUG_VERIFY_METHOD_CACHE' } }
-
-          - { name: enable-yjit,                    env: { append_configure: '--enable-yjit --disable-rjit' } }
-          - { name: enable-rjit,                    env: { append_configure: '--enable-rjit --disable-yjit' } }
-          - { name: YJIT_FORCE_ENABLE,              env: { cppflags: '-DYJIT_FORCE_ENABLE' } }
-#         - { name: RJIT_FORCE_ENABLE,              env: { cppflags: '-DRJIT_FORCE_ENABLE' } }
-          - { name: UNIVERSAL_PARSER,               env: { cppflags: '-DUNIVERSAL_PARSER' } }
-
-    name: ${{ matrix.entry.name }}
-
+  compile-if:
+    name: 'omnibus compilations, trigger'
     runs-on: ubuntu-latest
-
-    container:
-      image: ghcr.io/ruby/ruby-ci-image:${{ matrix.entry.container || matrix.entry.env.default_cc || 'clang-17' }}
-      options: --user root
-
     if: >-
       ${{!(false
       || contains(github.event.head_commit.message, '[DOC]')
+      || contains(github.event.head_commit.message, 'Document')
       || contains(github.event.pull_request.title, '[DOC]')
+      || contains(github.event.pull_request.title, 'Document')
       || contains(github.event.pull_request.labels.*.name, 'Documentation')
-      || (github.event_name == 'push' && github.actor == 'dependabot[bot]')
+      || (github.event_name == 'push' && github.event.pull_request.user.login == 'dependabot[bot]')
       )}}
-
-    env: ${{ matrix.entry.env || matrix.env }}
-
     steps:
-      - run: id
+      - run: true
         working-directory:
 
-      - uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0
+  compile1:
+    name: 'omnibus compilations, #1'
+    runs-on: ubuntu-latest
+    needs: compile-if
+    if: ${{ needs.compile-if.result == 'success' }}
+    timeout-minutes: 60
+    services: { docuum: { image: 'stephanmisc/docuum', options: '--init', volumes: [ '/root', '/var/run/docker.sock:/var/run/docker.sock' ] } }
+    steps:
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+        with: { sparse-checkout-cone-mode: false, sparse-checkout: /.github }
+      # Set fetch-depth: 10 so that Launchable can receive commits information.
+      - { uses: './.github/actions/setup/directories', with: { srcdir: 'src', builddir: 'build', makeup: true, fetch-depth: 10 } }
+      - name: 'clang 18 LTO'
+        uses: './.github/actions/compilers'
         with:
-          sparse-checkout-cone-mode: false
-          sparse-checkout: /.github
-
-      - uses: ./.github/actions/setup/directories
+          tag: clang-18
+          with_gcc: 'clang-18 -flto=auto'
+          optflags: '-O2'
+          enable_shared: false
+      - { uses: './.github/actions/compilers', name: '-O0', with: { optflags: '-O0 -march=x86-64 -mtune=generic' } }
+      # - { uses: './.github/actions/compilers', name: '-O3', with: { optflags: '-O3 -march=x86-64 -mtune=generic', check: true } }
+
+  compile2:
+    name: 'omnibus compilations, #2'
+    runs-on: ubuntu-latest
+    needs: compile-if
+    if: ${{ needs.compile-if.result == 'success' }}
+    timeout-minutes: 60
+    services: { docuum: { image: 'stephanmisc/docuum', options: '--init', volumes: [ '/root', '/var/run/docker.sock:/var/run/docker.sock' ] } }
+    steps:
+      - 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 } }
+      - name: 'GCC 15 LTO'
+        uses: './.github/actions/compilers'
         with:
-          srcdir: src
-          builddir: build
-          makeup: true
-
-      - name: Run configure
-        run: >
-          ../src/configure -C ${default_configure} ${append_configure}
-          --${{
-            matrix.entry.crosshost && 'host' || 'with-gcc'
-          }}=${{
-            matrix.entry.crosshost || '"${default_cc}${append_cc:+ $append_cc}"'
-          }}
-          --${{ matrix.entry.shared || 'enable' }}-shared
-
-      - name: Add to ext/Setup # statically link just the etc extension
-        run: mkdir ext && echo etc >> ext/Setup
-        if: ${{ matrix.entry.name == 'ext/Setup' }}
-
-      - run: make showflags
-
-      - run: make
-
-      - run: make test
-
-      - run: make install
-        if: ${{ matrix.entry.check }}
-
-      - run: make test-tool
-        if: ${{ matrix.entry.check }}
-
-      - run: make test-all TESTS='-- ruby -ext-'
-        if: ${{ matrix.entry.check }}
-
-      - run: make test-spec
-        env:
-          CHECK_LEAKS: true
-        if: ${{ matrix.entry.check }}
-
-      - run: make test-annocheck
-        if: ${{ matrix.entry.check && endsWith(matrix.entry.name, 'annocheck') }}
-
+          tag: gcc-15
+          with_gcc: 'gcc-15 -flto=auto -ffat-lto-objects -Werror=lto-type-mismatch'
+          optflags: '-O2'
+          enable_shared: false
+      - { uses: './.github/actions/compilers', name: 'ext/Setup', with: { static_exts: 'etc json/* */escape' } }
+      - { uses: './.github/actions/compilers', name: 'GCC 15', with: { tag: 'gcc-15' } }
+      - { uses: './.github/actions/compilers', name: 'GCC 14', with: { tag: 'gcc-14' } }
+      - { uses: './.github/actions/compilers', name: 'GCC 13', with: { tag: 'gcc-13' } }
+      - { uses: './.github/actions/compilers', name: 'GCC 12', with: { tag: 'gcc-12' } }
+      - { uses: './.github/actions/compilers', name: 'GCC 11', with: { tag: 'gcc-11' } }
+      - { uses: './.github/actions/compilers', name: 'GCC 10', with: { tag: 'gcc-10' } }
+      - { uses: './.github/actions/compilers', name: 'GCC 9',  with: { tag: 'gcc-9'  } }
+      - { uses: './.github/actions/compilers', name: 'GCC 8',  with: { tag: 'gcc-8'  } }
+      - { uses: './.github/actions/compilers', name: 'GCC 7',  with: { tag: 'gcc-7'  } }
+
+  compile3:
+    name: 'omnibus compilations, #3'
+    runs-on: ubuntu-latest
+    needs: compile-if
+    if: ${{ needs.compile-if.result == 'success' }}
+    timeout-minutes: 60
+    services: { docuum: { image: 'stephanmisc/docuum', options: '--init', volumes: [ '/root', '/var/run/docker.sock:/var/run/docker.sock' ] } }
+    steps:
+      - 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 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' } }
+      - { uses: './.github/actions/compilers', name: 'clang 18', with: { tag: 'clang-18' } }
+      - { uses: './.github/actions/compilers', name: 'clang 17', with: { tag: 'clang-17' } }
+      - { uses: './.github/actions/compilers', name: 'clang 16', with: { tag: 'clang-16' } }
+      - { uses: './.github/actions/compilers', name: 'clang 15', with: { tag: 'clang-15' } }
+      - { uses: './.github/actions/compilers', name: 'clang 14', with: { tag: 'clang-14' } }
+
+  compile4:
+    name: 'omnibus compilations, #4'
+    runs-on: ubuntu-latest
+    needs: compile-if
+    if: ${{ needs.compile-if.result == 'success' }}
+    timeout-minutes: 60
+    services: { docuum: { image: 'stephanmisc/docuum', options: '--init', volumes: [ '/root', '/var/run/docker.sock:/var/run/docker.sock' ] } }
+    steps:
+      - 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 13', with: { tag: 'clang-13' } }
+      - { uses: './.github/actions/compilers', name: 'clang 12', with: { tag: 'clang-12' } }
+      - { uses: './.github/actions/compilers', name: 'clang 11', with: { tag: 'clang-11' } }
+      - { uses: './.github/actions/compilers', name: 'clang 10', with: { tag: 'clang-10' } }
+        # llvm-objcopy<=9 doesn't have --wildcard. It compiles, but leaves Rust symbols in libyjit.o.
+      - { uses: './.github/actions/compilers', name: 'clang 9',  with: { tag: 'clang-9',   append_configure: '--disable-yjit' } }
+      - { uses: './.github/actions/compilers', name: 'clang 8',  with: { tag: 'clang-8',   append_configure: '--disable-yjit' } }
+      - { uses: './.github/actions/compilers', name: 'clang 7',  with: { tag: 'clang-7',   append_configure: '--disable-yjit' } }
+      - { uses: './.github/actions/compilers', name: 'clang 6',  with: { tag: 'clang-6.0', append_configure: '--disable-yjit' } }
+
+  compile5:
+    name: 'omnibus compilations, #5'
+    runs-on: ubuntu-latest
+    needs: compile-if
+    if: ${{ needs.compile-if.result == 'success' }}
+    timeout-minutes: 60
+    services: { docuum: { image: 'stephanmisc/docuum', options: '--init', volumes: [ '/root', '/var/run/docker.sock:/var/run/docker.sock' ] } }
+    steps:
+      - 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 } }
+      # -Wno-strict-prototypes is necessary with current clang-15 since
+      # older autoconf generate functions without prototype and -pedantic
+      # now implies strict-prototypes. Disabling the error but leaving the
+      # warning generates a lot of noise from use of ANYARGS in
+      # rb_define_method() and friends.
+      # See: https://github.com/llvm/llvm-project/commit/11da1b53d8cd3507959022cd790d5a7ad4573d94
+      - { uses: './.github/actions/compilers', name: 'C99',      with: { CFLAGS: '-std=c99 -Werror=pedantic -pedantic-errors -Wno-strict-prototypes' } }
+      - { uses: './.github/actions/compilers', name: 'C11',   with: { CFLAGS:   '-std=c11   -Werror=pedantic -pedantic-errors -Wno-strict-prototypes' } }
+      - { uses: './.github/actions/compilers', name: 'C17',   with: { CFLAGS:   '-std=c17   -Werror=pedantic -pedantic-errors -Wno-strict-prototypes' } }
+      - { uses: './.github/actions/compilers', name: 'C23',   with: { CFLAGS:   '-std=c2x   -Werror=pedantic -pedantic-errors -Wno-strict-prototypes' } }
+      - { uses: './.github/actions/compilers', name: 'C++98', with: { CXXFLAGS: '-std=c++98 -Werror=pedantic -pedantic-errors -Wno-c++11-long-long' } }
+      - { uses: './.github/actions/compilers', name: 'C++11', with: { CXXFLAGS: '-std=c++11 -Werror=pedantic -pedantic-errors -Wno-c++11-long-long' } }
+      - { uses: './.github/actions/compilers', name: 'C++14', with: { CXXFLAGS: '-std=c++14 -Werror=pedantic -pedantic-errors -Wno-c++11-long-long' } }
+      - { uses: './.github/actions/compilers', name: 'C++17', with: { CXXFLAGS: '-std=c++17 -Werror=pedantic -pedantic-errors -Wno-c++11-long-long' } }
+
+  compile6:
+    name: 'omnibus compilations, #6'
+    runs-on: ubuntu-latest
+    needs: compile-if
+    if: ${{ needs.compile-if.result == 'success' }}
+    timeout-minutes: 60
+    services: { docuum: { image: 'stephanmisc/docuum', options: '--init', volumes: [ '/root', '/var/run/docker.sock:/var/run/docker.sock' ] } }
+    steps:
+      - 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: 'C++20', with: { CXXFLAGS: '-std=c++20 -Werror=pedantic -pedantic-errors -Wno-c++11-long-long' } }
+      - { uses: './.github/actions/compilers', name: 'C++23', with: { CXXFLAGS: '-std=c++23 -Werror=pedantic -pedantic-errors -Wno-c++11-long-long' } }
+      - { uses: './.github/actions/compilers', name: 'C++26', with: { CXXFLAGS: '-std=c++26 -Werror=pedantic -pedantic-errors -Wno-c++11-long-long' } }
+      - { uses: './.github/actions/compilers', name: 'gmp',                 with: { append_configure: '--with-gmp', check: 'ruby/test_bignum.rb', mspecopt: "/github/workspace/src/spec/ruby/core/integer" } }
+      - { uses: './.github/actions/compilers', name: 'jemalloc',            with: { append_configure: '--with-jemalloc' } }
+      - { uses: './.github/actions/compilers', name: 'valgrind',            with: { append_configure: '--with-valgrind' } }
+      - { uses: './.github/actions/compilers', name: 'coroutine=ucontext',  with: { append_configure: '--with-coroutine=ucontext' } }
+      - { uses: './.github/actions/compilers', name: 'coroutine=pthread',   with: { append_configure: '--with-coroutine=pthread' } }
+
+  compile7:
+    name: 'omnibus compilations, #7'
+    runs-on: ubuntu-latest
+    needs: compile-if
+    if: ${{ needs.compile-if.result == 'success' }}
+    timeout-minutes: 60
+    services: { docuum: { image: 'stephanmisc/docuum', options: '--init', volumes: [ '/root', '/var/run/docker.sock:/var/run/docker.sock' ] } }
+    steps:
+      - 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: 'disable-jit',         with: { append_configure: '--disable-yjit --disable-zjit' } }
+      - { uses: './.github/actions/compilers', name: 'disable-yjit',        with: { append_configure: '--disable-yjit' } }
+      - { uses: './.github/actions/compilers', name: 'disable-zjit',        with: { append_configure: '--disable-zjit' } }
+      - { uses: './.github/actions/compilers', name: 'disable-dln',         with: { append_configure: '--disable-dln' } }
+      - { uses: './.github/actions/compilers', name: 'enable-mkmf-verbose', with: { append_configure: '--enable-mkmf-verbose' } }
+      - { uses: './.github/actions/compilers', name: 'disable-rubygems',    with: { append_configure: '--disable-rubygems' } }
+      - { uses: './.github/actions/compilers', name: 'RUBY_DEVEL',          with: { append_configure: '--enable-devel' } }
+      - { uses: './.github/actions/compilers', name: 'OPT_THREADED_CODE=0',            with: { cppflags: '-DOPT_THREADED_CODE=0' } }
+      - { uses: './.github/actions/compilers', name: 'OPT_THREADED_CODE=1',            with: { cppflags: '-DOPT_THREADED_CODE=1' } }
+      - { uses: './.github/actions/compilers', name: 'OPT_THREADED_CODE=2',            with: { cppflags: '-DOPT_THREADED_CODE=2' } }
+
+  compile8:
+    name: 'omnibus compilations, #8'
+    runs-on: ubuntu-latest
+    needs: compile-if
+    if: ${{ needs.compile-if.result == 'success' }}
+    timeout-minutes: 60
+    services: { docuum: { image: 'stephanmisc/docuum', options: '--init', volumes: [ '/root', '/var/run/docker.sock:/var/run/docker.sock' ] } }
+    steps:
+      - 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: 'NDEBUG',                         with: { cppflags: '-DNDEBUG' } }
+      - { uses: './.github/actions/compilers', name: 'RUBY_DEBUG',                     with: { cppflags: '-DRUBY_DEBUG' } }
+      - { uses: './.github/actions/compilers', name: 'ARRAY_DEBUG',                    with: { cppflags: '-DARRAY_DEBUG' } }
+      - { uses: './.github/actions/compilers', name: 'BIGNUM_DEBUG',                   with: { cppflags: '-DBIGNUM_DEBUG' } }
+      - { uses: './.github/actions/compilers', name: 'CCAN_LIST_DEBUG',                with: { cppflags: '-DCCAN_LIST_DEBUG' } }
+      - { uses: './.github/actions/compilers', name: 'CPDEBUG=-1',                     with: { cppflags: '-DCPDEBUG=-1' } }
+      - { uses: './.github/actions/compilers', name: 'ENC_DEBUG',                      with: { cppflags: '-DENC_DEBUG' } }
+      - { uses: './.github/actions/compilers', name: 'GC_DEBUG',                       with: { cppflags: '-DGC_DEBUG' } }
+
+  compile9:
+    name: 'omnibus compilations, #9'
+    runs-on: ubuntu-latest
+    needs: compile-if
+    if: ${{ needs.compile-if.result == 'success' }}
+    timeout-minutes: 60
+    services: { docuum: { image: 'stephanmisc/docuum', options: '--init', volumes: [ '/root', '/var/run/docker.sock:/var/run/docker.sock' ] } }
+    steps:
+      - 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: 'HASH_DEBUG',                     with: { cppflags: '-DHASH_DEBUG' } }
+      - { uses: './.github/actions/compilers', name: 'ID_TABLE_DEBUG',                 with: { cppflags: '-DID_TABLE_DEBUG' } }
+      - { uses: './.github/actions/compilers', name: 'RGENGC_DEBUG=-1',                with: { cppflags: '-DRGENGC_DEBUG=-1' } }
+      - { uses: './.github/actions/compilers', name: 'SYMBOL_DEBUG',                   with: { cppflags: '-DSYMBOL_DEBUG' } }
+      - { uses: './.github/actions/compilers', name: 'RGENGC_CHECK_MODE',              with: { cppflags: '-DRGENGC_CHECK_MODE' } }
+      - { uses: './.github/actions/compilers', name: 'VM_CHECK_MODE',                  with: { cppflags: '-DVM_CHECK_MODE' } }
+      - { uses: './.github/actions/compilers', name: 'USE_EMBED_CI=0',                 with: { cppflags: '-DUSE_EMBED_CI=0' } }
+      - { uses: './.github/actions/compilers', name: 'USE_FLONUM=0',                   with: { cppflags: '-DUSE_FLONUM=0', append_configure: '--disable-yjit' } }
+
+  compileX:
+    name: 'omnibus compilations, #10'
+    runs-on: ubuntu-latest
+    needs: compile-if
+    if: ${{ needs.compile-if.result == 'success' }}
+    timeout-minutes: 60
+    services: { docuum: { image: 'stephanmisc/docuum', options: '--init', volumes: [ '/root', '/var/run/docker.sock:/var/run/docker.sock' ] } }
+    steps:
+      - 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: 'USE_LAZY_LOAD',                  with: { cppflags: '-DUSE_LAZY_LOAD' } }
+      - { uses: './.github/actions/compilers', name: 'USE_SYMBOL_GC=0',                with: { cppflags: '-DUSE_SYMBOL_GC=0' } }
+      - { uses: './.github/actions/compilers', name: 'USE_THREAD_CACHE=0',             with: { cppflags: '-DUSE_THREAD_CACHE=0' } }
+      - { uses: './.github/actions/compilers', name: 'USE_RUBY_DEBUG_LOG=1',           with: { cppflags: '-DUSE_RUBY_DEBUG_LOG=1' } }
+      - { uses: './.github/actions/compilers', name: 'USE_DEBUG_COUNTER',              with: { cppflags: '-DUSE_DEBUG_COUNTER=1' } }
+      - { uses: './.github/actions/compilers', name: 'SHARABLE_MIDDLE_SUBSTRING',      with: { cppflags: '-DSHARABLE_MIDDLE_SUBSTRING=1' } }
+      - { uses: './.github/actions/compilers', name: 'DEBUG_FIND_TIME_NUMGUESS',       with: { cppflags: '-DDEBUG_FIND_TIME_NUMGUESS' } }
+      - { uses: './.github/actions/compilers', name: 'DEBUG_INTEGER_PACK',             with: { cppflags: '-DDEBUG_INTEGER_PACK' } }
+
+  compileB:
+    name: 'omnibus compilations, #11'
+    runs-on: ubuntu-latest
+    needs: compile-if
+    if: ${{ needs.compile-if.result == 'success' }}
+    timeout-minutes: 60
+    services: { docuum: { image: 'stephanmisc/docuum', options: '--init', volumes: [ '/root', '/var/run/docker.sock:/var/run/docker.sock' ] } }
+    steps:
+      - 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: 'GC_DEBUG_STRESS_TO_CLASS',       with: { cppflags: '-DGC_DEBUG_STRESS_TO_CLASS' } }
+      - { uses: './.github/actions/compilers', name: 'GC_ENABLE_LAZY_SWEEP=0',         with: { cppflags: '-DGC_ENABLE_LAZY_SWEEP=0' } }
+      - { uses: './.github/actions/compilers', name: 'GC_PROFILE_DETAIL_MEMORY',       with: { cppflags: '-DGC_PROFILE_DETAIL_MEMORY' } }
+      - { uses: './.github/actions/compilers', name: 'GC_PROFILE_MORE_DETAIL',         with: { cppflags: '-DGC_PROFILE_MORE_DETAIL' } }
+      - { uses: './.github/actions/compilers', name: 'MALLOC_ALLOCATED_SIZE_CHECK',    with: { cppflags: '-DMALLOC_ALLOCATED_SIZE_CHECK' } }
+      - { uses: './.github/actions/compilers', name: 'RGENGC_ESTIMATE_OLDMALLOC',      with: { cppflags: '-DRGENGC_ESTIMATE_OLDMALLOC' } }
+      - { uses: './.github/actions/compilers', name: 'RGENGC_OBJ_INFO',                with: { cppflags: '-DRGENGC_OBJ_INFO' } }
+      - { uses: './.github/actions/compilers', name: 'RGENGC_PROFILE',                 with: { cppflags: '-DRGENGC_PROFILE' } }
+
+  compileC:
+    name: 'omnibus compilations, #12'
+    runs-on: ubuntu-latest
+    needs: compile-if
+    if: ${{ needs.compile-if.result == 'success' }}
+    timeout-minutes: 60
+    services: { docuum: { image: 'stephanmisc/docuum', options: '--init', volumes: [ '/root', '/var/run/docker.sock:/var/run/docker.sock' ] } }
+    steps:
+      - 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: 'VM_DEBUG_BP_CHECK',              with: { cppflags: '-DVM_DEBUG_BP_CHECK' } }
+      - { uses: './.github/actions/compilers', name: 'VM_DEBUG_VERIFY_METHOD_CACHE',   with: { cppflags: '-DVM_DEBUG_VERIFY_METHOD_CACHE' } }
+      - { uses: './.github/actions/compilers', name: 'enable-yjit',                    with: { append_configure: '--enable-yjit' } }
+      - { uses: './.github/actions/compilers', name: 'enable-{y,z}jit',                with: { append_configure: '--enable-yjit --enable-zjit' } }
+      - { uses: './.github/actions/compilers', name: 'enable-{y,z}jit=dev',            with: { append_configure: '--enable-yjit=dev --enable-zjit' } }
+      - { uses: './.github/actions/compilers', name: 'YJIT_FORCE_ENABLE',              with: { cppflags: '-DYJIT_FORCE_ENABLE' } }
+      - { uses: './.github/actions/compilers', name: 'UNIVERSAL_PARSER',               with: { cppflags: '-DUNIVERSAL_PARSER' } }
+
+  compilemax:
+    name: 'omnibus compilations, result'
+    runs-on: ubuntu-latest
+    if: ${{ always() }}
+    needs:
+      - 'compile1'
+      - 'compile2'
+      - 'compile3'
+      - 'compile4'
+      - 'compile5'
+      - 'compile6'
+      - 'compile7'
+      - 'compile8'
+      - 'compile9'
+      - 'compileX'
+      - 'compileB'
+      - 'compileC'
+    steps:
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+        with: { sparse-checkout-cone-mode: false, sparse-checkout: /.github }
       - uses: ./.github/actions/slack
         with:
-          label: ${{ matrix.entry.name }}
+          label: 'omnibus'
           SLACK_WEBHOOK_URL: ${{ secrets.SIMPLER_ALERTS_URL }} # ruby-lang slack: ruby/simpler-alerts-bot
-        if: ${{ failure() && github.event_name == 'push' }}
+        if: ${{ contains(needs.*.result, 'failure') || contains(needs.*.result, 'cancelled') }}
+      - run: false
+        working-directory:
+        if: ${{ contains(needs.*.result, 'failure') || contains(needs.*.result, 'cancelled') }}
 
 defaults:
   run:
diff --git a/.github/workflows/cygwin.yml b/.github/workflows/cygwin.yml
new file mode 100644
index 00000000000000..d822a2e9e217e3
--- /dev/null
+++ b/.github/workflows/cygwin.yml
@@ -0,0 +1,67 @@
+name: Cygwin
+on:
+  push:
+    paths-ignore:
+      - 'doc/**'
+      - '**/man/*'
+      - '**.md'
+      - '**.rdoc'
+      - '**/.document'
+      - '.*.yml'
+  pull_request:
+    paths-ignore:
+      - 'doc/**'
+      - '**/man/*'
+      - '**.md'
+      - '**.rdoc'
+      - '**/.document'
+      - '.*.yml'
+  merge_group:
+
+concurrency:
+  group: ${{ github.workflow }} / ${{ startsWith(github.event_name, 'pull') && github.ref_name || github.sha }}
+  cancel-in-progress: ${{ startsWith(github.event_name, 'pull') }}
+
+permissions:
+  contents: read
+
+jobs:
+  make:
+    runs-on: windows-2022
+
+    if: >-
+      ${{!(false
+      || contains(github.event.head_commit.message, '[DOC]')
+      || contains(github.event.head_commit.message, 'Document')
+      || contains(github.event.pull_request.title, '[DOC]')
+      || contains(github.event.pull_request.title, 'Document')
+      || contains(github.event.pull_request.labels.*.name, 'Documentation')
+      || (github.event_name == 'push' && github.event.pull_request.user.login == 'dependabot[bot]')
+      )}}
+
+    steps:
+      - run: git config --global core.autocrlf input
+
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+
+      - name: Setup Cygwin
+        uses: cygwin/cygwin-install-action@master
+        with:
+          packages: ruby gcc-core make autoconf libtool libssl-devel libyaml-devel libffi-devel zlib-devel
+
+      - name: configure
+        run: |
+          ./autogen.sh
+          ./configure --disable-install-doc
+        shell: C:\cygwin\bin\bash.EXE --noprofile --norc -e -o igncr -o pipefail {0}
+
+      - name: Extract bundled gems
+        run: |
+          make ruby -j5
+          make extract-gems
+        shell: C:\cygwin\bin\bash.EXE --noprofile --norc -e -o igncr -o pipefail {0}
+
+      - name: make all
+        timeout-minutes: 30
+        run: make -j4 V=1
+        shell: C:\cygwin\bin\bash.EXE --noprofile --norc -e -o igncr -o pipefail {0}
diff --git a/.github/workflows/default_gems.yml b/.github/workflows/default_gems.yml
new file mode 100644
index 00000000000000..cd15e34229e593
--- /dev/null
+++ b/.github/workflows/default_gems.yml
@@ -0,0 +1,96 @@
+name: Update default gems list
+on: [push, pull_request, merge_group]
+
+concurrency:
+  group: ${{ github.workflow }} / ${{ startsWith(github.event_name, 'pull') && github.ref_name || github.sha }}
+  cancel-in-progress: ${{ startsWith(github.event_name, 'pull') }}
+
+permissions:
+  contents: read
+
+jobs:
+  update_default_gems:
+    name: Update default gems list
+
+    permissions:
+      contents: write # for Git to git push
+
+    runs-on: ubuntu-latest
+
+    if: ${{ github.repository == 'ruby/ruby' }}
+
+    steps:
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+        with:
+          token: ${{ (github.repository == 'ruby/ruby' && !startsWith(github.event_name, 'pull')) && secrets.MATZBOT_AUTO_UPDATE_TOKEN || secrets.GITHUB_TOKEN }}
+
+      - id: gems
+        run: true
+        if: ${{ github.ref == 'refs/heads/master' }}
+
+      - uses: ./.github/actions/setup/directories
+        with:
+          makeup: true
+          # Skip overwriting MATZBOT_AUTO_UPDATE_TOKEN
+          checkout: '' # false (ref: https://github.com/actions/runner/issues/2238)
+        if: ${{ steps.gems.outcome == 'success' }}
+
+      - name: Download previous gems list
+        run: |
+          data=default_gems.json
+          mkdir -p .downloaded-cache
+          ln -s .downloaded-cache/$data .
+          curl -O -R -z ./$data https://stdgems.org/$data
+        if: ${{ steps.gems.outcome == 'success' }}
+
+      - name: Make default gems list
+        run: |
+          #!ruby
+          require 'rubygems'
+          $:.unshift "lib"
+          rgver = File.foreach("lib/rubygems.rb") do |line|
+            break $1 if /^\s*VERSION\s*=\s*"([^"]+)"/ =~ line
+          end
+          gems = Dir.glob("{ext,lib}/**/*.gemspec").map do |f|
+            spec = Gem::Specification.load(f)
+            "#{spec.name} #{spec.version}"
+          end.sort
+          File.open("gems/default_gems", "w") do |f|
+            f.puts "RubyGems #{rgver}"
+            f.puts gems
+          end
+        shell: ruby --disable=gems {0}
+        if: ${{ steps.gems.outcome == 'success' }}
+
+      - name: Maintain updated gems list in NEWS
+        run: |
+          ruby tool/update-NEWS-gemlist.rb default
+        if: ${{ steps.gems.outcome == 'success' }}
+
+      - name: Check diffs
+        id: diff
+        run: |
+          git diff --color --no-ext-diff --ignore-submodules --exit-code NEWS.md ||
+          echo update=true >> $GITHUB_OUTPUT
+        if: ${{ steps.gems.outcome == 'success' }}
+
+      - name: Commit
+        run: |
+          git pull --ff-only origin ${GITHUB_REF#refs/heads/}
+          git commit --message="Update default gems list at ${GITHUB_SHA:0:30} [ci skip]" NEWS.md
+          git push origin ${GITHUB_REF#refs/heads/}
+        env:
+          EMAIL: svn-admin@ruby-lang.org
+          GIT_AUTHOR_NAME: git
+          GIT_COMMITTER_NAME: git
+        if: >-
+          ${{
+          github.repository == 'ruby/ruby' &&
+          !startsWith(github.event_name, 'pull') &&
+          steps.diff.outputs.update
+          }}
+
+      - uses: ./.github/actions/slack
+        with:
+          SLACK_WEBHOOK_URL: ${{ secrets.SIMPLER_ALERTS_URL }} # ruby-lang slack: ruby/simpler-alerts-bot
+        if: ${{ failure() }}
diff --git a/.github/workflows/dependabot_automerge.yml b/.github/workflows/dependabot_automerge.yml
index 6259199b113b64..09fdba7b2b66af 100644
--- a/.github/workflows/dependabot_automerge.yml
+++ b/.github/workflows/dependabot_automerge.yml
@@ -1,23 +1,25 @@
 # from https://github.com/gofiber/swagger/blob/main/.github/workflows/dependabot_automerge.yml
 name: Dependabot auto-merge
 on:
-  pull_request_target:
+  pull_request:
+
+permissions:
+  contents: write
+  pull-requests: write
 
 jobs:
   automerge:
     runs-on: ubuntu-latest
-
-    if: ${{ github.actor == 'dependabot[bot]' }}
-
+    if: github.event.pull_request.user.login == 'dependabot[bot]' && github.repository == 'ruby/ruby'
     steps:
       - name: Dependabot metadata
-        uses: dependabot/fetch-metadata@c9c4182bf1b97f5224aee3906fd373f6b61b4526 # v1.6.0
+        uses: dependabot/fetch-metadata@08eff52bf64351f401fb50d4972fa95b9f2c2d1b # v2.4.0
         id: metadata
 
       - name: Wait for status checks
-        uses: lewagon/wait-on-check-action@e106e5c43e8ca1edea6383a39a01c5ca495fd812 # v1.3.1
+        uses: lewagon/wait-on-check-action@ccfb013c15c8afb7bf2b7c028fb74dc5a068cccc # v1.3.4
         with:
-          repo-token: ${{ secrets.MATZBOT_GITHUB_TOKEN }}
+          repo-token: ${{ secrets.GITHUB_TOKEN }}
           ref: ${{ github.event.pull_request.head.sha || github.sha }}
           check-regexp: 'make \(check, .*\)'
           wait-interval: 30
@@ -27,4 +29,4 @@ jobs:
         run: gh pr merge --auto --rebase "$PR_URL"
         env:
           PR_URL: ${{ github.event.pull_request.html_url }}
-          GITHUB_TOKEN: ${{ secrets.MATZBOT_GITHUB_TOKEN }}
+          GITHUB_TOKEN: ${{ secrets.MATZBOT_DEPENDABOT_MERGE_TOKEN }}
diff --git a/.github/workflows/labeler.yml b/.github/workflows/labeler.yml
new file mode 100644
index 00000000000000..e57cd86e2b3c7f
--- /dev/null
+++ b/.github/workflows/labeler.yml
@@ -0,0 +1,12 @@
+name: "Pull Request Labeler"
+on:
+- pull_request_target
+
+jobs:
+  labeler:
+    permissions:
+      contents: read
+      pull-requests: write
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/labeler@v5
diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
index 30c30e46265c4e..bf5f5cd413c112 100644
--- a/.github/workflows/macos.yml
+++ b/.github/workflows/macos.yml
@@ -3,24 +3,15 @@ on:
   push:
     paths-ignore:
       - 'doc/**'
-      - '**/man'
+      - '**/man/*'
       - '**.md'
       - '**.rdoc'
       - '**/.document'
+      - '.*.yml'
   pull_request:
-    paths-ignore:
-      - 'doc/**'
-      - '**/man'
-      - '**.md'
-      - '**.rdoc'
-      - '**/.document'
+    # Do not use paths-ignore for required status checks
+    # https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/collaborating-on-repositories-with-code-quality-features/troubleshooting-required-status-checks#handling-skipped-but-required-checks
   merge_group:
-    paths-ignore:
-      - 'doc/**'
-      - '**/man'
-      - '**.md'
-      - '**.rdoc'
-      - '**/.document'
 
 concurrency:
   group: ${{ github.workflow }} / ${{ startsWith(github.event_name, 'pull') && github.ref_name || github.sha }}
@@ -33,13 +24,29 @@ jobs:
   make:
     strategy:
       matrix:
-        test_task: ['check'] # "test-bundler-parallel", "test-bundled-gems"
-        os:
-          - macos-11
-          - macos-12
-        configure:
-          - ''
-          - '--enable-shared'
+        include:
+          - test_task: check
+            os: macos-14
+          - test_task: check
+            os: macos-14
+            configure_args: '--with-gcc=gcc-14'
+          - test_task: check
+            os: macos-14
+            configure_args: '--with-jemalloc --with-opt-dir=$(brew --prefix jemalloc)'
+          - test_task: check
+            os: macos-14
+            configure_args: '--with-gmp'
+          - test_task: test-all
+            test_opts: --repeat-count=2
+            os: macos-14
+          - test_task: test-bundler-parallel
+            os: macos-14
+          - test_task: test-bundled-gems
+            os: macos-14
+          - test_task: check
+            os: macos-15
+          - test_task: check
+            os: macos-13
       fail-fast: false
 
     env:
@@ -50,13 +57,15 @@ jobs:
     if: >-
       ${{!(false
       || contains(github.event.head_commit.message, '[DOC]')
+      || contains(github.event.head_commit.message, 'Document')
       || contains(github.event.pull_request.title, '[DOC]')
+      || contains(github.event.pull_request.title, 'Document')
       || contains(github.event.pull_request.labels.*.name, 'Documentation')
-      || (github.event_name == 'push' && github.actor == 'dependabot[bot]')
+      || (github.event_name == 'push' && github.event.pull_request.user.login == 'dependabot[bot]')
       )}}
 
     steps:
-      - uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           sparse-checkout-cone-mode: false
           sparse-checkout: /.github
@@ -69,41 +78,120 @@ jobs:
           srcdir: src
           builddir: build
           makeup: true
+          clean: true
+          dummy-files: ${{ matrix.test_task == 'check' }}
+          # Set fetch-depth: 0 so that Launchable can receive commits information.
+          fetch-depth: 10
+
+      - name: make sure that kern.coredump=1
+        run: |
+          sysctl -n kern.coredump
+          sudo sysctl -w kern.coredump=1
+          sudo chmod -R +rwx /cores/
+
+      - name: Delete unused SDKs
+        # To free up disk space to not run out during the run
+        run: |
+          sudo rm -rf ~/.dotnet
+          sudo rm -rf /Library/Android
+          sudo rm -rf /Library/Developer/CoreSimulator
+        continue-on-error: true
 
       - name: Run configure
-        run: ../src/configure -C --disable-install-doc ${{ matrix.configure }}
+        run: ../src/configure -C --disable-install-doc ${ruby_configure_args} ${{ matrix.configure_args }}
 
       - run: make prepare-gems
         if: ${{ matrix.test_task == 'test-bundled-gems' }}
 
       - run: make
 
+      - run: make hello
+
+      - name: runirb
+        run: |
+          echo IRB::VERSION | make runirb RUNOPT="-- -f"
+
+      - name: Set test options for skipped tests
+        run: |
+          set -x
+          TESTS="$(echo "${{ matrix.skipped_tests }}" | sed 's| |$$/ -n!/|g;s|^|-n!/|;s|$|$$/|')"
+          echo "TESTS=${TESTS}" >> $GITHUB_ENV
+        if: ${{ matrix.test_task == 'check' && matrix.skipped_tests }}
+
+      - name: Set up Launchable
+        id: launchable
+        uses: ./.github/actions/launchable/setup
+        with:
+          os: ${{ matrix.os }}
+          test-opts: ${{ matrix.test_opts }}
+          launchable-token: ${{ secrets.LAUNCHABLE_TOKEN }}
+          builddir: build
+          srcdir: src
+        continue-on-error: true
+        timeout-minutes: 3
+
+      - name: Set extra test options
+        run: |
+          echo "TESTS=$TESTS ${{ matrix.test_opts }}" >> $GITHUB_ENV
+          echo "RUBY_TEST_TIMEOUT_SCALE=10" >> $GITHUB_ENV # With --repeat-count=2, flaky test by timeout occurs frequently for some reason
+        if: matrix.test_opts
+
       - name: make ${{ matrix.test_task }}
         run: |
-          make -s ${{ matrix.test_task }} ${TESTS:+TESTS=`echo "$TESTS" | sed 's| |$$/ -n!/|g;s|^|-n!/|;s|$|$$/|'`}
+          test -n "${LAUNCHABLE_STDOUT}" && exec 1> >(tee "${LAUNCHABLE_STDOUT}")
+          test -n "${LAUNCHABLE_STDERR}" && exec 2> >(tee "${LAUNCHABLE_STDERR}")
+
+          ulimit -c unlimited
+          make -s ${{ matrix.test_task }} ${TESTS:+TESTS="$TESTS"}
         timeout-minutes: 60
         env:
           RUBY_TESTOPTS: '-q --tty=no'
-          TESTS: ${{ matrix.test_task == 'check' && matrix.skipped_tests || '' }}
           TEST_BUNDLED_GEMS_ALLOW_FAILURES: ''
           PRECHECK_BUNDLED_GEMS: 'no'
+          LAUNCHABLE_STDOUT: ${{ steps.launchable.outputs.stdout_report_path }}
+          LAUNCHABLE_STDERR: ${{ steps.launchable.outputs.stderr_report_path }}
 
       - name: make skipped tests
         run: |
-          make -s test-all TESTS=`echo "$TESTS" | sed 's| |$$/ -n/|g;s|^|-n/|;s|$|$$/|'`
+          make -s test-all TESTS="${TESTS//-n!\//-n/}"
         env:
           GNUMAKEFLAGS: ''
           RUBY_TESTOPTS: '-v --tty=no'
-          TESTS: ${{ matrix.skipped_tests }}
           PRECHECK_BUNDLED_GEMS: 'no'
-        if: ${{ matrix.test_task == 'check' && matrix.skipped_tests != '' }}
+        if: ${{ matrix.test_task == 'check' && matrix.skipped_tests }}
         continue-on-error: ${{ matrix.continue-on-skipped_tests || false }}
 
       - uses: ./.github/actions/slack
         with:
-          label: ${{ matrix.test_task }}
+          label: ${{ matrix.os }} / ${{ matrix.test_task }}
           SLACK_WEBHOOK_URL: ${{ secrets.SIMPLER_ALERTS_URL }} # ruby-lang slack: ruby/simpler-alerts-bot
-        if: ${{ failure() && github.event_name == 'push' }}
+        if: ${{ failure() }}
+
+      - name: Resolve job ID
+        id: job_id
+        uses: actions/github-script@main
+        env:
+          matrix: ${{ toJson(matrix) }}
+        with:
+          script: |
+            const { data: workflow_run } = await github.rest.actions.listJobsForWorkflowRun({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              run_id: context.runId
+            });
+            const matrix = JSON.parse(process.env.matrix);
+            const job_name = `${context.job}${matrix ? ` (${Object.values(matrix).join(", ")})` : ""}`;
+            return workflow_run.jobs.find((job) => job.name === job_name).id;
+
+  result:
+    if: ${{ always() }}
+    name: ${{ github.workflow }} result
+    runs-on: macos-latest
+    needs: [make]
+    steps:
+      - run: exit 1
+        working-directory:
+        if: ${{ contains(needs.*.result, 'failure') || contains(needs.*.result, 'cancelled') }}
 
 defaults:
   run:
diff --git a/.github/workflows/mingw.yml b/.github/workflows/mingw.yml
index df24ff394e0c51..72656fa7665f5c 100644
--- a/.github/workflows/mingw.yml
+++ b/.github/workflows/mingw.yml
@@ -3,24 +3,20 @@ on:
   push:
     paths-ignore:
       - 'doc/**'
-      - '**/man'
+      - '**/man/*'
       - '**.md'
       - '**.rdoc'
       - '**/.document'
+      - '.*.yml'
   pull_request:
     paths-ignore:
       - 'doc/**'
-      - '**/man'
+      - '**/man/*'
       - '**.md'
       - '**.rdoc'
       - '**/.document'
+      - '.*.yml'
   merge_group:
-    paths-ignore:
-      - 'doc/**'
-      - '**/man'
-      - '**.md'
-      - '**.rdoc'
-      - '**/.document'
 
 concurrency:
   group: ${{ github.workflow }} / ${{ startsWith(github.event_name, 'pull') && github.ref_name || github.sha }}
@@ -52,8 +48,8 @@ jobs:
       matrix:
         include:
           # To mitigate flakiness of MinGW CI, we test only one runtime that newer MSYS2 uses.
+          # Ruby 3.2 is the first Windows Ruby to use OpenSSL 3.x
           - msystem: 'UCRT64'
-            base_ruby: head
             test_task: 'check'
             test-all-opts: '--name=!/TestObjSpace#test_reachable_objects_during_iteration/'
       fail-fast: false
@@ -61,45 +57,43 @@ jobs:
     if: >-
       ${{!(false
       || contains(github.event.head_commit.message, '[DOC]')
+      || contains(github.event.head_commit.message, 'Document')
       || contains(github.event.pull_request.title, '[DOC]')
+      || contains(github.event.pull_request.title, 'Document')
       || contains(github.event.pull_request.labels.*.name, 'Documentation')
-      || (github.event_name == 'push' && github.actor == 'dependabot[bot]')
+      || (github.event_name == 'push' && github.event.pull_request.user.login == 'dependabot[bot]')
       )}}
 
     steps:
       - name: Set up Ruby & MSYS2
-        uses: ruby/setup-ruby@250fcd6a742febb1123a77a841497ccaa8b9e939 # v1.152.0
+        uses: ruby/setup-ruby@d8d83c3960843afb664e821fed6be52f37da5267 # v1.231.0
         with:
-          ruby-version: ${{ matrix.base_ruby }}
+          ruby-version: '3.2'
 
-      - name: where check
+      - name: Misc system & package info
+        working-directory:
         run: |
           # show where
-          mv /c/Windows/System32/libcrypto-1_1-x64.dll /c/Windows/System32/libcrypto-1_1-x64.dll_
-          mv /c/Windows/System32/libssl-1_1-x64.dll    /c/Windows/System32/libssl-1_1-x64.dll_
           result=true
-          for e in gcc.exe ragel.exe make.exe libcrypto-1_1-x64.dll libssl-1_1-x64.dll; do
+          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'
             where $e || result=false
             echo ::endgroup::
           done
-          $result
-        working-directory:
-
-      - name: version check
-        run: |
           # show version
-          result=true
           for e in gcc ragel make "openssl version"; do
             case "$e" in *" "*) ;; *) e="$e --version";; esac
             echo ::group::$'\033[93m'$e$'\033[m'
             $e || result=false
             echo ::endgroup::
           done
+          # show packages
+          echo ::group::$'\033[93m'Packages$'\033[m'
+          pacman -Qs mingw-w64-ucrt-x86_64-* | sed -n "s,local/mingw-w64-ucrt-x86_64-,,p"
+          echo ::endgroup::
           $result
-        working-directory:
 
-      - uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           sparse-checkout-cone-mode: false
           sparse-checkout: /.github
@@ -109,6 +103,8 @@ jobs:
           srcdir: src
           builddir: build
           makeup: true
+          # Set fetch-depth: 10 so that Launchable can receive commits information.
+          fetch-depth: 10
 
       - name: configure
         run: >
@@ -117,14 +113,26 @@ jobs:
 
       - name: make all
         timeout-minutes: 30
-        run: make
+        run: make -j4
 
       - name: make install
         run: make DESTDIR=../install install-nodoc
 
+      - name: Set up Launchable
+        uses: ./.github/actions/launchable/setup
+        with:
+          os: windows-2022
+          launchable-token: ${{ secrets.LAUNCHABLE_TOKEN }}
+          builddir: build
+          srcdir: src
+          test-tasks: '["test", "test-all", "test-spec"]'
+        continue-on-error: true
+        timeout-minutes: 3
+
       - name: test
         timeout-minutes: 30
         run: make test
+        shell: cmd
         env:
           GNUMAKEFLAGS: ''
           RUBY_TESTOPTS: '-v --tty=no'
@@ -132,14 +140,14 @@ jobs:
 
       - name: test-all
         timeout-minutes: 45
+        shell: cmd
         run: |
-          # Actions uses UTF8, causes test failures, similar to normal OS setup
-          chcp.com 437
           make ${{ StartsWith(matrix.test_task, 'test/') && matrix.test_task || 'test-all' }}
         env:
           RUBY_TESTOPTS: >-
-            --retry --job-status=normal --show-skip --timeout-scale=1.5
+            --retry --job-status=normal --show-skip --timeout-scale=1.5 -j4
             ${{ matrix.test-all-opts }}
+            ${{ env.TESTS }}
           BUNDLER_VERSION:
         if: ${{ matrix.test_task == 'check' || matrix.test_task == 'test-all' || StartsWith(matrix.test_task, 'test/') }}
 
@@ -147,13 +155,14 @@ jobs:
         timeout-minutes: 10
         run: |
           make ${{ StartsWith(matrix.test_task, 'spec/') && matrix.test_task || 'test-spec' }}
+        shell: cmd
         if: ${{ matrix.test_task == 'check' || matrix.test_task == 'test-spec' || StartsWith(matrix.test_task, 'spec/') }}
 
       - uses: ./src/.github/actions/slack
         with:
           label: ${{ matrix.msystem }} / ${{ matrix.test_task }}
           SLACK_WEBHOOK_URL: ${{ secrets.SIMPLER_ALERTS_URL }} # ruby-lang slack: ruby/simpler-alerts-bot
-        if: ${{ failure() && github.event_name == 'push' }}
+        if: ${{ failure() }}
 
 defaults:
   run:
diff --git a/.github/workflows/modgc.yml b/.github/workflows/modgc.yml
new file mode 100644
index 00000000000000..815994b395b08e
--- /dev/null
+++ b/.github/workflows/modgc.yml
@@ -0,0 +1,178 @@
+name: ModGC
+on:
+  push:
+    paths-ignore:
+      - 'doc/**'
+      - '**/man/*'
+      - '**.md'
+      - '**.rdoc'
+      - '**/.document'
+      - '.*.yml'
+  pull_request:
+    # Do not use paths-ignore for required status checks
+    # https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/collaborating-on-repositories-with-code-quality-features/troubleshooting-required-status-checks#handling-skipped-but-required-checks
+  merge_group:
+
+concurrency:
+  group: ${{ github.workflow }} / ${{ startsWith(github.event_name, 'pull') && github.ref_name || github.sha }}
+  cancel-in-progress: ${{ startsWith(github.event_name, 'pull') }}
+
+permissions:
+  contents: read
+
+jobs:
+  check:
+    strategy:
+      matrix:
+        gc:
+          - name: default
+          - name: mmtk
+            mmtk_build: release
+        os: [macos-latest, ubuntu-latest]
+        include:
+          - test_task: check
+      fail-fast: false
+
+    env:
+      GITPULLOPTIONS: --no-tags origin ${{ github.ref }}
+      RUBY_DEBUG: ci
+
+    runs-on: ${{ matrix.os }}
+
+    if: >-
+      ${{!(false
+      || contains(github.event.head_commit.message, '[DOC]')
+      || contains(github.event.head_commit.message, 'Document')
+      || contains(github.event.pull_request.title, '[DOC]')
+      || contains(github.event.pull_request.title, 'Document')
+      || contains(github.event.pull_request.labels.*.name, 'Documentation')
+      || (github.event_name == 'push' && github.event.pull_request.user.login == 'dependabot[bot]')
+      )}}
+
+    steps:
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+        with:
+          sparse-checkout-cone-mode: false
+          sparse-checkout: /.github
+
+      - name: Install libraries (macOS)
+        uses: ./.github/actions/setup/macos
+        if: ${{ contains(matrix.os, 'macos') }}
+
+      - name: Install libraries (Ubuntu)
+        uses: ./.github/actions/setup/ubuntu
+        if: ${{ contains(matrix.os, 'ubuntu') }}
+
+      - uses: ruby/setup-ruby@a4effe49ee8ee5b8b5091268c473a4628afb5651 # v1.245.0
+        with:
+          ruby-version: '3.1'
+          bundler: none
+        if: ${{ contains(matrix.os, 'ubuntu') }}
+
+      - uses: ./.github/actions/setup/directories
+        with:
+          srcdir: src
+          builddir: build
+          makeup: true
+          clean: true
+          dummy-files: false
+          # Set fetch-depth: 10 so that Launchable can receive commits information.
+          fetch-depth: 10
+
+      - name: make sure that kern.coredump=1
+        run: |
+          sysctl -n kern.coredump
+          sudo sysctl -w kern.coredump=1
+          sudo chmod -R +rwx /cores/
+        if: ${{ contains(matrix.os, 'macos') }}
+
+      - name: Delete unused SDKs
+        # To free up disk space to not run out during the run
+        run: |
+          sudo rm -rf ~/.dotnet
+          sudo rm -rf /Library/Android
+          sudo rm -rf /Library/Developer/CoreSimulator
+        continue-on-error: true
+        if: ${{ contains(matrix.os, 'macos') }}
+
+      - name: Setup Ruby GC Directory
+        run: |
+          echo "MODULAR_GC_DIR=$HOME/ruby_gc" >> $GITHUB_ENV
+
+      - name: Run configure
+        env:
+          arch: ${{ matrix.arch }}
+        run: >-
+          $SETARCH ../src/configure -C --disable-install-doc --with-modular-gc=${{ env.MODULAR_GC_DIR }}
+          ${arch:+--target=$arch-$OSTYPE --host=$arch-$OSTYPE}
+
+      - uses: actions-rust-lang/setup-rust-toolchain@v1
+      - name: Set MMTk environment variables
+        run: |
+          echo 'EXCLUDES=../src/test/.excludes-mmtk' >> $GITHUB_ENV
+          echo 'MSPECOPT=-B../src/spec/mmtk.mspec' >> $GITHUB_ENV
+        if: ${{ matrix.gc.name == 'mmtk' }}
+
+      - run: $SETARCH make
+
+      - name: Build Modular  GC
+        run: |
+          echo "RUBY_GC_LIBRARY=${{ matrix.gc.name }}" >> $GITHUB_ENV
+          make install-modular-gc MODULAR_GC=${{ matrix.gc.name }} MMTK_BUILD=${{ matrix.gc.mmtk_build }}
+          make distclean-modular-gc MODULAR_GC=${{ matrix.gc.name }}
+
+      - run: $SETARCH make hello
+
+      - name: Set test options for skipped tests
+        run: |
+          set -x
+          TESTS="$(echo "${{ matrix.skipped_tests }}" | sed 's| |$$/ -n!/|g;s|^|-n!/|;s|$|$$/|')"
+          echo "TESTS=${TESTS}" >> $GITHUB_ENV
+        if: ${{ matrix.test_task == 'check' && matrix.skipped_tests }}
+
+      - name: Set up Launchable
+        id: launchable
+        uses: ./.github/actions/launchable/setup
+        with:
+          os: ${{ matrix.os || 'ubuntu-22.04' }}
+          test-opts: ${{ matrix.configure }}
+          launchable-token: ${{ secrets.LAUNCHABLE_TOKEN }}
+          builddir: build
+          srcdir: src
+        continue-on-error: true
+        timeout-minutes: 3
+
+      - name: make ${{ matrix.test_task }}
+        run: |
+          test -n "${LAUNCHABLE_STDOUT}" && exec 1> >(tee "${LAUNCHABLE_STDOUT}")
+          test -n "${LAUNCHABLE_STDERR}" && exec 2> >(tee "${LAUNCHABLE_STDERR}")
+
+          $SETARCH make -s ${{ matrix.test_task }} \
+            ${TESTS:+TESTS="$TESTS"} \
+            ${{ !contains(matrix.test_task, 'bundle') && 'RUBYOPT=-w' || '' }}
+        timeout-minutes: ${{ matrix.gc.timeout || 40 }}
+        env:
+          RUBY_TESTOPTS: '-q --tty=no'
+          TEST_BUNDLED_GEMS_ALLOW_FAILURES: ''
+          PRECHECK_BUNDLED_GEMS: 'no'
+          LAUNCHABLE_STDOUT: ${{ steps.launchable.outputs.stdout_report_path }}
+          LAUNCHABLE_STDERR: ${{ steps.launchable.outputs.stderr_report_path }}
+
+      - name: make skipped tests
+        run: |
+          $SETARCH make -s test-all TESTS="${TESTS//-n!\//-n/}"
+        env:
+          GNUMAKEFLAGS: ''
+          RUBY_TESTOPTS: '-v --tty=no'
+        if: ${{ matrix.test_task == 'check' && matrix.skipped_tests }}
+        continue-on-error: ${{ matrix.continue-on-skipped_tests || false }}
+
+      - uses: ./.github/actions/slack
+        with:
+          label: ${{ matrix.test_task }} ${{ matrix.configure }}${{ matrix.arch }}
+          SLACK_WEBHOOK_URL: ${{ secrets.SIMPLER_ALERTS_URL }} # ruby-lang slack: ruby/simpler-alerts-bot
+        if: ${{ failure() }}
+
+defaults:
+  run:
+    working-directory: build
diff --git a/.github/workflows/parse_y.yml b/.github/workflows/parse_y.yml
new file mode 100644
index 00000000000000..eb7c6c22026530
--- /dev/null
+++ b/.github/workflows/parse_y.yml
@@ -0,0 +1,100 @@
+name: parse.y
+on:
+  push:
+    paths-ignore:
+      - 'doc/**'
+      - '**/man/*'
+      - '**.md'
+      - '**.rdoc'
+      - '**/.document'
+      - '.*.yml'
+  pull_request:
+    paths-ignore:
+      - 'doc/**'
+      - '**/man/*'
+      - '**.md'
+      - '**.rdoc'
+      - '**/.document'
+      - '.*.yml'
+  merge_group:
+
+concurrency:
+  group: ${{ github.workflow }} / ${{ startsWith(github.event_name, 'pull') && github.ref_name || github.sha }}
+  cancel-in-progress: ${{ startsWith(github.event_name, 'pull') }}
+
+permissions:
+  contents: read
+
+jobs:
+  make:
+    strategy:
+      matrix:
+        include:
+          - test_task: check
+          - test_task: test-bundler-parallel
+          - test_task: test-bundled-gems
+      fail-fast: false
+
+    env:
+      GITPULLOPTIONS: --no-tags origin ${{ github.ref }}
+      RUBY_DEBUG: ci
+      SETARCH: ${{ matrix.arch && format('setarch {0}', matrix.arch) }}
+
+    runs-on: ubuntu-22.04
+
+    if: >-
+      ${{!(false
+      || contains(github.event.head_commit.message, '[DOC]')
+      || contains(github.event.head_commit.message, 'Document')
+      || contains(github.event.pull_request.title, '[DOC]')
+      || contains(github.event.pull_request.title, 'Document')
+      || contains(github.event.pull_request.labels.*.name, 'Documentation')
+      || (github.event_name == 'push' && github.event.pull_request.user.login == 'dependabot[bot]')
+      )}}
+
+    steps:
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+        with:
+          sparse-checkout-cone-mode: false
+          sparse-checkout: /.github
+
+      - uses: ./.github/actions/setup/ubuntu
+
+      - uses: ruby/setup-ruby@a4effe49ee8ee5b8b5091268c473a4628afb5651 # v1.245.0
+        with:
+          ruby-version: '3.1'
+          bundler: none
+
+      - uses: ./.github/actions/setup/directories
+        with:
+          srcdir: src
+          builddir: build
+          makeup: true
+          clean: true
+          dummy-files: ${{ matrix.test_task == 'check' }}
+
+      - name: Run configure
+        run: ../src/configure -C --disable-install-doc cppflags=-DRUBY_DEBUG --with-parser=parse.y
+
+      - run: make
+
+      - run: make TESTRUN_SCRIPT='-e "exit !RUBY_DESCRIPTION.include?(%[+PRISM])"' run
+
+      - name: make ${{ matrix.test_task }}
+        run: make -s ${{ matrix.test_task }} RUN_OPTS="$RUN_OPTS" SPECOPTS="$SPECOPTS"
+        env:
+          RUBY_TESTOPTS: ${{ matrix.testopts }}
+          EXCLUDES: '../src/test/.excludes-parsey'
+          RUN_OPTS: ${{ matrix.run_opts || '--parser=parse.y' }}
+          SPECOPTS: ${{ matrix.specopts || '-T --parser=parse.y' }}
+          TEST_BUNDLED_GEMS_ALLOW_FAILURES: ''
+
+      - uses: ./.github/actions/slack
+        with:
+          label: ${{ matrix.run_opts }}
+          SLACK_WEBHOOK_URL: ${{ secrets.SIMPLER_ALERTS_URL }} # ruby-lang slack: ruby/simpler-alerts-bot
+        if: ${{ failure() }}
+
+defaults:
+  run:
+    working-directory: build
diff --git a/.github/workflows/pr-playground.yml b/.github/workflows/pr-playground.yml
new file mode 100644
index 00000000000000..cc060061421acd
--- /dev/null
+++ b/.github/workflows/pr-playground.yml
@@ -0,0 +1,127 @@
+name: Post Playground link to PR
+on:
+  pull_request_target:
+    types: [labeled]
+  workflow_run:
+    workflows: ["WebAssembly"]
+    types: [completed]
+
+jobs:
+  post-summary:
+    name: Post Playground link
+    runs-on: ubuntu-latest
+    permissions:
+      pull-requests: write
+    # Post a comment only if the PR status check is passed and the PR is labeled with `Playground`.
+    # Triggered twice: when the PR is labeled and when PR build is passed.
+    if: >-
+      ${{ false
+      || (true
+        && github.event_name == 'pull_request_target'
+        && contains(github.event.pull_request.labels.*.name, 'Playground'))
+      || (true
+        && github.event_name == 'workflow_run'
+        && github.event.workflow_run.conclusion == 'success'
+        && github.event.workflow_run.event == 'pull_request')
+      }}
+    steps:
+      - uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
+        with:
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          script: |
+            const fs = require('fs/promises');
+
+            const buildWorkflowPath = '.github/workflows/wasm.yml';
+            const findSuccessfuBuildRun = async (pr) => {
+              const opts = github.rest.actions.listWorkflowRunsForRepo.endpoint.merge({
+                owner: context.repo.owner,
+                repo: context.repo.repo,
+                status: 'success',
+                branch: pr.head.ref,
+              });
+              const runs = await github.paginate(opts);
+              const buildRun = runs.find(run => run.path == buildWorkflowPath);
+              return buildRun;
+            }
+
+            const postComment = async (body, pr) => {
+              const { data: comments } = await github.rest.issues.listComments({
+                owner: context.repo.owner,
+                repo: context.repo.repo,
+                issue_number: pr.number,
+              });
+
+              const commentOpts = { owner: context.repo.owner, repo: context.repo.repo, body: comment };
+
+              const existingComment = comments.find(comment => comment.body.startsWith(magicComment));
+              if (existingComment) {
+                core.info(`Updating existing comment: ${existingComment.html_url}`);
+                await github.rest.issues.updateComment({
+                  ...commentOpts, comment_id: existingComment.id
+                });
+              } else {
+                await github.rest.issues.createComment({
+                  ...commentOpts, issue_number: pr.number
+                });
+              }
+            }
+
+            const derivePRNumber = async () => {
+              if (context.payload.pull_request) {
+                return context.payload.pull_request.number;
+              }
+              // Workaround for https://github.com/orgs/community/discussions/25220
+
+              const { data: { artifacts } } = await github.rest.actions.listWorkflowRunArtifacts({
+                owner: context.repo.owner,
+                repo: context.repo.repo,
+                run_id: context.payload.workflow_run.id,
+              });
+              const artifact = artifacts.find(artifact => artifact.name == 'github-pr-info');
+              if (!artifact) {
+                throw new Error('Cannot find github-pr-info.txt artifact');
+              }
+
+              const { data } = await github.rest.actions.downloadArtifact({
+                owner: context.repo.owner,
+                repo: context.repo.repo,
+                artifact_id: artifact.id,
+                archive_format: 'zip',
+              });
+
+              await fs.writeFile('pr-info.zip', Buffer.from(data));
+              await exec.exec('unzip', ['pr-info.zip']);
+              return await fs.readFile('github-pr-info.txt', 'utf8');
+            }
+
+            const prNumber = await derivePRNumber();
+
+            const { data: pr } = await github.rest.pulls.get({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              pull_number: prNumber,
+            });
+
+            core.info(`Checking if the PR ${prNumber} is labeled with Playground...`);
+            if (!pr.labels.some(label => label.name == 'Playground')) {
+              core.info(`The PR is not labeled with Playground.`);
+              return;
+            }
+
+            core.info(`Checking if the build is successful for ${pr.head.ref} in ${pr.head.repo.owner.login}/${pr.head.repo.name}...`);
+            const buildRun = await findSuccessfuBuildRun(pr);
+            if (!buildRun) {
+              core.info(`No successful build run found for ${buildWorkflowPath} on ${pr.head.ref} yet.`);
+              return;
+            }
+            core.info(`Found a successful build run: ${buildRun.html_url}`);
+
+            const runLink = `${process.env.GITHUB_SERVER_URL}/${process.env.GITHUB_REPOSITORY}/actions/runs/${process.env.GITHUB_RUN_ID}`;
+            const magicComment = `<!-- AUTO-GENERATED-COMMENT-PR-PLAYGROUND -->`;
+            const comment = `${magicComment}
+            **Try on Playground**: https://ruby.github.io/play-ruby?run=${buildRun.id}
+            This is an automated comment by [\`pr-playground.yml\`](${runLink}) workflow.
+            `;
+            core.info(`Comment: ${comment}`);
+            await postComment(comment, pr);
+
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
new file mode 100644
index 00000000000000..5d4474d978f51a
--- /dev/null
+++ b/.github/workflows/publish.yml
@@ -0,0 +1,18 @@
+name: Start release workflow
+on:
+  push:
+    tags:
+      - '*'
+
+jobs:
+  notify:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Build release package
+        run: |
+          curl -L -X POST \
+            -H "Authorization: Bearer ${{ secrets.MATZBOT_GITHUB_WORKFLOW_TOKEN }}" \
+            -H "Accept: application/vnd.github+json" \
+            -H "X-GitHub-Api-Version: 2022-11-28" \
+            https://api.github.com/repos/ruby/actions/dispatches \
+            -d '{"event_type": "${{ github.ref }}"}'
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
new file mode 100644
index 00000000000000..284e336a2942c2
--- /dev/null
+++ b/.github/workflows/release.yml
@@ -0,0 +1,107 @@
+name: Publish Ruby packages
+
+on:
+  repository_dispatch:
+    types:
+      - release
+  workflow_dispatch:
+    inputs:
+      version:
+        description: 'Version of the Ruby package to release'
+        required: true
+        default: '3.3.4'
+
+jobs:
+  release:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: 3.3.4
+
+      - name: Store Ruby version
+        run: |
+          echo "RUBY_VERSION=${{ github.event.client_payload.version || github.event.inputs.version }}" >> $GITHUB_ENV
+
+      - name: Store ABI version
+        run: echo "ABI_VERSION=$(echo ${{ env.RUBY_VERSION }} | cut -d '.' -f 1-2)" >> $GITHUB_ENV
+
+      - name: Copy draft package `/tmp` to `/pub` directory
+        run: tool/release.sh ${{ env.RUBY_VERSION }}
+        env:
+          AWS_ACCESS_KEY_ID: ${{ secrets.FTP_R_L_O_AWS_ACCESS_KEY_ID }}
+          AWS_SECRET_ACCESS_KEY: ${{ secrets.FTP_R_L_O_AWS_SECRET_ACCESS_KEY }}
+          AWS_DEFAULT_REGION: us-west-2
+
+      - name: Purge URLs of release package
+        run: |
+          curl -X POST \
+            -H "Fastly-Key: ${{ secrets.FASTLY_PURGE_TOKEN }}" \
+            https://api.fastly.com/purge/cache.ruby-lang.org/pub/ruby/${{ env.ABI_VERSION }}/ruby-${{ env.RUBY_VERSION }}.tar.gz
+          curl -X POST \
+            -H "Fastly-Key: ${{ secrets.FASTLY_PURGE_TOKEN }}" \
+            https://api.fastly.com/purge/cache.ruby-lang.org/pub/ruby/${{ env.ABI_VERSION }}/ruby-${{ env.RUBY_VERSION }}.tar.xz
+          curl -X POST \
+            -H "Fastly-Key: ${{ secrets.FASTLY_PURGE_TOKEN }}" \
+            https://api.fastly.com/purge/cache.ruby-lang.org/pub/ruby/${{ env.ABI_VERSION }}/ruby-${{ env.RUBY_VERSION }}.zip
+
+      - name: Create a release on GitHub
+        run: |
+          RELEASE_TAG=$(echo v${{ env.RUBY_VERSION }} | sed 's/\./_/g')
+          echo $RELEASE_TAG
+          PREVIOUS_RELEASE_TAG=$(echo $RELEASE_TAG | awk 'BEGIN {FS="_"; OFS="_"}{ $NF=$NF-1; print }')
+          echo $PREVIOUS_RELEASE_TAG
+          tool/gen-github-release.rb $PREVIOUS_RELEASE_TAG $RELEASE_TAG --no-dry-run
+        env:
+          GITHUB_TOKEN: ${{ secrets.MATZBOT_AUTO_UPDATE_TOKEN }}
+
+      - name: Update versions index
+        run: |
+          curl -L -X POST \
+            -H "Authorization: Bearer ${{ secrets.MATZBOT_GITHUB_WORKFLOW_TOKEN }}" \
+            -H "Accept: application/vnd.github+json" \
+            -H "X-GitHub-Api-Version: 2022-11-28" \
+            https://api.github.com/repos/ruby/actions/dispatches \
+            -d '{"event_type": "update_index"}'
+
+      - name: Build and push Docker images
+        run: |
+          curl -L -X POST \
+            -H "Authorization: Bearer ${{ secrets.MATZBOT_GITHUB_WORKFLOW_TOKEN }}" \
+            -H "Accept: application/vnd.github+json" \
+            -H "X-GitHub-Api-Version: 2022-11-28" \
+            https://api.github.com/repos/ruby/docker-images/dispatches \
+            -d '{"event_type": "build", "client_payload": {"ruby_version": "${{ env.RUBY_VERSION }}"}}'
+
+      - name: Build snapcraft packages
+        run: |
+          curl -L -X POST \
+            -H "Authorization: Bearer ${{ secrets.MATZBOT_GITHUB_WORKFLOW_TOKEN }}" \
+            -H "Accept: application/vnd.github+json" \
+            -H "X-GitHub-Api-Version: 2022-11-28" \
+            https://api.github.com/repos/ruby/snap.ruby/dispatches \
+            -d '{"event_type": "build", "client_payload": {"ruby_version": "${{ env.RUBY_VERSION }}"}}'
+
+      - name: Store the latest LTS version of OpenSSL
+        run: |
+          echo "OPENSSL_VERSION=`curl -s https://api.github.com/repos/openssl/openssl/releases | jq -r '.[].tag_name | select(startswith("openssl-3.0"))' | sort -Vr | head -n1 | cut -d'-' -f2`" >> $GITHUB_ENV
+
+      - name: Update ruby-build definition
+        run: |
+          curl -L -X POST \
+            -H "Authorization: Bearer ${{ secrets.RUBY_BUILD_WORKFLOW_TOKEN }}" \
+            -H "Accept: application/vnd.github+json" \
+            -H "X-GitHub-Api-Version: 2022-11-28" \
+            https://api.github.com/repos/rbenv/ruby-build/dispatches \
+            -d '{"event_type": "update-ruby", "client_payload": {"ruby_version": "${{ env.RUBY_VERSION }}", "openssl_version": "${{ env.OPENSSL_VERSION }}"}}'
+
+      - name: Update all-ruby definition
+        run: |
+          curl -L -X POST \
+            -H "Authorization: Bearer ${{ secrets.MATZBOT_GITHUB_WORKFLOW_TOKEN }}" \
+            -H "Accept: application/vnd.github+json" \
+            -H "X-GitHub-Api-Version: 2022-11-28" \
+            https://api.github.com/repos/ruby/all-ruby/dispatches \
+            -d '{"event_type": "update"}'
diff --git a/.github/workflows/rjit-bindgen.yml b/.github/workflows/rjit-bindgen.yml
deleted file mode 100644
index 6a6769b92afc8d..00000000000000
--- a/.github/workflows/rjit-bindgen.yml
+++ /dev/null
@@ -1,88 +0,0 @@
-name: RJIT bindgen
-on:
-  push:
-    paths-ignore:
-      - 'doc/**'
-      - '**/man'
-      - '**.md'
-      - '**.rdoc'
-      - '**/.document'
-  pull_request:
-    paths-ignore:
-      - 'doc/**'
-      - '**/man'
-      - '**.md'
-      - '**.rdoc'
-      - '**/.document'
-  merge_group:
-    paths-ignore:
-      - 'doc/**'
-      - '**/man'
-      - '**.md'
-      - '**.rdoc'
-      - '**/.document'
-
-concurrency:
-  group: ${{ github.workflow }} / ${{ startsWith(github.event_name, 'pull') && github.ref_name || github.sha }}
-  cancel-in-progress: ${{ startsWith(github.event_name, 'pull') }}
-
-permissions:
-  contents: read
-
-jobs:
-  make:
-    strategy:
-      matrix:
-        include:
-          - task: rjit-bindgen
-      fail-fast: false
-
-    runs-on: ubuntu-20.04
-
-    if: >-
-      ${{!(false
-      || contains(github.event.head_commit.message, '[DOC]')
-      || contains(github.event.pull_request.title, '[DOC]')
-      || contains(github.event.pull_request.labels.*.name, 'Documentation')
-      || (github.event_name == 'push' && github.actor == 'dependabot[bot]')
-      )}}
-
-    steps:
-      - name: Set up Ruby
-        uses: ruby/setup-ruby@250fcd6a742febb1123a77a841497ccaa8b9e939 # v1.152.0
-        with:
-          ruby-version: '3.1'
-
-      - uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0
-        with:
-          sparse-checkout-cone-mode: false
-          sparse-checkout: /.github
-
-      - uses: ./.github/actions/setup/ubuntu
-
-      - uses: ./.github/actions/setup/directories
-        with:
-          srcdir: src
-          builddir: build
-          makeup: true
-
-      - name: Run configure
-        run: ../src/configure -C --disable-install-doc --prefix=$(pwd)/install --enable-yjit=dev_nodebug
-
-      - run: make
-
-      - run: make install
-
-      - run: make ${{ matrix.task }}
-
-      - run: git diff --exit-code
-        working-directory: src
-
-      - uses: ./.github/actions/slack
-        with:
-          SLACK_WEBHOOK_URL: ${{ secrets.SIMPLER_ALERTS_URL }} # ruby-lang slack: ruby/simpler-alerts-bot
-        if: ${{ failure() && github.event_name == 'push' }}
-
-defaults:
-  run:
-    working-directory: build
diff --git a/.github/workflows/rjit.yml b/.github/workflows/rjit.yml
deleted file mode 100644
index 66a6805abce2b1..00000000000000
--- a/.github/workflows/rjit.yml
+++ /dev/null
@@ -1,117 +0,0 @@
-name: RJIT
-on:
-  push:
-    paths-ignore:
-      - 'doc/**'
-      - '**.md'
-      - '**.rdoc'
-      - '**/.document'
-      - '**.[1-8]'
-      - '**.ronn'
-  pull_request:
-    paths-ignore:
-      - 'doc/**'
-      - '**.md'
-      - '**.rdoc'
-      - '**/.document'
-      - '**.[1-8]'
-      - '**.ronn'
-  merge_group:
-    paths-ignore:
-      - 'doc/**'
-      - '**.md'
-      - '**.rdoc'
-      - '**/.document'
-      - '**.[1-8]'
-      - '**.ronn'
-
-concurrency:
-  group: ${{ github.workflow }} / ${{ startsWith(github.event_name, 'pull') && github.ref_name || github.sha }}
-  cancel-in-progress: ${{ startsWith(github.event_name, 'pull') }}
-
-permissions:
-  contents: read
-
-jobs:
-  make:
-    strategy:
-      matrix:
-        # main variables included in the job name
-        test_task: [check]
-        run_opts: ['--rjit-call-threshold=1']
-        arch: ['']
-      fail-fast: false
-
-    env:
-      GITPULLOPTIONS: --no-tags origin ${{ github.ref }}
-      RUBY_DEBUG: ci
-      SETARCH: ${{ matrix.arch && format('setarch {0}', matrix.arch) }}
-
-    runs-on: ubuntu-22.04
-
-    if: >-
-      ${{!(false
-      || contains(github.event.head_commit.message, '[DOC]')
-      || contains(github.event.pull_request.title, '[DOC]')
-      || contains(github.event.pull_request.labels.*.name, 'Documentation')
-      || (github.event_name == 'push' && github.actor == 'dependabot[bot]')
-      )}}
-
-    steps:
-      - uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0
-        with:
-          sparse-checkout-cone-mode: false
-          sparse-checkout: /.github
-
-      - uses: ./.github/actions/setup/ubuntu
-
-      - uses: ./.github/actions/setup/directories
-        with:
-          srcdir: src
-          builddir: build
-          makeup: true
-
-      - name: Run configure
-        env:
-          arch: ${{ matrix.arch }}
-        run: >-
-          $SETARCH ../src/configure -C --disable-install-doc cppflags=-DRUBY_DEBUG
-          ${arch:+--target=$arch-$OSTYPE --host=$arch-$OSTYPE}
-
-      - run: $SETARCH make
-
-      - name: make test
-        run: |
-          $SETARCH make -s test RUN_OPTS="$RUN_OPTS"
-        timeout-minutes: 30
-        env:
-          GNUMAKEFLAGS: ''
-          RUBY_TESTOPTS: '-v --tty=no'
-          RUN_OPTS: ${{ matrix.run_opts }}
-
-      - name: make test-all
-        run: |
-          $SETARCH make -s test-all RUN_OPTS="$RUN_OPTS"
-        timeout-minutes: 40
-        env:
-          GNUMAKEFLAGS: ''
-          RUBY_TESTOPTS: '-q --tty=no'
-          RUN_OPTS: ${{ matrix.run_opts }}
-
-      - name: make test-spec
-        run: |
-          $SETARCH make -s test-spec RUN_OPTS="$RUN_OPTS"
-        timeout-minutes: 10
-        env:
-          GNUMAKEFLAGS: ''
-          RUN_OPTS: ${{ matrix.run_opts }}
-
-      - uses: ./.github/actions/slack
-        with:
-          label: ${{ matrix.run_opts }}
-          SLACK_WEBHOOK_URL: ${{ secrets.SIMPLER_ALERTS_URL }} # ruby-lang slack: ruby/simpler-alerts-bot
-        if: ${{ failure() && github.event_name == 'push' }}
-
-defaults:
-  run:
-    working-directory: build
diff --git a/.github/workflows/scorecards.yml b/.github/workflows/scorecards.yml
index c6a4110af1b994..8cc7e00c47ec26 100644
--- a/.github/workflows/scorecards.yml
+++ b/.github/workflows/scorecards.yml
@@ -2,7 +2,7 @@
 # by a third-party and are governed by separate terms of service, privacy
 # policy, and support documentation.
 
-name: Scorecards supply-chain security
+name: Scorecard supply-chain security
 on:
   # For Branch-Protection check. Only the default branch is supported. See
   # https://github.com/ossf/scorecard/blob/main/docs/checks.md#branch-protection
@@ -10,7 +10,7 @@ on:
   # To guarantee Maintained check is occasionally updated. See
   # https://github.com/ossf/scorecard/blob/main/docs/checks.md#maintained
   schedule:
-    - cron: '22 4 * * 2'
+    - cron: '39 3 * * 5'
   # push:
   #   branches: [ "master" ]
 
@@ -19,8 +19,10 @@ permissions: read-all
 
 jobs:
   analysis:
-    name: Scorecards analysis
+    name: Scorecard analysis
     runs-on: ubuntu-latest
+    # `publish_results: true` only works when run from the default branch. conditional can be removed if disabled.
+    if: github.event.repository.default_branch == github.ref_name || github.event_name == 'pull_request'
     permissions:
       # Needed to upload the results to code-scanning dashboard.
       security-events: write
@@ -31,21 +33,21 @@ jobs:
       # actions: read
 
     steps:
-      - name: 'Checkout code'
-        uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0
+      - name: "Checkout code"
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           persist-credentials: false
 
-      - name: 'Run analysis'
-        uses: ossf/scorecard-action@08b4669551908b1024bb425080c797723083c031 # v2.2.0
+      - name: "Run analysis"
+        uses: ossf/scorecard-action@05b42c624433fc40578a4040d5cf5e36ddca8cde # v2.4.2
         with:
           results_file: results.sarif
           results_format: sarif
-          # (Optional) Read-only PAT token. Uncomment the `repo_token` line below if:
+          # (Optional) "write" PAT token. Uncomment the `repo_token` line below if:
           # - you want to enable the Branch-Protection check on a *public* repository, or
-          # - you are installing Scorecards on a *private* repository
-          # To create the PAT, follow the steps in https://github.com/ossf/scorecard-action#authentication-with-pat.
-          repo_token: ${{ secrets.SCORECARD_READ_TOKEN }}
+          # - you are installing Scorecard on a *private* repository
+          # To create the PAT, follow the steps in https://github.com/ossf/scorecard-action?tab=readme-ov-file#authentication-with-fine-grained-pat-optional.
+          # repo_token: ${{ secrets.SCORECARD_TOKEN }}
 
           # Public repositories:
           #   - Publish results to OpenSSF REST API for easy access by consumers
@@ -56,17 +58,21 @@ jobs:
           #     of the value entered here.
           publish_results: true
 
+          # (Optional) Uncomment file_mode if you have a .gitattributes with files marked export-ignore
+          # file_mode: git
+
       # Upload the results as artifacts (optional). Commenting out will disable uploads of run results in SARIF
       # format to the repository Actions tab.
-      # - name: "Upload artifact"
-      #   uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce # v3.1.2
-      #   with:
-      #     name: SARIF file
-      #     path: results.sarif
-      #     retention-days: 5
+      - name: "Upload artifact"
+        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
+        with:
+          name: SARIF file
+          path: results.sarif
+          retention-days: 5
 
-      # Upload the results to GitHub's code scanning dashboard.
-      - name: 'Upload to code-scanning'
-        uses: github/codeql-action/upload-sarif@cdcdbb579706841c47f7063dda365e292e5cad7a # v2.1.27
+      # Upload the results to GitHub's code scanning dashboard (optional).
+      # Commenting out will disable upload of results to your repo's Code Scanning dashboard
+      - name: "Upload to code-scanning"
+        uses: github/codeql-action/upload-sarif@v3
         with:
           sarif_file: results.sarif
diff --git a/.github/workflows/spec_guards.yml b/.github/workflows/spec_guards.yml
index 77677c98596807..d723abde21ab69 100644
--- a/.github/workflows/spec_guards.yml
+++ b/.github/workflows/spec_guards.yml
@@ -3,16 +3,15 @@ name: Rubyspec Version Guards Check
 on:
   push:
     paths:
+      - '.github/workflows/spec_guards.yml'
       - 'spec/**'
       - '!spec/*.md'
   pull_request:
-    paths-ignore:
+    paths:
+      - '.github/workflows/spec_guards.yml'
       - 'spec/**'
       - '!spec/*.md'
   merge_group:
-    paths-ignore:
-      - 'spec/**'
-      - '!spec/*.md'
 
 concurrency:
   group: ${{ github.workflow }} / ${{ startsWith(github.event_name, 'pull') && github.ref_name || github.sha }}
@@ -25,14 +24,16 @@ jobs:
   rubyspec:
     name: Rubyspec
 
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
 
     if: >-
       ${{!(false
       || contains(github.event.head_commit.message, '[DOC]')
+      || contains(github.event.head_commit.message, 'Document')
       || contains(github.event.pull_request.title, '[DOC]')
+      || contains(github.event.pull_request.title, 'Document')
       || contains(github.event.pull_request.labels.*.name, 'Documentation')
-      || (github.event_name == 'push' && github.actor == 'dependabot[bot]')
+      || (github.event_name == 'push' && github.event.pull_request.user.login == 'dependabot[bot]')
       )}}
 
     strategy:
@@ -40,14 +41,14 @@ jobs:
         # Specs from ruby/spec should still run on all supported Ruby versions.
         # This also ensures the needed ruby_version_is guards are there, see spec/README.md.
         ruby:
-          - ruby-3.0
-          - ruby-3.1
           - ruby-3.2
+          - ruby-3.3
+          - ruby-3.4
 
     steps:
-      - uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
 
-      - uses: ruby/setup-ruby@250fcd6a742febb1123a77a841497ccaa8b9e939 # v1.152.0
+      - uses: ruby/setup-ruby@a4effe49ee8ee5b8b5091268c473a4628afb5651 # v1.245.0
         with:
           ruby-version: ${{ matrix.ruby }}
           bundler: none
@@ -63,4 +64,4 @@ jobs:
         with:
           label: ${{ matrix.ruby }}
           SLACK_WEBHOOK_URL: ${{ secrets.SIMPLER_ALERTS_URL }} # ruby-lang slack: ruby/simpler-alerts-bot
-        if: ${{ failure() && github.event_name == 'push' }}
+        if: ${{ failure() }}
diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml
index 66b0228102c023..3005809b08c475 100644
--- a/.github/workflows/ubuntu.yml
+++ b/.github/workflows/ubuntu.yml
@@ -3,24 +3,15 @@ on:
   push:
     paths-ignore:
       - 'doc/**'
-      - '**/man'
+      - '**/man/*'
       - '**.md'
       - '**.rdoc'
       - '**/.document'
+      - '.*.yml'
   pull_request:
-    paths-ignore:
-      - 'doc/**'
-      - '**/man'
-      - '**.md'
-      - '**.rdoc'
-      - '**/.document'
+    # Do not use paths-ignore for required status checks
+    # https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/collaborating-on-repositories-with-code-quality-features/troubleshooting-required-status-checks#handling-skipped-but-required-checks
   merge_group:
-    paths-ignore:
-      - 'doc/**'
-      - '**/man'
-      - '**.md'
-      - '**.rdoc'
-      - '**/.document'
 
 concurrency:
   group: ${{ github.workflow }} / ${{ startsWith(github.event_name, 'pull') && github.ref_name || github.sha }}
@@ -33,38 +24,42 @@ jobs:
   make:
     strategy:
       matrix:
-        test_task: [check]
-        arch: ['']
-        configure: ['cppflags=-DVM_CHECK_MODE']
-        # specifying everything else with `include` to avoid redundant tests
         include:
+          - test_task: check
+            configure: 'cppflags=-DVM_CHECK_MODE'
           - test_task: check
             arch: i686
+          - test_task: check
+            configure: '--disable-yjit'
           - test_task: check
             configure: '--enable-shared --enable-load-relative'
-          - test_task: test-all TESTS=--repeat-count=2
-          - test_task: test-all TESTS=--repeat-count=2
-            configure: 'cppflags=-DUNIVERSAL_PARSER'
           - test_task: test-bundler-parallel
+            timeout: 50
           - test_task: test-bundled-gems
+          - test_task: check
+            os: ubuntu-24.04
+          - test_task: check
+            os: ubuntu-24.04-arm
       fail-fast: false
 
     env:
       GITPULLOPTIONS: --no-tags origin ${{ github.ref }}
       RUBY_DEBUG: ci
 
-    runs-on: ubuntu-20.04
+    runs-on: ${{ matrix.os || 'ubuntu-22.04' }}
 
     if: >-
       ${{!(false
       || contains(github.event.head_commit.message, '[DOC]')
+      || contains(github.event.head_commit.message, 'Document')
       || contains(github.event.pull_request.title, '[DOC]')
+      || contains(github.event.pull_request.title, 'Document')
       || contains(github.event.pull_request.labels.*.name, 'Documentation')
-      || (github.event_name == 'push' && github.actor == 'dependabot[bot]')
+      || (github.event_name == 'push' && github.event.pull_request.user.login == 'dependabot[bot]')
       )}}
 
     steps:
-      - uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           sparse-checkout-cone-mode: false
           sparse-checkout: /.github
@@ -73,11 +68,21 @@ jobs:
         with:
           arch: ${{ matrix.arch }}
 
+      - uses: ruby/setup-ruby@a4effe49ee8ee5b8b5091268c473a4628afb5651 # v1.245.0
+        with:
+          ruby-version: '3.1'
+          bundler: none
+        if: ${{ !endsWith(matrix.os, 'arm') }}
+
       - uses: ./.github/actions/setup/directories
         with:
           srcdir: src
           builddir: build
           makeup: true
+          clean: true
+          dummy-files: ${{ matrix.test_task == 'check' }}
+          # Set fetch-depth: 10 so that Launchable can receive commits information.
+          fetch-depth: 10
 
       - name: Run configure
         env:
@@ -92,38 +97,71 @@ jobs:
 
       - run: $SETARCH make
 
-      - name: Create dummy files in build dir
+      - run: $SETARCH make hello
+
+      - name: runirb
         run: |
-          $SETARCH ./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)")}'
-        if: ${{ matrix.test_task == 'check' }}
+          echo IRB::VERSION | $SETARCH make runirb RUNOPT="-- -f"
+
+      - name: Set test options for skipped tests
+        run: |
+          set -x
+          TESTS="$(echo "${{ matrix.skipped_tests }}" | sed 's| |$$/ -n!/|g;s|^|-n!/|;s|$|$$/|')"
+          echo "TESTS=${TESTS}" >> $GITHUB_ENV
+        if: ${{ matrix.test_task == 'check' && matrix.skipped_tests }}
+
+      - name: Set up Launchable
+        id: launchable
+        uses: ./.github/actions/launchable/setup
+        with:
+          os: ${{ matrix.os || 'ubuntu-22.04' }}
+          test-opts: ${{ matrix.configure }}
+          launchable-token: ${{ secrets.LAUNCHABLE_TOKEN }}
+          builddir: build
+          srcdir: src
+        continue-on-error: true
+        timeout-minutes: 3
 
       - name: make ${{ matrix.test_task }}
-        run: >-
-          $SETARCH make -s ${{ matrix.test_task }}
-            ${TESTS:+TESTS=`echo "$TESTS" | sed 's| |$$/ -n!/|g;s|^|-n!/|;s|$|$$/|'`}
-            ${{ contains(matrix.test_task, 'bundle') && '' || 'RUBYOPT=-w' }}
-        timeout-minutes: 40
+        run: |
+          test -n "${LAUNCHABLE_STDOUT}" && exec 1> >(tee "${LAUNCHABLE_STDOUT}")
+          test -n "${LAUNCHABLE_STDERR}" && exec 2> >(tee "${LAUNCHABLE_STDERR}")
+
+          $SETARCH make -s ${{ matrix.test_task }} \
+          ${TESTS:+TESTS="$TESTS"} \
+          ${{ !contains(matrix.test_task, 'bundle') && 'RUBYOPT=-w' || '' }}
+        timeout-minutes: ${{ matrix.timeout || 40 }}
         env:
           RUBY_TESTOPTS: '-q --tty=no'
-          TESTS: ${{ matrix.test_task == 'check' && matrix.skipped_tests || '' }}
           TEST_BUNDLED_GEMS_ALLOW_FAILURES: ''
           PRECHECK_BUNDLED_GEMS: 'no'
+          LAUNCHABLE_STDOUT: ${{ steps.launchable.outputs.stdout_report_path }}
+          LAUNCHABLE_STDERR: ${{ steps.launchable.outputs.stderr_report_path }}
 
       - name: make skipped tests
         run: |
-          $SETARCH make -s test-all TESTS=`echo "$TESTS" | sed 's| |$$/ -n/|g;s|^|-n/|;s|$|$$/|'`
+          $SETARCH make -s test-all TESTS="${TESTS//-n!\//-n/}"
         env:
           GNUMAKEFLAGS: ''
           RUBY_TESTOPTS: '-v --tty=no'
-          TESTS: ${{ matrix.skipped_tests }}
-        if: ${{ matrix.test_task == 'check' && matrix.skipped_tests != '' }}
+        if: ${{ matrix.test_task == 'check' && matrix.skipped_tests }}
         continue-on-error: ${{ matrix.continue-on-skipped_tests || false }}
 
       - uses: ./.github/actions/slack
         with:
           label: ${{ matrix.test_task }} ${{ matrix.configure }}${{ matrix.arch }}
           SLACK_WEBHOOK_URL: ${{ secrets.SIMPLER_ALERTS_URL }} # ruby-lang slack: ruby/simpler-alerts-bot
-        if: ${{ failure() && github.event_name == 'push' }}
+        if: ${{ failure() }}
+
+  result:
+    if: ${{ always() }}
+    name: ${{ github.workflow }} result
+    runs-on: ubuntu-latest
+    needs: [make]
+    steps:
+      - run: exit 1
+        working-directory:
+        if: ${{ contains(needs.*.result, 'failure') || contains(needs.*.result, 'cancelled') }}
 
 defaults:
   run:
diff --git a/.github/workflows/wasm.yml b/.github/workflows/wasm.yml
index 3be9bf8d1ed380..2c49d990719637 100644
--- a/.github/workflows/wasm.yml
+++ b/.github/workflows/wasm.yml
@@ -3,24 +3,20 @@ on:
   push:
     paths-ignore:
       - 'doc/**'
-      - '**/man'
+      - '**/man/*'
       - '**.md'
       - '**.rdoc'
       - '**/.document'
+      - '.*.yml'
   pull_request:
     paths-ignore:
       - 'doc/**'
-      - '**/man'
+      - '**/man/*'
       - '**.md'
       - '**.rdoc'
       - '**/.document'
+      - '.*.yml'
   merge_group:
-    paths-ignore:
-      - 'doc/**'
-      - '**/man'
-      - '**.md'
-      - '**.rdoc'
-      - '**/.document'
 
 concurrency:
   group: ${{ github.workflow }} / ${{ startsWith(github.event_name, 'pull') && github.ref_name || github.sha }}
@@ -47,23 +43,25 @@ jobs:
     env:
       RUBY_TESTOPTS: '-q --tty=no'
       GITPULLOPTIONS: --no-tags origin ${{ github.ref }}
-      WASI_SDK_VERSION_MAJOR: 14
+      WASI_SDK_VERSION_MAJOR: 25
       WASI_SDK_VERSION_MINOR: 0
-      BINARYEN_VERSION: 109
-      WASMTIME_VERSION: v0.33.0
+      BINARYEN_VERSION: 113
+      WASMTIME_VERSION: v15.0.0
 
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
 
     if: >-
       ${{!(false
       || contains(github.event.head_commit.message, '[DOC]')
+      || contains(github.event.head_commit.message, 'Document')
       || contains(github.event.pull_request.title, '[DOC]')
+      || contains(github.event.pull_request.title, 'Document')
       || contains(github.event.pull_request.labels.*.name, 'Documentation')
-      || (github.event_name == 'push' && github.actor == 'dependabot[bot]')
+      || (github.event_name == 'push' && github.event.pull_request.user.login == 'dependabot[bot]')
       )}}
 
     steps:
-      - uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           sparse-checkout-cone-mode: false
           sparse-checkout: /.github
@@ -80,7 +78,7 @@ jobs:
           sudo apt-get update -q || :
           sudo apt-get install --no-install-recommends -q -y ruby make autoconf git wget
 
-          wasi_sdk_deb="wasi-sdk_${WASI_SDK_VERSION_MAJOR}.${WASI_SDK_VERSION_MINOR}_amd64.deb"
+          wasi_sdk_deb="wasi-sdk-${WASI_SDK_VERSION_MAJOR}.${WASI_SDK_VERSION_MINOR}-x86_64-linux.deb"
           wget "https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-${WASI_SDK_VERSION_MAJOR}/${wasi_sdk_deb}"
           sudo dpkg -i "$wasi_sdk_deb"
           rm -f "$wasi_sdk_deb"
@@ -102,11 +100,33 @@ jobs:
         run: |
           echo "WASI_SDK_PATH=/opt/wasi-sdk" >> $GITHUB_ENV
 
+      - uses: ruby/setup-ruby@a4effe49ee8ee5b8b5091268c473a4628afb5651 # v1.245.0
+        with:
+          ruby-version: '3.1'
+          bundler: none
+
+      - name: Build baseruby
+        run: |
+          set -ex
+          mkdir ../baseruby
+          pushd ../baseruby
+          ../src/configure --prefix=$PWD/install
+          make
+          make install
+
+      - name: Download config.guess with wasi version
+        run: |
+          rm tool/config.guess tool/config.sub
+          ruby tool/downloader.rb -d tool -e gnu config.guess config.sub
+        working-directory: src
+
       - name: Run configure
         run: |
           ../src/configure \
             --host wasm32-unknown-wasi \
+            --with-baseruby=$PWD/../baseruby/install/bin/ruby \
             --with-static-linked-ext \
+            --with-ext=cgi/escape,continuation,coverage,date,digest/bubblebabble,digest,digest/md5,digest/rmd160,digest/sha1,digest/sha2,etc,fcntl,json,json/generator,json/parser,objspace,pathname,rbconfig/sizeof,ripper,stringio,strscan,monitor \
             LDFLAGS=" \
               -Xlinker --stack-first \
               -Xlinker -z -Xlinker stack-size=16777216 \
@@ -118,6 +138,18 @@ jobs:
       # miniruby may not be built when cross-compling
       - run: make mini ruby
 
+      - run: make install DESTDIR=$PWD/../install
+      - run: tar cfz ../install.tar.gz -C ../install .
+
+      - name: Upload artifacts
+        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
+        with:
+          name: ruby-wasm-install
+          path: ${{ github.workspace }}/install.tar.gz
+      - name: Show Playground URL to try the build
+        run: |
+          echo "Try on Playground: https://ruby.github.io/play-ruby?run=$GITHUB_RUN_ID" >> $GITHUB_STEP_SUMMARY
+
       - name: Run basictest
         run: wasmtime run ./../build/miniruby --mapdir /::./ -- basictest/test.rb
         working-directory: src
@@ -132,7 +164,17 @@ jobs:
         with:
           label: ${{ matrix.entry.name }}
           SLACK_WEBHOOK_URL: ${{ secrets.SIMPLER_ALERTS_URL }} # ruby-lang slack: ruby/simpler-alerts-bot
-        if: ${{ failure() && github.event_name == 'push' }}
+        if: ${{ failure() }}
+
+      # Workaround for https://github.com/orgs/community/discussions/25220
+      - name: Save Pull Request number
+        if: ${{ github.event_name == 'pull_request' }}
+        run: echo "${{ github.event.pull_request.number }}" >> ${{ github.workspace }}/github-pr-info.txt
+      - uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
+        if: ${{ github.event_name == 'pull_request' }}
+        with:
+          name: github-pr-info
+          path: ${{ github.workspace }}/github-pr-info.txt
 
 defaults:
   run:
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
index 71209a5c9c48a3..47e3f53241eafb 100644
--- a/.github/workflows/windows.yml
+++ b/.github/workflows/windows.yml
@@ -3,24 +3,15 @@ on:
   push:
     paths-ignore:
       - 'doc/**'
-      - '**/man'
+      - '**/man/*'
       - '**.md'
       - '**.rdoc'
       - '**/.document'
+      - '.*.yml'
   pull_request:
-    paths-ignore:
-      - 'doc/**'
-      - '**/man'
-      - '**.md'
-      - '**.rdoc'
-      - '**/.document'
+    # Do not use paths-ignore for required status checks
+    # https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/collaborating-on-repositories-with-code-quality-features/troubleshooting-required-status-checks#handling-skipped-but-required-checks
   merge_group:
-    paths-ignore:
-      - 'doc/**'
-      - '**/man'
-      - '**.md'
-      - '**.rdoc'
-      - '**/.document'
 
 concurrency:
   group: ${{ github.workflow }} / ${{ startsWith(github.event_name, 'pull') && github.ref_name || github.sha }}
@@ -34,150 +25,193 @@ jobs:
     strategy:
       matrix:
         include:
-          - vs: 2019
-          - vs: 2022
+          - os: 2022
+            vc: 2022
+            test_task: check
+          - os: 2025
+            vc: 2022
+            test_task: check
+          - os: 11-arm
+            test_task: 'btest test-basic test-tool' # check and test-spec are broken yet.
+            target: arm64
+          - os: 2025
+            vc: 2022
+            test_task: test-bundled-gems
       fail-fast: false
 
-    runs-on: windows-${{ matrix.vs < 2022 && '2019' || matrix.vs }}
+    runs-on: windows-${{ matrix.os < 2022 && '2019' || matrix.os }}
 
     if: >-
       ${{!(false
       || contains(github.event.head_commit.message, '[DOC]')
+      || contains(github.event.head_commit.message, 'Document')
       || contains(github.event.pull_request.title, '[DOC]')
+      || contains(github.event.pull_request.title, 'Document')
       || contains(github.event.pull_request.labels.*.name, 'Documentation')
-      || (github.event_name == 'push' && github.actor == 'dependabot[bot]')
+      || (github.event_name == 'push' && github.event.pull_request.user.login == 'dependabot[bot]')
       )}}
 
-    name: VisualStudio ${{ matrix.vs }}
+    name: Windows ${{ matrix.os }}/Visual C++ ${{ matrix.vc }} (${{ matrix.test_task }})
 
     env:
       GITPULLOPTIONS: --no-tags origin ${{ github.ref }}
-      OS_VER: windows-${{ matrix.vs < 2022 && '2019' || matrix.vs }}
-      # FIXME: This is a workaround for the vcpkg's issue present as of openssl 3.1.1
-      # where OpenSSL's default modules directory is incorrectly set to C:\vcpkg\packages\openssl_x64-windows\bin
-      # cf. https://github.com/ruby/openssl/pull/635#issuecomment-1596833720
-      OPENSSL_MODULES: C:\vcpkg\installed\x64-windows\bin
+      VCPKG_DEFAULT_TRIPLET: ${{ matrix.target || 'x64' }}-windows
 
     steps:
       - run: md build
         working-directory:
 
-      - name: find tools
-        id: find-tools
-        run: |
-          ::- find needed tools
-          set NEEDS=
-          for %%I in (patch.exe) do if "%%~$PATH:I" == "" (
-            echo NEEDS=%NEEDS% %%I
-          ) else (
-            echo %%I: %%~$PATH:I
-          )
-          echo needs=%NEEDS% >> %GITHUB_OUTPUT%
-
-      - uses: msys2/setup-msys2@d40200dc2db4c351366b048a9565ad82919e1c24 # v2
-        id: setup-msys2
+      - uses: ruby/setup-ruby@a4effe49ee8ee5b8b5091268c473a4628afb5651 # v1.245.0
         with:
-          update: true
-          install: >-
-            ${{ steps.find-patch.outputs.needs }}
-        if: ${{ steps.find-patch.outputs.needs != '' }}
+          # windows-11-arm has only 3.4.1, 3.4.2, 3.4.3, head
+          ruby-version: ${{ !endsWith(matrix.os, 'arm') && '3.1' || '3.4' }}
+          bundler: none
+          windows-toolchain: none
 
-      - uses: actions/cache@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 # v3.3.1
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
-          path: C:\vcpkg\downloads
-          key: ${{ runner.os }}-vcpkg-download-${{ env.OS_VER }}-${{ github.sha }}
-          restore-keys: |
-            ${{ runner.os }}-vcpkg-download-${{ env.OS_VER }}-
-            ${{ runner.os }}-vcpkg-download-
+          sparse-checkout-cone-mode: false
+          sparse-checkout: /.github
 
-      - uses: actions/cache@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 # v3.3.1
+      - uses: ./.github/actions/setup/directories
         with:
-          path: C:\vcpkg\installed
-          key: ${{ runner.os }}-vcpkg-installed-${{ env.OS_VER }}-${{ github.sha }}
-          restore-keys: |
-            ${{ runner.os }}-vcpkg-installed-${{ env.OS_VER }}-
-            ${{ runner.os }}-vcpkg-installed-
-
-      - name: Install libraries with vcpkg
-        run: |
-          vcpkg --triplet x64-windows install libffi libyaml openssl readline zlib
+          srcdir: src
+          builddir: build
 
-      - name: Install libraries with scoop
+      - name: Install tools with scoop
         run: |
-          iex "& {$(irm get.scoop.sh)} -RunAsAdmin"
+          Set-ExecutionPolicy -ExecutionPolicy RemoteSigned -Scope CurrentUser
+          iwr -useb get.scoop.sh | iex
           Join-Path (Resolve-Path ~).Path "scoop\shims" >> $Env:GITHUB_PATH
+          scoop install vcpkg uutils-coreutils cmake@3.31.6
         shell: pwsh
 
-      - uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0
+      - name: Restore vcpkg artifact
+        uses: actions/cache/restore@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
         with:
-          sparse-checkout-cone-mode: false
-          sparse-checkout: /.github
+          path: src\vcpkg_installed
+          key: windows-${{ matrix.os }}-vcpkg-${{ hashFiles('src/vcpkg.json') }}
 
-      - uses: ./.github/actions/setup/directories
+      - name: Install libraries with vcpkg
+        run: |
+          vcpkg install --vcpkg-root=C:\Users\runneradmin\scoop\apps\vcpkg\current
+        working-directory: src
+
+      - name: Save vcpkg artifact
+        uses: actions/cache/save@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
         with:
-          srcdir: src
-          builddir: build
+          path: src\vcpkg_installed
+          key: windows-${{ matrix.os }}-vcpkg-${{ hashFiles('src/vcpkg.json') }}
 
       - name: setup env
+        # Available Ruby versions: https://github.com/actions/runner-images/blob/main/images/windows/Windows2019-Readme.md#ruby
         # %TEMP% is inconsistent with %TMP% and test-all expects they are consistent.
         # https://github.com/actions/virtual-environments/issues/712#issuecomment-613004302
         run: |
-          set VS=${{ matrix.vs }}
-          set VCVARS=${{ matrix.vcvars || '' }}
-          if not "%VCVARS%" == "" goto :vcset
-            set VCVARS="C:\Program Files (x86)\Microsoft Visual Studio\%VS%\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
-            if not exist %VCVARS% set VCVARS="C:\Program Files\Microsoft Visual Studio\%VS%\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
-          :vcset
-          set | C:\msys64\usr\bin\sort > old.env
-          call %VCVARS%
+          ::- Set up VC ${{ matrix.vc }}
+          set | uutils sort > old.env
+          call ..\src\win32\vssetup.cmd ^
+            -arch=${{ matrix.target || 'amd64' }} ^
+            ${{ matrix.vcvars && '-vcvars_ver=' || '' }}${{ matrix.vcvars }}
           nmake -f nul
           set TMP=%USERPROFILE%\AppData\Local\Temp
           set TEMP=%USERPROFILE%\AppData\Local\Temp
           set MAKEFLAGS=l
           set /a TEST_JOBS=(15 * %NUMBER_OF_PROCESSORS% / 10) > nul
-          set | C:\msys64\usr\bin\sort > new.env
-          C:\msys64\usr\bin\comm -13 old.env new.env >> %GITHUB_ENV%
+          set RUBY_OPT_DIR=%GITHUB_WORKSPACE:\=/%/src/vcpkg_installed/%VCPKG_DEFAULT_TRIPLET%
+          set | uutils sort > new.env
+          uutils comm -13 old.env new.env >> %GITHUB_ENV%
           del *.env
 
+      - name: baseruby version
+        run: ruby -v
+
       - name: compiler version
         run: cl
 
-      - name: link libraries
-        run: |
-          for %%I in (C:\vcpkg\installed\x64-windows\bin\*.dll) do (
-            if not %%~nI == readline mklink %%~nxI %%I
-          )
-          for %%I in (libcrypto-1_1-x64 libssl-1_1-x64) do (
-            ren c:\Windows\System32\%%I.dll %%I.dll_
-          )
+      - name: volume info
+        run: Get-Volume
+        shell: pwsh
 
+      # TODO: We should use `../src` instead of `D:/a/ruby/ruby/src`
       - name: Configure
         run: >-
           ../src/win32/configure.bat --disable-install-doc
-          --with-opt-dir=C:/vcpkg/installed/x64-windows
+          --with-opt-dir=%RUBY_OPT_DIR%
+          --with-gmp
+
+      - run: nmake prepare-vcpkg
 
       - run: nmake incs
 
       - run: nmake extract-extlibs
 
-      - run: nmake
+      # On all other platforms, test-spec depending on extract-gems (in common.mk) is enough.
+      # But not for this Visual Studio workflow. So here we extract gems before building.
+      - run: nmake extract-gems
 
-      - run: nmake test
-        timeout-minutes: 5
+      # windows-11-arm runner cannot run `ruby tool/file2lastrev.rb --revision.h --output=revision.h`
+      - name: make revision.h
+        run: |
+          if not exist revision.h (
+            for /f "tokens=1-3" %%I in ('git log -1 "--date=format-local:%%F %%T" "--format=%%H %%cd" @') do (
+              set rev=%%I
+              set dt=%%J
+              set tm=%%K
+            )
+            call set yy=%%dt:~0,4%%
+            call set /a mm=100%%dt:~5,2%% %%%% 100
+            call set /a dd=100%%dt:~8,2%% %%%% 100
+            call set branch=%%GITHUB_REF:refs/heads/=%%
+            (
+              call echo #define RUBY_REVISION "%%rev:~,10%%"
+              call echo #define RUBY_FULL_REVISION "%%rev%%"
+              call echo #define RUBY_BRANCH_NAME "%%branch%%"
+              call echo #define RUBY_RELEASE_DATETIME "%%dt%%T%%tm%%"
+              call echo #define RUBY_RELEASE_YEAR %%yy%%
+              call echo #define RUBY_RELEASE_MONTH %%mm%%
+              call echo #define RUBY_RELEASE_DAY %%dd%%
+            ) > revision.h
+            copy /y NUL .revision.time
+          )
+          type revision.h
+        env:
+          TZ: UTC
 
-      - run: nmake test-spec
-        timeout-minutes: 10
+      - run: nmake
 
-      - run: nmake test-all
+      - name: Set up Launchable
+        uses: ./.github/actions/launchable/setup
+        with:
+          os: windows-${{ matrix.os < 2022 && '2019' || matrix.os }}
+          launchable-token: ${{ secrets.LAUNCHABLE_TOKEN }}
+          builddir: build
+          srcdir: src
+          test-task: ${{ matrix.test_task || 'check' }}
+        continue-on-error: true
+        if: ${{ matrix.test_task != 'test-bundled-gems' }}
+        timeout-minutes: 3
+
+      - run: nmake ${{ matrix.test_task || 'check' }}
         env:
-          RUBY_TESTOPTS: -j${{ env.TEST_JOBS || 4 }} --job-status=normal
-        timeout-minutes: 60
+          RUBY_TESTOPTS: -j${{ env.TEST_JOBS || 4 }}
+        timeout-minutes: 70
 
       - uses: ./.github/actions/slack
         with:
-          label: VS${{ matrix.vs }} / ${{ matrix.test_task || 'check' }}
+          label: Windows ${{ matrix.os }} / VC ${{ matrix.vc }} / ${{ matrix.test_task || 'check' }}
           SLACK_WEBHOOK_URL: ${{ secrets.SIMPLER_ALERTS_URL }} # ruby-lang slack: ruby/simpler-alerts-bot
-        if: ${{ failure() && github.event_name == 'push' }}
+        if: ${{ failure() }}
+
+  result:
+    if: ${{ always() }}
+    name: ${{ github.workflow }} result
+    runs-on: windows-latest
+    needs: [make]
+    steps:
+      - run: exit 1
+        working-directory:
+        if: ${{ contains(needs.*.result, 'failure') || contains(needs.*.result, 'cancelled') }}
 
 defaults:
   run:
diff --git a/.github/workflows/wsl.yml b/.github/workflows/wsl.yml
new file mode 100644
index 00000000000000..af490dffd74d1b
--- /dev/null
+++ b/.github/workflows/wsl.yml
@@ -0,0 +1,72 @@
+name: Ubuntu on WSL
+
+on:
+  push:
+    paths-ignore:
+      - 'doc/**'
+      - '**/man/*'
+      - '**.md'
+      - '**.rdoc'
+      - '**/.document'
+      - '.*.yml'
+  pull_request:
+    # Do not use paths-ignore for required status checks
+    # https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/collaborating-on-repositories-with-code-quality-features/troubleshooting-required-status-checks#handling-skipped-but-required-checks
+  merge_group:
+
+jobs:
+  wsl:
+    runs-on: windows-2025
+
+    if: >-
+      ${{!(false
+      || contains(github.event.head_commit.message, '[DOC]')
+      || contains(github.event.head_commit.message, 'Document')
+      || contains(github.event.pull_request.title, '[DOC]')
+      || contains(github.event.pull_request.title, 'Document')
+      || contains(github.event.pull_request.labels.*.name, 'Documentation')
+      || (github.event_name == 'push' && github.event.pull_request.user.login == 'dependabot[bot]')
+      )}}
+
+    steps:
+      - name: Install or update WSL
+        uses: Ubuntu/WSL/.github/actions/wsl-install@main
+        with:
+          distro: Ubuntu-24.04
+
+      - name: Install dependencies
+        uses: Ubuntu/WSL/.github/actions/wsl-bash@main
+        with:
+         distro: Ubuntu-24.04
+         working-dir: /tmp/github/
+         exec: |
+            DEBIAN_FRONTEND=noninteractive sudo apt update
+            DEBIAN_FRONTEND=noninteractive sudo apt install -y ruby build-essential autoconf libssl-dev libyaml-dev zlib1g-dev libgmp-dev libffi-dev
+
+      - name: Check out the repository
+        uses: Ubuntu/WSL/.github/actions/wsl-checkout@main
+        with:
+          distro: Ubuntu-24.04
+          working-dir: /tmp/github/
+          submodules: true
+
+      - name: Build
+        uses: Ubuntu/WSL/.github/actions/wsl-bash@main
+        with:
+         distro: Ubuntu-24.04
+         working-dir: /tmp/github/
+         exec: |
+            ./autogen.sh
+            ./configure --disable-install-doc
+            make ruby -j4
+            make extract-gems
+            make -j4
+
+      - name: Test
+        uses: Ubuntu/WSL/.github/actions/wsl-bash@main
+        with:
+         distro: Ubuntu-24.04
+         working-dir: /tmp/github/
+         exec: |
+            ./ruby -v
+            # make check TESTS="-j4" MSPECOPT="-j"
diff --git a/.github/workflows/yjit-macos.yml b/.github/workflows/yjit-macos.yml
new file mode 100644
index 00000000000000..60139257af306c
--- /dev/null
+++ b/.github/workflows/yjit-macos.yml
@@ -0,0 +1,192 @@
+name: YJIT macOS Arm64
+on:
+  push:
+    branches:
+      - master
+    paths-ignore:
+      - 'doc/**'
+      - '**/man/*'
+      - '**.md'
+      - '**.rdoc'
+      - '**/.document'
+      - '.*.yml'
+  pull_request:
+    types:
+      - opened
+      - synchronize
+      - reopened
+    # Do not use paths-ignore for required status checks
+    # https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/collaborating-on-repositories-with-code-quality-features/troubleshooting-required-status-checks#handling-skipped-but-required-checks
+  merge_group:
+
+concurrency:
+  group: ${{ github.workflow }} / ${{ startsWith(github.event_name, 'pull') && github.ref_name || github.sha }}
+  cancel-in-progress: ${{ startsWith(github.event_name, 'pull') }}
+
+permissions:
+  contents: read
+
+jobs:
+  cargo:
+    name: cargo test
+
+    runs-on: macos-14
+
+    if: >-
+      ${{!(false
+      || contains(github.event.head_commit.message, '[DOC]')
+      || contains(github.event.head_commit.message, 'Document')
+      || contains(github.event.pull_request.title, '[DOC]')
+      || contains(github.event.pull_request.title, 'Document')
+      || contains(github.event.pull_request.labels.*.name, 'Documentation')
+      || (github.event_name == 'push' && github.event.pull_request.user.login == 'dependabot[bot]')
+      )}}
+
+    steps:
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+
+      - run: RUST_BACKTRACE=1 cargo test
+        working-directory: yjit
+
+      # Also compile and test with all features enabled
+      - run: RUST_BACKTRACE=1 cargo test --all-features
+        working-directory: yjit
+
+      # Check that we can build in release mode too
+      - run: cargo build --release
+        working-directory: yjit
+
+  make:
+    strategy:
+      matrix:
+        include:
+          - test_task: 'check'
+            configure: '--enable-yjit'
+            yjit_opts: '--yjit'
+          - test_task: 'check'
+            configure: '--enable-yjit=dev'
+            yjit_opts: '--yjit-call-threshold=1 --yjit-verify-ctx --yjit-code-gc'
+            specopts: '-T --yjit-call-threshold=1 -T --yjit-verify-ctx -T --yjit-code-gc'
+      fail-fast: false
+
+    env:
+      GITPULLOPTIONS: --no-tags origin ${{ github.ref }}
+      RUN_OPTS: ${{ matrix.yjit_opts }}
+      SPECOPTS: ${{ matrix.specopts }}
+
+    runs-on: macos-14
+
+    if: >-
+      ${{!(false
+      || contains(github.event.head_commit.message, '[DOC]')
+      || contains(github.event.head_commit.message, 'Document')
+      || contains(github.event.pull_request.title, '[DOC]')
+      || contains(github.event.pull_request.title, 'Document')
+      || contains(github.event.pull_request.labels.*.name, 'Documentation')
+      || (github.event_name == 'push' && github.event.pull_request.user.login == 'dependabot[bot]')
+      )}}
+
+    steps:
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+        with:
+          sparse-checkout-cone-mode: false
+          sparse-checkout: /.github
+
+      - name: Install libraries
+        uses: ./.github/actions/setup/macos
+
+      - uses: ./.github/actions/setup/directories
+        with:
+          srcdir: src
+          builddir: build
+          makeup: true
+          dummy-files: ${{ matrix.test_task == 'check' }}
+          # Set fetch-depth: 10 so that Launchable can receive commits information.
+          fetch-depth: 10
+
+      - name: Run configure
+        run: ../src/configure -C --disable-install-doc ${{ matrix.configure }}
+
+      - run: make prepare-gems
+        if: ${{ matrix.test_task == 'test-bundled-gems' }}
+
+      - run: make
+
+      - name: Verify that --yjit-dump-disasm works
+        run: |
+          ./miniruby --yjit-call-threshold=1 --yjit-dump-disasm -e0 | \
+          wc -l | \
+          ruby -ne 'raise "Disassembly seems broken in dev build (output has too few lines)" unless $_.to_i > 10'
+        if: ${{ contains(matrix.configure, 'jit=dev') }}
+
+      - name: Enable YJIT through ENV
+        run: echo "RUBY_YJIT_ENABLE=1" >> $GITHUB_ENV
+
+      - name: Set test options for skipped tests
+        run: |
+          set -x
+          TESTS="$(echo "${{ matrix.skipped_tests }}" | sed 's| |$$/ -n!/|g;s|^|-n!/|;s|$|$$/|')"
+          echo "TESTS=${TESTS}" >> $GITHUB_ENV
+        if: ${{ matrix.test_task == 'check' && matrix.skipped_tests }}
+
+      - name: Set up Launchable
+        id: launchable
+        uses: ./.github/actions/launchable/setup
+        with:
+          os: macos-14
+          test-opts: ${{ matrix.configure }}
+          launchable-token: ${{ secrets.LAUNCHABLE_TOKEN }}
+          builddir: build
+          srcdir: src
+          is-yjit: true
+        continue-on-error: true
+        timeout-minutes: 3
+
+      - name: make ${{ matrix.test_task }}
+        run: |
+          test -n "${LAUNCHABLE_STDOUT}" && exec 1> >(tee "${LAUNCHABLE_STDOUT}")
+          test -n "${LAUNCHABLE_STDERR}" && exec 2> >(tee "${LAUNCHABLE_STDERR}")
+
+          make -s ${{ matrix.test_task }} ${TESTS:+TESTS="$TESTS"} \
+            RUN_OPTS="$RUN_OPTS" \
+            SPECOPTS="$SPECOPTS"
+        timeout-minutes: 60
+        env:
+          RUBY_TESTOPTS: '-q --tty=no'
+          TEST_BUNDLED_GEMS_ALLOW_FAILURES: ''
+          SYNTAX_SUGGEST_TIMEOUT: '5'
+          PRECHECK_BUNDLED_GEMS: 'no'
+          LAUNCHABLE_STDOUT: ${{ steps.launchable.outputs.stdout_report_path }}
+          LAUNCHABLE_STDERR: ${{ steps.launchable.outputs.stderr_report_path }}
+        continue-on-error: ${{ matrix.continue-on-test_task || false }}
+
+      - name: make skipped tests
+        run: |
+          make -s test-all TESTS="${TESTS//-n!\//-n/}"
+        env:
+          GNUMAKEFLAGS: ''
+          RUBY_TESTOPTS: '-v --tty=no'
+          PRECHECK_BUNDLED_GEMS: 'no'
+        if: ${{ matrix.test_task == 'check' && matrix.skipped_tests }}
+        continue-on-error: ${{ matrix.continue-on-skipped_tests || false }}
+
+      - uses: ./.github/actions/slack
+        with:
+          label: ${{ matrix.test_task }} ${{ matrix.configure }} ${{ matrix.yjit_opts }}
+          SLACK_WEBHOOK_URL: ${{ secrets.SIMPLER_ALERTS_URL }} # ruby-lang slack: ruby/simpler-alerts-bot
+        if: ${{ failure() }}
+
+  result:
+    if: ${{ always() }}
+    name: ${{ github.workflow }} result
+    runs-on: macos-14
+    needs: [make]
+    steps:
+      - name: ${{ github.workflow }} jobs have failed
+        run: exit 1
+        working-directory:
+        if: ${{ contains(needs.*.result, 'failure') || contains(needs.*.result, 'cancelled') }}
+
+defaults:
+  run:
+    working-directory: build
diff --git a/.github/workflows/yjit-ubuntu.yml b/.github/workflows/yjit-ubuntu.yml
index 45c7a224441356..d71c5df48a51b8 100644
--- a/.github/workflows/yjit-ubuntu.yml
+++ b/.github/workflows/yjit-ubuntu.yml
@@ -3,24 +3,15 @@ on:
   push:
     paths-ignore:
       - 'doc/**'
-      - '**/man'
+      - '**/man/*'
       - '**.md'
       - '**.rdoc'
       - '**/.document'
+      - '.*.yml'
   pull_request:
-    paths-ignore:
-      - 'doc/**'
-      - '**/man'
-      - '**.md'
-      - '**.rdoc'
-      - '**/.document'
+    # Do not use paths-ignore for required status checks
+    # https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/collaborating-on-repositories-with-code-quality-features/troubleshooting-required-status-checks#handling-skipped-but-required-checks
   merge_group:
-    paths-ignore:
-      - 'doc/**'
-      - '**/man'
-      - '**.md'
-      - '**.rdoc'
-      - '**/.document'
 
 concurrency:
   group: ${{ github.workflow }} / ${{ startsWith(github.event_name, 'pull') && github.ref_name || github.sha }}
@@ -31,13 +22,21 @@ permissions:
 
 jobs:
   cargo:
-    name: Rust cargo test
+    name: cargo test
 
     # GitHub Action's image seems to already contain a Rust 1.58.0.
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
+
+    if: >-
+      ${{!(false
+      || contains(github.event.head_commit.message, '[DOC]')
+      || contains(github.event.pull_request.title, '[DOC]')
+      || contains(github.event.pull_request.labels.*.name, 'Documentation')
+      || (github.event_name == 'push' && github.event.pull_request.user.login == 'dependabot[bot]')
+      )}}
 
     steps:
-      - uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
 
       # For now we can't run cargo test --offline because it complains about the
       # capstone dependency, even though the dependency is optional
@@ -55,13 +54,21 @@ jobs:
         working-directory: yjit
 
   lint:
-    name: Rust lint
+    name: cargo clippy
 
     # GitHub Action's image seems to already contain a Rust 1.58.0.
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
+
+    if: >-
+      ${{!(false
+      || contains(github.event.head_commit.message, '[DOC]')
+      || contains(github.event.pull_request.title, '[DOC]')
+      || contains(github.event.pull_request.labels.*.name, 'Documentation')
+      || (github.event_name == 'push' && github.event.pull_request.user.login == 'dependabot[bot]')
+      )}}
 
     steps:
-      - uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
 
       # Check that we don't have linting errors in release mode, too
       - run: cargo clippy --all-targets --all-features
@@ -74,7 +81,8 @@ jobs:
         include:
           - test_task: 'yjit-bindgen'
             hint: 'To fix: use patch in logs'
-            configure: '--with-gcc=clang-12 --enable-yjit=dev'
+            configure: '--with-gcc=clang-14 --enable-yjit=dev'
+            libclang_path: '/usr/lib/llvm-14/lib/libclang.so.1'
 
           - test_task: 'check'
             # YJIT should be automatically built in release mode on x86-64 Linux with rustc present
@@ -87,10 +95,8 @@ jobs:
 
           - test_task: 'check'
             configure: '--enable-yjit=dev'
-            yjit_opts: '--yjit-call-threshold=1 --yjit-verify-ctx'
-
-          - test_task: 'test-all TESTS=--repeat-count=2'
-            configure: '--enable-yjit=dev'
+            yjit_opts: '--yjit-call-threshold=1 --yjit-verify-ctx --yjit-code-gc'
+            specopts: '-T --yjit-call-threshold=1 -T --yjit-verify-ctx -T --yjit-code-gc'
 
           - test_task: 'test-bundled-gems'
             configure: '--enable-yjit=dev'
@@ -98,38 +104,50 @@ jobs:
           - test_task: 'yjit-bench'
             configure: '--enable-yjit=dev'
             yjit_bench_opts: '--yjit-stats'
+            continue-on-test_task: true
 
     env:
       GITPULLOPTIONS: --no-tags origin ${{ github.ref }}
       RUN_OPTS: ${{ matrix.yjit_opts }}
       YJIT_BENCH_OPTS: ${{ matrix.yjit_bench_opts }}
+      SPECOPTS: ${{ matrix.specopts }}
       RUBY_DEBUG: ci
       BUNDLE_JOBS: 8 # for yjit-bench
       RUST_BACKTRACE: 1
 
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
 
     if: >-
       ${{!(false
       || contains(github.event.head_commit.message, '[DOC]')
+      || contains(github.event.head_commit.message, 'Document')
       || contains(github.event.pull_request.title, '[DOC]')
+      || contains(github.event.pull_request.title, 'Document')
       || contains(github.event.pull_request.labels.*.name, 'Documentation')
-      || (github.event_name == 'push' && github.actor == 'dependabot[bot]')
+      || (github.event_name == 'push' && github.event.pull_request.user.login == 'dependabot[bot]')
       )}}
 
     steps:
-      - uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           sparse-checkout-cone-mode: false
           sparse-checkout: /.github
 
       - uses: ./.github/actions/setup/ubuntu
 
+      - uses: ruby/setup-ruby@a4effe49ee8ee5b8b5091268c473a4628afb5651 # v1.245.0
+        with:
+          ruby-version: '3.1'
+          bundler: none
+
       - uses: ./.github/actions/setup/directories
         with:
           srcdir: src
           builddir: build
           makeup: true
+          dummy-files: ${{ matrix.test_task == 'check' }}
+          # Set fetch-depth: 10 so that Launchable can receive commits information.
+          fetch-depth: 10
 
       - name: Install Rust
         if: ${{ matrix.rust_version }}
@@ -145,10 +163,12 @@ jobs:
 
       - run: make
 
-      - name: Create dummy files in build dir
+      - name: Verify that --yjit-dump-disasm works
         run: |
-          ./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)")}'
-        if: ${{ matrix.test_task == 'check' }}
+          ./miniruby --yjit-call-threshold=1 --yjit-dump-disasm -e0 | \
+          wc -l | \
+          ruby -ne 'raise "Disassembly seems broken in dev build (output has too few lines)" unless $_.to_i > 10'
+        if: ${{ contains(matrix.configure, 'jit=dev') }}
 
       - name: Enable YJIT through ENV
         run: echo "RUBY_YJIT_ENABLE=1" >> $GITHUB_ENV
@@ -157,16 +177,38 @@ jobs:
       - name: Check YJIT enabled
         run: ./miniruby --yjit -v | grep "+YJIT"
 
+      - name: Set up Launchable
+        id: launchable
+        uses: ./.github/actions/launchable/setup
+        with:
+          os: ubuntu-22.04
+          test-opts: ${{ matrix.configure }}
+          launchable-token: ${{ secrets.LAUNCHABLE_TOKEN }}
+          builddir: build
+          srcdir: src
+          is-yjit: true
+        continue-on-error: true
+        timeout-minutes: 3
+
       - name: make ${{ matrix.test_task }}
-        run: make -s -j ${{ matrix.test_task }} RUN_OPTS="$RUN_OPTS" YJIT_BENCH_OPTS="$YJIT_BENCH_OPTS" YJIT_BINDGEN_DIFF_OPTS="$YJIT_BINDGEN_DIFF_OPTS"
-        timeout-minutes: 60
+        run: |
+          test -n "${LAUNCHABLE_STDOUT}" && exec 1> >(tee "${LAUNCHABLE_STDOUT}")
+          test -n "${LAUNCHABLE_STDERR}" && exec 2> >(tee "${LAUNCHABLE_STDERR}")
+
+          make -s ${{ matrix.test_task }} ${TESTS:+TESTS="$TESTS"} \
+            RUN_OPTS="$RUN_OPTS" MSPECOPT=--debug SPECOPTS="$SPECOPTS" \
+            YJIT_BENCH_OPTS="$YJIT_BENCH_OPTS" YJIT_BINDGEN_DIFF_OPTS="$YJIT_BINDGEN_DIFF_OPTS"
+        timeout-minutes: 90
         env:
           RUBY_TESTOPTS: '-q --tty=no'
           TEST_BUNDLED_GEMS_ALLOW_FAILURES: ''
           PRECHECK_BUNDLED_GEMS: 'no'
           SYNTAX_SUGGEST_TIMEOUT: '5'
           YJIT_BINDGEN_DIFF_OPTS: '--exit-code'
-        continue-on-error: ${{ matrix.test_task == 'yjit-bench' }}
+          LIBCLANG_PATH: ${{ matrix.libclang_path }}
+          LAUNCHABLE_STDOUT: ${{ steps.launchable.outputs.stdout_report_path }}
+          LAUNCHABLE_STDERR: ${{ steps.launchable.outputs.stderr_report_path }}
+        continue-on-error: ${{ matrix.continue-on-test_task || false }}
 
       - name: Show ${{ github.event.pull_request.base.ref }} GitHub URL for yjit-bench comparison
         run: echo "https://github.com/${BASE_REPO}/commit/${BASE_SHA}"
@@ -179,7 +221,17 @@ jobs:
         with:
           label: ${{ matrix.test_task }} ${{ matrix.configure }}
           SLACK_WEBHOOK_URL: ${{ secrets.SIMPLER_ALERTS_URL }} # ruby-lang slack: ruby/simpler-alerts-bot
-        if: ${{ failure() && github.event_name == 'push' }}
+        if: ${{ failure() }}
+
+  result:
+    if: ${{ always() }}
+    name: ${{ github.workflow }} result
+    runs-on: ubuntu-latest
+    needs: [make]
+    steps:
+      - run: exit 1
+        working-directory:
+        if: ${{ contains(needs.*.result, 'failure') || contains(needs.*.result, 'cancelled') }}
 
 defaults:
   run:
diff --git a/.github/workflows/zjit-macos.yml b/.github/workflows/zjit-macos.yml
new file mode 100644
index 00000000000000..7a36b296f11afd
--- /dev/null
+++ b/.github/workflows/zjit-macos.yml
@@ -0,0 +1,172 @@
+name: ZJIT macOS Arm64
+on:
+  push:
+    branches:
+      - master
+    paths-ignore:
+      - 'doc/**'
+      - '**/man/*'
+      - '**.md'
+      - '**.rdoc'
+      - '**/.document'
+      - '.*.yml'
+  pull_request:
+    types:
+      - opened
+      - synchronize
+      - reopened
+    # Do not use paths-ignore for required status checks
+    # https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/collaborating-on-repositories-with-code-quality-features/troubleshooting-required-status-checks#handling-skipped-but-required-checks
+  merge_group:
+
+concurrency:
+  group: ${{ github.workflow }} / ${{ startsWith(github.event_name, 'pull') && github.ref_name || github.sha }}
+  cancel-in-progress: ${{ startsWith(github.event_name, 'pull') }}
+
+permissions:
+  contents: read
+
+jobs:
+  make:
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - test_task: 'zjit-test'
+            configure: '--enable-yjit=dev --enable-zjit'
+
+          - test_task: 'ruby' # build test for combo build
+            configure: '--enable-yjit --enable-zjit'
+
+          - test_task: 'test-all'
+            configure: '--enable-zjit=dev'
+            tests: '../src/test/ruby/test_zjit.rb'
+
+          - test_task: 'btest'
+            configure: '--enable-zjit=dev'
+
+    env:
+      GITPULLOPTIONS: --no-tags origin ${{ github.ref }}
+      RUN_OPTS: ${{ matrix.zjit_opts }}
+      SPECOPTS: ${{ matrix.specopts }}
+
+    runs-on: macos-14
+
+    if: >-
+      ${{!(false
+      || contains(github.event.head_commit.message, '[DOC]')
+      || contains(github.event.head_commit.message, 'Document')
+      || contains(github.event.pull_request.title, '[DOC]')
+      || contains(github.event.pull_request.title, 'Document')
+      || contains(github.event.pull_request.labels.*.name, 'Documentation')
+      || (github.event_name == 'push' && github.event.pull_request.user.login == 'dependabot[bot]')
+      )}}
+
+    steps:
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+        with:
+          sparse-checkout-cone-mode: false
+          sparse-checkout: /.github
+
+      - name: Install libraries
+        uses: ./.github/actions/setup/macos
+
+      - uses: ./.github/actions/setup/directories
+        with:
+          srcdir: src
+          builddir: build
+          makeup: true
+          dummy-files: ${{ matrix.test_task == 'check' }}
+          # Set fetch-depth: 10 so that Launchable can receive commits information.
+          fetch-depth: 10
+
+      - uses: taiki-e/install-action@v2
+        with:
+          tool: nextest@0.9
+        if: ${{ matrix.test_task == 'zjit-test' }}
+
+      - name: Install Rust # TODO(alan): remove when GitHub images catch up past 1.85.0
+        run: rustup default 1.85.0
+
+      - name: Run configure
+        run: ../src/configure -C --disable-install-doc ${{ matrix.configure }}
+
+      - run: make prepare-gems
+        if: ${{ matrix.test_task == 'test-bundled-gems' }}
+
+      - run: make
+
+      - name: Verify that --zjit-dump-disasm works
+        run: |
+          ./miniruby --zjit-call-threshold=1 --zjit-dump-disasm -e0 | \
+          wc -l | \
+          ruby -ne 'raise "Disassembly seems broken in dev build (output has too few lines)" unless $_.to_i > 10'
+        if: ${{ contains(matrix.configure, 'jit=dev') }}
+
+      - name: btest
+        run: |
+          RUST_BACKTRACE=1 ruby --disable=gems ../src/bootstraptest/runner.rb --ruby="./miniruby -I../src/lib -I. -I.ext/common --zjit-call-threshold=1" \
+          ../src/bootstraptest/test_attr.rb \
+          ../src/bootstraptest/test_autoload.rb \
+          ../src/bootstraptest/test_block.rb \
+          ../src/bootstraptest/test_class.rb \
+          ../src/bootstraptest/test_constant_cache.rb \
+          ../src/bootstraptest/test_env.rb \
+          ../src/bootstraptest/test_eval.rb \
+          ../src/bootstraptest/test_exception.rb \
+          ../src/bootstraptest/test_fiber.rb \
+          ../src/bootstraptest/test_finalizer.rb \
+          ../src/bootstraptest/test_flip.rb \
+          ../src/bootstraptest/test_flow.rb \
+          ../src/bootstraptest/test_fork.rb \
+          ../src/bootstraptest/test_gc.rb \
+          ../src/bootstraptest/test_insns.rb \
+          ../src/bootstraptest/test_io.rb \
+          ../src/bootstraptest/test_jump.rb \
+          ../src/bootstraptest/test_literal.rb \
+          ../src/bootstraptest/test_literal_suffix.rb \
+          ../src/bootstraptest/test_load.rb \
+          ../src/bootstraptest/test_marshal.rb \
+          ../src/bootstraptest/test_massign.rb \
+          ../src/bootstraptest/test_method.rb \
+          ../src/bootstraptest/test_objectspace.rb \
+          ../src/bootstraptest/test_proc.rb \
+          ../src/bootstraptest/test_ractor.rb \
+          ../src/bootstraptest/test_string.rb \
+          ../src/bootstraptest/test_struct.rb \
+          ../src/bootstraptest/test_syntax.rb \
+          ../src/bootstraptest/test_thread.rb \
+          ../src/bootstraptest/test_yjit_30k_ifelse.rb \
+          ../src/bootstraptest/test_yjit_30k_methods.rb \
+          ../src/bootstraptest/test_yjit_rust_port.rb
+        # ../src/bootstraptest/test_yjit.rb \
+        if: ${{ matrix.test_task == 'btest' }}
+
+      - name: make ${{ matrix.test_task }}
+        run: >-
+          make -s ${{ matrix.test_task }} ${TESTS:+TESTS="$TESTS"}
+          RUN_OPTS="$RUN_OPTS"
+          SPECOPTS="$SPECOPTS"
+        timeout-minutes: 60
+        env:
+          RUBY_TESTOPTS: '-q --tty=no'
+          TEST_BUNDLED_GEMS_ALLOW_FAILURES: ''
+          SYNTAX_SUGGEST_TIMEOUT: '5'
+          PRECHECK_BUNDLED_GEMS: 'no'
+          TESTS: ${{ matrix.tests }}
+        continue-on-error: ${{ matrix.continue-on-test_task || false }}
+        if: ${{ matrix.test_task != 'btest' }}
+
+  result:
+    if: ${{ always() }}
+    name: ${{ github.workflow }} result
+    runs-on: macos-14
+    needs: [make]
+    steps:
+      - run: exit 1
+        working-directory:
+        if: ${{ contains(needs.*.result, 'failure') || contains(needs.*.result, 'cancelled') }}
+
+defaults:
+  run:
+    working-directory: build
diff --git a/.github/workflows/zjit-ubuntu.yml b/.github/workflows/zjit-ubuntu.yml
new file mode 100644
index 00000000000000..91aa436b58bc24
--- /dev/null
+++ b/.github/workflows/zjit-ubuntu.yml
@@ -0,0 +1,197 @@
+name: ZJIT Ubuntu
+on:
+  push:
+    branches:
+      - master
+    paths-ignore:
+      - 'doc/**'
+      - '**/man/*'
+      - '**.md'
+      - '**.rdoc'
+      - '**/.document'
+      - '.*.yml'
+  pull_request:
+    types:
+      - opened
+      - synchronize
+      - reopened
+    # Do not use paths-ignore for required status checks
+    # https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/collaborating-on-repositories-with-code-quality-features/troubleshooting-required-status-checks#handling-skipped-but-required-checks
+  merge_group:
+
+concurrency:
+  group: ${{ github.workflow }} / ${{ startsWith(github.event_name, 'pull') && github.ref_name || github.sha }}
+  cancel-in-progress: ${{ startsWith(github.event_name, 'pull') }}
+
+permissions:
+  contents: read
+
+jobs:
+  make:
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - test_task: 'zjit-bindgen'
+            hint: 'To fix: use patch in logs'
+            configure: '--enable-zjit=dev --with-gcc=clang-14'
+            libclang_path: '/usr/lib/llvm-14/lib/libclang.so.1'
+
+          - test_task: 'zjit-test'
+            configure: '--enable-yjit --enable-zjit=dev'
+
+          - test_task: 'test-all'
+            configure: '--enable-zjit=dev'
+            tests: '../src/test/ruby/test_zjit.rb'
+
+          - test_task: 'btest'
+            configure: '--enable-zjit=dev'
+
+    env:
+      GITPULLOPTIONS: --no-tags origin ${{ github.ref }}
+      RUN_OPTS: ${{ matrix.zjit_opts }}
+      YJIT_BENCH_OPTS: ${{ matrix.yjit_bench_opts }}
+      SPECOPTS: ${{ matrix.specopts }}
+      RUBY_DEBUG: ci
+      BUNDLE_JOBS: 8 # for yjit-bench
+      RUST_BACKTRACE: 1
+
+    runs-on: ubuntu-22.04
+
+    if: >-
+      ${{!(false
+      || contains(github.event.head_commit.message, '[DOC]')
+      || contains(github.event.head_commit.message, 'Document')
+      || contains(github.event.pull_request.title, '[DOC]')
+      || contains(github.event.pull_request.title, 'Document')
+      || contains(github.event.pull_request.labels.*.name, 'Documentation')
+      || (github.event_name == 'push' && github.event.pull_request.user.login == 'dependabot[bot]')
+      )}}
+
+    steps:
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+        with:
+          sparse-checkout-cone-mode: false
+          sparse-checkout: /.github
+
+      - uses: ./.github/actions/setup/ubuntu
+
+      - uses: ruby/setup-ruby@a4effe49ee8ee5b8b5091268c473a4628afb5651 # v1.245.0
+        with:
+          ruby-version: '3.1'
+          bundler: none
+
+      - uses: taiki-e/install-action@v2
+        with:
+          tool: nextest@0.9
+        if: ${{ matrix.test_task == 'zjit-test' }}
+
+
+      - uses: ./.github/actions/setup/directories
+        with:
+          srcdir: src
+          builddir: build
+          makeup: true
+          dummy-files: ${{ matrix.test_task == 'check' }}
+          # Set fetch-depth: 10 so that Launchable can receive commits information.
+          fetch-depth: 10
+
+      - name: Install Rust
+        run: rustup default 1.85.0
+
+      - name: Install rustfmt
+        if: ${{ matrix.test_task == 'zjit-bindgen' }}
+        run: rustup component add rustfmt
+
+      - name: Run configure
+        run: ../src/configure -C --disable-install-doc --prefix=$(pwd)/install ${{ matrix.configure }}
+
+      - run: make incs
+
+      - run: make prepare-gems
+        if: ${{ matrix.test_task == 'test-bundled-gems' }}
+
+      - run: make
+
+      - name: Verify that --zjit-dump-disasm works
+        run: |
+          ./miniruby --zjit-call-threshold=1 --zjit-dump-disasm -e0 | \
+          wc -l | \
+          ruby -ne 'raise "Disassembly seems broken in dev build (output has too few lines)" unless $_.to_i > 10'
+        if: ${{ contains(matrix.configure, 'jit=dev') }}
+
+      # Check that the binary was built with ZJIT
+      - name: Check ZJIT enabled
+        run: ./miniruby --zjit -v | grep "+ZJIT"
+        if: ${{ matrix.configure != '--disable-zjit' }}
+
+      - name: btest
+        run: |
+          RUST_BACKTRACE=1 ruby --disable=gems ../src/bootstraptest/runner.rb --ruby="./miniruby -I../src/lib -I. -I.ext/common --zjit-call-threshold=1" \
+          ../src/bootstraptest/test_attr.rb \
+          ../src/bootstraptest/test_autoload.rb \
+          ../src/bootstraptest/test_block.rb \
+          ../src/bootstraptest/test_class.rb \
+          ../src/bootstraptest/test_constant_cache.rb \
+          ../src/bootstraptest/test_env.rb \
+          ../src/bootstraptest/test_env.rb \
+          ../src/bootstraptest/test_exception.rb \
+          ../src/bootstraptest/test_fiber.rb \
+          ../src/bootstraptest/test_finalizer.rb \
+          ../src/bootstraptest/test_flip.rb \
+          ../src/bootstraptest/test_flow.rb \
+          ../src/bootstraptest/test_fork.rb \
+          ../src/bootstraptest/test_gc.rb \
+          ../src/bootstraptest/test_insns.rb \
+          ../src/bootstraptest/test_io.rb \
+          ../src/bootstraptest/test_jump.rb \
+          ../src/bootstraptest/test_literal.rb \
+          ../src/bootstraptest/test_literal_suffix.rb \
+          ../src/bootstraptest/test_load.rb \
+          ../src/bootstraptest/test_marshal.rb \
+          ../src/bootstraptest/test_massign.rb \
+          ../src/bootstraptest/test_method.rb \
+          ../src/bootstraptest/test_objectspace.rb \
+          ../src/bootstraptest/test_proc.rb \
+          ../src/bootstraptest/test_ractor.rb \
+          ../src/bootstraptest/test_string.rb \
+          ../src/bootstraptest/test_struct.rb \
+          ../src/bootstraptest/test_syntax.rb \
+          ../src/bootstraptest/test_thread.rb \
+          ../src/bootstraptest/test_yjit_30k_ifelse.rb \
+          ../src/bootstraptest/test_yjit_30k_methods.rb \
+          ../src/bootstraptest/test_yjit_rust_port.rb
+        # ../src/bootstraptest/test_yjit.rb \
+        if: ${{ matrix.test_task == 'btest' }}
+
+      - name: make ${{ matrix.test_task }}
+        run: >-
+          make -s ${{ matrix.test_task }} ${TESTS:+TESTS="$TESTS"}
+          RUN_OPTS="$RUN_OPTS" MSPECOPT=--debug SPECOPTS="$SPECOPTS"
+          ZJIT_BINDGEN_DIFF_OPTS="$ZJIT_BINDGEN_DIFF_OPTS"
+        timeout-minutes: 90
+        env:
+          RUBY_TESTOPTS: '-q --tty=no'
+          TEST_BUNDLED_GEMS_ALLOW_FAILURES: ''
+          PRECHECK_BUNDLED_GEMS: 'no'
+          SYNTAX_SUGGEST_TIMEOUT: '5'
+          ZJIT_BINDGEN_DIFF_OPTS: '--exit-code'
+          LIBCLANG_PATH: ${{ matrix.libclang_path }}
+          TESTS: ${{ matrix.tests }}
+        continue-on-error: ${{ matrix.continue-on-test_task || false }}
+        if: ${{ matrix.test_task != 'btest' }}
+
+  result:
+    if: ${{ always() }}
+    name: ${{ github.workflow }} result
+    runs-on: ubuntu-22.04
+    needs: [make]
+    steps:
+      - name: ${{ github.workflow }} jobs have failed
+        run: exit 1
+        working-directory:
+        if: ${{ contains(needs.*.result, 'failure') || contains(needs.*.result, 'cancelled') }}
+
+defaults:
+  run:
+    working-directory: build
diff --git a/.gitignore b/.gitignore
index 631a489eeff1f8..3e8d3310f555b4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -138,12 +138,12 @@ lcov*.info
 /test.rb
 /test-coverage.dat
 /tmp
+/vcpkg_installed
 /transdb.h
 /uncommon.mk
 /verconf.h
 /verconf.mk
 /web
-/yasmdata.rb
 
 # /bin/
 
@@ -166,6 +166,7 @@ lcov*.info
 
 # /coroutine/
 !/coroutine/**/*.s
+!/coroutine/**/*.S
 
 # /enc/trans/
 /enc/trans/*.c
@@ -232,7 +233,6 @@ lcov*.info
 
 # for `make test-bundler`
 /.rspec_status
-/tool/bundler/*.lock
 
 # /tool/
 /tool/config.guess
@@ -241,27 +241,38 @@ lcov*.info
 # /win32/
 /win32/*.ico
 
-# RJIT
-/include/ruby-*/*/rb_rjit_min_header-*.h
-/lib/ruby_vm/rjit/instruction.rb
-/lib/ruby_vm/rjit/instruction.rb
-/rjit_config.h
-/rb_rjit_header.h*
 
 # YJIT
 /yjit-bench
 /yjit_exit_locations.dump
 
+# Rust
+/target
+
 # /wasm/
 /wasm/tests/*.wasm
 
-# YARP
-/lib/yarp/mutation_visitor.rb
-/lib/yarp/node.rb
-/lib/yarp/serialize.rb
-/yarp/api_node.c
-/yarp/ast.h
-/yarp/node.c
-/yarp/prettyprint.c
-/yarp/serialize.c
-/yarp/token_type.c
+# prism
+/lib/prism/compiler.rb
+/lib/prism/dispatcher.rb
+/lib/prism/dot_visitor.rb
+/lib/prism/dsl.rb
+/lib/prism/inspect_visitor.rb
+/lib/prism/mutation_compiler.rb
+/lib/prism/node.rb
+/lib/prism/reflection.rb
+/lib/prism/serialize.rb
+/lib/prism/visitor.rb
+/prism/api_node.c
+/prism/ast.h
+/prism/diagnostic.c
+/prism/diagnostic.h
+/prism/node.c
+/prism/prettyprint.c
+/prism/serialize.c
+/prism/token_type.c
+
+# tool/update-NEWS-gemlist.rb
+/bundled_gems.json
+/default_gems.json
+/gems/default_gems
diff --git a/.mailmap b/.mailmap
new file mode 100644
index 00000000000000..213a0f49164c0f
--- /dev/null
+++ b/.mailmap
@@ -0,0 +1,431 @@
+git[bot]                                <svn-admin@ruby-lang.org>
+git[bot]                                <svn-admin@ruby-lang.org> git <svn@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
+svn[bot]                                <svn-admin@ruby-lang.org> svn <svn@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
+
+# a_matsuda
+Akira Matsuda                           <ronnie@dio.jp>
+Akira Matsuda                           <ronnie@dio.jp> <a_matsuda@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
+
+# aamine
+Minero Aoki                             <aamine@loveruby.net>
+Minero Aoki                             <aamine@loveruby.net> <aamine@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
+
+# akira
+akira yamada                            <akira@ruby-lang.org>
+## akira yamada                         <akira@ruby-lang.org> <akira@rice.p.arika.org>
+akira yamada                            <akira@ruby-lang.org> <akira@arika.org>
+akira yamada                            <akira@ruby-lang.org> <akira@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
+
+# akiyoshi
+AKIYOSHI, Masamichi                     <masamichi.akiyoshi@hp.com>
+AKIYOSHI, Masamichi                     <masamichi.akiyoshi@hp.com> <akiyoshi@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
+
+# akr
+Tanaka Akira                            <akr@fsij.org>
+Tanaka Akira                            <akr@fsij.org> <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
+
+# arai
+Koji Arai                               <jca02266@nifty.ne.jp>
+Koji Arai                               <jca02266@nifty.ne.jp> <arai@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
+
+# arton
+Akio Tajima                             <artonx@yahoo.co.jp>
+Akio Tajima                             <artonx@yahoo.co.jp> <arton@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
+
+# aycabta
+aycabta                                 <aycabta@gmail.com>
+aycabta                                 <aycabta@gmail.com> <aycabta@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
+
+# ayumin
+Ayumu AIZAWA                            <ayumu.aizawa@gmail.com>
+Ayumu AIZAWA                            <ayumu.aizawa@gmail.com> <ayumin@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
+
+# azav
+Alexander Zavorine                      <alexandre.zavorine@nokia.com>
+Alexander Zavorine                      <alexandre.zavorine@nokia.com> <azav@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
+
+# charliesome
+Charlie Somerville                      <charliesome@ruby-lang.org>
+Charlie Somerville                      <charliesome@ruby-lang.org> <charliesome@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
+
+# dave
+Dave Thomas                             <dave@pragprog.com>
+Dave Thomas                             <dave@pragprog.com> <dave@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
+
+# davidflanagan
+David Flanagan                          <davidflanagan@ruby-lang.org>
+David Flanagan                          <davidflanagan@ruby-lang.org> <david@think32>
+David Flanagan                          <davidflanagan@ruby-lang.org> <david@davidflanagan.com>
+David Flanagan                          <davidflanagan@ruby-lang.org> <davidflanagan@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
+
+# dblack
+David A. Black                          <dblack@rubypal.com>
+David A. Black                          <dblack@rubypal.com> <dblack@wobblini.net>
+David A. Black                          <dblack@rubypal.com> <dblack@superlink.net>
+David A. Black                          <dblack@rubypal.com> <dblack@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
+
+# drbrain
+Eric Hodel                              <drbrain@segment7.net>
+Eric Hodel                              <drbrain@segment7.net> <drbrain@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
+
+# duerst
+Martin Dürst                            <duerst@it.aoyama.ac.jp>
+Martin Dürst                            <duerst@it.aoyama.ac.jp> <duerst@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
+
+# eban
+WATANABE Hirofumi                       <eban@ruby-lang.org>
+WATANABE Hirofumi                       <eban@ruby-lang.org> <eban@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
+
+# emboss
+Martin Bosslet                          <Martin.Bosslet@gmail.com>
+Martin Bosslet                          <Martin.Bosslet@gmail.com> <Martin.Bosslet@googlemail.com>
+Martin Bosslet                          <Martin.Bosslet@gmail.com> <emboss@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
+
+# eregon
+Benoit Daloze                           <eregontp@gmail.com>
+Benoit Daloze                           <eregontp@gmail.com> <eregon@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
+
+# evan
+Evan Phoenix                            <evan@ruby-lang.org>
+Evan Phoenix                            <evan@ruby-lang.org> <evan@fallingsnow.net>
+Evan Phoenix                            <evan@ruby-lang.org> <evan@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
+
+# glass
+Masaki Matsushita                       <glass.saga@gmail.com>
+Masaki Matsushita                       <glass.saga@gmail.com> <glass@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
+
+# gogotanaka
+Kazuki Tanaka                           <gogotanaka@ruby-lang.org>
+Kazuki Tanaka                           <gogotanaka@ruby-lang.org> <gogotanaka@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
+
+# gotoken
+Kentaro Goto                            <gotoken@gmail.com>
+Kentaro Goto                            <gotoken@gmail.com> <gotoken@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
+
+# gotoyuzo
+GOTOU Yuuzou                            <gotoyuzo@notwork.org>
+GOTOU Yuuzou                            <gotoyuzo@notwork.org> <gotoyuzo@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
+
+# gsinclair
+Gavin Sinclair                          <gsinclair@soyabean.com.au>
+Gavin Sinclair                          <gsinclair@soyabean.com.au> <gsinclair@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
+
+# H_Konishi
+KONISHI Hiromasa                        <konishih@fd6.so-net.ne.jp>
+KONISHI Hiromasa                        <konishih@fd6.so-net.ne.jp> <H_Konishi@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
+
+# headius
+Charles Oliver Nutter                   <headius@headius.com>
+Charles Oliver Nutter                   <headius@headius.com> <headius@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
+
+# hone
+Terence Lee                             <hone@heroku.com>
+Terence Lee                             <hone@heroku.com> <hone@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
+
+# hsbt
+Hiroshi SHIBATA                         <hsbt@ruby-lang.org>
+Hiroshi SHIBATA                         <hsbt@ruby-lang.org> <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
+
+# iwamatsu
+Nobuhiro Iwamatsu                       <iwamatsu@nigauri.org>
+Nobuhiro Iwamatsu                       <iwamatsu@nigauri.org> <iwamatsu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
+
+# jeg2
+James Edward Gray II                    <james@graysoftinc.com>
+James Edward Gray II                    <james@graysoftinc.com> <jeg2@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
+
+# jim
+Jim Weirich                             <jim@tardis.local>
+Jim Weirich                             <jim@tardis.local> <jim@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
+
+# k0kubun
+Takashi Kokubun                         <takashikkbn@gmail.com>
+Takashi Kokubun                         <takashikkbn@gmail.com> <k0kubun@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
+
+# kanemoto
+Yutaka Kanemoto                         <kanemoto@ruby-lang.org>
+Yutaka Kanemoto                         <kanemoto@ruby-lang.org> <kanemoto@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
+
+# katsu
+UENO Katsuhiro                          <katsu@blue.sky.or.jp>
+UENO Katsuhiro                          <katsu@blue.sky.or.jp> <katsu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
+
+# kazu
+Kazuhiro NISHIYAMA                      <zn@mbf.nifty.com>
+Kazuhiro NISHIYAMA                      <zn@mbf.nifty.com> <kazu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
+
+# keiju
+Keiju Ishitsuka                         <keiju@ishitsuka.com>
+Keiju Ishitsuka                         <keiju@ishitsuka.com> <keiju@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
+
+# knu
+Akinori MUSHA                           <knu@iDaemons.org>
+Akinori MUSHA                           <knu@iDaemons.org> <knu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
+
+# ko1
+Koichi Sasada                           <ko1@atdot.net>
+Koichi Sasada                           <ko1@atdot.net> <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
+
+# kosaki
+KOSAKI Motohiro                         <kosaki.motohiro@gmail.com>
+KOSAKI Motohiro                         <kosaki.motohiro@gmail.com> <kosaki@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
+
+# kosako
+K.Kosako                                <sndgk393@ybb.ne.jp>
+K.Kosako                                <sndgk393@ybb.ne.jp> <kosako@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
+
+# kou
+Sutou Kouhei                            <kou@clear-code.com>
+Sutou Kouhei                            <kou@clear-code.com> <kou@cozmixng.org>
+Sutou Kouhei                            <kou@clear-code.com> <kou@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
+
+# kouji
+Kouji Takao                             <kouji.takao@gmail.com>
+Kouji Takao                             <kouji.takao@gmail.com> <kouji@takao7.net>
+Kouji Takao                             <kouji.takao@gmail.com> <kouji@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
+
+# ksaito
+Kazuo Saito                             <ksaito@uranus.dti.ne.jp>
+Kazuo Saito                             <ksaito@uranus.dti.ne.jp> <ksaito@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
+
+# ktsj
+Kazuki Tsujimoto                        <kazuki@callcc.net>
+Kazuki Tsujimoto                        <kazuki@callcc.net> <ktsj@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
+
+# luislavena
+Luis Lavena                             <luislavena@gmail.com>
+Luis Lavena                             <luislavena@gmail.com> <luislavena@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
+
+# mame
+Yusuke Endoh                            <mame@ruby-lang.org>
+## Yusuke Endoh                         <mame@ruby-lang.org> <mame@tsg.ne.jp>
+Yusuke Endoh                            <mame@ruby-lang.org> <mame@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
+
+# marcandre
+Marc-Andre Lafortune                    <github@marc-andre.ca>
+Marc-Andre Lafortune                    <ruby-core@marc-andre.ca>
+Marc-Andre Lafortune                    <ruby-core@marc-andre.ca> <marcandre@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
+
+# matz
+Yukihiro "Matz" Matsumoto               <matz@ruby.or.jp>
+Yukihiro "Matz" Matsumoto               <matz@ruby.or.jp> <matz@ruby-lang.org>
+Yukihiro "Matz" Matsumoto               <matz@ruby.or.jp> <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
+
+# michal
+Michal Rokos                            <michal@ruby-lang.org>
+Michal Rokos                            <michal@ruby-lang.org> <michal@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
+
+# mneumann
+Michael Neumann                         <mneumann@ruby-lang.org>
+Michael Neumann                         <mneumann@ruby-lang.org> <mneumann@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
+
+# mrkn
+Kenta Murata                            <mrkn@mrkn.jp>
+Kenta Murata                            <mrkn@mrkn.jp> <muraken@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
+Kenta Murata                            <mrkn@mrkn.jp> <3959+mrkn@users.noreply.github.com>
+Kenta Murata                            <mrkn@mrkn.jp> <mrkn@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
+
+# nagachika
+nagachika                               <nagachika@ruby-lang.org>
+nagachika                               <nagachika@ruby-lang.org> <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
+
+# nagai
+Hidetoshi NAGAI                         <nagai@ai.kyutech.ac.jp>
+Hidetoshi NAGAI                         <nagai@ai.kyutech.ac.jp> <nagai@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
+
+# nahi
+Hiroshi Nakamura                        <nahi@ruby-lang.org>
+Hiroshi Nakamura                        <nahi@ruby-lang.org> <nahi@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
+
+# nari
+Narihiro Nakamura                       <authornari@gmail.com>
+Narihiro Nakamura                       <authornari@gmail.com> <nari@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
+
+# naruse
+NARUSE, Yui                             <naruse@airemix.jp>
+NARUSE, Yui                             <naruse@airemix.jp> <naruse@ruby-lang.org>
+NARUSE, Yui                             <naruse@airemix.jp> <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
+
+# ngoto
+Naohisa Goto                            <ngotogenome@gmail.com>
+Naohisa Goto                            <ngotogenome@gmail.com> <ngoto@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
+
+# nobu
+Nobuyoshi Nakada                        <nobu@ruby-lang.org>
+Nobuyoshi Nakada                        <nobu@ruby-lang.org> <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
+
+# normal
+Eric Wong                               <normal@ruby-lang.org>
+Eric Wong                               <normal@ruby-lang.org> <e@80x24.org>
+Eric Wong                               <normal@ruby-lang.org> <normal@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
+
+# ntalbott
+Nathaniel Talbott                       <ntalbott@ruby-lang.org>
+Nathaniel Talbott                       <ntalbott@ruby-lang.org> <ntalbott@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
+
+# ocean
+Hirokazu Yamamoto                       <ocean@m2.ccsnet.ne.jp>
+Hirokazu Yamamoto                       <ocean@m2.ccsnet.ne.jp> <ocean@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
+
+# odaira
+Rei Odaira                              <rodaira@us.ibm.com>
+Rei Odaira                              <rodaira@us.ibm.com> <Rei.Odaira@gmail.com>
+Rei Odaira                              <rodaira@us.ibm.com> <odaira@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
+
+# okkez
+okkez                                   <okkez000@gmail.com>
+okkez                                   <okkez000@gmail.com> <okkez@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
+
+# rhe
+Kazuki Yamaguchi                        <k@rhe.jp>
+Kazuki Yamaguchi                        <k@rhe.jp> <rhe@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
+
+# ryan
+Ryan Davis                              <ryand-github@zenspider.com>
+Ryan Davis                              <ryand-github@zenspider.com> <ryand-ruby@zenspider.com>
+Ryan Davis                              <ryand-github@zenspider.com> <ryan@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
+
+# samuel
+Samuel Williams                         <samuel.williams@oriontransfer.co.nz>
+Samuel Williams                         <samuel.williams@oriontransfer.co.nz> <samuel@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
+
+# seki
+Masatoshi SEKI                          <m_seki@mva.biglobe.ne.jp>
+Masatoshi SEKI                          <m_seki@mva.biglobe.ne.jp> <seki@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
+
+# ser
+Sean Russell                            <ser@germane-software.com>
+Sean Russell                            <ser@germane-software.com> <ser@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
+
+# shigek
+Shigeo Kobayashi                        <shigek@ruby-lang.org>
+Shigeo Kobayashi                        <shigek@ruby-lang.org> <shigek@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
+
+# shirosaki
+Hiroshi Shirosaki                       <h.shirosaki@gmail.com>
+Hiroshi Shirosaki                       <h.shirosaki@gmail.com> <shirosaki@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
+
+# sho-h
+Sho Hashimoto                           <sho-h@ruby-lang.org>
+Sho Hashimoto                           <sho-h@ruby-lang.org> <sho-h@netlab.jp>
+Sho Hashimoto                           <sho-h@ruby-lang.org> <sho.hsmt@gmail.com>
+Sho Hashimoto                           <sho-h@ruby-lang.org> <sho-h@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
+
+# shugo
+Shugo Maeda                             <shugo@ruby-lang.org>
+Shugo Maeda                             <shugo@ruby-lang.org> <shugo@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
+
+# shyouhei
+卜部昌平                                    <shyouhei@ruby-lang.org>
+卜部昌平                                    <shyouhei@ruby-lang.org> <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
+
+# siena
+Siena.                                  <siena@faculty.chiba-u.jp>
+Siena.                                  <siena@faculty.chiba-u.jp> <siena@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
+
+# sonots
+sonots                                  <sonots@gmail.com>
+sonots                                  <sonots@gmail.com> <sonots@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
+
+# sorah
+Sorah Fukumori                          <her@sorah.jp>
+Sorah Fukumori                          <her@sorah.jp> <sorah@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
+
+# stomar
+Marcus Stollsteimer                     <sto.mar@web.de>
+Marcus Stollsteimer                     <sto.mar@web.de> <stomar@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
+
+# suke
+Masaki Suketa                           <masaki.suketa@nifty.ne.jp>
+Masaki Suketa                           <masaki.suketa@nifty.ne.jp> <suke@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
+
+# tadd
+Tadashi Saito                           <tad.a.digger@gmail.com>
+Tadashi Saito                           <tad.a.digger@gmail.com> <tadd@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
+
+# tadf
+Tadayoshi Funaba                        <tadf@dotrb.org>
+Tadayoshi Funaba                        <tadf@dotrb.org> <tadf@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
+
+# takano32
+TAKANO Mitsuhiro                        <takano32@gmail.com>
+TAKANO Mitsuhiro                        <takano32@gmail.com> <takano32@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
+
+# tarui
+Masaya Tarui                            <tarui@ruby-lang.org>
+Masaya Tarui                            <tarui@ruby-lang.org> <tarui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
+
+# technorama
+Technorama Ltd.                         <oss-ruby@technorama.net>
+Technorama Ltd.                         <oss-ruby@technorama.net> <technorama@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
+
+# tenderlove
+Aaron Patterson                         <tenderlove@ruby-lang.org>
+Aaron Patterson                         <tenderlove@ruby-lang.org> <tenderlove@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
+
+# tmm1
+Aman Gupta                              <ruby@tmm1.net>
+Aman Gupta                              <ruby@tmm1.net> <tmm1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
+
+# ts
+Guy Decoux                              <ts@moulon.inra.fr>
+Guy Decoux                              <ts@moulon.inra.fr> <ts@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
+
+# ttate
+Takaaki Tateishi                        <ttate@ttsky.net>
+## Takaaki Tateishi                     <ttate@ttsky.net> <ttate@kt.jaist.ac.jp>
+Takaaki Tateishi                        <ttate@ttsky.net> <ttate@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
+
+# uema2
+Takaaki Uematsu                         <uema2x@jcom.home.ne.jp>
+Takaaki Uematsu                         <uema2x@jcom.home.ne.jp> <uema2@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
+
+# usa
+U.Nakamura                              <usa@ruby-lang.org>
+U.Nakamura                              <usa@ruby-lang.org> <usa@garbagecollect.jp>
+U.Nakamura                              <usa@ruby-lang.org> <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
+
+# wakou
+Wakou Aoyama                            <wakou@ruby-lang.org>
+Wakou Aoyama                            <wakou@ruby-lang.org> <wakou@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
+
+# wanabe
+wanabe                                  <s.wanabe@gmail.com>
+wanabe                                  <s.wanabe@gmail.com> <wanabe@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
+
+# watson1978
+Watson                                  <watson1978@gmail.com>
+Watson                                  <watson1978@gmail.com> <watson1978@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
+
+# wew
+William Webber                          <william@williamwebber.com>
+William Webber                          <william@williamwebber.com> <wew@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
+
+# why
+why the lucky stiff                     <why@ruby-lang.org>
+why the lucky stiff                     <why@ruby-lang.org> <why@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
+
+# xibbar
+Takeyuki FUJIOKA                        <xibbar@ruby-lang.org>
+Takeyuki FUJIOKA                        <xibbar@ruby-lang.org> <xibbar@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
+
+# yugui
+Yuki Yugui Sonoda                       <yugui@yugui.jp>
+Yuki Yugui Sonoda                       <yugui@yugui.jp> <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
+
+# yui-knk
+yui-knk                                 <spiketeika@gmail.com>
+yui-knk                                 <spiketeika@gmail.com> <yui-knk@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
+
+# yuki
+Yuki Nishijima                          <yuki24@hey.com>
+Yuki Nishijima                          <yuki24@hey.com> <mail@yukinishijima.net>
+Yuki Nishijima                          <yuki24@hey.com> <yuki@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
+
+# zsombor
+Dee Zsombor                             <zsombor@ruby-lang.org>
+Dee Zsombor                             <zsombor@ruby-lang.org> <zsombor@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
+
+# zzak
+zzak                                    <zzakscott@gmail.com>
+zzak                                    <zzakscott@gmail.com> <zzak@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
diff --git a/.rdoc_options b/.rdoc_options
index 760507c7a2d1c0..27d35e2f58b97f 100644
--- a/.rdoc_options
+++ b/.rdoc_options
@@ -1,4 +1,24 @@
 ---
 page_dir: doc
-main_page: README.md
+charset: UTF-8
+encoding: UTF-8
+main_page: index.md
 title: Documentation for Ruby development version
+visibility: :private
+rdoc_include:
+- doc
+
+exclude:
+- \Alib/irb
+- \.gemspec\z
+
+autolink_excluded_words:
+- Class
+- Method
+- Module
+- Process
+- RDoc
+- Ruby
+- Set
+
+canonical_root: https://docs.ruby-lang.org/en/master
diff --git a/.travis.yml b/.travis.yml
index c6054ae6723a46..ca68ed20abd91f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,63 +6,46 @@
 # conditions  mentioned in  the file  COPYING are  met.  Consult  the  file for
 # details.
 
-# We only manage non-amd64 free pipelines.
-# https://docs.travis-ci.com/user/billing-overview/
+# When you see Travis CI issues, or you are interested in understanding how to
+# manage, please check the link below.
+# https://github.com/ruby/ruby/wiki/CI-Servers#travis-ci
+
+# We enable Travis on the specific branches or forked repositories here.
+# https://docs.travis-ci.com/user/conditions-v1
+if: >-
+  (fork OR branch = master OR branch =~ /^ruby_\d_\d$/)
+  AND (commit_message !~ /(\[DOC\]|Document)/)
+  AND NOT (type = 'push' AND sender =~ /\[bot\]/)
 
 language: c
 
 os: linux
 
-if: commit_message !~ /\[DOC\]/
-
-dist: focal
+dist: jammy
 
 git:
   quiet: true
 
-cache:
-  ccache: true
-  directories:
-    - $HOME/config_2nd
-    - $HOME/.downloaded-cache
-
 env:
   global:
-    # The tests skipped in `make test-all`.
-    - TEST_ALL_SKIPPED_TESTS=
-    # The tests executed separately by `make test-all`.
-    - TEST_ALL_SEPARATED_TESTS=
-    # Reset timestamps early
-    - _=$(touch NEWS && find . -type f -exec touch -r NEWS {} +)
-    - CONFIGURE_TTY=no
-    - CCACHE_COMPILERCHECK=none
-    - CCACHE_NOCOMPRESS=1
-    - CCACHE_MAXSIZE=512Mi
-    - NPROC="`nproc`"
-    # JOBS and SETARCH are overridden when necessary; see below.
-    - JOBS=-j$((1+${NPROC}))
-    - SETARCH=
-    - RUBY_PREFIX=/tmp/ruby-prefix
-    - GEMS_FOR_TEST='timezone tzinfo'
+    - NPROC="$(nproc)"
+    - JOBS="-j${NPROC}"
     # 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"
-    # -O1 is faster than -O3 in our tests.
-    - optflags=-O1
-    # -g0 disables backtraces when SEGV.  Do not set that.
+    # -g0 disables backtraces when SEGV. Do not set that.
     - debugflags=-ggdb3
+    - RUBY_TESTOPTS="$JOBS -q --tty=no"
 
 .org.ruby-lang.ci.matrix-definitions:
-
-  - &gcc-10
-    compiler: gcc-10
+  - &gcc-11
+    compiler: gcc-11
     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
-        ccache
-        gcc-10
-        g++-10
+        gcc-11
+        g++-11
         libffi-dev
         libncurses-dev
         libncursesw5-dev
@@ -71,165 +54,58 @@ env:
         libyaml-dev
         openssl
         zlib1g-dev
-
-  # --------
-
-  - &arm64-linux
-    name: arm64-linux
-    arch: arm64
-    <<: *gcc-10
-
+      - gcc-11 --version
   - &ppc64le-linux
     name: ppc64le-linux
     arch: ppc64le
-    <<: *gcc-10
-
+    <<: *gcc-11
   - &s390x-linux
     name: s390x-linux
     arch: s390x
-    <<: *gcc-10
-
-  - &arm32-linux
-    name: arm32-linux
-    arch: arm64
-    # https://packages.ubuntu.com/focal/crossbuild-essential-armhf
-    compiler: arm-linux-gnueabihf-gcc
+    <<: *gcc-11
     env:
-      - SETARCH='setarch linux32 --verbose --32bit'
-      # The "TestReadline#test_interrupt_in_other_thread" started failing on arm32
-      # from https://www.travis-ci.com/github/ruby/ruby/jobs/529005145
-      - TEST_ALL_SKIPPED_TESTS=test_interrupt_in_other_thread
-    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++-10-dev:armhf
-        libffi-dev:armhf
-        libncurses-dev:armhf
-        libncursesw5-dev:armhf
-        libreadline-dev:armhf
-        libssl-dev:armhf
-        libyaml-dev:armhf
-        linux-libc-dev:armhf
-        zlib1g-dev:armhf
+      # Avoid possible test failures with the zlib applying the following patch
+      # on s390x CPU architecture.
+      # https://github.com/madler/zlib/pull/410
+      - DFLTCC=0
 
 matrix:
   include:
-    # Build every commit (Allowed Failures):
-    - <<: *arm32-linux
-    # Comment out as the 2nd arm64 pipeline is unstable.
-    # - <<: *arm64-linux
     - <<: *ppc64le-linux
     - <<: *s390x-linux
   allow_failures:
-    # We see multiple errors indicating errors on the Travis environment itself in a short while:
-    # https://app.travis-ci.com/github/ruby/ruby/jobs/544382885
-    # https://app.travis-ci.com/github/ruby/ruby/jobs/544361370
-    # It's not a fault of Ruby's arm32 support but just Travis arm32 seems unsable.
-    - name: arm32-linux
-    # - name: arm64-linux
-    # We see "Some worker was crashed." in about 40% of recent ppc64le-linux jobs
-    # e.g. https://app.travis-ci.com/github/ruby/ruby/jobs/530959548
     - name: ppc64le-linux
-    # Tentatively disable, because often hungs up **after** all tests
-    # have finished successfully and saving caches.
     - name: s390x-linux
   fast_finish: true
 
 before_script:
-  - . tool/ci_functions.sh
-  - |-
-    if [ -n "${TEST_ALL_SKIPPED_TESTS}" ]; then
-      TEST_ALL_OPTS="${TEST_ALL_OPTS} $(ci_to_excluded_test_opts "${TEST_ALL_SKIPPED_TESTS}")"
-      if [ -z "${TEST_ALL_SEPARATED_TESTS}" ]; then
-        TEST_ALL_SEPARATED_TESTS="${TEST_ALL_SKIPPED_TESTS}"
-      fi
-    fi
-  - |-
-    if [ -n "${TEST_ALL_SEPARATED_TESTS}" ]; then
-      TEST_ALL_OPTS_SEPARATED="$(ci_to_included_test_opts "${TEST_ALL_SEPARATED_TESTS}")"
-    fi
-  - echo TEST_ALL_OPTS="${TEST_ALL_OPTS}" TEST_ALL_OPTS_SEPARATED="${TEST_ALL_OPTS_SEPARATED}"
-  - rm -fr .ext autom4te.cache
-  - |-
-    [ -d ~/.downloaded-cache ] ||
-    mkdir ~/.downloaded-cache
-  - ln -s ~/.downloaded-cache
-  - "> config.status"
-  - "> .rbconfig.time"
-  - sed -f tool/prereq.status template/Makefile.in common.mk > Makefile
-  - make -s $JOBS up
-  - make -s $JOBS srcs
-  - rm -f config.status Makefile rbconfig.rb .rbconfig.time
-  - |-
-    if [ -d ~/config_2nd ]; then
-      cp -pr ~/config_2nd build
-    else
-      mkdir build
-    fi
-  - mkdir config_1st config_2nd gems/src
-  - chmod -R a-w .
-  - chmod -R u+w build config_1st config_2nd gems/src .bundle
+  - lscpu
+  - ./autogen.sh
+  - mkdir build
   - cd build
-  - |-
-    case "$CC" in
-    gcc*)   CC="ccache $CC${GCC_FLAGS:+ }$GCC_FLAGS -fno-diagnostics-color";;
-    clang*) CC="ccache $CC${GCC_FLAGS:+ }$GCC_FLAGS -fno-color-diagnostics";;
-    esac
-  - |-
-    [ ! -f config.cache ] ||
-    [ "$CC" = "`sed -n s/^ac_cv_prog_CC=//p config.cache`" ] ||
-    (set -x; exec rm config.cache)
-  - $SETARCH ../configure -C --disable-install-doc --prefix=$RUBY_PREFIX $CONFIG_FLAG
-  - cp -pr config.cache config.status .ext/include ../config_1st
-  - $SETARCH make reconfig
-  - cp -pr config.cache config.status .ext/include ../config_2nd
-  - (cd .. && exec diff -ru config_1st config_2nd)
-  - chmod u+w ..
-  - rm -rf ~/config_2nd
-  - mv ../config_2nd ~
-  - chmod u-w ..
-  - $SETARCH make -s $JOBS
-  - make -s install
-  - |-
-    [ -z "${GEMS_FOR_TEST}" ] ||
-    $RUBY_PREFIX/bin/gem install --no-document $GEMS_FOR_TEST
-  - echo "raise 'do not load ~/.irbrc in test'" > ~/.irbrc
+  - ../configure -C --disable-install-doc --prefix=$(pwd)/install
+  - make -s $JOBS
+  - make -s $JOBS install
+  # Useful info to report issues to the Ruby.
+  - $(pwd)/install/bin/ruby -v
+  # Useful info To report issues to the RubyGems.
+  - $(pwd)/install/bin/gem env
 
 script:
-  - $SETARCH make -s test -o showflags TESTOPTS="${TESTOPTS=$JOBS -q --tty=no}"
-  - ../tool/travis_wait.sh $SETARCH make -s test-all -o exts TESTOPTS="$JOBS -q --tty=no ${TEST_ALL_OPTS}" RUBYOPT="-w"
-  # Run the failing tests separately returning ok status to check if it works,
-  # visualize them.
-  - |
-    if [ -n "${TEST_ALL_OPTS_SEPARATED}" ]; then
-      $SETARCH make -s test-all -o exts TESTOPTS="$JOBS -v --tty=no ${TEST_ALL_OPTS_SEPARATED}" RUBYOPT="-w" || :
-    fi
-  - $SETARCH make -s test-spec # not using `-j` because sometimes `mspec -j` silently dies
-  - $SETARCH make -s -o showflags leaked-globals
-
-# We enable Travis on the specific branches or forked repositories here.
-if: (repo = ruby/ruby AND (branch = master OR branch =~ /^ruby_\d_\d$/)) OR repo != ruby/ruby
+  - make -s test
+  - ../tool/travis_wait.sh make -s test-all RUBYOPT="-w"
+  - ../tool/travis_wait.sh make -s test-spec
 
 # We want to be notified when something happens.
 notifications:
-  irc:
-    channels:
-      - "chat.freenode.net#ruby-core"
-    on_success: change # [always|never|change] # default: always
-    on_failure: always # [always|never|change] # default: always
-    template:
-      - "%{message} by @%{author}: See %{build_url}"
-
   webhooks:
     urls:
-      - secure: mRsoS/UbqDkKkW5p3AEqM27d4SZnV6Gsylo3bm8T/deltQzTsGzZwrm7OIBXZv0UFZdE68XmPlyHfZFLSP2V9QZ7apXMf9/vw0GtcSe1gchtnjpAPF6lYBn7nMCbVPPx9cS0dwL927fjdRM1vj7IKZ2bk4F0lAJ25R25S6teqdk= # ruby-lang slack: ruby/simpler-alerts-bot (travis)
+      # ruby-lang slack: ruby/simpler-alerts-bot (travis)
+      - secure: mRsoS/UbqDkKkW5p3AEqM27d4SZnV6Gsylo3bm8T/deltQzTsGzZwrm7OIBXZv0UFZdE68XmPlyHfZFLSP2V9QZ7apXMf9/vw0GtcSe1gchtnjpAPF6lYBn7nMCbVPPx9cS0dwL927fjdRM1vj7IKZ2bk4F0lAJ25R25S6teqdk=
     on_success: never
     on_failure: always
-
   email:
-    - jaruga@ruby-lang.org
+    recipients:
+      - jun.aruga@gmail.com
+    on_success: never
+    on_failure: always
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 13df6087cad9b6..35e79dd3b9480f 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1 +1 @@
-See ["Contributing to Ruby"](https://docs.ruby-lang.org/en/master/contributing_md.html), which includes setup and build instructions.
+See ["Contributing to Ruby"](https://docs.ruby-lang.org/en/master/contributing/contributing_md.html), which includes setup and build instructions.
diff --git a/Cargo.lock b/Cargo.lock
new file mode 100644
index 00000000000000..65131406d32876
--- /dev/null
+++ b/Cargo.lock
@@ -0,0 +1,89 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+version = 3
+
+[[package]]
+name = "capstone"
+version = "0.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "015ef5d5ca1743e3f94af9509ba6bd2886523cfee46e48d15c2ef5216fd4ac9a"
+dependencies = [
+ "capstone-sys",
+ "libc",
+]
+
+[[package]]
+name = "capstone-sys"
+version = "0.17.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2267cb8d16a1e4197863ec4284ffd1aec26fe7e57c58af46b02590a0235809a0"
+dependencies = [
+ "cc",
+ "libc",
+]
+
+[[package]]
+name = "cc"
+version = "1.2.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "525046617d8376e3db1deffb079e91cef90a89fc3ca5c185bbf8c9ecdd15cd5c"
+dependencies = [
+ "shlex",
+]
+
+[[package]]
+name = "dissimilar"
+version = "1.0.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8975ffdaa0ef3661bfe02dbdcc06c9f829dfafe6a3c474de366a8d5e44276921"
+
+[[package]]
+name = "expect-test"
+version = "1.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "63af43ff4431e848fb47472a920f14fa71c24de13255a5692e93d4e90302acb0"
+dependencies = [
+ "dissimilar",
+ "once_cell",
+]
+
+[[package]]
+name = "jit"
+version = "0.0.0"
+dependencies = [
+ "yjit",
+ "zjit",
+]
+
+[[package]]
+name = "libc"
+version = "0.2.171"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c19937216e9d3aa9956d9bb8dfc0b0c8beb6058fc4f7a4dc4d850edf86a237d6"
+
+[[package]]
+name = "once_cell"
+version = "1.21.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d"
+
+[[package]]
+name = "shlex"
+version = "1.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
+
+[[package]]
+name = "yjit"
+version = "0.1.0"
+dependencies = [
+ "capstone",
+]
+
+[[package]]
+name = "zjit"
+version = "0.0.1"
+dependencies = [
+ "capstone",
+ "expect-test",
+]
diff --git a/Cargo.toml b/Cargo.toml
new file mode 100644
index 00000000000000..6ab7e3a45f7c7d
--- /dev/null
+++ b/Cargo.toml
@@ -0,0 +1,51 @@
+# Using Cargo's workspace feature to build all the Rust code in
+# into a single package.
+# TODO(alan) notes about rust version requirements. Undecided yet.
+
+[workspace]
+members = ["zjit", "yjit"]
+
+[package]
+name = "jit"
+version = "0.0.0"
+edition = "2024"
+rust-version = "1.85.0"
+publish = false # Don't publish to crates.io
+
+[dependencies]
+yjit = { path = "yjit", optional = true }
+zjit = { path = "zjit", optional = true }
+
+[lib]
+crate-type = ["staticlib"]
+path = "jit.rs"
+
+[features]
+disasm = ["yjit?/disasm", "zjit?/disasm"]
+runtime_checks = []
+yjit = [ "dep:yjit" ]
+zjit = [ "dep:zjit" ]
+
+[profile.dev]
+opt-level = 0
+debug = true
+debug-assertions = true
+overflow-checks = true
+
+[profile.dev_nodebug]
+inherits = "dev"
+
+[profile.stats]
+inherits = "release"
+
+[profile.release]
+# NOTE: --enable-yjit and zjit builds use `rustc` without going through Cargo. You
+# might want to update the `rustc` invocation if you change this profile.
+opt-level = 3
+# The extra robustness that comes from checking for arithmetic overflow is
+# worth the performance cost for the compiler.
+overflow-checks = true
+# Generate debug info
+debug = true
+# Use ThinLTO. Much smaller output for a small amount of build time increase.
+lto = "thin"
diff --git a/LEGAL b/LEGAL
index e352c55ee50005..a05cd6eaa3b01b 100644
--- a/LEGAL
+++ b/LEGAL
@@ -58,12 +58,12 @@ mentioned below.
 
 [ccan/list/list.h]
 
-  This file is licensed under the {MIT License}[rdoc-label:label-MIT+License].
+  This file is licensed under the {MIT License}[rdoc-ref:@MIT+License].
 
 [coroutine]
 
   Unless otherwise specified, these files are licensed under the
-  {MIT License}[rdoc-label:label-MIT+License].
+  {MIT License}[rdoc-ref:@MIT+License].
 
 [include/ruby/onigmo.h]
 [include/ruby/oniguruma.h]
@@ -546,7 +546,7 @@ mentioned below.
 
 [vsnprintf.c]
 
-  This file is under the {old-style BSD license}[rdoc-label:label-Old-style+BSD+license].
+  This file is under the {old-style BSD license}[rdoc-ref:@Old-style+BSD+license].
 
   >>>
     Copyright (c) 1990, 1993::
@@ -577,7 +577,7 @@ mentioned below.
 
 [missing/crypt.c]
 
-  This file is under the {old-style BSD license}[rdoc-label:label-Old-style+BSD+license].
+  This file is under the {old-style BSD license}[rdoc-ref:@Old-style+BSD+license].
 
   >>>
     Copyright (c) 1989, 1993::
@@ -588,7 +588,7 @@ mentioned below.
 
 [missing/setproctitle.c]
 
-  This file is under the {old-style BSD license}[rdoc-label:label-Old-style+BSD+license].
+  This file is under the {old-style BSD license}[rdoc-ref:@Old-style+BSD+license].
 
   >>>
     Copyright 2003:: Damien Miller
@@ -702,48 +702,43 @@ mentioned below.
     OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
     SUCH DAMAGE.
 
-[ext/json/generator/generator.c]
+[ext/json/vendor/fpconv.c]
 
-  The file contains the following copyright notice.
+  This file is under the Boost Software License.
 
   >>>
-    Copyright 2001-2004:: Unicode, Inc.
-
-    Disclaimer::
-
-      This source code is provided as is by Unicode, Inc. No claims are
-      made as to fitness for any particular purpose. No warranties of any
-      kind are expressed or implied. The recipient agrees to determine
-      applicability of information provided. If this file has been
-      purchased on magnetic or optical media from Unicode, Inc., the
-      sole remedy for any claim will be exchange of defective media
-      within 90 days of receipt.
-
-    Limitations on Rights to Redistribute This Code::
-
-      Unicode, Inc. hereby grants the right to freely use the information
-      supplied in this file in the creation of products supporting the
-      Unicode Standard, and to make copies of this file in any form
-      for internal or external distribution as long as this notice
-      remains attached.
-
-[ext/nkf/nkf-utf8/config.h]
-[ext/nkf/nkf-utf8/nkf.c]
-[ext/nkf/nkf-utf8/utf8tbl.c]
+    Boost Software License - Version 1.0 - August 17th, 2003
+    
+    Permission is hereby granted, free of charge, to any person or organization
+    obtaining a copy of the software and accompanying documentation covered by
+    this license (the "Software") to use, reproduce, display, distribute,
+    execute, and transmit the Software, and to prepare derivative works of the
+    Software, and to permit third-parties to whom the Software is furnished to
+    do so, all subject to the following:
+    
+    The copyright notices in the Software and this entire statement, including
+    the above license grant, this restriction and the following disclaimer,
+    must be included in all copies of the Software, in whole or in part, and
+    all derivative works of the Software, unless such copies or derivative
+    works are solely in the form of machine-executable object code generated by
+    a source language processor.
+    
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+    FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
+    SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
+    FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
+    ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+    DEALINGS IN THE SOFTWARE.
 
-  These files are under the following license.  So to speak, it is
-  copyrighted semi-public-domain software.
+[ext/json/vendor/jeaiii-ltoa.h]
 
   >>>
-    Copyright (C) 1987:: Fujitsu LTD. (Itaru ICHIKAWA)
+    Copyright (c) 2024,2025 Enrico Thierbach - https://github.com/radiospiel
+    Copyright (c) 2022 James Edward Anhalt III - https://github.com/jeaiii/itoa
 
-    Everyone is permitted to do anything on this program
-    including copying, modifying, improving,
-    as long as you don't try to pretend that you wrote it.
-    i.e., the above copyright notice has to appear in all copies.
-    Binary distribution requires original version messages.
-    You don't have to ask before copying, redistribution or publishing.
-    THE AUTHOR DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE.
+    {MIT License}[rdoc-ref:@MIT+License]
+  
 
 [ext/psych]
 [test/psych]
@@ -879,7 +874,7 @@ mentioned below.
   >>>
     RubyGems is copyrighted free software by Chad Fowler, Rich Kilmer, Jim
     Weirich and others.  You can redistribute it and/or modify it under
-    either the terms of the {MIT license}[rdoc-label:label-MIT+License], or the conditions
+    either the terms of the {MIT license}[rdoc-ref:@MIT+License], or the conditions
     below:
 
     1. You may make and give away verbatim copies of the source form of the
@@ -941,7 +936,7 @@ mentioned below.
     Portions copyright (c) 2010:: Andre Arko
     Portions copyright (c) 2009:: Engine Yard
 
-    {MIT License}[rdoc-label:label-MIT+License]
+    {MIT License}[rdoc-ref:@MIT+License]
 
 [lib/bundler/vendor/thor]
 
@@ -950,16 +945,16 @@ mentioned below.
   >>>
     Copyright (c) 2008 Yehuda Katz, Eric Hodel, et al.
 
-    {MIT License}[rdoc-label:label-MIT+License]
+    {MIT License}[rdoc-ref:@MIT+License]
 
-[lib/rubygems/resolver/molinillo]
+[lib/rubygems/vendor/molinillo]
 
   molinillo is under the following license.
 
   >>>
     Copyright (c) 2014 Samuel E. Giddins segiddins@segiddins.me
 
-    {MIT License}[rdoc-label:label-MIT+License]
+    {MIT License}[rdoc-ref:@MIT+License]
 
 [lib/bundler/vendor/pub_grub]
 
@@ -968,7 +963,7 @@ mentioned below.
   >>>
     Copyright (c) 2018 John Hawthorn
 
-    {MIT License}[rdoc-label:label-MIT+License]
+    {MIT License}[rdoc-ref:@MIT+License]
 
 [lib/bundler/vendor/connection_pool]
 
@@ -977,7 +972,7 @@ mentioned below.
   >>>
     Copyright (c) 2011 Mike Perham
 
-    {MIT License}[rdoc-label:label-MIT+License]
+    {MIT License}[rdoc-ref:@MIT+License]
 
 [lib/bundler/vendor/net-http-persistent]
 
@@ -986,7 +981,7 @@ mentioned below.
   >>>
     Copyright (c) Eric Hodel, Aaron Patterson
 
-    {MIT License}[rdoc-label:label-MIT+License]
+    {MIT License}[rdoc-ref:@MIT+License]
 
 [lib/did_you_mean]
 [lib/did_you_mean.rb]
@@ -997,7 +992,7 @@ mentioned below.
   >>>
     Copyright (c) 2014-2016 Yuki Nishijima
 
-    {MIT License}[rdoc-label:label-MIT+License]
+    {MIT License}[rdoc-ref:@MIT+License]
 
 [lib/error_highlight]
 [lib/error_highlight.rb]
@@ -1008,7 +1003,7 @@ mentioned below.
   >>>
     Copyright (c) 2021 Yusuke Endoh
 
-    {MIT License}[rdoc-label:label-MIT+License]
+    {MIT License}[rdoc-ref:@MIT+License]
 
 [benchmark/so_ackermann.rb]
 [benchmark/so_array.rb]
diff --git a/NEWS.md b/NEWS.md
index f424808bf2d203..df9da1406eff0d 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -1,184 +1,235 @@
-# NEWS for Ruby 3.3.0
+# NEWS for Ruby 3.5.0
 
 This document is a list of user-visible feature changes
-since the **3.2.0** release, except for bug fixes.
+since the **3.4.0** release, except for bug fixes.
 
 Note that each entry is kept to a minimum, see links for details.
 
 ## Language changes
 
-## Command line options
-
-* A new `performance` warning category was introduced.
-  They are not displayed by default even in verbose mode.
-  Turn them on with `-W:performance` or `Warning[:performance] = true`. [[Feature #19538]]
-* The `RUBY_GC_HEAP_INIT_SLOTS` environment variable has been deprecated and
-  removed. Environment variables `RUBY_GC_HEAP_%d_INIT_SLOTS` should be
-  used instead.  [[Feature #19785]]
+* `*nil` no longer calls `nil.to_a`, similar to how `**nil` does
+  not call `nil.to_hash`.  [[Feature #21047]]
 
 ## Core classes updates
 
 Note: We're only listing outstanding class updates.
 
-* Array
+* Kernel
 
-    * Array#pack now raises ArgumentError for unknown directives. [[Bug #19150]]
+    * `Kernel#inspect` now checks for the existence of a `#instance_variables_to_inspect` method,
+      allowing control over which instance variables are displayed in the `#inspect` string:
 
-* Dir
+        ```ruby
+        class DatabaseConfig
+          def initialize(host, user, password)
+            @host = host
+            @user = user
+            @password = password
+          end
 
-    * Dir.for_fd added for returning a Dir object for the directory specified
-      by the provided directory file descriptor. [[Feature #19347]]
-    * Dir.fchdir added for changing the directory to the directory specified
-      by the provided directory file descriptor. [[Feature #19347]]
-    * Dir#chdir added for changing the directory to the directory specified by
-      the provided `Dir` object. [[Feature #19347]]
+          private def instance_variables_to_inspect = [:@host, :@user]
+        end
 
-* MatchData
+        conf = DatabaseConfig.new("localhost", "root", "hunter2")
+        conf.inspect #=> #<DatabaseConfig:0x0000000104def350 @host="localhost", @user="root">
+        ```
 
-    * MatchData#named_captures now accepts optional `symbolize_names`
-      keyword. [[Feature #19591]]
+        [[Feature #21219]]
 
-* String
+* Binding
+
+    * `Binding#local_variables` does no longer include numbered parameters.
+      Also, `Binding#local_variable_get` and `Binding#local_variable_set` reject
+      to handle numbered parameters.  [[Bug #21049]]
+
+* IO
+
+    * `IO.select` accepts +Float::INFINITY+ as a timeout argument.
+      [[Feature #20610]]
+
+* Socket
+
+    * `Socket.tcp` accepts `open_timeout` as a keyword argument to specify
+      the timeout for the initial connection. [[Feature #21347]]
+
+* Ractor
 
-    * String#unpack now raises ArgumentError for unknown directives. [[Bug #19150]]
-    * String#bytesplice now accepts new arguments index/length or range of the
-      source string to be copied.  [[Feature #19314]]
+    * `Ractor::Port` class was added for a new synchronization mechanism
+      to communicate between Ractors. [[Feature #21262]]
 
-* ObjectSpace::WeakKeyMap
+        ```ruby
+        port1 = Ractor::Port.new
+        port2 = Ractor::Port.new
+        Ractor.new port1, port2 do |port1, port2|
+          port1 << 1
+          port2 << 11
+          port1 << 2
+          port2 << 12
+        end
+        2.times{ p port1.receive } #=> 1, 2
+        2.times{ p port2.receive } #=> 11, 12
+        ```
 
-    * New core class to build collections with weak references.
-      The class use equality semantic to lookup keys like a regular hash,
-      but it doesn't hold strong references on the keys. [[Feature #18498]]
+        `Ractor::Port` provides the following methods:
 
-* Module
+        * `Ractor::Port#receive`
+        * `Ractor::Port#send` (or `Ractor::Port#<<`)
+        * `Ractor::Port#close`
+        * `Ractor::Port#closed?`
 
-    * Module#set_temporary_name added for setting a temporary name for a
-      module. [[Feature #19521]]
+        As result, `Ractor.yield` and `Ractor#take` were removed.
 
-* Process.warmup
+    * `Ractor#join` and `Ractor#value` were added to wait for the
+      termination of a Ractor. These are similar to `Thread#join`
+      and `Thread#value`.
+
+    * `Ractor#monitor` and `Ractor#unmonitor` were added as low-level
+      interfaces used internally to implement `Ractor#join`.
+
+    * `Ractor.select` now only accepts Ractors and Ports. If Ractors are given,
+      it returns when a Ractor terminates.
+
+    * `Ractor#default_port` was added. Each `Ractor` has a default port,
+      which is used by `Ractor.send`, `Ractor.receive`.
+
+    * `Ractor#close_incoming` and `Ractor#close_outgoing` were removed.
+
+* Set
+
+    * Set is now a core class, instead of an autoloaded stdlib class.
+      [[Feature #21216]]
+
+* String
 
-    * Notify the Ruby virtual machine that the boot sequence is finished,
-      and that now is a good time to optimize the application. This is useful
-      for long running applications. The actual optimizations performed are entirely
-      implementation specific and may change in the future without notice. [[Feature #18885]]
+    * Update Unicode to Version 16.0.0 and Emoji Version 16.0.
+      [[Feature #19908]][[Feature #20724]] (also applies to Regexp)
 
-* Refinement
+* Fiber::Scheduler
 
-    * Add Refinement#target as an alternative of Refinement#refined_class.
-      Refinement#refined_class is deprecated and will be removed in Ruby
-      3.4.  [[Feature #19714]]
+    * Introduce `Fiber::Scheduler#fiber_interrupt` to interrupt a fiber with a
+      given exception. The initial use case is to interrupt a fiber that is
+      waiting on a blocking IO operation when the IO operation is closed.
+      [[Feature #21166]]
 
 ## Stdlib updates
 
-* RubyGems and Bundler warn if users require gem that is scheduled to become the bundled gems
-  in the future version of Ruby. [[Feature #19351]] [[Feature #19776]] [[Feature #19843]]
+The following bundled gems are promoted from default gems.
 
-* Random::Formatter#alphanumeric is extended to accept optional `chars`
-  keyword argument. [[Feature #18183]]
+* ostruct 0.6.2
+* pstore 0.2.0
+* benchmark 0.4.1
+* logger 1.7.0
+* rdoc 6.14.2
+* win32ole 1.9.2
+* irb 1.15.2
+* reline 0.6.1
+* readline 0.0.4
+* fiddle 1.1.8
 
-The following default gems are updated.
+We only list stdlib changes that are notable feature changes.
 
-* RubyGems 3.5.0.dev
-* bigdecimal 3.1.4
-* bundler 2.5.0.dev
-* csv 3.2.8
-* erb 4.0.3
-* fiddle 1.1.2
-* fileutils 1.7.1
-* irb 1.8.1
-* nkf 0.1.3
-* optparse 0.4.0.pre.1
-* psych 5.1.0
-* reline 0.3.8
-* stringio 3.0.9
-* strscan 3.0.7
-* syntax_suggest 1.1.0
-* time 0.2.2
-* timeout 0.4.0
-* uri 0.12.2
-* yarp 0.10.0
+Other changes are listed in the following sections. We also listed release
+history from the previous bundled version that is Ruby 3.3.0 if it has GitHub
+releases.
 
-The following bundled gems are updated.
+The following default gem is added.
+
+* win32-registry 0.1.0
+
+The following default gems are updated.
+
+* RubyGems 3.7.0.dev
+* bundler 2.7.0.dev
+* erb 5.0.1
+* json 2.12.2
+* optparse 0.7.0.dev.2
+* prism 1.4.0
+* psych 5.2.6
+* resolv 0.6.2
+* stringio 3.1.8.dev
+* strscan 3.1.6.dev
+* uri 1.0.3
+* weakref 0.1.4
 
-* minitest 5.19.0
-* test-unit 3.6.1
-* rexml 3.2.6
-* rss 0.3.0
-* net-imap 0.3.7
-* rbs 3.2.1
-* typeprof 0.21.8
-* debug 1.8.0
+The following bundled gems are added.
 
-The following default gem is now bundled.
 
-* racc 1.7.1
+The following bundled gems are updated.
 
-See GitHub releases like [Logger](https://github.com/ruby/logger/releases) or
-changelog for details of the default gems or bundled gems.
+* minitest 5.25.5
+* rake 13.3.0
+* test-unit 3.7.0
+* rexml 3.4.1
+* net-imap 0.5.9
+* net-smtp 0.5.1
+* matrix 0.4.3
+* prime 0.1.4
+* rbs 3.9.4
+* debug 1.11.0
+* base64 0.3.0
+* bigdecimal 3.2.2
+* drb 2.2.3
+* syslog 0.3.0
+* csv 3.3.5
+* repl_type_completor 0.1.11
 
 ## Supported platforms
 
 ## Compatibility issues
 
+* The following methods were removed from Ractor due because of `Ractor::Port`:
+
+    * `Ractor.yield`
+    * `Ractor#take`
+    * `Ractor#close_incoming`
+    * `Ractor#close_outgoging`
+
+    [[Feature #21262]]
+
 ## Stdlib compatibility issues
 
-* `racc` is promoted bundled gems.
-  * You need to add `racc` to your `Gemfile` if you use `racc` under bundler environment.
-* `ext/readline` is retired
-  * We have `reline` that is pure Ruby implementation compatible with `ext/readline` API. We rely on `reline` in the future. If you need to use `ext/readline`, you can install `ext/readline` via rubygems.org with `gem install readline-ext`.
-  * We no longer need to install libraries like `libreadline` or `libedit`.
+* CGI library is removed from the default gems. Now we only provide `cgi/escape` for
+  the following methods:
+
+    * `CGI.escape` and `CGI.unescape`
+    * `CGI.escapeHTML` and `CGI.unescapeHTML`
+    * `CGI.escapeURIComponent` and `CGI.unescapeURIComponent`
+    * `CGI.escapeElement` and `CGI.unescapeElement`
+
+    [[Feature #21258]]
+
+* With the move of `Set` from stdlib to core class, `set/sorted_set.rb` has
+  been removed, and `SortedSet` is no longer an autoloaded constant. Please
+  install the `sorted_set` gem and `require 'sorted_set'` to use `SortedSet`.
+  [[Feature #21287]]
 
 ## C API updates
 
+* IO
+
+    * `rb_thread_fd_close` is deprecated and now a no-op. If you need to expose
+      file descriptors from C extensions to Ruby code, create an `IO` instance
+      using `RUBY_IO_MODE_EXTERNAL` and use `rb_io_close(io)` to close it (this
+      also interrupts and waits for all pending operations on the `IO`
+      instance). Directly closing file descriptors does not interrupt pending
+      operations, and may lead to undefined behaviour. In other words, if two
+      `IO` objects share the same file descriptor, closing one does not affect
+      the other. [[Feature #18455]]
+
 ## Implementation improvements
 
-* `defined?(@ivar)` is optimized with Object Shapes.
-
-### YJIT
-
-* Major performance improvements over 3.2
-  * Support for splat and rest arguments has been improved.
-  * Registers are allocated for stack operations of the virtual machine.
-  * More calls with optional arguments are compiled.
-  * Exception handlers are also compiled.
-  * Instance variables no longer exit to the interpreter
-    with megamorphic Object Shapes.
-  * Unsupported call types no longer exit to the interpreter.
-  * Integer#!=, String#!=, Kernel#block_given?, Kernel#is_a?,
-    Kernel#instance_of?, Module#=== are specially optimized.
-  * Now more than 3x faster than the interpreter on optcarrot!
-* Metadata for compiled code uses a lot less memory.
-* Generate more compact code on ARM64
-* Option to start YJIT in paused mode and then later enable it manually
-  * `--yjit-pause` and RubyVM::YJIT.resume
-  * This can be used to enable YJIT only once your application is done booting
-* `ratio_in_yjit` stat produced by `--yjit-stats` is now avaiable in release builds,
-  a special stats or dev build is no longer required.
-* Exit tracing option now supports sampling
-  * `--trace-exits-sample-rate=N`
-* `--yjit-stats=quiet` is added to avoid printing stats on exit.
-* The default value for `--yjit-exec-mem-size` is changed from 64 to 128.
-* More thorough testing and multiple bug fixes
-
-### RJIT
-
-* Introduced a pure-Ruby JIT compiler RJIT and replaced MJIT.
-  * RJIT supports only x86\_64 architecture on Unix platforms.
-  * Unlike MJIT, it doesn't require a C compiler at runtime.
-* RJIT exists only for experimental purposes.
-  * You should keep using YJIT in production.
-
-[Feature #18183]: https://bugs.ruby-lang.org/issues/18183
-[Feature #18498]: https://bugs.ruby-lang.org/issues/18498
-[Feature #18885]: https://bugs.ruby-lang.org/issues/18885
-[Bug #19150]:     https://bugs.ruby-lang.org/issues/19150
-[Feature #19314]: https://bugs.ruby-lang.org/issues/19314
-[Feature #19347]: https://bugs.ruby-lang.org/issues/19347
-[Feature #19351]: https://bugs.ruby-lang.org/issues/19351
-[Feature #19521]: https://bugs.ruby-lang.org/issues/19521
-[Feature #19538]: https://bugs.ruby-lang.org/issues/19538
-[Feature #19591]: https://bugs.ruby-lang.org/issues/19591
-[Feature #19714]: https://bugs.ruby-lang.org/issues/19714
-[Feature #19776]: https://bugs.ruby-lang.org/issues/19776
-[Feature #19785]: https://bugs.ruby-lang.org/issues/19785
-[Feature #19843]: https://bugs.ruby-lang.org/issues/19843
+## JIT
+
+[Feature #18455]: https://bugs.ruby-lang.org/issues/18455
+[Feature #19908]: https://bugs.ruby-lang.org/issues/19908
+[Feature #20610]: https://bugs.ruby-lang.org/issues/20610
+[Feature #20724]: https://bugs.ruby-lang.org/issues/20724
+[Feature #21047]: https://bugs.ruby-lang.org/issues/21047
+[Bug #21049]:     https://bugs.ruby-lang.org/issues/21049
+[Feature #21166]: https://bugs.ruby-lang.org/issues/21166
+[Feature #21216]: https://bugs.ruby-lang.org/issues/21216
+[Feature #21219]: https://bugs.ruby-lang.org/issues/21219
+[Feature #21258]: https://bugs.ruby-lang.org/issues/21258
+[Feature #21262]: https://bugs.ruby-lang.org/issues/21262
+[Feature #21287]: https://bugs.ruby-lang.org/issues/21287
+[Feature #21347]: https://bugs.ruby-lang.org/issues/21347
diff --git a/README.ja.md b/README.ja.md
index 0d2d309fb89522..278285dc83db3c 100644
--- a/README.ja.md
+++ b/README.ja.md
@@ -1,10 +1,8 @@
 [![Actions Status: MinGW](https://github.com/ruby/ruby/workflows/MinGW/badge.svg)](https://github.com/ruby/ruby/actions?query=workflow%3A"MinGW")
-[![Actions Status: RJIT](https://github.com/ruby/ruby/workflows/RJIT/badge.svg)](https://github.com/ruby/ruby/actions?query=workflow%3A"RJIT")
 [![Actions Status: Ubuntu](https://github.com/ruby/ruby/workflows/Ubuntu/badge.svg)](https://github.com/ruby/ruby/actions?query=workflow%3A"Ubuntu")
 [![Actions Status: Windows](https://github.com/ruby/ruby/workflows/Windows/badge.svg)](https://github.com/ruby/ruby/actions?query=workflow%3A"Windows")
 [![AppVeyor status](https://ci.appveyor.com/api/projects/status/0sy8rrxut4o0k960/branch/master?svg=true)](https://ci.appveyor.com/project/ruby/ruby/branch/master)
 [![Travis Status](https://app.travis-ci.com/ruby/ruby.svg?branch=master)](https://app.travis-ci.com/ruby/ruby)
-[![Cirrus Status](https://api.cirrus-ci.com/github/ruby/ruby.svg)](https://cirrus-ci.com/github/ruby/ruby/master)
 
 # Rubyとは
 
@@ -41,11 +39,15 @@ https://www.ruby-lang.org/ja/downloads/
 
 ミラーをGitHubに公開しています． 以下のコマンドでリポジトリを取得できます．
 
-    $ git clone https://github.com/ruby/ruby.git
+```console
+$ git clone https://github.com/ruby/ruby.git
+```
 
 他のブランチの一覧は次のコマンドで見られます．
 
-    $ git ls-remote https://github.com/ruby/ruby.git
+```console
+$ git ls-remote https://github.com/ruby/ruby.git
+```
 
 Rubyリポジトリの本来のmasterは https://git.ruby-lang.org/ruby.git にあります．
 コミッタはこちらを使います．
diff --git a/README.md b/README.md
index c0cbf05b7a519a..5ed312cca872a0 100644
--- a/README.md
+++ b/README.md
@@ -1,10 +1,7 @@
 [![Actions Status: MinGW](https://github.com/ruby/ruby/workflows/MinGW/badge.svg)](https://github.com/ruby/ruby/actions?query=workflow%3A"MinGW")
-[![Actions Status: RJIT](https://github.com/ruby/ruby/workflows/RJIT/badge.svg)](https://github.com/ruby/ruby/actions?query=workflow%3A"RJIT")
 [![Actions Status: Ubuntu](https://github.com/ruby/ruby/workflows/Ubuntu/badge.svg)](https://github.com/ruby/ruby/actions?query=workflow%3A"Ubuntu")
 [![Actions Status: Windows](https://github.com/ruby/ruby/workflows/Windows/badge.svg)](https://github.com/ruby/ruby/actions?query=workflow%3A"Windows")
-[![AppVeyor status](https://ci.appveyor.com/api/projects/status/0sy8rrxut4o0k960/branch/master?svg=true)](https://ci.appveyor.com/project/ruby/ruby/branch/master)
 [![Travis Status](https://app.travis-ci.com/ruby/ruby.svg?branch=master)](https://app.travis-ci.com/ruby/ruby)
-[![Cirrus Status](https://api.cirrus-ci.com/github/ruby/ruby.svg)](https://cirrus-ci.com/github/ruby/ruby/master)
 
 # What is Ruby?
 
@@ -88,7 +85,7 @@ Bugs should be reported at https://bugs.ruby-lang.org. Read ["Reporting Issues"]
 
 ## Contributing
 
-See ["Contributing to Ruby"](https://docs.ruby-lang.org/en/master/contributing_md.html), which includes setup and build instructions.
+See ["Contributing to Ruby"](https://docs.ruby-lang.org/en/master/contributing/contributing_md.html), which includes setup and build instructions.
 
 ## The Author
 
diff --git a/addr2line.c b/addr2line.c
index 358eccc5fc841f..745364cc0f78e8 100644
--- a/addr2line.c
+++ b/addr2line.c
@@ -56,11 +56,11 @@
 #  ifdef _AIX
 #pragma alloca
 #  else
-#   ifndef alloca		/* predefined by HP cc +Olibcalls */
+#   ifndef alloca                /* predefined by HP cc +Olibcalls */
 void *alloca();
 #   endif
 #  endif /* AIX */
-# endif	/* HAVE_ALLOCA_H */
+# endif        /* HAVE_ALLOCA_H */
 # ifndef UNREACHABLE
 #  define UNREACHABLE __builtin_unreachable()
 # endif
@@ -144,7 +144,7 @@ void *alloca();
 #define DW_LNE_define_file              0x03
 #define DW_LNE_set_discriminator        0x04  /* DWARF4 */
 
-#define kprintf(...) fprintf(stderr, "" __VA_ARGS__)
+#define kprintf(...) fprintf(errout, "" __VA_ARGS__)
 
 typedef struct line_info {
     const char *dirname;
@@ -220,13 +220,13 @@ uleb128(const char **p)
     unsigned long r = 0;
     int s = 0;
     for (;;) {
-	unsigned char b = (unsigned char)*(*p)++;
-	if (b < 0x80) {
-	    r += (unsigned long)b << s;
-	    break;
-	}
-	r += (b & 0x7f) << s;
-	s += 7;
+        unsigned char b = (unsigned char)*(*p)++;
+        if (b < 0x80) {
+            r += (unsigned long)b << s;
+            break;
+        }
+        r += (b & 0x7f) << s;
+        s += 7;
     }
     return r;
 }
@@ -237,44 +237,48 @@ sleb128(const char **p)
     long r = 0;
     int s = 0;
     for (;;) {
-	unsigned char b = (unsigned char)*(*p)++;
-	if (b < 0x80) {
-	    if (b & 0x40) {
-		r -= (0x80 - b) << s;
-	    }
-	    else {
-		r += (b & 0x3f) << s;
-	    }
-	    break;
-	}
-	r += (b & 0x7f) << s;
-	s += 7;
+        unsigned char b = (unsigned char)*(*p)++;
+        if (b < 0x80) {
+            if (b & 0x40) {
+                r -= (0x80 - b) << s;
+            }
+            else {
+                r += (b & 0x3f) << s;
+            }
+            break;
+        }
+        r += (b & 0x7f) << s;
+        s += 7;
     }
     return r;
 }
 
 static const char *
-get_nth_dirname(unsigned long dir, const char *p)
+get_nth_dirname(unsigned long dir, const char *p, FILE *errout)
 {
     if (!dir--) {
-	return "";
+        return "";
     }
     while (dir--) {
-	while (*p) p++;
-	p++;
-	if (!*p) {
-	    kprintf("Unexpected directory number %lu in %s\n",
-		    dir, binary_filename);
-	    return "";
-	}
+        while (*p) p++;
+        p++;
+        if (!*p) {
+            kprintf("Unexpected directory number %lu in %s\n",
+                    dir, binary_filename);
+            return "";
+        }
     }
     return p;
 }
 
-static const char *parse_ver5_debug_line_header(const char *p, int idx, uint8_t format, obj_info_t *obj, const char **out_path, uint64_t *out_directory_index);
+static const char *parse_ver5_debug_line_header(
+    const char *p, int idx, uint8_t format,
+    obj_info_t *obj, const char **out_path,
+    uint64_t *out_directory_index, FILE *errout);
 
 static void
-fill_filename(int file, uint8_t format, uint16_t version, const char *include_directories, const char *filenames, line_info_t *line, obj_info_t *obj)
+fill_filename(int file, uint8_t format, uint16_t version, const char *include_directories,
+              const char *filenames, line_info_t *line, obj_info_t *obj, FILE *errout)
 {
     int i;
     const char *p = filenames;
@@ -283,18 +287,20 @@ fill_filename(int file, uint8_t format, uint16_t version, const char *include_di
     if (version >= 5) {
         const char *path;
         uint64_t directory_index = -1;
-        parse_ver5_debug_line_header(filenames, file, format, obj, &path, &directory_index);
+        parse_ver5_debug_line_header(filenames, file, format, obj, &path, &directory_index, errout);
         line->filename = path;
-        parse_ver5_debug_line_header(include_directories, (int)directory_index, format, obj, &path, NULL);
+        parse_ver5_debug_line_header(include_directories, (int)directory_index, format, obj, &path, NULL, errout);
         line->dirname = path;
     }
     else {
         for (i = 1; i <= file; i++) {
             filename = p;
             if (!*p) {
+#ifndef __APPLE__
                 /* Need to output binary file name? */
                 kprintf("Unexpected file number %d in %s at %tx\n",
                         file, binary_filename, filenames - obj->mapped);
+#endif
                 return;
             }
             while (*p) p++;
@@ -307,7 +313,7 @@ fill_filename(int file, uint8_t format, uint16_t version, const char *include_di
 
             if (i == file) {
                 line->filename = filename;
-                line->dirname = get_nth_dirname(dir, include_directories);
+                line->dirname = get_nth_dirname(dir, include_directories, errout);
             }
         }
     }
@@ -315,19 +321,19 @@ fill_filename(int file, uint8_t format, uint16_t version, const char *include_di
 
 static void
 fill_line(int num_traces, void **traces, uintptr_t addr, int file, int line,
-	  uint8_t format, uint16_t version, const char *include_directories, const char *filenames,
-	  obj_info_t *obj, line_info_t *lines, int offset)
+          uint8_t format, uint16_t version, const char *include_directories, const char *filenames,
+          obj_info_t *obj, line_info_t *lines, int offset, FILE *errout)
 {
     int i;
     addr += obj->base_addr - obj->vmaddr;
     for (i = offset; i < num_traces; i++) {
-	uintptr_t a = (uintptr_t)traces[i];
-	/* We assume one line code doesn't result >100 bytes of native code.
+        uintptr_t a = (uintptr_t)traces[i];
+        /* We assume one line code doesn't result >100 bytes of native code.
        We may want more reliable way eventually... */
-	if (addr < a && a < addr + 100) {
-	    fill_filename(file, format, version, include_directories, filenames, &lines[i], obj);
-	    lines[i].line = line;
-	}
+        if (addr < a && a < addr + 100) {
+            fill_filename(file, format, version, include_directories, filenames, &lines[i], obj, errout);
+            lines[i].line = line;
+        }
     }
 }
 
@@ -350,7 +356,7 @@ struct LineNumberProgramHeader {
 };
 
 static int
-parse_debug_line_header(obj_info_t *obj, const char **pp, struct LineNumberProgramHeader *header)
+parse_debug_line_header(obj_info_t *obj, const char **pp, struct LineNumberProgramHeader *header, FILE *errout)
 {
     const char *p = *pp;
     header->unit_length = *(uint32_t *)p;
@@ -358,8 +364,8 @@ parse_debug_line_header(obj_info_t *obj, const char **pp, struct LineNumberProgr
 
     header->format = 4;
     if (header->unit_length == 0xffffffff) {
-	header->unit_length = *(uint64_t *)p;
-	p += sizeof(uint64_t);
+        header->unit_length = *(uint64_t *)p;
+        p += sizeof(uint64_t);
         header->format = 8;
     }
 
@@ -396,7 +402,7 @@ parse_debug_line_header(obj_info_t *obj, const char **pp, struct LineNumberProgr
 
     if (header->version >= 5) {
         header->include_directories = p;
-        p = parse_ver5_debug_line_header(p, -1, header->format, obj, NULL, NULL);
+        p = parse_ver5_debug_line_header(p, -1, header->format, obj, NULL, NULL, errout);
         header->filenames = p;
     }
     else {
@@ -423,7 +429,7 @@ parse_debug_line_header(obj_info_t *obj, const char **pp, struct LineNumberProgr
 
 static int
 parse_debug_line_cu(int num_traces, void **traces, const char **debug_line,
-		obj_info_t *obj, line_info_t *lines, int offset)
+                obj_info_t *obj, line_info_t *lines, int offset, FILE *errout)
 {
     const char *p = (const char *)*debug_line;
     struct LineNumberProgramHeader header;
@@ -440,109 +446,109 @@ parse_debug_line_cu(int num_traces, void **traces, const char **debug_line,
     /* int epilogue_begin = 0; */
     /* unsigned int isa = 0; */
 
-    if (parse_debug_line_header(obj, &p, &header))
+    if (parse_debug_line_header(obj, &p, &header, errout))
         return -1;
     is_stmt = header.default_is_stmt;
 
-#define FILL_LINE()						    \
-    do {							    \
-	fill_line(num_traces, traces, addr, file, line,		    \
+#define FILL_LINE()                                                 \
+    do {                                                            \
+        fill_line(num_traces, traces, addr, file, line,             \
                   header.format,                                    \
                   header.version,                                   \
                   header.include_directories,                       \
                   header.filenames,                                 \
-		  obj, lines, offset);				    \
-	/*basic_block = prologue_end = epilogue_begin = 0;*/	    \
+                  obj, lines, offset, errout);                      \
+        /*basic_block = prologue_end = epilogue_begin = 0;*/        \
     } while (0)
 
     while (p < header.cu_end) {
-	unsigned long a;
-	unsigned char op = *p++;
-	switch (op) {
-	case DW_LNS_copy:
-	    FILL_LINE();
-	    break;
-	case DW_LNS_advance_pc:
-	    a = uleb128(&p) * header.minimum_instruction_length;
-	    addr += a;
-	    break;
-	case DW_LNS_advance_line: {
-	    long a = sleb128(&p);
-	    line += a;
-	    break;
-	}
-	case DW_LNS_set_file:
-	    file = (unsigned int)uleb128(&p);
-	    break;
-	case DW_LNS_set_column:
-	    /*column = (unsigned int)*/(void)uleb128(&p);
-	    break;
-	case DW_LNS_negate_stmt:
-	    is_stmt = !is_stmt;
-	    break;
-	case DW_LNS_set_basic_block:
-	    /*basic_block = 1; */
-	    break;
-	case DW_LNS_const_add_pc:
-	    a = ((255UL - header.opcode_base) / header.line_range) *
-		header.minimum_instruction_length;
-	    addr += a;
-	    break;
-	case DW_LNS_fixed_advance_pc:
-	    a = *(uint16_t *)p;
-	    p += sizeof(uint16_t);
-	    addr += a;
-	    break;
-	case DW_LNS_set_prologue_end:
-	    /* prologue_end = 1; */
-	    break;
-	case DW_LNS_set_epilogue_begin:
-	    /* epilogue_begin = 1; */
-	    break;
-	case DW_LNS_set_isa:
-	    /* isa = (unsigned int)*/(void)uleb128(&p);
-	    break;
-	case 0:
-	    a = uleb128(&p);
-	    op = *p++;
-	    switch (op) {
-	    case DW_LNE_end_sequence:
-		/* end_sequence = 1; */
-		FILL_LINE();
-		addr = 0;
-		file = 1;
-		line = 1;
-		/* column = 0; */
-		is_stmt = header.default_is_stmt;
-		/* end_sequence = 0; */
-		/* isa = 0; */
-		break;
-	    case DW_LNE_set_address:
-		addr = *(unsigned long *)p;
-		p += sizeof(unsigned long);
-		break;
-	    case DW_LNE_define_file:
-		kprintf("Unsupported operation in %s\n",
-			binary_filename);
-		break;
-	    case DW_LNE_set_discriminator:
-		/* TODO:currently ignore */
-		uleb128(&p);
-		break;
-	    default:
-		kprintf("Unknown extended opcode: %d in %s\n",
-			op, binary_filename);
-	    }
-	    break;
-	default: {
+        unsigned long a;
+        unsigned char op = *p++;
+        switch (op) {
+        case DW_LNS_copy:
+            FILL_LINE();
+            break;
+        case DW_LNS_advance_pc:
+            a = uleb128(&p) * header.minimum_instruction_length;
+            addr += a;
+            break;
+        case DW_LNS_advance_line: {
+            long a = sleb128(&p);
+            line += a;
+            break;
+        }
+        case DW_LNS_set_file:
+            file = (unsigned int)uleb128(&p);
+            break;
+        case DW_LNS_set_column:
+            /*column = (unsigned int)*/(void)uleb128(&p);
+            break;
+        case DW_LNS_negate_stmt:
+            is_stmt = !is_stmt;
+            break;
+        case DW_LNS_set_basic_block:
+            /*basic_block = 1; */
+            break;
+        case DW_LNS_const_add_pc:
+            a = ((255UL - header.opcode_base) / header.line_range) *
+                header.minimum_instruction_length;
+            addr += a;
+            break;
+        case DW_LNS_fixed_advance_pc:
+            a = *(uint16_t *)p;
+            p += sizeof(uint16_t);
+            addr += a;
+            break;
+        case DW_LNS_set_prologue_end:
+            /* prologue_end = 1; */
+            break;
+        case DW_LNS_set_epilogue_begin:
+            /* epilogue_begin = 1; */
+            break;
+        case DW_LNS_set_isa:
+            /* isa = (unsigned int)*/(void)uleb128(&p);
+            break;
+        case 0:
+            a = uleb128(&p);
+            op = *p++;
+            switch (op) {
+            case DW_LNE_end_sequence:
+                /* end_sequence = 1; */
+                FILL_LINE();
+                addr = 0;
+                file = 1;
+                line = 1;
+                /* column = 0; */
+                is_stmt = header.default_is_stmt;
+                /* end_sequence = 0; */
+                /* isa = 0; */
+                break;
+            case DW_LNE_set_address:
+                addr = *(unsigned long *)p;
+                p += sizeof(unsigned long);
+                break;
+            case DW_LNE_define_file:
+                kprintf("Unsupported operation in %s\n",
+                        binary_filename);
+                break;
+            case DW_LNE_set_discriminator:
+                /* TODO:currently ignore */
+                uleb128(&p);
+                break;
+            default:
+                kprintf("Unknown extended opcode: %d in %s\n",
+                        op, binary_filename);
+            }
+            break;
+        default: {
             uint8_t adjusted_opcode = op - header.opcode_base;
             uint8_t operation_advance = adjusted_opcode / header.line_range;
             /* NOTE: this code doesn't support VLIW */
             addr += operation_advance * header.minimum_instruction_length;
             line += header.line_base + (adjusted_opcode % header.line_range);
-	    FILL_LINE();
-	}
-	}
+            FILL_LINE();
+        }
+        }
     }
     *debug_line = (char *)p;
     return 0;
@@ -550,17 +556,17 @@ parse_debug_line_cu(int num_traces, void **traces, const char **debug_line,
 
 static int
 parse_debug_line(int num_traces, void **traces,
-		 const char *debug_line, unsigned long size,
-		 obj_info_t *obj, line_info_t *lines, int offset)
+                 const char *debug_line, unsigned long size,
+                 obj_info_t *obj, line_info_t *lines, int offset, FILE *errout)
 {
     const char *debug_line_end = debug_line + size;
     while (debug_line < debug_line_end) {
-	if (parse_debug_line_cu(num_traces, traces, &debug_line, obj, lines, offset))
-	    return -1;
+        if (parse_debug_line_cu(num_traces, traces, &debug_line, obj, lines, offset, errout))
+            return -1;
     }
     if (debug_line != debug_line_end) {
-	kprintf("Unexpected size of .debug_line in %s\n",
-		binary_filename);
+        kprintf("Unexpected size of .debug_line in %s\n",
+                binary_filename);
     }
     return 0;
 }
@@ -568,7 +574,7 @@ parse_debug_line(int num_traces, void **traces,
 /* read file and fill lines */
 static uintptr_t
 fill_lines(int num_traces, void **traces, int check_debuglink,
-	   obj_info_t **objp, line_info_t *lines, int offset);
+           obj_info_t **objp, line_info_t *lines, int offset, FILE *errout);
 
 static void
 append_obj(obj_info_t **objp)
@@ -596,7 +602,7 @@ append_obj(obj_info_t **objp)
 // check the path pattern of "/usr/lib/debug/usr/bin/ruby.debug"
 static void
 follow_debuglink(const char *debuglink, int num_traces, void **traces,
-		 obj_info_t **objp, line_info_t *lines, int offset)
+                 obj_info_t **objp, line_info_t *lines, int offset, FILE *errout)
 {
     static const char global_debug_dir[] = "/usr/lib/debug";
     const size_t global_debug_dir_len = sizeof(global_debug_dir) - 1;
@@ -606,13 +612,13 @@ follow_debuglink(const char *debuglink, int num_traces, void **traces,
 
     p = strrchr(binary_filename, '/');
     if (!p) {
-	return;
+        return;
     }
     p[1] = '\0';
 
     len = strlen(binary_filename);
     if (len >= PATH_MAX - global_debug_dir_len)
-	len = PATH_MAX - global_debug_dir_len - 1;
+        len = PATH_MAX - global_debug_dir_len - 1;
     memmove(binary_filename + global_debug_dir_len, binary_filename, len);
     memcpy(binary_filename, global_debug_dir, global_debug_dir_len);
     len += global_debug_dir_len;
@@ -622,13 +628,13 @@ follow_debuglink(const char *debuglink, int num_traces, void **traces,
     o2 = *objp;
     o2->base_addr = o1->base_addr;
     o2->path = o1->path;
-    fill_lines(num_traces, traces, 0, objp, lines, offset);
+    fill_lines(num_traces, traces, 0, objp, lines, offset, errout);
 }
 
 // check the path pattern of "/usr/lib/debug/.build-id/ab/cdef1234.debug"
 static void
 follow_debuglink_build_id(const char *build_id, size_t build_id_size, int num_traces, void **traces,
-                          obj_info_t **objp, line_info_t *lines, int offset)
+                          obj_info_t **objp, line_info_t *lines, int offset, FILE *errout)
 {
     static const char global_debug_dir[] = "/usr/lib/debug/.build-id/";
     const size_t global_debug_dir_len = sizeof(global_debug_dir) - 1;
@@ -653,7 +659,7 @@ follow_debuglink_build_id(const char *build_id, size_t build_id_size, int num_tr
     o2 = *objp;
     o2->base_addr = o1->base_addr;
     o2->path = o1->path;
-    fill_lines(num_traces, traces, 0, objp, lines, offset);
+    fill_lines(num_traces, traces, 0, objp, lines, offset, errout);
 }
 #endif
 
@@ -1079,13 +1085,13 @@ di_read_debug_abbrev_cu(DebugInfoReader *reader)
 }
 
 static int
-di_read_debug_line_cu(DebugInfoReader *reader)
+di_read_debug_line_cu(DebugInfoReader *reader, FILE *errout)
 {
     const char *p;
     struct LineNumberProgramHeader header;
 
     p = (const char *)reader->debug_line_cu_end;
-    if (parse_debug_line_header(reader->obj, &p, &header))
+    if (parse_debug_line_header(reader->obj, &p, &header, errout))
         return -1;
 
     reader->debug_line_cu_end = (char *)header.cu_end;
@@ -1186,7 +1192,7 @@ debug_info_reader_read_addr_value_member(DebugInfoReader *reader, DebugInfoValue
 
 
 static bool
-debug_info_reader_read_value(DebugInfoReader *reader, uint64_t form, DebugInfoValue *v)
+debug_info_reader_read_value(DebugInfoReader *reader, uint64_t form, DebugInfoValue *v, FILE *errout)
 {
     switch (form) {
       case DW_FORM_addr:
@@ -1369,7 +1375,7 @@ debug_info_reader_read_value(DebugInfoReader *reader, uint64_t form, DebugInfoVa
 
 /* find abbrev in current compilation unit */
 static const char *
-di_find_abbrev(DebugInfoReader *reader, uint64_t abbrev_number)
+di_find_abbrev(DebugInfoReader *reader, uint64_t abbrev_number, FILE *errout)
 {
     const char *p;
     if (abbrev_number < ABBREV_TABLE_SIZE) {
@@ -1394,7 +1400,7 @@ di_find_abbrev(DebugInfoReader *reader, uint64_t abbrev_number)
 
 #if 0
 static void
-hexdump0(const unsigned char *p, size_t n)
+hexdump0(const unsigned char *p, size_t n, FILE *errout)
 {
     size_t i;
     kprintf("     0  1  2  3  4  5  6  7  8  9  A  B  C  D  E  F\n");
@@ -1415,10 +1421,10 @@ hexdump0(const unsigned char *p, size_t n)
         kprintf("\n");
     }
 }
-#define hexdump(p,n) hexdump0((const unsigned char *)p, n)
+#define hexdump(p,n,e) hexdump0((const unsigned char *)p, n, e)
 
 static void
-div_inspect(DebugInfoValue *v)
+div_inspect(DebugInfoValue *v, FILE *errout)
 {
     switch (v->type) {
       case VAL_uint:
@@ -1432,14 +1438,14 @@ div_inspect(DebugInfoValue *v)
         break;
       case VAL_data:
         kprintf("%d: type:%d size:%" PRIxSIZE " v:\n",__LINE__,v->type,v->size);
-        hexdump(v->as.ptr, 16);
+        hexdump(v->as.ptr, 16, errout);
         break;
     }
 }
 #endif
 
 static DIE *
-di_read_die(DebugInfoReader *reader, DIE *die)
+di_read_die(DebugInfoReader *reader, DIE *die, FILE *errout)
 {
     uint64_t abbrev_number = uleb128(&reader->p);
     if (abbrev_number == 0) {
@@ -1447,7 +1453,7 @@ di_read_die(DebugInfoReader *reader, DIE *die)
         return NULL;
     }
 
-    if (!(reader->q = di_find_abbrev(reader, abbrev_number))) return NULL;
+    if (!(reader->q = di_find_abbrev(reader, abbrev_number, errout))) return NULL;
 
     die->pos = reader->p - reader->obj->debug_info.ptr - 1;
     die->tag = (int)uleb128(&reader->q); /* tag */
@@ -1459,26 +1465,26 @@ di_read_die(DebugInfoReader *reader, DIE *die)
 }
 
 static DebugInfoValue *
-di_read_record(DebugInfoReader *reader, DebugInfoValue *vp)
+di_read_record(DebugInfoReader *reader, DebugInfoValue *vp, FILE *errout)
 {
     uint64_t at = uleb128(&reader->q);
     uint64_t form = uleb128(&reader->q);
     if (!at || !form) return NULL;
     vp->at = at;
     vp->form = form;
-    if (!debug_info_reader_read_value(reader, form, vp)) return NULL;
+    if (!debug_info_reader_read_value(reader, form, vp, errout)) return NULL;
     return vp;
 }
 
 static bool
-di_skip_records(DebugInfoReader *reader)
+di_skip_records(DebugInfoReader *reader, FILE *errout)
 {
     for (;;) {
         DebugInfoValue v = {{0}};
         uint64_t at = uleb128(&reader->q);
         uint64_t form = uleb128(&reader->q);
         if (!at || !form) return true;
-        if (!debug_info_reader_read_value(reader, form, &v)) return false;
+        if (!debug_info_reader_read_value(reader, form, &v, errout)) return false;
     }
 }
 
@@ -1491,12 +1497,13 @@ typedef struct addr_header {
 } addr_header_t;
 
 static bool
-addr_header_init(obj_info_t *obj, addr_header_t *header) {
+addr_header_init(obj_info_t *obj, addr_header_t *header, FILE *errout)
+{
     const char *p = obj->debug_addr.ptr;
 
     header->ptr = p;
 
-    if (!p) return false;
+    if (!p) return true;
 
     header->unit_length = *(uint32_t *)p;
     p += sizeof(uint32_t);
@@ -1536,10 +1543,11 @@ typedef struct rnglists_header {
 } rnglists_header_t;
 
 static bool
-rnglists_header_init(obj_info_t *obj, rnglists_header_t *header) {
+rnglists_header_init(obj_info_t *obj, rnglists_header_t *header, FILE *errout)
+{
     const char *p = obj->debug_rnglists.ptr;
 
-    if (!p) return false;
+    if (!p) return true;
 
     header->unit_length = *(uint32_t *)p;
     p += sizeof(uint32_t);
@@ -1603,7 +1611,7 @@ ranges_set(ranges_t *ptr, DebugInfoValue *v, addr_header_t *addr_header, uint64_
 }
 
 static uint64_t
-read_dw_form_addr(DebugInfoReader *reader, const char **ptr)
+read_dw_form_addr(DebugInfoReader *reader, const char **ptr, FILE *errout)
 {
     const char *p = *ptr;
     *ptr = p + reader->address_size;
@@ -1615,7 +1623,7 @@ read_dw_form_addr(DebugInfoReader *reader, const char **ptr)
 }
 
 static uintptr_t
-ranges_include(DebugInfoReader *reader, ranges_t *ptr, uint64_t addr, rnglists_header_t *rnglists_header)
+ranges_include(DebugInfoReader *reader, ranges_t *ptr, uint64_t addr, rnglists_header_t *rnglists_header, FILE *errout)
 {
     if (ptr->high_pc_set) {
         if (ptr->ranges_set || !ptr->low_pc_set) {
@@ -1668,15 +1676,15 @@ ranges_include(DebugInfoReader *reader, ranges_t *ptr, uint64_t addr, rnglists_h
                     to = (uintptr_t)base + uleb128(&p);
                     break;
                   case DW_RLE_base_address:
-                    base = read_dw_form_addr(reader, &p);
+                    base = read_dw_form_addr(reader, &p, errout);
                     base_valid = true;
                     break;
                   case DW_RLE_start_end:
-                    from = (uintptr_t)read_dw_form_addr(reader, &p);
-                    to = (uintptr_t)read_dw_form_addr(reader, &p);
+                    from = (uintptr_t)read_dw_form_addr(reader, &p, errout);
+                    to = (uintptr_t)read_dw_form_addr(reader, &p, errout);
                     break;
                   case DW_RLE_start_length:
-                    from = (uintptr_t)read_dw_form_addr(reader, &p);
+                    from = (uintptr_t)read_dw_form_addr(reader, &p, errout);
                     to = from + uleb128(&p);
                     break;
                 }
@@ -1710,7 +1718,7 @@ ranges_include(DebugInfoReader *reader, ranges_t *ptr, uint64_t addr, rnglists_h
 
 #if 0
 static void
-ranges_inspect(DebugInfoReader *reader, ranges_t *ptr)
+ranges_inspect(DebugInfoReader *reader, ranges_t *ptr, FILE *errout)
 {
     if (ptr->high_pc_set) {
         if (ptr->ranges_set || !ptr->low_pc_set) {
@@ -1740,7 +1748,7 @@ ranges_inspect(DebugInfoReader *reader, ranges_t *ptr)
 #endif
 
 static int
-di_read_cu(DebugInfoReader *reader)
+di_read_cu(DebugInfoReader *reader, FILE *errout)
 {
     uint64_t unit_length;
     uint16_t version;
@@ -1775,15 +1783,15 @@ di_read_cu(DebugInfoReader *reader)
 
     reader->level = 0;
     di_read_debug_abbrev_cu(reader);
-    if (di_read_debug_line_cu(reader)) return -1;
+    if (di_read_debug_line_cu(reader, errout)) return -1;
 
     do {
         DIE die;
 
-        if (!di_read_die(reader, &die)) continue;
+        if (!di_read_die(reader, &die, errout)) continue;
 
         if (die.tag != DW_TAG_compile_unit) {
-            if (!di_skip_records(reader)) return -1;
+            if (!di_skip_records(reader, errout)) return -1;
             break;
         }
 
@@ -1795,7 +1803,7 @@ di_read_cu(DebugInfoReader *reader)
         /* enumerate abbrev */
         for (;;) {
             DebugInfoValue v = {{0}};
-            if (!di_read_record(reader, &v)) break;
+            if (!di_read_record(reader, &v, errout)) break;
             switch (v.at) {
               case DW_AT_low_pc:
                 // clang may output DW_AT_addr_base after DW_AT_low_pc.
@@ -1821,7 +1829,7 @@ di_read_cu(DebugInfoReader *reader)
             case VAL_addr:
                 {
                     addr_header_t header = {0};
-                    if (!addr_header_init(reader->obj, &header)) return -1;
+                    if (!addr_header_init(reader->obj, &header, errout)) return -1;
                     reader->current_low_pc = read_addr(&header, reader->current_addr_base, low_pc.as.addr_idx);
                 }
                 break;
@@ -1832,7 +1840,7 @@ di_read_cu(DebugInfoReader *reader)
 }
 
 static void
-read_abstract_origin(DebugInfoReader *reader, uint64_t form, uint64_t abstract_origin, line_info_t *line)
+read_abstract_origin(DebugInfoReader *reader, uint64_t form, uint64_t abstract_origin, line_info_t *line, FILE *errout)
 {
     const char *p = reader->p;
     const char *q = reader->q;
@@ -1857,12 +1865,12 @@ read_abstract_origin(DebugInfoReader *reader, uint64_t form, uint64_t abstract_o
       default:
         goto finish;
     }
-    if (!di_read_die(reader, &die)) goto finish;
+    if (!di_read_die(reader, &die, errout)) goto finish;
 
     /* enumerate abbrev */
     for (;;) {
         DebugInfoValue v = {{0}};
-        if (!di_read_record(reader, &v)) break;
+        if (!di_read_record(reader, &v, errout)) break;
         switch (v.at) {
           case DW_AT_name:
             line->sname = get_cstr_value(&v);
@@ -1878,25 +1886,26 @@ read_abstract_origin(DebugInfoReader *reader, uint64_t form, uint64_t abstract_o
 
 static bool
 debug_info_read(DebugInfoReader *reader, int num_traces, void **traces,
-         line_info_t *lines, int offset) {
+                line_info_t *lines, int offset, FILE *errout)
+{
 
     addr_header_t addr_header = {0};
-    if (!addr_header_init(reader->obj, &addr_header)) return false;
+    if (!addr_header_init(reader->obj, &addr_header, errout)) return false;
 
     rnglists_header_t rnglists_header = {0};
-    if (!rnglists_header_init(reader->obj, &rnglists_header)) return false;
+    if (!rnglists_header_init(reader->obj, &rnglists_header, errout)) return false;
 
     while (reader->p < reader->cu_end) {
         DIE die;
         ranges_t ranges = {0};
         line_info_t line = {0};
 
-        if (!di_read_die(reader, &die)) continue;
+        if (!di_read_die(reader, &die, errout)) continue;
         /* kprintf("%d:%tx: <%d>\n",__LINE__,die.pos,reader->level,die.tag); */
 
         if (die.tag != DW_TAG_subprogram && die.tag != DW_TAG_inlined_subroutine) {
           skip_die:
-            if (!di_skip_records(reader)) return false;
+            if (!di_skip_records(reader, errout)) return false;
             continue;
         }
 
@@ -1904,15 +1913,15 @@ debug_info_read(DebugInfoReader *reader, int num_traces, void **traces,
         for (;;) {
             DebugInfoValue v = {{0}};
             /* ptrdiff_t pos = reader->p - reader->p0; */
-            if (!di_read_record(reader, &v)) break;
+            if (!di_read_record(reader, &v, errout)) break;
             /* kprintf("\n%d:%tx: AT:%lx FORM:%lx\n",__LINE__,pos,v.at,v.form); */
-            /* div_inspect(&v); */
+            /* div_inspect(&v, errout); */
             switch (v.at) {
               case DW_AT_name:
                 line.sname = get_cstr_value(&v);
                 break;
               case DW_AT_call_file:
-                fill_filename((int)v.as.uint64, reader->debug_line_format, reader->debug_line_version, reader->debug_line_directories, reader->debug_line_files, &line, reader->obj);
+                fill_filename((int)v.as.uint64, reader->debug_line_format, reader->debug_line_version, reader->debug_line_directories, reader->debug_line_files, &line, reader->obj, errout);
                 break;
               case DW_AT_call_line:
                 line.line = (int)v.as.uint64;
@@ -1928,16 +1937,16 @@ debug_info_read(DebugInfoReader *reader, int num_traces, void **traces,
                 /* 1 or 3 */
                 break; /* goto skip_die; */
               case DW_AT_abstract_origin:
-                read_abstract_origin(reader, v.form, v.as.uint64, &line);
+                read_abstract_origin(reader, v.form, v.as.uint64, &line, errout);
                 break; /* goto skip_die; */
             }
         }
-        /* ranges_inspect(reader, &ranges); */
+        /* ranges_inspect(reader, &ranges, errout); */
         /* kprintf("%d:%tx: %x ",__LINE__,diepos,die.tag); */
         for (int i=offset; i < num_traces; i++) {
             uintptr_t addr = (uintptr_t)traces[i];
             uintptr_t offset = addr - reader->obj->base_addr + reader->obj->vmaddr;
-            uintptr_t saddr = ranges_include(reader, &ranges, offset, &rnglists_header);
+            uintptr_t saddr = ranges_include(reader, &ranges, offset, &rnglists_header, errout);
             if (saddr == UINTPTR_MAX) return false;
             if (saddr) {
                 /* kprintf("%d:%tx: %d %lx->%lx %x %s: %s/%s %d %s %s %s\n",__LINE__,die.pos, i,addr,offset, die.tag,line.sname,line.dirname,line.filename,line.line,reader->obj->path,line.sname,lines[i].sname); */
@@ -1976,7 +1985,10 @@ debug_info_read(DebugInfoReader *reader, int num_traces, void **traces,
 //
 // It records DW_LNCT_path and DW_LNCT_directory_index at the index "idx".
 static const char *
-parse_ver5_debug_line_header(const char *p, int idx, uint8_t format, obj_info_t *obj, const char **out_path, uint64_t *out_directory_index) {
+parse_ver5_debug_line_header(const char *p, int idx, uint8_t format,
+                             obj_info_t *obj, const char **out_path,
+                             uint64_t *out_directory_index, FILE *errout)
+{
     int i, j;
     int entry_format_count = *(uint8_t *)p++;
     const char *entry_format = p;
@@ -1996,7 +2008,7 @@ parse_ver5_debug_line_header(const char *p, int idx, uint8_t format, obj_info_t
             DebugInfoValue v = {{0}};
             unsigned long dw_lnct = uleb128(&format);
             unsigned long dw_form = uleb128(&format);
-            if (!debug_info_reader_read_value(&reader, dw_form, &v)) return 0;
+            if (!debug_info_reader_read_value(&reader, dw_form, &v, errout)) return 0;
             if (dw_lnct == 1 /* DW_LNCT_path */ && v.type == VAL_cstr && out_path)
                 *out_path = v.as.ptr + v.off;
             if (dw_lnct == 2 /* DW_LNCT_directory_index */ && v.type == VAL_uint && out_directory_index)
@@ -2019,14 +2031,14 @@ uncompress_debug_section(ElfW(Shdr) *shdr, char *file, char **ptr)
     int ret = 0;
 
     if (chdr->ch_type != ELFCOMPRESS_ZLIB) {
-	/* unsupported compression type */
-	return 0;
+        /* unsupported compression type */
+        return 0;
     }
 
     *ptr = malloc(destsize);
     if (!*ptr) return 0;
     ret = uncompress((Bytef *)*ptr, &destsize,
-	    (const Bytef*)chdr + sizeof(ElfW(Chdr)),
+            (const Bytef*)chdr + sizeof(ElfW(Chdr)),
             shdr->sh_size - sizeof(ElfW(Chdr)));
     if (ret != Z_OK) goto fail;
     return destsize;
@@ -2041,7 +2053,7 @@ uncompress_debug_section(ElfW(Shdr) *shdr, char *file, char **ptr)
 /* read file and fill lines */
 static uintptr_t
 fill_lines(int num_traces, void **traces, int check_debuglink,
-	   obj_info_t **objp, line_info_t *lines, int offset)
+           obj_info_t **objp, line_info_t *lines, int offset, FILE *errout)
 {
     int i, j;
     char *shstr;
@@ -2059,40 +2071,40 @@ fill_lines(int num_traces, void **traces, int check_debuglink,
 
     fd = open(binary_filename, O_RDONLY);
     if (fd < 0) {
-	goto fail;
+        goto fail;
     }
     filesize = lseek(fd, 0, SEEK_END);
     if (filesize < 0) {
-	int e = errno;
-	close(fd);
-	kprintf("lseek: %s\n", strerror(e));
-	goto fail;
+        int e = errno;
+        close(fd);
+        kprintf("lseek: %s\n", strerror(e));
+        goto fail;
     }
 #if SIZEOF_OFF_T > SIZEOF_SIZE_T
     if (filesize > (off_t)SIZE_MAX) {
-	close(fd);
-	kprintf("Too large file %s\n", binary_filename);
-	goto fail;
+        close(fd);
+        kprintf("Too large file %s\n", binary_filename);
+        goto fail;
     }
 #endif
     lseek(fd, 0, SEEK_SET);
     /* async-signal unsafe */
     file = (char *)mmap(NULL, (size_t)filesize, PROT_READ, MAP_SHARED, fd, 0);
     if (file == MAP_FAILED) {
-	int e = errno;
-	close(fd);
-	kprintf("mmap: %s\n", strerror(e));
-	goto fail;
+        int e = errno;
+        close(fd);
+        kprintf("mmap: %s\n", strerror(e));
+        goto fail;
     }
     close(fd);
 
     ehdr = (ElfW(Ehdr) *)file;
     if (memcmp(ehdr->e_ident, "\177ELF", 4) != 0) {
-	/*
-	 * Huh? Maybe filename was overridden by setproctitle() and
-	 * it match non-elf file.
-	 */
-	goto fail;
+        /*
+         * Huh? Maybe filename was overridden by setproctitle() and
+         * it match non-elf file.
+         */
+        goto fail;
     }
     obj->mapped = file;
     obj->mapped_size = (size_t)filesize;
@@ -2104,32 +2116,32 @@ fill_lines(int num_traces, void **traces, int check_debuglink,
 
     for (i = 0; i < ehdr->e_shnum; i++) {
         char *section_name = shstr + shdr[i].sh_name;
-	switch (shdr[i].sh_type) {
-	  case SHT_STRTAB:
-	    if (!strcmp(section_name, ".strtab")) {
-		strtab_shdr = shdr + i;
-	    }
-	    else if (!strcmp(section_name, ".dynstr")) {
-		dynstr_shdr = shdr + i;
-	    }
-	    break;
-	  case SHT_SYMTAB:
-	    /* if (!strcmp(section_name, ".symtab")) */
-	    symtab_shdr = shdr + i;
-	    break;
-	  case SHT_DYNSYM:
-	    /* if (!strcmp(section_name, ".dynsym")) */
-	    dynsym_shdr = shdr + i;
-	    break;
+        switch (shdr[i].sh_type) {
+          case SHT_STRTAB:
+            if (!strcmp(section_name, ".strtab")) {
+                strtab_shdr = shdr + i;
+            }
+            else if (!strcmp(section_name, ".dynstr")) {
+                dynstr_shdr = shdr + i;
+            }
+            break;
+          case SHT_SYMTAB:
+            /* if (!strcmp(section_name, ".symtab")) */
+            symtab_shdr = shdr + i;
+            break;
+          case SHT_DYNSYM:
+            /* if (!strcmp(section_name, ".dynsym")) */
+            dynsym_shdr = shdr + i;
+            break;
           case SHT_NOTE:
             if (!strcmp(section_name, ".note.gnu.build-id")) {
                 note_gnu_build_id = shdr + i;
             }
             break;
-	  case SHT_PROGBITS:
-	    if (!strcmp(section_name, ".gnu_debuglink")) {
-		gnu_debuglink_shdr = shdr + i;
-	    }
+          case SHT_PROGBITS:
+            if (!strcmp(section_name, ".gnu_debuglink")) {
+                gnu_debuglink_shdr = shdr + i;
+            }
             else {
                 const char *debug_section_names[] = {
                     ".debug_abbrev",
@@ -2159,17 +2171,16 @@ fill_lines(int num_traces, void **traces, int check_debuglink,
                     break;
                 }
             }
-	    break;
-	}
+            break;
+        }
     }
 
-    if (offset == -1) {
-	/* main executable */
-	offset = 0;
-	if (dynsym_shdr && dynstr_shdr) {
-	    char *strtab = file + dynstr_shdr->sh_offset;
-	    ElfW(Sym) *symtab = (ElfW(Sym) *)(file + dynsym_shdr->sh_offset);
-	    int symtab_count = (int)(dynsym_shdr->sh_size / sizeof(ElfW(Sym)));
+    if (offset == 0) {
+        /* main executable */
+        if (dynsym_shdr && dynstr_shdr) {
+            char *strtab = file + dynstr_shdr->sh_offset;
+            ElfW(Sym) *symtab = (ElfW(Sym) *)(file + dynsym_shdr->sh_offset);
+            int symtab_count = (int)(dynsym_shdr->sh_size / sizeof(ElfW(Sym)));
             void *handle = dlopen(NULL, RTLD_NOW|RTLD_LOCAL);
             if (handle) {
                 for (j = 0; j < symtab_count; j++) {
@@ -2186,14 +2197,14 @@ fill_lines(int num_traces, void **traces, int check_debuglink,
                 }
                 dlclose(handle);
             }
-	    if (ehdr->e_type == ET_EXEC) {
-		obj->base_addr = 0;
-	    }
-	    else {
-		/* PIE (position-independent executable) */
-		obj->base_addr = dladdr_fbase;
-	    }
-	}
+            if (ehdr->e_type == ET_EXEC) {
+                obj->base_addr = 0;
+            }
+            else {
+                /* PIE (position-independent executable) */
+                obj->base_addr = dladdr_fbase;
+            }
+        }
     }
 
     if (obj->debug_info.ptr && obj->debug_abbrev.ptr) {
@@ -2202,8 +2213,8 @@ fill_lines(int num_traces, void **traces, int check_debuglink,
         i = 0;
         while (reader.p < reader.pend) {
             /* kprintf("%d:%tx: CU[%d]\n", __LINE__, reader.p - reader.obj->debug_info.ptr, i++); */
-            if (di_read_cu(&reader)) goto use_symtab;
-            if (!debug_info_read(&reader, num_traces, traces, lines, offset))
+            if (di_read_cu(&reader, errout)) goto use_symtab;
+            if (!debug_info_read(&reader, num_traces, traces, lines, offset, errout))
                 goto use_symtab;
         }
     }
@@ -2239,27 +2250,27 @@ fill_lines(int num_traces, void **traces, int check_debuglink,
     }
 
     if (!obj->debug_line.ptr) {
-	/* This file doesn't have .debug_line section,
-	   let's check .gnu_debuglink section instead. */
-	if (gnu_debuglink_shdr && check_debuglink) {
-	    follow_debuglink(file + gnu_debuglink_shdr->sh_offset,
-			     num_traces, traces,
-			     objp, lines, offset);
-	}
+        /* This file doesn't have .debug_line section,
+           let's check .gnu_debuglink section instead. */
+        if (gnu_debuglink_shdr && check_debuglink) {
+            follow_debuglink(file + gnu_debuglink_shdr->sh_offset,
+                             num_traces, traces,
+                             objp, lines, offset, errout);
+        }
         if (note_gnu_build_id && check_debuglink) {
             ElfW(Nhdr) *nhdr = (ElfW(Nhdr)*) (file + note_gnu_build_id->sh_offset);
             const char *build_id = (char *)(nhdr + 1) + nhdr->n_namesz;
             follow_debuglink_build_id(build_id, nhdr->n_descsz,
-			       num_traces, traces,
-			       objp, lines, offset);
+                               num_traces, traces,
+                               objp, lines, offset, errout);
         }
-	goto finish;
+        goto finish;
     }
 
     if (parse_debug_line(num_traces, traces,
             obj->debug_line.ptr,
             obj->debug_line.size,
-            obj, lines, offset) == -1)
+            obj, lines, offset, errout) == -1)
         goto fail;
 
 finish:
@@ -2271,7 +2282,7 @@ fill_lines(int num_traces, void **traces, int check_debuglink,
 /* read file and fill lines */
 static uintptr_t
 fill_lines(int num_traces, void **traces, int check_debuglink,
-        obj_info_t **objp, line_info_t *lines, int offset)
+        obj_info_t **objp, line_info_t *lines, int offset, FILE *errout)
 {
 # ifdef __LP64__
 #  define LP(x) x##_64
@@ -2374,13 +2385,14 @@ fill_lines(int num_traces, void **traces, int check_debuglink,
         goto fail;
     }
     else {
-        kprintf("'%s' is not a "
 # ifdef __LP64__
-                "64"
+#   define bitsize "64"
 # else
-                "32"
+#   define bitsize "32"
 # endif
+        kprintf("'%s' is not a " bitsize
                 "-bit Mach-O file!\n",binary_filename);
+# undef bitsize
         close(fd);
         goto fail;
     }
@@ -2415,7 +2427,17 @@ fill_lines(int num_traces, void **traces, int check_debuglink,
                         for (int j=0; j < DWARF_SECTION_COUNT; j++) {
                             struct dwarf_section *s = obj_dwarf_section_at(obj, j);
 
-                            if (strcmp(sect->sectname, debug_section_names[j]) != 0)
+                            if (strcmp(sect->sectname, debug_section_names[j]) != 0
+#ifdef __APPLE__
+                                    /* macOS clang 16 generates DWARF5, which have Mach-O
+                                     * section names that are limited to 16 characters,
+                                     * which causes sections with long names to be truncated
+                                     * and not match above.
+                                     * See: https://wiki.dwarfstd.org/Best_Practices.md#Mach-2d-O
+                                     */
+                                    && strncmp(sect->sectname, debug_section_names[j], 16) != 0
+#endif
+                                )
                                 continue;
 
                             s->ptr = file + sect->offset;
@@ -2472,8 +2494,8 @@ fill_lines(int num_traces, void **traces, int check_debuglink,
         DebugInfoReader reader;
         debug_info_reader_init(&reader, obj);
         while (reader.p < reader.pend) {
-            if (di_read_cu(&reader)) goto fail;
-            if (!debug_info_read(&reader, num_traces, traces, lines, offset))
+            if (di_read_cu(&reader, errout)) goto fail;
+            if (!debug_info_read(&reader, num_traces, traces, lines, offset, errout))
                 goto fail;
         }
     }
@@ -2481,7 +2503,7 @@ fill_lines(int num_traces, void **traces, int check_debuglink,
     if (parse_debug_line(num_traces, traces,
             obj->debug_line.ptr,
             obj->debug_line.size,
-            obj, lines, offset) == -1)
+            obj, lines, offset, errout) == -1)
         goto fail;
 
     return dladdr_fbase;
@@ -2494,7 +2516,7 @@ fill_lines(int num_traces, void **traces, int check_debuglink,
 #if defined(__FreeBSD__) || defined(__DragonFly__)
 # include <sys/sysctl.h>
 #endif
-/* ssize_t main_exe_path(void)
+/* ssize_t main_exe_path(FILE *errout)
  *
  * store the path of the main executable to `binary_filename`,
  * and returns strlen(binary_filename).
@@ -2502,7 +2524,7 @@ fill_lines(int num_traces, void **traces, int check_debuglink,
  */
 #if defined(__linux__) || defined(__NetBSD__)
 static ssize_t
-main_exe_path(void)
+main_exe_path(FILE *errout)
 {
 # if defined(__linux__)
 #  define PROC_SELF_EXE "/proc/self/exe"
@@ -2516,21 +2538,21 @@ main_exe_path(void)
 }
 #elif defined(__FreeBSD__) || defined(__DragonFly__)
 static ssize_t
-main_exe_path(void)
+main_exe_path(FILE *errout)
 {
     int mib[4] = {CTL_KERN, KERN_PROC, KERN_PROC_PATHNAME, -1};
     size_t len = PATH_MAX;
     int err = sysctl(mib, 4, binary_filename, &len, NULL, 0);
     if (err) {
-	kprintf("Can't get the path of ruby");
-	return -1;
+        kprintf("Can't get the path of ruby");
+        return -1;
     }
     len--; /* sysctl sets strlen+1 */
     return len;
 }
 #elif defined(HAVE_LIBPROC_H)
 static ssize_t
-main_exe_path(void)
+main_exe_path(FILE *errout)
 {
     int len = proc_pidpath(getpid(), binary_filename, PATH_MAX);
     if (len == 0) return 0;
@@ -2542,7 +2564,7 @@ main_exe_path(void)
 #endif
 
 static void
-print_line0(line_info_t *line, void *address)
+print_line0(line_info_t *line, void *address, FILE *errout)
 {
     uintptr_t addr = (uintptr_t)address;
     uintptr_t d = addr - line->saddr;
@@ -2583,16 +2605,16 @@ print_line0(line_info_t *line, void *address)
 }
 
 static void
-print_line(line_info_t *line, void *address)
+print_line(line_info_t *line, void *address, FILE *errout)
 {
-    print_line0(line, address);
+    print_line0(line, address, errout);
     if (line->next) {
-        print_line(line->next, NULL);
+        print_line(line->next, NULL, errout);
     }
 }
 
 void
-rb_dump_backtrace_with_lines(int num_traces, void **traces)
+rb_dump_backtrace_with_lines(int num_traces, void **traces, FILE *errout)
 {
     int i;
     /* async-signal unsafe */
@@ -2604,80 +2626,80 @@ rb_dump_backtrace_with_lines(int num_traces, void **traces)
 #ifdef HAVE_MAIN_EXE_PATH
     char *main_path = NULL; /* used on printing backtrace */
     ssize_t len;
-    if ((len = main_exe_path()) > 0) {
-	main_path = (char *)alloca(len + 1);
-	if (main_path) {
-	    uintptr_t addr;
-	    memcpy(main_path, binary_filename, len+1);
-	    append_obj(&obj);
-	    obj->path = main_path;
-	    addr = fill_lines(num_traces, traces, 1, &obj, lines, -1);
-	    if (addr != (uintptr_t)-1) {
-		dladdr_fbases[0] = (void *)addr;
-	    }
-	}
+    if ((len = main_exe_path(errout)) > 0) {
+        main_path = (char *)alloca(len + 1);
+        if (main_path) {
+            uintptr_t addr;
+            memcpy(main_path, binary_filename, len+1);
+            append_obj(&obj);
+            obj->path = main_path;
+            addr = fill_lines(num_traces, traces, 1, &obj, lines, 0, errout);
+            if (addr != (uintptr_t)-1) {
+                dladdr_fbases[0] = (void *)addr;
+            }
+        }
     }
 #endif
 
     /* fill source lines by reading dwarf */
     for (i = 0; i < num_traces; i++) {
-	Dl_info info;
-	if (lines[i].line) continue;
-	if (dladdr(traces[i], &info)) {
-	    const char *path;
-	    void **p;
-
-	    /* skip symbols which is in already checked objects */
-	    /* if the binary is strip-ed, this may effect */
-	    for (p=dladdr_fbases; *p; p++) {
-		if (*p == info.dli_fbase) {
-		    if (info.dli_fname) lines[i].path = info.dli_fname;
-		    if (info.dli_sname) lines[i].sname = info.dli_sname;
-		    goto next_line;
-		}
-	    }
-	    *p = info.dli_fbase;
-
-	    append_obj(&obj);
-	    obj->base_addr = (uintptr_t)info.dli_fbase;
-	    path = info.dli_fname;
-	    obj->path = path;
-	    if (path) lines[i].path = path;
+        Dl_info info;
+        if (lines[i].line) continue;
+        if (dladdr(traces[i], &info)) {
+            const char *path;
+            void **p;
+
+            /* skip symbols which is in already checked objects */
+            /* if the binary is strip-ed, this may effect */
+            for (p=dladdr_fbases; *p; p++) {
+                if (*p == info.dli_fbase) {
+                    if (info.dli_fname) lines[i].path = info.dli_fname;
+                    if (info.dli_sname) lines[i].sname = info.dli_sname;
+                    goto next_line;
+                }
+            }
+            *p = info.dli_fbase;
+
+            append_obj(&obj);
+            obj->base_addr = (uintptr_t)info.dli_fbase;
+            path = info.dli_fname;
+            obj->path = path;
+            if (path) lines[i].path = path;
             if (info.dli_sname) {
                 lines[i].sname = info.dli_sname;
                 lines[i].saddr = (uintptr_t)info.dli_saddr;
             }
-	    strlcpy(binary_filename, path, PATH_MAX);
-	    if (fill_lines(num_traces, traces, 1, &obj, lines, i) == (uintptr_t)-1)
-		break;
-	}
+            strlcpy(binary_filename, path, PATH_MAX);
+            if (fill_lines(num_traces, traces, 1, &obj, lines, i, errout) == (uintptr_t)-1)
+                break;
+        }
 next_line:
-	continue;
+        continue;
     }
 
     /* output */
     for (i = 0; i < num_traces; i++) {
-        print_line(&lines[i], traces[i]);
+        print_line(&lines[i], traces[i], errout);
 
-	/* FreeBSD's backtrace may show _start and so on */
-	if (lines[i].sname && strcmp("main", lines[i].sname) == 0)
-	    break;
+        /* FreeBSD's backtrace may show _start and so on */
+        if (lines[i].sname && strcmp("main", lines[i].sname) == 0)
+            break;
     }
 
     /* free */
     while (obj) {
-	obj_info_t *o = obj;
+        obj_info_t *o = obj;
         for (i=0; i < DWARF_SECTION_COUNT; i++) {
             struct dwarf_section *s = obj_dwarf_section_at(obj, i);
             if (s->flags & SHF_COMPRESSED) {
                 free(s->ptr);
             }
         }
-	if (obj->mapped_size) {
-	    munmap(obj->mapped, obj->mapped_size);
-	}
-	obj = o->next;
-	free(o);
+        if (obj->mapped_size) {
+            munmap(obj->mapped, obj->mapped_size);
+        }
+        obj = o->next;
+        free(o);
     }
     for (i = 0; i < num_traces; i++) {
         line_info_t *line = lines[i].next;
diff --git a/addr2line.h b/addr2line.h
index f09b6658001d1e..ff8e476b929f16 100644
--- a/addr2line.h
+++ b/addr2line.h
@@ -12,8 +12,10 @@
 
 #if (defined(USE_ELF) || defined(HAVE_MACH_O_LOADER_H))
 
+#include <stdio.h>
+
 void
-rb_dump_backtrace_with_lines(int num_traces, void **traces);
+rb_dump_backtrace_with_lines(int num_traces, void **traces, FILE *errout);
 
 #endif /* USE_ELF */
 
diff --git a/array.c b/array.c
index 103269630839a4..f485223e34bd21 100644
--- a/array.c
+++ b/array.c
@@ -27,7 +27,9 @@
 #include "probes.h"
 #include "ruby/encoding.h"
 #include "ruby/st.h"
+#include "ruby/thread.h"
 #include "ruby/util.h"
+#include "vm_core.h"
 #include "builtin.h"
 
 #if !ARRAY_DEBUG
@@ -37,15 +39,16 @@
 #include "ruby_assert.h"
 
 VALUE rb_cArray;
+VALUE rb_cArray_empty_frozen;
 
 /* Flags of RArray
  *
+ * 0:   RARRAY_SHARED_FLAG (equal to ELTS_SHARED)
+ *          The array is shared. The buffer this array points to is owned by
+ *          another array (the shared root).
  * 1:   RARRAY_EMBED_FLAG
  *          The array is embedded (its contents follow the header, rather than
  *          being on a separately allocated buffer).
- * 2:   RARRAY_SHARED_FLAG (equal to ELTS_SHARED)
- *          The array is shared. The buffer this array points to is owned by
- *          another array (the shared root).
  * 3-9: RARRAY_EMBED_LEN
  *          The length of the array when RARRAY_EMBED_FLAG is set.
  * 12:  RARRAY_SHARED_ROOT_FLAG
@@ -76,47 +79,47 @@ should_be_T_ARRAY(VALUE ary)
     return RB_TYPE_P(ary, T_ARRAY);
 }
 
-#define ARY_HEAP_PTR(a) (assert(!ARY_EMBED_P(a)), RARRAY(a)->as.heap.ptr)
-#define ARY_HEAP_LEN(a) (assert(!ARY_EMBED_P(a)), RARRAY(a)->as.heap.len)
-#define ARY_HEAP_CAPA(a) (assert(!ARY_EMBED_P(a)), assert(!ARY_SHARED_ROOT_P(a)), \
+#define ARY_HEAP_PTR(a) (RUBY_ASSERT(!ARY_EMBED_P(a)), RARRAY(a)->as.heap.ptr)
+#define ARY_HEAP_LEN(a) (RUBY_ASSERT(!ARY_EMBED_P(a)), RARRAY(a)->as.heap.len)
+#define ARY_HEAP_CAPA(a) (RUBY_ASSERT(!ARY_EMBED_P(a)), RUBY_ASSERT(!ARY_SHARED_ROOT_P(a)), \
                           RARRAY(a)->as.heap.aux.capa)
 
-#define ARY_EMBED_PTR(a) (assert(ARY_EMBED_P(a)), RARRAY(a)->as.ary)
+#define ARY_EMBED_PTR(a) (RUBY_ASSERT(ARY_EMBED_P(a)), RARRAY(a)->as.ary)
 #define ARY_EMBED_LEN(a) \
-    (assert(ARY_EMBED_P(a)), \
+    (RUBY_ASSERT(ARY_EMBED_P(a)), \
      (long)((RBASIC(a)->flags >> RARRAY_EMBED_LEN_SHIFT) & \
          (RARRAY_EMBED_LEN_MASK >> RARRAY_EMBED_LEN_SHIFT)))
-#define ARY_HEAP_SIZE(a) (assert(!ARY_EMBED_P(a)), assert(ARY_OWNS_HEAP_P(a)), ARY_CAPA(a) * sizeof(VALUE))
+#define ARY_HEAP_SIZE(a) (RUBY_ASSERT(!ARY_EMBED_P(a)), RUBY_ASSERT(ARY_OWNS_HEAP_P(a)), ARY_CAPA(a) * sizeof(VALUE))
 
-#define ARY_OWNS_HEAP_P(a) (assert(should_be_T_ARRAY((VALUE)(a))), \
+#define ARY_OWNS_HEAP_P(a) (RUBY_ASSERT(should_be_T_ARRAY((VALUE)(a))), \
                             !FL_TEST_RAW((a), RARRAY_SHARED_FLAG|RARRAY_EMBED_FLAG))
 
 #define FL_SET_EMBED(a) do { \
-    assert(!ARY_SHARED_P(a)); \
+    RUBY_ASSERT(!ARY_SHARED_P(a)); \
     FL_SET((a), RARRAY_EMBED_FLAG); \
     ary_verify(a); \
 } while (0)
 
 #define FL_UNSET_EMBED(ary) FL_UNSET((ary), RARRAY_EMBED_FLAG|RARRAY_EMBED_LEN_MASK)
 #define FL_SET_SHARED(ary) do { \
-    assert(!ARY_EMBED_P(ary)); \
+    RUBY_ASSERT(!ARY_EMBED_P(ary)); \
     FL_SET((ary), RARRAY_SHARED_FLAG); \
 } while (0)
 #define FL_UNSET_SHARED(ary) FL_UNSET((ary), RARRAY_SHARED_FLAG)
 
 #define ARY_SET_PTR(ary, p) do { \
-    assert(!ARY_EMBED_P(ary)); \
-    assert(!OBJ_FROZEN(ary)); \
+    RUBY_ASSERT(!ARY_EMBED_P(ary)); \
+    RUBY_ASSERT(!OBJ_FROZEN(ary)); \
     RARRAY(ary)->as.heap.ptr = (p); \
 } while (0)
 #define ARY_SET_EMBED_LEN(ary, n) do { \
     long tmp_n = (n); \
-    assert(ARY_EMBED_P(ary)); \
+    RUBY_ASSERT(ARY_EMBED_P(ary)); \
     RBASIC(ary)->flags &= ~RARRAY_EMBED_LEN_MASK; \
     RBASIC(ary)->flags |= (tmp_n) << RARRAY_EMBED_LEN_SHIFT; \
 } while (0)
 #define ARY_SET_HEAP_LEN(ary, n) do { \
-    assert(!ARY_EMBED_P(ary)); \
+    RUBY_ASSERT(!ARY_EMBED_P(ary)); \
     RARRAY(ary)->as.heap.len = (n); \
 } while (0)
 #define ARY_SET_LEN(ary, n) do { \
@@ -126,15 +129,15 @@ should_be_T_ARRAY(VALUE ary)
     else { \
         ARY_SET_HEAP_LEN((ary), (n)); \
     } \
-    assert(RARRAY_LEN(ary) == (n)); \
+    RUBY_ASSERT(RARRAY_LEN(ary) == (n)); \
 } while (0)
 #define ARY_INCREASE_PTR(ary, n) do  { \
-    assert(!ARY_EMBED_P(ary)); \
-    assert(!OBJ_FROZEN(ary)); \
+    RUBY_ASSERT(!ARY_EMBED_P(ary)); \
+    RUBY_ASSERT(!OBJ_FROZEN(ary)); \
     RARRAY(ary)->as.heap.ptr += (n); \
 } while (0)
 #define ARY_INCREASE_LEN(ary, n) do  { \
-    assert(!OBJ_FROZEN(ary)); \
+    RUBY_ASSERT(!OBJ_FROZEN(ary)); \
     if (ARY_EMBED_P(ary)) { \
         ARY_SET_EMBED_LEN((ary), RARRAY_LEN(ary)+(n)); \
     } \
@@ -146,30 +149,30 @@ should_be_T_ARRAY(VALUE ary)
 #define ARY_CAPA(ary) (ARY_EMBED_P(ary) ? ary_embed_capa(ary) : \
                        ARY_SHARED_ROOT_P(ary) ? RARRAY_LEN(ary) : ARY_HEAP_CAPA(ary))
 #define ARY_SET_CAPA(ary, n) do { \
-    assert(!ARY_EMBED_P(ary)); \
-    assert(!ARY_SHARED_P(ary)); \
-    assert(!OBJ_FROZEN(ary)); \
+    RUBY_ASSERT(!ARY_EMBED_P(ary)); \
+    RUBY_ASSERT(!ARY_SHARED_P(ary)); \
+    RUBY_ASSERT(!OBJ_FROZEN(ary)); \
     RARRAY(ary)->as.heap.aux.capa = (n); \
 } while (0)
 
 #define ARY_SHARED_ROOT_OCCUPIED(ary) (!OBJ_FROZEN(ary) && ARY_SHARED_ROOT_REFCNT(ary) == 1)
 #define ARY_SET_SHARED_ROOT_REFCNT(ary, value) do { \
-    assert(ARY_SHARED_ROOT_P(ary)); \
-    assert(!OBJ_FROZEN(ary)); \
-    assert((value) >= 0); \
+    RUBY_ASSERT(ARY_SHARED_ROOT_P(ary)); \
+    RUBY_ASSERT(!OBJ_FROZEN(ary)); \
+    RUBY_ASSERT((value) >= 0); \
     RARRAY(ary)->as.heap.aux.capa = (value); \
 } while (0)
 #define FL_SET_SHARED_ROOT(ary) do { \
-    assert(!OBJ_FROZEN(ary)); \
-    assert(!ARY_EMBED_P(ary)); \
+    RUBY_ASSERT(!OBJ_FROZEN(ary)); \
+    RUBY_ASSERT(!ARY_EMBED_P(ary)); \
     FL_SET((ary), RARRAY_SHARED_ROOT_FLAG); \
 } while (0)
 
 static inline void
 ARY_SET(VALUE a, long i, VALUE v)
 {
-    assert(!ARY_SHARED_P(a));
-    assert(!OBJ_FROZEN(a));
+    RUBY_ASSERT(!ARY_SHARED_P(a));
+    RUBY_ASSERT(!OBJ_FROZEN(a));
 
     RARRAY_ASET(a, i, v);
 }
@@ -179,7 +182,7 @@ static long
 ary_embed_capa(VALUE ary)
 {
     size_t size = rb_gc_obj_slot_size(ary) - offsetof(struct RArray, as.ary);
-    assert(size % sizeof(VALUE) == 0);
+    RUBY_ASSERT(size % sizeof(VALUE) == 0);
     return size / sizeof(VALUE);
 }
 
@@ -233,23 +236,22 @@ rb_ary_size_as_embedded(VALUE ary)
 static VALUE
 ary_verify_(VALUE ary, const char *file, int line)
 {
-    assert(RB_TYPE_P(ary, T_ARRAY));
+    RUBY_ASSERT(RB_TYPE_P(ary, T_ARRAY));
 
     if (ARY_SHARED_P(ary)) {
         VALUE root = ARY_SHARED_ROOT(ary);
         const VALUE *ptr = ARY_HEAP_PTR(ary);
         const VALUE *root_ptr = RARRAY_CONST_PTR(root);
         long len = ARY_HEAP_LEN(ary), root_len = RARRAY_LEN(root);
-        assert(ARY_SHARED_ROOT_P(root) || OBJ_FROZEN(root));
-        assert(root_ptr <= ptr && ptr + len <= root_ptr + root_len);
+        RUBY_ASSERT(ARY_SHARED_ROOT_P(root) || OBJ_FROZEN(root));
+        RUBY_ASSERT(root_ptr <= ptr && ptr + len <= root_ptr + root_len);
         ary_verify(root);
     }
     else if (ARY_EMBED_P(ary)) {
-        assert(!ARY_SHARED_P(ary));
-        assert(RARRAY_LEN(ary) <= ary_embed_capa(ary));
+        RUBY_ASSERT(!ARY_SHARED_P(ary));
+        RUBY_ASSERT(RARRAY_LEN(ary) <= ary_embed_capa(ary));
     }
     else {
-#if 1
         const VALUE *ptr = RARRAY_CONST_PTR(ary);
         long i, len = RARRAY_LEN(ary);
         volatile VALUE v;
@@ -258,17 +260,10 @@ ary_verify_(VALUE ary, const char *file, int line)
             v = ptr[i]; /* access check */
         }
         v = v;
-#endif
     }
 
     return ary;
 }
-
-void
-rb_ary_verify(VALUE ary)
-{
-    ary_verify(ary);
-}
 #else
 #define ary_verify(ary) ((void)0)
 #endif
@@ -326,7 +321,7 @@ ary_memfill(VALUE ary, long beg, long size, VALUE val)
 static void
 ary_memcpy0(VALUE ary, long beg, long argc, const VALUE *argv, VALUE buff_owner_ary)
 {
-    assert(!ARY_SHARED_P(buff_owner_ary));
+    RUBY_ASSERT(!ARY_SHARED_P(buff_owner_ary));
 
     if (argc > (int)(128/sizeof(VALUE)) /* is magic number (cache line size) */) {
         rb_gc_writebarrier_remember(buff_owner_ary);
@@ -351,7 +346,7 @@ ary_memcpy(VALUE ary, long beg, long argc, const VALUE *argv)
 }
 
 static VALUE *
-ary_heap_alloc(size_t capa)
+ary_heap_alloc_buffer(size_t capa)
 {
     return ALLOC_N(VALUE, capa);
 }
@@ -371,6 +366,7 @@ ary_heap_free(VALUE ary)
 static size_t
 ary_heap_realloc(VALUE ary, size_t new_capa)
 {
+    RUBY_ASSERT(!OBJ_FROZEN(ary));
     SIZED_REALLOC_N(RARRAY(ary)->as.heap.ptr, VALUE, new_capa, ARY_HEAP_CAPA(ary));
     ary_verify(ary);
 
@@ -380,7 +376,7 @@ ary_heap_realloc(VALUE ary, size_t new_capa)
 void
 rb_ary_make_embedded(VALUE ary)
 {
-    assert(rb_ary_embeddable_p(ary));
+    RUBY_ASSERT(rb_ary_embeddable_p(ary));
     if (!ARY_EMBED_P(ary)) {
         const VALUE *buf = ARY_HEAP_PTR(ary);
         long len = ARY_HEAP_LEN(ary);
@@ -397,15 +393,15 @@ rb_ary_make_embedded(VALUE ary)
 static void
 ary_resize_capa(VALUE ary, long capacity)
 {
-    assert(RARRAY_LEN(ary) <= capacity);
-    assert(!OBJ_FROZEN(ary));
-    assert(!ARY_SHARED_P(ary));
+    RUBY_ASSERT(RARRAY_LEN(ary) <= capacity);
+    RUBY_ASSERT(!OBJ_FROZEN(ary));
+    RUBY_ASSERT(!ARY_SHARED_P(ary));
 
     if (capacity > ary_embed_capa(ary)) {
         size_t new_capa = capacity;
         if (ARY_EMBED_P(ary)) {
             long len = ARY_EMBED_LEN(ary);
-            VALUE *ptr = ary_heap_alloc(capacity);
+            VALUE *ptr = ary_heap_alloc_buffer(capacity);
 
             MEMCPY(ptr, ARY_EMBED_PTR(ary), VALUE, len);
             FL_UNSET_EMBED(ary);
@@ -440,9 +436,12 @@ ary_shrink_capa(VALUE ary)
 {
     long capacity = ARY_HEAP_LEN(ary);
     long old_capa = ARY_HEAP_CAPA(ary);
-    assert(!ARY_SHARED_P(ary));
-    assert(old_capa >= capacity);
-    if (old_capa > capacity) ary_heap_realloc(ary, capacity);
+    RUBY_ASSERT(!ARY_SHARED_P(ary));
+    RUBY_ASSERT(old_capa >= capacity);
+    if (old_capa > capacity) {
+        size_t new_capa = ary_heap_realloc(ary, capacity);
+        ARY_SET_CAPA(ary, new_capa);
+    }
 
     ary_verify(ary);
 }
@@ -500,7 +499,7 @@ rb_ary_increment_share(VALUE shared_root)
 {
     if (!OBJ_FROZEN(shared_root)) {
         long num = ARY_SHARED_ROOT_REFCNT(shared_root);
-        assert(num >= 0);
+        RUBY_ASSERT(num >= 0);
         ARY_SET_SHARED_ROOT_REFCNT(shared_root, num + 1);
     }
     return shared_root;
@@ -509,9 +508,9 @@ rb_ary_increment_share(VALUE shared_root)
 static void
 rb_ary_set_shared(VALUE ary, VALUE shared_root)
 {
-    assert(!ARY_EMBED_P(ary));
-    assert(!OBJ_FROZEN(ary));
-    assert(ARY_SHARED_ROOT_P(shared_root) || OBJ_FROZEN(shared_root));
+    RUBY_ASSERT(!ARY_EMBED_P(ary));
+    RUBY_ASSERT(!OBJ_FROZEN(ary));
+    RUBY_ASSERT(ARY_SHARED_ROOT_P(shared_root) || OBJ_FROZEN(shared_root));
 
     rb_ary_increment_share(shared_root);
     FL_SET_SHARED(ary);
@@ -523,6 +522,8 @@ rb_ary_set_shared(VALUE ary, VALUE shared_root)
 static inline void
 rb_ary_modify_check(VALUE ary)
 {
+    RUBY_ASSERT(ruby_thread_has_gvl_p());
+
     rb_check_frozen(ary);
     ary_verify(ary);
 }
@@ -556,7 +557,7 @@ rb_ary_cancel_sharing(VALUE ary)
             rb_ary_decrement_share(shared_root);
         }
         else {
-            VALUE *ptr = ary_heap_alloc(len);
+            VALUE *ptr = ary_heap_alloc_buffer(len);
             MEMCPY(ptr, ARY_HEAP_PTR(ary), VALUE, len);
             rb_ary_unshare(ary);
             ARY_SET_CAPA(ary, len);
@@ -625,21 +626,32 @@ ary_ensure_room_for_push(VALUE ary, long add_len)
 
 /*
  *  call-seq:
- *    array.freeze -> self
+ *    freeze -> self
  *
- *  Freezes +self+; returns +self+:
+ *  Freezes +self+ (if not already frozen); returns +self+:
  *
  *    a = []
  *    a.frozen? # => false
  *    a.freeze
  *    a.frozen? # => true
  *
- *  An attempt to modify a frozen \Array raises FrozenError.
+ *  No further changes may be made to +self+;
+ *  raises FrozenError if a change is attempted.
+ *
+ *  Related: Kernel#frozen?.
  */
 
 VALUE
 rb_ary_freeze(VALUE ary)
 {
+    RUBY_ASSERT(RB_TYPE_P(ary, T_ARRAY));
+
+    if (OBJ_FROZEN(ary)) return ary;
+
+    if (!ARY_EMBED_P(ary) && !ARY_SHARED_P(ary) && !ARY_SHARED_ROOT_P(ary)) {
+        ary_shrink_capa(ary);
+    }
+
     return rb_obj_freeze(ary);
 }
 
@@ -666,7 +678,7 @@ static VALUE
 ary_alloc_embed(VALUE klass, long capa)
 {
     size_t size = ary_embed_size(capa);
-    assert(rb_gc_size_allocatable_p(size));
+    RUBY_ASSERT(rb_gc_size_allocatable_p(size));
     NEWOBJ_OF(ary, struct RArray, klass,
                      T_ARRAY | RARRAY_EMBED_FLAG | (RGENGC_WB_PROTECTED_ARRAY ? FL_WB_PROTECTED : 0),
                      size, 0);
@@ -696,6 +708,8 @@ empty_ary_alloc(VALUE klass)
 static VALUE
 ary_new(VALUE klass, long capa)
 {
+    RUBY_ASSERT(ruby_thread_has_gvl_p());
+
     VALUE ary;
 
     if (capa < 0) {
@@ -713,9 +727,9 @@ ary_new(VALUE klass, long capa)
     else {
         ary = ary_alloc_heap(klass);
         ARY_SET_CAPA(ary, capa);
-        assert(!ARY_EMBED_P(ary));
+        RUBY_ASSERT(!ARY_EMBED_P(ary));
 
-        ARY_SET_PTR(ary, ary_heap_alloc(capa));
+        ARY_SET_PTR(ary, ary_heap_alloc_buffer(capa));
         ARY_SET_HEAP_LEN(ary, 0);
     }
 
@@ -777,7 +791,7 @@ static VALUE
 ec_ary_alloc_embed(rb_execution_context_t *ec, VALUE klass, long capa)
 {
     size_t size = ary_embed_size(capa);
-    assert(rb_gc_size_allocatable_p(size));
+    RUBY_ASSERT(rb_gc_size_allocatable_p(size));
     NEWOBJ_OF(ary, struct RArray, klass,
             T_ARRAY | RARRAY_EMBED_FLAG | (RGENGC_WB_PROTECTED_ARRAY ? FL_WB_PROTECTED : 0),
             size, ec);
@@ -817,9 +831,9 @@ ec_ary_new(rb_execution_context_t *ec, VALUE klass, long capa)
     else {
         ary = ec_ary_alloc_heap(ec, klass);
         ARY_SET_CAPA(ary, capa);
-        assert(!ARY_EMBED_P(ary));
+        RUBY_ASSERT(!ARY_EMBED_P(ary));
 
-        ARY_SET_PTR(ary, ary_heap_alloc(capa));
+        ARY_SET_PTR(ary, ary_heap_alloc_buffer(capa));
         ARY_SET_HEAP_LEN(ary, 0);
     }
 
@@ -881,7 +895,32 @@ rb_ary_free(VALUE ary)
     }
 }
 
-RUBY_FUNC_EXPORTED size_t
+static VALUE fake_ary_flags;
+
+static VALUE
+init_fake_ary_flags(void)
+{
+    struct RArray fake_ary = {0};
+    fake_ary.basic.flags = T_ARRAY;
+    VALUE ary = (VALUE)&fake_ary;
+    rb_ary_freeze(ary);
+    return fake_ary.basic.flags;
+}
+
+VALUE
+rb_setup_fake_ary(struct RArray *fake_ary, const VALUE *list, long len)
+{
+    fake_ary->basic.flags = fake_ary_flags;
+    RBASIC_CLEAR_CLASS((VALUE)fake_ary);
+
+    // bypass frozen checks
+    fake_ary->as.heap.ptr = list;
+    fake_ary->as.heap.len = len;
+    fake_ary->as.heap.aux.capa = len;
+    return (VALUE)fake_ary;
+}
+
+size_t
 rb_ary_memsize(VALUE ary)
 {
     if (ARY_OWNS_HEAP_P(ary)) {
@@ -904,9 +943,6 @@ ary_make_shared(VALUE ary)
         return ary;
     }
     else if (OBJ_FROZEN(ary)) {
-        if (!ARY_EMBED_P(ary)) {
-            ary_shrink_capa(ary);
-        }
         return ary;
     }
     else {
@@ -919,7 +955,7 @@ ary_make_shared(VALUE ary)
         FL_SET_SHARED_ROOT(shared);
 
         if (ARY_EMBED_P(ary)) {
-            VALUE *ptr = ary_heap_alloc(capa);
+            VALUE *ptr = ary_heap_alloc_buffer(capa);
             ARY_SET_PTR(shared, ptr);
             ary_memcpy(shared, 0, len, RARRAY_CONST_PTR(ary));
 
@@ -949,7 +985,7 @@ ary_make_substitution(VALUE ary)
 
     if (ary_embeddable_p(len)) {
         VALUE subst = rb_ary_new_capa(len);
-        assert(ARY_EMBED_P(subst));
+        RUBY_ASSERT(ARY_EMBED_P(subst));
 
         ary_memcpy(subst, 0, len, RARRAY_CONST_PTR(ary));
         ARY_SET_EMBED_LEN(subst, len);
@@ -995,14 +1031,18 @@ rb_to_array(VALUE ary)
  *  call-seq:
  *    Array.try_convert(object) -> object, new_array, or nil
  *
- *  If +object+ is an \Array object, returns +object+.
+ *  Attempts to return an array, based on the given +object+.
  *
- *  Otherwise if +object+ responds to <tt>:to_ary</tt>,
- *  calls <tt>object.to_ary</tt> and returns the result.
+ *  If +object+ is an array, returns +object+.
  *
- *  Returns +nil+ if +object+ does not respond to <tt>:to_ary</tt>
+ *  Otherwise if +object+ responds to <tt>:to_ary</tt>.
+ *  calls <tt>object.to_ary</tt>:
+ *  if the return value is an array or +nil+, returns that value;
+ *  if not, raises TypeError.
  *
- *  Raises an exception unless <tt>object.to_ary</tt> returns an \Array object.
+ *  Otherwise returns +nil+.
+ *
+ *  Related: see {Methods for Creating an Array}[rdoc-ref:Array@Methods+for+Creating+an+Array].
  */
 
 static VALUE
@@ -1039,48 +1079,51 @@ rb_ary_s_new(int argc, VALUE *argv, VALUE klass)
  *  call-seq:
  *    Array.new -> new_empty_array
  *    Array.new(array) -> new_array
- *    Array.new(size) -> new_array
- *    Array.new(size, default_value) -> new_array
- *    Array.new(size) {|index| ... } -> new_array
+ *    Array.new(size, default_value = nil) -> new_array
+ *    Array.new(size = 0) {|index| ... } -> new_array
  *
- *  Returns a new \Array.
+ *  Returns a new array.
  *
- *  With no block and no arguments, returns a new empty \Array object.
+ *  With no block and no argument given, returns a new empty array:
  *
- *  With no block and a single \Array argument +array+,
- *  returns a new \Array formed from +array+:
+ *    Array.new # => []
  *
- *    a = Array.new([:foo, 'bar', 2])
- *    a.class # => Array
- *    a # => [:foo, "bar", 2]
+ *  With no block and array argument given, returns a new array with the same elements:
+ *
+ *    Array.new([:foo, 'bar', 2]) # => [:foo, "bar", 2]
+ *
+ *  With no block and integer argument given, returns a new array containing
+ *  that many instances of the given +default_value+:
  *
- *  With no block and a single Integer argument +size+,
- *  returns a new \Array of the given size
- *  whose elements are all +nil+:
+ *    Array.new(0)    # => []
+ *    Array.new(3)    # => [nil, nil, nil]
+ *    Array.new(2, 3) # => [3, 3]
  *
- *    a = Array.new(3)
- *    a # => [nil, nil, nil]
+ *  With a block given, returns an array of the given +size+;
+ *  calls the block with each +index+ in the range <tt>(0...size)</tt>;
+ *  the element at that +index+ in the returned array is the blocks return value:
  *
- *  With no block and arguments +size+ and +default_value+,
- *  returns an \Array of the given size;
- *  each element is that same +default_value+:
+ *    Array.new(3)  {|index| "Element #{index}" } # => ["Element 0", "Element 1", "Element 2"]
  *
- *    a = Array.new(3, 'x')
- *    a # => ['x', 'x', 'x']
+ *  A common pitfall for new Rubyists is providing an expression as +default_value+:
  *
- *  With a block and argument +size+,
- *  returns an \Array of the given size;
- *  the block is called with each successive integer +index+;
- *  the element for that +index+ is the return value from the block:
+ *    array = Array.new(2, {})
+ *    array # => [{}, {}]
+ *    array[0][:a] = 1
+ *    array # => [{a: 1}, {a: 1}], as array[0] and array[1] are same object
  *
- *    a = Array.new(3) {|index| "Element #{index}" }
- *    a # => ["Element 0", "Element 1", "Element 2"]
+ *  If you want the elements of the array to be distinct, you should pass a block:
  *
- *  Raises ArgumentError if +size+ is negative.
+ *    array = Array.new(2) { {} }
+ *    array # => [{}, {}]
+ *    array[0][:a] = 1
+ *    array # => [{a: 1}, {}], as array[0] and array[1] are different objects
  *
- *  With a block and no argument,
- *  or a single argument +0+,
- *  ignores the block and returns a new empty \Array.
+ *  Raises TypeError if the first argument is not either an array
+ *  or an {integer-convertible object}[rdoc-ref:implicit_conversion.rdoc@Integer-Convertible+Objects]).
+ *  Raises ArgumentError if the first argument is a negative integer.
+ *
+ *  Related: see {Methods for Creating an Array}[rdoc-ref:Array@Methods+for+Creating+an+Array].
  */
 
 static VALUE
@@ -1092,8 +1135,8 @@ rb_ary_initialize(int argc, VALUE *argv, VALUE ary)
     rb_ary_modify(ary);
     if (argc == 0) {
         rb_ary_reset(ary);
-        assert(ARY_EMBED_P(ary));
-        assert(ARY_EMBED_LEN(ary) == 0);
+        RUBY_ASSERT(ARY_EMBED_P(ary));
+        RUBY_ASSERT(ARY_EMBED_LEN(ary) == 0);
         if (rb_block_given_p()) {
             rb_warning("given block not used");
         }
@@ -1138,11 +1181,13 @@ rb_ary_initialize(int argc, VALUE *argv, VALUE ary)
 }
 
 /*
- * Returns a new array populated with the given objects.
+ * Returns a new array, populated with the given objects:
+ *
+ *   Array[1, 'a', /^A/]    # => [1, "a", /^A/]
+ *   Array[]                # => []
+ *   Array.[](1, 'a', /^A/) # => [1, "a", /^A/]
  *
- *   Array.[]( 1, 'a', /^A/)  # => [1, "a", /^A/]
- *   Array[ 1, 'a', /^A/ ]    # => [1, "a", /^A/]
- *   [ 1, 'a', /^A/ ]         # => [1, "a", /^A/]
+ * Related: see {Methods for Creating an Array}[rdoc-ref:Array@Methods+for+Creating+an+Array].
  */
 
 static VALUE
@@ -1190,9 +1235,9 @@ rb_ary_store(VALUE ary, long idx, VALUE val)
 static VALUE
 ary_make_partial(VALUE ary, VALUE klass, long offset, long len)
 {
-    assert(offset >= 0);
-    assert(len >= 0);
-    assert(offset+len <= RARRAY_LEN(ary));
+    RUBY_ASSERT(offset >= 0);
+    RUBY_ASSERT(len >= 0);
+    RUBY_ASSERT(offset+len <= RARRAY_LEN(ary));
 
     VALUE result = ary_alloc_heap(klass);
     size_t embed_capa = ary_embed_capa(result);
@@ -1204,7 +1249,10 @@ ary_make_partial(VALUE ary, VALUE klass, long offset, long len)
     else {
         VALUE shared = ary_make_shared(ary);
 
-        assert(!ARY_EMBED_P(result));
+        /* The ary_make_shared call may allocate, which can trigger a GC
+         * compaction. This can cause the array to be embedded because it has
+         * a length of 0. */
+        FL_UNSET_EMBED(result);
 
         ARY_SET_PTR(result, RARRAY_CONST_PTR(ary));
         ARY_SET_LEN(result, RARRAY_LEN(ary));
@@ -1223,17 +1271,18 @@ ary_make_partial(VALUE ary, VALUE klass, long offset, long len)
 static VALUE
 ary_make_partial_step(VALUE ary, VALUE klass, long offset, long len, long step)
 {
-    assert(offset >= 0);
-    assert(len >= 0);
-    assert(offset+len <= RARRAY_LEN(ary));
-    assert(step != 0);
+    RUBY_ASSERT(offset >= 0);
+    RUBY_ASSERT(len >= 0);
+    RUBY_ASSERT(offset+len <= RARRAY_LEN(ary));
+    RUBY_ASSERT(step != 0);
 
-    const VALUE *values = RARRAY_CONST_PTR(ary);
     const long orig_len = len;
 
     if (step > 0 && step >= len) {
         VALUE result = ary_new(klass, 1);
         VALUE *ptr = (VALUE *)ARY_EMBED_PTR(result);
+        const VALUE *values = RARRAY_CONST_PTR(ary);
+
         RB_OBJ_WRITE(result, ptr, values[offset]);
         ARY_SET_EMBED_LEN(result, 1);
         return result;
@@ -1251,6 +1300,8 @@ ary_make_partial_step(VALUE ary, VALUE klass, long offset, long len, long step)
     VALUE result = ary_new(klass, len);
     if (ARY_EMBED_P(result)) {
         VALUE *ptr = (VALUE *)ARY_EMBED_PTR(result);
+        const VALUE *values = RARRAY_CONST_PTR(ary);
+
         for (i = 0; i < len; ++i) {
             RB_OBJ_WRITE(result, ptr+i, values[j]);
             j += step;
@@ -1258,6 +1309,8 @@ ary_make_partial_step(VALUE ary, VALUE klass, long offset, long len, long step)
         ARY_SET_EMBED_LEN(result, len);
     }
     else {
+        const VALUE *values = RARRAY_CONST_PTR(ary);
+
         RARRAY_PTR_USE(result, ptr, {
             for (i = 0; i < len; ++i) {
                 RB_OBJ_WRITE(result, ptr+i, values[j]);
@@ -1313,19 +1366,17 @@ ary_take_first_or_last(int argc, const VALUE *argv, VALUE ary, enum ary_take_pos
 
 /*
  *  call-seq:
- *    array << object -> self
+ *    self << object -> self
  *
- *  Appends +object+ to +self+; returns +self+:
+ *  Appends +object+ as the last element in +self+; returns +self+:
  *
- *    a = [:foo, 'bar', 2]
- *    a << :baz # => [:foo, "bar", 2, :baz]
+ *    [:foo, 'bar', 2] << :baz # => [:foo, "bar", 2, :baz]
  *
- *  Appends +object+ as one element, even if it is another \Array:
+ *  Appends +object+ as a single element, even if it is another array:
  *
- *    a = [:foo, 'bar', 2]
- *    a1 = a << [3, 4]
- *    a1 # => [:foo, "bar", 2, [3, 4]]
+ *    [:foo, 'bar', 2] << [3, 4] # => [:foo, "bar", 2, [3, 4]]
  *
+ *  Related: see {Methods for Assigning}[rdoc-ref:Array@Methods+for+Assigning].
  */
 
 VALUE
@@ -1353,22 +1404,20 @@ rb_ary_cat(VALUE ary, const VALUE *argv, long len)
 
 /*
  *  call-seq:
- *    array.push(*objects) -> self
- *
- *  Appends trailing elements.
+ *    push(*objects) -> self
+ *    append(*objects) -> self
  *
- *  Appends each argument in +objects+ to +self+;  returns +self+:
+ *  Appends each argument in +objects+ to +self+; returns +self+:
  *
- *    a = [:foo, 'bar', 2]
- *    a.push(:baz, :bat) # => [:foo, "bar", 2, :baz, :bat]
+ *    a = [:foo, 'bar', 2] # => [:foo, "bar", 2]
+ *    a.push(:baz, :bat)   # => [:foo, "bar", 2, :baz, :bat]
  *
- *  Appends each argument as one element, even if it is another \Array:
+ *  Appends each argument as a single element, even if it is another array:
  *
- *    a = [:foo, 'bar', 2]
- *    a1 = a.push([:baz, :bat], [:bam, :bad])
- *    a1 # => [:foo, "bar", 2, [:baz, :bat], [:bam, :bad]]
+ *    a = [:foo, 'bar', 2]               # => [:foo, "bar", 2]
+      a.push([:baz, :bat], [:bam, :bad]) # => [:foo, "bar", 2, [:baz, :bat], [:bam, :bad]]
  *
- *  Related: #pop, #shift, #unshift.
+ *  Related: see {Methods for Assigning}[rdoc-ref:Array@Methods+for+Assigning].
  */
 
 static VALUE
@@ -1398,33 +1447,32 @@ rb_ary_pop(VALUE ary)
 
 /*
  *  call-seq:
- *    array.pop -> object or nil
- *    array.pop(n) -> new_array
+ *    pop -> object or nil
+ *    pop(count) -> new_array
  *
- *  Removes and returns trailing elements.
+ *  Removes and returns trailing elements of +self+.
  *
- *  When no argument is given and +self+ is not empty,
- *  removes and returns the last element:
+ *  With no argument given, removes and returns the last element, if available;
+ *  otherwise returns +nil+:
  *
  *    a = [:foo, 'bar', 2]
- *    a.pop # => 2
- *    a # => [:foo, "bar"]
+ *    a.pop  # => 2
+ *    a      # => [:foo, "bar"]
+ *    [].pop # => nil
  *
- *  Returns +nil+ if the array is empty.
+ *  With non-negative integer argument +count+ given,
+ *  returns a new array containing the trailing +count+ elements of +self+, as available:
  *
- *  When a non-negative Integer argument +n+ is given and is in range,
- *
- *  removes and returns the last +n+ elements in a new \Array:
  *    a = [:foo, 'bar', 2]
  *    a.pop(2) # => ["bar", 2]
- *
- *  If +n+ is positive and out of range,
- *  removes and returns all elements:
+ *    a        # => [:foo]
  *
  *    a = [:foo, 'bar', 2]
  *    a.pop(50) # => [:foo, "bar", 2]
+ *    a         # => []
  *
- *  Related: #push, #shift, #unshift.
+ *  Related: Array#push;
+ *  see also {Methods for Deleting}[rdoc-ref:Array@Methods+for+Deleting].
  */
 
 static VALUE
@@ -1463,35 +1511,40 @@ rb_ary_shift(VALUE ary)
 
 /*
  *  call-seq:
- *     array.shift -> object or nil
- *     array.shift(n) -> new_array
- *
- *  Removes and returns leading elements.
+ *    shift -> object or nil
+ *    shift(count) -> new_array or nil
  *
- *  When no argument is given, removes and returns the first element:
- *
- *    a = [:foo, 'bar', 2]
- *    a.shift # => :foo
- *    a # => ['bar', 2]
+ *  Removes and returns leading elements from +self+.
  *
- *  Returns +nil+ if +self+ is empty.
+ *  With no argument, removes and returns one element, if available,
+ *  or +nil+ otherwise:
  *
- *  When positive Integer argument +n+ is given, removes the first +n+ elements;
- *  returns those elements in a new \Array:
+ *    a = [0, 1, 2, 3]
+ *    a.shift  # => 0
+ *    a        # => [1, 2, 3]
+ *    [].shift # => nil
  *
- *    a = [:foo, 'bar', 2]
- *    a.shift(2) # => [:foo, 'bar']
- *    a # => [2]
+ *  With non-negative numeric argument +count+ given,
+ *  removes and returns the first +count+ elements:
  *
- *  If +n+ is as large as or larger than <tt>self.length</tt>,
- *  removes all elements; returns those elements in a new \Array:
+ *    a = [0, 1, 2, 3]
+ *    a.shift(2)   # => [0, 1]
+ *    a            # => [2, 3]
+ *    a.shift(1.1) # => [2]
+ *    a            # => [3]
+ *    a.shift(0)   # => []
+ *    a            # => [3]
+ *
+ *  If +count+ is large,
+ *  removes and returns all elements:
  *
- *    a = [:foo, 'bar', 2]
- *    a.shift(3) # => [:foo, 'bar', 2]
+ *    a = [0, 1, 2, 3]
+ *    a.shift(50) # => [0, 1, 2, 3]
+ *    a           # => []
  *
- *  If +n+ is zero, returns a new empty \Array; +self+ is unmodified.
+ *  If +self+ is empty, returns a new empty array.
  *
- *  Related: #push, #pop, #unshift.
+ *  Related: see {Methods for Deleting}[rdoc-ref:Array@Methods+for+Deleting].
  */
 
 static VALUE
@@ -1556,7 +1609,7 @@ make_room_for_unshift(VALUE ary, const VALUE *head, VALUE *sharedp, int argc, lo
         head = sharedp + argc + room;
     }
     ARY_SET_PTR(ary, head - argc);
-    assert(ARY_SHARED_ROOT_OCCUPIED(ARY_SHARED_ROOT(ary)));
+    RUBY_ASSERT(ARY_SHARED_ROOT_OCCUPIED(ARY_SHARED_ROOT(ary)));
 
     ary_verify(ary);
     return ARY_SHARED_ROOT(ary);
@@ -1632,14 +1685,16 @@ ary_ensure_room_for_unshift(VALUE ary, int argc)
 
 /*
  *  call-seq:
- *    array.unshift(*objects) -> self
+ *    unshift(*objects) -> self
+ *    prepend(*objects) -> self
  *
  *  Prepends the given +objects+ to +self+:
  *
  *    a = [:foo, 'bar', 2]
  *    a.unshift(:bam, :bat) # => [:bam, :bat, :foo, "bar", 2]
  *
- *  Related: #push, #pop, #shift.
+ *  Related: Array#shift;
+ *  see also {Methods for Assigning}[rdoc-ref:Array@Methods+for+Assigning].
  */
 
 VALUE
@@ -1715,25 +1770,42 @@ static VALUE rb_ary_aref2(VALUE ary, VALUE b, VALUE e);
 
 /*
  *  call-seq:
- *    array[index] -> object or nil
- *    array[start, length] -> object or nil
- *    array[range] -> object or nil
- *    array[aseq] -> object or nil
- *    array.slice(index) -> object or nil
- *    array.slice(start, length) -> object or nil
- *    array.slice(range) -> object or nil
- *    array.slice(aseq) -> object or nil
+ *    self[index] -> object or nil
+ *    self[start, length] -> object or nil
+ *    self[range] -> object or nil
+ *    self[aseq] -> object or nil
+ *    slice(index) -> object or nil
+ *    slice(start, length) -> object or nil
+ *    slice(range) -> object or nil
+ *    slice(aseq) -> object or nil
  *
  *  Returns elements from +self+; does not modify +self+.
  *
- *  When a single Integer argument +index+ is given, returns the element at offset +index+:
+ *  In brief:
+ *
+ *    a = [:foo, 'bar', 2]
+ *
+ *    # Single argument index: returns one element.
+ *    a[0]     # => :foo          # Zero-based index.
+ *    a[-1]    # => 2             # Negative index counts backwards from end.
+ *
+ *    # Arguments start and length: returns an array.
+ *    a[1, 2]  # => ["bar", 2]
+ *    a[-2, 2] # => ["bar", 2]    # Negative start counts backwards from end.
+ *
+ *    # Single argument range: returns an array.
+ *    a[0..1]  # => [:foo, "bar"]
+ *    a[0..-2] # => [:foo, "bar"] # Negative range-begin counts backwards from end.
+ *    a[-2..2] # => ["bar", 2]    # Negative range-end counts backwards from end.
+ *
+ *  When a single integer argument +index+ is given, returns the element at offset +index+:
  *
  *    a = [:foo, 'bar', 2]
  *    a[0] # => :foo
  *    a[2] # => 2
  *    a # => [:foo, "bar", 2]
  *
- *  If +index+ is negative, counts relative to the end of +self+:
+ *  If +index+ is negative, counts backwards from the end of +self+:
  *
  *    a = [:foo, 'bar', 2]
  *    a[-1] # => 2
@@ -1742,7 +1814,7 @@ static VALUE rb_ary_aref2(VALUE ary, VALUE b, VALUE e);
  *  If +index+ is out of range, returns +nil+.
  *
  *  When two Integer arguments +start+ and +length+ are given,
- *  returns a new \Array of size +length+ containing successive elements beginning at offset +start+:
+ *  returns a new array of size +length+ containing successive elements beginning at offset +start+:
  *
  *    a = [:foo, 'bar', 2]
  *    a[0, 2] # => [:foo, "bar"]
@@ -1757,7 +1829,7 @@ static VALUE rb_ary_aref2(VALUE ary, VALUE b, VALUE e);
  *    a[2, 2] # => [2]
  *
  *  If <tt>start == self.size</tt> and <tt>length >= 0</tt>,
- *  returns a new empty \Array.
+ *  returns a new empty array.
  *
  *  If +length+ is negative, returns +nil+.
  *
@@ -1769,7 +1841,7 @@ static VALUE rb_ary_aref2(VALUE ary, VALUE b, VALUE e);
  *    a[0..1] # => [:foo, "bar"]
  *    a[1..2] # => ["bar", 2]
  *
- *  Special case: If <tt>range.start == a.size</tt>, returns a new empty \Array.
+ *  Special case: If <tt>range.start == a.size</tt>, returns a new empty array.
  *
  *  If <tt>range.end</tt> is negative, calculates the end index from the end:
  *
@@ -1793,7 +1865,7 @@ static VALUE rb_ary_aref2(VALUE ary, VALUE b, VALUE e);
  *    a[4..-1] # => nil
  *
  *  When a single Enumerator::ArithmeticSequence argument +aseq+ is given,
- *  returns an \Array of elements corresponding to the indexes produced by
+ *  returns an array of elements corresponding to the indexes produced by
  *  the sequence.
  *
  *    a = ['--', 'data1', '--', 'data2', '--', 'data3']
@@ -1815,6 +1887,7 @@ static VALUE rb_ary_aref2(VALUE ary, VALUE b, VALUE e);
  *    # Raises TypeError (no implicit conversion of Symbol into Integer):
  *    a[:foo]
  *
+ *  Related: see {Methods for Fetching}[rdoc-ref:Array@Methods+for+Fetching].
  */
 
 VALUE
@@ -1862,13 +1935,26 @@ rb_ary_aref1(VALUE ary, VALUE arg)
 
 /*
  *  call-seq:
- *    array.at(index) -> object
+ *    at(index) -> object or nil
+ *
+ *  Returns the element of +self+ specified by the given +index+
+ *  or +nil+ if there is no such element;
+ *  +index+ must be an
+ *  {integer-convertible object}[rdoc-ref:implicit_conversion.rdoc@Integer-Convertible+Objects].
+ *
+ *  For non-negative +index+, returns the element of +self+ at offset +index+:
  *
- *  Returns the element at Integer offset +index+; does not modify +self+.
  *    a = [:foo, 'bar', 2]
- *    a.at(0) # => :foo
- *    a.at(2) # => 2
+ *    a.at(0)   # => :foo
+ *    a.at(2)   # => 2
+ *    a.at(2.0) # => 2
+ *
+ *  For negative +index+, counts backwards from the end of +self+:
+ *
+ *    a.at(-2) # => "bar"
  *
+ *  Related: Array#[];
+ *  see also {Methods for Fetching}[rdoc-ref:Array@Methods+for+Fetching].
  */
 
 VALUE
@@ -1917,17 +2003,19 @@ rb_ary_last(int argc, const VALUE *argv, VALUE ary) // used by parse.y
 
 /*
  *  call-seq:
- *    array.fetch(index) -> element
- *    array.fetch(index, default_value) -> element
- *    array.fetch(index) {|index| ... } -> element
+ *    fetch(index) -> element
+ *    fetch(index, default_value) -> element or default_value
+ *    fetch(index) {|index| ... } -> element or block_return_value
  *
- *  Returns the element at offset  +index+.
+ *  Returns the element of +self+ at offset +index+ if +index+ is in range; +index+ must be an
+ *  {integer-convertible object}[rdoc-ref:implicit_conversion.rdoc@Integer-Convertible+Objects].
  *
- *  With the single Integer argument +index+,
+ *  With the single argument +index+ and no block,
  *  returns the element at offset +index+:
  *
  *    a = [:foo, 'bar', 2]
- *    a.fetch(1) # => "bar"
+ *    a.fetch(1)   # => "bar"
+ *    a.fetch(1.1) # => "bar"
  *
  *  If +index+ is negative, counts from the end of the array:
  *
@@ -1935,12 +2023,12 @@ rb_ary_last(int argc, const VALUE *argv, VALUE ary) // used by parse.y
  *    a.fetch(-1) # => 2
  *    a.fetch(-2) # => "bar"
  *
- *  With arguments +index+ and +default_value+,
- *  returns the element at offset +index+ if index is in range,
- *  otherwise returns +default_value+:
+ *  With arguments +index+ and +default_value+ (which may be any object) and no block,
+ *  returns +default_value+ if +index+ is out-of-range:
  *
  *    a = [:foo, 'bar', 2]
- *    a.fetch(1, nil) # => "bar"
+ *    a.fetch(1, nil)  # => "bar"
+ *    a.fetch(3, :foo) # => :foo
  *
  *  With argument +index+ and a block,
  *  returns the element at offset +index+ if index is in range
@@ -1950,6 +2038,7 @@ rb_ary_last(int argc, const VALUE *argv, VALUE ary) // used by parse.y
  *    a.fetch(1) {|index| raise 'Cannot happen' } # => "bar"
  *    a.fetch(50) {|index| "Value for #{index}" } # => "Value for 50"
  *
+ *  Related: see {Methods for Fetching}[rdoc-ref:Array@Methods+for+Fetching].
  */
 
 static VALUE
@@ -1982,13 +2071,16 @@ rb_ary_fetch(int argc, VALUE *argv, VALUE ary)
 
 /*
  *  call-seq:
- *    array.index(object) -> integer or nil
- *    array.index {|element| ... } -> integer or nil
- *    array.index -> new_enumerator
+ *    find_index(object) -> integer or nil
+ *    find_index {|element| ... } -> integer or nil
+ *    find_index -> new_enumerator
+ *    index(object) -> integer or nil
+ *    index {|element| ... } -> integer or nil
+ *    index -> new_enumerator
  *
- *  Returns the index of a specified element.
+ *  Returns the zero-based integer index of a specified element, or +nil+.
  *
- *  When argument +object+ is given but no block,
+ *  With only argument +object+ given,
  *  returns the index of the first element +element+
  *  for which <tt>object == element</tt>:
  *
@@ -1997,7 +2089,7 @@ rb_ary_fetch(int argc, VALUE *argv, VALUE ary)
  *
  *  Returns +nil+ if no such element found.
  *
- *  When both argument +object+ and a block are given,
+ *  With only a block given,
  *  calls the block with each successive element;
  *  returns the index of the first element for which the block returns a truthy value:
  *
@@ -2006,14 +2098,9 @@ rb_ary_fetch(int argc, VALUE *argv, VALUE ary)
  *
  *  Returns +nil+ if the block never returns a truthy value.
  *
- *  When neither an argument nor a block is given, returns a new Enumerator:
+ *  With neither an argument nor a block given, returns a new Enumerator.
  *
- *    a = [:foo, 'bar', 2]
- *    e = a.index
- *    e # => #<Enumerator: [:foo, "bar", 2]:index>
- *    e.each {|element| element == 'bar' } # => 1
- *
- *  Related: #rindex.
+ *  Related: see {Methods for Querying}[rdoc-ref:Array@Methods+for+Querying].
  */
 
 static VALUE
@@ -2046,20 +2133,20 @@ rb_ary_index(int argc, VALUE *argv, VALUE ary)
 
 /*
  *  call-seq:
- *    array.rindex(object) -> integer or nil
- *    array.rindex {|element| ... } -> integer or nil
- *    array.rindex -> new_enumerator
+ *    rindex(object) -> integer or nil
+ *    rindex {|element| ... } -> integer or nil
+ *    rindex -> new_enumerator
  *
  *  Returns the index of the last element for which <tt>object == element</tt>.
  *
- *  When argument +object+ is given but no block, returns the index of the last such element found:
+ *  With argument +object+ given, returns the index of the last such element found:
  *
  *    a = [:foo, 'bar', 2, 'bar']
  *    a.rindex('bar') # => 3
  *
  *  Returns +nil+ if no such object found.
  *
- *  When a block is given but no argument, calls the block with each successive element;
+ *  With a block given, calls the block with each successive element;
  *  returns the index of the last element for which the block returns a truthy value:
  *
  *    a = [:foo, 'bar', 2, 'bar']
@@ -2067,14 +2154,9 @@ rb_ary_index(int argc, VALUE *argv, VALUE ary)
  *
  *  Returns +nil+ if the block never returns a truthy value.
  *
- *  When neither an argument nor a block is given, returns a new Enumerator:
- *
- *    a = [:foo, 'bar', 2, 'bar']
- *    e = a.rindex
- *    e # => #<Enumerator: [:foo, "bar", 2, "bar"]:rindex>
- *    e.each {|element| element == 'bar' } # => 3
+ *  When neither an argument nor a block is given, returns a new Enumerator.
  *
- *  Related: #index.
+ *  Related: see {Methods for Querying}[rdoc-ref:Array@Methods+for+Querying].
  */
 
 static VALUE
@@ -2221,7 +2303,7 @@ rb_ary_resize(VALUE ary, long len)
         rb_raise(rb_eIndexError, "index %ld too big", len);
     }
     if (len > olen) {
-        if (len >= ARY_CAPA(ary)) {
+        if (len > ARY_CAPA(ary)) {
             ary_double_capa(ary, len);
         }
         ary_mem_clear(ary, olen, len - olen);
@@ -2271,11 +2353,39 @@ ary_aset_by_rb_ary_splice(VALUE ary, long beg, long len, VALUE val)
 
 /*
  *  call-seq:
- *    array[index] = object -> object
- *    array[start, length] = object -> object
- *    array[range] = object -> object
- *
- *  Assigns elements in +self+; returns the given +object+.
+ *    self[index] = object -> object
+ *    self[start, length] = object -> object
+ *    self[range] = object -> object
+ *
+ *  Assigns elements in +self+, based on the given +object+; returns +object+.
+ *
+ *  In brief:
+ *
+ *      a_orig = [:foo, 'bar', 2]
+ *
+ *      # With argument index.
+ *      a = a_orig.dup
+ *      a[0] = 'foo' # => "foo"
+ *      a # => ["foo", "bar", 2]
+ *      a = a_orig.dup
+ *      a[7] = 'foo' # => "foo"
+ *      a # => [:foo, "bar", 2, nil, nil, nil, nil, "foo"]
+ *
+ *      # With arguments start and length.
+ *      a = a_orig.dup
+ *      a[0, 2] = 'foo' # => "foo"
+ *      a # => ["foo", 2]
+ *      a = a_orig.dup
+ *      a[6, 50] = 'foo' # => "foo"
+ *      a # => [:foo, "bar", 2, nil, nil, nil, "foo"]
+ *
+ *      # With argument range.
+ *      a = a_orig.dup
+ *      a[0..1] = 'foo' # => "foo"
+ *      a # => ["foo", 2]
+ *      a = a_orig.dup
+ *      a[6..50] = 'foo' # => "foo"
+ *      a # => [:foo, "bar", 2, nil, nil, nil, "foo"]
  *
  *  When Integer argument +index+ is given, assigns +object+ to an element in +self+.
  *
@@ -2297,7 +2407,7 @@ ary_aset_by_rb_ary_splice(VALUE ary, long beg, long len, VALUE val)
  *    a[-1] = 'two' # => "two"
  *    a # => [:foo, "bar", "two"]
  *
- *  When Integer arguments +start+ and +length+ are given and +object+ is not an \Array,
+ *  When Integer arguments +start+ and +length+ are given and +object+ is not an array,
  *  removes <tt>length - 1</tt> elements beginning at offset +start+,
  *  and assigns +object+ at offset +start+:
  *
@@ -2332,7 +2442,7 @@ ary_aset_by_rb_ary_splice(VALUE ary, long beg, long len, VALUE val)
  *    a[1, 5] = 'foo' # => "foo"
  *    a # => [:foo, "foo"]
  *
- *  When Range argument +range+ is given and +object+ is an \Array,
+ *  When Range argument +range+ is given and +object+ is not an array,
  *  removes <tt>length - 1</tt> elements beginning at offset +start+,
  *  and assigns +object+ at offset +start+:
  *
@@ -2347,7 +2457,8 @@ ary_aset_by_rb_ary_splice(VALUE ary, long beg, long len, VALUE val)
  *    a # => [:foo, "foo"]
  *
  *  If the array length is less than <tt>range.begin</tt>,
- *  assigns +object+ at offset <tt>range.begin</tt>, and ignores +length+:
+ *  extends the array with +nil+, assigns +object+ at offset <tt>range.begin</tt>,
+ *  and ignores +length+:
  *
  *    a = [:foo, 'bar', 2]
  *    a[6..50] = 'foo' # => "foo"
@@ -2381,6 +2492,7 @@ ary_aset_by_rb_ary_splice(VALUE ary, long beg, long len, VALUE val)
  *    a[1..5] = 'foo' # => "foo"
  *    a # => [:foo, "foo"]
  *
+ *  Related: see {Methods for Assigning}[rdoc-ref:Array@Methods+for+Assigning].
  */
 
 static VALUE
@@ -2410,38 +2522,38 @@ rb_ary_aset(int argc, VALUE *argv, VALUE ary)
 
 /*
  *  call-seq:
- *    array.insert(index, *objects) -> self
+ *    insert(index, *objects) -> self
  *
- *  Inserts given +objects+ before or after the element at Integer index +offset+;
+ *  Inserts the given +objects+ as elements of +self+;
  *  returns +self+.
  *
- *  When +index+ is non-negative, inserts all given +objects+
- *  before the element at offset +index+:
+ *  When +index+ is non-negative, inserts +objects+
+ *  _before_ the element at offset +index+:
  *
- *    a = [:foo, 'bar', 2]
- *    a.insert(1, :bat, :bam) # => [:foo, :bat, :bam, "bar", 2]
+ *    a = ['a', 'b', 'c']     # => ["a", "b", "c"]
+ *    a.insert(1, :x, :y, :z) # => ["a", :x, :y, :z, "b", "c"]
  *
  *  Extends the array if +index+ is beyond the array (<tt>index >= self.size</tt>):
  *
- *    a = [:foo, 'bar', 2]
- *    a.insert(5, :bat, :bam)
- *    a # => [:foo, "bar", 2, nil, nil, :bat, :bam]
+ *    a = ['a', 'b', 'c']     # => ["a", "b", "c"]
+ *    a.insert(5, :x, :y, :z) # => ["a", "b", "c", nil, nil, :x, :y, :z]
  *
- *  Does nothing if no objects given:
+ *  When +index+ is negative, inserts +objects+
+ *  _after_ the element at offset <tt>index + self.size</tt>:
  *
- *    a = [:foo, 'bar', 2]
- *    a.insert(1)
- *    a.insert(50)
- *    a.insert(-50)
- *    a # => [:foo, "bar", 2]
+ *    a = ['a', 'b', 'c']      # => ["a", "b", "c"]
+ *    a.insert(-2, :x, :y, :z) # => ["a", "b", :x, :y, :z, "c"]
  *
- *  When +index+ is negative, inserts all given +objects+
- *  _after_ the element at offset <tt>index+self.size</tt>:
+ *  With no +objects+ given, does nothing:
  *
- *    a = [:foo, 'bar', 2]
- *    a.insert(-2, :bat, :bam)
- *    a # => [:foo, "bar", :bat, :bam, 2]
+ *    a = ['a', 'b', 'c'] # => ["a", "b", "c"]
+ *    a.insert(1)         # => ["a", "b", "c"]
+ *    a.insert(50)        # => ["a", "b", "c"]
+ *    a.insert(-50)       # => ["a", "b", "c"]
+ *
+ *  Raises IndexError if +objects+ are given and +index+ is negative and out of range.
  *
+ *  Related: see {Methods for Assigning}[rdoc-ref:Array@Methods+for+Assigning].
  */
 
 static VALUE
@@ -2477,14 +2589,27 @@ ary_enum_length(VALUE ary, VALUE args, VALUE eobj)
     return rb_ary_length(ary);
 }
 
+// Primitive to avoid a race condition in Array#each.
+// Return `true` and write `value` and `index` if the element exists.
+static VALUE
+ary_fetch_next(VALUE self, VALUE *index, VALUE *value)
+{
+    long i = NUM2LONG(*index);
+    if (i >= RARRAY_LEN(self)) {
+        return Qfalse;
+    }
+    *value = RARRAY_AREF(self, i);
+    *index = LONG2NUM(i + 1);
+    return Qtrue;
+}
+
 /*
  *  call-seq:
- *    array.each {|element| ... } -> self
- *    array.each -> Enumerator
- *
- *  Iterates over array elements.
+ *    each {|element| ... } -> self
+ *    each -> new_enumerator
  *
- *  When a block given, passes each successive array element to the block;
+ *  With a block given, iterates over the elements of +self+,
+ *  passing each element to the block;
  *  returns +self+:
  *
  *    a = [:foo, 'bar', 2]
@@ -2506,20 +2631,9 @@ ary_enum_length(VALUE ary, VALUE args, VALUE eobj)
  *    foo
  *    bar
  *
- *  When no block given, returns a new Enumerator:
- *    a = [:foo, 'bar', 2]
- *
- *    e = a.each
- *    e # => #<Enumerator: [:foo, "bar", 2]:each>
- *    a1 = e.each {|element|  puts "#{element.class} #{element}" }
- *
- *  Output:
- *
- *    Symbol foo
- *    String bar
- *    Integer 2
+ *  With no block given, returns a new Enumerator.
  *
- *  Related: #each_index, #reverse_each.
+ *  Related: see {Methods for Iterating}[rdoc-ref:Array@Methods+for+Iterating].
  */
 
 VALUE
@@ -2536,12 +2650,11 @@ rb_ary_each(VALUE ary)
 
 /*
  *  call-seq:
- *    array.each_index {|index| ... } -> self
- *    array.each_index -> Enumerator
+ *    each_index {|index| ... } -> self
+ *    each_index -> new_enumerator
  *
- *  Iterates over array indexes.
- *
- *  When a block given, passes each successive array index to the block;
+ *  With a block given, iterates over the elements of +self+,
+ *  passing each <i>array index</i> to the block;
  *  returns +self+:
  *
  *    a = [:foo, 'bar', 2]
@@ -2557,26 +2670,16 @@ rb_ary_each(VALUE ary)
  *
  *    a = [:foo, 'bar', 2]
  *    a.each_index {|index| puts index; a.clear if index > 0 }
+ *    a # => []
  *
  *  Output:
  *
  *    0
  *    1
  *
- *  When no block given, returns a new Enumerator:
- *
- *    a = [:foo, 'bar', 2]
- *    e = a.each_index
- *    e # => #<Enumerator: [:foo, "bar", 2]:each_index>
- *    a1 = e.each {|index|  puts "#{index} #{a[index]}"}
- *
- *  Output:
- *
- *    0 foo
- *    1 bar
- *    2 2
+ *  With no block given, returns a new Enumerator.
  *
- *  Related: #each, #reverse_each.
+ *  Related: see {Methods for Iterating}[rdoc-ref:Array@Methods+for+Iterating].
  */
 
 static VALUE
@@ -2593,47 +2696,26 @@ rb_ary_each_index(VALUE ary)
 
 /*
  *  call-seq:
- *    array.reverse_each {|element| ... } -> self
- *    array.reverse_each -> Enumerator
- *
- *  Iterates backwards over array elements.
+ *    reverse_each {|element| ... } -> self
+ *    reverse_each -> Enumerator
  *
- *  When a block given, passes, in reverse order, each element to the block;
+ *  When a block given, iterates backwards over the elements of +self+,
+ *  passing, in reverse order, each element to the block;
  *  returns +self+:
  *
- *    a = [:foo, 'bar', 2]
- *    a.reverse_each {|element|  puts "#{element.class} #{element}" }
- *
- *  Output:
- *
- *    Integer 2
- *    String bar
- *    Symbol foo
+ *    a = []
+ *    [0, 1, 2].reverse_each {|element| a.push(element) }
+ *    a # => [2, 1, 0]
  *
  *  Allows the array to be modified during iteration:
  *
- *    a = [:foo, 'bar', 2]
- *    a.reverse_each {|element| puts element; a.clear if element.to_s.start_with?('b') }
- *
- *  Output:
- *
- *    2
- *    bar
- *
- *  When no block given, returns a new Enumerator:
+ *    a = ['a', 'b', 'c']
+ *    a.reverse_each {|element| a.clear if element.start_with?('b') }
+ *    a # => []
  *
- *    a = [:foo, 'bar', 2]
- *    e = a.reverse_each
- *    e # => #<Enumerator: [:foo, "bar", 2]:reverse_each>
- *    a1 = e.each {|element|  puts "#{element.class} #{element}" }
- *
- *  Output:
- *
- *    Integer 2
- *    String bar
- *    Symbol foo
+ *  When no block given, returns a new Enumerator.
  *
- *  Related: #each, #each_index.
+ *  Related: see {Methods for Iterating}[rdoc-ref:Array@Methods+for+Iterating].
  */
 
 static VALUE
@@ -2656,9 +2738,15 @@ rb_ary_reverse_each(VALUE ary)
 
 /*
  *  call-seq:
- *    array.length -> an_integer
+ *    length -> integer
+ *    size -> integer
+ *
+ *  Returns the count of elements in +self+:
  *
- *  Returns the count of elements in +self+.
+ *    [0, 1, 2].length # => 3
+ *    [].length        # => 0
+ *
+ *  Related: see {Methods for Querying}[rdoc-ref:Array@Methods+for+Querying].
  */
 
 static VALUE
@@ -2670,10 +2758,12 @@ rb_ary_length(VALUE ary)
 
 /*
  *  call-seq:
- *    array.empty?  -> true or false
+ *    empty?  -> true or false
  *
  *  Returns +true+ if the count of elements in +self+ is zero,
  *  +false+ otherwise.
+ *
+ *  Related: see {Methods for Querying}[rdoc-ref:Array@Methods+for+Querying].
  */
 
 static VALUE
@@ -2837,31 +2927,32 @@ rb_ary_join(VALUE ary, VALUE sep)
 
 /*
  *  call-seq:
- *    array.join ->new_string
- *    array.join(separator = $,) -> new_string
+ *    join(separator = $,) -> new_string
  *
- *  Returns the new String formed by joining the array elements after conversion.
- *  For each element +element+:
+ *  Returns the new string formed by joining the converted elements of +self+;
+ *  for each element +element+:
  *
- *  - Uses <tt>element.to_s</tt> if +element+ is not a <tt>kind_of?(Array)</tt>.
- *  - Uses recursive <tt>element.join(separator)</tt> if +element+ is a <tt>kind_of?(Array)</tt>.
+ *  - Converts recursively using <tt>element.join(separator)</tt>
+ *    if +element+ is a <tt>kind_of?(Array)</tt>.
+ *  - Otherwise, converts using <tt>element.to_s</tt>.
  *
- *  With no argument, joins using the output field separator, <tt>$,</tt>:
+ *  With no argument given, joins using the output field separator, <tt>$,</tt>:
  *
  *    a = [:foo, 'bar', 2]
  *    $, # => nil
  *    a.join # => "foobar2"
  *
- *  With \string argument +separator+, joins using that separator:
+ *  With string argument +separator+ given, joins using that separator:
  *
  *    a = [:foo, 'bar', 2]
  *    a.join("\n") # => "foo\nbar\n2"
  *
- *  Joins recursively for nested Arrays:
+ *  Joins recursively for nested arrays:
  *
  *   a = [:foo, [:bar, [:baz, :bat]]]
  *   a.join # => "foobarbazbat"
  *
+ *  Related: see {Methods for Converting}[rdoc-ref:Array@Methods+for+Converting].
  */
 static VALUE
 rb_ary_join_m(int argc, VALUE *argv, VALUE ary)
@@ -2898,14 +2989,16 @@ inspect_ary(VALUE ary, VALUE dummy, int recur)
 
 /*
  *  call-seq:
- *    array.inspect -> new_string
+ *    inspect -> new_string
+ *    to_s -> new_string
  *
- *  Returns the new String formed by calling method <tt>#inspect</tt>
+ *  Returns the new string formed by calling method <tt>#inspect</tt>
  *  on each array element:
  *
  *    a = [:foo, 'bar', 2]
  *    a.inspect # => "[:foo, \"bar\", 2]"
  *
+ *  Related: see {Methods for Converting}[rdoc-ref:Array@Methods+for+Converting].
  */
 
 static VALUE
@@ -2925,21 +3018,17 @@ rb_ary_to_s(VALUE ary)
  *  call-seq:
  *    to_a -> self or new_array
  *
- *  When +self+ is an instance of \Array, returns +self+:
- *
- *    a = [:foo, 'bar', 2]
- *    a.to_a # => [:foo, "bar", 2]
+ *  When +self+ is an instance of \Array, returns +self+.
  *
- *  Otherwise, returns a new \Array containing the elements of +self+:
+ *  Otherwise, returns a new array containing the elements of +self+:
  *
  *    class MyArray < Array; end
- *    a = MyArray.new(['foo', 'bar', 'two'])
- *    a.instance_of?(Array) # => false
- *    a.kind_of?(Array) # => true
- *    a1 = a.to_a
- *    a1 # => ["foo", "bar", "two"]
- *    a1.class # => Array # Not MyArray
+ *    my_a = MyArray.new(['foo', 'bar', 'two'])
+ *    a = my_a.to_a
+ *    a # => ["foo", "bar", "two"]
+ *    a.class # => Array # Not MyArray.
  *
+ *  Related: see {Methods for Converting}[rdoc-ref:Array@Methods+for+Converting].
  */
 
 static VALUE
@@ -2955,27 +3044,27 @@ rb_ary_to_a(VALUE ary)
 
 /*
  *  call-seq:
- *    array.to_h -> new_hash
- *    array.to_h {|item| ... } -> new_hash
+ *    to_h -> new_hash
+ *    to_h {|element| ... } -> new_hash
  *
- *  Returns a new Hash formed from +self+.
+ *  Returns a new hash formed from +self+.
  *
- *  When a block is given, calls the block with each array element;
- *  the block must return a 2-element \Array whose two elements
- *  form a key-value pair in the returned Hash:
+ *  With no block given, each element of +self+ must be a 2-element sub-array;
+ *  forms each sub-array into a key-value pair in the new hash:
  *
- *    a = ['foo', :bar, 1, [2, 3], {baz: 4}]
- *    h = a.to_h {|item| [item, item] }
- *    h # => {"foo"=>"foo", :bar=>:bar, 1=>1, [2, 3]=>[2, 3], {:baz=>4}=>{:baz=>4}}
+ *    a = [['foo', 'zero'], ['bar', 'one'], ['baz', 'two']]
+ *    a.to_h # => {"foo"=>"zero", "bar"=>"one", "baz"=>"two"}
+ *    [].to_h # => {}
  *
- *  When no block is given, +self+ must be an \Array of 2-element sub-arrays,
- *  each sub-array is formed into a key-value pair in the new Hash:
+ *  With a block given, the block must return a 2-element array;
+ *  calls the block with each element of +self+;
+ *  forms each returned array into a key-value pair in the returned hash:
  *
- *    [].to_h # => {}
- *    a = [['foo', 'zero'], ['bar', 'one'], ['baz', 'two']]
- *    h = a.to_h
- *    h # => {"foo"=>"zero", "bar"=>"one", "baz"=>"two"}
+ *    a = ['foo', :bar, 1, [2, 3], {baz: 4}]
+ *    a.to_h {|element| [element, element.class] }
+ *    # => {"foo"=>String, :bar=>Symbol, 1=>Integer, [2, 3]=>Array, {:baz=>4}=>Hash}
  *
+ *  Related: see {Methods for Converting}[rdoc-ref:Array@Methods+for+Converting].
  */
 
 static VALUE
@@ -3004,7 +3093,7 @@ rb_ary_to_h(VALUE ary)
 
 /*
  *  call-seq:
- *    array.to_ary -> self
+ *    to_ary -> self
  *
  *  Returns +self+.
  */
@@ -3043,13 +3132,16 @@ rb_ary_reverse(VALUE ary)
 
 /*
  *  call-seq:
- *    array.reverse! -> self
+ *    reverse! -> self
  *
- *  Reverses +self+ in place:
+ *  Reverses the order of the elements of +self+;
+ *  returns +self+:
  *
- *    a = ['foo', 'bar', 'two']
- *    a.reverse! # => ["two", "bar", "foo"]
+ *    a = [0, 1, 2]
+ *    a.reverse! # => [2, 1, 0]
+ *    a          # => [2, 1, 0]
  *
+ *  Related: see {Methods for Assigning}[rdoc-ref:Array@Methods+for+Assigning].
  */
 
 static VALUE
@@ -3060,14 +3152,13 @@ rb_ary_reverse_bang(VALUE ary)
 
 /*
  *  call-seq:
- *    array.reverse -> new_array
+ *    reverse -> new_array
  *
- *  Returns a new \Array with the elements of +self+ in reverse order:
+ *  Returns a new array containing the elements of +self+ in reverse order:
  *
- *    a = ['foo', 'bar', 'two']
- *    a1 = a.reverse
- *    a1 # => ["two", "bar", "foo"]
+ *    [0, 1, 2].reverse # => [2, 1, 0]
  *
+ *  Related: see {Methods for Combining}[rdoc-ref:Array@Methods+for+Combining].
  */
 
 static VALUE
@@ -3129,48 +3220,34 @@ rb_ary_rotate(VALUE ary, long cnt)
 
 /*
  *  call-seq:
- *    array.rotate! -> self
- *    array.rotate!(count) -> self
+ *    rotate!(count = 1) -> self
  *
  *  Rotates +self+ in place by moving elements from one end to the other; returns +self+.
  *
- *  When no argument given, rotates the first element to the last position:
- *
- *    a = [:foo, 'bar', 2, 'bar']
- *    a.rotate! # => ["bar", 2, "bar", :foo]
- *
- *  When given a non-negative Integer +count+,
+ *  With non-negative numeric +count+,
  *  rotates +count+ elements from the beginning to the end:
  *
- *    a = [:foo, 'bar', 2]
- *    a.rotate!(2)
- *    a # => [2, :foo, "bar"]
+ *    [0, 1, 2, 3].rotate!(2)   # => [2, 3, 0, 1]
+      [0, 1, 2, 3].rotate!(2.1) # => [2, 3, 0, 1]
  *
  *  If +count+ is large, uses <tt>count % array.size</tt> as the count:
  *
- *    a = [:foo, 'bar', 2]
- *    a.rotate!(20)
- *    a # => [2, :foo, "bar"]
+ *    [0, 1, 2, 3].rotate!(21) # => [1, 2, 3, 0]
  *
- *  If +count+ is zero, returns +self+ unmodified:
+ *  If +count+ is zero, rotates no elements:
  *
- *    a = [:foo, 'bar', 2]
- *    a.rotate!(0)
- *    a # => [:foo, "bar", 2]
+ *    [0, 1, 2, 3].rotate!(0) # => [0, 1, 2, 3]
  *
- *  When given a negative Integer +count+, rotates in the opposite direction,
+ *  With a negative numeric +count+, rotates in the opposite direction,
  *  from end to beginning:
  *
- *    a = [:foo, 'bar', 2]
- *    a.rotate!(-2)
- *    a # => ["bar", 2, :foo]
+ *    [0, 1, 2, 3].rotate!(-1) # => [3, 0, 1, 2]
  *
  *  If +count+ is small (far from zero), uses <tt>count % array.size</tt> as the count:
  *
- *    a = [:foo, 'bar', 2]
- *    a.rotate!(-5)
- *    a # => ["bar", 2, :foo]
+ *    [0, 1, 2, 3].rotate!(-21) # => [3, 0, 1, 2]
  *
+ *  Related: see {Methods for Assigning}[rdoc-ref:Array@Methods+for+Assigning].
  */
 
 static VALUE
@@ -3183,51 +3260,35 @@ rb_ary_rotate_bang(int argc, VALUE *argv, VALUE ary)
 
 /*
  *  call-seq:
- *    array.rotate -> new_array
- *    array.rotate(count) -> new_array
+ *    rotate(count = 1) -> new_array
  *
- *  Returns a new \Array formed from +self+ with elements
+ *  Returns a new array formed from +self+ with elements
  *  rotated from one end to the other.
  *
- *  When no argument given, returns a new \Array that is like +self+,
- *  except that the first element has been rotated to the last position:
- *
- *    a = [:foo, 'bar', 2, 'bar']
- *    a1 = a.rotate
- *    a1 # => ["bar", 2, "bar", :foo]
- *
- *  When given a non-negative Integer +count+,
- *  returns a new \Array with +count+ elements rotated from the beginning to the end:
+ *  With non-negative numeric +count+,
+ *  rotates elements from the beginning to the end:
  *
- *    a = [:foo, 'bar', 2]
- *    a1 = a.rotate(2)
- *    a1 # => [2, :foo, "bar"]
+ *    [0, 1, 2, 3].rotate(2)   # => [2, 3, 0, 1]
+ *    [0, 1, 2, 3].rotate(2.1) # => [2, 3, 0, 1]
  *
  *  If +count+ is large, uses <tt>count % array.size</tt> as the count:
  *
- *    a = [:foo, 'bar', 2]
- *    a1 = a.rotate(20)
- *    a1 # => [2, :foo, "bar"]
+ *    [0, 1, 2, 3].rotate(22) # => [2, 3, 0, 1]
  *
- *  If +count+ is zero, returns a copy of +self+, unmodified:
+ *  With a +count+ of zero, rotates no elements:
  *
- *    a = [:foo, 'bar', 2]
- *    a1 = a.rotate(0)
- *    a1 # => [:foo, "bar", 2]
+ *    [0, 1, 2, 3].rotate(0) # => [0, 1, 2, 3]
  *
- *  When given a negative Integer +count+, rotates in the opposite direction,
- *  from end to beginning:
+ *  With negative numeric +count+, rotates in the opposite direction,
+ *  from the end to the beginning:
  *
- *    a = [:foo, 'bar', 2]
- *    a1 = a.rotate(-2)
- *    a1 # => ["bar", 2, :foo]
+ *    [0, 1, 2, 3].rotate(-1) # => [3, 0, 1, 2]
  *
  *  If +count+ is small (far from zero), uses <tt>count % array.size</tt> as the count:
  *
- *    a = [:foo, 'bar', 2]
- *    a1 = a.rotate(-5)
- *    a1 # => ["bar", 2, :foo]
+ *    [0, 1, 2, 3].rotate(-21) # => [3, 0, 1, 2]
  *
+ *  Related: see {Methods for Fetching}[rdoc-ref:Array@Methods+for+Fetching].
  */
 
 static VALUE
@@ -3320,50 +3381,19 @@ sort_2(const void *ap, const void *bp, void *dummy)
 
 /*
  *  call-seq:
- *    array.sort! -> self
- *    array.sort! {|a, b| ... } -> self
- *
- *  Returns +self+ with its elements sorted in place.
- *
- *  With no block, compares elements using operator <tt><=></tt>
- *  (see Comparable):
+ *    sort! -> self
+ *    sort! {|a, b| ... } -> self
  *
- *    a = 'abcde'.split('').shuffle
- *    a # => ["e", "b", "d", "a", "c"]
- *    a.sort!
- *    a # => ["a", "b", "c", "d", "e"]
- *
- *  With a block, calls the block with each element pair;
- *  for each element pair +a+ and +b+, the block should return an integer:
- *
- *  - Negative when +b+ is to follow +a+.
- *  - Zero when +a+ and +b+ are equivalent.
- *  - Positive when +a+ is to follow +b+.
- *
- *  Example:
- *
- *    a = 'abcde'.split('').shuffle
- *    a # => ["e", "b", "d", "a", "c"]
- *    a.sort! {|a, b| a <=> b }
- *    a # => ["a", "b", "c", "d", "e"]
- *    a.sort! {|a, b| b <=> a }
- *    a # => ["e", "d", "c", "b", "a"]
- *
- *  When the block returns zero, the order for +a+ and +b+ is indeterminate,
- *  and may be unstable:
- *
- *    a = 'abcde'.split('').shuffle
- *    a # => ["e", "b", "d", "a", "c"]
- *    a.sort! {|a, b| 0 }
- *    a # => ["d", "e", "c", "a", "b"]
+ *  Like Array#sort, but returns +self+ with its elements sorted in place.
  *
+ *  Related: see {Methods for Assigning}[rdoc-ref:Array@Methods+for+Assigning].
  */
 
 VALUE
 rb_ary_sort_bang(VALUE ary)
 {
     rb_ary_modify(ary);
-    assert(!ARY_SHARED_P(ary));
+    RUBY_ASSERT(!ARY_SHARED_P(ary));
     if (RARRAY_LEN(ary) > 1) {
         VALUE tmp = ary_make_substitution(ary); /* only ary refers tmp */
         struct ary_sort_data data;
@@ -3381,6 +3411,9 @@ rb_ary_sort_bang(VALUE ary)
                 rb_ary_unshare(ary);
                 FL_SET_EMBED(ary);
             }
+            if (ARY_EMBED_LEN(tmp) > ARY_CAPA(ary)) {
+                ary_resize_capa(ary, ARY_EMBED_LEN(tmp));
+            }
             ary_memcpy(ary, 0, ARY_EMBED_LEN(tmp), ARY_EMBED_PTR(tmp));
             ARY_SET_LEN(ary, ARY_EMBED_LEN(tmp));
         }
@@ -3390,7 +3423,7 @@ rb_ary_sort_bang(VALUE ary)
                 ARY_SET_CAPA(ary, RARRAY_LEN(tmp));
             }
             else {
-                assert(!ARY_SHARED_P(tmp));
+                RUBY_ASSERT(!ARY_SHARED_P(tmp));
                 if (ARY_EMBED_P(ary)) {
                     FL_UNSET_EMBED(ary);
                 }
@@ -3406,10 +3439,9 @@ rb_ary_sort_bang(VALUE ary)
                 ARY_SET_CAPA(ary, ARY_HEAP_LEN(tmp));
             }
             /* tmp was lost ownership for the ptr */
-            FL_UNSET(tmp, FL_FREEZE);
             FL_SET_EMBED(tmp);
             ARY_SET_EMBED_LEN(tmp, 0);
-            FL_SET(tmp, FL_FREEZE);
+            OBJ_FREEZE(tmp);
         }
         /* tmp will be GC'ed. */
         RBASIC_SET_CLASS_RAW(tmp, rb_cArray); /* rb_cArray must be marked */
@@ -3420,21 +3452,18 @@ rb_ary_sort_bang(VALUE ary)
 
 /*
  *  call-seq:
- *    array.sort -> new_array
- *    array.sort {|a, b| ... } -> new_array
+ *    sort -> new_array
+ *    sort {|a, b| ... } -> new_array
  *
- *  Returns a new \Array whose elements are those from +self+, sorted.
+ *  Returns a new array containing the elements of +self+, sorted.
  *
- *  With no block, compares elements using operator <tt><=></tt>
- *  (see Comparable):
+ *  With no block given, compares elements using operator <tt>#<=></tt>
+ *  (see Object#<=>):
  *
- *    a = 'abcde'.split('').shuffle
- *    a # => ["e", "b", "d", "a", "c"]
- *    a1 = a.sort
- *    a1 # => ["a", "b", "c", "d", "e"]
+ *    [0, 2, 3, 1].sort # => [0, 1, 2, 3]
  *
- *  With a block, calls the block with each element pair;
- *  for each element pair +a+ and +b+, the block should return an integer:
+ *  With a block given, calls the block with each combination of pairs of elements from +self+;
+ *  for each pair +a+ and +b+, the block should return a numeric:
  *
  *  - Negative when +b+ is to follow +a+.
  *  - Zero when +a+ and +b+ are equivalent.
@@ -3442,22 +3471,17 @@ rb_ary_sort_bang(VALUE ary)
  *
  *  Example:
  *
- *    a = 'abcde'.split('').shuffle
- *    a # => ["e", "b", "d", "a", "c"]
- *    a1 = a.sort {|a, b| a <=> b }
- *    a1 # => ["a", "b", "c", "d", "e"]
- *    a2 = a.sort {|a, b| b <=> a }
- *    a2 # => ["e", "d", "c", "b", "a"]
+ *    a = [3, 2, 0, 1]
+ *    a.sort {|a, b| a <=> b } # => [0, 1, 2, 3]
+ *    a.sort {|a, b| b <=> a } # => [3, 2, 1, 0]
  *
  *  When the block returns zero, the order for +a+ and +b+ is indeterminate,
- *  and may be unstable:
+ *  and may be unstable.
  *
- *    a = 'abcde'.split('').shuffle
- *    a # => ["e", "b", "d", "a", "c"]
- *    a1 = a.sort {|a, b| 0 }
- *    a1 # =>  ["c", "e", "b", "d", "a"]
+ *  See an example in Numeric#nonzero? for the idiom to sort more
+ *  complex structure.
  *
- *  Related: Enumerable#sort_by.
+ *  Related: see {Methods for Fetching}[rdoc-ref:Array@Methods+for+Fetching].
  */
 
 VALUE
@@ -3472,12 +3496,15 @@ static VALUE rb_ary_bsearch_index(VALUE ary);
 
 /*
  *  call-seq:
- *    array.bsearch {|element| ... } -> object
- *    array.bsearch -> new_enumerator
+ *    bsearch {|element| ... } -> found_element or nil
+ *    bsearch -> new_enumerator
  *
- *  Returns an element from +self+ selected by a binary search.
+ *  Returns the element from +self+ found by a binary search,
+ *  or +nil+ if the search found no suitable element.
  *
  *  See {Binary Searching}[rdoc-ref:bsearch.rdoc].
+ *
+ *  Related: see {Methods for Fetching}[rdoc-ref:Array@Methods+for+Fetching].
  */
 
 static VALUE
@@ -3493,11 +3520,15 @@ rb_ary_bsearch(VALUE ary)
 
 /*
  *  call-seq:
- *    array.bsearch_index {|element| ... } -> integer or nil
- *    array.bsearch_index -> new_enumerator
+ *    bsearch_index {|element| ... } -> integer or nil
+ *    bsearch_index -> new_enumerator
+ *
+ *  Returns the integer index of the element from +self+ found by a binary search,
+ *  or +nil+ if the search found no suitable element.
+ *
+ *  See {Binary Searching}[rdoc-ref:bsearch.rdoc].
  *
- *  Searches +self+ as described at method #bsearch,
- *  but returns the _index_ of the found element instead of the element itself.
+ *  Related: see {Methods for Fetching}[rdoc-ref:Array@Methods+for+Fetching].
  */
 
 static VALUE
@@ -3556,28 +3587,24 @@ sort_by_i(RB_BLOCK_CALL_FUNC_ARGLIST(i, dummy))
 
 /*
  *  call-seq:
- *    array.sort_by! {|element| ... } -> self
- *    array.sort_by! -> new_enumerator
+ *    sort_by! {|element| ... } -> self
+ *    sort_by! -> new_enumerator
  *
- *  Sorts the elements of +self+ in place,
- *  using an ordering determined by the block; returns self.
+ *  With a block given, sorts the elements of +self+ in place;
+ *  returns self.
  *
  *  Calls the block with each successive element;
- *  sorts elements based on the values returned from the block.
- *
- *  For duplicates returned by the block, the ordering is indeterminate, and may be unstable.
- *
- *  This example sorts strings based on their sizes:
+ *  sorts elements based on the values returned from the block:
  *
  *    a = ['aaaa', 'bbb', 'cc', 'd']
  *    a.sort_by! {|element| element.size }
  *    a # => ["d", "cc", "bbb", "aaaa"]
  *
- *  Returns a new Enumerator if no block given:
+ *  For duplicate values returned by the block, the ordering is indeterminate, and may be unstable.
  *
- *    a = ['aaaa', 'bbb', 'cc', 'd']
- *    a.sort_by! # => #<Enumerator: ["aaaa", "bbb", "cc", "d"]:sort_by!>
+ *  With no block given, returns a new Enumerator.
  *
+ *  Related: see {Methods for Assigning}[rdoc-ref:Array@Methods+for+Assigning].
  */
 
 static VALUE
@@ -3587,29 +3614,32 @@ rb_ary_sort_by_bang(VALUE ary)
 
     RETURN_SIZED_ENUMERATOR(ary, 0, 0, ary_enum_length);
     rb_ary_modify(ary);
-    sorted = rb_block_call(ary, rb_intern("sort_by"), 0, 0, sort_by_i, 0);
-    rb_ary_replace(ary, sorted);
+    if (RARRAY_LEN(ary) > 1) {
+        sorted = rb_block_call(ary, rb_intern("sort_by"), 0, 0, sort_by_i, 0);
+        rb_ary_replace(ary, sorted);
+    }
     return ary;
 }
 
 
 /*
  *  call-seq:
- *    array.map {|element| ... } -> new_array
- *    array.map -> new_enumerator
+ *    collect {|element| ... } -> new_array
+ *    collect -> new_enumerator
+ *    map {|element| ... } -> new_array
+ *    map -> new_enumerator
  *
- *  Calls the block, if given, with each element of +self+;
- *  returns a new \Array whose elements are the return values from the block:
+ *  With a block given, calls the block with each element of +self+;
+ *  returns a new array whose elements are the return values from the block:
  *
  *    a = [:foo, 'bar', 2]
  *    a1 = a.map {|element| element.class }
  *    a1 # => [Symbol, String, Integer]
  *
- *  Returns a new Enumerator if no block given:
- *    a = [:foo, 'bar', 2]
- *    a1 = a.map
- *    a1 # => #<Enumerator: [:foo, "bar", 2]:map>
+ *  With no block given, returns a new Enumerator.
  *
+ *  Related: #collect!;
+ *  see also {Methods for Converting}[rdoc-ref:Array@Methods+for+Converting].
  */
 
 static VALUE
@@ -3629,21 +3659,22 @@ rb_ary_collect(VALUE ary)
 
 /*
  *  call-seq:
- *    array.map! {|element| ... } -> self
- *    array.map! -> new_enumerator
+ *    collect! {|element| ... } -> new_array
+ *    collect! -> new_enumerator
+ *    map! {|element| ... } -> new_array
+ *    map! -> new_enumerator
  *
- *  Calls the block, if given, with each element;
- *  replaces the element with the block's return value:
+ *  With a block given, calls the block with each element of +self+
+ *  and replaces the element with the block's return value;
+ *  returns +self+:
  *
  *    a = [:foo, 'bar', 2]
  *    a.map! { |element| element.class } # => [Symbol, String, Integer]
  *
- *  Returns a new Enumerator if no block given:
- *
- *    a = [:foo, 'bar', 2]
- *    a1 = a.map!
- *    a1 # => #<Enumerator: [:foo, "bar", 2]:map!>
+ *  With no block given, returns a new Enumerator.
  *
+ *  Related: #collect;
+ *  see also {Methods for Converting}[rdoc-ref:Array@Methods+for+Converting].
  */
 
 static VALUE
@@ -3715,45 +3746,108 @@ append_values_at_single(VALUE result, VALUE ary, long olen, VALUE idx)
 
 /*
  *  call-seq:
- *    array.values_at(*indexes) -> new_array
+ *    values_at(*specifiers) -> new_array
  *
- *  Returns a new \Array whose elements are the elements
- *  of +self+ at the given Integer or Range +indexes+.
+ *  Returns elements from +self+ in a new array; does not modify +self+.
  *
- *  For each positive +index+, returns the element at offset +index+:
+ *  The objects included in the returned array are the elements of +self+
+ *  selected by the given +specifiers+,
+ *  each of which must be a numeric index or a Range.
  *
- *    a = [:foo, 'bar', 2]
- *    a.values_at(0, 2) # => [:foo, 2]
- *    a.values_at(0..1) # => [:foo, "bar"]
+ *  In brief:
  *
- *  The given +indexes+ may be in any order, and may repeat:
+ *    a = ['a', 'b', 'c', 'd']
  *
- *    a = [:foo, 'bar', 2]
- *    a.values_at(2, 0, 1, 0, 2) # => [2, :foo, "bar", :foo, 2]
- *    a.values_at(1, 0..2) # => ["bar", :foo, "bar", 2]
+ *    # Index specifiers.
+ *    a.values_at(2, 0, 2, 0)     # => ["c", "a", "c", "a"] # May repeat.
+ *    a.values_at(-4, -3, -2, -1) # => ["a", "b", "c", "d"] # Counts backwards if negative.
+ *    a.values_at(-50, 50)        # => [nil, nil]           # Outside of self.
  *
- *  Assigns +nil+ for an +index+ that is too large:
+ *    # Range specifiers.
+ *    a.values_at(1..3)       # => ["b", "c", "d"] # From range.begin to range.end.
+ *    a.values_at(1...3)      # => ["b", "c"]      # End excluded.
+ *    a.values_at(3..1)       # => []              # No such elements.
  *
- *    a = [:foo, 'bar', 2]
- *    a.values_at(0, 3, 1, 3) # => [:foo, nil, "bar", nil]
+ *    a.values_at(-3..3)  # => ["b", "c", "d"]     # Negative range.begin counts backwards.
+ *    a.values_at(-50..3)                          # Raises RangeError.
  *
- *  Returns a new empty \Array if no arguments given.
+ *    a.values_at(1..-2)  # => ["b", "c"]          # Negative range.end counts backwards.
+ *    a.values_at(1..-50) # => []                  # No such elements.
  *
- *  For each negative +index+, counts backward from the end of the array:
+ *    # Mixture of specifiers.
+ *    a.values_at(2..3, 3, 0..1, 0) # => ["c", "d", "d", "a", "b", "a"]
  *
- *    a = [:foo, 'bar', 2]
- *    a.values_at(-1, -3) # => [2, :foo]
+ *  With no +specifiers+ given, returns a new empty array:
  *
- *  Assigns +nil+ for an +index+ that is too small:
+ *    a = ['a', 'b', 'c', 'd']
+ *    a.values_at # => []
  *
- *    a = [:foo, 'bar', 2]
- *    a.values_at(0, -5, 1, -6, 2) # => [:foo, nil, "bar", nil, 2]
+ *  For each numeric specifier +index+, includes an element:
  *
- *  The given +indexes+ may have a mixture of signs:
+ *  - For each non-negative numeric specifier +index+ that is in-range (less than <tt>self.size</tt>),
+ *    includes the element at offset +index+:
  *
- *    a = [:foo, 'bar', 2]
- *    a.values_at(0, -2, 1, -1) # => [:foo, "bar", "bar", 2]
+ *      a.values_at(0, 2)     # => ["a", "c"]
+ *      a.values_at(0.1, 2.9) # => ["a", "c"]
+ *
+ *  - For each negative numeric +index+ that is in-range (greater than or equal to <tt>- self.size</tt>),
+ *    counts backwards from the end of +self+:
+ *
+ *      a.values_at(-1, -4) # => ["d", "a"]
+ *
+ *  The given indexes may be in any order, and may repeat:
+ *
+ *    a.values_at(2, 0, 1, 0, 2) # => ["c", "a", "b", "a", "c"]
+ *
+ *  For each +index+ that is out-of-range, includes +nil+:
+ *
+ *    a.values_at(4, -5) # => [nil, nil]
+ *
+ *  For each Range specifier +range+, includes elements
+ *  according to <tt>range.begin</tt> and <tt>range.end</tt>:
+ *
+ *  - If both <tt>range.begin</tt> and <tt>range.end</tt>
+ *    are non-negative and in-range (less than <tt>self.size</tt>),
+ *    includes elements from index <tt>range.begin</tt>
+ *    through <tt>range.end - 1</tt> (if <tt>range.exclude_end?</tt>),
+ *    or through <tt>range.end</tt> (otherwise):
+ *
+ *      a.values_at(1..2)  # => ["b", "c"]
+ *      a.values_at(1...2) # => ["b"]
+ *
+ *  - If <tt>range.begin</tt> is negative and in-range (greater than or equal to <tt>- self.size</tt>),
+ *    counts backwards from the end of +self+:
+ *
+ *      a.values_at(-2..3) # => ["c", "d"]
+ *
+ *  - If <tt>range.begin</tt> is negative and out-of-range, raises an exception:
+ *
+ *      a.values_at(-5..3) # Raises RangeError.
+ *
+ *  - If <tt>range.end</tt> is positive and out-of-range,
+ *    extends the returned array with +nil+ elements:
+ *
+ *      a.values_at(1..5) # => ["b", "c", "d", nil, nil]
  *
+ *  - If <tt>range.end</tt> is negative and in-range,
+ *    counts backwards from the end of +self+:
+ *
+ *      a.values_at(1..-2) # => ["b", "c"]
+ *
+ *  - If <tt>range.end</tt> is negative and out-of-range,
+ *    returns an empty array:
+ *
+ *      a.values_at(1..-5) # => []
+ *
+ *  The given ranges may be in any order and may repeat:
+ *
+ *    a.values_at(2..3, 0..1, 2..3) # => ["c", "d", "a", "b", "c", "d"]
+ *
+ *  The given specifiers may be any mixture of indexes and ranges:
+ *
+ *    a.values_at(3, 1..2, 0, 2..3) # => ["d", "b", "c", "a", "c", "d"]
+ *
+ *  Related: see {Methods for Fetching}[rdoc-ref:Array@Methods+for+Fetching].
  */
 
 static VALUE
@@ -3771,22 +3865,22 @@ rb_ary_values_at(int argc, VALUE *argv, VALUE ary)
 
 /*
  *  call-seq:
- *    array.select {|element| ... } -> new_array
- *    array.select -> new_enumerator
+ *    select {|element| ... } -> new_array
+ *    select -> new_enumerator
+ *    filter {|element| ... } -> new_array
+ *    filter -> new_enumerator
  *
- *  Calls the block, if given, with each element of +self+;
- *  returns a new \Array containing those elements of +self+
+ *  With a block given, calls the block with each element of +self+;
+ *  returns a new array containing those elements of +self+
  *  for which the block returns a truthy value:
  *
  *    a = [:foo, 'bar', 2, :bam]
- *    a1 = a.select {|element| element.to_s.start_with?('b') }
- *    a1 # => ["bar", :bam]
+ *    a.select {|element| element.to_s.start_with?('b') }
+ *    # => ["bar", :bam]
  *
- *  Returns a new Enumerator if no block given:
- *
- *    a = [:foo, 'bar', 2, :bam]
- *    a.select # => #<Enumerator: [:foo, "bar", 2, :bam]:select>
+ *  With no block given, returns a new Enumerator.
  *
+ *  Related: see {Methods for Fetching}[rdoc-ref:Array@Methods+for+Fetching].
  */
 
 static VALUE
@@ -3852,10 +3946,12 @@ select_bang_ensure(VALUE a)
 
 /*
  *  call-seq:
- *    array.select! {|element| ... } -> self or nil
- *    array.select! -> new_enumerator
+ *    select! {|element| ... } -> self or nil
+ *    select! -> new_enumerator
+ *    filter! {|element| ... } -> self or nil
+ *    filter! -> new_enumerator
  *
- *  Calls the block, if given  with each element of +self+;
+ *  With a block given, calls the block with each element of +self+;
  *  removes from +self+ those elements for which the block returns +false+ or +nil+.
  *
  *  Returns +self+ if any elements were removed:
@@ -3865,11 +3961,9 @@ select_bang_ensure(VALUE a)
  *
  *  Returns +nil+ if no elements were removed.
  *
- *  Returns a new Enumerator if no block given:
- *
- *    a = [:foo, 'bar', 2, :bam]
- *    a.select! # => #<Enumerator: [:foo, "bar", 2, :bam]:select!>
+ *  With no block given, returns a new Enumerator.
  *
+ *  Related: see {Methods for Deleting}[rdoc-ref:Array@Methods+for+Deleting].
  */
 
 static VALUE
@@ -3887,20 +3981,18 @@ rb_ary_select_bang(VALUE ary)
 
 /*
  *  call-seq:
- *    array.keep_if {|element| ... } -> self
- *    array.keep_if -> new_enumeration
+ *    keep_if {|element| ... } -> self
+ *    keep_if -> new_enumerator
  *
- *  Retains those elements for which the block returns a truthy value;
- *  deletes all other elements; returns +self+:
+ *  With a block given, calls the block with each element of +self+;
+ *  removes the element from +self+ if the block does not return a truthy value:
  *
  *    a = [:foo, 'bar', 2, :bam]
  *    a.keep_if {|element| element.to_s.start_with?('b') } # => ["bar", :bam]
  *
- *  Returns a new Enumerator if no block given:
- *
- *    a = [:foo, 'bar', 2, :bam]
- *    a.keep_if # => #<Enumerator: [:foo, "bar", 2, :bam]:keep_if>
+ *  With no block given, returns a new Enumerator.
  *
+ *  Related: see {Methods for Deleting}[rdoc-ref:Array@Methods+for+Deleting].
  */
 
 static VALUE
@@ -3926,38 +4018,39 @@ ary_resize_smaller(VALUE ary, long len)
 
 /*
  *  call-seq:
- *    array.delete(obj) -> deleted_object
- *    array.delete(obj) {|nosuch| ... } -> deleted_object or block_return
+ *    delete(object) -> last_removed_object
+ *    delete(object) {|element| ... } -> last_removed_object or block_return
  *
  *  Removes zero or more elements from +self+.
  *
- *  When no block is given,
- *  removes from +self+ each element +ele+ such that <tt>ele == obj</tt>;
- *  returns the last deleted element:
+ *  With no block given,
+ *  removes from +self+ each element +ele+ such that <tt>ele == object</tt>;
+ *  returns the last removed element:
  *
- *    s1 = 'bar'; s2 = 'bar'
- *    a = [:foo, s1, 2, s2]
- *    a.delete('bar') # => "bar"
- *    a # => [:foo, 2]
+ *    a = [0, 1, 2, 2.0]
+ *    a.delete(2) # => 2.0
+ *    a           # => [0, 1]
  *
- *  Returns +nil+ if no elements removed.
+ *  Returns +nil+ if no elements removed:
  *
- *  When a block is given,
- *  removes from +self+ each element +ele+ such that <tt>ele == obj</tt>.
+ *    a.delete(2) # => nil
+ *
+ *  With a block given,
+ *  removes from +self+ each element +ele+ such that <tt>ele == object</tt>.
  *
  *  If any such elements are found, ignores the block
- *  and returns the last deleted element:
+ *  and returns the last removed element:
  *
- *    s1 = 'bar'; s2 = 'bar'
- *    a = [:foo, s1, 2, s2]
- *    deleted_obj = a.delete('bar') {|obj| fail 'Cannot happen' }
- *    a # => [:foo, 2]
+ *    a = [0, 1, 2, 2.0]
+ *    a.delete(2) {|element| fail 'Cannot happen' } # => 2.0
+ *    a                                             # => [0, 1]
  *
- *  If no such elements are found, returns the block's return value:
+ *  If no such element is found, returns the block's return value:
  *
- *    a = [:foo, 'bar', 2]
- *    a.delete(:nosuch) {|obj| "#{obj} not found" } # => "nosuch not found"
+ *    a.delete(2) {|element| "Element #{element} not found." }
+ *    # => "Element 2 not found."
  *
+ *  Related: see {Methods for Deleting}[rdoc-ref:Array@Methods+for+Deleting].
  */
 
 VALUE
@@ -4038,9 +4131,10 @@ rb_ary_delete_at(VALUE ary, long pos)
 
 /*
  *  call-seq:
- *    array.delete_at(index) -> deleted_object or nil
+ *    delete_at(index) -> removed_object or nil
  *
- *  Deletes an element from +self+, per the given Integer +index+.
+ *  Removes the element of +self+ at the given +index+, which must be an
+ *  {integer-convertible object}[rdoc-ref:implicit_conversion.rdoc@Integer-Convertible+Objects].
  *
  *  When +index+ is non-negative, deletes the element at offset +index+:
  *
@@ -4048,15 +4142,19 @@ rb_ary_delete_at(VALUE ary, long pos)
  *    a.delete_at(1) # => "bar"
  *    a # => [:foo, 2]
  *
- *  If index is too large, returns +nil+.
- *
  *  When +index+ is negative, counts backward from the end of the array:
  *
  *    a = [:foo, 'bar', 2]
  *    a.delete_at(-2) # => "bar"
  *    a # => [:foo, 2]
  *
- *  If +index+ is too small (far from zero), returns nil.
+ *  When +index+ is out of range, returns +nil+.
+ *
+ *    a = [:foo, 'bar', 2]
+ *    a.delete_at(3)  # => nil
+ *    a.delete_at(-4) # => nil
+ *
+ *  Related: see {Methods for Deleting}[rdoc-ref:Array@Methods+for+Deleting].
  */
 
 static VALUE
@@ -4097,72 +4195,95 @@ ary_slice_bang_by_rb_ary_splice(VALUE ary, long pos, long len)
 
 /*
  *  call-seq:
- *    array.slice!(n) -> object or nil
- *    array.slice!(start, length) -> new_array or nil
- *    array.slice!(range) -> new_array or nil
+ *    slice!(index) -> object or nil
+ *    slice!(start, length) -> new_array or nil
+ *    slice!(range) -> new_array or nil
  *
  *  Removes and returns elements from +self+.
  *
- *  When the only argument is an Integer +n+,
- *  removes and returns the _nth_ element in +self+:
+ *  With numeric argument +index+ given,
+ *  removes and returns the element at offset +index+:
  *
- *    a = [:foo, 'bar', 2]
- *    a.slice!(1) # => "bar"
- *    a # => [:foo, 2]
+ *    a = ['a', 'b', 'c', 'd']
+ *    a.slice!(2)   # => "c"
+ *    a             # => ["a", "b", "d"]
+ *    a.slice!(2.1) # => "d"
+ *    a             # => ["a", "b"]
  *
- *  If +n+ is negative, counts backwards from the end of +self+:
+ *  If +index+ is negative, counts backwards from the end of +self+:
  *
- *    a = [:foo, 'bar', 2]
- *    a.slice!(-1) # => 2
- *    a # => [:foo, "bar"]
+ *    a = ['a', 'b', 'c', 'd']
+ *    a.slice!(-2) # => "c"
+ *    a            # => ["a", "b", "d"]
  *
- *  If +n+ is out of range, returns +nil+.
+ *  If +index+ is out of range, returns +nil+.
  *
- *  When the only arguments are Integers +start+ and +length+,
- *  removes +length+ elements from +self+ beginning at offset  +start+;
- *  returns the deleted objects in a new \Array:
+ *  With numeric arguments +start+ and +length+ given,
+ *  removes +length+ elements from +self+ beginning at zero-based offset +start+;
+ *  returns the removed objects in a new array:
  *
- *    a = [:foo, 'bar', 2]
- *    a.slice!(0, 2) # => [:foo, "bar"]
- *    a # => [2]
+ *    a = ['a', 'b', 'c', 'd']
+ *    a.slice!(1, 2)     # => ["b", "c"]
+ *    a                  # => ["a", "d"]
+ *    a.slice!(0.1, 1.1) # => ["a"]
+ *    a                  # => ["d"]
+ *
+ *  If +start+ is negative, counts backwards from the end of +self+:
+ *
+ *    a = ['a', 'b', 'c', 'd']
+ *    a.slice!(-2, 1) # => ["c"]
+ *    a               # => ["a", "b", "d"]
+ *
+ *  If +start+ is out-of-range, returns +nil+:
+ *
+ *    a = ['a', 'b', 'c', 'd']
+ *    a.slice!(5, 1)  # => nil
+ *    a.slice!(-5, 1) # => nil
  *
  *  If <tt>start + length</tt> exceeds the array size,
  *  removes and returns all elements from offset +start+ to the end:
  *
- *    a = [:foo, 'bar', 2]
- *    a.slice!(1, 50) # => ["bar", 2]
- *    a # => [:foo]
+ *    a = ['a', 'b', 'c', 'd']
+ *    a.slice!(2, 50) # => ["c", "d"]
+ *    a               # => ["a", "b"]
  *
  *  If <tt>start == a.size</tt> and +length+ is non-negative,
- *  returns a new empty \Array.
+ *  returns a new empty array.
  *
  *  If +length+ is negative, returns +nil+.
  *
- *  When the only argument is a Range object +range+,
- *  treats <tt>range.min</tt> as +start+ above and <tt>range.size</tt> as +length+ above:
+ *  With Range argument +range+ given,
+ *  treats <tt>range.min</tt> as +start+ (as above)
+ *  and <tt>range.size</tt> as +length+ (as above):
  *
- *    a = [:foo, 'bar', 2]
- *    a.slice!(1..2) # => ["bar", 2]
- *    a # => [:foo]
+ *    a = ['a', 'b', 'c', 'd']
+ *    a.slice!(1..2) # => ["b", "c"]
+ *    a              # => ["a", "d"]
  *
- *  If <tt>range.start == a.size</tt>, returns a new empty \Array.
+ *  If <tt>range.start == a.size</tt>, returns a new empty array:
  *
- *  If <tt>range.start</tt> is larger than the array size, returns +nil+.
+ *    a = ['a', 'b', 'c', 'd']
+ *    a.slice!(4..5) # => []
  *
- *  If <tt>range.end</tt> is negative, counts backwards from the end of the array:
+ *  If <tt>range.start</tt> is larger than the array size, returns +nil+:
  *
- *    a = [:foo, 'bar', 2]
- *    a.slice!(0..-2) # => [:foo, "bar"]
- *    a # => [2]
+ *    a = ['a', 'b', 'c', 'd']
+      a.slice!(5..6) # => nil
  *
  *  If <tt>range.start</tt> is negative,
- *  calculates the start index backwards from the end of the array:
+ *  calculates the start index by counting backwards from the end of +self+:
  *
- *    a = [:foo, 'bar', 2]
- *    a.slice!(-2..2) # => ["bar", 2]
- *    a # => [:foo]
+ *    a = ['a', 'b', 'c', 'd']
+ *    a.slice!(-2..2) # => ["c"]
  *
- */
+ *  If <tt>range.end</tt> is negative,
+ *  calculates the end index by counting backwards from the end of +self+:
+ *
+ *    a = ['a', 'b', 'c', 'd']
+ *    a.slice!(0..-2) # => ["a", "b", "c"]
+ *
+ *  Related: see {Methods for Deleting}[rdoc-ref:Array@Methods+for+Deleting].
+ */
 
 static VALUE
 rb_ary_slice_bang(int argc, VALUE *argv, VALUE ary)
@@ -4242,10 +4363,11 @@ ary_reject_bang(VALUE ary)
 
 /*
  *  call-seq:
- *    array.reject! {|element| ... } -> self or nil
- *    array.reject! -> new_enumerator
+ *    reject! {|element| ... } -> self or nil
+ *    reject! -> new_enumerator
  *
- *  Removes each element for which the block returns a truthy value.
+ *  With a block given, calls the block with each element of +self+;
+ *  removes each element for which the block returns a truthy value.
  *
  *  Returns +self+ if any elements removed:
  *
@@ -4254,11 +4376,9 @@ ary_reject_bang(VALUE ary)
  *
  *  Returns +nil+ if no elements removed.
  *
- *  Returns a new Enumerator if no block given:
- *
- *    a = [:foo, 'bar', 2]
- *    a.reject! # => #<Enumerator: [:foo, "bar", 2]:reject!>
+ *  With no block given, returns a new Enumerator.
  *
+ *  Related: see {Methods for Deleting}[rdoc-ref:Array@Methods+for+Deleting].
  */
 
 static VALUE
@@ -4271,21 +4391,19 @@ rb_ary_reject_bang(VALUE ary)
 
 /*
  *  call-seq:
- *    array.reject {|element| ... } -> new_array
- *    array.reject -> new_enumerator
+ *    reject {|element| ... } -> new_array
+ *    reject -> new_enumerator
  *
- *  Returns a new \Array whose elements are all those from +self+
+ *  With a block given, returns a new array whose elements are all those from +self+
  *  for which the block returns +false+ or +nil+:
  *
  *    a = [:foo, 'bar', 2, 'bat']
  *    a1 = a.reject {|element| element.to_s.start_with?('b') }
  *    a1 # => [:foo, 2]
  *
- *  Returns a new Enumerator if no block given:
- *
- *     a = [:foo, 'bar', 2]
- *     a.reject # => #<Enumerator: [:foo, "bar", 2]:reject>
+ *  With no block given, returns a new Enumerator.
  *
+ *  Related: {Methods for Fetching}[rdoc-ref:Array@Methods+for+Fetching].
  */
 
 static VALUE
@@ -4301,20 +4419,19 @@ rb_ary_reject(VALUE ary)
 
 /*
  *  call-seq:
- *    array.delete_if {|element| ... } -> self
- *    array.delete_if -> Enumerator
+ *    delete_if {|element| ... } -> self
+ *    delete_if -> new_numerator
  *
- *  Removes each element in +self+ for which the block returns a truthy value;
+ *  With a block given, calls the block with each element of +self+;
+ *  removes the element if the block returns a truthy value;
  *  returns +self+:
  *
  *    a = [:foo, 'bar', 2, 'bat']
  *    a.delete_if {|element| element.to_s.start_with?('b') } # => [:foo, 2]
  *
- *  Returns a new Enumerator if no block given:
- *
- *    a = [:foo, 'bar', 2]
- *    a.delete_if # => #<Enumerator: [:foo, "bar", 2]:delete_if>
+ *  With no block given, returns a new Enumerator.
  *
+ *  Related: see {Methods for Deleting}[rdoc-ref:Array@Methods+for+Deleting].
  */
 
 static VALUE
@@ -4355,58 +4472,95 @@ take_items(VALUE obj, long n)
 
 /*
  *  call-seq:
- *    array.zip(*other_arrays) -> new_array
- *    array.zip(*other_arrays) {|other_array| ... } -> nil
+ *    zip(*other_arrays) -> new_array
+ *    zip(*other_arrays) {|sub_array| ... } -> nil
  *
- *  When no block given, returns a new \Array +new_array+ of size <tt>self.size</tt>
- *  whose elements are Arrays.
+ *  With no block given, combines +self+ with the collection of +other_arrays+;
+ *  returns a new array of sub-arrays:
  *
- *  Each nested array <tt>new_array[n]</tt> is of size <tt>other_arrays.size+1</tt>,
- *  and contains:
+ *    [0, 1].zip(['zero', 'one'], [:zero, :one])
+ *    # => [[0, "zero", :zero], [1, "one", :one]]
  *
- *  - The _nth_ element of +self+.
- *  - The _nth_ element of each of the +other_arrays+.
+ *  Returned:
  *
- *  If all +other_arrays+ and +self+ are the same size:
+ *  - The outer array is of size <tt>self.size</tt>.
+ *  - Each sub-array is of size <tt>other_arrays.size + 1</tt>.
+ *  - The _nth_ sub-array contains (in order):
+ *
+ *    - The _nth_ element of +self+.
+ *    - The _nth_ element of each of the other arrays, as available.
+ *
+ *  Example:
+ *
+ *    a = [0, 1]
+ *    zipped = a.zip(['zero', 'one'], [:zero, :one])
+ *    # => [[0, "zero", :zero], [1, "one", :one]]
+ *    zipped.size       # => 2 # Same size as a.
+ *    zipped.first.size # => 3 # Size of other arrays plus 1.
+ *
+ *  When the other arrays are all the same size as +self+,
+ *  the returned sub-arrays are a rearrangement containing exactly elements of all the arrays
+ *  (including +self+), with no omissions or additions:
  *
  *    a = [:a0, :a1, :a2, :a3]
  *    b = [:b0, :b1, :b2, :b3]
  *    c = [:c0, :c1, :c2, :c3]
  *    d = a.zip(b, c)
- *    d # => [[:a0, :b0, :c0], [:a1, :b1, :c1], [:a2, :b2, :c2], [:a3, :b3, :c3]]
+ *    pp d
+ *    # =>
+ *    [[:a0, :b0, :c0],
+ *     [:a1, :b1, :c1],
+ *     [:a2, :b2, :c2],
+ *     [:a3, :b3, :c3]]
  *
- *  If any array in +other_arrays+ is smaller than +self+,
- *  fills to <tt>self.size</tt> with +nil+:
+ *  When one of the other arrays is smaller than +self+,
+ *  pads the corresponding sub-array with +nil+ elements:
  *
  *    a = [:a0, :a1, :a2, :a3]
  *    b = [:b0, :b1, :b2]
  *    c = [:c0, :c1]
  *    d = a.zip(b, c)
- *    d # => [[:a0, :b0, :c0], [:a1, :b1, :c1], [:a2, :b2, nil], [:a3, nil, nil]]
+ *    pp d
+ *    # =>
+ *    [[:a0, :b0, :c0],
+ *     [:a1, :b1, :c1],
+ *     [:a2, :b2, nil],
+ *     [:a3, nil, nil]]
  *
- *  If any array in +other_arrays+ is larger than +self+,
- *  its trailing elements are ignored:
+ *  When one of the other arrays is larger than +self+,
+ *  _ignores_ its trailing elements:
  *
  *    a = [:a0, :a1, :a2, :a3]
  *    b = [:b0, :b1, :b2, :b3, :b4]
  *    c = [:c0, :c1, :c2, :c3, :c4, :c5]
  *    d = a.zip(b, c)
- *    d # => [[:a0, :b0, :c0], [:a1, :b1, :c1], [:a2, :b2, :c2], [:a3, :b3, :c3]]
+ *    pp d
+ *    # =>
+ *    [[:a0, :b0, :c0],
+ *     [:a1, :b1, :c1],
+ *     [:a2, :b2, :c2],
+ *     [:a3, :b3, :c3]]
  *
- *  When a block is given, calls the block with each of the sub-arrays (formed as above); returns +nil+:
+ *  With a block given, calls the block with each of the other arrays;
+ *  returns +nil+:
  *
+ *    d = []
  *    a = [:a0, :a1, :a2, :a3]
  *    b = [:b0, :b1, :b2, :b3]
  *    c = [:c0, :c1, :c2, :c3]
- *    a.zip(b, c) {|sub_array| p sub_array} # => nil
- *
- *  Output:
- *
- *    [:a0, :b0, :c0]
- *    [:a1, :b1, :c1]
- *    [:a2, :b2, :c2]
- *    [:a3, :b3, :c3]
- *
+ *    a.zip(b, c) {|sub_array| d.push(sub_array.reverse) } # => nil
+ *    pp d
+ *    # =>
+ *    [[:c0, :b0, :a0],
+ *     [:c1, :b1, :a1],
+ *     [:c2, :b2, :a2],
+ *     [:c3, :b3, :a3]]
+ *
+ *  For an *object* in *other_arrays* that is not actually an array,
+ *  forms the the "other array" as <tt>object.to_ary</tt>, if defined,
+ *  or as <tt>object.each.to_a</tt> otherwise.
+ *
+ *  Related: see {Methods for Converting}[rdoc-ref:Array@Methods+for+Converting].
  */
 
 static VALUE
@@ -4469,14 +4623,17 @@ rb_ary_zip(int argc, VALUE *argv, VALUE ary)
 
 /*
  *  call-seq:
- *    array.transpose -> new_array
+ *    transpose -> new_array
  *
- *  Transposes the rows and columns in an \Array of Arrays;
- *  the nested Arrays must all be the same size:
+ *  Returns a new array that is +self+
+ *  as a {transposed matrix}[https://en.wikipedia.org/wiki/Transpose]:
  *
  *    a = [[:a0, :a1], [:b0, :b1], [:c0, :c1]]
  *    a.transpose # => [[:a0, :b0, :c0], [:a1, :b1, :c1]]
  *
+ *  The elements of +self+ must all be the same size.
+ *
+ *  Related: see {Methods for Converting}[rdoc-ref:Array@Methods+for+Converting].
  */
 
 static VALUE
@@ -4509,13 +4666,17 @@ rb_ary_transpose(VALUE ary)
 
 /*
  *  call-seq:
- *    array.replace(other_array) -> self
+ *    initialize_copy(other_array) -> self
+ *    replace(other_array) -> self
  *
- *  Replaces the content of +self+ with the content of +other_array+; returns +self+:
+ *  Replaces the elements of +self+ with the elements of +other_array+, which must be an
+ *  {array-convertible object}[rdoc-ref:implicit_conversion.rdoc@Array-Convertible+Objects];
+ *  returns +self+:
  *
- *    a = [:foo, 'bar', 2]
- *    a.replace(['foo', :bar, 3]) # => ["foo", :bar, 3]
+ *    a = ['a', 'b', 'c']   # => ["a", "b", "c"]
+ *    a.replace(['d', 'e']) # => ["d", "e"]
  *
+ *  Related: see {Methods for Assigning}[rdoc-ref:Array@Methods+for+Assigning].
  */
 
 VALUE
@@ -4529,7 +4690,7 @@ rb_ary_replace(VALUE copy, VALUE orig)
 
     /* orig has enough space to embed the contents of orig. */
     if (RARRAY_LEN(orig) <= ary_embed_capa(copy)) {
-        assert(ARY_EMBED_P(copy));
+        RUBY_ASSERT(ARY_EMBED_P(copy));
         ary_memcpy(copy, 0, RARRAY_LEN(orig), RARRAY_CONST_PTR(orig));
         ARY_SET_EMBED_LEN(copy, RARRAY_LEN(orig));
     }
@@ -4537,7 +4698,7 @@ rb_ary_replace(VALUE copy, VALUE orig)
      * contents of orig. */
     else if (ARY_EMBED_P(orig)) {
         long len = ARY_EMBED_LEN(orig);
-        VALUE *ptr = ary_heap_alloc(len);
+        VALUE *ptr = ary_heap_alloc_buffer(len);
 
         FL_UNSET_EMBED(copy);
         ARY_SET_PTR(copy, ptr);
@@ -4563,13 +4724,14 @@ rb_ary_replace(VALUE copy, VALUE orig)
 
 /*
  *  call-seq:
- *     array.clear -> self
+ *    clear -> self
  *
- *  Removes all elements from +self+:
+ *  Removes all elements from +self+; returns +self+:
  *
  *    a = [:foo, 'bar', 2]
  *    a.clear # => []
  *
+ *  Related: see {Methods for Deleting}[rdoc-ref:Array@Methods+for+Deleting].
  */
 
 VALUE
@@ -4577,11 +4739,9 @@ rb_ary_clear(VALUE ary)
 {
     rb_ary_modify_check(ary);
     if (ARY_SHARED_P(ary)) {
-        if (!ARY_EMBED_P(ary)) {
-            rb_ary_unshare(ary);
-            FL_SET_EMBED(ary);
-            ARY_SET_EMBED_LEN(ary, 0);
-        }
+        rb_ary_unshare(ary);
+        FL_SET_EMBED(ary);
+        ARY_SET_EMBED_LEN(ary, 0);
     }
     else {
         ARY_SET_LEN(ary, 0);
@@ -4595,198 +4755,182 @@ rb_ary_clear(VALUE ary)
 
 /*
  *  call-seq:
- *    array.fill(obj) -> self
- *    array.fill(obj, start) -> self
- *    array.fill(obj, start, length) -> self
- *    array.fill(obj, range) -> self
- *    array.fill {|index| ... } -> self
- *    array.fill(start) {|index| ... } -> self
- *    array.fill(start, length) {|index| ... } -> self
- *    array.fill(range) {|index| ... } -> self
- *
- *  Replaces specified elements in +self+ with specified objects; returns +self+.
- *
- *  With argument +obj+ and no block given, replaces all elements with that one object:
- *
- *    a = ['a', 'b', 'c', 'd']
- *    a # => ["a", "b", "c", "d"]
- *    a.fill(:X) # => [:X, :X, :X, :X]
- *
- *  With arguments +obj+ and Integer +start+, and no block given,
- *  replaces elements based on the given start.
- *
- *  If +start+ is in range (<tt>0 <= start < array.size</tt>),
- *  replaces all elements from offset +start+ through the end:
- *
- *    a = ['a', 'b', 'c', 'd']
- *    a.fill(:X, 2) # => ["a", "b", :X, :X]
+ *    fill(object, start = nil, count = nil) -> new_array
+ *    fill(object, range) -> new_array
+ *    fill(start = nil, count = nil) {|element| ... } -> new_array
+ *    fill(range) {|element| ... } -> new_array
  *
- *  If +start+ is too large (<tt>start >= array.size</tt>), does nothing:
+ *  Replaces selected elements in +self+;
+ *  may add elements to +self+;
+ *  always returns +self+ (never a new array).
  *
- *    a = ['a', 'b', 'c', 'd']
- *    a.fill(:X, 4) # => ["a", "b", "c", "d"]
- *    a = ['a', 'b', 'c', 'd']
- *    a.fill(:X, 5) # => ["a", "b", "c", "d"]
+ *  In brief:
  *
- *  If +start+ is negative, counts from the end (starting index is <tt>start + array.size</tt>):
+ *    # Non-negative start.
+ *    ['a', 'b', 'c', 'd'].fill('-', 1, 2)          # => ["a", "-", "-", "d"]
+ *    ['a', 'b', 'c', 'd'].fill(1, 2) {|e| e.to_s } # => ["a", "1", "2", "d"]
  *
- *    a = ['a', 'b', 'c', 'd']
- *    a.fill(:X, -2) # => ["a", "b", :X, :X]
+ *    # Extends with specified values if necessary.
+ *    ['a', 'b', 'c', 'd'].fill('-', 3, 2)          # => ["a", "b", "c", "-", "-"]
+ *    ['a', 'b', 'c', 'd'].fill(3, 2) {|e| e.to_s } # => ["a", "b", "c", "3", "4"]
  *
- *  If +start+ is too small (less than and far from zero), replaces all elements:
+ *    # Fills with nils if necessary.
+ *    ['a', 'b', 'c', 'd'].fill('-', 6, 2)          # => ["a", "b", "c", "d", nil, nil, "-", "-"]
+ *    ['a', 'b', 'c', 'd'].fill(6, 2) {|e| e.to_s } # => ["a", "b", "c", "d", nil, nil, "6", "7"]
  *
- *    a = ['a', 'b', 'c', 'd']
- *    a.fill(:X, -6) # => [:X, :X, :X, :X]
- *    a = ['a', 'b', 'c', 'd']
- *    a.fill(:X, -50) # => [:X, :X, :X, :X]
+ *    # For negative start, counts backwards from the end.
+ *    ['a', 'b', 'c', 'd'].fill('-', -3, 3)          # => ["a", "-", "-", "-"]
+ *    ['a', 'b', 'c', 'd'].fill(-3, 3) {|e| e.to_s } # => ["a", "1", "2", "3"]
  *
- *  With arguments +obj+, Integer +start+, and Integer +length+, and no block given,
- *  replaces elements based on the given +start+ and +length+.
+ *    # Range.
+ *    ['a', 'b', 'c', 'd'].fill('-', 1..2)          # => ["a", "-", "-", "d"]
+ *    ['a', 'b', 'c', 'd'].fill(1..2) {|e| e.to_s } # => ["a", "1", "2", "d"]
  *
- *  If +start+ is in range, replaces +length+ elements beginning at offset +start+:
+ *  When arguments +start+ and +count+ are given,
+ *  they select the elements of +self+ to be replaced;
+ *  each must be an
+ *  {integer-convertible object}[rdoc-ref:implicit_conversion.rdoc@Integer-Convertible+Objects]
+ *  (or +nil+):
  *
- *    a = ['a', 'b', 'c', 'd']
- *    a.fill(:X, 1, 1) # => ["a", :X, "c", "d"]
+ *  - +start+ specifies the zero-based offset of the first element to be replaced;
+ *    +nil+ means zero.
+ *  - +count+ is the number of consecutive elements to be replaced;
+ *    +nil+ means "all the rest."
  *
- *  If +start+ is negative, counts from the end:
+ *  With argument +object+ given,
+ *  that one object is used for all replacements:
  *
- *    a = ['a', 'b', 'c', 'd']
- *    a.fill(:X, -2, 1) # => ["a", "b", :X, "d"]
+ *    o = Object.new           # => #<Object:0x0000014e7bff7600>
+ *    a = ['a', 'b', 'c', 'd'] # => ["a", "b", "c", "d"]
+ *    a.fill(o, 1, 2)
+ *    # => ["a", #<Object:0x0000014e7bff7600>, #<Object:0x0000014e7bff7600>, "d"]
  *
- *  If +start+ is large (<tt>start >= array.size</tt>), extends +self+ with +nil+:
+ *  With a block given, the block is called once for each element to be replaced;
+ *  the value passed to the block is the _index_ of the element to be replaced
+ *  (not the element itself);
+ *  the block's return value replaces the element:
  *
- *    a = ['a', 'b', 'c', 'd']
- *    a.fill(:X, 5, 0) # => ["a", "b", "c", "d", nil]
- *    a = ['a', 'b', 'c', 'd']
- *    a.fill(:X, 5, 2) # => ["a", "b", "c", "d", nil, :X, :X]
+ *    a = ['a', 'b', 'c', 'd']               # => ["a", "b", "c", "d"]
+ *    a.fill(1, 2) {|element| element.to_s } # => ["a", "1", "2", "d"]
  *
- *  If +length+ is zero or negative, replaces no elements:
+ *  For arguments +start+ and +count+:
  *
- *    a = ['a', 'b', 'c', 'd']
- *    a.fill(:X, 1, 0) # => ["a", "b", "c", "d"]
- *    a.fill(:X, 1, -1) # => ["a", "b", "c", "d"]
+ *  - If +start+ is non-negative,
+ *    replaces +count+ elements beginning at offset +start+:
  *
- *  With arguments +obj+ and Range +range+, and no block given,
- *  replaces elements based on the given range.
+ *      ['a', 'b', 'c', 'd'].fill('-', 0, 2) # => ["-", "-", "c", "d"]
+ *      ['a', 'b', 'c', 'd'].fill('-', 1, 2) # => ["a", "-", "-", "d"]
+ *      ['a', 'b', 'c', 'd'].fill('-', 2, 2) # => ["a", "b", "-", "-"]
  *
- *  If the range is positive and ascending (<tt>0 < range.begin <= range.end</tt>),
- *  replaces elements from <tt>range.begin</tt> to <tt>range.end</tt>:
+ *      ['a', 'b', 'c', 'd'].fill(0, 2) {|e| e.to_s } # => ["0", "1", "c", "d"]
+ *      ['a', 'b', 'c', 'd'].fill(1, 2) {|e| e.to_s } # => ["a", "1", "2", "d"]
+ *      ['a', 'b', 'c', 'd'].fill(2, 2) {|e| e.to_s } # => ["a", "b", "2", "3"]
  *
- *    a = ['a', 'b', 'c', 'd']
- *    a.fill(:X, (1..1)) # => ["a", :X, "c", "d"]
+ *    Extends +self+ if necessary:
  *
- *  If <tt>range.first</tt> is negative, replaces no elements:
+ *      ['a', 'b', 'c', 'd'].fill('-', 3, 2) # => ["a", "b", "c", "-", "-"]
+ *      ['a', 'b', 'c', 'd'].fill('-', 4, 2) # => ["a", "b", "c", "d", "-", "-"]
  *
- *    a = ['a', 'b', 'c', 'd']
- *    a.fill(:X, (-1..1)) # => ["a", "b", "c", "d"]
+ *      ['a', 'b', 'c', 'd'].fill(3, 2) {|e| e.to_s } # => ["a", "b", "c", "3", "4"]
+ *      ['a', 'b', 'c', 'd'].fill(4, 2) {|e| e.to_s } # => ["a", "b", "c", "d", "4", "5"]
  *
- *  If <tt>range.last</tt> is negative, counts from the end:
+ *    Fills with +nil+ if necessary:
  *
- *    a = ['a', 'b', 'c', 'd']
- *    a.fill(:X, (0..-2)) # => [:X, :X, :X, "d"]
- *    a = ['a', 'b', 'c', 'd']
- *    a.fill(:X, (1..-2)) # => ["a", :X, :X, "d"]
+ *      ['a', 'b', 'c', 'd'].fill('-', 5, 2) # => ["a", "b", "c", "d", nil, "-", "-"]
+ *      ['a', 'b', 'c', 'd'].fill('-', 6, 2) # => ["a", "b", "c", "d", nil, nil, "-", "-"]
  *
- *  If <tt>range.last</tt> and <tt>range.last</tt> are both negative,
- *  both count from the end of the array:
+ *      ['a', 'b', 'c', 'd'].fill(5, 2) {|e| e.to_s } # => ["a", "b", "c", "d", nil, "5", "6"]
+ *      ['a', 'b', 'c', 'd'].fill(6, 2) {|e| e.to_s } # => ["a", "b", "c", "d", nil, nil, "6", "7"]
  *
- *    a = ['a', 'b', 'c', 'd']
- *    a.fill(:X, (-1..-1)) # => ["a", "b", "c", :X]
- *    a = ['a', 'b', 'c', 'd']
- *    a.fill(:X, (-2..-2)) # => ["a", "b", :X, "d"]
+ *    Does nothing if +count+ is non-positive:
  *
- *  With no arguments and a block given, calls the block with each index;
- *  replaces the corresponding element with the block's return value:
+ *      ['a', 'b', 'c', 'd'].fill('-', 2, 0)    # => ["a", "b", "c", "d"]
+ *      ['a', 'b', 'c', 'd'].fill('-', 2, -100) # => ["a", "b", "c", "d"]
+ *      ['a', 'b', 'c', 'd'].fill('-', 6, -100) # => ["a", "b", "c", "d"]
  *
- *    a = ['a', 'b', 'c', 'd']
- *    a.fill { |index| "new_#{index}" } # => ["new_0", "new_1", "new_2", "new_3"]
+ *      ['a', 'b', 'c', 'd'].fill(2, 0) {|e| fail 'Cannot happen' }    # => ["a", "b", "c", "d"]
+ *      ['a', 'b', 'c', 'd'].fill(2, -100) {|e| fail 'Cannot happen' } # => ["a", "b", "c", "d"]
+ *      ['a', 'b', 'c', 'd'].fill(6, -100) {|e| fail 'Cannot happen' } # => ["a", "b", "c", "d"]
  *
- *  With argument +start+ and a block given, calls the block with each index
- *  from offset +start+ to the end; replaces the corresponding element
- *  with the block's return value.
+ *  - If +start+ is negative, counts backwards from the end of +self+:
  *
- *  If start is in range (<tt>0 <= start < array.size</tt>),
- *  replaces from offset +start+ to the end:
+ *      ['a', 'b', 'c', 'd'].fill('-', -4, 3) # => ["-", "-", "-", "d"]
+ *      ['a', 'b', 'c', 'd'].fill('-', -3, 3) # => ["a", "-", "-", "-"]
  *
- *    a = ['a', 'b', 'c', 'd']
- *    a.fill(1) { |index| "new_#{index}" } # => ["a", "new_1", "new_2", "new_3"]
+ *      ['a', 'b', 'c', 'd'].fill(-4, 3) {|e| e.to_s } # => ["0", "1", "2", "d"]
+ *      ['a', 'b', 'c', 'd'].fill(-3, 3) {|e| e.to_s } # => ["a", "1", "2", "3"]
  *
- *  If +start+ is too large(<tt>start >= array.size</tt>), does nothing:
+ *    Extends +self+ if necessary:
  *
- *    a = ['a', 'b', 'c', 'd']
- *    a.fill(4) { |index| fail 'Cannot happen' } # => ["a", "b", "c", "d"]
- *    a = ['a', 'b', 'c', 'd']
- *    a.fill(4) { |index| fail 'Cannot happen' } # => ["a", "b", "c", "d"]
+ *      ['a', 'b', 'c', 'd'].fill('-', -2, 3) # => ["a", "b", "-", "-", "-"]
+ *      ['a', 'b', 'c', 'd'].fill('-', -1, 3) # => ["a", "b", "c", "-", "-", "-"]
  *
- *  If +start+ is negative, counts from the end:
+ *      ['a', 'b', 'c', 'd'].fill(-2, 3) {|e| e.to_s } # => ["a", "b", "2", "3", "4"]
+ *      ['a', 'b', 'c', 'd'].fill(-1, 3) {|e| e.to_s } # => ["a", "b", "c", "3", "4", "5"]
  *
- *    a = ['a', 'b', 'c', 'd']
- *    a.fill(-2) { |index| "new_#{index}" } # => ["a", "b", "new_2", "new_3"]
+ *    Starts at the beginning of +self+ if +start+ is negative and out-of-range:
  *
- *  If start is too small (<tt>start <= -array.size</tt>, replaces all elements:
+ *      ['a', 'b', 'c', 'd'].fill('-', -5, 2) # => ["-", "-", "c", "d"]
+ *      ['a', 'b', 'c', 'd'].fill('-', -6, 2) # => ["-", "-", "c", "d"]
  *
- *    a = ['a', 'b', 'c', 'd']
- *    a.fill(-6) { |index| "new_#{index}" } # => ["new_0", "new_1", "new_2", "new_3"]
- *    a = ['a', 'b', 'c', 'd']
- *    a.fill(-50) { |index| "new_#{index}" } # => ["new_0", "new_1", "new_2", "new_3"]
+ *      ['a', 'b', 'c', 'd'].fill(-5, 2) {|e| e.to_s } # => ["0", "1", "c", "d"]
+ *      ['a', 'b', 'c', 'd'].fill(-6, 2) {|e| e.to_s } # => ["0", "1", "c", "d"]
  *
- *  With arguments +start+ and +length+, and a block given,
- *  calls the block for each index specified by start length;
- *  replaces the corresponding element with the block's return value.
+ *    Does nothing if +count+ is non-positive:
  *
- *  If +start+ is in range, replaces +length+ elements beginning at offset +start+:
+ *      ['a', 'b', 'c', 'd'].fill('-', -2, 0)  # => ["a", "b", "c", "d"]
+ *      ['a', 'b', 'c', 'd'].fill('-', -2, -1) # => ["a", "b", "c", "d"]
  *
- *    a = ['a', 'b', 'c', 'd']
- *    a.fill(1, 1) { |index| "new_#{index}" } # => ["a", "new_1", "c", "d"]
+ *      ['a', 'b', 'c', 'd'].fill(-2, 0) {|e| fail 'Cannot happen' }  # => ["a", "b", "c", "d"]
+ *      ['a', 'b', 'c', 'd'].fill(-2, -1) {|e| fail 'Cannot happen' } # => ["a", "b", "c", "d"]
  *
- *  If start is negative, counts from the end:
+ *  When argument +range+ is given,
+ *  it must be a Range object whose members are numeric;
+ *  its +begin+ and +end+ values determine the elements of +self+
+ *  to be replaced:
  *
- *    a = ['a', 'b', 'c', 'd']
- *    a.fill(-2, 1) { |index| "new_#{index}" } # => ["a", "b", "new_2", "d"]
+ *  - If both +begin+ and +end+ are positive, they specify the first and last elements
+ *    to be replaced:
  *
- *  If +start+ is large (<tt>start >= array.size</tt>), extends +self+ with +nil+:
+ *      ['a', 'b', 'c', 'd'].fill('-', 1..2)          # => ["a", "-", "-", "d"]
+ *      ['a', 'b', 'c', 'd'].fill(1..2) {|e| e.to_s } # => ["a", "1", "2", "d"]
  *
- *    a = ['a', 'b', 'c', 'd']
- *    a.fill(5, 0) { |index| "new_#{index}" } # => ["a", "b", "c", "d", nil]
- *    a = ['a', 'b', 'c', 'd']
- *    a.fill(5, 2) { |index| "new_#{index}" } # => ["a", "b", "c", "d", nil, "new_5", "new_6"]
+ *    If +end+ is smaller than +begin+, replaces no elements:
  *
- *  If +length+ is zero or less, replaces no elements:
+ *      ['a', 'b', 'c', 'd'].fill('-', 2..1)          # => ["a", "b", "c", "d"]
+ *      ['a', 'b', 'c', 'd'].fill(2..1) {|e| e.to_s } # => ["a", "b", "c", "d"]
  *
- *    a = ['a', 'b', 'c', 'd']
- *    a.fill(1, 0) { |index| "new_#{index}" } # => ["a", "b", "c", "d"]
- *    a.fill(1, -1) { |index| "new_#{index}" } # => ["a", "b", "c", "d"]
+ *  - If either is negative (or both are negative), counts backwards from the end of +self+:
  *
- *  With arguments +obj+ and +range+, and a block given,
- *  calls the block with each index in the given range;
- *  replaces the corresponding element with the block's return value.
+ *      ['a', 'b', 'c', 'd'].fill('-', -3..2)  # => ["a", "-", "-", "d"]
+ *      ['a', 'b', 'c', 'd'].fill('-', 1..-2)  # => ["a", "-", "-", "d"]
+ *      ['a', 'b', 'c', 'd'].fill('-', -3..-2) # => ["a", "-", "-", "d"]
  *
- *  If the range is positive and ascending (<tt>range 0 < range.begin <= range.end</tt>,
- *  replaces elements from <tt>range.begin</tt> to <tt>range.end</tt>:
+ *      ['a', 'b', 'c', 'd'].fill(-3..2) {|e| e.to_s }  # => ["a", "1", "2", "d"]
+ *      ['a', 'b', 'c', 'd'].fill(1..-2) {|e| e.to_s }  # => ["a", "1", "2", "d"]
+ *      ['a', 'b', 'c', 'd'].fill(-3..-2) {|e| e.to_s } # => ["a", "1", "2", "d"]
  *
- *    a = ['a', 'b', 'c', 'd']
- *    a.fill(1..1) { |index| "new_#{index}" } # => ["a", "new_1", "c", "d"]
+ *  - If the +end+ value is excluded (see Range#exclude_end?), omits the last replacement:
  *
- *  If +range.first+ is negative, does nothing:
+ *      ['a', 'b', 'c', 'd'].fill('-', 1...2)  # => ["a", "-", "c", "d"]
+ *      ['a', 'b', 'c', 'd'].fill('-', 1...-2) # => ["a", "-", "c", "d"]
  *
- *    a = ['a', 'b', 'c', 'd']
- *    a.fill(-1..1) { |index| fail 'Cannot happen' } # => ["a", "b", "c", "d"]
+ *      ['a', 'b', 'c', 'd'].fill(1...2) {|e| e.to_s }  # => ["a", "1", "c", "d"]
+ *      ['a', 'b', 'c', 'd'].fill(1...-2) {|e| e.to_s } # => ["a", "1", "c", "d"]
  *
- *  If <tt>range.last</tt> is negative, counts from the end:
+ *  - If the range is endless (see {Endless Ranges}[rdoc-ref:Range@Endless+Ranges]),
+ *    replaces elements to the end of +self+:
  *
- *    a = ['a', 'b', 'c', 'd']
- *    a.fill(0..-2) { |index| "new_#{index}" } # => ["new_0", "new_1", "new_2", "d"]
- *    a = ['a', 'b', 'c', 'd']
- *    a.fill(1..-2) { |index| "new_#{index}" } # => ["a", "new_1", "new_2", "d"]
+ *      ['a', 'b', 'c', 'd'].fill('-', 1..)          # => ["a", "-", "-", "-"]
+ *      ['a', 'b', 'c', 'd'].fill(1..) {|e| e.to_s } # => ["a", "1", "2", "3"]
  *
- *  If <tt>range.first</tt> and <tt>range.last</tt> are both negative,
- *  both count from the end:
+ *  - If the range is beginless (see {Beginless Ranges}[rdoc-ref:Range@Beginless+Ranges]),
+ *    replaces elements from the beginning of +self+:
  *
- *    a = ['a', 'b', 'c', 'd']
- *    a.fill(-1..-1) { |index| "new_#{index}" } # => ["a", "b", "c", "new_3"]
- *    a = ['a', 'b', 'c', 'd']
- *    a.fill(-2..-2) { |index| "new_#{index}" } # => ["a", "b", "new_2", "d"]
+ *      ['a', 'b', 'c', 'd'].fill('-', ..2)          # => ["-", "-", "-", "d"]
+ *      ['a', 'b', 'c', 'd'].fill(..2) {|e| e.to_s } # => ["0", "1", "2", "d"]
  *
+ *  Related: see {Methods for Assigning}[rdoc-ref:Array@Methods+for+Assigning].
  */
 
 static VALUE
@@ -4855,15 +4999,15 @@ rb_ary_fill(int argc, VALUE *argv, VALUE ary)
 
 /*
  *  call-seq:
- *    array + other_array -> new_array
+ *    self + other_array -> new_array
  *
- *  Returns a new \Array containing all elements of +array+
+ *  Returns a new array containing all elements of +self+
  *  followed by all elements of +other_array+:
  *
  *    a = [0, 1] + [2, 3]
  *    a # => [0, 1, 2, 3]
  *
- *  Related: #concat.
+ *  Related: see {Methods for Combining}[rdoc-ref:Array@Methods+for+Combining].
  */
 
 VALUE
@@ -4897,12 +5041,15 @@ ary_append(VALUE x, VALUE y)
 
 /*
  *  call-seq:
- *    array.concat(*other_arrays) -> self
+ *    concat(*other_arrays) -> self
  *
- *  Adds to +array+ all elements from each \Array in +other_arrays+; returns +self+:
+ *  Adds to +self+ all elements from each array in +other_arrays+; returns +self+:
  *
  *    a = [0, 1]
- *    a.concat([2, 3], [4, 5]) # => [0, 1, 2, 3, 4, 5]
+ *    a.concat(['two', 'three'], [:four, :five], a)
+ *    # => [0, 1, "two", "three", :four, :five, 0, 1]
+ *
+ *  Related: see {Methods for Assigning}[rdoc-ref:Array@Methods+for+Assigning].
  */
 
 static VALUE
@@ -4934,19 +5081,19 @@ rb_ary_concat(VALUE x, VALUE y)
 
 /*
  *  call-seq:
- *    array * n -> new_array
- *    array * string_separator -> new_string
+ *    self * n -> new_array
+ *    self * string_separator -> new_string
  *
- *  When non-negative argument Integer +n+ is given,
- *  returns a new \Array built by concatenating the +n+ copies of +self+:
+ *  When non-negative integer argument +n+ is given,
+ *  returns a new array built by concatenating +n+ copies of +self+:
  *
  *    a = ['x', 'y']
  *    a * 3 # => ["x", "y", "x", "y", "x", "y"]
  *
- *  When String argument +string_separator+ is given,
- *  equivalent to <tt>array.join(string_separator)</tt>:
+ *  When string argument +string_separator+ is given,
+ *  equivalent to <tt>self.join(string_separator)</tt>:
  *
- *    [0, [0, 1], {foo: 0}] * ', ' # => "0, 0, 1, {:foo=>0}"
+ *    [0, [0, 1], {foo: 0}] * ', ' # => "0, 0, 1, {foo: 0}"
  *
  */
 
@@ -4996,17 +5143,18 @@ rb_ary_times(VALUE ary, VALUE times)
 
 /*
  *  call-seq:
- *    array.assoc(obj) -> found_array or nil
+ *    assoc(object) -> found_array or nil
  *
- *  Returns the first element in +self+ that is an \Array
- *  whose first element <tt>==</tt> +obj+:
+ *  Returns the first element +ele+ in +self+ such that +ele+ is an array
+ *  and <tt>ele[0] == object</tt>:
  *
  *    a = [{foo: 0}, [2, 4], [4, 5, 6], [4, 5]]
  *    a.assoc(4) # => [4, 5, 6]
  *
  *  Returns +nil+ if no such element is found.
  *
- *  Related: #rassoc.
+ *  Related: Array#rassoc;
+ *  see also {Methods for Fetching}[rdoc-ref:Array@Methods+for+Fetching].
  */
 
 VALUE
@@ -5026,17 +5174,19 @@ rb_ary_assoc(VALUE ary, VALUE key)
 
 /*
  *  call-seq:
- *    array.rassoc(obj) -> found_array or nil
+ *    rassoc(object) -> found_array or nil
  *
- *  Returns the first element in +self+ that is an \Array
- *  whose second element <tt>==</tt> +obj+:
+ *  Returns the first element +ele+ in +self+ such that +ele+ is an array
+ *  and <tt>ele[1] == object</tt>:
  *
  *    a = [{foo: 0}, [2, 4], [4, 5, 6], [4, 5]]
  *    a.rassoc(4) # => [2, 4]
+ *    a.rassoc(5) # => [4, 5, 6]
  *
  *  Returns +nil+ if no such element is found.
  *
- *  Related: #assoc.
+ *  Related: Array#assoc;
+ *  see also {Methods for Fetching}[rdoc-ref:Array@Methods+for+Fetching].
  */
 
 VALUE
@@ -5046,7 +5196,7 @@ rb_ary_rassoc(VALUE ary, VALUE value)
     VALUE v;
 
     for (i = 0; i < RARRAY_LEN(ary); ++i) {
-        v = RARRAY_AREF(ary, i);
+        v = rb_check_array_type(RARRAY_AREF(ary, i));
         if (RB_TYPE_P(v, T_ARRAY) &&
             RARRAY_LEN(v) > 1 &&
             rb_equal(RARRAY_AREF(v, 1), value))
@@ -5091,20 +5241,26 @@ recursive_equal(VALUE ary1, VALUE ary2, int recur)
 
 /*
  *  call-seq:
- *    array == other_array -> true or false
+ *    self == other_array -> true or false
  *
- *  Returns +true+ if both <tt>array.size == other_array.size</tt>
- *  and for each index +i+ in +array+, <tt>array[i] == other_array[i]</tt>:
+ *  Returns whether both:
  *
- *    a0 = [:foo, 'bar', 2]
- *    a1 = [:foo, 'bar', 2.0]
- *    a1 == a0 # => true
- *    [] == [] # => true
+ *  - +self+ and +other_array+ are the same size.
+ *  - Their corresponding elements are the same;
+ *    that is, for each index +i+ in <tt>(0...self.size)</tt>,
+ *    <tt>self[i] == other_array[i]</tt>.
  *
- *  Otherwise, returns +false+.
+ *  Examples:
+ *
+ *    [:foo, 'bar', 2] == [:foo, 'bar', 2]   # => true
+ *    [:foo, 'bar', 2] == [:foo, 'bar', 2.0] # => true
+ *    [:foo, 'bar', 2] == [:foo, 'bar']      # => false # Different sizes.
+ *    [:foo, 'bar', 2] == [:foo, 'bar', 3]   # => false # Different elements.
  *
  *  This method is different from method Array#eql?,
  *  which compares elements using <tt>Object#eql?</tt>.
+ *
+ *  Related: see {Methods for Comparing}[rdoc-ref:Array@Methods+for+Comparing].
  */
 
 static VALUE
@@ -5137,10 +5293,10 @@ recursive_eql(VALUE ary1, VALUE ary2, int recur)
 
 /*
  *  call-seq:
- *    array.eql? other_array -> true or false
+ *    eql?(other_array) -> true or false
  *
  *  Returns +true+ if +self+ and +other_array+ are the same size,
- *  and if, for each index +i+ in +self+, <tt>self[i].eql? other_array[i]</tt>:
+ *  and if, for each index +i+ in +self+, <tt>self[i].eql?(other_array[i])</tt>:
  *
  *    a0 = [:foo, 'bar', 2]
  *    a1 = [:foo, 'bar', 2]
@@ -5150,6 +5306,8 @@ recursive_eql(VALUE ary1, VALUE ary2, int recur)
  *
  *  This method is different from method Array#==,
  *  which compares using method <tt>Object#==</tt>.
+ *
+ *  Related: see {Methods for Querying}[rdoc-ref:Array@Methods+for+Querying].
  */
 
 static VALUE
@@ -5162,8 +5320,8 @@ rb_ary_eql(VALUE ary1, VALUE ary2)
     return rb_exec_recursive_paired(recursive_eql, ary1, ary2, ary2);
 }
 
-VALUE
-rb_ary_hash_values(long len, const VALUE *elements)
+static VALUE
+ary_hash_values(long len, const VALUE *elements, const VALUE ary)
 {
     long i;
     st_index_t h;
@@ -5174,39 +5332,55 @@ rb_ary_hash_values(long len, const VALUE *elements)
     for (i=0; i<len; i++) {
         n = rb_hash(elements[i]);
         h = rb_hash_uint(h, NUM2LONG(n));
+        if (ary) {
+            len = RARRAY_LEN(ary);
+            elements = RARRAY_CONST_PTR(ary);
+        }
     }
     h = rb_hash_end(h);
     return ST2FIX(h);
 }
 
+VALUE
+rb_ary_hash_values(long len, const VALUE *elements)
+{
+    return ary_hash_values(len, elements, 0);
+}
+
 /*
  *  call-seq:
- *    array.hash -> integer
+ *    hash -> integer
  *
  *  Returns the integer hash value for +self+.
  *
- *  Two arrays with the same content will have the same hash code (and will compare using eql?):
+ *  Two arrays with the same content will have the same hash value
+ *  (and will compare using eql?):
  *
- *    [0, 1, 2].hash == [0, 1, 2].hash # => true
- *    [0, 1, 2].hash == [0, 1, 3].hash # => false
+ *    ['a', 'b'].hash == ['a', 'b'].hash # => true
+ *    ['a', 'b'].hash == ['a', 'c'].hash # => false
+ *    ['a', 'b'].hash == ['a'].hash      # => false
  *
  */
 
 static VALUE
 rb_ary_hash(VALUE ary)
 {
-    return rb_ary_hash_values(RARRAY_LEN(ary), RARRAY_CONST_PTR(ary));
+    RBIMPL_ASSERT_OR_ASSUME(ary);
+    return ary_hash_values(RARRAY_LEN(ary), RARRAY_CONST_PTR(ary), ary);
 }
 
 /*
  *  call-seq:
- *    array.include?(obj) -> true or false
+ *    include?(object) -> true or false
+ *
+ *  Returns whether for some element +element+ in +self+,
+ *  <tt>object == element</tt>:
  *
- *  Returns +true+ if for some index +i+ in +self+, <tt>obj == self[i]</tt>;
- *  otherwise +false+:
+ *    [0, 1, 2].include?(2)   # => true
+ *    [0, 1, 2].include?(2.0) # => true
+ *    [0, 1, 2].include?(2.1) # => false
  *
- *    [0, 1, 2].include?(2) # => true
- *    [0, 1, 2].include?(3) # => false
+ *  Related: see {Methods for Querying}[rdoc-ref:Array@Methods+for+Querying].
  */
 
 VALUE
@@ -5261,33 +5435,40 @@ recursive_cmp(VALUE ary1, VALUE ary2, int recur)
 
 /*
  *  call-seq:
- *    array <=> other_array -> -1, 0, or 1
- *
- *  Returns -1, 0, or 1 as +self+ is less than, equal to, or greater than +other_array+.
- *  For each index +i+ in +self+, evaluates <tt>result = self[i] <=> other_array[i]</tt>.
+ *    self <=> other_array -> -1, 0, or 1
  *
- *  Returns -1 if any result is -1:
+ *  Returns -1, 0, or 1 as +self+ is determined
+ *  to be less than, equal to, or greater than +other_array+.
  *
- *    [0, 1, 2] <=> [0, 1, 3] # => -1
+ *  Iterates over each index +i+ in <tt>(0...self.size)</tt>:
  *
- *  Returns 1 if any result is 1:
+ *  - Computes <tt>result[i]</tt> as <tt>self[i] <=> other_array[i]</tt>.
+ *  - Immediately returns 1 if <tt>result[i]</tt> is 1:
  *
- *    [0, 1, 2] <=> [0, 1, 1] # => 1
+ *      [0, 1, 2] <=> [0, 0, 2] # => 1
  *
- *  When all results are zero:
+ *  - Immediately returns -1 if <tt>result[i]</tt> is -1:
  *
- *  - Returns -1 if +array+ is smaller than +other_array+:
+ *      [0, 1, 2] <=> [0, 2, 2] # => -1
  *
- *      [0, 1, 2] <=> [0, 1, 2, 3] # => -1
+ *  - Continues if <tt>result[i]</tt> is 0.
  *
- *  - Returns 1 if +array+ is larger than +other_array+:
+ *  When every +result+ is 0,
+ *  returns <tt>self.size <=> other_array.size</tt>
+ *  (see Integer#<=>):
  *
- *      [0, 1, 2] <=> [0, 1] # => 1
+ *    [0, 1, 2] <=> [0, 1]        # => 1
+ *    [0, 1, 2] <=> [0, 1, 2]     # => 0
+ *    [0, 1, 2] <=> [0, 1, 2, 3]  # => -1
  *
- *  - Returns 0 if +array+ and +other_array+ are the same size:
+ *  Note that when +other_array+ is larger than +self+,
+ *  its trailing elements do not affect the result:
  *
- *      [0, 1, 2] <=> [0, 1, 2] # => 0
+ *    [0, 1, 2] <=> [0, 1, 2, -3] # => -1
+ *    [0, 1, 2] <=> [0, 1, 2, 0]  # => -1
+ *    [0, 1, 2] <=> [0, 1, 2, 3]  # => -1
  *
+ *  Related: see {Methods for Comparing}[rdoc-ref:Array@Methods+for+Comparing].
  */
 
 VALUE
@@ -5357,18 +5538,20 @@ ary_make_hash_by(VALUE ary)
 
 /*
  *  call-seq:
- *    array - other_array -> new_array
+ *    self - other_array -> new_array
  *
- *  Returns a new \Array containing only those elements from +array+
- *  that are not found in \Array +other_array+;
- *  items are compared using <tt>eql?</tt>;
- *  the order from +array+ is preserved:
+ *  Returns a new array containing only those elements of +self+
+ *  that are not found in +other_array+;
+ *  the order from +self+ is preserved:
  *
- *    [0, 1, 1, 2, 1, 1, 3, 1, 1] - [1] # => [0, 2, 3]
- *    [0, 1, 2, 3] - [3, 0] # => [1, 2]
- *    [0, 1, 2] - [4] # => [0, 1, 2]
+ *    [0, 1, 1, 2, 1, 1, 3, 1, 1] - [1]             # => [0, 2, 3]
+ *    [0, 1, 1, 2, 1, 1, 3, 1, 1] - [3, 2, 0, :foo] # => [1, 1, 1, 1, 1, 1]
+ *    [0, 1, 2] - [:foo]                            # => [0, 1, 2]
  *
- *  Related: Array#difference.
+ *  Element are compared using method <tt>#eql?</tt>
+ *  (as defined in each element of +self+).
+ *
+ *  Related: see {Methods for Combining}[rdoc-ref:Array@Methods+for+Combining].
  */
 
 VALUE
@@ -5402,19 +5585,21 @@ rb_ary_diff(VALUE ary1, VALUE ary2)
 
 /*
  *  call-seq:
- *    array.difference(*other_arrays) -> new_array
+ *    difference(*other_arrays = []) -> new_array
  *
- *  Returns a new \Array containing only those elements from +self+
- *  that are not found in any of the Arrays +other_arrays+;
+ *  Returns a new array containing only those elements from +self+
+ *  that are not found in any of the given +other_arrays+;
  *  items are compared using <tt>eql?</tt>;  order from +self+ is preserved:
  *
  *    [0, 1, 1, 2, 1, 1, 3, 1, 1].difference([1]) # => [0, 2, 3]
- *    [0, 1, 2, 3].difference([3, 0], [1, 3]) # => [2]
- *    [0, 1, 2].difference([4]) # => [0, 1, 2]
+ *    [0, 1, 2, 3].difference([3, 0], [1, 3])     # => [2]
+ *    [0, 1, 2].difference([4])                   # => [0, 1, 2]
+ *    [0, 1, 2].difference                        # => [0, 1, 2]
  *
- *  Returns a copy of +self+ if no arguments given.
+ *  Returns a copy of +self+ if no arguments are given.
  *
- *  Related: Array#-.
+ *  Related: Array#-;
+ *  see also {Methods for Combining}[rdoc-ref:Array@Methods+for+Combining].
  */
 
 static VALUE
@@ -5438,7 +5623,7 @@ rb_ary_difference_multi(int argc, VALUE *argv, VALUE ary)
         VALUE elt = rb_ary_elt(ary, i);
         for (j = 0; j < argc; j++) {
             if (is_hash[j]) {
-                if (rb_hash_stlike_lookup(argv[j], RARRAY_AREF(ary, i), NULL))
+                if (rb_hash_stlike_lookup(argv[j], elt, NULL))
                     break;
             }
             else {
@@ -5456,20 +5641,25 @@ rb_ary_difference_multi(int argc, VALUE *argv, VALUE ary)
 
 /*
  *  call-seq:
- *    array & other_array -> new_array
+ *    self & other_array -> new_array
  *
- *  Returns a new \Array containing each element found in both +array+ and \Array +other_array+;
- *  duplicates are omitted; items are compared using <tt>eql?</tt>
- *  (items must also implement +hash+ correctly):
+ *  Returns a new array containing the _intersection_ of +self+ and +other_array+;
+ *  that is, containing those elements found in both +self+ and +other_array+:
  *
  *    [0, 1, 2, 3] & [1, 2] # => [1, 2]
- *    [0, 1, 0, 1] & [0, 1] # => [0, 1]
  *
- *  Preserves order from +array+:
+ *  Omits duplicates:
+ *
+ *    [0, 1, 1, 0] & [0, 1] # => [0, 1]
+ *
+ *  Preserves order from +self+:
  *
  *    [0, 1, 2] & [3, 2, 1, 0] # => [0, 1, 2]
  *
- *  Related: Array#intersection.
+ *  Identifies common elements using method <tt>#eql?</tt>
+ *  (as defined in each element of +self+).
+ *
+ *  Related: see {Methods for Combining}[rdoc-ref:Array@Methods+for+Combining].
  */
 
 
@@ -5509,23 +5699,23 @@ rb_ary_and(VALUE ary1, VALUE ary2)
 
 /*
  *  call-seq:
- *    array.intersection(*other_arrays) -> new_array
+ *    intersection(*other_arrays) -> new_array
  *
- *  Returns a new \Array containing each element found both in +self+
- *  and in all of the given Arrays +other_arrays+;
- *  duplicates are omitted; items are compared using <tt>eql?</tt>
- *  (items must also implement +hash+ correctly):
+ *  Returns a new array containing each element in +self+ that is +#eql?+
+ *  to at least one element in each of the given +other_arrays+;
+ *  duplicates are omitted:
  *
- *    [0, 1, 2, 3].intersection([0, 1, 2], [0, 1, 3]) # => [0, 1]
  *    [0, 0, 1, 1, 2, 3].intersection([0, 1, 2], [0, 1, 3]) # => [0, 1]
  *
- *  Preserves order from +self+:
+ *  Each element must correctly implement method <tt>#hash</tt>.
+ *
+ *  Order from +self+ is preserved:
  *
  *    [0, 1, 2].intersection([2, 1, 0]) # => [0, 1, 2]
  *
- *  Returns a copy of +self+ if no arguments given.
+ *  Returns a copy of +self+ if no arguments are given.
  *
- *  Related: Array#&.
+ *  Related: see {Methods for Combining}[rdoc-ref:Array@Methods+for+Combining].
  */
 
 static VALUE
@@ -5574,9 +5764,9 @@ rb_ary_union_hash(VALUE hash, VALUE ary2)
 
 /*
  *  call-seq:
- *    array | other_array -> new_array
+ *    self | other_array -> new_array
  *
- *  Returns the union of +array+ and \Array +other_array+;
+ *  Returns the union of +self+ and +other_array+;
  *  duplicates are removed; order is preserved;
  *  items are compared using <tt>eql?</tt>:
  *
@@ -5584,7 +5774,7 @@ rb_ary_union_hash(VALUE hash, VALUE ary2)
  *    [0, 1, 1] | [2, 2, 3] # => [0, 1, 2, 3]
  *    [0, 1, 2] | [3, 2, 1, 0] # => [0, 1, 2, 3]
  *
- *  Related: Array#union.
+ *  Related: see {Methods for Combining}[rdoc-ref:Array@Methods+for+Combining].
  */
 
 static VALUE
@@ -5608,18 +5798,25 @@ rb_ary_or(VALUE ary1, VALUE ary2)
 
 /*
  *  call-seq:
- *    array.union(*other_arrays) -> new_array
+ *    union(*other_arrays) -> new_array
  *
- *  Returns a new \Array that is the union of +self+ and all given Arrays +other_arrays+;
- *  duplicates are removed;  order is preserved;  items are compared using <tt>eql?</tt>:
+ *  Returns a new array that is the union of the elements of +self+
+ *  and all given arrays +other_arrays+;
+ *  items are compared using <tt>eql?</tt>:
  *
  *    [0, 1, 2, 3].union([4, 5], [6, 7]) # => [0, 1, 2, 3, 4, 5, 6, 7]
+ *
+ *  Removes duplicates (preserving the first found):
+ *
  *    [0, 1, 1].union([2, 1], [3, 1]) # => [0, 1, 2, 3]
- *    [0, 1, 2, 3].union([3, 2], [1, 0]) # => [0, 1, 2, 3]
  *
- *  Returns a copy of +self+ if no arguments given.
+ *  Preserves order (preserving the position of the first found):
  *
- *  Related: Array#|.
+ *    [3, 2, 1, 0].union([5, 3], [4, 2]) # => [3, 2, 1, 0, 5, 4]
+ *
+ *  With no arguments given, returns a copy of +self+.
+ *
+ *  Related: see {Methods for Combining}[rdoc-ref:Array@Methods+for+Combining].
  */
 
 static VALUE
@@ -5652,19 +5849,16 @@ rb_ary_union_multi(int argc, VALUE *argv, VALUE ary)
 
 /*
  *  call-seq:
- *     ary.intersect?(other_ary)   -> true or false
+ *    intersect?(other_array) -> true or false
  *
- *  Returns +true+ if the array and +other_ary+ have at least one element in
- *  common, otherwise returns +false+:
+ *  Returns whether +other_array+ has at least one element that is +#eql?+ to some element of +self+:
  *
- *     a = [ 1, 2, 3 ]
- *     b = [ 3, 4, 5 ]
- *     c = [ 5, 6, 7 ]
- *     a.intersect?(b)   #=> true
- *     a.intersect?(c)   #=> false
+ *    [1, 2, 3].intersect?([3, 4, 5]) # => true
+ *    [1, 2, 3].intersect?([4, 5, 6]) # => false
  *
- *  Array elements are compared using <tt>eql?</tt>
- *  (items must also implement +hash+ correctly).
+ *  Each element must correctly implement method <tt>#hash</tt>.
+ *
+ *  Related: see {Methods for Querying}[rdoc-ref:Array@Methods+for+Querying].
  */
 
 static VALUE
@@ -5798,42 +5992,51 @@ ary_max_opt_string(VALUE ary, long i, VALUE vmax)
 
 /*
  *  call-seq:
- *    array.max -> element
- *    array.max {|a, b| ... } -> element
- *    array.max(n) -> new_array
- *    array.max(n) {|a, b| ... } -> new_array
+ *    max -> element
+ *    max(count) -> new_array
+ *    max {|a, b| ... } -> element
+ *    max(count) {|a, b| ... } -> new_array
  *
  *  Returns one of the following:
  *
  *  - The maximum-valued element from +self+.
- *  - A new \Array of maximum-valued elements selected from +self+.
+ *  - A new array of maximum-valued elements from +self+.
+ *
+ *  Does not modify +self+.
  *
- *  When no block is given, each element in +self+ must respond to method <tt><=></tt>
- *  with an Integer.
+ *  With no block given, each element in +self+ must respond to method <tt>#<=></tt>
+ *  with a numeric.
  *
  *  With no argument and no block, returns the element in +self+
- *  having the maximum value per method <tt><=></tt>:
+ *  having the maximum value per method <tt>#<=></tt>:
  *
- *    [0, 1, 2].max # => 2
+ *    [1, 0, 3, 2].max # => 3
  *
- *  With an argument Integer +n+ and no block, returns a new \Array with at most +n+ elements,
- *  in descending order per method <tt><=></tt>:
+ *  With non-negative numeric argument +count+ and no block,
+ *  returns a new array with at most +count+ elements,
+ *  in descending order, per method <tt>#<=></tt>:
  *
- *    [0, 1, 2, 3].max(3) # => [3, 2, 1]
- *    [0, 1, 2, 3].max(6) # => [3, 2, 1, 0]
+ *    [1, 0, 3, 2].max(3)   # => [3, 2, 1]
+ *    [1, 0, 3, 2].max(3.0) # => [3, 2, 1]
+ *    [1, 0, 3, 2].max(9)   # => [3, 2, 1, 0]
+ *    [1, 0, 3, 2].max(0)   # => []
  *
- *  When a block is given, the block must return an Integer.
+ *  With a block given, the block must return a numeric.
  *
- *  With a block and no argument, calls the block <tt>self.size-1</tt> times to compare elements;
+ *  With a block and no argument, calls the block <tt>self.size - 1</tt> times to compare elements;
  *  returns the element having the maximum value per the block:
  *
- *    ['0', '00', '000'].max {|a, b| a.size <=> b.size } # => "000"
+ *    ['0', '', '000', '00'].max {|a, b| a.size <=> b.size }
+ *    # => "000"
  *
- *  With an argument +n+ and a block, returns a new \Array with at most +n+ elements,
- *  in descending order per the block:
+ *  With non-negative numeric argument +count+ and a block,
+ *  returns a new array with at most +count+ elements,
+ *  in descending order, per the block:
  *
- *    ['0', '00', '000'].max(2) {|a, b| a.size <=> b.size } # => ["000", "00"]
+ *    ['0', '', '000', '00'].max(2) {|a, b| a.size <=> b.size }
+ *    # => ["000", "00"]
  *
+ *  Related: see {Methods for Fetching}[rdoc-ref:Array@Methods+for+Fetching].
  */
 static VALUE
 rb_ary_max(int argc, VALUE *argv, VALUE ary)
@@ -5966,42 +6169,51 @@ ary_min_opt_string(VALUE ary, long i, VALUE vmin)
 
 /*
  *  call-seq:
- *    array.min -> element
- *    array.min { |a, b| ... } -> element
- *    array.min(n) -> new_array
- *    array.min(n) { |a, b| ... } -> new_array
+ *    min -> element
+ *    min(count) -> new_array
+ *    min {|a, b| ... } -> element
+ *    min(count) {|a, b| ... } -> new_array
  *
  *  Returns one of the following:
  *
  *  - The minimum-valued element from +self+.
- *  - A new \Array of minimum-valued elements selected from +self+.
+ *  - A new array of minimum-valued elements from +self+.
  *
- *  When no block is given, each element in +self+ must respond to method <tt><=></tt>
- *  with an Integer.
+ *  Does not modify +self+.
+ *
+ *  With no block given, each element in +self+ must respond to method <tt>#<=></tt>
+ *  with a numeric.
  *
  *  With no argument and no block, returns the element in +self+
- *  having the minimum value per method <tt><=></tt>:
+ *  having the minimum value per method <tt>#<=></tt>:
  *
- *    [0, 1, 2].min # => 0
+ *    [1, 0, 3, 2].min # => 0
  *
- *  With Integer argument +n+ and no block, returns a new \Array with at most +n+ elements,
- *  in ascending order per method <tt><=></tt>:
+ *  With non-negative numeric argument +count+ and no block,
+ *  returns a new array with at most +count+ elements,
+ *  in ascending order, per method <tt>#<=></tt>:
  *
- *    [0, 1, 2, 3].min(3) # => [0, 1, 2]
- *    [0, 1, 2, 3].min(6) # => [0, 1, 2, 3]
+ *    [1, 0, 3, 2].min(3)   # => [0, 1, 2]
+ *    [1, 0, 3, 2].min(3.0) # => [0, 1, 2]
+ *    [1, 0, 3, 2].min(9)   # => [0, 1, 2, 3]
+ *    [1, 0, 3, 2].min(0)   # => []
  *
- *  When a block is given, the block must return an Integer.
+ *  With a block given, the block must return a numeric.
  *
- *  With a block and no argument, calls the block <tt>self.size-1</tt> times to compare elements;
+ *  With a block and no argument, calls the block <tt>self.size - 1</tt> times to compare elements;
  *  returns the element having the minimum value per the block:
  *
- *    ['0', '00', '000'].min { |a, b| a.size <=> b.size } # => "0"
+ *    ['0', '', '000', '00'].min {|a, b| a.size <=> b.size }
+ *    # => ""
  *
- *  With an argument +n+ and a block, returns a new \Array with at most +n+ elements,
- *  in ascending order per the block:
+ *  With non-negative numeric argument +count+ and a block,
+ *  returns a new array with at most +count+ elements,
+ *  in ascending order, per the block:
  *
- *    ['0', '00', '000'].min(2) {|a, b| a.size <=> b.size } # => ["0", "00"]
+ *    ['0', '', '000', '00'].min(2) {|a, b| a.size <=> b.size }
+ *    # => ["", "0"]
  *
+ *  Related: see {Methods for Fetching}[rdoc-ref:Array@Methods+for+Fetching].
  */
 static VALUE
 rb_ary_min(int argc, VALUE *argv, VALUE ary)
@@ -6045,26 +6257,25 @@ rb_ary_min(int argc, VALUE *argv, VALUE ary)
 
 /*
  *  call-seq:
- *    array.minmax -> [min_val, max_val]
- *    array.minmax {|a, b| ... } -> [min_val, max_val]
+ *    minmax -> array
+ *    minmax {|a, b| ... } -> array
  *
- *  Returns a new 2-element \Array containing the minimum and maximum values
- *  from +self+, either per method <tt><=></tt> or per a given block:.
+ *  Returns a 2-element array containing the minimum-valued and maximum-valued
+ *  elements from +self+;
+ *  does not modify +self+.
  *
- *  When no block is given, each element in +self+ must respond to method <tt><=></tt>
- *  with an Integer;
- *  returns a new 2-element \Array containing the minimum and maximum values
- *  from +self+, per method <tt><=></tt>:
+ *  With no block given, the minimum and maximum values are determined using method <tt>#<=></tt>:
  *
- *    [0, 1, 2].minmax # => [0, 2]
+ *    [1, 0, 3, 2].minmax # => [0, 3]
  *
- *  When a block is given, the block must return an Integer;
- *  the block is called <tt>self.size-1</tt> times to compare elements;
- *  returns a new 2-element \Array containing the minimum and maximum values
- *  from +self+, per the block:
+ *  With a block given, the block must return a numeric;
+ *  the block is called <tt>self.size - 1</tt> times to compare elements;
+ *  returns the elements having the minimum and maximum values per the block:
  *
- *    ['0', '00', '000'].minmax {|a, b| a.size <=> b.size } # => ["0", "000"]
+ *    ['0', '', '000', '00'].minmax {|a, b| a.size <=> b.size }
+ *    # => ["", "000"]
  *
+ *  Related: see {Methods for Fetching}[rdoc-ref:Array@Methods+for+Fetching].
  */
 static VALUE
 rb_ary_minmax(VALUE ary)
@@ -6084,32 +6295,30 @@ push_value(st_data_t key, st_data_t val, st_data_t ary)
 
 /*
  *  call-seq:
- *    array.uniq! -> self or nil
- *    array.uniq! {|element| ... } -> self or nil
+ *    uniq! -> self or nil
+ *    uniq! {|element| ... } -> self or nil
  *
  *  Removes duplicate elements from +self+, the first occurrence always being retained;
  *  returns +self+ if any elements removed, +nil+ otherwise.
  *
  *  With no block given, identifies and removes elements using method <tt>eql?</tt>
- *  to compare.
- *
- *  Returns +self+ if any elements removed:
+ *  to compare elements:
  *
  *    a = [0, 0, 1, 1, 2, 2]
  *    a.uniq! # => [0, 1, 2]
- *
- *  Returns +nil+ if no elements removed.
+ *    a.uniq! # => nil
  *
  *  With a block given, calls the block for each element;
- *  identifies (using method <tt>eql?</tt>) and removes
- *  elements for which the block returns duplicate values.
- *
- *  Returns +self+ if any elements removed:
+ *  identifies and omits "duplicate" elements using method <tt>eql?</tt>
+ *  to compare <i>block return values</i>;
+ *  that is, an element is a duplicate if its block return value
+ *  is the same as that of a previous element:
  *
  *    a = ['a', 'aa', 'aaa', 'b', 'bb', 'bbb']
- *    a.uniq! {|element| element.size } # => ['a', 'aa', 'aaa']
+ *    a.uniq! {|element| element.size } # => ["a", "aa", "aaa"]
+ *    a.uniq! {|element| element.size } # => nil
  *
- *  Returns +nil+ if no elements removed.
+ *  Related: see {Methods for Deleting}[rdoc-ref:Array@Methods+for+Deleting].
  */
 static VALUE
 rb_ary_uniq_bang(VALUE ary)
@@ -6131,7 +6340,7 @@ rb_ary_uniq_bang(VALUE ary)
     }
     rb_ary_modify_check(ary);
     ARY_SET_LEN(ary, 0);
-    if (ARY_SHARED_P(ary) && !ARY_EMBED_P(ary)) {
+    if (ARY_SHARED_P(ary)) {
         rb_ary_unshare(ary);
         FL_SET_EMBED(ary);
     }
@@ -6143,25 +6352,28 @@ rb_ary_uniq_bang(VALUE ary)
 
 /*
  *  call-seq:
- *    array.uniq -> new_array
- *    array.uniq {|element| ... } -> new_array
+ *    uniq -> new_array
+ *    uniq {|element| ... } -> new_array
  *
- *  Returns a new \Array containing those elements from +self+ that are not duplicates,
+ *  Returns a new array containing those elements from +self+ that are not duplicates,
  *  the first occurrence always being retained.
  *
- *  With no block given, identifies and omits duplicates using method <tt>eql?</tt>
- *  to compare:
+ *  With no block given, identifies and omits duplicate elements using method <tt>eql?</tt>
+ *  to compare elements:
  *
  *    a = [0, 0, 1, 1, 2, 2]
  *    a.uniq # => [0, 1, 2]
  *
  *  With a block given, calls the block for each element;
- *  identifies (using method <tt>eql?</tt>) and omits duplicate values,
- *  that is, those elements for which the block returns the same value:
+ *  identifies and omits "duplicate" elements using method <tt>eql?</tt>
+ *  to compare <i>block return values</i>;
+ *  that is, an element is a duplicate if its block return value
+ *  is the same as that of a previous element:
  *
  *    a = ['a', 'aa', 'aaa', 'b', 'bb', 'bbb']
  *    a.uniq {|element| element.size } # => ["a", "aa", "aaa"]
  *
+ *  Related: {Methods for Fetching}[rdoc-ref:Array@Methods+for+Fetching].
  */
 
 static VALUE
@@ -6187,11 +6399,18 @@ rb_ary_uniq(VALUE ary)
 
 /*
  *  call-seq:
- *    array.compact! -> self or nil
+ *    compact! -> self or nil
+ *
+ *  Removes all +nil+ elements from +self+;
+ *  Returns +self+ if any elements are removed, +nil+ otherwise:
  *
- *  Removes all +nil+ elements from +self+.
+ *    a = [nil, 0, nil, false, nil, '', nil, [], nil, {}]
+ *    a.compact! # => [0, false, "", [], {}]
+ *    a          # => [0, false, "", [], {}]
+ *    a.compact! # => nil
  *
- *  Returns +self+ if any elements removed, otherwise +nil+.
+ *  Related: Array#compact;
+ *  see also {Methods for Deleting}[rdoc-ref:Array@Methods+for+Deleting].
  */
 
 static VALUE
@@ -6219,12 +6438,16 @@ rb_ary_compact_bang(VALUE ary)
 
 /*
  *  call-seq:
- *    array.compact -> new_array
+ *    compact -> new_array
+ *
+ *  Returns a new array containing only the non-+nil+ elements from +self+;
+ *  element order is preserved:
  *
- *  Returns a new \Array containing all non-+nil+ elements from +self+:
+ *    a = [nil, 0, nil, false, nil, '', nil, [], nil, {}]
+ *    a.compact # => [0, false, "", [], {}]
  *
- *    a = [nil, 0, nil, 1, nil, 2, nil]
- *    a.compact # => [0, 1, 2]
+ *  Related: Array#compact!;
+ *  see also {Methods for Deleting}[rdoc-ref:Array@Methods+for+Deleting].
  */
 
 static VALUE
@@ -6237,29 +6460,29 @@ rb_ary_compact(VALUE ary)
 
 /*
  *  call-seq:
- *    array.count -> an_integer
- *    array.count(obj) -> an_integer
- *    array.count {|element| ... } -> an_integer
+ *    count -> integer
+ *    count(object) -> integer
+ *    count {|element| ... } -> integer
  *
  *  Returns a count of specified elements.
  *
  *  With no argument and no block, returns the count of all elements:
  *
- *    [0, 1, 2].count # => 3
- *    [].count # => 0
+ *    [0, :one, 'two', 3, 3.0].count # => 5
  *
- *  With argument +obj+, returns the count of elements <tt>==</tt> to +obj+:
+ *  With argument +object+ given, returns the count of elements <tt>==</tt> to +object+:
  *
- *    [0, 1, 2, 0.0].count(0) # => 2
- *    [0, 1, 2].count(3) # => 0
+ *    [0, :one, 'two', 3, 3.0].count(3) # => 2
  *
  *  With no argument and a block given, calls the block with each element;
  *  returns the count of elements for which the block returns a truthy value:
  *
- *    [0, 1, 2, 3].count {|element| element > 1} # => 2
+ *    [0, 1, 2, 3].count {|element| element > 1 } # => 2
  *
- *  With argument +obj+ and a block given, issues a warning, ignores the block,
- *  and returns the count of elements <tt>==</tt> to +obj+.
+ *  With argument +object+ and a block given, issues a warning, ignores the block,
+ *  and returns the count of elements <tt>==</tt> to +object+.
+ *
+ *  Related: see {Methods for Querying}[rdoc-ref:Array@Methods+for+Querying].
  */
 
 static VALUE
@@ -6295,16 +6518,9 @@ rb_ary_count(int argc, VALUE *argv, VALUE ary)
 static VALUE
 flatten(VALUE ary, int level)
 {
-    static const rb_data_type_t flatten_memo_data_type = {
-        .wrap_struct_name = "array_flatten_memo_data_type",
-        .function = { NULL, (RUBY_DATA_FUNC)st_free_table },
-        NULL, NULL, RUBY_TYPED_FREE_IMMEDIATELY | RUBY_TYPED_WB_PROTECTED
-    };
-
     long i;
-    VALUE stack, result, tmp = 0, elt, vmemo;
-    st_table *memo = 0;
-    st_data_t id;
+    VALUE stack, result, tmp = 0, elt;
+    VALUE memo = Qfalse;
 
     for (i = 0; i < RARRAY_LEN(ary); i++) {
         elt = RARRAY_AREF(ary, i);
@@ -6326,10 +6542,9 @@ flatten(VALUE ary, int level)
     rb_ary_push(stack, LONG2NUM(i + 1));
 
     if (level < 0) {
-        memo = st_init_numtable();
-        vmemo = TypedData_Wrap_Struct(0, &flatten_memo_data_type, memo);
-        st_insert(memo, (st_data_t)ary, (st_data_t)Qtrue);
-        st_insert(memo, (st_data_t)tmp, (st_data_t)Qtrue);
+        memo = rb_obj_hide(rb_ident_hash_new());
+        rb_hash_aset(memo, ary, Qtrue);
+        rb_hash_aset(memo, tmp, Qtrue);
     }
 
     ary = tmp;
@@ -6344,9 +6559,8 @@ flatten(VALUE ary, int level)
             }
             tmp = rb_check_array_type(elt);
             if (RBASIC(result)->klass) {
-                if (memo) {
-                    RB_GC_GUARD(vmemo);
-                    st_clear(memo);
+                if (RTEST(memo)) {
+                    rb_hash_clear(memo);
                 }
                 rb_raise(rb_eRuntimeError, "flatten reentered");
             }
@@ -6355,12 +6569,11 @@ flatten(VALUE ary, int level)
             }
             else {
                 if (memo) {
-                    id = (st_data_t)tmp;
-                    if (st_is_member(memo, id)) {
-                        st_clear(memo);
+                    if (rb_hash_aref(memo, tmp) == Qtrue) {
+                        rb_hash_clear(memo);
                         rb_raise(rb_eArgError, "tried to flatten recursive array");
                     }
-                    st_insert(memo, id, (st_data_t)Qtrue);
+                    rb_hash_aset(memo, tmp, Qtrue);
                 }
                 rb_ary_push(stack, ary);
                 rb_ary_push(stack, LONG2NUM(i));
@@ -6372,8 +6585,7 @@ flatten(VALUE ary, int level)
             break;
         }
         if (memo) {
-            id = (st_data_t)ary;
-            st_delete(memo, &id, 0);
+            rb_hash_delete(memo, ary);
         }
         tmp = rb_ary_pop(stack);
         i = NUM2LONG(tmp);
@@ -6381,7 +6593,7 @@ flatten(VALUE ary, int level)
     }
 
     if (memo) {
-        st_clear(memo);
+        rb_hash_clear(memo);
     }
 
     RBASIC_SET_CLASS(result, rb_cArray);
@@ -6390,33 +6602,37 @@ flatten(VALUE ary, int level)
 
 /*
  *  call-seq:
- *    array.flatten! -> self or nil
- *    array.flatten!(level) -> self or nil
+ *    flatten!(depth = nil) -> self or nil
+ *
+ *  Returns +self+ as a recursively flattening of +self+ to +depth+ levels of recursion;
+ *  +depth+ must be an
+ *  {integer-convertible object}[rdoc-ref:implicit_conversion.rdoc@Integer-Convertible+Objects],
+ *  or +nil+.
+ *  At each level of recursion:
  *
- *  Replaces each nested \Array in +self+ with the elements from that \Array;
- *  returns +self+ if any changes, +nil+ otherwise.
+ *  - Each element that is an array is "flattened"
+ *    (that is, replaced by its individual array elements).
+ *  - Each element that is not an array is unchanged
+ *    (even if the element is an object that has instance method +flatten+).
  *
- *  With non-negative Integer argument +level+, flattens recursively through +level+ levels:
+ *  Returns +nil+ if no elements were flattened.
  *
- *    a = [ 0, [ 1, [2, 3], 4 ], 5 ]
- *    a.flatten!(1) # => [0, 1, [2, 3], 4, 5]
- *    a = [ 0, [ 1, [2, 3], 4 ], 5 ]
- *    a.flatten!(2) # => [0, 1, 2, 3, 4, 5]
- *    a = [ 0, [ 1, [2, 3], 4 ], 5 ]
- *    a.flatten!(3) # => [0, 1, 2, 3, 4, 5]
- *    [0, 1, 2].flatten!(1) # => nil
+ *  With non-negative integer argument +depth+, flattens recursively through +depth+ levels:
  *
- *  With no argument, a +nil+ argument, or with negative argument +level+, flattens all levels:
+ *    a = [ 0, [ 1, [2, 3], 4 ], 5, {foo: 0}, Set.new([6, 7]) ]
+ *    a                   # => [0, [1, [2, 3], 4], 5, {:foo=>0}, #<Set: {6, 7}>]
+ *    a.dup.flatten!(1)   # => [0, 1, [2, 3], 4, 5, {:foo=>0}, #<Set: {6, 7}>]
+ *    a.dup.flatten!(1.1) # => [0, 1, [2, 3], 4, 5, {:foo=>0}, #<Set: {6, 7}>]
+ *    a.dup.flatten!(2)   # => [0, 1, 2, 3, 4, 5, {:foo=>0}, #<Set: {6, 7}>]
+ *    a.dup.flatten!(3)   # => [0, 1, 2, 3, 4, 5, {:foo=>0}, #<Set: {6, 7}>]
  *
- *    a = [ 0, [ 1, [2, 3], 4 ], 5 ]
- *    a.flatten! # => [0, 1, 2, 3, 4, 5]
- *    [0, 1, 2].flatten! # => nil
- *    a = [ 0, [ 1, [2, 3], 4 ], 5 ]
- *    a.flatten!(-1) # => [0, 1, 2, 3, 4, 5]
- *    a = [ 0, [ 1, [2, 3], 4 ], 5 ]
- *    a.flatten!(-2) # => [0, 1, 2, 3, 4, 5]
- *    [0, 1, 2].flatten!(-1) # => nil
+ *  With +nil+ or negative argument +depth+, flattens all levels:
  *
+ *    a.dup.flatten!     # => [0, 1, 2, 3, 4, 5, {:foo=>0}, #<Set: {6, 7}>]
+ *    a.dup.flatten!(-1) # => [0, 1, 2, 3, 4, 5, {:foo=>0}, #<Set: {6, 7}>]
+ *
+ *  Related: Array#flatten;
+ *  see also {Methods for Assigning}[rdoc-ref:Array@Methods+for+Assigning].
  */
 
 static VALUE
@@ -6434,7 +6650,7 @@ rb_ary_flatten_bang(int argc, VALUE *argv, VALUE ary)
     if (result == ary) {
         return Qnil;
     }
-    if (!(mod = ARY_EMBED_P(result))) rb_obj_freeze(result);
+    if (!(mod = ARY_EMBED_P(result))) rb_ary_freeze(result);
     rb_ary_replace(ary, result);
     if (mod) ARY_SET_EMBED_LEN(result, 0);
 
@@ -6443,35 +6659,37 @@ rb_ary_flatten_bang(int argc, VALUE *argv, VALUE ary)
 
 /*
  *  call-seq:
- *    array.flatten -> new_array
- *    array.flatten(level) -> new_array
- *
- *  Returns a new \Array that is a recursive flattening of +self+:
- *  - Each non-Array element is unchanged.
- *  - Each \Array is replaced by its individual elements.
- *
- *  With non-negative Integer argument +level+, flattens recursively through +level+ levels:
- *
- *    a = [ 0, [ 1, [2, 3], 4 ], 5 ]
- *    a.flatten(0) # => [0, [1, [2, 3], 4], 5]
- *    a = [ 0, [ 1, [2, 3], 4 ], 5 ]
- *    a.flatten(1) # => [0, 1, [2, 3], 4, 5]
- *    a = [ 0, [ 1, [2, 3], 4 ], 5 ]
- *    a.flatten(2) # => [0, 1, 2, 3, 4, 5]
- *    a = [ 0, [ 1, [2, 3], 4 ], 5 ]
- *    a.flatten(3) # => [0, 1, 2, 3, 4, 5]
- *
- *  With no argument, a +nil+ argument, or with negative argument +level+, flattens all levels:
- *
- *    a = [ 0, [ 1, [2, 3], 4 ], 5 ]
- *    a.flatten # => [0, 1, 2, 3, 4, 5]
- *    [0, 1, 2].flatten # => [0, 1, 2]
- *    a = [ 0, [ 1, [2, 3], 4 ], 5 ]
- *    a.flatten(-1) # => [0, 1, 2, 3, 4, 5]
- *    a = [ 0, [ 1, [2, 3], 4 ], 5 ]
- *    a.flatten(-2) # => [0, 1, 2, 3, 4, 5]
- *    [0, 1, 2].flatten(-1) # => [0, 1, 2]
+ *    flatten(depth = nil) -> new_array
+ *
+ *  Returns a new array that is a recursive flattening of +self+
+ *  to +depth+ levels of recursion;
+ *  +depth+ must be an
+ *  {integer-convertible object}[rdoc-ref:implicit_conversion.rdoc@Integer-Convertible+Objects]
+ *  or +nil+.
+ *  At each level of recursion:
  *
+ *  - Each element that is an array is "flattened"
+ *    (that is, replaced by its individual array elements).
+ *  - Each element that is not an array is unchanged
+ *    (even if the element is an object that has instance method +flatten+).
+ *
+ *  With non-negative integer argument +depth+, flattens recursively through +depth+ levels:
+ *
+ *    a = [ 0, [ 1, [2, 3], 4 ], 5, {foo: 0}, Set.new([6, 7]) ]
+ *    a              # => [0, [1, [2, 3], 4], 5, {:foo=>0}, #<Set: {6, 7}>]
+ *    a.flatten(0)   # => [0, [1, [2, 3], 4], 5, {:foo=>0}, #<Set: {6, 7}>]
+ *    a.flatten(1  ) # => [0, 1, [2, 3], 4, 5, {:foo=>0}, #<Set: {6, 7}>]
+ *    a.flatten(1.1) # => [0, 1, [2, 3], 4, 5, {:foo=>0}, #<Set: {6, 7}>]
+ *    a.flatten(2)   # => [0, 1, 2, 3, 4, 5, {:foo=>0}, #<Set: {6, 7}>]
+ *    a.flatten(3)   # => [0, 1, 2, 3, 4, 5, {:foo=>0}, #<Set: {6, 7}>]
+ *
+ *  With +nil+ or negative +depth+, flattens all levels.
+ *
+ *    a.flatten     # => [0, 1, 2, 3, 4, 5, {:foo=>0}, #<Set: {6, 7}>]
+ *    a.flatten(-1) # => [0, 1, 2, 3, 4, 5, {:foo=>0}, #<Set: {6, 7}>]
+ *
+ *  Related: Array#flatten!;
+ *  see also {Methods for Converting}[rdoc-ref:Array@Methods+for+Converting].
  */
 
 static VALUE
@@ -6503,7 +6721,7 @@ rb_ary_shuffle_bang(rb_execution_context_t *ec, VALUE ary, VALUE randgen)
     rb_ary_modify(ary);
     i = len = RARRAY_LEN(ary);
     RARRAY_PTR_USE(ary, ptr, {
-        while (i) {
+        while (i > 1) {
             long j = RAND_UPTO(i);
             VALUE tmp;
             if (len != RARRAY_LEN(ary) || ptr != RARRAY_CONST_PTR(ary)) {
@@ -6525,6 +6743,14 @@ rb_ary_shuffle(rb_execution_context_t *ec, VALUE ary, VALUE randgen)
     return ary;
 }
 
+static const rb_data_type_t ary_sample_memo_type = {
+    .wrap_struct_name = "ary_sample_memo",
+    .function = {
+        .dfree = (RUBY_DATA_FUNC)st_free_table,
+    },
+    .flags = RUBY_TYPED_WB_PROTECTED | RUBY_TYPED_FREE_IMMEDIATELY
+};
+
 static VALUE
 ary_sample(rb_execution_context_t *ec, VALUE ary, VALUE randgen, VALUE nv, VALUE to_array)
 {
@@ -6606,11 +6832,9 @@ ary_sample(rb_execution_context_t *ec, VALUE ary, VALUE randgen, VALUE nv, VALUE
     }
     else if (n <= memo_threshold / 2) {
         long max_idx = 0;
-#undef RUBY_UNTYPED_DATA_WARNING
-#define RUBY_UNTYPED_DATA_WARNING 0
-        VALUE vmemo = Data_Wrap_Struct(0, 0, st_free_table, 0);
+        VALUE vmemo = TypedData_Wrap_Struct(0, &ary_sample_memo_type, 0);
         st_table *memo = st_init_numtable_with_size(n);
-        DATA_PTR(vmemo) = memo;
+        RTYPEDDATA_DATA(vmemo) = memo;
         result = rb_ary_new_capa(n);
         RARRAY_PTR_USE(result, ptr_result, {
             for (i=0; i<n; i++) {
@@ -6633,8 +6857,9 @@ ary_sample(rb_execution_context_t *ec, VALUE ary, VALUE randgen, VALUE nv, VALUE
                 }
             });
         });
-        DATA_PTR(vmemo) = 0;
+        RTYPEDDATA_DATA(vmemo) = 0;
         st_free_table(memo);
+        RB_GC_GUARD(vmemo);
     }
     else {
         result = rb_ary_dup(ary);
@@ -6655,6 +6880,12 @@ ary_sample(rb_execution_context_t *ec, VALUE ary, VALUE randgen, VALUE nv, VALUE
     return result;
 }
 
+static VALUE
+ary_sized_alloc(rb_execution_context_t *ec, VALUE self)
+{
+    return rb_ary_new2(RARRAY_LEN(self));
+}
+
 static VALUE
 ary_sample0(rb_execution_context_t *ec, VALUE ary)
 {
@@ -6679,36 +6910,36 @@ rb_ary_cycle_size(VALUE self, VALUE args, VALUE eobj)
 
 /*
  *  call-seq:
- *    array.cycle {|element| ... } -> nil
- *    array.cycle(count) {|element| ... } -> nil
- *    array.cycle -> new_enumerator
- *    array.cycle(count) -> new_enumerator
+ *    cycle(count = nil) {|element| ... } -> nil
+ *    cycle(count = nil) -> new_enumerator
  *
- *  When called with positive Integer argument +count+ and a block,
- *  calls the block with each element, then does so again,
+ *  With a block given, may call the block, depending on the value of argument +count+;
+ *  +count+ must be an
+ *  {integer-convertible object}[rdoc-ref:implicit_conversion.rdoc@Integer-Convertible+Objects],
+ *  or +nil+.
+ *
+ *  When +count+ is positive,
+ *  calls the block with each element, then does so repeatedly,
  *  until it has done so +count+ times; returns +nil+:
  *
  *    output = []
  *    [0, 1].cycle(2) {|element| output.push(element) } # => nil
  *    output # => [0, 1, 0, 1]
  *
- *  If +count+ is zero or negative, does not call the block:
+ *  When +count+ is zero or negative, does not call the block:
  *
- *    [0, 1].cycle(0) {|element| fail 'Cannot happen' } # => nil
+ *    [0, 1].cycle(0) {|element| fail 'Cannot happen' }  # => nil
  *    [0, 1].cycle(-1) {|element| fail 'Cannot happen' } # => nil
  *
- *  When a block is given, and argument is omitted or +nil+, cycles forever:
+ *  When +count+ is +nil+, cycles forever:
  *
  *    # Prints 0 and 1 forever.
  *    [0, 1].cycle {|element| puts element }
  *    [0, 1].cycle(nil) {|element| puts element }
  *
- *  When no block is given, returns a new Enumerator:
- *
- *    [0, 1].cycle(2) # => #<Enumerator: [0, 1]:cycle(2)>
- *    [0, 1].cycle # => # => #<Enumerator: [0, 1]:cycle>
- *    [0, 1].cycle.first(5) # => [0, 1, 0, 1, 0]
+ *  With no block given, returns a new Enumerator.
  *
+ *  Related: see {Methods for Iterating}[rdoc-ref:Array@Methods+for+Iterating].
  */
 static VALUE
 rb_ary_cycle(int argc, VALUE *argv, VALUE ary)
@@ -6852,82 +7083,44 @@ rb_ary_permutation_size(VALUE ary, VALUE args, VALUE eobj)
 
 /*
  *  call-seq:
- *    array.permutation {|element| ... } -> self
- *    array.permutation(n) {|element| ... } -> self
- *    array.permutation -> new_enumerator
- *    array.permutation(n) -> new_enumerator
+ *    permutation(count = self.size) {|permutation| ... } -> self
+ *    permutation(count = self.size) -> new_enumerator
  *
- *  When invoked with a block, yield all permutations of elements of +self+; returns +self+.
- *  The order of permutations is indeterminate.
+ *  Iterates over permutations of the elements of +self+;
+ *  the order of permutations is indeterminate.
  *
- *  When a block and an in-range positive Integer argument +n+ (<tt>0 < n <= self.size</tt>)
- *  are given, calls the block with all +n+-tuple permutations of +self+.
- *
- *  Example:
- *
- *    a = [0, 1, 2]
- *    a.permutation(2) {|permutation| p permutation }
- *
- *  Output:
- *
- *    [0, 1]
- *    [0, 2]
- *    [1, 0]
- *    [1, 2]
- *    [2, 0]
- *    [2, 1]
- *
- *  Another example:
+ *  With a block and an in-range positive integer argument +count+ (<tt>0 < count <= self.size</tt>) given,
+ *  calls the block with each permutation of +self+ of size +count+;
+ *  returns +self+:
  *
  *    a = [0, 1, 2]
- *    a.permutation(3) {|permutation| p permutation }
+ *    perms = []
+ *    a.permutation(1) {|perm| perms.push(perm) }
+ *    perms # => [[0], [1], [2]]
  *
- *  Output:
- *
- *    [0, 1, 2]
- *    [0, 2, 1]
- *    [1, 0, 2]
- *    [1, 2, 0]
- *    [2, 0, 1]
- *    [2, 1, 0]
+ *    perms = []
+ *    a.permutation(2) {|perm| perms.push(perm) }
+ *    perms # => [[0, 1], [0, 2], [1, 0], [1, 2], [2, 0], [2, 1]]
  *
- *  When +n+ is zero, calls the block once with a new empty \Array:
- *
- *    a = [0, 1, 2]
- *    a.permutation(0) {|permutation| p permutation }
+ *    perms = []
+ *    a.permutation(3) {|perm| perms.push(perm) }
+ *    perms # => [[0, 1, 2], [0, 2, 1], [1, 0, 2], [1, 2, 0], [2, 0, 1], [2, 1, 0]]
  *
- *  Output:
+ *  When +count+ is zero, calls the block once with a new empty array:
  *
- *    []
+ *    perms = []
+ *    a.permutation(0) {|perm| perms.push(perm) }
+ *    perms # => [[]]
  *
- *  When +n+ is out of range (negative or larger than <tt>self.size</tt>),
+ *  When +count+ is out of range (negative or larger than <tt>self.size</tt>),
  *  does not call the block:
  *
- *    a = [0, 1, 2]
  *    a.permutation(-1) {|permutation| fail 'Cannot happen' }
  *    a.permutation(4) {|permutation| fail 'Cannot happen' }
  *
- *  When a block given but no argument,
- *  behaves the same as <tt>a.permutation(a.size)</tt>:
- *
- *    a = [0, 1, 2]
- *    a.permutation {|permutation| p permutation }
- *
- *  Output:
- *
- *    [0, 1, 2]
- *    [0, 2, 1]
- *    [1, 0, 2]
- *    [1, 2, 0]
- *    [2, 0, 1]
- *    [2, 1, 0]
- *
- *  Returns a new Enumerator if no block given:
- *
- *    a = [0, 1, 2]
- *    a.permutation # => #<Enumerator: [0, 1, 2]:permutation>
- *    a.permutation(2) # => #<Enumerator: [0, 1, 2]:permutation(2)>
+ *  With no block given, returns a new Enumerator.
  *
+ *  Related: {Methods for Iterating}[rdoc-ref:Array@Methods+for+Iterating].
  */
 
 static VALUE
@@ -7000,56 +7193,46 @@ rb_ary_combination_size(VALUE ary, VALUE args, VALUE eobj)
 
 /*
  *  call-seq:
- *    array.combination(n) {|element| ... } -> self
- *    array.combination(n) -> new_enumerator
- *
- *  Calls the block, if given, with combinations of elements of +self+;
- *  returns +self+. The order of combinations is indeterminate.
+ *    combination(count) {|element| ... } -> self
+ *    combination(count) -> new_enumerator
  *
- *  When a block and an in-range positive Integer argument +n+ (<tt>0 < n <= self.size</tt>)
- *  are given, calls the block with all +n+-tuple combinations of +self+.
- *
- *  Example:
+ *  When a block and a positive
+ *  {integer-convertible object}[rdoc-ref:implicit_conversion.rdoc@Integer-Convertible+Objects]
+ *  argument +count+ (<tt>0 < count <= self.size</tt>)
+ *  are given, calls the block with each combination of +self+ of size +count+;
+ *  returns +self+:
  *
- *    a = [0, 1, 2]
- *    a.combination(2) {|combination| p combination }
+ *    a = %w[a b c]                                   # => ["a", "b", "c"]
+ *    a.combination(2) {|combination| p combination } # => ["a", "b", "c"]
  *
  *  Output:
  *
- *    [0, 1]
- *    [0, 2]
- *    [1, 2]
+ *    ["a", "b"]
+ *    ["a", "c"]
+ *    ["b", "c"]
  *
- *  Another example:
+ *  The order of the yielded combinations is not guaranteed.
  *
- *    a = [0, 1, 2]
- *    a.combination(3) {|combination| p combination }
+ *  When +count+ is zero, calls the block once with a new empty array:
  *
- *  Output:
- *
- *    [0, 1, 2]
- *
- *  When +n+ is zero, calls the block once with a new empty \Array:
- *
- *    a = [0, 1, 2]
- *    a1 = a.combination(0) {|combination| p combination }
+ *    a.combination(0) {|combination| p combination }
+ *    [].combination(0) {|combination| p combination }
  *
  *  Output:
  *
  *    []
+ *    []
  *
- *  When +n+ is out of range (negative or larger than <tt>self.size</tt>),
+ *  When +count+ is negative or larger than +self.size+ and +self+ is non-empty,
  *  does not call the block:
  *
- *    a = [0, 1, 2]
- *    a.combination(-1) {|combination| fail 'Cannot happen' }
- *    a.combination(4) {|combination| fail 'Cannot happen' }
- *
- *  Returns a new Enumerator if no block given:
+ *    a.combination(-1) {|combination| fail 'Cannot happen' } # => ["a", "b", "c"]
+ *    a.combination(4)  {|combination| fail 'Cannot happen' } # => ["a", "b", "c"]
  *
- *    a = [0, 1, 2]
- *    a.combination(2) # => #<Enumerator: [0, 1, 2]:combination(2)>
+ *  With no block given, returns a new Enumerator.
  *
+ *  Related: Array#permutation;
+ *  see also {Methods for Iterating}[rdoc-ref:Array@Methods+for+Iterating].
  */
 
 static VALUE
@@ -7136,68 +7319,41 @@ rb_ary_repeated_permutation_size(VALUE ary, VALUE args, VALUE eobj)
 
 /*
  *  call-seq:
- *    array.repeated_permutation(n) {|permutation| ... } -> self
- *    array.repeated_permutation(n) -> new_enumerator
+ *    repeated_permutation(size) {|permutation| ... } -> self
+ *    repeated_permutation(size) -> new_enumerator
  *
- *  Calls the block with each repeated permutation of length +n+ of the elements of +self+;
- *  each permutation is an \Array;
+ *  With a block given, calls the block with each repeated permutation of length +size+
+ *  of the elements of +self+;
+ *  each permutation is an array;
  *  returns +self+. The order of the permutations is indeterminate.
  *
- *  When a block and a positive Integer argument +n+ are given, calls the block with each
- *  +n+-tuple repeated permutation of the elements of +self+.
- *  The number of permutations is <tt>self.size**n</tt>.
+ *  If a positive integer argument +size+ is given,
+ *  calls the block with each +size+-tuple repeated permutation of the elements of +self+.
+ *  The number of permutations is <tt>self.size**size</tt>.
  *
- *  +n+ = 1:
- *
- *    a = [0, 1, 2]
- *    a.repeated_permutation(1) {|permutation| p permutation }
- *
- *  Output:
- *
- *    [0]
- *    [1]
- *    [2]
- *
- *  +n+ = 2:
- *
- *    a.repeated_permutation(2) {|permutation| p permutation }
- *
- *  Output:
+ *  Examples:
  *
- *    [0, 0]
- *    [0, 1]
- *    [0, 2]
- *    [1, 0]
- *    [1, 1]
- *    [1, 2]
- *    [2, 0]
- *    [2, 1]
- *    [2, 2]
+ *  - +size+ is 1:
  *
- *  If +n+ is zero, calls the block once with an empty \Array.
+ *      p = []
+ *      [0, 1, 2].repeated_permutation(1) {|permutation| p.push(permutation) }
+ *      p # => [[0], [1], [2]]
  *
- *  If +n+ is negative, does not call the block:
+ *  - +size+ is 2:
  *
- *    a.repeated_permutation(-1) {|permutation| fail 'Cannot happen' }
+ *      p = []
+ *      [0, 1, 2].repeated_permutation(2) {|permutation| p.push(permutation) }
+ *      p # => [[0, 0], [0, 1], [0, 2], [1, 0], [1, 1], [1, 2], [2, 0], [2, 1], [2, 2]]
  *
- *  Returns a new Enumerator if no block given:
+ *  If +size+ is zero, calls the block once with an empty array.
  *
- *    a = [0, 1, 2]
- *    a.repeated_permutation(2) # => #<Enumerator: [0, 1, 2]:permutation(2)>
+ *  If +size+ is negative, does not call the block:
  *
- *  Using Enumerators, it's convenient to show the permutations and counts
- *  for some values of +n+:
+ *    [0, 1, 2].repeated_permutation(-1) {|permutation| fail 'Cannot happen' }
  *
- *    e = a.repeated_permutation(0)
- *    e.size # => 1
- *    e.to_a # => [[]]
- *    e = a.repeated_permutation(1)
- *    e.size # => 3
- *    e.to_a # => [[0], [1], [2]]
- *    e = a.repeated_permutation(2)
- *    e.size # => 9
- *    e.to_a # => [[0, 0], [0, 1], [0, 2], [1, 0], [1, 1], [1, 2], [2, 0], [2, 1], [2, 2]]
+ *  With no block given, returns a new Enumerator.
  *
+ *  Related: see {Methods for Combining}[rdoc-ref:Array@Methods+for+Combining].
  */
 static VALUE
 rb_ary_repeated_permutation(VALUE ary, VALUE num)
@@ -7268,65 +7424,41 @@ rb_ary_repeated_combination_size(VALUE ary, VALUE args, VALUE eobj)
 
 /*
  *  call-seq:
- *    array.repeated_combination(n) {|combination| ... } -> self
- *    array.repeated_combination(n) -> new_enumerator
+ *    repeated_combination(size) {|combination| ... } -> self
+ *    repeated_combination(size) -> new_enumerator
  *
- *  Calls the block with each repeated combination of length +n+ of the elements of +self+;
- *  each combination is an \Array;
+ *  With a block given, calls the block with each repeated combination of length +size+
+ *  of the elements of +self+;
+ *  each combination is an array;
  *  returns +self+. The order of the combinations is indeterminate.
  *
- *  When a block and a positive Integer argument +n+ are given, calls the block with each
- *  +n+-tuple repeated combination of the elements of +self+.
- *  The number of combinations is <tt>(n+1)(n+2)/2</tt>.
- *
- *  +n+ = 1:
- *
- *    a = [0, 1, 2]
- *    a.repeated_combination(1) {|combination| p combination }
- *
- *  Output:
- *
- *    [0]
- *    [1]
- *    [2]
- *
- *  +n+ = 2:
+ *  If a positive integer argument +size+ is given,
+ *  calls the block with each +size+-tuple repeated combination of the elements of +self+.
+ *  The number of combinations is <tt>(size+1)(size+2)/2</tt>.
  *
- *    a.repeated_combination(2) {|combination| p combination }
+ *  Examples:
  *
- *  Output:
+ *  - +size+ is 1:
  *
- *    [0, 0]
- *    [0, 1]
- *    [0, 2]
- *    [1, 1]
- *    [1, 2]
- *    [2, 2]
+ *      c = []
+ *      [0, 1, 2].repeated_combination(1) {|combination| c.push(combination) }
+ *      c # => [[0], [1], [2]]
  *
- *  If +n+ is zero, calls the block once with an empty \Array.
+ *  - +size+ is 2:
  *
- *  If +n+ is negative, does not call the block:
+ *      c = []
+ *      [0, 1, 2].repeated_combination(2) {|combination| c.push(combination) }
+ *      c # => [[0, 0], [0, 1], [0, 2], [1, 1], [1, 2], [2, 2]]
  *
- *    a.repeated_combination(-1) {|combination| fail 'Cannot happen' }
+ *  If +size+ is zero, calls the block once with an empty array.
  *
- *  Returns a new Enumerator if no block given:
+ *  If +size+ is negative, does not call the block:
  *
- *    a = [0, 1, 2]
- *    a.repeated_combination(2) # => #<Enumerator: [0, 1, 2]:combination(2)>
+ *    [0, 1, 2].repeated_combination(-1) {|combination| fail 'Cannot happen' }
  *
- *  Using Enumerators, it's convenient to show the combinations and counts
- *  for some values of +n+:
- *
- *    e = a.repeated_combination(0)
- *    e.size # => 1
- *    e.to_a # => [[]]
- *    e = a.repeated_combination(1)
- *    e.size # => 3
- *    e.to_a # => [[0], [1], [2]]
- *    e = a.repeated_combination(2)
- *    e.size # => 6
- *    e.to_a # => [[0, 0], [0, 1], [0, 2], [1, 1], [1, 2], [2, 2]]
+ *  With no block given, returns a new Enumerator.
  *
+ *  Related: see {Methods for Combining}[rdoc-ref:Array@Methods+for+Combining].
  */
 
 static VALUE
@@ -7366,62 +7498,55 @@ rb_ary_repeated_combination(VALUE ary, VALUE num)
 
 /*
  *  call-seq:
- *    array.product(*other_arrays) -> new_array
- *    array.product(*other_arrays) {|combination| ... } -> self
+ *    product(*other_arrays) -> new_array
+ *    product(*other_arrays) {|combination| ... } -> self
  *
- *  Computes and returns or yields all combinations of elements from all the Arrays,
+ *  Computes all combinations of elements from all the arrays,
  *  including both +self+ and +other_arrays+:
  *
  *  - The number of combinations is the product of the sizes of all the arrays,
  *    including both +self+ and +other_arrays+.
  *  - The order of the returned combinations is indeterminate.
  *
- *  When no block is given, returns the combinations as an \Array of Arrays:
+ *  With no block given, returns the combinations as an array of arrays:
  *
- *    a = [0, 1, 2]
- *    a1 = [3, 4]
- *    a2 = [5, 6]
- *    p = a.product(a1)
- *    p.size # => 6 # a.size * a1.size
- *    p # => [[0, 3], [0, 4], [1, 3], [1, 4], [2, 3], [2, 4]]
- *    p = a.product(a1, a2)
- *    p.size # => 12 # a.size * a1.size * a2.size
- *    p # => [[0, 3, 5], [0, 3, 6], [0, 4, 5], [0, 4, 6], [1, 3, 5], [1, 3, 6], [1, 4, 5], [1, 4, 6], [2, 3, 5], [2, 3, 6], [2, 4, 5], [2, 4, 6]]
- *
- *  If any argument is an empty \Array, returns an empty \Array.
- *
- *  If no argument is given, returns an \Array of 1-element Arrays,
- *  each containing an element of +self+:
- *
- *    a.product # => [[0], [1], [2]]
+ *    p = [0, 1].product([2, 3])
+ *    # => [[0, 2], [0, 3], [1, 2], [1, 3]]
+ *    p.size # => 4
+ *    p = [0, 1].product([2, 3], [4, 5])
+ *    # => [[0, 2, 4], [0, 2, 5], [0, 3, 4], [0, 3, 5], [1, 2, 4], [1, 2, 5], [1, 3, 4], [1, 3,...
+ *    p.size # => 8
  *
- *  When a block is given, yields each combination as an \Array; returns +self+:
+ *  If +self+ or any argument is empty, returns an empty array:
  *
- *    a.product(a1) {|combination| p combination }
+ *    [].product([2, 3], [4, 5]) # => []
+ *    [0, 1].product([2, 3], []) # => []
  *
- *  Output:
+ *  If no argument is given, returns an array of 1-element arrays,
+ *  each containing an element of +self+:
  *
- *    [0, 3]
- *    [0, 4]
- *    [1, 3]
- *    [1, 4]
- *    [2, 3]
- *    [2, 4]
+ *    a.product # => [[0], [1], [2]]
  *
- *  If any argument is an empty \Array, does not call the block:
+ *  With a block given, calls the block with each combination; returns +self+:
  *
- *    a.product(a1, a2, []) {|combination| fail 'Cannot happen' }
+ *    p = []
+ *    [0, 1].product([2, 3]) {|combination| p.push(combination) }
+ *    p # => [[0, 2], [0, 3], [1, 2], [1, 3]]
  *
- *  If no argument is given, yields each element of +self+ as a 1-element \Array:
+ *  If +self+ or any argument is empty, does not call the block:
  *
- *    a.product {|combination| p combination }
+ *    [].product([2, 3], [4, 5]) {|combination| fail 'Cannot happen' }
+ *    # => []
+ *    [0, 1].product([2, 3], []) {|combination| fail 'Cannot happen' }
+ *    # => [0, 1]
  *
- *  Output:
+ *  If no argument is given, calls the block with each element of +self+ as a 1-element array:
  *
- *    [0]
- *    [1]
- *    [2]
+ *    p = []
+ *    [0, 1].product {|combination| p.push(combination) }
+ *    p # => [[0], [1]]
  *
+ *  Related: see {Methods for Combining}[rdoc-ref:Array@Methods+for+Combining].
  */
 
 static VALUE
@@ -7514,20 +7639,20 @@ rb_ary_product(int argc, VALUE *argv, VALUE ary)
 
 /*
  *  call-seq:
- *    array.take(n) -> new_array
- *
- *  Returns a new \Array containing the first +n+ element of +self+,
- *  where +n+ is a non-negative Integer;
- *  does not modify +self+.
+ *    take(count) -> new_array
  *
- *  Examples:
+ *  Returns a new array containing the first +count+ element of +self+
+ *  (as available);
+ *  +count+ must be a non-negative numeric;
+ *  does not modify +self+:
  *
- *    a = [0, 1, 2, 3, 4, 5]
- *    a.take(1) # => [0]
- *    a.take(2) # => [0, 1]
- *    a.take(50) # => [0, 1, 2, 3, 4, 5]
- *    a # => [0, 1, 2, 3, 4, 5]
+ *    a = ['a', 'b', 'c', 'd']
+ *    a.take(2)   # => ["a", "b"]
+ *    a.take(2.1) # => ["a", "b"]
+ *    a.take(50)  # => ["a", "b", "c", "d"]
+ *    a.take(0)   # => []
  *
+ *  Related: see {Methods for Fetching}[rdoc-ref:Array@Methods+for+Fetching].
  */
 
 static VALUE
@@ -7542,25 +7667,23 @@ rb_ary_take(VALUE obj, VALUE n)
 
 /*
  *  call-seq:
- *    array.take_while {|element| ... } -> new_array
- *    array.take_while -> new_enumerator
- *
- *  Returns a new \Array containing zero or more leading elements of +self+;
- *  does not modify +self+.
+ *    take_while {|element| ... } -> new_array
+ *    take_while -> new_enumerator
  *
  *  With a block given, calls the block with each successive element of +self+;
- *  stops if the block returns +false+ or +nil+;
- *  returns a new \Array containing those elements for which the block returned a truthy value:
+ *  stops iterating if the block returns +false+ or +nil+;
+ *  returns a new array containing those elements for which the block returned a truthy value:
  *
  *    a = [0, 1, 2, 3, 4, 5]
  *    a.take_while {|element| element < 3 } # => [0, 1, 2]
- *    a.take_while {|element| true } # => [0, 1, 2, 3, 4, 5]
- *    a # => [0, 1, 2, 3, 4, 5]
+ *    a.take_while {|element| true }        # => [0, 1, 2, 3, 4, 5]
+ *    a.take_while {|element| false }       # => []
  *
- *  With no block given, returns a new Enumerator:
+ *  With no block given, returns a new Enumerator.
  *
- *    [0, 1].take_while # => #<Enumerator: [0, 1]:take_while>
+ *  Does not modify +self+.
  *
+ *  Related: see {Methods for Fetching}[rdoc-ref:Array@Methods+for+Fetching].
  */
 
 static VALUE
@@ -7577,10 +7700,10 @@ rb_ary_take_while(VALUE ary)
 
 /*
  *  call-seq:
- *    array.drop(n) -> new_array
+ *    drop(count) -> new_array
  *
- *  Returns a new \Array containing all but the first +n+ element of +self+,
- *  where +n+ is a non-negative Integer;
+ *  Returns a new array containing all but the first +count+ element of +self+,
+ *  where +count+ is a non-negative integer;
  *  does not modify +self+.
  *
  *  Examples:
@@ -7589,7 +7712,9 @@ rb_ary_take_while(VALUE ary)
  *    a.drop(0) # => [0, 1, 2, 3, 4, 5]
  *    a.drop(1) # => [1, 2, 3, 4, 5]
  *    a.drop(2) # => [2, 3, 4, 5]
+ *    a.drop(9) # => []
  *
+ *  Related: see {Methods for Fetching}[rdoc-ref:Array@Methods+for+Fetching].
  */
 
 static VALUE
@@ -7608,23 +7733,20 @@ rb_ary_drop(VALUE ary, VALUE n)
 
 /*
  *  call-seq:
- *    array.drop_while {|element| ... } -> new_array
- *    array.drop_while -> new_enumerator
-
- *  Returns a new \Array containing zero or more trailing elements of +self+;
- *  does not modify +self+.
+ *    drop_while {|element| ... } -> new_array
+ *    drop_while -> new_enumerator
  *
  *  With a block given, calls the block with each successive element of +self+;
  *  stops if the block returns +false+ or +nil+;
- *  returns a new \Array _omitting_ those elements for which the block returned a truthy value:
+ *  returns a new array _omitting_ those elements for which the block returned a truthy value;
+ *  does not modify +self+:
  *
  *    a = [0, 1, 2, 3, 4, 5]
  *    a.drop_while {|element| element < 3 } # => [3, 4, 5]
  *
- *  With no block given, returns a new Enumerator:
- *
- *    [0, 1].drop_while # => # => #<Enumerator: [0, 1]:drop_while>
+ *  With no block given, returns a new Enumerator.
  *
+ *  Related: see {Methods for Fetching}[rdoc-ref:Array@Methods+for+Fetching].
  */
 
 static VALUE
@@ -7641,38 +7763,41 @@ rb_ary_drop_while(VALUE ary)
 
 /*
  *  call-seq:
- *    array.any? -> true or false
- *    array.any? {|element| ... } -> true or false
- *    array.any?(obj) -> true or false
+ *    any? -> true or false
+ *    any?(object) -> true or false
+ *    any? {|element| ... } -> true or false
  *
- *  Returns +true+ if any element of +self+ meets a given criterion.
+ *  Returns whether for any element of +self+, a given criterion is satisfied.
  *
- *  If +self+ has no element, returns +false+ and argument or block
- *  are not used.
+ *  With no block and no argument, returns whether any element of +self+ is truthy:
  *
- *  With no block given and no argument, returns +true+ if +self+ has any truthy element,
- *  +false+ otherwise:
+ *    [nil, false, []].any? # => true  # Array object is truthy.
+ *    [nil, false, {}].any? # => true  # Hash object is truthy.
+ *    [nil, false, ''].any? # => true  # String object is truthy.
+ *    [nil, false].any?     # => false # Nil and false are not truthy.
  *
- *    [nil, 0, false].any? # => true
- *    [nil, false].any? # => false
- *    [].any? # => false
+ *  With argument +object+ given,
+ *  returns whether <tt>object === ele</tt> for any element +ele+ in +self+:
  *
- *  With a block given and no argument, calls the block with each element in +self+;
- *  returns +true+ if the block returns any truthy value, +false+ otherwise:
+ *    [nil, false, 0].any?(0)          # => true
+ *    [nil, false, 1].any?(0)          # => false
+ *    [nil, false, 'food'].any?(/foo/) # => true
+ *    [nil, false, 'food'].any?(/bar/) # => false
  *
- *    [0, 1, 2].any? {|element| element > 1 } # => true
- *    [0, 1, 2].any? {|element| element > 2 } # => false
+ *  With a block given,
+ *  calls the block with each element in +self+;
+ *  returns whether the block returns any truthy value:
  *
- *  If argument +obj+ is given, returns +true+ if +obj+.<tt>===</tt> any element,
- *  +false+ otherwise:
+ *    [0, 1, 2].any? {|ele| ele < 1 } # => true
+ *    [0, 1, 2].any? {|ele| ele < 0 } # => false
+ *
+ *  With both a block and argument +object+ given,
+ *  ignores the block and uses +object+ as above.
  *
- *    ['food', 'drink'].any?(/foo/) # => true
- *    ['food', 'drink'].any?(/bar/) # => false
- *    [].any?(/foo/) # => false
- *    [0, 1, 2].any?(1) # => true
- *    [0, 1, 2].any?(3) # => false
+ *  <b>Special case</b>: returns +false+ if +self+ is empty
+ *  (regardless of any given argument or block).
  *
- *  Related: Enumerable#any?
+ *  Related: see {Methods for Querying}[rdoc-ref:Array@Methods+for+Querying].
  */
 
 static VALUE
@@ -7705,37 +7830,41 @@ rb_ary_any_p(int argc, VALUE *argv, VALUE ary)
 
 /*
  *  call-seq:
- *    array.all? -> true or false
- *    array.all? {|element| ... } -> true or false
- *    array.all?(obj) -> true or false
+ *    all? -> true or false
+ *    all?(object) -> true or false
+ *    all? {|element| ... } -> true or false
  *
- *  Returns +true+ if all elements of +self+ meet a given criterion.
+ *  Returns whether for every element of +self+,
+ *  a given criterion is satisfied.
  *
- *  If +self+ has no element, returns +true+ and argument or block
- *  are not used.
+ *  With no block and no argument,
+ *  returns whether every element of +self+ is truthy:
  *
- *  With no block given and no argument, returns +true+ if +self+ contains only truthy elements,
- *  +false+ otherwise:
+ *    [[], {}, '', 0, 0.0, Object.new].all? # => true  # All truthy objects.
+ *    [[], {}, '', 0, 0.0, nil].all?        # => false # nil is not truthy.
+ *    [[], {}, '', 0, 0.0, false].all?      # => false # false is not truthy.
  *
- *    [0, 1, :foo].all? # => true
- *    [0, nil, 2].all? # => false
- *    [].all? # => true
+ *  With argument +object+ given, returns whether <tt>object === ele</tt>
+ *  for every element +ele+ in +self+:
  *
- *  With a block given and no argument, calls the block with each element in +self+;
- *  returns +true+ if the block returns only truthy values, +false+ otherwise:
+ *    [0, 0, 0].all?(0)                    # => true
+ *    [0, 1, 2].all?(1)                    # => false
+ *    ['food', 'fool', 'foot'].all?(/foo/) # => true
+ *    ['food', 'drink'].all?(/foo/)        # => false
  *
- *    [0, 1, 2].all? { |element| element < 3 } # => true
- *    [0, 1, 2].all? { |element| element < 2 } # => false
+ *  With a block given, calls the block with each element in +self+;
+ *  returns whether the block returns only truthy values:
  *
- *  If argument +obj+ is given, returns +true+ if <tt>obj.===</tt> every element, +false+ otherwise:
+ *    [0, 1, 2].all? { |ele| ele < 3 } # => true
+ *    [0, 1, 2].all? { |ele| ele < 2 } # => false
  *
- *    ['food', 'fool', 'foot'].all?(/foo/) # => true
- *    ['food', 'drink'].all?(/bar/) # => false
- *    [].all?(/foo/) # => true
- *    [0, 0, 0].all?(0) # => true
- *    [0, 1, 2].all?(1) # => false
+ *  With both a block and argument +object+ given,
+ *  ignores the block and uses +object+ as above.
  *
- *  Related: Enumerable#all?
+ *  <b>Special case</b>: returns +true+ if +self+ is empty
+ *  (regardless of any given argument or block).
+ *
+ *  Related: see {Methods for Querying}[rdoc-ref:Array@Methods+for+Querying].
  */
 
 static VALUE
@@ -7768,34 +7897,35 @@ rb_ary_all_p(int argc, VALUE *argv, VALUE ary)
 
 /*
  *  call-seq:
- *    array.none? -> true or false
- *    array.none? {|element| ... } -> true or false
- *    array.none?(obj) -> true or false
+ *    none? -> true or false
+ *    none?(object) -> true or false
+ *    none? {|element| ... } -> true or false
  *
- *  Returns +true+ if no element of +self+ meet a given criterion.
+ *  Returns +true+ if no element of +self+ meets a given criterion, +false+ otherwise.
  *
  *  With no block given and no argument, returns +true+ if +self+ has no truthy elements,
  *  +false+ otherwise:
  *
- *    [nil, false].none? # => true
+ *    [nil, false].none?    # => true
  *    [nil, 0, false].none? # => false
- *    [].none? # => true
+ *    [].none?              # => true
+ *
+ *  With argument +object+ given, returns +false+ if for any element +element+,
+ *  <tt>object === element</tt>; +true+ otherwise:
  *
- *  With a block given and no argument, calls the block with each element in +self+;
+ *    ['food', 'drink'].none?(/bar/) # => true
+ *    ['food', 'drink'].none?(/foo/) # => false
+ *    [].none?(/foo/)                # => true
+ *    [0, 1, 2].none?(3)             # => true
+ *    [0, 1, 2].none?(1)             # => false
+ *
+ *  With a block given, calls the block with each element in +self+;
  *  returns +true+ if the block returns no truthy value, +false+ otherwise:
  *
  *    [0, 1, 2].none? {|element| element > 3 } # => true
  *    [0, 1, 2].none? {|element| element > 1 } # => false
  *
- *  If argument +obj+ is given, returns +true+ if <tt>obj.===</tt> no element, +false+ otherwise:
- *
- *    ['food', 'drink'].none?(/bar/) # => true
- *    ['food', 'drink'].none?(/foo/) # => false
- *    [].none?(/foo/) # => true
- *    [0, 1, 2].none?(3) # => true
- *    [0, 1, 2].none?(1) # => false
- *
- *  Related: Enumerable#none?
+ *  Related: see {Methods for Querying}[rdoc-ref:Array@Methods+for+Querying].
  */
 
 static VALUE
@@ -7828,9 +7958,9 @@ rb_ary_none_p(int argc, VALUE *argv, VALUE ary)
 
 /*
  *  call-seq:
- *    array.one? -> true or false
- *    array.one? {|element| ... } -> true or false
- *    array.one?(obj) -> true or false
+ *    one? -> true or false
+ *    one? {|element| ... } -> true or false
+ *    one?(object) -> true or false
  *
  *  Returns +true+ if exactly one element of +self+ meets a given criterion.
  *
@@ -7842,14 +7972,14 @@ rb_ary_none_p(int argc, VALUE *argv, VALUE ary)
  *    [nil, nil].one? # => false
  *    [].one? # => false
  *
- *  With a block given and no argument, calls the block with each element in +self+;
+ *  With a block given, calls the block with each element in +self+;
  *  returns +true+ if the block a truthy value for exactly one element, +false+ otherwise:
  *
  *    [0, 1, 2].one? {|element| element > 0 } # => false
  *    [0, 1, 2].one? {|element| element > 1 } # => true
  *    [0, 1, 2].one? {|element| element > 2 } # => false
  *
- *  If argument +obj+ is given, returns +true+ if <tt>obj.===</tt> exactly one element,
+ *  With argument +object+ given, returns +true+ if for exactly one element +element+, <tt>object === element</tt>;
  *  +false+ otherwise:
  *
  *    [0, 1, 2].one?(0) # => true
@@ -7859,7 +7989,7 @@ rb_ary_none_p(int argc, VALUE *argv, VALUE ary)
  *    ['food', 'drink'].one?(/foo/) # => true
  *    [].one?(/foo/) # => false
  *
- *  Related: Enumerable#one?
+ *  Related: see {Methods for Querying}[rdoc-ref:Array@Methods+for+Querying].
  */
 
 static VALUE
@@ -7902,11 +8032,11 @@ rb_ary_one_p(int argc, VALUE *argv, VALUE ary)
 
 /*
  *  call-seq:
- *    array.dig(index, *identifiers) -> object
+ *    dig(index, *identifiers) -> object
  *
- *  Finds and returns the object in nested objects
- *  that is specified by +index+ and +identifiers+.
- *  The nested objects may be instances of various classes.
+ *  Finds and returns the object in nested object
+ *  specified by +index+ and +identifiers+;
+ *  the nested objects may be instances of various classes.
  *  See {Dig Methods}[rdoc-ref:dig_methods.rdoc].
  *
  *  Examples:
@@ -7917,6 +8047,7 @@ rb_ary_one_p(int argc, VALUE *argv, VALUE ary)
  *    a.dig(1, 2, 0) # => :bat
  *    a.dig(1, 2, 3) # => nil
  *
+ *  Related: see {Methods for Fetching}[rdoc-ref:Array@Methods+for+Fetching].
  */
 
 static VALUE
@@ -7945,40 +8076,41 @@ finish_exact_sum(long n, VALUE r, VALUE v, int z)
 
 /*
  * call-seq:
- *   array.sum(init = 0) -> object
- *   array.sum(init = 0) {|element| ... } -> object
+ *   sum(init = 0) -> object
+ *   sum(init = 0) {|element| ... } -> object
  *
- *  When no block is given, returns the object equivalent to:
+ *  With no block given, returns the sum of +init+ and all elements of +self+;
+ *  for array +array+ and value +init+, equivalent to:
  *
  *    sum = init
  *    array.each {|element| sum += element }
  *    sum
  *
- *  For example, <tt>[e1, e2, e3].sum</tt> returns <tt>init + e1 + e2 + e3</tt>.
+ *  For example, <tt>[e0, e1, e2].sum</tt> returns <tt>init + e0 + e1 + e2</tt>.
  *
  *  Examples:
  *
- *    a = [0, 1, 2, 3]
- *    a.sum # => 6
- *    a.sum(100) # => 106
+ *    [0, 1, 2, 3].sum                 # => 6
+ *    [0, 1, 2, 3].sum(100)            # => 106
+ *    ['abc', 'def', 'ghi'].sum('jkl') # => "jklabcdefghi"
+ *    [[:foo, :bar], ['foo', 'bar']].sum([2, 3])
+ *    # => [2, 3, :foo, :bar, "foo", "bar"]
  *
- *  The elements need not be numeric, but must be <tt>+</tt>-compatible
- *  with each other and with +init+:
+ *  The +init+ value and elements need not be numeric, but must all be <tt>+</tt>-compatible:
  *
- *    a = ['abc', 'def', 'ghi']
- *    a.sum('jkl') # => "jklabcdefghi"
+ *    # Raises TypeError: Array can't be coerced into Integer.
+ *    [[:foo, :bar], ['foo', 'bar']].sum(2)
  *
- *  When a block is given, it is called with each element
- *  and the block's return value (instead of the element itself) is used as the addend:
+ *  With a block given, calls the block with each element of +self+;
+ *  the block's return value (instead of the element itself) is used as the addend:
  *
- *    a = ['zero', 1, :two]
- *    s = a.sum('Coerced and concatenated: ') {|element| element.to_s }
- *    s # => "Coerced and concatenated: zero1two"
+ *    ['zero', 1, :two].sum('Coerced and concatenated: ') {|element| element.to_s }
+ *    # => "Coerced and concatenated: zero1two"
  *
  *  Notes:
  *
  *  - Array#join and Array#flatten may be faster than Array#sum
- *    for an \Array of Strings or an \Array of Arrays.
+ *    for an array of strings or an array of arrays.
  *  - Array#sum method may not respect method redefinition of "+" methods such as Integer#+.
  *
  */
@@ -8100,6 +8232,7 @@ rb_ary_sum(int argc, VALUE *argv, VALUE ary)
     return v;
 }
 
+/* :nodoc: */
 static VALUE
 rb_ary_deconstruct(VALUE ary)
 {
@@ -8107,15 +8240,37 @@ rb_ary_deconstruct(VALUE ary)
 }
 
 /*
- *  An \Array is an ordered, integer-indexed collection of objects, called _elements_.
- *  Any object (even another array) may be an array element,
- *  and an array can contain objects of different types.
+ *  An \Array object is an ordered, integer-indexed collection of objects,
+ *  called _elements_;
+ *  the object represents
+ *  an {array data structure}[https://en.wikipedia.org/wiki/Array_(data_structure)].
+ *
+ *  An element may be any object (even another array);
+ *  elements may be any mixture of objects of different types.
+ *
+ *  Important data structures that use arrays include:
+ *
+ *  - {Coordinate vector}[https://en.wikipedia.org/wiki/Coordinate_vector].
+ *  - {Matrix}[https://en.wikipedia.org/wiki/Matrix_(mathematics)].
+ *  - {Heap}[https://en.wikipedia.org/wiki/Heap_(data_structure)].
+ *  - {Hash table}[https://en.wikipedia.org/wiki/Hash_table].
+ *  - {Deque (double-ended queue)}[https://en.wikipedia.org/wiki/Double-ended_queue].
+ *  - {Queue}[https://en.wikipedia.org/wiki/Queue_(abstract_data_type)].
+ *  - {Stack}[https://en.wikipedia.org/wiki/Stack_(abstract_data_type)].
+ *
+ *  There are also array-like data structures:
+ *
+ *  - {Associative array}[https://en.wikipedia.org/wiki/Associative_array] (see Hash).
+ *  - {Directory}[https://en.wikipedia.org/wiki/Directory_(computing)] (see Dir).
+ *  - {Environment}[https://en.wikipedia.org/wiki/Environment_variable] (see ENV).
+ *  - {Set}[https://en.wikipedia.org/wiki/Set_(abstract_data_type)] (see Set).
+ *  - {String}[https://en.wikipedia.org/wiki/String_(computer_science)] (see String).
  *
  *  == \Array Indexes
  *
  *  \Array indexing starts at 0, as in C or Java.
  *
- *  A positive index is an offset from the first element:
+ *  A non-negative index is an offset from the first element:
  *
  *  - Index 0 indicates the first element.
  *  - Index 1 indicates the second element.
@@ -8127,6 +8282,9 @@ rb_ary_deconstruct(VALUE ary)
  *  - Index -2 indicates the next-to-last element.
  *  - ...
  *
+ *
+ *  === In-Range and Out-of-Range Indexes
+ *
  *  A non-negative index is <i>in range</i> if and only if it is smaller than
  *  the size of the array.  For a 3-element array:
  *
@@ -8139,31 +8297,32 @@ rb_ary_deconstruct(VALUE ary)
  *  - Indexes -1 through -3 are in range.
  *  - Index -4 is out of range.
  *
+ *  === Effective Index
+ *
  *  Although the effective index into an array is always an integer,
- *  some methods (both within and outside of class \Array)
+ *  some methods (both within class \Array and elsewhere)
  *  accept one or more non-integer arguments that are
  *  {integer-convertible objects}[rdoc-ref:implicit_conversion.rdoc@Integer-Convertible+Objects].
  *
- *
  *  == Creating Arrays
  *
  *  You can create an \Array object explicitly with:
  *
- *  - An {array literal}[rdoc-ref:literals.rdoc@Array+Literals]:
+ *  - An {array literal}[rdoc-ref:syntax/literals.rdoc@Array+Literals]:
  *
  *      [1, 'one', :one, [2, 'two', :two]]
  *
- *  - A {%w or %W: string-array Literal}[rdoc-ref:literals.rdoc@25w+and+-25W-3A+String-Array+Literals]:
+ *  - A {%w or %W string-array Literal}[rdoc-ref:syntax/literals.rdoc@25w+and+-25W-3A+String-Array+Literals]:
  *
  *      %w[foo bar baz] # => ["foo", "bar", "baz"]
  *      %w[1 % *]       # => ["1", "%", "*"]
  *
- *  - A {%i pr %I: symbol-array Literal}[rdoc-ref:literals.rdoc@25i+and+-25I-3A+Symbol-Array+Literals]:
+ *  - A {%i or %I symbol-array Literal}[rdoc-ref:syntax/literals.rdoc@25i+and+-25I-3A+Symbol-Array+Literals]:
  *
  *      %i[foo bar baz] # => [:foo, :bar, :baz]
  *      %i[1 % *]       # => [:"1", :%, :*]
  *
- *  - \Method Kernel#Array:
+ *  - Method Kernel#Array:
  *
  *      Array(["a", "b"])             # => ["a", "b"]
  *      Array(1..5)                   # => [1, 2, 3, 4, 5]
@@ -8172,7 +8331,7 @@ rb_ary_deconstruct(VALUE ary)
  *      Array(1)                      # => [1]
  *      Array({:a => "a", :b => "b"}) # => [[:a, "a"], [:b, "b"]]
  *
- *  - \Method Array.new:
+ *  - Method Array.new:
  *
  *      Array.new               # => []
  *      Array.new(3)            # => [nil, nil, nil]
@@ -8227,8 +8386,8 @@ rb_ary_deconstruct(VALUE ary)
  *
  *  == Example Usage
  *
- *  In addition to the methods it mixes in through the Enumerable module, the
- *  \Array class has proprietary methods for accessing, searching and otherwise
+ *  In addition to the methods it mixes in through the Enumerable module,
+ *  class \Array has proprietary methods for accessing, searching and otherwise
  *  manipulating arrays.
  *
  *  Some of the more common ones are illustrated below.
@@ -8278,7 +8437,7 @@ rb_ary_deconstruct(VALUE ary)
  *
  *  == Obtaining Information about an \Array
  *
- *  Arrays keep track of their own length at all times.  To query an array
+ *  An array keeps track of its own length at all times.  To query an array
  *  about the number of elements it contains, use #length, #count or #size.
  *
  *    browsers = ['Chrome', 'Firefox', 'Safari', 'Opera', 'IE']
@@ -8293,7 +8452,7 @@ rb_ary_deconstruct(VALUE ary)
  *
  *    browsers.include?('Konqueror') #=> false
  *
- *  == Adding Items to Arrays
+ *  == Adding Items to an \Array
  *
  *  Items can be added to the end of an array by using either #push or #<<
  *
@@ -8354,11 +8513,11 @@ rb_ary_deconstruct(VALUE ary)
  *     arr = [2, 5, 6, 556, 6, 6, 8, 9, 0, 123, 556]
  *     arr.uniq #=> [2, 5, 6, 556, 8, 9, 0, 123]
  *
- *  == Iterating over Arrays
+ *  == Iterating over an \Array
  *
- *  Like all classes that include the Enumerable module, \Array has an each
+ *  Like all classes that include the Enumerable module, class \Array has an each
  *  method, which defines what elements should be iterated over and how.  In
- *  case of Array's #each, all elements in the \Array instance are yielded to
+ *  case of Array#each, all elements in +self+ are yielded to
  *  the supplied block in sequence.
  *
  *  Note that this operation leaves the array unchanged.
@@ -8418,7 +8577,7 @@ rb_ary_deconstruct(VALUE ary)
  *
  *  == What's Here
  *
- *  First, what's elsewhere. \Class \Array:
+ *  First, what's elsewhere. Class \Array:
  *
  *  - Inherits from {class Object}[rdoc-ref:Object@What-27s+Here].
  *  - Includes {module Enumerable}[rdoc-ref:Enumerable@What-27s+Here],
@@ -8443,148 +8602,132 @@ rb_ary_deconstruct(VALUE ary)
  *  - ::new: Returns a new array.
  *  - ::try_convert: Returns a new array created from a given object.
  *
+ *  See also {Creating Arrays}[rdoc-ref:Array@Creating+Arrays].
+ *
  *  === Methods for Querying
  *
- *  - #length, #size: Returns the count of elements.
- *  - #include?: Returns whether any element <tt>==</tt> a given object.
- *  - #empty?: Returns whether there are no elements.
  *  - #all?: Returns whether all elements meet a given criterion.
  *  - #any?: Returns whether any element meets a given criterion.
+ *  - #count: Returns the count of elements that meet a given criterion.
+ *  - #empty?: Returns whether there are no elements.
+ *  - #find_index (aliased as #index): Returns the index of the first element that meets a given criterion.
+ *  - #hash: Returns the integer hash code.
+ *  - #include?: Returns whether any element <tt>==</tt> a given object.
+ *  - #length (aliased as #size): Returns the count of elements.
  *  - #none?: Returns whether no element <tt>==</tt> a given object.
  *  - #one?: Returns whether exactly one element <tt>==</tt> a given object.
- *  - #count: Returns the count of elements that meet a given criterion.
- *  - #find_index, #index: Returns the index of the first element that meets a given criterion.
  *  - #rindex: Returns the index of the last element that meets a given criterion.
- *  - #hash: Returns the integer hash code.
  *
  *  === Methods for Comparing
  *
- *  - #<=>: Returns -1, 0, or 1 * as +self+ is less than, equal to, or
- *    greater than a given object.
- *  - #==: Returns whether each element in +self+ is <tt>==</tt> to the corresponding element
- *    in a given object.
- *  - #eql?: Returns whether each element in +self+ is <tt>eql?</tt> to the corresponding
- *    element in a given object.
+ *  - #<=>: Returns -1, 0, or 1, as +self+ is less than, equal to, or greater than a given object.
+ *  - #==: Returns whether each element in +self+ is <tt>==</tt> to the corresponding element in a given object.
+ *  - #eql?: Returns whether each element in +self+ is <tt>eql?</tt> to the corresponding element in a given object.
 
  *  === Methods for Fetching
  *
  *  These methods do not modify +self+.
  *
- *  - #[]: Returns one or more elements.
- *  - #fetch: Returns the element at a given offset.
- *  - #first: Returns one or more leading elements.
- *  - #last: Returns one or more trailing elements.
- *  - #max: Returns one or more maximum-valued elements,
- *    as determined by <tt><=></tt> or a given block.
- *  - #min: Returns one or more minimum-valued elements,
- *    as determined by <tt><=></tt> or a given block.
- *  - #minmax: Returns the minimum-valued and maximum-valued elements,
- *    as determined by <tt><=></tt> or a given block.
- *  - #assoc: Returns the first element that is an array
- *    whose first element <tt>==</tt> a given object.
- *  - #rassoc: Returns the first element that is an array
- *    whose second element <tt>==</tt> a given object.
+ *  - #[] (aliased as #slice): Returns consecutive elements as determined by a given argument.
+ *  - #assoc: Returns the first element that is an array whose first element <tt>==</tt> a given object.
  *  - #at: Returns the element at a given offset.
- *  - #values_at: Returns the elements at given offsets.
- *  - #dig: Returns the object in nested objects
- *    that is specified by a given index and additional arguments.
+ *  - #bsearch: Returns an element selected via a binary search as determined by a given block.
+ *  - #bsearch_index: Returns the index of an element selected via a binary search as determined by a given block.
+ *  - #compact: Returns an array containing all non-+nil+ elements.
+ *  - #dig: Returns the object in nested objects that is specified by a given index and additional arguments.
  *  - #drop: Returns trailing elements as determined by a given index.
- *  - #take: Returns leading elements as determined by a given index.
  *  - #drop_while: Returns trailing elements as determined by a given block.
- *  - #take_while: Returns leading elements as determined by a given block.
- *  - #slice: Returns consecutive elements as determined by a given argument.
- *  - #sort: Returns all elements in an order determined by <tt><=></tt> or a given block.
+ *  - #fetch: Returns the element at a given offset.
+ *  - #fetch_values: Returns elements at given offsets.
+ *  - #first: Returns one or more leading elements.
+ *  - #last: Returns one or more trailing elements.
+ *  - #max: Returns one or more maximum-valued elements, as determined by <tt>#<=></tt> or a given block.
+ *  - #min: Returns one or more minimum-valued elements, as determined by <tt>#<=></tt> or a given block.
+ *  - #minmax: Returns the minimum-valued and maximum-valued elements, as determined by <tt>#<=></tt> or a given block.
+ *  - #rassoc: Returns the first element that is an array whose second element <tt>==</tt> a given object.
+ *  - #reject: Returns an array containing elements not rejected by a given block.
  *  - #reverse: Returns all elements in reverse order.
- *  - #compact: Returns an array containing all non-+nil+ elements.
- *  - #select, #filter: Returns an array containing elements selected by a given block.
- *  - #uniq: Returns an array containing non-duplicate elements.
  *  - #rotate: Returns all elements with some rotated from one end to the other.
- *  - #bsearch: Returns an element selected via a binary search
- *    as determined by a given block.
- *  - #bsearch_index: Returns the index of an element selected via a binary search
- *    as determined by a given block.
  *  - #sample: Returns one or more random elements.
+ *  - #select (aliased as #filter): Returns an array containing elements selected by a given block.
  *  - #shuffle: Returns elements in a random order.
+ *  - #sort: Returns all elements in an order determined by <tt>#<=></tt> or a given block.
+ *  - #take: Returns leading elements as determined by a given index.
+ *  - #take_while: Returns leading elements as determined by a given block.
+ *  - #uniq: Returns an array containing non-duplicate elements.
+ *  - #values_at: Returns the elements at given offsets.
  *
  *  === Methods for Assigning
  *
  *  These methods add, replace, or reorder elements in +self+.
  *
+ *  - #<<: Appends an element.
  *  - #[]=: Assigns specified elements with a given object.
- *  - #push, #append, #<<: Appends trailing elements.
- *  - #unshift, #prepend: Prepends leading elements.
- *  - #insert: Inserts given objects at a given offset; does not replace elements.
  *  - #concat: Appends all elements from given arrays.
  *  - #fill: Replaces specified elements with specified objects.
- *  - #replace: Replaces the content of +self+ with the content of a given array.
+ *  - #flatten!: Replaces each nested array in +self+ with the elements from that array.
+ *  - #initialize_copy (aliased as #replace): Replaces the content of +self+ with the content of a given array.
+ *  - #insert: Inserts given objects at a given offset; does not replace elements.
+ *  - #push (aliased as #append): Appends elements.
  *  - #reverse!: Replaces +self+ with its elements reversed.
  *  - #rotate!: Replaces +self+ with its elements rotated.
  *  - #shuffle!: Replaces +self+ with its elements in random order.
- *  - #sort!: Replaces +self+ with its elements sorted,
- *    as determined by <tt><=></tt> or a given block.
+ *  - #sort!: Replaces +self+ with its elements sorted, as determined by <tt>#<=></tt> or a given block.
  *  - #sort_by!: Replaces +self+ with its elements sorted, as determined by a given block.
+ *  - #unshift (aliased as #prepend): Prepends leading elements.
  *
  *  === Methods for Deleting
  *
  *  Each of these methods removes elements from +self+:
  *
- *  - #pop: Removes and returns the last element.
- *  - #shift:  Removes and returns the first element.
+ *  - #clear: Removes all elements.
  *  - #compact!: Removes all +nil+ elements.
  *  - #delete: Removes elements equal to a given object.
  *  - #delete_at: Removes the element at a given offset.
  *  - #delete_if: Removes elements specified by a given block.
  *  - #keep_if: Removes elements not specified by a given block.
+ *  - #pop: Removes and returns the last element.
  *  - #reject!: Removes elements specified by a given block.
- *  - #select!, #filter!: Removes elements not specified by a given block.
+ *  - #select! (aliased as #filter!): Removes elements not specified by a given block.
+ *  - #shift:  Removes and returns the first element.
  *  - #slice!: Removes and returns a sequence of elements.
  *  - #uniq!: Removes duplicates.
  *
  *  === Methods for Combining
  *
  *  - #&: Returns an array containing elements found both in +self+ and a given array.
- *  - #intersection: Returns an array containing elements found both in +self+
- *    and in each given array.
  *  - #+: Returns an array containing all elements of +self+ followed by all elements of a given array.
  *  - #-: Returns an array containing all elements of +self+ that are not found in a given array.
- *  - #|: Returns an array containing all elements of +self+ and all elements of a given array,
- *    duplicates removed.
- *  - #union: Returns an array containing all elements of +self+ and all elements of given arrays,
- *    duplicates removed.
- *  - #difference: Returns an array containing all elements of +self+ that are not found
- *    in any of the given arrays..
+ *  - #|: Returns an array containing all element of +self+ and all elements of a given array, duplicates removed.
+ *  - #difference: Returns an array containing all elements of +self+ that are not found in any of the given arrays..
+ *  - #intersection: Returns an array containing elements found both in +self+ and in each given array.
  *  - #product: Returns or yields all combinations of elements from +self+ and given arrays.
+ *  - #reverse: Returns an array containing all elements of +self+ in reverse order.
+ *  - #union: Returns an array containing all elements of +self+ and all elements of given arrays, duplicates removed.
  *
  *  === Methods for Iterating
  *
+ *  - #combination: Calls a given block with combinations of elements of +self+; a combination does not use the same element more than once.
+ *  - #cycle: Calls a given block with each element, then does so again, for a specified number of times, or forever.
  *  - #each: Passes each element to a given block.
- *  - #reverse_each:  Passes each element, in reverse order, to a given block.
  *  - #each_index: Passes each element index to a given block.
- *  - #cycle: Calls a given block with each element, then does so again,
- *    for a specified number of times, or forever.
- *  - #combination: Calls a given block with combinations of elements of +self+;
- *    a combination does not use the same element more than once.
- *  - #permutation: Calls a given block with permutations of elements of +self+;
- *    a permutation does not use the same element more than once.
- *  - #repeated_combination: Calls a given block with combinations of elements of +self+;
- *    a combination may use the same element more than once.
- *  - #repeated_permutation: Calls a given block with permutations of elements of +self+;
- *    a permutation may use the same element more than once.
+ *  - #permutation: Calls a given block with permutations of elements of +self+; a permutation does not use the same element more than once.
+ *  - #repeated_combination: Calls a given block with combinations of elements of +self+; a combination may use the same element more than once.
+ *  - #repeated_permutation: Calls a given block with permutations of elements of +self+; a permutation may use the same element more than once.
+ *  - #reverse_each:  Passes each element, in reverse order, to a given block.
  *
  *  === Methods for Converting
  *
- *  - #map, #collect: Returns an array containing the block return-value for each element.
- *  - #map!, #collect!: Replaces each element with a block return-value.
+ *  - #collect (aliased as #map): Returns an array containing the block return-value for each element.
+ *  - #collect! (aliased as #map!): Replaces each element with a block return-value.
  *  - #flatten: Returns an array that is a recursive flattening of +self+.
- *  - #flatten!: Replaces each nested array in +self+ with the elements from that array.
- *  - #inspect, #to_s: Returns a new String containing the elements.
- *  - #join: Returns a newsString containing the elements joined by the field separator.
+ *  - #inspect (aliased as #to_s): Returns a new String containing the elements.
+ *  - #join: Returns a new String containing the elements joined by the field separator.
  *  - #to_a: Returns +self+ or a new array containing all elements.
  *  - #to_ary: Returns +self+.
  *  - #to_h: Returns a new hash formed from the elements.
  *  - #transpose: Transposes +self+, which must be an array of arrays.
- *  - #zip: Returns a new array of arrays containing +self+ and given arrays;
- *    follow the link for details.
+ *  - #zip: Returns a new array of arrays containing +self+ and given arrays.
  *
  *  === Other Methods
  *
@@ -8595,7 +8738,6 @@ rb_ary_deconstruct(VALUE ary)
  *    - With string argument +field_separator+, a new string that is equivalent to
  *      <tt>join(field_separator)</tt>.
  *
- *  - #abbrev: Returns a hash of unambiguous abbreviations for elements.
  *  - #pack: Packs the elements into a binary sequence.
  *  - #sum: Returns a sum of elements according to either <tt>+</tt> or a given block.
  */
@@ -8603,6 +8745,8 @@ rb_ary_deconstruct(VALUE ary)
 void
 Init_Array(void)
 {
+    fake_ary_flags = init_fake_ary_flags();
+
     rb_cArray  = rb_define_class("Array", rb_cObject);
     rb_include_module(rb_cArray, rb_mEnumerable);
 
@@ -8723,8 +8867,12 @@ Init_Array(void)
     rb_define_method(rb_cArray, "one?", rb_ary_one_p, -1);
     rb_define_method(rb_cArray, "dig", rb_ary_dig, -1);
     rb_define_method(rb_cArray, "sum", rb_ary_sum, -1);
+    rb_define_method(rb_cArray, "freeze", rb_ary_freeze, 0);
 
     rb_define_method(rb_cArray, "deconstruct", rb_ary_deconstruct, 0);
+
+    rb_cArray_empty_frozen = rb_ary_freeze(rb_ary_new());
+    rb_vm_register_global_object(rb_cArray_empty_frozen);
 }
 
 #include "array.rbinc"
diff --git a/array.rb b/array.rb
index d17f3742357613..5f31693cabf2de 100644
--- a/array.rb
+++ b/array.rb
@@ -1,62 +1,97 @@
 class Array
   # call-seq:
-  #    array.shuffle!(random: Random) -> array
+  #   shuffle!(random: Random) -> self
   #
-  # Shuffles the elements of +self+ in place.
-  #    a = [1, 2, 3] #=> [1, 2, 3]
-  #    a.shuffle!    #=> [2, 3, 1]
-  #    a             #=> [2, 3, 1]
+  # Shuffles all elements in +self+ into a random order,
+  # as selected by the object given by the keyword argument +random+.
+  # Returns +self+:
   #
-  # The optional +random+ argument will be used as the random number generator:
-  #    a.shuffle!(random: Random.new(1))  #=> [1, 3, 2]
+  #   a =             [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]
+  #   a.shuffle! # => [5, 3, 8, 7, 6, 1, 9, 4, 2, 0]
+  #   a.shuffle! # => [9, 4, 0, 6, 2, 8, 1, 5, 3, 7]
+  #
+  # Duplicate elements are included:
+  #
+  #   a =             [0, 1, 0, 1, 0, 1, 0, 1, 0, 1]
+  #   a.shuffle! # => [1, 0, 0, 1, 1, 0, 1, 0, 0, 1]
+  #   a.shuffle! # => [0, 1, 0, 1, 1, 0, 1, 0, 1, 0]
+  #
+  # The object given with the keyword argument +random+ is used as the random number generator.
+  #
+  # Related: see {Methods for Assigning}[rdoc-ref:Array@Methods+for+Assigning].
   def shuffle!(random: Random)
     Primitive.rb_ary_shuffle_bang(random)
   end
 
   # call-seq:
-  #    array.shuffle(random: Random) -> new_ary
+  #   shuffle(random: Random) -> new_array
+  #
+  # Returns a new array containing all elements from +self+ in a random order,
+  # as selected by the object given by the keyword argument +random+:
   #
-  # 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]
+  #   a =            [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]
+  #   a.shuffle # => [0, 8, 1, 9, 6, 3, 4, 7, 2, 5]
+  #   a.shuffle # => [8, 9, 0, 5, 1, 2, 6, 4, 7, 3]
   #
-  # The optional +random+ argument will be used as the random number generator:
-  #    a.shuffle(random: Random.new(1))  #=> [1, 3, 2]
+  # Duplicate elements are included:
+  #
+  #   a =            [0, 1, 0, 1, 0, 1, 0, 1, 0, 1]
+  #   a.shuffle # => [1, 0, 1, 1, 0, 0, 1, 0, 0, 1]
+  #   a.shuffle # => [1, 1, 0, 0, 0, 1, 1, 0, 0, 1]
+  #
+  # The object given with the keyword argument +random+ is used as the random number generator.
+  #
+  # Related: see {Methods for Fetching}[rdoc-ref:Array@Methods+for+Fetching].
   def shuffle(random: Random)
     Primitive.rb_ary_shuffle(random)
   end
 
   # call-seq:
-  #    array.sample(random: Random) -> object
-  #    array.sample(n, random: Random) -> new_ary
+  #   sample(random: Random) -> object
+  #   sample(count, random: Random) -> new_ary
   #
-  # Returns random elements from +self+.
+  # Returns random elements from +self+,
+  # as selected by the object given by the keyword argument +random+.
   #
-  # When no arguments are given, returns a random element from +self+:
-  #    a = [1, 2, 3, 4, 5, 6, 7, 8, 9, 10]
-  #    a.sample # => 3
-  #    a.sample # => 8
-  # If +self+ is empty, returns +nil+.
+  # With no argument +count+ given, returns one random element from +self+:
+  #
+  #   a = [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]
+  #   a.sample # => 3
+  #   a.sample # => 8
+  #
+  # Returns +nil+ if +self+ is empty:
+  #
+  #   [].sample # => nil
+  #
+  # With a non-negative numeric argument +count+ given,
+  # returns a new array containing +count+ random elements from +self+:
+  #
+  #   a.sample(3) # => [8, 9, 2]
+  #   a.sample(6) # => [9, 6, 0, 3, 1, 4]
+  #
+  # The order of the result array is unrelated to the order of +self+.
+  #
+  # Returns a new empty array if +self+ is empty:
+  #
+  #   [].sample(4) # => []
+  #
+  # May return duplicates in +self+:
+  #
+  #   a = [1, 1, 1, 2, 2, 3]
+  #   a.sample(a.size) # => [1, 1, 3, 2, 1, 2]
   #
-  # When argument +n+ is given, returns a new \Array containing +n+ random
-  # elements from +self+:
-  #    a.sample(3) # => [8, 9, 2]
-  #    a.sample(6) # => [9, 6, 10, 3, 1, 4]
   # Returns no more than <tt>a.size</tt> elements
   # (because no new duplicates are introduced):
-  #    a.sample(a.size * 2) # => [6, 4, 1, 8, 5, 9, 10, 2, 3, 7]
-  # But +self+ may contain duplicates:
-  #    a = [1, 1, 1, 2, 2, 3]
-  #    a.sample(a.size * 2) # => [1, 1, 3, 2, 1, 2]
-  # The argument +n+ must be a non-negative numeric value.
-  # The order of the result array is unrelated to the order of +self+.
-  # Returns a new empty \Array if +self+ is empty.
   #
-  # The optional +random+ argument will be used as the random number generator:
-  #    a = [1, 2, 3, 4, 5, 6, 7, 8, 9, 10]
-  #    a.sample(random: Random.new(1))     #=> 6
-  #    a.sample(4, random: Random.new(1))  #=> [6, 10, 9, 2]
+  #   a.sample(50) # => [6, 4, 1, 8, 5, 9, 0, 2, 3, 7]
+  #
+  # The object given with the keyword argument +random+ is used as the random number generator:
+  #
+  #   a = [1, 2, 3, 4, 5, 6, 7, 8, 9, 10]
+  #   a.sample(random: Random.new(1))     # => 6
+  #   a.sample(4, random: Random.new(1))  # => [6, 10, 9, 2]
+  #
+  # Related: see {Methods for Fetching}[rdoc-ref:Array@Methods+for+Fetching].
   def sample(n = (ary = false), random: Random)
     if Primitive.mandatory_only?
       # Primitive.cexpr! %{ rb_ary_sample(self, rb_cRandom, Qfalse, Qfalse) }
@@ -68,12 +103,12 @@ def sample(n = (ary = false), random: Random)
   end
 
   # call-seq:
-  #   array.first -> object or nil
-  #   array.first(n) -> new_array
+  #   first -> object or nil
+  #   first(count) -> new_array
   #
-  # Returns elements from +self+; does not modify +self+.
+  # Returns elements from +self+, or +nil+; does not modify +self+.
   #
-  # When no argument is given, returns the first element:
+  # With no argument given, returns the first element (if available):
   #
   #   a = [:foo, 'bar', 2]
   #   a.first # => :foo
@@ -81,23 +116,16 @@ def sample(n = (ary = false), random: Random)
   #
   # If +self+ is empty, returns +nil+.
   #
-  # When non-negative Integer argument +n+ is given,
-  # returns the first +n+ elements in a new \Array:
-  #
-  #   a = [:foo, 'bar', 2]
-  #   a.first(2) # => [:foo, "bar"]
+  #   [].first # => nil
   #
-  # If <tt>n >= array.size</tt>, returns all elements:
+  # With a non-negative integer argument +count+ given,
+  # returns the first +count+ elements (as available) in a new array:
   #
-  #   a = [:foo, 'bar', 2]
+  #   a.first(0)  # => []
+  #   a.first(2)  # => [:foo, "bar"]
   #   a.first(50) # => [:foo, "bar", 2]
   #
-  # If <tt>n == 0</tt> returns an new empty \Array:
-  #
-  #   a = [:foo, 'bar', 2]
-  #   a.first(0) # []
-  #
-  # Related: #last.
+  # Related: see {Methods for Querying}[rdoc-ref:Array@Methods+for+Querying].
   def first n = unspecified = true
     if Primitive.mandatory_only?
       Primitive.attr! :leaf
@@ -112,36 +140,29 @@ def first n = unspecified = true
   end
 
   # call-seq:
-  #   array.last  -> object or nil
-  #   array.last(n) -> new_array
+  #  last  -> last_object or nil
+  #  last(count) -> new_array
   #
-  # Returns elements from +self+; +self+ is not modified.
+  # Returns elements from +self+, or +nil+; +self+ is not modified.
   #
-  # When no argument is given, returns the last element:
+  # With no argument given, returns the last element, or +nil+ if +self+ is empty:
   #
   #   a = [:foo, 'bar', 2]
   #   a.last # => 2
   #   a # => [:foo, "bar", 2]
+  #   [].last # => nil
   #
-  # If +self+ is empty, returns +nil+.
   #
-  # When non-negative Integer argument +n+ is given,
-  # returns the last +n+ elements in a new \Array:
-  #
-  #   a = [:foo, 'bar', 2]
-  #   a.last(2) # => ["bar", 2]
-  #
-  # If <tt>n >= array.size</tt>, returns all elements:
+  # With non-negative integer argument +count+ given,
+  # returns a new array containing the trailing +count+ elements of +self+, as available:
   #
   #   a = [:foo, 'bar', 2]
+  #   a.last(2)  # => ["bar", 2]
   #   a.last(50) # => [:foo, "bar", 2]
+  #   a.last(0)  # => []
+  #   [].last(3) # => []
   #
-  # If <tt>n == 0</tt>, returns an new empty \Array:
-  #
-  #   a = [:foo, 'bar', 2]
-  #   a.last(0) # []
-  #
-  # Related: #first.
+  # Related: see {Methods for Fetching}[rdoc-ref:Array@Methods+for+Fetching].
   def last n = unspecified = true
     if Primitive.mandatory_only?
       Primitive.attr! :leaf
@@ -154,4 +175,110 @@ def last n = unspecified = true
       end
     end
   end
+
+  # call-seq:
+  #   fetch_values(*indexes) -> new_array
+  #   fetch_values(*indexes) { |index| ... } -> new_array
+  #
+  # With no block given, returns a new array containing the elements of +self+
+  # at the offsets specified by +indexes+. Each of the +indexes+ must be an
+  # {integer-convertible object}[rdoc-ref:implicit_conversion.rdoc@Integer-Convertible+Objects]:
+  #
+  #    a = [:foo, :bar, :baz]
+  #    a.fetch_values(2, 0)   # => [:baz, :foo]
+  #    a.fetch_values(2.1, 0) # => [:baz, :foo]
+  #    a.fetch_values         # => []
+  #
+  # For a negative index, counts backwards from the end of the array:
+  #
+  #    a.fetch_values(-2, -1) # [:bar, :baz]
+  #
+  # When no block is given, raises an exception if any index is out of range.
+  #
+  # With a block given, for each index:
+  #
+  # - If the index is in range, uses an element of +self+ (as above).
+  # - Otherwise, calls the block with the index and uses the block's return value.
+  #
+  # Example:
+  #
+  #   a = [:foo, :bar, :baz]
+  #   a.fetch_values(1, 0, 42, 777) { |index| index.to_s }
+  #   # => [:bar, :foo, "42", "777"]
+  #
+  # Related: see {Methods for Fetching}[rdoc-ref:Array@Methods+for+Fetching].
+  def fetch_values(*indexes, &block)
+    indexes.map! { |i| fetch(i, &block) }
+    indexes
+  end
+
+  with_yjit do
+    if Primitive.rb_builtin_basic_definition_p(:each)
+      undef :each
+
+      def each # :nodoc:
+        Primitive.attr! :inline_block, :c_trace
+
+        unless defined?(yield)
+          return Primitive.cexpr! 'SIZED_ENUMERATOR(self, 0, 0, ary_enum_length)'
+        end
+        _i = 0
+        value = nil
+        while Primitive.cexpr!(%q{ ary_fetch_next(self, LOCAL_PTR(_i), LOCAL_PTR(value)) })
+          yield value
+        end
+        self
+      end
+    end
+
+    if Primitive.rb_builtin_basic_definition_p(:map)
+      undef :map
+
+      def map # :nodoc:
+        Primitive.attr! :inline_block, :c_trace
+
+        unless defined?(yield)
+          return Primitive.cexpr! 'SIZED_ENUMERATOR(self, 0, 0, ary_enum_length)'
+        end
+
+        _i = 0
+        value = nil
+        result = Primitive.ary_sized_alloc
+        while Primitive.cexpr!(%q{ ary_fetch_next(self, LOCAL_PTR(_i), LOCAL_PTR(value)) })
+          result << yield(value)
+        end
+        result
+      end
+
+      if Primitive.rb_builtin_basic_definition_p(:collect)
+        undef :collect
+        alias collect map
+      end
+    end
+
+    if Primitive.rb_builtin_basic_definition_p(:select)
+      undef :select
+
+      def select # :nodoc:
+        Primitive.attr! :inline_block, :c_trace
+
+        unless defined?(yield)
+          return Primitive.cexpr! 'SIZED_ENUMERATOR(self, 0, 0, ary_enum_length)'
+        end
+
+        _i = 0
+        value = nil
+        result = Primitive.ary_sized_alloc
+        while Primitive.cexpr!(%q{ ary_fetch_next(self, LOCAL_PTR(_i), LOCAL_PTR(value)) })
+          result << value if yield value
+        end
+        result
+      end
+
+      if Primitive.rb_builtin_basic_definition_p(:filter)
+        undef :filter
+        alias filter select
+      end
+    end
+  end
 end
diff --git a/ast.c b/ast.c
index 4bd3784fbae9ae..dde42e5921f3d5 100644
--- a/ast.c
+++ b/ast.c
@@ -14,9 +14,10 @@
 
 static VALUE rb_mAST;
 static VALUE rb_cNode;
+static VALUE rb_cLocation;
 
 struct ASTNodeData {
-    rb_ast_t *ast;
+    VALUE ast_value;
     const NODE *node;
 };
 
@@ -24,14 +25,16 @@ static void
 node_gc_mark(void *ptr)
 {
     struct ASTNodeData *data = (struct ASTNodeData *)ptr;
-    rb_gc_mark((VALUE)data->ast);
+    rb_gc_mark(data->ast_value);
 }
 
 static size_t
 node_memsize(const void *ptr)
 {
     struct ASTNodeData *data = (struct ASTNodeData *)ptr;
-    return rb_ast_memsize(data->ast);
+    rb_ast_t *ast = rb_ruby_ast_data_get(data->ast_value);
+
+    return sizeof(struct ASTNodeData) + rb_ast_memsize(ast);
 }
 
 static const rb_data_type_t rb_node_type = {
@@ -41,25 +44,51 @@ static const rb_data_type_t rb_node_type = {
     RUBY_TYPED_FREE_IMMEDIATELY,
 };
 
+struct ASTLocationData {
+    int first_lineno;
+    int first_column;
+    int last_lineno;
+    int last_column;
+};
+
+static void
+location_gc_mark(void *ptr)
+{
+}
+
+static size_t
+location_memsize(const void *ptr)
+{
+    return sizeof(struct ASTLocationData);
+}
+
+static const rb_data_type_t rb_location_type = {
+    "AST/location",
+    {location_gc_mark, RUBY_TYPED_DEFAULT_FREE, location_memsize,},
+    0, 0,
+    RUBY_TYPED_FREE_IMMEDIATELY,
+};
+
+
 static VALUE rb_ast_node_alloc(VALUE klass);
 
 static void
-setup_node(VALUE obj, rb_ast_t *ast, const NODE *node)
+setup_node(VALUE obj, VALUE ast_value, const NODE *node)
 {
     struct ASTNodeData *data;
 
     TypedData_Get_Struct(obj, struct ASTNodeData, &rb_node_type, data);
-    data->ast = ast;
+    data->ast_value = ast_value;
     data->node = node;
 }
 
 static VALUE
-ast_new_internal(rb_ast_t *ast, const NODE *node)
+ast_new_internal(VALUE ast_value, const NODE *node)
 {
     VALUE obj;
 
     obj = rb_ast_node_alloc(rb_cNode);
-    setup_node(obj, ast, node);
+    setup_node(obj, ast_value, node);
 
     return obj;
 }
@@ -74,14 +103,26 @@ ast_parse_new(void)
 }
 
 static VALUE
-ast_parse_done(rb_ast_t *ast)
+ast_parse_done(VALUE ast_value)
 {
+    rb_ast_t *ast = rb_ruby_ast_data_get(ast_value);
+
     if (!ast->body.root) {
         rb_ast_dispose(ast);
         rb_exc_raise(GET_EC()->errinfo);
     }
 
-    return ast_new_internal(ast, (NODE *)ast->body.root);
+    return ast_new_internal(ast_value, (NODE *)ast->body.root);
+}
+
+static VALUE
+setup_vparser(VALUE keep_script_lines, VALUE error_tolerant, VALUE keep_tokens)
+{
+    VALUE vparser = ast_parse_new();
+    if (RTEST(keep_script_lines)) rb_parser_set_script_lines(vparser);
+    if (RTEST(error_tolerant)) rb_parser_error_tolerant(vparser);
+    if (RTEST(keep_tokens)) rb_parser_keep_tokens(vparser);
+    return vparser;
 }
 
 static VALUE
@@ -93,15 +134,11 @@ ast_s_parse(rb_execution_context_t *ec, VALUE module, VALUE str, VALUE keep_scri
 static VALUE
 rb_ast_parse_str(VALUE str, VALUE keep_script_lines, VALUE error_tolerant, VALUE keep_tokens)
 {
-    rb_ast_t *ast = 0;
-
+    VALUE ast_value = Qnil;
     StringValue(str);
-    VALUE vparser = ast_parse_new();
-    if (RTEST(keep_script_lines)) rb_parser_set_script_lines(vparser, Qtrue);
-    if (RTEST(error_tolerant)) rb_parser_error_tolerant(vparser);
-    if (RTEST(keep_tokens)) rb_parser_keep_tokens(vparser);
-    ast = rb_parser_compile_string_path(vparser, Qnil, str, 1);
-    return ast_parse_done(ast);
+    VALUE vparser = setup_vparser(keep_script_lines, error_tolerant, keep_tokens);
+    ast_value = rb_parser_compile_string_path(vparser, Qnil, str, 1);
+    return ast_parse_done(ast_value);
 }
 
 static VALUE
@@ -114,49 +151,29 @@ static VALUE
 rb_ast_parse_file(VALUE path, VALUE keep_script_lines, VALUE error_tolerant, VALUE keep_tokens)
 {
     VALUE f;
-    rb_ast_t *ast = 0;
+    VALUE ast_value = Qnil;
     rb_encoding *enc = rb_utf8_encoding();
 
-    FilePathValue(path);
     f = rb_file_open_str(path, "r");
     rb_funcall(f, rb_intern("set_encoding"), 2, rb_enc_from_encoding(enc), rb_str_new_cstr("-"));
-    VALUE vparser = ast_parse_new();
-    if (RTEST(keep_script_lines)) rb_parser_set_script_lines(vparser, Qtrue);
-    if (RTEST(error_tolerant))  rb_parser_error_tolerant(vparser);
-    if (RTEST(keep_tokens))  rb_parser_keep_tokens(vparser);
-    ast = rb_parser_compile_file_path(vparser, Qnil, f, 1);
+    VALUE vparser = setup_vparser(keep_script_lines, error_tolerant, keep_tokens);
+    ast_value = rb_parser_compile_file_path(vparser, Qnil, f, 1);
     rb_io_close(f);
-    return ast_parse_done(ast);
-}
-
-static VALUE
-lex_array(VALUE array, int index)
-{
-    VALUE str = rb_ary_entry(array, index);
-    if (!NIL_P(str)) {
-        StringValue(str);
-        if (!rb_enc_asciicompat(rb_enc_get(str))) {
-            rb_raise(rb_eArgError, "invalid source encoding");
-        }
-    }
-    return str;
+    return ast_parse_done(ast_value);
 }
 
 static VALUE
 rb_ast_parse_array(VALUE array, VALUE keep_script_lines, VALUE error_tolerant, VALUE keep_tokens)
 {
-    rb_ast_t *ast = 0;
+    VALUE ast_value = Qnil;
 
     array = rb_check_array_type(array);
-    VALUE vparser = ast_parse_new();
-    if (RTEST(keep_script_lines)) rb_parser_set_script_lines(vparser, Qtrue);
-    if (RTEST(error_tolerant)) rb_parser_error_tolerant(vparser);
-    if (RTEST(keep_tokens)) rb_parser_keep_tokens(vparser);
-    ast = rb_parser_compile_generic(vparser, lex_array, Qnil, array, 1);
-    return ast_parse_done(ast);
+    VALUE vparser = setup_vparser(keep_script_lines, error_tolerant, keep_tokens);
+    ast_value = rb_parser_compile_array(vparser, Qnil, array, 1);
+    return ast_parse_done(ast_value);
 }
 
-static VALUE node_children(rb_ast_t*, const NODE*);
+static VALUE node_children(VALUE, const NODE*);
 
 static VALUE
 node_find(VALUE self, const int node_id)
@@ -168,7 +185,7 @@ node_find(VALUE self, const int node_id)
 
     if (nd_node_id(data->node) == node_id) return self;
 
-    ary = node_children(data->ast, data->node);
+    ary = node_children(data->ast_value, data->node);
 
     for (i = 0; i < RARRAY_LEN(ary); i++) {
         VALUE child = RARRAY_AREF(ary, i);
@@ -184,29 +201,6 @@ node_find(VALUE self, const int node_id)
 
 extern VALUE rb_e_script;
 
-VALUE
-rb_script_lines_for(VALUE path, bool add)
-{
-    VALUE hash, lines;
-    ID script_lines;
-    CONST_ID(script_lines, "SCRIPT_LINES__");
-    if (!rb_const_defined_at(rb_cObject, script_lines)) return Qnil;
-    hash = rb_const_get_at(rb_cObject, script_lines);
-    if (!RB_TYPE_P(hash, T_HASH)) return Qnil;
-    if (add) {
-        rb_hash_aset(hash, path, lines = rb_ary_new());
-    }
-    else if (!RB_TYPE_P((lines = rb_hash_lookup(hash, path)), T_ARRAY)) {
-        return Qnil;
-    }
-    return lines;
-}
-static VALUE
-script_lines(VALUE path)
-{
-    return rb_script_lines_for(path, false);
-}
-
 static VALUE
 node_id_for_backtrace_location(rb_execution_context_t *ec, VALUE module, VALUE location)
 {
@@ -254,6 +248,11 @@ ast_s_of(rb_execution_context_t *ec, VALUE module, VALUE body, VALUE keep_script
     if (!iseq) {
         return Qnil;
     }
+
+    if (ISEQ_BODY(iseq)->prism) {
+        rb_raise(rb_eRuntimeError, "cannot get AST for ISEQ compiled by prism");
+    }
+
     lines = ISEQ_BODY(iseq)->variable.script_lines;
 
     VALUE path = rb_iseq_path(iseq);
@@ -263,7 +262,7 @@ ast_s_of(rb_execution_context_t *ec, VALUE module, VALUE body, VALUE keep_script
         rb_raise(rb_eArgError, "cannot get AST for method defined in eval");
     }
 
-    if (!NIL_P(lines) || !NIL_P(lines = script_lines(path))) {
+    if (!NIL_P(lines)) {
         node = rb_ast_parse_array(lines, keep_script_lines, error_tolerant, keep_tokens);
     }
     else if (e_option) {
@@ -309,10 +308,10 @@ ast_node_node_id(rb_execution_context_t *ec, VALUE self)
     return INT2FIX(nd_node_id(data->node));
 }
 
-#define NEW_CHILD(ast, node) node ? ast_new_internal(ast, node) : Qnil
+#define NEW_CHILD(ast_value, node) (node ? ast_new_internal(ast_value, node) : Qnil)
 
 static VALUE
-rb_ary_new_from_node_args(rb_ast_t *ast, long n, ...)
+rb_ary_new_from_node_args(VALUE ast_value, long n, ...)
 {
     va_list ar;
     VALUE ary;
@@ -324,39 +323,57 @@ rb_ary_new_from_node_args(rb_ast_t *ast, long n, ...)
     for (i=0; i<n; i++) {
         NODE *node;
         node = va_arg(ar, NODE *);
-        rb_ary_push(ary, NEW_CHILD(ast, node));
+        rb_ary_push(ary, NEW_CHILD(ast_value, node));
     }
     va_end(ar);
     return ary;
 }
 
 static VALUE
-dump_block(rb_ast_t *ast, const NODE *node)
+dump_block(VALUE ast_value, const struct RNode_BLOCK *node)
 {
     VALUE ary = rb_ary_new();
     do {
-        rb_ary_push(ary, NEW_CHILD(ast, node->nd_head));
+        rb_ary_push(ary, NEW_CHILD(ast_value, node->nd_head));
     } while (node->nd_next &&
         nd_type_p(node->nd_next, NODE_BLOCK) &&
-        (node = node->nd_next, 1));
+        (node = RNODE_BLOCK(node->nd_next), 1));
     if (node->nd_next) {
-        rb_ary_push(ary, NEW_CHILD(ast, node->nd_next));
+        rb_ary_push(ary, NEW_CHILD(ast_value, node->nd_next));
     }
 
     return ary;
 }
 
 static VALUE
-dump_array(rb_ast_t *ast, const NODE *node)
+dump_array(VALUE ast_value, const struct RNode_LIST *node)
 {
     VALUE ary = rb_ary_new();
-    rb_ary_push(ary, NEW_CHILD(ast, node->nd_head));
+    rb_ary_push(ary, NEW_CHILD(ast_value, node->nd_head));
 
     while (node->nd_next && nd_type_p(node->nd_next, NODE_LIST)) {
-        node = node->nd_next;
-        rb_ary_push(ary, NEW_CHILD(ast, node->nd_head));
+        node = RNODE_LIST(node->nd_next);
+        rb_ary_push(ary, NEW_CHILD(ast_value, node->nd_head));
+    }
+    rb_ary_push(ary, NEW_CHILD(ast_value, node->nd_next));
+
+    return ary;
+}
+
+static VALUE
+dump_parser_array(VALUE ast_value, rb_parser_ary_t *p_ary)
+{
+    VALUE ary;
+
+    if (p_ary->data_type != PARSER_ARY_DATA_NODE) {
+        rb_bug("unexpected rb_parser_ary_data_type: %d", p_ary->data_type);
+    }
+
+    ary = rb_ary_new();
+
+    for (long i = 0; i < p_ary->len; i++) {
+        rb_ary_push(ary, NEW_CHILD(ast_value, p_ary->data[i]));
     }
-    rb_ary_push(ary, NEW_CHILD(ast, node->nd_next));
 
     return ary;
 }
@@ -378,307 +395,341 @@ no_name_rest(void)
 }
 
 static VALUE
-rest_arg(rb_ast_t *ast, const NODE *rest_arg)
+rest_arg(VALUE ast_value, const NODE *rest_arg)
 {
-    return NODE_NAMED_REST_P(rest_arg) ? NEW_CHILD(ast, rest_arg) : no_name_rest();
+    return NODE_NAMED_REST_P(rest_arg) ? NEW_CHILD(ast_value, rest_arg) : no_name_rest();
 }
 
 static VALUE
-node_children(rb_ast_t *ast, const NODE *node)
+node_children(VALUE ast_value, const NODE *node)
 {
     char name[sizeof("$") + DECIMAL_SIZE_OF(long)];
 
     enum node_type type = nd_type(node);
     switch (type) {
       case NODE_BLOCK:
-        return dump_block(ast, node);
+        return dump_block(ast_value, RNODE_BLOCK(node));
       case NODE_IF:
-        return rb_ary_new_from_node_args(ast, 3, node->nd_cond, node->nd_body, node->nd_else);
+        return rb_ary_new_from_node_args(ast_value, 3, RNODE_IF(node)->nd_cond, RNODE_IF(node)->nd_body, RNODE_IF(node)->nd_else);
       case NODE_UNLESS:
-        return rb_ary_new_from_node_args(ast, 3, node->nd_cond, node->nd_body, node->nd_else);
+        return rb_ary_new_from_node_args(ast_value, 3, RNODE_UNLESS(node)->nd_cond, RNODE_UNLESS(node)->nd_body, RNODE_UNLESS(node)->nd_else);
       case NODE_CASE:
-        return rb_ary_new_from_node_args(ast, 2, node->nd_head, node->nd_body);
+        return rb_ary_new_from_node_args(ast_value, 2, RNODE_CASE(node)->nd_head, RNODE_CASE(node)->nd_body);
       case NODE_CASE2:
-        return rb_ary_new_from_node_args(ast, 2, node->nd_head, node->nd_body);
+        return rb_ary_new_from_node_args(ast_value, 2, RNODE_CASE2(node)->nd_head, RNODE_CASE2(node)->nd_body);
       case NODE_CASE3:
-        return rb_ary_new_from_node_args(ast, 2, node->nd_head, node->nd_body);
+        return rb_ary_new_from_node_args(ast_value, 2, RNODE_CASE3(node)->nd_head, RNODE_CASE3(node)->nd_body);
       case NODE_WHEN:
-        return rb_ary_new_from_node_args(ast, 3, node->nd_head, node->nd_body, node->nd_next);
+        return rb_ary_new_from_node_args(ast_value, 3, RNODE_WHEN(node)->nd_head, RNODE_WHEN(node)->nd_body, RNODE_WHEN(node)->nd_next);
       case NODE_IN:
-        return rb_ary_new_from_node_args(ast, 3, node->nd_head, node->nd_body, node->nd_next);
+        return rb_ary_new_from_node_args(ast_value, 3, RNODE_IN(node)->nd_head, RNODE_IN(node)->nd_body, RNODE_IN(node)->nd_next);
       case NODE_WHILE:
       case NODE_UNTIL:
-        return rb_ary_push(rb_ary_new_from_node_args(ast, 2, node->nd_cond, node->nd_body),
-                           RBOOL(node->nd_state));
+        return rb_ary_push(rb_ary_new_from_node_args(ast_value, 2, RNODE_WHILE(node)->nd_cond, RNODE_WHILE(node)->nd_body),
+                           RBOOL(RNODE_WHILE(node)->nd_state));
       case NODE_ITER:
       case NODE_FOR:
-        return rb_ary_new_from_node_args(ast, 2, node->nd_iter, node->nd_body);
+        return rb_ary_new_from_node_args(ast_value, 2, RNODE_ITER(node)->nd_iter, RNODE_ITER(node)->nd_body);
       case NODE_FOR_MASGN:
-        return rb_ary_new_from_node_args(ast, 1, node->nd_var);
+        return rb_ary_new_from_node_args(ast_value, 1, RNODE_FOR_MASGN(node)->nd_var);
       case NODE_BREAK:
+        return rb_ary_new_from_node_args(ast_value, 1, RNODE_BREAK(node)->nd_stts);
       case NODE_NEXT:
+        return rb_ary_new_from_node_args(ast_value, 1, RNODE_NEXT(node)->nd_stts);
       case NODE_RETURN:
-        return rb_ary_new_from_node_args(ast, 1, node->nd_stts);
+        return rb_ary_new_from_node_args(ast_value, 1, RNODE_RETURN(node)->nd_stts);
       case NODE_REDO:
-        return rb_ary_new_from_node_args(ast, 0);
+        return rb_ary_new_from_node_args(ast_value, 0);
       case NODE_RETRY:
-        return rb_ary_new_from_node_args(ast, 0);
+        return rb_ary_new_from_node_args(ast_value, 0);
       case NODE_BEGIN:
-        return rb_ary_new_from_node_args(ast, 1, node->nd_body);
+        return rb_ary_new_from_node_args(ast_value, 1, RNODE_BEGIN(node)->nd_body);
       case NODE_RESCUE:
-        return rb_ary_new_from_node_args(ast, 3, node->nd_head, node->nd_resq, node->nd_else);
+        return rb_ary_new_from_node_args(ast_value, 3, RNODE_RESCUE(node)->nd_head, RNODE_RESCUE(node)->nd_resq, RNODE_RESCUE(node)->nd_else);
       case NODE_RESBODY:
-        return rb_ary_new_from_node_args(ast, 3, node->nd_args, node->nd_body, node->nd_head);
+        return rb_ary_new_from_node_args(ast_value, 4, RNODE_RESBODY(node)->nd_args, RNODE_RESBODY(node)->nd_exc_var, RNODE_RESBODY(node)->nd_body, RNODE_RESBODY(node)->nd_next);
       case NODE_ENSURE:
-        return rb_ary_new_from_node_args(ast, 2, node->nd_head, node->nd_ensr);
+        return rb_ary_new_from_node_args(ast_value, 2, RNODE_ENSURE(node)->nd_head, RNODE_ENSURE(node)->nd_ensr);
       case NODE_AND:
       case NODE_OR:
         {
             VALUE ary = rb_ary_new();
 
             while (1) {
-                rb_ary_push(ary, NEW_CHILD(ast, node->nd_1st));
-                if (!node->nd_2nd || !nd_type_p(node->nd_2nd, type))
+                rb_ary_push(ary, NEW_CHILD(ast_value, RNODE_AND(node)->nd_1st));
+                if (!RNODE_AND(node)->nd_2nd || !nd_type_p(RNODE_AND(node)->nd_2nd, type))
                     break;
-                node = node->nd_2nd;
+                node = RNODE_AND(node)->nd_2nd;
             }
-            rb_ary_push(ary, NEW_CHILD(ast, node->nd_2nd));
+            rb_ary_push(ary, NEW_CHILD(ast_value, RNODE_AND(node)->nd_2nd));
             return ary;
         }
       case NODE_MASGN:
-        if (NODE_NAMED_REST_P(node->nd_args)) {
-            return rb_ary_new_from_node_args(ast, 3, node->nd_value, node->nd_head, node->nd_args);
+        if (NODE_NAMED_REST_P(RNODE_MASGN(node)->nd_args)) {
+            return rb_ary_new_from_node_args(ast_value, 3, RNODE_MASGN(node)->nd_value, RNODE_MASGN(node)->nd_head, RNODE_MASGN(node)->nd_args);
         }
         else {
-            return rb_ary_new_from_args(3, NEW_CHILD(ast, node->nd_value),
-                                        NEW_CHILD(ast, node->nd_head),
+            return rb_ary_new_from_args(3, NEW_CHILD(ast_value, RNODE_MASGN(node)->nd_value),
+                                        NEW_CHILD(ast_value, RNODE_MASGN(node)->nd_head),
                                         no_name_rest());
         }
       case NODE_LASGN:
+        if (NODE_REQUIRED_KEYWORD_P(RNODE_LASGN(node)->nd_value)) {
+            return rb_ary_new_from_args(2, var_name(RNODE_LASGN(node)->nd_vid), ID2SYM(rb_intern("NODE_SPECIAL_REQUIRED_KEYWORD")));
+        }
+        return rb_ary_new_from_args(2, var_name(RNODE_LASGN(node)->nd_vid), NEW_CHILD(ast_value, RNODE_LASGN(node)->nd_value));
       case NODE_DASGN:
+        if (NODE_REQUIRED_KEYWORD_P(RNODE_DASGN(node)->nd_value)) {
+            return rb_ary_new_from_args(2, var_name(RNODE_DASGN(node)->nd_vid), ID2SYM(rb_intern("NODE_SPECIAL_REQUIRED_KEYWORD")));
+        }
+        return rb_ary_new_from_args(2, var_name(RNODE_DASGN(node)->nd_vid), NEW_CHILD(ast_value, RNODE_DASGN(node)->nd_value));
       case NODE_IASGN:
+        return rb_ary_new_from_args(2, var_name(RNODE_IASGN(node)->nd_vid), NEW_CHILD(ast_value, RNODE_IASGN(node)->nd_value));
       case NODE_CVASGN:
+        return rb_ary_new_from_args(2, var_name(RNODE_CVASGN(node)->nd_vid), NEW_CHILD(ast_value, RNODE_CVASGN(node)->nd_value));
       case NODE_GASGN:
-        if (NODE_REQUIRED_KEYWORD_P(node)) {
-            return rb_ary_new_from_args(2, var_name(node->nd_vid), ID2SYM(rb_intern("NODE_SPECIAL_REQUIRED_KEYWORD")));
-        }
-        return rb_ary_new_from_args(2, var_name(node->nd_vid), NEW_CHILD(ast, node->nd_value));
+        return rb_ary_new_from_args(2, var_name(RNODE_GASGN(node)->nd_vid), NEW_CHILD(ast_value, RNODE_GASGN(node)->nd_value));
       case NODE_CDECL:
-        if (node->nd_vid) {
-            return rb_ary_new_from_args(2, ID2SYM(node->nd_vid), NEW_CHILD(ast, node->nd_value));
+        if (RNODE_CDECL(node)->nd_vid) {
+            return rb_ary_new_from_args(2, ID2SYM(RNODE_CDECL(node)->nd_vid), NEW_CHILD(ast_value, RNODE_CDECL(node)->nd_value));
         }
-        return rb_ary_new_from_args(3, NEW_CHILD(ast, node->nd_else), ID2SYM(node->nd_else->nd_mid), NEW_CHILD(ast, node->nd_value));
+        return rb_ary_new_from_args(3, NEW_CHILD(ast_value, RNODE_CDECL(node)->nd_else), ID2SYM(RNODE_COLON2(RNODE_CDECL(node)->nd_else)->nd_mid), NEW_CHILD(ast_value, RNODE_CDECL(node)->nd_value));
       case NODE_OP_ASGN1:
-        return rb_ary_new_from_args(4, NEW_CHILD(ast, node->nd_recv),
-                                    ID2SYM(node->nd_mid),
-                                    NEW_CHILD(ast, node->nd_args->nd_head),
-                                    NEW_CHILD(ast, node->nd_args->nd_body));
+        return rb_ary_new_from_args(4, NEW_CHILD(ast_value, RNODE_OP_ASGN1(node)->nd_recv),
+                                    ID2SYM(RNODE_OP_ASGN1(node)->nd_mid),
+                                    NEW_CHILD(ast_value, RNODE_OP_ASGN1(node)->nd_index),
+                                    NEW_CHILD(ast_value, RNODE_OP_ASGN1(node)->nd_rvalue));
       case NODE_OP_ASGN2:
-        return rb_ary_new_from_args(5, NEW_CHILD(ast, node->nd_recv),
-                                    RBOOL(node->nd_next->nd_aid),
-                                    ID2SYM(node->nd_next->nd_vid),
-                                    ID2SYM(node->nd_next->nd_mid),
-                                    NEW_CHILD(ast, node->nd_value));
+        return rb_ary_new_from_args(5, NEW_CHILD(ast_value, RNODE_OP_ASGN2(node)->nd_recv),
+                                    RBOOL(RNODE_OP_ASGN2(node)->nd_aid),
+                                    ID2SYM(RNODE_OP_ASGN2(node)->nd_vid),
+                                    ID2SYM(RNODE_OP_ASGN2(node)->nd_mid),
+                                    NEW_CHILD(ast_value, RNODE_OP_ASGN2(node)->nd_value));
       case NODE_OP_ASGN_AND:
-        return rb_ary_new_from_args(3, NEW_CHILD(ast, node->nd_head), ID2SYM(idANDOP),
-                                    NEW_CHILD(ast, node->nd_value));
+        return rb_ary_new_from_args(3, NEW_CHILD(ast_value, RNODE_OP_ASGN_AND(node)->nd_head), ID2SYM(idANDOP),
+                                    NEW_CHILD(ast_value, RNODE_OP_ASGN_AND(node)->nd_value));
       case NODE_OP_ASGN_OR:
-        return rb_ary_new_from_args(3, NEW_CHILD(ast, node->nd_head), ID2SYM(idOROP),
-                                    NEW_CHILD(ast, node->nd_value));
+        return rb_ary_new_from_args(3, NEW_CHILD(ast_value, RNODE_OP_ASGN_OR(node)->nd_head), ID2SYM(idOROP),
+                                    NEW_CHILD(ast_value, RNODE_OP_ASGN_OR(node)->nd_value));
       case NODE_OP_CDECL:
-        return rb_ary_new_from_args(3, NEW_CHILD(ast, node->nd_head),
-                                    ID2SYM(node->nd_aid),
-                                    NEW_CHILD(ast, node->nd_value));
+        return rb_ary_new_from_args(3, NEW_CHILD(ast_value, RNODE_OP_CDECL(node)->nd_head),
+                                    ID2SYM(RNODE_OP_CDECL(node)->nd_aid),
+                                    NEW_CHILD(ast_value, RNODE_OP_CDECL(node)->nd_value));
       case NODE_CALL:
+        return rb_ary_new_from_args(3, NEW_CHILD(ast_value, RNODE_CALL(node)->nd_recv),
+                                    ID2SYM(RNODE_CALL(node)->nd_mid),
+                                    NEW_CHILD(ast_value, RNODE_CALL(node)->nd_args));
       case NODE_OPCALL:
+        return rb_ary_new_from_args(3, NEW_CHILD(ast_value, RNODE_OPCALL(node)->nd_recv),
+                                    ID2SYM(RNODE_OPCALL(node)->nd_mid),
+                                    NEW_CHILD(ast_value, RNODE_OPCALL(node)->nd_args));
       case NODE_QCALL:
-        return rb_ary_new_from_args(3, NEW_CHILD(ast, node->nd_recv),
-                                    ID2SYM(node->nd_mid),
-                                    NEW_CHILD(ast, node->nd_args));
+        return rb_ary_new_from_args(3, NEW_CHILD(ast_value, RNODE_QCALL(node)->nd_recv),
+                                    ID2SYM(RNODE_QCALL(node)->nd_mid),
+                                    NEW_CHILD(ast_value, RNODE_QCALL(node)->nd_args));
       case NODE_FCALL:
-        return rb_ary_new_from_args(2, ID2SYM(node->nd_mid),
-                                    NEW_CHILD(ast, node->nd_args));
+        return rb_ary_new_from_args(2, ID2SYM(RNODE_FCALL(node)->nd_mid),
+                                    NEW_CHILD(ast_value, RNODE_FCALL(node)->nd_args));
       case NODE_VCALL:
-        return rb_ary_new_from_args(1, ID2SYM(node->nd_mid));
+        return rb_ary_new_from_args(1, ID2SYM(RNODE_VCALL(node)->nd_mid));
       case NODE_SUPER:
-        return rb_ary_new_from_node_args(ast, 1, node->nd_args);
+        return rb_ary_new_from_node_args(ast_value, 1, RNODE_SUPER(node)->nd_args);
       case NODE_ZSUPER:
-        return rb_ary_new_from_node_args(ast, 0);
+        return rb_ary_new_from_node_args(ast_value, 0);
       case NODE_LIST:
-      case NODE_VALUES:
-        return dump_array(ast, node);
+        return dump_array(ast_value, RNODE_LIST(node));
       case NODE_ZLIST:
-        return rb_ary_new_from_node_args(ast, 0);
+        return rb_ary_new_from_node_args(ast_value, 0);
       case NODE_HASH:
-        return rb_ary_new_from_node_args(ast, 1, node->nd_head);
+        return rb_ary_new_from_node_args(ast_value, 1, RNODE_HASH(node)->nd_head);
       case NODE_YIELD:
-        return rb_ary_new_from_node_args(ast, 1, node->nd_head);
+        return rb_ary_new_from_node_args(ast_value, 1, RNODE_YIELD(node)->nd_head);
       case NODE_LVAR:
+        return rb_ary_new_from_args(1, var_name(RNODE_LVAR(node)->nd_vid));
       case NODE_DVAR:
-        return rb_ary_new_from_args(1, var_name(node->nd_vid));
+        return rb_ary_new_from_args(1, var_name(RNODE_DVAR(node)->nd_vid));
       case NODE_IVAR:
+        return rb_ary_new_from_args(1, ID2SYM(RNODE_IVAR(node)->nd_vid));
       case NODE_CONST:
+        return rb_ary_new_from_args(1, ID2SYM(RNODE_CONST(node)->nd_vid));
       case NODE_CVAR:
+        return rb_ary_new_from_args(1, ID2SYM(RNODE_CVAR(node)->nd_vid));
       case NODE_GVAR:
-        return rb_ary_new_from_args(1, ID2SYM(node->nd_vid));
+        return rb_ary_new_from_args(1, ID2SYM(RNODE_GVAR(node)->nd_vid));
       case NODE_NTH_REF:
-        snprintf(name, sizeof(name), "$%ld", node->nd_nth);
+        snprintf(name, sizeof(name), "$%ld", RNODE_NTH_REF(node)->nd_nth);
         return rb_ary_new_from_args(1, ID2SYM(rb_intern(name)));
       case NODE_BACK_REF:
         name[0] = '$';
-        name[1] = (char)node->nd_nth;
+        name[1] = (char)RNODE_BACK_REF(node)->nd_nth;
         name[2] = '\0';
         return rb_ary_new_from_args(1, ID2SYM(rb_intern(name)));
+      case NODE_MATCH:
+        return rb_ary_new_from_args(1, rb_node_regx_string_val(node));
       case NODE_MATCH2:
-        if (node->nd_args) {
-            return rb_ary_new_from_node_args(ast, 3, node->nd_recv, node->nd_value, node->nd_args);
+        if (RNODE_MATCH2(node)->nd_args) {
+            return rb_ary_new_from_node_args(ast_value, 3, RNODE_MATCH2(node)->nd_recv, RNODE_MATCH2(node)->nd_value, RNODE_MATCH2(node)->nd_args);
         }
-        return rb_ary_new_from_node_args(ast, 2, node->nd_recv, node->nd_value);
+        return rb_ary_new_from_node_args(ast_value, 2, RNODE_MATCH2(node)->nd_recv, RNODE_MATCH2(node)->nd_value);
       case NODE_MATCH3:
-        return rb_ary_new_from_node_args(ast, 2, node->nd_recv, node->nd_value);
-      case NODE_MATCH:
-      case NODE_LIT:
+        return rb_ary_new_from_node_args(ast_value, 2, RNODE_MATCH3(node)->nd_recv, RNODE_MATCH3(node)->nd_value);
       case NODE_STR:
       case NODE_XSTR:
-        return rb_ary_new_from_args(1, node->nd_lit);
+        return rb_ary_new_from_args(1, rb_node_str_string_val(node));
+      case NODE_INTEGER:
+        return rb_ary_new_from_args(1, rb_node_integer_literal_val(node));
+      case NODE_FLOAT:
+        return rb_ary_new_from_args(1, rb_node_float_literal_val(node));
+      case NODE_RATIONAL:
+        return rb_ary_new_from_args(1, rb_node_rational_literal_val(node));
+      case NODE_IMAGINARY:
+        return rb_ary_new_from_args(1, rb_node_imaginary_literal_val(node));
+      case NODE_REGX:
+        return rb_ary_new_from_args(1, rb_node_regx_string_val(node));
       case NODE_ONCE:
-        return rb_ary_new_from_node_args(ast, 1, node->nd_body);
+        return rb_ary_new_from_node_args(ast_value, 1, RNODE_ONCE(node)->nd_body);
       case NODE_DSTR:
       case NODE_DXSTR:
       case NODE_DREGX:
       case NODE_DSYM:
         {
-            NODE *n = node->nd_next;
+            struct RNode_LIST *n = RNODE_DSTR(node)->nd_next;
             VALUE head = Qnil, next = Qnil;
             if (n) {
-                head = NEW_CHILD(ast, n->nd_head);
-                next = NEW_CHILD(ast, n->nd_next);
+                head = NEW_CHILD(ast_value, n->nd_head);
+                next = NEW_CHILD(ast_value, n->nd_next);
             }
-            return rb_ary_new_from_args(3, node->nd_lit, head, next);
+            return rb_ary_new_from_args(3, rb_node_dstr_string_val(node), head, next);
         }
+      case NODE_SYM:
+        return rb_ary_new_from_args(1, rb_node_sym_string_val(node));
       case NODE_EVSTR:
-        return rb_ary_new_from_node_args(ast, 1, node->nd_body);
+        return rb_ary_new_from_node_args(ast_value, 1, RNODE_EVSTR(node)->nd_body);
       case NODE_ARGSCAT:
-        return rb_ary_new_from_node_args(ast, 2, node->nd_head, node->nd_body);
+        return rb_ary_new_from_node_args(ast_value, 2, RNODE_ARGSCAT(node)->nd_head, RNODE_ARGSCAT(node)->nd_body);
       case NODE_ARGSPUSH:
-        return rb_ary_new_from_node_args(ast, 2, node->nd_head, node->nd_body);
+        return rb_ary_new_from_node_args(ast_value, 2, RNODE_ARGSPUSH(node)->nd_head, RNODE_ARGSPUSH(node)->nd_body);
       case NODE_SPLAT:
-        return rb_ary_new_from_node_args(ast, 1, node->nd_head);
+        return rb_ary_new_from_node_args(ast_value, 1, RNODE_SPLAT(node)->nd_head);
       case NODE_BLOCK_PASS:
-        return rb_ary_new_from_node_args(ast, 2, node->nd_head, node->nd_body);
+        return rb_ary_new_from_node_args(ast_value, 2, RNODE_BLOCK_PASS(node)->nd_head, RNODE_BLOCK_PASS(node)->nd_body);
       case NODE_DEFN:
-        return rb_ary_new_from_args(2, ID2SYM(node->nd_mid), NEW_CHILD(ast, node->nd_defn));
+        return rb_ary_new_from_args(2, ID2SYM(RNODE_DEFN(node)->nd_mid), NEW_CHILD(ast_value, RNODE_DEFN(node)->nd_defn));
       case NODE_DEFS:
-        return rb_ary_new_from_args(3, NEW_CHILD(ast, node->nd_recv), ID2SYM(node->nd_mid), NEW_CHILD(ast, node->nd_defn));
+        return rb_ary_new_from_args(3, NEW_CHILD(ast_value, RNODE_DEFS(node)->nd_recv), ID2SYM(RNODE_DEFS(node)->nd_mid), NEW_CHILD(ast_value, RNODE_DEFS(node)->nd_defn));
       case NODE_ALIAS:
-        return rb_ary_new_from_node_args(ast, 2, node->nd_1st, node->nd_2nd);
+        return rb_ary_new_from_node_args(ast_value, 2, RNODE_ALIAS(node)->nd_1st, RNODE_ALIAS(node)->nd_2nd);
       case NODE_VALIAS:
-        return rb_ary_new_from_args(2, ID2SYM(node->nd_alias), ID2SYM(node->nd_orig));
+        return rb_ary_new_from_args(2, ID2SYM(RNODE_VALIAS(node)->nd_alias), ID2SYM(RNODE_VALIAS(node)->nd_orig));
       case NODE_UNDEF:
-        return rb_ary_new_from_node_args(ast, 1, node->nd_undef);
+        return rb_ary_new_from_args(1, dump_parser_array(ast_value, RNODE_UNDEF(node)->nd_undefs));
       case NODE_CLASS:
-        return rb_ary_new_from_node_args(ast, 3, node->nd_cpath, node->nd_super, node->nd_body);
+        return rb_ary_new_from_node_args(ast_value, 3, RNODE_CLASS(node)->nd_cpath, RNODE_CLASS(node)->nd_super, RNODE_CLASS(node)->nd_body);
       case NODE_MODULE:
-        return rb_ary_new_from_node_args(ast, 2, node->nd_cpath, node->nd_body);
+        return rb_ary_new_from_node_args(ast_value, 2, RNODE_MODULE(node)->nd_cpath, RNODE_MODULE(node)->nd_body);
       case NODE_SCLASS:
-        return rb_ary_new_from_node_args(ast, 2, node->nd_recv, node->nd_body);
+        return rb_ary_new_from_node_args(ast_value, 2, RNODE_SCLASS(node)->nd_recv, RNODE_SCLASS(node)->nd_body);
       case NODE_COLON2:
-        return rb_ary_new_from_args(2, NEW_CHILD(ast, node->nd_head), ID2SYM(node->nd_mid));
+        return rb_ary_new_from_args(2, NEW_CHILD(ast_value, RNODE_COLON2(node)->nd_head), ID2SYM(RNODE_COLON2(node)->nd_mid));
       case NODE_COLON3:
-        return rb_ary_new_from_args(1, ID2SYM(node->nd_mid));
+        return rb_ary_new_from_args(1, ID2SYM(RNODE_COLON3(node)->nd_mid));
       case NODE_DOT2:
       case NODE_DOT3:
       case NODE_FLIP2:
       case NODE_FLIP3:
-        return rb_ary_new_from_node_args(ast, 2, node->nd_beg, node->nd_end);
+        return rb_ary_new_from_node_args(ast_value, 2, RNODE_DOT2(node)->nd_beg, RNODE_DOT2(node)->nd_end);
       case NODE_SELF:
-        return rb_ary_new_from_node_args(ast, 0);
+        return rb_ary_new_from_node_args(ast_value, 0);
       case NODE_NIL:
-        return rb_ary_new_from_node_args(ast, 0);
+        return rb_ary_new_from_node_args(ast_value, 0);
       case NODE_TRUE:
-        return rb_ary_new_from_node_args(ast, 0);
+        return rb_ary_new_from_node_args(ast_value, 0);
       case NODE_FALSE:
-        return rb_ary_new_from_node_args(ast, 0);
+        return rb_ary_new_from_node_args(ast_value, 0);
       case NODE_ERRINFO:
-        return rb_ary_new_from_node_args(ast, 0);
+        return rb_ary_new_from_node_args(ast_value, 0);
       case NODE_DEFINED:
-        return rb_ary_new_from_node_args(ast, 1, node->nd_head);
+        return rb_ary_new_from_node_args(ast_value, 1, RNODE_DEFINED(node)->nd_head);
       case NODE_POSTEXE:
-        return rb_ary_new_from_node_args(ast, 1, node->nd_body);
+        return rb_ary_new_from_node_args(ast_value, 1, RNODE_POSTEXE(node)->nd_body);
       case NODE_ATTRASGN:
-        return rb_ary_new_from_args(3, NEW_CHILD(ast, node->nd_recv), ID2SYM(node->nd_mid), NEW_CHILD(ast, node->nd_args));
+        return rb_ary_new_from_args(3, NEW_CHILD(ast_value, RNODE_ATTRASGN(node)->nd_recv), ID2SYM(RNODE_ATTRASGN(node)->nd_mid), NEW_CHILD(ast_value, RNODE_ATTRASGN(node)->nd_args));
       case NODE_LAMBDA:
-        return rb_ary_new_from_node_args(ast, 1, node->nd_body);
+        return rb_ary_new_from_node_args(ast_value, 1, RNODE_LAMBDA(node)->nd_body);
       case NODE_OPT_ARG:
-        return rb_ary_new_from_node_args(ast, 2, node->nd_body, node->nd_next);
+        return rb_ary_new_from_node_args(ast_value, 2, RNODE_OPT_ARG(node)->nd_body, RNODE_OPT_ARG(node)->nd_next);
       case NODE_KW_ARG:
-        return rb_ary_new_from_node_args(ast, 2, node->nd_body, node->nd_next);
+        return rb_ary_new_from_node_args(ast_value, 2, RNODE_KW_ARG(node)->nd_body, RNODE_KW_ARG(node)->nd_next);
       case NODE_POSTARG:
-        if (NODE_NAMED_REST_P(node->nd_1st)) {
-            return rb_ary_new_from_node_args(ast, 2, node->nd_1st, node->nd_2nd);
+        if (NODE_NAMED_REST_P(RNODE_POSTARG(node)->nd_1st)) {
+            return rb_ary_new_from_node_args(ast_value, 2, RNODE_POSTARG(node)->nd_1st, RNODE_POSTARG(node)->nd_2nd);
         }
         return rb_ary_new_from_args(2, no_name_rest(),
-                                    NEW_CHILD(ast, node->nd_2nd));
+                                    NEW_CHILD(ast_value, RNODE_POSTARG(node)->nd_2nd));
       case NODE_ARGS:
         {
-            struct rb_args_info *ainfo = node->nd_ainfo;
+            struct rb_args_info *ainfo = &RNODE_ARGS(node)->nd_ainfo;
             return rb_ary_new_from_args(10,
                                         INT2NUM(ainfo->pre_args_num),
-                                        NEW_CHILD(ast, ainfo->pre_init),
-                                        NEW_CHILD(ast, ainfo->opt_args),
+                                        NEW_CHILD(ast_value, ainfo->pre_init),
+                                        NEW_CHILD(ast_value, (NODE *)ainfo->opt_args),
                                         var_name(ainfo->first_post_arg),
                                         INT2NUM(ainfo->post_args_num),
-                                        NEW_CHILD(ast, ainfo->post_init),
+                                        NEW_CHILD(ast_value, ainfo->post_init),
                                         (ainfo->rest_arg == NODE_SPECIAL_EXCESSIVE_COMMA
                                             ? ID2SYM(rb_intern("NODE_SPECIAL_EXCESSIVE_COMMA"))
                                             : var_name(ainfo->rest_arg)),
-                                        (ainfo->no_kwarg ? Qfalse : NEW_CHILD(ast, ainfo->kw_args)),
-                                        (ainfo->no_kwarg ? Qfalse : NEW_CHILD(ast, ainfo->kw_rest_arg)),
+                                        (ainfo->no_kwarg ? Qfalse : NEW_CHILD(ast_value, (NODE *)ainfo->kw_args)),
+                                        (ainfo->no_kwarg ? Qfalse : NEW_CHILD(ast_value, ainfo->kw_rest_arg)),
                                         var_name(ainfo->block_arg));
         }
       case NODE_SCOPE:
         {
-            rb_ast_id_table_t *tbl = node->nd_tbl;
+            rb_ast_id_table_t *tbl = RNODE_SCOPE(node)->nd_tbl;
             int i, size = tbl ? tbl->size : 0;
             VALUE locals = rb_ary_new_capa(size);
             for (i = 0; i < size; i++) {
                 rb_ary_push(locals, var_name(tbl->ids[i]));
             }
-            return rb_ary_new_from_args(3, locals, NEW_CHILD(ast, node->nd_args), NEW_CHILD(ast, node->nd_body));
+            return rb_ary_new_from_args(3, locals, NEW_CHILD(ast_value, (NODE *)RNODE_SCOPE(node)->nd_args), NEW_CHILD(ast_value, RNODE_SCOPE(node)->nd_body));
         }
       case NODE_ARYPTN:
         {
-            struct rb_ary_pattern_info *apinfo = node->nd_apinfo;
-            VALUE rest = rest_arg(ast, apinfo->rest_arg);
+            VALUE rest = rest_arg(ast_value, RNODE_ARYPTN(node)->rest_arg);
             return rb_ary_new_from_args(4,
-                                        NEW_CHILD(ast, node->nd_pconst),
-                                        NEW_CHILD(ast, apinfo->pre_args),
+                                        NEW_CHILD(ast_value, RNODE_ARYPTN(node)->nd_pconst),
+                                        NEW_CHILD(ast_value, RNODE_ARYPTN(node)->pre_args),
                                         rest,
-                                        NEW_CHILD(ast, apinfo->post_args));
+                                        NEW_CHILD(ast_value, RNODE_ARYPTN(node)->post_args));
         }
       case NODE_FNDPTN:
         {
-            struct rb_fnd_pattern_info *fpinfo = node->nd_fpinfo;
-            VALUE pre_rest = rest_arg(ast, fpinfo->pre_rest_arg);
-            VALUE post_rest = rest_arg(ast, fpinfo->post_rest_arg);
+            VALUE pre_rest = rest_arg(ast_value, RNODE_FNDPTN(node)->pre_rest_arg);
+            VALUE post_rest = rest_arg(ast_value, RNODE_FNDPTN(node)->post_rest_arg);
             return rb_ary_new_from_args(4,
-                                        NEW_CHILD(ast, node->nd_pconst),
+                                        NEW_CHILD(ast_value, RNODE_FNDPTN(node)->nd_pconst),
                                         pre_rest,
-                                        NEW_CHILD(ast, fpinfo->args),
+                                        NEW_CHILD(ast_value, RNODE_FNDPTN(node)->args),
                                         post_rest);
         }
       case NODE_HSHPTN:
         {
-            VALUE kwrest = node->nd_pkwrestarg == NODE_SPECIAL_NO_REST_KEYWORD ? ID2SYM(rb_intern("NODE_SPECIAL_NO_REST_KEYWORD")) :
-                                                                                 NEW_CHILD(ast, node->nd_pkwrestarg);
+            VALUE kwrest = RNODE_HSHPTN(node)->nd_pkwrestarg == NODE_SPECIAL_NO_REST_KEYWORD ? ID2SYM(rb_intern("NODE_SPECIAL_NO_REST_KEYWORD")) :
+                                                                                 NEW_CHILD(ast_value, RNODE_HSHPTN(node)->nd_pkwrestarg);
 
             return rb_ary_new_from_args(3,
-                                        NEW_CHILD(ast, node->nd_pconst),
-                                        NEW_CHILD(ast, node->nd_pkwargs),
+                                        NEW_CHILD(ast_value, RNODE_HSHPTN(node)->nd_pconst),
+                                        NEW_CHILD(ast_value, RNODE_HSHPTN(node)->nd_pkwargs),
                                         kwrest);
         }
+      case NODE_LINE:
+        return rb_ary_new_from_args(1, rb_node_line_lineno_val(node));
+      case NODE_FILE:
+        return rb_ary_new_from_args(1, rb_node_file_path_val(node));
+      case NODE_ENCODING:
+        return rb_ary_new_from_args(1, rb_node_encoding_val(node));
       case NODE_ERROR:
-        return rb_ary_new_from_node_args(ast, 0);
+        return rb_ary_new_from_node_args(ast_value, 0);
       case NODE_ARGS_AUX:
       case NODE_LAST:
         break;
@@ -693,7 +744,227 @@ ast_node_children(rb_execution_context_t *ec, VALUE self)
     struct ASTNodeData *data;
     TypedData_Get_Struct(self, struct ASTNodeData, &rb_node_type, data);
 
-    return node_children(data->ast, data->node);
+    return node_children(data->ast_value, data->node);
+}
+
+static int
+null_loc_p(rb_code_location_t *loc)
+{
+    return (loc->beg_pos.lineno == 0 && loc->beg_pos.column == -1 && loc->end_pos.lineno == 0 && loc->end_pos.column == -1);
+}
+
+static VALUE
+location_new(rb_code_location_t *loc)
+{
+    VALUE obj;
+    struct ASTLocationData *data;
+
+    if (null_loc_p(loc)) return Qnil;
+
+    obj = TypedData_Make_Struct(rb_cLocation, struct ASTLocationData, &rb_location_type, data);
+    data->first_lineno = loc->beg_pos.lineno;
+    data->first_column = loc->beg_pos.column;
+    data->last_lineno = loc->end_pos.lineno;
+    data->last_column = loc->end_pos.column;
+
+    return obj;
+}
+
+static VALUE
+node_locations(VALUE ast_value, const NODE *node)
+{
+    enum node_type type = nd_type(node);
+    switch (type) {
+      case NODE_ALIAS:
+        return rb_ary_new_from_args(2,
+                                    location_new(nd_code_loc(node)),
+                                    location_new(&RNODE_ALIAS(node)->keyword_loc));
+      case NODE_AND:
+        return rb_ary_new_from_args(2,
+                                    location_new(nd_code_loc(node)),
+                                    location_new(&RNODE_AND(node)->operator_loc));
+      case NODE_BLOCK_PASS:
+        return rb_ary_new_from_args(2,
+                                    location_new(nd_code_loc(node)),
+                                    location_new(&RNODE_BLOCK_PASS(node)->operator_loc));
+      case NODE_BREAK:
+        return rb_ary_new_from_args(2,
+                                    location_new(nd_code_loc(node)),
+                                    location_new(&RNODE_BREAK(node)->keyword_loc));
+      case NODE_CASE:
+        return rb_ary_new_from_args(3,
+                                    location_new(nd_code_loc(node)),
+                                    location_new(&RNODE_CASE(node)->case_keyword_loc),
+                                    location_new(&RNODE_CASE(node)->end_keyword_loc));
+      case NODE_CASE2:
+        return rb_ary_new_from_args(3,
+                                    location_new(nd_code_loc(node)),
+                                    location_new(&RNODE_CASE2(node)->case_keyword_loc),
+                                    location_new(&RNODE_CASE2(node)->end_keyword_loc));
+      case NODE_CASE3:
+        return rb_ary_new_from_args(3,
+                                    location_new(nd_code_loc(node)),
+                                    location_new(&RNODE_CASE3(node)->case_keyword_loc),
+                                    location_new(&RNODE_CASE3(node)->end_keyword_loc));
+      case NODE_CLASS:
+        return rb_ary_new_from_args(4,
+                                    location_new(nd_code_loc(node)),
+                                    location_new(&RNODE_CLASS(node)->class_keyword_loc),
+                                    location_new(&RNODE_CLASS(node)->inheritance_operator_loc),
+                                    location_new(&RNODE_CLASS(node)->end_keyword_loc));
+      case NODE_COLON2:
+        return rb_ary_new_from_args(3,
+                                    location_new(nd_code_loc(node)),
+                                    location_new(&RNODE_COLON2(node)->delimiter_loc),
+                                    location_new(&RNODE_COLON2(node)->name_loc));
+      case NODE_COLON3:
+        return rb_ary_new_from_args(3,
+                                    location_new(nd_code_loc(node)),
+                                    location_new(&RNODE_COLON3(node)->delimiter_loc),
+                                    location_new(&RNODE_COLON3(node)->name_loc));
+      case NODE_DOT2:
+        return rb_ary_new_from_args(2,
+                                    location_new(nd_code_loc(node)),
+                                    location_new(&RNODE_DOT2(node)->operator_loc));
+      case NODE_DOT3:
+        return rb_ary_new_from_args(2,
+                                    location_new(nd_code_loc(node)),
+                                    location_new(&RNODE_DOT3(node)->operator_loc));
+      case NODE_EVSTR:
+        return rb_ary_new_from_args(3,
+                                    location_new(nd_code_loc(node)),
+                                    location_new(&RNODE_EVSTR(node)->opening_loc),
+                                    location_new(&RNODE_EVSTR(node)->closing_loc));
+      case NODE_FLIP2:
+        return rb_ary_new_from_args(2,
+                                    location_new(nd_code_loc(node)),
+                                    location_new(&RNODE_FLIP2(node)->operator_loc));
+      case NODE_FLIP3:
+        return rb_ary_new_from_args(2,
+                                    location_new(nd_code_loc(node)),
+                                    location_new(&RNODE_FLIP3(node)->operator_loc));
+      case NODE_FOR:
+        return rb_ary_new_from_args(5,
+                                    location_new(nd_code_loc(node)),
+                                    location_new(&RNODE_FOR(node)->for_keyword_loc),
+                                    location_new(&RNODE_FOR(node)->in_keyword_loc),
+                                    location_new(&RNODE_FOR(node)->do_keyword_loc),
+                                    location_new(&RNODE_FOR(node)->end_keyword_loc));
+      case NODE_LAMBDA:
+        return rb_ary_new_from_args(4,
+                                    location_new(nd_code_loc(node)),
+                                    location_new(&RNODE_LAMBDA(node)->operator_loc),
+                                    location_new(&RNODE_LAMBDA(node)->opening_loc),
+                                    location_new(&RNODE_LAMBDA(node)->closing_loc));
+      case NODE_IF:
+        return rb_ary_new_from_args(4,
+                                    location_new(nd_code_loc(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_NEXT:
+        return rb_ary_new_from_args(2,
+                                    location_new(nd_code_loc(node)),
+                                    location_new(&RNODE_NEXT(node)->keyword_loc));
+      case NODE_OR:
+        return rb_ary_new_from_args(2,
+                                    location_new(nd_code_loc(node)),
+                                    location_new(&RNODE_OR(node)->operator_loc));
+      case NODE_OP_ASGN1:
+        return rb_ary_new_from_args(5,
+                                    location_new(nd_code_loc(node)),
+                                    location_new(&RNODE_OP_ASGN1(node)->call_operator_loc),
+                                    location_new(&RNODE_OP_ASGN1(node)->opening_loc),
+                                    location_new(&RNODE_OP_ASGN1(node)->closing_loc),
+                                    location_new(&RNODE_OP_ASGN1(node)->binary_operator_loc));
+      case NODE_OP_ASGN2:
+        return rb_ary_new_from_args(4,
+                                    location_new(nd_code_loc(node)),
+                                    location_new(&RNODE_OP_ASGN2(node)->call_operator_loc),
+                                    location_new(&RNODE_OP_ASGN2(node)->message_loc),
+                                    location_new(&RNODE_OP_ASGN2(node)->binary_operator_loc));
+      case NODE_POSTEXE:
+        return rb_ary_new_from_args(4,
+                                    location_new(nd_code_loc(node)),
+                                    location_new(&RNODE_POSTEXE(node)->keyword_loc),
+                                    location_new(&RNODE_POSTEXE(node)->opening_loc),
+                                    location_new(&RNODE_POSTEXE(node)->closing_loc));
+      case NODE_REDO:
+        return rb_ary_new_from_args(2,
+                                    location_new(nd_code_loc(node)),
+                                    location_new(&RNODE_REDO(node)->keyword_loc));
+      case NODE_REGX:
+        return rb_ary_new_from_args(4,
+                                    location_new(nd_code_loc(node)),
+                                    location_new(&RNODE_REGX(node)->opening_loc),
+                                    location_new(&RNODE_REGX(node)->content_loc),
+                                    location_new(&RNODE_REGX(node)->closing_loc));
+      case NODE_RETURN:
+        return rb_ary_new_from_args(2,
+                                    location_new(nd_code_loc(node)),
+                                    location_new(&RNODE_RETURN(node)->keyword_loc));
+      case NODE_SPLAT:
+        return rb_ary_new_from_args(2,
+                                    location_new(nd_code_loc(node)),
+                                    location_new(&RNODE_SPLAT(node)->operator_loc));
+      case NODE_SUPER:
+        return rb_ary_new_from_args(4,
+                                    location_new(nd_code_loc(node)),
+                                    location_new(&RNODE_SUPER(node)->keyword_loc),
+                                    location_new(&RNODE_SUPER(node)->lparen_loc),
+                                    location_new(&RNODE_SUPER(node)->rparen_loc));
+      case NODE_UNDEF:
+        return rb_ary_new_from_args(2,
+                                    location_new(nd_code_loc(node)),
+                                    location_new(&RNODE_UNDEF(node)->keyword_loc));
+      case NODE_UNLESS:
+        return rb_ary_new_from_args(4,
+                                    location_new(nd_code_loc(node)),
+                                    location_new(&RNODE_UNLESS(node)->keyword_loc),
+                                    location_new(&RNODE_UNLESS(node)->then_keyword_loc),
+                                    location_new(&RNODE_UNLESS(node)->end_keyword_loc));
+      case NODE_VALIAS:
+        return rb_ary_new_from_args(2,
+                                    location_new(nd_code_loc(node)),
+                                    location_new(&RNODE_VALIAS(node)->keyword_loc));
+      case NODE_WHEN:
+        return rb_ary_new_from_args(3,
+                                    location_new(nd_code_loc(node)),
+                                    location_new(&RNODE_WHEN(node)->keyword_loc),
+                                    location_new(&RNODE_WHEN(node)->then_keyword_loc));
+      case NODE_WHILE:
+        return rb_ary_new_from_args(3,
+                                    location_new(nd_code_loc(node)),
+                                    location_new(&RNODE_WHILE(node)->keyword_loc),
+                                    location_new(&RNODE_WHILE(node)->closing_loc));
+      case NODE_UNTIL:
+        return rb_ary_new_from_args(3,
+                                    location_new(nd_code_loc(node)),
+                                    location_new(&RNODE_UNTIL(node)->keyword_loc),
+                                    location_new(&RNODE_UNTIL(node)->closing_loc));
+      case NODE_YIELD:
+        return rb_ary_new_from_args(4,
+                                    location_new(nd_code_loc(node)),
+                                    location_new(&RNODE_YIELD(node)->keyword_loc),
+                                    location_new(&RNODE_YIELD(node)->lparen_loc),
+                                    location_new(&RNODE_YIELD(node)->rparen_loc));
+      case NODE_ARGS_AUX:
+      case NODE_LAST:
+        break;
+      default:
+        return rb_ary_new_from_args(1, location_new(nd_code_loc(node)));
+    }
+
+    rb_bug("node_locations: unknown node: %s", ruby_node_name(type));
+}
+
+static VALUE
+ast_node_locations(rb_execution_context_t *ec, VALUE self)
+{
+    struct ASTNodeData *data;
+    TypedData_Get_Struct(self, struct ASTNodeData, &rb_node_type, data);
+
+    return node_locations(data->ast_value, data->node);
 }
 
 static VALUE
@@ -735,10 +1006,37 @@ ast_node_last_column(rb_execution_context_t *ec, VALUE self)
 static VALUE
 ast_node_all_tokens(rb_execution_context_t *ec, VALUE self)
 {
+    long i;
     struct ASTNodeData *data;
+    rb_ast_t *ast;
+    rb_parser_ary_t *parser_tokens;
+    rb_parser_ast_token_t *parser_token;
+    VALUE str, loc, token, all_tokens;
+
     TypedData_Get_Struct(self, struct ASTNodeData, &rb_node_type, data);
+    ast = rb_ruby_ast_data_get(data->ast_value);
 
-    return rb_ast_tokens(data->ast);
+    parser_tokens = ast->node_buffer->tokens;
+    if (parser_tokens == NULL) {
+        return Qnil;
+    }
+
+    all_tokens = rb_ary_new2(parser_tokens->len);
+    for (i = 0; i < parser_tokens->len; i++) {
+        parser_token = parser_tokens->data[i];
+        str = rb_str_new(parser_token->str->ptr, parser_token->str->len);
+        loc = rb_ary_new_from_args(4,
+            INT2FIX(parser_token->loc.beg_pos.lineno),
+            INT2FIX(parser_token->loc.beg_pos.column),
+            INT2FIX(parser_token->loc.end_pos.lineno),
+            INT2FIX(parser_token->loc.end_pos.column)
+        );
+        token = rb_ary_new_from_args(4, INT2FIX(parser_token->id), ID2SYM(rb_intern(parser_token->type_name)), str, loc);
+        rb_ary_push(all_tokens, token);
+    }
+    rb_ary_freeze(all_tokens);
+
+    return all_tokens;
 }
 
 static VALUE
@@ -765,10 +1063,66 @@ static VALUE
 ast_node_script_lines(rb_execution_context_t *ec, VALUE self)
 {
     struct ASTNodeData *data;
+    rb_ast_t *ast;
     TypedData_Get_Struct(self, struct ASTNodeData, &rb_node_type, data);
-    VALUE ret = data->ast->body.script_lines;
-    if (!RB_TYPE_P(ret, T_ARRAY)) return Qnil;
-    return ret;
+    ast = rb_ruby_ast_data_get(data->ast_value);
+    rb_parser_ary_t *ret = ast->body.script_lines;
+    return rb_parser_build_script_lines_from(ret);
+}
+
+static VALUE
+ast_location_first_lineno(rb_execution_context_t *ec, VALUE self)
+{
+    struct ASTLocationData *data;
+    TypedData_Get_Struct(self, struct ASTLocationData, &rb_location_type, data);
+
+    return INT2NUM(data->first_lineno);
+}
+
+static VALUE
+ast_location_first_column(rb_execution_context_t *ec, VALUE self)
+{
+    struct ASTLocationData *data;
+    TypedData_Get_Struct(self, struct ASTLocationData, &rb_location_type, data);
+
+    return INT2NUM(data->first_column);
+}
+
+static VALUE
+ast_location_last_lineno(rb_execution_context_t *ec, VALUE self)
+{
+    struct ASTLocationData *data;
+    TypedData_Get_Struct(self, struct ASTLocationData, &rb_location_type, data);
+
+    return INT2NUM(data->last_lineno);
+}
+
+static VALUE
+ast_location_last_column(rb_execution_context_t *ec, VALUE self)
+{
+    struct ASTLocationData *data;
+    TypedData_Get_Struct(self, struct ASTLocationData, &rb_location_type, data);
+
+    return INT2NUM(data->last_column);
+}
+
+static VALUE
+ast_location_inspect(rb_execution_context_t *ec, VALUE self)
+{
+    VALUE str;
+    VALUE cname;
+    struct ASTLocationData *data;
+    TypedData_Get_Struct(self, struct ASTLocationData, &rb_location_type, data);
+
+    cname = rb_class_path(rb_obj_class(self));
+    str = rb_str_new2("#<");
+
+    rb_str_append(str, cname);
+    rb_str_catf(str, ":@%d:%d-%d:%d>",
+                data->first_lineno, data->first_column,
+                data->last_lineno, data->last_column);
+
+    return str;
 }
 
 #include "ast.rbinc"
@@ -778,5 +1132,7 @@ Init_ast(void)
 {
     rb_mAST = rb_define_module_under(rb_cRubyVM, "AbstractSyntaxTree");
     rb_cNode = rb_define_class_under(rb_mAST, "Node", rb_cObject);
+    rb_cLocation = rb_define_class_under(rb_mAST, "Location", rb_cObject);
     rb_undef_alloc_func(rb_cNode);
+    rb_undef_alloc_func(rb_cLocation);
 }
diff --git a/ast.rb b/ast.rb
index fa9b69507c3f43..6380621780a0bf 100644
--- a/ast.rb
+++ b/ast.rb
@@ -13,9 +13,8 @@
 # access children nodes by name, etc.
 #
 # If you are looking for a stable API or an API working under multiple Ruby
-# implementations, consider using the _parser_ gem or Ripper. If you would
-# like to make RubyVM::AbstractSyntaxTree stable, please join the discussion
-# at https://bugs.ruby-lang.org/issues/14844.
+# implementations, consider using the _prism_ gem, which is the official
+# Ruby API to parse Ruby code.
 #
 module RubyVM::AbstractSyntaxTree
 
@@ -265,12 +264,69 @@ def source
       lines = script_lines
       if lines
         lines = lines[first_lineno - 1 .. last_lineno - 1]
-        lines[-1] = lines[-1][0...last_column]
-        lines[0] = lines[0][first_column..-1]
+        lines[-1] = lines[-1].byteslice(0...last_column)
+        lines[0] = lines[0].byteslice(first_column..-1)
         lines.join
       else
         nil
       end
     end
+
+    #  call-seq:
+    #     node.locations -> array
+    #
+    #  Returns location objects associated with the AST node.
+    #  The returned array contains RubyVM::AbstractSyntaxTree::Location.
+    def locations
+      Primitive.ast_node_locations
+    end
+  end
+
+  # RubyVM::AbstractSyntaxTree::Location instances are created by
+  # RubyVM::AbstractSyntaxTree::Node#locations.
+  #
+  # This class is MRI specific.
+  #
+  class Location
+
+    #  call-seq:
+    #     location.first_lineno -> integer
+    #
+    #  The line number in the source code where this AST's text began.
+    def first_lineno
+      Primitive.ast_location_first_lineno
+    end
+
+    #  call-seq:
+    #     location.first_column -> integer
+    #
+    #  The column number in the source code where this AST's text began.
+    def first_column
+      Primitive.ast_location_first_column
+    end
+
+    #  call-seq:
+    #     location.last_lineno -> integer
+    #
+    #  The line number in the source code where this AST's text ended.
+    def last_lineno
+      Primitive.ast_location_last_lineno
+    end
+
+    #  call-seq:
+    #     location.last_column -> integer
+    #
+    #  The column number in the source code where this AST's text ended.
+    def last_column
+      Primitive.ast_location_last_column
+    end
+
+    #  call-seq:
+    #     location.inspect -> string
+    #
+    #  Returns debugging information about this location as a string.
+    def inspect
+      Primitive.ast_location_inspect
+    end
   end
 end
diff --git a/basictest/test.rb b/basictest/test.rb
index 95875b52a6ef79..711e4f4ab32209 100755
--- a/basictest/test.rb
+++ b/basictest/test.rb
@@ -879,7 +879,7 @@ def r(val); a,b,*c = *yield(); test_ok([a,b,c] == val, 2); end
 test_ok($x == [7,5,3,2,1])
 
 # split test
-$x = "The Book of Mormon"
+$x = +"The Book of Mormon"
 test_ok($x.split(//).reverse!.join == $x.reverse)
 test_ok($x.reverse == $x.reverse!)
 test_ok("1 byte string".split(//).reverse.join(":") == "g:n:i:r:t:s: :e:t:y:b: :1")
@@ -1643,7 +1643,7 @@ def shift_test(a)
 test_ok(/(\s+\d+){2}/ =~ " 1 2" && $& == " 1 2")
 test_ok(/(?:\s+\d+){2}/ =~ " 1 2" && $& == " 1 2")
 
-$x = <<END;
+$x = +<<END;
 ABCD
 ABCD
 END
@@ -1682,12 +1682,12 @@ def shift_test(a)
 test_ok(?\C-a == "\1")
 test_ok(?\M-a == "\341")
 test_ok(?\M-\C-a == "\201")
-test_ok("a".upcase![0] == ?A)
-test_ok("A".downcase![0] == ?a)
-test_ok("abc".tr!("a-z", "A-Z") == "ABC")
-test_ok("aabbcccc".tr_s!("a-z", "A-Z") == "ABC")
-test_ok("abcc".squeeze!("a-z") == "abc")
-test_ok("abcd".delete!("bc") == "ad")
+test_ok("a".dup.upcase![0] == ?A)
+test_ok("A".dup.downcase![0] == ?a)
+test_ok("abc".dup.tr!("a-z", "A-Z") == "ABC")
+test_ok("aabbcccc".dup.tr_s!("a-z", "A-Z") == "ABC")
+test_ok("abcc".dup.squeeze!("a-z") == "abc")
+test_ok("abcd".dup.delete!("bc") == "ad")
 
 $x = "abcdef"
 $y = [ ?a, ?b, ?c, ?d, ?e, ?f ]
@@ -1700,7 +1700,7 @@ def shift_test(a)
 }
 test_ok(!$bad)
 
-s = "a string"
+s = +"a string"
 s[0..s.size]="another string"
 test_ok(s == "another string")
 
diff --git a/benchmark/README.md b/benchmark/README.md
index e11381cad93e2c..9f9192685e97bb 100644
--- a/benchmark/README.md
+++ b/benchmark/README.md
@@ -27,6 +27,7 @@ benchmark-driver benchmark/*.yml
 See also:
 
 ```console
+benchmark-driver --help
 Usage: benchmark-driver [options] RUBY|YAML...
     -r, --runner TYPE                Specify runner type: ips, time, memory, once, block (default: ips)
     -o, --output TYPE                Specify output type: compare, simple, markdown, record, all (default: compare)
@@ -39,7 +40,7 @@ Usage: benchmark-driver [options] RUBY|YAML...
         --filter REGEXP              Filter out benchmarks with given regexp
         --run-duration SECONDS       Warmup estimates loop_count to run for this duration (default: 3)
         --timeout SECONDS            Timeout ruby command execution with timeout(1)
-    -v, --verbose                    Verbose mode. Multiple -v options increase visilibity (max: 2)
+    -v, --verbose                    Verbose mode. Multiple -v options increase visibility (max: 2)
 ```
 
 ## make benchmark
diff --git a/benchmark/app_aobench.rb b/benchmark/app_aobench.rb
index 16296af12b2a50..c1546e08ab3cf6 100644
--- a/benchmark/app_aobench.rb
+++ b/benchmark/app_aobench.rb
@@ -151,7 +151,7 @@ def clamp(f)
   i.to_i
 end
 
-def otherBasis(basis, n)
+def orthoBasis(basis, n)
   basis[2] = Vec.new(n.x, n.y, n.z)
   basis[1] = Vec.new(0.0, 0.0, 0.0)
 
@@ -183,7 +183,7 @@ def initialize
 
   def ambient_occlusion(isect)
     basis = Array.new
-    otherBasis(basis, isect.n)
+    orthoBasis(basis, isect.n)
 
     ntheta    = NAO_SAMPLES
     nphi      = NAO_SAMPLES
diff --git a/benchmark/app_fib.rb b/benchmark/app_fib.rb
index 34a7b2e7250efe..e61bc8aa3282a8 100644
--- a/benchmark/app_fib.rb
+++ b/benchmark/app_fib.rb
@@ -1,4 +1,4 @@
-def fib n
+def fib(n)
   if n < 3
     1
   else
diff --git a/benchmark/array_large_literal.yml b/benchmark/array_large_literal.yml
new file mode 100644
index 00000000000000..423d68391fcfcf
--- /dev/null
+++ b/benchmark/array_large_literal.yml
@@ -0,0 +1,19 @@
+prelude: |
+  def def_array(size)
+    Object.class_eval(<<-END)
+      def array_#{size}
+        x = 1
+        [#{(['x'] * size).join(',')}]
+      end
+    END
+  end
+  def_array(100)
+  def_array(1000)
+  def_array(10000)
+  def_array(100000)
+benchmark:
+  array_100: array_100
+  array_1000: array_1000
+  array_10000: array_10000
+  array_100000: array_100000
+
diff --git a/benchmark/class_superclass.yml b/benchmark/class_superclass.yml
new file mode 100644
index 00000000000000..847ff811f15f57
--- /dev/null
+++ b/benchmark/class_superclass.yml
@@ -0,0 +1,23 @@
+prelude: |
+  class SimpleClass; end
+  class OneModuleClass
+    1.times { include Module.new }
+  end
+  class MediumClass
+    10.times { include Module.new }
+  end
+  class LargeClass
+    100.times { include Module.new }
+  end
+benchmark:
+  object_class_superclass: |
+    Object.superclass
+  simple_class_superclass: |
+    SimpleClass.superclass
+  one_module_class: |
+    OneModuleClass.superclass
+  medium_class_superclass: |
+    MediumClass.superclass
+  large_class_superclass: |
+    LargeClass.superclass
+loop_count: 20000000
diff --git a/benchmark/hash_aref_str_lit.yml b/benchmark/hash_aref_str_lit.yml
new file mode 100644
index 00000000000000..ed8142bcf1eaf3
--- /dev/null
+++ b/benchmark/hash_aref_str_lit.yml
@@ -0,0 +1,20 @@
+prelude: |
+  # frozen_string_literal: true
+  hash = 10.times.to_h do |i|
+    [i, i]
+  end
+  dyn_sym = "dynamic_symbol".to_sym
+  binary = RubyVM::InstructionSequence.compile("# frozen_string_literal: true\n'iseq_load'").to_binary
+  iseq_literal_string = RubyVM::InstructionSequence.load_from_binary(binary).eval
+
+  hash[:some_symbol] = 1
+  hash[dyn_sym] = 2
+  hash["small"] = 3
+  hash["frozen_string_literal"] = 4
+  hash[iseq_literal_string] = 5
+benchmark:
+  symbol: hash[:some_symbol]
+  dyn_symbol: hash[dyn_sym]
+  small_lit: hash["small"]
+  frozen_lit: hash["frozen_string_literal"]
+  iseq_lit: hash[iseq_literal_string]
diff --git a/benchmark/hash_key.yml b/benchmark/hash_key.yml
new file mode 100644
index 00000000000000..cab4cf9ca46d02
--- /dev/null
+++ b/benchmark/hash_key.yml
@@ -0,0 +1,5 @@
+prelude: |
+  obj = Object.new
+  hash = { obj => true }
+benchmark: hash.key?(obj)
+loop_count: 30000000
diff --git a/benchmark/hash_new.yml b/benchmark/hash_new.yml
new file mode 100644
index 00000000000000..9d8e34187f6785
--- /dev/null
+++ b/benchmark/hash_new.yml
@@ -0,0 +1,16 @@
+prelude: |
+  has_hash_with_capa = Hash.instance_method(:initialize).parameters.include?([:key, :capacity])
+  strings_1k = 1_000.times.map { |i| -i.to_s.freeze }
+  strings_100k = 100_000.times.map { |i| -i.to_s.freeze }
+benchmark:
+  new: Hash.new
+  new_with_capa_1k: |
+    h = has_hash_with_capa ? Hash.new(capacity: strings_1k.size) : {}
+    strings_1k.each do |x|
+      h[x] = true
+    end
+  new_with_capa_100k: |
+    h = has_hash_with_capa ? Hash.new(capacity: strings_100k.size) : {}
+    strings_100k.each do |x|
+      h[x] = true
+    end
diff --git a/benchmark/io_close.yml b/benchmark/io_close.yml
new file mode 100644
index 00000000000000..a552872884b3ee
--- /dev/null
+++ b/benchmark/io_close.yml
@@ -0,0 +1,13 @@
+prelude: |
+  ios = 1000.times.map do
+    100.times.map{IO.pipe}
+  end
+benchmark:
+  # Close IO
+  io_close: |
+    # Process each batch of ios per iteration of the benchmark.
+    ios.pop.each do |r, w|
+      r.close
+      w.close
+    end
+loop_count: 100
diff --git a/benchmark/io_close_contended.yml b/benchmark/io_close_contended.yml
new file mode 100644
index 00000000000000..1d9e4e0d0f8636
--- /dev/null
+++ b/benchmark/io_close_contended.yml
@@ -0,0 +1,21 @@
+prelude: |
+  ios = 100.times.map do
+    10.times.map do
+      pipe = IO.pipe.tap do |r, w|
+        Thread.new do
+          r.read
+        rescue IOError
+          # Ignore
+        end
+      end
+    end
+  end
+benchmark:
+  # Close IO
+  io_close_contended: |
+    # Process each batch of ios per iteration of the benchmark.
+    ios.pop.each do |r, w|
+      r.close
+      w.close
+    end
+loop_count: 10
diff --git a/benchmark/lib/benchmark_driver/runner/ractor.rb b/benchmark/lib/benchmark_driver/runner/ractor.rb
index c730b8e4a54bf2..fd9c2dd4db731d 100644
--- a/benchmark/lib/benchmark_driver/runner/ractor.rb
+++ b/benchmark/lib/benchmark_driver/runner/ractor.rb
@@ -87,7 +87,7 @@ def render(results:)
 <% end %>
 
 # Wait for all Ractors before executing code to write results
-__bmdv_ractors.map!(&:take)
+__bmdv_ractors.map!(&:value)
 
 <% results.each do |result| %>
 File.write(<%= result.dump %>, __bmdv_ractors.shift)
diff --git a/benchmark/loop_each.yml b/benchmark/loop_each.yml
new file mode 100644
index 00000000000000..1c757185a8a7e9
--- /dev/null
+++ b/benchmark/loop_each.yml
@@ -0,0 +1,4 @@
+prelude: |
+  arr = [nil] * 30_000_000
+benchmark:
+  loop_each: arr.each{|e|}
diff --git a/benchmark/loop_times_megamorphic.yml b/benchmark/loop_times_megamorphic.yml
new file mode 100644
index 00000000000000..f9343ba8973b79
--- /dev/null
+++ b/benchmark/loop_times_megamorphic.yml
@@ -0,0 +1,7 @@
+prelude: |
+  eval(<<~EOS)
+    def loop_times_megamorphic
+      #{"1.times {|i|};" * 1000}
+    end
+  EOS
+benchmark: loop_times_megamorphic
diff --git a/benchmark/module_eqq.yml b/benchmark/module_eqq.yml
index a561fb86dc4b06..2f9c490d92cf7b 100644
--- a/benchmark/module_eqq.yml
+++ b/benchmark/module_eqq.yml
@@ -1,4 +1,5 @@
 prelude: |
+  module SomeModule; end
   class SimpleClass; end
   class MediumClass
     10.times { include Module.new }
@@ -24,4 +25,8 @@ benchmark:
     SimpleClass === LargeObj
   simple_class_eqq_huge_obj: |
     SimpleClass === HugeObj
-loop_count: 20000000
+  simple_class_eqq_module: |
+    SimpleClass === HugeObj
+  module_eqq_module: |
+    SomeModule === HugeObj
+loop_count: 10000000
diff --git a/benchmark/nilclass.yml b/benchmark/nilclass.yml
index fba67a5f6a1764..66234c4cdfe05b 100644
--- a/benchmark/nilclass.yml
+++ b/benchmark/nilclass.yml
@@ -1,6 +1,16 @@
+prelude: |
+  def a = nil
 benchmark:
+  rationalize:
+    nil.rationalize
+  to_c: |
+    nil.to_c
   to_i: |
     nil.to_i
   to_f: |
     nil.to_f
+  to_r: |
+    nil.to_r
+  splat: |
+    a(*nil)
 loop_count: 100000
diff --git a/benchmark/object_allocate.yml b/benchmark/object_allocate.yml
index 93ff463e415585..c6269923f07cc0 100644
--- a/benchmark/object_allocate.yml
+++ b/benchmark/object_allocate.yml
@@ -11,6 +11,26 @@ prelude: |
   class OneTwentyEight
     128.times { include(Module.new) }
   end
+  class OnePositional
+    def initialize a; end
+  end
+  class TwoPositional
+    def initialize a, b; end
+  end
+  class ThreePositional
+    def initialize a, b, c; end
+  end
+  class FourPositional
+    def initialize a, b, c, d; end
+  end
+  class KWArg
+    def initialize a:, b:, c:, d:
+    end
+  end
+  class Mixed
+    def initialize a, b, c:, d:
+    end
+  end
   # Disable GC to see raw throughput:
   GC.disable
 benchmark:
@@ -18,4 +38,12 @@ benchmark:
   allocate_32_deep: ThirtyTwo.new
   allocate_64_deep: SixtyFour.new
   allocate_128_deep: OneTwentyEight.new
+  allocate_1_positional_params: OnePositional.new(1)
+  allocate_2_positional_params: TwoPositional.new(1, 2)
+  allocate_3_positional_params: ThreePositional.new(1, 2, 3)
+  allocate_4_positional_params: FourPositional.new(1, 2, 3, 4)
+  allocate_kwarg_params: "KWArg.new(a: 1, b: 2, c: 3, d: 4)"
+  allocate_mixed_params: "Mixed.new(1, 2, c: 3, d: 4)"
+  allocate_no_params: "Object.new"
+  allocate_allocate: "Object.allocate"
 loop_count: 100000
diff --git a/benchmark/object_id.yml b/benchmark/object_id.yml
new file mode 100644
index 00000000000000..2bd52b923fa100
--- /dev/null
+++ b/benchmark/object_id.yml
@@ -0,0 +1,4 @@
+benchmark:
+  baseline: "Object.new"
+  object_id: "Object.new.object_id"
+# loop_count: 100000
diff --git a/benchmark/ractor_string_fstring.yml b/benchmark/ractor_string_fstring.yml
new file mode 100644
index 00000000000000..14b92d8fd87f3a
--- /dev/null
+++ b/benchmark/ractor_string_fstring.yml
@@ -0,0 +1,18 @@
+type: lib/benchmark_driver/runner/ractor
+benchmark:
+  ractor_fstring_random: |
+    i = 0
+    str = "same".dup
+    while i < 2000000
+      -(i.to_s.freeze)
+      i += 1
+    end
+  ractor_fstring_same: |
+    i = 0
+    str = "same".dup
+    while i < 2000000
+      -str
+      i += 1
+    end
+loop_count: 1
+ractor: 4
diff --git a/benchmark/range_bsearch_bignum.yml b/benchmark/range_bsearch_bignum.yml
new file mode 100644
index 00000000000000..5730c93fcfb016
--- /dev/null
+++ b/benchmark/range_bsearch_bignum.yml
@@ -0,0 +1,10 @@
+prelude: |
+  first = 2**100
+  last = 2**1000
+  mid = (first + last) / 2
+  r = first..last
+
+benchmark:
+  first: r.bsearch { |x| x >= first }
+  mid: r.bsearch { |x| x >= mid }
+  last: r.bsearch { |x| x >= last }
diff --git a/benchmark/range_bsearch_endpointless.yml b/benchmark/range_bsearch_endpointless.yml
new file mode 100644
index 00000000000000..8d7bedb662e007
--- /dev/null
+++ b/benchmark/range_bsearch_endpointless.yml
@@ -0,0 +1,21 @@
+prelude: |
+  re = (1..)
+  rb = (..0)
+
+benchmark:
+  'endless 10**0': re.bsearch { |x| x >= 1 }
+  'endless 10**1': re.bsearch { |x| x >= 10 }
+  'endless 10**2': re.bsearch { |x| x >= 100 }
+  'endless 10**3': re.bsearch { |x| x >= 1000 }
+  'endless 10**4': re.bsearch { |x| x >= 10000 }
+  'endless 10**5': re.bsearch { |x| x >= 100000 }
+  'endless 10**10': re.bsearch { |x| x >= 10000000000 }
+  'endless 10**100': re.bsearch { |x| x >= 10000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 }
+  'beginless -10**0': rb.bsearch { |x| x >= -1 }
+  'beginless -10**1': rb.bsearch { |x| x >= -10 }
+  'beginless -10**2': rb.bsearch { |x| x >= -100 }
+  'beginless -10**3': rb.bsearch { |x| x >= -1000 }
+  'beginless -10**4': rb.bsearch { |x| x >= -10000 }
+  'beginless -10**5': rb.bsearch { |x| x >= -100000 }
+  'beginless -10**10': rb.bsearch { |x| x >= -10000000000 }
+  'beginless -10**100': rb.bsearch { |x| x >= -10000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 }
diff --git a/benchmark/range_bsearch_fixnum.yml b/benchmark/range_bsearch_fixnum.yml
new file mode 100644
index 00000000000000..59416531b9abd0
--- /dev/null
+++ b/benchmark/range_bsearch_fixnum.yml
@@ -0,0 +1,10 @@
+prelude: |
+  first = 1
+  last = 10000
+  mid = (first + last) / 2
+  r = first..last
+
+benchmark:
+  first: r.bsearch { |x| x >= first }
+  mid: r.bsearch { |x| x >= mid }
+  last: r.bsearch { |x| x >= last }
diff --git a/benchmark/range_count.yml b/benchmark/range_count.yml
new file mode 100644
index 00000000000000..58f53a023613cc
--- /dev/null
+++ b/benchmark/range_count.yml
@@ -0,0 +1,11 @@
+prelude: |
+  r_1 = 1..1
+  r_1k = 1..1000
+  r_1m = 1..1000000
+  r_str = 'a'..'z'
+
+benchmark:
+  'int 1': r_1.count
+  'int 1K': r_1k.count
+  'int 1M': r_1m.count
+  string: r_str.count
diff --git a/benchmark/range_overlap.yml b/benchmark/range_overlap.yml
new file mode 100644
index 00000000000000..700a00053c84aa
--- /dev/null
+++ b/benchmark/range_overlap.yml
@@ -0,0 +1,19 @@
+prelude: |
+  class Range
+    unless method_defined?(:overlap?)
+      def overlap?(other)
+        other.begin == self.begin || cover?(other.begin) || other.cover?(self.begin)
+      end
+    end
+  end
+
+benchmark:
+  - (2..3).overlap?(1..1)
+  - (2..3).overlap?(2..4)
+  - (2..3).overlap?(4..5)
+  - (2..3).overlap?(2..1)
+  - (2..3).overlap?(0..1)
+  - (2..3).overlap?(...1)
+  - (2...3).overlap?(..2)
+  - (2...3).overlap?(3...)
+  - (2..3).overlap?('a'..'d')
diff --git a/benchmark/range_reverse_each.yml b/benchmark/range_reverse_each.yml
new file mode 100644
index 00000000000000..a32efeccc68e91
--- /dev/null
+++ b/benchmark/range_reverse_each.yml
@@ -0,0 +1,16 @@
+prelude: |
+  rf_1 = 0..1
+  rf_1k = 0..1000
+  rf_1m = 0..1000000
+  big = 2**1000
+  rb_1 = big..big+1
+  rb_1k = big..big+1000
+  rb_1m = big..big+1000000
+
+benchmark:
+  "Fixnum 1": rf_1.reverse_each { _1 }
+  "Fixnum 1K": rf_1k.reverse_each { _1 }
+  "Fixnum 1M": rf_1m.reverse_each { _1 }
+  "Bignum 1": rb_1.reverse_each { _1 }
+  "Bignum 1K": rb_1k.reverse_each { _1 }
+  "Bignum 1M": rb_1m.reverse_each { _1 }
diff --git a/benchmark/realpath.yml b/benchmark/realpath.yml
index 90a029d5b982ba..6b6a4836b0df20 100644
--- a/benchmark/realpath.yml
+++ b/benchmark/realpath.yml
@@ -12,6 +12,9 @@ prelude: |
   relative_dir = 'b/c'
   absolute_dir = File.join(pwd, relative_dir)
   file_dir = 'c'
+teardown: |
+  require 'fileutils'
+  FileUtils.rm_rf('b')
 benchmark:
   relative_nil: "f.realpath(relative, nil)"
   absolute_nil: "f.realpath(absolute, nil)"
diff --git a/benchmark/scan.yaml b/benchmark/scan.yaml
new file mode 100644
index 00000000000000..62ad1d6862df6d
--- /dev/null
+++ b/benchmark/scan.yaml
@@ -0,0 +1,16 @@
+prelude: |
+  $LOAD_PATH.unshift(File.expand_path("lib"))
+  require "strscan"
+  str = "test string"
+  scanner = StringScanner.new(str)
+  str = "test"
+  reg = /test/
+benchmark:
+  check(reg): |
+    scanner.check(reg)
+  check(str): |
+    scanner.check(str)
+  match?(reg): |
+    scanner.match?(reg)
+  match?(str): |
+    scanner.match?(str)
diff --git a/benchmark/search.yaml b/benchmark/search.yaml
new file mode 100644
index 00000000000000..42a50c90e6c134
--- /dev/null
+++ b/benchmark/search.yaml
@@ -0,0 +1,16 @@
+prelude: |
+  $LOAD_PATH.unshift(File.expand_path("lib"))
+  require "strscan"
+  str = "test string"
+  scanner = StringScanner.new(str)
+  str = "string"
+  reg = /string/
+benchmark:
+  check_until(reg): |
+    scanner.check_until(reg)
+  check_until(str): |
+    scanner.check_until(str)
+  exist?(reg): |
+    scanner.exist?(reg)
+  exist?(str): |
+    scanner.exist?(str)
diff --git a/benchmark/set.yml b/benchmark/set.yml
new file mode 100644
index 00000000000000..43217036e25ba5
--- /dev/null
+++ b/benchmark/set.yml
@@ -0,0 +1,265 @@
+prelude: |
+  # First 1000 digits of pi
+  pi = <<~END.gsub(/\D/, '')
+    31415926535897932384626433832795028841971693993751058209749445923078164062862089
+    98628034825342117067982148086513282306647093844609550582231725359408128481117450
+    28410270193852110555964462294895493038196442881097566593344612847564823378678316
+    52712019091456485669234603486104543266482133936072602491412737245870066063155881
+    74881520920962829254091715364367892590360011330530548820466521384146951941511609
+    43305727036575959195309218611738193261179310511854807446237996274956735188575272
+    48912279381830119491298336733624406566430860213949463952247371907021798609437027
+    70539217176293176752384674818467669405132000568127145263560827785771342757789609
+    17363717872146844090122495343014654958537105079227968925892354201995611212902196
+    08640344181598136297747713099605187072113499999983729780499510597317328160963185
+    95024459455346908302642522308253344685035261931188171010003137838752886587533208
+    38142061717766914730359825349042875546873115956286388235378759375195778185778053
+    21712268066130019278766111959092164201989380952572010654505906988788448549
+  END
+  array1 = 10.times.flat_map do |i|
+    pi[i...].chars.each_slice(10).map(&:join)
+  end
+  array2 = array1.map(&:reverse)
+  array1.map!(&:to_i)
+  array2.map!(&:to_i)
+  a1 = array1[...10]
+  a2 = array1[...100]
+  a3 = array1
+  oa1 = array2[...10]
+  oa2 = array2[...100]
+  oa3 = array2
+  s0 = Set.new
+  s0 = Set.new
+  s1 = Set.new(a1)
+  s2 = Set.new(a2)
+  s3 = Set.new(a3)
+  o0 = Set.new
+  o1 = Set.new(array2[...10])
+  o2 = Set.new(array2[...100])
+  o3 = Set.new(array2)
+  d0 = s0.dup
+  d1 = s1.dup
+  d2 = s2.dup
+  d3 = s3.dup
+  ss1 = s1 - a1[-1..-1]
+  ss2 = s2 - a2[-1..-1]
+  ss3 = s3 - a3[-1..-1]
+  os1 = o1 - oa1[-1..-1]
+  os2 = o2 - oa2[-1..-1]
+  os3 = o3 - oa3[-1..-1]
+  member = a1.first
+  cbi = s0.dup.compare_by_identity
+  ns = Set[s3, o3, d3]
+  set_subclass = Class.new(Set)
+
+benchmark:
+  new_0: Set.new
+  new_10: Set.new(a1)
+  new_100: Set.new(a2)
+  new_1000: Set.new(a3)
+  aref_0: Set[]
+  aref_10: Set[*a1]
+  aref_100: Set[*a2]
+  aref_1000: Set[*a3]
+  amp_0: s0 & o0
+  amp_10: s1 & o1
+  amp_100: s2 & o2
+  amp_1000: s3 & o3
+  amp_same_0: s0 & d0
+  amp_same_10: s1 & d1
+  amp_same_100: s2 & d2
+  amp_same_1000: s3 & d3
+  minus_0: s0 - o0
+  minus_10: s1 - o1
+  minus_100: s2 - o2
+  minus_1000: s3 - o3
+  minus_same_0: s0 - d0
+  minus_same_10: s1 - d1
+  minus_same_100: s2 - d2
+  minus_same_1000: s3 - d3
+  spaceship_0: s0 <=> o0
+  spaceship_diff_10: s1 <=> o1
+  spaceship_diff_100: s2 <=> o2
+  spaceship_diff_1000: s2 <=> o3
+  spaceship_sub_10: s1 <=> ss1
+  spaceship_sub_100: s2 <=> ss2
+  spaceship_sub_1000: s2 <=> ss3
+  spaceship_sup_10: ss1 <=> s1
+  spaceship_sup_100: ss2 <=> s2
+  spaceship_sup_1000: ss2 <=> s3
+  eq_0: s0 == o0
+  eq_10: s1 == o1
+  eq_100: s2 == o2
+  eq_1000: s3 == o3
+  eq_same_0: s0 == d0
+  eq_same_10: s1 == d1
+  eq_same_100: s2 == d2
+  eq_same_1000: s3 == d3
+  xor_0: s0 ^ o0
+  xor_10: s1 ^ o1
+  xor_100: s2 ^ o2
+  xor_1000: s3 ^ o3
+  xor_same_0: s0 ^ d0
+  xor_same_10: s1 ^ d1
+  xor_same_100: s2 ^ d2
+  xor_same_1000: s3 ^ d3
+  pipe_0: s0 | o0
+  pipe_10: s1 | o1
+  pipe_100: s2 | o2
+  pipe_1000: s3 | o3
+  pipe_same_0: s0 | d0
+  pipe_same_10: s1 | d1
+  pipe_same_100: s2 | d2
+  pipe_same_1000: s3 | d3
+  add: a3.each { s0.add(it) }
+  add_exist: a3.each { s3.add(it) }
+  addq: a3.each { s0.add?(it) }
+  addq_exist: a3.each { s3.add?(it) }
+  classify_0: s0.classify { it }
+  classify_10: s1.classify { it & 2 }
+  classify_100: s2.classify { it & 8 }
+  classify_1000: s3.classify { it & 32 }
+  clear: s0.clear
+  collect_0: s0.collect! { it }
+  collect_10: s1.collect! { it }
+  collect_100: s2.collect! { it }
+  collect_1000: s3.collect! { it }
+  compare_by_identity_0: s0.dup.compare_by_identity
+  compare_by_identity_10: s1.dup.compare_by_identity
+  compare_by_identity_100: s2.dup.compare_by_identity
+  compare_by_identity_1000: s3.dup.compare_by_identity
+  compare_by_identityq_false: s0.compare_by_identity?
+  compare_by_identityq_true: cbi.compare_by_identity?
+  clone_0: s0.clone
+  clone_10: s1.clone
+  clone_100: s2.clone
+  clone_1000: s3.clone
+  delete: a3.each { s3.delete(it) }
+  delete_not_exist: a3.each { o3.delete(it) }
+  deleteq: a3.each { s3.delete?(it) }
+  deleteq_not_exist: a3.each { o3.delete?(it) }
+  delete_if_0: s0.delete_if { it }
+  delete_if_10: s1.delete_if { it & 2 == 0 }
+  delete_if_100: s2.delete_if { it & 2 == 0 }
+  delete_if_1000: s3.delete_if { it & 2 == 0 }
+  disjoint_0: s0.disjoint? o0
+  disjoint_10: s1.disjoint? o1
+  disjoint_100: s2.disjoint? o2
+  disjoint_1000: s3.disjoint? o3
+  disjoint_same_0: s0.disjoint? d0
+  disjoint_same_10: s1.disjoint? d1
+  disjoint_same_100: s2.disjoint? d2
+  disjoint_same_1000: s3.disjoint? d3
+  divide_1arity_0: s0.divide { true }
+  divide_1arity_10: s1.divide { it & 2 }
+  divide_1arity_100: s2.divide { it & 8 }
+  divide_1arity_1000: s3.divide { it & 32 }
+  divide_2arity_0: s0.divide { true }
+  divide_2arity_10: s1.divide { (_1 & 2) == (_2 & 2) }
+  divide_2arity_100: s2.divide { (_1 & 8) == (_2 & 8) }
+  divide_2arity_1000: s3.divide { (_1 & 32) == (_2 & 32) }
+  dup_0: s0.dup
+  dup_10: s1.dup
+  dup_100: s2.dup
+  dup_1000: s3.dup
+  each_0: s0.each { it }
+  each_10: s1.each { it }
+  each_100: s2.each { it }
+  each_1000: s3.each { it }
+  empty_true: s0.empty?
+  empty_false: s3.empty?
+  flatten: ns.flatten
+  flattenb: ns.flatten!
+  include_true_0: s0.include? member
+  include_true_10: s1.include? member
+  include_true_100: s2.include? member
+  include_true_1000: s3.include? member
+  include_false_0: s0.include?(-1)
+  include_false_10: s1.include?(-1)
+  include_false_100: s2.include?(-1)
+  include_false_1000: s3.include?(-1)
+  intersect_0: s0.intersect? o0
+  intersect_10: s1.intersect? o1
+  intersect_100: s2.intersect? o2
+  intersect_1000: s3.intersect? o3
+  intersect_same_0: s0.intersect? d0
+  intersect_same_10: s1.intersect? d1
+  intersect_same_100: s2.intersect? d2
+  intersect_same_1000: s3.intersect? d3
+  join_0: s0.join
+  join_10: s1.join
+  join_100: s2.join
+  join_1000: s3.join
+  join_arg_0: s0.join ""
+  join_arg_10: s1.join ""
+  join_arg_100: s2.join ""
+  join_arg_1000: s3.join ""
+  keep_if_0: s0.keep_if { it }
+  keep_if_10: s1.keep_if { it & 2 == 0 }
+  keep_if_100: s2.keep_if { it & 2 == 0 }
+  keep_if_1000: s3.keep_if { it & 2 == 0 }
+  merge_set: s0.dup.merge(s3, o3)
+  merge_enum: s0.dup.merge(array1, array2)
+  proper_subset_0: s0.proper_subset? s0
+  proper_subset_10: s1.proper_subset? ss1
+  proper_subset_100: s2.proper_subset? ss2
+  proper_subset_1000: s3.proper_subset? ss3
+  proper_subset_false_10: s1.proper_subset? os1
+  proper_subset_false_100: s2.proper_subset? os2
+  proper_subset_false_1000: s3.proper_subset? os3
+  proper_superset_0: s0.proper_superset? s0
+  proper_superset_10: ss1.proper_superset? s1
+  proper_superset_100: ss2.proper_superset? s2
+  proper_superset_1000: ss3.proper_superset? s3
+  proper_superset_false_10: os1.proper_superset? s1
+  proper_superset_false_100: os2.proper_superset? s2
+  proper_superset_false_1000: os3.proper_superset? s3
+  reject_0: s0.reject! { it }
+  reject_10: s1.reject! { it & 2 == 0 }
+  reject_100: s2.reject! { it & 2 == 0 }
+  reject_1000: s3.reject! { it & 2 == 0 }
+  replace_0: s = Set.new; array1.each { s.replace(s0) }
+  replace_10: s = Set.new; array1.each { s.replace(s1) }
+  replace_100: s = Set.new; array1.each { s.replace(s2) }
+  replace_1000: s = Set.new; array1.each { s.replace(s3) }
+  reset_0: s0.reset
+  reset_10: s1.reset
+  reset_100: s2.reset
+  reset_1000: s3.reset
+  select_0: s0.select! { it }
+  select_10: s1.select! { it & 2 == 0 }
+  select_100: s2.select! { it & 2 == 0 }
+  select_1000: s3.select! { it & 2 == 0 }
+  size_0: s0.size
+  size_10: s1.size
+  size_100: s2.size
+  size_1000: s3.size
+  subtract_set: s3.dup.subtract(os3)
+  subtract_enum: s3.dup.subtract(oa3)
+  subtract_same_set: s3.dup.subtract(s3)
+  subtract_same_enum: s3.dup.subtract(a3)
+  subset_0: s0.subset? s0
+  subset_10: s1.subset? ss1
+  subset_100: s2.subset? ss2
+  subset_1000: s3.subset? ss3
+  subset_false_10: s1.subset? os1
+  subset_false_100: s2.subset? os2
+  subset_false_1000: s3.subset? os3
+  superset_0: s0.superset? s0
+  superset_10: ss1.superset? s1
+  superset_100: ss2.superset? s2
+  superset_1000: ss3.superset? s3
+  superset_false_10: os1.superset? s1
+  superset_false_100: os2.superset? s2
+  superset_false_1000: os3.superset? s3
+  to_a_0: s0.to_a
+  to_a_10: s1.to_a
+  to_a_100: s2.to_a
+  to_a_1000: s3.to_a
+  to_set_0: s0.to_set
+  to_set_10: s1.to_set
+  to_set_100: s2.to_set
+  to_set_1000: s3.to_set
+  to_set_arg_0: s0.to_set set_subclass
+  to_set_arg_10: s1.to_set set_subclass
+  to_set_arg_100: s2.to_set set_subclass
+  to_set_arg_1000: s3.to_set set_subclass
diff --git a/benchmark/so_count_words.yml b/benchmark/so_count_words.yml
index 99683505f927ac..f7322a8541d8cb 100644
--- a/benchmark/so_count_words.yml
+++ b/benchmark/so_count_words.yml
@@ -15,13 +15,13 @@ prelude: |
   Newsgroups:   rec.games.roguelike.nethack
   X-Mailer:     Mozilla 1.1N (Macintosh; I; 68K)
 
-  Hello there, Izchak Miller was my father.  When I was younger I spent 
-  many a night, hunched over the keyboard with a cup of tea, playing 
-  nethack with him and my brother.  my dad was a philosopher with a strong 
-  weakness for fantasy/sci fi.  I remember when he started to get involved 
-  with the Nethack team- my brother's Dungeons and Dragons monster book 
-  found a regular place beside my dad's desk. it's nice to see him living 
-  on in the game he loved so much :-).  
+  Hello there,  Izchak Miller was my  father.  When I was  younger I spent
+  many  a night,  hunched over  the keyboard  with a  cup of  tea, playing
+  nethack with him and my brother.  my dad was a philosopher with a strong
+  weakness for fantasy/sci fi.  I remember when he started to get involved
+  with the  Nethack team- my  brother's Dungeons and Dragons  monster book
+  found a regular place beside my dad's  desk. it's nice to see him living
+  on in the game he loved so much :-).
                                                                     Tamar Miller
 
   The following is a really long word of 5000 characters:
@@ -38,8 +38,9 @@ prelude: |
       13.times{
         data << data
       }
-      open(wcinput, 'w'){|f| f.write data}
+      File.write(wcinput, data)
     end
+    at_exit {File.unlink(wcinput) rescue nil}
   end
 
   prepare_wc_input(wc_input_base)
@@ -49,16 +50,16 @@ benchmark:
     # $Id: wc-ruby.code,v 1.4 2004/11/13 07:43:32 bfulgham Exp $
     # http://www.bagley.org/~doug/shootout/
     # with help from Paul Brannan
-    input = open(File.join(File.dirname($0), 'wc.input'), 'rb')
 
     nl = nw = nc = 0
-    while true
-      tmp = input.read(4096) or break
-      data = tmp << (input.gets || "")
-      nc += data.length
-      nl += data.count("\n")
-      ((data.strip! || data).tr!("\n", " ") || data).squeeze!
-      nw += data.count(" ") + 1
+    File.open(File.join(File.dirname($0), 'wc.input'), 'rb') do |input|
+      while tmp = input.read(4096)
+        data = tmp << (input.gets || "")
+        nc += data.length
+        nl += data.count("\n")
+        ((data.strip! || data).tr!("\n", " ") || data).squeeze!
+        nw += data.count(" ") + 1
+      end
     end
     # STDERR.puts "#{nl} #{nw} #{nc}"
 
diff --git a/benchmark/string_concat.yml b/benchmark/string_concat.yml
index da14692f5ecc2c..f11f95ee9a7891 100644
--- a/benchmark/string_concat.yml
+++ b/benchmark/string_concat.yml
@@ -45,7 +45,7 @@ benchmark:
       "#{CHUNK}#{CHUNK}#{CHUNK}#{CHUNK}#{CHUNK}#{CHUNK}#{CHUNK}#{CHUNK}#{CHUNK}#{CHUNK}" \
       "#{CHUNK}#{CHUNK}#{CHUNK}#{CHUNK}#{CHUNK}#{CHUNK}#{CHUNK}#{CHUNK}#{CHUNK}#{CHUNK}" \
       "#{CHUNK}#{CHUNK}#{CHUNK}#{CHUNK}#{CHUNK}#{CHUNK}#{CHUNK}#{CHUNK}#{CHUNK}"
-  interpolation_same_size_pool: |
+  interpolation_same_heap: |
     buffer = "#{SHORT}#{SHORT}"
-  interpolation_switching_size_pools: |
+  interpolation_switching_heaps: |
     buffer = "#{SHORT}#{LONG}"
diff --git a/benchmark/string_dup.yml b/benchmark/string_dup.yml
new file mode 100644
index 00000000000000..90793f9f2a8975
--- /dev/null
+++ b/benchmark/string_dup.yml
@@ -0,0 +1,7 @@
+prelude: |
+  # frozen_string_literal: true
+benchmark:
+  uplus: |
+    +"A"
+  dup: |
+    "A".dup
diff --git a/benchmark/string_fstring.yml b/benchmark/string_fstring.yml
new file mode 100644
index 00000000000000..cafef1f3fea360
--- /dev/null
+++ b/benchmark/string_fstring.yml
@@ -0,0 +1,16 @@
+benchmark:
+  fstring_random: |
+    i = 0
+    str = "same".dup
+    while i < 5_000_000
+      -(i.to_s.freeze)
+      i += 1
+    end
+  fstring_same: |
+    i = 0
+    str = "same".dup
+    while i < 10_000_000
+      -str
+      i += 1
+    end
+loop_count: 1
diff --git a/benchmark/string_gsub.yml b/benchmark/string_gsub.yml
new file mode 100644
index 00000000000000..0f964337dd9613
--- /dev/null
+++ b/benchmark/string_gsub.yml
@@ -0,0 +1,43 @@
+prelude: |
+  # frozen_string_literal: true
+  STR = ((("a" * 31) + "<") * 1000).freeze
+  STR_UNICODE = ((("a" * 30) + "\u2028") * 1000).freeze
+  ESCAPED_CHARS_BINARY = {
+    "\u2028".b => '\u2028'.b,
+    "\u2029".b => '\u2029'.b,
+    ">".b => '\u003e'.b.freeze,
+    "<".b => '\u003c'.b.freeze,
+    "&".b => '\u0026'.b.freeze,
+  }
+  BINARY_PATTERN = Regexp.union(ESCAPED_CHARS_BINARY.keys)
+
+  ESCAPED_CHARS = {
+    "\u2028" => '\u2028',
+    "\u2029" => '\u2029',
+    ">" => '\u003e',
+    "<" => '\u003c',
+    "&" => '\u0026',
+  }
+  ESCAPE_PATTERN = Regexp.union(ESCAPED_CHARS.keys)
+
+
+benchmark:
+  escape: |
+    str = STR.dup
+    str.gsub!(ESCAPE_PATTERN, ESCAPED_CHARS)
+    str
+
+  escape_bin: |
+    str = STR.b
+    str.gsub!(BINARY_PATTERN, ESCAPED_CHARS_BINARY)
+    str.force_encoding(Encoding::UTF_8)
+
+  escape_utf8: |
+    str = STR_UNICODE.dup
+    str.gsub!(ESCAPE_PATTERN, ESCAPED_CHARS)
+    str
+
+  escape_utf8_bin: |
+    str = STR_UNICODE.b
+    str.gsub!(BINARY_PATTERN, ESCAPED_CHARS_BINARY)
+    str.force_encoding(Encoding::UTF_8)
diff --git a/benchmark/struct_accessor.yml b/benchmark/struct_accessor.yml
new file mode 100644
index 00000000000000..61176cfdd48d3a
--- /dev/null
+++ b/benchmark/struct_accessor.yml
@@ -0,0 +1,25 @@
+prelude: |
+  C = Struct.new(:x) do
+    class_eval <<-END
+      def r
+        #{'x;'*256}
+      end
+      def w
+        #{'self.x = nil;'*256}
+      end
+      def rm
+        m = method(:x)
+        #{'m.call;'*256}
+      end
+      def wm
+        m = method(:x=)
+        #{'m.call(nil);'*256}
+      end
+    END
+  end
+  obj = C.new(nil)
+benchmark:
+  member_reader: "obj.r"
+  member_writer: "obj.w"
+  member_reader_method: "obj.rm"
+  member_writer_method: "obj.wm"
diff --git a/benchmark/time_strftime.yml b/benchmark/time_strftime.yml
new file mode 100644
index 00000000000000..28f62aec87a20d
--- /dev/null
+++ b/benchmark/time_strftime.yml
@@ -0,0 +1,7 @@
+prelude: |
+  # frozen_string_literal: true
+  time = Time.now
+benchmark:
+  - time.strftime("%FT%T")     # 19B
+  - time.strftime("%FT%T.%3N") # 23B
+  - time.strftime("%FT%T.%6N") # 26B
diff --git a/benchmark/time_xmlschema.yml b/benchmark/time_xmlschema.yml
new file mode 100644
index 00000000000000..654e5cfcbc3bcd
--- /dev/null
+++ b/benchmark/time_xmlschema.yml
@@ -0,0 +1,27 @@
+prelude: |
+  # frozen_string_literal
+  unless Time.method_defined?(:xmlschema)
+    class Time
+      def xmlschema(fraction_digits=0)
+        fraction_digits = fraction_digits.to_i
+        s = strftime("%FT%T")
+        if fraction_digits > 0
+          s << strftime(".%#{fraction_digits}N")
+        end
+        s << (utc? ? 'Z' : strftime("%:z"))
+      end
+    end
+  end
+  time = Time.now
+  utc_time = Time.now.utc
+  fraction_sec = Time.at(123456789.quo(9999999999)).getlocal("+09:00")
+  future_time = Time.utc(10000)
+benchmark:
+  - time.xmlschema
+  - utc_time.xmlschema
+  - time.xmlschema(6)
+  - utc_time.xmlschema(6)
+  - time.xmlschema(9)
+  - utc_time.xmlschema(9)
+  - fraction_sec.xmlschema(10)
+  - future_time.xmlschema
diff --git a/benchmark/vm_call_kw_and_kw_splat.yml b/benchmark/vm_call_kw_and_kw_splat.yml
new file mode 100644
index 00000000000000..aa6e549e0c4224
--- /dev/null
+++ b/benchmark/vm_call_kw_and_kw_splat.yml
@@ -0,0 +1,25 @@
+prelude: |
+  h1, h10, h100, h1000 = [1, 10, 100, 1000].map do |n|
+    h = {kw: 1}
+    n.times{|i| h[i.to_s.to_sym] = i}
+    h
+  end
+  eh = {}
+  def kw(kw: nil, **kws) end
+benchmark:
+  1: |
+    kw(**h1)
+  1_mutable: |
+    kw(**eh, **h1)
+  10: |
+    kw(**h10)
+  10_mutable: |
+    kw(**eh, **h10)
+  100: |
+    kw(**h100)
+  100_mutable: |
+    kw(**eh, **h100)
+  1000: |
+    kw(**h1000)
+  1000_mutable: |
+    kw(**eh, **h1000)
diff --git a/benchmark/vm_ivar_ic_miss.yml b/benchmark/vm_ivar_ic_miss.yml
new file mode 100644
index 00000000000000..944fb1a9e6d38e
--- /dev/null
+++ b/benchmark/vm_ivar_ic_miss.yml
@@ -0,0 +1,20 @@
+prelude: |
+  class Foo
+    def initialize diverge
+      if diverge
+        @a = 1
+      end
+
+      @a0 = @a1 = @a2 = @a3 = @a4 = @a5 = @a6 = @a7 = @a8 = @a9 = @a10 = @a11 = @a12 = @a13 = @a14 = @a15 = @a16 = @a17 = @a18 = @a19 = @a20 = @a21 = @a22 = @a23 = @a24 = @a25 = @a26 = @a27 = @a28 = @a29 = @a30 = @a31 = @a32 = @a33 = @a34 = @a35 = @a36 = @a37 = @a38 = @a39 = @a40 = @a41 = @a42 = @a43 = @a44 = @a45 = @a46 = @a47 = @a48 = @a49 = @a50 = @a51 = @a52 = @a53 = @a54 = @a55 = @a56 = @a57 = @a58 = @a59 = @a60 = @a61 = @a62 = @a63 = @a64 = @a65 = @a66 = @a67 = @a68 = @a69 = @a70 = @a71 = @a72 = @a73 = @a74 = @b = 1
+    end
+
+    def b; @b; end
+  end
+
+  a = Foo.new false
+  b = Foo.new true
+benchmark:
+  vm_ivar_ic_miss: |
+    a.b
+    b.b
+loop_count: 30000000
diff --git a/benchmark/vm_ivar_memoize.yml b/benchmark/vm_ivar_memoize.yml
new file mode 100644
index 00000000000000..90f6b07f05de41
--- /dev/null
+++ b/benchmark/vm_ivar_memoize.yml
@@ -0,0 +1,85 @@
+prelude: |
+  IVARS = 60
+  class Record
+    def initialize(offset = false)
+      @offset = 1 if offset
+      @first = 0
+      IVARS.times do |i|
+        instance_variable_set("@ivar_#{i}", i)
+      end
+    end
+
+    def first
+      @first
+    end
+
+    def lazy_set
+      @lazy_set ||= 123
+    end
+
+    def undef
+      @undef
+    end
+  end
+
+  Record.new # Need one alloc to right size
+
+  BASE = Record.new
+  LAZY = Record.new
+  LAZY.lazy_set
+
+  class Miss < Record
+    @first = 0
+    IVARS.times do |i|
+      instance_variable_set("@i_#{i}", i)
+    end
+  end
+
+  Miss.new # Need one alloc to right size
+  MISS = Miss.new
+
+  DIVERGENT = Record.new(true)
+
+benchmark:
+  vm_ivar_stable_shape: |
+    BASE.first
+    BASE.first
+    BASE.first
+    BASE.first
+    BASE.first
+    BASE.first
+  vm_ivar_memoize_unstable_shape: |
+    BASE.first
+    LAZY.first
+    BASE.first
+    LAZY.first
+    BASE.first
+    LAZY.first
+  vm_ivar_memoize_unstable_shape_miss: |
+    BASE.first
+    MISS.first
+    BASE.first
+    MISS.first
+    BASE.first
+    MISS.first
+  vm_ivar_unstable_undef: |
+    BASE.undef
+    LAZY.undef
+    BASE.undef
+    LAZY.undef
+    BASE.undef
+    LAZY.undef
+  vm_ivar_divergent_shape: |
+    BASE.first
+    DIVERGENT.first
+    BASE.first
+    DIVERGENT.first
+    BASE.first
+    DIVERGENT.first
+  vm_ivar_divergent_shape_imbalanced: |
+    BASE.first
+    DIVERGENT.first
+    DIVERGENT.first
+    DIVERGENT.first
+    DIVERGENT.first
+    DIVERGENT.first
diff --git a/benchmark/vm_method_splat_calls.yml b/benchmark/vm_method_splat_calls.yml
new file mode 100644
index 00000000000000..f2f366e99ca8d3
--- /dev/null
+++ b/benchmark/vm_method_splat_calls.yml
@@ -0,0 +1,13 @@
+prelude: |
+  def f(x=0, y: 0) end
+  a = [1]
+  ea = []
+  kw = {y: 1}
+  b = lambda{}
+benchmark:
+  arg_splat: "f(1, *ea)"
+  arg_splat_block: "f(1, *ea, &b)"
+  splat_kw_splat: "f(*a, **kw)"
+  splat_kw_splat_block: "f(*a, **kw, &b)"
+  splat_kw: "f(*a, y: 1)"
+  splat_kw_block: "f(*a, y: 1, &b)"
diff --git a/benchmark/vm_method_splat_calls2.yml b/benchmark/vm_method_splat_calls2.yml
new file mode 100644
index 00000000000000..d33dcd7e8b91e1
--- /dev/null
+++ b/benchmark/vm_method_splat_calls2.yml
@@ -0,0 +1,27 @@
+prelude: |
+  def named_arg_splat(*a) end
+  def named_arg_kw_splat(*a, **kw) end
+  def anon_arg_splat(*) end
+  def anon_kw_splat(**) end
+  def anon_arg_kw_splat(*, **) end
+  def anon_fw_to_named(*, **) named_arg_kw_splat(*, **) end
+  def fw_to_named(...) named_arg_kw_splat(...) end
+  def fw_to_anon_to_named(...) anon_fw_to_named(...) end
+  def fw_no_kw(...) named_arg_splat(...) end
+  a = [1]
+  kw = {y: 1}
+benchmark:
+  named_multi_arg_splat: "named_arg_splat(*a, *a)"
+  named_post_splat: "named_arg_splat(*a, a)"
+  anon_arg_splat: "anon_arg_splat(*a)"
+  anon_arg_kw_splat: "anon_arg_kw_splat(*a, **kw)"
+  anon_multi_arg_splat: "anon_arg_splat(*a, *a)"
+  anon_post_splat: "anon_arg_splat(*a, a)"
+  anon_kw_splat: "anon_kw_splat(**kw)"
+  anon_fw_to_named_splat: "anon_fw_to_named(*a, **kw)"
+  anon_fw_to_named_no_splat: "anon_fw_to_named(1, y: 1)"
+  fw_to_named_splat: "fw_to_named(*a, **kw)"
+  fw_to_named_no_splat: "fw_to_named(1, y: 1)"
+  fw_to_anon_to_named_splat: "fw_to_anon_to_named(*a, **kw)"
+  fw_to_anon_to_named_no_splat: "fw_to_anon_to_named(1, y: 1)"
+  fw_no_kw: "fw_no_kw(1, 2)"
diff --git a/benchmark/vm_super_splat_calls.yml b/benchmark/vm_super_splat_calls.yml
new file mode 100644
index 00000000000000..795e44e4da4c25
--- /dev/null
+++ b/benchmark/vm_super_splat_calls.yml
@@ -0,0 +1,25 @@
+prelude: |
+  @a = [1].freeze
+  @ea = [].freeze
+  @kw = {y: 1}.freeze
+  @b = lambda{}
+  extend(Module.new{def arg_splat(x=0, y: 0) end})
+  extend(Module.new{def arg_splat_block(x=0, y: 0) end})
+  extend(Module.new{def splat_kw_splat(x=0, y: 0) end})
+  extend(Module.new{def splat_kw_splat_block(x=0, y: 0) end})
+  extend(Module.new{def splat_kw(x=0, y: 0) end})
+  extend(Module.new{def splat_kw_block(x=0, y: 0) end})
+
+  extend(Module.new{def arg_splat; super(1, *@ea) end})
+  extend(Module.new{def arg_splat_block; super(1, *@ea, &@b) end})
+  extend(Module.new{def splat_kw_splat; super(*@a, **@kw) end})
+  extend(Module.new{def splat_kw_splat_block; super(*@a, **@kw, &@b) end})
+  extend(Module.new{def splat_kw; super(*@a, y: 1) end})
+  extend(Module.new{def splat_kw_block; super(*@a, y: 1, &@b) end})
+benchmark:
+  arg_splat: "arg_splat"
+  arg_splat_block: "arg_splat_block"
+  splat_kw_splat: "splat_kw_splat"
+  splat_kw_splat_block: "splat_kw_splat_block"
+  splat_kw: "splat_kw"
+  splat_kw_block: "splat_kw_block"
diff --git a/benchmark/vm_zsuper_splat_calls.yml b/benchmark/vm_zsuper_splat_calls.yml
new file mode 100644
index 00000000000000..82dc22349d4a24
--- /dev/null
+++ b/benchmark/vm_zsuper_splat_calls.yml
@@ -0,0 +1,28 @@
+prelude: |
+  a = [1].freeze
+  ea = [].freeze
+  kw = {y: 1}.freeze
+  b = lambda{}
+  extend(Module.new{def arg_splat(x=0, y: 0) end})
+  extend(Module.new{def arg_splat_block(x=0, y: 0) end})
+  extend(Module.new{def arg_splat_post(x=0, y: 0) end})
+  extend(Module.new{def splat_kw_splat(x=0, y: 0) end})
+  extend(Module.new{def splat_kw_splat_block(x=0, y: 0) end})
+  extend(Module.new{def splat_kw(x=0, y: 0) end})
+  extend(Module.new{def splat_kw_block(x=0, y: 0) end})
+
+  extend(Module.new{def arg_splat(x, *a) super end})
+  extend(Module.new{def arg_splat_block(x, *a, &b) super end})
+  extend(Module.new{def arg_splat_post(*a, x) super end})
+  extend(Module.new{def splat_kw_splat(*a, **kw) super end})
+  extend(Module.new{def splat_kw_splat_block(*a, **kw, &b) super end})
+  extend(Module.new{def splat_kw(*a, y: 1) super end})
+  extend(Module.new{def splat_kw_block(*a, y: 1, &b) super end})
+benchmark:
+  arg_splat: "arg_splat(1, *ea)"
+  arg_splat_block: "arg_splat_block(1, *ea, &b)"
+  arg_splat_post: "arg_splat_post(1, *ea, &b)"
+  splat_kw_splat: "splat_kw_splat(*a, **kw)"
+  splat_kw_splat_block: "splat_kw_splat_block(*a, **kw, &b)"
+  splat_kw: "splat_kw(*a, y: 1)"
+  splat_kw_block: "splat_kw_block(*a, y: 1, &b)"
diff --git a/bignum.c b/bignum.c
index e9bf37d2060ea7..fb4714307e6375 100644
--- a/bignum.c
+++ b/bignum.c
@@ -30,9 +30,6 @@
 # define USE_GMP 0
 #endif
 #endif
-#if USE_GMP
-# include <gmp.h>
-#endif
 
 #include "id.h"
 #include "internal.h"
@@ -48,6 +45,15 @@
 #include "ruby/util.h"
 #include "ruby_assert.h"
 
+#if USE_GMP
+RBIMPL_WARNING_PUSH()
+# ifdef _MSC_VER
+RBIMPL_WARNING_IGNORED(4146) /* for mpn_neg() */
+# endif
+# include <gmp.h>
+RBIMPL_WARNING_POP()
+#endif
+
 static const bool debug_integer_pack = (
 #ifdef DEBUG_INTEGER_PACK
     DEBUG_INTEGER_PACK+0
@@ -349,7 +355,7 @@ maxpow_in_bdigit_dbl(int base, int *exp_ret)
     BDIGIT_DBL maxpow;
     int exponent;
 
-    assert(2 <= base && base <= 36);
+    RUBY_ASSERT(2 <= base && base <= 36);
 
     {
 #if SIZEOF_BDIGIT_DBL == 2
@@ -381,7 +387,7 @@ maxpow_in_bdigit_dbl(int base, int *exp_ret)
 static inline BDIGIT_DBL
 bary2bdigitdbl(const BDIGIT *ds, size_t n)
 {
-    assert(n <= 2);
+    RUBY_ASSERT(n <= 2);
 
     if (n == 2)
         return ds[0] | BIGUP(ds[1]);
@@ -393,7 +399,7 @@ bary2bdigitdbl(const BDIGIT *ds, size_t n)
 static inline void
 bdigitdbl2bary(BDIGIT *ds, size_t n, BDIGIT_DBL num)
 {
-    assert(n == 2);
+    RUBY_ASSERT(n == 2);
 
     ds[0] = BIGLO(num);
     ds[1] = (BDIGIT)BIGDN(num);
@@ -424,7 +430,7 @@ bary_small_lshift(BDIGIT *zds, const BDIGIT *xds, size_t n, int shift)
 {
     size_t i;
     BDIGIT_DBL num = 0;
-    assert(0 <= shift && shift < BITSPERDIG);
+    RUBY_ASSERT(0 <= shift && shift < BITSPERDIG);
 
     for (i=0; i<n; i++) {
         num = num | (BDIGIT_DBL)*xds++ << shift;
@@ -440,7 +446,7 @@ bary_small_rshift(BDIGIT *zds, const BDIGIT *xds, size_t n, int shift, BDIGIT hi
     size_t i;
     BDIGIT_DBL num = 0;
 
-    assert(0 <= shift && shift < BITSPERDIG);
+    RUBY_ASSERT(0 <= shift && shift < BITSPERDIG);
 
     num = BIGUP(higher_bdigit);
     for (i = 0; i < n; i++) {
@@ -1060,8 +1066,8 @@ integer_unpack_num_bdigits(size_t numwords, size_t wordsize, size_t nails, int *
         if (debug_integer_pack) {
             int nlp_bits1;
             size_t num_bdigits1 = integer_unpack_num_bdigits_generic(numwords, wordsize, nails, &nlp_bits1);
-            assert(num_bdigits == num_bdigits1);
-            assert(*nlp_bits_ret == nlp_bits1);
+            RUBY_ASSERT(num_bdigits == num_bdigits1);
+            RUBY_ASSERT(*nlp_bits_ret == nlp_bits1);
             (void)num_bdigits1;
         }
     }
@@ -1271,7 +1277,7 @@ bary_unpack_internal(BDIGIT *bdigits, size_t num_bdigits, const void *words, siz
         }
         if (dd)
             *dp++ = (BDIGIT)dd;
-        assert(dp <= de);
+        RUBY_ASSERT(dp <= de);
         while (dp < de)
             *dp++ = 0;
 #undef PUSH_BITS
@@ -1330,7 +1336,7 @@ bary_unpack(BDIGIT *bdigits, size_t num_bdigits, const void *words, size_t numwo
 
     num_bdigits0 = integer_unpack_num_bdigits(numwords, wordsize, nails, &nlp_bits);
 
-    assert(num_bdigits0 <= num_bdigits);
+    RUBY_ASSERT(num_bdigits0 <= num_bdigits);
 
     sign = bary_unpack_internal(bdigits, num_bdigits0, words, numwords, wordsize, nails, flags, nlp_bits);
 
@@ -1349,8 +1355,8 @@ bary_subb(BDIGIT *zds, size_t zn, const BDIGIT *xds, size_t xn, const BDIGIT *yd
     size_t i;
     size_t sn;
 
-    assert(xn <= zn);
-    assert(yn <= zn);
+    RUBY_ASSERT(xn <= zn);
+    RUBY_ASSERT(yn <= zn);
 
     sn = xn < yn ? xn : yn;
 
@@ -1411,8 +1417,8 @@ bary_addc(BDIGIT *zds, size_t zn, const BDIGIT *xds, size_t xn, const BDIGIT *yd
     BDIGIT_DBL num;
     size_t i;
 
-    assert(xn <= zn);
-    assert(yn <= zn);
+    RUBY_ASSERT(xn <= zn);
+    RUBY_ASSERT(yn <= zn);
 
     if (xn > yn) {
         const BDIGIT *tds;
@@ -1476,7 +1482,7 @@ bary_mul_single(BDIGIT *zds, size_t zn, BDIGIT x, BDIGIT y)
 {
     BDIGIT_DBL n;
 
-    assert(2 <= zn);
+    RUBY_ASSERT(2 <= zn);
 
     n = (BDIGIT_DBL)x * y;
     bdigitdbl2bary(zds, 2, n);
@@ -1490,7 +1496,7 @@ bary_muladd_1xN(BDIGIT *zds, size_t zn, BDIGIT x, const BDIGIT *yds, size_t yn)
     BDIGIT_DBL dd;
     size_t j;
 
-    assert(zn > yn);
+    RUBY_ASSERT(zn > yn);
 
     if (x == 0)
         return 0;
@@ -1525,7 +1531,7 @@ bigdivrem_mulsub(BDIGIT *zds, size_t zn, BDIGIT x, const BDIGIT *yds, size_t yn)
     BDIGIT_DBL t2;
     BDIGIT_DBL_SIGNED num;
 
-    assert(zn == yn + 1);
+    RUBY_ASSERT(zn == yn + 1);
 
     num = 0;
     t2 = 0;
@@ -1550,7 +1556,7 @@ bary_mulsub_1xN(BDIGIT *zds, size_t zn, BDIGIT x, const BDIGIT *yds, size_t yn)
 {
     BDIGIT_DBL_SIGNED num;
 
-    assert(zn == yn + 1);
+    RUBY_ASSERT(zn == yn + 1);
 
     num = bigdivrem_mulsub(zds, zn, x, yds, yn);
     zds[yn] = BIGLO(num);
@@ -1564,7 +1570,7 @@ bary_mul_normal(BDIGIT *zds, size_t zn, const BDIGIT *xds, size_t xn, const BDIG
 {
     size_t i;
 
-    assert(xn + yn <= zn);
+    RUBY_ASSERT(xn + yn <= zn);
 
     BDIGITS_ZERO(zds, zn);
     for (i = 0; i < xn; i++) {
@@ -1595,7 +1601,7 @@ bary_sq_fast(BDIGIT *zds, size_t zn, const BDIGIT *xds, size_t xn)
     BDIGIT vl;
     int vh;
 
-    assert(xn * 2 <= zn);
+    RUBY_ASSERT(xn * 2 <= zn);
 
     BDIGITS_ZERO(zds, zn);
 
@@ -1667,9 +1673,9 @@ bary_mul_balance_with_mulfunc(BDIGIT *const zds, const size_t zn,
     VALUE work = 0;
     size_t n;
 
-    assert(xn + yn <= zn);
-    assert(xn <= yn);
-    assert(!KARATSUBA_BALANCED(xn, yn) || !TOOM3_BALANCED(xn, yn));
+    RUBY_ASSERT(xn + yn <= zn);
+    RUBY_ASSERT(xn <= yn);
+    RUBY_ASSERT(!KARATSUBA_BALANCED(xn, yn) || !TOOM3_BALANCED(xn, yn));
 
     BDIGITS_ZERO(zds, xn);
 
@@ -1751,9 +1757,9 @@ bary_mul_karatsuba(BDIGIT *zds, size_t zn, const BDIGIT *xds, size_t xn, const B
     const BDIGIT *xds0, *xds1, *yds0, *yds1;
     BDIGIT *zds0, *zds1, *zds2, *zds3;
 
-    assert(xn + yn <= zn);
-    assert(xn <= yn);
-    assert(yn < 2 * xn);
+    RUBY_ASSERT(xn + yn <= zn);
+    RUBY_ASSERT(xn <= yn);
+    RUBY_ASSERT(yn < 2 * xn);
 
     sq = xds == yds && xn == yn;
 
@@ -1768,7 +1774,7 @@ bary_mul_karatsuba(BDIGIT *zds, size_t zn, const BDIGIT *xds, size_t xn, const B
 
     n = yn / 2;
 
-    assert(n < xn);
+    RUBY_ASSERT(n < xn);
 
     if (wn < n) {
         /* This function itself needs only n BDIGITs for work area.
@@ -1889,7 +1895,7 @@ bary_mul_karatsuba(BDIGIT *zds, size_t zn, const BDIGIT *xds, size_t xn, const B
         for (x = 0, i = xn-1; 0 <= i; i--) { x <<= SIZEOF_BDIGIT*CHAR_BIT; x |= xds[i]; }
         for (y = 0, i = yn-1; 0 <= i; i--) { y <<= SIZEOF_BDIGIT*CHAR_BIT; y |= yds[i]; }
         for (z = 0, i = zn-1; 0 <= i; i--) { z <<= SIZEOF_BDIGIT*CHAR_BIT; z |= zds[i]; }
-        assert(z == x * y);
+        RUBY_ASSERT(z == x * y);
     }
     */
 
@@ -1957,11 +1963,11 @@ bary_mul_toom3(BDIGIT *zds, size_t zn, const BDIGIT *xds, size_t xn, const BDIGI
 
     int sq = xds == yds && xn == yn;
 
-    assert(xn <= yn);  /* assume y >= x */
-    assert(xn + yn <= zn);
+    RUBY_ASSERT(xn <= yn);  /* assume y >= x */
+    RUBY_ASSERT(xn + yn <= zn);
 
     n = (yn + 2) / 3;
-    assert(2*n < xn);
+    RUBY_ASSERT(2*n < xn);
 
     wnc = 0;
 
@@ -2148,19 +2154,19 @@ bary_mul_toom3(BDIGIT *zds, size_t zn, const BDIGIT *xds, size_t xn, const BDIGI
     /* z(1) : t1 <- u1 * v1 */
     bary_mul_toom3_start(t1ds, t1n, u1ds, u1n, v1ds, v1n, wds, wn);
     t1p = u1p == v1p;
-    assert(t1ds[t1n-1] == 0);
+    RUBY_ASSERT(t1ds[t1n-1] == 0);
     t1n--;
 
     /* z(-1) : t2 <- u2 * v2 */
     bary_mul_toom3_start(t2ds, t2n, u2ds, u2n, v2ds, v2n, wds, wn);
     t2p = u2p == v2p;
-    assert(t2ds[t2n-1] == 0);
+    RUBY_ASSERT(t2ds[t2n-1] == 0);
     t2n--;
 
     /* z(-2) : t3 <- u3 * v3 */
     bary_mul_toom3_start(t3ds, t3n, u3ds, u3n, v3ds, v3n, wds, wn);
     t3p = u3p == v3p;
-    assert(t3ds[t3n-1] == 0);
+    RUBY_ASSERT(t3ds[t3n-1] == 0);
     t3n--;
 
     /* z(inf) : t4 <- x2 * y2 */
@@ -2336,7 +2342,7 @@ bary_mul_gmp(BDIGIT *zds, size_t zn, const BDIGIT *xds, size_t xn, const BDIGIT
     mpz_t x, y, z;
     size_t count;
 
-    assert(xn + yn <= zn);
+    RUBY_ASSERT(xn + yn <= zn);
 
     mpz_init(x);
     mpz_init(y);
@@ -2371,7 +2377,7 @@ rb_big_mul_gmp(VALUE x, VALUE y)
 static void
 bary_short_mul(BDIGIT *zds, size_t zn, const BDIGIT *xds, size_t xn, const BDIGIT *yds, size_t yn)
 {
-    assert(xn + yn <= zn);
+    RUBY_ASSERT(xn + yn <= zn);
 
     if (xn == 1 && yn == 1) {
         bary_mul_single(zds, zn, xds[0], yds[0]);
@@ -2407,7 +2413,7 @@ bary_mul_precheck(BDIGIT **zdsp, size_t *znp, const BDIGIT **xdsp, size_t *xnp,
     const BDIGIT *yds = *ydsp;
     size_t yn = *ynp;
 
-    assert(xn + yn <= zn);
+    RUBY_ASSERT(xn + yn <= zn);
 
     nlsz = 0;
 
@@ -2456,7 +2462,7 @@ bary_mul_precheck(BDIGIT **zdsp, size_t *znp, const BDIGIT **xdsp, size_t *xnp,
         tds = xds; xds = yds; yds = tds;
         tn = xn; xn = yn; yn = tn;
     }
-    assert(xn <= yn);
+    RUBY_ASSERT(xn <= yn);
 
     if (xn <= 1) {
         if (xn == 0) {
@@ -2639,8 +2645,8 @@ rb_big_stop(void *ptr)
 static BDIGIT
 bigdivrem_single1(BDIGIT *qds, const BDIGIT *xds, size_t xn, BDIGIT x_higher_bdigit, BDIGIT y)
 {
-    assert(0 < xn);
-    assert(x_higher_bdigit < y);
+    RUBY_ASSERT(0 < xn);
+    RUBY_ASSERT(x_higher_bdigit < y);
     if (POW2_P(y)) {
         BDIGIT r;
         r = xds[0] & (y-1);
@@ -2672,9 +2678,9 @@ bigdivrem_restoring(BDIGIT *zds, size_t zn, BDIGIT *yds, size_t yn)
     struct big_div_struct bds;
     size_t ynzero;
 
-    assert(yn < zn);
-    assert(BDIGIT_MSB(yds[yn-1]));
-    assert(zds[zn-1] < yds[yn-1]);
+    RUBY_ASSERT(yn < zn);
+    RUBY_ASSERT(BDIGIT_MSB(yds[yn-1]));
+    RUBY_ASSERT(zds[zn-1] < yds[yn-1]);
 
     for (ynzero = 0; !yds[ynzero]; ynzero++);
 
@@ -2693,7 +2699,7 @@ bigdivrem_restoring(BDIGIT *zds, size_t zn, BDIGIT *yds, size_t yn)
     if (bds.zn > 10000 || bds.yn > 10000) {
       retry:
         bds.stop = Qfalse;
-        rb_nogvl(bigdivrem1, &bds, rb_big_stop, &bds, RB_NOGVL_UBF_ASYNC_SAFE);
+        rb_nogvl(bigdivrem1, &bds, rb_big_stop, &bds, RB_NOGVL_UBF_ASYNC_SAFE | RB_NOGVL_OFFLOAD_SAFE);
 
         if (bds.stop == Qtrue) {
             /* execute trap handler, but exception was not raised. */
@@ -2713,9 +2719,9 @@ bary_divmod_normal(BDIGIT *qds, size_t qn, BDIGIT *rds, size_t rn, const BDIGIT
     size_t zn;
     VALUE tmpyz = 0;
 
-    assert(yn < xn || (xn == yn && yds[yn - 1] <= xds[xn - 1]));
-    assert(qds ? (xn - yn + 1) <= qn : 1);
-    assert(rds ? yn <= rn : 1);
+    RUBY_ASSERT(yn < xn || (xn == yn && yds[yn - 1] <= xds[xn - 1]));
+    RUBY_ASSERT(qds ? (xn - yn + 1) <= qn : 1);
+    RUBY_ASSERT(rds ? yn <= rn : 1);
 
     zn = xn + BIGDIVREM_EXTRA_WORDS;
 
@@ -2807,10 +2813,10 @@ bary_divmod_gmp(BDIGIT *qds, size_t qn, BDIGIT *rds, size_t rn, const BDIGIT *xd
     mpz_t x, y, q, r;
     size_t count;
 
-    assert(yn < xn || (xn == yn && yds[yn - 1] <= xds[xn - 1]));
-    assert(qds ? (xn - yn + 1) <= qn : 1);
-    assert(rds ? yn <= rn : 1);
-    assert(qds || rds);
+    RUBY_ASSERT(yn < xn || (xn == yn && yds[yn - 1] <= xds[xn - 1]));
+    RUBY_ASSERT(qds ? (xn - yn + 1) <= qn : 1);
+    RUBY_ASSERT(rds ? yn <= rn : 1);
+    RUBY_ASSERT(qds || rds);
 
     mpz_init(x);
     mpz_init(y);
@@ -2896,8 +2902,8 @@ bary_divmod_branch(BDIGIT *qds, size_t qn, BDIGIT *rds, size_t rn, const BDIGIT
 static void
 bary_divmod(BDIGIT *qds, size_t qn, BDIGIT *rds, size_t rn, const BDIGIT *xds, size_t xn, const BDIGIT *yds, size_t yn)
 {
-    assert(xn <= qn);
-    assert(yn <= rn);
+    RUBY_ASSERT(xn <= qn);
+    RUBY_ASSERT(yn <= rn);
 
     BARY_TRUNC(yds, yn);
     if (yn == 0)
@@ -3432,8 +3438,8 @@ rb_absint_numwords(VALUE val, size_t word_numbits, size_t *nlz_bits_ret)
         if (debug_integer_pack) {
             size_t numwords0, nlz_bits0;
             numwords0 = absint_numwords_generic(numbytes, nlz_bits_in_msbyte, word_numbits, &nlz_bits0);
-            assert(numwords0 == numwords);
-            assert(nlz_bits0 == nlz_bits);
+            RUBY_ASSERT(numwords0 == numwords);
+            RUBY_ASSERT(nlz_bits0 == nlz_bits);
             (void)numwords0;
         }
     }
@@ -3848,7 +3854,7 @@ str2big_poweroftwo(
     if (numbits) {
         *dp++ = BIGLO(dd);
     }
-    assert((size_t)(dp - BDIGITS(z)) == num_bdigits);
+    RUBY_ASSERT((size_t)(dp - BDIGITS(z)) == num_bdigits);
 
     return z;
 }
@@ -3891,7 +3897,7 @@ str2big_normal(
             }
             break;
         }
-        assert(blen <= num_bdigits);
+        RUBY_ASSERT(blen <= num_bdigits);
     }
 
     return z;
@@ -3949,7 +3955,7 @@ str2big_karatsuba(
             current_base = 1;
         }
     }
-    assert(i == num_bdigits);
+    RUBY_ASSERT(i == num_bdigits);
     for (unit = 2; unit < num_bdigits; unit *= 2) {
         for (i = 0; i < num_bdigits; i += unit*2) {
             if (2*unit <= num_bdigits - i) {
@@ -4094,8 +4100,8 @@ rb_int_parse_cstr(const char *str, ssize_t len, char **endp, size_t *ndigits,
         len -= (n); \
     } while (0)
 #define ASSERT_LEN() do {\
-        assert(len != 0); \
-        if (len0 >= 0) assert(s + len0 == str + len); \
+        RUBY_ASSERT(len != 0); \
+        if (len0 >= 0) RUBY_ASSERT(s + len0 == str + len); \
     } while (0)
 
     if (!str) {
@@ -4640,8 +4646,8 @@ big_shift2(VALUE x, int lshift_p, VALUE y)
     size_t shift_numdigits;
     int shift_numbits;
 
-    assert(POW2_P(CHAR_BIT));
-    assert(POW2_P(BITSPERDIG));
+    RUBY_ASSERT(POW2_P(CHAR_BIT));
+    RUBY_ASSERT(POW2_P(BITSPERDIG));
 
     if (BIGZEROP(x))
         return INT2FIX(0);
@@ -4728,7 +4734,7 @@ power_cache_get_power(int base, int power_level, size_t *numdigits_ret)
         rb_obj_hide(power);
         base36_power_cache[base - 2][power_level] = power;
         base36_numdigits_cache[base - 2][power_level] = numdigits;
-        rb_gc_register_mark_object(power);
+        rb_vm_register_global_object(power);
     }
     if (numdigits_ret)
         *numdigits_ret = base36_numdigits_cache[base - 2][power_level];
@@ -4764,7 +4770,7 @@ big2str_2bdigits(struct big2str_struct *b2s, BDIGIT *xds, size_t xn, size_t tail
     int beginning = !b2s->ptr;
     size_t len = 0;
 
-    assert(xn <= 2);
+    RUBY_ASSERT(xn <= 2);
     num = bary2bdigitdbl(xds, xn);
 
     if (beginning) {
@@ -4892,7 +4898,7 @@ big2str_karatsuba(struct big2str_struct *b2s, BDIGIT *xds, size_t xn, size_t wn,
             /* bigdivrem_restoring will modify y.
              * So use temporary buffer.  */
             tds = xds + qn;
-            assert(qn + bn <= xn + wn);
+            RUBY_ASSERT(qn + bn <= xn + wn);
             bary_small_lshift(tds, bds, bn, shift);
             xds[xn] = bary_small_lshift(xds, xds, xn, shift);
         }
@@ -4910,7 +4916,7 @@ big2str_karatsuba(struct big2str_struct *b2s, BDIGIT *xds, size_t xn, size_t wn,
         }
 
         BARY_TRUNC(qds, qn);
-        assert(qn <= bn);
+        RUBY_ASSERT(qn <= bn);
         big2str_karatsuba(b2s, qds, qn, xn+wn - (rn+qn), lower_power_level, lower_numdigits+taillen);
         BARY_TRUNC(rds, rn);
         big2str_karatsuba(b2s, rds, rn, xn+wn - rn, lower_power_level, taillen);
@@ -4975,7 +4981,7 @@ big2str_generic(VALUE x, int base)
         invalid_radix(base);
 
     if (xn >= LONG_MAX/BITSPERDIG) {
-        rb_raise(rb_eRangeError, "bignum too big to convert into `string'");
+        rb_raise(rb_eRangeError, "bignum too big to convert into 'string'");
     }
 
     power_level = 0;
@@ -4985,7 +4991,7 @@ big2str_generic(VALUE x, int base)
         power_level++;
         power = power_cache_get_power(base, power_level, NULL);
     }
-    assert(power_level != MAX_BASE36_POWER_TABLE_ENTRIES);
+    RUBY_ASSERT(power_level != MAX_BASE36_POWER_TABLE_ENTRIES);
 
     if ((size_t)BIGNUM_LEN(power) <= xn) {
         /*
@@ -5100,7 +5106,7 @@ rb_big2str1(VALUE x, int base)
         invalid_radix(base);
 
     if (xn >= LONG_MAX/BITSPERDIG) {
-        rb_raise(rb_eRangeError, "bignum too big to convert into `string'");
+        rb_raise(rb_eRangeError, "bignum too big to convert into 'string'");
     }
 
     if (POW2_P(base)) {
@@ -5136,7 +5142,7 @@ big2ulong(VALUE x, const char *type)
     if (len == 0)
         return 0;
     if (BIGSIZE(x) > sizeof(long)) {
-        rb_raise(rb_eRangeError, "bignum too big to convert into `%s'", type);
+        rb_raise(rb_eRangeError, "bignum too big to convert into '%s'", type);
     }
     ds = BDIGITS(x);
 #if SIZEOF_LONG <= SIZEOF_BDIGIT
@@ -5179,7 +5185,7 @@ rb_big2long(VALUE x)
         if (num <= 1+(unsigned long)(-(LONG_MIN+1)))
             return -(long)(num-1)-1;
     }
-    rb_raise(rb_eRangeError, "bignum too big to convert into `long'");
+    rb_raise(rb_eRangeError, "bignum too big to convert into 'long'");
 }
 
 #if HAVE_LONG_LONG
@@ -5197,7 +5203,7 @@ big2ull(VALUE x, const char *type)
     if (len == 0)
         return 0;
     if (BIGSIZE(x) > SIZEOF_LONG_LONG)
-        rb_raise(rb_eRangeError, "bignum too big to convert into `%s'", type);
+        rb_raise(rb_eRangeError, "bignum too big to convert into '%s'", type);
 #if SIZEOF_LONG_LONG <= SIZEOF_BDIGIT
     num = (unsigned LONG_LONG)ds[0];
 #else
@@ -5238,7 +5244,7 @@ rb_big2ll(VALUE x)
         if (num <= 1+(unsigned LONG_LONG)(-(LLONG_MIN+1)))
             return -(LONG_LONG)(num-1)-1;
     }
-    rb_raise(rb_eRangeError, "bignum too big to convert into `long long'");
+    rb_raise(rb_eRangeError, "bignum too big to convert into 'long long'");
 }
 
 #endif  /* HAVE_LONG_LONG */
@@ -5501,10 +5507,10 @@ big_op(VALUE x, VALUE y, enum big_op_t op)
     n = FIX2INT(rel);
 
     switch (op) {
-        case big_op_gt: return RBOOL(n >  0);
-        case big_op_ge: return RBOOL(n >= 0);
-        case big_op_lt: return RBOOL(n <  0);
-        case big_op_le: return RBOOL(n <= 0);
+      case big_op_gt: return RBOOL(n >  0);
+      case big_op_ge: return RBOOL(n >= 0);
+      case big_op_lt: return RBOOL(n <  0);
+      case big_op_le: return RBOOL(n <= 0);
     }
     return Qundef;
 }
@@ -5660,7 +5666,7 @@ bigsub_int(VALUE x, long y0)
     zds = BDIGITS(z);
 
 #if SIZEOF_BDIGIT >= SIZEOF_LONG
-    assert(xn == zn);
+    RUBY_ASSERT(xn == zn);
     num = (BDIGIT_DBL_SIGNED)xds[0] - y;
     if (xn == 1 && num < 0) {
         BIGNUM_NEGATE(z);
@@ -5723,7 +5729,7 @@ bigsub_int(VALUE x, long y0)
     goto finish;
 
   finish:
-    assert(num == 0 || num == -1);
+    RUBY_ASSERT(num == 0 || num == -1);
     if (num < 0) {
         get2comp(z);
         BIGNUM_NEGATE(z);
@@ -5908,6 +5914,8 @@ bigsq(VALUE x)
     BDIGIT *xds, *zds;
 
     xn = BIGNUM_LEN(x);
+    if (MUL_OVERFLOW_LONG_P(2, xn))
+        rb_raise(rb_eArgError, "square overflow");
     zn = 2 * xn;
 
     z = bignew(zn, 1);
@@ -5936,6 +5944,8 @@ bigmul0(VALUE x, VALUE y)
 
     xn = BIGNUM_LEN(x);
     yn = BIGNUM_LEN(y);
+    if (ADD_OVERFLOW_LONG_P(xn, yn))
+        rb_raise(rb_eArgError, "multiplication overflow");
     zn = xn + yn;
 
     z = bignew(zn, BIGNUM_SIGN(x)==BIGNUM_SIGN(y));
@@ -6281,8 +6291,7 @@ rb_big_pow(VALUE x, VALUE y)
         y = bignorm(y);
         if (FIXNUM_P(y))
             goto again;
-        rb_warn("in a**b, b may be too big");
-        d = rb_big2dbl(y);
+        rb_raise(rb_eArgError, "exponent is too large");
     }
     else if (FIXNUM_P(y)) {
         yy = FIX2LONG(y);
@@ -6298,13 +6307,17 @@ rb_big_pow(VALUE x, VALUE y)
             VALUE z = 0;
             SIGNED_VALUE mask;
             const size_t xbits = rb_absint_numwords(x, 1, NULL);
-            const size_t BIGLEN_LIMIT = 32*1024*1024;
+#if SIZEOF_SIZE_T == 4
+            const size_t BIGLEN_LIMIT = 1ULL << 31; // 2 GB
+#else // SIZEOF_SIZE_T == 8
+            const size_t BIGLEN_LIMIT = 1ULL << 34; // 16 GB
+#endif
 
             if (xbits == (size_t)-1 ||
                 (xbits > BIGLEN_LIMIT) ||
+                MUL_OVERFLOW_LONG_P(yy, xbits) ||
                 (xbits * yy > BIGLEN_LIMIT)) {
-                rb_warn("in a**b, b may be too big");
-                d = (double)yy;
+                rb_raise(rb_eArgError, "exponent is too large");
             }
             else {
                 for (mask = FIXNUM_MAX + 1; mask; mask >>= 1) {
@@ -6878,63 +6891,11 @@ BDIGIT rb_bdigit_dbl_isqrt(BDIGIT_DBL);
 # define BDIGIT_DBL_TO_DOUBLE(n) (double)(n)
 #endif
 
-static BDIGIT *
-estimate_initial_sqrt(VALUE *xp, const size_t xn, const BDIGIT *nds, size_t len)
-{
-    enum {dbl_per_bdig = roomof(DBL_MANT_DIG,BITSPERDIG)};
-    const int zbits = nlz(nds[len-1]);
-    VALUE x = *xp = bignew_1(0, xn, 1); /* division may release the GVL */
-    BDIGIT *xds = BDIGITS(x);
-    BDIGIT_DBL d = bary2bdigitdbl(nds+len-dbl_per_bdig, dbl_per_bdig);
-    BDIGIT lowbits = 1;
-    int rshift = (int)((BITSPERDIG*2-zbits+(len&BITSPERDIG&1) - DBL_MANT_DIG + 1) & ~1);
-    double f;
-
-    if (rshift > 0) {
-        lowbits = (BDIGIT)d & ~(~(BDIGIT)1U << rshift);
-        d >>= rshift;
-    }
-    else if (rshift < 0) {
-        d <<= -rshift;
-        d |= nds[len-dbl_per_bdig-1] >> (BITSPERDIG+rshift);
-    }
-    f = sqrt(BDIGIT_DBL_TO_DOUBLE(d));
-    d = (BDIGIT_DBL)ceil(f);
-    if (BDIGIT_DBL_TO_DOUBLE(d) == f) {
-        if (lowbits || (lowbits = !bary_zero_p(nds, len-dbl_per_bdig)))
-            ++d;
-    }
-    else {
-        lowbits = 1;
-    }
-    rshift /= 2;
-    rshift += (2-(len&1))*BITSPERDIG/2;
-    if (rshift >= 0) {
-        if (nlz((BDIGIT)d) + rshift >= BITSPERDIG) {
-            /* (d << rshift) does cause overflow.
-             * example: Integer.sqrt(0xffff_ffff_ffff_ffff ** 2)
-             */
-            d = ~(BDIGIT_DBL)0;
-        }
-        else {
-            d <<= rshift;
-        }
-    }
-    BDIGITS_ZERO(xds, xn-2);
-    bdigitdbl2bary(&xds[xn-2], 2, d);
-
-    if (!lowbits) return NULL; /* special case, exact result */
-    return xds;
-}
-
 VALUE
 rb_big_isqrt(VALUE n)
 {
     BDIGIT *nds = BDIGITS(n);
     size_t len = BIGNUM_LEN(n);
-    size_t xn = (len+1) / 2;
-    VALUE x;
-    BDIGIT *xds;
 
     if (len <= 2) {
         BDIGIT sq = rb_bdigit_dbl_isqrt(bary2bdigitdbl(nds, len));
@@ -6944,25 +6905,19 @@ rb_big_isqrt(VALUE n)
         return ULONG2NUM(sq);
 #endif
     }
-    else if ((xds = estimate_initial_sqrt(&x, xn, nds, len)) != 0) {
-        size_t tn = xn + BIGDIVREM_EXTRA_WORDS;
-        VALUE t = bignew_1(0, tn, 1);
-        BDIGIT *tds = BDIGITS(t);
-        tn = BIGNUM_LEN(t);
-
-        /* t = n/x */
-        while (bary_divmod_branch(tds, tn, NULL, 0, nds, len, xds, xn),
-               bary_cmp(tds, tn, xds, xn) < 0) {
-            int carry;
-            BARY_TRUNC(tds, tn);
-            /* x = (x+t)/2 */
-            carry = bary_add(xds, xn, xds, xn, tds, tn);
-            bary_small_rshift(xds, xds, xn, 1, carry);
-            tn = BIGNUM_LEN(t);
+    else {
+        size_t shift = FIX2LONG(rb_big_bit_length(n)) / 4;
+        VALUE n2 = rb_int_rshift(n, SIZET2NUM(2 * shift));
+        VALUE x = FIXNUM_P(n2) ? LONG2FIX(rb_ulong_isqrt(FIX2ULONG(n2))) : rb_big_isqrt(n2);
+        /* x = (x+n/x)/2 */
+        x = rb_int_plus(rb_int_lshift(x, SIZET2NUM(shift - 1)), rb_int_idiv(rb_int_rshift(n, SIZET2NUM(shift + 1)), x));
+        VALUE xx = rb_int_mul(x, x);
+        while (rb_int_gt(xx, n)) {
+            xx = rb_int_minus(xx, rb_int_minus(rb_int_plus(x, x), INT2FIX(1)));
+            x = rb_int_minus(x, INT2FIX(1));
         }
+        return x;
     }
-    RBASIC_SET_CLASS_RAW(x, rb_cInteger);
-    return x;
 }
 
 #if USE_GMP
@@ -7001,7 +6956,7 @@ int_pow_tmp3(VALUE x, VALUE y, VALUE m, int nega_flg)
     if (FIXNUM_P(y)) {
        y = rb_int2big(FIX2LONG(y));
     }
-    assert(RB_BIGNUM_TYPE_P(m));
+    RUBY_ASSERT(RB_BIGNUM_TYPE_P(m));
     xn = BIGNUM_LEN(x);
     yn = BIGNUM_LEN(y);
     mn = BIGNUM_LEN(m);
diff --git a/bootstraptest/runner.rb b/bootstraptest/runner.rb
index c8ba8244076986..a8e67f34968b58 100755
--- a/bootstraptest/runner.rb
+++ b/bootstraptest/runner.rb
@@ -6,7 +6,6 @@
 # Never use optparse in this file.
 # Never use test/unit in this file.
 # Never use Ruby extensions in this file.
-# Maintain Ruby 1.8 compatibility for now
 
 $start_time = Time.now
 
@@ -77,6 +76,9 @@ def Dir.mktmpdir(prefix_suffix=nil, tmpdir=nil)
                 :width,
                 :indent,
                 :platform,
+                :timeout,
+                :timeout_scale,
+                :launchable_test_reports
                 )
 BT = Class.new(bt) do
   def indent=(n)
@@ -144,6 +146,10 @@ def wn=(wn)
     end
     super wn
   end
+
+  def apply_timeout_scale(timeout)
+    timeout&.*(timeout_scale)
+  end
 end.new
 
 BT_STATE = Struct.new(:count, :error).new
@@ -156,6 +162,12 @@ def main
   BT.color = nil
   BT.tty = nil
   BT.quiet = false
+  BT.timeout = 180
+  BT.timeout_scale = 1
+  if (ts = (ENV["RUBY_TEST_TIMEOUT_SCALE"] || ENV["RUBY_TEST_SUBPROCESS_TIMEOUT_SCALE"]).to_i) > 1
+    BT.timeout_scale *= ts
+  end
+
   # BT.wn = 1
   dir = nil
   quiet = false
@@ -186,14 +198,18 @@ def main
       warn "unknown --tty argument: #$3" if $3
       BT.tty = !$1 || !$2
       true
-    when /\A(-q|--q(uiet))\z/
+    when /\A(-q|--q(uiet)?)\z/
       quiet = true
       BT.quiet = true
       true
     when /\A-j(\d+)?/
       BT.wn = $1.to_i
       true
-    when /\A(-v|--v(erbose))\z/
+    when /\A--timeout=(\d+(?:_\d+)*(?:\.\d+(?:_\d+)*)?)(?::(\d+(?:_\d+)*(?:\.\d+(?:_\d+)*)?))?/
+      BT.timeout = $1.to_f
+      BT.timeout_scale = $2.to_f if defined?($2)
+      true
+    when /\A(-v|--v(erbose)?)\z/
       BT.verbose = true
       BT.quiet = false
       true
@@ -205,6 +221,7 @@ def main
                                     default: /tmp/bootstraptestXXXXX.tmpwd
         --color[=WHEN]              Colorize the output.  WHEN defaults to 'always'
                                     or can be 'never' or 'auto'.
+        --timeout=TIMEOUT           Default timeout in seconds.
     -s, --stress                    stress test.
     -v, --verbose                   Output test name before exec.
     -q, --quiet                     Don\'t print header message.
@@ -213,6 +230,31 @@ def main
       exit true
     when /\A-j/
       true
+    when /--launchable-test-reports=(.*)/
+      if File.exist?($1)
+        # To protect files from overwritten, do nothing when the file exists.
+        return true
+      end
+
+      begin
+        require_relative '../tool/lib/launchable'
+      rescue LoadError
+        # The following error sometimes happens, so we're going to skip writing Launchable report files in this case.
+        #
+        # ```
+        # /tmp/tmp.bISss9CtXZ/.ext/common/json/ext.rb:15:in 'Kernel#require':
+        #   /tmp/tmp.bISss9CtXZ/.ext/x86_64-linux/json/ext/parser.so:
+        #     undefined symbol: ruby_abi_version - ruby_abi_version (LoadError)
+        # ```
+        #
+        return true
+      end
+      BT.launchable_test_reports = writer = Launchable::JsonStreamWriter.new($1)
+      writer.write_array('testCases')
+      at_exit {
+        writer.close
+      }
+      true
     else
       false
     end
@@ -222,7 +264,7 @@ def main
   end
   tests ||= ARGV
   tests = Dir.glob("#{File.dirname($0)}/test_*.rb").sort if tests.empty?
-  pathes = tests.map {|path| File.expand_path(path) }
+  paths = tests.map {|path| File.expand_path(path) }
 
   BT.progress = %w[- \\ | /]
   BT.progress_bs = "\b" * BT.progress[0].size
@@ -266,7 +308,7 @@ def main
   end
 
   in_temporary_working_directory(dir) do
-    exec_test pathes
+    exec_test paths
   end
 end
 
@@ -278,8 +320,8 @@ def erase(e = true)
   end
 end
 
-def load_test pathes
-  pathes.each do |path|
+def load_test paths
+  paths.each do |path|
     load File.expand_path(path)
   end
 end
@@ -312,6 +354,7 @@ def concurrent_exec_test
   begin
     while BT.wn != term_wn
       if r = rq.pop
+        BT_STATE.count += 1
         case
         when BT.quiet
         when BT.tty
@@ -329,13 +372,66 @@ def concurrent_exec_test
   end
 end
 
-def exec_test(pathes)
+##
+# Module for writing a test file for uploading test results into Launchable.
+# In bootstraptest, we aggregate the test results based on file level.
+module Launchable
+  @@last_test_name = nil
+  @@failure_log = ''
+  @@duration = 0
+
+  def show_progress(message = '')
+    faildesc, t = super
+
+    if writer = BT.launchable_test_reports
+      if faildesc
+        @@failure_log += faildesc
+      end
+      repo_path = File.expand_path("#{__dir__}/../")
+      relative_path = File.join(__dir__, self.path).delete_prefix("#{repo_path}/")
+      if @@last_test_name != nil && @@last_test_name != relative_path
+        # The test path is a URL-encoded representation.
+        # https://github.com/launchableinc/cli/blob/v1.81.0/launchable/testpath.py#L18
+        test_path = "#{encode_test_path_component("file")}=#{encode_test_path_component(@@last_test_name)}"
+        if @@failure_log.size > 0
+          status = 'TEST_FAILED'
+        else
+          status = 'TEST_PASSED'
+        end
+        writer.write_object(
+          {
+            testPath: test_path,
+            status: status,
+            duration: t,
+            createdAt: Time.now.to_s,
+            stderr: @@failure_log,
+            stdout: nil,
+            data: {
+              lineNumber: self.lineno
+            }
+          }
+        )
+        @@duration = 0
+        @@failure_log = ''
+      end
+      @@last_test_name = relative_path
+      @@duration += t
+    end
+  end
+
+  private
+  def encode_test_path_component component
+    component.to_s.gsub('%', '%25').gsub('=', '%3D').gsub('#', '%23').gsub('&', '%26')
+  end
+end
+
+def exec_test(paths)
   # setup
-  load_test pathes
+  load_test paths
   BT_STATE.count = 0
   BT_STATE.error = 0
   BT.columns = 0
-  BT.width = pathes.map {|path| File.basename(path).size}.max + 2
+  BT.width = paths.map {|path| File.basename(path).size}.max + 2
 
   # execute tests
   if BT.wn > 1
@@ -405,6 +501,7 @@ def target_platform
 end
 
 class Assertion < Struct.new(:src, :path, :lineno, :proc)
+  prepend Launchable
   @count = 0
   @all = Hash.new{|h, k| h[k] = []}
   @errbuf = []
@@ -428,7 +525,7 @@ def add as
   def initialize(*args)
     super
     self.class.add self
-    @category = self.path.match(/test_(.+)\.rb/)[1]
+    @category = self.path[/\Atest_(.+)\.rb\z/, 1]
   end
 
   def call
@@ -479,9 +576,9 @@ def show_progress(message = '')
       $stderr.print "#{BT.progress_bs}#{BT.progress[BT_STATE.count % BT.progress.size]}"
     end
 
-    t = Time.now if BT.verbose
+    t = Time.now if BT.verbose || BT.launchable_test_reports
     faildesc, errout = with_stderr {yield}
-    t = Time.now - t if BT.verbose
+    t = Time.now - t if BT.verbose || BT.launchable_test_reports
 
     if !faildesc
       # success
@@ -508,6 +605,8 @@ def show_progress(message = '')
         $stderr.printf("%-*s%s", BT.width, path, BT.progress[BT_STATE.count % BT.progress.size])
       end
     end
+
+    [faildesc, t]
   rescue Interrupt
     $stderr.puts "\##{@id} #{path}:#{lineno}"
     raise
@@ -526,14 +625,22 @@ def show_progress(message = '')
     end
   end
 
-  def get_result_string(opt = '', **argh)
+  class Timeout < StandardError; end
+
+  def get_result_string(opt = '', timeout: BT.timeout, **argh)
     if BT.ruby
+      timeout = BT.apply_timeout_scale(timeout)
       filename = make_srcfile(**argh)
       begin
         kw = self.err ? {err: self.err} : {}
         out = IO.popen("#{BT.ruby} -W0 #{opt} #{filename}", **kw)
         pid = out.pid
-        out.read.tap{ Process.waitpid(pid); out.close }
+        th = Thread.new {out.read.tap {Process.waitpid(pid); out.close}}
+        if th.join(timeout)
+          th.value
+        else
+          Timeout.new("timed out after #{timeout} seconds")
+        end
       ensure
         raise Interrupt if $? and $?.signaled? && $?.termsig == Signal.list["INT"]
 
@@ -551,9 +658,14 @@ def get_result_string(opt = '', **argh)
   def make_srcfile(frozen_string_literal: nil)
     filename = "bootstraptest.#{self.path}_#{self.lineno}_#{self.id}.rb"
     File.open(filename, 'w') {|f|
-      f.puts "#frozen_string_literal:true" if frozen_string_literal
-      f.puts "GC.stress = true" if $stress
-      f.puts "print(begin; #{self.src}; end)"
+      f.puts "#frozen_string_literal:#{frozen_string_literal}" unless frozen_string_literal.nil?
+      if $stress
+        f.puts "GC.stress = true" if $stress
+      else
+        f.puts ""
+      end
+      f.puts "class BT_Skip < Exception; end; def skip(msg) = raise(BT_Skip, msg.to_s)"
+      f.puts "print(begin; #{self.src}; rescue BT_Skip; $!.message; end)"
     }
     filename
   end
@@ -567,9 +679,9 @@ def add_assertion src, pr
   Assertion.new(src, path, lineno, pr)
 end
 
-def assert_equal(expected, testsrc, message = '', opt = '', **argh)
+def assert_equal(expected, testsrc, message = '', opt = '', **kwargs)
   add_assertion testsrc, -> as do
-    as.assert_check(message, opt, **argh) {|result|
+    as.assert_check(message, opt, **kwargs) {|result|
       if expected == result
         nil
       else
@@ -580,9 +692,9 @@ def assert_equal(expected, testsrc, message = '', opt = '', **argh)
   end
 end
 
-def assert_match(expected_pattern, testsrc, message = '')
+def assert_match(expected_pattern, testsrc, message = '', **argh)
   add_assertion testsrc, -> as do
-    as.assert_check(message) {|result|
+    as.assert_check(message, **argh) {|result|
       if expected_pattern =~ result
         nil
       else
@@ -614,8 +726,9 @@ def assert_valid_syntax(testsrc, message = '')
   end
 end
 
-def assert_normal_exit(testsrc, *rest, timeout: nil, **opt)
+def assert_normal_exit(testsrc, *rest, timeout: BT.timeout, **opt)
   add_assertion testsrc, -> as do
+    timeout = BT.apply_timeout_scale(timeout)
     message, ignore_signals = rest
     message ||= ''
     as.show_progress(message) {
@@ -624,23 +737,19 @@ def assert_normal_exit(testsrc, *rest, timeout: nil, **opt)
       timeout_signaled = false
       logfile = "assert_normal_exit.#{as.path}.#{as.lineno}.log"
 
-      begin
-        err = open(logfile, "w")
-        io = IO.popen("#{BT.ruby} -W0 #{filename}", err: err)
-        pid = io.pid
-        th = Thread.new {
-          io.read
-          io.close
-          $?
-        }
-        if !th.join(timeout)
-          Process.kill :KILL, pid
-          timeout_signaled = true
-        end
-        status = th.value
-      ensure
-        err.close
+      io = IO.popen("#{BT.ruby} -W0 #{filename}", err: logfile)
+      pid = io.pid
+      th = Thread.new {
+        io.read
+        io.close
+        $?
+      }
+      if !th.join(timeout)
+        Process.kill :KILL, pid
+        timeout_signaled = true
       end
+      status = th.value
+
       if status && status.signaled?
         signo = status.termsig
         signame = Signal.list.invert[signo]
@@ -669,9 +778,7 @@ def assert_normal_exit(testsrc, *rest, timeout: nil, **opt)
 
 def assert_finish(timeout_seconds, testsrc, message = '')
   add_assertion testsrc, -> as do
-    if defined?(RubyVM::RJIT) && RubyVM::RJIT.enabled? # for --jit-wait
-      timeout_seconds *= 3
-    end
+    timeout_seconds = BT.apply_timeout_scale(timeout_seconds)
 
     as.show_progress(message) {
       faildesc = nil
@@ -727,6 +834,8 @@ def show_limit(testsrc, opt = '', **argh)
 
 def pretty(src, desc, result)
   src = src.sub(/\A\s*\n/, '')
+  lines = src.lines
+  src = lines[0..20].join + "(...snip)\n" if lines.size > 20
   (/\n/ =~ src ? "\n#{adjust_indent(src)}" : src) + "  #=> #{desc}"
 end
 
@@ -784,4 +893,12 @@ def check_coredump
   end
 end
 
+def yjit_enabled?
+  ENV.key?('RUBY_YJIT_ENABLE') || ENV.fetch('RUN_OPTS', '').include?('yjit') || BT.ruby.include?('yjit')
+end
+
+def zjit_enabled?
+  ENV.key?('RUBY_ZJIT_ENABLE') || ENV.fetch('RUN_OPTS', '').include?('zjit') || BT.ruby.include?('zjit')
+end
+
 exit main
diff --git a/bootstraptest/test_autoload.rb b/bootstraptest/test_autoload.rb
index 9e0850bc529720..de66f1f3ee15de 100644
--- a/bootstraptest/test_autoload.rb
+++ b/bootstraptest/test_autoload.rb
@@ -11,7 +11,7 @@
 }, '[ruby-dev:43816]'
 
 assert_equal 'ok', %q{
-  open('zzz2.rb', 'w') {|f| f.puts '' }
+  File.write('zzz2.rb', '')
   instance_eval do
     autoload :ZZZ, './zzz2.rb'
     begin
@@ -23,7 +23,7 @@
 }, '[ruby-dev:43816]'
 
 assert_equal 'ok', %q{
-  open('zzz3.rb', 'w') {|f| f.puts 'class ZZZ; def self.ok;:ok;end;end'}
+  File.write('zzz3.rb', "class ZZZ; def self.ok;:ok;end;end\n")
   instance_eval do
     autoload :ZZZ, './zzz3.rb'
     ZZZ.ok
@@ -31,20 +31,20 @@
 }, '[ruby-dev:43816]'
 
 assert_equal 'ok', %q{
-  open("zzz4.rb", "w") {|f| f.puts "class ZZZ; def self.ok;:ok;end;end"}
+  File.write("zzz4.rb", "class ZZZ; def self.ok;:ok;end;end\n")
   autoload :ZZZ, "./zzz4.rb"
   ZZZ.ok
 }
 
 assert_equal 'ok', %q{
-  open("zzz5.rb", "w") {|f| f.puts "class ZZZ; def self.ok;:ok;end;end"}
+  File.write("zzz5.rb", "class ZZZ; def self.ok;:ok;end;end\n")
   autoload :ZZZ, "./zzz5.rb"
   require "./zzz5.rb"
   ZZZ.ok
 }
 
 assert_equal 'okok', %q{
-  open("zzz6.rb", "w") {|f| f.puts "class ZZZ; def self.ok;:ok;end;end"}
+  File.write("zzz6.rb", "class ZZZ; def self.ok;:ok;end;end\n")
   autoload :ZZZ, "./zzz6.rb"
   t1 = Thread.new {ZZZ.ok}
   t2 = Thread.new {ZZZ.ok}
@@ -60,7 +60,7 @@
 }, '[ruby-core:21696]'
 
 assert_equal 'A::C', %q{
-  open("zzz7.rb", "w") {}
+  File.write("zzz7.rb", "")
   class A
     autoload :C, "./zzz7"
     class C
diff --git a/bootstraptest/test_eval.rb b/bootstraptest/test_eval.rb
index a9f389c673412b..20bd9615f4561c 100644
--- a/bootstraptest/test_eval.rb
+++ b/bootstraptest/test_eval.rb
@@ -217,7 +217,7 @@ def initialize &b
 }
 
 %w[break next redo].each do |keyword|
-  assert_match %r"Can't escape from eval with #{keyword}\b", %{
+  assert_match %r"Invalid #{keyword}\b", %{
     $stderr = STDOUT
     begin
       eval "0 rescue #{keyword}"
@@ -227,6 +227,16 @@ def initialize &b
   }, '[ruby-dev:31372]'
 end
 
+assert_normal_exit %{
+  $stderr = STDOUT
+  5000.times do
+    begin
+      eval "0 rescue break"
+    rescue SyntaxError
+    end
+  end
+}
+
 assert_normal_exit %q{
   $stderr = STDOUT
   class Foo
@@ -354,3 +364,34 @@ def kaboom!
   end
 }, 'check escaping the internal value th->base_block'
 
+assert_equal "false", <<~RUBY, "literal strings are mutable", "--disable-frozen-string-literal"
+  eval("'test'").frozen?
+RUBY
+
+assert_equal "false", <<~RUBY, "literal strings are mutable", "--disable-frozen-string-literal", frozen_string_literal: true
+  eval("'test'").frozen?
+RUBY
+
+assert_equal "true", <<~RUBY, "literal strings are frozen", "--enable-frozen-string-literal"
+  eval("'test'").frozen?
+RUBY
+
+assert_equal "true", <<~RUBY, "literal strings are frozen", "--enable-frozen-string-literal", frozen_string_literal: false
+  eval("'test'").frozen?
+RUBY
+
+assert_equal "false", <<~RUBY, "__FILE__ is mutable", "--disable-frozen-string-literal"
+  eval("__FILE__").frozen?
+RUBY
+
+assert_equal "false", <<~RUBY, "__FILE__ is mutable", "--disable-frozen-string-literal", frozen_string_literal: true
+  eval("__FILE__").frozen?
+RUBY
+
+assert_equal "true", <<~RUBY, "__FILE__ is frozen", "--enable-frozen-string-literal"
+  eval("__FILE__").frozen?
+RUBY
+
+assert_equal "true", <<~RUBY, "__FILE__ is frozen", "--enable-frozen-string-literal", frozen_string_literal: false
+  eval("__FILE__").frozen?
+RUBY
diff --git a/bootstraptest/test_exception.rb b/bootstraptest/test_exception.rb
index 0fb6f552b88d10..decfdc08a30895 100644
--- a/bootstraptest/test_exception.rb
+++ b/bootstraptest/test_exception.rb
@@ -370,7 +370,7 @@ def m
 }
 
 ##
-assert_match /undefined method `foo\'/, %q{#`
+assert_match /undefined method 'foo\'/, %q{#`
   STDERR.reopen(STDOUT)
   class C
     def inspect
diff --git a/bootstraptest/test_fiber.rb b/bootstraptest/test_fiber.rb
index 2614dd13bf1d6d..ae809a59366779 100644
--- a/bootstraptest/test_fiber.rb
+++ b/bootstraptest/test_fiber.rb
@@ -37,3 +37,8 @@
 assert_normal_exit %q{
   Fiber.new(&Object.method(:class_eval)).resume("foo")
 }, '[ruby-dev:34128]'
+
+# [Bug #21400]
+assert_normal_exit %q{
+  Thread.new { Fiber.current.kill }.join
+}
diff --git a/bootstraptest/test_finalizer.rb b/bootstraptest/test_finalizer.rb
index 22a16b1220e784..ccfa0b55d613f2 100644
--- a/bootstraptest/test_finalizer.rb
+++ b/bootstraptest/test_finalizer.rb
@@ -6,3 +6,11 @@
 ObjectSpace.define_finalizer(a2,proc{a1.inspect})
 ObjectSpace.define_finalizer(a1,proc{})
 }, '[ruby-dev:35778]'
+
+assert_equal 'true', %q{
+  obj = Object.new
+  id = obj.object_id
+
+  ObjectSpace.define_finalizer(obj, proc { |i| print(id == i) })
+  nil
+}
diff --git a/bootstraptest/test_flow.rb b/bootstraptest/test_flow.rb
index 35f19db5888f85..15528a42130fc1 100644
--- a/bootstraptest/test_flow.rb
+++ b/bootstraptest/test_flow.rb
@@ -363,7 +363,7 @@ class C
 ; $a << 8
 ; rescue Exception; $a << 99; end; $a}
 assert_equal %q{[1, 2, 6, 3, 5, 7, 8]}, %q{$a = []; begin;  ; $a << 1
-  o = "test"; $a << 2
+  o = "test".dup; $a << 2
   def o.test(a); $a << 3
     return a; $a << 4
   ensure; $a << 5
diff --git a/bootstraptest/test_fork.rb b/bootstraptest/test_fork.rb
index 83923dad97eff6..860ef285d033e2 100644
--- a/bootstraptest/test_fork.rb
+++ b/bootstraptest/test_fork.rb
@@ -75,3 +75,30 @@
   end
 }, '[ruby-dev:44005] [Ruby 1.9 - Bug #4950]'
 
+assert_equal 'ok', %q{
+  def now = Process.clock_gettime(Process::CLOCK_MONOTONIC)
+
+  Thread.new do
+    loop { sleep 0.0001 }
+  end
+
+  10.times do
+    pid = fork{ exit!(0) }
+    deadline = now + 10
+    while true
+      _, status = Process.waitpid2(pid, Process::WNOHANG)
+      break if status
+      if now > deadline
+        Process.kill(:KILL, pid)
+        raise "failed"
+      end
+      sleep 0.001
+    end
+    unless status.success?
+      raise "child exited with status #{status}"
+    end
+  rescue NotImplementedError
+  end
+  :ok
+}, '[Bug #20670]'
+
diff --git a/bootstraptest/test_gc.rb b/bootstraptest/test_gc.rb
index 9f17e1481405c8..eb68c9845e37c9 100644
--- a/bootstraptest/test_gc.rb
+++ b/bootstraptest/test_gc.rb
@@ -14,7 +14,7 @@
     o.send(meth)
   end
 end
-}, '[ruby-dev:39453]' unless ENV.fetch('RUN_OPTS', '').include?('rjit') # speed up RJIT CI
+}, '[ruby-dev:39453]'
 
 assert_normal_exit %q{
 a = []
diff --git a/bootstraptest/test_insns.rb b/bootstraptest/test_insns.rb
index d2e799f855def9..8a6efae08985d5 100644
--- a/bootstraptest/test_insns.rb
+++ b/bootstraptest/test_insns.rb
@@ -92,7 +92,7 @@ def m&b
   [ 'intern',                   %q{ :"#{true}" }, ],
 
   [ 'newarray',    %q{ ["true"][0] }, ],
-  [ 'newarraykwsplat', %q{ [**{x:'true'}][0][:x] }, ],
+  [ 'pushtoarraykwsplat', %q{ [**{x:'true'}][0][:x] }, ],
   [ 'duparray',    %q{ [ true ][0] }, ],
   [ 'expandarray', %q{ y = [ true, false, nil ]; x, = y; x }, ],
   [ 'expandarray', %q{ y = [ true, false, nil ]; x, *z = y; x }, ],
@@ -214,8 +214,21 @@ def freeze
     'true'.freeze
   },
 
+  [ 'opt_duparray_send', %q{ x = :a; [:a, :b].include?(x) }, ],
+  [ 'opt_duparray_send', <<-'},', ], # {
+    class Array
+      def include?(i)
+        i == 1
+      end
+    end
+    x = 1
+    [:a, :b].include?(x)
+  },
+
   [ 'opt_newarray_send', %q{ ![ ].hash.nil? }, ],
 
+  [ 'opt_newarray_send', %q{ v=2; [1, Object.new, 2].include?(v) }, ],
+
   [ 'opt_newarray_send', %q{ [ ].max.nil? }, ],
   [ 'opt_newarray_send', %q{ [1, x = 2, 3].max == 3 }, ],
   [ 'opt_newarray_send', <<-'},', ], # {
@@ -236,6 +249,48 @@ def min
     end
     [3, x = 2, 1].min
   },
+  [ 'opt_newarray_send', %q{ v = 1.23; [v, v*2].pack("E*").unpack("E*") == [v, v*2] }, ],
+  [ 'opt_newarray_send', %q{ v = 4.56; b = +"x"; [v, v*2].pack("E*", buffer: b); b[1..].unpack("E*") == [v, v*2] }, ],
+  [ 'opt_newarray_send', <<-'},', ], # {
+    v = 7.89;
+    b = +"x";
+    class Array
+      alias _pack pack
+      def pack(s, buffer: nil, prefix: "y")
+        buffer ||= +"b"
+        buffer << prefix
+        _pack(s, buffer: buffer)
+      end
+    end
+    tests = []
+
+    ret = [v].pack("E*", prefix: "z")
+    tests << (ret[0..1] == "bz")
+    tests << (ret[2..].unpack("E*") == [v])
+
+    ret = [v].pack("E*")
+    tests << (ret[0..1] == "by")
+    tests << (ret[2..].unpack("E*") == [v])
+
+    [v, v*2, v*3].pack("E*", buffer: b)
+    tests << (b[0..1] == "xy")
+    tests << (b[2..].unpack("E*") == [v, v*2, v*3])
+
+    class Array
+      def pack(_fmt, buffer:) = buffer
+    end
+
+    b = nil
+    tests << [v].pack("E*", buffer: b).nil?
+
+    class Array
+      def pack(_fmt, **kw) = kw.empty?
+    end
+
+    tests << [v].pack("E*") == true
+
+    tests.all? or puts tests
+  },
 
   [ 'throw',        %q{ false.tap { break true } }, ],
   [ 'branchif',     %q{ x = nil;  x ||= true }, ],
@@ -354,7 +409,7 @@ class X; def != other; true; end; end
   [ 'opt_ge', %q{ +0.0.next_float >= 0.0 }, ],
   [ 'opt_ge', %q{              ?z >= ?a }, ],
 
-  [ 'opt_ltlt', %q{  '' << 'true' }, ],
+  [ 'opt_ltlt', %q{  +'' << 'true' }, ],
   [ 'opt_ltlt', %q{ ([] << 'true').join }, ],
   [ 'opt_ltlt', %q{ (1 << 31) == 2147483648 }, ],
 
@@ -363,7 +418,7 @@ class X; def != other; true; end; end
   [ 'opt_aref', %q{ 'true'[0] == ?t }, ],
   [ 'opt_aset', %q{ [][0] = true }, ],
   [ 'opt_aset', %q{ {}[0] = true }, ],
-  [ 'opt_aset', %q{ x = 'frue'; x[0] = 't'; x }, ],
+  [ 'opt_aset', %q{ x = +'frue'; x[0] = 't'; x }, ],
   [ 'opt_aset', <<-'},', ], # {
     # opt_aref / opt_aset mixup situation
     class X; def x; {}; end; end
diff --git a/bootstraptest/test_io.rb b/bootstraptest/test_io.rb
index 666e5a011b63c7..4e5d6d59c9bd36 100644
--- a/bootstraptest/test_io.rb
+++ b/bootstraptest/test_io.rb
@@ -91,7 +91,7 @@
     at_exit { p :foo }
 
     megacontent = "abc" * 12345678
-    #File.open("megasrc", "w") {|f| f << megacontent }
+    #File.write("megasrc", megacontent)
 
     t0 = Thread.main
     Thread.new { sleep 0.001 until t0.stop?; Process.kill(:INT, $$) }
diff --git a/bootstraptest/test_jump.rb b/bootstraptest/test_jump.rb
index d07c47a56d7400..8751343b1f2d2a 100644
--- a/bootstraptest/test_jump.rb
+++ b/bootstraptest/test_jump.rb
@@ -292,7 +292,7 @@ class << self
       end
     end
   end
-  s = "foo"
+  s = +"foo"
   s.return_eigenclass == class << s; self; end
 }, '[ruby-core:21379]'
 
diff --git a/bootstraptest/test_literal.rb b/bootstraptest/test_literal.rb
index a0d4ee08c6b2e9..39e6527027a8f7 100644
--- a/bootstraptest/test_literal.rb
+++ b/bootstraptest/test_literal.rb
@@ -70,6 +70,7 @@
   assert_equal "foo\n",           %q(`echo foo`)
   assert_equal "foo\n",           %q(s = "foo"; `echo #{s}`)
 end
+assert_equal "ECHO FOO",        %q(def `(s) s.upcase; end; `echo foo`)
 
 # regexp
 assert_equal '',                '//.source'
@@ -116,16 +117,16 @@
 assert_equal 'true',            'a = [obj = Object.new]; a[0] == obj'
 assert_equal '5',               'a = [1,2,3]; a[1] = 5; a[1]'
 assert_equal 'bar',             '[*:foo];:bar'
-assert_equal '[1, 2]',          'def nil.to_a; [2]; end; [1, *nil]'
-assert_equal '[1, 2]',          'def nil.to_a; [1, 2]; end; [*nil]'
-assert_equal '[0, 1, {2=>3}]',  '[0, *[1], 2=>3]', "[ruby-dev:31592]"
+assert_equal '[]',              'def nil.to_a; [1, 2]; end; [*nil]'
+assert_equal '[1]',             'def nil.to_a; [2]; end; [1, *nil]'
+assert_equal '[0, 1, {2 => 3}]', '[0, *[1], 2=>3]', "[ruby-dev:31592]"
 
 
 # hash
 assert_equal 'Hash',            '{}.class'
 assert_equal '{}',              '{}.inspect'
 assert_equal 'Hash',            '{1=>2}.class'
-assert_equal '{1=>2}',          '{1=>2}.inspect'
+assert_equal '{1 => 2}',        '{1=>2}.inspect'
 assert_equal '2',               'h = {1 => 2}; h[1]'
 assert_equal '0',               'h = {1 => 2}; h.delete(1); h.size'
 assert_equal '',                'h = {1 => 2}; h.delete(1); h[1]'
diff --git a/bootstraptest/test_literal_suffix.rb b/bootstraptest/test_literal_suffix.rb
index c36fa7078f950d..7a4d67d0fac3e3 100644
--- a/bootstraptest/test_literal_suffix.rb
+++ b/bootstraptest/test_literal_suffix.rb
@@ -46,9 +46,9 @@
 assert_equal '10000000000000000001/10000000000000000000',
              '1.0000000000000000001r'
 
-assert_equal 'syntax error, unexpected local variable or method, expecting end-of-input',
-             %q{begin eval('1ir', nil, '', 0); rescue SyntaxError => e; e.message[/\A:(?:\d+:)? (.*)/, 1] end}
-assert_equal 'syntax error, unexpected local variable or method, expecting end-of-input',
-             %q{begin eval('1.2ir', nil, '', 0); rescue SyntaxError => e; e.message[/\A:(?:\d+:)? (.*)/, 1] end}
-assert_equal 'syntax error, unexpected local variable or method, expecting end-of-input',
-             %q{begin eval('1e1r', nil, '', 0); rescue SyntaxError => e; e.message[/\A:(?:\d+:)? (.*)/, 1] end}
+assert_equal 'unexpected local variable or method, expecting end-of-input',
+             %q{begin eval('1ir', nil, '', 0); rescue SyntaxError => e; e.message[/(?:\^~*|\A:(?:\d+:)? syntax error,) (.*)/, 1]; end}
+assert_equal 'unexpected local variable or method, expecting end-of-input',
+             %q{begin eval('1.2ir', nil, '', 0); rescue SyntaxError => e; e.message[/(?:\^~*|\A:(?:\d+:)? syntax error,) (.*)/, 1]; end}
+assert_equal 'unexpected local variable or method, expecting end-of-input',
+             %q{begin eval('1e1r', nil, '', 0); rescue SyntaxError => e; e.message[/(?:\^~*|\A:(?:\d+:)? syntax error,) (.*)/, 1]; end}
diff --git a/bootstraptest/test_load.rb b/bootstraptest/test_load.rb
index 3253582a324995..fa8d31c098c029 100644
--- a/bootstraptest/test_load.rb
+++ b/bootstraptest/test_load.rb
@@ -1,9 +1,9 @@
 assert_equal 'ok', %q{
-  open("require-lock-test.rb", "w") {|f|
-    f.puts "sleep 0.1"
-    f.puts "module M"
-    f.puts "end"
-  }
+  File.write("require-lock-test.rb", <<-END)
+    sleep 0.1
+    module M
+    end
+  END
   $:.unshift Dir.pwd
   vs = (1..2).map {|i|
     Thread.start {
@@ -12,11 +12,11 @@
     }
   }.map {|t| t.value }
   vs[0] == M && vs[1] == M ? :ok : :ng
-}, '[ruby-dev:32048]' unless ENV.fetch('RUN_OPTS', '').include?('rjit') # Thread seems to be switching during JIT. To be fixed later.
+}, '[ruby-dev:32048]'
 
 assert_equal 'ok', %q{
   %w[a a/foo b].each {|d| Dir.mkdir(d)}
-  open("b/foo", "w") {|f| f.puts "$ok = :ok"}
+  File.write("b/foo", "$ok = :ok\n")
   $:.replace(%w[a b])
   begin
     load "foo"
diff --git a/bootstraptest/test_method.rb b/bootstraptest/test_method.rb
index 04c9eb2d11425e..997675200e4d73 100644
--- a/bootstraptest/test_method.rb
+++ b/bootstraptest/test_method.rb
@@ -340,24 +340,6 @@ def method_missing(mid, *args, &block) block end
 assert_equal '1',       %q( class C; def m() 1 end; private :m end
                             C.new.send(:m) )
 
-# with block
-assert_equal '[[:ok1, :foo], [:ok2, :foo, :bar]]',
-%q{
-  class C
-    def [](a)
-      $ary << [yield, a]
-    end
-    def []=(a, b)
-      $ary << [yield, a, b]
-    end
-  end
-
-  $ary = []
-  C.new[:foo, &lambda{:ok1}]
-  C.new[:foo, &lambda{:ok2}] = :bar
-  $ary
-}
-
 # with
 assert_equal '[:ok1, [:ok2, 11]]', %q{
   class C
@@ -404,7 +386,6 @@ def m(*args, &b)
 
 # aset and splat
 assert_equal '4', %q{class Foo;def []=(a,b,c,d);end;end;Foo.new[1,*a=[2,3]]=4}
-assert_equal '4', %q{class Foo;def []=(a,b,c,d);end;end;def m(&blk)Foo.new[1,*a=[2,3],&blk]=4;end;m{}}
 
 # post test
 assert_equal %q{[1, 2, :o1, :o2, [], 3, 4, NilClass, nil, nil]}, %q{
@@ -1107,10 +1088,6 @@ class C
     'ok'
   end
 }
-assert_equal 'ok', %q{
-  [0][0, &proc{}] += 21
-  'ok'
-}, '[ruby-core:30534]'
 
 # should not cache when splat
 assert_equal 'ok', %q{
@@ -1190,3 +1167,263 @@ def test2 o, args, block
   test2 o1, [], block
   $result.join
 }
+
+assert_equal 'ok', %q{
+  def foo
+    binding
+    ["ok"].first
+  end
+  foo
+  foo
+}, '[Bug #20178]'
+
+assert_equal 'ok', %q{
+  def bar(x); x; end
+  def foo(...); bar(...); end
+  foo('ok')
+}
+
+assert_equal 'ok', %q{
+  def bar(x); x; end
+  def foo(z, ...); bar(...); end
+  foo(1, 'ok')
+}
+
+assert_equal 'ok', %q{
+  def bar(x, y); x; end
+  def foo(...); bar("ok", ...); end
+  foo(1)
+}
+
+assert_equal 'ok', %q{
+  def bar(x); x; end
+  def foo(...); 1.times { return bar(...) }; end
+  foo("ok")
+}
+
+assert_equal 'ok', %q{
+  def bar(x); x; end
+  def foo(...); x = nil; 1.times { x = bar(...) }; x; end
+  foo("ok")
+}
+
+assert_equal 'ok', %q{
+  def bar(x); yield; end
+  def foo(...); bar(...); end
+  foo(1) { "ok" }
+}
+
+assert_equal 'ok', %q{
+  def baz(x); x; end
+  def bar(...); baz(...); end
+  def foo(...); bar(...); end
+  foo("ok")
+}
+
+assert_equal '[1, 2, 3, 4]', %q{
+  def baz(a, b, c, d); [a, b, c, d]; end
+  def bar(...); baz(1, ...); end
+  def foo(...); bar(2, ...); end
+  foo(3, 4)
+}
+
+assert_equal 'ok', %q{
+  class Foo; def self.foo(x); x; end; end
+  class Bar < Foo; def self.foo(...); super; end; end
+  Bar.foo('ok')
+}
+
+assert_equal 'ok', %q{
+  class Foo; def self.foo(x); x; end; end
+  class Bar < Foo; def self.foo(...); super(...); end; end
+  Bar.foo('ok')
+}
+
+assert_equal 'ok', %q{
+  class Foo; def self.foo(x, y); x + y; end; end
+  class Bar < Foo; def self.foo(...); super("o", ...); end; end
+  Bar.foo('k')
+}
+
+assert_equal 'ok', %q{
+  def bar(a); a; end
+  def foo(...); lambda { bar(...) }; end
+  foo("ok").call
+}
+
+assert_equal 'ok', %q{
+  class Foo; def self.foo(x, y); x + y; end; end
+  class Bar < Foo; def self.y(&b); b; end; def self.foo(...); y { super("o", ...) }; end; end
+  Bar.foo('k').call
+}
+
+assert_equal 'ok', %q{
+  def baz(n); n; end
+  def foo(...); bar = baz(...); lambda { lambda { bar } }; end
+  foo("ok").call.call
+}
+
+assert_equal 'ok', %q{
+  class A; def self.foo(...); new(...); end; attr_reader :b; def initialize(a, b:"ng"); @a = a; @b = b; end end
+  A.foo(1).b
+  A.foo(1, b: "ok").b
+}
+
+assert_equal 'ok', %q{
+  class A; def initialize; @a = ["ok"]; end; def first(...); @a.first(...); end; end
+  def call x; x.first; end
+  def call1 x; x.first(1); end
+  call(A.new)
+  call1(A.new).first
+}
+
+assert_equal 'ok', %q{
+  class A; def foo; yield("o"); end; end
+  class B < A; def foo(...); super { |x| yield(x + "k") }; end; end
+  B.new.foo { |x| x }
+}
+
+assert_equal "[1, 2, 3, 4]", %q{
+  def foo(*b) = b
+
+  def forward(...)
+    splat = [1,2,3]
+    foo(*splat, ...)
+  end
+
+  forward(4)
+}
+
+assert_equal "[1, 2, 3, 4]", %q{
+class A
+  def foo(*b) = b
+end
+
+class B < A
+  def foo(...)
+    splat = [1,2,3]
+    super(*splat, ...)
+  end
+end
+
+B.new.foo(4)
+}
+
+assert_equal 'ok', %q{
+  class A; attr_reader :iv; def initialize(...) = @iv = "ok"; end
+  A.new("foo", bar: []).iv
+}
+
+assert_equal 'ok', %q{
+  def foo(a, b) = a + b
+  def bar(...) = foo(...)
+  bar(1, 2)
+  bar(1, 2)
+  begin
+    bar(1, 2, 3)
+    "ng"
+  rescue ArgumentError
+    "ok"
+  end
+}
+
+assert_equal 'ok', %q{
+  class C
+    def foo(...) = :ok
+    def bar(...) = __send__(:foo, ...)
+  end
+
+  C.new.bar
+}
+
+assert_equal 'ok', %q{
+  class C
+    def method_missing(...) = :ok
+    def foo(...) = xyzzy(...)
+  end
+
+  C.new.foo
+}
+
+assert_equal 'ok', %q{
+  class C
+    def initialize(a)
+    end
+  end
+
+  def foo(...)
+    C.new(...)
+    :ok
+  end
+
+  foo(*["bar"])
+  foo("baz")
+}
+
+assert_equal 'ok', %q{
+  class C
+    def foo(b:)
+      b
+    end
+  end
+
+  def foo(...)
+    C.new.send(...)
+  end
+
+  foo(:foo, b: :ok)
+  foo(*["foo"], b: :ok)
+}
+
+assert_equal 'ok', %q{
+  Thing = Struct.new(:value)
+
+  Obj = Thing.new("ok")
+
+  def delegate(...)
+    Obj.value(...)
+  end
+
+  def no_args
+    delegate
+  end
+
+  def splat_args(*args)
+    delegate(*args)
+  end
+
+  no_args
+  splat_args
+}
+
+assert_equal 'ok', %q{
+  class A
+    private
+    def foo = "ng"
+  end
+
+  class B
+    def initialize(o)
+      @o = o
+    end
+
+    def foo(...) = @o.foo(...)
+    def internal_foo = foo
+  end
+
+  b = B.new(A.new)
+
+  begin
+    b.internal_foo
+  rescue NoMethodError
+    "ok"
+  end
+}
+
+assert_equal 'ok', <<~RUBY
+  def test(*, kw: false)
+    "ok"
+  end
+
+  test
+RUBY
diff --git a/bootstraptest/test_ractor.rb b/bootstraptest/test_ractor.rb
index 7a71f6e0715094..1c2a4b0b8ec8bd 100644
--- a/bootstraptest/test_ractor.rb
+++ b/bootstraptest/test_ractor.rb
@@ -67,7 +67,7 @@
 # Return id, loc, and status for no-name ractor
 assert_match /^#<Ractor:#([^ ]*?) .+:[0-9]+ terminated>$/, %q{
   r = Ractor.new { '' }
-  r.take
+  r.join
   sleep 0.1 until r.inspect =~ /terminated/
   r.inspect
 }
@@ -75,7 +75,7 @@
 # Return id, name, loc, and status for named ractor
 assert_match /^#<Ractor:#([^ ]*?) Test Ractor .+:[0-9]+ terminated>$/, %q{
   r = Ractor.new(name: 'Test Ractor') { '' }
-  r.take
+  r.join
   sleep 0.1 until r.inspect =~ /terminated/
   r.inspect
 }
@@ -86,7 +86,7 @@
   r = Ractor.new do
     'ok'
   end
-  r.take
+  r.value
 }
 
 # Passed arguments to Ractor.new will be a block parameter
@@ -96,7 +96,7 @@
   r = Ractor.new 'ok' do |msg|
     msg
   end
-  r.take
+  r.value
 }
 
 # Pass multiple arguments to Ractor.new
@@ -105,7 +105,7 @@
   r =  Ractor.new 'ping', 'pong' do |msg, msg2|
     [msg, msg2]
   end
-  'ok' if r.take == ['ping', 'pong']
+  'ok' if r.value == ['ping', 'pong']
 }
 
 # Ractor#send passes an object with copy to a Ractor
@@ -115,65 +115,23 @@
     msg = Ractor.receive
   end
   r.send 'ok'
-  r.take
+  r.value
 }
 
 # Ractor#receive_if can filter the message
-assert_equal '[2, 3, 1]', %q{
-  r = Ractor.new Ractor.current do |main|
-    main << 1
-    main << 2
-    main << 3
-  end
-  a = []
-  a << Ractor.receive_if{|msg| msg == 2}
-  a << Ractor.receive_if{|msg| msg == 3}
-  a << Ractor.receive
-}
+assert_equal '[1, 2, 3]', %q{
+  ports = 3.times.map{Ractor::Port.new}
 
-# Ractor#receive_if with break
-assert_equal '[2, [1, :break], 3]', %q{
-  r = Ractor.new Ractor.current do |main|
-    main << 1
-    main << 2
-    main << 3
+  r = Ractor.new ports do |ports|
+    ports[0] << 3
+    ports[1] << 1
+    ports[2] << 2
   end
-
-  a = []
-  a << Ractor.receive_if{|msg| msg == 2}
-  a << Ractor.receive_if{|msg| break [msg, :break]}
-  a << Ractor.receive
-}
-
-# Ractor#receive_if can't be called recursively
-assert_equal '[[:e1, 1], [:e2, 2]]', %q{
-  r = Ractor.new Ractor.current do |main|
-    main << 1
-    main << 2
-    main << 3
-  end
-
   a = []
-
-  Ractor.receive_if do |msg|
-    begin
-      Ractor.receive
-    rescue Ractor::Error
-      a << [:e1, msg]
-    end
-    true # delete 1 from queue
-  end
-
-  Ractor.receive_if do |msg|
-    begin
-      Ractor.receive_if{}
-    rescue Ractor::Error
-      a << [:e2, msg]
-    end
-    true # delete 2 from queue
-  end
-
-  a #
+  a << ports[1].receive # 1
+  a << ports[2].receive # 2
+  a << ports[0].receive # 3
+  a
 }
 
 # dtoa race condition
@@ -184,7 +142,7 @@
       10_000.times{ rand.to_s }
       :ok
     }
-  }.map(&:take)
+  }.map(&:value)
 }
 
 # Ractor.make_shareable issue for locals in proc [Bug #18023]
@@ -211,46 +169,39 @@
   Ractor.make_shareable(closure).call
 }
 
-# Now autoload in non-main Ractor is not supported
-assert_equal 'ok', %q{
-  autoload :Foo, 'foo.rb'
-  r = Ractor.new do
-    p Foo
-  rescue Ractor::UnsafeError
-    :ok
-  end
-  r.take
-}
-
 ###
 ###
 # Ractor still has several memory corruption so skip huge number of tests
-if ENV['GITHUB_WORKFLOW'] &&
-   ENV['GITHUB_WORKFLOW'] == 'Compilations'
+if ENV['GITHUB_WORKFLOW'] == 'Compilations'
    # ignore the follow
 else
 
-# Ractor.select(*ractors) receives a values from a ractors.
-# It is similar to select(2) and Go's select syntax.
-# The return value is [ch, received_value]
+# Ractor.select with a Ractor argument
 assert_equal 'ok', %q{
   # select 1
   r1 = Ractor.new{'r1'}
-  r, obj = Ractor.select(r1)
-  'ok' if r == r1 and obj == 'r1'
+  port, obj = Ractor.select(r1)
+  if port == r1 and obj == 'r1'
+    'ok'
+  else
+    # failed
+    [port, obj].inspect
+  end
 }
 
 # Ractor.select from two ractors.
 assert_equal '["r1", "r2"]', %q{
   # select 2
-  r1 = Ractor.new{'r1'}
-  r2 = Ractor.new{'r2'}
-  rs = [r1, r2]
+  p1 = Ractor::Port.new
+  p2 = Ractor::Port.new
+  r1 = Ractor.new(p1){|p1| p1 << 'r1'}
+  r2 = Ractor.new(p2){|p2| p2 << 'r2'}
+  ps = [p1, p2]
   as = []
-  r, obj = Ractor.select(*rs)
-  rs.delete(r)
+  port, obj = Ractor.select(*ps)
+  ps.delete(port)
   as << obj
-  r, obj = Ractor.select(*rs)
+  port, obj = Ractor.select(*ps)
   as << obj
   as.sort #=> ["r1", "r2"]
 }
@@ -294,30 +245,12 @@ def test n
   end
 }
 
-# Outgoing port of a ractor will be closed when the Ractor is terminated.
-assert_equal 'ok', %q{
-  r = Ractor.new do
-    'finish'
-  end
-
-  r.take
-  sleep 0.1 until r.inspect =~ /terminated/
-
-  begin
-    o = r.take
-  rescue Ractor::ClosedError
-    'ok'
-  else
-    "ng: #{o}"
-  end
-}
-
 # Raise Ractor::ClosedError when try to send into a terminated ractor
 assert_equal 'ok', %q{
   r = Ractor.new do
   end
 
-  r.take # closed
+  r.join # closed
   sleep 0.1 until r.inspect =~ /terminated/
 
   begin
@@ -329,47 +262,16 @@ def test n
   end
 }
 
-# Raise Ractor::ClosedError when try to send into a closed actor
-assert_equal 'ok', %q{
-  r = Ractor.new { Ractor.receive }
-  r.close_incoming
-
-  begin
-    r.send(1)
-  rescue Ractor::ClosedError
-    'ok'
-  else
-    'ng'
-  end
-}
-
-# Raise Ractor::ClosedError when try to take from closed actor
-assert_equal 'ok', %q{
-  r = Ractor.new do
-    Ractor.yield 1
-    Ractor.receive
-  end
-
-  r.close_outgoing
-  begin
-    r.take
-  rescue Ractor::ClosedError
-    'ok'
-  else
-    'ng'
-  end
-}
-
-# Can mix with Thread#interrupt and Ractor#take [Bug #17366]
+# Can mix with Thread#interrupt and Ractor#join [Bug #17366]
 assert_equal 'err', %q{
-  Ractor.new{
+  Ractor.new do
     t = Thread.current
     begin
       Thread.new{ t.raise "err" }.join
     rescue => e
       e.message
     end
-  }.take
+  end.value
 }
 
 # Killed Ractor's thread yields nil
@@ -377,34 +279,18 @@ def test n
   Ractor.new{
     t = Thread.current
     Thread.new{ t.kill }.join
-  }.take.inspect #=> nil
+  }.value.inspect #=> nil
 }
 
-# Ractor.yield raises Ractor::ClosedError when outgoing port is closed.
+# Raise Ractor::ClosedError when try to send into a ractor with closed default port
 assert_equal 'ok', %q{
-  r = Ractor.new Ractor.current do |main|
+  r = Ractor.new {
+    Ractor.current.close
+    Ractor.main << :ok
     Ractor.receive
-    main << true
-    Ractor.yield 1
-  end
-
-  r.close_outgoing
-  r << true
-  Ractor.receive
-
-  begin
-    r.take
-  rescue Ractor::ClosedError
-    'ok'
-  else
-    'ng'
-  end
-}
+  }
 
-# Raise Ractor::ClosedError when try to send into a ractor with closed incoming port
-assert_equal 'ok', %q{
-  r = Ractor.new { Ractor.receive }
-  r.close_incoming
+  Ractor.receive # wait for ok
 
   begin
     r.send(1)
@@ -415,154 +301,82 @@ def test n
   end
 }
 
-# A ractor with closed incoming port still can send messages out
-assert_equal '[1, 2]', %q{
-  r = Ractor.new do
-    Ractor.yield 1
-    2
-  end
-  r.close_incoming
-
-  [r.take, r.take]
-}
-
-# Raise Ractor::ClosedError when try to take from a ractor with closed outgoing port
-assert_equal 'ok', %q{
-  r = Ractor.new do
-    Ractor.yield 1
-    Ractor.receive
-  end
-
-  sleep 0.01 # wait for Ractor.yield in r
-  r.close_outgoing
-  begin
-    r.take
-  rescue Ractor::ClosedError
-    'ok'
-  else
-    'ng'
-  end
-}
-
-# A ractor with closed outgoing port still can receive messages from incoming port
-assert_equal 'ok', %q{
-  r = Ractor.new do
-    Ractor.receive
-  end
-
-  r.close_outgoing
-  begin
-    r.send(1)
-  rescue Ractor::ClosedError
-    'ng'
-  else
-    'ok'
-  end
-}
-
 # Ractor.main returns main ractor
 assert_equal 'true', %q{
   Ractor.new{
     Ractor.main
-  }.take == Ractor.current
+  }.value == Ractor.current
 }
 
 # a ractor with closed outgoing port should terminate
 assert_equal 'ok', %q{
   Ractor.new do
-    close_outgoing
+    Ractor.current.close
   end
 
   true until Ractor.count == 1
   :ok
 }
 
-# multiple Ractors can receive (wait) from one Ractor
-assert_equal '[0, 1, 2, 3, 4, 5, 6, 7, 8, 9]', %q{
-  pipe = Ractor.new do
-    loop do
-      Ractor.yield Ractor.receive
-    end
+# an exception in a Ractor main thread will be re-raised at Ractor#receive
+assert_equal '[RuntimeError, "ok", true]', %q{
+  r = Ractor.new do
+    raise 'ok' # exception will be transferred receiver
   end
-
-  RN = 10
-  rs = RN.times.map{|i|
-    Ractor.new pipe, i do |pipe, i|
-      msg = pipe.take
-      msg # ping-pong
-    end
-  }
-  RN.times{|i|
-    pipe << i
-  }
-  RN.times.map{
-    r, n = Ractor.select(*rs)
-    rs.delete r
-    n
-  }.sort
-} unless /mswin/ =~ RUBY_PLATFORM # randomly hangs on mswin https://github.com/ruby/ruby/actions/runs/3753871445/jobs/6377551069#step:20:131
-
-# Ractor.select also support multiple take, receive and yield
-assert_equal '[true, true, true]', %q{
-  RN = 10
-  CR = Ractor.current
-
-  rs = (1..RN).map{
-    Ractor.new do
-      CR.send 'send' + CR.take #=> 'sendyield'
-      'take'
-    end
-  }
-  received = []
-  taken = []
-  yielded = []
-  until received.size == RN && taken.size == RN && yielded.size == RN
-    r, v = Ractor.select(CR, *rs, yield_value: 'yield')
-    case r
-    when :receive
-      received << v
-    when :yield
-      yielded << v
-    else
-      taken << v
-      rs.delete r
-    end
+  begin
+    r.join
+  rescue Ractor::RemoteError => e
+    [e.cause.class,   #=> RuntimeError
+     e.cause.message, #=> 'ok'
+     e.ractor == r]   #=> true
   end
-  r = [received == ['sendyield'] * RN,
-       yielded  == [nil] * RN,
-       taken    == ['take'] * RN,
-  ]
-
-  STDERR.puts [received, yielded, taken].inspect
-  r
 }
 
-# multiple Ractors can send to one Ractor
-assert_equal '[0, 1, 2, 3, 4, 5, 6, 7, 8, 9]', %q{
-  pipe = Ractor.new do
-    loop do
-      Ractor.yield Ractor.receive
-    end
+# an exception in a Ractor will be re-raised at Ractor#value
+assert_equal '[RuntimeError, "ok", true]', %q{
+  r = Ractor.new do
+    raise 'ok' # exception will be transferred receiver
+  end
+  begin
+    r.value
+  rescue Ractor::RemoteError => e
+    [e.cause.class,   #=> RuntimeError
+     e.cause.message, #=> 'ok'
+     e.ractor == r]   #=> true
   end
+}
 
-  RN = 10
-  RN.times.map{|i|
-    Ractor.new pipe, i do |pipe, i|
-      pipe << i
+# an exception in a Ractor non-main thread will not be re-raised at Ractor#receive
+assert_equal 'ok', %q{
+  r = Ractor.new do
+    Thread.new do
+      raise 'ng'
     end
-  }
-  RN.times.map{
-    pipe.take
-  }.sort
+    sleep 0.1
+    'ok'
+  end
+  r.value
 }
 
-# an exception in a Ractor will be re-raised at Ractor#receive
-assert_equal '[RuntimeError, "ok", true]', %q{
-  r = Ractor.new do
-    raise 'ok' # exception will be transferred receiver
+# SystemExit from a Ractor is re-raised
+# [Bug #21505]
+assert_equal '[SystemExit, "exit", true]', %q{
+  r = Ractor.new { exit }
+  begin
+    r.value
+  rescue Ractor::RemoteError => e
+    [e.cause.class,   #=> RuntimeError
+     e.cause.message, #=> 'ok'
+     e.ractor == r]   #=> true
   end
+}
+
+# SystemExit from a Thread inside a Ractor is re-raised
+# [Bug #21505]
+assert_equal '[SystemExit, "exit", true]', %q{
+  r = Ractor.new { Thread.new { exit }.join }
   begin
-    r.take
+    r.value
   rescue Ractor::RemoteError => e
     [e.cause.class,   #=> RuntimeError
      e.cause.message, #=> 'ok'
@@ -571,7 +385,7 @@ def test n
 }
 
 # threads in a ractor will killed
-assert_equal '{:ok=>3}', %q{
+assert_equal '{ok: 3}', %q{
   Ractor.new Ractor.current do |main|
     q = Thread::Queue.new
     Thread.new do
@@ -601,7 +415,7 @@ def test n
   end
 
   3.times.map{Ractor.receive}.tally
-}
+} unless yjit_enabled? || zjit_enabled? # YJIT: `[BUG] Bus Error at 0x000000010b7002d0` in jit_exec(), ZJIT hangs
 
 # unshareable object are copied
 assert_equal 'false', %q{
@@ -610,7 +424,7 @@ def test n
     msg.object_id
   end
 
-  obj.object_id == r.take
+  obj.object_id == r.value
 }
 
 # To copy the object, now Marshal#dump is used
@@ -628,11 +442,12 @@ def test n
 }
 
 # send shareable and unshareable objects
-assert_equal "ok", %q{
-  echo_ractor = Ractor.new do
+assert_equal "ok", <<~'RUBY', frozen_string_literal: false
+  port = Ractor::Port.new
+  echo_ractor = Ractor.new port do |port|
     loop do
       v = Ractor.receive
-      Ractor.yield v
+      port << v
     end
   end
 
@@ -680,13 +495,13 @@ module M; end
 
   shareable_objects.map{|o|
     echo_ractor << o
-    o2 = echo_ractor.take
+    o2 = port.receive
     results << "#{o} is copied" unless o.object_id == o2.object_id
   }
 
   unshareable_objects.map{|o|
     echo_ractor << o
-    o2 = echo_ractor.take
+    o2 = port.receive
     results << "#{o.inspect} is not copied" if o.object_id == o2.object_id
   }
 
@@ -695,10 +510,10 @@ module M; end
   else
     results.inspect
   end
-}
+RUBY
 
 # frozen Objects are shareable
-assert_equal [false, true, false].inspect, %q{
+assert_equal [false, true, false].inspect, <<~'RUBY', frozen_string_literal: false
   class C
     def initialize freeze
       @a = 1
@@ -712,7 +527,7 @@ def initialize freeze
   def check obj1
     obj2 = Ractor.new obj1 do |obj|
       obj
-    end.take
+    end.value
 
     obj1.object_id == obj2.object_id
   end
@@ -721,11 +536,11 @@ def check obj1
   results << check(C.new(true))         # false
   results << check(C.new(true).freeze)  # true
   results << check(C.new(false).freeze) # false
-}
+RUBY
 
 # move example2: String
 # touching moved object causes an error
-assert_equal 'hello world', %q{
+assert_equal 'hello world', <<~'RUBY', frozen_string_literal: false
   # move
   r = Ractor.new do
     obj = Ractor.receive
@@ -734,7 +549,7 @@ def check obj1
 
   str = 'hello'
   r.send str, move: true
-  modified = r.take
+  modified = r.value
 
   begin
     str << ' exception' # raise Ractor::MovedError
@@ -743,7 +558,7 @@ def check obj1
   else
     raise 'unreachable'
   end
-}
+RUBY
 
 # move example2: Array
 assert_equal '[0, 1]', %q{
@@ -754,7 +569,7 @@ def check obj1
 
   a1 = [0]
   r.send a1, move: true
-  a2 = r.take
+  a2 = r.value
   begin
     a1 << 2 # raise Ractor::MovedError
   rescue Ractor::MovedError
@@ -762,46 +577,15 @@ def check obj1
   end
 }
 
-# move with yield
-assert_equal 'hello', %q{
-  r = Ractor.new do
-    Thread.current.report_on_exception = false
-    obj = 'hello'
-    Ractor.yield obj, move: true
-    obj << 'world'
-  end
-
-  str = r.take
-  begin
-    r.take
-  rescue Ractor::RemoteError
-    str #=> "hello"
-  end
-}
-
-# yield/move should not make moved object when the yield is not succeeded
-assert_equal '"str"', %q{
-  R = Ractor.new{}
-  M = Ractor.current
-  r = Ractor.new do
-    s = 'str'
-    selected_r, v = Ractor.select R, yield_value: s, move: true
-    raise if selected_r != R # taken from R
-    M.send s.inspect # s should not be a moved object
-  end
-
-  Ractor.receive
-}
-
-# yield/move can fail
-assert_equal "allocator undefined for Thread", %q{
+# unshareable frozen objects should still be frozen in new ractor after move
+assert_equal 'true', %q{
   r = Ractor.new do
-    obj = Thread.new{}
-    Ractor.yield obj
-  rescue => e
-    e.message
+    obj = receive
+    { frozen: obj.frozen? }
   end
-  r.take
+  obj = [Object.new].freeze
+  r.send(obj, move: true)
+  r.value[:frozen]
 }
 
 # Access to global-variables are prohibited
@@ -812,7 +596,7 @@ def check obj1
   end
 
   begin
-    r.take
+    r.join
   rescue Ractor::RemoteError => e
     e.cause.message
   end
@@ -825,7 +609,7 @@ def check obj1
   end
 
   begin
-    r.take
+    r.join
   rescue Ractor::RemoteError => e
     e.cause.message
   end
@@ -839,7 +623,7 @@ def check obj1
     }
   end
 
-  [$stdin, $stdout, $stderr].zip(r.take){|io, (oid, fno)|
+  [$stdin, $stdout, $stderr].zip(r.value){|io, (oid, fno)|
     raise "should not be different object" if io.object_id == oid
     raise "fd should be same" unless io.fileno == fno
   }
@@ -855,7 +639,7 @@ def check obj1
     'ok'
   end
 
-  r.take
+  r.value
 }
 
 # $DEBUG, $VERBOSE are Ractor local
@@ -913,7 +697,7 @@ def ractor_local_globals
 
   h = Ractor.new do
     ractor_local_globals
-  end.take
+  end.value
   ractor_local_globals == h #=> true
 }
 
@@ -922,7 +706,8 @@ def ractor_local_globals
   r = Ractor.new do
     self.object_id
   end
-  r.take == self.object_id #=> false
+  ret = r.value
+  ret == self.object_id
 }
 
 # self is a Ractor instance
@@ -930,7 +715,12 @@ def ractor_local_globals
   r = Ractor.new do
     self.object_id
   end
-  r.object_id == r.take #=> true
+  ret = r.value
+  if r.object_id == ret #=> true
+    true
+  else
+    raise [ret, r.object_id].inspect
+  end
 }
 
 # given block Proc will be isolated, so can not access outer variables.
@@ -946,7 +736,7 @@ def ractor_local_globals
 }
 
 # ivar in shareable-objects are not allowed to access from non-main Ractor
-assert_equal "can not get unshareable values from instance variables of classes/modules from non-main Ractors", %q{
+assert_equal "can not get unshareable values from instance variables of classes/modules from non-main Ractors", <<~'RUBY', frozen_string_literal: false
   class C
     @iv = 'str'
   end
@@ -957,13 +747,12 @@ class C
     end
   end
 
-
   begin
-    r.take
+    r.value
   rescue Ractor::RemoteError => e
     e.cause.message
   end
-}
+RUBY
 
 # ivar in shareable-objects are not allowed to access from non-main Ractor
 assert_equal 'can not access instance variables of shareable objects from non-main Ractors', %q{
@@ -975,7 +764,7 @@ class C
   end
 
   begin
-    r.take
+    r.value
   rescue Ractor::RemoteError => e
     e.cause.message
   end
@@ -1001,7 +790,7 @@ def foo
   end
 
   begin
-    r.take
+    r.value
   rescue Ractor::RemoteError => e
     e.cause.message
   end
@@ -1022,7 +811,7 @@ def setup
   end
 
   begin
-    r.take
+    r.value
   rescue Ractor::RemoteError => e
     e.cause.message
   end
@@ -1036,7 +825,7 @@ def setup
 
     Ractor.new obj do |obj|
       obj.instance_variable_get('@a')
-    end.take.to_s
+    end.value.to_s
   }.join
 }
 
@@ -1062,31 +851,66 @@ def self.str = @str
     def self.fstr = @fstr
   end
 
-  a = Ractor.new{ C.int }.take
+  a = Ractor.new{ C.int }.value
   b = Ractor.new do
     C.str.to_i
   rescue Ractor::IsolationError
     10
-  end.take
+  end.value
   c = Ractor.new do
     C.fstr.to_i
-  end.take
+  end.value
 
-  d = Ractor.new{ M.int }.take
+  d = Ractor.new{ M.int }.value
   e = Ractor.new do
     M.str.to_i
   rescue Ractor::IsolationError
     20
-  end.take
+  end.value
   f = Ractor.new do
     M.fstr.to_i
-  end.take
+  end.value
 
 
   # 1 + 10 + 100 + 2 + 20 + 200
   a + b + c + d + e + f
 }
 
+assert_equal '["instance-variable", "instance-variable", nil]', %q{
+  class C
+    @iv1 = ""
+    @iv2 = 42
+    def self.iv1 = defined?(@iv1) # "instance-variable"
+    def self.iv2 = defined?(@iv2) # "instance-variable"
+    def self.iv3 = defined?(@iv3) # nil
+  end
+
+  Ractor.new{
+    [C.iv1, C.iv2, C.iv3]
+  }.value
+}
+
+# moved objects have their shape properly set to original object's shape
+assert_equal '1234', %q{
+  class Obj
+    attr_accessor :a, :b, :c, :d
+    def initialize
+      @a = 1
+      @b = 2
+      @c = 3
+    end
+  end
+  r = Ractor.new do
+    obj = receive
+    obj.d = 4
+    [obj.a, obj.b, obj.c, obj.d]
+  end
+  obj = Obj.new
+  r.send(obj, move: true)
+  values = r.value
+  values.join
+}
+
 # cvar in shareable-objects are not allowed to access from non-main Ractor
 assert_equal 'can not access class variables from non-main Ractors', %q{
   class C
@@ -1100,7 +924,7 @@ class C
   end
 
   begin
-    r.take
+    r.join
   rescue Ractor::RemoteError => e
     e.cause.message
   end
@@ -1122,14 +946,14 @@ def self.cv
   end
 
   begin
-    r.take
+    r.join
   rescue Ractor::RemoteError => e
     e.cause.message
   end
 }
 
 # Getting non-shareable objects via constants by other Ractors is not allowed
-assert_equal 'can not access non-shareable objects in constant C::CONST by non-main Ractor.', %q{
+assert_equal 'can not access non-shareable objects in constant C::CONST by non-main Ractor.', <<~'RUBY', frozen_string_literal: false
   class C
     CONST = 'str'
   end
@@ -1137,44 +961,44 @@ class C
     C::CONST
   end
   begin
-    r.take
+    r.join
   rescue Ractor::RemoteError => e
     e.cause.message
   end
-}
+  RUBY
 
 # Constant cache should care about non-sharable constants
-assert_equal "can not access non-shareable objects in constant Object::STR by non-main Ractor.", %q{
+assert_equal "can not access non-shareable objects in constant Object::STR by non-main Ractor.", <<~'RUBY', frozen_string_literal: false
   STR = "hello"
   def str; STR; end
   s = str() # fill const cache
   begin
-    Ractor.new{ str() }.take
+    Ractor.new{ str() }.join
   rescue Ractor::RemoteError => e
     e.cause.message
   end
-}
+RUBY
 
 # Setting non-shareable objects into constants by other Ractors is not allowed
-assert_equal 'can not set constants with non-shareable objects by non-main Ractors', %q{
+assert_equal 'can not set constants with non-shareable objects by non-main Ractors', <<~'RUBY', frozen_string_literal: false
   class C
   end
   r = Ractor.new do
     C::CONST = 'str'
   end
   begin
-    r.take
+    r.join
   rescue Ractor::RemoteError => e
     e.cause.message
   end
-}
+RUBY
 
 # define_method is not allowed
 assert_equal "defined with an un-shareable Proc in a different Ractor", %q{
   str = "foo"
   define_method(:buggy){|i| str << "#{i}"}
   begin
-    Ractor.new{buggy(10)}.take
+    Ractor.new{buggy(10)}.join
   rescue => e
     e.cause.message
   end
@@ -1185,7 +1009,7 @@ class C
   A = Array.new(1000).freeze # [nil, ...]
   H = {a: 1, b: 2, c: 3}.freeze
 
-  Ractor.new{ [A.size, H.size] }.take
+  Ractor.new{ [A.size, H.size] }.value
 }
 
 # Ractor.count
@@ -1195,15 +1019,15 @@ class C
   ractors = (1..3).map { Ractor.new { Ractor.receive } }
   counts << Ractor.count
 
-  ractors[0].send('End 0').take
+  ractors[0].send('End 0').join
   sleep 0.1 until ractors[0].inspect =~ /terminated/
   counts << Ractor.count
 
-  ractors[1].send('End 1').take
+  ractors[1].send('End 1').join
   sleep 0.1 until ractors[1].inspect =~ /terminated/
   counts << Ractor.count
 
-  ractors[2].send('End 2').take
+  ractors[2].send('End 2').join
   sleep 0.1 until ractors[2].inspect =~ /terminated/
   counts << Ractor.count
 
@@ -1216,11 +1040,11 @@ class C
     n = 0
     ObjectSpace.each_object{|o| n += 1 unless Ractor.shareable?(o)}
     n
-  }.take
+  }.value
 }
 
 # ObjectSpace._id2ref can not handle unshareable objects with Ractors
-assert_equal 'ok', %q{
+assert_equal 'ok', <<~'RUBY', frozen_string_literal: false
   s = 'hello'
 
   Ractor.new s.object_id do |id ;s|
@@ -1229,11 +1053,11 @@ class C
     rescue => e
       :ok
     end
-  end.take
-}
+  end.value
+RUBY
 
 # Ractor.make_shareable(obj)
-assert_equal 'true', %q{
+assert_equal 'true', <<~'RUBY', frozen_string_literal: false
   class C
     def initialize
       @a = 'foo'
@@ -1304,7 +1128,7 @@ def /(other)
   }
 
   Ractor.shareable?(a)
-}
+RUBY
 
 # Ractor.make_shareable(obj) doesn't freeze shareable objects
 assert_equal 'true', %q{
@@ -1328,6 +1152,28 @@ def /(other)
   Ractor.shareable?(pr)
 }
 
+# Ractor.make_shareable(a_proc) makes inner structure shareable and freezes it
+assert_equal 'true,true,true,true', %q{
+  class Proc
+    attr_reader :obj
+    def initialize
+      @obj = Object.new
+    end
+  end
+
+  pr = Ractor.current.instance_eval do
+    Proc.new {}
+  end
+
+  results = []
+  Ractor.make_shareable(pr)
+  results << Ractor.shareable?(pr)
+  results << pr.frozen?
+  results << Ractor.shareable?(pr.obj)
+  results << pr.obj.frozen?
+  results.map(&:to_s).join(',')
+}
+
 # Ractor.shareable?(recursive_objects)
 assert_equal '[false, false]', %q{
   y = []
@@ -1356,6 +1202,21 @@ module M; end
   Ractor.make_shareable(ary = [C, M])
 }
 
+# Ractor.make_shareable with curried proc checks isolation of original proc
+assert_equal 'isolation error', %q{
+  a = Object.new
+  orig = proc { a }
+  curried = orig.curry
+
+  begin
+    Ractor.make_shareable(curried)
+  rescue Ractor::IsolationError
+    'isolation error'
+  else
+    'no error'
+  end
+}
+
 # define_method() can invoke different Ractor's proc if the proc is shareable.
 assert_equal '1', %q{
   class C
@@ -1364,7 +1225,7 @@ class C
     a = 2
   end
 
-  Ractor.new{ C.new.foo }.take
+  Ractor.new{ C.new.foo }.value
 }
 
 # Ractor.make_shareable(a_proc) makes a proc shareable.
@@ -1401,14 +1262,14 @@ class C
 }
 
 # TracePoint with normal Proc should be Ractor local
-assert_equal '[4, 8]', %q{
+assert_equal '[6, 10]', %q{
   rs = []
   TracePoint.new(:line){|tp| rs << tp.lineno if tp.path == __FILE__}.enable do
-    Ractor.new{ # line 4
+    Ractor.new{ # line 5
       a = 1
       b = 2
-    }.take
-    c = 3       # line 8
+    }.value
+    c = 3       # line 9
   end
   rs
 }
@@ -1417,7 +1278,7 @@ class C
 assert_equal '[true, false]', %q{
   Ractor.new([[]].freeze) { |ary|
     [ary.frozen?, ary.first.frozen? ]
-  }.take
+  }.value
 }
 
 # Ractor deep copies frozen objects (str)
@@ -1425,7 +1286,7 @@ class C
   s = String.new.instance_eval { @x = []; freeze}
   Ractor.new(s) { |s|
     [s.frozen?, s.instance_variable_get(:@x).frozen?]
-  }.take
+  }.value
 }
 
 # Can not trap with not isolated Proc on non-main ractor
@@ -1433,33 +1294,85 @@ class C
   a = []
   Ractor.new{
     trap(:INT){p :ok}
-  }.take
+  }.join
   a << :ok
 
   begin
     Ractor.new{
       s = 'str'
       trap(:INT){p s}
-    }.take
+    }.join
   rescue => Ractor::RemoteError
     a << :ok
   end
 }
 
+# Ractor.select is interruptible
+assert_normal_exit %q{
+  trap(:INT) do
+    exit
+  end
+
+  r = Ractor.new do
+    loop do
+      sleep 1
+    end
+  end
+
+  Thread.new do
+    sleep 0.5
+    Process.kill(:INT, Process.pid)
+  end
+  Ractor.select(r)
+}
+
 # Ractor-local storage
 assert_equal '[nil, "b", "a"]', %q{
   ans = []
   Ractor.current[:key] = 'a'
   r = Ractor.new{
-    Ractor.yield self[:key]
+    Ractor.main << self[:key]
     self[:key] = 'b'
     self[:key]
   }
-  ans << r.take
-  ans << r.take
+  ans << Ractor.receive
+  ans << r.value
   ans << Ractor.current[:key]
 }
 
+assert_equal '1', %q{
+  N = 1_000
+  Ractor.new{
+    a = []
+    1_000.times.map{|i|
+      Thread.new(i){|i|
+        Thread.pass if i < N
+        a << Ractor.store_if_absent(:i){ i }
+        a << Ractor.current[:i]
+      }
+    }.each(&:join)
+    a.uniq.size
+  }.value
+}
+
+# Ractor-local storage
+assert_equal '2', %q{
+  Ractor.new {
+    fails = 0
+    begin
+      Ractor.main[:key] # cannot get ractor local storage from non-main ractor
+    rescue => e
+      fails += 1 if e.message =~ /Cannot get ractor local/
+    end
+    begin
+      Ractor.main[:key] = 'val'
+    rescue => e
+      fails += 1 if e.message =~ /Cannot set ractor local/
+    end
+    fails
+  }.value
+}
+
 ###
 ### Synchronization tests
 ###
@@ -1473,23 +1386,38 @@ class C
     Ractor.new{
       N.times{|i| -(i.to_s)}
     }
-  }.map{|r| r.take}.join
+  }.map{|r| r.value}.join
+}
+
+assert_equal "ok", %Q{
+  N = #{N}
+  a, b = 2.times.map{
+    Ractor.new{
+      N.times.map{|i| -(i.to_s)}
+    }
+  }.map{|r| r.value}
+  N.times do |i|
+    unless a[i].equal?(b[i])
+      raise [a[i], b[i]].inspect
+    end
+  end
+  :ok
 }
 
-# Generic ivtbl
+# Generic fields_tbl
 n = N/2
 assert_equal "#{n}#{n}", %Q{
   2.times.map{
     Ractor.new do
       #{n}.times do
-        obj = ''
+        obj = +''
         obj.instance_variable_set("@a", 1)
         obj.instance_variable_set("@b", 1)
         obj.instance_variable_set("@c", 1)
         obj.instance_variable_defined?("@a")
       end
     end
-  }.map{|r| r.take}.join
+  }.map{|r| r.value}.join
 }
 
 # NameError
@@ -1521,18 +1449,19 @@ class C
 
 # Can yield back values while GC is sweeping [Bug #18117]
 assert_equal "ok", %q{
+  port = Ractor::Port.new
   workers = (0...8).map do
-    Ractor.new do
+    Ractor.new port do |port|
       loop do
         10_000.times.map { Object.new }
-        Ractor.yield Time.now
+        port << Time.now
       end
     end
   end
 
-  1_000.times { idle_worker, tmp_reporter = Ractor.select(*workers) }
+  1_000.times { port.receive }
   "ok"
-} unless ENV['RUN_OPTS'] =~ /rjit/ # flaky
+} if !yjit_enabled? && ENV['GITHUB_WORKFLOW'] != 'ModGC' # flaky
 
 assert_equal "ok", %q{
   def foo(*); ->{ super }; end
@@ -1633,26 +1562,48 @@ class C8; def self.foo = 17; end
   }
 
   n = CS.inject(1){|r, c| r * c.foo} * LN
-  rs.map{|r| r.take} == Array.new(RN){n}
+  rs.map{|r| r.value} == Array.new(RN){n}
 }
 
 # check experimental warning
 assert_match /\Atest_ractor\.rb:1:\s+warning:\s+Ractor is experimental/, %q{
   Warning[:experimental] = $VERBOSE = true
   STDERR.reopen(STDOUT)
-  eval("Ractor.new{}.take", nil, "test_ractor.rb", 1)
+  eval("Ractor.new{}.value", nil, "test_ractor.rb", 1)
+}, frozen_string_literal: false
+
+# check moved object
+assert_equal 'ok', %q{
+  r = Ractor.new do
+    Ractor.receive
+    GC.start
+    :ok
+  end
+
+  obj = begin
+  raise
+  rescue => e
+    e = Marshal.load(Marshal.dump(e))
+  end
+
+  r.send obj, move: true
+  r.value
 }
 
 ## Ractor::Selector
 
 # Selector#empty? returns true
 assert_equal 'true', %q{
+  skip true unless defined? Ractor::Selector
+
   s = Ractor::Selector.new
   s.empty?
 }
 
 # Selector#empty? returns false if there is target ractors
 assert_equal 'false', %q{
+  skip false unless defined? Ractor::Selector
+
   s = Ractor::Selector.new
   s.add Ractor.new{}
   s.empty?
@@ -1660,6 +1611,8 @@ class C8; def self.foo = 17; end
 
 # Selector#clear removes all ractors from the waiting list
 assert_equal 'true', %q{
+  skip true unless defined? Ractor::Selector
+
   s = Ractor::Selector.new
   s.add Ractor.new{10}
   s.add Ractor.new{20}
@@ -1669,6 +1622,8 @@ class C8; def self.foo = 17; end
 
 # Selector#wait can wait multiple ractors
 assert_equal '[10, 20, true]', %q{
+  skip [10, 20, true] unless defined? Ractor::Selector
+
   s = Ractor::Selector.new
   s.add Ractor.new{10}
   s.add Ractor.new{20}
@@ -1678,10 +1633,12 @@ class C8; def self.foo = 17; end
   r, v = s.wait
   vs << v
   [*vs.sort, s.empty?]
-}
+} if defined? Ractor::Selector
 
 # Selector#wait can wait multiple ractors with receiving.
 assert_equal '30', %q{
+  skip 30 unless defined? Ractor::Selector
+
   RN = 30
   rs = RN.times.map{
     Ractor.new{ :v }
@@ -1698,17 +1655,19 @@ class C8; def self.foo = 17; end
   end
 
   results.size
-}
+} if defined? Ractor::Selector
 
 # Selector#wait can support dynamic addition
-yjit_enabled = ENV.key?('RUBY_YJIT_ENABLE') || ENV.fetch('RUN_OPTS', '').include?('yjit') || BT.ruby.include?('yjit')
 assert_equal '600', %q{
+  skip 600 unless defined? Ractor::Selector
+
   RN = 100
   s = Ractor::Selector.new
+  port = Ractor::Port.new
   rs = RN.times.map{
     Ractor.new{
-      Ractor.main << Ractor.new{ Ractor.yield :v3; :v4 }
-      Ractor.main << Ractor.new{ Ractor.yield :v5; :v6 }
+      Ractor.main << Ractor.new(port){|port| port << :v3; :v4 }
+      Ractor.main << Ractor.new(port){|port| port << :v5; :v6 }
       Ractor.yield :v1
       :v2
     }
@@ -1728,10 +1687,12 @@ class C8; def self.foo = 17; end
   end
 
   h.sum{|k, v| v}
-} unless yjit_enabled # http://ci.rvm.jp/results/trunk-yjit@ruby-sp2-docker/4466770
+} unless yjit_enabled? # http://ci.rvm.jp/results/trunk-yjit@ruby-sp2-docker/4466770
 
 # Selector should be GCed (free'ed) without trouble
 assert_equal 'ok', %q{
+  skip :ok unless defined? Ractor::Selector
+
   RN = 30
   rs = RN.times.map{
     Ractor.new{ :v }
@@ -1741,3 +1702,608 @@ class C8; def self.foo = 17; end
 }
 
 end # if !ENV['GITHUB_WORKFLOW']
+
+# Chilled strings are not shareable
+assert_equal 'false', %q{
+  Ractor.shareable?("chilled")
+}
+
+# Chilled strings can be made shareable
+assert_equal 'true', %q{
+  shareable = Ractor.make_shareable("chilled")
+  shareable == "chilled" && Ractor.shareable?(shareable)
+}
+
+# require in Ractor
+assert_equal 'true', %q{
+  Module.new do
+    def require feature
+      return Ractor._require(feature) unless Ractor.main?
+      super
+    end
+    Object.prepend self
+    set_temporary_name 'Ractor#require'
+  end
+
+  Ractor.new{
+    begin
+      require 'tempfile'
+      Tempfile.new
+    rescue SystemStackError
+      # prism parser with -O0 build consumes a lot of machine stack
+      Data.define(:fileno).new(1)
+    end
+  }.value.fileno > 0
+}
+
+# require_relative in Ractor
+assert_equal 'true', %q{
+  dummyfile = File.join(__dir__, "dummy#{rand}.rb")
+  return true if File.exist?(dummyfile)
+
+  begin
+    File.write dummyfile, ''
+  rescue Exception
+    # skip on any errors
+    return true
+  end
+
+  begin
+    Ractor.new dummyfile do |f|
+      require_relative File.basename(f)
+    end.value
+  ensure
+    File.unlink dummyfile
+  end
+}
+
+# require_relative in Ractor
+assert_equal 'LoadError', %q{
+  dummyfile = File.join(__dir__, "not_existed_dummy#{rand}.rb")
+  return true if File.exist?(dummyfile)
+
+  Ractor.new dummyfile do |f|
+    begin
+      require_relative File.basename(f)
+    rescue LoadError => e
+      e.class
+    end
+  end.value
+}
+
+# autolaod in Ractor
+assert_equal 'true', %q{
+  autoload :Tempfile, 'tempfile'
+
+  r = Ractor.new do
+    begin
+      Tempfile.new
+    rescue SystemStackError
+      # prism parser with -O0 build consumes a lot of machine stack
+      Data.define(:fileno).new(1)
+    end
+  end
+  r.value.fileno > 0
+}
+
+# failed in autolaod in Ractor
+assert_equal 'LoadError', %q{
+  dummyfile = File.join(__dir__, "not_existed_dummy#{rand}.rb")
+  autoload :Tempfile, dummyfile
+
+  r = Ractor.new do
+    begin
+      Tempfile.new
+    rescue LoadError => e
+      e.class
+    end
+  end
+  r.value
+}
+
+# bind_call in Ractor [Bug #20934]
+assert_equal 'ok', %q{
+  2.times.map do
+    Ractor.new do
+      1000.times do
+        Object.instance_method(:itself).bind_call(self)
+      end
+    end
+  end.each(&:join)
+  GC.start
+  :ok.itself
+}
+
+# moved objects being corrupted if embeded (String)
+assert_equal 'ok', %q{
+  ractor = Ractor.new { Ractor.receive }
+  obj = "foobarbazfoobarbazfoobarbazfoobarbaz"
+  ractor.send(obj.dup, move: true)
+  roundtripped_obj = ractor.value
+  roundtripped_obj == obj ? :ok : roundtripped_obj
+}
+
+# moved objects being corrupted if embeded (Array)
+assert_equal 'ok', %q{
+  ractor = Ractor.new { Ractor.receive }
+  obj = Array.new(10, 42)
+  ractor.send(obj.dup, move: true)
+  roundtripped_obj = ractor.value
+  roundtripped_obj == obj ? :ok : roundtripped_obj
+}
+
+# moved objects being corrupted if embeded (Hash)
+assert_equal 'ok', %q{
+  ractor = Ractor.new { Ractor.receive }
+  obj = { foo: 1, bar: 2 }
+  ractor.send(obj.dup, move: true)
+  roundtripped_obj = ractor.value
+  roundtripped_obj == obj ? :ok : roundtripped_obj
+}
+
+# moved objects being corrupted if embeded (MatchData)
+assert_equal 'ok', %q{
+  ractor = Ractor.new { Ractor.receive }
+  obj = "foo".match(/o/)
+  ractor.send(obj.dup, move: true)
+  roundtripped_obj = ractor.value
+  roundtripped_obj == obj ? :ok : roundtripped_obj
+}
+
+# moved objects being corrupted if embeded (Struct)
+assert_equal 'ok', %q{
+  ractor = Ractor.new { Ractor.receive }
+  obj = Struct.new(:a, :b, :c, :d, :e, :f).new(1, 2, 3, 4, 5, 6)
+  ractor.send(obj.dup, move: true)
+  roundtripped_obj = ractor.value
+  roundtripped_obj == obj ? :ok : roundtripped_obj
+}
+
+# moved objects being corrupted if embeded (Object)
+assert_equal 'ok', %q{
+  ractor = Ractor.new { Ractor.receive }
+  class SomeObject
+    attr_reader :a, :b, :c, :d, :e, :f
+    def initialize
+      @a = @b = @c = @d = @e = @f = 1
+    end
+
+    def ==(o)
+      @a == o.a &&
+      @b == o.b &&
+      @c == o.c &&
+      @d == o.d &&
+      @e == o.e &&
+      @f == o.f
+    end
+  end
+
+  SomeObject.new # initial non-embeded
+
+  obj = SomeObject.new
+  ractor.send(obj.dup, move: true)
+  roundtripped_obj = ractor.value
+  roundtripped_obj == obj ? :ok : roundtripped_obj
+}
+
+# moved arrays can't be used
+assert_equal 'ok', %q{
+  ractor = Ractor.new { Ractor.receive }
+  obj = [1]
+  ractor.send(obj, move: true)
+  begin
+    [].concat(obj)
+  rescue TypeError
+    :ok
+  else
+    :fail
+  end
+}
+
+# moved strings can't be used
+assert_equal 'ok', %q{
+  ractor = Ractor.new { Ractor.receive }
+  obj = "hello"
+  ractor.send(obj, move: true)
+  begin
+    "".replace(obj)
+  rescue TypeError
+    :ok
+  else
+    :fail
+  end
+}
+
+# moved hashes can't be used
+assert_equal 'ok', %q{
+  ractor = Ractor.new { Ractor.receive }
+  obj = { a: 1 }
+  ractor.send(obj, move: true)
+  begin
+    {}.merge(obj)
+  rescue TypeError
+    :ok
+  else
+    :fail
+  end
+}
+
+# move objects inside frozen containers
+assert_equal 'ok', %q{
+  ractor = Ractor.new { Ractor.receive }
+  obj = Array.new(10, 42)
+  original = obj.dup
+  ractor.send([obj].freeze, move: true)
+  roundtripped_obj = ractor.value[0]
+  roundtripped_obj == original ? :ok : roundtripped_obj
+}
+
+# move object with generic ivar
+assert_equal 'ok', %q{
+  ractor = Ractor.new { Ractor.receive }
+  obj = Array.new(10, 42)
+  obj.instance_variable_set(:@array, [1])
+
+  ractor.send(obj, move: true)
+  roundtripped_obj = ractor.value
+  roundtripped_obj.instance_variable_get(:@array) == [1] ? :ok : roundtripped_obj
+}
+
+# move object with many generic ivars
+assert_equal 'ok', %q{
+  ractor = Ractor.new { Ractor.receive }
+  obj = Array.new(10, 42)
+  0.upto(300) do |i|
+    obj.instance_variable_set(:"@array#{i}", [i])
+  end
+
+  ractor.send(obj, move: true)
+  roundtripped_obj = ractor.value
+  roundtripped_obj.instance_variable_get(:@array1) == [1] ? :ok : roundtripped_obj
+}
+
+# move object with complex generic ivars
+assert_equal 'ok', %q{
+  # Make Array too_complex
+  30.times { |i| [].instance_variable_set(:"@complex#{i}", 1) }
+
+  ractor = Ractor.new { Ractor.receive }
+  obj = Array.new(10, 42)
+  obj.instance_variable_set(:@array1, [1])
+
+  ractor.send(obj, move: true)
+  roundtripped_obj = ractor.value
+  roundtripped_obj.instance_variable_get(:@array1) == [1] ? :ok : roundtripped_obj
+}
+
+# copy object with complex generic ivars
+assert_equal 'ok', %q{
+  # Make Array too_complex
+  30.times { |i| [].instance_variable_set(:"@complex#{i}", 1) }
+
+  ractor = Ractor.new { Ractor.receive }
+  obj = Array.new(10, 42)
+  obj.instance_variable_set(:@array1, [1])
+
+  ractor.send(obj)
+  roundtripped_obj = ractor.value
+  roundtripped_obj.instance_variable_get(:@array1) == [1] ? :ok : roundtripped_obj
+}
+
+# copy object with many generic ivars
+assert_equal 'ok', %q{
+  ractor = Ractor.new { Ractor.receive }
+  obj = Array.new(10, 42)
+  0.upto(300) do |i|
+    obj.instance_variable_set(:"@array#{i}", [i])
+  end
+
+  ractor.send(obj)
+  roundtripped_obj = ractor.value
+  roundtripped_obj.instance_variable_get(:@array1) == [1] ? :ok : roundtripped_obj
+}
+
+# moved composite types move their non-shareable parts properly
+assert_equal 'ok', %q{
+  k, v = String.new("key"), String.new("value")
+  h = { k => v }
+  h.instance_variable_set("@b", String.new("b"))
+  a = [k,v]
+  o_singleton = Object.new
+  def o_singleton.a
+    @a
+  end
+  o_singleton.instance_variable_set("@a", String.new("a"))
+  class MyObject
+    attr_reader :a
+    def initialize(a)
+      @a = a
+    end
+  end
+  struct_class = Struct.new(:a)
+  struct = struct_class.new(String.new('a'))
+  o = MyObject.new(String.new('a'))
+  port = Ractor::Port.new
+
+  r = Ractor.new port do |port|
+    loop do
+      obj = Ractor.receive
+      val = case obj
+      when Hash
+        obj['key'] == 'value' && obj.instance_variable_get("@b") == 'b'
+      when Array
+        obj[0] == 'key'
+      when Struct
+        obj.a == 'a'
+      when Object
+        obj.a == 'a'
+      end
+      port << val
+    end
+  end
+
+  objs = [h, a, o_singleton, o, struct]
+  objs.each_with_index do |obj, i|
+    klass = obj.class
+    parts_moved = {}
+    case obj
+    when Hash
+      parts_moved[klass] = [obj['key'], obj.instance_variable_get("@b")]
+    when Array
+      parts_moved[klass] = obj.dup # the contents
+    when Struct, Object
+      parts_moved[klass] = [obj.a]
+    end
+    r.send(obj, move: true)
+    val = port.receive
+    if val != true
+      raise "bad val in ractor for obj at i:#{i}"
+    end
+    begin
+      p obj
+    rescue
+    else
+      raise "should be moved"
+    end
+    parts_moved.each do |klass, parts|
+      parts.each_with_index do |part, j|
+        case part
+        when Ractor::MovedObject
+        else
+          raise "part for class #{klass} at i:#{j} should be moved"
+        end
+      end
+    end
+  end
+  'ok'
+}
+
+# fork after creating Ractor
+assert_equal 'ok', %q{
+begin
+  Ractor.new { Ractor.receive }
+  _, status = Process.waitpid2 fork { }
+  status.success? ? "ok" : status
+rescue NotImplementedError
+  :ok
+end
+}
+
+# Ractors should be terminated after fork
+assert_equal 'ok', %q{
+begin
+  r = Ractor.new { Ractor.receive }
+  _, status = Process.waitpid2 fork {
+    begin
+      raise if r.value != nil
+    end
+  }
+  r.send(123)
+  raise unless r.value == 123
+  status.success? ? "ok" : status
+rescue NotImplementedError
+  :ok
+end
+}
+
+# Ractors should be terminated after fork
+assert_equal 'ok', %q{
+begin
+  r = Ractor.new { Ractor.receive }
+  _, status = Process.waitpid2 fork {
+    begin
+      r.send(123)
+    rescue Ractor::ClosedError
+    end
+  }
+  r.send(123)
+  raise unless r.value == 123
+  status.success? ? "ok" : status
+rescue NotImplementedError
+  :ok
+end
+}
+
+# Creating classes inside of Ractors
+# [Bug #18119]
+assert_equal 'ok', %q{
+  port = Ractor::Port.new
+  workers = (0...8).map do
+    Ractor.new port do |port|
+      loop do
+        100.times.map { Class.new }
+        port << nil
+      end
+    end
+  end
+
+  100.times { port.receive }
+
+  'ok'
+}
+
+# Using Symbol#to_proc inside ractors
+# [Bug #21354]
+assert_equal 'ok', %q{
+  :inspect.to_proc
+  Ractor.new do
+    # It should not use this cached proc, it should create a new one. If it used
+    # the cached proc, we would get a ractor_confirm_belonging error here.
+    :inspect.to_proc
+  end.join
+  'ok'
+}
+
+# take vm lock when deleting generic ivars from the global table
+assert_equal 'ok', %q{
+  Ractor.new do
+    a = [1, 2, 3]
+    a.object_id
+    a.dup # this deletes generic ivar on dupped object
+    'ok'
+  end.value
+}
+
+## Ractor#monitor
+
+# monitor port returns `:exited` when the monitering Ractor terminated.
+assert_equal 'true', %q{
+  r = Ractor.new do
+    Ractor.main << :ok1
+    :ok2
+  end
+
+  r.monitor port = Ractor::Port.new
+  Ractor.receive # :ok1
+  port.receive == :exited
+}
+
+# monitor port returns `:exited` even if the monitoring Ractor was terminated.
+assert_equal 'true', %q{
+  r = Ractor.new do
+    :ok
+  end
+
+  r.join # wait for r's terminateion
+
+  r.monitor port = Ractor::Port.new
+  port.receive == :exited
+}
+
+# monitor returns false if the monitoring Ractor was terminated.
+assert_equal 'false', %q{
+  r = Ractor.new do
+    :ok
+  end
+
+  r.join # wait for r's terminateion
+
+  r.monitor Ractor::Port.new
+}
+
+# monitor port returns `:aborted` when the monitering Ractor is aborted.
+assert_equal 'true', %q{
+  r = Ractor.new do
+    Ractor.main << :ok1
+    raise 'ok'
+  end
+
+  r.monitor port = Ractor::Port.new
+  Ractor.receive # :ok1
+  port.receive == :aborted
+}
+
+# monitor port returns `:aborted` even if the monitoring Ractor was aborted.
+assert_equal 'true', %q{
+  r = Ractor.new do
+    raise 'ok'
+  end
+
+  begin
+    r.join # wait for r's terminateion
+  rescue Ractor::RemoteError
+    # ignore
+  end
+
+  r.monitor port = Ractor::Port.new
+  port.receive == :aborted
+}
+
+## Ractor#join
+
+# Ractor#join returns self when the Ractor is terminated.
+assert_equal 'true', %q{
+  r = Ractor.new do
+    Ractor.receive
+  end
+
+  r << :ok
+  r.join
+  r.inspect in /terminated/
+} if false # TODO
+
+# Ractor#join raises RemoteError when the remote Ractor aborted with an exception
+assert_equal 'err', %q{
+  r = Ractor.new do
+    raise 'err'
+  end
+
+  begin
+    r.join
+  rescue Ractor::RemoteError => e
+    e.cause.message
+  end
+}
+
+## Ractor#value
+
+# Ractor#value returns the last expression even if it is unshareable
+assert_equal 'true', %q{
+  r = Ractor.new do
+    obj = [1, 2]
+    obj << obj.object_id
+  end
+
+  ret = r.value
+  ret == [1, 2, ret.object_id]
+}
+
+# Only one Ractor can call Ractor#value
+assert_equal '[["Only the successor ractor can take a value", 9], ["ok", 2]]', %q{
+  r = Ractor.new do
+    'ok'
+  end
+
+  RN = 10
+
+  rs = RN.times.map do
+    Ractor.new r do |r|
+      begin
+        Ractor.main << r.value
+        Ractor.main << r.value # this ractor can get same result
+      rescue Ractor::Error => e
+        Ractor.main << e.message
+      end
+    end
+  end
+
+  (RN+1).times.map{
+    Ractor.receive
+  }.tally.sort
+}
+
+# Ractor#take will warn for compatibility.
+# This method will be removed after 2025/09/01
+assert_equal "2", %q{
+  raise "remove Ractor#take and this test" if Time.now > Time.new(2025, 9, 2)
+  $VERBOSE = true
+  r = Ractor.new{42}
+  $msg = []
+  def Warning.warn(msg)
+    $msg << msg
+  end
+  r.take
+  r.take
+  raise unless $msg.all?{/Ractor#take/ =~ it}
+  $msg.size
+}
diff --git a/bootstraptest/test_rjit.rb b/bootstraptest/test_rjit.rb
deleted file mode 100644
index 464af7a6e6a65a..00000000000000
--- a/bootstraptest/test_rjit.rb
+++ /dev/null
@@ -1,44 +0,0 @@
-# VM_CALL_OPT_SEND + VM_METHOD_TYPE_ATTRSET
-assert_equal '1', %q{
-  class Foo
-    attr_writer :foo
-
-    def bar
-      send(:foo=, 1)
-    end
-  end
-
-  Foo.new.bar
-}
-
-# VM_CALL_OPT_SEND + OPTIMIZED_METHOD_TYPE_CALL
-assert_equal 'foo', %q{
-  def bar(&foo)
-    foo.send(:call)
-  end
-
-  bar { :foo }
-}
-
-# VM_CALL_OPT_SEND + OPTIMIZED_METHOD_TYPE_STRUCT_AREF
-assert_equal 'bar', %q{
-  def bar(foo)
-    foo.send(:bar)
-  end
-
-  bar(Struct.new(:bar).new(:bar))
-}
-
-# kwargs default w/ checkkeyword + locals (which shouldn't overwrite unspecified_bits)
-assert_equal '1', %q{
-  def foo(bar: 1.to_s)
-    _ = 1
-    bar
-  end
-
-  def entry
-    foo
-  end
-
-  entry
-}
diff --git a/bootstraptest/test_syntax.rb b/bootstraptest/test_syntax.rb
index 948e2d7809ee24..fbc9c6f62e377a 100644
--- a/bootstraptest/test_syntax.rb
+++ b/bootstraptest/test_syntax.rb
@@ -528,24 +528,24 @@ def lines
   i
 }
 def assert_syntax_error expected, code, message = ''
-  assert_equal "#{expected}",
-    "begin eval(%q{#{code}}, nil, '', 0)"'; rescue SyntaxError => e; e.message[/\A:(?:\d+:)? (.*)/, 1] end', message
+  assert_match /^#{Regexp.escape(expected)}/,
+    "begin eval(%q{#{code}}, nil, '', 0)"'; rescue SyntaxError => e; e.message[/(?:\^~*|\A:(?:\d+:)?(?! syntax errors? found)(?: syntax error,)?) (.*)/, 1] end', message
 end
 assert_syntax_error "unterminated string meets end of file", '().."', '[ruby-dev:29732]'
 assert_equal %q{[]}, %q{$&;[]}, '[ruby-dev:31068]'
-assert_syntax_error "syntax error, unexpected *, expecting '}'", %q{{*0}}, '[ruby-dev:31072]'
-assert_syntax_error "`@0' is not allowed as an instance variable name", %q{@0..0}, '[ruby-dev:31095]'
-assert_syntax_error "identifier $00 is not valid to get", %q{$00..0}, '[ruby-dev:31100]'
-assert_syntax_error "identifier $00 is not valid to set", %q{0..$00=1}
+assert_syntax_error "unexpected *, expecting '}'", %q{{*0}}, '[ruby-dev:31072]'
+assert_syntax_error "'@0' is not allowed as an instance variable name", %q{@0..0}, '[ruby-dev:31095]'
+assert_syntax_error "'$00' is not allowed as a global variable name", %q{$00..0}, '[ruby-dev:31100]'
+assert_syntax_error "'$00' is not allowed as a global variable name", %q{0..$00=1}
 assert_equal %q{0}, %q{[*0];0}, '[ruby-dev:31102]'
-assert_syntax_error "syntax error, unexpected ')'", %q{v0,(*,v1,) = 0}, '[ruby-dev:31104]'
+assert_syntax_error "unexpected ')'", %q{v0,(*,v1,) = 0}, '[ruby-dev:31104]'
 assert_equal %q{1}, %q{
   class << (ary=[]); def []; 0; end; def []=(x); super(0,x);end;end; ary[]+=1
 }, '[ruby-dev:31110]'
 assert_syntax_error "Can't set variable $1", %q{0..$1=1}, '[ruby-dev:31118]'
 assert_valid_syntax %q{1.times{1+(1&&next)}}, '[ruby-dev:31119]'
 assert_valid_syntax %q{x=-1;loop{x+=1&&redo if (x+=1).zero?}}, '[ruby-dev:31119]'
-assert_syntax_error %q{syntax error, unexpected end-of-input}, %q{!}, '[ruby-dev:31243]'
+assert_syntax_error %q{unexpected end-of-input}, %q{!}, '[ruby-dev:31243]'
 assert_equal %q{[nil]}, %q{[()]}, '[ruby-dev:31252]'
 assert_equal %q{true}, %q{!_=()}, '[ruby-dev:31263]'
 assert_equal 'ok', %q{while true; redo; end if 1 == 2; :ok}, '[ruby-dev:31360]'
@@ -629,7 +629,7 @@ class << (ary=[]); def []; 0; end; def []=(x); super(0,x);end;end; ary[]+=1
 
 assert_match /invalid multibyte char/, %q{
   $stderr = STDOUT
-  eval("\"\xf0".force_encoding("utf-8"))
+  eval("\"\xf0".dup.force_encoding("utf-8"))
 }, '[ruby-dev:32429]'
 
 # method ! and !=
@@ -904,3 +904,35 @@ def foo(&block)
     Class
   end
 }, '[ruby-core:30293]'
+
+assert_equal "false", <<~RUBY, "literal strings are mutable", "--disable-frozen-string-literal"
+  'test'.frozen?
+RUBY
+
+assert_equal "true", <<~RUBY, "literal strings are frozen", "--disable-frozen-string-literal", frozen_string_literal: true
+  'test'.frozen?
+RUBY
+
+assert_equal "true", <<~RUBY, "literal strings are frozen", "--enable-frozen-string-literal"
+  'test'.frozen?
+RUBY
+
+assert_equal "false", <<~RUBY, "literal strings are mutable", "--enable-frozen-string-literal", frozen_string_literal: false
+  'test'.frozen?
+RUBY
+
+assert_equal "false", <<~RUBY, "__FILE__ is mutable", "--disable-frozen-string-literal"
+  __FILE__.frozen?
+RUBY
+
+assert_equal "true", <<~RUBY, "__FILE__ is frozen", "--disable-frozen-string-literal", frozen_string_literal: true
+  __FILE__.frozen?
+RUBY
+
+assert_equal "true", <<~RUBY, "__FILE__ is frozen", "--enable-frozen-string-literal"
+  __FILE__.frozen?
+RUBY
+
+assert_equal "false", <<~RUBY, "__FILE__ is mutable", "--enable-frozen-string-literal", frozen_string_literal: false
+  __FILE__.frozen?
+RUBY
diff --git a/bootstraptest/test_thread.rb b/bootstraptest/test_thread.rb
index 0c163d0db02dca..7ff5bb4a38fb59 100644
--- a/bootstraptest/test_thread.rb
+++ b/bootstraptest/test_thread.rb
@@ -242,9 +242,22 @@
   end
 }
 
+assert_equal 'true', %{
+  Thread.new{}.join
+  begin
+    Process.waitpid2 fork{
+      Thread.new{
+        sleep 0.1
+      }.join
+    }
+    true
+  rescue NotImplementedError
+    true
+  end
+}
+
 assert_equal 'ok', %{
-  open("zzz_t1.rb", "w") do |f|
-    f.puts <<-END
+  File.write("zzz_t1.rb", <<-END)
       begin
         Thread.new { fork { GC.start } }.join
         pid, status = Process.wait2
@@ -253,7 +266,6 @@
         $result = :ok
       end
     END
-  end
   require "./zzz_t1.rb"
   $result
 }
@@ -279,7 +291,6 @@
   exec "/"
 }
 
-rjit_enabled = RUBY_DESCRIPTION.include?('+RJIT')
 assert_normal_exit %q{
   (0..10).map {
     Thread.new {
@@ -290,7 +301,7 @@
   }.each {|t|
     t.join
   }
-} unless rjit_enabled # flaky
+}
 
 assert_equal 'ok', %q{
   def m
@@ -409,8 +420,7 @@ def m
 }
 
 assert_equal 'ok', %{
-  open("zzz_t2.rb", "w") do |f|
-    f.puts <<-'end;' # do
+  File.write("zzz_t2.rb", <<-'end;') # do
       begin
         m = Thread::Mutex.new
         parent = Thread.current
@@ -432,7 +442,6 @@ def m
         $result = :ok
       end
     end;
-  end
   require "./zzz_t2.rb"
   $result
 }
@@ -484,7 +493,8 @@ def m
   [th1, th2].each {|t| t.join }
   GC.start
   f.call.source
-} unless rjit_enabled # flaky
+}
+
 assert_normal_exit %q{
   class C
     def inspect
diff --git a/bootstraptest/test_yjit.rb b/bootstraptest/test_yjit.rb
index 3c53641f91e2fb..d480369c759119 100644
--- a/bootstraptest/test_yjit.rb
+++ b/bootstraptest/test_yjit.rb
@@ -1,3 +1,181 @@
+# To run the tests in this file only, with YJIT enabled:
+# make btest BTESTS=bootstraptest/test_yjit.rb RUN_OPTS="--yjit-call-threshold=1"
+
+# regression test for popping before side exit
+assert_equal "ok", %q{
+  def foo(a, *) = a
+
+  def call(args, &)
+    foo(1) # spill at where the block arg will be
+    foo(*args, &)
+  end
+
+  call([1, 2])
+
+  begin
+    call([])
+  rescue ArgumentError
+    :ok
+  end
+}
+
+# regression test for send processing before side exit
+assert_equal "ok", %q{
+  def foo(a, *) = :foo
+
+  def call(args)
+    send(:foo, *args)
+  end
+
+  call([1, 2])
+
+  begin
+    call([])
+  rescue ArgumentError
+    :ok
+  end
+}
+
+# test discarding extra yield arguments
+assert_equal "22131300500015901015", %q{
+  def splat_kw(ary) = yield *ary, a: 1
+
+  def splat(ary) = yield *ary
+
+  def kw = yield 1, 2, a: 3
+
+  def kw_only = yield a: 0
+
+  def simple = yield 0, 1
+
+  def none = yield
+
+  def calls
+    [
+      splat([1, 1, 2]) { |x, y| x + y },
+      splat([1, 1, 2]) { |y, opt = raise| opt + y},
+      splat_kw([0, 1]) { |a:| a },
+      kw { |a:| a },
+      kw { |one| one },
+      kw { |one, a:| a },
+      kw_only { |a:| a },
+      kw_only { |a: 1| a },
+      simple { 5.itself },
+      simple { |a| a },
+      simple { |opt = raise| opt },
+      simple { |*rest| rest },
+      simple { |opt_kw: 5| opt_kw },
+      none { |a: 9| a },
+      # autosplat ineractions
+      [0, 1, 2].yield_self { |a, b| [a, b] },
+      [0, 1, 2].yield_self { |a, opt = raise| [a, opt] },
+      [1].yield_self { |a, opt = 4| a + opt },
+    ]
+  end
+
+  calls.join
+}
+
+# test autosplat with empty splat
+assert_equal "ok", %q{
+  def m(pos, splat) = yield pos, *splat
+
+  m([:ok], []) {|v0,| v0 }
+}
+
+# regression test for send stack shifting
+assert_normal_exit %q{
+  def foo(a, b)
+    a.singleton_methods(b)
+  end
+
+  def call_foo
+    [1, 1, 1, 1, 1, 1, send(:foo, 1, 1)]
+  end
+
+  call_foo
+}
+
+# regression test for keyword splat with yield
+assert_equal 'nil', %q{
+  def splat_kw(kwargs) = yield(**kwargs)
+
+  splat_kw({}) { _1 }.inspect
+}
+
+# regression test for arity check with splat
+assert_equal '[:ae, :ae]', %q{
+  def req_one(a_, b_ = 1) = raise
+
+  def test(args)
+    req_one *args
+  rescue ArgumentError
+    :ae
+  end
+
+  [test(Array.new 5), test([])]
+}
+
+# regression test for arity check with splat and send
+assert_equal '[:ae, :ae]', %q{
+  def two_reqs(a, b_, _ = 1) = a.gsub(a, a)
+
+  def test(name, args)
+    send(name, *args)
+  rescue ArgumentError
+    :ae
+  end
+
+  [test(:two_reqs, ["g", nil, nil, nil]), test(:two_reqs, ["g"])]
+}
+
+# regression test for GC marking stubs in invalidated code
+assert_normal_exit %q{
+  skip true unless GC.respond_to?(:compact)
+  garbage = Array.new(10_000) { [] } # create garbage to cause iseq movement
+  eval(<<~RUBY)
+  def foo(n, garbage)
+    if n == 2
+      # 1.times.each to create a cfunc frame to preserve the JIT frame
+      # which will return to a stub housed in an invalidated block
+      return 1.times.each do
+        Object.define_method(:foo) {}
+        garbage.clear
+        GC.verify_compaction_references(toward: :empty, expand_heap: true)
+      end
+    end
+
+    foo(n + 1, garbage)
+  end
+  RUBY
+
+  foo(1, garbage)
+}
+
+# regression test for callee block handler overlapping with arguments
+assert_equal '3', %q{
+  def foo(_req, *args) = args.last
+
+  def call_foo = foo(0, 1, 2, 3, &->{})
+
+  call_foo
+}
+
+# call leaf builtin with a block argument
+assert_equal '0', "0.abs(&nil)"
+
+# regression test for invokeblock iseq guard
+assert_equal 'ok', %q{
+  skip :ok unless GC.respond_to?(:compact)
+  def foo = yield
+  10.times do |i|
+    ret = eval("foo { #{i} }")
+    raise "failed at #{i}" unless ret == i
+    GC.compact
+  end
+  :ok
+}
+
 # regression test for overly generous guard elision
 assert_equal '[0, :sum, 0, :sum]', %q{
   # In faulty versions, the following happens:
@@ -16,7 +194,7 @@ def carray(iter)
   end
 
   def cstring(iter)
-    string = ""
+    string = "".dup
     string.sum(iter.times { def string.sum(_) = :sum })
   end
 
@@ -42,6 +220,15 @@ class Sub < String; end
   call(Sub.new('o')).class
 }
 
+# String#dup with generic ivars
+assert_equal '["str", "ivar"]', %q{
+  def str_dup(str) = str.dup
+  str = "str"
+  str.instance_variable_set(:@ivar, "ivar")
+  str = str_dup(str)
+  [str, str.instance_variable_get(:@ivar)]
+}
+
 # test splat filling required and feeding rest
 assert_equal '[0, 1, 2, [3, 4]]', %q{
   public def lead_rest(a, b, *rest)
@@ -124,7 +311,7 @@ def extender
   # Used to crash due to GC run in rb_ensure_iv_list_size()
   # not marking the newly allocated [:ok].
   RegressionTest.new.extender.itself
-} unless RUBY_DESCRIPTION.include?('+RJIT') # Skip on RJIT since this uncovers a crash
+}
 
 assert_equal 'true', %q{
   # regression test for tracking type of locals for too long
@@ -174,7 +361,7 @@ def call_graph_root
 }
 
 assert_normal_exit %q{
-  # Test to ensure send on overriden c functions
+  # Test to ensure send on overridden c functions
   # doesn't corrupt the stack
   class Bar
     def bar(x)
@@ -254,6 +441,33 @@ def foo
   Foo.new.foo
 }
 
+# getinstancevariable with shape too complex
+assert_normal_exit %q{
+  class Foo
+    def initialize
+      @a = 1
+    end
+
+    def getter
+      @foobar
+    end
+  end
+
+  # Initialize ivars in changing order, making the Foo
+  # class have shape too complex
+  100.times do |x|
+    foo = Foo.new
+    foo.instance_variable_set(:"@a#{x}", 1)
+    foo.instance_variable_set(:"@foobar", 777)
+
+    # The getter method eventually sees shape too complex
+    r = foo.getter
+    if r != 777
+      raise "error"
+    end
+  end
+}
+
 assert_equal '0', %q{
   # This is a regression test for incomplete invalidation from
   # opt_setinlinecache. This test might be brittle, so
@@ -396,6 +610,8 @@ def foo
 
 # Check that exceptions work when getting global variable
 assert_equal 'rescued', %q{
+  Warning[:deprecated] = true
+
   module Warning
     def warn(message)
       raise
@@ -1031,6 +1247,7 @@ def special.[](idx)
 
 # Test that object references in generated code get marked and moved
 assert_equal "good", %q{
+  skip :good unless GC.respond_to?(:compact)
   def bar
     "good"
   end
@@ -1054,7 +1271,7 @@ def foo
 # Test polymorphic getinstancevariable. T_OBJECT -> T_STRING
 assert_equal 'ok', %q{
   @hello = @h1 = @h2 = @h3 = @h4 = 'ok'
-  str = ""
+  str = +""
   str.instance_variable_set(:@hello, 'ok')
 
   public def get
@@ -1199,7 +1416,7 @@ def index(obj, idx)
 }
 
 # Test default value block for Hash with opt_aref_with
-assert_equal "false", %q{
+assert_equal "false", <<~RUBY, frozen_string_literal: false
   def index_with_string(h)
     h["foo"]
   end
@@ -1208,7 +1425,7 @@ def index_with_string(h)
 
   index_with_string(h)
   index_with_string(h)
-}
+RUBY
 
 # A regression test for making sure cfp->sp is proper when
 # hitting stubs. See :stub-sp-flush:
@@ -1598,7 +1815,7 @@ def build_hash
 }
 
 # test building hash with values
-assert_equal '{:foo=>:bar}', %q{
+assert_equal '{foo: :bar}', %q{
   def build_hash(val)
     { foo: val }
   end
@@ -1708,7 +1925,7 @@ def make_str(foo)
 }
 
 # Test that String unary plus returns the same object ID for an unfrozen string.
-assert_equal 'true', %q{
+assert_equal 'true', <<~RUBY, frozen_string_literal: false
   def jittable_method
     str = "bar"
 
@@ -1718,7 +1935,7 @@ def jittable_method
     uplus_str.object_id == old_obj_id
   end
   jittable_method
-}
+RUBY
 
 # Test that String unary plus returns a different unfrozen string when given a frozen string
 assert_equal 'false', %q{
@@ -1832,6 +2049,85 @@ def jittable_method
   jittable_method
 }
 
+# test getbyte on string class
+assert_equal '[97, :nil, 97, :nil, :raised]', %q{
+  def getbyte(s, i)
+   byte = begin
+    s.getbyte(i)
+   rescue TypeError
+    :raised
+   end
+
+   byte || :nil
+  end
+
+  getbyte("a", 0)
+  getbyte("a", 0)
+
+  [getbyte("a", 0), getbyte("a", 1), getbyte("a", -1), getbyte("a", -2), getbyte("a", "a")]
+}
+
+# Basic test for String#setbyte
+assert_equal 'AoZ', %q{
+  s = +"foo"
+  s.setbyte(0, 65)
+  s.setbyte(-1, 90)
+  s
+}
+
+# String#setbyte IndexError
+assert_equal 'String#setbyte', %q{
+  def ccall = "".setbyte(1, 0)
+  begin
+    ccall
+  rescue => e
+    e.backtrace.first.split("'").last
+  end
+}
+
+# String#setbyte TypeError
+assert_equal 'String#setbyte', %q{
+  def ccall = "".setbyte(nil, 0)
+  begin
+    ccall
+  rescue => e
+    e.backtrace.first.split("'").last
+  end
+}
+
+# String#setbyte FrozenError
+assert_equal 'String#setbyte', %q{
+  def ccall = "a".freeze.setbyte(0, 0)
+  begin
+    ccall
+  rescue => e
+    e.backtrace.first.split("'").last
+  end
+}
+
+# non-leaf String#setbyte
+assert_equal 'String#setbyte', %q{
+  def to_int
+    @caller = caller
+    0
+  end
+
+  def ccall = "a".dup.setbyte(self, 98)
+  ccall
+
+  @caller.first.split("'").last
+}
+
+# non-leaf String#byteslice
+assert_equal 'TypeError', %q{
+  def ccall = "".byteslice(nil, nil)
+  begin
+    ccall
+  rescue => e
+    e.class
+  end
+}
+
 # Test << operator on string subclass
 assert_equal 'abab', %q{
   class MyString < String; end
@@ -1977,6 +2273,34 @@ def foo(foo, bar)
   foo(5,2)
 }
 
+# regression test for argument registers with invalidation
+assert_equal '[0, 1, 2]', %q{
+  def test(n)
+    ret = n
+    binding
+    ret
+  end
+
+  [0, 1, 2].map do |n|
+    test(n)
+  end
+}
+
+# regression test for argument registers
+assert_equal 'true', %q{
+  class Foo
+    def ==(other)
+      other == nil
+    end
+  end
+
+  def test
+    [Foo.new].include?(Foo.new)
+  end
+
+  test
+}
+
 # test pattern matching
 assert_equal '[:ok, :ok]', %q{
   class C
@@ -2042,6 +2366,20 @@ def foo(obj)
   foo(Foo)
 }
 
+# Test EP == BP invalidation with moving ISEQs
+assert_equal 'ok', %q{
+  skip :ok unless GC.respond_to?(:compact)
+  def entry
+    ok = proc { :ok } # set #entry as an EP-escaping ISEQ
+    [nil].reverse_each do # avoid exiting the JIT frame on the constant
+      GC.compact # move #entry ISEQ
+    end
+    ok # should be read off of escaped EP
+  end
+
+  entry.call
+}
+
 # invokesuper edge case
 assert_equal '[:A, [:A, :B]]', %q{
   class B
@@ -2230,6 +2568,18 @@ def foo
   B.new.foo
 }
 
+# invokesuper zsuper in a bmethod
+assert_equal 'ok', %q{
+  class Foo
+    define_method(:itself) { super }
+  end
+  begin
+    Foo.new.itself
+  rescue RuntimeError
+    :ok
+  end
+}
+
 # Call to fixnum
 assert_equal '[true, false]', %q{
   def is_odd(obj)
@@ -2270,6 +2620,16 @@ def is_odd(obj)
   [is_odd(123), is_odd(456), is_odd(bignum), is_odd(bignum+1)]
 }
 
+# Flonum and Flonum
+assert_equal '[2.0, 0.0, 1.0, 4.0]', %q{
+  [1.0 + 1.0, 1.0 - 1.0, 1.0 * 1.0, 8.0 / 2.0]
+}
+
+# Flonum and Fixnum
+assert_equal '[2.0, 0.0, 1.0, 4.0]', %q{
+  [1.0 + 1, 1.0 - 1, 1.0 * 1, 8.0 / 2]
+}
+
 # Call to static and dynamic symbol
 assert_equal 'bar', %q{
   def to_string(obj)
@@ -2310,6 +2670,30 @@ def splatarray
   splatarray
 }
 
+# splatkw
+assert_equal '[1, 2]', %q{
+  def foo(a:) = [a, yield]
+
+  def entry(&block)
+    a = { a: 1 }
+    foo(**a, &block)
+  end
+
+  entry { 2 }
+}
+assert_equal '[1, 2]', %q{
+  def foo(a:) = [a, yield]
+
+  def entry(obj, &block)
+    foo(**obj, &block)
+  end
+
+  entry({ a: 3 }) { 2 }
+  obj = Object.new
+  def obj.to_hash = { a: 1 }
+  entry(obj) { 2 }
+}
+
 assert_equal '[1, 1, 2, 1, 2, 3]', %q{
   def expandarray
     arr = [1, 2, 3]
@@ -2364,6 +2748,23 @@ def obj.to_ary
   expandarray_not_array(obj)
 }
 
+assert_equal '[1, 2]', %q{
+  class NilClass
+    private
+    def to_ary
+      [1, 2]
+    end
+  end
+
+  def expandarray_redefined_nilclass
+    a, b = nil
+    [a, b]
+  end
+
+  expandarray_redefined_nilclass
+  expandarray_redefined_nilclass
+}
+
 assert_equal '[1, 2, nil]', %q{
   def expandarray_rhs_too_small
     a, b, c = [1, 2]
@@ -2474,7 +2875,7 @@ def events.compiled(obj)
   events.compiled(events)
 
   events
-} unless defined?(RubyVM::RJIT) && RubyVM::RJIT.enabled? # RJIT calls extra Ruby methods
+}
 
 # test enabling a TracePoint that targets a particular line in a C method call
 assert_equal '[true]', %q{
@@ -2556,7 +2957,7 @@ def shouldnt_compile
   tp.enable { shouldnt_compile }
 
   events
-} unless defined?(RubyVM::RJIT) && RubyVM::RJIT.enabled? # RJIT calls extra Ruby methods
+}
 
 # test enabling c_return tracing before compiling
 assert_equal '[[:c_return, :itself, main]]', %q{
@@ -2571,7 +2972,7 @@ def shouldnt_compile
   tp.enable { shouldnt_compile }
 
   events
-} unless defined?(RubyVM::RJIT) && RubyVM::RJIT.enabled? # RJIT calls extra Ruby methods
+}
 
 # test c_call invalidation
 assert_equal '[[:c_call, :itself]]', %q{
@@ -2617,15 +3018,16 @@ def traced_method
     itself
   end
 
-  tracing_ractor = Ractor.new do
+  port = Ractor::Port.new
+  tracing_ractor = Ractor.new port do |port|
     # 1: start tracing
     events = []
     tp = TracePoint.new(:c_call) { events << _1.method_id }
     tp.enable
-    Ractor.yield(nil)
+    port << nil
 
     # 3: run compiled method on tracing ractor
-    Ractor.yield(nil)
+    port << nil
     traced_method
 
     events
@@ -2633,13 +3035,13 @@ def traced_method
     tp&.disable
   end
 
-  tracing_ractor.take
+  port.receive
 
   # 2: compile on non tracing ractor
   traced_method
 
-  tracing_ractor.take
-  tracing_ractor.take
+  port.receive
+  tracing_ractor.value
 }
 
 # Try to hit a lazy branch stub while another ractor enables tracing
@@ -2653,17 +3055,18 @@ def compiled(arg)
     end
   end
 
-  ractor = Ractor.new do
+  port = Ractor::Port.new
+  ractor = Ractor.new port do |port|
     compiled(false)
-    Ractor.yield(nil)
+    port << nil
     compiled(41)
   end
 
   tp = TracePoint.new(:line) { itself }
-  ractor.take
+  port.receive
   tp.enable
 
-  ractor.take
+  ractor.value
 }
 
 # Test equality with changing types
@@ -2739,7 +3142,7 @@ def self.foo
   A.foo
   A.foo
 
-  Ractor.new { A.foo }.take
+  Ractor.new { A.foo }.value
 }
 
 assert_equal '["plain", "special", "sub", "plain"]', %q{
@@ -2991,7 +3394,7 @@ def foo(required:, specified: 999, simple_default: 3, complex_default: "4".to_i)
 }
 
 # cfunc kwargs
-assert_equal '{:foo=>123}', %q{
+assert_equal '{foo: 123}', %q{
   def foo(bar)
     bar.store(:value, foo: 123)
     bar[:value]
@@ -3002,7 +3405,7 @@ def foo(bar)
 }
 
 # cfunc kwargs
-assert_equal '{:foo=>123}', %q{
+assert_equal '{foo: 123}', %q{
   def foo(bar)
     bar.replace(foo: 123)
   end
@@ -3012,7 +3415,7 @@ def foo(bar)
 }
 
 # cfunc kwargs
-assert_equal '{:foo=>123, :bar=>456}', %q{
+assert_equal '{foo: 123, bar: 456}', %q{
   def foo(bar)
     bar.replace(foo: 123, bar: 456)
   end
@@ -3022,7 +3425,7 @@ def foo(bar)
 }
 
 # variadic cfunc kwargs
-assert_equal '{:foo=>123}', %q{
+assert_equal '{foo: 123}', %q{
   def foo(bar)
     bar.merge(foo: 123)
   end
@@ -3146,7 +3549,7 @@ def initialize(title)
 }
 
 # duphash
-assert_equal '{:foo=>123}', %q{
+assert_equal '{foo: 123}', %q{
   def foo
     {foo: 123}
   end
@@ -3156,7 +3559,7 @@ def foo
 }
 
 # newhash
-assert_equal '{:foo=>2}', %q{
+assert_equal '{foo: 2}', %q{
   def foo
     {foo: 1+1}
   end
@@ -3266,6 +3669,74 @@ def foo
   test
 }
 
+# Bug #21257 (infinite jmp)
+assert_equal 'ok', %q{
+  Good = :ok
+
+  def first
+    second
+  end
+
+  def second
+    ::Good
+  end
+
+  # Make `second` side exit on its first instruction
+  trace = TracePoint.new(:line) { }
+  trace.enable(target: method(:second))
+
+  first
+  # Recompile now that the constant cache is populated, so we get a fallthrough from `first` to `second`
+  # (this is need to reproduce with --yjit-call-threshold=1)
+  RubyVM::YJIT.code_gc if defined?(RubyVM::YJIT)
+  first
+
+  # Trigger a constant cache miss in rb_vm_opt_getconstant_path (in `second`) next time it's called
+  module InvalidateConstantCache
+    Good = nil
+  end
+
+  RubyVM::YJIT.simulate_oom! if defined?(RubyVM::YJIT)
+
+  first
+  first
+}
+
+assert_equal 'ok', %q{
+  # Multiple incoming branches into second
+  Good = :ok
+
+  def incoming_one
+    second
+  end
+
+  def incoming_two
+    second
+  end
+
+  def second
+    ::Good
+  end
+
+  # Make `second` side exit on its first instruction
+  trace = TracePoint.new(:line) { }
+  trace.enable(target: method(:second))
+
+  incoming_one
+  # Recompile now that the constant cache is populated, so we get a fallthrough from `incoming_one` to `second`
+  # (this is need to reproduce with --yjit-call-threshold=1)
+  RubyVM::YJIT.code_gc if defined?(RubyVM::YJIT)
+  incoming_one
+  incoming_two
+
+  # Trigger a constant cache miss in rb_vm_opt_getconstant_path (in `second`) next time it's called
+  module InvalidateConstantCache
+    Good = nil
+  end
+
+  incoming_one
+}
+
 assert_equal 'ok', %q{
   # Try to compile new method while OOM
   def foo
@@ -3390,36 +3861,6 @@ def pt_inspect(pt)
   pt_inspect(p)
 }
 
-# Regression test for deadlock between branch_stub_hit and ractor_receive_if
-assert_equal '10', %q{
-  r = Ractor.new Ractor.current do |main|
-    main << 1
-    main << 2
-    main << 3
-    main << 4
-    main << 5
-    main << 6
-    main << 7
-    main << 8
-    main << 9
-    main << 10
-  end
-
-  a = []
-  a << Ractor.receive_if{|msg| msg == 10}
-  a << Ractor.receive_if{|msg| msg == 9}
-  a << Ractor.receive_if{|msg| msg == 8}
-  a << Ractor.receive_if{|msg| msg == 7}
-  a << Ractor.receive_if{|msg| msg == 6}
-  a << Ractor.receive_if{|msg| msg == 5}
-  a << Ractor.receive_if{|msg| msg == 4}
-  a << Ractor.receive_if{|msg| msg == 3}
-  a << Ractor.receive_if{|msg| msg == 2}
-  a << Ractor.receive_if{|msg| msg == 1}
-
-  a.length
-}
-
 # checktype
 assert_equal 'false', %q{
     def function()
@@ -3829,7 +4270,7 @@ def foo
 assert_equal 'Hello World', %q{
   def bar
     args = ["Hello "]
-    greeting = "World"
+    greeting = +"World"
     greeting.insert(0, *args)
     greeting
   end
@@ -3965,7 +4406,7 @@ def literal_append(sql, v)
 
 # Rest with block
 # Simplified code from railsbench
-assert_equal '[{"/a"=>"b", :as=>:c, :via=>:post}, [], nil]', %q{
+assert_equal '[{"/a" => "b", as: :c, via: :post}, [], nil]', %q{
   def match(path, *rest, &block)
     [path, rest, block]
   end
@@ -4065,7 +4506,7 @@ def calling_my_func
   calling_my_func
 }
 
-# Regresssion test: rest and optional and splat
+# Regression test: rest and optional and splat
 assert_equal 'true', %q{
   def my_func(base=nil, *args)
     [base, args]
@@ -4093,9 +4534,9 @@ def calling_func
   rescue ArgumentError
     true
   end
-} unless defined?(RubyVM::RJIT) && RubyVM::RJIT.enabled? # Not yet working on RJIT
+}
 
-# Regresssion test: register allocator on expandarray
+# Regression test: register allocator on expandarray
 assert_equal '[]', %q{
   func = proc { [] }
   proc do
@@ -4151,3 +4592,838 @@ def foo(a, b)
 
   [r1, r2, r3, r4, r5]
 }
+
+# Integer multiplication and overflow (minimized regression test from test-basic)
+assert_equal '8515157028618240000', %q{2128789257154560000 * 4}
+
+# Inlined method calls
+assert_equal 'nil', %q{
+  def putnil = nil
+  def entry = putnil
+  entry.inspect
+}
+assert_equal '1', %q{
+  def putobject_1 = 1
+  def entry = putobject_1
+  entry
+}
+assert_equal 'false', %q{
+  def putobject(_unused_arg1) = false
+  def entry = putobject(nil)
+  entry
+}
+assert_equal 'true', %q{
+  def entry = yield
+  entry { true }
+}
+assert_equal 'sym', %q{
+  def entry = :sym.to_sym
+  entry
+}
+
+assert_normal_exit %q{
+  ivars = 1024.times.map { |i| "@iv_#{i} = #{i}\n" }.join
+  Foo = Class.new
+  Foo.class_eval "def initialize() #{ivars} end"
+  Foo.new
+}
+
+assert_equal '0', %q{
+  def spill
+    1.to_i # not inlined
+  end
+
+  def inline(_stack1, _stack2, _stack3, _stack4, _stack5)
+    0 # inlined
+  end
+
+  def entry
+    # RegTemps is 00111110 prior to the #inline call.
+    # Its return value goes to stack_idx=0, which conflicts with stack_idx=5.
+    inline(spill, 2, 3, 4, 5)
+  end
+
+  entry
+}
+
+# Integer succ and overflow
+assert_equal '[2, 4611686018427387904]', %q{
+  [1.succ, 4611686018427387903.succ]
+}
+
+# Integer pred and overflow
+assert_equal '[0, -4611686018427387905]', %q{
+  [1.pred, -4611686018427387904.pred]
+}
+
+# Integer right shift
+assert_equal '[0, 1, -4]', %q{
+  [0 >> 1, 2 >> 1, -7 >> 1]
+}
+
+# Integer XOR
+assert_equal '[0, 0, 4]', %q{
+  [0 ^ 0, 1 ^ 1, 7 ^ 3]
+}
+
+assert_equal '[nil, "yield"]', %q{
+  def defined_yield = defined?(yield)
+  [defined_yield, defined_yield {}]
+}
+
+# splat with ruby2_keywords into rest parameter
+assert_equal '[[{a: 1}], {}]', %q{
+  ruby2_keywords def foo(*args) = args
+
+  def bar(*args, **kw) = [args, kw]
+
+  def pass_bar(*args) = bar(*args)
+
+  def body
+    args = foo(a: 1)
+    pass_bar(*args)
+  end
+
+  body
+}
+
+# concatarray
+assert_equal '[1, 2]', %q{
+  def foo(a, b) = [a, b]
+  arr = [2]
+  foo(*[1], *arr)
+}
+
+# pushtoarray
+assert_equal '[1, 2]', %q{
+  def foo(a, b) = [a, b]
+  arr = [1]
+  foo(*arr, 2)
+}
+
+# pop before fallback
+assert_normal_exit %q{
+  class Foo
+    attr_reader :foo
+
+    def try = foo(0, &nil)
+  end
+
+  Foo.new.try
+}
+
+# a kwrest case
+assert_equal '[1, 2, {complete: false}]', %q{
+  def rest(foo: 1, bar: 2, **kwrest)
+    [foo, bar, kwrest]
+  end
+
+  def callsite = rest(complete: false)
+
+  callsite
+}
+
+# splat+kw_splat+opt+rest
+assert_equal '[1, []]', %q{
+  def opt_rest(a = 0, *rest) = [a, rest]
+
+  def call_site(args) = opt_rest(*args, **nil)
+
+  call_site([1])
+}
+
+# splat and nil kw_splat
+assert_equal 'ok', %q{
+  def identity(x) = x
+
+  def splat_nil_kw_splat(args) = identity(*args, **nil)
+
+  splat_nil_kw_splat([:ok])
+}
+
+# empty splat and kwsplat into leaf builtins
+assert_equal '[1, 1, 1]', %q{
+  empty = []
+  [1.abs(*empty), 1.abs(**nil), 1.bit_length(*empty, **nil)]
+}
+
+# splat into C methods with -1 arity
+assert_equal '[[1, 2, 3], [0, 2, 3], [1, 2, 3], [2, 2, 3], [], [], [{}]]', %q{
+  class Foo < Array
+    def push(args) = super(1, *args)
+  end
+
+  def test_cfunc_vargs_splat(sub_instance, array_class, empty_kw_hash)
+    splat = [2, 3]
+    kw_splat = [empty_kw_hash]
+    [
+      sub_instance.push(splat),
+      array_class[0, *splat, **nil],
+      array_class[1, *splat, &nil],
+      array_class[2, *splat, **nil, &nil],
+      array_class.send(:[], *kw_splat),
+      # kw_splat disables keywords hash handling
+      array_class[*kw_splat],
+      array_class[*kw_splat, **nil],
+    ]
+  end
+
+  test_cfunc_vargs_splat(Foo.new, Array, Hash.ruby2_keywords_hash({}))
+}
+
+# Class#new (arity=-1), splat, and ruby2_keywords
+assert_equal '[0, {1 => 1}]', %q{
+  class KwInit
+    attr_reader :init_args
+    def initialize(x = 0, **kw)
+      @init_args = [x, kw]
+    end
+  end
+
+  def test(klass, args)
+    klass.new(*args).init_args
+  end
+
+  test(KwInit, [Hash.ruby2_keywords_hash({1 => 1})])
+}
+
+# Chilled string setivar trigger warning
+assert_match(/literal string will be frozen in the future/, %q{
+  Warning[:deprecated] = true
+  $VERBOSE = true
+  $warning = "no-warning"
+  module ::Warning
+    def self.warn(message)
+      $warning = message.split("warning: ").last.strip
+    end
+  end
+
+  class String
+    def setivar!
+      @ivar = 42
+    end
+  end
+
+  def setivar!(str)
+    str.setivar!
+  end
+
+  10.times { setivar!("mutable".dup) }
+  10.times do
+    setivar!("frozen".freeze)
+  rescue FrozenError
+  end
+
+  setivar!("chilled") # Emit warning
+  $warning
+})
+
+# arity=-2 cfuncs
+assert_equal '["", "1/2", [0, [:ok, 1]]]', %q{
+  def test_cases(file, chain)
+    new_chain = chain.allocate # to call initialize directly
+    new_chain.send(:initialize, [0], ok: 1)
+
+    [
+      file.join,
+      file.join("1", "2"),
+      new_chain.to_a,
+    ]
+  end
+
+  test_cases(File, Enumerator::Chain)
+}
+
+# singleton class should invalidate Type::CString assumption
+assert_equal 'foo', %q{
+  def define_singleton(str, define)
+    if define
+      # Wrap a C method frame to avoid exiting JIT code on defineclass
+      [nil].reverse_each do
+        class << str
+          def +(_)
+            "foo"
+          end
+        end
+      end
+    end
+    "bar"
+  end
+
+  def entry(define)
+    str = ""
+    # When `define` is false, #+ compiles to rb_str_plus() without a class guard.
+    # When the code is reused with `define` is true, the class of `str` is changed
+    # to a singleton class, so the block should be invalidated.
+    str + define_singleton(str, define)
+  end
+
+  entry(false)
+  entry(true)
+}
+
+assert_equal 'ok', %q{
+  def ok
+    :ok
+  end
+
+  def delegator(...)
+    ok(...)
+  end
+
+  def caller
+    send(:delegator)
+  end
+
+  caller
+}
+
+# test inlining of simple iseqs
+assert_equal '[:ok, :ok, :ok]', %q{
+  def identity(x) = x
+  def foo(x, _) = x
+  def bar(_, _, _, _, x) = x
+
+  def tests
+    [
+      identity(:ok),
+      foo(:ok, 2),
+      bar(1, 2, 3, 4, :ok),
+    ]
+  end
+
+  tests
+}
+
+# test inlining of simple iseqs with kwargs
+assert_equal '[:ok, :ok, :ok, :ok, :ok]', %q{
+  def optional_unused(x, opt: :not_ok) = x
+  def optional_used(x, opt: :ok) = opt
+  def required_unused(x, req:) = x
+  def required_used(x, req:) = req
+  def unknown(x) = x
+
+  def tests
+    [
+      optional_unused(:ok),
+      optional_used(:not_ok),
+      required_unused(:ok, req: :not_ok),
+      required_used(:not_ok, req: :ok),
+      begin unknown(:not_ok, unknown_kwarg: :not_ok) rescue ArgumentError; :ok end,
+    ]
+  end
+
+  tests
+}
+
+# test simple iseqs not eligible for inlining
+assert_equal '[:ok, :ok, :ok, :ok, :ok]', %q{
+  def identity(x) = x
+  def arg_splat(x, *args) = x
+  def kwarg_splat(x, **kwargs) = x
+  def block_arg(x, &blk) = x
+  def block_iseq(x) = x
+  def call_forwarding(...) = identity(...)
+
+  def tests
+    [
+      arg_splat(:ok),
+      kwarg_splat(:ok),
+      block_arg(:ok, &proc { :not_ok }),
+      block_iseq(:ok) { :not_ok },
+      call_forwarding(:ok),
+    ]
+  end
+
+  tests
+}
+
+# regression test for invalidating an empty block
+assert_equal '0', %q{
+  def foo = (* = 1).pred
+
+  foo # compile it
+
+  class Integer
+    def to_ary = [] # invalidate
+  end
+
+  foo # try again
+}
+
+# test integer left shift with constant rhs
+assert_equal [0x80000000000, 'a+', :ok].inspect, %q{
+  def shift(val) = val << 43
+
+  def tests
+    int = shift(1)
+    str = shift("a")
+
+    Integer.define_method(:<<) { |_| :ok }
+    redef = shift(1)
+
+    [int, str, redef]
+  end
+
+  tests
+}
+
+# test integer left shift fusion followed by opt_getconstant_path
+assert_equal '33', %q{
+  def test(a)
+    (a << 5) | (Object; a)
+  end
+
+  test(1)
+}
+
+# test String#stebyte with arguments that need conversion
+assert_equal "abc", %q{
+  str = +"a00"
+  def change_bytes(str, one, two)
+    str.setbyte(one, "b".ord)
+    str.setbyte(2, two)
+  end
+
+  to_int_1 = Object.new
+  to_int_99 = Object.new
+  def to_int_1.to_int = 1
+  def to_int_99.to_int = 99
+
+  change_bytes(str, to_int_1, to_int_99)
+  str
+}
+
+# test --yjit-verify-ctx for arrays with a singleton class
+assert_equal "ok", %q{
+  class Array
+    def foo
+      self.singleton_class.define_method(:first) { :ok }
+      first
+    end
+  end
+
+  def test = [].foo
+
+  test
+}
+
+assert_equal '["raised", "Module", "Object"]', %q{
+  def foo(obj)
+    obj.superclass.name
+  end
+
+  ret = []
+
+  begin
+    foo(Class.allocate)
+  rescue TypeError
+    ret << 'raised'
+  end
+
+  ret += [foo(Class), foo(Class.new)]
+}
+
+# test TrueClass#=== before and after redefining TrueClass#==
+assert_equal '[[true, false, false], [true, true, false], [true, :error, :error]]', %q{
+  def true_eqq(x)
+    true === x
+  rescue NoMethodError
+    :error
+  end
+
+  def test
+    [
+      # first one is always true because rb_equal does object comparison before calling #==
+      true_eqq(true),
+      # these will use TrueClass#==
+      true_eqq(false),
+      true_eqq(:truthy),
+    ]
+  end
+
+  results = [test]
+
+  class TrueClass
+    def ==(x)
+      !x
+    end
+  end
+
+  results << test
+
+  class TrueClass
+    undef_method :==
+  end
+
+  results << test
+}
+
+# test FalseClass#=== before and after redefining FalseClass#==
+assert_equal '[[true, false, false], [true, false, true], [true, :error, :error]]', %q{
+  def case_equal(x, y)
+    x === y
+  rescue NoMethodError
+    :error
+  end
+
+  def test
+    [
+      # first one is always true because rb_equal does object comparison before calling #==
+      case_equal(false, false),
+      # these will use #==
+      case_equal(false, true),
+      case_equal(false, nil),
+    ]
+  end
+
+  results = [test]
+
+  class FalseClass
+    def ==(x)
+      !x
+    end
+  end
+
+  results << test
+
+  class FalseClass
+    undef_method :==
+  end
+
+  results << test
+}
+
+# test NilClass#=== before and after redefining NilClass#==
+assert_equal '[[true, false, false], [true, false, true], [true, :error, :error]]', %q{
+  def case_equal(x, y)
+    x === y
+  rescue NoMethodError
+    :error
+  end
+
+  def test
+    [
+      # first one is always true because rb_equal does object comparison before calling #==
+      case_equal(nil, nil),
+      # these will use #==
+      case_equal(nil, true),
+      case_equal(nil, false),
+    ]
+  end
+
+  results = [test]
+
+  class NilClass
+    def ==(x)
+      !x
+    end
+  end
+
+  results << test
+
+  class NilClass
+    undef_method :==
+  end
+
+  results << test
+}
+
+# test struct accessors fire c_call events
+assert_equal '[[:c_call, :x=], [:c_call, :x]]', %q{
+  c = Struct.new(:x)
+  obj = c.new
+
+  events = []
+  TracePoint.new(:c_call) do
+    events << [_1.event, _1.method_id]
+  end.enable do
+    obj.x = 100
+    obj.x
+  end
+
+  events
+}
+
+# regression test for splatting empty array
+assert_equal '1', %q{
+  def callee(foo) = foo
+
+  def test_body(args) = callee(1, *args)
+
+  test_body([])
+  array = Array.new(100)
+  array.clear
+  test_body(array)
+}
+
+# regression test for splatting empty array to cfunc
+assert_normal_exit %q{
+  def test_body(args) = Array(1, *args)
+
+  test_body([])
+  0x100.times do
+    array = Array.new(100)
+    array.clear
+    test_body(array)
+  end
+}
+
+# compiling code shouldn't emit warnings as it may call into more Ruby code
+assert_equal 'ok', <<~'RUBY'
+  # [Bug #20522]
+  $VERBOSE = true
+  Warning[:performance] = true
+
+  module StrictWarnings
+    def warn(msg, **)
+      raise msg
+    end
+  end
+  Warning.singleton_class.prepend(StrictWarnings)
+
+  class A
+    def compiled_method(is_private)
+      @some_ivar = is_private
+    end
+  end
+
+  shape_max_variations = 8
+  if defined?(RubyVM::Shape::SHAPE_MAX_VARIATIONS) && RubyVM::Shape::SHAPE_MAX_VARIATIONS != shape_max_variations
+    raise "Expected SHAPE_MAX_VARIATIONS to be #{shape_max_variations}, got: #{RubyVM::Shape::SHAPE_MAX_VARIATIONS}"
+  end
+
+  100.times do |i|
+    klass = Class.new(A)
+    (shape_max_variations - 1).times do |j|
+      obj = klass.new
+      obj.instance_variable_set("@base_#{i}", 42)
+      obj.instance_variable_set("@ivar_#{j}", 42)
+    end
+    obj = klass.new
+    obj.instance_variable_set("@base_#{i}", 42)
+    begin
+      obj.compiled_method(true)
+    rescue
+      # expected
+    end
+  end
+
+  :ok
+RUBY
+
+assert_equal 'ok', <<~'RUBY'
+  class MyRelation
+    def callee(...)
+      :ok
+    end
+
+    def uncached(...)
+      callee(...)
+    end
+
+    def takes_block(&block)
+      # push blockhandler
+      uncached(&block) # CI1
+    end
+  end
+
+  relation = MyRelation.new
+  relation.takes_block { }
+RUBY
+
+assert_equal 'ok', <<~'RUBY'
+  def _exec_scope(...)
+    instance_exec(...)
+  end
+
+  def ok args, body
+    _exec_scope(*args, &body)
+  end
+
+  ok([], -> { "ok" })
+RUBY
+
+assert_equal 'ok', <<~'RUBY'
+  def _exec_scope(...)
+    instance_exec(...)
+  end
+
+  def ok args, body
+    _exec_scope(*args, &body)
+  end
+
+  ok(["ok"], ->(x) { x })
+RUBY
+
+assert_equal 'ok', <<~'RUBY'
+def baz(a, b)
+  a + b
+end
+
+def bar(...)
+  baz(...)
+end
+
+def foo(a, ...)
+  bar(a, ...)
+end
+
+def test
+  foo("o", "k")
+end
+
+test
+RUBY
+
+# opt_newarray_send pack/buffer
+assert_equal '[true, true]', <<~'RUBY'
+  def pack
+    v = 1.23
+    [v, v*2, v*3].pack("E*").unpack("E*") == [v, v*2, v*3]
+  end
+
+  def with_buffer
+    v = 4.56
+    b = +"x"
+    [v, v*2, v*3].pack("E*", buffer: b)
+    b[1..].unpack("E*") == [v, v*2, v*3]
+  end
+
+  [pack, with_buffer]
+RUBY
+
+# String#[] / String#slice
+assert_equal 'ok', <<~'RUBY'
+  def error(klass)
+    yield
+  rescue klass
+    true
+  end
+
+  def test
+    str = "こんにちは"
+    substr = "にち"
+    failures = []
+
+    # Use many small statements to keep context for each slice call smaller than MAX_CTX_TEMPS
+
+    str[1] == "ん" && str.slice(4) == "は" || failures << :index
+    str[5].nil? && str.slice(5).nil? || failures << :index_end
+
+    str[1, 2] == "んに" && str.slice(2, 1) == "に" || failures << :beg_len
+    str[5, 1] == "" && str.slice(5, 1) == "" || failures << :beg_len_end
+
+    str[1..2] == "んに" && str.slice(2..2) == "に" || failures << :range
+
+    str[/に./] == "にち" && str.slice(/に./) == "にち" || failures << :regexp
+
+    str[/に./, 0] == "にち" && str.slice(/に./, 0) == "にち" || failures << :regexp_cap0
+
+    str[/に(.)/, 1] == "ち" && str.slice(/に(.)/, 1) == "ち" || failures << :regexp_cap1
+
+    str[substr] == substr && str.slice(substr) == substr || failures << :substr
+
+    error(TypeError) { str[Object.new] } && error(TypeError) { str.slice(Object.new, 1) } || failures << :type_error
+    error(RangeError) { str[Float::INFINITY] } && error(RangeError) { str.slice(Float::INFINITY) } || failures << :range_error
+
+    return "ok" if failures.empty?
+    {failures: failures}
+  end
+
+  test
+RUBY
+
+# opt_duparray_send :include?
+assert_equal '[true, false]', <<~'RUBY'
+  def test(x)
+    [:a, :b].include?(x)
+  end
+
+  [
+    test(:b),
+    test(:c),
+  ]
+RUBY
+
+# opt_newarray_send :include?
+assert_equal '[true, false]', <<~'RUBY'
+  def test(x)
+    [Object.new, :a, :b].include?(x.to_sym)
+  end
+
+  [
+    test("b"),
+    test("c"),
+  ]
+RUBY
+
+# YARV: swap and opt_reverse
+assert_equal '["x", "Y", "c", "A", "t", "A", "b", "C", "d"]', <<~'RUBY'
+  class Swap
+    def initialize(s)
+      @a, @b, @c, @d = s.split("")
+    end
+
+    def swap
+      a, b = @a, @b
+      b = b.upcase
+      @a, @b = a, b
+    end
+
+    def reverse_odd
+      a, b, c = @a, @b, @c
+      b = b.upcase
+      @a, @b, @c = a, b, c
+    end
+
+    def reverse_even
+      a, b, c, d = @a, @b, @c, @d
+      a = a.upcase
+      c = c.upcase
+      @a, @b, @c, @d = a, b, c, d
+    end
+  end
+
+  Swap.new("xy").swap + Swap.new("cat").reverse_odd + Swap.new("abcd").reverse_even
+RUBY
+
+assert_normal_exit %{
+  class Bug20997
+    def foo(&) = self.class.name(&)
+
+    new.foo
+  end
+}
+
+# This used to trigger a "try to mark T_NONE"
+# due to an uninitialized local in foo.
+assert_normal_exit %{
+  def foo(...)
+    _local_that_should_nil_on_call = GC.start
+  end
+
+  def test_bug21021
+    puts [], [], [], [], [], []
+    foo []
+  end
+
+  GC.stress = true
+  test_bug21021
+}
+
+assert_equal 'nil', %{
+  def foo(...)
+    _a = _b = _c = binding.local_variable_get(:_c)
+
+    _c
+  end
+
+  # [Bug #21021]
+  def test_local_fill_in_forwardable
+    puts [], [], [], [], []
+    foo []
+  end
+
+  test_local_fill_in_forwardable.inspect
+}
diff --git a/bootstraptest/test_yjit_rust_port.rb b/bootstraptest/test_yjit_rust_port.rb
index e399e0e49ef637..2dbcebc03a780d 100644
--- a/bootstraptest/test_yjit_rust_port.rb
+++ b/bootstraptest/test_yjit_rust_port.rb
@@ -374,7 +374,7 @@ def nimai(jita)
   r = Ractor.new do
     'ok'
   end
-  r.take
+  r.value
 }
 
 # Passed arguments to Ractor.new will be a block parameter
@@ -384,7 +384,7 @@ def nimai(jita)
   r = Ractor.new 'ok' do |msg|
     msg
   end
-  r.take
+  r.value
 }
 
 # Pass multiple arguments to Ractor.new
@@ -393,7 +393,7 @@ def nimai(jita)
   r =  Ractor.new 'ping', 'pong' do |msg, msg2|
     [msg, msg2]
   end
-  'ok' if r.take == ['ping', 'pong']
+  'ok' if r.value == ['ping', 'pong']
 }
 
 # Ractor#send passes an object with copy to a Ractor
@@ -403,7 +403,7 @@ def nimai(jita)
     msg = Ractor.receive
   end
   r.send 'ok'
-  r.take
+  r.value
 }
 
 assert_equal '[1, 2, 3]', %q{
diff --git a/builtin.c b/builtin.c
index aef5b2c2d44b30..3207704b28a096 100644
--- a/builtin.c
+++ b/builtin.c
@@ -3,15 +3,15 @@
 #include "iseq.h"
 #include "builtin.h"
 
-#ifdef CROSS_COMPILING
+#include "builtin_binary.inc"
+
+#ifndef BUILTIN_BINARY_SIZE
 
-#define INCLUDED_BY_BUILTIN_C 1
+#define BUILTIN_LOADED(feature_name, iseq) ((void)0)
 #include "mini_builtin.c"
 
 #else
 
-#include "builtin_binary.inc"
-
 static const unsigned char *
 bin4feature(const struct builtin_binary *bb, const char *feature, size_t *psize)
 {
@@ -32,8 +32,8 @@ builtin_lookup(const char *feature, size_t *psize)
     return bin;
 }
 
-void
-rb_load_with_builtin_functions(const char *feature_name, const struct rb_builtin_function *table)
+static void
+load_with_builtin_functions(const char *feature_name, const struct rb_builtin_function *table)
 {
     // search binary
     size_t size;
@@ -46,17 +46,37 @@ rb_load_with_builtin_functions(const char *feature_name, const struct rb_builtin
     rb_vm_t *vm = GET_VM();
     if (vm->builtin_function_table != NULL) rb_bug("vm->builtin_function_table should be NULL.");
     vm->builtin_function_table = table;
-    vm->builtin_inline_index = 0;
     const rb_iseq_t *iseq = rb_iseq_ibf_load_bytes((const char *)bin, size);
     ASSUME(iseq); // otherwise an exception should have raised
     vm->builtin_function_table = NULL;
 
+    rb_namespace_enable_builtin();
+
     // exec
-    rb_iseq_eval(rb_iseq_check(iseq));
+    if (rb_namespace_available() && rb_mNamespaceRefiner) {
+        rb_iseq_eval_with_refinement(rb_iseq_check(iseq), rb_mNamespaceRefiner);
+    }
+    else {
+        rb_iseq_eval(rb_iseq_check(iseq));
+    }
+
+    rb_namespace_disable_builtin();
+}
+
+void
+rb_load_with_builtin_functions(const char *feature_name, const struct rb_builtin_function *table)
+{
+    load_with_builtin_functions(feature_name, table);
 }
 
 #endif
 
+void
+rb_free_loaded_builtin_table(void)
+{
+    // do nothing
+}
+
 void
 Init_builtin(void)
 {
@@ -66,5 +86,5 @@ Init_builtin(void)
 void
 Init_builtin_features(void)
 {
-    rb_load_with_builtin_functions("gem_prelude", NULL);
+    load_with_builtin_functions("gem_prelude", NULL);
 }
diff --git a/builtin.h b/builtin.h
index 85fd1a009a24f5..fd1c4c307fc62b 100644
--- a/builtin.h
+++ b/builtin.h
@@ -15,7 +15,7 @@ struct rb_builtin_function {
 
 #define RB_BUILTIN_FUNCTION(_i, _name, _fname, _arity) {\
   .name = _i < 0 ? NULL : #_name, \
-  .func_ptr = (void *)_fname, \
+  .func_ptr = (void *)(uintptr_t)_fname, \
   .argc = _arity, \
   .index = _i, \
 }
@@ -106,6 +106,14 @@ rb_vm_lvar(rb_execution_context_t *ec, int index)
 #endif
 }
 
+static inline VALUE
+rb_builtin_basic_definition_p(rb_execution_context_t *ec, VALUE klass, VALUE id_sym)
+{
+    return rb_method_basic_definition_p(klass, rb_sym2id(id_sym)) ? Qtrue : Qfalse;
+}
+
+#define LOCAL_PTR(local) local ## __ptr
+
 // dump/load
 
 struct builtin_binary {
diff --git a/ccan/list/list.h b/ccan/list/list.h
index 30b2af04e954ad..bf692a6937b8a2 100644
--- a/ccan/list/list.h
+++ b/ccan/list/list.h
@@ -635,14 +635,16 @@ static inline void ccan_list_prepend_list_(struct ccan_list_head *to,
 
 /* internal macros, do not use directly */
 #define ccan_list_for_each_off_dir_(h, i, off, dir)				\
-	for (i = ccan_list_node_to_off_(ccan_list_debug(h, CCAN_LIST_LOC)->n.dir,	\
+	for (i = 0, \
+	     i = ccan_list_node_to_off_(ccan_list_debug(h, CCAN_LIST_LOC)->n.dir, \
 				   (off));				\
 	ccan_list_node_from_off_((void *)i, (off)) != &(h)->n;		\
 	i = ccan_list_node_to_off_(ccan_list_node_from_off_((void *)i, (off))->dir, \
 			      (off)))
 
 #define ccan_list_for_each_safe_off_dir_(h, i, nxt, off, dir)		\
-	for (i = ccan_list_node_to_off_(ccan_list_debug(h, CCAN_LIST_LOC)->n.dir,	\
+	for (i = 0, \
+	     i = ccan_list_node_to_off_(ccan_list_debug(h, CCAN_LIST_LOC)->n.dir, \
 				   (off)),				\
 	nxt = ccan_list_node_to_off_(ccan_list_node_from_off_(i, (off))->dir,	\
 				(off));					\
diff --git a/class.c b/class.c
index e0222d47342571..bef54eae2f38c1 100644
--- a/class.c
+++ b/class.c
@@ -24,46 +24,53 @@
 #include "internal/class.h"
 #include "internal/eval.h"
 #include "internal/hash.h"
+#include "internal/namespace.h"
 #include "internal/object.h"
 #include "internal/string.h"
 #include "internal/variable.h"
 #include "ruby/st.h"
 #include "vm_core.h"
+#include "yjit.h"
 
 /* Flags of T_CLASS
  *
- * 2:     RCLASS_SUPERCLASSES_INCLUDE_SELF
- *            The RCLASS_SUPERCLASSES contains the class as the last element.
- *            This means that this class owns the RCLASS_SUPERCLASSES list.
- * if !SHAPE_IN_BASIC_FLAGS
- * 4-19: SHAPE_FLAG_MASK
- *           Shape ID for the class.
- * endif
+ * 0:    RCLASS_IS_ROOT
+ *           The class has been added to the VM roots. Will always be marked and pinned.
+ *           This is done for classes defined from C to allow storing them in global variables.
+ * 1:    RUBY_FL_SINGLETON
+ *           This class is a singleton class.
+ * 2:    RCLASS_PRIME_CLASSEXT_PRIME_WRITABLE
+ *           This class's prime classext is the only classext and writable from any namespaces.
+ *           If unset, the prime classext is writable only from the root namespace.
+ * 3:    RCLASS_IS_INITIALIZED
+ *           Class has been initialized.
+ * 4:    RCLASS_NAMESPACEABLE
+ *           Is a builtin class that may be namespaced. It larger than a normal class.
  */
 
 /* Flags of T_ICLASS
  *
- * 0:    RICLASS_IS_ORIGIN
- * 3:    RICLASS_ORIGIN_SHARED_MTBL
- *           The T_ICLASS does not own the method table.
- * if !SHAPE_IN_BASIC_FLAGS
- * 4-19: SHAPE_FLAG_MASK
- *           Shape ID. This is set but not used.
- * endif
+ * 2:    RCLASS_PRIME_CLASSEXT_PRIME_WRITABLE
+ *           This module's prime classext is the only classext and writable from any namespaces.
+ *           If unset, the prime classext is writable only from the root namespace.
+ * 4:    RCLASS_NAMESPACEABLE
+ *           Is a builtin class that may be namespaced. It larger than a normal class.
  */
 
 /* Flags of T_MODULE
  *
- * 1:    RMODULE_ALLOCATED_BUT_NOT_INITIALIZED
- *           Module has not been initialized.
- * 2:    RCLASS_SUPERCLASSES_INCLUDE_SELF
- *           See RCLASS_SUPERCLASSES_INCLUDE_SELF in T_CLASS.
- * 3:    RMODULE_IS_REFINEMENT
+ * 0:    RCLASS_IS_ROOT
+ *           The class has been added to the VM roots. Will always be marked and pinned.
+ *           This is done for classes defined from C to allow storing them in global variables.
+ * 1:    RMODULE_IS_REFINEMENT
  *           Module is used for refinements.
- * if !SHAPE_IN_BASIC_FLAGS
- * 4-19: SHAPE_FLAG_MASK
- *           Shape ID for the module.
- * endif
+ * 2:    RCLASS_PRIME_CLASSEXT_PRIME_WRITABLE
+ *           This module's prime classext is the only classext and writable from any namespaces.
+ *           If unset, the prime classext is writable only from the root namespace.
+ * 3:    RCLASS_IS_INITIALIZED
+ *           Module has been initialized.
+ * 4:    RCLASS_NAMESPACEABLE
+ *           Is a builtin class that may be namespaced. It larger than a normal class.
  */
 
 #define METACLASS_OF(k) RBASIC(k)->klass
@@ -71,122 +78,527 @@
 
 RUBY_EXTERN rb_serial_t ruby_vm_global_cvar_state;
 
-static rb_subclass_entry_t *
-push_subclass_entry_to_list(VALUE super, VALUE klass)
+struct duplicate_id_tbl_data {
+    struct rb_id_table *tbl;
+    VALUE klass;
+};
+
+static enum rb_id_table_iterator_result
+duplicate_classext_id_table_i(ID key, VALUE value, void *data)
+{
+    struct rb_id_table *tbl = (struct rb_id_table *)data;
+    rb_id_table_insert(tbl, key, value);
+    return ID_TABLE_CONTINUE;
+}
+
+static enum rb_id_table_iterator_result
+duplicate_classext_m_tbl_i(ID key, VALUE value, void *data)
+{
+    struct duplicate_id_tbl_data *arg = (struct duplicate_id_tbl_data *)data;
+    rb_method_entry_t *me = (rb_method_entry_t *)value;
+    rb_method_table_insert0(arg->klass, arg->tbl, key, me, false);
+    return ID_TABLE_CONTINUE;
+}
+
+static struct rb_id_table *
+duplicate_classext_m_tbl(struct rb_id_table *orig, VALUE klass, bool init_missing)
+{
+    struct rb_id_table *tbl;
+    if (!orig) {
+        if (init_missing)
+            return rb_id_table_create(0);
+        else
+            return NULL;
+    }
+    tbl = rb_id_table_create(rb_id_table_size(orig));
+    struct duplicate_id_tbl_data data = {
+        .tbl = tbl,
+        .klass = klass,
+    };
+    rb_id_table_foreach(orig, duplicate_classext_m_tbl_i, &data);
+    return tbl;
+}
+
+static struct rb_id_table *
+duplicate_classext_id_table(struct rb_id_table *orig, bool init_missing)
+{
+    struct rb_id_table *tbl;
+
+    if (!orig) {
+        if (init_missing)
+            return rb_id_table_create(0);
+        else
+            return NULL;
+    }
+    tbl = rb_id_table_create(rb_id_table_size(orig));
+    rb_id_table_foreach(orig, duplicate_classext_id_table_i, tbl);
+    return tbl;
+}
+
+static rb_const_entry_t *
+duplicate_classext_const_entry(rb_const_entry_t *src, VALUE klass)
+{
+    // See also: setup_const_entry (variable.c)
+    rb_const_entry_t *dst = ZALLOC(rb_const_entry_t);
+
+    dst->flag = src->flag;
+    dst->line = src->line;
+    RB_OBJ_WRITE(klass, &dst->value, src->value);
+    RB_OBJ_WRITE(klass, &dst->file, src->file);
+
+    return dst;
+}
+
+static enum rb_id_table_iterator_result
+duplicate_classext_const_tbl_i(ID key, VALUE value, void *data)
+{
+    struct duplicate_id_tbl_data *arg = (struct duplicate_id_tbl_data *)data;
+    rb_const_entry_t *entry = duplicate_classext_const_entry((rb_const_entry_t *)value, arg->klass);
+
+    rb_id_table_insert(arg->tbl, key, (VALUE)entry);
+
+    return ID_TABLE_CONTINUE;
+}
+
+static struct rb_id_table *
+duplicate_classext_const_tbl(struct rb_id_table *src, VALUE klass)
+{
+    struct rb_id_table *dst;
+
+    if (!src)
+        return NULL;
+
+    dst = rb_id_table_create(rb_id_table_size(src));
+
+    struct duplicate_id_tbl_data data = {
+        .tbl = dst,
+        .klass = klass,
+    };
+    rb_id_table_foreach(src, duplicate_classext_const_tbl_i, (void *)&data);
+
+    return dst;
+}
+
+static VALUE
+namespace_subclasses_tbl_key(const rb_namespace_t *ns)
+{
+    if (!ns){
+        return 0;
+    }
+    return (VALUE)ns->ns_id;
+}
+
+static void
+duplicate_classext_subclasses(rb_classext_t *orig, rb_classext_t *copy)
+{
+    rb_subclass_anchor_t *anchor, *orig_anchor;
+    rb_subclass_entry_t *head, *cur, *cdr, *entry, *first = NULL;
+    rb_ns_subclasses_t *ns_subclasses;
+    struct st_table *tbl;
+
+    if (RCLASSEXT_SUBCLASSES(orig)) {
+        orig_anchor = RCLASSEXT_SUBCLASSES(orig);
+        ns_subclasses = orig_anchor->ns_subclasses;
+        tbl = ((rb_ns_subclasses_t *)ns_subclasses)->tbl;
+
+        anchor = ZALLOC(rb_subclass_anchor_t);
+        anchor->ns_subclasses = rb_ns_subclasses_ref_inc(ns_subclasses);
+
+        head = ZALLOC(rb_subclass_entry_t);
+        anchor->head = head;
+
+        RCLASSEXT_SUBCLASSES(copy) = anchor;
+
+        cur = head;
+        entry = orig_anchor->head;
+        RUBY_ASSERT(!entry->klass);
+        // The head entry has NULL klass always. See rb_class_foreach_subclass().
+        entry = entry->next;
+        while (entry) {
+            if (rb_objspace_garbage_object_p(entry->klass)) {
+                entry = entry->next;
+                continue;
+            }
+            cdr = ZALLOC(rb_subclass_entry_t);
+            cdr->klass = entry->klass;
+            cdr->prev = cur;
+            cur->next = cdr;
+            if (!first) {
+                VALUE ns_id = namespace_subclasses_tbl_key(RCLASSEXT_NS(copy));
+                first = cdr;
+                st_insert(tbl, ns_id, (st_data_t)first);
+            }
+            cur = cdr;
+            entry = entry->next;
+        }
+    }
+
+    if (RCLASSEXT_NS_SUPER_SUBCLASSES(orig))
+        RCLASSEXT_NS_SUPER_SUBCLASSES(copy) = rb_ns_subclasses_ref_inc(RCLASSEXT_NS_SUPER_SUBCLASSES(orig));
+    if (RCLASSEXT_NS_MODULE_SUBCLASSES(orig))
+        RCLASSEXT_NS_MODULE_SUBCLASSES(copy) = rb_ns_subclasses_ref_inc(RCLASSEXT_NS_MODULE_SUBCLASSES(orig));
+}
+
+static void
+class_duplicate_iclass_classext(VALUE iclass, rb_classext_t *mod_ext, const rb_namespace_t *ns)
+{
+    RUBY_ASSERT(RB_TYPE_P(iclass, T_ICLASS));
+
+    rb_classext_t *src = RCLASS_EXT_PRIME(iclass);
+    rb_classext_t *ext = RCLASS_EXT_TABLE_LOOKUP_INTERNAL(iclass, ns);
+    int first_set = 0;
+
+    if (ext) {
+        // iclass classext for the ns is only for cc/callable_m_tbl if it's created earlier than module's one
+        rb_invalidate_method_caches(RCLASSEXT_CALLABLE_M_TBL(ext), RCLASSEXT_CC_TBL(ext));
+    }
+
+    ext = ZALLOC(rb_classext_t);
+
+    RCLASSEXT_NS(ext) = ns;
+
+    RCLASSEXT_SUPER(ext) = RCLASSEXT_SUPER(src);
+
+    // See also: rb_include_class_new()
+    if (RCLASSEXT_ICLASS_IS_ORIGIN(src) && !RCLASSEXT_ICLASS_ORIGIN_SHARED_MTBL(src)) {
+        RCLASSEXT_M_TBL(ext) = duplicate_classext_m_tbl(RCLASSEXT_M_TBL(src), iclass, true);
+    }
+    else {
+        RCLASSEXT_M_TBL(ext) = RCLASSEXT_M_TBL(mod_ext);
+    }
+
+    RCLASSEXT_CONST_TBL(ext) = RCLASSEXT_CONST_TBL(mod_ext);
+    RCLASSEXT_CVC_TBL(ext) = RCLASSEXT_CVC_TBL(mod_ext);
+
+    // Those are cache and should be recreated when methods are called
+    // RCLASSEXT_CALLABLE_M_TBL(ext) = NULL;
+    // RCLASSEXT_CC_TBL(ext) = NULL;
+
+    // subclasses, namespace_super_subclasses_tbl, namespace_module_subclasses_tbl
+    duplicate_classext_subclasses(src, ext);
+
+    RCLASSEXT_SET_ORIGIN(ext, iclass, RCLASSEXT_ORIGIN(src));
+    RCLASSEXT_ICLASS_IS_ORIGIN(ext) = RCLASSEXT_ICLASS_IS_ORIGIN(src);
+    RCLASSEXT_ICLASS_ORIGIN_SHARED_MTBL(ext) = RCLASSEXT_ICLASS_ORIGIN_SHARED_MTBL(src);
+
+    RCLASSEXT_SET_INCLUDER(ext, iclass, RCLASSEXT_INCLUDER(src));
+
+    first_set = RCLASS_SET_NAMESPACE_CLASSEXT(iclass, ns, ext);
+    if (first_set) {
+        RCLASS_SET_PRIME_CLASSEXT_WRITABLE(iclass, false);
+    }
+}
+
+rb_classext_t *
+rb_class_duplicate_classext(rb_classext_t *orig, VALUE klass, const rb_namespace_t *ns)
+{
+    VM_ASSERT(RB_TYPE_P(klass, T_CLASS) || RB_TYPE_P(klass, T_MODULE) || RB_TYPE_P(klass, T_ICLASS));
+
+    rb_classext_t *ext = ZALLOC(rb_classext_t);
+    bool dup_iclass = RB_TYPE_P(klass, T_MODULE) ? true : false;
+
+    RCLASSEXT_NS(ext) = ns;
+
+    RCLASSEXT_SUPER(ext) = RCLASSEXT_SUPER(orig);
+
+    RCLASSEXT_M_TBL(ext) = duplicate_classext_m_tbl(RCLASSEXT_M_TBL(orig), klass, dup_iclass);
+
+    if (orig->fields_obj) {
+        RB_OBJ_WRITE(klass, &ext->fields_obj, rb_imemo_fields_clone(orig->fields_obj));
+    }
+
+    if (RCLASSEXT_SHARED_CONST_TBL(orig)) {
+        RCLASSEXT_CONST_TBL(ext) = RCLASSEXT_CONST_TBL(orig);
+        RCLASSEXT_SHARED_CONST_TBL(ext) = true;
+    }
+    else {
+        RCLASSEXT_CONST_TBL(ext) = duplicate_classext_const_tbl(RCLASSEXT_CONST_TBL(orig), klass);
+        RCLASSEXT_SHARED_CONST_TBL(ext) = false;
+    }
+    /*
+     * callable_m_tbl is for `super` chain, and entries will be created when the super chain is called.
+     * so initially, it can be NULL and let it be created lazily.
+     * RCLASSEXT_CALLABLE_M_TBL(ext) = NULL;
+     *
+     * cc_tbl is for method inline cache, and method calls from different namespaces never occur on
+     * the same code, so the copied classext should have a different cc_tbl from the prime one.
+     * RCLASSEXT_CC_TBL(copy) = NULL
+     */
+
+    RCLASSEXT_CVC_TBL(ext) = duplicate_classext_id_table(RCLASSEXT_CVC_TBL(orig), dup_iclass);
+
+    // subclasses, subclasses_index
+    duplicate_classext_subclasses(orig, ext);
+
+    RCLASSEXT_SET_ORIGIN(ext, klass, RCLASSEXT_ORIGIN(orig));
+    /*
+     * Members not copied to namespace classext values
+     * * refined_class
+     * * as.class.allocator / as.singleton_class.attached_object
+     * * includer
+     * * max IV count
+     * * variation count
+     */
+    RCLASSEXT_PERMANENT_CLASSPATH(ext) = RCLASSEXT_PERMANENT_CLASSPATH(orig);
+    RCLASSEXT_CLONED(ext) = RCLASSEXT_CLONED(orig);
+    RCLASSEXT_CLASSPATH(ext) = RCLASSEXT_CLASSPATH(orig);
+
+    /* For the usual T_CLASS/T_MODULE, iclass flags are always false */
+
+    if (dup_iclass) {
+        VALUE iclass;
+        /*
+         * ICLASS has the same m_tbl/const_tbl/cvc_tbl with the included module.
+         * So the module's classext is copied, its tables should be also referred
+         * by the ICLASS's classext for the namespace.
+         */
+        rb_subclass_anchor_t *anchor = RCLASSEXT_SUBCLASSES(ext);
+        rb_subclass_entry_t *subclass_entry = anchor->head;
+        while (subclass_entry) {
+            if (subclass_entry->klass && RB_TYPE_P(subclass_entry->klass, T_ICLASS)) {
+                iclass = subclass_entry->klass;
+                if (RBASIC_CLASS(iclass) == klass) {
+                    // Is the subclass an ICLASS including this module into another class
+                    // If so we need to re-associate it under our namespace with the new ext
+                    class_duplicate_iclass_classext(iclass, ext, ns);
+                }
+            }
+            subclass_entry = subclass_entry->next;
+        }
+    }
+
+    return ext;
+}
+
+void
+rb_class_ensure_writable(VALUE klass)
+{
+    VM_ASSERT(RB_TYPE_P(klass, T_CLASS) || RB_TYPE_P(klass, T_MODULE) || RB_TYPE_P(klass, T_ICLASS));
+    RCLASS_EXT_WRITABLE(klass);
+}
+
+struct class_classext_foreach_arg {
+    rb_class_classext_foreach_callback_func *func;
+    void * callback_arg;
+};
+
+static int
+class_classext_foreach_i(st_data_t key, st_data_t value, st_data_t arg)
+{
+    struct class_classext_foreach_arg *foreach_arg = (struct class_classext_foreach_arg *)arg;
+    rb_class_classext_foreach_callback_func *func = foreach_arg->func;
+    func((rb_classext_t *)value, false, (VALUE)key, foreach_arg->callback_arg);
+    return ST_CONTINUE;
+}
+
+void
+rb_class_classext_foreach(VALUE klass, rb_class_classext_foreach_callback_func *func, void *arg)
+{
+    st_table *tbl = RCLASS_CLASSEXT_TBL(klass);
+    struct class_classext_foreach_arg foreach_arg;
+    if (tbl) {
+        foreach_arg.func = func;
+        foreach_arg.callback_arg = arg;
+        rb_st_foreach(tbl, class_classext_foreach_i, (st_data_t)&foreach_arg);
+    }
+    func(RCLASS_EXT_PRIME(klass), true, (VALUE)NULL, arg);
+}
+
+VALUE
+rb_class_super_of(VALUE klass)
+{
+    return RCLASS_SUPER(klass);
+}
+
+VALUE
+rb_class_singleton_p(VALUE klass)
+{
+    return RCLASS_SINGLETON_P(klass);
+}
+
+unsigned char
+rb_class_variation_count(VALUE klass)
+{
+    return RCLASS_VARIATION_COUNT(klass);
+}
+
+static void
+push_subclass_entry_to_list(VALUE super, VALUE klass, bool is_module)
 {
     rb_subclass_entry_t *entry, *head;
+    rb_subclass_anchor_t *anchor;
+    rb_ns_subclasses_t *ns_subclasses;
+    struct st_table *tbl;
+    const rb_namespace_t *ns = rb_current_namespace();
 
     entry = ZALLOC(rb_subclass_entry_t);
     entry->klass = klass;
 
-    head = RCLASS_SUBCLASSES(super);
-    if (!head) {
-        head = ZALLOC(rb_subclass_entry_t);
-        RCLASS_SUBCLASSES(super) = head;
-    }
-    entry->next = head->next;
-    entry->prev = head;
+    RB_VM_LOCKING() {
+        anchor = RCLASS_WRITABLE_SUBCLASSES(super);
+        VM_ASSERT(anchor);
+        ns_subclasses = (rb_ns_subclasses_t *)anchor->ns_subclasses;
+        VM_ASSERT(ns_subclasses);
+        tbl = ns_subclasses->tbl;
+        VM_ASSERT(tbl);
 
-    if (head->next) {
-        head->next->prev = entry;
+        head = anchor->head;
+        if (head->next) {
+            head->next->prev = entry;
+            entry->next = head->next;
+        }
+        head->next = entry;
+        entry->prev = head;
+        st_insert(tbl, namespace_subclasses_tbl_key(ns), (st_data_t)entry);
     }
-    head->next = entry;
 
-    return entry;
+    if (is_module) {
+        RCLASS_WRITE_NS_MODULE_SUBCLASSES(klass, anchor->ns_subclasses);
+    }
+    else {
+        RCLASS_WRITE_NS_SUPER_SUBCLASSES(klass, anchor->ns_subclasses);
+    }
 }
 
 void
 rb_class_subclass_add(VALUE super, VALUE klass)
 {
     if (super && !UNDEF_P(super)) {
-        rb_subclass_entry_t *entry = push_subclass_entry_to_list(super, klass);
-        RCLASS_SUBCLASS_ENTRY(klass) = entry;
+        push_subclass_entry_to_list(super, klass, false);
     }
 }
 
 static void
 rb_module_add_to_subclasses_list(VALUE module, VALUE iclass)
 {
-    rb_subclass_entry_t *entry = push_subclass_entry_to_list(module, iclass);
-    RCLASS_MODULE_SUBCLASS_ENTRY(iclass) = entry;
+    if (module && !UNDEF_P(module)) {
+        push_subclass_entry_to_list(module, iclass, true);
+    }
 }
 
 void
-rb_class_remove_subclass_head(VALUE klass)
+rb_class_remove_subclass_head(VALUE klass) // TODO: check this is still used and required
 {
-    rb_subclass_entry_t *head = RCLASS_SUBCLASSES(klass);
+    rb_classext_t *ext = RCLASS_EXT_WRITABLE(klass);
+    rb_class_classext_free_subclasses(ext, klass);
+}
 
-    if (head) {
-        if (head->next) {
-            head->next->prev = NULL;
-        }
-        RCLASS_SUBCLASSES(klass) = NULL;
-        xfree(head);
+static struct rb_subclass_entry *
+class_get_subclasses_for_ns(struct st_table *tbl, VALUE ns_id)
+{
+    st_data_t value;
+    if (st_lookup(tbl, (st_data_t)ns_id, &value)) {
+        return (struct rb_subclass_entry *)value;
     }
+    return NULL;
 }
 
-void
-rb_class_remove_from_super_subclasses(VALUE klass)
+static void
+remove_class_from_subclasses(struct st_table *tbl, VALUE ns_id, VALUE klass)
 {
-    rb_subclass_entry_t *entry = RCLASS_SUBCLASS_ENTRY(klass);
+    rb_subclass_entry_t *entry = class_get_subclasses_for_ns(tbl, ns_id);
+    bool first_entry = true;
+    while (entry) {
+        if (entry->klass == klass) {
+            rb_subclass_entry_t *prev = entry->prev, *next = entry->next;
 
-    if (entry) {
-        rb_subclass_entry_t *prev = entry->prev, *next = entry->next;
+            if (prev) {
+                prev->next = next;
+            }
+            if (next) {
+                next->prev = prev;
+            }
+
+            xfree(entry);
 
-        if (prev) {
-            prev->next = next;
+            if (first_entry) {
+                if (next) {
+                    st_insert(tbl, ns_id, (st_data_t)next);
+                }
+                else {
+                    // no subclass entries in this ns
+                    st_delete(tbl, &ns_id, NULL);
+                }
+            }
+            break;
         }
-        if (next) {
-            next->prev = prev;
+        else if (first_entry) {
+            first_entry = false;
         }
-
-        xfree(entry);
+        entry = entry->next;
     }
+}
 
-    RCLASS_SUBCLASS_ENTRY(klass) = NULL;
+void
+rb_class_remove_from_super_subclasses(VALUE klass)
+{
+    rb_classext_t *ext = RCLASS_EXT_WRITABLE(klass);
+    rb_ns_subclasses_t *ns_subclasses = RCLASSEXT_NS_SUPER_SUBCLASSES(ext);
+
+    if (!ns_subclasses) return;
+    remove_class_from_subclasses(ns_subclasses->tbl, namespace_subclasses_tbl_key(RCLASSEXT_NS(ext)), klass);
+    rb_ns_subclasses_ref_dec(ns_subclasses);
+    RCLASSEXT_NS_SUPER_SUBCLASSES(ext) = 0;
 }
 
 void
 rb_class_remove_from_module_subclasses(VALUE klass)
 {
-    rb_subclass_entry_t *entry = RCLASS_MODULE_SUBCLASS_ENTRY(klass);
+    rb_classext_t *ext = RCLASS_EXT_WRITABLE(klass);
+    rb_ns_subclasses_t *ns_subclasses = RCLASSEXT_NS_MODULE_SUBCLASSES(ext);
 
-    if (entry) {
-        rb_subclass_entry_t *prev = entry->prev, *next = entry->next;
+    if (!ns_subclasses) return;
+    remove_class_from_subclasses(ns_subclasses->tbl, namespace_subclasses_tbl_key(RCLASSEXT_NS(ext)), klass);
+    rb_ns_subclasses_ref_dec(ns_subclasses);
+    RCLASSEXT_NS_MODULE_SUBCLASSES(ext) = 0;
+}
 
-        if (prev) {
-            prev->next = next;
-        }
-        if (next) {
-            next->prev = prev;
-        }
+void
+rb_class_classext_free_subclasses(rb_classext_t *ext, VALUE klass)
+{
+    rb_subclass_anchor_t *anchor = RCLASSEXT_SUBCLASSES(ext);
+    struct st_table *tbl = anchor->ns_subclasses->tbl;
+    VALUE ns_id = namespace_subclasses_tbl_key(RCLASSEXT_NS(ext));
+    rb_subclass_entry_t *next, *entry = anchor->head;
 
+    while (entry) {
+        next = entry->next;
         xfree(entry);
+        entry = next;
     }
+    VM_ASSERT(
+        rb_ns_subclasses_ref_count(anchor->ns_subclasses) > 0,
+        "ns_subclasses refcount (%p) %ld", anchor->ns_subclasses, rb_ns_subclasses_ref_count(anchor->ns_subclasses));
+    st_delete(tbl, &ns_id, NULL);
+    rb_ns_subclasses_ref_dec(anchor->ns_subclasses);
+    xfree(anchor);
 
-    RCLASS_MODULE_SUBCLASS_ENTRY(klass) = NULL;
+    if (RCLASSEXT_NS_SUPER_SUBCLASSES(ext)) {
+        rb_ns_subclasses_t *ns_sub = RCLASSEXT_NS_SUPER_SUBCLASSES(ext);
+        remove_class_from_subclasses(ns_sub->tbl, ns_id, klass);
+        rb_ns_subclasses_ref_dec(ns_sub);
+    }
+    if (RCLASSEXT_NS_MODULE_SUBCLASSES(ext)) {
+        rb_ns_subclasses_t *ns_sub = RCLASSEXT_NS_MODULE_SUBCLASSES(ext);
+        remove_class_from_subclasses(ns_sub->tbl, ns_id, klass);
+        rb_ns_subclasses_ref_dec(ns_sub);
+    }
 }
 
 void
 rb_class_foreach_subclass(VALUE klass, void (*f)(VALUE, VALUE), VALUE arg)
 {
-    // RCLASS_SUBCLASSES should always point to our head element which has NULL klass
-    rb_subclass_entry_t *cur = RCLASS_SUBCLASSES(klass);
-    // if we have a subclasses list, then the head is a placeholder with no valid
-    // class. So ignore it and use the next element in the list (if one exists)
-    if (cur) {
-        RUBY_ASSERT(!cur->klass);
-        cur = cur->next;
-    }
-
+    rb_subclass_entry_t *tmp;
+    rb_subclass_entry_t *cur = RCLASS_SUBCLASSES_FIRST(klass);
     /* do not be tempted to simplify this loop into a for loop, the order of
        operations is important here if `f` modifies the linked list */
     while (cur) {
         VALUE curklass = cur->klass;
-        cur = cur->next;
+        tmp = cur->next;
         // do not trigger GC during f, otherwise the cur will become
         // a dangling pointer if the subclass is collected
         f(curklass, arg);
+        cur = tmp;
     }
 }
 
@@ -214,75 +626,159 @@ rb_class_detach_module_subclasses(VALUE klass)
     rb_class_foreach_subclass(klass, class_detach_module_subclasses, Qnil);
 }
 
+static void
+class_switch_superclass(VALUE super, VALUE klass)
+{
+    class_detach_subclasses(klass, Qnil);
+    rb_class_subclass_add(super, klass);
+}
+
 /**
- * Allocates a struct RClass for a new class.
+ * Allocates a struct RClass for a new class, iclass, or module.
  *
- * \param flags     initial value for basic.flags of the returned class.
- * \param klass     the class of the returned class.
- * \return          an uninitialized Class object.
- * \pre  \p klass must refer \c Class class or an ancestor of Class.
- * \pre  \code (flags | T_CLASS) != 0  \endcode
- * \post the returned class can safely be \c #initialize 'd.
+ * @param type      The type of the RClass (T_CLASS, T_ICLASS, or T_MODULE)
+ * @param klass     value for basic.klass of the returned object.
+ * @return          an uninitialized Class/IClass/Module object.
+ * @pre  `klass` must refer to a class or module
  *
- * \note this function is not Class#allocate.
+ * @note this function is not Class#allocate.
  */
 static VALUE
-class_alloc(VALUE flags, VALUE klass)
+class_alloc0(enum ruby_value_type type, VALUE klass, bool namespaceable)
 {
-    size_t alloc_size = sizeof(struct RClass) + sizeof(rb_classext_t);
+    rb_ns_subclasses_t *ns_subclasses;
+    rb_subclass_anchor_t *anchor;
+    const rb_namespace_t *ns = rb_definition_namespace();
 
-    flags &= T_MASK;
+    if (!ruby_namespace_init_done) {
+        namespaceable = true;
+    }
+
+    size_t alloc_size = sizeof(struct RClass_and_rb_classext_t);
+    if (namespaceable) {
+        alloc_size = sizeof(struct RClass_namespaceable);
+    }
+
+    // class_alloc is supposed to return a new object that is not promoted yet.
+    // So, we need to avoid GC after NEWOBJ_OF.
+    // To achieve that, we allocate subclass lists before NEWOBJ_OF.
+    //
+    // TODO: Note that this could cause memory leak.
+    // If NEWOBJ_OF fails with out of memory, these buffers will leak.
+    ns_subclasses = ZALLOC(rb_ns_subclasses_t);
+    ns_subclasses->refcount = 1;
+    ns_subclasses->tbl = st_init_numtable();
+    anchor = ZALLOC(rb_subclass_anchor_t);
+    anchor->ns_subclasses = ns_subclasses;
+    anchor->head = ZALLOC(rb_subclass_entry_t);
+
+    RUBY_ASSERT(type == T_CLASS || type == T_ICLASS || type == T_MODULE);
+
+    VALUE flags = type;
     if (RGENGC_WB_PROTECTED_CLASS) flags |= FL_WB_PROTECTED;
+    if (namespaceable) flags |= RCLASS_NAMESPACEABLE;
+
     NEWOBJ_OF(obj, struct RClass, klass, flags, alloc_size, 0);
 
-    memset(RCLASS_EXT(obj), 0, sizeof(rb_classext_t));
+    memset(RCLASS_EXT_PRIME(obj), 0, sizeof(rb_classext_t));
 
     /* ZALLOC
       RCLASS_CONST_TBL(obj) = 0;
       RCLASS_M_TBL(obj) = 0;
-      RCLASS_IV_INDEX_TBL(obj) = 0;
+      RCLASS_FIELDS(obj) = 0;
       RCLASS_SET_SUPER((VALUE)obj, 0);
-      RCLASS_SUBCLASSES(obj) = NULL;
-      RCLASS_PARENT_SUBCLASSES(obj) = NULL;
-      RCLASS_MODULE_SUBCLASSES(obj) = NULL;
      */
+
+    RCLASS_PRIME_NS((VALUE)obj) = ns;
+    // Classes/Modules defined in user namespaces are
+    // writable directly because it exists only in a namespace.
+    RCLASS_SET_PRIME_CLASSEXT_WRITABLE((VALUE)obj, !namespaceable || NAMESPACE_USER_P(ns));
+
     RCLASS_SET_ORIGIN((VALUE)obj, (VALUE)obj);
-    RB_OBJ_WRITE(obj, &RCLASS_REFINED_CLASS(obj), Qnil);
-    RCLASS_SET_ALLOCATOR((VALUE)obj, 0);
+    RCLASS_SET_REFINED_CLASS((VALUE)obj, Qnil);
+
+    RCLASS_SET_SUBCLASSES((VALUE)obj, anchor);
 
     return (VALUE)obj;
 }
 
+static VALUE
+class_alloc(enum ruby_value_type type, VALUE klass)
+{
+    return class_alloc0(type, klass, false);
+}
+
+static VALUE
+class_associate_super(VALUE klass, VALUE super, bool init)
+{
+    if (super && !UNDEF_P(super)) {
+        class_switch_superclass(super, klass);
+    }
+    if (init) {
+        RCLASS_SET_SUPER(klass, super);
+    }
+    else {
+        RCLASS_WRITE_SUPER(klass, super);
+    }
+    rb_class_update_superclasses(klass);
+    return super;
+}
+
+VALUE
+rb_class_set_super(VALUE klass, VALUE super)
+{
+    return class_associate_super(klass, super, false);
+}
+
 static void
-RCLASS_M_TBL_INIT(VALUE c)
+class_initialize_method_table(VALUE c)
 {
-    RCLASS_M_TBL(c) = rb_id_table_create(0);
+    // initialize the prime classext m_tbl
+    RCLASS_SET_M_TBL_EVEN_WHEN_PROMOTED(c, rb_id_table_create(0));
 }
 
-/*!
+static void
+class_clear_method_table(VALUE c)
+{
+    RCLASS_WRITE_M_TBL_EVEN_WHEN_PROMOTED(c, rb_id_table_create(0));
+}
+
+static VALUE
+class_boot_namespaceable(VALUE super, bool namespaceable)
+{
+    VALUE klass = class_alloc0(T_CLASS, rb_cClass, namespaceable);
+
+    // initialize method table prior to class_associate_super()
+    // because class_associate_super() may cause GC and promote klass
+    class_initialize_method_table(klass);
+
+    class_associate_super(klass, super, true);
+    if (super && !UNDEF_P(super)) {
+        rb_class_set_initialized(klass);
+    }
+
+    return (VALUE)klass;
+}
+
+/**
  * A utility function that wraps class_alloc.
  *
  * allocates a class and initializes safely.
- * \param super     a class from which the new class derives.
- * \return          a class object.
- * \pre  \a super must be a class.
- * \post the metaclass of the new class is Class.
+ * @param super     a class from which the new class derives.
+ * @return          a class object.
+ * @pre  `super` must be a class.
+ * @post the metaclass of the new class is Class.
  */
 VALUE
 rb_class_boot(VALUE super)
 {
-    VALUE klass = class_alloc(T_CLASS, rb_cClass);
-
-    RCLASS_SET_SUPER(klass, super);
-    RCLASS_M_TBL_INIT(klass);
-
-    return (VALUE)klass;
+    return class_boot_namespaceable(super, false);
 }
 
 static VALUE *
 class_superclasses_including_self(VALUE klass)
 {
-    if (FL_TEST_RAW(klass, RCLASS_SUPERCLASSES_INCLUDE_SELF))
+    if (RCLASS_SUPERCLASSES_WITH_SELF_P(klass))
         return RCLASS_SUPERCLASSES(klass);
 
     size_t depth = RCLASS_SUPERCLASS_DEPTH(klass);
@@ -291,14 +787,14 @@ class_superclasses_including_self(VALUE klass)
         memcpy(superclasses, RCLASS_SUPERCLASSES(klass), sizeof(VALUE) * depth);
     superclasses[depth] = klass;
 
-    RCLASS_SUPERCLASSES(klass) = superclasses;
-    FL_SET_RAW(klass, RCLASS_SUPERCLASSES_INCLUDE_SELF);
     return superclasses;
 }
 
 void
 rb_class_update_superclasses(VALUE klass)
 {
+    VALUE *superclasses;
+    size_t super_depth;
     VALUE super = RCLASS_SUPER(klass);
 
     if (!RB_TYPE_P(klass, T_CLASS)) return;
@@ -327,8 +823,17 @@ rb_class_update_superclasses(VALUE klass)
             return;
     }
 
-    RCLASS_SUPERCLASSES(klass) = class_superclasses_including_self(super);
-    RCLASS_SUPERCLASS_DEPTH(klass) = RCLASS_SUPERCLASS_DEPTH(super) + 1;
+    super_depth = RCLASS_SUPERCLASS_DEPTH(super);
+    if (RCLASS_SUPERCLASSES_WITH_SELF_P(super)) {
+        superclasses = RCLASS_SUPERCLASSES(super);
+    }
+    else {
+        superclasses = class_superclasses_including_self(super);
+        RCLASS_WRITE_SUPERCLASSES(super, super_depth, superclasses, true);
+    }
+
+    size_t depth = super_depth == RCLASS_MAX_SUPERCLASS_DEPTH ? super_depth : super_depth + 1;
+    RCLASS_WRITE_SUPERCLASSES(klass, depth, superclasses, false);
 }
 
 void
@@ -338,7 +843,7 @@ rb_check_inheritable(VALUE super)
         rb_raise(rb_eTypeError, "superclass must be an instance of Class (given an instance of %"PRIsVALUE")",
                  rb_obj_class(super));
     }
-    if (RBASIC(super)->flags & FL_SINGLETON) {
+    if (RCLASS_SINGLETON_P(super)) {
         rb_raise(rb_eTypeError, "can't make subclass of singleton class");
     }
     if (super == rb_cClass) {
@@ -354,9 +859,11 @@ rb_class_new(VALUE super)
     VALUE klass = rb_class_boot(super);
 
     if (super != rb_cObject && super != rb_cBasicObject) {
-        RCLASS_EXT(klass)->max_iv_count = RCLASS_EXT(super)->max_iv_count;
+        RCLASS_SET_MAX_IV_COUNT(klass, RCLASS_MAX_IV_COUNT(super));
     }
 
+    RUBY_ASSERT(getenv("RUBY_NAMESPACE") || RCLASS_PRIME_CLASSEXT_WRITABLE_P(klass));
+
     return klass;
 }
 
@@ -370,8 +877,7 @@ static void
 clone_method(VALUE old_klass, VALUE new_klass, ID mid, const rb_method_entry_t *me)
 {
     if (me->def->type == VM_METHOD_TYPE_ISEQ) {
-        rb_cref_t *new_cref;
-        rb_vm_rewrite_cref(me->def->body.iseq.cref, old_klass, new_klass, &new_cref);
+        rb_cref_t *new_cref = rb_vm_rewrite_cref(me->def->body.iseq.cref, old_klass, new_klass);
         rb_add_method_iseq(new_klass, mid, me->def->body.iseq.iseqptr, new_cref, METHOD_ENTRY_VISI(me));
     }
     else {
@@ -421,10 +927,10 @@ class_init_copy_check(VALUE clone, VALUE orig)
     if (orig == rb_cBasicObject) {
         rb_raise(rb_eTypeError, "can't copy the root class");
     }
-    if (RCLASS_SUPER(clone) != 0 || clone == rb_cBasicObject) {
+    if (RCLASS_INITIALIZED_P(clone)) {
         rb_raise(rb_eTypeError, "already initialized class");
     }
-    if (FL_TEST(orig, FL_SINGLETON)) {
+    if (RCLASS_SINGLETON_P(orig)) {
         rb_raise(rb_eTypeError, "can't copy singleton class");
     }
 }
@@ -459,7 +965,7 @@ copy_tables(VALUE clone, VALUE orig)
 {
     if (RCLASS_CONST_TBL(clone)) {
         rb_free_const_table(RCLASS_CONST_TBL(clone));
-        RCLASS_CONST_TBL(clone) = 0;
+        RCLASS_WRITE_CONST_TBL(clone, 0, false);
     }
     if (RCLASS_CVC_TBL(orig)) {
         struct rb_id_table *rb_cvc_tbl = RCLASS_CVC_TBL(orig);
@@ -469,51 +975,38 @@ copy_tables(VALUE clone, VALUE orig)
         ctx.clone = clone;
         ctx.new_table = rb_cvc_tbl_dup;
         rb_id_table_foreach(rb_cvc_tbl, cvc_table_copy, &ctx);
-        RCLASS_CVC_TBL(clone) = rb_cvc_tbl_dup;
+        RCLASS_WRITE_CVC_TBL(clone, rb_cvc_tbl_dup);
     }
-    RCLASS_M_TBL(clone) = 0;
+    rb_id_table_free(RCLASS_M_TBL(clone));
+    RCLASS_WRITE_M_TBL_EVEN_WHEN_PROMOTED(clone, 0);
     if (!RB_TYPE_P(clone, T_ICLASS)) {
-        st_data_t id;
-
-        rb_iv_tbl_copy(clone, orig);
-        CONST_ID(id, "__tmp_classpath__");
-        rb_attr_delete(clone, id);
-        CONST_ID(id, "__classpath__");
-        rb_attr_delete(clone, id);
+        rb_fields_tbl_copy(clone, orig);
     }
     if (RCLASS_CONST_TBL(orig)) {
         struct clone_const_arg arg;
-
-        arg.tbl = RCLASS_CONST_TBL(clone) = rb_id_table_create(0);
+        struct rb_id_table *const_tbl;
+        struct rb_id_table *orig_tbl = RCLASS_CONST_TBL(orig);
+        arg.tbl = const_tbl = rb_id_table_create(rb_id_table_size(orig_tbl));
         arg.klass = clone;
-        rb_id_table_foreach(RCLASS_CONST_TBL(orig), clone_const_i, &arg);
+        rb_id_table_foreach(orig_tbl, clone_const_i, &arg);
+        RCLASS_WRITE_CONST_TBL(clone, const_tbl, false);
     }
 }
 
 static bool ensure_origin(VALUE klass);
 
-/**
- * If this flag is set, that module is allocated but not initialized yet.
- */
-enum {RMODULE_ALLOCATED_BUT_NOT_INITIALIZED = RUBY_FL_USER1};
-
-static inline bool
-RMODULE_UNINITIALIZED(VALUE module)
-{
-    return FL_TEST_RAW(module, RMODULE_ALLOCATED_BUT_NOT_INITIALIZED);
-}
-
 void
-rb_module_set_initialized(VALUE mod)
+rb_class_set_initialized(VALUE klass)
 {
-    FL_UNSET_RAW(mod, RMODULE_ALLOCATED_BUT_NOT_INITIALIZED);
+    RUBY_ASSERT(RB_TYPE_P(klass, T_CLASS) || RB_TYPE_P(klass, T_MODULE));
+    FL_SET_RAW(klass, RCLASS_IS_INITIALIZED);
     /* no more re-initialization */
 }
 
 void
 rb_module_check_initializable(VALUE mod)
 {
-    if (!RMODULE_UNINITIALIZED(mod)) {
+    if (RCLASS_INITIALIZED_P(mod)) {
         rb_raise(rb_eTypeError, "already initialized module");
     }
 }
@@ -522,9 +1015,11 @@ rb_module_check_initializable(VALUE mod)
 VALUE
 rb_mod_init_copy(VALUE clone, VALUE orig)
 {
+    /* Only class or module is valid here, but other classes may enter here and
+     * only hit an exception on the OBJ_INIT_COPY checks
+     */
     switch (BUILTIN_TYPE(clone)) {
       case T_CLASS:
-      case T_ICLASS:
         class_init_copy_check(clone, orig);
         break;
       case T_MODULE:
@@ -535,28 +1030,37 @@ rb_mod_init_copy(VALUE clone, VALUE orig)
     }
     if (!OBJ_INIT_COPY(clone, orig)) return clone;
 
+    RUBY_ASSERT(RB_TYPE_P(orig, T_CLASS) || RB_TYPE_P(orig, T_MODULE));
+    RUBY_ASSERT(BUILTIN_TYPE(clone) == BUILTIN_TYPE(orig));
+
+    rb_class_set_initialized(clone);
+
     /* cloned flag is refer at constant inline cache
      * see vm_get_const_key_cref() in vm_insnhelper.c
      */
-    RCLASS_EXT(clone)->cloned = true;
-    RCLASS_EXT(orig)->cloned = true;
+    RCLASS_SET_CLONED(clone, true);
+    RCLASS_SET_CLONED(orig, true);
 
-    if (!FL_TEST(CLASS_OF(clone), FL_SINGLETON)) {
+    if (!RCLASS_SINGLETON_P(CLASS_OF(clone))) {
         RBASIC_SET_CLASS(clone, rb_singleton_class_clone(orig));
         rb_singleton_class_attached(METACLASS_OF(clone), (VALUE)clone);
     }
-    RCLASS_SET_ALLOCATOR(clone, RCLASS_ALLOCATOR(orig));
+    if (BUILTIN_TYPE(clone) == T_CLASS) {
+        RCLASS_SET_ALLOCATOR(clone, RCLASS_ALLOCATOR(orig));
+    }
     copy_tables(clone, orig);
     if (RCLASS_M_TBL(orig)) {
         struct clone_method_arg arg;
         arg.old_klass = orig;
         arg.new_klass = clone;
-        RCLASS_M_TBL_INIT(clone);
+        // TODO: use class_initialize_method_table() instead of RCLASS_SET_M_TBL_*
+        //       after RCLASS_SET_M_TBL is protected by write barrier
+        RCLASS_SET_M_TBL_EVEN_WHEN_PROMOTED(clone, rb_id_table_create(0));
         rb_id_table_foreach(RCLASS_M_TBL(orig), clone_method_i, &arg);
     }
 
     if (RCLASS_ORIGIN(orig) == orig) {
-        RCLASS_SET_SUPER(clone, RCLASS_SUPER(orig));
+        rb_class_set_super(clone, RCLASS_SUPER(orig));
     }
     else {
         VALUE p = RCLASS_SUPER(orig);
@@ -576,12 +1080,14 @@ rb_mod_init_copy(VALUE clone, VALUE orig)
             if (BUILTIN_TYPE(p) != T_ICLASS) {
                 rb_bug("non iclass between module/class and origin");
             }
-            clone_p = class_alloc(RBASIC(p)->flags, METACLASS_OF(p));
-            RCLASS_SET_SUPER(prev_clone_p, clone_p);
+            clone_p = class_alloc(T_ICLASS, METACLASS_OF(p));
+            /* We should set the m_tbl right after allocation before anything
+             * that can trigger GC to avoid clone_p from becoming old and
+             * needing to fire write barriers. */
+            RCLASS_SET_M_TBL(clone_p, RCLASS_M_TBL(p));
+            rb_class_set_super(prev_clone_p, clone_p);
             prev_clone_p = clone_p;
-            RCLASS_M_TBL(clone_p) = RCLASS_M_TBL(p);
-            RCLASS_CONST_TBL(clone_p) = RCLASS_CONST_TBL(p);
-            RCLASS_SET_ALLOCATOR(clone_p, RCLASS_ALLOCATOR(p));
+            RCLASS_SET_CONST_TBL(clone_p, RCLASS_CONST_TBL(p), false);
             if (RB_TYPE_P(clone, T_CLASS)) {
                 RCLASS_SET_INCLUDER(clone_p, clone);
             }
@@ -593,8 +1099,8 @@ rb_mod_init_copy(VALUE clone, VALUE orig)
             }
             else if ((origin_len = RARRAY_LEN(origin_stack)) > 1 &&
                      RARRAY_AREF(origin_stack, origin_len - 1) == p) {
-                RCLASS_SET_ORIGIN(RARRAY_AREF(origin_stack, (origin_len -= 2)), clone_p);
-                RICLASS_SET_ORIGIN_SHARED_MTBL(clone_p);
+                RCLASS_WRITE_ORIGIN(RARRAY_AREF(origin_stack, (origin_len -= 2)), clone_p);
+                RICLASS_WRITE_ORIGIN_SHARED_MTBL(clone_p);
                 rb_ary_resize(origin_stack, origin_len);
                 add_subclass = FALSE;
             }
@@ -606,15 +1112,15 @@ rb_mod_init_copy(VALUE clone, VALUE orig)
 
         if (p == orig_origin) {
             if (clone_p) {
-                RCLASS_SET_SUPER(clone_p, clone_origin);
-                RCLASS_SET_SUPER(clone_origin, RCLASS_SUPER(orig_origin));
+                rb_class_set_super(clone_p, clone_origin);
+                rb_class_set_super(clone_origin, RCLASS_SUPER(orig_origin));
             }
             copy_tables(clone_origin, orig_origin);
             if (RCLASS_M_TBL(orig_origin)) {
                 struct clone_method_arg arg;
                 arg.old_klass = orig;
                 arg.new_klass = clone;
-                RCLASS_M_TBL_INIT(clone_origin);
+                class_initialize_method_table(clone_origin);
                 rb_id_table_foreach(RCLASS_M_TBL(orig_origin), clone_method_i, &arg);
             }
         }
@@ -644,14 +1150,15 @@ rb_singleton_class_clone_and_attach(VALUE obj, VALUE attach)
     // attached to an object other than `obj`. In which case `obj` does not have
     // a material singleton class attached yet and there is no singleton class
     // to clone.
-    if (!(FL_TEST(klass, FL_SINGLETON) && RCLASS_ATTACHED_OBJECT(klass) == obj)) {
+    if (!(RCLASS_SINGLETON_P(klass) && RCLASS_ATTACHED_OBJECT(klass) == obj)) {
         // nothing to clone
         return klass;
     }
     else {
         /* copy singleton(unnamed) class */
         bool klass_of_clone_is_new;
-        VALUE clone = class_alloc(RBASIC(klass)->flags, 0);
+        RUBY_ASSERT(RB_TYPE_P(klass, T_CLASS));
+        VALUE clone = class_alloc(T_CLASS, 0);
 
         if (BUILTIN_TYPE(obj) == T_CLASS) {
             klass_of_clone_is_new = true;
@@ -665,18 +1172,22 @@ rb_singleton_class_clone_and_attach(VALUE obj, VALUE attach)
             RBASIC_SET_CLASS(clone, klass_metaclass_clone);
         }
 
-        RCLASS_SET_SUPER(clone, RCLASS_SUPER(klass));
-        rb_iv_tbl_copy(clone, klass);
+        // initialize method table before any GC chance
+        class_initialize_method_table(clone);
+
+        rb_class_set_super(clone, RCLASS_SUPER(klass));
+        rb_fields_tbl_copy(clone, klass);
         if (RCLASS_CONST_TBL(klass)) {
             struct clone_const_arg arg;
-            arg.tbl = RCLASS_CONST_TBL(clone) = rb_id_table_create(0);
+            struct rb_id_table *table;
+            arg.tbl = table = rb_id_table_create(0);
             arg.klass = clone;
             rb_id_table_foreach(RCLASS_CONST_TBL(klass), clone_const_i, &arg);
+            RCLASS_SET_CONST_TBL(clone, table, false);
         }
         if (!UNDEF_P(attach)) {
             rb_singleton_class_attached(clone, attach);
         }
-        RCLASS_M_TBL_INIT(clone);
         {
             struct clone_method_arg arg;
             arg.old_klass = klass;
@@ -695,7 +1206,7 @@ rb_singleton_class_clone_and_attach(VALUE obj, VALUE attach)
 void
 rb_singleton_class_attached(VALUE klass, VALUE obj)
 {
-    if (FL_TEST(klass, FL_SINGLETON)) {
+    if (RCLASS_SINGLETON_P(klass)) {
         RCLASS_SET_ATTACHED_OBJECT(klass, obj);
     }
 }
@@ -720,7 +1231,7 @@ rb_singleton_class_internal_p(VALUE sklass)
             !rb_singleton_class_has_metaclass_p(sklass));
 }
 
-/*!
+/**
  * whether k has a metaclass
  * @retval 1 if \a k has a metaclass
  * @retval 0 otherwise
@@ -729,31 +1240,31 @@ rb_singleton_class_internal_p(VALUE sklass)
     (FL_TEST(METACLASS_OF(k), FL_SINGLETON) && \
      rb_singleton_class_has_metaclass_p(k))
 
-/*!
- * ensures \a klass belongs to its own eigenclass.
- * @return the eigenclass of \a klass
- * @post \a klass belongs to the returned eigenclass.
- *       i.e. the attached object of the eigenclass is \a klass.
+/**
+ * ensures `klass` belongs to its own eigenclass.
+ * @return the eigenclass of `klass`
+ * @post `klass` belongs to the returned eigenclass.
+ *       i.e. the attached object of the eigenclass is `klass`.
  * @note this macro creates a new eigenclass if necessary.
  */
 #define ENSURE_EIGENCLASS(klass) \
     (HAVE_METACLASS_P(klass) ? METACLASS_OF(klass) : make_metaclass(klass))
 
 
-/*!
- * Creates a metaclass of \a klass
- * \param klass     a class
- * \return          created metaclass for the class
- * \pre \a klass is a Class object
- * \pre \a klass has no singleton class.
- * \post the class of \a klass is the returned class.
- * \post the returned class is meta^(n+1)-class when \a klass is a meta^(n)-klass for n >= 0
+/**
+ * Creates a metaclass of `klass`
+ * @param klass     a class
+ * @return          created metaclass for the class
+ * @pre `klass` is a Class object
+ * @pre `klass` has no singleton class.
+ * @post the class of `klass` is the returned class.
+ * @post the returned class is meta^(n+1)-class when `klass` is a meta^(n)-klass for n >= 0
  */
 static inline VALUE
 make_metaclass(VALUE klass)
 {
     VALUE super;
-    VALUE metaclass = rb_class_boot(Qundef);
+    VALUE metaclass = class_boot_namespaceable(Qundef, FL_TEST_RAW(klass, RCLASS_NAMESPACEABLE));
 
     FL_SET(metaclass, FL_SINGLETON);
     rb_singleton_class_attached(metaclass, klass);
@@ -770,7 +1281,8 @@ make_metaclass(VALUE klass)
 
     super = RCLASS_SUPER(klass);
     while (RB_TYPE_P(super, T_ICLASS)) super = RCLASS_SUPER(super);
-    RCLASS_SET_SUPER(metaclass, super ? ENSURE_EIGENCLASS(super) : rb_cClass);
+    class_associate_super(metaclass, super ? ENSURE_EIGENCLASS(super) : rb_cClass, true);
+    rb_class_set_initialized(klass);
 
     // Full class ancestry may not have been filled until we reach here.
     rb_class_update_superclasses(METACLASS_OF(metaclass));
@@ -778,21 +1290,22 @@ make_metaclass(VALUE klass)
     return metaclass;
 }
 
-/*!
- * Creates a singleton class for \a obj.
- * \pre \a obj must not a immediate nor a special const.
- * \pre \a obj must not a Class object.
- * \pre \a obj has no singleton class.
+/**
+ * Creates a singleton class for `obj`.
+ * @pre `obj` must not be an immediate nor a special const.
+ * @pre `obj` must not be a Class object.
+ * @pre `obj` has no singleton class.
  */
 static inline VALUE
 make_singleton_class(VALUE obj)
 {
     VALUE orig_class = METACLASS_OF(obj);
-    VALUE klass = rb_class_boot(orig_class);
+    VALUE klass = class_boot_namespaceable(orig_class, FL_TEST_RAW(orig_class, RCLASS_NAMESPACEABLE));
 
     FL_SET(klass, FL_SINGLETON);
     RBASIC_SET_CLASS(obj, klass);
     rb_singleton_class_attached(klass, obj);
+    rb_yjit_invalidate_no_singleton_class(orig_class);
 
     SET_METACLASS_OF(klass, METACLASS_OF(rb_class_real(orig_class)));
     return klass;
@@ -806,7 +1319,7 @@ boot_defclass(const char *name, VALUE super)
     ID id = rb_intern(name);
 
     rb_const_set((rb_cObject ? rb_cObject : obj), id, obj);
-    rb_vm_add_root_module(obj);
+    rb_vm_register_global_object(obj);
     return obj;
 }
 
@@ -888,7 +1401,7 @@ Init_class_hierarchy(void)
 {
     rb_cBasicObject = boot_defclass("BasicObject", 0);
     rb_cObject = boot_defclass("Object", rb_cBasicObject);
-    rb_gc_register_mark_object(rb_cObject);
+    rb_vm_register_global_object(rb_cObject);
 
     /* resolve class name ASAP for order-independence */
     rb_set_class_path_string(rb_cObject, rb_cObject, rb_fstring_lit("Object"));
@@ -913,15 +1426,15 @@ Init_class_hierarchy(void)
 }
 
 
-/*!
- * \internal
+/**
+ * @internal
  * Creates a new *singleton class* for an object.
  *
- * \pre \a obj has no singleton class.
- * \note DO NOT USE the function in an extension libraries. Use \ref rb_singleton_class.
- * \param obj     An object.
- * \param unused  ignored.
- * \return        The singleton class of the object.
+ * @pre `obj` has no singleton class.
+ * @note DO NOT USE the function in an extension libraries. Use @ref rb_singleton_class.
+ * @param obj     An object.
+ * @param unused  ignored.
+ * @return        The singleton class of the object.
  */
 VALUE
 rb_make_metaclass(VALUE obj, VALUE unused)
@@ -947,13 +1460,13 @@ rb_define_class_id(ID id, VALUE super)
 }
 
 
-/*!
+/**
  * Calls Class#inherited.
- * \param super  A class which will be called #inherited.
+ * @param super  A class which will be called #inherited.
  *               NULL means Object class.
- * \param klass  A Class object which derived from \a super
- * \return the value \c Class#inherited's returns
- * \pre Each of \a super and \a klass must be a \c Class object.
+ * @param klass  A Class object which derived from `super`
+ * @return the value `Class#inherited` returns
+ * @pre Each of `super` and `klass` must be a `Class` object.
  */
 VALUE
 rb_class_inherited(VALUE super, VALUE klass)
@@ -969,8 +1482,12 @@ rb_define_class(const char *name, VALUE super)
 {
     VALUE klass;
     ID id;
+    const rb_namespace_t *ns = rb_current_namespace();
 
     id = rb_intern(name);
+    if (NAMESPACE_OPTIONAL_P(ns)) {
+        return rb_define_class_id_under(ns->ns_object, id, super);
+    }
     if (rb_const_defined(rb_cObject, id)) {
         klass = rb_const_get(rb_cObject, id);
         if (!RB_TYPE_P(klass, T_CLASS)) {
@@ -982,14 +1499,14 @@ rb_define_class(const char *name, VALUE super)
         }
 
         /* Class may have been defined in Ruby and not pin-rooted */
-        rb_vm_add_root_module(klass);
+        rb_vm_register_global_object(klass);
         return klass;
     }
     if (!super) {
-        rb_raise(rb_eArgError, "no super class for `%s'", name);
+        rb_raise(rb_eArgError, "no super class for '%s'", name);
     }
     klass = rb_define_class_id(id, super);
-    rb_vm_add_root_module(klass);
+    rb_vm_register_global_object(klass);
     rb_const_set(rb_cObject, id, klass);
     rb_class_inherited(super, klass);
 
@@ -1003,7 +1520,7 @@ rb_define_class_under(VALUE outer, const char *name, VALUE super)
 }
 
 VALUE
-rb_define_class_id_under(VALUE outer, ID id, VALUE super)
+rb_define_class_id_under_no_pin(VALUE outer, ID id, VALUE super)
 {
     VALUE klass;
 
@@ -1020,30 +1537,34 @@ rb_define_class_id_under(VALUE outer, ID id, VALUE super)
                      " (%"PRIsVALUE" is given but was %"PRIsVALUE")",
                      outer, rb_id2str(id), RCLASS_SUPER(klass), super);
         }
-        /* Class may have been defined in Ruby and not pin-rooted */
-        rb_vm_add_root_module(klass);
 
         return klass;
     }
     if (!super) {
-        rb_raise(rb_eArgError, "no super class for `%"PRIsVALUE"::%"PRIsVALUE"'",
+        rb_raise(rb_eArgError, "no super class for '%"PRIsVALUE"::%"PRIsVALUE"'",
                  rb_class_path(outer), rb_id2str(id));
     }
     klass = rb_define_class_id(id, super);
     rb_set_class_path_string(klass, outer, rb_id2str(id));
     rb_const_set(outer, id, klass);
     rb_class_inherited(super, klass);
-    rb_vm_add_root_module(klass);
 
     return klass;
 }
 
+VALUE
+rb_define_class_id_under(VALUE outer, ID id, VALUE super)
+{
+    VALUE klass = rb_define_class_id_under_no_pin(outer, id, super);
+    rb_vm_register_global_object(klass);
+    return klass;
+}
+
 VALUE
 rb_module_s_alloc(VALUE klass)
 {
     VALUE mod = class_alloc(T_MODULE, klass);
-    RCLASS_M_TBL_INIT(mod);
-    FL_SET(mod, RMODULE_ALLOCATED_BUT_NOT_INITIALIZED);
+    class_initialize_method_table(mod);
     return mod;
 }
 
@@ -1051,7 +1572,7 @@ static inline VALUE
 module_new(VALUE klass)
 {
     VALUE mdl = class_alloc(T_MODULE, klass);
-    RCLASS_M_TBL_INIT(mdl);
+    class_initialize_method_table(mdl);
     return (VALUE)mdl;
 }
 
@@ -1079,8 +1600,12 @@ rb_define_module(const char *name)
 {
     VALUE module;
     ID id;
+    const rb_namespace_t *ns = rb_current_namespace();
 
     id = rb_intern(name);
+    if (NAMESPACE_OPTIONAL_P(ns)) {
+        return rb_define_module_id_under(ns->ns_object, id);
+    }
     if (rb_const_defined(rb_cObject, id)) {
         module = rb_const_get(rb_cObject, id);
         if (!RB_TYPE_P(module, T_MODULE)) {
@@ -1088,11 +1613,11 @@ rb_define_module(const char *name)
                      name, rb_obj_class(module));
         }
         /* Module may have been defined in Ruby and not pin-rooted */
-        rb_vm_add_root_module(module);
+        rb_vm_register_global_object(module);
         return module;
     }
     module = rb_module_new();
-    rb_vm_add_root_module(module);
+    rb_vm_register_global_object(module);
     rb_const_set(rb_cObject, id, module);
 
     return module;
@@ -1117,43 +1642,40 @@ rb_define_module_id_under(VALUE outer, ID id)
                      outer, rb_id2str(id), rb_obj_class(module));
         }
         /* Module may have been defined in Ruby and not pin-rooted */
-        rb_gc_register_mark_object(module);
+        rb_vm_register_global_object(module);
         return module;
     }
     module = rb_module_new();
     rb_const_set(outer, id, module);
     rb_set_class_path_string(module, outer, rb_id2str(id));
-    rb_gc_register_mark_object(module);
+    rb_vm_register_global_object(module);
 
     return module;
 }
 
-VALUE
-rb_iclass_alloc(VALUE klass)
-{
-    return class_alloc(T_ICLASS, klass);
-}
-
 VALUE
 rb_include_class_new(VALUE module, VALUE super)
 {
-    VALUE klass = rb_iclass_alloc(rb_cClass);
+    VALUE klass = class_alloc(T_ICLASS, rb_cClass);
 
-    RCLASS_M_TBL(klass) = RCLASS_M_TBL(module);
+    RCLASS_SET_M_TBL(klass, RCLASS_WRITABLE_M_TBL(module));
 
     RCLASS_SET_ORIGIN(klass, klass);
     if (BUILTIN_TYPE(module) == T_ICLASS) {
         module = METACLASS_OF(module);
     }
     RUBY_ASSERT(!RB_TYPE_P(module, T_ICLASS));
-    if (!RCLASS_CONST_TBL(module)) {
-        RCLASS_CONST_TBL(module) = rb_id_table_create(0);
+    if (RCLASS_WRITABLE_CONST_TBL(module)) {
+        RCLASS_SET_CONST_TBL(klass, RCLASS_WRITABLE_CONST_TBL(module), true);
+    }
+    else {
+        RCLASS_WRITE_CONST_TBL(module, rb_id_table_create(0), false);
+        RCLASS_SET_CONST_TBL(klass, RCLASS_WRITABLE_CONST_TBL(module), true);
     }
 
-    RCLASS_CVC_TBL(klass) = RCLASS_CVC_TBL(module);
-    RCLASS_CONST_TBL(klass) = RCLASS_CONST_TBL(module);
+    RCLASS_SET_CVC_TBL(klass, RCLASS_WRITABLE_CVC_TBL(module));
 
-    RCLASS_SET_SUPER(klass, super);
+    class_associate_super(klass, super, true);
     RBASIC_SET_CLASS(klass, module);
 
     return (VALUE)klass;
@@ -1166,7 +1688,7 @@ ensure_includable(VALUE klass, VALUE module)
 {
     rb_class_modify_check(klass);
     Check_Type(module, T_MODULE);
-    rb_module_set_initialized(module);
+    rb_class_set_initialized(module);
     if (!NIL_P(rb_refinement_module_get_refined_class(module))) {
         rb_raise(rb_eArgError, "refinement module is not allowed");
     }
@@ -1184,15 +1706,9 @@ rb_include_module(VALUE klass, VALUE module)
         rb_raise(rb_eArgError, "cyclic include detected");
 
     if (RB_TYPE_P(klass, T_MODULE)) {
-        rb_subclass_entry_t *iclass = RCLASS_SUBCLASSES(klass);
-        // skip the placeholder subclass entry at the head of the list
-        if (iclass) {
-            RUBY_ASSERT(!iclass->klass);
-            iclass = iclass->next;
-        }
-
-        int do_include = 1;
+        rb_subclass_entry_t *iclass = RCLASS_SUBCLASSES_FIRST(klass);
         while (iclass) {
+            int do_include = 1;
             VALUE check_class = iclass->klass;
             /* During lazy sweeping, iclass->klass could be a dead object that
              * has not yet been swept. */
@@ -1259,7 +1775,7 @@ static int
 do_include_modules_at(const VALUE klass, VALUE c, VALUE module, int search_super, bool check_cyclic)
 {
     VALUE p, iclass, origin_stack = 0;
-    int method_changed = 0, add_subclass;
+    int method_changed = 0;
     long origin_len;
     VALUE klass_origin = RCLASS_ORIGIN(klass);
     VALUE original_klass = klass;
@@ -1321,9 +1837,8 @@ do_include_modules_at(const VALUE klass, VALUE c, VALUE module, int search_super
 
         // setup T_ICLASS for the include/prepend module
         iclass = rb_include_class_new(module, super_class);
-        c = RCLASS_SET_SUPER(c, iclass);
+        c = rb_class_set_super(c, iclass);
         RCLASS_SET_INCLUDER(iclass, klass);
-        add_subclass = TRUE;
         if (module != RCLASS_ORIGIN(module)) {
             if (!origin_stack) origin_stack = rb_ary_hidden_new(2);
             VALUE origin[2] = {iclass, RCLASS_ORIGIN(module)};
@@ -1331,17 +1846,14 @@ do_include_modules_at(const VALUE klass, VALUE c, VALUE module, int search_super
         }
         else if (origin_stack && (origin_len = RARRAY_LEN(origin_stack)) > 1 &&
                  RARRAY_AREF(origin_stack, origin_len - 1) == module) {
-            RCLASS_SET_ORIGIN(RARRAY_AREF(origin_stack, (origin_len -= 2)), iclass);
-            RICLASS_SET_ORIGIN_SHARED_MTBL(iclass);
+            RCLASS_WRITE_ORIGIN(RARRAY_AREF(origin_stack, (origin_len -= 2)), iclass);
+            RICLASS_WRITE_ORIGIN_SHARED_MTBL(iclass);
             rb_ary_resize(origin_stack, origin_len);
-            add_subclass = FALSE;
         }
 
-        if (add_subclass) {
-            VALUE m = module;
-            if (BUILTIN_TYPE(m) == T_ICLASS) m = METACLASS_OF(m);
-            rb_module_add_to_subclasses_list(m, iclass);
-        }
+        VALUE m = module;
+        if (BUILTIN_TYPE(m) == T_ICLASS) m = METACLASS_OF(m);
+        rb_module_add_to_subclasses_list(m, iclass);
 
         if (BUILTIN_TYPE(klass) == T_MODULE && FL_TEST(klass, RMODULE_IS_REFINEMENT)) {
             VALUE refined_class =
@@ -1374,7 +1886,7 @@ move_refined_method(ID key, VALUE value, void *data)
 
     if (me->def->type == VM_METHOD_TYPE_REFINED) {
         VALUE klass = (VALUE)data;
-        struct rb_id_table *tbl = RCLASS_M_TBL(klass);
+        struct rb_id_table *tbl = RCLASS_WRITABLE_M_TBL(klass);
 
         if (me->def->body.refined.orig_me) {
             const rb_method_entry_t *orig_me = me->def->body.refined.orig_me, *new_me;
@@ -1414,12 +1926,12 @@ ensure_origin(VALUE klass)
 {
     VALUE origin = RCLASS_ORIGIN(klass);
     if (origin == klass) {
-        origin = rb_iclass_alloc(klass);
-        RCLASS_SET_SUPER(origin, RCLASS_SUPER(klass));
-        RCLASS_SET_SUPER(klass, origin);
-        RCLASS_SET_ORIGIN(klass, origin);
-        RCLASS_M_TBL(origin) = RCLASS_M_TBL(klass);
-        RCLASS_M_TBL_INIT(klass);
+        origin = class_alloc(T_ICLASS, klass);
+        RCLASS_SET_M_TBL(origin, RCLASS_M_TBL(klass));
+        rb_class_set_super(origin, RCLASS_SUPER(klass));
+        rb_class_set_super(klass, origin); // writes origin into RCLASS_SUPER(klass)
+        RCLASS_WRITE_ORIGIN(klass, origin);
+        class_clear_method_table(klass);
         rb_id_table_foreach(RCLASS_M_TBL(origin), cache_clear_refined_method, (void *)klass);
         rb_id_table_foreach(RCLASS_M_TBL(origin), move_refined_method, (void *)klass);
         return true;
@@ -1444,13 +1956,7 @@ rb_prepend_module(VALUE klass, VALUE module)
         rb_vm_check_redefinition_by_prepend(klass);
     }
     if (RB_TYPE_P(klass, T_MODULE)) {
-        rb_subclass_entry_t *iclass = RCLASS_SUBCLASSES(klass);
-        // skip the placeholder subclass entry at the head of the list if it exists
-        if (iclass) {
-            RUBY_ASSERT(!iclass->klass);
-            iclass = iclass->next;
-        }
-
+        rb_subclass_entry_t *iclass = RCLASS_SUBCLASSES_FIRST(klass);
         VALUE klass_origin = RCLASS_ORIGIN(klass);
         struct rb_id_table *klass_m_tbl = RCLASS_M_TBL(klass);
         struct rb_id_table *klass_origin_m_tbl = RCLASS_M_TBL(klass_origin);
@@ -1462,11 +1968,11 @@ rb_prepend_module(VALUE klass, VALUE module)
                 if (klass_had_no_origin && klass_origin_m_tbl == RCLASS_M_TBL(subclass)) {
                     // backfill an origin iclass to handle refinements and future prepends
                     rb_id_table_foreach(RCLASS_M_TBL(subclass), clear_module_cache_i, (void *)subclass);
-                    RCLASS_M_TBL(subclass) = klass_m_tbl;
+                    RCLASS_WRITE_M_TBL_EVEN_WHEN_PROMOTED(subclass, klass_m_tbl);
                     VALUE origin = rb_include_class_new(klass_origin, RCLASS_SUPER(subclass));
-                    RCLASS_SET_SUPER(subclass, origin);
+                    rb_class_set_super(subclass, origin);
                     RCLASS_SET_INCLUDER(origin, RCLASS_INCLUDER(subclass));
-                    RCLASS_SET_ORIGIN(subclass, origin);
+                    RCLASS_WRITE_ORIGIN(subclass, origin);
                     RICLASS_SET_ORIGIN_SHARED_MTBL(origin);
                 }
                 include_modules_at(subclass, subclass, module, FALSE);
@@ -1542,7 +2048,7 @@ rb_mod_include_p(VALUE mod, VALUE mod2)
 
     Check_Type(mod2, T_MODULE);
     for (p = RCLASS_SUPER(mod); p; p = RCLASS_SUPER(p)) {
-        if (BUILTIN_TYPE(p) == T_ICLASS && !FL_TEST(p, RICLASS_IS_ORIGIN)) {
+        if (BUILTIN_TYPE(p) == T_ICLASS && !RICLASS_IS_ORIGIN_P(p)) {
             if (METACLASS_OF(p) == mod2) return Qtrue;
         }
     }
@@ -1602,7 +2108,7 @@ class_descendants_recursive(VALUE klass, VALUE v)
 {
     struct subclass_traverse_data *data = (struct subclass_traverse_data *) v;
 
-    if (BUILTIN_TYPE(klass) == T_CLASS && !FL_TEST(klass, FL_SINGLETON)) {
+    if (BUILTIN_TYPE(klass) == T_CLASS && !RCLASS_SINGLETON_P(klass)) {
         if (data->buffer && data->count < data->maxcount && !rb_objspace_garbage_object_p(klass)) {
             // assumes that this does not cause GC as long as the length does not exceed the capacity
             rb_ary_push(data->buffer, klass);
@@ -1707,8 +2213,8 @@ rb_class_subclasses(VALUE klass)
 VALUE
 rb_class_attached_object(VALUE klass)
 {
-    if (!FL_TEST(klass, FL_SINGLETON)) {
-        rb_raise(rb_eTypeError, "`%"PRIsVALUE"' is not a singleton class", klass);
+    if (!RCLASS_SINGLETON_P(klass)) {
+        rb_raise(rb_eTypeError, "'%"PRIsVALUE"' is not a singleton class", klass);
     }
 
     return RCLASS_ATTACHED_OBJECT(klass);
@@ -1810,7 +2316,7 @@ static bool
 particular_class_p(VALUE mod)
 {
     if (!mod) return false;
-    if (FL_TEST(mod, FL_SINGLETON)) return true;
+    if (RCLASS_SINGLETON_P(mod)) return true;
     if (BUILTIN_TYPE(mod) == T_ICLASS) return true;
     return false;
 }
@@ -2087,19 +2593,19 @@ rb_obj_singleton_methods(int argc, const VALUE *argv, VALUE obj)
     int recur = TRUE;
 
     if (rb_check_arity(argc, 0, 1)) recur = RTEST(argv[0]);
-    if (RB_TYPE_P(obj, T_CLASS) && FL_TEST(obj, FL_SINGLETON)) {
+    if (RCLASS_SINGLETON_P(obj)) {
         rb_singleton_class(obj);
     }
     klass = CLASS_OF(obj);
     origin = RCLASS_ORIGIN(klass);
     me_arg.list = st_init_numtable();
     me_arg.recur = recur;
-    if (klass && FL_TEST(klass, FL_SINGLETON)) {
+    if (klass && RCLASS_SINGLETON_P(klass)) {
         if ((mtbl = RCLASS_M_TBL(origin)) != 0) rb_id_table_foreach(mtbl, method_entry_i, &me_arg);
         klass = RCLASS_SUPER(klass);
     }
     if (recur) {
-        while (klass && (FL_TEST(klass, FL_SINGLETON) || RB_TYPE_P(klass, T_ICLASS))) {
+        while (klass && (RCLASS_SINGLETON_P(klass) || RB_TYPE_P(klass, T_ICLASS))) {
             if (klass != origin && (mtbl = RCLASS_M_TBL(klass)) != 0) rb_id_table_foreach(mtbl, method_entry_i, &me_arg);
             klass = RCLASS_SUPER(klass);
         }
@@ -2203,13 +2709,13 @@ rb_special_singleton_class(VALUE obj)
     return special_singleton_class_of(obj);
 }
 
-/*!
- * \internal
- * Returns the singleton class of \a obj. Creates it if necessary.
+/**
+ * @internal
+ * Returns the singleton class of `obj`. Creates it if necessary.
  *
- * \note DO NOT expose the returned singleton class to
+ * @note DO NOT expose the returned singleton class to
  *       outside of class.c.
- *       Use \ref rb_singleton_class instead for
+ *       Use @ref rb_singleton_class instead for
  *       consistency of the metaclass hierarchy.
  */
 static VALUE
@@ -2233,13 +2739,16 @@ singleton_class_of(VALUE obj)
         return klass;
 
       case T_STRING:
-        if (FL_TEST_RAW(obj, RSTRING_FSTR)) {
+        if (CHILLED_STRING_P(obj)) {
+            CHILLED_STRING_MUTATED(obj);
+        }
+        else if (FL_TEST_RAW(obj, RSTRING_FSTR)) {
             rb_raise(rb_eTypeError, "can't define singleton");
         }
     }
 
     klass = METACLASS_OF(obj);
-    if (!(FL_TEST(klass, FL_SINGLETON) &&
+    if (!(RCLASS_SINGLETON_P(klass) &&
           RCLASS_ATTACHED_OBJECT(klass) == obj)) {
         klass = rb_make_metaclass(obj, klass);
     }
@@ -2253,21 +2762,22 @@ void
 rb_freeze_singleton_class(VALUE x)
 {
     /* should not propagate to meta-meta-class, and so on */
-    if (!(RBASIC(x)->flags & FL_SINGLETON)) {
+    if (!RCLASS_SINGLETON_P(x)) {
         VALUE klass = RBASIC_CLASS(x);
         if (klass && // no class when hidden from ObjectSpace
-            FL_TEST(klass, (FL_SINGLETON|FL_FREEZE)) == FL_SINGLETON) {
-            OBJ_FREEZE_RAW(klass);
+            FL_TEST_RAW(klass, FL_SINGLETON) &&
+            !OBJ_FROZEN_RAW(klass)) {
+            OBJ_FREEZE(klass);
         }
     }
 }
 
-/*!
- * Returns the singleton class of \a obj, or nil if obj is not a
+/**
+ * Returns the singleton class of `obj`, or nil if obj is not a
  * singleton object.
  *
- * \param obj an arbitrary object.
- * \return the singleton class or nil.
+ * @param obj an arbitrary object.
+ * @return the singleton class or nil.
  */
 VALUE
 rb_singleton_class_get(VALUE obj)
@@ -2278,7 +2788,7 @@ rb_singleton_class_get(VALUE obj)
         return rb_special_singleton_class(obj);
     }
     klass = METACLASS_OF(obj);
-    if (!FL_TEST(klass, FL_SINGLETON)) return Qnil;
+    if (!RCLASS_SINGLETON_P(klass)) return Qnil;
     if (RCLASS_ATTACHED_OBJECT(klass) != obj) return Qnil;
     return klass;
 }
diff --git a/common.mk b/common.mk
index d55d1788aa8e01..5a54cecb636c4f 100644
--- a/common.mk
+++ b/common.mk
@@ -6,7 +6,7 @@ bin: $(PROGRAM) $(WPROGRAM)
 lib: $(LIBRUBY)
 dll: $(LIBRUBY_SO)
 
-.SUFFIXES: .rbinc .rb .inc .h .c .y .i .$(ASMEXT) .$(DTRACE_EXT)
+.SUFFIXES: .rbinc .rbbin .rb .inc .h .c .y .i .$(ASMEXT) .$(DTRACE_EXT)
 
 # V=0 quiet, V=1 verbose.  other values don't work.
 V = 0
@@ -18,9 +18,10 @@ ECHO = @$(ECHO0)
 
 mflags = $(MFLAGS)
 gnumake_recursive =
+sequential = $(gnumake:yes=-sequential)
 enable_shared = $(ENABLE_SHARED:no=)
 
-UNICODE_VERSION = 15.0.0
+UNICODE_VERSION = 16.0.0
 UNICODE_EMOJI_VERSION_0 = $(UNICODE_VERSION)///
 UNICODE_EMOJI_VERSION_1 = $(UNICODE_EMOJI_VERSION_0:.0///=)
 UNICODE_EMOJI_VERSION = $(UNICODE_EMOJI_VERSION_1:///=)
@@ -45,8 +46,8 @@ RUN_OPTS      = --disable-gems
 
 # GITPULLOPTIONS = --no-tags
 
-YARP_SRCDIR = $(srcdir)/yarp
-INCFLAGS = -I. -I$(arch_hdrdir) -I$(hdrdir) -I$(srcdir) -I$(YARP_SRCDIR) -I$(UNICODE_HDR_DIR)
+PRISM_SRCDIR = $(srcdir)/prism
+INCFLAGS = -I. -I$(arch_hdrdir) -I$(ext_hdrdir) -I$(hdrdir) -I$(srcdir) -I$(PRISM_SRCDIR) -I$(UNICODE_HDR_DIR) $(incflags)
 
 GEM_HOME =
 GEM_PATH =
@@ -64,64 +65,61 @@ LIBRUBY_EXTS  = ./.libruby-with-ext.time
 REVISION_H    = ./.revision.time
 PLATFORM_D    = $(TIMESTAMPDIR)/.$(PLATFORM_DIR).time
 ENC_TRANS_D   = $(TIMESTAMPDIR)/.enc-trans.time
-RDOC          = $(XRUBY) "$(srcdir)/libexec/rdoc" --root "$(srcdir)" --encoding=UTF-8 --all
+RDOC          = $(XRUBY) "$(tooldir)/rdoc-srcdir"
 RDOCOUT       = $(EXTOUT)/rdoc
 HTMLOUT       = $(EXTOUT)/html
 CAPIOUT       = doc/capi
 INSTALL_DOC_OPTS = --rdoc-output="$(RDOCOUT)" --html-output="$(HTMLOUT)"
-RDOC_GEN_OPTS = --page-dir "$(srcdir)/doc" --no-force-update \
-	--title "Documentation for Ruby $(RUBY_API_VERSION)" \
-	--main README.md
+RDOC_GEN_OPTS = --no-force-update \
+	$(empty)
 
 INITOBJS      = dmyext.$(OBJEXT) dmyenc.$(OBJEXT)
 NORMALMAINOBJ = main.$(OBJEXT)
 MAINOBJ       = $(NORMALMAINOBJ)
 DLDOBJS	      = $(INITOBJS)
 EXTSOLIBS     =
-MINIOBJS      = $(ARCHMINIOBJS) miniinit.$(OBJEXT) dmyext.$(OBJEXT)
+MINIOBJS      = $(ARCHMINIOBJS) miniinit.$(OBJEXT)
 ENC_MK        = enc.mk
 MAKE_ENC      = -f $(ENC_MK) V="$(V)" UNICODE_HDR_DIR="$(UNICODE_HDR_DIR)" \
 		RUBY="$(BOOTSTRAPRUBY)" MINIRUBY="$(BOOTSTRAPRUBY)" $(mflags)
 
-YARP_FILES = yarp/api_node.$(OBJEXT) \
-		yarp/api_pack.$(OBJEXT) \
-		yarp/diagnostic.$(OBJEXT) \
-		yarp/enc/yp_big5.$(OBJEXT) \
-		yarp/enc/yp_euc_jp.$(OBJEXT) \
-		yarp/enc/yp_gbk.$(OBJEXT) \
-		yarp/enc/yp_shift_jis.$(OBJEXT) \
-		yarp/enc/yp_tables.$(OBJEXT) \
-		yarp/enc/yp_unicode.$(OBJEXT) \
-		yarp/enc/yp_windows_31j.$(OBJEXT) \
-		yarp/extension.$(OBJEXT) \
-		yarp/node.$(OBJEXT) \
-		yarp/pack.$(OBJEXT) \
-		yarp/prettyprint.$(OBJEXT) \
-		yarp/regexp.$(OBJEXT) \
-		yarp/serialize.$(OBJEXT) \
-		yarp/token_type.$(OBJEXT) \
-		yarp/unescape.$(OBJEXT) \
-		yarp/util/yp_buffer.$(OBJEXT) \
-		yarp/util/yp_char.$(OBJEXT) \
-		yarp/util/yp_constant_pool.$(OBJEXT) \
-		yarp/util/yp_list.$(OBJEXT) \
-		yarp/util/yp_memchr.$(OBJEXT) \
-		yarp/util/yp_newline_list.$(OBJEXT) \
-		yarp/util/yp_state_stack.$(OBJEXT) \
-		yarp/util/yp_string.$(OBJEXT) \
-		yarp/util/yp_string_list.$(OBJEXT) \
-		yarp/util/yp_strncasecmp.$(OBJEXT) \
-		yarp/util/yp_strpbrk.$(OBJEXT) \
-		yarp/yarp.$(OBJEXT) \
-		yarp/yarp_init.$(OBJEXT)
-
-COMMONOBJS    = array.$(OBJEXT) \
+PRISM_BUILD_DIR = prism
+
+PRISM_FILES = prism/api_node.$(OBJEXT) \
+		prism/api_pack.$(OBJEXT) \
+		prism/diagnostic.$(OBJEXT) \
+		prism/encoding.$(OBJEXT) \
+		prism/extension.$(OBJEXT) \
+		prism/node.$(OBJEXT) \
+		prism/options.$(OBJEXT) \
+		prism/pack.$(OBJEXT) \
+		prism/prettyprint.$(OBJEXT) \
+		prism/regexp.$(OBJEXT) \
+		prism/serialize.$(OBJEXT) \
+		prism/static_literals.$(OBJEXT) \
+		prism/token_type.$(OBJEXT) \
+		prism/util/pm_buffer.$(OBJEXT) \
+		prism/util/pm_char.$(OBJEXT) \
+		prism/util/pm_constant_pool.$(OBJEXT) \
+		prism/util/pm_integer.$(OBJEXT) \
+		prism/util/pm_list.$(OBJEXT) \
+		prism/util/pm_memchr.$(OBJEXT) \
+		prism/util/pm_newline_list.$(OBJEXT) \
+		prism/util/pm_string.$(OBJEXT) \
+		prism/util/pm_strncasecmp.$(OBJEXT) \
+		prism/util/pm_strpbrk.$(OBJEXT) \
+		prism/prism.$(OBJEXT) \
+		prism_init.$(OBJEXT)
+
+COMMONOBJS    = \
+		array.$(OBJEXT) \
 		ast.$(OBJEXT) \
 		bignum.$(OBJEXT) \
 		class.$(OBJEXT) \
 		compar.$(OBJEXT) \
 		compile.$(OBJEXT) \
 		complex.$(OBJEXT) \
+		concurrent_set.$(OBJEXT) \
 		cont.$(OBJEXT) \
 		debug.$(OBJEXT) \
 		debug_counter.$(OBJEXT) \
@@ -135,6 +133,7 @@ COMMONOBJS    = array.$(OBJEXT) \
 		file.$(OBJEXT) \
 		gc.$(OBJEXT) \
 		hash.$(OBJEXT) \
+		imemo.$(OBJEXT) \
 		inits.$(OBJEXT) \
 		io.$(OBJEXT) \
 		io_buffer.$(OBJEXT) \
@@ -143,8 +142,7 @@ COMMONOBJS    = array.$(OBJEXT) \
 		marshal.$(OBJEXT) \
 		math.$(OBJEXT) \
 		memory_view.$(OBJEXT) \
-		rjit.$(OBJEXT) \
-		rjit_c.$(OBJEXT) \
+		namespace.$(OBJEXT) \
 		node.$(OBJEXT) \
 		node_dump.$(OBJEXT) \
 		numeric.$(OBJEXT) \
@@ -168,6 +166,7 @@ COMMONOBJS    = array.$(OBJEXT) \
 		ruby.$(OBJEXT) \
 		ruby_parser.$(OBJEXT) \
 		scheduler.$(OBJEXT) \
+		set.$(OBJEXT) \
 		shape.$(OBJEXT) \
 		signal.$(OBJEXT) \
 		sprintf.$(OBJEXT) \
@@ -188,59 +187,99 @@ COMMONOBJS    = array.$(OBJEXT) \
 		vm_sync.$(OBJEXT) \
 		vm_trace.$(OBJEXT) \
 		weakmap.$(OBJEXT) \
-		$(YARP_FILES) \
+		$(PRISM_FILES) \
 		$(YJIT_OBJ) \
-		$(YJIT_LIBOBJ) \
+		$(ZJIT_OBJ) \
+		$(JIT_OBJ) \
+		$(RUST_LIBOBJ) \
 		$(COROUTINE_OBJ) \
 		$(DTRACE_OBJ) \
 		$(BUILTIN_ENCOBJS) \
 		$(BUILTIN_TRANSOBJS) \
 		$(MISSING)
 
-$(YARP_FILES): $(YARP_BUILD_DIR)/.time $(YARP_BUILD_DIR)/enc/.time $(YARP_BUILD_DIR)/util/.time
+$(PRISM_FILES): $(PRISM_BUILD_DIR)/.time $(PRISM_BUILD_DIR)/util/.time
 
-$(YARP_BUILD_DIR)/.time $(YARP_BUILD_DIR)/enc/.time $(YARP_BUILD_DIR)/util/.time:
+$(PRISM_BUILD_DIR)/.time $(PRISM_BUILD_DIR)/util/.time:
 	$(Q) $(MAKEDIRS) $(@D)
 	@$(NULLCMD) > $@
 
-main: $(srcdir)/lib/yarp/mutation_visitor.rb
-srcs: $(srcdir)/lib/yarp/mutation_visitor.rb
-$(srcdir)/lib/yarp/mutation_visitor.rb: $(YARP_SRCDIR)/config.yml $(YARP_SRCDIR)/templates/template.rb $(YARP_SRCDIR)/templates/lib/yarp/mutation_visitor.rb.erb
-	$(Q) $(BASERUBY) $(YARP_SRCDIR)/templates/template.rb lib/yarp/mutation_visitor.rb $(srcdir)/lib/yarp/mutation_visitor.rb
-
-main: $(srcdir)/lib/yarp/node.rb
-srcs: $(srcdir)/lib/yarp/node.rb
-$(srcdir)/lib/yarp/node.rb: $(YARP_SRCDIR)/config.yml $(YARP_SRCDIR)/templates/template.rb $(YARP_SRCDIR)/templates/lib/yarp/node.rb.erb
-	$(Q) $(BASERUBY) $(YARP_SRCDIR)/templates/template.rb lib/yarp/node.rb $(srcdir)/lib/yarp/node.rb
-
-main: $(srcdir)/lib/yarp/serialize.rb
-srcs: $(srcdir)/lib/yarp/serialize.rb
-$(srcdir)/lib/yarp/serialize.rb: $(YARP_SRCDIR)/config.yml $(YARP_SRCDIR)/templates/template.rb $(YARP_SRCDIR)/templates/lib/yarp/serialize.rb.erb
-	$(Q) $(BASERUBY) $(YARP_SRCDIR)/templates/template.rb lib/yarp/serialize.rb $(srcdir)/lib/yarp/serialize.rb
-
-srcs: yarp/api_node.c
-yarp/api_node.c: $(YARP_SRCDIR)/config.yml $(YARP_SRCDIR)/templates/template.rb $(YARP_SRCDIR)/templates/ext/yarp/api_node.c.erb
-	$(Q) $(BASERUBY) $(YARP_SRCDIR)/templates/template.rb ext/yarp/api_node.c $@
-
-srcs: yarp/ast.h
-yarp/ast.h: $(YARP_SRCDIR)/config.yml $(YARP_SRCDIR)/templates/template.rb $(YARP_SRCDIR)/templates/include/yarp/ast.h.erb
-	$(Q) $(BASERUBY) $(YARP_SRCDIR)/templates/template.rb include/yarp/ast.h $@
-
-srcs: yarp/node.c
-yarp/node.c: $(YARP_SRCDIR)/config.yml $(YARP_SRCDIR)/templates/template.rb $(YARP_SRCDIR)/templates/src/node.c.erb
-	$(Q) $(BASERUBY) $(YARP_SRCDIR)/templates/template.rb src/node.c $@
-
-srcs: yarp/prettyprint.c
-yarp/prettyprint.c: $(YARP_SRCDIR)/config.yml $(YARP_SRCDIR)/templates/template.rb $(YARP_SRCDIR)/templates/src/prettyprint.c.erb
-	$(Q) $(BASERUBY) $(YARP_SRCDIR)/templates/template.rb src/prettyprint.c $@
-
-srcs: yarp/serialize.c
-yarp/serialize.c: $(YARP_SRCDIR)/config.yml $(YARP_SRCDIR)/templates/template.rb $(YARP_SRCDIR)/templates/src/serialize.c.erb
-	$(Q) $(BASERUBY) $(YARP_SRCDIR)/templates/template.rb src/serialize.c $@
-
-srcs: yarp/token_type.c
-yarp/token_type.c: $(YARP_SRCDIR)/config.yml $(YARP_SRCDIR)/templates/template.rb $(YARP_SRCDIR)/templates/src/token_type.c.erb
-	$(Q) $(BASERUBY) $(YARP_SRCDIR)/templates/template.rb src/token_type.c $@
+main: $(srcdir)/lib/prism/compiler.rb
+srcs: $(srcdir)/lib/prism/compiler.rb
+$(srcdir)/lib/prism/compiler.rb: $(PRISM_SRCDIR)/config.yml $(PRISM_SRCDIR)/templates/template.rb $(PRISM_SRCDIR)/templates/lib/prism/compiler.rb.erb
+	$(Q) $(BASERUBY) $(PRISM_SRCDIR)/templates/template.rb lib/prism/compiler.rb $(srcdir)/lib/prism/compiler.rb
+
+main: $(srcdir)/lib/prism/dispatcher.rb
+srcs: $(srcdir)/lib/prism/dispatcher.rb
+$(srcdir)/lib/prism/dispatcher.rb: $(PRISM_SRCDIR)/config.yml $(PRISM_SRCDIR)/templates/template.rb $(PRISM_SRCDIR)/templates/lib/prism/dispatcher.rb.erb
+	$(Q) $(BASERUBY) $(PRISM_SRCDIR)/templates/template.rb lib/prism/dispatcher.rb $(srcdir)/lib/prism/dispatcher.rb
+
+main: $(srcdir)/lib/prism/dsl.rb
+srcs: $(srcdir)/lib/prism/dsl.rb
+$(srcdir)/lib/prism/dsl.rb: $(PRISM_SRCDIR)/config.yml $(PRISM_SRCDIR)/templates/template.rb $(PRISM_SRCDIR)/templates/lib/prism/dsl.rb.erb
+	$(Q) $(BASERUBY) $(PRISM_SRCDIR)/templates/template.rb lib/prism/dsl.rb $(srcdir)/lib/prism/dsl.rb
+
+main: $(srcdir)/lib/prism/inspect_visitor.rb
+srcs: $(srcdir)/lib/prism/inspect_visitor.rb
+$(srcdir)/lib/prism/inspect_visitor.rb: $(PRISM_SRCDIR)/config.yml $(PRISM_SRCDIR)/templates/template.rb $(PRISM_SRCDIR)/templates/lib/prism/inspect_visitor.rb.erb
+	$(Q) $(BASERUBY) $(PRISM_SRCDIR)/templates/template.rb lib/prism/inspect_visitor.rb $(srcdir)/lib/prism/inspect_visitor.rb
+
+main: $(srcdir)/lib/prism/mutation_compiler.rb
+srcs: $(srcdir)/lib/prism/mutation_compiler.rb
+$(srcdir)/lib/prism/mutation_compiler.rb: $(PRISM_SRCDIR)/config.yml $(PRISM_SRCDIR)/templates/template.rb $(PRISM_SRCDIR)/templates/lib/prism/mutation_compiler.rb.erb
+	$(Q) $(BASERUBY) $(PRISM_SRCDIR)/templates/template.rb lib/prism/mutation_compiler.rb $(srcdir)/lib/prism/mutation_compiler.rb
+
+main: $(srcdir)/lib/prism/node.rb
+srcs: $(srcdir)/lib/prism/node.rb
+$(srcdir)/lib/prism/node.rb: $(PRISM_SRCDIR)/config.yml $(PRISM_SRCDIR)/templates/template.rb $(PRISM_SRCDIR)/templates/lib/prism/node.rb.erb
+	$(Q) $(BASERUBY) $(PRISM_SRCDIR)/templates/template.rb lib/prism/node.rb $(srcdir)/lib/prism/node.rb
+
+main: $(srcdir)/lib/prism/reflection.rb
+srcs: $(srcdir)/lib/prism/reflection.rb
+$(srcdir)/lib/prism/reflection.rb: $(PRISM_SRCDIR)/config.yml $(PRISM_SRCDIR)/templates/template.rb $(PRISM_SRCDIR)/templates/lib/prism/reflection.rb.erb
+	$(Q) $(BASERUBY) $(PRISM_SRCDIR)/templates/template.rb lib/prism/reflection.rb $(srcdir)/lib/prism/reflection.rb
+
+main: $(srcdir)/lib/prism/serialize.rb
+srcs: $(srcdir)/lib/prism/serialize.rb
+$(srcdir)/lib/prism/serialize.rb: $(PRISM_SRCDIR)/config.yml $(PRISM_SRCDIR)/templates/template.rb $(PRISM_SRCDIR)/templates/lib/prism/serialize.rb.erb
+	$(Q) $(BASERUBY) $(PRISM_SRCDIR)/templates/template.rb lib/prism/serialize.rb $(srcdir)/lib/prism/serialize.rb
+
+main: $(srcdir)/lib/prism/visitor.rb
+srcs: $(srcdir)/lib/prism/visitor.rb
+$(srcdir)/lib/prism/visitor.rb: $(PRISM_SRCDIR)/config.yml $(PRISM_SRCDIR)/templates/template.rb $(PRISM_SRCDIR)/templates/lib/prism/visitor.rb.erb
+	$(Q) $(BASERUBY) $(PRISM_SRCDIR)/templates/template.rb lib/prism/visitor.rb $(srcdir)/lib/prism/visitor.rb
+
+srcs: prism/api_node.c
+prism/api_node.c: $(PRISM_SRCDIR)/config.yml $(PRISM_SRCDIR)/templates/template.rb $(PRISM_SRCDIR)/templates/ext/prism/api_node.c.erb
+	$(Q) $(BASERUBY) $(PRISM_SRCDIR)/templates/template.rb ext/prism/api_node.c $@
+
+srcs: prism/ast.h
+prism/ast.h: $(PRISM_SRCDIR)/config.yml $(PRISM_SRCDIR)/templates/template.rb $(PRISM_SRCDIR)/templates/include/prism/ast.h.erb
+	$(Q) $(BASERUBY) $(PRISM_SRCDIR)/templates/template.rb include/prism/ast.h $@
+
+srcs: prism/diagnostic.c
+prism/diagnostic.c: $(PRISM_SRCDIR)/config.yml $(PRISM_SRCDIR)/templates/template.rb $(PRISM_SRCDIR)/templates/src/diagnostic.c.erb
+	$(Q) $(BASERUBY) $(PRISM_SRCDIR)/templates/template.rb src/diagnostic.c $@
+
+srcs: prism/diagnostic.h
+prism/diagnostic.h: $(PRISM_SRCDIR)/config.yml $(PRISM_SRCDIR)/templates/template.rb $(PRISM_SRCDIR)/templates/include/prism/diagnostic.h.erb
+	$(Q) $(BASERUBY) $(PRISM_SRCDIR)/templates/template.rb include/prism/diagnostic.h $@
+
+srcs: prism/node.c
+prism/node.c: $(PRISM_SRCDIR)/config.yml $(PRISM_SRCDIR)/templates/template.rb $(PRISM_SRCDIR)/templates/src/node.c.erb
+	$(Q) $(BASERUBY) $(PRISM_SRCDIR)/templates/template.rb src/node.c $@
+
+srcs: prism/prettyprint.c
+prism/prettyprint.c: $(PRISM_SRCDIR)/config.yml $(PRISM_SRCDIR)/templates/template.rb $(PRISM_SRCDIR)/templates/src/prettyprint.c.erb
+	$(Q) $(BASERUBY) $(PRISM_SRCDIR)/templates/template.rb src/prettyprint.c $@
+
+srcs: prism/serialize.c
+prism/serialize.c: $(PRISM_SRCDIR)/config.yml $(PRISM_SRCDIR)/templates/template.rb $(PRISM_SRCDIR)/templates/src/serialize.c.erb
+	$(Q) $(BASERUBY) $(PRISM_SRCDIR)/templates/template.rb src/serialize.c $@
+
+srcs: prism/token_type.c
+prism/token_type.c: $(PRISM_SRCDIR)/config.yml $(PRISM_SRCDIR)/templates/template.rb $(PRISM_SRCDIR)/templates/src/token_type.c.erb
+	$(Q) $(BASERUBY) $(PRISM_SRCDIR)/templates/template.rb src/token_type.c $@
 
 EXPORTOBJS    = $(DLNOBJ) \
 		localeinit.$(OBJEXT) \
@@ -248,7 +287,7 @@ EXPORTOBJS    = $(DLNOBJ) \
 		$(COMMONOBJS)
 
 OBJS          = $(EXPORTOBJS) builtin.$(OBJEXT)
-ALLOBJS       = $(NORMALMAINOBJ) $(MINIOBJS) $(COMMONOBJS) $(INITOBJS)
+ALLOBJS       = $(OBJS) $(MINIOBJS) $(INITOBJS) $(MAINOBJ)
 
 GOLFOBJS      = goruby.$(OBJEXT)
 
@@ -256,7 +295,7 @@ DEFAULT_PRELUDES = $(GEM_PRELUDE)
 PRELUDE_SCRIPTS = $(DEFAULT_PRELUDES)
 GEM_PRELUDE   =
 PRELUDES      = {$(srcdir)}miniprelude.c
-GOLFPRELUDES  = {$(srcdir)}golf_prelude.c
+GOLFPRELUDES  = golf_prelude.rbbin
 
 SCRIPT_ARGS   =	--dest-dir="$(DESTDIR)" \
 		--extout="$(EXTOUT)" \
@@ -308,23 +347,23 @@ YJIT_RUSTC_ARGS = --crate-name=yjit \
 	-C opt-level=3 \
 	-C overflow-checks=on \
 	'--out-dir=$(CARGO_TARGET_DIR)/release/' \
-	$(top_srcdir)/yjit/src/lib.rs
+	'$(top_srcdir)/yjit/src/lib.rs'
+
+ZJIT_RUSTC_ARGS = --crate-name=zjit \
+	--crate-type=staticlib \
+	--edition=2024 \
+	-g \
+	-C lto=thin \
+	-C opt-level=3 \
+	-C overflow-checks=on \
+	'--out-dir=$(CARGO_TARGET_DIR)/release/' \
+	'$(top_srcdir)/zjit/src/lib.rs'
 
-all: $(SHOWFLAGS) main docs
+all: $(SHOWFLAGS) main
 
 main: $(SHOWFLAGS) exts $(ENCSTATIC:static=lib)encs
 	@$(NULLCMD)
 
-main: $(srcdir)/lib/ruby_vm/rjit/instruction.rb
-srcs: $(srcdir)/lib/ruby_vm/rjit/instruction.rb
-$(srcdir)/lib/ruby_vm/rjit/instruction.rb: $(tooldir)/insns2vm.rb $(tooldir)/ruby_vm/views/lib/ruby_vm/rjit/instruction.rb.erb $(srcdir)/insns.def
-	$(ECHO) generating $@
-	$(Q) $(BASERUBY) -Ku $(tooldir)/insns2vm.rb --basedir="$(srcdir)" $(INSNS2VMOPT) $@
-
-.PHONY: rjit-bindgen
-rjit-bindgen:
-	$(Q) $(BASERUBY) -rrubygems -C $(srcdir)/tool/rjit bindgen.rb $(CURDIR)
-
 .PHONY: showflags
 exts enc trans: $(SHOWFLAGS)
 showflags:
@@ -344,6 +383,7 @@ showflags:
 	"	MFLAGS = $(MFLAGS)" \
 	"	RUSTC = $(RUSTC)" \
 	"	YJIT_RUSTC_ARGS = $(YJIT_RUSTC_ARGS)" \
+	"	ZJIT_RUSTC_ARGS = $(ZJIT_RUSTC_ARGS)" \
 	$(MESSAGE_END)
 	-@$(CC_VERSION)
 
@@ -380,7 +420,7 @@ configure-ext: $(EXTS_MK)
 build-ext: $(EXTS_MK)
 	$(Q)$(MAKE) -f $(EXTS_MK) $(mflags) libdir="$(libdir)" LIBRUBY_EXTS=$(LIBRUBY_EXTS) \
 	    EXTENCS="$(ENCOBJS)" BASERUBY="$(BASERUBY)" MINIRUBY="$(MINIRUBY)" \
-	    UPDATE_LIBRARIES=no $(EXTSTATIC)
+	    $(EXTSTATIC)
 	$(Q)$(MAKE) $(EXTS_NOTE)
 
 exts-note: $(EXTS_MK)
@@ -396,7 +436,7 @@ programs: $(PROGRAM) $(WPROGRAM) $(arch)-fake.rb
 
 $(PREP): $(MKFILES)
 
-miniruby$(EXEEXT): config.status $(ALLOBJS) $(ARCHFILE)
+miniruby$(EXEEXT): config.status $(NORMALMAINOBJ) $(MINIOBJS) $(COMMONOBJS) $(ARCHFILE)
 
 objs: $(ALLOBJS)
 
@@ -423,8 +463,8 @@ Doxyfile: $(srcdir)/template/Doxyfile.tmpl $(PREP) $(tooldir)/generic_erb.rb $(R
 	$(Q) $(MINIRUBY) $(tooldir)/generic_erb.rb -o $@ $(srcdir)/template/Doxyfile.tmpl \
 	--srcdir="$(srcdir)" --miniruby="$(MINIRUBY)"
 
-program: $(SHOWFLAGS) $(PROGRAM)
-wprogram: $(SHOWFLAGS) $(WPROGRAM)
+program: $(SHOWFLAGS) $(DOT_WAIT) $(PROGRAM)
+wprogram: $(SHOWFLAGS) $(DOT_WAIT) $(WPROGRAM)
 mini: PHONY miniruby$(EXEEXT)
 
 $(PROGRAM) $(WPROGRAM): $(LIBRUBY) $(MAINOBJ) $(OBJS) $(EXTOBJS) $(SETUP) $(PREP)
@@ -444,8 +484,6 @@ ruby.imp: $(COMMONOBJS)
 	$(Q){ \
 	$(NM) -Pgp $(COMMONOBJS) | \
 	awk 'BEGIN{print "#!"}; $$2~/^[A-TV-Z]$$/&&$$1!~/^$(SYMBOL_PREFIX)(Init_|InitVM_|ruby_static_id_|.*_threadptr_|rb_ec_)|^\./{print $$1}'; \
-	($(CHDIR) $(srcdir) && \
-	 exec sed -n '/^RJIT_FUNC_EXPORTED/!d;N;s/.*\n\(rb_[a-zA-Z_0-9]*\).*/$(SYMBOL_PREFIX)\1/p' cont.c gc.c thread*c vm*.c) \
 	} | \
 	sort -u -o $@
 
@@ -454,17 +492,19 @@ docs: srcs-doc $(DOCTARGETS)
 pkgconfig-data: $(ruby_pc)
 $(ruby_pc): $(srcdir)/template/ruby.pc.in config.status
 
-install-all: docs pre-install-all do-install-all post-install-all
+INSTALL_ALL = all
+
+install-all: pre-install-all do-install-all post-install-all
 pre-install-all:: all pre-install-local pre-install-ext pre-install-gem pre-install-doc
-do-install-all: pre-install-all
-	$(INSTRUBY) --make="$(MAKE)" $(INSTRUBY_ARGS) --install=all $(INSTALL_DOC_OPTS)
+do-install-all: pre-install-all $(DOT_WAIT) docs
+	$(INSTRUBY) --make="$(MAKE)" $(INSTRUBY_ARGS) --install=$(INSTALL_ALL) $(INSTALL_DOC_OPTS)
 post-install-all:: post-install-local post-install-ext post-install-gem post-install-doc
 	@$(NULLCMD)
 
 install-nodoc: pre-install-nodoc do-install-nodoc post-install-nodoc
 pre-install-nodoc:: pre-install-local pre-install-ext pre-install-gem
 do-install-nodoc: main pre-install-nodoc
-	$(INSTRUBY) --make="$(MAKE)" $(INSTRUBY_ARGS) --install=all --exclude=doc
+	$(INSTRUBY) --make="$(MAKE)" $(INSTRUBY_ARGS) --install=$(INSTALL_ALL) --exclude=doc
 post-install-nodoc:: post-install-local post-install-ext post-install-gem
 
 install-local: pre-install-local do-install-local post-install-local
@@ -539,7 +579,7 @@ what-where-all: no-install-all
 no-install-all: pre-no-install-all dont-install-all post-no-install-all
 pre-no-install-all:: pre-no-install-local pre-no-install-ext pre-no-install-doc
 dont-install-all: $(PROGRAM)
-	$(INSTRUBY) -n --make="$(MAKE)" $(INSTRUBY_ARGS) --install=all $(INSTALL_DOC_OPTS)
+	$(INSTRUBY) -n --make="$(MAKE)" $(INSTRUBY_ARGS) --install=$(INSTALL_ALL) $(INSTALL_DOC_OPTS)
 post-no-install-all:: post-no-install-local post-no-install-ext post-no-install-doc
 	@$(NULLCMD)
 
@@ -644,18 +684,26 @@ do-install-dbg: $(PROGRAM) pre-install-dbg
 post-install-dbg::
 	@$(NULLCMD)
 
+srcs-doc: prepare-gems
+
 rdoc: PHONY main srcs-doc
 	@echo Generating RDoc documentation
-	$(Q) $(RDOC) --ri --op "$(RDOCOUT)" $(RDOC_GEN_OPTS) $(RDOCFLAGS) "$(srcdir)"
+	$(Q) $(RDOC) --ri --op "$(RDOCOUT)" $(RDOC_GEN_OPTS) $(RDOCFLAGS) .
 
 html: PHONY main srcs-doc
 	@echo Generating RDoc HTML files
-	$(Q) $(RDOC) --op "$(HTMLOUT)" $(RDOC_GEN_OPTS) $(RDOCFLAGS) "$(srcdir)"
+	$(Q) $(RDOC) --op "$(HTMLOUT)" $(RDOC_GEN_OPTS) $(RDOCFLAGS) .
 
 rdoc-coverage: PHONY main srcs-doc
 	@echo Generating RDoc coverage report
 	$(Q) $(RDOC) --quiet -C $(RDOCFLAGS) "$(srcdir)"
 
+undocumented: PHONY main srcs-doc
+	$(Q) $(RDOC) --quiet -C $(RDOCFLAGS) "$(srcdir)" | \
+	sed -n \
+	-e '/^ *# in file /{' -e 's///;N;s/\n/: /p' -e '}' \
+	-e 's/^ *\(.*[^ ]\) *# in file \(.*\)/\2: \1/p' | sort
+
 RDOCBENCHOUT=/tmp/rdocbench
 
 GCBENCH_ITEM=null
@@ -683,22 +731,27 @@ install-prereq: $(CLEAR_INSTALLED_LIST) yes-fake sudo-precheck PHONY
 clear-installed-list: PHONY
 	@> $(INSTALLED_LIST) set MAKE="$(MAKE)"
 
-clean: clean-ext clean-enc clean-golf clean-docs clean-extout clean-local clean-platform clean-spec
+clean: clean-ext clean-enc clean-golf clean-docs clean-extout clean-modular-gc clean-local clean-platform clean-spec
 clean-local:: clean-runnable
-	$(Q)$(RM) $(OBJS) $(MINIOBJS) $(INITOBJS) $(MAINOBJ) $(LIBRUBY_A) $(LIBRUBY_SO) $(LIBRUBY) $(LIBRUBY_ALIASES)
+	$(Q)$(RM) $(ALLOBJS) $(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 ChangeLog $(STATIC_RUBY)$(EXEEXT)
 	$(Q)$(RM) GNUmakefile.old Makefile.old $(arch)-fake.rb bisect.sh $(ENC_TRANS_D) builtin_binary.inc
-	-$(Q)$(RMALL) yjit/target
-	-$(Q) $(RMDIR) enc/jis enc/trans enc $(COROUTINE_H:/Context.h=) coroutine yjit 2> $(NULL) || $(NULLCMD)
+	$(Q)$(RM) $(PRISM_BUILD_DIR)/.time $(PRISM_BUILD_DIR)/*/.time yjit_exit_locations.dump
+	-$(Q)$(RMALL) target
+	-$(Q) $(RMDIR) enc/jis enc/trans enc $(COROUTINE_H:/Context.h=) coroutine target \
+	  $(PRISM_BUILD_DIR)/*/ $(PRISM_BUILD_DIR) tmp \
+	2> $(NULL) || $(NULLCMD)
 
 bin/clean-runnable:: PHONY
 	$(Q)$(CHDIR) bin 2>$(NULL) && $(RM) $(PROGRAM) $(WPROGRAM) $(GORUBY)$(EXEEXT) bin/*.$(DLEXT) 2>$(NULL) || $(NULLCMD)
 lib/clean-runnable:: PHONY
-	$(Q)$(CHDIR) lib 2>$(NULL) && $(RM) $(LIBRUBY_A) $(LIBRUBY) $(LIBRUBY_ALIASES) $(RUBY_BASE_NAME)/$(RUBY_PROGRAM_VERSION) $(RUBY_BASE_NAME)/vendor_ruby 2>$(NULL) || $(NULLCMD)
+	$(Q)$(CHDIR) lib 2>$(NULL) && $(RM) $(LIBRUBY_A) $(LIBRUBY) $(LIBRUBY_ALIASES) $(RUBY_BASE_NAME)/$(ruby_version) $(RUBY_BASE_NAME)/vendor_ruby 2>$(NULL) || $(NULLCMD)
 clean-runnable:: bin/clean-runnable lib/clean-runnable PHONY
 	$(Q)$(RMDIR) lib/$(RUBY_BASE_NAME) lib bin 2>$(NULL) || $(NULLCMD)
+	-$(Q)$(RM) $(EXTOUT)/$(arch)/rbconfig.rb $(EXTOUT)/common/$(arch)
+	-$(Q)$(RMALL) exe/
 clean-ext:: PHONY
 clean-golf: PHONY
 	$(Q)$(RM) $(GORUBY)$(EXEEXT) $(GOLFOBJS)
@@ -712,9 +765,9 @@ clean-docs: clean-rdoc clean-html clean-capi
 clean-spec: PHONY
 clean-rubyspec: clean-spec
 
-distclean: distclean-ext distclean-enc distclean-golf distclean-docs distclean-extout distclean-local distclean-platform distclean-spec
+distclean: distclean-ext distclean-enc distclean-golf distclean-docs distclean-extout distclean-modular-gc distclean-local distclean-platform distclean-spec
 distclean-local:: clean-local
-	$(Q)$(RM) $(MKFILES) yasmdata.rb *.inc $(PRELUDES) *.rbinc
+	$(Q)$(RM) $(MKFILES) *.inc $(PRELUDES) *.rbinc *.rbbin
 	$(Q)$(RM) config.cache config.status config.status.lineno
 	$(Q)$(RM) *~ *.bak *.stackdump core *.core gmon.out $(PREP)
 	-$(Q)$(RMALL) $(srcdir)/autom4te.cache
@@ -810,6 +863,12 @@ clean-platform distclean-platform realclean-platform:
 	-$(Q) $(RMDIR) $(PLATFORM_DIR) 2> $(NULL) || $(NULLCMD)
 
 RUBYSPEC_CAPIEXT = spec/ruby/optional/capi/ext
+RUBYSPEC_CAPIEXT_SRCDIR = $(srcdir)/$(RUBYSPEC_CAPIEXT)
+RUBYSPEC_CAPIEXT_DEPS = $(RUBYSPEC_CAPIEXT_SRCDIR)/rubyspec.h $(RUBY_H_INCLUDES) $(LIBRUBY)
+
+rubyspec-capiext: build-ext $(DOT_WAIT)
+# make-dependent rules should be included after this and built after build-ext.
+
 clean-spec: PHONY
 	-$(Q) $(RM) $(RUBYSPEC_CAPIEXT)/*.$(OBJEXT) $(RUBYSPEC_CAPIEXT)/*.$(DLEXT)
 	-$(Q) $(RMDIRS) $(RUBYSPEC_CAPIEXT) 2> $(NULL) || $(NULLCMD)
@@ -839,7 +898,8 @@ $(arch:noarch=ignore)-fake.rb: $(srcdir)/template/fake.rb.in $(tooldir)/generic_
 	$(ECHO) generating $@
 	$(Q) $(CPP) -DRUBY_EXPORT $(INCFLAGS) $(CPPFLAGS) "$(srcdir)/version.c" | \
 	$(BOOTSTRAPRUBY) "$(tooldir)/generic_erb.rb" -o $@ "$(srcdir)/template/fake.rb.in" \
-		i=- srcdir="$(srcdir)" BASERUBY="$(BASERUBY)"
+	    i=- srcdir="$(srcdir)" BASERUBY="$(BASERUBY)" \
+	    LIBPATHENV="$(LIBPATHENV)" PRELOADENV="$(PRELOADENV)" LIBRUBY_SO="$(LIBRUBY_SO)"
 
 noarch-fake.rb: # prerequisite of yes-fake
 	$(Q) exit > $@
@@ -904,18 +964,28 @@ test-sample: test-basic # backward compatibility for mswin-build
 test-short: btest-ruby $(DOT_WAIT) test-knownbug $(DOT_WAIT) test-basic
 test: test-short
 
-yes-test-all-precheck: programs encs exts PHONY $(DOT_WAIT)
+# Separate to skip updating encs and exts by `make -o test-precheck`
+# for GNU make.
+test-precheck: $(ENCSTATIC:static=lib)encs exts PHONY $(DOT_WAIT)
+yes-test-all-precheck: programs $(DOT_WAIT) test-precheck
+
+PRECHECK_TEST_ALL = yes-test-all-precheck
 
 # $ make test-all TESTOPTS="--help" displays more detail
 # for example, make test-all TESTOPTS="-j2 -v -n test-name -- test-file-name"
 test-all: $(TEST_RUNNABLE)-test-all
-yes-test-all: yes-test-all-precheck
+yes-test-all: $(PRECHECK_TEST_ALL)
 	$(ACTIONS_GROUP)
-	$(gnumake_recursive)$(Q)$(exec) $(RUNRUBY) "$(TESTSDIR)/runner.rb" --ruby="$(RUNRUBY)" $(TEST_EXCLUDES) $(TESTOPTS) $(TESTS)
+	$(gnumake_recursive)$(Q)$(exec) $(RUNRUBY) -r$(tooldir)/lib/_tmpdir \
+	"$(TESTSDIR)/runner.rb" --ruby="$(RUNRUBY)" \
+	$(TEST_EXCLUDES) $(TESTOPTS) $(TESTS)
 	$(ACTIONS_ENDGROUP)
 TESTS_BUILD = mkmf
 no-test-all: PHONY
-	$(gnumake_recursive)$(MINIRUBY) -I"$(srcdir)/lib" "$(TESTSDIR)/runner.rb" $(TESTOPTS) $(TESTS_BUILD)
+	$(ACTIONS_GROUP)
+	$(gnumake_recursive)$(MINIRUBY) -I"$(srcdir)/lib" -r$(tooldir)/lib/_tmpdir \
+	"$(TESTSDIR)/runner.rb" $(TESTOPTS) $(TESTS_BUILD)
+	$(ACTIONS_ENDGROUP)
 
 test-almost: test-all
 yes-test-almost: yes-test-all
@@ -957,7 +1027,7 @@ test-spec: $(TEST_RUNNABLE)-test-spec
 yes-test-spec: yes-test-spec-precheck
 	$(ACTIONS_GROUP)
 	$(gnumake_recursive)$(Q) \
-	$(RUNRUBY) -r./$(arch)-fake -r$(tooldir)/rubyspec_temp \
+	$(RUNRUBY) -r./$(arch)-fake -r$(tooldir)/lib/_tmpdir \
 		$(srcdir)/spec/mspec/bin/mspec run -B $(srcdir)/spec/default.mspec $(MSPECOPT) $(SPECOPTS)
 	$(ACTIONS_ENDGROUP)
 no-test-spec:
@@ -965,10 +1035,18 @@ no-test-spec:
 check: $(DOT_WAIT) test-spec
 
 RUNNABLE = $(LIBRUBY_RELATIVE:no=un)-runnable
-runnable: $(RUNNABLE) prog $(tooldir)/mkrunnable.rb PHONY
+runnable: $(RUNNABLE)
+runnable-golf: golf
+runnable $(enable_shared:yes=runnable-golf): prog $(tooldir)/mkrunnable.rb PHONY
 	$(Q) $(MINIRUBY) $(tooldir)/mkrunnable.rb -v $(EXTOUT)
 yes-runnable: PHONY
 
+hello: $(TEST_RUNNABLE)-hello
+yes-hello: runnable-golf
+	./$(enable_shared:yes=bin/)$(GORUBY) -veh
+no-hello: runnable-golf
+	$(ECHO) Run ./$(enable_shared:yes=bin/)$(GORUBY) -veh
+
 encs: enc trans
 libencs: libenc libtrans
 encs enc trans libencs libenc libtrans: $(SHOWFLAGS) $(ENC_MK) $(LIBRUBY) $(PREP) PHONY
@@ -1008,12 +1086,13 @@ PHONY:
 {$(srcdir)}.y.c:
 	$(ECHO) generating $@
 	$(Q)$(BASERUBY) $(tooldir)/id2token.rb $(SRC_FILE) | \
-	$(YACC) -d $(YFLAGS) -o$@ -h$*.h - parse.y
+	$(LRAMA) $(YFLAGS) -o$@ -H$*.h - parse.y
 
 $(PLATFORM_D):
 	$(Q) $(MAKEDIRS) $(PLATFORM_DIR) $(@D)
 	@$(NULLCMD) > $@
 
+exe/$(PROGRAM): $(TIMESTAMPDIR)/$(arch)/.time
 exe/$(PROGRAM): ruby-runner.c ruby-runner.h exe/.time $(PREP) {$(VPATH)}config.h
 	$(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)
@@ -1026,6 +1105,8 @@ exe/$(PROGRAM): ruby-runner.c ruby-runner.h exe/.time $(PREP) {$(VPATH)}config.h
 	    -e '  File.symlink(prog, dest)' \
 	    -e 'end' \
 	$(@F) $(@D) $(RUBY_INSTALL_NAME)$(EXEEXT)
+	$(Q) $(BOOTSTRAPRUBY) -r$(srcdir)/lib/fileutils \
+	    -e 'FileUtils::Verbose.ln_sr(*ARGV, force: true)' rbconfig.rb $(EXTOUT)/$(arch)
 
 exe/.time:
 	$(Q) $(MAKEDIRS) $(@D)
@@ -1127,10 +1208,11 @@ $(srcs_vpath)insns_info.inc: $(tooldir)/ruby_vm/views/insns_info.inc.erb $(inc_c
   $(tooldir)/ruby_vm/views/_insn_type_chars.erb $(tooldir)/ruby_vm/views/_insn_name_info.erb \
   $(tooldir)/ruby_vm/views/_insn_len_info.erb $(tooldir)/ruby_vm/views/_insn_operand_info.erb \
   $(tooldir)/ruby_vm/views/_attributes.erb $(tooldir)/ruby_vm/views/_comptime_insn_stack_increase.erb \
-  $(tooldir)/ruby_vm/views/_insn_sp_pc_dependency.erb
+  $(tooldir)/ruby_vm/views/_zjit_helpers.erb
 $(srcs_vpath)vmtc.inc: $(tooldir)/ruby_vm/views/vmtc.inc.erb $(inc_common_headers)
 $(srcs_vpath)vm.inc: $(tooldir)/ruby_vm/views/vm.inc.erb $(inc_common_headers) \
-  $(tooldir)/ruby_vm/views/_insn_entry.erb $(tooldir)/ruby_vm/views/_trace_instruction.erb
+  $(tooldir)/ruby_vm/views/_insn_entry.erb $(tooldir)/ruby_vm/views/_trace_instruction.erb \
+  $(tooldir)/ruby_vm/views/_zjit_instruction.erb
 
 BUILTIN_RB_SRCS = \
 		$(srcdir)/ast.rb \
@@ -1139,12 +1221,11 @@ BUILTIN_RB_SRCS = \
 		$(srcdir)/numeric.rb \
 		$(srcdir)/io.rb \
 		$(srcdir)/marshal.rb \
-		$(srcdir)/rjit.rb \
-		$(srcdir)/rjit_c.rb \
 		$(srcdir)/pack.rb \
 		$(srcdir)/trace_point.rb \
 		$(srcdir)/warning.rb \
 		$(srcdir)/array.rb \
+		$(srcdir)/hash.rb \
 		$(srcdir)/kernel.rb \
 		$(srcdir)/ractor.rb \
 		$(srcdir)/symbol.rb \
@@ -1154,6 +1235,8 @@ BUILTIN_RB_SRCS = \
 		$(srcdir)/prelude.rb \
 		$(srcdir)/gem_prelude.rb \
 		$(srcdir)/yjit.rb \
+		$(srcdir)/yjit_hook.rb \
+		$(srcdir)/zjit.rb \
 		$(empty)
 BUILTIN_RB_INCS = $(BUILTIN_RB_SRCS:.rb=.rbinc)
 
@@ -1183,7 +1266,7 @@ srcs-ext: $(EXT_SRCS)
 realclean-srcs-ext::
 	$(Q)$(RM) $(EXT_SRCS)
 
-EXTRA_SRCS = $(srcdir)/ext/json/parser/parser.c \
+EXTRA_SRCS = \
 	     $(srcdir)/ext/date/zonetab.h \
 	     $(empty)
 
@@ -1199,11 +1282,12 @@ srcs-enc: $(ENC_MK)
 	$(ECHO) making srcs under enc
 	$(Q) $(MAKE) $(MAKE_ENC) srcs
 
-all-incs: incs {$(VPATH)}encdb.h {$(VPATH)}transdb.h
+all-incs: incs {$(VPATH)}encdb.h {$(VPATH)}transdb.h {$(VPATH)}probes.h
 incs: $(INSNS) {$(VPATH)}node_name.inc {$(VPATH)}known_errors.inc \
       {$(VPATH)}vm_call_iseq_optimized.inc $(srcdir)/revision.h \
       $(REVISION_H) \
       $(UNICODE_DATA_HEADERS) $(ENC_HEADERS) \
+      $(srcs_vpath)prism/ast.h $(srcs_vpath)prism/diagnostic.h \
       {$(VPATH)}id.h {$(VPATH)}probes.dmyh
 
 insns: $(INSNS)
@@ -1245,10 +1329,7 @@ $(MINIPRELUDE_C): $(COMPILE_PRELUDE) $(BUILTIN_RB_SRCS)
 	$(Q) $(BASERUBY) $(tooldir)/generic_erb.rb -I$(srcdir) -o $@ \
 		$(srcdir)/template/prelude.c.tmpl $(BUILTIN_RB_SRCS)
 
-$(GOLF_PRELUDE_C): $(COMPILE_PRELUDE) {$(srcdir)}golf_prelude.rb
-	$(ECHO) generating $@
-	$(Q) $(BASERUBY) $(tooldir)/generic_erb.rb -I$(srcdir) -c -o $@ \
-		$(srcdir)/template/prelude.c.tmpl golf_prelude.rb
+golf_prelude.rbbin: {$(srcdir)}golf_prelude.rb $(tooldir)/mk_rbbin.rb $(PREP)
 
 MAINCPPFLAGS = $(ENABLE_DEBUG_ENV:yes=-DRUBY_DEBUG_ENV=1)
 
@@ -1266,15 +1347,22 @@ probes.h: {$(VPATH)}probes.$(DTRACE_EXT)
 prereq: incs srcs preludes PHONY
 
 preludes: {$(VPATH)}miniprelude.c
-preludes: {$(srcdir)}golf_prelude.c
+
+{$(srcdir)}.rb.rbbin:
+	$(ECHO) making $@
+	$(Q) $(MINIRUBY) $(tooldir)/mk_rbbin.rb $< > $@
 
 {$(srcdir)}.rb.rbinc:
 	$(ECHO) making $@
 	$(Q) $(BASERUBY) $(tooldir)/mk_builtin_loader.rb $<
 
-builtin_binary.inc: $(PREP) $(BUILTIN_RB_SRCS) $(srcdir)/template/builtin_binary.inc.tmpl
+$(BUILTIN_BINARY:yes=built)in_binary.inc: $(PREP) $(BUILTIN_RB_SRCS) $(srcdir)/template/builtin_binary.inc.tmpl
 	$(Q) $(MINIRUBY) $(tooldir)/generic_erb.rb -o $@ \
-		$(srcdir)/template/builtin_binary.inc.tmpl -- --cross=$(CROSS_COMPILING)
+		$(srcdir)/template/builtin_binary.inc.tmpl
+	-$(Q) sha256sum $@ 2> $(NULL) || $(NULLCMD)
+
+$(BUILTIN_BINARY:no=builtin)_binary.inc:
+	$(Q) echo> $@ // empty $(@F)
 
 $(BUILTIN_RB_INCS): $(top_srcdir)/tool/mk_builtin_loader.rb
 
@@ -1288,7 +1376,7 @@ $(REVISION_H)$(yes_baseruby:yes=~disabled~):
 # uncommon.mk: $(REVISION_H)
 # $(MKFILES): $(REVISION_H)
 
-$(DOT_WAIT)ripper_srcs: $(RIPPER_SRCS)
+ripper_srcs: $(RIPPER_SRCS)
 
 $(RIPPER_SRCS): $(srcdir)/parse.y $(srcdir)/defs/id.def
 $(RIPPER_SRCS): $(srcdir)/ext/ripper/tools/preproc.rb $(srcdir)/ext/ripper/tools/dsl.rb
@@ -1300,11 +1388,6 @@ $(RIPPER_SRCS): $(srcdir)/ext/ripper/ripper_init.c.tmpl $(srcdir)/ext/ripper/eve
 		Q=$(Q) ECHO=$(ECHO) RM="$(RM1)" top_srcdir=../.. srcdir=. VPATH=../.. \
 		RUBY="$(BASERUBY)" BASERUBY="$(BASERUBY)" PATH_SEPARATOR="$(PATH_SEPARATOR)" LANG=C
 
-$(srcdir)/ext/json/parser/parser.c: $(srcdir)/ext/json/parser/parser.rl $(srcdir)/ext/json/parser/prereq.mk
-	$(ECHO) generating $@
-	$(Q) $(CHDIR) $(@D) && $(exec) $(MAKE) -f prereq.mk $(mflags) \
-		Q=$(Q) ECHO=$(ECHO) top_srcdir=../../.. srcdir=. VPATH=../../.. BASERUBY="$(BASERUBY)"
-
 $(srcdir)/ext/date/zonetab.h: $(srcdir)/ext/date/zonetab.list $(srcdir)/ext/date/prereq.mk
 	$(ECHO) generating $@
 	$(Q) $(CHDIR) $(@D) && $(exec) $(MAKE) -f prereq.mk $(mflags) \
@@ -1326,7 +1409,7 @@ $(srcdir)/ext/rbconfig/sizeof/limits.c: $(srcdir)/ext/rbconfig/sizeof/depend \
 	$(exec) $(MAKE) -f - $(mflags) \
 		Q=$(Q) ECHO=$(ECHO) top_srcdir=../../.. srcdir=. VPATH=../../.. RUBY="$(BASERUBY)" $(@F)
 
-$(srcdir)/ext/socket/constdefs.c: $(srcdir)/ext/socket/depend
+$(srcdir)/ext/socket/constdefs.c: $(srcdir)/ext/socket/depend $(srcdir)/ext/socket/mkconstants.rb
 	$(Q) $(CHDIR) $(@D) && \
 	$(CAT_DEPEND) depend | \
 	$(exec) $(MAKE) -f - $(mflags) \
@@ -1346,8 +1429,8 @@ run: yes-fake miniruby$(EXEEXT) PHONY
 runruby: $(PROGRAM) PHONY
 	RUBY_ON_BUG='gdb -x $(srcdir)/.gdbinit -p' $(RUNRUBY) $(RUNOPT0) $(TESTRUN_SCRIPT) $(RUNOPT)
 
-runirb: $(PROGRAM) PHONY
-	RUBY_ON_BUG='gdb -x $(srcdir)/.gdbinit -p' $(RUNRUBY) $(RUNOPT0) -r irb -e 'IRB.start("make runirb")' $(RUNOPT)
+runirb: $(PROGRAM) update-default-gemspecs
+	RUBY_ON_BUG='gdb -x $(srcdir)/.gdbinit -p' $(RUNRUBY) $(RUNOPT0) -rrubygems -r irb -e 'IRB.start("make runirb")' $(RUNOPT)
 
 parse: yes-fake miniruby$(EXEEXT) PHONY
 	$(BTESTRUBY) --dump=parsetree_with_comment,insns $(TESTRUN_SCRIPT)
@@ -1449,7 +1532,7 @@ refresh-gems: update-bundled_gems prepare-gems
 prepare-gems: $(HAVE_BASERUBY:yes=update-gems) $(HAVE_BASERUBY:yes=extract-gems)
 extract-gems: $(HAVE_BASERUBY:yes=update-gems)
 
-update-gems$(gnumake:yes=-sequential): PHONY
+update-gems$(sequential): PHONY
 	$(ECHO) Downloading bundled gem files...
 	$(Q) $(BASERUBY) -C "$(srcdir)" \
 	    -I./tool -rdownloader -answ \
@@ -1463,7 +1546,7 @@ update-gems$(gnumake:yes=-sequential): PHONY
 	    -e 'FileUtils.rm_rf(old.map{'"|n|"'n.chomp(".gem")})' \
 	    gems/bundled_gems
 
-extract-gems$(gnumake:yes=-sequential): PHONY
+extract-gems$(sequential): PHONY
 	$(ECHO) Extracting bundled gem files...
 	$(Q) $(BASERUBY) -C "$(srcdir)" \
 	    -Itool/lib -rfileutils -rbundled_gem -answ \
@@ -1479,22 +1562,12 @@ extract-gems$(gnumake:yes=-sequential): PHONY
 	    -e 'end' \
 	    gems/bundled_gems
 
-extract-gems$(gnumake:yes=-sequential): $(HAVE_GIT:yes=clone-bundled-gems-src)
-
-clone-bundled-gems-src: PHONY
-	$(Q) $(BASERUBY) -C "$(srcdir)" \
-	    -Itool/lib -rbundled_gem -answ \
-	    -e 'BEGIN {git = $$git}' \
-	    -e 'gem, _, repo, rev = *$$F' \
-	    -e 'next if !rev or /^#/=~gem' \
-	    -e 'gemdir = "gems/src/#{gem}"' \
-	    -e 'BundledGem.checkout(gemdir, repo, rev, git: git)' \
-	    -e 'BundledGem.dummy_gemspec("#{gemdir}/#{gem}.gemspec")' \
-	    -- -git="$(GIT)" \
-	    gems/bundled_gems
+extract-gems$(sequential): $(HAVE_GIT:yes=clone-bundled-gems-src)
 
 outdate-bundled-gems: PHONY
-	$(Q) $(BASERUBY) $(tooldir)/$@.rb --make="$(MAKE)" --mflags="$(MFLAGS)" "$(srcdir)"
+	$(Q) $(BASERUBY) $(tooldir)/$@.rb --make="$(MAKE)" --mflags="$(MFLAGS)" \
+	--ruby-platform=$(arch) --ruby-version=$(ruby_version) \
+	"$(srcdir)"
 
 update-bundled_gems: PHONY
 	$(Q) $(RUNRUBY) -rrubygems \
@@ -1504,63 +1577,89 @@ update-bundled_gems: PHONY
 	$(GIT) -C "$(srcdir)" diff --no-ext-diff --ignore-submodules --exit-code || \
 	$(GIT) -C "$(srcdir)" commit -m "Update bundled_gems" gems/bundled_gems
 
-PRECHECK_BUNDLED_GEMS = test-bundled-gems-precheck
+PRECHECK_BUNDLED_GEMS = yes
 test-bundled-gems-precheck: $(TEST_RUNNABLE)-test-bundled-gems-precheck
-yes-test-bundled-gems-precheck: main
+yes-test-bundled-gems-precheck: $(PRECHECK_BUNDLED_GEMS:yes=main)
 no-test-bundled-gems-precheck:
 
+update-default-gemspecs: $(TEST_RUNNABLE)-update-default-gemspecs
+no-update-default-gemspecs:
+yes-update-default-gemspecs: $(PRECHECK_BUNDLED_GEMS:yes=main)
+	@$(MAKEDIRS) $(srcdir)/.bundle/specifications
+	@$(XRUBY) -W0 -C "$(srcdir)" -rrubygems \
+	    -e "destdir = ARGV.shift" \
+	    -e "ARGV.each do |basedir|" \
+	    -e   "Dir.glob(basedir+'/**/*.gemspec') do |g|" \
+	    -e     "dir, base = File.split(g)" \
+	    -e     "spec = Dir.chdir(dir) {Gem::Specification.load(base)} ||" \
+	    -e         "Gem::Specification.load(g)" \
+	    -e     "unless spec" \
+	    -e       "puts %[Ignoring #{g}]" \
+	    -e       "next" \
+	    -e     "end" \
+	    -e     "spec.files.clear" \
+	    -e     "spec.extensions.clear" \
+	    -e     "File.binwrite(File.join(destdir, spec.full_name+'.gemspec'), spec.to_ruby)" \
+	    -e   "end" \
+	    -e "end" \
+	    -- .bundle/specifications lib ext
+
+install-for-test-bundled-gems: $(TEST_RUNNABLE)-install-for-test-bundled-gems
+no-install-for-test-bundled-gems: no-update-default-gemspecs
+yes-install-for-test-bundled-gems: yes-update-default-gemspecs
+	$(XRUBY) -C "$(srcdir)" -r./tool/lib/gem_env.rb bin/gem \
+		install --no-document --conservative \
+		"hoe" "json-schema:5.1.0" "test-unit-rr" "simplecov" "simplecov-html" "simplecov-json" "rspec" "zeitwerk" \
+		"sinatra" "rack" "tilt" "mustermann" "base64" "compact_index" "rack-test" "logger" "kpeg" "tracer"
+
 test-bundled-gems-fetch: yes-test-bundled-gems-fetch
-yes-test-bundled-gems-fetch:
-	$(ACTIONS_GROUP)
-	$(Q) $(BASERUBY) -C $(srcdir)/gems ../tool/fetch-bundled_gems.rb src bundled_gems
-	$(ACTIONS_ENDGROUP)
+yes-test-bundled-gems-fetch: clone-bundled-gems-src
+clone-bundled-gems-src: PHONY
+	$(Q) $(BASERUBY) -C $(srcdir)/gems ../tool/fetch-bundled_gems.rb BUNDLED_GEMS="$(BUNDLED_GEMS)" src bundled_gems
 no-test-bundled-gems-fetch:
 
-test-bundled-gems-prepare: $(PRECHECK_BUNDLED_GEMS) test-bundled-gems-fetch
 test-bundled-gems-prepare: $(TEST_RUNNABLE)-test-bundled-gems-prepare
-no-test-bundled-gems-prepare: no-test-bundled-gems-precheck
-yes-test-bundled-gems-prepare: yes-test-bundled-gems-precheck
+no-test-bundled-gems-prepare: no-test-bundled-gems-precheck no-test-bundled-gems-fetch
+Preparing-test-bundled-gems:
 	$(ACTIONS_GROUP)
-	$(XRUBY) -C "$(srcdir)" bin/gem install --no-document \
-		--install-dir .bundle --conservative "hoe" "json-schema" "test-unit-rr"
+yes-test-bundled-gems-prepare: Preparing-test-bundled-gems $(DOT_WAIT)
 	$(ACTIONS_ENDGROUP)
+yes-test-bundled-gems-prepare: yes-test-bundled-gems-precheck $(DOT_WAIT)
+yes-test-bundled-gems-prepare: yes-install-for-test-bundled-gems $(DOT_WAIT)
+yes-test-bundled-gems-prepare: yes-test-bundled-gems-fetch $(DOT_WAIT)
+yes-test-bundled-gems-precheck: Preparing-test-bundled-gems
+yes-install-for-test-bundled-gems: Preparing-test-bundled-gems
+yes-test-bundled-gems-fetch: Preparing-test-bundled-gems
 
 PREPARE_BUNDLED_GEMS = test-bundled-gems-prepare
-test-bundled-gems: $(TEST_RUNNABLE)-test-bundled-gems
+test-bundled-gems: $(TEST_RUNNABLE)-test-bundled-gems $(DOT_WAIT) $(TEST_RUNNABLE)-test-bundled-gems-spec
 yes-test-bundled-gems: test-bundled-gems-run
 no-test-bundled-gems:
 
+bundled_gems_spec-run: install-for-test-bundled-gems
+	$(XRUBY) -C $(srcdir) .bundle/bin/rspec spec/bundled_gems_spec.rb
+
 # Override this to allow failure of specific gems on CI
 # TEST_BUNDLED_GEMS_ALLOW_FAILURES =
 
 BUNDLED_GEMS =
-test-bundled-gems-run: $(PREPARE_BUNDLED_GEMS)
+test-bundled-gems-run: $(TEST_RUNNABLE)-test-bundled-gems-run
+yes-test-bundled-gems-run: $(PREPARE_BUNDLED_GEMS)
 	$(gnumake_recursive)$(Q) $(XRUBY) $(tooldir)/test-bundled-gems.rb $(BUNDLED_GEMS)
+no-test-bundled-gems-run: $(PREPARE_BUNDLED_GEMS)
 
-test-syntax-suggest-precheck: $(TEST_RUNNABLE)-test-syntax-suggest-precheck
-no-test-syntax-suggest-precheck:
-yes-test-syntax-suggest-precheck: main
-
-test-syntax-suggest-prepare: $(TEST_RUNNABLE)-test-syntax-suggest-prepare
-no-test-syntax-suggest-prepare: no-test-syntax-suggest-precheck
-yes-test-syntax-suggest-prepare: yes-test-syntax-suggest-precheck
+test-bundled-gems-spec: $(TEST_RUNNABLE)-test-bundled-gems-spec
+yes-test-bundled-gems-spec: yes-test-spec-precheck $(PREPARE_BUNDLED_GEMS)
 	$(ACTIONS_GROUP)
-	$(XRUBY) -C "$(srcdir)" bin/gem install --no-document \
-		--install-dir .bundle --conservative "rspec:~> 3"
+	$(gnumake_recursive)$(Q) \
+	$(RUNRUBY) -r./$(arch)-fake -r$(tooldir)/lib/_tmpdir \
+		$(srcdir)/spec/mspec/bin/mspec run --env BUNDLED_GEMS=$(BUNDLED_GEMS) -B $(srcdir)/spec/bundled_gems.mspec \
+		$(MSPECOPT) $(SPECOPTS)
 	$(ACTIONS_ENDGROUP)
+no-test-bundled-gems-spec:
 
-RSPECOPTS =
-SYNTAX_SUGGEST_SPECS =
-PREPARE_SYNTAX_SUGGEST = $(TEST_RUNNABLE)-test-syntax-suggest-prepare
-test-syntax-suggest: $(TEST_RUNNABLE)-test-syntax-suggest
-yes-test-syntax-suggest: $(PREPARE_SYNTAX_SUGGEST)
-	$(ACTIONS_GROUP)
-	$(XRUBY) -C $(srcdir) -Ispec/syntax_suggest:spec/lib .bundle/bin/rspec \
-		--require rspec/expectations \
-		--require spec_helper --require formatter_overrides --require spec_coverage \
-		$(RSPECOPTS) spec/syntax_suggest/$(SYNTAX_SUGGEST_SPECS)
-	$(ACTIONS_ENDGROUP)
-no-test-syntax-suggest:
+
+test-syntax-suggest:
 
 check: $(DOT_WAIT) $(PREPARE_SYNTAX_SUGGEST) test-syntax-suggest
 
@@ -1573,24 +1672,19 @@ test-bundler-prepare: $(TEST_RUNNABLE)-test-bundler-prepare
 no-test-bundler-prepare: no-test-bundler-precheck
 yes-test-bundler-prepare: yes-test-bundler-precheck
 	$(ACTIONS_GROUP)
-	$(XRUBY) -C $(srcdir) -Ilib \
-		-e 'ENV["GEM_HOME"] = File.expand_path(".bundle")' \
-		-e 'ENV["BUNDLE_APP_CONFIG"] = File.expand_path(".bundle")' \
-		-e 'ENV["BUNDLE_PATH__SYSTEM"] = "true"' \
-		-e 'ENV["BUNDLE_WITHOUT"] = "lint doc"' \
-		-e 'load "spec/bundler/support/bundle.rb"' -- install --quiet --gemfile=tool/bundler/dev_gems.rb
+	$(XRUBY) -C $(srcdir) -Ilib -r./tool/lib/bundle_env.rb \
+		spec/bin/bundle install --quiet --gemfile=tool/bundler/dev_gems.rb
 	$(ACTIONS_ENDGROUP)
 
-RSPECOPTS =
+RSPECOPTS = -r formatter_overrides
 BUNDLER_SPECS =
 PREPARE_BUNDLER = $(TEST_RUNNABLE)-test-bundler-prepare
 test-bundler: $(TEST_RUNNABLE)-test-bundler
 yes-test-bundler: $(PREPARE_BUNDLER)
 	$(gnumake_recursive)$(XRUBY) \
 		-r./$(arch)-fake \
-		-e "exec(*ARGV)" -- \
-		$(XRUBY) -C $(srcdir) -Ispec/bundler:spec/lib .bundle/bin/rspec \
-		--require spec_helper --require formatter_overrides $(RSPECOPTS) spec/bundler/$(BUNDLER_SPECS)
+		-C $(srcdir) -Ispec/bundler -Ispec/lib spec/bin/rspec \
+		-r spec_helper $(RSPECOPTS) spec/bundler/$(BUNDLER_SPECS)
 no-test-bundler:
 
 PARALLELRSPECOPTS = --runtime-log $(srcdir)/tmp/parallel_runtime_rspec.log
@@ -1598,22 +1692,21 @@ test-bundler-parallel: $(TEST_RUNNABLE)-test-bundler-parallel
 yes-test-bundler-parallel: $(PREPARE_BUNDLER)
 	$(gnumake_recursive)$(XRUBY) \
 		-r./$(arch)-fake \
+		-I$(srcdir)/spec/bundler \
+		-e "ruby = ENV['RUBY']" \
 		-e "ARGV[-1] = File.expand_path(ARGV[-1])" \
-		-e "exec(*ARGV)" -- \
-		$(XRUBY) -I$(srcdir)/spec/bundler \
-		-e "ENV['PARALLEL_TESTS_EXECUTABLE'] = ARGV.shift" \
+		-e "ENV['RSPEC_EXECUTABLE'] = ruby + ARGV.shift" \
 		-e "load ARGV.shift" \
-		"$(XRUBY) -C $(srcdir) -Ispec/bundler:spec/lib .bundle/bin/rspec" \
-		$(srcdir)/.bundle/bin/parallel_rspec \
-		-o "--require spec_helper --require formatter_overrides" \
+		" -C $(srcdir) -Ispec/bundler -Ispec/lib .bundle/bin/rspec -r spec_helper" \
+		$(srcdir)/spec/bin/parallel_rspec $(RSPECOPTS) \
 		$(PARALLELRSPECOPTS) $(srcdir)/spec/bundler/$(BUNDLER_SPECS)
 no-test-bundler-parallel:
 
 # The annocheck supports ELF format binaries compiled for any OS and for any
 # architecture. It is designed to be independent of the host OS and the
 # architecture. The test-annocheck.sh requires docker or podman.
-test-annocheck: $(PROGRAM)
-	$(tooldir)/test-annocheck.sh $(PROGRAM)
+test-annocheck: $(PROGRAM) $(LIBRUBY_SO)
+	$(tooldir)/test-annocheck.sh $(PROGRAM) $(LIBRUBY_SO)
 
 GEM = up
 sync-default-gems:
@@ -1626,7 +1719,7 @@ UNICODE_FILES = $(UNICODE_SRC_DATA_DIR)/UnicodeData.txt \
 		$(UNICODE_SRC_DATA_DIR)/SpecialCasing.txt \
 		$(empty)
 
-UNICODE_PROPERTY_FILES =  \
+UNICODE_PROPERTY_FILES = \
 		$(UNICODE_SRC_DATA_DIR)/Blocks.txt \
 		$(UNICODE_SRC_DATA_DIR)/DerivedAge.txt \
 		$(UNICODE_SRC_DATA_DIR)/DerivedCoreProperties.txt \
@@ -1636,7 +1729,7 @@ UNICODE_PROPERTY_FILES =  \
 		$(UNICODE_SRC_DATA_DIR)/Scripts.txt \
 		$(empty)
 
-UNICODE_AUXILIARY_FILES =  \
+UNICODE_AUXILIARY_FILES = \
 		$(UNICODE_SRC_DATA_DIR)/auxiliary/GraphemeBreakProperty.txt \
 		$(UNICODE_SRC_DATA_DIR)/auxiliary/GraphemeBreakTest.txt \
 		$(empty)
@@ -1679,30 +1772,46 @@ UNICODE_EMOJI_DOWNLOAD = \
 	    -d $(UNICODE_SRC_EMOJI_DATA_DIR) \
 	    -p emoji/$(UNICODE_EMOJI_VERSION)
 
-update-unicode-files: $(UNICODE_FILES) $(UNICODE_PROPERTY_FILES)
-$(UNICODE_FILES) $(UNICODE_PROPERTY_FILES):
+update-unicode-files:
 	$(ECHO) Downloading Unicode $(UNICODE_VERSION) data and property files...
 	$(Q) $(MAKEDIRS) "$(UNICODE_SRC_DATA_DIR)"
 	$(Q) $(UNICODE_DOWNLOAD) $(UNICODE_FILES) $(UNICODE_PROPERTY_FILES)
 
-update-unicode-auxiliary-files: $(UNICODE_AUXILIARY_FILES)
-$(UNICODE_AUXILIARY_FILES):
+update-unicode-auxiliary-files:
 	$(ECHO) Downloading Unicode $(UNICODE_VERSION) auxiliary files...
 	$(Q) $(MAKEDIRS) "$(UNICODE_SRC_DATA_DIR)/auxiliary"
 	$(Q) $(UNICODE_AUXILIARY_DOWNLOAD) $(UNICODE_AUXILIARY_FILES)
 
-update-unicode-ucd-emoji-files: $(UNICODE_UCD_EMOJI_FILES)
-$(UNICODE_UCD_EMOJI_FILES):
+update-unicode-ucd-emoji-files:
 	$(ECHO) Downloading Unicode UCD emoji $(UNICODE_EMOJI_VERSION) files...
 	$(Q) $(MAKEDIRS) "$(UNICODE_SRC_DATA_DIR)/emoji"
 	$(Q) $(UNICODE_UCD_EMOJI_DOWNLOAD) $(UNICODE_UCD_EMOJI_FILES)
 
-update-unicode-emoji-files: $(UNICODE_EMOJI_FILES)
-$(UNICODE_EMOJI_FILES):
+update-unicode-emoji-files:
 	$(ECHO) Downloading Unicode emoji $(UNICODE_EMOJI_VERSION) files...
 	$(Q) $(MAKEDIRS) "$(UNICODE_SRC_EMOJI_DATA_DIR)"
 	$(Q) $(UNICODE_EMOJI_DOWNLOAD) $(UNICODE_EMOJI_FILES)
 
+$(UNICODE_FILES) $(UNICODE_PROPERTY_FILES):
+	$(ECHO) Downloading Unicode $(UNICODE_VERSION) data and property files...
+	$(Q) $(MAKEDIRS) "$(UNICODE_SRC_DATA_DIR)"
+	$(Q) $(UNICODE_DOWNLOAD) $@
+
+$(UNICODE_AUXILIARY_FILES):
+	$(ECHO) Downloading Unicode $(UNICODE_VERSION) auxiliary files...
+	$(Q) $(MAKEDIRS) "$(UNICODE_SRC_DATA_DIR)/auxiliary"
+	$(Q) $(UNICODE_AUXILIARY_DOWNLOAD) $@
+
+$(UNICODE_UCD_EMOJI_FILES):
+	$(ECHO) Downloading Unicode UCD emoji $(UNICODE_EMOJI_VERSION) files...
+	$(Q) $(MAKEDIRS) "$(UNICODE_SRC_DATA_DIR)/emoji"
+	$(Q) $(UNICODE_UCD_EMOJI_DOWNLOAD) $@
+
+$(UNICODE_EMOJI_FILES):
+	$(ECHO) Downloading Unicode emoji $(UNICODE_EMOJI_VERSION) files...
+	$(Q) $(MAKEDIRS) "$(UNICODE_SRC_EMOJI_DATA_DIR)"
+	$(Q) $(UNICODE_EMOJI_DOWNLOAD) $@
+
 $(srcdir)/lib/unicode_normalize/tables.rb: \
 	$(UNICODE_SRC_DATA_DIR)/$(HAVE_BASERUBY:yes=.unicode-tables.time)
 
@@ -1808,6 +1917,7 @@ info-arch: PHONY
 
 exam: check
 exam: $(DOT_WAIT) test-bundler-parallel
+exam: $(DOT_WAIT) bundled_gems_spec-run
 exam: $(DOT_WAIT) test-bundled-gems
 
 love: sudo-precheck up all test exam install
@@ -1830,11 +1940,56 @@ update-man-date: PHONY
 ChangeLog:
 	$(ECHO) Generating $@
 	-$(Q) $(BASERUBY) -I"$(tooldir)/lib" -rvcs \
-	-e 'VCS.detect(ARGV[0]).export_changelog("@", nil, nil, ARGV[1])' \
+	-e 'VCS.detect(ARGV[0]).export_changelog(path: ARGV[1])' \
 	"$(srcdir)" $@
 
+# CAUTION: If using GNU make 3 which does not support `.WAIT`, this
+# recipe with multiple jobs makes build and `git reset` run
+# simultaneously, and will cause inconsistent results.  Run with `-j1`
+# or update GNU make.
+nightly: yesterday $(DOT_WAIT) install
+	$(NULLCMD)
+
+# Rewind to the last commit "yesterday".  "Yesterday" means here the
+# period where `RUBY_RELEASE_DATE` is the day before the date to be
+# generated now.  In short, the yesterday in JST-9 time zone.
+yesterday: rewindable
+
+rewindable:
+	$(GIT) -C $(srcdir) status --porcelain
+	$(GIT) -C $(srcdir) diff --quiet
+
 HELP_EXTRA_TASKS = ""
 
+gc/Makefile:
+	$(MAKEDIRS) $(@D)
+	$(MESSAGE_BEGIN) \
+	"all:" \
+	"	@echo You must specify MODULAR_GC with the GC to build" \
+	"	@exit 1" \
+	$(MESSAGE_END) > $@
+gc/distclean gc/realclean::
+	-$(Q) $(RM) gc/Makefile
+
+modular-gc-precheck:
+modular-gc: probes.h gc/Makefile
+	$(Q) $(RUNRUBY) $(srcdir)/ext/extmk.rb \
+		$(SCRIPT_ARGS) \
+		--make='$(MAKE)' --make-flags="V=$(V) MINIRUBY='$(MINIRUBY)'" \
+		--gnumake=$(gnumake) --extflags="$(EXTLDFLAGS)" \
+		--ext-build-dir=gc --command-output=gc/$(MODULAR_GC)/exts.mk -- \
+		configure gc/$(MODULAR_GC)
+	$(CHDIR) gc/$(MODULAR_GC) && $(exec) $(MAKE) TARGET_SO_DIR=./
+install-modular-gc: modular-gc modular-gc-precheck
+	$(Q) $(MAKEDIRS) $(modular_gc_dir)
+	$(CP) gc/$(MODULAR_GC)/librubygc.$(MODULAR_GC).$(DLEXT) $(modular_gc_dir)
+
+clean-modular-gc: gc/clean
+distclean-modular-gc: gc/distclean
+realclean-modular-gc: gc/realclean
+distclean-modular-gc realclean-modular-gc:
+	-$(Q) $(RMDIR) gc
+
 help: PHONY
 	$(MESSAGE_BEGIN) \
 	"                Makefile of Ruby" \
@@ -1955,11 +2110,14 @@ 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/imemo.h
+array.$(OBJEXT): $(top_srcdir)/internal/namespace.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/sanitizers.h
 array.$(OBJEXT): $(top_srcdir)/internal/serial.h
+array.$(OBJEXT): $(top_srcdir)/internal/set_table.h
 array.$(OBJEXT): $(top_srcdir)/internal/static_assert.h
 array.$(OBJEXT): $(top_srcdir)/internal/variable.h
 array.$(OBJEXT): $(top_srcdir)/internal/vm.h
@@ -2110,6 +2268,7 @@ array.$(OBJEXT): {$(VPATH)}internal/intern/re.h
 array.$(OBJEXT): {$(VPATH)}internal/intern/ruby.h
 array.$(OBJEXT): {$(VPATH)}internal/intern/select.h
 array.$(OBJEXT): {$(VPATH)}internal/intern/select/largesize.h
+array.$(OBJEXT): {$(VPATH)}internal/intern/set.h
 array.$(OBJEXT): {$(VPATH)}internal/intern/signal.h
 array.$(OBJEXT): {$(VPATH)}internal/intern/sprintf.h
 array.$(OBJEXT): {$(VPATH)}internal/intern/string.h
@@ -2129,6 +2288,7 @@ array.$(OBJEXT): {$(VPATH)}internal/special_consts.h
 array.$(OBJEXT): {$(VPATH)}internal/static_assert.h
 array.$(OBJEXT): {$(VPATH)}internal/stdalign.h
 array.$(OBJEXT): {$(VPATH)}internal/stdbool.h
+array.$(OBJEXT): {$(VPATH)}internal/stdckdint.h
 array.$(OBJEXT): {$(VPATH)}internal/symbol.h
 array.$(OBJEXT): {$(VPATH)}internal/value.h
 array.$(OBJEXT): {$(VPATH)}internal/value_type.h
@@ -2148,6 +2308,7 @@ array.$(OBJEXT): {$(VPATH)}rubyparser.h
 array.$(OBJEXT): {$(VPATH)}shape.h
 array.$(OBJEXT): {$(VPATH)}st.h
 array.$(OBJEXT): {$(VPATH)}subst.h
+array.$(OBJEXT): {$(VPATH)}thread.h
 array.$(OBJEXT): {$(VPATH)}thread_$(THREAD_MODEL).h
 array.$(OBJEXT): {$(VPATH)}thread_native.h
 array.$(OBJEXT): {$(VPATH)}util.h
@@ -2161,17 +2322,46 @@ ast.$(OBJEXT): $(hdrdir)/ruby.h
 ast.$(OBJEXT): $(hdrdir)/ruby/ruby.h
 ast.$(OBJEXT): $(top_srcdir)/internal/array.h
 ast.$(OBJEXT): $(top_srcdir)/internal/basic_operators.h
+ast.$(OBJEXT): $(top_srcdir)/internal/bignum.h
+ast.$(OBJEXT): $(top_srcdir)/internal/bits.h
 ast.$(OBJEXT): $(top_srcdir)/internal/compilers.h
+ast.$(OBJEXT): $(top_srcdir)/internal/complex.h
+ast.$(OBJEXT): $(top_srcdir)/internal/fixnum.h
 ast.$(OBJEXT): $(top_srcdir)/internal/gc.h
 ast.$(OBJEXT): $(top_srcdir)/internal/imemo.h
+ast.$(OBJEXT): $(top_srcdir)/internal/namespace.h
+ast.$(OBJEXT): $(top_srcdir)/internal/numeric.h
 ast.$(OBJEXT): $(top_srcdir)/internal/parse.h
+ast.$(OBJEXT): $(top_srcdir)/internal/rational.h
 ast.$(OBJEXT): $(top_srcdir)/internal/ruby_parser.h
+ast.$(OBJEXT): $(top_srcdir)/internal/sanitizers.h
 ast.$(OBJEXT): $(top_srcdir)/internal/serial.h
+ast.$(OBJEXT): $(top_srcdir)/internal/set_table.h
 ast.$(OBJEXT): $(top_srcdir)/internal/static_assert.h
 ast.$(OBJEXT): $(top_srcdir)/internal/symbol.h
 ast.$(OBJEXT): $(top_srcdir)/internal/variable.h
 ast.$(OBJEXT): $(top_srcdir)/internal/vm.h
 ast.$(OBJEXT): $(top_srcdir)/internal/warnings.h
+ast.$(OBJEXT): $(top_srcdir)/prism/defines.h
+ast.$(OBJEXT): $(top_srcdir)/prism/encoding.h
+ast.$(OBJEXT): $(top_srcdir)/prism/node.h
+ast.$(OBJEXT): $(top_srcdir)/prism/options.h
+ast.$(OBJEXT): $(top_srcdir)/prism/pack.h
+ast.$(OBJEXT): $(top_srcdir)/prism/parser.h
+ast.$(OBJEXT): $(top_srcdir)/prism/prettyprint.h
+ast.$(OBJEXT): $(top_srcdir)/prism/prism.h
+ast.$(OBJEXT): $(top_srcdir)/prism/regexp.h
+ast.$(OBJEXT): $(top_srcdir)/prism/static_literals.h
+ast.$(OBJEXT): $(top_srcdir)/prism/util/pm_buffer.h
+ast.$(OBJEXT): $(top_srcdir)/prism/util/pm_char.h
+ast.$(OBJEXT): $(top_srcdir)/prism/util/pm_constant_pool.h
+ast.$(OBJEXT): $(top_srcdir)/prism/util/pm_integer.h
+ast.$(OBJEXT): $(top_srcdir)/prism/util/pm_list.h
+ast.$(OBJEXT): $(top_srcdir)/prism/util/pm_memchr.h
+ast.$(OBJEXT): $(top_srcdir)/prism/util/pm_newline_list.h
+ast.$(OBJEXT): $(top_srcdir)/prism/util/pm_string.h
+ast.$(OBJEXT): $(top_srcdir)/prism/util/pm_strncasecmp.h
+ast.$(OBJEXT): $(top_srcdir)/prism/util/pm_strpbrk.h
 ast.$(OBJEXT): {$(VPATH)}assert.h
 ast.$(OBJEXT): {$(VPATH)}ast.c
 ast.$(OBJEXT): {$(VPATH)}ast.rbinc
@@ -2317,6 +2507,7 @@ ast.$(OBJEXT): {$(VPATH)}internal/intern/re.h
 ast.$(OBJEXT): {$(VPATH)}internal/intern/ruby.h
 ast.$(OBJEXT): {$(VPATH)}internal/intern/select.h
 ast.$(OBJEXT): {$(VPATH)}internal/intern/select/largesize.h
+ast.$(OBJEXT): {$(VPATH)}internal/intern/set.h
 ast.$(OBJEXT): {$(VPATH)}internal/intern/signal.h
 ast.$(OBJEXT): {$(VPATH)}internal/intern/sprintf.h
 ast.$(OBJEXT): {$(VPATH)}internal/intern/string.h
@@ -2336,6 +2527,7 @@ ast.$(OBJEXT): {$(VPATH)}internal/special_consts.h
 ast.$(OBJEXT): {$(VPATH)}internal/static_assert.h
 ast.$(OBJEXT): {$(VPATH)}internal/stdalign.h
 ast.$(OBJEXT): {$(VPATH)}internal/stdbool.h
+ast.$(OBJEXT): {$(VPATH)}internal/stdckdint.h
 ast.$(OBJEXT): {$(VPATH)}internal/symbol.h
 ast.$(OBJEXT): {$(VPATH)}internal/value.h
 ast.$(OBJEXT): {$(VPATH)}internal/value_type.h
@@ -2348,6 +2540,10 @@ ast.$(OBJEXT): {$(VPATH)}missing.h
 ast.$(OBJEXT): {$(VPATH)}node.h
 ast.$(OBJEXT): {$(VPATH)}onigmo.h
 ast.$(OBJEXT): {$(VPATH)}oniguruma.h
+ast.$(OBJEXT): {$(VPATH)}prism/ast.h
+ast.$(OBJEXT): {$(VPATH)}prism/diagnostic.h
+ast.$(OBJEXT): {$(VPATH)}prism/version.h
+ast.$(OBJEXT): {$(VPATH)}prism_compile.h
 ast.$(OBJEXT): {$(VPATH)}ruby_assert.h
 ast.$(OBJEXT): {$(VPATH)}ruby_atomic.h
 ast.$(OBJEXT): {$(VPATH)}rubyparser.h
@@ -2374,10 +2570,12 @@ 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/imemo.h
+bignum.$(OBJEXT): $(top_srcdir)/internal/namespace.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/set_table.h
 bignum.$(OBJEXT): $(top_srcdir)/internal/static_assert.h
 bignum.$(OBJEXT): $(top_srcdir)/internal/variable.h
 bignum.$(OBJEXT): $(top_srcdir)/internal/vm.h
@@ -2525,6 +2723,7 @@ bignum.$(OBJEXT): {$(VPATH)}internal/intern/re.h
 bignum.$(OBJEXT): {$(VPATH)}internal/intern/ruby.h
 bignum.$(OBJEXT): {$(VPATH)}internal/intern/select.h
 bignum.$(OBJEXT): {$(VPATH)}internal/intern/select/largesize.h
+bignum.$(OBJEXT): {$(VPATH)}internal/intern/set.h
 bignum.$(OBJEXT): {$(VPATH)}internal/intern/signal.h
 bignum.$(OBJEXT): {$(VPATH)}internal/intern/sprintf.h
 bignum.$(OBJEXT): {$(VPATH)}internal/intern/string.h
@@ -2544,6 +2743,7 @@ bignum.$(OBJEXT): {$(VPATH)}internal/special_consts.h
 bignum.$(OBJEXT): {$(VPATH)}internal/static_assert.h
 bignum.$(OBJEXT): {$(VPATH)}internal/stdalign.h
 bignum.$(OBJEXT): {$(VPATH)}internal/stdbool.h
+bignum.$(OBJEXT): {$(VPATH)}internal/stdckdint.h
 bignum.$(OBJEXT): {$(VPATH)}internal/symbol.h
 bignum.$(OBJEXT): {$(VPATH)}internal/value.h
 bignum.$(OBJEXT): {$(VPATH)}internal/value_type.h
@@ -2577,11 +2777,34 @@ builtin.$(OBJEXT): $(top_srcdir)/internal/basic_operators.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/namespace.h
+builtin.$(OBJEXT): $(top_srcdir)/internal/sanitizers.h
 builtin.$(OBJEXT): $(top_srcdir)/internal/serial.h
+builtin.$(OBJEXT): $(top_srcdir)/internal/set_table.h
 builtin.$(OBJEXT): $(top_srcdir)/internal/static_assert.h
 builtin.$(OBJEXT): $(top_srcdir)/internal/variable.h
 builtin.$(OBJEXT): $(top_srcdir)/internal/vm.h
 builtin.$(OBJEXT): $(top_srcdir)/internal/warnings.h
+builtin.$(OBJEXT): $(top_srcdir)/prism/defines.h
+builtin.$(OBJEXT): $(top_srcdir)/prism/encoding.h
+builtin.$(OBJEXT): $(top_srcdir)/prism/node.h
+builtin.$(OBJEXT): $(top_srcdir)/prism/options.h
+builtin.$(OBJEXT): $(top_srcdir)/prism/pack.h
+builtin.$(OBJEXT): $(top_srcdir)/prism/parser.h
+builtin.$(OBJEXT): $(top_srcdir)/prism/prettyprint.h
+builtin.$(OBJEXT): $(top_srcdir)/prism/prism.h
+builtin.$(OBJEXT): $(top_srcdir)/prism/regexp.h
+builtin.$(OBJEXT): $(top_srcdir)/prism/static_literals.h
+builtin.$(OBJEXT): $(top_srcdir)/prism/util/pm_buffer.h
+builtin.$(OBJEXT): $(top_srcdir)/prism/util/pm_char.h
+builtin.$(OBJEXT): $(top_srcdir)/prism/util/pm_constant_pool.h
+builtin.$(OBJEXT): $(top_srcdir)/prism/util/pm_integer.h
+builtin.$(OBJEXT): $(top_srcdir)/prism/util/pm_list.h
+builtin.$(OBJEXT): $(top_srcdir)/prism/util/pm_memchr.h
+builtin.$(OBJEXT): $(top_srcdir)/prism/util/pm_newline_list.h
+builtin.$(OBJEXT): $(top_srcdir)/prism/util/pm_string.h
+builtin.$(OBJEXT): $(top_srcdir)/prism/util/pm_strncasecmp.h
+builtin.$(OBJEXT): $(top_srcdir)/prism/util/pm_strpbrk.h
 builtin.$(OBJEXT): {$(VPATH)}assert.h
 builtin.$(OBJEXT): {$(VPATH)}atomic.h
 builtin.$(OBJEXT): {$(VPATH)}backward/2/assume.h
@@ -2727,6 +2950,7 @@ builtin.$(OBJEXT): {$(VPATH)}internal/intern/re.h
 builtin.$(OBJEXT): {$(VPATH)}internal/intern/ruby.h
 builtin.$(OBJEXT): {$(VPATH)}internal/intern/select.h
 builtin.$(OBJEXT): {$(VPATH)}internal/intern/select/largesize.h
+builtin.$(OBJEXT): {$(VPATH)}internal/intern/set.h
 builtin.$(OBJEXT): {$(VPATH)}internal/intern/signal.h
 builtin.$(OBJEXT): {$(VPATH)}internal/intern/sprintf.h
 builtin.$(OBJEXT): {$(VPATH)}internal/intern/string.h
@@ -2746,6 +2970,7 @@ builtin.$(OBJEXT): {$(VPATH)}internal/special_consts.h
 builtin.$(OBJEXT): {$(VPATH)}internal/static_assert.h
 builtin.$(OBJEXT): {$(VPATH)}internal/stdalign.h
 builtin.$(OBJEXT): {$(VPATH)}internal/stdbool.h
+builtin.$(OBJEXT): {$(VPATH)}internal/stdckdint.h
 builtin.$(OBJEXT): {$(VPATH)}internal/symbol.h
 builtin.$(OBJEXT): {$(VPATH)}internal/value.h
 builtin.$(OBJEXT): {$(VPATH)}internal/value_type.h
@@ -2758,6 +2983,10 @@ builtin.$(OBJEXT): {$(VPATH)}missing.h
 builtin.$(OBJEXT): {$(VPATH)}node.h
 builtin.$(OBJEXT): {$(VPATH)}onigmo.h
 builtin.$(OBJEXT): {$(VPATH)}oniguruma.h
+builtin.$(OBJEXT): {$(VPATH)}prism/ast.h
+builtin.$(OBJEXT): {$(VPATH)}prism/diagnostic.h
+builtin.$(OBJEXT): {$(VPATH)}prism/version.h
+builtin.$(OBJEXT): {$(VPATH)}prism_compile.h
 builtin.$(OBJEXT): {$(VPATH)}ruby_assert.h
 builtin.$(OBJEXT): {$(VPATH)}ruby_atomic.h
 builtin.$(OBJEXT): {$(VPATH)}rubyparser.h
@@ -2781,8 +3010,11 @@ 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/namespace.h
 class.$(OBJEXT): $(top_srcdir)/internal/object.h
+class.$(OBJEXT): $(top_srcdir)/internal/sanitizers.h
 class.$(OBJEXT): $(top_srcdir)/internal/serial.h
+class.$(OBJEXT): $(top_srcdir)/internal/set_table.h
 class.$(OBJEXT): $(top_srcdir)/internal/static_assert.h
 class.$(OBJEXT): $(top_srcdir)/internal/string.h
 class.$(OBJEXT): $(top_srcdir)/internal/variable.h
@@ -2932,6 +3164,7 @@ class.$(OBJEXT): {$(VPATH)}internal/intern/re.h
 class.$(OBJEXT): {$(VPATH)}internal/intern/ruby.h
 class.$(OBJEXT): {$(VPATH)}internal/intern/select.h
 class.$(OBJEXT): {$(VPATH)}internal/intern/select/largesize.h
+class.$(OBJEXT): {$(VPATH)}internal/intern/set.h
 class.$(OBJEXT): {$(VPATH)}internal/intern/signal.h
 class.$(OBJEXT): {$(VPATH)}internal/intern/sprintf.h
 class.$(OBJEXT): {$(VPATH)}internal/intern/string.h
@@ -2951,6 +3184,7 @@ class.$(OBJEXT): {$(VPATH)}internal/special_consts.h
 class.$(OBJEXT): {$(VPATH)}internal/static_assert.h
 class.$(OBJEXT): {$(VPATH)}internal/stdalign.h
 class.$(OBJEXT): {$(VPATH)}internal/stdbool.h
+class.$(OBJEXT): {$(VPATH)}internal/stdckdint.h
 class.$(OBJEXT): {$(VPATH)}internal/symbol.h
 class.$(OBJEXT): {$(VPATH)}internal/value.h
 class.$(OBJEXT): {$(VPATH)}internal/value_type.h
@@ -2971,13 +3205,18 @@ class.$(OBJEXT): {$(VPATH)}subst.h
 class.$(OBJEXT): {$(VPATH)}thread_$(THREAD_MODEL).h
 class.$(OBJEXT): {$(VPATH)}thread_native.h
 class.$(OBJEXT): {$(VPATH)}vm_core.h
+class.$(OBJEXT): {$(VPATH)}vm_debug.h
 class.$(OBJEXT): {$(VPATH)}vm_opts.h
+class.$(OBJEXT): {$(VPATH)}vm_sync.h
+class.$(OBJEXT): {$(VPATH)}yjit.h
 compar.$(OBJEXT): $(hdrdir)/ruby/ruby.h
+compar.$(OBJEXT): $(hdrdir)/ruby/version.h
 compar.$(OBJEXT): $(top_srcdir)/internal/basic_operators.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/set_table.h
 compar.$(OBJEXT): $(top_srcdir)/internal/static_assert.h
 compar.$(OBJEXT): $(top_srcdir)/internal/string.h
 compar.$(OBJEXT): $(top_srcdir)/internal/vm.h
@@ -3121,6 +3360,7 @@ compar.$(OBJEXT): {$(VPATH)}internal/intern/re.h
 compar.$(OBJEXT): {$(VPATH)}internal/intern/ruby.h
 compar.$(OBJEXT): {$(VPATH)}internal/intern/select.h
 compar.$(OBJEXT): {$(VPATH)}internal/intern/select/largesize.h
+compar.$(OBJEXT): {$(VPATH)}internal/intern/set.h
 compar.$(OBJEXT): {$(VPATH)}internal/intern/signal.h
 compar.$(OBJEXT): {$(VPATH)}internal/intern/sprintf.h
 compar.$(OBJEXT): {$(VPATH)}internal/intern/string.h
@@ -3140,6 +3380,7 @@ compar.$(OBJEXT): {$(VPATH)}internal/special_consts.h
 compar.$(OBJEXT): {$(VPATH)}internal/static_assert.h
 compar.$(OBJEXT): {$(VPATH)}internal/stdalign.h
 compar.$(OBJEXT): {$(VPATH)}internal/stdbool.h
+compar.$(OBJEXT): {$(VPATH)}internal/stdckdint.h
 compar.$(OBJEXT): {$(VPATH)}internal/symbol.h
 compar.$(OBJEXT): {$(VPATH)}internal/value.h
 compar.$(OBJEXT): {$(VPATH)}internal/value_type.h
@@ -3156,6 +3397,7 @@ compile.$(OBJEXT): $(CCAN_DIR)/container_of/container_of.h
 compile.$(OBJEXT): $(CCAN_DIR)/list/list.h
 compile.$(OBJEXT): $(CCAN_DIR)/str/str.h
 compile.$(OBJEXT): $(hdrdir)/ruby/ruby.h
+compile.$(OBJEXT): $(hdrdir)/ruby/version.h
 compile.$(OBJEXT): $(top_srcdir)/internal/array.h
 compile.$(OBJEXT): $(top_srcdir)/internal/basic_operators.h
 compile.$(OBJEXT): $(top_srcdir)/internal/bignum.h
@@ -3170,11 +3412,17 @@ 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/io.h
+compile.$(OBJEXT): $(top_srcdir)/internal/namespace.h
 compile.$(OBJEXT): $(top_srcdir)/internal/numeric.h
 compile.$(OBJEXT): $(top_srcdir)/internal/object.h
+compile.$(OBJEXT): $(top_srcdir)/internal/parse.h
 compile.$(OBJEXT): $(top_srcdir)/internal/rational.h
 compile.$(OBJEXT): $(top_srcdir)/internal/re.h
+compile.$(OBJEXT): $(top_srcdir)/internal/ruby_parser.h
+compile.$(OBJEXT): $(top_srcdir)/internal/sanitizers.h
 compile.$(OBJEXT): $(top_srcdir)/internal/serial.h
+compile.$(OBJEXT): $(top_srcdir)/internal/set_table.h
 compile.$(OBJEXT): $(top_srcdir)/internal/static_assert.h
 compile.$(OBJEXT): $(top_srcdir)/internal/string.h
 compile.$(OBJEXT): $(top_srcdir)/internal/symbol.h
@@ -3182,26 +3430,27 @@ 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): $(top_srcdir)/yarp/defines.h
-compile.$(OBJEXT): $(top_srcdir)/yarp/diagnostic.h
-compile.$(OBJEXT): $(top_srcdir)/yarp/enc/yp_encoding.h
-compile.$(OBJEXT): $(top_srcdir)/yarp/node.h
-compile.$(OBJEXT): $(top_srcdir)/yarp/pack.h
-compile.$(OBJEXT): $(top_srcdir)/yarp/parser.h
-compile.$(OBJEXT): $(top_srcdir)/yarp/regexp.h
-compile.$(OBJEXT): $(top_srcdir)/yarp/unescape.h
-compile.$(OBJEXT): $(top_srcdir)/yarp/util/yp_buffer.h
-compile.$(OBJEXT): $(top_srcdir)/yarp/util/yp_char.h
-compile.$(OBJEXT): $(top_srcdir)/yarp/util/yp_constant_pool.h
-compile.$(OBJEXT): $(top_srcdir)/yarp/util/yp_list.h
-compile.$(OBJEXT): $(top_srcdir)/yarp/util/yp_memchr.h
-compile.$(OBJEXT): $(top_srcdir)/yarp/util/yp_newline_list.h
-compile.$(OBJEXT): $(top_srcdir)/yarp/util/yp_state_stack.h
-compile.$(OBJEXT): $(top_srcdir)/yarp/util/yp_string.h
-compile.$(OBJEXT): $(top_srcdir)/yarp/util/yp_string_list.h
-compile.$(OBJEXT): $(top_srcdir)/yarp/util/yp_strpbrk.h
-compile.$(OBJEXT): $(top_srcdir)/yarp/yarp.h
-compile.$(OBJEXT): $(top_srcdir)/yarp/yarp_compiler.c
+compile.$(OBJEXT): $(top_srcdir)/prism/defines.h
+compile.$(OBJEXT): $(top_srcdir)/prism/encoding.h
+compile.$(OBJEXT): $(top_srcdir)/prism/node.h
+compile.$(OBJEXT): $(top_srcdir)/prism/options.h
+compile.$(OBJEXT): $(top_srcdir)/prism/pack.h
+compile.$(OBJEXT): $(top_srcdir)/prism/parser.h
+compile.$(OBJEXT): $(top_srcdir)/prism/prettyprint.h
+compile.$(OBJEXT): $(top_srcdir)/prism/prism.h
+compile.$(OBJEXT): $(top_srcdir)/prism/regexp.h
+compile.$(OBJEXT): $(top_srcdir)/prism/static_literals.h
+compile.$(OBJEXT): $(top_srcdir)/prism/util/pm_buffer.h
+compile.$(OBJEXT): $(top_srcdir)/prism/util/pm_char.h
+compile.$(OBJEXT): $(top_srcdir)/prism/util/pm_constant_pool.h
+compile.$(OBJEXT): $(top_srcdir)/prism/util/pm_integer.h
+compile.$(OBJEXT): $(top_srcdir)/prism/util/pm_list.h
+compile.$(OBJEXT): $(top_srcdir)/prism/util/pm_memchr.h
+compile.$(OBJEXT): $(top_srcdir)/prism/util/pm_newline_list.h
+compile.$(OBJEXT): $(top_srcdir)/prism/util/pm_string.h
+compile.$(OBJEXT): $(top_srcdir)/prism/util/pm_strncasecmp.h
+compile.$(OBJEXT): $(top_srcdir)/prism/util/pm_strpbrk.h
+compile.$(OBJEXT): $(top_srcdir)/prism_compile.c
 compile.$(OBJEXT): {$(VPATH)}assert.h
 compile.$(OBJEXT): {$(VPATH)}atomic.h
 compile.$(OBJEXT): {$(VPATH)}backward/2/assume.h
@@ -3352,6 +3601,7 @@ compile.$(OBJEXT): {$(VPATH)}internal/intern/re.h
 compile.$(OBJEXT): {$(VPATH)}internal/intern/ruby.h
 compile.$(OBJEXT): {$(VPATH)}internal/intern/select.h
 compile.$(OBJEXT): {$(VPATH)}internal/intern/select/largesize.h
+compile.$(OBJEXT): {$(VPATH)}internal/intern/set.h
 compile.$(OBJEXT): {$(VPATH)}internal/intern/signal.h
 compile.$(OBJEXT): {$(VPATH)}internal/intern/sprintf.h
 compile.$(OBJEXT): {$(VPATH)}internal/intern/string.h
@@ -3371,12 +3621,14 @@ compile.$(OBJEXT): {$(VPATH)}internal/special_consts.h
 compile.$(OBJEXT): {$(VPATH)}internal/static_assert.h
 compile.$(OBJEXT): {$(VPATH)}internal/stdalign.h
 compile.$(OBJEXT): {$(VPATH)}internal/stdbool.h
+compile.$(OBJEXT): {$(VPATH)}internal/stdckdint.h
 compile.$(OBJEXT): {$(VPATH)}internal/symbol.h
 compile.$(OBJEXT): {$(VPATH)}internal/value.h
 compile.$(OBJEXT): {$(VPATH)}internal/value_type.h
 compile.$(OBJEXT): {$(VPATH)}internal/variable.h
 compile.$(OBJEXT): {$(VPATH)}internal/warning_push.h
 compile.$(OBJEXT): {$(VPATH)}internal/xmalloc.h
+compile.$(OBJEXT): {$(VPATH)}io.h
 compile.$(OBJEXT): {$(VPATH)}iseq.h
 compile.$(OBJEXT): {$(VPATH)}method.h
 compile.$(OBJEXT): {$(VPATH)}missing.h
@@ -3384,6 +3636,13 @@ compile.$(OBJEXT): {$(VPATH)}node.h
 compile.$(OBJEXT): {$(VPATH)}onigmo.h
 compile.$(OBJEXT): {$(VPATH)}oniguruma.h
 compile.$(OBJEXT): {$(VPATH)}optinsn.inc
+compile.$(OBJEXT): {$(VPATH)}prism/ast.h
+compile.$(OBJEXT): {$(VPATH)}prism/diagnostic.h
+compile.$(OBJEXT): {$(VPATH)}prism/prism.h
+compile.$(OBJEXT): {$(VPATH)}prism/version.h
+compile.$(OBJEXT): {$(VPATH)}prism_compile.c
+compile.$(OBJEXT): {$(VPATH)}prism_compile.h
+compile.$(OBJEXT): {$(VPATH)}ractor.h
 compile.$(OBJEXT): {$(VPATH)}re.h
 compile.$(OBJEXT): {$(VPATH)}regex.h
 compile.$(OBJEXT): {$(VPATH)}ruby_assert.h
@@ -3399,9 +3658,8 @@ compile.$(OBJEXT): {$(VPATH)}vm_callinfo.h
 compile.$(OBJEXT): {$(VPATH)}vm_core.h
 compile.$(OBJEXT): {$(VPATH)}vm_debug.h
 compile.$(OBJEXT): {$(VPATH)}vm_opts.h
-compile.$(OBJEXT): {$(VPATH)}yarp/ast.h
-compile.$(OBJEXT): {$(VPATH)}yarp/version.h
-compile.$(OBJEXT): {$(VPATH)}yarp/yarp.h
+compile.$(OBJEXT): {$(VPATH)}vm_sync.h
+compile.$(OBJEXT): {$(VPATH)}yjit.h
 complex.$(OBJEXT): $(CCAN_DIR)/check_type/check_type.h
 complex.$(OBJEXT): $(CCAN_DIR)/container_of/container_of.h
 complex.$(OBJEXT): $(CCAN_DIR)/list/list.h
@@ -3418,11 +3676,15 @@ complex.$(OBJEXT): $(top_srcdir)/internal/fixnum.h
 complex.$(OBJEXT): $(top_srcdir)/internal/gc.h
 complex.$(OBJEXT): $(top_srcdir)/internal/imemo.h
 complex.$(OBJEXT): $(top_srcdir)/internal/math.h
+complex.$(OBJEXT): $(top_srcdir)/internal/namespace.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/sanitizers.h
 complex.$(OBJEXT): $(top_srcdir)/internal/serial.h
+complex.$(OBJEXT): $(top_srcdir)/internal/set_table.h
 complex.$(OBJEXT): $(top_srcdir)/internal/static_assert.h
+complex.$(OBJEXT): $(top_srcdir)/internal/string.h
 complex.$(OBJEXT): $(top_srcdir)/internal/variable.h
 complex.$(OBJEXT): $(top_srcdir)/internal/vm.h
 complex.$(OBJEXT): $(top_srcdir)/internal/warnings.h
@@ -3440,6 +3702,7 @@ complex.$(OBJEXT): {$(VPATH)}backward/2/stdarg.h
 complex.$(OBJEXT): {$(VPATH)}complex.c
 complex.$(OBJEXT): {$(VPATH)}config.h
 complex.$(OBJEXT): {$(VPATH)}constant.h
+complex.$(OBJEXT): {$(VPATH)}debug_counter.h
 complex.$(OBJEXT): {$(VPATH)}defines.h
 complex.$(OBJEXT): {$(VPATH)}encoding.h
 complex.$(OBJEXT): {$(VPATH)}id.h
@@ -3569,6 +3832,7 @@ complex.$(OBJEXT): {$(VPATH)}internal/intern/re.h
 complex.$(OBJEXT): {$(VPATH)}internal/intern/ruby.h
 complex.$(OBJEXT): {$(VPATH)}internal/intern/select.h
 complex.$(OBJEXT): {$(VPATH)}internal/intern/select/largesize.h
+complex.$(OBJEXT): {$(VPATH)}internal/intern/set.h
 complex.$(OBJEXT): {$(VPATH)}internal/intern/signal.h
 complex.$(OBJEXT): {$(VPATH)}internal/intern/sprintf.h
 complex.$(OBJEXT): {$(VPATH)}internal/intern/string.h
@@ -3588,6 +3852,7 @@ complex.$(OBJEXT): {$(VPATH)}internal/special_consts.h
 complex.$(OBJEXT): {$(VPATH)}internal/static_assert.h
 complex.$(OBJEXT): {$(VPATH)}internal/stdalign.h
 complex.$(OBJEXT): {$(VPATH)}internal/stdbool.h
+complex.$(OBJEXT): {$(VPATH)}internal/stdckdint.h
 complex.$(OBJEXT): {$(VPATH)}internal/symbol.h
 complex.$(OBJEXT): {$(VPATH)}internal/value.h
 complex.$(OBJEXT): {$(VPATH)}internal/value_type.h
@@ -3608,13 +3873,220 @@ complex.$(OBJEXT): {$(VPATH)}subst.h
 complex.$(OBJEXT): {$(VPATH)}thread_$(THREAD_MODEL).h
 complex.$(OBJEXT): {$(VPATH)}thread_native.h
 complex.$(OBJEXT): {$(VPATH)}vm_core.h
+complex.$(OBJEXT): {$(VPATH)}vm_debug.h
 complex.$(OBJEXT): {$(VPATH)}vm_opts.h
+complex.$(OBJEXT): {$(VPATH)}vm_sync.h
+concurrent_set.$(OBJEXT): $(CCAN_DIR)/check_type/check_type.h
+concurrent_set.$(OBJEXT): $(CCAN_DIR)/container_of/container_of.h
+concurrent_set.$(OBJEXT): $(CCAN_DIR)/list/list.h
+concurrent_set.$(OBJEXT): $(CCAN_DIR)/str/str.h
+concurrent_set.$(OBJEXT): $(hdrdir)/ruby/ruby.h
+concurrent_set.$(OBJEXT): $(top_srcdir)/internal/array.h
+concurrent_set.$(OBJEXT): $(top_srcdir)/internal/basic_operators.h
+concurrent_set.$(OBJEXT): $(top_srcdir)/internal/compilers.h
+concurrent_set.$(OBJEXT): $(top_srcdir)/internal/concurrent_set.h
+concurrent_set.$(OBJEXT): $(top_srcdir)/internal/gc.h
+concurrent_set.$(OBJEXT): $(top_srcdir)/internal/imemo.h
+concurrent_set.$(OBJEXT): $(top_srcdir)/internal/namespace.h
+concurrent_set.$(OBJEXT): $(top_srcdir)/internal/sanitizers.h
+concurrent_set.$(OBJEXT): $(top_srcdir)/internal/serial.h
+concurrent_set.$(OBJEXT): $(top_srcdir)/internal/set_table.h
+concurrent_set.$(OBJEXT): $(top_srcdir)/internal/static_assert.h
+concurrent_set.$(OBJEXT): $(top_srcdir)/internal/vm.h
+concurrent_set.$(OBJEXT): $(top_srcdir)/internal/warnings.h
+concurrent_set.$(OBJEXT): {$(VPATH)}assert.h
+concurrent_set.$(OBJEXT): {$(VPATH)}atomic.h
+concurrent_set.$(OBJEXT): {$(VPATH)}backward/2/assume.h
+concurrent_set.$(OBJEXT): {$(VPATH)}backward/2/attributes.h
+concurrent_set.$(OBJEXT): {$(VPATH)}backward/2/bool.h
+concurrent_set.$(OBJEXT): {$(VPATH)}backward/2/gcc_version_since.h
+concurrent_set.$(OBJEXT): {$(VPATH)}backward/2/inttypes.h
+concurrent_set.$(OBJEXT): {$(VPATH)}backward/2/limits.h
+concurrent_set.$(OBJEXT): {$(VPATH)}backward/2/long_long.h
+concurrent_set.$(OBJEXT): {$(VPATH)}backward/2/stdalign.h
+concurrent_set.$(OBJEXT): {$(VPATH)}backward/2/stdarg.h
+concurrent_set.$(OBJEXT): {$(VPATH)}concurrent_set.c
+concurrent_set.$(OBJEXT): {$(VPATH)}config.h
+concurrent_set.$(OBJEXT): {$(VPATH)}debug_counter.h
+concurrent_set.$(OBJEXT): {$(VPATH)}defines.h
+concurrent_set.$(OBJEXT): {$(VPATH)}encoding.h
+concurrent_set.$(OBJEXT): {$(VPATH)}id.h
+concurrent_set.$(OBJEXT): {$(VPATH)}id_table.h
+concurrent_set.$(OBJEXT): {$(VPATH)}intern.h
+concurrent_set.$(OBJEXT): {$(VPATH)}internal.h
+concurrent_set.$(OBJEXT): {$(VPATH)}internal/abi.h
+concurrent_set.$(OBJEXT): {$(VPATH)}internal/anyargs.h
+concurrent_set.$(OBJEXT): {$(VPATH)}internal/arithmetic.h
+concurrent_set.$(OBJEXT): {$(VPATH)}internal/arithmetic/char.h
+concurrent_set.$(OBJEXT): {$(VPATH)}internal/arithmetic/double.h
+concurrent_set.$(OBJEXT): {$(VPATH)}internal/arithmetic/fixnum.h
+concurrent_set.$(OBJEXT): {$(VPATH)}internal/arithmetic/gid_t.h
+concurrent_set.$(OBJEXT): {$(VPATH)}internal/arithmetic/int.h
+concurrent_set.$(OBJEXT): {$(VPATH)}internal/arithmetic/intptr_t.h
+concurrent_set.$(OBJEXT): {$(VPATH)}internal/arithmetic/long.h
+concurrent_set.$(OBJEXT): {$(VPATH)}internal/arithmetic/long_long.h
+concurrent_set.$(OBJEXT): {$(VPATH)}internal/arithmetic/mode_t.h
+concurrent_set.$(OBJEXT): {$(VPATH)}internal/arithmetic/off_t.h
+concurrent_set.$(OBJEXT): {$(VPATH)}internal/arithmetic/pid_t.h
+concurrent_set.$(OBJEXT): {$(VPATH)}internal/arithmetic/short.h
+concurrent_set.$(OBJEXT): {$(VPATH)}internal/arithmetic/size_t.h
+concurrent_set.$(OBJEXT): {$(VPATH)}internal/arithmetic/st_data_t.h
+concurrent_set.$(OBJEXT): {$(VPATH)}internal/arithmetic/uid_t.h
+concurrent_set.$(OBJEXT): {$(VPATH)}internal/assume.h
+concurrent_set.$(OBJEXT): {$(VPATH)}internal/attr/alloc_size.h
+concurrent_set.$(OBJEXT): {$(VPATH)}internal/attr/artificial.h
+concurrent_set.$(OBJEXT): {$(VPATH)}internal/attr/cold.h
+concurrent_set.$(OBJEXT): {$(VPATH)}internal/attr/const.h
+concurrent_set.$(OBJEXT): {$(VPATH)}internal/attr/constexpr.h
+concurrent_set.$(OBJEXT): {$(VPATH)}internal/attr/deprecated.h
+concurrent_set.$(OBJEXT): {$(VPATH)}internal/attr/diagnose_if.h
+concurrent_set.$(OBJEXT): {$(VPATH)}internal/attr/enum_extensibility.h
+concurrent_set.$(OBJEXT): {$(VPATH)}internal/attr/error.h
+concurrent_set.$(OBJEXT): {$(VPATH)}internal/attr/flag_enum.h
+concurrent_set.$(OBJEXT): {$(VPATH)}internal/attr/forceinline.h
+concurrent_set.$(OBJEXT): {$(VPATH)}internal/attr/format.h
+concurrent_set.$(OBJEXT): {$(VPATH)}internal/attr/maybe_unused.h
+concurrent_set.$(OBJEXT): {$(VPATH)}internal/attr/noalias.h
+concurrent_set.$(OBJEXT): {$(VPATH)}internal/attr/nodiscard.h
+concurrent_set.$(OBJEXT): {$(VPATH)}internal/attr/noexcept.h
+concurrent_set.$(OBJEXT): {$(VPATH)}internal/attr/noinline.h
+concurrent_set.$(OBJEXT): {$(VPATH)}internal/attr/nonnull.h
+concurrent_set.$(OBJEXT): {$(VPATH)}internal/attr/noreturn.h
+concurrent_set.$(OBJEXT): {$(VPATH)}internal/attr/packed_struct.h
+concurrent_set.$(OBJEXT): {$(VPATH)}internal/attr/pure.h
+concurrent_set.$(OBJEXT): {$(VPATH)}internal/attr/restrict.h
+concurrent_set.$(OBJEXT): {$(VPATH)}internal/attr/returns_nonnull.h
+concurrent_set.$(OBJEXT): {$(VPATH)}internal/attr/warning.h
+concurrent_set.$(OBJEXT): {$(VPATH)}internal/attr/weakref.h
+concurrent_set.$(OBJEXT): {$(VPATH)}internal/cast.h
+concurrent_set.$(OBJEXT): {$(VPATH)}internal/compiler_is.h
+concurrent_set.$(OBJEXT): {$(VPATH)}internal/compiler_is/apple.h
+concurrent_set.$(OBJEXT): {$(VPATH)}internal/compiler_is/clang.h
+concurrent_set.$(OBJEXT): {$(VPATH)}internal/compiler_is/gcc.h
+concurrent_set.$(OBJEXT): {$(VPATH)}internal/compiler_is/intel.h
+concurrent_set.$(OBJEXT): {$(VPATH)}internal/compiler_is/msvc.h
+concurrent_set.$(OBJEXT): {$(VPATH)}internal/compiler_is/sunpro.h
+concurrent_set.$(OBJEXT): {$(VPATH)}internal/compiler_since.h
+concurrent_set.$(OBJEXT): {$(VPATH)}internal/config.h
+concurrent_set.$(OBJEXT): {$(VPATH)}internal/constant_p.h
+concurrent_set.$(OBJEXT): {$(VPATH)}internal/core.h
+concurrent_set.$(OBJEXT): {$(VPATH)}internal/core/rarray.h
+concurrent_set.$(OBJEXT): {$(VPATH)}internal/core/rbasic.h
+concurrent_set.$(OBJEXT): {$(VPATH)}internal/core/rbignum.h
+concurrent_set.$(OBJEXT): {$(VPATH)}internal/core/rclass.h
+concurrent_set.$(OBJEXT): {$(VPATH)}internal/core/rdata.h
+concurrent_set.$(OBJEXT): {$(VPATH)}internal/core/rfile.h
+concurrent_set.$(OBJEXT): {$(VPATH)}internal/core/rhash.h
+concurrent_set.$(OBJEXT): {$(VPATH)}internal/core/robject.h
+concurrent_set.$(OBJEXT): {$(VPATH)}internal/core/rregexp.h
+concurrent_set.$(OBJEXT): {$(VPATH)}internal/core/rstring.h
+concurrent_set.$(OBJEXT): {$(VPATH)}internal/core/rstruct.h
+concurrent_set.$(OBJEXT): {$(VPATH)}internal/core/rtypeddata.h
+concurrent_set.$(OBJEXT): {$(VPATH)}internal/ctype.h
+concurrent_set.$(OBJEXT): {$(VPATH)}internal/dllexport.h
+concurrent_set.$(OBJEXT): {$(VPATH)}internal/dosish.h
+concurrent_set.$(OBJEXT): {$(VPATH)}internal/encoding/coderange.h
+concurrent_set.$(OBJEXT): {$(VPATH)}internal/encoding/ctype.h
+concurrent_set.$(OBJEXT): {$(VPATH)}internal/encoding/encoding.h
+concurrent_set.$(OBJEXT): {$(VPATH)}internal/encoding/pathname.h
+concurrent_set.$(OBJEXT): {$(VPATH)}internal/encoding/re.h
+concurrent_set.$(OBJEXT): {$(VPATH)}internal/encoding/sprintf.h
+concurrent_set.$(OBJEXT): {$(VPATH)}internal/encoding/string.h
+concurrent_set.$(OBJEXT): {$(VPATH)}internal/encoding/symbol.h
+concurrent_set.$(OBJEXT): {$(VPATH)}internal/encoding/transcode.h
+concurrent_set.$(OBJEXT): {$(VPATH)}internal/error.h
+concurrent_set.$(OBJEXT): {$(VPATH)}internal/eval.h
+concurrent_set.$(OBJEXT): {$(VPATH)}internal/event.h
+concurrent_set.$(OBJEXT): {$(VPATH)}internal/fl_type.h
+concurrent_set.$(OBJEXT): {$(VPATH)}internal/gc.h
+concurrent_set.$(OBJEXT): {$(VPATH)}internal/glob.h
+concurrent_set.$(OBJEXT): {$(VPATH)}internal/globals.h
+concurrent_set.$(OBJEXT): {$(VPATH)}internal/has/attribute.h
+concurrent_set.$(OBJEXT): {$(VPATH)}internal/has/builtin.h
+concurrent_set.$(OBJEXT): {$(VPATH)}internal/has/c_attribute.h
+concurrent_set.$(OBJEXT): {$(VPATH)}internal/has/cpp_attribute.h
+concurrent_set.$(OBJEXT): {$(VPATH)}internal/has/declspec_attribute.h
+concurrent_set.$(OBJEXT): {$(VPATH)}internal/has/extension.h
+concurrent_set.$(OBJEXT): {$(VPATH)}internal/has/feature.h
+concurrent_set.$(OBJEXT): {$(VPATH)}internal/has/warning.h
+concurrent_set.$(OBJEXT): {$(VPATH)}internal/intern/array.h
+concurrent_set.$(OBJEXT): {$(VPATH)}internal/intern/bignum.h
+concurrent_set.$(OBJEXT): {$(VPATH)}internal/intern/class.h
+concurrent_set.$(OBJEXT): {$(VPATH)}internal/intern/compar.h
+concurrent_set.$(OBJEXT): {$(VPATH)}internal/intern/complex.h
+concurrent_set.$(OBJEXT): {$(VPATH)}internal/intern/cont.h
+concurrent_set.$(OBJEXT): {$(VPATH)}internal/intern/dir.h
+concurrent_set.$(OBJEXT): {$(VPATH)}internal/intern/enum.h
+concurrent_set.$(OBJEXT): {$(VPATH)}internal/intern/enumerator.h
+concurrent_set.$(OBJEXT): {$(VPATH)}internal/intern/error.h
+concurrent_set.$(OBJEXT): {$(VPATH)}internal/intern/eval.h
+concurrent_set.$(OBJEXT): {$(VPATH)}internal/intern/file.h
+concurrent_set.$(OBJEXT): {$(VPATH)}internal/intern/hash.h
+concurrent_set.$(OBJEXT): {$(VPATH)}internal/intern/io.h
+concurrent_set.$(OBJEXT): {$(VPATH)}internal/intern/load.h
+concurrent_set.$(OBJEXT): {$(VPATH)}internal/intern/marshal.h
+concurrent_set.$(OBJEXT): {$(VPATH)}internal/intern/numeric.h
+concurrent_set.$(OBJEXT): {$(VPATH)}internal/intern/object.h
+concurrent_set.$(OBJEXT): {$(VPATH)}internal/intern/parse.h
+concurrent_set.$(OBJEXT): {$(VPATH)}internal/intern/proc.h
+concurrent_set.$(OBJEXT): {$(VPATH)}internal/intern/process.h
+concurrent_set.$(OBJEXT): {$(VPATH)}internal/intern/random.h
+concurrent_set.$(OBJEXT): {$(VPATH)}internal/intern/range.h
+concurrent_set.$(OBJEXT): {$(VPATH)}internal/intern/rational.h
+concurrent_set.$(OBJEXT): {$(VPATH)}internal/intern/re.h
+concurrent_set.$(OBJEXT): {$(VPATH)}internal/intern/ruby.h
+concurrent_set.$(OBJEXT): {$(VPATH)}internal/intern/select.h
+concurrent_set.$(OBJEXT): {$(VPATH)}internal/intern/select/largesize.h
+concurrent_set.$(OBJEXT): {$(VPATH)}internal/intern/set.h
+concurrent_set.$(OBJEXT): {$(VPATH)}internal/intern/signal.h
+concurrent_set.$(OBJEXT): {$(VPATH)}internal/intern/sprintf.h
+concurrent_set.$(OBJEXT): {$(VPATH)}internal/intern/string.h
+concurrent_set.$(OBJEXT): {$(VPATH)}internal/intern/struct.h
+concurrent_set.$(OBJEXT): {$(VPATH)}internal/intern/thread.h
+concurrent_set.$(OBJEXT): {$(VPATH)}internal/intern/time.h
+concurrent_set.$(OBJEXT): {$(VPATH)}internal/intern/variable.h
+concurrent_set.$(OBJEXT): {$(VPATH)}internal/intern/vm.h
+concurrent_set.$(OBJEXT): {$(VPATH)}internal/interpreter.h
+concurrent_set.$(OBJEXT): {$(VPATH)}internal/iterator.h
+concurrent_set.$(OBJEXT): {$(VPATH)}internal/memory.h
+concurrent_set.$(OBJEXT): {$(VPATH)}internal/method.h
+concurrent_set.$(OBJEXT): {$(VPATH)}internal/module.h
+concurrent_set.$(OBJEXT): {$(VPATH)}internal/newobj.h
+concurrent_set.$(OBJEXT): {$(VPATH)}internal/scan_args.h
+concurrent_set.$(OBJEXT): {$(VPATH)}internal/special_consts.h
+concurrent_set.$(OBJEXT): {$(VPATH)}internal/static_assert.h
+concurrent_set.$(OBJEXT): {$(VPATH)}internal/stdalign.h
+concurrent_set.$(OBJEXT): {$(VPATH)}internal/stdbool.h
+concurrent_set.$(OBJEXT): {$(VPATH)}internal/stdckdint.h
+concurrent_set.$(OBJEXT): {$(VPATH)}internal/symbol.h
+concurrent_set.$(OBJEXT): {$(VPATH)}internal/value.h
+concurrent_set.$(OBJEXT): {$(VPATH)}internal/value_type.h
+concurrent_set.$(OBJEXT): {$(VPATH)}internal/variable.h
+concurrent_set.$(OBJEXT): {$(VPATH)}internal/warning_push.h
+concurrent_set.$(OBJEXT): {$(VPATH)}internal/xmalloc.h
+concurrent_set.$(OBJEXT): {$(VPATH)}method.h
+concurrent_set.$(OBJEXT): {$(VPATH)}missing.h
+concurrent_set.$(OBJEXT): {$(VPATH)}node.h
+concurrent_set.$(OBJEXT): {$(VPATH)}onigmo.h
+concurrent_set.$(OBJEXT): {$(VPATH)}oniguruma.h
+concurrent_set.$(OBJEXT): {$(VPATH)}ruby_assert.h
+concurrent_set.$(OBJEXT): {$(VPATH)}ruby_atomic.h
+concurrent_set.$(OBJEXT): {$(VPATH)}rubyparser.h
+concurrent_set.$(OBJEXT): {$(VPATH)}st.h
+concurrent_set.$(OBJEXT): {$(VPATH)}subst.h
+concurrent_set.$(OBJEXT): {$(VPATH)}thread_$(THREAD_MODEL).h
+concurrent_set.$(OBJEXT): {$(VPATH)}thread_native.h
+concurrent_set.$(OBJEXT): {$(VPATH)}vm_core.h
+concurrent_set.$(OBJEXT): {$(VPATH)}vm_debug.h
+concurrent_set.$(OBJEXT): {$(VPATH)}vm_opts.h
+concurrent_set.$(OBJEXT): {$(VPATH)}vm_sync.h
 cont.$(OBJEXT): $(CCAN_DIR)/check_type/check_type.h
 cont.$(OBJEXT): $(CCAN_DIR)/container_of/container_of.h
 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): $(hdrdir)/ruby/version.h
 cont.$(OBJEXT): $(top_srcdir)/internal/array.h
 cont.$(OBJEXT): $(top_srcdir)/internal/basic_operators.h
 cont.$(OBJEXT): $(top_srcdir)/internal/compilers.h
@@ -3622,15 +4094,37 @@ cont.$(OBJEXT): $(top_srcdir)/internal/cont.h
 cont.$(OBJEXT): $(top_srcdir)/internal/error.h
 cont.$(OBJEXT): $(top_srcdir)/internal/gc.h
 cont.$(OBJEXT): $(top_srcdir)/internal/imemo.h
+cont.$(OBJEXT): $(top_srcdir)/internal/namespace.h
 cont.$(OBJEXT): $(top_srcdir)/internal/proc.h
 cont.$(OBJEXT): $(top_srcdir)/internal/sanitizers.h
 cont.$(OBJEXT): $(top_srcdir)/internal/serial.h
+cont.$(OBJEXT): $(top_srcdir)/internal/set_table.h
 cont.$(OBJEXT): $(top_srcdir)/internal/static_assert.h
 cont.$(OBJEXT): $(top_srcdir)/internal/string.h
 cont.$(OBJEXT): $(top_srcdir)/internal/thread.h
 cont.$(OBJEXT): $(top_srcdir)/internal/variable.h
 cont.$(OBJEXT): $(top_srcdir)/internal/vm.h
 cont.$(OBJEXT): $(top_srcdir)/internal/warnings.h
+cont.$(OBJEXT): $(top_srcdir)/prism/defines.h
+cont.$(OBJEXT): $(top_srcdir)/prism/encoding.h
+cont.$(OBJEXT): $(top_srcdir)/prism/node.h
+cont.$(OBJEXT): $(top_srcdir)/prism/options.h
+cont.$(OBJEXT): $(top_srcdir)/prism/pack.h
+cont.$(OBJEXT): $(top_srcdir)/prism/parser.h
+cont.$(OBJEXT): $(top_srcdir)/prism/prettyprint.h
+cont.$(OBJEXT): $(top_srcdir)/prism/prism.h
+cont.$(OBJEXT): $(top_srcdir)/prism/regexp.h
+cont.$(OBJEXT): $(top_srcdir)/prism/static_literals.h
+cont.$(OBJEXT): $(top_srcdir)/prism/util/pm_buffer.h
+cont.$(OBJEXT): $(top_srcdir)/prism/util/pm_char.h
+cont.$(OBJEXT): $(top_srcdir)/prism/util/pm_constant_pool.h
+cont.$(OBJEXT): $(top_srcdir)/prism/util/pm_integer.h
+cont.$(OBJEXT): $(top_srcdir)/prism/util/pm_list.h
+cont.$(OBJEXT): $(top_srcdir)/prism/util/pm_memchr.h
+cont.$(OBJEXT): $(top_srcdir)/prism/util/pm_newline_list.h
+cont.$(OBJEXT): $(top_srcdir)/prism/util/pm_string.h
+cont.$(OBJEXT): $(top_srcdir)/prism/util/pm_strncasecmp.h
+cont.$(OBJEXT): $(top_srcdir)/prism/util/pm_strpbrk.h
 cont.$(OBJEXT): {$(VPATH)}$(COROUTINE_H)
 cont.$(OBJEXT): {$(VPATH)}assert.h
 cont.$(OBJEXT): {$(VPATH)}atomic.h
@@ -3778,6 +4272,7 @@ cont.$(OBJEXT): {$(VPATH)}internal/intern/re.h
 cont.$(OBJEXT): {$(VPATH)}internal/intern/ruby.h
 cont.$(OBJEXT): {$(VPATH)}internal/intern/select.h
 cont.$(OBJEXT): {$(VPATH)}internal/intern/select/largesize.h
+cont.$(OBJEXT): {$(VPATH)}internal/intern/set.h
 cont.$(OBJEXT): {$(VPATH)}internal/intern/signal.h
 cont.$(OBJEXT): {$(VPATH)}internal/intern/sprintf.h
 cont.$(OBJEXT): {$(VPATH)}internal/intern/string.h
@@ -3797,6 +4292,7 @@ cont.$(OBJEXT): {$(VPATH)}internal/special_consts.h
 cont.$(OBJEXT): {$(VPATH)}internal/static_assert.h
 cont.$(OBJEXT): {$(VPATH)}internal/stdalign.h
 cont.$(OBJEXT): {$(VPATH)}internal/stdbool.h
+cont.$(OBJEXT): {$(VPATH)}internal/stdckdint.h
 cont.$(OBJEXT): {$(VPATH)}internal/symbol.h
 cont.$(OBJEXT): {$(VPATH)}internal/value.h
 cont.$(OBJEXT): {$(VPATH)}internal/value_type.h
@@ -3809,9 +4305,12 @@ cont.$(OBJEXT): {$(VPATH)}missing.h
 cont.$(OBJEXT): {$(VPATH)}node.h
 cont.$(OBJEXT): {$(VPATH)}onigmo.h
 cont.$(OBJEXT): {$(VPATH)}oniguruma.h
+cont.$(OBJEXT): {$(VPATH)}prism/ast.h
+cont.$(OBJEXT): {$(VPATH)}prism/diagnostic.h
+cont.$(OBJEXT): {$(VPATH)}prism/version.h
+cont.$(OBJEXT): {$(VPATH)}prism_compile.h
 cont.$(OBJEXT): {$(VPATH)}ractor.h
 cont.$(OBJEXT): {$(VPATH)}ractor_core.h
-cont.$(OBJEXT): {$(VPATH)}rjit.h
 cont.$(OBJEXT): {$(VPATH)}ruby_assert.h
 cont.$(OBJEXT): {$(VPATH)}ruby_atomic.h
 cont.$(OBJEXT): {$(VPATH)}rubyparser.h
@@ -3836,7 +4335,10 @@ debug.$(OBJEXT): $(top_srcdir)/internal/class.h
 debug.$(OBJEXT): $(top_srcdir)/internal/compilers.h
 debug.$(OBJEXT): $(top_srcdir)/internal/gc.h
 debug.$(OBJEXT): $(top_srcdir)/internal/imemo.h
+debug.$(OBJEXT): $(top_srcdir)/internal/namespace.h
+debug.$(OBJEXT): $(top_srcdir)/internal/sanitizers.h
 debug.$(OBJEXT): $(top_srcdir)/internal/serial.h
+debug.$(OBJEXT): $(top_srcdir)/internal/set_table.h
 debug.$(OBJEXT): $(top_srcdir)/internal/signal.h
 debug.$(OBJEXT): $(top_srcdir)/internal/static_assert.h
 debug.$(OBJEXT): $(top_srcdir)/internal/variable.h
@@ -3988,6 +4490,7 @@ debug.$(OBJEXT): {$(VPATH)}internal/intern/re.h
 debug.$(OBJEXT): {$(VPATH)}internal/intern/ruby.h
 debug.$(OBJEXT): {$(VPATH)}internal/intern/select.h
 debug.$(OBJEXT): {$(VPATH)}internal/intern/select/largesize.h
+debug.$(OBJEXT): {$(VPATH)}internal/intern/set.h
 debug.$(OBJEXT): {$(VPATH)}internal/intern/signal.h
 debug.$(OBJEXT): {$(VPATH)}internal/intern/sprintf.h
 debug.$(OBJEXT): {$(VPATH)}internal/intern/string.h
@@ -4007,6 +4510,7 @@ debug.$(OBJEXT): {$(VPATH)}internal/special_consts.h
 debug.$(OBJEXT): {$(VPATH)}internal/static_assert.h
 debug.$(OBJEXT): {$(VPATH)}internal/stdalign.h
 debug.$(OBJEXT): {$(VPATH)}internal/stdbool.h
+debug.$(OBJEXT): {$(VPATH)}internal/stdckdint.h
 debug.$(OBJEXT): {$(VPATH)}internal/symbol.h
 debug.$(OBJEXT): {$(VPATH)}internal/value.h
 debug.$(OBJEXT): {$(VPATH)}internal/value_type.h
@@ -4035,6 +4539,7 @@ debug.$(OBJEXT): {$(VPATH)}vm_callinfo.h
 debug.$(OBJEXT): {$(VPATH)}vm_core.h
 debug.$(OBJEXT): {$(VPATH)}vm_debug.h
 debug.$(OBJEXT): {$(VPATH)}vm_opts.h
+debug.$(OBJEXT): {$(VPATH)}vm_sync.h
 debug_counter.$(OBJEXT): $(hdrdir)/ruby/ruby.h
 debug_counter.$(OBJEXT): {$(VPATH)}assert.h
 debug_counter.$(OBJEXT): {$(VPATH)}backward/2/assume.h
@@ -4165,6 +4670,7 @@ debug_counter.$(OBJEXT): {$(VPATH)}internal/intern/re.h
 debug_counter.$(OBJEXT): {$(VPATH)}internal/intern/ruby.h
 debug_counter.$(OBJEXT): {$(VPATH)}internal/intern/select.h
 debug_counter.$(OBJEXT): {$(VPATH)}internal/intern/select/largesize.h
+debug_counter.$(OBJEXT): {$(VPATH)}internal/intern/set.h
 debug_counter.$(OBJEXT): {$(VPATH)}internal/intern/signal.h
 debug_counter.$(OBJEXT): {$(VPATH)}internal/intern/sprintf.h
 debug_counter.$(OBJEXT): {$(VPATH)}internal/intern/string.h
@@ -4184,6 +4690,7 @@ debug_counter.$(OBJEXT): {$(VPATH)}internal/special_consts.h
 debug_counter.$(OBJEXT): {$(VPATH)}internal/static_assert.h
 debug_counter.$(OBJEXT): {$(VPATH)}internal/stdalign.h
 debug_counter.$(OBJEXT): {$(VPATH)}internal/stdbool.h
+debug_counter.$(OBJEXT): {$(VPATH)}internal/stdckdint.h
 debug_counter.$(OBJEXT): {$(VPATH)}internal/symbol.h
 debug_counter.$(OBJEXT): {$(VPATH)}internal/value.h
 debug_counter.$(OBJEXT): {$(VPATH)}internal/value_type.h
@@ -4199,6 +4706,7 @@ dir.$(OBJEXT): $(CCAN_DIR)/container_of/container_of.h
 dir.$(OBJEXT): $(CCAN_DIR)/list/list.h
 dir.$(OBJEXT): $(CCAN_DIR)/str/str.h
 dir.$(OBJEXT): $(hdrdir)/ruby/ruby.h
+dir.$(OBJEXT): $(hdrdir)/ruby/version.h
 dir.$(OBJEXT): $(top_srcdir)/internal/array.h
 dir.$(OBJEXT): $(top_srcdir)/internal/basic_operators.h
 dir.$(OBJEXT): $(top_srcdir)/internal/class.h
@@ -4210,8 +4718,11 @@ dir.$(OBJEXT): $(top_srcdir)/internal/file.h
 dir.$(OBJEXT): $(top_srcdir)/internal/gc.h
 dir.$(OBJEXT): $(top_srcdir)/internal/imemo.h
 dir.$(OBJEXT): $(top_srcdir)/internal/io.h
+dir.$(OBJEXT): $(top_srcdir)/internal/namespace.h
 dir.$(OBJEXT): $(top_srcdir)/internal/object.h
+dir.$(OBJEXT): $(top_srcdir)/internal/sanitizers.h
 dir.$(OBJEXT): $(top_srcdir)/internal/serial.h
+dir.$(OBJEXT): $(top_srcdir)/internal/set_table.h
 dir.$(OBJEXT): $(top_srcdir)/internal/static_assert.h
 dir.$(OBJEXT): $(top_srcdir)/internal/string.h
 dir.$(OBJEXT): $(top_srcdir)/internal/variable.h
@@ -4363,6 +4874,7 @@ dir.$(OBJEXT): {$(VPATH)}internal/intern/re.h
 dir.$(OBJEXT): {$(VPATH)}internal/intern/ruby.h
 dir.$(OBJEXT): {$(VPATH)}internal/intern/select.h
 dir.$(OBJEXT): {$(VPATH)}internal/intern/select/largesize.h
+dir.$(OBJEXT): {$(VPATH)}internal/intern/set.h
 dir.$(OBJEXT): {$(VPATH)}internal/intern/signal.h
 dir.$(OBJEXT): {$(VPATH)}internal/intern/sprintf.h
 dir.$(OBJEXT): {$(VPATH)}internal/intern/string.h
@@ -4382,6 +4894,7 @@ dir.$(OBJEXT): {$(VPATH)}internal/special_consts.h
 dir.$(OBJEXT): {$(VPATH)}internal/static_assert.h
 dir.$(OBJEXT): {$(VPATH)}internal/stdalign.h
 dir.$(OBJEXT): {$(VPATH)}internal/stdbool.h
+dir.$(OBJEXT): {$(VPATH)}internal/stdckdint.h
 dir.$(OBJEXT): {$(VPATH)}internal/symbol.h
 dir.$(OBJEXT): {$(VPATH)}internal/value.h
 dir.$(OBJEXT): {$(VPATH)}internal/value_type.h
@@ -4408,6 +4921,7 @@ dir.$(OBJEXT): {$(VPATH)}vm_core.h
 dir.$(OBJEXT): {$(VPATH)}vm_opts.h
 dln.$(OBJEXT): $(hdrdir)/ruby/ruby.h
 dln.$(OBJEXT): $(top_srcdir)/internal/compilers.h
+dln.$(OBJEXT): $(top_srcdir)/internal/namespace.h
 dln.$(OBJEXT): $(top_srcdir)/internal/warnings.h
 dln.$(OBJEXT): {$(VPATH)}assert.h
 dln.$(OBJEXT): {$(VPATH)}backward/2/assume.h
@@ -4539,6 +5053,7 @@ dln.$(OBJEXT): {$(VPATH)}internal/intern/re.h
 dln.$(OBJEXT): {$(VPATH)}internal/intern/ruby.h
 dln.$(OBJEXT): {$(VPATH)}internal/intern/select.h
 dln.$(OBJEXT): {$(VPATH)}internal/intern/select/largesize.h
+dln.$(OBJEXT): {$(VPATH)}internal/intern/set.h
 dln.$(OBJEXT): {$(VPATH)}internal/intern/signal.h
 dln.$(OBJEXT): {$(VPATH)}internal/intern/sprintf.h
 dln.$(OBJEXT): {$(VPATH)}internal/intern/string.h
@@ -4558,6 +5073,7 @@ dln.$(OBJEXT): {$(VPATH)}internal/special_consts.h
 dln.$(OBJEXT): {$(VPATH)}internal/static_assert.h
 dln.$(OBJEXT): {$(VPATH)}internal/stdalign.h
 dln.$(OBJEXT): {$(VPATH)}internal/stdbool.h
+dln.$(OBJEXT): {$(VPATH)}internal/stdckdint.h
 dln.$(OBJEXT): {$(VPATH)}internal/symbol.h
 dln.$(OBJEXT): {$(VPATH)}internal/value.h
 dln.$(OBJEXT): {$(VPATH)}internal/value_type.h
@@ -4696,6 +5212,7 @@ dln_find.$(OBJEXT): {$(VPATH)}internal/intern/re.h
 dln_find.$(OBJEXT): {$(VPATH)}internal/intern/ruby.h
 dln_find.$(OBJEXT): {$(VPATH)}internal/intern/select.h
 dln_find.$(OBJEXT): {$(VPATH)}internal/intern/select/largesize.h
+dln_find.$(OBJEXT): {$(VPATH)}internal/intern/set.h
 dln_find.$(OBJEXT): {$(VPATH)}internal/intern/signal.h
 dln_find.$(OBJEXT): {$(VPATH)}internal/intern/sprintf.h
 dln_find.$(OBJEXT): {$(VPATH)}internal/intern/string.h
@@ -4715,6 +5232,7 @@ dln_find.$(OBJEXT): {$(VPATH)}internal/special_consts.h
 dln_find.$(OBJEXT): {$(VPATH)}internal/static_assert.h
 dln_find.$(OBJEXT): {$(VPATH)}internal/stdalign.h
 dln_find.$(OBJEXT): {$(VPATH)}internal/stdbool.h
+dln_find.$(OBJEXT): {$(VPATH)}internal/stdckdint.h
 dln_find.$(OBJEXT): {$(VPATH)}internal/symbol.h
 dln_find.$(OBJEXT): {$(VPATH)}internal/value.h
 dln_find.$(OBJEXT): {$(VPATH)}internal/value_type.h
@@ -4852,6 +5370,7 @@ dmydln.$(OBJEXT): {$(VPATH)}internal/intern/re.h
 dmydln.$(OBJEXT): {$(VPATH)}internal/intern/ruby.h
 dmydln.$(OBJEXT): {$(VPATH)}internal/intern/select.h
 dmydln.$(OBJEXT): {$(VPATH)}internal/intern/select/largesize.h
+dmydln.$(OBJEXT): {$(VPATH)}internal/intern/set.h
 dmydln.$(OBJEXT): {$(VPATH)}internal/intern/signal.h
 dmydln.$(OBJEXT): {$(VPATH)}internal/intern/sprintf.h
 dmydln.$(OBJEXT): {$(VPATH)}internal/intern/string.h
@@ -4871,6 +5390,7 @@ dmydln.$(OBJEXT): {$(VPATH)}internal/special_consts.h
 dmydln.$(OBJEXT): {$(VPATH)}internal/static_assert.h
 dmydln.$(OBJEXT): {$(VPATH)}internal/stdalign.h
 dmydln.$(OBJEXT): {$(VPATH)}internal/stdbool.h
+dmydln.$(OBJEXT): {$(VPATH)}internal/stdckdint.h
 dmydln.$(OBJEXT): {$(VPATH)}internal/symbol.h
 dmydln.$(OBJEXT): {$(VPATH)}internal/value.h
 dmydln.$(OBJEXT): {$(VPATH)}internal/value_type.h
@@ -5700,24 +6220,34 @@ enc/utf_8.$(OBJEXT): {$(VPATH)}oniguruma.h
 enc/utf_8.$(OBJEXT): {$(VPATH)}regenc.h
 enc/utf_8.$(OBJEXT): {$(VPATH)}st.h
 enc/utf_8.$(OBJEXT): {$(VPATH)}subst.h
+encoding.$(OBJEXT): $(CCAN_DIR)/check_type/check_type.h
+encoding.$(OBJEXT): $(CCAN_DIR)/container_of/container_of.h
+encoding.$(OBJEXT): $(CCAN_DIR)/list/list.h
+encoding.$(OBJEXT): $(CCAN_DIR)/str/str.h
 encoding.$(OBJEXT): $(hdrdir)/ruby.h
 encoding.$(OBJEXT): $(hdrdir)/ruby/ruby.h
+encoding.$(OBJEXT): $(hdrdir)/ruby/version.h
+encoding.$(OBJEXT): $(top_srcdir)/internal/array.h
+encoding.$(OBJEXT): $(top_srcdir)/internal/basic_operators.h
 encoding.$(OBJEXT): $(top_srcdir)/internal/class.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/error.h
 encoding.$(OBJEXT): $(top_srcdir)/internal/gc.h
+encoding.$(OBJEXT): $(top_srcdir)/internal/imemo.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/set_table.h
 encoding.$(OBJEXT): $(top_srcdir)/internal/static_assert.h
 encoding.$(OBJEXT): $(top_srcdir)/internal/string.h
 encoding.$(OBJEXT): $(top_srcdir)/internal/variable.h
 encoding.$(OBJEXT): $(top_srcdir)/internal/vm.h
 encoding.$(OBJEXT): $(top_srcdir)/internal/warnings.h
 encoding.$(OBJEXT): {$(VPATH)}assert.h
+encoding.$(OBJEXT): {$(VPATH)}atomic.h
 encoding.$(OBJEXT): {$(VPATH)}backward/2/assume.h
 encoding.$(OBJEXT): {$(VPATH)}backward/2/attributes.h
 encoding.$(OBJEXT): {$(VPATH)}backward/2/bool.h
@@ -5734,6 +6264,7 @@ encoding.$(OBJEXT): {$(VPATH)}defines.h
 encoding.$(OBJEXT): {$(VPATH)}encindex.h
 encoding.$(OBJEXT): {$(VPATH)}encoding.c
 encoding.$(OBJEXT): {$(VPATH)}encoding.h
+encoding.$(OBJEXT): {$(VPATH)}id.h
 encoding.$(OBJEXT): {$(VPATH)}id_table.h
 encoding.$(OBJEXT): {$(VPATH)}intern.h
 encoding.$(OBJEXT): {$(VPATH)}internal.h
@@ -5860,6 +6391,7 @@ encoding.$(OBJEXT): {$(VPATH)}internal/intern/re.h
 encoding.$(OBJEXT): {$(VPATH)}internal/intern/ruby.h
 encoding.$(OBJEXT): {$(VPATH)}internal/intern/select.h
 encoding.$(OBJEXT): {$(VPATH)}internal/intern/select/largesize.h
+encoding.$(OBJEXT): {$(VPATH)}internal/intern/set.h
 encoding.$(OBJEXT): {$(VPATH)}internal/intern/signal.h
 encoding.$(OBJEXT): {$(VPATH)}internal/intern/sprintf.h
 encoding.$(OBJEXT): {$(VPATH)}internal/intern/string.h
@@ -5879,22 +6411,31 @@ encoding.$(OBJEXT): {$(VPATH)}internal/special_consts.h
 encoding.$(OBJEXT): {$(VPATH)}internal/static_assert.h
 encoding.$(OBJEXT): {$(VPATH)}internal/stdalign.h
 encoding.$(OBJEXT): {$(VPATH)}internal/stdbool.h
+encoding.$(OBJEXT): {$(VPATH)}internal/stdckdint.h
 encoding.$(OBJEXT): {$(VPATH)}internal/symbol.h
 encoding.$(OBJEXT): {$(VPATH)}internal/value.h
 encoding.$(OBJEXT): {$(VPATH)}internal/value_type.h
 encoding.$(OBJEXT): {$(VPATH)}internal/variable.h
 encoding.$(OBJEXT): {$(VPATH)}internal/warning_push.h
 encoding.$(OBJEXT): {$(VPATH)}internal/xmalloc.h
+encoding.$(OBJEXT): {$(VPATH)}method.h
 encoding.$(OBJEXT): {$(VPATH)}missing.h
+encoding.$(OBJEXT): {$(VPATH)}node.h
 encoding.$(OBJEXT): {$(VPATH)}onigmo.h
 encoding.$(OBJEXT): {$(VPATH)}oniguruma.h
 encoding.$(OBJEXT): {$(VPATH)}regenc.h
 encoding.$(OBJEXT): {$(VPATH)}ruby_assert.h
+encoding.$(OBJEXT): {$(VPATH)}ruby_atomic.h
+encoding.$(OBJEXT): {$(VPATH)}rubyparser.h
 encoding.$(OBJEXT): {$(VPATH)}shape.h
 encoding.$(OBJEXT): {$(VPATH)}st.h
 encoding.$(OBJEXT): {$(VPATH)}subst.h
+encoding.$(OBJEXT): {$(VPATH)}thread_$(THREAD_MODEL).h
+encoding.$(OBJEXT): {$(VPATH)}thread_native.h
 encoding.$(OBJEXT): {$(VPATH)}util.h
+encoding.$(OBJEXT): {$(VPATH)}vm_core.h
 encoding.$(OBJEXT): {$(VPATH)}vm_debug.h
+encoding.$(OBJEXT): {$(VPATH)}vm_opts.h
 encoding.$(OBJEXT): {$(VPATH)}vm_sync.h
 enum.$(OBJEXT): $(hdrdir)/ruby/ruby.h
 enum.$(OBJEXT): $(top_srcdir)/internal/array.h
@@ -5915,6 +6456,7 @@ enum.$(OBJEXT): $(top_srcdir)/internal/proc.h
 enum.$(OBJEXT): $(top_srcdir)/internal/rational.h
 enum.$(OBJEXT): $(top_srcdir)/internal/re.h
 enum.$(OBJEXT): $(top_srcdir)/internal/serial.h
+enum.$(OBJEXT): $(top_srcdir)/internal/set_table.h
 enum.$(OBJEXT): $(top_srcdir)/internal/static_assert.h
 enum.$(OBJEXT): $(top_srcdir)/internal/variable.h
 enum.$(OBJEXT): $(top_srcdir)/internal/vm.h
@@ -6061,6 +6603,7 @@ enum.$(OBJEXT): {$(VPATH)}internal/intern/re.h
 enum.$(OBJEXT): {$(VPATH)}internal/intern/ruby.h
 enum.$(OBJEXT): {$(VPATH)}internal/intern/select.h
 enum.$(OBJEXT): {$(VPATH)}internal/intern/select/largesize.h
+enum.$(OBJEXT): {$(VPATH)}internal/intern/set.h
 enum.$(OBJEXT): {$(VPATH)}internal/intern/signal.h
 enum.$(OBJEXT): {$(VPATH)}internal/intern/sprintf.h
 enum.$(OBJEXT): {$(VPATH)}internal/intern/string.h
@@ -6080,6 +6623,7 @@ enum.$(OBJEXT): {$(VPATH)}internal/special_consts.h
 enum.$(OBJEXT): {$(VPATH)}internal/static_assert.h
 enum.$(OBJEXT): {$(VPATH)}internal/stdalign.h
 enum.$(OBJEXT): {$(VPATH)}internal/stdbool.h
+enum.$(OBJEXT): {$(VPATH)}internal/stdckdint.h
 enum.$(OBJEXT): {$(VPATH)}internal/symbol.h
 enum.$(OBJEXT): {$(VPATH)}internal/value.h
 enum.$(OBJEXT): {$(VPATH)}internal/value_type.h
@@ -6100,6 +6644,7 @@ enumerator.$(OBJEXT): $(CCAN_DIR)/container_of/container_of.h
 enumerator.$(OBJEXT): $(CCAN_DIR)/list/list.h
 enumerator.$(OBJEXT): $(CCAN_DIR)/str/str.h
 enumerator.$(OBJEXT): $(hdrdir)/ruby/ruby.h
+enumerator.$(OBJEXT): $(hdrdir)/ruby/version.h
 enumerator.$(OBJEXT): $(top_srcdir)/internal/array.h
 enumerator.$(OBJEXT): $(top_srcdir)/internal/basic_operators.h
 enumerator.$(OBJEXT): $(top_srcdir)/internal/bignum.h
@@ -6112,10 +6657,13 @@ 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/namespace.h
 enumerator.$(OBJEXT): $(top_srcdir)/internal/numeric.h
 enumerator.$(OBJEXT): $(top_srcdir)/internal/range.h
 enumerator.$(OBJEXT): $(top_srcdir)/internal/rational.h
+enumerator.$(OBJEXT): $(top_srcdir)/internal/sanitizers.h
 enumerator.$(OBJEXT): $(top_srcdir)/internal/serial.h
+enumerator.$(OBJEXT): $(top_srcdir)/internal/set_table.h
 enumerator.$(OBJEXT): $(top_srcdir)/internal/static_assert.h
 enumerator.$(OBJEXT): $(top_srcdir)/internal/string.h
 enumerator.$(OBJEXT): $(top_srcdir)/internal/struct.h
@@ -6135,6 +6683,7 @@ enumerator.$(OBJEXT): {$(VPATH)}backward/2/stdalign.h
 enumerator.$(OBJEXT): {$(VPATH)}backward/2/stdarg.h
 enumerator.$(OBJEXT): {$(VPATH)}config.h
 enumerator.$(OBJEXT): {$(VPATH)}constant.h
+enumerator.$(OBJEXT): {$(VPATH)}debug_counter.h
 enumerator.$(OBJEXT): {$(VPATH)}defines.h
 enumerator.$(OBJEXT): {$(VPATH)}encoding.h
 enumerator.$(OBJEXT): {$(VPATH)}enumerator.c
@@ -6265,6 +6814,7 @@ enumerator.$(OBJEXT): {$(VPATH)}internal/intern/re.h
 enumerator.$(OBJEXT): {$(VPATH)}internal/intern/ruby.h
 enumerator.$(OBJEXT): {$(VPATH)}internal/intern/select.h
 enumerator.$(OBJEXT): {$(VPATH)}internal/intern/select/largesize.h
+enumerator.$(OBJEXT): {$(VPATH)}internal/intern/set.h
 enumerator.$(OBJEXT): {$(VPATH)}internal/intern/signal.h
 enumerator.$(OBJEXT): {$(VPATH)}internal/intern/sprintf.h
 enumerator.$(OBJEXT): {$(VPATH)}internal/intern/string.h
@@ -6284,6 +6834,7 @@ enumerator.$(OBJEXT): {$(VPATH)}internal/special_consts.h
 enumerator.$(OBJEXT): {$(VPATH)}internal/static_assert.h
 enumerator.$(OBJEXT): {$(VPATH)}internal/stdalign.h
 enumerator.$(OBJEXT): {$(VPATH)}internal/stdbool.h
+enumerator.$(OBJEXT): {$(VPATH)}internal/stdckdint.h
 enumerator.$(OBJEXT): {$(VPATH)}internal/symbol.h
 enumerator.$(OBJEXT): {$(VPATH)}internal/value.h
 enumerator.$(OBJEXT): {$(VPATH)}internal/value_type.h
@@ -6304,12 +6855,15 @@ enumerator.$(OBJEXT): {$(VPATH)}subst.h
 enumerator.$(OBJEXT): {$(VPATH)}thread_$(THREAD_MODEL).h
 enumerator.$(OBJEXT): {$(VPATH)}thread_native.h
 enumerator.$(OBJEXT): {$(VPATH)}vm_core.h
+enumerator.$(OBJEXT): {$(VPATH)}vm_debug.h
 enumerator.$(OBJEXT): {$(VPATH)}vm_opts.h
+enumerator.$(OBJEXT): {$(VPATH)}vm_sync.h
 error.$(OBJEXT): $(CCAN_DIR)/check_type/check_type.h
 error.$(OBJEXT): $(CCAN_DIR)/container_of/container_of.h
 error.$(OBJEXT): $(CCAN_DIR)/list/list.h
 error.$(OBJEXT): $(CCAN_DIR)/str/str.h
 error.$(OBJEXT): $(hdrdir)/ruby/ruby.h
+error.$(OBJEXT): $(hdrdir)/ruby/version.h
 error.$(OBJEXT): $(top_srcdir)/internal/array.h
 error.$(OBJEXT): $(top_srcdir)/internal/basic_operators.h
 error.$(OBJEXT): $(top_srcdir)/internal/class.h
@@ -6321,8 +6875,12 @@ error.$(OBJEXT): $(top_srcdir)/internal/hash.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/namespace.h
 error.$(OBJEXT): $(top_srcdir)/internal/object.h
+error.$(OBJEXT): $(top_srcdir)/internal/process.h
+error.$(OBJEXT): $(top_srcdir)/internal/sanitizers.h
 error.$(OBJEXT): $(top_srcdir)/internal/serial.h
+error.$(OBJEXT): $(top_srcdir)/internal/set_table.h
 error.$(OBJEXT): $(top_srcdir)/internal/static_assert.h
 error.$(OBJEXT): $(top_srcdir)/internal/string.h
 error.$(OBJEXT): $(top_srcdir)/internal/symbol.h
@@ -6344,6 +6902,7 @@ error.$(OBJEXT): {$(VPATH)}backward/2/stdarg.h
 error.$(OBJEXT): {$(VPATH)}builtin.h
 error.$(OBJEXT): {$(VPATH)}config.h
 error.$(OBJEXT): {$(VPATH)}constant.h
+error.$(OBJEXT): {$(VPATH)}debug_counter.h
 error.$(OBJEXT): {$(VPATH)}defines.h
 error.$(OBJEXT): {$(VPATH)}encoding.h
 error.$(OBJEXT): {$(VPATH)}error.c
@@ -6474,6 +7033,7 @@ error.$(OBJEXT): {$(VPATH)}internal/intern/re.h
 error.$(OBJEXT): {$(VPATH)}internal/intern/ruby.h
 error.$(OBJEXT): {$(VPATH)}internal/intern/select.h
 error.$(OBJEXT): {$(VPATH)}internal/intern/select/largesize.h
+error.$(OBJEXT): {$(VPATH)}internal/intern/set.h
 error.$(OBJEXT): {$(VPATH)}internal/intern/signal.h
 error.$(OBJEXT): {$(VPATH)}internal/intern/sprintf.h
 error.$(OBJEXT): {$(VPATH)}internal/intern/string.h
@@ -6493,6 +7053,7 @@ error.$(OBJEXT): {$(VPATH)}internal/special_consts.h
 error.$(OBJEXT): {$(VPATH)}internal/static_assert.h
 error.$(OBJEXT): {$(VPATH)}internal/stdalign.h
 error.$(OBJEXT): {$(VPATH)}internal/stdbool.h
+error.$(OBJEXT): {$(VPATH)}internal/stdckdint.h
 error.$(OBJEXT): {$(VPATH)}internal/symbol.h
 error.$(OBJEXT): {$(VPATH)}internal/value.h
 error.$(OBJEXT): {$(VPATH)}internal/value_type.h
@@ -6514,15 +7075,20 @@ error.$(OBJEXT): {$(VPATH)}st.h
 error.$(OBJEXT): {$(VPATH)}subst.h
 error.$(OBJEXT): {$(VPATH)}thread_$(THREAD_MODEL).h
 error.$(OBJEXT): {$(VPATH)}thread_native.h
+error.$(OBJEXT): {$(VPATH)}util.h
 error.$(OBJEXT): {$(VPATH)}vm_core.h
+error.$(OBJEXT): {$(VPATH)}vm_debug.h
 error.$(OBJEXT): {$(VPATH)}vm_opts.h
+error.$(OBJEXT): {$(VPATH)}vm_sync.h
 error.$(OBJEXT): {$(VPATH)}warning.rbinc
+error.$(OBJEXT): {$(VPATH)}yjit.h
 eval.$(OBJEXT): $(CCAN_DIR)/check_type/check_type.h
 eval.$(OBJEXT): $(CCAN_DIR)/container_of/container_of.h
 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): $(hdrdir)/ruby/version.h
 eval.$(OBJEXT): $(top_srcdir)/internal/array.h
 eval.$(OBJEXT): $(top_srcdir)/internal/basic_operators.h
 eval.$(OBJEXT): $(top_srcdir)/internal/class.h
@@ -6535,14 +7101,37 @@ 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/namespace.h
 eval.$(OBJEXT): $(top_srcdir)/internal/object.h
+eval.$(OBJEXT): $(top_srcdir)/internal/sanitizers.h
 eval.$(OBJEXT): $(top_srcdir)/internal/serial.h
+eval.$(OBJEXT): $(top_srcdir)/internal/set_table.h
 eval.$(OBJEXT): $(top_srcdir)/internal/static_assert.h
 eval.$(OBJEXT): $(top_srcdir)/internal/string.h
 eval.$(OBJEXT): $(top_srcdir)/internal/thread.h
 eval.$(OBJEXT): $(top_srcdir)/internal/variable.h
 eval.$(OBJEXT): $(top_srcdir)/internal/vm.h
 eval.$(OBJEXT): $(top_srcdir)/internal/warnings.h
+eval.$(OBJEXT): $(top_srcdir)/prism/defines.h
+eval.$(OBJEXT): $(top_srcdir)/prism/encoding.h
+eval.$(OBJEXT): $(top_srcdir)/prism/node.h
+eval.$(OBJEXT): $(top_srcdir)/prism/options.h
+eval.$(OBJEXT): $(top_srcdir)/prism/pack.h
+eval.$(OBJEXT): $(top_srcdir)/prism/parser.h
+eval.$(OBJEXT): $(top_srcdir)/prism/prettyprint.h
+eval.$(OBJEXT): $(top_srcdir)/prism/prism.h
+eval.$(OBJEXT): $(top_srcdir)/prism/regexp.h
+eval.$(OBJEXT): $(top_srcdir)/prism/static_literals.h
+eval.$(OBJEXT): $(top_srcdir)/prism/util/pm_buffer.h
+eval.$(OBJEXT): $(top_srcdir)/prism/util/pm_char.h
+eval.$(OBJEXT): $(top_srcdir)/prism/util/pm_constant_pool.h
+eval.$(OBJEXT): $(top_srcdir)/prism/util/pm_integer.h
+eval.$(OBJEXT): $(top_srcdir)/prism/util/pm_list.h
+eval.$(OBJEXT): $(top_srcdir)/prism/util/pm_memchr.h
+eval.$(OBJEXT): $(top_srcdir)/prism/util/pm_newline_list.h
+eval.$(OBJEXT): $(top_srcdir)/prism/util/pm_string.h
+eval.$(OBJEXT): $(top_srcdir)/prism/util/pm_strncasecmp.h
+eval.$(OBJEXT): $(top_srcdir)/prism/util/pm_strpbrk.h
 eval.$(OBJEXT): {$(VPATH)}assert.h
 eval.$(OBJEXT): {$(VPATH)}atomic.h
 eval.$(OBJEXT): {$(VPATH)}backward/2/assume.h
@@ -6691,6 +7280,7 @@ eval.$(OBJEXT): {$(VPATH)}internal/intern/re.h
 eval.$(OBJEXT): {$(VPATH)}internal/intern/ruby.h
 eval.$(OBJEXT): {$(VPATH)}internal/intern/select.h
 eval.$(OBJEXT): {$(VPATH)}internal/intern/select/largesize.h
+eval.$(OBJEXT): {$(VPATH)}internal/intern/set.h
 eval.$(OBJEXT): {$(VPATH)}internal/intern/signal.h
 eval.$(OBJEXT): {$(VPATH)}internal/intern/sprintf.h
 eval.$(OBJEXT): {$(VPATH)}internal/intern/string.h
@@ -6710,6 +7300,7 @@ eval.$(OBJEXT): {$(VPATH)}internal/special_consts.h
 eval.$(OBJEXT): {$(VPATH)}internal/static_assert.h
 eval.$(OBJEXT): {$(VPATH)}internal/stdalign.h
 eval.$(OBJEXT): {$(VPATH)}internal/stdbool.h
+eval.$(OBJEXT): {$(VPATH)}internal/stdckdint.h
 eval.$(OBJEXT): {$(VPATH)}internal/symbol.h
 eval.$(OBJEXT): {$(VPATH)}internal/value.h
 eval.$(OBJEXT): {$(VPATH)}internal/value_type.h
@@ -6723,12 +7314,15 @@ eval.$(OBJEXT): {$(VPATH)}missing.h
 eval.$(OBJEXT): {$(VPATH)}node.h
 eval.$(OBJEXT): {$(VPATH)}onigmo.h
 eval.$(OBJEXT): {$(VPATH)}oniguruma.h
+eval.$(OBJEXT): {$(VPATH)}prism/ast.h
+eval.$(OBJEXT): {$(VPATH)}prism/diagnostic.h
+eval.$(OBJEXT): {$(VPATH)}prism/version.h
+eval.$(OBJEXT): {$(VPATH)}prism_compile.h
 eval.$(OBJEXT): {$(VPATH)}probes.dmyh
 eval.$(OBJEXT): {$(VPATH)}probes.h
 eval.$(OBJEXT): {$(VPATH)}probes_helper.h
 eval.$(OBJEXT): {$(VPATH)}ractor.h
 eval.$(OBJEXT): {$(VPATH)}ractor_core.h
-eval.$(OBJEXT): {$(VPATH)}rjit.h
 eval.$(OBJEXT): {$(VPATH)}ruby_assert.h
 eval.$(OBJEXT): {$(VPATH)}ruby_atomic.h
 eval.$(OBJEXT): {$(VPATH)}rubyparser.h
@@ -6741,6 +7335,7 @@ eval.$(OBJEXT): {$(VPATH)}vm.h
 eval.$(OBJEXT): {$(VPATH)}vm_core.h
 eval.$(OBJEXT): {$(VPATH)}vm_debug.h
 eval.$(OBJEXT): {$(VPATH)}vm_opts.h
+eval.$(OBJEXT): {$(VPATH)}vm_sync.h
 explicit_bzero.$(OBJEXT): {$(VPATH)}config.h
 explicit_bzero.$(OBJEXT): {$(VPATH)}explicit_bzero.c
 explicit_bzero.$(OBJEXT): {$(VPATH)}internal/attr/format.h
@@ -6761,6 +7356,7 @@ file.$(OBJEXT): $(CCAN_DIR)/container_of/container_of.h
 file.$(OBJEXT): $(CCAN_DIR)/list/list.h
 file.$(OBJEXT): $(CCAN_DIR)/str/str.h
 file.$(OBJEXT): $(hdrdir)/ruby/ruby.h
+file.$(OBJEXT): $(hdrdir)/ruby/version.h
 file.$(OBJEXT): $(top_srcdir)/internal/array.h
 file.$(OBJEXT): $(top_srcdir)/internal/class.h
 file.$(OBJEXT): $(top_srcdir)/internal/compilers.h
@@ -6924,6 +7520,7 @@ file.$(OBJEXT): {$(VPATH)}internal/intern/re.h
 file.$(OBJEXT): {$(VPATH)}internal/intern/ruby.h
 file.$(OBJEXT): {$(VPATH)}internal/intern/select.h
 file.$(OBJEXT): {$(VPATH)}internal/intern/select/largesize.h
+file.$(OBJEXT): {$(VPATH)}internal/intern/set.h
 file.$(OBJEXT): {$(VPATH)}internal/intern/signal.h
 file.$(OBJEXT): {$(VPATH)}internal/intern/sprintf.h
 file.$(OBJEXT): {$(VPATH)}internal/intern/string.h
@@ -6943,6 +7540,7 @@ file.$(OBJEXT): {$(VPATH)}internal/special_consts.h
 file.$(OBJEXT): {$(VPATH)}internal/static_assert.h
 file.$(OBJEXT): {$(VPATH)}internal/stdalign.h
 file.$(OBJEXT): {$(VPATH)}internal/stdbool.h
+file.$(OBJEXT): {$(VPATH)}internal/stdckdint.h
 file.$(OBJEXT): {$(VPATH)}internal/symbol.h
 file.$(OBJEXT): {$(VPATH)}internal/value.h
 file.$(OBJEXT): {$(VPATH)}internal/value_type.h
@@ -6965,6 +7563,10 @@ 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): $(hdrdir)/ruby/version.h
+gc.$(OBJEXT): $(top_srcdir)/gc/default/default.c
+gc.$(OBJEXT): $(top_srcdir)/gc/gc.h
+gc.$(OBJEXT): $(top_srcdir)/gc/gc_impl.h
 gc.$(OBJEXT): $(top_srcdir)/internal/array.h
 gc.$(OBJEXT): $(top_srcdir)/internal/basic_operators.h
 gc.$(OBJEXT): $(top_srcdir)/internal/bignum.h
@@ -6981,12 +7583,14 @@ 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/namespace.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/set_table.h
 gc.$(OBJEXT): $(top_srcdir)/internal/static_assert.h
 gc.$(OBJEXT): $(top_srcdir)/internal/string.h
 gc.$(OBJEXT): $(top_srcdir)/internal/struct.h
@@ -6995,6 +7599,26 @@ 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): $(top_srcdir)/prism/defines.h
+gc.$(OBJEXT): $(top_srcdir)/prism/encoding.h
+gc.$(OBJEXT): $(top_srcdir)/prism/node.h
+gc.$(OBJEXT): $(top_srcdir)/prism/options.h
+gc.$(OBJEXT): $(top_srcdir)/prism/pack.h
+gc.$(OBJEXT): $(top_srcdir)/prism/parser.h
+gc.$(OBJEXT): $(top_srcdir)/prism/prettyprint.h
+gc.$(OBJEXT): $(top_srcdir)/prism/prism.h
+gc.$(OBJEXT): $(top_srcdir)/prism/regexp.h
+gc.$(OBJEXT): $(top_srcdir)/prism/static_literals.h
+gc.$(OBJEXT): $(top_srcdir)/prism/util/pm_buffer.h
+gc.$(OBJEXT): $(top_srcdir)/prism/util/pm_char.h
+gc.$(OBJEXT): $(top_srcdir)/prism/util/pm_constant_pool.h
+gc.$(OBJEXT): $(top_srcdir)/prism/util/pm_integer.h
+gc.$(OBJEXT): $(top_srcdir)/prism/util/pm_list.h
+gc.$(OBJEXT): $(top_srcdir)/prism/util/pm_memchr.h
+gc.$(OBJEXT): $(top_srcdir)/prism/util/pm_newline_list.h
+gc.$(OBJEXT): $(top_srcdir)/prism/util/pm_string.h
+gc.$(OBJEXT): $(top_srcdir)/prism/util/pm_strncasecmp.h
+gc.$(OBJEXT): $(top_srcdir)/prism/util/pm_strpbrk.h
 gc.$(OBJEXT): {$(VPATH)}assert.h
 gc.$(OBJEXT): {$(VPATH)}atomic.h
 gc.$(OBJEXT): {$(VPATH)}backward/2/assume.h
@@ -7145,6 +7769,7 @@ gc.$(OBJEXT): {$(VPATH)}internal/intern/re.h
 gc.$(OBJEXT): {$(VPATH)}internal/intern/ruby.h
 gc.$(OBJEXT): {$(VPATH)}internal/intern/select.h
 gc.$(OBJEXT): {$(VPATH)}internal/intern/select/largesize.h
+gc.$(OBJEXT): {$(VPATH)}internal/intern/set.h
 gc.$(OBJEXT): {$(VPATH)}internal/intern/signal.h
 gc.$(OBJEXT): {$(VPATH)}internal/intern/sprintf.h
 gc.$(OBJEXT): {$(VPATH)}internal/intern/string.h
@@ -7164,6 +7789,7 @@ gc.$(OBJEXT): {$(VPATH)}internal/special_consts.h
 gc.$(OBJEXT): {$(VPATH)}internal/static_assert.h
 gc.$(OBJEXT): {$(VPATH)}internal/stdalign.h
 gc.$(OBJEXT): {$(VPATH)}internal/stdbool.h
+gc.$(OBJEXT): {$(VPATH)}internal/stdckdint.h
 gc.$(OBJEXT): {$(VPATH)}internal/symbol.h
 gc.$(OBJEXT): {$(VPATH)}internal/value.h
 gc.$(OBJEXT): {$(VPATH)}internal/value_type.h
@@ -7177,6 +7803,10 @@ gc.$(OBJEXT): {$(VPATH)}missing.h
 gc.$(OBJEXT): {$(VPATH)}node.h
 gc.$(OBJEXT): {$(VPATH)}onigmo.h
 gc.$(OBJEXT): {$(VPATH)}oniguruma.h
+gc.$(OBJEXT): {$(VPATH)}prism/ast.h
+gc.$(OBJEXT): {$(VPATH)}prism/diagnostic.h
+gc.$(OBJEXT): {$(VPATH)}prism/version.h
+gc.$(OBJEXT): {$(VPATH)}prism_compile.h
 gc.$(OBJEXT): {$(VPATH)}probes.dmyh
 gc.$(OBJEXT): {$(VPATH)}probes.h
 gc.$(OBJEXT): {$(VPATH)}ractor.h
@@ -7185,7 +7815,6 @@ gc.$(OBJEXT): {$(VPATH)}re.h
 gc.$(OBJEXT): {$(VPATH)}regenc.h
 gc.$(OBJEXT): {$(VPATH)}regex.h
 gc.$(OBJEXT): {$(VPATH)}regint.h
-gc.$(OBJEXT): {$(VPATH)}rjit.h
 gc.$(OBJEXT): {$(VPATH)}ruby_assert.h
 gc.$(OBJEXT): {$(VPATH)}ruby_atomic.h
 gc.$(OBJEXT): {$(VPATH)}rubyparser.h
@@ -7197,11 +7826,14 @@ gc.$(OBJEXT): {$(VPATH)}thread.h
 gc.$(OBJEXT): {$(VPATH)}thread_$(THREAD_MODEL).h
 gc.$(OBJEXT): {$(VPATH)}thread_native.h
 gc.$(OBJEXT): {$(VPATH)}util.h
+gc.$(OBJEXT): {$(VPATH)}variable.h
+gc.$(OBJEXT): {$(VPATH)}vm.h
 gc.$(OBJEXT): {$(VPATH)}vm_callinfo.h
 gc.$(OBJEXT): {$(VPATH)}vm_core.h
 gc.$(OBJEXT): {$(VPATH)}vm_debug.h
 gc.$(OBJEXT): {$(VPATH)}vm_opts.h
 gc.$(OBJEXT): {$(VPATH)}vm_sync.h
+gc.$(OBJEXT): {$(VPATH)}yjit.h
 goruby.$(OBJEXT): $(CCAN_DIR)/check_type/check_type.h
 goruby.$(OBJEXT): $(CCAN_DIR)/container_of/container_of.h
 goruby.$(OBJEXT): $(CCAN_DIR)/list/list.h
@@ -7210,15 +7842,45 @@ goruby.$(OBJEXT): $(hdrdir)/ruby.h
 goruby.$(OBJEXT): $(hdrdir)/ruby/ruby.h
 goruby.$(OBJEXT): $(top_srcdir)/internal/array.h
 goruby.$(OBJEXT): $(top_srcdir)/internal/basic_operators.h
+goruby.$(OBJEXT): $(top_srcdir)/internal/bignum.h
+goruby.$(OBJEXT): $(top_srcdir)/internal/bits.h
 goruby.$(OBJEXT): $(top_srcdir)/internal/compilers.h
+goruby.$(OBJEXT): $(top_srcdir)/internal/complex.h
+goruby.$(OBJEXT): $(top_srcdir)/internal/fixnum.h
 goruby.$(OBJEXT): $(top_srcdir)/internal/gc.h
 goruby.$(OBJEXT): $(top_srcdir)/internal/imemo.h
+goruby.$(OBJEXT): $(top_srcdir)/internal/namespace.h
+goruby.$(OBJEXT): $(top_srcdir)/internal/numeric.h
+goruby.$(OBJEXT): $(top_srcdir)/internal/parse.h
+goruby.$(OBJEXT): $(top_srcdir)/internal/rational.h
 goruby.$(OBJEXT): $(top_srcdir)/internal/ruby_parser.h
+goruby.$(OBJEXT): $(top_srcdir)/internal/sanitizers.h
 goruby.$(OBJEXT): $(top_srcdir)/internal/serial.h
+goruby.$(OBJEXT): $(top_srcdir)/internal/set_table.h
 goruby.$(OBJEXT): $(top_srcdir)/internal/static_assert.h
 goruby.$(OBJEXT): $(top_srcdir)/internal/variable.h
 goruby.$(OBJEXT): $(top_srcdir)/internal/vm.h
 goruby.$(OBJEXT): $(top_srcdir)/internal/warnings.h
+goruby.$(OBJEXT): $(top_srcdir)/prism/defines.h
+goruby.$(OBJEXT): $(top_srcdir)/prism/encoding.h
+goruby.$(OBJEXT): $(top_srcdir)/prism/node.h
+goruby.$(OBJEXT): $(top_srcdir)/prism/options.h
+goruby.$(OBJEXT): $(top_srcdir)/prism/pack.h
+goruby.$(OBJEXT): $(top_srcdir)/prism/parser.h
+goruby.$(OBJEXT): $(top_srcdir)/prism/prettyprint.h
+goruby.$(OBJEXT): $(top_srcdir)/prism/prism.h
+goruby.$(OBJEXT): $(top_srcdir)/prism/regexp.h
+goruby.$(OBJEXT): $(top_srcdir)/prism/static_literals.h
+goruby.$(OBJEXT): $(top_srcdir)/prism/util/pm_buffer.h
+goruby.$(OBJEXT): $(top_srcdir)/prism/util/pm_char.h
+goruby.$(OBJEXT): $(top_srcdir)/prism/util/pm_constant_pool.h
+goruby.$(OBJEXT): $(top_srcdir)/prism/util/pm_integer.h
+goruby.$(OBJEXT): $(top_srcdir)/prism/util/pm_list.h
+goruby.$(OBJEXT): $(top_srcdir)/prism/util/pm_memchr.h
+goruby.$(OBJEXT): $(top_srcdir)/prism/util/pm_newline_list.h
+goruby.$(OBJEXT): $(top_srcdir)/prism/util/pm_string.h
+goruby.$(OBJEXT): $(top_srcdir)/prism/util/pm_strncasecmp.h
+goruby.$(OBJEXT): $(top_srcdir)/prism/util/pm_strpbrk.h
 goruby.$(OBJEXT): {$(VPATH)}assert.h
 goruby.$(OBJEXT): {$(VPATH)}atomic.h
 goruby.$(OBJEXT): {$(VPATH)}backward.h
@@ -7235,7 +7897,7 @@ goruby.$(OBJEXT): {$(VPATH)}config.h
 goruby.$(OBJEXT): {$(VPATH)}constant.h
 goruby.$(OBJEXT): {$(VPATH)}defines.h
 goruby.$(OBJEXT): {$(VPATH)}encoding.h
-goruby.$(OBJEXT): {$(VPATH)}golf_prelude.c
+goruby.$(OBJEXT): {$(VPATH)}golf_prelude.rbbin
 goruby.$(OBJEXT): {$(VPATH)}goruby.c
 goruby.$(OBJEXT): {$(VPATH)}id.h
 goruby.$(OBJEXT): {$(VPATH)}id_table.h
@@ -7364,6 +8026,7 @@ goruby.$(OBJEXT): {$(VPATH)}internal/intern/re.h
 goruby.$(OBJEXT): {$(VPATH)}internal/intern/ruby.h
 goruby.$(OBJEXT): {$(VPATH)}internal/intern/select.h
 goruby.$(OBJEXT): {$(VPATH)}internal/intern/select/largesize.h
+goruby.$(OBJEXT): {$(VPATH)}internal/intern/set.h
 goruby.$(OBJEXT): {$(VPATH)}internal/intern/signal.h
 goruby.$(OBJEXT): {$(VPATH)}internal/intern/sprintf.h
 goruby.$(OBJEXT): {$(VPATH)}internal/intern/string.h
@@ -7383,6 +8046,7 @@ goruby.$(OBJEXT): {$(VPATH)}internal/special_consts.h
 goruby.$(OBJEXT): {$(VPATH)}internal/static_assert.h
 goruby.$(OBJEXT): {$(VPATH)}internal/stdalign.h
 goruby.$(OBJEXT): {$(VPATH)}internal/stdbool.h
+goruby.$(OBJEXT): {$(VPATH)}internal/stdckdint.h
 goruby.$(OBJEXT): {$(VPATH)}internal/symbol.h
 goruby.$(OBJEXT): {$(VPATH)}internal/value.h
 goruby.$(OBJEXT): {$(VPATH)}internal/value_type.h
@@ -7396,6 +8060,10 @@ goruby.$(OBJEXT): {$(VPATH)}missing.h
 goruby.$(OBJEXT): {$(VPATH)}node.h
 goruby.$(OBJEXT): {$(VPATH)}onigmo.h
 goruby.$(OBJEXT): {$(VPATH)}oniguruma.h
+goruby.$(OBJEXT): {$(VPATH)}prism/ast.h
+goruby.$(OBJEXT): {$(VPATH)}prism/diagnostic.h
+goruby.$(OBJEXT): {$(VPATH)}prism/version.h
+goruby.$(OBJEXT): {$(VPATH)}prism_compile.h
 goruby.$(OBJEXT): {$(VPATH)}ruby_assert.h
 goruby.$(OBJEXT): {$(VPATH)}ruby_atomic.h
 goruby.$(OBJEXT): {$(VPATH)}rubyparser.h
@@ -7412,6 +8080,7 @@ hash.$(OBJEXT): $(CCAN_DIR)/container_of/container_of.h
 hash.$(OBJEXT): $(CCAN_DIR)/list/list.h
 hash.$(OBJEXT): $(CCAN_DIR)/str/str.h
 hash.$(OBJEXT): $(hdrdir)/ruby/ruby.h
+hash.$(OBJEXT): $(hdrdir)/ruby/version.h
 hash.$(OBJEXT): $(top_srcdir)/internal/array.h
 hash.$(OBJEXT): $(top_srcdir)/internal/basic_operators.h
 hash.$(OBJEXT): $(top_srcdir)/internal/bignum.h
@@ -7423,9 +8092,13 @@ 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/imemo.h
+hash.$(OBJEXT): $(top_srcdir)/internal/namespace.h
 hash.$(OBJEXT): $(top_srcdir)/internal/object.h
 hash.$(OBJEXT): $(top_srcdir)/internal/proc.h
+hash.$(OBJEXT): $(top_srcdir)/internal/sanitizers.h
 hash.$(OBJEXT): $(top_srcdir)/internal/serial.h
+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/symbol.h
@@ -7434,6 +8107,26 @@ hash.$(OBJEXT): $(top_srcdir)/internal/time.h
 hash.$(OBJEXT): $(top_srcdir)/internal/variable.h
 hash.$(OBJEXT): $(top_srcdir)/internal/vm.h
 hash.$(OBJEXT): $(top_srcdir)/internal/warnings.h
+hash.$(OBJEXT): $(top_srcdir)/prism/defines.h
+hash.$(OBJEXT): $(top_srcdir)/prism/encoding.h
+hash.$(OBJEXT): $(top_srcdir)/prism/node.h
+hash.$(OBJEXT): $(top_srcdir)/prism/options.h
+hash.$(OBJEXT): $(top_srcdir)/prism/pack.h
+hash.$(OBJEXT): $(top_srcdir)/prism/parser.h
+hash.$(OBJEXT): $(top_srcdir)/prism/prettyprint.h
+hash.$(OBJEXT): $(top_srcdir)/prism/prism.h
+hash.$(OBJEXT): $(top_srcdir)/prism/regexp.h
+hash.$(OBJEXT): $(top_srcdir)/prism/static_literals.h
+hash.$(OBJEXT): $(top_srcdir)/prism/util/pm_buffer.h
+hash.$(OBJEXT): $(top_srcdir)/prism/util/pm_char.h
+hash.$(OBJEXT): $(top_srcdir)/prism/util/pm_constant_pool.h
+hash.$(OBJEXT): $(top_srcdir)/prism/util/pm_integer.h
+hash.$(OBJEXT): $(top_srcdir)/prism/util/pm_list.h
+hash.$(OBJEXT): $(top_srcdir)/prism/util/pm_memchr.h
+hash.$(OBJEXT): $(top_srcdir)/prism/util/pm_newline_list.h
+hash.$(OBJEXT): $(top_srcdir)/prism/util/pm_string.h
+hash.$(OBJEXT): $(top_srcdir)/prism/util/pm_strncasecmp.h
+hash.$(OBJEXT): $(top_srcdir)/prism/util/pm_strpbrk.h
 hash.$(OBJEXT): {$(VPATH)}assert.h
 hash.$(OBJEXT): {$(VPATH)}atomic.h
 hash.$(OBJEXT): {$(VPATH)}backward/2/assume.h
@@ -7445,12 +8138,14 @@ hash.$(OBJEXT): {$(VPATH)}backward/2/limits.h
 hash.$(OBJEXT): {$(VPATH)}backward/2/long_long.h
 hash.$(OBJEXT): {$(VPATH)}backward/2/stdalign.h
 hash.$(OBJEXT): {$(VPATH)}backward/2/stdarg.h
+hash.$(OBJEXT): {$(VPATH)}builtin.h
 hash.$(OBJEXT): {$(VPATH)}config.h
 hash.$(OBJEXT): {$(VPATH)}constant.h
 hash.$(OBJEXT): {$(VPATH)}debug_counter.h
 hash.$(OBJEXT): {$(VPATH)}defines.h
 hash.$(OBJEXT): {$(VPATH)}encoding.h
 hash.$(OBJEXT): {$(VPATH)}hash.c
+hash.$(OBJEXT): {$(VPATH)}hash.rbinc
 hash.$(OBJEXT): {$(VPATH)}id.h
 hash.$(OBJEXT): {$(VPATH)}id_table.h
 hash.$(OBJEXT): {$(VPATH)}intern.h
@@ -7578,6 +8273,7 @@ hash.$(OBJEXT): {$(VPATH)}internal/intern/re.h
 hash.$(OBJEXT): {$(VPATH)}internal/intern/ruby.h
 hash.$(OBJEXT): {$(VPATH)}internal/intern/select.h
 hash.$(OBJEXT): {$(VPATH)}internal/intern/select/largesize.h
+hash.$(OBJEXT): {$(VPATH)}internal/intern/set.h
 hash.$(OBJEXT): {$(VPATH)}internal/intern/signal.h
 hash.$(OBJEXT): {$(VPATH)}internal/intern/sprintf.h
 hash.$(OBJEXT): {$(VPATH)}internal/intern/string.h
@@ -7594,9 +8290,11 @@ hash.$(OBJEXT): {$(VPATH)}internal/module.h
 hash.$(OBJEXT): {$(VPATH)}internal/newobj.h
 hash.$(OBJEXT): {$(VPATH)}internal/scan_args.h
 hash.$(OBJEXT): {$(VPATH)}internal/special_consts.h
+hash.$(OBJEXT): {$(VPATH)}internal/st.h
 hash.$(OBJEXT): {$(VPATH)}internal/static_assert.h
 hash.$(OBJEXT): {$(VPATH)}internal/stdalign.h
 hash.$(OBJEXT): {$(VPATH)}internal/stdbool.h
+hash.$(OBJEXT): {$(VPATH)}internal/stdckdint.h
 hash.$(OBJEXT): {$(VPATH)}internal/symbol.h
 hash.$(OBJEXT): {$(VPATH)}internal/value.h
 hash.$(OBJEXT): {$(VPATH)}internal/value_type.h
@@ -7609,6 +8307,10 @@ hash.$(OBJEXT): {$(VPATH)}missing.h
 hash.$(OBJEXT): {$(VPATH)}node.h
 hash.$(OBJEXT): {$(VPATH)}onigmo.h
 hash.$(OBJEXT): {$(VPATH)}oniguruma.h
+hash.$(OBJEXT): {$(VPATH)}prism/ast.h
+hash.$(OBJEXT): {$(VPATH)}prism/diagnostic.h
+hash.$(OBJEXT): {$(VPATH)}prism/version.h
+hash.$(OBJEXT): {$(VPATH)}prism_compile.h
 hash.$(OBJEXT): {$(VPATH)}probes.dmyh
 hash.$(OBJEXT): {$(VPATH)}probes.h
 hash.$(OBJEXT): {$(VPATH)}ractor.h
@@ -7626,6 +8328,215 @@ hash.$(OBJEXT): {$(VPATH)}vm_core.h
 hash.$(OBJEXT): {$(VPATH)}vm_debug.h
 hash.$(OBJEXT): {$(VPATH)}vm_opts.h
 hash.$(OBJEXT): {$(VPATH)}vm_sync.h
+imemo.$(OBJEXT): $(CCAN_DIR)/check_type/check_type.h
+imemo.$(OBJEXT): $(CCAN_DIR)/container_of/container_of.h
+imemo.$(OBJEXT): $(CCAN_DIR)/list/list.h
+imemo.$(OBJEXT): $(CCAN_DIR)/str/str.h
+imemo.$(OBJEXT): $(hdrdir)/ruby/ruby.h
+imemo.$(OBJEXT): $(top_srcdir)/internal/array.h
+imemo.$(OBJEXT): $(top_srcdir)/internal/basic_operators.h
+imemo.$(OBJEXT): $(top_srcdir)/internal/class.h
+imemo.$(OBJEXT): $(top_srcdir)/internal/compilers.h
+imemo.$(OBJEXT): $(top_srcdir)/internal/gc.h
+imemo.$(OBJEXT): $(top_srcdir)/internal/imemo.h
+imemo.$(OBJEXT): $(top_srcdir)/internal/namespace.h
+imemo.$(OBJEXT): $(top_srcdir)/internal/sanitizers.h
+imemo.$(OBJEXT): $(top_srcdir)/internal/serial.h
+imemo.$(OBJEXT): $(top_srcdir)/internal/set_table.h
+imemo.$(OBJEXT): $(top_srcdir)/internal/st.h
+imemo.$(OBJEXT): $(top_srcdir)/internal/static_assert.h
+imemo.$(OBJEXT): $(top_srcdir)/internal/variable.h
+imemo.$(OBJEXT): $(top_srcdir)/internal/vm.h
+imemo.$(OBJEXT): $(top_srcdir)/internal/warnings.h
+imemo.$(OBJEXT): {$(VPATH)}assert.h
+imemo.$(OBJEXT): {$(VPATH)}atomic.h
+imemo.$(OBJEXT): {$(VPATH)}backward/2/assume.h
+imemo.$(OBJEXT): {$(VPATH)}backward/2/attributes.h
+imemo.$(OBJEXT): {$(VPATH)}backward/2/bool.h
+imemo.$(OBJEXT): {$(VPATH)}backward/2/gcc_version_since.h
+imemo.$(OBJEXT): {$(VPATH)}backward/2/inttypes.h
+imemo.$(OBJEXT): {$(VPATH)}backward/2/limits.h
+imemo.$(OBJEXT): {$(VPATH)}backward/2/long_long.h
+imemo.$(OBJEXT): {$(VPATH)}backward/2/stdalign.h
+imemo.$(OBJEXT): {$(VPATH)}backward/2/stdarg.h
+imemo.$(OBJEXT): {$(VPATH)}config.h
+imemo.$(OBJEXT): {$(VPATH)}constant.h
+imemo.$(OBJEXT): {$(VPATH)}debug_counter.h
+imemo.$(OBJEXT): {$(VPATH)}defines.h
+imemo.$(OBJEXT): {$(VPATH)}encoding.h
+imemo.$(OBJEXT): {$(VPATH)}id.h
+imemo.$(OBJEXT): {$(VPATH)}id_table.h
+imemo.$(OBJEXT): {$(VPATH)}imemo.c
+imemo.$(OBJEXT): {$(VPATH)}intern.h
+imemo.$(OBJEXT): {$(VPATH)}internal.h
+imemo.$(OBJEXT): {$(VPATH)}internal/abi.h
+imemo.$(OBJEXT): {$(VPATH)}internal/anyargs.h
+imemo.$(OBJEXT): {$(VPATH)}internal/arithmetic.h
+imemo.$(OBJEXT): {$(VPATH)}internal/arithmetic/char.h
+imemo.$(OBJEXT): {$(VPATH)}internal/arithmetic/double.h
+imemo.$(OBJEXT): {$(VPATH)}internal/arithmetic/fixnum.h
+imemo.$(OBJEXT): {$(VPATH)}internal/arithmetic/gid_t.h
+imemo.$(OBJEXT): {$(VPATH)}internal/arithmetic/int.h
+imemo.$(OBJEXT): {$(VPATH)}internal/arithmetic/intptr_t.h
+imemo.$(OBJEXT): {$(VPATH)}internal/arithmetic/long.h
+imemo.$(OBJEXT): {$(VPATH)}internal/arithmetic/long_long.h
+imemo.$(OBJEXT): {$(VPATH)}internal/arithmetic/mode_t.h
+imemo.$(OBJEXT): {$(VPATH)}internal/arithmetic/off_t.h
+imemo.$(OBJEXT): {$(VPATH)}internal/arithmetic/pid_t.h
+imemo.$(OBJEXT): {$(VPATH)}internal/arithmetic/short.h
+imemo.$(OBJEXT): {$(VPATH)}internal/arithmetic/size_t.h
+imemo.$(OBJEXT): {$(VPATH)}internal/arithmetic/st_data_t.h
+imemo.$(OBJEXT): {$(VPATH)}internal/arithmetic/uid_t.h
+imemo.$(OBJEXT): {$(VPATH)}internal/assume.h
+imemo.$(OBJEXT): {$(VPATH)}internal/attr/alloc_size.h
+imemo.$(OBJEXT): {$(VPATH)}internal/attr/artificial.h
+imemo.$(OBJEXT): {$(VPATH)}internal/attr/cold.h
+imemo.$(OBJEXT): {$(VPATH)}internal/attr/const.h
+imemo.$(OBJEXT): {$(VPATH)}internal/attr/constexpr.h
+imemo.$(OBJEXT): {$(VPATH)}internal/attr/deprecated.h
+imemo.$(OBJEXT): {$(VPATH)}internal/attr/diagnose_if.h
+imemo.$(OBJEXT): {$(VPATH)}internal/attr/enum_extensibility.h
+imemo.$(OBJEXT): {$(VPATH)}internal/attr/error.h
+imemo.$(OBJEXT): {$(VPATH)}internal/attr/flag_enum.h
+imemo.$(OBJEXT): {$(VPATH)}internal/attr/forceinline.h
+imemo.$(OBJEXT): {$(VPATH)}internal/attr/format.h
+imemo.$(OBJEXT): {$(VPATH)}internal/attr/maybe_unused.h
+imemo.$(OBJEXT): {$(VPATH)}internal/attr/noalias.h
+imemo.$(OBJEXT): {$(VPATH)}internal/attr/nodiscard.h
+imemo.$(OBJEXT): {$(VPATH)}internal/attr/noexcept.h
+imemo.$(OBJEXT): {$(VPATH)}internal/attr/noinline.h
+imemo.$(OBJEXT): {$(VPATH)}internal/attr/nonnull.h
+imemo.$(OBJEXT): {$(VPATH)}internal/attr/noreturn.h
+imemo.$(OBJEXT): {$(VPATH)}internal/attr/packed_struct.h
+imemo.$(OBJEXT): {$(VPATH)}internal/attr/pure.h
+imemo.$(OBJEXT): {$(VPATH)}internal/attr/restrict.h
+imemo.$(OBJEXT): {$(VPATH)}internal/attr/returns_nonnull.h
+imemo.$(OBJEXT): {$(VPATH)}internal/attr/warning.h
+imemo.$(OBJEXT): {$(VPATH)}internal/attr/weakref.h
+imemo.$(OBJEXT): {$(VPATH)}internal/cast.h
+imemo.$(OBJEXT): {$(VPATH)}internal/compiler_is.h
+imemo.$(OBJEXT): {$(VPATH)}internal/compiler_is/apple.h
+imemo.$(OBJEXT): {$(VPATH)}internal/compiler_is/clang.h
+imemo.$(OBJEXT): {$(VPATH)}internal/compiler_is/gcc.h
+imemo.$(OBJEXT): {$(VPATH)}internal/compiler_is/intel.h
+imemo.$(OBJEXT): {$(VPATH)}internal/compiler_is/msvc.h
+imemo.$(OBJEXT): {$(VPATH)}internal/compiler_is/sunpro.h
+imemo.$(OBJEXT): {$(VPATH)}internal/compiler_since.h
+imemo.$(OBJEXT): {$(VPATH)}internal/config.h
+imemo.$(OBJEXT): {$(VPATH)}internal/constant_p.h
+imemo.$(OBJEXT): {$(VPATH)}internal/core.h
+imemo.$(OBJEXT): {$(VPATH)}internal/core/rarray.h
+imemo.$(OBJEXT): {$(VPATH)}internal/core/rbasic.h
+imemo.$(OBJEXT): {$(VPATH)}internal/core/rbignum.h
+imemo.$(OBJEXT): {$(VPATH)}internal/core/rclass.h
+imemo.$(OBJEXT): {$(VPATH)}internal/core/rdata.h
+imemo.$(OBJEXT): {$(VPATH)}internal/core/rfile.h
+imemo.$(OBJEXT): {$(VPATH)}internal/core/rhash.h
+imemo.$(OBJEXT): {$(VPATH)}internal/core/robject.h
+imemo.$(OBJEXT): {$(VPATH)}internal/core/rregexp.h
+imemo.$(OBJEXT): {$(VPATH)}internal/core/rstring.h
+imemo.$(OBJEXT): {$(VPATH)}internal/core/rstruct.h
+imemo.$(OBJEXT): {$(VPATH)}internal/core/rtypeddata.h
+imemo.$(OBJEXT): {$(VPATH)}internal/ctype.h
+imemo.$(OBJEXT): {$(VPATH)}internal/dllexport.h
+imemo.$(OBJEXT): {$(VPATH)}internal/dosish.h
+imemo.$(OBJEXT): {$(VPATH)}internal/encoding/coderange.h
+imemo.$(OBJEXT): {$(VPATH)}internal/encoding/ctype.h
+imemo.$(OBJEXT): {$(VPATH)}internal/encoding/encoding.h
+imemo.$(OBJEXT): {$(VPATH)}internal/encoding/pathname.h
+imemo.$(OBJEXT): {$(VPATH)}internal/encoding/re.h
+imemo.$(OBJEXT): {$(VPATH)}internal/encoding/sprintf.h
+imemo.$(OBJEXT): {$(VPATH)}internal/encoding/string.h
+imemo.$(OBJEXT): {$(VPATH)}internal/encoding/symbol.h
+imemo.$(OBJEXT): {$(VPATH)}internal/encoding/transcode.h
+imemo.$(OBJEXT): {$(VPATH)}internal/error.h
+imemo.$(OBJEXT): {$(VPATH)}internal/eval.h
+imemo.$(OBJEXT): {$(VPATH)}internal/event.h
+imemo.$(OBJEXT): {$(VPATH)}internal/fl_type.h
+imemo.$(OBJEXT): {$(VPATH)}internal/gc.h
+imemo.$(OBJEXT): {$(VPATH)}internal/glob.h
+imemo.$(OBJEXT): {$(VPATH)}internal/globals.h
+imemo.$(OBJEXT): {$(VPATH)}internal/has/attribute.h
+imemo.$(OBJEXT): {$(VPATH)}internal/has/builtin.h
+imemo.$(OBJEXT): {$(VPATH)}internal/has/c_attribute.h
+imemo.$(OBJEXT): {$(VPATH)}internal/has/cpp_attribute.h
+imemo.$(OBJEXT): {$(VPATH)}internal/has/declspec_attribute.h
+imemo.$(OBJEXT): {$(VPATH)}internal/has/extension.h
+imemo.$(OBJEXT): {$(VPATH)}internal/has/feature.h
+imemo.$(OBJEXT): {$(VPATH)}internal/has/warning.h
+imemo.$(OBJEXT): {$(VPATH)}internal/intern/array.h
+imemo.$(OBJEXT): {$(VPATH)}internal/intern/bignum.h
+imemo.$(OBJEXT): {$(VPATH)}internal/intern/class.h
+imemo.$(OBJEXT): {$(VPATH)}internal/intern/compar.h
+imemo.$(OBJEXT): {$(VPATH)}internal/intern/complex.h
+imemo.$(OBJEXT): {$(VPATH)}internal/intern/cont.h
+imemo.$(OBJEXT): {$(VPATH)}internal/intern/dir.h
+imemo.$(OBJEXT): {$(VPATH)}internal/intern/enum.h
+imemo.$(OBJEXT): {$(VPATH)}internal/intern/enumerator.h
+imemo.$(OBJEXT): {$(VPATH)}internal/intern/error.h
+imemo.$(OBJEXT): {$(VPATH)}internal/intern/eval.h
+imemo.$(OBJEXT): {$(VPATH)}internal/intern/file.h
+imemo.$(OBJEXT): {$(VPATH)}internal/intern/hash.h
+imemo.$(OBJEXT): {$(VPATH)}internal/intern/io.h
+imemo.$(OBJEXT): {$(VPATH)}internal/intern/load.h
+imemo.$(OBJEXT): {$(VPATH)}internal/intern/marshal.h
+imemo.$(OBJEXT): {$(VPATH)}internal/intern/numeric.h
+imemo.$(OBJEXT): {$(VPATH)}internal/intern/object.h
+imemo.$(OBJEXT): {$(VPATH)}internal/intern/parse.h
+imemo.$(OBJEXT): {$(VPATH)}internal/intern/proc.h
+imemo.$(OBJEXT): {$(VPATH)}internal/intern/process.h
+imemo.$(OBJEXT): {$(VPATH)}internal/intern/random.h
+imemo.$(OBJEXT): {$(VPATH)}internal/intern/range.h
+imemo.$(OBJEXT): {$(VPATH)}internal/intern/rational.h
+imemo.$(OBJEXT): {$(VPATH)}internal/intern/re.h
+imemo.$(OBJEXT): {$(VPATH)}internal/intern/ruby.h
+imemo.$(OBJEXT): {$(VPATH)}internal/intern/select.h
+imemo.$(OBJEXT): {$(VPATH)}internal/intern/select/largesize.h
+imemo.$(OBJEXT): {$(VPATH)}internal/intern/set.h
+imemo.$(OBJEXT): {$(VPATH)}internal/intern/signal.h
+imemo.$(OBJEXT): {$(VPATH)}internal/intern/sprintf.h
+imemo.$(OBJEXT): {$(VPATH)}internal/intern/string.h
+imemo.$(OBJEXT): {$(VPATH)}internal/intern/struct.h
+imemo.$(OBJEXT): {$(VPATH)}internal/intern/thread.h
+imemo.$(OBJEXT): {$(VPATH)}internal/intern/time.h
+imemo.$(OBJEXT): {$(VPATH)}internal/intern/variable.h
+imemo.$(OBJEXT): {$(VPATH)}internal/intern/vm.h
+imemo.$(OBJEXT): {$(VPATH)}internal/interpreter.h
+imemo.$(OBJEXT): {$(VPATH)}internal/iterator.h
+imemo.$(OBJEXT): {$(VPATH)}internal/memory.h
+imemo.$(OBJEXT): {$(VPATH)}internal/method.h
+imemo.$(OBJEXT): {$(VPATH)}internal/module.h
+imemo.$(OBJEXT): {$(VPATH)}internal/newobj.h
+imemo.$(OBJEXT): {$(VPATH)}internal/scan_args.h
+imemo.$(OBJEXT): {$(VPATH)}internal/special_consts.h
+imemo.$(OBJEXT): {$(VPATH)}internal/static_assert.h
+imemo.$(OBJEXT): {$(VPATH)}internal/stdalign.h
+imemo.$(OBJEXT): {$(VPATH)}internal/stdbool.h
+imemo.$(OBJEXT): {$(VPATH)}internal/stdckdint.h
+imemo.$(OBJEXT): {$(VPATH)}internal/symbol.h
+imemo.$(OBJEXT): {$(VPATH)}internal/value.h
+imemo.$(OBJEXT): {$(VPATH)}internal/value_type.h
+imemo.$(OBJEXT): {$(VPATH)}internal/variable.h
+imemo.$(OBJEXT): {$(VPATH)}internal/warning_push.h
+imemo.$(OBJEXT): {$(VPATH)}internal/xmalloc.h
+imemo.$(OBJEXT): {$(VPATH)}method.h
+imemo.$(OBJEXT): {$(VPATH)}missing.h
+imemo.$(OBJEXT): {$(VPATH)}node.h
+imemo.$(OBJEXT): {$(VPATH)}onigmo.h
+imemo.$(OBJEXT): {$(VPATH)}oniguruma.h
+imemo.$(OBJEXT): {$(VPATH)}ruby_assert.h
+imemo.$(OBJEXT): {$(VPATH)}ruby_atomic.h
+imemo.$(OBJEXT): {$(VPATH)}rubyparser.h
+imemo.$(OBJEXT): {$(VPATH)}shape.h
+imemo.$(OBJEXT): {$(VPATH)}st.h
+imemo.$(OBJEXT): {$(VPATH)}subst.h
+imemo.$(OBJEXT): {$(VPATH)}thread_$(THREAD_MODEL).h
+imemo.$(OBJEXT): {$(VPATH)}thread_native.h
+imemo.$(OBJEXT): {$(VPATH)}vm_callinfo.h
+imemo.$(OBJEXT): {$(VPATH)}vm_core.h
+imemo.$(OBJEXT): {$(VPATH)}vm_debug.h
+imemo.$(OBJEXT): {$(VPATH)}vm_opts.h
+imemo.$(OBJEXT): {$(VPATH)}vm_sync.h
 inits.$(OBJEXT): $(hdrdir)/ruby.h
 inits.$(OBJEXT): $(hdrdir)/ruby/ruby.h
 inits.$(OBJEXT): $(top_srcdir)/internal/compilers.h
@@ -7760,6 +8671,7 @@ inits.$(OBJEXT): {$(VPATH)}internal/intern/re.h
 inits.$(OBJEXT): {$(VPATH)}internal/intern/ruby.h
 inits.$(OBJEXT): {$(VPATH)}internal/intern/select.h
 inits.$(OBJEXT): {$(VPATH)}internal/intern/select/largesize.h
+inits.$(OBJEXT): {$(VPATH)}internal/intern/set.h
 inits.$(OBJEXT): {$(VPATH)}internal/intern/signal.h
 inits.$(OBJEXT): {$(VPATH)}internal/intern/sprintf.h
 inits.$(OBJEXT): {$(VPATH)}internal/intern/string.h
@@ -7779,6 +8691,7 @@ inits.$(OBJEXT): {$(VPATH)}internal/special_consts.h
 inits.$(OBJEXT): {$(VPATH)}internal/static_assert.h
 inits.$(OBJEXT): {$(VPATH)}internal/stdalign.h
 inits.$(OBJEXT): {$(VPATH)}internal/stdbool.h
+inits.$(OBJEXT): {$(VPATH)}internal/stdckdint.h
 inits.$(OBJEXT): {$(VPATH)}internal/symbol.h
 inits.$(OBJEXT): {$(VPATH)}internal/value.h
 inits.$(OBJEXT): {$(VPATH)}internal/value_type.h
@@ -7794,6 +8707,7 @@ io.$(OBJEXT): $(CCAN_DIR)/container_of/container_of.h
 io.$(OBJEXT): $(CCAN_DIR)/list/list.h
 io.$(OBJEXT): $(CCAN_DIR)/str/str.h
 io.$(OBJEXT): $(hdrdir)/ruby/ruby.h
+io.$(OBJEXT): $(hdrdir)/ruby/version.h
 io.$(OBJEXT): $(top_srcdir)/internal/array.h
 io.$(OBJEXT): $(top_srcdir)/internal/basic_operators.h
 io.$(OBJEXT): $(top_srcdir)/internal/bignum.h
@@ -7807,10 +8721,13 @@ 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/namespace.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/sanitizers.h
 io.$(OBJEXT): $(top_srcdir)/internal/serial.h
+io.$(OBJEXT): $(top_srcdir)/internal/set_table.h
 io.$(OBJEXT): $(top_srcdir)/internal/static_assert.h
 io.$(OBJEXT): $(top_srcdir)/internal/string.h
 io.$(OBJEXT): $(top_srcdir)/internal/thread.h
@@ -7832,6 +8749,7 @@ io.$(OBJEXT): {$(VPATH)}backward/2/stdarg.h
 io.$(OBJEXT): {$(VPATH)}builtin.h
 io.$(OBJEXT): {$(VPATH)}config.h
 io.$(OBJEXT): {$(VPATH)}constant.h
+io.$(OBJEXT): {$(VPATH)}debug_counter.h
 io.$(OBJEXT): {$(VPATH)}defines.h
 io.$(OBJEXT): {$(VPATH)}dln.h
 io.$(OBJEXT): {$(VPATH)}encindex.h
@@ -7964,6 +8882,7 @@ io.$(OBJEXT): {$(VPATH)}internal/intern/re.h
 io.$(OBJEXT): {$(VPATH)}internal/intern/ruby.h
 io.$(OBJEXT): {$(VPATH)}internal/intern/select.h
 io.$(OBJEXT): {$(VPATH)}internal/intern/select/largesize.h
+io.$(OBJEXT): {$(VPATH)}internal/intern/set.h
 io.$(OBJEXT): {$(VPATH)}internal/intern/signal.h
 io.$(OBJEXT): {$(VPATH)}internal/intern/sprintf.h
 io.$(OBJEXT): {$(VPATH)}internal/intern/string.h
@@ -7983,6 +8902,7 @@ io.$(OBJEXT): {$(VPATH)}internal/special_consts.h
 io.$(OBJEXT): {$(VPATH)}internal/static_assert.h
 io.$(OBJEXT): {$(VPATH)}internal/stdalign.h
 io.$(OBJEXT): {$(VPATH)}internal/stdbool.h
+io.$(OBJEXT): {$(VPATH)}internal/stdckdint.h
 io.$(OBJEXT): {$(VPATH)}internal/symbol.h
 io.$(OBJEXT): {$(VPATH)}internal/value.h
 io.$(OBJEXT): {$(VPATH)}internal/value_type.h
@@ -8010,25 +8930,37 @@ io.$(OBJEXT): {$(VPATH)}thread_$(THREAD_MODEL).h
 io.$(OBJEXT): {$(VPATH)}thread_native.h
 io.$(OBJEXT): {$(VPATH)}util.h
 io.$(OBJEXT): {$(VPATH)}vm_core.h
+io.$(OBJEXT): {$(VPATH)}vm_debug.h
 io.$(OBJEXT): {$(VPATH)}vm_opts.h
+io.$(OBJEXT): {$(VPATH)}vm_sync.h
 io_buffer.$(OBJEXT): $(CCAN_DIR)/check_type/check_type.h
 io_buffer.$(OBJEXT): $(CCAN_DIR)/container_of/container_of.h
 io_buffer.$(OBJEXT): $(CCAN_DIR)/list/list.h
 io_buffer.$(OBJEXT): $(CCAN_DIR)/str/str.h
 io_buffer.$(OBJEXT): $(hdrdir)/ruby/ruby.h
+io_buffer.$(OBJEXT): $(hdrdir)/ruby/version.h
 io_buffer.$(OBJEXT): $(top_srcdir)/internal/array.h
+io_buffer.$(OBJEXT): $(top_srcdir)/internal/basic_operators.h
 io_buffer.$(OBJEXT): $(top_srcdir)/internal/bignum.h
 io_buffer.$(OBJEXT): $(top_srcdir)/internal/bits.h
 io_buffer.$(OBJEXT): $(top_srcdir)/internal/compilers.h
 io_buffer.$(OBJEXT): $(top_srcdir)/internal/error.h
 io_buffer.$(OBJEXT): $(top_srcdir)/internal/fixnum.h
+io_buffer.$(OBJEXT): $(top_srcdir)/internal/gc.h
+io_buffer.$(OBJEXT): $(top_srcdir)/internal/imemo.h
+io_buffer.$(OBJEXT): $(top_srcdir)/internal/io.h
+io_buffer.$(OBJEXT): $(top_srcdir)/internal/namespace.h
 io_buffer.$(OBJEXT): $(top_srcdir)/internal/numeric.h
+io_buffer.$(OBJEXT): $(top_srcdir)/internal/sanitizers.h
 io_buffer.$(OBJEXT): $(top_srcdir)/internal/serial.h
+io_buffer.$(OBJEXT): $(top_srcdir)/internal/set_table.h
 io_buffer.$(OBJEXT): $(top_srcdir)/internal/static_assert.h
 io_buffer.$(OBJEXT): $(top_srcdir)/internal/string.h
 io_buffer.$(OBJEXT): $(top_srcdir)/internal/thread.h
 io_buffer.$(OBJEXT): $(top_srcdir)/internal/vm.h
+io_buffer.$(OBJEXT): $(top_srcdir)/internal/warnings.h
 io_buffer.$(OBJEXT): {$(VPATH)}assert.h
+io_buffer.$(OBJEXT): {$(VPATH)}atomic.h
 io_buffer.$(OBJEXT): {$(VPATH)}backward/2/assume.h
 io_buffer.$(OBJEXT): {$(VPATH)}backward/2/attributes.h
 io_buffer.$(OBJEXT): {$(VPATH)}backward/2/bool.h
@@ -8042,6 +8974,8 @@ io_buffer.$(OBJEXT): {$(VPATH)}config.h
 io_buffer.$(OBJEXT): {$(VPATH)}defines.h
 io_buffer.$(OBJEXT): {$(VPATH)}encoding.h
 io_buffer.$(OBJEXT): {$(VPATH)}fiber/scheduler.h
+io_buffer.$(OBJEXT): {$(VPATH)}id.h
+io_buffer.$(OBJEXT): {$(VPATH)}id_table.h
 io_buffer.$(OBJEXT): {$(VPATH)}intern.h
 io_buffer.$(OBJEXT): {$(VPATH)}internal.h
 io_buffer.$(OBJEXT): {$(VPATH)}internal/abi.h
@@ -8167,6 +9101,7 @@ io_buffer.$(OBJEXT): {$(VPATH)}internal/intern/re.h
 io_buffer.$(OBJEXT): {$(VPATH)}internal/intern/ruby.h
 io_buffer.$(OBJEXT): {$(VPATH)}internal/intern/select.h
 io_buffer.$(OBJEXT): {$(VPATH)}internal/intern/select/largesize.h
+io_buffer.$(OBJEXT): {$(VPATH)}internal/intern/set.h
 io_buffer.$(OBJEXT): {$(VPATH)}internal/intern/signal.h
 io_buffer.$(OBJEXT): {$(VPATH)}internal/intern/sprintf.h
 io_buffer.$(OBJEXT): {$(VPATH)}internal/intern/string.h
@@ -8186,6 +9121,7 @@ io_buffer.$(OBJEXT): {$(VPATH)}internal/special_consts.h
 io_buffer.$(OBJEXT): {$(VPATH)}internal/static_assert.h
 io_buffer.$(OBJEXT): {$(VPATH)}internal/stdalign.h
 io_buffer.$(OBJEXT): {$(VPATH)}internal/stdbool.h
+io_buffer.$(OBJEXT): {$(VPATH)}internal/stdckdint.h
 io_buffer.$(OBJEXT): {$(VPATH)}internal/symbol.h
 io_buffer.$(OBJEXT): {$(VPATH)}internal/value.h
 io_buffer.$(OBJEXT): {$(VPATH)}internal/value_type.h
@@ -8195,33 +9131,51 @@ io_buffer.$(OBJEXT): {$(VPATH)}internal/xmalloc.h
 io_buffer.$(OBJEXT): {$(VPATH)}io.h
 io_buffer.$(OBJEXT): {$(VPATH)}io/buffer.h
 io_buffer.$(OBJEXT): {$(VPATH)}io_buffer.c
+io_buffer.$(OBJEXT): {$(VPATH)}method.h
 io_buffer.$(OBJEXT): {$(VPATH)}missing.h
+io_buffer.$(OBJEXT): {$(VPATH)}node.h
 io_buffer.$(OBJEXT): {$(VPATH)}onigmo.h
 io_buffer.$(OBJEXT): {$(VPATH)}oniguruma.h
+io_buffer.$(OBJEXT): {$(VPATH)}ruby_assert.h
+io_buffer.$(OBJEXT): {$(VPATH)}ruby_atomic.h
+io_buffer.$(OBJEXT): {$(VPATH)}rubyparser.h
 io_buffer.$(OBJEXT): {$(VPATH)}st.h
 io_buffer.$(OBJEXT): {$(VPATH)}subst.h
+io_buffer.$(OBJEXT): {$(VPATH)}thread.h
+io_buffer.$(OBJEXT): {$(VPATH)}thread_$(THREAD_MODEL).h
 io_buffer.$(OBJEXT): {$(VPATH)}thread_native.h
+io_buffer.$(OBJEXT): {$(VPATH)}vm_core.h
+io_buffer.$(OBJEXT): {$(VPATH)}vm_opts.h
 iseq.$(OBJEXT): $(CCAN_DIR)/check_type/check_type.h
 iseq.$(OBJEXT): $(CCAN_DIR)/container_of/container_of.h
 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): $(hdrdir)/ruby/version.h
 iseq.$(OBJEXT): $(top_srcdir)/internal/array.h
 iseq.$(OBJEXT): $(top_srcdir)/internal/basic_operators.h
+iseq.$(OBJEXT): $(top_srcdir)/internal/bignum.h
 iseq.$(OBJEXT): $(top_srcdir)/internal/bits.h
 iseq.$(OBJEXT): $(top_srcdir)/internal/class.h
 iseq.$(OBJEXT): $(top_srcdir)/internal/compile.h
 iseq.$(OBJEXT): $(top_srcdir)/internal/compilers.h
+iseq.$(OBJEXT): $(top_srcdir)/internal/complex.h
 iseq.$(OBJEXT): $(top_srcdir)/internal/error.h
 iseq.$(OBJEXT): $(top_srcdir)/internal/file.h
+iseq.$(OBJEXT): $(top_srcdir)/internal/fixnum.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/io.h
+iseq.$(OBJEXT): $(top_srcdir)/internal/namespace.h
+iseq.$(OBJEXT): $(top_srcdir)/internal/numeric.h
 iseq.$(OBJEXT): $(top_srcdir)/internal/parse.h
+iseq.$(OBJEXT): $(top_srcdir)/internal/rational.h
 iseq.$(OBJEXT): $(top_srcdir)/internal/ruby_parser.h
 iseq.$(OBJEXT): $(top_srcdir)/internal/sanitizers.h
 iseq.$(OBJEXT): $(top_srcdir)/internal/serial.h
+iseq.$(OBJEXT): $(top_srcdir)/internal/set_table.h
 iseq.$(OBJEXT): $(top_srcdir)/internal/static_assert.h
 iseq.$(OBJEXT): $(top_srcdir)/internal/string.h
 iseq.$(OBJEXT): $(top_srcdir)/internal/symbol.h
@@ -8229,25 +9183,26 @@ 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): $(top_srcdir)/yarp/defines.h
-iseq.$(OBJEXT): $(top_srcdir)/yarp/diagnostic.h
-iseq.$(OBJEXT): $(top_srcdir)/yarp/enc/yp_encoding.h
-iseq.$(OBJEXT): $(top_srcdir)/yarp/node.h
-iseq.$(OBJEXT): $(top_srcdir)/yarp/pack.h
-iseq.$(OBJEXT): $(top_srcdir)/yarp/parser.h
-iseq.$(OBJEXT): $(top_srcdir)/yarp/regexp.h
-iseq.$(OBJEXT): $(top_srcdir)/yarp/unescape.h
-iseq.$(OBJEXT): $(top_srcdir)/yarp/util/yp_buffer.h
-iseq.$(OBJEXT): $(top_srcdir)/yarp/util/yp_char.h
-iseq.$(OBJEXT): $(top_srcdir)/yarp/util/yp_constant_pool.h
-iseq.$(OBJEXT): $(top_srcdir)/yarp/util/yp_list.h
-iseq.$(OBJEXT): $(top_srcdir)/yarp/util/yp_memchr.h
-iseq.$(OBJEXT): $(top_srcdir)/yarp/util/yp_newline_list.h
-iseq.$(OBJEXT): $(top_srcdir)/yarp/util/yp_state_stack.h
-iseq.$(OBJEXT): $(top_srcdir)/yarp/util/yp_string.h
-iseq.$(OBJEXT): $(top_srcdir)/yarp/util/yp_string_list.h
-iseq.$(OBJEXT): $(top_srcdir)/yarp/util/yp_strpbrk.h
-iseq.$(OBJEXT): $(top_srcdir)/yarp/yarp.h
+iseq.$(OBJEXT): $(top_srcdir)/prism/defines.h
+iseq.$(OBJEXT): $(top_srcdir)/prism/encoding.h
+iseq.$(OBJEXT): $(top_srcdir)/prism/node.h
+iseq.$(OBJEXT): $(top_srcdir)/prism/options.h
+iseq.$(OBJEXT): $(top_srcdir)/prism/pack.h
+iseq.$(OBJEXT): $(top_srcdir)/prism/parser.h
+iseq.$(OBJEXT): $(top_srcdir)/prism/prettyprint.h
+iseq.$(OBJEXT): $(top_srcdir)/prism/prism.h
+iseq.$(OBJEXT): $(top_srcdir)/prism/regexp.h
+iseq.$(OBJEXT): $(top_srcdir)/prism/static_literals.h
+iseq.$(OBJEXT): $(top_srcdir)/prism/util/pm_buffer.h
+iseq.$(OBJEXT): $(top_srcdir)/prism/util/pm_char.h
+iseq.$(OBJEXT): $(top_srcdir)/prism/util/pm_constant_pool.h
+iseq.$(OBJEXT): $(top_srcdir)/prism/util/pm_integer.h
+iseq.$(OBJEXT): $(top_srcdir)/prism/util/pm_list.h
+iseq.$(OBJEXT): $(top_srcdir)/prism/util/pm_memchr.h
+iseq.$(OBJEXT): $(top_srcdir)/prism/util/pm_newline_list.h
+iseq.$(OBJEXT): $(top_srcdir)/prism/util/pm_string.h
+iseq.$(OBJEXT): $(top_srcdir)/prism/util/pm_strncasecmp.h
+iseq.$(OBJEXT): $(top_srcdir)/prism/util/pm_strpbrk.h
 iseq.$(OBJEXT): {$(VPATH)}assert.h
 iseq.$(OBJEXT): {$(VPATH)}atomic.h
 iseq.$(OBJEXT): {$(VPATH)}backward/2/assume.h
@@ -8396,6 +9351,7 @@ iseq.$(OBJEXT): {$(VPATH)}internal/intern/re.h
 iseq.$(OBJEXT): {$(VPATH)}internal/intern/ruby.h
 iseq.$(OBJEXT): {$(VPATH)}internal/intern/select.h
 iseq.$(OBJEXT): {$(VPATH)}internal/intern/select/largesize.h
+iseq.$(OBJEXT): {$(VPATH)}internal/intern/set.h
 iseq.$(OBJEXT): {$(VPATH)}internal/intern/signal.h
 iseq.$(OBJEXT): {$(VPATH)}internal/intern/sprintf.h
 iseq.$(OBJEXT): {$(VPATH)}internal/intern/string.h
@@ -8415,12 +9371,14 @@ iseq.$(OBJEXT): {$(VPATH)}internal/special_consts.h
 iseq.$(OBJEXT): {$(VPATH)}internal/static_assert.h
 iseq.$(OBJEXT): {$(VPATH)}internal/stdalign.h
 iseq.$(OBJEXT): {$(VPATH)}internal/stdbool.h
+iseq.$(OBJEXT): {$(VPATH)}internal/stdckdint.h
 iseq.$(OBJEXT): {$(VPATH)}internal/symbol.h
 iseq.$(OBJEXT): {$(VPATH)}internal/value.h
 iseq.$(OBJEXT): {$(VPATH)}internal/value_type.h
 iseq.$(OBJEXT): {$(VPATH)}internal/variable.h
 iseq.$(OBJEXT): {$(VPATH)}internal/warning_push.h
 iseq.$(OBJEXT): {$(VPATH)}internal/xmalloc.h
+iseq.$(OBJEXT): {$(VPATH)}io.h
 iseq.$(OBJEXT): {$(VPATH)}iseq.c
 iseq.$(OBJEXT): {$(VPATH)}iseq.h
 iseq.$(OBJEXT): {$(VPATH)}method.h
@@ -8428,8 +9386,12 @@ iseq.$(OBJEXT): {$(VPATH)}missing.h
 iseq.$(OBJEXT): {$(VPATH)}node.h
 iseq.$(OBJEXT): {$(VPATH)}onigmo.h
 iseq.$(OBJEXT): {$(VPATH)}oniguruma.h
+iseq.$(OBJEXT): {$(VPATH)}prism/ast.h
+iseq.$(OBJEXT): {$(VPATH)}prism/diagnostic.h
+iseq.$(OBJEXT): {$(VPATH)}prism/prism.h
+iseq.$(OBJEXT): {$(VPATH)}prism/version.h
+iseq.$(OBJEXT): {$(VPATH)}prism_compile.h
 iseq.$(OBJEXT): {$(VPATH)}ractor.h
-iseq.$(OBJEXT): {$(VPATH)}rjit.h
 iseq.$(OBJEXT): {$(VPATH)}ruby_assert.h
 iseq.$(OBJEXT): {$(VPATH)}ruby_atomic.h
 iseq.$(OBJEXT): {$(VPATH)}rubyparser.h
@@ -8441,35 +9403,303 @@ 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_debug.h
 iseq.$(OBJEXT): {$(VPATH)}vm_opts.h
-iseq.$(OBJEXT): {$(VPATH)}yarp/ast.h
-iseq.$(OBJEXT): {$(VPATH)}yarp/version.h
-iseq.$(OBJEXT): {$(VPATH)}yarp/yarp.h
+iseq.$(OBJEXT): {$(VPATH)}vm_sync.h
 iseq.$(OBJEXT): {$(VPATH)}yjit.h
+iseq.$(OBJEXT): {$(VPATH)}zjit.h
+jit.$(OBJEXT): $(CCAN_DIR)/check_type/check_type.h
+jit.$(OBJEXT): $(CCAN_DIR)/container_of/container_of.h
+jit.$(OBJEXT): $(CCAN_DIR)/list/list.h
+jit.$(OBJEXT): $(CCAN_DIR)/str/str.h
+jit.$(OBJEXT): $(hdrdir)/ruby/ruby.h
+jit.$(OBJEXT): $(top_srcdir)/internal/array.h
+jit.$(OBJEXT): $(top_srcdir)/internal/basic_operators.h
+jit.$(OBJEXT): $(top_srcdir)/internal/class.h
+jit.$(OBJEXT): $(top_srcdir)/internal/compilers.h
+jit.$(OBJEXT): $(top_srcdir)/internal/gc.h
+jit.$(OBJEXT): $(top_srcdir)/internal/imemo.h
+jit.$(OBJEXT): $(top_srcdir)/internal/namespace.h
+jit.$(OBJEXT): $(top_srcdir)/internal/sanitizers.h
+jit.$(OBJEXT): $(top_srcdir)/internal/serial.h
+jit.$(OBJEXT): $(top_srcdir)/internal/set_table.h
+jit.$(OBJEXT): $(top_srcdir)/internal/static_assert.h
+jit.$(OBJEXT): $(top_srcdir)/internal/variable.h
+jit.$(OBJEXT): $(top_srcdir)/internal/vm.h
+jit.$(OBJEXT): $(top_srcdir)/internal/warnings.h
+jit.$(OBJEXT): $(top_srcdir)/prism/defines.h
+jit.$(OBJEXT): $(top_srcdir)/prism/encoding.h
+jit.$(OBJEXT): $(top_srcdir)/prism/node.h
+jit.$(OBJEXT): $(top_srcdir)/prism/options.h
+jit.$(OBJEXT): $(top_srcdir)/prism/pack.h
+jit.$(OBJEXT): $(top_srcdir)/prism/parser.h
+jit.$(OBJEXT): $(top_srcdir)/prism/prettyprint.h
+jit.$(OBJEXT): $(top_srcdir)/prism/prism.h
+jit.$(OBJEXT): $(top_srcdir)/prism/regexp.h
+jit.$(OBJEXT): $(top_srcdir)/prism/static_literals.h
+jit.$(OBJEXT): $(top_srcdir)/prism/util/pm_buffer.h
+jit.$(OBJEXT): $(top_srcdir)/prism/util/pm_char.h
+jit.$(OBJEXT): $(top_srcdir)/prism/util/pm_constant_pool.h
+jit.$(OBJEXT): $(top_srcdir)/prism/util/pm_integer.h
+jit.$(OBJEXT): $(top_srcdir)/prism/util/pm_list.h
+jit.$(OBJEXT): $(top_srcdir)/prism/util/pm_memchr.h
+jit.$(OBJEXT): $(top_srcdir)/prism/util/pm_newline_list.h
+jit.$(OBJEXT): $(top_srcdir)/prism/util/pm_string.h
+jit.$(OBJEXT): $(top_srcdir)/prism/util/pm_strncasecmp.h
+jit.$(OBJEXT): $(top_srcdir)/prism/util/pm_strpbrk.h
+jit.$(OBJEXT): {$(VPATH)}assert.h
+jit.$(OBJEXT): {$(VPATH)}atomic.h
+jit.$(OBJEXT): {$(VPATH)}backward/2/assume.h
+jit.$(OBJEXT): {$(VPATH)}backward/2/attributes.h
+jit.$(OBJEXT): {$(VPATH)}backward/2/bool.h
+jit.$(OBJEXT): {$(VPATH)}backward/2/gcc_version_since.h
+jit.$(OBJEXT): {$(VPATH)}backward/2/inttypes.h
+jit.$(OBJEXT): {$(VPATH)}backward/2/limits.h
+jit.$(OBJEXT): {$(VPATH)}backward/2/long_long.h
+jit.$(OBJEXT): {$(VPATH)}backward/2/stdalign.h
+jit.$(OBJEXT): {$(VPATH)}backward/2/stdarg.h
+jit.$(OBJEXT): {$(VPATH)}builtin.h
+jit.$(OBJEXT): {$(VPATH)}config.h
+jit.$(OBJEXT): {$(VPATH)}constant.h
+jit.$(OBJEXT): {$(VPATH)}debug_counter.h
+jit.$(OBJEXT): {$(VPATH)}defines.h
+jit.$(OBJEXT): {$(VPATH)}encoding.h
+jit.$(OBJEXT): {$(VPATH)}id.h
+jit.$(OBJEXT): {$(VPATH)}id_table.h
+jit.$(OBJEXT): {$(VPATH)}insns.def
+jit.$(OBJEXT): {$(VPATH)}insns.inc
+jit.$(OBJEXT): {$(VPATH)}insns_info.inc
+jit.$(OBJEXT): {$(VPATH)}intern.h
+jit.$(OBJEXT): {$(VPATH)}internal.h
+jit.$(OBJEXT): {$(VPATH)}internal/abi.h
+jit.$(OBJEXT): {$(VPATH)}internal/anyargs.h
+jit.$(OBJEXT): {$(VPATH)}internal/arithmetic.h
+jit.$(OBJEXT): {$(VPATH)}internal/arithmetic/char.h
+jit.$(OBJEXT): {$(VPATH)}internal/arithmetic/double.h
+jit.$(OBJEXT): {$(VPATH)}internal/arithmetic/fixnum.h
+jit.$(OBJEXT): {$(VPATH)}internal/arithmetic/gid_t.h
+jit.$(OBJEXT): {$(VPATH)}internal/arithmetic/int.h
+jit.$(OBJEXT): {$(VPATH)}internal/arithmetic/intptr_t.h
+jit.$(OBJEXT): {$(VPATH)}internal/arithmetic/long.h
+jit.$(OBJEXT): {$(VPATH)}internal/arithmetic/long_long.h
+jit.$(OBJEXT): {$(VPATH)}internal/arithmetic/mode_t.h
+jit.$(OBJEXT): {$(VPATH)}internal/arithmetic/off_t.h
+jit.$(OBJEXT): {$(VPATH)}internal/arithmetic/pid_t.h
+jit.$(OBJEXT): {$(VPATH)}internal/arithmetic/short.h
+jit.$(OBJEXT): {$(VPATH)}internal/arithmetic/size_t.h
+jit.$(OBJEXT): {$(VPATH)}internal/arithmetic/st_data_t.h
+jit.$(OBJEXT): {$(VPATH)}internal/arithmetic/uid_t.h
+jit.$(OBJEXT): {$(VPATH)}internal/assume.h
+jit.$(OBJEXT): {$(VPATH)}internal/attr/alloc_size.h
+jit.$(OBJEXT): {$(VPATH)}internal/attr/artificial.h
+jit.$(OBJEXT): {$(VPATH)}internal/attr/cold.h
+jit.$(OBJEXT): {$(VPATH)}internal/attr/const.h
+jit.$(OBJEXT): {$(VPATH)}internal/attr/constexpr.h
+jit.$(OBJEXT): {$(VPATH)}internal/attr/deprecated.h
+jit.$(OBJEXT): {$(VPATH)}internal/attr/diagnose_if.h
+jit.$(OBJEXT): {$(VPATH)}internal/attr/enum_extensibility.h
+jit.$(OBJEXT): {$(VPATH)}internal/attr/error.h
+jit.$(OBJEXT): {$(VPATH)}internal/attr/flag_enum.h
+jit.$(OBJEXT): {$(VPATH)}internal/attr/forceinline.h
+jit.$(OBJEXT): {$(VPATH)}internal/attr/format.h
+jit.$(OBJEXT): {$(VPATH)}internal/attr/maybe_unused.h
+jit.$(OBJEXT): {$(VPATH)}internal/attr/noalias.h
+jit.$(OBJEXT): {$(VPATH)}internal/attr/nodiscard.h
+jit.$(OBJEXT): {$(VPATH)}internal/attr/noexcept.h
+jit.$(OBJEXT): {$(VPATH)}internal/attr/noinline.h
+jit.$(OBJEXT): {$(VPATH)}internal/attr/nonnull.h
+jit.$(OBJEXT): {$(VPATH)}internal/attr/noreturn.h
+jit.$(OBJEXT): {$(VPATH)}internal/attr/packed_struct.h
+jit.$(OBJEXT): {$(VPATH)}internal/attr/pure.h
+jit.$(OBJEXT): {$(VPATH)}internal/attr/restrict.h
+jit.$(OBJEXT): {$(VPATH)}internal/attr/returns_nonnull.h
+jit.$(OBJEXT): {$(VPATH)}internal/attr/warning.h
+jit.$(OBJEXT): {$(VPATH)}internal/attr/weakref.h
+jit.$(OBJEXT): {$(VPATH)}internal/cast.h
+jit.$(OBJEXT): {$(VPATH)}internal/compiler_is.h
+jit.$(OBJEXT): {$(VPATH)}internal/compiler_is/apple.h
+jit.$(OBJEXT): {$(VPATH)}internal/compiler_is/clang.h
+jit.$(OBJEXT): {$(VPATH)}internal/compiler_is/gcc.h
+jit.$(OBJEXT): {$(VPATH)}internal/compiler_is/intel.h
+jit.$(OBJEXT): {$(VPATH)}internal/compiler_is/msvc.h
+jit.$(OBJEXT): {$(VPATH)}internal/compiler_is/sunpro.h
+jit.$(OBJEXT): {$(VPATH)}internal/compiler_since.h
+jit.$(OBJEXT): {$(VPATH)}internal/config.h
+jit.$(OBJEXT): {$(VPATH)}internal/constant_p.h
+jit.$(OBJEXT): {$(VPATH)}internal/core.h
+jit.$(OBJEXT): {$(VPATH)}internal/core/rarray.h
+jit.$(OBJEXT): {$(VPATH)}internal/core/rbasic.h
+jit.$(OBJEXT): {$(VPATH)}internal/core/rbignum.h
+jit.$(OBJEXT): {$(VPATH)}internal/core/rclass.h
+jit.$(OBJEXT): {$(VPATH)}internal/core/rdata.h
+jit.$(OBJEXT): {$(VPATH)}internal/core/rfile.h
+jit.$(OBJEXT): {$(VPATH)}internal/core/rhash.h
+jit.$(OBJEXT): {$(VPATH)}internal/core/robject.h
+jit.$(OBJEXT): {$(VPATH)}internal/core/rregexp.h
+jit.$(OBJEXT): {$(VPATH)}internal/core/rstring.h
+jit.$(OBJEXT): {$(VPATH)}internal/core/rstruct.h
+jit.$(OBJEXT): {$(VPATH)}internal/core/rtypeddata.h
+jit.$(OBJEXT): {$(VPATH)}internal/ctype.h
+jit.$(OBJEXT): {$(VPATH)}internal/dllexport.h
+jit.$(OBJEXT): {$(VPATH)}internal/dosish.h
+jit.$(OBJEXT): {$(VPATH)}internal/encoding/coderange.h
+jit.$(OBJEXT): {$(VPATH)}internal/encoding/ctype.h
+jit.$(OBJEXT): {$(VPATH)}internal/encoding/encoding.h
+jit.$(OBJEXT): {$(VPATH)}internal/encoding/pathname.h
+jit.$(OBJEXT): {$(VPATH)}internal/encoding/re.h
+jit.$(OBJEXT): {$(VPATH)}internal/encoding/sprintf.h
+jit.$(OBJEXT): {$(VPATH)}internal/encoding/string.h
+jit.$(OBJEXT): {$(VPATH)}internal/encoding/symbol.h
+jit.$(OBJEXT): {$(VPATH)}internal/encoding/transcode.h
+jit.$(OBJEXT): {$(VPATH)}internal/error.h
+jit.$(OBJEXT): {$(VPATH)}internal/eval.h
+jit.$(OBJEXT): {$(VPATH)}internal/event.h
+jit.$(OBJEXT): {$(VPATH)}internal/fl_type.h
+jit.$(OBJEXT): {$(VPATH)}internal/gc.h
+jit.$(OBJEXT): {$(VPATH)}internal/glob.h
+jit.$(OBJEXT): {$(VPATH)}internal/globals.h
+jit.$(OBJEXT): {$(VPATH)}internal/has/attribute.h
+jit.$(OBJEXT): {$(VPATH)}internal/has/builtin.h
+jit.$(OBJEXT): {$(VPATH)}internal/has/c_attribute.h
+jit.$(OBJEXT): {$(VPATH)}internal/has/cpp_attribute.h
+jit.$(OBJEXT): {$(VPATH)}internal/has/declspec_attribute.h
+jit.$(OBJEXT): {$(VPATH)}internal/has/extension.h
+jit.$(OBJEXT): {$(VPATH)}internal/has/feature.h
+jit.$(OBJEXT): {$(VPATH)}internal/has/warning.h
+jit.$(OBJEXT): {$(VPATH)}internal/intern/array.h
+jit.$(OBJEXT): {$(VPATH)}internal/intern/bignum.h
+jit.$(OBJEXT): {$(VPATH)}internal/intern/class.h
+jit.$(OBJEXT): {$(VPATH)}internal/intern/compar.h
+jit.$(OBJEXT): {$(VPATH)}internal/intern/complex.h
+jit.$(OBJEXT): {$(VPATH)}internal/intern/cont.h
+jit.$(OBJEXT): {$(VPATH)}internal/intern/dir.h
+jit.$(OBJEXT): {$(VPATH)}internal/intern/enum.h
+jit.$(OBJEXT): {$(VPATH)}internal/intern/enumerator.h
+jit.$(OBJEXT): {$(VPATH)}internal/intern/error.h
+jit.$(OBJEXT): {$(VPATH)}internal/intern/eval.h
+jit.$(OBJEXT): {$(VPATH)}internal/intern/file.h
+jit.$(OBJEXT): {$(VPATH)}internal/intern/hash.h
+jit.$(OBJEXT): {$(VPATH)}internal/intern/io.h
+jit.$(OBJEXT): {$(VPATH)}internal/intern/load.h
+jit.$(OBJEXT): {$(VPATH)}internal/intern/marshal.h
+jit.$(OBJEXT): {$(VPATH)}internal/intern/numeric.h
+jit.$(OBJEXT): {$(VPATH)}internal/intern/object.h
+jit.$(OBJEXT): {$(VPATH)}internal/intern/parse.h
+jit.$(OBJEXT): {$(VPATH)}internal/intern/proc.h
+jit.$(OBJEXT): {$(VPATH)}internal/intern/process.h
+jit.$(OBJEXT): {$(VPATH)}internal/intern/random.h
+jit.$(OBJEXT): {$(VPATH)}internal/intern/range.h
+jit.$(OBJEXT): {$(VPATH)}internal/intern/rational.h
+jit.$(OBJEXT): {$(VPATH)}internal/intern/re.h
+jit.$(OBJEXT): {$(VPATH)}internal/intern/ruby.h
+jit.$(OBJEXT): {$(VPATH)}internal/intern/select.h
+jit.$(OBJEXT): {$(VPATH)}internal/intern/select/largesize.h
+jit.$(OBJEXT): {$(VPATH)}internal/intern/set.h
+jit.$(OBJEXT): {$(VPATH)}internal/intern/signal.h
+jit.$(OBJEXT): {$(VPATH)}internal/intern/sprintf.h
+jit.$(OBJEXT): {$(VPATH)}internal/intern/string.h
+jit.$(OBJEXT): {$(VPATH)}internal/intern/struct.h
+jit.$(OBJEXT): {$(VPATH)}internal/intern/thread.h
+jit.$(OBJEXT): {$(VPATH)}internal/intern/time.h
+jit.$(OBJEXT): {$(VPATH)}internal/intern/variable.h
+jit.$(OBJEXT): {$(VPATH)}internal/intern/vm.h
+jit.$(OBJEXT): {$(VPATH)}internal/interpreter.h
+jit.$(OBJEXT): {$(VPATH)}internal/iterator.h
+jit.$(OBJEXT): {$(VPATH)}internal/memory.h
+jit.$(OBJEXT): {$(VPATH)}internal/method.h
+jit.$(OBJEXT): {$(VPATH)}internal/module.h
+jit.$(OBJEXT): {$(VPATH)}internal/newobj.h
+jit.$(OBJEXT): {$(VPATH)}internal/scan_args.h
+jit.$(OBJEXT): {$(VPATH)}internal/special_consts.h
+jit.$(OBJEXT): {$(VPATH)}internal/static_assert.h
+jit.$(OBJEXT): {$(VPATH)}internal/stdalign.h
+jit.$(OBJEXT): {$(VPATH)}internal/stdbool.h
+jit.$(OBJEXT): {$(VPATH)}internal/stdckdint.h
+jit.$(OBJEXT): {$(VPATH)}internal/symbol.h
+jit.$(OBJEXT): {$(VPATH)}internal/value.h
+jit.$(OBJEXT): {$(VPATH)}internal/value_type.h
+jit.$(OBJEXT): {$(VPATH)}internal/variable.h
+jit.$(OBJEXT): {$(VPATH)}internal/warning_push.h
+jit.$(OBJEXT): {$(VPATH)}internal/xmalloc.h
+jit.$(OBJEXT): {$(VPATH)}iseq.h
+jit.$(OBJEXT): {$(VPATH)}jit.c
+jit.$(OBJEXT): {$(VPATH)}method.h
+jit.$(OBJEXT): {$(VPATH)}missing.h
+jit.$(OBJEXT): {$(VPATH)}node.h
+jit.$(OBJEXT): {$(VPATH)}onigmo.h
+jit.$(OBJEXT): {$(VPATH)}oniguruma.h
+jit.$(OBJEXT): {$(VPATH)}prism/ast.h
+jit.$(OBJEXT): {$(VPATH)}prism/diagnostic.h
+jit.$(OBJEXT): {$(VPATH)}prism/version.h
+jit.$(OBJEXT): {$(VPATH)}prism_compile.h
+jit.$(OBJEXT): {$(VPATH)}ruby_assert.h
+jit.$(OBJEXT): {$(VPATH)}ruby_atomic.h
+jit.$(OBJEXT): {$(VPATH)}rubyparser.h
+jit.$(OBJEXT): {$(VPATH)}shape.h
+jit.$(OBJEXT): {$(VPATH)}st.h
+jit.$(OBJEXT): {$(VPATH)}subst.h
+jit.$(OBJEXT): {$(VPATH)}thread_$(THREAD_MODEL).h
+jit.$(OBJEXT): {$(VPATH)}thread_native.h
+jit.$(OBJEXT): {$(VPATH)}vm_callinfo.h
+jit.$(OBJEXT): {$(VPATH)}vm_core.h
+jit.$(OBJEXT): {$(VPATH)}vm_debug.h
+jit.$(OBJEXT): {$(VPATH)}vm_opts.h
+jit.$(OBJEXT): {$(VPATH)}vm_sync.h
 load.$(OBJEXT): $(CCAN_DIR)/check_type/check_type.h
 load.$(OBJEXT): $(CCAN_DIR)/container_of/container_of.h
 load.$(OBJEXT): $(CCAN_DIR)/list/list.h
 load.$(OBJEXT): $(CCAN_DIR)/str/str.h
 load.$(OBJEXT): $(hdrdir)/ruby/ruby.h
+load.$(OBJEXT): $(hdrdir)/ruby/version.h
 load.$(OBJEXT): $(top_srcdir)/internal/array.h
 load.$(OBJEXT): $(top_srcdir)/internal/basic_operators.h
+load.$(OBJEXT): $(top_srcdir)/internal/bignum.h
 load.$(OBJEXT): $(top_srcdir)/internal/bits.h
 load.$(OBJEXT): $(top_srcdir)/internal/compilers.h
+load.$(OBJEXT): $(top_srcdir)/internal/complex.h
 load.$(OBJEXT): $(top_srcdir)/internal/dir.h
 load.$(OBJEXT): $(top_srcdir)/internal/error.h
+load.$(OBJEXT): $(top_srcdir)/internal/eval.h
 load.$(OBJEXT): $(top_srcdir)/internal/file.h
+load.$(OBJEXT): $(top_srcdir)/internal/fixnum.h
 load.$(OBJEXT): $(top_srcdir)/internal/gc.h
+load.$(OBJEXT): $(top_srcdir)/internal/hash.h
 load.$(OBJEXT): $(top_srcdir)/internal/imemo.h
 load.$(OBJEXT): $(top_srcdir)/internal/load.h
+load.$(OBJEXT): $(top_srcdir)/internal/namespace.h
+load.$(OBJEXT): $(top_srcdir)/internal/numeric.h
 load.$(OBJEXT): $(top_srcdir)/internal/parse.h
+load.$(OBJEXT): $(top_srcdir)/internal/rational.h
 load.$(OBJEXT): $(top_srcdir)/internal/ruby_parser.h
+load.$(OBJEXT): $(top_srcdir)/internal/sanitizers.h
 load.$(OBJEXT): $(top_srcdir)/internal/serial.h
+load.$(OBJEXT): $(top_srcdir)/internal/set_table.h
 load.$(OBJEXT): $(top_srcdir)/internal/static_assert.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): $(top_srcdir)/internal/warnings.h
+load.$(OBJEXT): $(top_srcdir)/prism/defines.h
+load.$(OBJEXT): $(top_srcdir)/prism/encoding.h
+load.$(OBJEXT): $(top_srcdir)/prism/node.h
+load.$(OBJEXT): $(top_srcdir)/prism/options.h
+load.$(OBJEXT): $(top_srcdir)/prism/pack.h
+load.$(OBJEXT): $(top_srcdir)/prism/parser.h
+load.$(OBJEXT): $(top_srcdir)/prism/prettyprint.h
+load.$(OBJEXT): $(top_srcdir)/prism/prism.h
+load.$(OBJEXT): $(top_srcdir)/prism/regexp.h
+load.$(OBJEXT): $(top_srcdir)/prism/static_literals.h
+load.$(OBJEXT): $(top_srcdir)/prism/util/pm_buffer.h
+load.$(OBJEXT): $(top_srcdir)/prism/util/pm_char.h
+load.$(OBJEXT): $(top_srcdir)/prism/util/pm_constant_pool.h
+load.$(OBJEXT): $(top_srcdir)/prism/util/pm_integer.h
+load.$(OBJEXT): $(top_srcdir)/prism/util/pm_list.h
+load.$(OBJEXT): $(top_srcdir)/prism/util/pm_memchr.h
+load.$(OBJEXT): $(top_srcdir)/prism/util/pm_newline_list.h
+load.$(OBJEXT): $(top_srcdir)/prism/util/pm_string.h
+load.$(OBJEXT): $(top_srcdir)/prism/util/pm_strncasecmp.h
+load.$(OBJEXT): $(top_srcdir)/prism/util/pm_strpbrk.h
 load.$(OBJEXT): {$(VPATH)}assert.h
 load.$(OBJEXT): {$(VPATH)}atomic.h
 load.$(OBJEXT): {$(VPATH)}backward/2/assume.h
@@ -8615,6 +9845,7 @@ load.$(OBJEXT): {$(VPATH)}internal/intern/re.h
 load.$(OBJEXT): {$(VPATH)}internal/intern/ruby.h
 load.$(OBJEXT): {$(VPATH)}internal/intern/select.h
 load.$(OBJEXT): {$(VPATH)}internal/intern/select/largesize.h
+load.$(OBJEXT): {$(VPATH)}internal/intern/set.h
 load.$(OBJEXT): {$(VPATH)}internal/intern/signal.h
 load.$(OBJEXT): {$(VPATH)}internal/intern/sprintf.h
 load.$(OBJEXT): {$(VPATH)}internal/intern/string.h
@@ -8634,6 +9865,7 @@ load.$(OBJEXT): {$(VPATH)}internal/special_consts.h
 load.$(OBJEXT): {$(VPATH)}internal/static_assert.h
 load.$(OBJEXT): {$(VPATH)}internal/stdalign.h
 load.$(OBJEXT): {$(VPATH)}internal/stdbool.h
+load.$(OBJEXT): {$(VPATH)}internal/stdckdint.h
 load.$(OBJEXT): {$(VPATH)}internal/symbol.h
 load.$(OBJEXT): {$(VPATH)}internal/value.h
 load.$(OBJEXT): {$(VPATH)}internal/value_type.h
@@ -8647,8 +9879,14 @@ load.$(OBJEXT): {$(VPATH)}missing.h
 load.$(OBJEXT): {$(VPATH)}node.h
 load.$(OBJEXT): {$(VPATH)}onigmo.h
 load.$(OBJEXT): {$(VPATH)}oniguruma.h
+load.$(OBJEXT): {$(VPATH)}prism/ast.h
+load.$(OBJEXT): {$(VPATH)}prism/diagnostic.h
+load.$(OBJEXT): {$(VPATH)}prism/version.h
+load.$(OBJEXT): {$(VPATH)}prism_compile.h
 load.$(OBJEXT): {$(VPATH)}probes.dmyh
 load.$(OBJEXT): {$(VPATH)}probes.h
+load.$(OBJEXT): {$(VPATH)}ractor.h
+load.$(OBJEXT): {$(VPATH)}ractor_core.h
 load.$(OBJEXT): {$(VPATH)}ruby_assert.h
 load.$(OBJEXT): {$(VPATH)}ruby_atomic.h
 load.$(OBJEXT): {$(VPATH)}rubyparser.h
@@ -8659,6 +9897,7 @@ load.$(OBJEXT): {$(VPATH)}thread_$(THREAD_MODEL).h
 load.$(OBJEXT): {$(VPATH)}thread_native.h
 load.$(OBJEXT): {$(VPATH)}util.h
 load.$(OBJEXT): {$(VPATH)}vm_core.h
+load.$(OBJEXT): {$(VPATH)}vm_debug.h
 load.$(OBJEXT): {$(VPATH)}vm_opts.h
 loadpath.$(OBJEXT): $(hdrdir)/ruby/ruby.h
 loadpath.$(OBJEXT): $(hdrdir)/ruby/version.h
@@ -8789,6 +10028,7 @@ loadpath.$(OBJEXT): {$(VPATH)}internal/intern/re.h
 loadpath.$(OBJEXT): {$(VPATH)}internal/intern/ruby.h
 loadpath.$(OBJEXT): {$(VPATH)}internal/intern/select.h
 loadpath.$(OBJEXT): {$(VPATH)}internal/intern/select/largesize.h
+loadpath.$(OBJEXT): {$(VPATH)}internal/intern/set.h
 loadpath.$(OBJEXT): {$(VPATH)}internal/intern/signal.h
 loadpath.$(OBJEXT): {$(VPATH)}internal/intern/sprintf.h
 loadpath.$(OBJEXT): {$(VPATH)}internal/intern/string.h
@@ -8808,6 +10048,7 @@ loadpath.$(OBJEXT): {$(VPATH)}internal/special_consts.h
 loadpath.$(OBJEXT): {$(VPATH)}internal/static_assert.h
 loadpath.$(OBJEXT): {$(VPATH)}internal/stdalign.h
 loadpath.$(OBJEXT): {$(VPATH)}internal/stdbool.h
+loadpath.$(OBJEXT): {$(VPATH)}internal/stdckdint.h
 loadpath.$(OBJEXT): {$(VPATH)}internal/symbol.h
 loadpath.$(OBJEXT): {$(VPATH)}internal/value.h
 loadpath.$(OBJEXT): {$(VPATH)}internal/value_type.h
@@ -8958,6 +10199,7 @@ localeinit.$(OBJEXT): {$(VPATH)}internal/intern/re.h
 localeinit.$(OBJEXT): {$(VPATH)}internal/intern/ruby.h
 localeinit.$(OBJEXT): {$(VPATH)}internal/intern/select.h
 localeinit.$(OBJEXT): {$(VPATH)}internal/intern/select/largesize.h
+localeinit.$(OBJEXT): {$(VPATH)}internal/intern/set.h
 localeinit.$(OBJEXT): {$(VPATH)}internal/intern/signal.h
 localeinit.$(OBJEXT): {$(VPATH)}internal/intern/sprintf.h
 localeinit.$(OBJEXT): {$(VPATH)}internal/intern/string.h
@@ -8977,6 +10219,7 @@ localeinit.$(OBJEXT): {$(VPATH)}internal/special_consts.h
 localeinit.$(OBJEXT): {$(VPATH)}internal/static_assert.h
 localeinit.$(OBJEXT): {$(VPATH)}internal/stdalign.h
 localeinit.$(OBJEXT): {$(VPATH)}internal/stdbool.h
+localeinit.$(OBJEXT): {$(VPATH)}internal/stdckdint.h
 localeinit.$(OBJEXT): {$(VPATH)}internal/symbol.h
 localeinit.$(OBJEXT): {$(VPATH)}internal/value.h
 localeinit.$(OBJEXT): {$(VPATH)}internal/value_type.h
@@ -8991,11 +10234,15 @@ localeinit.$(OBJEXT): {$(VPATH)}st.h
 localeinit.$(OBJEXT): {$(VPATH)}subst.h
 main.$(OBJEXT): $(hdrdir)/ruby.h
 main.$(OBJEXT): $(hdrdir)/ruby/ruby.h
+main.$(OBJEXT): $(top_srcdir)/internal/compilers.h
+main.$(OBJEXT): $(top_srcdir)/internal/sanitizers.h
+main.$(OBJEXT): $(top_srcdir)/internal/warnings.h
 main.$(OBJEXT): {$(VPATH)}assert.h
 main.$(OBJEXT): {$(VPATH)}backward.h
 main.$(OBJEXT): {$(VPATH)}backward/2/assume.h
 main.$(OBJEXT): {$(VPATH)}backward/2/attributes.h
 main.$(OBJEXT): {$(VPATH)}backward/2/bool.h
+main.$(OBJEXT): {$(VPATH)}backward/2/gcc_version_since.h
 main.$(OBJEXT): {$(VPATH)}backward/2/inttypes.h
 main.$(OBJEXT): {$(VPATH)}backward/2/limits.h
 main.$(OBJEXT): {$(VPATH)}backward/2/long_long.h
@@ -9118,6 +10365,7 @@ main.$(OBJEXT): {$(VPATH)}internal/intern/re.h
 main.$(OBJEXT): {$(VPATH)}internal/intern/ruby.h
 main.$(OBJEXT): {$(VPATH)}internal/intern/select.h
 main.$(OBJEXT): {$(VPATH)}internal/intern/select/largesize.h
+main.$(OBJEXT): {$(VPATH)}internal/intern/set.h
 main.$(OBJEXT): {$(VPATH)}internal/intern/signal.h
 main.$(OBJEXT): {$(VPATH)}internal/intern/sprintf.h
 main.$(OBJEXT): {$(VPATH)}internal/intern/string.h
@@ -9137,6 +10385,7 @@ main.$(OBJEXT): {$(VPATH)}internal/special_consts.h
 main.$(OBJEXT): {$(VPATH)}internal/static_assert.h
 main.$(OBJEXT): {$(VPATH)}internal/stdalign.h
 main.$(OBJEXT): {$(VPATH)}internal/stdbool.h
+main.$(OBJEXT): {$(VPATH)}internal/stdckdint.h
 main.$(OBJEXT): {$(VPATH)}internal/symbol.h
 main.$(OBJEXT): {$(VPATH)}internal/value.h
 main.$(OBJEXT): {$(VPATH)}internal/value_type.h
@@ -9153,6 +10402,7 @@ marshal.$(OBJEXT): $(CCAN_DIR)/container_of/container_of.h
 marshal.$(OBJEXT): $(CCAN_DIR)/list/list.h
 marshal.$(OBJEXT): $(CCAN_DIR)/str/str.h
 marshal.$(OBJEXT): $(hdrdir)/ruby/ruby.h
+marshal.$(OBJEXT): $(hdrdir)/ruby/version.h
 marshal.$(OBJEXT): $(top_srcdir)/internal/array.h
 marshal.$(OBJEXT): $(top_srcdir)/internal/basic_operators.h
 marshal.$(OBJEXT): $(top_srcdir)/internal/bignum.h
@@ -9165,9 +10415,12 @@ marshal.$(OBJEXT): $(top_srcdir)/internal/fixnum.h
 marshal.$(OBJEXT): $(top_srcdir)/internal/gc.h
 marshal.$(OBJEXT): $(top_srcdir)/internal/hash.h
 marshal.$(OBJEXT): $(top_srcdir)/internal/imemo.h
+marshal.$(OBJEXT): $(top_srcdir)/internal/namespace.h
 marshal.$(OBJEXT): $(top_srcdir)/internal/numeric.h
 marshal.$(OBJEXT): $(top_srcdir)/internal/object.h
+marshal.$(OBJEXT): $(top_srcdir)/internal/sanitizers.h
 marshal.$(OBJEXT): $(top_srcdir)/internal/serial.h
+marshal.$(OBJEXT): $(top_srcdir)/internal/set_table.h
 marshal.$(OBJEXT): $(top_srcdir)/internal/static_assert.h
 marshal.$(OBJEXT): $(top_srcdir)/internal/string.h
 marshal.$(OBJEXT): $(top_srcdir)/internal/struct.h
@@ -9190,6 +10443,7 @@ marshal.$(OBJEXT): {$(VPATH)}backward/2/stdarg.h
 marshal.$(OBJEXT): {$(VPATH)}builtin.h
 marshal.$(OBJEXT): {$(VPATH)}config.h
 marshal.$(OBJEXT): {$(VPATH)}constant.h
+marshal.$(OBJEXT): {$(VPATH)}debug_counter.h
 marshal.$(OBJEXT): {$(VPATH)}defines.h
 marshal.$(OBJEXT): {$(VPATH)}encindex.h
 marshal.$(OBJEXT): {$(VPATH)}encoding.h
@@ -9234,6 +10488,7 @@ marshal.$(OBJEXT): {$(VPATH)}internal/attr/nodiscard.h
 marshal.$(OBJEXT): {$(VPATH)}internal/attr/noexcept.h
 marshal.$(OBJEXT): {$(VPATH)}internal/attr/noinline.h
 marshal.$(OBJEXT): {$(VPATH)}internal/attr/nonnull.h
+marshal.$(OBJEXT): {$(VPATH)}internal/attr/nonstring.h
 marshal.$(OBJEXT): {$(VPATH)}internal/attr/noreturn.h
 marshal.$(OBJEXT): {$(VPATH)}internal/attr/packed_struct.h
 marshal.$(OBJEXT): {$(VPATH)}internal/attr/pure.h
@@ -9320,6 +10575,7 @@ marshal.$(OBJEXT): {$(VPATH)}internal/intern/re.h
 marshal.$(OBJEXT): {$(VPATH)}internal/intern/ruby.h
 marshal.$(OBJEXT): {$(VPATH)}internal/intern/select.h
 marshal.$(OBJEXT): {$(VPATH)}internal/intern/select/largesize.h
+marshal.$(OBJEXT): {$(VPATH)}internal/intern/set.h
 marshal.$(OBJEXT): {$(VPATH)}internal/intern/signal.h
 marshal.$(OBJEXT): {$(VPATH)}internal/intern/sprintf.h
 marshal.$(OBJEXT): {$(VPATH)}internal/intern/string.h
@@ -9339,6 +10595,7 @@ marshal.$(OBJEXT): {$(VPATH)}internal/special_consts.h
 marshal.$(OBJEXT): {$(VPATH)}internal/static_assert.h
 marshal.$(OBJEXT): {$(VPATH)}internal/stdalign.h
 marshal.$(OBJEXT): {$(VPATH)}internal/stdbool.h
+marshal.$(OBJEXT): {$(VPATH)}internal/stdckdint.h
 marshal.$(OBJEXT): {$(VPATH)}internal/symbol.h
 marshal.$(OBJEXT): {$(VPATH)}internal/value.h
 marshal.$(OBJEXT): {$(VPATH)}internal/value_type.h
@@ -9363,7 +10620,9 @@ marshal.$(OBJEXT): {$(VPATH)}thread_$(THREAD_MODEL).h
 marshal.$(OBJEXT): {$(VPATH)}thread_native.h
 marshal.$(OBJEXT): {$(VPATH)}util.h
 marshal.$(OBJEXT): {$(VPATH)}vm_core.h
+marshal.$(OBJEXT): {$(VPATH)}vm_debug.h
 marshal.$(OBJEXT): {$(VPATH)}vm_opts.h
+marshal.$(OBJEXT): {$(VPATH)}vm_sync.h
 math.$(OBJEXT): $(hdrdir)/ruby/ruby.h
 math.$(OBJEXT): $(top_srcdir)/internal/bignum.h
 math.$(OBJEXT): $(top_srcdir)/internal/class.h
@@ -9507,6 +10766,7 @@ math.$(OBJEXT): {$(VPATH)}internal/intern/re.h
 math.$(OBJEXT): {$(VPATH)}internal/intern/ruby.h
 math.$(OBJEXT): {$(VPATH)}internal/intern/select.h
 math.$(OBJEXT): {$(VPATH)}internal/intern/select/largesize.h
+math.$(OBJEXT): {$(VPATH)}internal/intern/set.h
 math.$(OBJEXT): {$(VPATH)}internal/intern/signal.h
 math.$(OBJEXT): {$(VPATH)}internal/intern/sprintf.h
 math.$(OBJEXT): {$(VPATH)}internal/intern/string.h
@@ -9526,6 +10786,7 @@ math.$(OBJEXT): {$(VPATH)}internal/special_consts.h
 math.$(OBJEXT): {$(VPATH)}internal/static_assert.h
 math.$(OBJEXT): {$(VPATH)}internal/stdalign.h
 math.$(OBJEXT): {$(VPATH)}internal/stdbool.h
+math.$(OBJEXT): {$(VPATH)}internal/stdckdint.h
 math.$(OBJEXT): {$(VPATH)}internal/symbol.h
 math.$(OBJEXT): {$(VPATH)}internal/value.h
 math.$(OBJEXT): {$(VPATH)}internal/value_type.h
@@ -9548,7 +10809,10 @@ memory_view.$(OBJEXT): $(top_srcdir)/internal/compilers.h
 memory_view.$(OBJEXT): $(top_srcdir)/internal/gc.h
 memory_view.$(OBJEXT): $(top_srcdir)/internal/hash.h
 memory_view.$(OBJEXT): $(top_srcdir)/internal/imemo.h
+memory_view.$(OBJEXT): $(top_srcdir)/internal/namespace.h
+memory_view.$(OBJEXT): $(top_srcdir)/internal/sanitizers.h
 memory_view.$(OBJEXT): $(top_srcdir)/internal/serial.h
+memory_view.$(OBJEXT): $(top_srcdir)/internal/set_table.h
 memory_view.$(OBJEXT): $(top_srcdir)/internal/static_assert.h
 memory_view.$(OBJEXT): $(top_srcdir)/internal/variable.h
 memory_view.$(OBJEXT): $(top_srcdir)/internal/vm.h
@@ -9696,6 +10960,7 @@ memory_view.$(OBJEXT): {$(VPATH)}internal/intern/re.h
 memory_view.$(OBJEXT): {$(VPATH)}internal/intern/ruby.h
 memory_view.$(OBJEXT): {$(VPATH)}internal/intern/select.h
 memory_view.$(OBJEXT): {$(VPATH)}internal/intern/select/largesize.h
+memory_view.$(OBJEXT): {$(VPATH)}internal/intern/set.h
 memory_view.$(OBJEXT): {$(VPATH)}internal/intern/signal.h
 memory_view.$(OBJEXT): {$(VPATH)}internal/intern/sprintf.h
 memory_view.$(OBJEXT): {$(VPATH)}internal/intern/string.h
@@ -9715,6 +10980,7 @@ memory_view.$(OBJEXT): {$(VPATH)}internal/special_consts.h
 memory_view.$(OBJEXT): {$(VPATH)}internal/static_assert.h
 memory_view.$(OBJEXT): {$(VPATH)}internal/stdalign.h
 memory_view.$(OBJEXT): {$(VPATH)}internal/stdbool.h
+memory_view.$(OBJEXT): {$(VPATH)}internal/stdckdint.h
 memory_view.$(OBJEXT): {$(VPATH)}internal/symbol.h
 memory_view.$(OBJEXT): {$(VPATH)}internal/value.h
 memory_view.$(OBJEXT): {$(VPATH)}internal/value_type.h
@@ -9746,18 +11012,48 @@ miniinit.$(OBJEXT): $(CCAN_DIR)/container_of/container_of.h
 miniinit.$(OBJEXT): $(CCAN_DIR)/list/list.h
 miniinit.$(OBJEXT): $(CCAN_DIR)/str/str.h
 miniinit.$(OBJEXT): $(hdrdir)/ruby/ruby.h
-miniinit.$(OBJEXT): $(srcdir)/rjit_c.rb
 miniinit.$(OBJEXT): $(top_srcdir)/internal/array.h
 miniinit.$(OBJEXT): $(top_srcdir)/internal/basic_operators.h
+miniinit.$(OBJEXT): $(top_srcdir)/internal/bignum.h
+miniinit.$(OBJEXT): $(top_srcdir)/internal/bits.h
 miniinit.$(OBJEXT): $(top_srcdir)/internal/compilers.h
+miniinit.$(OBJEXT): $(top_srcdir)/internal/complex.h
+miniinit.$(OBJEXT): $(top_srcdir)/internal/eval.h
+miniinit.$(OBJEXT): $(top_srcdir)/internal/fixnum.h
 miniinit.$(OBJEXT): $(top_srcdir)/internal/gc.h
 miniinit.$(OBJEXT): $(top_srcdir)/internal/imemo.h
+miniinit.$(OBJEXT): $(top_srcdir)/internal/namespace.h
+miniinit.$(OBJEXT): $(top_srcdir)/internal/numeric.h
+miniinit.$(OBJEXT): $(top_srcdir)/internal/parse.h
+miniinit.$(OBJEXT): $(top_srcdir)/internal/rational.h
 miniinit.$(OBJEXT): $(top_srcdir)/internal/ruby_parser.h
+miniinit.$(OBJEXT): $(top_srcdir)/internal/sanitizers.h
 miniinit.$(OBJEXT): $(top_srcdir)/internal/serial.h
+miniinit.$(OBJEXT): $(top_srcdir)/internal/set_table.h
 miniinit.$(OBJEXT): $(top_srcdir)/internal/static_assert.h
 miniinit.$(OBJEXT): $(top_srcdir)/internal/variable.h
 miniinit.$(OBJEXT): $(top_srcdir)/internal/vm.h
 miniinit.$(OBJEXT): $(top_srcdir)/internal/warnings.h
+miniinit.$(OBJEXT): $(top_srcdir)/prism/defines.h
+miniinit.$(OBJEXT): $(top_srcdir)/prism/encoding.h
+miniinit.$(OBJEXT): $(top_srcdir)/prism/node.h
+miniinit.$(OBJEXT): $(top_srcdir)/prism/options.h
+miniinit.$(OBJEXT): $(top_srcdir)/prism/pack.h
+miniinit.$(OBJEXT): $(top_srcdir)/prism/parser.h
+miniinit.$(OBJEXT): $(top_srcdir)/prism/prettyprint.h
+miniinit.$(OBJEXT): $(top_srcdir)/prism/prism.h
+miniinit.$(OBJEXT): $(top_srcdir)/prism/regexp.h
+miniinit.$(OBJEXT): $(top_srcdir)/prism/static_literals.h
+miniinit.$(OBJEXT): $(top_srcdir)/prism/util/pm_buffer.h
+miniinit.$(OBJEXT): $(top_srcdir)/prism/util/pm_char.h
+miniinit.$(OBJEXT): $(top_srcdir)/prism/util/pm_constant_pool.h
+miniinit.$(OBJEXT): $(top_srcdir)/prism/util/pm_integer.h
+miniinit.$(OBJEXT): $(top_srcdir)/prism/util/pm_list.h
+miniinit.$(OBJEXT): $(top_srcdir)/prism/util/pm_memchr.h
+miniinit.$(OBJEXT): $(top_srcdir)/prism/util/pm_newline_list.h
+miniinit.$(OBJEXT): $(top_srcdir)/prism/util/pm_string.h
+miniinit.$(OBJEXT): $(top_srcdir)/prism/util/pm_strncasecmp.h
+miniinit.$(OBJEXT): $(top_srcdir)/prism/util/pm_strpbrk.h
 miniinit.$(OBJEXT): {$(VPATH)}array.rb
 miniinit.$(OBJEXT): {$(VPATH)}assert.h
 miniinit.$(OBJEXT): {$(VPATH)}ast.rb
@@ -9820,6 +11116,7 @@ miniinit.$(OBJEXT): {$(VPATH)}internal/attr/nodiscard.h
 miniinit.$(OBJEXT): {$(VPATH)}internal/attr/noexcept.h
 miniinit.$(OBJEXT): {$(VPATH)}internal/attr/noinline.h
 miniinit.$(OBJEXT): {$(VPATH)}internal/attr/nonnull.h
+miniinit.$(OBJEXT): {$(VPATH)}internal/attr/nonstring.h
 miniinit.$(OBJEXT): {$(VPATH)}internal/attr/noreturn.h
 miniinit.$(OBJEXT): {$(VPATH)}internal/attr/packed_struct.h
 miniinit.$(OBJEXT): {$(VPATH)}internal/attr/pure.h
@@ -9906,6 +11203,7 @@ miniinit.$(OBJEXT): {$(VPATH)}internal/intern/re.h
 miniinit.$(OBJEXT): {$(VPATH)}internal/intern/ruby.h
 miniinit.$(OBJEXT): {$(VPATH)}internal/intern/select.h
 miniinit.$(OBJEXT): {$(VPATH)}internal/intern/select/largesize.h
+miniinit.$(OBJEXT): {$(VPATH)}internal/intern/set.h
 miniinit.$(OBJEXT): {$(VPATH)}internal/intern/signal.h
 miniinit.$(OBJEXT): {$(VPATH)}internal/intern/sprintf.h
 miniinit.$(OBJEXT): {$(VPATH)}internal/intern/string.h
@@ -9925,6 +11223,7 @@ miniinit.$(OBJEXT): {$(VPATH)}internal/special_consts.h
 miniinit.$(OBJEXT): {$(VPATH)}internal/static_assert.h
 miniinit.$(OBJEXT): {$(VPATH)}internal/stdalign.h
 miniinit.$(OBJEXT): {$(VPATH)}internal/stdbool.h
+miniinit.$(OBJEXT): {$(VPATH)}internal/stdckdint.h
 miniinit.$(OBJEXT): {$(VPATH)}internal/symbol.h
 miniinit.$(OBJEXT): {$(VPATH)}internal/value.h
 miniinit.$(OBJEXT): {$(VPATH)}internal/value_type.h
@@ -9947,9 +11246,11 @@ miniinit.$(OBJEXT): {$(VPATH)}onigmo.h
 miniinit.$(OBJEXT): {$(VPATH)}oniguruma.h
 miniinit.$(OBJEXT): {$(VPATH)}pack.rb
 miniinit.$(OBJEXT): {$(VPATH)}prelude.rb
+miniinit.$(OBJEXT): {$(VPATH)}prism/ast.h
+miniinit.$(OBJEXT): {$(VPATH)}prism/diagnostic.h
+miniinit.$(OBJEXT): {$(VPATH)}prism/version.h
+miniinit.$(OBJEXT): {$(VPATH)}prism_compile.h
 miniinit.$(OBJEXT): {$(VPATH)}ractor.rb
-miniinit.$(OBJEXT): {$(VPATH)}rjit.rb
-miniinit.$(OBJEXT): {$(VPATH)}rjit_c.rb
 miniinit.$(OBJEXT): {$(VPATH)}ruby_assert.h
 miniinit.$(OBJEXT): {$(VPATH)}ruby_atomic.h
 miniinit.$(OBJEXT): {$(VPATH)}rubyparser.h
@@ -9966,6 +11267,223 @@ miniinit.$(OBJEXT): {$(VPATH)}vm_core.h
 miniinit.$(OBJEXT): {$(VPATH)}vm_opts.h
 miniinit.$(OBJEXT): {$(VPATH)}warning.rb
 miniinit.$(OBJEXT): {$(VPATH)}yjit.rb
+miniinit.$(OBJEXT): {$(VPATH)}yjit_hook.rb
+miniinit.$(OBJEXT): {$(VPATH)}zjit.rb
+namespace.$(OBJEXT): $(CCAN_DIR)/check_type/check_type.h
+namespace.$(OBJEXT): $(CCAN_DIR)/container_of/container_of.h
+namespace.$(OBJEXT): $(CCAN_DIR)/list/list.h
+namespace.$(OBJEXT): $(CCAN_DIR)/str/str.h
+namespace.$(OBJEXT): $(hdrdir)/ruby/ruby.h
+namespace.$(OBJEXT): $(top_srcdir)/internal/array.h
+namespace.$(OBJEXT): $(top_srcdir)/internal/basic_operators.h
+namespace.$(OBJEXT): $(top_srcdir)/internal/class.h
+namespace.$(OBJEXT): $(top_srcdir)/internal/compilers.h
+namespace.$(OBJEXT): $(top_srcdir)/internal/error.h
+namespace.$(OBJEXT): $(top_srcdir)/internal/eval.h
+namespace.$(OBJEXT): $(top_srcdir)/internal/file.h
+namespace.$(OBJEXT): $(top_srcdir)/internal/gc.h
+namespace.$(OBJEXT): $(top_srcdir)/internal/hash.h
+namespace.$(OBJEXT): $(top_srcdir)/internal/imemo.h
+namespace.$(OBJEXT): $(top_srcdir)/internal/load.h
+namespace.$(OBJEXT): $(top_srcdir)/internal/namespace.h
+namespace.$(OBJEXT): $(top_srcdir)/internal/sanitizers.h
+namespace.$(OBJEXT): $(top_srcdir)/internal/serial.h
+namespace.$(OBJEXT): $(top_srcdir)/internal/set_table.h
+namespace.$(OBJEXT): $(top_srcdir)/internal/st.h
+namespace.$(OBJEXT): $(top_srcdir)/internal/static_assert.h
+namespace.$(OBJEXT): $(top_srcdir)/internal/string.h
+namespace.$(OBJEXT): $(top_srcdir)/internal/variable.h
+namespace.$(OBJEXT): $(top_srcdir)/internal/vm.h
+namespace.$(OBJEXT): $(top_srcdir)/internal/warnings.h
+namespace.$(OBJEXT): {$(VPATH)}assert.h
+namespace.$(OBJEXT): {$(VPATH)}atomic.h
+namespace.$(OBJEXT): {$(VPATH)}backward/2/assume.h
+namespace.$(OBJEXT): {$(VPATH)}backward/2/attributes.h
+namespace.$(OBJEXT): {$(VPATH)}backward/2/bool.h
+namespace.$(OBJEXT): {$(VPATH)}backward/2/gcc_version_since.h
+namespace.$(OBJEXT): {$(VPATH)}backward/2/inttypes.h
+namespace.$(OBJEXT): {$(VPATH)}backward/2/limits.h
+namespace.$(OBJEXT): {$(VPATH)}backward/2/long_long.h
+namespace.$(OBJEXT): {$(VPATH)}backward/2/stdalign.h
+namespace.$(OBJEXT): {$(VPATH)}backward/2/stdarg.h
+namespace.$(OBJEXT): {$(VPATH)}config.h
+namespace.$(OBJEXT): {$(VPATH)}constant.h
+namespace.$(OBJEXT): {$(VPATH)}debug_counter.h
+namespace.$(OBJEXT): {$(VPATH)}defines.h
+namespace.$(OBJEXT): {$(VPATH)}encoding.h
+namespace.$(OBJEXT): {$(VPATH)}id.h
+namespace.$(OBJEXT): {$(VPATH)}id_table.h
+namespace.$(OBJEXT): {$(VPATH)}intern.h
+namespace.$(OBJEXT): {$(VPATH)}internal.h
+namespace.$(OBJEXT): {$(VPATH)}internal/abi.h
+namespace.$(OBJEXT): {$(VPATH)}internal/anyargs.h
+namespace.$(OBJEXT): {$(VPATH)}internal/arithmetic.h
+namespace.$(OBJEXT): {$(VPATH)}internal/arithmetic/char.h
+namespace.$(OBJEXT): {$(VPATH)}internal/arithmetic/double.h
+namespace.$(OBJEXT): {$(VPATH)}internal/arithmetic/fixnum.h
+namespace.$(OBJEXT): {$(VPATH)}internal/arithmetic/gid_t.h
+namespace.$(OBJEXT): {$(VPATH)}internal/arithmetic/int.h
+namespace.$(OBJEXT): {$(VPATH)}internal/arithmetic/intptr_t.h
+namespace.$(OBJEXT): {$(VPATH)}internal/arithmetic/long.h
+namespace.$(OBJEXT): {$(VPATH)}internal/arithmetic/long_long.h
+namespace.$(OBJEXT): {$(VPATH)}internal/arithmetic/mode_t.h
+namespace.$(OBJEXT): {$(VPATH)}internal/arithmetic/off_t.h
+namespace.$(OBJEXT): {$(VPATH)}internal/arithmetic/pid_t.h
+namespace.$(OBJEXT): {$(VPATH)}internal/arithmetic/short.h
+namespace.$(OBJEXT): {$(VPATH)}internal/arithmetic/size_t.h
+namespace.$(OBJEXT): {$(VPATH)}internal/arithmetic/st_data_t.h
+namespace.$(OBJEXT): {$(VPATH)}internal/arithmetic/uid_t.h
+namespace.$(OBJEXT): {$(VPATH)}internal/assume.h
+namespace.$(OBJEXT): {$(VPATH)}internal/attr/alloc_size.h
+namespace.$(OBJEXT): {$(VPATH)}internal/attr/artificial.h
+namespace.$(OBJEXT): {$(VPATH)}internal/attr/cold.h
+namespace.$(OBJEXT): {$(VPATH)}internal/attr/const.h
+namespace.$(OBJEXT): {$(VPATH)}internal/attr/constexpr.h
+namespace.$(OBJEXT): {$(VPATH)}internal/attr/deprecated.h
+namespace.$(OBJEXT): {$(VPATH)}internal/attr/diagnose_if.h
+namespace.$(OBJEXT): {$(VPATH)}internal/attr/enum_extensibility.h
+namespace.$(OBJEXT): {$(VPATH)}internal/attr/error.h
+namespace.$(OBJEXT): {$(VPATH)}internal/attr/flag_enum.h
+namespace.$(OBJEXT): {$(VPATH)}internal/attr/forceinline.h
+namespace.$(OBJEXT): {$(VPATH)}internal/attr/format.h
+namespace.$(OBJEXT): {$(VPATH)}internal/attr/maybe_unused.h
+namespace.$(OBJEXT): {$(VPATH)}internal/attr/noalias.h
+namespace.$(OBJEXT): {$(VPATH)}internal/attr/nodiscard.h
+namespace.$(OBJEXT): {$(VPATH)}internal/attr/noexcept.h
+namespace.$(OBJEXT): {$(VPATH)}internal/attr/noinline.h
+namespace.$(OBJEXT): {$(VPATH)}internal/attr/nonnull.h
+namespace.$(OBJEXT): {$(VPATH)}internal/attr/noreturn.h
+namespace.$(OBJEXT): {$(VPATH)}internal/attr/packed_struct.h
+namespace.$(OBJEXT): {$(VPATH)}internal/attr/pure.h
+namespace.$(OBJEXT): {$(VPATH)}internal/attr/restrict.h
+namespace.$(OBJEXT): {$(VPATH)}internal/attr/returns_nonnull.h
+namespace.$(OBJEXT): {$(VPATH)}internal/attr/warning.h
+namespace.$(OBJEXT): {$(VPATH)}internal/attr/weakref.h
+namespace.$(OBJEXT): {$(VPATH)}internal/cast.h
+namespace.$(OBJEXT): {$(VPATH)}internal/compiler_is.h
+namespace.$(OBJEXT): {$(VPATH)}internal/compiler_is/apple.h
+namespace.$(OBJEXT): {$(VPATH)}internal/compiler_is/clang.h
+namespace.$(OBJEXT): {$(VPATH)}internal/compiler_is/gcc.h
+namespace.$(OBJEXT): {$(VPATH)}internal/compiler_is/intel.h
+namespace.$(OBJEXT): {$(VPATH)}internal/compiler_is/msvc.h
+namespace.$(OBJEXT): {$(VPATH)}internal/compiler_is/sunpro.h
+namespace.$(OBJEXT): {$(VPATH)}internal/compiler_since.h
+namespace.$(OBJEXT): {$(VPATH)}internal/config.h
+namespace.$(OBJEXT): {$(VPATH)}internal/constant_p.h
+namespace.$(OBJEXT): {$(VPATH)}internal/core.h
+namespace.$(OBJEXT): {$(VPATH)}internal/core/rarray.h
+namespace.$(OBJEXT): {$(VPATH)}internal/core/rbasic.h
+namespace.$(OBJEXT): {$(VPATH)}internal/core/rbignum.h
+namespace.$(OBJEXT): {$(VPATH)}internal/core/rclass.h
+namespace.$(OBJEXT): {$(VPATH)}internal/core/rdata.h
+namespace.$(OBJEXT): {$(VPATH)}internal/core/rfile.h
+namespace.$(OBJEXT): {$(VPATH)}internal/core/rhash.h
+namespace.$(OBJEXT): {$(VPATH)}internal/core/robject.h
+namespace.$(OBJEXT): {$(VPATH)}internal/core/rregexp.h
+namespace.$(OBJEXT): {$(VPATH)}internal/core/rstring.h
+namespace.$(OBJEXT): {$(VPATH)}internal/core/rstruct.h
+namespace.$(OBJEXT): {$(VPATH)}internal/core/rtypeddata.h
+namespace.$(OBJEXT): {$(VPATH)}internal/ctype.h
+namespace.$(OBJEXT): {$(VPATH)}internal/dllexport.h
+namespace.$(OBJEXT): {$(VPATH)}internal/dosish.h
+namespace.$(OBJEXT): {$(VPATH)}internal/encoding/coderange.h
+namespace.$(OBJEXT): {$(VPATH)}internal/encoding/ctype.h
+namespace.$(OBJEXT): {$(VPATH)}internal/encoding/encoding.h
+namespace.$(OBJEXT): {$(VPATH)}internal/encoding/pathname.h
+namespace.$(OBJEXT): {$(VPATH)}internal/encoding/re.h
+namespace.$(OBJEXT): {$(VPATH)}internal/encoding/sprintf.h
+namespace.$(OBJEXT): {$(VPATH)}internal/encoding/string.h
+namespace.$(OBJEXT): {$(VPATH)}internal/encoding/symbol.h
+namespace.$(OBJEXT): {$(VPATH)}internal/encoding/transcode.h
+namespace.$(OBJEXT): {$(VPATH)}internal/error.h
+namespace.$(OBJEXT): {$(VPATH)}internal/eval.h
+namespace.$(OBJEXT): {$(VPATH)}internal/event.h
+namespace.$(OBJEXT): {$(VPATH)}internal/fl_type.h
+namespace.$(OBJEXT): {$(VPATH)}internal/gc.h
+namespace.$(OBJEXT): {$(VPATH)}internal/glob.h
+namespace.$(OBJEXT): {$(VPATH)}internal/globals.h
+namespace.$(OBJEXT): {$(VPATH)}internal/has/attribute.h
+namespace.$(OBJEXT): {$(VPATH)}internal/has/builtin.h
+namespace.$(OBJEXT): {$(VPATH)}internal/has/c_attribute.h
+namespace.$(OBJEXT): {$(VPATH)}internal/has/cpp_attribute.h
+namespace.$(OBJEXT): {$(VPATH)}internal/has/declspec_attribute.h
+namespace.$(OBJEXT): {$(VPATH)}internal/has/extension.h
+namespace.$(OBJEXT): {$(VPATH)}internal/has/feature.h
+namespace.$(OBJEXT): {$(VPATH)}internal/has/warning.h
+namespace.$(OBJEXT): {$(VPATH)}internal/intern/array.h
+namespace.$(OBJEXT): {$(VPATH)}internal/intern/bignum.h
+namespace.$(OBJEXT): {$(VPATH)}internal/intern/class.h
+namespace.$(OBJEXT): {$(VPATH)}internal/intern/compar.h
+namespace.$(OBJEXT): {$(VPATH)}internal/intern/complex.h
+namespace.$(OBJEXT): {$(VPATH)}internal/intern/cont.h
+namespace.$(OBJEXT): {$(VPATH)}internal/intern/dir.h
+namespace.$(OBJEXT): {$(VPATH)}internal/intern/enum.h
+namespace.$(OBJEXT): {$(VPATH)}internal/intern/enumerator.h
+namespace.$(OBJEXT): {$(VPATH)}internal/intern/error.h
+namespace.$(OBJEXT): {$(VPATH)}internal/intern/eval.h
+namespace.$(OBJEXT): {$(VPATH)}internal/intern/file.h
+namespace.$(OBJEXT): {$(VPATH)}internal/intern/hash.h
+namespace.$(OBJEXT): {$(VPATH)}internal/intern/io.h
+namespace.$(OBJEXT): {$(VPATH)}internal/intern/load.h
+namespace.$(OBJEXT): {$(VPATH)}internal/intern/marshal.h
+namespace.$(OBJEXT): {$(VPATH)}internal/intern/numeric.h
+namespace.$(OBJEXT): {$(VPATH)}internal/intern/object.h
+namespace.$(OBJEXT): {$(VPATH)}internal/intern/parse.h
+namespace.$(OBJEXT): {$(VPATH)}internal/intern/proc.h
+namespace.$(OBJEXT): {$(VPATH)}internal/intern/process.h
+namespace.$(OBJEXT): {$(VPATH)}internal/intern/random.h
+namespace.$(OBJEXT): {$(VPATH)}internal/intern/range.h
+namespace.$(OBJEXT): {$(VPATH)}internal/intern/rational.h
+namespace.$(OBJEXT): {$(VPATH)}internal/intern/re.h
+namespace.$(OBJEXT): {$(VPATH)}internal/intern/ruby.h
+namespace.$(OBJEXT): {$(VPATH)}internal/intern/select.h
+namespace.$(OBJEXT): {$(VPATH)}internal/intern/select/largesize.h
+namespace.$(OBJEXT): {$(VPATH)}internal/intern/set.h
+namespace.$(OBJEXT): {$(VPATH)}internal/intern/signal.h
+namespace.$(OBJEXT): {$(VPATH)}internal/intern/sprintf.h
+namespace.$(OBJEXT): {$(VPATH)}internal/intern/string.h
+namespace.$(OBJEXT): {$(VPATH)}internal/intern/struct.h
+namespace.$(OBJEXT): {$(VPATH)}internal/intern/thread.h
+namespace.$(OBJEXT): {$(VPATH)}internal/intern/time.h
+namespace.$(OBJEXT): {$(VPATH)}internal/intern/variable.h
+namespace.$(OBJEXT): {$(VPATH)}internal/intern/vm.h
+namespace.$(OBJEXT): {$(VPATH)}internal/interpreter.h
+namespace.$(OBJEXT): {$(VPATH)}internal/iterator.h
+namespace.$(OBJEXT): {$(VPATH)}internal/memory.h
+namespace.$(OBJEXT): {$(VPATH)}internal/method.h
+namespace.$(OBJEXT): {$(VPATH)}internal/module.h
+namespace.$(OBJEXT): {$(VPATH)}internal/newobj.h
+namespace.$(OBJEXT): {$(VPATH)}internal/scan_args.h
+namespace.$(OBJEXT): {$(VPATH)}internal/special_consts.h
+namespace.$(OBJEXT): {$(VPATH)}internal/static_assert.h
+namespace.$(OBJEXT): {$(VPATH)}internal/stdalign.h
+namespace.$(OBJEXT): {$(VPATH)}internal/stdbool.h
+namespace.$(OBJEXT): {$(VPATH)}internal/stdckdint.h
+namespace.$(OBJEXT): {$(VPATH)}internal/symbol.h
+namespace.$(OBJEXT): {$(VPATH)}internal/value.h
+namespace.$(OBJEXT): {$(VPATH)}internal/value_type.h
+namespace.$(OBJEXT): {$(VPATH)}internal/variable.h
+namespace.$(OBJEXT): {$(VPATH)}internal/warning_push.h
+namespace.$(OBJEXT): {$(VPATH)}internal/xmalloc.h
+namespace.$(OBJEXT): {$(VPATH)}method.h
+namespace.$(OBJEXT): {$(VPATH)}missing.h
+namespace.$(OBJEXT): {$(VPATH)}namespace.c
+namespace.$(OBJEXT): {$(VPATH)}node.h
+namespace.$(OBJEXT): {$(VPATH)}onigmo.h
+namespace.$(OBJEXT): {$(VPATH)}oniguruma.h
+namespace.$(OBJEXT): {$(VPATH)}ruby_assert.h
+namespace.$(OBJEXT): {$(VPATH)}ruby_atomic.h
+namespace.$(OBJEXT): {$(VPATH)}rubyparser.h
+namespace.$(OBJEXT): {$(VPATH)}shape.h
+namespace.$(OBJEXT): {$(VPATH)}st.h
+namespace.$(OBJEXT): {$(VPATH)}subst.h
+namespace.$(OBJEXT): {$(VPATH)}thread_$(THREAD_MODEL).h
+namespace.$(OBJEXT): {$(VPATH)}thread_native.h
+namespace.$(OBJEXT): {$(VPATH)}util.h
+namespace.$(OBJEXT): {$(VPATH)}vm_core.h
+namespace.$(OBJEXT): {$(VPATH)}vm_debug.h
+namespace.$(OBJEXT): {$(VPATH)}vm_opts.h
+namespace.$(OBJEXT): {$(VPATH)}vm_sync.h
 node.$(OBJEXT): $(CCAN_DIR)/check_type/check_type.h
 node.$(OBJEXT): $(CCAN_DIR)/container_of/container_of.h
 node.$(OBJEXT): $(CCAN_DIR)/list/list.h
@@ -9977,7 +11495,10 @@ 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/namespace.h
+node.$(OBJEXT): $(top_srcdir)/internal/sanitizers.h
 node.$(OBJEXT): $(top_srcdir)/internal/serial.h
+node.$(OBJEXT): $(top_srcdir)/internal/set_table.h
 node.$(OBJEXT): $(top_srcdir)/internal/static_assert.h
 node.$(OBJEXT): $(top_srcdir)/internal/variable.h
 node.$(OBJEXT): $(top_srcdir)/internal/vm.h
@@ -10124,6 +11645,7 @@ node.$(OBJEXT): {$(VPATH)}internal/intern/re.h
 node.$(OBJEXT): {$(VPATH)}internal/intern/ruby.h
 node.$(OBJEXT): {$(VPATH)}internal/intern/select.h
 node.$(OBJEXT): {$(VPATH)}internal/intern/select/largesize.h
+node.$(OBJEXT): {$(VPATH)}internal/intern/set.h
 node.$(OBJEXT): {$(VPATH)}internal/intern/signal.h
 node.$(OBJEXT): {$(VPATH)}internal/intern/sprintf.h
 node.$(OBJEXT): {$(VPATH)}internal/intern/string.h
@@ -10143,6 +11665,7 @@ node.$(OBJEXT): {$(VPATH)}internal/special_consts.h
 node.$(OBJEXT): {$(VPATH)}internal/static_assert.h
 node.$(OBJEXT): {$(VPATH)}internal/stdalign.h
 node.$(OBJEXT): {$(VPATH)}internal/stdbool.h
+node.$(OBJEXT): {$(VPATH)}internal/stdckdint.h
 node.$(OBJEXT): {$(VPATH)}internal/symbol.h
 node.$(OBJEXT): {$(VPATH)}internal/value.h
 node.$(OBJEXT): {$(VPATH)}internal/value_type.h
@@ -10173,11 +11696,23 @@ node_dump.$(OBJEXT): $(CCAN_DIR)/str/str.h
 node_dump.$(OBJEXT): $(hdrdir)/ruby/ruby.h
 node_dump.$(OBJEXT): $(top_srcdir)/internal/array.h
 node_dump.$(OBJEXT): $(top_srcdir)/internal/basic_operators.h
+node_dump.$(OBJEXT): $(top_srcdir)/internal/bignum.h
+node_dump.$(OBJEXT): $(top_srcdir)/internal/bits.h
+node_dump.$(OBJEXT): $(top_srcdir)/internal/class.h
 node_dump.$(OBJEXT): $(top_srcdir)/internal/compilers.h
+node_dump.$(OBJEXT): $(top_srcdir)/internal/complex.h
+node_dump.$(OBJEXT): $(top_srcdir)/internal/fixnum.h
 node_dump.$(OBJEXT): $(top_srcdir)/internal/gc.h
 node_dump.$(OBJEXT): $(top_srcdir)/internal/hash.h
 node_dump.$(OBJEXT): $(top_srcdir)/internal/imemo.h
+node_dump.$(OBJEXT): $(top_srcdir)/internal/namespace.h
+node_dump.$(OBJEXT): $(top_srcdir)/internal/numeric.h
+node_dump.$(OBJEXT): $(top_srcdir)/internal/parse.h
+node_dump.$(OBJEXT): $(top_srcdir)/internal/rational.h
+node_dump.$(OBJEXT): $(top_srcdir)/internal/ruby_parser.h
+node_dump.$(OBJEXT): $(top_srcdir)/internal/sanitizers.h
 node_dump.$(OBJEXT): $(top_srcdir)/internal/serial.h
+node_dump.$(OBJEXT): $(top_srcdir)/internal/set_table.h
 node_dump.$(OBJEXT): $(top_srcdir)/internal/static_assert.h
 node_dump.$(OBJEXT): $(top_srcdir)/internal/variable.h
 node_dump.$(OBJEXT): $(top_srcdir)/internal/vm.h
@@ -10195,6 +11730,7 @@ node_dump.$(OBJEXT): {$(VPATH)}backward/2/stdalign.h
 node_dump.$(OBJEXT): {$(VPATH)}backward/2/stdarg.h
 node_dump.$(OBJEXT): {$(VPATH)}config.h
 node_dump.$(OBJEXT): {$(VPATH)}constant.h
+node_dump.$(OBJEXT): {$(VPATH)}debug_counter.h
 node_dump.$(OBJEXT): {$(VPATH)}defines.h
 node_dump.$(OBJEXT): {$(VPATH)}encoding.h
 node_dump.$(OBJEXT): {$(VPATH)}id.h
@@ -10324,6 +11860,7 @@ node_dump.$(OBJEXT): {$(VPATH)}internal/intern/re.h
 node_dump.$(OBJEXT): {$(VPATH)}internal/intern/ruby.h
 node_dump.$(OBJEXT): {$(VPATH)}internal/intern/select.h
 node_dump.$(OBJEXT): {$(VPATH)}internal/intern/select/largesize.h
+node_dump.$(OBJEXT): {$(VPATH)}internal/intern/set.h
 node_dump.$(OBJEXT): {$(VPATH)}internal/intern/signal.h
 node_dump.$(OBJEXT): {$(VPATH)}internal/intern/sprintf.h
 node_dump.$(OBJEXT): {$(VPATH)}internal/intern/string.h
@@ -10343,6 +11880,7 @@ node_dump.$(OBJEXT): {$(VPATH)}internal/special_consts.h
 node_dump.$(OBJEXT): {$(VPATH)}internal/static_assert.h
 node_dump.$(OBJEXT): {$(VPATH)}internal/stdalign.h
 node_dump.$(OBJEXT): {$(VPATH)}internal/stdbool.h
+node_dump.$(OBJEXT): {$(VPATH)}internal/stdckdint.h
 node_dump.$(OBJEXT): {$(VPATH)}internal/symbol.h
 node_dump.$(OBJEXT): {$(VPATH)}internal/value.h
 node_dump.$(OBJEXT): {$(VPATH)}internal/value_type.h
@@ -10364,7 +11902,9 @@ node_dump.$(OBJEXT): {$(VPATH)}subst.h
 node_dump.$(OBJEXT): {$(VPATH)}thread_$(THREAD_MODEL).h
 node_dump.$(OBJEXT): {$(VPATH)}thread_native.h
 node_dump.$(OBJEXT): {$(VPATH)}vm_core.h
+node_dump.$(OBJEXT): {$(VPATH)}vm_debug.h
 node_dump.$(OBJEXT): {$(VPATH)}vm_opts.h
+node_dump.$(OBJEXT): {$(VPATH)}vm_sync.h
 numeric.$(OBJEXT): $(CCAN_DIR)/check_type/check_type.h
 numeric.$(OBJEXT): $(CCAN_DIR)/container_of/container_of.h
 numeric.$(OBJEXT): $(CCAN_DIR)/list/list.h
@@ -10382,10 +11922,13 @@ 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/imemo.h
+numeric.$(OBJEXT): $(top_srcdir)/internal/namespace.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/sanitizers.h
 numeric.$(OBJEXT): $(top_srcdir)/internal/serial.h
+numeric.$(OBJEXT): $(top_srcdir)/internal/set_table.h
 numeric.$(OBJEXT): $(top_srcdir)/internal/static_assert.h
 numeric.$(OBJEXT): $(top_srcdir)/internal/string.h
 numeric.$(OBJEXT): $(top_srcdir)/internal/util.h
@@ -10535,6 +12078,7 @@ numeric.$(OBJEXT): {$(VPATH)}internal/intern/re.h
 numeric.$(OBJEXT): {$(VPATH)}internal/intern/ruby.h
 numeric.$(OBJEXT): {$(VPATH)}internal/intern/select.h
 numeric.$(OBJEXT): {$(VPATH)}internal/intern/select/largesize.h
+numeric.$(OBJEXT): {$(VPATH)}internal/intern/set.h
 numeric.$(OBJEXT): {$(VPATH)}internal/intern/signal.h
 numeric.$(OBJEXT): {$(VPATH)}internal/intern/sprintf.h
 numeric.$(OBJEXT): {$(VPATH)}internal/intern/string.h
@@ -10554,6 +12098,7 @@ numeric.$(OBJEXT): {$(VPATH)}internal/special_consts.h
 numeric.$(OBJEXT): {$(VPATH)}internal/static_assert.h
 numeric.$(OBJEXT): {$(VPATH)}internal/stdalign.h
 numeric.$(OBJEXT): {$(VPATH)}internal/stdbool.h
+numeric.$(OBJEXT): {$(VPATH)}internal/stdckdint.h
 numeric.$(OBJEXT): {$(VPATH)}internal/symbol.h
 numeric.$(OBJEXT): {$(VPATH)}internal/value.h
 numeric.$(OBJEXT): {$(VPATH)}internal/value_type.h
@@ -10583,6 +12128,7 @@ object.$(OBJEXT): $(CCAN_DIR)/container_of/container_of.h
 object.$(OBJEXT): $(CCAN_DIR)/list/list.h
 object.$(OBJEXT): $(CCAN_DIR)/str/str.h
 object.$(OBJEXT): $(hdrdir)/ruby/ruby.h
+object.$(OBJEXT): $(hdrdir)/ruby/version.h
 object.$(OBJEXT): $(top_srcdir)/internal/array.h
 object.$(OBJEXT): $(top_srcdir)/internal/basic_operators.h
 object.$(OBJEXT): $(top_srcdir)/internal/bignum.h
@@ -10595,9 +12141,13 @@ object.$(OBJEXT): $(top_srcdir)/internal/fixnum.h
 object.$(OBJEXT): $(top_srcdir)/internal/gc.h
 object.$(OBJEXT): $(top_srcdir)/internal/imemo.h
 object.$(OBJEXT): $(top_srcdir)/internal/inits.h
+object.$(OBJEXT): $(top_srcdir)/internal/namespace.h
 object.$(OBJEXT): $(top_srcdir)/internal/numeric.h
 object.$(OBJEXT): $(top_srcdir)/internal/object.h
+object.$(OBJEXT): $(top_srcdir)/internal/sanitizers.h
 object.$(OBJEXT): $(top_srcdir)/internal/serial.h
+object.$(OBJEXT): $(top_srcdir)/internal/set_table.h
+object.$(OBJEXT): $(top_srcdir)/internal/st.h
 object.$(OBJEXT): $(top_srcdir)/internal/static_assert.h
 object.$(OBJEXT): $(top_srcdir)/internal/string.h
 object.$(OBJEXT): $(top_srcdir)/internal/struct.h
@@ -10619,6 +12169,7 @@ object.$(OBJEXT): {$(VPATH)}backward/2/stdarg.h
 object.$(OBJEXT): {$(VPATH)}builtin.h
 object.$(OBJEXT): {$(VPATH)}config.h
 object.$(OBJEXT): {$(VPATH)}constant.h
+object.$(OBJEXT): {$(VPATH)}debug_counter.h
 object.$(OBJEXT): {$(VPATH)}defines.h
 object.$(OBJEXT): {$(VPATH)}encoding.h
 object.$(OBJEXT): {$(VPATH)}id.h
@@ -10748,6 +12299,7 @@ object.$(OBJEXT): {$(VPATH)}internal/intern/re.h
 object.$(OBJEXT): {$(VPATH)}internal/intern/ruby.h
 object.$(OBJEXT): {$(VPATH)}internal/intern/select.h
 object.$(OBJEXT): {$(VPATH)}internal/intern/select/largesize.h
+object.$(OBJEXT): {$(VPATH)}internal/intern/set.h
 object.$(OBJEXT): {$(VPATH)}internal/intern/signal.h
 object.$(OBJEXT): {$(VPATH)}internal/intern/sprintf.h
 object.$(OBJEXT): {$(VPATH)}internal/intern/string.h
@@ -10764,9 +12316,11 @@ object.$(OBJEXT): {$(VPATH)}internal/module.h
 object.$(OBJEXT): {$(VPATH)}internal/newobj.h
 object.$(OBJEXT): {$(VPATH)}internal/scan_args.h
 object.$(OBJEXT): {$(VPATH)}internal/special_consts.h
+object.$(OBJEXT): {$(VPATH)}internal/st.h
 object.$(OBJEXT): {$(VPATH)}internal/static_assert.h
 object.$(OBJEXT): {$(VPATH)}internal/stdalign.h
 object.$(OBJEXT): {$(VPATH)}internal/stdbool.h
+object.$(OBJEXT): {$(VPATH)}internal/stdckdint.h
 object.$(OBJEXT): {$(VPATH)}internal/symbol.h
 object.$(OBJEXT): {$(VPATH)}internal/value.h
 object.$(OBJEXT): {$(VPATH)}internal/value_type.h
@@ -10794,7 +12348,10 @@ object.$(OBJEXT): {$(VPATH)}thread_native.h
 object.$(OBJEXT): {$(VPATH)}util.h
 object.$(OBJEXT): {$(VPATH)}variable.h
 object.$(OBJEXT): {$(VPATH)}vm_core.h
+object.$(OBJEXT): {$(VPATH)}vm_debug.h
 object.$(OBJEXT): {$(VPATH)}vm_opts.h
+object.$(OBJEXT): {$(VPATH)}vm_sync.h
+object.$(OBJEXT): {$(VPATH)}yjit.h
 pack.$(OBJEXT): $(CCAN_DIR)/check_type/check_type.h
 pack.$(OBJEXT): $(CCAN_DIR)/container_of/container_of.h
 pack.$(OBJEXT): $(CCAN_DIR)/list/list.h
@@ -10806,7 +12363,10 @@ pack.$(OBJEXT): $(top_srcdir)/internal/bits.h
 pack.$(OBJEXT): $(top_srcdir)/internal/compilers.h
 pack.$(OBJEXT): $(top_srcdir)/internal/gc.h
 pack.$(OBJEXT): $(top_srcdir)/internal/imemo.h
+pack.$(OBJEXT): $(top_srcdir)/internal/namespace.h
+pack.$(OBJEXT): $(top_srcdir)/internal/sanitizers.h
 pack.$(OBJEXT): $(top_srcdir)/internal/serial.h
+pack.$(OBJEXT): $(top_srcdir)/internal/set_table.h
 pack.$(OBJEXT): $(top_srcdir)/internal/static_assert.h
 pack.$(OBJEXT): $(top_srcdir)/internal/string.h
 pack.$(OBJEXT): $(top_srcdir)/internal/symbol.h
@@ -10956,6 +12516,7 @@ pack.$(OBJEXT): {$(VPATH)}internal/intern/re.h
 pack.$(OBJEXT): {$(VPATH)}internal/intern/ruby.h
 pack.$(OBJEXT): {$(VPATH)}internal/intern/select.h
 pack.$(OBJEXT): {$(VPATH)}internal/intern/select/largesize.h
+pack.$(OBJEXT): {$(VPATH)}internal/intern/set.h
 pack.$(OBJEXT): {$(VPATH)}internal/intern/signal.h
 pack.$(OBJEXT): {$(VPATH)}internal/intern/sprintf.h
 pack.$(OBJEXT): {$(VPATH)}internal/intern/string.h
@@ -10975,6 +12536,7 @@ pack.$(OBJEXT): {$(VPATH)}internal/special_consts.h
 pack.$(OBJEXT): {$(VPATH)}internal/static_assert.h
 pack.$(OBJEXT): {$(VPATH)}internal/stdalign.h
 pack.$(OBJEXT): {$(VPATH)}internal/stdbool.h
+pack.$(OBJEXT): {$(VPATH)}internal/stdckdint.h
 pack.$(OBJEXT): {$(VPATH)}internal/symbol.h
 pack.$(OBJEXT): {$(VPATH)}internal/value.h
 pack.$(OBJEXT): {$(VPATH)}internal/value_type.h
@@ -11005,6 +12567,7 @@ parse.$(OBJEXT): $(CCAN_DIR)/list/list.h
 parse.$(OBJEXT): $(CCAN_DIR)/str/str.h
 parse.$(OBJEXT): $(hdrdir)/ruby.h
 parse.$(OBJEXT): $(hdrdir)/ruby/ruby.h
+parse.$(OBJEXT): $(hdrdir)/ruby/version.h
 parse.$(OBJEXT): $(top_srcdir)/internal/array.h
 parse.$(OBJEXT): $(top_srcdir)/internal/basic_operators.h
 parse.$(OBJEXT): $(top_srcdir)/internal/bignum.h
@@ -11019,12 +12582,15 @@ 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/namespace.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/ruby_parser.h
+parse.$(OBJEXT): $(top_srcdir)/internal/sanitizers.h
 parse.$(OBJEXT): $(top_srcdir)/internal/serial.h
+parse.$(OBJEXT): $(top_srcdir)/internal/set_table.h
 parse.$(OBJEXT): $(top_srcdir)/internal/static_assert.h
 parse.$(OBJEXT): $(top_srcdir)/internal/string.h
 parse.$(OBJEXT): $(top_srcdir)/internal/symbol.h
@@ -11175,6 +12741,7 @@ parse.$(OBJEXT): {$(VPATH)}internal/intern/re.h
 parse.$(OBJEXT): {$(VPATH)}internal/intern/ruby.h
 parse.$(OBJEXT): {$(VPATH)}internal/intern/select.h
 parse.$(OBJEXT): {$(VPATH)}internal/intern/select/largesize.h
+parse.$(OBJEXT): {$(VPATH)}internal/intern/set.h
 parse.$(OBJEXT): {$(VPATH)}internal/intern/signal.h
 parse.$(OBJEXT): {$(VPATH)}internal/intern/sprintf.h
 parse.$(OBJEXT): {$(VPATH)}internal/intern/string.h
@@ -11194,6 +12761,7 @@ parse.$(OBJEXT): {$(VPATH)}internal/special_consts.h
 parse.$(OBJEXT): {$(VPATH)}internal/static_assert.h
 parse.$(OBJEXT): {$(VPATH)}internal/stdalign.h
 parse.$(OBJEXT): {$(VPATH)}internal/stdbool.h
+parse.$(OBJEXT): {$(VPATH)}internal/stdckdint.h
 parse.$(OBJEXT): {$(VPATH)}internal/symbol.h
 parse.$(OBJEXT): {$(VPATH)}internal/value.h
 parse.$(OBJEXT): {$(VPATH)}internal/value_type.h
@@ -11292,11 +12860,1003 @@ parser_st.$(OBJEXT): {$(VPATH)}parser_st.c
 parser_st.$(OBJEXT): {$(VPATH)}parser_st.h
 parser_st.$(OBJEXT): {$(VPATH)}parser_value.h
 parser_st.$(OBJEXT): {$(VPATH)}st.c
+prism/api_node.$(OBJEXT): $(hdrdir)/ruby.h
+prism/api_node.$(OBJEXT): $(hdrdir)/ruby/ruby.h
+prism/api_node.$(OBJEXT): $(top_srcdir)/prism/defines.h
+prism/api_node.$(OBJEXT): $(top_srcdir)/prism/encoding.h
+prism/api_node.$(OBJEXT): $(top_srcdir)/prism/extension.h
+prism/api_node.$(OBJEXT): $(top_srcdir)/prism/node.h
+prism/api_node.$(OBJEXT): $(top_srcdir)/prism/options.h
+prism/api_node.$(OBJEXT): $(top_srcdir)/prism/pack.h
+prism/api_node.$(OBJEXT): $(top_srcdir)/prism/parser.h
+prism/api_node.$(OBJEXT): $(top_srcdir)/prism/prettyprint.h
+prism/api_node.$(OBJEXT): $(top_srcdir)/prism/prism.h
+prism/api_node.$(OBJEXT): $(top_srcdir)/prism/regexp.h
+prism/api_node.$(OBJEXT): $(top_srcdir)/prism/static_literals.h
+prism/api_node.$(OBJEXT): $(top_srcdir)/prism/util/pm_buffer.h
+prism/api_node.$(OBJEXT): $(top_srcdir)/prism/util/pm_char.h
+prism/api_node.$(OBJEXT): $(top_srcdir)/prism/util/pm_constant_pool.h
+prism/api_node.$(OBJEXT): $(top_srcdir)/prism/util/pm_integer.h
+prism/api_node.$(OBJEXT): $(top_srcdir)/prism/util/pm_list.h
+prism/api_node.$(OBJEXT): $(top_srcdir)/prism/util/pm_memchr.h
+prism/api_node.$(OBJEXT): $(top_srcdir)/prism/util/pm_newline_list.h
+prism/api_node.$(OBJEXT): $(top_srcdir)/prism/util/pm_string.h
+prism/api_node.$(OBJEXT): $(top_srcdir)/prism/util/pm_strncasecmp.h
+prism/api_node.$(OBJEXT): $(top_srcdir)/prism/util/pm_strpbrk.h
+prism/api_node.$(OBJEXT): {$(VPATH)}assert.h
+prism/api_node.$(OBJEXT): {$(VPATH)}backward/2/assume.h
+prism/api_node.$(OBJEXT): {$(VPATH)}backward/2/attributes.h
+prism/api_node.$(OBJEXT): {$(VPATH)}backward/2/bool.h
+prism/api_node.$(OBJEXT): {$(VPATH)}backward/2/inttypes.h
+prism/api_node.$(OBJEXT): {$(VPATH)}backward/2/limits.h
+prism/api_node.$(OBJEXT): {$(VPATH)}backward/2/long_long.h
+prism/api_node.$(OBJEXT): {$(VPATH)}backward/2/stdalign.h
+prism/api_node.$(OBJEXT): {$(VPATH)}backward/2/stdarg.h
+prism/api_node.$(OBJEXT): {$(VPATH)}config.h
+prism/api_node.$(OBJEXT): {$(VPATH)}defines.h
+prism/api_node.$(OBJEXT): {$(VPATH)}encoding.h
+prism/api_node.$(OBJEXT): {$(VPATH)}intern.h
+prism/api_node.$(OBJEXT): {$(VPATH)}internal/abi.h
+prism/api_node.$(OBJEXT): {$(VPATH)}internal/anyargs.h
+prism/api_node.$(OBJEXT): {$(VPATH)}internal/arithmetic.h
+prism/api_node.$(OBJEXT): {$(VPATH)}internal/arithmetic/char.h
+prism/api_node.$(OBJEXT): {$(VPATH)}internal/arithmetic/double.h
+prism/api_node.$(OBJEXT): {$(VPATH)}internal/arithmetic/fixnum.h
+prism/api_node.$(OBJEXT): {$(VPATH)}internal/arithmetic/gid_t.h
+prism/api_node.$(OBJEXT): {$(VPATH)}internal/arithmetic/int.h
+prism/api_node.$(OBJEXT): {$(VPATH)}internal/arithmetic/intptr_t.h
+prism/api_node.$(OBJEXT): {$(VPATH)}internal/arithmetic/long.h
+prism/api_node.$(OBJEXT): {$(VPATH)}internal/arithmetic/long_long.h
+prism/api_node.$(OBJEXT): {$(VPATH)}internal/arithmetic/mode_t.h
+prism/api_node.$(OBJEXT): {$(VPATH)}internal/arithmetic/off_t.h
+prism/api_node.$(OBJEXT): {$(VPATH)}internal/arithmetic/pid_t.h
+prism/api_node.$(OBJEXT): {$(VPATH)}internal/arithmetic/short.h
+prism/api_node.$(OBJEXT): {$(VPATH)}internal/arithmetic/size_t.h
+prism/api_node.$(OBJEXT): {$(VPATH)}internal/arithmetic/st_data_t.h
+prism/api_node.$(OBJEXT): {$(VPATH)}internal/arithmetic/uid_t.h
+prism/api_node.$(OBJEXT): {$(VPATH)}internal/assume.h
+prism/api_node.$(OBJEXT): {$(VPATH)}internal/attr/alloc_size.h
+prism/api_node.$(OBJEXT): {$(VPATH)}internal/attr/artificial.h
+prism/api_node.$(OBJEXT): {$(VPATH)}internal/attr/cold.h
+prism/api_node.$(OBJEXT): {$(VPATH)}internal/attr/const.h
+prism/api_node.$(OBJEXT): {$(VPATH)}internal/attr/constexpr.h
+prism/api_node.$(OBJEXT): {$(VPATH)}internal/attr/deprecated.h
+prism/api_node.$(OBJEXT): {$(VPATH)}internal/attr/diagnose_if.h
+prism/api_node.$(OBJEXT): {$(VPATH)}internal/attr/enum_extensibility.h
+prism/api_node.$(OBJEXT): {$(VPATH)}internal/attr/error.h
+prism/api_node.$(OBJEXT): {$(VPATH)}internal/attr/flag_enum.h
+prism/api_node.$(OBJEXT): {$(VPATH)}internal/attr/forceinline.h
+prism/api_node.$(OBJEXT): {$(VPATH)}internal/attr/format.h
+prism/api_node.$(OBJEXT): {$(VPATH)}internal/attr/maybe_unused.h
+prism/api_node.$(OBJEXT): {$(VPATH)}internal/attr/noalias.h
+prism/api_node.$(OBJEXT): {$(VPATH)}internal/attr/nodiscard.h
+prism/api_node.$(OBJEXT): {$(VPATH)}internal/attr/noexcept.h
+prism/api_node.$(OBJEXT): {$(VPATH)}internal/attr/noinline.h
+prism/api_node.$(OBJEXT): {$(VPATH)}internal/attr/nonnull.h
+prism/api_node.$(OBJEXT): {$(VPATH)}internal/attr/noreturn.h
+prism/api_node.$(OBJEXT): {$(VPATH)}internal/attr/packed_struct.h
+prism/api_node.$(OBJEXT): {$(VPATH)}internal/attr/pure.h
+prism/api_node.$(OBJEXT): {$(VPATH)}internal/attr/restrict.h
+prism/api_node.$(OBJEXT): {$(VPATH)}internal/attr/returns_nonnull.h
+prism/api_node.$(OBJEXT): {$(VPATH)}internal/attr/warning.h
+prism/api_node.$(OBJEXT): {$(VPATH)}internal/attr/weakref.h
+prism/api_node.$(OBJEXT): {$(VPATH)}internal/cast.h
+prism/api_node.$(OBJEXT): {$(VPATH)}internal/compiler_is.h
+prism/api_node.$(OBJEXT): {$(VPATH)}internal/compiler_is/apple.h
+prism/api_node.$(OBJEXT): {$(VPATH)}internal/compiler_is/clang.h
+prism/api_node.$(OBJEXT): {$(VPATH)}internal/compiler_is/gcc.h
+prism/api_node.$(OBJEXT): {$(VPATH)}internal/compiler_is/intel.h
+prism/api_node.$(OBJEXT): {$(VPATH)}internal/compiler_is/msvc.h
+prism/api_node.$(OBJEXT): {$(VPATH)}internal/compiler_is/sunpro.h
+prism/api_node.$(OBJEXT): {$(VPATH)}internal/compiler_since.h
+prism/api_node.$(OBJEXT): {$(VPATH)}internal/config.h
+prism/api_node.$(OBJEXT): {$(VPATH)}internal/constant_p.h
+prism/api_node.$(OBJEXT): {$(VPATH)}internal/core.h
+prism/api_node.$(OBJEXT): {$(VPATH)}internal/core/rarray.h
+prism/api_node.$(OBJEXT): {$(VPATH)}internal/core/rbasic.h
+prism/api_node.$(OBJEXT): {$(VPATH)}internal/core/rbignum.h
+prism/api_node.$(OBJEXT): {$(VPATH)}internal/core/rclass.h
+prism/api_node.$(OBJEXT): {$(VPATH)}internal/core/rdata.h
+prism/api_node.$(OBJEXT): {$(VPATH)}internal/core/rfile.h
+prism/api_node.$(OBJEXT): {$(VPATH)}internal/core/rhash.h
+prism/api_node.$(OBJEXT): {$(VPATH)}internal/core/robject.h
+prism/api_node.$(OBJEXT): {$(VPATH)}internal/core/rregexp.h
+prism/api_node.$(OBJEXT): {$(VPATH)}internal/core/rstring.h
+prism/api_node.$(OBJEXT): {$(VPATH)}internal/core/rstruct.h
+prism/api_node.$(OBJEXT): {$(VPATH)}internal/core/rtypeddata.h
+prism/api_node.$(OBJEXT): {$(VPATH)}internal/ctype.h
+prism/api_node.$(OBJEXT): {$(VPATH)}internal/dllexport.h
+prism/api_node.$(OBJEXT): {$(VPATH)}internal/dosish.h
+prism/api_node.$(OBJEXT): {$(VPATH)}internal/encoding/coderange.h
+prism/api_node.$(OBJEXT): {$(VPATH)}internal/encoding/ctype.h
+prism/api_node.$(OBJEXT): {$(VPATH)}internal/encoding/encoding.h
+prism/api_node.$(OBJEXT): {$(VPATH)}internal/encoding/pathname.h
+prism/api_node.$(OBJEXT): {$(VPATH)}internal/encoding/re.h
+prism/api_node.$(OBJEXT): {$(VPATH)}internal/encoding/sprintf.h
+prism/api_node.$(OBJEXT): {$(VPATH)}internal/encoding/string.h
+prism/api_node.$(OBJEXT): {$(VPATH)}internal/encoding/symbol.h
+prism/api_node.$(OBJEXT): {$(VPATH)}internal/encoding/transcode.h
+prism/api_node.$(OBJEXT): {$(VPATH)}internal/error.h
+prism/api_node.$(OBJEXT): {$(VPATH)}internal/eval.h
+prism/api_node.$(OBJEXT): {$(VPATH)}internal/event.h
+prism/api_node.$(OBJEXT): {$(VPATH)}internal/fl_type.h
+prism/api_node.$(OBJEXT): {$(VPATH)}internal/gc.h
+prism/api_node.$(OBJEXT): {$(VPATH)}internal/glob.h
+prism/api_node.$(OBJEXT): {$(VPATH)}internal/globals.h
+prism/api_node.$(OBJEXT): {$(VPATH)}internal/has/attribute.h
+prism/api_node.$(OBJEXT): {$(VPATH)}internal/has/builtin.h
+prism/api_node.$(OBJEXT): {$(VPATH)}internal/has/c_attribute.h
+prism/api_node.$(OBJEXT): {$(VPATH)}internal/has/cpp_attribute.h
+prism/api_node.$(OBJEXT): {$(VPATH)}internal/has/declspec_attribute.h
+prism/api_node.$(OBJEXT): {$(VPATH)}internal/has/extension.h
+prism/api_node.$(OBJEXT): {$(VPATH)}internal/has/feature.h
+prism/api_node.$(OBJEXT): {$(VPATH)}internal/has/warning.h
+prism/api_node.$(OBJEXT): {$(VPATH)}internal/intern/array.h
+prism/api_node.$(OBJEXT): {$(VPATH)}internal/intern/bignum.h
+prism/api_node.$(OBJEXT): {$(VPATH)}internal/intern/class.h
+prism/api_node.$(OBJEXT): {$(VPATH)}internal/intern/compar.h
+prism/api_node.$(OBJEXT): {$(VPATH)}internal/intern/complex.h
+prism/api_node.$(OBJEXT): {$(VPATH)}internal/intern/cont.h
+prism/api_node.$(OBJEXT): {$(VPATH)}internal/intern/dir.h
+prism/api_node.$(OBJEXT): {$(VPATH)}internal/intern/enum.h
+prism/api_node.$(OBJEXT): {$(VPATH)}internal/intern/enumerator.h
+prism/api_node.$(OBJEXT): {$(VPATH)}internal/intern/error.h
+prism/api_node.$(OBJEXT): {$(VPATH)}internal/intern/eval.h
+prism/api_node.$(OBJEXT): {$(VPATH)}internal/intern/file.h
+prism/api_node.$(OBJEXT): {$(VPATH)}internal/intern/hash.h
+prism/api_node.$(OBJEXT): {$(VPATH)}internal/intern/io.h
+prism/api_node.$(OBJEXT): {$(VPATH)}internal/intern/load.h
+prism/api_node.$(OBJEXT): {$(VPATH)}internal/intern/marshal.h
+prism/api_node.$(OBJEXT): {$(VPATH)}internal/intern/numeric.h
+prism/api_node.$(OBJEXT): {$(VPATH)}internal/intern/object.h
+prism/api_node.$(OBJEXT): {$(VPATH)}internal/intern/parse.h
+prism/api_node.$(OBJEXT): {$(VPATH)}internal/intern/proc.h
+prism/api_node.$(OBJEXT): {$(VPATH)}internal/intern/process.h
+prism/api_node.$(OBJEXT): {$(VPATH)}internal/intern/random.h
+prism/api_node.$(OBJEXT): {$(VPATH)}internal/intern/range.h
+prism/api_node.$(OBJEXT): {$(VPATH)}internal/intern/rational.h
+prism/api_node.$(OBJEXT): {$(VPATH)}internal/intern/re.h
+prism/api_node.$(OBJEXT): {$(VPATH)}internal/intern/ruby.h
+prism/api_node.$(OBJEXT): {$(VPATH)}internal/intern/select.h
+prism/api_node.$(OBJEXT): {$(VPATH)}internal/intern/select/largesize.h
+prism/api_node.$(OBJEXT): {$(VPATH)}internal/intern/set.h
+prism/api_node.$(OBJEXT): {$(VPATH)}internal/intern/signal.h
+prism/api_node.$(OBJEXT): {$(VPATH)}internal/intern/sprintf.h
+prism/api_node.$(OBJEXT): {$(VPATH)}internal/intern/string.h
+prism/api_node.$(OBJEXT): {$(VPATH)}internal/intern/struct.h
+prism/api_node.$(OBJEXT): {$(VPATH)}internal/intern/thread.h
+prism/api_node.$(OBJEXT): {$(VPATH)}internal/intern/time.h
+prism/api_node.$(OBJEXT): {$(VPATH)}internal/intern/variable.h
+prism/api_node.$(OBJEXT): {$(VPATH)}internal/intern/vm.h
+prism/api_node.$(OBJEXT): {$(VPATH)}internal/interpreter.h
+prism/api_node.$(OBJEXT): {$(VPATH)}internal/iterator.h
+prism/api_node.$(OBJEXT): {$(VPATH)}internal/memory.h
+prism/api_node.$(OBJEXT): {$(VPATH)}internal/method.h
+prism/api_node.$(OBJEXT): {$(VPATH)}internal/module.h
+prism/api_node.$(OBJEXT): {$(VPATH)}internal/newobj.h
+prism/api_node.$(OBJEXT): {$(VPATH)}internal/scan_args.h
+prism/api_node.$(OBJEXT): {$(VPATH)}internal/special_consts.h
+prism/api_node.$(OBJEXT): {$(VPATH)}internal/static_assert.h
+prism/api_node.$(OBJEXT): {$(VPATH)}internal/stdalign.h
+prism/api_node.$(OBJEXT): {$(VPATH)}internal/stdbool.h
+prism/api_node.$(OBJEXT): {$(VPATH)}internal/stdckdint.h
+prism/api_node.$(OBJEXT): {$(VPATH)}internal/symbol.h
+prism/api_node.$(OBJEXT): {$(VPATH)}internal/value.h
+prism/api_node.$(OBJEXT): {$(VPATH)}internal/value_type.h
+prism/api_node.$(OBJEXT): {$(VPATH)}internal/variable.h
+prism/api_node.$(OBJEXT): {$(VPATH)}internal/warning_push.h
+prism/api_node.$(OBJEXT): {$(VPATH)}internal/xmalloc.h
+prism/api_node.$(OBJEXT): {$(VPATH)}missing.h
+prism/api_node.$(OBJEXT): {$(VPATH)}onigmo.h
+prism/api_node.$(OBJEXT): {$(VPATH)}oniguruma.h
+prism/api_node.$(OBJEXT): {$(VPATH)}prism/api_node.c
+prism/api_node.$(OBJEXT): {$(VPATH)}prism/ast.h
+prism/api_node.$(OBJEXT): {$(VPATH)}prism/diagnostic.h
+prism/api_node.$(OBJEXT): {$(VPATH)}prism/version.h
+prism/api_node.$(OBJEXT): {$(VPATH)}st.h
+prism/api_node.$(OBJEXT): {$(VPATH)}subst.h
+prism/api_pack.$(OBJEXT): $(hdrdir)/ruby.h
+prism/api_pack.$(OBJEXT): $(hdrdir)/ruby/ruby.h
+prism/api_pack.$(OBJEXT): $(top_srcdir)/prism/api_pack.c
+prism/api_pack.$(OBJEXT): $(top_srcdir)/prism/defines.h
+prism/api_pack.$(OBJEXT): $(top_srcdir)/prism/encoding.h
+prism/api_pack.$(OBJEXT): $(top_srcdir)/prism/extension.h
+prism/api_pack.$(OBJEXT): $(top_srcdir)/prism/node.h
+prism/api_pack.$(OBJEXT): $(top_srcdir)/prism/options.h
+prism/api_pack.$(OBJEXT): $(top_srcdir)/prism/pack.h
+prism/api_pack.$(OBJEXT): $(top_srcdir)/prism/parser.h
+prism/api_pack.$(OBJEXT): $(top_srcdir)/prism/prettyprint.h
+prism/api_pack.$(OBJEXT): $(top_srcdir)/prism/prism.h
+prism/api_pack.$(OBJEXT): $(top_srcdir)/prism/regexp.h
+prism/api_pack.$(OBJEXT): $(top_srcdir)/prism/static_literals.h
+prism/api_pack.$(OBJEXT): $(top_srcdir)/prism/util/pm_buffer.h
+prism/api_pack.$(OBJEXT): $(top_srcdir)/prism/util/pm_char.h
+prism/api_pack.$(OBJEXT): $(top_srcdir)/prism/util/pm_constant_pool.h
+prism/api_pack.$(OBJEXT): $(top_srcdir)/prism/util/pm_integer.h
+prism/api_pack.$(OBJEXT): $(top_srcdir)/prism/util/pm_list.h
+prism/api_pack.$(OBJEXT): $(top_srcdir)/prism/util/pm_memchr.h
+prism/api_pack.$(OBJEXT): $(top_srcdir)/prism/util/pm_newline_list.h
+prism/api_pack.$(OBJEXT): $(top_srcdir)/prism/util/pm_string.h
+prism/api_pack.$(OBJEXT): $(top_srcdir)/prism/util/pm_strncasecmp.h
+prism/api_pack.$(OBJEXT): $(top_srcdir)/prism/util/pm_strpbrk.h
+prism/api_pack.$(OBJEXT): {$(VPATH)}assert.h
+prism/api_pack.$(OBJEXT): {$(VPATH)}backward/2/assume.h
+prism/api_pack.$(OBJEXT): {$(VPATH)}backward/2/attributes.h
+prism/api_pack.$(OBJEXT): {$(VPATH)}backward/2/bool.h
+prism/api_pack.$(OBJEXT): {$(VPATH)}backward/2/inttypes.h
+prism/api_pack.$(OBJEXT): {$(VPATH)}backward/2/limits.h
+prism/api_pack.$(OBJEXT): {$(VPATH)}backward/2/long_long.h
+prism/api_pack.$(OBJEXT): {$(VPATH)}backward/2/stdalign.h
+prism/api_pack.$(OBJEXT): {$(VPATH)}backward/2/stdarg.h
+prism/api_pack.$(OBJEXT): {$(VPATH)}config.h
+prism/api_pack.$(OBJEXT): {$(VPATH)}defines.h
+prism/api_pack.$(OBJEXT): {$(VPATH)}encoding.h
+prism/api_pack.$(OBJEXT): {$(VPATH)}intern.h
+prism/api_pack.$(OBJEXT): {$(VPATH)}internal/abi.h
+prism/api_pack.$(OBJEXT): {$(VPATH)}internal/anyargs.h
+prism/api_pack.$(OBJEXT): {$(VPATH)}internal/arithmetic.h
+prism/api_pack.$(OBJEXT): {$(VPATH)}internal/arithmetic/char.h
+prism/api_pack.$(OBJEXT): {$(VPATH)}internal/arithmetic/double.h
+prism/api_pack.$(OBJEXT): {$(VPATH)}internal/arithmetic/fixnum.h
+prism/api_pack.$(OBJEXT): {$(VPATH)}internal/arithmetic/gid_t.h
+prism/api_pack.$(OBJEXT): {$(VPATH)}internal/arithmetic/int.h
+prism/api_pack.$(OBJEXT): {$(VPATH)}internal/arithmetic/intptr_t.h
+prism/api_pack.$(OBJEXT): {$(VPATH)}internal/arithmetic/long.h
+prism/api_pack.$(OBJEXT): {$(VPATH)}internal/arithmetic/long_long.h
+prism/api_pack.$(OBJEXT): {$(VPATH)}internal/arithmetic/mode_t.h
+prism/api_pack.$(OBJEXT): {$(VPATH)}internal/arithmetic/off_t.h
+prism/api_pack.$(OBJEXT): {$(VPATH)}internal/arithmetic/pid_t.h
+prism/api_pack.$(OBJEXT): {$(VPATH)}internal/arithmetic/short.h
+prism/api_pack.$(OBJEXT): {$(VPATH)}internal/arithmetic/size_t.h
+prism/api_pack.$(OBJEXT): {$(VPATH)}internal/arithmetic/st_data_t.h
+prism/api_pack.$(OBJEXT): {$(VPATH)}internal/arithmetic/uid_t.h
+prism/api_pack.$(OBJEXT): {$(VPATH)}internal/assume.h
+prism/api_pack.$(OBJEXT): {$(VPATH)}internal/attr/alloc_size.h
+prism/api_pack.$(OBJEXT): {$(VPATH)}internal/attr/artificial.h
+prism/api_pack.$(OBJEXT): {$(VPATH)}internal/attr/cold.h
+prism/api_pack.$(OBJEXT): {$(VPATH)}internal/attr/const.h
+prism/api_pack.$(OBJEXT): {$(VPATH)}internal/attr/constexpr.h
+prism/api_pack.$(OBJEXT): {$(VPATH)}internal/attr/deprecated.h
+prism/api_pack.$(OBJEXT): {$(VPATH)}internal/attr/diagnose_if.h
+prism/api_pack.$(OBJEXT): {$(VPATH)}internal/attr/enum_extensibility.h
+prism/api_pack.$(OBJEXT): {$(VPATH)}internal/attr/error.h
+prism/api_pack.$(OBJEXT): {$(VPATH)}internal/attr/flag_enum.h
+prism/api_pack.$(OBJEXT): {$(VPATH)}internal/attr/forceinline.h
+prism/api_pack.$(OBJEXT): {$(VPATH)}internal/attr/format.h
+prism/api_pack.$(OBJEXT): {$(VPATH)}internal/attr/maybe_unused.h
+prism/api_pack.$(OBJEXT): {$(VPATH)}internal/attr/noalias.h
+prism/api_pack.$(OBJEXT): {$(VPATH)}internal/attr/nodiscard.h
+prism/api_pack.$(OBJEXT): {$(VPATH)}internal/attr/noexcept.h
+prism/api_pack.$(OBJEXT): {$(VPATH)}internal/attr/noinline.h
+prism/api_pack.$(OBJEXT): {$(VPATH)}internal/attr/nonnull.h
+prism/api_pack.$(OBJEXT): {$(VPATH)}internal/attr/noreturn.h
+prism/api_pack.$(OBJEXT): {$(VPATH)}internal/attr/packed_struct.h
+prism/api_pack.$(OBJEXT): {$(VPATH)}internal/attr/pure.h
+prism/api_pack.$(OBJEXT): {$(VPATH)}internal/attr/restrict.h
+prism/api_pack.$(OBJEXT): {$(VPATH)}internal/attr/returns_nonnull.h
+prism/api_pack.$(OBJEXT): {$(VPATH)}internal/attr/warning.h
+prism/api_pack.$(OBJEXT): {$(VPATH)}internal/attr/weakref.h
+prism/api_pack.$(OBJEXT): {$(VPATH)}internal/cast.h
+prism/api_pack.$(OBJEXT): {$(VPATH)}internal/compiler_is.h
+prism/api_pack.$(OBJEXT): {$(VPATH)}internal/compiler_is/apple.h
+prism/api_pack.$(OBJEXT): {$(VPATH)}internal/compiler_is/clang.h
+prism/api_pack.$(OBJEXT): {$(VPATH)}internal/compiler_is/gcc.h
+prism/api_pack.$(OBJEXT): {$(VPATH)}internal/compiler_is/intel.h
+prism/api_pack.$(OBJEXT): {$(VPATH)}internal/compiler_is/msvc.h
+prism/api_pack.$(OBJEXT): {$(VPATH)}internal/compiler_is/sunpro.h
+prism/api_pack.$(OBJEXT): {$(VPATH)}internal/compiler_since.h
+prism/api_pack.$(OBJEXT): {$(VPATH)}internal/config.h
+prism/api_pack.$(OBJEXT): {$(VPATH)}internal/constant_p.h
+prism/api_pack.$(OBJEXT): {$(VPATH)}internal/core.h
+prism/api_pack.$(OBJEXT): {$(VPATH)}internal/core/rarray.h
+prism/api_pack.$(OBJEXT): {$(VPATH)}internal/core/rbasic.h
+prism/api_pack.$(OBJEXT): {$(VPATH)}internal/core/rbignum.h
+prism/api_pack.$(OBJEXT): {$(VPATH)}internal/core/rclass.h
+prism/api_pack.$(OBJEXT): {$(VPATH)}internal/core/rdata.h
+prism/api_pack.$(OBJEXT): {$(VPATH)}internal/core/rfile.h
+prism/api_pack.$(OBJEXT): {$(VPATH)}internal/core/rhash.h
+prism/api_pack.$(OBJEXT): {$(VPATH)}internal/core/robject.h
+prism/api_pack.$(OBJEXT): {$(VPATH)}internal/core/rregexp.h
+prism/api_pack.$(OBJEXT): {$(VPATH)}internal/core/rstring.h
+prism/api_pack.$(OBJEXT): {$(VPATH)}internal/core/rstruct.h
+prism/api_pack.$(OBJEXT): {$(VPATH)}internal/core/rtypeddata.h
+prism/api_pack.$(OBJEXT): {$(VPATH)}internal/ctype.h
+prism/api_pack.$(OBJEXT): {$(VPATH)}internal/dllexport.h
+prism/api_pack.$(OBJEXT): {$(VPATH)}internal/dosish.h
+prism/api_pack.$(OBJEXT): {$(VPATH)}internal/encoding/coderange.h
+prism/api_pack.$(OBJEXT): {$(VPATH)}internal/encoding/ctype.h
+prism/api_pack.$(OBJEXT): {$(VPATH)}internal/encoding/encoding.h
+prism/api_pack.$(OBJEXT): {$(VPATH)}internal/encoding/pathname.h
+prism/api_pack.$(OBJEXT): {$(VPATH)}internal/encoding/re.h
+prism/api_pack.$(OBJEXT): {$(VPATH)}internal/encoding/sprintf.h
+prism/api_pack.$(OBJEXT): {$(VPATH)}internal/encoding/string.h
+prism/api_pack.$(OBJEXT): {$(VPATH)}internal/encoding/symbol.h
+prism/api_pack.$(OBJEXT): {$(VPATH)}internal/encoding/transcode.h
+prism/api_pack.$(OBJEXT): {$(VPATH)}internal/error.h
+prism/api_pack.$(OBJEXT): {$(VPATH)}internal/eval.h
+prism/api_pack.$(OBJEXT): {$(VPATH)}internal/event.h
+prism/api_pack.$(OBJEXT): {$(VPATH)}internal/fl_type.h
+prism/api_pack.$(OBJEXT): {$(VPATH)}internal/gc.h
+prism/api_pack.$(OBJEXT): {$(VPATH)}internal/glob.h
+prism/api_pack.$(OBJEXT): {$(VPATH)}internal/globals.h
+prism/api_pack.$(OBJEXT): {$(VPATH)}internal/has/attribute.h
+prism/api_pack.$(OBJEXT): {$(VPATH)}internal/has/builtin.h
+prism/api_pack.$(OBJEXT): {$(VPATH)}internal/has/c_attribute.h
+prism/api_pack.$(OBJEXT): {$(VPATH)}internal/has/cpp_attribute.h
+prism/api_pack.$(OBJEXT): {$(VPATH)}internal/has/declspec_attribute.h
+prism/api_pack.$(OBJEXT): {$(VPATH)}internal/has/extension.h
+prism/api_pack.$(OBJEXT): {$(VPATH)}internal/has/feature.h
+prism/api_pack.$(OBJEXT): {$(VPATH)}internal/has/warning.h
+prism/api_pack.$(OBJEXT): {$(VPATH)}internal/intern/array.h
+prism/api_pack.$(OBJEXT): {$(VPATH)}internal/intern/bignum.h
+prism/api_pack.$(OBJEXT): {$(VPATH)}internal/intern/class.h
+prism/api_pack.$(OBJEXT): {$(VPATH)}internal/intern/compar.h
+prism/api_pack.$(OBJEXT): {$(VPATH)}internal/intern/complex.h
+prism/api_pack.$(OBJEXT): {$(VPATH)}internal/intern/cont.h
+prism/api_pack.$(OBJEXT): {$(VPATH)}internal/intern/dir.h
+prism/api_pack.$(OBJEXT): {$(VPATH)}internal/intern/enum.h
+prism/api_pack.$(OBJEXT): {$(VPATH)}internal/intern/enumerator.h
+prism/api_pack.$(OBJEXT): {$(VPATH)}internal/intern/error.h
+prism/api_pack.$(OBJEXT): {$(VPATH)}internal/intern/eval.h
+prism/api_pack.$(OBJEXT): {$(VPATH)}internal/intern/file.h
+prism/api_pack.$(OBJEXT): {$(VPATH)}internal/intern/hash.h
+prism/api_pack.$(OBJEXT): {$(VPATH)}internal/intern/io.h
+prism/api_pack.$(OBJEXT): {$(VPATH)}internal/intern/load.h
+prism/api_pack.$(OBJEXT): {$(VPATH)}internal/intern/marshal.h
+prism/api_pack.$(OBJEXT): {$(VPATH)}internal/intern/numeric.h
+prism/api_pack.$(OBJEXT): {$(VPATH)}internal/intern/object.h
+prism/api_pack.$(OBJEXT): {$(VPATH)}internal/intern/parse.h
+prism/api_pack.$(OBJEXT): {$(VPATH)}internal/intern/proc.h
+prism/api_pack.$(OBJEXT): {$(VPATH)}internal/intern/process.h
+prism/api_pack.$(OBJEXT): {$(VPATH)}internal/intern/random.h
+prism/api_pack.$(OBJEXT): {$(VPATH)}internal/intern/range.h
+prism/api_pack.$(OBJEXT): {$(VPATH)}internal/intern/rational.h
+prism/api_pack.$(OBJEXT): {$(VPATH)}internal/intern/re.h
+prism/api_pack.$(OBJEXT): {$(VPATH)}internal/intern/ruby.h
+prism/api_pack.$(OBJEXT): {$(VPATH)}internal/intern/select.h
+prism/api_pack.$(OBJEXT): {$(VPATH)}internal/intern/select/largesize.h
+prism/api_pack.$(OBJEXT): {$(VPATH)}internal/intern/set.h
+prism/api_pack.$(OBJEXT): {$(VPATH)}internal/intern/signal.h
+prism/api_pack.$(OBJEXT): {$(VPATH)}internal/intern/sprintf.h
+prism/api_pack.$(OBJEXT): {$(VPATH)}internal/intern/string.h
+prism/api_pack.$(OBJEXT): {$(VPATH)}internal/intern/struct.h
+prism/api_pack.$(OBJEXT): {$(VPATH)}internal/intern/thread.h
+prism/api_pack.$(OBJEXT): {$(VPATH)}internal/intern/time.h
+prism/api_pack.$(OBJEXT): {$(VPATH)}internal/intern/variable.h
+prism/api_pack.$(OBJEXT): {$(VPATH)}internal/intern/vm.h
+prism/api_pack.$(OBJEXT): {$(VPATH)}internal/interpreter.h
+prism/api_pack.$(OBJEXT): {$(VPATH)}internal/iterator.h
+prism/api_pack.$(OBJEXT): {$(VPATH)}internal/memory.h
+prism/api_pack.$(OBJEXT): {$(VPATH)}internal/method.h
+prism/api_pack.$(OBJEXT): {$(VPATH)}internal/module.h
+prism/api_pack.$(OBJEXT): {$(VPATH)}internal/newobj.h
+prism/api_pack.$(OBJEXT): {$(VPATH)}internal/scan_args.h
+prism/api_pack.$(OBJEXT): {$(VPATH)}internal/special_consts.h
+prism/api_pack.$(OBJEXT): {$(VPATH)}internal/static_assert.h
+prism/api_pack.$(OBJEXT): {$(VPATH)}internal/stdalign.h
+prism/api_pack.$(OBJEXT): {$(VPATH)}internal/stdbool.h
+prism/api_pack.$(OBJEXT): {$(VPATH)}internal/stdckdint.h
+prism/api_pack.$(OBJEXT): {$(VPATH)}internal/symbol.h
+prism/api_pack.$(OBJEXT): {$(VPATH)}internal/value.h
+prism/api_pack.$(OBJEXT): {$(VPATH)}internal/value_type.h
+prism/api_pack.$(OBJEXT): {$(VPATH)}internal/variable.h
+prism/api_pack.$(OBJEXT): {$(VPATH)}internal/warning_push.h
+prism/api_pack.$(OBJEXT): {$(VPATH)}internal/xmalloc.h
+prism/api_pack.$(OBJEXT): {$(VPATH)}missing.h
+prism/api_pack.$(OBJEXT): {$(VPATH)}onigmo.h
+prism/api_pack.$(OBJEXT): {$(VPATH)}oniguruma.h
+prism/api_pack.$(OBJEXT): {$(VPATH)}prism/ast.h
+prism/api_pack.$(OBJEXT): {$(VPATH)}prism/diagnostic.h
+prism/api_pack.$(OBJEXT): {$(VPATH)}prism/version.h
+prism/api_pack.$(OBJEXT): {$(VPATH)}st.h
+prism/api_pack.$(OBJEXT): {$(VPATH)}subst.h
+prism/diagnostic.$(OBJEXT): $(top_srcdir)/prism/defines.h
+prism/diagnostic.$(OBJEXT): $(top_srcdir)/prism/util/pm_buffer.h
+prism/diagnostic.$(OBJEXT): $(top_srcdir)/prism/util/pm_char.h
+prism/diagnostic.$(OBJEXT): $(top_srcdir)/prism/util/pm_constant_pool.h
+prism/diagnostic.$(OBJEXT): $(top_srcdir)/prism/util/pm_integer.h
+prism/diagnostic.$(OBJEXT): $(top_srcdir)/prism/util/pm_list.h
+prism/diagnostic.$(OBJEXT): $(top_srcdir)/prism/util/pm_newline_list.h
+prism/diagnostic.$(OBJEXT): $(top_srcdir)/prism/util/pm_string.h
+prism/diagnostic.$(OBJEXT): {$(VPATH)}prism/ast.h
+prism/diagnostic.$(OBJEXT): {$(VPATH)}prism/diagnostic.c
+prism/diagnostic.$(OBJEXT): {$(VPATH)}prism/diagnostic.h
+prism/encoding.$(OBJEXT): $(top_srcdir)/prism/defines.h
+prism/encoding.$(OBJEXT): $(top_srcdir)/prism/encoding.c
+prism/encoding.$(OBJEXT): $(top_srcdir)/prism/encoding.h
+prism/encoding.$(OBJEXT): $(top_srcdir)/prism/util/pm_strncasecmp.h
+prism/extension.$(OBJEXT): $(hdrdir)/ruby.h
+prism/extension.$(OBJEXT): $(hdrdir)/ruby/ruby.h
+prism/extension.$(OBJEXT): $(top_srcdir)/prism/defines.h
+prism/extension.$(OBJEXT): $(top_srcdir)/prism/encoding.h
+prism/extension.$(OBJEXT): $(top_srcdir)/prism/extension.c
+prism/extension.$(OBJEXT): $(top_srcdir)/prism/extension.h
+prism/extension.$(OBJEXT): $(top_srcdir)/prism/node.h
+prism/extension.$(OBJEXT): $(top_srcdir)/prism/options.h
+prism/extension.$(OBJEXT): $(top_srcdir)/prism/pack.h
+prism/extension.$(OBJEXT): $(top_srcdir)/prism/parser.h
+prism/extension.$(OBJEXT): $(top_srcdir)/prism/prettyprint.h
+prism/extension.$(OBJEXT): $(top_srcdir)/prism/prism.h
+prism/extension.$(OBJEXT): $(top_srcdir)/prism/regexp.h
+prism/extension.$(OBJEXT): $(top_srcdir)/prism/static_literals.h
+prism/extension.$(OBJEXT): $(top_srcdir)/prism/util/pm_buffer.h
+prism/extension.$(OBJEXT): $(top_srcdir)/prism/util/pm_char.h
+prism/extension.$(OBJEXT): $(top_srcdir)/prism/util/pm_constant_pool.h
+prism/extension.$(OBJEXT): $(top_srcdir)/prism/util/pm_integer.h
+prism/extension.$(OBJEXT): $(top_srcdir)/prism/util/pm_list.h
+prism/extension.$(OBJEXT): $(top_srcdir)/prism/util/pm_memchr.h
+prism/extension.$(OBJEXT): $(top_srcdir)/prism/util/pm_newline_list.h
+prism/extension.$(OBJEXT): $(top_srcdir)/prism/util/pm_string.h
+prism/extension.$(OBJEXT): $(top_srcdir)/prism/util/pm_strncasecmp.h
+prism/extension.$(OBJEXT): $(top_srcdir)/prism/util/pm_strpbrk.h
+prism/extension.$(OBJEXT): {$(VPATH)}assert.h
+prism/extension.$(OBJEXT): {$(VPATH)}backward/2/assume.h
+prism/extension.$(OBJEXT): {$(VPATH)}backward/2/attributes.h
+prism/extension.$(OBJEXT): {$(VPATH)}backward/2/bool.h
+prism/extension.$(OBJEXT): {$(VPATH)}backward/2/inttypes.h
+prism/extension.$(OBJEXT): {$(VPATH)}backward/2/limits.h
+prism/extension.$(OBJEXT): {$(VPATH)}backward/2/long_long.h
+prism/extension.$(OBJEXT): {$(VPATH)}backward/2/stdalign.h
+prism/extension.$(OBJEXT): {$(VPATH)}backward/2/stdarg.h
+prism/extension.$(OBJEXT): {$(VPATH)}config.h
+prism/extension.$(OBJEXT): {$(VPATH)}defines.h
+prism/extension.$(OBJEXT): {$(VPATH)}encoding.h
+prism/extension.$(OBJEXT): {$(VPATH)}intern.h
+prism/extension.$(OBJEXT): {$(VPATH)}internal/abi.h
+prism/extension.$(OBJEXT): {$(VPATH)}internal/anyargs.h
+prism/extension.$(OBJEXT): {$(VPATH)}internal/arithmetic.h
+prism/extension.$(OBJEXT): {$(VPATH)}internal/arithmetic/char.h
+prism/extension.$(OBJEXT): {$(VPATH)}internal/arithmetic/double.h
+prism/extension.$(OBJEXT): {$(VPATH)}internal/arithmetic/fixnum.h
+prism/extension.$(OBJEXT): {$(VPATH)}internal/arithmetic/gid_t.h
+prism/extension.$(OBJEXT): {$(VPATH)}internal/arithmetic/int.h
+prism/extension.$(OBJEXT): {$(VPATH)}internal/arithmetic/intptr_t.h
+prism/extension.$(OBJEXT): {$(VPATH)}internal/arithmetic/long.h
+prism/extension.$(OBJEXT): {$(VPATH)}internal/arithmetic/long_long.h
+prism/extension.$(OBJEXT): {$(VPATH)}internal/arithmetic/mode_t.h
+prism/extension.$(OBJEXT): {$(VPATH)}internal/arithmetic/off_t.h
+prism/extension.$(OBJEXT): {$(VPATH)}internal/arithmetic/pid_t.h
+prism/extension.$(OBJEXT): {$(VPATH)}internal/arithmetic/short.h
+prism/extension.$(OBJEXT): {$(VPATH)}internal/arithmetic/size_t.h
+prism/extension.$(OBJEXT): {$(VPATH)}internal/arithmetic/st_data_t.h
+prism/extension.$(OBJEXT): {$(VPATH)}internal/arithmetic/uid_t.h
+prism/extension.$(OBJEXT): {$(VPATH)}internal/assume.h
+prism/extension.$(OBJEXT): {$(VPATH)}internal/attr/alloc_size.h
+prism/extension.$(OBJEXT): {$(VPATH)}internal/attr/artificial.h
+prism/extension.$(OBJEXT): {$(VPATH)}internal/attr/cold.h
+prism/extension.$(OBJEXT): {$(VPATH)}internal/attr/const.h
+prism/extension.$(OBJEXT): {$(VPATH)}internal/attr/constexpr.h
+prism/extension.$(OBJEXT): {$(VPATH)}internal/attr/deprecated.h
+prism/extension.$(OBJEXT): {$(VPATH)}internal/attr/diagnose_if.h
+prism/extension.$(OBJEXT): {$(VPATH)}internal/attr/enum_extensibility.h
+prism/extension.$(OBJEXT): {$(VPATH)}internal/attr/error.h
+prism/extension.$(OBJEXT): {$(VPATH)}internal/attr/flag_enum.h
+prism/extension.$(OBJEXT): {$(VPATH)}internal/attr/forceinline.h
+prism/extension.$(OBJEXT): {$(VPATH)}internal/attr/format.h
+prism/extension.$(OBJEXT): {$(VPATH)}internal/attr/maybe_unused.h
+prism/extension.$(OBJEXT): {$(VPATH)}internal/attr/noalias.h
+prism/extension.$(OBJEXT): {$(VPATH)}internal/attr/nodiscard.h
+prism/extension.$(OBJEXT): {$(VPATH)}internal/attr/noexcept.h
+prism/extension.$(OBJEXT): {$(VPATH)}internal/attr/noinline.h
+prism/extension.$(OBJEXT): {$(VPATH)}internal/attr/nonnull.h
+prism/extension.$(OBJEXT): {$(VPATH)}internal/attr/noreturn.h
+prism/extension.$(OBJEXT): {$(VPATH)}internal/attr/packed_struct.h
+prism/extension.$(OBJEXT): {$(VPATH)}internal/attr/pure.h
+prism/extension.$(OBJEXT): {$(VPATH)}internal/attr/restrict.h
+prism/extension.$(OBJEXT): {$(VPATH)}internal/attr/returns_nonnull.h
+prism/extension.$(OBJEXT): {$(VPATH)}internal/attr/warning.h
+prism/extension.$(OBJEXT): {$(VPATH)}internal/attr/weakref.h
+prism/extension.$(OBJEXT): {$(VPATH)}internal/cast.h
+prism/extension.$(OBJEXT): {$(VPATH)}internal/compiler_is.h
+prism/extension.$(OBJEXT): {$(VPATH)}internal/compiler_is/apple.h
+prism/extension.$(OBJEXT): {$(VPATH)}internal/compiler_is/clang.h
+prism/extension.$(OBJEXT): {$(VPATH)}internal/compiler_is/gcc.h
+prism/extension.$(OBJEXT): {$(VPATH)}internal/compiler_is/intel.h
+prism/extension.$(OBJEXT): {$(VPATH)}internal/compiler_is/msvc.h
+prism/extension.$(OBJEXT): {$(VPATH)}internal/compiler_is/sunpro.h
+prism/extension.$(OBJEXT): {$(VPATH)}internal/compiler_since.h
+prism/extension.$(OBJEXT): {$(VPATH)}internal/config.h
+prism/extension.$(OBJEXT): {$(VPATH)}internal/constant_p.h
+prism/extension.$(OBJEXT): {$(VPATH)}internal/core.h
+prism/extension.$(OBJEXT): {$(VPATH)}internal/core/rarray.h
+prism/extension.$(OBJEXT): {$(VPATH)}internal/core/rbasic.h
+prism/extension.$(OBJEXT): {$(VPATH)}internal/core/rbignum.h
+prism/extension.$(OBJEXT): {$(VPATH)}internal/core/rclass.h
+prism/extension.$(OBJEXT): {$(VPATH)}internal/core/rdata.h
+prism/extension.$(OBJEXT): {$(VPATH)}internal/core/rfile.h
+prism/extension.$(OBJEXT): {$(VPATH)}internal/core/rhash.h
+prism/extension.$(OBJEXT): {$(VPATH)}internal/core/robject.h
+prism/extension.$(OBJEXT): {$(VPATH)}internal/core/rregexp.h
+prism/extension.$(OBJEXT): {$(VPATH)}internal/core/rstring.h
+prism/extension.$(OBJEXT): {$(VPATH)}internal/core/rstruct.h
+prism/extension.$(OBJEXT): {$(VPATH)}internal/core/rtypeddata.h
+prism/extension.$(OBJEXT): {$(VPATH)}internal/ctype.h
+prism/extension.$(OBJEXT): {$(VPATH)}internal/dllexport.h
+prism/extension.$(OBJEXT): {$(VPATH)}internal/dosish.h
+prism/extension.$(OBJEXT): {$(VPATH)}internal/encoding/coderange.h
+prism/extension.$(OBJEXT): {$(VPATH)}internal/encoding/ctype.h
+prism/extension.$(OBJEXT): {$(VPATH)}internal/encoding/encoding.h
+prism/extension.$(OBJEXT): {$(VPATH)}internal/encoding/pathname.h
+prism/extension.$(OBJEXT): {$(VPATH)}internal/encoding/re.h
+prism/extension.$(OBJEXT): {$(VPATH)}internal/encoding/sprintf.h
+prism/extension.$(OBJEXT): {$(VPATH)}internal/encoding/string.h
+prism/extension.$(OBJEXT): {$(VPATH)}internal/encoding/symbol.h
+prism/extension.$(OBJEXT): {$(VPATH)}internal/encoding/transcode.h
+prism/extension.$(OBJEXT): {$(VPATH)}internal/error.h
+prism/extension.$(OBJEXT): {$(VPATH)}internal/eval.h
+prism/extension.$(OBJEXT): {$(VPATH)}internal/event.h
+prism/extension.$(OBJEXT): {$(VPATH)}internal/fl_type.h
+prism/extension.$(OBJEXT): {$(VPATH)}internal/gc.h
+prism/extension.$(OBJEXT): {$(VPATH)}internal/glob.h
+prism/extension.$(OBJEXT): {$(VPATH)}internal/globals.h
+prism/extension.$(OBJEXT): {$(VPATH)}internal/has/attribute.h
+prism/extension.$(OBJEXT): {$(VPATH)}internal/has/builtin.h
+prism/extension.$(OBJEXT): {$(VPATH)}internal/has/c_attribute.h
+prism/extension.$(OBJEXT): {$(VPATH)}internal/has/cpp_attribute.h
+prism/extension.$(OBJEXT): {$(VPATH)}internal/has/declspec_attribute.h
+prism/extension.$(OBJEXT): {$(VPATH)}internal/has/extension.h
+prism/extension.$(OBJEXT): {$(VPATH)}internal/has/feature.h
+prism/extension.$(OBJEXT): {$(VPATH)}internal/has/warning.h
+prism/extension.$(OBJEXT): {$(VPATH)}internal/intern/array.h
+prism/extension.$(OBJEXT): {$(VPATH)}internal/intern/bignum.h
+prism/extension.$(OBJEXT): {$(VPATH)}internal/intern/class.h
+prism/extension.$(OBJEXT): {$(VPATH)}internal/intern/compar.h
+prism/extension.$(OBJEXT): {$(VPATH)}internal/intern/complex.h
+prism/extension.$(OBJEXT): {$(VPATH)}internal/intern/cont.h
+prism/extension.$(OBJEXT): {$(VPATH)}internal/intern/dir.h
+prism/extension.$(OBJEXT): {$(VPATH)}internal/intern/enum.h
+prism/extension.$(OBJEXT): {$(VPATH)}internal/intern/enumerator.h
+prism/extension.$(OBJEXT): {$(VPATH)}internal/intern/error.h
+prism/extension.$(OBJEXT): {$(VPATH)}internal/intern/eval.h
+prism/extension.$(OBJEXT): {$(VPATH)}internal/intern/file.h
+prism/extension.$(OBJEXT): {$(VPATH)}internal/intern/hash.h
+prism/extension.$(OBJEXT): {$(VPATH)}internal/intern/io.h
+prism/extension.$(OBJEXT): {$(VPATH)}internal/intern/load.h
+prism/extension.$(OBJEXT): {$(VPATH)}internal/intern/marshal.h
+prism/extension.$(OBJEXT): {$(VPATH)}internal/intern/numeric.h
+prism/extension.$(OBJEXT): {$(VPATH)}internal/intern/object.h
+prism/extension.$(OBJEXT): {$(VPATH)}internal/intern/parse.h
+prism/extension.$(OBJEXT): {$(VPATH)}internal/intern/proc.h
+prism/extension.$(OBJEXT): {$(VPATH)}internal/intern/process.h
+prism/extension.$(OBJEXT): {$(VPATH)}internal/intern/random.h
+prism/extension.$(OBJEXT): {$(VPATH)}internal/intern/range.h
+prism/extension.$(OBJEXT): {$(VPATH)}internal/intern/rational.h
+prism/extension.$(OBJEXT): {$(VPATH)}internal/intern/re.h
+prism/extension.$(OBJEXT): {$(VPATH)}internal/intern/ruby.h
+prism/extension.$(OBJEXT): {$(VPATH)}internal/intern/select.h
+prism/extension.$(OBJEXT): {$(VPATH)}internal/intern/select/largesize.h
+prism/extension.$(OBJEXT): {$(VPATH)}internal/intern/set.h
+prism/extension.$(OBJEXT): {$(VPATH)}internal/intern/signal.h
+prism/extension.$(OBJEXT): {$(VPATH)}internal/intern/sprintf.h
+prism/extension.$(OBJEXT): {$(VPATH)}internal/intern/string.h
+prism/extension.$(OBJEXT): {$(VPATH)}internal/intern/struct.h
+prism/extension.$(OBJEXT): {$(VPATH)}internal/intern/thread.h
+prism/extension.$(OBJEXT): {$(VPATH)}internal/intern/time.h
+prism/extension.$(OBJEXT): {$(VPATH)}internal/intern/variable.h
+prism/extension.$(OBJEXT): {$(VPATH)}internal/intern/vm.h
+prism/extension.$(OBJEXT): {$(VPATH)}internal/interpreter.h
+prism/extension.$(OBJEXT): {$(VPATH)}internal/iterator.h
+prism/extension.$(OBJEXT): {$(VPATH)}internal/memory.h
+prism/extension.$(OBJEXT): {$(VPATH)}internal/method.h
+prism/extension.$(OBJEXT): {$(VPATH)}internal/module.h
+prism/extension.$(OBJEXT): {$(VPATH)}internal/newobj.h
+prism/extension.$(OBJEXT): {$(VPATH)}internal/scan_args.h
+prism/extension.$(OBJEXT): {$(VPATH)}internal/special_consts.h
+prism/extension.$(OBJEXT): {$(VPATH)}internal/static_assert.h
+prism/extension.$(OBJEXT): {$(VPATH)}internal/stdalign.h
+prism/extension.$(OBJEXT): {$(VPATH)}internal/stdbool.h
+prism/extension.$(OBJEXT): {$(VPATH)}internal/stdckdint.h
+prism/extension.$(OBJEXT): {$(VPATH)}internal/symbol.h
+prism/extension.$(OBJEXT): {$(VPATH)}internal/value.h
+prism/extension.$(OBJEXT): {$(VPATH)}internal/value_type.h
+prism/extension.$(OBJEXT): {$(VPATH)}internal/variable.h
+prism/extension.$(OBJEXT): {$(VPATH)}internal/warning_push.h
+prism/extension.$(OBJEXT): {$(VPATH)}internal/xmalloc.h
+prism/extension.$(OBJEXT): {$(VPATH)}missing.h
+prism/extension.$(OBJEXT): {$(VPATH)}onigmo.h
+prism/extension.$(OBJEXT): {$(VPATH)}oniguruma.h
+prism/extension.$(OBJEXT): {$(VPATH)}prism/ast.h
+prism/extension.$(OBJEXT): {$(VPATH)}prism/diagnostic.h
+prism/extension.$(OBJEXT): {$(VPATH)}prism/version.h
+prism/extension.$(OBJEXT): {$(VPATH)}st.h
+prism/extension.$(OBJEXT): {$(VPATH)}subst.h
+prism/node.$(OBJEXT): $(top_srcdir)/prism/defines.h
+prism/node.$(OBJEXT): $(top_srcdir)/prism/encoding.h
+prism/node.$(OBJEXT): $(top_srcdir)/prism/node.h
+prism/node.$(OBJEXT): $(top_srcdir)/prism/options.h
+prism/node.$(OBJEXT): $(top_srcdir)/prism/pack.h
+prism/node.$(OBJEXT): $(top_srcdir)/prism/parser.h
+prism/node.$(OBJEXT): $(top_srcdir)/prism/prism.h
+prism/node.$(OBJEXT): $(top_srcdir)/prism/regexp.h
+prism/node.$(OBJEXT): $(top_srcdir)/prism/static_literals.h
+prism/node.$(OBJEXT): $(top_srcdir)/prism/util/pm_buffer.h
+prism/node.$(OBJEXT): $(top_srcdir)/prism/util/pm_char.h
+prism/node.$(OBJEXT): $(top_srcdir)/prism/util/pm_constant_pool.h
+prism/node.$(OBJEXT): $(top_srcdir)/prism/util/pm_integer.h
+prism/node.$(OBJEXT): $(top_srcdir)/prism/util/pm_list.h
+prism/node.$(OBJEXT): $(top_srcdir)/prism/util/pm_newline_list.h
+prism/node.$(OBJEXT): $(top_srcdir)/prism/util/pm_string.h
+prism/node.$(OBJEXT): $(top_srcdir)/prism/util/pm_strncasecmp.h
+prism/node.$(OBJEXT): $(top_srcdir)/prism/util/pm_strpbrk.h
+prism/node.$(OBJEXT): {$(VPATH)}prism/ast.h
+prism/node.$(OBJEXT): {$(VPATH)}prism/diagnostic.h
+prism/node.$(OBJEXT): {$(VPATH)}prism/node.c
+prism/options.$(OBJEXT): $(top_srcdir)/prism/defines.h
+prism/options.$(OBJEXT): $(top_srcdir)/prism/options.c
+prism/options.$(OBJEXT): $(top_srcdir)/prism/options.h
+prism/options.$(OBJEXT): $(top_srcdir)/prism/util/pm_char.h
+prism/options.$(OBJEXT): $(top_srcdir)/prism/util/pm_newline_list.h
+prism/options.$(OBJEXT): $(top_srcdir)/prism/util/pm_string.h
+prism/pack.$(OBJEXT): $(top_srcdir)/prism/defines.h
+prism/pack.$(OBJEXT): $(top_srcdir)/prism/pack.c
+prism/pack.$(OBJEXT): $(top_srcdir)/prism/pack.h
+prism/prettyprint.$(OBJEXT): $(top_srcdir)/prism/defines.h
+prism/prettyprint.$(OBJEXT): $(top_srcdir)/prism/encoding.h
+prism/prettyprint.$(OBJEXT): $(top_srcdir)/prism/options.h
+prism/prettyprint.$(OBJEXT): $(top_srcdir)/prism/parser.h
+prism/prettyprint.$(OBJEXT): $(top_srcdir)/prism/prettyprint.h
+prism/prettyprint.$(OBJEXT): $(top_srcdir)/prism/static_literals.h
+prism/prettyprint.$(OBJEXT): $(top_srcdir)/prism/util/pm_buffer.h
+prism/prettyprint.$(OBJEXT): $(top_srcdir)/prism/util/pm_char.h
+prism/prettyprint.$(OBJEXT): $(top_srcdir)/prism/util/pm_constant_pool.h
+prism/prettyprint.$(OBJEXT): $(top_srcdir)/prism/util/pm_integer.h
+prism/prettyprint.$(OBJEXT): $(top_srcdir)/prism/util/pm_list.h
+prism/prettyprint.$(OBJEXT): $(top_srcdir)/prism/util/pm_newline_list.h
+prism/prettyprint.$(OBJEXT): $(top_srcdir)/prism/util/pm_string.h
+prism/prettyprint.$(OBJEXT): $(top_srcdir)/prism/util/pm_strncasecmp.h
+prism/prettyprint.$(OBJEXT): {$(VPATH)}prism/ast.h
+prism/prettyprint.$(OBJEXT): {$(VPATH)}prism/prettyprint.c
+prism/prism.$(OBJEXT): $(top_srcdir)/prism/defines.h
+prism/prism.$(OBJEXT): $(top_srcdir)/prism/encoding.h
+prism/prism.$(OBJEXT): $(top_srcdir)/prism/node.h
+prism/prism.$(OBJEXT): $(top_srcdir)/prism/options.h
+prism/prism.$(OBJEXT): $(top_srcdir)/prism/pack.h
+prism/prism.$(OBJEXT): $(top_srcdir)/prism/parser.h
+prism/prism.$(OBJEXT): $(top_srcdir)/prism/prettyprint.h
+prism/prism.$(OBJEXT): $(top_srcdir)/prism/prism.c
+prism/prism.$(OBJEXT): $(top_srcdir)/prism/prism.h
+prism/prism.$(OBJEXT): $(top_srcdir)/prism/regexp.h
+prism/prism.$(OBJEXT): $(top_srcdir)/prism/static_literals.h
+prism/prism.$(OBJEXT): $(top_srcdir)/prism/util/pm_buffer.h
+prism/prism.$(OBJEXT): $(top_srcdir)/prism/util/pm_char.h
+prism/prism.$(OBJEXT): $(top_srcdir)/prism/util/pm_constant_pool.h
+prism/prism.$(OBJEXT): $(top_srcdir)/prism/util/pm_integer.h
+prism/prism.$(OBJEXT): $(top_srcdir)/prism/util/pm_list.h
+prism/prism.$(OBJEXT): $(top_srcdir)/prism/util/pm_memchr.h
+prism/prism.$(OBJEXT): $(top_srcdir)/prism/util/pm_newline_list.h
+prism/prism.$(OBJEXT): $(top_srcdir)/prism/util/pm_string.h
+prism/prism.$(OBJEXT): $(top_srcdir)/prism/util/pm_strncasecmp.h
+prism/prism.$(OBJEXT): $(top_srcdir)/prism/util/pm_strpbrk.h
+prism/prism.$(OBJEXT): $(top_srcdir)/prism/version.h
+prism/prism.$(OBJEXT): {$(VPATH)}prism/ast.h
+prism/prism.$(OBJEXT): {$(VPATH)}prism/diagnostic.h
+prism/prism.$(OBJEXT): {$(VPATH)}prism/version.h
+prism/regexp.$(OBJEXT): $(top_srcdir)/prism/defines.h
+prism/regexp.$(OBJEXT): $(top_srcdir)/prism/encoding.h
+prism/regexp.$(OBJEXT): $(top_srcdir)/prism/options.h
+prism/regexp.$(OBJEXT): $(top_srcdir)/prism/parser.h
+prism/regexp.$(OBJEXT): $(top_srcdir)/prism/regexp.c
+prism/regexp.$(OBJEXT): $(top_srcdir)/prism/regexp.h
+prism/regexp.$(OBJEXT): $(top_srcdir)/prism/static_literals.h
+prism/regexp.$(OBJEXT): $(top_srcdir)/prism/util/pm_buffer.h
+prism/regexp.$(OBJEXT): $(top_srcdir)/prism/util/pm_char.h
+prism/regexp.$(OBJEXT): $(top_srcdir)/prism/util/pm_constant_pool.h
+prism/regexp.$(OBJEXT): $(top_srcdir)/prism/util/pm_integer.h
+prism/regexp.$(OBJEXT): $(top_srcdir)/prism/util/pm_list.h
+prism/regexp.$(OBJEXT): $(top_srcdir)/prism/util/pm_memchr.h
+prism/regexp.$(OBJEXT): $(top_srcdir)/prism/util/pm_newline_list.h
+prism/regexp.$(OBJEXT): $(top_srcdir)/prism/util/pm_string.h
+prism/regexp.$(OBJEXT): $(top_srcdir)/prism/util/pm_strncasecmp.h
+prism/regexp.$(OBJEXT): {$(VPATH)}prism/ast.h
+prism/serialize.$(OBJEXT): $(top_srcdir)/prism/defines.h
+prism/serialize.$(OBJEXT): $(top_srcdir)/prism/encoding.h
+prism/serialize.$(OBJEXT): $(top_srcdir)/prism/node.h
+prism/serialize.$(OBJEXT): $(top_srcdir)/prism/options.h
+prism/serialize.$(OBJEXT): $(top_srcdir)/prism/pack.h
+prism/serialize.$(OBJEXT): $(top_srcdir)/prism/parser.h
+prism/serialize.$(OBJEXT): $(top_srcdir)/prism/prettyprint.h
+prism/serialize.$(OBJEXT): $(top_srcdir)/prism/prism.h
+prism/serialize.$(OBJEXT): $(top_srcdir)/prism/regexp.h
+prism/serialize.$(OBJEXT): $(top_srcdir)/prism/static_literals.h
+prism/serialize.$(OBJEXT): $(top_srcdir)/prism/util/pm_buffer.h
+prism/serialize.$(OBJEXT): $(top_srcdir)/prism/util/pm_char.h
+prism/serialize.$(OBJEXT): $(top_srcdir)/prism/util/pm_constant_pool.h
+prism/serialize.$(OBJEXT): $(top_srcdir)/prism/util/pm_integer.h
+prism/serialize.$(OBJEXT): $(top_srcdir)/prism/util/pm_list.h
+prism/serialize.$(OBJEXT): $(top_srcdir)/prism/util/pm_memchr.h
+prism/serialize.$(OBJEXT): $(top_srcdir)/prism/util/pm_newline_list.h
+prism/serialize.$(OBJEXT): $(top_srcdir)/prism/util/pm_string.h
+prism/serialize.$(OBJEXT): $(top_srcdir)/prism/util/pm_strncasecmp.h
+prism/serialize.$(OBJEXT): $(top_srcdir)/prism/util/pm_strpbrk.h
+prism/serialize.$(OBJEXT): {$(VPATH)}prism/ast.h
+prism/serialize.$(OBJEXT): {$(VPATH)}prism/diagnostic.h
+prism/serialize.$(OBJEXT): {$(VPATH)}prism/serialize.c
+prism/serialize.$(OBJEXT): {$(VPATH)}prism/version.h
+prism/static_literals.$(OBJEXT): $(top_srcdir)/prism/defines.h
+prism/static_literals.$(OBJEXT): $(top_srcdir)/prism/encoding.h
+prism/static_literals.$(OBJEXT): $(top_srcdir)/prism/node.h
+prism/static_literals.$(OBJEXT): $(top_srcdir)/prism/options.h
+prism/static_literals.$(OBJEXT): $(top_srcdir)/prism/parser.h
+prism/static_literals.$(OBJEXT): $(top_srcdir)/prism/static_literals.c
+prism/static_literals.$(OBJEXT): $(top_srcdir)/prism/static_literals.h
+prism/static_literals.$(OBJEXT): $(top_srcdir)/prism/util/pm_buffer.h
+prism/static_literals.$(OBJEXT): $(top_srcdir)/prism/util/pm_char.h
+prism/static_literals.$(OBJEXT): $(top_srcdir)/prism/util/pm_constant_pool.h
+prism/static_literals.$(OBJEXT): $(top_srcdir)/prism/util/pm_integer.h
+prism/static_literals.$(OBJEXT): $(top_srcdir)/prism/util/pm_list.h
+prism/static_literals.$(OBJEXT): $(top_srcdir)/prism/util/pm_newline_list.h
+prism/static_literals.$(OBJEXT): $(top_srcdir)/prism/util/pm_string.h
+prism/static_literals.$(OBJEXT): $(top_srcdir)/prism/util/pm_strncasecmp.h
+prism/static_literals.$(OBJEXT): {$(VPATH)}prism/ast.h
+prism/token_type.$(OBJEXT): $(top_srcdir)/prism/defines.h
+prism/token_type.$(OBJEXT): $(top_srcdir)/prism/util/pm_buffer.h
+prism/token_type.$(OBJEXT): $(top_srcdir)/prism/util/pm_char.h
+prism/token_type.$(OBJEXT): $(top_srcdir)/prism/util/pm_constant_pool.h
+prism/token_type.$(OBJEXT): $(top_srcdir)/prism/util/pm_integer.h
+prism/token_type.$(OBJEXT): $(top_srcdir)/prism/util/pm_newline_list.h
+prism/token_type.$(OBJEXT): $(top_srcdir)/prism/util/pm_string.h
+prism/token_type.$(OBJEXT): {$(VPATH)}prism/ast.h
+prism/token_type.$(OBJEXT): {$(VPATH)}prism/token_type.c
+prism/util/pm_buffer.$(OBJEXT): $(top_srcdir)/prism/defines.h
+prism/util/pm_buffer.$(OBJEXT): $(top_srcdir)/prism/util/pm_buffer.c
+prism/util/pm_buffer.$(OBJEXT): $(top_srcdir)/prism/util/pm_buffer.h
+prism/util/pm_buffer.$(OBJEXT): $(top_srcdir)/prism/util/pm_char.h
+prism/util/pm_buffer.$(OBJEXT): $(top_srcdir)/prism/util/pm_newline_list.h
+prism/util/pm_char.$(OBJEXT): $(top_srcdir)/prism/defines.h
+prism/util/pm_char.$(OBJEXT): $(top_srcdir)/prism/util/pm_char.c
+prism/util/pm_char.$(OBJEXT): $(top_srcdir)/prism/util/pm_char.h
+prism/util/pm_char.$(OBJEXT): $(top_srcdir)/prism/util/pm_newline_list.h
+prism/util/pm_constant_pool.$(OBJEXT): $(top_srcdir)/prism/defines.h
+prism/util/pm_constant_pool.$(OBJEXT): $(top_srcdir)/prism/util/pm_constant_pool.c
+prism/util/pm_constant_pool.$(OBJEXT): $(top_srcdir)/prism/util/pm_constant_pool.h
+prism/util/pm_integer.$(OBJEXT): $(top_srcdir)/prism/defines.h
+prism/util/pm_integer.$(OBJEXT): $(top_srcdir)/prism/util/pm_buffer.h
+prism/util/pm_integer.$(OBJEXT): $(top_srcdir)/prism/util/pm_char.h
+prism/util/pm_integer.$(OBJEXT): $(top_srcdir)/prism/util/pm_integer.c
+prism/util/pm_integer.$(OBJEXT): $(top_srcdir)/prism/util/pm_integer.h
+prism/util/pm_integer.$(OBJEXT): $(top_srcdir)/prism/util/pm_newline_list.h
+prism/util/pm_list.$(OBJEXT): $(top_srcdir)/prism/defines.h
+prism/util/pm_list.$(OBJEXT): $(top_srcdir)/prism/util/pm_list.c
+prism/util/pm_list.$(OBJEXT): $(top_srcdir)/prism/util/pm_list.h
+prism/util/pm_memchr.$(OBJEXT): $(top_srcdir)/prism/defines.h
+prism/util/pm_memchr.$(OBJEXT): $(top_srcdir)/prism/encoding.h
+prism/util/pm_memchr.$(OBJEXT): $(top_srcdir)/prism/parser.h
+prism/util/pm_memchr.$(OBJEXT): $(top_srcdir)/prism/util/pm_constant_pool.h
+prism/util/pm_memchr.$(OBJEXT): $(top_srcdir)/prism/util/pm_list.h
+prism/util/pm_memchr.$(OBJEXT): $(top_srcdir)/prism/util/pm_memchr.c
+prism/util/pm_memchr.$(OBJEXT): $(top_srcdir)/prism/util/pm_memchr.h
+prism/util/pm_memchr.$(OBJEXT): $(top_srcdir)/prism/util/pm_newline_list.h
+prism/util/pm_memchr.$(OBJEXT): $(top_srcdir)/prism/util/pm_string.h
+prism/util/pm_memchr.$(OBJEXT): $(top_srcdir)/prism/util/pm_strncasecmp.h
+prism/util/pm_memchr.$(OBJEXT): {$(VPATH)}prism/ast.h
+prism/util/pm_newline_list.$(OBJEXT): $(top_srcdir)/prism/defines.h
+prism/util/pm_newline_list.$(OBJEXT): $(top_srcdir)/prism/util/pm_newline_list.c
+prism/util/pm_newline_list.$(OBJEXT): $(top_srcdir)/prism/util/pm_newline_list.h
+prism/util/pm_string.$(OBJEXT): $(top_srcdir)/prism/defines.h
+prism/util/pm_string.$(OBJEXT): $(top_srcdir)/prism/util/pm_string.c
+prism/util/pm_string.$(OBJEXT): $(top_srcdir)/prism/util/pm_string.h
+prism/util/pm_strncasecmp.$(OBJEXT): $(top_srcdir)/prism/defines.h
+prism/util/pm_strncasecmp.$(OBJEXT): $(top_srcdir)/prism/util/pm_strncasecmp.c
+prism/util/pm_strncasecmp.$(OBJEXT): $(top_srcdir)/prism/util/pm_strncasecmp.h
+prism/util/pm_strpbrk.$(OBJEXT): $(top_srcdir)/prism/defines.h
+prism/util/pm_strpbrk.$(OBJEXT): $(top_srcdir)/prism/encoding.h
+prism/util/pm_strpbrk.$(OBJEXT): $(top_srcdir)/prism/options.h
+prism/util/pm_strpbrk.$(OBJEXT): $(top_srcdir)/prism/parser.h
+prism/util/pm_strpbrk.$(OBJEXT): $(top_srcdir)/prism/static_literals.h
+prism/util/pm_strpbrk.$(OBJEXT): $(top_srcdir)/prism/util/pm_buffer.h
+prism/util/pm_strpbrk.$(OBJEXT): $(top_srcdir)/prism/util/pm_char.h
+prism/util/pm_strpbrk.$(OBJEXT): $(top_srcdir)/prism/util/pm_constant_pool.h
+prism/util/pm_strpbrk.$(OBJEXT): $(top_srcdir)/prism/util/pm_integer.h
+prism/util/pm_strpbrk.$(OBJEXT): $(top_srcdir)/prism/util/pm_list.h
+prism/util/pm_strpbrk.$(OBJEXT): $(top_srcdir)/prism/util/pm_newline_list.h
+prism/util/pm_strpbrk.$(OBJEXT): $(top_srcdir)/prism/util/pm_string.h
+prism/util/pm_strpbrk.$(OBJEXT): $(top_srcdir)/prism/util/pm_strncasecmp.h
+prism/util/pm_strpbrk.$(OBJEXT): $(top_srcdir)/prism/util/pm_strpbrk.c
+prism/util/pm_strpbrk.$(OBJEXT): $(top_srcdir)/prism/util/pm_strpbrk.h
+prism/util/pm_strpbrk.$(OBJEXT): {$(VPATH)}prism/ast.h
+prism/util/pm_strpbrk.$(OBJEXT): {$(VPATH)}prism/diagnostic.h
+prism_init.$(OBJEXT): $(hdrdir)/ruby.h
+prism_init.$(OBJEXT): $(hdrdir)/ruby/ruby.h
+prism_init.$(OBJEXT): $(top_srcdir)/prism/defines.h
+prism_init.$(OBJEXT): $(top_srcdir)/prism/encoding.h
+prism_init.$(OBJEXT): $(top_srcdir)/prism/extension.h
+prism_init.$(OBJEXT): $(top_srcdir)/prism/node.h
+prism_init.$(OBJEXT): $(top_srcdir)/prism/options.h
+prism_init.$(OBJEXT): $(top_srcdir)/prism/pack.h
+prism_init.$(OBJEXT): $(top_srcdir)/prism/parser.h
+prism_init.$(OBJEXT): $(top_srcdir)/prism/prettyprint.h
+prism_init.$(OBJEXT): $(top_srcdir)/prism/prism.h
+prism_init.$(OBJEXT): $(top_srcdir)/prism/regexp.h
+prism_init.$(OBJEXT): $(top_srcdir)/prism/static_literals.h
+prism_init.$(OBJEXT): $(top_srcdir)/prism/util/pm_buffer.h
+prism_init.$(OBJEXT): $(top_srcdir)/prism/util/pm_char.h
+prism_init.$(OBJEXT): $(top_srcdir)/prism/util/pm_constant_pool.h
+prism_init.$(OBJEXT): $(top_srcdir)/prism/util/pm_integer.h
+prism_init.$(OBJEXT): $(top_srcdir)/prism/util/pm_list.h
+prism_init.$(OBJEXT): $(top_srcdir)/prism/util/pm_memchr.h
+prism_init.$(OBJEXT): $(top_srcdir)/prism/util/pm_newline_list.h
+prism_init.$(OBJEXT): $(top_srcdir)/prism/util/pm_string.h
+prism_init.$(OBJEXT): $(top_srcdir)/prism/util/pm_strncasecmp.h
+prism_init.$(OBJEXT): $(top_srcdir)/prism/util/pm_strpbrk.h
+prism_init.$(OBJEXT): $(top_srcdir)/prism_init.c
+prism_init.$(OBJEXT): {$(VPATH)}assert.h
+prism_init.$(OBJEXT): {$(VPATH)}backward/2/assume.h
+prism_init.$(OBJEXT): {$(VPATH)}backward/2/attributes.h
+prism_init.$(OBJEXT): {$(VPATH)}backward/2/bool.h
+prism_init.$(OBJEXT): {$(VPATH)}backward/2/inttypes.h
+prism_init.$(OBJEXT): {$(VPATH)}backward/2/limits.h
+prism_init.$(OBJEXT): {$(VPATH)}backward/2/long_long.h
+prism_init.$(OBJEXT): {$(VPATH)}backward/2/stdalign.h
+prism_init.$(OBJEXT): {$(VPATH)}backward/2/stdarg.h
+prism_init.$(OBJEXT): {$(VPATH)}config.h
+prism_init.$(OBJEXT): {$(VPATH)}defines.h
+prism_init.$(OBJEXT): {$(VPATH)}encoding.h
+prism_init.$(OBJEXT): {$(VPATH)}intern.h
+prism_init.$(OBJEXT): {$(VPATH)}internal/abi.h
+prism_init.$(OBJEXT): {$(VPATH)}internal/anyargs.h
+prism_init.$(OBJEXT): {$(VPATH)}internal/arithmetic.h
+prism_init.$(OBJEXT): {$(VPATH)}internal/arithmetic/char.h
+prism_init.$(OBJEXT): {$(VPATH)}internal/arithmetic/double.h
+prism_init.$(OBJEXT): {$(VPATH)}internal/arithmetic/fixnum.h
+prism_init.$(OBJEXT): {$(VPATH)}internal/arithmetic/gid_t.h
+prism_init.$(OBJEXT): {$(VPATH)}internal/arithmetic/int.h
+prism_init.$(OBJEXT): {$(VPATH)}internal/arithmetic/intptr_t.h
+prism_init.$(OBJEXT): {$(VPATH)}internal/arithmetic/long.h
+prism_init.$(OBJEXT): {$(VPATH)}internal/arithmetic/long_long.h
+prism_init.$(OBJEXT): {$(VPATH)}internal/arithmetic/mode_t.h
+prism_init.$(OBJEXT): {$(VPATH)}internal/arithmetic/off_t.h
+prism_init.$(OBJEXT): {$(VPATH)}internal/arithmetic/pid_t.h
+prism_init.$(OBJEXT): {$(VPATH)}internal/arithmetic/short.h
+prism_init.$(OBJEXT): {$(VPATH)}internal/arithmetic/size_t.h
+prism_init.$(OBJEXT): {$(VPATH)}internal/arithmetic/st_data_t.h
+prism_init.$(OBJEXT): {$(VPATH)}internal/arithmetic/uid_t.h
+prism_init.$(OBJEXT): {$(VPATH)}internal/assume.h
+prism_init.$(OBJEXT): {$(VPATH)}internal/attr/alloc_size.h
+prism_init.$(OBJEXT): {$(VPATH)}internal/attr/artificial.h
+prism_init.$(OBJEXT): {$(VPATH)}internal/attr/cold.h
+prism_init.$(OBJEXT): {$(VPATH)}internal/attr/const.h
+prism_init.$(OBJEXT): {$(VPATH)}internal/attr/constexpr.h
+prism_init.$(OBJEXT): {$(VPATH)}internal/attr/deprecated.h
+prism_init.$(OBJEXT): {$(VPATH)}internal/attr/diagnose_if.h
+prism_init.$(OBJEXT): {$(VPATH)}internal/attr/enum_extensibility.h
+prism_init.$(OBJEXT): {$(VPATH)}internal/attr/error.h
+prism_init.$(OBJEXT): {$(VPATH)}internal/attr/flag_enum.h
+prism_init.$(OBJEXT): {$(VPATH)}internal/attr/forceinline.h
+prism_init.$(OBJEXT): {$(VPATH)}internal/attr/format.h
+prism_init.$(OBJEXT): {$(VPATH)}internal/attr/maybe_unused.h
+prism_init.$(OBJEXT): {$(VPATH)}internal/attr/noalias.h
+prism_init.$(OBJEXT): {$(VPATH)}internal/attr/nodiscard.h
+prism_init.$(OBJEXT): {$(VPATH)}internal/attr/noexcept.h
+prism_init.$(OBJEXT): {$(VPATH)}internal/attr/noinline.h
+prism_init.$(OBJEXT): {$(VPATH)}internal/attr/nonnull.h
+prism_init.$(OBJEXT): {$(VPATH)}internal/attr/noreturn.h
+prism_init.$(OBJEXT): {$(VPATH)}internal/attr/packed_struct.h
+prism_init.$(OBJEXT): {$(VPATH)}internal/attr/pure.h
+prism_init.$(OBJEXT): {$(VPATH)}internal/attr/restrict.h
+prism_init.$(OBJEXT): {$(VPATH)}internal/attr/returns_nonnull.h
+prism_init.$(OBJEXT): {$(VPATH)}internal/attr/warning.h
+prism_init.$(OBJEXT): {$(VPATH)}internal/attr/weakref.h
+prism_init.$(OBJEXT): {$(VPATH)}internal/cast.h
+prism_init.$(OBJEXT): {$(VPATH)}internal/compiler_is.h
+prism_init.$(OBJEXT): {$(VPATH)}internal/compiler_is/apple.h
+prism_init.$(OBJEXT): {$(VPATH)}internal/compiler_is/clang.h
+prism_init.$(OBJEXT): {$(VPATH)}internal/compiler_is/gcc.h
+prism_init.$(OBJEXT): {$(VPATH)}internal/compiler_is/intel.h
+prism_init.$(OBJEXT): {$(VPATH)}internal/compiler_is/msvc.h
+prism_init.$(OBJEXT): {$(VPATH)}internal/compiler_is/sunpro.h
+prism_init.$(OBJEXT): {$(VPATH)}internal/compiler_since.h
+prism_init.$(OBJEXT): {$(VPATH)}internal/config.h
+prism_init.$(OBJEXT): {$(VPATH)}internal/constant_p.h
+prism_init.$(OBJEXT): {$(VPATH)}internal/core.h
+prism_init.$(OBJEXT): {$(VPATH)}internal/core/rarray.h
+prism_init.$(OBJEXT): {$(VPATH)}internal/core/rbasic.h
+prism_init.$(OBJEXT): {$(VPATH)}internal/core/rbignum.h
+prism_init.$(OBJEXT): {$(VPATH)}internal/core/rclass.h
+prism_init.$(OBJEXT): {$(VPATH)}internal/core/rdata.h
+prism_init.$(OBJEXT): {$(VPATH)}internal/core/rfile.h
+prism_init.$(OBJEXT): {$(VPATH)}internal/core/rhash.h
+prism_init.$(OBJEXT): {$(VPATH)}internal/core/robject.h
+prism_init.$(OBJEXT): {$(VPATH)}internal/core/rregexp.h
+prism_init.$(OBJEXT): {$(VPATH)}internal/core/rstring.h
+prism_init.$(OBJEXT): {$(VPATH)}internal/core/rstruct.h
+prism_init.$(OBJEXT): {$(VPATH)}internal/core/rtypeddata.h
+prism_init.$(OBJEXT): {$(VPATH)}internal/ctype.h
+prism_init.$(OBJEXT): {$(VPATH)}internal/dllexport.h
+prism_init.$(OBJEXT): {$(VPATH)}internal/dosish.h
+prism_init.$(OBJEXT): {$(VPATH)}internal/encoding/coderange.h
+prism_init.$(OBJEXT): {$(VPATH)}internal/encoding/ctype.h
+prism_init.$(OBJEXT): {$(VPATH)}internal/encoding/encoding.h
+prism_init.$(OBJEXT): {$(VPATH)}internal/encoding/pathname.h
+prism_init.$(OBJEXT): {$(VPATH)}internal/encoding/re.h
+prism_init.$(OBJEXT): {$(VPATH)}internal/encoding/sprintf.h
+prism_init.$(OBJEXT): {$(VPATH)}internal/encoding/string.h
+prism_init.$(OBJEXT): {$(VPATH)}internal/encoding/symbol.h
+prism_init.$(OBJEXT): {$(VPATH)}internal/encoding/transcode.h
+prism_init.$(OBJEXT): {$(VPATH)}internal/error.h
+prism_init.$(OBJEXT): {$(VPATH)}internal/eval.h
+prism_init.$(OBJEXT): {$(VPATH)}internal/event.h
+prism_init.$(OBJEXT): {$(VPATH)}internal/fl_type.h
+prism_init.$(OBJEXT): {$(VPATH)}internal/gc.h
+prism_init.$(OBJEXT): {$(VPATH)}internal/glob.h
+prism_init.$(OBJEXT): {$(VPATH)}internal/globals.h
+prism_init.$(OBJEXT): {$(VPATH)}internal/has/attribute.h
+prism_init.$(OBJEXT): {$(VPATH)}internal/has/builtin.h
+prism_init.$(OBJEXT): {$(VPATH)}internal/has/c_attribute.h
+prism_init.$(OBJEXT): {$(VPATH)}internal/has/cpp_attribute.h
+prism_init.$(OBJEXT): {$(VPATH)}internal/has/declspec_attribute.h
+prism_init.$(OBJEXT): {$(VPATH)}internal/has/extension.h
+prism_init.$(OBJEXT): {$(VPATH)}internal/has/feature.h
+prism_init.$(OBJEXT): {$(VPATH)}internal/has/warning.h
+prism_init.$(OBJEXT): {$(VPATH)}internal/intern/array.h
+prism_init.$(OBJEXT): {$(VPATH)}internal/intern/bignum.h
+prism_init.$(OBJEXT): {$(VPATH)}internal/intern/class.h
+prism_init.$(OBJEXT): {$(VPATH)}internal/intern/compar.h
+prism_init.$(OBJEXT): {$(VPATH)}internal/intern/complex.h
+prism_init.$(OBJEXT): {$(VPATH)}internal/intern/cont.h
+prism_init.$(OBJEXT): {$(VPATH)}internal/intern/dir.h
+prism_init.$(OBJEXT): {$(VPATH)}internal/intern/enum.h
+prism_init.$(OBJEXT): {$(VPATH)}internal/intern/enumerator.h
+prism_init.$(OBJEXT): {$(VPATH)}internal/intern/error.h
+prism_init.$(OBJEXT): {$(VPATH)}internal/intern/eval.h
+prism_init.$(OBJEXT): {$(VPATH)}internal/intern/file.h
+prism_init.$(OBJEXT): {$(VPATH)}internal/intern/hash.h
+prism_init.$(OBJEXT): {$(VPATH)}internal/intern/io.h
+prism_init.$(OBJEXT): {$(VPATH)}internal/intern/load.h
+prism_init.$(OBJEXT): {$(VPATH)}internal/intern/marshal.h
+prism_init.$(OBJEXT): {$(VPATH)}internal/intern/numeric.h
+prism_init.$(OBJEXT): {$(VPATH)}internal/intern/object.h
+prism_init.$(OBJEXT): {$(VPATH)}internal/intern/parse.h
+prism_init.$(OBJEXT): {$(VPATH)}internal/intern/proc.h
+prism_init.$(OBJEXT): {$(VPATH)}internal/intern/process.h
+prism_init.$(OBJEXT): {$(VPATH)}internal/intern/random.h
+prism_init.$(OBJEXT): {$(VPATH)}internal/intern/range.h
+prism_init.$(OBJEXT): {$(VPATH)}internal/intern/rational.h
+prism_init.$(OBJEXT): {$(VPATH)}internal/intern/re.h
+prism_init.$(OBJEXT): {$(VPATH)}internal/intern/ruby.h
+prism_init.$(OBJEXT): {$(VPATH)}internal/intern/select.h
+prism_init.$(OBJEXT): {$(VPATH)}internal/intern/select/largesize.h
+prism_init.$(OBJEXT): {$(VPATH)}internal/intern/set.h
+prism_init.$(OBJEXT): {$(VPATH)}internal/intern/signal.h
+prism_init.$(OBJEXT): {$(VPATH)}internal/intern/sprintf.h
+prism_init.$(OBJEXT): {$(VPATH)}internal/intern/string.h
+prism_init.$(OBJEXT): {$(VPATH)}internal/intern/struct.h
+prism_init.$(OBJEXT): {$(VPATH)}internal/intern/thread.h
+prism_init.$(OBJEXT): {$(VPATH)}internal/intern/time.h
+prism_init.$(OBJEXT): {$(VPATH)}internal/intern/variable.h
+prism_init.$(OBJEXT): {$(VPATH)}internal/intern/vm.h
+prism_init.$(OBJEXT): {$(VPATH)}internal/interpreter.h
+prism_init.$(OBJEXT): {$(VPATH)}internal/iterator.h
+prism_init.$(OBJEXT): {$(VPATH)}internal/memory.h
+prism_init.$(OBJEXT): {$(VPATH)}internal/method.h
+prism_init.$(OBJEXT): {$(VPATH)}internal/module.h
+prism_init.$(OBJEXT): {$(VPATH)}internal/newobj.h
+prism_init.$(OBJEXT): {$(VPATH)}internal/scan_args.h
+prism_init.$(OBJEXT): {$(VPATH)}internal/special_consts.h
+prism_init.$(OBJEXT): {$(VPATH)}internal/static_assert.h
+prism_init.$(OBJEXT): {$(VPATH)}internal/stdalign.h
+prism_init.$(OBJEXT): {$(VPATH)}internal/stdbool.h
+prism_init.$(OBJEXT): {$(VPATH)}internal/stdckdint.h
+prism_init.$(OBJEXT): {$(VPATH)}internal/symbol.h
+prism_init.$(OBJEXT): {$(VPATH)}internal/value.h
+prism_init.$(OBJEXT): {$(VPATH)}internal/value_type.h
+prism_init.$(OBJEXT): {$(VPATH)}internal/variable.h
+prism_init.$(OBJEXT): {$(VPATH)}internal/warning_push.h
+prism_init.$(OBJEXT): {$(VPATH)}internal/xmalloc.h
+prism_init.$(OBJEXT): {$(VPATH)}missing.h
+prism_init.$(OBJEXT): {$(VPATH)}onigmo.h
+prism_init.$(OBJEXT): {$(VPATH)}oniguruma.h
+prism_init.$(OBJEXT): {$(VPATH)}prism/ast.h
+prism_init.$(OBJEXT): {$(VPATH)}prism/diagnostic.h
+prism_init.$(OBJEXT): {$(VPATH)}prism/version.h
+prism_init.$(OBJEXT): {$(VPATH)}prism_init.c
+prism_init.$(OBJEXT): {$(VPATH)}st.h
+prism_init.$(OBJEXT): {$(VPATH)}subst.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
 proc.$(OBJEXT): $(CCAN_DIR)/str/str.h
 proc.$(OBJEXT): $(hdrdir)/ruby/ruby.h
+proc.$(OBJEXT): $(hdrdir)/ruby/version.h
 proc.$(OBJEXT): $(top_srcdir)/internal/array.h
 proc.$(OBJEXT): $(top_srcdir)/internal/basic_operators.h
 proc.$(OBJEXT): $(top_srcdir)/internal/class.h
@@ -11304,16 +13864,40 @@ 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/hash.h
 proc.$(OBJEXT): $(top_srcdir)/internal/imemo.h
+proc.$(OBJEXT): $(top_srcdir)/internal/namespace.h
 proc.$(OBJEXT): $(top_srcdir)/internal/object.h
 proc.$(OBJEXT): $(top_srcdir)/internal/proc.h
+proc.$(OBJEXT): $(top_srcdir)/internal/sanitizers.h
 proc.$(OBJEXT): $(top_srcdir)/internal/serial.h
+proc.$(OBJEXT): $(top_srcdir)/internal/set_table.h
 proc.$(OBJEXT): $(top_srcdir)/internal/static_assert.h
 proc.$(OBJEXT): $(top_srcdir)/internal/string.h
 proc.$(OBJEXT): $(top_srcdir)/internal/symbol.h
 proc.$(OBJEXT): $(top_srcdir)/internal/variable.h
 proc.$(OBJEXT): $(top_srcdir)/internal/vm.h
 proc.$(OBJEXT): $(top_srcdir)/internal/warnings.h
+proc.$(OBJEXT): $(top_srcdir)/prism/defines.h
+proc.$(OBJEXT): $(top_srcdir)/prism/encoding.h
+proc.$(OBJEXT): $(top_srcdir)/prism/node.h
+proc.$(OBJEXT): $(top_srcdir)/prism/options.h
+proc.$(OBJEXT): $(top_srcdir)/prism/pack.h
+proc.$(OBJEXT): $(top_srcdir)/prism/parser.h
+proc.$(OBJEXT): $(top_srcdir)/prism/prettyprint.h
+proc.$(OBJEXT): $(top_srcdir)/prism/prism.h
+proc.$(OBJEXT): $(top_srcdir)/prism/regexp.h
+proc.$(OBJEXT): $(top_srcdir)/prism/static_literals.h
+proc.$(OBJEXT): $(top_srcdir)/prism/util/pm_buffer.h
+proc.$(OBJEXT): $(top_srcdir)/prism/util/pm_char.h
+proc.$(OBJEXT): $(top_srcdir)/prism/util/pm_constant_pool.h
+proc.$(OBJEXT): $(top_srcdir)/prism/util/pm_integer.h
+proc.$(OBJEXT): $(top_srcdir)/prism/util/pm_list.h
+proc.$(OBJEXT): $(top_srcdir)/prism/util/pm_memchr.h
+proc.$(OBJEXT): $(top_srcdir)/prism/util/pm_newline_list.h
+proc.$(OBJEXT): $(top_srcdir)/prism/util/pm_string.h
+proc.$(OBJEXT): $(top_srcdir)/prism/util/pm_strncasecmp.h
+proc.$(OBJEXT): $(top_srcdir)/prism/util/pm_strpbrk.h
 proc.$(OBJEXT): {$(VPATH)}assert.h
 proc.$(OBJEXT): {$(VPATH)}atomic.h
 proc.$(OBJEXT): {$(VPATH)}backward/2/assume.h
@@ -11327,6 +13911,7 @@ proc.$(OBJEXT): {$(VPATH)}backward/2/stdalign.h
 proc.$(OBJEXT): {$(VPATH)}backward/2/stdarg.h
 proc.$(OBJEXT): {$(VPATH)}config.h
 proc.$(OBJEXT): {$(VPATH)}constant.h
+proc.$(OBJEXT): {$(VPATH)}debug_counter.h
 proc.$(OBJEXT): {$(VPATH)}defines.h
 proc.$(OBJEXT): {$(VPATH)}encoding.h
 proc.$(OBJEXT): {$(VPATH)}eval_intern.h
@@ -11457,6 +14042,7 @@ proc.$(OBJEXT): {$(VPATH)}internal/intern/re.h
 proc.$(OBJEXT): {$(VPATH)}internal/intern/ruby.h
 proc.$(OBJEXT): {$(VPATH)}internal/intern/select.h
 proc.$(OBJEXT): {$(VPATH)}internal/intern/select/largesize.h
+proc.$(OBJEXT): {$(VPATH)}internal/intern/set.h
 proc.$(OBJEXT): {$(VPATH)}internal/intern/signal.h
 proc.$(OBJEXT): {$(VPATH)}internal/intern/sprintf.h
 proc.$(OBJEXT): {$(VPATH)}internal/intern/string.h
@@ -11476,6 +14062,7 @@ proc.$(OBJEXT): {$(VPATH)}internal/special_consts.h
 proc.$(OBJEXT): {$(VPATH)}internal/static_assert.h
 proc.$(OBJEXT): {$(VPATH)}internal/stdalign.h
 proc.$(OBJEXT): {$(VPATH)}internal/stdbool.h
+proc.$(OBJEXT): {$(VPATH)}internal/stdckdint.h
 proc.$(OBJEXT): {$(VPATH)}internal/symbol.h
 proc.$(OBJEXT): {$(VPATH)}internal/value.h
 proc.$(OBJEXT): {$(VPATH)}internal/value_type.h
@@ -11488,7 +14075,13 @@ proc.$(OBJEXT): {$(VPATH)}missing.h
 proc.$(OBJEXT): {$(VPATH)}node.h
 proc.$(OBJEXT): {$(VPATH)}onigmo.h
 proc.$(OBJEXT): {$(VPATH)}oniguruma.h
+proc.$(OBJEXT): {$(VPATH)}prism/ast.h
+proc.$(OBJEXT): {$(VPATH)}prism/diagnostic.h
+proc.$(OBJEXT): {$(VPATH)}prism/version.h
+proc.$(OBJEXT): {$(VPATH)}prism_compile.h
 proc.$(OBJEXT): {$(VPATH)}proc.c
+proc.$(OBJEXT): {$(VPATH)}ractor.h
+proc.$(OBJEXT): {$(VPATH)}ractor_core.h
 proc.$(OBJEXT): {$(VPATH)}ruby_assert.h
 proc.$(OBJEXT): {$(VPATH)}ruby_atomic.h
 proc.$(OBJEXT): {$(VPATH)}rubyparser.h
@@ -11498,7 +14091,9 @@ proc.$(OBJEXT): {$(VPATH)}subst.h
 proc.$(OBJEXT): {$(VPATH)}thread_$(THREAD_MODEL).h
 proc.$(OBJEXT): {$(VPATH)}thread_native.h
 proc.$(OBJEXT): {$(VPATH)}vm_core.h
+proc.$(OBJEXT): {$(VPATH)}vm_debug.h
 proc.$(OBJEXT): {$(VPATH)}vm_opts.h
+proc.$(OBJEXT): {$(VPATH)}vm_sync.h
 proc.$(OBJEXT): {$(VPATH)}yjit.h
 process.$(OBJEXT): $(CCAN_DIR)/check_type/check_type.h
 process.$(OBJEXT): $(CCAN_DIR)/container_of/container_of.h
@@ -11506,6 +14101,7 @@ 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): $(hdrdir)/ruby/version.h
 process.$(OBJEXT): $(top_srcdir)/internal/array.h
 process.$(OBJEXT): $(top_srcdir)/internal/basic_operators.h
 process.$(OBJEXT): $(top_srcdir)/internal/bignum.h
@@ -11520,10 +14116,13 @@ 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/io.h
+process.$(OBJEXT): $(top_srcdir)/internal/namespace.h
 process.$(OBJEXT): $(top_srcdir)/internal/numeric.h
 process.$(OBJEXT): $(top_srcdir)/internal/object.h
 process.$(OBJEXT): $(top_srcdir)/internal/process.h
+process.$(OBJEXT): $(top_srcdir)/internal/sanitizers.h
 process.$(OBJEXT): $(top_srcdir)/internal/serial.h
+process.$(OBJEXT): $(top_srcdir)/internal/set_table.h
 process.$(OBJEXT): $(top_srcdir)/internal/static_assert.h
 process.$(OBJEXT): $(top_srcdir)/internal/string.h
 process.$(OBJEXT): $(top_srcdir)/internal/thread.h
@@ -11677,6 +14276,7 @@ process.$(OBJEXT): {$(VPATH)}internal/intern/re.h
 process.$(OBJEXT): {$(VPATH)}internal/intern/ruby.h
 process.$(OBJEXT): {$(VPATH)}internal/intern/select.h
 process.$(OBJEXT): {$(VPATH)}internal/intern/select/largesize.h
+process.$(OBJEXT): {$(VPATH)}internal/intern/set.h
 process.$(OBJEXT): {$(VPATH)}internal/intern/signal.h
 process.$(OBJEXT): {$(VPATH)}internal/intern/sprintf.h
 process.$(OBJEXT): {$(VPATH)}internal/intern/string.h
@@ -11696,6 +14296,7 @@ process.$(OBJEXT): {$(VPATH)}internal/special_consts.h
 process.$(OBJEXT): {$(VPATH)}internal/static_assert.h
 process.$(OBJEXT): {$(VPATH)}internal/stdalign.h
 process.$(OBJEXT): {$(VPATH)}internal/stdbool.h
+process.$(OBJEXT): {$(VPATH)}internal/stdckdint.h
 process.$(OBJEXT): {$(VPATH)}internal/symbol.h
 process.$(OBJEXT): {$(VPATH)}internal/value.h
 process.$(OBJEXT): {$(VPATH)}internal/value_type.h
@@ -11710,7 +14311,7 @@ process.$(OBJEXT): {$(VPATH)}onigmo.h
 process.$(OBJEXT): {$(VPATH)}oniguruma.h
 process.$(OBJEXT): {$(VPATH)}process.c
 process.$(OBJEXT): {$(VPATH)}ractor.h
-process.$(OBJEXT): {$(VPATH)}rjit.h
+process.$(OBJEXT): {$(VPATH)}ractor_core.h
 process.$(OBJEXT): {$(VPATH)}ruby_assert.h
 process.$(OBJEXT): {$(VPATH)}ruby_atomic.h
 process.$(OBJEXT): {$(VPATH)}rubyparser.h
@@ -11731,6 +14332,7 @@ ractor.$(OBJEXT): $(CCAN_DIR)/list/list.h
 ractor.$(OBJEXT): $(CCAN_DIR)/str/str.h
 ractor.$(OBJEXT): $(hdrdir)/ruby.h
 ractor.$(OBJEXT): $(hdrdir)/ruby/ruby.h
+ractor.$(OBJEXT): $(hdrdir)/ruby/version.h
 ractor.$(OBJEXT): $(top_srcdir)/internal/array.h
 ractor.$(OBJEXT): $(top_srcdir)/internal/basic_operators.h
 ractor.$(OBJEXT): $(top_srcdir)/internal/bignum.h
@@ -11742,9 +14344,14 @@ ractor.$(OBJEXT): $(top_srcdir)/internal/fixnum.h
 ractor.$(OBJEXT): $(top_srcdir)/internal/gc.h
 ractor.$(OBJEXT): $(top_srcdir)/internal/hash.h
 ractor.$(OBJEXT): $(top_srcdir)/internal/imemo.h
+ractor.$(OBJEXT): $(top_srcdir)/internal/namespace.h
 ractor.$(OBJEXT): $(top_srcdir)/internal/numeric.h
+ractor.$(OBJEXT): $(top_srcdir)/internal/object.h
+ractor.$(OBJEXT): $(top_srcdir)/internal/ractor.h
 ractor.$(OBJEXT): $(top_srcdir)/internal/rational.h
+ractor.$(OBJEXT): $(top_srcdir)/internal/sanitizers.h
 ractor.$(OBJEXT): $(top_srcdir)/internal/serial.h
+ractor.$(OBJEXT): $(top_srcdir)/internal/set_table.h
 ractor.$(OBJEXT): $(top_srcdir)/internal/static_assert.h
 ractor.$(OBJEXT): $(top_srcdir)/internal/string.h
 ractor.$(OBJEXT): $(top_srcdir)/internal/struct.h
@@ -11897,6 +14504,7 @@ ractor.$(OBJEXT): {$(VPATH)}internal/intern/re.h
 ractor.$(OBJEXT): {$(VPATH)}internal/intern/ruby.h
 ractor.$(OBJEXT): {$(VPATH)}internal/intern/select.h
 ractor.$(OBJEXT): {$(VPATH)}internal/intern/select/largesize.h
+ractor.$(OBJEXT): {$(VPATH)}internal/intern/set.h
 ractor.$(OBJEXT): {$(VPATH)}internal/intern/signal.h
 ractor.$(OBJEXT): {$(VPATH)}internal/intern/sprintf.h
 ractor.$(OBJEXT): {$(VPATH)}internal/intern/string.h
@@ -11916,6 +14524,7 @@ ractor.$(OBJEXT): {$(VPATH)}internal/special_consts.h
 ractor.$(OBJEXT): {$(VPATH)}internal/static_assert.h
 ractor.$(OBJEXT): {$(VPATH)}internal/stdalign.h
 ractor.$(OBJEXT): {$(VPATH)}internal/stdbool.h
+ractor.$(OBJEXT): {$(VPATH)}internal/stdckdint.h
 ractor.$(OBJEXT): {$(VPATH)}internal/symbol.h
 ractor.$(OBJEXT): {$(VPATH)}internal/value.h
 ractor.$(OBJEXT): {$(VPATH)}internal/value_type.h
@@ -11931,7 +14540,7 @@ ractor.$(OBJEXT): {$(VPATH)}ractor.c
 ractor.$(OBJEXT): {$(VPATH)}ractor.h
 ractor.$(OBJEXT): {$(VPATH)}ractor.rbinc
 ractor.$(OBJEXT): {$(VPATH)}ractor_core.h
-ractor.$(OBJEXT): {$(VPATH)}rjit.h
+ractor.$(OBJEXT): {$(VPATH)}ractor_sync.c
 ractor.$(OBJEXT): {$(VPATH)}ruby_assert.h
 ractor.$(OBJEXT): {$(VPATH)}ruby_atomic.h
 ractor.$(OBJEXT): {$(VPATH)}rubyparser.h
@@ -11960,10 +14569,12 @@ random.$(OBJEXT): $(top_srcdir)/internal/compilers.h
 random.$(OBJEXT): $(top_srcdir)/internal/fixnum.h
 random.$(OBJEXT): $(top_srcdir)/internal/gc.h
 random.$(OBJEXT): $(top_srcdir)/internal/imemo.h
+random.$(OBJEXT): $(top_srcdir)/internal/namespace.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/set_table.h
 random.$(OBJEXT): $(top_srcdir)/internal/static_assert.h
 random.$(OBJEXT): $(top_srcdir)/internal/variable.h
 random.$(OBJEXT): $(top_srcdir)/internal/vm.h
@@ -12110,6 +14721,7 @@ random.$(OBJEXT): {$(VPATH)}internal/intern/re.h
 random.$(OBJEXT): {$(VPATH)}internal/intern/ruby.h
 random.$(OBJEXT): {$(VPATH)}internal/intern/select.h
 random.$(OBJEXT): {$(VPATH)}internal/intern/select/largesize.h
+random.$(OBJEXT): {$(VPATH)}internal/intern/set.h
 random.$(OBJEXT): {$(VPATH)}internal/intern/signal.h
 random.$(OBJEXT): {$(VPATH)}internal/intern/sprintf.h
 random.$(OBJEXT): {$(VPATH)}internal/intern/string.h
@@ -12129,6 +14741,7 @@ random.$(OBJEXT): {$(VPATH)}internal/special_consts.h
 random.$(OBJEXT): {$(VPATH)}internal/static_assert.h
 random.$(OBJEXT): {$(VPATH)}internal/stdalign.h
 random.$(OBJEXT): {$(VPATH)}internal/stdbool.h
+random.$(OBJEXT): {$(VPATH)}internal/stdckdint.h
 random.$(OBJEXT): {$(VPATH)}internal/symbol.h
 random.$(OBJEXT): {$(VPATH)}internal/value.h
 random.$(OBJEXT): {$(VPATH)}internal/value_type.h
@@ -12157,6 +14770,7 @@ random.$(OBJEXT): {$(VPATH)}thread_native.h
 random.$(OBJEXT): {$(VPATH)}vm_core.h
 random.$(OBJEXT): {$(VPATH)}vm_opts.h
 range.$(OBJEXT): $(hdrdir)/ruby/ruby.h
+range.$(OBJEXT): $(hdrdir)/ruby/version.h
 range.$(OBJEXT): $(top_srcdir)/internal/array.h
 range.$(OBJEXT): $(top_srcdir)/internal/basic_operators.h
 range.$(OBJEXT): $(top_srcdir)/internal/bignum.h
@@ -12315,6 +14929,7 @@ range.$(OBJEXT): {$(VPATH)}internal/intern/re.h
 range.$(OBJEXT): {$(VPATH)}internal/intern/ruby.h
 range.$(OBJEXT): {$(VPATH)}internal/intern/select.h
 range.$(OBJEXT): {$(VPATH)}internal/intern/select/largesize.h
+range.$(OBJEXT): {$(VPATH)}internal/intern/set.h
 range.$(OBJEXT): {$(VPATH)}internal/intern/signal.h
 range.$(OBJEXT): {$(VPATH)}internal/intern/sprintf.h
 range.$(OBJEXT): {$(VPATH)}internal/intern/string.h
@@ -12334,6 +14949,7 @@ range.$(OBJEXT): {$(VPATH)}internal/special_consts.h
 range.$(OBJEXT): {$(VPATH)}internal/static_assert.h
 range.$(OBJEXT): {$(VPATH)}internal/stdalign.h
 range.$(OBJEXT): {$(VPATH)}internal/stdbool.h
+range.$(OBJEXT): {$(VPATH)}internal/stdckdint.h
 range.$(OBJEXT): {$(VPATH)}internal/symbol.h
 range.$(OBJEXT): {$(VPATH)}internal/value.h
 range.$(OBJEXT): {$(VPATH)}internal/value_type.h
@@ -12362,10 +14978,13 @@ rational.$(OBJEXT): $(top_srcdir)/internal/complex.h
 rational.$(OBJEXT): $(top_srcdir)/internal/fixnum.h
 rational.$(OBJEXT): $(top_srcdir)/internal/gc.h
 rational.$(OBJEXT): $(top_srcdir)/internal/imemo.h
+rational.$(OBJEXT): $(top_srcdir)/internal/namespace.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/sanitizers.h
 rational.$(OBJEXT): $(top_srcdir)/internal/serial.h
+rational.$(OBJEXT): $(top_srcdir)/internal/set_table.h
 rational.$(OBJEXT): $(top_srcdir)/internal/static_assert.h
 rational.$(OBJEXT): $(top_srcdir)/internal/variable.h
 rational.$(OBJEXT): $(top_srcdir)/internal/vm.h
@@ -12512,6 +15131,7 @@ rational.$(OBJEXT): {$(VPATH)}internal/intern/re.h
 rational.$(OBJEXT): {$(VPATH)}internal/intern/ruby.h
 rational.$(OBJEXT): {$(VPATH)}internal/intern/select.h
 rational.$(OBJEXT): {$(VPATH)}internal/intern/select/largesize.h
+rational.$(OBJEXT): {$(VPATH)}internal/intern/set.h
 rational.$(OBJEXT): {$(VPATH)}internal/intern/signal.h
 rational.$(OBJEXT): {$(VPATH)}internal/intern/sprintf.h
 rational.$(OBJEXT): {$(VPATH)}internal/intern/string.h
@@ -12531,6 +15151,7 @@ rational.$(OBJEXT): {$(VPATH)}internal/special_consts.h
 rational.$(OBJEXT): {$(VPATH)}internal/static_assert.h
 rational.$(OBJEXT): {$(VPATH)}internal/stdalign.h
 rational.$(OBJEXT): {$(VPATH)}internal/stdbool.h
+rational.$(OBJEXT): {$(VPATH)}internal/stdckdint.h
 rational.$(OBJEXT): {$(VPATH)}internal/symbol.h
 rational.$(OBJEXT): {$(VPATH)}internal/value.h
 rational.$(OBJEXT): {$(VPATH)}internal/value_type.h
@@ -12568,10 +15189,13 @@ re.$(OBJEXT): $(top_srcdir)/internal/encoding.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/namespace.h
 re.$(OBJEXT): $(top_srcdir)/internal/object.h
 re.$(OBJEXT): $(top_srcdir)/internal/ractor.h
 re.$(OBJEXT): $(top_srcdir)/internal/re.h
+re.$(OBJEXT): $(top_srcdir)/internal/sanitizers.h
 re.$(OBJEXT): $(top_srcdir)/internal/serial.h
+re.$(OBJEXT): $(top_srcdir)/internal/set_table.h
 re.$(OBJEXT): $(top_srcdir)/internal/static_assert.h
 re.$(OBJEXT): $(top_srcdir)/internal/string.h
 re.$(OBJEXT): $(top_srcdir)/internal/time.h
@@ -12723,6 +15347,7 @@ re.$(OBJEXT): {$(VPATH)}internal/intern/re.h
 re.$(OBJEXT): {$(VPATH)}internal/intern/ruby.h
 re.$(OBJEXT): {$(VPATH)}internal/intern/select.h
 re.$(OBJEXT): {$(VPATH)}internal/intern/select/largesize.h
+re.$(OBJEXT): {$(VPATH)}internal/intern/set.h
 re.$(OBJEXT): {$(VPATH)}internal/intern/signal.h
 re.$(OBJEXT): {$(VPATH)}internal/intern/sprintf.h
 re.$(OBJEXT): {$(VPATH)}internal/intern/string.h
@@ -12742,6 +15367,7 @@ re.$(OBJEXT): {$(VPATH)}internal/special_consts.h
 re.$(OBJEXT): {$(VPATH)}internal/static_assert.h
 re.$(OBJEXT): {$(VPATH)}internal/stdalign.h
 re.$(OBJEXT): {$(VPATH)}internal/stdbool.h
+re.$(OBJEXT): {$(VPATH)}internal/stdckdint.h
 re.$(OBJEXT): {$(VPATH)}internal/symbol.h
 re.$(OBJEXT): {$(VPATH)}internal/value.h
 re.$(OBJEXT): {$(VPATH)}internal/value_type.h
@@ -12753,6 +15379,8 @@ re.$(OBJEXT): {$(VPATH)}missing.h
 re.$(OBJEXT): {$(VPATH)}node.h
 re.$(OBJEXT): {$(VPATH)}onigmo.h
 re.$(OBJEXT): {$(VPATH)}oniguruma.h
+re.$(OBJEXT): {$(VPATH)}ractor.h
+re.$(OBJEXT): {$(VPATH)}ractor_core.h
 re.$(OBJEXT): {$(VPATH)}re.c
 re.$(OBJEXT): {$(VPATH)}re.h
 re.$(OBJEXT): {$(VPATH)}regenc.h
@@ -12768,6 +15396,7 @@ re.$(OBJEXT): {$(VPATH)}thread_$(THREAD_MODEL).h
 re.$(OBJEXT): {$(VPATH)}thread_native.h
 re.$(OBJEXT): {$(VPATH)}util.h
 re.$(OBJEXT): {$(VPATH)}vm_core.h
+re.$(OBJEXT): {$(VPATH)}vm_debug.h
 re.$(OBJEXT): {$(VPATH)}vm_opts.h
 regcomp.$(OBJEXT): $(hdrdir)/ruby.h
 regcomp.$(OBJEXT): $(hdrdir)/ruby/ruby.h
@@ -12897,6 +15526,7 @@ regcomp.$(OBJEXT): {$(VPATH)}internal/intern/re.h
 regcomp.$(OBJEXT): {$(VPATH)}internal/intern/ruby.h
 regcomp.$(OBJEXT): {$(VPATH)}internal/intern/select.h
 regcomp.$(OBJEXT): {$(VPATH)}internal/intern/select/largesize.h
+regcomp.$(OBJEXT): {$(VPATH)}internal/intern/set.h
 regcomp.$(OBJEXT): {$(VPATH)}internal/intern/signal.h
 regcomp.$(OBJEXT): {$(VPATH)}internal/intern/sprintf.h
 regcomp.$(OBJEXT): {$(VPATH)}internal/intern/string.h
@@ -12916,6 +15546,7 @@ regcomp.$(OBJEXT): {$(VPATH)}internal/special_consts.h
 regcomp.$(OBJEXT): {$(VPATH)}internal/static_assert.h
 regcomp.$(OBJEXT): {$(VPATH)}internal/stdalign.h
 regcomp.$(OBJEXT): {$(VPATH)}internal/stdbool.h
+regcomp.$(OBJEXT): {$(VPATH)}internal/stdckdint.h
 regcomp.$(OBJEXT): {$(VPATH)}internal/symbol.h
 regcomp.$(OBJEXT): {$(VPATH)}internal/value.h
 regcomp.$(OBJEXT): {$(VPATH)}internal/value_type.h
@@ -13058,6 +15689,7 @@ regenc.$(OBJEXT): {$(VPATH)}internal/intern/re.h
 regenc.$(OBJEXT): {$(VPATH)}internal/intern/ruby.h
 regenc.$(OBJEXT): {$(VPATH)}internal/intern/select.h
 regenc.$(OBJEXT): {$(VPATH)}internal/intern/select/largesize.h
+regenc.$(OBJEXT): {$(VPATH)}internal/intern/set.h
 regenc.$(OBJEXT): {$(VPATH)}internal/intern/signal.h
 regenc.$(OBJEXT): {$(VPATH)}internal/intern/sprintf.h
 regenc.$(OBJEXT): {$(VPATH)}internal/intern/string.h
@@ -13077,6 +15709,7 @@ regenc.$(OBJEXT): {$(VPATH)}internal/special_consts.h
 regenc.$(OBJEXT): {$(VPATH)}internal/static_assert.h
 regenc.$(OBJEXT): {$(VPATH)}internal/stdalign.h
 regenc.$(OBJEXT): {$(VPATH)}internal/stdbool.h
+regenc.$(OBJEXT): {$(VPATH)}internal/stdckdint.h
 regenc.$(OBJEXT): {$(VPATH)}internal/symbol.h
 regenc.$(OBJEXT): {$(VPATH)}internal/value.h
 regenc.$(OBJEXT): {$(VPATH)}internal/value_type.h
@@ -13218,6 +15851,7 @@ regerror.$(OBJEXT): {$(VPATH)}internal/intern/re.h
 regerror.$(OBJEXT): {$(VPATH)}internal/intern/ruby.h
 regerror.$(OBJEXT): {$(VPATH)}internal/intern/select.h
 regerror.$(OBJEXT): {$(VPATH)}internal/intern/select/largesize.h
+regerror.$(OBJEXT): {$(VPATH)}internal/intern/set.h
 regerror.$(OBJEXT): {$(VPATH)}internal/intern/signal.h
 regerror.$(OBJEXT): {$(VPATH)}internal/intern/sprintf.h
 regerror.$(OBJEXT): {$(VPATH)}internal/intern/string.h
@@ -13237,6 +15871,7 @@ regerror.$(OBJEXT): {$(VPATH)}internal/special_consts.h
 regerror.$(OBJEXT): {$(VPATH)}internal/static_assert.h
 regerror.$(OBJEXT): {$(VPATH)}internal/stdalign.h
 regerror.$(OBJEXT): {$(VPATH)}internal/stdbool.h
+regerror.$(OBJEXT): {$(VPATH)}internal/stdckdint.h
 regerror.$(OBJEXT): {$(VPATH)}internal/symbol.h
 regerror.$(OBJEXT): {$(VPATH)}internal/value.h
 regerror.$(OBJEXT): {$(VPATH)}internal/value_type.h
@@ -13378,6 +16013,7 @@ regexec.$(OBJEXT): {$(VPATH)}internal/intern/re.h
 regexec.$(OBJEXT): {$(VPATH)}internal/intern/ruby.h
 regexec.$(OBJEXT): {$(VPATH)}internal/intern/select.h
 regexec.$(OBJEXT): {$(VPATH)}internal/intern/select/largesize.h
+regexec.$(OBJEXT): {$(VPATH)}internal/intern/set.h
 regexec.$(OBJEXT): {$(VPATH)}internal/intern/signal.h
 regexec.$(OBJEXT): {$(VPATH)}internal/intern/sprintf.h
 regexec.$(OBJEXT): {$(VPATH)}internal/intern/string.h
@@ -13397,6 +16033,7 @@ regexec.$(OBJEXT): {$(VPATH)}internal/special_consts.h
 regexec.$(OBJEXT): {$(VPATH)}internal/static_assert.h
 regexec.$(OBJEXT): {$(VPATH)}internal/stdalign.h
 regexec.$(OBJEXT): {$(VPATH)}internal/stdbool.h
+regexec.$(OBJEXT): {$(VPATH)}internal/stdckdint.h
 regexec.$(OBJEXT): {$(VPATH)}internal/symbol.h
 regexec.$(OBJEXT): {$(VPATH)}internal/value.h
 regexec.$(OBJEXT): {$(VPATH)}internal/value_type.h
@@ -13542,6 +16179,7 @@ regparse.$(OBJEXT): {$(VPATH)}internal/intern/re.h
 regparse.$(OBJEXT): {$(VPATH)}internal/intern/ruby.h
 regparse.$(OBJEXT): {$(VPATH)}internal/intern/select.h
 regparse.$(OBJEXT): {$(VPATH)}internal/intern/select/largesize.h
+regparse.$(OBJEXT): {$(VPATH)}internal/intern/set.h
 regparse.$(OBJEXT): {$(VPATH)}internal/intern/signal.h
 regparse.$(OBJEXT): {$(VPATH)}internal/intern/sprintf.h
 regparse.$(OBJEXT): {$(VPATH)}internal/intern/string.h
@@ -13561,6 +16199,7 @@ regparse.$(OBJEXT): {$(VPATH)}internal/special_consts.h
 regparse.$(OBJEXT): {$(VPATH)}internal/static_assert.h
 regparse.$(OBJEXT): {$(VPATH)}internal/stdalign.h
 regparse.$(OBJEXT): {$(VPATH)}internal/stdbool.h
+regparse.$(OBJEXT): {$(VPATH)}internal/stdckdint.h
 regparse.$(OBJEXT): {$(VPATH)}internal/symbol.h
 regparse.$(OBJEXT): {$(VPATH)}internal/value.h
 regparse.$(OBJEXT): {$(VPATH)}internal/value_type.h
@@ -13703,6 +16342,7 @@ regsyntax.$(OBJEXT): {$(VPATH)}internal/intern/re.h
 regsyntax.$(OBJEXT): {$(VPATH)}internal/intern/ruby.h
 regsyntax.$(OBJEXT): {$(VPATH)}internal/intern/select.h
 regsyntax.$(OBJEXT): {$(VPATH)}internal/intern/select/largesize.h
+regsyntax.$(OBJEXT): {$(VPATH)}internal/intern/set.h
 regsyntax.$(OBJEXT): {$(VPATH)}internal/intern/signal.h
 regsyntax.$(OBJEXT): {$(VPATH)}internal/intern/sprintf.h
 regsyntax.$(OBJEXT): {$(VPATH)}internal/intern/string.h
@@ -13722,6 +16362,7 @@ regsyntax.$(OBJEXT): {$(VPATH)}internal/special_consts.h
 regsyntax.$(OBJEXT): {$(VPATH)}internal/static_assert.h
 regsyntax.$(OBJEXT): {$(VPATH)}internal/stdalign.h
 regsyntax.$(OBJEXT): {$(VPATH)}internal/stdbool.h
+regsyntax.$(OBJEXT): {$(VPATH)}internal/stdckdint.h
 regsyntax.$(OBJEXT): {$(VPATH)}internal/symbol.h
 regsyntax.$(OBJEXT): {$(VPATH)}internal/value.h
 regsyntax.$(OBJEXT): {$(VPATH)}internal/value_type.h
@@ -13735,461 +16376,6 @@ regsyntax.$(OBJEXT): {$(VPATH)}regint.h
 regsyntax.$(OBJEXT): {$(VPATH)}regsyntax.c
 regsyntax.$(OBJEXT): {$(VPATH)}st.h
 regsyntax.$(OBJEXT): {$(VPATH)}subst.h
-rjit.$(OBJEXT): $(CCAN_DIR)/check_type/check_type.h
-rjit.$(OBJEXT): $(CCAN_DIR)/container_of/container_of.h
-rjit.$(OBJEXT): $(CCAN_DIR)/list/list.h
-rjit.$(OBJEXT): $(CCAN_DIR)/str/str.h
-rjit.$(OBJEXT): $(hdrdir)/ruby.h
-rjit.$(OBJEXT): $(hdrdir)/ruby/ruby.h
-rjit.$(OBJEXT): $(hdrdir)/ruby/version.h
-rjit.$(OBJEXT): $(top_srcdir)/internal/array.h
-rjit.$(OBJEXT): $(top_srcdir)/internal/basic_operators.h
-rjit.$(OBJEXT): $(top_srcdir)/internal/class.h
-rjit.$(OBJEXT): $(top_srcdir)/internal/cmdlineopt.h
-rjit.$(OBJEXT): $(top_srcdir)/internal/compile.h
-rjit.$(OBJEXT): $(top_srcdir)/internal/compilers.h
-rjit.$(OBJEXT): $(top_srcdir)/internal/cont.h
-rjit.$(OBJEXT): $(top_srcdir)/internal/file.h
-rjit.$(OBJEXT): $(top_srcdir)/internal/gc.h
-rjit.$(OBJEXT): $(top_srcdir)/internal/hash.h
-rjit.$(OBJEXT): $(top_srcdir)/internal/imemo.h
-rjit.$(OBJEXT): $(top_srcdir)/internal/process.h
-rjit.$(OBJEXT): $(top_srcdir)/internal/serial.h
-rjit.$(OBJEXT): $(top_srcdir)/internal/static_assert.h
-rjit.$(OBJEXT): $(top_srcdir)/internal/string.h
-rjit.$(OBJEXT): $(top_srcdir)/internal/struct.h
-rjit.$(OBJEXT): $(top_srcdir)/internal/variable.h
-rjit.$(OBJEXT): $(top_srcdir)/internal/vm.h
-rjit.$(OBJEXT): $(top_srcdir)/internal/warnings.h
-rjit.$(OBJEXT): {$(VPATH)}assert.h
-rjit.$(OBJEXT): {$(VPATH)}atomic.h
-rjit.$(OBJEXT): {$(VPATH)}backward/2/assume.h
-rjit.$(OBJEXT): {$(VPATH)}backward/2/attributes.h
-rjit.$(OBJEXT): {$(VPATH)}backward/2/bool.h
-rjit.$(OBJEXT): {$(VPATH)}backward/2/gcc_version_since.h
-rjit.$(OBJEXT): {$(VPATH)}backward/2/inttypes.h
-rjit.$(OBJEXT): {$(VPATH)}backward/2/limits.h
-rjit.$(OBJEXT): {$(VPATH)}backward/2/long_long.h
-rjit.$(OBJEXT): {$(VPATH)}backward/2/stdalign.h
-rjit.$(OBJEXT): {$(VPATH)}backward/2/stdarg.h
-rjit.$(OBJEXT): {$(VPATH)}builtin.h
-rjit.$(OBJEXT): {$(VPATH)}config.h
-rjit.$(OBJEXT): {$(VPATH)}constant.h
-rjit.$(OBJEXT): {$(VPATH)}debug.h
-rjit.$(OBJEXT): {$(VPATH)}debug_counter.h
-rjit.$(OBJEXT): {$(VPATH)}defines.h
-rjit.$(OBJEXT): {$(VPATH)}dln.h
-rjit.$(OBJEXT): {$(VPATH)}encoding.h
-rjit.$(OBJEXT): {$(VPATH)}id.h
-rjit.$(OBJEXT): {$(VPATH)}id_table.h
-rjit.$(OBJEXT): {$(VPATH)}insns.def
-rjit.$(OBJEXT): {$(VPATH)}insns.inc
-rjit.$(OBJEXT): {$(VPATH)}insns_info.inc
-rjit.$(OBJEXT): {$(VPATH)}intern.h
-rjit.$(OBJEXT): {$(VPATH)}internal.h
-rjit.$(OBJEXT): {$(VPATH)}internal/abi.h
-rjit.$(OBJEXT): {$(VPATH)}internal/anyargs.h
-rjit.$(OBJEXT): {$(VPATH)}internal/arithmetic.h
-rjit.$(OBJEXT): {$(VPATH)}internal/arithmetic/char.h
-rjit.$(OBJEXT): {$(VPATH)}internal/arithmetic/double.h
-rjit.$(OBJEXT): {$(VPATH)}internal/arithmetic/fixnum.h
-rjit.$(OBJEXT): {$(VPATH)}internal/arithmetic/gid_t.h
-rjit.$(OBJEXT): {$(VPATH)}internal/arithmetic/int.h
-rjit.$(OBJEXT): {$(VPATH)}internal/arithmetic/intptr_t.h
-rjit.$(OBJEXT): {$(VPATH)}internal/arithmetic/long.h
-rjit.$(OBJEXT): {$(VPATH)}internal/arithmetic/long_long.h
-rjit.$(OBJEXT): {$(VPATH)}internal/arithmetic/mode_t.h
-rjit.$(OBJEXT): {$(VPATH)}internal/arithmetic/off_t.h
-rjit.$(OBJEXT): {$(VPATH)}internal/arithmetic/pid_t.h
-rjit.$(OBJEXT): {$(VPATH)}internal/arithmetic/short.h
-rjit.$(OBJEXT): {$(VPATH)}internal/arithmetic/size_t.h
-rjit.$(OBJEXT): {$(VPATH)}internal/arithmetic/st_data_t.h
-rjit.$(OBJEXT): {$(VPATH)}internal/arithmetic/uid_t.h
-rjit.$(OBJEXT): {$(VPATH)}internal/assume.h
-rjit.$(OBJEXT): {$(VPATH)}internal/attr/alloc_size.h
-rjit.$(OBJEXT): {$(VPATH)}internal/attr/artificial.h
-rjit.$(OBJEXT): {$(VPATH)}internal/attr/cold.h
-rjit.$(OBJEXT): {$(VPATH)}internal/attr/const.h
-rjit.$(OBJEXT): {$(VPATH)}internal/attr/constexpr.h
-rjit.$(OBJEXT): {$(VPATH)}internal/attr/deprecated.h
-rjit.$(OBJEXT): {$(VPATH)}internal/attr/diagnose_if.h
-rjit.$(OBJEXT): {$(VPATH)}internal/attr/enum_extensibility.h
-rjit.$(OBJEXT): {$(VPATH)}internal/attr/error.h
-rjit.$(OBJEXT): {$(VPATH)}internal/attr/flag_enum.h
-rjit.$(OBJEXT): {$(VPATH)}internal/attr/forceinline.h
-rjit.$(OBJEXT): {$(VPATH)}internal/attr/format.h
-rjit.$(OBJEXT): {$(VPATH)}internal/attr/maybe_unused.h
-rjit.$(OBJEXT): {$(VPATH)}internal/attr/noalias.h
-rjit.$(OBJEXT): {$(VPATH)}internal/attr/nodiscard.h
-rjit.$(OBJEXT): {$(VPATH)}internal/attr/noexcept.h
-rjit.$(OBJEXT): {$(VPATH)}internal/attr/noinline.h
-rjit.$(OBJEXT): {$(VPATH)}internal/attr/nonnull.h
-rjit.$(OBJEXT): {$(VPATH)}internal/attr/noreturn.h
-rjit.$(OBJEXT): {$(VPATH)}internal/attr/packed_struct.h
-rjit.$(OBJEXT): {$(VPATH)}internal/attr/pure.h
-rjit.$(OBJEXT): {$(VPATH)}internal/attr/restrict.h
-rjit.$(OBJEXT): {$(VPATH)}internal/attr/returns_nonnull.h
-rjit.$(OBJEXT): {$(VPATH)}internal/attr/warning.h
-rjit.$(OBJEXT): {$(VPATH)}internal/attr/weakref.h
-rjit.$(OBJEXT): {$(VPATH)}internal/cast.h
-rjit.$(OBJEXT): {$(VPATH)}internal/compiler_is.h
-rjit.$(OBJEXT): {$(VPATH)}internal/compiler_is/apple.h
-rjit.$(OBJEXT): {$(VPATH)}internal/compiler_is/clang.h
-rjit.$(OBJEXT): {$(VPATH)}internal/compiler_is/gcc.h
-rjit.$(OBJEXT): {$(VPATH)}internal/compiler_is/intel.h
-rjit.$(OBJEXT): {$(VPATH)}internal/compiler_is/msvc.h
-rjit.$(OBJEXT): {$(VPATH)}internal/compiler_is/sunpro.h
-rjit.$(OBJEXT): {$(VPATH)}internal/compiler_since.h
-rjit.$(OBJEXT): {$(VPATH)}internal/config.h
-rjit.$(OBJEXT): {$(VPATH)}internal/constant_p.h
-rjit.$(OBJEXT): {$(VPATH)}internal/core.h
-rjit.$(OBJEXT): {$(VPATH)}internal/core/rarray.h
-rjit.$(OBJEXT): {$(VPATH)}internal/core/rbasic.h
-rjit.$(OBJEXT): {$(VPATH)}internal/core/rbignum.h
-rjit.$(OBJEXT): {$(VPATH)}internal/core/rclass.h
-rjit.$(OBJEXT): {$(VPATH)}internal/core/rdata.h
-rjit.$(OBJEXT): {$(VPATH)}internal/core/rfile.h
-rjit.$(OBJEXT): {$(VPATH)}internal/core/rhash.h
-rjit.$(OBJEXT): {$(VPATH)}internal/core/robject.h
-rjit.$(OBJEXT): {$(VPATH)}internal/core/rregexp.h
-rjit.$(OBJEXT): {$(VPATH)}internal/core/rstring.h
-rjit.$(OBJEXT): {$(VPATH)}internal/core/rstruct.h
-rjit.$(OBJEXT): {$(VPATH)}internal/core/rtypeddata.h
-rjit.$(OBJEXT): {$(VPATH)}internal/ctype.h
-rjit.$(OBJEXT): {$(VPATH)}internal/dllexport.h
-rjit.$(OBJEXT): {$(VPATH)}internal/dosish.h
-rjit.$(OBJEXT): {$(VPATH)}internal/encoding/coderange.h
-rjit.$(OBJEXT): {$(VPATH)}internal/encoding/ctype.h
-rjit.$(OBJEXT): {$(VPATH)}internal/encoding/encoding.h
-rjit.$(OBJEXT): {$(VPATH)}internal/encoding/pathname.h
-rjit.$(OBJEXT): {$(VPATH)}internal/encoding/re.h
-rjit.$(OBJEXT): {$(VPATH)}internal/encoding/sprintf.h
-rjit.$(OBJEXT): {$(VPATH)}internal/encoding/string.h
-rjit.$(OBJEXT): {$(VPATH)}internal/encoding/symbol.h
-rjit.$(OBJEXT): {$(VPATH)}internal/encoding/transcode.h
-rjit.$(OBJEXT): {$(VPATH)}internal/error.h
-rjit.$(OBJEXT): {$(VPATH)}internal/eval.h
-rjit.$(OBJEXT): {$(VPATH)}internal/event.h
-rjit.$(OBJEXT): {$(VPATH)}internal/fl_type.h
-rjit.$(OBJEXT): {$(VPATH)}internal/gc.h
-rjit.$(OBJEXT): {$(VPATH)}internal/glob.h
-rjit.$(OBJEXT): {$(VPATH)}internal/globals.h
-rjit.$(OBJEXT): {$(VPATH)}internal/has/attribute.h
-rjit.$(OBJEXT): {$(VPATH)}internal/has/builtin.h
-rjit.$(OBJEXT): {$(VPATH)}internal/has/c_attribute.h
-rjit.$(OBJEXT): {$(VPATH)}internal/has/cpp_attribute.h
-rjit.$(OBJEXT): {$(VPATH)}internal/has/declspec_attribute.h
-rjit.$(OBJEXT): {$(VPATH)}internal/has/extension.h
-rjit.$(OBJEXT): {$(VPATH)}internal/has/feature.h
-rjit.$(OBJEXT): {$(VPATH)}internal/has/warning.h
-rjit.$(OBJEXT): {$(VPATH)}internal/intern/array.h
-rjit.$(OBJEXT): {$(VPATH)}internal/intern/bignum.h
-rjit.$(OBJEXT): {$(VPATH)}internal/intern/class.h
-rjit.$(OBJEXT): {$(VPATH)}internal/intern/compar.h
-rjit.$(OBJEXT): {$(VPATH)}internal/intern/complex.h
-rjit.$(OBJEXT): {$(VPATH)}internal/intern/cont.h
-rjit.$(OBJEXT): {$(VPATH)}internal/intern/dir.h
-rjit.$(OBJEXT): {$(VPATH)}internal/intern/enum.h
-rjit.$(OBJEXT): {$(VPATH)}internal/intern/enumerator.h
-rjit.$(OBJEXT): {$(VPATH)}internal/intern/error.h
-rjit.$(OBJEXT): {$(VPATH)}internal/intern/eval.h
-rjit.$(OBJEXT): {$(VPATH)}internal/intern/file.h
-rjit.$(OBJEXT): {$(VPATH)}internal/intern/hash.h
-rjit.$(OBJEXT): {$(VPATH)}internal/intern/io.h
-rjit.$(OBJEXT): {$(VPATH)}internal/intern/load.h
-rjit.$(OBJEXT): {$(VPATH)}internal/intern/marshal.h
-rjit.$(OBJEXT): {$(VPATH)}internal/intern/numeric.h
-rjit.$(OBJEXT): {$(VPATH)}internal/intern/object.h
-rjit.$(OBJEXT): {$(VPATH)}internal/intern/parse.h
-rjit.$(OBJEXT): {$(VPATH)}internal/intern/proc.h
-rjit.$(OBJEXT): {$(VPATH)}internal/intern/process.h
-rjit.$(OBJEXT): {$(VPATH)}internal/intern/random.h
-rjit.$(OBJEXT): {$(VPATH)}internal/intern/range.h
-rjit.$(OBJEXT): {$(VPATH)}internal/intern/rational.h
-rjit.$(OBJEXT): {$(VPATH)}internal/intern/re.h
-rjit.$(OBJEXT): {$(VPATH)}internal/intern/ruby.h
-rjit.$(OBJEXT): {$(VPATH)}internal/intern/select.h
-rjit.$(OBJEXT): {$(VPATH)}internal/intern/select/largesize.h
-rjit.$(OBJEXT): {$(VPATH)}internal/intern/signal.h
-rjit.$(OBJEXT): {$(VPATH)}internal/intern/sprintf.h
-rjit.$(OBJEXT): {$(VPATH)}internal/intern/string.h
-rjit.$(OBJEXT): {$(VPATH)}internal/intern/struct.h
-rjit.$(OBJEXT): {$(VPATH)}internal/intern/thread.h
-rjit.$(OBJEXT): {$(VPATH)}internal/intern/time.h
-rjit.$(OBJEXT): {$(VPATH)}internal/intern/variable.h
-rjit.$(OBJEXT): {$(VPATH)}internal/intern/vm.h
-rjit.$(OBJEXT): {$(VPATH)}internal/interpreter.h
-rjit.$(OBJEXT): {$(VPATH)}internal/iterator.h
-rjit.$(OBJEXT): {$(VPATH)}internal/memory.h
-rjit.$(OBJEXT): {$(VPATH)}internal/method.h
-rjit.$(OBJEXT): {$(VPATH)}internal/module.h
-rjit.$(OBJEXT): {$(VPATH)}internal/newobj.h
-rjit.$(OBJEXT): {$(VPATH)}internal/scan_args.h
-rjit.$(OBJEXT): {$(VPATH)}internal/special_consts.h
-rjit.$(OBJEXT): {$(VPATH)}internal/static_assert.h
-rjit.$(OBJEXT): {$(VPATH)}internal/stdalign.h
-rjit.$(OBJEXT): {$(VPATH)}internal/stdbool.h
-rjit.$(OBJEXT): {$(VPATH)}internal/symbol.h
-rjit.$(OBJEXT): {$(VPATH)}internal/value.h
-rjit.$(OBJEXT): {$(VPATH)}internal/value_type.h
-rjit.$(OBJEXT): {$(VPATH)}internal/variable.h
-rjit.$(OBJEXT): {$(VPATH)}internal/warning_push.h
-rjit.$(OBJEXT): {$(VPATH)}internal/xmalloc.h
-rjit.$(OBJEXT): {$(VPATH)}iseq.h
-rjit.$(OBJEXT): {$(VPATH)}method.h
-rjit.$(OBJEXT): {$(VPATH)}missing.h
-rjit.$(OBJEXT): {$(VPATH)}node.h
-rjit.$(OBJEXT): {$(VPATH)}onigmo.h
-rjit.$(OBJEXT): {$(VPATH)}oniguruma.h
-rjit.$(OBJEXT): {$(VPATH)}ractor.h
-rjit.$(OBJEXT): {$(VPATH)}ractor_core.h
-rjit.$(OBJEXT): {$(VPATH)}rjit.c
-rjit.$(OBJEXT): {$(VPATH)}rjit.h
-rjit.$(OBJEXT): {$(VPATH)}rjit.rbinc
-rjit.$(OBJEXT): {$(VPATH)}rjit_c.h
-rjit.$(OBJEXT): {$(VPATH)}ruby_assert.h
-rjit.$(OBJEXT): {$(VPATH)}ruby_atomic.h
-rjit.$(OBJEXT): {$(VPATH)}rubyparser.h
-rjit.$(OBJEXT): {$(VPATH)}shape.h
-rjit.$(OBJEXT): {$(VPATH)}st.h
-rjit.$(OBJEXT): {$(VPATH)}subst.h
-rjit.$(OBJEXT): {$(VPATH)}thread.h
-rjit.$(OBJEXT): {$(VPATH)}thread_$(THREAD_MODEL).h
-rjit.$(OBJEXT): {$(VPATH)}thread_native.h
-rjit.$(OBJEXT): {$(VPATH)}util.h
-rjit.$(OBJEXT): {$(VPATH)}vm_callinfo.h
-rjit.$(OBJEXT): {$(VPATH)}vm_core.h
-rjit.$(OBJEXT): {$(VPATH)}vm_debug.h
-rjit.$(OBJEXT): {$(VPATH)}vm_opts.h
-rjit.$(OBJEXT): {$(VPATH)}vm_sync.h
-rjit.$(OBJEXT): {$(VPATH)}yjit.h
-rjit_c.$(OBJEXT): $(CCAN_DIR)/check_type/check_type.h
-rjit_c.$(OBJEXT): $(CCAN_DIR)/container_of/container_of.h
-rjit_c.$(OBJEXT): $(CCAN_DIR)/list/list.h
-rjit_c.$(OBJEXT): $(CCAN_DIR)/str/str.h
-rjit_c.$(OBJEXT): $(hdrdir)/ruby.h
-rjit_c.$(OBJEXT): $(hdrdir)/ruby/ruby.h
-rjit_c.$(OBJEXT): $(srcdir)/rjit_c.rb
-rjit_c.$(OBJEXT): $(top_srcdir)/internal/array.h
-rjit_c.$(OBJEXT): $(top_srcdir)/internal/basic_operators.h
-rjit_c.$(OBJEXT): $(top_srcdir)/internal/class.h
-rjit_c.$(OBJEXT): $(top_srcdir)/internal/compile.h
-rjit_c.$(OBJEXT): $(top_srcdir)/internal/compilers.h
-rjit_c.$(OBJEXT): $(top_srcdir)/internal/fixnum.h
-rjit_c.$(OBJEXT): $(top_srcdir)/internal/gc.h
-rjit_c.$(OBJEXT): $(top_srcdir)/internal/hash.h
-rjit_c.$(OBJEXT): $(top_srcdir)/internal/imemo.h
-rjit_c.$(OBJEXT): $(top_srcdir)/internal/object.h
-rjit_c.$(OBJEXT): $(top_srcdir)/internal/proc.h
-rjit_c.$(OBJEXT): $(top_srcdir)/internal/sanitizers.h
-rjit_c.$(OBJEXT): $(top_srcdir)/internal/serial.h
-rjit_c.$(OBJEXT): $(top_srcdir)/internal/static_assert.h
-rjit_c.$(OBJEXT): $(top_srcdir)/internal/string.h
-rjit_c.$(OBJEXT): $(top_srcdir)/internal/struct.h
-rjit_c.$(OBJEXT): $(top_srcdir)/internal/variable.h
-rjit_c.$(OBJEXT): $(top_srcdir)/internal/vm.h
-rjit_c.$(OBJEXT): $(top_srcdir)/internal/warnings.h
-rjit_c.$(OBJEXT): {$(VPATH)}assert.h
-rjit_c.$(OBJEXT): {$(VPATH)}atomic.h
-rjit_c.$(OBJEXT): {$(VPATH)}backward/2/assume.h
-rjit_c.$(OBJEXT): {$(VPATH)}backward/2/attributes.h
-rjit_c.$(OBJEXT): {$(VPATH)}backward/2/bool.h
-rjit_c.$(OBJEXT): {$(VPATH)}backward/2/gcc_version_since.h
-rjit_c.$(OBJEXT): {$(VPATH)}backward/2/inttypes.h
-rjit_c.$(OBJEXT): {$(VPATH)}backward/2/limits.h
-rjit_c.$(OBJEXT): {$(VPATH)}backward/2/long_long.h
-rjit_c.$(OBJEXT): {$(VPATH)}backward/2/stdalign.h
-rjit_c.$(OBJEXT): {$(VPATH)}backward/2/stdarg.h
-rjit_c.$(OBJEXT): {$(VPATH)}builtin.h
-rjit_c.$(OBJEXT): {$(VPATH)}config.h
-rjit_c.$(OBJEXT): {$(VPATH)}constant.h
-rjit_c.$(OBJEXT): {$(VPATH)}debug.h
-rjit_c.$(OBJEXT): {$(VPATH)}debug_counter.h
-rjit_c.$(OBJEXT): {$(VPATH)}defines.h
-rjit_c.$(OBJEXT): {$(VPATH)}encoding.h
-rjit_c.$(OBJEXT): {$(VPATH)}id.h
-rjit_c.$(OBJEXT): {$(VPATH)}id_table.h
-rjit_c.$(OBJEXT): {$(VPATH)}insns.def
-rjit_c.$(OBJEXT): {$(VPATH)}insns.inc
-rjit_c.$(OBJEXT): {$(VPATH)}insns_info.inc
-rjit_c.$(OBJEXT): {$(VPATH)}intern.h
-rjit_c.$(OBJEXT): {$(VPATH)}internal.h
-rjit_c.$(OBJEXT): {$(VPATH)}internal/abi.h
-rjit_c.$(OBJEXT): {$(VPATH)}internal/anyargs.h
-rjit_c.$(OBJEXT): {$(VPATH)}internal/arithmetic.h
-rjit_c.$(OBJEXT): {$(VPATH)}internal/arithmetic/char.h
-rjit_c.$(OBJEXT): {$(VPATH)}internal/arithmetic/double.h
-rjit_c.$(OBJEXT): {$(VPATH)}internal/arithmetic/fixnum.h
-rjit_c.$(OBJEXT): {$(VPATH)}internal/arithmetic/gid_t.h
-rjit_c.$(OBJEXT): {$(VPATH)}internal/arithmetic/int.h
-rjit_c.$(OBJEXT): {$(VPATH)}internal/arithmetic/intptr_t.h
-rjit_c.$(OBJEXT): {$(VPATH)}internal/arithmetic/long.h
-rjit_c.$(OBJEXT): {$(VPATH)}internal/arithmetic/long_long.h
-rjit_c.$(OBJEXT): {$(VPATH)}internal/arithmetic/mode_t.h
-rjit_c.$(OBJEXT): {$(VPATH)}internal/arithmetic/off_t.h
-rjit_c.$(OBJEXT): {$(VPATH)}internal/arithmetic/pid_t.h
-rjit_c.$(OBJEXT): {$(VPATH)}internal/arithmetic/short.h
-rjit_c.$(OBJEXT): {$(VPATH)}internal/arithmetic/size_t.h
-rjit_c.$(OBJEXT): {$(VPATH)}internal/arithmetic/st_data_t.h
-rjit_c.$(OBJEXT): {$(VPATH)}internal/arithmetic/uid_t.h
-rjit_c.$(OBJEXT): {$(VPATH)}internal/assume.h
-rjit_c.$(OBJEXT): {$(VPATH)}internal/attr/alloc_size.h
-rjit_c.$(OBJEXT): {$(VPATH)}internal/attr/artificial.h
-rjit_c.$(OBJEXT): {$(VPATH)}internal/attr/cold.h
-rjit_c.$(OBJEXT): {$(VPATH)}internal/attr/const.h
-rjit_c.$(OBJEXT): {$(VPATH)}internal/attr/constexpr.h
-rjit_c.$(OBJEXT): {$(VPATH)}internal/attr/deprecated.h
-rjit_c.$(OBJEXT): {$(VPATH)}internal/attr/diagnose_if.h
-rjit_c.$(OBJEXT): {$(VPATH)}internal/attr/enum_extensibility.h
-rjit_c.$(OBJEXT): {$(VPATH)}internal/attr/error.h
-rjit_c.$(OBJEXT): {$(VPATH)}internal/attr/flag_enum.h
-rjit_c.$(OBJEXT): {$(VPATH)}internal/attr/forceinline.h
-rjit_c.$(OBJEXT): {$(VPATH)}internal/attr/format.h
-rjit_c.$(OBJEXT): {$(VPATH)}internal/attr/maybe_unused.h
-rjit_c.$(OBJEXT): {$(VPATH)}internal/attr/noalias.h
-rjit_c.$(OBJEXT): {$(VPATH)}internal/attr/nodiscard.h
-rjit_c.$(OBJEXT): {$(VPATH)}internal/attr/noexcept.h
-rjit_c.$(OBJEXT): {$(VPATH)}internal/attr/noinline.h
-rjit_c.$(OBJEXT): {$(VPATH)}internal/attr/nonnull.h
-rjit_c.$(OBJEXT): {$(VPATH)}internal/attr/noreturn.h
-rjit_c.$(OBJEXT): {$(VPATH)}internal/attr/packed_struct.h
-rjit_c.$(OBJEXT): {$(VPATH)}internal/attr/pure.h
-rjit_c.$(OBJEXT): {$(VPATH)}internal/attr/restrict.h
-rjit_c.$(OBJEXT): {$(VPATH)}internal/attr/returns_nonnull.h
-rjit_c.$(OBJEXT): {$(VPATH)}internal/attr/warning.h
-rjit_c.$(OBJEXT): {$(VPATH)}internal/attr/weakref.h
-rjit_c.$(OBJEXT): {$(VPATH)}internal/cast.h
-rjit_c.$(OBJEXT): {$(VPATH)}internal/compiler_is.h
-rjit_c.$(OBJEXT): {$(VPATH)}internal/compiler_is/apple.h
-rjit_c.$(OBJEXT): {$(VPATH)}internal/compiler_is/clang.h
-rjit_c.$(OBJEXT): {$(VPATH)}internal/compiler_is/gcc.h
-rjit_c.$(OBJEXT): {$(VPATH)}internal/compiler_is/intel.h
-rjit_c.$(OBJEXT): {$(VPATH)}internal/compiler_is/msvc.h
-rjit_c.$(OBJEXT): {$(VPATH)}internal/compiler_is/sunpro.h
-rjit_c.$(OBJEXT): {$(VPATH)}internal/compiler_since.h
-rjit_c.$(OBJEXT): {$(VPATH)}internal/config.h
-rjit_c.$(OBJEXT): {$(VPATH)}internal/constant_p.h
-rjit_c.$(OBJEXT): {$(VPATH)}internal/core.h
-rjit_c.$(OBJEXT): {$(VPATH)}internal/core/rarray.h
-rjit_c.$(OBJEXT): {$(VPATH)}internal/core/rbasic.h
-rjit_c.$(OBJEXT): {$(VPATH)}internal/core/rbignum.h
-rjit_c.$(OBJEXT): {$(VPATH)}internal/core/rclass.h
-rjit_c.$(OBJEXT): {$(VPATH)}internal/core/rdata.h
-rjit_c.$(OBJEXT): {$(VPATH)}internal/core/rfile.h
-rjit_c.$(OBJEXT): {$(VPATH)}internal/core/rhash.h
-rjit_c.$(OBJEXT): {$(VPATH)}internal/core/robject.h
-rjit_c.$(OBJEXT): {$(VPATH)}internal/core/rregexp.h
-rjit_c.$(OBJEXT): {$(VPATH)}internal/core/rstring.h
-rjit_c.$(OBJEXT): {$(VPATH)}internal/core/rstruct.h
-rjit_c.$(OBJEXT): {$(VPATH)}internal/core/rtypeddata.h
-rjit_c.$(OBJEXT): {$(VPATH)}internal/ctype.h
-rjit_c.$(OBJEXT): {$(VPATH)}internal/dllexport.h
-rjit_c.$(OBJEXT): {$(VPATH)}internal/dosish.h
-rjit_c.$(OBJEXT): {$(VPATH)}internal/encoding/coderange.h
-rjit_c.$(OBJEXT): {$(VPATH)}internal/encoding/ctype.h
-rjit_c.$(OBJEXT): {$(VPATH)}internal/encoding/encoding.h
-rjit_c.$(OBJEXT): {$(VPATH)}internal/encoding/pathname.h
-rjit_c.$(OBJEXT): {$(VPATH)}internal/encoding/re.h
-rjit_c.$(OBJEXT): {$(VPATH)}internal/encoding/sprintf.h
-rjit_c.$(OBJEXT): {$(VPATH)}internal/encoding/string.h
-rjit_c.$(OBJEXT): {$(VPATH)}internal/encoding/symbol.h
-rjit_c.$(OBJEXT): {$(VPATH)}internal/encoding/transcode.h
-rjit_c.$(OBJEXT): {$(VPATH)}internal/error.h
-rjit_c.$(OBJEXT): {$(VPATH)}internal/eval.h
-rjit_c.$(OBJEXT): {$(VPATH)}internal/event.h
-rjit_c.$(OBJEXT): {$(VPATH)}internal/fl_type.h
-rjit_c.$(OBJEXT): {$(VPATH)}internal/gc.h
-rjit_c.$(OBJEXT): {$(VPATH)}internal/glob.h
-rjit_c.$(OBJEXT): {$(VPATH)}internal/globals.h
-rjit_c.$(OBJEXT): {$(VPATH)}internal/has/attribute.h
-rjit_c.$(OBJEXT): {$(VPATH)}internal/has/builtin.h
-rjit_c.$(OBJEXT): {$(VPATH)}internal/has/c_attribute.h
-rjit_c.$(OBJEXT): {$(VPATH)}internal/has/cpp_attribute.h
-rjit_c.$(OBJEXT): {$(VPATH)}internal/has/declspec_attribute.h
-rjit_c.$(OBJEXT): {$(VPATH)}internal/has/extension.h
-rjit_c.$(OBJEXT): {$(VPATH)}internal/has/feature.h
-rjit_c.$(OBJEXT): {$(VPATH)}internal/has/warning.h
-rjit_c.$(OBJEXT): {$(VPATH)}internal/intern/array.h
-rjit_c.$(OBJEXT): {$(VPATH)}internal/intern/bignum.h
-rjit_c.$(OBJEXT): {$(VPATH)}internal/intern/class.h
-rjit_c.$(OBJEXT): {$(VPATH)}internal/intern/compar.h
-rjit_c.$(OBJEXT): {$(VPATH)}internal/intern/complex.h
-rjit_c.$(OBJEXT): {$(VPATH)}internal/intern/cont.h
-rjit_c.$(OBJEXT): {$(VPATH)}internal/intern/dir.h
-rjit_c.$(OBJEXT): {$(VPATH)}internal/intern/enum.h
-rjit_c.$(OBJEXT): {$(VPATH)}internal/intern/enumerator.h
-rjit_c.$(OBJEXT): {$(VPATH)}internal/intern/error.h
-rjit_c.$(OBJEXT): {$(VPATH)}internal/intern/eval.h
-rjit_c.$(OBJEXT): {$(VPATH)}internal/intern/file.h
-rjit_c.$(OBJEXT): {$(VPATH)}internal/intern/hash.h
-rjit_c.$(OBJEXT): {$(VPATH)}internal/intern/io.h
-rjit_c.$(OBJEXT): {$(VPATH)}internal/intern/load.h
-rjit_c.$(OBJEXT): {$(VPATH)}internal/intern/marshal.h
-rjit_c.$(OBJEXT): {$(VPATH)}internal/intern/numeric.h
-rjit_c.$(OBJEXT): {$(VPATH)}internal/intern/object.h
-rjit_c.$(OBJEXT): {$(VPATH)}internal/intern/parse.h
-rjit_c.$(OBJEXT): {$(VPATH)}internal/intern/proc.h
-rjit_c.$(OBJEXT): {$(VPATH)}internal/intern/process.h
-rjit_c.$(OBJEXT): {$(VPATH)}internal/intern/random.h
-rjit_c.$(OBJEXT): {$(VPATH)}internal/intern/range.h
-rjit_c.$(OBJEXT): {$(VPATH)}internal/intern/rational.h
-rjit_c.$(OBJEXT): {$(VPATH)}internal/intern/re.h
-rjit_c.$(OBJEXT): {$(VPATH)}internal/intern/ruby.h
-rjit_c.$(OBJEXT): {$(VPATH)}internal/intern/select.h
-rjit_c.$(OBJEXT): {$(VPATH)}internal/intern/select/largesize.h
-rjit_c.$(OBJEXT): {$(VPATH)}internal/intern/signal.h
-rjit_c.$(OBJEXT): {$(VPATH)}internal/intern/sprintf.h
-rjit_c.$(OBJEXT): {$(VPATH)}internal/intern/string.h
-rjit_c.$(OBJEXT): {$(VPATH)}internal/intern/struct.h
-rjit_c.$(OBJEXT): {$(VPATH)}internal/intern/thread.h
-rjit_c.$(OBJEXT): {$(VPATH)}internal/intern/time.h
-rjit_c.$(OBJEXT): {$(VPATH)}internal/intern/variable.h
-rjit_c.$(OBJEXT): {$(VPATH)}internal/intern/vm.h
-rjit_c.$(OBJEXT): {$(VPATH)}internal/interpreter.h
-rjit_c.$(OBJEXT): {$(VPATH)}internal/iterator.h
-rjit_c.$(OBJEXT): {$(VPATH)}internal/memory.h
-rjit_c.$(OBJEXT): {$(VPATH)}internal/method.h
-rjit_c.$(OBJEXT): {$(VPATH)}internal/module.h
-rjit_c.$(OBJEXT): {$(VPATH)}internal/newobj.h
-rjit_c.$(OBJEXT): {$(VPATH)}internal/scan_args.h
-rjit_c.$(OBJEXT): {$(VPATH)}internal/special_consts.h
-rjit_c.$(OBJEXT): {$(VPATH)}internal/static_assert.h
-rjit_c.$(OBJEXT): {$(VPATH)}internal/stdalign.h
-rjit_c.$(OBJEXT): {$(VPATH)}internal/stdbool.h
-rjit_c.$(OBJEXT): {$(VPATH)}internal/symbol.h
-rjit_c.$(OBJEXT): {$(VPATH)}internal/value.h
-rjit_c.$(OBJEXT): {$(VPATH)}internal/value_type.h
-rjit_c.$(OBJEXT): {$(VPATH)}internal/variable.h
-rjit_c.$(OBJEXT): {$(VPATH)}internal/warning_push.h
-rjit_c.$(OBJEXT): {$(VPATH)}internal/xmalloc.h
-rjit_c.$(OBJEXT): {$(VPATH)}iseq.h
-rjit_c.$(OBJEXT): {$(VPATH)}method.h
-rjit_c.$(OBJEXT): {$(VPATH)}missing.h
-rjit_c.$(OBJEXT): {$(VPATH)}node.h
-rjit_c.$(OBJEXT): {$(VPATH)}onigmo.h
-rjit_c.$(OBJEXT): {$(VPATH)}oniguruma.h
-rjit_c.$(OBJEXT): {$(VPATH)}probes.dmyh
-rjit_c.$(OBJEXT): {$(VPATH)}probes.h
-rjit_c.$(OBJEXT): {$(VPATH)}probes_helper.h
-rjit_c.$(OBJEXT): {$(VPATH)}rjit.h
-rjit_c.$(OBJEXT): {$(VPATH)}rjit_c.c
-rjit_c.$(OBJEXT): {$(VPATH)}rjit_c.h
-rjit_c.$(OBJEXT): {$(VPATH)}rjit_c.rb
-rjit_c.$(OBJEXT): {$(VPATH)}rjit_c.rbinc
-rjit_c.$(OBJEXT): {$(VPATH)}ruby_assert.h
-rjit_c.$(OBJEXT): {$(VPATH)}ruby_atomic.h
-rjit_c.$(OBJEXT): {$(VPATH)}rubyparser.h
-rjit_c.$(OBJEXT): {$(VPATH)}shape.h
-rjit_c.$(OBJEXT): {$(VPATH)}st.h
-rjit_c.$(OBJEXT): {$(VPATH)}subst.h
-rjit_c.$(OBJEXT): {$(VPATH)}thread_$(THREAD_MODEL).h
-rjit_c.$(OBJEXT): {$(VPATH)}thread_native.h
-rjit_c.$(OBJEXT): {$(VPATH)}vm_callinfo.h
-rjit_c.$(OBJEXT): {$(VPATH)}vm_core.h
-rjit_c.$(OBJEXT): {$(VPATH)}vm_exec.h
-rjit_c.$(OBJEXT): {$(VPATH)}vm_insnhelper.h
-rjit_c.$(OBJEXT): {$(VPATH)}vm_opts.h
-rjit_c.$(OBJEXT): {$(VPATH)}yjit.h
 ruby-runner.$(OBJEXT): {$(VPATH)}config.h
 ruby-runner.$(OBJEXT): {$(VPATH)}internal/compiler_is.h
 ruby-runner.$(OBJEXT): {$(VPATH)}internal/compiler_is/apple.h
@@ -14211,12 +16397,16 @@ ruby.$(OBJEXT): $(hdrdir)/ruby/ruby.h
 ruby.$(OBJEXT): $(hdrdir)/ruby/version.h
 ruby.$(OBJEXT): $(top_srcdir)/internal/array.h
 ruby.$(OBJEXT): $(top_srcdir)/internal/basic_operators.h
+ruby.$(OBJEXT): $(top_srcdir)/internal/bignum.h
+ruby.$(OBJEXT): $(top_srcdir)/internal/bits.h
 ruby.$(OBJEXT): $(top_srcdir)/internal/class.h
 ruby.$(OBJEXT): $(top_srcdir)/internal/cmdlineopt.h
 ruby.$(OBJEXT): $(top_srcdir)/internal/compilers.h
+ruby.$(OBJEXT): $(top_srcdir)/internal/complex.h
 ruby.$(OBJEXT): $(top_srcdir)/internal/cont.h
 ruby.$(OBJEXT): $(top_srcdir)/internal/error.h
 ruby.$(OBJEXT): $(top_srcdir)/internal/file.h
+ruby.$(OBJEXT): $(top_srcdir)/internal/fixnum.h
 ruby.$(OBJEXT): $(top_srcdir)/internal/gc.h
 ruby.$(OBJEXT): $(top_srcdir)/internal/imemo.h
 ruby.$(OBJEXT): $(top_srcdir)/internal/inits.h
@@ -14224,15 +16414,41 @@ 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/namespace.h
+ruby.$(OBJEXT): $(top_srcdir)/internal/numeric.h
 ruby.$(OBJEXT): $(top_srcdir)/internal/object.h
 ruby.$(OBJEXT): $(top_srcdir)/internal/parse.h
+ruby.$(OBJEXT): $(top_srcdir)/internal/rational.h
 ruby.$(OBJEXT): $(top_srcdir)/internal/ruby_parser.h
+ruby.$(OBJEXT): $(top_srcdir)/internal/sanitizers.h
 ruby.$(OBJEXT): $(top_srcdir)/internal/serial.h
+ruby.$(OBJEXT): $(top_srcdir)/internal/set_table.h
 ruby.$(OBJEXT): $(top_srcdir)/internal/static_assert.h
 ruby.$(OBJEXT): $(top_srcdir)/internal/string.h
+ruby.$(OBJEXT): $(top_srcdir)/internal/thread.h
 ruby.$(OBJEXT): $(top_srcdir)/internal/variable.h
 ruby.$(OBJEXT): $(top_srcdir)/internal/vm.h
 ruby.$(OBJEXT): $(top_srcdir)/internal/warnings.h
+ruby.$(OBJEXT): $(top_srcdir)/prism/defines.h
+ruby.$(OBJEXT): $(top_srcdir)/prism/encoding.h
+ruby.$(OBJEXT): $(top_srcdir)/prism/node.h
+ruby.$(OBJEXT): $(top_srcdir)/prism/options.h
+ruby.$(OBJEXT): $(top_srcdir)/prism/pack.h
+ruby.$(OBJEXT): $(top_srcdir)/prism/parser.h
+ruby.$(OBJEXT): $(top_srcdir)/prism/prettyprint.h
+ruby.$(OBJEXT): $(top_srcdir)/prism/prism.h
+ruby.$(OBJEXT): $(top_srcdir)/prism/regexp.h
+ruby.$(OBJEXT): $(top_srcdir)/prism/static_literals.h
+ruby.$(OBJEXT): $(top_srcdir)/prism/util/pm_buffer.h
+ruby.$(OBJEXT): $(top_srcdir)/prism/util/pm_char.h
+ruby.$(OBJEXT): $(top_srcdir)/prism/util/pm_constant_pool.h
+ruby.$(OBJEXT): $(top_srcdir)/prism/util/pm_integer.h
+ruby.$(OBJEXT): $(top_srcdir)/prism/util/pm_list.h
+ruby.$(OBJEXT): $(top_srcdir)/prism/util/pm_memchr.h
+ruby.$(OBJEXT): $(top_srcdir)/prism/util/pm_newline_list.h
+ruby.$(OBJEXT): $(top_srcdir)/prism/util/pm_string.h
+ruby.$(OBJEXT): $(top_srcdir)/prism/util/pm_strncasecmp.h
+ruby.$(OBJEXT): $(top_srcdir)/prism/util/pm_strpbrk.h
 ruby.$(OBJEXT): {$(VPATH)}assert.h
 ruby.$(OBJEXT): {$(VPATH)}atomic.h
 ruby.$(OBJEXT): {$(VPATH)}backward/2/assume.h
@@ -14378,6 +16594,7 @@ ruby.$(OBJEXT): {$(VPATH)}internal/intern/re.h
 ruby.$(OBJEXT): {$(VPATH)}internal/intern/ruby.h
 ruby.$(OBJEXT): {$(VPATH)}internal/intern/select.h
 ruby.$(OBJEXT): {$(VPATH)}internal/intern/select/largesize.h
+ruby.$(OBJEXT): {$(VPATH)}internal/intern/set.h
 ruby.$(OBJEXT): {$(VPATH)}internal/intern/signal.h
 ruby.$(OBJEXT): {$(VPATH)}internal/intern/sprintf.h
 ruby.$(OBJEXT): {$(VPATH)}internal/intern/string.h
@@ -14397,6 +16614,7 @@ ruby.$(OBJEXT): {$(VPATH)}internal/special_consts.h
 ruby.$(OBJEXT): {$(VPATH)}internal/static_assert.h
 ruby.$(OBJEXT): {$(VPATH)}internal/stdalign.h
 ruby.$(OBJEXT): {$(VPATH)}internal/stdbool.h
+ruby.$(OBJEXT): {$(VPATH)}internal/stdckdint.h
 ruby.$(OBJEXT): {$(VPATH)}internal/symbol.h
 ruby.$(OBJEXT): {$(VPATH)}internal/value.h
 ruby.$(OBJEXT): {$(VPATH)}internal/value_type.h
@@ -14410,7 +16628,10 @@ ruby.$(OBJEXT): {$(VPATH)}missing.h
 ruby.$(OBJEXT): {$(VPATH)}node.h
 ruby.$(OBJEXT): {$(VPATH)}onigmo.h
 ruby.$(OBJEXT): {$(VPATH)}oniguruma.h
-ruby.$(OBJEXT): {$(VPATH)}rjit.h
+ruby.$(OBJEXT): {$(VPATH)}prism/ast.h
+ruby.$(OBJEXT): {$(VPATH)}prism/diagnostic.h
+ruby.$(OBJEXT): {$(VPATH)}prism/version.h
+ruby.$(OBJEXT): {$(VPATH)}prism_compile.h
 ruby.$(OBJEXT): {$(VPATH)}ruby.c
 ruby.$(OBJEXT): {$(VPATH)}ruby_assert.h
 ruby.$(OBJEXT): {$(VPATH)}ruby_atomic.h
@@ -14425,7 +16646,198 @@ ruby.$(OBJEXT): {$(VPATH)}util.h
 ruby.$(OBJEXT): {$(VPATH)}vm_core.h
 ruby.$(OBJEXT): {$(VPATH)}vm_opts.h
 ruby.$(OBJEXT): {$(VPATH)}yjit.h
+ruby_parser.$(OBJEXT): $(hdrdir)/ruby/ruby.h
+ruby_parser.$(OBJEXT): $(top_srcdir)/internal/array.h
+ruby_parser.$(OBJEXT): $(top_srcdir)/internal/bignum.h
+ruby_parser.$(OBJEXT): $(top_srcdir)/internal/bits.h
+ruby_parser.$(OBJEXT): $(top_srcdir)/internal/compilers.h
+ruby_parser.$(OBJEXT): $(top_srcdir)/internal/complex.h
+ruby_parser.$(OBJEXT): $(top_srcdir)/internal/error.h
+ruby_parser.$(OBJEXT): $(top_srcdir)/internal/fixnum.h
+ruby_parser.$(OBJEXT): $(top_srcdir)/internal/imemo.h
+ruby_parser.$(OBJEXT): $(top_srcdir)/internal/numeric.h
+ruby_parser.$(OBJEXT): $(top_srcdir)/internal/parse.h
+ruby_parser.$(OBJEXT): $(top_srcdir)/internal/rational.h
+ruby_parser.$(OBJEXT): $(top_srcdir)/internal/re.h
+ruby_parser.$(OBJEXT): $(top_srcdir)/internal/ruby_parser.h
+ruby_parser.$(OBJEXT): $(top_srcdir)/internal/serial.h
+ruby_parser.$(OBJEXT): $(top_srcdir)/internal/static_assert.h
+ruby_parser.$(OBJEXT): $(top_srcdir)/internal/string.h
+ruby_parser.$(OBJEXT): $(top_srcdir)/internal/vm.h
+ruby_parser.$(OBJEXT): {$(VPATH)}assert.h
+ruby_parser.$(OBJEXT): {$(VPATH)}backward/2/assume.h
+ruby_parser.$(OBJEXT): {$(VPATH)}backward/2/attributes.h
+ruby_parser.$(OBJEXT): {$(VPATH)}backward/2/bool.h
+ruby_parser.$(OBJEXT): {$(VPATH)}backward/2/gcc_version_since.h
+ruby_parser.$(OBJEXT): {$(VPATH)}backward/2/inttypes.h
+ruby_parser.$(OBJEXT): {$(VPATH)}backward/2/limits.h
+ruby_parser.$(OBJEXT): {$(VPATH)}backward/2/long_long.h
+ruby_parser.$(OBJEXT): {$(VPATH)}backward/2/stdalign.h
+ruby_parser.$(OBJEXT): {$(VPATH)}backward/2/stdarg.h
+ruby_parser.$(OBJEXT): {$(VPATH)}config.h
+ruby_parser.$(OBJEXT): {$(VPATH)}defines.h
+ruby_parser.$(OBJEXT): {$(VPATH)}encoding.h
+ruby_parser.$(OBJEXT): {$(VPATH)}intern.h
+ruby_parser.$(OBJEXT): {$(VPATH)}internal.h
+ruby_parser.$(OBJEXT): {$(VPATH)}internal/abi.h
+ruby_parser.$(OBJEXT): {$(VPATH)}internal/anyargs.h
+ruby_parser.$(OBJEXT): {$(VPATH)}internal/arithmetic.h
+ruby_parser.$(OBJEXT): {$(VPATH)}internal/arithmetic/char.h
+ruby_parser.$(OBJEXT): {$(VPATH)}internal/arithmetic/double.h
+ruby_parser.$(OBJEXT): {$(VPATH)}internal/arithmetic/fixnum.h
+ruby_parser.$(OBJEXT): {$(VPATH)}internal/arithmetic/gid_t.h
+ruby_parser.$(OBJEXT): {$(VPATH)}internal/arithmetic/int.h
+ruby_parser.$(OBJEXT): {$(VPATH)}internal/arithmetic/intptr_t.h
+ruby_parser.$(OBJEXT): {$(VPATH)}internal/arithmetic/long.h
+ruby_parser.$(OBJEXT): {$(VPATH)}internal/arithmetic/long_long.h
+ruby_parser.$(OBJEXT): {$(VPATH)}internal/arithmetic/mode_t.h
+ruby_parser.$(OBJEXT): {$(VPATH)}internal/arithmetic/off_t.h
+ruby_parser.$(OBJEXT): {$(VPATH)}internal/arithmetic/pid_t.h
+ruby_parser.$(OBJEXT): {$(VPATH)}internal/arithmetic/short.h
+ruby_parser.$(OBJEXT): {$(VPATH)}internal/arithmetic/size_t.h
+ruby_parser.$(OBJEXT): {$(VPATH)}internal/arithmetic/st_data_t.h
+ruby_parser.$(OBJEXT): {$(VPATH)}internal/arithmetic/uid_t.h
+ruby_parser.$(OBJEXT): {$(VPATH)}internal/assume.h
+ruby_parser.$(OBJEXT): {$(VPATH)}internal/attr/alloc_size.h
+ruby_parser.$(OBJEXT): {$(VPATH)}internal/attr/artificial.h
+ruby_parser.$(OBJEXT): {$(VPATH)}internal/attr/cold.h
+ruby_parser.$(OBJEXT): {$(VPATH)}internal/attr/const.h
+ruby_parser.$(OBJEXT): {$(VPATH)}internal/attr/constexpr.h
+ruby_parser.$(OBJEXT): {$(VPATH)}internal/attr/deprecated.h
+ruby_parser.$(OBJEXT): {$(VPATH)}internal/attr/diagnose_if.h
+ruby_parser.$(OBJEXT): {$(VPATH)}internal/attr/enum_extensibility.h
+ruby_parser.$(OBJEXT): {$(VPATH)}internal/attr/error.h
+ruby_parser.$(OBJEXT): {$(VPATH)}internal/attr/flag_enum.h
+ruby_parser.$(OBJEXT): {$(VPATH)}internal/attr/forceinline.h
+ruby_parser.$(OBJEXT): {$(VPATH)}internal/attr/format.h
+ruby_parser.$(OBJEXT): {$(VPATH)}internal/attr/maybe_unused.h
+ruby_parser.$(OBJEXT): {$(VPATH)}internal/attr/noalias.h
+ruby_parser.$(OBJEXT): {$(VPATH)}internal/attr/nodiscard.h
+ruby_parser.$(OBJEXT): {$(VPATH)}internal/attr/noexcept.h
+ruby_parser.$(OBJEXT): {$(VPATH)}internal/attr/noinline.h
+ruby_parser.$(OBJEXT): {$(VPATH)}internal/attr/nonnull.h
+ruby_parser.$(OBJEXT): {$(VPATH)}internal/attr/noreturn.h
+ruby_parser.$(OBJEXT): {$(VPATH)}internal/attr/packed_struct.h
+ruby_parser.$(OBJEXT): {$(VPATH)}internal/attr/pure.h
+ruby_parser.$(OBJEXT): {$(VPATH)}internal/attr/restrict.h
+ruby_parser.$(OBJEXT): {$(VPATH)}internal/attr/returns_nonnull.h
+ruby_parser.$(OBJEXT): {$(VPATH)}internal/attr/warning.h
+ruby_parser.$(OBJEXT): {$(VPATH)}internal/attr/weakref.h
+ruby_parser.$(OBJEXT): {$(VPATH)}internal/cast.h
+ruby_parser.$(OBJEXT): {$(VPATH)}internal/compiler_is.h
+ruby_parser.$(OBJEXT): {$(VPATH)}internal/compiler_is/apple.h
+ruby_parser.$(OBJEXT): {$(VPATH)}internal/compiler_is/clang.h
+ruby_parser.$(OBJEXT): {$(VPATH)}internal/compiler_is/gcc.h
+ruby_parser.$(OBJEXT): {$(VPATH)}internal/compiler_is/intel.h
+ruby_parser.$(OBJEXT): {$(VPATH)}internal/compiler_is/msvc.h
+ruby_parser.$(OBJEXT): {$(VPATH)}internal/compiler_is/sunpro.h
+ruby_parser.$(OBJEXT): {$(VPATH)}internal/compiler_since.h
+ruby_parser.$(OBJEXT): {$(VPATH)}internal/config.h
+ruby_parser.$(OBJEXT): {$(VPATH)}internal/constant_p.h
+ruby_parser.$(OBJEXT): {$(VPATH)}internal/core.h
+ruby_parser.$(OBJEXT): {$(VPATH)}internal/core/rarray.h
+ruby_parser.$(OBJEXT): {$(VPATH)}internal/core/rbasic.h
+ruby_parser.$(OBJEXT): {$(VPATH)}internal/core/rbignum.h
+ruby_parser.$(OBJEXT): {$(VPATH)}internal/core/rclass.h
+ruby_parser.$(OBJEXT): {$(VPATH)}internal/core/rdata.h
+ruby_parser.$(OBJEXT): {$(VPATH)}internal/core/rfile.h
+ruby_parser.$(OBJEXT): {$(VPATH)}internal/core/rhash.h
+ruby_parser.$(OBJEXT): {$(VPATH)}internal/core/robject.h
+ruby_parser.$(OBJEXT): {$(VPATH)}internal/core/rregexp.h
+ruby_parser.$(OBJEXT): {$(VPATH)}internal/core/rstring.h
+ruby_parser.$(OBJEXT): {$(VPATH)}internal/core/rstruct.h
+ruby_parser.$(OBJEXT): {$(VPATH)}internal/core/rtypeddata.h
+ruby_parser.$(OBJEXT): {$(VPATH)}internal/ctype.h
+ruby_parser.$(OBJEXT): {$(VPATH)}internal/dllexport.h
+ruby_parser.$(OBJEXT): {$(VPATH)}internal/dosish.h
+ruby_parser.$(OBJEXT): {$(VPATH)}internal/encoding/coderange.h
+ruby_parser.$(OBJEXT): {$(VPATH)}internal/encoding/ctype.h
+ruby_parser.$(OBJEXT): {$(VPATH)}internal/encoding/encoding.h
+ruby_parser.$(OBJEXT): {$(VPATH)}internal/encoding/pathname.h
+ruby_parser.$(OBJEXT): {$(VPATH)}internal/encoding/re.h
+ruby_parser.$(OBJEXT): {$(VPATH)}internal/encoding/sprintf.h
+ruby_parser.$(OBJEXT): {$(VPATH)}internal/encoding/string.h
+ruby_parser.$(OBJEXT): {$(VPATH)}internal/encoding/symbol.h
+ruby_parser.$(OBJEXT): {$(VPATH)}internal/encoding/transcode.h
+ruby_parser.$(OBJEXT): {$(VPATH)}internal/error.h
+ruby_parser.$(OBJEXT): {$(VPATH)}internal/eval.h
+ruby_parser.$(OBJEXT): {$(VPATH)}internal/event.h
+ruby_parser.$(OBJEXT): {$(VPATH)}internal/fl_type.h
+ruby_parser.$(OBJEXT): {$(VPATH)}internal/gc.h
+ruby_parser.$(OBJEXT): {$(VPATH)}internal/glob.h
+ruby_parser.$(OBJEXT): {$(VPATH)}internal/globals.h
+ruby_parser.$(OBJEXT): {$(VPATH)}internal/has/attribute.h
+ruby_parser.$(OBJEXT): {$(VPATH)}internal/has/builtin.h
+ruby_parser.$(OBJEXT): {$(VPATH)}internal/has/c_attribute.h
+ruby_parser.$(OBJEXT): {$(VPATH)}internal/has/cpp_attribute.h
+ruby_parser.$(OBJEXT): {$(VPATH)}internal/has/declspec_attribute.h
+ruby_parser.$(OBJEXT): {$(VPATH)}internal/has/extension.h
+ruby_parser.$(OBJEXT): {$(VPATH)}internal/has/feature.h
+ruby_parser.$(OBJEXT): {$(VPATH)}internal/has/warning.h
+ruby_parser.$(OBJEXT): {$(VPATH)}internal/intern/array.h
+ruby_parser.$(OBJEXT): {$(VPATH)}internal/intern/bignum.h
+ruby_parser.$(OBJEXT): {$(VPATH)}internal/intern/class.h
+ruby_parser.$(OBJEXT): {$(VPATH)}internal/intern/compar.h
+ruby_parser.$(OBJEXT): {$(VPATH)}internal/intern/complex.h
+ruby_parser.$(OBJEXT): {$(VPATH)}internal/intern/cont.h
+ruby_parser.$(OBJEXT): {$(VPATH)}internal/intern/dir.h
+ruby_parser.$(OBJEXT): {$(VPATH)}internal/intern/enum.h
+ruby_parser.$(OBJEXT): {$(VPATH)}internal/intern/enumerator.h
+ruby_parser.$(OBJEXT): {$(VPATH)}internal/intern/error.h
+ruby_parser.$(OBJEXT): {$(VPATH)}internal/intern/eval.h
+ruby_parser.$(OBJEXT): {$(VPATH)}internal/intern/file.h
+ruby_parser.$(OBJEXT): {$(VPATH)}internal/intern/hash.h
+ruby_parser.$(OBJEXT): {$(VPATH)}internal/intern/io.h
+ruby_parser.$(OBJEXT): {$(VPATH)}internal/intern/load.h
+ruby_parser.$(OBJEXT): {$(VPATH)}internal/intern/marshal.h
+ruby_parser.$(OBJEXT): {$(VPATH)}internal/intern/numeric.h
+ruby_parser.$(OBJEXT): {$(VPATH)}internal/intern/object.h
+ruby_parser.$(OBJEXT): {$(VPATH)}internal/intern/parse.h
+ruby_parser.$(OBJEXT): {$(VPATH)}internal/intern/proc.h
+ruby_parser.$(OBJEXT): {$(VPATH)}internal/intern/process.h
+ruby_parser.$(OBJEXT): {$(VPATH)}internal/intern/random.h
+ruby_parser.$(OBJEXT): {$(VPATH)}internal/intern/range.h
+ruby_parser.$(OBJEXT): {$(VPATH)}internal/intern/rational.h
+ruby_parser.$(OBJEXT): {$(VPATH)}internal/intern/re.h
+ruby_parser.$(OBJEXT): {$(VPATH)}internal/intern/ruby.h
+ruby_parser.$(OBJEXT): {$(VPATH)}internal/intern/select.h
+ruby_parser.$(OBJEXT): {$(VPATH)}internal/intern/select/largesize.h
+ruby_parser.$(OBJEXT): {$(VPATH)}internal/intern/set.h
+ruby_parser.$(OBJEXT): {$(VPATH)}internal/intern/signal.h
+ruby_parser.$(OBJEXT): {$(VPATH)}internal/intern/sprintf.h
+ruby_parser.$(OBJEXT): {$(VPATH)}internal/intern/string.h
+ruby_parser.$(OBJEXT): {$(VPATH)}internal/intern/struct.h
+ruby_parser.$(OBJEXT): {$(VPATH)}internal/intern/thread.h
+ruby_parser.$(OBJEXT): {$(VPATH)}internal/intern/time.h
+ruby_parser.$(OBJEXT): {$(VPATH)}internal/intern/variable.h
+ruby_parser.$(OBJEXT): {$(VPATH)}internal/intern/vm.h
+ruby_parser.$(OBJEXT): {$(VPATH)}internal/interpreter.h
+ruby_parser.$(OBJEXT): {$(VPATH)}internal/iterator.h
+ruby_parser.$(OBJEXT): {$(VPATH)}internal/memory.h
+ruby_parser.$(OBJEXT): {$(VPATH)}internal/method.h
+ruby_parser.$(OBJEXT): {$(VPATH)}internal/module.h
+ruby_parser.$(OBJEXT): {$(VPATH)}internal/newobj.h
+ruby_parser.$(OBJEXT): {$(VPATH)}internal/scan_args.h
+ruby_parser.$(OBJEXT): {$(VPATH)}internal/special_consts.h
+ruby_parser.$(OBJEXT): {$(VPATH)}internal/static_assert.h
+ruby_parser.$(OBJEXT): {$(VPATH)}internal/stdalign.h
+ruby_parser.$(OBJEXT): {$(VPATH)}internal/stdbool.h
+ruby_parser.$(OBJEXT): {$(VPATH)}internal/stdckdint.h
+ruby_parser.$(OBJEXT): {$(VPATH)}internal/symbol.h
+ruby_parser.$(OBJEXT): {$(VPATH)}internal/value.h
+ruby_parser.$(OBJEXT): {$(VPATH)}internal/value_type.h
+ruby_parser.$(OBJEXT): {$(VPATH)}internal/variable.h
+ruby_parser.$(OBJEXT): {$(VPATH)}internal/warning_push.h
+ruby_parser.$(OBJEXT): {$(VPATH)}internal/xmalloc.h
+ruby_parser.$(OBJEXT): {$(VPATH)}missing.h
+ruby_parser.$(OBJEXT): {$(VPATH)}node.h
+ruby_parser.$(OBJEXT): {$(VPATH)}onigmo.h
+ruby_parser.$(OBJEXT): {$(VPATH)}oniguruma.h
+ruby_parser.$(OBJEXT): {$(VPATH)}ruby_assert.h
 ruby_parser.$(OBJEXT): {$(VPATH)}ruby_parser.c
+ruby_parser.$(OBJEXT): {$(VPATH)}rubyparser.h
+ruby_parser.$(OBJEXT): {$(VPATH)}st.h
+ruby_parser.$(OBJEXT): {$(VPATH)}subst.h
 scheduler.$(OBJEXT): $(CCAN_DIR)/check_type/check_type.h
 scheduler.$(OBJEXT): $(CCAN_DIR)/container_of/container_of.h
 scheduler.$(OBJEXT): $(CCAN_DIR)/list/list.h
@@ -14436,7 +16848,10 @@ scheduler.$(OBJEXT): $(top_srcdir)/internal/basic_operators.h
 scheduler.$(OBJEXT): $(top_srcdir)/internal/compilers.h
 scheduler.$(OBJEXT): $(top_srcdir)/internal/gc.h
 scheduler.$(OBJEXT): $(top_srcdir)/internal/imemo.h
+scheduler.$(OBJEXT): $(top_srcdir)/internal/namespace.h
+scheduler.$(OBJEXT): $(top_srcdir)/internal/sanitizers.h
 scheduler.$(OBJEXT): $(top_srcdir)/internal/serial.h
+scheduler.$(OBJEXT): $(top_srcdir)/internal/set_table.h
 scheduler.$(OBJEXT): $(top_srcdir)/internal/static_assert.h
 scheduler.$(OBJEXT): $(top_srcdir)/internal/thread.h
 scheduler.$(OBJEXT): $(top_srcdir)/internal/variable.h
@@ -14585,6 +17000,7 @@ scheduler.$(OBJEXT): {$(VPATH)}internal/intern/re.h
 scheduler.$(OBJEXT): {$(VPATH)}internal/intern/ruby.h
 scheduler.$(OBJEXT): {$(VPATH)}internal/intern/select.h
 scheduler.$(OBJEXT): {$(VPATH)}internal/intern/select/largesize.h
+scheduler.$(OBJEXT): {$(VPATH)}internal/intern/set.h
 scheduler.$(OBJEXT): {$(VPATH)}internal/intern/signal.h
 scheduler.$(OBJEXT): {$(VPATH)}internal/intern/sprintf.h
 scheduler.$(OBJEXT): {$(VPATH)}internal/intern/string.h
@@ -14604,6 +17020,7 @@ scheduler.$(OBJEXT): {$(VPATH)}internal/special_consts.h
 scheduler.$(OBJEXT): {$(VPATH)}internal/static_assert.h
 scheduler.$(OBJEXT): {$(VPATH)}internal/stdalign.h
 scheduler.$(OBJEXT): {$(VPATH)}internal/stdbool.h
+scheduler.$(OBJEXT): {$(VPATH)}internal/stdckdint.h
 scheduler.$(OBJEXT): {$(VPATH)}internal/symbol.h
 scheduler.$(OBJEXT): {$(VPATH)}internal/value.h
 scheduler.$(OBJEXT): {$(VPATH)}internal/value_type.h
@@ -14624,10 +17041,221 @@ scheduler.$(OBJEXT): {$(VPATH)}scheduler.c
 scheduler.$(OBJEXT): {$(VPATH)}shape.h
 scheduler.$(OBJEXT): {$(VPATH)}st.h
 scheduler.$(OBJEXT): {$(VPATH)}subst.h
+scheduler.$(OBJEXT): {$(VPATH)}thread.h
 scheduler.$(OBJEXT): {$(VPATH)}thread_$(THREAD_MODEL).h
 scheduler.$(OBJEXT): {$(VPATH)}thread_native.h
 scheduler.$(OBJEXT): {$(VPATH)}vm_core.h
 scheduler.$(OBJEXT): {$(VPATH)}vm_opts.h
+set.$(OBJEXT): $(CCAN_DIR)/check_type/check_type.h
+set.$(OBJEXT): $(CCAN_DIR)/container_of/container_of.h
+set.$(OBJEXT): $(CCAN_DIR)/list/list.h
+set.$(OBJEXT): $(CCAN_DIR)/str/str.h
+set.$(OBJEXT): $(hdrdir)/ruby/ruby.h
+set.$(OBJEXT): $(top_srcdir)/internal/array.h
+set.$(OBJEXT): $(top_srcdir)/internal/basic_operators.h
+set.$(OBJEXT): $(top_srcdir)/internal/bits.h
+set.$(OBJEXT): $(top_srcdir)/internal/compilers.h
+set.$(OBJEXT): $(top_srcdir)/internal/error.h
+set.$(OBJEXT): $(top_srcdir)/internal/gc.h
+set.$(OBJEXT): $(top_srcdir)/internal/hash.h
+set.$(OBJEXT): $(top_srcdir)/internal/imemo.h
+set.$(OBJEXT): $(top_srcdir)/internal/namespace.h
+set.$(OBJEXT): $(top_srcdir)/internal/proc.h
+set.$(OBJEXT): $(top_srcdir)/internal/sanitizers.h
+set.$(OBJEXT): $(top_srcdir)/internal/serial.h
+set.$(OBJEXT): $(top_srcdir)/internal/set_table.h
+set.$(OBJEXT): $(top_srcdir)/internal/static_assert.h
+set.$(OBJEXT): $(top_srcdir)/internal/string.h
+set.$(OBJEXT): $(top_srcdir)/internal/symbol.h
+set.$(OBJEXT): $(top_srcdir)/internal/variable.h
+set.$(OBJEXT): $(top_srcdir)/internal/vm.h
+set.$(OBJEXT): $(top_srcdir)/internal/warnings.h
+set.$(OBJEXT): {$(VPATH)}assert.h
+set.$(OBJEXT): {$(VPATH)}atomic.h
+set.$(OBJEXT): {$(VPATH)}backward/2/assume.h
+set.$(OBJEXT): {$(VPATH)}backward/2/attributes.h
+set.$(OBJEXT): {$(VPATH)}backward/2/bool.h
+set.$(OBJEXT): {$(VPATH)}backward/2/gcc_version_since.h
+set.$(OBJEXT): {$(VPATH)}backward/2/inttypes.h
+set.$(OBJEXT): {$(VPATH)}backward/2/limits.h
+set.$(OBJEXT): {$(VPATH)}backward/2/long_long.h
+set.$(OBJEXT): {$(VPATH)}backward/2/stdalign.h
+set.$(OBJEXT): {$(VPATH)}backward/2/stdarg.h
+set.$(OBJEXT): {$(VPATH)}config.h
+set.$(OBJEXT): {$(VPATH)}constant.h
+set.$(OBJEXT): {$(VPATH)}defines.h
+set.$(OBJEXT): {$(VPATH)}encoding.h
+set.$(OBJEXT): {$(VPATH)}id.h
+set.$(OBJEXT): {$(VPATH)}id_table.h
+set.$(OBJEXT): {$(VPATH)}intern.h
+set.$(OBJEXT): {$(VPATH)}internal.h
+set.$(OBJEXT): {$(VPATH)}internal/abi.h
+set.$(OBJEXT): {$(VPATH)}internal/anyargs.h
+set.$(OBJEXT): {$(VPATH)}internal/arithmetic.h
+set.$(OBJEXT): {$(VPATH)}internal/arithmetic/char.h
+set.$(OBJEXT): {$(VPATH)}internal/arithmetic/double.h
+set.$(OBJEXT): {$(VPATH)}internal/arithmetic/fixnum.h
+set.$(OBJEXT): {$(VPATH)}internal/arithmetic/gid_t.h
+set.$(OBJEXT): {$(VPATH)}internal/arithmetic/int.h
+set.$(OBJEXT): {$(VPATH)}internal/arithmetic/intptr_t.h
+set.$(OBJEXT): {$(VPATH)}internal/arithmetic/long.h
+set.$(OBJEXT): {$(VPATH)}internal/arithmetic/long_long.h
+set.$(OBJEXT): {$(VPATH)}internal/arithmetic/mode_t.h
+set.$(OBJEXT): {$(VPATH)}internal/arithmetic/off_t.h
+set.$(OBJEXT): {$(VPATH)}internal/arithmetic/pid_t.h
+set.$(OBJEXT): {$(VPATH)}internal/arithmetic/short.h
+set.$(OBJEXT): {$(VPATH)}internal/arithmetic/size_t.h
+set.$(OBJEXT): {$(VPATH)}internal/arithmetic/st_data_t.h
+set.$(OBJEXT): {$(VPATH)}internal/arithmetic/uid_t.h
+set.$(OBJEXT): {$(VPATH)}internal/assume.h
+set.$(OBJEXT): {$(VPATH)}internal/attr/alloc_size.h
+set.$(OBJEXT): {$(VPATH)}internal/attr/artificial.h
+set.$(OBJEXT): {$(VPATH)}internal/attr/cold.h
+set.$(OBJEXT): {$(VPATH)}internal/attr/const.h
+set.$(OBJEXT): {$(VPATH)}internal/attr/constexpr.h
+set.$(OBJEXT): {$(VPATH)}internal/attr/deprecated.h
+set.$(OBJEXT): {$(VPATH)}internal/attr/diagnose_if.h
+set.$(OBJEXT): {$(VPATH)}internal/attr/enum_extensibility.h
+set.$(OBJEXT): {$(VPATH)}internal/attr/error.h
+set.$(OBJEXT): {$(VPATH)}internal/attr/flag_enum.h
+set.$(OBJEXT): {$(VPATH)}internal/attr/forceinline.h
+set.$(OBJEXT): {$(VPATH)}internal/attr/format.h
+set.$(OBJEXT): {$(VPATH)}internal/attr/maybe_unused.h
+set.$(OBJEXT): {$(VPATH)}internal/attr/noalias.h
+set.$(OBJEXT): {$(VPATH)}internal/attr/nodiscard.h
+set.$(OBJEXT): {$(VPATH)}internal/attr/noexcept.h
+set.$(OBJEXT): {$(VPATH)}internal/attr/noinline.h
+set.$(OBJEXT): {$(VPATH)}internal/attr/nonnull.h
+set.$(OBJEXT): {$(VPATH)}internal/attr/noreturn.h
+set.$(OBJEXT): {$(VPATH)}internal/attr/packed_struct.h
+set.$(OBJEXT): {$(VPATH)}internal/attr/pure.h
+set.$(OBJEXT): {$(VPATH)}internal/attr/restrict.h
+set.$(OBJEXT): {$(VPATH)}internal/attr/returns_nonnull.h
+set.$(OBJEXT): {$(VPATH)}internal/attr/warning.h
+set.$(OBJEXT): {$(VPATH)}internal/attr/weakref.h
+set.$(OBJEXT): {$(VPATH)}internal/cast.h
+set.$(OBJEXT): {$(VPATH)}internal/compiler_is.h
+set.$(OBJEXT): {$(VPATH)}internal/compiler_is/apple.h
+set.$(OBJEXT): {$(VPATH)}internal/compiler_is/clang.h
+set.$(OBJEXT): {$(VPATH)}internal/compiler_is/gcc.h
+set.$(OBJEXT): {$(VPATH)}internal/compiler_is/intel.h
+set.$(OBJEXT): {$(VPATH)}internal/compiler_is/msvc.h
+set.$(OBJEXT): {$(VPATH)}internal/compiler_is/sunpro.h
+set.$(OBJEXT): {$(VPATH)}internal/compiler_since.h
+set.$(OBJEXT): {$(VPATH)}internal/config.h
+set.$(OBJEXT): {$(VPATH)}internal/constant_p.h
+set.$(OBJEXT): {$(VPATH)}internal/core.h
+set.$(OBJEXT): {$(VPATH)}internal/core/rarray.h
+set.$(OBJEXT): {$(VPATH)}internal/core/rbasic.h
+set.$(OBJEXT): {$(VPATH)}internal/core/rbignum.h
+set.$(OBJEXT): {$(VPATH)}internal/core/rclass.h
+set.$(OBJEXT): {$(VPATH)}internal/core/rdata.h
+set.$(OBJEXT): {$(VPATH)}internal/core/rfile.h
+set.$(OBJEXT): {$(VPATH)}internal/core/rhash.h
+set.$(OBJEXT): {$(VPATH)}internal/core/robject.h
+set.$(OBJEXT): {$(VPATH)}internal/core/rregexp.h
+set.$(OBJEXT): {$(VPATH)}internal/core/rstring.h
+set.$(OBJEXT): {$(VPATH)}internal/core/rstruct.h
+set.$(OBJEXT): {$(VPATH)}internal/core/rtypeddata.h
+set.$(OBJEXT): {$(VPATH)}internal/ctype.h
+set.$(OBJEXT): {$(VPATH)}internal/dllexport.h
+set.$(OBJEXT): {$(VPATH)}internal/dosish.h
+set.$(OBJEXT): {$(VPATH)}internal/encoding/coderange.h
+set.$(OBJEXT): {$(VPATH)}internal/encoding/ctype.h
+set.$(OBJEXT): {$(VPATH)}internal/encoding/encoding.h
+set.$(OBJEXT): {$(VPATH)}internal/encoding/pathname.h
+set.$(OBJEXT): {$(VPATH)}internal/encoding/re.h
+set.$(OBJEXT): {$(VPATH)}internal/encoding/sprintf.h
+set.$(OBJEXT): {$(VPATH)}internal/encoding/string.h
+set.$(OBJEXT): {$(VPATH)}internal/encoding/symbol.h
+set.$(OBJEXT): {$(VPATH)}internal/encoding/transcode.h
+set.$(OBJEXT): {$(VPATH)}internal/error.h
+set.$(OBJEXT): {$(VPATH)}internal/eval.h
+set.$(OBJEXT): {$(VPATH)}internal/event.h
+set.$(OBJEXT): {$(VPATH)}internal/fl_type.h
+set.$(OBJEXT): {$(VPATH)}internal/gc.h
+set.$(OBJEXT): {$(VPATH)}internal/glob.h
+set.$(OBJEXT): {$(VPATH)}internal/globals.h
+set.$(OBJEXT): {$(VPATH)}internal/has/attribute.h
+set.$(OBJEXT): {$(VPATH)}internal/has/builtin.h
+set.$(OBJEXT): {$(VPATH)}internal/has/c_attribute.h
+set.$(OBJEXT): {$(VPATH)}internal/has/cpp_attribute.h
+set.$(OBJEXT): {$(VPATH)}internal/has/declspec_attribute.h
+set.$(OBJEXT): {$(VPATH)}internal/has/extension.h
+set.$(OBJEXT): {$(VPATH)}internal/has/feature.h
+set.$(OBJEXT): {$(VPATH)}internal/has/warning.h
+set.$(OBJEXT): {$(VPATH)}internal/intern/array.h
+set.$(OBJEXT): {$(VPATH)}internal/intern/bignum.h
+set.$(OBJEXT): {$(VPATH)}internal/intern/class.h
+set.$(OBJEXT): {$(VPATH)}internal/intern/compar.h
+set.$(OBJEXT): {$(VPATH)}internal/intern/complex.h
+set.$(OBJEXT): {$(VPATH)}internal/intern/cont.h
+set.$(OBJEXT): {$(VPATH)}internal/intern/dir.h
+set.$(OBJEXT): {$(VPATH)}internal/intern/enum.h
+set.$(OBJEXT): {$(VPATH)}internal/intern/enumerator.h
+set.$(OBJEXT): {$(VPATH)}internal/intern/error.h
+set.$(OBJEXT): {$(VPATH)}internal/intern/eval.h
+set.$(OBJEXT): {$(VPATH)}internal/intern/file.h
+set.$(OBJEXT): {$(VPATH)}internal/intern/hash.h
+set.$(OBJEXT): {$(VPATH)}internal/intern/io.h
+set.$(OBJEXT): {$(VPATH)}internal/intern/load.h
+set.$(OBJEXT): {$(VPATH)}internal/intern/marshal.h
+set.$(OBJEXT): {$(VPATH)}internal/intern/numeric.h
+set.$(OBJEXT): {$(VPATH)}internal/intern/object.h
+set.$(OBJEXT): {$(VPATH)}internal/intern/parse.h
+set.$(OBJEXT): {$(VPATH)}internal/intern/proc.h
+set.$(OBJEXT): {$(VPATH)}internal/intern/process.h
+set.$(OBJEXT): {$(VPATH)}internal/intern/random.h
+set.$(OBJEXT): {$(VPATH)}internal/intern/range.h
+set.$(OBJEXT): {$(VPATH)}internal/intern/rational.h
+set.$(OBJEXT): {$(VPATH)}internal/intern/re.h
+set.$(OBJEXT): {$(VPATH)}internal/intern/ruby.h
+set.$(OBJEXT): {$(VPATH)}internal/intern/select.h
+set.$(OBJEXT): {$(VPATH)}internal/intern/select/largesize.h
+set.$(OBJEXT): {$(VPATH)}internal/intern/set.h
+set.$(OBJEXT): {$(VPATH)}internal/intern/signal.h
+set.$(OBJEXT): {$(VPATH)}internal/intern/sprintf.h
+set.$(OBJEXT): {$(VPATH)}internal/intern/string.h
+set.$(OBJEXT): {$(VPATH)}internal/intern/struct.h
+set.$(OBJEXT): {$(VPATH)}internal/intern/thread.h
+set.$(OBJEXT): {$(VPATH)}internal/intern/time.h
+set.$(OBJEXT): {$(VPATH)}internal/intern/variable.h
+set.$(OBJEXT): {$(VPATH)}internal/intern/vm.h
+set.$(OBJEXT): {$(VPATH)}internal/interpreter.h
+set.$(OBJEXT): {$(VPATH)}internal/iterator.h
+set.$(OBJEXT): {$(VPATH)}internal/memory.h
+set.$(OBJEXT): {$(VPATH)}internal/method.h
+set.$(OBJEXT): {$(VPATH)}internal/module.h
+set.$(OBJEXT): {$(VPATH)}internal/newobj.h
+set.$(OBJEXT): {$(VPATH)}internal/scan_args.h
+set.$(OBJEXT): {$(VPATH)}internal/set_table.h
+set.$(OBJEXT): {$(VPATH)}internal/special_consts.h
+set.$(OBJEXT): {$(VPATH)}internal/static_assert.h
+set.$(OBJEXT): {$(VPATH)}internal/stdalign.h
+set.$(OBJEXT): {$(VPATH)}internal/stdbool.h
+set.$(OBJEXT): {$(VPATH)}internal/stdckdint.h
+set.$(OBJEXT): {$(VPATH)}internal/symbol.h
+set.$(OBJEXT): {$(VPATH)}internal/value.h
+set.$(OBJEXT): {$(VPATH)}internal/value_type.h
+set.$(OBJEXT): {$(VPATH)}internal/variable.h
+set.$(OBJEXT): {$(VPATH)}internal/warning_push.h
+set.$(OBJEXT): {$(VPATH)}internal/xmalloc.h
+set.$(OBJEXT): {$(VPATH)}method.h
+set.$(OBJEXT): {$(VPATH)}missing.h
+set.$(OBJEXT): {$(VPATH)}node.h
+set.$(OBJEXT): {$(VPATH)}onigmo.h
+set.$(OBJEXT): {$(VPATH)}oniguruma.h
+set.$(OBJEXT): {$(VPATH)}ruby_assert.h
+set.$(OBJEXT): {$(VPATH)}ruby_atomic.h
+set.$(OBJEXT): {$(VPATH)}rubyparser.h
+set.$(OBJEXT): {$(VPATH)}set.c
+set.$(OBJEXT): {$(VPATH)}shape.h
+set.$(OBJEXT): {$(VPATH)}st.h
+set.$(OBJEXT): {$(VPATH)}subst.h
+set.$(OBJEXT): {$(VPATH)}thread_$(THREAD_MODEL).h
+set.$(OBJEXT): {$(VPATH)}thread_native.h
+set.$(OBJEXT): {$(VPATH)}vm_core.h
+set.$(OBJEXT): {$(VPATH)}vm_opts.h
 setproctitle.$(OBJEXT): $(hdrdir)/ruby.h
 setproctitle.$(OBJEXT): $(hdrdir)/ruby/ruby.h
 setproctitle.$(OBJEXT): {$(VPATH)}assert.h
@@ -14756,6 +17384,7 @@ setproctitle.$(OBJEXT): {$(VPATH)}internal/intern/re.h
 setproctitle.$(OBJEXT): {$(VPATH)}internal/intern/ruby.h
 setproctitle.$(OBJEXT): {$(VPATH)}internal/intern/select.h
 setproctitle.$(OBJEXT): {$(VPATH)}internal/intern/select/largesize.h
+setproctitle.$(OBJEXT): {$(VPATH)}internal/intern/set.h
 setproctitle.$(OBJEXT): {$(VPATH)}internal/intern/signal.h
 setproctitle.$(OBJEXT): {$(VPATH)}internal/intern/sprintf.h
 setproctitle.$(OBJEXT): {$(VPATH)}internal/intern/string.h
@@ -14775,6 +17404,7 @@ setproctitle.$(OBJEXT): {$(VPATH)}internal/special_consts.h
 setproctitle.$(OBJEXT): {$(VPATH)}internal/static_assert.h
 setproctitle.$(OBJEXT): {$(VPATH)}internal/stdalign.h
 setproctitle.$(OBJEXT): {$(VPATH)}internal/stdbool.h
+setproctitle.$(OBJEXT): {$(VPATH)}internal/stdckdint.h
 setproctitle.$(OBJEXT): {$(VPATH)}internal/symbol.h
 setproctitle.$(OBJEXT): {$(VPATH)}internal/value.h
 setproctitle.$(OBJEXT): {$(VPATH)}internal/value_type.h
@@ -14791,6 +17421,7 @@ shape.$(OBJEXT): $(CCAN_DIR)/container_of/container_of.h
 shape.$(OBJEXT): $(CCAN_DIR)/list/list.h
 shape.$(OBJEXT): $(CCAN_DIR)/str/str.h
 shape.$(OBJEXT): $(hdrdir)/ruby/ruby.h
+shape.$(OBJEXT): $(hdrdir)/ruby/version.h
 shape.$(OBJEXT): $(top_srcdir)/internal/array.h
 shape.$(OBJEXT): $(top_srcdir)/internal/basic_operators.h
 shape.$(OBJEXT): $(top_srcdir)/internal/class.h
@@ -14798,7 +17429,11 @@ shape.$(OBJEXT): $(top_srcdir)/internal/compilers.h
 shape.$(OBJEXT): $(top_srcdir)/internal/error.h
 shape.$(OBJEXT): $(top_srcdir)/internal/gc.h
 shape.$(OBJEXT): $(top_srcdir)/internal/imemo.h
+shape.$(OBJEXT): $(top_srcdir)/internal/namespace.h
+shape.$(OBJEXT): $(top_srcdir)/internal/object.h
+shape.$(OBJEXT): $(top_srcdir)/internal/sanitizers.h
 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/symbol.h
@@ -14948,6 +17583,7 @@ shape.$(OBJEXT): {$(VPATH)}internal/intern/re.h
 shape.$(OBJEXT): {$(VPATH)}internal/intern/ruby.h
 shape.$(OBJEXT): {$(VPATH)}internal/intern/select.h
 shape.$(OBJEXT): {$(VPATH)}internal/intern/select/largesize.h
+shape.$(OBJEXT): {$(VPATH)}internal/intern/set.h
 shape.$(OBJEXT): {$(VPATH)}internal/intern/signal.h
 shape.$(OBJEXT): {$(VPATH)}internal/intern/sprintf.h
 shape.$(OBJEXT): {$(VPATH)}internal/intern/string.h
@@ -14967,6 +17603,7 @@ shape.$(OBJEXT): {$(VPATH)}internal/special_consts.h
 shape.$(OBJEXT): {$(VPATH)}internal/static_assert.h
 shape.$(OBJEXT): {$(VPATH)}internal/stdalign.h
 shape.$(OBJEXT): {$(VPATH)}internal/stdbool.h
+shape.$(OBJEXT): {$(VPATH)}internal/stdckdint.h
 shape.$(OBJEXT): {$(VPATH)}internal/symbol.h
 shape.$(OBJEXT): {$(VPATH)}internal/value.h
 shape.$(OBJEXT): {$(VPATH)}internal/value_type.h
@@ -14998,6 +17635,7 @@ signal.$(OBJEXT): $(CCAN_DIR)/container_of/container_of.h
 signal.$(OBJEXT): $(CCAN_DIR)/list/list.h
 signal.$(OBJEXT): $(CCAN_DIR)/str/str.h
 signal.$(OBJEXT): $(hdrdir)/ruby/ruby.h
+signal.$(OBJEXT): $(hdrdir)/ruby/version.h
 signal.$(OBJEXT): $(top_srcdir)/internal/array.h
 signal.$(OBJEXT): $(top_srcdir)/internal/basic_operators.h
 signal.$(OBJEXT): $(top_srcdir)/internal/compilers.h
@@ -15005,8 +17643,10 @@ signal.$(OBJEXT): $(top_srcdir)/internal/error.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/namespace.h
 signal.$(OBJEXT): $(top_srcdir)/internal/sanitizers.h
 signal.$(OBJEXT): $(top_srcdir)/internal/serial.h
+signal.$(OBJEXT): $(top_srcdir)/internal/set_table.h
 signal.$(OBJEXT): $(top_srcdir)/internal/signal.h
 signal.$(OBJEXT): $(top_srcdir)/internal/static_assert.h
 signal.$(OBJEXT): $(top_srcdir)/internal/string.h
@@ -15072,6 +17712,7 @@ signal.$(OBJEXT): {$(VPATH)}internal/attr/nodiscard.h
 signal.$(OBJEXT): {$(VPATH)}internal/attr/noexcept.h
 signal.$(OBJEXT): {$(VPATH)}internal/attr/noinline.h
 signal.$(OBJEXT): {$(VPATH)}internal/attr/nonnull.h
+signal.$(OBJEXT): {$(VPATH)}internal/attr/nonstring.h
 signal.$(OBJEXT): {$(VPATH)}internal/attr/noreturn.h
 signal.$(OBJEXT): {$(VPATH)}internal/attr/packed_struct.h
 signal.$(OBJEXT): {$(VPATH)}internal/attr/pure.h
@@ -15158,6 +17799,7 @@ signal.$(OBJEXT): {$(VPATH)}internal/intern/re.h
 signal.$(OBJEXT): {$(VPATH)}internal/intern/ruby.h
 signal.$(OBJEXT): {$(VPATH)}internal/intern/select.h
 signal.$(OBJEXT): {$(VPATH)}internal/intern/select/largesize.h
+signal.$(OBJEXT): {$(VPATH)}internal/intern/set.h
 signal.$(OBJEXT): {$(VPATH)}internal/intern/signal.h
 signal.$(OBJEXT): {$(VPATH)}internal/intern/sprintf.h
 signal.$(OBJEXT): {$(VPATH)}internal/intern/string.h
@@ -15177,6 +17819,7 @@ signal.$(OBJEXT): {$(VPATH)}internal/special_consts.h
 signal.$(OBJEXT): {$(VPATH)}internal/static_assert.h
 signal.$(OBJEXT): {$(VPATH)}internal/stdalign.h
 signal.$(OBJEXT): {$(VPATH)}internal/stdbool.h
+signal.$(OBJEXT): {$(VPATH)}internal/stdckdint.h
 signal.$(OBJEXT): {$(VPATH)}internal/symbol.h
 signal.$(OBJEXT): {$(VPATH)}internal/value.h
 signal.$(OBJEXT): {$(VPATH)}internal/value_type.h
@@ -15203,6 +17846,7 @@ signal.$(OBJEXT): {$(VPATH)}vm_core.h
 signal.$(OBJEXT): {$(VPATH)}vm_debug.h
 signal.$(OBJEXT): {$(VPATH)}vm_opts.h
 sprintf.$(OBJEXT): $(hdrdir)/ruby/ruby.h
+sprintf.$(OBJEXT): $(hdrdir)/ruby/version.h
 sprintf.$(OBJEXT): $(top_srcdir)/internal/bignum.h
 sprintf.$(OBJEXT): $(top_srcdir)/internal/bits.h
 sprintf.$(OBJEXT): $(top_srcdir)/internal/class.h
@@ -15363,6 +18007,7 @@ sprintf.$(OBJEXT): {$(VPATH)}internal/intern/re.h
 sprintf.$(OBJEXT): {$(VPATH)}internal/intern/ruby.h
 sprintf.$(OBJEXT): {$(VPATH)}internal/intern/select.h
 sprintf.$(OBJEXT): {$(VPATH)}internal/intern/select/largesize.h
+sprintf.$(OBJEXT): {$(VPATH)}internal/intern/set.h
 sprintf.$(OBJEXT): {$(VPATH)}internal/intern/signal.h
 sprintf.$(OBJEXT): {$(VPATH)}internal/intern/sprintf.h
 sprintf.$(OBJEXT): {$(VPATH)}internal/intern/string.h
@@ -15382,6 +18027,7 @@ sprintf.$(OBJEXT): {$(VPATH)}internal/special_consts.h
 sprintf.$(OBJEXT): {$(VPATH)}internal/static_assert.h
 sprintf.$(OBJEXT): {$(VPATH)}internal/stdalign.h
 sprintf.$(OBJEXT): {$(VPATH)}internal/stdbool.h
+sprintf.$(OBJEXT): {$(VPATH)}internal/stdckdint.h
 sprintf.$(OBJEXT): {$(VPATH)}internal/symbol.h
 sprintf.$(OBJEXT): {$(VPATH)}internal/value.h
 sprintf.$(OBJEXT): {$(VPATH)}internal/value_type.h
@@ -15404,6 +18050,8 @@ 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/set_table.h
+st.$(OBJEXT): $(top_srcdir)/internal/st.h
 st.$(OBJEXT): $(top_srcdir)/internal/static_assert.h
 st.$(OBJEXT): $(top_srcdir)/internal/warnings.h
 st.$(OBJEXT): {$(VPATH)}assert.h
@@ -15534,6 +18182,7 @@ st.$(OBJEXT): {$(VPATH)}internal/intern/re.h
 st.$(OBJEXT): {$(VPATH)}internal/intern/ruby.h
 st.$(OBJEXT): {$(VPATH)}internal/intern/select.h
 st.$(OBJEXT): {$(VPATH)}internal/intern/select/largesize.h
+st.$(OBJEXT): {$(VPATH)}internal/intern/set.h
 st.$(OBJEXT): {$(VPATH)}internal/intern/signal.h
 st.$(OBJEXT): {$(VPATH)}internal/intern/sprintf.h
 st.$(OBJEXT): {$(VPATH)}internal/intern/string.h
@@ -15550,9 +18199,11 @@ st.$(OBJEXT): {$(VPATH)}internal/module.h
 st.$(OBJEXT): {$(VPATH)}internal/newobj.h
 st.$(OBJEXT): {$(VPATH)}internal/scan_args.h
 st.$(OBJEXT): {$(VPATH)}internal/special_consts.h
+st.$(OBJEXT): {$(VPATH)}internal/st.h
 st.$(OBJEXT): {$(VPATH)}internal/static_assert.h
 st.$(OBJEXT): {$(VPATH)}internal/stdalign.h
 st.$(OBJEXT): {$(VPATH)}internal/stdbool.h
+st.$(OBJEXT): {$(VPATH)}internal/stdckdint.h
 st.$(OBJEXT): {$(VPATH)}internal/symbol.h
 st.$(OBJEXT): {$(VPATH)}internal/value.h
 st.$(OBJEXT): {$(VPATH)}internal/value_type.h
@@ -15560,6 +18211,7 @@ st.$(OBJEXT): {$(VPATH)}internal/variable.h
 st.$(OBJEXT): {$(VPATH)}internal/warning_push.h
 st.$(OBJEXT): {$(VPATH)}internal/xmalloc.h
 st.$(OBJEXT): {$(VPATH)}missing.h
+st.$(OBJEXT): {$(VPATH)}ruby_assert.h
 st.$(OBJEXT): {$(VPATH)}st.c
 st.$(OBJEXT): {$(VPATH)}st.h
 st.$(OBJEXT): {$(VPATH)}subst.h
@@ -15708,6 +18360,7 @@ strftime.$(OBJEXT): {$(VPATH)}internal/intern/re.h
 strftime.$(OBJEXT): {$(VPATH)}internal/intern/ruby.h
 strftime.$(OBJEXT): {$(VPATH)}internal/intern/select.h
 strftime.$(OBJEXT): {$(VPATH)}internal/intern/select/largesize.h
+strftime.$(OBJEXT): {$(VPATH)}internal/intern/set.h
 strftime.$(OBJEXT): {$(VPATH)}internal/intern/signal.h
 strftime.$(OBJEXT): {$(VPATH)}internal/intern/sprintf.h
 strftime.$(OBJEXT): {$(VPATH)}internal/intern/string.h
@@ -15727,6 +18380,7 @@ strftime.$(OBJEXT): {$(VPATH)}internal/special_consts.h
 strftime.$(OBJEXT): {$(VPATH)}internal/static_assert.h
 strftime.$(OBJEXT): {$(VPATH)}internal/stdalign.h
 strftime.$(OBJEXT): {$(VPATH)}internal/stdbool.h
+strftime.$(OBJEXT): {$(VPATH)}internal/stdckdint.h
 strftime.$(OBJEXT): {$(VPATH)}internal/symbol.h
 strftime.$(OBJEXT): {$(VPATH)}internal/value.h
 strftime.$(OBJEXT): {$(VPATH)}internal/value_type.h
@@ -15746,6 +18400,7 @@ string.$(OBJEXT): $(CCAN_DIR)/container_of/container_of.h
 string.$(OBJEXT): $(CCAN_DIR)/list/list.h
 string.$(OBJEXT): $(CCAN_DIR)/str/str.h
 string.$(OBJEXT): $(hdrdir)/ruby/ruby.h
+string.$(OBJEXT): $(hdrdir)/ruby/version.h
 string.$(OBJEXT): $(top_srcdir)/internal/array.h
 string.$(OBJEXT): $(top_srcdir)/internal/basic_operators.h
 string.$(OBJEXT): $(top_srcdir)/internal/bignum.h
@@ -15753,17 +18408,21 @@ string.$(OBJEXT): $(top_srcdir)/internal/bits.h
 string.$(OBJEXT): $(top_srcdir)/internal/class.h
 string.$(OBJEXT): $(top_srcdir)/internal/compar.h
 string.$(OBJEXT): $(top_srcdir)/internal/compilers.h
+string.$(OBJEXT): $(top_srcdir)/internal/concurrent_set.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/hash.h
 string.$(OBJEXT): $(top_srcdir)/internal/imemo.h
+string.$(OBJEXT): $(top_srcdir)/internal/namespace.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/set_table.h
 string.$(OBJEXT): $(top_srcdir)/internal/static_assert.h
 string.$(OBJEXT): $(top_srcdir)/internal/string.h
 string.$(OBJEXT): $(top_srcdir)/internal/transcode.h
@@ -15828,6 +18487,7 @@ string.$(OBJEXT): {$(VPATH)}internal/attr/nodiscard.h
 string.$(OBJEXT): {$(VPATH)}internal/attr/noexcept.h
 string.$(OBJEXT): {$(VPATH)}internal/attr/noinline.h
 string.$(OBJEXT): {$(VPATH)}internal/attr/nonnull.h
+string.$(OBJEXT): {$(VPATH)}internal/attr/nonstring.h
 string.$(OBJEXT): {$(VPATH)}internal/attr/noreturn.h
 string.$(OBJEXT): {$(VPATH)}internal/attr/packed_struct.h
 string.$(OBJEXT): {$(VPATH)}internal/attr/pure.h
@@ -15915,6 +18575,7 @@ string.$(OBJEXT): {$(VPATH)}internal/intern/re.h
 string.$(OBJEXT): {$(VPATH)}internal/intern/ruby.h
 string.$(OBJEXT): {$(VPATH)}internal/intern/select.h
 string.$(OBJEXT): {$(VPATH)}internal/intern/select/largesize.h
+string.$(OBJEXT): {$(VPATH)}internal/intern/set.h
 string.$(OBJEXT): {$(VPATH)}internal/intern/signal.h
 string.$(OBJEXT): {$(VPATH)}internal/intern/sprintf.h
 string.$(OBJEXT): {$(VPATH)}internal/intern/string.h
@@ -15934,6 +18595,7 @@ string.$(OBJEXT): {$(VPATH)}internal/special_consts.h
 string.$(OBJEXT): {$(VPATH)}internal/static_assert.h
 string.$(OBJEXT): {$(VPATH)}internal/stdalign.h
 string.$(OBJEXT): {$(VPATH)}internal/stdbool.h
+string.$(OBJEXT): {$(VPATH)}internal/stdckdint.h
 string.$(OBJEXT): {$(VPATH)}internal/symbol.h
 string.$(OBJEXT): {$(VPATH)}internal/value.h
 string.$(OBJEXT): {$(VPATH)}internal/value_type.h
@@ -15956,6 +18618,7 @@ string.$(OBJEXT): {$(VPATH)}shape.h
 string.$(OBJEXT): {$(VPATH)}st.h
 string.$(OBJEXT): {$(VPATH)}string.c
 string.$(OBJEXT): {$(VPATH)}subst.h
+string.$(OBJEXT): {$(VPATH)}thread.h
 string.$(OBJEXT): {$(VPATH)}thread_$(THREAD_MODEL).h
 string.$(OBJEXT): {$(VPATH)}thread_native.h
 string.$(OBJEXT): {$(VPATH)}util.h
@@ -15998,6 +18661,7 @@ struct.$(OBJEXT): $(CCAN_DIR)/container_of/container_of.h
 struct.$(OBJEXT): $(CCAN_DIR)/list/list.h
 struct.$(OBJEXT): $(CCAN_DIR)/str/str.h
 struct.$(OBJEXT): $(hdrdir)/ruby/ruby.h
+struct.$(OBJEXT): $(hdrdir)/ruby/version.h
 struct.$(OBJEXT): $(top_srcdir)/internal/array.h
 struct.$(OBJEXT): $(top_srcdir)/internal/basic_operators.h
 struct.$(OBJEXT): $(top_srcdir)/internal/class.h
@@ -16006,9 +18670,12 @@ 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/namespace.h
 struct.$(OBJEXT): $(top_srcdir)/internal/object.h
 struct.$(OBJEXT): $(top_srcdir)/internal/proc.h
+struct.$(OBJEXT): $(top_srcdir)/internal/sanitizers.h
 struct.$(OBJEXT): $(top_srcdir)/internal/serial.h
+struct.$(OBJEXT): $(top_srcdir)/internal/set_table.h
 struct.$(OBJEXT): $(top_srcdir)/internal/static_assert.h
 struct.$(OBJEXT): $(top_srcdir)/internal/string.h
 struct.$(OBJEXT): $(top_srcdir)/internal/struct.h
@@ -16030,6 +18697,7 @@ struct.$(OBJEXT): {$(VPATH)}backward/2/stdarg.h
 struct.$(OBJEXT): {$(VPATH)}builtin.h
 struct.$(OBJEXT): {$(VPATH)}config.h
 struct.$(OBJEXT): {$(VPATH)}constant.h
+struct.$(OBJEXT): {$(VPATH)}debug_counter.h
 struct.$(OBJEXT): {$(VPATH)}defines.h
 struct.$(OBJEXT): {$(VPATH)}encoding.h
 struct.$(OBJEXT): {$(VPATH)}id.h
@@ -16159,6 +18827,7 @@ struct.$(OBJEXT): {$(VPATH)}internal/intern/re.h
 struct.$(OBJEXT): {$(VPATH)}internal/intern/ruby.h
 struct.$(OBJEXT): {$(VPATH)}internal/intern/select.h
 struct.$(OBJEXT): {$(VPATH)}internal/intern/select/largesize.h
+struct.$(OBJEXT): {$(VPATH)}internal/intern/set.h
 struct.$(OBJEXT): {$(VPATH)}internal/intern/signal.h
 struct.$(OBJEXT): {$(VPATH)}internal/intern/sprintf.h
 struct.$(OBJEXT): {$(VPATH)}internal/intern/string.h
@@ -16178,6 +18847,7 @@ struct.$(OBJEXT): {$(VPATH)}internal/special_consts.h
 struct.$(OBJEXT): {$(VPATH)}internal/static_assert.h
 struct.$(OBJEXT): {$(VPATH)}internal/stdalign.h
 struct.$(OBJEXT): {$(VPATH)}internal/stdbool.h
+struct.$(OBJEXT): {$(VPATH)}internal/stdckdint.h
 struct.$(OBJEXT): {$(VPATH)}internal/symbol.h
 struct.$(OBJEXT): {$(VPATH)}internal/value.h
 struct.$(OBJEXT): {$(VPATH)}internal/value_type.h
@@ -16199,12 +18869,15 @@ struct.$(OBJEXT): {$(VPATH)}subst.h
 struct.$(OBJEXT): {$(VPATH)}thread_$(THREAD_MODEL).h
 struct.$(OBJEXT): {$(VPATH)}thread_native.h
 struct.$(OBJEXT): {$(VPATH)}vm_core.h
+struct.$(OBJEXT): {$(VPATH)}vm_debug.h
 struct.$(OBJEXT): {$(VPATH)}vm_opts.h
+struct.$(OBJEXT): {$(VPATH)}vm_sync.h
 symbol.$(OBJEXT): $(CCAN_DIR)/check_type/check_type.h
 symbol.$(OBJEXT): $(CCAN_DIR)/container_of/container_of.h
 symbol.$(OBJEXT): $(CCAN_DIR)/list/list.h
 symbol.$(OBJEXT): $(CCAN_DIR)/str/str.h
 symbol.$(OBJEXT): $(hdrdir)/ruby/ruby.h
+symbol.$(OBJEXT): $(hdrdir)/ruby/version.h
 symbol.$(OBJEXT): $(top_srcdir)/internal/array.h
 symbol.$(OBJEXT): $(top_srcdir)/internal/basic_operators.h
 symbol.$(OBJEXT): $(top_srcdir)/internal/class.h
@@ -16213,8 +18886,11 @@ 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/imemo.h
+symbol.$(OBJEXT): $(top_srcdir)/internal/namespace.h
 symbol.$(OBJEXT): $(top_srcdir)/internal/object.h
+symbol.$(OBJEXT): $(top_srcdir)/internal/sanitizers.h
 symbol.$(OBJEXT): $(top_srcdir)/internal/serial.h
+symbol.$(OBJEXT): $(top_srcdir)/internal/set_table.h
 symbol.$(OBJEXT): $(top_srcdir)/internal/static_assert.h
 symbol.$(OBJEXT): $(top_srcdir)/internal/string.h
 symbol.$(OBJEXT): $(top_srcdir)/internal/symbol.h
@@ -16281,6 +18957,7 @@ symbol.$(OBJEXT): {$(VPATH)}internal/attr/nodiscard.h
 symbol.$(OBJEXT): {$(VPATH)}internal/attr/noexcept.h
 symbol.$(OBJEXT): {$(VPATH)}internal/attr/noinline.h
 symbol.$(OBJEXT): {$(VPATH)}internal/attr/nonnull.h
+symbol.$(OBJEXT): {$(VPATH)}internal/attr/nonstring.h
 symbol.$(OBJEXT): {$(VPATH)}internal/attr/noreturn.h
 symbol.$(OBJEXT): {$(VPATH)}internal/attr/packed_struct.h
 symbol.$(OBJEXT): {$(VPATH)}internal/attr/pure.h
@@ -16367,6 +19044,7 @@ symbol.$(OBJEXT): {$(VPATH)}internal/intern/re.h
 symbol.$(OBJEXT): {$(VPATH)}internal/intern/ruby.h
 symbol.$(OBJEXT): {$(VPATH)}internal/intern/select.h
 symbol.$(OBJEXT): {$(VPATH)}internal/intern/select/largesize.h
+symbol.$(OBJEXT): {$(VPATH)}internal/intern/set.h
 symbol.$(OBJEXT): {$(VPATH)}internal/intern/signal.h
 symbol.$(OBJEXT): {$(VPATH)}internal/intern/sprintf.h
 symbol.$(OBJEXT): {$(VPATH)}internal/intern/string.h
@@ -16386,6 +19064,7 @@ symbol.$(OBJEXT): {$(VPATH)}internal/special_consts.h
 symbol.$(OBJEXT): {$(VPATH)}internal/static_assert.h
 symbol.$(OBJEXT): {$(VPATH)}internal/stdalign.h
 symbol.$(OBJEXT): {$(VPATH)}internal/stdbool.h
+symbol.$(OBJEXT): {$(VPATH)}internal/stdckdint.h
 symbol.$(OBJEXT): {$(VPATH)}internal/symbol.h
 symbol.$(OBJEXT): {$(VPATH)}internal/value.h
 symbol.$(OBJEXT): {$(VPATH)}internal/value_type.h
@@ -16421,6 +19100,7 @@ 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): $(hdrdir)/ruby/version.h
 thread.$(OBJEXT): $(top_srcdir)/internal/array.h
 thread.$(OBJEXT): $(top_srcdir)/internal/basic_operators.h
 thread.$(OBJEXT): $(top_srcdir)/internal/bits.h
@@ -16432,9 +19112,12 @@ 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/namespace.h
 thread.$(OBJEXT): $(top_srcdir)/internal/object.h
 thread.$(OBJEXT): $(top_srcdir)/internal/proc.h
+thread.$(OBJEXT): $(top_srcdir)/internal/sanitizers.h
 thread.$(OBJEXT): $(top_srcdir)/internal/serial.h
+thread.$(OBJEXT): $(top_srcdir)/internal/set_table.h
 thread.$(OBJEXT): $(top_srcdir)/internal/signal.h
 thread.$(OBJEXT): $(top_srcdir)/internal/static_assert.h
 thread.$(OBJEXT): $(top_srcdir)/internal/string.h
@@ -16443,6 +19126,27 @@ thread.$(OBJEXT): $(top_srcdir)/internal/time.h
 thread.$(OBJEXT): $(top_srcdir)/internal/variable.h
 thread.$(OBJEXT): $(top_srcdir)/internal/vm.h
 thread.$(OBJEXT): $(top_srcdir)/internal/warnings.h
+thread.$(OBJEXT): $(top_srcdir)/prism/defines.h
+thread.$(OBJEXT): $(top_srcdir)/prism/encoding.h
+thread.$(OBJEXT): $(top_srcdir)/prism/node.h
+thread.$(OBJEXT): $(top_srcdir)/prism/options.h
+thread.$(OBJEXT): $(top_srcdir)/prism/pack.h
+thread.$(OBJEXT): $(top_srcdir)/prism/parser.h
+thread.$(OBJEXT): $(top_srcdir)/prism/prettyprint.h
+thread.$(OBJEXT): $(top_srcdir)/prism/prism.h
+thread.$(OBJEXT): $(top_srcdir)/prism/regexp.h
+thread.$(OBJEXT): $(top_srcdir)/prism/static_literals.h
+thread.$(OBJEXT): $(top_srcdir)/prism/util/pm_buffer.h
+thread.$(OBJEXT): $(top_srcdir)/prism/util/pm_char.h
+thread.$(OBJEXT): $(top_srcdir)/prism/util/pm_constant_pool.h
+thread.$(OBJEXT): $(top_srcdir)/prism/util/pm_integer.h
+thread.$(OBJEXT): $(top_srcdir)/prism/util/pm_list.h
+thread.$(OBJEXT): $(top_srcdir)/prism/util/pm_memchr.h
+thread.$(OBJEXT): $(top_srcdir)/prism/util/pm_newline_list.h
+thread.$(OBJEXT): $(top_srcdir)/prism/util/pm_string.h
+thread.$(OBJEXT): $(top_srcdir)/prism/util/pm_strncasecmp.h
+thread.$(OBJEXT): $(top_srcdir)/prism/util/pm_strpbrk.h
+thread.$(OBJEXT): {$(VPATH)}$(COROUTINE_H)
 thread.$(OBJEXT): {$(VPATH)}assert.h
 thread.$(OBJEXT): {$(VPATH)}atomic.h
 thread.$(OBJEXT): {$(VPATH)}backward/2/assume.h
@@ -16591,6 +19295,7 @@ thread.$(OBJEXT): {$(VPATH)}internal/intern/re.h
 thread.$(OBJEXT): {$(VPATH)}internal/intern/ruby.h
 thread.$(OBJEXT): {$(VPATH)}internal/intern/select.h
 thread.$(OBJEXT): {$(VPATH)}internal/intern/select/largesize.h
+thread.$(OBJEXT): {$(VPATH)}internal/intern/set.h
 thread.$(OBJEXT): {$(VPATH)}internal/intern/signal.h
 thread.$(OBJEXT): {$(VPATH)}internal/intern/sprintf.h
 thread.$(OBJEXT): {$(VPATH)}internal/intern/string.h
@@ -16610,6 +19315,7 @@ thread.$(OBJEXT): {$(VPATH)}internal/special_consts.h
 thread.$(OBJEXT): {$(VPATH)}internal/static_assert.h
 thread.$(OBJEXT): {$(VPATH)}internal/stdalign.h
 thread.$(OBJEXT): {$(VPATH)}internal/stdbool.h
+thread.$(OBJEXT): {$(VPATH)}internal/stdckdint.h
 thread.$(OBJEXT): {$(VPATH)}internal/symbol.h
 thread.$(OBJEXT): {$(VPATH)}internal/value.h
 thread.$(OBJEXT): {$(VPATH)}internal/value_type.h
@@ -16623,9 +19329,12 @@ thread.$(OBJEXT): {$(VPATH)}missing.h
 thread.$(OBJEXT): {$(VPATH)}node.h
 thread.$(OBJEXT): {$(VPATH)}onigmo.h
 thread.$(OBJEXT): {$(VPATH)}oniguruma.h
+thread.$(OBJEXT): {$(VPATH)}prism/ast.h
+thread.$(OBJEXT): {$(VPATH)}prism/diagnostic.h
+thread.$(OBJEXT): {$(VPATH)}prism/version.h
+thread.$(OBJEXT): {$(VPATH)}prism_compile.h
 thread.$(OBJEXT): {$(VPATH)}ractor.h
 thread.$(OBJEXT): {$(VPATH)}ractor_core.h
-thread.$(OBJEXT): {$(VPATH)}rjit.h
 thread.$(OBJEXT): {$(VPATH)}ruby_assert.h
 thread.$(OBJEXT): {$(VPATH)}ruby_atomic.h
 thread.$(OBJEXT): {$(VPATH)}rubyparser.h
@@ -16637,6 +19346,7 @@ thread.$(OBJEXT): {$(VPATH)}thread.h
 thread.$(OBJEXT): {$(VPATH)}thread_$(THREAD_MODEL).c
 thread.$(OBJEXT): {$(VPATH)}thread_$(THREAD_MODEL).h
 thread.$(OBJEXT): {$(VPATH)}thread_native.h
+thread.$(OBJEXT): {$(VPATH)}thread_pthread_mn.c
 thread.$(OBJEXT): {$(VPATH)}thread_sync.c
 thread.$(OBJEXT): {$(VPATH)}thread_sync.rbinc
 thread.$(OBJEXT): {$(VPATH)}timev.h
@@ -16659,9 +19369,12 @@ time.$(OBJEXT): $(top_srcdir)/internal/fixnum.h
 time.$(OBJEXT): $(top_srcdir)/internal/gc.h
 time.$(OBJEXT): $(top_srcdir)/internal/hash.h
 time.$(OBJEXT): $(top_srcdir)/internal/imemo.h
+time.$(OBJEXT): $(top_srcdir)/internal/namespace.h
 time.$(OBJEXT): $(top_srcdir)/internal/numeric.h
 time.$(OBJEXT): $(top_srcdir)/internal/rational.h
+time.$(OBJEXT): $(top_srcdir)/internal/sanitizers.h
 time.$(OBJEXT): $(top_srcdir)/internal/serial.h
+time.$(OBJEXT): $(top_srcdir)/internal/set_table.h
 time.$(OBJEXT): $(top_srcdir)/internal/static_assert.h
 time.$(OBJEXT): $(top_srcdir)/internal/string.h
 time.$(OBJEXT): $(top_srcdir)/internal/time.h
@@ -16811,6 +19524,7 @@ time.$(OBJEXT): {$(VPATH)}internal/intern/re.h
 time.$(OBJEXT): {$(VPATH)}internal/intern/ruby.h
 time.$(OBJEXT): {$(VPATH)}internal/intern/select.h
 time.$(OBJEXT): {$(VPATH)}internal/intern/select/largesize.h
+time.$(OBJEXT): {$(VPATH)}internal/intern/set.h
 time.$(OBJEXT): {$(VPATH)}internal/intern/signal.h
 time.$(OBJEXT): {$(VPATH)}internal/intern/sprintf.h
 time.$(OBJEXT): {$(VPATH)}internal/intern/string.h
@@ -16830,6 +19544,7 @@ time.$(OBJEXT): {$(VPATH)}internal/special_consts.h
 time.$(OBJEXT): {$(VPATH)}internal/static_assert.h
 time.$(OBJEXT): {$(VPATH)}internal/stdalign.h
 time.$(OBJEXT): {$(VPATH)}internal/stdbool.h
+time.$(OBJEXT): {$(VPATH)}internal/stdckdint.h
 time.$(OBJEXT): {$(VPATH)}internal/symbol.h
 time.$(OBJEXT): {$(VPATH)}internal/value.h
 time.$(OBJEXT): {$(VPATH)}internal/value_type.h
@@ -16852,6 +19567,7 @@ time.$(OBJEXT): {$(VPATH)}thread_native.h
 time.$(OBJEXT): {$(VPATH)}time.c
 time.$(OBJEXT): {$(VPATH)}timev.h
 time.$(OBJEXT): {$(VPATH)}timev.rbinc
+time.$(OBJEXT): {$(VPATH)}util.h
 time.$(OBJEXT): {$(VPATH)}vm_core.h
 time.$(OBJEXT): {$(VPATH)}vm_opts.h
 transcode.$(OBJEXT): $(hdrdir)/ruby/ruby.h
@@ -16879,6 +19595,7 @@ transcode.$(OBJEXT): {$(VPATH)}backward/2/stdalign.h
 transcode.$(OBJEXT): {$(VPATH)}backward/2/stdarg.h
 transcode.$(OBJEXT): {$(VPATH)}config.h
 transcode.$(OBJEXT): {$(VPATH)}constant.h
+transcode.$(OBJEXT): {$(VPATH)}debug_counter.h
 transcode.$(OBJEXT): {$(VPATH)}defines.h
 transcode.$(OBJEXT): {$(VPATH)}encoding.h
 transcode.$(OBJEXT): {$(VPATH)}id.h
@@ -17008,6 +19725,7 @@ transcode.$(OBJEXT): {$(VPATH)}internal/intern/re.h
 transcode.$(OBJEXT): {$(VPATH)}internal/intern/ruby.h
 transcode.$(OBJEXT): {$(VPATH)}internal/intern/select.h
 transcode.$(OBJEXT): {$(VPATH)}internal/intern/select/largesize.h
+transcode.$(OBJEXT): {$(VPATH)}internal/intern/set.h
 transcode.$(OBJEXT): {$(VPATH)}internal/intern/signal.h
 transcode.$(OBJEXT): {$(VPATH)}internal/intern/sprintf.h
 transcode.$(OBJEXT): {$(VPATH)}internal/intern/string.h
@@ -17027,6 +19745,7 @@ transcode.$(OBJEXT): {$(VPATH)}internal/special_consts.h
 transcode.$(OBJEXT): {$(VPATH)}internal/static_assert.h
 transcode.$(OBJEXT): {$(VPATH)}internal/stdalign.h
 transcode.$(OBJEXT): {$(VPATH)}internal/stdbool.h
+transcode.$(OBJEXT): {$(VPATH)}internal/stdckdint.h
 transcode.$(OBJEXT): {$(VPATH)}internal/symbol.h
 transcode.$(OBJEXT): {$(VPATH)}internal/value.h
 transcode.$(OBJEXT): {$(VPATH)}internal/value_type.h
@@ -17041,9 +19760,14 @@ transcode.$(OBJEXT): {$(VPATH)}st.h
 transcode.$(OBJEXT): {$(VPATH)}subst.h
 transcode.$(OBJEXT): {$(VPATH)}transcode.c
 transcode.$(OBJEXT): {$(VPATH)}transcode_data.h
+transcode.$(OBJEXT): {$(VPATH)}vm_debug.h
+transcode.$(OBJEXT): {$(VPATH)}vm_sync.h
 util.$(OBJEXT): $(hdrdir)/ruby/ruby.h
+util.$(OBJEXT): $(top_srcdir)/internal/array.h
 util.$(OBJEXT): $(top_srcdir)/internal/compilers.h
+util.$(OBJEXT): $(top_srcdir)/internal/imemo.h
 util.$(OBJEXT): $(top_srcdir)/internal/sanitizers.h
+util.$(OBJEXT): $(top_srcdir)/internal/static_assert.h
 util.$(OBJEXT): $(top_srcdir)/internal/util.h
 util.$(OBJEXT): $(top_srcdir)/internal/warnings.h
 util.$(OBJEXT): {$(VPATH)}assert.h
@@ -17060,6 +19784,7 @@ util.$(OBJEXT): {$(VPATH)}backward/2/stdarg.h
 util.$(OBJEXT): {$(VPATH)}config.h
 util.$(OBJEXT): {$(VPATH)}defines.h
 util.$(OBJEXT): {$(VPATH)}dtoa.c
+util.$(OBJEXT): {$(VPATH)}id_table.h
 util.$(OBJEXT): {$(VPATH)}intern.h
 util.$(OBJEXT): {$(VPATH)}internal.h
 util.$(OBJEXT): {$(VPATH)}internal/abi.h
@@ -17176,6 +19901,7 @@ util.$(OBJEXT): {$(VPATH)}internal/intern/re.h
 util.$(OBJEXT): {$(VPATH)}internal/intern/ruby.h
 util.$(OBJEXT): {$(VPATH)}internal/intern/select.h
 util.$(OBJEXT): {$(VPATH)}internal/intern/select/largesize.h
+util.$(OBJEXT): {$(VPATH)}internal/intern/set.h
 util.$(OBJEXT): {$(VPATH)}internal/intern/signal.h
 util.$(OBJEXT): {$(VPATH)}internal/intern/sprintf.h
 util.$(OBJEXT): {$(VPATH)}internal/intern/string.h
@@ -17195,6 +19921,7 @@ util.$(OBJEXT): {$(VPATH)}internal/special_consts.h
 util.$(OBJEXT): {$(VPATH)}internal/static_assert.h
 util.$(OBJEXT): {$(VPATH)}internal/stdalign.h
 util.$(OBJEXT): {$(VPATH)}internal/stdbool.h
+util.$(OBJEXT): {$(VPATH)}internal/stdckdint.h
 util.$(OBJEXT): {$(VPATH)}internal/symbol.h
 util.$(OBJEXT): {$(VPATH)}internal/value.h
 util.$(OBJEXT): {$(VPATH)}internal/value_type.h
@@ -17212,6 +19939,7 @@ variable.$(OBJEXT): $(CCAN_DIR)/container_of/container_of.h
 variable.$(OBJEXT): $(CCAN_DIR)/list/list.h
 variable.$(OBJEXT): $(CCAN_DIR)/str/str.h
 variable.$(OBJEXT): $(hdrdir)/ruby/ruby.h
+variable.$(OBJEXT): $(hdrdir)/ruby/version.h
 variable.$(OBJEXT): $(top_srcdir)/internal/array.h
 variable.$(OBJEXT): $(top_srcdir)/internal/basic_operators.h
 variable.$(OBJEXT): $(top_srcdir)/internal/class.h
@@ -17221,9 +19949,12 @@ 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/namespace.h
 variable.$(OBJEXT): $(top_srcdir)/internal/object.h
 variable.$(OBJEXT): $(top_srcdir)/internal/re.h
+variable.$(OBJEXT): $(top_srcdir)/internal/sanitizers.h
 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/symbol.h
@@ -17374,6 +20105,7 @@ variable.$(OBJEXT): {$(VPATH)}internal/intern/re.h
 variable.$(OBJEXT): {$(VPATH)}internal/intern/ruby.h
 variable.$(OBJEXT): {$(VPATH)}internal/intern/select.h
 variable.$(OBJEXT): {$(VPATH)}internal/intern/select/largesize.h
+variable.$(OBJEXT): {$(VPATH)}internal/intern/set.h
 variable.$(OBJEXT): {$(VPATH)}internal/intern/signal.h
 variable.$(OBJEXT): {$(VPATH)}internal/intern/sprintf.h
 variable.$(OBJEXT): {$(VPATH)}internal/intern/string.h
@@ -17393,6 +20125,7 @@ variable.$(OBJEXT): {$(VPATH)}internal/special_consts.h
 variable.$(OBJEXT): {$(VPATH)}internal/static_assert.h
 variable.$(OBJEXT): {$(VPATH)}internal/stdalign.h
 variable.$(OBJEXT): {$(VPATH)}internal/stdbool.h
+variable.$(OBJEXT): {$(VPATH)}internal/stdckdint.h
 variable.$(OBJEXT): {$(VPATH)}internal/symbol.h
 variable.$(OBJEXT): {$(VPATH)}internal/value.h
 variable.$(OBJEXT): {$(VPATH)}internal/value_type.h
@@ -17435,7 +20168,11 @@ version.$(OBJEXT): $(top_srcdir)/internal/cmdlineopt.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/namespace.h
+version.$(OBJEXT): $(top_srcdir)/internal/parse.h
+version.$(OBJEXT): $(top_srcdir)/internal/sanitizers.h
 version.$(OBJEXT): $(top_srcdir)/internal/serial.h
+version.$(OBJEXT): $(top_srcdir)/internal/set_table.h
 version.$(OBJEXT): $(top_srcdir)/internal/static_assert.h
 version.$(OBJEXT): $(top_srcdir)/internal/variable.h
 version.$(OBJEXT): $(top_srcdir)/internal/vm.h
@@ -17584,6 +20321,7 @@ version.$(OBJEXT): {$(VPATH)}internal/intern/re.h
 version.$(OBJEXT): {$(VPATH)}internal/intern/ruby.h
 version.$(OBJEXT): {$(VPATH)}internal/intern/select.h
 version.$(OBJEXT): {$(VPATH)}internal/intern/select/largesize.h
+version.$(OBJEXT): {$(VPATH)}internal/intern/set.h
 version.$(OBJEXT): {$(VPATH)}internal/intern/signal.h
 version.$(OBJEXT): {$(VPATH)}internal/intern/sprintf.h
 version.$(OBJEXT): {$(VPATH)}internal/intern/string.h
@@ -17603,6 +20341,7 @@ version.$(OBJEXT): {$(VPATH)}internal/special_consts.h
 version.$(OBJEXT): {$(VPATH)}internal/static_assert.h
 version.$(OBJEXT): {$(VPATH)}internal/stdalign.h
 version.$(OBJEXT): {$(VPATH)}internal/stdbool.h
+version.$(OBJEXT): {$(VPATH)}internal/stdckdint.h
 version.$(OBJEXT): {$(VPATH)}internal/symbol.h
 version.$(OBJEXT): {$(VPATH)}internal/value.h
 version.$(OBJEXT): {$(VPATH)}internal/value_type.h
@@ -17615,7 +20354,6 @@ version.$(OBJEXT): {$(VPATH)}node.h
 version.$(OBJEXT): {$(VPATH)}onigmo.h
 version.$(OBJEXT): {$(VPATH)}oniguruma.h
 version.$(OBJEXT): {$(VPATH)}revision.h
-version.$(OBJEXT): {$(VPATH)}rjit.h
 version.$(OBJEXT): {$(VPATH)}ruby_assert.h
 version.$(OBJEXT): {$(VPATH)}ruby_atomic.h
 version.$(OBJEXT): {$(VPATH)}rubyparser.h
@@ -17634,6 +20372,7 @@ 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): $(hdrdir)/ruby/version.h
 vm.$(OBJEXT): $(top_srcdir)/internal/array.h
 vm.$(OBJEXT): $(top_srcdir)/internal/basic_operators.h
 vm.$(OBJEXT): $(top_srcdir)/internal/bignum.h
@@ -17642,7 +20381,9 @@ 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/complex.h
 vm.$(OBJEXT): $(top_srcdir)/internal/cont.h
+vm.$(OBJEXT): $(top_srcdir)/internal/encoding.h
 vm.$(OBJEXT): $(top_srcdir)/internal/error.h
 vm.$(OBJEXT): $(top_srcdir)/internal/eval.h
 vm.$(OBJEXT): $(top_srcdir)/internal/fixnum.h
@@ -17650,23 +20391,48 @@ 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/missing.h
+vm.$(OBJEXT): $(top_srcdir)/internal/namespace.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/rational.h
 vm.$(OBJEXT): $(top_srcdir)/internal/re.h
 vm.$(OBJEXT): $(top_srcdir)/internal/ruby_parser.h
 vm.$(OBJEXT): $(top_srcdir)/internal/sanitizers.h
 vm.$(OBJEXT): $(top_srcdir)/internal/serial.h
+vm.$(OBJEXT): $(top_srcdir)/internal/set_table.h
 vm.$(OBJEXT): $(top_srcdir)/internal/static_assert.h
 vm.$(OBJEXT): $(top_srcdir)/internal/string.h
 vm.$(OBJEXT): $(top_srcdir)/internal/struct.h
 vm.$(OBJEXT): $(top_srcdir)/internal/symbol.h
 vm.$(OBJEXT): $(top_srcdir)/internal/thread.h
+vm.$(OBJEXT): $(top_srcdir)/internal/transcode.h
 vm.$(OBJEXT): $(top_srcdir)/internal/variable.h
 vm.$(OBJEXT): $(top_srcdir)/internal/vm.h
 vm.$(OBJEXT): $(top_srcdir)/internal/warnings.h
+vm.$(OBJEXT): $(top_srcdir)/prism/defines.h
+vm.$(OBJEXT): $(top_srcdir)/prism/encoding.h
+vm.$(OBJEXT): $(top_srcdir)/prism/node.h
+vm.$(OBJEXT): $(top_srcdir)/prism/options.h
+vm.$(OBJEXT): $(top_srcdir)/prism/pack.h
+vm.$(OBJEXT): $(top_srcdir)/prism/parser.h
+vm.$(OBJEXT): $(top_srcdir)/prism/prettyprint.h
+vm.$(OBJEXT): $(top_srcdir)/prism/prism.h
+vm.$(OBJEXT): $(top_srcdir)/prism/regexp.h
+vm.$(OBJEXT): $(top_srcdir)/prism/static_literals.h
+vm.$(OBJEXT): $(top_srcdir)/prism/util/pm_buffer.h
+vm.$(OBJEXT): $(top_srcdir)/prism/util/pm_char.h
+vm.$(OBJEXT): $(top_srcdir)/prism/util/pm_constant_pool.h
+vm.$(OBJEXT): $(top_srcdir)/prism/util/pm_integer.h
+vm.$(OBJEXT): $(top_srcdir)/prism/util/pm_list.h
+vm.$(OBJEXT): $(top_srcdir)/prism/util/pm_memchr.h
+vm.$(OBJEXT): $(top_srcdir)/prism/util/pm_newline_list.h
+vm.$(OBJEXT): $(top_srcdir)/prism/util/pm_string.h
+vm.$(OBJEXT): $(top_srcdir)/prism/util/pm_strncasecmp.h
+vm.$(OBJEXT): $(top_srcdir)/prism/util/pm_strpbrk.h
 vm.$(OBJEXT): {$(VPATH)}assert.h
 vm.$(OBJEXT): {$(VPATH)}atomic.h
 vm.$(OBJEXT): {$(VPATH)}backward/2/assume.h
@@ -17816,6 +20582,7 @@ vm.$(OBJEXT): {$(VPATH)}internal/intern/re.h
 vm.$(OBJEXT): {$(VPATH)}internal/intern/ruby.h
 vm.$(OBJEXT): {$(VPATH)}internal/intern/select.h
 vm.$(OBJEXT): {$(VPATH)}internal/intern/select/largesize.h
+vm.$(OBJEXT): {$(VPATH)}internal/intern/set.h
 vm.$(OBJEXT): {$(VPATH)}internal/intern/signal.h
 vm.$(OBJEXT): {$(VPATH)}internal/intern/sprintf.h
 vm.$(OBJEXT): {$(VPATH)}internal/intern/string.h
@@ -17835,6 +20602,7 @@ vm.$(OBJEXT): {$(VPATH)}internal/special_consts.h
 vm.$(OBJEXT): {$(VPATH)}internal/static_assert.h
 vm.$(OBJEXT): {$(VPATH)}internal/stdalign.h
 vm.$(OBJEXT): {$(VPATH)}internal/stdbool.h
+vm.$(OBJEXT): {$(VPATH)}internal/stdckdint.h
 vm.$(OBJEXT): {$(VPATH)}internal/symbol.h
 vm.$(OBJEXT): {$(VPATH)}internal/value.h
 vm.$(OBJEXT): {$(VPATH)}internal/value_type.h
@@ -17847,18 +20615,22 @@ vm.$(OBJEXT): {$(VPATH)}missing.h
 vm.$(OBJEXT): {$(VPATH)}node.h
 vm.$(OBJEXT): {$(VPATH)}onigmo.h
 vm.$(OBJEXT): {$(VPATH)}oniguruma.h
+vm.$(OBJEXT): {$(VPATH)}prism/ast.h
+vm.$(OBJEXT): {$(VPATH)}prism/diagnostic.h
+vm.$(OBJEXT): {$(VPATH)}prism/version.h
+vm.$(OBJEXT): {$(VPATH)}prism_compile.h
 vm.$(OBJEXT): {$(VPATH)}probes.dmyh
 vm.$(OBJEXT): {$(VPATH)}probes.h
 vm.$(OBJEXT): {$(VPATH)}probes_helper.h
 vm.$(OBJEXT): {$(VPATH)}ractor.h
 vm.$(OBJEXT): {$(VPATH)}ractor_core.h
-vm.$(OBJEXT): {$(VPATH)}rjit.h
 vm.$(OBJEXT): {$(VPATH)}ruby_assert.h
 vm.$(OBJEXT): {$(VPATH)}ruby_atomic.h
 vm.$(OBJEXT): {$(VPATH)}rubyparser.h
 vm.$(OBJEXT): {$(VPATH)}shape.h
 vm.$(OBJEXT): {$(VPATH)}st.h
 vm.$(OBJEXT): {$(VPATH)}subst.h
+vm.$(OBJEXT): {$(VPATH)}symbol.h
 vm.$(OBJEXT): {$(VPATH)}thread_$(THREAD_MODEL).h
 vm.$(OBJEXT): {$(VPATH)}thread_native.h
 vm.$(OBJEXT): {$(VPATH)}variable.h
@@ -17880,11 +20652,14 @@ vm.$(OBJEXT): {$(VPATH)}vm_opts.h
 vm.$(OBJEXT): {$(VPATH)}vm_sync.h
 vm.$(OBJEXT): {$(VPATH)}vmtc.inc
 vm.$(OBJEXT): {$(VPATH)}yjit.h
+vm.$(OBJEXT): {$(VPATH)}yjit_hook.rbinc
+vm.$(OBJEXT): {$(VPATH)}zjit.h
 vm_backtrace.$(OBJEXT): $(CCAN_DIR)/check_type/check_type.h
 vm_backtrace.$(OBJEXT): $(CCAN_DIR)/container_of/container_of.h
 vm_backtrace.$(OBJEXT): $(CCAN_DIR)/list/list.h
 vm_backtrace.$(OBJEXT): $(CCAN_DIR)/str/str.h
 vm_backtrace.$(OBJEXT): $(hdrdir)/ruby/ruby.h
+vm_backtrace.$(OBJEXT): $(hdrdir)/ruby/version.h
 vm_backtrace.$(OBJEXT): $(top_srcdir)/internal/array.h
 vm_backtrace.$(OBJEXT): $(top_srcdir)/internal/basic_operators.h
 vm_backtrace.$(OBJEXT): $(top_srcdir)/internal/class.h
@@ -17892,12 +20667,35 @@ vm_backtrace.$(OBJEXT): $(top_srcdir)/internal/compilers.h
 vm_backtrace.$(OBJEXT): $(top_srcdir)/internal/error.h
 vm_backtrace.$(OBJEXT): $(top_srcdir)/internal/gc.h
 vm_backtrace.$(OBJEXT): $(top_srcdir)/internal/imemo.h
+vm_backtrace.$(OBJEXT): $(top_srcdir)/internal/namespace.h
+vm_backtrace.$(OBJEXT): $(top_srcdir)/internal/sanitizers.h
 vm_backtrace.$(OBJEXT): $(top_srcdir)/internal/serial.h
+vm_backtrace.$(OBJEXT): $(top_srcdir)/internal/set_table.h
 vm_backtrace.$(OBJEXT): $(top_srcdir)/internal/static_assert.h
 vm_backtrace.$(OBJEXT): $(top_srcdir)/internal/string.h
 vm_backtrace.$(OBJEXT): $(top_srcdir)/internal/variable.h
 vm_backtrace.$(OBJEXT): $(top_srcdir)/internal/vm.h
 vm_backtrace.$(OBJEXT): $(top_srcdir)/internal/warnings.h
+vm_backtrace.$(OBJEXT): $(top_srcdir)/prism/defines.h
+vm_backtrace.$(OBJEXT): $(top_srcdir)/prism/encoding.h
+vm_backtrace.$(OBJEXT): $(top_srcdir)/prism/node.h
+vm_backtrace.$(OBJEXT): $(top_srcdir)/prism/options.h
+vm_backtrace.$(OBJEXT): $(top_srcdir)/prism/pack.h
+vm_backtrace.$(OBJEXT): $(top_srcdir)/prism/parser.h
+vm_backtrace.$(OBJEXT): $(top_srcdir)/prism/prettyprint.h
+vm_backtrace.$(OBJEXT): $(top_srcdir)/prism/prism.h
+vm_backtrace.$(OBJEXT): $(top_srcdir)/prism/regexp.h
+vm_backtrace.$(OBJEXT): $(top_srcdir)/prism/static_literals.h
+vm_backtrace.$(OBJEXT): $(top_srcdir)/prism/util/pm_buffer.h
+vm_backtrace.$(OBJEXT): $(top_srcdir)/prism/util/pm_char.h
+vm_backtrace.$(OBJEXT): $(top_srcdir)/prism/util/pm_constant_pool.h
+vm_backtrace.$(OBJEXT): $(top_srcdir)/prism/util/pm_integer.h
+vm_backtrace.$(OBJEXT): $(top_srcdir)/prism/util/pm_list.h
+vm_backtrace.$(OBJEXT): $(top_srcdir)/prism/util/pm_memchr.h
+vm_backtrace.$(OBJEXT): $(top_srcdir)/prism/util/pm_newline_list.h
+vm_backtrace.$(OBJEXT): $(top_srcdir)/prism/util/pm_string.h
+vm_backtrace.$(OBJEXT): $(top_srcdir)/prism/util/pm_strncasecmp.h
+vm_backtrace.$(OBJEXT): $(top_srcdir)/prism/util/pm_strpbrk.h
 vm_backtrace.$(OBJEXT): {$(VPATH)}assert.h
 vm_backtrace.$(OBJEXT): {$(VPATH)}atomic.h
 vm_backtrace.$(OBJEXT): {$(VPATH)}backward/2/assume.h
@@ -17912,6 +20710,7 @@ vm_backtrace.$(OBJEXT): {$(VPATH)}backward/2/stdarg.h
 vm_backtrace.$(OBJEXT): {$(VPATH)}config.h
 vm_backtrace.$(OBJEXT): {$(VPATH)}constant.h
 vm_backtrace.$(OBJEXT): {$(VPATH)}debug.h
+vm_backtrace.$(OBJEXT): {$(VPATH)}debug_counter.h
 vm_backtrace.$(OBJEXT): {$(VPATH)}defines.h
 vm_backtrace.$(OBJEXT): {$(VPATH)}encoding.h
 vm_backtrace.$(OBJEXT): {$(VPATH)}eval_intern.h
@@ -18042,6 +20841,7 @@ vm_backtrace.$(OBJEXT): {$(VPATH)}internal/intern/re.h
 vm_backtrace.$(OBJEXT): {$(VPATH)}internal/intern/ruby.h
 vm_backtrace.$(OBJEXT): {$(VPATH)}internal/intern/select.h
 vm_backtrace.$(OBJEXT): {$(VPATH)}internal/intern/select/largesize.h
+vm_backtrace.$(OBJEXT): {$(VPATH)}internal/intern/set.h
 vm_backtrace.$(OBJEXT): {$(VPATH)}internal/intern/signal.h
 vm_backtrace.$(OBJEXT): {$(VPATH)}internal/intern/sprintf.h
 vm_backtrace.$(OBJEXT): {$(VPATH)}internal/intern/string.h
@@ -18061,6 +20861,7 @@ vm_backtrace.$(OBJEXT): {$(VPATH)}internal/special_consts.h
 vm_backtrace.$(OBJEXT): {$(VPATH)}internal/static_assert.h
 vm_backtrace.$(OBJEXT): {$(VPATH)}internal/stdalign.h
 vm_backtrace.$(OBJEXT): {$(VPATH)}internal/stdbool.h
+vm_backtrace.$(OBJEXT): {$(VPATH)}internal/stdckdint.h
 vm_backtrace.$(OBJEXT): {$(VPATH)}internal/symbol.h
 vm_backtrace.$(OBJEXT): {$(VPATH)}internal/value.h
 vm_backtrace.$(OBJEXT): {$(VPATH)}internal/value_type.h
@@ -18073,6 +20874,10 @@ vm_backtrace.$(OBJEXT): {$(VPATH)}missing.h
 vm_backtrace.$(OBJEXT): {$(VPATH)}node.h
 vm_backtrace.$(OBJEXT): {$(VPATH)}onigmo.h
 vm_backtrace.$(OBJEXT): {$(VPATH)}oniguruma.h
+vm_backtrace.$(OBJEXT): {$(VPATH)}prism/ast.h
+vm_backtrace.$(OBJEXT): {$(VPATH)}prism/diagnostic.h
+vm_backtrace.$(OBJEXT): {$(VPATH)}prism/version.h
+vm_backtrace.$(OBJEXT): {$(VPATH)}prism_compile.h
 vm_backtrace.$(OBJEXT): {$(VPATH)}ruby_assert.h
 vm_backtrace.$(OBJEXT): {$(VPATH)}ruby_atomic.h
 vm_backtrace.$(OBJEXT): {$(VPATH)}rubyparser.h
@@ -18083,7 +20888,9 @@ vm_backtrace.$(OBJEXT): {$(VPATH)}thread_$(THREAD_MODEL).h
 vm_backtrace.$(OBJEXT): {$(VPATH)}thread_native.h
 vm_backtrace.$(OBJEXT): {$(VPATH)}vm_backtrace.c
 vm_backtrace.$(OBJEXT): {$(VPATH)}vm_core.h
+vm_backtrace.$(OBJEXT): {$(VPATH)}vm_debug.h
 vm_backtrace.$(OBJEXT): {$(VPATH)}vm_opts.h
+vm_backtrace.$(OBJEXT): {$(VPATH)}vm_sync.h
 vm_dump.$(OBJEXT): $(CCAN_DIR)/check_type/check_type.h
 vm_dump.$(OBJEXT): $(CCAN_DIR)/container_of/container_of.h
 vm_dump.$(OBJEXT): $(CCAN_DIR)/list/list.h
@@ -18094,11 +20901,34 @@ vm_dump.$(OBJEXT): $(top_srcdir)/internal/basic_operators.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/namespace.h
+vm_dump.$(OBJEXT): $(top_srcdir)/internal/sanitizers.h
 vm_dump.$(OBJEXT): $(top_srcdir)/internal/serial.h
+vm_dump.$(OBJEXT): $(top_srcdir)/internal/set_table.h
 vm_dump.$(OBJEXT): $(top_srcdir)/internal/static_assert.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): $(top_srcdir)/prism/defines.h
+vm_dump.$(OBJEXT): $(top_srcdir)/prism/encoding.h
+vm_dump.$(OBJEXT): $(top_srcdir)/prism/node.h
+vm_dump.$(OBJEXT): $(top_srcdir)/prism/options.h
+vm_dump.$(OBJEXT): $(top_srcdir)/prism/pack.h
+vm_dump.$(OBJEXT): $(top_srcdir)/prism/parser.h
+vm_dump.$(OBJEXT): $(top_srcdir)/prism/prettyprint.h
+vm_dump.$(OBJEXT): $(top_srcdir)/prism/prism.h
+vm_dump.$(OBJEXT): $(top_srcdir)/prism/regexp.h
+vm_dump.$(OBJEXT): $(top_srcdir)/prism/static_literals.h
+vm_dump.$(OBJEXT): $(top_srcdir)/prism/util/pm_buffer.h
+vm_dump.$(OBJEXT): $(top_srcdir)/prism/util/pm_char.h
+vm_dump.$(OBJEXT): $(top_srcdir)/prism/util/pm_constant_pool.h
+vm_dump.$(OBJEXT): $(top_srcdir)/prism/util/pm_integer.h
+vm_dump.$(OBJEXT): $(top_srcdir)/prism/util/pm_list.h
+vm_dump.$(OBJEXT): $(top_srcdir)/prism/util/pm_memchr.h
+vm_dump.$(OBJEXT): $(top_srcdir)/prism/util/pm_newline_list.h
+vm_dump.$(OBJEXT): $(top_srcdir)/prism/util/pm_string.h
+vm_dump.$(OBJEXT): $(top_srcdir)/prism/util/pm_strncasecmp.h
+vm_dump.$(OBJEXT): $(top_srcdir)/prism/util/pm_strpbrk.h
 vm_dump.$(OBJEXT): {$(VPATH)}addr2line.h
 vm_dump.$(OBJEXT): {$(VPATH)}assert.h
 vm_dump.$(OBJEXT): {$(VPATH)}atomic.h
@@ -18115,6 +20945,7 @@ vm_dump.$(OBJEXT): {$(VPATH)}config.h
 vm_dump.$(OBJEXT): {$(VPATH)}constant.h
 vm_dump.$(OBJEXT): {$(VPATH)}defines.h
 vm_dump.$(OBJEXT): {$(VPATH)}encoding.h
+vm_dump.$(OBJEXT): {$(VPATH)}fiber/scheduler.h
 vm_dump.$(OBJEXT): {$(VPATH)}id.h
 vm_dump.$(OBJEXT): {$(VPATH)}id_table.h
 vm_dump.$(OBJEXT): {$(VPATH)}intern.h
@@ -18242,6 +21073,7 @@ vm_dump.$(OBJEXT): {$(VPATH)}internal/intern/re.h
 vm_dump.$(OBJEXT): {$(VPATH)}internal/intern/ruby.h
 vm_dump.$(OBJEXT): {$(VPATH)}internal/intern/select.h
 vm_dump.$(OBJEXT): {$(VPATH)}internal/intern/select/largesize.h
+vm_dump.$(OBJEXT): {$(VPATH)}internal/intern/set.h
 vm_dump.$(OBJEXT): {$(VPATH)}internal/intern/signal.h
 vm_dump.$(OBJEXT): {$(VPATH)}internal/intern/sprintf.h
 vm_dump.$(OBJEXT): {$(VPATH)}internal/intern/string.h
@@ -18261,6 +21093,7 @@ vm_dump.$(OBJEXT): {$(VPATH)}internal/special_consts.h
 vm_dump.$(OBJEXT): {$(VPATH)}internal/static_assert.h
 vm_dump.$(OBJEXT): {$(VPATH)}internal/stdalign.h
 vm_dump.$(OBJEXT): {$(VPATH)}internal/stdbool.h
+vm_dump.$(OBJEXT): {$(VPATH)}internal/stdckdint.h
 vm_dump.$(OBJEXT): {$(VPATH)}internal/symbol.h
 vm_dump.$(OBJEXT): {$(VPATH)}internal/value.h
 vm_dump.$(OBJEXT): {$(VPATH)}internal/value_type.h
@@ -18273,6 +21106,10 @@ vm_dump.$(OBJEXT): {$(VPATH)}missing.h
 vm_dump.$(OBJEXT): {$(VPATH)}node.h
 vm_dump.$(OBJEXT): {$(VPATH)}onigmo.h
 vm_dump.$(OBJEXT): {$(VPATH)}oniguruma.h
+vm_dump.$(OBJEXT): {$(VPATH)}prism/ast.h
+vm_dump.$(OBJEXT): {$(VPATH)}prism/diagnostic.h
+vm_dump.$(OBJEXT): {$(VPATH)}prism/version.h
+vm_dump.$(OBJEXT): {$(VPATH)}prism_compile.h
 vm_dump.$(OBJEXT): {$(VPATH)}procstat_vm.c
 vm_dump.$(OBJEXT): {$(VPATH)}ractor.h
 vm_dump.$(OBJEXT): {$(VPATH)}ractor_core.h
@@ -18298,7 +21135,10 @@ vm_sync.$(OBJEXT): $(top_srcdir)/internal/basic_operators.h
 vm_sync.$(OBJEXT): $(top_srcdir)/internal/compilers.h
 vm_sync.$(OBJEXT): $(top_srcdir)/internal/gc.h
 vm_sync.$(OBJEXT): $(top_srcdir)/internal/imemo.h
+vm_sync.$(OBJEXT): $(top_srcdir)/internal/namespace.h
+vm_sync.$(OBJEXT): $(top_srcdir)/internal/sanitizers.h
 vm_sync.$(OBJEXT): $(top_srcdir)/internal/serial.h
+vm_sync.$(OBJEXT): $(top_srcdir)/internal/set_table.h
 vm_sync.$(OBJEXT): $(top_srcdir)/internal/static_assert.h
 vm_sync.$(OBJEXT): $(top_srcdir)/internal/thread.h
 vm_sync.$(OBJEXT): $(top_srcdir)/internal/variable.h
@@ -18447,6 +21287,7 @@ vm_sync.$(OBJEXT): {$(VPATH)}internal/intern/re.h
 vm_sync.$(OBJEXT): {$(VPATH)}internal/intern/ruby.h
 vm_sync.$(OBJEXT): {$(VPATH)}internal/intern/select.h
 vm_sync.$(OBJEXT): {$(VPATH)}internal/intern/select/largesize.h
+vm_sync.$(OBJEXT): {$(VPATH)}internal/intern/set.h
 vm_sync.$(OBJEXT): {$(VPATH)}internal/intern/signal.h
 vm_sync.$(OBJEXT): {$(VPATH)}internal/intern/sprintf.h
 vm_sync.$(OBJEXT): {$(VPATH)}internal/intern/string.h
@@ -18466,6 +21307,7 @@ vm_sync.$(OBJEXT): {$(VPATH)}internal/special_consts.h
 vm_sync.$(OBJEXT): {$(VPATH)}internal/static_assert.h
 vm_sync.$(OBJEXT): {$(VPATH)}internal/stdalign.h
 vm_sync.$(OBJEXT): {$(VPATH)}internal/stdbool.h
+vm_sync.$(OBJEXT): {$(VPATH)}internal/stdckdint.h
 vm_sync.$(OBJEXT): {$(VPATH)}internal/symbol.h
 vm_sync.$(OBJEXT): {$(VPATH)}internal/value.h
 vm_sync.$(OBJEXT): {$(VPATH)}internal/value_type.h
@@ -18500,17 +21342,42 @@ 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/basic_operators.h
+vm_trace.$(OBJEXT): $(top_srcdir)/internal/bits.h
 vm_trace.$(OBJEXT): $(top_srcdir)/internal/class.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/namespace.h
+vm_trace.$(OBJEXT): $(top_srcdir)/internal/sanitizers.h
 vm_trace.$(OBJEXT): $(top_srcdir)/internal/serial.h
+vm_trace.$(OBJEXT): $(top_srcdir)/internal/set_table.h
 vm_trace.$(OBJEXT): $(top_srcdir)/internal/static_assert.h
 vm_trace.$(OBJEXT): $(top_srcdir)/internal/symbol.h
+vm_trace.$(OBJEXT): $(top_srcdir)/internal/thread.h
 vm_trace.$(OBJEXT): $(top_srcdir)/internal/variable.h
 vm_trace.$(OBJEXT): $(top_srcdir)/internal/vm.h
 vm_trace.$(OBJEXT): $(top_srcdir)/internal/warnings.h
+vm_trace.$(OBJEXT): $(top_srcdir)/prism/defines.h
+vm_trace.$(OBJEXT): $(top_srcdir)/prism/encoding.h
+vm_trace.$(OBJEXT): $(top_srcdir)/prism/node.h
+vm_trace.$(OBJEXT): $(top_srcdir)/prism/options.h
+vm_trace.$(OBJEXT): $(top_srcdir)/prism/pack.h
+vm_trace.$(OBJEXT): $(top_srcdir)/prism/parser.h
+vm_trace.$(OBJEXT): $(top_srcdir)/prism/prettyprint.h
+vm_trace.$(OBJEXT): $(top_srcdir)/prism/prism.h
+vm_trace.$(OBJEXT): $(top_srcdir)/prism/regexp.h
+vm_trace.$(OBJEXT): $(top_srcdir)/prism/static_literals.h
+vm_trace.$(OBJEXT): $(top_srcdir)/prism/util/pm_buffer.h
+vm_trace.$(OBJEXT): $(top_srcdir)/prism/util/pm_char.h
+vm_trace.$(OBJEXT): $(top_srcdir)/prism/util/pm_constant_pool.h
+vm_trace.$(OBJEXT): $(top_srcdir)/prism/util/pm_integer.h
+vm_trace.$(OBJEXT): $(top_srcdir)/prism/util/pm_list.h
+vm_trace.$(OBJEXT): $(top_srcdir)/prism/util/pm_memchr.h
+vm_trace.$(OBJEXT): $(top_srcdir)/prism/util/pm_newline_list.h
+vm_trace.$(OBJEXT): $(top_srcdir)/prism/util/pm_string.h
+vm_trace.$(OBJEXT): $(top_srcdir)/prism/util/pm_strncasecmp.h
+vm_trace.$(OBJEXT): $(top_srcdir)/prism/util/pm_strpbrk.h
 vm_trace.$(OBJEXT): {$(VPATH)}assert.h
 vm_trace.$(OBJEXT): {$(VPATH)}atomic.h
 vm_trace.$(OBJEXT): {$(VPATH)}backward/2/assume.h
@@ -18657,6 +21524,7 @@ vm_trace.$(OBJEXT): {$(VPATH)}internal/intern/re.h
 vm_trace.$(OBJEXT): {$(VPATH)}internal/intern/ruby.h
 vm_trace.$(OBJEXT): {$(VPATH)}internal/intern/select.h
 vm_trace.$(OBJEXT): {$(VPATH)}internal/intern/select/largesize.h
+vm_trace.$(OBJEXT): {$(VPATH)}internal/intern/set.h
 vm_trace.$(OBJEXT): {$(VPATH)}internal/intern/signal.h
 vm_trace.$(OBJEXT): {$(VPATH)}internal/intern/sprintf.h
 vm_trace.$(OBJEXT): {$(VPATH)}internal/intern/string.h
@@ -18676,6 +21544,7 @@ vm_trace.$(OBJEXT): {$(VPATH)}internal/special_consts.h
 vm_trace.$(OBJEXT): {$(VPATH)}internal/static_assert.h
 vm_trace.$(OBJEXT): {$(VPATH)}internal/stdalign.h
 vm_trace.$(OBJEXT): {$(VPATH)}internal/stdbool.h
+vm_trace.$(OBJEXT): {$(VPATH)}internal/stdckdint.h
 vm_trace.$(OBJEXT): {$(VPATH)}internal/symbol.h
 vm_trace.$(OBJEXT): {$(VPATH)}internal/value.h
 vm_trace.$(OBJEXT): {$(VPATH)}internal/value_type.h
@@ -18688,8 +21557,11 @@ vm_trace.$(OBJEXT): {$(VPATH)}missing.h
 vm_trace.$(OBJEXT): {$(VPATH)}node.h
 vm_trace.$(OBJEXT): {$(VPATH)}onigmo.h
 vm_trace.$(OBJEXT): {$(VPATH)}oniguruma.h
+vm_trace.$(OBJEXT): {$(VPATH)}prism/ast.h
+vm_trace.$(OBJEXT): {$(VPATH)}prism/diagnostic.h
+vm_trace.$(OBJEXT): {$(VPATH)}prism/version.h
+vm_trace.$(OBJEXT): {$(VPATH)}prism_compile.h
 vm_trace.$(OBJEXT): {$(VPATH)}ractor.h
-vm_trace.$(OBJEXT): {$(VPATH)}rjit.h
 vm_trace.$(OBJEXT): {$(VPATH)}ruby_assert.h
 vm_trace.$(OBJEXT): {$(VPATH)}ruby_atomic.h
 vm_trace.$(OBJEXT): {$(VPATH)}rubyparser.h
@@ -18700,7 +21572,9 @@ vm_trace.$(OBJEXT): {$(VPATH)}thread_$(THREAD_MODEL).h
 vm_trace.$(OBJEXT): {$(VPATH)}thread_native.h
 vm_trace.$(OBJEXT): {$(VPATH)}trace_point.rbinc
 vm_trace.$(OBJEXT): {$(VPATH)}vm_core.h
+vm_trace.$(OBJEXT): {$(VPATH)}vm_debug.h
 vm_trace.$(OBJEXT): {$(VPATH)}vm_opts.h
+vm_trace.$(OBJEXT): {$(VPATH)}vm_sync.h
 vm_trace.$(OBJEXT): {$(VPATH)}vm_trace.c
 vm_trace.$(OBJEXT): {$(VPATH)}yjit.h
 weakmap.$(OBJEXT): $(CCAN_DIR)/check_type/check_type.h
@@ -18714,9 +21588,11 @@ weakmap.$(OBJEXT): $(top_srcdir)/internal/compilers.h
 weakmap.$(OBJEXT): $(top_srcdir)/internal/gc.h
 weakmap.$(OBJEXT): $(top_srcdir)/internal/hash.h
 weakmap.$(OBJEXT): $(top_srcdir)/internal/imemo.h
+weakmap.$(OBJEXT): $(top_srcdir)/internal/namespace.h
 weakmap.$(OBJEXT): $(top_srcdir)/internal/proc.h
 weakmap.$(OBJEXT): $(top_srcdir)/internal/sanitizers.h
 weakmap.$(OBJEXT): $(top_srcdir)/internal/serial.h
+weakmap.$(OBJEXT): $(top_srcdir)/internal/set_table.h
 weakmap.$(OBJEXT): $(top_srcdir)/internal/static_assert.h
 weakmap.$(OBJEXT): $(top_srcdir)/internal/vm.h
 weakmap.$(OBJEXT): $(top_srcdir)/internal/warnings.h
@@ -18735,6 +21611,7 @@ weakmap.$(OBJEXT): {$(VPATH)}config.h
 weakmap.$(OBJEXT): {$(VPATH)}defines.h
 weakmap.$(OBJEXT): {$(VPATH)}encoding.h
 weakmap.$(OBJEXT): {$(VPATH)}id.h
+weakmap.$(OBJEXT): {$(VPATH)}id_table.h
 weakmap.$(OBJEXT): {$(VPATH)}intern.h
 weakmap.$(OBJEXT): {$(VPATH)}internal.h
 weakmap.$(OBJEXT): {$(VPATH)}internal/abi.h
@@ -18860,6 +21737,7 @@ weakmap.$(OBJEXT): {$(VPATH)}internal/intern/re.h
 weakmap.$(OBJEXT): {$(VPATH)}internal/intern/ruby.h
 weakmap.$(OBJEXT): {$(VPATH)}internal/intern/select.h
 weakmap.$(OBJEXT): {$(VPATH)}internal/intern/select/largesize.h
+weakmap.$(OBJEXT): {$(VPATH)}internal/intern/set.h
 weakmap.$(OBJEXT): {$(VPATH)}internal/intern/signal.h
 weakmap.$(OBJEXT): {$(VPATH)}internal/intern/sprintf.h
 weakmap.$(OBJEXT): {$(VPATH)}internal/intern/string.h
@@ -18879,6 +21757,7 @@ weakmap.$(OBJEXT): {$(VPATH)}internal/special_consts.h
 weakmap.$(OBJEXT): {$(VPATH)}internal/static_assert.h
 weakmap.$(OBJEXT): {$(VPATH)}internal/stdalign.h
 weakmap.$(OBJEXT): {$(VPATH)}internal/stdbool.h
+weakmap.$(OBJEXT): {$(VPATH)}internal/stdckdint.h
 weakmap.$(OBJEXT): {$(VPATH)}internal/symbol.h
 weakmap.$(OBJEXT): {$(VPATH)}internal/value.h
 weakmap.$(OBJEXT): {$(VPATH)}internal/value_type.h
@@ -18900,1070 +21779,6 @@ weakmap.$(OBJEXT): {$(VPATH)}thread_native.h
 weakmap.$(OBJEXT): {$(VPATH)}vm_core.h
 weakmap.$(OBJEXT): {$(VPATH)}vm_opts.h
 weakmap.$(OBJEXT): {$(VPATH)}weakmap.c
-yarp/api_node.$(OBJEXT): $(hdrdir)/ruby.h
-yarp/api_node.$(OBJEXT): $(hdrdir)/ruby/ruby.h
-yarp/api_node.$(OBJEXT): $(top_srcdir)/yarp/defines.h
-yarp/api_node.$(OBJEXT): $(top_srcdir)/yarp/diagnostic.h
-yarp/api_node.$(OBJEXT): $(top_srcdir)/yarp/enc/yp_encoding.h
-yarp/api_node.$(OBJEXT): $(top_srcdir)/yarp/extension.h
-yarp/api_node.$(OBJEXT): $(top_srcdir)/yarp/node.h
-yarp/api_node.$(OBJEXT): $(top_srcdir)/yarp/pack.h
-yarp/api_node.$(OBJEXT): $(top_srcdir)/yarp/parser.h
-yarp/api_node.$(OBJEXT): $(top_srcdir)/yarp/regexp.h
-yarp/api_node.$(OBJEXT): $(top_srcdir)/yarp/unescape.h
-yarp/api_node.$(OBJEXT): $(top_srcdir)/yarp/util/yp_buffer.h
-yarp/api_node.$(OBJEXT): $(top_srcdir)/yarp/util/yp_char.h
-yarp/api_node.$(OBJEXT): $(top_srcdir)/yarp/util/yp_constant_pool.h
-yarp/api_node.$(OBJEXT): $(top_srcdir)/yarp/util/yp_list.h
-yarp/api_node.$(OBJEXT): $(top_srcdir)/yarp/util/yp_memchr.h
-yarp/api_node.$(OBJEXT): $(top_srcdir)/yarp/util/yp_newline_list.h
-yarp/api_node.$(OBJEXT): $(top_srcdir)/yarp/util/yp_state_stack.h
-yarp/api_node.$(OBJEXT): $(top_srcdir)/yarp/util/yp_string.h
-yarp/api_node.$(OBJEXT): $(top_srcdir)/yarp/util/yp_string_list.h
-yarp/api_node.$(OBJEXT): $(top_srcdir)/yarp/util/yp_strpbrk.h
-yarp/api_node.$(OBJEXT): $(top_srcdir)/yarp/yarp.h
-yarp/api_node.$(OBJEXT): {$(VPATH)}assert.h
-yarp/api_node.$(OBJEXT): {$(VPATH)}backward/2/assume.h
-yarp/api_node.$(OBJEXT): {$(VPATH)}backward/2/attributes.h
-yarp/api_node.$(OBJEXT): {$(VPATH)}backward/2/bool.h
-yarp/api_node.$(OBJEXT): {$(VPATH)}backward/2/inttypes.h
-yarp/api_node.$(OBJEXT): {$(VPATH)}backward/2/limits.h
-yarp/api_node.$(OBJEXT): {$(VPATH)}backward/2/long_long.h
-yarp/api_node.$(OBJEXT): {$(VPATH)}backward/2/stdalign.h
-yarp/api_node.$(OBJEXT): {$(VPATH)}backward/2/stdarg.h
-yarp/api_node.$(OBJEXT): {$(VPATH)}config.h
-yarp/api_node.$(OBJEXT): {$(VPATH)}defines.h
-yarp/api_node.$(OBJEXT): {$(VPATH)}encoding.h
-yarp/api_node.$(OBJEXT): {$(VPATH)}intern.h
-yarp/api_node.$(OBJEXT): {$(VPATH)}internal/abi.h
-yarp/api_node.$(OBJEXT): {$(VPATH)}internal/anyargs.h
-yarp/api_node.$(OBJEXT): {$(VPATH)}internal/arithmetic.h
-yarp/api_node.$(OBJEXT): {$(VPATH)}internal/arithmetic/char.h
-yarp/api_node.$(OBJEXT): {$(VPATH)}internal/arithmetic/double.h
-yarp/api_node.$(OBJEXT): {$(VPATH)}internal/arithmetic/fixnum.h
-yarp/api_node.$(OBJEXT): {$(VPATH)}internal/arithmetic/gid_t.h
-yarp/api_node.$(OBJEXT): {$(VPATH)}internal/arithmetic/int.h
-yarp/api_node.$(OBJEXT): {$(VPATH)}internal/arithmetic/intptr_t.h
-yarp/api_node.$(OBJEXT): {$(VPATH)}internal/arithmetic/long.h
-yarp/api_node.$(OBJEXT): {$(VPATH)}internal/arithmetic/long_long.h
-yarp/api_node.$(OBJEXT): {$(VPATH)}internal/arithmetic/mode_t.h
-yarp/api_node.$(OBJEXT): {$(VPATH)}internal/arithmetic/off_t.h
-yarp/api_node.$(OBJEXT): {$(VPATH)}internal/arithmetic/pid_t.h
-yarp/api_node.$(OBJEXT): {$(VPATH)}internal/arithmetic/short.h
-yarp/api_node.$(OBJEXT): {$(VPATH)}internal/arithmetic/size_t.h
-yarp/api_node.$(OBJEXT): {$(VPATH)}internal/arithmetic/st_data_t.h
-yarp/api_node.$(OBJEXT): {$(VPATH)}internal/arithmetic/uid_t.h
-yarp/api_node.$(OBJEXT): {$(VPATH)}internal/assume.h
-yarp/api_node.$(OBJEXT): {$(VPATH)}internal/attr/alloc_size.h
-yarp/api_node.$(OBJEXT): {$(VPATH)}internal/attr/artificial.h
-yarp/api_node.$(OBJEXT): {$(VPATH)}internal/attr/cold.h
-yarp/api_node.$(OBJEXT): {$(VPATH)}internal/attr/const.h
-yarp/api_node.$(OBJEXT): {$(VPATH)}internal/attr/constexpr.h
-yarp/api_node.$(OBJEXT): {$(VPATH)}internal/attr/deprecated.h
-yarp/api_node.$(OBJEXT): {$(VPATH)}internal/attr/diagnose_if.h
-yarp/api_node.$(OBJEXT): {$(VPATH)}internal/attr/enum_extensibility.h
-yarp/api_node.$(OBJEXT): {$(VPATH)}internal/attr/error.h
-yarp/api_node.$(OBJEXT): {$(VPATH)}internal/attr/flag_enum.h
-yarp/api_node.$(OBJEXT): {$(VPATH)}internal/attr/forceinline.h
-yarp/api_node.$(OBJEXT): {$(VPATH)}internal/attr/format.h
-yarp/api_node.$(OBJEXT): {$(VPATH)}internal/attr/maybe_unused.h
-yarp/api_node.$(OBJEXT): {$(VPATH)}internal/attr/noalias.h
-yarp/api_node.$(OBJEXT): {$(VPATH)}internal/attr/nodiscard.h
-yarp/api_node.$(OBJEXT): {$(VPATH)}internal/attr/noexcept.h
-yarp/api_node.$(OBJEXT): {$(VPATH)}internal/attr/noinline.h
-yarp/api_node.$(OBJEXT): {$(VPATH)}internal/attr/nonnull.h
-yarp/api_node.$(OBJEXT): {$(VPATH)}internal/attr/noreturn.h
-yarp/api_node.$(OBJEXT): {$(VPATH)}internal/attr/packed_struct.h
-yarp/api_node.$(OBJEXT): {$(VPATH)}internal/attr/pure.h
-yarp/api_node.$(OBJEXT): {$(VPATH)}internal/attr/restrict.h
-yarp/api_node.$(OBJEXT): {$(VPATH)}internal/attr/returns_nonnull.h
-yarp/api_node.$(OBJEXT): {$(VPATH)}internal/attr/warning.h
-yarp/api_node.$(OBJEXT): {$(VPATH)}internal/attr/weakref.h
-yarp/api_node.$(OBJEXT): {$(VPATH)}internal/cast.h
-yarp/api_node.$(OBJEXT): {$(VPATH)}internal/compiler_is.h
-yarp/api_node.$(OBJEXT): {$(VPATH)}internal/compiler_is/apple.h
-yarp/api_node.$(OBJEXT): {$(VPATH)}internal/compiler_is/clang.h
-yarp/api_node.$(OBJEXT): {$(VPATH)}internal/compiler_is/gcc.h
-yarp/api_node.$(OBJEXT): {$(VPATH)}internal/compiler_is/intel.h
-yarp/api_node.$(OBJEXT): {$(VPATH)}internal/compiler_is/msvc.h
-yarp/api_node.$(OBJEXT): {$(VPATH)}internal/compiler_is/sunpro.h
-yarp/api_node.$(OBJEXT): {$(VPATH)}internal/compiler_since.h
-yarp/api_node.$(OBJEXT): {$(VPATH)}internal/config.h
-yarp/api_node.$(OBJEXT): {$(VPATH)}internal/constant_p.h
-yarp/api_node.$(OBJEXT): {$(VPATH)}internal/core.h
-yarp/api_node.$(OBJEXT): {$(VPATH)}internal/core/rarray.h
-yarp/api_node.$(OBJEXT): {$(VPATH)}internal/core/rbasic.h
-yarp/api_node.$(OBJEXT): {$(VPATH)}internal/core/rbignum.h
-yarp/api_node.$(OBJEXT): {$(VPATH)}internal/core/rclass.h
-yarp/api_node.$(OBJEXT): {$(VPATH)}internal/core/rdata.h
-yarp/api_node.$(OBJEXT): {$(VPATH)}internal/core/rfile.h
-yarp/api_node.$(OBJEXT): {$(VPATH)}internal/core/rhash.h
-yarp/api_node.$(OBJEXT): {$(VPATH)}internal/core/robject.h
-yarp/api_node.$(OBJEXT): {$(VPATH)}internal/core/rregexp.h
-yarp/api_node.$(OBJEXT): {$(VPATH)}internal/core/rstring.h
-yarp/api_node.$(OBJEXT): {$(VPATH)}internal/core/rstruct.h
-yarp/api_node.$(OBJEXT): {$(VPATH)}internal/core/rtypeddata.h
-yarp/api_node.$(OBJEXT): {$(VPATH)}internal/ctype.h
-yarp/api_node.$(OBJEXT): {$(VPATH)}internal/dllexport.h
-yarp/api_node.$(OBJEXT): {$(VPATH)}internal/dosish.h
-yarp/api_node.$(OBJEXT): {$(VPATH)}internal/encoding/coderange.h
-yarp/api_node.$(OBJEXT): {$(VPATH)}internal/encoding/ctype.h
-yarp/api_node.$(OBJEXT): {$(VPATH)}internal/encoding/encoding.h
-yarp/api_node.$(OBJEXT): {$(VPATH)}internal/encoding/pathname.h
-yarp/api_node.$(OBJEXT): {$(VPATH)}internal/encoding/re.h
-yarp/api_node.$(OBJEXT): {$(VPATH)}internal/encoding/sprintf.h
-yarp/api_node.$(OBJEXT): {$(VPATH)}internal/encoding/string.h
-yarp/api_node.$(OBJEXT): {$(VPATH)}internal/encoding/symbol.h
-yarp/api_node.$(OBJEXT): {$(VPATH)}internal/encoding/transcode.h
-yarp/api_node.$(OBJEXT): {$(VPATH)}internal/error.h
-yarp/api_node.$(OBJEXT): {$(VPATH)}internal/eval.h
-yarp/api_node.$(OBJEXT): {$(VPATH)}internal/event.h
-yarp/api_node.$(OBJEXT): {$(VPATH)}internal/fl_type.h
-yarp/api_node.$(OBJEXT): {$(VPATH)}internal/gc.h
-yarp/api_node.$(OBJEXT): {$(VPATH)}internal/glob.h
-yarp/api_node.$(OBJEXT): {$(VPATH)}internal/globals.h
-yarp/api_node.$(OBJEXT): {$(VPATH)}internal/has/attribute.h
-yarp/api_node.$(OBJEXT): {$(VPATH)}internal/has/builtin.h
-yarp/api_node.$(OBJEXT): {$(VPATH)}internal/has/c_attribute.h
-yarp/api_node.$(OBJEXT): {$(VPATH)}internal/has/cpp_attribute.h
-yarp/api_node.$(OBJEXT): {$(VPATH)}internal/has/declspec_attribute.h
-yarp/api_node.$(OBJEXT): {$(VPATH)}internal/has/extension.h
-yarp/api_node.$(OBJEXT): {$(VPATH)}internal/has/feature.h
-yarp/api_node.$(OBJEXT): {$(VPATH)}internal/has/warning.h
-yarp/api_node.$(OBJEXT): {$(VPATH)}internal/intern/array.h
-yarp/api_node.$(OBJEXT): {$(VPATH)}internal/intern/bignum.h
-yarp/api_node.$(OBJEXT): {$(VPATH)}internal/intern/class.h
-yarp/api_node.$(OBJEXT): {$(VPATH)}internal/intern/compar.h
-yarp/api_node.$(OBJEXT): {$(VPATH)}internal/intern/complex.h
-yarp/api_node.$(OBJEXT): {$(VPATH)}internal/intern/cont.h
-yarp/api_node.$(OBJEXT): {$(VPATH)}internal/intern/dir.h
-yarp/api_node.$(OBJEXT): {$(VPATH)}internal/intern/enum.h
-yarp/api_node.$(OBJEXT): {$(VPATH)}internal/intern/enumerator.h
-yarp/api_node.$(OBJEXT): {$(VPATH)}internal/intern/error.h
-yarp/api_node.$(OBJEXT): {$(VPATH)}internal/intern/eval.h
-yarp/api_node.$(OBJEXT): {$(VPATH)}internal/intern/file.h
-yarp/api_node.$(OBJEXT): {$(VPATH)}internal/intern/hash.h
-yarp/api_node.$(OBJEXT): {$(VPATH)}internal/intern/io.h
-yarp/api_node.$(OBJEXT): {$(VPATH)}internal/intern/load.h
-yarp/api_node.$(OBJEXT): {$(VPATH)}internal/intern/marshal.h
-yarp/api_node.$(OBJEXT): {$(VPATH)}internal/intern/numeric.h
-yarp/api_node.$(OBJEXT): {$(VPATH)}internal/intern/object.h
-yarp/api_node.$(OBJEXT): {$(VPATH)}internal/intern/parse.h
-yarp/api_node.$(OBJEXT): {$(VPATH)}internal/intern/proc.h
-yarp/api_node.$(OBJEXT): {$(VPATH)}internal/intern/process.h
-yarp/api_node.$(OBJEXT): {$(VPATH)}internal/intern/random.h
-yarp/api_node.$(OBJEXT): {$(VPATH)}internal/intern/range.h
-yarp/api_node.$(OBJEXT): {$(VPATH)}internal/intern/rational.h
-yarp/api_node.$(OBJEXT): {$(VPATH)}internal/intern/re.h
-yarp/api_node.$(OBJEXT): {$(VPATH)}internal/intern/ruby.h
-yarp/api_node.$(OBJEXT): {$(VPATH)}internal/intern/select.h
-yarp/api_node.$(OBJEXT): {$(VPATH)}internal/intern/select/largesize.h
-yarp/api_node.$(OBJEXT): {$(VPATH)}internal/intern/signal.h
-yarp/api_node.$(OBJEXT): {$(VPATH)}internal/intern/sprintf.h
-yarp/api_node.$(OBJEXT): {$(VPATH)}internal/intern/string.h
-yarp/api_node.$(OBJEXT): {$(VPATH)}internal/intern/struct.h
-yarp/api_node.$(OBJEXT): {$(VPATH)}internal/intern/thread.h
-yarp/api_node.$(OBJEXT): {$(VPATH)}internal/intern/time.h
-yarp/api_node.$(OBJEXT): {$(VPATH)}internal/intern/variable.h
-yarp/api_node.$(OBJEXT): {$(VPATH)}internal/intern/vm.h
-yarp/api_node.$(OBJEXT): {$(VPATH)}internal/interpreter.h
-yarp/api_node.$(OBJEXT): {$(VPATH)}internal/iterator.h
-yarp/api_node.$(OBJEXT): {$(VPATH)}internal/memory.h
-yarp/api_node.$(OBJEXT): {$(VPATH)}internal/method.h
-yarp/api_node.$(OBJEXT): {$(VPATH)}internal/module.h
-yarp/api_node.$(OBJEXT): {$(VPATH)}internal/newobj.h
-yarp/api_node.$(OBJEXT): {$(VPATH)}internal/scan_args.h
-yarp/api_node.$(OBJEXT): {$(VPATH)}internal/special_consts.h
-yarp/api_node.$(OBJEXT): {$(VPATH)}internal/static_assert.h
-yarp/api_node.$(OBJEXT): {$(VPATH)}internal/stdalign.h
-yarp/api_node.$(OBJEXT): {$(VPATH)}internal/stdbool.h
-yarp/api_node.$(OBJEXT): {$(VPATH)}internal/symbol.h
-yarp/api_node.$(OBJEXT): {$(VPATH)}internal/value.h
-yarp/api_node.$(OBJEXT): {$(VPATH)}internal/value_type.h
-yarp/api_node.$(OBJEXT): {$(VPATH)}internal/variable.h
-yarp/api_node.$(OBJEXT): {$(VPATH)}internal/warning_push.h
-yarp/api_node.$(OBJEXT): {$(VPATH)}internal/xmalloc.h
-yarp/api_node.$(OBJEXT): {$(VPATH)}missing.h
-yarp/api_node.$(OBJEXT): {$(VPATH)}onigmo.h
-yarp/api_node.$(OBJEXT): {$(VPATH)}oniguruma.h
-yarp/api_node.$(OBJEXT): {$(VPATH)}st.h
-yarp/api_node.$(OBJEXT): {$(VPATH)}subst.h
-yarp/api_node.$(OBJEXT): {$(VPATH)}yarp/api_node.c
-yarp/api_node.$(OBJEXT): {$(VPATH)}yarp/ast.h
-yarp/api_node.$(OBJEXT): {$(VPATH)}yarp/version.h
-yarp/api_pack.$(OBJEXT): $(hdrdir)/ruby.h
-yarp/api_pack.$(OBJEXT): $(hdrdir)/ruby/ruby.h
-yarp/api_pack.$(OBJEXT): $(top_srcdir)/yarp/api_pack.c
-yarp/api_pack.$(OBJEXT): $(top_srcdir)/yarp/defines.h
-yarp/api_pack.$(OBJEXT): $(top_srcdir)/yarp/diagnostic.h
-yarp/api_pack.$(OBJEXT): $(top_srcdir)/yarp/enc/yp_encoding.h
-yarp/api_pack.$(OBJEXT): $(top_srcdir)/yarp/extension.h
-yarp/api_pack.$(OBJEXT): $(top_srcdir)/yarp/node.h
-yarp/api_pack.$(OBJEXT): $(top_srcdir)/yarp/pack.h
-yarp/api_pack.$(OBJEXT): $(top_srcdir)/yarp/parser.h
-yarp/api_pack.$(OBJEXT): $(top_srcdir)/yarp/regexp.h
-yarp/api_pack.$(OBJEXT): $(top_srcdir)/yarp/unescape.h
-yarp/api_pack.$(OBJEXT): $(top_srcdir)/yarp/util/yp_buffer.h
-yarp/api_pack.$(OBJEXT): $(top_srcdir)/yarp/util/yp_char.h
-yarp/api_pack.$(OBJEXT): $(top_srcdir)/yarp/util/yp_constant_pool.h
-yarp/api_pack.$(OBJEXT): $(top_srcdir)/yarp/util/yp_list.h
-yarp/api_pack.$(OBJEXT): $(top_srcdir)/yarp/util/yp_memchr.h
-yarp/api_pack.$(OBJEXT): $(top_srcdir)/yarp/util/yp_newline_list.h
-yarp/api_pack.$(OBJEXT): $(top_srcdir)/yarp/util/yp_state_stack.h
-yarp/api_pack.$(OBJEXT): $(top_srcdir)/yarp/util/yp_string.h
-yarp/api_pack.$(OBJEXT): $(top_srcdir)/yarp/util/yp_string_list.h
-yarp/api_pack.$(OBJEXT): $(top_srcdir)/yarp/util/yp_strpbrk.h
-yarp/api_pack.$(OBJEXT): $(top_srcdir)/yarp/yarp.h
-yarp/api_pack.$(OBJEXT): {$(VPATH)}assert.h
-yarp/api_pack.$(OBJEXT): {$(VPATH)}backward/2/assume.h
-yarp/api_pack.$(OBJEXT): {$(VPATH)}backward/2/attributes.h
-yarp/api_pack.$(OBJEXT): {$(VPATH)}backward/2/bool.h
-yarp/api_pack.$(OBJEXT): {$(VPATH)}backward/2/inttypes.h
-yarp/api_pack.$(OBJEXT): {$(VPATH)}backward/2/limits.h
-yarp/api_pack.$(OBJEXT): {$(VPATH)}backward/2/long_long.h
-yarp/api_pack.$(OBJEXT): {$(VPATH)}backward/2/stdalign.h
-yarp/api_pack.$(OBJEXT): {$(VPATH)}backward/2/stdarg.h
-yarp/api_pack.$(OBJEXT): {$(VPATH)}config.h
-yarp/api_pack.$(OBJEXT): {$(VPATH)}defines.h
-yarp/api_pack.$(OBJEXT): {$(VPATH)}encoding.h
-yarp/api_pack.$(OBJEXT): {$(VPATH)}intern.h
-yarp/api_pack.$(OBJEXT): {$(VPATH)}internal/abi.h
-yarp/api_pack.$(OBJEXT): {$(VPATH)}internal/anyargs.h
-yarp/api_pack.$(OBJEXT): {$(VPATH)}internal/arithmetic.h
-yarp/api_pack.$(OBJEXT): {$(VPATH)}internal/arithmetic/char.h
-yarp/api_pack.$(OBJEXT): {$(VPATH)}internal/arithmetic/double.h
-yarp/api_pack.$(OBJEXT): {$(VPATH)}internal/arithmetic/fixnum.h
-yarp/api_pack.$(OBJEXT): {$(VPATH)}internal/arithmetic/gid_t.h
-yarp/api_pack.$(OBJEXT): {$(VPATH)}internal/arithmetic/int.h
-yarp/api_pack.$(OBJEXT): {$(VPATH)}internal/arithmetic/intptr_t.h
-yarp/api_pack.$(OBJEXT): {$(VPATH)}internal/arithmetic/long.h
-yarp/api_pack.$(OBJEXT): {$(VPATH)}internal/arithmetic/long_long.h
-yarp/api_pack.$(OBJEXT): {$(VPATH)}internal/arithmetic/mode_t.h
-yarp/api_pack.$(OBJEXT): {$(VPATH)}internal/arithmetic/off_t.h
-yarp/api_pack.$(OBJEXT): {$(VPATH)}internal/arithmetic/pid_t.h
-yarp/api_pack.$(OBJEXT): {$(VPATH)}internal/arithmetic/short.h
-yarp/api_pack.$(OBJEXT): {$(VPATH)}internal/arithmetic/size_t.h
-yarp/api_pack.$(OBJEXT): {$(VPATH)}internal/arithmetic/st_data_t.h
-yarp/api_pack.$(OBJEXT): {$(VPATH)}internal/arithmetic/uid_t.h
-yarp/api_pack.$(OBJEXT): {$(VPATH)}internal/assume.h
-yarp/api_pack.$(OBJEXT): {$(VPATH)}internal/attr/alloc_size.h
-yarp/api_pack.$(OBJEXT): {$(VPATH)}internal/attr/artificial.h
-yarp/api_pack.$(OBJEXT): {$(VPATH)}internal/attr/cold.h
-yarp/api_pack.$(OBJEXT): {$(VPATH)}internal/attr/const.h
-yarp/api_pack.$(OBJEXT): {$(VPATH)}internal/attr/constexpr.h
-yarp/api_pack.$(OBJEXT): {$(VPATH)}internal/attr/deprecated.h
-yarp/api_pack.$(OBJEXT): {$(VPATH)}internal/attr/diagnose_if.h
-yarp/api_pack.$(OBJEXT): {$(VPATH)}internal/attr/enum_extensibility.h
-yarp/api_pack.$(OBJEXT): {$(VPATH)}internal/attr/error.h
-yarp/api_pack.$(OBJEXT): {$(VPATH)}internal/attr/flag_enum.h
-yarp/api_pack.$(OBJEXT): {$(VPATH)}internal/attr/forceinline.h
-yarp/api_pack.$(OBJEXT): {$(VPATH)}internal/attr/format.h
-yarp/api_pack.$(OBJEXT): {$(VPATH)}internal/attr/maybe_unused.h
-yarp/api_pack.$(OBJEXT): {$(VPATH)}internal/attr/noalias.h
-yarp/api_pack.$(OBJEXT): {$(VPATH)}internal/attr/nodiscard.h
-yarp/api_pack.$(OBJEXT): {$(VPATH)}internal/attr/noexcept.h
-yarp/api_pack.$(OBJEXT): {$(VPATH)}internal/attr/noinline.h
-yarp/api_pack.$(OBJEXT): {$(VPATH)}internal/attr/nonnull.h
-yarp/api_pack.$(OBJEXT): {$(VPATH)}internal/attr/noreturn.h
-yarp/api_pack.$(OBJEXT): {$(VPATH)}internal/attr/packed_struct.h
-yarp/api_pack.$(OBJEXT): {$(VPATH)}internal/attr/pure.h
-yarp/api_pack.$(OBJEXT): {$(VPATH)}internal/attr/restrict.h
-yarp/api_pack.$(OBJEXT): {$(VPATH)}internal/attr/returns_nonnull.h
-yarp/api_pack.$(OBJEXT): {$(VPATH)}internal/attr/warning.h
-yarp/api_pack.$(OBJEXT): {$(VPATH)}internal/attr/weakref.h
-yarp/api_pack.$(OBJEXT): {$(VPATH)}internal/cast.h
-yarp/api_pack.$(OBJEXT): {$(VPATH)}internal/compiler_is.h
-yarp/api_pack.$(OBJEXT): {$(VPATH)}internal/compiler_is/apple.h
-yarp/api_pack.$(OBJEXT): {$(VPATH)}internal/compiler_is/clang.h
-yarp/api_pack.$(OBJEXT): {$(VPATH)}internal/compiler_is/gcc.h
-yarp/api_pack.$(OBJEXT): {$(VPATH)}internal/compiler_is/intel.h
-yarp/api_pack.$(OBJEXT): {$(VPATH)}internal/compiler_is/msvc.h
-yarp/api_pack.$(OBJEXT): {$(VPATH)}internal/compiler_is/sunpro.h
-yarp/api_pack.$(OBJEXT): {$(VPATH)}internal/compiler_since.h
-yarp/api_pack.$(OBJEXT): {$(VPATH)}internal/config.h
-yarp/api_pack.$(OBJEXT): {$(VPATH)}internal/constant_p.h
-yarp/api_pack.$(OBJEXT): {$(VPATH)}internal/core.h
-yarp/api_pack.$(OBJEXT): {$(VPATH)}internal/core/rarray.h
-yarp/api_pack.$(OBJEXT): {$(VPATH)}internal/core/rbasic.h
-yarp/api_pack.$(OBJEXT): {$(VPATH)}internal/core/rbignum.h
-yarp/api_pack.$(OBJEXT): {$(VPATH)}internal/core/rclass.h
-yarp/api_pack.$(OBJEXT): {$(VPATH)}internal/core/rdata.h
-yarp/api_pack.$(OBJEXT): {$(VPATH)}internal/core/rfile.h
-yarp/api_pack.$(OBJEXT): {$(VPATH)}internal/core/rhash.h
-yarp/api_pack.$(OBJEXT): {$(VPATH)}internal/core/robject.h
-yarp/api_pack.$(OBJEXT): {$(VPATH)}internal/core/rregexp.h
-yarp/api_pack.$(OBJEXT): {$(VPATH)}internal/core/rstring.h
-yarp/api_pack.$(OBJEXT): {$(VPATH)}internal/core/rstruct.h
-yarp/api_pack.$(OBJEXT): {$(VPATH)}internal/core/rtypeddata.h
-yarp/api_pack.$(OBJEXT): {$(VPATH)}internal/ctype.h
-yarp/api_pack.$(OBJEXT): {$(VPATH)}internal/dllexport.h
-yarp/api_pack.$(OBJEXT): {$(VPATH)}internal/dosish.h
-yarp/api_pack.$(OBJEXT): {$(VPATH)}internal/encoding/coderange.h
-yarp/api_pack.$(OBJEXT): {$(VPATH)}internal/encoding/ctype.h
-yarp/api_pack.$(OBJEXT): {$(VPATH)}internal/encoding/encoding.h
-yarp/api_pack.$(OBJEXT): {$(VPATH)}internal/encoding/pathname.h
-yarp/api_pack.$(OBJEXT): {$(VPATH)}internal/encoding/re.h
-yarp/api_pack.$(OBJEXT): {$(VPATH)}internal/encoding/sprintf.h
-yarp/api_pack.$(OBJEXT): {$(VPATH)}internal/encoding/string.h
-yarp/api_pack.$(OBJEXT): {$(VPATH)}internal/encoding/symbol.h
-yarp/api_pack.$(OBJEXT): {$(VPATH)}internal/encoding/transcode.h
-yarp/api_pack.$(OBJEXT): {$(VPATH)}internal/error.h
-yarp/api_pack.$(OBJEXT): {$(VPATH)}internal/eval.h
-yarp/api_pack.$(OBJEXT): {$(VPATH)}internal/event.h
-yarp/api_pack.$(OBJEXT): {$(VPATH)}internal/fl_type.h
-yarp/api_pack.$(OBJEXT): {$(VPATH)}internal/gc.h
-yarp/api_pack.$(OBJEXT): {$(VPATH)}internal/glob.h
-yarp/api_pack.$(OBJEXT): {$(VPATH)}internal/globals.h
-yarp/api_pack.$(OBJEXT): {$(VPATH)}internal/has/attribute.h
-yarp/api_pack.$(OBJEXT): {$(VPATH)}internal/has/builtin.h
-yarp/api_pack.$(OBJEXT): {$(VPATH)}internal/has/c_attribute.h
-yarp/api_pack.$(OBJEXT): {$(VPATH)}internal/has/cpp_attribute.h
-yarp/api_pack.$(OBJEXT): {$(VPATH)}internal/has/declspec_attribute.h
-yarp/api_pack.$(OBJEXT): {$(VPATH)}internal/has/extension.h
-yarp/api_pack.$(OBJEXT): {$(VPATH)}internal/has/feature.h
-yarp/api_pack.$(OBJEXT): {$(VPATH)}internal/has/warning.h
-yarp/api_pack.$(OBJEXT): {$(VPATH)}internal/intern/array.h
-yarp/api_pack.$(OBJEXT): {$(VPATH)}internal/intern/bignum.h
-yarp/api_pack.$(OBJEXT): {$(VPATH)}internal/intern/class.h
-yarp/api_pack.$(OBJEXT): {$(VPATH)}internal/intern/compar.h
-yarp/api_pack.$(OBJEXT): {$(VPATH)}internal/intern/complex.h
-yarp/api_pack.$(OBJEXT): {$(VPATH)}internal/intern/cont.h
-yarp/api_pack.$(OBJEXT): {$(VPATH)}internal/intern/dir.h
-yarp/api_pack.$(OBJEXT): {$(VPATH)}internal/intern/enum.h
-yarp/api_pack.$(OBJEXT): {$(VPATH)}internal/intern/enumerator.h
-yarp/api_pack.$(OBJEXT): {$(VPATH)}internal/intern/error.h
-yarp/api_pack.$(OBJEXT): {$(VPATH)}internal/intern/eval.h
-yarp/api_pack.$(OBJEXT): {$(VPATH)}internal/intern/file.h
-yarp/api_pack.$(OBJEXT): {$(VPATH)}internal/intern/hash.h
-yarp/api_pack.$(OBJEXT): {$(VPATH)}internal/intern/io.h
-yarp/api_pack.$(OBJEXT): {$(VPATH)}internal/intern/load.h
-yarp/api_pack.$(OBJEXT): {$(VPATH)}internal/intern/marshal.h
-yarp/api_pack.$(OBJEXT): {$(VPATH)}internal/intern/numeric.h
-yarp/api_pack.$(OBJEXT): {$(VPATH)}internal/intern/object.h
-yarp/api_pack.$(OBJEXT): {$(VPATH)}internal/intern/parse.h
-yarp/api_pack.$(OBJEXT): {$(VPATH)}internal/intern/proc.h
-yarp/api_pack.$(OBJEXT): {$(VPATH)}internal/intern/process.h
-yarp/api_pack.$(OBJEXT): {$(VPATH)}internal/intern/random.h
-yarp/api_pack.$(OBJEXT): {$(VPATH)}internal/intern/range.h
-yarp/api_pack.$(OBJEXT): {$(VPATH)}internal/intern/rational.h
-yarp/api_pack.$(OBJEXT): {$(VPATH)}internal/intern/re.h
-yarp/api_pack.$(OBJEXT): {$(VPATH)}internal/intern/ruby.h
-yarp/api_pack.$(OBJEXT): {$(VPATH)}internal/intern/select.h
-yarp/api_pack.$(OBJEXT): {$(VPATH)}internal/intern/select/largesize.h
-yarp/api_pack.$(OBJEXT): {$(VPATH)}internal/intern/signal.h
-yarp/api_pack.$(OBJEXT): {$(VPATH)}internal/intern/sprintf.h
-yarp/api_pack.$(OBJEXT): {$(VPATH)}internal/intern/string.h
-yarp/api_pack.$(OBJEXT): {$(VPATH)}internal/intern/struct.h
-yarp/api_pack.$(OBJEXT): {$(VPATH)}internal/intern/thread.h
-yarp/api_pack.$(OBJEXT): {$(VPATH)}internal/intern/time.h
-yarp/api_pack.$(OBJEXT): {$(VPATH)}internal/intern/variable.h
-yarp/api_pack.$(OBJEXT): {$(VPATH)}internal/intern/vm.h
-yarp/api_pack.$(OBJEXT): {$(VPATH)}internal/interpreter.h
-yarp/api_pack.$(OBJEXT): {$(VPATH)}internal/iterator.h
-yarp/api_pack.$(OBJEXT): {$(VPATH)}internal/memory.h
-yarp/api_pack.$(OBJEXT): {$(VPATH)}internal/method.h
-yarp/api_pack.$(OBJEXT): {$(VPATH)}internal/module.h
-yarp/api_pack.$(OBJEXT): {$(VPATH)}internal/newobj.h
-yarp/api_pack.$(OBJEXT): {$(VPATH)}internal/scan_args.h
-yarp/api_pack.$(OBJEXT): {$(VPATH)}internal/special_consts.h
-yarp/api_pack.$(OBJEXT): {$(VPATH)}internal/static_assert.h
-yarp/api_pack.$(OBJEXT): {$(VPATH)}internal/stdalign.h
-yarp/api_pack.$(OBJEXT): {$(VPATH)}internal/stdbool.h
-yarp/api_pack.$(OBJEXT): {$(VPATH)}internal/symbol.h
-yarp/api_pack.$(OBJEXT): {$(VPATH)}internal/value.h
-yarp/api_pack.$(OBJEXT): {$(VPATH)}internal/value_type.h
-yarp/api_pack.$(OBJEXT): {$(VPATH)}internal/variable.h
-yarp/api_pack.$(OBJEXT): {$(VPATH)}internal/warning_push.h
-yarp/api_pack.$(OBJEXT): {$(VPATH)}internal/xmalloc.h
-yarp/api_pack.$(OBJEXT): {$(VPATH)}missing.h
-yarp/api_pack.$(OBJEXT): {$(VPATH)}onigmo.h
-yarp/api_pack.$(OBJEXT): {$(VPATH)}oniguruma.h
-yarp/api_pack.$(OBJEXT): {$(VPATH)}st.h
-yarp/api_pack.$(OBJEXT): {$(VPATH)}subst.h
-yarp/api_pack.$(OBJEXT): {$(VPATH)}yarp/ast.h
-yarp/api_pack.$(OBJEXT): {$(VPATH)}yarp/version.h
-yarp/diagnostic.$(OBJEXT): $(top_srcdir)/yarp/defines.h
-yarp/diagnostic.$(OBJEXT): $(top_srcdir)/yarp/diagnostic.c
-yarp/diagnostic.$(OBJEXT): $(top_srcdir)/yarp/diagnostic.h
-yarp/diagnostic.$(OBJEXT): $(top_srcdir)/yarp/util/yp_list.h
-yarp/diagnostic.$(OBJEXT): {$(VPATH)}config.h
-yarp/enc/yp_ascii.$(OBJEXT): $(top_srcdir)/yarp/defines.h
-yarp/enc/yp_ascii.$(OBJEXT): $(top_srcdir)/yarp/enc/yp_ascii.c
-yarp/enc/yp_ascii.$(OBJEXT): $(top_srcdir)/yarp/enc/yp_encoding.h
-yarp/enc/yp_ascii.$(OBJEXT): {$(VPATH)}config.h
-yarp/enc/yp_big5.$(OBJEXT): $(top_srcdir)/yarp/defines.h
-yarp/enc/yp_big5.$(OBJEXT): $(top_srcdir)/yarp/enc/yp_big5.c
-yarp/enc/yp_big5.$(OBJEXT): $(top_srcdir)/yarp/enc/yp_encoding.h
-yarp/enc/yp_big5.$(OBJEXT): {$(VPATH)}config.h
-yarp/enc/yp_euc_jp.$(OBJEXT): $(top_srcdir)/yarp/defines.h
-yarp/enc/yp_euc_jp.$(OBJEXT): $(top_srcdir)/yarp/enc/yp_encoding.h
-yarp/enc/yp_euc_jp.$(OBJEXT): $(top_srcdir)/yarp/enc/yp_euc_jp.c
-yarp/enc/yp_euc_jp.$(OBJEXT): {$(VPATH)}config.h
-yarp/enc/yp_gbk.$(OBJEXT): $(top_srcdir)/yarp/defines.h
-yarp/enc/yp_gbk.$(OBJEXT): $(top_srcdir)/yarp/enc/yp_encoding.h
-yarp/enc/yp_gbk.$(OBJEXT): $(top_srcdir)/yarp/enc/yp_gbk.c
-yarp/enc/yp_gbk.$(OBJEXT): {$(VPATH)}config.h
-yarp/enc/yp_iso_8859_1.$(OBJEXT): $(top_srcdir)/yarp/defines.h
-yarp/enc/yp_iso_8859_1.$(OBJEXT): $(top_srcdir)/yarp/enc/yp_encoding.h
-yarp/enc/yp_iso_8859_1.$(OBJEXT): $(top_srcdir)/yarp/enc/yp_iso_8859_1.c
-yarp/enc/yp_iso_8859_1.$(OBJEXT): {$(VPATH)}config.h
-yarp/enc/yp_iso_8859_10.$(OBJEXT): $(top_srcdir)/yarp/defines.h
-yarp/enc/yp_iso_8859_10.$(OBJEXT): $(top_srcdir)/yarp/enc/yp_encoding.h
-yarp/enc/yp_iso_8859_10.$(OBJEXT): $(top_srcdir)/yarp/enc/yp_iso_8859_10.c
-yarp/enc/yp_iso_8859_10.$(OBJEXT): {$(VPATH)}config.h
-yarp/enc/yp_iso_8859_11.$(OBJEXT): $(top_srcdir)/yarp/defines.h
-yarp/enc/yp_iso_8859_11.$(OBJEXT): $(top_srcdir)/yarp/enc/yp_encoding.h
-yarp/enc/yp_iso_8859_11.$(OBJEXT): $(top_srcdir)/yarp/enc/yp_iso_8859_11.c
-yarp/enc/yp_iso_8859_11.$(OBJEXT): {$(VPATH)}config.h
-yarp/enc/yp_iso_8859_13.$(OBJEXT): $(top_srcdir)/yarp/defines.h
-yarp/enc/yp_iso_8859_13.$(OBJEXT): $(top_srcdir)/yarp/enc/yp_encoding.h
-yarp/enc/yp_iso_8859_13.$(OBJEXT): $(top_srcdir)/yarp/enc/yp_iso_8859_13.c
-yarp/enc/yp_iso_8859_13.$(OBJEXT): {$(VPATH)}config.h
-yarp/enc/yp_iso_8859_14.$(OBJEXT): $(top_srcdir)/yarp/defines.h
-yarp/enc/yp_iso_8859_14.$(OBJEXT): $(top_srcdir)/yarp/enc/yp_encoding.h
-yarp/enc/yp_iso_8859_14.$(OBJEXT): $(top_srcdir)/yarp/enc/yp_iso_8859_14.c
-yarp/enc/yp_iso_8859_14.$(OBJEXT): {$(VPATH)}config.h
-yarp/enc/yp_iso_8859_15.$(OBJEXT): $(top_srcdir)/yarp/defines.h
-yarp/enc/yp_iso_8859_15.$(OBJEXT): $(top_srcdir)/yarp/enc/yp_encoding.h
-yarp/enc/yp_iso_8859_15.$(OBJEXT): $(top_srcdir)/yarp/enc/yp_iso_8859_15.c
-yarp/enc/yp_iso_8859_15.$(OBJEXT): {$(VPATH)}config.h
-yarp/enc/yp_iso_8859_16.$(OBJEXT): $(top_srcdir)/yarp/defines.h
-yarp/enc/yp_iso_8859_16.$(OBJEXT): $(top_srcdir)/yarp/enc/yp_encoding.h
-yarp/enc/yp_iso_8859_16.$(OBJEXT): $(top_srcdir)/yarp/enc/yp_iso_8859_16.c
-yarp/enc/yp_iso_8859_16.$(OBJEXT): {$(VPATH)}config.h
-yarp/enc/yp_iso_8859_2.$(OBJEXT): $(top_srcdir)/yarp/defines.h
-yarp/enc/yp_iso_8859_2.$(OBJEXT): $(top_srcdir)/yarp/enc/yp_encoding.h
-yarp/enc/yp_iso_8859_2.$(OBJEXT): $(top_srcdir)/yarp/enc/yp_iso_8859_2.c
-yarp/enc/yp_iso_8859_2.$(OBJEXT): {$(VPATH)}config.h
-yarp/enc/yp_iso_8859_3.$(OBJEXT): $(top_srcdir)/yarp/defines.h
-yarp/enc/yp_iso_8859_3.$(OBJEXT): $(top_srcdir)/yarp/enc/yp_encoding.h
-yarp/enc/yp_iso_8859_3.$(OBJEXT): $(top_srcdir)/yarp/enc/yp_iso_8859_3.c
-yarp/enc/yp_iso_8859_3.$(OBJEXT): {$(VPATH)}config.h
-yarp/enc/yp_iso_8859_4.$(OBJEXT): $(top_srcdir)/yarp/defines.h
-yarp/enc/yp_iso_8859_4.$(OBJEXT): $(top_srcdir)/yarp/enc/yp_encoding.h
-yarp/enc/yp_iso_8859_4.$(OBJEXT): $(top_srcdir)/yarp/enc/yp_iso_8859_4.c
-yarp/enc/yp_iso_8859_4.$(OBJEXT): {$(VPATH)}config.h
-yarp/enc/yp_iso_8859_5.$(OBJEXT): $(top_srcdir)/yarp/defines.h
-yarp/enc/yp_iso_8859_5.$(OBJEXT): $(top_srcdir)/yarp/enc/yp_encoding.h
-yarp/enc/yp_iso_8859_5.$(OBJEXT): $(top_srcdir)/yarp/enc/yp_iso_8859_5.c
-yarp/enc/yp_iso_8859_5.$(OBJEXT): {$(VPATH)}config.h
-yarp/enc/yp_iso_8859_6.$(OBJEXT): $(top_srcdir)/yarp/defines.h
-yarp/enc/yp_iso_8859_6.$(OBJEXT): $(top_srcdir)/yarp/enc/yp_encoding.h
-yarp/enc/yp_iso_8859_6.$(OBJEXT): $(top_srcdir)/yarp/enc/yp_iso_8859_6.c
-yarp/enc/yp_iso_8859_6.$(OBJEXT): {$(VPATH)}config.h
-yarp/enc/yp_iso_8859_7.$(OBJEXT): $(top_srcdir)/yarp/defines.h
-yarp/enc/yp_iso_8859_7.$(OBJEXT): $(top_srcdir)/yarp/enc/yp_encoding.h
-yarp/enc/yp_iso_8859_7.$(OBJEXT): $(top_srcdir)/yarp/enc/yp_iso_8859_7.c
-yarp/enc/yp_iso_8859_7.$(OBJEXT): {$(VPATH)}config.h
-yarp/enc/yp_iso_8859_8.$(OBJEXT): $(top_srcdir)/yarp/defines.h
-yarp/enc/yp_iso_8859_8.$(OBJEXT): $(top_srcdir)/yarp/enc/yp_encoding.h
-yarp/enc/yp_iso_8859_8.$(OBJEXT): $(top_srcdir)/yarp/enc/yp_iso_8859_8.c
-yarp/enc/yp_iso_8859_8.$(OBJEXT): {$(VPATH)}config.h
-yarp/enc/yp_iso_8859_9.$(OBJEXT): $(top_srcdir)/yarp/defines.h
-yarp/enc/yp_iso_8859_9.$(OBJEXT): $(top_srcdir)/yarp/enc/yp_encoding.h
-yarp/enc/yp_iso_8859_9.$(OBJEXT): $(top_srcdir)/yarp/enc/yp_iso_8859_9.c
-yarp/enc/yp_iso_8859_9.$(OBJEXT): {$(VPATH)}config.h
-yarp/enc/yp_koi8_r.$(OBJEXT): $(top_srcdir)/yarp/defines.h
-yarp/enc/yp_koi8_r.$(OBJEXT): $(top_srcdir)/yarp/enc/yp_encoding.h
-yarp/enc/yp_koi8_r.$(OBJEXT): $(top_srcdir)/yarp/enc/yp_koi8_r.c
-yarp/enc/yp_koi8_r.$(OBJEXT): {$(VPATH)}config.h
-yarp/enc/yp_shared.$(OBJEXT): $(top_srcdir)/yarp/defines.h
-yarp/enc/yp_shared.$(OBJEXT): $(top_srcdir)/yarp/enc/yp_encoding.h
-yarp/enc/yp_shared.$(OBJEXT): $(top_srcdir)/yarp/enc/yp_shared.c
-yarp/enc/yp_shared.$(OBJEXT): {$(VPATH)}config.h
-yarp/enc/yp_shift_jis.$(OBJEXT): $(top_srcdir)/yarp/defines.h
-yarp/enc/yp_shift_jis.$(OBJEXT): $(top_srcdir)/yarp/enc/yp_encoding.h
-yarp/enc/yp_shift_jis.$(OBJEXT): $(top_srcdir)/yarp/enc/yp_shift_jis.c
-yarp/enc/yp_shift_jis.$(OBJEXT): {$(VPATH)}config.h
-yarp/enc/yp_tables.$(OBJEXT): $(top_srcdir)/yarp/defines.h
-yarp/enc/yp_tables.$(OBJEXT): $(top_srcdir)/yarp/enc/yp_encoding.h
-yarp/enc/yp_tables.$(OBJEXT): $(top_srcdir)/yarp/enc/yp_tables.c
-yarp/enc/yp_tables.$(OBJEXT): {$(VPATH)}config.h
-yarp/enc/yp_unicode.$(OBJEXT): $(top_srcdir)/yarp/defines.h
-yarp/enc/yp_unicode.$(OBJEXT): $(top_srcdir)/yarp/enc/yp_encoding.h
-yarp/enc/yp_unicode.$(OBJEXT): $(top_srcdir)/yarp/enc/yp_unicode.c
-yarp/enc/yp_unicode.$(OBJEXT): {$(VPATH)}config.h
-yarp/enc/yp_windows_1251.$(OBJEXT): $(top_srcdir)/yarp/defines.h
-yarp/enc/yp_windows_1251.$(OBJEXT): $(top_srcdir)/yarp/enc/yp_encoding.h
-yarp/enc/yp_windows_1251.$(OBJEXT): $(top_srcdir)/yarp/enc/yp_windows_1251.c
-yarp/enc/yp_windows_1251.$(OBJEXT): {$(VPATH)}config.h
-yarp/enc/yp_windows_1252.$(OBJEXT): $(top_srcdir)/yarp/defines.h
-yarp/enc/yp_windows_1252.$(OBJEXT): $(top_srcdir)/yarp/enc/yp_encoding.h
-yarp/enc/yp_windows_1252.$(OBJEXT): $(top_srcdir)/yarp/enc/yp_windows_1252.c
-yarp/enc/yp_windows_1252.$(OBJEXT): {$(VPATH)}config.h
-yarp/enc/yp_windows_31j.$(OBJEXT): $(top_srcdir)/yarp/defines.h
-yarp/enc/yp_windows_31j.$(OBJEXT): $(top_srcdir)/yarp/enc/yp_encoding.h
-yarp/enc/yp_windows_31j.$(OBJEXT): $(top_srcdir)/yarp/enc/yp_windows_31j.c
-yarp/enc/yp_windows_31j.$(OBJEXT): {$(VPATH)}config.h
-yarp/extension.$(OBJEXT): $(hdrdir)/ruby.h
-yarp/extension.$(OBJEXT): $(hdrdir)/ruby/ruby.h
-yarp/extension.$(OBJEXT): $(top_srcdir)/yarp/defines.h
-yarp/extension.$(OBJEXT): $(top_srcdir)/yarp/diagnostic.h
-yarp/extension.$(OBJEXT): $(top_srcdir)/yarp/enc/yp_encoding.h
-yarp/extension.$(OBJEXT): $(top_srcdir)/yarp/extension.c
-yarp/extension.$(OBJEXT): $(top_srcdir)/yarp/extension.h
-yarp/extension.$(OBJEXT): $(top_srcdir)/yarp/node.h
-yarp/extension.$(OBJEXT): $(top_srcdir)/yarp/pack.h
-yarp/extension.$(OBJEXT): $(top_srcdir)/yarp/parser.h
-yarp/extension.$(OBJEXT): $(top_srcdir)/yarp/regexp.h
-yarp/extension.$(OBJEXT): $(top_srcdir)/yarp/unescape.h
-yarp/extension.$(OBJEXT): $(top_srcdir)/yarp/util/yp_buffer.h
-yarp/extension.$(OBJEXT): $(top_srcdir)/yarp/util/yp_char.h
-yarp/extension.$(OBJEXT): $(top_srcdir)/yarp/util/yp_constant_pool.h
-yarp/extension.$(OBJEXT): $(top_srcdir)/yarp/util/yp_list.h
-yarp/extension.$(OBJEXT): $(top_srcdir)/yarp/util/yp_memchr.h
-yarp/extension.$(OBJEXT): $(top_srcdir)/yarp/util/yp_newline_list.h
-yarp/extension.$(OBJEXT): $(top_srcdir)/yarp/util/yp_state_stack.h
-yarp/extension.$(OBJEXT): $(top_srcdir)/yarp/util/yp_string.h
-yarp/extension.$(OBJEXT): $(top_srcdir)/yarp/util/yp_string_list.h
-yarp/extension.$(OBJEXT): $(top_srcdir)/yarp/util/yp_strpbrk.h
-yarp/extension.$(OBJEXT): $(top_srcdir)/yarp/yarp.h
-yarp/extension.$(OBJEXT): {$(VPATH)}assert.h
-yarp/extension.$(OBJEXT): {$(VPATH)}backward/2/assume.h
-yarp/extension.$(OBJEXT): {$(VPATH)}backward/2/attributes.h
-yarp/extension.$(OBJEXT): {$(VPATH)}backward/2/bool.h
-yarp/extension.$(OBJEXT): {$(VPATH)}backward/2/inttypes.h
-yarp/extension.$(OBJEXT): {$(VPATH)}backward/2/limits.h
-yarp/extension.$(OBJEXT): {$(VPATH)}backward/2/long_long.h
-yarp/extension.$(OBJEXT): {$(VPATH)}backward/2/stdalign.h
-yarp/extension.$(OBJEXT): {$(VPATH)}backward/2/stdarg.h
-yarp/extension.$(OBJEXT): {$(VPATH)}config.h
-yarp/extension.$(OBJEXT): {$(VPATH)}defines.h
-yarp/extension.$(OBJEXT): {$(VPATH)}encoding.h
-yarp/extension.$(OBJEXT): {$(VPATH)}intern.h
-yarp/extension.$(OBJEXT): {$(VPATH)}internal/abi.h
-yarp/extension.$(OBJEXT): {$(VPATH)}internal/anyargs.h
-yarp/extension.$(OBJEXT): {$(VPATH)}internal/arithmetic.h
-yarp/extension.$(OBJEXT): {$(VPATH)}internal/arithmetic/char.h
-yarp/extension.$(OBJEXT): {$(VPATH)}internal/arithmetic/double.h
-yarp/extension.$(OBJEXT): {$(VPATH)}internal/arithmetic/fixnum.h
-yarp/extension.$(OBJEXT): {$(VPATH)}internal/arithmetic/gid_t.h
-yarp/extension.$(OBJEXT): {$(VPATH)}internal/arithmetic/int.h
-yarp/extension.$(OBJEXT): {$(VPATH)}internal/arithmetic/intptr_t.h
-yarp/extension.$(OBJEXT): {$(VPATH)}internal/arithmetic/long.h
-yarp/extension.$(OBJEXT): {$(VPATH)}internal/arithmetic/long_long.h
-yarp/extension.$(OBJEXT): {$(VPATH)}internal/arithmetic/mode_t.h
-yarp/extension.$(OBJEXT): {$(VPATH)}internal/arithmetic/off_t.h
-yarp/extension.$(OBJEXT): {$(VPATH)}internal/arithmetic/pid_t.h
-yarp/extension.$(OBJEXT): {$(VPATH)}internal/arithmetic/short.h
-yarp/extension.$(OBJEXT): {$(VPATH)}internal/arithmetic/size_t.h
-yarp/extension.$(OBJEXT): {$(VPATH)}internal/arithmetic/st_data_t.h
-yarp/extension.$(OBJEXT): {$(VPATH)}internal/arithmetic/uid_t.h
-yarp/extension.$(OBJEXT): {$(VPATH)}internal/assume.h
-yarp/extension.$(OBJEXT): {$(VPATH)}internal/attr/alloc_size.h
-yarp/extension.$(OBJEXT): {$(VPATH)}internal/attr/artificial.h
-yarp/extension.$(OBJEXT): {$(VPATH)}internal/attr/cold.h
-yarp/extension.$(OBJEXT): {$(VPATH)}internal/attr/const.h
-yarp/extension.$(OBJEXT): {$(VPATH)}internal/attr/constexpr.h
-yarp/extension.$(OBJEXT): {$(VPATH)}internal/attr/deprecated.h
-yarp/extension.$(OBJEXT): {$(VPATH)}internal/attr/diagnose_if.h
-yarp/extension.$(OBJEXT): {$(VPATH)}internal/attr/enum_extensibility.h
-yarp/extension.$(OBJEXT): {$(VPATH)}internal/attr/error.h
-yarp/extension.$(OBJEXT): {$(VPATH)}internal/attr/flag_enum.h
-yarp/extension.$(OBJEXT): {$(VPATH)}internal/attr/forceinline.h
-yarp/extension.$(OBJEXT): {$(VPATH)}internal/attr/format.h
-yarp/extension.$(OBJEXT): {$(VPATH)}internal/attr/maybe_unused.h
-yarp/extension.$(OBJEXT): {$(VPATH)}internal/attr/noalias.h
-yarp/extension.$(OBJEXT): {$(VPATH)}internal/attr/nodiscard.h
-yarp/extension.$(OBJEXT): {$(VPATH)}internal/attr/noexcept.h
-yarp/extension.$(OBJEXT): {$(VPATH)}internal/attr/noinline.h
-yarp/extension.$(OBJEXT): {$(VPATH)}internal/attr/nonnull.h
-yarp/extension.$(OBJEXT): {$(VPATH)}internal/attr/noreturn.h
-yarp/extension.$(OBJEXT): {$(VPATH)}internal/attr/packed_struct.h
-yarp/extension.$(OBJEXT): {$(VPATH)}internal/attr/pure.h
-yarp/extension.$(OBJEXT): {$(VPATH)}internal/attr/restrict.h
-yarp/extension.$(OBJEXT): {$(VPATH)}internal/attr/returns_nonnull.h
-yarp/extension.$(OBJEXT): {$(VPATH)}internal/attr/warning.h
-yarp/extension.$(OBJEXT): {$(VPATH)}internal/attr/weakref.h
-yarp/extension.$(OBJEXT): {$(VPATH)}internal/cast.h
-yarp/extension.$(OBJEXT): {$(VPATH)}internal/compiler_is.h
-yarp/extension.$(OBJEXT): {$(VPATH)}internal/compiler_is/apple.h
-yarp/extension.$(OBJEXT): {$(VPATH)}internal/compiler_is/clang.h
-yarp/extension.$(OBJEXT): {$(VPATH)}internal/compiler_is/gcc.h
-yarp/extension.$(OBJEXT): {$(VPATH)}internal/compiler_is/intel.h
-yarp/extension.$(OBJEXT): {$(VPATH)}internal/compiler_is/msvc.h
-yarp/extension.$(OBJEXT): {$(VPATH)}internal/compiler_is/sunpro.h
-yarp/extension.$(OBJEXT): {$(VPATH)}internal/compiler_since.h
-yarp/extension.$(OBJEXT): {$(VPATH)}internal/config.h
-yarp/extension.$(OBJEXT): {$(VPATH)}internal/constant_p.h
-yarp/extension.$(OBJEXT): {$(VPATH)}internal/core.h
-yarp/extension.$(OBJEXT): {$(VPATH)}internal/core/rarray.h
-yarp/extension.$(OBJEXT): {$(VPATH)}internal/core/rbasic.h
-yarp/extension.$(OBJEXT): {$(VPATH)}internal/core/rbignum.h
-yarp/extension.$(OBJEXT): {$(VPATH)}internal/core/rclass.h
-yarp/extension.$(OBJEXT): {$(VPATH)}internal/core/rdata.h
-yarp/extension.$(OBJEXT): {$(VPATH)}internal/core/rfile.h
-yarp/extension.$(OBJEXT): {$(VPATH)}internal/core/rhash.h
-yarp/extension.$(OBJEXT): {$(VPATH)}internal/core/robject.h
-yarp/extension.$(OBJEXT): {$(VPATH)}internal/core/rregexp.h
-yarp/extension.$(OBJEXT): {$(VPATH)}internal/core/rstring.h
-yarp/extension.$(OBJEXT): {$(VPATH)}internal/core/rstruct.h
-yarp/extension.$(OBJEXT): {$(VPATH)}internal/core/rtypeddata.h
-yarp/extension.$(OBJEXT): {$(VPATH)}internal/ctype.h
-yarp/extension.$(OBJEXT): {$(VPATH)}internal/dllexport.h
-yarp/extension.$(OBJEXT): {$(VPATH)}internal/dosish.h
-yarp/extension.$(OBJEXT): {$(VPATH)}internal/encoding/coderange.h
-yarp/extension.$(OBJEXT): {$(VPATH)}internal/encoding/ctype.h
-yarp/extension.$(OBJEXT): {$(VPATH)}internal/encoding/encoding.h
-yarp/extension.$(OBJEXT): {$(VPATH)}internal/encoding/pathname.h
-yarp/extension.$(OBJEXT): {$(VPATH)}internal/encoding/re.h
-yarp/extension.$(OBJEXT): {$(VPATH)}internal/encoding/sprintf.h
-yarp/extension.$(OBJEXT): {$(VPATH)}internal/encoding/string.h
-yarp/extension.$(OBJEXT): {$(VPATH)}internal/encoding/symbol.h
-yarp/extension.$(OBJEXT): {$(VPATH)}internal/encoding/transcode.h
-yarp/extension.$(OBJEXT): {$(VPATH)}internal/error.h
-yarp/extension.$(OBJEXT): {$(VPATH)}internal/eval.h
-yarp/extension.$(OBJEXT): {$(VPATH)}internal/event.h
-yarp/extension.$(OBJEXT): {$(VPATH)}internal/fl_type.h
-yarp/extension.$(OBJEXT): {$(VPATH)}internal/gc.h
-yarp/extension.$(OBJEXT): {$(VPATH)}internal/glob.h
-yarp/extension.$(OBJEXT): {$(VPATH)}internal/globals.h
-yarp/extension.$(OBJEXT): {$(VPATH)}internal/has/attribute.h
-yarp/extension.$(OBJEXT): {$(VPATH)}internal/has/builtin.h
-yarp/extension.$(OBJEXT): {$(VPATH)}internal/has/c_attribute.h
-yarp/extension.$(OBJEXT): {$(VPATH)}internal/has/cpp_attribute.h
-yarp/extension.$(OBJEXT): {$(VPATH)}internal/has/declspec_attribute.h
-yarp/extension.$(OBJEXT): {$(VPATH)}internal/has/extension.h
-yarp/extension.$(OBJEXT): {$(VPATH)}internal/has/feature.h
-yarp/extension.$(OBJEXT): {$(VPATH)}internal/has/warning.h
-yarp/extension.$(OBJEXT): {$(VPATH)}internal/intern/array.h
-yarp/extension.$(OBJEXT): {$(VPATH)}internal/intern/bignum.h
-yarp/extension.$(OBJEXT): {$(VPATH)}internal/intern/class.h
-yarp/extension.$(OBJEXT): {$(VPATH)}internal/intern/compar.h
-yarp/extension.$(OBJEXT): {$(VPATH)}internal/intern/complex.h
-yarp/extension.$(OBJEXT): {$(VPATH)}internal/intern/cont.h
-yarp/extension.$(OBJEXT): {$(VPATH)}internal/intern/dir.h
-yarp/extension.$(OBJEXT): {$(VPATH)}internal/intern/enum.h
-yarp/extension.$(OBJEXT): {$(VPATH)}internal/intern/enumerator.h
-yarp/extension.$(OBJEXT): {$(VPATH)}internal/intern/error.h
-yarp/extension.$(OBJEXT): {$(VPATH)}internal/intern/eval.h
-yarp/extension.$(OBJEXT): {$(VPATH)}internal/intern/file.h
-yarp/extension.$(OBJEXT): {$(VPATH)}internal/intern/hash.h
-yarp/extension.$(OBJEXT): {$(VPATH)}internal/intern/io.h
-yarp/extension.$(OBJEXT): {$(VPATH)}internal/intern/load.h
-yarp/extension.$(OBJEXT): {$(VPATH)}internal/intern/marshal.h
-yarp/extension.$(OBJEXT): {$(VPATH)}internal/intern/numeric.h
-yarp/extension.$(OBJEXT): {$(VPATH)}internal/intern/object.h
-yarp/extension.$(OBJEXT): {$(VPATH)}internal/intern/parse.h
-yarp/extension.$(OBJEXT): {$(VPATH)}internal/intern/proc.h
-yarp/extension.$(OBJEXT): {$(VPATH)}internal/intern/process.h
-yarp/extension.$(OBJEXT): {$(VPATH)}internal/intern/random.h
-yarp/extension.$(OBJEXT): {$(VPATH)}internal/intern/range.h
-yarp/extension.$(OBJEXT): {$(VPATH)}internal/intern/rational.h
-yarp/extension.$(OBJEXT): {$(VPATH)}internal/intern/re.h
-yarp/extension.$(OBJEXT): {$(VPATH)}internal/intern/ruby.h
-yarp/extension.$(OBJEXT): {$(VPATH)}internal/intern/select.h
-yarp/extension.$(OBJEXT): {$(VPATH)}internal/intern/select/largesize.h
-yarp/extension.$(OBJEXT): {$(VPATH)}internal/intern/signal.h
-yarp/extension.$(OBJEXT): {$(VPATH)}internal/intern/sprintf.h
-yarp/extension.$(OBJEXT): {$(VPATH)}internal/intern/string.h
-yarp/extension.$(OBJEXT): {$(VPATH)}internal/intern/struct.h
-yarp/extension.$(OBJEXT): {$(VPATH)}internal/intern/thread.h
-yarp/extension.$(OBJEXT): {$(VPATH)}internal/intern/time.h
-yarp/extension.$(OBJEXT): {$(VPATH)}internal/intern/variable.h
-yarp/extension.$(OBJEXT): {$(VPATH)}internal/intern/vm.h
-yarp/extension.$(OBJEXT): {$(VPATH)}internal/interpreter.h
-yarp/extension.$(OBJEXT): {$(VPATH)}internal/iterator.h
-yarp/extension.$(OBJEXT): {$(VPATH)}internal/memory.h
-yarp/extension.$(OBJEXT): {$(VPATH)}internal/method.h
-yarp/extension.$(OBJEXT): {$(VPATH)}internal/module.h
-yarp/extension.$(OBJEXT): {$(VPATH)}internal/newobj.h
-yarp/extension.$(OBJEXT): {$(VPATH)}internal/scan_args.h
-yarp/extension.$(OBJEXT): {$(VPATH)}internal/special_consts.h
-yarp/extension.$(OBJEXT): {$(VPATH)}internal/static_assert.h
-yarp/extension.$(OBJEXT): {$(VPATH)}internal/stdalign.h
-yarp/extension.$(OBJEXT): {$(VPATH)}internal/stdbool.h
-yarp/extension.$(OBJEXT): {$(VPATH)}internal/symbol.h
-yarp/extension.$(OBJEXT): {$(VPATH)}internal/value.h
-yarp/extension.$(OBJEXT): {$(VPATH)}internal/value_type.h
-yarp/extension.$(OBJEXT): {$(VPATH)}internal/variable.h
-yarp/extension.$(OBJEXT): {$(VPATH)}internal/warning_push.h
-yarp/extension.$(OBJEXT): {$(VPATH)}internal/xmalloc.h
-yarp/extension.$(OBJEXT): {$(VPATH)}missing.h
-yarp/extension.$(OBJEXT): {$(VPATH)}onigmo.h
-yarp/extension.$(OBJEXT): {$(VPATH)}oniguruma.h
-yarp/extension.$(OBJEXT): {$(VPATH)}st.h
-yarp/extension.$(OBJEXT): {$(VPATH)}subst.h
-yarp/extension.$(OBJEXT): {$(VPATH)}yarp/ast.h
-yarp/extension.$(OBJEXT): {$(VPATH)}yarp/version.h
-yarp/node.$(OBJEXT): $(top_srcdir)/yarp/defines.h
-yarp/node.$(OBJEXT): $(top_srcdir)/yarp/diagnostic.h
-yarp/node.$(OBJEXT): $(top_srcdir)/yarp/enc/yp_encoding.h
-yarp/node.$(OBJEXT): $(top_srcdir)/yarp/node.h
-yarp/node.$(OBJEXT): $(top_srcdir)/yarp/pack.h
-yarp/node.$(OBJEXT): $(top_srcdir)/yarp/parser.h
-yarp/node.$(OBJEXT): $(top_srcdir)/yarp/regexp.h
-yarp/node.$(OBJEXT): $(top_srcdir)/yarp/unescape.h
-yarp/node.$(OBJEXT): $(top_srcdir)/yarp/util/yp_buffer.h
-yarp/node.$(OBJEXT): $(top_srcdir)/yarp/util/yp_char.h
-yarp/node.$(OBJEXT): $(top_srcdir)/yarp/util/yp_constant_pool.h
-yarp/node.$(OBJEXT): $(top_srcdir)/yarp/util/yp_list.h
-yarp/node.$(OBJEXT): $(top_srcdir)/yarp/util/yp_newline_list.h
-yarp/node.$(OBJEXT): $(top_srcdir)/yarp/util/yp_state_stack.h
-yarp/node.$(OBJEXT): $(top_srcdir)/yarp/util/yp_string.h
-yarp/node.$(OBJEXT): $(top_srcdir)/yarp/util/yp_string_list.h
-yarp/node.$(OBJEXT): $(top_srcdir)/yarp/util/yp_strpbrk.h
-yarp/node.$(OBJEXT): $(top_srcdir)/yarp/yarp.h
-yarp/node.$(OBJEXT): {$(VPATH)}config.h
-yarp/node.$(OBJEXT): {$(VPATH)}yarp/ast.h
-yarp/node.$(OBJEXT): {$(VPATH)}yarp/node.c
-yarp/pack.$(OBJEXT): $(top_srcdir)/yarp/defines.h
-yarp/pack.$(OBJEXT): $(top_srcdir)/yarp/pack.c
-yarp/pack.$(OBJEXT): $(top_srcdir)/yarp/pack.h
-yarp/pack.$(OBJEXT): {$(VPATH)}config.h
-yarp/prettyprint.$(OBJEXT): $(top_srcdir)/yarp/defines.h
-yarp/prettyprint.$(OBJEXT): $(top_srcdir)/yarp/enc/yp_encoding.h
-yarp/prettyprint.$(OBJEXT): $(top_srcdir)/yarp/parser.h
-yarp/prettyprint.$(OBJEXT): $(top_srcdir)/yarp/util/yp_buffer.h
-yarp/prettyprint.$(OBJEXT): $(top_srcdir)/yarp/util/yp_constant_pool.h
-yarp/prettyprint.$(OBJEXT): $(top_srcdir)/yarp/util/yp_list.h
-yarp/prettyprint.$(OBJEXT): $(top_srcdir)/yarp/util/yp_newline_list.h
-yarp/prettyprint.$(OBJEXT): $(top_srcdir)/yarp/util/yp_state_stack.h
-yarp/prettyprint.$(OBJEXT): $(top_srcdir)/yarp/util/yp_string.h
-yarp/prettyprint.$(OBJEXT): {$(VPATH)}config.h
-yarp/prettyprint.$(OBJEXT): {$(VPATH)}yarp/ast.h
-yarp/prettyprint.$(OBJEXT): {$(VPATH)}yarp/prettyprint.c
-yarp/regexp.$(OBJEXT): $(top_srcdir)/yarp/defines.h
-yarp/regexp.$(OBJEXT): $(top_srcdir)/yarp/enc/yp_encoding.h
-yarp/regexp.$(OBJEXT): $(top_srcdir)/yarp/parser.h
-yarp/regexp.$(OBJEXT): $(top_srcdir)/yarp/regexp.c
-yarp/regexp.$(OBJEXT): $(top_srcdir)/yarp/regexp.h
-yarp/regexp.$(OBJEXT): $(top_srcdir)/yarp/util/yp_constant_pool.h
-yarp/regexp.$(OBJEXT): $(top_srcdir)/yarp/util/yp_list.h
-yarp/regexp.$(OBJEXT): $(top_srcdir)/yarp/util/yp_memchr.h
-yarp/regexp.$(OBJEXT): $(top_srcdir)/yarp/util/yp_newline_list.h
-yarp/regexp.$(OBJEXT): $(top_srcdir)/yarp/util/yp_state_stack.h
-yarp/regexp.$(OBJEXT): $(top_srcdir)/yarp/util/yp_string.h
-yarp/regexp.$(OBJEXT): $(top_srcdir)/yarp/util/yp_string_list.h
-yarp/regexp.$(OBJEXT): {$(VPATH)}config.h
-yarp/regexp.$(OBJEXT): {$(VPATH)}yarp/ast.h
-yarp/serialize.$(OBJEXT): $(top_srcdir)/yarp/defines.h
-yarp/serialize.$(OBJEXT): $(top_srcdir)/yarp/diagnostic.h
-yarp/serialize.$(OBJEXT): $(top_srcdir)/yarp/enc/yp_encoding.h
-yarp/serialize.$(OBJEXT): $(top_srcdir)/yarp/node.h
-yarp/serialize.$(OBJEXT): $(top_srcdir)/yarp/pack.h
-yarp/serialize.$(OBJEXT): $(top_srcdir)/yarp/parser.h
-yarp/serialize.$(OBJEXT): $(top_srcdir)/yarp/regexp.h
-yarp/serialize.$(OBJEXT): $(top_srcdir)/yarp/unescape.h
-yarp/serialize.$(OBJEXT): $(top_srcdir)/yarp/util/yp_buffer.h
-yarp/serialize.$(OBJEXT): $(top_srcdir)/yarp/util/yp_char.h
-yarp/serialize.$(OBJEXT): $(top_srcdir)/yarp/util/yp_constant_pool.h
-yarp/serialize.$(OBJEXT): $(top_srcdir)/yarp/util/yp_list.h
-yarp/serialize.$(OBJEXT): $(top_srcdir)/yarp/util/yp_memchr.h
-yarp/serialize.$(OBJEXT): $(top_srcdir)/yarp/util/yp_newline_list.h
-yarp/serialize.$(OBJEXT): $(top_srcdir)/yarp/util/yp_state_stack.h
-yarp/serialize.$(OBJEXT): $(top_srcdir)/yarp/util/yp_string.h
-yarp/serialize.$(OBJEXT): $(top_srcdir)/yarp/util/yp_string_list.h
-yarp/serialize.$(OBJEXT): $(top_srcdir)/yarp/util/yp_strpbrk.h
-yarp/serialize.$(OBJEXT): $(top_srcdir)/yarp/yarp.h
-yarp/serialize.$(OBJEXT): {$(VPATH)}config.h
-yarp/serialize.$(OBJEXT): {$(VPATH)}yarp/ast.h
-yarp/serialize.$(OBJEXT): {$(VPATH)}yarp/serialize.c
-yarp/serialize.$(OBJEXT): {$(VPATH)}yarp/version.h
-yarp/token_type.$(OBJEXT): $(top_srcdir)/yarp/defines.h
-yarp/token_type.$(OBJEXT): $(top_srcdir)/yarp/util/yp_constant_pool.h
-yarp/token_type.$(OBJEXT): $(top_srcdir)/yarp/util/yp_string.h
-yarp/token_type.$(OBJEXT): {$(VPATH)}config.h
-yarp/token_type.$(OBJEXT): {$(VPATH)}yarp/ast.h
-yarp/token_type.$(OBJEXT): {$(VPATH)}yarp/token_type.c
-yarp/unescape.$(OBJEXT): $(top_srcdir)/yarp/defines.h
-yarp/unescape.$(OBJEXT): $(top_srcdir)/yarp/diagnostic.h
-yarp/unescape.$(OBJEXT): $(top_srcdir)/yarp/enc/yp_encoding.h
-yarp/unescape.$(OBJEXT): $(top_srcdir)/yarp/node.h
-yarp/unescape.$(OBJEXT): $(top_srcdir)/yarp/pack.h
-yarp/unescape.$(OBJEXT): $(top_srcdir)/yarp/parser.h
-yarp/unescape.$(OBJEXT): $(top_srcdir)/yarp/regexp.h
-yarp/unescape.$(OBJEXT): $(top_srcdir)/yarp/unescape.c
-yarp/unescape.$(OBJEXT): $(top_srcdir)/yarp/unescape.h
-yarp/unescape.$(OBJEXT): $(top_srcdir)/yarp/util/yp_buffer.h
-yarp/unescape.$(OBJEXT): $(top_srcdir)/yarp/util/yp_char.h
-yarp/unescape.$(OBJEXT): $(top_srcdir)/yarp/util/yp_constant_pool.h
-yarp/unescape.$(OBJEXT): $(top_srcdir)/yarp/util/yp_list.h
-yarp/unescape.$(OBJEXT): $(top_srcdir)/yarp/util/yp_memchr.h
-yarp/unescape.$(OBJEXT): $(top_srcdir)/yarp/util/yp_newline_list.h
-yarp/unescape.$(OBJEXT): $(top_srcdir)/yarp/util/yp_state_stack.h
-yarp/unescape.$(OBJEXT): $(top_srcdir)/yarp/util/yp_string.h
-yarp/unescape.$(OBJEXT): $(top_srcdir)/yarp/util/yp_string_list.h
-yarp/unescape.$(OBJEXT): $(top_srcdir)/yarp/util/yp_strpbrk.h
-yarp/unescape.$(OBJEXT): $(top_srcdir)/yarp/yarp.h
-yarp/unescape.$(OBJEXT): {$(VPATH)}config.h
-yarp/unescape.$(OBJEXT): {$(VPATH)}yarp/ast.h
-yarp/unescape.$(OBJEXT): {$(VPATH)}yarp/version.h
-yarp/util/yp_buffer.$(OBJEXT): $(top_srcdir)/yarp/defines.h
-yarp/util/yp_buffer.$(OBJEXT): $(top_srcdir)/yarp/util/yp_buffer.c
-yarp/util/yp_buffer.$(OBJEXT): $(top_srcdir)/yarp/util/yp_buffer.h
-yarp/util/yp_buffer.$(OBJEXT): {$(VPATH)}config.h
-yarp/util/yp_char.$(OBJEXT): $(top_srcdir)/yarp/defines.h
-yarp/util/yp_char.$(OBJEXT): $(top_srcdir)/yarp/util/yp_char.c
-yarp/util/yp_char.$(OBJEXT): $(top_srcdir)/yarp/util/yp_char.h
-yarp/util/yp_char.$(OBJEXT): $(top_srcdir)/yarp/util/yp_newline_list.h
-yarp/util/yp_char.$(OBJEXT): {$(VPATH)}config.h
-yarp/util/yp_constant_pool.$(OBJEXT): $(top_srcdir)/yarp/defines.h
-yarp/util/yp_constant_pool.$(OBJEXT): $(top_srcdir)/yarp/util/yp_constant_pool.c
-yarp/util/yp_constant_pool.$(OBJEXT): $(top_srcdir)/yarp/util/yp_constant_pool.h
-yarp/util/yp_constant_pool.$(OBJEXT): {$(VPATH)}config.h
-yarp/util/yp_list.$(OBJEXT): $(top_srcdir)/yarp/defines.h
-yarp/util/yp_list.$(OBJEXT): $(top_srcdir)/yarp/util/yp_list.c
-yarp/util/yp_list.$(OBJEXT): $(top_srcdir)/yarp/util/yp_list.h
-yarp/util/yp_list.$(OBJEXT): {$(VPATH)}config.h
-yarp/util/yp_memchr.$(OBJEXT): $(top_srcdir)/yarp/defines.h
-yarp/util/yp_memchr.$(OBJEXT): $(top_srcdir)/yarp/enc/yp_encoding.h
-yarp/util/yp_memchr.$(OBJEXT): $(top_srcdir)/yarp/parser.h
-yarp/util/yp_memchr.$(OBJEXT): $(top_srcdir)/yarp/util/yp_constant_pool.h
-yarp/util/yp_memchr.$(OBJEXT): $(top_srcdir)/yarp/util/yp_list.h
-yarp/util/yp_memchr.$(OBJEXT): $(top_srcdir)/yarp/util/yp_memchr.c
-yarp/util/yp_memchr.$(OBJEXT): $(top_srcdir)/yarp/util/yp_memchr.h
-yarp/util/yp_memchr.$(OBJEXT): $(top_srcdir)/yarp/util/yp_newline_list.h
-yarp/util/yp_memchr.$(OBJEXT): $(top_srcdir)/yarp/util/yp_state_stack.h
-yarp/util/yp_memchr.$(OBJEXT): $(top_srcdir)/yarp/util/yp_string.h
-yarp/util/yp_memchr.$(OBJEXT): {$(VPATH)}config.h
-yarp/util/yp_memchr.$(OBJEXT): {$(VPATH)}yarp/ast.h
-yarp/util/yp_newline_list.$(OBJEXT): $(top_srcdir)/yarp/defines.h
-yarp/util/yp_newline_list.$(OBJEXT): $(top_srcdir)/yarp/util/yp_newline_list.c
-yarp/util/yp_newline_list.$(OBJEXT): $(top_srcdir)/yarp/util/yp_newline_list.h
-yarp/util/yp_newline_list.$(OBJEXT): {$(VPATH)}config.h
-yarp/util/yp_state_stack.$(OBJEXT): $(top_srcdir)/yarp/defines.h
-yarp/util/yp_state_stack.$(OBJEXT): $(top_srcdir)/yarp/util/yp_state_stack.c
-yarp/util/yp_state_stack.$(OBJEXT): $(top_srcdir)/yarp/util/yp_state_stack.h
-yarp/util/yp_state_stack.$(OBJEXT): {$(VPATH)}config.h
-yarp/util/yp_string.$(OBJEXT): $(top_srcdir)/yarp/defines.h
-yarp/util/yp_string.$(OBJEXT): $(top_srcdir)/yarp/util/yp_string.c
-yarp/util/yp_string.$(OBJEXT): $(top_srcdir)/yarp/util/yp_string.h
-yarp/util/yp_string.$(OBJEXT): {$(VPATH)}config.h
-yarp/util/yp_string_list.$(OBJEXT): $(top_srcdir)/yarp/defines.h
-yarp/util/yp_string_list.$(OBJEXT): $(top_srcdir)/yarp/util/yp_string.h
-yarp/util/yp_string_list.$(OBJEXT): $(top_srcdir)/yarp/util/yp_string_list.c
-yarp/util/yp_string_list.$(OBJEXT): $(top_srcdir)/yarp/util/yp_string_list.h
-yarp/util/yp_string_list.$(OBJEXT): {$(VPATH)}config.h
-yarp/util/yp_strncasecmp.$(OBJEXT): $(top_srcdir)/yarp/defines.h
-yarp/util/yp_strncasecmp.$(OBJEXT): $(top_srcdir)/yarp/util/yp_strncasecmp.c
-yarp/util/yp_strpbrk.$(OBJEXT): $(top_srcdir)/yarp/defines.h
-yarp/util/yp_strpbrk.$(OBJEXT): $(top_srcdir)/yarp/enc/yp_encoding.h
-yarp/util/yp_strpbrk.$(OBJEXT): $(top_srcdir)/yarp/parser.h
-yarp/util/yp_strpbrk.$(OBJEXT): $(top_srcdir)/yarp/util/yp_constant_pool.h
-yarp/util/yp_strpbrk.$(OBJEXT): $(top_srcdir)/yarp/util/yp_list.h
-yarp/util/yp_strpbrk.$(OBJEXT): $(top_srcdir)/yarp/util/yp_newline_list.h
-yarp/util/yp_strpbrk.$(OBJEXT): $(top_srcdir)/yarp/util/yp_state_stack.h
-yarp/util/yp_strpbrk.$(OBJEXT): $(top_srcdir)/yarp/util/yp_string.h
-yarp/util/yp_strpbrk.$(OBJEXT): $(top_srcdir)/yarp/util/yp_strpbrk.c
-yarp/util/yp_strpbrk.$(OBJEXT): $(top_srcdir)/yarp/util/yp_strpbrk.h
-yarp/util/yp_strpbrk.$(OBJEXT): {$(VPATH)}config.h
-yarp/util/yp_strpbrk.$(OBJEXT): {$(VPATH)}yarp/ast.h
-yarp/yarp.$(OBJEXT): $(top_srcdir)/yarp/defines.h
-yarp/yarp.$(OBJEXT): $(top_srcdir)/yarp/diagnostic.h
-yarp/yarp.$(OBJEXT): $(top_srcdir)/yarp/enc/yp_encoding.h
-yarp/yarp.$(OBJEXT): $(top_srcdir)/yarp/node.h
-yarp/yarp.$(OBJEXT): $(top_srcdir)/yarp/pack.h
-yarp/yarp.$(OBJEXT): $(top_srcdir)/yarp/parser.h
-yarp/yarp.$(OBJEXT): $(top_srcdir)/yarp/regexp.h
-yarp/yarp.$(OBJEXT): $(top_srcdir)/yarp/unescape.h
-yarp/yarp.$(OBJEXT): $(top_srcdir)/yarp/util/yp_buffer.h
-yarp/yarp.$(OBJEXT): $(top_srcdir)/yarp/util/yp_char.h
-yarp/yarp.$(OBJEXT): $(top_srcdir)/yarp/util/yp_constant_pool.h
-yarp/yarp.$(OBJEXT): $(top_srcdir)/yarp/util/yp_list.h
-yarp/yarp.$(OBJEXT): $(top_srcdir)/yarp/util/yp_memchr.h
-yarp/yarp.$(OBJEXT): $(top_srcdir)/yarp/util/yp_newline_list.h
-yarp/yarp.$(OBJEXT): $(top_srcdir)/yarp/util/yp_state_stack.h
-yarp/yarp.$(OBJEXT): $(top_srcdir)/yarp/util/yp_string.h
-yarp/yarp.$(OBJEXT): $(top_srcdir)/yarp/util/yp_string_list.h
-yarp/yarp.$(OBJEXT): $(top_srcdir)/yarp/util/yp_strpbrk.h
-yarp/yarp.$(OBJEXT): $(top_srcdir)/yarp/version.h
-yarp/yarp.$(OBJEXT): $(top_srcdir)/yarp/yarp.c
-yarp/yarp.$(OBJEXT): $(top_srcdir)/yarp/yarp.h
-yarp/yarp.$(OBJEXT): {$(VPATH)}config.h
-yarp/yarp.$(OBJEXT): {$(VPATH)}yarp/ast.h
-yarp/yarp.$(OBJEXT): {$(VPATH)}yarp/version.h
-yarp/yarp_init.$(OBJEXT): $(hdrdir)/ruby.h
-yarp/yarp_init.$(OBJEXT): $(hdrdir)/ruby/ruby.h
-yarp/yarp_init.$(OBJEXT): $(top_srcdir)/yarp/defines.h
-yarp/yarp_init.$(OBJEXT): $(top_srcdir)/yarp/diagnostic.h
-yarp/yarp_init.$(OBJEXT): $(top_srcdir)/yarp/enc/yp_encoding.h
-yarp/yarp_init.$(OBJEXT): $(top_srcdir)/yarp/extension.h
-yarp/yarp_init.$(OBJEXT): $(top_srcdir)/yarp/node.h
-yarp/yarp_init.$(OBJEXT): $(top_srcdir)/yarp/pack.h
-yarp/yarp_init.$(OBJEXT): $(top_srcdir)/yarp/parser.h
-yarp/yarp_init.$(OBJEXT): $(top_srcdir)/yarp/regexp.h
-yarp/yarp_init.$(OBJEXT): $(top_srcdir)/yarp/unescape.h
-yarp/yarp_init.$(OBJEXT): $(top_srcdir)/yarp/util/yp_buffer.h
-yarp/yarp_init.$(OBJEXT): $(top_srcdir)/yarp/util/yp_char.h
-yarp/yarp_init.$(OBJEXT): $(top_srcdir)/yarp/util/yp_constant_pool.h
-yarp/yarp_init.$(OBJEXT): $(top_srcdir)/yarp/util/yp_list.h
-yarp/yarp_init.$(OBJEXT): $(top_srcdir)/yarp/util/yp_memchr.h
-yarp/yarp_init.$(OBJEXT): $(top_srcdir)/yarp/util/yp_newline_list.h
-yarp/yarp_init.$(OBJEXT): $(top_srcdir)/yarp/util/yp_state_stack.h
-yarp/yarp_init.$(OBJEXT): $(top_srcdir)/yarp/util/yp_string.h
-yarp/yarp_init.$(OBJEXT): $(top_srcdir)/yarp/util/yp_string_list.h
-yarp/yarp_init.$(OBJEXT): $(top_srcdir)/yarp/util/yp_strpbrk.h
-yarp/yarp_init.$(OBJEXT): $(top_srcdir)/yarp/yarp.h
-yarp/yarp_init.$(OBJEXT): $(top_srcdir)/yarp/yarp_init.c
-yarp/yarp_init.$(OBJEXT): {$(VPATH)}assert.h
-yarp/yarp_init.$(OBJEXT): {$(VPATH)}backward/2/assume.h
-yarp/yarp_init.$(OBJEXT): {$(VPATH)}backward/2/attributes.h
-yarp/yarp_init.$(OBJEXT): {$(VPATH)}backward/2/bool.h
-yarp/yarp_init.$(OBJEXT): {$(VPATH)}backward/2/inttypes.h
-yarp/yarp_init.$(OBJEXT): {$(VPATH)}backward/2/limits.h
-yarp/yarp_init.$(OBJEXT): {$(VPATH)}backward/2/long_long.h
-yarp/yarp_init.$(OBJEXT): {$(VPATH)}backward/2/stdalign.h
-yarp/yarp_init.$(OBJEXT): {$(VPATH)}backward/2/stdarg.h
-yarp/yarp_init.$(OBJEXT): {$(VPATH)}config.h
-yarp/yarp_init.$(OBJEXT): {$(VPATH)}defines.h
-yarp/yarp_init.$(OBJEXT): {$(VPATH)}encoding.h
-yarp/yarp_init.$(OBJEXT): {$(VPATH)}intern.h
-yarp/yarp_init.$(OBJEXT): {$(VPATH)}internal/abi.h
-yarp/yarp_init.$(OBJEXT): {$(VPATH)}internal/anyargs.h
-yarp/yarp_init.$(OBJEXT): {$(VPATH)}internal/arithmetic.h
-yarp/yarp_init.$(OBJEXT): {$(VPATH)}internal/arithmetic/char.h
-yarp/yarp_init.$(OBJEXT): {$(VPATH)}internal/arithmetic/double.h
-yarp/yarp_init.$(OBJEXT): {$(VPATH)}internal/arithmetic/fixnum.h
-yarp/yarp_init.$(OBJEXT): {$(VPATH)}internal/arithmetic/gid_t.h
-yarp/yarp_init.$(OBJEXT): {$(VPATH)}internal/arithmetic/int.h
-yarp/yarp_init.$(OBJEXT): {$(VPATH)}internal/arithmetic/intptr_t.h
-yarp/yarp_init.$(OBJEXT): {$(VPATH)}internal/arithmetic/long.h
-yarp/yarp_init.$(OBJEXT): {$(VPATH)}internal/arithmetic/long_long.h
-yarp/yarp_init.$(OBJEXT): {$(VPATH)}internal/arithmetic/mode_t.h
-yarp/yarp_init.$(OBJEXT): {$(VPATH)}internal/arithmetic/off_t.h
-yarp/yarp_init.$(OBJEXT): {$(VPATH)}internal/arithmetic/pid_t.h
-yarp/yarp_init.$(OBJEXT): {$(VPATH)}internal/arithmetic/short.h
-yarp/yarp_init.$(OBJEXT): {$(VPATH)}internal/arithmetic/size_t.h
-yarp/yarp_init.$(OBJEXT): {$(VPATH)}internal/arithmetic/st_data_t.h
-yarp/yarp_init.$(OBJEXT): {$(VPATH)}internal/arithmetic/uid_t.h
-yarp/yarp_init.$(OBJEXT): {$(VPATH)}internal/assume.h
-yarp/yarp_init.$(OBJEXT): {$(VPATH)}internal/attr/alloc_size.h
-yarp/yarp_init.$(OBJEXT): {$(VPATH)}internal/attr/artificial.h
-yarp/yarp_init.$(OBJEXT): {$(VPATH)}internal/attr/cold.h
-yarp/yarp_init.$(OBJEXT): {$(VPATH)}internal/attr/const.h
-yarp/yarp_init.$(OBJEXT): {$(VPATH)}internal/attr/constexpr.h
-yarp/yarp_init.$(OBJEXT): {$(VPATH)}internal/attr/deprecated.h
-yarp/yarp_init.$(OBJEXT): {$(VPATH)}internal/attr/diagnose_if.h
-yarp/yarp_init.$(OBJEXT): {$(VPATH)}internal/attr/enum_extensibility.h
-yarp/yarp_init.$(OBJEXT): {$(VPATH)}internal/attr/error.h
-yarp/yarp_init.$(OBJEXT): {$(VPATH)}internal/attr/flag_enum.h
-yarp/yarp_init.$(OBJEXT): {$(VPATH)}internal/attr/forceinline.h
-yarp/yarp_init.$(OBJEXT): {$(VPATH)}internal/attr/format.h
-yarp/yarp_init.$(OBJEXT): {$(VPATH)}internal/attr/maybe_unused.h
-yarp/yarp_init.$(OBJEXT): {$(VPATH)}internal/attr/noalias.h
-yarp/yarp_init.$(OBJEXT): {$(VPATH)}internal/attr/nodiscard.h
-yarp/yarp_init.$(OBJEXT): {$(VPATH)}internal/attr/noexcept.h
-yarp/yarp_init.$(OBJEXT): {$(VPATH)}internal/attr/noinline.h
-yarp/yarp_init.$(OBJEXT): {$(VPATH)}internal/attr/nonnull.h
-yarp/yarp_init.$(OBJEXT): {$(VPATH)}internal/attr/noreturn.h
-yarp/yarp_init.$(OBJEXT): {$(VPATH)}internal/attr/packed_struct.h
-yarp/yarp_init.$(OBJEXT): {$(VPATH)}internal/attr/pure.h
-yarp/yarp_init.$(OBJEXT): {$(VPATH)}internal/attr/restrict.h
-yarp/yarp_init.$(OBJEXT): {$(VPATH)}internal/attr/returns_nonnull.h
-yarp/yarp_init.$(OBJEXT): {$(VPATH)}internal/attr/warning.h
-yarp/yarp_init.$(OBJEXT): {$(VPATH)}internal/attr/weakref.h
-yarp/yarp_init.$(OBJEXT): {$(VPATH)}internal/cast.h
-yarp/yarp_init.$(OBJEXT): {$(VPATH)}internal/compiler_is.h
-yarp/yarp_init.$(OBJEXT): {$(VPATH)}internal/compiler_is/apple.h
-yarp/yarp_init.$(OBJEXT): {$(VPATH)}internal/compiler_is/clang.h
-yarp/yarp_init.$(OBJEXT): {$(VPATH)}internal/compiler_is/gcc.h
-yarp/yarp_init.$(OBJEXT): {$(VPATH)}internal/compiler_is/intel.h
-yarp/yarp_init.$(OBJEXT): {$(VPATH)}internal/compiler_is/msvc.h
-yarp/yarp_init.$(OBJEXT): {$(VPATH)}internal/compiler_is/sunpro.h
-yarp/yarp_init.$(OBJEXT): {$(VPATH)}internal/compiler_since.h
-yarp/yarp_init.$(OBJEXT): {$(VPATH)}internal/config.h
-yarp/yarp_init.$(OBJEXT): {$(VPATH)}internal/constant_p.h
-yarp/yarp_init.$(OBJEXT): {$(VPATH)}internal/core.h
-yarp/yarp_init.$(OBJEXT): {$(VPATH)}internal/core/rarray.h
-yarp/yarp_init.$(OBJEXT): {$(VPATH)}internal/core/rbasic.h
-yarp/yarp_init.$(OBJEXT): {$(VPATH)}internal/core/rbignum.h
-yarp/yarp_init.$(OBJEXT): {$(VPATH)}internal/core/rclass.h
-yarp/yarp_init.$(OBJEXT): {$(VPATH)}internal/core/rdata.h
-yarp/yarp_init.$(OBJEXT): {$(VPATH)}internal/core/rfile.h
-yarp/yarp_init.$(OBJEXT): {$(VPATH)}internal/core/rhash.h
-yarp/yarp_init.$(OBJEXT): {$(VPATH)}internal/core/robject.h
-yarp/yarp_init.$(OBJEXT): {$(VPATH)}internal/core/rregexp.h
-yarp/yarp_init.$(OBJEXT): {$(VPATH)}internal/core/rstring.h
-yarp/yarp_init.$(OBJEXT): {$(VPATH)}internal/core/rstruct.h
-yarp/yarp_init.$(OBJEXT): {$(VPATH)}internal/core/rtypeddata.h
-yarp/yarp_init.$(OBJEXT): {$(VPATH)}internal/ctype.h
-yarp/yarp_init.$(OBJEXT): {$(VPATH)}internal/dllexport.h
-yarp/yarp_init.$(OBJEXT): {$(VPATH)}internal/dosish.h
-yarp/yarp_init.$(OBJEXT): {$(VPATH)}internal/encoding/coderange.h
-yarp/yarp_init.$(OBJEXT): {$(VPATH)}internal/encoding/ctype.h
-yarp/yarp_init.$(OBJEXT): {$(VPATH)}internal/encoding/encoding.h
-yarp/yarp_init.$(OBJEXT): {$(VPATH)}internal/encoding/pathname.h
-yarp/yarp_init.$(OBJEXT): {$(VPATH)}internal/encoding/re.h
-yarp/yarp_init.$(OBJEXT): {$(VPATH)}internal/encoding/sprintf.h
-yarp/yarp_init.$(OBJEXT): {$(VPATH)}internal/encoding/string.h
-yarp/yarp_init.$(OBJEXT): {$(VPATH)}internal/encoding/symbol.h
-yarp/yarp_init.$(OBJEXT): {$(VPATH)}internal/encoding/transcode.h
-yarp/yarp_init.$(OBJEXT): {$(VPATH)}internal/error.h
-yarp/yarp_init.$(OBJEXT): {$(VPATH)}internal/eval.h
-yarp/yarp_init.$(OBJEXT): {$(VPATH)}internal/event.h
-yarp/yarp_init.$(OBJEXT): {$(VPATH)}internal/fl_type.h
-yarp/yarp_init.$(OBJEXT): {$(VPATH)}internal/gc.h
-yarp/yarp_init.$(OBJEXT): {$(VPATH)}internal/glob.h
-yarp/yarp_init.$(OBJEXT): {$(VPATH)}internal/globals.h
-yarp/yarp_init.$(OBJEXT): {$(VPATH)}internal/has/attribute.h
-yarp/yarp_init.$(OBJEXT): {$(VPATH)}internal/has/builtin.h
-yarp/yarp_init.$(OBJEXT): {$(VPATH)}internal/has/c_attribute.h
-yarp/yarp_init.$(OBJEXT): {$(VPATH)}internal/has/cpp_attribute.h
-yarp/yarp_init.$(OBJEXT): {$(VPATH)}internal/has/declspec_attribute.h
-yarp/yarp_init.$(OBJEXT): {$(VPATH)}internal/has/extension.h
-yarp/yarp_init.$(OBJEXT): {$(VPATH)}internal/has/feature.h
-yarp/yarp_init.$(OBJEXT): {$(VPATH)}internal/has/warning.h
-yarp/yarp_init.$(OBJEXT): {$(VPATH)}internal/intern/array.h
-yarp/yarp_init.$(OBJEXT): {$(VPATH)}internal/intern/bignum.h
-yarp/yarp_init.$(OBJEXT): {$(VPATH)}internal/intern/class.h
-yarp/yarp_init.$(OBJEXT): {$(VPATH)}internal/intern/compar.h
-yarp/yarp_init.$(OBJEXT): {$(VPATH)}internal/intern/complex.h
-yarp/yarp_init.$(OBJEXT): {$(VPATH)}internal/intern/cont.h
-yarp/yarp_init.$(OBJEXT): {$(VPATH)}internal/intern/dir.h
-yarp/yarp_init.$(OBJEXT): {$(VPATH)}internal/intern/enum.h
-yarp/yarp_init.$(OBJEXT): {$(VPATH)}internal/intern/enumerator.h
-yarp/yarp_init.$(OBJEXT): {$(VPATH)}internal/intern/error.h
-yarp/yarp_init.$(OBJEXT): {$(VPATH)}internal/intern/eval.h
-yarp/yarp_init.$(OBJEXT): {$(VPATH)}internal/intern/file.h
-yarp/yarp_init.$(OBJEXT): {$(VPATH)}internal/intern/hash.h
-yarp/yarp_init.$(OBJEXT): {$(VPATH)}internal/intern/io.h
-yarp/yarp_init.$(OBJEXT): {$(VPATH)}internal/intern/load.h
-yarp/yarp_init.$(OBJEXT): {$(VPATH)}internal/intern/marshal.h
-yarp/yarp_init.$(OBJEXT): {$(VPATH)}internal/intern/numeric.h
-yarp/yarp_init.$(OBJEXT): {$(VPATH)}internal/intern/object.h
-yarp/yarp_init.$(OBJEXT): {$(VPATH)}internal/intern/parse.h
-yarp/yarp_init.$(OBJEXT): {$(VPATH)}internal/intern/proc.h
-yarp/yarp_init.$(OBJEXT): {$(VPATH)}internal/intern/process.h
-yarp/yarp_init.$(OBJEXT): {$(VPATH)}internal/intern/random.h
-yarp/yarp_init.$(OBJEXT): {$(VPATH)}internal/intern/range.h
-yarp/yarp_init.$(OBJEXT): {$(VPATH)}internal/intern/rational.h
-yarp/yarp_init.$(OBJEXT): {$(VPATH)}internal/intern/re.h
-yarp/yarp_init.$(OBJEXT): {$(VPATH)}internal/intern/ruby.h
-yarp/yarp_init.$(OBJEXT): {$(VPATH)}internal/intern/select.h
-yarp/yarp_init.$(OBJEXT): {$(VPATH)}internal/intern/select/largesize.h
-yarp/yarp_init.$(OBJEXT): {$(VPATH)}internal/intern/signal.h
-yarp/yarp_init.$(OBJEXT): {$(VPATH)}internal/intern/sprintf.h
-yarp/yarp_init.$(OBJEXT): {$(VPATH)}internal/intern/string.h
-yarp/yarp_init.$(OBJEXT): {$(VPATH)}internal/intern/struct.h
-yarp/yarp_init.$(OBJEXT): {$(VPATH)}internal/intern/thread.h
-yarp/yarp_init.$(OBJEXT): {$(VPATH)}internal/intern/time.h
-yarp/yarp_init.$(OBJEXT): {$(VPATH)}internal/intern/variable.h
-yarp/yarp_init.$(OBJEXT): {$(VPATH)}internal/intern/vm.h
-yarp/yarp_init.$(OBJEXT): {$(VPATH)}internal/interpreter.h
-yarp/yarp_init.$(OBJEXT): {$(VPATH)}internal/iterator.h
-yarp/yarp_init.$(OBJEXT): {$(VPATH)}internal/memory.h
-yarp/yarp_init.$(OBJEXT): {$(VPATH)}internal/method.h
-yarp/yarp_init.$(OBJEXT): {$(VPATH)}internal/module.h
-yarp/yarp_init.$(OBJEXT): {$(VPATH)}internal/newobj.h
-yarp/yarp_init.$(OBJEXT): {$(VPATH)}internal/scan_args.h
-yarp/yarp_init.$(OBJEXT): {$(VPATH)}internal/special_consts.h
-yarp/yarp_init.$(OBJEXT): {$(VPATH)}internal/static_assert.h
-yarp/yarp_init.$(OBJEXT): {$(VPATH)}internal/stdalign.h
-yarp/yarp_init.$(OBJEXT): {$(VPATH)}internal/stdbool.h
-yarp/yarp_init.$(OBJEXT): {$(VPATH)}internal/symbol.h
-yarp/yarp_init.$(OBJEXT): {$(VPATH)}internal/value.h
-yarp/yarp_init.$(OBJEXT): {$(VPATH)}internal/value_type.h
-yarp/yarp_init.$(OBJEXT): {$(VPATH)}internal/variable.h
-yarp/yarp_init.$(OBJEXT): {$(VPATH)}internal/warning_push.h
-yarp/yarp_init.$(OBJEXT): {$(VPATH)}internal/xmalloc.h
-yarp/yarp_init.$(OBJEXT): {$(VPATH)}missing.h
-yarp/yarp_init.$(OBJEXT): {$(VPATH)}onigmo.h
-yarp/yarp_init.$(OBJEXT): {$(VPATH)}oniguruma.h
-yarp/yarp_init.$(OBJEXT): {$(VPATH)}st.h
-yarp/yarp_init.$(OBJEXT): {$(VPATH)}subst.h
-yarp/yarp_init.$(OBJEXT): {$(VPATH)}yarp/ast.h
-yarp/yarp_init.$(OBJEXT): {$(VPATH)}yarp/version.h
 yjit.$(OBJEXT): $(CCAN_DIR)/check_type/check_type.h
 yjit.$(OBJEXT): $(CCAN_DIR)/container_of/container_of.h
 yjit.$(OBJEXT): $(CCAN_DIR)/list/list.h
@@ -19981,14 +21796,36 @@ yjit.$(OBJEXT): $(top_srcdir)/internal/fixnum.h
 yjit.$(OBJEXT): $(top_srcdir)/internal/gc.h
 yjit.$(OBJEXT): $(top_srcdir)/internal/hash.h
 yjit.$(OBJEXT): $(top_srcdir)/internal/imemo.h
+yjit.$(OBJEXT): $(top_srcdir)/internal/namespace.h
 yjit.$(OBJEXT): $(top_srcdir)/internal/numeric.h
 yjit.$(OBJEXT): $(top_srcdir)/internal/sanitizers.h
 yjit.$(OBJEXT): $(top_srcdir)/internal/serial.h
+yjit.$(OBJEXT): $(top_srcdir)/internal/set_table.h
 yjit.$(OBJEXT): $(top_srcdir)/internal/static_assert.h
 yjit.$(OBJEXT): $(top_srcdir)/internal/string.h
 yjit.$(OBJEXT): $(top_srcdir)/internal/variable.h
 yjit.$(OBJEXT): $(top_srcdir)/internal/vm.h
 yjit.$(OBJEXT): $(top_srcdir)/internal/warnings.h
+yjit.$(OBJEXT): $(top_srcdir)/prism/defines.h
+yjit.$(OBJEXT): $(top_srcdir)/prism/encoding.h
+yjit.$(OBJEXT): $(top_srcdir)/prism/node.h
+yjit.$(OBJEXT): $(top_srcdir)/prism/options.h
+yjit.$(OBJEXT): $(top_srcdir)/prism/pack.h
+yjit.$(OBJEXT): $(top_srcdir)/prism/parser.h
+yjit.$(OBJEXT): $(top_srcdir)/prism/prettyprint.h
+yjit.$(OBJEXT): $(top_srcdir)/prism/prism.h
+yjit.$(OBJEXT): $(top_srcdir)/prism/regexp.h
+yjit.$(OBJEXT): $(top_srcdir)/prism/static_literals.h
+yjit.$(OBJEXT): $(top_srcdir)/prism/util/pm_buffer.h
+yjit.$(OBJEXT): $(top_srcdir)/prism/util/pm_char.h
+yjit.$(OBJEXT): $(top_srcdir)/prism/util/pm_constant_pool.h
+yjit.$(OBJEXT): $(top_srcdir)/prism/util/pm_integer.h
+yjit.$(OBJEXT): $(top_srcdir)/prism/util/pm_list.h
+yjit.$(OBJEXT): $(top_srcdir)/prism/util/pm_memchr.h
+yjit.$(OBJEXT): $(top_srcdir)/prism/util/pm_newline_list.h
+yjit.$(OBJEXT): $(top_srcdir)/prism/util/pm_string.h
+yjit.$(OBJEXT): $(top_srcdir)/prism/util/pm_strncasecmp.h
+yjit.$(OBJEXT): $(top_srcdir)/prism/util/pm_strpbrk.h
 yjit.$(OBJEXT): {$(VPATH)}assert.h
 yjit.$(OBJEXT): {$(VPATH)}atomic.h
 yjit.$(OBJEXT): {$(VPATH)}backward/2/assume.h
@@ -20137,6 +21974,7 @@ yjit.$(OBJEXT): {$(VPATH)}internal/intern/re.h
 yjit.$(OBJEXT): {$(VPATH)}internal/intern/ruby.h
 yjit.$(OBJEXT): {$(VPATH)}internal/intern/select.h
 yjit.$(OBJEXT): {$(VPATH)}internal/intern/select/largesize.h
+yjit.$(OBJEXT): {$(VPATH)}internal/intern/set.h
 yjit.$(OBJEXT): {$(VPATH)}internal/intern/signal.h
 yjit.$(OBJEXT): {$(VPATH)}internal/intern/sprintf.h
 yjit.$(OBJEXT): {$(VPATH)}internal/intern/string.h
@@ -20157,6 +21995,7 @@ yjit.$(OBJEXT): {$(VPATH)}internal/special_consts.h
 yjit.$(OBJEXT): {$(VPATH)}internal/static_assert.h
 yjit.$(OBJEXT): {$(VPATH)}internal/stdalign.h
 yjit.$(OBJEXT): {$(VPATH)}internal/stdbool.h
+yjit.$(OBJEXT): {$(VPATH)}internal/stdckdint.h
 yjit.$(OBJEXT): {$(VPATH)}internal/symbol.h
 yjit.$(OBJEXT): {$(VPATH)}internal/value.h
 yjit.$(OBJEXT): {$(VPATH)}internal/value_type.h
@@ -20169,6 +22008,10 @@ yjit.$(OBJEXT): {$(VPATH)}missing.h
 yjit.$(OBJEXT): {$(VPATH)}node.h
 yjit.$(OBJEXT): {$(VPATH)}onigmo.h
 yjit.$(OBJEXT): {$(VPATH)}oniguruma.h
+yjit.$(OBJEXT): {$(VPATH)}prism/ast.h
+yjit.$(OBJEXT): {$(VPATH)}prism/diagnostic.h
+yjit.$(OBJEXT): {$(VPATH)}prism/version.h
+yjit.$(OBJEXT): {$(VPATH)}prism_compile.h
 yjit.$(OBJEXT): {$(VPATH)}probes.dmyh
 yjit.$(OBJEXT): {$(VPATH)}probes.h
 yjit.$(OBJEXT): {$(VPATH)}probes_helper.h
@@ -20189,4 +22032,255 @@ yjit.$(OBJEXT): {$(VPATH)}vm_sync.h
 yjit.$(OBJEXT): {$(VPATH)}yjit.c
 yjit.$(OBJEXT): {$(VPATH)}yjit.h
 yjit.$(OBJEXT): {$(VPATH)}yjit.rbinc
+yjit.$(OBJEXT): {$(VPATH)}zjit.h
+zjit.$(OBJEXT): $(CCAN_DIR)/check_type/check_type.h
+zjit.$(OBJEXT): $(CCAN_DIR)/container_of/container_of.h
+zjit.$(OBJEXT): $(CCAN_DIR)/list/list.h
+zjit.$(OBJEXT): $(CCAN_DIR)/str/str.h
+zjit.$(OBJEXT): $(hdrdir)/ruby/ruby.h
+zjit.$(OBJEXT): $(top_srcdir)/internal/array.h
+zjit.$(OBJEXT): $(top_srcdir)/internal/basic_operators.h
+zjit.$(OBJEXT): $(top_srcdir)/internal/bignum.h
+zjit.$(OBJEXT): $(top_srcdir)/internal/bits.h
+zjit.$(OBJEXT): $(top_srcdir)/internal/class.h
+zjit.$(OBJEXT): $(top_srcdir)/internal/compile.h
+zjit.$(OBJEXT): $(top_srcdir)/internal/compilers.h
+zjit.$(OBJEXT): $(top_srcdir)/internal/cont.h
+zjit.$(OBJEXT): $(top_srcdir)/internal/fixnum.h
+zjit.$(OBJEXT): $(top_srcdir)/internal/gc.h
+zjit.$(OBJEXT): $(top_srcdir)/internal/hash.h
+zjit.$(OBJEXT): $(top_srcdir)/internal/imemo.h
+zjit.$(OBJEXT): $(top_srcdir)/internal/numeric.h
+zjit.$(OBJEXT): $(top_srcdir)/internal/sanitizers.h
+zjit.$(OBJEXT): $(top_srcdir)/internal/serial.h
+zjit.$(OBJEXT): $(top_srcdir)/internal/static_assert.h
+zjit.$(OBJEXT): $(top_srcdir)/internal/string.h
+zjit.$(OBJEXT): $(top_srcdir)/internal/variable.h
+zjit.$(OBJEXT): $(top_srcdir)/internal/vm.h
+zjit.$(OBJEXT): $(top_srcdir)/internal/warnings.h
+zjit.$(OBJEXT): $(top_srcdir)/prism/defines.h
+zjit.$(OBJEXT): $(top_srcdir)/prism/encoding.h
+zjit.$(OBJEXT): $(top_srcdir)/prism/node.h
+zjit.$(OBJEXT): $(top_srcdir)/prism/options.h
+zjit.$(OBJEXT): $(top_srcdir)/prism/pack.h
+zjit.$(OBJEXT): $(top_srcdir)/prism/parser.h
+zjit.$(OBJEXT): $(top_srcdir)/prism/prettyprint.h
+zjit.$(OBJEXT): $(top_srcdir)/prism/prism.h
+zjit.$(OBJEXT): $(top_srcdir)/prism/regexp.h
+zjit.$(OBJEXT): $(top_srcdir)/prism/static_literals.h
+zjit.$(OBJEXT): $(top_srcdir)/prism/util/pm_buffer.h
+zjit.$(OBJEXT): $(top_srcdir)/prism/util/pm_char.h
+zjit.$(OBJEXT): $(top_srcdir)/prism/util/pm_constant_pool.h
+zjit.$(OBJEXT): $(top_srcdir)/prism/util/pm_integer.h
+zjit.$(OBJEXT): $(top_srcdir)/prism/util/pm_list.h
+zjit.$(OBJEXT): $(top_srcdir)/prism/util/pm_memchr.h
+zjit.$(OBJEXT): $(top_srcdir)/prism/util/pm_newline_list.h
+zjit.$(OBJEXT): $(top_srcdir)/prism/util/pm_string.h
+zjit.$(OBJEXT): $(top_srcdir)/prism/util/pm_strncasecmp.h
+zjit.$(OBJEXT): $(top_srcdir)/prism/util/pm_strpbrk.h
+zjit.$(OBJEXT): {$(VPATH)}assert.h
+zjit.$(OBJEXT): {$(VPATH)}atomic.h
+zjit.$(OBJEXT): {$(VPATH)}backward/2/assume.h
+zjit.$(OBJEXT): {$(VPATH)}backward/2/attributes.h
+zjit.$(OBJEXT): {$(VPATH)}backward/2/bool.h
+zjit.$(OBJEXT): {$(VPATH)}backward/2/gcc_version_since.h
+zjit.$(OBJEXT): {$(VPATH)}backward/2/inttypes.h
+zjit.$(OBJEXT): {$(VPATH)}backward/2/limits.h
+zjit.$(OBJEXT): {$(VPATH)}backward/2/long_long.h
+zjit.$(OBJEXT): {$(VPATH)}backward/2/stdalign.h
+zjit.$(OBJEXT): {$(VPATH)}backward/2/stdarg.h
+zjit.$(OBJEXT): {$(VPATH)}builtin.h
+zjit.$(OBJEXT): {$(VPATH)}config.h
+zjit.$(OBJEXT): {$(VPATH)}constant.h
+zjit.$(OBJEXT): {$(VPATH)}debug.h
+zjit.$(OBJEXT): {$(VPATH)}debug_counter.h
+zjit.$(OBJEXT): {$(VPATH)}defines.h
+zjit.$(OBJEXT): {$(VPATH)}encoding.h
+zjit.$(OBJEXT): {$(VPATH)}id.h
+zjit.$(OBJEXT): {$(VPATH)}id_table.h
+zjit.$(OBJEXT): {$(VPATH)}insns.def
+zjit.$(OBJEXT): {$(VPATH)}insns.inc
+zjit.$(OBJEXT): {$(VPATH)}insns_info.inc
+zjit.$(OBJEXT): {$(VPATH)}intern.h
+zjit.$(OBJEXT): {$(VPATH)}internal.h
+zjit.$(OBJEXT): {$(VPATH)}internal/abi.h
+zjit.$(OBJEXT): {$(VPATH)}internal/anyargs.h
+zjit.$(OBJEXT): {$(VPATH)}internal/arithmetic.h
+zjit.$(OBJEXT): {$(VPATH)}internal/arithmetic/char.h
+zjit.$(OBJEXT): {$(VPATH)}internal/arithmetic/double.h
+zjit.$(OBJEXT): {$(VPATH)}internal/arithmetic/fixnum.h
+zjit.$(OBJEXT): {$(VPATH)}internal/arithmetic/gid_t.h
+zjit.$(OBJEXT): {$(VPATH)}internal/arithmetic/int.h
+zjit.$(OBJEXT): {$(VPATH)}internal/arithmetic/intptr_t.h
+zjit.$(OBJEXT): {$(VPATH)}internal/arithmetic/long.h
+zjit.$(OBJEXT): {$(VPATH)}internal/arithmetic/long_long.h
+zjit.$(OBJEXT): {$(VPATH)}internal/arithmetic/mode_t.h
+zjit.$(OBJEXT): {$(VPATH)}internal/arithmetic/off_t.h
+zjit.$(OBJEXT): {$(VPATH)}internal/arithmetic/pid_t.h
+zjit.$(OBJEXT): {$(VPATH)}internal/arithmetic/short.h
+zjit.$(OBJEXT): {$(VPATH)}internal/arithmetic/size_t.h
+zjit.$(OBJEXT): {$(VPATH)}internal/arithmetic/st_data_t.h
+zjit.$(OBJEXT): {$(VPATH)}internal/arithmetic/uid_t.h
+zjit.$(OBJEXT): {$(VPATH)}internal/assume.h
+zjit.$(OBJEXT): {$(VPATH)}internal/attr/alloc_size.h
+zjit.$(OBJEXT): {$(VPATH)}internal/attr/artificial.h
+zjit.$(OBJEXT): {$(VPATH)}internal/attr/cold.h
+zjit.$(OBJEXT): {$(VPATH)}internal/attr/const.h
+zjit.$(OBJEXT): {$(VPATH)}internal/attr/constexpr.h
+zjit.$(OBJEXT): {$(VPATH)}internal/attr/deprecated.h
+zjit.$(OBJEXT): {$(VPATH)}internal/attr/diagnose_if.h
+zjit.$(OBJEXT): {$(VPATH)}internal/attr/enum_extensibility.h
+zjit.$(OBJEXT): {$(VPATH)}internal/attr/error.h
+zjit.$(OBJEXT): {$(VPATH)}internal/attr/flag_enum.h
+zjit.$(OBJEXT): {$(VPATH)}internal/attr/forceinline.h
+zjit.$(OBJEXT): {$(VPATH)}internal/attr/format.h
+zjit.$(OBJEXT): {$(VPATH)}internal/attr/maybe_unused.h
+zjit.$(OBJEXT): {$(VPATH)}internal/attr/noalias.h
+zjit.$(OBJEXT): {$(VPATH)}internal/attr/nodiscard.h
+zjit.$(OBJEXT): {$(VPATH)}internal/attr/noexcept.h
+zjit.$(OBJEXT): {$(VPATH)}internal/attr/noinline.h
+zjit.$(OBJEXT): {$(VPATH)}internal/attr/nonnull.h
+zjit.$(OBJEXT): {$(VPATH)}internal/attr/noreturn.h
+zjit.$(OBJEXT): {$(VPATH)}internal/attr/packed_struct.h
+zjit.$(OBJEXT): {$(VPATH)}internal/attr/pure.h
+zjit.$(OBJEXT): {$(VPATH)}internal/attr/restrict.h
+zjit.$(OBJEXT): {$(VPATH)}internal/attr/returns_nonnull.h
+zjit.$(OBJEXT): {$(VPATH)}internal/attr/warning.h
+zjit.$(OBJEXT): {$(VPATH)}internal/attr/weakref.h
+zjit.$(OBJEXT): {$(VPATH)}internal/cast.h
+zjit.$(OBJEXT): {$(VPATH)}internal/compiler_is.h
+zjit.$(OBJEXT): {$(VPATH)}internal/compiler_is/apple.h
+zjit.$(OBJEXT): {$(VPATH)}internal/compiler_is/clang.h
+zjit.$(OBJEXT): {$(VPATH)}internal/compiler_is/gcc.h
+zjit.$(OBJEXT): {$(VPATH)}internal/compiler_is/intel.h
+zjit.$(OBJEXT): {$(VPATH)}internal/compiler_is/msvc.h
+zjit.$(OBJEXT): {$(VPATH)}internal/compiler_is/sunpro.h
+zjit.$(OBJEXT): {$(VPATH)}internal/compiler_since.h
+zjit.$(OBJEXT): {$(VPATH)}internal/config.h
+zjit.$(OBJEXT): {$(VPATH)}internal/constant_p.h
+zjit.$(OBJEXT): {$(VPATH)}internal/core.h
+zjit.$(OBJEXT): {$(VPATH)}internal/core/rarray.h
+zjit.$(OBJEXT): {$(VPATH)}internal/core/rbasic.h
+zjit.$(OBJEXT): {$(VPATH)}internal/core/rbignum.h
+zjit.$(OBJEXT): {$(VPATH)}internal/core/rclass.h
+zjit.$(OBJEXT): {$(VPATH)}internal/core/rdata.h
+zjit.$(OBJEXT): {$(VPATH)}internal/core/rfile.h
+zjit.$(OBJEXT): {$(VPATH)}internal/core/rhash.h
+zjit.$(OBJEXT): {$(VPATH)}internal/core/robject.h
+zjit.$(OBJEXT): {$(VPATH)}internal/core/rregexp.h
+zjit.$(OBJEXT): {$(VPATH)}internal/core/rstring.h
+zjit.$(OBJEXT): {$(VPATH)}internal/core/rstruct.h
+zjit.$(OBJEXT): {$(VPATH)}internal/core/rtypeddata.h
+zjit.$(OBJEXT): {$(VPATH)}internal/ctype.h
+zjit.$(OBJEXT): {$(VPATH)}internal/dllexport.h
+zjit.$(OBJEXT): {$(VPATH)}internal/dosish.h
+zjit.$(OBJEXT): {$(VPATH)}internal/encoding/coderange.h
+zjit.$(OBJEXT): {$(VPATH)}internal/encoding/ctype.h
+zjit.$(OBJEXT): {$(VPATH)}internal/encoding/encoding.h
+zjit.$(OBJEXT): {$(VPATH)}internal/encoding/pathname.h
+zjit.$(OBJEXT): {$(VPATH)}internal/encoding/re.h
+zjit.$(OBJEXT): {$(VPATH)}internal/encoding/sprintf.h
+zjit.$(OBJEXT): {$(VPATH)}internal/encoding/string.h
+zjit.$(OBJEXT): {$(VPATH)}internal/encoding/symbol.h
+zjit.$(OBJEXT): {$(VPATH)}internal/encoding/transcode.h
+zjit.$(OBJEXT): {$(VPATH)}internal/error.h
+zjit.$(OBJEXT): {$(VPATH)}internal/eval.h
+zjit.$(OBJEXT): {$(VPATH)}internal/event.h
+zjit.$(OBJEXT): {$(VPATH)}internal/fl_type.h
+zjit.$(OBJEXT): {$(VPATH)}internal/gc.h
+zjit.$(OBJEXT): {$(VPATH)}internal/glob.h
+zjit.$(OBJEXT): {$(VPATH)}internal/globals.h
+zjit.$(OBJEXT): {$(VPATH)}internal/has/attribute.h
+zjit.$(OBJEXT): {$(VPATH)}internal/has/builtin.h
+zjit.$(OBJEXT): {$(VPATH)}internal/has/c_attribute.h
+zjit.$(OBJEXT): {$(VPATH)}internal/has/cpp_attribute.h
+zjit.$(OBJEXT): {$(VPATH)}internal/has/declspec_attribute.h
+zjit.$(OBJEXT): {$(VPATH)}internal/has/extension.h
+zjit.$(OBJEXT): {$(VPATH)}internal/has/feature.h
+zjit.$(OBJEXT): {$(VPATH)}internal/has/warning.h
+zjit.$(OBJEXT): {$(VPATH)}internal/intern/array.h
+zjit.$(OBJEXT): {$(VPATH)}internal/intern/bignum.h
+zjit.$(OBJEXT): {$(VPATH)}internal/intern/class.h
+zjit.$(OBJEXT): {$(VPATH)}internal/intern/compar.h
+zjit.$(OBJEXT): {$(VPATH)}internal/intern/complex.h
+zjit.$(OBJEXT): {$(VPATH)}internal/intern/cont.h
+zjit.$(OBJEXT): {$(VPATH)}internal/intern/dir.h
+zjit.$(OBJEXT): {$(VPATH)}internal/intern/enum.h
+zjit.$(OBJEXT): {$(VPATH)}internal/intern/enumerator.h
+zjit.$(OBJEXT): {$(VPATH)}internal/intern/error.h
+zjit.$(OBJEXT): {$(VPATH)}internal/intern/eval.h
+zjit.$(OBJEXT): {$(VPATH)}internal/intern/file.h
+zjit.$(OBJEXT): {$(VPATH)}internal/intern/hash.h
+zjit.$(OBJEXT): {$(VPATH)}internal/intern/io.h
+zjit.$(OBJEXT): {$(VPATH)}internal/intern/load.h
+zjit.$(OBJEXT): {$(VPATH)}internal/intern/marshal.h
+zjit.$(OBJEXT): {$(VPATH)}internal/intern/numeric.h
+zjit.$(OBJEXT): {$(VPATH)}internal/intern/object.h
+zjit.$(OBJEXT): {$(VPATH)}internal/intern/parse.h
+zjit.$(OBJEXT): {$(VPATH)}internal/intern/proc.h
+zjit.$(OBJEXT): {$(VPATH)}internal/intern/process.h
+zjit.$(OBJEXT): {$(VPATH)}internal/intern/random.h
+zjit.$(OBJEXT): {$(VPATH)}internal/intern/range.h
+zjit.$(OBJEXT): {$(VPATH)}internal/intern/rational.h
+zjit.$(OBJEXT): {$(VPATH)}internal/intern/re.h
+zjit.$(OBJEXT): {$(VPATH)}internal/intern/ruby.h
+zjit.$(OBJEXT): {$(VPATH)}internal/intern/select.h
+zjit.$(OBJEXT): {$(VPATH)}internal/intern/select/largesize.h
+zjit.$(OBJEXT): {$(VPATH)}internal/intern/signal.h
+zjit.$(OBJEXT): {$(VPATH)}internal/intern/sprintf.h
+zjit.$(OBJEXT): {$(VPATH)}internal/intern/string.h
+zjit.$(OBJEXT): {$(VPATH)}internal/intern/struct.h
+zjit.$(OBJEXT): {$(VPATH)}internal/intern/thread.h
+zjit.$(OBJEXT): {$(VPATH)}internal/intern/time.h
+zjit.$(OBJEXT): {$(VPATH)}internal/intern/variable.h
+zjit.$(OBJEXT): {$(VPATH)}internal/intern/vm.h
+zjit.$(OBJEXT): {$(VPATH)}internal/interpreter.h
+zjit.$(OBJEXT): {$(VPATH)}internal/iterator.h
+zjit.$(OBJEXT): {$(VPATH)}internal/memory.h
+zjit.$(OBJEXT): {$(VPATH)}internal/method.h
+zjit.$(OBJEXT): {$(VPATH)}internal/module.h
+zjit.$(OBJEXT): {$(VPATH)}internal/newobj.h
+zjit.$(OBJEXT): {$(VPATH)}internal/numeric.h
+zjit.$(OBJEXT): {$(VPATH)}internal/scan_args.h
+zjit.$(OBJEXT): {$(VPATH)}internal/special_consts.h
+zjit.$(OBJEXT): {$(VPATH)}internal/static_assert.h
+zjit.$(OBJEXT): {$(VPATH)}internal/stdalign.h
+zjit.$(OBJEXT): {$(VPATH)}internal/stdbool.h
+zjit.$(OBJEXT): {$(VPATH)}internal/stdckdint.h
+zjit.$(OBJEXT): {$(VPATH)}internal/symbol.h
+zjit.$(OBJEXT): {$(VPATH)}internal/value.h
+zjit.$(OBJEXT): {$(VPATH)}internal/value_type.h
+zjit.$(OBJEXT): {$(VPATH)}internal/variable.h
+zjit.$(OBJEXT): {$(VPATH)}internal/warning_push.h
+zjit.$(OBJEXT): {$(VPATH)}internal/xmalloc.h
+zjit.$(OBJEXT): {$(VPATH)}iseq.h
+zjit.$(OBJEXT): {$(VPATH)}method.h
+zjit.$(OBJEXT): {$(VPATH)}missing.h
+zjit.$(OBJEXT): {$(VPATH)}node.h
+zjit.$(OBJEXT): {$(VPATH)}onigmo.h
+zjit.$(OBJEXT): {$(VPATH)}oniguruma.h
+zjit.$(OBJEXT): {$(VPATH)}prism/ast.h
+zjit.$(OBJEXT): {$(VPATH)}prism/diagnostic.h
+zjit.$(OBJEXT): {$(VPATH)}prism/version.h
+zjit.$(OBJEXT): {$(VPATH)}prism_compile.h
+zjit.$(OBJEXT): {$(VPATH)}probes.dmyh
+zjit.$(OBJEXT): {$(VPATH)}probes.h
+zjit.$(OBJEXT): {$(VPATH)}probes_helper.h
+zjit.$(OBJEXT): {$(VPATH)}ruby_assert.h
+zjit.$(OBJEXT): {$(VPATH)}ruby_atomic.h
+zjit.$(OBJEXT): {$(VPATH)}rubyparser.h
+zjit.$(OBJEXT): {$(VPATH)}shape.h
+zjit.$(OBJEXT): {$(VPATH)}st.h
+zjit.$(OBJEXT): {$(VPATH)}subst.h
+zjit.$(OBJEXT): {$(VPATH)}thread_$(THREAD_MODEL).h
+zjit.$(OBJEXT): {$(VPATH)}thread_native.h
+zjit.$(OBJEXT): {$(VPATH)}vm_callinfo.h
+zjit.$(OBJEXT): {$(VPATH)}vm_core.h
+zjit.$(OBJEXT): {$(VPATH)}vm_debug.h
+zjit.$(OBJEXT): {$(VPATH)}vm_insnhelper.h
+zjit.$(OBJEXT): {$(VPATH)}vm_opts.h
+zjit.$(OBJEXT): {$(VPATH)}vm_sync.h
+zjit.$(OBJEXT): {$(VPATH)}zjit.c
+zjit.$(OBJEXT): {$(VPATH)}zjit.h
+zjit.$(OBJEXT): {$(VPATH)}zjit.rbinc
 # AUTOGENERATED DEPENDENCIES END
diff --git a/compar.c b/compar.c
index 2b34ebb062c499..f5da6178cf4358 100644
--- a/compar.c
+++ b/compar.c
@@ -187,6 +187,12 @@ cmp_between(VALUE x, VALUE min, VALUE max)
  *     'd'.clamp('a', 'f')      #=> 'd'
  *     'z'.clamp('a', 'f')      #=> 'f'
  *
+ * If _min_ is +nil+, it is considered smaller than _obj_,
+ * and if _max_ is +nil+, it is considered greater than _obj_.
+ *
+ *     -20.clamp(0, nil)           #=> 0
+ *     523.clamp(nil, 100)         #=> 100
+ *
  * In <code>(range)</code> form, returns _range.begin_ if _obj_
  * <code><=></code> _range.begin_ is less than zero, _range.end_
  * if _obj_ <code><=></code> _range.end_ is greater than zero, and
@@ -257,25 +263,28 @@ cmp_clamp(int argc, VALUE *argv, VALUE x)
  *  <code>==</code>, <code>>=</code>, and <code>></code>) and the
  *  method <code>between?</code>.
  *
- *     class SizeMatters
+ *     class StringSorter
  *       include Comparable
+ *
  *       attr :str
  *       def <=>(other)
  *         str.size <=> other.str.size
  *       end
+ *
  *       def initialize(str)
  *         @str = str
  *       end
+ *
  *       def inspect
  *         @str
  *       end
  *     end
  *
- *     s1 = SizeMatters.new("Z")
- *     s2 = SizeMatters.new("YY")
- *     s3 = SizeMatters.new("XXX")
- *     s4 = SizeMatters.new("WWWW")
- *     s5 = SizeMatters.new("VVVVV")
+ *     s1 = StringSorter.new("Z")
+ *     s2 = StringSorter.new("YY")
+ *     s3 = StringSorter.new("XXX")
+ *     s4 = StringSorter.new("WWWW")
+ *     s5 = StringSorter.new("VVVVV")
  *
  *     s1 < s2                       #=> true
  *     s4.between?(s1, s3)           #=> false
@@ -284,7 +293,7 @@ cmp_clamp(int argc, VALUE *argv, VALUE x)
  *
  *  == What's Here
  *
- *  \Module \Comparable provides these methods, all of which use method <tt><=></tt>:
+ *  Module \Comparable provides these methods, all of which use method <tt>#<=></tt>:
  *
  *  - #<: Returns whether +self+ is less than the given object.
  *  - #<=: Returns whether +self+ is less than or equal to the given object.
diff --git a/compile.c b/compile.c
index a165690597938a..8d5cb45904c6e7 100644
--- a/compile.c
+++ b/compile.c
@@ -26,30 +26,29 @@
 #include "internal/error.h"
 #include "internal/gc.h"
 #include "internal/hash.h"
+#include "internal/io.h"
 #include "internal/numeric.h"
 #include "internal/object.h"
 #include "internal/rational.h"
 #include "internal/re.h"
+#include "internal/ruby_parser.h"
 #include "internal/symbol.h"
 #include "internal/thread.h"
 #include "internal/variable.h"
 #include "iseq.h"
+#include "ruby/ractor.h"
 #include "ruby/re.h"
 #include "ruby/util.h"
 #include "vm_core.h"
 #include "vm_callinfo.h"
 #include "vm_debug.h"
+#include "yjit.h"
 
 #include "builtin.h"
 #include "insns.inc"
 #include "insns_info.inc"
-#include "yarp/yarp.h"
-
-#undef RUBY_UNTYPED_DATA_WARNING
-#define RUBY_UNTYPED_DATA_WARNING 0
 
 #define FIXNUM_INC(n, i) ((n)+(INT2FIX(i)&~FIXNUM_FLAG))
-#define FIXNUM_OR(n, i) ((n)|INT2FIX(i))
 
 typedef struct iseq_link_element {
     enum {
@@ -119,7 +118,7 @@ struct ensure_range {
 };
 
 struct iseq_compile_data_ensure_node_stack {
-    const NODE *ensure_node;
+    const void *ensure_node;
     struct iseq_compile_data_ensure_node_stack *prev;
     struct ensure_range *erange;
 };
@@ -214,36 +213,43 @@ const ID rb_iseq_shared_exc_local_tbl[] = {idERROR_INFO};
 #define NEW_CHILD_ISEQ(node, name, type, line_no) \
   new_child_iseq(iseq, (node), rb_fstring(name), iseq, (type), (line_no))
 
+#define NEW_CHILD_ISEQ_WITH_CALLBACK(callback_func, name, type, line_no) \
+  new_child_iseq_with_callback(iseq, (callback_func), (name), iseq, (type), (line_no))
+
 /* add instructions */
 #define ADD_SEQ(seq1, seq2) \
   APPEND_LIST((seq1), (seq2))
 
 /* add an instruction */
 #define ADD_INSN(seq, line_node, insn) \
-  ADD_ELEM((seq), (LINK_ELEMENT *) new_insn_body(iseq, (line_node), BIN(insn), 0))
+  ADD_ELEM((seq), (LINK_ELEMENT *) new_insn_body(iseq, nd_line(line_node), nd_node_id(line_node), BIN(insn), 0))
+
+/* add an instruction with the given line number and node id */
+#define ADD_SYNTHETIC_INSN(seq, line_no, node_id, insn) \
+  ADD_ELEM((seq), (LINK_ELEMENT *) new_insn_body(iseq, (line_no), (node_id), BIN(insn), 0))
 
 /* insert an instruction before next */
-#define INSERT_BEFORE_INSN(next, line_node, insn) \
-  ELEM_INSERT_PREV(&(next)->link, (LINK_ELEMENT *) new_insn_body(iseq, (line_node), BIN(insn), 0))
+#define INSERT_BEFORE_INSN(next, line_no, node_id, insn) \
+  ELEM_INSERT_PREV(&(next)->link, (LINK_ELEMENT *) new_insn_body(iseq, line_no, node_id, BIN(insn), 0))
 
 /* insert an instruction after prev */
-#define INSERT_AFTER_INSN(prev, line_node, insn) \
-  ELEM_INSERT_NEXT(&(prev)->link, (LINK_ELEMENT *) new_insn_body(iseq, (line_node), BIN(insn), 0))
+#define INSERT_AFTER_INSN(prev, line_no, node_id, insn) \
+  ELEM_INSERT_NEXT(&(prev)->link, (LINK_ELEMENT *) new_insn_body(iseq, line_no, node_id, BIN(insn), 0))
 
 /* add an instruction with some operands (1, 2, 3, 5) */
 #define ADD_INSN1(seq, line_node, insn, op1) \
   ADD_ELEM((seq), (LINK_ELEMENT *) \
-           new_insn_body(iseq, (line_node), BIN(insn), 1, (VALUE)(op1)))
+           new_insn_body(iseq, nd_line(line_node), nd_node_id(line_node), BIN(insn), 1, (VALUE)(op1)))
 
 /* insert an instruction with some operands (1, 2, 3, 5) before next */
-#define INSERT_BEFORE_INSN1(next, line_node, insn, op1) \
+#define INSERT_BEFORE_INSN1(next, line_no, node_id, insn, op1) \
   ELEM_INSERT_PREV(&(next)->link, (LINK_ELEMENT *) \
-           new_insn_body(iseq, (line_node), BIN(insn), 1, (VALUE)(op1)))
+           new_insn_body(iseq, line_no, node_id, BIN(insn), 1, (VALUE)(op1)))
 
 /* insert an instruction with some operands (1, 2, 3, 5) after prev */
-#define INSERT_AFTER_INSN1(prev, line_node, insn, op1) \
+#define INSERT_AFTER_INSN1(prev, line_no, node_id, insn, op1) \
   ELEM_INSERT_NEXT(&(prev)->link, (LINK_ELEMENT *) \
-           new_insn_body(iseq, (line_node), BIN(insn), 1, (VALUE)(op1)))
+           new_insn_body(iseq, line_no, node_id, BIN(insn), 1, (VALUE)(op1)))
 
 #define LABEL_REF(label) ((label)->refcnt++)
 
@@ -252,11 +258,11 @@ const ID rb_iseq_shared_exc_local_tbl[] = {idERROR_INFO};
 
 #define ADD_INSN2(seq, line_node, insn, op1, op2) \
   ADD_ELEM((seq), (LINK_ELEMENT *) \
-           new_insn_body(iseq, (line_node), BIN(insn), 2, (VALUE)(op1), (VALUE)(op2)))
+           new_insn_body(iseq, nd_line(line_node), nd_node_id(line_node), BIN(insn), 2, (VALUE)(op1), (VALUE)(op2)))
 
 #define ADD_INSN3(seq, line_node, insn, op1, op2, op3) \
   ADD_ELEM((seq), (LINK_ELEMENT *) \
-           new_insn_body(iseq, (line_node), BIN(insn), 3, (VALUE)(op1), (VALUE)(op2), (VALUE)(op3)))
+           new_insn_body(iseq, nd_line(line_node), nd_node_id(line_node), BIN(insn), 3, (VALUE)(op1), (VALUE)(op2), (VALUE)(op3)))
 
 /* Specific Insn factory */
 #define ADD_SEND(seq, line_node, id, argc) \
@@ -278,7 +284,7 @@ const ID rb_iseq_shared_exc_local_tbl[] = {idERROR_INFO};
   ADD_SEND_R((seq), (line_node), (id), (argc), (block), (VALUE)INT2FIX(VM_CALL_FCALL), NULL)
 
 #define ADD_SEND_R(seq, line_node, id, argc, block, flag, keywords) \
-  ADD_ELEM((seq), (LINK_ELEMENT *) new_insn_send(iseq, (line_node), (id), (VALUE)(argc), (block), (VALUE)(flag), (keywords)))
+  ADD_ELEM((seq), (LINK_ELEMENT *) new_insn_send(iseq, nd_line(line_node), nd_node_id(line_node), (id), (VALUE)(argc), (block), (VALUE)(flag), (keywords)))
 
 #define ADD_TRACE(seq, event) \
   ADD_ELEM((seq), (LINK_ELEMENT *)new_trace_body(iseq, (event), 0))
@@ -333,10 +339,10 @@ static void iseq_add_setlocal(rb_iseq_t *iseq, LINK_ANCHOR *const seq, const NOD
   (debug_compile("== " desc "\n", \
                  iseq_compile_each(iseq, (anchor), (node), (popped))))
 
-#define COMPILE_RECV(anchor, desc, node) \
+#define COMPILE_RECV(anchor, desc, node, recv) \
     (private_recv_p(node) ? \
      (ADD_INSN(anchor, node, putself), VM_CALL_FCALL) : \
-     COMPILE(anchor, desc, node->nd_recv) ? 0 : -1)
+     COMPILE(anchor, desc, recv) ? 0 : -1)
 
 #define OPERAND_AT(insn, idx) \
   (((INSN*)(insn))->operands[(idx)])
@@ -432,12 +438,10 @@ do { \
 #define NO_CHECK(sub) (void)(sub)
 #define BEFORE_RETURN
 
-/* leave name uninitialized so that compiler warn if INIT_ANCHOR is
- * missing */
 #define DECL_ANCHOR(name) \
-    LINK_ANCHOR name[1] = {{{ISEQ_ELEMENT_ANCHOR,},}}
+    LINK_ANCHOR name[1] = {{{ISEQ_ELEMENT_ANCHOR,},&name[0].anchor}}
 #define INIT_ANCHOR(name) \
-    (name->last = &name->anchor)
+    ((name->last = &name->anchor)->next = NULL) /* re-initialize */
 
 static inline VALUE
 freeze_hide_obj(VALUE obj)
@@ -471,7 +475,7 @@ static void dump_disasm_list(const LINK_ELEMENT *elem);
 static int insn_data_length(INSN *iobj);
 static int calc_sp_depth(int depth, INSN *iobj);
 
-static INSN *new_insn_body(rb_iseq_t *iseq, const NODE *const line_node, enum ruby_vminsn_type insn_id, int argc, ...);
+static INSN *new_insn_body(rb_iseq_t *iseq, int line_no, int node_id, enum ruby_vminsn_type insn_id, int argc, ...);
 static LABEL *new_label_body(rb_iseq_t *iseq, long line);
 static ADJUST *new_adjust_body(rb_iseq_t *iseq, LABEL *label, int line);
 static TRACE *new_trace_body(rb_iseq_t *iseq, rb_event_flag_t event, long data);
@@ -483,7 +487,7 @@ static int iseq_setup_insn(rb_iseq_t *iseq, LINK_ANCHOR *const anchor);
 static int iseq_optimize(rb_iseq_t *iseq, LINK_ANCHOR *const anchor);
 static int iseq_insns_unification(rb_iseq_t *iseq, LINK_ANCHOR *const anchor);
 
-static int iseq_set_local_table(rb_iseq_t *iseq, const rb_ast_id_table_t *tbl);
+static int iseq_set_local_table(rb_iseq_t *iseq, const rb_ast_id_table_t *tbl, const NODE *const node_args);
 static int iseq_set_exception_local_table(rb_iseq_t *iseq);
 static int iseq_set_arguments(rb_iseq_t *iseq, LINK_ANCHOR *const anchor, const NODE *const node);
 
@@ -491,7 +495,7 @@ static int iseq_set_sequence(rb_iseq_t *iseq, LINK_ANCHOR *const anchor);
 static int iseq_set_exception_table(rb_iseq_t *iseq);
 static int iseq_set_optargs_table(rb_iseq_t *iseq);
 
-static int compile_defined_expr(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const node, VALUE needstr);
+static int compile_defined_expr(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const node, VALUE needstr, bool ignore);
 static int compile_hash(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *node, int method_call_keywords, int popped);
 
 /*
@@ -605,13 +609,28 @@ branch_coverage_valid_p(rb_iseq_t *iseq, int first_line)
     return 1;
 }
 
+#define PTR2NUM(x) (rb_int2inum((intptr_t)(void *)(x)))
+
 static VALUE
-decl_branch_base(rb_iseq_t *iseq, const NODE *node, const char *type)
+setup_branch(const rb_code_location_t *loc, const char *type, VALUE structure, VALUE key)
 {
-    const int first_lineno = nd_first_lineno(node), first_column = nd_first_column(node);
-    const int last_lineno = nd_last_lineno(node), last_column = nd_last_column(node);
+    const int first_lineno = loc->beg_pos.lineno, first_column = loc->beg_pos.column;
+    const int last_lineno = loc->end_pos.lineno, last_column = loc->end_pos.column;
+    VALUE branch = rb_ary_hidden_new(6);
 
-    if (!branch_coverage_valid_p(iseq, first_lineno)) return Qundef;
+    rb_hash_aset(structure, key, branch);
+    rb_ary_push(branch, ID2SYM(rb_intern(type)));
+    rb_ary_push(branch, INT2FIX(first_lineno));
+    rb_ary_push(branch, INT2FIX(first_column));
+    rb_ary_push(branch, INT2FIX(last_lineno));
+    rb_ary_push(branch, INT2FIX(last_column));
+    return branch;
+}
+
+static VALUE
+decl_branch_base(rb_iseq_t *iseq, VALUE key, const rb_code_location_t *loc, const char *type)
+{
+    if (!branch_coverage_valid_p(iseq, loc->beg_pos.lineno)) return Qundef;
 
     /*
      * if !structure[node]
@@ -622,18 +641,11 @@ decl_branch_base(rb_iseq_t *iseq, const NODE *node, const char *type)
      */
 
     VALUE structure = RARRAY_AREF(ISEQ_BRANCH_COVERAGE(iseq), 0);
-    VALUE key = (VALUE)node | 1; // FIXNUM for hash key
     VALUE branch_base = rb_hash_aref(structure, key);
     VALUE branches;
 
     if (NIL_P(branch_base)) {
-        branch_base = rb_ary_hidden_new(6);
-        rb_hash_aset(structure, key, branch_base);
-        rb_ary_push(branch_base, ID2SYM(rb_intern(type)));
-        rb_ary_push(branch_base, INT2FIX(first_lineno));
-        rb_ary_push(branch_base, INT2FIX(first_column));
-        rb_ary_push(branch_base, INT2FIX(last_lineno));
-        rb_ary_push(branch_base, INT2FIX(last_column));
+        branch_base = setup_branch(loc, type, structure, key);
         branches = rb_hash_new();
         rb_obj_hide(branches);
         rb_ary_push(branch_base, branches);
@@ -655,12 +667,9 @@ generate_dummy_line_node(int lineno, int node_id)
 }
 
 static void
-add_trace_branch_coverage(rb_iseq_t *iseq, LINK_ANCHOR *const seq, const NODE *node, int branch_id, const char *type, VALUE branches)
+add_trace_branch_coverage(rb_iseq_t *iseq, LINK_ANCHOR *const seq, const rb_code_location_t *loc, int node_id, int branch_id, const char *type, VALUE branches)
 {
-    const int first_lineno = nd_first_lineno(node), first_column = nd_first_column(node);
-    const int last_lineno = nd_last_lineno(node), last_column = nd_last_column(node);
-
-    if (!branch_coverage_valid_p(iseq, first_lineno)) return;
+    if (!branch_coverage_valid_p(iseq, loc->beg_pos.lineno)) return;
 
     /*
      * if !branches[branch_id]
@@ -675,13 +684,7 @@ add_trace_branch_coverage(rb_iseq_t *iseq, LINK_ANCHOR *const seq, const NODE *n
     long counter_idx;
 
     if (NIL_P(branch)) {
-        branch = rb_ary_hidden_new(6);
-        rb_hash_aset(branches, key, branch);
-        rb_ary_push(branch, ID2SYM(rb_intern(type)));
-        rb_ary_push(branch, INT2FIX(first_lineno));
-        rb_ary_push(branch, INT2FIX(first_column));
-        rb_ary_push(branch, INT2FIX(last_lineno));
-        rb_ary_push(branch, INT2FIX(last_column));
+        branch = setup_branch(loc, type, branches, key);
         VALUE counters = RARRAY_AREF(ISEQ_BRANCH_COVERAGE(iseq), 1);
         counter_idx = RARRAY_LEN(counters);
         rb_ary_push(branch, LONG2FIX(counter_idx));
@@ -692,9 +695,7 @@ add_trace_branch_coverage(rb_iseq_t *iseq, LINK_ANCHOR *const seq, const NODE *n
     }
 
     ADD_TRACE_WITH_DATA(seq, RUBY_EVENT_COVERAGE_BRANCH, counter_idx);
-
-    NODE dummy_line_node = generate_dummy_line_node(last_lineno, nd_node_id(node));
-    ADD_INSN(seq, &dummy_line_node, nop);
+    ADD_SYNTHETIC_INSN(seq, loc->end_pos.lineno, node_id, nop);
 }
 
 #define ISEQ_LAST_LINE(iseq) (ISEQ_COMPILE_DATA(iseq)->last_line)
@@ -721,6 +722,129 @@ validate_labels(rb_iseq_t *iseq, st_table *labels_table)
     st_free_table(labels_table);
 }
 
+static NODE *
+get_nd_recv(const NODE *node)
+{
+    switch (nd_type(node)) {
+      case NODE_CALL:
+        return RNODE_CALL(node)->nd_recv;
+      case NODE_OPCALL:
+        return RNODE_OPCALL(node)->nd_recv;
+      case NODE_FCALL:
+        return 0;
+      case NODE_QCALL:
+        return RNODE_QCALL(node)->nd_recv;
+      case NODE_VCALL:
+        return 0;
+      case NODE_ATTRASGN:
+        return RNODE_ATTRASGN(node)->nd_recv;
+      case NODE_OP_ASGN1:
+        return RNODE_OP_ASGN1(node)->nd_recv;
+      case NODE_OP_ASGN2:
+        return RNODE_OP_ASGN2(node)->nd_recv;
+      default:
+        rb_bug("unexpected node: %s", ruby_node_name(nd_type(node)));
+    }
+}
+
+static ID
+get_node_call_nd_mid(const NODE *node)
+{
+    switch (nd_type(node)) {
+      case NODE_CALL:
+        return RNODE_CALL(node)->nd_mid;
+      case NODE_OPCALL:
+        return RNODE_OPCALL(node)->nd_mid;
+      case NODE_FCALL:
+        return RNODE_FCALL(node)->nd_mid;
+      case NODE_QCALL:
+        return RNODE_QCALL(node)->nd_mid;
+      case NODE_VCALL:
+        return RNODE_VCALL(node)->nd_mid;
+      case NODE_ATTRASGN:
+        return RNODE_ATTRASGN(node)->nd_mid;
+      default:
+        rb_bug("unexpected node: %s", ruby_node_name(nd_type(node)));
+    }
+}
+
+static NODE *
+get_nd_args(const NODE *node)
+{
+    switch (nd_type(node)) {
+      case NODE_CALL:
+        return RNODE_CALL(node)->nd_args;
+      case NODE_OPCALL:
+        return RNODE_OPCALL(node)->nd_args;
+      case NODE_FCALL:
+        return RNODE_FCALL(node)->nd_args;
+      case NODE_QCALL:
+        return RNODE_QCALL(node)->nd_args;
+      case NODE_VCALL:
+        return 0;
+      case NODE_ATTRASGN:
+        return RNODE_ATTRASGN(node)->nd_args;
+      default:
+        rb_bug("unexpected node: %s", ruby_node_name(nd_type(node)));
+    }
+}
+
+static ID
+get_node_colon_nd_mid(const NODE *node)
+{
+    switch (nd_type(node)) {
+      case NODE_COLON2:
+        return RNODE_COLON2(node)->nd_mid;
+      case NODE_COLON3:
+        return RNODE_COLON3(node)->nd_mid;
+      default:
+        rb_bug("unexpected node: %s", ruby_node_name(nd_type(node)));
+    }
+}
+
+static ID
+get_nd_vid(const NODE *node)
+{
+    switch (nd_type(node)) {
+      case NODE_LASGN:
+        return RNODE_LASGN(node)->nd_vid;
+      case NODE_DASGN:
+        return RNODE_DASGN(node)->nd_vid;
+      case NODE_IASGN:
+        return RNODE_IASGN(node)->nd_vid;
+      case NODE_CVASGN:
+        return RNODE_CVASGN(node)->nd_vid;
+      default:
+        rb_bug("unexpected node: %s", ruby_node_name(nd_type(node)));
+    }
+}
+
+static NODE *
+get_nd_value(const NODE *node)
+{
+    switch (nd_type(node)) {
+      case NODE_LASGN:
+        return RNODE_LASGN(node)->nd_value;
+      case NODE_DASGN:
+        return RNODE_DASGN(node)->nd_value;
+      default:
+        rb_bug("unexpected node: %s", ruby_node_name(nd_type(node)));
+    }
+}
+
+static VALUE
+get_string_value(const NODE *node)
+{
+    switch (nd_type(node)) {
+      case NODE_STR:
+        return rb_node_str_string_val(node);
+      case NODE_FILE:
+        return rb_node_file_path_val(node);
+      default:
+        rb_bug("unexpected node: %s", ruby_node_name(nd_type(node)));
+    }
+}
+
 VALUE
 rb_iseq_compile_callback(rb_iseq_t *iseq, const struct rb_iseq_new_with_callback_callback_func * ifunc)
 {
@@ -729,32 +853,29 @@ rb_iseq_compile_callback(rb_iseq_t *iseq, const struct rb_iseq_new_with_callback
 
     (*ifunc->func)(iseq, ret, ifunc->data);
 
-    NODE dummy_line_node = generate_dummy_line_node(ISEQ_COMPILE_DATA(iseq)->last_line, -1);
-    ADD_INSN(ret, &dummy_line_node, leave);
+    ADD_SYNTHETIC_INSN(ret, ISEQ_COMPILE_DATA(iseq)->last_line, -1, leave);
 
     CHECK(iseq_setup_insn(iseq, ret));
     return iseq_setup(iseq, ret);
 }
 
+static bool drop_unreachable_return(LINK_ANCHOR *ret);
+
 VALUE
 rb_iseq_compile_node(rb_iseq_t *iseq, const NODE *node)
 {
     DECL_ANCHOR(ret);
     INIT_ANCHOR(ret);
 
-    if (IMEMO_TYPE_P(node, imemo_ifunc)) {
-        rb_raise(rb_eArgError, "unexpected imemo_ifunc");
-    }
-
     if (node == 0) {
         NO_CHECK(COMPILE(ret, "nil", node));
-        iseq_set_local_table(iseq, 0);
+        iseq_set_local_table(iseq, 0, 0);
     }
     /* assume node is T_NODE */
     else if (nd_type_p(node, NODE_SCOPE)) {
         /* iseq type of top, method, class, block */
-        iseq_set_local_table(iseq, node->nd_tbl);
-        iseq_set_arguments(iseq, ret, node->nd_args);
+        iseq_set_local_table(iseq, RNODE_SCOPE(node)->nd_tbl, (NODE *)RNODE_SCOPE(node)->nd_args);
+        iseq_set_arguments(iseq, ret, (NODE *)RNODE_SCOPE(node)->nd_args);
 
         switch (ISEQ_BODY(iseq)->type) {
           case ISEQ_TYPE_BLOCK:
@@ -766,10 +887,9 @@ rb_iseq_compile_node(rb_iseq_t *iseq, const NODE *node)
                 end->rescued = LABEL_RESCUE_END;
 
                 ADD_TRACE(ret, RUBY_EVENT_B_CALL);
-                NODE dummy_line_node = generate_dummy_line_node(ISEQ_BODY(iseq)->location.first_lineno, -1);
-                ADD_INSN (ret, &dummy_line_node, nop);
+                ADD_SYNTHETIC_INSN(ret, ISEQ_BODY(iseq)->location.first_lineno, -1, nop);
                 ADD_LABEL(ret, start);
-                CHECK(COMPILE(ret, "block body", node->nd_body));
+                CHECK(COMPILE(ret, "block body", RNODE_SCOPE(node)->nd_body));
                 ADD_LABEL(ret, end);
                 ADD_TRACE(ret, RUBY_EVENT_B_RETURN);
                 ISEQ_COMPILE_DATA(iseq)->last_line = ISEQ_BODY(iseq)->location.code_location.end_pos.lineno;
@@ -782,23 +902,23 @@ rb_iseq_compile_node(rb_iseq_t *iseq, const NODE *node)
           case ISEQ_TYPE_CLASS:
             {
                 ADD_TRACE(ret, RUBY_EVENT_CLASS);
-                CHECK(COMPILE(ret, "scoped node", node->nd_body));
+                CHECK(COMPILE(ret, "scoped node", RNODE_SCOPE(node)->nd_body));
                 ADD_TRACE(ret, RUBY_EVENT_END);
                 ISEQ_COMPILE_DATA(iseq)->last_line = nd_line(node);
                 break;
             }
           case ISEQ_TYPE_METHOD:
             {
-                ISEQ_COMPILE_DATA(iseq)->root_node = node->nd_body;
+                ISEQ_COMPILE_DATA(iseq)->root_node = RNODE_SCOPE(node)->nd_body;
                 ADD_TRACE(ret, RUBY_EVENT_CALL);
-                CHECK(COMPILE(ret, "scoped node", node->nd_body));
-                ISEQ_COMPILE_DATA(iseq)->root_node = node->nd_body;
+                CHECK(COMPILE(ret, "scoped node", RNODE_SCOPE(node)->nd_body));
+                ISEQ_COMPILE_DATA(iseq)->root_node = RNODE_SCOPE(node)->nd_body;
                 ADD_TRACE(ret, RUBY_EVENT_RETURN);
                 ISEQ_COMPILE_DATA(iseq)->last_line = nd_line(node);
                 break;
             }
           default: {
-            CHECK(COMPILE(ret, "scoped node", node->nd_body));
+            CHECK(COMPILE(ret, "scoped node", RNODE_SCOPE(node)->nd_body));
             break;
           }
         }
@@ -840,9 +960,8 @@ rb_iseq_compile_node(rb_iseq_t *iseq, const NODE *node)
         ADD_GETLOCAL(ret, &dummy_line_node, LVAR_ERRINFO, 0);
         ADD_INSN1(ret, &dummy_line_node, throw, INT2FIX(0) /* continue throw */ );
     }
-    else {
-        NODE dummy_line_node = generate_dummy_line_node(ISEQ_COMPILE_DATA(iseq)->last_line, -1);
-        ADD_INSN(ret, &dummy_line_node, leave);
+    else if (!drop_unreachable_return(ret)) {
+        ADD_SYNTHETIC_INSN(ret, ISEQ_COMPILE_DATA(iseq)->last_line, -1, leave);
     }
 
 #if OPT_SUPPORT_JOKE
@@ -856,45 +975,6 @@ rb_iseq_compile_node(rb_iseq_t *iseq, const NODE *node)
     return iseq_setup(iseq, ret);
 }
 
-typedef struct yp_compile_context {
-    yp_parser_t *parser;
-    struct yp_compile_context *previous;
-    ID *constants;
-    st_table *index_lookup_table;
-} yp_compile_context_t;
-
-static VALUE rb_translate_yarp(rb_iseq_t *iseq, const yp_node_t *node, LINK_ANCHOR *const ret, yp_compile_context_t *compile_context);
-
-VALUE
-rb_iseq_compile_yarp_node(rb_iseq_t * iseq, const yp_node_t *yarp_pointer, yp_parser_t *parser)
-{
-    DECL_ANCHOR(ret);
-    INIT_ANCHOR(ret);
-
-    ID *constants = calloc(parser->constant_pool.size, sizeof(ID));
-    rb_encoding *encoding = rb_enc_find(parser->encoding.name);
-
-    for (size_t index = 0; index < parser->constant_pool.capacity; index++) {
-        yp_constant_t constant = parser->constant_pool.constants[index];
-
-        if (constant.id != 0) {
-            constants[constant.id - 1] = rb_intern3((const char *) constant.start, constant.length, encoding);
-        }
-    }
-
-    yp_compile_context_t compile_context = {
-        .parser = parser,
-        .previous = NULL,
-        .constants = constants
-    };
-
-    CHECK(rb_translate_yarp(iseq, yarp_pointer, ret, &compile_context));
-    free(constants);
-
-    CHECK(iseq_setup_insn(iseq, ret));
-    return iseq_setup(iseq, ret);
-}
-
 static int
 rb_iseq_translate_threaded_code(rb_iseq_t *iseq)
 {
@@ -911,6 +991,12 @@ rb_iseq_translate_threaded_code(rb_iseq_t *iseq)
     }
     FL_SET((VALUE)iseq, ISEQ_TRANSLATED);
 #endif
+
+#if USE_YJIT
+    rb_yjit_live_iseq_count++;
+    rb_yjit_iseq_alloc_count++;
+#endif
+
     return COMPILE_OK;
 }
 
@@ -1204,10 +1290,15 @@ static void
 APPEND_LIST(ISEQ_ARG_DECLARE LINK_ANCHOR *const anc1, LINK_ANCHOR *const anc2)
 {
     if (anc2->anchor.next) {
+        /* LINK_ANCHOR must not loop */
+        RUBY_ASSERT(anc2->last != &anc2->anchor);
         anc1->last->next = anc2->anchor.next;
         anc2->anchor.next->prev = anc1->last;
         anc1->last = anc2->last;
     }
+    else {
+        RUBY_ASSERT(anc2->last == &anc2->anchor);
+    }
     verify_list("append", anc1);
 }
 #if CPDEBUG < 0
@@ -1267,6 +1358,7 @@ new_label_body(rb_iseq_t *iseq, long line)
     labelobj->set = 0;
     labelobj->rescued = LABEL_RESCUE_NONE;
     labelobj->unremovable = 0;
+    labelobj->position = -1;
     return labelobj;
 }
 
@@ -1303,14 +1395,13 @@ iseq_insn_each_markable_object(INSN *insn, void (*func)(VALUE *, VALUE), VALUE d
 }
 
 static void
-iseq_insn_each_object_write_barrier(VALUE *obj_ptr, VALUE iseq)
+iseq_insn_each_object_write_barrier(VALUE * obj, VALUE iseq)
 {
-    RB_OBJ_WRITTEN(iseq, Qundef, *obj_ptr);
+    RB_OBJ_WRITTEN(iseq, Qundef, *obj);
 }
 
 static INSN *
-new_insn_core(rb_iseq_t *iseq, const NODE *line_node,
-              int insn_id, int argc, VALUE *argv)
+new_insn_core(rb_iseq_t *iseq, int line_no, int node_id, int insn_id, int argc, VALUE *argv)
 {
     INSN *iobj = compile_data_alloc_insn(iseq);
 
@@ -1319,8 +1410,8 @@ new_insn_core(rb_iseq_t *iseq, const NODE *line_node,
     iobj->link.type = ISEQ_ELEMENT_INSN;
     iobj->link.next = 0;
     iobj->insn_id = insn_id;
-    iobj->insn_info.line_no = nd_line(line_node);
-    iobj->insn_info.node_id = nd_node_id(line_node);
+    iobj->insn_info.line_no = line_no;
+    iobj->insn_info.node_id = node_id;
     iobj->insn_info.events = 0;
     iobj->operands = argv;
     iobj->operand_size = argc;
@@ -1332,7 +1423,7 @@ new_insn_core(rb_iseq_t *iseq, const NODE *line_node,
 }
 
 static INSN *
-new_insn_body(rb_iseq_t *iseq, const NODE *const line_node, enum ruby_vminsn_type insn_id, int argc, ...)
+new_insn_body(rb_iseq_t *iseq, int line_no, int node_id, enum ruby_vminsn_type insn_id, int argc, ...)
 {
     VALUE *operands = 0;
     va_list argv;
@@ -1346,7 +1437,7 @@ new_insn_body(rb_iseq_t *iseq, const NODE *const line_node, enum ruby_vminsn_typ
         }
         va_end(argv);
     }
-    return new_insn_core(iseq, line_node, insn_id, argc, operands);
+    return new_insn_core(iseq, line_no, node_id, insn_id, argc, operands);
 }
 
 static const struct rb_callinfo *
@@ -1354,16 +1445,16 @@ new_callinfo(rb_iseq_t *iseq, ID mid, int argc, unsigned int flag, struct rb_cal
 {
     VM_ASSERT(argc >= 0);
 
-    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) {
         flag |= VM_CALL_KWARG;
         argc += kw_arg->keyword_len;
     }
 
+    if (!(flag & (VM_CALL_ARGS_SPLAT | VM_CALL_ARGS_BLOCKARG | VM_CALL_KWARG | VM_CALL_KW_SPLAT | VM_CALL_FORWARDING))
+        && !has_blockiseq) {
+        flag |= VM_CALL_ARGS_SIMPLE;
+    }
+
     ISEQ_BODY(iseq)->ci_size++;
     const struct rb_callinfo *ci = vm_ci_new(mid, flag, argc, kw_arg);
     RB_OBJ_WRITTEN(iseq, Qundef, ci);
@@ -1371,7 +1462,7 @@ new_callinfo(rb_iseq_t *iseq, ID mid, int argc, unsigned int flag, struct rb_cal
 }
 
 static INSN *
-new_insn_send(rb_iseq_t *iseq, const NODE *const line_node, ID id, VALUE argc, const rb_iseq_t *blockiseq, VALUE flag, struct rb_callinfo_kwarg *keywords)
+new_insn_send(rb_iseq_t *iseq, int line_no, int node_id, ID id, VALUE argc, const rb_iseq_t *blockiseq, VALUE flag, struct rb_callinfo_kwarg *keywords)
 {
     VALUE *operands = compile_data_calloc2(iseq, sizeof(VALUE), 2);
     VALUE ci = (VALUE)new_callinfo(iseq, id, FIX2INT(argc), FIX2INT(flag), keywords, blockiseq != NULL);
@@ -1380,7 +1471,16 @@ new_insn_send(rb_iseq_t *iseq, const NODE *const line_node, ID id, VALUE argc, c
     if (blockiseq) {
         RB_OBJ_WRITTEN(iseq, Qundef, blockiseq);
     }
-    INSN *insn = new_insn_core(iseq, line_node, BIN(send), 2, operands);
+
+    INSN *insn;
+
+    if (vm_ci_flag((struct rb_callinfo *)ci) & VM_CALL_FORWARDING) {
+        insn = new_insn_core(iseq, line_no, node_id, BIN(sendforward), 2, operands);
+    }
+    else {
+        insn = new_insn_core(iseq, line_no, node_id, BIN(send), 2, operands);
+    }
+
     RB_OBJ_WRITTEN(iseq, Qundef, ci);
     RB_GC_GUARD(ci);
     return insn;
@@ -1391,20 +1491,16 @@ new_child_iseq(rb_iseq_t *iseq, const NODE *const node,
                VALUE name, const rb_iseq_t *parent, enum rb_iseq_type type, int line_no)
 {
     rb_iseq_t *ret_iseq;
-    rb_ast_body_t ast;
-
-    ast.root = node;
-    ast.frozen_string_literal = -1;
-    ast.coverage_enabled = -1;
-    ast.script_lines = ISEQ_BODY(iseq)->variable.script_lines;
+    VALUE ast_value = rb_ruby_ast_new(node);
 
     debugs("[new_child_iseq]> ---------------------------------------\n");
     int isolated_depth = ISEQ_COMPILE_DATA(iseq)->isolated_depth;
-    ret_iseq = rb_iseq_new_with_opt(&ast, name,
+    ret_iseq = rb_iseq_new_with_opt(ast_value, name,
                                     rb_iseq_path(iseq), rb_iseq_realpath(iseq),
                                     line_no, parent,
                                     isolated_depth ? isolated_depth + 1 : 0,
-                                    type, ISEQ_COMPILE_DATA(iseq)->option);
+                                    type, ISEQ_COMPILE_DATA(iseq)->option,
+                                    ISEQ_BODY(iseq)->variable.script_lines);
     debugs("[new_child_iseq]< ---------------------------------------\n");
     return ret_iseq;
 }
@@ -1499,14 +1595,15 @@ iseq_insert_nop_between_end_and_cont(rb_iseq_t *iseq)
 
             for (e = end; e && (IS_LABEL(e) || IS_TRACE(e)); e = e->next) {
                 if (e == cont) {
-                    NODE dummy_line_node = generate_dummy_line_node(0, -1);
-                    INSN *nop = new_insn_core(iseq, &dummy_line_node, BIN(nop), 0, 0);
+                    INSN *nop = new_insn_core(iseq, 0, -1, BIN(nop), 0, 0);
                     ELEM_INSERT_NEXT(end, &nop->link);
                     break;
                 }
             }
         }
     }
+
+    RB_GC_GUARD(catch_table_ary);
 }
 
 static int
@@ -1703,7 +1800,7 @@ access_outer_variables(const rb_iseq_t *iseq, int level, ID id, bool write)
             COMPILE_ERROR(iseq, ISEQ_LAST_LINE(iseq), "can not yield from isolated Proc");
         }
         else {
-            COMPILE_ERROR(iseq, ISEQ_LAST_LINE(iseq), "can not access variable `%s' from isolated Proc", rb_id2name(id));
+            COMPILE_ERROR(iseq, ISEQ_LAST_LINE(iseq), "can not access variable '%s' from isolated Proc", rb_id2name(id));
         }
     }
 
@@ -1808,7 +1905,7 @@ static int
 iseq_set_arguments_keywords(rb_iseq_t *iseq, LINK_ANCHOR *const optargs,
                             const struct rb_args_info *args, int arg_size)
 {
-    const NODE *node = args->kw_args;
+    const rb_node_kw_arg_t *node = args->kw_args;
     struct rb_iseq_constant_body *const body = ISEQ_BODY(iseq);
     struct rb_iseq_param_keyword *keyword;
     const VALUE default_values = rb_ary_hidden_new(1);
@@ -1827,7 +1924,7 @@ iseq_set_arguments_keywords(rb_iseq_t *iseq, LINK_ANCHOR *const optargs,
 
     node = args->kw_args;
     while (node) {
-        const NODE *val_node = node->nd_body->nd_value;
+        const NODE *val_node = get_nd_value(node->nd_body);
         VALUE dv;
 
         if (val_node == NODE_SPECIAL_REQUIRED_KEYWORD) {
@@ -1835,8 +1932,29 @@ iseq_set_arguments_keywords(rb_iseq_t *iseq, LINK_ANCHOR *const optargs,
         }
         else {
             switch (nd_type(val_node)) {
-              case NODE_LIT:
-                dv = val_node->nd_lit;
+              case NODE_SYM:
+                dv = rb_node_sym_string_val(val_node);
+                break;
+              case NODE_REGX:
+                dv = rb_node_regx_string_val(val_node);
+                break;
+              case NODE_LINE:
+                dv = rb_node_line_lineno_val(val_node);
+                break;
+              case NODE_INTEGER:
+                dv = rb_node_integer_literal_val(val_node);
+                break;
+              case NODE_FLOAT:
+                dv = rb_node_float_literal_val(val_node);
+                break;
+              case NODE_RATIONAL:
+                dv = rb_node_rational_literal_val(val_node);
+                break;
+              case NODE_IMAGINARY:
+                dv = rb_node_imaginary_literal_val(val_node);
+                break;
+              case NODE_ENCODING:
+                dv = rb_node_encoding_val(val_node);
                 break;
               case NODE_NIL:
                 dv = Qnil;
@@ -1848,7 +1966,7 @@ iseq_set_arguments_keywords(rb_iseq_t *iseq, LINK_ANCHOR *const optargs,
                 dv = Qfalse;
                 break;
               default:
-                NO_CHECK(COMPILE_POPPED(optargs, "kwarg", node)); /* nd_type_p(node, NODE_KW_ARG) */
+                NO_CHECK(COMPILE_POPPED(optargs, "kwarg", RNODE(node))); /* nd_type_p(node, NODE_KW_ARG) */
                 dv = complex_mark;
             }
 
@@ -1861,23 +1979,23 @@ iseq_set_arguments_keywords(rb_iseq_t *iseq, LINK_ANCHOR *const optargs,
 
     keyword->num = kw;
 
-    if (args->kw_rest_arg->nd_vid != 0) {
+    if (RNODE_DVAR(args->kw_rest_arg)->nd_vid != 0) {
+        ID kw_id = ISEQ_BODY(iseq)->local_table[arg_size];
         keyword->rest_start = arg_size++;
         body->param.flags.has_kwrest = TRUE;
+
+        if (kw_id == idPow) body->param.flags.anon_kwrest = TRUE;
     }
     keyword->required_num = rkw;
     keyword->table = &body->local_table[keyword->bits_start - keyword->num];
 
-    {
+    if (RARRAY_LEN(default_values)) {
         VALUE *dvs = ALLOC_N(VALUE, RARRAY_LEN(default_values));
 
         for (i = 0; i < RARRAY_LEN(default_values); i++) {
             VALUE dv = RARRAY_AREF(default_values, i);
             if (dv == complex_mark) dv = Qundef;
-            if (!SPECIAL_CONST_P(dv)) {
-                RB_OBJ_WRITTEN(iseq, Qundef, dv);
-            }
-            dvs[i] = dv;
+            RB_OBJ_WRITE(iseq, &dvs[i], dv);
         }
 
         keyword->default_values = dvs;
@@ -1885,6 +2003,22 @@ iseq_set_arguments_keywords(rb_iseq_t *iseq, LINK_ANCHOR *const optargs,
     return arg_size;
 }
 
+static void
+iseq_set_use_block(rb_iseq_t *iseq)
+{
+    struct rb_iseq_constant_body *const body = ISEQ_BODY(iseq);
+    if (!body->param.flags.use_block) {
+        body->param.flags.use_block = 1;
+
+        rb_vm_t *vm = GET_VM();
+
+        if (!rb_warning_category_enabled_p(RB_WARN_CATEGORY_STRICT_UNUSED_BLOCK)) {
+            st_data_t key = (st_data_t)rb_intern_str(body->location.label); // String -> ID
+            set_insert(vm->unused_block_warning_table, key);
+        }
+    }
+}
+
 static int
 iseq_set_arguments(rb_iseq_t *iseq, LINK_ANCHOR *const optargs, const NODE *const node_args)
 {
@@ -1892,7 +2026,7 @@ iseq_set_arguments(rb_iseq_t *iseq, LINK_ANCHOR *const optargs, const NODE *cons
 
     if (node_args) {
         struct rb_iseq_constant_body *const body = ISEQ_BODY(iseq);
-        struct rb_args_info *args = node_args->nd_ainfo;
+        struct rb_args_info *args = &RNODE_ARGS(node_args)->nd_ainfo;
         ID rest_id = 0;
         int last_comma = 0;
         ID block_id = 0;
@@ -1912,15 +2046,22 @@ iseq_set_arguments(rb_iseq_t *iseq, LINK_ANCHOR *const optargs, const NODE *cons
         }
         block_id = args->block_arg;
 
+        bool optimized_forward = (args->forwarding && args->pre_args_num == 0 && !args->opt_args);
+
+        if (optimized_forward) {
+            rest_id = 0;
+            block_id = 0;
+        }
+
         if (args->opt_args) {
-            const NODE *node = args->opt_args;
+            const rb_node_opt_arg_t *node = args->opt_args;
             LABEL *label;
             VALUE labels = rb_ary_hidden_new(1);
             VALUE *opt_table;
             int i = 0, j;
 
             while (node) {
-                label = NEW_LABEL(nd_line(node));
+                label = NEW_LABEL(nd_line(RNODE(node)));
                 rb_ary_push(labels, (VALUE)label | 1);
                 ADD_LABEL(optargs, label);
                 NO_CHECK(COMPILE_POPPED(optargs, "optarg", node->nd_body));
@@ -1950,7 +2091,8 @@ iseq_set_arguments(rb_iseq_t *iseq, LINK_ANCHOR *const optargs, const NODE *cons
         if (rest_id) {
             body->param.rest_start = arg_size++;
             body->param.flags.has_rest = TRUE;
-            assert(body->param.rest_start != -1);
+            if (rest_id == '*') body->param.flags.anon_rest = TRUE;
+            RUBY_ASSERT(body->param.rest_start != -1);
         }
 
         if (args->first_post_arg) {
@@ -1967,11 +2109,16 @@ iseq_set_arguments(rb_iseq_t *iseq, LINK_ANCHOR *const optargs, const NODE *cons
         if (args->kw_args) {
             arg_size = iseq_set_arguments_keywords(iseq, optargs, args, arg_size);
         }
-        else if (args->kw_rest_arg) {
+        else if (args->kw_rest_arg && !optimized_forward) {
+            ID kw_id = ISEQ_BODY(iseq)->local_table[arg_size];
             struct rb_iseq_param_keyword *keyword = ZALLOC_N(struct rb_iseq_param_keyword, 1);
             keyword->rest_start = arg_size++;
             body->param.keyword = keyword;
             body->param.flags.has_kwrest = TRUE;
+
+            static ID anon_kwrest = 0;
+            if (!anon_kwrest) anon_kwrest = rb_intern("**");
+            if (kw_id == anon_kwrest) body->param.flags.anon_kwrest = TRUE;
         }
         else if (args->no_kwarg) {
             body->param.flags.accepts_no_kwarg = TRUE;
@@ -1980,6 +2127,14 @@ iseq_set_arguments(rb_iseq_t *iseq, LINK_ANCHOR *const optargs, const NODE *cons
         if (block_id) {
             body->param.block_start = arg_size++;
             body->param.flags.has_block = TRUE;
+            iseq_set_use_block(iseq);
+        }
+
+        // Only optimize specifically methods like this: `foo(...)`
+        if (optimized_forward) {
+            body->param.flags.use_block = 1;
+            body->param.flags.forwardable = TRUE;
+            arg_size = 1;
         }
 
         iseq_calc_param_size(iseq);
@@ -2011,13 +2166,27 @@ iseq_set_arguments(rb_iseq_t *iseq, LINK_ANCHOR *const optargs, const NODE *cons
 }
 
 static int
-iseq_set_local_table(rb_iseq_t *iseq, const rb_ast_id_table_t *tbl)
+iseq_set_local_table(rb_iseq_t *iseq, const rb_ast_id_table_t *tbl, const NODE *const node_args)
 {
     unsigned int size = tbl ? tbl->size : 0;
+    unsigned int offset = 0;
+
+    if (node_args) {
+        struct rb_args_info *args = &RNODE_ARGS(node_args)->nd_ainfo;
+
+        // If we have a function that only has `...` as the parameter,
+        // then its local table should only be `...`
+        // FIXME: I think this should be fixed in the AST rather than special case here.
+        if (args->forwarding && args->pre_args_num == 0 && !args->opt_args) {
+            CHECK(size >= 3);
+            size -= 3;
+            offset += 3;
+        }
+    }
 
     if (size > 0) {
-        ID *ids = (ID *)ALLOC_N(ID, size);
-        MEMCPY(ids, tbl->ids, ID, size);
+        ID *ids = ALLOC_N(ID, size);
+        MEMCPY(ids, tbl->ids + offset, ID, size);
         ISEQ_BODY(iseq)->local_table = ids;
     }
     ISEQ_BODY(iseq)->local_table_size = size;
@@ -2301,6 +2470,7 @@ add_adjust_info(struct iseq_insn_info_entry *insns_info, unsigned int *positions
                 int insns_info_index, int code_index, const ADJUST *adjust)
 {
     insns_info[insns_info_index].line_no    = adjust->line_no;
+    insns_info[insns_info_index].node_id    = -1;
     insns_info[insns_info_index].events     = 0;
     positions[insns_info_index]             = code_index;
     return TRUE;
@@ -2312,7 +2482,7 @@ array_to_idlist(VALUE arr)
     RUBY_ASSERT(RB_TYPE_P(arr, T_ARRAY));
     long size = RARRAY_LEN(arr);
     ID *ids = (ID *)ALLOC_N(ID, size + 1);
-    for (int i = 0; i < size; i++) {
+    for (long i = 0; i < size; i++) {
         VALUE sym = RARRAY_AREF(arr, i);
         ids[i] = SYM2ID(sym);
     }
@@ -2421,8 +2591,19 @@ iseq_set_sequence(rb_iseq_t *iseq, LINK_ANCHOR *const anchor)
     generated_iseq = ALLOC_N(VALUE, code_index);
     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, ISEQ_IS_SIZE(body));
-    body->call_data = ZALLOC_N(struct rb_call_data, body->ci_size);
+    if (ISEQ_IS_SIZE(body)) {
+        body->is_entries = ZALLOC_N(union iseq_inline_storage_entry, ISEQ_IS_SIZE(body));
+    }
+    else {
+        body->is_entries = NULL;
+    }
+
+    if (body->ci_size) {
+        body->call_data = ZALLOC_N(struct rb_call_data, body->ci_size);
+    }
+    else {
+        body->call_data = NULL;
+    }
     ISEQ_COMPILE_DATA(iseq)->ci_index = 0;
 
     // Calculate the bitmask buffer size.
@@ -2433,16 +2614,21 @@ iseq_set_sequence(rb_iseq_t *iseq, LINK_ANCHOR *const anchor)
     iseq_bits_t * mark_offset_bits;
     int code_size = code_index;
 
-    iseq_bits_t tmp[1] = {0};
     bool needs_bitmap = false;
 
     if (ISEQ_MBITS_BUFLEN(code_index) == 1) {
-        mark_offset_bits = tmp;
+        mark_offset_bits = &ISEQ_COMPILE_DATA(iseq)->mark_bits.single;
+        ISEQ_COMPILE_DATA(iseq)->is_single_mark_bit = true;
     }
     else {
         mark_offset_bits = ZALLOC_N(iseq_bits_t, ISEQ_MBITS_BUFLEN(code_index));
+        ISEQ_COMPILE_DATA(iseq)->mark_bits.list = mark_offset_bits;
+        ISEQ_COMPILE_DATA(iseq)->is_single_mark_bit = false;
     }
 
+    ISEQ_COMPILE_DATA(iseq)->iseq_encoded = (void *)generated_iseq;
+    ISEQ_COMPILE_DATA(iseq)->iseq_size = code_index;
+
     list = FIRST_ELEMENT(anchor);
     insns_info_index = code_index = sp = 0;
 
@@ -2557,11 +2743,11 @@ iseq_set_sequence(rb_iseq_t *iseq, LINK_ANCHOR *const anchor)
 
                             break;
                         }
-                        case TS_CALLDATA:
+                      case TS_CALLDATA:
                         {
                             const struct rb_callinfo *source_ci = (const struct rb_callinfo *)operands[j];
+                            RUBY_ASSERT(ISEQ_COMPILE_DATA(iseq)->ci_index <= body->ci_size);
                             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;
@@ -2653,15 +2839,16 @@ iseq_set_sequence(rb_iseq_t *iseq, LINK_ANCHOR *const anchor)
     body->iseq_size = code_index;
     body->stack_max = stack_max;
 
-    if (ISEQ_MBITS_BUFLEN(body->iseq_size) == 1) {
-        body->mark_bits.single = mark_offset_bits[0];
+    if (ISEQ_COMPILE_DATA(iseq)->is_single_mark_bit) {
+        body->mark_bits.single = ISEQ_COMPILE_DATA(iseq)->mark_bits.single;
     }
     else {
         if (needs_bitmap) {
             body->mark_bits.list = mark_offset_bits;
         }
         else {
-            body->mark_bits.list = 0;
+            body->mark_bits.list = NULL;
+            ISEQ_COMPILE_DATA(iseq)->mark_bits.list = NULL;
             ruby_xfree(mark_offset_bits);
         }
     }
@@ -2699,20 +2886,27 @@ iseq_set_exception_table(rb_iseq_t *iseq)
     struct iseq_catch_table_entry *entry;
 
     ISEQ_BODY(iseq)->catch_table = NULL;
-    if (NIL_P(ISEQ_COMPILE_DATA(iseq)->catch_table_ary)) return COMPILE_OK;
-    tlen = (int)RARRAY_LEN(ISEQ_COMPILE_DATA(iseq)->catch_table_ary);
-    tptr = RARRAY_CONST_PTR(ISEQ_COMPILE_DATA(iseq)->catch_table_ary);
+
+    VALUE catch_table_ary = ISEQ_COMPILE_DATA(iseq)->catch_table_ary;
+    if (NIL_P(catch_table_ary)) return COMPILE_OK;
+    tlen = (int)RARRAY_LEN(catch_table_ary);
+    tptr = RARRAY_CONST_PTR(catch_table_ary);
 
     if (tlen > 0) {
         struct iseq_catch_table *table = xmalloc(iseq_catch_table_bytes(tlen));
         table->size = tlen;
 
         for (i = 0; i < table->size; i++) {
+            int pos;
             ptr = RARRAY_CONST_PTR(tptr[i]);
             entry = UNALIGNED_MEMBER_PTR(table, entries[i]);
             entry->type = (enum rb_catch_type)(ptr[0] & 0xffff);
-            entry->start = label_get_position((LABEL *)(ptr[1] & ~1));
-            entry->end = label_get_position((LABEL *)(ptr[2] & ~1));
+            pos = label_get_position((LABEL *)(ptr[1] & ~1));
+            RUBY_ASSERT(pos >= 0);
+            entry->start = (unsigned int)pos;
+            pos = label_get_position((LABEL *)(ptr[2] & ~1));
+            RUBY_ASSERT(pos >= 0);
+            entry->end = (unsigned int)pos;
             entry->iseq = (rb_iseq_t *)ptr[3];
             RB_OBJ_WRITTEN(iseq, Qundef, entry->iseq);
 
@@ -2726,6 +2920,7 @@ iseq_set_exception_table(rb_iseq_t *iseq)
                 if (entry->type == CATCH_TYPE_RESCUE ||
                     entry->type == CATCH_TYPE_BREAK ||
                     entry->type == CATCH_TYPE_NEXT) {
+                    RUBY_ASSERT(entry->sp > 0);
                     entry->sp--;
                 }
             }
@@ -2737,6 +2932,8 @@ iseq_set_exception_table(rb_iseq_t *iseq)
         RB_OBJ_WRITE(iseq, &ISEQ_COMPILE_DATA(iseq)->catch_table_ary, 0); /* free */
     }
 
+    RB_GC_GUARD(catch_table_ary);
+
     return COMPILE_OK;
 }
 
@@ -2833,16 +3030,18 @@ unref_destination(INSN *iobj, int pos)
     if (!lobj->refcnt) ELEM_REMOVE(&lobj->link);
 }
 
-static void
+static bool
 replace_destination(INSN *dobj, INSN *nobj)
 {
     VALUE n = OPERAND_AT(nobj, 0);
     LABEL *dl = (LABEL *)OPERAND_AT(dobj, 0);
     LABEL *nl = (LABEL *)n;
+    if (dl == nl) return false;
     --dl->refcnt;
     ++nl->refcnt;
     OPERAND_AT(dobj, 0) = n;
     if (!dl->refcnt) ELEM_REMOVE(&dl->link);
+    return true;
 }
 
 static LABEL*
@@ -2875,7 +3074,6 @@ remove_unreachable_chunk(rb_iseq_t *iseq, LINK_ELEMENT *i)
                 break;
             }
             else if ((lab = find_destination((INSN *)i)) != 0) {
-                if (lab->unremovable) break;
                 unref_counts[lab->label_no]++;
             }
         }
@@ -2892,8 +3090,7 @@ remove_unreachable_chunk(rb_iseq_t *iseq, LINK_ELEMENT *i)
             /* do nothing */
         }
         else if (IS_ADJUST(i)) {
-            LABEL *dest = ((ADJUST *)i)->label;
-            if (dest && dest->unremovable) return 0;
+            return 0;
         }
         end = i;
     } while ((i = i->next) != 0);
@@ -2938,7 +3135,7 @@ iseq_pop_newarray(rb_iseq_t *iseq, INSN *iobj)
 static int
 is_frozen_putstring(INSN *insn, VALUE *op)
 {
-    if (IS_INSN_ID(insn, putstring)) {
+    if (IS_INSN_ID(insn, putstring) || IS_INSN_ID(insn, putchilledstring)) {
         *op = OPERAND_AT(insn, 0);
         return 1;
     }
@@ -2980,6 +3177,7 @@ optimize_checktype(rb_iseq_t *iseq, INSN *iobj)
 
     switch (INSN_OF(iobj)) {
       case BIN(putstring):
+      case BIN(putchilledstring):
         type = INT2FIX(T_STRING);
         break;
       case BIN(putnil):
@@ -3020,7 +3218,6 @@ optimize_checktype(rb_iseq_t *iseq, INSN *iobj)
     }
     line = ciobj->insn_info.line_no;
     node_id = ciobj->insn_info.node_id;
-    NODE dummy_line_node = generate_dummy_line_node(line, node_id);
     if (!dest) {
         if (niobj->link.next && IS_LABEL(niobj->link.next)) {
             dest = (LABEL *)niobj->link.next; /* reuse label */
@@ -3030,9 +3227,9 @@ optimize_checktype(rb_iseq_t *iseq, INSN *iobj)
             ELEM_INSERT_NEXT(&niobj->link, &dest->link);
         }
     }
-    INSERT_AFTER_INSN1(iobj, &dummy_line_node, jump, dest);
+    INSERT_AFTER_INSN1(iobj, line, node_id, jump, dest);
     LABEL_REF(dest);
-    if (!dup) INSERT_AFTER_INSN(iobj, &dummy_line_node, pop);
+    if (!dup) INSERT_AFTER_INSN(iobj, line, node_id, pop);
     return TRUE;
 }
 
@@ -3058,6 +3255,8 @@ ci_argc_set(const rb_iseq_t *iseq, const struct rb_callinfo *ci, int argc)
     return nci;
 }
 
+#define vm_ci_simple(ci) (vm_ci_flag(ci) & VM_CALL_ARGS_SIMPLE)
+
 static int
 iseq_peephole_optimize(rb_iseq_t *iseq, LINK_ELEMENT *list, const int do_tailcallopt)
 {
@@ -3096,9 +3295,10 @@ iseq_peephole_optimize(rb_iseq_t *iseq, LINK_ELEMENT *list, const int do_tailcal
              *   => in this case, first jump instruction should jump to
              *      LABEL2 directly
              */
-            replace_destination(iobj, diobj);
-            remove_unreachable_chunk(iseq, iobj->link.next);
-            goto again;
+            if (replace_destination(iobj, diobj)) {
+                remove_unreachable_chunk(iseq, iobj->link.next);
+                goto again;
+            }
         }
         else if (IS_INSN_ID(diobj, leave)) {
             /*
@@ -3143,8 +3343,7 @@ iseq_peephole_optimize(rb_iseq_t *iseq, LINK_ELEMENT *list, const int do_tailcal
                  */
                 piobj->insn_id = (IS_INSN_ID(piobj, branchif))
                   ? BIN(branchunless) : BIN(branchif);
-                replace_destination(piobj, iobj);
-                if (refcnt <= 1) {
+                if (replace_destination(piobj, iobj) && refcnt <= 1) {
                     ELEM_REMOVE(&iobj->link);
                 }
                 else {
@@ -3166,8 +3365,7 @@ iseq_peephole_optimize(rb_iseq_t *iseq, LINK_ELEMENT *list, const int do_tailcal
                  *   pop
                  *   jump L1
                  */
-                NODE dummy_line_node = generate_dummy_line_node(iobj->insn_info.line_no, iobj->insn_info.node_id);
-                INSN *popiobj = new_insn_core(iseq, &dummy_line_node, BIN(pop), 0, 0);
+                INSN *popiobj = new_insn_core(iseq, iobj->insn_info.line_no, iobj->insn_info.node_id, BIN(pop), 0, 0);
                 ELEM_REPLACE(&piobj->link, &popiobj->link);
             }
         }
@@ -3212,19 +3410,117 @@ iseq_peephole_optimize(rb_iseq_t *iseq, LINK_ELEMENT *list, const int do_tailcal
     /*
      *  ...
      *  duparray [...]
-     *  concatarray
+     *  concatarray | concattoarray
      * =>
      *  ...
      *  putobject [...]
-     *  concatarray
+     *  concatarray | concattoarray
      */
     if (IS_INSN_ID(iobj, duparray)) {
         LINK_ELEMENT *next = iobj->link.next;
-        if (IS_INSN(next) && IS_INSN_ID(next, concatarray)) {
+        if (IS_INSN(next) && (IS_INSN_ID(next, concatarray) || IS_INSN_ID(next, concattoarray))) {
             iobj->insn_id = BIN(putobject);
         }
     }
 
+    /*
+     * duparray [...]
+     * send     <calldata!mid:freeze, argc:0, ARGS_SIMPLE>, nil
+     * =>
+     * opt_ary_freeze [...], <calldata!mid:freeze, argc:0, ARGS_SIMPLE>
+     */
+    if (IS_INSN_ID(iobj, duparray)) {
+        LINK_ELEMENT *next = iobj->link.next;
+        if (IS_INSN(next) && (IS_INSN_ID(next, send))) {
+            const struct rb_callinfo *ci = (struct rb_callinfo *)OPERAND_AT(next, 0);
+            const rb_iseq_t *blockiseq = (rb_iseq_t *)OPERAND_AT(next, 1);
+
+            if (vm_ci_simple(ci) && vm_ci_argc(ci) == 0 && blockiseq == NULL && vm_ci_mid(ci) == idFreeze) {
+                VALUE ary = iobj->operands[0];
+                rb_obj_reveal(ary, rb_cArray);
+
+                iobj->insn_id = BIN(opt_ary_freeze);
+                iobj->operand_size = 2;
+                iobj->operands = compile_data_calloc2(iseq, iobj->operand_size, sizeof(VALUE));
+                iobj->operands[0] = ary;
+                iobj->operands[1] = (VALUE)ci;
+                ELEM_REMOVE(next);
+            }
+        }
+    }
+
+    /*
+     * duphash {...}
+     * send     <calldata!mid:freeze, argc:0, ARGS_SIMPLE>, nil
+     * =>
+     * opt_hash_freeze {...}, <calldata!mid:freeze, argc:0, ARGS_SIMPLE>
+     */
+    if (IS_INSN_ID(iobj, duphash)) {
+        LINK_ELEMENT *next = iobj->link.next;
+        if (IS_INSN(next) && (IS_INSN_ID(next, send))) {
+            const struct rb_callinfo *ci = (struct rb_callinfo *)OPERAND_AT(next, 0);
+            const rb_iseq_t *blockiseq = (rb_iseq_t *)OPERAND_AT(next, 1);
+
+            if (vm_ci_simple(ci) && vm_ci_argc(ci) == 0 && blockiseq == NULL && vm_ci_mid(ci) == idFreeze) {
+                VALUE hash = iobj->operands[0];
+                rb_obj_reveal(hash, rb_cHash);
+
+                iobj->insn_id = BIN(opt_hash_freeze);
+                iobj->operand_size = 2;
+                iobj->operands = compile_data_calloc2(iseq, iobj->operand_size, sizeof(VALUE));
+                iobj->operands[0] = hash;
+                iobj->operands[1] = (VALUE)ci;
+                ELEM_REMOVE(next);
+            }
+        }
+    }
+
+    /*
+     * newarray 0
+     * send     <calldata!mid:freeze, argc:0, ARGS_SIMPLE>, nil
+     * =>
+     * opt_ary_freeze [], <calldata!mid:freeze, argc:0, ARGS_SIMPLE>
+     */
+    if (IS_INSN_ID(iobj, newarray) && iobj->operands[0] == INT2FIX(0)) {
+        LINK_ELEMENT *next = iobj->link.next;
+        if (IS_INSN(next) && (IS_INSN_ID(next, send))) {
+            const struct rb_callinfo *ci = (struct rb_callinfo *)OPERAND_AT(next, 0);
+            const rb_iseq_t *blockiseq = (rb_iseq_t *)OPERAND_AT(next, 1);
+
+            if (vm_ci_simple(ci) && vm_ci_argc(ci) == 0 && blockiseq == NULL && vm_ci_mid(ci) == idFreeze) {
+                iobj->insn_id = BIN(opt_ary_freeze);
+                iobj->operand_size = 2;
+                iobj->operands = compile_data_calloc2(iseq, iobj->operand_size, sizeof(VALUE));
+                RB_OBJ_WRITE(iseq, &iobj->operands[0], rb_cArray_empty_frozen);
+                iobj->operands[1] = (VALUE)ci;
+                ELEM_REMOVE(next);
+            }
+        }
+    }
+
+    /*
+     * newhash 0
+     * send     <calldata!mid:freeze, argc:0, ARGS_SIMPLE>, nil
+     * =>
+     * opt_hash_freeze {}, <calldata!mid:freeze, argc:0, ARGS_SIMPLE>
+     */
+    if (IS_INSN_ID(iobj, newhash) && iobj->operands[0] == INT2FIX(0)) {
+        LINK_ELEMENT *next = iobj->link.next;
+        if (IS_INSN(next) && (IS_INSN_ID(next, send))) {
+            const struct rb_callinfo *ci = (struct rb_callinfo *)OPERAND_AT(next, 0);
+            const rb_iseq_t *blockiseq = (rb_iseq_t *)OPERAND_AT(next, 1);
+
+            if (vm_ci_simple(ci) && vm_ci_argc(ci) == 0 && blockiseq == NULL && vm_ci_mid(ci) == idFreeze) {
+                iobj->insn_id = BIN(opt_hash_freeze);
+                iobj->operand_size = 2;
+                iobj->operands = compile_data_calloc2(iseq, iobj->operand_size, sizeof(VALUE));
+                RB_OBJ_WRITE(iseq, &iobj->operands[0], rb_cHash_empty_frozen);
+                iobj->operands[1] = (VALUE)ci;
+                ELEM_REMOVE(next);
+            }
+        }
+    }
+
     if (IS_INSN_ID(iobj, branchif) ||
         IS_INSN_ID(iobj, branchnil) ||
         IS_INSN_ID(iobj, branchunless)) {
@@ -3274,7 +3570,7 @@ iseq_peephole_optimize(rb_iseq_t *iseq, LINK_ELEMENT *list, const int do_tailcal
 
             for (;;) {
                 if (IS_INSN(&nobj->link) && IS_INSN_ID(nobj, jump)) {
-                    replace_destination(iobj, nobj);
+                    if (!replace_destination(iobj, nobj)) break;
                 }
                 else if (prev_dup && IS_INSN_ID(nobj, dup) &&
                          !!(nobj = (INSN *)nobj->link.next) &&
@@ -3295,7 +3591,7 @@ iseq_peephole_optimize(rb_iseq_t *iseq, LINK_ELEMENT *list, const int do_tailcal
                      *   dup
                      *   if L2
                      */
-                    replace_destination(iobj, nobj);
+                    if (!replace_destination(iobj, nobj)) break;
                 }
                 else if (pobj) {
                     /*
@@ -3346,14 +3642,12 @@ iseq_peephole_optimize(rb_iseq_t *iseq, LINK_ELEMENT *list, const int do_tailcal
                         ELEM_REMOVE(iobj->link.prev);
                     }
                     else if (!iseq_pop_newarray(iseq, pobj)) {
-                        NODE dummy_line_node = generate_dummy_line_node(pobj->insn_info.line_no, pobj->insn_info.node_id);
-                        pobj = new_insn_core(iseq, &dummy_line_node, BIN(pop), 0, NULL);
+                        pobj = new_insn_core(iseq, pobj->insn_info.line_no, pobj->insn_info.node_id, BIN(pop), 0, NULL);
                         ELEM_INSERT_PREV(&iobj->link, &pobj->link);
                     }
                     if (cond) {
                         if (prev_dup) {
-                            NODE dummy_line_node = generate_dummy_line_node(pobj->insn_info.line_no, pobj->insn_info.node_id);
-                            pobj = new_insn_core(iseq, &dummy_line_node, BIN(putnil), 0, NULL);
+                            pobj = new_insn_core(iseq, pobj->insn_info.line_no, pobj->insn_info.node_id, BIN(putnil), 0, NULL);
                             ELEM_INSERT_NEXT(&iobj->link, &pobj->link);
                         }
                         iobj->insn_id = BIN(jump);
@@ -3383,6 +3677,7 @@ iseq_peephole_optimize(rb_iseq_t *iseq, LINK_ELEMENT *list, const int do_tailcal
             enum ruby_vminsn_type previ = ((INSN *)prev)->insn_id;
             if (previ == BIN(putobject) || previ == BIN(putnil) ||
                 previ == BIN(putself) || previ == BIN(putstring) ||
+                previ == BIN(putchilledstring) ||
                 previ == BIN(dup) ||
                 previ == BIN(getlocal) ||
                 previ == BIN(getblockparam) ||
@@ -3399,8 +3694,7 @@ iseq_peephole_optimize(rb_iseq_t *iseq, LINK_ELEMENT *list, const int do_tailcal
             }
             else if (previ == BIN(concatarray)) {
                 INSN *piobj = (INSN *)prev;
-                NODE dummy_line_node = generate_dummy_line_node(piobj->insn_info.line_no, piobj->insn_info.node_id);
-                INSERT_BEFORE_INSN1(piobj, &dummy_line_node, splatarray, Qfalse);
+                INSERT_BEFORE_INSN1(piobj, piobj->insn_info.line_no, piobj->insn_info.node_id, splatarray, Qfalse);
                 INSN_OF(piobj) = BIN(pop);
             }
             else if (previ == BIN(concatstrings)) {
@@ -3417,7 +3711,6 @@ iseq_peephole_optimize(rb_iseq_t *iseq, LINK_ELEMENT *list, const int do_tailcal
 
     if (IS_INSN_ID(iobj, newarray) ||
         IS_INSN_ID(iobj, duparray) ||
-        IS_INSN_ID(iobj, expandarray) ||
         IS_INSN_ID(iobj, concatarray) ||
         IS_INSN_ID(iobj, splatarray) ||
         0) {
@@ -3466,7 +3759,6 @@ iseq_peephole_optimize(rb_iseq_t *iseq, LINK_ELEMENT *list, const int do_tailcal
                 }
             }
             else {
-                NODE dummy_line_node = generate_dummy_line_node(iobj->insn_info.line_no, iobj->insn_info.node_id);
                 long diff = FIX2LONG(op1) - FIX2LONG(op2);
                 INSN_OF(iobj) = BIN(opt_reverse);
                 OPERAND_AT(iobj, 0) = OPERAND_AT(next, 0);
@@ -3480,7 +3772,7 @@ iseq_peephole_optimize(rb_iseq_t *iseq, LINK_ELEMENT *list, const int do_tailcal
                      *  opt_reverse Y
                      */
                     for (; diff > 0; diff--) {
-                        INSERT_BEFORE_INSN(iobj, &dummy_line_node, pop);
+                        INSERT_BEFORE_INSN(iobj, iobj->insn_info.line_no, iobj->insn_info.node_id, pop);
                     }
                 }
                 else { /* (op1 < op2) */
@@ -3492,7 +3784,7 @@ iseq_peephole_optimize(rb_iseq_t *iseq, LINK_ELEMENT *list, const int do_tailcal
                      *  opt_reverse Y
                      */
                     for (; diff < 0; diff++) {
-                        INSERT_BEFORE_INSN(iobj, &dummy_line_node, putnil);
+                        INSERT_BEFORE_INSN(iobj, iobj->insn_info.line_no, iobj->insn_info.node_id, putnil);
                     }
                 }
             }
@@ -3527,7 +3819,7 @@ iseq_peephole_optimize(rb_iseq_t *iseq, LINK_ELEMENT *list, const int do_tailcal
         }
     }
 
-    if (IS_INSN_ID(iobj, putstring) ||
+    if (IS_INSN_ID(iobj, putstring) || IS_INSN_ID(iobj, putchilledstring) ||
         (IS_INSN_ID(iobj, putobject) && RB_TYPE_P(OPERAND_AT(iobj, 0), T_STRING))) {
         /*
          *  putstring ""
@@ -3543,6 +3835,24 @@ iseq_peephole_optimize(rb_iseq_t *iseq, LINK_ELEMENT *list, const int do_tailcal
             }
             ELEM_REMOVE(&iobj->link);
         }
+        if (IS_NEXT_INSN_ID(&iobj->link, toregexp)) {
+            INSN *next = (INSN *)iobj->link.next;
+            if (OPERAND_AT(next, 1) == INT2FIX(1)) {
+                VALUE src = OPERAND_AT(iobj, 0);
+                int opt = (int)FIX2LONG(OPERAND_AT(next, 0));
+                VALUE path = rb_iseq_path(iseq);
+                int line = iobj->insn_info.line_no;
+                VALUE errinfo = rb_errinfo();
+                VALUE re = rb_reg_compile(src, opt, RSTRING_PTR(path), line);
+                if (NIL_P(re)) {
+                    VALUE message = rb_attr_get(rb_errinfo(), idMesg);
+                    rb_set_errinfo(errinfo);
+                    COMPILE_ERROR(iseq, line, "%" PRIsVALUE, message);
+                }
+                RB_OBJ_WRITE(iseq, &OPERAND_AT(iobj, 0), re);
+                ELEM_REMOVE(iobj->link.next);
+            }
+        }
     }
 
     if (IS_INSN_ID(iobj, concatstrings)) {
@@ -3715,8 +4025,8 @@ iseq_peephole_optimize(rb_iseq_t *iseq, LINK_ELEMENT *list, const int do_tailcal
             if (IS_NEXT_INSN_ID(iobj->link.next, leave)) {
                 iobj->insn_id = BIN(opt_invokebuiltin_delegate_leave);
                 const struct rb_builtin_function *bf = (const struct rb_builtin_function *)iobj->operands[0];
-                if (iobj == (INSN *)list && bf->argc == 0 && (iseq->body->builtin_attrs & BUILTIN_ATTR_LEAF)) {
-                    iseq->body->builtin_attrs |= BUILTIN_ATTR_SINGLE_NOARG_INLINE;
+                if (iobj == (INSN *)list && bf->argc == 0 && (ISEQ_BODY(iseq)->builtin_attrs & BUILTIN_ATTR_LEAF)) {
+                    ISEQ_BODY(iseq)->builtin_attrs |= BUILTIN_ATTR_SINGLE_NOARG_LEAF;
                 }
             }
         }
@@ -3735,6 +4045,64 @@ iseq_peephole_optimize(rb_iseq_t *iseq, LINK_ELEMENT *list, const int do_tailcal
         }
     }
 
+    if (IS_INSN_ID(iobj, splatarray) && OPERAND_AT(iobj, 0) == false) {
+        LINK_ELEMENT *niobj = &iobj->link;
+        if (IS_NEXT_INSN_ID(niobj, duphash)) {
+            niobj = niobj->next;
+            LINK_ELEMENT *siobj;
+            unsigned int set_flags = 0, unset_flags = 0;
+
+            /*
+            * Eliminate hash allocation for f(*a, kw: 1)
+            *
+            *  splatarray false
+            *  duphash
+            *  send ARGS_SPLAT|KW_SPLAT|KW_SPLAT_MUT and not ARGS_BLOCKARG
+            * =>
+            *  splatarray false
+            *  putobject
+            *  send ARGS_SPLAT|KW_SPLAT
+            */
+            if (IS_NEXT_INSN_ID(niobj, send)) {
+                siobj = niobj->next;
+                set_flags = VM_CALL_ARGS_SPLAT|VM_CALL_KW_SPLAT|VM_CALL_KW_SPLAT_MUT;
+                unset_flags = VM_CALL_ARGS_BLOCKARG;
+            }
+            /*
+            * Eliminate hash allocation for f(*a, kw: 1, &{arg,lvar,@iv})
+            *
+            *  splatarray false
+            *  duphash
+            *  getlocal / getinstancevariable / getblockparamproxy
+            *  send ARGS_SPLAT|KW_SPLAT|KW_SPLAT_MUT|ARGS_BLOCKARG
+            * =>
+            *  splatarray false
+            *  putobject
+            *  getlocal / getinstancevariable / getblockparamproxy
+            *  send ARGS_SPLAT|KW_SPLAT|ARGS_BLOCKARG
+            */
+            else if ((IS_NEXT_INSN_ID(niobj, getlocal) || IS_NEXT_INSN_ID(niobj, getinstancevariable) ||
+                        IS_NEXT_INSN_ID(niobj, getblockparamproxy)) && (IS_NEXT_INSN_ID(niobj->next, send))) {
+                siobj = niobj->next->next;
+                set_flags = VM_CALL_ARGS_SPLAT|VM_CALL_KW_SPLAT|VM_CALL_KW_SPLAT_MUT|VM_CALL_ARGS_BLOCKARG;
+            }
+
+            if (set_flags) {
+                const struct rb_callinfo *ci = (const struct rb_callinfo *)OPERAND_AT(siobj, 0);
+                unsigned int flags = vm_ci_flag(ci);
+                if ((flags & set_flags) == set_flags && !(flags & unset_flags)) {
+                    ((INSN*)niobj)->insn_id = BIN(putobject);
+                    RB_OBJ_WRITE(iseq, &OPERAND_AT(niobj, 0), rb_hash_freeze(rb_hash_resurrect(OPERAND_AT(niobj, 0))));
+
+                    const struct rb_callinfo *nci = vm_ci_new(vm_ci_mid(ci),
+                        flags & ~VM_CALL_KW_SPLAT_MUT, vm_ci_argc(ci), vm_ci_kwarg(ci));
+                    RB_OBJ_WRITTEN(iseq, ci, nci);
+                    OPERAND_AT(siobj, 0) = (VALUE)nci;
+                }
+            }
+        }
+    }
+
     return COMPILE_OK;
 }
 
@@ -3762,37 +4130,169 @@ iseq_specialized_instruction(rb_iseq_t *iseq, INSN *iobj)
     if (IS_INSN_ID(iobj, newarray) && iobj->link.next &&
         IS_INSN(iobj->link.next)) {
         /*
-         *   [a, b, ...].max/min -> a, b, c, opt_newarray_max/min
+         *   [a, b, ...].max/min -> a, b, c, opt_newarray_send max/min
          */
         INSN *niobj = (INSN *)iobj->link.next;
         if (IS_INSN_ID(niobj, send)) {
             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) {
+            if (vm_ci_simple(ci) && vm_ci_argc(ci) == 0) {
+                VALUE method = INT2FIX(0);
                 switch (vm_ci_mid(ci)) {
                   case idMax:
+                      method = INT2FIX(VM_OPT_NEWARRAY_SEND_MAX);
+                      break;
                   case idMin:
+                      method = INT2FIX(VM_OPT_NEWARRAY_SEND_MIN);
+                      break;
                   case idHash:
-                    {
-                        rb_num_t num = (rb_num_t)iobj->operands[0];
-                        iobj->insn_id = BIN(opt_newarray_send);
-                        iobj->operands = compile_data_calloc2(iseq, insn_len(iobj->insn_id) - 1, sizeof(VALUE));
-                        iobj->operands[0] = (VALUE)num;
-                        iobj->operands[1] = (VALUE)rb_id2sym(vm_ci_mid(ci));
-                        iobj->operand_size = insn_len(iobj->insn_id) - 1;
-                        ELEM_REMOVE(&niobj->link);
-                        return COMPILE_OK;
-                    }
+                      method = INT2FIX(VM_OPT_NEWARRAY_SEND_HASH);
+                      break;
+                }
+
+                if (method != INT2FIX(0)) {
+                    VALUE num = iobj->operands[0];
+                    int operand_len = insn_len(BIN(opt_newarray_send)) - 1;
+                    iobj->insn_id = BIN(opt_newarray_send);
+                    iobj->operands = compile_data_calloc2(iseq, operand_len, sizeof(VALUE));
+                    iobj->operands[0] = num;
+                    iobj->operands[1] = method;
+                    iobj->operand_size = operand_len;
+                    ELEM_REMOVE(&niobj->link);
+                    return COMPILE_OK;
                 }
             }
         }
-    }
+        else if ((IS_INSN_ID(niobj, putstring) || IS_INSN_ID(niobj, putchilledstring) ||
+                  (IS_INSN_ID(niobj, putobject) && RB_TYPE_P(OPERAND_AT(niobj, 0), T_STRING))) &&
+                 IS_NEXT_INSN_ID(&niobj->link, send)) {
+            const struct rb_callinfo *ci = (struct rb_callinfo *)OPERAND_AT((INSN *)niobj->link.next, 0);
+            if (vm_ci_simple(ci) && vm_ci_argc(ci) == 1 && vm_ci_mid(ci) == idPack) {
+                VALUE num = iobj->operands[0];
+                int operand_len = insn_len(BIN(opt_newarray_send)) - 1;
+                iobj->insn_id = BIN(opt_newarray_send);
+                iobj->operands = compile_data_calloc2(iseq, operand_len, sizeof(VALUE));
+                iobj->operands[0] = FIXNUM_INC(num, 1);
+                iobj->operands[1] = INT2FIX(VM_OPT_NEWARRAY_SEND_PACK);
+                iobj->operand_size = operand_len;
+                ELEM_REMOVE(&iobj->link);
+                ELEM_REMOVE(niobj->link.next);
+                ELEM_INSERT_NEXT(&niobj->link, &iobj->link);
+                return COMPILE_OK;
+            }
+        }
+        // newarray n, putchilledstring "E", getlocal b, send :pack with {buffer: b}
+        // -> putchilledstring "E", getlocal b, opt_newarray_send n+2, :pack, :buffer
+        else if ((IS_INSN_ID(niobj, putstring) || IS_INSN_ID(niobj, putchilledstring) ||
+                  (IS_INSN_ID(niobj, putobject) && RB_TYPE_P(OPERAND_AT(niobj, 0), T_STRING))) &&
+                 IS_NEXT_INSN_ID(&niobj->link, getlocal) &&
+                 (niobj->link.next && IS_NEXT_INSN_ID(niobj->link.next, send))) {
+            const struct rb_callinfo *ci = (struct rb_callinfo *)OPERAND_AT((INSN *)(niobj->link.next)->next, 0);
+            const struct rb_callinfo_kwarg *kwarg = vm_ci_kwarg(ci);
+            if (vm_ci_mid(ci) == idPack && vm_ci_argc(ci) == 2 &&
+                    (kwarg && kwarg->keyword_len == 1 && kwarg->keywords[0] == rb_id2sym(idBuffer))) {
+                VALUE num = iobj->operands[0];
+                int operand_len = insn_len(BIN(opt_newarray_send)) - 1;
+                iobj->insn_id = BIN(opt_newarray_send);
+                iobj->operands = compile_data_calloc2(iseq, operand_len, sizeof(VALUE));
+                iobj->operands[0] = FIXNUM_INC(num, 2);
+                iobj->operands[1] = INT2FIX(VM_OPT_NEWARRAY_SEND_PACK_BUFFER);
+                iobj->operand_size = operand_len;
+                // Remove the "send" insn.
+                ELEM_REMOVE((niobj->link.next)->next);
+                // Remove the modified insn from its original "newarray" position...
+                ELEM_REMOVE(&iobj->link);
+                // and insert it after the buffer insn.
+                ELEM_INSERT_NEXT(niobj->link.next, &iobj->link);
+                return COMPILE_OK;
+            }
+        }
 
-    if (IS_INSN_ID(iobj, send)) {
-        const struct rb_callinfo *ci = (struct rb_callinfo *)OPERAND_AT(iobj, 0);
-        const rb_iseq_t *blockiseq = (rb_iseq_t *)OPERAND_AT(iobj, 1);
+        // Break the "else if" chain since some prior checks abort after sub-ifs.
+        // We already found "newarray".  To match `[...].include?(arg)` we look for
+        // the instruction(s) representing the argument followed by a "send".
+        if ((IS_INSN_ID(niobj, putstring) || IS_INSN_ID(niobj, putchilledstring) ||
+                  IS_INSN_ID(niobj, putobject) ||
+                  IS_INSN_ID(niobj, putself) ||
+                  IS_INSN_ID(niobj, getlocal) ||
+                  IS_INSN_ID(niobj, getinstancevariable)) &&
+                 IS_NEXT_INSN_ID(&niobj->link, send)) {
 
-#define SP_INSN(opt) insn_set_specialized_instruction(iseq, iobj, BIN(opt_##opt))
-        if (vm_ci_flag(ci) & VM_CALL_ARGS_SIMPLE) {
+            LINK_ELEMENT *sendobj = &(niobj->link); // Below we call ->next;
+            const struct rb_callinfo *ci;
+            // Allow any number (0 or more) of simple method calls on the argument
+            // (as in `[...].include?(arg.method1.method2)`.
+            do {
+                sendobj = sendobj->next;
+                ci = (struct rb_callinfo *)OPERAND_AT(sendobj, 0);
+            } while (vm_ci_simple(ci) && vm_ci_argc(ci) == 0 && IS_NEXT_INSN_ID(sendobj, send));
+
+            // If this send is for .include? with one arg we can do our opt.
+            if (vm_ci_simple(ci) && vm_ci_argc(ci) == 1 && vm_ci_mid(ci) == idIncludeP) {
+                VALUE num = iobj->operands[0];
+                INSN *sendins = (INSN *)sendobj;
+                sendins->insn_id = BIN(opt_newarray_send);
+                sendins->operand_size = insn_len(sendins->insn_id) - 1;
+                sendins->operands = compile_data_calloc2(iseq, sendins->operand_size, sizeof(VALUE));
+                sendins->operands[0] = FIXNUM_INC(num, 1);
+                sendins->operands[1] = INT2FIX(VM_OPT_NEWARRAY_SEND_INCLUDE_P);
+                // Remove the original "newarray" insn.
+                ELEM_REMOVE(&iobj->link);
+                return COMPILE_OK;
+            }
+        }
+    }
+
+    /*
+     * duparray [...]
+     * some insn for the arg...
+     * send     <calldata!mid:include?, argc:1, ARGS_SIMPLE>, nil
+     * =>
+     * arg insn...
+     * opt_duparray_send [...], :include?, 1
+     */
+    if (IS_INSN_ID(iobj, duparray) && iobj->link.next && IS_INSN(iobj->link.next)) {
+        INSN *niobj = (INSN *)iobj->link.next;
+        if ((IS_INSN_ID(niobj, getlocal) ||
+             IS_INSN_ID(niobj, getinstancevariable) ||
+             IS_INSN_ID(niobj, putself)) &&
+            IS_NEXT_INSN_ID(&niobj->link, send)) {
+
+            LINK_ELEMENT *sendobj = &(niobj->link); // Below we call ->next;
+            const struct rb_callinfo *ci;
+            // Allow any number (0 or more) of simple method calls on the argument
+            // (as in `[...].include?(arg.method1.method2)`.
+            do {
+                sendobj = sendobj->next;
+                ci = (struct rb_callinfo *)OPERAND_AT(sendobj, 0);
+            } while (vm_ci_simple(ci) && vm_ci_argc(ci) == 0 && IS_NEXT_INSN_ID(sendobj, send));
+
+            if (vm_ci_simple(ci) && vm_ci_argc(ci) == 1 && vm_ci_mid(ci) == idIncludeP) {
+                // Move the array arg from duparray to opt_duparray_send.
+                VALUE ary = iobj->operands[0];
+                rb_obj_reveal(ary, rb_cArray);
+
+                INSN *sendins = (INSN *)sendobj;
+                sendins->insn_id = BIN(opt_duparray_send);
+                sendins->operand_size = insn_len(sendins->insn_id) - 1;;
+                sendins->operands = compile_data_calloc2(iseq, sendins->operand_size, sizeof(VALUE));
+                sendins->operands[0] = ary;
+                sendins->operands[1] = rb_id2sym(idIncludeP);
+                sendins->operands[2] = INT2FIX(1);
+
+                // Remove the duparray insn.
+                ELEM_REMOVE(&iobj->link);
+                return COMPILE_OK;
+            }
+        }
+    }
+
+
+    if (IS_INSN_ID(iobj, send)) {
+        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 (vm_ci_simple(ci)) {
             switch (vm_ci_argc(ci)) {
               case 0:
                 switch (vm_ci_mid(ci)) {
@@ -3832,7 +4332,7 @@ iseq_specialized_instruction(rb_iseq_t *iseq, INSN *iobj)
             }
         }
 
-        if ((vm_ci_flag(ci) & VM_CALL_ARGS_BLOCKARG) == 0 && blockiseq == NULL) {
+        if ((vm_ci_flag(ci) & (VM_CALL_ARGS_BLOCKARG | VM_CALL_FORWARDING)) == 0 && blockiseq == NULL) {
             iobj->insn_id = BIN(opt_send_without_block);
             iobj->operand_size = insn_len(iobj->insn_id) - 1;
         }
@@ -3874,9 +4374,18 @@ iseq_optimize(rb_iseq_t *iseq, LINK_ANCHOR *const anchor)
     list = FIRST_ELEMENT(anchor);
 
     int do_block_optimization = 0;
+    LABEL * block_loop_label = NULL;
 
-    if (ISEQ_BODY(iseq)->type == ISEQ_TYPE_BLOCK && !ISEQ_COMPILE_DATA(iseq)->catch_except_p) {
+    // If we're optimizing a block
+    if (ISEQ_BODY(iseq)->type == ISEQ_TYPE_BLOCK) {
         do_block_optimization = 1;
+
+        // If the block starts with a nop and a label,
+        // record the label so we can detect if it's a jump target
+        LINK_ELEMENT * le = FIRST_ELEMENT(anchor)->next;
+        if (IS_INSN(le) && IS_INSN_ID((INSN *)le, nop) && IS_LABEL(le->next)) {
+            block_loop_label = (LABEL *)le->next;
+        }
     }
 
     while (list) {
@@ -3893,9 +4402,27 @@ iseq_optimize(rb_iseq_t *iseq, LINK_ANCHOR *const anchor)
 
             if (do_block_optimization) {
                 INSN * item = (INSN *)list;
-                if (IS_INSN_ID(item, jump)) {
+                // Give up if there is a throw
+                if (IS_INSN_ID(item, throw)) {
                     do_block_optimization = 0;
                 }
+                else {
+                    // If the instruction has a jump target, check if the
+                    // jump target is the block loop label
+                    const char *types = insn_op_types(item->insn_id);
+                    for (int j = 0; types[j]; j++) {
+                        if (types[j] == TS_OFFSET) {
+                            // If the jump target is equal to the block loop
+                            // label, then we can't do the optimization because
+                            // the leading `nop` instruction fires the block
+                            // entry tracepoint
+                            LABEL * target = (LABEL *)OPERAND_AT(item, j);
+                            if (target == block_loop_label) {
+                                do_block_optimization = 0;
+                            }
+                        }
+                    }
+                }
             }
         }
         if (IS_LABEL(list)) {
@@ -3952,8 +4479,7 @@ new_unified_insn(rb_iseq_t *iseq,
         list = list->next;
     }
 
-    NODE dummy_line_node = generate_dummy_line_node(iobj->insn_info.line_no, iobj->insn_info.node_id);
-    return new_insn_core(iseq, &dummy_line_node, insn_id, argc, operands);
+    return new_insn_core(iseq, iobj->insn_info.line_no, iobj->insn_info.node_id, insn_id, argc, operands);
 }
 #endif
 
@@ -4018,65 +4544,109 @@ all_string_result_p(const NODE *node)
 {
     if (!node) return FALSE;
     switch (nd_type(node)) {
-      case NODE_STR: case NODE_DSTR:
+      case NODE_STR: case NODE_DSTR: case NODE_FILE:
         return TRUE;
       case NODE_IF: case NODE_UNLESS:
-        if (!node->nd_body || !node->nd_else) return FALSE;
-        if (all_string_result_p(node->nd_body))
-            return all_string_result_p(node->nd_else);
+        if (!RNODE_IF(node)->nd_body || !RNODE_IF(node)->nd_else) return FALSE;
+        if (all_string_result_p(RNODE_IF(node)->nd_body))
+            return all_string_result_p(RNODE_IF(node)->nd_else);
         return FALSE;
       case NODE_AND: case NODE_OR:
-        if (!node->nd_2nd)
-            return all_string_result_p(node->nd_1st);
-        if (!all_string_result_p(node->nd_1st))
+        if (!RNODE_AND(node)->nd_2nd)
+            return all_string_result_p(RNODE_AND(node)->nd_1st);
+        if (!all_string_result_p(RNODE_AND(node)->nd_1st))
             return FALSE;
-        return all_string_result_p(node->nd_2nd);
+        return all_string_result_p(RNODE_AND(node)->nd_2nd);
       default:
         return FALSE;
     }
 }
 
+struct dstr_ctxt {
+    rb_iseq_t *const iseq;
+    LINK_ANCHOR *const ret;
+    VALUE lit;
+    const NODE *lit_node;
+    int cnt;
+    int dregx;
+};
+
 static int
-compile_dstr_fragments(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const node, int *cntp)
+append_dstr_fragment(struct dstr_ctxt *args, const NODE *const node, rb_parser_string_t *str)
 {
-    const NODE *list = node->nd_next;
-    VALUE lit = node->nd_lit;
-    LINK_ELEMENT *first_lit = 0;
-    int cnt = 0;
-
-    debugp_param("nd_lit", lit);
-    if (!NIL_P(lit)) {
-        cnt++;
-        if (!RB_TYPE_P(lit, T_STRING)) {
-            COMPILE_ERROR(ERROR_ARGS "dstr: must be string: %s",
-                          rb_builtin_type_name(TYPE(lit)));
+    VALUE s = rb_str_new_mutable_parser_string(str);
+    if (args->dregx) {
+        VALUE error = rb_reg_check_preprocess(s);
+        if (!NIL_P(error)) {
+            COMPILE_ERROR(args->iseq, nd_line(node), "%" PRIsVALUE, error);
             return COMPILE_NG;
         }
+    }
+    if (NIL_P(args->lit)) {
+        args->lit = s;
+        args->lit_node = node;
+    }
+    else {
+        rb_str_buf_append(args->lit, s);
+    }
+    return COMPILE_OK;
+}
+
+static void
+flush_dstr_fragment(struct dstr_ctxt *args)
+{
+    if (!NIL_P(args->lit)) {
+        rb_iseq_t *iseq = args->iseq;
+        VALUE lit = args->lit;
+        args->lit = Qnil;
         lit = rb_fstring(lit);
-        ADD_INSN1(ret, node, putobject, lit);
-        RB_OBJ_WRITTEN(iseq, Qundef, lit);
-        if (RSTRING_LEN(lit) == 0) first_lit = LAST_ELEMENT(ret);
+        ADD_INSN1(args->ret, args->lit_node, putobject, lit);
+        RB_OBJ_WRITTEN(args->iseq, Qundef, lit);
+        args->cnt++;
+    }
+}
+
+static int
+compile_dstr_fragments_0(struct dstr_ctxt *args, const NODE *const node)
+{
+    const struct RNode_LIST *list = RNODE_DSTR(node)->nd_next;
+    rb_parser_string_t *str = RNODE_DSTR(node)->string;
+
+    if (str) {
+        CHECK(append_dstr_fragment(args, node, str));
     }
 
     while (list) {
         const NODE *const head = list->nd_head;
         if (nd_type_p(head, NODE_STR)) {
-            lit = rb_fstring(head->nd_lit);
-            ADD_INSN1(ret, head, putobject, lit);
-            RB_OBJ_WRITTEN(iseq, Qundef, lit);
-            lit = Qnil;
+            CHECK(append_dstr_fragment(args, node, RNODE_STR(head)->string));
+        }
+        else if (nd_type_p(head, NODE_DSTR)) {
+            CHECK(compile_dstr_fragments_0(args, head));
         }
         else {
-            CHECK(COMPILE(ret, "each string", head));
+            flush_dstr_fragment(args);
+            rb_iseq_t *iseq = args->iseq;
+            CHECK(COMPILE(args->ret, "each string", head));
+            args->cnt++;
         }
-        cnt++;
-        list = list->nd_next;
-    }
-    if (NIL_P(lit) && first_lit) {
-        ELEM_REMOVE(first_lit);
-        --cnt;
+        list = (struct RNode_LIST *)list->nd_next;
     }
-    *cntp = cnt;
+    return COMPILE_OK;
+}
+
+static int
+compile_dstr_fragments(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const node, int *cntp, int dregx)
+{
+    struct dstr_ctxt args = {
+        .iseq = iseq, .ret = ret,
+        .lit = Qnil, .lit_node = NULL,
+        .cnt = 0, .dregx = dregx,
+    };
+    CHECK(compile_dstr_fragments_0(&args, node));
+    flush_dstr_fragment(&args);
+
+    *cntp = args.cnt;
 
     return COMPILE_OK;
 }
@@ -4085,12 +4655,12 @@ static int
 compile_block(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *node, int popped)
 {
     while (node && nd_type_p(node, NODE_BLOCK)) {
-        CHECK(COMPILE_(ret, "BLOCK body", node->nd_head,
-                       (node->nd_next ? 1 : popped)));
-        node = node->nd_next;
+        CHECK(COMPILE_(ret, "BLOCK body", RNODE_BLOCK(node)->nd_head,
+                       (RNODE_BLOCK(node)->nd_next ? 1 : popped)));
+        node = RNODE_BLOCK(node)->nd_next;
     }
     if (node) {
-        CHECK(COMPILE_(ret, "BLOCK next", node->nd_next, popped));
+        CHECK(COMPILE_(ret, "BLOCK next", RNODE_BLOCK(node)->nd_next, popped));
     }
     return COMPILE_OK;
 }
@@ -4099,24 +4669,41 @@ static int
 compile_dstr(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const node)
 {
     int cnt;
-    if (!node->nd_next) {
-        VALUE lit = rb_fstring(node->nd_lit);
+    if (!RNODE_DSTR(node)->nd_next) {
+        VALUE lit = rb_node_dstr_string_val(node);
         ADD_INSN1(ret, node, putstring, lit);
         RB_OBJ_WRITTEN(iseq, Qundef, lit);
     }
     else {
-        CHECK(compile_dstr_fragments(iseq, ret, node, &cnt));
+        CHECK(compile_dstr_fragments(iseq, ret, node, &cnt, FALSE));
         ADD_INSN1(ret, node, concatstrings, INT2FIX(cnt));
     }
     return COMPILE_OK;
 }
 
 static int
-compile_dregx(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const node)
+compile_dregx(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const node, int popped)
 {
     int cnt;
-    CHECK(compile_dstr_fragments(iseq, ret, node, &cnt));
-    ADD_INSN2(ret, node, toregexp, INT2FIX(node->nd_cflag), INT2FIX(cnt));
+    int cflag = (int)RNODE_DREGX(node)->as.nd_cflag;
+
+    if (!RNODE_DREGX(node)->nd_next) {
+        if (!popped) {
+            VALUE src = rb_node_dregx_string_val(node);
+            VALUE match = rb_reg_compile(src, cflag, NULL, 0);
+            ADD_INSN1(ret, node, putobject, match);
+            RB_OBJ_WRITTEN(iseq, Qundef, match);
+        }
+        return COMPILE_OK;
+    }
+
+    CHECK(compile_dstr_fragments(iseq, ret, node, &cnt, TRUE));
+    ADD_INSN2(ret, node, toregexp, INT2FIX(cflag), INT2FIX(cnt));
+
+    if (popped) {
+        ADD_INSN(ret, node, pop);
+    }
+
     return COMPILE_OK;
 }
 
@@ -4134,7 +4721,7 @@ compile_flip_flop(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const nod
     ADD_INSNL(ret, node, branchif, lend);
 
     /* *flip == 0 */
-    CHECK(COMPILE(ret, "flip2 beg", node->nd_beg));
+    CHECK(COMPILE(ret, "flip2 beg", RNODE_FLIP2(node)->nd_beg));
     ADD_INSNL(ret, node, branchunless, else_label);
     ADD_INSN1(ret, node, putobject, Qtrue);
     ADD_INSN1(ret, node, setspecial, key);
@@ -4144,7 +4731,7 @@ compile_flip_flop(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const nod
 
     /* *flip == 1 */
     ADD_LABEL(ret, lend);
-    CHECK(COMPILE(ret, "flip2 end", node->nd_end));
+    CHECK(COMPILE(ret, "flip2 end", RNODE_FLIP2(node)->nd_end));
     ADD_INSNL(ret, node, branchunless, then_label);
     ADD_INSN1(ret, node, putobject, Qfalse);
     ADD_INSN1(ret, node, setspecial, key);
@@ -4154,9 +4741,10 @@ compile_flip_flop(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const nod
 }
 
 static int
-compile_branch_condition(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *cond,
+compile_branch_condition(rb_iseq_t *iseq, LINK_ANCHOR *ret, const NODE *cond,
                          LABEL *then_label, LABEL *else_label);
 
+#define COMPILE_SINGLE 2
 static int
 compile_logical(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *cond,
                 LABEL *then_label, LABEL *else_label)
@@ -4175,32 +4763,51 @@ compile_logical(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *cond,
             return COMPILE_OK;
     }
     if (!label->refcnt) {
-        ADD_INSN(seq, cond, putnil);
-    }
-    else {
-        ADD_LABEL(seq, label);
+        return COMPILE_SINGLE;
     }
+    ADD_LABEL(seq, label);
     ADD_SEQ(ret, seq);
     return COMPILE_OK;
 }
 
 static int
-compile_branch_condition(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *cond,
+compile_branch_condition(rb_iseq_t *iseq, LINK_ANCHOR *ret, const NODE *cond,
                          LABEL *then_label, LABEL *else_label)
 {
+    int ok;
+    DECL_ANCHOR(ignore);
+
   again:
     switch (nd_type(cond)) {
       case NODE_AND:
-        CHECK(compile_logical(iseq, ret, cond->nd_1st, NULL, else_label));
-        cond = cond->nd_2nd;
+        CHECK(ok = compile_logical(iseq, ret, RNODE_AND(cond)->nd_1st, NULL, else_label));
+        cond = RNODE_AND(cond)->nd_2nd;
+        if (ok == COMPILE_SINGLE) {
+            INIT_ANCHOR(ignore);
+            ret = ignore;
+            then_label = NEW_LABEL(nd_line(cond));
+        }
         goto again;
       case NODE_OR:
-        CHECK(compile_logical(iseq, ret, cond->nd_1st, then_label, NULL));
-        cond = cond->nd_2nd;
+        CHECK(ok = compile_logical(iseq, ret, RNODE_OR(cond)->nd_1st, then_label, NULL));
+        cond = RNODE_OR(cond)->nd_2nd;
+        if (ok == COMPILE_SINGLE) {
+            INIT_ANCHOR(ignore);
+            ret = ignore;
+            else_label = NEW_LABEL(nd_line(cond));
+        }
         goto again;
-      case NODE_LIT:		/* NODE_LIT is always true */
+      case NODE_SYM:
+      case NODE_LINE:
+      case NODE_FILE:
+      case NODE_ENCODING:
+      case NODE_INTEGER:    /* NODE_INTEGER is always true */
+      case NODE_FLOAT:      /* NODE_FLOAT is always true */
+      case NODE_RATIONAL:   /* NODE_RATIONAL is always true */
+      case NODE_IMAGINARY:  /* NODE_IMAGINARY is always true */
       case NODE_TRUE:
       case NODE_STR:
+      case NODE_REGX:
       case NODE_ZLIST:
       case NODE_LAMBDA:
         /* printf("useless condition eliminate (%s)\n",  ruby_node_name(nd_type(cond))); */
@@ -4225,7 +4832,7 @@ compile_branch_condition(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *co
         CHECK(compile_flip_flop(iseq, ret, cond, FALSE, then_label, else_label));
         return COMPILE_OK;
       case NODE_DEFINED:
-        CHECK(compile_defined_expr(iseq, ret, cond, Qfalse));
+        CHECK(compile_defined_expr(iseq, ret, cond, Qfalse, ret == ignore));
         break;
       default:
         {
@@ -4263,7 +4870,40 @@ compile_branch_condition(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *co
 static int
 keyword_node_p(const NODE *const node)
 {
-    return nd_type_p(node, NODE_HASH) && (node->nd_brace & HASH_BRACE) != HASH_BRACE;
+    return nd_type_p(node, NODE_HASH) && (RNODE_HASH(node)->nd_brace & HASH_BRACE) != HASH_BRACE;
+}
+
+static VALUE
+get_symbol_value(rb_iseq_t *iseq, const NODE *node)
+{
+    switch (nd_type(node)) {
+      case NODE_SYM:
+        return rb_node_sym_string_val(node);
+      default:
+        UNKNOWN_NODE("get_symbol_value", node, Qnil);
+    }
+}
+
+static VALUE
+node_hash_unique_key_index(rb_iseq_t *iseq, rb_node_hash_t *node_hash, int *count_ptr)
+{
+    NODE *node = node_hash->nd_head;
+    VALUE hash = rb_hash_new();
+    VALUE ary = rb_ary_new();
+
+    for (int i = 0; node != NULL; i++, node = RNODE_LIST(RNODE_LIST(node)->nd_next)->nd_next) {
+        VALUE key = get_symbol_value(iseq, RNODE_LIST(node)->nd_head);
+        VALUE idx = rb_hash_aref(hash, key);
+        if (!NIL_P(idx)) {
+            rb_ary_store(ary, FIX2INT(idx), Qfalse);
+            (*count_ptr)--;
+        }
+        rb_hash_aset(hash, key, INT2FIX(i));
+        rb_ary_store(ary, i, Qtrue);
+        (*count_ptr)++;
+    }
+
+    return ary;
 }
 
 static int
@@ -4276,22 +4916,22 @@ compile_keyword_arg(rb_iseq_t *iseq, LINK_ANCHOR *const ret,
     RUBY_ASSERT(kw_arg_ptr != NULL);
     RUBY_ASSERT(flag != NULL);
 
-    if (root_node->nd_head && nd_type_p(root_node->nd_head, NODE_LIST)) {
-        const NODE *node = root_node->nd_head;
+    if (RNODE_HASH(root_node)->nd_head && nd_type_p(RNODE_HASH(root_node)->nd_head, NODE_LIST)) {
+        const NODE *node = RNODE_HASH(root_node)->nd_head;
         int seen_nodes = 0;
 
         while (node) {
-            const NODE *key_node = node->nd_head;
+            const NODE *key_node = RNODE_LIST(node)->nd_head;
             seen_nodes++;
 
-            assert(nd_type_p(node, NODE_LIST));
-            if (key_node && nd_type_p(key_node, NODE_LIT) && SYMBOL_P(key_node->nd_lit)) {
+            RUBY_ASSERT(nd_type_p(node, NODE_LIST));
+            if (key_node && nd_type_p(key_node, NODE_SYM)) {
                 /* can be keywords */
             }
             else {
                 if (flag) {
                     *flag |= VM_CALL_KW_SPLAT;
-                    if (seen_nodes > 1 || node->nd_next->nd_next) {
+                    if (seen_nodes > 1 || RNODE_LIST(RNODE_LIST(node)->nd_next)->nd_next) {
                         /* A new hash will be created for the keyword arguments
                          * in this case, so mark the method as passing mutable
                          * keyword splat.
@@ -4301,29 +4941,37 @@ compile_keyword_arg(rb_iseq_t *iseq, LINK_ANCHOR *const ret,
                 }
                 return FALSE;
             }
-            node = node->nd_next; /* skip value node */
-            node = node->nd_next;
+            node = RNODE_LIST(node)->nd_next; /* skip value node */
+            node = RNODE_LIST(node)->nd_next;
         }
 
         /* may be keywords */
-        node = root_node->nd_head;
+        node = RNODE_HASH(root_node)->nd_head;
         {
-            int len = (int)node->nd_alen / 2;
+            int len = 0;
+            VALUE key_index = node_hash_unique_key_index(iseq, RNODE_HASH(root_node), &len);
             struct rb_callinfo_kwarg *kw_arg =
                 rb_xmalloc_mul_add(len, sizeof(VALUE), sizeof(struct rb_callinfo_kwarg));
             VALUE *keywords = kw_arg->keywords;
             int i = 0;
+            int j = 0;
+            kw_arg->references = 0;
             kw_arg->keyword_len = len;
 
             *kw_arg_ptr = kw_arg;
 
-            for (i=0; node != NULL; i++, node = node->nd_next->nd_next) {
-                const NODE *key_node = node->nd_head;
-                const NODE *val_node = node->nd_next->nd_head;
-                keywords[i] = key_node->nd_lit;
-                NO_CHECK(COMPILE(ret, "keyword values", val_node));
+            for (i=0; node != NULL; i++, node = RNODE_LIST(RNODE_LIST(node)->nd_next)->nd_next) {
+                const NODE *key_node = RNODE_LIST(node)->nd_head;
+                const NODE *val_node = RNODE_LIST(RNODE_LIST(node)->nd_next)->nd_head;
+                int popped = TRUE;
+                if (rb_ary_entry(key_index, i)) {
+                    keywords[j] = get_symbol_value(iseq, key_node);
+                    j++;
+                    popped = FALSE;
+                }
+                NO_CHECK(COMPILE_(ret, "keyword values", val_node, popped));
             }
-            assert(i == len);
+            RUBY_ASSERT(j == len);
             return TRUE;
         }
     }
@@ -4335,34 +4983,48 @@ compile_args(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *node, NODE **k
 {
     int len = 0;
 
-    for (; node; len++, node = node->nd_next) {
+    for (; node; len++, node = RNODE_LIST(node)->nd_next) {
         if (CPDEBUG > 0) {
             EXPECT_NODE("compile_args", node, NODE_LIST, -1);
         }
 
-        if (node->nd_next == NULL && keyword_node_p(node->nd_head)) { /* last node is kwnode */
-            *kwnode_ptr = node->nd_head;
+        if (RNODE_LIST(node)->nd_next == NULL && keyword_node_p(RNODE_LIST(node)->nd_head)) { /* last node is kwnode */
+            *kwnode_ptr = RNODE_LIST(node)->nd_head;
         }
         else {
-            RUBY_ASSERT(!keyword_node_p(node->nd_head));
-            NO_CHECK(COMPILE_(ret, "array element", node->nd_head, FALSE));
+            RUBY_ASSERT(!keyword_node_p(RNODE_LIST(node)->nd_head));
+            NO_CHECK(COMPILE_(ret, "array element", RNODE_LIST(node)->nd_head, FALSE));
         }
     }
 
     return len;
 }
 
-static inline int
-static_literal_node_p(const NODE *node, const rb_iseq_t *iseq)
+static inline bool
+frozen_string_literal_p(const rb_iseq_t *iseq)
+{
+    return ISEQ_COMPILE_DATA(iseq)->option->frozen_string_literal > 0;
+}
+
+static inline bool
+static_literal_node_p(const NODE *node, const rb_iseq_t *iseq, bool hash_key)
 {
     switch (nd_type(node)) {
-      case NODE_LIT:
+      case NODE_SYM:
+      case NODE_REGX:
+      case NODE_LINE:
+      case NODE_ENCODING:
+      case NODE_INTEGER:
+      case NODE_FLOAT:
+      case NODE_RATIONAL:
+      case NODE_IMAGINARY:
       case NODE_NIL:
       case NODE_TRUE:
       case NODE_FALSE:
         return TRUE;
       case NODE_STR:
-        return ISEQ_COMPILE_DATA(iseq)->option->frozen_string_literal;
+      case NODE_FILE:
+        return hash_key || frozen_string_literal_p(iseq);
       default:
         return FALSE;
     }
@@ -4372,30 +5034,44 @@ static inline VALUE
 static_literal_value(const NODE *node, rb_iseq_t *iseq)
 {
     switch (nd_type(node)) {
+      case NODE_INTEGER:
+        return rb_node_integer_literal_val(node);
+      case NODE_FLOAT:
+        return rb_node_float_literal_val(node);
+      case NODE_RATIONAL:
+        return rb_node_rational_literal_val(node);
+      case NODE_IMAGINARY:
+        return rb_node_imaginary_literal_val(node);
       case NODE_NIL:
         return Qnil;
       case NODE_TRUE:
         return Qtrue;
       case NODE_FALSE:
         return Qfalse;
+      case NODE_SYM:
+        return rb_node_sym_string_val(node);
+      case NODE_REGX:
+        return rb_node_regx_string_val(node);
+      case NODE_LINE:
+        return rb_node_line_lineno_val(node);
+      case NODE_ENCODING:
+        return rb_node_encoding_val(node);
+      case NODE_FILE:
       case NODE_STR:
         if (ISEQ_COMPILE_DATA(iseq)->option->debug_frozen_string_literal || RTEST(ruby_debug)) {
-            VALUE lit;
-            VALUE debug_info = rb_ary_new_from_args(2, rb_iseq_path(iseq), INT2FIX((int)nd_line(node)));
-            lit = rb_str_dup(node->nd_lit);
-            rb_ivar_set(lit, id_debug_created_info, rb_obj_freeze(debug_info));
-            return rb_str_freeze(lit);
+            VALUE lit = get_string_value(node);
+            return rb_str_with_debug_created_info(lit, rb_iseq_path(iseq), (int)nd_line(node));
         }
         else {
-            return rb_fstring(node->nd_lit);
+            return get_string_value(node);
         }
       default:
-        return node->nd_lit;
+        rb_bug("unexpected node: %s", ruby_node_name(nd_type(node)));
     }
 }
 
 static int
-compile_array(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *node, int popped)
+compile_array(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *node, int popped, bool first_chunk)
 {
     const NODE *line_node = node;
 
@@ -4409,8 +5085,8 @@ compile_array(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *node, int pop
     EXPECT_NODE("compile_array", node, NODE_LIST, -1);
 
     if (popped) {
-        for (; node; node = node->nd_next) {
-            NO_CHECK(COMPILE_(ret, "array element", node->nd_head, popped));
+        for (; node; node = RNODE_LIST(node)->nd_next) {
+            NO_CHECK(COMPILE_(ret, "array element", RNODE_LIST(node)->nd_head, popped));
         }
         return 1;
     }
@@ -4430,8 +5106,8 @@ compile_array(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *node, int pop
      *
      *   [x1,x2,...,x10000] =>
      *     push x1  ; push x2  ; ...; push x256; newarray 256;
-     *     push x257; push x258; ...; push x512; newarray 256; concatarray;
-     *     push x513; push x514; ...; push x768; newarray 256; concatarray;
+     *     push x257; push x258; ...; push x512; pushtoarray 256;
+     *     push x513; push x514; ...; push x768; pushtoarray 256;
      *     ...
      *
      * - Long subarray can be optimized by pre-allocating a hidden array.
@@ -4441,38 +5117,38 @@ compile_array(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *node, int pop
      *
      *   [x, 1,2,3,...,100, z] =>
      *     push x; newarray 1;
-     *     putobject [1,2,3,...,100] (<- hidden array); concatarray;
-     *     push z; newarray 1; concatarray
+     *     putobject [1,2,3,...,100] (<- hidden array); concattoarray;
+     *     push z; pushtoarray 1;
      *
-     * - If the last element is a keyword, newarraykwsplat should be emitted
-     *   to check and remove empty keyword arguments hash from array.
+     * - If the last element is a keyword, pushtoarraykwsplat should be emitted
+     *   to only push it onto the array if it is not empty
      *   (Note: a keyword is NODE_HASH which is not static_literal_node_p.)
      *
      *   [1,2,3,**kw] =>
-     *     putobject 1; putobject 2; putobject 3; push kw; newarraykwsplat
+     *     putobject 1; putobject 2; putobject 3; newarray 3; ...; pushtoarraykwsplat kw
      */
 
     const int max_stack_len = 0x100;
     const int min_tmp_ary_len = 0x40;
     int stack_len = 0;
-    int first_chunk = 1;
 
-    /* Convert pushed elements to an array, and concatarray if needed */
-#define FLUSH_CHUNK(newarrayinsn)                               \
+    /* Either create a new array, or push to the existing array */
+#define FLUSH_CHUNK \
     if (stack_len) {                                            \
-        ADD_INSN1(ret, line_node, newarrayinsn, INT2FIX(stack_len)); \
-        if (!first_chunk) ADD_INSN(ret, line_node, concatarray);     \
-        first_chunk = stack_len = 0;                            \
+        if (first_chunk) ADD_INSN1(ret, line_node, newarray, INT2FIX(stack_len)); \
+        else ADD_INSN1(ret, line_node, pushtoarray, INT2FIX(stack_len));     \
+        first_chunk = FALSE; \
+        stack_len = 0;                            \
     }
 
     while (node) {
         int count = 1;
 
         /* pre-allocation check (this branch can be omittable) */
-        if (static_literal_node_p(node->nd_head, iseq)) {
+        if (static_literal_node_p(RNODE_LIST(node)->nd_head, iseq, false)) {
             /* count the elements that are optimizable */
-            const NODE *node_tmp = node->nd_next;
-            for (; node_tmp && static_literal_node_p(node_tmp->nd_head, iseq); node_tmp = node_tmp->nd_next)
+            const NODE *node_tmp = RNODE_LIST(node)->nd_next;
+            for (; node_tmp && static_literal_node_p(RNODE_LIST(node_tmp)->nd_head, iseq, false); node_tmp = RNODE_LIST(node_tmp)->nd_next)
                 count++;
 
             if ((first_chunk && stack_len == 0 && !node_tmp) || count >= min_tmp_ary_len) {
@@ -4480,72 +5156,61 @@ compile_array(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *node, int pop
                 VALUE ary = rb_ary_hidden_new(count);
 
                 /* Create a hidden array */
-                for (; count; count--, node = node->nd_next)
-                    rb_ary_push(ary, static_literal_value(node->nd_head, iseq));
+                for (; count; count--, node = RNODE_LIST(node)->nd_next)
+                    rb_ary_push(ary, static_literal_value(RNODE_LIST(node)->nd_head, iseq));
                 OBJ_FREEZE(ary);
 
                 /* Emit optimized code */
-                FLUSH_CHUNK(newarray);
+                FLUSH_CHUNK;
                 if (first_chunk) {
                     ADD_INSN1(ret, line_node, duparray, ary);
-                    first_chunk = 0;
+                    first_chunk = FALSE;
                 }
                 else {
                     ADD_INSN1(ret, line_node, putobject, ary);
-                    ADD_INSN(ret, line_node, concatarray);
+                    ADD_INSN(ret, line_node, concattoarray);
                 }
                 RB_OBJ_WRITTEN(iseq, Qundef, ary);
             }
         }
 
         /* Base case: Compile "count" elements */
-        for (; count; count--, node = node->nd_next) {
+        for (; count; count--, node = RNODE_LIST(node)->nd_next) {
             if (CPDEBUG > 0) {
                 EXPECT_NODE("compile_array", node, NODE_LIST, -1);
             }
 
-            NO_CHECK(COMPILE_(ret, "array element", node->nd_head, 0));
-            stack_len++;
-
-            if (!node->nd_next && keyword_node_p(node->nd_head)) {
-                /* Reached the end, and the last element is a keyword */
-                FLUSH_CHUNK(newarraykwsplat);
+            if (!RNODE_LIST(node)->nd_next && keyword_node_p(RNODE_LIST(node)->nd_head)) {
+                /* Create array or push existing non-keyword elements onto array */
+                if (stack_len == 0 && first_chunk) {
+                    ADD_INSN1(ret, line_node, newarray, INT2FIX(0));
+                }
+                else {
+                    FLUSH_CHUNK;
+                }
+                NO_CHECK(COMPILE_(ret, "array element", RNODE_LIST(node)->nd_head, 0));
+                ADD_INSN(ret, line_node, pushtoarraykwsplat);
                 return 1;
             }
+            else {
+                NO_CHECK(COMPILE_(ret, "array element", RNODE_LIST(node)->nd_head, 0));
+                stack_len++;
+            }
 
             /* If there are many pushed elements, flush them to avoid stack overflow */
-            if (stack_len >= max_stack_len) FLUSH_CHUNK(newarray);
+            if (stack_len >= max_stack_len) FLUSH_CHUNK;
         }
     }
 
-    FLUSH_CHUNK(newarray);
+    FLUSH_CHUNK;
 #undef FLUSH_CHUNK
     return 1;
 }
 
-/* Compile an array containing the single element represented by node */
-static int
-compile_array_1(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *node)
-{
-    if (static_literal_node_p(node, iseq)) {
-        VALUE ary = rb_ary_hidden_new(1);
-        rb_ary_push(ary, static_literal_value(node, iseq));
-        OBJ_FREEZE(ary);
-
-        ADD_INSN1(ret, node, duparray, ary);
-    }
-    else {
-        CHECK(COMPILE_(ret, "array element", node, FALSE));
-        ADD_INSN1(ret, node, newarray, INT2FIX(1));
-    }
-
-    return 1;
-}
-
 static inline int
 static_literal_node_pair_p(const NODE *node, const rb_iseq_t *iseq)
 {
-    return node->nd_head && static_literal_node_p(node->nd_head, iseq) && static_literal_node_p(node->nd_next->nd_head, iseq);
+    return RNODE_LIST(node)->nd_head && static_literal_node_p(RNODE_LIST(node)->nd_head, iseq, true) && static_literal_node_p(RNODE_LIST(RNODE_LIST(node)->nd_next)->nd_head, iseq, false);
 }
 
 static int
@@ -4553,7 +5218,7 @@ compile_hash(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *node, int meth
 {
     const NODE *line_node = node;
 
-    node = node->nd_head;
+    node = RNODE_HASH(node)->nd_head;
 
     if (!node || nd_type_p(node, NODE_ZLIST)) {
         if (!popped) {
@@ -4565,8 +5230,8 @@ compile_hash(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *node, int meth
     EXPECT_NODE("compile_hash", node, NODE_LIST, -1);
 
     if (popped) {
-        for (; node; node = node->nd_next) {
-            NO_CHECK(COMPILE_(ret, "hash element", node->nd_head, popped));
+        for (; node; node = RNODE_LIST(node)->nd_next) {
+            NO_CHECK(COMPILE_(ret, "hash element", RNODE_LIST(node)->nd_head, popped));
         }
         return 1;
     }
@@ -4619,8 +5284,8 @@ compile_hash(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *node, int meth
         /* pre-allocation check (this branch can be omittable) */
         if (static_literal_node_pair_p(node, iseq)) {
             /* count the elements that are optimizable */
-            const NODE *node_tmp = node->nd_next->nd_next;
-            for (; node_tmp && static_literal_node_pair_p(node_tmp, iseq); node_tmp = node_tmp->nd_next->nd_next)
+            const NODE *node_tmp = RNODE_LIST(RNODE_LIST(node)->nd_next)->nd_next;
+            for (; node_tmp && static_literal_node_pair_p(node_tmp, iseq); node_tmp = RNODE_LIST(RNODE_LIST(node_tmp)->nd_next)->nd_next)
                 count++;
 
             if ((first_chunk && stack_len == 0 && !node_tmp) || count >= min_tmp_hash_len) {
@@ -4628,10 +5293,10 @@ compile_hash(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *node, int meth
                 VALUE ary = rb_ary_hidden_new(count);
 
                 /* Create a hidden hash */
-                for (; count; count--, node = node->nd_next->nd_next) {
+                for (; count; count--, node = RNODE_LIST(RNODE_LIST(node)->nd_next)->nd_next) {
                     VALUE elem[2];
-                    elem[0] = static_literal_value(node->nd_head, iseq);
-                    elem[1] = static_literal_value(node->nd_next->nd_head, iseq);
+                    elem[0] = static_literal_value(RNODE_LIST(node)->nd_head, iseq);
+                    elem[1] = static_literal_value(RNODE_LIST(RNODE_LIST(node)->nd_next)->nd_head, iseq);
                     rb_ary_cat(ary, elem, 2);
                 }
                 VALUE hash = rb_hash_new_with_size(RARRAY_LEN(ary) / 2);
@@ -4658,16 +5323,16 @@ compile_hash(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *node, int meth
         }
 
         /* Base case: Compile "count" elements */
-        for (; count; count--, node = node->nd_next->nd_next) {
+        for (; count; count--, node = RNODE_LIST(RNODE_LIST(node)->nd_next)->nd_next) {
 
             if (CPDEBUG > 0) {
                 EXPECT_NODE("compile_hash", node, NODE_LIST, -1);
             }
 
-            if (node->nd_head) {
+            if (RNODE_LIST(node)->nd_head) {
                 /* Normal key-value pair */
-                NO_CHECK(COMPILE_(anchor, "hash key element", node->nd_head, 0));
-                NO_CHECK(COMPILE_(anchor, "hash value element", node->nd_next->nd_head, 0));
+                NO_CHECK(COMPILE_(anchor, "hash key element", RNODE_LIST(node)->nd_head, 0));
+                NO_CHECK(COMPILE_(anchor, "hash value element", RNODE_LIST(RNODE_LIST(node)->nd_next)->nd_head, 0));
                 stack_len += 2;
 
                 /* If there are many pushed elements, flush them to avoid stack overflow */
@@ -4677,12 +5342,13 @@ compile_hash(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *node, int meth
                 /* kwsplat case: foo(..., **kw, ...) */
                 FLUSH_CHUNK();
 
-                const NODE *kw = node->nd_next->nd_head;
-                int empty_kw = nd_type_p(kw, NODE_LIT) && RB_TYPE_P(kw->nd_lit, T_HASH); /* foo(  ..., **{}, ...) */
+                const NODE *kw = RNODE_LIST(RNODE_LIST(node)->nd_next)->nd_head;
+                int empty_kw = nd_type_p(kw, NODE_HASH) && (!RNODE_HASH(kw)->nd_head); /* 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 last_kw = !RNODE_LIST(RNODE_LIST(node)->nd_next)->nd_next; /* foo(  ..., **kw) */
                 int only_kw = last_kw && first_kw;            /* foo(1,2,3, **kw) */
 
+                empty_kw = empty_kw || nd_type_p(kw, NODE_NIL); /* foo(  ..., **nil, ...) */
                 if (empty_kw) {
                     if (only_kw && method_call_keywords) {
                         /* **{} appears at the only keyword argument in method call,
@@ -4742,29 +5408,34 @@ VALUE
 rb_node_case_when_optimizable_literal(const NODE *const node)
 {
     switch (nd_type(node)) {
-      case NODE_LIT: {
-        VALUE v = node->nd_lit;
+      case NODE_INTEGER:
+        return rb_node_integer_literal_val(node);
+      case NODE_FLOAT: {
+        VALUE v = rb_node_float_literal_val(node);
         double ival;
-        if (RB_FLOAT_TYPE_P(v) &&
-            modf(RFLOAT_VALUE(v), &ival) == 0.0) {
+
+        if (modf(RFLOAT_VALUE(v), &ival) == 0.0) {
             return FIXABLE(ival) ? LONG2FIX((long)ival) : rb_dbl2big(ival);
         }
-        if (RB_TYPE_P(v, T_RATIONAL) || RB_TYPE_P(v, T_COMPLEX)) {
-            return Qundef;
-        }
-        if (SYMBOL_P(v) || rb_obj_is_kind_of(v, rb_cNumeric)) {
-            return v;
-        }
-        break;
+        return v;
       }
+      case NODE_RATIONAL:
+      case NODE_IMAGINARY:
+        return Qundef;
       case NODE_NIL:
         return Qnil;
       case NODE_TRUE:
         return Qtrue;
       case NODE_FALSE:
         return Qfalse;
+      case NODE_SYM:
+        return rb_node_sym_string_val(node);
+      case NODE_LINE:
+        return rb_node_line_lineno_val(node);
       case NODE_STR:
-        return rb_fstring(node->nd_lit);
+        return rb_node_str_string_val(node);
+      case NODE_FILE:
+        return rb_node_file_path_val(node);
     }
     return Qundef;
 }
@@ -4774,7 +5445,7 @@ when_vals(rb_iseq_t *iseq, LINK_ANCHOR *const cond_seq, const NODE *vals,
           LABEL *l1, int only_special_literals, VALUE literals)
 {
     while (vals) {
-        const NODE *val = vals->nd_head;
+        const NODE *val = RNODE_LIST(vals)->nd_head;
         VALUE lit = rb_node_case_when_optimizable_literal(val);
 
         if (UNDEF_P(lit)) {
@@ -4784,9 +5455,9 @@ when_vals(rb_iseq_t *iseq, LINK_ANCHOR *const cond_seq, const NODE *vals,
             rb_hash_aset(literals, lit, (VALUE)(l1) | 1);
         }
 
-        if (nd_type_p(val, NODE_STR)) {
-            debugp_param("nd_lit", val->nd_lit);
-            lit = rb_fstring(val->nd_lit);
+        if (nd_type_p(val, NODE_STR) || nd_type_p(val, NODE_FILE)) {
+            debugp_param("nd_lit", get_string_value(val));
+            lit = get_string_value(val);
             ADD_INSN1(cond_seq, val, putobject, lit);
             RB_OBJ_WRITTEN(iseq, Qundef, lit);
         }
@@ -4798,7 +5469,7 @@ when_vals(rb_iseq_t *iseq, LINK_ANCHOR *const cond_seq, const NODE *vals,
         ADD_INSN1(cond_seq, vals, topn, INT2FIX(1));
         ADD_CALL(cond_seq, vals, idEqq, INT2FIX(1));
         ADD_INSNL(cond_seq, val, branchif, l1);
-        vals = vals->nd_next;
+        vals = RNODE_LIST(vals)->nd_next;
     }
     return only_special_literals;
 }
@@ -4816,19 +5487,19 @@ when_splat_vals(rb_iseq_t *iseq, LINK_ANCHOR *const cond_seq, const NODE *vals,
         break;
       case NODE_SPLAT:
         ADD_INSN (cond_seq, line_node, dup);
-        CHECK(COMPILE(cond_seq, "when splat", vals->nd_head));
+        CHECK(COMPILE(cond_seq, "when splat", RNODE_SPLAT(vals)->nd_head));
         ADD_INSN1(cond_seq, line_node, splatarray, Qfalse);
         ADD_INSN1(cond_seq, line_node, checkmatch, INT2FIX(VM_CHECKMATCH_TYPE_CASE | VM_CHECKMATCH_ARRAY));
         ADD_INSNL(cond_seq, line_node, branchif, l1);
         break;
       case NODE_ARGSCAT:
-        CHECK(when_splat_vals(iseq, cond_seq, vals->nd_head, l1, only_special_literals, literals));
-        CHECK(when_splat_vals(iseq, cond_seq, vals->nd_body, l1, only_special_literals, literals));
+        CHECK(when_splat_vals(iseq, cond_seq, RNODE_ARGSCAT(vals)->nd_head, l1, only_special_literals, literals));
+        CHECK(when_splat_vals(iseq, cond_seq, RNODE_ARGSCAT(vals)->nd_body, l1, only_special_literals, literals));
         break;
       case NODE_ARGSPUSH:
-        CHECK(when_splat_vals(iseq, cond_seq, vals->nd_head, l1, only_special_literals, literals));
+        CHECK(when_splat_vals(iseq, cond_seq, RNODE_ARGSPUSH(vals)->nd_head, l1, only_special_literals, literals));
         ADD_INSN (cond_seq, line_node, dup);
-        CHECK(COMPILE(cond_seq, "when argspush body", vals->nd_body));
+        CHECK(COMPILE(cond_seq, "when argspush body", RNODE_ARGSPUSH(vals)->nd_body));
         ADD_INSN1(cond_seq, line_node, checkmatch, INT2FIX(VM_CHECKMATCH_TYPE_CASE));
         ADD_INSNL(cond_seq, line_node, branchif, l1);
         break;
@@ -4987,12 +5658,17 @@ compile_massign_lhs(rb_iseq_t *iseq, LINK_ANCHOR *const pre, LINK_ANCHOR *const
 
         CHECK(COMPILE_POPPED(pre, "masgn lhs (NODE_ATTRASGN)", node));
 
+        bool safenav_call = false;
         LINK_ELEMENT *insn_element = LAST_ELEMENT(pre);
         iobj = (INSN *)get_prev_insn((INSN *)insn_element); /* send insn */
         ASSUME(iobj);
-        ELEM_REMOVE(LAST_ELEMENT(pre));
-        ELEM_REMOVE((LINK_ELEMENT *)iobj);
-        pre->last = iobj->link.prev;
+        ELEM_REMOVE(insn_element);
+        if (!IS_INSN_ID(iobj, send)) {
+            safenav_call = true;
+            iobj = (INSN *)get_prev_insn(iobj);
+            ELEM_INSERT_NEXT(&iobj->link, insn_element);
+        }
+        (pre->last = iobj->link.prev)->next = 0;
 
         const struct rb_callinfo *ci = (struct rb_callinfo *)OPERAND_AT(iobj, 0);
         int argc = vm_ci_argc(ci) + 1;
@@ -5011,18 +5687,46 @@ compile_massign_lhs(rb_iseq_t *iseq, LINK_ANCHOR *const pre, LINK_ANCHOR *const
             return COMPILE_NG;
         }
 
-        ADD_ELEM(lhs, (LINK_ELEMENT *)iobj);
+        iobj->link.prev = lhs->last;
+        lhs->last->next = &iobj->link;
+        for (lhs->last = &iobj->link; lhs->last->next; lhs->last = lhs->last->next);
         if (vm_ci_flag(ci) & VM_CALL_ARGS_SPLAT) {
             int argc = vm_ci_argc(ci);
+            bool dupsplat = false;
             ci = ci_argc_set(iseq, ci, argc - 1);
+            if (!(vm_ci_flag(ci) & VM_CALL_ARGS_SPLAT_MUT)) {
+                /* Given h[*a], _ = ary
+                 * setup_args sets VM_CALL_ARGS_SPLAT and not VM_CALL_ARGS_SPLAT_MUT
+                 * `a` must be dupped, because it will be appended with ary[0]
+                 * Since you are dupping `a`, you can set VM_CALL_ARGS_SPLAT_MUT
+                 */
+                dupsplat = true;
+                ci = ci_flag_set(iseq, ci, VM_CALL_ARGS_SPLAT_MUT);
+            }
             OPERAND_AT(iobj, 0) = (VALUE)ci;
             RB_OBJ_WRITTEN(iseq, Qundef, iobj);
-            INSERT_BEFORE_INSN1(iobj, line_node, newarray, INT2FIX(1));
-            INSERT_BEFORE_INSN(iobj, line_node, concatarray);
+
+            /* Given: h[*a], h[*b, 1] = ary
+             *  h[*a] uses splatarray false and does not set VM_CALL_ARGS_SPLAT_MUT,
+             *    so this uses splatarray true on a to dup it before using pushtoarray
+             *  h[*b, 1] uses splatarray true and sets VM_CALL_ARGS_SPLAT_MUT,
+             *    so you can use pushtoarray directly
+             */
+            int line_no = nd_line(line_node);
+            int node_id = nd_node_id(line_node);
+
+            if (dupsplat) {
+                INSERT_BEFORE_INSN(iobj, line_no, node_id, swap);
+                INSERT_BEFORE_INSN1(iobj, line_no, node_id, splatarray, Qtrue);
+                INSERT_BEFORE_INSN(iobj, line_no, node_id, swap);
+            }
+            INSERT_BEFORE_INSN1(iobj, line_no, node_id, pushtoarray, INT2FIX(1));
         }
-        ADD_INSN(lhs, line_node, pop);
-        if (argc != 1) {
+        if (!safenav_call) {
             ADD_INSN(lhs, line_node, pop);
+            if (argc != 1) {
+                ADD_INSN(lhs, line_node, pop);
+            }
         }
         for (int i=0; i < argc; i++) {
             ADD_INSN(post, line_node, pop);
@@ -5048,7 +5752,7 @@ compile_massign_lhs(rb_iseq_t *iseq, LINK_ANCHOR *const pre, LINK_ANCHOR *const
         break;
       }
       case NODE_CDECL:
-        if (!node->nd_vid) {
+        if (!RNODE_CDECL(node)->nd_vid) {
             /* Special handling only needed for expr::C, not for C */
             INSN *iobj;
 
@@ -5086,8 +5790,8 @@ static int
 compile_massign_opt_lhs(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *lhsn)
 {
     if (lhsn) {
-        CHECK(compile_massign_opt_lhs(iseq, ret, lhsn->nd_next));
-        CHECK(compile_massign_lhs(iseq, ret, ret, ret, ret, lhsn->nd_head, NULL, 0));
+        CHECK(compile_massign_opt_lhs(iseq, ret, RNODE_LIST(lhsn)->nd_next));
+        CHECK(compile_massign_lhs(iseq, ret, ret, ret, ret, RNODE_LIST(lhsn)->nd_head, NULL, 0));
     }
     return COMPILE_OK;
 }
@@ -5117,31 +5821,29 @@ compile_massign_opt(rb_iseq_t *iseq, LINK_ANCHOR *const ret,
     }
 
     while (lhsn) {
-        const NODE *ln = lhsn->nd_head;
+        const NODE *ln = RNODE_LIST(lhsn)->nd_head;
         switch (nd_type(ln)) {
           case NODE_LASGN:
-            MEMORY(ln->nd_vid);
-            break;
           case NODE_DASGN:
           case NODE_IASGN:
           case NODE_CVASGN:
-            MEMORY(ln->nd_vid);
+            MEMORY(get_nd_vid(ln));
             break;
           default:
             return 0;
         }
-        lhsn = lhsn->nd_next;
+        lhsn = RNODE_LIST(lhsn)->nd_next;
         llen++;
     }
 
     while (rhsn) {
         if (llen <= rlen) {
-            NO_CHECK(COMPILE_POPPED(ret, "masgn val (popped)", rhsn->nd_head));
+            NO_CHECK(COMPILE_POPPED(ret, "masgn val (popped)", RNODE_LIST(rhsn)->nd_head));
         }
         else {
-            NO_CHECK(COMPILE(ret, "masgn val", rhsn->nd_head));
+            NO_CHECK(COMPILE(ret, "masgn val", RNODE_LIST(rhsn)->nd_head));
         }
-        rhsn = rhsn->nd_next;
+        rhsn = RNODE_LIST(rhsn)->nd_next;
         rlen++;
     }
 
@@ -5158,32 +5860,31 @@ compile_massign_opt(rb_iseq_t *iseq, LINK_ANCHOR *const ret,
 static int
 compile_massign0(rb_iseq_t *iseq, LINK_ANCHOR *const pre, LINK_ANCHOR *const rhs, LINK_ANCHOR *const lhs, LINK_ANCHOR *const post, const NODE *const node, struct masgn_state *state, int popped)
 {
-    const NODE *rhsn = node->nd_value;
-    const NODE *splatn = node->nd_args;
-    const NODE *lhsn = node->nd_head;
+    const NODE *rhsn = RNODE_MASGN(node)->nd_value;
+    const NODE *splatn = RNODE_MASGN(node)->nd_args;
+    const NODE *lhsn = RNODE_MASGN(node)->nd_head;
     const NODE *lhsn_count = lhsn;
     int lhs_splat = (splatn && NODE_NAMED_REST_P(splatn)) ? 1 : 0;
 
     int llen = 0;
     int lpos = 0;
-    int expand = 1;
 
     while (lhsn_count) {
         llen++;
-        lhsn_count = lhsn_count->nd_next;
+        lhsn_count = RNODE_LIST(lhsn_count)->nd_next;
     }
     while (lhsn) {
-        CHECK(compile_massign_lhs(iseq, pre, rhs, lhs, post, lhsn->nd_head, state, (llen - lpos) + lhs_splat + state->lhs_level));
+        CHECK(compile_massign_lhs(iseq, pre, rhs, lhs, post, RNODE_LIST(lhsn)->nd_head, state, (llen - lpos) + lhs_splat + state->lhs_level));
         lpos++;
-        lhsn = lhsn->nd_next;
+        lhsn = RNODE_LIST(lhsn)->nd_next;
     }
 
     if (lhs_splat) {
         if (nd_type_p(splatn, NODE_POSTARG)) {
             /*a, b, *r, p1, p2 */
-            const NODE *postn = splatn->nd_2nd;
-            const NODE *restn = splatn->nd_1st;
-            int plen = (int)postn->nd_alen;
+            const NODE *postn = RNODE_POSTARG(splatn)->nd_2nd;
+            const NODE *restn = RNODE_POSTARG(splatn)->nd_1st;
+            int plen = (int)RNODE_LIST(postn)->as.nd_alen;
             int ppos = 0;
             int flag = 0x02 | (NODE_NAMED_REST_P(restn) ? 0x01 : 0x00);
 
@@ -5193,9 +5894,9 @@ compile_massign0(rb_iseq_t *iseq, LINK_ANCHOR *const pre, LINK_ANCHOR *const rhs
                 CHECK(compile_massign_lhs(iseq, pre, rhs, lhs, post, restn, state, 1 + plen + state->lhs_level));
             }
             while (postn) {
-                CHECK(compile_massign_lhs(iseq, pre, rhs, lhs, post, postn->nd_head, state, (plen - ppos) + state->lhs_level));
+                CHECK(compile_massign_lhs(iseq, pre, rhs, lhs, post, RNODE_LIST(postn)->nd_head, state, (plen - ppos) + state->lhs_level));
                 ppos++;
-                postn = postn->nd_next;
+                postn = RNODE_LIST(postn)->nd_next;
             }
         }
         else {
@@ -5204,7 +5905,6 @@ compile_massign0(rb_iseq_t *iseq, LINK_ANCHOR *const pre, LINK_ANCHOR *const rhs
         }
     }
 
-
     if (!state->nested) {
         NO_CHECK(COMPILE(rhs, "normal masgn rhs", rhsn));
     }
@@ -5212,16 +5912,14 @@ compile_massign0(rb_iseq_t *iseq, LINK_ANCHOR *const pre, LINK_ANCHOR *const rhs
     if (!popped) {
         ADD_INSN(rhs, node, dup);
     }
-    if (expand) {
-        ADD_INSN2(rhs, node, expandarray, INT2FIX(llen), INT2FIX(lhs_splat));
-    }
+    ADD_INSN2(rhs, node, expandarray, INT2FIX(llen), INT2FIX(lhs_splat));
     return COMPILE_OK;
 }
 
 static int
 compile_massign(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const node, int popped)
 {
-    if (!popped || node->nd_args || !compile_massign_opt(iseq, ret, node->nd_value, node->nd_head)) {
+    if (!popped || RNODE_MASGN(node)->nd_args || !compile_massign_opt(iseq, ret, RNODE_MASGN(node)->nd_value, RNODE_MASGN(node)->nd_head)) {
         struct masgn_state state;
         state.lhs_level = popped ? 0 : 1;
         state.nested = 0;
@@ -5243,7 +5941,7 @@ compile_massign(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const node,
         while (memo) {
             VALUE topn_arg = INT2FIX((state.num_args - memo->argn) + memo->lhs_pos);
             for (int i = 0; i < memo->num_args; i++) {
-                INSERT_BEFORE_INSN1(memo->before_insn, memo->line_node, topn, topn_arg);
+                INSERT_BEFORE_INSN1(memo->before_insn, nd_line(memo->line_node), nd_node_id(memo->line_node), topn, topn_arg);
             }
             tmp_memo = memo->next;
             free(memo);
@@ -5270,15 +5968,15 @@ collect_const_segments(rb_iseq_t *iseq, const NODE *node)
     for (;;) {
         switch (nd_type(node)) {
           case NODE_CONST:
-            rb_ary_unshift(arr, ID2SYM(node->nd_vid));
+            rb_ary_unshift(arr, ID2SYM(RNODE_CONST(node)->nd_vid));
             return arr;
           case NODE_COLON3:
-            rb_ary_unshift(arr, ID2SYM(node->nd_mid));
+            rb_ary_unshift(arr, ID2SYM(RNODE_COLON3(node)->nd_mid));
             rb_ary_unshift(arr, ID2SYM(idNULL));
             return arr;
           case NODE_COLON2:
-            rb_ary_unshift(arr, ID2SYM(node->nd_mid));
-            node = node->nd_head;
+            rb_ary_unshift(arr, ID2SYM(RNODE_COLON2(node)->nd_mid));
+            node = RNODE_COLON2(node)->nd_head;
             break;
           default:
             return Qfalse;
@@ -5292,22 +5990,22 @@ compile_const_prefix(rb_iseq_t *iseq, const NODE *const node,
 {
     switch (nd_type(node)) {
       case NODE_CONST:
-        debugi("compile_const_prefix - colon", node->nd_vid);
+        debugi("compile_const_prefix - colon", RNODE_CONST(node)->nd_vid);
         ADD_INSN1(body, node, putobject, Qtrue);
-        ADD_INSN1(body, node, getconstant, ID2SYM(node->nd_vid));
+        ADD_INSN1(body, node, getconstant, ID2SYM(RNODE_CONST(node)->nd_vid));
         break;
       case NODE_COLON3:
-        debugi("compile_const_prefix - colon3", node->nd_mid);
+        debugi("compile_const_prefix - colon3", RNODE_COLON3(node)->nd_mid);
         ADD_INSN(body, node, pop);
         ADD_INSN1(body, node, putobject, rb_cObject);
         ADD_INSN1(body, node, putobject, Qtrue);
-        ADD_INSN1(body, node, getconstant, ID2SYM(node->nd_mid));
+        ADD_INSN1(body, node, getconstant, ID2SYM(RNODE_COLON3(node)->nd_mid));
         break;
       case NODE_COLON2:
-        CHECK(compile_const_prefix(iseq, node->nd_head, pref, body));
-        debugi("compile_const_prefix - colon2", node->nd_mid);
+        CHECK(compile_const_prefix(iseq, RNODE_COLON2(node)->nd_head, pref, body));
+        debugi("compile_const_prefix - colon2", RNODE_COLON2(node)->nd_mid);
         ADD_INSN1(body, node, putobject, Qfalse);
-        ADD_INSN1(body, node, getconstant, ID2SYM(node->nd_mid));
+        ADD_INSN1(body, node, getconstant, ID2SYM(RNODE_COLON2(node)->nd_mid));
         break;
       default:
         CHECK(COMPILE(pref, "const colon2 prefix", node));
@@ -5324,9 +6022,9 @@ compile_cpath(LINK_ANCHOR *const ret, rb_iseq_t *iseq, const NODE *cpath)
         ADD_INSN1(ret, cpath, putobject, rb_cObject);
         return VM_DEFINECLASS_FLAG_SCOPED;
     }
-    else if (cpath->nd_head) {
+    else if (nd_type_p(cpath, NODE_COLON2) && RNODE_COLON2(cpath)->nd_head) {
         /* Bar::Foo */
-        NO_CHECK(COMPILE(ret, "nd_else->nd_head", cpath->nd_head));
+        NO_CHECK(COMPILE(ret, "nd_else->nd_head", RNODE_COLON2(cpath)->nd_head));
         return VM_DEFINECLASS_FLAG_SCOPED;
     }
     else {
@@ -5340,16 +6038,16 @@ compile_cpath(LINK_ANCHOR *const ret, rb_iseq_t *iseq, const NODE *cpath)
 static inline int
 private_recv_p(const NODE *node)
 {
-    if (nd_type_p(node->nd_recv, NODE_SELF)) {
-        NODE *self = node->nd_recv;
-        return self->nd_state != 0;
+    NODE *recv = get_nd_recv(node);
+    if (recv && nd_type_p(recv, NODE_SELF)) {
+        return RNODE_SELF(recv)->nd_state != 0;
     }
     return 0;
 }
 
 static void
 defined_expr(rb_iseq_t *iseq, LINK_ANCHOR *const ret,
-             const NODE *const node, LABEL **lfinish, VALUE needstr);
+             const NODE *const node, LABEL **lfinish, VALUE needstr, bool ignore);
 
 static int
 compile_call(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const node, const enum node_type type, const NODE *const line_node, int popped, bool assume_receiver);
@@ -5380,21 +6078,34 @@ defined_expr0(rb_iseq_t *iseq, LINK_ANCHOR *const ret,
         expr_type = DEFINED_FALSE;
         break;
 
+      case NODE_HASH:
       case NODE_LIST:{
-        const NODE *vals = node;
+        const NODE *vals = (nd_type(node) == NODE_HASH) ? RNODE_HASH(node)->nd_head : node;
 
-        do {
-            defined_expr0(iseq, ret, vals->nd_head, lfinish, Qfalse, false);
+        if (vals) {
+            do {
+                if (RNODE_LIST(vals)->nd_head) {
+                    defined_expr0(iseq, ret, RNODE_LIST(vals)->nd_head, lfinish, Qfalse, false);
 
-            if (!lfinish[1]) {
-                lfinish[1] = NEW_LABEL(line);
-            }
-            ADD_INSNL(ret, line_node, branchunless, lfinish[1]);
-        } while ((vals = vals->nd_next) != NULL);
+                    if (!lfinish[1]) {
+                        lfinish[1] = NEW_LABEL(line);
+                    }
+                    ADD_INSNL(ret, line_node, branchunless, lfinish[1]);
+                }
+            } while ((vals = RNODE_LIST(vals)->nd_next) != NULL);
+        }
       }
         /* fall through */
       case NODE_STR:
-      case NODE_LIT:
+      case NODE_SYM:
+      case NODE_REGX:
+      case NODE_LINE:
+      case NODE_FILE:
+      case NODE_ENCODING:
+      case NODE_INTEGER:
+      case NODE_FLOAT:
+      case NODE_RATIONAL:
+      case NODE_IMAGINARY:
       case NODE_ZLIST:
       case NODE_AND:
       case NODE_OR:
@@ -5402,6 +6113,15 @@ defined_expr0(rb_iseq_t *iseq, LINK_ANCHOR *const ret,
         expr_type = DEFINED_EXPR;
         break;
 
+      case NODE_SPLAT:
+        defined_expr0(iseq, ret, RNODE_LIST(node)->nd_head, lfinish, Qfalse, false);
+        if (!lfinish[1]) {
+            lfinish[1] = NEW_LABEL(line);
+        }
+        ADD_INSNL(ret, line_node, branchunless, lfinish[1]);
+        expr_type = DEFINED_EXPR;
+        break;
+
         /* variables */
       case NODE_LVAR:
       case NODE_DVAR:
@@ -5411,47 +6131,47 @@ defined_expr0(rb_iseq_t *iseq, LINK_ANCHOR *const ret,
 #define PUSH_VAL(type) (needstr == Qfalse ? Qtrue : rb_iseq_defined_string(type))
       case NODE_IVAR:
         ADD_INSN3(ret, line_node, definedivar,
-                  ID2SYM(node->nd_vid), get_ivar_ic_value(iseq,node->nd_vid), PUSH_VAL(DEFINED_IVAR));
+                  ID2SYM(RNODE_IVAR(node)->nd_vid), get_ivar_ic_value(iseq,RNODE_IVAR(node)->nd_vid), PUSH_VAL(DEFINED_IVAR));
         return;
 
       case NODE_GVAR:
         ADD_INSN(ret, line_node, putnil);
         ADD_INSN3(ret, line_node, defined, INT2FIX(DEFINED_GVAR),
-                  ID2SYM(node->nd_vid), PUSH_VAL(DEFINED_GVAR));
+                  ID2SYM(RNODE_GVAR(node)->nd_vid), PUSH_VAL(DEFINED_GVAR));
         return;
 
       case NODE_CVAR:
         ADD_INSN(ret, line_node, putnil);
         ADD_INSN3(ret, line_node, defined, INT2FIX(DEFINED_CVAR),
-                  ID2SYM(node->nd_vid), PUSH_VAL(DEFINED_CVAR));
+                  ID2SYM(RNODE_CVAR(node)->nd_vid), PUSH_VAL(DEFINED_CVAR));
         return;
 
       case NODE_CONST:
         ADD_INSN(ret, line_node, putnil);
         ADD_INSN3(ret, line_node, defined, INT2FIX(DEFINED_CONST),
-                  ID2SYM(node->nd_vid), PUSH_VAL(DEFINED_CONST));
+                  ID2SYM(RNODE_CONST(node)->nd_vid), PUSH_VAL(DEFINED_CONST));
         return;
       case NODE_COLON2:
         if (!lfinish[1]) {
             lfinish[1] = NEW_LABEL(line);
         }
-        defined_expr0(iseq, ret, node->nd_head, lfinish, Qfalse, false);
+        defined_expr0(iseq, ret, RNODE_COLON2(node)->nd_head, lfinish, Qfalse, false);
         ADD_INSNL(ret, line_node, branchunless, lfinish[1]);
-        NO_CHECK(COMPILE(ret, "defined/colon2#nd_head", node->nd_head));
+        NO_CHECK(COMPILE(ret, "defined/colon2#nd_head", RNODE_COLON2(node)->nd_head));
 
-        if (rb_is_const_id(node->nd_mid)) {
+        if (rb_is_const_id(RNODE_COLON2(node)->nd_mid)) {
             ADD_INSN3(ret, line_node, defined, INT2FIX(DEFINED_CONST_FROM),
-                    ID2SYM(node->nd_mid), PUSH_VAL(DEFINED_CONST));
+                    ID2SYM(RNODE_COLON2(node)->nd_mid), PUSH_VAL(DEFINED_CONST));
         }
         else {
             ADD_INSN3(ret, line_node, defined, INT2FIX(DEFINED_METHOD),
-                    ID2SYM(node->nd_mid), PUSH_VAL(DEFINED_METHOD));
+                    ID2SYM(RNODE_COLON2(node)->nd_mid), PUSH_VAL(DEFINED_METHOD));
         }
         return;
       case NODE_COLON3:
         ADD_INSN1(ret, line_node, putobject, rb_cObject);
         ADD_INSN3(ret, line_node, defined,
-                  INT2FIX(DEFINED_CONST_FROM), ID2SYM(node->nd_mid), PUSH_VAL(DEFINED_CONST));
+                  INT2FIX(DEFINED_CONST_FROM), ID2SYM(RNODE_COLON3(node)->nd_mid), PUSH_VAL(DEFINED_CONST));
         return;
 
         /* method dispatch */
@@ -5464,7 +6184,7 @@ defined_expr0(rb_iseq_t *iseq, LINK_ANCHOR *const ret,
             (type == NODE_CALL || type == NODE_OPCALL ||
              (type == NODE_ATTRASGN && !private_recv_p(node)));
 
-        if (node->nd_args || explicit_receiver) {
+        if (get_nd_args(node) || explicit_receiver) {
             if (!lfinish[1]) {
                 lfinish[1] = NEW_LABEL(line);
             }
@@ -5472,31 +6192,31 @@ defined_expr0(rb_iseq_t *iseq, LINK_ANCHOR *const ret,
                 lfinish[2] = NEW_LABEL(line);
             }
         }
-        if (node->nd_args) {
-            defined_expr0(iseq, ret, node->nd_args, lfinish, Qfalse, false);
+        if (get_nd_args(node)) {
+            defined_expr0(iseq, ret, get_nd_args(node), lfinish, Qfalse, false);
             ADD_INSNL(ret, line_node, branchunless, lfinish[1]);
         }
         if (explicit_receiver) {
-            defined_expr0(iseq, ret, node->nd_recv, lfinish, Qfalse, true);
-            switch (nd_type(node->nd_recv)) {
+            defined_expr0(iseq, ret, get_nd_recv(node), lfinish, Qfalse, true);
+            switch (nd_type(get_nd_recv(node))) {
               case NODE_CALL:
               case NODE_OPCALL:
               case NODE_VCALL:
               case NODE_FCALL:
               case NODE_ATTRASGN:
                 ADD_INSNL(ret, line_node, branchunless, lfinish[2]);
-                compile_call(iseq, ret, node->nd_recv, nd_type(node->nd_recv), line_node, 0, true);
+                compile_call(iseq, ret, get_nd_recv(node), nd_type(get_nd_recv(node)), line_node, 0, true);
                 break;
               default:
                 ADD_INSNL(ret, line_node, branchunless, lfinish[1]);
-                NO_CHECK(COMPILE(ret, "defined/recv", node->nd_recv));
+                NO_CHECK(COMPILE(ret, "defined/recv", get_nd_recv(node)));
                 break;
             }
             if (keep_result) {
                 ADD_INSN(ret, line_node, dup);
             }
             ADD_INSN3(ret, line_node, defined, INT2FIX(DEFINED_METHOD),
-                      ID2SYM(node->nd_mid), PUSH_VAL(DEFINED_METHOD));
+                      ID2SYM(get_node_call_nd_mid(node)), PUSH_VAL(DEFINED_METHOD));
         }
         else {
             ADD_INSN(ret, line_node, putself);
@@ -5504,7 +6224,7 @@ defined_expr0(rb_iseq_t *iseq, LINK_ANCHOR *const ret,
                 ADD_INSN(ret, line_node, dup);
             }
             ADD_INSN3(ret, line_node, defined, INT2FIX(DEFINED_FUNC),
-                      ID2SYM(node->nd_mid), PUSH_VAL(DEFINED_METHOD));
+                      ID2SYM(get_node_call_nd_mid(node)), PUSH_VAL(DEFINED_METHOD));
         }
         return;
       }
@@ -5513,13 +6233,14 @@ defined_expr0(rb_iseq_t *iseq, LINK_ANCHOR *const ret,
         ADD_INSN(ret, line_node, putnil);
         ADD_INSN3(ret, line_node, defined, INT2FIX(DEFINED_YIELD), 0,
                   PUSH_VAL(DEFINED_YIELD));
+        iseq_set_use_block(ISEQ_BODY(iseq)->local_iseq);
         return;
 
       case NODE_BACK_REF:
       case NODE_NTH_REF:
         ADD_INSN(ret, line_node, putnil);
         ADD_INSN3(ret, line_node, defined, INT2FIX(DEFINED_REF),
-                  INT2FIX((node->nd_nth << 1) | (type == NODE_BACK_REF)),
+                  INT2FIX((RNODE_BACK_REF(node)->nd_nth << 1) | (type == NODE_BACK_REF)),
                   PUSH_VAL(DEFINED_GVAR));
         return;
 
@@ -5542,11 +6263,12 @@ defined_expr0(rb_iseq_t *iseq, LINK_ANCHOR *const ret,
       case NODE_IASGN:
       case NODE_CDECL:
       case NODE_CVASGN:
+      case NODE_OP_CDECL:
         expr_type = DEFINED_ASGN;
         break;
     }
 
-    assert(expr_type != DEFINED_NOT_DEFINED);
+    RUBY_ASSERT(expr_type != DEFINED_NOT_DEFINED);
 
     if (needstr != Qfalse) {
         VALUE str = rb_iseq_defined_string(expr_type);
@@ -5560,14 +6282,13 @@ defined_expr0(rb_iseq_t *iseq, LINK_ANCHOR *const ret,
 static void
 build_defined_rescue_iseq(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const void *unused)
 {
-    NODE dummy_line_node = generate_dummy_line_node(0, -1);
-    ADD_INSN(ret, &dummy_line_node, putnil);
+    ADD_SYNTHETIC_INSN(ret, 0, -1, putnil);
     iseq_set_exception_local_table(iseq);
 }
 
 static void
 defined_expr(rb_iseq_t *iseq, LINK_ANCHOR *const ret,
-             const NODE *const node, LABEL **lfinish, VALUE needstr)
+             const NODE *const node, LABEL **lfinish, VALUE needstr, bool ignore)
 {
     LINK_ELEMENT *lcur = ret->last;
     defined_expr0(iseq, ret, node, lfinish, needstr, false);
@@ -5578,24 +6299,26 @@ defined_expr(rb_iseq_t *iseq, LINK_ANCHOR *const ret,
         const rb_iseq_t *rescue;
         struct rb_iseq_new_with_callback_callback_func *ifunc =
             rb_iseq_new_with_callback_new_callback(build_defined_rescue_iseq, NULL);
-        rescue = new_child_iseq_with_callback(iseq, ifunc,
+        rescue = NEW_CHILD_ISEQ_WITH_CALLBACK(ifunc,
                                               rb_str_concat(rb_str_new2("defined guard in "),
                                                             ISEQ_BODY(iseq)->location.label),
-                                              iseq, ISEQ_TYPE_RESCUE, 0);
+                                              ISEQ_TYPE_RESCUE, 0);
         lstart->rescued = LABEL_RESCUE_BEG;
         lend->rescued = LABEL_RESCUE_END;
         APPEND_LABEL(ret, lcur, lstart);
         ADD_LABEL(ret, lend);
-        ADD_CATCH_ENTRY(CATCH_TYPE_RESCUE, lstart, lend, rescue, lfinish[1]);
+        if (!ignore) {
+            ADD_CATCH_ENTRY(CATCH_TYPE_RESCUE, lstart, lend, rescue, lfinish[1]);
+        }
     }
 }
 
 static int
-compile_defined_expr(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const node, VALUE needstr)
+compile_defined_expr(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const node, VALUE needstr, bool ignore)
 {
     const int line = nd_line(node);
     const NODE *line_node = node;
-    if (!node->nd_head) {
+    if (!RNODE_DEFINED(node)->nd_head) {
         VALUE str = rb_iseq_defined_string(DEFINED_NIL);
         ADD_INSN1(ret, line_node, putobject, str);
     }
@@ -5605,9 +6328,9 @@ compile_defined_expr(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const
         lfinish[0] = NEW_LABEL(line);
         lfinish[1] = 0;
         lfinish[2] = 0;
-        defined_expr(iseq, ret, node->nd_head, lfinish, needstr);
+        defined_expr(iseq, ret, RNODE_DEFINED(node)->nd_head, lfinish, needstr, ignore);
         if (lfinish[1]) {
-            ELEM_INSERT_NEXT(last, &new_insn_body(iseq, line_node, BIN(putnil), 0)->link);
+            ELEM_INSERT_NEXT(last, &new_insn_body(iseq, nd_line(line_node), nd_node_id(line_node), BIN(putnil), 0)->link);
             ADD_INSN(ret, line_node, swap);
             if (lfinish[2]) {
                 ADD_LABEL(ret, lfinish[2]);
@@ -5646,7 +6369,7 @@ make_name_for_block(const rb_iseq_t *orig_iseq)
 static void
 push_ensure_entry(rb_iseq_t *iseq,
                   struct iseq_compile_data_ensure_node_stack *enl,
-                  struct ensure_range *er, const NODE *const node)
+                  struct ensure_range *er, const void *const node)
 {
     enl->ensure_node = node;
     enl->prev = ISEQ_COMPILE_DATA(iseq)->ensure_node_stack;	/* prev */
@@ -5688,7 +6411,7 @@ can_add_ensure_iseq(const rb_iseq_t *iseq)
 static void
 add_ensure_iseq(LINK_ANCHOR *const ret, rb_iseq_t *iseq, int is_return)
 {
-    assert(can_add_ensure_iseq(iseq));
+    RUBY_ASSERT(can_add_ensure_iseq(iseq));
 
     struct iseq_compile_data_ensure_node_stack *enlp =
         ISEQ_COMPILE_DATA(iseq)->ensure_node_stack;
@@ -5729,10 +6452,10 @@ check_keyword(const NODE *node)
     /* This check is essentially a code clone of compile_keyword_arg. */
 
     if (nd_type_p(node, NODE_LIST)) {
-        while (node->nd_next) {
-            node = node->nd_next;
+        while (RNODE_LIST(node)->nd_next) {
+            node = RNODE_LIST(node)->nd_next;
         }
-        node = node->nd_head;
+        node = RNODE_LIST(node)->nd_head;
     }
 
     return keyword_node_p(node);
@@ -5744,14 +6467,29 @@ keyword_node_single_splat_p(NODE *kwnode)
 {
     RUBY_ASSERT(keyword_node_p(kwnode));
 
-    NODE *node = kwnode->nd_head;
-    return node->nd_head == NULL &&
-           node->nd_next->nd_next == NULL;
+    NODE *node = RNODE_HASH(kwnode)->nd_head;
+    return RNODE_LIST(node)->nd_head == NULL &&
+           RNODE_LIST(RNODE_LIST(node)->nd_next)->nd_next == NULL;
+}
+
+static void
+compile_single_keyword_splat_mutable(rb_iseq_t *iseq, LINK_ANCHOR *const args, const NODE *argn,
+                                     NODE *kwnode, unsigned int *flag_ptr)
+{
+    *flag_ptr |= VM_CALL_KW_SPLAT_MUT;
+    ADD_INSN1(args, argn, putspecialobject, INT2FIX(VM_SPECIAL_OBJECT_VMCORE));
+    ADD_INSN1(args, argn, newhash, INT2FIX(0));
+    compile_hash(iseq, args, kwnode, TRUE, FALSE);
+    ADD_SEND(args, argn, id_core_hash_merge_kwd, INT2FIX(2));
 }
 
+#define SPLATARRAY_FALSE 0
+#define SPLATARRAY_TRUE 1
+#define DUP_SINGLE_KW_SPLAT 2
+
 static int
 setup_args_core(rb_iseq_t *iseq, LINK_ANCHOR *const args, const NODE *argn,
-                int dup_rest, unsigned int *flag_ptr, struct rb_callinfo_kwarg **kwarg_ptr)
+                unsigned int *dup_rest, unsigned int *flag_ptr, struct rb_callinfo_kwarg **kwarg_ptr)
 {
     if (!argn) return 0;
 
@@ -5759,132 +6497,273 @@ setup_args_core(rb_iseq_t *iseq, LINK_ANCHOR *const args, const NODE *argn,
 
     switch (nd_type(argn)) {
       case NODE_LIST: {
-          // f(x, y, z)
-          int len = compile_args(iseq, args, argn, &kwnode);
-          RUBY_ASSERT(flag_ptr == NULL || (*flag_ptr & VM_CALL_ARGS_SPLAT) == 0);
+        // f(x, y, z)
+        int len = compile_args(iseq, args, argn, &kwnode);
+        RUBY_ASSERT(flag_ptr == NULL || (*flag_ptr & VM_CALL_ARGS_SPLAT) == 0);
 
-          if (kwnode) {
-              if (compile_keyword_arg(iseq, args, kwnode, kwarg_ptr, flag_ptr)) {
-                  len -= 1;
-              }
-              else {
-                  compile_hash(iseq, args, kwnode, TRUE, FALSE);
-              }
-          }
+        if (kwnode) {
+            if (compile_keyword_arg(iseq, args, kwnode, kwarg_ptr, flag_ptr)) {
+                len -= 1;
+            }
+            else {
+                if (keyword_node_single_splat_p(kwnode) && (*dup_rest & DUP_SINGLE_KW_SPLAT)) {
+                    compile_single_keyword_splat_mutable(iseq, args, argn, kwnode, flag_ptr);
+                }
+                else {
+                    compile_hash(iseq, args, kwnode, TRUE, FALSE);
+                }
+            }
+        }
 
-          return len;
+        return len;
       }
       case NODE_SPLAT: {
-          // f(*a)
-          NO_CHECK(COMPILE(args, "args (splat)", argn->nd_head));
-          ADD_INSN1(args, argn, splatarray, RBOOL(dup_rest));
-          if (flag_ptr) *flag_ptr |= VM_CALL_ARGS_SPLAT;
-          RUBY_ASSERT(flag_ptr == NULL || (*flag_ptr & VM_CALL_KW_SPLAT) == 0);
-          return 1;
+        // f(*a)
+        NO_CHECK(COMPILE(args, "args (splat)", RNODE_SPLAT(argn)->nd_head));
+        ADD_INSN1(args, argn, splatarray, RBOOL(*dup_rest & SPLATARRAY_TRUE));
+        if (*dup_rest & SPLATARRAY_TRUE) *dup_rest &= ~SPLATARRAY_TRUE;
+        if (flag_ptr) *flag_ptr |= VM_CALL_ARGS_SPLAT;
+        RUBY_ASSERT(flag_ptr == NULL || (*flag_ptr & VM_CALL_KW_SPLAT) == 0);
+        return 1;
       }
       case NODE_ARGSCAT: {
-          if (flag_ptr) *flag_ptr |= VM_CALL_ARGS_SPLAT;
-          int argc = setup_args_core(iseq, args, argn->nd_head, 1, NULL, NULL);
+        if (flag_ptr) *flag_ptr |= VM_CALL_ARGS_SPLAT;
+        int argc = setup_args_core(iseq, args, RNODE_ARGSCAT(argn)->nd_head, dup_rest, NULL, NULL);
+        bool args_pushed = false;
 
-          if (nd_type_p(argn->nd_body, NODE_LIST)) {
-              int rest_len = compile_args(iseq, args, argn->nd_body, &kwnode);
-              if (kwnode) rest_len--;
-              ADD_INSN1(args, argn, newarray, INT2FIX(rest_len));
-          }
-          else {
-              RUBY_ASSERT(!check_keyword(argn->nd_body));
-              NO_CHECK(COMPILE(args, "args (cat: splat)", argn->nd_body));
-          }
+        if (nd_type_p(RNODE_ARGSCAT(argn)->nd_body, NODE_LIST)) {
+            int rest_len = compile_args(iseq, args, RNODE_ARGSCAT(argn)->nd_body, &kwnode);
+            if (kwnode) rest_len--;
+            ADD_INSN1(args, argn, pushtoarray, INT2FIX(rest_len));
+            args_pushed = true;
+        }
+        else {
+            RUBY_ASSERT(!check_keyword(RNODE_ARGSCAT(argn)->nd_body));
+            NO_CHECK(COMPILE(args, "args (cat: splat)", RNODE_ARGSCAT(argn)->nd_body));
+        }
 
-          if (nd_type_p(argn->nd_head, NODE_LIST)) {
-              ADD_INSN1(args, argn, splatarray, Qtrue);
-              argc += 1;
-          }
-          else {
-              ADD_INSN1(args, argn, splatarray, Qfalse);
-              ADD_INSN(args, argn, concatarray);
-          }
+        if (nd_type_p(RNODE_ARGSCAT(argn)->nd_head, NODE_LIST)) {
+            ADD_INSN1(args, argn, splatarray, RBOOL(*dup_rest & SPLATARRAY_TRUE));
+            if (*dup_rest & SPLATARRAY_TRUE) *dup_rest &= ~SPLATARRAY_TRUE;
+            argc += 1;
+        }
+        else if (!args_pushed) {
+            ADD_INSN(args, argn, concattoarray);
+        }
 
-          // f(..., *a, ..., k1:1, ...) #=> f(..., *[*a, ...], **{k1:1, ...})
-          if (kwnode) {
-              // kwsplat
-              *flag_ptr |= VM_CALL_KW_SPLAT;
-              *flag_ptr |= VM_CALL_KW_SPLAT_MUT;
-              compile_hash(iseq, args, kwnode, TRUE, FALSE);
-              argc += 1;
-          }
+        // f(..., *a, ..., k1:1, ...) #=> f(..., *[*a, ...], **{k1:1, ...})
+        if (kwnode) {
+            // kwsplat
+            *flag_ptr |= VM_CALL_KW_SPLAT;
+            compile_hash(iseq, args, kwnode, TRUE, FALSE);
+            argc += 1;
+        }
 
-          return argc;
+        return argc;
       }
       case NODE_ARGSPUSH: {
-          if (flag_ptr) *flag_ptr |= VM_CALL_ARGS_SPLAT;
-          int argc = setup_args_core(iseq, args, argn->nd_head, 1, NULL, NULL);
-
-          if (nd_type_p(argn->nd_body, NODE_LIST)) {
-              int rest_len = compile_args(iseq, args, argn->nd_body, &kwnode);
-              if (kwnode) rest_len--;
-              ADD_INSN1(args, argn, newarray, INT2FIX(rest_len));
-              ADD_INSN1(args, argn, newarray, INT2FIX(1));
-              ADD_INSN(args, argn, concatarray);
-          }
-          else {
-              if (keyword_node_p(argn->nd_body)) {
-                  kwnode = argn->nd_body;
-              }
-              else {
-                  NO_CHECK(COMPILE(args, "args (cat: splat)", argn->nd_body));
-                  ADD_INSN1(args, argn, newarray, INT2FIX(1));
-                  ADD_INSN(args, argn, concatarray);
-              }
-          }
+        if (flag_ptr) *flag_ptr |= VM_CALL_ARGS_SPLAT;
+        int argc = setup_args_core(iseq, args, RNODE_ARGSPUSH(argn)->nd_head, dup_rest, NULL, NULL);
 
-          if (kwnode) {
-              // f(*a, k:1)
-              *flag_ptr |= VM_CALL_KW_SPLAT;
-              if (!keyword_node_single_splat_p(kwnode)) {
-                  *flag_ptr |= VM_CALL_KW_SPLAT_MUT;
-              }
-              compile_hash(iseq, args, kwnode, TRUE, FALSE);
-              argc += 1;
-          }
+        if (nd_type_p(RNODE_ARGSPUSH(argn)->nd_body, NODE_LIST)) {
+            int rest_len = compile_args(iseq, args, RNODE_ARGSPUSH(argn)->nd_body, &kwnode);
+            if (kwnode) rest_len--;
+            ADD_INSN1(args, argn, newarray, INT2FIX(rest_len));
+            ADD_INSN1(args, argn, pushtoarray, INT2FIX(1));
+        }
+        else {
+            if (keyword_node_p(RNODE_ARGSPUSH(argn)->nd_body)) {
+                kwnode = RNODE_ARGSPUSH(argn)->nd_body;
+            }
+            else {
+                NO_CHECK(COMPILE(args, "args (cat: splat)", RNODE_ARGSPUSH(argn)->nd_body));
+                ADD_INSN1(args, argn, pushtoarray, INT2FIX(1));
+            }
+        }
+
+        if (kwnode) {
+            // f(*a, k:1)
+            *flag_ptr |= VM_CALL_KW_SPLAT;
+            if (!keyword_node_single_splat_p(kwnode)) {
+                *flag_ptr |= VM_CALL_KW_SPLAT_MUT;
+                compile_hash(iseq, args, kwnode, TRUE, FALSE);
+            }
+            else if (*dup_rest & DUP_SINGLE_KW_SPLAT) {
+                compile_single_keyword_splat_mutable(iseq, args, argn, kwnode, flag_ptr);
+            }
+            else {
+                compile_hash(iseq, args, kwnode, TRUE, FALSE);
+            }
+            argc += 1;
+        }
 
-          return argc;
+        return argc;
       }
       default: {
-          UNKNOWN_NODE("setup_arg", argn, Qnil);
+        UNKNOWN_NODE("setup_arg", argn, Qnil);
       }
     }
 }
 
+static void
+setup_args_splat_mut(unsigned int *flag, int dup_rest, int initial_dup_rest)
+{
+    if ((*flag & VM_CALL_ARGS_SPLAT) && dup_rest != initial_dup_rest) {
+        *flag |= VM_CALL_ARGS_SPLAT_MUT;
+    }
+}
+
+static bool
+setup_args_dup_rest_p(const NODE *argn)
+{
+    switch(nd_type(argn)) {
+      case NODE_LVAR:
+      case NODE_DVAR:
+      case NODE_GVAR:
+      case NODE_IVAR:
+      case NODE_CVAR:
+      case NODE_CONST:
+      case NODE_COLON3:
+      case NODE_INTEGER:
+      case NODE_FLOAT:
+      case NODE_RATIONAL:
+      case NODE_IMAGINARY:
+      case NODE_STR:
+      case NODE_SYM:
+      case NODE_REGX:
+      case NODE_SELF:
+      case NODE_NIL:
+      case NODE_TRUE:
+      case NODE_FALSE:
+      case NODE_LAMBDA:
+      case NODE_NTH_REF:
+      case NODE_BACK_REF:
+        return false;
+      case NODE_COLON2:
+        return setup_args_dup_rest_p(RNODE_COLON2(argn)->nd_head);
+      case NODE_LIST:
+        while (argn) {
+            if (setup_args_dup_rest_p(RNODE_LIST(argn)->nd_head)) {
+                return true;
+            }
+            argn = RNODE_LIST(argn)->nd_next;
+        }
+        return false;
+      default:
+        return true;
+    }
+}
+
 static VALUE
 setup_args(rb_iseq_t *iseq, LINK_ANCHOR *const args, const NODE *argn,
            unsigned int *flag, struct rb_callinfo_kwarg **keywords)
 {
     VALUE ret;
-    if (argn && nd_type_p(argn, NODE_BLOCK_PASS)) {
-        unsigned int dup_rest = 1;
-        DECL_ANCHOR(arg_block);
-        INIT_ANCHOR(arg_block);
-        NO_CHECK(COMPILE(arg_block, "block", argn->nd_body));
+    unsigned int dup_rest = SPLATARRAY_TRUE, initial_dup_rest;
 
-        *flag |= VM_CALL_ARGS_BLOCKARG;
+    if (argn) {
+        const NODE *check_arg = nd_type_p(argn, NODE_BLOCK_PASS) ?
+            RNODE_BLOCK_PASS(argn)->nd_head : argn;
 
-        if (LIST_INSN_SIZE_ONE(arg_block)) {
-            LINK_ELEMENT *elem = FIRST_ELEMENT(arg_block);
-            if (IS_INSN(elem)) {
-                INSN *iobj = (INSN *)elem;
-                if (iobj->insn_id == BIN(getblockparam)) {
-                    iobj->insn_id = BIN(getblockparamproxy);
+        if (check_arg) {
+            switch(nd_type(check_arg)) {
+              case(NODE_SPLAT):
+                // avoid caller side array allocation for f(*arg)
+                dup_rest = SPLATARRAY_FALSE;
+                break;
+              case(NODE_ARGSCAT):
+                // avoid caller side array allocation for f(1, *arg)
+                dup_rest = !nd_type_p(RNODE_ARGSCAT(check_arg)->nd_head, NODE_LIST);
+                break;
+              case(NODE_ARGSPUSH):
+                // avoid caller side array allocation for f(*arg, **hash) and f(1, *arg, **hash)
+                dup_rest = !((nd_type_p(RNODE_ARGSPUSH(check_arg)->nd_head, NODE_SPLAT) ||
+                    (nd_type_p(RNODE_ARGSPUSH(check_arg)->nd_head, NODE_ARGSCAT) &&
+                     nd_type_p(RNODE_ARGSCAT(RNODE_ARGSPUSH(check_arg)->nd_head)->nd_head, NODE_LIST))) &&
+                    nd_type_p(RNODE_ARGSPUSH(check_arg)->nd_body, NODE_HASH) &&
+                    !RNODE_HASH(RNODE_ARGSPUSH(check_arg)->nd_body)->nd_brace);
+
+                if (dup_rest == SPLATARRAY_FALSE) {
+                    // require allocation for keyword key/value/splat that may modify splatted argument
+                    NODE *node = RNODE_HASH(RNODE_ARGSPUSH(check_arg)->nd_body)->nd_head;
+                    while (node) {
+                        NODE *key_node = RNODE_LIST(node)->nd_head;
+                        if (key_node && setup_args_dup_rest_p(key_node)) {
+                            dup_rest = SPLATARRAY_TRUE;
+                            break;
+                        }
+
+                        node = RNODE_LIST(node)->nd_next;
+                        NODE *value_node = RNODE_LIST(node)->nd_head;
+                        if (setup_args_dup_rest_p(value_node)) {
+                            dup_rest = SPLATARRAY_TRUE;
+                            break;
+                        }
+
+                        node = RNODE_LIST(node)->nd_next;
+                    }
                 }
-                dup_rest = 0;
+                break;
+              default:
+                break;
             }
         }
-        ret = INT2FIX(setup_args_core(iseq, args, argn->nd_head, dup_rest, flag, keywords));
-        ADD_SEQ(args, arg_block);
-    }
-    else {
-        ret = INT2FIX(setup_args_core(iseq, args, argn, 0, flag, keywords));
+
+        if (check_arg != argn && setup_args_dup_rest_p(RNODE_BLOCK_PASS(argn)->nd_body)) {
+            // for block pass that may modify splatted argument, dup rest and kwrest if given
+            dup_rest = SPLATARRAY_TRUE | DUP_SINGLE_KW_SPLAT;
+        }
     }
+    initial_dup_rest = dup_rest;
+
+    if (argn && nd_type_p(argn, NODE_BLOCK_PASS)) {
+        DECL_ANCHOR(arg_block);
+        INIT_ANCHOR(arg_block);
+
+        if (RNODE_BLOCK_PASS(argn)->forwarding && ISEQ_BODY(ISEQ_BODY(iseq)->local_iseq)->param.flags.forwardable) {
+            int idx = ISEQ_BODY(ISEQ_BODY(iseq)->local_iseq)->local_table_size;// - get_local_var_idx(iseq, idDot3);
+
+            RUBY_ASSERT(nd_type_p(RNODE_BLOCK_PASS(argn)->nd_head, NODE_ARGSPUSH));
+            const NODE * arg_node =
+                RNODE_ARGSPUSH(RNODE_BLOCK_PASS(argn)->nd_head)->nd_head;
+
+            int argc = 0;
+
+            // Only compile leading args:
+            //   foo(x, y, ...)
+            //       ^^^^
+            if (nd_type_p(arg_node, NODE_ARGSCAT)) {
+                argc += setup_args_core(iseq, args, RNODE_ARGSCAT(arg_node)->nd_head, &dup_rest, flag, keywords);
+            }
+
+            *flag |= VM_CALL_FORWARDING;
+
+            ADD_GETLOCAL(args, argn, idx, get_lvar_level(iseq));
+            setup_args_splat_mut(flag, dup_rest, initial_dup_rest);
+            return INT2FIX(argc);
+        }
+        else {
+            *flag |= VM_CALL_ARGS_BLOCKARG;
+
+            NO_CHECK(COMPILE(arg_block, "block", RNODE_BLOCK_PASS(argn)->nd_body));
+        }
+
+        if (LIST_INSN_SIZE_ONE(arg_block)) {
+            LINK_ELEMENT *elem = FIRST_ELEMENT(arg_block);
+            if (IS_INSN(elem)) {
+                INSN *iobj = (INSN *)elem;
+                if (iobj->insn_id == BIN(getblockparam)) {
+                    iobj->insn_id = BIN(getblockparamproxy);
+                }
+            }
+        }
+        ret = INT2FIX(setup_args_core(iseq, args, RNODE_BLOCK_PASS(argn)->nd_head, &dup_rest, flag, keywords));
+        ADD_SEQ(args, arg_block);
+    }
+    else {
+        ret = INT2FIX(setup_args_core(iseq, args, argn, &dup_rest, flag, keywords));
+    }
+    setup_args_splat_mut(flag, dup_rest, initial_dup_rest);
     return ret;
 }
 
@@ -5899,7 +6778,7 @@ build_postexe_iseq(rb_iseq_t *iseq, LINK_ANCHOR *ret, const void *ptr)
     ADD_INSN1(ret, body, putspecialobject, INT2FIX(VM_SPECIAL_OBJECT_VMCORE));
     ADD_CALL_WITH_BLOCK(ret, body, id_core_set_postexe, argc, block);
     RB_OBJ_WRITTEN(iseq, Qundef, (VALUE)block);
-    iseq_set_local_table(iseq, 0);
+    iseq_set_local_table(iseq, 0, 0);
 }
 
 static void
@@ -5919,19 +6798,19 @@ compile_named_capture_assign(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE
     ADD_INSN(ret, line_node, dup);
     ADD_INSNL(ret, line_node, branchunless, fail_label);
 
-    for (vars = node; vars; vars = vars->nd_next) {
+    for (vars = node; vars; vars = RNODE_BLOCK(vars)->nd_next) {
         INSN *cap;
-        if (vars->nd_next) {
+        if (RNODE_BLOCK(vars)->nd_next) {
             ADD_INSN(ret, line_node, dup);
         }
         last = ret->last;
-        NO_CHECK(COMPILE_POPPED(ret, "capture", vars->nd_head));
+        NO_CHECK(COMPILE_POPPED(ret, "capture", RNODE_BLOCK(vars)->nd_head));
         last = last->next; /* putobject :var */
-        cap = new_insn_send(iseq, line_node, idAREF, INT2FIX(1),
+        cap = new_insn_send(iseq, nd_line(line_node), nd_node_id(line_node), idAREF, INT2FIX(1),
                             NULL, INT2FIX(0), NULL);
         ELEM_INSERT_PREV(last->next, (LINK_ELEMENT *)cap);
 #if !defined(NAMED_CAPTURE_SINGLE_OPT) || NAMED_CAPTURE_SINGLE_OPT-0
-        if (!vars->nd_next && vars == node) {
+        if (!RNODE_BLOCK(vars)->nd_next && vars == node) {
             /* only one name */
             DECL_ANCHOR(nom);
 
@@ -5952,9 +6831,9 @@ compile_named_capture_assign(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE
     ADD_INSNL(ret, line_node, jump, end_label);
     ADD_LABEL(ret, fail_label);
     ADD_INSN(ret, line_node, pop);
-    for (vars = node; vars; vars = vars->nd_next) {
+    for (vars = node; vars; vars = RNODE_BLOCK(vars)->nd_next) {
         last = ret->last;
-        NO_CHECK(COMPILE_POPPED(ret, "capture", vars->nd_head));
+        NO_CHECK(COMPILE_POPPED(ret, "capture", RNODE_BLOCK(vars)->nd_head));
         last = last->next; /* putobject :var */
         ((INSN*)last)->insn_id = BIN(putnil);
         ((INSN*)last)->operand_size = 0;
@@ -5967,8 +6846,10 @@ optimizable_range_item_p(const NODE *n)
 {
     if (!n) return FALSE;
     switch (nd_type(n)) {
-      case NODE_LIT:
-        return RB_INTEGER_TYPE_P(n->nd_lit);
+      case NODE_LINE:
+        return TRUE;
+      case NODE_INTEGER:
+        return TRUE;
       case NODE_NIL:
         return TRUE;
       default:
@@ -5976,11 +6857,32 @@ optimizable_range_item_p(const NODE *n)
     }
 }
 
+static VALUE
+optimized_range_item(const NODE *n)
+{
+    switch (nd_type(n)) {
+      case NODE_LINE:
+        return rb_node_line_lineno_val(n);
+      case NODE_INTEGER:
+        return rb_node_integer_literal_val(n);
+      case NODE_FLOAT:
+        return rb_node_float_literal_val(n);
+      case NODE_RATIONAL:
+        return rb_node_rational_literal_val(n);
+      case NODE_IMAGINARY:
+        return rb_node_imaginary_literal_val(n);
+      case NODE_NIL:
+        return Qnil;
+      default:
+        rb_bug("unexpected node: %s", ruby_node_name(nd_type(n)));
+    }
+}
+
 static int
 compile_if(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const node, int popped, const enum node_type type)
 {
-    const NODE *const node_body = type == NODE_IF ? node->nd_body : node->nd_else;
-    const NODE *const node_else = type == NODE_IF ? node->nd_else : node->nd_body;
+    const NODE *const node_body = type == NODE_IF ? RNODE_IF(node)->nd_body : RNODE_UNLESS(node)->nd_else;
+    const NODE *const node_else = type == NODE_IF ? RNODE_IF(node)->nd_else : RNODE_UNLESS(node)->nd_body;
 
     const int line = nd_line(node);
     const NODE *line_node = node;
@@ -5993,11 +6895,16 @@ compile_if(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const node, int
     else_label = NEW_LABEL(line);
     end_label = 0;
 
-    compile_branch_condition(iseq, cond_seq, node->nd_cond, then_label, else_label);
+    NODE *cond = RNODE_IF(node)->nd_cond;
+    if (nd_type(cond) == NODE_BLOCK) {
+        cond = RNODE_BLOCK(cond)->nd_head;
+    }
+
+    CHECK(compile_branch_condition(iseq, cond_seq, cond, then_label, else_label));
     ADD_SEQ(ret, cond_seq);
 
     if (then_label->refcnt && else_label->refcnt) {
-        branches = decl_branch_base(iseq, node, type == NODE_IF ? "if" : "unless");
+        branches = decl_branch_base(iseq, PTR2NUM(node), nd_code_loc(node), type == NODE_IF ? "if" : "unless");
     }
 
     if (then_label->refcnt) {
@@ -6008,10 +6915,12 @@ compile_if(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const node, int
         CHECK(COMPILE_(then_seq, "then", node_body, popped));
 
         if (else_label->refcnt) {
+            const NODE *const coverage_node = node_body ? node_body : node;
             add_trace_branch_coverage(
                 iseq,
                 ret,
-                node_body ? node_body : node,
+                nd_code_loc(coverage_node),
+                nd_node_id(coverage_node),
                 0,
                 type == NODE_IF ? "then" : "else",
                 branches);
@@ -6032,10 +6941,12 @@ compile_if(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const node, int
         CHECK(COMPILE_(else_seq, "else", node_else, popped));
 
         if (then_label->refcnt) {
+            const NODE *const coverage_node = node_else ? node_else : node;
             add_trace_branch_coverage(
                 iseq,
                 ret,
-                node_else ? node_else : node,
+                nd_code_loc(coverage_node),
+                nd_node_id(coverage_node),
                 1,
                 type == NODE_IF ? "else" : "then",
                 branches);
@@ -6073,11 +6984,11 @@ compile_case(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const orig_nod
 
     RHASH_TBL_RAW(literals)->type = &cdhash_type;
 
-    CHECK(COMPILE(head, "case base", node->nd_head));
+    CHECK(COMPILE(head, "case base", RNODE_CASE(node)->nd_head));
 
-    branches = decl_branch_base(iseq, node, "case");
+    branches = decl_branch_base(iseq, PTR2NUM(node), nd_code_loc(node), "case");
 
-    node = node->nd_body;
+    node = RNODE_CASE(node)->nd_body;
     EXPECT_NODE("NODE_CASE", node, NODE_WHEN, COMPILE_NG);
     type = nd_type(node);
     line = nd_line(node);
@@ -6094,17 +7005,21 @@ compile_case(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const orig_nod
         l1 = NEW_LABEL(line);
         ADD_LABEL(body_seq, l1);
         ADD_INSN(body_seq, line_node, pop);
+
+        const NODE *const coverage_node = RNODE_WHEN(node)->nd_body ? RNODE_WHEN(node)->nd_body : node;
         add_trace_branch_coverage(
                 iseq,
                 body_seq,
-                node->nd_body ? node->nd_body : node,
+                nd_code_loc(coverage_node),
+                nd_node_id(coverage_node),
                 branch_id++,
                 "when",
                 branches);
-        CHECK(COMPILE_(body_seq, "when body", node->nd_body, popped));
+
+        CHECK(COMPILE_(body_seq, "when body", RNODE_WHEN(node)->nd_body, popped));
         ADD_INSNL(body_seq, line_node, jump, endlabel);
 
-        vals = node->nd_head;
+        vals = RNODE_WHEN(node)->nd_head;
         if (vals) {
             switch (nd_type(vals)) {
               case NODE_LIST:
@@ -6125,7 +7040,7 @@ compile_case(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const orig_nod
             EXPECT_NODE_NONULL("NODE_CASE", node, NODE_LIST, COMPILE_NG);
         }
 
-        node = node->nd_next;
+        node = RNODE_WHEN(node)->nd_next;
         if (!node) {
             break;
         }
@@ -6137,7 +7052,7 @@ compile_case(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const orig_nod
     if (node) {
         ADD_LABEL(cond_seq, elselabel);
         ADD_INSN(cond_seq, line_node, pop);
-        add_trace_branch_coverage(iseq, cond_seq, node, branch_id, "else", branches);
+        add_trace_branch_coverage(iseq, cond_seq, nd_code_loc(node), nd_node_id(node), branch_id, "else", branches);
         CHECK(COMPILE_(cond_seq, "else", node, popped));
         ADD_INSNL(cond_seq, line_node, jump, endlabel);
     }
@@ -6145,7 +7060,7 @@ compile_case(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const orig_nod
         debugs("== else (implicit)\n");
         ADD_LABEL(cond_seq, elselabel);
         ADD_INSN(cond_seq, orig_node, pop);
-        add_trace_branch_coverage(iseq, cond_seq, orig_node, branch_id, "else", branches);
+        add_trace_branch_coverage(iseq, cond_seq, nd_code_loc(orig_node), nd_node_id(orig_node), branch_id, "else", branches);
         if (!popped) {
             ADD_INSN(cond_seq, orig_node, putnil);
         }
@@ -6170,13 +7085,13 @@ compile_case2(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const orig_no
 {
     const NODE *vals;
     const NODE *val;
-    const NODE *node = orig_node->nd_body;
+    const NODE *node = RNODE_CASE2(orig_node)->nd_body;
     LABEL *endlabel;
     DECL_ANCHOR(body_seq);
     VALUE branches = Qfalse;
     int branch_id = 0;
 
-    branches = decl_branch_base(iseq, orig_node, "case");
+    branches = decl_branch_base(iseq, PTR2NUM(orig_node), nd_code_loc(orig_node), "case");
 
     INIT_ANCHOR(body_seq);
     endlabel = NEW_LABEL(nd_line(node));
@@ -6185,17 +7100,21 @@ compile_case2(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const orig_no
         const int line = nd_line(node);
         LABEL *l1 = NEW_LABEL(line);
         ADD_LABEL(body_seq, l1);
+
+        const NODE *const coverage_node = RNODE_WHEN(node)->nd_body ? RNODE_WHEN(node)->nd_body : node;
         add_trace_branch_coverage(
                 iseq,
                 body_seq,
-                node->nd_body ? node->nd_body : node,
+                nd_code_loc(coverage_node),
+                nd_node_id(coverage_node),
                 branch_id++,
                 "when",
                 branches);
-        CHECK(COMPILE_(body_seq, "when", node->nd_body, popped));
+
+        CHECK(COMPILE_(body_seq, "when", RNODE_WHEN(node)->nd_body, popped));
         ADD_INSNL(body_seq, node, jump, endlabel);
 
-        vals = node->nd_head;
+        vals = RNODE_WHEN(node)->nd_head;
         if (!vals) {
             EXPECT_NODE_NONULL("NODE_WHEN", node, NODE_LIST, COMPILE_NG);
         }
@@ -6203,12 +7122,12 @@ compile_case2(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const orig_no
           case NODE_LIST:
             while (vals) {
                 LABEL *lnext;
-                val = vals->nd_head;
+                val = RNODE_LIST(vals)->nd_head;
                 lnext = NEW_LABEL(nd_line(val));
                 debug_compile("== when2\n", (void)0);
                 CHECK(compile_branch_condition(iseq, ret, val, l1, lnext));
                 ADD_LABEL(ret, lnext);
-                vals = vals->nd_next;
+                vals = RNODE_LIST(vals)->nd_next;
             }
             break;
           case NODE_SPLAT:
@@ -6222,13 +7141,15 @@ compile_case2(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const orig_no
           default:
             UNKNOWN_NODE("NODE_WHEN", vals, COMPILE_NG);
         }
-        node = node->nd_next;
+        node = RNODE_WHEN(node)->nd_next;
     }
     /* else */
+    const NODE *const coverage_node = node ? node : orig_node;
     add_trace_branch_coverage(
         iseq,
         ret,
-        node ? node : orig_node,
+        nd_code_loc(coverage_node),
+        nd_node_id(coverage_node),
         branch_id,
         "else",
         branches);
@@ -6314,14 +7235,13 @@ iseq_compile_pattern_each(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *c
          * match_failed:
          *   goto unmatched
          */
-        struct rb_ary_pattern_info *apinfo = node->nd_apinfo;
-        const NODE *args = apinfo->pre_args;
-        const int pre_args_num = apinfo->pre_args ? rb_long2int(apinfo->pre_args->nd_alen) : 0;
-        const int post_args_num = apinfo->post_args ? rb_long2int(apinfo->post_args->nd_alen) : 0;
+        const NODE *args = RNODE_ARYPTN(node)->pre_args;
+        const int pre_args_num = RNODE_ARYPTN(node)->pre_args ? rb_long2int(RNODE_LIST(RNODE_ARYPTN(node)->pre_args)->as.nd_alen) : 0;
+        const int post_args_num = RNODE_ARYPTN(node)->post_args ? rb_long2int(RNODE_LIST(RNODE_ARYPTN(node)->post_args)->as.nd_alen) : 0;
 
         const int min_argc = pre_args_num + post_args_num;
-        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));
+        const int use_rest_num = RNODE_ARYPTN(node)->rest_arg && (NODE_NAMED_REST_P(RNODE_ARYPTN(node)->rest_arg) ||
+                                                      (!NODE_NAMED_REST_P(RNODE_ARYPTN(node)->rest_arg) && post_args_num > 0));
 
         LABEL *match_failed, *type_error, *deconstruct, *deconstructed;
         int i;
@@ -6345,10 +7265,10 @@ iseq_compile_pattern_each(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *c
         ADD_INSN(ret, line_node, dup);
         ADD_SEND(ret, line_node, idLength, INT2FIX(0));
         ADD_INSN1(ret, line_node, putobject, INT2FIX(min_argc));
-        ADD_SEND(ret, line_node, apinfo->rest_arg ? idGE : idEq, INT2FIX(1)); // (1)
+        ADD_SEND(ret, line_node, RNODE_ARYPTN(node)->rest_arg ? idGE : idEq, INT2FIX(1)); // (1)
         if (in_single_pattern) {
             CHECK(iseq_compile_pattern_set_length_errmsg(iseq, ret, node,
-                                                         apinfo->rest_arg ? rb_fstring_lit("%p length mismatch (given %p, expected %p+)") :
+                                                         RNODE_ARYPTN(node)->rest_arg ? rb_fstring_lit("%p length mismatch (given %p, expected %p+)") :
                                                                             rb_fstring_lit("%p length mismatch (given %p, expected %p)"),
                                                          INT2FIX(min_argc), base_index + 1 /* (1) */));
         }
@@ -6358,12 +7278,12 @@ iseq_compile_pattern_each(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *c
             ADD_INSN(ret, line_node, dup);
             ADD_INSN1(ret, line_node, putobject, INT2FIX(i));
             ADD_SEND(ret, line_node, idAREF, INT2FIX(1)); // (2)
-            CHECK(iseq_compile_pattern_match(iseq, ret, args->nd_head, match_failed, in_single_pattern, in_alt_pattern, base_index + 1 /* (2) */, false));
-            args = args->nd_next;
+            CHECK(iseq_compile_pattern_match(iseq, ret, RNODE_LIST(args)->nd_head, match_failed, in_single_pattern, in_alt_pattern, base_index + 1 /* (2) */, false));
+            args = RNODE_LIST(args)->nd_next;
         }
 
-        if (apinfo->rest_arg) {
-            if (NODE_NAMED_REST_P(apinfo->rest_arg)) {
+        if (RNODE_ARYPTN(node)->rest_arg) {
+            if (NODE_NAMED_REST_P(RNODE_ARYPTN(node)->rest_arg)) {
                 ADD_INSN(ret, line_node, dup);
                 ADD_INSN1(ret, line_node, putobject, INT2FIX(pre_args_num));
                 ADD_INSN1(ret, line_node, topn, INT2FIX(1));
@@ -6373,7 +7293,7 @@ iseq_compile_pattern_each(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *c
                 ADD_INSN1(ret, line_node, setn, INT2FIX(4));
                 ADD_SEND(ret, line_node, idAREF, INT2FIX(2)); // (3)
 
-                CHECK(iseq_compile_pattern_match(iseq, ret, apinfo->rest_arg, match_failed, in_single_pattern, in_alt_pattern, base_index + 1 /* (3) */, false));
+                CHECK(iseq_compile_pattern_match(iseq, ret, RNODE_ARYPTN(node)->rest_arg, match_failed, in_single_pattern, in_alt_pattern, base_index + 1 /* (3) */, false));
             }
             else {
                 if (post_args_num > 0) {
@@ -6387,7 +7307,7 @@ iseq_compile_pattern_each(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *c
             }
         }
 
-        args = apinfo->post_args;
+        args = RNODE_ARYPTN(node)->post_args;
         for (i = 0; i < post_args_num; i++) {
             ADD_INSN(ret, line_node, dup);
 
@@ -6396,8 +7316,8 @@ iseq_compile_pattern_each(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *c
             ADD_SEND(ret, line_node, idPLUS, INT2FIX(1));
 
             ADD_SEND(ret, line_node, idAREF, INT2FIX(1)); // (4)
-            CHECK(iseq_compile_pattern_match(iseq, ret, args->nd_head, match_failed, in_single_pattern, in_alt_pattern, base_index + 1 /* (4) */, false));
-            args = args->nd_next;
+            CHECK(iseq_compile_pattern_match(iseq, ret, RNODE_LIST(args)->nd_head, match_failed, in_single_pattern, in_alt_pattern, base_index + 1 /* (4) */, false));
+            args = RNODE_LIST(args)->nd_next;
         }
 
         ADD_INSN(ret, line_node, pop);
@@ -6475,9 +7395,8 @@ iseq_compile_pattern_each(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *c
          * match_failed:
          *   goto unmatched
          */
-        struct rb_fnd_pattern_info *fpinfo = node->nd_fpinfo;
-        const NODE *args = fpinfo->args;
-        const int args_num = fpinfo->args ? rb_long2int(fpinfo->args->nd_alen) : 0;
+        const NODE *args = RNODE_FNDPTN(node)->args;
+        const int args_num = RNODE_FNDPTN(node)->args ? rb_long2int(RNODE_LIST(RNODE_FNDPTN(node)->args)->as.nd_alen) : 0;
 
         LABEL *match_failed, *type_error, *deconstruct, *deconstructed;
         match_failed = NEW_LABEL(line);
@@ -6530,25 +7449,25 @@ iseq_compile_pattern_each(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *c
                 }
                 ADD_SEND(ret, line_node, idAREF, INT2FIX(1)); // (5)
 
-                CHECK(iseq_compile_pattern_match(iseq, ret, args->nd_head, next_loop, in_single_pattern, in_alt_pattern, base_index + 4 /* (2), (3), (4), (5) */, false));
-                args = args->nd_next;
+                CHECK(iseq_compile_pattern_match(iseq, ret, RNODE_LIST(args)->nd_head, next_loop, in_single_pattern, in_alt_pattern, base_index + 4 /* (2), (3), (4), (5) */, false));
+                args = RNODE_LIST(args)->nd_next;
             }
 
-            if (NODE_NAMED_REST_P(fpinfo->pre_rest_arg)) {
+            if (NODE_NAMED_REST_P(RNODE_FNDPTN(node)->pre_rest_arg)) {
                 ADD_INSN1(ret, line_node, topn, INT2FIX(3));
                 ADD_INSN1(ret, line_node, putobject, INT2FIX(0));
                 ADD_INSN1(ret, line_node, topn, INT2FIX(2));
                 ADD_SEND(ret, line_node, idAREF, INT2FIX(2)); // (6)
-                CHECK(iseq_compile_pattern_match(iseq, ret, fpinfo->pre_rest_arg, find_failed, in_single_pattern, in_alt_pattern, base_index + 4 /* (2), (3), (4), (6) */, false));
+                CHECK(iseq_compile_pattern_match(iseq, ret, RNODE_FNDPTN(node)->pre_rest_arg, find_failed, in_single_pattern, in_alt_pattern, base_index + 4 /* (2), (3), (4), (6) */, false));
             }
-            if (NODE_NAMED_REST_P(fpinfo->post_rest_arg)) {
+            if (NODE_NAMED_REST_P(RNODE_FNDPTN(node)->post_rest_arg)) {
                 ADD_INSN1(ret, line_node, topn, INT2FIX(3));
                 ADD_INSN1(ret, line_node, topn, INT2FIX(1));
                 ADD_INSN1(ret, line_node, putobject, INT2FIX(args_num));
                 ADD_SEND(ret, line_node, idPLUS, INT2FIX(1));
                 ADD_INSN1(ret, line_node, topn, INT2FIX(3));
                 ADD_SEND(ret, line_node, idAREF, INT2FIX(2)); // (7)
-                CHECK(iseq_compile_pattern_match(iseq, ret, fpinfo->post_rest_arg, find_failed, in_single_pattern, in_alt_pattern, base_index + 4 /* (2), (3),(4), (7) */, false));
+                CHECK(iseq_compile_pattern_match(iseq, ret, RNODE_FNDPTN(node)->post_rest_arg, find_failed, in_single_pattern, in_alt_pattern, base_index + 4 /* (2), (3),(4), (7) */, false));
             }
             ADD_INSNL(ret, line_node, jump, find_succeeded);
 
@@ -6662,12 +7581,12 @@ iseq_compile_pattern_each(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *c
         match_failed = NEW_LABEL(line);
         type_error = NEW_LABEL(line);
 
-        if (node->nd_pkwargs && !node->nd_pkwrestarg) {
-            const NODE *kw_args = node->nd_pkwargs->nd_head;
-            keys = rb_ary_new_capa(kw_args ? kw_args->nd_alen/2 : 0);
+        if (RNODE_HSHPTN(node)->nd_pkwargs && !RNODE_HSHPTN(node)->nd_pkwrestarg) {
+            const NODE *kw_args = RNODE_HASH(RNODE_HSHPTN(node)->nd_pkwargs)->nd_head;
+            keys = rb_ary_new_capa(kw_args ? RNODE_LIST(kw_args)->as.nd_alen/2 : 0);
             while (kw_args) {
-                rb_ary_push(keys, kw_args->nd_head->nd_lit);
-                kw_args = kw_args->nd_next->nd_next;
+                rb_ary_push(keys, get_symbol_value(iseq, RNODE_LIST(kw_args)->nd_head));
+                kw_args = RNODE_LIST(RNODE_LIST(kw_args)->nd_next)->nd_next;
             }
         }
 
@@ -6694,28 +7613,23 @@ iseq_compile_pattern_each(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *c
         ADD_INSN1(ret, line_node, checktype, INT2FIX(T_HASH));
         ADD_INSNL(ret, line_node, branchunless, type_error);
 
-        if (node->nd_pkwrestarg) {
+        if (RNODE_HSHPTN(node)->nd_pkwrestarg) {
             ADD_SEND(ret, line_node, rb_intern("dup"), INT2FIX(0));
         }
 
-        if (node->nd_pkwargs) {
+        if (RNODE_HSHPTN(node)->nd_pkwargs) {
             int i;
             int keys_num;
             const NODE *args;
-            args = node->nd_pkwargs->nd_head;
+            args = RNODE_HASH(RNODE_HSHPTN(node)->nd_pkwargs)->nd_head;
             if (args) {
                 DECL_ANCHOR(match_values);
                 INIT_ANCHOR(match_values);
-                keys_num = rb_long2int(args->nd_alen) / 2;
+                keys_num = rb_long2int(RNODE_LIST(args)->as.nd_alen) / 2;
                 for (i = 0; i < keys_num; i++) {
-                    NODE *key_node = args->nd_head;
-                    NODE *value_node = args->nd_next->nd_head;
-                    VALUE key;
-
-                    if (!nd_type_p(key_node, NODE_LIT)) {
-                        UNKNOWN_NODE("NODE_IN", key_node, COMPILE_NG);
-                    }
-                    key = key_node->nd_lit;
+                    NODE *key_node = RNODE_LIST(args)->nd_head;
+                    NODE *value_node = RNODE_LIST(RNODE_LIST(args)->nd_next)->nd_head;
+                    VALUE key = get_symbol_value(iseq, key_node);
 
                     ADD_INSN(ret, line_node, dup);
                     ADD_INSN1(ret, line_node, putobject, key);
@@ -6744,9 +7658,9 @@ iseq_compile_pattern_each(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *c
 
                     ADD_INSN(match_values, line_node, dup);
                     ADD_INSN1(match_values, line_node, putobject, key);
-                    ADD_SEND(match_values, line_node, node->nd_pkwrestarg ? rb_intern("delete") : idAREF, INT2FIX(1)); // (8)
+                    ADD_SEND(match_values, line_node, RNODE_HSHPTN(node)->nd_pkwrestarg ? rb_intern("delete") : idAREF, INT2FIX(1)); // (8)
                     CHECK(iseq_compile_pattern_match(iseq, match_values, value_node, match_failed, in_single_pattern, in_alt_pattern, base_index + 1 /* (8) */, false));
-                    args = args->nd_next->nd_next;
+                    args = RNODE_LIST(RNODE_LIST(args)->nd_next)->nd_next;
                 }
                 ADD_SEQ(ret, match_values);
             }
@@ -6760,8 +7674,8 @@ iseq_compile_pattern_each(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *c
             ADD_INSNL(ret, line_node, branchunless, match_failed);
         }
 
-        if (node->nd_pkwrestarg) {
-            if (node->nd_pkwrestarg == NODE_SPECIAL_NO_REST_KEYWORD) {
+        if (RNODE_HSHPTN(node)->nd_pkwrestarg) {
+            if (RNODE_HSHPTN(node)->nd_pkwrestarg == NODE_SPECIAL_NO_REST_KEYWORD) {
                 ADD_INSN(ret, line_node, dup);
                 ADD_SEND(ret, line_node, idEmptyP, INT2FIX(0)); // (10)
                 if (in_single_pattern) {
@@ -6771,7 +7685,7 @@ iseq_compile_pattern_each(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *c
             }
             else {
                 ADD_INSN(ret, line_node, dup); // (11)
-                CHECK(iseq_compile_pattern_match(iseq, ret, node->nd_pkwrestarg, match_failed, in_single_pattern, in_alt_pattern, base_index + 1 /* (11) */, false));
+                CHECK(iseq_compile_pattern_match(iseq, ret, RNODE_HSHPTN(node)->nd_pkwrestarg, match_failed, in_single_pattern, in_alt_pattern, base_index + 1 /* (11) */, false));
             }
         }
 
@@ -6791,7 +7705,15 @@ iseq_compile_pattern_each(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *c
         ADD_INSNL(ret, line_node, jump, unmatched);
         break;
       }
-      case NODE_LIT:
+      case NODE_SYM:
+      case NODE_REGX:
+      case NODE_LINE:
+      case NODE_INTEGER:
+      case NODE_FLOAT:
+      case NODE_RATIONAL:
+      case NODE_IMAGINARY:
+      case NODE_FILE:
+      case NODE_ENCODING:
       case NODE_STR:
       case NODE_XSTR:
       case NODE_DSTR:
@@ -6815,6 +7737,8 @@ iseq_compile_pattern_each(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *c
       case NODE_COLON2:
       case NODE_COLON3:
       case NODE_BEGIN:
+      case NODE_BLOCK:
+      case NODE_ONCE:
         CHECK(COMPILE(ret, "case in literal", node)); // (1)
         if (in_single_pattern) {
             ADD_INSN1(ret, line_node, dupn, INT2FIX(2));
@@ -6828,7 +7752,7 @@ iseq_compile_pattern_each(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *c
         break;
       case NODE_LASGN: {
         struct rb_iseq_constant_body *const body = ISEQ_BODY(iseq);
-        ID id = node->nd_vid;
+        ID id = RNODE_LASGN(node)->nd_vid;
         int idx = ISEQ_BODY(body->local_iseq)->local_table_size - get_local_var_idx(iseq, id);
 
         if (in_alt_pattern) {
@@ -6846,7 +7770,7 @@ iseq_compile_pattern_each(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *c
       }
       case NODE_DASGN: {
         int idx, lv, ls;
-        ID id = node->nd_vid;
+        ID id = RNODE_DASGN(node)->nd_vid;
 
         idx = get_dyna_var_idx(iseq, id, &lv, &ls);
 
@@ -6872,8 +7796,8 @@ iseq_compile_pattern_each(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *c
       case NODE_UNLESS: {
         LABEL *match_failed;
         match_failed = unmatched;
-        CHECK(iseq_compile_pattern_match(iseq, ret, node->nd_body, unmatched, in_single_pattern, in_alt_pattern, base_index, use_deconstructed_cache));
-        CHECK(COMPILE(ret, "case in if", node->nd_cond));
+        CHECK(iseq_compile_pattern_match(iseq, ret, RNODE_IF(node)->nd_body, unmatched, in_single_pattern, in_alt_pattern, base_index, use_deconstructed_cache));
+        CHECK(COMPILE(ret, "case in if", RNODE_IF(node)->nd_cond));
         if (in_single_pattern) {
             LABEL *match_succeeded;
             match_succeeded = NEW_LABEL(line);
@@ -6910,15 +7834,15 @@ iseq_compile_pattern_each(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *c
         LABEL *match_failed;
         match_failed = NEW_LABEL(line);
 
-        n = node->nd_head;
-        if (! (nd_type_p(n, NODE_LIST) && n->nd_alen == 2)) {
+        n = RNODE_HASH(node)->nd_head;
+        if (! (nd_type_p(n, NODE_LIST) && RNODE_LIST(n)->as.nd_alen == 2)) {
             COMPILE_ERROR(ERROR_ARGS "unexpected node");
             return COMPILE_NG;
         }
 
         ADD_INSN(ret, line_node, dup); // (1)
-        CHECK(iseq_compile_pattern_match(iseq, ret, n->nd_head, match_failed, in_single_pattern, in_alt_pattern, base_index + 1 /* (1) */, use_deconstructed_cache));
-        CHECK(iseq_compile_pattern_each(iseq, ret, n->nd_next->nd_head, matched, match_failed, in_single_pattern, in_alt_pattern, base_index, false));
+        CHECK(iseq_compile_pattern_match(iseq, ret, RNODE_LIST(n)->nd_head, match_failed, in_single_pattern, in_alt_pattern, base_index + 1 /* (1) */, use_deconstructed_cache));
+        CHECK(iseq_compile_pattern_each(iseq, ret, RNODE_LIST(RNODE_LIST(n)->nd_next)->nd_head, matched, match_failed, in_single_pattern, in_alt_pattern, base_index, false));
         ADD_INSN(ret, line_node, putnil);
 
         ADD_LABEL(ret, match_failed);
@@ -6932,13 +7856,13 @@ iseq_compile_pattern_each(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *c
         fin = NEW_LABEL(line);
 
         ADD_INSN(ret, line_node, dup); // (1)
-        CHECK(iseq_compile_pattern_each(iseq, ret, node->nd_1st, match_succeeded, fin, in_single_pattern, true, base_index + 1 /* (1) */, use_deconstructed_cache));
+        CHECK(iseq_compile_pattern_each(iseq, ret, RNODE_OR(node)->nd_1st, match_succeeded, fin, in_single_pattern, true, base_index + 1 /* (1) */, use_deconstructed_cache));
         ADD_LABEL(ret, match_succeeded);
         ADD_INSN(ret, line_node, pop);
         ADD_INSNL(ret, line_node, jump, matched);
         ADD_INSN(ret, line_node, putnil);
         ADD_LABEL(ret, fin);
-        CHECK(iseq_compile_pattern_each(iseq, ret, node->nd_2nd, matched, unmatched, in_single_pattern, true, base_index, use_deconstructed_cache));
+        CHECK(iseq_compile_pattern_each(iseq, ret, RNODE_OR(node)->nd_2nd, matched, unmatched, in_single_pattern, true, base_index, use_deconstructed_cache));
         break;
       }
       default:
@@ -6961,9 +7885,9 @@ iseq_compile_pattern_constant(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NOD
 {
     const NODE *line_node = node;
 
-    if (node->nd_pconst) {
+    if (RNODE_ARYPTN(node)->nd_pconst) {
         ADD_INSN(ret, line_node, dup); // (1)
-        CHECK(COMPILE(ret, "constant", node->nd_pconst)); // (2)
+        CHECK(COMPILE(ret, "constant", RNODE_ARYPTN(node)->nd_pconst)); // (2)
         if (in_single_pattern) {
             ADD_INSN1(ret, line_node, dupn, INT2FIX(2));
         }
@@ -7164,14 +8088,14 @@ compile_case3(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const orig_no
     INIT_ANCHOR(body_seq);
     INIT_ANCHOR(cond_seq);
 
-    branches = decl_branch_base(iseq, node, "case");
+    branches = decl_branch_base(iseq, PTR2NUM(node), nd_code_loc(node), "case");
 
-    node = node->nd_body;
+    node = RNODE_CASE3(node)->nd_body;
     EXPECT_NODE("NODE_CASE3", node, NODE_IN, COMPILE_NG);
     type = nd_type(node);
     line = nd_line(node);
     line_node = node;
-    single_pattern = !node->nd_next;
+    single_pattern = !RNODE_IN(node)->nd_next;
 
     endlabel = NEW_LABEL(line);
     elselabel = NEW_LABEL(line);
@@ -7185,7 +8109,7 @@ compile_case3(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const orig_no
     }
     ADD_INSN(head, line_node, putnil); /* allocate stack for cached #deconstruct value */
 
-    CHECK(COMPILE(head, "case base", orig_node->nd_head));
+    CHECK(COMPILE(head, "case base", RNODE_CASE3(orig_node)->nd_head));
 
     ADD_SEQ(ret, head);	/* case VAL */
 
@@ -7198,17 +8122,21 @@ compile_case3(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const orig_no
         l1 = NEW_LABEL(line);
         ADD_LABEL(body_seq, l1);
         ADD_INSN1(body_seq, line_node, adjuststack, INT2FIX(single_pattern ? 6 : 2));
+
+        const NODE *const coverage_node = RNODE_IN(node)->nd_body ? RNODE_IN(node)->nd_body : node;
         add_trace_branch_coverage(
             iseq,
             body_seq,
-            node->nd_body ? node->nd_body : node,
+            nd_code_loc(coverage_node),
+            nd_node_id(coverage_node),
             branch_id++,
             "in",
             branches);
-        CHECK(COMPILE_(body_seq, "in body", node->nd_body, popped));
+
+        CHECK(COMPILE_(body_seq, "in body", RNODE_IN(node)->nd_body, popped));
         ADD_INSNL(body_seq, line_node, jump, endlabel);
 
-        pattern = node->nd_head;
+        pattern = RNODE_IN(node)->nd_head;
         if (pattern) {
             int pat_line = nd_line(pattern);
             LABEL *next_pat = NEW_LABEL(pat_line);
@@ -7223,7 +8151,7 @@ compile_case3(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const orig_no
             return COMPILE_NG;
         }
 
-        node = node->nd_next;
+        node = RNODE_IN(node)->nd_next;
         if (!node) {
             break;
         }
@@ -7236,7 +8164,7 @@ compile_case3(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const orig_no
         ADD_LABEL(cond_seq, elselabel);
         ADD_INSN(cond_seq, line_node, pop);
         ADD_INSN(cond_seq, line_node, pop); /* discard cached #deconstruct value */
-        add_trace_branch_coverage(iseq, cond_seq, node, branch_id, "else", branches);
+        add_trace_branch_coverage(iseq, cond_seq, nd_code_loc(node), nd_node_id(node), branch_id, "else", branches);
         CHECK(COMPILE_(cond_seq, "else", node, popped));
         ADD_INSNL(cond_seq, line_node, jump, endlabel);
         ADD_INSN(cond_seq, line_node, putnil);
@@ -7247,7 +8175,7 @@ compile_case3(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const orig_no
     else {
         debugs("== else (implicit)\n");
         ADD_LABEL(cond_seq, elselabel);
-        add_trace_branch_coverage(iseq, cond_seq, orig_node, branch_id, "else", branches);
+        add_trace_branch_coverage(iseq, cond_seq, nd_code_loc(orig_node), nd_node_id(orig_node), branch_id, "else", branches);
         ADD_INSN1(cond_seq, orig_node, putspecialobject, INT2FIX(VM_SPECIAL_OBJECT_VMCORE));
 
         if (single_pattern) {
@@ -7265,6 +8193,7 @@ compile_case3(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const orig_no
             fin = NEW_LABEL(line);
 
             kw_arg = rb_xmalloc_mul_add(2, sizeof(VALUE), sizeof(struct rb_callinfo_kwarg));
+            kw_arg->references = 0;
             kw_arg->keyword_len = 2;
             kw_arg->keywords[0] = ID2SYM(rb_intern("matchee"));
             kw_arg->keywords[1] = ID2SYM(rb_intern("key"));
@@ -7348,7 +8277,7 @@ compile_loop(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const node, in
     ISEQ_COMPILE_DATA(iseq)->loopval_popped = 0;
     push_ensure_entry(iseq, &enl, NULL, NULL);
 
-    if (node->nd_state == 1) {
+    if (RNODE_WHILE(node)->nd_state == 1) {
         ADD_INSNL(ret, line_node, jump, next_label);
     }
     else {
@@ -7363,31 +8292,35 @@ compile_loop(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const node, in
     if (tmp_label) ADD_LABEL(ret, tmp_label);
 
     ADD_LABEL(ret, redo_label);
-    branches = decl_branch_base(iseq, node, type == NODE_WHILE ? "while" : "until");
+    branches = decl_branch_base(iseq, PTR2NUM(node), nd_code_loc(node), type == NODE_WHILE ? "while" : "until");
+
+    const NODE *const coverage_node = RNODE_WHILE(node)->nd_body ? RNODE_WHILE(node)->nd_body : node;
     add_trace_branch_coverage(
         iseq,
         ret,
-        node->nd_body ? node->nd_body : node,
+        nd_code_loc(coverage_node),
+        nd_node_id(coverage_node),
         0,
         "body",
         branches);
-    CHECK(COMPILE_POPPED(ret, "while body", node->nd_body));
+
+    CHECK(COMPILE_POPPED(ret, "while body", RNODE_WHILE(node)->nd_body));
     ADD_LABEL(ret, next_label);	/* next */
 
     if (type == NODE_WHILE) {
-        compile_branch_condition(iseq, ret, node->nd_cond,
-                                 redo_label, end_label);
+        CHECK(compile_branch_condition(iseq, ret, RNODE_WHILE(node)->nd_cond,
+                                       redo_label, end_label));
     }
     else {
         /* until */
-        compile_branch_condition(iseq, ret, node->nd_cond,
-                                 end_label, redo_label);
+        CHECK(compile_branch_condition(iseq, ret, RNODE_WHILE(node)->nd_cond,
+                                       end_label, redo_label));
     }
 
     ADD_LABEL(ret, end_label);
     ADD_ADJUST_RESTORE(ret, adjust_label);
 
-    if (UNDEF_P(node->nd_state)) {
+    if (UNDEF_P(RNODE_WHILE(node)->nd_state)) {
         /* ADD_INSN(ret, line_node, putundef); */
         COMPILE_ERROR(ERROR_ARGS "unsupported: putundef");
         return COMPILE_NG;
@@ -7429,18 +8362,18 @@ compile_iter(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const node, in
 
     ADD_LABEL(ret, retry_label);
     if (nd_type_p(node, NODE_FOR)) {
-        CHECK(COMPILE(ret, "iter caller (for)", node->nd_iter));
+        CHECK(COMPILE(ret, "iter caller (for)", RNODE_FOR(node)->nd_iter));
 
         ISEQ_COMPILE_DATA(iseq)->current_block = child_iseq =
-            NEW_CHILD_ISEQ(node->nd_body, make_name_for_block(iseq),
+            NEW_CHILD_ISEQ(RNODE_FOR(node)->nd_body, make_name_for_block(iseq),
                            ISEQ_TYPE_BLOCK, line);
         ADD_SEND_WITH_BLOCK(ret, line_node, idEach, INT2FIX(0), child_iseq);
     }
     else {
         ISEQ_COMPILE_DATA(iseq)->current_block = child_iseq =
-            NEW_CHILD_ISEQ(node->nd_body, make_name_for_block(iseq),
+            NEW_CHILD_ISEQ(RNODE_ITER(node)->nd_body, make_name_for_block(iseq),
                            ISEQ_TYPE_BLOCK, line);
-        CHECK(COMPILE(ret, "iter caller", node->nd_iter));
+        CHECK(COMPILE(ret, "iter caller", RNODE_ITER(node)->nd_iter));
     }
 
     {
@@ -7451,11 +8384,11 @@ compile_iter(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const node, in
         // Normally, "send" instruction is at the last.
         // However, qcall under branch coverage measurement adds some instructions after the "send".
         //
-        // Note that "invokesuper" appears instead of "send".
+        // Note that "invokesuper", "invokesuperforward" appears instead of "send".
         INSN *iobj;
         LINK_ELEMENT *last_elem = LAST_ELEMENT(ret);
         iobj = IS_INSN(last_elem) ? (INSN*) last_elem : (INSN*) get_prev_insn((INSN*) last_elem);
-        while (INSN_OF(iobj) != BIN(send) && INSN_OF(iobj) != BIN(invokesuper)) {
+        while (!IS_INSN_ID(iobj, send) && !IS_INSN_ID(iobj, invokesuper) && !IS_INSN_ID(iobj, sendforward) && !IS_INSN_ID(iobj, invokesuperforward)) {
             iobj = (INSN*) get_prev_insn(iobj);
         }
         ELEM_INSERT_NEXT(&iobj->link, (LINK_ELEMENT*) retry_end_l);
@@ -7484,7 +8417,7 @@ compile_for_masgn(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const nod
      * (args.length == 1 && Array.try_convert(args[0])) || args
      */
     const NODE *line_node = node;
-    const NODE *var = node->nd_var;
+    const NODE *var = RNODE_FOR_MASGN(node)->nd_var;
     LABEL *not_single = NEW_LABEL(nd_line(var));
     LABEL *not_ary = NEW_LABEL(nd_line(var));
     CHECK(COMPILE(ret, "for var", var));
@@ -7519,7 +8452,7 @@ compile_break(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const node, i
         LABEL *splabel = NEW_LABEL(0);
         ADD_LABEL(ret, splabel);
         ADD_ADJUST(ret, line_node, ISEQ_COMPILE_DATA(iseq)->redo_label);
-        CHECK(COMPILE_(ret, "break val (while/until)", node->nd_stts,
+        CHECK(COMPILE_(ret, "break val (while/until)", RNODE_BREAK(node)->nd_stts,
                        ISEQ_COMPILE_DATA(iseq)->loopval_popped));
         add_ensure_iseq(ret, iseq, 0);
         ADD_INSNL(ret, line_node, jump, ISEQ_COMPILE_DATA(iseq)->end_label);
@@ -7554,7 +8487,7 @@ compile_break(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const node, i
             }
 
             /* escape from block */
-            CHECK(COMPILE(ret, "break val (block)", node->nd_stts));
+            CHECK(COMPILE(ret, "break val (block)", RNODE_BREAK(node)->nd_stts));
             ADD_INSN1(ret, line_node, throw, INT2FIX(throw_flag | TAG_BREAK));
             if (popped) {
                 ADD_INSN(ret, line_node, pop);
@@ -7577,7 +8510,7 @@ compile_next(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const node, in
         LABEL *splabel = NEW_LABEL(0);
         debugs("next in while loop\n");
         ADD_LABEL(ret, splabel);
-        CHECK(COMPILE(ret, "next val/valid syntax?", node->nd_stts));
+        CHECK(COMPILE(ret, "next val/valid syntax?", RNODE_NEXT(node)->nd_stts));
         add_ensure_iseq(ret, iseq, 0);
         ADD_ADJUST(ret, line_node, ISEQ_COMPILE_DATA(iseq)->redo_label);
         ADD_INSNL(ret, line_node, jump, ISEQ_COMPILE_DATA(iseq)->start_label);
@@ -7591,11 +8524,10 @@ compile_next(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const node, in
         debugs("next in block\n");
         ADD_LABEL(ret, splabel);
         ADD_ADJUST(ret, line_node, ISEQ_COMPILE_DATA(iseq)->start_label);
-        CHECK(COMPILE(ret, "next val", node->nd_stts));
+        CHECK(COMPILE(ret, "next val", RNODE_NEXT(node)->nd_stts));
         add_ensure_iseq(ret, iseq, 0);
         ADD_INSNL(ret, line_node, jump, ISEQ_COMPILE_DATA(iseq)->end_label);
         ADD_ADJUST_RESTORE(ret, splabel);
-        splabel->unremovable = FALSE;
 
         if (!popped) {
             ADD_INSN(ret, line_node, putnil);
@@ -7626,7 +8558,7 @@ compile_next(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const node, in
             ip = ISEQ_BODY(ip)->parent_iseq;
         }
         if (ip != 0) {
-            CHECK(COMPILE(ret, "next val", node->nd_stts));
+            CHECK(COMPILE(ret, "next val", RNODE_NEXT(node)->nd_stts));
             ADD_INSN1(ret, line_node, throw, INT2FIX(throw_flag | TAG_NEXT));
 
             if (popped) {
@@ -7738,7 +8670,7 @@ compile_rescue(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const node,
     LABEL *lstart = NEW_LABEL(line);
     LABEL *lend = NEW_LABEL(line);
     LABEL *lcont = NEW_LABEL(line);
-    const rb_iseq_t *rescue = NEW_CHILD_ISEQ(node->nd_resq,
+    const rb_iseq_t *rescue = NEW_CHILD_ISEQ(RNODE_RESCUE(node)->nd_resq,
                                              rb_str_concat(rb_str_new2("rescue in "),
                                                            ISEQ_BODY(iseq)->location.label),
                                              ISEQ_TYPE_RESCUE, line);
@@ -7750,14 +8682,14 @@ compile_rescue(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const node,
     bool prev_in_rescue = ISEQ_COMPILE_DATA(iseq)->in_rescue;
     ISEQ_COMPILE_DATA(iseq)->in_rescue = true;
     {
-        CHECK(COMPILE(ret, "rescue head", node->nd_head));
+        CHECK(COMPILE(ret, "rescue head", RNODE_RESCUE(node)->nd_head));
     }
     ISEQ_COMPILE_DATA(iseq)->in_rescue = prev_in_rescue;
 
     ADD_LABEL(ret, lend);
-    if (node->nd_else) {
+    if (RNODE_RESCUE(node)->nd_else) {
         ADD_INSN(ret, line_node, pop);
-        CHECK(COMPILE(ret, "rescue else", node->nd_else));
+        CHECK(COMPILE(ret, "rescue else", RNODE_RESCUE(node)->nd_else));
     }
     ADD_INSN(ret, line_node, nop);
     ADD_LABEL(ret, lcont);
@@ -7785,16 +8717,16 @@ compile_resbody(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const node,
         label_miss = NEW_LABEL(line);
         label_hit = NEW_LABEL(line);
 
-        narg = resq->nd_args;
+        narg = RNODE_RESBODY(resq)->nd_args;
         if (narg) {
             switch (nd_type(narg)) {
               case NODE_LIST:
                 while (narg) {
                     ADD_GETLOCAL(ret, line_node, LVAR_ERRINFO, 0);
-                    CHECK(COMPILE(ret, "rescue arg", narg->nd_head));
+                    CHECK(COMPILE(ret, "rescue arg", RNODE_LIST(narg)->nd_head));
                     ADD_INSN1(ret, line_node, checkmatch, INT2FIX(VM_CHECKMATCH_TYPE_RESCUE));
                     ADD_INSNL(ret, line_node, branchif, label_hit);
-                    narg = narg->nd_next;
+                    narg = RNODE_LIST(narg)->nd_next;
                 }
                 break;
               case NODE_SPLAT:
@@ -7819,14 +8751,16 @@ compile_resbody(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const node,
         ADD_LABEL(ret, label_hit);
         ADD_TRACE(ret, RUBY_EVENT_RESCUE);
 
-        if (nd_type(resq->nd_body) == NODE_BEGIN && resq->nd_body->nd_body == NULL) {
+        if (RNODE_RESBODY(resq)->nd_exc_var) {
+            CHECK(COMPILE_POPPED(ret, "resbody exc_var", RNODE_RESBODY(resq)->nd_exc_var));
+        }
+
+        if (nd_type(RNODE_RESBODY(resq)->nd_body) == NODE_BEGIN && RNODE_BEGIN(RNODE_RESBODY(resq)->nd_body)->nd_body == NULL && !RNODE_RESBODY(resq)->nd_exc_var) {
             // empty body
-            int lineno = nd_line(resq->nd_body);
-            NODE dummy_line_node = generate_dummy_line_node(lineno, -1);
-            ADD_INSN(ret, &dummy_line_node, putnil);
+            ADD_SYNTHETIC_INSN(ret, nd_line(RNODE_RESBODY(resq)->nd_body), -1, putnil);
         }
         else {
-            CHECK(COMPILE(ret, "resbody body", resq->nd_body));
+            CHECK(COMPILE(ret, "resbody body", RNODE_RESBODY(resq)->nd_body));
         }
 
         if (ISEQ_COMPILE_DATA(iseq)->option->tailcall_optimization) {
@@ -7834,7 +8768,7 @@ compile_resbody(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const node,
         }
         ADD_INSN(ret, line_node, leave);
         ADD_LABEL(ret, label_miss);
-        resq = resq->nd_head;
+        resq = RNODE_RESBODY(resq)->nd_next;
     }
     return COMPILE_OK;
 }
@@ -7842,10 +8776,10 @@ compile_resbody(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const node,
 static int
 compile_ensure(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const node, int popped)
 {
-    const int line = nd_line(node);
+    const int line = nd_line(RNODE_ENSURE(node)->nd_ensr);
     const NODE *line_node = node;
     DECL_ANCHOR(ensr);
-    const rb_iseq_t *ensure = NEW_CHILD_ISEQ(node->nd_ensr,
+    const rb_iseq_t *ensure = NEW_CHILD_ISEQ(RNODE_ENSURE(node)->nd_ensr,
                                              rb_str_concat(rb_str_new2 ("ensure in "), ISEQ_BODY(iseq)->location.label),
                                              ISEQ_TYPE_ENSURE, line);
     LABEL *lstart = NEW_LABEL(line);
@@ -7858,17 +8792,17 @@ compile_ensure(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const node,
     struct ensure_range *erange;
 
     INIT_ANCHOR(ensr);
-    CHECK(COMPILE_POPPED(ensr, "ensure ensr", node->nd_ensr));
+    CHECK(COMPILE_POPPED(ensr, "ensure ensr", RNODE_ENSURE(node)->nd_ensr));
     last = ensr->last;
     last_leave = last && IS_INSN(last) && IS_INSN_ID(last, leave);
 
     er.begin = lstart;
     er.end = lend;
     er.next = 0;
-    push_ensure_entry(iseq, &enl, &er, node->nd_ensr);
+    push_ensure_entry(iseq, &enl, &er, RNODE_ENSURE(node)->nd_ensr);
 
     ADD_LABEL(ret, lstart);
-    CHECK(COMPILE_(ret, "ensure head", node->nd_head, (popped | last_leave)));
+    CHECK(COMPILE_(ret, "ensure head", RNODE_ENSURE(node)->nd_head, (popped | last_leave)));
     ADD_LABEL(ret, lend);
     ADD_SEQ(ret, ensr);
     if (!popped && last_leave) ADD_INSN(ret, line_node, putnil);
@@ -7897,7 +8831,7 @@ compile_return(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const node,
         enum rb_iseq_type type = ISEQ_BODY(iseq)->type;
         const rb_iseq_t *is = iseq;
         enum rb_iseq_type t = type;
-        const NODE *retval = node->nd_stts;
+        const NODE *retval = RNODE_RETURN(node)->nd_stts;
         LABEL *splabel = 0;
 
         while (t == ISEQ_TYPE_RESCUE || t == ISEQ_TYPE_ENSURE) {
@@ -7947,6 +8881,27 @@ compile_return(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const node,
     return COMPILE_OK;
 }
 
+static bool
+drop_unreachable_return(LINK_ANCHOR *ret)
+{
+    LINK_ELEMENT *i = ret->last, *last;
+    if (!i) return false;
+    if (IS_TRACE(i)) i = i->prev;
+    if (!IS_INSN(i) || !IS_INSN_ID(i, putnil)) return false;
+    last = i = i->prev;
+    if (IS_ADJUST(i)) i = i->prev;
+    if (!IS_INSN(i)) return false;
+    switch (INSN_OF(i)) {
+      case BIN(leave):
+      case BIN(jump):
+        break;
+      default:
+        return false;
+    }
+    (ret->last = last->prev)->next = NULL;
+    return true;
+}
+
 static int
 compile_evstr(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const node, int popped)
 {
@@ -7980,11 +8935,11 @@ qcall_branch_start(rb_iseq_t *iseq, LINK_ANCHOR *const recv, VALUE *branches, co
     LABEL *else_label = NEW_LABEL(nd_line(line_node));
     VALUE br = 0;
 
-    br = decl_branch_base(iseq, node, "&.");
+    br = decl_branch_base(iseq, PTR2NUM(node), nd_code_loc(node), "&.");
     *branches = br;
     ADD_INSN(recv, line_node, dup);
     ADD_INSNL(recv, line_node, branchnil, else_label);
-    add_trace_branch_coverage(iseq, recv, node, 0, "then", br);
+    add_trace_branch_coverage(iseq, recv, nd_code_loc(node), nd_node_id(node), 0, "then", br);
     return else_label;
 }
 
@@ -7996,7 +8951,7 @@ qcall_branch_end(rb_iseq_t *iseq, LINK_ANCHOR *const ret, LABEL *else_label, VAL
     end_label = NEW_LABEL(nd_line(line_node));
     ADD_INSNL(ret, line_node, jump, end_label);
     ADD_LABEL(ret, else_label);
-    add_trace_branch_coverage(iseq, ret, node, 1, "else", branches);
+    add_trace_branch_coverage(iseq, ret, nd_code_loc(node), nd_node_id(node), 1, "else", branches);
     ADD_LABEL(ret, end_label);
 }
 
@@ -8006,13 +8961,14 @@ compile_call_precheck_freeze(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE
     /* optimization shortcut
      *   "literal".freeze -> opt_str_freeze("literal")
      */
-    if (node->nd_recv && nd_type_p(node->nd_recv, NODE_STR) &&
-        (node->nd_mid == idFreeze || node->nd_mid == idUMinus) &&
-        node->nd_args == NULL &&
+    if (get_nd_recv(node) &&
+        (nd_type_p(get_nd_recv(node), NODE_STR) || nd_type_p(get_nd_recv(node), NODE_FILE)) &&
+        (get_node_call_nd_mid(node) == idFreeze || get_node_call_nd_mid(node) == idUMinus) &&
+        get_nd_args(node) == NULL &&
         ISEQ_COMPILE_DATA(iseq)->current_block == NULL &&
         ISEQ_COMPILE_DATA(iseq)->option->specialized_instruction) {
-        VALUE str = rb_fstring(node->nd_recv->nd_lit);
-        if (node->nd_mid == idUMinus) {
+        VALUE str = get_string_value(get_nd_recv(node));
+        if (get_node_call_nd_mid(node) == idUMinus) {
             ADD_INSN2(ret, line_node, opt_str_uminus, str,
                       new_callinfo(iseq, idUMinus, 0, 0, NULL, FALSE));
         }
@@ -8029,14 +8985,14 @@ compile_call_precheck_freeze(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE
     /* optimization shortcut
      *   obj["literal"] -> opt_aref_with(obj, "literal")
      */
-    if (node->nd_mid == idAREF && !private_recv_p(node) && node->nd_args &&
-        nd_type_p(node->nd_args, NODE_LIST) && node->nd_args->nd_alen == 1 &&
-        nd_type_p(node->nd_args->nd_head, NODE_STR) &&
+    if (get_node_call_nd_mid(node) == idAREF && !private_recv_p(node) && get_nd_args(node) &&
+        nd_type_p(get_nd_args(node), NODE_LIST) && RNODE_LIST(get_nd_args(node))->as.nd_alen == 1 &&
+        (nd_type_p(RNODE_LIST(get_nd_args(node))->nd_head, NODE_STR) || nd_type_p(RNODE_LIST(get_nd_args(node))->nd_head, NODE_FILE)) &&
         ISEQ_COMPILE_DATA(iseq)->current_block == NULL &&
-        !ISEQ_COMPILE_DATA(iseq)->option->frozen_string_literal &&
+        !frozen_string_literal_p(iseq) &&
         ISEQ_COMPILE_DATA(iseq)->option->specialized_instruction) {
-        VALUE str = rb_fstring(node->nd_args->nd_head->nd_lit);
-        CHECK(COMPILE(ret, "recv", node->nd_recv));
+        VALUE str = get_string_value(RNODE_LIST(get_nd_args(node))->nd_head);
+        CHECK(COMPILE(ret, "recv", get_nd_recv(node)));
         ADD_INSN2(ret, line_node, opt_aref_with, str,
                   new_callinfo(iseq, idAREF, 1, 0, NULL, FALSE));
         RB_OBJ_WRITTEN(iseq, Qundef, str);
@@ -8079,12 +9035,12 @@ iseq_builtin_function_name(const enum node_type type, const NODE *recv, ID mid)
         if (recv) {
             switch (nd_type(recv)) {
               case NODE_VCALL:
-                if (recv->nd_mid == rb_intern("__builtin")) {
+                if (RNODE_VCALL(recv)->nd_mid == rb_intern("__builtin")) {
                     return name;
                 }
                 break;
               case NODE_CONST:
-                if (recv->nd_vid == rb_intern("Primitive")) {
+                if (RNODE_CONST(recv)->nd_vid == rb_intern("Primitive")) {
                     return name;
                 }
                 break;
@@ -8174,21 +9130,33 @@ compile_builtin_attr(rb_iseq_t *iseq, const NODE *node)
     if (!node) goto no_arg;
     while (node) {
         if (!nd_type_p(node, NODE_LIST)) goto bad_arg;
-        const NODE *next = node->nd_next;
+        const NODE *next = RNODE_LIST(node)->nd_next;
 
-        node = node->nd_head;
+        node = RNODE_LIST(node)->nd_head;
         if (!node) goto no_arg;
-        if (!nd_type_p(node, NODE_LIT)) goto bad_arg;
+        switch (nd_type(node)) {
+          case NODE_SYM:
+            symbol = rb_node_sym_string_val(node);
+            break;
+          default:
+            goto bad_arg;
+        }
 
-        symbol = node->nd_lit;
         if (!SYMBOL_P(symbol)) goto non_symbol_arg;
 
-        string = rb_sym_to_s(symbol);
+        string = rb_sym2str(symbol);
         if (strcmp(RSTRING_PTR(string), "leaf") == 0) {
             ISEQ_BODY(iseq)->builtin_attrs |= BUILTIN_ATTR_LEAF;
         }
-        else if (strcmp(RSTRING_PTR(string), "no_gc") == 0) {
-            ISEQ_BODY(iseq)->builtin_attrs |= BUILTIN_ATTR_NO_GC;
+        else if (strcmp(RSTRING_PTR(string), "inline_block") == 0) {
+            ISEQ_BODY(iseq)->builtin_attrs |= BUILTIN_ATTR_INLINE_BLOCK;
+        }
+        else if (strcmp(RSTRING_PTR(string), "use_block") == 0) {
+            iseq_set_use_block(iseq);
+        }
+        else if (strcmp(RSTRING_PTR(string), "c_trace") == 0) {
+            // Let the iseq act like a C method in backtraces
+            ISEQ_BODY(iseq)->builtin_attrs |= BUILTIN_ATTR_C_TRACE;
         }
         else {
             goto unknown_arg;
@@ -8212,13 +9180,20 @@ compile_builtin_attr(rb_iseq_t *iseq, const NODE *node)
 static int
 compile_builtin_arg(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *node, const NODE *line_node, int popped)
 {
+    VALUE name;
+
     if (!node) goto no_arg;
     if (!nd_type_p(node, NODE_LIST)) goto bad_arg;
-    if (node->nd_next) goto too_many_arg;
-    node = node->nd_head;
+    if (RNODE_LIST(node)->nd_next) goto too_many_arg;
+    node = RNODE_LIST(node)->nd_head;
     if (!node) goto no_arg;
-    if (!nd_type_p(node, NODE_LIT)) goto bad_arg;
-    VALUE name = node->nd_lit;
+    switch (nd_type(node)) {
+      case NODE_SYM:
+        name = rb_node_sym_string_val(node);
+        break;
+      default:
+        goto bad_arg;
+    }
     if (!SYMBOL_P(name)) goto non_symbol_arg;
     if (!popped) {
         compile_lvar(iseq, ret, line_node, SYM2ID(name));
@@ -8242,8 +9217,8 @@ static NODE *
 mandatory_node(const rb_iseq_t *iseq, const NODE *cond_node)
 {
     const NODE *node = ISEQ_COMPILE_DATA(iseq)->root_node;
-    if (nd_type(node) == NODE_IF && node->nd_cond == cond_node) {
-        return node->nd_body;
+    if (nd_type(node) == NODE_IF && RNODE_IF(node)->nd_cond == cond_node) {
+        return RNODE_IF(node)->nd_body;
     }
     else {
         rb_bug("mandatory_node: can't find mandatory node");
@@ -8257,8 +9232,9 @@ compile_builtin_mandatory_only_method(rb_iseq_t *iseq, const NODE *node, const N
     struct rb_args_info args = {
         .pre_args_num = ISEQ_BODY(iseq)->param.lead_num,
     };
-    NODE args_node;
-    rb_node_init(&args_node, NODE_ARGS, 0, 0, (VALUE)&args);
+    rb_node_args_t args_node;
+    rb_node_init(RNODE(&args_node), NODE_ARGS);
+    args_node.nd_ainfo = args;
 
     // local table without non-mandatory parameters
     const int skip_local_size = ISEQ_BODY(iseq)->param.size - ISEQ_BODY(iseq)->param.lead_num;
@@ -8279,21 +9255,21 @@ compile_builtin_mandatory_only_method(rb_iseq_t *iseq, const NODE *node, const N
         tbl->ids[i] = ISEQ_BODY(iseq)->local_table[i + skip_local_size];
     }
 
-    NODE scope_node;
-    rb_node_init(&scope_node, NODE_SCOPE, (VALUE)tbl, (VALUE)mandatory_node(iseq, node), (VALUE)&args_node);
+    rb_node_scope_t scope_node;
+    rb_node_init(RNODE(&scope_node), NODE_SCOPE);
+    scope_node.nd_tbl = tbl;
+    scope_node.nd_body = mandatory_node(iseq, node);
+    scope_node.nd_args = &args_node;
 
-    rb_ast_body_t ast = {
-        .root = &scope_node,
-        .frozen_string_literal = -1,
-        .coverage_enabled = -1,
-        .script_lines = ISEQ_BODY(iseq)->variable.script_lines,
-    };
+    VALUE ast_value = rb_ruby_ast_new(RNODE(&scope_node));
 
-    ISEQ_BODY(iseq)->mandatory_only_iseq =
-      rb_iseq_new_with_opt(&ast, rb_iseq_base_label(iseq),
+    const rb_iseq_t *mandatory_only_iseq =
+      rb_iseq_new_with_opt(ast_value, rb_iseq_base_label(iseq),
                            rb_iseq_path(iseq), rb_iseq_realpath(iseq),
                            nd_line(line_node), NULL, 0,
-                           ISEQ_TYPE_METHOD, ISEQ_COMPILE_DATA(iseq)->option);
+                           ISEQ_TYPE_METHOD, ISEQ_COMPILE_DATA(iseq)->option,
+                           ISEQ_BODY(iseq)->variable.script_lines);
+    RB_OBJ_WRITE(iseq, &ISEQ_BODY(iseq)->mandatory_only_iseq, (VALUE)mandatory_only_iseq);
 
     ALLOCV_END(idtmp);
     return COMPILE_OK;
@@ -8303,7 +9279,7 @@ static int
 compile_builtin_function_call(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const node, const NODE *line_node, int popped,
                               const rb_iseq_t *parent_block, LINK_ANCHOR *args, const char *builtin_func)
 {
-    NODE *args_node = node->nd_args;
+    NODE *args_node = get_nd_args(node);
 
     if (parent_block != NULL) {
         COMPILE_ERROR(ERROR_ARGS_AT(line_node) "should not call builtins here.");
@@ -8326,7 +9302,6 @@ compile_builtin_function_call(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NOD
             }
             else if (strcmp("cinit!", builtin_func) == 0) {
                 // ignore
-                GET_VM()->builtin_inline_index++;
                 return COMPILE_OK;
             }
             else if (strcmp("attr!", builtin_func) == 0) {
@@ -8354,10 +9329,7 @@ compile_builtin_function_call(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NOD
                 return COMPILE_NG;
             }
 
-            if (GET_VM()->builtin_inline_index == INT_MAX) {
-                rb_bug("builtin inline function index overflow:%s", builtin_func);
-            }
-            int inline_index = GET_VM()->builtin_inline_index++;
+            int inline_index = nd_line(node);
             snprintf(inline_func, sizeof(inline_func), BUILTIN_INLINE_PREFIX "%d", inline_index);
             builtin_func = inline_func;
             args_node = NULL;
@@ -8366,7 +9338,7 @@ compile_builtin_function_call(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NOD
 
         if (cconst) {
             typedef VALUE(*builtin_func0)(void *, VALUE);
-            VALUE const_val = (*(builtin_func0)bf->func_ptr)(NULL, Qnil);
+            VALUE const_val = (*(builtin_func0)(uintptr_t)bf->func_ptr)(NULL, Qnil);
             ADD_INSN1(ret, line_node, putobject, const_val);
             return COMPILE_OK;
         }
@@ -8406,7 +9378,7 @@ compile_call(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const node, co
      */
     DECL_ANCHOR(recv);
     DECL_ANCHOR(args);
-    ID mid = node->nd_mid;
+    ID mid = get_node_call_nd_mid(node);
     VALUE argc;
     unsigned int flag = 0;
     struct rb_callinfo_kwarg *keywords = NULL;
@@ -8418,6 +9390,7 @@ compile_call(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const node, co
 
     INIT_ANCHOR(recv);
     INIT_ANCHOR(args);
+
 #if OPT_SUPPORT_JOKE
     if (nd_type_p(node, NODE_VCALL)) {
         ID id_bitblt;
@@ -8454,20 +9427,7 @@ compile_call(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const node, co
                 labels_table = st_init_numtable();
                 ISEQ_COMPILE_DATA(iseq)->labels_table = labels_table;
             }
-            if (nd_type_p(node->nd_args->nd_head, NODE_LIT) &&
-                SYMBOL_P(node->nd_args->nd_head->nd_lit)) {
-
-                label_name = node->nd_args->nd_head->nd_lit;
-                if (!st_lookup(labels_table, (st_data_t)label_name, &data)) {
-                    label = NEW_LABEL(nd_line(line_node));
-                    label->position = nd_line(line_node);
-                    st_insert(labels_table, (st_data_t)label_name, (st_data_t)label);
-                }
-                else {
-                    label = (LABEL *)data;
-                }
-            }
-            else {
+            {
                 COMPILE_ERROR(ERROR_ARGS "invalid goto/label format");
                 return COMPILE_NG;
             }
@@ -8485,7 +9445,7 @@ compile_call(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const node, co
 
     const char *builtin_func;
     if (UNLIKELY(iseq_has_builtin_function_table(iseq)) &&
-        (builtin_func = iseq_builtin_function_name(type, node->nd_recv, mid)) != NULL) {
+        (builtin_func = iseq_builtin_function_name(type, get_nd_recv(node), mid)) != NULL) {
         return compile_builtin_function_call(iseq, ret, node, line_node, popped, parent_block, args, builtin_func);
     }
 
@@ -8495,16 +9455,16 @@ compile_call(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const node, co
             int idx, level;
 
             if (mid == idCall &&
-                nd_type_p(node->nd_recv, NODE_LVAR) &&
-                iseq_block_param_id_p(iseq, node->nd_recv->nd_vid, &idx, &level)) {
-                ADD_INSN2(recv, node->nd_recv, getblockparamproxy, INT2FIX(idx + VM_ENV_DATA_SIZE - 1), INT2FIX(level));
+                nd_type_p(get_nd_recv(node), NODE_LVAR) &&
+                iseq_block_param_id_p(iseq, RNODE_LVAR(get_nd_recv(node))->nd_vid, &idx, &level)) {
+                ADD_INSN2(recv, get_nd_recv(node), getblockparamproxy, INT2FIX(idx + VM_ENV_DATA_SIZE - 1), INT2FIX(level));
             }
             else if (private_recv_p(node)) {
                 ADD_INSN(recv, node, putself);
                 flag |= VM_CALL_FCALL;
             }
             else {
-                CHECK(COMPILE(recv, "recv", node->nd_recv));
+                CHECK(COMPILE(recv, "recv", get_nd_recv(node)));
             }
 
             if (type == NODE_QCALL) {
@@ -8518,7 +9478,7 @@ compile_call(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const node, co
 
     /* args */
     if (type != NODE_VCALL) {
-        argc = setup_args(iseq, args, node->nd_args, &flag, &keywords);
+        argc = setup_args(iseq, args, get_nd_args(node), &flag, &keywords);
         CHECK(!NIL_P(argc));
     }
     else {
@@ -8526,6 +9486,17 @@ compile_call(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const node, co
     }
 
     ADD_SEQ(ret, recv);
+
+    bool inline_new = ISEQ_COMPILE_DATA(iseq)->option->specialized_instruction &&
+        mid == rb_intern("new") &&
+        parent_block == NULL &&
+        !(flag & VM_CALL_ARGS_BLOCKARG);
+
+    if (inline_new) {
+        ADD_INSN(ret, node, putnil);
+        ADD_INSN(ret, node, swap);
+    }
+
     ADD_SEQ(ret, args);
 
     debugp_param("call args argc", argc);
@@ -8539,7 +9510,40 @@ compile_call(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const node, co
         flag |= VM_CALL_FCALL;
     }
 
-    ADD_SEND_R(ret, line_node, mid, argc, parent_block, INT2FIX(flag), keywords);
+    if ((flag & VM_CALL_ARGS_BLOCKARG) && (flag & VM_CALL_KW_SPLAT) && !(flag & VM_CALL_KW_SPLAT_MUT)) {
+        ADD_INSN(ret, line_node, splatkw);
+    }
+
+    LABEL *not_basic_new = NEW_LABEL(nd_line(node));
+    LABEL *not_basic_new_finish = NEW_LABEL(nd_line(node));
+
+    if (inline_new) {
+        // Jump unless the receiver uses the "basic" implementation of "new"
+        VALUE ci;
+        if (flag & VM_CALL_FORWARDING) {
+            ci = (VALUE)new_callinfo(iseq, mid, NUM2INT(argc) + 1, flag, keywords, 0);
+        }
+        else {
+            ci = (VALUE)new_callinfo(iseq, mid, NUM2INT(argc), flag, keywords, 0);
+        }
+        ADD_INSN2(ret, node, opt_new, ci, not_basic_new);
+        LABEL_REF(not_basic_new);
+
+        // optimized path
+        ADD_SEND_R(ret, line_node, rb_intern("initialize"), argc, parent_block, INT2FIX(flag | VM_CALL_FCALL), keywords);
+        ADD_INSNL(ret, line_node, jump, not_basic_new_finish);
+
+        ADD_LABEL(ret, not_basic_new);
+        // Fall back to normal send
+        ADD_SEND_R(ret, line_node, mid, argc, parent_block, INT2FIX(flag), keywords);
+        ADD_INSN(ret, line_node, swap);
+
+        ADD_LABEL(ret, not_basic_new_finish);
+        ADD_INSN(ret, line_node, pop);
+    }
+    else {
+        ADD_SEND_R(ret, line_node, mid, argc, parent_block, INT2FIX(flag), keywords);
+    }
 
     qcall_branch_end(iseq, ret, else_label, branches, node, line_node);
     if (popped) {
@@ -8555,8 +9559,7 @@ compile_op_asgn1(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const node
     VALUE argc;
     unsigned int flag = 0;
     int asgnflag = 0;
-    ID id = node->nd_mid;
-    int boff = 0;
+    ID id = RNODE_OP_ASGN1(node)->nd_mid;
 
     /*
      * a[x] (op)= y
@@ -8584,22 +9587,20 @@ compile_op_asgn1(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const node
     if (!popped) {
         ADD_INSN(ret, node, putnil);
     }
-    asgnflag = COMPILE_RECV(ret, "NODE_OP_ASGN1 recv", node);
+    asgnflag = COMPILE_RECV(ret, "NODE_OP_ASGN1 recv", node, RNODE_OP_ASGN1(node)->nd_recv);
     CHECK(asgnflag != -1);
-    switch (nd_type(node->nd_args->nd_head)) {
+    switch (nd_type(RNODE_OP_ASGN1(node)->nd_index)) {
       case NODE_ZLIST:
         argc = INT2FIX(0);
         break;
-      case NODE_BLOCK_PASS:
-        boff = 1;
-        /* fall through */
       default:
-        argc = setup_args(iseq, ret, node->nd_args->nd_head, &flag, NULL);
+        argc = setup_args(iseq, ret, RNODE_OP_ASGN1(node)->nd_index, &flag, NULL);
         CHECK(!NIL_P(argc));
     }
-    ADD_INSN1(ret, node, dupn, FIXNUM_INC(argc, 1 + boff));
+    int dup_argn = FIX2INT(argc) + 1;
+    ADD_INSN1(ret, node, dupn, INT2FIX(dup_argn));
     flag |= asgnflag;
-    ADD_SEND_WITH_FLAG(ret, node, idAREF, argc, INT2FIX(flag));
+    ADD_SEND_R(ret, node, idAREF, argc, NULL, INT2FIX(flag & ~VM_CALL_ARGS_SPLAT_MUT), NULL);
 
     if (id == idOROP || id == idANDOP) {
         /* a[x] ||= y  or  a[x] &&= y
@@ -8622,64 +9623,63 @@ compile_op_asgn1(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const node
         }
         ADD_INSN(ret, node, pop);
 
-        CHECK(COMPILE(ret, "NODE_OP_ASGN1 args->body: ", node->nd_args->nd_body));
+        CHECK(COMPILE(ret, "NODE_OP_ASGN1 nd_rvalue: ", RNODE_OP_ASGN1(node)->nd_rvalue));
         if (!popped) {
-            ADD_INSN1(ret, node, setn, FIXNUM_INC(argc, 2+boff));
+            ADD_INSN1(ret, node, setn, INT2FIX(dup_argn+1));
         }
         if (flag & VM_CALL_ARGS_SPLAT) {
-            ADD_INSN1(ret, node, newarray, INT2FIX(1));
-            if (boff > 0) {
-                ADD_INSN1(ret, node, dupn, INT2FIX(3));
+            if (!(flag & VM_CALL_ARGS_SPLAT_MUT)) {
                 ADD_INSN(ret, node, swap);
-                ADD_INSN(ret, node, pop);
-            }
-            ADD_INSN(ret, node, concatarray);
-            if (boff > 0) {
-                ADD_INSN1(ret, node, setn, INT2FIX(3));
-                ADD_INSN(ret, node, pop);
-                ADD_INSN(ret, node, pop);
+                ADD_INSN1(ret, node, splatarray, Qtrue);
+                ADD_INSN(ret, node, swap);
+                flag |= VM_CALL_ARGS_SPLAT_MUT;
             }
-            ADD_SEND_WITH_FLAG(ret, node, idASET, argc, INT2FIX(flag));
+            ADD_INSN1(ret, node, pushtoarray, INT2FIX(1));
+            ADD_SEND_R(ret, node, idASET, argc, NULL, INT2FIX(flag), NULL);
         }
         else {
-            if (boff > 0)
-                ADD_INSN(ret, node, swap);
-            ADD_SEND_WITH_FLAG(ret, node, idASET, FIXNUM_INC(argc, 1), INT2FIX(flag));
+            ADD_SEND_R(ret, node, idASET, FIXNUM_INC(argc, 1), NULL, INT2FIX(flag), NULL);
         }
         ADD_INSN(ret, node, pop);
         ADD_INSNL(ret, node, jump, lfin);
         ADD_LABEL(ret, label);
         if (!popped) {
-            ADD_INSN1(ret, node, setn, FIXNUM_INC(argc, 2+boff));
+            ADD_INSN1(ret, node, setn, INT2FIX(dup_argn+1));
         }
-        ADD_INSN1(ret, node, adjuststack, FIXNUM_INC(argc, 2+boff));
+        ADD_INSN1(ret, node, adjuststack, INT2FIX(dup_argn+1));
         ADD_LABEL(ret, lfin);
     }
     else {
-        CHECK(COMPILE(ret, "NODE_OP_ASGN1 args->body: ", node->nd_args->nd_body));
+        CHECK(COMPILE(ret, "NODE_OP_ASGN1 nd_rvalue: ", RNODE_OP_ASGN1(node)->nd_rvalue));
         ADD_SEND(ret, node, id, INT2FIX(1));
         if (!popped) {
-            ADD_INSN1(ret, node, setn, FIXNUM_INC(argc, 2+boff));
+            ADD_INSN1(ret, node, setn, INT2FIX(dup_argn+1));
         }
         if (flag & VM_CALL_ARGS_SPLAT) {
-            ADD_INSN1(ret, node, newarray, INT2FIX(1));
-            if (boff > 0) {
-                ADD_INSN1(ret, node, dupn, INT2FIX(3));
+            if (flag & VM_CALL_KW_SPLAT) {
+                ADD_INSN1(ret, node, topn, INT2FIX(2));
+                if (!(flag & VM_CALL_ARGS_SPLAT_MUT)) {
+                    ADD_INSN1(ret, node, splatarray, Qtrue);
+                    flag |= VM_CALL_ARGS_SPLAT_MUT;
+                }
                 ADD_INSN(ret, node, swap);
+                ADD_INSN1(ret, node, pushtoarray, INT2FIX(1));
+                ADD_INSN1(ret, node, setn, INT2FIX(2));
                 ADD_INSN(ret, node, pop);
             }
-            ADD_INSN(ret, node, concatarray);
-            if (boff > 0) {
-                ADD_INSN1(ret, node, setn, INT2FIX(3));
-                ADD_INSN(ret, node, pop);
-                ADD_INSN(ret, node, pop);
+            else {
+                if (!(flag & VM_CALL_ARGS_SPLAT_MUT)) {
+                    ADD_INSN(ret, node, swap);
+                    ADD_INSN1(ret, node, splatarray, Qtrue);
+                    ADD_INSN(ret, node, swap);
+                    flag |= VM_CALL_ARGS_SPLAT_MUT;
+                }
+                ADD_INSN1(ret, node, pushtoarray, INT2FIX(1));
             }
-            ADD_SEND_WITH_FLAG(ret, node, idASET, argc, INT2FIX(flag));
+            ADD_SEND_R(ret, node, idASET, argc, NULL, INT2FIX(flag), NULL);
         }
         else {
-            if (boff > 0)
-                ADD_INSN(ret, node, swap);
-            ADD_SEND_WITH_FLAG(ret, node, idASET, FIXNUM_INC(argc, 1), INT2FIX(flag));
+            ADD_SEND_R(ret, node, idASET, FIXNUM_INC(argc, 1), NULL, INT2FIX(flag), NULL);
         }
         ADD_INSN(ret, node, pop);
     }
@@ -8690,8 +9690,8 @@ static int
 compile_op_asgn2(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const node, int popped)
 {
     const int line = nd_line(node);
-    ID atype = node->nd_next->nd_mid;
-    ID vid = node->nd_next->nd_vid, aid = rb_id_attrset(vid);
+    ID atype = RNODE_OP_ASGN2(node)->nd_mid;
+    ID vid = RNODE_OP_ASGN2(node)->nd_vid, aid = rb_id_attrset(vid);
     int asgnflag;
     LABEL *lfin = NEW_LABEL(line);
     LABEL *lcfin = NEW_LABEL(line);
@@ -8749,9 +9749,9 @@ compile_op_asgn2(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const node
 
     */
 
-    asgnflag = COMPILE_RECV(ret, "NODE_OP_ASGN2#recv", node);
+    asgnflag = COMPILE_RECV(ret, "NODE_OP_ASGN2#recv", node, RNODE_OP_ASGN2(node)->nd_recv);
     CHECK(asgnflag != -1);
-    if (node->nd_next->nd_aid) {
+    if (RNODE_OP_ASGN2(node)->nd_aid) {
         lskip = NEW_LABEL(line);
         ADD_INSN(ret, node, dup);
         ADD_INSNL(ret, node, branchnil, lskip);
@@ -8772,7 +9772,7 @@ compile_op_asgn2(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const node
         if (!popped) {
             ADD_INSN(ret, node, pop);
         }
-        CHECK(COMPILE(ret, "NODE_OP_ASGN2 val", node->nd_value));
+        CHECK(COMPILE(ret, "NODE_OP_ASGN2 val", RNODE_OP_ASGN2(node)->nd_value));
         if (!popped) {
             ADD_INSN(ret, node, swap);
             ADD_INSN1(ret, node, topn, INT2FIX(1));
@@ -8788,7 +9788,7 @@ compile_op_asgn2(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const node
         ADD_LABEL(ret, lfin);
     }
     else {
-        CHECK(COMPILE(ret, "NODE_OP_ASGN2 val", node->nd_value));
+        CHECK(COMPILE(ret, "NODE_OP_ASGN2 val", RNODE_OP_ASGN2(node)->nd_value));
         ADD_SEND(ret, node, atype, INT2FIX(1));
         if (!popped) {
             ADD_INSN(ret, node, swap);
@@ -8806,6 +9806,8 @@ compile_op_asgn2(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const node
     return COMPILE_OK;
 }
 
+static int compile_shareable_constant_value(rb_iseq_t *iseq, LINK_ANCHOR *ret, enum rb_parser_shareability shareable, const NODE *lhs, const NODE *value);
+
 static int
 compile_op_cdecl(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const node, int popped)
 {
@@ -8814,21 +9816,21 @@ compile_op_cdecl(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const node
     LABEL *lassign = 0;
     ID mid;
 
-    switch (nd_type(node->nd_head)) {
+    switch (nd_type(RNODE_OP_CDECL(node)->nd_head)) {
       case NODE_COLON3:
         ADD_INSN1(ret, node, putobject, rb_cObject);
         break;
       case NODE_COLON2:
-        CHECK(COMPILE(ret, "NODE_OP_CDECL/colon2#nd_head", node->nd_head->nd_head));
+        CHECK(COMPILE(ret, "NODE_OP_CDECL/colon2#nd_head", RNODE_COLON2(RNODE_OP_CDECL(node)->nd_head)->nd_head));
         break;
       default:
         COMPILE_ERROR(ERROR_ARGS "%s: invalid node in NODE_OP_CDECL",
-                      ruby_node_name(nd_type(node->nd_head)));
+                      ruby_node_name(nd_type(RNODE_OP_CDECL(node)->nd_head)));
         return COMPILE_NG;
     }
-    mid = node->nd_head->nd_mid;
+    mid = get_node_colon_nd_mid(RNODE_OP_CDECL(node)->nd_head);
     /* cref */
-    if (node->nd_aid == idOROP) {
+    if (RNODE_OP_CDECL(node)->nd_aid == idOROP) {
         lassign = NEW_LABEL(line);
         ADD_INSN(ret, node, dup); /* cref cref */
         ADD_INSN3(ret, node, defined, INT2FIX(DEFINED_CONST_FROM),
@@ -8839,17 +9841,17 @@ compile_op_cdecl(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const node
     ADD_INSN1(ret, node, putobject, Qtrue);
     ADD_INSN1(ret, node, getconstant, ID2SYM(mid)); /* cref obj */
 
-    if (node->nd_aid == idOROP || node->nd_aid == idANDOP) {
+    if (RNODE_OP_CDECL(node)->nd_aid == idOROP || RNODE_OP_CDECL(node)->nd_aid == idANDOP) {
         lfin = NEW_LABEL(line);
         if (!popped) ADD_INSN(ret, node, dup); /* cref [obj] obj */
-        if (node->nd_aid == idOROP)
+        if (RNODE_OP_CDECL(node)->nd_aid == idOROP)
             ADD_INSNL(ret, node, branchif, lfin);
         else /* idANDOP */
             ADD_INSNL(ret, node, branchunless, lfin);
         /* cref [obj] */
         if (!popped) ADD_INSN(ret, node, pop); /* cref */
         if (lassign) ADD_LABEL(ret, lassign);
-        CHECK(COMPILE(ret, "NODE_OP_CDECL#nd_value", node->nd_value));
+        CHECK(compile_shareable_constant_value(iseq, ret, RNODE_OP_CDECL(node)->shareability, RNODE_OP_CDECL(node)->nd_head, RNODE_OP_CDECL(node)->nd_value));
         /* cref value */
         if (popped)
             ADD_INSN1(ret, node, topn, INT2FIX(1)); /* cref value cref */
@@ -8863,9 +9865,9 @@ compile_op_cdecl(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const node
         ADD_INSN(ret, node, pop); /* [value] */
     }
     else {
-        CHECK(COMPILE(ret, "NODE_OP_CDECL#nd_value", node->nd_value));
+        CHECK(compile_shareable_constant_value(iseq, ret, RNODE_OP_CDECL(node)->shareability, RNODE_OP_CDECL(node)->nd_head, RNODE_OP_CDECL(node)->nd_value));
         /* cref obj value */
-        ADD_CALL(ret, node, node->nd_aid, INT2FIX(1));
+        ADD_CALL(ret, node, RNODE_OP_CDECL(node)->nd_aid, INT2FIX(1));
         /* cref value */
         ADD_INSN(ret, node, swap); /* value cref */
         if (!popped) {
@@ -8884,11 +9886,11 @@ compile_op_log(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const node,
     LABEL *lfin = NEW_LABEL(line);
     LABEL *lassign;
 
-    if (type == NODE_OP_ASGN_OR && !nd_type_p(node->nd_head, NODE_IVAR)) {
+    if (type == NODE_OP_ASGN_OR && !nd_type_p(RNODE_OP_ASGN_OR(node)->nd_head, NODE_IVAR)) {
         LABEL *lfinish[2];
         lfinish[0] = lfin;
         lfinish[1] = 0;
-        defined_expr(iseq, ret, node->nd_head, lfinish, Qfalse);
+        defined_expr(iseq, ret, RNODE_OP_ASGN_OR(node)->nd_head, lfinish, Qfalse, false);
         lassign = lfinish[1];
         if (!lassign) {
             lassign = NEW_LABEL(line);
@@ -8899,7 +9901,7 @@ compile_op_log(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const node,
         lassign = NEW_LABEL(line);
     }
 
-    CHECK(COMPILE(ret, "NODE_OP_ASGN_AND/OR#nd_head", node->nd_head));
+    CHECK(COMPILE(ret, "NODE_OP_ASGN_AND/OR#nd_head", RNODE_OP_ASGN_OR(node)->nd_head));
 
     if (!popped) {
         ADD_INSN(ret, node, dup);
@@ -8917,7 +9919,7 @@ compile_op_log(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const node,
     }
 
     ADD_LABEL(ret, lassign);
-    CHECK(COMPILE_(ret, "NODE_OP_ASGN_AND/OR#nd_value", node->nd_value, popped));
+    CHECK(COMPILE_(ret, "NODE_OP_ASGN_AND/OR#nd_value", RNODE_OP_ASGN_OR(node)->nd_value, popped));
     ADD_LABEL(ret, lfin);
     return COMPILE_OK;
 }
@@ -8931,13 +9933,22 @@ compile_super(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const node, i
     unsigned int flag = 0;
     struct rb_callinfo_kwarg *keywords = NULL;
     const rb_iseq_t *parent_block = ISEQ_COMPILE_DATA(iseq)->current_block;
+    int use_block = 1;
 
     INIT_ANCHOR(args);
     ISEQ_COMPILE_DATA(iseq)->current_block = NULL;
+
     if (type == NODE_SUPER) {
-        VALUE vargc = setup_args(iseq, args, node->nd_args, &flag, &keywords);
+        VALUE vargc = setup_args(iseq, args, RNODE_SUPER(node)->nd_args, &flag, &keywords);
         CHECK(!NIL_P(vargc));
         argc = FIX2INT(vargc);
+        if ((flag & VM_CALL_ARGS_BLOCKARG) && (flag & VM_CALL_KW_SPLAT) && !(flag & VM_CALL_KW_SPLAT_MUT)) {
+            ADD_INSN(args, node, splatkw);
+        }
+
+        if (flag & VM_CALL_ARGS_BLOCKARG) {
+            use_block = 0;
+        }
     }
     else {
         /* NODE_ZSUPER */
@@ -8955,6 +9966,13 @@ compile_super(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const node, i
             ADD_GETLOCAL(args, node, idx, lvar_level);
         }
 
+        /* forward ... */
+        if (local_body->param.flags.forwardable) {
+            flag |= VM_CALL_FORWARDING;
+            int idx = local_body->local_table_size - get_local_var_idx(liseq, idDot3);
+            ADD_GETLOCAL(args, node, idx, lvar_level);
+        }
+
         if (local_body->param.flags.has_opt) {
             /* optional arguments */
             int j;
@@ -8969,7 +9987,7 @@ compile_super(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const node, i
             /* rest argument */
             int idx = local_body->local_table_size - local_body->param.rest_start;
             ADD_GETLOCAL(args, node, idx, lvar_level);
-            ADD_INSN1(args, node, splatarray, Qfalse);
+            ADD_INSN1(args, node, splatarray, RBOOL(local_body->param.flags.has_post));
 
             argc = local_body->param.rest_start + 1;
             flag |= VM_CALL_ARGS_SPLAT;
@@ -8985,8 +10003,8 @@ compile_super(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const node, i
                     int idx = local_body->local_table_size - (post_start + j);
                     ADD_GETLOCAL(args, node, idx, lvar_level);
                 }
-                ADD_INSN1(args, node, newarray, INT2FIX(j));
-                ADD_INSN (args, node, concatarray);
+                ADD_INSN1(args, node, pushtoarray, INT2FIX(j));
+                flag |= VM_CALL_ARGS_SPLAT_MUT;
                 /* argc is settled at above */
             }
             else {
@@ -9008,14 +10026,11 @@ compile_super(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const node, i
             if (local_body->param.flags.has_kwrest) {
                 int idx = local_body->local_table_size - local_kwd->rest_start;
                 ADD_GETLOCAL(args, node, idx, lvar_level);
-                if (local_kwd->num > 0) {
-                    ADD_SEND (args, node, rb_intern("dup"), INT2FIX(0));
-                    flag |= VM_CALL_KW_SPLAT_MUT;
-                }
+                RUBY_ASSERT(local_kwd->num > 0);
+                ADD_SEND (args, node, rb_intern("dup"), INT2FIX(0));
             }
             else {
                 ADD_INSN1(args, node, newhash, INT2FIX(0));
-                flag |= VM_CALL_KW_SPLAT_MUT;
             }
             for (i = 0; i < local_kwd->num; ++i) {
                 ID id = local_kwd->table[i];
@@ -9024,23 +10039,33 @@ compile_super(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const node, i
                 ADD_GETLOCAL(args, node, idx, lvar_level);
             }
             ADD_SEND(args, node, id_core_hash_merge_ptr, INT2FIX(i * 2 + 1));
-            flag |= VM_CALL_KW_SPLAT;
+            flag |= VM_CALL_KW_SPLAT| VM_CALL_KW_SPLAT_MUT;
         }
         else if (local_body->param.flags.has_kwrest) {
             int idx = local_body->local_table_size - local_kwd->rest_start;
             ADD_GETLOCAL(args, node, idx, lvar_level);
             argc++;
-            flag |= VM_CALL_KW_SPLAT | VM_CALL_KW_SPLAT_MUT;
+            flag |= VM_CALL_KW_SPLAT;
         }
     }
 
+    if (use_block && parent_block == NULL) {
+        iseq_set_use_block(ISEQ_BODY(iseq)->local_iseq);
+    }
+
     flag |= VM_CALL_SUPER | VM_CALL_FCALL;
     if (type == NODE_ZSUPER) flag |= VM_CALL_ZSUPER;
     ADD_INSN(ret, node, putself);
     ADD_SEQ(ret, args);
-    ADD_INSN2(ret, node, invokesuper,
-              new_callinfo(iseq, 0, argc, flag, keywords, parent_block != NULL),
-              parent_block);
+
+    const struct rb_callinfo * ci = new_callinfo(iseq, 0, argc, flag, keywords, parent_block != NULL);
+
+    if (vm_ci_flag(ci) & VM_CALL_FORWARDING) {
+        ADD_INSN2(ret, node, invokesuperforward, ci, parent_block);
+    }
+    else {
+        ADD_INSN2(ret, node, invokesuper, ci, parent_block);
+    }
 
     if (popped) {
         ADD_INSN(ret, node, pop);
@@ -9067,8 +10092,8 @@ compile_yield(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const node, i
       default: /* valid */;
     }
 
-    if (node->nd_head) {
-        argc = setup_args(iseq, args, node->nd_head, &flag, &keywords);
+    if (RNODE_YIELD(node)->nd_head) {
+        argc = setup_args(iseq, args, RNODE_YIELD(node)->nd_head, &flag, &keywords);
         CHECK(!NIL_P(argc));
     }
     else {
@@ -9077,6 +10102,7 @@ compile_yield(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const node, i
 
     ADD_SEQ(ret, args);
     ADD_INSN1(ret, node, invokeblock, new_callinfo(iseq, 0, FIX2INT(argc), flag, keywords, FALSE));
+    iseq_set_use_block(ISEQ_BODY(iseq)->local_iseq);
 
     if (popped) {
         ADD_INSN(ret, node, pop);
@@ -9102,17 +10128,17 @@ compile_match(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const node, i
     INIT_ANCHOR(val);
     switch ((int)type) {
       case NODE_MATCH:
-        ADD_INSN1(recv, node, putobject, node->nd_lit);
+        ADD_INSN1(recv, node, putobject, rb_node_regx_string_val(node));
         ADD_INSN2(val, node, getspecial, INT2FIX(0),
                   INT2FIX(0));
         break;
       case NODE_MATCH2:
-        CHECK(COMPILE(recv, "receiver", node->nd_recv));
-        CHECK(COMPILE(val, "value", node->nd_value));
+        CHECK(COMPILE(recv, "receiver", RNODE_MATCH2(node)->nd_recv));
+        CHECK(COMPILE(val, "value", RNODE_MATCH2(node)->nd_value));
         break;
       case NODE_MATCH3:
-        CHECK(COMPILE(recv, "receiver", node->nd_value));
-        CHECK(COMPILE(val, "value", node->nd_recv));
+        CHECK(COMPILE(recv, "receiver", RNODE_MATCH3(node)->nd_value));
+        CHECK(COMPILE(val, "value", RNODE_MATCH3(node)->nd_recv));
         break;
     }
 
@@ -9120,8 +10146,8 @@ compile_match(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const node, i
     ADD_SEQ(ret, val);
     ADD_SEND(ret, node, idEqTilde, INT2FIX(1));
 
-    if (node->nd_args) {
-        compile_named_capture_assign(iseq, ret, node->nd_args);
+    if (nd_type_p(node, NODE_MATCH2) && RNODE_MATCH2(node)->nd_args) {
+        compile_named_capture_assign(iseq, ret, RNODE_MATCH2(node)->nd_args);
     }
 
     if (popped) {
@@ -9133,7 +10159,7 @@ compile_match(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const node, i
 static int
 compile_colon2(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const node, int popped)
 {
-    if (rb_is_const_id(node->nd_mid)) {
+    if (rb_is_const_id(RNODE_COLON2(node)->nd_mid)) {
         /* constant */
         VALUE segments;
         if (ISEQ_COMPILE_DATA(iseq)->option->inline_const_cache &&
@@ -9163,8 +10189,8 @@ compile_colon2(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const node,
     else {
         /* function call */
         ADD_CALL_RECEIVER(ret, node);
-        CHECK(COMPILE(ret, "colon2#nd_head", node->nd_head));
-        ADD_CALL(ret, node, node->nd_mid, INT2FIX(1));
+        CHECK(COMPILE(ret, "colon2#nd_head", RNODE_COLON2(node)->nd_head));
+        ADD_CALL(ret, node, RNODE_COLON2(node)->nd_mid, INT2FIX(1));
     }
     if (popped) {
         ADD_INSN(ret, node, pop);
@@ -9175,19 +10201,19 @@ compile_colon2(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const node,
 static int
 compile_colon3(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const node, int popped)
 {
-    debugi("colon3#nd_mid", node->nd_mid);
+    debugi("colon3#nd_mid", RNODE_COLON3(node)->nd_mid);
 
     /* add cache insn */
     if (ISEQ_COMPILE_DATA(iseq)->option->inline_const_cache) {
         ISEQ_BODY(iseq)->ic_size++;
-        VALUE segments = rb_ary_new_from_args(2, ID2SYM(idNULL), ID2SYM(node->nd_mid));
+        VALUE segments = rb_ary_new_from_args(2, ID2SYM(idNULL), ID2SYM(RNODE_COLON3(node)->nd_mid));
         ADD_INSN1(ret, node, opt_getconstant_path, segments);
         RB_OBJ_WRITTEN(iseq, Qundef, segments);
     }
     else {
         ADD_INSN1(ret, node, putobject, rb_cObject);
         ADD_INSN1(ret, node, putobject, Qtrue);
-        ADD_INSN1(ret, node, getconstant, ID2SYM(node->nd_mid));
+        ADD_INSN1(ret, node, getconstant, ID2SYM(RNODE_COLON3(node)->nd_mid));
     }
 
     if (popped) {
@@ -9200,13 +10226,13 @@ static int
 compile_dots(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const node, int popped, const int excl)
 {
     VALUE flag = INT2FIX(excl);
-    const NODE *b = node->nd_beg;
-    const NODE *e = node->nd_end;
+    const NODE *b = RNODE_DOT2(node)->nd_beg;
+    const NODE *e = RNODE_DOT2(node)->nd_end;
 
     if (optimizable_range_item_p(b) && optimizable_range_item_p(e)) {
         if (!popped) {
-            VALUE bv = nd_type_p(b, NODE_LIT) ? b->nd_lit : Qnil;
-            VALUE ev = nd_type_p(e, NODE_LIT) ? e->nd_lit : Qnil;
+            VALUE bv = optimized_range_item(b);
+            VALUE ev = optimized_range_item(e);
             VALUE val = rb_range_new(bv, ev, excl);
             ADD_INSN1(ret, node, putobject, val);
             RB_OBJ_WRITTEN(iseq, Qundef, val);
@@ -9236,140 +10262,503 @@ compile_errinfo(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const node,
                 if (ISEQ_BODY(ip)->type == ISEQ_TYPE_RESCUE) {
                     break;
                 }
-                ip = ISEQ_BODY(ip)->parent_iseq;
-                level++;
+                ip = ISEQ_BODY(ip)->parent_iseq;
+                level++;
+            }
+            if (ip) {
+                ADD_GETLOCAL(ret, node, LVAR_ERRINFO, level);
+            }
+            else {
+                ADD_INSN(ret, node, putnil);
+            }
+        }
+    }
+    return COMPILE_OK;
+}
+
+static int
+compile_kw_arg(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const node, int popped)
+{
+    struct rb_iseq_constant_body *const body = ISEQ_BODY(iseq);
+    LABEL *end_label = NEW_LABEL(nd_line(node));
+    const NODE *default_value = get_nd_value(RNODE_KW_ARG(node)->nd_body);
+
+    if (default_value == NODE_SPECIAL_REQUIRED_KEYWORD) {
+        /* required argument. do nothing */
+        COMPILE_ERROR(ERROR_ARGS "unreachable");
+        return COMPILE_NG;
+    }
+    else if (nd_type_p(default_value, NODE_SYM) ||
+             nd_type_p(default_value, NODE_REGX) ||
+             nd_type_p(default_value, NODE_LINE) ||
+             nd_type_p(default_value, NODE_INTEGER) ||
+             nd_type_p(default_value, NODE_FLOAT) ||
+             nd_type_p(default_value, NODE_RATIONAL) ||
+             nd_type_p(default_value, NODE_IMAGINARY) ||
+             nd_type_p(default_value, NODE_NIL) ||
+             nd_type_p(default_value, NODE_TRUE) ||
+             nd_type_p(default_value, NODE_FALSE)) {
+        COMPILE_ERROR(ERROR_ARGS "unreachable");
+        return COMPILE_NG;
+    }
+    else {
+        /* if keywordcheck(_kw_bits, nth_keyword)
+         *   kw = default_value
+         * end
+         */
+        int kw_bits_idx = body->local_table_size - body->param.keyword->bits_start;
+        int keyword_idx = body->param.keyword->num;
+
+        ADD_INSN2(ret, node, checkkeyword, INT2FIX(kw_bits_idx + VM_ENV_DATA_SIZE - 1), INT2FIX(keyword_idx));
+        ADD_INSNL(ret, node, branchif, end_label);
+        CHECK(COMPILE_POPPED(ret, "keyword default argument", RNODE_KW_ARG(node)->nd_body));
+        ADD_LABEL(ret, end_label);
+    }
+    return COMPILE_OK;
+}
+
+static int
+compile_attrasgn(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const node, int popped)
+{
+    DECL_ANCHOR(recv);
+    DECL_ANCHOR(args);
+    unsigned int flag = 0;
+    ID mid = RNODE_ATTRASGN(node)->nd_mid;
+    VALUE argc;
+    LABEL *else_label = NULL;
+    VALUE branches = Qfalse;
+
+    /* optimization shortcut
+     *   obj["literal"] = value -> opt_aset_with(obj, "literal", value)
+     */
+    if (!ISEQ_COMPILE_DATA(iseq)->in_masgn &&
+        mid == idASET && !private_recv_p(node) && RNODE_ATTRASGN(node)->nd_args &&
+        nd_type_p(RNODE_ATTRASGN(node)->nd_args, NODE_LIST) && RNODE_LIST(RNODE_ATTRASGN(node)->nd_args)->as.nd_alen == 2 &&
+        (nd_type_p(RNODE_LIST(RNODE_ATTRASGN(node)->nd_args)->nd_head, NODE_STR) || nd_type_p(RNODE_LIST(RNODE_ATTRASGN(node)->nd_args)->nd_head, NODE_FILE)) &&
+        ISEQ_COMPILE_DATA(iseq)->current_block == NULL &&
+        !frozen_string_literal_p(iseq) &&
+        ISEQ_COMPILE_DATA(iseq)->option->specialized_instruction)
+    {
+        VALUE str = get_string_value(RNODE_LIST(RNODE_ATTRASGN(node)->nd_args)->nd_head);
+        CHECK(COMPILE(ret, "recv", RNODE_ATTRASGN(node)->nd_recv));
+        CHECK(COMPILE(ret, "value", RNODE_LIST(RNODE_LIST(RNODE_ATTRASGN(node)->nd_args)->nd_next)->nd_head));
+        if (!popped) {
+            ADD_INSN(ret, node, swap);
+            ADD_INSN1(ret, node, topn, INT2FIX(1));
+        }
+        ADD_INSN2(ret, node, opt_aset_with, str,
+                  new_callinfo(iseq, idASET, 2, 0, NULL, FALSE));
+        RB_OBJ_WRITTEN(iseq, Qundef, str);
+        ADD_INSN(ret, node, pop);
+        return COMPILE_OK;
+    }
+
+    INIT_ANCHOR(recv);
+    INIT_ANCHOR(args);
+    argc = setup_args(iseq, args, RNODE_ATTRASGN(node)->nd_args, &flag, NULL);
+    CHECK(!NIL_P(argc));
+
+    int asgnflag = COMPILE_RECV(recv, "recv", node, RNODE_ATTRASGN(node)->nd_recv);
+    CHECK(asgnflag != -1);
+    flag |= (unsigned int)asgnflag;
+
+    debugp_param("argc", argc);
+    debugp_param("nd_mid", ID2SYM(mid));
+
+    if (!rb_is_attrset_id(mid)) {
+        /* safe nav attr */
+        mid = rb_id_attrset(mid);
+        else_label = qcall_branch_start(iseq, recv, &branches, node, node);
+    }
+    if (!popped) {
+        ADD_INSN(ret, node, putnil);
+        ADD_SEQ(ret, recv);
+        ADD_SEQ(ret, args);
+
+        if (flag & VM_CALL_ARGS_SPLAT) {
+            ADD_INSN(ret, node, dup);
+            ADD_INSN1(ret, node, putobject, INT2FIX(-1));
+            ADD_SEND_WITH_FLAG(ret, node, idAREF, INT2FIX(1), INT2FIX(asgnflag));
+            ADD_INSN1(ret, node, setn, FIXNUM_INC(argc, 2));
+            ADD_INSN (ret, node, pop);
+        }
+        else {
+            ADD_INSN1(ret, node, setn, FIXNUM_INC(argc, 1));
+        }
+    }
+    else {
+        ADD_SEQ(ret, recv);
+        ADD_SEQ(ret, args);
+    }
+    ADD_SEND_WITH_FLAG(ret, node, mid, argc, INT2FIX(flag));
+    qcall_branch_end(iseq, ret, else_label, branches, node, node);
+    ADD_INSN(ret, node, pop);
+    return COMPILE_OK;
+}
+
+static int
+compile_make_shareable_node(rb_iseq_t *iseq, LINK_ANCHOR *ret, LINK_ANCHOR *sub, const NODE *value, bool copy)
+{
+    ADD_INSN1(ret, value, putspecialobject, INT2FIX(VM_SPECIAL_OBJECT_VMCORE));
+    ADD_SEQ(ret, sub);
+
+    if (copy) {
+        /*
+         * NEW_CALL(fcore, rb_intern("make_shareable_copy"),
+         *          NEW_LIST(value, loc), loc);
+         */
+        ADD_SEND_WITH_FLAG(ret, value, rb_intern("make_shareable_copy"), INT2FIX(1), INT2FIX(VM_CALL_ARGS_SIMPLE));
+    }
+    else {
+        /*
+         * NEW_CALL(fcore, rb_intern("make_shareable"),
+         *          NEW_LIST(value, loc), loc);
+         */
+        ADD_SEND_WITH_FLAG(ret, value, rb_intern("make_shareable"), INT2FIX(1), INT2FIX(VM_CALL_ARGS_SIMPLE));
+    }
+
+    return COMPILE_OK;
+}
+
+static VALUE
+node_const_decl_val(const NODE *node)
+{
+    VALUE path;
+    switch (nd_type(node)) {
+      case NODE_CDECL:
+        if (RNODE_CDECL(node)->nd_vid) {
+            path = rb_id2str(RNODE_CDECL(node)->nd_vid);
+            goto end;
+        }
+        else {
+            node = RNODE_CDECL(node)->nd_else;
+        }
+        break;
+      case NODE_COLON2:
+        break;
+      case NODE_COLON3:
+        // ::Const
+        path = rb_str_new_cstr("::");
+        rb_str_append(path, rb_id2str(RNODE_COLON3(node)->nd_mid));
+        goto end;
+      default:
+        rb_bug("unexpected node: %s", ruby_node_name(nd_type(node)));
+        UNREACHABLE_RETURN(0);
+    }
+
+    path = rb_ary_new();
+    if (node) {
+        for (; node && nd_type_p(node, NODE_COLON2); node = RNODE_COLON2(node)->nd_head) {
+            rb_ary_push(path, rb_id2str(RNODE_COLON2(node)->nd_mid));
+        }
+        if (node && nd_type_p(node, NODE_CONST)) {
+            // Const::Name
+            rb_ary_push(path, rb_id2str(RNODE_CONST(node)->nd_vid));
+        }
+        else if (node && nd_type_p(node, NODE_COLON3)) {
+            // ::Const::Name
+            rb_ary_push(path, rb_id2str(RNODE_COLON3(node)->nd_mid));
+            rb_ary_push(path, rb_str_new(0, 0));
+        }
+        else {
+            // expression::Name
+            rb_ary_push(path, rb_str_new_cstr("..."));
+        }
+        path = rb_ary_join(rb_ary_reverse(path), rb_str_new_cstr("::"));
+    }
+  end:
+    path = rb_fstring(path);
+    return path;
+}
+
+static VALUE
+const_decl_path(NODE *dest)
+{
+    VALUE path = Qnil;
+    if (!nd_type_p(dest, NODE_CALL)) {
+        path = node_const_decl_val(dest);
+    }
+    return path;
+}
+
+static int
+compile_ensure_shareable_node(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE *dest, const NODE *value)
+{
+    /*
+     *. RubyVM::FrozenCore.ensure_shareable(value, const_decl_path(dest))
+     */
+    VALUE path = const_decl_path(dest);
+    ADD_INSN1(ret, value, putspecialobject, INT2FIX(VM_SPECIAL_OBJECT_VMCORE));
+    CHECK(COMPILE(ret, "compile_ensure_shareable_node", value));
+    ADD_INSN1(ret, value, putobject, path);
+    RB_OBJ_WRITTEN(iseq, Qundef, path);
+    ADD_SEND_WITH_FLAG(ret, value, rb_intern("ensure_shareable"), INT2FIX(2), INT2FIX(VM_CALL_ARGS_SIMPLE));
+
+    return COMPILE_OK;
+}
+
+#ifndef SHAREABLE_BARE_EXPRESSION
+#define SHAREABLE_BARE_EXPRESSION 1
+#endif
+
+static int
+compile_shareable_literal_constant(rb_iseq_t *iseq, LINK_ANCHOR *ret, enum rb_parser_shareability shareable, NODE *dest, const NODE *node, size_t level, VALUE *value_p, int *shareable_literal_p)
+{
+# define compile_shareable_literal_constant_next(node, anchor, value_p, shareable_literal_p) \
+    compile_shareable_literal_constant(iseq, anchor, shareable, dest, node, level+1, value_p, shareable_literal_p)
+    VALUE lit = Qnil;
+    DECL_ANCHOR(anchor);
+
+    enum node_type type = node ? nd_type(node) : NODE_NIL;
+    switch (type) {
+      case NODE_TRUE:
+        *value_p = Qtrue;
+        goto compile;
+      case NODE_FALSE:
+        *value_p = Qfalse;
+        goto compile;
+      case NODE_NIL:
+        *value_p = Qnil;
+        goto compile;
+      case NODE_SYM:
+        *value_p = rb_node_sym_string_val(node);
+        goto compile;
+      case NODE_REGX:
+        *value_p = rb_node_regx_string_val(node);
+        goto compile;
+      case NODE_LINE:
+        *value_p = rb_node_line_lineno_val(node);
+        goto compile;
+      case NODE_INTEGER:
+        *value_p = rb_node_integer_literal_val(node);
+        goto compile;
+      case NODE_FLOAT:
+        *value_p = rb_node_float_literal_val(node);
+        goto compile;
+      case NODE_RATIONAL:
+        *value_p = rb_node_rational_literal_val(node);
+        goto compile;
+      case NODE_IMAGINARY:
+        *value_p = rb_node_imaginary_literal_val(node);
+        goto compile;
+      case NODE_ENCODING:
+        *value_p = rb_node_encoding_val(node);
+
+      compile:
+        CHECK(COMPILE(ret, "shareable_literal_constant", node));
+        *shareable_literal_p = 1;
+        return COMPILE_OK;
+
+      case NODE_DSTR:
+        CHECK(COMPILE(ret, "shareable_literal_constant", node));
+        if (shareable == rb_parser_shareable_literal) {
+            /*
+             *  NEW_CALL(node, idUMinus, 0, loc);
+             *
+             *  -"#{var}"
+             */
+            ADD_SEND_WITH_FLAG(ret, node, idUMinus, INT2FIX(0), INT2FIX(VM_CALL_ARGS_SIMPLE));
+        }
+        *value_p = Qundef;
+        *shareable_literal_p = 1;
+        return COMPILE_OK;
+
+      case NODE_STR:{
+        VALUE lit = rb_node_str_string_val(node);
+        ADD_INSN1(ret, node, putobject, lit);
+        RB_OBJ_WRITTEN(iseq, Qundef, lit);
+        *value_p = lit;
+        *shareable_literal_p = 1;
+
+        return COMPILE_OK;
+      }
+
+      case NODE_FILE:{
+        VALUE lit = rb_node_file_path_val(node);
+        ADD_INSN1(ret, node, putobject, lit);
+        RB_OBJ_WRITTEN(iseq, Qundef, lit);
+        *value_p = lit;
+        *shareable_literal_p = 1;
+
+        return COMPILE_OK;
+      }
+
+      case NODE_ZLIST:{
+        VALUE lit = rb_ary_new();
+        OBJ_FREEZE(lit);
+        ADD_INSN1(ret, node, putobject, lit);
+        RB_OBJ_WRITTEN(iseq, Qundef, lit);
+        *value_p = lit;
+        *shareable_literal_p = 1;
+
+        return COMPILE_OK;
+      }
+
+      case NODE_LIST:{
+        INIT_ANCHOR(anchor);
+        lit = rb_ary_new();
+        for (NODE *n = (NODE *)node; n; n = RNODE_LIST(n)->nd_next) {
+            VALUE val;
+            int shareable_literal_p2;
+            NODE *elt = RNODE_LIST(n)->nd_head;
+            if (elt) {
+                CHECK(compile_shareable_literal_constant_next(elt, anchor, &val, &shareable_literal_p2));
+                if (shareable_literal_p2) {
+                    /* noop */
+                }
+                else if (RTEST(lit)) {
+                    rb_ary_clear(lit);
+                    lit = Qfalse;
+                }
+            }
+            if (RTEST(lit)) {
+                if (!UNDEF_P(val)) {
+                    rb_ary_push(lit, val);
+                }
+                else {
+                    rb_ary_clear(lit);
+                    lit = Qnil; /* make shareable at runtime */
+                }
             }
-            if (ip) {
-                ADD_GETLOCAL(ret, node, LVAR_ERRINFO, level);
+        }
+        break;
+      }
+      case NODE_HASH:{
+        if (!RNODE_HASH(node)->nd_brace) {
+            *value_p = Qundef;
+            *shareable_literal_p = 0;
+            return COMPILE_OK;
+        }
+        for (NODE *n = RNODE_HASH(node)->nd_head; n; n = RNODE_LIST(RNODE_LIST(n)->nd_next)->nd_next) {
+            if (!RNODE_LIST(n)->nd_head) {
+                // If the hash node have a keyword splat, fall back to the default case.
+                goto compile_shareable;
             }
-            else {
-                ADD_INSN(ret, node, putnil);
+        }
+
+        INIT_ANCHOR(anchor);
+        lit = rb_hash_new();
+        for (NODE *n = RNODE_HASH(node)->nd_head; n; n = RNODE_LIST(RNODE_LIST(n)->nd_next)->nd_next) {
+            VALUE key_val = 0;
+            VALUE value_val = 0;
+            int shareable_literal_p2;
+            NODE *key = RNODE_LIST(n)->nd_head;
+            NODE *val = RNODE_LIST(RNODE_LIST(n)->nd_next)->nd_head;
+            CHECK(compile_shareable_literal_constant_next(key, anchor, &key_val, &shareable_literal_p2));
+            if (shareable_literal_p2) {
+                /* noop */
+            }
+            else if (RTEST(lit)) {
+                rb_hash_clear(lit);
+                lit = Qfalse;
+            }
+            CHECK(compile_shareable_literal_constant_next(val, anchor, &value_val, &shareable_literal_p2));
+            if (shareable_literal_p2) {
+                /* noop */
+            }
+            else if (RTEST(lit)) {
+                rb_hash_clear(lit);
+                lit = Qfalse;
+            }
+            if (RTEST(lit)) {
+                if (!UNDEF_P(key_val) && !UNDEF_P(value_val)) {
+                    rb_hash_aset(lit, key_val, value_val);
+                }
+                else {
+                    rb_hash_clear(lit);
+                    lit = Qnil; /* make shareable at runtime */
+                }
             }
         }
-    }
-    return COMPILE_OK;
-}
+        break;
+      }
 
-static int
-compile_kw_arg(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const node, int popped)
-{
-    struct rb_iseq_constant_body *const body = ISEQ_BODY(iseq);
-    LABEL *end_label = NEW_LABEL(nd_line(node));
-    const NODE *default_value = node->nd_body->nd_value;
+      default:
 
-    if (default_value == NODE_SPECIAL_REQUIRED_KEYWORD) {
-        /* required argument. do nothing */
-        COMPILE_ERROR(ERROR_ARGS "unreachable");
-        return COMPILE_NG;
+      compile_shareable:
+        if (shareable == rb_parser_shareable_literal &&
+            (SHAREABLE_BARE_EXPRESSION || level > 0)) {
+            CHECK(compile_ensure_shareable_node(iseq, ret, dest, node));
+            *value_p = Qundef;
+            *shareable_literal_p = 1;
+            return COMPILE_OK;
+        }
+        CHECK(COMPILE(ret, "shareable_literal_constant", node));
+        *value_p = Qundef;
+        *shareable_literal_p = 0;
+        return COMPILE_OK;
     }
-    else if (nd_type_p(default_value, NODE_LIT) ||
-             nd_type_p(default_value, NODE_NIL) ||
-             nd_type_p(default_value, NODE_TRUE) ||
-             nd_type_p(default_value, NODE_FALSE)) {
-        COMPILE_ERROR(ERROR_ARGS "unreachable");
-        return COMPILE_NG;
+
+    /* Array or Hash that does not have keyword splat */
+    if (!lit) {
+        if (nd_type(node) == NODE_LIST) {
+            ADD_INSN1(anchor, node, newarray, INT2FIX(RNODE_LIST(node)->as.nd_alen));
+        }
+        else if (nd_type(node) == NODE_HASH) {
+            int len = (int)RNODE_LIST(RNODE_HASH(node)->nd_head)->as.nd_alen;
+            ADD_INSN1(anchor, node, newhash, INT2FIX(len));
+        }
+        *value_p = Qundef;
+        *shareable_literal_p = 0;
+        ADD_SEQ(ret, anchor);
+        return COMPILE_OK;
+    }
+    if (NIL_P(lit)) {
+        // if shareable_literal, all elements should have been ensured
+        // as shareable
+        if (nd_type(node) == NODE_LIST) {
+            ADD_INSN1(anchor, node, newarray, INT2FIX(RNODE_LIST(node)->as.nd_alen));
+        }
+        else if (nd_type(node) == NODE_HASH) {
+            int len = (int)RNODE_LIST(RNODE_HASH(node)->nd_head)->as.nd_alen;
+            ADD_INSN1(anchor, node, newhash, INT2FIX(len));
+        }
+        CHECK(compile_make_shareable_node(iseq, ret, anchor, node, false));
+        *value_p = Qundef;
+        *shareable_literal_p = 1;
     }
     else {
-        /* if keywordcheck(_kw_bits, nth_keyword)
-         *   kw = default_value
-         * end
-         */
-        int kw_bits_idx = body->local_table_size - body->param.keyword->bits_start;
-        int keyword_idx = body->param.keyword->num;
-
-        ADD_INSN2(ret, node, checkkeyword, INT2FIX(kw_bits_idx + VM_ENV_DATA_SIZE - 1), INT2FIX(keyword_idx));
-        ADD_INSNL(ret, node, branchif, end_label);
-        CHECK(COMPILE_POPPED(ret, "keyword default argument", node->nd_body));
-        ADD_LABEL(ret, end_label);
+        VALUE val = rb_ractor_make_shareable(lit);
+        ADD_INSN1(ret, node, putobject, val);
+        RB_OBJ_WRITTEN(iseq, Qundef, val);
+        *value_p = val;
+        *shareable_literal_p = 1;
     }
+
     return COMPILE_OK;
 }
 
 static int
-compile_attrasgn(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const node, int popped)
+compile_shareable_constant_value(rb_iseq_t *iseq, LINK_ANCHOR *ret, enum rb_parser_shareability shareable, const NODE *lhs, const NODE *value)
 {
-    DECL_ANCHOR(recv);
-    DECL_ANCHOR(args);
-    unsigned int flag = 0;
-    ID mid = node->nd_mid;
-    VALUE argc;
-    LABEL *else_label = NULL;
-    VALUE branches = Qfalse;
+    int literal_p = 0;
+    VALUE val;
+    DECL_ANCHOR(anchor);
+    INIT_ANCHOR(anchor);
 
-    /* optimization shortcut
-     *   obj["literal"] = value -> opt_aset_with(obj, "literal", value)
-     */
-    if (mid == idASET && !private_recv_p(node) && node->nd_args &&
-        nd_type_p(node->nd_args, NODE_LIST) && node->nd_args->nd_alen == 2 &&
-        nd_type_p(node->nd_args->nd_head, NODE_STR) &&
-        ISEQ_COMPILE_DATA(iseq)->current_block == NULL &&
-        !ISEQ_COMPILE_DATA(iseq)->option->frozen_string_literal &&
-        ISEQ_COMPILE_DATA(iseq)->option->specialized_instruction)
-    {
-        VALUE str = rb_fstring(node->nd_args->nd_head->nd_lit);
-        CHECK(COMPILE(ret, "recv", node->nd_recv));
-        CHECK(COMPILE(ret, "value", node->nd_args->nd_next->nd_head));
-        if (!popped) {
-            ADD_INSN(ret, node, swap);
-            ADD_INSN1(ret, node, topn, INT2FIX(1));
-        }
-        ADD_INSN2(ret, node, opt_aset_with, str,
-                  new_callinfo(iseq, idASET, 2, 0, NULL, FALSE));
-        RB_OBJ_WRITTEN(iseq, Qundef, str);
-        ADD_INSN(ret, node, pop);
+    switch (shareable) {
+      case rb_parser_shareable_none:
+        CHECK(COMPILE(ret, "compile_shareable_constant_value", value));
         return COMPILE_OK;
-    }
-
-    INIT_ANCHOR(recv);
-    INIT_ANCHOR(args);
-    argc = setup_args(iseq, args, node->nd_args, &flag, NULL);
-    CHECK(!NIL_P(argc));
-
-    int asgnflag = COMPILE_RECV(recv, "recv", node);
-    CHECK(asgnflag != -1);
-    flag |= (unsigned int)asgnflag;
-
-    debugp_param("argc", argc);
-    debugp_param("nd_mid", ID2SYM(mid));
 
-    if (!rb_is_attrset_id(mid)) {
-        /* safe nav attr */
-        mid = rb_id_attrset(mid);
-        else_label = qcall_branch_start(iseq, recv, &branches, node, node);
-    }
-    if (!popped) {
-        ADD_INSN(ret, node, putnil);
-        ADD_SEQ(ret, recv);
-        ADD_SEQ(ret, args);
+      case rb_parser_shareable_literal:
+        CHECK(compile_shareable_literal_constant(iseq, anchor, shareable, (NODE *)lhs, value, 0, &val, &literal_p));
+        ADD_SEQ(ret, anchor);
+        return COMPILE_OK;
 
-        if (flag & VM_CALL_ARGS_BLOCKARG) {
-            ADD_INSN1(ret, node, topn, INT2FIX(1));
-            if (flag & VM_CALL_ARGS_SPLAT) {
-                ADD_INSN1(ret, node, putobject, INT2FIX(-1));
-                ADD_SEND_WITH_FLAG(ret, node, idAREF, INT2FIX(1), INT2FIX(asgnflag));
-            }
-            ADD_INSN1(ret, node, setn, FIXNUM_INC(argc, 3));
-            ADD_INSN (ret, node, pop);
-        }
-        else if (flag & VM_CALL_ARGS_SPLAT) {
-            ADD_INSN(ret, node, dup);
-            ADD_INSN1(ret, node, putobject, INT2FIX(-1));
-            ADD_SEND_WITH_FLAG(ret, node, idAREF, INT2FIX(1), INT2FIX(asgnflag));
-            ADD_INSN1(ret, node, setn, FIXNUM_INC(argc, 2));
-            ADD_INSN (ret, node, pop);
+      case rb_parser_shareable_copy:
+      case rb_parser_shareable_everything:
+        CHECK(compile_shareable_literal_constant(iseq, anchor, shareable, (NODE *)lhs, value, 0, &val, &literal_p));
+        if (!literal_p) {
+            CHECK(compile_make_shareable_node(iseq, ret, anchor, value, shareable == rb_parser_shareable_copy));
         }
         else {
-            ADD_INSN1(ret, node, setn, FIXNUM_INC(argc, 1));
+            ADD_SEQ(ret, anchor);
         }
+        return COMPILE_OK;
+      default:
+        rb_bug("unexpected rb_parser_shareability: %d", shareable);
     }
-    else {
-        ADD_SEQ(ret, recv);
-        ADD_SEQ(ret, args);
-    }
-    ADD_SEND_WITH_FLAG(ret, node, mid, argc, INT2FIX(flag));
-    qcall_branch_end(iseq, ret, else_label, branches, node, node);
-    ADD_INSN(ret, node, pop);
-    return COMPILE_OK;
 }
 
 static int iseq_compile_each0(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const node, int popped);
@@ -9388,8 +10777,7 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *ret, const NODE *node, int poppe
             int lineno = ISEQ_COMPILE_DATA(iseq)->last_line;
             if (lineno == 0) lineno = FIX2INT(rb_iseq_first_lineno(iseq));
             debugs("node: NODE_NIL(implicit)\n");
-            NODE dummy_line_node = generate_dummy_line_node(lineno, -1);
-            ADD_INSN(ret, &dummy_line_node, putnil);
+            ADD_SYNTHETIC_INSN(ret, lineno, -1, putnil);
         }
         return COMPILE_OK;
     }
@@ -9407,10 +10795,10 @@ iseq_compile_each0(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const no
         /* ignore */
     }
     else {
-        if (node->flags & NODE_FL_NEWLINE) {
+        if (nd_fl_newline(node)) {
             int event = RUBY_EVENT_LINE;
             ISEQ_COMPILE_DATA(iseq)->last_line = line;
-            if (ISEQ_COVERAGE(iseq) && ISEQ_LINE_COVERAGE(iseq)) {
+            if (line > 0 && ISEQ_COVERAGE(iseq) && ISEQ_LINE_COVERAGE(iseq)) {
                 event |= RUBY_EVENT_COVERAGE_LINE;
             }
             ADD_TRACE(ret, event);
@@ -9462,7 +10850,7 @@ iseq_compile_each0(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const no
         CHECK(compile_retry(iseq, ret, node, popped));
         break;
       case NODE_BEGIN:{
-        CHECK(COMPILE_(ret, "NODE_BEGIN", node->nd_body, popped));
+        CHECK(COMPILE_(ret, "NODE_BEGIN", RNODE_BEGIN(node)->nd_body, popped));
         break;
       }
       case NODE_RESCUE:
@@ -9478,7 +10866,7 @@ iseq_compile_each0(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const no
       case NODE_AND:
       case NODE_OR:{
         LABEL *end_label = NEW_LABEL(line);
-        CHECK(COMPILE(ret, "nd_1st", node->nd_1st));
+        CHECK(COMPILE(ret, "nd_1st", RNODE_OR(node)->nd_1st));
         if (!popped) {
             ADD_INSN(ret, node, dup);
         }
@@ -9491,22 +10879,25 @@ iseq_compile_each0(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const no
         if (!popped) {
             ADD_INSN(ret, node, pop);
         }
-        CHECK(COMPILE_(ret, "nd_2nd", node->nd_2nd, popped));
+        CHECK(COMPILE_(ret, "nd_2nd", RNODE_OR(node)->nd_2nd, popped));
         ADD_LABEL(ret, end_label);
         break;
       }
 
       case NODE_MASGN:{
+        bool prev_in_masgn = ISEQ_COMPILE_DATA(iseq)->in_masgn;
+        ISEQ_COMPILE_DATA(iseq)->in_masgn = true;
         compile_massign(iseq, ret, node, popped);
+        ISEQ_COMPILE_DATA(iseq)->in_masgn = prev_in_masgn;
         break;
       }
 
       case NODE_LASGN:{
-        ID id = node->nd_vid;
+        ID id = RNODE_LASGN(node)->nd_vid;
         int idx = ISEQ_BODY(body->local_iseq)->local_table_size - get_local_var_idx(iseq, id);
 
         debugs("lvar: %s idx: %d\n", rb_id2name(id), idx);
-        CHECK(COMPILE(ret, "rvalue", node->nd_value));
+        CHECK(COMPILE(ret, "rvalue", RNODE_LASGN(node)->nd_value));
 
         if (!popped) {
             ADD_INSN(ret, node, dup);
@@ -9516,8 +10907,8 @@ iseq_compile_each0(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const no
       }
       case NODE_DASGN: {
         int idx, lv, ls;
-        ID id = node->nd_vid;
-        CHECK(COMPILE(ret, "dvalue", node->nd_value));
+        ID id = RNODE_DASGN(node)->nd_vid;
+        CHECK(COMPILE(ret, "dvalue", RNODE_DASGN(node)->nd_value));
         debugi("dassn id", rb_id2str(id) ? id : '*');
 
         if (!popped) {
@@ -9535,27 +10926,27 @@ iseq_compile_each0(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const no
         break;
       }
       case NODE_GASGN:{
-        CHECK(COMPILE(ret, "lvalue", node->nd_value));
+        CHECK(COMPILE(ret, "lvalue", RNODE_GASGN(node)->nd_value));
 
         if (!popped) {
             ADD_INSN(ret, node, dup);
         }
-        ADD_INSN1(ret, node, setglobal, ID2SYM(node->nd_vid));
+        ADD_INSN1(ret, node, setglobal, ID2SYM(RNODE_GASGN(node)->nd_vid));
         break;
       }
       case NODE_IASGN:{
-        CHECK(COMPILE(ret, "lvalue", node->nd_value));
+        CHECK(COMPILE(ret, "lvalue", RNODE_IASGN(node)->nd_value));
         if (!popped) {
             ADD_INSN(ret, node, dup);
         }
         ADD_INSN2(ret, node, setinstancevariable,
-                  ID2SYM(node->nd_vid),
-                  get_ivar_ic_value(iseq,node->nd_vid));
+                  ID2SYM(RNODE_IASGN(node)->nd_vid),
+                  get_ivar_ic_value(iseq,RNODE_IASGN(node)->nd_vid));
         break;
       }
       case NODE_CDECL:{
-        if (node->nd_vid) {
-            CHECK(COMPILE(ret, "lvalue", node->nd_value));
+        if (RNODE_CDECL(node)->nd_vid) {
+            CHECK(compile_shareable_constant_value(iseq, ret, RNODE_CDECL(node)->shareability, node, RNODE_CDECL(node)->nd_value));
 
             if (!popped) {
                 ADD_INSN(ret, node, dup);
@@ -9563,11 +10954,11 @@ iseq_compile_each0(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const no
 
             ADD_INSN1(ret, node, putspecialobject,
                       INT2FIX(VM_SPECIAL_OBJECT_CONST_BASE));
-            ADD_INSN1(ret, node, setconstant, ID2SYM(node->nd_vid));
+            ADD_INSN1(ret, node, setconstant, ID2SYM(RNODE_CDECL(node)->nd_vid));
         }
         else {
-            compile_cpath(ret, iseq, node->nd_else);
-            CHECK(COMPILE(ret, "lvalue", node->nd_value));
+            compile_cpath(ret, iseq, RNODE_CDECL(node)->nd_else);
+            CHECK(compile_shareable_constant_value(iseq, ret, RNODE_CDECL(node)->shareability, node, RNODE_CDECL(node)->nd_value));
             ADD_INSN(ret, node, swap);
 
             if (!popped) {
@@ -9575,18 +10966,18 @@ iseq_compile_each0(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const no
                 ADD_INSN(ret, node, swap);
             }
 
-            ADD_INSN1(ret, node, setconstant, ID2SYM(node->nd_else->nd_mid));
+            ADD_INSN1(ret, node, setconstant, ID2SYM(get_node_colon_nd_mid(RNODE_CDECL(node)->nd_else)));
         }
         break;
       }
       case NODE_CVASGN:{
-        CHECK(COMPILE(ret, "cvasgn val", node->nd_value));
+        CHECK(COMPILE(ret, "cvasgn val", RNODE_CVASGN(node)->nd_value));
         if (!popped) {
             ADD_INSN(ret, node, dup);
         }
         ADD_INSN2(ret, node, setclassvariable,
-                  ID2SYM(node->nd_vid),
-                  get_cvar_ic_value(iseq,node->nd_vid));
+                  ID2SYM(RNODE_CVASGN(node)->nd_vid),
+                  get_cvar_ic_value(iseq, RNODE_CVASGN(node)->nd_vid));
         break;
       }
       case NODE_OP_ASGN1:
@@ -9619,7 +11010,7 @@ iseq_compile_each0(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const no
         CHECK(compile_super(iseq, ret, node, popped, type));
         break;
       case NODE_LIST:{
-        CHECK(compile_array(iseq, ret, node, popped) >= 0);
+        CHECK(compile_array(iseq, ret, node, popped, TRUE) >= 0);
         break;
       }
       case NODE_ZLIST:{
@@ -9628,18 +11019,6 @@ iseq_compile_each0(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const no
         }
         break;
       }
-      case NODE_VALUES:{
-        const NODE *n = node;
-        if (popped) {
-            COMPILE_ERROR(ERROR_ARGS "NODE_VALUES: must not be popped");
-        }
-        while (n) {
-            CHECK(COMPILE(ret, "values item", n->nd_head));
-            n = n->nd_next;
-        }
-        ADD_INSN1(ret, node, newarray, INT2FIX(node->nd_alen));
-        break;
-      }
       case NODE_HASH:
         CHECK(compile_hash(iseq, ret, node, FALSE, popped) >= 0);
         break;
@@ -9651,18 +11030,18 @@ iseq_compile_each0(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const no
         break;
       case NODE_LVAR:{
         if (!popped) {
-            compile_lvar(iseq, ret, node, node->nd_vid);
+            compile_lvar(iseq, ret, node, RNODE_LVAR(node)->nd_vid);
         }
         break;
       }
       case NODE_DVAR:{
         int lv, idx, ls;
-        debugi("nd_vid", node->nd_vid);
+        debugi("nd_vid", RNODE_DVAR(node)->nd_vid);
         if (!popped) {
-            idx = get_dyna_var_idx(iseq, node->nd_vid, &lv, &ls);
+            idx = get_dyna_var_idx(iseq, RNODE_DVAR(node)->nd_vid, &lv, &ls);
             if (idx < 0) {
                 COMPILE_ERROR(ERROR_ARGS "unknown dvar (%"PRIsVALUE")",
-                              rb_id2str(node->nd_vid));
+                              rb_id2str(RNODE_DVAR(node)->nd_vid));
                 goto ng;
             }
             ADD_GETLOCAL(ret, node, ls - idx, lv);
@@ -9670,34 +11049,34 @@ iseq_compile_each0(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const no
         break;
       }
       case NODE_GVAR:{
-        ADD_INSN1(ret, node, getglobal, ID2SYM(node->nd_vid));
+        ADD_INSN1(ret, node, getglobal, ID2SYM(RNODE_GVAR(node)->nd_vid));
         if (popped) {
             ADD_INSN(ret, node, pop);
         }
         break;
       }
       case NODE_IVAR:{
-        debugi("nd_vid", node->nd_vid);
+        debugi("nd_vid", RNODE_IVAR(node)->nd_vid);
         if (!popped) {
             ADD_INSN2(ret, node, getinstancevariable,
-                      ID2SYM(node->nd_vid),
-                      get_ivar_ic_value(iseq,node->nd_vid));
+                      ID2SYM(RNODE_IVAR(node)->nd_vid),
+                      get_ivar_ic_value(iseq, RNODE_IVAR(node)->nd_vid));
         }
         break;
       }
       case NODE_CONST:{
-        debugi("nd_vid", node->nd_vid);
+        debugi("nd_vid", RNODE_CONST(node)->nd_vid);
 
         if (ISEQ_COMPILE_DATA(iseq)->option->inline_const_cache) {
             body->ic_size++;
-            VALUE segments = rb_ary_new_from_args(1, ID2SYM(node->nd_vid));
+            VALUE segments = rb_ary_new_from_args(1, ID2SYM(RNODE_CONST(node)->nd_vid));
             ADD_INSN1(ret, node, opt_getconstant_path, segments);
             RB_OBJ_WRITTEN(iseq, Qundef, segments);
         }
         else {
             ADD_INSN(ret, node, putnil);
             ADD_INSN1(ret, node, putobject, Qtrue);
-            ADD_INSN1(ret, node, getconstant, ID2SYM(node->nd_vid));
+            ADD_INSN1(ret, node, getconstant, ID2SYM(RNODE_CONST(node)->nd_vid));
         }
 
         if (popped) {
@@ -9708,26 +11087,26 @@ iseq_compile_each0(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const no
       case NODE_CVAR:{
         if (!popped) {
             ADD_INSN2(ret, node, getclassvariable,
-                      ID2SYM(node->nd_vid),
-                      get_cvar_ic_value(iseq,node->nd_vid));
+                      ID2SYM(RNODE_CVAR(node)->nd_vid),
+                      get_cvar_ic_value(iseq, RNODE_CVAR(node)->nd_vid));
         }
         break;
       }
       case NODE_NTH_REF:{
         if (!popped) {
-            if (!node->nd_nth) {
+            if (!RNODE_NTH_REF(node)->nd_nth) {
                 ADD_INSN(ret, node, putnil);
                 break;
             }
             ADD_INSN2(ret, node, getspecial, INT2FIX(1) /* '~'  */,
-                      INT2FIX(node->nd_nth << 1));
+                      INT2FIX(RNODE_NTH_REF(node)->nd_nth << 1));
         }
         break;
       }
       case NODE_BACK_REF:{
         if (!popped) {
             ADD_INSN2(ret, node, getspecial, INT2FIX(1) /* '~' */,
-                      INT2FIX(0x01 | (node->nd_nth << 1)));
+                      INT2FIX(0x01 | (RNODE_BACK_REF(node)->nd_nth << 1)));
         }
         break;
       }
@@ -9736,36 +11115,84 @@ iseq_compile_each0(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const no
       case NODE_MATCH3:
         CHECK(compile_match(iseq, ret, node, popped, type));
         break;
-      case NODE_LIT:{
-        debugp_param("lit", node->nd_lit);
+      case NODE_SYM:{
+        if (!popped) {
+            ADD_INSN1(ret, node, putobject, rb_node_sym_string_val(node));
+        }
+        break;
+      }
+      case NODE_LINE:{
+        if (!popped) {
+            ADD_INSN1(ret, node, putobject, rb_node_line_lineno_val(node));
+        }
+        break;
+      }
+      case NODE_ENCODING:{
+        if (!popped) {
+            ADD_INSN1(ret, node, putobject, rb_node_encoding_val(node));
+        }
+        break;
+      }
+      case NODE_INTEGER:{
+        VALUE lit = rb_node_integer_literal_val(node);
+        debugp_param("integer", lit);
+        if (!popped) {
+            ADD_INSN1(ret, node, putobject, lit);
+            RB_OBJ_WRITTEN(iseq, Qundef, lit);
+        }
+        break;
+      }
+      case NODE_FLOAT:{
+        VALUE lit = rb_node_float_literal_val(node);
+        debugp_param("float", lit);
+        if (!popped) {
+            ADD_INSN1(ret, node, putobject, lit);
+            RB_OBJ_WRITTEN(iseq, Qundef, lit);
+        }
+        break;
+      }
+      case NODE_RATIONAL:{
+        VALUE lit = rb_node_rational_literal_val(node);
+        debugp_param("rational", lit);
+        if (!popped) {
+            ADD_INSN1(ret, node, putobject, lit);
+            RB_OBJ_WRITTEN(iseq, Qundef, lit);
+        }
+        break;
+      }
+      case NODE_IMAGINARY:{
+        VALUE lit = rb_node_imaginary_literal_val(node);
+        debugp_param("imaginary", lit);
         if (!popped) {
-            ADD_INSN1(ret, node, putobject, node->nd_lit);
-            RB_OBJ_WRITTEN(iseq, Qundef, node->nd_lit);
+            ADD_INSN1(ret, node, putobject, lit);
+            RB_OBJ_WRITTEN(iseq, Qundef, lit);
         }
         break;
       }
+      case NODE_FILE:
       case NODE_STR:{
-        debugp_param("nd_lit", node->nd_lit);
+        debugp_param("nd_lit", get_string_value(node));
         if (!popped) {
-            VALUE lit = node->nd_lit;
-            if (!ISEQ_COMPILE_DATA(iseq)->option->frozen_string_literal) {
-                lit = rb_fstring(lit);
+            VALUE lit = get_string_value(node);
+            const rb_compile_option_t *option = ISEQ_COMPILE_DATA(iseq)->option;
+            if ((option->debug_frozen_string_literal || RTEST(ruby_debug)) &&
+                option->frozen_string_literal != ISEQ_FROZEN_STRING_LITERAL_DISABLED) {
+                lit = rb_str_with_debug_created_info(lit, rb_iseq_path(iseq), line);
+            }
+            switch (option->frozen_string_literal) {
+              case ISEQ_FROZEN_STRING_LITERAL_UNSET:
+                ADD_INSN1(ret, node, putchilledstring, lit);
+                break;
+              case ISEQ_FROZEN_STRING_LITERAL_DISABLED:
                 ADD_INSN1(ret, node, putstring, lit);
-                RB_OBJ_WRITTEN(iseq, Qundef, lit);
-            }
-            else {
-                if (ISEQ_COMPILE_DATA(iseq)->option->debug_frozen_string_literal || RTEST(ruby_debug)) {
-                    VALUE debug_info = rb_ary_new_from_args(2, rb_iseq_path(iseq), INT2FIX(line));
-                    lit = rb_str_dup(lit);
-                    rb_ivar_set(lit, id_debug_created_info, rb_obj_freeze(debug_info));
-                    lit = rb_str_freeze(lit);
-                }
-                else {
-                    lit = rb_fstring(lit);
-                }
+                break;
+              case ISEQ_FROZEN_STRING_LITERAL_ENABLED:
                 ADD_INSN1(ret, node, putobject, lit);
-                RB_OBJ_WRITTEN(iseq, Qundef, lit);
+                break;
+              default:
+                rb_bug("invalid frozen_string_literal");
             }
+            RB_OBJ_WRITTEN(iseq, Qundef, lit);
         }
         break;
       }
@@ -9779,7 +11206,7 @@ iseq_compile_each0(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const no
       }
       case NODE_XSTR:{
         ADD_CALL_RECEIVER(ret, node);
-        VALUE str = rb_fstring(node->nd_lit);
+        VALUE str = rb_node_str_string_val(node);
         ADD_INSN1(ret, node, putobject, str);
         RB_OBJ_WRITTEN(iseq, Qundef, str);
         ADD_CALL(ret, node, idBackquote, INT2FIX(1));
@@ -9800,20 +11227,23 @@ iseq_compile_each0(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const no
         break;
       }
       case NODE_EVSTR:
-        CHECK(compile_evstr(iseq, ret, node->nd_body, popped));
+        CHECK(compile_evstr(iseq, ret, RNODE_EVSTR(node)->nd_body, popped));
         break;
-      case NODE_DREGX:{
-        compile_dregx(iseq, ret, node);
-
-        if (popped) {
-            ADD_INSN(ret, node, pop);
+      case NODE_REGX:{
+        if (!popped) {
+            VALUE lit = rb_node_regx_string_val(node);
+            ADD_INSN1(ret, node, putobject, lit);
+            RB_OBJ_WRITTEN(iseq, Qundef, lit);
         }
         break;
       }
+      case NODE_DREGX:
+        compile_dregx(iseq, ret, node, popped);
+        break;
       case NODE_ONCE:{
         int ic_index = body->ise_size++;
         const rb_iseq_t *block_iseq;
-        block_iseq = NEW_CHILD_ISEQ(node->nd_body, make_name_for_block(iseq), ISEQ_TYPE_PLAIN, line);
+        block_iseq = NEW_CHILD_ISEQ(RNODE_ONCE(node)->nd_body, make_name_for_block(iseq), ISEQ_TYPE_PLAIN, line);
 
         ADD_INSN2(ret, node, once, block_iseq, INT2FIX(ic_index));
         RB_OBJ_WRITTEN(iseq, Qundef, (VALUE)block_iseq);
@@ -9825,36 +11255,53 @@ iseq_compile_each0(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const no
       }
       case NODE_ARGSCAT:{
         if (popped) {
-            CHECK(COMPILE(ret, "argscat head", node->nd_head));
+            CHECK(COMPILE(ret, "argscat head", RNODE_ARGSCAT(node)->nd_head));
             ADD_INSN1(ret, node, splatarray, Qfalse);
             ADD_INSN(ret, node, pop);
-            CHECK(COMPILE(ret, "argscat body", node->nd_body));
+            CHECK(COMPILE(ret, "argscat body", RNODE_ARGSCAT(node)->nd_body));
             ADD_INSN1(ret, node, splatarray, Qfalse);
             ADD_INSN(ret, node, pop);
         }
         else {
-            CHECK(COMPILE(ret, "argscat head", node->nd_head));
-            CHECK(COMPILE(ret, "argscat body", node->nd_body));
-            ADD_INSN(ret, node, concatarray);
+            CHECK(COMPILE(ret, "argscat head", RNODE_ARGSCAT(node)->nd_head));
+            const NODE *body_node = RNODE_ARGSCAT(node)->nd_body;
+            if (nd_type_p(body_node, NODE_LIST)) {
+                CHECK(compile_array(iseq, ret, body_node, popped, FALSE) >= 0);
+            }
+            else {
+                CHECK(COMPILE(ret, "argscat body", body_node));
+                ADD_INSN(ret, node, concattoarray);
+            }
         }
         break;
       }
       case NODE_ARGSPUSH:{
         if (popped) {
-            CHECK(COMPILE(ret, "argspush head", node->nd_head));
+            CHECK(COMPILE(ret, "argspush head", RNODE_ARGSPUSH(node)->nd_head));
             ADD_INSN1(ret, node, splatarray, Qfalse);
             ADD_INSN(ret, node, pop);
-            CHECK(COMPILE_(ret, "argspush body", node->nd_body, popped));
+            CHECK(COMPILE_(ret, "argspush body", RNODE_ARGSPUSH(node)->nd_body, popped));
         }
         else {
-            CHECK(COMPILE(ret, "argspush head", node->nd_head));
-            CHECK(compile_array_1(iseq, ret, node->nd_body));
-            ADD_INSN(ret, node, concatarray);
+            CHECK(COMPILE(ret, "argspush head", RNODE_ARGSPUSH(node)->nd_head));
+            const NODE *body_node = RNODE_ARGSPUSH(node)->nd_body;
+            if (keyword_node_p(body_node)) {
+                CHECK(COMPILE_(ret, "array element", body_node, FALSE));
+                ADD_INSN(ret, node, pushtoarraykwsplat);
+            }
+            else if (static_literal_node_p(body_node, iseq, false)) {
+                ADD_INSN1(ret, body_node, putobject, static_literal_value(body_node, iseq));
+                ADD_INSN1(ret, node, pushtoarray, INT2FIX(1));
+            }
+            else {
+                CHECK(COMPILE_(ret, "array element", body_node, FALSE));
+                ADD_INSN1(ret, node, pushtoarray, INT2FIX(1));
+            }
         }
         break;
       }
       case NODE_SPLAT:{
-        CHECK(COMPILE(ret, "splat", node->nd_head));
+        CHECK(COMPILE(ret, "splat", RNODE_SPLAT(node)->nd_head));
         ADD_INSN1(ret, node, splatarray, Qtrue);
 
         if (popped) {
@@ -9863,8 +11310,8 @@ iseq_compile_each0(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const no
         break;
       }
       case NODE_DEFN:{
-        ID mid = node->nd_mid;
-        const rb_iseq_t *method_iseq = NEW_ISEQ(node->nd_defn,
+        ID mid = RNODE_DEFN(node)->nd_mid;
+        const rb_iseq_t *method_iseq = NEW_ISEQ(RNODE_DEFN(node)->nd_defn,
                                                 rb_id2str(mid),
                                                 ISEQ_TYPE_METHOD, line);
 
@@ -9879,13 +11326,13 @@ iseq_compile_each0(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const no
         break;
       }
       case NODE_DEFS:{
-        ID mid = node->nd_mid;
-        const rb_iseq_t * singleton_method_iseq = NEW_ISEQ(node->nd_defn,
+        ID mid = RNODE_DEFS(node)->nd_mid;
+        const rb_iseq_t * singleton_method_iseq = NEW_ISEQ(RNODE_DEFS(node)->nd_defn,
                                                            rb_id2str(mid),
                                                            ISEQ_TYPE_METHOD, line);
 
         debugp_param("defs/iseq", rb_iseqw_new(singleton_method_iseq));
-        CHECK(COMPILE(ret, "defs: recv", node->nd_recv));
+        CHECK(COMPILE(ret, "defs: recv", RNODE_DEFS(node)->nd_recv));
         ADD_INSN2(ret, node, definesmethod, ID2SYM(mid), singleton_method_iseq);
         RB_OBJ_WRITTEN(iseq, Qundef, (VALUE)singleton_method_iseq);
 
@@ -9897,8 +11344,8 @@ iseq_compile_each0(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const no
       case NODE_ALIAS:{
         ADD_INSN1(ret, node, putspecialobject, INT2FIX(VM_SPECIAL_OBJECT_VMCORE));
         ADD_INSN1(ret, node, putspecialobject, INT2FIX(VM_SPECIAL_OBJECT_CBASE));
-        CHECK(COMPILE(ret, "alias arg1", node->nd_1st));
-        CHECK(COMPILE(ret, "alias arg2", node->nd_2nd));
+        CHECK(COMPILE(ret, "alias arg1", RNODE_ALIAS(node)->nd_1st));
+        CHECK(COMPILE(ret, "alias arg2", RNODE_ALIAS(node)->nd_2nd));
         ADD_SEND(ret, node, id_core_set_method_alias, INT2FIX(3));
 
         if (popped) {
@@ -9908,8 +11355,8 @@ iseq_compile_each0(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const no
       }
       case NODE_VALIAS:{
         ADD_INSN1(ret, node, putspecialobject, INT2FIX(VM_SPECIAL_OBJECT_VMCORE));
-        ADD_INSN1(ret, node, putobject, ID2SYM(node->nd_alias));
-        ADD_INSN1(ret, node, putobject, ID2SYM(node->nd_orig));
+        ADD_INSN1(ret, node, putobject, ID2SYM(RNODE_VALIAS(node)->nd_alias));
+        ADD_INSN1(ret, node, putobject, ID2SYM(RNODE_VALIAS(node)->nd_orig));
         ADD_SEND(ret, node, id_core_set_variable_alias, INT2FIX(2));
 
         if (popped) {
@@ -9918,10 +11365,18 @@ iseq_compile_each0(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const no
         break;
       }
       case NODE_UNDEF:{
-        ADD_INSN1(ret, node, putspecialobject, INT2FIX(VM_SPECIAL_OBJECT_VMCORE));
-        ADD_INSN1(ret, node, putspecialobject, INT2FIX(VM_SPECIAL_OBJECT_CBASE));
-        CHECK(COMPILE(ret, "undef arg", node->nd_undef));
-        ADD_SEND(ret, node, id_core_undef_method, INT2FIX(2));
+        const rb_parser_ary_t *ary = RNODE_UNDEF(node)->nd_undefs;
+
+        for (long i = 0; i < ary->len; i++) {
+            ADD_INSN1(ret, node, putspecialobject, INT2FIX(VM_SPECIAL_OBJECT_VMCORE));
+            ADD_INSN1(ret, node, putspecialobject, INT2FIX(VM_SPECIAL_OBJECT_CBASE));
+            CHECK(COMPILE(ret, "undef arg", ary->data[i]));
+            ADD_SEND(ret, node, id_core_undef_method, INT2FIX(2));
+
+            if (i < ary->len - 1) {
+                ADD_INSN(ret, node, pop);
+            }
+        }
 
         if (popped) {
             ADD_INSN(ret, node, pop);
@@ -9929,15 +11384,15 @@ iseq_compile_each0(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const no
         break;
       }
       case NODE_CLASS:{
-        const rb_iseq_t *class_iseq = NEW_CHILD_ISEQ(node->nd_body,
-                                                     rb_str_freeze(rb_sprintf("<class:%"PRIsVALUE">", rb_id2str(node->nd_cpath->nd_mid))),
+        const rb_iseq_t *class_iseq = NEW_CHILD_ISEQ(RNODE_CLASS(node)->nd_body,
+                                                     rb_str_freeze(rb_sprintf("<class:%"PRIsVALUE">", rb_id2str(get_node_colon_nd_mid(RNODE_CLASS(node)->nd_cpath)))),
                                                      ISEQ_TYPE_CLASS, line);
         const int flags = VM_DEFINECLASS_TYPE_CLASS |
-            (node->nd_super ? VM_DEFINECLASS_FLAG_HAS_SUPERCLASS : 0) |
-            compile_cpath(ret, iseq, node->nd_cpath);
+            (RNODE_CLASS(node)->nd_super ? VM_DEFINECLASS_FLAG_HAS_SUPERCLASS : 0) |
+            compile_cpath(ret, iseq, RNODE_CLASS(node)->nd_cpath);
 
-        CHECK(COMPILE(ret, "super", node->nd_super));
-        ADD_INSN3(ret, node, defineclass, ID2SYM(node->nd_cpath->nd_mid), class_iseq, INT2FIX(flags));
+        CHECK(COMPILE(ret, "super", RNODE_CLASS(node)->nd_super));
+        ADD_INSN3(ret, node, defineclass, ID2SYM(get_node_colon_nd_mid(RNODE_CLASS(node)->nd_cpath)), class_iseq, INT2FIX(flags));
         RB_OBJ_WRITTEN(iseq, Qundef, (VALUE)class_iseq);
 
         if (popped) {
@@ -9946,14 +11401,14 @@ iseq_compile_each0(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const no
         break;
       }
       case NODE_MODULE:{
-        const rb_iseq_t *module_iseq = NEW_CHILD_ISEQ(node->nd_body,
-                                                      rb_str_freeze(rb_sprintf("<module:%"PRIsVALUE">", rb_id2str(node->nd_cpath->nd_mid))),
+        const rb_iseq_t *module_iseq = NEW_CHILD_ISEQ(RNODE_MODULE(node)->nd_body,
+                                                      rb_str_freeze(rb_sprintf("<module:%"PRIsVALUE">", rb_id2str(get_node_colon_nd_mid(RNODE_MODULE(node)->nd_cpath)))),
                                                       ISEQ_TYPE_CLASS, line);
         const int flags = VM_DEFINECLASS_TYPE_MODULE |
-            compile_cpath(ret, iseq, node->nd_cpath);
+            compile_cpath(ret, iseq, RNODE_MODULE(node)->nd_cpath);
 
         ADD_INSN (ret, node, putnil); /* dummy */
-        ADD_INSN3(ret, node, defineclass, ID2SYM(node->nd_cpath->nd_mid), module_iseq, INT2FIX(flags));
+        ADD_INSN3(ret, node, defineclass, ID2SYM(get_node_colon_nd_mid(RNODE_MODULE(node)->nd_cpath)), module_iseq, INT2FIX(flags));
         RB_OBJ_WRITTEN(iseq, Qundef, (VALUE)module_iseq);
 
         if (popped) {
@@ -9963,10 +11418,10 @@ iseq_compile_each0(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const no
       }
       case NODE_SCLASS:{
         ID singletonclass;
-        const rb_iseq_t *singleton_class = NEW_ISEQ(node->nd_body, rb_fstring_lit("singleton class"),
+        const rb_iseq_t *singleton_class = NEW_ISEQ(RNODE_SCLASS(node)->nd_body, rb_fstring_lit("singleton class"),
                                                     ISEQ_TYPE_CLASS, line);
 
-        CHECK(COMPILE(ret, "sclass#recv", node->nd_recv));
+        CHECK(COMPILE(ret, "sclass#recv", RNODE_SCLASS(node)->nd_recv));
         ADD_INSN (ret, node, putnil);
         CONST_ID(singletonclass, "singletonclass");
         ADD_INSN3(ret, node, defineclass,
@@ -10035,7 +11490,7 @@ iseq_compile_each0(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const no
         break;
       case NODE_DEFINED:
         if (!popped) {
-            CHECK(compile_defined_expr(iseq, ret, node, Qtrue));
+            CHECK(compile_defined_expr(iseq, ret, node, Qtrue, false));
         }
         break;
       case NODE_POSTEXE:{
@@ -10044,10 +11499,9 @@ iseq_compile_each0(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const no
          */
         int is_index = body->ise_size++;
         struct rb_iseq_new_with_callback_callback_func *ifunc =
-            rb_iseq_new_with_callback_new_callback(build_postexe_iseq, node->nd_body);
+            rb_iseq_new_with_callback_new_callback(build_postexe_iseq, RNODE_POSTEXE(node)->nd_body);
         const rb_iseq_t *once_iseq =
-            new_child_iseq_with_callback(iseq, ifunc,
-                                 rb_fstring(make_name_for_block(iseq)), iseq, ISEQ_TYPE_BLOCK, line);
+            NEW_CHILD_ISEQ_WITH_CALLBACK(ifunc, rb_fstring(make_name_for_block(iseq)), ISEQ_TYPE_BLOCK, line);
 
         ADD_INSN2(ret, node, once, once_iseq, INT2FIX(is_index));
         RB_OBJ_WRITTEN(iseq, Qundef, (VALUE)once_iseq);
@@ -10075,7 +11529,7 @@ iseq_compile_each0(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const no
         break;
       case NODE_LAMBDA:{
         /* compile same as lambda{...} */
-        const rb_iseq_t *block = NEW_CHILD_ISEQ(node->nd_body, make_name_for_block(iseq), ISEQ_TYPE_BLOCK, line);
+        const rb_iseq_t *block = NEW_CHILD_ISEQ(RNODE_LAMBDA(node)->nd_body, make_name_for_block(iseq), ISEQ_TYPE_BLOCK, line);
         VALUE argc = INT2FIX(0);
 
         ADD_INSN1(ret, node, putspecialobject, INT2FIX(VM_SPECIAL_OBJECT_VMCORE));
@@ -10260,7 +11714,7 @@ dump_disasm_list_with_cursor(const LINK_ELEMENT *link, const LINK_ELEMENT *curr,
           case ISEQ_ELEMENT_LABEL:
             {
                 lobj = (LABEL *)link;
-                printf(LABEL_FORMAT" [sp: %d]%s\n", lobj->label_no, lobj->sp,
+                printf(LABEL_FORMAT" [sp: %d, unremovable: %d, refcnt: %d]%s\n", lobj->label_no, lobj->sp, lobj->unremovable, lobj->refcnt,
                        dest == lobj ? " <---" : "");
                 break;
             }
@@ -10278,7 +11732,7 @@ dump_disasm_list_with_cursor(const LINK_ELEMENT *link, const LINK_ELEMENT *curr,
             }
           default:
             /* ignore */
-            rb_raise(rb_eSyntaxError, "dump_disasm_list error: %ld\n", FIX2LONG(link->type));
+            rb_raise(rb_eSyntaxError, "dump_disasm_list error: %d\n", (int)link->type);
         }
         link = link->next;
     }
@@ -10306,7 +11760,7 @@ rb_insns_name_array(void)
     for (i = 0; i < VM_INSTRUCTION_SIZE; i++) {
         rb_ary_push(ary, rb_fstring_cstr(insn_name(i)));
     }
-    return rb_obj_freeze(ary);
+    return rb_ary_freeze(ary);
 }
 
 static LABEL *
@@ -10455,6 +11909,7 @@ iseq_build_callinfo_from_hash(rb_iseq_t *iseq, VALUE op)
             size_t n = rb_callinfo_kwarg_bytes(len);
 
             kw_arg = xmalloc(n);
+            kw_arg->references = 0;
             kw_arg->keyword_len = len;
             for (i = 0; i < len; i++) {
                 VALUE kw = RARRAY_AREF(vkw_arg, i);
@@ -10491,7 +11946,7 @@ iseq_build_from_ary_body(rb_iseq_t *iseq, LINK_ANCHOR *const anchor,
 {
     /* TODO: body should be frozen */
     long i, len = RARRAY_LEN(body);
-    struct st_table *labels_table = DATA_PTR(labels_wrapper);
+    struct st_table *labels_table = RTYPEDDATA_DATA(labels_wrapper);
     int j;
     int line_no = 0, node_id = -1, insn_idx = 0;
     int ret = COMPILE_OK;
@@ -10551,9 +12006,8 @@ iseq_build_from_ary_body(rb_iseq_t *iseq, LINK_ANCHOR *const anchor,
                 argv = compile_data_calloc2(iseq, sizeof(VALUE), argc);
 
                 // add element before operand setup to make GC root
-                NODE dummy_line_node = generate_dummy_line_node(line_no, node_id);
                 ADD_ELEM(anchor,
-                         (LINK_ELEMENT*)new_insn_core(iseq, &dummy_line_node,
+                         (LINK_ELEMENT*)new_insn_core(iseq, line_no, node_id,
                                                       (enum ruby_vminsn_type)insn_id, argc, argv));
 
                 for (j=0; j<argc; j++) {
@@ -10661,9 +12115,8 @@ iseq_build_from_ary_body(rb_iseq_t *iseq, LINK_ANCHOR *const anchor,
                 }
             }
             else {
-                NODE dummy_line_node = generate_dummy_line_node(line_no, node_id);
                 ADD_ELEM(anchor,
-                         (LINK_ELEMENT*)new_insn_core(iseq, &dummy_line_node,
+                         (LINK_ELEMENT*)new_insn_core(iseq, line_no, node_id,
                                                       (enum ruby_vminsn_type)insn_id, argc, NULL));
             }
         }
@@ -10671,7 +12124,8 @@ iseq_build_from_ary_body(rb_iseq_t *iseq, LINK_ANCHOR *const anchor,
             rb_raise(rb_eTypeError, "unexpected object for instruction");
         }
     }
-    DATA_PTR(labels_wrapper) = 0;
+    RTYPEDDATA_DATA(labels_wrapper) = 0;
+    RB_GC_GUARD(labels_wrapper);
     validate_labels(iseq, labels_table);
     if (!ret) return ret;
     return iseq_setup(iseq, anchor);
@@ -10755,7 +12209,7 @@ iseq_build_kw(rb_iseq_t *iseq, VALUE params, VALUE keywords)
             rb_raise(rb_eTypeError, "keyword default has unsupported len %+"PRIsVALUE, key);
         }
         ids[i] = SYM2ID(sym);
-        dvs[j] = default_val;
+        RB_OBJ_WRITE(iseq, &dvs[j], default_val);
     }
 
     keyword->table = ids;
@@ -10765,9 +12219,9 @@ iseq_build_kw(rb_iseq_t *iseq, VALUE params, VALUE keywords)
 }
 
 static void
-iseq_insn_each_object_mark_and_move(VALUE *obj_ptr, VALUE _)
+iseq_insn_each_object_mark_and_move(VALUE * obj, VALUE _)
 {
-    rb_gc_mark_and_move(obj_ptr);
+    rb_gc_mark_and_move(obj);
 }
 
 void
@@ -10803,6 +12257,15 @@ rb_iseq_mark_and_move_insn_storage(struct iseq_compile_data_storage *storage)
     }
 }
 
+static const rb_data_type_t labels_wrapper_type = {
+    .wrap_struct_name = "compiler/labels_wrapper",
+    .function = {
+        .dmark = (RUBY_DATA_FUNC)rb_mark_set,
+        .dfree = (RUBY_DATA_FUNC)st_free_table,
+    },
+    .flags = RUBY_TYPED_FREE_IMMEDIATELY | RUBY_TYPED_WB_PROTECTED,
+};
+
 void
 rb_iseq_build_from_ary(rb_iseq_t *iseq, VALUE misc, VALUE locals, VALUE params,
                          VALUE exception, VALUE body)
@@ -10812,7 +12275,7 @@ rb_iseq_build_from_ary(rb_iseq_t *iseq, VALUE misc, VALUE locals, VALUE params,
     unsigned int arg_size, local_size, stack_max;
     ID *tbl;
     struct st_table *labels_table = st_init_numtable();
-    VALUE labels_wrapper = Data_Wrap_Struct(0, rb_mark_set, st_free_table, labels_table);
+    VALUE labels_wrapper = TypedData_Wrap_Struct(0, &labels_wrapper_type, labels_table);
     VALUE arg_opt_labels = rb_hash_aref(params, SYM(opt));
     VALUE keywords = rb_hash_aref(params, SYM(keyword));
     VALUE sym_arg_rest = ID2SYM(rb_intern_const("#arg_rest"));
@@ -10894,6 +12357,10 @@ rb_iseq_build_from_ary(rb_iseq_t *iseq, VALUE misc, VALUE locals, VALUE params,
         ISEQ_BODY(iseq)->param.flags.ambiguous_param0 = TRUE;
     }
 
+    if (Qtrue == rb_hash_aref(params, SYM(use_block))) {
+        ISEQ_BODY(iseq)->param.flags.use_block = TRUE;
+    }
+
     if (int_param(&i, params, SYM(kwrest))) {
         struct rb_iseq_param_keyword *keyword = (struct rb_iseq_param_keyword *)ISEQ_BODY(iseq)->param.keyword;
         if (keyword == NULL) {
@@ -10969,7 +12436,7 @@ rb_local_defined(ID id, const rb_iseq_t *iseq)
 #define IBF_ISEQ_ENABLE_LOCAL_BUFFER 0
 #endif
 
-typedef unsigned int ibf_offset_t;
+typedef uint32_t ibf_offset_t;
 #define IBF_OFFSET(ptr) ((ibf_offset_t)(VALUE)(ptr))
 
 #define IBF_MAJOR_VERSION ISEQ_MAJOR_VERSION
@@ -10980,17 +12447,27 @@ typedef unsigned int ibf_offset_t;
 #define IBF_MINOR_VERSION ISEQ_MINOR_VERSION
 #endif
 
+static const char IBF_ENDIAN_MARK =
+#ifdef WORDS_BIGENDIAN
+    'b'
+#else
+    'l'
+#endif
+    ;
+
 struct ibf_header {
     char magic[4]; /* YARB */
-    unsigned int major_version;
-    unsigned int minor_version;
-    unsigned int size;
-    unsigned int extra_size;
+    uint32_t major_version;
+    uint32_t minor_version;
+    uint32_t size;
+    uint32_t extra_size;
 
-    unsigned int iseq_list_size;
-    unsigned int global_object_list_size;
+    uint32_t iseq_list_size;
+    uint32_t global_object_list_size;
     ibf_offset_t iseq_list_offset;
     ibf_offset_t global_object_list_offset;
+    uint8_t endian;
+    uint8_t wordsize;           /* assume no 2048-bit CPU */
 };
 
 struct ibf_dump_buffer {
@@ -11025,7 +12502,7 @@ struct ibf_load {
 
 struct pinned_list {
     long size;
-    VALUE * buffer;
+    VALUE buffer[1];
 };
 
 static void
@@ -11040,25 +12517,14 @@ pinned_list_mark(void *ptr)
     }
 }
 
-static void
-pinned_list_free(void *ptr)
-{
-    struct pinned_list *list = (struct pinned_list *)ptr;
-    xfree(list->buffer);
-    xfree(ptr);
-}
-
-static size_t
-pinned_list_memsize(const void *ptr)
-{
-    struct pinned_list *list = (struct pinned_list *)ptr;
-    return sizeof(struct pinned_list) + (list->size * sizeof(VALUE *));
-}
-
 static const rb_data_type_t pinned_list_type = {
     "pinned_list",
-    {pinned_list_mark, pinned_list_free, pinned_list_memsize,},
-    0, 0, RUBY_TYPED_WB_PROTECTED | RUBY_TYPED_FREE_IMMEDIATELY
+    {
+        pinned_list_mark,
+        RUBY_DEFAULT_FREE,
+        NULL, // No external memory to report,
+    },
+    0, 0, RUBY_TYPED_WB_PROTECTED | RUBY_TYPED_FREE_IMMEDIATELY | RUBY_TYPED_EMBEDDABLE
 };
 
 static VALUE
@@ -11092,13 +12558,10 @@ pinned_list_store(VALUE list, long offset, VALUE object)
 static VALUE
 pinned_list_new(long size)
 {
-    struct pinned_list * ptr;
-    VALUE obj_list =
-        TypedData_Make_Struct(0, struct pinned_list, &pinned_list_type, ptr);
-
-    ptr->buffer = xcalloc(size, sizeof(VALUE));
+    size_t memsize = offsetof(struct pinned_list, buffer) + size * sizeof(VALUE);
+    VALUE obj_list = rb_data_typed_object_zalloc(0, memsize, &pinned_list_type);
+    struct pinned_list * ptr = RTYPEDDATA_GET_DATA(obj_list);
     ptr->size = size;
-
     return obj_list;
 }
 
@@ -11137,8 +12600,13 @@ static ibf_offset_t
 ibf_dump_write(struct ibf_dump *dump, const void *buff, unsigned long size)
 {
     ibf_offset_t pos = ibf_dump_pos(dump);
+#if SIZEOF_LONG > SIZEOF_INT
+    /* ensure the resulting dump does not exceed UINT_MAX */
+    if (size >= UINT_MAX || pos + size >= UINT_MAX) {
+        rb_raise(rb_eRuntimeError, "dump size exceeds");
+    }
+#endif
     rb_str_cat(dump->current_buffer->str, (const char *)buff, size);
-    /* TODO: overflow check */
     return pos;
 }
 
@@ -11247,6 +12715,10 @@ ibf_load_id(const struct ibf_load *load, const ID id_index)
         return 0;
     }
     VALUE sym = ibf_load_object(load, id_index);
+    if (rb_integer_type_p(sym)) {
+        /* Load hidden local variables as indexes */
+        return NUM2ULONG(sym);
+    }
     return rb_sym2id(sym);
 }
 
@@ -11446,7 +12918,7 @@ ibf_dump_code(struct ibf_dump *dump, const rb_iseq_t *iseq)
             ibf_dump_write_small_value(dump, wv);
           skip_wv:;
         }
-        assert(insn_len(insn) == op_index+1);
+        RUBY_ASSERT(insn_len(insn) == op_index+1);
     }
 
     return offset;
@@ -11611,8 +13083,8 @@ ibf_load_code(const struct ibf_load *load, rb_iseq_t *iseq, ibf_offset_t bytecod
         }
     }
 
-    assert(code_index == iseq_size);
-    assert(reading_pos == bytecode_offset + bytecode_size);
+    RUBY_ASSERT(code_index == iseq_size);
+    RUBY_ASSERT(reading_pos == bytecode_offset + bytecode_size);
     return code;
 }
 
@@ -11673,19 +13145,17 @@ ibf_load_param_keyword(const struct ibf_load *load, ibf_offset_t param_keyword_o
 {
     if (param_keyword_offset) {
         struct rb_iseq_param_keyword *kw = IBF_R(param_keyword_offset, struct rb_iseq_param_keyword, 1);
-        ID *ids = IBF_R(kw->table, ID, kw->num);
         int dv_num = kw->num - kw->required_num;
-        VALUE *dvs = IBF_R(kw->default_values, VALUE, dv_num);
-        int i;
+        VALUE *dvs = dv_num ? IBF_R(kw->default_values, VALUE, dv_num) : NULL;
 
-        for (i=0; i<kw->num; i++) {
-            ids[i] = ibf_load_id(load, ids[i]);
-        }
+        int i;
         for (i=0; i<dv_num; i++) {
             dvs[i] = ibf_load_object(load, dvs[i]);
         }
 
-        kw->table = ids;
+        // Will be set once the local table is loaded.
+        kw->table = NULL;
+
         kw->default_values = dvs;
         return kw;
     }
@@ -11770,7 +13240,12 @@ ibf_dump_local_table(struct ibf_dump *dump, const rb_iseq_t *iseq)
     int i;
 
     for (i=0; i<size; i++) {
-        table[i] = ibf_dump_id(dump, body->local_table[i]);
+        VALUE v = ibf_dump_id(dump, body->local_table[i]);
+        if (v == 0) {
+            /* Dump hidden local variables as indexes, so load_from_binary will work with them */
+            v = ibf_dump_object(dump, ULONG2NUM(body->local_table[i]));
+        }
+        table[i] = v;
     }
 
     IBF_W_ALIGN(ID);
@@ -11824,12 +13299,13 @@ ibf_dump_catch_table(struct ibf_dump *dump, const rb_iseq_t *iseq)
     }
 }
 
-static struct iseq_catch_table *
-ibf_load_catch_table(const struct ibf_load *load, ibf_offset_t catch_table_offset, unsigned int size)
+static void
+ibf_load_catch_table(const struct ibf_load *load, ibf_offset_t catch_table_offset, unsigned int size, const rb_iseq_t *parent_iseq)
 {
     if (size) {
-        struct iseq_catch_table *table = ruby_xmalloc(iseq_catch_table_bytes(size));
+        struct iseq_catch_table *table = ruby_xcalloc(1, iseq_catch_table_bytes(size));
         table->size = size;
+        ISEQ_BODY(parent_iseq)->catch_table = table;
 
         ibf_offset_t reading_pos = catch_table_offset;
 
@@ -11842,12 +13318,12 @@ ibf_load_catch_table(const struct ibf_load *load, ibf_offset_t catch_table_offse
             table->entries[i].cont = (unsigned int)ibf_load_small_value(load, &reading_pos);
             table->entries[i].sp = (unsigned int)ibf_load_small_value(load, &reading_pos);
 
-            table->entries[i].iseq = ibf_load_iseq(load, (const rb_iseq_t *)(VALUE)iseq_index);
+            rb_iseq_t *catch_iseq = (rb_iseq_t *)ibf_load_iseq(load, (const rb_iseq_t *)(VALUE)iseq_index);
+            RB_OBJ_WRITE(parent_iseq, UNALIGNED_MEMBER_PTR(&table->entries[i], iseq), catch_iseq);
         }
-        return table;
     }
     else {
-        return NULL;
+        ISEQ_BODY(parent_iseq)->catch_table = NULL;
     }
 }
 
@@ -11891,15 +13367,44 @@ ibf_dump_ci_entries(struct ibf_dump *dump, const rb_iseq_t *iseq)
     return offset;
 }
 
+struct outer_variable_pair {
+    ID id;
+    VALUE name;
+    VALUE val;
+};
+
+struct outer_variable_list {
+    size_t num;
+    struct outer_variable_pair pairs[1];
+};
+
 static enum rb_id_table_iterator_result
-dump_outer_variable(ID id, VALUE val, void *dump)
+store_outer_variable(ID id, VALUE val, void *dump)
 {
-    ibf_dump_write_small_value(dump, ibf_dump_id(dump, id));
-    ibf_dump_write_small_value(dump, val);
-
+    struct outer_variable_list *ovlist = dump;
+    struct outer_variable_pair *pair = &ovlist->pairs[ovlist->num++];
+    pair->id = id;
+    pair->name = rb_id2str(id);
+    pair->val = val;
     return ID_TABLE_CONTINUE;
 }
 
+static int
+outer_variable_cmp(const void *a, const void *b, void *arg)
+{
+    const struct outer_variable_pair *ap = (const struct outer_variable_pair *)a;
+    const struct outer_variable_pair *bp = (const struct outer_variable_pair *)b;
+
+    if (!ap->name) {
+        return -1;
+    }
+    else if (!bp->name) {
+        return 1;
+    }
+
+    return rb_str_cmp(ap->name, bp->name);
+}
+
 static ibf_offset_t
 ibf_dump_outer_variables(struct ibf_dump *dump, const rb_iseq_t *iseq)
 {
@@ -11907,12 +13412,24 @@ ibf_dump_outer_variables(struct ibf_dump *dump, const rb_iseq_t *iseq)
 
     ibf_offset_t offset = ibf_dump_pos(dump);
 
-    if (ovs) {
-        ibf_dump_write_small_value(dump, (VALUE)rb_id_table_size(ovs));
-        rb_id_table_foreach(ovs, dump_outer_variable, (void *)dump);
-    }
-    else {
-        ibf_dump_write_small_value(dump, (VALUE)0);
+    size_t size = ovs ? rb_id_table_size(ovs) : 0;
+    ibf_dump_write_small_value(dump, (VALUE)size);
+    if (size > 0) {
+        VALUE buff;
+        size_t buffsize =
+            rb_size_mul_add_or_raise(sizeof(struct outer_variable_pair), size,
+                                     offsetof(struct outer_variable_list, pairs),
+                                     rb_eArgError);
+        struct outer_variable_list *ovlist = RB_ALLOCV(buff, buffsize);
+        ovlist->num = 0;
+        rb_id_table_foreach(ovs, store_outer_variable, ovlist);
+        ruby_qsort(ovlist->pairs, size, sizeof(struct outer_variable_pair), outer_variable_cmp, NULL);
+        for (size_t i = 0; i < size; ++i) {
+            ID id = ovlist->pairs[i].id;
+            ID val = ovlist->pairs[i].val;
+            ibf_dump_write_small_value(dump, ibf_dump_id(dump, id));
+            ibf_dump_write_small_value(dump, val);
+        }
     }
 
     return offset;
@@ -11925,6 +13442,11 @@ ibf_load_ci_entries(const struct ibf_load *load,
                     unsigned int ci_size,
                     struct rb_call_data **cd_ptr)
 {
+    if (!ci_size) {
+        *cd_ptr = NULL;
+        return;
+    }
+
     ibf_offset_t reading_pos = ci_entries_offset;
 
     unsigned int i;
@@ -11943,6 +13465,7 @@ ibf_load_ci_entries(const struct ibf_load *load,
             int kwlen = (int)ibf_load_small_value(load, &reading_pos);
             if (kwlen > 0) {
                 kwarg = rb_xmalloc_mul_add(kwlen, sizeof(VALUE), sizeof(struct rb_callinfo_kwarg));
+                kwarg->references = 0;
                 kwarg->keyword_len = kwlen;
                 for (int j=0; j<kwlen; j++) {
                     VALUE keyword = ibf_load_small_value(load, &reading_pos);
@@ -11988,7 +13511,7 @@ ibf_load_outer_variables(const struct ibf_load * load, ibf_offset_t outer_variab
 static ibf_offset_t
 ibf_dump_iseq_each(struct ibf_dump *dump, const rb_iseq_t *iseq)
 {
-    assert(dump->current_buffer == &dump->global_buffer);
+    RUBY_ASSERT(dump->current_buffer == &dump->global_buffer);
 
     unsigned int *positions;
 
@@ -12047,7 +13570,11 @@ ibf_dump_iseq_each(struct ibf_dump *dump, const rb_iseq_t *iseq)
         (body->param.flags.has_block        << 6) |
         (body->param.flags.ambiguous_param0 << 7) |
         (body->param.flags.accepts_no_kwarg << 8) |
-        (body->param.flags.ruby2_keywords   << 9);
+        (body->param.flags.ruby2_keywords   << 9) |
+        (body->param.flags.anon_rest        << 10) |
+        (body->param.flags.anon_kwrest      << 11) |
+        (body->param.flags.use_block        << 12) |
+        (body->param.flags.forwardable      << 13) ;
 
 #if IBF_ISEQ_ENABLE_LOCAL_BUFFER
 #  define IBF_BODY_OFFSET(x) (x)
@@ -12098,6 +13625,7 @@ ibf_dump_iseq_each(struct ibf_dump *dump, const rb_iseq_t *iseq)
     ibf_dump_write_small_value(dump, body->ci_size);
     ibf_dump_write_small_value(dump, body->stack_max);
     ibf_dump_write_small_value(dump, body->builtin_attrs);
+    ibf_dump_write_small_value(dump, body->prism ? 1 : 0);
 
 #undef IBF_BODY_OFFSET
 
@@ -12210,6 +13738,7 @@ ibf_load_iseq_each(struct ibf_load *load, rb_iseq_t *iseq, ibf_offset_t offset)
     const unsigned int ci_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 unsigned int builtin_attrs = (unsigned int)ibf_load_small_value(load, &reading_pos);
+    const bool prism = (bool)ibf_load_small_value(load, &reading_pos);
 
     // setup fname and dummy frame
     VALUE path = ibf_load_object(load, location_pathobj_index);
@@ -12259,6 +13788,10 @@ ibf_load_iseq_each(struct ibf_load *load, rb_iseq_t *iseq, ibf_offset_t offset)
     load_body->param.flags.ambiguous_param0 = (param_flags >> 7) & 1;
     load_body->param.flags.accepts_no_kwarg = (param_flags >> 8) & 1;
     load_body->param.flags.ruby2_keywords = (param_flags >> 9) & 1;
+    load_body->param.flags.anon_rest = (param_flags >> 10) & 1;
+    load_body->param.flags.anon_kwrest = (param_flags >> 11) & 1;
+    load_body->param.flags.use_block = (param_flags >> 12) & 1;
+    load_body->param.flags.forwardable = (param_flags >> 13) & 1;
     load_body->param.size = param_size;
     load_body->param.lead_num = param_lead_num;
     load_body->param.opt_num = param_opt_num;
@@ -12282,12 +13815,19 @@ ibf_load_iseq_each(struct ibf_load *load, rb_iseq_t *iseq, ibf_offset_t offset)
     load_body->location.code_location.end_pos.lineno = location_code_location_end_pos_lineno;
     load_body->location.code_location.end_pos.column = location_code_location_end_pos_column;
     load_body->builtin_attrs = builtin_attrs;
+    load_body->prism = prism;
 
     load_body->ivc_size             = ivc_size;
     load_body->icvarc_size          = icvarc_size;
     load_body->ise_size             = ise_size;
     load_body->ic_size              = ic_size;
-    load_body->is_entries           = ZALLOC_N(union iseq_inline_storage_entry, ISEQ_IS_SIZE(load_body));
+
+    if (ISEQ_IS_SIZE(load_body)) {
+        load_body->is_entries       = ZALLOC_N(union iseq_inline_storage_entry, ISEQ_IS_SIZE(load_body));
+    }
+    else {
+        load_body->is_entries       = NULL;
+    }
                                       ibf_load_ci_entries(load, ci_entries_offset, ci_size, &load_body->call_data);
     load_body->outer_variables      = ibf_load_outer_variables(load, outer_variables_offset);
     load_body->param.opt_table      = ibf_load_param_opt_table(load, param_opt_table_offset, param_opt_num);
@@ -12296,10 +13836,22 @@ ibf_load_iseq_each(struct ibf_load *load, rb_iseq_t *iseq, ibf_offset_t offset)
     load_body->insns_info.body      = ibf_load_insns_info_body(load, insns_info_body_offset, insns_info_size);
     load_body->insns_info.positions = ibf_load_insns_info_positions(load, insns_info_positions_offset, insns_info_size);
     load_body->local_table          = ibf_load_local_table(load, local_table_offset, local_table_size);
-    load_body->catch_table          = ibf_load_catch_table(load, catch_table_offset, catch_table_size);
-    load_body->parent_iseq          = ibf_load_iseq(load, (const rb_iseq_t *)(VALUE)parent_iseq_index);
-    load_body->local_iseq           = ibf_load_iseq(load, (const rb_iseq_t *)(VALUE)local_iseq_index);
-    load_body->mandatory_only_iseq  = ibf_load_iseq(load, (const rb_iseq_t *)(VALUE)mandatory_only_iseq_index);
+    ibf_load_catch_table(load, catch_table_offset, catch_table_size, iseq);
+
+    const rb_iseq_t *parent_iseq = ibf_load_iseq(load, (const rb_iseq_t *)(VALUE)parent_iseq_index);
+    const rb_iseq_t *local_iseq = ibf_load_iseq(load, (const rb_iseq_t *)(VALUE)local_iseq_index);
+    const rb_iseq_t *mandatory_only_iseq = ibf_load_iseq(load, (const rb_iseq_t *)(VALUE)mandatory_only_iseq_index);
+
+    RB_OBJ_WRITE(iseq, &load_body->parent_iseq, parent_iseq);
+    RB_OBJ_WRITE(iseq, &load_body->local_iseq, local_iseq);
+    RB_OBJ_WRITE(iseq, &load_body->mandatory_only_iseq, mandatory_only_iseq);
+
+    // This must be done after the local table is loaded.
+    if (load_body->param.keyword != NULL) {
+        RUBY_ASSERT(load_body->local_table);
+        struct rb_iseq_param_keyword *keyword = (struct rb_iseq_param_keyword *) load_body->param.keyword;
+        keyword->table = &load_body->local_table[keyword->bits_start - keyword->num];
+    }
 
     ibf_load_code(load, iseq, bytecode_offset, bytecode_size, iseq_size);
 #if VM_INSN_INFO_TABLE_IMPL == 2
@@ -12560,7 +14112,7 @@ ibf_load_object_string(const struct ibf_load *load, const struct ibf_object_head
 
     VALUE str;
     if (header->frozen && !header->internal) {
-        str = rb_enc_interned_str(ptr, len, rb_enc_from_index(encindex));
+        str = rb_enc_literal_str(ptr, len, rb_enc_from_index(encindex));
     }
     else {
         str = rb_enc_str_new(ptr, len, rb_enc_from_index(encindex));
@@ -12625,7 +14177,7 @@ ibf_load_object_array(const struct ibf_load *load, const struct ibf_object_heade
         rb_ary_push(ary, ibf_load_object(load, index));
     }
 
-    if (header->frozen) rb_obj_freeze(ary);
+    if (header->frozen) rb_ary_freeze(ary);
 
     return ary;
 }
@@ -12727,8 +14279,12 @@ ibf_load_object_bignum(const struct ibf_load *load, const struct ibf_object_head
     const struct ibf_object_bignum *bignum = IBF_OBJBODY(struct ibf_object_bignum, offset);
     int sign = bignum->slen > 0;
     ssize_t len = sign > 0 ? bignum->slen : -1 * bignum->slen;
-    VALUE obj = rb_integer_unpack(bignum->digits, len * 2, 2, 0,
-                                  INTEGER_PACK_LITTLE_ENDIAN | (sign == 0 ? INTEGER_PACK_NEGATIVE : 0));
+    const int big_unpack_flags = /* c.f. rb_big_unpack() */
+        INTEGER_PACK_LSWORD_FIRST |
+        INTEGER_PACK_NATIVE_BYTE_ORDER;
+    VALUE obj = rb_integer_unpack(bignum->digits, len, sizeof(BDIGIT), 0,
+                                  big_unpack_flags |
+                                  (sign == 0 ? INTEGER_PACK_NEGATIVE : 0));
     if (header->internal) rb_obj_hide(obj);
     if (header->frozen)   rb_obj_freeze(obj);
     return obj;
@@ -12904,7 +14460,7 @@ ibf_dump_object_object(struct ibf_dump *dump, VALUE obj)
     else {
         obj_header.internal = SPECIAL_CONST_P(obj) ? FALSE : (RBASIC_CLASS(obj) == 0) ? TRUE : FALSE;
         obj_header.special_const = FALSE;
-        obj_header.frozen = FL_TEST(obj, FL_FREEZE) ? TRUE : FALSE;
+        obj_header.frozen = OBJ_FROZEN(obj) ? TRUE : FALSE;
         ibf_dump_object_object_header(dump, obj_header);
         (*dump_object_functions[obj_header.type])(dump, obj);
     }
@@ -13056,14 +14612,13 @@ ibf_dump_free(void *ptr)
         st_free_table(dump->iseq_table);
         dump->iseq_table = 0;
     }
-    ruby_xfree(dump);
 }
 
 static size_t
 ibf_dump_memsize(const void *ptr)
 {
     struct ibf_dump *dump = (struct ibf_dump *)ptr;
-    size_t size = sizeof(*dump);
+    size_t size = 0;
     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;
@@ -13072,7 +14627,7 @@ ibf_dump_memsize(const void *ptr)
 static const rb_data_type_t ibf_dump_type = {
     "ibf_dump",
     {ibf_dump_mark, ibf_dump_free, ibf_dump_memsize,},
-    0, 0, RUBY_TYPED_FREE_IMMEDIATELY
+    0, 0, RUBY_TYPED_FREE_IMMEDIATELY | RUBY_TYPED_EMBEDDABLE
 };
 
 static void
@@ -13108,7 +14663,6 @@ rb_iseq_ibf_dump(const rb_iseq_t *iseq, VALUE opt)
     ibf_dump_setup(dump, dump_obj);
 
     ibf_dump_write(dump, &header, sizeof(header));
-    ibf_dump_write(dump, RUBY_PLATFORM, strlen(RUBY_PLATFORM) + 1);
     ibf_dump_iseq(dump, iseq);
 
     header.magic[0] = 'Y'; /* YARB */
@@ -13117,6 +14671,8 @@ rb_iseq_ibf_dump(const rb_iseq_t *iseq, VALUE opt)
     header.magic[3] = 'B';
     header.major_version = IBF_MAJOR_VERSION;
     header.minor_version = IBF_MINOR_VERSION;
+    header.endian = IBF_ENDIAN_MARK;
+    header.wordsize = (uint8_t)SIZEOF_VALUE;
     ibf_dump_iseq_list(dump, &header);
     ibf_dump_object_list(dump, &header.global_object_list_offset, &header.global_object_list_size);
     header.size = ibf_dump_pos(dump);
@@ -13134,8 +14690,6 @@ rb_iseq_ibf_dump(const rb_iseq_t *iseq, VALUE opt)
     ibf_dump_overwrite(dump, &header, sizeof(header), 0);
 
     str = dump->global_buffer.str;
-    ibf_dump_free(dump);
-    DATA_PTR(dump_obj) = NULL;
     RB_GC_GUARD(dump_obj);
     return str;
 }
@@ -13228,35 +14782,39 @@ ibf_load_iseq(const struct ibf_load *load, const rb_iseq_t *index_iseq)
 static void
 ibf_load_setup_bytes(struct ibf_load *load, VALUE loader_obj, const char *bytes, size_t size)
 {
+    struct ibf_header *header = (struct ibf_header *)bytes;
     load->loader_obj = loader_obj;
     load->global_buffer.buff = bytes;
-    load->header = (struct ibf_header *)load->global_buffer.buff;
-    load->global_buffer.size = load->header->size;
-    load->global_buffer.obj_list_offset = load->header->global_object_list_offset;
-    load->global_buffer.obj_list_size = load->header->global_object_list_size;
-    RB_OBJ_WRITE(loader_obj, &load->iseq_list, pinned_list_new(load->header->iseq_list_size));
+    load->header = header;
+    load->global_buffer.size = header->size;
+    load->global_buffer.obj_list_offset = header->global_object_list_offset;
+    load->global_buffer.obj_list_size = header->global_object_list_size;
+    RB_OBJ_WRITE(loader_obj, &load->iseq_list, pinned_list_new(header->iseq_list_size));
     RB_OBJ_WRITE(loader_obj, &load->global_buffer.obj_list, pinned_list_new(load->global_buffer.obj_list_size));
     load->iseq = NULL;
 
     load->current_buffer = &load->global_buffer;
 
-    if (size < load->header->size) {
+    if (size < header->size) {
         rb_raise(rb_eRuntimeError, "broken binary format");
     }
-    if (strncmp(load->header->magic, "YARB", 4) != 0) {
+    if (strncmp(header->magic, "YARB", 4) != 0) {
         rb_raise(rb_eRuntimeError, "unknown binary format");
     }
-    if (load->header->major_version != IBF_MAJOR_VERSION ||
-        load->header->minor_version != IBF_MINOR_VERSION) {
+    if (header->major_version != IBF_MAJOR_VERSION ||
+        header->minor_version != IBF_MINOR_VERSION) {
         rb_raise(rb_eRuntimeError, "unmatched version file (%u.%u for %u.%u)",
-                 load->header->major_version, load->header->minor_version, IBF_MAJOR_VERSION, IBF_MINOR_VERSION);
+                 header->major_version, header->minor_version, IBF_MAJOR_VERSION, IBF_MINOR_VERSION);
     }
-    if (strcmp(load->global_buffer.buff + sizeof(struct ibf_header), RUBY_PLATFORM) != 0) {
-        rb_raise(rb_eRuntimeError, "unmatched platform");
+    if (header->endian != IBF_ENDIAN_MARK) {
+        rb_raise(rb_eRuntimeError, "unmatched endian: %c", header->endian);
     }
-    if (load->header->iseq_list_offset % RUBY_ALIGNOF(ibf_offset_t)) {
+    if (header->wordsize != SIZEOF_VALUE) {
+        rb_raise(rb_eRuntimeError, "unmatched word size: %d", header->wordsize);
+    }
+    if (header->iseq_list_offset % RUBY_ALIGNOF(ibf_offset_t)) {
         rb_raise(rb_eArgError, "unaligned iseq list offset: %u",
-                 load->header->iseq_list_offset);
+                 header->iseq_list_offset);
     }
     if (load->global_buffer.obj_list_offset % RUBY_ALIGNOF(ibf_offset_t)) {
         rb_raise(rb_eArgError, "unaligned object list offset: %u",
@@ -13267,6 +14825,8 @@ ibf_load_setup_bytes(struct ibf_load *load, VALUE loader_obj, const char *bytes,
 static void
 ibf_load_setup(struct ibf_load *load, VALUE loader_obj, VALUE str)
 {
+    StringValue(str);
+
     if (RSTRING_LENINT(str) < (int)sizeof(struct ibf_header)) {
         rb_raise(rb_eRuntimeError, "broken binary format");
     }
@@ -13275,7 +14835,7 @@ ibf_load_setup(struct ibf_load *load, VALUE loader_obj, VALUE str)
         str = rb_str_new(RSTRING_PTR(str), RSTRING_LEN(str));
     }
 
-    ibf_load_setup_bytes(load, loader_obj, StringValuePtr(str), RSTRING_LEN(str));
+    ibf_load_setup_bytes(load, loader_obj, RSTRING_PTR(str), RSTRING_LEN(str));
     RB_OBJ_WRITE(loader_obj, &load->str, str);
 }
 
@@ -13348,4 +14908,4 @@ rb_iseq_ibf_load_extra_data(VALUE str)
     return extra_str;
 }
 
-#include "yarp/yarp_compiler.c"
+#include "prism_compile.c"
diff --git a/complex.c b/complex.c
index c9272778bbee65..d6daee307cc170 100644
--- a/complex.c
+++ b/complex.c
@@ -24,6 +24,7 @@
 #include "internal/numeric.h"
 #include "internal/object.h"
 #include "internal/rational.h"
+#include "internal/string.h"
 #include "ruby_assert.h"
 
 #define ZERO INT2FIX(0)
@@ -396,7 +397,7 @@ nucomp_s_new_internal(VALUE klass, VALUE real, VALUE imag)
 
     RCOMPLEX_SET_REAL(obj, real);
     RCOMPLEX_SET_IMAG(obj, imag);
-    OBJ_FREEZE_RAW((VALUE)obj);
+    OBJ_FREEZE((VALUE)obj);
 
     return (VALUE)obj;
 }
@@ -410,15 +411,15 @@ nucomp_s_alloc(VALUE klass)
 inline static VALUE
 f_complex_new_bang1(VALUE klass, VALUE x)
 {
-    assert(!RB_TYPE_P(x, T_COMPLEX));
+    RUBY_ASSERT(!RB_TYPE_P(x, T_COMPLEX));
     return nucomp_s_new_internal(klass, x, ZERO);
 }
 
 inline static VALUE
 f_complex_new_bang2(VALUE klass, VALUE x, VALUE y)
 {
-    assert(!RB_TYPE_P(x, T_COMPLEX));
-    assert(!RB_TYPE_P(y, T_COMPLEX));
+    RUBY_ASSERT(!RB_TYPE_P(x, T_COMPLEX));
+    RUBY_ASSERT(!RB_TYPE_P(y, T_COMPLEX));
     return nucomp_s_new_internal(klass, x, y);
 }
 
@@ -431,7 +432,7 @@ nucomp_real_check(VALUE num)
         !RB_TYPE_P(num, T_RATIONAL)) {
         if (RB_TYPE_P(num, T_COMPLEX) && nucomp_real_p(num)) {
             VALUE real = RCOMPLEX(num)->real;
-            assert(!RB_TYPE_P(real, T_COMPLEX));
+            RUBY_ASSERT(!RB_TYPE_P(real, T_COMPLEX));
             return real;
         }
         if (!k_numeric_p(num) || !f_real_p(num))
@@ -474,12 +475,19 @@ nucomp_s_canonicalize_internal(VALUE klass, VALUE real, VALUE imag)
 
 /*
  * call-seq:
- *    Complex.rect(real[, imag])         ->  complex
- *    Complex.rectangular(real[, imag])  ->  complex
+ *   Complex.rect(real, imag = 0) -> complex
  *
- * Returns a complex object which denotes the given rectangular form.
+ * Returns a new \Complex object formed from the arguments,
+ * each of which must be an instance of Numeric,
+ * or an instance of one of its subclasses:
+ * \Complex, Float, Integer, Rational;
+ * see {Rectangular Coordinates}[rdoc-ref:Complex@Rectangular+Coordinates]:
  *
- *    Complex.rectangular(1, 2)  #=> (1+2i)
+ *   Complex.rect(3)             # => (3+0i)
+ *   Complex.rect(3, Math::PI)   # => (3+3.141592653589793i)
+ *   Complex.rect(-3, -Math::PI) # => (-3-3.141592653589793i)
+ *
+ * \Complex.rectangular is an alias for \Complex.rect.
  */
 static VALUE
 nucomp_s_new(int argc, VALUE *argv, VALUE klass)
@@ -516,39 +524,54 @@ static VALUE nucomp_s_convert(int argc, VALUE *argv, VALUE klass);
 
 /*
  * call-seq:
- *    Complex(x[, y], exception: true)  ->  numeric or nil
- *
- * Returns x+i*y;
- *
- *    Complex(1, 2)    #=> (1+2i)
- *    Complex('1+2i')  #=> (1+2i)
- *    Complex(nil)     #=> TypeError
- *    Complex(1, nil)  #=> TypeError
- *
- *    Complex(1, nil, exception: false)  #=> nil
- *    Complex('1+2', exception: false)   #=> nil
- *
- * Syntax of string form:
- *
- *   string form = extra spaces , complex , extra spaces ;
- *   complex = real part | [ sign ] , imaginary part
- *           | real part , sign , imaginary part
- *           | rational , "@" , rational ;
- *   real part = rational ;
- *   imaginary part = imaginary unit | unsigned rational , imaginary unit ;
- *   rational = [ sign ] , unsigned rational ;
- *   unsigned rational = numerator | numerator , "/" , denominator ;
- *   numerator = integer part | fractional part | integer part , fractional part ;
- *   denominator = digits ;
- *   integer part = digits ;
- *   fractional part = "." , digits , [ ( "e" | "E" ) , [ sign ] , digits ] ;
- *   imaginary unit = "i" | "I" | "j" | "J" ;
- *   sign = "-" | "+" ;
- *   digits = digit , { digit | "_" , digit };
- *   digit = "0" | "1" | "2" | "3" | "4" | "5" | "6" | "7" | "8" | "9" ;
- *   extra spaces = ? \s* ? ;
- *
- * See String#to_c.
+ *   Complex(real, imag = 0, exception: true) -> complex or nil
+ *   Complex(s, exception: true) -> complex or nil
+ *
+ * Returns a new \Complex object if the arguments are valid;
+ * otherwise raises an exception if +exception+ is +true+;
+ * otherwise returns +nil+.
+ *
+ * With Numeric arguments +real+ and +imag+,
+ * returns <tt>Complex.rect(real, imag)</tt> if the arguments are valid.
+ *
+ * With string argument +s+, returns a new \Complex object if the argument is valid;
+ * the string may have:
+ *
+ * - One or two numeric substrings,
+ *   each of which specifies a Complex, Float, Integer, Numeric, or Rational value,
+ *   specifying {rectangular coordinates}[rdoc-ref:Complex@Rectangular+Coordinates]:
+ *
+ *   - Sign-separated real and imaginary numeric substrings
+ *     (with trailing character <tt>'i'</tt>):
+ *
+ *       Complex('1+2i')  # => (1+2i)
+ *       Complex('+1+2i') # => (1+2i)
+ *       Complex('+1-2i') # => (1-2i)
+ *       Complex('-1+2i') # => (-1+2i)
+ *       Complex('-1-2i') # => (-1-2i)
+ *
+ *   - Real-only numeric string (without trailing character <tt>'i'</tt>):
+ *
+ *       Complex('1')  # => (1+0i)
+ *       Complex('+1') # => (1+0i)
+ *       Complex('-1') # => (-1+0i)
+ *
+ *   - Imaginary-only numeric string (with trailing character <tt>'i'</tt>):
+ *
+ *       Complex('1i')  # => (0+1i)
+ *       Complex('+1i') # => (0+1i)
+ *       Complex('-1i') # => (0-1i)
+ *
+ * - At-sign separated real and imaginary rational substrings,
+ *   each of which specifies a Rational value,
+ *   specifying {polar coordinates}[rdoc-ref:Complex@Polar+Coordinates]:
+ *
+ *     Complex('1/2@3/4')   # => (0.36584443443691045+0.34081938001166706i)
+ *     Complex('+1/2@+3/4') # => (0.36584443443691045+0.34081938001166706i)
+ *     Complex('+1/2@-3/4') # => (0.36584443443691045-0.34081938001166706i)
+ *     Complex('-1/2@+3/4') # => (-0.36584443443691045-0.34081938001166706i)
+ *     Complex('-1/2@-3/4') # => (-0.36584443443691045+0.34081938001166706i)
+ *
  */
 static VALUE
 nucomp_f_complex(int argc, VALUE *argv, VALUE klass)
@@ -698,14 +721,19 @@ rb_dbl_complex_new_polar_pi(double abs, double ang)
 
 /*
  * call-seq:
- *    Complex.polar(abs[, arg])  ->  complex
+ *   Complex.polar(abs, arg = 0) -> complex
+ *
+ * Returns a new \Complex object formed from the arguments,
+ * each of which must be an instance of Numeric,
+ * or an instance of one of its subclasses:
+ * \Complex, Float, Integer, Rational.
+ * Argument +arg+ is given in radians;
+ * see {Polar Coordinates}[rdoc-ref:Complex@Polar+Coordinates]:
  *
- * Returns a complex object which denotes the given polar form.
+ *   Complex.polar(3)        # => (3+0i)
+ *   Complex.polar(3, 2.0)   # => (-1.2484405096414273+2.727892280477045i)
+ *   Complex.polar(-3, -2.0) # => (1.2484405096414273+2.727892280477045i)
  *
- *    Complex.polar(3, 0)            #=> (3.0+0.0i)
- *    Complex.polar(3, Math::PI/2)   #=> (1.836909530733566e-16+3.0i)
- *    Complex.polar(3, Math::PI)     #=> (-3.0+3.673819061467132e-16i)
- *    Complex.polar(3, -Math::PI/2)  #=> (1.836909530733566e-16-3.0i)
  */
 static VALUE
 nucomp_s_polar(int argc, VALUE *argv, VALUE klass)
@@ -725,12 +753,19 @@ nucomp_s_polar(int argc, VALUE *argv, VALUE klass)
 
 /*
  * call-seq:
- *    cmp.real  ->  real
+ *   real -> numeric
  *
- * Returns the real part.
+ * Returns the real value for +self+:
+ *
+ *   Complex.rect(7).real     # => 7
+ *   Complex.rect(9, -4).real # => 9
+ *
+ * If +self+ was created with
+ * {polar coordinates}[rdoc-ref:Complex@Polar+Coordinates], the returned value
+ * is computed, and may be inexact:
+ *
+ *   Complex.polar(1, Math::PI/4).real # => 0.7071067811865476 # Square root of 2.
  *
- *    Complex(7).real      #=> 7
- *    Complex(9, -4).real  #=> 9
  */
 VALUE
 rb_complex_real(VALUE self)
@@ -741,13 +776,19 @@ rb_complex_real(VALUE self)
 
 /*
  * call-seq:
- *    cmp.imag       ->  real
- *    cmp.imaginary  ->  real
+ *   imag -> numeric
+ *
+ * Returns the imaginary value for +self+:
+ *
+ *   Complex.rect(7).imag     # => 0
+ *   Complex.rect(9, -4).imag # => -4
  *
- * Returns the imaginary part.
+ * If +self+ was created with
+ * {polar coordinates}[rdoc-ref:Complex@Polar+Coordinates], the returned value
+ * is computed, and may be inexact:
+ *
+ *   Complex.polar(1, Math::PI/4).imag # => 0.7071067811865476 # Square root of 2.
  *
- *    Complex(7).imaginary      #=> 0
- *    Complex(9, -4).imaginary  #=> -4
  */
 VALUE
 rb_complex_imag(VALUE self)
@@ -758,11 +799,13 @@ rb_complex_imag(VALUE self)
 
 /*
  * call-seq:
- *    -cmp  ->  complex
+ *   -complex -> new_complex
+ *
+ * Returns the negation of +self+, which is the negation of each of its parts:
  *
- * Returns negation of the value.
+ *   -Complex.rect(1, 2)   # => (-1-2i)
+ *   -Complex.rect(-1, -2) # => (1+2i)
  *
- *    -Complex(1, 2)  #=> (-1-2i)
  */
 VALUE
 rb_complex_uminus(VALUE self)
@@ -774,15 +817,16 @@ rb_complex_uminus(VALUE self)
 
 /*
  * call-seq:
- *    cmp + numeric  ->  complex
+ *   complex + numeric -> new_complex
+ *
+ * Returns the sum of +self+ and +numeric+:
  *
- * Performs addition.
+ *   Complex.rect(2, 3)  + Complex.rect(2, 3)  # => (4+6i)
+ *   Complex.rect(900)   + Complex.rect(1)     # => (901+0i)
+ *   Complex.rect(-2, 9) + Complex.rect(-9, 2) # => (-11+11i)
+ *   Complex.rect(9, 8)  + 4                   # => (13+8i)
+ *   Complex.rect(20, 9) + 9.8                 # => (29.8+9i)
  *
- *    Complex(2, 3)  + Complex(2, 3)   #=> (4+6i)
- *    Complex(900)   + Complex(1)      #=> (901+0i)
- *    Complex(-2, 9) + Complex(-9, 2)  #=> (-11+11i)
- *    Complex(9, 8)  + 4               #=> (13+8i)
- *    Complex(20, 9) + 9.8             #=> (29.8+9i)
  */
 VALUE
 rb_complex_plus(VALUE self, VALUE other)
@@ -808,15 +852,16 @@ rb_complex_plus(VALUE self, VALUE other)
 
 /*
  * call-seq:
- *    cmp - numeric  ->  complex
+ *   complex - numeric -> new_complex
  *
- * Performs subtraction.
+ * Returns the difference of +self+ and +numeric+:
+ *
+ *   Complex.rect(2, 3)  - Complex.rect(2, 3)  # => (0+0i)
+ *   Complex.rect(900)   - Complex.rect(1)     # => (899+0i)
+ *   Complex.rect(-2, 9) - Complex.rect(-9, 2) # => (7+7i)
+ *   Complex.rect(9, 8)  - 4                   # => (5+8i)
+ *   Complex.rect(20, 9) - 9.8                 # => (10.2+9i)
  *
- *    Complex(2, 3)  - Complex(2, 3)   #=> (0+0i)
- *    Complex(900)   - Complex(1)      #=> (899+0i)
- *    Complex(-2, 9) - Complex(-9, 2)  #=> (7+7i)
- *    Complex(9, 8)  - 4               #=> (5+8i)
- *    Complex(20, 9) - 9.8             #=> (10.2+9i)
  */
 VALUE
 rb_complex_minus(VALUE self, VALUE other)
@@ -868,15 +913,16 @@ comp_mul(VALUE areal, VALUE aimag, VALUE breal, VALUE bimag, VALUE *real, VALUE
 
 /*
  * call-seq:
- *    cmp * numeric  ->  complex
+ *   complex * numeric -> new_complex
+ *
+ * Returns the product of +self+ and +numeric+:
  *
- * Performs multiplication.
+ *   Complex.rect(2, 3)  * Complex.rect(2, 3)  # => (-5+12i)
+ *   Complex.rect(900)   * Complex.rect(1)     # => (900+0i)
+ *   Complex.rect(-2, 9) * Complex.rect(-9, 2) # => (0-85i)
+ *   Complex.rect(9, 8)  * 4                   # => (36+32i)
+ *   Complex.rect(20, 9) * 9.8                 # => (196.0+88.2i)
  *
- *    Complex(2, 3)  * Complex(2, 3)   #=> (-5+12i)
- *    Complex(900)   * Complex(1)      #=> (900+0i)
- *    Complex(-2, 9) * Complex(-9, 2)  #=> (0-85i)
- *    Complex(9, 8)  * 4               #=> (36+32i)
- *    Complex(20, 9) * 9.8             #=> (196.0+88.2i)
  */
 VALUE
 rb_complex_mul(VALUE self, VALUE other)
@@ -943,16 +989,16 @@ f_divide(VALUE self, VALUE other,
 
 /*
  * call-seq:
- *    cmp / numeric     ->  complex
- *    cmp.quo(numeric)  ->  complex
+ *   complex / numeric -> new_complex
+ *
+ * Returns the quotient of +self+ and +numeric+:
  *
- * Performs division.
+ *   Complex.rect(2, 3)  / Complex.rect(2, 3)  # => (1+0i)
+ *   Complex.rect(900)   / Complex.rect(1)     # => (900+0i)
+ *   Complex.rect(-2, 9) / Complex.rect(-9, 2) # => ((36/85)-(77/85)*i)
+ *   Complex.rect(9, 8)  / 4                   # => ((9/4)+2i)
+ *   Complex.rect(20, 9) / 9.8                 # => (2.0408163265306123+0.9183673469387754i)
  *
- *    Complex(2, 3)  / Complex(2, 3)   #=> ((1/1)+(0/1)*i)
- *    Complex(900)   / Complex(1)      #=> ((900/1)+(0/1)*i)
- *    Complex(-2, 9) / Complex(-9, 2)  #=> ((36/85)-(77/85)*i)
- *    Complex(9, 8)  / 4               #=> ((9/4)+(2/1)*i)
- *    Complex(20, 9) / 9.8             #=> (2.0408163265306123+0.9183673469387754i)
  */
 VALUE
 rb_complex_div(VALUE self, VALUE other)
@@ -964,11 +1010,12 @@ rb_complex_div(VALUE self, VALUE other)
 
 /*
  * call-seq:
- *    cmp.fdiv(numeric)  ->  complex
+ *   fdiv(numeric) -> new_complex
  *
- * Performs division as each part is a float, never returns a float.
+ * Returns <tt>Complex.rect(self.real/numeric, self.imag/numeric)</tt>:
+ *
+ *   Complex.rect(11, 22).fdiv(3) # => (3.6666666666666665+7.333333333333333i)
  *
- *    Complex(11, 22).fdiv(3)  #=> (3.6666666666666665+7.333333333333333i)
  */
 static VALUE
 nucomp_fdiv(VALUE self, VALUE other)
@@ -982,14 +1029,96 @@ f_reciprocal(VALUE x)
     return f_quo(ONE, x);
 }
 
+static VALUE
+zero_for(VALUE x)
+{
+    if (RB_FLOAT_TYPE_P(x))
+        return DBL2NUM(0);
+    if (RB_TYPE_P(x, T_RATIONAL))
+        return rb_rational_new(INT2FIX(0), INT2FIX(1));
+
+    return INT2FIX(0);
+}
+
+static VALUE
+complex_pow_for_special_angle(VALUE self, VALUE other)
+{
+    if (!rb_integer_type_p(other)) {
+        return Qundef;
+    }
+
+    get_dat1(self);
+    VALUE x = Qundef;
+    int dir;
+    if (f_zero_p(dat->imag)) {
+        x = dat->real;
+        dir = 0;
+    }
+    else if (f_zero_p(dat->real)) {
+        x = dat->imag;
+        dir = 2;
+    }
+    else if (f_eqeq_p(dat->real, dat->imag)) {
+        x = dat->real;
+        dir = 1;
+    }
+    else if (f_eqeq_p(dat->real, f_negate(dat->imag))) {
+        x = dat->imag;
+        dir = 3;
+    }
+    else {
+        dir = 0;
+    }
+
+    if (UNDEF_P(x)) return x;
+
+    if (f_negative_p(x)) {
+        x = f_negate(x);
+        dir += 4;
+    }
+
+    VALUE zx;
+    if (dir % 2 == 0) {
+        zx = rb_num_pow(x, other);
+    }
+    else {
+        zx = rb_num_pow(
+            rb_funcall(rb_int_mul(TWO, x), '*', 1, x),
+            rb_int_div(other, TWO)
+        );
+        if (rb_int_odd_p(other)) {
+            zx = rb_funcall(zx, '*', 1, x);
+        }
+    }
+    static const int dirs[][2] = {
+        {1, 0}, {1, 1}, {0, 1}, {-1, 1}, {-1, 0}, {-1, -1}, {0, -1}, {1, -1}
+    };
+    int z_dir = FIX2INT(rb_int_modulo(rb_int_mul(INT2FIX(dir), other), INT2FIX(8)));
+
+    VALUE zr = Qfalse, zi = Qfalse;
+    switch (dirs[z_dir][0]) {
+      case 0: zr = zero_for(zx); break;
+      case 1: zr = zx; break;
+      case -1: zr = f_negate(zx); break;
+    }
+    switch (dirs[z_dir][1]) {
+      case 0: zi = zero_for(zx); break;
+      case 1: zi = zx; break;
+      case -1: zi = f_negate(zx); break;
+    }
+    return nucomp_s_new_internal(CLASS_OF(self), zr, zi);
+}
+
+
 /*
  * call-seq:
- *    cmp ** numeric  ->  complex
+ *   complex ** numeric -> new_complex
  *
- * Performs exponentiation.
+ * Returns +self+ raised to power +numeric+:
+ *
+ *   Complex.rect(0, 1) ** 2            # => (-1+0i)
+ *   Complex.rect(-8) ** Rational(1, 3) # => (1.0000000000000002+1.7320508075688772i)
  *
- *    Complex('i') ** 2              #=> (-1+0i)
- *    Complex(-8) ** Rational(1, 3)  #=> (1.0000000000000002+1.7320508075688772i)
  */
 VALUE
 rb_complex_pow(VALUE self, VALUE other)
@@ -1007,6 +1136,14 @@ rb_complex_pow(VALUE self, VALUE other)
             other = dat->real; /* c14n */
     }
 
+    if (other == ONE) {
+        get_dat1(self);
+        return nucomp_s_new_internal(CLASS_OF(self), dat->real, dat->imag);
+    }
+
+    VALUE result = complex_pow_for_special_angle(self, other);
+    if (!UNDEF_P(result)) return result;
+
     if (RB_TYPE_P(other, T_COMPLEX)) {
         VALUE r, theta, nr, ntheta;
 
@@ -1079,15 +1216,13 @@ rb_complex_pow(VALUE self, VALUE other)
 
 /*
  * call-seq:
- *    cmp == object  ->  true or false
+ *   complex == object -> true or false
  *
- * Returns true if cmp equals object numerically.
+ * Returns +true+ if <tt>self.real == object.real</tt>
+ * and <tt>self.imag == object.imag</tt>:
+ *
+ *   Complex.rect(2, 3)  == Complex.rect(2.0, 3.0) # => true
  *
- *    Complex(2, 3)  == Complex(2, 3)   #=> true
- *    Complex(5)     == 5               #=> true
- *    Complex(0)     == 0.0             #=> true
- *    Complex('1/3') == 0.33            #=> false
- *    Complex('1/2') == '1/2'           #=> false
  */
 static VALUE
 nucomp_eqeq_p(VALUE self, VALUE other)
@@ -1115,17 +1250,26 @@ nucomp_real_p(VALUE self)
 
 /*
  * call-seq:
- *    cmp <=> object  ->  0, 1, -1, or nil
+ *   complex <=> object -> -1, 0, 1, or nil
+ *
+ * Returns:
+ *
+ * - <tt>self.real <=> object.real</tt> if both of the following are true:
+ *
+ *   - <tt>self.imag == 0</tt>.
+ *   - <tt>object.imag == 0</tt>. # Always true if object is numeric but not complex.
+ *
+ * - +nil+ otherwise.
  *
- * If +cmp+'s imaginary part is zero, and +object+ is also a
- * real number (or a Complex number where the imaginary part is zero),
- * compare the real part of +cmp+ to object.  Otherwise, return nil.
+ * Examples:
+ *
+ *   Complex.rect(2) <=> 3                  # => -1
+ *   Complex.rect(2) <=> 2                  # => 0
+ *   Complex.rect(2) <=> 1                  # => 1
+ *   Complex.rect(2, 1) <=> 1               # => nil # self.imag not zero.
+ *   Complex.rect(1) <=> Complex.rect(1, 1) # => nil # object.imag not zero.
+ *   Complex.rect(1) <=> 'Foo'              # => nil # object.imag not defined.
  *
- *    Complex(2, 3)  <=> Complex(2, 3)   #=> nil
- *    Complex(2, 3)  <=> 1               #=> nil
- *    Complex(2)     <=> 1               #=> 1
- *    Complex(2)     <=> 2               #=> 0
- *    Complex(2)     <=> 3               #=> -1
  */
 static VALUE
 nucomp_cmp(VALUE self, VALUE other)
@@ -1170,13 +1314,19 @@ nucomp_coerce(VALUE self, VALUE other)
 
 /*
  * call-seq:
- *    cmp.abs        ->  real
- *    cmp.magnitude  ->  real
+ *   abs -> float
+ *
+ * Returns the absolute value (magnitude) for +self+;
+ * see {polar coordinates}[rdoc-ref:Complex@Polar+Coordinates]:
+ *
+ *   Complex.polar(-1, 0).abs # => 1.0
  *
- * Returns the absolute part of its polar form.
+ * If +self+ was created with
+ * {rectangular coordinates}[rdoc-ref:Complex@Rectangular+Coordinates], the returned value
+ * is computed, and may be inexact:
+ *
+ *   Complex.rectangular(1, 1).abs # => 1.4142135623730951 # The square root of 2.
  *
- *    Complex(-1).abs         #=> 1
- *    Complex(3.0, -4.0).abs  #=> 5.0
  */
 VALUE
 rb_complex_abs(VALUE self)
@@ -1200,12 +1350,19 @@ rb_complex_abs(VALUE self)
 
 /*
  * call-seq:
- *    cmp.abs2  ->  real
+ *   abs2 -> float
+ *
+ * Returns square of the absolute value (magnitude) for +self+;
+ * see {polar coordinates}[rdoc-ref:Complex@Polar+Coordinates]:
  *
- * Returns square of the absolute value.
+ *   Complex.polar(2, 2).abs2 # => 4.0
+ *
+ * If +self+ was created with
+ * {rectangular coordinates}[rdoc-ref:Complex@Rectangular+Coordinates], the returned value
+ * is computed, and may be inexact:
+ *
+ *   Complex.rectangular(1.0/3, 1.0/3).abs2 # => 0.2222222222222222
  *
- *    Complex(-1).abs2         #=> 1
- *    Complex(3.0, -4.0).abs2  #=> 25.0
  */
 static VALUE
 nucomp_abs2(VALUE self)
@@ -1217,13 +1374,19 @@ nucomp_abs2(VALUE self)
 
 /*
  * call-seq:
- *    cmp.arg    ->  float
- *    cmp.angle  ->  float
- *    cmp.phase  ->  float
+ *   arg -> float
+ *
+ * Returns the argument (angle) for +self+ in radians;
+ * see {polar coordinates}[rdoc-ref:Complex@Polar+Coordinates]:
+ *
+ *   Complex.polar(3, Math::PI/2).arg  # => 1.57079632679489660
+ *
+ * If +self+ was created with
+ * {rectangular coordinates}[rdoc-ref:Complex@Rectangular+Coordinates], the returned value
+ * is computed, and may be inexact:
  *
- * Returns the angle part of its polar form.
+ *   Complex.polar(1, 1.0/3).arg # => 0.33333333333333326
  *
- *    Complex.polar(3, Math::PI/2).arg  #=> 1.5707963267948966
  */
 VALUE
 rb_complex_arg(VALUE self)
@@ -1234,12 +1397,22 @@ rb_complex_arg(VALUE self)
 
 /*
  * call-seq:
- *    cmp.rect         ->  array
- *    cmp.rectangular  ->  array
+ *   rect -> array
  *
- * Returns an array; [cmp.real, cmp.imag].
+ * Returns the array <tt>[self.real, self.imag]</tt>:
  *
- *    Complex(1, 2).rectangular  #=> [1, 2]
+ *   Complex.rect(1, 2).rect # => [1, 2]
+ *
+ * See {Rectangular Coordinates}[rdoc-ref:Complex@Rectangular+Coordinates].
+ *
+ * If +self+ was created with
+ * {polar coordinates}[rdoc-ref:Complex@Polar+Coordinates], the returned value
+ * is computed, and may be inexact:
+ *
+ *   Complex.polar(1.0, 1.0).rect # => [0.5403023058681398, 0.8414709848078965]
+ *
+ *
+ * Complex#rectangular is an alias for Complex#rect.
  */
 static VALUE
 nucomp_rect(VALUE self)
@@ -1250,11 +1423,20 @@ nucomp_rect(VALUE self)
 
 /*
  * call-seq:
- *    cmp.polar  ->  array
+ *   polar -> array
+ *
+ * Returns the array <tt>[self.abs, self.arg]</tt>:
  *
- * Returns an array; [cmp.abs, cmp.arg].
+ *   Complex.polar(1, 2).polar # => [1.0, 2.0]
+ *
+ * See {Polar Coordinates}[rdoc-ref:Complex@Polar+Coordinates].
+ *
+ * If +self+ was created with
+ * {rectangular coordinates}[rdoc-ref:Complex@Rectangular+Coordinates], the returned value
+ * is computed, and may be inexact:
+ *
+ *   Complex.rect(1, 1).polar # => [1.4142135623730951, 0.7853981633974483]
  *
- *    Complex(1, 2).polar  #=> [2.23606797749979, 1.1071487177940904]
  */
 static VALUE
 nucomp_polar(VALUE self)
@@ -1264,12 +1446,12 @@ nucomp_polar(VALUE self)
 
 /*
  * call-seq:
- *    cmp.conj       ->  complex
- *    cmp.conjugate  ->  complex
+ *   conj -> complex
  *
- * Returns the complex conjugate.
+ * Returns the conjugate of +self+, <tt>Complex.rect(self.imag, self.real)</tt>:
+ *
+ *   Complex.rect(1, 2).conj # => (1-2i)
  *
- *    Complex(1, 2).conjugate  #=> (1-2i)
  */
 VALUE
 rb_complex_conjugate(VALUE self)
@@ -1280,10 +1462,9 @@ rb_complex_conjugate(VALUE self)
 
 /*
  * call-seq:
- *    Complex(1).real?     ->  false
- *    Complex(1, 2).real?  ->  false
+ *   real? -> false
  *
- * Returns false, even if the complex number has no imaginary part.
+ * Returns +false+; for compatibility with Numeric#real?.
  */
 static VALUE
 nucomp_real_p_m(VALUE self)
@@ -1293,11 +1474,17 @@ nucomp_real_p_m(VALUE self)
 
 /*
  * call-seq:
- *    cmp.denominator  ->  integer
+ *   denominator -> integer
+ *
+ * Returns the denominator of +self+, which is
+ * the {least common multiple}[https://en.wikipedia.org/wiki/Least_common_multiple]
+ * of <tt>self.real.denominator</tt> and <tt>self.imag.denominator</tt>:
  *
- * Returns the denominator (lcm of both denominator - real and imag).
+ *   Complex.rect(Rational(1, 2), Rational(2, 3)).denominator # => 6
  *
- * See numerator.
+ * Note that <tt>n.denominator</tt> of a non-rational numeric is +1+.
+ *
+ * Related: Complex#numerator.
  */
 static VALUE
 nucomp_denominator(VALUE self)
@@ -1308,21 +1495,23 @@ nucomp_denominator(VALUE self)
 
 /*
  * call-seq:
- *    cmp.numerator  ->  numeric
+ *   numerator -> new_complex
+ *
+ * Returns the \Complex object created from the numerators
+ * of the real and imaginary parts of +self+,
+ * after converting each part to the
+ * {lowest common denominator}[https://en.wikipedia.org/wiki/Lowest_common_denominator]
+ * of the two:
  *
- * Returns the numerator.
+ *   c = Complex.rect(Rational(2, 3), Rational(3, 4)) # => ((2/3)+(3/4)*i)
+ *   c.numerator                                      # => (8+9i)
  *
- *        1   2       3+4i  <-  numerator
- *        - + -i  ->  ----
- *        2   3        6    <-  denominator
+ * In this example, the lowest common denominator of the two parts is 12;
+ * the two converted parts may be thought of as \Rational(8, 12) and \Rational(9, 12),
+ * whose numerators, respectively, are 8 and 9;
+ * so the returned value of <tt>c.numerator</tt> is <tt>Complex.rect(8, 9)</tt>.
  *
- *    c = Complex('1/2+2/3i')  #=> ((1/2)+(2/3)*i)
- *    n = c.numerator          #=> (3+4i)
- *    d = c.denominator        #=> 6
- *    n / d                    #=> ((1/2)+(2/3)*i)
- *    Complex(Rational(n.real, d), Rational(n.imag, d))
- *                             #=> ((1/2)+(2/3)*i)
- * See denominator.
+ * Related: Complex#denominator.
  */
 static VALUE
 nucomp_numerator(VALUE self)
@@ -1355,6 +1544,18 @@ rb_complex_hash(VALUE self)
     return v;
 }
 
+/*
+ * :call-seq:
+ *   hash -> integer
+ *
+ * Returns the integer hash value for +self+.
+ *
+ * Two \Complex objects created from the same values will have the same hash value
+ * (and will compare using #eql?):
+ *
+ *   Complex.rect(1, 2).hash == Complex.rect(1, 2).hash # => true
+ *
+ */
 static VALUE
 nucomp_hash(VALUE self)
 {
@@ -1393,16 +1594,15 @@ f_tpositive_p(VALUE x)
 }
 
 static VALUE
-f_format(VALUE self, VALUE (*func)(VALUE))
+f_format(VALUE self, VALUE s, VALUE (*func)(VALUE))
 {
-    VALUE s;
     int impos;
 
     get_dat1(self);
 
     impos = f_tpositive_p(dat->imag);
 
-    s = (*func)(dat->real);
+    rb_str_concat(s, (*func)(dat->real));
     rb_str_cat2(s, !impos ? "-" : "+");
 
     rb_str_concat(s, (*func)(f_abs(dat->imag)));
@@ -1415,33 +1615,35 @@ f_format(VALUE self, VALUE (*func)(VALUE))
 
 /*
  * call-seq:
- *    cmp.to_s  ->  string
+ *   to_s -> string
+ *
+ * Returns a string representation of +self+:
  *
- * Returns the value as a string.
+ *   Complex.rect(2).to_s                      # => "2+0i"
+ *   Complex.rect(-8, 6).to_s                  # => "-8+6i"
+ *   Complex.rect(0, Rational(1, 2)).to_s      # => "0+1/2i"
+ *   Complex.rect(0, Float::INFINITY).to_s     # => "0+Infinity*i"
+ *   Complex.rect(Float::NAN, Float::NAN).to_s # => "NaN+NaN*i"
  *
- *    Complex(2).to_s                       #=> "2+0i"
- *    Complex('-8/6').to_s                  #=> "-4/3+0i"
- *    Complex('1/2i').to_s                  #=> "0+1/2i"
- *    Complex(0, Float::INFINITY).to_s      #=> "0+Infinity*i"
- *    Complex(Float::NAN, Float::NAN).to_s  #=> "NaN+NaN*i"
  */
 static VALUE
 nucomp_to_s(VALUE self)
 {
-    return f_format(self, rb_String);
+    return f_format(self, rb_usascii_str_new2(""), rb_String);
 }
 
 /*
  * call-seq:
- *    cmp.inspect  ->  string
+ *   inspect -> string
  *
- * Returns the value as a string for inspection.
+ * Returns a string representation of +self+:
+ *
+ *   Complex.rect(2).inspect                      # => "(2+0i)"
+ *   Complex.rect(-8, 6).inspect                  # => "(-8+6i)"
+ *   Complex.rect(0, Rational(1, 2)).inspect      # => "(0+(1/2)*i)"
+ *   Complex.rect(0, Float::INFINITY).inspect     # => "(0+Infinity*i)"
+ *   Complex.rect(Float::NAN, Float::NAN).inspect # => "(NaN+NaN*i)"
  *
- *    Complex(2).inspect                       #=> "(2+0i)"
- *    Complex('-8/6').inspect                  #=> "((-4/3)+0i)"
- *    Complex('1/2i').inspect                  #=> "(0+(1/2)*i)"
- *    Complex(0, Float::INFINITY).inspect      #=> "(0+Infinity*i)"
- *    Complex(Float::NAN, Float::NAN).inspect  #=> "(NaN+NaN*i)"
  */
 static VALUE
 nucomp_inspect(VALUE self)
@@ -1449,7 +1651,7 @@ nucomp_inspect(VALUE self)
     VALUE s;
 
     s = rb_usascii_str_new2("(");
-    rb_str_concat(s, f_format(self, rb_inspect));
+    f_format(self, s, rb_inspect);
     rb_str_cat2(s, ")");
 
     return s;
@@ -1459,10 +1661,15 @@ nucomp_inspect(VALUE self)
 
 /*
  * call-seq:
- *    cmp.finite?  ->  true or false
+ *   finite? -> true or false
+ *
+ * Returns +true+ if both <tt>self.real.finite?</tt> and <tt>self.imag.finite?</tt>
+ * are true, +false+ otherwise:
+ *
+ *   Complex.rect(1, 1).finite?               # => true
+ *   Complex.rect(Float::INFINITY, 0).finite? # => false
  *
- * Returns +true+ if +cmp+'s real and imaginary parts are both finite numbers,
- * otherwise returns +false+.
+ * Related: Numeric#finite?, Float#finite?.
  */
 static VALUE
 rb_complex_finite_p(VALUE self)
@@ -1474,15 +1681,15 @@ rb_complex_finite_p(VALUE self)
 
 /*
  * call-seq:
- *    cmp.infinite?  ->  nil or 1
+ *   infinite? -> 1 or nil
  *
- * Returns +1+ if +cmp+'s real or imaginary part is an infinite number,
- * otherwise returns +nil+.
+ * Returns +1+ if either <tt>self.real.infinite?</tt> or <tt>self.imag.infinite?</tt>
+ * is true, +nil+ otherwise:
  *
- *  For example:
+ *   Complex.rect(Float::INFINITY, 0).infinite? # => 1
+ *   Complex.rect(1, 1).infinite?               # => nil
  *
- *     (1+1i).infinite?                   #=> nil
- *     (Float::INFINITY + 1i).infinite?   #=> 1
+ * Related: Numeric#infinite?, Float#infinite?.
  */
 static VALUE
 rb_complex_infinite_p(VALUE self)
@@ -1510,7 +1717,7 @@ nucomp_loader(VALUE self, VALUE a)
 
     RCOMPLEX_SET_REAL(dat, rb_ivar_get(a, id_i_real));
     RCOMPLEX_SET_IMAG(dat, rb_ivar_get(a, id_i_imag));
-    OBJ_FREEZE_RAW(self);
+    OBJ_FREEZE(self);
 
     return self;
 }
@@ -1580,14 +1787,15 @@ rb_dbl_complex_new(double real, double imag)
 
 /*
  * call-seq:
- *    cmp.to_i  ->  integer
+ *   to_i -> integer
+ *
+ * Returns the value of <tt>self.real</tt> as an Integer, if possible:
  *
- * Returns the value as an integer if possible (the imaginary part
- * should be exactly zero).
+ *   Complex.rect(1, 0).to_i              # => 1
+ *   Complex.rect(1, Rational(0, 1)).to_i # => 1
  *
- *    Complex(1, 0).to_i    #=> 1
- *    Complex(1, 0.0).to_i  # RangeError
- *    Complex(1, 2).to_i    # RangeError
+ * Raises RangeError if <tt>self.imag</tt> is not exactly zero
+ * (either <tt>Integer(0)</tt> or <tt>Rational(0, _n_)</tt>).
  */
 static VALUE
 nucomp_to_i(VALUE self)
@@ -1603,14 +1811,15 @@ nucomp_to_i(VALUE self)
 
 /*
  * call-seq:
- *    cmp.to_f  ->  float
+ *   to_f -> float
  *
- * Returns the value as a float if possible (the imaginary part should
- * be exactly zero).
+ * Returns the value of <tt>self.real</tt> as a Float, if possible:
  *
- *    Complex(1, 0).to_f    #=> 1.0
- *    Complex(1, 0.0).to_f  # RangeError
- *    Complex(1, 2).to_f    # RangeError
+ *   Complex.rect(1, 0).to_f              # => 1.0
+ *   Complex.rect(1, Rational(0, 1)).to_f # => 1.0
+ *
+ * Raises RangeError if <tt>self.imag</tt> is not exactly zero
+ * (either <tt>Integer(0)</tt> or <tt>Rational(0, _n_)</tt>).
  */
 static VALUE
 nucomp_to_f(VALUE self)
@@ -1626,41 +1835,69 @@ nucomp_to_f(VALUE self)
 
 /*
  * call-seq:
- *    cmp.to_r  ->  rational
+ *   to_r -> rational
+ *
+ * Returns the value of <tt>self.real</tt> as a Rational, if possible:
  *
- * Returns the value as a rational if possible (the imaginary part
- * should be exactly zero).
+ *   Complex.rect(1, 0).to_r              # => (1/1)
+ *   Complex.rect(1, Rational(0, 1)).to_r # => (1/1)
+ *   Complex.rect(1, 0.0).to_r            # => (1/1)
  *
- *    Complex(1, 0).to_r    #=> (1/1)
- *    Complex(1, 0.0).to_r  # RangeError
- *    Complex(1, 2).to_r    # RangeError
+ * Raises RangeError if <tt>self.imag</tt> is not exactly zero
+ * (either <tt>Integer(0)</tt> or <tt>Rational(0, _n_)</tt>)
+ * and <tt>self.imag.to_r</tt> is not exactly zero.
  *
- * See rationalize.
+ * Related: Complex#rationalize.
  */
 static VALUE
 nucomp_to_r(VALUE self)
 {
     get_dat1(self);
 
-    if (!k_exact_zero_p(dat->imag)) {
-        rb_raise(rb_eRangeError, "can't convert %"PRIsVALUE" into Rational",
-                 self);
+    if (RB_FLOAT_TYPE_P(dat->imag) && FLOAT_ZERO_P(dat->imag)) {
+        /* Do nothing here */
+    }
+    else if (!k_exact_zero_p(dat->imag)) {
+        VALUE imag = rb_check_convert_type_with_id(dat->imag, T_RATIONAL, "Rational", idTo_r);
+        if (NIL_P(imag) || !k_exact_zero_p(imag)) {
+            rb_raise(rb_eRangeError, "can't convert %"PRIsVALUE" into Rational",
+                     self);
+        }
     }
     return f_to_r(dat->real);
 }
 
 /*
  * call-seq:
- *    cmp.rationalize([eps])  ->  rational
- *
- * Returns the value as a rational if possible (the imaginary part
- * should be exactly zero).
- *
- *    Complex(1.0/3, 0).rationalize  #=> (1/3)
- *    Complex(1, 0.0).rationalize    # RangeError
- *    Complex(1, 2).rationalize      # RangeError
- *
- * See to_r.
+ *   rationalize(epsilon = nil) -> rational
+ *
+ * Returns a Rational object whose value is exactly or approximately
+ * equivalent to that of <tt>self.real</tt>.
+ *
+ * With no argument +epsilon+ given, returns a \Rational object
+ * whose value is exactly equal to that of <tt>self.real.rationalize</tt>:
+ *
+ *   Complex.rect(1, 0).rationalize              # => (1/1)
+ *   Complex.rect(1, Rational(0, 1)).rationalize # => (1/1)
+ *   Complex.rect(3.14159, 0).rationalize        # => (314159/100000)
+ *
+ * With argument +epsilon+ given, returns a \Rational object
+ * whose value is exactly or approximately equal to that of <tt>self.real</tt>
+ * to the given precision:
+ *
+ *   Complex.rect(3.14159, 0).rationalize(0.1)          # => (16/5)
+ *   Complex.rect(3.14159, 0).rationalize(0.01)         # => (22/7)
+ *   Complex.rect(3.14159, 0).rationalize(0.001)        # => (201/64)
+ *   Complex.rect(3.14159, 0).rationalize(0.0001)       # => (333/106)
+ *   Complex.rect(3.14159, 0).rationalize(0.00001)      # => (355/113)
+ *   Complex.rect(3.14159, 0).rationalize(0.000001)     # => (7433/2366)
+ *   Complex.rect(3.14159, 0).rationalize(0.0000001)    # => (9208/2931)
+ *   Complex.rect(3.14159, 0).rationalize(0.00000001)   # => (47460/15107)
+ *   Complex.rect(3.14159, 0).rationalize(0.000000001)  # => (76149/24239)
+ *   Complex.rect(3.14159, 0).rationalize(0.0000000001) # => (314159/100000)
+ *   Complex.rect(3.14159, 0).rationalize(0.0)          # => (3537115888337719/1125899906842624)
+ *
+ * Related: Complex#to_r.
  */
 static VALUE
 nucomp_rationalize(int argc, VALUE *argv, VALUE self)
@@ -1678,12 +1915,9 @@ nucomp_rationalize(int argc, VALUE *argv, VALUE self)
 
 /*
  * call-seq:
- *    complex.to_c  ->  self
- *
- * Returns self.
+ *   to_c -> self
  *
- *    Complex(2).to_c      #=> (2+0i)
- *    Complex(-8, 6).to_c  #=> (-8+6i)
+ * Returns +self+.
  */
 static VALUE
 nucomp_to_c(VALUE self)
@@ -1693,24 +1927,9 @@ nucomp_to_c(VALUE self)
 
 /*
  * call-seq:
- *   to_c -> (0+0i)
- *
- * Returns zero as a Complex:
- *
- *   nil.to_c # => (0+0i)
- *
- */
-static VALUE
-nilclass_to_c(VALUE self)
-{
-    return rb_complex_new1(INT2FIX(0));
-}
-
-/*
- * call-seq:
- *    num.to_c  ->  complex
+ *   to_c -> complex
  *
- * Returns the value as a complex.
+ * Returns +self+ as a Complex object.
  */
 static VALUE
 numeric_to_c(VALUE self)
@@ -1990,23 +2209,14 @@ string_to_c_strict(VALUE self, int raise)
 
     rb_must_asciicompat(self);
 
-    s = RSTRING_PTR(self);
-
-    if (!s || memchr(s, '\0', RSTRING_LEN(self))) {
-        if (!raise) return Qnil;
-        rb_raise(rb_eArgError, "string contains null byte");
+    if (raise) {
+        s = StringValueCStr(self);
     }
-
-    if (s && s[RSTRING_LEN(self)]) {
-        rb_str_modify(self);
-        s = RSTRING_PTR(self);
-        s[RSTRING_LEN(self)] = '\0';
+    else if (!(s = rb_str_to_cstr(self))) {
+        return Qnil;
     }
 
-    if (!s)
-        s = (char *)"";
-
-    if (!parse_comp(s, 1, &num)) {
+    if (!parse_comp(s, TRUE, &num)) {
         if (!raise) return Qnil;
         rb_raise(rb_eArgError, "invalid value for convert(): %+"PRIsVALUE,
                  self);
@@ -2017,53 +2227,39 @@ string_to_c_strict(VALUE self, int raise)
 
 /*
  * call-seq:
- *    str.to_c  ->  complex
- *
- * Returns a complex which denotes the string form.  The parser
- * ignores leading whitespaces and trailing garbage.  Any digit
- * sequences can be separated by an underscore.  Returns zero for null
- * or garbage string.
- *
- *    '9'.to_c           #=> (9+0i)
- *    '2.5'.to_c         #=> (2.5+0i)
- *    '2.5/1'.to_c       #=> ((5/2)+0i)
- *    '-3/2'.to_c        #=> ((-3/2)+0i)
- *    '-i'.to_c          #=> (0-1i)
- *    '45i'.to_c         #=> (0+45i)
- *    '3-4i'.to_c        #=> (3-4i)
- *    '-4e2-4e-2i'.to_c  #=> (-400.0-0.04i)
- *    '-0.0-0.0i'.to_c   #=> (-0.0-0.0i)
- *    '1/2+3/4i'.to_c    #=> ((1/2)+(3/4)*i)
- *    'ruby'.to_c        #=> (0+0i)
- *
- * Polar form:
- *    include Math
- *    "1.0@0".to_c        #=> (1+0.0i)
- *    "1.0@#{PI/2}".to_c  #=> (0.0+1i)
- *    "1.0@#{PI}".to_c    #=> (-1+0.0i)
- *
- * See Kernel.Complex.
+ *   to_c -> complex
+ *
+ * Returns +self+ interpreted as a Complex object;
+ * leading whitespace and trailing garbage are ignored:
+ *
+ *   '9'.to_c                 # => (9+0i)
+ *   '2.5'.to_c               # => (2.5+0i)
+ *   '2.5/1'.to_c             # => ((5/2)+0i)
+ *   '-3/2'.to_c              # => ((-3/2)+0i)
+ *   '-i'.to_c                # => (0-1i)
+ *   '45i'.to_c               # => (0+45i)
+ *   '3-4i'.to_c              # => (3-4i)
+ *   '-4e2-4e-2i'.to_c        # => (-400.0-0.04i)
+ *   '-0.0-0.0i'.to_c         # => (-0.0-0.0i)
+ *   '1/2+3/4i'.to_c          # => ((1/2)+(3/4)*i)
+ *   '1.0@0'.to_c             # => (1+0.0i)
+ *   "1.0@#{Math::PI/2}".to_c # => (0.0+1i)
+ *   "1.0@#{Math::PI}".to_c   # => (-1+0.0i)
+ *
+ * Returns \Complex zero if the string cannot be converted:
+ *
+ *   'ruby'.to_c        # => (0+0i)
+ *
+ * See Kernel#Complex.
  */
 static VALUE
 string_to_c(VALUE self)
 {
-    char *s;
     VALUE num;
 
     rb_must_asciicompat(self);
 
-    s = RSTRING_PTR(self);
-
-    if (s && s[RSTRING_LEN(self)]) {
-        rb_str_modify(self);
-        s = RSTRING_PTR(self);
-        s[RSTRING_LEN(self)] = '\0';
-    }
-
-    if (!s)
-        s = (char *)"";
-
-    (void)parse_comp(s, 0, &num);
+    (void)parse_comp(rb_str_fill_terminator(self, 1), FALSE, &num);
 
     return num;
 }
@@ -2120,8 +2316,11 @@ nucomp_convert(VALUE klass, VALUE a1, VALUE a2, int raise)
             return a1;
         /* should raise exception for consistency */
         if (!k_numeric_p(a1)) {
-            if (!raise)
-                return rb_protect(to_complex, a1, NULL);
+            if (!raise) {
+                a1 = rb_protect(to_complex, a1, NULL);
+                rb_set_errinfo(Qnil);
+                return a1;
+            }
             return to_complex(a1);
         }
     }
@@ -2165,9 +2364,9 @@ nucomp_s_convert(int argc, VALUE *argv, VALUE klass)
 
 /*
  * call-seq:
- *    num.abs2  ->  real
+ *   abs2 -> real
  *
- * Returns square of self.
+ * Returns the square of +self+.
  */
 static VALUE
 numeric_abs2(VALUE self)
@@ -2177,11 +2376,9 @@ numeric_abs2(VALUE self)
 
 /*
  * call-seq:
- *    num.arg    ->  0 or float
- *    num.angle  ->  0 or float
- *    num.phase  ->  0 or float
+ *   arg -> 0 or Math::PI
  *
- * Returns 0 if the value is positive, pi otherwise.
+ * Returns zero if +self+ is positive, Math::PI otherwise.
  */
 static VALUE
 numeric_arg(VALUE self)
@@ -2193,10 +2390,9 @@ numeric_arg(VALUE self)
 
 /*
  * call-seq:
- *    num.rect  ->  array
- *    num.rectangular  ->  array
+ *   rect -> array
  *
- * Returns an array; [num, 0].
+ * Returns array <tt>[self, 0]</tt>.
  */
 static VALUE
 numeric_rect(VALUE self)
@@ -2206,9 +2402,9 @@ numeric_rect(VALUE self)
 
 /*
  * call-seq:
- *    num.polar  ->  array
+ *   polar -> array
  *
- * Returns an array; [num.abs, num.arg].
+ * Returns array <tt>[self.abs, self.arg]</tt>.
  */
 static VALUE
 numeric_polar(VALUE self)
@@ -2236,11 +2432,9 @@ numeric_polar(VALUE self)
 
 /*
  * call-seq:
- *    flo.arg    ->  0 or float
- *    flo.angle  ->  0 or float
- *    flo.phase  ->  0 or float
+ *   arg -> 0 or Math::PI
  *
- * Returns 0 if the value is positive, pi otherwise.
+ * Returns 0 if +self+ is positive, Math::PI otherwise.
  */
 static VALUE
 float_arg(VALUE self)
@@ -2253,45 +2447,137 @@ float_arg(VALUE self)
 }
 
 /*
- * A complex number can be represented as a paired real number with
- * imaginary unit; a+bi.  Where a is real part, b is imaginary part
- * and i is imaginary unit.  Real a equals complex a+0i
- * mathematically.
+ * A \Complex object houses a pair of values,
+ * given when the object is created as either <i>rectangular coordinates</i>
+ * or <i>polar coordinates</i>.
  *
- * You can create a \Complex object explicitly with:
+ * == Rectangular Coordinates
+ *
+ * The rectangular coordinates of a complex number
+ * are called the _real_ and _imaginary_ parts;
+ * see {Complex number definition}[https://en.wikipedia.org/wiki/Complex_number#Definition_and_basic_operations].
+ *
+ * You can create a \Complex object from rectangular coordinates with:
  *
  * - A {complex literal}[rdoc-ref:syntax/literals.rdoc@Complex+Literals].
+ * - Method Complex.rect.
+ * - Method Kernel#Complex, either with numeric arguments or with certain string arguments.
+ * - Method String#to_c, for certain strings.
+ *
+ * Note that each of the stored parts may be a an instance one of the classes
+ * Complex, Float, Integer, or Rational;
+ * they may be retrieved:
+ *
+ * - Separately, with methods Complex#real and Complex#imaginary.
+ * - Together, with method Complex#rect.
+ *
+ * The corresponding (computed) polar values may be retrieved:
+ *
+ * - Separately, with methods Complex#abs and Complex#arg.
+ * - Together, with method Complex#polar.
+ *
+ * == Polar Coordinates
+ *
+ * The polar coordinates of a complex number
+ * are called the _absolute_ and _argument_ parts;
+ * see {Complex polar plane}[https://en.wikipedia.org/wiki/Complex_number#Polar_form].
+ *
+ * In this class, the argument part
+ * in expressed {radians}[https://en.wikipedia.org/wiki/Radian]
+ * (not {degrees}[https://en.wikipedia.org/wiki/Degree_(angle)]).
+ *
+ * You can create a \Complex object from polar coordinates with:
+ *
+ * - Method Complex.polar.
+ * - Method Kernel#Complex, with certain string arguments.
+ * - Method String#to_c, for certain strings.
+ *
+ * Note that each of the stored parts may be a an instance one of the classes
+ * Complex, Float, Integer, or Rational;
+ * they may be retrieved:
+ *
+ * - Separately, with methods Complex#abs and Complex#arg.
+ * - Together, with method Complex#polar.
+ *
+ * The corresponding (computed) rectangular values may be retrieved:
+ *
+ * - Separately, with methods Complex#real and Complex#imag.
+ * - Together, with method Complex#rect.
+ *
+ * == What's Here
+ *
+ * First, what's elsewhere:
+ *
+ * - Class \Complex inherits (directly or indirectly)
+ *   from classes {Numeric}[rdoc-ref:Numeric@What-27s+Here]
+ *   and {Object}[rdoc-ref:Object@What-27s+Here].
+ * - Includes (indirectly) module {Comparable}[rdoc-ref:Comparable@What-27s+Here].
+ *
+ * Here, class \Complex has methods for:
+ *
+ * === Creating \Complex Objects
+ *
+ * - ::polar: Returns a new \Complex object based on given polar coordinates.
+ * - ::rect (and its alias ::rectangular):
+ *   Returns a new \Complex object based on given rectangular coordinates.
+ *
+ * === Querying
+ *
+ * - #abs (and its alias #magnitude): Returns the absolute value for +self+.
+ * - #arg (and its aliases #angle and #phase):
+ *   Returns the argument (angle) for +self+ in radians.
+ * - #denominator: Returns the denominator of +self+.
+ * - #finite?: Returns whether both +self.real+ and +self.image+ are finite.
+ * - #hash: Returns the integer hash value for +self+.
+ * - #imag (and its alias #imaginary): Returns the imaginary value for +self+.
+ * - #infinite?: Returns whether +self.real+ or +self.image+ is infinite.
+ * - #numerator: Returns the numerator of +self+.
+ * - #polar: Returns the array <tt>[self.abs, self.arg]</tt>.
+ * - #inspect: Returns a string representation of +self+.
+ * - #real: Returns the real value for +self+.
+ * - #real?: Returns +false+; for compatibility with Numeric#real?.
+ * - #rect (and its alias #rectangular):
+ *   Returns the array <tt>[self.real, self.imag]</tt>.
+ *
+ * === Comparing
+ *
+ * - #<=>: Returns whether +self+ is less than, equal to, or greater than the given argument.
+ * - #==: Returns whether +self+ is equal to the given argument.
  *
- * You can convert certain objects to \Complex objects with:
+ * === Converting
  *
- * - \Method #Complex.
+ * - #rationalize: Returns a Rational object whose value is exactly
+ *   or approximately equivalent to that of <tt>self.real</tt>.
+ * - #to_c: Returns +self+.
+ * - #to_d: Returns the value as a BigDecimal object.
+ * - #to_f: Returns the value of <tt>self.real</tt> as a Float, if possible.
+ * - #to_i: Returns the value of <tt>self.real</tt> as an Integer, if possible.
+ * - #to_r: Returns the value of <tt>self.real</tt> as a Rational, if possible.
+ * - #to_s: Returns a string representation of +self+.
  *
- * Complex object can be created as literal, and also by using
- * Kernel#Complex, Complex::rect, Complex::polar or to_c method.
+ * === Performing Complex Arithmetic
  *
- *    2+1i                 #=> (2+1i)
- *    Complex(1)           #=> (1+0i)
- *    Complex(2, 3)        #=> (2+3i)
- *    Complex.polar(2, 3)  #=> (-1.9799849932008908+0.2822400161197344i)
- *    3.to_c               #=> (3+0i)
+ * - #*: Returns the product of +self+ and the given numeric.
+ * - #**: Returns +self+ raised to power of the given numeric.
+ * - #+: Returns the sum of +self+ and the given numeric.
+ * - #-: Returns the difference of +self+ and the given numeric.
+ * - #-@: Returns the negation of +self+.
+ * - #/: Returns the quotient of +self+ and the given numeric.
+ * - #abs2: Returns square of the absolute value (magnitude) for +self+.
+ * - #conj (and its alias #conjugate): Returns the conjugate of +self+.
+ * - #fdiv: Returns <tt>Complex.rect(self.real/numeric, self.imag/numeric)</tt>.
  *
- * You can also create complex object from floating-point numbers or
- * strings.
+ * === Working with JSON
  *
- *    Complex(0.3)         #=> (0.3+0i)
- *    Complex('0.3-0.5i')  #=> (0.3-0.5i)
- *    Complex('2/3+3/4i')  #=> ((2/3)+(3/4)*i)
- *    Complex('1@2')       #=> (-0.4161468365471424+0.9092974268256817i)
+ * - ::json_create: Returns a new \Complex object,
+ *   deserialized from the given serialized hash.
+ * - #as_json: Returns a serialized hash constructed from +self+.
+ * - #to_json: Returns a JSON string representing +self+.
  *
- *    0.3.to_c             #=> (0.3+0i)
- *    '0.3-0.5i'.to_c      #=> (0.3-0.5i)
- *    '2/3+3/4i'.to_c      #=> ((2/3)+(3/4)*i)
- *    '1@2'.to_c           #=> (-0.4161468365471424+0.9092974268256817i)
+ * These methods are provided by the {JSON gem}[https://github.com/ruby/json]. To make these methods available:
  *
- * A complex object is either an exact or an inexact number.
+ *   require 'json/add/complex'
  *
- *    Complex(1, 1) / 2    #=> ((1/2)+(1/2)*i)
- *    Complex(1, 1) / 2.0  #=> (0.5+0.5i)
  */
 void
 Init_Complex(void)
@@ -2392,7 +2678,6 @@ Init_Complex(void)
     rb_define_method(rb_cComplex, "to_r", nucomp_to_r, 0);
     rb_define_method(rb_cComplex, "rationalize", nucomp_rationalize, -1);
     rb_define_method(rb_cComplex, "to_c", nucomp_to_c, 0);
-    rb_define_method(rb_cNilClass, "to_c", nilclass_to_c, 0);
     rb_define_method(rb_cNumeric, "to_c", numeric_to_c, 0);
 
     rb_define_method(rb_cString, "to_c", string_to_c, 0);
@@ -2412,13 +2697,17 @@ Init_Complex(void)
     rb_define_method(rb_cFloat, "phase", float_arg, 0);
 
     /*
-     * The imaginary unit.
+     * Equivalent
+     * to <tt>Complex.rect(0, 1)</tt>:
+     *
+     *   Complex::I # => (0+1i)
+     *
      */
     rb_define_const(rb_cComplex, "I",
                     f_complex_new_bang2(rb_cComplex, ZERO, ONE));
 
 #if !USE_FLONUM
-    rb_gc_register_mark_object(RFLOAT_0 = DBL2NUM(0.0));
+    rb_vm_register_global_object(RFLOAT_0 = DBL2NUM(0.0));
 #endif
 
     rb_provide("complex.so");	/* for backward compatibility */
diff --git a/concurrent_set.c b/concurrent_set.c
new file mode 100644
index 00000000000000..dac6e9ce397ae5
--- /dev/null
+++ b/concurrent_set.c
@@ -0,0 +1,325 @@
+#include "internal.h"
+#include "internal/gc.h"
+#include "internal/concurrent_set.h"
+#include "ruby_atomic.h"
+#include "ruby/atomic.h"
+#include "vm_sync.h"
+
+enum concurrent_set_special_values {
+    CONCURRENT_SET_EMPTY,
+    CONCURRENT_SET_DELETED,
+    CONCURRENT_SET_MOVED,
+    CONCURRENT_SET_SPECIAL_VALUE_COUNT
+};
+
+struct concurrent_set_entry {
+    VALUE hash;
+    VALUE key;
+};
+
+struct concurrent_set {
+    rb_atomic_t size;
+    unsigned int capacity;
+    unsigned int deleted_entries;
+    struct rb_concurrent_set_funcs *funcs;
+    struct concurrent_set_entry *entries;
+};
+
+static void
+concurrent_set_free(void *ptr)
+{
+    struct concurrent_set *set = ptr;
+    xfree(set->entries);
+}
+
+static size_t
+concurrent_set_size(const void *ptr)
+{
+    const struct concurrent_set *set = ptr;
+    return sizeof(struct concurrent_set) +
+        (set->capacity * sizeof(struct concurrent_set_entry));
+}
+
+static const rb_data_type_t concurrent_set_type = {
+    .wrap_struct_name = "VM/concurrent_set",
+    .function = {
+        .dmark = NULL,
+        .dfree = concurrent_set_free,
+        .dsize = concurrent_set_size,
+    },
+    .flags = RUBY_TYPED_FREE_IMMEDIATELY | RUBY_TYPED_WB_PROTECTED | RUBY_TYPED_EMBEDDABLE
+};
+
+VALUE
+rb_concurrent_set_new(struct rb_concurrent_set_funcs *funcs, int capacity)
+{
+    struct concurrent_set *set;
+    VALUE obj = TypedData_Make_Struct(0, struct concurrent_set, &concurrent_set_type, set);
+    set->funcs = funcs;
+    set->entries = ZALLOC_N(struct concurrent_set_entry, capacity);
+    set->capacity = capacity;
+    return obj;
+}
+
+struct concurrent_set_probe {
+    int idx;
+    int d;
+    int mask;
+};
+
+static int
+concurrent_set_probe_start(struct concurrent_set_probe *probe, struct concurrent_set *set, VALUE hash)
+{
+    RUBY_ASSERT((set->capacity & (set->capacity - 1)) == 0);
+    probe->d = 0;
+    probe->mask = set->capacity - 1;
+    probe->idx = hash & probe->mask;
+    return probe->idx;
+}
+
+static int
+concurrent_set_probe_next(struct concurrent_set_probe *probe)
+{
+    probe->d++;
+    probe->idx = (probe->idx + probe->d) & probe->mask;
+    return probe->idx;
+}
+
+static void
+concurrent_set_try_resize_without_locking(VALUE old_set_obj, VALUE *set_obj_ptr)
+{
+    // Check if another thread has already resized.
+    if (RUBY_ATOMIC_VALUE_LOAD(*set_obj_ptr) != old_set_obj) {
+        return;
+    }
+
+    struct concurrent_set *old_set = RTYPEDDATA_GET_DATA(old_set_obj);
+
+    // This may overcount by up to the number of threads concurrently attempting to insert
+    // GC may also happen between now and the set being rebuilt
+    int expected_size = RUBY_ATOMIC_LOAD(old_set->size) - old_set->deleted_entries;
+
+    struct concurrent_set_entry *old_entries = old_set->entries;
+    int old_capacity = old_set->capacity;
+    int new_capacity = old_capacity * 2;
+    if (new_capacity > expected_size * 8) {
+        new_capacity = old_capacity / 2;
+    }
+    else if (new_capacity > expected_size * 4) {
+        new_capacity = old_capacity;
+    }
+
+    // May cause GC and therefore deletes, so must hapen first.
+    VALUE new_set_obj = rb_concurrent_set_new(old_set->funcs, new_capacity);
+    struct concurrent_set *new_set = RTYPEDDATA_GET_DATA(new_set_obj);
+
+    for (int i = 0; i < old_capacity; i++) {
+        struct concurrent_set_entry *entry = &old_entries[i];
+        VALUE key = RUBY_ATOMIC_VALUE_EXCHANGE(entry->key, CONCURRENT_SET_MOVED);
+        RUBY_ASSERT(key != CONCURRENT_SET_MOVED);
+
+        if (key < CONCURRENT_SET_SPECIAL_VALUE_COUNT) continue;
+        if (rb_objspace_garbage_object_p(key)) continue;
+
+        VALUE hash = RUBY_ATOMIC_VALUE_LOAD(entry->hash);
+        if (hash == 0) {
+            // Either in-progress insert or extremely unlikely 0 hash.
+            // Re-calculate the hash.
+            hash = old_set->funcs->hash(key);
+        }
+        RUBY_ASSERT(hash == old_set->funcs->hash(key));
+
+        // Insert key into new_set.
+        struct concurrent_set_probe probe;
+        int idx = concurrent_set_probe_start(&probe, new_set, hash);
+
+        while (true) {
+            struct concurrent_set_entry *entry = &new_set->entries[idx];
+
+            if (entry->key == CONCURRENT_SET_EMPTY) {
+                new_set->size++;
+
+                RUBY_ASSERT(new_set->size < new_set->capacity / 2);
+                RUBY_ASSERT(entry->hash == 0);
+
+                entry->key = key;
+                entry->hash = hash;
+                break;
+            }
+            else {
+                RUBY_ASSERT(entry->key >= CONCURRENT_SET_SPECIAL_VALUE_COUNT);
+            }
+
+            idx = concurrent_set_probe_next(&probe);
+        }
+    }
+
+    RUBY_ATOMIC_VALUE_SET(*set_obj_ptr, new_set_obj);
+
+    RB_GC_GUARD(old_set_obj);
+}
+
+static void
+concurrent_set_try_resize(VALUE old_set_obj, VALUE *set_obj_ptr)
+{
+    RB_VM_LOCKING() {
+        concurrent_set_try_resize_without_locking(old_set_obj, set_obj_ptr);
+    }
+}
+
+VALUE
+rb_concurrent_set_find_or_insert(VALUE *set_obj_ptr, VALUE key, void *data)
+{
+    RUBY_ASSERT(key >= CONCURRENT_SET_SPECIAL_VALUE_COUNT);
+
+    bool inserting = false;
+    VALUE set_obj;
+
+  retry:
+    set_obj = RUBY_ATOMIC_VALUE_LOAD(*set_obj_ptr);
+    RUBY_ASSERT(set_obj);
+    struct concurrent_set *set = RTYPEDDATA_GET_DATA(set_obj);
+
+    struct concurrent_set_probe probe;
+    VALUE hash = set->funcs->hash(key);
+    int idx = concurrent_set_probe_start(&probe, set, hash);
+
+    while (true) {
+        struct concurrent_set_entry *entry = &set->entries[idx];
+        VALUE curr_key = RUBY_ATOMIC_VALUE_LOAD(entry->key);
+
+        switch (curr_key) {
+          case CONCURRENT_SET_EMPTY: {
+            // Not in set
+            if (!inserting) {
+                key = set->funcs->create(key, data);
+                RUBY_ASSERT(hash == set->funcs->hash(key));
+                inserting = true;
+            }
+
+            rb_atomic_t prev_size = RUBY_ATOMIC_FETCH_ADD(set->size, 1);
+
+            if (UNLIKELY(prev_size > set->capacity / 2)) {
+                concurrent_set_try_resize(set_obj, set_obj_ptr);
+
+                goto retry;
+            }
+
+            curr_key = RUBY_ATOMIC_VALUE_CAS(entry->key, CONCURRENT_SET_EMPTY, key);
+            if (curr_key == CONCURRENT_SET_EMPTY) {
+                RUBY_ATOMIC_VALUE_SET(entry->hash, hash);
+
+                RB_GC_GUARD(set_obj);
+                return key;
+            }
+            else {
+                // Entry was not inserted.
+                RUBY_ATOMIC_DEC(set->size);
+
+                // Another thread won the race, try again at the same location.
+                continue;
+            }
+          }
+          case CONCURRENT_SET_DELETED:
+            break;
+          case CONCURRENT_SET_MOVED:
+            // Wait
+            RB_VM_LOCKING();
+
+            goto retry;
+          default: {
+            VALUE curr_hash = RUBY_ATOMIC_VALUE_LOAD(entry->hash);
+            if ((curr_hash == hash || curr_hash == 0) && set->funcs->cmp(key, curr_key)) {
+                // We've found a match.
+                if (UNLIKELY(rb_objspace_garbage_object_p(curr_key))) {
+                    // This is a weakref set, so after marking but before sweeping is complete we may find a matching garbage object.
+                    // Skip it and mark it as deleted.
+                    RUBY_ATOMIC_VALUE_CAS(entry->key, curr_key, CONCURRENT_SET_DELETED);
+
+                    // Fall through and continue our search.
+                }
+                else {
+                    RB_GC_GUARD(set_obj);
+                    return curr_key;
+                }
+            }
+
+            break;
+          }
+        }
+
+        idx = concurrent_set_probe_next(&probe);
+    }
+}
+
+VALUE
+rb_concurrent_set_delete_by_identity(VALUE set_obj, VALUE key)
+{
+    // Assume locking and barrier (which there is no assert for).
+    ASSERT_vm_locking();
+
+    struct concurrent_set *set = RTYPEDDATA_GET_DATA(set_obj);
+
+    VALUE hash = set->funcs->hash(key);
+
+    struct concurrent_set_probe probe;
+    int idx = concurrent_set_probe_start(&probe, set, hash);
+
+    while (true) {
+        struct concurrent_set_entry *entry = &set->entries[idx];
+        VALUE curr_key = RUBY_ATOMIC_VALUE_LOAD(entry->key);
+
+        switch (curr_key) {
+          case CONCURRENT_SET_EMPTY:
+            // We didn't find our entry to delete.
+            return 0;
+          case CONCURRENT_SET_DELETED:
+            break;
+          case CONCURRENT_SET_MOVED:
+            rb_bug("rb_concurrent_set_delete_by_identity: moved entry");
+            break;
+          default:
+            if (key == curr_key) {
+                entry->key = CONCURRENT_SET_DELETED;
+                set->deleted_entries++;
+                return curr_key;
+            }
+            break;
+        }
+
+        idx = concurrent_set_probe_next(&probe);
+    }
+}
+
+void
+rb_concurrent_set_foreach_with_replace(VALUE set_obj, int (*callback)(VALUE *key, void *data), void *data)
+{
+    // Assume locking and barrier (which there is no assert for).
+    ASSERT_vm_locking();
+
+    struct concurrent_set *set = RTYPEDDATA_GET_DATA(set_obj);
+
+    for (unsigned int i = 0; i < set->capacity; i++) {
+        VALUE key = set->entries[i].key;
+
+        switch (key) {
+          case CONCURRENT_SET_EMPTY:
+          case CONCURRENT_SET_DELETED:
+            continue;
+          case CONCURRENT_SET_MOVED:
+            rb_bug("rb_concurrent_set_foreach_with_replace: moved entry");
+            break;
+          default: {
+            int ret = callback(&set->entries[i].key, data);
+            switch (ret) {
+              case ST_STOP:
+                return;
+              case ST_DELETE:
+                set->entries[i].key = CONCURRENT_SET_DELETED;
+                break;
+            }
+            break;
+          }
+        }
+    }
+}
diff --git a/configure.ac b/configure.ac
index 122e0617929999..7270bd5e8b9cbe 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,43 +9,51 @@ tooldir="$srcdir/tool"
 
 AC_DISABLE_OPTION_CHECKING
 
-m4_include([tool/m4/_colorize_result_prepare.m4])dnl
-m4_include([tool/m4/ac_msg_result.m4])dnl
-m4_include([tool/m4/colorize_result.m4])dnl
-m4_include([tool/m4/ruby_append_option.m4])dnl
-m4_include([tool/m4/ruby_append_options.m4])dnl
-m4_include([tool/m4/ruby_check_builtin_func.m4])dnl
-m4_include([tool/m4/ruby_check_builtin_setjmp.m4])dnl
-m4_include([tool/m4/ruby_check_printf_prefix.m4])dnl
-m4_include([tool/m4/ruby_check_setjmp.m4])dnl
-m4_include([tool/m4/ruby_check_signedness.m4])dnl
-m4_include([tool/m4/ruby_check_sizeof.m4])dnl
-m4_include([tool/m4/ruby_check_sysconf.m4])dnl
-m4_include([tool/m4/ruby_cppoutfile.m4])dnl
-m4_include([tool/m4/ruby_decl_attribute.m4])dnl
-m4_include([tool/m4/ruby_default_arch.m4])dnl
-m4_include([tool/m4/ruby_define_if.m4])dnl
-m4_include([tool/m4/ruby_defint.m4])dnl
-m4_include([tool/m4/ruby_dtrace_available.m4])dnl
-m4_include([tool/m4/ruby_dtrace_postprocess.m4])dnl
-m4_include([tool/m4/ruby_func_attribute.m4])dnl
-m4_include([tool/m4/ruby_mingw32.m4])dnl
-m4_include([tool/m4/ruby_prepend_option.m4])dnl
-m4_include([tool/m4/ruby_prog_gnu_ld.m4])dnl
-m4_include([tool/m4/ruby_prog_makedirs.m4])dnl
-m4_include([tool/m4/ruby_replace_funcs.m4])dnl
-m4_include([tool/m4/ruby_replace_type.m4])dnl
-m4_include([tool/m4/ruby_require_funcs.m4])dnl
-m4_include([tool/m4/ruby_rm_recursive.m4])dnl
-m4_include([tool/m4/ruby_setjmp_type.m4])dnl
-m4_include([tool/m4/ruby_stack_grow_direction.m4])dnl
-m4_include([tool/m4/ruby_thread.m4])dnl
-m4_include([tool/m4/ruby_try_cflags.m4])dnl
-m4_include([tool/m4/ruby_try_cxxflags.m4])dnl
-m4_include([tool/m4/ruby_try_ldflags.m4])dnl
-m4_include([tool/m4/ruby_universal_arch.m4])dnl
-m4_include([tool/m4/ruby_wasm_tools.m4])dnl
-m4_include([tool/m4/ruby_werror_flag.m4])dnl
+m4_define([RUBY_M4_INCLUDED], [])dnl
+AC_DEFUN([RUBY_M4_INCLUDE], [m4_include([tool/m4/$1])dnl
+  m4_append([RUBY_M4_INCLUDED], [ \
+	$(tooldir)/m4/$1])dnl
+])
+RUBY_M4_INCLUDE([_colorize_result_prepare.m4])dnl
+RUBY_M4_INCLUDE([ac_msg_result.m4])dnl
+RUBY_M4_INCLUDE([colorize_result.m4])dnl
+RUBY_M4_INCLUDE([ruby_append_option.m4])dnl
+RUBY_M4_INCLUDE([ruby_append_options.m4])dnl
+RUBY_M4_INCLUDE([ruby_check_builtin_func.m4])dnl
+RUBY_M4_INCLUDE([ruby_check_builtin_overflow.m4])dnl
+RUBY_M4_INCLUDE([ruby_check_builtin_setjmp.m4])dnl
+RUBY_M4_INCLUDE([ruby_check_header.m4])dnl
+RUBY_M4_INCLUDE([ruby_check_printf_prefix.m4])dnl
+RUBY_M4_INCLUDE([ruby_check_setjmp.m4])dnl
+RUBY_M4_INCLUDE([ruby_check_signedness.m4])dnl
+RUBY_M4_INCLUDE([ruby_check_sizeof.m4])dnl
+RUBY_M4_INCLUDE([ruby_check_sysconf.m4])dnl
+RUBY_M4_INCLUDE([ruby_cppoutfile.m4])dnl
+RUBY_M4_INCLUDE([ruby_decl_attribute.m4])dnl
+RUBY_M4_INCLUDE([ruby_default_arch.m4])dnl
+RUBY_M4_INCLUDE([ruby_define_if.m4])dnl
+RUBY_M4_INCLUDE([ruby_defint.m4])dnl
+RUBY_M4_INCLUDE([ruby_dtrace_available.m4])dnl
+RUBY_M4_INCLUDE([ruby_dtrace_postprocess.m4])dnl
+RUBY_M4_INCLUDE([ruby_func_attribute.m4])dnl
+RUBY_M4_INCLUDE([ruby_mingw32.m4])dnl
+RUBY_M4_INCLUDE([ruby_prepend_option.m4])dnl
+RUBY_M4_INCLUDE([ruby_prog_gnu_ld.m4])dnl
+RUBY_M4_INCLUDE([ruby_prog_makedirs.m4])dnl
+RUBY_M4_INCLUDE([ruby_replace_funcs.m4])dnl
+RUBY_M4_INCLUDE([ruby_replace_type.m4])dnl
+RUBY_M4_INCLUDE([ruby_require_funcs.m4])dnl
+RUBY_M4_INCLUDE([ruby_rm_recursive.m4])dnl
+RUBY_M4_INCLUDE([ruby_setjmp_type.m4])dnl
+RUBY_M4_INCLUDE([ruby_modular_gc.m4])dnl
+RUBY_M4_INCLUDE([ruby_stack_grow_direction.m4])dnl
+RUBY_M4_INCLUDE([ruby_thread.m4])dnl
+RUBY_M4_INCLUDE([ruby_try_cflags.m4])dnl
+RUBY_M4_INCLUDE([ruby_try_cxxflags.m4])dnl
+RUBY_M4_INCLUDE([ruby_try_ldflags.m4])dnl
+RUBY_M4_INCLUDE([ruby_universal_arch.m4])dnl
+RUBY_M4_INCLUDE([ruby_wasm_tools.m4])dnl
+RUBY_M4_INCLUDE([ruby_werror_flag.m4])dnl
 
 AS_IF([test "x${GITHUB_ACTIONS}" = xtrue],
 [AC_REQUIRE([_COLORIZE_RESULT_PREPARE])dnl
@@ -75,8 +83,10 @@ AC_ARG_WITH(baseruby,
 	[
 		AC_PATH_PROG([BASERUBY], [ruby], [false])
 	])
-# BASERUBY must be >= 2.5.0. Note that `"2.5.0" > "2.5"` is true.
-AS_IF([test "$HAVE_BASERUBY" != no -a "`RUBYOPT=- $BASERUBY --disable=gems -e 'print 42 if RUBY_VERSION > "2.5"' 2>/dev/null`" = 42], [
+AS_IF([test "$HAVE_BASERUBY" != no], [
+    RUBYOPT=- $BASERUBY --disable=gems -rerb -rfileutils -rtempfile "${tooldir}/missing-baseruby.bat" || HAVE_BASERUBY=no
+])
+AS_IF([test "${HAVE_BASERUBY:=no}" != no], [
     AS_CASE(["$build_os"], [mingw*], [
         # Can MSys shell run a command with a drive letter?
         RUBYOPT=- `cygpath -ma "$BASERUBY"` --disable=gems -e exit 2>/dev/null || HAVE_BASERUBY=no
@@ -84,12 +94,10 @@ AS_IF([test "$HAVE_BASERUBY" != no -a "`RUBYOPT=- $BASERUBY --disable=gems -e 'p
     RUBY_APPEND_OPTION(BASERUBY, "--disable=gems")
     BASERUBY_VERSION=`$BASERUBY -v`
     $BASERUBY -C "$srcdir" tool/downloader.rb -d tool -e gnu config.guess config.sub >&AS_MESSAGE_FD
-], [
-    HAVE_BASERUBY=no
 ])
 AS_IF([test "$HAVE_BASERUBY" = no], [
     AS_IF([test "$cross_compiling" = yes], [AC_MSG_ERROR([executable host ruby is required for cross-compiling])])
-    BASERUBY="echo executable host ruby is required.  use --with-baseruby option.; false"
+    BASERUBY=${tooldir}/missing-baseruby.bat
 ])
 AC_SUBST(BASERUBY)
 AC_SUBST(HAVE_BASERUBY)
@@ -141,6 +149,7 @@ dnl checks for alternative programs
 AC_CANONICAL_BUILD
 AC_CANONICAL_HOST
 AC_CANONICAL_TARGET
+AC_SUBST(config_target, $target)
 AS_CASE(["$target_cpu-$target_os"],
     [aarch64-darwin*], [
         target_cpu=arm64
@@ -199,7 +208,7 @@ AC_ARG_VAR([STRIP],    [Strip command])
 set rb_dummy ${CC}
 rb_CC=$2
 AC_DEFUN([RUBY_CHECK_PROG_FOR_CC], [
-    rb_prog=`echo "${rb_CC}" | sed "$2"`
+    rb_prog=`echo "${rb_CC}" | sed ["s:$2\([^/]*\)$:$3\1:"]`
     AC_CHECK_PROG([$1], [$rb_prog], [$rb_prog])
 ])
 AS_CASE(["/${rb_CC} "],
@@ -210,30 +219,38 @@ AS_CASE(["/${rb_CC} "],
 [*icc*],              [
     # Intel C++ has interprocedural optimizations.  It tends to come with its
     # own linker etc.
-    RUBY_CHECK_PROG_FOR_CC([AR],      [s/icc/xiar/])
-    RUBY_CHECK_PROG_FOR_CC([CXX],     [s/icc/icpc/])
-    RUBY_CHECK_PROG_FOR_CC([LD],      [s/icc/xild/])
+    RUBY_CHECK_PROG_FOR_CC([AR],      [icc], [xiar])
+    RUBY_CHECK_PROG_FOR_CC([CXX],     [icc], [icpc])
+    RUBY_CHECK_PROG_FOR_CC([LD],      [icc], [xild])
 ],
 [*gcc*],              [
     # Ditto for GCC.
-    RUBY_CHECK_PROG_FOR_CC([LD],      [s/gcc/ld/])
-    RUBY_CHECK_PROG_FOR_CC([AR],      [s/gcc/gcc-ar/])
-    RUBY_CHECK_PROG_FOR_CC([CXX],     [s/gcc/g++/])
-    RUBY_CHECK_PROG_FOR_CC([NM],      [s/gcc/gcc-nm/])
-    RUBY_CHECK_PROG_FOR_CC([RANLIB],  [s/gcc/gcc-ranlib/])
+    RUBY_CHECK_PROG_FOR_CC([LD],      [gcc], [ld])
+    RUBY_CHECK_PROG_FOR_CC([AR],      [gcc], [gcc-ar])
+    RUBY_CHECK_PROG_FOR_CC([CXX],     [gcc], [g++])
+    RUBY_CHECK_PROG_FOR_CC([NM],      [gcc], [gcc-nm])
+    RUBY_CHECK_PROG_FOR_CC([RANLIB],  [gcc], [gcc-ranlib])
 ],
 [*clang*],            [
     # Ditto for LLVM.  Note however that llvm-as is a LLVM-IR to LLVM bitcode
     # assembler that does not target your machine native binary.
-    RUBY_CHECK_PROG_FOR_CC([LD],      [s/clang/ld/]) # ... maybe try lld ?
-    RUBY_CHECK_PROG_FOR_CC([AR],      [s/clang/llvm-ar/])
-#   RUBY_CHECK_PROG_FOR_CC([AS],      [s/clang/llvm-as/])
-    RUBY_CHECK_PROG_FOR_CC([CXX],     [s/clang/clang++/])
-    RUBY_CHECK_PROG_FOR_CC([NM],      [s/clang/llvm-nm/])
-    RUBY_CHECK_PROG_FOR_CC([OBJCOPY], [s/clang/llvm-objcopy/])
-    RUBY_CHECK_PROG_FOR_CC([OBJDUMP], [s/clang/llvm-objdump/])
-    RUBY_CHECK_PROG_FOR_CC([RANLIB],  [s/clang/llvm-ranlib/])
-    RUBY_CHECK_PROG_FOR_CC([STRIP],   [s/clang/llvm-strip/])
+
+    # Xcode has its own version tools that may be incompatible with
+    # genuine LLVM tools, use the tools in the same directory.
+
+    AS_IF([$rb_CC -E -dM -xc - < /dev/null | grep -F __apple_build_version__ > /dev/null],
+          [llvm_prefix=], [llvm_prefix=llvm-])
+    # AC_PREPROC_IFELSE cannot be used before AC_USE_SYSTEM_EXTENSIONS
+
+    RUBY_CHECK_PROG_FOR_CC([LD],      [clang], [ld]) # ... maybe try lld ?
+    RUBY_CHECK_PROG_FOR_CC([AR],      [clang], [${llvm_prefix}ar])
+#   RUBY_CHECK_PROG_FOR_CC([AS],      [clang], [${llvm_prefix}as])
+    RUBY_CHECK_PROG_FOR_CC([CXX],     [clang], [clang++])
+    RUBY_CHECK_PROG_FOR_CC([NM],      [clang], [${llvm_prefix}nm])
+    RUBY_CHECK_PROG_FOR_CC([OBJCOPY], [clang], [${llvm_prefix}objcopy])
+    RUBY_CHECK_PROG_FOR_CC([OBJDUMP], [clang], [${llvm_prefix}objdump])
+    RUBY_CHECK_PROG_FOR_CC([RANLIB],  [clang], [${llvm_prefix}ranlib])
+    RUBY_CHECK_PROG_FOR_CC([STRIP],   [clang], [${llvm_prefix}strip])
 ])
 AS_UNSET(rb_CC)
 AS_UNSET(rb_dummy)
@@ -244,12 +261,6 @@ AS_CASE(["${build_os}"],
 ],
 [aix*], [
     AC_PATH_TOOL([NM], [nm], [/usr/ccs/bin/nm], [/usr/ccs/bin:$PATH])
-],
-[darwin*], [
-    # For Apple clang version 14.0.3 (clang-1403.0.22.14.1)
-    ac_cv_prog_ac_ct_AR=`$CC -print-prog-name=ar`
-    ac_cv_prog_ac_ct_LD=`$CC -print-prog-name=ld`
-    ac_cv_prog_ac_ct_NM=`$CC -print-prog-name=nm`
 ])
 AS_CASE(["${target_os}"],
 [cygwin*|msys*|mingw*|darwin*], [
@@ -277,7 +288,7 @@ AC_CHECK_TOOLS([STRIP],   [gstrip strip], [:])
 
 # nm errors with Rust's LLVM bitcode when Rust uses a newer LLVM version than nm.
 # In case we're working with llvm-nm, tell it to not worry about the bitcode.
-AS_IF([${NM} --help | grep -q 'llvm-bc'], [NM="$NM --no-llvm-bc"])
+AS_IF([${NM} --help 2>&1 | grep -q 'llvm-bc'], [NM="$NM --no-llvm-bc"])
 
 AS_IF([test ! $rb_test_CFLAGS], [AS_UNSET(CFLAGS)]); AS_UNSET(rb_test_CFLAGS)
 AS_IF([test ! $rb_test_CXXFLAGS], [AS_UNSET(CXXFLAGS)]); AS_UNSET(rb_save_CXXFLAGS)
@@ -351,7 +362,7 @@ test -z "$warnflags" ||
 AS_IF([test -z "${CFLAGS+set}"], [
     cflags=`echo " $cflags " | sed "$cflagspat;s/^ *//;s/ *$//"`
     orig_cflags="$cflags"
-    cflags="$cflags "'${optflags} ${debugflags} ${warnflags}'
+    cflags='${hardenflags} '"$cflags "'${optflags} ${debugflags} ${warnflags}'
 ])
 dnl AS_IF([test -z "${CXXFLAGS+set}"], [
 dnl     cxxflags=`echo " $cxxflags " | sed "$cflagspat;s/^ *//;s/ *$//"`
@@ -421,17 +432,25 @@ AC_SUBST(COUTFLAG)
 AC_SUBST(CSRCFLAG)
 
 AS_CASE(["$build_os"],
-  [darwin1*.*], [
+  [darwin*], [
+    # gcc 13 warns duplicate -l options, which are added by the
+    # default spec.
     # Xcode linker warns for deprecated architecture and wrongly
     # installed TBD files.
-    CC_WRAPPER=""
+    AC_MSG_CHECKING(for $CC linker warning)
+    suppress_ld_waring=no
     echo 'int main(void) {return 0;}' > conftest.c
     AS_IF([$CC -framework Foundation -o conftest conftest.c 2>&1 |
-	   grep '^ld: warning: text-based stub file' >/dev/null], [
-	CC_WRAPPER=`cd -P "${tooldir}" && pwd`/darwin-cc
-	CC="$CC_WRAPPER $CC"
+	   grep \
+	      -e '^ld: warning: ignoring duplicate libraries:' \
+	      -e '^ld: warning: text-based stub file' \
+	      -e '^ld: warning: -multiply_defined is obsolete' \
+	   >/dev/null], [
+	suppress_ld_waring=yes
     ])
     rm -fr conftest*
+    test $suppress_ld_waring = yes && warnflags="${warnflags:+${warnflags} }-Wl,-w"
+    AC_MSG_RESULT($suppress_ld_waring)
   ])
 AS_CASE(["$target_os"],
   [wasi*], [
@@ -458,8 +477,8 @@ AC_SUBST(CC_VERSION_MESSAGE, $cc_version_message)
 : ${DLDFLAGS="$LDFLAGS"}
 
 RUBY_UNIVERSAL_ARCH
-AS_IF([test "$target_cpu" != "$host_cpu" -a "$GCC" = yes -a "$cross_compiling" = no -a "${universal_binary:-no}" = no], [
-    RUBY_DEFAULT_ARCH("$target_cpu")
+AS_IF([test "$target_cpu" != "$host_cpu" -a "$GCC" = yes -a "${universal_binary:-no}" = no], [
+    RUBY_DEFAULT_ARCH($target_cpu)
 ])
 host_os=$target_os
 host_vendor=$target_vendor
@@ -472,7 +491,6 @@ AC_CACHE_CHECK([for $AR flags], [rb_cv_arflags], [
 	[rb_cv_arflags=rcD], [rb_cv_arflags=rcu])
 ])
 AC_SUBST(ARFLAGS, ["$rb_cv_arflags "])
-AC_SUBST(ASFLAGS)
 
 AS_CASE(["$target_os"],
 [cygwin*|msys*|mingw*], [
@@ -503,10 +521,10 @@ AS_CASE(["$target_os"],
     ])
     rb_cv_binary_elf=no
     : ${enable_shared=yes}
+    AS_IF([$WINDRES --version | grep LLVM > /dev/null], [USE_LLVM_WINDRES=yes], [USE_LLVM_WINDRES=no])
     ],
 [hiuxmpp*], [AC_DEFINE(__HIUX_MPP__)])    # by TOYODA Eizi <toyoda@npd.kishou.go.jp>
 
-
 AC_PROG_LN_S
 AC_PROG_MAKE_SET
 AC_PROG_INSTALL
@@ -646,9 +664,9 @@ RUBY_WERROR_FLAG([
         [enable_rpath=$enableval], [enable_rpath="$rb_cv_binary_elf"])
 
     AS_IF([test "$enable_rpath:${RPATHFLAG}" = yes:], [
-        RPATHFLAG="${rpathflag:+ ${rpathflag}%1\$-s}"
+        RPATHFLAG="${rpathflag:+${rpathflag}%1\$-s}"
     ])
-    AS_CASE([${RPATHFLAG}],[*'%1$'*],[: ${LIBPATHFLAG=' -L%1$-s'}],[: ${LIBPATHFLAG=' -L%s'}])
+    AS_CASE([${RPATHFLAG}],[*'%1$'*],[: ${LIBPATHFLAG='-L%1$-s'}],[: ${LIBPATHFLAG='-L%s'}])
 }
 
 RUBY_TRY_LDFLAGS(-fdeclspec, [fdeclspec=yes], [fdeclspec=no])
@@ -796,7 +814,7 @@ AS_IF([test "$GCC" = yes], [
 		  [fortify_source=$enableval])
     AS_IF([test "x$fortify_source" != xno], [
         RUBY_TRY_CFLAGS([$optflags -D_FORTIFY_SOURCE=2],
-                        [RUBY_APPEND_OPTION(XCFLAGS, -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2)], [],
+                        [RUBY_PREPEND_OPTION(hardenflags, -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2)], [],
                         [@%:@include <stdio.h>])
     ])
 
@@ -817,18 +835,45 @@ AS_IF([test "$GCC" = yes], [
     AC_MSG_CHECKING([for -fstack-protector])
     AC_MSG_RESULT(["$stack_protector"])
     AS_CASE(["$stack_protector"], [-*], [
-	RUBY_APPEND_OPTION(XCFLAGS, $stack_protector)
-	RUBY_APPEND_OPTION(XLDFLAGS, $stack_protector)
-	RUBY_APPEND_OPTION(LDFLAGS, $stack_protector)
+        RUBY_PREPEND_OPTION(hardenflags, $stack_protector)
+        RUBY_APPEND_OPTION(XLDFLAGS, $stack_protector)
+        RUBY_APPEND_OPTION(LDFLAGS, $stack_protector)
     ])
 
     # aarch64 branch protection
-    AS_CASE(["$target_cpu"], [aarch64], [
-	AS_FOR(option, opt, [-mbranch-protection=pac-ret -msign-return-address=all], [
-            RUBY_TRY_CFLAGS(option, [branch_protection=yes], [branch_protection=no])
-            AS_IF([test "x$branch_protection" = xyes], [
-                RUBY_APPEND_OPTION(XCFLAGS, option)
-                break
+    AS_CASE(["$target_cpu"], [aarch64|arm64], [
+        # LLVM libunwind is not actually capable of unwinding code compiled with pointer
+        # authentication unless it's built without LIBUNWIND_ENABLE_CROSS_UNWINDING (see
+        # https://github.com/llvm/llvm-project/blob/8e35c86977ce5529a9387657321ac9fefcdae5b5/libunwind/src/DwarfInstructions.hpp#L294)
+        # It seems that macOS ships LLVM compiled this way.
+        # Detect this and disable automatic insertion of pac-ret flags in that case, since we assume
+        # that reliable backtraces are more important than hardening flags.
+        AC_MSG_CHECKING([for a broken LLVM libunwind that cannot unwind code with RA signing])
+	AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
+            @%:@include <libunwind.h>
+            int foo = UNW_ECROSSRASIGNING;
+            ]])],
+            # If compilation succeeds, that means we a) had libunwind, and b) it was NOT native only
+            [rb_cv_libunwind_broken_ra_signing=yes],
+            # if compilation fails, that means we either a) do not have libunwind, or b) have it in
+            # native only mode (which is good!)
+            [rb_cv_libunwind_broken_ra_signing=no]
+        )
+        AC_MSG_RESULT(["$rb_cv_libunwind_broken_ra_signing"])
+        AS_IF([test "x$rb_cv_libunwind_broken_ra_signing" = "xno"], [
+            AS_FOR(option, opt, [-mbranch-protection=pac-ret -msign-return-address=all], [
+                # Try these flags in the _prepended_ position - i.e. we want to try building a program
+                # with CFLAGS="-mbranch-protection=pac-ret $CFLAGS". If the builder has provided different
+                # branch protection flags in CFLAGS, we don't want to overwrite those. We just want to
+                # find some branch protection flags which work if none were provided.
+                RUBY_TRY_CFLAGS_PREPEND(option, [branch_protection=yes], [branch_protection=no])
+                AS_IF([test "x$branch_protection" = xyes], [
+                    # _prepend_ the options to CFLAGS, so that user-provided flags will overwrite them.
+                    # These CFLAGS are used during the configure script to compile further test programs;
+                    # however, $harden_flags is prepended separately to CFLAGS at the end of the script.
+                    RUBY_PREPEND_OPTION(hardenflags, $opt)
+                    break
+                ])
             ])
         ])
     ])
@@ -884,9 +929,9 @@ AS_IF([test "$GCC" = yes], [
     # suppress annoying -Wstrict-overflow warnings
     RUBY_TRY_CFLAGS(-fno-strict-overflow, [RUBY_APPEND_OPTION(XCFLAGS, -fno-strict-overflow)])
 
-    test "${debugflags+set}" || {RUBY_TRY_CFLAGS(-ggdb3, [debugflags=-ggdb3])}
-    test "${debugflags+set}" || {RUBY_TRY_CFLAGS(-ggdb, [debugflags=-ggdb])}
-    test "${debugflags+set}" || {RUBY_TRY_CFLAGS(-g3, [debugflags=-g3])}
+    test "${debugflags+set}" || {RUBY_TRY_LDFLAGS(-ggdb3, [debugflags=-ggdb3])}
+    test "${debugflags+set}" || {RUBY_TRY_LDFLAGS(-ggdb, [debugflags=-ggdb])}
+    test "${debugflags+set}" || {RUBY_TRY_LDFLAGS(-g3, [debugflags=-g3])}
 ])
 test $ac_cv_prog_cc_g = yes && : ${debugflags=-g}
 
@@ -958,22 +1003,31 @@ AC_ARG_WITH(opt-dir,
 	[OPT_DIR="${OPT_DIR:+$OPT_DIR$PATH_SEPARATOR}$withval"], [])
 
 AS_IF([test "x$OPT_DIR" != x], [
+    save_IFS="$IFS" IFS="$PATH_SEPARATOR" val= PWD=
+    for dir in $OPT_DIR; do
+        test -z "$dir" && continue
+        dir=`eval $CHDIR '"$dir"' 2>/dev/null && pwd` || continue
+        val="${val:+$val$PATH_SEPARATOR}$dir"
+    done
+    IFS="$save_IFS" OPT_DIR="$val"
+    unset PWD
+    unset save_IFS
     val=`IFS="$PATH_SEPARATOR"
         for dir in $OPT_DIR; do
-            test -z "$dir" && continue
             echo x ${LIBPATHFLAG} ${RPATHFLAG} |
             sed "s/^x *//;s${IFS}"'%1\\$-s'"${IFS}${dir}/lib${IFS}g;s${IFS}%s${IFS}${dir}/lib${IFS}g"
         done | tr '\012' ' ' | sed 's/ *$//'`
     LDFLAGS="${LDFLAGS:+$LDFLAGS }$val"
     DLDFLAGS="${DLDFLAGS:+$DLDFLAGS }$val"
     LDFLAGS_OPTDIR="$val"
-    CPPFLAGS="${CPPFLAGS:+$CPPFLAGS }"`echo "$OPT_DIR" | tr "${PATH_SEPARATOR}" '\012' |
+    INCFLAGS="${INCFLAGS:+$INCFLAGS }"`echo "$OPT_DIR" | tr "${PATH_SEPARATOR}" '\012' |
         sed '/^$/d;s|^|-I|;s|$|/include|' | tr '\012' ' ' | sed 's/ *$//'`
 ])
+AC_SUBST(incflags, "$INCFLAGS")
 
 test -z "${ac_env_CFLAGS_set}" -a -n "${cflags+set}" && eval CFLAGS="\"$cflags $ARCH_FLAG\""
 test -z "${ac_env_CXXFLAGS_set}" -a -n "${cxxflags+set}" && eval CXXFLAGS="\"$cxxflags $ARCH_FLAG\""
-}
+
 
 AC_CACHE_CHECK([whether compiler has statement and declarations in expressions],
   rb_cv_have_stmt_and_decl_in_expr,
@@ -983,6 +1037,7 @@ AC_CACHE_CHECK([whether compiler has statement and declarations in expressions],
 AS_IF([test "$rb_cv_have_stmt_and_decl_in_expr" = yes], [
   AC_DEFINE(HAVE_STMT_AND_DECL_IN_EXPR)
 ])
+}
 
 [begin]_group "header and library section" && {
 AC_ARG_WITH(winnt-ver,
@@ -1039,7 +1094,6 @@ AS_CASE(["$target_os"],
 		AS_IF([test $gcc_major -eq 4 -a $gcc_minor -lt 3], [
 		    ac_cv_func___builtin_setjmp=no
 		])
-		with_setjmp_type=sigsetjmp # to hijack SIGCHLD handler
 		AC_CACHE_CHECK(for broken crypt with 8bit chars, rb_cv_broken_crypt,
 		    [AC_RUN_IFELSE([AC_LANG_SOURCE([[
 #include <stdio.h>
@@ -1087,21 +1141,23 @@ main()
 		])
 		POSTLINK=""
 		AC_CHECK_PROGS(codesign, codesign)
-		AC_CHECK_PROGS(dsymutil, dsymutil)
+		dsymutils=
+		AS_CASE("$CC_NO_WRAPPER", [gcc*-1[[3-9]]], [
+		    dsymutils=${CC_NO_WRAPPER@%:@gcc}
+		    dsymutils=dsymutil${dsymutils%-1*}
+		    dsymutils="$dsymutils-19 $dsymutils-18 $dsymutils-17"
+		])
+		AC_CHECK_PROGS(dsymutil, $dsymutils dsymutil)
 		AS_IF([test -n "$codesign"], [
-		    POSTLINK="{ test -z '\$(RUBY_CODESIGN)' || $codesign -s '\$(RUBY_CODESIGN)' -f \$@; }${POSTLINK:+; $POSTLINK}"
+		    POSTLINK="{ test -z '\$(RUBY_CODESIGN)' || $codesign -s '\$(RUBY_CODESIGN)' \$@; }${POSTLINK:+; $POSTLINK}"
 		])
 		AS_IF([test -n "$dsymutil"], [
-		    POSTLINK="$dsymutil \$@${POSTLINK:+; $POSTLINK}"
-		])
-		AS_IF([test -n "${POSTLINK}"], [
-		    LINK_SO="$LINK_SO
-\$(POSTLINK)"
+		    POSTLINK="$dsymutil \$@ 2>/dev/null${POSTLINK:+; $POSTLINK}"
 		])
 		AC_CHECK_HEADERS(crt_externs.h, [], [], [
 		    #include <crt_externs.h>
 		])
-		cleanlibs='$(TARGET_SO).dSYM'
+		cleanlibs='$(TARGET_SO:=.dSYM)'
 		],
 [solaris*], [	LIBS="-lm $LIBS"
 		ac_cv_func_vfork=no
@@ -1194,8 +1250,6 @@ main()
 		ac_cv_func_gmtime_r=yes
 		rb_cv_large_fd_select=yes
 		ac_cv_type_struct_timeval=yes
-                ac_cv_func_clock_gettime=yes
-                ac_cv_func_clock_getres=yes
 		ac_cv_func_malloc_usable_size=no
 		ac_cv_type_off_t=yes
 		ac_cv_sizeof_off_t=8
@@ -1206,7 +1260,8 @@ main()
 		ac_cv_func_tgamma=no
 		AC_CHECK_TYPE([NET_LUID], [], [],
 			      [@%:@include <winsock2.h>
-			      @%:@include <iphlpapi.h>])
+			       @%:@include <windows.h>
+			       @%:@include <iphlpapi.h>])
 		AS_IF([test x"$ac_cv_type_NET_LUID" = xyes], [
 		    AC_DEFINE(HAVE_TYPE_NET_LUID, 1)
 		])
@@ -1236,12 +1291,8 @@ main()
 		# __builtin_longjmp in ppc64* Linux does not restore
 		# the TOC register (r2), which is problematic
 		# when a global exit happens from JITted .so code.
-		AS_CASE(["$target_cpu"], [powerpc64*], [
-			ac_cv_func___builtin_setjmp=no
-		])
-		# With gcc-8's -fcf-protection, RJIT's __builtin_longjmp fails.
-		AS_CASE(["$CC $CFLAGS "], [*" -fcf-protection "*], [cf_protection=yes], [cf_protection=no])
-		AS_IF([test "$cf_protection" = yes], [
+		# __builtin_setjmp can have issues on arm64 linux (see [Bug #14480]).
+		AS_CASE(["$target_cpu"], [powerpc64*|arm64|aarch64], [
 			ac_cv_func___builtin_setjmp=no
 		])
 		],
@@ -1254,7 +1305,7 @@ main()
 [wasi*],[	LIBS="-lm -lwasi-emulated-mman -lwasi-emulated-signal -lwasi-emulated-getpid -lwasi-emulated-process-clocks $LIBS"
 		RUBY_APPEND_OPTIONS(CFLAGS, -D_WASI_EMULATED_SIGNAL -D_WASI_EMULATED_MMAN -D_WASI_EMULATED_GETPID -D_WASI_EMULATED_PROCESS_CLOCKS)
 		RUBY_APPEND_OPTIONS(CPPFLAGS, -D_WASI_EMULATED_SIGNAL -D_WASI_EMULATED_MMAN -D_WASI_EMULATED_GETPID -D_WASI_EMULATED_PROCESS_CLOCKS)
-		POSTLINK="\$(WASMOPT) --asyncify \$(wasmoptflags) --pass-arg=asyncify-ignore-imports -o \$@ \$@${POSTLINK:+; $POSTLINK}"
+		POSTLINK="\$(WASMOPT) --asyncify \$(wasmoptflags) -o \$@ \$@${POSTLINK:+; $POSTLINK}"
 		# wasi-libc's sys/socket.h is not compatible with -std=gnu99,
 		# so re-declare shutdown in include/ruby/missing.h
 		ac_cv_func_shutdown=no
@@ -1262,6 +1313,13 @@ main()
 [	LIBS="-lm $LIBS"])
 : ${ORIG_LIBS=$LIBS}
 
+AS_IF([test -n "${POSTLINK}"], [
+    # NOTE: A (part of) link commands used link shared extension libraries. If
+    # the first line of the value is empty, mkmf prepends default link steps.
+    LINK_SO="$LINK_SO
+\$(POSTLINK)"
+])
+
 AS_IF([test -n "${rb_there_is_in_fact_no_gplusplus_but_autoconf_is_cheating_us}"], [
     AC_MSG_NOTICE([Test skipped due to lack of a C++ compiler.])
 ],
@@ -1341,13 +1399,18 @@ AC_CHECK_HEADERS(syscall.h)
 AC_CHECK_HEADERS(time.h)
 AC_CHECK_HEADERS(ucontext.h)
 AC_CHECK_HEADERS(utime.h)
-AS_CASE("$target_cpu", [x64|x86_64|i[3-6]86*], [
+AC_CHECK_HEADERS(sys/epoll.h)
+AC_CHECK_HEADERS(sys/event.h)
+AC_CHECK_HEADERS(stdckdint.h)
+AC_CHECK_HEADERS(stdatomic.h)
+
+AS_CASE("$target_cpu", [x64|x86_64|[i[3-6]86*]], [
   AC_CHECK_HEADERS(x86intrin.h)
 ])
 RUBY_UNIVERSAL_CHECK_HEADER([x86_64, i386], x86intrin.h)
 
 AS_IF([test "x$with_gmp" != xno],
-  [AC_CHECK_HEADERS(gmp.h)
+  [RUBY_CHECK_HEADER(gmp.h)
    AS_IF([test "x$ac_cv_header_gmp_h" != xno],
      AC_SEARCH_LIBS([__gmpz_init], [gmp],
        [AC_DEFINE(HAVE_LIBGMP, 1)]))])
@@ -1357,6 +1420,8 @@ AC_ARG_WITH([jemalloc],
   [with_jemalloc=$withval], [with_jemalloc=no])
 AS_IF([test "x$with_jemalloc" != xno],[
   # find jemalloc header first
+  save_CPPFLAGS="${CPPFLAGS}"
+  CPPFLAGS="${INCFLAGS} ${CPPFLAGS}"
   malloc_header=
   AC_CHECK_HEADER(jemalloc/jemalloc.h, [malloc_header=jemalloc/jemalloc.h], [
     AC_CHECK_HEADER(jemalloc.h, [malloc_header=jemalloc.h])
@@ -1388,6 +1453,8 @@ AS_IF([test "x$with_jemalloc" != xno],[
       done
     done
   ])
+  CPPFLAGS="${save_CPPFLAGS}"
+  unset save_CPPFLAGS
   with_jemalloc=${rb_cv_jemalloc_library}
   AS_CASE(["$with_jemalloc"],
   [no],
@@ -1413,7 +1480,7 @@ AC_SYS_LARGEFILE
 # which is not added by AC_SYS_LARGEFILE.
 AS_IF([test x"$enable_largefile" != xno], [
   AS_CASE(["$target_os"], [solaris*], [
-    AC_MSG_CHECKING([wheather _LARGEFILE_SOURCE should be defined])
+    AC_MSG_CHECKING([whether _LARGEFILE_SOURCE should be defined])
     AS_CASE(["${ac_cv_sys_file_offset_bits}:${ac_cv_sys_large_files}"],
       ["64:"|"64:no"|"64:unknown"], [
 	# insert _LARGEFILE_SOURCE before _FILE_OFFSET_BITS line
@@ -1474,6 +1541,25 @@ RUBY_CHECK_SIZEOF(float)
 RUBY_CHECK_SIZEOF(double)
 RUBY_CHECK_SIZEOF(time_t, [long "long long"], [], [@%:@include <time.h>])
 RUBY_CHECK_SIZEOF(clock_t, [], [], [@%:@include <time.h>])
+AC_SUBST(X_BUILTIN_BINARY, yes)
+AS_IF([test "$cross_compiling" = yes],
+[dnl miniruby cannot run if cross compiling
+    X_BUILTIN_BINARY=no
+],
+[
+    AS_CASE([ac_cv_sizeof_voidp],
+    [[1-9]*], [dnl fixed value
+    ],
+    [
+        AC_CACHE_CHECK([word size], [rb_cv_word_size],
+            [for w in 4 8; do
+                AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[@%:@if SIZEOF_VOIDP != ${w}
+                @%:@error SIZEOF_VOIDP
+                @%:@endif]])], [rb_cv_word_size=${w}; break])
+            done])
+        AS_IF([test -z $rb_cv_word_size], [X_BUILTIN_BINARY=no])
+    ])
+])
 
 AC_CACHE_CHECK(packed struct attribute, rb_cv_packed_struct,
     [rb_cv_packed_struct=no
@@ -1593,7 +1679,7 @@ AS_IF([test "$rb_cv_func_weak" != x], [
    AC_DEFINE(HAVE_FUNC_WEAK)
 ])
 
-AC_CACHE_CHECK([for __attribute__((__depreacted__(msg))) in C++],
+AC_CACHE_CHECK([for __attribute__((__deprecated__(msg))) in C++],
   rb_cv_CentOS6_CXX_workaround,
   RUBY_WERROR_FLAG([
     AC_LANG_PUSH([C++])
@@ -1657,6 +1743,18 @@ AS_IF([test "$GCC" = yes], [
 		    [rb_cv_gcc_atomic_builtins=no])])
     AS_IF([test "$rb_cv_gcc_atomic_builtins" = yes], [
 	AC_DEFINE(HAVE_GCC_ATOMIC_BUILTINS)
+	AC_CACHE_CHECK([for 64bit __atomic builtins], [rb_cv_gcc_atomic_builtins_64], [
+	    AC_LINK_IFELSE([AC_LANG_PROGRAM([[@%:@include <stdint.h>
+			uint64_t atomic_var;]],
+			[[
+			    __atomic_load_n(&atomic_var, __ATOMIC_RELAXED);
+			    __atomic_store_n(&atomic_var, 0, __ATOMIC_RELAXED);
+			]])],
+			[rb_cv_gcc_atomic_builtins_64=yes],
+			[rb_cv_gcc_atomic_builtins_64=no])])
+	AS_IF([test "$rb_cv_gcc_atomic_builtins_64" = yes], [
+	    AC_DEFINE(HAVE_GCC_ATOMIC_BUILTINS_64)
+	])
     ])
 
     AC_CACHE_CHECK([for __sync builtins], [rb_cv_gcc_sync_builtins], [
@@ -1703,7 +1801,7 @@ AS_IF([test "$GCC" = yes], [
 AC_CACHE_CHECK(for exported function attribute, rb_cv_func_exported, [
 rb_cv_func_exported=no
 RUBY_WERROR_FLAG([
-for mac in '__attribute__ ((__visibility__("default")))' '__declspec(dllexport)'; do
+for mac in '__declspec(dllexport)' '__attribute__ ((__visibility__("default")))'; do
   AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[@%:@define RUBY_FUNC_EXPORTED $mac extern
     RUBY_FUNC_EXPORTED void conftest_attribute_check(void);]], [[]])],
     [rb_cv_func_exported="$mac"; break])
@@ -1729,7 +1827,7 @@ AC_CACHE_CHECK(for function name string predefined identifier,
     [AS_CASE(["$target_os"],[openbsd*],[
       rb_cv_function_name_string=__func__
      ],[
-     rb_cv_function_name_string=no
+      rb_cv_function_name_string=no
       RUBY_WERROR_FLAG([
         for func in __func__ __FUNCTION__; do
             AC_LINK_IFELSE([AC_LANG_PROGRAM([[@%:@include <stdio.h>]],
@@ -1737,7 +1835,8 @@ AC_CACHE_CHECK(for function name string predefined identifier,
             [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])
@@ -1997,6 +2096,7 @@ AC_CHECK_FUNCS(_longjmp)		# used for AC_ARG_WITH(setjmp-type)
 test x$ac_cv_func__longjmp = xno && ac_cv_func__setjmp=no
 AC_CHECK_FUNCS(arc4random_buf)
 AC_CHECK_FUNCS(atan2l atan2f)
+AC_CHECK_DECLS(atomic_signal_fence, [], [], [@%:@include <stdatomic.h>])
 AC_CHECK_FUNCS(chmod)
 AC_CHECK_FUNCS(chown)
 AC_CHECK_FUNCS(chroot)
@@ -2061,7 +2161,6 @@ AC_CHECK_FUNCS(gettimeofday)		# for making ac_cv_func_gettimeofday
 AC_CHECK_FUNCS(getuid)
 AC_CHECK_FUNCS(getuidx)
 AC_CHECK_FUNCS(gmtime_r)
-AC_CHECK_FUNCS(grantpt)
 AC_CHECK_FUNCS(initgroups)
 AC_CHECK_FUNCS(ioctl)
 AC_CHECK_FUNCS(isfinite)
@@ -2078,6 +2177,7 @@ AC_CHECK_FUNCS(lstat)
 AC_CHECK_FUNCS(lutimes)
 AC_CHECK_FUNCS(malloc_usable_size)
 AC_CHECK_FUNCS(malloc_size)
+AC_CHECK_FUNCS(malloc_trim)
 AC_CHECK_FUNCS(mblen)
 AC_CHECK_FUNCS(memalign)
 AC_CHECK_FUNCS(memset_s)
@@ -2205,10 +2305,6 @@ RUBY_CHECK_BUILTIN_FUNC(__builtin_clzl, [__builtin_clzl(0)])
 RUBY_CHECK_BUILTIN_FUNC(__builtin_clzll, [__builtin_clzll(0)])
 RUBY_CHECK_BUILTIN_FUNC(__builtin_ctz, [__builtin_ctz(0)])
 RUBY_CHECK_BUILTIN_FUNC(__builtin_ctzll, [__builtin_ctzll(0)])
-RUBY_CHECK_BUILTIN_FUNC(__builtin_add_overflow, [int x;__builtin_add_overflow(0,0,&x)])
-RUBY_CHECK_BUILTIN_FUNC(__builtin_sub_overflow, [int x;__builtin_sub_overflow(0,0,&x)])
-RUBY_CHECK_BUILTIN_FUNC(__builtin_mul_overflow, [int x;__builtin_mul_overflow(0,0,&x)])
-RUBY_CHECK_BUILTIN_FUNC(__builtin_mul_overflow_p, [__builtin_mul_overflow_p(0,0,(int)0)])
 RUBY_CHECK_BUILTIN_FUNC(__builtin_constant_p, [__builtin_constant_p(0)])
 RUBY_CHECK_BUILTIN_FUNC(__builtin_choose_expr, [
     [int x[__extension__(__builtin_choose_expr(1, 1, -1))]];
@@ -2224,26 +2320,9 @@ RUBY_CHECK_BUILTIN_FUNC(__builtin_types_compatible_p, [__builtin_types_compatibl
 RUBY_CHECK_BUILTIN_FUNC(__builtin_trap, [__builtin_trap()])
 RUBY_CHECK_BUILTIN_FUNC(__builtin_expect, [__builtin_expect(0, 0)])
 
-AS_IF([test "$rb_cv_builtin___builtin_mul_overflow" != no], [
-  AC_CACHE_CHECK(for __builtin_mul_overflow with long long arguments, rb_cv_use___builtin_mul_overflow_long_long, [
-    AC_LINK_IFELSE([AC_LANG_SOURCE([[
-#pragma clang optimize off
-
-int
-main(void)
-{
-    long long x = 0, y;
-    __builtin_mul_overflow(x, x, &y);
-
-    return 0;
-}
-]])],
-	rb_cv_use___builtin_mul_overflow_long_long=yes,
-	rb_cv_use___builtin_mul_overflow_long_long=no)])
-])
-AS_IF([test "$rb_cv_use___builtin_mul_overflow_long_long" = yes], [
-  AC_DEFINE(USE___BUILTIN_MUL_OVERFLOW_LONG_LONG, 1)
-])
+RUBY_CHECK_BUILTIN_OVERFLOW(add)
+RUBY_CHECK_BUILTIN_OVERFLOW(sub)
+RUBY_CHECK_BUILTIN_OVERFLOW(mul)
 
 AS_IF([test "$ac_cv_func_qsort_r" != no], [
   AC_CACHE_CHECK(whether qsort_r is GNU version, rb_cv_gnu_qsort_r,
@@ -2632,6 +2711,9 @@ AS_CASE([$coroutine_type], [yes|''], [
         [*86-mingw*], [
             coroutine_type=win32
         ],
+        [aarch64-mingw*], [
+            coroutine_type=arm64
+        ],
         [arm*-linux*], [
             coroutine_type=arm32
         ],
@@ -2656,6 +2738,12 @@ AS_CASE([$coroutine_type], [yes|''], [
         [aarch64-freebsd*], [
             coroutine_type=arm64
         ],
+        [powerpc64-freebsd*], [
+            coroutine_type=ppc64le
+        ],
+        [powerpc64le-freebsd*], [
+            coroutine_type=ppc64le
+        ],
         [x86_64-netbsd*], [
             coroutine_type=amd64
         ],
@@ -2674,6 +2762,9 @@ AS_CASE([$coroutine_type], [yes|''], [
         [aarch64-openbsd*], [
             coroutine_type=arm64
         ],
+        [riscv64-openbsd*], [
+            coroutine_type=riscv64
+        ],
         [*-openbsd*], [
             coroutine_type=pthread
         ],
@@ -2772,7 +2863,7 @@ AS_IF([test "$THREAD_MODEL" = pthread], [
 	    ])
     ])
 
-    AC_CACHE_CHECK([for thread-local storage sepcifier], [rb_cv_tls_specifier],
+    AC_CACHE_CHECK([for thread-local storage specifier], [rb_cv_tls_specifier],
         rb_cv_tls_specifier=none
         RUBY_WERROR_FLAG([
             for attr in \
@@ -2931,7 +3022,7 @@ AS_IF([test "x$ac_cv_func_ioctl" = xyes], [
 }
 
 [begin]_group "runtime section" && {
-dnl wheather use dln_a_out or not
+dnl whether use dln_a_out or not
 AC_ARG_WITH(dln-a-out,
 	AS_HELP_STRING([--with-dln-a-out], [dln_a_out is deprecated]),
 	[
@@ -3079,7 +3170,7 @@ AC_SUBST(EXTOBJS)
 	[darwin*], [	: ${LDSHARED='$(CC) -dynamic -bundle'}
 			: ${DLDSHARED='$(CC) -dynamiclib'}
 			: ${LDFLAGS=""}
-			: ${LIBPATHENV=DYLD_FALLBACK_LIBRARY_PATH}
+			: ${LIBPATHENV=DYLD_LIBRARY_PATH}
 			: ${PRELOADENV=DYLD_INSERT_LIBRARIES}
                         AS_IF([test x"$enable_shared" = xyes], [
                             # Resolve symbols from libruby.dylib in $(LIBS) when --enable-shared
@@ -3118,6 +3209,7 @@ AC_SUBST(EXTOBJS)
 	[hiuxmpp], [	: ${LDSHARED='$(LD) -r'}],
 	[atheos*], [	: ${LDSHARED='$(CC) -shared'}
 			rb_cv_dlopen=yes],
+	[wasi*], [	: ${LDSHARED='$(LD) -shared -Xlinker --export-dynamic'}],
 	[	: ${LDSHARED='$(LD)'}])
     AC_MSG_RESULT($rb_cv_dlopen)
 }
@@ -3282,7 +3374,6 @@ AS_IF([test x$with_valgrind != xno],
 	DLEXT=so])
 : ${SOEXT="${DLEXT}"}
 AC_SUBST(SOEXT)
-}
 
 AS_IF([test "$rb_cv_dlopen:$load_relative" = yes:yes], [
     AS_IF([test "$ac_cv_func_dladdr" = yes], [
@@ -3301,6 +3392,9 @@ AC_DEFINE_UNQUOTED(DLEXT_MAXLEN, `expr $len + 1`)
 test ".$DLEXT"  = "." || AC_DEFINE_UNQUOTED(DLEXT,  ".$DLEXT")
 AC_SUBST(DLEXT)
 
+AC_DEFINE_UNQUOTED(SOEXT, ".$SOEXT")
+}
+
 : "strip" && {
     AC_MSG_CHECKING([for $STRIP flags])
     AC_LINK_IFELSE([AC_LANG_PROGRAM], [AS_IF(
@@ -3373,7 +3467,7 @@ done
 
 BTESTRUBY='$(MINIRUBY)'
 AS_IF([test x"$cross_compiling" = xyes], [
-  test x"$MINIRUBY" = x && MINIRUBY="${RUBY-$BASERUBY} -I`$CHDIR .; pwd` "-r'$(arch)-fake'
+  test x"$MINIRUBY" = x && MINIRUBY="${RUBY-$BASERUBY} -I${ac_abs_builddir-.} "-r'$(arch)-fake'
   XRUBY_LIBDIR=`${RUBY-$BASERUBY} -rrbconfig -e ['puts RbConfig::CONFIG["libdir"]']`
   XRUBY_RUBYLIBDIR=`${RUBY-$BASERUBY} -rrbconfig -e ['puts RbConfig::CONFIG["rubylibdir"]']`
   XRUBY_RUBYHDRDIR=`${RUBY-$BASERUBY} -rrbconfig -e ['puts RbConfig::CONFIG["rubyhdrdir"]']`
@@ -3451,7 +3545,7 @@ AC_ARG_WITH(soname,
 	    ],
 	    [mingw*], [
 		RUBY_SO_NAME="${rb_cv_msvcrt}"'-$(RUBY_BASE_NAME)$(MAJOR)$(MINOR)0'
-		AS_IF([test x"${target_cpu}" != xi386], [
+		AS_IF([test x"${target_cpu}" != xi386 || test x"${rb_cv_msvcrt}" != xmsvcrt], [
 		    RUBY_SO_NAME="${target_cpu}-${RUBY_SO_NAME}"
 		])
 	    ],
@@ -3508,6 +3602,7 @@ AS_CASE("$enable_shared", [yes], [
      ])
     ])
 
+  relative_libprefix="/../${multiarch+../}${libdir_basename}"
   AS_CASE(["$target_os"],
     [sunos4*], [
 	LIBRUBY_ALIASES='$(LIBRUBY_SONAME) lib$(RUBY_SO_NAME).$(SOEXT)'
@@ -3516,7 +3611,7 @@ AS_CASE("$enable_shared", [yes], [
 	RUBY_APPEND_OPTIONS(LIBRUBY_DLDFLAGS, ['-Wl,-soname,$(LIBRUBY_SONAME)' "$LDFLAGS_OPTDIR"])
 	LIBRUBY_ALIASES='$(LIBRUBY_SONAME) lib$(RUBY_SO_NAME).$(SOEXT)'
 	AS_IF([test "$load_relative" = yes], [
-	    libprefix="'\$\${ORIGIN}/../${libdir_basename}'"
+	    libprefix="'\$\${ORIGIN}${relative_libprefix}'"
 	    LIBRUBY_RPATHFLAGS="-Wl,-rpath,${libprefix}"
 	    LIBRUBY_RELATIVE=yes
 	])
@@ -3528,7 +3623,7 @@ AS_CASE("$enable_shared", [yes], [
 	    LIBRUBY_SO="$LIBRUBY_SO.\$(TEENY)"
 	    LIBRUBY_ALIASES=''
 	], [test "$load_relative" = yes], [
-	    libprefix="'\$\$ORIGIN/../${libdir_basename}'"
+	    libprefix="'\$\$ORIGIN${relative_libprefix}'"
 	    LIBRUBY_RPATHFLAGS="-Wl,-rpath,${libprefix}"
 	    LIBRUBY_RELATIVE=yes
 	])
@@ -3552,7 +3647,7 @@ AS_CASE("$enable_shared", [yes], [
 	LIBRUBY_ALIASES='$(LIBRUBY_SONAME) lib$(RUBY_SO_NAME).$(SOEXT)'
 	RUBY_APPEND_OPTIONS(LIBRUBY_DLDFLAGS, ["${linker_flag}-h${linker_flag:+,}"'$(@F)'])
 	AS_IF([test "$load_relative" = yes], [
-	    libprefix="'\$\$ORIGIN/../${libdir_basename}'"
+	    libprefix="'\$\$ORIGIN${relative_libprefix}'"
 	    LIBRUBY_RPATHFLAGS="-R${libprefix}"
 	    LIBRUBY_RELATIVE=yes
 	], [
@@ -3569,7 +3664,7 @@ AS_CASE("$enable_shared", [yes], [
 	LIBRUBY_SONAME='$(LIBRUBY_SO)'
 	LIBRUBY_ALIASES='lib$(RUBY_INSTALL_NAME).$(SOEXT)'
 	AS_IF([test "$load_relative" = yes], [
-	    libprefix="@executable_path/../${libdir_basename}"
+	    libprefix="@executable_path${relative_libprefix}"
 	    LIBRUBY_RELATIVE=yes
 	])
 	LIBRUBY_DLDFLAGS="$LIBRUBY_DLDFLAGS -install_name ${libprefix}"'/$(LIBRUBY_SONAME)'
@@ -3617,16 +3712,16 @@ AS_CASE("$enable_shared", [yes], [
   ])
 ])
 AS_IF([test "$enable_rpath" = yes], [
-    test -z "$LIBRUBY_RPATHFLAGS" || LIBRUBY_RPATHFLAGS="$LIBRUBY_RPATHFLAGS "
-    rpathflag="${RPATHFLAG}"
-    AS_CASE(["${cross_compiling}${load_relative}"], [*yes*], [], [rpathflag="$RPATHFLAG$LIBPATHFLAG"])
+    AS_CASE(["${cross_compiling}${load_relative}"],
+        [*yes*], [rpathflag="${RPATHFLAG}"],
+        [rpathflag="$RPATHFLAG${LIBPATHFLAG:+${RPATHFLAG:+ }$LIBPATHFLAG}"])
     rpathflag=`IFS="$PATH_SEPARATOR"
         echo x "$rpathflag" |
         sed "s/^x *//;s${IFS}"'%1\\$-s'"${IFS}${libprefix}${IFS}g;s${IFS}%s${IFS}${libprefix}${IFS}g"
     `
-    LIBRUBY_RPATHFLAGS="$LIBRUBY_RPATHFLAGS${rpathflag}"
-    LIBRUBYARG_SHARED="$LIBRUBY_RPATHFLAGS $LIBRUBYARG_SHARED"
-    LIBRUBYARG_STATIC="$LIBRUBY_RPATHFLAGS $LIBRUBYARG_STATIC"
+    LIBRUBY_RPATHFLAGS="${LIBRUBY_RPATHFLAGS:+$LIBRUBY_RPATHFLAGS }${rpathflag}"
+    LIBRUBYARG_SHARED="${LIBRUBY_RPATHFLAGS:+$LIBRUBY_RPATHFLAGS }$LIBRUBYARG_SHARED"
+    LIBRUBYARG_STATIC="${LIBRUBY_RPATHFLAGS:+$LIBRUBY_RPATHFLAGS }$LIBRUBYARG_STATIC"
 ])
 AC_SUBST(LIBRUBY_RELATIVE)
 
@@ -3703,11 +3798,12 @@ AC_ARG_ENABLE(gcov,
        AS_HELP_STRING([--enable-gcov], [enable coverage measurement by gcov]),
        [gcov=yes])
 AS_IF([test x"$gcov" = xyes], [
-    CFLAGS="$CFLAGS -coverage"
+    CFLAGS="$CFLAGS -coverage -fprofile-update=atomic"
     LDFLAGS="$LDFLAGS -coverage"
 ])
 
 RUBY_SETJMP_TYPE
+RUBY_MODULAR_GC
 }
 
 [begin]_group "installation section" && {
@@ -3773,51 +3869,64 @@ AC_SUBST(INSTALL_STATIC_LIBRARY)
 [begin]_group "JIT section" && {
 AC_CHECK_PROG(RUSTC, [rustc], [rustc], [no]) dnl no ac_tool_prefix
 
-dnl check if rustc is recent enough to build YJIT (rustc >= 1.58.0)
-YJIT_RUSTC_OK=no
+dnl check if rustc is recent enough to build YJIT/ZJIT (rustc >= 1.58.0)
+JIT_RUSTC_OK=no
 AS_IF([test "$RUSTC" != "no"],
-    AC_MSG_CHECKING([whether ${RUSTC} works for YJIT])
-    YJIT_TARGET_ARCH=
+    AC_MSG_CHECKING([whether ${RUSTC} works for YJIT/ZJIT])
+    JIT_TARGET_ARCH=
     AS_CASE(["$target_cpu"],
-        [arm64|aarch64], [YJIT_TARGET_ARCH=aarch64],
-        [x86_64], [YJIT_TARGET_ARCH=x86_64],
+        [arm64|aarch64], [JIT_TARGET_ARCH=aarch64],
+        [x86_64], [JIT_TARGET_ARCH=x86_64],
     )
     dnl Fails in case rustc target doesn't match ruby target.
     dnl Can happen on Rosetta, for example.
-    AS_IF([echo "#[cfg(target_arch = \"$YJIT_TARGET_ARCH\")] fn main() { let x = 1; format!(\"{x}\"); }" |
+    AS_IF([echo "#[cfg(target_arch = \"$JIT_TARGET_ARCH\")] fn main() { let x = 1; format!(\"{x}\"); }" |
             $RUSTC - --emit asm=/dev/null 2>/dev/null],
-        [YJIT_RUSTC_OK=yes]
+        [JIT_RUSTC_OK=yes]
     )
-    AC_MSG_RESULT($YJIT_RUSTC_OK)
+    AC_MSG_RESULT($JIT_RUSTC_OK)
 )
 
-dnl check if we can build YJIT on this target platform
+dnl check if we can build YJIT/ZJIT on this target platform
 dnl we can't easily cross-compile with rustc so we don't support that
-YJIT_TARGET_OK=no
+JIT_TARGET_OK=no
 AS_IF([test "$cross_compiling" = no],
     AS_CASE(["$target_cpu-$target_os"],
         [*android*], [
-            YJIT_TARGET_OK=no
+            JIT_TARGET_OK=no
         ],
         [arm64-darwin*|aarch64-darwin*|x86_64-darwin*], [
-            YJIT_TARGET_OK=yes
+            JIT_TARGET_OK=yes
         ],
         [arm64-*linux*|aarch64-*linux*|x86_64-*linux*], [
-            YJIT_TARGET_OK=yes
+            JIT_TARGET_OK=yes
         ],
         [arm64-*bsd*|aarch64-*bsd*|x86_64-*bsd*], [
-            YJIT_TARGET_OK=yes
+            JIT_TARGET_OK=yes
         ]
     )
 )
 
+dnl build ZJIT in release mode if rustc >= 1.58.0 is present and we are on a supported platform
+AC_ARG_ENABLE(zjit,
+    AS_HELP_STRING([--enable-zjit],
+    [enable in-process JIT compiler that requires Rust build tools. enabled by default on supported platforms if rustc 1.58.0+ is available]),
+    [ZJIT_SUPPORT=$enableval],
+    [AS_CASE(["$JIT_TARGET_OK:$JIT_RUSTC_OK:$YJIT_SUPPORT"],
+        [yes:yes:no], [
+            ZJIT_SUPPORT=yes
+        ],
+        [ZJIT_SUPPORT=no]
+    )]
+)
+
 dnl build YJIT in release mode if rustc >= 1.58.0 is present and we are on a supported platform
 AC_ARG_ENABLE(yjit,
     AS_HELP_STRING([--enable-yjit],
     [enable in-process JIT compiler that requires Rust build tools. enabled by default on supported platforms if rustc 1.58.0+ is available]),
     [YJIT_SUPPORT=$enableval],
-    [AS_CASE(["$YJIT_TARGET_OK:$YJIT_RUSTC_OK"],
-        [yes:yes], [
+    [AS_CASE(["$JIT_TARGET_OK:$JIT_RUSTC_OK:$ZJIT_SUPPORT"],
+        [yes:yes:no], [
             YJIT_SUPPORT=yes
         ],
         [YJIT_SUPPORT=no]
@@ -3827,6 +3936,7 @@ AC_ARG_ENABLE(yjit,
 CARGO=
 CARGO_BUILD_ARGS=
 YJIT_LIBS=
+JIT_CARGO_SUPPORT=no
 AS_CASE(["${YJIT_SUPPORT}"],
 [yes|dev|stats|dev_nodebug], [
     AS_IF([test x"$RUSTC" = "xno"],
@@ -3835,36 +3945,26 @@ AS_CASE(["${YJIT_SUPPORT}"],
 
     AS_CASE(["${YJIT_SUPPORT}"],
     [yes], [
-	rb_rust_target_subdir=release
     ],
     [dev], [
-	rb_rust_target_subdir=debug
-	CARGO_BUILD_ARGS='--features stats,disasm'
+        rb_cargo_features='disasm,runtime_checks'
+        JIT_CARGO_SUPPORT=dev
 	AC_DEFINE(RUBY_DEBUG, 1)
     ],
     [dev_nodebug], [
-	rb_rust_target_subdir=dev_nodebug
-	CARGO_BUILD_ARGS='--profile dev_nodebug --features stats,disasm'
+        rb_cargo_features='disasm'
+        JIT_CARGO_SUPPORT=dev_nodebug
 	AC_DEFINE(YJIT_STATS, 1)
     ],
     [stats], [
-	rb_rust_target_subdir=stats
-	CARGO_BUILD_ARGS='--profile stats --features stats'
+        JIT_CARGO_SUPPORT=stats
 	AC_DEFINE(YJIT_STATS, 1)
     ])
 
-    AS_IF([test -n "${CARGO_BUILD_ARGS}"], [
-             AC_CHECK_TOOL(CARGO, [cargo], [no])
-             AS_IF([test x"$CARGO" = "xno"],
-                AC_MSG_ERROR([cargo is required. Installation instructions available at https://www.rust-lang.org/tools/install])
-             ]))
-
-    YJIT_LIBS="yjit/target/${rb_rust_target_subdir}/libyjit.a"
-    AS_CASE(["$target_os"],[openbsd*],[
-        # Link libc++abi (which requires libpthread) for _Unwind_* functions needed by yjit
-        LDFLAGS="$LDFLAGS -lpthread -lc++abi"
-    ])
+    YJIT_LIBS="target/release/libyjit.a"
+    RUST_LIB='$(YJIT_LIBS)'
     YJIT_OBJ='yjit.$(OBJEXT)'
+    JIT_OBJ='jit.$(OBJEXT)'
     AS_IF([test x"$YJIT_SUPPORT" != "xyes" ], [
         AC_DEFINE_UNQUOTED(YJIT_SUPPORT, [$YJIT_SUPPORT])
     ])
@@ -3873,65 +3973,89 @@ AS_CASE(["${YJIT_SUPPORT}"],
     AC_DEFINE(USE_YJIT, 0)
 ])
 
-dnl These variables end up in ::RbConfig::CONFIG
-AC_SUBST(YJIT_SUPPORT)dnl what flavor of YJIT the Ruby build includes
-AC_SUBST(RUSTC)dnl Rust compiler command
-AC_SUBST(CARGO)dnl Cargo command for Rust builds
-AC_SUBST(CARGO_BUILD_ARGS)dnl for selecting Rust build profiles
-AC_SUBST(YJIT_LIBS)dnl for optionally building the Rust parts of YJIT
-AC_SUBST(YJIT_OBJ)dnl for optionally building the C parts of YJIT
-
-dnl Currently, RJIT only supports Unix x86_64 platforms.
-RJIT_TARGET_OK=no
-AS_IF([test "$cross_compiling" = no],
-    AS_CASE(["$target_cpu-$target_os"],
-        [*android*], [
-            RJIT_TARGET_OK=no
-        ],
-        [x86_64-darwin*], [
-            RJIT_TARGET_OK=yes
-        ],
-        [x86_64-*linux*], [
-            RJIT_TARGET_OK=yes
-        ],
-        [x86_64-*bsd*], [
-            RJIT_TARGET_OK=yes
-        ]
+ZJIT_LIBS=
+AS_CASE(["${ZJIT_SUPPORT}"],
+[yes|dev|dev_nodebug], [
+    AS_IF([test x"$RUSTC" = "xno"],
+        AC_MSG_ERROR([rustc is required. Installation instructions available at https://www.rust-lang.org/tools/install])
     )
-)
-
-dnl Build RJIT on Unix x86_64 platforms or if --enable-rjit is specified.
-AC_ARG_ENABLE(rjit,
-    AS_HELP_STRING([--enable-rjit],
-    [enable pure-Ruby JIT compiler. enabled by default on Unix x86_64 platforms]),
-    [RJIT_SUPPORT=$enableval],
-    [AS_CASE(["$YJIT_TARGET_OK"],
-        [yes], [RJIT_SUPPORT=yes],
-        [RJIT_SUPPORT=no]
-    )]
-)
 
-AS_CASE(["$RJIT_SUPPORT"],
-[yes|dev|disasm], [
-    AS_CASE(["$RJIT_SUPPORT"],
+    AS_CASE(["${ZJIT_SUPPORT}"],
+    [yes], [
+    ],
     [dev], [
-        # Link libcapstone for --rjit-dump-disasm
-        AC_CHECK_LIB([capstone], [cs_disasm])
-
-        # Enable extra stats (vm_insns_count, ratio_in_rjit)
-        AC_DEFINE(RJIT_STATS, 1)
+        rb_cargo_features="$rb_cargo_features,disasm"
+        JIT_CARGO_SUPPORT=dev
+	AC_DEFINE(RUBY_DEBUG, 1)
     ],
-    [disasm], [
-        # Link libcapstone for --rjit-dump-disasm
-        AC_CHECK_LIB([capstone], [cs_disasm])
+    [dev_nodebug], [
+        rb_cargo_features="$rb_cargo_features,disasm"
+        JIT_CARGO_SUPPORT=dev_nodebug
     ])
 
-    AC_DEFINE(USE_RJIT, 1)
+    ZJIT_LIBS="target/release/libzjit.a"
+    RUST_LIB='$(ZJIT_LIBS)'
+    ZJIT_OBJ='zjit.$(OBJEXT)'
+    JIT_OBJ='jit.$(OBJEXT)'
+    AS_IF([test x"$ZJIT_SUPPORT" != "xyes" ], [
+        AC_DEFINE_UNQUOTED(ZJIT_SUPPORT, [$ZJIT_SUPPORT])
+    ])
+    AC_DEFINE(USE_ZJIT, 1)
 ], [
-    AC_DEFINE(USE_RJIT, 0)
+    AC_DEFINE(USE_ZJIT, 0)
 ])
 
-AC_SUBST(RJIT_SUPPORT)
+# if YJIT+ZJIT release build, or any build that requires Cargo
+AS_IF([test x"$JIT_CARGO_SUPPORT" != "xno" -o \( x"$YJIT_SUPPORT" != "xno" -a x"$ZJIT_SUPPORT" != "xno" \)], [
+    AC_CHECK_TOOL(CARGO, [cargo], [no])
+    AS_IF([test x"$CARGO" = "xno"],
+        AC_MSG_ERROR([cargo is required. Installation instructions available at https://www.rust-lang.org/tools/install]))
+
+    YJIT_LIBS=
+    ZJIT_LIBS=
+
+    AS_IF([test x"${YJIT_SUPPORT}" != x"no"], [
+        rb_cargo_features="$rb_cargo_features,yjit"
+    ])
+    AS_IF([test x"${ZJIT_SUPPORT}" != x"no"], [
+        rb_cargo_features="$rb_cargo_features,zjit"
+    ])
+    # if YJIT and ZJIT release mode
+    AS_IF([test "${YJIT_SUPPORT}:${ZJIT_SUPPORT}" = "yes:yes"], [
+        JIT_CARGO_SUPPORT=release
+    ])
+    CARGO_BUILD_ARGS="--profile ${JIT_CARGO_SUPPORT} --features ${rb_cargo_features}"
+    AS_IF([test "${JIT_CARGO_SUPPORT}" = "dev"], [
+        RUST_LIB="target/debug/libjit.a"
+    ], [
+        RUST_LIB="target/${JIT_CARGO_SUPPORT}/libjit.a"
+    ])
+])
+
+# In case either we're linking rust code
+AS_IF([test -n "$RUST_LIB"], [
+    AS_CASE(["$target_os"],[openbsd*],[
+        # Link libc++abi (which requires libpthread) for _Unwind_* functions needed by rust stdlib
+        LDFLAGS="$LDFLAGS -lpthread -lc++abi"
+    ])
+
+    # absolute path to stop the "target" dir in src dir from interfering through VPATH
+    RUST_LIB="$(pwd)/${RUST_LIB}"
+])
+
+dnl These variables end up in ::RbConfig::CONFIG
+AC_SUBST(RUSTC)dnl Rust compiler command
+AC_SUBST(CARGO)dnl Cargo command for Rust builds
+AC_SUBST(CARGO_BUILD_ARGS)dnl for selecting Rust build profiles
+AC_SUBST(YJIT_SUPPORT)dnl what flavor of YJIT the Ruby build includes
+AC_SUBST(YJIT_LIBS)dnl the .a library of YJIT
+AC_SUBST(YJIT_OBJ)dnl for optionally building the C parts of YJIT
+AC_SUBST(ZJIT_SUPPORT)dnl what flavor of ZJIT the Ruby build includes
+AC_SUBST(ZJIT_LIBS)dnl path to the .a library of ZJIT
+AC_SUBST(ZJIT_OBJ)dnl for optionally building the C parts of ZJIT
+AC_SUBST(JIT_OBJ)dnl for optionally building C glue code for Rust FFI
+AC_SUBST(RUST_LIB)dnl path to the rust .a library that contains either or both JITs
+AC_SUBST(JIT_CARGO_SUPPORT)dnl "no" or the cargo profile of the rust code
 }
 
 [begin]_group "build section" && {
@@ -3945,6 +4069,25 @@ AC_CACHE_CHECK([for prefix of external symbols], rb_cv_symbol_prefix, [
 ])
 SYMBOL_PREFIX="$rb_cv_symbol_prefix"
 test "x$SYMBOL_PREFIX" = xNONE && SYMBOL_PREFIX=''
+
+AS_IF([test x"$SOEXT" = xdll], [
+    # DLL on Windows is managed by win32/mkexports.rb
+], [test x"$enable_shared" = xyes], [
+    AC_CACHE_CHECK([for default symbols in empty shared library], rb_cv_symbols_in_emptylib, [
+        save_CC="$CC"
+        eval CC=\"`printf "%s" "${DLDSHARED}" | sed ['s/\$(CC)/${CC}/']`\"
+        AC_LINK_IFELSE([AC_LANG_PROGRAM()],[
+            rb_cv_symbols_in_emptylib=`$NM -Pgp conftest$ac_exeext |
+                sed ["/ [A-TV-Z] .*/!d;s///;s/^${SYMBOL_PREFIX}//;/^main$/d"]`
+        ])
+        set dummy ${rb_cv_symbols_in_emptylib}
+        shift
+        rb_cv_symbols_in_emptylib="$*"
+        CC="$save_CC"
+    ])
+])
+AC_SUBST(XSYMBOLS_IN_EMPTYLIB, "${rb_cv_symbols_in_emptylib}")
+
 DLNOBJ=dln.o
 AC_ARG_ENABLE(dln,
 	      AS_HELP_STRING([--disable-dln], [disable dynamic link feature]),
@@ -3959,7 +4102,8 @@ AS_CASE(["$target_os"],
 	RUBY_APPEND_OPTION(CFLAGS, -pipe)
 	],
     [darwin*], [
-	RUBY_APPEND_OPTION(CFLAGS, -pipe)
+	RUBY_TRY_CFLAGS(-pipe, [pipe_opt=yes], [pipe_opt=no])
+	AS_IF([test $pipe_opt = yes], [RUBY_APPEND_OPTION(CFLAGS, -pipe)])
         AC_MSG_CHECKING([whether Security framework is needed])
 	AC_COMPILE_IFELSE([
 	    AC_LANG_BOOL_COMPILE_TRY([
@@ -4012,6 +4156,7 @@ enum {
 	[mingw*], [
 	    AS_IF([test x"$enable_shared" = xyes], [
 		LIBRUBY_SO='$(RUBY_SO_NAME)'.dll
+		LIBRUBY_SONAME=''
 		LIBRUBY_DLDFLAGS="${LIBRUBY_DLDFLAGS}"' $(RUBYDEF)'
 	    ])
 	    EXPORT_PREFIX=' '
@@ -4152,12 +4297,13 @@ AS_IF([test "${ARCH_FLAG}"], [
 rb_cv_warnflags=`echo "$rb_cv_warnflags" | sed 's/^ *//;s/ *$//'`
 warnflags="$rb_cv_warnflags"
 AC_SUBST(cppflags)dnl
-AC_SUBST(cflags, ["${orig_cflags:+$orig_cflags }"'${optflags} ${debugflags} ${warnflags}'])dnl
+AC_SUBST(cflags, ['${hardenflags} '"${orig_cflags:+$orig_cflags }"' ${optflags} ${debugflags} ${warnflags}'])dnl
 AC_SUBST(cxxflags)dnl
 AC_SUBST(optflags)dnl
 AC_SUBST(debugflags)dnl
 AC_SUBST(warnflags)dnl
 AC_SUBST(strict_warnflags)dnl
+AC_SUBST(hardenflags)dnl
 AC_SUBST(XCFLAGS)dnl
 AC_SUBST(XLDFLAGS)dnl
 AC_SUBST(EXTLDFLAGS)dnl
@@ -4190,6 +4336,7 @@ AC_SUBST(MINIOBJS)
 AC_SUBST(THREAD_MODEL)
 AC_SUBST(COROUTINE_TYPE, ${coroutine_type})
 AC_SUBST(PLATFORM_DIR)
+AC_SUBST(USE_LLVM_WINDRES)
 
 firstmf=`echo $FIRSTMAKEFILE | sed 's/:.*//'`
 firsttmpl=`echo $FIRSTMAKEFILE | sed 's/.*://'`
@@ -4341,6 +4488,10 @@ AS_IF([test "${universal_binary-no}" = yes ], [
         arch="${target_cpu}-${target_os}"
     ])
     AC_DEFINE_UNQUOTED(RUBY_PLATFORM, "$arch")
+
+    AS_IF([test "$arch" = "s390x-linux"], [
+       AC_DEFINE_UNQUOTED(USE_MN_THREADS, 0)
+    ])
 ])
 
 unset sitearch
@@ -4438,6 +4589,17 @@ AS_IF([test x"$enable_rubygems" = xno], [
 ])
 AC_SUBST(USE_RUBYGEMS)
 
+m4_define(available_parsers, [parse.y, prism])
+AC_ARG_WITH(parser,
+    AS_HELP_STRING([--with-parser=PARSER],
+        [specify default parser; PARSER is one of ]m4_join([, ],available_parsers)),
+    [], [with_parser=prism])
+AS_CASE([$with_parser],
+m4_foreach(parser, [available_parsers],
+    parser[,][AC_DEFINE_UNQUOTED(RB_DEFAULT_PARSER, RB_DEFAULT_PARSER_[]AS_TR_CPP(parser)),])
+    [AC_MSG_ERROR([Unknown parser: $with_parser])]
+)
+
 arch_hdrdir="${EXTOUT}/include/${arch}/ruby"
 AS_MKDIR_P("${arch_hdrdir}")
 config_h="${arch_hdrdir}/config.h"
@@ -4445,7 +4607,7 @@ guard=INCLUDE_RUBY_CONFIG_H
 {
   echo "#ifndef $guard"
   echo "#define $guard 1"
-  grep -v "^#define PACKAGE_" confdefs.h
+  sed "/^@%:@define PACKAGE_/d;s/  *$//" confdefs.h
   echo "#endif /* $guard */"
 } | tr -d '\015' |
 (
@@ -4533,6 +4695,9 @@ AC_CONFIG_FILES(Makefile:template/Makefile.in, [
 	], [
 	    echo 'distclean-local::; @$(RM) GNUmakefile uncommon.mk'
 	])
+
+	echo; echo '$(srcdir)/$(CONFIGURE):RUBY_M4_INCLUDED \
+	$(empty)'
     } > $tmpmk && AS_IF([! grep '^ruby:' $tmpmk > /dev/null], [
 	AS_IF([test "${gnumake}" = yes], [
 	    tmpgmk=confgmk$$.tmp
@@ -4599,6 +4764,7 @@ config_summary "target OS"           "$target_os"
 config_summary "compiler"            "$CC"
 config_summary "with thread"         "$THREAD_MODEL"
 config_summary "with coroutine"      "$coroutine_type"
+config_summary "with modular GC"     "$modular_gc_summary"
 config_summary "enable shared libs"  "$ENABLE_SHARED"
 config_summary "dynamic library ext" "$DLEXT"
 config_summary "CFLAGS"              "$cflags"
@@ -4608,10 +4774,11 @@ config_summary "DLDFLAGS"            "$DLDFLAGS"
 config_summary "optflags"            "$optflags"
 config_summary "debugflags"          "$debugflags"
 config_summary "warnflags"           "$warnflags"
+config_summary "hardenflags"         "$hardenflags"
 config_summary "strip command"       "$STRIP"
 config_summary "install doc"         "$DOCTARGETS"
 config_summary "YJIT support"        "$YJIT_SUPPORT"
-config_summary "RJIT support"        "$RJIT_SUPPORT"
+config_summary "ZJIT support"        "$ZJIT_SUPPORT"
 config_summary "man page type"       "$MANTYPE"
 config_summary "search path"         "$search_path"
 config_summary "static-linked-ext"   ${EXTSTATIC:+"yes"}
diff --git a/cont.c b/cont.c
index db8508e724bebf..c40ed6715cbfe7 100644
--- a/cont.c
+++ b/cont.c
@@ -35,7 +35,6 @@ extern int madvise(caddr_t, size_t, int);
 #include "internal/sanitizers.h"
 #include "internal/warnings.h"
 #include "ruby/fiber/scheduler.h"
-#include "rjit.h"
 #include "yjit.h"
 #include "vm_core.h"
 #include "vm_sync.h"
@@ -71,8 +70,6 @@ static VALUE rb_cFiberPool;
 #define FIBER_POOL_ALLOCATION_FREE
 #endif
 
-#define jit_cont_enabled (rb_rjit_enabled || rb_yjit_enabled_p())
-
 enum context_type {
     CONTINUATION_CONTEXT = 0,
     FIBER_CONTEXT = 1
@@ -228,7 +225,6 @@ typedef struct rb_context_struct {
     } machine;
     rb_execution_context_t saved_ec;
     rb_jmpbuf_t jmpbuf;
-    rb_ensure_entry_t *ensure_array;
     struct rb_jit_cont *jit_cont; // Continuation contexts for JITs
 } rb_context_t;
 
@@ -277,6 +273,17 @@ struct rb_fiber_struct {
 
 static struct fiber_pool shared_fiber_pool = {NULL, NULL, 0, 0, 0, 0};
 
+void
+rb_free_shared_fiber_pool(void)
+{
+    struct fiber_pool_allocation *allocations = shared_fiber_pool.allocations;
+    while (allocations) {
+        struct fiber_pool_allocation *next = allocations->next;
+        xfree(allocations);
+        allocations = next;
+    }
+}
+
 static ID fiber_initialize_keywords[3] = {0};
 
 /*
@@ -472,18 +479,20 @@ fiber_pool_allocate_memory(size_t * count, size_t stride)
         }
 #else
         errno = 0;
-        void * base = mmap(NULL, (*count)*stride, PROT_READ | PROT_WRITE, FIBER_STACK_FLAGS, -1, 0);
+        size_t mmap_size = (*count)*stride;
+        void * base = mmap(NULL, mmap_size, PROT_READ | PROT_WRITE, FIBER_STACK_FLAGS, -1, 0);
 
         if (base == MAP_FAILED) {
             // If the allocation fails, count = count / 2, and try again.
             *count = (*count) >> 1;
         }
         else {
+            ruby_annotate_mmap(base, mmap_size, "Ruby:fiber_pool_allocate_memory");
 #if defined(MADV_FREE_REUSE)
             // On Mac MADV_FREE_REUSE is necessary for the task_info api
             // to keep the accounting accurate as possible when a page is marked as reusable
             // it can possibly not occurring at first call thus re-iterating if necessary.
-            while (madvise(base, (*count)*stride, MADV_FREE_REUSE) == -1 && errno == EAGAIN);
+            while (madvise(base, mmap_size, MADV_FREE_REUSE) == -1 && errno == EAGAIN);
 #endif
             return base;
         }
@@ -500,80 +509,87 @@ fiber_pool_allocate_memory(size_t * count, size_t stride)
 static struct fiber_pool_allocation *
 fiber_pool_expand(struct fiber_pool * fiber_pool, size_t count)
 {
-    STACK_GROW_DIR_DETECTION;
+    struct fiber_pool_allocation * allocation;
+    RB_VM_LOCK_ENTER();
+    {
+        STACK_GROW_DIR_DETECTION;
 
-    size_t size = fiber_pool->size;
-    size_t stride = size + RB_PAGE_SIZE;
+        size_t size = fiber_pool->size;
+        size_t stride = size + RB_PAGE_SIZE;
 
-    // Allocate the memory required for the stacks:
-    void * base = fiber_pool_allocate_memory(&count, stride);
+        // Allocate the memory required for the stacks:
+        void * base = fiber_pool_allocate_memory(&count, stride);
 
-    if (base == NULL) {
-        rb_raise(rb_eFiberError, "can't alloc machine stack to fiber (%"PRIuSIZE" x %"PRIuSIZE" bytes): %s", count, size, ERRNOMSG);
-    }
+        if (base == NULL) {
+            rb_raise(rb_eFiberError, "can't alloc machine stack to fiber (%"PRIuSIZE" x %"PRIuSIZE" bytes): %s", count, size, ERRNOMSG);
+        }
 
-    struct fiber_pool_vacancy * vacancies = fiber_pool->vacancies;
-    struct fiber_pool_allocation * allocation = RB_ALLOC(struct fiber_pool_allocation);
+        struct fiber_pool_vacancy * vacancies = fiber_pool->vacancies;
+        allocation = RB_ALLOC(struct fiber_pool_allocation);
 
-    // Initialize fiber pool allocation:
-    allocation->base = base;
-    allocation->size = size;
-    allocation->stride = stride;
-    allocation->count = count;
+        // Initialize fiber pool allocation:
+        allocation->base = base;
+        allocation->size = size;
+        allocation->stride = stride;
+        allocation->count = count;
 #ifdef FIBER_POOL_ALLOCATION_FREE
-    allocation->used = 0;
+        allocation->used = 0;
 #endif
-    allocation->pool = fiber_pool;
-
-    if (DEBUG) {
-        fprintf(stderr, "fiber_pool_expand(%"PRIuSIZE"): %p, %"PRIuSIZE"/%"PRIuSIZE" x [%"PRIuSIZE":%"PRIuSIZE"]\n",
-                count, (void*)fiber_pool, fiber_pool->used, fiber_pool->count, size, fiber_pool->vm_stack_size);
-    }
+        allocation->pool = fiber_pool;
 
-    // Iterate over all stacks, initializing the vacancy list:
-    for (size_t i = 0; i < count; i += 1) {
-        void * base = (char*)allocation->base + (stride * i);
-        void * page = (char*)base + STACK_DIR_UPPER(size, 0);
+        if (DEBUG) {
+            fprintf(stderr, "fiber_pool_expand(%"PRIuSIZE"): %p, %"PRIuSIZE"/%"PRIuSIZE" x [%"PRIuSIZE":%"PRIuSIZE"]\n",
+                    count, (void*)fiber_pool, fiber_pool->used, fiber_pool->count, size, fiber_pool->vm_stack_size);
+        }
 
+        // Iterate over all stacks, initializing the vacancy list:
+        for (size_t i = 0; i < count; i += 1) {
+            void * base = (char*)allocation->base + (stride * i);
+            void * page = (char*)base + STACK_DIR_UPPER(size, 0);
 #if defined(_WIN32)
-        DWORD old_protect;
+            DWORD old_protect;
 
-        if (!VirtualProtect(page, RB_PAGE_SIZE, PAGE_READWRITE | PAGE_GUARD, &old_protect)) {
-            VirtualFree(allocation->base, 0, MEM_RELEASE);
-            rb_raise(rb_eFiberError, "can't set a guard page: %s", ERRNOMSG);
-        }
+            if (!VirtualProtect(page, RB_PAGE_SIZE, PAGE_READWRITE | PAGE_GUARD, &old_protect)) {
+                VirtualFree(allocation->base, 0, MEM_RELEASE);
+                rb_raise(rb_eFiberError, "can't set a guard page: %s", ERRNOMSG);
+            }
+#elif defined(__wasi__)
+            // wasi-libc's mprotect emulation doesn't support PROT_NONE.
+            (void)page;
 #else
-        if (mprotect(page, RB_PAGE_SIZE, PROT_NONE) < 0) {
-            munmap(allocation->base, count*stride);
-            rb_raise(rb_eFiberError, "can't set a guard page: %s", ERRNOMSG);
-        }
+            if (mprotect(page, RB_PAGE_SIZE, PROT_NONE) < 0) {
+                munmap(allocation->base, count*stride);
+                rb_raise(rb_eFiberError, "can't set a guard page: %s", ERRNOMSG);
+            }
 #endif
 
-        vacancies = fiber_pool_vacancy_initialize(
-            fiber_pool, vacancies,
-            (char*)base + STACK_DIR_UPPER(0, RB_PAGE_SIZE),
-            size
-        );
+            vacancies = fiber_pool_vacancy_initialize(
+                fiber_pool, vacancies,
+                (char*)base + STACK_DIR_UPPER(0, RB_PAGE_SIZE),
+                size
+            );
 
 #ifdef FIBER_POOL_ALLOCATION_FREE
-        vacancies->stack.allocation = allocation;
+            vacancies->stack.allocation = allocation;
 #endif
-    }
+        }
 
-    // Insert the allocation into the head of the pool:
-    allocation->next = fiber_pool->allocations;
+        // Insert the allocation into the head of the pool:
+        allocation->next = fiber_pool->allocations;
 
 #ifdef FIBER_POOL_ALLOCATION_FREE
-    if (allocation->next) {
-        allocation->next->previous = allocation;
-    }
+        if (allocation->next) {
+            allocation->next->previous = allocation;
+        }
 
-    allocation->previous = NULL;
+        allocation->previous = NULL;
 #endif
 
-    fiber_pool->allocations = allocation;
-    fiber_pool->vacancies = vacancies;
-    fiber_pool->count += count;
+        fiber_pool->allocations = allocation;
+        fiber_pool->vacancies = vacancies;
+        fiber_pool->count += count;
+    }
+    RB_VM_LOCK_LEAVE();
 
     return allocation;
 }
@@ -647,41 +663,46 @@ fiber_pool_allocation_free(struct fiber_pool_allocation * allocation)
 static struct fiber_pool_stack
 fiber_pool_stack_acquire(struct fiber_pool * fiber_pool)
 {
-    struct fiber_pool_vacancy * vacancy = fiber_pool_vacancy_pop(fiber_pool);
+    struct fiber_pool_vacancy * vacancy ;
+    RB_VM_LOCK_ENTER();
+    {
+        vacancy = fiber_pool_vacancy_pop(fiber_pool);
 
-    if (DEBUG) fprintf(stderr, "fiber_pool_stack_acquire: %p used=%"PRIuSIZE"\n", (void*)fiber_pool->vacancies, fiber_pool->used);
+        if (DEBUG) fprintf(stderr, "fiber_pool_stack_acquire: %p used=%"PRIuSIZE"\n", (void*)fiber_pool->vacancies, fiber_pool->used);
 
-    if (!vacancy) {
-        const size_t maximum = FIBER_POOL_ALLOCATION_MAXIMUM_SIZE;
-        const size_t minimum = fiber_pool->initial_count;
+        if (!vacancy) {
+            const size_t maximum = FIBER_POOL_ALLOCATION_MAXIMUM_SIZE;
+            const size_t minimum = fiber_pool->initial_count;
 
-        size_t count = fiber_pool->count;
-        if (count > maximum) count = maximum;
-        if (count < minimum) count = minimum;
+            size_t count = fiber_pool->count;
+            if (count > maximum) count = maximum;
+            if (count < minimum) count = minimum;
 
-        fiber_pool_expand(fiber_pool, count);
+            fiber_pool_expand(fiber_pool, count);
 
-        // The free list should now contain some stacks:
-        VM_ASSERT(fiber_pool->vacancies);
+            // The free list should now contain some stacks:
+            VM_ASSERT(fiber_pool->vacancies);
 
-        vacancy = fiber_pool_vacancy_pop(fiber_pool);
-    }
+            vacancy = fiber_pool_vacancy_pop(fiber_pool);
+        }
 
-    VM_ASSERT(vacancy);
-    VM_ASSERT(vacancy->stack.base);
+        VM_ASSERT(vacancy);
+        VM_ASSERT(vacancy->stack.base);
 
 #if defined(COROUTINE_SANITIZE_ADDRESS)
-    __asan_unpoison_memory_region(fiber_pool_stack_poison_base(&vacancy->stack), fiber_pool_stack_poison_size(&vacancy->stack));
+        __asan_unpoison_memory_region(fiber_pool_stack_poison_base(&vacancy->stack), fiber_pool_stack_poison_size(&vacancy->stack));
 #endif
 
-    // Take the top item from the free list:
-    fiber_pool->used += 1;
+        // Take the top item from the free list:
+        fiber_pool->used += 1;
 
 #ifdef FIBER_POOL_ALLOCATION_FREE
-    vacancy->stack.allocation->used += 1;
+        vacancy->stack.allocation->used += 1;
 #endif
 
-    fiber_pool_stack_reset(&vacancy->stack);
+        fiber_pool_stack_reset(&vacancy->stack);
+    }
+    RB_VM_LOCK_LEAVE();
 
     return vacancy->stack;
 }
@@ -752,46 +773,53 @@ static void
 fiber_pool_stack_release(struct fiber_pool_stack * stack)
 {
     struct fiber_pool * pool = stack->pool;
-    struct fiber_pool_vacancy * vacancy = fiber_pool_vacancy_pointer(stack->base, stack->size);
+    RB_VM_LOCK_ENTER();
+    {
+        struct fiber_pool_vacancy * vacancy = fiber_pool_vacancy_pointer(stack->base, stack->size);
 
-    if (DEBUG) fprintf(stderr, "fiber_pool_stack_release: %p used=%"PRIuSIZE"\n", stack->base, stack->pool->used);
+        if (DEBUG) fprintf(stderr, "fiber_pool_stack_release: %p used=%"PRIuSIZE"\n", stack->base, stack->pool->used);
 
-    // Copy the stack details into the vacancy area:
-    vacancy->stack = *stack;
-    // After this point, be careful about updating/using state in stack, since it's copied to the vacancy area.
+        // Copy the stack details into the vacancy area:
+        vacancy->stack = *stack;
+        // After this point, be careful about updating/using state in stack, since it's copied to the vacancy area.
 
-    // Reset the stack pointers and reserve space for the vacancy data:
-    fiber_pool_vacancy_reset(vacancy);
+        // Reset the stack pointers and reserve space for the vacancy data:
+        fiber_pool_vacancy_reset(vacancy);
 
-    // Push the vacancy into the vancancies list:
-    pool->vacancies = fiber_pool_vacancy_push(vacancy, pool->vacancies);
-    pool->used -= 1;
+        // Push the vacancy into the vancancies list:
+        pool->vacancies = fiber_pool_vacancy_push(vacancy, pool->vacancies);
+        pool->used -= 1;
 
 #ifdef FIBER_POOL_ALLOCATION_FREE
-    struct fiber_pool_allocation * allocation = stack->allocation;
+        struct fiber_pool_allocation * allocation = stack->allocation;
 
-    allocation->used -= 1;
+        allocation->used -= 1;
 
-    // Release address space and/or dirty memory:
-    if (allocation->used == 0) {
-        fiber_pool_allocation_free(allocation);
-    }
-    else if (stack->pool->free_stacks) {
-        fiber_pool_stack_free(&vacancy->stack);
-    }
+        // Release address space and/or dirty memory:
+        if (allocation->used == 0) {
+            fiber_pool_allocation_free(allocation);
+        }
+        else if (stack->pool->free_stacks) {
+            fiber_pool_stack_free(&vacancy->stack);
+        }
 #else
-    // This is entirely optional, but clears the dirty flag from the stack
-    // memory, so it won't get swapped to disk when there is memory pressure:
-    if (stack->pool->free_stacks) {
-        fiber_pool_stack_free(&vacancy->stack);
-    }
+        // This is entirely optional, but clears the dirty flag from the stack
+        // memory, so it won't get swapped to disk when there is memory pressure:
+        if (stack->pool->free_stacks) {
+            fiber_pool_stack_free(&vacancy->stack);
+        }
 #endif
+    }
+    RB_VM_LOCK_LEAVE();
 }
 
 static inline void
 ec_switch(rb_thread_t *th, rb_fiber_t *fiber)
 {
     rb_execution_context_t *ec = &fiber->cont.saved_ec;
+#ifdef RUBY_ASAN_ENABLED
+    ec->machine.asan_fake_stack_handle = asan_get_thread_fake_stack_handle();
+#endif
     rb_ractor_set_current_ec(th->ractor, th->ec = ec);
     // ruby_current_execution_context_ptr = th->ec = ec;
 
@@ -814,6 +842,10 @@ fiber_restore_thread(rb_thread_t *th, rb_fiber_t *fiber)
     VM_ASSERT(th->ec->fiber_ptr == fiber);
 }
 
+#ifndef COROUTINE_DECL
+# define COROUTINE_DECL COROUTINE
+#endif
+NORETURN(static COROUTINE_DECL fiber_entry(struct coroutine_context * from, struct coroutine_context * to));
 static COROUTINE
 fiber_entry(struct coroutine_context * from, struct coroutine_context * to)
 {
@@ -1019,13 +1051,8 @@ cont_mark(void *ptr)
                                  cont->machine.stack + cont->machine.stack_size);
         }
         else {
-            /* fiber */
-            const rb_fiber_t *fiber = (rb_fiber_t*)cont;
-
-            if (!FIBER_TERMINATED_P(fiber)) {
-                rb_gc_mark_locations(cont->machine.stack,
-                                     cont->machine.stack + cont->machine.stack_size);
-            }
+            /* fiber machine context is marked as part of rb_execution_context_mark, no need to
+             * do anything here. */
         }
     }
 
@@ -1051,7 +1078,6 @@ cont_free(void *ptr)
 
     if (cont->type == CONTINUATION_CONTEXT) {
         ruby_xfree(cont->saved_ec.vm_stack);
-        ruby_xfree(cont->ensure_array);
         RUBY_FREE_UNLESS_NULL(cont->machine.stack);
     }
     else {
@@ -1062,10 +1088,8 @@ cont_free(void *ptr)
 
     RUBY_FREE_UNLESS_NULL(cont->saved_vm_stack.ptr);
 
-    if (jit_cont_enabled) {
-        VM_ASSERT(cont->jit_cont != NULL);
-        jit_cont_free(cont->jit_cont);
-    }
+    VM_ASSERT(cont->jit_cont != NULL);
+    jit_cont_free(cont->jit_cont);
     /* free rb_cont_t or rb_fiber_t */
     ruby_xfree(ptr);
     RUBY_FREE_LEAVE("cont");
@@ -1294,26 +1318,42 @@ rb_jit_cont_each_iseq(rb_iseq_callback callback, void *data)
         if (cont->ec->vm_stack == NULL)
             continue;
 
-        const rb_control_frame_t *cfp;
-        for (cfp = RUBY_VM_END_CONTROL_FRAME(cont->ec) - 1; ; cfp = RUBY_VM_NEXT_CONTROL_FRAME(cfp)) {
-            const rb_iseq_t *iseq;
-            if (cfp->pc && (iseq = cfp->iseq) != NULL && imemo_type((VALUE)iseq) == imemo_iseq) {
-                callback(iseq, data);
+        const rb_control_frame_t *cfp = cont->ec->cfp;
+        while (!RUBY_VM_CONTROL_FRAME_STACK_OVERFLOW_P(cont->ec, cfp)) {
+            if (cfp->pc && cfp->iseq && imemo_type((VALUE)cfp->iseq) == imemo_iseq) {
+                callback(cfp->iseq, data);
             }
+            cfp = RUBY_VM_PREVIOUS_CONTROL_FRAME(cfp);
+        }
+    }
+}
+
+#if USE_YJIT
+// Update the jit_return of all CFPs to leave_exit unless it's leave_exception or not set.
+// This prevents jit_exec_exception from jumping to the caller after invalidation.
+void
+rb_yjit_cancel_jit_return(void *leave_exit, void *leave_exception)
+{
+    struct rb_jit_cont *cont;
+    for (cont = first_jit_cont; cont != NULL; cont = cont->next) {
+        if (cont->ec->vm_stack == NULL)
+            continue;
 
-            if (cfp == cont->ec->cfp)
-                break; // reached the most recent cfp
+        const rb_control_frame_t *cfp = cont->ec->cfp;
+        while (!RUBY_VM_CONTROL_FRAME_STACK_OVERFLOW_P(cont->ec, cfp)) {
+            if (cfp->jit_return && cfp->jit_return != leave_exception) {
+                ((rb_control_frame_t *)cfp)->jit_return = leave_exit;
+            }
+            cfp = RUBY_VM_PREVIOUS_CONTROL_FRAME(cfp);
         }
     }
 }
+#endif
 
 // Finish working with jit_cont.
 void
 rb_jit_cont_finish(void)
 {
-    if (!jit_cont_enabled)
-        return;
-
     struct rb_jit_cont *cont, *next;
     for (cont = first_jit_cont; cont != NULL; cont = next) {
         next = cont->next;
@@ -1326,9 +1366,8 @@ static void
 cont_init_jit_cont(rb_context_t *cont)
 {
     VM_ASSERT(cont->jit_cont == NULL);
-    if (jit_cont_enabled) {
-        cont->jit_cont = jit_cont_new(&(cont->saved_ec));
-    }
+    // We always allocate this since YJIT may be enabled later
+    cont->jit_cont = jit_cont_new(&(cont->saved_ec));
 }
 
 struct rb_execution_context_struct *
@@ -1375,15 +1414,11 @@ rb_fiberptr_blocking(struct rb_fiber_struct *fiber)
     return fiber->blocking;
 }
 
-// Start working with jit_cont.
+// Initialize the jit_cont_lock
 void
 rb_jit_cont_init(void)
 {
-    if (!jit_cont_enabled)
-        return;
-
     rb_native_mutex_initialize(&jit_cont_lock);
-    cont_init_jit_cont(&GET_EC()->fiber_ptr->cont);
 }
 
 #if 0
@@ -1447,22 +1482,6 @@ cont_capture(volatile int *volatile stat)
     VM_ASSERT(cont->saved_ec.cfp != NULL);
     cont_save_machine_stack(th, cont);
 
-    /* backup ensure_list to array for search in another context */
-    {
-        rb_ensure_list_t *p;
-        int size = 0;
-        rb_ensure_entry_t *entry;
-        for (p=th->ec->ensure_list; p; p=p->next)
-            size++;
-        entry = cont->ensure_array = ALLOC_N(rb_ensure_entry_t,size+1);
-        for (p=th->ec->ensure_list; p; p=p->next) {
-            if (!p->entry.marker)
-                p->entry.marker = rb_ary_hidden_new(0); /* dummy object */
-            *entry++ = p->entry;
-        }
-        entry->marker = 0;
-    }
-
     if (ruby_setjmp(cont->jmpbuf)) {
         VALUE value;
 
@@ -1505,6 +1524,51 @@ cont_restore_thread(rb_context_t *cont)
             rb_raise(rb_eRuntimeError, "can't call across trace_func");
         }
 
+#if defined(__wasm__) && !defined(__EMSCRIPTEN__)
+        if (th->ec->tag != sec->tag) {
+            /* find the lowest common ancestor tag of the current EC and the saved EC */
+
+            struct rb_vm_tag *lowest_common_ancestor = NULL;
+            size_t num_tags = 0;
+            size_t num_saved_tags = 0;
+            for (struct rb_vm_tag *tag = th->ec->tag; tag != NULL; tag = tag->prev) {
+                ++num_tags;
+            }
+            for (struct rb_vm_tag *tag = sec->tag; tag != NULL; tag = tag->prev) {
+                ++num_saved_tags;
+            }
+
+            size_t min_tags = num_tags <= num_saved_tags ? num_tags : num_saved_tags;
+
+            struct rb_vm_tag *tag = th->ec->tag;
+            while (num_tags > min_tags) {
+                tag = tag->prev;
+                --num_tags;
+            }
+
+            struct rb_vm_tag *saved_tag = sec->tag;
+            while (num_saved_tags > min_tags) {
+                saved_tag = saved_tag->prev;
+                --num_saved_tags;
+            }
+
+            while (min_tags > 0) {
+                if (tag == saved_tag) {
+                    lowest_common_ancestor = tag;
+                    break;
+                }
+                tag = tag->prev;
+                saved_tag = saved_tag->prev;
+                --min_tags;
+            }
+
+            /* free all the jump buffers between the current EC's tag and the lowest common ancestor tag */
+            for (struct rb_vm_tag *tag = th->ec->tag; tag != lowest_common_ancestor; tag = tag->prev) {
+                rb_vm_tag_jmpbuf_deinit(&tag->buf);
+            }
+        }
+#endif
+
         /* copy vm stack */
 #ifdef CAPTURE_JUST_VALID_VM_STACK
         MEMCPY(th->ec->vm_stack,
@@ -1523,7 +1587,6 @@ cont_restore_thread(rb_context_t *cont)
         th->ec->tag = sec->tag;
         th->ec->root_lep = sec->root_lep;
         th->ec->root_svar = sec->root_svar;
-        th->ec->ensure_list = sec->ensure_list;
         th->ec->errinfo = sec->errinfo;
 
         VM_ASSERT(th->ec->vm_stack != NULL);
@@ -1555,11 +1618,10 @@ fiber_setcontext(rb_fiber_t *new_fiber, rb_fiber_t *old_fiber)
         }
     }
 
-    /* exchange machine_stack_start between old_fiber and new_fiber */
+    /* these values are used in rb_gc_mark_machine_context to mark the fiber's stack. */
     old_fiber->cont.saved_ec.machine.stack_start = th->ec->machine.stack_start;
+    old_fiber->cont.saved_ec.machine.stack_end = FIBER_TERMINATED_P(old_fiber) ? NULL : th->ec->machine.stack_end;
 
-    /* old_fiber->machine.stack_end should be NULL */
-    old_fiber->cont.saved_ec.machine.stack_end = NULL;
 
     // if (DEBUG) fprintf(stderr, "fiber_setcontext: %p[%p] -> %p[%p]\n", (void*)old_fiber, old_fiber->stack.base, (void*)new_fiber, new_fiber->stack.base);
 
@@ -1593,9 +1655,9 @@ cont_restore_1(rb_context_t *cont)
     cont_restore_thread(cont);
 
     /* restore machine stack */
-#if defined(_M_AMD64) && !defined(__MINGW64__)
+#if (defined(_M_AMD64) && !defined(__MINGW64__)) || defined(_M_ARM64)
     {
-        /* workaround for x64 SEH */
+        /* workaround for x64 and arm64 SEH on Windows */
         jmp_buf buf;
         setjmp(buf);
         _JUMP_BUFFER *bp = (void*)&cont->jmpbuf;
@@ -1762,6 +1824,13 @@ rb_callcc(VALUE self)
         return rb_yield(val);
     }
 }
+#ifdef RUBY_ASAN_ENABLED
+/* callcc can't possibly work with ASAN; see bug #20273. Also this function
+ * definition below avoids a "defined and not used" warning. */
+MAYBE_UNUSED(static void notusing_callcc(void)) { rb_callcc(Qnil); }
+# define rb_callcc rb_f_notimplement
+#endif
+
 
 static VALUE
 make_passing_arg(int argc, const VALUE *argv)
@@ -1780,80 +1849,6 @@ make_passing_arg(int argc, const VALUE *argv)
 
 typedef VALUE e_proc(VALUE);
 
-/* CAUTION!! : Currently, error in rollback_func is not supported  */
-/* same as rb_protect if set rollback_func to NULL */
-void
-ruby_register_rollback_func_for_ensure(e_proc *ensure_func, e_proc *rollback_func)
-{
-    st_table **table_p = &GET_VM()->ensure_rollback_table;
-    if (UNLIKELY(*table_p == NULL)) {
-        *table_p = st_init_numtable();
-    }
-    st_insert(*table_p, (st_data_t)ensure_func, (st_data_t)rollback_func);
-}
-
-static inline e_proc *
-lookup_rollback_func(e_proc *ensure_func)
-{
-    st_table *table = GET_VM()->ensure_rollback_table;
-    st_data_t val;
-    if (table && st_lookup(table, (st_data_t)ensure_func, &val))
-        return (e_proc *) val;
-    return (e_proc *) Qundef;
-}
-
-
-static inline void
-rollback_ensure_stack(VALUE self,rb_ensure_list_t *current,rb_ensure_entry_t *target)
-{
-    rb_ensure_list_t *p;
-    rb_ensure_entry_t *entry;
-    size_t i, j;
-    size_t cur_size;
-    size_t target_size;
-    size_t base_point;
-    e_proc *func;
-
-    cur_size = 0;
-    for (p=current; p; p=p->next)
-        cur_size++;
-    target_size = 0;
-    for (entry=target; entry->marker; entry++)
-        target_size++;
-
-    /* search common stack point */
-    p = current;
-    base_point = cur_size;
-    while (base_point) {
-        if (target_size >= base_point &&
-            p->entry.marker == target[target_size - base_point].marker)
-            break;
-        base_point --;
-        p = p->next;
-    }
-
-    /* rollback function check */
-    for (i=0; i < target_size - base_point; i++) {
-        if (!lookup_rollback_func(target[i].e_proc)) {
-            rb_raise(rb_eRuntimeError, "continuation called from out of critical rb_ensure scope");
-        }
-    }
-    /* pop ensure stack */
-    while (cur_size > base_point) {
-        /* escape from ensure block */
-        (*current->entry.e_proc)(current->entry.data2);
-        current = current->next;
-        cur_size--;
-    }
-    /* push ensure stack */
-    for (j = 0; j < i; j++) {
-        func = lookup_rollback_func(target[i - j - 1].e_proc);
-        if (!UNDEF_P((VALUE)func)) {
-            (*func)(target[i - j - 1].data2);
-        }
-    }
-}
-
 NORETURN(static VALUE rb_cont_call(int argc, VALUE *argv, VALUE contval));
 
 /*
@@ -1885,7 +1880,6 @@ rb_cont_call(int argc, VALUE *argv, VALUE contval)
             rb_raise(rb_eRuntimeError, "continuation called across fiber");
         }
     }
-    rollback_ensure_stack(contval, th->ec->ensure_list, cont->ensure_array);
 
     cont->argc = argc;
     cont->value = make_passing_arg(argc, argv);
@@ -1962,7 +1956,7 @@ rb_cont_call(int argc, VALUE *argv, VALUE contval)
  *  == Non-blocking Fibers
  *
  *  The concept of <em>non-blocking fiber</em> was introduced in Ruby 3.0.
- *  A non-blocking fiber, when reaching a operation that would normally block
+ *  A non-blocking fiber, when reaching an operation that would normally block
  *  the fiber (like <code>sleep</code>, or wait for another process or I/O)
  *  will yield control to other fibers and allow the <em>scheduler</em> to
  *  handle blocking and waking up (resuming) this fiber when it can proceed.
@@ -2190,7 +2184,7 @@ rb_fiber_storage_set(VALUE self, VALUE value)
 static VALUE
 rb_fiber_storage_aref(VALUE class, VALUE key)
 {
-    Check_Type(key, T_SYMBOL);
+    key = rb_to_symbol(key);
 
     VALUE storage = fiber_storage_get(fiber_current(), FALSE);
     if (storage == Qnil) return Qnil;
@@ -2211,7 +2205,7 @@ rb_fiber_storage_aref(VALUE class, VALUE key)
 static VALUE
 rb_fiber_storage_aset(VALUE class, VALUE key, VALUE value)
 {
-    Check_Type(key, T_SYMBOL);
+    key = rb_to_symbol(key);
 
     VALUE storage = fiber_storage_get(fiber_current(), value != Qnil);
     if (storage == Qnil) return Qnil;
@@ -2365,7 +2359,7 @@ rb_fiber_initialize(int argc, VALUE* argv, VALUE self)
 VALUE
 rb_fiber_new_storage(rb_block_call_func_t func, VALUE obj, VALUE storage)
 {
-    return fiber_initialize(fiber_alloc(rb_cFiber), rb_proc_new(func, obj), rb_fiber_pool_default(Qnil), 1, storage);
+    return fiber_initialize(fiber_alloc(rb_cFiber), rb_proc_new(func, obj), rb_fiber_pool_default(Qnil), 0, storage);
 }
 
 VALUE
@@ -2552,11 +2546,10 @@ rb_fiber_start(rb_fiber_t *fiber)
 void
 rb_threadptr_root_fiber_setup(rb_thread_t *th)
 {
-    rb_fiber_t *fiber = ruby_mimmalloc(sizeof(rb_fiber_t));
+    rb_fiber_t *fiber = ruby_mimcalloc(1, sizeof(rb_fiber_t));
     if (!fiber) {
         rb_bug("%s", strerror(errno)); /* ... is it possible to call rb_bug here? */
     }
-    MEMZERO(fiber, rb_fiber_t, 1);
     fiber->cont.type = FIBER_CONTEXT;
     fiber->cont.saved_ec.fiber_ptr = fiber;
     fiber->cont.saved_ec.thread_ptr = th;
@@ -2564,10 +2557,6 @@ rb_threadptr_root_fiber_setup(rb_thread_t *th)
     fiber->killed = 0;
     fiber_status_set(fiber, FIBER_RESUMED); /* skip CREATED */
     th->ec = &fiber->cont.saved_ec;
-    // When rb_threadptr_root_fiber_setup is called for the first time, rb_rjit_enabled and
-    // rb_yjit_enabled_p() are still false. So this does nothing and rb_jit_cont_init() that is
-    // called later will take care of it. However, you still have to call cont_init_jit_cont()
-    // here for other Ractors, which are not initialized by rb_jit_cont_init().
     cont_init_jit_cont(&fiber->cont);
 }
 
@@ -2578,12 +2567,12 @@ rb_threadptr_root_fiber_release(rb_thread_t *th)
         /* ignore. A root fiber object will free th->ec */
     }
     else {
-        rb_execution_context_t *ec = GET_EC();
+        rb_execution_context_t *ec = rb_current_execution_context(false);
 
         VM_ASSERT(th->ec->fiber_ptr->cont.type == FIBER_CONTEXT);
         VM_ASSERT(th->ec->fiber_ptr->cont.self == 0);
 
-        if (th->ec == ec) {
+        if (ec && th->ec == ec) {
             rb_ractor_set_current_ec(th->ractor, NULL);
         }
         fiber_free(th->ec->fiber_ptr);
@@ -3214,7 +3203,13 @@ rb_fiber_s_yield(int argc, VALUE *argv, VALUE klass)
 static VALUE
 fiber_raise(rb_fiber_t *fiber, VALUE exception)
 {
-    if (FIBER_SUSPENDED_P(fiber) && !fiber->yielding) {
+    if (fiber == fiber_current()) {
+        rb_exc_raise(exception);
+    }
+    else if (fiber->resuming_fiber) {
+        return fiber_raise(fiber->resuming_fiber, exception);
+    }
+    else if (FIBER_SUSPENDED_P(fiber) && !fiber->yielding) {
         return fiber_transfer_kw(fiber, -1, &exception, RB_NO_KEYWORDS);
     }
     else {
@@ -3250,6 +3245,10 @@ rb_fiber_raise(VALUE fiber, int argc, const VALUE *argv)
  *  the exception, and the third parameter is an array of callback information.
  *  Exceptions are caught by the +rescue+ clause of <code>begin...end</code>
  *  blocks.
+ *
+ *  Raises +FiberError+ if called on a Fiber belonging to another +Thread+.
+ *
+ *  See Kernel#raise for more information.
  */
 static VALUE
 rb_fiber_m_raise(int argc, VALUE *argv, VALUE self)
@@ -3261,12 +3260,18 @@ rb_fiber_m_raise(int argc, VALUE *argv, VALUE self)
  *  call-seq:
  *     fiber.kill -> nil
  *
- *  Terminates +fiber+ by raising an uncatchable exception, returning
- *  the terminated Fiber.
+ *  Terminates the fiber by raising an uncatchable exception.
+ *  It only terminates the given fiber and no other fiber, returning +nil+ to
+ *  another fiber if that fiber was calling #resume or #transfer.
+ *
+ *  <tt>Fiber#kill</tt> only interrupts another fiber when it is in Fiber.yield.
+ *  If called on the current fiber then it raises that exception at the <tt>Fiber#kill</tt> call site.
  *
  *  If the fiber has not been started, transition directly to the terminated state.
  *
  *  If the fiber is already terminated, does nothing.
+ *
+ *  Raises FiberError if called on a fiber belonging to another thread.
  */
 static VALUE
 rb_fiber_m_kill(VALUE self)
@@ -3282,7 +3287,8 @@ rb_fiber_m_kill(VALUE self)
     else if (fiber->status != FIBER_TERMINATED) {
         if (fiber_current() == fiber) {
             fiber_check_killed(fiber);
-        } else {
+        }
+        else {
             fiber_raise(fiber_ptr(self), Qnil);
         }
     }
@@ -3490,6 +3496,10 @@ Init_Cont(void)
     rb_define_singleton_method(rb_cFiber, "schedule", rb_fiber_s_schedule, -1);
 
 #ifdef RB_EXPERIMENTAL_FIBER_POOL
+    /*
+     * Document-class: Fiber::Pool
+     * :nodoc: experimental
+     */
     rb_cFiberPool = rb_define_class_under(rb_cFiber, "Pool", rb_cObject);
     rb_define_alloc_func(rb_cFiberPool, fiber_pool_alloc);
     rb_define_method(rb_cFiberPool, "initialize", rb_fiber_pool_initialize, -1);
diff --git a/coroutine/amd64/Context.S b/coroutine/amd64/Context.S
index 056c276a317c3c..4b94d31f30839f 100644
--- a/coroutine/amd64/Context.S
+++ b/coroutine/amd64/Context.S
@@ -5,13 +5,21 @@
 ##  Copyright, 2018, by Samuel Williams.
 ##
 
+/* Important - do _not_ include <cet.h> in this file; doing so will
+ * cause an incorrect .note.gnu.property section to be emitted. We have
+ * one at the bottom of this file */
+
 #define TOKEN_PASTE(x,y) x##y
-#define PREFIXED_SYMBOL(prefix,name) TOKEN_PASTE(prefix,name)
 
 .text
 
-.globl PREFIXED_SYMBOL(SYMBOL_PREFIX,coroutine_transfer)
-PREFIXED_SYMBOL(SYMBOL_PREFIX,coroutine_transfer):
+.globl PREFIXED_SYMBOL(coroutine_transfer)
+PREFIXED_SYMBOL(coroutine_transfer):
+
+#if defined(__CET__) && (__CET__ & 0x01) != 0
+        /* IBT landing pad */
+        endbr64
+#endif
 
 	# Make space on the stack for 6 registers:
 	subq $48, %rsp
@@ -50,3 +58,31 @@ PREFIXED_SYMBOL(SYMBOL_PREFIX,coroutine_transfer):
 #if (defined(__linux__) || defined(__FreeBSD__)) && defined(__ELF__)
 .section .note.GNU-stack,"",%progbits
 #endif
+
+#if defined(__ELF__)
+
+#if defined(__CET__) && (__CET__ & 0x01) != 0
+# define IBT_FLAG 0x01
+#else
+# define IBT_FLAG 0x00
+#endif
+
+/* We do _NOT_ support CET shadow-stack. Do _not_ add the property for
+ * this to the Context.o object. If you require CET shadow-stack support,
+ * for now, consider building with --with-coroutine=ucontext */
+#define SHSTK_FLAG 0x00
+
+.pushsection .note.gnu.property, "a"
+.p2align 3
+.long 0x4        /* Name size ("GNU\0") */
+.long 0x10       /* Descriptor size */
+.long 0x5        /* Type: NT_GNU_PROPERTY_TYPE_0 */
+.asciz "GNU"     /* Name */
+# Begin descriptor
+.long 0xc0000002 /* Property type: GNU_PROPERTY_X86_FEATURE_1_AND */
+.long 0x4        /* Property size */
+.long (IBT_FLAG | SHSTK_FLAG)
+.long 0x0        /* 8-byte alignment padding */
+/* End descriptor */
+.popsection
+#endif
diff --git a/coroutine/amd64/Context.h b/coroutine/amd64/Context.h
index 44daa4e01a8861..65aa6383044973 100644
--- a/coroutine/amd64/Context.h
+++ b/coroutine/amd64/Context.h
@@ -69,7 +69,7 @@ static inline void coroutine_initialize(
     context->stack_pointer = (void**)((uintptr_t)top & ~0xF);
 
     *--context->stack_pointer = NULL;
-    *--context->stack_pointer = (void*)start;
+    *--context->stack_pointer = (void*)(uintptr_t)start;
 
     context->stack_pointer -= COROUTINE_REGISTERS;
     memset(context->stack_pointer, 0, sizeof(void*) * COROUTINE_REGISTERS);
diff --git a/coroutine/arm32/Context.S b/coroutine/arm32/Context.S
index 1850c4c4080602..945e4f82d5d61b 100644
--- a/coroutine/arm32/Context.S
+++ b/coroutine/arm32/Context.S
@@ -6,16 +6,15 @@
 ##
 
 #define TOKEN_PASTE(x,y) x##y
-#define PREFIXED_SYMBOL(prefix,name) TOKEN_PASTE(prefix,name)
 
 .file "Context.S"
 .text
-.globl PREFIXED_SYMBOL(SYMBOL_PREFIX,coroutine_transfer)
+.globl PREFIXED_SYMBOL(coroutine_transfer)
 .align 2
-.type PREFIXED_SYMBOL(SYMBOL_PREFIX,coroutine_transfer),%function
+.type PREFIXED_SYMBOL(coroutine_transfer),%function
 .syntax unified
 
-PREFIXED_SYMBOL(SYMBOL_PREFIX,coroutine_transfer):
+PREFIXED_SYMBOL(coroutine_transfer):
 	# Save caller state (8 registers + return address)
 	push {r4-r11,lr}
 
diff --git a/coroutine/arm32/Context.h b/coroutine/arm32/Context.h
index 09410eb25dc4c4..7529dd2efc74a5 100644
--- a/coroutine/arm32/Context.h
+++ b/coroutine/arm32/Context.h
@@ -44,7 +44,7 @@ static inline void coroutine_initialize(
     char * top = (char*)stack + size;
     context->stack_pointer = (void**)((uintptr_t)top & ~0xF);
 
-    *--context->stack_pointer = (void*)start;
+    *--context->stack_pointer = (void*)(uintptr_t)start;
 
     context->stack_pointer -= COROUTINE_REGISTERS;
     memset(context->stack_pointer, 0, sizeof(void*) * COROUTINE_REGISTERS);
diff --git a/coroutine/arm64/Context.S b/coroutine/arm64/Context.S
index 07d50d30df39ee..ce219c0c4d375c 100644
--- a/coroutine/arm64/Context.S
+++ b/coroutine/arm64/Context.S
@@ -6,7 +6,6 @@
 ##
 
 #define TOKEN_PASTE(x,y) x##y
-#define PREFIXED_SYMBOL(prefix,name) TOKEN_PASTE(prefix,name)
 
 #if defined(__APPLE__)
 #define x29 fp
@@ -18,26 +17,63 @@
 .align 2
 #endif
 
-.global PREFIXED_SYMBOL(SYMBOL_PREFIX,coroutine_transfer)
-PREFIXED_SYMBOL(SYMBOL_PREFIX,coroutine_transfer):
+#if defined(__ARM_FEATURE_PAC_DEFAULT) && (__ARM_FEATURE_PAC_DEFAULT & 0x02) != 0
+# error "-mbranch-protection flag specified b-key but Context.S does not support this"
+#endif
+
+#if defined(_WIN32)
+## Add more space for certain TEB values on each stack
+#define TEB_OFFSET 0x20
+#else
+#define TEB_OFFSET 0x00
+#endif
+
+## NOTE(PAC): Use we HINT mnemonics instead of PAC mnemonics to
+## keep compatibility with those assemblers that don't support PAC.
+##
+## See "Providing protection for complex software" for more details about PAC/BTI
+## https://developer.arm.com/architectures/learn-the-architecture/providing-protection-for-complex-software
+
+.global PREFIXED_SYMBOL(coroutine_transfer)
+PREFIXED_SYMBOL(coroutine_transfer):
 
+#if defined(__ARM_FEATURE_PAC_DEFAULT) && (__ARM_FEATURE_PAC_DEFAULT != 0)
+	# paciasp (it also acts as BTI landing pad, so no need to insert BTI also)
+	hint #25
+#elif defined(__ARM_FEATURE_BTI_DEFAULT) && (__ARM_FEATURE_BTI_DEFAULT != 0)
+	# For the case PAC is not enabled but BTI is.
+	# bti c
+	hint #34
+#endif
 	# Make space on the stack for caller registers
-	sub sp, sp, 0xb0
+	sub sp, sp, 0xa0 + TEB_OFFSET
 
 	# Save caller registers
-	stp d8, d9, [sp, 0x00]
-	stp d10, d11, [sp, 0x10]
-	stp d12, d13, [sp, 0x20]
-	stp d14, d15, [sp, 0x30]
-	stp x19, x20, [sp, 0x40]
-	stp x21, x22, [sp, 0x50]
-	stp x23, x24, [sp, 0x60]
-	stp x25, x26, [sp, 0x70]
-	stp x27, x28, [sp, 0x80]
-	stp x29, x30, [sp, 0x90]
-
-	# Save return address
-	str x30, [sp, 0xa0]
+	stp d8, d9, [sp, 0x00 + TEB_OFFSET]
+	stp d10, d11, [sp, 0x10 + TEB_OFFSET]
+	stp d12, d13, [sp, 0x20 + TEB_OFFSET]
+	stp d14, d15, [sp, 0x30 + TEB_OFFSET]
+	stp x19, x20, [sp, 0x40 + TEB_OFFSET]
+	stp x21, x22, [sp, 0x50 + TEB_OFFSET]
+	stp x23, x24, [sp, 0x60 + TEB_OFFSET]
+	stp x25, x26, [sp, 0x70 + TEB_OFFSET]
+	stp x27, x28, [sp, 0x80 + TEB_OFFSET]
+	stp x29, x30, [sp, 0x90 + TEB_OFFSET]
+
+#if defined(_WIN32)
+	# Save certain values from Thread Environment Block (TEB)
+	# x18 points to the TEB on Windows
+	# Read TeStackBase and TeStackLimit at ksarm64.h from TEB
+	ldp  x5,  x6,  [x18, #0x08]
+	# Save them
+	stp  x5,  x6,  [sp, #0x00]
+	# Read TeDeallocationStack at ksarm64.h from TEB
+	ldr  x5, [x18, #0x1478]
+	# Read TeFiberData at ksarm64.h from TEB
+	ldr  x6, [x18, #0x20]
+	# Save current fiber data and deallocation stack
+	stp  x5,  x6,  [sp, #0x10]
+#endif
 
 	# Save stack pointer to x0 (first argument)
 	mov x2, sp
@@ -47,27 +83,78 @@ PREFIXED_SYMBOL(SYMBOL_PREFIX,coroutine_transfer):
 	ldr x3, [x1, 0]
 	mov sp, x3
 
+#if defined(_WIN32)
+	# Restore stack base and limit
+	ldp  x5,  x6,  [sp, #0x00]
+	# Write TeStackBase and TeStackLimit at ksarm64.h to TEB
+	stp  x5,  x6,  [x18, #0x08]
+	# Restore fiber data and deallocation stack
+	ldp  x5,  x6,  [sp, #0x10]
+	# Write TeDeallocationStack at ksarm64.h to TEB
+	str  x5, [x18, #0x1478]
+	# Write TeFiberData at ksarm64.h to TEB
+	str  x6, [x18, #0x20]
+#endif
+
 	# Restore caller registers
-	ldp d8, d9, [sp, 0x00]
-	ldp d10, d11, [sp, 0x10]
-	ldp d12, d13, [sp, 0x20]
-	ldp d14, d15, [sp, 0x30]
-	ldp x19, x20, [sp, 0x40]
-	ldp x21, x22, [sp, 0x50]
-	ldp x23, x24, [sp, 0x60]
-	ldp x25, x26, [sp, 0x70]
-	ldp x27, x28, [sp, 0x80]
-	ldp x29, x30, [sp, 0x90]
-
-	# Load return address into x4
-	ldr x4, [sp, 0xa0]
+	ldp d8, d9, [sp, 0x00 + TEB_OFFSET]
+	ldp d10, d11, [sp, 0x10 + TEB_OFFSET]
+	ldp d12, d13, [sp, 0x20 + TEB_OFFSET]
+	ldp d14, d15, [sp, 0x30 + TEB_OFFSET]
+	ldp x19, x20, [sp, 0x40 + TEB_OFFSET]
+	ldp x21, x22, [sp, 0x50 + TEB_OFFSET]
+	ldp x23, x24, [sp, 0x60 + TEB_OFFSET]
+	ldp x25, x26, [sp, 0x70 + TEB_OFFSET]
+	ldp x27, x28, [sp, 0x80 + TEB_OFFSET]
+	ldp x29, x30, [sp, 0x90 + TEB_OFFSET]
 
 	# Pop stack frame
-	add sp, sp, 0xb0
+	add sp, sp, 0xa0 + TEB_OFFSET
 
-	# Jump to return address (in x4)
-	ret x4
+#if defined(__ARM_FEATURE_PAC_DEFAULT) && (__ARM_FEATURE_PAC_DEFAULT != 0)
+	# autiasp: Authenticate x30 (LR) with SP and key A
+	hint #29
+#endif
+
+	# Jump to return address (in x30)
+	ret
 
 #if defined(__linux__) && defined(__ELF__)
 .section .note.GNU-stack,"",%progbits
 #endif
+
+#if (defined(__ARM_FEATURE_BTI_DEFAULT) && __ARM_FEATURE_BTI_DEFAULT != 0) || (defined(__ARM_FEATURE_PAC_DEFAULT) && __ARM_FEATURE_PAC_DEFAULT != 0)
+#if defined(__ELF__)
+/*  See "ELF for the Arm 64-bit Architecture (AArch64)"
+    https://github.com/ARM-software/abi-aa/blob/2023Q3/aaelf64/aaelf64.rst#program-property */
+#  define GNU_PROPERTY_AARCH64_FEATURE_1_BTI (1<<0)
+#  define GNU_PROPERTY_AARCH64_FEATURE_1_PAC (1<<1)
+
+#  if defined(__ARM_FEATURE_BTI_DEFAULT) && __ARM_FEATURE_BTI_DEFAULT != 0
+#    define BTI_FLAG GNU_PROPERTY_AARCH64_FEATURE_1_BTI
+#  else
+#    define BTI_FLAG 0
+#  endif
+#  if defined(__ARM_FEATURE_PAC_DEFAULT) && __ARM_FEATURE_PAC_DEFAULT != 0
+#    define PAC_FLAG GNU_PROPERTY_AARCH64_FEATURE_1_PAC
+#  else
+#    define PAC_FLAG 0
+#  endif
+
+  # The note section format is described by Note Section in Chapter 5
+  # of "System V Application Binary Interface, Edition 4.1".
+  .pushsection .note.gnu.property, "a"
+  .p2align 3
+  .long 0x4        /* Name size ("GNU\0") */
+  .long 0x10       /* Descriptor size */
+  .long 0x5        /* Type: NT_GNU_PROPERTY_TYPE_0 */
+  .asciz "GNU"     /* Name */
+  # Begin descriptor
+  .long 0xc0000000 /* Property type: GNU_PROPERTY_AARCH64_FEATURE_1_AND */
+  .long 0x4        /* Property size */
+  .long (BTI_FLAG|PAC_FLAG)
+  .long 0x0        /* 8-byte alignment padding */
+  # End descriptor
+  .popsection
+#endif
+#endif
diff --git a/coroutine/arm64/Context.asm b/coroutine/arm64/Context.asm
new file mode 100644
index 00000000000000..866fa628e78e88
--- /dev/null
+++ b/coroutine/arm64/Context.asm
@@ -0,0 +1,81 @@
+	TTL	coroutine/arm64/Context.asm
+
+	AREA	|.drectve|, DRECTVE
+
+	EXPORT	|coroutine_transfer|
+
+	AREA	|.text$mn|, CODE, ARM64
+
+;; Add more space for certain TEB values on each stack
+TEB_OFFSET EQU 0x20
+
+;; Incomplete implementation
+coroutine_transfer PROC
+	; Make space on the stack for caller registers
+	sub sp, sp, 0xa0 + TEB_OFFSET
+
+	; Save caller registers
+	stp d8, d9, [sp, 0x00 + TEB_OFFSET]
+	stp d10, d11, [sp, 0x10 + TEB_OFFSET]
+	stp d12, d13, [sp, 0x20 + TEB_OFFSET]
+	stp d14, d15, [sp, 0x30 + TEB_OFFSET]
+	stp x19, x20, [sp, 0x40 + TEB_OFFSET]
+	stp x21, x22, [sp, 0x50 + TEB_OFFSET]
+	stp x23, x24, [sp, 0x60 + TEB_OFFSET]
+	stp x25, x26, [sp, 0x70 + TEB_OFFSET]
+	stp x27, x28, [sp, 0x80 + TEB_OFFSET]
+	stp x29, x30, [sp, 0x90 + TEB_OFFSET]
+
+	;; Save certain values from Thread Environment Block (TEB) x18
+	;; points to the TEB on Windows
+	;; Read TeStackBase and TeStackLimit at ksarm64.h from TEB
+	ldp  x5,  x6,  [x18, #0x08]
+	;; Save them
+	stp  x5,  x6,  [sp, #0x00]
+	;; Read TeDeallocationStack at ksarm64.h from TEB
+	ldr  x5, [x18, #0x1478]
+	;; Read TeFiberData at ksarm64.h from TEB
+	ldr  x6, [x18, #0x20]
+	;; Save current fiber data and deallocation stack
+	stp  x5,  x6,  [sp, #0x10]
+
+	; Save stack pointer to x0 (first argument)
+	mov x2, sp
+	str x2, [x0, 0]
+
+	; Load stack pointer from x1 (second argument)
+	ldr x3, [x1, 0]
+	mov sp, x3
+
+	;; Restore stack base and limit
+	ldp  x5,  x6,  [sp, #0x00]
+	;; Write TeStackBase and TeStackLimit at ksarm64.h to TEB
+	stp  x5,  x6,  [x18, #0x08]
+	;; Restore fiber data and deallocation stack
+	ldp  x5,  x6,  [sp, #0x10]
+	;; Write TeDeallocationStack at ksarm64.h to TEB
+	str  x5, [x18, #0x1478]
+	;; Write TeFiberData at ksarm64.h to TEB
+	str  x6, [x18, #0x20]
+
+	; Restore caller registers
+	ldp d8, d9, [sp, 0x00 + TEB_OFFSET]
+	ldp d10, d11, [sp, 0x10 + TEB_OFFSET]
+	ldp d12, d13, [sp, 0x20 + TEB_OFFSET]
+	ldp d14, d15, [sp, 0x30 + TEB_OFFSET]
+	ldp x19, x20, [sp, 0x40 + TEB_OFFSET]
+	ldp x21, x22, [sp, 0x50 + TEB_OFFSET]
+	ldp x23, x24, [sp, 0x60 + TEB_OFFSET]
+	ldp x25, x26, [sp, 0x70 + TEB_OFFSET]
+	ldp x27, x28, [sp, 0x80 + TEB_OFFSET]
+	ldp x29, x30, [sp, 0x90 + TEB_OFFSET]
+
+	; Pop stack frame
+	add sp, sp, 0xa0 + TEB_OFFSET
+
+	; Jump to return address (in x30)
+	ret
+
+	endp
+
+	end
diff --git a/coroutine/arm64/Context.h b/coroutine/arm64/Context.h
index 1472621f480170..468e4155b2b700 100644
--- a/coroutine/arm64/Context.h
+++ b/coroutine/arm64/Context.h
@@ -15,9 +15,21 @@
 #include <stdint.h>
 #include <string.h>
 
+#if defined __GNUC__
 #define COROUTINE __attribute__((noreturn)) void
+#define COROUTINE_DECL COROUTINE
+#elif defined _MSC_VER
+#define COROUTINE __declspec(noreturn) void
+#define COROUTINE_DECL void
+#endif
+
+#if defined(_WIN32)
+#define TEB_OFFSET 0x20
+#else
+#define TEB_OFFSET 0x00
+#endif
 
-enum {COROUTINE_REGISTERS = 0xb0 / 8};
+enum {COROUTINE_REGISTERS = (0xa0 + TEB_OFFSET) / 8};
 
 #if defined(__SANITIZE_ADDRESS__)
     #define COROUTINE_SANITIZE_ADDRESS
@@ -44,12 +56,26 @@ struct coroutine_context
 #endif
 };
 
-typedef COROUTINE(* coroutine_start)(struct coroutine_context *from, struct coroutine_context *self);
+typedef COROUTINE_DECL(* coroutine_start)(struct coroutine_context *from, struct coroutine_context *self);
 
 static inline void coroutine_initialize_main(struct coroutine_context * context) {
     context->stack_pointer = NULL;
 }
 
+static inline void *ptrauth_sign_instruction_addr(void *addr, void *modifier) {
+#if defined(__ARM_FEATURE_PAC_DEFAULT) && __ARM_FEATURE_PAC_DEFAULT != 0
+    // Sign the given instruction address with the given modifier and key A
+    register void *r17 __asm("r17") = addr;
+    register void *r16 __asm("r16") = modifier;
+    // Use HINT mnemonic instead of PACIA1716 for compatibility with older assemblers.
+    __asm ("hint #8;" : "+r"(r17) : "r"(r16));
+    addr = r17;
+#else
+    // No-op if PAC is not enabled
+#endif
+    return addr;
+}
+
 static inline void coroutine_initialize(
     struct coroutine_context *context,
     coroutine_start start,
@@ -66,12 +92,21 @@ static inline void coroutine_initialize(
 
     // Stack grows down. Force 16-byte alignment.
     char * top = (char*)stack + size;
-    context->stack_pointer = (void**)((uintptr_t)top & ~0xF);
+    top = (char *)((uintptr_t)top & ~0xF);
+    context->stack_pointer = (void**)top;
 
     context->stack_pointer -= COROUTINE_REGISTERS;
     memset(context->stack_pointer, 0, sizeof(void*) * COROUTINE_REGISTERS);
 
-    context->stack_pointer[0xa0 / 8] = (void*)start;
+    void *addr = (void*)(uintptr_t)start;
+    context->stack_pointer[(0x98 + TEB_OFFSET) / 8] = ptrauth_sign_instruction_addr(addr, (void*)top);
+#if defined(_WIN32)
+    // save top address of stack as base in TEB
+    context->stack_pointer[0x00 / 8] = (char*)stack + size;
+    // save botton address of stack as limit and deallocation stack in TEB
+    context->stack_pointer[0x08 / 8] = stack;
+    context->stack_pointer[0x10 / 8] = stack;
+#endif
 }
 
 struct coroutine_context * coroutine_transfer(struct coroutine_context * current, struct coroutine_context * target);
diff --git a/coroutine/asyncify/Context.h b/coroutine/asyncify/Context.h
index 7dba829a1dfd50..71791a400492b5 100644
--- a/coroutine/asyncify/Context.h
+++ b/coroutine/asyncify/Context.h
@@ -13,6 +13,7 @@
 
 #include <stddef.h>
 #include <stdio.h>
+#include <stdint.h>
 #include "wasm/asyncify.h"
 #include "wasm/machine.h"
 #include "wasm/fiber.h"
@@ -47,10 +48,13 @@ static inline void coroutine_initialize_main(struct coroutine_context * context)
 
 static inline void coroutine_initialize(struct coroutine_context *context, coroutine_start start, void *stack, size_t size)
 {
-    if (ASYNCIFY_CORO_DEBUG) fprintf(stderr, "[%s] entry (context = %p, stack = %p ... %p)\n", __func__, context, stack, (char *)stack + size);
+    // Linear stack pointer must be always aligned down to 16 bytes.
+    // https://github.com/WebAssembly/tool-conventions/blob/c74267a5897c1bdc9aa60adeaf41816387d3cd12/BasicCABI.md#the-linear-stack
+    uintptr_t sp = ((uintptr_t)stack + size) & ~0xF;
+    if (ASYNCIFY_CORO_DEBUG) fprintf(stderr, "[%s] entry (context = %p, stack = %p ... %p)\n", __func__, context, stack, (char *)sp);
     rb_wasm_init_context(&context->fc, coroutine_trampoline, start, context);
     // record the initial stack pointer position to restore it after resumption
-    context->current_sp = (char *)stack + size;
+    context->current_sp = (char *)sp;
     context->stack_base = stack;
     context->size = size;
 }
diff --git a/coroutine/loongarch64/Context.S b/coroutine/loongarch64/Context.S
index 662f5dfb6c7af8..6e10cd032bea8d 100644
--- a/coroutine/loongarch64/Context.S
+++ b/coroutine/loongarch64/Context.S
@@ -1,11 +1,10 @@
 #define TOKEN_PASTE(x,y) x##y
-#define PREFIXED_SYMBOL(prefix,name) TOKEN_PASTE(prefix,name)
 
 .text
 .align 2
 
-.global PREFIXED_SYMBOL(SYMBOL_PREFIX,coroutine_transfer)
-PREFIXED_SYMBOL(SYMBOL_PREFIX,coroutine_transfer):
+.global PREFIXED_SYMBOL(coroutine_transfer)
+PREFIXED_SYMBOL(coroutine_transfer):
 
 	# Make space on the stack for caller registers
 	addi.d $sp, $sp, -0xa0
diff --git a/coroutine/loongarch64/Context.h b/coroutine/loongarch64/Context.h
index 668c9a965e4174..82b85b36e9e411 100644
--- a/coroutine/loongarch64/Context.h
+++ b/coroutine/loongarch64/Context.h
@@ -36,7 +36,7 @@ static inline void coroutine_initialize(
     context->stack_pointer -= COROUTINE_REGISTERS;
     memset(context->stack_pointer, 0, sizeof(void*) * COROUTINE_REGISTERS);
 
-    context->stack_pointer[0x90 / 8] = (void*)start;
+    context->stack_pointer[0x90 / 8] = (void*)(uintptr_t)start;
 }
 
 struct coroutine_context * coroutine_transfer(struct coroutine_context * current, struct coroutine_context * target);
diff --git a/coroutine/ppc/Context.S b/coroutine/ppc/Context.S
index cdda93e1797c15..f44b2419b4dfee 100644
--- a/coroutine/ppc/Context.S
+++ b/coroutine/ppc/Context.S
@@ -3,21 +3,20 @@
 ; Some relevant examples: https://github.com/gcc-mirror/gcc/blob/master/libphobos/libdruntime/config/powerpc/switchcontext.S
 ; https://github.com/gcc-mirror/gcc/blob/master/libgcc/config/rs6000/darwin-gpsave.S
 ; https://www.ibm.com/docs/en/aix/7.2?topic=epilogs-saving-gprs-only
-; ppc32 version may be re-written compactly with stmw/lwm, but the code wonʼt be faster, see: https://github.com/ruby/ruby/pull/5927#issuecomment-1139730541
+; ppc32 version may be re-written compactly with stmw/lwm, but the code won't be faster, see: https://github.com/ruby/ruby/pull/5927#issuecomment-1139730541
 
 ; Notice that this code is only for Darwin (macOS). Darwin ABI differs from AIX and ELF.
 ; To add support for AIX, *BSD or *Linux, please make separate implementations.
 
 #define TOKEN_PASTE(x,y) x##y
-#define PREFIXED_SYMBOL(prefix,name) TOKEN_PASTE(prefix,name)
 
 .machine ppc7400 ; = G4, Rosetta
 .text
 
-.globl PREFIXED_SYMBOL(SYMBOL_PREFIX,coroutine_transfer)
+.globl PREFIXED_SYMBOL(coroutine_transfer)
 .align 2
 
-PREFIXED_SYMBOL(SYMBOL_PREFIX,coroutine_transfer):
+PREFIXED_SYMBOL(coroutine_transfer):
 	; Make space on the stack for caller registers
 	; (Should we rather use red zone? See libphobos example.)
 	subi r1,r1,80
diff --git a/coroutine/ppc/Context.h b/coroutine/ppc/Context.h
index 1fce1125794500..8035d08556d77d 100644
--- a/coroutine/ppc/Context.h
+++ b/coroutine/ppc/Context.h
@@ -13,7 +13,7 @@
 
 enum {
   COROUTINE_REGISTERS =
-  20  /* 19 general purpose registers (r13–r31) and 1 return address */
+  20  /* 19 general purpose registers (r13-r31) and 1 return address */
   + 4  /* space for fiber_entry() to store the link register */
 };
 
diff --git a/coroutine/ppc64/Context.S b/coroutine/ppc64/Context.S
index f8561e0e7d0bee..20a47c61c6914e 100644
--- a/coroutine/ppc64/Context.S
+++ b/coroutine/ppc64/Context.S
@@ -8,15 +8,14 @@
 ; To add support for AIX, *BSD or *Linux, please make separate implementations.
 
 #define TOKEN_PASTE(x,y) x##y
-#define PREFIXED_SYMBOL(prefix,name) TOKEN_PASTE(prefix,name)
 
 .machine ppc64 ; = G5
 .text
 
-.globl PREFIXED_SYMBOL(SYMBOL_PREFIX,coroutine_transfer)
+.globl PREFIXED_SYMBOL(coroutine_transfer)
 .align 2
 
-PREFIXED_SYMBOL(SYMBOL_PREFIX,coroutine_transfer):
+PREFIXED_SYMBOL(coroutine_transfer):
 	; Make space on the stack for caller registers
 	; (Should we rather use red zone? See libphobos example.)
 	subi r1,r1,160
diff --git a/coroutine/ppc64/Context.h b/coroutine/ppc64/Context.h
index 3e6f77f55af182..085b475ed58563 100644
--- a/coroutine/ppc64/Context.h
+++ b/coroutine/ppc64/Context.h
@@ -12,7 +12,7 @@
 
 enum {
   COROUTINE_REGISTERS =
-  20  /* 19 general purpose registers (r13–r31) and 1 return address */
+  20  /* 19 general purpose registers (r13-r31) and 1 return address */
   + 4  /* space for fiber_entry() to store the link register */
 };
 
diff --git a/coroutine/ppc64le/Context.S b/coroutine/ppc64le/Context.S
index 61be9efcf0461a..f7bcae2c3af400 100644
--- a/coroutine/ppc64le/Context.S
+++ b/coroutine/ppc64le/Context.S
@@ -1,14 +1,13 @@
 #define TOKEN_PASTE(x,y) x##y
-#define PREFIXED_SYMBOL(prefix,name) TOKEN_PASTE(prefix,name)
 
 .text
 .align 2
 
-.globl PREFIXED_SYMBOL(SYMBOL_PREFIX,coroutine_transfer)
-.type   PREFIXED_SYMBOL(SYMBOL_PREFIX,coroutine_transfer), @function
-PREFIXED_SYMBOL(SYMBOL_PREFIX,coroutine_transfer):
+.globl PREFIXED_SYMBOL(coroutine_transfer)
+.type   PREFIXED_SYMBOL(coroutine_transfer), @function
+PREFIXED_SYMBOL(coroutine_transfer):
 	# Make space on the stack for caller registers
-	addi 1,1,-152
+	addi 1,1,-160
 
 	# Save caller registers
 	std 14,0(1)
@@ -34,6 +33,10 @@ PREFIXED_SYMBOL(SYMBOL_PREFIX,coroutine_transfer):
 	mflr 0
 	std 0,144(1)
 
+        # Save caller special register
+        mfcr 0
+        std 0, 152(1)
+
 	# Save stack pointer to first argument
 	std 1,0(3)
 
@@ -64,8 +67,14 @@ PREFIXED_SYMBOL(SYMBOL_PREFIX,coroutine_transfer):
 	ld 0,144(1)
 	mtlr 0
 
+        # Load special registers
+        ld 0,152(1)
+        # Restore cr register cr2, cr3 and cr4 (field index 3,4,5)
+        # (field index is 1-based, field 1 = cr0) using a mask (32|16|8 = 56)
+        mtcrf 56,0
+
 	# Pop stack frame
-	addi 1,1,152
+	addi 1,1,160
 
 	# Jump to return address
 	blr
diff --git a/coroutine/ppc64le/Context.h b/coroutine/ppc64le/Context.h
index fbfaa2ee63fcca..63ea9f19ff96e7 100644
--- a/coroutine/ppc64le/Context.h
+++ b/coroutine/ppc64le/Context.h
@@ -12,7 +12,7 @@
 
 enum {
   COROUTINE_REGISTERS =
-  19  /* 18 general purpose registers (r14-r31) and 1 return address */
+  20  /* 18 general purpose registers (r14-r31), 1 special register (cr) and 1 return address */
   + 4  /* space for fiber_entry() to store the link register */
 };
 
diff --git a/coroutine/riscv64/Context.S b/coroutine/riscv64/Context.S
index cc4e872f84b3dd..8e7fc74ffc1ee5 100644
--- a/coroutine/riscv64/Context.S
+++ b/coroutine/riscv64/Context.S
@@ -1,11 +1,10 @@
 #define TOKEN_PASTE(x,y) x##y
-#define PREFIXED_SYMBOL(prefix,name) TOKEN_PASTE(prefix,name)
 
 .text
 .align 2
 
-.global PREFIXED_SYMBOL(SYMBOL_PREFIX,coroutine_transfer)
-PREFIXED_SYMBOL(SYMBOL_PREFIX,coroutine_transfer):
+.global PREFIXED_SYMBOL(coroutine_transfer)
+PREFIXED_SYMBOL(coroutine_transfer):
 
 	# Make space on the stack for caller registers
 	addi sp, sp, -0xd0
diff --git a/coroutine/riscv64/Context.h b/coroutine/riscv64/Context.h
index 9ce1140e0b826d..3660fb5577a43e 100644
--- a/coroutine/riscv64/Context.h
+++ b/coroutine/riscv64/Context.h
@@ -36,7 +36,7 @@ static inline void coroutine_initialize(
     context->stack_pointer -= COROUTINE_REGISTERS;
     memset(context->stack_pointer, 0, sizeof(void*) * COROUTINE_REGISTERS);
 
-    context->stack_pointer[0xc0 / 8] = (void*)start;
+    context->stack_pointer[0xc0 / 8] = (void*)(uintptr_t)start;
 }
 
 struct coroutine_context * coroutine_transfer(struct coroutine_context * current, struct coroutine_context * target);
diff --git a/coroutine/win32/Context.h b/coroutine/win32/Context.h
index 902fd1246f0876..c1c8fbcd13a2c3 100644
--- a/coroutine/win32/Context.h
+++ b/coroutine/win32/Context.h
@@ -16,6 +16,7 @@
 #include <string.h>
 
 #define COROUTINE __declspec(noreturn) void __fastcall
+#define COROUTINE_DECL void __fastcall
 #define COROUTINE_LIMITED_ADDRESS_SPACE
 
 /* This doesn't include thread information block */
@@ -45,7 +46,7 @@ static inline void coroutine_initialize(
     char * top = (char*)stack + size;
     context->stack_pointer = (void**)((uintptr_t)top & ~0xF);
 
-    *--context->stack_pointer = (void*)start;
+    *--context->stack_pointer = (void*)(uintptr_t)start;
 
     /* Windows Thread Information Block */
     *--context->stack_pointer = (void*)0xFFFFFFFF; /* fs:[0] */
diff --git a/coroutine/win64/Context.h b/coroutine/win64/Context.h
index aaa4caeaf9fc48..23b21b5c1c00d8 100644
--- a/coroutine/win64/Context.h
+++ b/coroutine/win64/Context.h
@@ -16,6 +16,7 @@
 #include <string.h>
 
 #define COROUTINE __declspec(noreturn) void
+#define COROUTINE_DECL void
 
 enum {
     COROUTINE_REGISTERS = 8,
@@ -30,7 +31,7 @@ struct coroutine_context
 
 typedef void(* coroutine_start)(struct coroutine_context *from, struct coroutine_context *self);
 
-void coroutine_trampoline();
+void coroutine_trampoline(void);
 
 static inline void coroutine_initialize_main(struct coroutine_context * context) {
     context->stack_pointer = NULL;
@@ -53,7 +54,7 @@ static inline void coroutine_initialize(
 
     /* Return address */
     *--context->stack_pointer = 0;
-    *--context->stack_pointer = (void*)start;
+    *--context->stack_pointer = (void*)(uintptr_t)start;
     *--context->stack_pointer = (void*)coroutine_trampoline;
 
     /* Windows Thread Information Block */
diff --git a/coroutine/x86/Context.S b/coroutine/x86/Context.S
index f06a417084b4e2..b04e71aa1cbbfa 100644
--- a/coroutine/x86/Context.S
+++ b/coroutine/x86/Context.S
@@ -6,12 +6,11 @@
 ##
 
 #define TOKEN_PASTE(x,y) x##y
-#define PREFIXED_SYMBOL(prefix,name) TOKEN_PASTE(prefix,name)
 
 .text
 
-.globl PREFIXED_SYMBOL(SYMBOL_PREFIX,coroutine_transfer)
-PREFIXED_SYMBOL(SYMBOL_PREFIX,coroutine_transfer):
+.globl PREFIXED_SYMBOL(coroutine_transfer)
+PREFIXED_SYMBOL(coroutine_transfer):
 
 	# Save caller registers
 	pushl %ebp
diff --git a/coroutine/x86/Context.h b/coroutine/x86/Context.h
index d98eaf6486165a..f33b338eabf2a7 100644
--- a/coroutine/x86/Context.h
+++ b/coroutine/x86/Context.h
@@ -45,7 +45,7 @@ static inline void coroutine_initialize(
     context->stack_pointer = (void**)((uintptr_t)top & ~0xF);
 
     *--context->stack_pointer = NULL;
-    *--context->stack_pointer = (void*)start;
+    *--context->stack_pointer = (void*)(uintptr_t)start;
 
     context->stack_pointer -= COROUTINE_REGISTERS;
     memset(context->stack_pointer, 0, sizeof(void*) * COROUTINE_REGISTERS);
diff --git a/cygwin/GNUmakefile.in b/cygwin/GNUmakefile.in
index 09298590304b53..8e83d73040fe8c 100644
--- a/cygwin/GNUmakefile.in
+++ b/cygwin/GNUmakefile.in
@@ -2,10 +2,18 @@ gnumake = yes
 
 include Makefile
 
+MUNICODE_FLAG := $(if $(filter mingw%,$(target_os)),-municode)
+override EXE_LDFLAGS += $(MUNICODE_FLAG)
+
 DLLWRAP = @DLLWRAP@ --target=$(target_os) --driver-name="$(CC)"
-windres-cpp := $(CPP) -xc
-windres-cpp := --preprocessor=$(firstword $(windres-cpp)) \
-	$(addprefix --preprocessor-arg=,$(wordlist 2,$(words $(windres-cpp)),$(windres-cpp)))
+ifeq (@USE_LLVM_WINDRES@,yes) # USE_LLVM_WINDRES
+	# llvm-windres fails when preprocessor options are added
+	windres-cpp :=
+else
+	windres-cpp := $(CPP) -xc
+	windres-cpp := --preprocessor=$(firstword $(windres-cpp)) \
+		$(addprefix --preprocessor-arg=,$(wordlist 2,$(words $(windres-cpp)),$(windres-cpp)))
+endif
 WINDRES = @WINDRES@ $(windres-cpp) -DRC_INVOKED
 STRIP = @STRIP@
 
@@ -64,7 +72,7 @@ $(PROGRAM): $(RUBY_INSTALL_NAME).res.$(OBJEXT)
 $(WPROGRAM): $(RUBYW_INSTALL_NAME).res.$(OBJEXT)
 	@rm -f $@
 	$(ECHO) linking $@
-	$(Q) $(PURIFY) $(CC) -mwindows -e $(SYMBOL_PREFIX)mainCRTStartup $(LDFLAGS) $(XLDFLAGS) \
+	$(Q) $(PURIFY) $(CC) $(MUNICODE_FLAG) -mwindows -e $(SYMBOL_PREFIX)mainCRTStartup $(LDFLAGS) $(XLDFLAGS) \
 	  $(MAINOBJ) $(EXTOBJS) $(LIBRUBYARG) $(LIBS) -o $@
 $(STUBPROGRAM): $(RUBY_INSTALL_NAME).res.$(OBJEXT)
 
@@ -91,6 +99,8 @@ yes-test-all:	 export MSYS2_ARG_CONV_EXCL=$(MSYS2_ARG_CONV_EXCL_PARAM)
 yes-test-almost: export MSYS2_ARG_CONV_EXCL=$(MSYS2_ARG_CONV_EXCL_PARAM)
 test/% spec/%/ spec/%_spec.rb: export MSYS2_ARG_CONV_EXCL=$(MSYS2_ARG_CONV_EXCL_PARAM)
 
+distclean-local::
+	$(RMDIR) win32
 endif
 
 $(LIBRUBY_SO): $(RUBYDEF)
diff --git a/darray.h b/darray.h
index 8e1e5763551605..c9035b74b642cd 100644
--- a/darray.h
+++ b/darray.h
@@ -5,9 +5,6 @@
 #include <stddef.h>
 #include <stdlib.h>
 
-#include "internal/bits.h"
-#include "internal/gc.h"
-
 // Type for a dynamic array. Use to declare a dynamic array.
 // It is a pointer so it fits in st_table nicely. Designed
 // to be fairly type-safe.
@@ -45,7 +42,7 @@
  * void rb_darray_append(rb_darray(T) *ptr_to_ary, T element);
  */
 #define rb_darray_append(ptr_to_ary, element) \
-    rb_darray_append_impl(ptr_to_ary, element, rb_xrealloc_mul_add)
+    rb_darray_append_impl(ptr_to_ary, element, rb_darray_realloc_mul_add)
 
 #define rb_darray_append_without_gc(ptr_to_ary, element) \
     rb_darray_append_impl(ptr_to_ary, element, rb_darray_realloc_mul_add_without_gc)
@@ -61,6 +58,20 @@
     (*(ptr_to_ary))->meta.size++; \
 } while (0)
 
+#define rb_darray_insert_without_gc(ptr_to_ary, idx, element) do { \
+    rb_darray_ensure_space((ptr_to_ary), \
+                           sizeof(**(ptr_to_ary)), \
+                           sizeof((*(ptr_to_ary))->data[0]), \
+                           rb_darray_realloc_mul_add_without_gc); \
+    MEMMOVE( \
+        rb_darray_ref(*(ptr_to_ary), idx + 1), \
+        rb_darray_ref(*(ptr_to_ary), idx), \
+        (*(ptr_to_ary))->data[0], \
+        rb_darray_size(*(ptr_to_ary)) - idx); \
+    rb_darray_set(*(ptr_to_ary), idx, element); \
+    (*(ptr_to_ary))->meta.size++; \
+} while (0)
+
 // Iterate over items of the array in a for loop
 //
 #define rb_darray_foreach(ary, idx_name, elem_ptr_var) \
@@ -80,7 +91,7 @@
  */
 #define rb_darray_make(ptr_to_ary, size) \
     rb_darray_make_impl((ptr_to_ary), size, sizeof(**(ptr_to_ary)), \
-                         sizeof((*(ptr_to_ary))->data[0]), rb_xcalloc_mul_add)
+                         sizeof((*(ptr_to_ary))->data[0]), rb_darray_calloc_mul_add)
 
 #define rb_darray_make_without_gc(ptr_to_ary, size) \
     rb_darray_make_impl((ptr_to_ary), size, sizeof(**(ptr_to_ary)), \
@@ -92,7 +103,7 @@
  * void rb_darray_resize_capa(rb_darray(T) *ptr_to_ary, size_t capa);
  */
 #define rb_darray_resize_capa_without_gc(ptr_to_ary, capa) \
-    rb_darray_resize_capa_impl((ptr_to_ary), rb_darray_next_power_of_two(capa), sizeof(**(ptr_to_ary)), \
+    rb_darray_resize_capa_impl((ptr_to_ary), capa, sizeof(**(ptr_to_ary)), \
                                sizeof((*(ptr_to_ary))->data[0]), rb_darray_realloc_mul_add_without_gc)
 
 #define rb_darray_data_ptr(ary) ((ary)->data)
@@ -122,6 +133,14 @@ rb_darray_size(const void *ary)
     return meta ? meta->size : 0;
 }
 
+
+static inline void
+rb_darray_pop(void *ary, size_t count)
+{
+    rb_darray_meta_t *meta = ary;
+    meta->size -= count;
+}
+
 // Get the capacity of the dynamic array.
 //
 static inline size_t
@@ -135,8 +154,7 @@ rb_darray_capa(const void *ary)
 static inline void
 rb_darray_free(void *ary)
 {
-    rb_darray_meta_t *meta = ary;
-    if (meta) ruby_sized_xfree(ary, meta->capa);
+    xfree(ary);
 }
 
 static inline void
@@ -145,12 +163,23 @@ rb_darray_free_without_gc(void *ary)
     free(ary);
 }
 
-/* Internal function. Like rb_xcalloc_mul_add but does not trigger GC and does
- * not check for overflow in arithmetic. */
+/* Internal function. Like rb_xcalloc_mul_add. */
+static inline void *
+rb_darray_calloc_mul_add(size_t x, size_t y, size_t z)
+{
+    size_t size = rbimpl_size_add_or_raise(rbimpl_size_mul_or_raise(x, y), z);
+
+    void *ptr = xcalloc(1, size);
+    RUBY_ASSERT(ptr != NULL);
+
+    return ptr;
+}
+
+/* Internal function. Like rb_xcalloc_mul_add but does not trigger GC. */
 static inline void *
 rb_darray_calloc_mul_add_without_gc(size_t x, size_t y, size_t z)
 {
-    size_t size = (x * y) + z;
+    size_t size = rbimpl_size_add_or_raise(rbimpl_size_mul_or_raise(x, y), z);
 
     void *ptr = calloc(1, size);
     if (ptr == NULL) rb_bug("rb_darray_calloc_mul_add_without_gc: failed");
@@ -158,32 +187,35 @@ rb_darray_calloc_mul_add_without_gc(size_t x, size_t y, size_t z)
     return ptr;
 }
 
-/* Internal function. Like rb_xrealloc_mul_add but does not trigger GC and does
- * not check for overflow in arithmetic. */
+/* Internal function. Like rb_xrealloc_mul_add. */
 static inline void *
-rb_darray_realloc_mul_add_without_gc(const void *orig_ptr, size_t x, size_t y, size_t z)
+rb_darray_realloc_mul_add(void *orig_ptr, size_t x, size_t y, size_t z)
 {
-    size_t size = (x * y) + z;
+    size_t size = rbimpl_size_add_or_raise(rbimpl_size_mul_or_raise(x, y), z);
 
-    void *ptr = realloc((void *)orig_ptr, size);
-    if (ptr == NULL) rb_bug("rb_darray_realloc_mul_add_without_gc: failed");
+    void *ptr = xrealloc(orig_ptr, size);
+    RUBY_ASSERT(ptr != NULL);
 
     return ptr;
 }
 
-/* Internal function. Returns the next power of two that is greater than or
- * equal to n. */
-static inline size_t
-rb_darray_next_power_of_two(size_t n)
+/* Internal function. Like rb_xrealloc_mul_add but does not trigger GC. */
+static inline void *
+rb_darray_realloc_mul_add_without_gc(void *orig_ptr, size_t x, size_t y, size_t z)
 {
-    return (size_t)(1 << (64 - nlz_int64(n)));
+    size_t size = rbimpl_size_add_or_raise(rbimpl_size_mul_or_raise(x, y), z);
+
+    void *ptr = realloc(orig_ptr, size);
+    if (ptr == NULL) rb_bug("rb_darray_realloc_mul_add_without_gc: failed");
+
+    return ptr;
 }
 
 /* Internal function. Resizes the capacity of a darray. The new capacity must
  * be greater than or equal to the size of the darray. */
 static inline void
 rb_darray_resize_capa_impl(void *ptr_to_ary, size_t new_capa, size_t header_size, size_t element_size,
-                           void *(*realloc_mul_add_impl)(const void *, size_t, size_t, size_t))
+                           void *(*realloc_mul_add_impl)(void *, size_t, size_t, size_t))
 {
     rb_darray_meta_t **ptr_to_ptr_to_meta = ptr_to_ary;
     rb_darray_meta_t *meta = *ptr_to_ptr_to_meta;
@@ -196,7 +228,7 @@ rb_darray_resize_capa_impl(void *ptr_to_ary, size_t new_capa, size_t header_size
         new_ary->size = 0;
     }
 
-    assert(new_ary->size <= new_capa);
+    RUBY_ASSERT(new_ary->size <= new_capa);
 
     new_ary->capa = new_capa;
 
@@ -210,7 +242,7 @@ rb_darray_resize_capa_impl(void *ptr_to_ary, size_t new_capa, size_t header_size
 // Note: header_size can be bigger than sizeof(rb_darray_meta_t) when T is __int128_t, for example.
 static inline void
 rb_darray_ensure_space(void *ptr_to_ary, size_t header_size, size_t element_size,
-                       void *(*realloc_mul_add_impl)(const void *, size_t, size_t, size_t))
+                       void *(*realloc_mul_add_impl)(void *, size_t, size_t, size_t))
 {
     rb_darray_meta_t **ptr_to_ptr_to_meta = ptr_to_ary;
     rb_darray_meta_t *meta = *ptr_to_ptr_to_meta;
diff --git a/debug.c b/debug.c
index b5cba590bab5d3..4717a0bc9c5e90 100644
--- a/debug.c
+++ b/debug.c
@@ -147,12 +147,20 @@ NODE *
 ruby_debug_print_node(int level, int debug_level, const char *header, const NODE *node)
 {
     if (level < debug_level) {
-        fprintf(stderr, "DBG> %s: %s (%u)\n", header,
-                ruby_node_name(nd_type(node)), nd_line(node));
+        fprintf(stderr, "DBG> %s: %s (id: %d, line: %d, location: (%d,%d)-(%d,%d))\n",
+                header, ruby_node_name(nd_type(node)), nd_node_id(node), nd_line(node),
+                nd_first_lineno(node), nd_first_column(node),
+                nd_last_lineno(node), nd_last_column(node));
     }
     return (NODE *)node;
 }
 
+void
+ruby_debug_print_n(const NODE *node)
+{
+    ruby_debug_print_node(0, 1, "", node);
+}
+
 void
 ruby_debug_breakpoint(void)
 {
@@ -177,9 +185,9 @@ ruby_env_debug_option(const char *str, int len, void *arg)
     int ov;
     size_t retlen;
     unsigned long n;
+#define NAME_MATCH(name) (len == sizeof(name) - 1 && strncmp(str, (name), len) == 0)
 #define SET_WHEN(name, var, val) do {	    \
-        if (len == sizeof(name) - 1 &&	    \
-            strncmp(str, (name), len) == 0) { \
+        if (NAME_MATCH(name)) { \
             (var) = (val);		    \
             return 1;			    \
         }				    \
@@ -207,31 +215,31 @@ ruby_env_debug_option(const char *str, int len, void *arg)
             --len; \
         } \
         if (len > 0) { \
-            fprintf(stderr, "ignored "name" option: `%.*s'\n", len, str); \
+            fprintf(stderr, "ignored "name" option: '%.*s'\n", len, str); \
         } \
     } while (0)
 #define SET_WHEN_UINT(name, vals, num, req) \
-    if (NAME_MATCH_VALUE(name)) SET_UINT_LIST(name, vals, num);
+    if (NAME_MATCH_VALUE(name)) { \
+        if (!len) req; \
+        else SET_UINT_LIST(name, vals, num); \
+        return 1; \
+    }
 
-    SET_WHEN("gc_stress", *ruby_initial_gc_stress_ptr, Qtrue);
-    SET_WHEN("core", ruby_enable_coredump, 1);
-    SET_WHEN("ci", ruby_on_ci, 1);
-    if (NAME_MATCH_VALUE("rgengc")) {
-        if (!len) ruby_rgengc_debug = 1;
-        else SET_UINT_LIST("rgengc", &ruby_rgengc_debug, 1);
+    if (NAME_MATCH("gc_stress")) {
+        rb_gc_initial_stress_set(Qtrue);
         return 1;
     }
+    SET_WHEN("core", ruby_enable_coredump, 1);
+    SET_WHEN("ci", ruby_on_ci, 1);
+    SET_WHEN_UINT("rgengc", &ruby_rgengc_debug, 1, ruby_rgengc_debug = 1);
 #if defined _WIN32
 # if RUBY_MSVCRT_VERSION >= 80
     SET_WHEN("rtc_error", ruby_w32_rtc_error, 1);
 # endif
 #endif
 #if defined _WIN32 || defined __CYGWIN__
-    if (NAME_MATCH_VALUE("codepage")) {
-        if (!len) fprintf(stderr, "missing codepage argument");
-        else SET_UINT_LIST("codepage", ruby_w32_codepage, numberof(ruby_w32_codepage));
-        return 1;
-    }
+    SET_WHEN_UINT("codepage", ruby_w32_codepage, numberof(ruby_w32_codepage),
+                  fprintf(stderr, "missing codepage argument"));
 #endif
     return 0;
 }
@@ -285,6 +293,12 @@ static const char *dlf_type_names[] = {
     "func",
 };
 
+#ifdef MAX_PATH
+#define DEBUG_LOG_MAX_PATH (MAX_PATH-1)
+#else
+#define DEBUG_LOG_MAX_PATH 255
+#endif
+
 static struct {
     char *mem;
     unsigned int cnt;
@@ -292,6 +306,7 @@ static struct {
     unsigned int filters_num;
     bool show_pid;
     rb_nativethread_lock_t lock;
+    char output_file[DEBUG_LOG_MAX_PATH+1];
     FILE *output;
 } debug_log;
 
@@ -393,7 +408,39 @@ setup_debug_log(void)
         }
         else {
             ruby_debug_log_mode |= ruby_debug_log_file;
-            if ((debug_log.output = fopen(log_config, "w")) == NULL) {
+
+            // pid extension with %p
+            unsigned long len = strlen(log_config);
+
+            for (unsigned long i=0, j=0; i<len; i++) {
+                const char c = log_config[i];
+
+                if (c == '%') {
+                    i++;
+                    switch (log_config[i]) {
+                      case '%':
+                        debug_log.output_file[j++] = '%';
+                        break;
+                      case 'p':
+                        snprintf(debug_log.output_file + j, DEBUG_LOG_MAX_PATH - j, "%d", getpid());
+                        j = strlen(debug_log.output_file);
+                        break;
+                      default:
+                        fprintf(stderr, "can not parse RUBY_DEBUG_LOG filename: %s\n", log_config);
+                        exit(1);
+                    }
+                }
+                else {
+                    debug_log.output_file[j++] = c;
+                }
+
+                if (j >= DEBUG_LOG_MAX_PATH) {
+                    fprintf(stderr, "RUBY_DEBUG_LOG=%s is too long\n", log_config);
+                    exit(1);
+                }
+            }
+
+            if ((debug_log.output = fopen(debug_log.output_file, "w")) == NULL) {
                 fprintf(stderr, "can not open %s for RUBY_DEBUG_LOG\n", log_config);
                 exit(1);
             }
@@ -404,6 +451,10 @@ setup_debug_log(void)
                 (ruby_debug_log_mode & ruby_debug_log_memory) ? "[mem]" : "",
                 (ruby_debug_log_mode & ruby_debug_log_stderr) ? "[stderr]" : "",
                 (ruby_debug_log_mode & ruby_debug_log_file)   ? "[file]" : "");
+        if (debug_log.output_file[0]) {
+            fprintf(stderr, "RUBY_DEBUG_LOG filename=%s\n", debug_log.output_file);
+        }
+
         rb_nativethread_lock_initialize(&debug_log.lock);
 
         setup_debug_log_filter();
@@ -570,10 +621,11 @@ ruby_debug_log(const char *file, int line, const char *func_name, const char *fm
         // ractor information
         if (ruby_single_main_ractor == NULL) {
             rb_ractor_t *cr = th ? th->ractor : NULL;
+            rb_vm_t *vm = GET_VM();
 
             if (r && len < MAX_DEBUG_LOG_MESSAGE_LEN) {
-                r = snprintf(buff + len, MAX_DEBUG_LOG_MESSAGE_LEN - len, "\tr:#%d/%u",
-                             cr ? (int)rb_ractor_id(cr) : -1, GET_VM()->ractor.cnt);
+                r = snprintf(buff + len, MAX_DEBUG_LOG_MESSAGE_LEN - len, "\tr:#%d/%u (%u)",
+                             cr ? (int)rb_ractor_id(cr) : -1, vm->ractor.cnt, vm->ractor.sched.running_cnt);
 
                 if (r < 0) rb_bug("ruby_debug_log returns %d", r);
                 len += r;
@@ -631,7 +683,7 @@ debug_log_dump(FILE *out, unsigned int n)
             int index = current_index - size + i;
             if (index < 0) index += MAX_DEBUG_LOG;
             VM_ASSERT(index <= MAX_DEBUG_LOG);
-            const char *mesg = RUBY_DEBUG_LOG_MEM_ENTRY(index);;
+            const char *mesg = RUBY_DEBUG_LOG_MEM_ENTRY(index);
             fprintf(out, "%4u: %s\n", debug_log.cnt - size + i, mesg);
         }
     }
diff --git a/debug_counter.h b/debug_counter.h
index a8b95edded258b..fada7513aa7b10 100644
--- a/debug_counter.h
+++ b/debug_counter.h
@@ -315,6 +315,10 @@ RB_DEBUG_COUNTER(obj_imemo_parser_strterm)
 RB_DEBUG_COUNTER(obj_imemo_callinfo)
 RB_DEBUG_COUNTER(obj_imemo_callcache)
 RB_DEBUG_COUNTER(obj_imemo_constcache)
+RB_DEBUG_COUNTER(obj_imemo_fields)
+
+RB_DEBUG_COUNTER(opt_new_hit)
+RB_DEBUG_COUNTER(opt_new_miss)
 
 /* ar_table */
 RB_DEBUG_COUNTER(artable_hint_hit)
@@ -356,7 +360,7 @@ RB_DEBUG_COUNTER(load_path_is_not_realpath)
 
 enum rb_debug_counter_type {
 #define RB_DEBUG_COUNTER(name) RB_DEBUG_COUNTER_##name,
-#include __FILE__
+#include "debug_counter.h"
     RB_DEBUG_COUNTER_MAX
 #undef RB_DEBUG_COUNTER
 };
diff --git a/defs/gmake.mk b/defs/gmake.mk
index 155122376ad025..a81d82eadd278c 100644
--- a/defs/gmake.mk
+++ b/defs/gmake.mk
@@ -37,7 +37,7 @@ TEST_TARGETS := $(patsubst test,test-short,$(TEST_TARGETS))
 TEST_DEPENDS := $(filter-out test $(TEST_TARGETS),$(TEST_DEPENDS))
 TEST_TARGETS := $(patsubst test-short,btest-ruby test-knownbug test-basic,$(TEST_TARGETS))
 TEST_TARGETS := $(patsubst test-basic,test-basic test-leaked-globals,$(TEST_TARGETS))
-TEST_TARGETS := $(patsubst test-bundled-gems,test-bundled-gems-run,$(TEST_TARGETS))
+TEST_TARGETS := $(patsubst test-bundled-gems,test-bundled-gems-spec test-bundled-gems-run,$(TEST_TARGETS))
 TEST_TARGETS := $(patsubst test-bundled-gems-run,test-bundled-gems-run $(PREPARE_BUNDLED_GEMS),$(TEST_TARGETS))
 TEST_TARGETS := $(patsubst test-bundled-gems-prepare,test-bundled-gems-prepare $(PRECHECK_BUNDLED_GEMS) test-bundled-gems-fetch,$(TEST_TARGETS))
 TEST_TARGETS := $(patsubst test-bundler-parallel,test-bundler-parallel $(PREPARE_BUNDLER),$(TEST_TARGETS))
@@ -97,6 +97,7 @@ ORDERED_TEST_TARGETS := $(filter $(TEST_TARGETS), \
 	test-bundler-prepare test-bundler test-bundler-parallel \
 	test-bundled-gems-precheck test-bundled-gems-fetch \
 	test-bundled-gems-prepare test-bundled-gems-run \
+	test-bundled-gems-spec \
 	)
 
 # grep ^yes-test-.*-precheck: template/Makefile.in defs/gmake.mk common.mk
@@ -193,15 +194,22 @@ $(SCRIPTBINDIR):
 	$(Q) mkdir $@
 
 .PHONY: commit
-commit: $(if $(filter commit,$(MAKECMDGOALS)),$(filter-out commit,$(MAKECMDGOALS))) up
+COMMIT_PREPARE := $(subst :,\:,$(filter-out commit do-commit,$(MAKECMDGOALS))) up
+
+commit: pre-commit $(DOT_WAIT) do-commit $(DOT_WAIT) post_commit
+pre-commit: $(COMMIT_PREPARE)
+do-commit: $(if $(DOT_WAIT),,pre-commit)
 	@$(BASERUBY) -C "$(srcdir)" -I./tool/lib -rvcs -e 'VCS.detect(".").commit'
+post-commit: $(if $(DOT_WAIT),,do-commit)
 	+$(Q) \
 	{ \
 	  $(in-srcdir) \
 	  exec sed -f tool/prereq.status defs/gmake.mk template/Makefile.in common.mk; \
 	} | \
-	$(MAKE) $(mflags) Q=$(Q) ECHO=$(ECHO) srcdir="$(srcdir)" srcs_vpath="" CHDIR="$(CHDIR)" \
-		BOOTSTRAPRUBY="$(BOOTSTRAPRUBY)" MINIRUBY="$(BASERUBY)" BASERUBY="$(BASERUBY)" \
+	$(MAKE) $(mflags) Q=$(Q) ECHO=$(ECHO) \
+		top_srcdir="$(top_srcdir)" srcdir="$(srcdir)" srcs_vpath="" CHDIR="$(CHDIR)" \
+		BOOTSTRAPRUBY="$(BOOTSTRAPRUBY)" BOOTSTRAPRUBY_OPT="$(BOOTSTRAPRUBY_OPT)" \
+		MINIRUBY="$(BASERUBY)" BASERUBY="$(BASERUBY)" HAVE_BASERUBY="$(HAVE_BASERUBY)" \
 		VCSUP="" ENC_MK=.top-enc.mk REVISION_FORCE=PHONY CONFIGURE="$(CONFIGURE)" -f - \
 		update-src srcs all-incs
 
@@ -357,16 +365,18 @@ $(srcdir)/.bundle/.timestamp:
 define build-gem
 $(srcdir)/gems/src/$(1)/.git: | $(srcdir)/gems/src
 	$(ECHO) Cloning $(4)
-	$(Q) $(GIT) clone $(4) $$(@D)
+	$(Q) $(GIT) clone --depth=1 --no-tags $(4) $$(@D)
 
 $(bundled-gem-revision): \
 	$(if $(if $(wildcard $$(@)),$(filter $(3),$(shell cat $$(@)))),,PHONY) \
 	| $(srcdir)/.bundle/.timestamp $(srcdir)/gems/src/$(1)/.git
 	$(ECHO) Update $(1) to $(3)
 	$(Q) $(CHDIR) "$(srcdir)/gems/src/$(1)" && \
-	    $(GIT) fetch origin $(3) && \
-	    $(GIT) checkout --detach $(3) && \
-	:
+	    if [ `$(GIT) rev-parse HEAD` != $(3) ]; then \
+	        $(GIT) fetch origin $(3) && \
+	        $(GIT) checkout --detach $(3) && \
+	        :; \
+	    fi
 	echo $(3) | $(IFCHANGE) $$(@) -
 
 # The repository of minitest does not include minitest.gemspec because it uses hoe.
@@ -407,6 +417,17 @@ endif
 .SECONDARY: update-unicode-ucd-emoji-files
 .SECONDARY: update-unicode-emoji-files
 
+ifneq ($(DOT_WAIT),)
+.NOTPARALLEL: update-unicode
+.NOTPARALLEL: update-unicode-files
+.NOTPARALLEL: update-unicode-auxiliary-files
+.NOTPARALLEL: update-unicode-ucd-emoji-files
+.NOTPARALLEL: update-unicode-emoji-files
+.NOTPARALLEL: $(UNICODE_FILES) $(UNICODE_PROPERTY_FILES)
+.NOTPARALLEL: $(UNICODE_AUXILIARY_FILES)
+.NOTPARALLEL: $(UNICODE_UCD_EMOJI_FILES) $(UNICODE_EMOJI_FILES)
+endif
+
 ifeq ($(HAVE_GIT),yes)
 REVISION_LATEST := $(shell $(CHDIR) $(srcdir) && $(GIT) log -1 --format=%H 2>/dev/null)
 else
@@ -421,6 +442,8 @@ $(REVISION_H): PHONY
 endif
 
 include $(top_srcdir)/yjit/yjit.mk
+include $(top_srcdir)/zjit/zjit.mk
+include $(top_srcdir)/defs/jit.mk
 
 # Query on the generated rdoc
 #
@@ -449,6 +472,10 @@ benchmark/%: miniruby$(EXEEXT) update-benchmark-driver PHONY
 	            --executables="built-ruby::$(BENCH_RUBY) --disable-gem" \
 	            $(srcdir)/$@ $(BENCH_OPTS) $(OPTS)
 
+clean-local:: TARGET_SO = $(PROGRAM) $(WPROGRAM) $(LIBRUBY_SO) $(STATIC_RUBY) miniruby goruby
+clean-local::
+	-$(Q)$(RMALL) $(cleanlibs)
+
 clean-srcs-ext::
 	$(Q)$(RM) $(patsubst $(srcdir)/%,%,$(EXT_SRCS))
 
@@ -480,13 +507,18 @@ update-deps:
 
 # order-only-prerequisites doesn't work for $(RUBYSPEC_CAPIEXT)
 # because the same named directory exists in the source tree.
-$(RUBYSPEC_CAPIEXT)/%.$(DLEXT): $(srcdir)/$(RUBYSPEC_CAPIEXT)/%.c $(srcdir)/$(RUBYSPEC_CAPIEXT)/rubyspec.h $(RUBY_H_INCLUDES) $(LIBRUBY)
+$(RUBYSPEC_CAPIEXT)/%.$(DLEXT): $(srcdir)/$(RUBYSPEC_CAPIEXT)/%.c $(RUBYSPEC_CAPIEXT_DEPS) \
+	| build-ext
 	$(ECHO) building $@
 	$(Q) $(MAKEDIRS) $(@D)
 	$(Q) $(DLDSHARED) -L. $(XDLDFLAGS) $(XLDFLAGS) $(LDFLAGS) $(INCFLAGS) $(CPPFLAGS) $(OUTFLAG)$@ $< $(LIBRUBYARG)
+ifneq ($(POSTLINK),)
+	$(Q) $(POSTLINK)
+endif
 	$(Q) $(RMALL) $@.*
 
-rubyspec-capiext: $(patsubst %.c,$(RUBYSPEC_CAPIEXT)/%.$(DLEXT),$(notdir $(wildcard $(srcdir)/$(RUBYSPEC_CAPIEXT)/*.c)))
+RUBYSPEC_CAPIEXT_SO := $(patsubst %.c,$(RUBYSPEC_CAPIEXT)/%.$(DLEXT),$(notdir $(wildcard $(srcdir)/$(RUBYSPEC_CAPIEXT)/*.c)))
+rubyspec-capiext: $(RUBYSPEC_CAPIEXT_SO)
 	@ $(NULLCMD)
 
 ifeq ($(ENABLE_SHARED),yes)
@@ -499,20 +531,39 @@ spec/%/ spec/%_spec.rb: programs exts PHONY
 ruby.pc: $(filter-out ruby.pc,$(ruby_pc))
 
 matz: up
+	$(eval OLD := $(MAJOR).$(MINOR).0)
 	$(eval MINOR := $(shell expr $(MINOR) + 1))
-	$(eval message := Development of $(MAJOR).$(MINOR).0 started.)
+	$(eval NEW := $(MAJOR).$(MINOR).0)
+	$(eval message := Development of $(NEW) started.)
 	$(eval files := include/ruby/version.h include/ruby/internal/abi.h)
+	$(GIT) -C $(srcdir) mv -f NEWS.md doc/NEWS/NEWS-$(OLD).md
+	$(GIT) -C $(srcdir) commit -m "[DOC] Flush NEWS.md"
 	sed -i~ \
 	-e "s/^\(#define RUBY_API_VERSION_MINOR\) .*/\1 $(MINOR)/" \
 	-e "s/^\(#define RUBY_ABI_VERSION\) .*/\1 0/" \
 	 $(files:%=$(srcdir)/%)
-	$(GIT) -C $(srcdir) commit -m "$(message)" $(files)
+	$(GIT) -C $(srcdir) add $(files)
+	$(BASERUBY) -C $(srcdir) -p -00 \
+	-e 'BEGIN {old, new = ARGV.shift(2); STDOUT.reopen("NEWS.md")}' \
+	-e 'case $$.' \
+	-e 'when 1; $$_.sub!(/Ruby \K[0-9.]+/, new)' \
+	-e 'when 2; $$_.sub!(/\*\*\K[0-9.]+(?=\*\*)/, old)' \
+	-e 'end' \
+	-e 'next if /^[\[ *]/ =~ $$_' \
+	-e '$$_.sub!(/\n{2,}\z/, "\n\n")' \
+	$(OLD) $(NEW) doc/NEWS/NEWS-$(OLD).md
+	$(GIT) -C $(srcdir) add NEWS.md
+	$(GIT) -C $(srcdir) commit -m "$(message)"
 
 tags:
 	$(MAKE) GIT="$(GIT)" -C "$(srcdir)" -f defs/tags.mk
 
+
+# ripper_srcs makes all sources at once. invoking this target multiple
+# times in parallel means all sources will be built for the number of
+# sources times respectively.
 ifneq ($(DOT_WAIT),)
-ripper_srcs: $(addprefix $(DOT_WAIT) ,$(RIPPER_SRCS))
+.NOTPARALLEL: ripper_srcs
 else
 ripper_src =
 $(foreach r,$(RIPPER_SRCS),$(eval $(value r): | $(value ripper_src))\
diff --git a/defs/id.def b/defs/id.def
index 2ddde7be70702a..0c32b0d1d4ab97 100644
--- a/defs/id.def
+++ b/defs/id.def
@@ -8,6 +8,7 @@ firstline, predefined = __LINE__+1, %[\
   inspect
   intern
   object_id
+  __id__
   const_added
   const_missing
   method_missing                                        MethodMissing
@@ -59,6 +60,11 @@ firstline, predefined = __LINE__+1, %[\
   name
   nil
   path
+  pack
+  buffer
+  include?
+  aborted
+  exited
 
   _                                                     UScore
 
@@ -97,6 +103,8 @@ firstline, predefined = __LINE__+1, %[\
   $_                                                    LASTLINE
   $~                                                    BACKREF
   $!                                                    ERROR_INFO
+
+  Ruby
 ]
 
 # VM ID         OP      Parser Token
diff --git a/defs/jit.mk b/defs/jit.mk
new file mode 100644
index 00000000000000..99f21fb51399bb
--- /dev/null
+++ b/defs/jit.mk
@@ -0,0 +1,58 @@
+# Make recipes that deal with the rust code of YJIT and ZJIT.
+
+# Because of Cargo cache, if the actual binary is not changed from the
+# previous build, the mtime is preserved as the cached file.
+# This means the target is not updated actually, and it will need to
+# rebuild at the next build.
+RUST_LIB_TOUCH = touch $@
+
+ifneq ($(JIT_CARGO_SUPPORT),no)
+# NOTE: MACOSX_DEPLOYMENT_TARGET to match `rustc --print deployment-target` to avoid the warning below.
+#    ld: warning: object file (target/debug/libjit.a(<libcapstone object>)) was built for
+#    newer macOS version (15.2) than being linked (15.0)
+# This limits us to an older set of macOS API in the rust code, but we don't use any.
+$(RUST_LIB): $(srcdir)/jit.rs
+	$(Q)if [ '$(ZJIT_SUPPORT)' != no -a '$(YJIT_SUPPORT)' != no ]; then \
+	    echo 'building YJIT and ZJIT ($(JIT_CARGO_SUPPORT:yes=release) mode)'; \
+	elif [ '$(ZJIT_SUPPORT)' != no ]; then \
+	    echo 'building ZJIT ($(JIT_CARGO_SUPPORT) mode)'; \
+	elif [ '$(YJIT_SUPPORT)' != no ]; then \
+	    echo 'building YJIT ($(JIT_CARGO_SUPPORT) mode)'; \
+	fi
+	+$(Q)CARGO_TARGET_DIR='$(CARGO_TARGET_DIR)' \
+	    CARGO_TERM_PROGRESS_WHEN='never' \
+	    MACOSX_DEPLOYMENT_TARGET=11.0 \
+	    $(CARGO) $(CARGO_VERBOSE) build --manifest-path '$(top_srcdir)/Cargo.toml' $(CARGO_BUILD_ARGS)
+	$(RUST_LIB_TOUCH)
+endif
+
+RUST_LIB_SYMBOLS = $(RUST_LIB:.a=).symbols
+$(RUST_LIBOBJ): $(RUST_LIB)
+	$(ECHO) 'partial linking $(RUST_LIB) into $@'
+ifneq ($(findstring darwin,$(target_os)),)
+	$(Q) $(CC) -nodefaultlibs -r -o $@ -exported_symbols_list $(RUST_LIB_SYMBOLS) $(RUST_LIB)
+else
+	$(Q) $(LD) -r -o $@ --whole-archive $(RUST_LIB)
+	-$(Q) $(OBJCOPY) --wildcard --keep-global-symbol='$(SYMBOL_PREFIX)rb_*' $(@)
+endif
+
+rust-libobj: $(RUST_LIBOBJ)
+rust-lib: $(RUST_LIB)
+
+# For Darwin only: a list of symbols that we want the glommed Rust static lib to export.
+# Unfortunately, using wildcard like '_rb_*' with -exported-symbol does not work, at least
+# not on version 820.1. Assume llvm-nm, so XCode 8.0 (from 2016) or newer.
+#
+# The -exported_symbols_list pulls out the right archive members. Symbols not listed
+# in the list are made private extern, which are in turn made local as we're using `ld -r`.
+# Note, section about -keep_private_externs in ld's man page hints at this behavior on which
+# we rely.
+ifneq ($(findstring darwin,$(target_os)),)
+$(RUST_LIB_SYMBOLS): $(RUST_LIB)
+	$(Q) $(tooldir)/darwin-ar $(NM) --defined-only --extern-only $(RUST_LIB) | \
+	sed -n -e 's/.* //' -e '/^$(SYMBOL_PREFIX)rb_/p' \
+	-e '/^$(SYMBOL_PREFIX)rust_eh_personality/p' \
+	> $@
+
+$(RUST_LIBOBJ): $(RUST_LIB_SYMBOLS)
+endif
diff --git a/defs/known_errors.def b/defs/known_errors.def
index e9694cfbda684b..23e9e535078042 100644
--- a/defs/known_errors.def
+++ b/defs/known_errors.def
@@ -1,157 +1,157 @@
-E2BIG
-EACCES
-EADDRINUSE
-EADDRNOTAVAIL
-EADV
-EAFNOSUPPORT
-EAGAIN
-EALREADY
-EAUTH
-EBADARCH
-EBADE
-EBADEXEC
-EBADF
-EBADFD
-EBADMACHO
-EBADMSG
-EBADR
-EBADRPC
-EBADRQC
-EBADSLT
-EBFONT
-EBUSY
-ECANCELED
-ECAPMODE
-ECHILD
-ECHRNG
-ECOMM
-ECONNABORTED
-ECONNREFUSED
-ECONNRESET
-EDEADLK
-EDEADLOCK
-EDESTADDRREQ
-EDEVERR
-EDOM
-EDOOFUS
-EDOTDOT
-EDQUOT
-EEXIST
-EFAULT
-EFBIG
-EFTYPE
-EHOSTDOWN
-EHOSTUNREACH
-EHWPOISON
-EIDRM
-EILSEQ
-EINPROGRESS
-EINTR
-EINVAL
-EIO
-EIPSEC
-EISCONN
-EISDIR
-EISNAM
-EKEYEXPIRED
-EKEYREJECTED
-EKEYREVOKED
-EL2HLT
-EL2NSYNC
-EL3HLT
-EL3RST
-ELAST
-ELIBACC
-ELIBBAD
-ELIBEXEC
-ELIBMAX
-ELIBSCN
-ELNRNG
-ELOOP
-EMEDIUMTYPE
-EMFILE
-EMLINK
-EMSGSIZE
-EMULTIHOP
-ENAMETOOLONG
-ENAVAIL
-ENEEDAUTH
-ENETDOWN
-ENETRESET
-ENETUNREACH
-ENFILE
-ENOANO
-ENOATTR
-ENOBUFS
-ENOCSI
-ENODATA
-ENODEV
-ENOENT
-ENOEXEC
-ENOKEY
-ENOLCK
-ENOLINK
-ENOMEDIUM
-ENOMEM
-ENOMSG
-ENONET
-ENOPKG
-ENOPOLICY
-ENOPROTOOPT
-ENOSPC
-ENOSR
-ENOSTR
-ENOSYS
-ENOTBLK
-ENOTCAPABLE
-ENOTCONN
-ENOTDIR
-ENOTEMPTY
-ENOTNAM
-ENOTRECOVERABLE
-ENOTSOCK
-ENOTSUP
-ENOTTY
-ENOTUNIQ
-ENXIO
-EOPNOTSUPP
-EOVERFLOW
-EOWNERDEAD
-EPERM
-EPFNOSUPPORT
-EPIPE
-EPROCLIM
-EPROCUNAVAIL
-EPROGMISMATCH
-EPROGUNAVAIL
-EPROTO
-EPROTONOSUPPORT
-EPROTOTYPE
-EPWROFF
-EQFULL
-ERANGE
-EREMCHG
-EREMOTE
-EREMOTEIO
-ERESTART
-ERFKILL
-EROFS
-ERPCMISMATCH
-ESHLIBVERS
-ESHUTDOWN
-ESOCKTNOSUPPORT
-ESPIPE
-ESRCH
-ESRMNT
-ESTALE
-ESTRPIPE
-ETIME
-ETIMEDOUT
-ETOOMANYREFS
-ETXTBSY
-EUCLEAN
-EUNATCH
-EUSERS
-EWOULDBLOCK
-EXDEV
-EXFULL
+E2BIG           Argument list too long
+EACCES          Permission denied
+EADDRINUSE      Address already in use
+EADDRNOTAVAIL   Address not available
+EADV            Advertise error
+EAFNOSUPPORT    Address family not supported
+EAGAIN          Resource temporarily unavailable, try again (may be the same value as EWOULDBLOCK)
+EALREADY        Connection already in progress
+EAUTH           Authentication error
+EBADARCH        Bad CPU type in executable
+EBADE           Bad exchange
+EBADEXEC        Bad executable
+EBADF           Bad file descriptor
+EBADFD          File descriptor in bad state
+EBADMACHO       Malformed Macho file
+EBADMSG         Bad message
+EBADR           Invalid request descriptor
+EBADRPC         RPC struct is bad
+EBADRQC         Invalid request code
+EBADSLT         Invalid slot
+EBFONT          Bad font file format
+EBUSY           Device or resource busy
+ECANCELED       Operation canceled
+ECAPMODE        Not permitted in capability mode
+ECHILD          No child processes
+ECHRNG          Channel number out of range
+ECOMM           Communication error on send
+ECONNABORTED    Connection aborted
+ECONNREFUSED    Connection refused
+ECONNRESET      Connection reset
+EDEADLK         Resource deadlock avoided
+EDEADLOCK       File locking deadlock error
+EDESTADDRREQ    Destination address required
+EDEVERR         Device error; e.g., printer paper out
+EDOM            Mathematics argument out of domain of function
+EDOOFUS         Improper function use
+EDOTDOT         RFS specific error
+EDQUOT          Disk quota exceeded
+EEXIST          File exists
+EFAULT          Bad address
+EFBIG           File too large
+EFTYPE          Invalid file type or format
+EHOSTDOWN       Host is down
+EHOSTUNREACH    Host is unreachable
+EHWPOISON       Memory page has hardware error
+EIDRM           Identifier removed
+EILSEQ          Invalid or incomplete multibyte or wide character
+EINPROGRESS     Operation in progress
+EINTR           Interrupted function call
+EINVAL          Invalid argument
+EIO             Input/output error
+EIPSEC          IPsec processing failure
+EISCONN         Socket is connected
+EISDIR          Is a directory
+EISNAM          Is a named file type
+EKEYEXPIRED     Key has expired
+EKEYREJECTED    Key was rejected by service
+EKEYREVOKED     Key has been revoked
+EL2HLT          Level 2 halted
+EL2NSYNC        Level 2 not synchronized
+EL3HLT          Level 3 halted
+EL3RST          Level 3 reset
+ELIBACC         Cannot access a needed shared library
+ELIBBAD         Accessing a corrupted shared library
+ELIBEXEC        Cannot exec a shared library directly
+ELIBMAX         Attempting to link in too many shared libraries
+ELIBSCN         .lib section in a.out corrupted
+ELNRNG          Link number out of range
+ELOOP           Too many levels of symbolic links
+EMEDIUMTYPE     Wrong medium type
+EMFILE          Too many open files
+EMLINK          Too many links
+EMSGSIZE        Message too long
+EMULTIHOP       Multihop attempted
+ENAMETOOLONG    Filename too long
+ENAVAIL         No XENIX semaphores available
+ENEEDAUTH       Need authenticator
+ENETDOWN        Network is down
+ENETRESET       Connection aborted by network
+ENETUNREACH     Network unreachable
+ENFILE          Too many open files in system
+ENOANO          No anode
+ENOATTR         Attribute not found
+ENOBUFS         No buffer space available
+ENOCSI          No CSI structure available
+ENODATA         No data available
+ENODEV          No such device
+ENOENT          No such file or directory
+ENOEXEC         Exec format error
+ENOKEY          Required key not available
+ENOLCK          No locks available
+ENOLINK         Link has been severed
+ENOMEDIUM       No medium found
+ENOMEM          Not enough space/cannot allocate memory
+ENOMSG          No message of the desired type
+ENONET          Machine is not on the network
+ENOPKG          Package not installed
+ENOPOLICY       No such policy
+ENOPROTOOPT     Protocol not available
+ENOSPC          No space left on device
+ENOSR           No STREAM resources
+ENOSTR          Not a STREAM
+ENOSYS          Functionality not implemented
+ENOTBLK         Block device required
+ENOTCAPABLE     Capabilities insufficient
+ENOTCONN        The socket is not connected
+ENOTDIR         Not a directory
+ENOTEMPTY       Directory not empty
+ENOTNAM         Not a XENIX named type file
+ENOTRECOVERABLE State not recoverable
+ENOTSOCK        Not a socket
+ENOTSUP         Operation not supported
+ENOTTY          Inappropriate I/O control operation
+ENOTUNIQ        Name not unique on network
+ENXIO           No such device or address
+EOPNOTSUPP      Operation not supported on socket
+EOVERFLOW       Value too large to be stored in data type
+EOWNERDEAD      Owner died
+EPERM           Operation not permitted
+EPFNOSUPPORT    Protocol family not supported
+EPIPE           Broken pipe
+EPROCLIM        Too many processes
+EPROCUNAVAIL    Bad procedure for program
+EPROGMISMATCH   Program version wrong
+EPROGUNAVAIL    RPC program isn't available
+EPROTO          Protocol error
+EPROTONOSUPPORT Protocol not supported
+EPROTOTYPE      Protocol wrong type for socket
+EPWROFF         Device power is off
+EQFULL          Interface output queue is full
+ERANGE          Result too large
+EREMCHG         Remote address changed
+EREMOTE         Object is remote
+EREMOTEIO       Remote I/O error
+ERESTART        Interrupted system call should be restarted
+ERFKILL         Operation not possible due to RF-kill
+EROFS           Read-only file system
+ERPCMISMATCH    RPC version wrong
+ESHLIBVERS      Shared library version mismatch
+ESHUTDOWN       Cannot send after transport endpoint shutdown
+ESOCKTNOSUPPORT Socket type not supported
+ESPIPE          Illegal seek
+ESRCH           No such process
+ESRMNT          Server mount error
+ESTALE          Stale file handle
+ESTRPIPE        Streams pipe error
+ETIME           Timer expired
+ETIMEDOUT       Connection timed out
+ETOOMANYREFS    Too many references: cannot splice
+ETXTBSY         Text file busy
+EUCLEAN         Structure needs cleaning
+EUNATCH         Protocol driver not attached
+EUSERS          Too many users
+EWOULDBLOCK     Operation would block
+EXDEV           Invalid cross-device link
+EXFULL          Exchange full
+ELAST           Largest errno value
diff --git a/dir.c b/dir.c
index 4dbdc44e8a6e34..b934f2795c90e0 100644
--- a/dir.c
+++ b/dir.c
@@ -22,10 +22,6 @@
 #include <unistd.h>
 #endif
 
-#ifndef O_CLOEXEC
-#  define O_CLOEXEC 0
-#endif
-
 #ifndef USE_OPENDIR_AT
 # if defined(HAVE_FDOPENDIR) && defined(HAVE_DIRFD) && \
     defined(HAVE_OPENAT) && defined(HAVE_FSTATAT)
@@ -35,8 +31,12 @@
 # endif
 #endif
 
-#if USE_OPENDIR_AT
-# include <fcntl.h>
+#ifdef HAVE_FCNTL_H
+#  include <fcntl.h>
+#endif
+
+#ifndef O_CLOEXEC
+#  define O_CLOEXEC 0
 #endif
 
 #undef HAVE_DIRENT_NAMLEN
@@ -113,6 +113,7 @@ char *strchr(char*,char);
 #include "internal/gc.h"
 #include "internal/io.h"
 #include "internal/object.h"
+#include "internal/imemo.h"
 #include "internal/vm.h"
 #include "ruby/encoding.h"
 #include "ruby/ruby.h"
@@ -142,6 +143,50 @@ char *strchr(char*,char);
 # define IS_WIN32 0
 #endif
 
+#ifdef HAVE_GETATTRLIST
+struct getattrlist_args {
+    const char *path;
+    int fd;
+    struct attrlist *list;
+    void *buf;
+    size_t size;
+    unsigned int options;
+};
+
+# define GETATTRLIST_ARGS(list_, buf_, options_) (struct getattrlist_args) \
+    {.list = list_, .buf = buf_, .size = sizeof(buf_), .options = options_}
+
+static void *
+nogvl_getattrlist(void *args)
+{
+    struct getattrlist_args *arg = args;
+    return (void *)(VALUE)getattrlist(arg->path, arg->list, arg->buf, arg->size, arg->options);
+}
+
+static int
+gvl_getattrlist(struct getattrlist_args *args, const char *path)
+{
+    args->path = path;
+    return IO_WITHOUT_GVL_INT(nogvl_getattrlist, args);
+}
+
+# ifdef HAVE_FGETATTRLIST
+static void *
+nogvl_fgetattrlist(void *args)
+{
+    struct getattrlist_args *arg = args;
+    return (void *)(VALUE)fgetattrlist(arg->fd, arg->list, arg->buf, arg->size, arg->options);
+}
+
+static int
+gvl_fgetattrlist(struct getattrlist_args *args, int fd)
+{
+    args->fd = fd;
+    return IO_WITHOUT_GVL_INT(nogvl_fgetattrlist, args);
+}
+# endif
+#endif
+
 #if NORMALIZE_UTF8PATH
 # if defined HAVE_FGETATTRLIST || !defined HAVE_GETATTRLIST
 #   define need_normalization(dirp, path) need_normalization(dirp)
@@ -154,10 +199,11 @@ need_normalization(DIR *dirp, const char *path)
 # if defined HAVE_FGETATTRLIST || defined HAVE_GETATTRLIST
     u_int32_t attrbuf[SIZEUP32(fsobj_tag_t)];
     struct attrlist al = {ATTR_BIT_MAP_COUNT, 0, ATTR_CMN_OBJTAG,};
+    struct getattrlist_args args = GETATTRLIST_ARGS(&al, attrbuf, 0);
 #   if defined HAVE_FGETATTRLIST
-    int ret = fgetattrlist(dirfd(dirp), &al, attrbuf, sizeof(attrbuf), 0);
+    int ret = gvl_fgetattrlist(&args, dirfd(dirp));
 #   else
-    int ret = getattrlist(path, &al, attrbuf, sizeof(attrbuf), 0);
+    int ret = gvl_getattrlist(&args, path);
 #   endif
     if (!ret) {
         const fsobj_tag_t *tag = (void *)(attrbuf+1);
@@ -471,23 +517,21 @@ dir_free(void *ptr)
     struct dir_data *dir = ptr;
 
     if (dir->dir) closedir(dir->dir);
-    xfree(dir);
 }
 
-static size_t
-dir_memsize(const void *ptr)
-{
-    return sizeof(struct dir_data);
-}
-
-RUBY_REFERENCES_START(dir_refs)
-    REF_EDGE(dir_data, path),
-RUBY_REFERENCES_END
+RUBY_REFERENCES(dir_refs) = {
+    RUBY_REF_EDGE(struct dir_data, path),
+    RUBY_REF_END
+};
 
 static const rb_data_type_t dir_data_type = {
     "dir",
-    {REFS_LIST_PTR(dir_refs), dir_free, dir_memsize,},
-    0, NULL, RUBY_TYPED_WB_PROTECTED | RUBY_TYPED_FREE_IMMEDIATELY | RUBY_TYPED_DECL_MARKING
+    {
+        RUBY_REFS_LIST_PTR(dir_refs),
+        dir_free,
+        NULL, // Nothing allocated externally, so don't need a memsize function
+    },
+    0, NULL, RUBY_TYPED_WB_PROTECTED | RUBY_TYPED_FREE_IMMEDIATELY | RUBY_TYPED_DECL_MARKING | RUBY_TYPED_EMBEDDABLE
 };
 
 static VALUE dir_close(VALUE);
@@ -510,7 +554,7 @@ nogvl_opendir(void *ptr)
 {
     const char *path = ptr;
 
-    return (void *)opendir(path);
+    return opendir(path);
 }
 
 static DIR *
@@ -521,12 +565,31 @@ opendir_without_gvl(const char *path)
 
         u.in = path;
 
-        return rb_thread_call_without_gvl(nogvl_opendir, u.out, RUBY_UBF_IO, 0);
+        return IO_WITHOUT_GVL(nogvl_opendir, u.out);
     }
     else
         return opendir(path);
 }
 
+static void
+close_dir_data(struct dir_data *dp)
+{
+    if (dp->dir) {
+        if (closedir(dp->dir) < 0) {
+            dp->dir = NULL;
+            rb_sys_fail("closedir");
+        }
+        dp->dir = NULL;
+    }
+}
+
+static void
+check_closedir(DIR *dirp)
+{
+    if (closedir(dirp) < 0)
+        rb_sys_fail("closedir");
+}
+
 static VALUE
 dir_initialize(rb_execution_context_t *ec, VALUE dir, VALUE dirname, VALUE enc)
 {
@@ -541,8 +604,7 @@ dir_initialize(rb_execution_context_t *ec, VALUE dir, VALUE dirname, VALUE enc)
     dirname = rb_str_dup_frozen(dirname);
 
     TypedData_Get_Struct(dir, struct dir_data, &dir_data_type, dp);
-    if (dp->dir) closedir(dp->dir);
-    dp->dir = NULL;
+    close_dir_data(dp);
     RB_OBJ_WRITE(dir, &dp->path, Qnil);
     dp->enc = fsenc;
     path = RSTRING_PTR(dirname);
@@ -556,7 +618,8 @@ dir_initialize(rb_execution_context_t *ec, VALUE dir, VALUE dirname, VALUE enc)
         else if (e == EIO) {
             u_int32_t attrbuf[1];
             struct attrlist al = {ATTR_BIT_MAP_COUNT, 0};
-            if (getattrlist(path, &al, attrbuf, sizeof(attrbuf), FSOPT_NOFOLLOW) == 0) {
+            struct getattrlist_args args = GETATTRLIST_ARGS(&al, attrbuf, FSOPT_NOFOLLOW);
+            if (gvl_getattrlist(&args, path) == 0) {
                 dp->dir = opendir_without_gvl(path);
             }
         }
@@ -589,6 +652,12 @@ dir_s_close(rb_execution_context_t *ec, VALUE klass, VALUE dir)
 }
 
 # if defined(HAVE_FDOPENDIR) && defined(HAVE_DIRFD)
+static void *
+nogvl_fdopendir(void *fd)
+{
+    return fdopendir((int)(VALUE)fd);
+}
+
 /*
  * call-seq:
  *   Dir.for_fd(fd) -> dir
@@ -615,7 +684,7 @@ dir_s_for_fd(VALUE klass, VALUE fd)
     struct dir_data *dp;
     VALUE dir = TypedData_Make_Struct(klass, struct dir_data, &dir_data_type, dp);
 
-    if (!(dp->dir = fdopendir(NUM2INT(fd)))) {
+    if (!(dp->dir = IO_WITHOUT_GVL(nogvl_fdopendir, (void *)(VALUE)NUM2INT(fd)))) {
         rb_sys_fail("fdopendir");
         UNREACHABLE_RETURN(Qnil);
     }
@@ -757,8 +826,28 @@ fundamental_encoding_p(rb_encoding *enc)
     }
 }
 # define READDIR(dir, enc) rb_w32_readdir((dir), (enc))
+# define READDIR_NOGVL READDIR
 #else
-# define READDIR(dir, enc) readdir((dir))
+NORETURN(static void *sys_failure(void *function));
+static void *
+sys_failure(void *function)
+{
+    rb_sys_fail(function);
+}
+
+static void *
+nogvl_readdir(void *dir)
+{
+    rb_errno_set(0);
+    if ((dir = readdir(dir)) == NULL) {
+        if (rb_errno())
+            rb_thread_call_with_gvl(sys_failure, (void *)"readdir");
+    }
+    return dir;
+}
+
+# define READDIR(dir, enc) IO_WITHOUT_GVL(nogvl_readdir, (void *)(dir))
+# define READDIR_NOGVL(dir, enc) nogvl_readdir((dir))
 #endif
 
 /* safe to use without GVL */
@@ -805,7 +894,7 @@ dir_read(VALUE dir)
     struct dirent *dp;
 
     GetDIR(dir, dirp);
-    errno = 0;
+    rb_errno_set(0);
     if ((dp = READDIR(dirp->dir, dirp->enc)) != NULL) {
         return rb_external_str_new_with_enc(dp->d_name, NAMLEN(dp), dirp->enc);
     }
@@ -903,7 +992,8 @@ dir_tell(VALUE dir)
     long pos;
 
     GetDIR(dir, dirp);
-    pos = telldir(dirp->dir);
+    if((pos = telldir(dirp->dir)) < 0)
+        rb_sys_fail("telldir");
     return rb_int2inum(pos);
 }
 #else
@@ -1022,8 +1112,7 @@ dir_close(VALUE dir)
 
     dirp = dir_get(dir);
     if (!dirp->dir) return Qnil;
-    closedir(dirp->dir);
-    dirp->dir = NULL;
+    close_dir_data(dirp);
 
     return Qnil;
 }
@@ -1039,16 +1128,68 @@ nogvl_chdir(void *ptr)
 static void
 dir_chdir0(VALUE path)
 {
-    if (chdir(RSTRING_PTR(path)) < 0)
+    if (IO_WITHOUT_GVL_INT(nogvl_chdir, (void*)RSTRING_PTR(path)) < 0)
         rb_sys_fail_path(path);
 }
 
-static int chdir_blocking = 0;
-static VALUE chdir_thread = Qnil;
+static struct {
+    VALUE thread;
+    VALUE path;
+    int line;
+    int blocking;
+} chdir_lock = {
+    .blocking = 0, .thread = Qnil,
+    .path = Qnil, .line = 0,
+};
+
+static void
+chdir_enter(void)
+{
+    if (chdir_lock.blocking == 0) {
+        chdir_lock.path = rb_source_location(&chdir_lock.line);
+    }
+    chdir_lock.blocking++;
+    if (NIL_P(chdir_lock.thread)) {
+        chdir_lock.thread = rb_thread_current();
+    }
+}
+
+static void
+chdir_leave(void)
+{
+    chdir_lock.blocking--;
+    if (chdir_lock.blocking == 0) {
+        chdir_lock.thread = Qnil;
+        chdir_lock.path = Qnil;
+        chdir_lock.line = 0;
+    }
+}
+
+static int
+chdir_alone_block_p(void)
+{
+    int block_given = rb_block_given_p();
+    if (chdir_lock.blocking > 0) {
+        if (rb_thread_current() != chdir_lock.thread)
+            rb_raise(rb_eRuntimeError, "conflicting chdir during another chdir block");
+        if (!block_given) {
+            if (!NIL_P(chdir_lock.path)) {
+                rb_warn("conflicting chdir during another chdir block\n"
+                        "%" PRIsVALUE ":%d: note: previous chdir was here",
+                        chdir_lock.path, chdir_lock.line);
+            }
+            else {
+                rb_warn("conflicting chdir during another chdir block");
+            }
+        }
+    }
+    return block_given;
+}
 
 struct chdir_data {
     VALUE old_path, new_path;
     int done;
+    bool yield_path;
 };
 
 static VALUE
@@ -1057,10 +1198,8 @@ chdir_yield(VALUE v)
     struct chdir_data *args = (void *)v;
     dir_chdir0(args->new_path);
     args->done = TRUE;
-    chdir_blocking++;
-    if (NIL_P(chdir_thread))
-        chdir_thread = rb_thread_current();
-    return rb_yield(args->new_path);
+    chdir_enter();
+    return args->yield_path ? rb_yield(args->new_path) : rb_yield_values2(0, NULL);
 }
 
 static VALUE
@@ -1068,14 +1207,34 @@ chdir_restore(VALUE v)
 {
     struct chdir_data *args = (void *)v;
     if (args->done) {
-        chdir_blocking--;
-        if (chdir_blocking == 0)
-            chdir_thread = Qnil;
+        chdir_leave();
         dir_chdir0(args->old_path);
     }
     return Qnil;
 }
 
+static VALUE
+chdir_path(VALUE path, bool yield_path)
+{
+    if (chdir_alone_block_p()) {
+        struct chdir_data args;
+
+        args.old_path = rb_str_encode_ospath(rb_dir_getwd());
+        args.new_path = path;
+        args.done = FALSE;
+        args.yield_path = yield_path;
+        return rb_ensure(chdir_yield, (VALUE)&args, chdir_restore, (VALUE)&args);
+    }
+    else {
+        char *p = RSTRING_PTR(path);
+        int r = IO_WITHOUT_GVL_INT(nogvl_chdir, p);
+        if (r < 0)
+            rb_sys_fail_path(path);
+    }
+
+    return INT2FIX(0);
+}
+
 /*
  * call-seq:
  *   Dir.chdir(new_dirpath) -> 0
@@ -1102,7 +1261,7 @@ chdir_restore(VALUE v)
  *
  * - Calls the block with the argument.
  * - Changes to the given directory.
- * - Executes the block
+ * - Executes the block (yielding the new path).
  * - Restores the previous working directory.
  * - Returns the block's return value.
  *
@@ -1156,30 +1315,7 @@ dir_s_chdir(int argc, VALUE *argv, VALUE obj)
         path = rb_str_new2(dist);
     }
 
-    if (chdir_blocking > 0) {
-        if (rb_thread_current() != chdir_thread)
-            rb_raise(rb_eRuntimeError, "conflicting chdir during another chdir block");
-        if (!rb_block_given_p())
-            rb_warn("conflicting chdir during another chdir block");
-    }
-
-    if (rb_block_given_p()) {
-        struct chdir_data args;
-
-        args.old_path = rb_str_encode_ospath(rb_dir_getwd());
-        args.new_path = path;
-        args.done = FALSE;
-        return rb_ensure(chdir_yield, (VALUE)&args, chdir_restore, (VALUE)&args);
-    }
-    else {
-        char *p = RSTRING_PTR(path);
-        int r = (int)(VALUE)rb_thread_call_without_gvl(nogvl_chdir, p,
-                                                        RUBY_UBF_IO, 0);
-        if (r < 0)
-            rb_sys_fail_path(path);
-    }
-
-    return INT2FIX(0);
+    return chdir_path(path, true);
 }
 
 #if defined(HAVE_FCHDIR) && defined(HAVE_DIRFD) && HAVE_FCHDIR && HAVE_DIRFD
@@ -1194,7 +1330,7 @@ nogvl_fchdir(void *ptr)
 static void
 dir_fchdir(int fd)
 {
-    if (fchdir(fd) < 0)
+    if (IO_WITHOUT_GVL_INT(nogvl_fchdir, (void *)&fd) < 0)
         rb_sys_fail("fchdir");
 }
 
@@ -1210,9 +1346,7 @@ fchdir_yield(VALUE v)
     struct fchdir_data *args = (void *)v;
     dir_fchdir(args->fd);
     args->done = TRUE;
-    chdir_blocking++;
-    if (NIL_P(chdir_thread))
-        chdir_thread = rb_thread_current();
+    chdir_enter();
     return rb_yield_values(0);
 }
 
@@ -1221,9 +1355,7 @@ fchdir_restore(VALUE v)
 {
     struct fchdir_data *args = (void *)v;
     if (args->done) {
-        chdir_blocking--;
-        if (chdir_blocking == 0)
-            chdir_thread = Qnil;
+        chdir_leave();
         dir_fchdir(RB_NUM2INT(dir_fileno(args->old_dir)));
     }
     dir_close(args->old_dir);
@@ -1248,16 +1380,14 @@ fchdir_restore(VALUE v)
  *   Dir.pwd # => "/var/spool/mail"
  *   dir  = Dir.new('/usr')
  *   fd = dir.fileno
- *   Dir.fchdir(fd) do
- *     Dir.pwd # => "/usr"
- *   end
- *   Dir.pwd # => "/var/spool/mail"
+ *   Dir.fchdir(fd)
+ *   Dir.pwd # => "/usr"
  *
  * With a block, temporarily changes the working directory:
  *
  * - Calls the block with the argument.
  * - Changes to the given directory.
- * - Executes the block
+ * - Executes the block (yields no args).
  * - Restores the previous working directory.
  * - Returns the block's return value.
  *
@@ -1265,7 +1395,9 @@ fchdir_restore(VALUE v)
  *
  *   Dir.chdir('/var/spool/mail')
  *   Dir.pwd # => "/var/spool/mail"
- *   Dir.chdir('/tmp') do
+ *   dir  = Dir.new('/tmp')
+ *   fd = dir.fileno
+ *   Dir.fchdir(fd) do
  *     Dir.pwd # => "/tmp"
  *   end
  *   Dir.pwd # => "/var/spool/mail"
@@ -1287,14 +1419,7 @@ dir_s_fchdir(VALUE klass, VALUE fd_value)
 {
     int fd = RB_NUM2INT(fd_value);
 
-    if (chdir_blocking > 0) {
-        if (rb_thread_current() != chdir_thread)
-            rb_raise(rb_eRuntimeError, "conflicting chdir during another chdir block");
-        if (!rb_block_given_p())
-            rb_warn("conflicting chdir during another chdir block");
-    }
-
-    if (rb_block_given_p()) {
+    if (chdir_alone_block_p()) {
         struct fchdir_data args;
         args.old_dir = dir_s_alloc(klass);
         dir_initialize(NULL, args.old_dir, rb_fstring_cstr("."), Qnil);
@@ -1303,8 +1428,7 @@ dir_s_fchdir(VALUE klass, VALUE fd_value)
         return rb_ensure(fchdir_yield, (VALUE)&args, fchdir_restore, (VALUE)&args);
     }
     else {
-        int r = (int)(VALUE)rb_thread_call_without_gvl(nogvl_fchdir, &fd,
-                                                       RUBY_UBF_IO, 0);
+        int r = IO_WITHOUT_GVL_INT(nogvl_fchdir, &fd);
         if (r < 0)
             rb_sys_fail("fchdir");
     }
@@ -1317,27 +1441,35 @@ dir_s_fchdir(VALUE klass, VALUE fd_value)
 
 /*
  * call-seq:
- *   chdir -> nil
+ *   chdir -> 0
+ *   chdir { ... } -> object
  *
- * Changes the current working directory to the path of +self+:
+ * Changes the current working directory to +self+:
  *
  *   Dir.pwd # => "/"
  *   dir = Dir.new('example')
  *   dir.chdir
- *   dir.pwd # => "/example"
+ *   Dir.pwd # => "/example"
+ *
+ * With a block, temporarily changes the working directory:
+ *
+ * - Calls the block.
+ * - Changes to the given directory.
+ * - Executes the block (yields no args).
+ * - Restores the previous working directory.
+ * - Returns the block's return value.
  *
+ * Uses Dir.fchdir if available, and Dir.chdir if not, see those
+ * methods for caveats.
  */
 static VALUE
 dir_chdir(VALUE dir)
 {
 #if defined(HAVE_FCHDIR) && defined(HAVE_DIRFD) && HAVE_FCHDIR && HAVE_DIRFD
-    dir_s_fchdir(rb_cDir, dir_fileno(dir));
+    return dir_s_fchdir(rb_cDir, dir_fileno(dir));
 #else
-    VALUE path = dir_get(dir)->path;
-    dir_s_chdir(1, &path, rb_cDir);
+    return chdir_path(dir_get(dir)->path, false);
 #endif
-
-    return Qnil;
 }
 
 #ifndef _WIN32
@@ -1348,19 +1480,15 @@ rb_dir_getwd_ospath(void)
     VALUE cwd;
     VALUE path_guard;
 
-#undef RUBY_UNTYPED_DATA_WARNING
-#define RUBY_UNTYPED_DATA_WARNING 0
-    path_guard = Data_Wrap_Struct((VALUE)0, NULL, RUBY_DEFAULT_FREE, NULL);
+    path_guard = rb_imemo_tmpbuf_auto_free_pointer();
     path = ruby_getcwd();
-    DATA_PTR(path_guard) = path;
+    rb_imemo_tmpbuf_set_ptr(path_guard, path);
 #ifdef __APPLE__
     cwd = rb_str_normalize_ospath(path, strlen(path));
 #else
     cwd = rb_str_new2(path);
 #endif
-    DATA_PTR(path_guard) = 0;
-
-    xfree(path);
+    rb_free_tmp_buffer(&path_guard);
     return cwd;
 }
 #endif
@@ -1422,6 +1550,12 @@ check_dirname(VALUE dir)
 }
 
 #if defined(HAVE_CHROOT)
+static void *
+nogvl_chroot(void *dirname)
+{
+    return (void *)(VALUE)chroot((const char *)dirname);
+}
+
 /*
  * call-seq:
  *   Dir.chroot(dirpath) -> 0
@@ -1438,7 +1572,7 @@ static VALUE
 dir_s_chroot(VALUE dir, VALUE path)
 {
     path = check_dirname(path);
-    if (chroot(RSTRING_PTR(path)) == -1)
+    if (IO_WITHOUT_GVL_INT(nogvl_chroot, (void *)RSTRING_PTR(path)) == -1)
         rb_sys_fail_path(path);
 
     return INT2FIX(0);
@@ -1492,7 +1626,7 @@ dir_s_mkdir(int argc, VALUE *argv, VALUE obj)
 
     path = check_dirname(path);
     m.path = RSTRING_PTR(path);
-    r = (int)(VALUE)rb_thread_call_without_gvl(nogvl_mkdir, &m, RUBY_UBF_IO, 0);
+    r = IO_WITHOUT_GVL_INT(nogvl_mkdir, &m);
     if (r < 0)
         rb_sys_fail_path(path);
 
@@ -1525,7 +1659,7 @@ dir_s_rmdir(VALUE obj, VALUE dir)
 
     dir = check_dirname(dir);
     p = RSTRING_PTR(dir);
-    r = (int)(VALUE)rb_thread_call_without_gvl(nogvl_rmdir, (void *)p, RUBY_UBF_IO, 0);
+    r = IO_WITHOUT_GVL_INT(nogvl_rmdir, (void *)p);
     if (r < 0)
         rb_sys_fail_path(dir);
 
@@ -1615,11 +1749,11 @@ to_be_ignored(int e)
 }
 
 #ifdef _WIN32
-#define STAT(p, s)	rb_w32_ustati128((p), (s))
-#undef lstat
-#define lstat(p, s)	rb_w32_ulstati128((p), (s))
+#define STAT(args)	(int)(VALUE)nogvl_stat(&(args))
+#define LSTAT(args)	(int)(VALUE)nogvl_lstat(&(args))
 #else
-#define STAT(p, s)	stat((p), (s))
+#define STAT(args)	IO_WITHOUT_GVL_INT(nogvl_stat, (void *)&(args))
+#define LSTAT(args)	IO_WITHOUT_GVL_INT(nogvl_lstat, (void *)&(args))
 #endif
 
 typedef int ruby_glob_errfunc(const char*, VALUE, const void*, int);
@@ -1640,14 +1774,50 @@ at_subpath(int fd, size_t baselen, const char *path)
     return *path ? path : ".";
 }
 
+#if USE_OPENDIR_AT
+struct fstatat_args {
+    int fd;
+    int flag;
+    const char *path;
+    struct stat *pst;
+};
+
+static void *
+nogvl_fstatat(void *args)
+{
+    struct fstatat_args *arg = (struct fstatat_args *)args;
+    return (void *)(VALUE)fstatat(arg->fd, arg->path, arg->pst, arg->flag);
+}
+#else
+struct stat_args {
+    const char *path;
+    struct stat *pst;
+};
+
+static void *
+nogvl_stat(void *args)
+{
+    struct stat_args *arg = (struct stat_args *)args;
+    return (void *)(VALUE)stat(arg->path, arg->pst);
+}
+#endif
+
 /* System call with warning */
 static int
 do_stat(int fd, size_t baselen, const char *path, struct stat *pst, int flags, rb_encoding *enc)
 {
 #if USE_OPENDIR_AT
-    int ret = fstatat(fd, at_subpath(fd, baselen, path), pst, 0);
+    struct fstatat_args args;
+    args.fd = fd;
+    args.path = path;
+    args.pst = pst;
+    args.flag = 0;
+    int ret = IO_WITHOUT_GVL_INT(nogvl_fstatat, (void *)&args);
 #else
-    int ret = STAT(path, pst);
+    struct stat_args args;
+    args.path = path;
+    args.pst = pst;
+    int ret = STAT(args);
 #endif
     if (ret < 0 && !to_be_ignored(errno))
         sys_warning(path, enc);
@@ -1656,13 +1826,30 @@ do_stat(int fd, size_t baselen, const char *path, struct stat *pst, int flags, r
 }
 
 #if defined HAVE_LSTAT || defined lstat || USE_OPENDIR_AT
+#if !USE_OPENDIR_AT
+static void *
+nogvl_lstat(void *args)
+{
+    struct stat_args *arg = (struct stat_args *)args;
+    return (void *)(VALUE)lstat(arg->path, arg->pst);
+}
+#endif
+
 static int
 do_lstat(int fd, size_t baselen, const char *path, struct stat *pst, int flags, rb_encoding *enc)
 {
 #if USE_OPENDIR_AT
-    int ret = fstatat(fd, at_subpath(fd, baselen, path), pst, AT_SYMLINK_NOFOLLOW);
+    struct fstatat_args args;
+    args.fd = fd;
+    args.path = path;
+    args.pst = pst;
+    args.flag = AT_SYMLINK_NOFOLLOW;
+    int ret = IO_WITHOUT_GVL_INT(nogvl_fstatat, (void *)&args);
 #else
-    int ret = lstat(path, pst);
+    struct stat_args args;
+    args.path = path;
+    args.pst = pst;
+    int ret = LSTAT(args);
 #endif
     if (ret < 0 && !to_be_ignored(errno))
         sys_warning(path, enc);
@@ -1723,7 +1910,7 @@ nogvl_opendir_at(void *ptr)
             /* fallthrough*/
           case 0:
             if (fd >= 0) close(fd);
-            errno = e;
+            rb_errno_set(e);
         }
     }
 #else  /* !USE_OPENDIR_AT */
@@ -1744,7 +1931,7 @@ opendir_at(int basefd, const char *path)
     oaa.path = path;
 
     if (vm_initialized)
-        return rb_thread_call_without_gvl(nogvl_opendir_at, &oaa, RUBY_UBF_IO, 0);
+        return IO_WITHOUT_GVL(nogvl_opendir_at, &oaa);
     else
         return nogvl_opendir_at(&oaa);
 }
@@ -2023,14 +2210,15 @@ is_case_sensitive(DIR *dirp, const char *path)
     const vol_capabilities_attr_t *const cap = attrbuf[0].cap;
     const int idx = VOL_CAPABILITIES_FORMAT;
     const uint32_t mask = VOL_CAP_FMT_CASE_SENSITIVE;
-
+    struct getattrlist_args args = GETATTRLIST_ARGS(&al, attrbuf, FSOPT_NOFOLLOW);
 #   if defined HAVE_FGETATTRLIST
-    if (fgetattrlist(dirfd(dirp), &al, attrbuf, sizeof(attrbuf), FSOPT_NOFOLLOW))
-        return -1;
+    int ret = gvl_fgetattrlist(&args, dirfd(dirp));
 #   else
-    if (getattrlist(path, &al, attrbuf, sizeof(attrbuf), FSOPT_NOFOLLOW))
-        return -1;
+    int ret = gvl_getattrlist(&args, path);
 #   endif
+    if (ret)
+        return -1;
+
     if (!(cap->valid[idx] & mask))
         return -1;
     return (cap->capabilities[idx] & mask) != 0;
@@ -2053,7 +2241,8 @@ replace_real_basename(char *path, long base, rb_encoding *enc, int norm_p, int f
     IF_NORMALIZE_UTF8PATH(VALUE utf8str = Qnil);
 
     *type = path_noent;
-    if (getattrlist(path, &al, attrbuf, sizeof(attrbuf), FSOPT_NOFOLLOW)) {
+    struct getattrlist_args args = GETATTRLIST_ARGS(&al, attrbuf, FSOPT_NOFOLLOW);
+    if (gvl_getattrlist(&args, path)) {
         if (!to_be_ignored(errno))
             sys_warning(path, enc);
         return path;
@@ -2426,7 +2615,7 @@ static void
 glob_dir_finish(ruby_glob_entries_t *ent, int flags)
 {
     if (flags & FNM_GLOB_NOSORT) {
-        closedir(ent->nosort.dirp);
+        check_closedir(ent->nosort.dirp);
         ent->nosort.dirp = NULL;
     }
     else if (ent->sort.entries) {
@@ -2457,7 +2646,7 @@ glob_opendir(ruby_glob_entries_t *ent, DIR *dirp, int flags, rb_encoding *enc)
 #ifdef _WIN32
         if ((capacity = dirp->nfiles) > 0) {
             if (!(newp = GLOB_ALLOC_N(rb_dirent_t, capacity))) {
-                closedir(dirp);
+                check_closedir(dirp);
                 return NULL;
             }
             ent->sort.entries = newp;
@@ -2477,7 +2666,7 @@ glob_opendir(ruby_glob_entries_t *ent, DIR *dirp, int flags, rb_encoding *enc)
             ent->sort.entries[count++] = rdp;
             ent->sort.count = count;
         }
-        closedir(dirp);
+        check_closedir(dirp);
         if (count < capacity) {
             if (!(newp = GLOB_REALLOC_N(ent->sort.entries, count))) {
                 glob_dir_finish(ent, 0);
@@ -2492,7 +2681,7 @@ glob_opendir(ruby_glob_entries_t *ent, DIR *dirp, int flags, rb_encoding *enc)
 
   nomem:
     glob_dir_finish(ent, 0);
-    closedir(dirp);
+    check_closedir(dirp);
     return NULL;
 }
 
@@ -2655,7 +2844,7 @@ glob_helper(
 
 # if NORMALIZE_UTF8PATH
         if (!(norm_p || magical || recursive)) {
-            closedir(dirp);
+            check_closedir(dirp);
             goto literally;
         }
 # endif
@@ -3116,7 +3305,7 @@ push_glob(VALUE ary, VALUE str, VALUE base, int flags)
     fd = AT_FDCWD;
     if (!NIL_P(base)) {
         if (!RB_TYPE_P(base, T_STRING) || !rb_enc_check(str, base)) {
-            struct dir_data *dirp = DATA_PTR(base);
+            struct dir_data *dirp = RTYPEDDATA_GET_DATA(base);
             if (!dirp->dir) dir_closed();
 #ifdef HAVE_DIRFD
             if ((fd = dirfd(dirp->dir)) == -1)
@@ -3357,7 +3546,7 @@ dir_s_each_child(int argc, VALUE *argv, VALUE io)
  *   "main.rb"
  *
  * If no block is given, returns an enumerator.
-  */
+ */
 static VALUE
 dir_each_child_m(VALUE dir)
 {
@@ -3478,6 +3667,9 @@ file_s_fnmatch(int argc, VALUE *argv, VALUE obj)
  * call-seq:
  *   Dir.home(user_name = nil) -> dirpath
  *
+ * Returns the home directory path of the user specified with +user_name+
+ * if it is not +nil+, or the current login user:
+ *
  *   Dir.home         # => "/home/me"
  *   Dir.home('root') # => "/root"
  *
@@ -3492,7 +3684,7 @@ dir_s_home(int argc, VALUE *argv, VALUE obj)
     rb_check_arity(argc, 0, 1);
     user = (argc > 0) ? argv[0] : Qnil;
     if (!NIL_P(user)) {
-        SafeStringValue(user);
+        StringValue(user);
         rb_must_asciicompat(user);
         u = StringValueCStr(user);
         if (*u) {
@@ -3514,6 +3706,7 @@ dir_s_home(int argc, VALUE *argv, VALUE obj)
  *   Dir.exist?('/nosuch')          # => false
  *   Dir.exist?('/example/main.rb') # => false
  *
+ * Same as File.directory?.
  *
  */
 VALUE
@@ -3543,13 +3736,13 @@ nogvl_dir_empty_p(void *ptr)
             return (void *)INT2FIX(e);
         }
     }
-    while ((dp = READDIR(dir, NULL)) != NULL) {
+    while ((dp = READDIR_NOGVL(dir, NULL)) != NULL) {
         if (!to_be_skipped(dp)) {
             result = Qfalse;
             break;
         }
     }
-    closedir(dir);
+    check_closedir(dir);
     return (void *)result;
 }
 
@@ -3585,12 +3778,13 @@ rb_dir_s_empty_p(VALUE obj, VALUE dirname)
     {
         u_int32_t attrbuf[SIZEUP32(fsobj_tag_t)];
         struct attrlist al = {ATTR_BIT_MAP_COUNT, 0, ATTR_CMN_OBJTAG,};
-        if (getattrlist(path, &al, attrbuf, sizeof(attrbuf), 0) != 0)
+        struct getattrlist_args args = GETATTRLIST_ARGS(&al, attrbuf, 0);
+        if (gvl_getattrlist(&args, path) != 0)
             rb_sys_fail_path(orig);
         if (*(const fsobj_tag_t *)(attrbuf+1) == VT_HFS) {
             al.commonattr = 0;
             al.dirattr = ATTR_DIR_ENTRYCOUNT;
-            if (getattrlist(path, &al, attrbuf, sizeof(attrbuf), 0) == 0) {
+            if (gvl_getattrlist(&args, path) == 0) {
                 if (attrbuf[0] >= 2 * sizeof(u_int32_t))
                     return RBOOL(attrbuf[1] == 0);
                 if (false_on_notdir) return Qfalse;
@@ -3600,8 +3794,7 @@ rb_dir_s_empty_p(VALUE obj, VALUE dirname)
     }
 #endif
 
-    result = (VALUE)rb_thread_call_without_gvl(nogvl_dir_empty_p, (void *)path,
-                                            RUBY_UBF_IO, 0);
+    result = (VALUE)IO_WITHOUT_GVL(nogvl_dir_empty_p, (void *)path);
     if (FIXNUM_P(result)) {
         rb_syserr_fail_path((int)FIX2LONG(result), orig);
     }
@@ -3611,6 +3804,9 @@ rb_dir_s_empty_p(VALUE obj, VALUE dirname)
 void
 Init_Dir(void)
 {
+    rb_gc_register_address(&chdir_lock.path);
+    rb_gc_register_address(&chdir_lock.thread);
+
     rb_cDir = rb_define_class("Dir", rb_cObject);
 
     rb_include_module(rb_cDir, rb_mEnumerable);
@@ -3654,12 +3850,20 @@ Init_Dir(void)
 
     rb_define_singleton_method(rb_cFile,"fnmatch", file_s_fnmatch, -1);
     rb_define_singleton_method(rb_cFile,"fnmatch?", file_s_fnmatch, -1);
+
+    /* {File::FNM_NOESCAPE}[rdoc-ref:File::Constants@File-3A-3AFNM_NOESCAPE] */
     rb_file_const("FNM_NOESCAPE", INT2FIX(FNM_NOESCAPE));
+    /* {File::FNM_PATHNAME}[rdoc-ref:File::Constants@File-3A-3AFNM_PATHNAME] */
     rb_file_const("FNM_PATHNAME", INT2FIX(FNM_PATHNAME));
+    /* {File::FNM_DOTMATCH}[rdoc-ref:File::Constants@File-3A-3AFNM_DOTMATCH] */
     rb_file_const("FNM_DOTMATCH", INT2FIX(FNM_DOTMATCH));
+    /* {File::FNM_CASEFOLD}[rdoc-ref:File::Constants@File-3A-3AFNM_CASEFOLD] */
     rb_file_const("FNM_CASEFOLD", INT2FIX(FNM_CASEFOLD));
+    /* {File::FNM_EXTGLOB}[rdoc-ref:File::Constants@File-3A-3AFNM_EXTGLOB] */
     rb_file_const("FNM_EXTGLOB", INT2FIX(FNM_EXTGLOB));
+    /* {File::FNM_SYSCASE}[rdoc-ref:File::Constants@File-3A-3AFNM_SYSCASE] */
     rb_file_const("FNM_SYSCASE", INT2FIX(FNM_SYSCASE));
+    /* {File::FNM_SHORTNAME}[rdoc-ref:File::Constants@File-3A-3AFNM_SHORTNAME] */
     rb_file_const("FNM_SHORTNAME", INT2FIX(FNM_SHORTNAME));
 }
 
diff --git a/dir.rb b/dir.rb
index 7de62da921410b..a05bd18630b923 100644
--- a/dir.rb
+++ b/dir.rb
@@ -46,14 +46,14 @@
 # The stream has a _position_, which is the index of an entry in the directory:
 #
 # - The initial position is zero (before the first entry).
-# - \Method #tell (aliased as #pos) returns the position.
-# - \Method #pos= sets the position (but ignores a value outside the stream),
+# - Method #tell (aliased as #pos) returns the position.
+# - Method #pos= sets the position (but ignores a value outside the stream),
 #   and returns the position.
-# - \Method #seek is like #pos=, but returns +self+ (convenient for chaining).
-# - \Method #read, if not at end-of-stream, reads the next entry and increments
+# - Method #seek is like #pos=, but returns +self+ (convenient for chaining).
+# - Method #read, if not at end-of-stream, reads the next entry and increments
 #   the position;
 #   if at end-of-stream, does not increment the position.
-# - \Method #rewind sets the position to zero.
+# - Method #rewind sets the position to zero.
 #
 # Examples (using the {simple file tree}[rdoc-ref:Dir@About+the+Examples]):
 #
@@ -83,7 +83,7 @@
 #
 # == What's Here
 #
-# First, what's elsewhere. \Class \Dir:
+# First, what's elsewhere. Class \Dir:
 #
 # - Inherits from {class Object}[rdoc-ref:Object@What-27s+Here].
 # - Includes {module Enumerable}[rdoc-ref:Enumerable@What-27s+Here],
@@ -224,8 +224,8 @@ def self.[](*args, base: nil, sort: true)
   end
 
   # call-seq:
-  #   Dir.glob(*patterns, flags: 0, base: nil, sort: true) -> array
-  #   Dir.glob(*patterns, flags: 0, base: nil, sort: true) {|entry_name| ... } -> nil
+  #   Dir.glob(patterns, flags: 0, base: nil, sort: true) -> array
+  #   Dir.glob(patterns, flags: 0, base: nil, sort: true) {|entry_name| ... } -> nil
   #
   # Forms an array _entry_names_ of the entry names selected by the arguments.
   #
@@ -320,7 +320,7 @@ def self.[](*args, base: nil, sort: true)
   #     Dir.glob('io.?') # => ["io.c"]
   #
   # - <tt>'[_set_]'</tt>: Matches any one character in the string _set_;
-  #   behaves like a {Regexp character class}[rdoc-ref:regexp.rdoc@Character+Classes],
+  #   behaves like a {Regexp character class}[rdoc-ref:Regexp@Character+Classes],
   #   including set negation (<tt>'[^a-z]'</tt>):
   #
   #     Dir.glob('*.[a-z][a-z]').take(3)
@@ -328,7 +328,7 @@ def self.[](*args, base: nil, sort: true)
   #
   # - <tt>'{_abc_,_xyz_}'</tt>:
   #   Matches either string _abc_ or string _xyz_;
-  #   behaves like {Regexp alternation}[rdoc-ref:regexp.rdoc@Alternation]:
+  #   behaves like {Regexp alternation}[rdoc-ref:Regexp@Alternation]:
   #
   #     Dir.glob('{LEGAL,BSDL}') # => ["LEGAL", "BSDL"]
   #
@@ -408,6 +408,7 @@ def self.[](*args, base: nil, sort: true)
   #   specifies that patterns may match short names if they exist; Windows only.
   #
   def self.glob(pattern, _flags = 0, flags: _flags, base: nil, sort: true)
+    Primitive.attr! :use_block
     Primitive.dir_s_glob(pattern, flags, base, sort)
   end
 end
diff --git a/dln.c b/dln.c
index 77bfe91b2875b5..5f6b1f0564c7b6 100644
--- a/dln.c
+++ b/dln.c
@@ -26,6 +26,7 @@ static void dln_loaderror(const char *format, ...);
 #include "dln.h"
 #include "internal.h"
 #include "internal/compilers.h"
+#include "internal/namespace.h"
 
 #ifdef HAVE_STDLIB_H
 # include <stdlib.h>
@@ -107,36 +108,45 @@ dln_loaderror(const char *format, ...)
 #endif
 
 #if defined(_WIN32) || defined(USE_DLN_DLOPEN)
-static size_t
-init_funcname_len(const char **file)
+struct string_part {
+    const char *ptr;
+    size_t len;
+};
+
+static struct string_part
+init_funcname_len(const char *file)
 {
-    const char *p = *file, *base, *dot = NULL;
+    const char *p = file, *base, *dot = NULL;
 
     /* Load the file as an object one */
     for (base = p; *p; p++) { /* Find position of last '/' */
         if (*p == '.' && !dot) dot = p;
         if (isdirsep(*p)) base = p+1, dot = NULL;
     }
-    *file = base;
     /* Delete suffix if it exists */
-    return (dot ? dot : p) - base;
+    const size_t len = (dot ? dot : p) - base;
+    return (struct string_part){base, len};
 }
 
-static const char funcname_prefix[sizeof(FUNCNAME_PREFIX) - 1] = FUNCNAME_PREFIX;
-
-#define init_funcname(buf, file) do {\
-    const char *base = (file);\
-    const size_t flen = init_funcname_len(&base);\
-    const size_t plen = sizeof(funcname_prefix);\
-    char *const tmp = ALLOCA_N(char, plen+flen+1);\
-    if (!tmp) {\
-        dln_memerror();\
-    }\
-    memcpy(tmp, funcname_prefix, plen);\
-    memcpy(tmp+plen, base, flen);\
-    tmp[plen+flen] = '\0';\
-    *(buf) = tmp;\
+static inline char *
+concat_funcname(char *buf, const char *prefix, size_t plen, const struct string_part base)
+{
+    if (!buf) {
+        dln_memerror();
+    }
+    memcpy(buf, prefix, plen);
+    memcpy(buf + plen, base.ptr, base.len);
+    buf[plen + base.len] = '\0';
+    return buf;
+}
+
+#define build_funcname(prefix, buf, file) do {\
+    const struct string_part f = init_funcname_len(file);\
+    const size_t plen = sizeof(prefix "") - 1;\
+    *(buf) = concat_funcname(ALLOCA_N(char, plen+f.len+1), prefix, plen, f);\
 } while (0)
+
+#define init_funcname(buf, file) build_funcname(FUNCNAME_PREFIX, buf, file)
 #endif
 
 #ifdef USE_DLN_DLOPEN
@@ -272,13 +282,15 @@ rb_w32_check_imported(HMODULE ext, HMODULE mine)
 static bool
 dln_incompatible_func(void *handle, const char *funcname, void *const fp, const char **libname)
 {
-    Dl_info dli;
     void *ex = dlsym(handle, funcname);
     if (!ex) return false;
     if (ex == fp) return false;
+#  if defined(HAVE_DLADDR) && !defined(__CYGWIN__)
+    Dl_info dli;
     if (dladdr(ex, &dli)) {
         *libname = dli.dli_fname;
     }
+#  endif
     return true;
 }
 
@@ -371,10 +383,14 @@ dln_open(const char *file)
 # endif
 # ifndef RTLD_GLOBAL
 #  define RTLD_GLOBAL 0
+# endif
+# ifndef RTLD_LOCAL
+#  define RTLD_LOCAL 0 /* TODO: 0??? some systems (including libc) use 0x00100 for RTLD_GLOBAL, 0x00000 for RTLD_LOCAL */
 # endif
 
     /* Load file */
-    handle = dlopen(file, RTLD_LAZY|RTLD_GLOBAL);
+    int mode = rb_namespace_available() ? RTLD_LAZY|RTLD_LOCAL : RTLD_LAZY|RTLD_GLOBAL;
+    handle = dlopen(file, mode);
     if (handle == NULL) {
         error = dln_strerror();
         goto failed;
@@ -419,33 +435,63 @@ dln_open(const char *file)
 static void *
 dln_sym(void *handle, const char *symbol)
 {
-    void *func;
-    const char *error;
-
 #if defined(_WIN32)
-    char message[1024];
+    return GetProcAddress(handle, symbol);
+#elif defined(USE_DLN_DLOPEN)
+    return dlsym(handle, symbol);
+#endif
+}
+
+static uintptr_t
+dln_sym_func(void *handle, const char *symbol)
+{
+    void *func = dln_sym(handle, symbol);
 
-    func = GetProcAddress(handle, symbol);
     if (func == NULL) {
+        const char *error;
+#if defined(_WIN32)
+        char message[1024];
         error = dln_strerror();
-        goto failed;
-    }
-
 #elif defined(USE_DLN_DLOPEN)
-    func = dlsym(handle, symbol);
-    if (func == NULL) {
         const size_t errlen = strlen(error = dln_strerror()) + 1;
         error = memcpy(ALLOCA_N(char, errlen), error, errlen);
-        goto failed;
-    }
 #endif
+        dln_loaderror("%s - %s", error, symbol);
+    }
+    return (uintptr_t)func;
+}
 
-    return func;
+#define dln_sym_callable(rettype, argtype, handle, symbol) \
+    (*(rettype (*)argtype)dln_sym_func(handle, symbol))
+#endif
 
-  failed:
-    dln_loaderror("%s - %s", error, symbol);
-}
+void *
+dln_symbol(void *handle, const char *symbol)
+{
+#if defined(_WIN32) || defined(USE_DLN_DLOPEN)
+    if (EXTERNAL_PREFIX[0]) {
+        const size_t symlen = strlen(symbol);
+        char *const tmp = ALLOCA_N(char, symlen + sizeof(EXTERNAL_PREFIX));
+        if (!tmp) dln_memerror();
+        memcpy(tmp, EXTERNAL_PREFIX, sizeof(EXTERNAL_PREFIX) - 1);
+        memcpy(tmp + sizeof(EXTERNAL_PREFIX) - 1, symbol, symlen + 1);
+        symbol = tmp;
+    }
+    if (handle == NULL) {
+# if defined(USE_DLN_DLOPEN)
+        handle = dlopen(NULL, RTLD_LAZY | RTLD_GLOBAL);
+# elif defined(_WIN32)
+        handle = rb_libruby_handle();
+# else
+        return NULL;
+# endif
+    }
+    return dln_sym(handle, symbol);
+#else
+    return NULL;
 #endif
+}
+
 
 #if defined(RUBY_DLN_CHECK_ABI) && defined(USE_DLN_DLOPEN)
 static bool
@@ -456,26 +502,23 @@ abi_check_enabled_p(void)
 }
 #endif
 
-void *
-dln_load(const char *file)
+static void *
+dln_load_and_init(const char *file, const char *init_fct_name)
 {
 #if defined(_WIN32) || defined(USE_DLN_DLOPEN)
     void *handle = dln_open(file);
 
 #ifdef RUBY_DLN_CHECK_ABI
-    unsigned long long (*abi_version_fct)(void) = (unsigned long long(*)(void))dln_sym(handle, "ruby_abi_version");
-    unsigned long long binary_abi_version = (*abi_version_fct)();
-    if (binary_abi_version != ruby_abi_version() && abi_check_enabled_p()) {
+    typedef unsigned long long abi_version_number;
+    abi_version_number binary_abi_version =
+        dln_sym_callable(abi_version_number, (void), handle, EXTERNAL_PREFIX "ruby_abi_version")();
+    if (binary_abi_version != RUBY_ABI_VERSION && abi_check_enabled_p()) {
         dln_loaderror("incompatible ABI version of binary - %s", file);
     }
 #endif
 
-    char *init_fct_name;
-    init_funcname(&init_fct_name, file);
-    void (*init_fct)(void) = (void(*)(void))dln_sym(handle, init_fct_name);
-
     /* Call the init code */
-    (*init_fct)();
+    dln_sym_callable(void, (void), handle, init_fct_name)();
 
     return handle;
 
@@ -483,6 +526,7 @@ dln_load(const char *file)
     {
         void (*init_fct)(void);
 
+        /* TODO: check - AIX's load system call will return the first/last symbol/function? */
         init_fct = (void(*)(void))load((char*)file, 1, 0);
         if (init_fct == NULL) {
             aix_loaderror(file);
@@ -499,3 +543,29 @@ dln_load(const char *file)
 
     return 0;			/* dummy return */
 }
+
+void *
+dln_load(const char *file)
+{
+#if defined(_WIN32) || defined(USE_DLN_DLOPEN)
+    char *init_fct_name;
+    init_funcname(&init_fct_name, file);
+    return dln_load_and_init(file, init_fct_name);
+#else
+    dln_notimplement();
+    return 0;
+#endif
+}
+
+void *
+dln_load_feature(const char *file, const char *fname)
+{
+#if defined(_WIN32) || defined(USE_DLN_DLOPEN)
+    char *init_fct_name;
+    init_funcname(&init_fct_name, fname);
+    return dln_load_and_init(file, init_fct_name);
+#else
+    dln_notimplement();
+    return 0;
+#endif
+}
diff --git a/dln.h b/dln.h
index 902f753450a30a..711abf592c605e 100644
--- a/dln.h
+++ b/dln.h
@@ -25,6 +25,8 @@ RUBY_SYMBOL_EXPORT_BEGIN
 char *dln_find_exe_r(const char*,const char*,char*,size_t DLN_FIND_EXTRA_ARG_DECL);
 char *dln_find_file_r(const char*,const char*,char*,size_t DLN_FIND_EXTRA_ARG_DECL);
 void *dln_load(const char*);
+void *dln_load_feature(const char*, const char*);
+void *dln_symbol(void*,const char*);
 
 RUBY_SYMBOL_EXPORT_END
 
diff --git a/dln_find.c b/dln_find.c
index 91c51394a95463..ae37b9dde42426 100644
--- a/dln_find.c
+++ b/dln_find.c
@@ -11,11 +11,9 @@
 
 #ifdef RUBY_EXPORT
 #include "ruby/ruby.h"
-#define dln_warning rb_warning
-#define dln_warning_arg
+#define dln_warning(...) rb_warning(__VA_ARGS__)
 #else
-#define dln_warning fprintf
-#define dln_warning_arg stderr,
+#define dln_warning(...) fprintf(stderr, __VA_ARGS__)
 #endif
 #include "dln.h"
 
@@ -109,7 +107,7 @@ dln_find_1(const char *fname, const char *path, char *fbuf, size_t size,
 
     static const char pathname_too_long[] = "openpath: pathname too long (ignored)\n\
 \tDirectory \"%.*s\"%s\n\tFile \"%.*s\"%s\n";
-#define PATHNAME_TOO_LONG() dln_warning(dln_warning_arg pathname_too_long, \
+#define PATHNAME_TOO_LONG() dln_warning(pathname_too_long, \
                                         ((bp - fbuf) > 100 ? 100 : (int)(bp - fbuf)), fbuf, \
                                         ((bp - fbuf) > 100 ? "..." : ""), \
                                         (fnlen > 100 ? 100 : (int)fnlen), fname, \
@@ -120,8 +118,7 @@ dln_find_1(const char *fname, const char *path, char *fbuf, size_t size,
     RETURN_IF(!fname);
     fnlen = strlen(fname);
     if (fnlen >= size) {
-        dln_warning(dln_warning_arg
-                    "openpath: pathname too long (ignored)\n\tFile \"%.*s\"%s\n",
+        dln_warning("openpath: pathname too long (ignored)\n\tFile \"%.*s\"%s\n",
                     (fnlen > 100 ? 100 : (int)fnlen), fname,
                     (fnlen > 100 ? "..." : ""));
         return NULL;
diff --git a/dmydln.c b/dmydln.c
index d05cda0b8eb922..62a89e2da530e7 100644
--- a/dmydln.c
+++ b/dmydln.c
@@ -1,3 +1,6 @@
+// This file is used by miniruby, not ruby.
+// ruby uses dln.c.
+
 #include "ruby/ruby.h"
 
 NORETURN(void *dln_load(const char *));
@@ -8,3 +11,21 @@ dln_load(const char *file)
 
     UNREACHABLE_RETURN(NULL);
 }
+
+NORETURN(void *dln_load_feature(const char*,const char*));
+void*
+dln_load_feature(const char *file, const char *fname)
+{
+    rb_loaderror("this executable file can't load extension libraries");
+
+    UNREACHABLE_RETURN(NULL);
+}
+
+NORETURN(void *dln_symbol(void*,const char*));
+void*
+dln_symbol(void *handle, const char *symbol)
+{
+    rb_loaderror("this executable file can't load extension libraries");
+
+    UNREACHABLE_RETURN(NULL);
+}
diff --git a/dmyenc.c b/dmyenc.c
index 75b8a2da43a06a..47718412814c6a 100644
--- a/dmyenc.c
+++ b/dmyenc.c
@@ -1,3 +1,17 @@
+// This file is used by dynamically-linked ruby, which has no
+// statically-linked encodings other than the builtin encodings.
+//
+// - miniruby does not use this Init_enc. Instead, "miniinit.c"
+//   provides Init_enc, which defines only the builtin encodings.
+//
+// - Dynamically-linked ruby uses this Init_enc, which requires
+//   "enc/encdb.so" to load the builtin encodings and set up the
+//   optional encodings.
+//
+// - Statically-linked ruby does not use this Init_enc. Instead,
+//   "enc/encinit.c" (which is a generated file) defines Init_enc,
+//   which activates the encodings.
+
 #define require(name) ruby_require_internal(name, (unsigned int)sizeof(name)-1)
 int ruby_require_internal(const char *, int);
 
diff --git a/dmyext.c b/dmyext.c
index 4d273f7faffc5a..66be95ab4ef892 100644
--- a/dmyext.c
+++ b/dmyext.c
@@ -1,3 +1,17 @@
+// This file is used by dynamically-linked ruby, which has no
+// statically-linked extension libraries.
+//
+// - miniruby does not use this Init_ext. Instead, "miniinit.c"
+//   provides Init_enc, which does nothing too. It does not support
+//   require'ing extension libraries.
+//
+// - Dynamically-linked ruby uses this Init_ext, which does
+//   nothing. It loads extension libraries by dlopen, etc.
+//
+// - Statically-linked ruby does not use this Init_ext. Instead,
+//   "ext/extinit.c" (which is a generated file) defines Init_ext,
+//   which activates the (statically-linked) extension libraries.
+
 void
 Init_ext(void)
 {
diff --git a/doc/.document b/doc/.document
index 4b90648377d32c..6e6caa83336322 100644
--- a/doc/.document
+++ b/doc/.document
@@ -1,10 +1,12 @@
 *.md
 *.rb
-*.rdoc
+[^_]*.rdoc
 contributing
 NEWS
 syntax
 optparse
+date
 rdoc
 regexp
 yjit
+ruby
diff --git a/doc/ChangeLog/ChangeLog-1.9.3 b/doc/ChangeLog/ChangeLog-1.9.3
index 0f80eed2d5d0b9..03a7f3eabffd10 100644
--- a/doc/ChangeLog/ChangeLog-1.9.3
+++ b/doc/ChangeLog/ChangeLog-1.9.3
@@ -9012,7 +9012,7 @@ Thu Dec  2 01:24:39 2010  NARUSE, Yui  <naruse@ruby-lang.org>
 
 Thu Dec  2 01:02:03 2010  NARUSE, Yui  <naruse@ruby-lang.org>
 
-	* ext/json: Update github/flori/json from 1.4.2+ to
+	* ext/json: Update github/ruby/json from 1.4.2+ to
 	  e22b2f2bdfe6a9b0. this fixes some bugs.
 
 Thu Dec  2 00:05:44 2010  NARUSE, Yui  <naruse@ruby-lang.org>
diff --git a/doc/ChangeLog/ChangeLog-2.0.0 b/doc/ChangeLog/ChangeLog-2.0.0
index 9e654db1893a91..de47b66a6947ba 100644
--- a/doc/ChangeLog/ChangeLog-2.0.0
+++ b/doc/ChangeLog/ChangeLog-2.0.0
@@ -14426,7 +14426,7 @@ Tue May  8 02:34:26 2012  NARUSE, Yui  <naruse@ruby-lang.org>
 Mon May  7 21:19:17 2012  NARUSE, Yui  <naruse@ruby-lang.org>
 
 	* ext/json: Merge JSON 1.7.1.
-	 https://github.com/flori/json/commit/e5b9a9465c1159fae533bca320d950b772bcb4ac
+	 https://github.com/ruby/json/commit/e5b9a9465c1159fae533bca320d950b772bcb4ac
 
 Mon May  7 22:54:22 2012  Martin Bosslet  <Martin.Bosslet@googlemail.com>
 
diff --git a/doc/ChangeLog/ChangeLog-2.1.0 b/doc/ChangeLog/ChangeLog-2.1.0
index 5b670b31c97c8c..b6977dbccdd980 100644
--- a/doc/ChangeLog/ChangeLog-2.1.0
+++ b/doc/ChangeLog/ChangeLog-2.1.0
@@ -659,7 +659,7 @@ Mon Dec  9 02:10:32 2013  NARUSE, Yui  <naruse@ruby-lang.org>
 
 	* lib/net/http/responses.rb:
 	  Add `HTTPIMUsed`, as it is also supported by rack/rails.
-	  RFC - http://tools.ietf.org/html/rfc3229
+	  RFC - https://www.rfc-editor.org/rfc/rfc3229
 	  by Vipul A M <vipulnsward@gmail.com>
 	  https://github.com/ruby/ruby/pull/447 fix GH-447
 
@@ -2167,7 +2167,7 @@ Wed Nov 20 11:46:38 2013  NARUSE, Yui  <naruse@ruby-lang.org>
 	* ext/json: merge JSON 1.8.1.
 	  https://github.com/nurse/json/compare/002ac2771ce32776b32ccd2d06e5604de6c36dcd...e09ffc0d7da25d0393873936c118c188c78dbac3
 	* Remove Rubinius exception since transcoding should be working now.
-	* Fix https://github.com/flori/json/issues/162 reported by Marc-Andre
+	* Fix https://github.com/ruby/json/issues/162 reported by Marc-Andre
 	  Lafortune <github_rocks@marc-andre.ca>. Thanks!
 	* Applied patches by Yui NARUSE <naruse@airemix.jp> to suppress
 	  warning with -Wchar-subscripts and better validate UTF-8 strings.
@@ -17913,7 +17913,7 @@ Tue Feb 12 12:02:35 2013  NARUSE, Yui  <naruse@ruby-lang.org>
 
 	* ext/json: merge JSON 1.7.7.
 	  This includes security fix. [CVE-2013-0269]
-	  https://github.com/flori/json/commit/d0a62f3ced7560daba2ad546d83f0479a5ae2cf2
+	  https://github.com/ruby/json/commit/d0a62f3ced7560daba2ad546d83f0479a5ae2cf2
 	  https://groups.google.com/d/topic/rubyonrails-security/4_YvCpLzL58/discussion
 
 Mon Feb 11 23:08:48 2013  Tanaka Akira  <akr@fsij.org>
diff --git a/doc/ChangeLog/ChangeLog-2.2.0 b/doc/ChangeLog/ChangeLog-2.2.0
index 5a7dbf826d3135..0edcf0122b190d 100644
--- a/doc/ChangeLog/ChangeLog-2.2.0
+++ b/doc/ChangeLog/ChangeLog-2.2.0
@@ -5648,7 +5648,7 @@ Wed Aug  6 04:16:05 2014  NARUSE, Yui  <naruse@ruby-lang.org>
 
 	* lib/net/http/requests.rb (Net::HTTP::Options::RESPONSE_HAS_BODY):
 	  OPTIONS requests may have response bodies. [Feature #8429]
-	  http://tools.ietf.org/html/rfc7231#section-4.3.7
+	  https://www.rfc-editor.org/rfc/rfc7231#section-4.3.7
 
 Wed Aug  6 03:18:04 2014  NARUSE, Yui  <naruse@ruby-lang.org>
 
diff --git a/doc/ChangeLog/ChangeLog-2.3.0 b/doc/ChangeLog/ChangeLog-2.3.0
index 94996cffd0de92..e6161838957e67 100644
--- a/doc/ChangeLog/ChangeLog-2.3.0
+++ b/doc/ChangeLog/ChangeLog-2.3.0
@@ -1211,7 +1211,7 @@ Sun Dec  6 08:39:05 2015  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
 	  upstream changes.
 
 	  https://github.com/ruby/ruby/commit/4d059bf9f5f10f3d3088de49fc87e5555db7770d
-	  https://github.com/flori/json/commit/d4c99de78905d96c3f301f48b2c789943bb3f098
+	  https://github.com/ruby/json/commit/d4c99de78905d96c3f301f48b2c789943bb3f098
 
 	* ext/json/lib/json/version.rb: ditto.
 
@@ -10989,7 +10989,7 @@ Fri Feb 13 21:16:00 2015  Yusuke Endoh  <mame@tsg.ne.jp>
 
 Fri Feb 13 14:19:06 2015  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
 
-	* ext/json: merge upstream from flori/json
+	* ext/json: merge upstream from ruby/json
 	  change usage of TypedData. [Feature #10739][ruby-core:67564]
 
 Thu Feb 12 18:34:01 2015  multisnow  <infinity.blick.winkel@gmail.com>
@@ -11556,7 +11556,7 @@ Tue Jan 13 21:08:22 2015  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
 
 	* ext/json, test/json: merge JSON HEAD(259dee6)
 	  separate implementation of Typed_Data macro.
-	  https://github.com/flori/json/compare/v1.8.1...v1.8.2
+	  https://github.com/ruby/json/compare/v1.8.1...v1.8.2
 
 Tue Jan 13 14:16:35 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
@@ -12009,7 +12009,7 @@ Mon Dec 29 10:37:27 2014  Thiago Lewin  <thiago_lewin@yahoo.com.br>
 Mon Dec 29 07:27:23 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
 
 	* ext/json, test/json: merge JSON HEAD(17fe8e7)
-	  https://github.com/flori/json/compare/v1.8.1...17fe8e7
+	  https://github.com/ruby/json/compare/v1.8.1...17fe8e7
 
 Sun Dec 28 23:49:37 2014  Michal Papis  <mpapis@gmail.com>
 
diff --git a/doc/ChangeLog/ChangeLog-2.4.0 b/doc/ChangeLog/ChangeLog-2.4.0
index a297a579d1d4ba..5e126fbd90e282 100644
--- a/doc/ChangeLog/ChangeLog-2.4.0
+++ b/doc/ChangeLog/ChangeLog-2.4.0
@@ -2668,8 +2668,8 @@ Wed Jul  6 07:11:27 2016  Shugo Maeda  <shugo@ruby-lang.org>
 Tue Jul  5 20:49:30 2016  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
 
 	* ext/json/*, test/json/*: Update json-2.0.1.
-	  Changes of 2.0.0: https://github.com/flori/json/blob/f679ebd0c69a94e3e70a897ac9a229f5779c2ee1/CHANGES.md#2015-09-11-200
-	  Changes of 2.0.1: https://github.com/flori/json/blob/f679ebd0c69a94e3e70a897ac9a229f5779c2ee1/CHANGES.md#2016-07-01-201
+	  Changes of 2.0.0: https://github.com/ruby/json/blob/f679ebd0c69a94e3e70a897ac9a229f5779c2ee1/CHANGES.md#2015-09-11-200
+	  Changes of 2.0.1: https://github.com/ruby/json/blob/f679ebd0c69a94e3e70a897ac9a229f5779c2ee1/CHANGES.md#2016-07-01-201
 	  [Feature #12542][ruby-dev:49706][fix GH-1395]
 
 Tue Jul  5 19:39:49 2016  Naohisa Goto  <ngotogenome@gmail.com>
@@ -7356,7 +7356,7 @@ Thu Mar 17 11:51:48 2016  NARUSE, Yui  <naruse@ruby-lang.org>
 	  Note: CryptGenRandom function is PRNG and doesn't check its entropy,
 	  so it won't block. [Bug #12139]
 	  https://msdn.microsoft.com/ja-jp/library/windows/desktop/aa379942.aspx
-	  https://tools.ietf.org/html/rfc4086#section-7.1.3
+	  https://www.rfc-editor.org/rfc/rfc4086#section-7.1.3
 	  https://eprint.iacr.org/2007/419.pdf
 	  http://www.cs.huji.ac.il/~dolev/pubs/thesis/msc-thesis-leo.pdf
 
diff --git a/doc/NEWS/NEWS-3.0.0.md b/doc/NEWS/NEWS-3.0.0.md
index bdbd47327bde3d..004fa4bf678bf8 100644
--- a/doc/NEWS/NEWS-3.0.0.md
+++ b/doc/NEWS/NEWS-3.0.0.md
@@ -741,7 +741,7 @@ end
 foo(42)
 ```
 
-```
+```console
 $ typeprof test.rb
 # Classes
 class Object
diff --git a/doc/NEWS/NEWS-3.1.0.md b/doc/NEWS/NEWS-3.1.0.md
index fe292fc414cf41..686003894e399b 100644
--- a/doc/NEWS/NEWS-3.1.0.md
+++ b/doc/NEWS/NEWS-3.1.0.md
@@ -552,7 +552,7 @@ Example: `title = json[:article][:title]`
 
 If `json` is nil, it shows:
 
-```
+```console
 $ ruby test.rb
 test.rb:2:in `<main>': undefined method `[]' for nil:NilClass (NoMethodError)
 
@@ -562,7 +562,7 @@ title = json[:article][:title]
 
 If `json[:article]` returns nil, it shows:
 
-```
+```console
 $ ruby test.rb
 test.rb:2:in `<main>': undefined method `[]' for nil:NilClass (NoMethodError)
 
diff --git a/doc/NEWS/NEWS-3.2.0.md b/doc/NEWS/NEWS-3.2.0.md
index 33a7b85c47f98b..3a48c1964d04de 100644
--- a/doc/NEWS/NEWS-3.2.0.md
+++ b/doc/NEWS/NEWS-3.2.0.md
@@ -623,13 +623,13 @@ The following deprecated methods are removed.
     Psych and fiddle supported the static build with specific version of libyaml
     and libffi sources. You can build psych with libyaml-0.2.5 like this.
 
-    ```bash
+    ```console
     $ ./configure --with-libyaml-source-dir=/path/to/libyaml-0.2.5
     ```
 
     And you can build fiddle with libffi-3.4.4 like this.
 
-    ```bash
+    ```console
     $ ./configure --with-libffi-source-dir=/path/to/libffi-3.4.4
     ```
 
diff --git a/doc/NEWS/NEWS-3.3.0.md b/doc/NEWS/NEWS-3.3.0.md
new file mode 100644
index 00000000000000..364786d754062e
--- /dev/null
+++ b/doc/NEWS/NEWS-3.3.0.md
@@ -0,0 +1,529 @@
+# NEWS for Ruby 3.3.0
+
+This document is a list of user-visible feature changes
+since the **3.2.0** release, except for bug fixes.
+
+Note that each entry is kept to a minimum, see links for details.
+
+## Command line options
+
+* A new `performance` warning category was introduced.
+  They are not displayed by default even in verbose mode.
+  Turn them on with `-W:performance` or `Warning[:performance] = true`. [[Feature #19538]]
+
+* A new `RUBY_CRASH_REPORT` environment variable was introduced to allow
+  redirecting Ruby crash reports to a file or sub command. See the `BUG REPORT ENVIRONMENT`
+  section of the ruby manpage for further details. [[Feature #19790]]
+
+## Core classes updates
+
+Note: We're only listing outstanding class updates.
+
+* Array
+
+    * Array#pack now raises ArgumentError for unknown directives. [[Bug #19150]]
+
+* Dir
+
+    * Dir.for_fd added for returning a Dir object for the directory specified
+      by the provided directory file descriptor. [[Feature #19347]]
+    * Dir.fchdir added for changing the directory to the directory specified
+      by the provided directory file descriptor. [[Feature #19347]]
+    * Dir#chdir added for changing the directory to the directory specified by
+      the provided `Dir` object. [[Feature #19347]]
+
+* Encoding
+
+    * `Encoding#replicate` has been removed, it was already deprecated.  [[Feature #18949]]
+
+* Fiber
+
+    * Introduce Fiber#kill. [[Bug #595]]
+
+        ```ruby
+        fiber = Fiber.new do
+          while true
+            puts "Yielding..."
+            Fiber.yield
+          end
+        ensure
+          puts "Exiting..."
+        end
+
+        fiber.resume
+        # Yielding...
+        fiber.kill
+        # Exiting...
+        ```
+
+* MatchData
+
+    * MatchData#named_captures now accepts optional `symbolize_names`
+      keyword. [[Feature #19591]]
+
+* Module
+
+    * Module#set_temporary_name added for setting a temporary name for a
+      module. [[Feature #19521]]
+
+* ObjectSpace::WeakKeyMap
+
+    * New core class to build collections with weak references.
+      The class use equality semantic to lookup keys like a regular hash,
+      but it doesn't hold strong references on the keys. [[Feature #18498]]
+
+* ObjectSpace::WeakMap
+
+    * ObjectSpace::WeakMap#delete was added to eagerly clear weak map
+      entries. [[Feature #19561]]
+
+* Proc
+    * Now Proc#dup and Proc#clone call `#initialize_dup` and `#initialize_clone`
+      hooks respectively.  [[Feature #19362]]
+
+* Process
+
+    * New Process.warmup method that notify the Ruby virtual machine that the boot sequence is finished,
+      and that now is a good time to optimize the application. This is useful
+      for long-running applications. The actual optimizations performed are entirely
+      implementation-specific and may change in the future without notice. [[Feature #18885]]
+
+* Process::Status
+
+    * Process::Status#& and Process::Status#>> are deprecated. [[Bug #19868]]
+
+* Range
+
+    * Range#reverse_each can now process beginless ranges with an Integer endpoint. [[Feature #18515]]
+    * Range#reverse_each now raises TypeError for endless ranges. [[Feature #18551]]
+    * Range#overlap? added for checking if two ranges overlap. [[Feature #19839]]
+
+* Refinement
+
+    * Add Refinement#target as an alternative of Refinement#refined_class.
+      Refinement#refined_class is deprecated and will be removed in Ruby
+      3.4.  [[Feature #19714]]
+
+* Regexp
+
+    * The cache-based optimization now supports lookarounds and atomic groupings. That is, match
+      for Regexp containing these extensions can now also be performed in linear time to the length
+      of the input string. However, these cannot contain captures and cannot be nested. [[Feature #19725]]
+
+* String
+
+    * String#unpack now raises ArgumentError for unknown directives. [[Bug #19150]]
+    * String#bytesplice now accepts new arguments index/length or range of the
+      source string to be copied.  [[Feature #19314]]
+
+* Thread::Queue
+
+    * Thread::Queue#freeze now raises TypeError. [[Bug #17146]]
+
+* Thread::SizedQueue
+
+    * Thread::SizedQueue#freeze now raises TypeError. [[Bug #17146]]
+
+* Time
+
+    * Time.new with a string argument became stricter. [[Bug #19293]]
+
+        ```ruby
+        Time.new('2023-12-20')
+        #  no time information (ArgumentError)
+        ```
+
+* TracePoint
+
+    * TracePoint supports `rescue` event. When the raised exception was rescued,
+      the TracePoint will fire the hook. `rescue` event only supports Ruby-level
+      `rescue`. [[Feature #19572]]
+
+## Stdlib updates
+
+* RubyGems and Bundler warn if users do `require` the following gems without adding them to Gemfile or gemspec.
+  This is because they will become the bundled gems in the future version of Ruby. This warning is suppressed
+  if you use bootsnap gem. We recommend to run your application with `DISABLE_BOOTSNAP=1` environmental variable
+  at least once. This is limitation of this version.
+  [[Feature #19351]] [[Feature #19776]] [[Feature #19843]]
+    * abbrev
+    * base64
+    * bigdecimal
+    * csv
+    * drb
+    * getoptlong
+    * mutex_m
+    * nkf
+    * observer
+    * racc
+    * resolv-replace
+    * rinda
+    * syslog
+
+* Socket#recv and Socket#recv_nonblock returns `nil` instead of an empty string on closed
+  connections. Socket#recvmsg and Socket#recvmsg_nonblock returns `nil` instead of an empty packet on closed
+  connections. [[Bug #19012]]
+
+* Name resolution such as Socket.getaddrinfo, Socket.getnameinfo, Addrinfo.getaddrinfo, etc.
+  can now be interrupted. [[Feature #19965]]
+
+* Random::Formatter#alphanumeric is extended to accept optional `chars`
+  keyword argument. [[Feature #18183]]
+
+The following default gem is added.
+
+* prism 0.19.0
+
+The following default gems are updated.
+
+* RubyGems 3.5.3
+* abbrev 0.1.2
+* base64 0.2.0
+* benchmark 0.3.0
+* bigdecimal 3.1.5
+* bundler 2.5.3
+* cgi 0.4.1
+* csv 3.2.8
+* date 3.3.4
+* delegate 0.3.1
+* drb 2.2.0
+* english 0.8.0
+* erb 4.0.3
+* error_highlight 0.6.0
+* etc 1.4.3
+* fcntl 1.1.0
+* fiddle 1.1.2
+* fileutils 1.7.2
+* find 0.2.0
+* getoptlong 0.2.1
+* io-console 0.7.1
+* io-nonblock 0.3.0
+* io-wait 0.3.1
+* ipaddr 1.2.6
+* irb 1.11.0
+* json 2.7.1
+* logger 1.6.0
+* mutex_m 0.2.0
+* net-http 0.4.0
+* net-protocol 0.2.2
+* nkf 0.1.3
+* observer 0.1.2
+* open-uri 0.4.1
+* open3 0.2.1
+* openssl 3.2.0
+* optparse 0.4.0
+* ostruct 0.6.0
+* pathname 0.3.0
+* pp 0.5.0
+* prettyprint 0.2.0
+* pstore 0.1.3
+* psych 5.1.2
+* rdoc 6.6.2
+* readline 0.0.4
+* reline 0.4.1
+* resolv 0.3.0
+* rinda 0.2.0
+* securerandom 0.3.1
+* set 1.1.0
+* shellwords 0.2.0
+* singleton 0.2.0
+* stringio 3.1.0
+* strscan 3.0.7
+* syntax_suggest 2.0.0
+* syslog 0.1.2
+* tempfile 0.2.1
+* time 0.3.0
+* timeout 0.4.1
+* tmpdir 0.2.0
+* tsort 0.2.0
+* un 0.3.0
+* uri 0.13.0
+* weakref 0.1.3
+* win32ole 1.8.10
+* yaml 0.3.0
+* zlib 3.1.0
+
+The following bundled gem is promoted from default gems.
+
+* racc 1.7.3
+
+The following bundled gems are updated.
+
+* minitest 5.20.0
+* rake 13.1.0
+* test-unit 3.6.1
+* rexml 3.2.6
+* rss 0.3.0
+* net-ftp 0.3.3
+* net-imap 0.4.9
+* net-smtp 0.4.0
+* rbs 3.4.0
+* typeprof 0.21.9
+* debug 1.9.1
+
+See GitHub releases like [Logger](https://github.com/ruby/logger/releases) or
+changelog for details of the default gems or bundled gems.
+
+### Prism
+
+* Introduced [the Prism parser](https://github.com/ruby/prism) as a default gem
+    * Prism is a portable, error tolerant, and maintainable recursive descent parser for the Ruby language
+* Prism is production ready and actively maintained, you can use it in place of Ripper
+    * There is [extensive documentation](https://ruby.github.io/prism/) on how to use Prism
+    * Prism is both a C library that will be used internally by CRuby and a Ruby gem that can be used by any tooling which needs to parse Ruby code
+    * Notable methods in the Prism API are:
+        * `Prism.parse(source)` which returns the AST as part of a parse result object
+        * `Prism.parse_comments(source)` which returns the comments
+        * `Prism.parse_success?(source)` which returns true if there are no errors
+* You can make pull requests or issues directly on [the Prism repository](https://github.com/ruby/prism) if you are interested in contributing
+* You can now use `ruby --parser=prism` or `RUBYOPT="--parser=prism"` to experiment with the Prism compiler. Please note that this flag is for debugging only.
+
+## Compatibility issues
+
+* Subprocess creation/forking via the following file open methods is deprecated. [[Feature #19630]]
+    * Kernel#open
+    * URI.open
+    * IO.binread
+    * IO.foreach
+    * IO.readlines
+    * IO.read
+    * IO.write
+
+* When given a non-lambda, non-literal block, Kernel#lambda with now raises
+  ArgumentError instead of returning it unmodified. These usages have been
+  issuing warnings under the `Warning[:deprecated]` category since Ruby 3.0.0.
+  [[Feature #19777]]
+
+* The `RUBY_GC_HEAP_INIT_SLOTS` environment variable has been deprecated and
+  removed. Environment variables `RUBY_GC_HEAP_%d_INIT_SLOTS` should be
+  used instead.  [[Feature #19785]]
+
+* `it` calls without arguments in a block with no ordinary parameters are
+  deprecated. `it` will be a reference to the first block parameter in Ruby 3.4.
+  [[Feature #18980]]
+
+* Error message for NoMethodError have changed to not use the target object's `#inspect`
+  for efficiency, and says "instance of ClassName" instead. [[Feature #18285]]
+
+    ```ruby
+    ([1] * 100).nonexisting
+    # undefined method `nonexisting' for an instance of Array (NoMethodError)
+    ```
+
+* Now anonymous parameters forwarding is disallowed inside a block
+  that uses anonymous parameters.  [[Feature #19370]]
+
+## Stdlib compatibility issues
+
+* `racc` is promoted to bundled gems.
+    * You need to add `racc` to your `Gemfile` if you use `racc` under bundler environment.
+* `ext/readline` is retired
+    * We have `reline` that is pure Ruby implementation compatible with `ext/readline` API.
+      We rely on `reline` in the future. If you need to use `ext/readline`, you can install
+      `ext/readline` via rubygems.org with `gem install readline-ext`.
+    * We no longer need to install libraries like `libreadline` or `libedit`.
+
+## C API updates
+
+* `rb_postponed_job` updates
+  * New APIs and deprecated APIs (see comments for details)
+    * added: `rb_postponed_job_preregister()`
+    * added: `rb_postponed_job_trigger()`
+    * deprecated: `rb_postponed_job_register()` (and semantic change. see below)
+    * deprecated: `rb_postponed_job_register_one()`
+  * The postponed job APIs have been changed to address some rare crashes.
+    To solve the issue, we introduced new two APIs and deprecated current APIs.
+    The semantics of these functions have also changed slightly; `rb_postponed_job_register`
+    now behaves like the `once` variant in that multiple calls with the same
+    `func` might be coalesced into a single execution of the `func`
+    [[Feature #20057]]
+
+* Some updates for internal thread event hook APIs
+  * `rb_internal_thread_event_data_t` with a target Ruby thread (VALUE)
+    and callback functions (`rb_internal_thread_event_callback`) receive it.
+    https://github.com/ruby/ruby/pull/8885
+  * The following functions are introduced to manipulate Ruby thread local data
+    from internal thread event hook APIs (they are introduced since Ruby 3.2).
+    https://github.com/ruby/ruby/pull/8936
+    * `rb_internal_thread_specific_key_create()`
+    * `rb_internal_thread_specific_get()`
+    * `rb_internal_thread_specific_set()`
+
+* `rb_profile_thread_frames()` is introduced to get a frames from
+  a specific thread.
+  [[Feature #10602]]
+
+* `rb_data_define()` is introduced to define `Data`. [[Feature #19757]]
+
+* `rb_ext_resolve_symbol()` is introduced to search a function from
+  extension libraries. [[Feature #20005]]
+
+* IO related updates:
+  * The details of `rb_io_t` will be hidden and deprecated attributes
+    are added for each members. [[Feature #19057]]
+  * `rb_io_path(VALUE io)` is introduced to get a path of `io`.
+  * `rb_io_closed_p(VALUE io)` to get opening or closing of `io`.
+  * `rb_io_mode(VALUE io)` to get the mode of `io`.
+  * `rb_io_open_descriptor()` is introduced to make an IO object from a file
+    descriptor.
+
+## Implementation improvements
+
+### Parser
+
+* Replace Bison with [Lrama LALR parser generator](https://github.com/ruby/lrama).
+  No need to install Bison to build Ruby from source code anymore.
+  We will no longer suffer bison compatibility issues and we can use new features by just implementing it to Lrama. [[Feature #19637]]
+  * See [The future vision of Ruby Parser](https://rubykaigi.org/2023/presentations/spikeolaf.html) for detail.
+  * Lrama internal parser is a LR parser generated by Racc for maintainability.
+  * Parameterizing Rules `(?, *, +)` are supported, it will be used in Ruby parse.y.
+
+### GC / Memory management
+
+* Major performance improvements over Ruby 3.2
+    * Young objects referenced by old objects are no longer immediately
+      promoted to the old generation. This significantly reduces the frequency of
+      major GC collections. [[Feature #19678]]
+    * A new `REMEMBERED_WB_UNPROTECTED_OBJECTS_LIMIT_RATIO` tuning variable was
+      introduced to control the number of unprotected objects cause a major GC
+      collection to trigger. The default is set to `0.01` (1%). This significantly
+      reduces the frequency of major GC collection. [[Feature #19571]]
+    * Write Barriers were implemented for many core types that were missing them,
+      notably `Time`, `Enumerator`, `MatchData`, `Method`, `File::Stat`, `BigDecimal`
+      and several others. This significantly reduces minor GC collection time and major
+      GC collection frequency.
+    * Most core classes are now using Variable Width Allocation, notably `Hash`, `Time`,
+      `Thread::Backtrace`, `Thread::Backtrace::Location`, `File::Stat`, `Method`.
+      This makes these classes faster to allocate and free, use less memory and reduce
+      heap fragmentation.
+* `defined?(@ivar)` is optimized with Object Shapes.
+
+### YJIT
+
+* Major performance improvements over Ruby 3.2
+  * Support for splat and rest arguments has been improved.
+  * Registers are allocated for stack operations of the virtual machine.
+  * More calls with optional arguments are compiled. Exception handlers are also compiled.
+  * Unsupported call types and megamorphic call sites no longer exit to the interpreter.
+  * Basic methods like Rails `#blank?` and
+    [specialized `#present?`](https://github.com/rails/rails/pull/49909) are inlined.
+  * `Integer#*`, `Integer#!=`, `String#!=`, `String#getbyte`,
+    `Kernel#block_given?`, `Kernel#is_a?`, `Kernel#instance_of?`, and `Module#===`
+    are specially optimized.
+  * Compilation speed is now slightly faster than Ruby 3.2.
+  * Now more than 3x faster than the interpreter on Optcarrot!
+* Significantly improved memory usage over Ruby 3.2
+    * Metadata for compiled code uses a lot less memory.
+    * `--yjit-call-threshold` is automatically raised from 30 to 120
+      when the application has more than 40,000 ISEQs.
+    * `--yjit-cold-threshold` is added to skip compiling cold ISEQs.
+    * More compact code is generated on Arm64.
+* Code GC is now disabled by default
+  * `--yjit-exec-mem-size` is treated as a hard limit where compilation of new code stops.
+  * No sudden drops in performance due to code GC.
+    Better copy-on-write behavior on servers reforking with
+    [Pitchfork](https://github.com/shopify/pitchfork).
+  * You can still enable code GC if desired with `--yjit-code-gc`
+* Add `RubyVM::YJIT.enable` that can enable YJIT at run-time
+  * You can start YJIT without modifying command-line arguments or environment variables.
+    Rails 7.2 will [enable YJIT by default](https://github.com/rails/rails/pull/49947)
+    using this method.
+  * This can also be used to enable YJIT only once your application is
+    done booting. `--yjit-disable` can be used if you want to use other
+    YJIT options while disabling YJIT at boot.
+* More YJIT stats are available by default
+  * `yjit_alloc_size` and several more metadata-related stats are now available by default.
+  * `ratio_in_yjit` stat produced by `--yjit-stats` is now available in release builds,
+    a special stats or dev build is no longer required to access most stats.
+* Add more profiling capabilities
+  * `--yjit-perf` is added to facilitate profiling with Linux perf.
+  * `--yjit-trace-exits` now supports sampling with `--yjit-trace-exits-sample-rate=N`
+* More thorough testing and multiple bug fixes
+* `--yjit-stats=quiet` is added to avoid printing stats on exit.
+
+### MJIT
+
+* MJIT is removed.
+    * `--disable-jit-support` is removed. Consider using `--disable-yjit --disable-rjit` instead.
+
+### RJIT
+
+* Introduced a pure-Ruby JIT compiler RJIT.
+    * RJIT supports only x86\_64 architecture on Unix platforms.
+    * Unlike MJIT, it doesn't require a C compiler at runtime.
+* RJIT exists only for experimental purposes.
+    * You should keep using YJIT in production.
+
+### M:N Thread scheduler
+
+* M:N Thread scheduler is introduced. [[Feature #19842]]
+    * Background: Ruby 1.8 and before, M:1 thread scheduler (M Ruby threads
+      with 1 native thread. Called as User level threads or Green threads)
+      is used. Ruby 1.9 and later, 1:1 thread scheduler (1 Ruby thread with
+      1 native thread). M:1 threads takes lower resources compare with 1:1
+      threads because it needs only 1 native threads. However it is difficult
+      to support context switching for all of blocking operation so 1:1
+      threads are employed from Ruby 1.9. M:N thread scheduler uses N native
+      threads for M Ruby threads (N is small number in general). It doesn't
+      need same number of native threads as Ruby threads (similar to the M:1
+      thread scheduler). Also our M:N threads supports blocking operations
+      well same as 1:1 threads. See the ticket for more details.
+      Our M:N thread scheduler refers on the goroutine scheduler in the
+      Go language.
+    * In a ractor, only 1 thread can run in a same time because of
+      implementation. Therefore, applications that use only one Ractor
+      (most applications) M:N thread scheduler works as M:1 thread scheduler
+      with further extension from Ruby 1.8.
+    * M:N thread scheduler can introduce incompatibility for C-extensions,
+      so it is disabled by default on the main Ractors.
+      `RUBY_MN_THREADS=1` environment variable will enable it.
+      On non-main Ractors, M:N thread scheduler is enabled (and can not
+      disable it now).
+    * `N` (the number of native threads) can be specified with `RUBY_MAX_CPU`
+      environment variable. The default is 8.
+      Note that more than `N` native threads are used to support many kind of
+      blocking operations.
+
+[Bug #595]:       https://bugs.ruby-lang.org/issues/595
+[Feature #10602]: https://bugs.ruby-lang.org/issues/10602
+[Bug #17146]:     https://bugs.ruby-lang.org/issues/17146
+[Feature #18183]: https://bugs.ruby-lang.org/issues/18183
+[Feature #18285]: https://bugs.ruby-lang.org/issues/18285
+[Feature #18498]: https://bugs.ruby-lang.org/issues/18498
+[Feature #18515]: https://bugs.ruby-lang.org/issues/18515
+[Feature #18551]: https://bugs.ruby-lang.org/issues/18551
+[Feature #18885]: https://bugs.ruby-lang.org/issues/18885
+[Feature #18949]: https://bugs.ruby-lang.org/issues/18949
+[Feature #18980]: https://bugs.ruby-lang.org/issues/18980
+[Bug #19012]:     https://bugs.ruby-lang.org/issues/19012
+[Feature #19057]: https://bugs.ruby-lang.org/issues/19057
+[Bug #19150]:     https://bugs.ruby-lang.org/issues/19150
+[Bug #19293]:     https://bugs.ruby-lang.org/issues/19293
+[Feature #19314]: https://bugs.ruby-lang.org/issues/19314
+[Feature #19347]: https://bugs.ruby-lang.org/issues/19347
+[Feature #19351]: https://bugs.ruby-lang.org/issues/19351
+[Feature #19362]: https://bugs.ruby-lang.org/issues/19362
+[Feature #19370]: https://bugs.ruby-lang.org/issues/19370
+[Feature #19521]: https://bugs.ruby-lang.org/issues/19521
+[Feature #19538]: https://bugs.ruby-lang.org/issues/19538
+[Feature #19561]: https://bugs.ruby-lang.org/issues/19561
+[Feature #19571]: https://bugs.ruby-lang.org/issues/19571
+[Feature #19572]: https://bugs.ruby-lang.org/issues/19572
+[Feature #19591]: https://bugs.ruby-lang.org/issues/19591
+[Feature #19630]: https://bugs.ruby-lang.org/issues/19630
+[Feature #19637]: https://bugs.ruby-lang.org/issues/19637
+[Feature #19678]: https://bugs.ruby-lang.org/issues/19678
+[Feature #19714]: https://bugs.ruby-lang.org/issues/19714
+[Feature #19725]: https://bugs.ruby-lang.org/issues/19725
+[Feature #19757]: https://bugs.ruby-lang.org/issues/19757
+[Feature #19776]: https://bugs.ruby-lang.org/issues/19776
+[Feature #19777]: https://bugs.ruby-lang.org/issues/19777
+[Feature #19785]: https://bugs.ruby-lang.org/issues/19785
+[Feature #19790]: https://bugs.ruby-lang.org/issues/19790
+[Feature #19839]: https://bugs.ruby-lang.org/issues/19839
+[Feature #19842]: https://bugs.ruby-lang.org/issues/19842
+[Feature #19843]: https://bugs.ruby-lang.org/issues/19843
+[Bug #19868]:     https://bugs.ruby-lang.org/issues/19868
+[Feature #19965]: https://bugs.ruby-lang.org/issues/19965
+[Feature #20005]: https://bugs.ruby-lang.org/issues/20005
+[Feature #20057]: https://bugs.ruby-lang.org/issues/20057
diff --git a/doc/NEWS/NEWS-3.4.0.md b/doc/NEWS/NEWS-3.4.0.md
new file mode 100644
index 00000000000000..e9cc3a95690bf7
--- /dev/null
+++ b/doc/NEWS/NEWS-3.4.0.md
@@ -0,0 +1,962 @@
+# NEWS for Ruby 3.4.0
+
+This document is a list of user-visible feature changes
+since the **3.3.0** release, except for bug fixes.
+
+Note that each entry is kept to a minimum, see links for details.
+
+## Language changes
+
+* `it` is added to reference a block parameter. [[Feature #18980]]
+
+* String literals in files without a `frozen_string_literal` comment now emit a deprecation warning
+  when they are mutated.
+  These warnings can be enabled with `-W:deprecated` or by setting `Warning[:deprecated] = true`.
+  To disable this change, you can run Ruby with the `--disable-frozen-string-literal`
+  command line argument. [[Feature #20205]]
+
+    * `String#+@` now duplicates when mutating the string would emit
+      a deprecation warning, offered as a replacement for the
+      `str.dup if str.frozen?` pattern.
+
+* Keyword splatting `nil` when calling methods is now supported.
+  `**nil` is treated similarly to `**{}`, passing no keywords,
+  and not calling any conversion methods.  [[Bug #20064]]
+
+* Block passing is no longer allowed in index assignment
+  (e.g. `a[0, &b] = 1`).  [[Bug #19918]]
+
+* Keyword arguments are no longer allowed in index assignment
+  (e.g. `a[0, kw: 1] = 2`).  [[Bug #20218]]
+
+* The toplevel name `::Ruby` is reserved now, and the definition will be warned
+  when `Warning[:deprecated]`.  [[Feature #20884]]
+
+## Core classes updates
+
+Note: We're only listing outstanding class updates.
+
+
+* Array
+
+    * `Array#fetch_values` was added. [[Feature #20702]]
+
+* Exception
+
+    * `Exception#set_backtrace` now accepts arrays of `Thread::Backtrace::Location`.
+      `Kernel#raise`, `Thread#raise` and `Fiber#raise` also accept this new format. [[Feature #13557]]
+
+* Fiber::Scheduler
+
+    * An optional `Fiber::Scheduler#blocking_operation_wait` hook allows blocking operations to be moved out of the
+      event loop in order to reduce latency and improve multi-core processor utilization. [[Feature #20876]]
+
+* GC
+
+    * `GC.config` added to allow setting configuration variables on the Garbage
+      Collector. [[Feature #20443]]
+
+    * GC configuration parameter `rgengc_allow_full_mark` introduced.  When `false`
+      GC will only mark young objects. Default is `true`.  [[Feature #20443]]
+
+* Hash
+
+    * `Hash.new` now accepts an optional `capacity:` argument, to preallocate the hash with a given capacity.
+      This can improve performance when building large hashes incrementally by saving on reallocation and
+      rehashing of keys. [[Feature #19236]]
+
+* IO::Buffer
+
+    * `IO::Buffer#copy` can release the GVL, allowing other threads to run while copying data. [[Feature #20902]]
+
+* Integer
+
+    * `Integer#**` used to return `Float::INFINITY` when the return value is large, but now returns an `Integer`.
+      If the return value is extremely large, it raises an exception.
+      [[Feature #20811]]
+
+* MatchData
+
+    * `MatchData#bytebegin` and `MatchData#byteend` have been added. [[Feature #20576]]
+
+* Object
+
+    * `Object#singleton_method` now returns methods in modules prepended to or included in the
+      receiver's singleton class. [[Bug #20620]]
+
+        ```rb
+        o = Object.new
+        o.extend(Module.new{def a = 1})
+        o.singleton_method(:a).call #=> 1
+        ```
+
+* Ractor
+
+    * `require` in Ractor is allowed. The requiring process will be run on
+      the main Ractor.
+      `Ractor._require(feature)` is added to run requiring process on the
+      main Ractor.
+      [[Feature #20627]]
+
+    * `Ractor.main?` is added. [[Feature #20627]]
+
+    * `Ractor.[]` and `Ractor.[]=` are added to access the ractor local storage
+      of the current Ractor. [[Feature #20715]]
+
+    * `Ractor.store_if_absent(key){ init }` is added to initialize ractor local
+      variables in thread-safety. [[Feature #20875]]
+
+* Range
+
+    * `Range#size` now raises `TypeError` if the range is not iterable. [[Misc #18984]]
+    * `Range#step` now consistently has a semantics of iterating by using `+` operator
+      for all types, not only numerics. [[Feature #18368]]
+
+        ```ruby
+        (Time.utc(2022, 2, 24)..).step(24*60*60).take(3)
+        #=> [2022-02-24 00:00:00 UTC, 2022-02-25 00:00:00 UTC, 2022-02-26 00:00:00 UTC]
+        ```
+
+* Rational
+
+    * `Rational#**` used to return `Float::INFINITY` or `Float::NAN`
+      when the numerator of the return value is large, but now returns an `Rational`.
+      If it is extremely large, it raises an exception. [[Feature #20811]]
+
+* RubyVM::AbstractSyntaxTree
+
+    * Add `RubyVM::AbstractSyntaxTree::Node#locations` method which returns location objects
+      associated with the AST node. [[Feature #20624]]
+    * Add `RubyVM::AbstractSyntaxTree::Location` class which holds location information. [[Feature #20624]]
+
+
+* String
+
+    * `String#append_as_bytes` was added to more easily and efficiently work with binary buffers and protocols.
+      It directly concatenate the arguments into the string without any encoding validation or conversion.
+      [[Feature #20594]]
+
+* Symbol
+
+    * The string returned by `Symbol#to_s` now emits a deprecation warning when mutated, and will be
+      frozen in a future version of Ruby.
+      These warnings can be enabled with `-W:deprecated` or by setting `Warning[:deprecated] = true`.
+      [[Feature #20350]]
+
+* Time
+
+    * On Windows, now `Time#zone` encodes the system timezone name in UTF-8
+      instead of the active code page, if it contains non-ASCII characters.
+      [[Bug #20929]]
+
+    * `Time#xmlschema`, and its `Time#iso8601` alias have been moved into the core Time
+      class while previously it was an extension provided by the `time` gem. [[Feature #20707]]
+
+* Warning
+
+    * Add `Warning.categories` method which returns a list of possible warning categories.
+      [[Feature #20293]]
+
+## Stdlib updates
+
+We only list stdlib changes that are notable feature changes.
+
+* RubyGems
+
+    * Add `--attestation` option to gem push. It enabled to store signature of build artifact to sigstore.dev.
+
+* Bundler
+
+    * Add a `lockfile_checksums` configuration to include checksums in fresh lockfiles.
+    * Add bundle lock `--add-checksums` to add checksums to an existing lockfile.
+
+* JSON
+
+    * Performance improvements `JSON.parse` about 1.5 times faster than json-2.7.x.
+
+* Tempfile
+
+    * The keyword argument `anonymous: true` is implemented for Tempfile.create.
+      `Tempfile.create(anonymous: true)` removes the created temporary file immediately.
+      So applications don't need to remove the file.
+      [[Feature #20497]]
+
+* win32/sspi.rb
+
+    * This library is now extracted from the Ruby repository to [ruby/net-http-sspi].
+      [[Feature #20775]]
+
+* Socket
+
+    * `Socket::ResolutionError` and `Socket::ResolutionError#error_code` was added.
+      [[Feature #20018]]
+
+* IRB
+
+    * Interactive method completion is now improved with type information by default.
+      [[Feature #20778]]
+
+Other changes are listed in the following sections. we also listed release history from the previous bundled version that is Ruby 3.3.0 if it has GitHub releases.
+
+The following default gem is added.
+
+* win32-registry 0.1.0
+
+The following default gems are updated.
+
+* RubyGems 3.6.2
+* benchmark 0.4.0
+* bundler 2.6.2
+* date 3.4.1
+* delegate 0.4.0
+* did_you_mean 2.0.0
+* digest 3.2.0
+* erb 4.0.4
+* error_highlight 0.7.0
+* etc 1.4.5
+* fcntl 1.2.0
+* fiddle 1.1.6
+* fileutils 1.7.3
+* io-console 0.8.0
+* io-nonblock 0.3.1
+* ipaddr 1.2.7
+* irb 1.14.3
+* json 2.9.1
+* logger 1.6.4
+* net-http 0.6.0
+* open-uri 0.5.0
+* openssl 3.3.0
+* optparse 0.6.0
+* ostruct 0.6.1
+* pathname 0.4.0
+* pp 0.6.2
+* prism 1.2.0
+* pstore 0.1.4
+* psych 5.2.2
+* rdoc 6.10.0
+* reline 0.6.0
+* resolv 0.6.0
+* securerandom 0.4.1
+* set 1.1.1
+* shellwords 0.2.2
+* singleton 0.3.0
+* stringio 3.1.2
+* strscan 3.1.2
+* syntax_suggest 2.0.2
+* tempfile 0.3.1
+* time 0.4.1
+* timeout 0.4.3
+* tmpdir 0.3.1
+* uri 1.0.2
+* win32ole 1.9.1
+* yaml 0.4.0
+* zlib 3.2.1
+
+    * 3.5.3 to [v3.5.4][RubyGems-v3.5.4], [v3.5.5][RubyGems-v3.5.5], [v3.5.6][RubyGems-v3.5.6], [v3.5.7][RubyGems-v3.5.7], [v3.5.8][RubyGems-v3.5.8], [v3.5.9][RubyGems-v3.5.9], [v3.5.10][RubyGems-v3.5.10], [v3.5.11][RubyGems-v3.5.11], [v3.5.12][RubyGems-v3.5.12], [v3.5.13][RubyGems-v3.5.13], [v3.5.14][RubyGems-v3.5.14], [v3.5.15][RubyGems-v3.5.15], [v3.5.16][RubyGems-v3.5.16], [v3.5.17][RubyGems-v3.5.17], [v3.5.18][RubyGems-v3.5.18], [v3.5.19][RubyGems-v3.5.19], [v3.5.20][RubyGems-v3.5.20], [v3.5.21][RubyGems-v3.5.21], [v3.5.22][RubyGems-v3.5.22], [v3.5.23][RubyGems-v3.5.23], [v3.6.0][RubyGems-v3.6.0], [v3.6.1][RubyGems-v3.6.1], [v3.6.2][RubyGems-v3.6.2]
+* [benchmark][benchmark] 0.4.0
+    * 0.3.0 to [v0.4.0][benchmark-v0.4.0]
+* [bundler][bundler] 2.6.2
+    * 2.5.3 to [v2.5.4][bundler-v2.5.4], [v2.5.5][bundler-v2.5.5], [v2.5.6][bundler-v2.5.6], [v2.5.7][bundler-v2.5.7], [v2.5.8][bundler-v2.5.8], [v2.5.9][bundler-v2.5.9], [v2.5.10][bundler-v2.5.10], [v2.5.11][bundler-v2.5.11], [v2.5.12][bundler-v2.5.12], [v2.5.13][bundler-v2.5.13], [v2.5.14][bundler-v2.5.14], [v2.5.15][bundler-v2.5.15], [v2.5.16][bundler-v2.5.16], [v2.5.17][bundler-v2.5.17], [v2.5.18][bundler-v2.5.18], [v2.5.19][bundler-v2.5.19], [v2.5.20][bundler-v2.5.20], [v2.5.21][bundler-v2.5.21], [v2.5.22][bundler-v2.5.22], [v2.5.23][bundler-v2.5.23], [v2.6.0][bundler-v2.6.0], [v2.6.1][bundler-v2.6.1], [v2.6.2][bundler-v2.6.2]
+* [date][date] 3.4.1
+    * 3.3.4 to [v3.4.0][date-v3.4.0], [v3.4.1][date-v3.4.1]
+* [delegate][delegate] 0.4.0
+    * 0.3.1 to [v0.4.0][delegate-v0.4.0]
+* [did_you_mean][did_you_mean] 2.0.0
+    * 1.6.3 to [v2.0.0][did_you_mean-v2.0.0]
+* [digest][digest] 3.2.0
+    * 3.1.1 to [v3.2.0.pre0][digest-v3.2.0.pre0], [v3.2.0][digest-v3.2.0]
+* [erb][erb] 4.0.4
+    * 4.0.3 to [v4.0.4][erb-v4.0.4]
+* [error_highlight][error_highlight] 0.7.0
+    * 0.6.0 to [v0.7.0][error_highlight-v0.7.0]
+* [etc][etc] 1.4.5
+    * 1.4.3 to [v1.4.4][etc-v1.4.4], [v1.4.5][etc-v1.4.5]
+* [fcntl][fcntl] 1.2.0
+    * 1.1.0 to [v1.2.0][fcntl-v1.2.0]
+* [fiddle][fiddle] 1.1.6
+    * 1.1.2 to [v1.1.3][fiddle-v1.1.3], [v1.1.4][fiddle-v1.1.4], [v1.1.5][fiddle-v1.1.5], [v1.1.6][fiddle-v1.1.6]
+* [fileutils][fileutils] 1.7.3
+    * 1.7.2 to [v1.7.3][fileutils-v1.7.3]
+* [io-console][io-console] 0.8.0
+    * 0.7.1 to [v0.7.2][io-console-v0.7.2], [v0.8.0.beta1][io-console-v0.8.0.beta1], [v0.8.0][io-console-v0.8.0]
+* [io-nonblock][io-nonblock] 0.3.1
+    * 0.3.0 to [v0.3.1][io-nonblock-v0.3.1]
+* [ipaddr][ipaddr] 1.2.7
+    * 1.2.6 to [v1.2.7][ipaddr-v1.2.7]
+* [irb][irb] 1.14.3
+    * 1.11.0 to [v1.11.1][irb-v1.11.1], [v1.11.2][irb-v1.11.2], [v1.12.0][irb-v1.12.0], [v1.13.0][irb-v1.13.0], [v1.13.1][irb-v1.13.1], [v1.13.2][irb-v1.13.2], [v1.14.0][irb-v1.14.0], [v1.14.1][irb-v1.14.1], [v1.14.2][irb-v1.14.2], [v1.14.3][irb-v1.14.3]
+* [json][json] 2.9.1
+    * 2.7.1 to [v2.7.2][json-v2.7.2], [v2.7.3.rc1][json-v2.7.3.rc1], [v2.7.3][json-v2.7.3], [v2.7.4][json-v2.7.4], [v2.7.5][json-v2.7.5], [v2.7.6][json-v2.7.6], [v2.8.0][json-v2.8.0], [v2.8.1][json-v2.8.1], [v2.8.2][json-v2.8.2], [v2.9.0][json-v2.9.0], [v2.9.1][json-v2.9.1]
+* [logger][logger] 1.6.4
+    * 1.6.0 to [v1.6.1][logger-v1.6.1], [v1.6.2][logger-v1.6.2], [v1.6.3][logger-v1.6.3], [v1.6.4][logger-v1.6.4]
+* [net-http][net-http] 0.6.0
+    * 0.4.0 to [v0.4.1][net-http-v0.4.1], [v0.5.0][net-http-v0.5.0], [v0.6.0][net-http-v0.6.0]
+* [open-uri][open-uri] 0.5.0
+    * 0.4.1 to [v0.5.0][open-uri-v0.5.0]
+* [optparse][optparse] 0.6.0
+    * 0.4.0 to [v0.5.0][optparse-v0.5.0], [v0.6.0][optparse-v0.6.0]
+* [ostruct][ostruct] 0.6.1
+    * 0.6.0 to [v0.6.1][ostruct-v0.6.1]
+* [pathname][pathname] 0.4.0
+    * 0.3.0 to [v0.4.0][pathname-v0.4.0]
+* [pp][pp] 0.6.2
+    * 0.5.0 to [v0.6.0][pp-v0.6.0], [v0.6.1][pp-v0.6.1], [v0.6.2][pp-v0.6.2]
+* [prism][prism] 1.2.0
+    * 0.19.0 to [v0.20.0][prism-v0.20.0], [v0.21.0][prism-v0.21.0], [v0.22.0][prism-v0.22.0], [v0.23.0][prism-v0.23.0], [v0.24.0][prism-v0.24.0], [v0.25.0][prism-v0.25.0], [v0.26.0][prism-v0.26.0], [v0.27.0][prism-v0.27.0], [v0.28.0][prism-v0.28.0], [v0.29.0][prism-v0.29.0], [v0.30.0][prism-v0.30.0], [v1.0.0][prism-v1.0.0], [v1.1.0][prism-v1.1.0], [v1.2.0][prism-v1.2.0]
+* [pstore][pstore] 0.1.4
+    * 0.1.3 to [v0.1.4][pstore-v0.1.4]
+* [psych][psych] 5.2.2
+    * 5.1.2 to [v5.2.0.beta1][psych-v5.2.0.beta1], [v5.2.0.beta2][psych-v5.2.0.beta2], [v5.2.0.beta3][psych-v5.2.0.beta3], [v5.2.0.beta4][psych-v5.2.0.beta4], [v5.2.0.beta5][psych-v5.2.0.beta5], [v5.2.0.beta6][psych-v5.2.0.beta6], [v5.2.0.beta7][psych-v5.2.0.beta7], [v5.2.0][psych-v5.2.0], [v5.2.1][psych-v5.2.1], [v5.2.2][psych-v5.2.2]
+* [rdoc][rdoc] 6.10.0
+    * 6.6.2 to [v6.7.0][rdoc-v6.7.0], [v6.8.0][rdoc-v6.8.0], [v6.8.1][rdoc-v6.8.1], [v6.9.0][rdoc-v6.9.0], [v6.9.1][rdoc-v6.9.1], [v6.10.0][rdoc-v6.10.0]
+* [reline][reline] 0.6.0
+    * 0.4.1 to [v0.4.2][reline-v0.4.2], [v0.4.3][reline-v0.4.3], [v0.5.0.pre.1][reline-v0.5.0.pre.1], [v0.5.0][reline-v0.5.0], [v0.5.1][reline-v0.5.1], [v0.5.2][reline-v0.5.2], [v0.5.3][reline-v0.5.3], [v0.5.4][reline-v0.5.4], [v0.5.5][reline-v0.5.5], [v0.5.6][reline-v0.5.6], [v0.5.7][reline-v0.5.7], [v0.5.8][reline-v0.5.8], [v0.5.9][reline-v0.5.9], [v0.5.10][reline-v0.5.10], [v0.5.11][reline-v0.5.11], [v0.5.12][reline-v0.5.12], [v0.6.0][reline-v0.6.0]
+* [resolv][resolv] 0.6.0
+    * 0.3.0 to [v0.4.0][resolv-v0.4.0], [v0.5.0][resolv-v0.5.0], [v0.6.0][resolv-v0.6.0]
+* [securerandom][securerandom] 0.4.1
+    * 0.3.1 to [v0.3.2][securerandom-v0.3.2], [v0.4.0][securerandom-v0.4.0], [v0.4.1][securerandom-v0.4.1]
+* [set][set] 1.1.1
+    * 1.1.0 to [v1.1.1][set-v1.1.1]
+* [shellwords][shellwords] 0.2.2
+    * 0.2.0 to [v0.2.1][shellwords-v0.2.1], [v0.2.2][shellwords-v0.2.2]
+* [singleton][singleton] 0.3.0
+    * 0.2.0 to [v0.3.0][singleton-v0.3.0]
+* [stringio][stringio] 3.1.2
+    * 3.1.0 to [v3.1.1][stringio-v3.1.1], [v3.1.2][stringio-v3.1.2]
+* [strscan][strscan] 3.1.2
+    * 3.0.7 to [v3.0.8][strscan-v3.0.8], [v3.0.9][strscan-v3.0.9], [v3.1.0][strscan-v3.1.0], [v3.1.1][strscan-v3.1.1], [v3.1.2][strscan-v3.1.2]
+* [syntax_suggest][syntax_suggest] 2.0.2
+    * 2.0.0 to [v2.0.1][syntax_suggest-v2.0.1], [v2.0.2][syntax_suggest-v2.0.2]
+* [tempfile][tempfile] 0.3.1
+    * 0.2.1 to [v0.3.0][tempfile-v0.3.0], [v0.3.1][tempfile-v0.3.1]
+* [time][time] 0.4.1
+    * 0.3.0 to [v0.4.0][time-v0.4.0], [v0.4.1][time-v0.4.1]
+* [timeout][timeout] 0.4.3
+    * 0.4.1 to [v0.4.2][timeout-v0.4.2], [v0.4.3][timeout-v0.4.3]
+* [tmpdir][tmpdir] 0.3.1
+    * 0.2.0 to [v0.3.0][tmpdir-v0.3.0], [v0.3.1][tmpdir-v0.3.1]
+* [uri][uri] 1.0.2
+    * 0.13.0 to [v0.13.1][uri-v0.13.1], [v1.0.0][uri-v1.0.0], [v1.0.1][uri-v1.0.1], [v1.0.2][uri-v1.0.2]
+* [win32ole][win32ole] 1.9.1
+    * 1.8.10 to [v1.9.0][win32ole-v1.9.0], [v1.9.1][win32ole-v1.9.1]
+* [yaml][yaml] 0.4.0
+    * 0.3.0 to [v0.4.0][yaml-v0.4.0]
+* [zlib][zlib] 3.2.1
+    * 3.1.0 to [v3.1.1][zlib-v3.1.1], [v3.2.0][zlib-v3.2.0], [v3.2.1][zlib-v3.2.1]
+
+The following bundled gem is added.
+
+* [repl_type_completor][repl_type_completor] 0.1.9
+
+The following bundled gems are updated.
+
+* [minitest][minitest] 5.25.4
+    * 5.20.0 to [v5.25.4][minitest-v5.25.4]
+* [power_assert][power_assert] 2.0.5
+    * 2.0.3 to [v2.0.4][power_assert-v2.0.4], [v2.0.5][power_assert-v2.0.5]
+* [rake][rake] 13.2.1
+    * 13.1.0 to [v13.2.0][rake-v13.2.0], [v13.2.1][rake-v13.2.1]
+* [test-unit][test-unit] 3.6.7
+    * 3.6.1 to [3.6.2][test-unit-3.6.2], [3.6.3][test-unit-3.6.3], [3.6.4][test-unit-3.6.4], [3.6.5][test-unit-3.6.5], [3.6.6][test-unit-3.6.6], [3.6.7][test-unit-3.6.7]
+* [rexml][rexml] 3.4.0
+    * 3.2.6 to [v3.2.7][rexml-v3.2.7], [v3.2.8][rexml-v3.2.8], [v3.2.9][rexml-v3.2.9], [v3.3.0][rexml-v3.3.0], [v3.3.1][rexml-v3.3.1], [v3.3.2][rexml-v3.3.2], [v3.3.3][rexml-v3.3.3], [v3.3.4][rexml-v3.3.4], [v3.3.5][rexml-v3.3.5], [v3.3.6][rexml-v3.3.6], [v3.3.7][rexml-v3.3.7], [v3.3.8][rexml-v3.3.8], [v3.3.9][rexml-v3.3.9], [v3.4.0][rexml-v3.4.0]
+* [rss][rss] 0.3.1
+    * 0.3.0 to [0.3.1][rss-0.3.1]
+* [net-ftp][net-ftp] 0.3.8
+    * 0.3.3 to [v0.3.4][net-ftp-v0.3.4], [v0.3.5][net-ftp-v0.3.5], [v0.3.6][net-ftp-v0.3.6], [v0.3.7][net-ftp-v0.3.7], [v0.3.8][net-ftp-v0.3.8]
+* [net-imap][net-imap] 0.5.4
+    * 0.4.9 to [v0.4.9.1][net-imap-v0.4.9.1], [v0.4.10][net-imap-v0.4.10], [v0.4.11][net-imap-v0.4.11], [v0.4.12][net-imap-v0.4.12], [v0.4.13][net-imap-v0.4.13], [v0.4.14][net-imap-v0.4.14], [v0.4.15][net-imap-v0.4.15], [v0.4.16][net-imap-v0.4.16], [v0.4.17][net-imap-v0.4.17], [v0.5.0][net-imap-v0.5.0], [v0.4.18][net-imap-v0.4.18], [v0.5.1][net-imap-v0.5.1], [v0.5.2][net-imap-v0.5.2], [v0.5.3][net-imap-v0.5.3], [v0.5.4][net-imap-v0.5.4]
+* [net-smtp][net-smtp] 0.5.0
+    * 0.4.0 to [v0.4.0.1][net-smtp-v0.4.0.1], [v0.5.0][net-smtp-v0.5.0]
+* [prime][prime] 0.1.3
+    * 0.1.2 to [v0.1.3][prime-v0.1.3]
+* [rbs][rbs] 3.8.0
+    * 3.4.0 to [v3.4.1][rbs-v3.4.1], [v3.4.2][rbs-v3.4.2], [v3.4.3][rbs-v3.4.3], [v3.4.4][rbs-v3.4.4], [v3.5.0.pre.1][rbs-v3.5.0.pre.1], [v3.5.0.pre.2][rbs-v3.5.0.pre.2], [v3.5.0][rbs-v3.5.0], [v3.5.1][rbs-v3.5.1], [v3.5.2][rbs-v3.5.2], [v3.5.3][rbs-v3.5.3], [v3.6.0.dev.1][rbs-v3.6.0.dev.1], [v3.6.0.pre.1][rbs-v3.6.0.pre.1], [v3.6.0.pre.2][rbs-v3.6.0.pre.2], [v3.6.0.pre.3][rbs-v3.6.0.pre.3], [v3.6.0][rbs-v3.6.0], [v3.6.1][rbs-v3.6.1], [v3.7.0.dev.1][rbs-v3.7.0.dev.1], [v3.7.0.pre.1][rbs-v3.7.0.pre.1], [v3.7.0][rbs-v3.7.0], [v3.8.0.pre.1][rbs-v3.8.0.pre.1] [v3.8.0][rbs-v3.8.0]
+* [typeprof][typeprof] 0.30.1
+    * 0.21.9 to [v0.30.1][typeprof-v0.30.1]
+* [debug][debug] 1.10.0
+    * 1.9.1 to [v1.9.2][debug-v1.9.2], [v1.10.0][debug-v1.10.0]
+* [racc][racc] 1.8.1
+    * 1.7.3 to [v1.8.0][racc-v1.8.0], [v1.8.1][racc-v1.8.1]
+
+The following bundled gems are promoted from default gems.
+
+* [mutex_m][mutex_m] 0.3.0
+    * 0.2.0 to [v0.3.0][mutex_m-v0.3.0]
+* [getoptlong][getoptlong] 0.2.1
+* [base64][base64] 0.2.0
+* [bigdecimal][bigdecimal] 3.1.8
+    * 3.1.5 to [v3.1.6][bigdecimal-v3.1.6], [v3.1.7][bigdecimal-v3.1.7], [v3.1.8][bigdecimal-v3.1.8]
+* [observer][observer] 0.1.2
+* [abbrev][abbrev] 0.1.2
+* [resolv-replace][resolv-replace] 0.1.1
+* [rinda][rinda] 0.2.0
+* [drb][drb] 2.2.1
+    * 2.2.0 to [v2.2.1][drb-v2.2.1]
+* [nkf][nkf] 0.2.0
+    * 0.1.3 to [v0.2.0][nkf-v0.2.0]
+* [syslog][syslog] 0.2.0
+    * 0.1.2 to [v0.2.0][syslog-v0.2.0]
+* [csv][csv] 3.3.2
+    * 3.2.8 to [v3.2.9][csv-v3.2.9], [v3.3.0][csv-v3.3.0], [v3.3.1][csv-v3.3.1], [v3.3.2][csv-v3.3.2]
+
+## Supported platforms
+
+## Compatibility issues
+
+* Error messages and backtrace displays have been changed.
+
+    * Use a single quote instead of a backtick as an opening quote. [[Feature #16495]]
+    * Display a class name before a method name (only when the class has a permanent name). [[Feature #19117]]
+    * Extra `rescue`/`ensure` frames are no longer available on the backtrace. [[Feature #20275]]
+    * `Kernel#caller`, `Thread::Backtrace::Location`’s methods, etc. are also changed accordingly.
+
+        Old:
+        ```
+        test.rb:1:in `foo': undefined method `time' for an instance of Integer
+                from test.rb:2:in `<main>'
+        ```
+
+        New:
+        ```
+        test.rb:1:in 'Object#foo': undefined method 'time' for an instance of Integer
+                from test.rb:2:in '<main>'
+        ```
+
+* `Hash#inspect` rendering have been changed. [[Bug #20433]]
+
+    * Symbol keys are displayed using the modern symbol key syntax: `"{user: 1}"`
+    * Other keys now have spaces around `=>`: `'{"user" => 1}'`, while previously they didn't: `'{"user"=>1}'`
+
+* `Kernel#Float()` now accepts a decimal string with decimal part omitted. [[Feature #20705]]
+
+    ```rb
+    Float("1.")    #=> 1.0 (previously, an ArgumentError was raised)
+    Float("1.E-1") #=> 0.1 (previously, an ArgumentError was raised)
+    ```
+
+* `String#to_f` now accepts a decimal string with decimal part omitted. [[Feature #20705]]
+  Note that the result changes when an exponent is specified.
+
+    ```rb
+    "1.".to_f    #=> 1.0
+    "1.E-1".to_f #=> 0.1 (previously, 1.0 was returned)
+    ```
+
+* `Refinement#refined_class` has been removed. [[Feature #19714]]
+
+## Stdlib compatibility issues
+
+* DidYouMean
+
+    * `DidYouMean::SPELL_CHECKERS[]=` and `DidYouMean::SPELL_CHECKERS.merge!` are removed.
+
+* Net::HTTP
+
+    * Removed the following deprecated constants:
+        * `Net::HTTP::ProxyMod`
+        * `Net::NetPrivate::HTTPRequest`
+        * `Net::HTTPInformationCode`
+        * `Net::HTTPSuccessCode`
+        * `Net::HTTPRedirectionCode`
+        * `Net::HTTPRetriableCode`
+        * `Net::HTTPClientErrorCode`
+        * `Net::HTTPFatalErrorCode`
+        * `Net::HTTPServerErrorCode`
+        * `Net::HTTPResponseReceiver`
+        * `Net::HTTPResponceReceiver`
+
+      These constants were deprecated from 2012.
+
+* Timeout
+
+    * Reject negative values for `Timeout.timeout`. [[Bug #20795]]
+
+* URI
+
+    * Switched default parser to RFC 3986 compliant from RFC 2396 compliant.
+      [[Bug #19266]]
+
+## C API updates
+
+* `rb_newobj` and `rb_newobj_of` (and corresponding macros `RB_NEWOBJ`, `RB_NEWOBJ_OF`, `NEWOBJ`, `NEWOBJ_OF`) have been removed. [[Feature #20265]]
+* Removed deprecated function `rb_gc_force_recycle`. [[Feature #18290]]
+
+## Implementation improvements
+
+* The default parser is now Prism.
+  To use the conventional parser, use the command-line argument `--parser=parse.y`.
+  [[Feature #20564]]
+
+* Happy Eyeballs version 2 (RFC8305), an algorithm that ensures faster and more reliable connections
+  by attempting IPv6 and IPv4 concurrently, is used in `Socket.tcp` and `TCPSocket.new`.
+  To disable it globally, set the environment variable `RUBY_TCP_NO_FAST_FALLBACK=1` or
+  call `Socket.tcp_fast_fallback=false`.
+  Or to disable it on a per-method basis, use the keyword argument `fast_fallback: false`.
+  [[Feature #20108]] [[Feature #20782]]
+
+* Alternative garbage collector (GC) implementations can be loaded dynamically
+  through the modular garbage collector feature. To enable this feature,
+  configure Ruby with `--with-modular-gc` at build time. GC libraries can be
+  loaded at runtime using the environment variable `RUBY_GC_LIBRARY`.
+  [[Feature #20351]]
+
+* Ruby's built-in garbage collector has been split into a separate file at
+  `gc/default/default.c` and interacts with Ruby using an API defined in
+  `gc/gc_impl.h`. The built-in garbage collector can now also be built as a
+  library using `make modular-gc MODULAR_GC=default` and enabled using the
+  environment variable `RUBY_GC_LIBRARY=default`. [[Feature #20470]]
+
+* An experimental GC library is provided based on [MMTk](https://www.mmtk.io/).
+  This GC library can be built using `make modular-gc MODULAR_GC=mmtk` and
+  enabled using the environment variable `RUBY_GC_LIBRARY=mmtk`. This requires
+  the Rust toolchain on the build machine. [[Feature #20860]]
+
+### YJIT
+
+#### New features
+
+* Command-line options
+    * `--yjit-mem-size` introduces a unified memory limit (default 128MiB) to track total YJIT memory usage,
+      providing a more intuitive alternative to the old `--yjit-exec-mem-size` option.
+    * `--yjit-trace-exits=COUNTER` allows tracing of counted exits and fallbacks.
+    * `--yjit-perf=codegen` allows profiling of JIT code based on YJIT's codegen functions.
+    * `--yjit-log` enables a compilation log to track what gets compiled.
+* Ruby API
+    * `RubyVM::YJIT.enable(log: true)` also enables a compilation log.
+    * `RubyVM::YJIT.log` provides access to the tail of the compilation log at run-time.
+* YJIT stats
+    * `RubyVM::YJIT.runtime_stats` now always provides additional statistics on
+      invalidation, inlining, and metadata encoding.
+    * `RubyVM::YJIT.runtime_stats[:iseq_calls]` is added to profile non-inlined Ruby method calls.
+    * `RubyVM::YJIT.runtime_stats[:cfunc_calls]` is truncated to the top 20 entries for better performance.
+
+#### New optimizations
+
+* Compressed context reduces memory needed to store YJIT metadata
+* Allocate registers for local variables and Ruby method arguments
+* When YJIT is enabled, use more Core primitives written in Ruby:
+    * `Array#each`, `Array#select`, `Array#map` rewritten in Ruby for better performance [[Feature #20182]].
+* Ability to inline small/trivial methods such as:
+    * Empty methods
+    * Methods returning a constant
+    * Methods returning `self`
+    * Methods directly returning an argument
+* Specialized codegen for many more runtime methods
+* Optimize `String#getbyte`, `String#setbyte` and other string methods
+* Optimize bitwise operations to speed up low-level bit/byte manipulation
+* Support shareable constants in multi-ractor mode
+* Various other incremental optimizations
+
+## Miscellaneous changes
+
+* Passing a block to a method which doesn't use the passed block will show
+  a warning on verbose mode (`-w`).
+  In connection with this, a new `strict_unused_block` warning category was introduced.
+  Turn them on with `-W:strict_unused_block` or `Warning[:strict_unused_block] = true`.
+  [[Feature #15554]]
+
+* Redefining some core methods that are specially optimized by the interpreter
+  and JIT like `String#freeze` or `Integer#+` now emits a performance class
+  warning (`-W:performance` or `Warning[:performance] = true`).
+  [[Feature #20429]]
+
+[Feature #13557]: https://bugs.ruby-lang.org/issues/13557
+[Feature #15554]: https://bugs.ruby-lang.org/issues/15554
+[Feature #16495]: https://bugs.ruby-lang.org/issues/16495
+[Feature #18290]: https://bugs.ruby-lang.org/issues/18290
+[Feature #18368]: https://bugs.ruby-lang.org/issues/18368
+[Feature #18980]: https://bugs.ruby-lang.org/issues/18980
+[Misc #18984]:    https://bugs.ruby-lang.org/issues/18984
+[Feature #19117]: https://bugs.ruby-lang.org/issues/19117
+[Feature #19236]: https://bugs.ruby-lang.org/issues/19236
+[Bug #19266]:     https://bugs.ruby-lang.org/issues/19266
+[Feature #19714]: https://bugs.ruby-lang.org/issues/19714
+[Bug #19918]:     https://bugs.ruby-lang.org/issues/19918
+[Feature #20018]: https://bugs.ruby-lang.org/issues/20018
+[Bug #20064]:     https://bugs.ruby-lang.org/issues/20064
+[Feature #20108]: https://bugs.ruby-lang.org/issues/20108
+[Feature #20182]: https://bugs.ruby-lang.org/issues/20182
+[Feature #20205]: https://bugs.ruby-lang.org/issues/20205
+[Bug #20218]:     https://bugs.ruby-lang.org/issues/20218
+[Feature #20265]: https://bugs.ruby-lang.org/issues/20265
+[Feature #20275]: https://bugs.ruby-lang.org/issues/20275
+[Feature #20293]: https://bugs.ruby-lang.org/issues/20293
+[Feature #20350]: https://bugs.ruby-lang.org/issues/20350
+[Feature #20351]: https://bugs.ruby-lang.org/issues/20351
+[Feature #20429]: https://bugs.ruby-lang.org/issues/20429
+[Bug #20433]:     https://bugs.ruby-lang.org/issues/20433
+[Feature #20443]: https://bugs.ruby-lang.org/issues/20443
+[Feature #20470]: https://bugs.ruby-lang.org/issues/20470
+[Feature #20497]: https://bugs.ruby-lang.org/issues/20497
+[Feature #20564]: https://bugs.ruby-lang.org/issues/20564
+[Feature #20576]: https://bugs.ruby-lang.org/issues/20576
+[Feature #20594]: https://bugs.ruby-lang.org/issues/20594
+[Bug #20620]:     https://bugs.ruby-lang.org/issues/20620
+[Feature #20624]: https://bugs.ruby-lang.org/issues/20624
+[Feature #20627]: https://bugs.ruby-lang.org/issues/20627
+[Feature #20702]: https://bugs.ruby-lang.org/issues/20702
+[Feature #20705]: https://bugs.ruby-lang.org/issues/20705
+[Feature #20707]: https://bugs.ruby-lang.org/issues/20707
+[Feature #20715]: https://bugs.ruby-lang.org/issues/20715
+[Feature #20775]: https://bugs.ruby-lang.org/issues/20775
+[Feature #20778]: https://bugs.ruby-lang.org/issues/20778
+[Feature #20782]: https://bugs.ruby-lang.org/issues/20782
+[Bug #20795]:     https://bugs.ruby-lang.org/issues/20795
+[Feature #20811]: https://bugs.ruby-lang.org/issues/20811
+[Feature #20860]: https://bugs.ruby-lang.org/issues/20860
+[Feature #20875]: https://bugs.ruby-lang.org/issues/20875
+[Feature #20876]: https://bugs.ruby-lang.org/issues/20876
+[Feature #20884]: https://bugs.ruby-lang.org/issues/20884
+[Feature #20902]: https://bugs.ruby-lang.org/issues/20902
+[Bug #20929]:     https://bugs.ruby-lang.org/issues/20929
+[RubyGems-v3.5.4]: https://github.com/rubygems/rubygems/releases/tag/v3.5.4
+[RubyGems-v3.5.5]: https://github.com/rubygems/rubygems/releases/tag/v3.5.5
+[RubyGems-v3.5.6]: https://github.com/rubygems/rubygems/releases/tag/v3.5.6
+[RubyGems-v3.5.7]: https://github.com/rubygems/rubygems/releases/tag/v3.5.7
+[RubyGems-v3.5.8]: https://github.com/rubygems/rubygems/releases/tag/v3.5.8
+[RubyGems-v3.5.9]: https://github.com/rubygems/rubygems/releases/tag/v3.5.9
+[RubyGems-v3.5.10]: https://github.com/rubygems/rubygems/releases/tag/v3.5.10
+[RubyGems-v3.5.11]: https://github.com/rubygems/rubygems/releases/tag/v3.5.11
+[RubyGems-v3.5.12]: https://github.com/rubygems/rubygems/releases/tag/v3.5.12
+[RubyGems-v3.5.13]: https://github.com/rubygems/rubygems/releases/tag/v3.5.13
+[RubyGems-v3.5.14]: https://github.com/rubygems/rubygems/releases/tag/v3.5.14
+[RubyGems-v3.5.15]: https://github.com/rubygems/rubygems/releases/tag/v3.5.15
+[RubyGems-v3.5.16]: https://github.com/rubygems/rubygems/releases/tag/v3.5.16
+[RubyGems-v3.5.17]: https://github.com/rubygems/rubygems/releases/tag/v3.5.17
+[RubyGems-v3.5.18]: https://github.com/rubygems/rubygems/releases/tag/v3.5.18
+[RubyGems-v3.5.19]: https://github.com/rubygems/rubygems/releases/tag/v3.5.19
+[RubyGems-v3.5.20]: https://github.com/rubygems/rubygems/releases/tag/v3.5.20
+[RubyGems-v3.5.21]: https://github.com/rubygems/rubygems/releases/tag/v3.5.21
+[RubyGems-v3.5.22]: https://github.com/rubygems/rubygems/releases/tag/v3.5.22
+[RubyGems-v3.5.23]: https://github.com/rubygems/rubygems/releases/tag/v3.5.23
+[RubyGems-v3.6.0]: https://github.com/rubygems/rubygems/releases/tag/v3.6.0
+[RubyGems-v3.6.1]: https://github.com/rubygems/rubygems/releases/tag/v3.6.1
+[RubyGems-v3.6.2]: https://github.com/rubygems/rubygems/releases/tag/v3.6.2
+[benchmark-v0.4.0]: https://github.com/ruby/benchmark/releases/tag/v0.4.0
+[bundler-v2.5.4]: https://github.com/rubygems/rubygems/releases/tag/bundler-v2.5.4
+[bundler-v2.5.5]: https://github.com/rubygems/rubygems/releases/tag/bundler-v2.5.5
+[bundler-v2.5.6]: https://github.com/rubygems/rubygems/releases/tag/bundler-v2.5.6
+[bundler-v2.5.7]: https://github.com/rubygems/rubygems/releases/tag/bundler-v2.5.7
+[bundler-v2.5.8]: https://github.com/rubygems/rubygems/releases/tag/bundler-v2.5.8
+[bundler-v2.5.9]: https://github.com/rubygems/rubygems/releases/tag/bundler-v2.5.9
+[bundler-v2.5.10]: https://github.com/rubygems/rubygems/releases/tag/bundler-v2.5.10
+[bundler-v2.5.11]: https://github.com/rubygems/rubygems/releases/tag/bundler-v2.5.11
+[bundler-v2.5.12]: https://github.com/rubygems/rubygems/releases/tag/bundler-v2.5.12
+[bundler-v2.5.13]: https://github.com/rubygems/rubygems/releases/tag/bundler-v2.5.13
+[bundler-v2.5.14]: https://github.com/rubygems/rubygems/releases/tag/bundler-v2.5.14
+[bundler-v2.5.15]: https://github.com/rubygems/rubygems/releases/tag/bundler-v2.5.15
+[bundler-v2.5.16]: https://github.com/rubygems/rubygems/releases/tag/bundler-v2.5.16
+[bundler-v2.5.17]: https://github.com/rubygems/rubygems/releases/tag/bundler-v2.5.17
+[bundler-v2.5.18]: https://github.com/rubygems/rubygems/releases/tag/bundler-v2.5.18
+[bundler-v2.5.19]: https://github.com/rubygems/rubygems/releases/tag/bundler-v2.5.19
+[bundler-v2.5.20]: https://github.com/rubygems/rubygems/releases/tag/bundler-v2.5.20
+[bundler-v2.5.21]: https://github.com/rubygems/rubygems/releases/tag/bundler-v2.5.21
+[bundler-v2.5.22]: https://github.com/rubygems/rubygems/releases/tag/bundler-v2.5.22
+[bundler-v2.5.23]: https://github.com/rubygems/rubygems/releases/tag/bundler-v2.5.23
+[bundler-v2.6.0]: https://github.com/rubygems/rubygems/releases/tag/bundler-v2.6.0
+[bundler-v2.6.1]: https://github.com/rubygems/rubygems/releases/tag/bundler-v2.6.1
+[bundler-v2.6.2]: https://github.com/rubygems/rubygems/releases/tag/bundler-v2.6.2
+[date-v3.4.0]: https://github.com/ruby/date/releases/tag/v3.4.0
+[date-v3.4.1]: https://github.com/ruby/date/releases/tag/v3.4.1
+[delegate-v0.4.0]: https://github.com/ruby/delegate/releases/tag/v0.4.0
+[did_you_mean-v2.0.0]: https://github.com/ruby/did_you_mean/releases/tag/v2.0.0
+[digest-v3.2.0.pre0]: https://github.com/ruby/digest/releases/tag/v3.2.0.pre0
+[digest-v3.2.0]: https://github.com/ruby/digest/releases/tag/v3.2.0
+[erb-v4.0.4]: https://github.com/ruby/erb/releases/tag/v4.0.4
+[etc-v1.4.4]: https://github.com/ruby/etc/releases/tag/v1.4.4
+[etc-v1.4.5]: https://github.com/ruby/etc/releases/tag/v1.4.5
+[fcntl-v1.2.0]: https://github.com/ruby/fcntl/releases/tag/v1.2.0
+[fiddle-v1.1.3]: https://github.com/ruby/fiddle/releases/tag/v1.1.3
+[fiddle-v1.1.4]: https://github.com/ruby/fiddle/releases/tag/v1.1.4
+[fiddle-v1.1.5]: https://github.com/ruby/fiddle/releases/tag/v1.1.5
+[fiddle-v1.1.6]: https://github.com/ruby/fiddle/releases/tag/v1.1.6
+[fileutils-v1.7.3]: https://github.com/ruby/fileutils/releases/tag/v1.7.3
+[io-console-v0.7.2]: https://github.com/ruby/io-console/releases/tag/v0.7.2
+[io-console-v0.8.0.beta1]: https://github.com/ruby/io-console/releases/tag/v0.8.0.beta1
+[io-console-v0.8.0]: https://github.com/ruby/io-console/releases/tag/v0.8.0
+[io-nonblock-v0.3.1]: https://github.com/ruby/io-nonblock/releases/tag/v0.3.1
+[ipaddr-v1.2.7]: https://github.com/ruby/ipaddr/releases/tag/v1.2.7
+[irb-v1.11.1]: https://github.com/ruby/irb/releases/tag/v1.11.1
+[irb-v1.11.2]: https://github.com/ruby/irb/releases/tag/v1.11.2
+[irb-v1.12.0]: https://github.com/ruby/irb/releases/tag/v1.12.0
+[irb-v1.13.0]: https://github.com/ruby/irb/releases/tag/v1.13.0
+[irb-v1.13.1]: https://github.com/ruby/irb/releases/tag/v1.13.1
+[irb-v1.13.2]: https://github.com/ruby/irb/releases/tag/v1.13.2
+[irb-v1.14.0]: https://github.com/ruby/irb/releases/tag/v1.14.0
+[irb-v1.14.1]: https://github.com/ruby/irb/releases/tag/v1.14.1
+[irb-v1.14.2]: https://github.com/ruby/irb/releases/tag/v1.14.2
+[irb-v1.14.3]: https://github.com/ruby/irb/releases/tag/v1.14.3
+[json-v2.7.2]: https://github.com/ruby/json/releases/tag/v2.7.2
+[json-v2.7.3.rc1]: https://github.com/ruby/json/releases/tag/v2.7.3.rc1
+[json-v2.7.3]: https://github.com/ruby/json/releases/tag/v2.7.3
+[json-v2.7.4]: https://github.com/ruby/json/releases/tag/v2.7.4
+[json-v2.7.5]: https://github.com/ruby/json/releases/tag/v2.7.5
+[json-v2.7.6]: https://github.com/ruby/json/releases/tag/v2.7.6
+[json-v2.8.0]: https://github.com/ruby/json/releases/tag/v2.8.0
+[json-v2.8.1]: https://github.com/ruby/json/releases/tag/v2.8.1
+[json-v2.8.2]: https://github.com/ruby/json/releases/tag/v2.8.2
+[json-v2.9.0]: https://github.com/ruby/json/releases/tag/v2.9.0
+[json-v2.9.1]: https://github.com/ruby/json/releases/tag/v2.9.1
+[logger-v1.6.1]: https://github.com/ruby/logger/releases/tag/v1.6.1
+[logger-v1.6.2]: https://github.com/ruby/logger/releases/tag/v1.6.2
+[logger-v1.6.3]: https://github.com/ruby/logger/releases/tag/v1.6.3
+[logger-v1.6.4]: https://github.com/ruby/logger/releases/tag/v1.6.4
+[net-http-v0.4.1]: https://github.com/ruby/net-http/releases/tag/v0.4.1
+[net-http-v0.5.0]: https://github.com/ruby/net-http/releases/tag/v0.5.0
+[net-http-v0.6.0]: https://github.com/ruby/net-http/releases/tag/v0.6.0
+[open-uri-v0.5.0]: https://github.com/ruby/open-uri/releases/tag/v0.5.0
+[optparse-v0.5.0]: https://github.com/ruby/optparse/releases/tag/v0.5.0
+[optparse-v0.6.0]: https://github.com/ruby/optparse/releases/tag/v0.6.0
+[ostruct-v0.6.1]: https://github.com/ruby/ostruct/releases/tag/v0.6.1
+[pathname-v0.4.0]: https://github.com/ruby/pathname/releases/tag/v0.4.0
+[pp-v0.6.0]: https://github.com/ruby/pp/releases/tag/v0.6.0
+[pp-v0.6.1]: https://github.com/ruby/pp/releases/tag/v0.6.1
+[pp-v0.6.2]: https://github.com/ruby/pp/releases/tag/v0.6.2
+[prism-v0.20.0]: https://github.com/ruby/prism/releases/tag/v0.20.0
+[prism-v0.21.0]: https://github.com/ruby/prism/releases/tag/v0.21.0
+[prism-v0.22.0]: https://github.com/ruby/prism/releases/tag/v0.22.0
+[prism-v0.23.0]: https://github.com/ruby/prism/releases/tag/v0.23.0
+[prism-v0.24.0]: https://github.com/ruby/prism/releases/tag/v0.24.0
+[prism-v0.25.0]: https://github.com/ruby/prism/releases/tag/v0.25.0
+[prism-v0.26.0]: https://github.com/ruby/prism/releases/tag/v0.26.0
+[prism-v0.27.0]: https://github.com/ruby/prism/releases/tag/v0.27.0
+[prism-v0.28.0]: https://github.com/ruby/prism/releases/tag/v0.28.0
+[prism-v0.29.0]: https://github.com/ruby/prism/releases/tag/v0.29.0
+[prism-v0.30.0]: https://github.com/ruby/prism/releases/tag/v0.30.0
+[prism-v1.0.0]: https://github.com/ruby/prism/releases/tag/v1.0.0
+[prism-v1.1.0]: https://github.com/ruby/prism/releases/tag/v1.1.0
+[prism-v1.2.0]: https://github.com/ruby/prism/releases/tag/v1.2.0
+[pstore-v0.1.4]: https://github.com/ruby/pstore/releases/tag/v0.1.4
+[psych-v5.2.0.beta1]: https://github.com/ruby/psych/releases/tag/v5.2.0.beta1
+[psych-v5.2.0]: https://github.com/ruby/psych/releases/tag/v5.2.0
+[psych-v5.2.0.beta2]: https://github.com/ruby/psych/releases/tag/v5.2.0.beta2
+[psych-v5.2.0.beta3]: https://github.com/ruby/psych/releases/tag/v5.2.0.beta3
+[psych-v5.2.0.beta4]: https://github.com/ruby/psych/releases/tag/v5.2.0.beta4
+[psych-v5.2.0.beta5]: https://github.com/ruby/psych/releases/tag/v5.2.0.beta5
+[psych-v5.2.0.beta6]: https://github.com/ruby/psych/releases/tag/v5.2.0.beta6
+[psych-v5.2.0.beta7]: https://github.com/ruby/psych/releases/tag/v5.2.0.beta7
+[psych-v5.2.1]: https://github.com/ruby/psych/releases/tag/v5.2.1
+[psych-v5.2.2]: https://github.com/ruby/psych/releases/tag/v5.2.2
+[rdoc-v6.7.0]: https://github.com/ruby/rdoc/releases/tag/v6.7.0
+[rdoc-v6.8.0]: https://github.com/ruby/rdoc/releases/tag/v6.8.0
+[rdoc-v6.8.1]: https://github.com/ruby/rdoc/releases/tag/v6.8.1
+[rdoc-v6.9.0]: https://github.com/ruby/rdoc/releases/tag/v6.9.0
+[rdoc-v6.9.1]: https://github.com/ruby/rdoc/releases/tag/v6.9.1
+[rdoc-v6.10.0]: https://github.com/ruby/rdoc/releases/tag/v6.10.0
+[reline-v0.5.0.pre.1]: https://github.com/ruby/reline/releases/tag/v0.5.0.pre.1
+[reline-v0.4.2]: https://github.com/ruby/reline/releases/tag/v0.4.2
+[reline-v0.4.3]: https://github.com/ruby/reline/releases/tag/v0.4.3
+[reline-v0.5.0]: https://github.com/ruby/reline/releases/tag/v0.5.0
+[reline-v0.5.1]: https://github.com/ruby/reline/releases/tag/v0.5.1
+[reline-v0.5.2]: https://github.com/ruby/reline/releases/tag/v0.5.2
+[reline-v0.5.3]: https://github.com/ruby/reline/releases/tag/v0.5.3
+[reline-v0.5.4]: https://github.com/ruby/reline/releases/tag/v0.5.4
+[reline-v0.5.5]: https://github.com/ruby/reline/releases/tag/v0.5.5
+[reline-v0.5.6]: https://github.com/ruby/reline/releases/tag/v0.5.6
+[reline-v0.5.7]: https://github.com/ruby/reline/releases/tag/v0.5.7
+[reline-v0.5.8]: https://github.com/ruby/reline/releases/tag/v0.5.8
+[reline-v0.5.9]: https://github.com/ruby/reline/releases/tag/v0.5.9
+[reline-v0.5.10]: https://github.com/ruby/reline/releases/tag/v0.5.10
+[reline-v0.5.11]: https://github.com/ruby/reline/releases/tag/v0.5.11
+[reline-v0.5.12]: https://github.com/ruby/reline/releases/tag/v0.5.12
+[reline-v0.6.0]: https://github.com/ruby/reline/releases/tag/v0.6.0
+[resolv-v0.4.0]: https://github.com/ruby/resolv/releases/tag/v0.4.0
+[resolv-v0.5.0]: https://github.com/ruby/resolv/releases/tag/v0.5.0
+[resolv-v0.6.0]: https://github.com/ruby/resolv/releases/tag/v0.6.0
+[securerandom-v0.3.2]: https://github.com/ruby/securerandom/releases/tag/v0.3.2
+[securerandom-v0.4.0]: https://github.com/ruby/securerandom/releases/tag/v0.4.0
+[securerandom-v0.4.1]: https://github.com/ruby/securerandom/releases/tag/v0.4.1
+[set-v1.1.1]: https://github.com/ruby/set/releases/tag/v1.1.1
+[shellwords-v0.2.1]: https://github.com/ruby/shellwords/releases/tag/v0.2.1
+[shellwords-v0.2.2]: https://github.com/ruby/shellwords/releases/tag/v0.2.2
+[singleton-v0.3.0]: https://github.com/ruby/singleton/releases/tag/v0.3.0
+[stringio-v3.1.1]: https://github.com/ruby/stringio/releases/tag/v3.1.1
+[stringio-v3.1.2]: https://github.com/ruby/stringio/releases/tag/v3.1.2
+[strscan-v3.0.8]: https://github.com/ruby/strscan/releases/tag/v3.0.8
+[strscan-v3.0.9]: https://github.com/ruby/strscan/releases/tag/v3.0.9
+[strscan-v3.1.0]: https://github.com/ruby/strscan/releases/tag/v3.1.0
+[strscan-v3.1.1]: https://github.com/ruby/strscan/releases/tag/v3.1.1
+[strscan-v3.1.2]: https://github.com/ruby/strscan/releases/tag/v3.1.2
+[syntax_suggest-v2.0.1]: https://github.com/ruby/syntax_suggest/releases/tag/v2.0.1
+[syntax_suggest-v2.0.2]: https://github.com/ruby/syntax_suggest/releases/tag/v2.0.2
+[tempfile-v0.3.0]: https://github.com/ruby/tempfile/releases/tag/v0.3.0
+[tempfile-v0.3.1]: https://github.com/ruby/tempfile/releases/tag/v0.3.1
+[time-v0.4.0]: https://github.com/ruby/time/releases/tag/v0.4.0
+[time-v0.4.1]: https://github.com/ruby/time/releases/tag/v0.4.1
+[timeout-v0.4.2]: https://github.com/ruby/timeout/releases/tag/v0.4.2
+[timeout-v0.4.3]: https://github.com/ruby/timeout/releases/tag/v0.4.3
+[tmpdir-v0.3.0]: https://github.com/ruby/tmpdir/releases/tag/v0.3.0
+[tmpdir-v0.3.1]: https://github.com/ruby/tmpdir/releases/tag/v0.3.1
+[uri-v0.13.1]: https://github.com/ruby/uri/releases/tag/v0.13.1
+[uri-v1.0.0]: https://github.com/ruby/uri/releases/tag/v1.0.0
+[uri-v1.0.1]: https://github.com/ruby/uri/releases/tag/v1.0.1
+[uri-v1.0.2]: https://github.com/ruby/uri/releases/tag/v1.0.2
+[win32ole-v1.9.0]: https://github.com/ruby/win32ole/releases/tag/v1.9.0
+[win32ole-v1.9.1]: https://github.com/ruby/win32ole/releases/tag/v1.9.1
+[yaml-v0.4.0]: https://github.com/ruby/yaml/releases/tag/v0.4.0
+[zlib-v3.1.1]: https://github.com/ruby/zlib/releases/tag/v3.1.1
+[zlib-v3.2.0]: https://github.com/ruby/zlib/releases/tag/v3.2.0
+[zlib-v3.2.1]: https://github.com/ruby/zlib/releases/tag/v3.2.1
+[minitest-v5.25.4]: https://github.com/seattlerb/minitest/releases/tag/v5.25.4
+[power_assert-v2.0.4]:  https://github.com/ruby/power_assert/releases/tag/v2.0.4
+[power_assert-v2.0.5]:  https://github.com/ruby/power_assert/releases/tag/v2.0.5
+[rake-v13.2.0]: https://github.com/ruby/rake/releases/tag/v13.2.0
+[rake-v13.2.1]: https://github.com/ruby/rake/releases/tag/v13.2.1
+[test-unit-3.6.2]: https://github.com/test-unit/test-unit/releases/tag/3.6.2
+[test-unit-3.6.3]: https://github.com/test-unit/test-unit/releases/tag/3.6.3
+[test-unit-3.6.4]: https://github.com/test-unit/test-unit/releases/tag/3.6.4
+[test-unit-3.6.5]: https://github.com/test-unit/test-unit/releases/tag/3.6.5
+[test-unit-3.6.6]: https://github.com/test-unit/test-unit/releases/tag/3.6.6
+[test-unit-3.6.7]: https://github.com/test-unit/test-unit/releases/tag/3.6.7
+[rexml-v3.2.7]: https://github.com/ruby/rexml/releases/tag/v3.2.7
+[rexml-v3.2.8]: https://github.com/ruby/rexml/releases/tag/v3.2.8
+[rexml-v3.2.9]: https://github.com/ruby/rexml/releases/tag/v3.2.9
+[rexml-v3.3.0]: https://github.com/ruby/rexml/releases/tag/v3.3.0
+[rexml-v3.3.1]: https://github.com/ruby/rexml/releases/tag/v3.3.1
+[rexml-v3.3.2]: https://github.com/ruby/rexml/releases/tag/v3.3.2
+[rexml-v3.3.3]: https://github.com/ruby/rexml/releases/tag/v3.3.3
+[rexml-v3.3.4]: https://github.com/ruby/rexml/releases/tag/v3.3.4
+[rexml-v3.3.5]: https://github.com/ruby/rexml/releases/tag/v3.3.5
+[rexml-v3.3.6]: https://github.com/ruby/rexml/releases/tag/v3.3.6
+[rexml-v3.3.7]: https://github.com/ruby/rexml/releases/tag/v3.3.7
+[rexml-v3.3.8]: https://github.com/ruby/rexml/releases/tag/v3.3.8
+[rexml-v3.3.9]: https://github.com/ruby/rexml/releases/tag/v3.3.9
+[rexml-v3.4.0]: https://github.com/ruby/rexml/releases/tag/v3.4.0
+[rss-0.3.1]: https://github.com/ruby/rss/releases/tag/0.3.1
+[net-ftp-v0.3.4]: https://github.com/ruby/net-ftp/releases/tag/v0.3.4
+[net-ftp-v0.3.5]: https://github.com/ruby/net-ftp/releases/tag/v0.3.5
+[net-ftp-v0.3.6]: https://github.com/ruby/net-ftp/releases/tag/v0.3.6
+[net-ftp-v0.3.7]: https://github.com/ruby/net-ftp/releases/tag/v0.3.7
+[net-ftp-v0.3.8]: https://github.com/ruby/net-ftp/releases/tag/v0.3.8
+[net-imap-v0.4.9.1]: https://github.com/ruby/net-imap/releases/tag/v0.4.9.1
+[net-imap-v0.4.10]: https://github.com/ruby/net-imap/releases/tag/v0.4.10
+[net-imap-v0.4.11]: https://github.com/ruby/net-imap/releases/tag/v0.4.11
+[net-imap-v0.4.12]: https://github.com/ruby/net-imap/releases/tag/v0.4.12
+[net-imap-v0.4.13]: https://github.com/ruby/net-imap/releases/tag/v0.4.13
+[net-imap-v0.4.14]: https://github.com/ruby/net-imap/releases/tag/v0.4.14
+[net-imap-v0.4.15]: https://github.com/ruby/net-imap/releases/tag/v0.4.15
+[net-imap-v0.4.16]: https://github.com/ruby/net-imap/releases/tag/v0.4.16
+[net-imap-v0.4.17]: https://github.com/ruby/net-imap/releases/tag/v0.4.17
+[net-imap-v0.5.0]: https://github.com/ruby/net-imap/releases/tag/v0.5.0
+[net-imap-v0.4.18]: https://github.com/ruby/net-imap/releases/tag/v0.4.18
+[net-imap-v0.5.1]: https://github.com/ruby/net-imap/releases/tag/v0.5.1
+[net-imap-v0.5.2]: https://github.com/ruby/net-imap/releases/tag/v0.5.2
+[net-imap-v0.5.3]: https://github.com/ruby/net-imap/releases/tag/v0.5.3
+[net-imap-v0.5.4]: https://github.com/ruby/net-imap/releases/tag/v0.5.4
+[net-smtp-v0.4.0.1]: https://github.com/ruby/net-smtp/releases/tag/v0.4.0.1
+[net-smtp-v0.5.0]: https://github.com/ruby/net-smtp/releases/tag/v0.5.0
+[prime-v0.1.3]: https://github.com/ruby/prime/releases/tag/v0.1.3
+[rbs-v3.4.1]: https://github.com/ruby/rbs/releases/tag/v3.4.1
+[rbs-v3.4.2]: https://github.com/ruby/rbs/releases/tag/v3.4.2
+[rbs-v3.4.3]: https://github.com/ruby/rbs/releases/tag/v3.4.3
+[rbs-v3.4.4]: https://github.com/ruby/rbs/releases/tag/v3.4.4
+[rbs-v3.5.0.pre.1]: https://github.com/ruby/rbs/releases/tag/v3.5.0.pre.1
+[rbs-v3.5.0.pre.2]: https://github.com/ruby/rbs/releases/tag/v3.5.0.pre.2
+[rbs-v3.5.0]: https://github.com/ruby/rbs/releases/tag/v3.5.0
+[rbs-v3.5.1]: https://github.com/ruby/rbs/releases/tag/v3.5.1
+[rbs-v3.5.2]: https://github.com/ruby/rbs/releases/tag/v3.5.2
+[rbs-v3.5.3]: https://github.com/ruby/rbs/releases/tag/v3.5.3
+[rbs-v3.6.0.dev.1]: https://github.com/ruby/rbs/releases/tag/v3.6.0.dev.1
+[rbs-v3.6.0.pre.1]: https://github.com/ruby/rbs/releases/tag/v3.6.0.pre.1
+[rbs-v3.6.0.pre.2]: https://github.com/ruby/rbs/releases/tag/v3.6.0.pre.2
+[rbs-v3.6.0.pre.3]: https://github.com/ruby/rbs/releases/tag/v3.6.0.pre.3
+[rbs-v3.6.0]: https://github.com/ruby/rbs/releases/tag/v3.6.0
+[rbs-v3.6.1]: https://github.com/ruby/rbs/releases/tag/v3.6.1
+[rbs-v3.7.0.dev.1]: https://github.com/ruby/rbs/releases/tag/v3.7.0.dev.1
+[rbs-v3.7.0.pre.1]: https://github.com/ruby/rbs/releases/tag/v3.7.0.pre.1
+[rbs-v3.7.0]: https://github.com/ruby/rbs/releases/tag/v3.7.0
+[rbs-v3.8.0.pre.1]: https://github.com/ruby/rbs/releases/tag/v3.8.0.pre.1
+[rbs-v3.8.0]: https://github.com/ruby/rbs/releases/tag/v3.8.0
+[debug-v1.9.2]: https://github.com/ruby/debug/releases/tag/v1.9.2
+[debug-v1.10.0]: https://github.com/ruby/debug/releases/tag/v1.10.0
+[racc-v1.8.0]: https://github.com/ruby/racc/releases/tag/v1.8.0
+[racc-v1.8.1]: https://github.com/ruby/racc/releases/tag/v1.8.1
+[mutex_m-v0.3.0]: https://github.com/ruby/mutex_m/releases/tag/v0.3.0
+[bigdecimal-v3.1.6]: https://github.com/ruby/bigdecimal/releases/tag/v3.1.6
+[bigdecimal-v3.1.7]: https://github.com/ruby/bigdecimal/releases/tag/v3.1.7
+[bigdecimal-v3.1.8]: https://github.com/ruby/bigdecimal/releases/tag/v3.1.8
+[drb-v2.2.1]: https://github.com/ruby/drb/releases/tag/v2.2.1
+[nkf-v0.2.0]: https://github.com/ruby/nkf/releases/tag/v0.2.0
+[syslog-v0.2.0]: https://github.com/ruby/syslog/releases/tag/v0.2.0
+[csv-v3.2.9]: https://github.com/ruby/csv/releases/tag/v3.2.9
+[csv-v3.3.0]: https://github.com/ruby/csv/releases/tag/v3.3.0
+[csv-v3.3.1]: https://github.com/ruby/csv/releases/tag/v3.3.1
+[csv-v3.3.2]: https://github.com/ruby/csv/releases/tag/v3.3.2
+[ruby/net-http-sspi]: https://github.com/ruby/net-http-sspi
+[typeprof-v0.30.1]: https://github.com/ruby/typeprof/releases/tag/v0.30.1
+
+[RubyGems]: https://github.com/rubygems/rubygems
+[benchmark]: https://github.com/ruby/benchmark
+[bundler]: https://github.com/rubygems/rubygems
+[date]: https://github.com/ruby/date
+[delegate]: https://github.com/ruby/delegate
+[did_you_mean]: https://github.com/ruby/did_you_mean
+[digest]: https://github.com/ruby/digest
+[erb]: https://github.com/ruby/erb
+[error_highlight]: https://github.com/ruby/error_highlight
+[etc]: https://github.com/ruby/etc
+[fcntl]: https://github.com/ruby/fcntl
+[fiddle]: https://github.com/ruby/fiddle
+[fileutils]: https://github.com/ruby/fileutils
+[io-console]: https://github.com/ruby/io-console
+[io-nonblock]: https://github.com/ruby/io-nonblock
+[ipaddr]: https://github.com/ruby/ipaddr
+[irb]: https://github.com/ruby/irb
+[json]: https://github.com/ruby/json
+[logger]: https://github.com/ruby/logger
+[net-http]: https://github.com/ruby/net-http
+[open-uri]: https://github.com/ruby/open-uri
+[optparse]: https://github.com/ruby/optparse
+[ostruct]: https://github.com/ruby/ostruct
+[pathname]: https://github.com/ruby/pathname
+[pp]: https://github.com/ruby/pp
+[prism]: https://github.com/ruby/prism
+[pstore]: https://github.com/ruby/pstore
+[psych]: https://github.com/ruby/psych
+[rdoc]: https://github.com/ruby/rdoc
+[reline]: https://github.com/ruby/reline
+[resolv]: https://github.com/ruby/resolv
+[securerandom]: https://github.com/ruby/securerandom
+[set]: https://github.com/ruby/set
+[shellwords]: https://github.com/ruby/shellwords
+[singleton]: https://github.com/ruby/singleton
+[stringio]: https://github.com/ruby/stringio
+[strscan]: https://github.com/ruby/strscan
+[syntax_suggest]: https://github.com/ruby/syntax_suggest
+[tempfile]: https://github.com/ruby/tempfile
+[time]: https://github.com/ruby/time
+[timeout]: https://github.com/ruby/timeout
+[tmpdir]: https://github.com/ruby/tmpdir
+[uri]: https://github.com/ruby/uri
+[win32ole]: https://github.com/ruby/win32ole
+[yaml]: https://github.com/ruby/yaml
+[zlib]: https://github.com/ruby/zlib
+
+[repl_type_completor]: https://github.com/ruby/repl_type_completor
+[minitest]: https://github.com/seattlerb/minitest
+[power_assert]: https://github.com/ruby/power_assert
+[rake]: https://github.com/ruby/rake
+[test-unit]: https://github.com/test-unit/test-unit
+[rexml]: https://github.com/ruby/rexml
+[rss]: https://github.com/ruby/rss
+[net-ftp]: https://github.com/ruby/net-ftp
+[net-imap]: https://github.com/ruby/net-imap
+[net-smtp]: https://github.com/ruby/net-smtp
+[prime]: https://github.com/ruby/prime
+[rbs]: https://github.com/ruby/rbs
+[typeprof]: https://github.com/ruby/typeprof
+[debug]: https://github.com/ruby/debug
+[racc]: https://github.com/ruby/racc
+[mutex_m]: https://github.com/ruby/mutex_m
+[getoptlong]: https://github.com/ruby/getoptlong
+[base64]: https://github.com/ruby/base64
+[bigdecimal]: https://github.com/ruby/bigdecimal
+[observer]: https://github.com/ruby/observer
+[abbrev]: https://github.com/ruby/abbrev
+[resolv-replace]: https://github.com/ruby/resolv-replace
+[rinda]: https://github.com/ruby/rinda
+[drb]: https://github.com/ruby/drb
+[nkf]: https://github.com/ruby/nkf
+[syslog]: https://github.com/ruby/syslog
+[csv]: https://github.com/ruby/csv
diff --git a/doc/_regexp.rdoc b/doc/_regexp.rdoc
new file mode 100644
index 00000000000000..45a307fad660d3
--- /dev/null
+++ b/doc/_regexp.rdoc
@@ -0,0 +1,1284 @@
+A {regular expression}[https://en.wikipedia.org/wiki/Regular_expression]
+(also called a _regexp_) is a <i>match pattern</i> (also simply called a _pattern_).
+
+A common notation for a regexp uses enclosing slash characters:
+
+  /foo/
+
+A regexp may be applied to a <i>target string</i>;
+The part of the string (if any) that matches the pattern is called a _match_,
+and may be said <i>to match</i>:
+
+  re = /red/
+  re.match?('redirect') # => true   # Match at beginning of target.
+  re.match?('bored')    # => true   # Match at end of target.
+  re.match?('credit')   # => true   # Match within target.
+  re.match?('foo')      # => false  # No match.
+
+== \Regexp Uses
+
+A regexp may be used:
+
+- To extract substrings based on a given pattern:
+
+    re = /foo/              # => /foo/
+    re.match('food')        # => #<MatchData "foo">
+    re.match('good')        # => nil
+
+  See sections {Method match}[rdoc-ref:Regexp@Method+match]
+  and {Operator =~}[rdoc-ref:Regexp@Operator+-3D~].
+
+- To determine whether a string matches a given pattern:
+
+    re.match?('food') # => true
+    re.match?('good') # => false
+
+  See section {Method match?}[rdoc-ref:Regexp@Method+match-3F].
+
+- As an argument for calls to certain methods in other classes and modules;
+  most such methods accept an argument that may be either a string
+  or the (much more powerful) regexp.
+
+  See {Regexp Methods}[rdoc-ref:regexp/methods.rdoc].
+
+== \Regexp Objects
+
+A regexp object has:
+
+- A source; see {Sources}[rdoc-ref:Regexp@Sources].
+
+- Several modes; see {Modes}[rdoc-ref:Regexp@Modes].
+
+- A timeout; see {Timeouts}[rdoc-ref:Regexp@Timeouts].
+
+- An encoding; see {Encodings}[rdoc-ref:Regexp@Encodings].
+
+== Creating a \Regexp
+
+A regular expression may be created with:
+
+- A regexp literal using slash characters
+  (see {Regexp Literals}[rdoc-ref:syntax/literals.rdoc@Regexp+Literals]):
+
+    # This is a very common usage.
+    /foo/ # => /foo/
+
+- A <tt>%r</tt> regexp literal
+  (see {%r: Regexp Literals}[rdoc-ref:syntax/literals.rdoc@25r-3A+Regexp+Literals]):
+
+    # Same delimiter character at beginning and end;
+    # useful for avoiding escaping characters
+    %r/name\/value pair/ # => /name\/value pair/
+    %r:name/value pair:  # => /name\/value pair/
+    %r|name/value pair|  # => /name\/value pair/
+
+    # Certain "paired" characters can be delimiters.
+    %r[foo] # => /foo/
+    %r{foo} # => /foo/
+    %r(foo) # => /foo/
+    %r<foo> # => /foo/
+
+- Method Regexp.new.
+
+== Method <tt>match</tt>
+
+Each of the methods Regexp#match, String#match, and Symbol#match
+returns a MatchData object if a match was found, +nil+ otherwise;
+each also sets {global variables}[rdoc-ref:Regexp@Global+Variables]:
+
+  'food'.match(/foo/) # => #<MatchData "foo">
+  'food'.match(/bar/) # => nil
+
+== Operator <tt>=~</tt>
+
+Each of the operators Regexp#=~, String#=~, and Symbol#=~
+returns an integer offset if a match was found, +nil+ otherwise;
+each also sets {global variables}[rdoc-ref:Regexp@Global+Variables]:
+
+  /bar/ =~ 'foo bar' # => 4
+  'foo bar' =~ /bar/ # => 4
+  /baz/ =~ 'foo bar' # => nil
+
+== Method <tt>match?</tt>
+
+Each of the methods Regexp#match?, String#match?, and Symbol#match?
+returns +true+ if a match was found, +false+ otherwise;
+none sets {global variables}[rdoc-ref:Regexp@Global+Variables]:
+
+  'food'.match?(/foo/) # => true
+  'food'.match?(/bar/) # => false
+
+== Global Variables
+
+Certain regexp-oriented methods assign values to global variables:
+
+- <tt>#match</tt>: see {Method match}[rdoc-ref:Regexp@Method+match].
+- <tt>#=~</tt>: see {Operator =~}[rdoc-ref:Regexp@Operator+-3D~].
+
+The affected global variables are:
+
+- <tt>$~</tt>: Returns a MatchData object, or +nil+.
+- <tt>$&</tt>: Returns the matched part of the string, or +nil+.
+- <tt>$`</tt>: Returns the part of the string to the left of the match, or +nil+.
+- <tt>$'</tt>: Returns the part of the string to the right of the match, or +nil+.
+- <tt>$+</tt>: Returns the last group matched, or +nil+.
+- <tt>$1</tt>, <tt>$2</tt>, etc.: Returns the first, second, etc.,
+  matched group, or +nil+.
+  Note that <tt>$0</tt> is quite different;
+  it returns the name of the currently executing program.
+
+These variables, except for <tt>$~</tt>, are shorthands for methods of
+<tt>$~</tt>.  See MatchData@Global+variables+equivalence.
+
+Examples:
+
+  # Matched string, but no matched groups.
+  'foo bar bar baz'.match('bar')
+  $~ # => #<MatchData "bar">
+  $& # => "bar"
+  $` # => "foo "
+  $' # => " bar baz"
+  $+ # => nil
+  $1 # => nil
+
+  # Matched groups.
+  /s(\w{2}).*(c)/.match('haystack')
+  $~ # => #<MatchData "stac" 1:"ta" 2:"c">
+  $& # => "stac"
+  $` # => "hay"
+  $' # => "k"
+  $+ # => "c"
+  $1 # => "ta"
+  $2 # => "c"
+  $3 # => nil
+
+  # No match.
+  'foo'.match('bar')
+  $~ # => nil
+  $& # => nil
+  $` # => nil
+  $' # => nil
+  $+ # => nil
+  $1 # => nil
+
+Note that Regexp#match?, String#match?, and Symbol#match?
+do not set global variables.
+
+== Sources
+
+As seen above, the simplest regexp uses a literal expression as its source:
+
+  re = /foo/              # => /foo/
+  re.match('food')        # => #<MatchData "foo">
+  re.match('good')        # => nil
+
+A rich collection of available _subexpressions_
+gives the regexp great power and flexibility:
+
+- {Special characters}[rdoc-ref:Regexp@Special+Characters]
+- {Source literals}[rdoc-ref:Regexp@Source+Literals]
+- {Character classes}[rdoc-ref:Regexp@Character+Classes]
+- {Shorthand character classes}[rdoc-ref:Regexp@Shorthand+Character+Classes]
+- {Anchors}[rdoc-ref:Regexp@Anchors]
+- {Alternation}[rdoc-ref:Regexp@Alternation]
+- {Quantifiers}[rdoc-ref:Regexp@Quantifiers]
+- {Groups and captures}[rdoc-ref:Regexp@Groups+and+Captures]
+- {Unicode}[rdoc-ref:Regexp@Unicode]
+- {POSIX Bracket Expressions}[rdoc-ref:Regexp@POSIX+Bracket+Expressions]
+- {Comments}[rdoc-ref:Regexp@Comments]
+
+=== Special Characters
+
+\Regexp special characters, called _metacharacters_,
+have special meanings in certain contexts;
+depending on the context, these are sometimes metacharacters:
+
+  . ? - + * ^ \ | $ ( ) [ ] { }
+
+To match a metacharacter literally, backslash-escape it:
+
+  # Matches one or more 'o' characters.
+  /o+/.match('foo')  # => #<MatchData "oo">
+  # Would match 'o+'.
+  /o\+/.match('foo') # => nil
+
+To match a backslash literally, backslash-escape it:
+
+  /\./.match('\.')  # => #<MatchData ".">
+  /\\./.match('\.') # => #<MatchData "\\.">
+
+Method Regexp.escape returns an escaped string:
+
+  Regexp.escape('.?-+*^\|$()[]{}')
+  # => "\\.\\?\\-\\+\\*\\^\\\\\\|\\$\\(\\)\\[\\]\\{\\}"
+
+=== Source Literals
+
+The source literal largely behaves like a double-quoted string;
+see {Double-Quoted String Literals}[rdoc-ref:syntax/literals.rdoc@Double-Quoted+String+Literals].
+
+In particular, a source literal may contain interpolated expressions:
+
+  s = 'foo'         # => "foo"
+  /#{s}/            # => /foo/
+  /#{s.capitalize}/ # => /Foo/
+  /#{2 + 2}/        # => /4/
+
+There are differences between an ordinary string literal and a source literal;
+see {Shorthand Character Classes}[rdoc-ref:Regexp@Shorthand+Character+Classes].
+
+- <tt>\s</tt> in an ordinary string literal is equivalent to a space character;
+  in a source literal, it's shorthand for matching a whitespace character.
+- In an ordinary string literal, these are (needlessly) escaped characters;
+  in a source literal, they are shorthands for various matching characters:
+
+    \w \W \d \D \h \H \S \R
+
+=== Character Classes
+
+A <i>character class</i> is delimited by square brackets;
+it specifies that certain characters match at a given point in the target string:
+
+  # This character class will match any vowel.
+  re = /B[aeiou]rd/
+  re.match('Bird') # => #<MatchData "Bird">
+  re.match('Bard') # => #<MatchData "Bard">
+  re.match('Byrd') # => nil
+
+A character class may contain hyphen characters to specify ranges of characters:
+
+  # These regexps have the same effect.
+  /[abcdef]/.match('foo') # => #<MatchData "f">
+  /[a-f]/.match('foo')    # => #<MatchData "f">
+  /[a-cd-f]/.match('foo') # => #<MatchData "f">
+
+When the first character of a character class is a caret (<tt>^</tt>),
+the sense of the class is inverted: it matches any character _except_ those specified.
+
+  /[^a-eg-z]/.match('f') # => #<MatchData "f">
+
+A character class may contain another character class.
+By itself this isn't useful because <tt>[a-z[0-9]]</tt>
+describes the same set as <tt>[a-z0-9]</tt>.
+
+However, character classes also support the <tt>&&</tt> operator,
+which performs set intersection on its arguments.
+The two can be combined as follows:
+
+  /[a-w&&[^c-g]z]/ # ([a-w] AND ([^c-g] OR z))
+
+This is equivalent to:
+
+    /[abh-w]/
+
+=== Shorthand Character Classes
+
+Each of the following metacharacters serves as a shorthand
+for a character class:
+
+- <tt>/./</tt>: Matches any character except a newline:
+
+    /./.match('foo') # => #<MatchData "f">
+    /./.match("\n")  # => nil
+
+- <tt>/./m</tt>: Matches any character, including a newline;
+  see {Multiline Mode}[rdoc-ref:Regexp@Multiline+Mode]:
+
+    /./m.match("\n") # => #<MatchData "\n">
+
+- <tt>/\w/</tt>: Matches a word character: equivalent to <tt>[a-zA-Z0-9_]</tt>:
+
+    /\w/.match(' foo') # => #<MatchData "f">
+    /\w/.match(' _')   # => #<MatchData "_">
+    /\w/.match(' ')    # => nil
+
+- <tt>/\W/</tt>: Matches a non-word character: equivalent to <tt>[^a-zA-Z0-9_]</tt>:
+
+    /\W/.match(' ') # => #<MatchData " ">
+    /\W/.match('_') # => nil
+
+- <tt>/\d/</tt>: Matches a digit character: equivalent to <tt>[0-9]</tt>:
+
+    /\d/.match('THX1138') # => #<MatchData "1">
+    /\d/.match('foo')     # => nil
+
+- <tt>/\D/</tt>: Matches a non-digit character: equivalent to <tt>[^0-9]</tt>:
+
+    /\D/.match('123Jump!') # => #<MatchData "J">
+    /\D/.match('123')      # => nil
+
+- <tt>/\h/</tt>: Matches a hexdigit character: equivalent to <tt>[0-9a-fA-F]</tt>:
+
+    /\h/.match('xyz fedcba9876543210') # => #<MatchData "f">
+    /\h/.match('xyz')                  # => nil
+
+- <tt>/\H/</tt>: Matches a non-hexdigit character: equivalent to <tt>[^0-9a-fA-F]</tt>:
+
+    /\H/.match('fedcba9876543210xyz') # => #<MatchData "x">
+    /\H/.match('fedcba9876543210')    # => nil
+
+- <tt>/\s/</tt>: Matches a whitespace character: equivalent to <tt>/[ \t\r\n\f\v]/</tt>:
+
+    /\s/.match('foo bar') # => #<MatchData " ">
+    /\s/.match('foo')     # => nil
+
+- <tt>/\S/</tt>: Matches a non-whitespace character: equivalent to <tt>/[^ \t\r\n\f\v]/</tt>:
+
+    /\S/.match(" \t\r\n\f\v foo") # => #<MatchData "f">
+    /\S/.match(" \t\r\n\f\v")     # => nil
+
+- <tt>/\R/</tt>: Matches a linebreak, platform-independently:
+
+    /\R/.match("\r")     # => #<MatchData "\r">     # Carriage return (CR)
+    /\R/.match("\n")     # => #<MatchData "\n">     # Newline (LF)
+    /\R/.match("\f")     # => #<MatchData "\f">     # Formfeed (FF)
+    /\R/.match("\v")     # => #<MatchData "\v">     # Vertical tab (VT)
+    /\R/.match("\r\n")   # => #<MatchData "\r\n">   # CRLF
+    /\R/.match("\u0085") # => #<MatchData "\u0085"> # Next line (NEL)
+    /\R/.match("\u2028") # => #<MatchData "\u2028"> # Line separator (LSEP)
+    /\R/.match("\u2029") # => #<MatchData "\u2029"> # Paragraph separator (PSEP)
+
+=== Anchors
+
+An anchor is a metasequence that matches a zero-width position between
+characters in the target string.
+
+For a subexpression with no anchor,
+matching may begin anywhere in the target string:
+
+  /real/.match('surrealist') # => #<MatchData "real">
+
+For a subexpression with an anchor,
+matching must begin at the matched anchor.
+
+==== Boundary Anchors
+
+Each of these anchors matches a boundary:
+
+- <tt>^</tt>: Matches the beginning of a line:
+
+    /^bar/.match("foo\nbar") # => #<MatchData "bar">
+    /^ar/.match("foo\nbar")  # => nil
+
+- <tt>$</tt>: Matches the end of a line:
+
+    /bar$/.match("foo\nbar") # => #<MatchData "bar">
+    /ba$/.match("foo\nbar")  # => nil
+
+- <tt>\A</tt>: Matches the beginning of the string:
+
+    /\Afoo/.match('foo bar')  # => #<MatchData "foo">
+    /\Afoo/.match(' foo bar') # => nil
+
+- <tt>\Z</tt>: Matches the end of the string;
+  if string ends with a single newline,
+  it matches just before the ending newline:
+
+    /foo\Z/.match('bar foo')     # => #<MatchData "foo">
+    /foo\Z/.match('foo bar')     # => nil
+    /foo\Z/.match("bar foo\n")   # => #<MatchData "foo">
+    /foo\Z/.match("bar foo\n\n") # => nil
+
+- <tt>\z</tt>: Matches the end of the string:
+
+    /foo\z/.match('bar foo')   # => #<MatchData "foo">
+    /foo\z/.match('foo bar')   # => nil
+    /foo\z/.match("bar foo\n") # => nil
+
+- <tt>\b</tt>: Matches word boundary when not inside brackets;
+  matches backspace (<tt>"0x08"</tt>) when inside brackets:
+
+    /foo\b/.match('foo bar') # => #<MatchData "foo">
+    /foo\b/.match('foobar')  # => nil
+
+- <tt>\B</tt>: Matches non-word boundary:
+
+    /foo\B/.match('foobar')  # => #<MatchData "foo">
+    /foo\B/.match('foo bar') # => nil
+
+- <tt>\G</tt>: Matches first matching position:
+
+  In methods like String#gsub and String#scan, it changes on each iteration.
+  It initially matches the beginning of subject, and in each following iteration it matches where the last match finished.
+
+    "    a b c".gsub(/ /, '_')   # => "____a_b_c"
+    "    a b c".gsub(/\G /, '_') # => "____a b c"
+
+  In methods like Regexp#match and String#match
+  that take an optional offset, it matches where the search begins.
+
+    "hello, world".match(/,/, 3)   # => #<MatchData ",">
+    "hello, world".match(/\G,/, 3) # => nil
+
+==== Lookaround Anchors
+
+Lookahead anchors:
+
+- <tt>(?=_pat_)</tt>: Positive lookahead assertion:
+  ensures that the following characters match _pat_,
+  but doesn't include those characters in the matched substring.
+
+- <tt>(?!_pat_)</tt>: Negative lookahead assertion:
+  ensures that the following characters <i>do not</i> match _pat_,
+  but doesn't include those characters in the matched substring.
+
+Lookbehind anchors:
+
+- <tt>(?<=_pat_)</tt>: Positive lookbehind assertion:
+  ensures that the preceding characters match _pat_, but
+  doesn't include those characters in the matched substring.
+
+- <tt>(?<!_pat_)</tt>: Negative lookbehind assertion:
+  ensures that the preceding characters do not match
+  _pat_, but doesn't include those characters in the matched substring.
+
+The pattern below uses positive lookahead and positive lookbehind to match
+text appearing in <tt><b></tt>...<tt></b></tt> tags
+without including the tags in the match:
+
+  /(?<=<b>)\w+(?=<\/b>)/.match("Fortune favors the <b>bold</b>.")
+  # => #<MatchData "bold">
+
+The pattern in lookbehind must be fixed-width.
+But top-level alternatives can be of various lengths.
+ex. (?<=a|bc) is OK. (?<=aaa(?:b|cd)) is not allowed.
+
+==== Match-Reset Anchor
+
+- <tt>\K</tt>: Match reset:
+  the matched content preceding <tt>\K</tt> in the regexp is excluded from the result.
+  For example, the following two regexps are almost equivalent:
+
+    /ab\Kc/.match('abc')    # => #<MatchData "c">
+    /(?<=ab)c/.match('abc') # => #<MatchData "c">
+
+  These match same string and <tt>$&</tt> equals <tt>'c'</tt>,
+  while the matched position is different.
+
+  As are the following two regexps:
+
+    /(a)\K(b)\Kc/
+    /(?<=(?<=(a))(b))c/
+
+=== Alternation
+
+The vertical bar metacharacter (<tt>|</tt>) may be used within parentheses
+to express alternation:
+two or more subexpressions any of which may match the target string.
+
+Two alternatives:
+
+  re = /(a|b)/
+  re.match('foo') # => nil
+  re.match('bar') # => #<MatchData "b" 1:"b">
+
+Four alternatives:
+
+  re = /(a|b|c|d)/
+  re.match('shazam') # => #<MatchData "a" 1:"a">
+  re.match('cold')   # => #<MatchData "c" 1:"c">
+
+Each alternative is a subexpression, and may be composed of other subexpressions:
+
+  re = /([a-c]|[x-z])/
+  re.match('bar') # => #<MatchData "b" 1:"b">
+  re.match('ooz') # => #<MatchData "z" 1:"z">
+
+Method Regexp.union provides a convenient way to construct
+a regexp with alternatives.
+
+=== Quantifiers
+
+A simple regexp matches one character:
+
+  /\w/.match('Hello')  # => #<MatchData "H">
+
+An added _quantifier_ specifies how many matches are required or allowed:
+
+- <tt>*</tt> - Matches zero or more times:
+
+    /\w*/.match('')
+    # => #<MatchData "">
+    /\w*/.match('x')
+    # => #<MatchData "x">
+    /\w*/.match('xyz')
+    # => #<MatchData "yz">
+
+- <tt>+</tt> - Matches one or more times:
+
+    /\w+/.match('')    # => nil
+    /\w+/.match('x')   # => #<MatchData "x">
+    /\w+/.match('xyz') # => #<MatchData "xyz">
+
+- <tt>?</tt> - Matches zero or one times:
+
+    /\w?/.match('')    # => #<MatchData "">
+    /\w?/.match('x')   # => #<MatchData "x">
+    /\w?/.match('xyz') # => #<MatchData "x">
+
+- <tt>{</tt>_n_<tt>}</tt> - Matches exactly _n_ times:
+
+    /\w{2}/.match('')    # => nil
+    /\w{2}/.match('x')   # => nil
+    /\w{2}/.match('xyz') # => #<MatchData "xy">
+
+- <tt>{</tt>_min_<tt>,}</tt> - Matches _min_ or more times:
+
+    /\w{2,}/.match('')    # => nil
+    /\w{2,}/.match('x')   # => nil
+    /\w{2,}/.match('xy')  # => #<MatchData "xy">
+    /\w{2,}/.match('xyz') # => #<MatchData "xyz">
+
+- <tt>{,</tt>_max_<tt>}</tt> - Matches _max_ or fewer times:
+
+    /\w{,2}/.match('')    # => #<MatchData "">
+    /\w{,2}/.match('x')   # => #<MatchData "x">
+    /\w{,2}/.match('xyz') # => #<MatchData "xy">
+
+- <tt>{</tt>_min_<tt>,</tt>_max_<tt>}</tt> -
+  Matches at least _min_ times and at most _max_ times:
+
+    /\w{1,2}/.match('')    # => nil
+    /\w{1,2}/.match('x')   # => #<MatchData "x">
+    /\w{1,2}/.match('xyz') # => #<MatchData "xy">
+
+==== Greedy, Lazy, or Possessive Matching
+
+Quantifier matching may be greedy, lazy, or possessive:
+
+- In _greedy_ matching, as many occurrences as possible are matched
+  while still allowing the overall match to succeed.
+  Greedy quantifiers: <tt>*</tt>, <tt>+</tt>, <tt>?</tt>,
+  <tt>{min, max}</tt> and its variants.
+- In _lazy_ matching, the minimum number of occurrences are matched.
+  Lazy quantifiers: <tt>*?</tt>, <tt>+?</tt>, <tt>??</tt>,
+  <tt>{min, max}?</tt> and its variants.
+- In _possessive_ matching, once a match is found, there is no backtracking;
+  that match is retained, even if it jeopardises the overall match.
+  Possessive quantifiers: <tt>*+</tt>, <tt>++</tt>, <tt>?+</tt>.
+  Note that <tt>{min, max}</tt> and its variants do _not_ support possessive matching.
+
+More:
+
+- About greedy and lazy matching, see
+  {Choosing Minimal or Maximal Repetition}[https://doc.lagout.org/programmation/Regular%20Expressions/Regular%20Expressions%20Cookbook_%20Detailed%20Solutions%20in%20Eight%20Programming%20Languages%20%282nd%20ed.%29%20%5BGoyvaerts%20%26%20Levithan%202012-09-06%5D.pdf#tutorial-backtrack].
+- About possessive matching, see
+  {Eliminate Needless Backtracking}[https://doc.lagout.org/programmation/Regular%20Expressions/Regular%20Expressions%20Cookbook_%20Detailed%20Solutions%20in%20Eight%20Programming%20Languages%20%282nd%20ed.%29%20%5BGoyvaerts%20%26%20Levithan%202012-09-06%5D.pdf#tutorial-backtrack].
+
+=== Groups and Captures
+
+A simple regexp has (at most) one match:
+
+  re = /\d\d\d\d-\d\d-\d\d/
+  re.match('1943-02-04')      # => #<MatchData "1943-02-04">
+  re.match('1943-02-04').size # => 1
+  re.match('foo')             # => nil
+
+Adding one or more pairs of parentheses, <tt>(_subexpression_)</tt>,
+defines _groups_, which may result in multiple matched substrings,
+called _captures_:
+
+  re = /(\d\d\d\d)-(\d\d)-(\d\d)/
+  re.match('1943-02-04')      # => #<MatchData "1943-02-04" 1:"1943" 2:"02" 3:"04">
+  re.match('1943-02-04').size # => 4
+
+The first capture is the entire matched string;
+the other captures are the matched substrings from the groups.
+
+A group may have a {quantifier}[rdoc-ref:Regexp@Quantifiers]:
+
+  re = /July 4(th)?/
+  re.match('July 4')   # => #<MatchData "July 4" 1:nil>
+  re.match('July 4th') # => #<MatchData "July 4th" 1:"th">
+
+  re = /(foo)*/
+  re.match('')       # => #<MatchData "" 1:nil>
+  re.match('foo')    # => #<MatchData "foo" 1:"foo">
+  re.match('foofoo') # => #<MatchData "foofoo" 1:"foo">
+
+  re = /(foo)+/
+  re.match('')       # => nil
+  re.match('foo')    # => #<MatchData "foo" 1:"foo">
+  re.match('foofoo') # => #<MatchData "foofoo" 1:"foo">
+
+The returned \MatchData object gives access to the matched substrings:
+
+  re = /(\d\d\d\d)-(\d\d)-(\d\d)/
+  md = re.match('1943-02-04')
+  # => #<MatchData "1943-02-04" 1:"1943" 2:"02" 3:"04">
+  md[0] # => "1943-02-04"
+  md[1] # => "1943"
+  md[2] # => "02"
+  md[3] # => "04"
+
+==== Non-Capturing Groups
+
+A group may be made non-capturing;
+it is still a group (and, for example, can have a quantifier),
+but its matching substring is not included among the captures.
+
+A non-capturing group begins with <tt>?:</tt> (inside the parentheses):
+
+  # Don't capture the year.
+  re = /(?:\d\d\d\d)-(\d\d)-(\d\d)/
+  md = re.match('1943-02-04') # => #<MatchData "1943-02-04" 1:"02" 2:"04">
+
+==== Backreferences
+
+A group match may also be referenced within the regexp itself;
+such a reference is called a +backreference+:
+
+  /[csh](..) [csh]\1 in/.match('The cat sat in the hat')
+  # => #<MatchData "cat sat in" 1:"at">
+
+This table shows how each subexpression in the regexp above
+matches a substring in the target string:
+
+  | Subexpression in Regexp   | Matching Substring in Target String |
+  |---------------------------|-------------------------------------|
+  |       First '[csh]'       |            Character 'c'            |
+  |          '(..)'           |        First substring 'at'         |
+  |      First space ' '      |      First space character ' '      |
+  |       Second '[csh]'      |            Character 's'            |
+  | '\1' (backreference 'at') |        Second substring 'at'        |
+  |           ' in'           |            Substring ' in'          |
+
+A regexp may contain any number of groups:
+
+- For a large number of groups:
+
+  - The ordinary <tt>\\_n_</tt> notation applies only for _n_ in range (1..9).
+  - The <tt>MatchData[_n_]</tt> notation applies for any non-negative _n_.
+
+- <tt>\0</tt> is a special backreference, referring to the entire matched string;
+  it may not be used within the regexp itself,
+  but may be used outside it (for example, in a substitution method call):
+
+    'The cat sat in the hat'.gsub(/[csh]at/, '\0s')
+    # => "The cats sats in the hats"
+
+==== Named Captures
+
+As seen above, a capture can be referred to by its number.
+A capture can also have a name,
+prefixed as <tt>?<_name_></tt> or <tt>?'_name_'</tt>,
+and the name (symbolized) may be used as an index in <tt>MatchData[]</tt>:
+
+  md = /\$(?<dollars>\d+)\.(?'cents'\d+)/.match("$3.67")
+  # => #<MatchData "$3.67" dollars:"3" cents:"67">
+  md[:dollars]  # => "3"
+  md[:cents]    # => "67"
+  # The capture numbers are still valid.
+  md[2]         # => "67"
+
+When a regexp contains a named capture, there are no unnamed captures:
+
+  /\$(?<dollars>\d+)\.(\d+)/.match("$3.67")
+  # => #<MatchData "$3.67" dollars:"3">
+
+A named group may be backreferenced as <tt>\k<_name_></tt>:
+
+  /(?<vowel>[aeiou]).\k<vowel>.\k<vowel>/.match('ototomy')
+  # => #<MatchData "ototo" vowel:"o">
+
+When (and only when) a regexp contains named capture groups
+and appears before the <tt>=~</tt> operator,
+the captured substrings are assigned to local variables with corresponding names:
+
+  /\$(?<dollars>\d+)\.(?<cents>\d+)/ =~ '$3.67'
+  dollars # => "3"
+  cents   # => "67"
+
+Method Regexp#named_captures returns a hash of the capture names and substrings;
+method Regexp#names returns an array of the capture names.
+
+==== Atomic Grouping
+
+A group may be made _atomic_ with <tt>(?></tt>_subexpression_<tt>)</tt>.
+
+This causes the subexpression to be matched
+independently of the rest of the expression,
+so that the matched substring becomes fixed for the remainder of the match,
+unless the entire subexpression must be abandoned and subsequently revisited.
+
+In this way _subexpression_ is treated as a non-divisible whole.
+Atomic grouping is typically used to optimise patterns
+to prevent needless backtracking .
+
+Example (without atomic grouping):
+
+  /".*"/.match('"Quote"') # => #<MatchData "\"Quote\"">
+
+Analysis:
+
+1. The leading subexpression <tt>"</tt> in the pattern matches the first character
+   <tt>"</tt> in the target string.
+2. The next subexpression <tt>.*</tt> matches the next substring <tt>Quote“</tt>
+   (including the trailing double-quote).
+3. Now there is nothing left in the target string to match
+   the trailing subexpression <tt>"</tt> in the pattern;
+   this would cause the overall match to fail.
+4. The matched substring is backtracked by one position: <tt>Quote</tt>.
+5. The final subexpression <tt>"</tt> now matches the final substring <tt>"</tt>,
+   and the overall match succeeds.
+
+If subexpression <tt>.*</tt> is grouped atomically,
+the backtracking is disabled, and the overall match fails:
+
+  /"(?>.*)"/.match('"Quote"') # => nil
+
+Atomic grouping can affect performance;
+see {Atomic Group}[https://www.regular-expressions.info/atomic.html].
+
+==== Subexpression Calls
+
+As seen above, a backreference number (<tt>\\_n_</tt>) or name (<tt>\k<_name_></tt>)
+gives access to a captured _substring_;
+the corresponding regexp _subexpression_ may also be accessed,
+via the number (<tt>\\g<i>n</i></tt>) or name (<tt>\g<_name_></tt>):
+
+  /\A(?<paren>\(\g<paren>*\))*\z/.match('(())')
+  # ^1
+  #      ^2
+  #           ^3
+  #                 ^4
+  #      ^5
+  #           ^6
+  #                      ^7
+  #                       ^8
+  #                       ^9
+  #                           ^10
+
+The pattern:
+
+1.  Matches at the beginning of the string, i.e. before the first character.
+2.  Enters a named group +paren+.
+3.  Matches the first character in the string, <tt>'('</tt>.
+4.  Calls the +paren+ group again, i.e. recurses back to the  second step.
+5.  Re-enters the +paren+ group.
+6.  Matches the second character in the string, <tt>'('</tt>.
+7.  Attempts to call +paren+ a third time,
+    but fails because doing so would prevent an overall successful match.
+8.  Matches the third character in the string, <tt>')'</tt>;
+    marks the end of the second recursive call
+9.  Matches the fourth character in the string, <tt>')'</tt>.
+10. Matches the end of the string.
+
+See {Subexpression calls}[https://learnbyexample.github.io/Ruby_Regexp/groupings-and-backreferences.html?highlight=subexpression#subexpression-calls].
+
+==== Conditionals
+
+The conditional construct takes the form <tt>(?(_cond_)_yes_|_no_)</tt>, where:
+
+- _cond_ may be a capture number or name.
+- The match to be applied is _yes_ if _cond_ is captured;
+  otherwise the match to be applied is _no_.
+- If not needed, <tt>|_no_</tt> may be omitted.
+
+Examples:
+
+  re = /\A(foo)?(?(1)(T)|(F))\z/
+  re.match('fooT') # => #<MatchData "fooT" 1:"foo" 2:"T" 3:nil>
+  re.match('F')    # => #<MatchData "F" 1:nil 2:nil 3:"F">
+  re.match('fooF') # => nil
+  re.match('T')    # => nil
+
+  re = /\A(?<xyzzy>foo)?(?(<xyzzy>)(T)|(F))\z/
+  re.match('fooT') # => #<MatchData "fooT" xyzzy:"foo">
+  re.match('F')    # => #<MatchData "F" xyzzy:nil>
+  re.match('fooF') # => nil
+  re.match('T')    # => nil
+
+
+==== Absence Operator
+
+The absence operator is a special group that matches anything which does _not_ match the contained subexpressions.
+
+  /(?~real)/.match('surrealist') # => #<MatchData "surrea">
+  /(?~real)ist/.match('surrealist') # => #<MatchData "ealist">
+  /sur(?~real)ist/.match('surrealist') # => nil
+
+=== Unicode
+
+==== Unicode Properties
+
+The <tt>/\p{_property_name_}/</tt> construct (with lowercase +p+)
+matches characters using a Unicode property name,
+much like a character class;
+property +Alpha+ specifies alphabetic characters:
+
+  /\p{Alpha}/.match('a') # => #<MatchData "a">
+  /\p{Alpha}/.match('1') # => nil
+
+A property can be inverted
+by prefixing the name with a caret character (<tt>^</tt>):
+
+  /\p{^Alpha}/.match('1') # => #<MatchData "1">
+  /\p{^Alpha}/.match('a') # => nil
+
+Or by using <tt>\P</tt> (uppercase +P+):
+
+  /\P{Alpha}/.match('1') # => #<MatchData "1">
+  /\P{Alpha}/.match('a') # => nil
+
+See {Unicode Properties}[rdoc-ref:regexp/unicode_properties.rdoc]
+for regexps based on the numerous properties.
+
+Some commonly-used properties correspond to POSIX bracket expressions:
+
+- <tt>/\p{Alnum}/</tt>: Alphabetic and numeric character
+- <tt>/\p{Alpha}/</tt>: Alphabetic character
+- <tt>/\p{Blank}/</tt>: Space or tab
+- <tt>/\p{Cntrl}/</tt>: Control character
+- <tt>/\p{Digit}/</tt>: Digit
+  characters, and similar)
+- <tt>/\p{Lower}/</tt>: Lowercase alphabetical character
+- <tt>/\p{Print}/</tt>: Like <tt>\p{Graph}</tt>, but includes the space character
+- <tt>/\p{Punct}/</tt>: Punctuation character
+- <tt>/\p{Space}/</tt>: Whitespace character (<tt>[:blank:]</tt>, newline,
+  carriage return, etc.)
+- <tt>/\p{Upper}/</tt>: Uppercase alphabetical
+- <tt>/\p{XDigit}/</tt>: Digit allowed in a hexadecimal number (i.e., 0-9a-fA-F)
+
+These are also commonly used:
+
+- <tt>/\p{Emoji}/</tt>: Unicode emoji.
+- <tt>/\p{Graph}/</tt>: Characters excluding <tt>/\p{Cntrl}/</tt> and <tt>/\p{Space}/</tt>.
+  Note that invisible characters under the Unicode
+  {"Format"}[https://www.compart.com/en/unicode/category/Cf] category are included.
+- <tt>/\p{Word}/</tt>: A member in one of these Unicode character
+  categories (see below) or having one of these Unicode properties:
+
+  - Unicode categories:
+    - +Mark+ (+M+).
+    - <tt>Decimal Number</tt> (+Nd+)
+    - <tt>Connector Punctuation</tt> (+Pc+).
+
+  - Unicode properties:
+    - +Alpha+
+    - <tt>Join_Control</tt>
+
+- <tt>/\p{ASCII}/</tt>: A character in the ASCII character set.
+- <tt>/\p{Any}/</tt>: Any Unicode character (including unassigned characters).
+- <tt>/\p{Assigned}/</tt>: An assigned character.
+
+==== Unicode Character Categories
+
+A Unicode character category name:
+
+- May be either its full name or its abbreviated name.
+- Is case-insensitive.
+- Treats a space, a hyphen, and an underscore as equivalent.
+
+Examples:
+
+  /\p{lu}/                # => /\p{lu}/
+  /\p{LU}/                # => /\p{LU}/
+  /\p{Uppercase Letter}/  # => /\p{Uppercase Letter}/
+  /\p{Uppercase_Letter}/  # => /\p{Uppercase_Letter}/
+  /\p{UPPERCASE-LETTER}/  # => /\p{UPPERCASE-LETTER}/
+
+Below are the Unicode character category abbreviations and names.
+Enumerations of characters in each category are at the links.
+
+Letters:
+
+- +L+, +Letter+: +LC+, +Lm+, or +Lo+.
+- +LC+, +Cased_Letter+: +Ll+, +Lt+, or +Lu+.
+- {Lu, Lowercase_Letter}[https://www.compart.com/en/unicode/category/Ll].
+- {Lu, Modifier_Letter}[https://www.compart.com/en/unicode/category/Lm].
+- {Lu, Other_Letter}[https://www.compart.com/en/unicode/category/Lo].
+- {Lu, Titlecase_Letter}[https://www.compart.com/en/unicode/category/Lt].
+- {Lu, Uppercase_Letter}[https://www.compart.com/en/unicode/category/Lu].
+
+Marks:
+
+- +M+, +Mark+: +Mc+, +Me+, or +Mn+.
+- {Mc, Spacing_Mark}[https://www.compart.com/en/unicode/category/Mc].
+- {Me, Enclosing_Mark}[https://www.compart.com/en/unicode/category/Me].
+- {Mn, Nonapacing_Mark}[https://www.compart.com/en/unicode/category/Mn].
+
+Numbers:
+
+- +N+, +Number+: +Nd+, +Nl+, or +No+.
+- {Nd, Decimal_Number}[https://www.compart.com/en/unicode/category/Nd].
+- {Nl, Letter_Number}[https://www.compart.com/en/unicode/category/Nl].
+- {No, Other_Number}[https://www.compart.com/en/unicode/category/No].
+
+Punctuation:
+
+- +P+, +Punctuation+: +Pc+, +Pd+, +Pe+, +Pf+, +Pi+, +Po+, or +Ps+.
+- {Pc, Connector_Punctuation}[https://www.compart.com/en/unicode/category/Pc].
+- {Pd, Dash_Punctuation}[https://www.compart.com/en/unicode/category/Pd].
+- {Pe, Close_Punctuation}[https://www.compart.com/en/unicode/category/Pe].
+- {Pf, Final_Punctuation}[https://www.compart.com/en/unicode/category/Pf].
+- {Pi, Initial_Punctuation}[https://www.compart.com/en/unicode/category/Pi].
+- {Po, Other_Punctuation}[https://www.compart.com/en/unicode/category/Po].
+- {Ps, Open_Punctuation}[https://www.compart.com/en/unicode/category/Ps].
+
+- +S+, +Symbol+: +Sc+, +Sk+, +Sm+, or +So+.
+- {Sc, Currency_Symbol}[https://www.compart.com/en/unicode/category/Sc].
+- {Sk, Modifier_Symbol}[https://www.compart.com/en/unicode/category/Sk].
+- {Sm, Math_Symbol}[https://www.compart.com/en/unicode/category/Sm].
+- {So, Other_Symbol}[https://www.compart.com/en/unicode/category/So].
+
+- +Z+, +Separator+: +Zl+, +Zp+, or +Zs+.
+- {Zl, Line_Separator}[https://www.compart.com/en/unicode/category/Zl].
+- {Zp, Paragraph_Separator}[https://www.compart.com/en/unicode/category/Zp].
+- {Zs, Space_Separator}[https://www.compart.com/en/unicode/category/Zs].
+
+- +C+, +Other+: +Cc+, +Cf+, +Cn+, +Co+, or +Cs+.
+- {Cc, Control}[https://www.compart.com/en/unicode/category/Cc].
+- {Cf, Format}[https://www.compart.com/en/unicode/category/Cf].
+- {Cn, Unassigned}[https://www.compart.com/en/unicode/category/Cn].
+- {Co, Private_Use}[https://www.compart.com/en/unicode/category/Co].
+- {Cs, Surrogate}[https://www.compart.com/en/unicode/category/Cs].
+
+==== Unicode Scripts and Blocks
+
+Among the Unicode properties are:
+
+- {Unicode scripts}[https://en.wikipedia.org/wiki/Script_(Unicode)];
+  see {supported scripts}[https://www.unicode.org/standard/supported.html].
+- {Unicode blocks}[https://en.wikipedia.org/wiki/Unicode_block];
+  see {supported blocks}[http://www.unicode.org/Public/UNIDATA/Blocks.txt].
+
+=== POSIX Bracket Expressions
+
+A POSIX <i>bracket expression</i> is also similar to a character class.
+These expressions provide a portable alternative to the above,
+with the added benefit of encompassing non-ASCII characters:
+
+- <tt>/\d/</tt> matches only ASCII decimal digits +0+ through +9+.
+- <tt>/[[:digit:]]/</tt> matches any character in the Unicode
+  <tt>Decimal Number</tt> (+Nd+) category;
+  see below.
+
+The POSIX bracket expressions:
+
+- <tt>/[[:digit:]]/</tt>: Matches a {Unicode digit}[https://www.compart.com/en/unicode/category/Nd]:
+
+    /[[:digit:]]/.match('9')       # => #<MatchData "9">
+    /[[:digit:]]/.match("\u1fbf9") # => #<MatchData "9">
+
+- <tt>/[[:xdigit:]]/</tt>: Matches a digit allowed in a hexadecimal number;
+  equivalent to <tt>[0-9a-fA-F]</tt>.
+
+- <tt>/[[:upper:]]/</tt>: Matches a {Unicode uppercase letter}[https://www.compart.com/en/unicode/category/Lu]:
+
+    /[[:upper:]]/.match('A')      # => #<MatchData "A">
+    /[[:upper:]]/.match("\u00c6") # => #<MatchData "Æ">
+
+- <tt>/[[:lower:]]/</tt>: Matches a {Unicode lowercase letter}[https://www.compart.com/en/unicode/category/Ll]:
+
+    /[[:lower:]]/.match('a')      # => #<MatchData "a">
+    /[[:lower:]]/.match("\u01fd") # => #<MatchData "ǽ">
+
+- <tt>/[[:alpha:]]/</tt>: Matches <tt>/[[:upper:]]/</tt> or <tt>/[[:lower:]]/</tt>.
+
+- <tt>/[[:alnum:]]/</tt>: Matches <tt>/[[:alpha:]]/</tt> or <tt>/[[:digit:]]/</tt>.
+
+- <tt>/[[:space:]]/</tt>: Matches {Unicode space character}[https://www.compart.com/en/unicode/category/Zs]:
+
+    /[[:space:]]/.match(' ')      # => #<MatchData " ">
+    /[[:space:]]/.match("\u2005") # => #<MatchData " ">
+
+- <tt>/[[:blank:]]/</tt>: Matches <tt>/[[:space:]]/</tt> or tab character:
+
+    /[[:blank:]]/.match(' ')      # => #<MatchData " ">
+    /[[:blank:]]/.match("\u2005") # => #<MatchData " ">
+    /[[:blank:]]/.match("\t")     # => #<MatchData "\t">
+
+- <tt>/[[:cntrl:]]/</tt>: Matches {Unicode control character}[https://www.compart.com/en/unicode/category/Cc]:
+
+    /[[:cntrl:]]/.match("\u0000") # => #<MatchData "\u0000">
+    /[[:cntrl:]]/.match("\u009f") # => #<MatchData "\u009F">
+
+- <tt>/[[:graph:]]/</tt>: Matches any character
+  except <tt>/[[:space:]]/</tt> or <tt>/[[:cntrl:]]/</tt>.
+
+- <tt>/[[:print:]]/</tt>: Matches <tt>/[[:graph:]]/</tt> or space character.
+
+- <tt>/[[:punct:]]/</tt>: Matches any (Unicode punctuation character}[https://www.compart.com/en/unicode/category/Po]:
+
+Ruby also supports these (non-POSIX) bracket expressions:
+
+- <tt>/[[:ascii:]]/</tt>: Matches a character in the ASCII character set.
+- <tt>/[[:word:]]/</tt>: Matches a character in one of these Unicode character
+  categories or having one of these Unicode properties:
+
+  - Unicode categories:
+    - +Mark+ (+M+).
+    - <tt>Decimal Number</tt> (+Nd+)
+    - <tt>Connector Punctuation</tt> (+Pc+).
+
+  - Unicode properties:
+    - +Alpha+
+    - <tt>Join_Control</tt>
+
+=== Comments
+
+A comment may be included in a regexp pattern
+using the <tt>(?#</tt>_comment_<tt>)</tt> construct,
+where _comment_ is a substring that is to be ignored.
+arbitrary text ignored by the regexp engine:
+
+  /foo(?#Ignore me)bar/.match('foobar') # => #<MatchData "foobar">
+
+The comment may not include an unescaped terminator character.
+
+See also {Extended Mode}[rdoc-ref:Regexp@Extended+Mode].
+
+== Modes
+
+Each of these modifiers sets a mode for the regexp:
+
+- +i+: <tt>/_pattern_/i</tt> sets
+  {Case-Insensitive Mode}[rdoc-ref:Regexp@Case-Insensitive+Mode].
+- +m+: <tt>/_pattern_/m</tt> sets
+  {Multiline Mode}[rdoc-ref:Regexp@Multiline+Mode].
+- +x+: <tt>/_pattern_/x</tt> sets
+  {Extended Mode}[rdoc-ref:Regexp@Extended+Mode].
+- +o+: <tt>/_pattern_/o</tt> sets
+  {Interpolation Mode}[rdoc-ref:Regexp@Interpolation+Mode].
+
+Any, all, or none of these may be applied.
+
+Modifiers +i+, +m+, and +x+ may be applied to subexpressions:
+
+- <tt>(?_modifier_)</tt> turns the mode "on" for ensuing subexpressions
+- <tt>(?-_modifier_)</tt> turns the mode "off" for ensuing subexpressions
+- <tt>(?_modifier_:_subexp_)</tt> turns the mode "on" for _subexp_ within the group
+- <tt>(?-_modifier_:_subexp_)</tt> turns the mode "off" for _subexp_ within the group
+
+Example:
+
+  re = /(?i)te(?-i)st/
+  re.match('test') # => #<MatchData "test">
+  re.match('TEst') # => #<MatchData "TEst">
+  re.match('TEST') # => nil
+  re.match('teST') # => nil
+
+  re = /t(?i:e)st/
+  re.match('test') # => #<MatchData "test">
+  re.match('tEst') # => #<MatchData "tEst">
+  re.match('tEST') # => nil
+
+Method Regexp#options returns an integer whose value showing
+the settings for case-insensitivity mode, multiline mode, and extended mode.
+
+=== Case-Insensitive Mode
+
+By default, a regexp is case-sensitive:
+
+  /foo/.match('FOO')  # => nil
+
+Modifier +i+ enables case-insensitive mode:
+
+  /foo/i.match('FOO')
+  # => #<MatchData "FOO">
+
+Method Regexp#casefold? returns whether the mode is case-insensitive.
+
+=== Multiline Mode
+
+The multiline-mode in Ruby is what is commonly called a "dot-all mode":
+
+- Without the +m+ modifier, the subexpression <tt>.</tt> does not match newlines:
+
+    /a.c/.match("a\nc")  # => nil
+
+- With the modifier, it does match:
+
+    /a.c/m.match("a\nc") # => #<MatchData "a\nc">
+
+Unlike other languages, the modifier +m+ does not affect the anchors <tt>^</tt> and <tt>$</tt>.
+These anchors always match at line-boundaries in Ruby.
+
+=== Extended Mode
+
+Modifier +x+ enables extended mode, which means that:
+
+- Literal white space in the pattern is to be ignored.
+- Character <tt>#</tt> marks the remainder of its containing line as a comment,
+  which is also to be ignored for matching purposes.
+
+In extended mode, whitespace and comments may be used
+to form a self-documented regexp.
+
+Regexp not in extended mode (matches some Roman numerals):
+
+  pattern = '^M{0,3}(CM|CD|D?C{0,3})(XC|XL|L?X{0,3})(IX|IV|V?I{0,3})$'
+  re = /#{pattern}/
+  re.match('MCMXLIII') # => #<MatchData "MCMXLIII" 1:"CM" 2:"XL" 3:"III">
+
+Regexp in extended mode:
+
+  pattern = <<-EOT
+    ^                   # beginning of string
+    M{0,3}              # thousands - 0 to 3 Ms
+    (CM|CD|D?C{0,3})    # hundreds - 900 (CM), 400 (CD), 0-300 (0 to 3 Cs),
+                        #            or 500-800 (D, followed by 0 to 3 Cs)
+    (XC|XL|L?X{0,3})    # tens - 90 (XC), 40 (XL), 0-30 (0 to 3 Xs),
+                        #        or 50-80 (L, followed by 0 to 3 Xs)
+    (IX|IV|V?I{0,3})    # ones - 9 (IX), 4 (IV), 0-3 (0 to 3 Is),
+                        #        or 5-8 (V, followed by 0 to 3 Is)
+    $                   # end of string
+  EOT
+  re = /#{pattern}/x
+  re.match('MCMXLIII') # => #<MatchData "MCMXLIII" 1:"CM" 2:"XL" 3:"III">
+
+=== Interpolation Mode
+
+Modifier +o+ means that the first time a literal regexp with interpolations
+is encountered,
+the generated Regexp object is saved and used for all future evaluations
+of that literal regexp.
+Without modifier +o+, the generated Regexp is not saved,
+so each evaluation of the literal regexp generates a new Regexp object.
+
+Without modifier +o+:
+
+  def letters; sleep 5; /[A-Z][a-z]/; end
+  words = %w[abc def xyz]
+  start = Time.now
+  words.each {|word| word.match(/\A[#{letters}]+\z/) }
+  Time.now - start # => 15.0174892
+
+With modifier +o+:
+
+  start = Time.now
+  words.each {|word| word.match(/\A[#{letters}]+\z/o) }
+  Time.now - start # => 5.0010866
+
+Note that if the literal regexp does not have interpolations,
+the +o+ behavior is the default.
+
+== Encodings
+
+By default, a regexp with only US-ASCII characters has US-ASCII encoding:
+
+  re = /foo/
+  re.source.encoding # => #<Encoding:US-ASCII>
+  re.encoding        # => #<Encoding:US-ASCII>
+
+A regular expression containing non-US-ASCII characters
+is assumed to use the source encoding.
+This can be overridden with one of the following modifiers.
+
+- <tt>/_pat_/n</tt>: US-ASCII if only containing US-ASCII characters,
+  otherwise ASCII-8BIT:
+
+    /foo/n.encoding     # => #<Encoding:US-ASCII>
+    /foo\xff/n.encoding # => #<Encoding:ASCII-8BIT>
+    /foo\x7f/n.encoding # => #<Encoding:US-ASCII>
+
+- <tt>/_pat_/u</tt>: UTF-8
+
+    /foo/u.encoding # => #<Encoding:UTF-8>
+
+- <tt>/_pat_/e</tt>: EUC-JP
+
+    /foo/e.encoding # => #<Encoding:EUC-JP>
+
+- <tt>/_pat_/s</tt>: Windows-31J
+
+    /foo/s.encoding # => #<Encoding:Windows-31J>
+
+A regexp can be matched against a target string when either:
+
+- They have the same encoding.
+- The regexp's encoding is a fixed encoding and the string
+  contains only ASCII characters.
+  Method Regexp#fixed_encoding? returns whether the regexp
+  has a <i>fixed</i> encoding.
+
+If a match between incompatible encodings is attempted an
+<tt>Encoding::CompatibilityError</tt> exception is raised.
+
+Example:
+
+  re = eval("# encoding: ISO-8859-1\n/foo\\xff?/")
+  re.encoding                 # => #<Encoding:ISO-8859-1>
+  re =~ "foo".encode("UTF-8") # => 0
+  re =~ "foo\u0100"           # Raises Encoding::CompatibilityError
+
+The encoding may be explicitly fixed by including Regexp::FIXEDENCODING
+in the second argument for Regexp.new:
+
+  # Regexp with encoding ISO-8859-1.
+  re = Regexp.new("a".force_encoding('iso-8859-1'), Regexp::FIXEDENCODING)
+  re.encoding  # => #<Encoding:ISO-8859-1>
+  # Target string with encoding UTF-8.
+  s = "a\u3042"
+  s.encoding   # => #<Encoding:UTF-8>
+  re.match(s)  # Raises Encoding::CompatibilityError.
+
+== Timeouts
+
+When either a regexp source or a target string comes from untrusted input,
+malicious values could become a denial-of-service attack;
+to prevent such an attack, it is wise to set a timeout.
+
+\Regexp has two timeout values:
+
+- A class default timeout, used for a regexp whose instance timeout is +nil+;
+  this default is initially +nil+, and may be set by method Regexp.timeout=:
+
+    Regexp.timeout # => nil
+    Regexp.timeout = 3.0
+    Regexp.timeout # => 3.0
+
+- An instance timeout, which defaults to +nil+ and may be set in Regexp.new:
+
+    re = Regexp.new('foo', timeout: 5.0)
+    re.timeout # => 5.0
+
+When regexp.timeout is +nil+, the timeout "falls through" to Regexp.timeout;
+when regexp.timeout is non-+nil+, that value controls timing out:
+
+  | regexp.timeout Value | Regexp.timeout Value |            Result           |
+  |----------------------|----------------------|-----------------------------|
+  |         nil          |          nil         |       Never times out.      |
+  |         nil          |         Float        | Times out in Float seconds. |
+  |        Float         |          Any         | Times out in Float seconds. |
+
+== Optimization
+
+For certain values of the pattern and target string,
+matching time can grow polynomially or exponentially in relation to the input size;
+the potential vulnerability arising from this is the {regular expression denial-of-service}[https://en.wikipedia.org/wiki/ReDoS] (ReDoS) attack.
+
+\Regexp matching can apply an optimization to prevent ReDoS attacks.
+When the optimization is applied, matching time increases linearly (not polynomially or exponentially)
+in relation to the input size, and a ReDoS attach is not possible.
+
+This optimization is applied if the pattern meets these criteria:
+
+- No backreferences.
+- No subexpression calls.
+- No nested lookaround anchors or atomic groups.
+- No nested quantifiers with counting (i.e. no nested <tt>{n}</tt>,
+  <tt>{min,}</tt>, <tt>{,max}</tt>, or <tt>{min,max}</tt> style quantifiers)
+
+You can use method Regexp.linear_time? to determine whether a pattern meets these criteria:
+
+  Regexp.linear_time?(/a*/)     # => true
+  Regexp.linear_time?('a*')     # => true
+  Regexp.linear_time?(/(a*)\1/) # => false
+
+However, an untrusted source may not be safe even if the method returns +true+,
+because the optimization uses memoization (which may invoke large memory consumption).
+
+== References
+
+Read (online PDF books):
+
+- {Mastering Regular Expressions}[https://ia902508.us.archive.org/10/items/allitebooks-02/Mastering%20Regular%20Expressions%2C%203rd%20Edition.pdf]
+  by Jeffrey E.F. Friedl.
+- {Regular Expressions Cookbook}[https://doc.lagout.org/programmation/Regular%20Expressions/Regular%20Expressions%20Cookbook_%20Detailed%20Solutions%20in%20Eight%20Programming%20Languages%20%282nd%20ed.%29%20%5BGoyvaerts%20%26%20Levithan%202012-09-06%5D.pdf]
+  by Jan Goyvaerts & Steven Levithan.
+
+Explore, test (interactive online editor):
+
+- {Rubular}[https://rubular.com/].
diff --git a/doc/_timezones.rdoc b/doc/_timezones.rdoc
new file mode 100644
index 00000000000000..a2ac46584fd75a
--- /dev/null
+++ b/doc/_timezones.rdoc
@@ -0,0 +1,163 @@
+== Timezone Specifiers
+
+Certain +Time+ methods accept arguments that specify timezones:
+
+- Time.at: keyword argument +in:+.
+- Time.new: positional argument +zone+ or keyword argument +in:+.
+- Time.now: keyword argument +in:+.
+- Time#getlocal: positional argument +zone+.
+- Time#localtime: positional argument +zone+.
+
+The value given with any of these must be one of the following
+(each detailed below):
+
+- {Hours/minutes offset}[rdoc-ref:Time@Hours-2FMinutes+Offsets].
+- {Single-letter offset}[rdoc-ref:Time@Single-Letter+Offsets].
+- {Integer offset}[rdoc-ref:Time@Integer+Offsets].
+- {Timezone object}[rdoc-ref:Time@Timezone+Objects].
+- {Timezone name}[rdoc-ref:Time@Timezone+Names].
+
+=== Hours/Minutes Offsets
+
+The zone value may be a string offset from UTC
+in the form <tt>'+HH:MM'</tt> or <tt>'-HH:MM'</tt>,
+where:
+
+- +HH+ is the 2-digit hour in the range <tt>0..23</tt>.
+- +MM+ is the 2-digit minute in the range <tt>0..59</tt>.
+
+Examples:
+
+  t = Time.utc(2000, 1, 1, 20, 15, 1) # => 2000-01-01 20:15:01 UTC
+  Time.at(t, in: '-23:59')            # => 1999-12-31 20:16:01 -2359
+  Time.at(t, in: '+23:59')            # => 2000-01-02 20:14:01 +2359
+
+=== Single-Letter Offsets
+
+The zone value may be a  letter in the range <tt>'A'..'I'</tt>
+or <tt>'K'..'Z'</tt>;
+see {List of military time zones}[https://en.wikipedia.org/wiki/List_of_military_time_zones]:
+
+  t = Time.utc(2000, 1, 1, 20, 15, 1) # => 2000-01-01 20:15:01 UTC
+  Time.at(t, in: 'A')                 # => 2000-01-01 21:15:01 +0100
+  Time.at(t, in: 'I')                 # => 2000-01-02 05:15:01 +0900
+  Time.at(t, in: 'K')                 # => 2000-01-02 06:15:01 +1000
+  Time.at(t, in: 'Y')                 # => 2000-01-01 08:15:01 -1200
+  Time.at(t, in: 'Z')                 # => 2000-01-01 20:15:01 UTC
+
+=== \Integer Offsets
+
+The zone value may be an integer number of seconds
+in the range <tt>-86399..86399</tt>:
+
+  t = Time.utc(2000, 1, 1, 20, 15, 1) # => 2000-01-01 20:15:01 UTC
+  Time.at(t, in: -86399)              # => 1999-12-31 20:15:02 -235959
+  Time.at(t, in: 86399)               # => 2000-01-02 20:15:00 +235959
+
+=== Timezone Objects
+
+The zone value may be an object responding to certain timezone methods, an
+instance of {Timezone}[https://github.com/panthomakos/timezone] and
+{TZInfo}[https://tzinfo.github.io] for example.
+
+The timezone methods are:
+
+- +local_to_utc+:
+
+  Called when Time.new is invoked with +tz+ as the value of positional
+  argument +zone+ or keyword argument +in:+.
+
+  Argument:: a {Time-like object}[rdoc-ref:Time@Time-Like+Objects].
+  Returns:: a {Time-like object}[rdoc-ref:Time@Time-Like+Objects] in the UTC timezone.
+
+- +utc_to_local+:
+
+  Called when Time.at or Time.now is invoked with +tz+ as the value for
+  keyword argument +in:+, and when Time#getlocal or Time#localtime is called
+  with +tz+ as the value for positional argument +zone+.
+
+  The UTC offset will be calculated as the difference between the
+  original time and the returned object as an +Integer+.
+  If the object is in fixed offset, its +utc_offset+ is also counted.
+
+  Argument:: a {Time-like object}[rdoc-ref:Time@Time-Like+Objects].
+  Returns:: a {Time-like object}[rdoc-ref:Time@Time-Like+Objects] in the local timezone.
+
+A custom timezone class may have these instance methods,
+which will be called if defined:
+
+- +abbr+:
+
+  Called when Time#strftime is invoked with a format involving <tt>%Z</tt>.
+
+  Argument:: a {Time-like object}[rdoc-ref:Time@Time-Like+Objects].
+  Returns:: a string abbreviation for the timezone name.
+
+- +dst?+:
+
+  Called when Time.at or Time.now is invoked with +tz+ as the value for
+  keyword argument +in:+, and when Time#getlocal or Time#localtime is
+  called with +tz+ as the value for positional argument +zone+.
+
+  Argument:: a {Time-like object}[rdoc-ref:Time@Time-Like+Objects].
+  Returns:: whether the time is daylight saving time.
+
+- +name+:
+
+  Called when <tt>Marshal.dump(t)</tt> is invoked
+
+  Argument:: none.
+  Returns:: the string name of the timezone.
+
+==== +Time+-Like Objects
+
+A +Time+-like object is a container object capable of interfacing with
+timezone libraries for timezone conversion.
+
+The argument to the timezone conversion methods above will have attributes
+similar to Time, except that timezone related attributes are meaningless.
+
+The objects returned by +local_to_utc+ and +utc_to_local+ methods of the
+timezone object may be of the same class as their arguments, of arbitrary
+object classes, or of class Integer.
+
+For a returned class other than +Integer+, the class must have the
+following methods:
+
+- +year+
+- +mon+
+- +mday+
+- +hour+
+- +min+
+- +sec+
+- +isdst+
+- +to_i+
+
+For a returned +Integer+, its components, decomposed in UTC, are
+interpreted as times in the specified timezone.
+
+=== Timezone Names
+
+If the class (the receiver of class methods, or the class of the receiver
+of instance methods) has +find_timezone+ singleton method, this method is
+called to achieve the corresponding timezone object from a timezone name.
+
+For example, using {Timezone}[https://github.com/panthomakos/timezone]:
+    class TimeWithTimezone < Time
+      require 'timezone'
+      def self.find_timezone(z) = Timezone[z]
+    end
+
+    TimeWithTimezone.now(in: "America/New_York")        #=> 2023-12-25 00:00:00 -0500
+    TimeWithTimezone.new("2023-12-25 America/New_York") #=> 2023-12-25 00:00:00 -0500
+
+Or, using {TZInfo}[https://tzinfo.github.io]:
+    class TimeWithTZInfo < Time
+      require 'tzinfo'
+      def self.find_timezone(z) = TZInfo::Timezone.get(z)
+    end
+
+    TimeWithTZInfo.now(in: "America/New_York")          #=> 2023-12-25 00:00:00 -0500
+    TimeWithTZInfo.new("2023-12-25 America/New_York")   #=> 2023-12-25 00:00:00 -0500
+
+You can define this method per subclasses, or on the toplevel Time class.
diff --git a/doc/bsearch.rdoc b/doc/bsearch.rdoc
index ca8091fc0da3a6..90705853d7c32e 100644
--- a/doc/bsearch.rdoc
+++ b/doc/bsearch.rdoc
@@ -1,4 +1,4 @@
-== Binary Searching
+= Binary Searching
 
 A few Ruby methods support binary searching in a collection:
 
diff --git a/doc/case_mapping.rdoc b/doc/case_mapping.rdoc
index 3c4215497383ed..d40155db031f43 100644
--- a/doc/case_mapping.rdoc
+++ b/doc/case_mapping.rdoc
@@ -1,4 +1,4 @@
-== Case Mapping
+= Case Mapping
 
 Some string-oriented methods use case mapping.
 
@@ -24,7 +24,7 @@ In Symbol:
 - Symbol#swapcase
 - Symbol#upcase
 
-=== Default Case Mapping
+== Default Case Mapping
 
 By default, all of these methods use full Unicode case mapping,
 which is suitable for most languages.
@@ -37,7 +37,7 @@ Context-dependent case mapping as described in
 {Table 3-17 (Context Specification for Casing) of the Unicode standard}[https://www.unicode.org/versions/latest/ch03.pdf]
 is currently not supported.
 
-In most cases, case conversions of a string have the same number of characters.
+In most cases, the case conversion of a string has the same number of characters as before.
 There are exceptions (see also +:fold+ below):
 
   s = "\u00DF" # => "ß"
@@ -58,25 +58,18 @@ Case changes may not be reversible:
   s.downcase.upcase  # => "HELLO WORLD!" # Different from original s.
 
 Case changing methods may not maintain Unicode normalization.
-See String#unicode_normalize).
+See String#unicode_normalize.
 
-=== Options for Case Mapping
+== Case Mappings
 
 Except for +casecmp+ and +casecmp?+,
 each of the case-mapping methods listed above
-accepts optional arguments, <tt>*options</tt>.
+accepts an optional argument, <tt>mapping</tt>.
 
-The arguments may be:
+The argument is one of:
 
-- +:ascii+ only.
-- +:fold+ only.
-- +:turkic+ or +:lithuanian+ or both.
-
-The options:
-
-- +:ascii+:
-  ASCII-only mapping:
-  uppercase letters ('A'..'Z') are mapped to lowercase letters ('a'..'z);
+- +:ascii+: ASCII-only mapping.
+  Uppercase letters ('A'..'Z') are mapped to lowercase letters ('a'..'z);
   other characters are not changed
 
     s = "Foo \u00D8 \u00F8 Bar" # => "Foo Ø ø Bar"
@@ -85,8 +78,8 @@ The options:
     s.upcase(:ascii)            # => "FOO Ø ø BAR"
     s.downcase(:ascii)          # => "foo Ø ø bar"
 
-- +:turkic+:
-  Full Unicode case mapping, adapted for the Turkic languages
+- +:turkic+: Full Unicode case mapping.
+  For the Turkic languages
   that distinguish dotted and dotless I, for example Turkish and Azeri.
 
     s = 'Türkiye'       # => "Türkiye"
@@ -97,11 +90,8 @@ The options:
     s.downcase          # => "türkiye"
     s.downcase(:turkic) # => "türkıye" # No dot above.
 
-- +:lithuanian+:
-  Not yet implemented.
-
 - +:fold+ (available only for String#downcase, String#downcase!,
-  and Symbol#downcase):
+  and Symbol#downcase).
   Unicode case folding,
   which is more far-reaching than Unicode case mapping.
 
diff --git a/doc/character_selectors.rdoc b/doc/character_selectors.rdoc
index e01b0e6a25286b..47cf242be7382b 100644
--- a/doc/character_selectors.rdoc
+++ b/doc/character_selectors.rdoc
@@ -1,6 +1,6 @@
-== Character Selectors
+= Character Selectors
 
-=== Character Selector
+== Character Selector
 
 A _character_ _selector_ is a string argument accepted by certain Ruby methods.
 Each of these instance methods accepts one or more character selectors:
@@ -70,7 +70,7 @@ In a character selector, these three characters get special treatment:
     "hello\r\nworld".delete("\\r")  # => "hello\r\nwold"
     "hello\r\nworld".delete("\\\r") # => "hello\nworld"
 
-=== Multiple Character Selectors
+== Multiple Character Selectors
 
 These instance methods accept multiple character selectors:
 
diff --git a/doc/command_injection.rdoc b/doc/command_injection.rdoc
index 4408b1839dadb4..ee33d4a04e6629 100644
--- a/doc/command_injection.rdoc
+++ b/doc/command_injection.rdoc
@@ -1,4 +1,4 @@
-== Command Injection
+= Command Injection
 
 Some Ruby core methods accept string data
 that includes text to be executed as a system command.
@@ -7,11 +7,17 @@ They should not be called with unknown or unsanitized commands.
 
 These methods include:
 
+- Kernel.exec
+- Kernel.spawn
 - Kernel.system
-- Kernel.open
 - {\`command` (backtick method)}[rdoc-ref:Kernel#`]
   (also called by the expression <tt>%x[command]</tt>).
-- IO.popen(command).
+- IO.popen (when called with other than <tt>"-"</tt>).
+
+Some methods execute a system command only if the given path name starts
+with a <tt>|</tt>:
+
+- Kernel.open(command).
 - IO.read(command).
 - IO.write(command).
 - IO.binread(command).
@@ -21,7 +27,7 @@ These methods include:
 - URI.open(command).
 
 Note that some of these methods do not execute commands when called
-from subclass \File:
+from subclass +File+:
 
 - File.read(path).
 - File.write(path).
diff --git a/doc/command_line/environment.md b/doc/command_line/environment.md
new file mode 100644
index 00000000000000..8f6d595f6c2f25
--- /dev/null
+++ b/doc/command_line/environment.md
@@ -0,0 +1,174 @@
+## Environment
+
+Certain command-line options affect the execution environment
+of the invoked Ruby program.
+
+### About the Examples
+
+The examples here use command-line option `-e`,
+which passes the Ruby code to be executed on the command line itself:
+
+```console
+$ ruby -e 'puts "Hello, World."'
+```
+
+### Option `-C`
+
+The argument to option `-C` specifies a working directory
+for the invoked Ruby program;
+does not change the working directory for the current process:
+
+```console
+$ basename `pwd`
+ruby
+$ ruby -C lib -e 'puts File.basename(Dir.pwd)'
+lib
+$ basename `pwd`
+ruby
+```
+
+Whitespace between the option and its argument may be omitted.
+
+### Option `-I`
+
+The argument to option `-I` specifies a directory
+to be added to the array in global variable `$LOAD_PATH`;
+the option may be given more than once:
+
+```console
+$ pushd /tmp
+$ ruby -e 'p $LOAD_PATH.size'
+8
+$ ruby -I my_lib -I some_lib -e 'p $LOAD_PATH.size'
+10
+$ ruby -I my_lib -I some_lib -e 'p $LOAD_PATH.take(2)'
+["/tmp/my_lib", "/tmp/some_lib"]
+$ popd
+```
+
+Whitespace between the option and its argument may be omitted.
+
+### Option `-r`
+
+The argument to option `-r` specifies a library to be required
+before executing the Ruby program;
+the option may be given more than once:
+
+```console
+$ ruby -e 'p defined?(JSON); p defined?(CSV)'
+nil
+nil
+$ ruby -r CSV -r JSON -e 'p defined?(JSON); p defined?(CSV)'
+"constant"
+"constant"
+```
+
+Whitespace between the option and its argument may be omitted.
+
+### Option `-0`
+
+Option `-0` defines the input record separator `$/`
+for the invoked Ruby program.
+
+The optional argument to the option must be octal digits,
+each in the range `0..7`;
+these digits are prefixed with digit `0` to form an octal value:
+
+- If no argument is given, the input record separator is `0x00`.
+- If the argument is `0`, the input record separator is `''`;
+  see {Special Line Separator Values}[rdoc-ref:IO@Special+Line+Separator+Values].
+- If the argument is in range `(1..0377)`,
+  it becomes the character value of the input record separator `$/`.
+- Otherwise, the input record separator is `nil`.
+
+Examples:
+
+```console
+$ ruby -0 -e 'p $/'
+"\x00"
+$ ruby -00 -e 'p $/'
+""
+$ ruby -012 -e 'p $/'
+"\n"
+$ ruby -015 -e 'p $/'
+"\r"
+$ ruby -0377 -e 'p $/'
+"\xFF"
+$ ruby -0400 -e 'p $/'
+nil
+```
+
+The option may not be separated from its argument by whitespace.
+
+### Option `-d`
+
+Some code in (or called by) the Ruby program may include statements or blocks
+conditioned by the global variable `$DEBUG` (e.g., `if $DEBUG`);
+these commonly write to `$stdout` or `$stderr`.
+
+The default value for `$DEBUG` is `false`;
+option `-d` (or `--debug`) sets it to `true`:
+
+```console
+$ ruby -e 'p $DEBUG'
+false
+$ ruby -d -e 'p $DEBUG'
+true
+```
+
+### Option '-w'
+
+Option `-w` (lowercase letter) is equivalent to option `-W1` (uppercase letter).
+
+### Option `-W`
+
+Any Ruby code can create a <i>warning message</i> by calling method Kernel#warn;
+methods in the Ruby core and standard libraries can also create warning messages.
+Such a message may be printed on `$stderr`
+(or not, depending on certain settings).
+
+Option `-W` helps determine whether a particular warning message
+will be written,
+by setting the initial value of global variable `$-W`:
+
+- `-W0`: Sets `$-W` to `0` (silent; no warnings).
+- `-W1`: Sets `$-W` to `1` (moderate verbosity).
+- `-W2`: Sets `$-W` to `2` (high verbosity).
+- `-W`: Same as `-W2` (high verbosity).
+- Option not given: Same as `-W1` (moderate verbosity).
+
+The value of `$-W`, in turn, determines which warning messages (if any)
+are to be printed to `$stdout` (see Kernel#warn):
+
+```console
+$ ruby -W1 -e 'p $foo'
+nil
+$ ruby -W2 -e 'p $foo'
+-e:1: warning: global variable '$foo' not initialized
+nil
+```
+
+Ruby code may also define warnings for certain categories;
+these are the default settings for the defined categories:
+
+```ruby
+Warning[:experimental] # => true
+Warning[:deprecated]   # => false
+Warning[:performance]  # => false
+```
+
+They may also be set:
+
+```ruby
+Warning[:experimental] = false
+Warning[:deprecated]   = true
+Warning[:performance]  = true
+```
+
+You can suppress a category by prefixing `no-` to the category name:
+
+```console
+$ ruby -W:no-experimental -e 'p IO::Buffer.new'
+#<IO::Buffer>
+```
+
diff --git a/doc/contributing.md b/doc/contributing.md
deleted file mode 100644
index a6c63de9b2ff7c..00000000000000
--- a/doc/contributing.md
+++ /dev/null
@@ -1,12 +0,0 @@
-# Contributing to Ruby
-
-This guide outlines ways to get started with contributing to Ruby:
-
-* [Reporting issues](contributing/reporting_issues.md): How to report issues, how to request features, and how backporting works
-* [Building Ruby](contributing/building_ruby.md): How to build Ruby on your local machine for development
-* [Testing Ruby](contributing/testing_ruby.md): How to test Ruby on your local machine once you've built it
-* [Making changes to Ruby](contributing/making_changes_to_ruby.md): How to submit pull requests
-  to change Ruby's documentation, code, test suite, or standard libraries
-* [Making changes to Ruby standard libraries](contributing/making_changes_to_stdlibs.md): How to build, test, and contribute to Ruby standard libraries
-* [Making changes to Ruby documentation](contributing/documentation_guide.md): How to make changes to Ruby documentation
-* [Benchmarking Ruby](https://github.com/ruby/ruby/tree/master/benchmark#make-benchmark): How to benchmark Ruby
diff --git a/doc/contributing/building_ruby.md b/doc/contributing/building_ruby.md
index b96fa4bc0bd921..a0486cb931de68 100644
--- a/doc/contributing/building_ruby.md
+++ b/doc/contributing/building_ruby.md
@@ -8,48 +8,73 @@
 
     For RubyGems, you will also need:
 
-    * OpenSSL 1.1.x or 3.0.x / LibreSSL
-    * libyaml 0.1.7 or later
-    * zlib
+    * [OpenSSL] 1.1.x or 3.0.x / [LibreSSL]
+    * [libyaml] 0.1.7 or later
+    * [zlib]
 
     If you want to build from the git repository, you will also need:
 
-    * autoconf - 2.67 or later
-    * gperf - 3.1 or later
+    * [autoconf] - 2.67 or later
+    * [gperf] - 3.1 or later
         * Usually unneeded; only if you edit some source files using gperf
-    * ruby - 2.5 or later
-        * We can upgrade this version to system ruby version of the latest Ubuntu LTS.
+    * ruby - 3.0 or later
+        * We can upgrade this version to system ruby version of the latest
+          Ubuntu LTS.
+    * git - 2.32 or later
+        * Anterior versions may work; 2.32 or later will prevent build
+          errors in case your system `.gitconfig` uses `$HOME` paths.
 
 2. Install optional, recommended dependencies:
 
-    * libffi (to build fiddle)
-    * gmp (if you with to accelerate Bignum operations)
-    * libexecinfo (FreeBSD)
-    * rustc - 1.58.0 or later, if you wish to build
-      [YJIT](https://docs.ruby-lang.org/en/master/RubyVM/YJIT.html).
+    * [libffi] (to build fiddle)
+    * [gmp] (if you wish to accelerate Bignum operations)
+    * [rustc] - 1.58.0 or later, if you wish to build
+      [YJIT](rdoc-ref:RubyVM::YJIT).
 
-    If you installed the libraries needed for extensions (openssl, readline, libyaml, zlib) into other than the OS default place,
-    typically using Homebrew on macOS, add `--with-EXTLIB-dir` options to `CONFIGURE_ARGS` environment variable.
+    If you want to link the libraries (e.g., gmp) installed into other than
+    the OS default place, typically using Homebrew on macOS, pass the
+    `--with-opt-dir` (or `--with-gmp-dir` for gmp) option to `configure`.
 
-    ``` shell
+    ```sh
+    configure --with-opt-dir=$(brew --prefix gmp):$(brew --prefix jemalloc)
+    ```
+
+    As for the libraries needed for particular extensions only and not for
+    Ruby (openssl, readline, libyaml, zlib), you can add `--with-EXTLIB-dir`
+    options to the command line or to `CONFIGURE_ARGS` environment variable.
+    The command line options will be embedded in `rbconfig.rb`, while the
+    latter environment variable is not embedded and is only used when
+    building the extension libraries.
+
+    ```sh
     export CONFIGURE_ARGS=""
     for ext in openssl readline libyaml zlib; do
       CONFIGURE_ARGS="${CONFIGURE_ARGS} --with-$ext-dir=$(brew --prefix $ext)"
     done
     ```
 
+[OpenSSL]: https://www.openssl.org
+[LibreSSL]: https://www.libressl.org
+[libyaml]: https://github.com/yaml/libyaml/
+[zlib]: https://www.zlib.net
+[autoconf]: https://www.gnu.org/software/autoconf/
+[gperf]: https://www.gnu.org/software/gperf/
+[libffi]: https://sourceware.org/libffi/
+[gmp]: https://gmplib.org
+[rustc]: https://www.rust-lang.org
+
 ## Quick start guide
 
 1. Download ruby source code:
 
-    Select one of the bellow.
+    Select one of the below.
 
     1. Build from the tarball:
 
-        Download the latest tarball from [ruby-lang.org](https://www.ruby-lang.org/en/downloads/) and
-        extract it. Example for Ruby 3.0.2:
+        Download the latest tarball from [Download Ruby] page and extract
+        it. Example for Ruby 3.0.2:
 
-        ``` shell
+        ```sh
         tar -xzf ruby-3.0.2.tar.gz
         cd ruby-3.0.2
         ```
@@ -58,50 +83,108 @@
 
         Checkout the CRuby source code:
 
-        ``` shell
+        ```sh
         git clone https://github.com/ruby/ruby.git
         cd ruby
         ```
 
-        Generate the configure file:
+        Run the GNU Autoconf script (which generates the `configure` script):
 
-        ``` shell
+        ```sh
         ./autogen.sh
         ```
 
-2. Create a `build` directory separate from the source directory:
+2. Create a `build` directory inside the repository directory:
 
-    ``` shell
+    ```sh
     mkdir build && cd build
     ```
 
-    While it's not necessary to build in a separate directory, it's good practice to do so.
+    While it's not necessary to build in a dedicated directory like this, it's good
+    practice to do so.
 
-3. We'll install Ruby in `~/.rubies/ruby-master`, so create the directory:
+3. We'll eventually install our new Ruby in `~/.rubies/ruby-master`, so we'll create that directory:
 
-    ``` shell
+    ```sh
     mkdir ~/.rubies
     ```
 
-4. Run configure:
+4. Run the `configure` script (which generates the `Makefile`):
 
-    ``` shell
+    ```sh
     ../configure --prefix="${HOME}/.rubies/ruby-master"
     ```
 
-    - If you are frequently building Ruby, add the `--disable-install-doc` flag to not build documentation which will speed up the build process.
+    - Also `-C` (or `--config-cache`) would reduce time to configure from the
+      next time.
 
 5. Build Ruby:
 
-    ``` shell
-    make install
+    ```sh
+    make
     ```
 
 6. [Run tests](testing_ruby.md) to confirm your build succeeded.
 
+7. Install our newly-compiled Ruby into `~/.rubies/ruby-master`:
+
+    ```sh
+    make install
+    ```
+
+    - If you need to run `make install` with `sudo` and want to avoid document
+      generation with different permissions, you can use `make SUDO=sudo
+      install`.
+
+8. You can then try your new Ruby out, for example:
+
+    ```sh
+    ~/.rubies/ruby-master/bin/ruby -e "puts 'Hello, World!'"
+    ```
+
+By the end, your repo will look like this:
+
+```text
+ruby
+├── autogen.sh      # Pre-existing Autoconf script, used in step 1
+├── configure       # Generated in step 1, which generates the `Makefile` in step 4
+├── build           # Created in step 2 and populated in step 4
+│   ├── GNUmakefile # Generated by `../configure`
+│   ├── Makefile    # Generated by `../configure`
+│   ├── object.o    # Compiled object file, built my `make`
+│   └── ... other compiled `.o` object files
+│
+│ # Other interesting files:
+├── include
+│   └── ruby.h      # The main public header
+├── internal
+│   ├── object.h
+│   └── ... other header files used by the `.c` files in the repo root.
+├── lib
+│   └── # Default gems, like `bundler`, `erb`, `set`, `yaml`, etc.
+├── spec
+│   └── # A mirror of the Ruby specification from github.com/ruby/spec
+├── test
+│   ├── ruby
+│   └── ...
+├── object.c
+└── ... other `.c` files
+```
+
+[Download Ruby]: https://www.ruby-lang.org/en/downloads/
+
 ### Unexplainable Build Errors
 
-If you are having unexplainable build errors, after saving all your work, try running `git clean -xfd` in the source root to remove all git ignored local files. If you are working from a source directory that's been updated several times, you may have temporary build artifacts from previous releases which can cause build failures.
+If you are having unexplainable build errors, after saving all your work, try
+running `git clean -xfd` in the source root to remove all git ignored local
+files. If you are working from a source directory that's been updated several
+times, you may have temporary build artifacts from previous releases which can
+cause build failures.
+
+## Building on Windows
+
+The documentation for building on Windows can be found in [the separated
+file](../windows.md).
 
 ## More details
 
@@ -110,18 +193,21 @@ about Ruby's build to help out.
 
 ### Running make scripts in parallel
 
-In GNU make and BSD make implementations, to run a specific make script in parallel, pass the flag `-j<number of processes>`. For instance,
-to run tests on 8 processes, use:
+In GNU make[^caution-gmake-3] and BSD make implementations, to run a specific make script in
+parallel, pass the flag `-j<number of processes>`. For instance, to run tests
+on 8 processes, use:
 
-``` shell
+```sh
 make test-all -j8
 ```
 
 We can also set `MAKEFLAGS` to run _all_ `make` commands in parallel.
 
-Having the right `--jobs` flag will ensure all processors are utilized when building software projects. To do this effectively, you can set `MAKEFLAGS` in your shell configuration/profile:
+Having the right `--jobs` flag will ensure all processors are utilized when
+building software projects. To do this effectively, you can set `MAKEFLAGS` in
+your shell configuration/profile:
 
-``` shell
+```sh
 # On macOS with Fish shell:
 export MAKEFLAGS="--jobs "(sysctl -n hw.ncpu)
 
@@ -135,20 +221,25 @@ export MAKEFLAGS="--jobs "(nproc)
 export MAKEFLAGS="--jobs $(nproc)"
 ```
 
+[^caution-gmake-3]: **CAUTION**: GNU make 3 is missing some features for parallel execution, we
+recommend to upgrade to GNU make 4 or later.
+
 ### Miniruby vs Ruby
 
-Miniruby is a version of Ruby which has no external dependencies and lacks certain features.
-It can be useful in Ruby development because it allows for faster build times. Miniruby is
-built before Ruby. A functional Miniruby is required to build Ruby. To build Miniruby:
+Miniruby is a version of Ruby which has no external dependencies and lacks
+certain features.  It can be useful in Ruby development because it allows for
+faster build times. Miniruby is built before Ruby. A functional Miniruby is
+required to build Ruby. To build Miniruby:
 
-``` shell
+```sh
 make miniruby
 ```
 
 ## Debugging
 
-You can use either lldb or gdb for debugging. Before debugging, you need to create a `test.rb`
-with the Ruby script you'd like to run. You can use the following make targets:
+You can use either lldb or gdb for debugging. Before debugging, you need to
+create a `test.rb` with the Ruby script you'd like to run. You can use the
+following make targets:
 
 * `make run`: Runs `test.rb` using Miniruby
 * `make lldb`: Runs `test.rb` using Miniruby in lldb
@@ -157,33 +248,95 @@ with the Ruby script you'd like to run. You can use the following make targets:
 * `make lldb-ruby`: Runs `test.rb` using Ruby in lldb
 * `make gdb-ruby`: Runs `test.rb` using Ruby in gdb
 
+For VS Code users, you can set up editor-based debugging experience by running:
+
+```shell
+cp -r misc/.vscode .vscode
+```
+
+This will add launch configurations for debugging Ruby itself by running `test.rb` with `lldb`.
+
+**Note**: if you build Ruby under the `./build` folder, you'll need to update `.vscode/launch.json`'s program entry accordingly to: `"${workspaceFolder}/build/ruby"`
+
 ### Compiling for Debugging
 
-You should configure Ruby without optimization and other flags that may interfere with debugging:
+You can compile Ruby with the `RUBY_DEBUG` macro to enable debugging on some
+features. One example is debugging object shapes in Ruby with
+`RubyVM::Shape.of(object)`.
 
-``` shell
-./configure --enable-debug-env optflags="-O0 -fno-omit-frame-pointer"
+Additionally Ruby can be compiled to support the `RUBY_DEBUG` environment
+variable to enable debugging on some features. An example is using
+`RUBY_DEBUG=gc_stress` to debug GC-related issues.
+
+There is also support for the `RUBY_DEBUG_LOG` environment variable to log a
+lot of information about what the VM is doing, via the `USE_RUBY_DEBUG_LOG`
+macro.
+
+You should also configure Ruby without optimization and other flags that may
+interfere with debugging by changing the optimization flags.
+
+Bringing it all together:
+
+```sh
+./configure cppflags="-DRUBY_DEBUG=1 -DUSE_RUBY_DEBUG_LOG=1" --enable-debug-env optflags="-O0 -fno-omit-frame-pointer"
 ```
 
 ### Building with Address Sanitizer
 
-Using the address sanitizer is a great way to detect memory issues.
+Using the address sanitizer (ASAN) is a great way to detect memory issues. It
+can detect memory safety issues in Ruby itself, and also in any C extensions
+compiled with and loaded into a Ruby compiled with ASAN.
 
-``` shell
+```sh
 ./autogen.sh
 mkdir build && cd build
-export ASAN_OPTIONS="halt_on_error=0:use_sigaltstack=0:detect_leaks=0"
-../configure cppflags="-fsanitize=address -fno-omit-frame-pointer" optflags=-O0 LDFLAGS="-fsanitize=address -fno-omit-frame-pointer"
+../configure CC=clang-18 cflags="-fsanitize=address -fno-omit-frame-pointer -DUSE_MN_THREADS=0" # and any other options you might like
 make
 ```
 
-On Linux it is important to specify `-O0` when debugging. This is especially true for ASAN which sometimes works incorrectly at higher optimisation levels.
+The compiled Ruby will now automatically crash with a report and a backtrace
+if ASAN detects a memory safety issue. To run Ruby's test suite under ASAN,
+issue the following command. Note that this will take quite a long time (over
+two hours on my laptop); the `RUBY_TEST_TIMEOUT_SCALE` and
+`SYNTAX_SUGEST_TIMEOUT` variables are required to make sure tests don't
+spuriously fail with timeouts when in fact they're just slow.
+
+```sh
+RUBY_TEST_TIMEOUT_SCALE=5 SYNTAX_SUGGEST_TIMEOUT=600 make check
+```
+
+Please note, however, the following caveats!
+
+* ASAN will not work properly on any currently released version of Ruby; the
+  necessary support is currently only present on Ruby's master branch (and the
+  whole test suite passes only as of commit [Revision 9d0a5148]).
+* Due to [Bug #20243], Clang generates code for threadlocal variables which
+  doesn't work with M:N threading. Thus, it's necessary to disable M:N
+  threading support at build time for now (with the `-DUSE_MN_THREADS=0`
+  configure argument).
+* ASAN will only work when using Clang version 18 or later - it requires
+  [llvm/llvm-project#75290] related to multithreaded `fork`.
+* ASAN has only been tested so far with Clang on Linux. It may or may not work
+  with other compilers or on other platforms - please file an issue on
+  [Ruby Issue Tracking System] if you run into problems with such configurations
+  (or, to report that they actually work properly!)
+* In particular, although I have not yet tried it, I have reason to believe
+  ASAN will _not_ work properly on macOS yet - the fix for the multithreaded
+  fork issue was actually reverted for macOS (see [llvm/llvm-project#75659]).
+  Please open an issue on [Ruby Issue Tracking System] if this is a problem for
+  you.
+
+[Revision 9d0a5148]: https://bugs.ruby-lang.org/projects/ruby-master/repository/git/revisions/9d0a5148ae062a0481a4a18fbeb9cfd01dc10428
+[Bug #20243]: https://bugs.ruby-lang.org/issues/20243
+[llvm/llvm-project#75290]: https://github.com/llvm/llvm-project/pull/75290
+[llvm/llvm-project#75659]: https://github.com/llvm/llvm-project/pull/75659#issuecomment-1861584777
+[Ruby Issue Tracking System]: https://bugs.ruby-lang.org
 
 ## How to measure coverage of C and Ruby code
 
 You need to be able to use gcc (gcov) and lcov visualizer.
 
-``` shell
+```sh
 ./autogen.sh
 ./configure --enable-gcov
 make
@@ -194,11 +347,12 @@ 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 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` accumulates all runs of `make test-all`.
-Make sure that you remove the file if you want to measure one test run.
+If you need only Ruby code coverage, you can remove `--enable-gcov`.  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
diff --git a/doc/contributing/contributing.md b/doc/contributing/contributing.md
new file mode 100644
index 00000000000000..a2ed00ab90c1b0
--- /dev/null
+++ b/doc/contributing/contributing.md
@@ -0,0 +1,35 @@
+# Contributing to Ruby
+
+## Ruby Issues
+
+To report an issue in the Ruby core:
+
+* [Report issues](reporting_issues.md).
+
+## Ruby Core
+
+To contribute to the Ruby core functionality,
+you'll need initially to:
+
+* [Build Ruby](building_ruby.md) on your system.
+* [Test Ruby](testing_ruby.md), to make sure the build is correct.
+
+Then:
+
+* [Make changes to Ruby](making_changes_to_ruby.md).
+
+And possibly:
+
+* [Benchmark Ruby](https://github.com/ruby/ruby/tree/master/benchmark#make-benchmark).
+
+## Ruby Documentation
+
+To contribute to the Ruby core documentation, see:
+
+* [Making changes to the Ruby documentation](documentation_guide.md).
+
+## Ruby Standard Library
+
+To contribute to the Ruby Standard Library, see:
+
+* [Making changes to the Ruby Standard Library](making_changes_to_stdlibs.md).
diff --git a/doc/contributing/documentation_guide.md b/doc/contributing/documentation_guide.md
index 6cb2b8d7dc434b..a913aa10865506 100644
--- a/doc/contributing/documentation_guide.md
+++ b/doc/contributing/documentation_guide.md
@@ -7,7 +7,7 @@ in the Ruby core and in the Ruby standard library.
 ## Generating documentation
 
 Most Ruby documentation lives in the source files and is written in
-[RDoc format](rdoc-ref:RDoc::Markup).
+[RDoc format](https://ruby.github.io/rdoc/RDoc/MarkupReference.html).
 
 Some pages live under the `doc` folder and can be written in either
 `.rdoc` or `.md` format, determined by the file extension.
@@ -20,10 +20,12 @@ build directory:
 make html
 ```
 
+If you don't have a build directory, follow the [quick start
+guide](building_ruby.md#label-Quick+start+guide) up to step 4.
+
 Then you can preview your changes by opening
 `{build folder}/.ext/html/index.html` file in your browser.
 
-
 ## Goal
 
 The goal of Ruby documentation is to impart the most important
@@ -42,14 +44,13 @@ Use your judgment about what the user needs to know.
 - Group sentences into (ideally short) paragraphs,
   each covering a single topic.
 - Organize material with
-  [headings](rdoc-ref:RDoc::MarkupReference@Headings).
+  [headings].
 - Refer to authoritative and relevant sources using
-  [links](rdoc-ref:RDoc::MarkupReference@Links).
+  [links](https://ruby.github.io/rdoc/RDoc/MarkupReference.html#class-RDoc::MarkupReference-label-Links).
 - Use simple verb tenses: simple present, simple past, simple future.
 - Use simple sentence structure, not compound or complex structure.
 - Avoid:
-    - Excessive comma-separated phrases;
-      consider a [list](rdoc-ref:RDoc::MarkupReference@Lists).
+    - Excessive comma-separated phrases; consider a [list].
     - Idioms and culture-specific references.
     - Overuse of headings.
     - Using US-ASCII-incompatible characters in C source files;
@@ -93,7 +94,7 @@ involving new files `doc/*.rdoc`:
 
     Example:
 
-    ```
+    ```c
     /*
      *  call-seq:
      *    each_byte {|byte| ... } -> self
@@ -108,7 +109,7 @@ involving new files `doc/*.rdoc`:
 
 Ruby is documented using RDoc.
 For information on \RDoc syntax and features, see the
-[RDoc Markup Reference](rdoc-ref:RDoc::Markup@RDoc+Markup+Reference).
+[RDoc Markup Reference](https://ruby.github.io/rdoc/RDoc/MarkupReference.html).
 
 ### Output from `irb`
 
@@ -127,22 +128,21 @@ a             #=> [2, 3, 1]
 
 ### Headings
 
-Organize a long discussion for a class or module with [headings](rdoc-ref:RDoc::MarkupReference@Headings).
+Organize a long discussion for a class or module with [headings].
 
 Do not use formal headings in the documentation for a method or constant.
 
 In the rare case where heading-like structures are needed
 within the documentation for a method or constant, use
-[bold text](rdoc-ref:RDoc::MarkupReference@Bold)
+[bold text](https://ruby.github.io/rdoc/RDoc/MarkupReference.html#class-RDoc::MarkupReference-label-Bold)
 as pseudo-headings.
 
 ### Blank Lines
 
 A blank line begins a new paragraph.
 
-A [code block](rdoc-ref:RDoc::MarkupReference@Code+Blocks)
-or [list](rdoc-ref:RDoc::MarkupReference@Lists)
-should be preceded by and followed by a blank line.
+A [code block](https://ruby.github.io/rdoc/RDoc/MarkupReference.html#class-RDoc::MarkupReference-label-Code+Blocks)
+or [list] should be preceded by and followed by a blank line.
 This is unnecessary for the HTML output, but helps in the `ri` output.
 
 ### \Method Names
@@ -162,45 +162,139 @@ For a method name in text:
 
 Code or commands embedded in running text (i.e., not in a code block)
 should marked up as
-[monofont](rdoc-ref:RDoc::MarkupReference@Monofont).
+[monofont].
 
 Code that is a simple string should include the quote marks.
 
 ### Auto-Linking
 
+Most often, the name of a class, module, or method
+is auto-linked:
+
+```rdoc
+- Float.
+- Enumerable.
+- File.new
+- File#read.
+```
+
+renders as:
+
+> - Float.
+> - Enumerable.
+> - File.new
+> - File#read.
+
 In general, \RDoc's auto-linking should not be suppressed.
-For example, we should write `Array`, not `\Array`.
+For example, we should write just plain _Float_ (which is auto-linked):
 
-We might consider whether to suppress when:
+```rdoc
+Returns a Float.
+```
 
-- The word in question does not refer to a Ruby entity
-  (e.g., some uses of _Class_ or _English_).
-- The reference is to the current class document
-  (e.g., _Array_ in the documentation for class `Array`).
-- The same reference is repeated many times
-  (e.g., _RDoc_ on this page).
-- The reference is to a class or module that users
-  usually don't deal with, including these:
+which renders as:
 
-    - \Class.
-    - \Method.
-    - \Module.
+> Returns a Float.
 
-Most often, the name of a class, module, or method
-will be autolinked:
+However, _do_ suppress auto-linking when the word in question
+does not refer to a Ruby entity (e.g., some uses of _Class_ or _English_):
 
-- Array.
-- Enumerable.
-- File.new
-- File#read.
+```rdoc
+Class variables can be tricky.
+```
+
+renders as:
+
+> Class variables can be tricky.
+
+Also, _do_ suppress auto-linking when the word in question
+refers to the current document
+(e.g., _Float_ in the documentation for class Float).
+
+In this case you may consider forcing the name to
+[monofont],
+which suppresses auto-linking, and also emphasizes that the word is a class name:
+
+```rdoc
+A +Float+ object represents ....
+```
+
+renders as:
+
+> A `Float` object represents ....
+
+For a _very_ few, _very_ often-discussed classes,
+you might consider avoiding the capitalized class name altogether.
+For example, for some mentions of arrays,
+you might write simply the lowercase _array_.
+
+Instead of:
+
+```rdoc
+For an empty Array, ....
+```
+
+which renders as:
+
+> For an empty Array, ....
+
+you might write:
+
+```rdoc
+For an empty array, ....
+```
+
+which renders as:
+
+> For an empty array, ....
+
+This more casual usage avoids both auto-linking and distracting font changes,
+and is unlikely to cause confusion.
+
+This principle may be usefully applied, in particular, for:
 
-If not, or if you suppress autolinking, consider forcing
-[monofont](rdoc-ref:RDoc::MarkupReference@Monofont).
+- An array.
+- An integer.
+- A hash.
+- A string.
+
+However, it should be applied _only_ when referring to an _instance_ of the class,
+and _never_ when referring to the class itself.
+
+### Explicit Links
+
+When writing an explicit link, follow these guidelines.
+
+#### +rdoc-ref+ Scheme
+
+Use the +rdoc-ref+ scheme for:
+
+- A link in core documentation to other core documentation.
+- A link in core documentation to documentation in a standard library package.
+- A link in a standard library package to other documentation in that same
+  standard library package.
+
+See section "+rdoc-ref+ Scheme" in [links].
+
+#### URL-Based Link
+
+Use a full URL-based link for:
+
+- A link in standard library documentation to documentation in the core.
+- A link in standard library documentation to documentation in a different
+  standard library package.
+
+Doing so ensures that the link will valid even when the package documentation
+is built independently (separately from the core documentation).
+
+The link should lead to a target in https://docs.ruby-lang.org/en/master/.
+
+Also use a full URL-based link for a link to an off-site document.
 
 ### Variable Names
 
 The name of a variable (as specified in its call-seq) should be marked up as
-[monofont](rdoc-ref:RDoc::MarkupReference@Monofont).
+[monofont].
 
 Also, use monofont text for the name of a transient variable
 (i.e., one defined and used only in the discussion, such as +n+).
@@ -216,16 +310,21 @@ may not render them properly.
 In particular, avoid building tables with HTML tags
 (<tt><table></tt>, etc.).
 
-Alternatives are:
+Alternatives:
+
+- A {verbatim text block}[https://ruby.github.io/rdoc/RDoc/MarkupReference.html#class-RDoc::MarkupReference-label-Verbatim+Text+Blocks],
+  using spaces and punctuation to format the text;
+  note that {text markup}[https://ruby.github.io/rdoc/RDoc/MarkupReference.html#class-RDoc::MarkupReference-label-Text+Markup]
+  will not be honored:
+
+    - Example {source}[https://github.com/ruby/ruby/blob/34d802f32f00df1ac0220b62f72605827c16bad8/file.c#L6570-L6596].
+    - Corresponding {output}[rdoc-ref:File@Read-2FWrite+Mode].
 
-- The GFM (GitHub Flavored Markdown) table extension,
-  which is enabled by default. See
-  {GFM tables extension}[https://github.github.com/gfm/#tables-extension-].
+- (Markdown format only): A {Github Flavored Markdown (GFM) table}[https://github.github.com/gfm/#tables-extension-],
+  using special formatting for the text:
 
-- A {verbatim text block}[rdoc-ref:RDoc::MarkupReference@Verbatim+Text+Blocks],
-  using spaces and punctuation to format the text.
-  Note that {text markup}[rdoc-ref:RDoc::MarkupReference@Text+Markup]
-  will not be honored.
+    - Example {source}[https://github.com/ruby/ruby/blob/34d802f32f00df1ac0220b62f72605827c16bad8/doc/contributing/glossary.md?plain=1].
+    - Corresponding {output}[https://docs.ruby-lang.org/en/master/contributing/glossary_md.html].
 
 ## Documenting Classes and Modules
 
@@ -255,9 +354,11 @@ Guidelines:
 
 - The section title is `What's Here`.
 - Consider listing the parent class and any included modules; consider
-  [links](rdoc-ref:RDoc::MarkupReference@Links)
-  to their "What's Here" sections if those exist.
-- List methods as a bullet list:
+  [links] to their "What's Here" sections if those exist.
+- All methods mentioned in the left-pane table of contents
+  should be listed (including any methods extended from another class).
+- Attributes (which are not included in the TOC) may also be listed.
+- Display methods as items in one or more bullet lists:
 
     - Begin each item with the method name, followed by a colon
       and a short description.
@@ -265,7 +366,7 @@ Guidelines:
       (and do not list the aliases separately).
     - Check the rendered documentation to determine whether \RDoc has recognized
       the method and linked to it;  if not, manually insert a
-      [link](rdoc-ref:RDoc::MarkupReference@Links).
+      [link](https://ruby.github.io/rdoc/RDoc/MarkupReference.html#class-RDoc::MarkupReference-label-Links).
 
 - If there are numerous entries, consider grouping them into subsections with headings.
 - If there are more than a few such subsections,
@@ -279,6 +380,7 @@ The general structure of the method documentation should be:
 
 - Calling sequence (for methods written in C).
 - Synopsis (short description).
+- In-brief examples (optional)
 - Details and examples.
 - Argument description (if necessary).
 - Corner cases and exceptions.
@@ -290,17 +392,17 @@ For methods written in Ruby, \RDoc documents the calling sequence automatically.
 
 For methods written in C, \RDoc cannot determine what arguments
 the method accepts, so those need to be documented using \RDoc directive
-[`call-seq:`](rdoc-ref:RDoc::MarkupReference@Directives+for+Method+Documentation).
+[`call-seq:`](https://ruby.github.io/rdoc/RDoc/MarkupReference.html#class-RDoc::MarkupReference-label-Directives+for+Method+Documentation).
 
 For a singleton method, use the form:
 
-```
+```rdoc
 class_name.method_name(method_args) {|block_args| ... } -> return_type
 ```
 
 Example:
 
-```
+```rdoc
 *  call-seq:
 *    Hash.new(default_value = nil) -> new_hash
 *    Hash.new {|hash, key| ... } -> new_hash
@@ -309,23 +411,32 @@ Example:
 For an instance method, use the form
 (omitting any prefix, just as RDoc does for a Ruby-coded method):
 
-```
+```rdoc
 method_name(method_args) {|block_args| ... } -> return_type
 ```
+
 For example, in Array, use:
 
-```
+```rdoc
 *  call-seq:
 *    count -> integer
 *    count(obj) -> integer
 *    count {|element| ... } -> integer
 ```
 
-```
-* call-seq:
+```rdoc
+*  call-seq:
 *    <=> other -> -1, 0, 1, or nil
 ```
 
+For a binary-operator style method (e.g., Array#&),
+cite `self` in the call-seq (not, e.g., `array` or `receiver`):
+
+```rdoc
+*  call-seq:
+*    self & other_array -> new_array
+```
+
 Arguments:
 
 - If the method does not accept arguments, omit the parentheses.
@@ -337,15 +448,17 @@ Arguments:
       or an explicit argument, use a `call-seq` with optional arguments.
       For example, use:
 
-        ```
-        respond_to?(symbol, include_all = false) -> true or false
+        ```rdoc
+        *  call-seq:
+        *    respond_to?(symbol, include_all = false) -> true or false
         ```
 
     - If the behavior is different with an omitted or an explicit argument,
       use a `call-seq` with separate lines.
       For example, in Enumerable, use:
 
-        ```
+        ```rdoc
+        *  call-seq:
         *    max    -> element
         *    max(n) -> array
         ```
@@ -355,6 +468,14 @@ Block:
 - If the method does not accept a block, omit the block.
 - If the method accepts a block, the `call-seq` should have `{|args| ... }`,
   not `{|args| block }` or `{|args| code }`.
+- If the method accepts a block, but returns an Enumerator when the block is omitted,
+  the `call-seq` should show both forms:
+
+    ```rdoc
+    *  call-seq:
+    *    array.select {|element| ... } -> new_array
+    *    array.select -> new_enumerator
+    ```
 
 Return types:
 
@@ -383,14 +504,22 @@ an entire paragraph.
 
 For `Array#count`, the synopsis is:
 
-```
-Returns a count of specified elements.
-```
+> Returns a count of specified elements.
 
 This is great as it is short and descriptive.  Avoid documenting
 too much in the synopsis, stick to the most important information
 for the benefit of the reader.
 
+### In-Brief Examples
+
+For a method whose documentation is lengthy,
+consider adding an "in-brief" passage,
+showing examples that summarize the method's uses.
+
+The passage may answer some users' questions
+(without their having to read long documentation);
+see Array#[] and Array#[]=.
+
 ### Details and Examples
 
 Most non-trivial methods benefit from examples, as well as details
@@ -413,6 +542,15 @@ do not add an example if it provides the same information given
 in the synopsis or details.  The purpose of examples is not to prove
 what the details are stating.
 
+Many methods that can take an optional block call the block if it is given,
+but return a new Enumerator if the block is not given;
+in that case, do not provide an example,
+but do state the fact (with the auto-linking uppercase Enumerator):
+
+```rdoc
+*  With no block given, returns a new Enumerator.
+```
+
 ### Argument Description (if necessary)
 
 For methods that require arguments, if not obvious and not explicitly
@@ -429,7 +567,7 @@ argument passed if it is not obvious, not explicitly mentioned in the
 details, and not implicitly shown in the examples.
 
 If there is more than one argument or block argument, use a
-[labeled list](rdoc-ref:RDoc::MarkupReference@Labeled+Lists).
+[labeled list](https://ruby.github.io/rdoc/RDoc/MarkupReference.html#class-RDoc::MarkupReference-label-Labeled+Lists).
 
 ### Corner Cases and Exceptions
 
@@ -469,3 +607,7 @@ mention `Hash#fetch` as a related method, and `Hash#merge` might mention
 For methods that accept multiple argument types, in some cases it can
 be useful to document the different argument types separately.  It's
 best to use a separate paragraph for each case you are discussing.
+
+[headings]: https://ruby.github.io/rdoc/RDoc/MarkupReference.html#class-RDoc::MarkupReference-label-Headings
+[list]: https://ruby.github.io/rdoc/RDoc/MarkupReference.html#class-RDoc::MarkupReference-label-Lists
+[monofont]: https://ruby.github.io/rdoc/RDoc/MarkupReference.html#class-RDoc::MarkupReference-label-Monofont
diff --git a/doc/contributing/glossary.md b/doc/contributing/glossary.md
index 0d27d28c96f4de..6f9c33502820ce 100644
--- a/doc/contributing/glossary.md
+++ b/doc/contributing/glossary.md
@@ -8,9 +8,10 @@ Just a list of acronyms I've run across in the Ruby source code and their meanin
 | `bop` | Basic Operator. Relates to methods like `Integer` plus and minus which can be optimized as long as they haven't been redefined. |
 | `cc` | Call Cache.  An inline cache structure for the call site. Stored in the `cd` |
 | `cd` | Call Data. A data structure that points at the `ci` and the `cc`.  `iseq` objects points at the `cd`, and access call information and call caches via this structure |
+| CFG | Control Flow Graph. Representation of the program where all control-flow and data dependencies have been made explicit by unrolling the stack and local variables. |
 | `cfp`| Control Frame Pointer. Represents a Ruby stack frame.  Calling a method pushes a new frame (cfp), returning pops a frame. Points at  the `pc`, `sp`, `ep`, and the corresponding `iseq`|
 | `ci` | Call Information.  Refers to an `rb_callinfo` struct. Contains call information about the call site, including number of parameters to be passed, whether it they are keyword arguments or not, etc. Used in conjunction with the `cc` and `cd`. |
-| `cref` | Class reference. A structure pointing to the class reference where `klass_or_self`, visibility scope, and refinements are stored. It also stores a pointer to the next class in the hierachy referenced by `rb_cref_struct * next`. The Class reference is lexically scoped. |
+| `cref` | Class reference. A structure pointing to the class reference where `klass_or_self`, visibility scope, and refinements are stored. It also stores a pointer to the next class in the hierarchy referenced by `rb_cref_struct * next`. The Class reference is lexically scoped. |
 | CRuby | Implementation of Ruby written in C |
 | `cvar` | Class Variable. Refers to a Ruby class variable like `@@foo` |
 | `dvar` | Dynamic Variable. Used by the parser to refer to local variables that are defined outside of the current lexical scope. For example `def foo; bar = 1; -> { p bar }; end` the "bar" inside the block is a `dvar` |
@@ -25,10 +26,11 @@ Just a list of acronyms I've run across in the Ruby source code and their meanin
 | `insns` | Instructions. Usually an array of YARV instructions. |
 | `ivar` | Instance Variable. Refers to a Ruby instance variable like `@foo` |
 | `imemo` | Internal Memo.  A tagged struct whose memory is managed by Ruby's GC, but contains internal information and isn't meant to be exposed to Ruby programs. Contains various information depending on the type.  See the `imemo_type` enum for different types. |
+| `IVC` | Instance Variable Cache. Cache specifically for instance variable access |
 | JIT | Just In Time compiler |
 | `lep` | Local Environment Pointer. An `ep` which is tagged `VM_ENV_FLAG_LOCAL`. Usually this is the `ep` of a method (rather than a block, whose `ep` isn't "local") |
 | `local` | Local. Refers to a local variable. |
-| `me` | Method Entry. Refers to an `rb_method_entry_t` struct, the internal representation of a Ruby method.
+| `me` | Method Entry. Refers to an `rb_method_entry_t` struct, the internal representation of a Ruby method. |
 | MRI | Matz's Ruby Implementation |
 | `pc` | Program Counter. Usually the instruction that will be executed _next_ by the VM. Pointed to by the `cfp` and incremented by the VM |
 | `sp` | Stack Pointer. The top of the stack. The VM executes instructions in the `iseq` and instructions will push and pop values on the stack. The VM updates the `sp` on the `cfp` to point at the top of the stack|
diff --git a/doc/contributing/making_changes_to_stdlibs.md b/doc/contributing/making_changes_to_stdlibs.md
index 3b33092fead20f..721ba842896a25 100644
--- a/doc/contributing/making_changes_to_stdlibs.md
+++ b/doc/contributing/making_changes_to_stdlibs.md
@@ -14,7 +14,7 @@ You can find the list of maintainers [here](https://docs.ruby-lang.org/en/master
 
 First, install its dependencies using:
 
-```
+```shell
 bundle install
 ```
 
@@ -22,7 +22,7 @@ bundle install
 
 If the library has a `/ext` directory, it has C files that you need to compile with:
 
-```
+```shell
 bundle exec rake compile
 ```
 
@@ -32,18 +32,18 @@ All standard libraries use [test-unit](https://github.com/test-unit/test-unit) a
 
 To run all tests:
 
-```
+```shell
 bundle exec rake test
 ```
 
 To run a single test file:
 
-```
+```shell
 bundle exec rake test TEST="test/test_foo.rb"
 ```
 
 To run a single test case:
 
-```
+```shell
 bundle exec rake test TEST="test/test_foo.rb" TESTOPS="--name=/test_mytest/"
 ```
diff --git a/doc/contributing/reporting_issues.md b/doc/contributing/reporting_issues.md
index 25516ffc6bcbf4..a1a22957129336 100644
--- a/doc/contributing/reporting_issues.md
+++ b/doc/contributing/reporting_issues.md
@@ -52,19 +52,30 @@ your feature it could help persuade Ruby core.
 
 Here is a template you can use for a feature proposal:
 
-```
-[Abstract]
-  Briefly summarize your feature
-[Background]
-  Describe current behavior
-[Proposal]
-  Describe your feature in detail
-[Use cases]
-  Give specific example uses of your feature
-[Discussion]
-  Describe why this feature is necessary and better than using existing features
-[See also]
-  Link to other related resources (such as implementations in other languages)
+```markdown
+# Abstract
+
+Briefly summarize your feature
+
+# Background
+
+Describe current behavior
+
+# Proposal
+
+Describe your feature in detail
+
+# Use cases
+
+Give specific example uses of your feature
+
+# Discussion
+
+Describe why this feature is necessary and better than using existing features
+
+# See also
+
+Link to other related resources (such as implementations in other languages)
 ```
 
 ## Backport requests
diff --git a/doc/contributing/testing_ruby.md b/doc/contributing/testing_ruby.md
index 8decc24083538b..4c7ce7f6a8e5a9 100644
--- a/doc/contributing/testing_ruby.md
+++ b/doc/contributing/testing_ruby.md
@@ -1,5 +1,9 @@
 # Testing Ruby
 
+All the commands below assume that you're running them from the `build/` directory made during [Building Ruby](building_ruby.md).
+
+Most commands below should work with [GNU make](https://www.gnu.org/software/make/) (the default on Linux and macOS), [BSD make](https://man.freebsd.org/cgi/man.cgi?make(1)) and [NMAKE](https://learn.microsoft.com/en-us/cpp/build/reference/nmake-reference), except where indicated otherwise.
+
 ## Test suites
 
 There are several test suites in the Ruby codebase:
@@ -8,137 +12,144 @@ We can run any of the make scripts [in parallel](building_ruby.md#label-Running+
 
 1. [bootstraptest/](https://github.com/ruby/ruby/tree/master/bootstraptest)
 
-    This is a small test suite that runs on Miniruby (see [building Ruby](building_ruby.md#label-Miniruby+vs+Ruby)). We can run it with:
+    This is a small test suite that runs on [Miniruby](building_ruby.md#label-Miniruby+vs+Ruby). We can run it with:
 
-    ```
+    ```sh
     make btest
     ```
 
-    To run it with logs, we can use:
+    To run individual bootstrap tests, we can either specify a list of filenames or use the `--sets` flag in the variable `BTESTS`:
 
-    ```
-    make btest OPTS=-v
+    ```sh
+    make btest BTESTS="../bootstraptest/test_string.rb ../bootstraptest/test_class.rb"
+    make btest BTESTS="--sets=string,class"
     ```
 
-    To run individual bootstrap tests, we can either specify a list of filenames or use the `--sets` flag in the variable `BTESTS`:
+    To run these tests with verbose logging, we can add `-v` to the `OPTS`:
 
-    ```
-    make btest BTESTS="bootstraptest/test_fork.rb bootstraptest/tes_gc.rb"
-    make btest BTESTS="--sets=fork,gc"
+    ```sh
+    make btest OPTS="--sets=string,class -v"
     ```
 
     If we want to run the bootstrap test suite on Ruby (not Miniruby), we can use:
 
-    ```
+    ```sh
     make test
     ```
 
-    To run it with logs, we can use:
+    To run these tests with verbose logging, we can add `-v` to the `OPTS`:
 
-    ```
+    ```sh
     make test OPTS=-v
     ```
 
-    To run a file or directory with GNU make, we can use:
+    (GNU make only) To run a specific file, we can use:
 
+    ```sh
+    make ../test/ruby/test_string.rb
     ```
-    make test/ruby/test_foo.rb
-    make test/ruby/test_foo.rb TESTOPTS="-n /test_bar/"
+
+    You can use the `-n` test option to run a specific test with a regex:
+
+    ```sh
+    make ../test/ruby/test_string.rb TESTOPTS="-n /test_.*_to_s/"
     ```
 
 2. [test/](https://github.com/ruby/ruby/tree/master/test)
 
     This is a more comprehensive test suite that runs on Ruby. We can run it with:
 
-    ```
+    ```sh
     make test-all
     ```
 
-    We can run a specific test directory in this suite using the `TESTS` option, for example:
+    We can run a specific test file or directory in this suite using the `TESTS` option, for example:
 
-    ```
-    make test-all TESTS=test/rubygems
-    ```
-
-    We can run a specific test file in this suite by also using the `TESTS` option, for example:
-
-    ```
-    make test-all TESTS=test/ruby/test_array.rb
+    ```sh
+    make test-all TESTS="../test/ruby/"
+    make test-all TESTS="../test/ruby/test_string.rb"
     ```
 
     We can run a specific test in this suite using the `TESTS` option, specifying
     first the file name, and then the test name, prefixed with `--name`. For example:
 
-    ```
-    make test-all TESTS="../test/ruby/test_alias.rb --name=TestAlias#test_alias_with_zsuper_method"
+    ```sh
+    make test-all TESTS="../test/ruby/test_string.rb --name=TestString#test_to_s"
     ```
 
-    To run these specs with logs, we can use:
+    To run these tests with verbose logging, we can add `-v` to `TESTS`:
 
-    ```
+    ```sh
     make test-all TESTS=-v
     ```
 
     We can display the help of the `TESTS` option:
 
-    ```
-    $ make test-all TESTS=--help
+    ```sh
+    make test-all TESTS=--help
     ```
 
-    If we would like to run both the `test/` and `bootstraptest/` test suites, we can run
+    We can run all the tests in `test/`, `bootstraptest/` and `spec/` (the `spec/` is explained in a later section) all together with:
 
-    ```
+    ```sh
     make check
     ```
 
 3. [spec/ruby](https://github.com/ruby/ruby/tree/master/spec/ruby)
 
-    This is a test suite that exists in [the Ruby spec repository](https://github.com/ruby/spec) and is mirrored into the `spec/ruby` directory in the Ruby repository. It tests the behavior of the Ruby programming language. We can run this using:
+    This is a test suite defined in [the Ruby spec repository](https://github.com/ruby/spec), and is periodically mirrored into the `spec/ruby` directory of this repository. It tests the behavior of the Ruby programming language. We can run this using:
 
-    ```
+    ```sh
     make test-spec
     ```
 
-    To run a specific directory, we can use `SPECOPTS` to specify the directory:
+    We can run a specific test file or directory in this suite using the `SPECOPTS` option, for example:
 
-    ```
-    make test-spec SPECOPTS=spec/ruby/core/array
-    ```
-
-    To run a specific file, we can also use `SPECOPTS` to specify the file:
-
-    ```
-    make test-spec SPECOPTS=spec/ruby/core/array/any_spec.rb
+    ```sh
+    make test-spec SPECOPTS="../spec/ruby/core/string/"
+    make test-spec SPECOPTS="../spec/ruby/core/string/to_s_spec.rb"
     ```
 
     To run a specific test, we can use the `--example` flag to match against the test name:
 
-    ```
-    make test-spec SPECOPTS="../spec/ruby/core/array/any_spec.rb --example='is false if the array is empty'"
+    ```sh
+    make test-spec SPECOPTS="../spec/ruby/core/string/to_s_spec.rb --example='returns self when self.class == String'"
     ```
 
-    To run these specs with logs, we can use:
+    To run these specs with verbose logging, we can add `-v` to the `SPECOPTS`:
 
-    ```
-    make test-spec SPECOPTS=-Vfs
+    ```sh
+    make test-spec SPECOPTS="../spec/ruby/core/string/to_s_spec.rb -Vfs"
     ```
 
-    To run a ruby-spec file or directory with GNU make, we can use
+    (GNU make only) To run a ruby-spec file or directory, we can use
 
-    ```
-    make spec/ruby/core/foo/bar_spec.rb
+    ```sh
+    make ../spec/ruby/core/string/to_s_spec.rb
     ```
 
 4. [spec/bundler](https://github.com/ruby/ruby/tree/master/spec/bundler)
 
-    The bundler test suite exists in [the RubyGems repository](https://github.com/rubygems/rubygems/tree/master/bundler/spec) and is mirrored into the `spec/bundler` directory in the Ruby repository. We can run this using:
+    The bundler test suite is defined in [the RubyGems repository](https://github.com/rubygems/rubygems/tree/master/bundler/spec), and is periodically mirrored into the `spec/ruby` directory of this repository. We can run this using:
 
-    ```
+    ```sh
     make test-bundler
     ```
 
     To run a specific bundler spec file, we can use `BUNDLER_SPECS` as follows:
 
+    ```sh
+    make test-bundler BUNDLER_SPECS=commands/exec_spec.rb
     ```
-    $ make test-bundler BUNDLER_SPECS=commands/exec_spec.rb
-    ```
+
+## Troubleshooting
+
+### Running test suites on s390x CPU Architecture
+
+If we see failing tests related to the zlib library on s390x CPU architecture, we can run the test suites with `DFLTCC=0` to pass:
+
+```sh
+DFLTCC=0 make check
+```
+
+The failures can happen with the zlib library applying the patch [madler/zlib#410](https://github.com/madler/zlib/pull/410) to enable the deflate algorithm producing a different compressed byte stream. We manage this issue at [[ruby-core:114942][Bug #19909]](https://bugs.ruby-lang.org/issues/19909).
diff --git a/doc/csv/recipes/generating.rdoc b/doc/csv/recipes/generating.rdoc
index a6bd88a7147a1e..e61838d31a5b3c 100644
--- a/doc/csv/recipes/generating.rdoc
+++ b/doc/csv/recipes/generating.rdoc
@@ -163,7 +163,7 @@ This example defines and uses two custom write converters to strip and upcase ge
 === RFC 4180 Compliance
 
 By default, \CSV generates data that is compliant with
-{RFC 4180}[https://tools.ietf.org/html/rfc4180]
+{RFC 4180}[https://www.rfc-editor.org/rfc/rfc4180]
 with respect to:
 - Column separator.
 - Quote character.
diff --git a/doc/csv/recipes/parsing.rdoc b/doc/csv/recipes/parsing.rdoc
index f3528fbdf1bc8b..1b7071e33f6543 100644
--- a/doc/csv/recipes/parsing.rdoc
+++ b/doc/csv/recipes/parsing.rdoc
@@ -191,7 +191,7 @@ Output:
 === RFC 4180 Compliance
 
 By default, \CSV parses data that is compliant with
-{RFC 4180}[https://tools.ietf.org/html/rfc4180]
+{RFC 4180}[https://www.rfc-editor.org/rfc/rfc4180]
 with respect to:
 - Row separator.
 - Column separator.
diff --git a/doc/date/calendars.rdoc b/doc/date/calendars.rdoc
index b8690841b1d45c..4e6fd8334bda50 100644
--- a/doc/date/calendars.rdoc
+++ b/doc/date/calendars.rdoc
@@ -18,7 +18,7 @@ The reasons for the difference are religious/political histories.
 - On October 15, 1582, several countries changed
   from the Julian calendar to the Gregorian calendar;
   these included Italy, Poland, Portugal, and Spain.
-  Other contries in the Western world retained the Julian calendar.
+  Other countries in the Western world retained the Julian calendar.
 - On September 14, 1752, most of the British empire
   changed from the Julian calendar to the Gregorian calendar.
 
@@ -31,7 +31,7 @@ See also {a concrete example here}[rdoc-ref:DateTime@When+should+you+use+DateTim
 === Argument +start+
 
 Certain methods in class \Date handle differences in the
-{Julian and Gregorian calendars}[rdoc-ref:calendars.rdoc@Julian+and+Gregorian+Calendars]
+{Julian and Gregorian calendars}[rdoc-ref:date/calendars.rdoc@Julian+and+Gregorian+Calendars]
 by accepting an optional argument +start+, whose value may be:
 
 - Date::ITALY (the default): the created date is Julian
diff --git a/doc/distribution.md b/doc/distribution.md
index bc89a7500a6ec0..164e1b7109a1ab 100644
--- a/doc/distribution.md
+++ b/doc/distribution.md
@@ -8,7 +8,7 @@ This document outlines the expected way to distribute Ruby, with a specific focu
 
 The tarball for official releases is created by the release manager. The release manager uploads the tarball to the [Ruby website](https://www.ruby-lang.org/en/downloads/).
 
-Downstream distributors should use the official release tarballs as part of their build process. This ensures that the tarball is created in a consistent way, and that the tarball is crytographically verified.
+Downstream distributors should use the official release tarballs as part of their build process. This ensures that the tarball is created in a consistent way, and that the tarball is cryptographically verified.
 
 ### Using the nightly tarball for testing
 
@@ -19,7 +19,8 @@ See the Snapshots section of the [Ruby website](https://www.ruby-lang.org/en/dow
 This can be useful if the nightly tarball does not have all changes yet.
 
 At Ruby source tree cloned using git:
-```sh-session
+
+```console
 $ ./autogen.sh
 $ ./configure -C
 $ make
diff --git a/doc/encodings.rdoc b/doc/encodings.rdoc
index f5e718b3cda57e..eaee2efd62b46a 100644
--- a/doc/encodings.rdoc
+++ b/doc/encodings.rdoc
@@ -1,6 +1,6 @@
-== Encodings
+= Encodings
 
-=== The Basics
+== The Basics
 
 A {character encoding}[https://en.wikipedia.org/wiki/Character_encoding],
 often shortened to _encoding_, is a mapping between:
@@ -12,9 +12,9 @@ Some character sets contain only 1-byte characters;
 {US-ASCII}[https://en.wikipedia.org/wiki/ASCII], for example, has 256 1-byte characters.
 This string, encoded in US-ASCII, has six characters that are stored as six bytes:
 
-  s = 'Hello!'.encode('US-ASCII')  # => "Hello!"
-  s.encoding                       # => #<Encoding:US-ASCII>
-  s.bytes                          # => [72, 101, 108, 108, 111, 33]
+  s = 'Hello!'.encode(Encoding::US_ASCII)  # => "Hello!"
+  s.encoding                               # => #<Encoding:US-ASCII>
+  s.bytes                                  # => [72, 101, 108, 108, 111, 33]
 
 Other encodings may involve multi-byte characters.
 {UTF-8}[https://en.wikipedia.org/wiki/UTF-8], for example,
@@ -30,22 +30,22 @@ Other characters, such as the Euro symbol, are multi-byte:
   s = "\u20ac" # => "€"
   s.bytes      # => [226, 130, 172]
 
-=== The \Encoding \Class
+== The \Encoding Class
 
-==== \Encoding Objects
+=== \Encoding Objects
 
 Ruby encodings are defined by constants in class \Encoding.
 There can be only one instance of \Encoding for each of these constants.
-\Method Encoding.list returns an array of \Encoding objects (one for each constant):
+Method Encoding.list returns an array of \Encoding objects (one for each constant):
 
   Encoding.list.size        # => 103
   Encoding.list.first.class # => Encoding
   Encoding.list.take(3)
   # => [#<Encoding:ASCII-8BIT>, #<Encoding:UTF-8>, #<Encoding:US-ASCII>]
 
-==== Names and Aliases
+=== Names and Aliases
 
-\Method Encoding#name returns the name of an \Encoding:
+Method Encoding#name returns the name of an \Encoding:
 
   Encoding::ASCII_8BIT.name  # => "ASCII-8BIT"
   Encoding::WINDOWS_31J.name # => "Windows-31J"
@@ -58,29 +58,29 @@ method Encoding#names returns an array containing the name and all aliases:
   Encoding::WINDOWS_31J.names
   #=> ["Windows-31J", "CP932", "csWindows31J", "SJIS", "PCK"]
 
-\Method Encoding.aliases returns a hash of all alias/name pairs:
+Method Encoding.aliases returns a hash of all alias/name pairs:
 
   Encoding.aliases.size # => 71
   Encoding.aliases.take(3)
   # => [["BINARY", "ASCII-8BIT"], ["CP437", "IBM437"], ["CP720", "IBM720"]]
 
-\Method Encoding.name_list returns an array of all the encoding names and aliases:
+Method Encoding.name_list returns an array of all the encoding names and aliases:
 
   Encoding.name_list.size # => 175
   Encoding.name_list.take(3)
   # => ["ASCII-8BIT", "UTF-8", "US-ASCII"]
 
-\Method +name_list+ returns more entries than method +list+
+Method +name_list+ returns more entries than method +list+
 because it includes both the names and their aliases.
 
-\Method Encoding.find returns the \Encoding for a given name or alias, if it exists:
+Method Encoding.find returns the \Encoding for a given name or alias, if it exists:
 
   Encoding.find("US-ASCII")       # => #<Encoding:US-ASCII>
   Encoding.find("US-ASCII").class # => Encoding
 
-==== Default Encodings
+=== Default Encodings
 
-\Method Encoding.find, above, also returns a default \Encoding
+Method Encoding.find, above, also returns a default \Encoding
 for each of these special names:
 
 - +external+: the default external \Encoding:
@@ -100,27 +100,27 @@ for each of these special names:
 
     Encoding.find("filesystem") # => #<Encoding:UTF-8>
 
-\Method Encoding.default_external returns the default external \Encoding:
+Method Encoding.default_external returns the default external \Encoding:
 
   Encoding.default_external # => #<Encoding:UTF-8>
 
-\Method Encoding.default_external= sets that value:
+Method Encoding.default_external= sets that value:
 
-  Encoding.default_external = 'US-ASCII' # => "US-ASCII"
-  Encoding.default_external              # => #<Encoding:US-ASCII>
+  Encoding.default_external = Encoding::US_ASCII # => #<Encoding:US-ASCII>
+  Encoding.default_external                      # => #<Encoding:US-ASCII>
 
-\Method Encoding.default_internal returns the default internal \Encoding:
+Method Encoding.default_internal returns the default internal \Encoding:
 
   Encoding.default_internal # => nil
 
-\Method Encoding.default_internal= sets the default internal \Encoding:
+Method Encoding.default_internal= sets the default internal \Encoding:
 
-  Encoding.default_internal = 'US-ASCII' # => "US-ASCII"
-  Encoding.default_internal              # => #<Encoding:US-ASCII>
+  Encoding.default_internal = Encoding::US_ASCII # => #<Encoding:US-ASCII>
+  Encoding.default_internal                      # => #<Encoding:US-ASCII>
 
-==== Compatible Encodings
+=== Compatible Encodings
 
-\Method Encoding.compatible? returns whether two given objects are encoding-compatible
+Method Encoding.compatible? returns whether two given objects are encoding-compatible
 (that is, whether they can be concatenated);
 returns the \Encoding of the concatenated string, or +nil+ if incompatible:
 
@@ -128,62 +128,63 @@ returns the \Encoding of the concatenated string, or +nil+ if incompatible:
   eng = 'text'
   Encoding.compatible?(rus, eng) # => #<Encoding:UTF-8>
 
-  s0 = "\xa1\xa1".force_encoding('iso-8859-1') # => "\xA1\xA1"
-  s1 = "\xa1\xa1".force_encoding('euc-jp')     # => "\x{A1A1}"
-  Encoding.compatible?(s0, s1)                 # => nil
+  s0 = "\xa1\xa1".force_encoding(Encoding::ISO_8859_1) # => "\xA1\xA1"
+  s1 = "\xa1\xa1".force_encoding(Encoding::EUCJP)      # => "\x{A1A1}"
+  Encoding.compatible?(s0, s1)                         # => nil
 
-=== \String \Encoding
+== \String \Encoding
 
 A Ruby String object has an encoding that is an instance of class \Encoding.
 The encoding may be retrieved by method String#encoding.
 
 The default encoding for a string literal is the script encoding;
-see (Script Encoding)[rdoc-ref:encodings.rdoc@Script+Encoding].
+see {Script Encoding}[rdoc-ref:encodings.rdoc@Script+Encoding].
 
   's'.encoding # => #<Encoding:UTF-8>
 
 The default encoding for a string created with method String.new is:
 
+- For no argument, ASCII-8BIT.
 - For a \String object argument, the encoding of that string.
 - For a string literal, the script encoding;
   see {Script Encoding}[rdoc-ref:encodings.rdoc@Script+Encoding].
 
 In either case, any encoding may be specified:
 
-  s = String.new(encoding: 'UTF-8')             # => ""
-  s.encoding                                    # => #<Encoding:UTF-8>
-  s = String.new('foo', encoding: 'ASCII-8BIT') # => "foo"
-  s.encoding                                    # => #<Encoding:ASCII-8BIT>
+  s = String.new(encoding: Encoding::UTF_8)         # => ""
+  s.encoding                                        # => #<Encoding:UTF-8>
+  s = String.new('foo', encoding: Encoding::BINARY) # => "foo"
+  s.encoding                                        # => #<Encoding:BINARY (ASCII-8BIT)>
 
 The encoding for a string may be changed:
 
-  s = "R\xC3\xA9sum\xC3\xA9"     # => "Résumé"
-  s.encoding                     # => #<Encoding:UTF-8>
-  s.force_encoding('ISO-8859-1') # => "R\xC3\xA9sum\xC3\xA9"
-  s.encoding                     # => #<Encoding:ISO-8859-1>
+  s = "R\xC3\xA9sum\xC3\xA9"              # => "Résumé"
+  s.encoding                              # => #<Encoding:UTF-8>
+  s.force_encoding(Encoding::ISO_8859_1)  # => "R\xC3\xA9sum\xC3\xA9"
+  s.encoding                              # => #<Encoding:ISO-8859-1>
 
 Changing the assigned encoding does not alter the content of the string;
 it changes only the way the content is to be interpreted:
 
-  s                         # => "R\xC3\xA9sum\xC3\xA9"
-  s.force_encoding('UTF-8') # => "Résumé"
+  s                                 # => "R\xC3\xA9sum\xC3\xA9"
+  s.force_encoding(Encoding::UTF_8) # => "Résumé"
 
 The actual content of a string may also be altered;
 see {Transcoding a String}[#label-Transcoding+a+String].
 
 Here are a couple of useful query methods:
 
-  s = "abc".force_encoding("UTF-8")         # => "abc"
-  s.ascii_only?                             # => true
-  s = "abc\u{6666}".force_encoding("UTF-8") # => "abc晦"
-  s.ascii_only?                             # => false
+  s = "abc".force_encoding(Encoding::UTF_8)         # => "abc"
+  s.ascii_only?                                     # => true
+  s = "abc\u{6666}".force_encoding(Encoding::UTF_8) # => "abc晦"
+  s.ascii_only?                                     # => false
 
-  s = "\xc2\xa1".force_encoding("UTF-8") # => "¡"
-  s.valid_encoding?                      # => true
-  s = "\xc2".force_encoding("UTF-8")     # => "\xC2"
-  s.valid_encoding?                      # => false
+  s = "\xc2\xa1".force_encoding(Encoding::UTF_8)    # => "¡"
+  s.valid_encoding?                                 # => true
+  s = "\xc2".force_encoding(Encoding::UTF_8)        # => "\xC2"
+  s.valid_encoding?                                 # => false
 
-=== \Symbol and \Regexp Encodings
+== \Symbol and \Regexp Encodings
 
 The string stored in a Symbol or Regexp object also has an encoding;
 the encoding may be retrieved by method Symbol#encoding or Regexp#encoding.
@@ -194,20 +195,20 @@ The default encoding for these, however, is:
 - The script encoding, otherwise;
   see (Script Encoding)[rdoc-ref:encodings.rdoc@Script+Encoding].
 
-=== Filesystem \Encoding
+== Filesystem \Encoding
 
 The filesystem encoding is the default \Encoding for a string from the filesystem:
 
     Encoding.find("filesystem") # => #<Encoding:UTF-8>
 
-=== Locale \Encoding
+== Locale \Encoding
 
 The locale encoding is the default encoding for a string from the environment,
 other than from the filesystem:
 
   Encoding.find('locale') # => #<Encoding:IBM437>
 
-=== Stream Encodings
+== Stream Encodings
 
 Certain stream objects can have two encodings; these objects include instances of:
 
@@ -222,7 +223,7 @@ The two encodings are:
 - An _internal_ _encoding_, which (if not +nil+) specifies the encoding
   to be used for the string constructed from the stream.
 
-==== External \Encoding
+=== External \Encoding
 
 The external encoding, which is an \Encoding object, specifies how bytes read
 from the stream are to be interpreted as characters.
@@ -248,9 +249,9 @@ For an \IO or \File object, the external encoding may be set by:
 
 For an \IO, \File, \ARGF, or \StringIO object, the external encoding may be set by:
 
-- \Methods +set_encoding+ or (except for \ARGF) +set_encoding_by_bom+.
+- Methods +set_encoding+ or (except for \ARGF) +set_encoding_by_bom+.
 
-==== Internal \Encoding
+=== Internal \Encoding
 
 The internal encoding, which is an \Encoding object or +nil+,
 specifies how characters read from the stream
@@ -274,9 +275,9 @@ For an \IO or \File object, the internal encoding may be set by:
 
 For an \IO, \File, \ARGF, or \StringIO object, the internal encoding may be set by:
 
-- \Method +set_encoding+.
+- Method +set_encoding+.
 
-=== Script \Encoding
+== Script \Encoding
 
 A Ruby script has a script encoding, which may be retrieved by:
 
@@ -291,7 +292,7 @@ followed by a colon, space and the Encoding name or alias:
   # encoding: ISO-8859-1
   __ENCODING__ #=> #<Encoding:ISO-8859-1>
 
-=== Transcoding
+== Transcoding
 
 _Transcoding_ is the process of changing a sequence of characters
 from one encoding to another.
@@ -302,7 +303,7 @@ but the bytes that represent them may change.
 The handling for characters that cannot be represented in the destination encoding
 may be specified by @Encoding+Options.
 
-==== Transcoding a \String
+=== Transcoding a \String
 
 Each of these methods transcodes a string:
 
@@ -317,7 +318,7 @@ Each of these methods transcodes a string:
 - String#unicode_normalize!: Like String#unicode_normalize,
   but transcodes +self+ in place.
 
-=== Transcoding a Stream
+== Transcoding a Stream
 
 Each of these methods may transcode a stream;
 whether it does so depends on the external and internal encodings:
@@ -336,8 +337,8 @@ then reads the file into a new string, encoding it as UTF-8:
 
   s = "R\u00E9sum\u00E9"
   path = 't.tmp'
-  ext_enc = 'ISO-8859-1'
-  int_enc = 'UTF-8'
+  ext_enc = Encoding::ISO_8859_1
+  int_enc = Encoding::UTF_8
 
   File.write(path, s, external_encoding: ext_enc)
   raw_text = File.binread(path)
@@ -352,7 +353,7 @@ Output:
   "R\xE9sum\xE9"
   "Résumé"
 
-=== \Encoding Options
+== \Encoding Options
 
 A number of methods in the Ruby core accept keyword arguments as encoding options.
 
@@ -372,8 +373,8 @@ These keyword-value pairs specify encoding options:
   Examples:
 
     s = "\x80foo\x80"
-    s.encode('ISO-8859-3') # Raises Encoding::InvalidByteSequenceError.
-    s.encode('ISO-8859-3', invalid: :replace) # => "?foo?"
+    s.encode(Encoding::ISO_8859_3) # Raises Encoding::InvalidByteSequenceError.
+    s.encode(Encoding::ISO_8859_3, invalid: :replace) # => "?foo?"
 
 - For an undefined character:
 
@@ -384,8 +385,8 @@ These keyword-value pairs specify encoding options:
   Examples:
 
     s = "\x80foo\x80"
-    "\x80".encode('UTF-8', 'ASCII-8BIT') # Raises Encoding::UndefinedConversionError.
-    s.encode('UTF-8', 'ASCII-8BIT', undef: :replace) # => "�foo�"
+    "\x80".encode(Encoding::UTF_8, Encoding::BINARY) # Raises Encoding::UndefinedConversionError.
+    s.encode(Encoding::UTF_8, Encoding::BINARY, undef: :replace) # => "�foo�"
 
 
 - Replacement string:
@@ -399,7 +400,7 @@ These keyword-value pairs specify encoding options:
 
     s = "\xA5foo\xA5"
     options = {:undef => :replace, :replace => 'xyzzy'}
-    s.encode('UTF-8', 'ISO-8859-3', **options) # => "xyzzyfooxyzzy"
+    s.encode(Encoding::UTF_8, Encoding::ISO_8859_3, **options) # => "xyzzyfooxyzzy"
 
 - Replacement fallback:
 
@@ -419,12 +420,12 @@ These keyword-value pairs specify encoding options:
 
     hash = {"\u3042" => 'xyzzy'}
     hash.default = 'XYZZY'
-    s.encode('ASCII', fallback: h) # => "xyzzyfooXYZZY"
+    s.encode(Encoding::US_ASCII, fallback: hash) # => "xyzzyfooXYZZY"
 
     def (fallback = "U+%.4X").escape(x)
       self % x.unpack("U")
     end
-    "\u{3042}".encode("US-ASCII", fallback: fallback.method(:escape)) # => "U+3042"
+    "\u{3042}".encode(Encoding::US_ASCII, fallback: fallback.method(:escape)) # => "U+3042"
 
     proc = Proc.new {|x| x == "\u3042" ? 'xyzzy' : 'XYZZY' }
     s.encode('ASCII', fallback: proc) # => "XYZZYfooXYZZY"
@@ -457,8 +458,8 @@ These keyword-value pairs specify encoding options:
   Examples:
 
     s = 'foo"<&>"bar' + "\u3042"
-    s.encode('ASCII', xml: :text) # => "foo\"&lt;&amp;&gt;\"bar&#x3042;"
-    s.encode('ASCII', xml: :attr) # => "\"foo&quot;&lt;&amp;&gt;&quot;bar&#x3042;\""
+    s.encode(Encoding::US_ASCII, xml: :text) # => "foo\"&lt;&amp;&gt;\"bar&#x3042;"
+    s.encode(Encoding::US_ASCII, xml: :attr) # => "\"foo&quot;&lt;&amp;&gt;&quot;bar&#x3042;\""
 
 
 - Newlines:
@@ -475,7 +476,7 @@ These keyword-value pairs specify encoding options:
 
   Examples:
 
-    s = "\n \r \r\n"                           # => "\n \r \r\n"
-    s.encode('ASCII', cr_newline: true)        # => "\r \r \r\r"
-    s.encode('ASCII', crlf_newline: true)      # => "\r\n \r \r\r\n"
-    s.encode('ASCII', universal_newline: true) # => "\n \n \n"
+    s = "\n \r \r\n"                                      # => "\n \r \r\n"
+    s.encode(Encoding::US_ASCII, cr_newline: true)        # => "\r \r \r\r"
+    s.encode(Encoding::US_ASCII, crlf_newline: true)      # => "\r\n \r \r\r\n"
+    s.encode(Encoding::US_ASCII, universal_newline: true) # => "\n \n \n"
diff --git a/doc/exceptions.md b/doc/exceptions.md
new file mode 100644
index 00000000000000..2c47455911376f
--- /dev/null
+++ b/doc/exceptions.md
@@ -0,0 +1,521 @@
+# Exceptions
+
+Ruby code can raise exceptions.
+
+Most often, a raised exception is meant to alert the running program
+that an unusual (i.e., _exceptional_) situation has arisen,
+and may need to be handled.
+
+Code throughout the Ruby core, Ruby standard library, and Ruby gems generates exceptions
+in certain circumstances:
+
+```rb
+File.open('nope.txt') # Raises Errno::ENOENT: "No such file or directory"
+```
+
+## Raised Exceptions
+
+A raised exception transfers program execution, one way or another.
+
+### Unrescued Exceptions
+
+If an exception not _rescued_
+(see [Rescued Exceptions](#label-Rescued+Exceptions) below),
+execution transfers to code in the Ruby interpreter
+that prints a message and exits the program (or thread):
+
+```console
+$ ruby -e "raise"
+-e:1:in '<main>': unhandled exception
+```
+
+### Rescued Exceptions
+
+An <i>exception handler</i> may determine what is to happen
+when an exception is raised;
+the handler may _rescue_ an exception,
+and may prevent the program from exiting.
+
+A simple example:
+
+```rb
+begin
+  raise 'Boom!'                # Raises an exception, transfers control.
+  puts 'Will not get here.'
+rescue
+  puts 'Rescued an exception.' # Control transferred to here; program does not exit.
+end
+puts 'Got here.'
+```
+
+Output:
+
+```
+Rescued an exception.
+Got here.
+```
+
+An exception handler has several elements:
+
+| Element                     | Use                                                                                      |
+|-----------------------------|------------------------------------------------------------------------------------------|
+| Begin clause.               | Begins the handler and contains the code whose raised exception, if any, may be rescued. |
+| One or more rescue clauses. | Each contains "rescuing" code, which is to be executed for certain exceptions.           |
+| Else clause (optional).     | Contains code to be executed if no exception is raised.                                  |
+| Ensure clause (optional).   | Contains code to be executed whether or not an exception is raised, or is rescued.       |
+| <tt>end</tt> statement.     | Ends the handler.  `                                                                     |
+
+#### Begin Clause
+
+The begin clause begins the exception handler:
+
+- May start with a `begin` statement;
+  see also [Begin-Less Exception Handlers](#label-Begin-Less+Exception+Handlers).
+- Contains code whose raised exception (if any) is covered
+  by the handler.
+- Ends with the first following `rescue` statement.
+
+#### Rescue Clauses
+
+A rescue clause:
+
+- Starts with a `rescue` statement.
+- Contains code that is to be executed for certain raised exceptions.
+- Ends with the first following `rescue`,
+  `else`, `ensure`, or `end` statement.
+
+##### Rescued Exceptions
+
+A `rescue` statement may include one or more classes
+that are to be rescued;
+if none is given, StandardError is assumed.
+
+The rescue clause rescues both the specified class
+(or StandardError if none given) or any of its subclasses;
+see [Built-In Exception Class Hierarchy](rdoc-ref:Exception@Built-In+Exception+Class+Hierarchy).
+
+```rb
+begin
+  1 / 0 # Raises ZeroDivisionError, a subclass of StandardError.
+rescue
+  puts "Rescued #{$!.class}"
+end
+```
+
+Output:
+
+```
+Rescued ZeroDivisionError
+```
+
+If the `rescue` statement specifies an exception class,
+only that class (or one of its subclasses) is rescued;
+this example exits with a ZeroDivisionError,
+which was not rescued because it is not ArgumentError or one of its subclasses:
+
+```rb
+begin
+  1 / 0
+rescue ArgumentError
+  puts "Rescued #{$!.class}"
+end
+```
+
+A `rescue` statement may specify multiple classes,
+which means that its code rescues an exception
+of any of the given classes (or their subclasses):
+
+```rb
+begin
+  1 / 0
+rescue FloatDomainError, ZeroDivisionError
+  puts "Rescued #{$!.class}"
+end
+```
+
+##### Multiple Rescue Clauses
+
+An exception handler may contain multiple rescue clauses;
+in that case, the first clause that rescues the exception does so,
+and those before and after are ignored:
+
+```rb
+begin
+  Dir.open('nosuch')
+rescue Errno::ENOTDIR
+  puts "Rescued #{$!.class}"
+rescue Errno::ENOENT
+  puts "Rescued #{$!.class}"
+end
+```
+
+Output:
+
+```
+Rescued Errno::ENOENT
+```
+
+##### Capturing the Rescued \Exception
+
+A `rescue` statement may specify a variable
+whose value becomes the rescued exception
+(an instance of Exception or one of its subclasses:
+
+```rb
+begin
+  1 / 0
+rescue => x
+  puts x.class
+  puts x.message
+end
+```
+
+Output:
+
+```
+ZeroDivisionError
+divided by 0
+```
+
+##### Global Variables
+
+Two read-only global variables always have `nil` value
+except in a rescue clause;
+they're:
+
+- `$!`: contains the rescued exception.
+- `$@`: contains its backtrace.
+
+Example:
+
+```rb
+begin
+  1 / 0
+rescue
+  p $!
+  p $@
+end
+```
+
+Output:
+
+```
+#<ZeroDivisionError: divided by 0>
+["t.rb:2:in 'Integer#/'", "t.rb:2:in '<main>'"]
+```
+
+##### Cause
+
+In a rescue clause, the method Exception#cause returns the previous value of `$!`,
+which may be `nil`;
+elsewhere, the method returns `nil`.
+
+Example:
+
+```rb
+begin
+  raise('Boom 0')
+rescue => x0
+  puts "Exception: #{x0.inspect};  $!: #{$!.inspect};  cause: #{x0.cause.inspect}."
+  begin
+    raise('Boom 1')
+  rescue => x1
+    puts "Exception: #{x1.inspect};  $!: #{$!.inspect};  cause: #{x1.cause.inspect}."
+    begin
+      raise('Boom 2')
+    rescue => x2
+      puts "Exception: #{x2.inspect};  $!: #{$!.inspect};  cause: #{x2.cause.inspect}."
+    end
+  end
+end
+```
+
+Output:
+
+```
+Exception: #<RuntimeError: Boom 0>;  $!: #<RuntimeError: Boom 0>;  cause: nil.
+Exception: #<RuntimeError: Boom 1>;  $!: #<RuntimeError: Boom 1>;  cause: #<RuntimeError: Boom 0>.
+Exception: #<RuntimeError: Boom 2>;  $!: #<RuntimeError: Boom 2>;  cause: #<RuntimeError: Boom 1>.
+```
+
+#### Else Clause
+
+The `else` clause:
+
+- Starts with an `else` statement.
+- Contains code that is to be executed if no exception is raised in the begin clause.
+- Ends with the first following `ensure` or `end` statement.
+
+```rb
+begin
+  puts 'Begin.'
+rescue
+  puts 'Rescued an exception!'
+else
+  puts 'No exception raised.'
+end
+```
+
+Output:
+
+```
+Begin.
+No exception raised.
+```
+
+#### Ensure Clause
+
+The ensure clause:
+
+- Starts with an `ensure` statement.
+- Contains code that is to be executed
+  regardless of whether an exception is raised,
+  and regardless of whether a raised exception is handled.
+- Ends with the first following `end` statement.
+
+```rb
+def foo(boom: false)
+  puts 'Begin.'
+  raise 'Boom!' if boom
+rescue
+  puts 'Rescued an exception!'
+else
+  puts 'No exception raised.'
+ensure
+  puts 'Always do this.'
+end
+
+foo(boom: true)
+foo(boom: false)
+```
+
+Output:
+
+```
+Begin.
+Rescued an exception!
+Always do this.
+Begin.
+No exception raised.
+Always do this.
+```
+
+#### End Statement
+
+The `end` statement ends the handler.
+
+Code following it is reached only if any raised exception is rescued.
+
+#### Begin-Less \Exception Handlers
+
+As seen above, an exception handler may be implemented with `begin` and `end`.
+
+An exception handler may also be implemented as:
+
+- A method body:
+
+    ```rb
+    def foo(boom: false) # Serves as beginning of exception handler.
+      puts 'Begin.'
+      raise 'Boom!' if boom
+    rescue
+      puts 'Rescued an exception!'
+    else
+      puts 'No exception raised.'
+    end                  # Serves as end of exception handler.
+    ```
+
+- A block:
+
+    ```rb
+    Dir.chdir('.') do |dir| # Serves as beginning of exception handler.
+      raise 'Boom!'
+    rescue
+      puts 'Rescued an exception!'
+    end                     # Serves as end of exception handler.
+    ```
+
+#### Re-Raising an \Exception
+
+It can be useful to rescue an exception, but allow its eventual effect;
+for example, a program can rescue an exception, log data about it,
+and then "reinstate" the exception.
+
+This may be done via the `raise` method, but in a special way;
+a rescuing clause:
+
+  - Captures an exception.
+  - Does whatever is needed concerning the exception (such as logging it).
+  - Calls method `raise` with no argument,
+    which raises the rescued exception:
+
+```rb
+begin
+  1 / 0
+rescue ZeroDivisionError
+  # Do needful things (like logging).
+  raise # Raised exception will be ZeroDivisionError, not RuntimeError.
+end
+```
+
+Output:
+
+```
+ruby t.rb
+t.rb:2:in 'Integer#/': divided by 0 (ZeroDivisionError)
+    from t.rb:2:in '<main>'
+```
+
+#### Retrying
+
+It can be useful to retry a begin clause;
+for example, if it must access a possibly-volatile resource
+(such as a web page),
+it can be useful to try the access more than once
+(in the hope that it may become available):
+
+```rb
+retries = 0
+begin
+  puts "Try ##{retries}."
+  raise 'Boom'
+rescue
+  puts "Rescued retry ##{retries}."
+  if (retries += 1) < 3
+    puts 'Retrying'
+    retry
+  else
+    puts 'Giving up.'
+    raise
+  end
+end
+```
+
+```
+Try #0.
+Rescued retry #0.
+Retrying
+Try #1.
+Rescued retry #1.
+Retrying
+Try #2.
+Rescued retry #2.
+Giving up.
+# RuntimeError ('Boom') raised.
+```
+
+Note that the retry re-executes the entire begin clause,
+not just the part after the point of failure.
+
+## Raising an \Exception
+
+Method Kernel#raise raises an exception.
+
+## Custom Exceptions
+
+To provide additional or alternate information,
+you may create custom exception classes.
+Each should be a subclass of one of the built-in exception classes
+(commonly StandardError or RuntimeError);
+see [Built-In Exception Class Hierarchy](rdoc-ref:Exception@Built-In+Exception+Class+Hierarchy).
+
+```rb
+class MyException < StandardError; end
+```
+
+## Messages
+
+Every `Exception` object has a message,
+which is a string that is set at the time the object is created;
+see Exception.new.
+
+The message cannot be changed, but you can create a similar object with a different message;
+see Exception#exception.
+
+This method returns the message as defined:
+
+- Exception#message.
+
+Two other methods return enhanced versions of the message:
+
+- Exception#detailed_message: adds exception class name, with optional highlighting.
+- Exception#full_message: adds exception class name and backtrace, with optional highlighting.
+
+Each of the two methods above accepts keyword argument `highlight`;
+if the value of keyword `highlight` is `true`,
+the returned string includes bolding and underlining ANSI codes (see below)
+to enhance the appearance of the message.
+
+Any exception class (Ruby or custom) may choose to override either of these methods,
+and may choose to interpret keyword argument <tt>highlight: true</tt>
+to mean that the returned message should contain
+[ANSI codes](https://en.wikipedia.org/wiki/ANSI_escape_code)
+that specify color, bolding, and underlining.
+
+Because the enhanced message may be written to a non-terminal device
+(e.g., into an HTML page),
+it is best to limit the ANSI codes to these widely-supported codes:
+
+- Begin font color:
+
+    | Color   | ANSI Code        |
+    |---------|------------------|
+    | Red     | <tt>\\e[31m</tt> |
+    | Green   | <tt>\\e[32m</tt> |
+    | Yellow  | <tt>\\e[33m</tt> |
+    | Blue    | <tt>\\e[34m</tt> |
+    | Magenta | <tt>\\e[35m</tt> |
+    | Cyan    | <tt>\\e[36m</tt> |
+
+<br>
+
+- Begin font attribute:
+
+    | Attribute | ANSI Code       |
+    |-----------|-----------------|
+    | Bold      | <tt>\\e[1m</tt> |
+    | Underline | <tt>\\e[4m</tt> |
+
+<br>
+
+- End all of the above:
+
+    | Color | ANSI Code       |
+    |-------|-----------------|
+    | Reset | <tt>\\e[0m</tt> |
+
+It's also best to craft a message that is conveniently human-readable,
+even if the ANSI codes are included "as-is"
+(rather than interpreted as font directives).
+
+## Backtraces
+
+A _backtrace_ is a record of the methods currently
+in the [call stack](https://en.wikipedia.org/wiki/Call_stack);
+each such method has been called, but has not yet returned.
+
+These methods return backtrace information:
+
+- Exception#backtrace: returns the backtrace as an array of strings or `nil`.
+- Exception#backtrace_locations: returns the backtrace as an array
+  of Thread::Backtrace::Location objects or `nil`.
+  Each Thread::Backtrace::Location object gives detailed information about a called method.
+
+By default, Ruby sets the backtrace of the exception to the location where it
+was raised.
+
+The developer might adjust this by either providing +backtrace+ argument
+to Kernel#raise, or using Exception#set_backtrace.
+
+Note that:
+
+- by default, both +backtrace+ and +backtrace_locations+ represent the same backtrace;
+- if the developer sets the backtrace by one of the above methods to an array of
+  Thread::Backtrace::Location, they still represent the same backtrace;
+- if the developer sets the backtrace to a string or an array of strings:
+  - by Kernel#raise: +backtrace_locations+ become +nil+;
+  - by Exception#set_backtrace: +backtrace_locations+ preserve the original
+    value;
+- if the developer sets the backtrace to +nil+ by Exception#set_backtrace,
+  +backtrace_locations+ preserve the original value; but if the exception is then
+  reraised, both +backtrace+ and +backtrace_locations+ become the location of reraise.
diff --git a/doc/extension.ja.rdoc b/doc/extension.ja.rdoc
index bde907c9168b9f..2f7856f3d439df 100644
--- a/doc/extension.ja.rdoc
+++ b/doc/extension.ja.rdoc
@@ -780,9 +780,14 @@ RUBY_TYPED_WB_PROTECTED ::
   メソッドの実装に適切にライトバリアを挿入する責任があります．
   さもなくばRubyは実行時にクラッシュする可能性があります．
 
-  ライトバリアについてはdoc/extension.ja.rdocのAppendix D
-  "世代別GC"も参照してください．
+  ライトバリアについては{世代別
+  GC}[rdoc-ref:@Appendix+D.+-E4-B8-96-E4-BB-A3-E5-88-A5GC]
+  も参照してください．
 
+このマクロは例外を発生させる可能性があることに注意してくださ
+い． ラップされる sval が，解放する必要があるリソース (割り
+当てられたメモリ，外部ライブラリからのハンドルなど) を保持し
+ている場合は，rb_protect を使用する必要があります．
 
 Cの構造体の割当と対応するオブジェクトの生成を同時に行うマク
 ロとして以下のものが提供されています．
@@ -1731,7 +1736,7 @@ have_func(func, header) ::
   ックする．funcが標準ではリンクされないライブラリ内のもので
   ある時には先にhave_libraryでそのライブラリをチェックしてお
   く事．チェックに成功すると，プリプロセッサマクロ
-  `HAVE_{FUNC}` を定義し，trueを返す．
+  <tt>HAVE_{FUNC}</tt> を定義し，trueを返す．
 
 have_var(var, header) ::
 
@@ -1739,44 +1744,44 @@ have_var(var, header) ::
   クする．varが標準ではリンクされないライブラリ内のものであ
   る時には先にhave_libraryでそのライブラリをチェックしておく
   事．チェックに成功すると，プリプロセッサマクロ
-  `HAVE_{VAR}` を定義し，trueを返す．
+  <tt>HAVE_{VAR}</tt> を定義し，trueを返す．
 
 have_header(header) ::
 
   ヘッダファイルの存在をチェックする．チェックに成功すると，
-  プリプロセッサマクロ `HAVE_{HEADER_H}` を定義し，trueを返す．
+  プリプロセッサマクロ <tt>HAVE_{HEADER_H}</tt> を定義し，trueを返す．
   (スラッシュやドットはアンダースコアに置換される)
 
 find_header(header, path...) ::
 
   ヘッダファイルheaderの存在を -Ipath を追加しながらチェック
   する．チェックに成功すると，プリプロセッサマクロ
-  `HAVE_{HEADER_H}` を定義し，trueを返す．
+  <tt>HAVE_{HEADER_H}</tt> を定義し，trueを返す．
   (スラッシュやドットはアンダースコアに置換される)
 
 have_struct_member(type, member[, header[, opt]]) ::
 
   ヘッダファイルheaderをインクルードして型typeが定義され，
   なおかつメンバmemberが存在するかをチェックする．チェックに
-  成功すると，プリプロセッサマクロ `HAVE_{TYPE}_{MEMBER}` を
+  成功すると，プリプロセッサマクロ <tt>HAVE_{TYPE}_{MEMBER}</tt> を
   定義し，trueを返す．
 
 have_type(type, header, opt) ::
 
   ヘッダファイルheaderをインクルードして型typeが存在するかを
   チェックする．チェックに成功すると，プリプロセッサマクロ
-  `HAVE_TYPE_{TYPE}` を定義し，trueを返す．
+  <tt>HAVE_TYPE_{TYPE}</tt> を定義し，trueを返す．
 
 check_sizeof(type, header) ::
 
   ヘッダファイルheaderをインクルードして型typeのchar単位サイ
   ズを調べる．チェックに成功すると，プリプロセッサマクロ
-  `SIZEOF_{TYPE}` を定義し，そのサイズを返す．定義されていな
+  <tt>SIZEOF_{TYPE}</tt> を定義し，そのサイズを返す．定義されていな
   いときはnilを返す．
 
-append_cppflags(array-of-flags[, opt])
-append_cflags(array-of-flags[, opt])
-append_ldflags(array-of-flags[, opt])
+append_cppflags(array-of-flags[, opt]) ::
+append_cflags(array-of-flags[, opt]) ::
+append_ldflags(array-of-flags[, opt]) ::
 
   各flagが使用可能であれば，それぞれ$CPPFLAGS, $CFLAGS,
   $LDFLAGSに追加する．コンパイラのフラグには移植性がないので，
@@ -1850,8 +1855,9 @@ RGenGCは，過去の拡張ライブラリに（ほぼ）互換性を保つよ
 スするようなコードは書かないようにして下さい．代わりに，rb_ary_aref(),
 rb_ary_store() などの，適切な API 関数を利用するようにして下さい．
 
-そのほか，対応についての詳細は extension.rdoc の「Appendix D. Generational
-GC」を参照して下さい．
+そのほか，対応についての詳細は {Appendix D. Generational
+GC}[rdoc-ref:extension.rdoc@Appendix+D.+Generational+GC]を参
+照して下さい．
 
 == Appendix E. Ractor サポート
 
@@ -1860,10 +1866,12 @@ Ruby 3.0 から、Ruby プログラムを並列に実行するための仕組み
 なります。サポートしていないライブラリは、メイン Ractor 以外で実行すると
 エラーになります（Ractor::UnsafeError）。
 
-Ractor をサポートするための詳細は、extension.rdoc の「Appendix F. Ractor
-support」を参照してください。
+Ractor をサポートするための詳細は、{Appendix F. Ractor
+support}[rdoc-ref:extension.rdoc@Appendix+F.+Ractor+support]
+を参照してください。
 
-
-:enddoc: Local variables:
-:enddoc: fill-column: 60
-:enddoc: end:
+--
+Local variables:
+fill-column: 60
+end:
+++
diff --git a/doc/extension.rdoc b/doc/extension.rdoc
index 50892725999ae8..ba59d107ab4c84 100644
--- a/doc/extension.rdoc
+++ b/doc/extension.rdoc
@@ -747,18 +747,24 @@ RUBY_TYPED_WB_PROTECTED ::
   barriers in all implementations of methods of that object as
   appropriate. Otherwise Ruby might crash while running.
 
-  More about write barriers can be found in "Generational GC" in
-  Appendix D.
+  More about write barriers can be found in {Generational
+  GC}[rdoc-ref:@Appendix+D.+Generational+GC].
 
 RUBY_TYPED_FROZEN_SHAREABLE ::
 
-  This flag indicates that the object is shareable object
-  if the object is frozen. See Appendix F more details.
+  This flag indicates that the object is shareable object if the object
+  is frozen. See {Ractor support}[rdoc-ref:@Appendix+F.+Ractor+support]
+  more details.
 
   If this flag is not set, the object can not become a shareable
   object by Ractor.make_shareable() method.
 
-You can allocate and wrap the structure in one step.
+Note that this macro can raise an exception.  If sval to be wrapped
+holds a resource needs to be released (e.g., allocated memory, handle
+from an external library, and etc), you will have to use rb_protect.
+
+You can allocate and wrap the structure in one step, in more
+preferable manner.
 
   TypedData_Make_Struct(klass, type, data_type, sval)
 
@@ -767,6 +773,10 @@ the structure, which is also allocated.  This macro works like:
 
   (sval = ZALLOC(type), TypedData_Wrap_Struct(klass, data_type, sval))
 
+However, you should use this macro instead of "allocation then wrap"
+like the above code if it is simply allocated, because the latter can
+raise a NoMemoryError and sval will be memory leaked in that case.
+
 Arguments klass and data_type work like their counterparts in
 TypedData_Wrap_Struct().  A pointer to the allocated structure will
 be assigned to sval, which should be a pointer of the type specified.
@@ -779,26 +789,26 @@ approach to marking and reference updating is provided, by declaring offset
 references to the VALUES in your struct.
 
 Doing this allows the Ruby GC to support marking these references and GC
-compaction without the need to define the `dmark` and `dcompact` callbacks.
+compaction without the need to define the +dmark+ and +dcompact+ callbacks.
 
 You must define a static list of VALUE pointers to the offsets within your
 struct where the references are located, and set the "data" member to point to
-this reference list. The reference list must end with `END_REFS`
+this reference list. The reference list must end with +RUBY_END_REFS+.
 
 Some Macros have been provided to make edge referencing easier:
 
-* <code>RUBY_TYPED_DECL_MARKING</code> =A flag that can be set on the `ruby_data_type_t` to indicate that references are being declared as edges.
+* <code>RUBY_TYPED_DECL_MARKING</code> =A flag that can be set on the +ruby_data_type_t+ to indicate that references are being declared as edges.
 
-* <code>RUBY_REFERENCES_START(ref_list_name)</code> - Define `ref_list_name` as a list of references
+* <code>RUBY_REFERENCES(ref_list_name)</code> - Define _ref_list_name_ as a list of references
 
-* <code>RUBY_REFERENCES_END</code> - Mark the end of the references list. This will take care of terminating the list correctly
+* <code>RUBY_REF_END</code> - The end mark of the references list.
 
-* <code>RUBY_REF_EDGE\(struct, member\)</code> - Declare `member` as a VALUE edge from `struct`. Use this after `RUBY_REFERENCES_START`
+* <code>RUBY_REF_EDGE(struct, member)</code> - Declare _member_ as a VALUE edge from _struct_. Use this after +RUBY_REFERENCES_START+
 
-* +REFS_LIST_PTR+ - Coerce the reference list into a format that can be
-  accepted by the existing `dmark` interface.
+* +RUBY_REFS_LIST_PTR+ - Coerce the reference list into a format that can be
+  accepted by the existing +dmark+ interface.
 
-The example below is from `Dir` (defined in `dir.c`)
+The example below is from Dir (defined in +dir.c+)
 
   // The struct being wrapped. Notice this contains 3 members of which the second
   // is a VALUE reference to another ruby object.
@@ -808,18 +818,19 @@ The example below is from `Dir` (defined in `dir.c`)
       rb_encoding *enc;
   }
 
-  // Define a reference list `dir_refs` containing a single entry to `path`, and
-  // terminating with RUBY_REF_END
-  RUBY_REFERENCES_START(dir_refs)
-      REF_EDGE(dir_data, path),
-  RUBY_REFERENCES_END
+  // Define a reference list `dir_refs` containing a single entry to `path`.
+  // Needs terminating with RUBY_REF_END
+  RUBY_REFERENCES(dir_refs) = {
+      RUBY_REF_EDGE(dir_data, path),
+      RUBY_REF_END
+  };
 
   // Override the "dmark" field with the defined reference list now that we
   // no longer need a marking callback and add RUBY_TYPED_DECL_MARKING to the
   // flags field
   static const rb_data_type_t dir_data_type = {
       "dir",
-      {REFS_LIST_PTR(dir_refs), dir_free, dir_memsize,},
+      {RUBY_REFS_LIST_PTR(dir_refs), dir_free, dir_memsize,},
       0, NULL, RUBY_TYPED_WB_PROTECTED | RUBY_TYPED_FREE_IMMEDIATELY | RUBY_TYPED_DECL_MARKING
   };
 
@@ -2208,70 +2219,72 @@ Ractor safety around C extensions has the following properties:
 
 To make a "Ractor-safe" C extension, we need to check the following points:
 
-(1) Do not share unshareable objects between ractors
+1. Do not share unshareable objects between ractors
 
-For example, C's global variable can lead sharing an unshareable objects
-between ractors.
+   For example, C's global variable can lead sharing an unshareable objects
+   between ractors.
 
-  VALUE g_var;
-  VALUE set(VALUE self, VALUE v){ return g_var = v; }
-  VALUE get(VALUE self){ return g_var; }
+     VALUE g_var;
+     VALUE set(VALUE self, VALUE v){ return g_var = v; }
+     VALUE get(VALUE self){ return g_var; }
 
-set() and get() pair can share an unshareable objects using g_var, and
-it is Ractor-unsafe.
+   set() and get() pair can share an unshareable objects using g_var, and
+   it is Ractor-unsafe.
 
-Not only using global variables directly, some indirect data structure
-such as global st_table can share the objects, so please take care.
+   Not only using global variables directly, some indirect data structure
+   such as global st_table can share the objects, so please take care.
 
-Note that class and module objects are shareable objects, so you can
-keep the code "cFoo = rb_define_class(...)" with C's global variables.
+   Note that class and module objects are shareable objects, so you can
+   keep the code "cFoo = rb_define_class(...)" with C's global variables.
 
-(2) Check the thread-safety of the extension
+2. Check the thread-safety of the extension
 
-An extension should be thread-safe. For example, the following code is
-not thread-safe:
+   An extension should be thread-safe. For example, the following code is
+   not thread-safe:
 
-  bool g_called = false;
-  VALUE call(VALUE self) {
-    if (g_called) rb_raise("recursive call is not allowed.");
-    g_called = true;
-    VALUE ret = do_something();
-    g_called = false;
-    return ret;
-  }
+     bool g_called = false;
+     VALUE call(VALUE self) {
+       if (g_called) rb_raise("recursive call is not allowed.");
+       g_called = true;
+       VALUE ret = do_something();
+       g_called = false;
+       return ret;
+     }
 
-because g_called global variable should be synchronized by other
-ractor's threads. To avoid such data-race, some synchronization should
-be used. Check include/ruby/thread_native.h and include/ruby/atomic.h.
+   because g_called global variable should be synchronized by other
+   ractor's threads. To avoid such data-race, some synchronization should
+   be used. Check include/ruby/thread_native.h and include/ruby/atomic.h.
 
-With Ractors, all objects given as method parameters and the receiver (self)
-are guaranteed to be from the current Ractor or to be shareable. As a
-consequence, it is easier to make code ractor-safe than to make code generally
-thread-safe. For example, we don't need to lock an array object to access the
-element of it.
+   With Ractors, all objects given as method parameters and the receiver (self)
+   are guaranteed to be from the current Ractor or to be shareable. As a
+   consequence, it is easier to make code ractor-safe than to make code generally
+   thread-safe. For example, we don't need to lock an array object to access the
+   element of it.
 
-(3) Check the thread-safety of any used library
+3. Check the thread-safety of any used library
 
-If the extension relies on an external library, such as a function foo() from
-a library libfoo, the function libfoo foo() should be thread safe.
+   If the extension relies on an external library, such as a function foo() from
+   a library libfoo, the function libfoo foo() should be thread safe.
 
-(4) Make an object shareable
+4. Make an object shareable
 
-This is not required to make an extension Ractor-safe.
+   This is not required to make an extension Ractor-safe.
 
-If an extension provides special objects defined by rb_data_type_t,
-consider these objects can become shareable or not.
+   If an extension provides special objects defined by rb_data_type_t,
+   consider these objects can become shareable or not.
 
-RUBY_TYPED_FROZEN_SHAREABLE flag indicates that these objects can be
-shareable objects if the object is frozen. This means that if the object
-is frozen, the mutation of wrapped data is not allowed.
+   RUBY_TYPED_FROZEN_SHAREABLE flag indicates that these objects can be
+   shareable objects if the object is frozen. This means that if the object
+   is frozen, the mutation of wrapped data is not allowed.
 
-(5) Others
+5. Others
 
-There are possibly other points or requirements which must be considered in the
-making of a Ractor-safe extension.  This document will be extended as they are
-discovered.
+   There are possibly other points or requirements which must be considered in the
+   making of a Ractor-safe extension.  This document will be extended as they are
+   discovered.
 
-:enddoc: Local variables:
-:enddoc: fill-column: 70
-:enddoc: end:
+--
+Local variables:
+fill-column: 70
+end:
+++
diff --git a/doc/fiber.md b/doc/fiber.md
index a334faf7396187..d9011cce2f2bbd 100644
--- a/doc/fiber.md
+++ b/doc/fiber.md
@@ -6,7 +6,7 @@ Fibers provide a mechanism for cooperative concurrency.
 
 Fibers execute a user-provided block. During the execution, the block may call `Fiber.yield` or `Fiber.transfer` to switch to another fiber. `Fiber#resume` is used to continue execution from the point where `Fiber.yield` was called.
 
-``` ruby
+```rb
 #!/usr/bin/env ruby
 
 puts "1: Start program."
@@ -38,13 +38,13 @@ instrumentation.
 
 To set the scheduler for the current thread:
 
-``` ruby
+```rb
 Fiber.set_scheduler(MyScheduler.new)
 ```
 
 When the thread exits, there is an implicit call to `set_scheduler`:
 
-``` ruby
+```rb
 Fiber.set_scheduler(nil)
 ```
 
@@ -60,7 +60,7 @@ no changes.
 
 This is the interface you need to implement.
 
-``` ruby
+```rb
 class Scheduler
   # Wait for the specified process ID to exit.
   # This hook is optional.
@@ -166,7 +166,7 @@ program.
 
 Fibers can be used to create non-blocking execution contexts.
 
-``` ruby
+```rb
 Fiber.new do
   puts Fiber.current.blocking? # false
 
@@ -184,7 +184,7 @@ end.resume
 We also introduce a new method which simplifies the creation of these
 non-blocking fibers:
 
-``` ruby
+```rb
 Fiber.schedule do
   puts Fiber.current.blocking? # false
 end
@@ -196,7 +196,7 @@ fibers.
 
 You can also create blocking execution contexts:
 
-``` ruby
+```rb
 Fiber.new(blocking: true) do
   # Won't use the scheduler:
   sleep(n)
@@ -212,6 +212,64 @@ I/O. Windows is a notable example where socket I/O can be non-blocking but pipe
 I/O is blocking. Provided that there *is* a scheduler and the current thread *is
 non-blocking*, the operation will invoke the scheduler.
 
+##### `IO#close`
+
+Closing an IO interrupts all blocking operations on that IO. When a thread calls `IO#close`, it first attempts to interrupt any threads or fibers that are blocked on that IO. The closing thread waits until all blocked threads and fibers have been properly interrupted and removed from the IO's blocking list. Each interrupted thread or fiber receives an `IOError` and is cleanly removed from the blocking operation. Only after all blocking operations have been interrupted and cleaned up will the actual file descriptor be closed, ensuring proper resource cleanup and preventing potential race conditions.
+
+For fibers managed by a scheduler, the interruption process involves calling `rb_fiber_scheduler_fiber_interrupt` on the scheduler. This allows the scheduler to handle the interruption in a way that's appropriate for its event loop implementation. The scheduler can then notify the fiber, which will receive an `IOError` and be removed from the blocking operation. This mechanism ensures that fiber-based concurrency works correctly with IO operations, even when those operations are interrupted by `IO#close`.
+
+```mermaid
+sequenceDiagram
+    participant ThreadB
+    participant ThreadA
+    participant Scheduler
+    participant IO
+    participant Fiber1
+    participant Fiber2
+
+    Note over ThreadA: Thread A has a fiber scheduler
+    activate Scheduler
+    ThreadA->>Fiber1: Schedule Fiber 1
+    activate Fiber1
+    Fiber1->>IO: IO.read
+    IO->>Scheduler: rb_thread_io_blocking_region
+    deactivate Fiber1
+
+    ThreadA->>Fiber2: Schedule Fiber 2
+    activate Fiber2
+    Fiber2->>IO: IO.read
+    IO->>Scheduler: rb_thread_io_blocking_region
+    deactivate Fiber2
+
+    Note over Fiber1,Fiber2: Both fibers blocked on same IO
+
+    Note over ThreadB: IO.close
+    activate ThreadB
+    ThreadB->>IO: thread_io_close_notify_all
+    Note over ThreadB: rb_mutex_sleep
+
+    IO->>Scheduler: rb_fiber_scheduler_fiber_interrupt(Fiber1)
+    Scheduler->>Fiber1: fiber_interrupt with IOError
+    activate Fiber1
+    Note over IO: fiber_interrupt causes removal from blocking list
+    Fiber1->>IO: rb_io_blocking_operation_exit()
+    IO-->>ThreadB: Wakeup thread
+    deactivate Fiber1
+
+    IO->>Scheduler: rb_fiber_scheduler_fiber_interrupt(Fiber2)
+    Scheduler->>Fiber2: fiber_interrupt with IOError
+    activate Fiber2
+    Note over IO: fiber_interrupt causes removal from blocking list
+    Fiber2->>IO: rb_io_blocking_operation_exit()
+    IO-->>ThreadB: Wakeup thread
+    deactivate Fiber2
+    deactivate Scheduler
+
+    Note over ThreadB: Blocking operations list empty
+    ThreadB->>IO: close(fd)
+    deactivate ThreadB
+```
+
 #### Mutex
 
 The `Mutex` class can be used in a non-blocking context and is fiber specific.
diff --git a/doc/format_specifications.rdoc b/doc/format_specifications.rdoc
index e589524f279365..bdfdc249536b36 100644
--- a/doc/format_specifications.rdoc
+++ b/doc/format_specifications.rdoc
@@ -1,4 +1,4 @@
-== Format Specifications
+= Format Specifications
 
 Several Ruby core classes have instance method +printf+ or +sprintf+:
 
@@ -37,12 +37,12 @@ It consists of:
 Except for the leading percent character,
 the only required part is the type specifier, so we begin with that.
 
-=== Type Specifiers
+== Type Specifiers
 
 This section provides a brief explanation of each type specifier.
 The links lead to the details and examples.
 
-==== \Integer Type Specifiers
+=== \Integer Type Specifiers
 
 - +b+ or +B+: Format +argument+ as a binary integer.
   See {Specifiers b and B}[rdoc-ref:format_specifications.rdoc@Specifiers+b+and+B].
@@ -54,7 +54,7 @@ The links lead to the details and examples.
 - +x+ or +X+: Format +argument+ as a hexadecimal integer.
   See {Specifiers x and X}[rdoc-ref:format_specifications.rdoc@Specifiers+x+and+X].
 
-==== Floating-Point Type Specifiers
+=== Floating-Point Type Specifiers
 
 - +a+ or +A+: Format +argument+ as hexadecimal floating-point number.
   See {Specifiers a and A}[rdoc-ref:format_specifications.rdoc@Specifiers+a+and+A].
@@ -65,7 +65,7 @@ The links lead to the details and examples.
 - +g+ or +G+: Format +argument+ in a "general" format.
   See {Specifiers g and G}[rdoc-ref:format_specifications.rdoc@Specifiers+g+and+G].
 
-==== Other Type Specifiers
+=== Other Type Specifiers
 
 - +c+: Format +argument+ as a character.
   See {Specifier c}[rdoc-ref:format_specifications.rdoc@Specifier+c].
@@ -76,7 +76,7 @@ The links lead to the details and examples.
 - <tt>%</tt>: Format +argument+ (<tt>'%'</tt>) as a single percent character.
   See {Specifier %}[rdoc-ref:format_specifications.rdoc@Specifier+-25].
 
-=== Flags
+== Flags
 
 The effect of a flag may vary greatly among type specifiers.
 These remarks are general in nature.
@@ -85,7 +85,7 @@ See {type-specific details}[rdoc-ref:format_specifications.rdoc@Type+Specifier+D
 Multiple flags may be given with single type specifier;
 order does not matter.
 
-==== <tt>' '</tt> Flag
+=== <tt>' '</tt> Flag
 
 Insert a space before a non-negative number:
 
@@ -97,49 +97,49 @@ Insert a minus sign for negative value:
   sprintf('%d', -10)  # => "-10"
   sprintf('% d', -10) # => "-10"
 
-==== <tt>'#'</tt> Flag
+=== <tt>'#'</tt> Flag
 
 Use an alternate format; varies among types:
 
   sprintf('%x', 100)  # => "64"
   sprintf('%#x', 100) # => "0x64"
 
-==== <tt>'+'</tt> Flag
+=== <tt>'+'</tt> Flag
 
 Add a leading plus sign for a non-negative number:
 
   sprintf('%x', 100)  # => "64"
   sprintf('%+x', 100) # => "+64"
 
-==== <tt>'-'</tt> Flag
+=== <tt>'-'</tt> Flag
 
 Left justify the value in its field:
 
   sprintf('%6d', 100)  # => "   100"
   sprintf('%-6d', 100) # => "100   "
 
-==== <tt>'0'</tt> Flag
+=== <tt>'0'</tt> Flag
 
 Left-pad with zeros instead of spaces:
 
   sprintf('%6d', 100)  # => "   100"
   sprintf('%06d', 100) # => "000100"
 
-==== <tt>'*'</tt> Flag
+=== <tt>'*'</tt> Flag
 
 Use the next argument as the field width:
 
   sprintf('%d', 20, 14)  # => "20"
   sprintf('%*d', 20, 14) # => "                  14"
 
-==== <tt>'n$'</tt> Flag
+=== <tt>'n$'</tt> Flag
 
 Format the (1-based) <tt>n</tt>th argument into this field:
 
     sprintf("%s %s", 'world', 'hello')     # => "world hello"
     sprintf("%2$s %1$s", 'world', 'hello') # => "hello world"
 
-=== Width Specifier
+== Width Specifier
 
 In general, a width specifier determines the minimum width (in characters)
 of the formatted field:
@@ -152,7 +152,7 @@ of the formatted field:
   # Ignore if too small.
   sprintf('%1d', 100)   # => "100"
 
-=== Precision Specifier
+== Precision Specifier
 
 A precision specifier is a decimal point followed by zero or more
 decimal digits.
@@ -194,9 +194,9 @@ the number of characters to write:
   sprintf('%s', Time.now)    # => "2022-05-04 11:59:16 -0400"
   sprintf('%.10s', Time.now) # => "2022-05-04"
 
-=== Type Specifier Details and Examples
+== Type Specifier Details and Examples
 
-==== Specifiers +a+ and +A+
+=== Specifiers +a+ and +A+
 
 Format +argument+ as hexadecimal floating-point number:
 
@@ -209,7 +209,7 @@ Format +argument+ as hexadecimal floating-point number:
   sprintf('%A', 4096)      # => "0X1P+12"
   sprintf('%A', -4096)     # => "-0X1P+12"
 
-==== Specifiers +b+ and +B+
+=== Specifiers +b+ and +B+
 
 The two specifiers +b+ and +B+ behave identically
 except when flag <tt>'#'</tt>+ is used.
@@ -226,14 +226,16 @@ Format +argument+ as a binary integer:
   sprintf('%#b', 4)  # => "0b100"
   sprintf('%#B', 4)  # => "0B100"
 
-==== Specifier +c+
+=== Specifier +c+
 
 Format +argument+ as a single character:
 
   sprintf('%c', 'A') # => "A"
   sprintf('%c', 65)  # => "A"
 
-==== Specifier +d+
+This behaves like String#<<, except for raising ArgumentError instead of RangeError.
+
+=== Specifier +d+
 
 Format +argument+ as a decimal integer:
 
@@ -242,7 +244,7 @@ Format +argument+ as a decimal integer:
 
 Flag <tt>'#'</tt> does not apply.
 
-==== Specifiers +e+ and +E+
+=== Specifiers +e+ and +E+
 
 Format +argument+ in
 {scientific notation}[https://en.wikipedia.org/wiki/Scientific_notation]:
@@ -250,7 +252,7 @@ Format +argument+ in
   sprintf('%e', 3.14159)  # => "3.141590e+00"
   sprintf('%E', -3.14159) # => "-3.141590E+00"
 
-==== Specifier +f+
+=== Specifier +f+
 
 Format +argument+ as a floating-point number:
 
@@ -259,7 +261,7 @@ Format +argument+ as a floating-point number:
 
 Flag <tt>'#'</tt> does not apply.
 
-==== Specifiers +g+ and +G+
+=== Specifiers +g+ and +G+
 
 Format +argument+ using exponential form (+e+/+E+ specifier)
 if the exponent is less than -4 or greater than or equal to the precision.
@@ -281,7 +283,7 @@ Otherwise format +argument+ using floating-point form (+f+ specifier):
   sprintf('%#G', 100000000000)  # => "1.00000E+11"
   sprintf('%#G', 0.000000000001)  # => "1.00000E-12"
 
-==== Specifier +o+
+=== Specifier +o+
 
 Format +argument+ as an octal integer.
 If +argument+ is negative, it will be formatted as a two's complement
@@ -296,14 +298,14 @@ prefixed with +..7+:
   sprintf('%#o', 16)  # => "020"
   sprintf('%#o', -16) # => "..760"
 
-==== Specifier +p+
+=== Specifier +p+
 
 Format +argument+ as a string via <tt>argument.inspect</tt>:
 
   t = Time.now
   sprintf('%p', t)   # => "2022-05-01 13:42:07.1645683 -0500"
 
-==== Specifier +s+
+=== Specifier +s+
 
 Format +argument+ as a string via <tt>argument.to_s</tt>:
 
@@ -312,7 +314,7 @@ Format +argument+ as a string via <tt>argument.to_s</tt>:
 
 Flag <tt>'#'</tt> does not apply.
 
-==== Specifiers +x+ and +X+
+=== Specifiers +x+ and +X+
 
 Format +argument+ as a hexadecimal integer.
 If +argument+ is negative, it will be formatted as a two's complement
@@ -329,7 +331,7 @@ prefixed with +..f+:
   # Alternate format for negative value.
   sprintf('%#x', -100) # => "0x..f9c"
 
-==== Specifier <tt>%</tt>
+=== Specifier <tt>%</tt>
 
 Format +argument+ (<tt>'%'</tt>) as a single percent character:
 
@@ -337,7 +339,7 @@ Format +argument+ (<tt>'%'</tt>) as a single percent character:
 
 Flags do not apply.
 
-=== Reference by Name
+== Reference by Name
 
 For more complex formatting, Ruby supports a reference by name.
 %<name>s style uses format style, but %{name} style doesn't.
diff --git a/doc/forwardable.rd.ja b/doc/forwardable.rd.ja
index 171724b2e50d26..53e82025133425 100644
--- a/doc/forwardable.rd.ja
+++ b/doc/forwardable.rd.ja
@@ -1,4 +1,4 @@
-  -- forwatable.rb
+  -- forwardable.rb
                                                 $Release Version: 1.1 $
                                                 $Revision$
 
diff --git a/doc/globals.rdoc b/doc/globals.rdoc
index 1d7cda69f952a6..9466005be76aab 100644
--- a/doc/globals.rdoc
+++ b/doc/globals.rdoc
@@ -1,69 +1,416 @@
-# -*- mode: rdoc; coding: utf-8; fill-column: 74; -*-
-
-== Pre-defined global variables
-
-$!::   The Exception object set by Kernel#raise.
-$@::   The same as <code>$!.backtrace</code>.
-$~::   The information about the last match in the current scope (thread-local and frame-local).
-$&::   The string matched by the last successful match.
-$`::   The string to the left  of the last successful match.
-$'::   The string to the right of the last successful match.
-$+::   The highest group matched by the last successful match.
-$1::   The Nth group of the last successful match. May be > 1.
-$=::   This variable is no longer effective. Deprecated.
-$/::   The input record separator, newline by default. Aliased to $-0.
-$\::   The output record separator for Kernel#print and IO#write. Default is +nil+.
-$,::   The output field separator for Kernel#print and Array#join. Non-nil $, will be deprecated.
-$;::   The default separator for String#split. Non-nil $; will be deprecated. Aliased to $-F.
-$.::   The current input line number of the last file that was read.
-$<::   The same as ARGF.
-$>::   The default output stream for Kernel#print and Kernel#printf. $stdout by default.
-$_::   The last input line of string by gets or readline.
-$0::   Contains the name of the script being executed. May be assignable.
-$*::   The same as ARGV.
-$$::   The process number of the Ruby running this script. Same as Process.pid.
-$?::   The status of the last executed child process (thread-local).
-$LOAD_PATH::   Load path for searching Ruby scripts and extension libraries used
-               by Kernel#load and Kernel#require. Aliased to $: and $-I.
-               Has a singleton method <code>$LOAD_PATH.resolve_feature_path(feature)</code>
-               that returns [+:rb+ or +:so+, path], which resolves the feature to
-               the path the original Kernel#require method would load.
-$LOADED_FEATURES::   The array contains the module names loaded by require.
-                     Aliased to $".
-$DEBUG::     The debug flag, which is set by the <tt>-d</tt> switch.  Enabling debug
-             output prints each exception raised to $stderr (but not its
-             backtrace).  Setting this to a true value enables debug output as
-             if <tt>-d</tt> were given on the command line.  Setting this to a false
-             value disables debug output. Aliased to $-d.
-$FILENAME::  Current input filename from ARGF. Same as ARGF.filename.
-$stderr::    The current standard error output.
-$stdin::     The current standard input.
-$stdout::    The current standard output.
-$VERBOSE::   The verbose flag, which is set by the <tt>-w</tt> or <tt>-v</tt> switch.
-             Setting this to a true value enables warnings as if <tt>-w</tt> or <tt>-v</tt> were given
-             on the command line.  Setting this to +nil+ disables warnings,
-             including from Kernel#warn. Aliased to $-v and $-w.
-$-a::  True if option <tt>-a</tt> is set. Read-only variable.
-$-i::  In in-place-edit mode, this variable holds the extension, otherwise +nil+.
-$-l::  True if option <tt>-l</tt> is set. Read-only variable.
-$-p::  True if option <tt>-p</tt> is set. Read-only variable.
-
-== Pre-defined global constants
-
-STDIN::             The standard input. The default value for $stdin.
-STDOUT::            The standard output. The default value for $stdout.
-STDERR::            The standard error output. The default value for $stderr.
-ENV::               The hash contains current environment variables.
-ARGF::              The virtual concatenation of the files given on command line (or from $stdin if no files were given).
-ARGV::              An Array of command line arguments given for the script.
-DATA::              The file object of the script, pointing just after <code>__END__</code>.
-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_ENGINE::       The name of the Ruby implementation.
-RUBY_ENGINE_VERSION:: The version of the Ruby implementation.
-RUBY_DESCRIPTION::  The same as <tt>ruby --version</tt>, a String describing various aspects of the Ruby implementation.
+= Pre-Defined Global Variables
+
+Some of the pre-defined global variables have synonyms
+that are available via module English.
+For each of those, the \English synonym is given.
+
+To use the module:
+
+  require 'English'
+
+== Exceptions
+
+=== <tt>$!</tt> (\Exception)
+
+Contains the Exception object set by Kernel#raise:
+
+  begin
+    raise RuntimeError.new('Boo!')
+  rescue RuntimeError
+    p $!
+  end
+
+Output:
+
+  #<RuntimeError: Boo!>
+
+English - <tt>$ERROR_INFO</tt>
+
+=== <tt>$@</tt> (Backtrace)
+
+Same as <tt>$!.backtrace</tt>;
+returns an array of backtrace positions:
+
+  begin
+    raise RuntimeError.new('Boo!')
+  rescue RuntimeError
+    pp $@.take(4)
+  end
+
+Output:
+
+  ["(irb):338:in `<top (required)>'",
+   "/snap/ruby/317/lib/ruby/3.2.0/irb/workspace.rb:119:in `eval'",
+   "/snap/ruby/317/lib/ruby/3.2.0/irb/workspace.rb:119:in `evaluate'",
+   "/snap/ruby/317/lib/ruby/3.2.0/irb/context.rb:502:in `evaluate'"]
+
+English - <tt>$ERROR_POSITION</tt>.
+
+== Pattern Matching
+
+These global variables store information about the most recent
+successful match in the current scope.
+
+For details and examples,
+see {Regexp Global Variables}[rdoc-ref:Regexp@Global+Variables].
+
+=== <tt>$~</tt> (\MatchData)
+
+MatchData object created from the match;
+thread-local and frame-local.
+
+English - <tt>$LAST_MATCH_INFO</tt>.
+
+=== <tt>$&</tt> (Matched Substring)
+
+The matched string.
+
+English - <tt>$MATCH</tt>.
+
+=== <tt>$`</tt> (Pre-Match Substring)
+
+The string to the left of the match.
+
+English - <tt>$PREMATCH</tt>.
+
+=== <tt>$'</tt> (Post-Match Substring)
+
+The string to the right of the match.
+
+English - <tt>$POSTMATCH</tt>.
+
+=== <tt>$+</tt> (Last Matched Group)
+
+The last group matched.
+
+English - <tt>$LAST_PAREN_MATCH</tt>.
+
+=== <tt>$1</tt>, <tt>$2</tt>, \Etc. (Matched Group)
+
+For <tt>$_n_</tt> the _nth_ group of the match.
+
+No \English.
+
+== Separators
+
+=== <tt>$/</tt> (Input Record Separator)
+
+An input record separator, initially newline.
+
+English - <tt>$INPUT_RECORD_SEPARATOR</tt>, <tt>$RS</tt>.
+
+Aliased as <tt>$-0</tt>.
+
+=== <tt>$\\</tt> (Output Record Separator)
+
+An output record separator, initially +nil+.
+
+English - <tt>$OUTPUT_RECORD_SEPARATOR</tt>, <tt>$ORS</tt>.
+
+== Streams
+
+=== <tt>$stdin</tt> (Standard Input)
+
+The current standard input stream; initially:
+
+  $stdin # => #<IO:<STDIN>>
+
+=== <tt>$stdout</tt> (Standard Output)
+
+The current standard output stream; initially:
+
+  $stdout # => #<IO:<STDOUT>>
+
+=== <tt>$stderr</tt> (Standard Error)
+
+The current standard error stream; initially:
+
+  $stderr # => #<IO:<STDERR>>
+
+=== <tt>$<</tt> (\ARGF or $stdin)
+
+Points to stream ARGF if not empty, else to stream $stdin; read-only.
+
+English - <tt>$DEFAULT_INPUT</tt>.
+
+=== <tt>$></tt> (Default Standard Output)
+
+An output stream, initially <tt>$stdout</tt>.
+
+English - <tt>$DEFAULT_OUTPUT</tt>
+
+=== <tt>$.</tt> (Input Position)
+
+The input position (line number) in the most recently read stream.
+
+English - <tt>$INPUT_LINE_NUMBER</tt>, <tt>$NR</tt>
+
+=== <tt>$_</tt> (Last Read Line)
+
+The line (string) from the most recently read stream.
+
+English - <tt>$LAST_READ_LINE</tt>.
+
+== Processes
+
+=== <tt>$0</tt>
+
+Initially, contains the name of the script being executed;
+may be reassigned.
+
+=== <tt>$*</tt> (\ARGV)
+
+Points to ARGV.
+
+English - <tt>$ARGV</tt>.
+
+=== <tt>$$</tt> (Process ID)
+
+The process ID of the current process. Same as Process.pid.
+
+English - <tt>$PROCESS_ID</tt>, <tt>$PID</tt>.
+
+=== <tt>$?</tt> (Child Status)
+
+Initially +nil+, otherwise the Process::Status object
+created for the most-recently exited child process;
+thread-local.
+
+English - <tt>$CHILD_STATUS</tt>.
+
+=== <tt>$LOAD_PATH</tt> (Load Path)
+
+Contains the array of paths to be searched
+by Kernel#load and Kernel#require.
+
+Singleton method <tt>$LOAD_PATH.resolve_feature_path(feature)</tt>
+returns:
+
+- <tt>[:rb, _path_]</tt>, where +path+ is the path to the Ruby file
+  to be loaded for the given +feature+.
+- <tt>[:so+ _path_]</tt>, where +path+ is the path to the shared object file
+  to be loaded for the given +feature+.
+- +nil+ if there is no such +feature+ and +path+.
+
+Examples:
+
+  $LOAD_PATH.resolve_feature_path('timeout')
+  # => [:rb, "/snap/ruby/317/lib/ruby/3.2.0/timeout.rb"]
+  $LOAD_PATH.resolve_feature_path('date_core')
+  # => [:so, "/snap/ruby/317/lib/ruby/3.2.0/x86_64-linux/date_core.so"]
+  $LOAD_PATH.resolve_feature_path('foo')
+  # => nil
+
+Aliased as <tt>$:</tt> and <tt>$-I</tt>.
+
+=== <tt>$LOADED_FEATURES</tt>
+
+Contains an array of the paths to the loaded files:
+
+  $LOADED_FEATURES.take(10)
+  # =>
+  ["enumerator.so",
+   "thread.rb",
+   "fiber.so",
+   "rational.so",
+   "complex.so",
+   "ruby2_keywords.rb",
+   "/snap/ruby/317/lib/ruby/3.2.0/x86_64-linux/enc/encdb.so",
+   "/snap/ruby/317/lib/ruby/3.2.0/x86_64-linux/enc/trans/transdb.so",
+   "/snap/ruby/317/lib/ruby/3.2.0/x86_64-linux/rbconfig.rb",
+   "/snap/ruby/317/lib/ruby/3.2.0/rubygems/compatibility.rb"]
+
+Aliased as <tt>$"</tt>.
+
+== Debugging
+
+=== <tt>$FILENAME</tt>
+
+The value returned by method ARGF.filename.
+
+=== <tt>$DEBUG</tt>
+
+Initially +true+ if command-line option <tt>-d</tt> or <tt>--debug</tt> is given,
+otherwise initially +false+;
+may be set to either value in the running program.
+
+When +true+, prints each raised exception to <tt>$stderr</tt>.
+
+Aliased as <tt>$-d</tt>.
+
+=== <tt>$VERBOSE</tt>
+
+Initially +true+ if command-line option <tt>-v</tt> or <tt>-w</tt> is given,
+otherwise initially +false+;
+may be set to either value, or to +nil+, in the running program.
+
+When +true+, enables Ruby warnings.
+
+When +nil+, disables warnings, including those from Kernel#warn.
+
+Aliased as <tt>$-v</tt> and <tt>$-w</tt>.
+
+== Other Variables
+
+=== <tt>$-a</tt>
+
+Whether command-line option <tt>-a</tt> was given; read-only.
+
+=== <tt>$-i</tt>
+
+Contains the extension given with command-line option <tt>-i</tt>,
+or +nil+ if none.
+
+An alias of ARGF.inplace_mode.
+
+=== <tt>$-l</tt>
+
+Whether command-line option <tt>-l</tt> was set; read-only.
+
+=== <tt>$-p</tt>
+
+Whether command-line option <tt>-p</tt> was given; read-only.
+
+== Deprecated
+
+=== <tt>$=</tt>
+
+=== <tt>$,</tt>
+
+=== <tt>$;</tt>
+
+= Pre-Defined Global Constants
+
+= Streams
+
+=== <tt>STDIN</tt>
+
+The standard input stream (the default value for <tt>$stdin</tt>):
+
+  STDIN # => #<IO:<STDIN>>
+
+=== <tt>STDOUT</tt>
+
+The standard output stream (the default value for <tt>$stdout</tt>):
+
+  STDOUT # => #<IO:<STDOUT>>
+
+=== <tt>STDERR</tt>
+
+The standard error stream (the default value for <tt>$stderr</tt>):
+
+  STDERR # => #<IO:<STDERR>>
+
+== Environment
+
+=== ENV
+
+A hash of the contains current environment variables names and values:
+
+  ENV.take(5)
+  # =>
+  [["COLORTERM", "truecolor"],
+   ["DBUS_SESSION_BUS_ADDRESS", "unix:path=/run/user/1000/bus"],
+   ["DESKTOP_SESSION", "ubuntu"],
+   ["DISPLAY", ":0"],
+   ["GDMSESSION", "ubuntu"]]
+
+=== ARGF
+
+The virtual concatenation of the files given on the command line, or from
+<tt>$stdin</tt> if no files were given, <tt>"-"</tt> is given, or after
+all files have been read.
+
+=== <tt>ARGV</tt>
+
+An array of the given command-line arguments.
+
+=== <tt>TOPLEVEL_BINDING</tt>
+
+The Binding of the top level scope:
+
+  TOPLEVEL_BINDING # => #<Binding:0x00007f58da0da7c0>
+
+=== <tt>RUBY_VERSION</tt>
+
+The Ruby version:
+
+  RUBY_VERSION # => "3.2.2"
+
+=== <tt>RUBY_RELEASE_DATE</tt>
+
+The release date string:
+
+  RUBY_RELEASE_DATE # => "2023-03-30"
+
+=== <tt>RUBY_PLATFORM</tt>
+
+The platform identifier:
+
+  RUBY_PLATFORM # => "x86_64-linux"
+
+=== <tt>RUBY_PATCHLEVEL</tt>
+
+The integer patch level for this Ruby:
+
+  RUBY_PATCHLEVEL # => 53
+
+For a development build the patch level will be -1.
+
+=== <tt>RUBY_REVISION</tt>
+
+The git commit hash for this Ruby:
+
+  RUBY_REVISION # => "e51014f9c05aa65cbf203442d37fef7c12390015"
+
+=== <tt>RUBY_COPYRIGHT</tt>
+
+The copyright string:
+
+  RUBY_COPYRIGHT
+  # => "ruby - Copyright (C) 1993-2023 Yukihiro Matsumoto"
+
+=== <tt>RUBY_ENGINE</tt>
+
+The name of the Ruby implementation:
+
+  RUBY_ENGINE # => "ruby"
+
+=== <tt>RUBY_ENGINE_VERSION</tt>
+
+The version of the Ruby implementation:
+
+  RUBY_ENGINE_VERSION # => "3.2.2"
+
+=== <tt>RUBY_DESCRIPTION</tt>
+
+The description of the Ruby implementation:
+
+  RUBY_DESCRIPTION
+  # => "ruby 3.2.2 (2023-03-30 revision e51014f9c0) [x86_64-linux]"
+
+== Embedded \Data
+
+=== <tt>DATA</tt>
+
+Defined if and only if the program has this line:
+
+  __END__
+
+When defined, <tt>DATA</tt> is a File object
+containing the lines following the <tt>__END__</tt>,
+positioned at the first of those lines:
+
+  p DATA
+  DATA.each_line { |line| p line }
+  __END__
+  Foo
+  Bar
+  Baz
+
+Output:
+
+  #<File:t.rb>
+  "Foo\n"
+  "Bar\n"
+  "Baz\n"
diff --git a/doc/hash_inclusion.rdoc b/doc/hash_inclusion.rdoc
new file mode 100644
index 00000000000000..05c2b0932a50ef
--- /dev/null
+++ b/doc/hash_inclusion.rdoc
@@ -0,0 +1,31 @@
+== \Hash Inclusion
+
+A hash is set-like in that it cannot have duplicate entries
+(or even duplicate keys).
+\Hash inclusion can therefore based on the idea of
+{subset and superset}[https://en.wikipedia.org/wiki/Subset].
+
+Two hashes may be tested for inclusion,
+based on comparisons of their entries.
+
+An entry <tt>h0[k0]</tt> in one hash
+is equal to an entry <tt>h1[k1]</tt> in another hash
+if and only if the two keys are equal (<tt>k0 == k1</tt>)
+and their two values are equal (<tt>h0[k0] == h1[h1]</tt>).
+
+A hash may be a subset or a superset of another hash:
+
+- Subset (included in or equal to another):
+
+  - \Hash +h0+ is a _subset_ of hash +h1+ (see Hash#<=)
+    if each entry in +h0+ is equal to an entry in +h1+.
+  - Further, +h0+ is a <i>proper subset</i> of +h1+ (see Hash#<)
+    if +h1+ is larger than +h0+.
+
+- Superset (including or equal to another):
+
+  - \Hash +h0+ is a _superset_ of hash +h1+ (see Hash#>=)
+    if each entry in +h1+ is equal to an entry in +h0+.
+  - Further, +h0+ is a <i>proper superset</i> of +h1+ (see Hash#>)
+    if +h0+ is larger than +h1+.
+
diff --git a/doc/implicit_conversion.rdoc b/doc/implicit_conversion.rdoc
index ba15fa4bf40682..e2440961250adc 100644
--- a/doc/implicit_conversion.rdoc
+++ b/doc/implicit_conversion.rdoc
@@ -1,4 +1,4 @@
-== Implicit Conversions
+= Implicit Conversions
 
 Some Ruby methods accept one or more objects
 that can be either:
@@ -15,7 +15,7 @@ a specific conversion method:
 * Integer: +to_int+
 * String: +to_str+
 
-=== Array-Convertible Objects
+== Array-Convertible Objects
 
 An <i>Array-convertible object</i> is an object that:
 
@@ -69,7 +69,7 @@ This class is not Array-convertible (method +to_ary+ returns non-Array):
     # Raises TypeError (can't convert NotArrayConvertible to Array (NotArrayConvertible#to_ary gives Symbol))
     a.replace(NotArrayConvertible.new)
 
-=== Hash-Convertible Objects
+== Hash-Convertible Objects
 
 A <i>Hash-convertible object</i> is an object that:
 
@@ -123,7 +123,7 @@ This class is not Hash-convertible (method +to_hash+ returns non-Hash):
     # Raises TypeError (can't convert NotHashConvertible to Hash (ToHashReturnsNonHash#to_hash gives Symbol))
     h.merge(NotHashConvertible.new)
 
-=== Integer-Convertible Objects
+== Integer-Convertible Objects
 
 An <i>Integer-convertible object</i> is an object that:
 
@@ -171,7 +171,7 @@ This class is not Integer-convertible (method +to_int+ returns non-Integer):
     # Raises TypeError (can't convert NotIntegerConvertible to Integer (NotIntegerConvertible#to_int gives Symbol))
     Array.new(NotIntegerConvertible.new)
 
-=== String-Convertible Objects
+== String-Convertible Objects
 
 A <i>String-convertible object</i> is an object that:
 * Has instance method +to_str+.
diff --git a/doc/index.md b/doc/index.md
new file mode 100644
index 00000000000000..596825a19c55c6
--- /dev/null
+++ b/doc/index.md
@@ -0,0 +1,65 @@
+# Ruby Documentation
+
+Welcome to the official Ruby programming language documentation.
+
+## Getting Started
+
+New to Ruby? Start with our [Getting Started Guide](https://www.ruby-lang.org/en/documentation/quickstart/).
+
+## Core Classes and Modules
+
+Explore the essential classes and modules:
+
+- [String](String.html) - Text manipulation and string utilities.
+- [Symbol](Symbol.html) - Named identifiers inside the Ruby interpreter.
+- [Array](Array.html) - Ordered collections of objects.
+- [Hash](Hash.html) - Key-value pairs for efficient data retrieval.
+- [Integer](Integer.html) - \Integer number class.
+- [Float](Float.html) - Floating-point number class.
+- [Enumerable](Enumerable.html) - Collection traversal and searching.
+- [File](File.html) - \File operations and handling.
+- [IO](IO.html) - Input/output functionality.
+- [Time](Time.html) - \Time representation.
+- [Regexp](Regexp.html) - Regular expressions for pattern matching.
+- [Range](Range.html) - Representing a range of values.
+- [Exception](Exception.html) - Base class for all exceptions.
+- [Thread](Thread.html) - Multithreading and concurrency.
+
+## Language Reference
+
+Deep dive into Ruby's syntax and features:
+
+- [Ruby Syntax](rdoc-ref:syntax.rdoc)
+- [Exceptions](rdoc-ref:exceptions.md)
+- [Implicit Conversions](rdoc-ref:implicit_conversion.rdoc)
+
+## Standard Libraries
+
+There are some standard libraries included in Ruby that are also commonly used, such as:
+
+- [Date](Date.html) - \Date representation.
+- [JSON](JSON.html) - \JSON encoding and decoding.
+- [ERB](ERB.html) - Embedded Ruby for templating.
+- [Net::HTTP](Net/HTTP.html) - HTTP client library.
+
+Use the following links to access the comprehensive set of libraries included with Ruby:
+
+- [Standard Library Documentation](rdoc-ref:standard_library.md)
+- [Maintainers](rdoc-ref:maintainers.md)
+
+## Contribute to Ruby
+
+Get involved with the Ruby community:
+
+- [Contribution Guide](rdoc-ref:contributing/contributing.md)
+- [Documentation Guide](rdoc-ref:contributing/documentation_guide.md)
+- [Reporting Issues](rdoc-ref:contributing/reporting_issues.md)
+- [Building Ruby](rdoc-ref:contributing/building_ruby.md)
+- [Testing Ruby](rdoc-ref:contributing/testing_ruby.md)
+- [Issue Tracker](https://bugs.ruby-lang.org/projects/ruby-master/issues)
+
+## Additional Resources
+
+- [Ruby Homepage](https://www.ruby-lang.org/)
+- [RubyGems](https://rubygems.org/)
+- [Ruby Community](https://www.ruby-lang.org/en/community/)
diff --git a/doc/irb/irb-tools.rd.ja b/doc/irb/irb-tools.rd.ja
deleted file mode 100644
index b997f0edeaf31f..00000000000000
--- a/doc/irb/irb-tools.rd.ja
+++ /dev/null
@@ -1,184 +0,0 @@
-irb関連おまけコマンドとライブラリ
-				$Release Version: 0.7.1 $
-			   	$Revision$
-			   	by Keiju ISHITSUKA(Nihon Rational Co.,Ltd.)
-
-=begin
-
-:コマンド:
-* rtags		-- ruby tags command
-
-:関数ライブラリ:
-* xmp		-- irb version of gotoken xmp-function
-
-:クラスライブラリ:
-* frame.rb      -- frame tracer
-* completion.rb -- irb completor
-
-= rtags
-
-rtagsはemacs及びvi用の, TAGファイルをつくるコマンドです.
-
-== 使い方
-
-   rtags [-vi] file....
-
-カレントディレクトリにemacs用のTAGSファイルができます. -viオプションを
-つけた時にはvi用のtagsファイルを作成します.
-
-emacsの場合, 通常のetags.elがそのまま使えます. 検索可能なのは,
-
-* クラス
-* メソッド
-* 特異メソッド
-* alias
-* attrで宣言されたアクセサ(パラメータがシンボルか文字列リテラルに限る)
-* attr_XXXで宣言されたアクセサ(パラメータがシンボルか文字列リテラルに限る)
-
-です.
-
-Cなどで使っているのと違うのは, コンプリーションに関する部分で,
-
-関数名は,
-
-  関数名(
-
-クラスは,
-
-  ::クラス名::....::クラス名
-
-メソッドは,
-
-  ::クラス名::....::クラス名#メソッド名
-
-特異メソッド(クラスメソッド)は
-
-  ::クラス名::....::クラス名.メソッド名
-
-でコンプリーションを行なうところです.
-
-= xmp.rb
-
-ごとけんxmpの上位互換バージョンです. ただ, 非常に重いのでごとけんxmpで
-は対応できない時に, 使用すると良いでしょう.
-
-== 使い方
-
-=== 関数として使う.
-
-    require "irb/xmp"
-    xmp <<END
-    foo = 1
-    foo
-    END
-    ---
-    foo = 1
-        ==>1
-    foo
-	==>1
-
-=== XMPインスタンスを用いる.
-
-この場合は, XMPがコンテキスト情報を持つので, 変数の値などを保持してい
-ます.
-
-  require "irb/xmp"
-  xmp = XMP.new
-  xmp.puts <<END
-  foo = 1
-  foo
-  END
-  xmp.puts <<END
-  foo
-  END
-  ===
-  foo = 1
-      ==>1
-  foo
-      ==>1
-  foo
-      ==>1
-
-== コンテキストに関して
-
-XMPメソッド群のコンテキストは, 呼び出す前のコンテキストで評価されます.
-明示的にコンテキストを指定するとそのコンテキストで評価します.
-
-例:
-
-  xmp "foo", an_binding
-
-:注:
-マルチスレッドには対応していません.
-
-= frame.rb
-現在実行中のフレーム情報を取り扱うためのクラスです.
-
-* IRB::Frame.top(n = 0)
-  上からn番目のコンテキストを取り出します. nは0が最上位になります.
-* IRB::Frame.bottom(n = 0)
-  下からn番目のコンテキストを取り出します. nは0が最下位になります.
-* IRB::Frame.sender
-  センダになっているオブジェクトを取り出します. センダとは, そのメソッ
-  ドを呼び出した側のselfのことです.
-
-:注:
-set_trace_funcを用いてRubyの実行をトレースしています. マルチスレッドに
-は対応していません.
-
-= completion.rb
-irbのcompletion機能を提供するものです.
-
-== 使い方
-
-   % irb -r irb/completion
-
-とするか, ~/.irbrc 中に
-
-   require "irb/completion"
-
-を入れてください. irb実行中に require "irb/completion" してもよいです.
-
-irb実行中に (TAB) を押すとコンプレーションします.
-
-トップレベルで(TAB)を押すとすべての構文要素, クラス, メソッドの候補がで
-ます. 候補が唯一ならば完全に補完します.
-
-  irb(main):001:0> in
-  in                    inspect               instance_eval
-  include               install_alias_method  instance_of?
-  initialize            install_aliases       instance_variables
-  irb(main):001:0> inspect
-  "main"
-  irb(main):002:0> foo = Object.new
-  #<Object:0x4027146c>
-
-  ((|変数名.|))の後に(TAB)を押すと, そのオブジェクトのメソッド一覧がでま
-  す.
-
-  irb(main):003:0> foo.
-  foo.==                  foo.frozen?             foo.protected_methods
-  foo.===                 foo.hash                foo.public_methods
-  foo.=~                  foo.id                  foo.respond_to?
-  foo.__id__              foo.inspect             foo.send
-  foo.__send__            foo.instance_eval       foo.singleton_methods
-  foo.class               foo.instance_of?        foo.taint
-  foo.clone               foo.instance_variables  foo.tainted?
-  foo.display             foo.is_a?               foo.to_a
-  foo.dup                 foo.kind_of?            foo.to_s
-  foo.eql?                foo.method              foo.type
-  foo.equal?              foo.methods             foo.untaint
-  foo.extend              foo.nil?
-  foo.freeze              foo.private_methods
-
-=end
-
-% Begin Emacs Environment
-% Local Variables:
-% mode: text
-% comment-column: 0
-% comment-start: "%"
-% comment-end: "\n"
-% End:
-%
-
diff --git a/doc/irb/irb.rd.ja b/doc/irb/irb.rd.ja
deleted file mode 100644
index c51e0bd60d566b..00000000000000
--- a/doc/irb/irb.rd.ja
+++ /dev/null
@@ -1,425 +0,0 @@
-irb -- interactive ruby
-				$Release Version: 0.9.5 $
-			   	$Revision$
-			   	by Keiju ISHITSUKA(keiju@ruby-lang.org)
-=begin
-= irbとは?
-
-irbはinteractive rubyの略です. rubyの式を標準入力から簡単に入力/実行する
-ためのツールです.
-
-= 起動
-
-  % irb
-
-で行ないます.
-
-= 使い方
-
-irbの使い方は, Rubyさえ知っていればいたって簡単です. 基本的には irb と
-いうコマンドを実行するだけです. irbを実行すると, 以下のようなプロンプ
-トが表れてきます. 後は, rubyの式を入れて下さい. 式が完結した時点で実行
-されます.
-
-  dim% irb
-  irb(main):001:0> 1+2
-  3
-  irb(main):002:0> class Foo
-  irb(main):003:1>  def foo
-  irb(main):004:2>    print 1
-  irb(main):005:2>  end
-  irb(main):006:1> end
-  nil
-  irb(main):007:0>
-
-また, irbはReadlineモジュールにも対応しています. Readlineモジュールが
-インストールされている時には, それを使うのが標準の動作になります.
-
-= コマンドオプション
-
-  irb.rb [options] file_name opts
-  options:
-  -f		    ~/.irbrc を読み込まない.
-  -d                $DEBUG をtrueにする(ruby -d と同じ)
-  -r load-module    ruby -r と同じ.
-  -I path           $LOAD_PATH に path を追加する.
-  -U                ruby -U と同じ.
-  -E enc            ruby -E と同じ.
-  -w                ruby -w と同じ.
-  -W[level=2]       ruby -W と同じ.
-  --context-mode n  新しいワークスペースを作成した時に関連する Binding
-		    オブジェクトの作成方法を 0 から 3 のいずれかに設定する.
-  --echo	    実行結果を表示する(デフォルト).
-  --noecho	    実行結果を表示しない.
-  --echo-on-assignment
-                    代入時に実行結果を表示する.
-  --noecho-on-assignment
-                    代入時に実行結果を表示しない.
-  --truncate-echo-on-assignment
-                    代入時に省略された実行結果を表示する(デフォルト).
-  --inspect	    結果出力にinspectを用いる.
-  --noinspect	    結果出力にinspectを用いない.
-  --singleline      シングルラインエディタを利用する.
-  --nosingleline    シングルラインエディタを利用しない. デフォルトの動
-                    作は, inf-ruby-mode以外でシングルラインエディタを利
-                    用しようとする.
-  --colorize	    色付けを利用する.
-  --nocolorize	    色付けを利用しない.
-  --autocomplete    オートコンプリートを利用する.
-  --noautocomplete  オートコンプリートを利用しない.
-  --prompt prompt-mode
-  --prompt-mode prompt-mode
-		    プロンプトモードを切替えます. 現在定義されているプ
-		    ロンプトモードは, default, simple, xmp, inf-rubyが
-		    用意されています.
-  --inf-ruby-mode   emacsのinf-ruby-mode用のプロンプト表示を行なう. 特
-		    に指定がない限り, ラインエディタは使わなくなる.
-  --simple-prompt
-		    非常にシンプルなプロンプトを用いるモードです.
-  --noprompt	    プロンプト表示を行なわない.
-  --single-irb	    irb 中で self を実行して得られるオブジェクトをサ
-		    ブ irb と共有する.
-  --tracer	    コマンド実行時にトレースを行なう.
-  --back-trace-limit n
-		    バックトレース表示をバックトレースの頭から n, 後ろ
-		    からnだけ行なう. デフォルトは16
-
-  --verbose	    詳細なメッセージを出力する.
-  --noverbose	    詳細なメッセージを出力しない(デフォルト).
-  -v, --version	    irbのバージョンを表示する.
-  -h, --help	    irb のヘルプを表示する.
-  --		    以降のコマンドライン引数をオプションとして扱わない.
-
-= コンフィギュレーション
-
-irb起動時に``~/.irbrc''を読み込みます. もし存在しない場合は,
-``.irbrc'', ``irb.rc'', ``_irbrc'', ``$irbrc''の順にloadを試みます.
-
-オプションを設定する代わりに, 以下のコマンドでもデフォルトの動作を設定
-できます.
-
-  IRB.conf[:IRB_NAME]="irb"
-  IRB.conf[:USE_TRACER]=false
-  IRB.conf[:USE_LOADER]=false
-  IRB.conf[:IGNORE_SIGINT]=true
-  IRB.conf[:IGNORE_EOF]=false
-  IRB.conf[:INSPECT_MODE]=nil
-  IRB.conf[:IRB_RC] = nil
-  IRB.conf[:BACK_TRACE_LIMIT]=16
-  IRB.conf[:USE_LOADER] = false
-  IRB.conf[:USE_SINGLELINE] = nil
-  IRB.conf[:USE_TRACER] = false
-  IRB.conf[:IGNORE_SIGINT] = true
-  IRB.conf[:IGNORE_EOF] = false
-  IRB.conf[:PROMPT_MODE] = :DEFAULT
-  IRB.conf[:PROMPT] = {...}
-  IRB.conf[:VERBOSE]=true
-
-== プロンプトの設定
-
-プロンプトをカスタマイズしたい時には,
-
-   IRB.conf[:PROMPT]
-
-を用います. 例えば, .irbrcの中で下のような式を記述します:
-
-   IRB.conf[:PROMPT][:MY_PROMPT] = { # プロンプトモードの名前
-     :PROMPT_I => nil,		  # 通常のプロンプト
-     :PROMPT_S => nil,		  # 文字列などの継続行のプロンプト
-     :PROMPT_C => nil,		  # 式が継続している時のプロンプト
-     :RETURN => "    ==>%s\n"	  # リターン時のプロンプト
-   }
-
-プロンプトモードを指定したい時には,
-
-  irb --prompt my-prompt
-
-でそのプロンプトモードで起動されます. または, .irbrcに下式を記述しても
-OKです.
-
-  IRB.conf[:PROMPT_MODE] = :MY_PROMPT
-
-PROMPT_I, PROMPT_S, PROMPT_Cは, フォーマットを指定します.
-
-  %N	起動しているコマンド名が出力される.
-  %m	mainオブジェクト(self)がto_sで出力される.
-  %M	mainオブジェクト(self)がinspectされて出力される.
-  %l	文字列中のタイプを表す(", ', /, ], `]'は%wの中の時)
-  %NNi	インデントのレベルを表す. NNは数字が入りprintfの%NNdと同じ. 省
-	略可能
-  %NNn	行番号を表します.
-  %%    %
-
-例えば, デフォルトのプロンプトモードは:
-
-  IRB.conf[:PROMPT][:DEFAULT] = {
-      :PROMPT_I => "%N(%m):%03n:%i> ",
-      :PROMPT_S => "%N(%m):%03n:%i%l ",
-      :PROMPT_C => "%N(%m):%03n:%i* ",
-      :RETURN => "=> %s\n"
-  }
-
-となっています.
-
-RETURNは, 現在のところprintf形式です. 将来仕様が変わるかも知れません.
-
-== サブirbの設定
-
-コマンドラインオプションおよびIRB.confは(サブ)irb起動時のデフォルトの
-設定を決めるもので, `5. コマンド'にあるconfで個別の(サブ)irbの設定がで
-きるようになっています.
-
-IRB.conf[:IRB_RC]にprocが設定されていると, サブirbを起動する時にその
-procをirbのコンテキストを引数として呼び出します. これによって個別のサ
-ブirbごとに設定を変えることができるようになります.
-
-
-= コマンド
-
-irb拡張コマンドは, 簡単な名前と頭に`irb_'をつけた名前と両方定義されて
-います. これは, 簡単な名前がoverrideされた時のためです.
-
---- exit, quit, irb_exit
-    終了する.
-    サブirbの場合, そのサブirbを終了する.
-
---- conf, irb_context
-    irbの現在の設定を表示する. 設定の変更は, confにメッセージを送るこ
-    とによって行なえる.
-
---- conf.eval_history = N
-    実行結果のヒストリ機能の設定.
-    nnは整数かnilで nn>0 であればその数だけヒストリにためる。nn==0の時は
-    無制限に記憶する、nilだとヒストリ機能はやめる(デフォルト).
-
---- Conf.back_trace_limit
-    バックトレース表示をバックトレースの頭からn, 後ろからnだけ行なう.
-    デフォルトは16
-
---- conf.ignore_eof = true/false
-    ^Dが入力された時の動作を設定する. trueの時は^Dを無視する, falseの
-    時はirbを終了する.
-
---- conf.ignore_sigint= true/false
-    ^Cが入力された時の動作を設定する. false時は, irbを終了する. trueの
-    時の動作は以下のようになる:
-      入力中: これまで入力したものをキャンセルしトップレベルに戻る.
-      実行中: 実行を中止する.
-
---- conf.inf_ruby_mode = true/false
-    inf-ruby-mode用のプロンプト表示を行なう. デフォルトはfalse. 特に指定
-    がない限り, ラインエディタは使わなくなる.
-
---- conf.inspect_mode = true/false/nil
-    インスペクトモードを設定する.
-    true: インスペクトして表示する.
-    false: 通常のprintで表示する.
-    nil: 通常モードであれば, inspect modeとなり, mathモードの時は, non
-	 inspect modeとなる.
-
---- conf.use_loader = true/false
-    load/require時にirbのfile読み込み機能を用いるモードのスイッチ(デフォ
-    ルトは用いない). このモードはIRB全体に反映される.
-
---- conf.prompt_c
-    ifの直後など, 行が継続している時のプロンプト.
-
---- conf.prompt_i
-    通常のプロンプト.
-
---- conf.prompt_s
-    文字列中などを表すプロンプト.
-
---- conf.rc
-    ~/.irbrcを読み込んだかどうか?
-
---- conf.use_prompt = true/false
-    プロンプト表示するかどうか? デフォルトではプロンプトを表示する.
-
---- conf.use_multiline = true/false/nil
-    マルチラインエディタを使うかどうか?
-    true: マルチラインエディタを使う.
-    false: マルチラインエディタを使わない.
-    nil: (デフォルト)inf-ruby-mode以外でマルチラインエディタを利用しよう
-    とする.
-
---- conf.use_singleline = true/false/nil
-    シングルラインエディタを使うかどうか?
-    true: シングルラインエディタを使う.
-    false: シングルラインエディタを使わない.
-    nil: (デフォルト)inf-ruby-modeとマルチラインエディタ以外でシングルラ
-         インエディタを利用しようとする.
-#
-#--- conf.verbose=T/F
-#    irbからいろいろなメッセージを出力するか?
-
---- cws, chws, irb_cws, irb_chws, irb_change_workspace [obj]
-    objをselfとする. objが省略されたときは, home workspace, すなわち
-    irbを起動したときのmain objectをselfとする.
-
---- pushws, irb_pushws, irb_push_workspace [obj]
-    UNIXシェルコマンドのpushdと同様.
-
---- popws, irb_popws, irb_pop_workspace
-    UNIXシェルコマンドのpopdと同様.
-
---- irb [obj]
-    サブirbを立ちあげる. objが指定された時は, そのobjをselfとする.
-
---- jobs, irb_jobs
-    サブirbのリスト
-
---- fg n, irb_fg n
-    指定したサブirbにスイッチする. nは, 次のものを指定する.
-
-      irb番号
-      スレッド
-      irbオブジェクト
-      self(irb objで起動した時のobj)
-
---- kill n, irb_kill n
-      サブirbをkillする. nはfgと同じ.
-
---- source, irb_source  path
-    UNIXシェルコマンドのsourceと似ている. 現在の環境上でpath内のスクリ
-    プトを評価する.
-
---- irb_load path, prev
-
-    Rubyのloadのirb版.
-
-= システム変数
-
---- _
-    前の計算の実行結果を覚えている(ローカル変数).
---- __
-    実行結果の履歴を覚えている.
-    __[line_no]で、その行で実行した結果を得ることができる. line_noが負の
-    時には、最新の結果から-line_no前の結果を得ることができる.
-
-=  使用例
-
-以下のような感じです.
-
-  dim% ruby irb.rb
-  irb(main):001:0> irb                        # サブirbの立ちあげ
-  irb#1(main):001:0> jobs                     # サブirbのリスト
-  #0->irb on main (#<Thread:0x400fb7e4> : stop)
-  #1->irb#1 on main (#<Thread:0x40125d64> : running)
-  nil
-  irb#1(main):002:0> fg 0                     # jobのスイッチ
-  nil
-  irb(main):002:0> class Foo;end
-  nil
-  irb(main):003:0> irb Foo                    # Fooをコンテキストしてirb
-					      # 立ちあげ
-  irb#2(Foo):001:0> def foo                   # Foo#fooの定義
-  irb#2(Foo):002:1>   print 1
-  irb#2(Foo):003:1> end
-  nil
-  irb#2(Foo):004:0> fg 0                      # jobをスイッチ
-  nil
-  irb(main):004:0> jobs                       # jobのリスト
-  #0->irb on main (#<Thread:0x400fb7e4> : running)
-  #1->irb#1 on main (#<Thread:0x40125d64> : stop)
-  #2->irb#2 on Foo (#<Thread:0x4011d54c> : stop)
-  nil
-  irb(main):005:0> Foo.instance_methods       # Foo#fooがちゃんと定義さ
-					      # れている
-  ["foo"]
-  irb(main):006:0> fg 2                       # jobをスイッチ
-  nil
-  irb#2(Foo):005:0> def bar                   # Foo#barを定義
-  irb#2(Foo):006:1>  print "bar"
-  irb#2(Foo):007:1> end
-  nil
-  irb#2(Foo):010:0>  Foo.instance_methods
-  ["bar", "foo"]
-  irb#2(Foo):011:0> fg 0
-  nil
-  irb(main):007:0> f = Foo.new
-  #<Foo:0x4010af3c>
-  irb(main):008:0> irb f                      # Fooのインスタンスでirbを
-					      # 立ちあげる.
-  irb#3(#<Foo:0x4010af3c>):001:0> jobs
-  #0->irb on main (#<Thread:0x400fb7e4> : stop)
-  #1->irb#1 on main (#<Thread:0x40125d64> : stop)
-  #2->irb#2 on Foo (#<Thread:0x4011d54c> : stop)
-  #3->irb#3 on #<Foo:0x4010af3c> (#<Thread:0x4010a1e0> : running)
-  nil
-  irb#3(#<Foo:0x4010af3c>):002:0> foo         # f.fooの実行
-  nil
-  irb#3(#<Foo:0x4010af3c>):003:0> bar         # f.barの実行
-  barnil
-  irb#3(#<Foo:0x4010af3c>):004:0> kill 1, 2, 3# jobのkill
-  nil
-  irb(main):009:0> jobs
-  #0->irb on main (#<Thread:0x400fb7e4> : running)
-  nil
-  irb(main):010:0> exit                       # 終了
-  dim%
-
-= 使用上の制限
-
-irbは, 評価できる時点(式が閉じた時点)での逐次実行を行ないます. したがっ
-て, rubyを直接使った時と, 若干異なる動作を行なう場合があります.
-
-現在明らかになっている問題点を説明します.
-
-== ローカル変数の宣言
-
-rubyでは, 以下のプログラムはエラーになります.
-
-  eval "foo = 0"
-  foo
-  --
-  -:2: undefined local variable or method `foo' for #<Object:0x40283118> (NameError)
-  ---
-  NameError
-
-ところが, irbを用いると
-
-  >> eval "foo = 0"
-  => 0
-  >> foo
-  => 0
-
-となり, エラーを起こしません. これは, rubyが最初にスクリプト全体をコン
-パイルしてローカル変数を決定するからです. それに対し, irbは実行可能に
-なる(式が閉じる)と自動的に評価しているからです. 上記の例では,
-
-  eval "foo = 0"
-
-を行なった時点で評価を行ない, その時点で変数が定義されるため, 次式で
-変数fooは定義されているからです.
-
-このようなrubyとirbの動作の違いを解決したい場合は, begin...endで括って
-バッチ的に実行して下さい:
-
-  >> begin
-  ?>   eval "foo = 0"
-  >>   foo
-  >> end
-  NameError: undefined local variable or method `foo' for #<Object:0x4013d0f0>
-  (irb):3
-  (irb_local_binding):1:in `eval'
-
-== ヒアドキュメント
-
-現在のところヒアドキュメントの実装は不完全です.
-
-== シンボル
-
-シンボルであるかどうかの判断を間違えることがあります. 具体的には式が完了
-しているのに継続行と見なすことがあります.
-
-=end
-
-% Begin Emacs Environment
-% Local Variables:
-% mode: text
-% comment-column: 0
-% comment-start: "%"
-% comment-end: "\n"
-% End:
-%
diff --git a/doc/maintainers.md b/doc/maintainers.md
index 11f729f9515c56..7d217a166534a9 100644
--- a/doc/maintainers.md
+++ b/doc/maintainers.md
@@ -1,7 +1,16 @@
 # Maintainers
-This page describes the current module, library, and extension maintainers of Ruby.
+
+This page describes the current branch, module, library, and extension maintainers of Ruby.
+
+## Branch Maintainers
+
+A branch maintainer is responsible for backporting commits into stable branches
+and publishing Ruby patch releases.
+
+[The list of current branch maintainers is available in the wiki](https://github.com/ruby/ruby/wiki/Release-Engineering).
 
 ## Module Maintainers
+
 A module maintainer is responsible for a certain part of Ruby.
 
 * The maintainer fixes bugs of the part. Particularly, they should fix
@@ -20,489 +29,599 @@ consensus on ruby-core/ruby-dev before changing/adding. Some of submaintainers
 have commit right, others don't.
 
 ### Language core features including security
-* Yukihiro Matsumoto (matz)
+
+* Yukihiro Matsumoto ([matz])
 
 ### Evaluator
-* Koichi Sasada (ko1)
+
+* Koichi Sasada ([ko1])
 
 ### Core classes
-* Yukihiro Matsumoto (matz)
+
+* Yukihiro Matsumoto ([matz])
 
 ## Standard Library Maintainers
+
 ### Libraries
+
 #### lib/mkmf.rb
+
 * *unmaintained*
 
 #### lib/rubygems.rb, lib/rubygems/*
-* Eric Hodel (drbrain)
-* Hiroshi SHIBATA (hsbt)
+
+* Eric Hodel ([drbrain])
+* Hiroshi SHIBATA ([hsbt])
 * https://github.com/rubygems/rubygems
 
 #### lib/unicode_normalize.rb, lib/unicode_normalize/*
-* Martin J. Dürst
+
+* Martin J. Dürst ([duerst])
 
 ### Extensions
+
 #### ext/continuation
-* Koichi Sasada (ko1)
+
+* Koichi Sasada ([ko1])
 
 #### ext/coverage
-* Yusuke Endoh (mame)
+
+* Yusuke Endoh ([mame])
 
 #### ext/fiber
-* Koichi Sasada (ko1)
+
+* Koichi Sasada ([ko1])
 
 #### ext/monitor
-* Koichi Sasada (ko1)
+
+* Koichi Sasada ([ko1])
 
 #### ext/objspace
+
 * *unmaintained*
 
 #### ext/pty
+
 * *unmaintained*
 
 #### ext/ripper
+
 * *unmaintained*
 
 #### ext/socket
-* Tanaka Akira (akr)
+
+* Tanaka Akira ([akr])
 * API change needs matz's approval
 
 #### ext/win32
-* NAKAMURA Usaku (usa)
 
-## Default gems Maintainers
-### Libraries
-#### lib/abbrev.rb
-* Akinori MUSHA (knu)
-* https://github.com/ruby/abbrev
-* https://rubygems.org/gems/abbrev
+* NAKAMURA Usaku ([unak])
 
-#### lib/base64.rb
-* Yusuke Endoh (mame)
-* https://github.com/ruby/base64
-* https://rubygems.org/gems/base64
+## Default gems Maintainers
 
-#### lib/benchmark.rb
-* *unmaintained*
-* https://github.com/ruby/benchmark
-* https://rubygems.org/gems/benchmark
+### Libraries
 
 #### lib/bundler.rb, lib/bundler/*
-* Hiroshi SHIBATA (hsbt)
+
+* Hiroshi SHIBATA ([hsbt])
 * https://github.com/rubygems/rubygems
 * https://rubygems.org/gems/bundler
 
-#### lib/cgi.rb, lib/cgi/*
-* *unmaintained*
-* https://github.com/ruby/cgi
-* https://rubygems.org/gems/cgi
+#### lib/cgi/escape.rb
 
-#### lib/csv.rb
-* Kenta Murata (mrkn)
-* Kouhei Sutou (kou)
-* https://github.com/ruby/csv
-* https://rubygems.org/gems/csv
+* *unmaintained*
 
 #### lib/English.rb
+
 * *unmaintained*
 * https://github.com/ruby/English
 * https://rubygems.org/gems/English
 
 #### lib/delegate.rb
+
 * *unmaintained*
 * https://github.com/ruby/delegate
 * https://rubygems.org/gems/delegate
 
 #### lib/did_you_mean.rb
-* Yuki Nishijima (yuki24)
+
+* Yuki Nishijima ([yuki24])
 * https://github.com/ruby/did_you_mean
 * https://rubygems.org/gems/did_you_mean
 
 #### ext/digest, ext/digest/*
-* Akinori MUSHA (knu)
+
+* Akinori MUSHA ([knu])
 * https://github.com/ruby/digest
 * https://rubygems.org/gems/digest
 
-#### lib/drb.rb, lib/drb/*
-* Masatoshi SEKI (seki)
-* https://github.com/ruby/drb
-* https://rubygems.org/gems/drb
-
 #### lib/erb.rb
-* Masatoshi SEKI (seki)
-* Takashi Kokubun (k0kubun)
+
+* Masatoshi SEKI ([seki])
+* Takashi Kokubun ([k0kubun])
 * https://github.com/ruby/erb
 * https://rubygems.org/gems/erb
 
 #### lib/error_highlight.rb, lib/error_highlight/*
-* Yusuke Endoh (mame)
+
+* Yusuke Endoh ([mame])
 * https://github.com/ruby/error_highlight
 * https://rubygems.org/gems/error_highlight
 
 #### lib/fileutils.rb
+
 * *unmaintained*
 * https://github.com/ruby/fileutils
 * https://rubygems.org/gems/fileutils
 
 #### lib/find.rb
-* Kazuki Tsujimoto (ktsj)
+
+* Kazuki Tsujimoto ([k-tsj])
 * https://github.com/ruby/find
 * https://rubygems.org/gems/find
 
 #### lib/forwardable.rb
-* Keiju ISHITSUKA (keiju)
+
+* Keiju ISHITSUKA ([keiju])
 * https://github.com/ruby/forwardable
 * https://rubygems.org/gems/forwardable
 
-#### lib/getoptlong.rb
-* *unmaintained*
-* https://github.com/ruby/getoptlong
-* https://rubygems.org/gems/getoptlong
-
 #### lib/ipaddr.rb
-* Akinori MUSHA (knu)
+
+* Akinori MUSHA ([knu])
 * https://github.com/ruby/ipaddr
 * https://rubygems.org/gems/ipaddr
 
-#### lib/irb.rb, lib/irb/*
-* aycabta
-* https://github.com/ruby/irb
-* https://rubygems.org/gems/irb
-
 #### lib/optparse.rb, lib/optparse/*
-* Nobuyuki Nakada (nobu)
-* https://github.com/ruby/optparse
 
-#### lib/logger.rb
-* Naotoshi Seo (sonots)
-* https://github.com/ruby/logger
-* https://rubygems.org/gems/logger
-
-#### lib/mutex_m.rb
-* Keiju ISHITSUKA (keiju)
-* https://github.com/ruby/mutex_m
-* https://rubygems.org/gems/mutex_m
+* Nobuyuki Nakada ([nobu])
+* https://github.com/ruby/optparse
 
 #### lib/net/http.rb, lib/net/https.rb
-* NARUSE, Yui (naruse)
+
+* NARUSE, Yui ([nurse])
 * https://github.com/ruby/net-http
 * https://rubygems.org/gems/net-http
 
 #### lib/net/protocol.rb
+
 * *unmaintained*
 * https://github.com/ruby/net-protocol
 * https://rubygems.org/gems/net-protocol
 
-#### lib/observer.rb
-* *unmaintained*
-* https://github.com/ruby/observer
-* https://rubygems.org/gems/observer
-
 #### lib/open3.rb
+
 * *unmaintained*
 * https://github.com/ruby/open3
 * https://rubygems.org/gems/open3
 
 #### lib/open-uri.rb
-* Tanaka Akira (akr)
-* https://github.com/ruby/open-uri
 
-#### lib/ostruct.rb
-* Marc-André Lafortune (marcandre)
-* https://github.com/ruby/ostruct
-* https://rubygems.org/gems/ostruct
+* Tanaka Akira ([akr])
+* https://github.com/ruby/open-uri
 
 #### lib/pp.rb
-* Tanaka Akira (akr)
+
+* Tanaka Akira ([akr])
 * https://github.com/ruby/pp
 * https://rubygems.org/gems/pp
 
 #### lib/prettyprint.rb
-* Tanaka Akira (akr)
+
+* Tanaka Akira ([akr])
 * https://github.com/ruby/prettyprint
 * https://rubygems.org/gems/prettyprint
 
-#### lib/pstore.rb
-* *unmaintained*
-* https://github.com/ruby/pstore
-* https://rubygems.org/gems/pstore
+#### lib/prism.rb
 
-#### lib/readline.rb
-* aycabta
-* https://github.com/ruby/readline
-* https://rubygems.org/gems/readline
+* Kevin Newton ([kddnewton])
+* Eileen Uchitelle ([eileencodes])
+* Aaron Patterson ([tenderlove])
+* https://github.com/ruby/prism
+* https://rubygems.org/gems/prism
 
 #### lib/resolv.rb
-* Tanaka Akira (akr)
+
+* Tanaka Akira ([akr])
 * https://github.com/ruby/resolv
 * https://rubygems.org/gems/resolv
 
-#### lib/resolv-replace.rb
-* Tanaka Akira (akr)
-* https://github.com/ruby/resolv-replace
-* https://rubygems.org/gems/resolv-replace
-
-#### lib/rdoc.rb, lib/rdoc/*
-* Eric Hodel (drbrain)
-* Hiroshi SHIBATA (hsbt)
-* https://github.com/ruby/rdoc
-* https://rubygems.org/gems/rdoc
-
-#### lib/reline.rb, lib/reline/*
-* aycabta
-* https://github.com/ruby/reline
-* https://rubygems.org/gems/reline
-
-#### lib/rinda/*
-* Masatoshi SEKI (seki)
-* https://github.com/ruby/rinda
-* https://rubygems.org/gems/rinda
-
 #### lib/securerandom.rb
-* Tanaka Akira (akr)
+
+* Tanaka Akira ([akr])
 * https://github.com/ruby/securerandom
 * https://rubygems.org/gems/securerandom
 
-#### lib/set.rb
-* Akinori MUSHA (knu)
-* https://github.com/ruby/set
-* https://rubygems.org/gems/set
-
 #### lib/shellwords.rb
-* Akinori MUSHA (knu)
+
+* Akinori MUSHA ([knu])
 * https://github.com/ruby/shellwords
 * https://rubygems.org/gems/shellwords
 
 #### lib/singleton.rb
-* Yukihiro Matsumoto (matz)
+
+* Yukihiro Matsumoto ([matz])
 * https://github.com/ruby/singleton
 * https://rubygems.org/gems/singleton
 
 #### lib/tempfile.rb
+
 * *unmaintained*
 * https://github.com/ruby/tempfile
 * https://rubygems.org/gems/tempfile
 
 #### lib/time.rb
-* Tanaka Akira (akr)
+
+* Tanaka Akira ([akr])
 * https://github.com/ruby/time
 * https://rubygems.org/gems/time
 
 #### lib/timeout.rb
-* Yukihiro Matsumoto (matz)
+
+* Yukihiro Matsumoto ([matz])
 * https://github.com/ruby/timeout
 * https://rubygems.org/gems/timeout
 
 #### lib/thwait.rb
-* Keiju ISHITSUKA (keiju)
+
+* Keiju ISHITSUKA ([keiju])
 * https://github.com/ruby/thwait
 * https://rubygems.org/gems/thwait
 
 #### lib/tmpdir.rb
+
 * *unmaintained*
 * https://github.com/ruby/tmpdir
 * https://rubygems.org/gems/tmpdir
 
 #### lib/tsort.rb
-* Tanaka Akira (akr)
+
+* Tanaka Akira ([akr])
 * https://github.com/ruby/tsort
 * https://rubygems.org/gems/tsort
 
 #### lib/un.rb
-* WATANABE Hirofumi (eban)
+
+* WATANABE Hirofumi ([eban])
 * https://github.com/ruby/un
 * https://rubygems.org/gems/un
 
 #### lib/uri.rb, lib/uri/*
-* NARUSE, Yui (naruse)
+
+* NARUSE, Yui ([nurse])
 * https://github.com/ruby/uri
 * https://rubygems.org/gems/uri
 
 #### lib/yaml.rb, lib/yaml/*
-* Aaron Patterson (tenderlove)
-* Hiroshi SHIBATA (hsbt)
+
+* Aaron Patterson ([tenderlove])
+* Hiroshi SHIBATA ([hsbt])
 * https://github.com/ruby/yaml
 * https://rubygems.org/gems/yaml
 
 #### lib/weakref.rb
+
 * *unmaintained*
 * https://github.com/ruby/weakref
 * https://rubygems.org/gems/weakref
 
 ### Extensions
-#### ext/bigdecimal
-* Kenta Murata (mrkn) https://github.com/ruby/bigdecimal
-* https://rubygems.org/gems/bigdecimal
 
 #### ext/cgi
-* Nobuyoshi Nakada (nobu)
-* https://github.com/ruby/cgi
-* https://rubygems.org/gems/cgi
+
+* Nobuyoshi Nakada ([nobu])
 
 #### ext/date
+
 * *unmaintained*
 * https://github.com/ruby/date
 * https://rubygems.org/gems/date
 
 #### ext/etc
+
 * *unmaintained*
 * https://github.com/ruby/etc
 * https://rubygems.org/gems/etc
 
 #### ext/fcntl
+
 * *unmaintained*
 * https://github.com/ruby/fcntl
 * https://rubygems.org/gems/fcntl
 
-#### ext/fiddle
-* Aaron Patterson (tenderlove)
-* https://github.com/ruby/fiddle
-* https://rubygems.org/gems/fiddle
-
 #### ext/io/console
-* Nobuyuki Nakada (nobu)
+
+* Nobuyuki Nakada ([nobu])
 * https://github.com/ruby/io-console
 * https://rubygems.org/gems/io-console
 
 #### ext/io/nonblock
-* Nobuyuki Nakada (nobu)
+
+* Nobuyuki Nakada ([nobu])
 * https://github.com/ruby/io-nonblock
 * https://rubygems.org/gems/io-nonblock
 
 #### ext/io/wait
-* Nobuyuki Nakada (nobu)
+
+* Nobuyuki Nakada ([nobu])
 * https://github.com/ruby/io-wait
 * https://rubygems.org/gems/io-wait
 
 #### ext/json
-* NARUSE, Yui (naruse)
-* Hiroshi SHIBATA (hsbt)
-* https://github.com/flori/json
-* https://rubygems.org/gems/json
 
-#### ext/nkf
-* NARUSE, Yui (naruse)
-* https://github.com/ruby/nkf
-* https://rubygems.org/gems/nkf
+* NARUSE, Yui ([nurse])
+* Hiroshi SHIBATA ([hsbt])
+* Jean Boussier ([byroot])
+* https://github.com/ruby/json
+* https://rubygems.org/gems/json
 
 #### ext/openssl
-* Kazuki Yamaguchi (rhe)
+
+* Kazuki Yamaguchi ([rhenium])
 * https://github.com/ruby/openssl
 * https://rubygems.org/gems/openssl
 
 #### ext/pathname
-* Tanaka Akira (akr)
+
+* Tanaka Akira ([akr])
 * https://github.com/ruby/pathname
 * https://rubygems.org/gems/pathname
 
 #### ext/psych
-* Aaron Patterson (tenderlove)
-* Hiroshi SHIBATA (hsbt)
+
+* Aaron Patterson ([tenderlove])
+* Hiroshi SHIBATA ([hsbt])
 * https://github.com/ruby/psych
 * https://rubygems.org/gems/psych
 
 #### ext/stringio
-* Nobuyuki Nakada (nobu)
+
+* Nobuyuki Nakada ([nobu])
 * https://github.com/ruby/stringio
 * https://rubygems.org/gems/stringio
 
 #### ext/strscan
-* Kouhei Sutou (kou)
+
+* Kouhei Sutou ([kou])
 * https://github.com/ruby/strscan
 * https://rubygems.org/gems/strscan
 
-#### ext/syslog
-* Akinori MUSHA (knu)
-* https://github.com/ruby/syslog
-* https://rubygems.org/gems/syslog
-
-#### ext/win32ole
-* Masaki Suketa (suke)
-* https://github.com/ruby/win32ole
-* https://rubygems.org/gems/win32ole
-
 #### ext/zlib
-* NARUSE, Yui (naruse)
+
+* NARUSE, Yui ([nurse])
 * https://github.com/ruby/zlib
 * https://rubygems.org/gems/zlib
 
 ## Bundled gems upstream repositories
+
 ### minitest
-* https://github.com/seattlerb/minitest
+
+* https://github.com/minitest/minitest
 
 ### power_assert
+
 * https://github.com/ruby/power_assert
 
 ### rake
+
 * https://github.com/ruby/rake
 
 ### test-unit
+
 * https://github.com/test-unit/test-unit
 
 ### rexml
+
 * https://github.com/ruby/rexml
 
 ### rss
+
 * https://github.com/ruby/rss
 
 ### net-ftp
+
 * https://github.com/ruby/net-ftp
 
 ### net-imap
+
 * https://github.com/ruby/net-imap
 
 ### net-pop
+
 * https://github.com/ruby/net-pop
 
 ### net-smtp
+
 * https://github.com/ruby/net-smtp
 
 ### matrix
+
 * https://github.com/ruby/matrix
 
 ### prime
+
 * https://github.com/ruby/prime
 
 ### rbs
+
 * https://github.com/ruby/rbs
 
 ### typeprof
+
 * https://github.com/ruby/typeprof
 
 ### debug
+
 * https://github.com/ruby/debug
 
 ### racc
+
 * https://github.com/ruby/racc
 
+#### mutex_m
+
+* https://github.com/ruby/mutex_m
+
+#### getoptlong
+
+* https://github.com/ruby/getoptlong
+
+#### base64
+
+* https://github.com/ruby/base64
+
+#### bigdecimal
+
+* https://github.com/ruby/bigdecimal
+
+#### observer
+
+* https://github.com/ruby/observer
+
+#### abbrev
+
+* https://github.com/ruby/abbrev
+
+#### resolv-replace
+
+* https://github.com/ruby/resolv-replace
+
+#### rinda
+
+* https://github.com/ruby/rinda
+
+#### drb
+
+* https://github.com/ruby/drb
+
+#### nkf
+
+* https://github.com/ruby/nkf
+
+#### syslog
+
+* https://github.com/ruby/syslog
+
+#### csv
+
+* https://github.com/ruby/csv
+
+#### ostruct
+
+* https://github.com/ruby/ostruct
+
+#### pstore
+
+* https://github.com/ruby/pstore
+
+#### benchmark
+
+* https://github.com/ruby/benchmark
+
+#### logger
+
+* https://github.com/ruby/logger
+
+#### rdoc
+
+* https://github.com/ruby/rdoc
+
+#### win32ole
+
+* https://github.com/ruby/win32ole
+
+#### irb
+
+* https://github.com/ruby/irb
+
+#### reline
+
+* https://github.com/ruby/reline
+
+#### readline
+
+* https://github.com/ruby/readline
+
+#### fiddle
+
+* https://github.com/ruby/fiddle
 
 ## Platform Maintainers
+
 ### mswin64 (Microsoft Windows)
-* NAKAMURA Usaku (usa)
+
+* NAKAMURA Usaku ([unak])
 
 ### mingw32 (Minimalist GNU for Windows)
-* Nobuyoshi Nakada (nobu)
+
+* Nobuyoshi Nakada ([nobu])
 
 ### AIX
-* Yutaka Kanemoto (kanemoto)
+
+* Yutaka Kanemoto ([kanemoto])
 
 ### FreeBSD
-* Akinori MUSHA (knu)
+
+* Akinori MUSHA ([knu])
 
 ### Solaris
-* Naohisa Goto (ngoto)
+
+* Naohisa Goto ([ngoto])
 
 ### RHEL, CentOS
-* KOSAKI Motohiro (kosaki)
+
+* KOSAKI Motohiro ([kosaki])
 
 ### macOS
-* Kenta Murata (mrkn)
+
+* Kenta Murata ([mrkn])
 
 ### OpenBSD
-* Jeremy Evans (jeremyevans0)
+
+* Jeremy Evans ([jeremyevans])
 
 ### cygwin, ...
+
 * none. (Maintainer WANTED)
 
 ### WebAssembly/WASI
-* Yuta Saito (katei)
+
+* Yuta Saito ([kateinoigakukun])
+
+[akr]: https://github.com/akr
+[byroot]: https://github.com/byroot
+[colby-swandale]: https://github.com/colby-swandale
+[drbrain]: https://github.com/drbrain
+[duerst]: https://github.com/duerst
+[eban]: https://github.com/eban
+[eileencodes]: https://github.com/eileencodes
+[hasumikin]: https://github.com/hasumikin
+[hsbt]: https://github.com/hsbt
+[ima1zumi]: https://github.com/ima1zumi
+[jeremyevans]: https://github.com/jeremyevans
+[k-tsj]: https://github.com/k-tsj
+[k0kubun]: https://github.com/k0kubun
+[kanemoto]: https://github.com/kanemoto
+[kateinoigakukun]: https://github.com/kateinoigakukun
+[kddnewton]: https://github.com/kddnewton
+[keiju]: https://github.com/keiju
+[knu]: https://github.com/knu
+[ko1]: https://github.com/ko1
+[kosaki]: https://github.com/kosaki
+[kou]: https://github.com/kou
+[mame]: https://github.com/mame
+[marcandre]: https://github.com/marcandre
+[matz]: https://github.com/matz
+[mrkn]: https://github.com/mrkn
+[ngoto]: https://github.com/ngoto
+[nobu]: https://github.com/nobu
+[nurse]: https://github.com/nurse
+[rhenium]: https://github.com/rhenium
+[seki]: https://github.com/seki
+[suketa]: https://github.com/suketa
+[sonots]: https://github.com/sonots
+[st0012]: https://github.com/st0012
+[tenderlove]: https://github.com/tenderlove
+[tompng]: https://github.com/tompng
+[unak]: https://github.com/unak
+[yuki24]: https://github.com/yuki24
diff --git a/doc/marshal.rdoc b/doc/marshal.rdoc
index abf9467262a3e9..740064ade66afa 100644
--- a/doc/marshal.rdoc
+++ b/doc/marshal.rdoc
@@ -188,9 +188,9 @@ bytes:
    result += (byte * 2 ** (exp * 8))
   end
 
-=== Class and Module
+=== +Class+ and +Module+
 
-"c" represents a Class object, "m" represents a Module and "M" represents
+"c" represents a +Class+ object, "m" represents a +Module+ and "M" represents
 either a class or module (this is an old-style for compatibility).  No class
 or module content is included, this type is only a reference.  Following the
 type byte is a byte sequence which is used to look up an existing class or
@@ -301,6 +301,11 @@ sequence containing the user-defined representation of the object.
 The class method +_load+ is called on the class with a string created from the
 byte-sequence.
 
+This type is not recommended for newly created classes, because of some
+restrictions:
+
+- cannot have recursive reference
+
 === User Marshal
 
 "U" represents an object with a user-defined serialization format using the
diff --git a/doc/matchdata/bytebegin.rdoc b/doc/matchdata/bytebegin.rdoc
new file mode 100644
index 00000000000000..5b40a7ef73ce4a
--- /dev/null
+++ b/doc/matchdata/bytebegin.rdoc
@@ -0,0 +1,30 @@
+Returns the offset (in bytes) of the beginning of the specified match.
+
+When non-negative integer argument +n+ is given,
+returns the offset of the beginning of the <tt>n</tt>th match:
+
+  m = /(.)(.)(\d+)(\d)/.match("THX1138.")
+  # => #<MatchData "HX1138" 1:"H" 2:"X" 3:"113" 4:"8">
+  m[0]       # => "HX1138"
+  m.bytebegin(0) # => 1
+  m[3]       # => "113"
+  m.bytebegin(3) # => 3
+
+  m = /(т)(е)(с)/.match('тест')
+  # => #<MatchData "тес" 1:"т" 2:"е" 3:"с">
+  m[0]       # => "тес"
+  m.bytebegin(0) # => 0
+  m[3]       # => "с"
+  m.bytebegin(3) # => 4
+
+When string or symbol argument +name+ is given,
+returns the offset of the beginning for the named match:
+
+  m = /(?<foo>.)(.)(?<bar>.)/.match("hoge")
+  # => #<MatchData "hog" foo:"h" bar:"g">
+  m[:foo]        # => "h"
+  m.bytebegin('foo') # => 0
+  m[:bar]        # => "g"
+  m.bytebegin(:bar)  # => 2
+
+Related: MatchData#byteend, MatchData#byteoffset.
diff --git a/doc/matchdata/byteend.rdoc b/doc/matchdata/byteend.rdoc
new file mode 100644
index 00000000000000..eb576640220b05
--- /dev/null
+++ b/doc/matchdata/byteend.rdoc
@@ -0,0 +1,30 @@
+Returns the offset (in bytes) of the end of the specified match.
+
+When non-negative integer argument +n+ is given,
+returns the offset of the end of the <tt>n</tt>th match:
+
+  m = /(.)(.)(\d+)(\d)/.match("THX1138.")
+  # => #<MatchData "HX1138" 1:"H" 2:"X" 3:"113" 4:"8">
+  m[0]     # => "HX1138"
+  m.byteend(0) # => 7
+  m[3]     # => "113"
+  m.byteend(3) # => 6
+
+  m = /(т)(е)(с)/.match('тест')
+  # => #<MatchData "тес" 1:"т" 2:"е" 3:"с">
+  m[0]     # => "тес"
+  m.byteend(0) # => 6
+  m[3]     # => "с"
+  m.byteend(3) # => 6
+
+When string or symbol argument +name+ is given,
+returns the offset of the end for the named match:
+
+  m = /(?<foo>.)(.)(?<bar>.)/.match("hoge")
+  # => #<MatchData "hog" foo:"h" bar:"g">
+  m[:foo]      # => "h"
+  m.byteend('foo') # => 1
+  m[:bar]      # => "g"
+  m.byteend(:bar)  # => 3
+
+Related: MatchData#bytebegin, MatchData#byteoffset.
diff --git a/doc/math/math.rdoc b/doc/math/math.rdoc
index 7a89df951ce483..29783755646b3c 100644
--- a/doc/math/math.rdoc
+++ b/doc/math/math.rdoc
@@ -1,4 +1,4 @@
-\Module \Math provides methods for basic trigonometric,
+Module \Math provides methods for basic trigonometric,
 logarithmic, and transcendental functions, and for extracting roots.
 
 You can write its constants and method calls thus:
diff --git a/doc/namespace.md b/doc/namespace.md
new file mode 100644
index 00000000000000..eee6b940725bbb
--- /dev/null
+++ b/doc/namespace.md
@@ -0,0 +1,418 @@
+# Namespace - Ruby's in-process separation of Classes and Modules
+
+Namespace is designed to provide separated spaces in a Ruby process, to isolate applications and libraries.
+
+## Known issues
+
+* Experimental warning is shown when ruby starts with `RUBY_NAMESPACE=1` (specify `-W:no-experimental` option to hide it)
+* `bundle install` may fail
+* `require 'active_support'` may fail
+* A wrong current namespace detection happens sometimes in the root namespace
+
+## TODOs
+
+* Identify the CI failure cause and restore temporarily skipped tests (mmtk, test/ruby/test_allocation on i686)
+* Reconstruct current/loading namespace management based on control frames
+* Add the loaded namespace on iseq to check if another namespace tries running the iseq (add a field only when VM_CHECK_MODE?)
+* Delete per-namespace extension files (.so) lazily or process exit
+* Collect rb_classext_t entries for a namespace when the namespace is collected
+* Allocate an rb_namespace_t entry as the root namespace at first, then construct the contents and wrap it as rb_cNamespace instance later (to eliminate root/builtin two namespaces situation)
+* Assign its own TOPLEVEL_BINDING in namespaces
+* Fix `warn` in namespaces to refer `$VERBOSE` in the namespace
+* Make an internal data container `Namespace::Entry` invisible
+* More test cases about `$LOAD_PATH` and `$LOADED_FEATURES`
+* Return classpath and nesting without the namespace prefix in the namespace itself [#21316](https://bugs.ruby-lang.org/issues/21316), [#21318](https://bugs.ruby-lang.org/issues/21318)
+
+## How to use
+
+### Enabling namespace
+
+First, an environment variable should be set at the ruby process bootup: `RUBY_NAMESPACE=1`.
+The only valid value is `1` to enable namespace. Other values (or unset `RUBY_NAMESPACE`) means disabling namespace. And setting the value after Ruby program starts doesn't work.
+
+### Using namespace
+
+`Namespace` class is the entrypoint of namespaces.
+
+```ruby
+ns = Namespace.new
+ns.require('something') # or require_relative, load
+```
+
+The required file (either .rb or .so/.dll/.bundle) is loaded in the namespace (`ns` here). The required/loaded files from `something` will be loaded in the namespace recursively.
+
+```ruby
+# something.rb
+
+X = 1
+
+class Something
+  def self.x = X
+  def x = ::X
+end
+```
+
+Classes/modules, those methods and constants defined in the namespace can be accessed via `ns` object.
+
+```ruby
+p ns::Something.x  # 1
+
+X = 2
+p X                # 2
+p ::X              # 2
+p ns::Something.x  # 1
+p ns::X            # 1
+```
+
+Instance methods defined in the namespace also run with definitions in the namespace.
+
+```ruby
+s = ns::Something.new
+
+p s.x  # 1
+```
+
+## Specifications
+
+### Namespace types
+
+There are two namespace types:
+
+* Root namespace
+* User namespace
+
+There is the root namespace, just a single namespace in a Ruby process. Ruby bootstrap runs in the root namespace, and all builtin classes/modules are defined in the root namespace. (See "Builtin classes and modules".)
+
+User namespaces are to run user-written programs and libraries loaded from user programs. The user's main program (specified by the `ruby` command line argument) is executed in the "main" namespace, which is a user namespace automatically created at the end of Ruby's bootstrap, copied from the root namespace.
+
+When `Namespace.new` is called, an "optional" namespace (a user, non-main namespace) is created, copied from the root namespace. All user namespaces are flat, copied from the root namespace.
+
+### Namespace class and instances
+
+`Namespace` is a top level class, as a subclass of `Module`, and `Namespace` instances are a kind of `Module`.
+
+### Classes and modules defined in namespace
+
+The classes and modules, newly defined in a namespace `ns`, are defined under `ns`. For example, if a class `A` is defined in `ns`, it is actually defined as `ns::A`.
+
+In the namespace `ns`, `ns::A` can be referred to as `A` (and `::A`). From outside of `ns`, it can be referred to as `ns::A`.
+
+The main namespace is exceptional. Top level classes and modules defined in the main namespace are just top level classes and modules.
+
+### Classes and modules reopened in namespace
+
+In namespaces, builtin classes/modules are visible and can be reopened. Those classes/modules can be reopened using `class` or `module` clauses, and class/module definitions can be changed.
+
+The changed definitions are visible only in the namespace. In other namespaces, builtin classes/modules and those instances work without changed definitions.
+
+```ruby
+# in foo.rb
+class String
+  BLANK_PATTERN = /\A\s*\z/
+  def blank?
+    self =~ BLANK_PATTERN
+  end
+end
+
+module Foo
+  def self.foo = "foo"
+
+  def self.foo_is_blank?
+    foo.blank?
+  end
+end
+
+Foo.foo.blank? #=> false
+"foo".blank?   #=> false
+
+# in main.rb
+ns = Namespace.new
+ns.require('foo')
+
+Foo.foo_is_blank? #=> false   (#blank? called in ns)
+
+Foo.foo.blank?    # NoMethodError
+"foo".blank?      # NoMethodError
+String::BLANK_PATTERN # NameError
+```
+
+The main namespace and `ns` are different namespaces, so monkey patches in main are also invisible in `ns`.
+
+### Builtin classes and modules
+
+In the namespace context, "builtin" classes and modules are classes and modules:
+
+* Accessible without any `require` calls in user scripts
+* Defined before any user program start running
+* Including classes/modules loaded by `prelude.rb` (including RubyGems `Gem`, for example)
+
+Hereafter, "builtin classes and modules" will be referred to as just "builtin classes".
+
+### Builtin classes referred via namespace objects
+
+Builtin classes in a namespace `ns` can be referred from other namespace. For example, `ns::String` is a valid reference, and `String` and `ns::String` are identical (`String == ns::String`, `String.object_id == ns::String.object_id`).
+
+`ns::String`-like reference returns just a `String` in the current namespace, so its definition is `String` in the namespace, not in `ns`.
+
+```ruby
+# foo.rb
+class String
+  def self.foo = "foo"
+end
+
+# main.rb
+ns = Namespace.new
+ns.require('foo')
+
+ns::String.foo  # NoMethodError
+```
+
+### Class instance variables, class variables, constants
+
+Builtin classes can have different sets of class instance variables, class variables and constants between namespaces.
+
+```ruby
+# foo.rb
+class Array
+  @v = "foo"
+  @@v = "_foo_"
+  V = "FOO"
+end
+
+Array.instance_variable_get(:@v) #=> "foo"
+Array.class_variable_get(:@@v)   #=> "_foo_"
+Array.const_get(:V)              #=> "FOO"
+
+# main.rb
+ns = Namespace.new
+ns.require('foo')
+
+Array.instance_variable_get(:@v) #=> nil
+Array.class_variable_get(:@@v)   # NameError
+Array.const_get(:V)              # NameError
+```
+
+### Global variables
+
+In namespaces, changes on global variables are also isolated in the namespace. Changes on global variables in a namespace are visible/applied only in the namespace.
+
+```ruby
+# foo.rb
+$foo = "foo"
+$VERBOSE = nil
+
+puts "This appears: '#{$foo}'"
+
+# main.rb
+p $foo      #=> nil
+p $VERBOSE  #=> false
+
+ns = Namespace.new
+ns.require('foo')  # "This appears: 'foo'"
+
+p $foo      #=> nil
+p $VERBOSE  #=> false
+```
+
+### Top level constants
+
+Usually, top level constants are defined as constants of `Object`. In namespaces, top level constants are constants of `Object` in the namespace. And the namespace object `ns`'s constants are strictly equal to constants of `Object`.
+
+```ruby
+# foo.rb
+FOO = 100
+
+FOO         #=> 100
+Object::FOO #=> 100
+
+# main.rb
+ns = Namespace.new
+ns.require('foo')
+
+ns::FOO      #=> 100
+
+FOO          # NameError
+Object::FOO  # NameError
+```
+
+### Top level methods
+
+Top level methods are private instance methods of `Object`, in each namespace.
+
+```ruby
+# foo.rb
+def yay = "foo"
+
+class Foo
+  def self.say = yay
+end
+
+Foo.say #=> "foo"
+yay     #=> "foo"
+
+# main.rb
+ns = Namespace.new
+ns.require('foo')
+
+ns.Foo.say  #=> "foo"
+
+yay  # NoMethodError
+```
+
+There is no way to expose top level methods in namespaces to another namespace.
+(See "Expose top level methods as a method of the namespace object" in "Discussions" section below)
+
+### Namespace scopes
+
+Namespace works in file scope. One `.rb` file runs in a single namespace.
+
+Once a file is loaded in a namespace `ns`, all methods/procs defined/created in the file run in `ns`.
+
+## Implementation details
+
+#### Object Shapes
+
+Once builtin classes are copied and modified in namespaces, its instance variable management fallbacks from Object Shapes to a traditional iv table (st_table) because RClass stores the shape in its `flags`, not in `rb_classext_t`.
+
+#### Size of RClass and rb_classext_t
+
+Namespace requires to move some fields from RClass to `rb_classext_t`, then the size of RClass and `rb_classext_t` is now larger than `4 * RVALUE_SIZE`. It's against the expectation of [Variable Width Allocation](https://rubykaigi.org/2021-takeout/presentations/peterzhu2118.html).
+
+Now the `STATIC_ASSERT` to check the size is commented-out. (See "Minimize the size of RClass and rb_classext_t" in "Discussion" section below)
+
+#### ISeq inline method/constant cache
+
+As described above in "Namespace scopes", an ".rb" file runs in a namespace. So method/constant resolution will be done in a namespace consistently.
+
+That means ISeq inline caches work well even with namespaces. Otherwise, it's a bug.
+
+#### Method call global cache (gccct)
+
+`rb_funcall()` C function refers to the global cc cache table (gccct), and the cache key is calculated with the current namespace.
+
+So, `rb_funcall()` calls have a performance penalty when namespace is enabled.
+
+#### Current namespace and loading namespace
+
+The current namespace is the namespace that the executing code is in. `Namespace.current` returns the current namespace object.
+
+The loading namespace is an internally managed namespace to determine the namespace to load newly required/loaded files. For example, `ns` is the loading namespace when `ns.require("foo")` is called.
+
+## Discussions
+
+#### Namespace#inspect
+
+Currently, `Namespace#inspect` returns values like `"#<Namespace:0x00000001083a5660>"`. This results in the very redundant and poorly visible classpath outside the namespace.
+
+```ruby
+# foo.rb
+class C; end
+
+# main.rb
+ns = Namespace.new
+ns.require('foo')
+
+p ns::C # "#<Namespace:0x00000001083a5660>::C"
+```
+
+And currently, if a namespace is assigned to a constant `NS1`, the classpath output will be `NS1::C`. But the namespace object can be brought to another namespace and the constant `NS1` in the namespace is something different. So the constant-based classpath for namespace is not safe basically.
+
+So we should find a better format to show namespaces. Options are:
+
+* `NS1::C` (only when this namespace is created and assigned to NS1 in the current namespace)
+* `#<Namespace:user:1083a5660>::C` (with namespace type and without preceding 0)
+* or something else
+
+#### Namespace#eval
+
+Testing namespace features needs to create files to be loaded in namespaces. It's not easy nor casual.
+
+If `Namespace` class has an instance method `#eval` to evaluate code in the namespace, it can be helpful.
+
+#### More builtin methods written in Ruby
+
+If namespace is enabled by default, builtin methods can be written in Ruby because it can't be overridden by users' monkey patches. Builtin Ruby methods can be JIT-ed, and it could bring performance reward.
+
+#### Monkey patching methods called by builtin methods
+
+Builtin methods sometimes call other builtin methods. For example, `Hash#map` calls `Hash#each` to retrieve entries to be mapped. Without namespace, Ruby users can overwrite `Hash#each` and expect the behavior change of `Hash#map` as a result.
+
+But with namespaces, `Hash#map` runs in the root namespace. Ruby users can define `Hash#each` only in user namespaces, so users cannot change `Hash#map`'s behavior in this case. To achieve it, users should override both`Hash#map` and `Hash#each` (or only `Hash#map`).
+
+It is a breaking change.
+
+It's an option to change the behavior of methods in the root namespace to refer to definitions in user namespaces. But if we do so, that means we can't proceed with "More builtin methods written in Ruby".
+
+#### Context of \$LOAD\_PATH and \$LOADED\_FEATURES
+
+Global variables `$LOAD_PATH` and `$LOADED_FEATURES` control `require` method behaviors. So those namespaces are determined by the loading namespace instead of the current namespace.
+
+This could potentially conflict with the user's expectations. We should find the solution.
+
+#### Expose top level methods as a method of the namespace object
+
+Currently, top level methods in namespaces are not accessible from outside of the namespace. But there might be a use case to call other namespace's top level methods.
+
+#### Split root and builtin namespace
+
+NOTE: "builtin" namespace is a different one from the "builtin" namespace in the current implementation
+
+Currently, the single "root" namespace is the source of classext CoW. And also, the "root" namespace can load additional files after starting main script evaluation by calling methods which contain lines like `require "openssl"`.
+
+That means, user namespaces can have different sets of definitions according to when it is created.
+
+```
+[root]
+ |
+ |----[main]
+ |
+ |(require "openssl" called in root)
+ |
+ |----[ns1] having OpenSSL
+ |
+ |(remove_const called for OpenSSL in root)
+ |
+ |----[ns2] without OpenSSL
+```
+
+This could cause unexpected behavior differences between user namespaces. It should NOT be a problem because user scripts which refer to `OpenSSL` should call `require "openssl"` by themselves.
+But in the worst case, a script (without `require "openssl"`) runs well in `ns1`, but doesn't run in `ns2`. This situation looks like a "random failure" to users.
+
+An option possible to prevent this situation is to have "root" and "builtin" namespaces.
+
+* root
+  * The namespace for the Ruby process bootstrap, then the source of CoW
+  * After starting the main namespace, no code runs in this namespace
+* builtin
+  * The namespace copied from the root namespace at the same time with "main"
+  * Methods and procs defined in the "root" namespace run in this namespace
+  * Classes and modules required will be loaded in this namespace
+
+This design realizes a consistent source of namespace CoW.
+
+#### Separate cc_tbl and callable_m_tbl, cvc_tbl for less classext CoW
+
+The fields of `rb_classext_t` contains several cache(-like) data, `cc_tbl`(callcache table), `callable_m_tbl`(table of resolved complemented methods) and `cvc_tbl`(class variable cache table).
+
+The classext CoW is triggered when the contents of `rb_classext_t` are changed, including `cc_tbl`, `callable_m_tbl`, and `cvc_tbl`. But those three tables are changed by just calling methods or referring class variables. So, currently, classext CoW is triggered much more times than the original expectation.
+
+If we can move those three tables outside of `rb_classext_t`, the number of copied `rb_classext_t` will be much less than the current implementation.
+
+#### Object Shapes per namespace
+
+Now the classext CoW requires RClass and `rb_classext_t` to fallback its instance variable management from Object Shapes to the traditional `st_table`. It may have a performance penalty.
+
+If we can apply Object Shapes on `rb_classext_t` instead of `RClass`, per-namespace classext can have its own shapes, and it may be able to avoid the performance penalty.
+
+#### Minimize the size of RClass and rb_classext_t
+
+As described in "Size of RClass and rb_classext_t" section above, the size of RClass and `rb_classext_t` is currently larger than `4 * RVALUE_SIZE` (`20 * VALUE_SIZE`). Now the size is `23 * VALUE_SIZE + 7 bits`.
+
+The fields possibly removed from `rb_classext_t` are:
+
+* `cc_tbl`, `callable_m_tbl`, `cvc_tbl` (See the section "Separate cc_tbl and callable_m_tbl, cvc_tbl for less classext CoW" above)
+* `ns_super_subclasses`, `module_super_subclasses`
+  * `RCLASSEXT_SUBCLASSES(RCLASS_EXT_PRIME(RCLASSEXT_SUPER(klass)))->ns_subclasses` can replace it
+  * These fields are used only in GC, how's the actual performance benefit?
+
+If we can move or remove those fields, the size satisfies the assertion (`<= 4 * RVALUE_SIZE`).
diff --git a/doc/optparse/argument_converters.rdoc b/doc/optparse/argument_converters.rdoc
index 4b4b30e8de58b5..532729871c5187 100644
--- a/doc/optparse/argument_converters.rdoc
+++ b/doc/optparse/argument_converters.rdoc
@@ -377,4 +377,4 @@ Executions:
   $ ruby match_converter.rb --capitalize foo
   ["Foo", String]
   $ ruby match_converter.rb --capitalize "foo bar"
-  match_converter.rb:9:in `<main>': invalid argument: --capitalize foo bar (OptionParser::InvalidArgument)
+  match_converter.rb:9:in '<main>': invalid argument: --capitalize foo bar (OptionParser::InvalidArgument)
diff --git a/doc/optparse/option_params.rdoc b/doc/optparse/option_params.rdoc
index 55f9b53dfff266..575ee66cdb0e17 100644
--- a/doc/optparse/option_params.rdoc
+++ b/doc/optparse/option_params.rdoc
@@ -31,7 +31,7 @@ Contents:
     - {Long Names with Optional Arguments}[#label-Long+Names+with+Optional+Arguments]
     - {Long Names with Negation}[#label-Long+Names+with+Negation]
   - {Mixed Names}[#label-Mixed+Names]
-- {Argument Styles}[#label-Argument+Styles]
+- {Argument Strings}[#label-Argument+Strings]
 - {Argument Values}[#label-Argument+Values]
   - {Explicit Argument Values}[#label-Explicit+Argument+Values]
     - {Explicit Values in Array}[#label-Explicit+Values+in+Array]
@@ -91,7 +91,7 @@ Executions:
   Usage: short_required [options]
       -xXXX                            Short name with required argument
   $ ruby short_required.rb -x
-  short_required.rb:6:in `<main>': missing argument: -x (OptionParser::MissingArgument)
+  short_required.rb:6:in '<main>': missing argument: -x (OptionParser::MissingArgument)
   $ ruby short_required.rb -x FOO
   ["-x", "FOO"]
 
@@ -181,7 +181,7 @@ Executions:
   Usage: long_required [options]
           --xxx XXX                    Long name with required argument
   $ ruby long_required.rb --xxx
-  long_required.rb:6:in `<main>': missing argument: --xxx (OptionParser::MissingArgument)
+  long_required.rb:6:in '<main>': missing argument: --xxx (OptionParser::MissingArgument)
   $ ruby long_required.rb --xxx FOO
   ["--xxx", "FOO"]
 
@@ -243,11 +243,11 @@ Usage: mixed_names [options]
   $ ruby mixed_names.rb --xxx
   ["--xxx", true]
   $ ruby mixed_names.rb -y
-  mixed_names.rb:12:in `<main>': missing argument: -y (OptionParser::MissingArgument)
+  mixed_names.rb:12:in '<main>': missing argument: -y (OptionParser::MissingArgument)
   $ ruby mixed_names.rb -y FOO
   ["--yyy", "FOO"]
   $ ruby mixed_names.rb --yyy
-  mixed_names.rb:12:in `<main>': missing argument: --yyy (OptionParser::MissingArgument)
+  mixed_names.rb:12:in '<main>': missing argument: --yyy (OptionParser::MissingArgument)
   $ ruby mixed_names.rb --yyy BAR
   ["--yyy", "BAR"]
   $ ruby mixed_names.rb -z
@@ -279,7 +279,7 @@ Executions:
   Usage: argument_keywords [options]
       -x, --xxx                        Required argument
   $ ruby argument_styles.rb --xxx
-  argument_styles.rb:6:in `<main>': missing argument: --xxx (OptionParser::MissingArgument)
+  argument_styles.rb:6:in '<main>': missing argument: --xxx (OptionParser::MissingArgument)
   $ ruby argument_styles.rb --xxx FOO
   ["--xxx", "FOO"]
 
@@ -298,7 +298,7 @@ Executions:
   Usage: argument_strings [options]
       -x, --xxx=XXX                    Required argument
   $ ruby argument_strings.rb --xxx
-  argument_strings.rb:9:in `<main>': missing argument: --xxx (OptionParser::MissingArgument)
+  argument_strings.rb:9:in '<main>': missing argument: --xxx (OptionParser::MissingArgument)
   $ ruby argument_strings.rb --xxx FOO
   ["--xxx", "FOO"]
 
@@ -331,7 +331,7 @@ Executions:
       -xXXX                            Values for required argument
       -y [YYY]                         Values for optional argument
   $ ruby explicit_array_values.rb -x
-  explicit_array_values.rb:9:in `<main>': missing argument: -x (OptionParser::MissingArgument)
+  explicit_array_values.rb:9:in '<main>': missing argument: -x (OptionParser::MissingArgument)
   $ ruby explicit_array_values.rb -x foo
   ["-x", "foo"]
   $ ruby explicit_array_values.rb -x f
@@ -339,9 +339,9 @@ Executions:
   $ ruby explicit_array_values.rb -x bar
   ["-x", "bar"]
   $ ruby explicit_array_values.rb -y ba
-  explicit_array_values.rb:9:in `<main>': ambiguous argument: -y ba (OptionParser::AmbiguousArgument)
+  explicit_array_values.rb:9:in '<main>': ambiguous argument: -y ba (OptionParser::AmbiguousArgument)
   $ ruby explicit_array_values.rb -x baz
-  explicit_array_values.rb:9:in `<main>': invalid argument: -x baz (OptionParser::InvalidArgument)
+  explicit_array_values.rb:9:in '<main>': invalid argument: -x baz (OptionParser::InvalidArgument)
 
 
 ===== Explicit Values in Hash
@@ -361,7 +361,7 @@ Executions:
       -xXXX                            Values for required argument
       -y [YYY]                         Values for optional argument
   $ ruby explicit_hash_values.rb -x
-  explicit_hash_values.rb:9:in `<main>': missing argument: -x (OptionParser::MissingArgument)
+  explicit_hash_values.rb:9:in '<main>': missing argument: -x (OptionParser::MissingArgument)
   $ ruby explicit_hash_values.rb -x foo
   ["-x", 0]
   $ ruby explicit_hash_values.rb -x f
@@ -369,7 +369,7 @@ Executions:
   $ ruby explicit_hash_values.rb -x bar
   ["-x", 1]
   $ ruby explicit_hash_values.rb -x baz
-  explicit_hash_values.rb:9:in `<main>': invalid argument: -x baz (OptionParser::InvalidArgument)
+  explicit_hash_values.rb:9:in '<main>': invalid argument: -x baz (OptionParser::InvalidArgument)
   $ ruby explicit_hash_values.rb -y
   ["-y", nil]
   $ ruby explicit_hash_values.rb -y baz
@@ -377,14 +377,15 @@ Executions:
   $ ruby explicit_hash_values.rb -y bat
   ["-y", 3]
   $ ruby explicit_hash_values.rb -y ba
-  explicit_hash_values.rb:9:in `<main>': ambiguous argument: -y ba (OptionParser::AmbiguousArgument)
+  explicit_hash_values.rb:9:in '<main>': ambiguous argument: -y ba (OptionParser::AmbiguousArgument)
   $ ruby explicit_hash_values.rb -y bam
   ["-y", nil]
 
 ==== Argument Value Patterns
 
 You can restrict permissible argument values
-by specifying a Regexp that the given argument must match.
+by specifying a +Regexp+ that the given argument must match,
+or a +Range+ or +Array+ that the converted value must be included in.
 
 File +matched_values.rb+ defines options with matched argument values.
 
@@ -395,12 +396,22 @@ Executions:
   $ ruby matched_values.rb --help
   Usage: matched_values [options]
           --xxx XXX                    Matched values
+          --yyy YYY                    Check by range
+          --zzz ZZZ                    Check by list
   $ ruby matched_values.rb --xxx foo
   ["--xxx", "foo"]
   $ ruby matched_values.rb --xxx FOO
   ["--xxx", "FOO"]
   $ ruby matched_values.rb --xxx bar
-  matched_values.rb:6:in `<main>': invalid argument: --xxx bar (OptionParser::InvalidArgument)
+  matched_values.rb:12:in '<main>': invalid argument: --xxx bar (OptionParser::InvalidArgument)
+  $ ruby matched_values.rb --yyy 1
+  ["--yyy", 1]
+  $ ruby matched_values.rb --yyy 4
+  matched_values.rb:12:in '<main>': invalid argument: --yyy 4 (OptionParser::InvalidArgument)
+  $ ruby matched_values.rb --zzz 1
+  ["--zzz", 1]
+  $ ruby matched_values.rb --zzz 2
+  matched_values.rb:12:in '<main>': invalid argument: --zzz 2 (OptionParser::InvalidArgument)
 
 === Argument Converters
 
diff --git a/doc/optparse/ruby/argument_abbreviation.rb b/doc/optparse/ruby/argument_abbreviation.rb
new file mode 100644
index 00000000000000..49007ebe69595f
--- /dev/null
+++ b/doc/optparse/ruby/argument_abbreviation.rb
@@ -0,0 +1,9 @@
+require 'optparse'
+parser = OptionParser.new
+parser.on('-x', '--xxx=VALUE', %w[ABC def], 'Argument abbreviations') do |value|
+  p ['--xxx', value]
+end
+parser.on('-y', '--yyy=VALUE', {"abc"=>"XYZ", def: "FOO"}, 'Argument abbreviations') do |value|
+  p ['--yyy', value]
+end
+parser.parse!
diff --git a/doc/optparse/ruby/matched_values.rb b/doc/optparse/ruby/matched_values.rb
index f184ca8474a852..a1aba140e6d86a 100644
--- a/doc/optparse/ruby/matched_values.rb
+++ b/doc/optparse/ruby/matched_values.rb
@@ -3,4 +3,10 @@
 parser.on('--xxx XXX', /foo/i, 'Matched values') do |value|
   p ['--xxx', value]
 end
+parser.on('--yyy YYY', Integer, 'Check by range', 1..3) do |value|
+  p ['--yyy', value]
+end
+parser.on('--zzz ZZZ', Integer, 'Check by list', [1, 3, 4]) do |value|
+  p ['--zzz', value]
+end
 parser.parse!
diff --git a/doc/optparse/tutorial.rdoc b/doc/optparse/tutorial.rdoc
index b104379cf767cc..1134f94ddf0d46 100644
--- a/doc/optparse/tutorial.rdoc
+++ b/doc/optparse/tutorial.rdoc
@@ -111,7 +111,7 @@ Executions:
   ["x", true]
   ["input_file.txt", "output_file.txt"]
   $ ruby basic.rb -a
-  basic.rb:16:in `<main>': invalid option: -a (OptionParser::InvalidOption)
+  basic.rb:16:in '<main>': invalid option: -a (OptionParser::InvalidOption)
 
 === Defining Options
 
@@ -232,11 +232,11 @@ Executions:
   $ ruby mixed_names.rb --xxx
   ["--xxx", true]
   $ ruby mixed_names.rb -y
-  mixed_names.rb:12:in `<main>': missing argument: -y (OptionParser::MissingArgument)
+  mixed_names.rb:12:in '<main>': missing argument: -y (OptionParser::MissingArgument)
   $ ruby mixed_names.rb -y FOO
   ["--yyy", "FOO"]
   $ ruby mixed_names.rb --yyy
-  mixed_names.rb:12:in `<main>': missing argument: --yyy (OptionParser::MissingArgument)
+  mixed_names.rb:12:in '<main>': missing argument: --yyy (OptionParser::MissingArgument)
   $ ruby mixed_names.rb --yyy BAR
   ["--yyy", "BAR"]
   $ ruby mixed_names.rb -z
@@ -270,9 +270,9 @@ Executions:
   $ ruby name_abbrev.rb --draft
   ["--draft", true]
   $ ruby name_abbrev.rb --d
-  name_abbrev.rb:9:in `<main>': ambiguous option: --d (OptionParser::AmbiguousOption)
+  name_abbrev.rb:9:in '<main>': ambiguous option: --d (OptionParser::AmbiguousOption)
   $ ruby name_abbrev.rb --dr
-  name_abbrev.rb:9:in `<main>': ambiguous option: --dr (OptionParser::AmbiguousOption)
+  name_abbrev.rb:9:in '<main>': ambiguous option: --dr (OptionParser::AmbiguousOption)
   $ ruby name_abbrev.rb --dry
   ["--dry-run", true]
   $ ruby name_abbrev.rb --dra
@@ -285,7 +285,7 @@ You can disable abbreviation using method +require_exact+.
 Executions:
 
   $ ruby no_abbreviation.rb --dry-ru
-  no_abbreviation.rb:10:in `<main>': invalid option: --dry-ru (OptionParser::InvalidOption)
+  no_abbreviation.rb:10:in '<main>': invalid option: --dry-ru (OptionParser::InvalidOption)
   $ ruby no_abbreviation.rb --dry-run
   ["--dry-run", true]
 
@@ -323,7 +323,7 @@ Executions:
 Omitting a required argument raises an error:
 
   $ ruby required_argument.rb -x
-  required_argument.rb:9:in `<main>': missing argument: -x (OptionParser::MissingArgument)
+  required_argument.rb:9:in '<main>': missing argument: -x (OptionParser::MissingArgument)
 
 ==== Option with Optional Argument
 
@@ -351,6 +351,29 @@ Executions:
 
 Omitting an optional argument does not raise an error.
 
+==== Argument Abbreviations
+
+Specify an argument list as an Array or a Hash.
+
+  :include: ruby/argument_abbreviation.rb
+
+When an argument is abbreviated, the expanded argument yielded.
+
+Executions:
+
+  $ ruby argument_abbreviation.rb --help
+  Usage: argument_abbreviation [options]
+  Usage: argument_abbreviation [options]
+      -x, --xxx=VALUE                  Argument abbreviations
+      -y, --yyy=VALUE                  Argument abbreviations
+  $ ruby argument_abbreviation.rb --xxx A
+  ["--xxx", "ABC"]
+  $ ruby argument_abbreviation.rb --xxx c
+  argument_abbreviation.rb:9:in '<main>': invalid argument: --xxx c (OptionParser::InvalidArgument)
+  $ ruby argument_abbreviation.rb --yyy a --yyy d
+  ["--yyy", "XYZ"]
+  ["--yyy", "FOO"]
+
 === Argument Values
 
 Permissible argument values may be restricted
@@ -380,7 +403,7 @@ Executions:
       -xXXX                            Values for required argument
       -y [YYY]                         Values for optional argument
   $ ruby explicit_array_values.rb -x
-  explicit_array_values.rb:9:in `<main>': missing argument: -x (OptionParser::MissingArgument)
+  explicit_array_values.rb:9:in '<main>': missing argument: -x (OptionParser::MissingArgument)
   $ ruby explicit_array_values.rb -x foo
   ["-x", "foo"]
   $ ruby explicit_array_values.rb -x f
@@ -388,9 +411,9 @@ Executions:
   $ ruby explicit_array_values.rb -x bar
   ["-x", "bar"]
   $ ruby explicit_array_values.rb -y ba
-  explicit_array_values.rb:9:in `<main>': ambiguous argument: -y ba (OptionParser::AmbiguousArgument)
+  explicit_array_values.rb:9:in '<main>': ambiguous argument: -y ba (OptionParser::AmbiguousArgument)
   $ ruby explicit_array_values.rb -x baz
-  explicit_array_values.rb:9:in `<main>': invalid argument: -x baz (OptionParser::InvalidArgument)
+  explicit_array_values.rb:9:in '<main>': invalid argument: -x baz (OptionParser::InvalidArgument)
 
 
 ===== Explicit Values in Hash
@@ -410,7 +433,7 @@ Executions:
       -xXXX                            Values for required argument
       -y [YYY]                         Values for optional argument
   $ ruby explicit_hash_values.rb -x
-  explicit_hash_values.rb:9:in `<main>': missing argument: -x (OptionParser::MissingArgument)
+  explicit_hash_values.rb:9:in '<main>': missing argument: -x (OptionParser::MissingArgument)
   $ ruby explicit_hash_values.rb -x foo
   ["-x", 0]
   $ ruby explicit_hash_values.rb -x f
@@ -418,7 +441,7 @@ Executions:
   $ ruby explicit_hash_values.rb -x bar
   ["-x", 1]
   $ ruby explicit_hash_values.rb -x baz
-  explicit_hash_values.rb:9:in `<main>': invalid argument: -x baz (OptionParser::InvalidArgument)
+  explicit_hash_values.rb:9:in '<main>': invalid argument: -x baz (OptionParser::InvalidArgument)
   $ ruby explicit_hash_values.rb -y
   ["-y", nil]
   $ ruby explicit_hash_values.rb -y baz
@@ -426,7 +449,7 @@ Executions:
   $ ruby explicit_hash_values.rb -y bat
   ["-y", 3]
   $ ruby explicit_hash_values.rb -y ba
-  explicit_hash_values.rb:9:in `<main>': ambiguous argument: -y ba (OptionParser::AmbiguousArgument)
+  explicit_hash_values.rb:9:in '<main>': ambiguous argument: -y ba (OptionParser::AmbiguousArgument)
   $ ruby explicit_hash_values.rb -y bam
   ["-y", nil]
 
@@ -449,7 +472,7 @@ Executions:
   $ ruby matched_values.rb --xxx FOO
   ["--xxx", "FOO"]
   $ ruby matched_values.rb --xxx bar
-  matched_values.rb:6:in `<main>': invalid argument: --xxx bar (OptionParser::InvalidArgument)
+  matched_values.rb:6:in '<main>': invalid argument: --xxx bar (OptionParser::InvalidArgument)
 
 === Keyword Argument +into+
 
@@ -501,7 +524,7 @@ Executions:
       -y, --yyyYYY                     Short and long, required argument
       -z, --zzz [ZZZ]                  Short and long, optional argument
   $ ruby missing_options.rb --yyy FOO
-  missing_options.rb:11:in `<main>': Missing required options: [:xxx, :zzz] (RuntimeError)
+  missing_options.rb:11:in '<main>': Missing required options: [:xxx, :zzz] (RuntimeError)
 
 ==== Default Values for Options
 
diff --git a/doc/packed_data.rdoc b/doc/packed_data.rdoc
index 05d9ab758a0a8b..b33eed58e7e47c 100644
--- a/doc/packed_data.rdoc
+++ b/doc/packed_data.rdoc
@@ -1,15 +1,116 @@
-== Packed \Data
+= Packed \Data
+
+== Quick Reference
+
+These tables summarize the directives for packing and unpacking.
+
+=== For Integers
+
+  Directive     | Meaning
+  --------------|---------------------------------------------------------------
+  C             | 8-bit unsigned (unsigned char)
+  S             | 16-bit unsigned, native endian (uint16_t)
+  L             | 32-bit unsigned, native endian (uint32_t)
+  Q             | 64-bit unsigned, native endian (uint64_t)
+  J             | pointer width unsigned, native endian (uintptr_t)
+
+  c             | 8-bit signed (signed char)
+  s             | 16-bit signed, native endian (int16_t)
+  l             | 32-bit signed, native endian (int32_t)
+  q             | 64-bit signed, native endian (int64_t)
+  j             | pointer width signed, native endian (intptr_t)
+
+  S_ S!         | unsigned short, native endian
+  I I_ I!       | unsigned int, native endian
+  L_ L!         | unsigned long, native endian
+  Q_ Q!         | unsigned long long, native endian
+                |   (raises ArgumentError if the platform has no long long type)
+  J!            | uintptr_t, native endian (same with J)
+
+  s_ s!         | signed short, native endian
+  i i_ i!       | signed int, native endian
+  l_ l!         | signed long, native endian
+  q_ q!         | signed long long, native endian
+                |   (raises ArgumentError if the platform has no long long type)
+  j!            | intptr_t, native endian (same with j)
+
+  S> s> S!> s!> | each the same as the directive without >, but big endian
+  L> l> L!> l!> |   S> is the same as n
+  I!> i!>       |   L> is the same as N
+  Q> q> Q!> q!> |
+  J> j> J!> j!> |
+
+  S< s< S!< s!< | each the same as the directive without <, but little endian
+  L< l< L!< l!< |   S< is the same as v
+  I!< i!<       |   L< is the same as V
+  Q< q< Q!< q!< |
+  J< j< J!< j!< |
+
+  n             | 16-bit unsigned, network (big-endian) byte order
+  N             | 32-bit unsigned, network (big-endian) byte order
+  v             | 16-bit unsigned, VAX (little-endian) byte order
+  V             | 32-bit unsigned, VAX (little-endian) byte order
+
+  U             | UTF-8 character
+  w             | BER-compressed integer
+
+=== For Floats
+
+  Directive | Meaning
+  ----------|--------------------------------------------------
+  D d       | double-precision, native format
+  F f       | single-precision, native format
+  E         | double-precision, little-endian byte order
+  e         | single-precision, little-endian byte order
+  G         | double-precision, network (big-endian) byte order
+  g         | single-precision, network (big-endian) byte order
+
+=== For Strings
+
+  Directive | Meaning
+  ----------|-----------------------------------------------------------------
+  A         | arbitrary binary string (remove trailing nulls and ASCII spaces)
+  a         | arbitrary binary string
+  Z         | null-terminated string
+  B         | bit string (MSB first)
+  b         | bit string (LSB first)
+  H         | hex string (high nibble first)
+  h         | hex string (low nibble first)
+  u         | UU-encoded string
+  M         | quoted-printable, MIME encoding (see RFC2045)
+  m         | base64 encoded string (RFC 2045) (default)
+            |   (base64 encoded string (RFC 4648) if followed by 0)
+  P         | pointer to a structure (fixed-length string)
+  p         | pointer to a null-terminated string
+
+=== Additional Directives for Packing
+
+  Directive | Meaning
+  ----------|----------------------------------------------------------------
+  @         | moves to absolute position
+  X         | back up a byte
+  x         | null byte
+
+=== Additional Directives for Unpacking
+
+  Directive | Meaning
+  ----------|----------------------------------------------------------------
+  @         | skip to the offset given by the length argument
+  X         | skip backward one byte
+  x         | skip forward one byte
+
+== Packing and Unpacking
 
 Certain Ruby core methods deal with packing and unpacking data:
 
-- \Method Array#pack:
+- Method Array#pack:
   Formats each element in array +self+ into a binary string;
   returns that string.
-- \Method String#unpack:
+- Method String#unpack:
   Extracts data from string +self+,
   forming objects that become the elements of a new array;
   returns that array.
-- \Method String#unpack1:
+- Method String#unpack1:
   Does the same, but unpacks and returns only the first extracted object.
 
 Each of these methods accepts a string +template+,
@@ -64,9 +165,9 @@ If elements don't fit the provided directive, only least significant bits are en
 
     [257].pack("C").unpack("C") # => [1]
 
-=== Packing \Method
+== Packing Method
 
-\Method Array#pack accepts optional keyword argument
+Method Array#pack accepts optional keyword argument
 +buffer+ that specifies the target string (instead of a new string):
 
   [65, 66].pack('C*', buffer: 'foo') # => "fooAB"
@@ -76,7 +177,7 @@ The method can accept a block:
   # Packed string is passed to the block.
   [65, 66].pack('C*') {|s| p s }    # => "AB"
 
-=== Unpacking Methods
+== Unpacking Methods
 
 Methods String#unpack and String#unpack1 each accept
 an optional keyword argument +offset+ that specifies an offset
@@ -95,12 +196,12 @@ Both methods can accept a block:
   # The single unpacked object is passed to the block.
   'AB'.unpack1('C*') {|ele| p ele } # => 65
 
-=== \Integer Directives
+== \Integer Directives
 
 Each integer directive specifies the packing or unpacking
 for one element in the input or output array.
 
-==== 8-Bit \Integer Directives
+=== 8-Bit \Integer Directives
 
 - <tt>'c'</tt> - 8-bit signed integer
   (like C <tt>signed char</tt>):
@@ -116,7 +217,7 @@ for one element in the input or output array.
     s = [0, 1, -1].pack('C*') # => "\x00\x01\xFF"
     s.unpack('C*')            # => [0, 1, 255]
 
-==== 16-Bit \Integer Directives
+=== 16-Bit \Integer Directives
 
 - <tt>'s'</tt> - 16-bit signed integer, native-endian
   (like C <tt>int16_t</tt>):
@@ -146,7 +247,7 @@ for one element in the input or output array.
     s.unpack('v*')
     # => [0, 1, 65535, 32767, 32768, 65535]
 
-==== 32-Bit \Integer Directives
+=== 32-Bit \Integer Directives
 
 - <tt>'l'</tt> - 32-bit signed integer, native-endian
   (like C <tt>int32_t</tt>):
@@ -178,7 +279,7 @@ for one element in the input or output array.
     s.unpack('v*')
     # => [0, 0, 1, 0, 65535, 65535]
 
-==== 64-Bit \Integer Directives
+=== 64-Bit \Integer Directives
 
 - <tt>'q'</tt> - 64-bit signed integer, native-endian
   (like C <tt>int64_t</tt>):
@@ -196,7 +297,7 @@ for one element in the input or output array.
     s.unpack('Q*')
     # => [578437695752307201, 17940646550795321087]
 
-==== Platform-Dependent \Integer Directives
+=== Platform-Dependent \Integer Directives
 
 - <tt>'i'</tt> - Platform-dependent width signed integer,
   native-endian (like C <tt>int</tt>):
@@ -214,25 +315,23 @@ for one element in the input or output array.
     s.unpack('I*')
     # => [67305985, 4244504319]
 
-==== Pointer Directives
-
-- <tt>'j'</tt> - 64-bit pointer-width signed integer,
-  native-endian (like C <tt>intptr_t</tt>):
+- <tt>'j'</tt> - Pointer-width signed integer, native-endian
+  (like C <tt>intptr_t</tt>):
 
     s = [67305985, -50462977].pack('j*')
     # => "\x01\x02\x03\x04\x00\x00\x00\x00\xFF\xFE\xFD\xFC\xFF\xFF\xFF\xFF"
     s.unpack('j*')
     # => [67305985, -50462977]
 
-- <tt>'j'</tt> - 64-bit pointer-width unsigned integer,
-  native-endian (like C <tt>uintptr_t</tt>):
+- <tt>'J'</tt> - Pointer-width unsigned integer, native-endian
+  (like C <tt>uintptr_t</tt>):
 
     s = [67305985, 4244504319].pack('J*')
     # => "\x01\x02\x03\x04\x00\x00\x00\x00\xFF\xFE\xFD\xFC\x00\x00\x00\x00"
     s.unpack('J*')
     # => [67305985, 4244504319]
 
-==== Other \Integer Directives
+=== Other \Integer Directives
 
 - <tt>'U'</tt> - UTF-8 character:
 
@@ -242,38 +341,37 @@ for one element in the input or output array.
     # => [4194304]
 
 - <tt>'w'</tt> - BER-encoded integer
-  (see {BER enocding}[https://en.wikipedia.org/wiki/X.690#BER_encoding]):
+  (see {BER encoding}[https://en.wikipedia.org/wiki/X.690#BER_encoding]):
 
     s = [1073741823].pack('w*')
     # => "\x83\xFF\xFF\xFF\x7F"
     s.unpack('w*')
     # => [1073741823]
 
-==== Modifiers for \Integer Directives
-
-For directives in
-<tt>'i'</tt>,
-<tt>'I'</tt>,
-<tt>'s'</tt>,
-<tt>'S'</tt>,
-<tt>'l'</tt>,
-<tt>'L'</tt>,
-<tt>'q'</tt>,
-<tt>'Q'</tt>,
-<tt>'j'</tt>, and
-<tt>'J'</tt>,
-these modifiers may be suffixed:
-
-- <tt>'!'</tt> or <tt>'_'</tt> - Underlying platform’s native size.
+=== Modifiers for \Integer Directives
+
+For the following directives, <tt>'!'</tt> or <tt>'_'</tt> modifiers may be
+suffixed as underlying platform’s native size.
+
+- <tt>'i'</tt>, <tt>'I'</tt> - C <tt>int</tt>, always native size.
+- <tt>'s'</tt>, <tt>'S'</tt> - C <tt>short</tt>.
+- <tt>'l'</tt>, <tt>'L'</tt> - C <tt>long</tt>.
+- <tt>'q'</tt>, <tt>'Q'</tt> - C <tt>long long</tt>, if available.
+- <tt>'j'</tt>, <tt>'J'</tt> - C <tt>intptr_t</tt>, always native size.
+
+Native size modifiers are silently ignored for always native size directives.
+
+The endian modifiers also may be suffixed in the directives above:
+
 - <tt>'>'</tt> - Big-endian.
 - <tt>'<'</tt> - Little-endian.
 
-=== \Float Directives
+== \Float Directives
 
 Each float directive specifies the packing or unpacking
 for one element in the input or output array.
 
-==== Single-Precision \Float Directives
+=== Single-Precision \Float Directives
 
 - <tt>'F'</tt> or <tt>'f'</tt> - Native format:
 
@@ -290,7 +388,7 @@ for one element in the input or output array.
     s = [3.0].pack('g') # => "@@\x00\x00"
     s.unpack('g')       # => [3.0]
 
-==== Double-Precision \Float Directives
+=== Double-Precision \Float Directives
 
 - <tt>'D'</tt> or <tt>'d'</tt> - Native format:
 
@@ -317,12 +415,12 @@ A float directive may be infinity or not-a-number:
   [nan].pack('f')                # => "\x00\x00\xC0\x7F"
   "\x00\x00\xC0\x7F".unpack('f') # => [NaN]
 
-=== \String Directives
+== \String Directives
 
 Each string directive specifies the packing or unpacking
 for one byte in the input or output string.
 
-==== Binary \String Directives
+=== Binary \String Directives
 
 - <tt>'A'</tt> - Arbitrary binary string (space padded; count is width);
   +nil+ is treated as the empty string:
@@ -380,7 +478,7 @@ for one byte in the input or output string.
     "foo".unpack('Z*')      # => ["foo"]
     "foo\0bar".unpack('Z*') # => ["foo"] # Does not read past "\0".
 
-==== Bit \String Directives
+=== Bit \String Directives
 
 - <tt>'B'</tt> - Bit string (high byte first):
 
@@ -424,7 +522,7 @@ for one byte in the input or output string.
     "\x01".unpack("b2") # => ["10"]
     "\x01".unpack("b3") # => ["100"]
 
-==== Hex \String Directives
+=== Hex \String Directives
 
 - <tt>'H'</tt> - Hex string (high nibble first):
 
@@ -470,7 +568,7 @@ for one byte in the input or output string.
     "\x01\xfe".unpack('h4') # => ["10ef"]
     "\x01\xfe".unpack('h5') # => ["10ef"]
 
-==== Pointer \String Directives
+=== Pointer \String Directives
 
 - <tt>'P'</tt> - Pointer to a structure (fixed-length string):
 
@@ -488,7 +586,7 @@ for one byte in the input or output string.
     ("\0" * 8).unpack("p") # => [nil]
     [nil].pack("p")        # => "\x00\x00\x00\x00\x00\x00\x00\x00"
 
-==== Other \String Directives
+=== Other \String Directives
 
 - <tt>'M'</tt> - Quoted printable, MIME encoding;
   text mode, but input must use LF and output LF;
@@ -557,34 +655,52 @@ for one byte in the input or output string.
 
 - <tt>'u'</tt> - UU-encoded string:
 
-    [0].pack("U")          # => "\u0000"
-    [0x3fffffff].pack("U") # => "\xFC\xBF\xBF\xBF\xBF\xBF"
-    [0x40000000].pack("U") # => "\xFD\x80\x80\x80\x80\x80"
-    [0x7fffffff].pack("U") # => "\xFD\xBF\xBF\xBF\xBF\xBF"
+    [""].pack("u")        # => ""
+    ["a"].pack("u")       # => "!80``\n"
+    ["aaa"].pack("u")     # => "#86%A\n"
 
-=== Offset Directives
+    "".unpack("u")        # => [""]
+    "#86)C\n".unpack("u") # => ["abc"]
+
+== Offset Directives
 
 - <tt>'@'</tt> - Begin packing at the given byte offset;
-  for packing, null fill if necessary:
+  for packing, null fill or shrink if necessary:
 
-    [1, 2].pack("C@0C") # => "\x02"
-    [1, 2].pack("C@1C") # => "\x01\x02"
-    [1, 2].pack("C@5C") # => "\x01\x00\x00\x00\x00\x02"
+    [1, 2].pack("C@0C")     # => "\x02"
+    [1, 2].pack("C@1C")     # => "\x01\x02"
+    [1, 2].pack("C@5C")     # => "\x01\x00\x00\x00\x00\x02"
+    [*1..5].pack("CCCC@2C") # => "\x01\x02\x05"
+
+  For unpacking, cannot to move to outside the string:
 
     "\x01\x00\x00\x02".unpack("C@3C") # => [1, 2]
     "\x00".unpack("@1C")              # => [nil]
+    "\x00".unpack("@2C")              # Raises ArgumentError.
 
-- <tt>'X'</tt> - Back up a byte:
+- <tt>'X'</tt> - For packing, shrink for the given byte offset:
 
     [0, 1, 2].pack("CCXC")    # => "\x00\x02"
     [0, 1, 2].pack("CCX2C")   # => "\x02"
+
+  For unpacking; rewind unpacking position for the given byte offset:
+
     "\x00\x02".unpack("CCXC") # => [0, 2, 2]
 
-=== Null Byte Direcive
+  Cannot to move to outside the string:
 
-- <tt>'x'</tt> - Null byte:
+    [0, 1, 2].pack("CCX3C")   # Raises ArgumentError.
+    "\x00\x02".unpack("CX3C") # Raises ArgumentError.
+
+- <tt>'x'</tt> - Begin packing at after the given byte offset;
+  for packing, null fill if necessary:
 
     [].pack("x0")                # => ""
     [].pack("x")                 # => "\x00"
     [].pack("x8")                # => "\x00\x00\x00\x00\x00\x00\x00\x00"
+
+  For unpacking, cannot to move to outside the string:
+
     "\x00\x00\x02".unpack("CxC") # => [0, 2]
+    "\x00\x00\x02".unpack("x3C") # => [nil]
+    "\x00\x00\x02".unpack("x4C") # Raises ArgumentError
diff --git a/doc/pty/README.expect.ja b/doc/pty/README.expect.ja
index 7c0456f24fe504..a4eb6b01df24a0 100644
--- a/doc/pty/README.expect.ja
+++ b/doc/pty/README.expect.ja
@@ -1,21 +1,23 @@
-	README for expect
+= README for expect
 		by A. Ito, 28 October, 1998
 
-  Expectライブラリは，tcl の expect パッケージと似たような機能を
+Expectライブラリは，tcl の expect パッケージと似たような機能を
 IOクラスに追加します．
 
-  追加されるメソッドの使い方は次の通りです．
+追加されるメソッドの使い方は次の通りです．
 
-   IO#expect(pattern,timeout=9999999)
+[IO#expect(pattern,timeout=9999999)]
 
-pattern は String か Regexp のインスタンス，timeout は Fixnum
-のインスタンスです．timeout は省略できます．
-  このメソッドがブロックなしで呼ばれた場合，まずレシーバである
-IOオブジェクトから pattern にマッチするパターンが読みこまれる
-まで待ちます．パターンが得られたら，そのパターンに関する配列を
-返します．配列の最初の要素は，pattern にマッチするまでに読みこ
-まれた内容の文字列です．2番目以降の要素は，pattern の正規表現
-の中にアンカーがあった場合に，そのアンカーにマッチする部分です．
-もしタイムアウトが起きた場合は，このメソッドはnilを返します．
-  このメソッドがブロック付きで呼ばれた場合には，マッチした要素の
-配列がブロック引数として渡され，ブロックが評価されます．
+   _pattern_ は String か Regexp のインスタンス，_timeout_ は Fixnum
+   のインスタンスです．_timeout_ は省略できます．
+
+   このメソッドがブロックなしで呼ばれた場合，まずレシーバである
+   IOオブジェクトから _pattern_ にマッチするパターンが読みこまれる
+   まで待ちます．パターンが得られたら，そのパターンに関する配列を
+   返します．配列の最初の要素は，_pattern_ にマッチするまでに読みこ
+   まれた内容の文字列です．2番目以降の要素は，_pattern_ の正規表現
+   の中にアンカーがあった場合に，そのアンカーにマッチする部分です．
+   もしタイムアウトが起きた場合は，このメソッドは +nil+ を返します．
+
+   このメソッドがブロック付きで呼ばれた場合には，マッチした要素の
+   配列がブロック引数として渡され，ブロックが評価されます．
diff --git a/doc/pty/README.ja b/doc/pty/README.ja
index 2d83ffa033e067..a26b4932ff904e 100644
--- a/doc/pty/README.ja
+++ b/doc/pty/README.ja
@@ -1,27 +1,26 @@
-pty 拡張モジュール version 0.3 by A.ito
+= pty 拡張モジュール version 0.3 by A.ito
 
 1. はじめに
 
-この拡張モジュールは，仮想tty (pty) を通して適当なコマンドを
-実行する機能を ruby に提供します．
+   この拡張モジュールは，仮想tty (pty) を通して適当なコマンドを
+   実行する機能を ruby に提供します．
 
 2. インストール
 
-次のようにしてインストールしてください．
+   次のようにしてインストールしてください．
 
-(1)  ruby extconf.rb
+   1. <tt>ruby extconf.rb</tt>
+      を実行すると Makefile が生成されます．
 
-    を実行すると Makefile が生成されます．
-
-(2) make; make install を実行してください．
+   2. <tt>make; make install</tt> を実行してください．
 
 3. 何ができるか
 
-この拡張モジュールは，PTY というモジュールを定義します．その中
-には，次のようなモジュール関数が含まれています．
+   この拡張モジュールは，PTY というモジュールを定義します．その中
+   には，次のようなモジュール関数が含まれています．
 
-   getpty(command)
-   spawn(command)
+   [PTY.getpty(command)]
+   [PTY.spawn(command)]
 
       この関数は，仮想ttyを確保し，指定されたコマンドをその仮想tty
       の向こうで実行し，配列を返します．戻り値は3つの要素からなる
@@ -35,12 +34,7 @@ pty 拡張モジュール version 0.3 by A.ito
       のみ例外が発生します．子プロセスをモニターしているスレッドはブロッ
       クを抜けるときに終了します．
 
-   protect_signal
-   reset_signal
-
-      廃止予定です．
-
-   PTY.open
+   [PTY.open]
 
       仮想ttyを確保し，マスター側に対応するIOオブジェクトとスレーブ側に
       対応するFileオブジェクトの配列を返します．ブロック付きで呼び出さ
@@ -48,7 +42,7 @@ pty 拡張モジュール version 0.3 by A.ito
       クから返された結果を返します．また、このマスターIOとスレーブFile
       は、ブロックを抜けるときにクローズ済みでなければクローズされます．
 
-   PTY.check(pid[, raise=false])
+   [PTY.check(pid[, raise=false])]
 
       pidで指定された子プロセスの状態をチェックし，実行中であればnilを
       返します．終了しているか停止している場合、第二引数が偽であれば、
@@ -57,20 +51,20 @@ pty 拡張モジュール version 0.3 by A.ito
 
 4. 利用について
 
-伊藤彰則が著作権を保有します．
+   伊藤彰則が著作権を保有します．
 
-ソースプログラムまたはドキュメントに元の著作権表示が改変されずに
-表示されている場合に限り，誰でも，このソフトウェアを無償かつ著作
-権者に無断で利用・配布・改変できます．利用目的は限定されていませ
-ん．
+   ソースプログラムまたはドキュメントに元の著作権表示が改変されずに
+   表示されている場合に限り，誰でも，このソフトウェアを無償かつ著作
+   権者に無断で利用・配布・改変できます．利用目的は限定されていませ
+   ん．
 
-このプログラムの利用・配布その他このプログラムに関係する行為によ
-って生じたいかなる損害に対しても，作者は一切責任を負いません．
+   このプログラムの利用・配布その他このプログラムに関係する行為によ
+   って生じたいかなる損害に対しても，作者は一切責任を負いません．
 
 5. バグ報告等
 
-バグレポートは歓迎します．
+   バグレポートは歓迎します．
 
 	aito@ei5sun.yz.yamagata-u.ac.jp
 
-まで電子メールでバグレポートをお送りください．
+   まで電子メールでバグレポートをお送りください．
diff --git a/doc/ractor.md b/doc/ractor.md
index 3ead5105018a6e..6a1cff4e7be83f 100644
--- a/doc/ractor.md
+++ b/doc/ractor.md
@@ -204,8 +204,8 @@ For message sending and receiving, there are two types of APIs: push type and pu
   * When a Ractor is terminated, the Ractor's ports are closed.
 * There are 3 ways to send an object as a message
   * (1) Send a reference: Sending a shareable object, send only a reference to the object (fast)
-  * (2) Copy an object: Sending an unshareable object by copying an object deeply (slow). Note that you can not send an object which does not support deep copy. Some `T_DATA` objects are not supported.
-  * (3) Move an object: Sending an unshareable object reference with a membership. Sender Ractor can not access moved objects anymore (raise an exception) after moving it. Current implementation makes new object as a moved object for receiver Ractor and copies references of sending object to moved object.
+  * (2) Copy an object: Sending an unshareable object by copying an object deeply (slow). Note that you can not send an object which does not support deep copy. Some `T_DATA` objects (objects whose class is defined in a C extension, such as `StringIO`) are not supported.
+  * (3) Move an object: Sending an unshareable object reference with a membership. Sender Ractor can not access moved objects anymore (raise an exception) after moving it. Current implementation makes new object as a moved object for receiver Ractor and copies references of sending object to moved object. `T_DATA` objects are not supported.
   * You can choose "Copy" and "Move" by the `move:` keyword, `Ractor#send(obj, move: true/false)` and `Ractor.yield(obj, move: true/false)` (default is `false` (COPY)).
 
 ### Sending/Receiving ports
@@ -259,7 +259,6 @@ r.take      # Receive from r's outgoing port
 The last example shows the following ractor network.
 
 ```
-
   +------+        +---+
   * main |------> * r *---+
   +------+        +---+   |
@@ -335,7 +334,7 @@ as << obj
 as.sort == ['r1', 'r2'] #=> true
 ```
 
-Complex example:
+\Complex example:
 
 ```ruby
 pipe = Ractor.new do
@@ -875,17 +874,17 @@ p Ractor.select(*rs, Ractor.current) #=> [:receive, "r0r10r9r8r7r6r5r4r3r2r1"]
 r.send "e0"
 p Ractor.select(*rs, Ractor.current)
 #=>
-#<Thread:0x000056262de28bd8 run> terminated with exception (report_on_exception is true):
-Traceback (most recent call last):
-        2: from /home/ko1/src/ruby/trunk/test.rb:7:in `block (2 levels) in <main>'
-        1: from /home/ko1/src/ruby/trunk/test.rb:7:in `loop'
-/home/ko1/src/ruby/trunk/test.rb:9:in `block (3 levels) in <main>': unhandled exception
-Traceback (most recent call last):
-        2: from /home/ko1/src/ruby/trunk/test.rb:7:in `block (2 levels) in <main>'
-        1: from /home/ko1/src/ruby/trunk/test.rb:7:in `loop'
-/home/ko1/src/ruby/trunk/test.rb:9:in `block (3 levels) in <main>': unhandled exception
-        1: from /home/ko1/src/ruby/trunk/test.rb:21:in `<main>'
-<internal:ractor>:69:in `select': thrown by remote Ractor. (Ractor::RemoteError)
+# <Thread:0x000056262de28bd8 run> terminated with exception (report_on_exception is true):
+# Traceback (most recent call last):
+#         2: from /home/ko1/src/ruby/trunk/test.rb:7:in `block (2 levels) in <main>'
+#         1: from /home/ko1/src/ruby/trunk/test.rb:7:in `loop'
+# /home/ko1/src/ruby/trunk/test.rb:9:in `block (3 levels) in <main>': unhandled exception
+# Traceback (most recent call last):
+#         2: from /home/ko1/src/ruby/trunk/test.rb:7:in `block (2 levels) in <main>'
+#         1: from /home/ko1/src/ruby/trunk/test.rb:7:in `loop'
+# /home/ko1/src/ruby/trunk/test.rb:9:in `block (3 levels) in <main>': unhandled exception
+#         1: from /home/ko1/src/ruby/trunk/test.rb:21:in `<main>'
+# <internal:ractor>:69:in `select': thrown by remote Ractor. (Ractor::RemoteError)
 ```
 
 ```ruby
diff --git a/doc/rdoc/markup_reference.rb b/doc/rdoc/markup_reference.rb
deleted file mode 100644
index dac5c847082ac4..00000000000000
--- a/doc/rdoc/markup_reference.rb
+++ /dev/null
@@ -1,1257 +0,0 @@
-require 'rdoc'
-
-# \Class \RDoc::MarkupReference exists only to provide a suitable home
-# for a reference document for \RDoc markup.
-#
-# All objects defined in this class -- classes, modules, methods, aliases,
-# attributes, and constants -- are solely for illustrating \RDoc markup,
-# and have no other legitimate use.
-#
-# = \RDoc Markup Reference
-#
-# Notes:
-#
-# - Examples in this reference are Ruby code and comments;
-#   certain differences from other sources
-#   (such as C code and comments) are noted.
-# - An example that shows rendered HTML output
-#   displays that output in a blockquote:
-#
-#   Rendered HTML:
-#   >>>
-#     Some stuff
-#
-# \RDoc-generated documentation is derived from and controlled by:
-#
-# - Single-line or multi-line comments that precede certain definitions;
-#   see {Markup in Comments}[rdoc-ref:RDoc::MarkupReference@Markup+in+Comments].
-# - \RDoc directives in trailing comments (on the same line as code);
-#   see <tt>:nodoc:</tt>, <tt>:doc:</tt>, and <tt>:notnew:</tt>.
-# - \RDoc directives in single-line comments;
-#   see other {Directives}[rdoc-ref:RDoc::MarkupReference@Directives].
-# - The Ruby code itself (but not from C code);
-#   see {Documentation Derived from Ruby Code}[rdoc-ref:RDoc::MarkupReference@Documentation+Derived+from+Ruby+Code].
-#
-# == Markup in Comments
-#
-# The treatment of markup in comments varies according to the type of file:
-#
-# - <tt>.rb</tt> (Ruby code file): markup is parsed from Ruby comments.
-# - <tt>.c</tt> (C code file): markup is parsed from C comments.
-# - <tt>.rdoc</tt> (RDoc text file): markup is parsed from the entire file.
-#
-# The comment associated with
-# a Ruby class, module, method, alias, constant, or attribute
-# becomes the documentation for that defined object:
-#
-# - In a Ruby file, that comment immediately precedes
-#   the definition of the object.
-# - In a C file, that comment immediately precedes
-#   the function that implements a method,
-#   or otherwise immediately precedes the definition of the object.
-#
-# In either a Ruby or a C file,
-# \RDoc ignores comments that do not precede object definitions.
-#
-# In an \RDoc file, the text is not associated with any code object,
-# but may (depending on how the documentation is built),
-# become a separate page.
-#
-# Almost all examples on this page are all RDoc-like;
-# that is, they have no comment markers like Ruby <tt>#</tt>
-# or C <tt>/* ... */</tt>.
-#
-# === Margins
-#
-# In a multi-line comment,
-# \RDoc looks for the comment's natural left margin,
-# which becomes the <em>base margin</em> for the comment
-# and is the initial <em>current margin</em> for the comment.
-#
-# The current margin can change, and does so, for example in a list.
-#
-# === Blocks
-#
-# It's convenient to think of \RDoc markup input as a sequence of _blocks_
-# of various types (details at the links):
-#
-# - {Paragraph}[rdoc-ref:RDoc::MarkupReference@Paragraphs]:
-#   an ordinary paragraph.
-# - {Verbatim text block}[rdoc-ref:RDoc::MarkupReference@Verbatim+Text+Blocks]:
-#   a block of text to be rendered literally.
-# - {Code block}[rdoc-ref:RDoc::MarkupReference@Code+Blocks]:
-#   a verbatim text block containing Ruby code,
-#   to be rendered with code highlighting.
-# - {Block quote}[rdoc-ref:RDoc::MarkupReference@Block+Quotes]:
-#   a longish quoted passage, to be rendered with indentation
-#   instead of quote marks.
-# - {List}[rdoc-ref:RDoc::MarkupReference@Lists]: items for
-#   a bullet list, numbered list, lettered list, or labeled list.
-# - {Heading}[rdoc-ref:RDoc::MarkupReference@Headings]:
-#   a section heading.
-# - {Horizontal rule}[rdoc-ref:RDoc::MarkupReference@Horizontal+Rules]:
-#   a line across the rendered page.
-# - {Directive}[rdoc-ref:RDoc::MarkupReference@Directives]:
-#   various special directions for the rendering.
-# - {Text Markup}[rdoc-ref:RDoc:MarkupReference@Text+Markup]:
-#   text to be rendered in a special way.
-#
-# About the blocks:
-#
-# - Except for a paragraph, a block is distinguished by its indentation,
-#   or by unusual initial or embedded characters.
-# - Any block may appear independently
-#   (that is, not nested in another block);
-#   some blocks may be nested, as detailed below.
-#
-# ==== Paragraphs
-#
-# A paragraph consists of one or more non-empty lines of ordinary text,
-# each beginning at the current margin.
-#
-# Note: Here, <em>ordinary text</em> means text that is <em>not identified</em>
-# by indentation, or by unusual initial or embedded characters.
-# See below.
-#
-# Paragraphs are separated by one or more empty lines.
-#
-# Example input:
-#
-#   \RDoc produces HTML and command-line documentation for Ruby projects.
-#   \RDoc includes the rdoc and ri tools for generating and displaying
-#   documentation from the command-line.
-#
-#   You'll love it.
-#
-# Rendered HTML:
-# >>>
-#   \RDoc produces HTML and command-line documentation for Ruby projects.
-#   \RDoc includes the rdoc and ri tools for generating and displaying
-#   documentation from the command-line.
-#
-#   You'll love it.
-#
-# A paragraph may contain nested blocks, including:
-#
-# - {Verbatim text blocks}[rdoc-ref:RDoc::MarkupReference@Verbatim+Text+Blocks].
-# - {Code blocks}[rdoc-ref:RDoc::MarkupReference@Code+Blocks].
-# - {Block quotes}[rdoc-ref:RDoc::MarkupReference@Block+Quotes].
-# - {Lists}[rdoc-ref:RDoc::MarkupReference@Lists].
-# - {Headings}[rdoc-ref:RDoc::MarkupReference@Headings].
-# - {Horizontal rules}[rdoc-ref:RDoc::MarkupReference@Horizontal+Rules].
-# - {Text Markup}[rdoc-ref:RDoc:MarkupReference@Text+Markup].
-#
-# ==== Verbatim Text Blocks
-#
-# Text indented farther than the current margin becomes a <em>verbatim text block</em>
-# (or a code block, described next).
-# In the rendered HTML, such text:
-#
-# - Is indented.
-# - Has a contrasting background color.
-#
-# The verbatim text block ends at the first line beginning at the current margin.
-#
-# Example input:
-#
-#   This is not verbatim text.
-#
-#     This is verbatim text.
-#       Whitespace is honored.     # See?
-#         Whitespace is honored.     # See?
-#
-#     This is still the same verbatim text block.
-#
-#   This is not verbatim text.
-#
-# Rendered HTML:
-# >>>
-#   This is not verbatim text.
-#
-#     This is verbatim text.
-#       Whitespace is honored.     # See?
-#         Whitespace is honored.     # See?
-#
-#     This is still the same verbatim text block.
-#
-#   This is not verbatim text.
-#
-# A verbatim text block may not contain nested blocks of any kind
-# -- it's verbatim.
-#
-# ==== Code Blocks
-#
-# A special case of verbatim text is the <em>code block</em>,
-# which is merely verbatim text that \RDoc recognizes as Ruby code:
-#
-# In the rendered HTML, the code block:
-#
-# - Is indented.
-# - Has a contrasting background color.
-# - Has syntax highlighting.
-#
-# Example input:
-#
-#   Consider this method:
-#
-#     def foo(name = '', value = 0)
-#       @name = name      # Whitespace is still honored.
-#       @value = value
-#     end
-#
-#
-# Rendered HTML:
-# >>>
-#   Consider this method:
-#
-#     def foo(name = '', value = 0)
-#       @name = name      # Whitespace is still honored.
-#       @value = value
-#     end
-#
-# Pro tip:  If your indented Ruby code does not get highlighted,
-# it may contain a syntax error.
-#
-# A code block may not contain nested blocks of any kind
-# -- it's verbatim.
-#
-# ==== Block Quotes
-#
-# You can use the characters <tt>>>></tt> (unindented),
-# followed by indented text, to treat the text
-# as a {block quote}[https://en.wikipedia.org/wiki/Block_quotation]:
-#
-# Example input:
-#
-#   Here's a block quote:
-#   >>>
-#     Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer
-#     commodo quam iaculis massa posuere, dictum fringilla justo pulvinar.
-#     Quisque turpis erat, pharetra eu dui at, sollicitudin accumsan nulla.
-#
-#     Aenean congue ligula eu ligula molestie, eu pellentesque purus
-#     faucibus. In id leo non ligula condimentum lobortis. Duis vestibulum,
-#     diam in pellentesque aliquet, mi tellus placerat sapien, id euismod
-#     purus magna ut tortor.
-#
-# Rendered HTML:
-#
-# >>>
-#   Here's a block quote:
-#   >>>
-#     Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer
-#     commodo quam iaculis massa posuere, dictum fringilla justo pulvinar.
-#     Quisque turpis erat, pharetra eu dui at, sollicitudin accumsan nulla.
-#
-#     Aenean congue ligula eu ligula molestie, eu pellentesque purus
-#     faucibus. In id leo non ligula condimentum lobortis. Duis vestibulum,
-#     diam in pellentesque aliquet, mi tellus placerat sapien, id euismod
-#     purus magna ut tortor.
-#
-# Note that, unlike verbatim text, single newlines are not honored,
-# but that a double newline begins a new paragraph in the block quote.
-#
-# A block quote may contain nested blocks, including:
-#
-# - Other block quotes.
-# - {Paragraphs}[rdoc-ref:RDoc::MarkupReference@Paragraphs].
-# - {Verbatim text blocks}[rdoc-ref:RDoc::MarkupReference@Verbatim+Text+Blocks].
-# - {Code blocks}[rdoc-ref:RDoc::MarkupReference@Code+Blocks].
-# - {Lists}[rdoc-ref:RDoc::MarkupReference@Lists].
-# - {Headings}[rdoc-ref:RDoc::MarkupReference@Headings].
-# - {Horizontal rules}[rdoc-ref:RDoc::MarkupReference@Horizontal+Rules].
-# - {Text Markup}[rdoc-ref:RDoc:MarkupReference@Text+Markup].
-#
-# ==== Lists
-#
-# Each type of list item is marked by a special beginning:
-#
-# - Bullet list item: Begins with a hyphen or asterisk.
-# - Numbered list item: Begins with digits and a period.
-# - Lettered list item: Begins with an alphabetic character and a period.
-# - Labeled list item: Begins with one of:
-#   - Square-bracketed text.
-#   - A word followed by two colons.
-#
-# A list begins with a list item and continues, even across blank lines,
-# as long as list items of the same type are found at the same indentation level.
-#
-# A new list resets the current margin inward.
-# Additional lines of text aligned at that margin
-# are part of the continuing list item.
-#
-# A list item may be continued on additional lines that are aligned
-# with the first line.  See examples below.
-#
-# A list item may contain nested blocks, including:
-#
-# - Other lists of any type.
-# - {Paragraphs}[rdoc-ref:RDoc::MarkupReference@Paragraphs].
-# - {Verbatim text blocks}[rdoc-ref:RDoc::MarkupReference@Verbatim+Text+Blocks].
-# - {Code blocks}[rdoc-ref:RDoc::MarkupReference@Code+Blocks].
-# - {Block quotes}[rdoc-ref:RDoc::MarkupReference@Block+Quotes].
-# - {Headings}[rdoc-ref:RDoc::MarkupReference@Headings].
-# - {Horizontal rules}[rdoc-ref:RDoc::MarkupReference@Horizontal+Rules].
-# - {Text Markup}[rdoc-ref:RDoc:MarkupReference@Text+Markup].
-#
-# ===== Bullet Lists
-#
-# A bullet list item begins with a hyphen or asterisk.
-#
-# Example input:
-#
-#   - An item.
-#   - Another.
-#   - An item spanning
-#     multiple lines.
-#
-#   * Yet another.
-#   - Last one.
-#
-# Rendered HTML:
-# >>>
-#   - An item.
-#   - Another.
-#   - An item spanning
-#     multiple lines.
-#
-#   * Yet another.
-#   - Last one.
-#
-# ===== Numbered Lists
-#
-# A numbered list item begins with digits and a period.
-#
-# The items are automatically re-numbered.
-#
-# Example input:
-#
-#   100. An item.
-#   10. Another.
-#   1. An item spanning
-#      multiple lines.
-#
-#   1. Yet another.
-#   1000. Last one.
-#
-# Rendered HTML:
-# >>>
-#   100. An item.
-#   10. Another.
-#   1. An item spanning
-#      multiple lines.
-#
-#   1. Yet another.
-#   1000. Last one.
-#
-# ===== Lettered Lists
-#
-# A lettered list item begins with letters and a period.
-#
-# The items are automatically "re-lettered."
-#
-# Example input:
-#
-#   z. An item.
-#   y. Another.
-#   x. An item spanning
-#      multiple lines.
-#
-#   x. Yet another.
-#   a. Last one.
-#
-# Rendered HTML:
-# >>>
-#   z. An item.
-#   y. Another.
-#
-#   x. Yet another.
-#   a. Last one.
-#
-# ===== Labeled Lists
-#
-# A labeled list item begins with one of:
-#
-# - Square-bracketed text: the label and text are on two lines.
-# - A word followed by two colons: the label and text are on the same line.
-#
-# Example input:
-#
-#   [foo] An item.
-#   bat:: Another.
-#   [bag] An item spanning
-#         multiple lines.
-#
-#   [bar baz] Yet another.
-#   bam:: Last one.
-#
-# Rendered HTML:
-# >>>
-#   [foo] An item.
-#   bat:: Another.
-#   [bag] An item spanning
-#         multiple lines.
-#
-#   [bar baz] Yet another.
-#   bam:: Last one.
-#
-# ==== Headings
-#
-# A heading begins with up to six equal-signs, followed by heading text.
-# Whitespace between those and the heading text is optional.
-#
-# Examples:
-#
-#   = Section 1
-#   == Section 1.1
-#   === Section 1.1.1
-#   === Section 1.1.2
-#   == Section 1.2
-#   = Section 2
-#   = Foo
-#   == Bar
-#   === Baz
-#   ==== Bam
-#   ===== Bat
-#   ====== Bad
-#   ============Still a Heading (Level 6)
-#   \== Not a Heading
-#
-# A heading may contain only one type of nested block:
-#
-# - {Text Markup}[rdoc-ref:RDoc:MarkupReference@Text+Markup].
-#
-# ==== Horizontal Rules
-#
-# A horizontal rule consists of a line with three or more hyphens
-# and nothing more.
-#
-# Example input:
-#
-#   ---
-#   --- Not a horizontal rule.
-#
-#   -- Also not a horizontal rule.
-#   ---
-#
-# Rendered HTML:
-# >>>
-#   ---
-#   --- Not a horizontal rule.
-#
-#   -- Also not a horizontal rule.
-#   ---
-#
-# ==== Directives
-#
-# ===== Directives for Allowing or Suppressing Documentation
-#
-# - <tt># :stopdoc:</tt>:
-#
-#   - Appears on a line by itself.
-#   - Specifies that \RDoc should ignore markup
-#     until next <tt>:startdoc:</tt> directive or end-of-file.
-#
-# - <tt># :startdoc:</tt>:
-#
-#   - Appears on a line by itself.
-#   - Specifies that \RDoc should resume parsing markup.
-#
-# - <tt># :enddoc:</tt>:
-#
-#   - Appears on a line by itself.
-#   - Specifies that \RDoc should ignore markup to end-of-file
-#     regardless of other directives.
-#
-# - <tt># :nodoc:</tt>:
-#
-#   - Appended to a line of code
-#     that defines a class, module, method, alias, constant, or attribute.
-#   - Specifies that the defined object should not be documented.
-#
-# - <tt># :nodoc: all</tt>:
-#
-#   - Appended to a line of code
-#     that defines a class or module.
-#   - Specifies that the class or module should not be documented.
-#     By default, however, a nested class or module _will_ be documented.
-#
-# - <tt># :doc:</tt>:
-#
-#   - Appended to a line of code
-#     that defines a class, module, method, alias, constant, or attribute.
-#   - Specifies the defined object should be documented, even if otherwise
-#     would not be documented.
-#
-# - <tt># :notnew:</tt> (aliased as <tt>:not_new:</tt> and <tt>:not-new:</tt>):
-#
-#   - Appended to a line of code
-#     that defines instance method +initialize+.
-#   - Specifies that singleton method +new+ should not be documented.
-#     By default, Ruby fakes a corresponding singleton method +new+,
-#     which \RDoc includes in the documentation.
-#     Note that instance method +initialize+ is private, and so by default
-#     is not documented.
-#
-# For Ruby code, but not for other \RDoc sources,
-# there is a shorthand for <tt>:stopdoc:</tt> and <tt>:startdoc:</tt>:
-#
-#   # Documented.
-#   #--
-#   # Not documented.
-#   #++
-#   # Documented.
-#
-# For C code, any of directives <tt>:startdoc:</tt>, <tt>:enddoc:</tt>,
-# and <tt>:nodoc:</tt> may appear in a stand-alone comment:
-#
-#   /* :startdoc: */
-#   /* :stopdoc: */
-#   /* :enddoc: */
-#
-# ===== Directive for Specifying \RDoc Source Format
-#
-# - <tt># :markup: _type_</tt>:
-#
-#   - Appears on a line by itself.
-#   - Specifies the format for the \RDoc input;
-#     parameter +type+ is one of +markdown+, +rd+, +rdoc+, +tomdoc+.
-#
-# ===== Directives for HTML Output
-#
-# - <tt># :title: _text_</tt>:
-#
-#   - Appears on a line by itself.
-#   - Specifies the title for the HTML output.
-#
-# - <tt># :main: _filename_</tt>:
-#   - Appears on a line by itself.
-#   - Specifies the HTML file to be displayed first.
-#
-# ===== Directives for Method Documentation
-#
-# - <tt># :call-seq:</tt>:
-#
-#   - Appears on a line by itself.
-#   - Specifies the calling sequence to be reported in the HTML,
-#     overriding the actual calling sequence in the code.
-#     See method #call_seq_directive.
-#
-#   Note that \RDoc can build the calling sequence for a Ruby-coded method,
-#   but not for other languages.
-#   You may want to override that by explicitly giving a <tt>:call-seq:</tt>
-#   directive if you want to include:
-#
-#   - A return type, which is not automatically inferred.
-#   - Multiple calling sequences.
-#
-#   For C code, the directive may appear in a stand-alone comment.
-#
-# - <tt># :args: _arg_names_</tt> (aliased as <tt>:arg:</tt>):
-#
-#   - Appears on a line by itself.
-#   - Specifies the arguments to be reported in the HTML,
-#     overriding the actual arguments in the code.
-#     See method #args_directive.
-#
-# - <tt># :yields: _arg_names_</tt> (aliased as <tt>:yield:</tt>):
-#
-#   - Appears on a line by itself.
-#   - Specifies the yield arguments to be reported in the HTML,
-#     overriding the actual yield in the code.
-#     See method #yields_directive.
-#
-# ===== Directives for Organizing Documentation
-#
-# By default, \RDoc groups:
-#
-# - Singleton methods together in alphabetical order.
-# - Instance methods and their aliases together in alphabetical order.
-# - Attributes and their aliases together in alphabetical order.
-#
-# You can use directives to modify those behaviors.
-#
-# - <tt># :section: _section_title_</tt>:
-#
-#   - Appears on a line by itself.
-#   - Specifies that following methods are to be grouped into the section
-#     with the given <em>section_title</em>,
-#     or into the default section if no title is given.
-#     The directive remains in effect until another such directive is given,
-#     but may be temporarily overridden by directive <tt>:category:</tt>.
-#     See below.
-#
-#   The comment block containing this directive:
-#
-#   - Must be separated by a blank line from the documentation for the next item.
-#   - May have one or more lines preceding the directive.
-#     These will be removed, along with any trailing lines that match them.
-#     Such lines may be visually helpful.
-#   - Lines of text that are not so removed become the descriptive text
-#     for the section.
-#
-#   Example:
-#
-#     # ----------------------------------------
-#     # :section: My Section
-#     # This is the section that I wrote.
-#     # See it glisten in the noon-day sun.
-#     # ----------------------------------------
-#
-#     ##
-#     # Comment for some_method
-#     def some_method
-#       # ...
-#     end
-#
-#   You can use directive <tt>:category:</tt> to temporarily
-#   override the current section.
-#
-# - <tt># :category: _section_title_</tt>:
-#
-#   - Appears on a line by itself.
-#   - Specifies that just one following method is to be included
-#     in the given section, or in the default section if no title is given.
-#     Subsequent methods are to be grouped into the current section.
-#
-# ===== Directive for Including a File
-#
-# - <tt># :include: _filepath_</tt>:
-#
-#   - Appears on a line by itself.
-#   - Specifies that the contents of the given file
-#     are to be included at this point.
-#     The file content is shifted to have the same indentation as the colon
-#     at the start of the directive.
-#
-#     The file is searched for in the directories
-#     given with the <tt>--include</tt> command-line option,
-#     or by default in the current directory.
-#
-#   For C code, the directive may appear in a stand-alone comment
-#
-# ==== Text Markup
-#
-# Text markup is metatext that affects HTML rendering:
-#
-# - Typeface: italic, bold, monofont.
-# - Character conversions: copyright, trademark, certain punctuation.
-# - Links.
-# - Escapes: marking text as "not markup."
-#
-# ===== Typeface Markup
-#
-# Typeface markup can specify that text is to be rendered
-# as italic, bold, or monofont.
-#
-# Typeface markup may contain only one type of nested block:
-#
-# - More typeface markup:
-#   italic, bold, monofont.
-#
-# ====== Italic
-#
-# Text may be marked as italic via HTML tag <tt><i></tt> or <tt><em></tt>.
-#
-# Example input:
-#
-#   <i>Italicized words</i> in a paragraph.
-#
-#   >>>
-#     <i>Italicized words in a block quote</i>.
-#
-#   - <i>Italicized words</i> in a list item.
-#
-#   ====== <i>Italicized words</i> in a Heading
-#
-#   <i>Italicized passage containing *bold* and +monofont+.</i>
-#
-# Rendered HTML:
-# >>>
-#   <i>Italicized words</i> in a paragraph.
-#
-#   >>>
-#     <i>Italicized words in a block quote</i>.
-#
-#   - <i>Italicized words</i> in a list item.
-#
-#   ====== <i>Italicized words</i> in a Heading
-#
-#   <i>Italicized passage containing *bold* and +monofont+.</i>
-#
-# A single word may be italicized via a shorthand:
-# prefixed and suffixed underscores.
-#
-# Example input:
-#
-#   _Italic_ in a paragraph.
-#
-#   >>>
-#     _Italic_ in a block quote.
-#
-#   - _Italic_ in a list item.
-#
-#   ====== _Italic_ in a Heading
-#
-# Rendered HTML:
-# >>>
-#   _Italic_ in a paragraph.
-#
-#   >>>
-#     _Italic_ in a block quote.
-#
-#   - _Italic_ in a list item.
-#
-#   ====== _Italic_ in a Heading
-#
-# ====== Bold
-#
-# Text may be marked as bold via HTML tag <tt><b></tt>.
-#
-# Example input:
-#
-#   <b>Bold words</b> in a paragraph.
-#
-#   >>>
-#     <b>Bold words</b> in a block quote.
-#
-#   - <b>Bold words</b> in a list item.
-#
-#   ====== <b>Bold words</b> in a Heading
-#
-#   <b>Bold passage containing _italics_ and +monofont+.</b>
-#
-# Rendered HTML:
-#
-# >>>
-#   <b>Bold words</b> in a paragraph.
-#
-#   >>>
-#     <b>Bold words</b> in a block quote.
-#
-#   - <b>Bold words</b> in a list item.
-#
-#   ====== <b>Bold words</b> in a Heading
-#
-#   <b>Bold passage containing _italics_ and +monofont+.</b>
-#
-# A single word may be made bold via a shorthand:
-# prefixed and suffixed asterisks.
-#
-# Example input:
-#
-#   *Bold* in a paragraph.
-#
-#   >>>
-#     *Bold* in a block quote.
-#
-#   - *Bold* in a list item.
-#
-#   ===== *Bold* in a Heading
-#
-# Rendered HTML:
-#
-# >>>
-#   *Bold* in a paragraph.
-#
-#   >>>
-#     *Bold* in a block quote.
-#
-#   - *Bold* in a list item.
-#
-#   ===== *Bold* in a Heading
-#
-# ====== Monofont
-#
-# Text may be marked as monofont
-# -- sometimes called 'typewriter font' --
-# via HTML tag <tt><tt></tt> or <tt><code></tt>.
-#
-# Example input:
-#
-#   <tt>Monofont words</tt> in a paragraph.
-#
-#   >>>
-#     <tt>Monofont words</tt> in a block quote.
-#
-#   - <tt>Monofont words</tt> in a list item.
-#
-#   ====== <tt>Monofont words</tt> in heading
-#
-#   <tt>Monofont passage containing _italics_ and *bold*.</tt>
-#
-# Rendered HTML:
-#
-# >>>
-#   <tt>Monofont words</tt> in a paragraph.
-#
-#   >>>
-#     <tt>Monofont words</tt> in a block quote.
-#
-#   - <tt>Monofont words</tt> in a list item.
-#
-#   ====== <tt>Monofont words</tt> in heading
-#
-#   <tt>Monofont passage containing _italics_ and *bold*.</tt>
-#
-# A single word may be made monofont by a shorthand:
-# prefixed and suffixed plus-signs.
-#
-# Example input:
-#
-#   +Monofont+ in a paragraph.
-#
-#   >>>
-#     +Monofont+ in a block quote.
-#
-#   - +Monofont+ in a list item.
-#
-#   ====== +Monofont+ in a Heading
-#
-# Rendered HTML:
-#
-# >>>
-#   +Monofont+ in a paragraph.
-#
-#   >>>
-#     +Monofont+ in a block quote.
-#
-#   - +Monofont+ in a list item.
-#
-#   ====== +Monofont+ in a Heading
-#
-# ==== Character Conversions
-#
-# Certain combinations of characters may be converted to special characters;
-# whether the conversion occurs depends on whether the special character
-# is available in the current encoding.
-#
-# - <tt>(c)</tt> converts to (c) (copyright character); must be lowercase.
-#
-# - <tt>(r)</tt> converts to (r) (registered trademark character); must be lowercase.
-#
-# - <tt>'foo'</tt> converts to 'foo' (smart single-quotes).
-#
-# - <tt>"foo"</tt> converts to "foo" (smart double-quotes).
-#
-# - <tt>foo ... bar</tt> converts to foo ... bar (1-character ellipsis).
-#
-# - <tt>foo -- bar</tt> converts to foo -- bar (1-character en-dash).
-#
-# - <tt>foo --- bar</tt> converts to foo --- bar (1-character em-dash).
-#
-# ==== Links
-#
-# Certain strings in \RDoc text are converted to links.
-# Any such link may be suppressed by prefixing a backslash.
-# This section shows how to link to various
-# targets.
-#
-# [Class]
-#
-#   - On-page: <tt>DummyClass</tt> links to DummyClass.
-#   - Off-page: <tt>RDoc::Alias</tt> links to RDoc::Alias.
-#
-# [Module]
-#
-#   - On-page: <tt>DummyModule</tt> links to DummyModule.
-#   - Off-page: <tt>RDoc</tt> links to RDoc.
-#
-# [Constant]
-#
-#   - On-page: <tt>DUMMY_CONSTANT</tt> links to DUMMY_CONSTANT.
-#   - Off-page: <tt>RDoc::Text::MARKUP_FORMAT</tt> links to RDoc::Text::MARKUP_FORMAT.
-#
-# [Singleton Method]
-#
-#   - On-page: <tt>::dummy_singleton_method</tt> links to ::dummy_singleton_method.
-#   - Off-page<tt>RDoc::TokenStream::to_html</tt> links to RDoc::TokenStream::to_html.
-#
-#   Note: Occasionally \RDoc is not linked to a method whose name
-#   has only special characters. Check whether the links you were expecting
-#   are actually there.  If not, you'll need to put in an explicit link;
-#   see below.
-#
-#   Pro tip: The link to any method is available in the alphabetical table of contents
-#   at the top left of the page for the class or module.
-#
-# [Instance Method]
-#
-#   - On-page: <tt>#dummy_instance_method</tt> links to #dummy_instance_method.
-#   - Off-page: <tt>RDoc::Alias#html_name</tt> links to RDoc::Alias#html_name.
-#
-#     See the Note and Pro Tip immediately above.
-#
-# [Attribute]
-#
-#   - On-page: <tt>#dummy_attribute</tt> links to #dummy_attribute.
-#   - Off-page: <tt>RDoc::Alias#name</tt> links to RDoc::Alias#name.
-#
-# [Alias]
-#
-#   - On-page: <tt>#dummy_instance_alias</tt> links to #dummy_instance_alias.
-#   - Off-page: <tt>RDoc::Alias#new_name</tt> links to RDoc::Alias#new_name.
-#
-# [Protocol +http+]
-#
-#   - Linked: <tt>http://yahoo.com</tt> links to http://yahoo.com.
-#
-# [Protocol +https+]
-#
-#   - Linked: <tt>https://github.com</tt> links to https://github.com.
-#
-# [Protocol +www+]
-#
-#   - Linked: <tt>www.yahoo.com</tt> links to www.yahoo.com.
-#
-# [Protocol +ftp+]
-#
-#   - Linked: <tt>ftp://nosuch.site</tt> links to ftp://nosuch.site.
-#
-# [Protocol +mailto+]
-#
-#   - Linked:  <tt>mailto:/foo@bar.com</tt> links to mailto://foo@bar.com.
-#
-# [Protocol +irc+]
-#
-#   - link: <tt>irc://irc.freenode.net/ruby</tt> links to irc://irc.freenode.net/ruby.
-#
-# [Image Filename Extensions]
-#
-#   - Link: <tt>https://www.ruby-lang.org/images/header-ruby-logo@2x.png</tt> is
-#     converted to an in-line HTML +img+ tag, which displays the image in the HTML:
-#
-#     https://www.ruby-lang.org/images/header-ruby-logo@2x.png
-#
-#     Also works for +bmp+, +gif+, +jpeg+, and +jpg+ files.
-#
-#     Note: Works only for a fully qualified URL.
-#
-# [Heading]
-#
-#   - Link: <tt>RDoc::RD@LICENSE</tt> links to RDoc::RDoc::RD@LICENSE.
-#
-#   Note that spaces in the actual heading are represented by <tt>+</tt> characters
-#   in the linkable text.
-#
-#   - Link: <tt>RDoc::Options@Saved+Options</tt>
-#     links to RDoc::Options@Saved+Options.
-#
-#   Punctuation and other special characters must be escaped like CGI.escape.
-#
-#   Pro tip: The link to any heading is available in the alphabetical table of contents
-#   at the top left of the page for the class or module.
-#
-# [Section]
-#
-#   See {Directives for Organizing Documentation}[#class-RDoc::MarkupReference-label-Directives+for+Organizing+Documentation].
-#
-#   - Link: <tt>RDoc::Markup::ToHtml@Visitor</tt> links to RDoc::Markup::ToHtml@Visitor.
-#
-#   If a section and a heading share the same name, the link target is the section.
-#
-# [Single-Word Text Link]
-#
-#   Use square brackets to create single-word text link:
-#
-#   - <tt>GitHub[https://github.com]</tt> links to GitHub[https://github.com].
-#
-# [Multi-Word Text Link]
-#
-#   Use square brackets and curly braces to create a multi-word text link.
-#
-#   - <tt>{GitHub home page}[https://github.com]</tt> links to
-#     {GitHub home page}[https://github.com].
-#
-# [<tt>rdoc-ref</tt> Scheme]
-#
-#   A link with the <tt>rdoc-ref:</tt> scheme links to the referenced item,
-#   if that item exists.
-#   The referenced item may be a class, module, method, file, etc.
-#
-#   - Class: <tt>Alias[rdoc-ref:RDoc::Alias]</tt> links to Alias[rdoc-ref:RDoc::Alias].
-#   - Module: <tt>RDoc[rdoc-ref:RDoc]</tt> links to RDoc[rdoc-ref:RDoc].
-#   - Method: <tt>foo[rdoc-ref:RDoc::Markup::ToHtml#handle_regexp_RDOCLINK]</tt>
-#     links to foo[rdoc-ref:RDoc::Markup::ToHtml#handle_regexp_RDOCLINK].
-#   - Constant: <tt>bar[rdoc-ref:RDoc::Markup::ToHtml::LIST_TYPE_TO_HTML]</tt>
-#     links to bar[rdoc-ref:RDoc::Markup::ToHtml::LIST_TYPE_TO_HTML].
-#   - Attribute: <tt>baz[rdoc-ref:RDoc::Markup::ToHtml#code_object]</tt>
-#     links to baz[rdoc-ref:RDoc::Markup::ToHtml#code_object].
-#   - Alias: <tt>bad[rdoc-ref:RDoc::MarkupReference#dummy_instance_alias]</tt> links to
-#     bad[rdoc-ref:RDoc::MarkupReference#dummy_instance_alias].
-#
-#   If the referenced item does not exist, no link is generated
-#   and entire <tt>rdoc-ref:</tt> square-bracketed clause is removed
-#   from the resulting text.
-#
-#   - <tt>Nosuch[rdoc-ref:RDoc::Nosuch]</tt> is rendered as
-#     Nosuch[rdoc-ref:RDoc::Nosuch].
-#
-#
-# [<tt>rdoc-label</tt> Scheme]
-#
-#   [Simple]
-#
-#     You can specify a link target using this form,
-#     where the second part cites the id of an HTML element.
-#
-#     This link refers to the constant +DUMMY_CONSTANT+ on this page:
-#
-#     - <tt>{DUMMY_CONSTANT}[rdoc-label:DUMMY_CONSTANT]</tt>
-#
-#     Thus:
-#
-#     {DUMMY_CONSTANT}[rdoc-label:DUMMY_CONSTANT]
-#
-#   [With Return]
-#
-#     You can specify both a link target and a local label
-#     that can be used as the target for a return link.
-#     These two links refer to each other:
-#
-#     - <tt>{go to addressee}[rdoc-label:addressee:sender]</tt>
-#     - <tt>{return to sender}[rdoc-label:sender:addressee]</tt>
-#
-#     Thus:
-#
-#     {go to addressee}[rdoc-label:addressee:sender]
-#
-#     Some text.
-#
-#     {return to sender}[rdoc-label:sender:addressee]
-#
-# [<tt>link:</tt> Scheme]
-#
-#   - <tt>link:README_rdoc.html</tt> links to link:README_rdoc.html.
-#
-# [<tt>rdoc-image</tt> Scheme]
-#
-#   Use the <tt>rdoc-image</tt> scheme to display an image that is also a link:
-#
-#     # {rdoc-image:path/to/image}[link_target]
-#
-#   - Link: <tt>{rdoc-image:https://www.ruby-lang.org/images/header-ruby-logo@2x.png}[https://www.ruby-lang.org]</tt>
-#     displays image <tt>https://www.ruby-lang.org/images/header-ruby-logo@2x.png</tt>
-#     as a link to <tt>https://www.ruby-lang.org</tt>.
-#
-#     {rdoc-image:https://www.ruby-lang.org/images/header-ruby-logo@2x.png}[https://www.ruby-lang.org]
-#
-#   A relative path as the target also works:
-#
-#   - Link: <tt>{rdoc-image:https://www.ruby-lang.org/images/header-ruby-logo@2x.png}[./Alias.html]</tt> links to <tt>./Alias.html</tt>
-#
-#     {rdoc-image:https://www.ruby-lang.org/images/header-ruby-logo@2x.png}[./Alias.html]
-#
-# === Escaping Text
-#
-# Text that would otherwise be interpreted as markup
-# can be "escaped," so that it is not interpreted as markup;
-# the escape character is the backslash (<tt>'\\'</tt>).
-#
-# In a verbatim text block or a code block,
-# the escape character is always preserved:
-#
-# Example input:
-#
-#   This is not verbatim text.
-#
-#     This is verbatim text, with an escape character \.
-#
-#   This is not a code block.
-#
-#     def foo
-#       'String with an escape character.'
-#     end
-#
-# Rendered HTML:
-#
-# >>>
-#   This is not verbatim text.
-#
-#     This is verbatim text, with an escape character \.
-#
-#   This is not a code block.
-#
-#     def foo
-#       'This is a code block with an escape character \.'
-#     end
-#
-# In typeface markup (italic, bold, or monofont),
-# an escape character is preserved unless it is immediately
-# followed by nested typeface markup.
-#
-# Example input:
-#
-#   This list is about escapes; it contains:
-#
-#   - <tt>Monofont text with unescaped nested _italic_</tt>.
-#   - <tt>Monofont text with escaped nested \_italic_</tt>.
-#   - <tt>Monofont text with an escape character \</tt>.
-#
-# Rendered HTML:
-#
-# >>>
-#   This list is about escapes; it contains:
-#
-#   - <tt>Monofont text with unescaped nested _italic_</tt>.
-#   - <tt>Monofont text with escaped nested \_italic_</tt>.
-#   - <tt>Monofont text with an escape character \ </tt>.
-#
-# In other text-bearing blocks
-# (paragraphs, block quotes, list items, headings):
-#
-# - A single escape character immediately followed by markup
-#   escapes the markup.
-# - A single escape character followed by whitespace is preserved.
-# - A single escape character anywhere else is ignored.
-# - A double escape character is rendered as a single backslash.
-#
-#   Example input:
-#
-#     This list is about escapes; it contains:
-#
-#     - An unescaped class name, RDoc, that will become a link.
-#     - An escaped class name, \RDoc, that will not become a link.
-#     - An escape character followed by whitespace \ .
-#     - An escape character \that is ignored.
-#     - A double escape character \\ that is rendered
-#       as a single backslash.
-#
-#   Rendered HTML:
-#
-#   >>>
-#     This list is about escapes; it contains:
-#
-#     - An unescaped class name, RDoc, that will become a link.
-#     - An escaped class name, \RDoc, that will not become a link.
-#     - An escape character followed by whitespace \ .
-#     - An escape character \that is ignored.
-#     - A double escape character \\ that is rendered
-#       as a single backslash.
-#
-# == Documentation Derived from Ruby Code
-#
-# [Class]
-#
-#   By default, \RDoc documents:
-#
-#   - \Class name.
-#   - Parent class.
-#   - Singleton methods.
-#   - Instance methods.
-#   - Aliases.
-#   - Constants.
-#   - Attributes.
-#
-# [Module]
-#
-#   By default, \RDoc documents:
-#
-#   - \Module name.
-#   - \Singleton methods.
-#   - Instance methods.
-#   - Aliases.
-#   - Constants.
-#   - Attributes.
-#
-# [Method]
-#
-#   By default, \RDoc documents:
-#
-#   - \Method name.
-#   - Arguments.
-#   - Yielded values.
-#
-#   See #method.
-#
-# [Alias]
-#
-#   By default, \RDoc documents:
-#
-#   - Alias name.
-#   - Aliased name.
-#
-#   See #dummy_instance_alias and #dummy_instance_method.
-#
-# [Constant]
-#
-#   By default, \RDoc documents:
-#
-#   - \Constant name.
-#
-#   See DUMMY_CONSTANT.
-#
-# [Attribute]
-#
-#   By default, \RDoc documents:
-#
-#   - Attribute name.
-#   - Attribute type (<tt>[R]</tt>, <tt>[W]</tt>, or <tt>[RW]</tt>)
-#
-#   See #dummy_attribute.
-#
-class RDoc::MarkupReference
-
-  class DummyClass; end
-  module DummyModule; end
-  def self.dummy_singleton_method(foo, bar); end
-  def dummy_instance_method(foo, bar); end;
-  alias dummy_instance_alias dummy_instance_method
-  attr_accessor :dummy_attribute
-  alias dummy_attribute_alias dummy_attribute
-  DUMMY_CONSTANT = ''
-
-  # :call-seq:
-  #   call_seq_directive(foo, bar)
-  #   Can be anything -> bar
-  #   Also anything more -> baz or bat
-  #
-  # The <tt>:call-seq:</tt> directive overrides the actual calling sequence
-  # found in the Ruby code.
-  #
-  # - It can specify anything at all.
-  # - It can have multiple calling sequences.
-  #
-  # This one includes <tt>Can be anything -> foo</tt>, which is nonsense.
-  #
-  # Note that the "arrow" is two characters, hyphen and right angle-bracket,
-  # which is made into a single character in the HTML.
-  #
-  # Click on the calling sequence to see the code.
-  #
-  # Here is the <tt>:call-seq:</tt> directive given for the method:
-  #
-  #   :call-seq:
-  #     call_seq_directive(foo, bar)
-  #     Can be anything -> bar
-  #     Also anything more -> baz or bat
-  #
-  def call_seq_directive
-    nil
-  end
-
-  # The <tt>:args:</tt> directive overrides the actual arguments found in the Ruby code.
-  #
-  # Click on the calling sequence to see the code.
-  #
-  def args_directive(foo, bar) # :args: baz
-    nil
-  end
-
-  # The <tt>:yields:</tt> directive overrides the actual yield found in the Ruby code.
-  #
-  # Click on the calling sequence to see the code.
-  #
-  def yields_directive(foo, bar) # :yields: 'bat'
-    yield 'baz'
-  end
-
-  # This method is documented only by \RDoc, except for these comments.
-  #
-  # Click on the calling sequence to see the code.
-  #
-  def method(foo, bar)
-    yield 'baz'
-  end
-
-end
diff --git a/doc/regexp.rdoc b/doc/regexp.rdoc
deleted file mode 100644
index c797c782f144bc..00000000000000
--- a/doc/regexp.rdoc
+++ /dev/null
@@ -1,1242 +0,0 @@
-A {regular expression}[https://en.wikipedia.org/wiki/Regular_expression]
-(also called a _regexp_) is a <i>match pattern</i> (also simply called a _pattern_).
-
-A common notation for a regexp uses enclosing slash characters:
-
-  /foo/
-
-A regexp may be applied to a <i>target string</i>;
-The part of the string (if any) that matches the pattern is called a _match_,
-and may be said <i>to match</i>:
-
-  re = /red/
-  re.match?('redirect') # => true   # Match at beginning of target.
-  re.match?('bored')    # => true   # Match at end of target.
-  re.match?('credit')   # => true   # Match within target.
-  re.match?('foo')      # => false  # No match.
-
-== \Regexp Uses
-
-A regexp may be used:
-
-- To extract substrings based on a given pattern:
-
-    re = /foo/              # => /foo/
-    re.match('food')        # => #<MatchData "foo">
-    re.match('good')        # => nil
-
-  See sections {Method match}[rdoc-ref:regexp.rdoc@Method+match]
-  and {Operator =~}[rdoc-ref:regexp.rdoc@Operator+-3D~].
-
-- To determine whether a string matches a given pattern:
-
-    re.match?('food') # => true
-    re.match?('good') # => false
-
-  See section {Method match?}[rdoc-ref:regexp.rdoc@Method+match-3F].
-
-- As an argument for calls to certain methods in other classes and modules;
-  most such methods accept an argument that may be either a string
-  or the (much more powerful) regexp.
-
-  See {Regexp Methods}[./Regexp/methods_rdoc.html].
-
-== \Regexp Objects
-
-A regexp object has:
-
-- A source; see {Sources}[rdoc-ref:regexp.rdoc@Sources].
-
-- Several modes; see {Modes}[rdoc-ref:regexp.rdoc@Modes].
-
-- A timeout; see {Timeouts}[rdoc-ref:regexp.rdoc@Timeouts].
-
-- An encoding; see {Encodings}[rdoc-ref:regexp.rdoc@Encodings].
-
-== Creating a \Regexp
-
-A regular expression may be created with:
-
-- A regexp literal using slash characters
-  (see {Regexp Literals}[https://docs.ruby-lang.org/en/master/syntax/literals_rdoc.html#label-Regexp+Literals]):
-
-    # This is a very common usage.
-    /foo/ # => /foo/
-
-- A <tt>%r</tt> regexp literal
-  (see {%r: Regexp Literals}[https://docs.ruby-lang.org/en/master/syntax/literals_rdoc.html#label-25r-3A+Regexp+Literals]):
-
-    # Same delimiter character at beginning and end;
-    # useful for avoiding escaping characters
-    %r/name\/value pair/ # => /name\/value pair/
-    %r:name/value pair:  # => /name\/value pair/
-    %r|name/value pair|  # => /name\/value pair/
-
-    # Certain "paired" characters can be delimiters.
-    %r[foo] # => /foo/
-    %r{foo} # => /foo/
-    %r(foo) # => /foo/
-    %r<foo> # => /foo/
-
-- \Method Regexp.new.
-
-== \Method <tt>match</tt>
-
-Each of the methods Regexp#match, String#match, and Symbol#match
-returns a MatchData object if a match was found, +nil+ otherwise;
-each also sets {global variables}[rdoc-ref:regexp.rdoc@Global+Variables]:
-
-  'food'.match(/foo/) # => #<MatchData "foo">
-  'food'.match(/bar/) # => nil
-
-== Operator <tt>=~</tt>
-
-Each of the operators Regexp#=~, String#=~, and Symbol#=~
-returns an integer offset if a match was found, +nil+ otherwise;
-each also sets {global variables}[rdoc-ref:regexp.rdoc@Global+Variables]:
-
-  /bar/ =~ 'foo bar' # => 4
-  'foo bar' =~ /bar/ # => 4
-  /baz/ =~ 'foo bar' # => nil
-
-== \Method <tt>match?</tt>
-
-Each of the methods Regexp#match?, String#match?, and Symbol#match?
-returns +true+ if a match was found, +false+ otherwise;
-none sets {global variables}[rdoc-ref:regexp.rdoc@Global+Variables]:
-
-  'food'.match?(/foo/) # => true
-  'food'.match?(/bar/) # => false
-
-== Global Variables
-
-Certain regexp-oriented methods assign values to global variables:
-
-- <tt>#match</tt>: see {Method match}[rdoc-ref:regexp.rdoc@Method+match].
-- <tt>#=~</tt>: see {Operator =~}[rdoc-ref:regexp.rdoc@Operator+-3D~].
-
-The affected global variables are:
-
-- <tt>$~</tt>: Returns a MatchData object, or +nil+.
-- <tt>$&</tt>: Returns the matched part of the string, or +nil+.
-- <tt>$`</tt>: Returns the part of the string to the left of the match, or +nil+.
-- <tt>$'</tt>: Returns the part of the string to the right of the match, or +nil+.
-- <tt>$+</tt>: Returns the last group matched, or +nil+.
-- <tt>$1</tt>, <tt>$2</tt>, etc.: Returns the first, second, etc.,
-  matched group, or +nil+.
-  Note that <tt>$0</tt> is quite different;
-  it returns the name of the currently executing program.
-
-Examples:
-
-  # Matched string, but no matched groups.
-  'foo bar bar baz'.match('bar')
-  $~ # => #<MatchData "bar">
-  $& # => "bar"
-  $` # => "foo "
-  $' # => " bar baz"
-  $+ # => nil
-  $1 # => nil
-
-  # Matched groups.
-  /s(\w{2}).*(c)/.match('haystack')
-  $~ # => #<MatchData "stac" 1:"ta" 2:"c">
-  $& # => "stac"
-  $` # => "hay"
-  $' # => "k"
-  $+ # => "c"
-  $1 # => "ta"
-  $2 # => "c"
-  $3 # => nil
-
-  # No match.
-  'foo'.match('bar')
-  $~ # => nil
-  $& # => nil
-  $` # => nil
-  $' # => nil
-  $+ # => nil
-  $1 # => nil
-
-Note that Regexp#match?, String#match?, and Symbol#match?
-do not set global variables.
-
-== Sources
-
-As seen above, the simplest regexp uses a literal expression as its source:
-
-  re = /foo/              # => /foo/
-  re.match('food')        # => #<MatchData "foo">
-  re.match('good')        # => nil
-
-A rich collection of available _subexpressions_
-gives the regexp great power and flexibility:
-
-- {Special characters}[rdoc-ref:regexp.rdoc@Special+Characters]
-- {Source literals}[rdoc-ref:regexp.rdoc@Source+Literals]
-- {Character classes}[rdoc-ref:regexp.rdoc@Character+Classes]
-- {Shorthand character classes}[rdoc-ref:regexp.rdoc@Shorthand+Character+Classes]
-- {Anchors}[rdoc-ref:regexp.rdoc@Anchors]
-- {Alternation}[rdoc-ref:regexp.rdoc@Alternation]
-- {Quantifiers}[rdoc-ref:regexp.rdoc@Quantifiers]
-- {Groups and captures}[rdoc-ref:regexp.rdoc@Groups+and+Captures]
-- {Unicode}[rdoc-ref:regexp.rdoc@Unicode]
-- {POSIX Bracket Expressions}[rdoc-ref:regexp.rdoc@POSIX+Bracket+Expressions]
-- {Comments}[rdoc-ref:regexp.rdoc@Comments]
-
-=== Special Characters
-
-\Regexp special characters, called _metacharacters_,
-have special meanings in certain contexts;
-depending on the context, these are sometimes metacharacters:
-
-  . ? - + * ^ \ | $ ( ) [ ] { }
-
-To match a metacharacter literally, backslash-escape it:
-
-  # Matches one or more 'o' characters.
-  /o+/.match('foo')  # => #<MatchData "oo">
-  # Would match 'o+'.
-  /o\+/.match('foo') # => nil
-
-To match a backslash literally, backslash-escape it:
-
-  /\./.match('\.')  # => #<MatchData ".">
-  /\\./.match('\.') # => #<MatchData "\\.">
-
-Method Regexp.escape returns an escaped string:
-
-  Regexp.escape('.?-+*^\|$()[]{}')
-  # => "\\.\\?\\-\\+\\*\\^\\\\\\|\\$\\(\\)\\[\\]\\{\\}"
-
-=== Source Literals
-
-The source literal largely behaves like a double-quoted string;
-see {String Literals}[rdoc-ref:syntax/literals.rdoc@String+Literals].
-
-In particular, a source literal may contain interpolated expressions:
-
-  s = 'foo'         # => "foo"
-  /#{s}/            # => /foo/
-  /#{s.capitalize}/ # => /Foo/
-  /#{2 + 2}/        # => /4/
-
-There are differences between an ordinary string literal and a source literal;
-see {Shorthand Character Classes}[rdoc-ref:regexp.rdoc@Shorthand+Character+Classes].
-
-- <tt>\s</tt> in an ordinary string literal is equivalent to a space character;
-  in a source literal, it's shorthand for matching a whitespace character.
-- In an ordinary string literal, these are (needlessly) escaped characters;
-  in a source literal, they are shorthands for various matching characters:
-
-    \w \W \d \D \h \H \S \R
-
-=== Character Classes
-
-A <i>character class</i> is delimited by square brackets;
-it specifies that certain characters match at a given point in the target string:
-
-  # This character class will match any vowel.
-  re = /B[aeiou]rd/
-  re.match('Bird') # => #<MatchData "Bird">
-  re.match('Bard') # => #<MatchData "Bard">
-  re.match('Byrd') # => nil
-
-A character class may contain hyphen characters to specify ranges of characters:
-
-  # These regexps have the same effect.
-  /[abcdef]/.match('foo') # => #<MatchData "f">
-  /[a-f]/.match('foo')    # => #<MatchData "f">
-  /[a-cd-f]/.match('foo') # => #<MatchData "f">
-
-When the first character of a character class is a caret (<tt>^</tt>),
-the sense of the class is inverted: it matches any character _except_ those specified.
-
-  /[^a-eg-z]/.match('f') # => #<MatchData "f">
-
-A character class may contain another character class.
-By itself this isn't useful because <tt>[a-z[0-9]]</tt>
-describes the same set as <tt>[a-z0-9]</tt>.
-
-However, character classes also support the <tt>&&</tt> operator,
-which performs set intersection on its arguments.
-The two can be combined as follows:
-
-  /[a-w&&[^c-g]z]/ # ([a-w] AND ([^c-g] OR z))
-
-This is equivalent to:
-
-    /[abh-w]/
-
-=== Shorthand Character Classes
-
-Each of the following metacharacters serves as a shorthand
-for a character class:
-
-- <tt>/./</tt>: Matches any character except a newline:
-
-    /./.match('foo') # => #<MatchData "f">
-    /./.match("\n")  # => nil
-
-- <tt>/./m</tt>: Matches any character, including a newline;
-  see {Multiline Mode}[rdoc-ref:regexp.rdoc@Multiline+Mode}:
-
-    /./m.match("\n") # => #<MatchData "\n">
-
-- <tt>/\w/</tt>: Matches a word character: equivalent to <tt>[a-zA-Z0-9_]</tt>:
-
-    /\w/.match(' foo') # => #<MatchData "f">
-    /\w/.match(' _')   # => #<MatchData "_">
-    /\w/.match(' ')    # => nil
-
-- <tt>/\W/</tt>: Matches a non-word character: equivalent to <tt>[^a-zA-Z0-9_]</tt>:
-
-    /\W/.match(' ') # => #<MatchData " ">
-    /\W/.match('_') # => nil
-
-- <tt>/\d/</tt>: Matches a digit character: equivalent to <tt>[0-9]</tt>:
-
-    /\d/.match('THX1138') # => #<MatchData "1">
-    /\d/.match('foo')     # => nil
-
-- <tt>/\D/</tt>: Matches a non-digit character: equivalent to <tt>[^0-9]</tt>:
-
-    /\D/.match('123Jump!') # => #<MatchData "J">
-    /\D/.match('123')      # => nil
-
-- <tt>/\h/</tt>: Matches a hexdigit character: equivalent to <tt>[0-9a-fA-F]</tt>:
-
-    /\h/.match('xyz fedcba9876543210') # => #<MatchData "f">
-    /\h/.match('xyz')                  # => nil
-
-- <tt>/\H/</tt>: Matches a non-hexdigit character: equivalent to <tt>[^0-9a-fA-F]</tt>:
-
-    /\H/.match('fedcba9876543210xyz') # => #<MatchData "x">
-    /\H/.match('fedcba9876543210')    # => nil
-
-- <tt>/\s/</tt>: Matches a whitespace character: equivalent to <tt>/[ \t\r\n\f\v]/</tt>:
-
-    /\s/.match('foo bar') # => #<MatchData " ">
-    /\s/.match('foo')     # => nil
-
-- <tt>/\S/</tt>: Matches a non-whitespace character: equivalent to <tt>/[^ \t\r\n\f\v]/</tt>:
-
-    /\S/.match(" \t\r\n\f\v foo") # => #<MatchData "f">
-    /\S/.match(" \t\r\n\f\v")     # => nil
-
-- <tt>/\R/</tt>: Matches a linebreak, platform-independently:
-
-    /\R/.match("\r")     # => #<MatchData "\r">     # Carriage return (CR)
-    /\R/.match("\n")     # => #<MatchData "\n">     # Newline (LF)
-    /\R/.match("\f")     # => #<MatchData "\f">     # Formfeed (FF)
-    /\R/.match("\v")     # => #<MatchData "\v">     # Vertical tab (VT)
-    /\R/.match("\r\n")   # => #<MatchData "\r\n">   # CRLF
-    /\R/.match("\u0085") # => #<MatchData "\u0085"> # Next line (NEL)
-    /\R/.match("\u2028") # => #<MatchData "\u2028"> # Line separator (LSEP)
-    /\R/.match("\u2029") # => #<MatchData "\u2029"> # Paragraph separator (PSEP)
-
-=== Anchors
-
-An anchor is a metasequence that matches a zero-width position between
-characters in the target string.
-
-For a subexpression with no anchor,
-matching may begin anywhere in the target string:
-
-  /real/.match('surrealist') # => #<MatchData "real">
-
-For a subexpression with an anchor,
-matching must begin at the matched anchor.
-
-==== Boundary Anchors
-
-Each of these anchors matches a boundary:
-
-- <tt>^</tt>: Matches the beginning of a line:
-
-    /^bar/.match("foo\nbar") # => #<MatchData "bar">
-    /^ar/.match("foo\nbar")  # => nil
-
-- <tt>$</tt>: Matches the end of a line:
-
-    /bar$/.match("foo\nbar") # => #<MatchData "bar">
-    /ba$/.match("foo\nbar")  # => nil
-
-- <tt>\A</tt>: Matches the beginning of the string:
-
-    /\Afoo/.match('foo bar')  # => #<MatchData "foo">
-    /\Afoo/.match(' foo bar') # => nil
-
-- <tt>\Z</tt>: Matches the end of the string;
-  if string ends with a single newline,
-  it matches just before the ending newline:
-
-    /foo\Z/.match('bar foo')     # => #<MatchData "foo">
-    /foo\Z/.match('foo bar')     # => nil
-    /foo\Z/.match("bar foo\n")   # => #<MatchData "foo">
-    /foo\Z/.match("bar foo\n\n") # => nil
-
-- <tt>\z</tt>: Matches the end of the string:
-
-    /foo\z/.match('bar foo')   # => #<MatchData "foo">
-    /foo\z/.match('foo bar')   # => nil
-    /foo\z/.match("bar foo\n") # => nil
-
-- <tt>\b</tt>: Matches word boundary when not inside brackets;
-  matches backspace (<tt>"0x08"</tt>) when inside brackets:
-
-    /foo\b/.match('foo bar') # => #<MatchData "foo">
-    /foo\b/.match('foobar')  # => nil
-
-- <tt>\B</tt>: Matches non-word boundary:
-
-    /foo\B/.match('foobar')  # => #<MatchData "foo">
-    /foo\B/.match('foo bar') # => nil
-
-- <tt>\G</tt>: Matches first matching position:
-
-  In methods like String#gsub and String#scan, it changes on each iteration.
-  It initially matches the beginning of subject, and in each following iteration it matches where the last match finished.
-
-    "    a b c".gsub(/ /, '_')   # => "____a_b_c"
-    "    a b c".gsub(/\G /, '_') # => "____a b c"
-
-  In methods like Regexp#match and String#match
-  that take an optional offset, it matches where the search begins.
-
-    "hello, world".match(/,/, 3)   # => #<MatchData ",">
-    "hello, world".match(/\G,/, 3) # => nil
-
-==== Lookaround Anchors
-
-Lookahead anchors:
-
-- <tt>(?=_pat_)</tt>: Positive lookahead assertion:
-  ensures that the following characters match _pat_,
-  but doesn't include those characters in the matched substring.
-
-- <tt>(?!_pat_)</tt>: Negative lookahead assertion:
-  ensures that the following characters <i>do not</i> match _pat_,
-  but doesn't include those characters in the matched substring.
-
-Lookbehind anchors:
-
-- <tt>(?<=_pat_)</tt>: Positive lookbehind assertion:
-  ensures that the preceding characters match _pat_, but
-  doesn't include those characters in the matched substring.
-
-- <tt>(?<!_pat_)</tt>: Negative lookbehind assertion:
-  ensures that the preceding characters do not match
-  _pat_, but doesn't include those characters in the matched substring.
-
-The pattern below uses positive lookahead and positive lookbehind to match
-text appearing in <tt><b></tt>...<tt></b></tt> tags
-without including the tags in the match:
-
-  /(?<=<b>)\w+(?=<\/b>)/.match("Fortune favors the <b>bold</b>.")
-  # => #<MatchData "bold">
-
-==== Match-Reset Anchor
-
-- <tt>\K</tt>: Match reset:
-  the matched content preceding <tt>\K</tt> in the regexp is excluded from the result.
-  For example, the following two regexps are almost equivalent:
-
-    /ab\Kc/.match('abc')    # => #<MatchData "c">
-    /(?<=ab)c/.match('abc') # => #<MatchData "c">
-
-  These match same string and <tt>$&</tt> equals <tt>'c'</tt>,
-  while the matched position is different.
-
-  As are the following two regexps:
-
-    /(a)\K(b)\Kc/
-    /(?<=(?<=(a))(b))c/
-
-=== Alternation
-
-The vertical bar metacharacter (<tt>|</tt>) may be used within parentheses
-to express alternation:
-two or more subexpressions any of which may match the target string.
-
-Two alternatives:
-
-  re = /(a|b)/
-  re.match('foo') # => nil
-  re.match('bar') # => #<MatchData "b" 1:"b">
-
-Four alternatives:
-
-  re = /(a|b|c|d)/
-  re.match('shazam') # => #<MatchData "a" 1:"a">
-  re.match('cold')   # => #<MatchData "c" 1:"c">
-
-Each alternative is a subexpression, and may be composed of other subexpressions:
-
-  re = /([a-c]|[x-z])/
-  re.match('bar') # => #<MatchData "b" 1:"b">
-  re.match('ooz') # => #<MatchData "z" 1:"z">
-
-\Method Regexp.union provides a convenient way to construct
-a regexp with alternatives.
-
-=== Quantifiers
-
-A simple regexp matches one character:
-
-  /\w/.match('Hello')  # => #<MatchData "H">
-
-An added _quantifier_ specifies how many matches are required or allowed:
-
-- <tt>*</tt> - Matches zero or more times:
-
-    /\w*/.match('')
-    # => #<MatchData "">
-    /\w*/.match('x')
-    # => #<MatchData "x">
-    /\w*/.match('xyz')
-    # => #<MatchData "yz">
-
-- <tt>+</tt> - Matches one or more times:
-
-    /\w+/.match('')    # => nil
-    /\w+/.match('x')   # => #<MatchData "x">
-    /\w+/.match('xyz') # => #<MatchData "xyz">
-
-- <tt>?</tt> - Matches zero or one times:
-
-    /\w?/.match('')    # => #<MatchData "">
-    /\w?/.match('x')   # => #<MatchData "x">
-    /\w?/.match('xyz') # => #<MatchData "x">
-
-- <tt>{</tt>_n_<tt>}</tt> - Matches exactly _n_ times:
-
-    /\w{2}/.match('')    # => nil
-    /\w{2}/.match('x')   # => nil
-    /\w{2}/.match('xyz') # => #<MatchData "xy">
-
-- <tt>{</tt>_min_<tt>,}</tt> - Matches _min_ or more times:
-
-    /\w{2,}/.match('')    # => nil
-    /\w{2,}/.match('x')   # => nil
-    /\w{2,}/.match('xy')  # => #<MatchData "xy">
-    /\w{2,}/.match('xyz') # => #<MatchData "xyz">
-
-- <tt>{,</tt>_max_<tt>}</tt> - Matches _max_ or fewer times:
-
-    /\w{,2}/.match('')    # => #<MatchData "">
-    /\w{,2}/.match('x')   # => #<MatchData "x">
-    /\w{,2}/.match('xyz') # => #<MatchData "xy">
-
-- <tt>{</tt>_min_<tt>,</tt>_max_<tt>}</tt> -
-  Matches at least _min_ times and at most _max_ times:
-
-    /\w{1,2}/.match('')    # => nil
-    /\w{1,2}/.match('x')   # => #<MatchData "x">
-    /\w{1,2}/.match('xyz') # => #<MatchData "xy">
-
-==== Greedy, Lazy, or Possessive Matching
-
-Quantifier matching may be greedy, lazy, or possessive:
-
-- In _greedy_ matching, as many occurrences as possible are matched
-  while still allowing the overall match to succeed.
-  Greedy quantifiers: <tt>*</tt>, <tt>+</tt>, <tt>?</tt>,
-  <tt>{min, max}</tt> and its variants.
-- In _lazy_ matching, the minimum number of occurrences are matched.
-  Lazy quantifiers: <tt>*?</tt>, <tt>+?</tt>, <tt>??</tt>,
-  <tt>{min, max}?</tt> and its variants.
-- In _possessive_ matching, once a match is found, there is no backtracking;
-  that match is retained, even if it jeopardises the overall match.
-  Possessive quantifiers: <tt>*+</tt>, <tt>++</tt>, <tt>?+</tt>.
-  Note that <tt>{min, max}</tt> and its variants do _not_ support possessive matching.
-
-More:
-
-- About greedy and lazy matching, see
-  {Choosing Minimal or Maximal Repetition}[https://doc.lagout.org/programmation/Regular%20Expressions/Regular%20Expressions%20Cookbook_%20Detailed%20Solutions%20in%20Eight%20Programming%20Languages%20%282nd%20ed.%29%20%5BGoyvaerts%20%26%20Levithan%202012-09-06%5D.pdf#tutorial-backtrack].
-- About possessive matching, see
-  {Eliminate Needless Backtracking}[https://doc.lagout.org/programmation/Regular%20Expressions/Regular%20Expressions%20Cookbook_%20Detailed%20Solutions%20in%20Eight%20Programming%20Languages%20%282nd%20ed.%29%20%5BGoyvaerts%20%26%20Levithan%202012-09-06%5D.pdf#tutorial-backtrack].
-
-=== Groups and Captures
-
-A simple regexp has (at most) one match:
-
-  re = /\d\d\d\d-\d\d-\d\d/
-  re.match('1943-02-04')      # => #<MatchData "1943-02-04">
-  re.match('1943-02-04').size # => 1
-  re.match('foo')             # => nil
-
-Adding one or more pairs of parentheses, <tt>(_subexpression_)</tt>,
-defines _groups_, which may result in multiple matched substrings,
-called _captures_:
-
-  re = /(\d\d\d\d)-(\d\d)-(\d\d)/
-  re.match('1943-02-04')      # => #<MatchData "1943-02-04" 1:"1943" 2:"02" 3:"04">
-  re.match('1943-02-04').size # => 4
-
-The first capture is the entire matched string;
-the other captures are the matched substrings from the groups.
-
-A group may have a
-{quantifier}[rdoc-ref:regexp.rdoc@Quantifiers]:
-
-  re = /July 4(th)?/
-  re.match('July 4')   # => #<MatchData "July 4" 1:nil>
-  re.match('July 4th') # => #<MatchData "July 4th" 1:"th">
-
-  re = /(foo)*/
-  re.match('')       # => #<MatchData "" 1:nil>
-  re.match('foo')    # => #<MatchData "foo" 1:"foo">
-  re.match('foofoo') # => #<MatchData "foofoo" 1:"foo">
-
-  re = /(foo)+/
-  re.match('')       # => nil
-  re.match('foo')    # => #<MatchData "foo" 1:"foo">
-  re.match('foofoo') # => #<MatchData "foofoo" 1:"foo">
-
-The returned \MatchData object gives access to the matched substrings:
-
-  re = /(\d\d\d\d)-(\d\d)-(\d\d)/
-  md = re.match('1943-02-04')
-  # => #<MatchData "1943-02-04" 1:"1943" 2:"02" 3:"04">
-  md[0] # => "1943-02-04"
-  md[1] # => "1943"
-  md[2] # => "02"
-  md[3] # => "04"
-
-==== Non-Capturing Groups
-
-A group may be made non-capturing;
-it is still a group (and, for example, can have a quantifier),
-but its matching substring is not included among the captures.
-
-A non-capturing group begins with <tt>?:</tt> (inside the parentheses):
-
-  # Don't capture the year.
-  re = /(?:\d\d\d\d)-(\d\d)-(\d\d)/
-  md = re.match('1943-02-04') # => #<MatchData "1943-02-04" 1:"02" 2:"04">
-
-==== Backreferences
-
-A group match may also be referenced within the regexp itself;
-such a reference is called a +backreference+:
-
-  /[csh](..) [csh]\1 in/.match('The cat sat in the hat')
-  # => #<MatchData "cat sat in" 1:"at">
-
-This table shows how each subexpression in the regexp above
-matches a substring in the target string:
-
-  | Subexpression in Regexp   | Matching Substring in Target String |
-  |---------------------------|-------------------------------------|
-  |       First '[csh]'       |            Character 'c'            |
-  |          '(..)'           |        First substring 'at'         |
-  |      First space ' '      |      First space character ' '      |
-  |       Second '[csh]'      |            Character 's'            |
-  | '\1' (backreference 'at') |        Second substring 'at'        |
-  |           ' in'           |            Substring ' in'          |
-
-A regexp may contain any number of groups:
-
-- For a large number of groups:
-
-  - The ordinary <tt>\\_n_</tt> notation applies only for _n_ in range (1..9).
-  - The <tt>MatchData[_n_]</tt> notation applies for any non-negative _n_.
-
-- <tt>\0</tt> is a special backreference, referring to the entire matched string;
-  it may not be used within the regexp itself,
-  but may be used outside it (for example, in a substitution method call):
-
-    'The cat sat in the hat'.gsub(/[csh]at/, '\0s')
-    # => "The cats sats in the hats"
-
-==== Named Captures
-
-As seen above, a capture can be referred to by its number.
-A capture can also have a name,
-prefixed as <tt>?<_name_></tt> or <tt>?'_name_'</tt>,
-and the name (symbolized) may be used as an index in <tt>MatchData[]</tt>:
-
-  md = /\$(?<dollars>\d+)\.(?'cents'\d+)/.match("$3.67")
-  # => #<MatchData "$3.67" dollars:"3" cents:"67">
-  md[:dollars]  # => "3"
-  md[:cents]    # => "67"
-  # The capture numbers are still valid.
-  md[2]         # => "67"
-
-When a regexp contains a named capture, there are no unnamed captures:
-
-  /\$(?<dollars>\d+)\.(\d+)/.match("$3.67")
-  # => #<MatchData "$3.67" dollars:"3">
-
-A named group may be backreferenced as <tt>\k<_name_></tt>:
-
-  /(?<vowel>[aeiou]).\k<vowel>.\k<vowel>/.match('ototomy')
-  # => #<MatchData "ototo" vowel:"o">
-
-When (and only when) a regexp contains named capture groups
-and appears before the <tt>=~</tt> operator,
-the captured substrings are assigned to local variables with corresponding names:
-
-  /\$(?<dollars>\d+)\.(?<cents>\d+)/ =~ '$3.67'
-  dollars # => "3"
-  cents   # => "67"
-
-\Method Regexp#named_captures returns a hash of the capture names and substrings;
-method Regexp#names returns an array of the capture names.
-
-==== Atomic Grouping
-
-A group may be made _atomic_ with <tt>(?></tt>_subexpression_<tt>)</tt>.
-
-This causes the subexpression to be matched
-independently of the rest of the expression,
-so that the matched substring becomes fixed for the remainder of the match,
-unless the entire subexpression must be abandoned and subsequently revisited.
-
-In this way _subexpression_ is treated as a non-divisible whole.
-Atomic grouping is typically used to optimise patterns
-to prevent needless backtracking .
-
-Example (without atomic grouping):
-
-  /".*"/.match('"Quote"') # => #<MatchData "\"Quote\"">
-
-Analysis:
-
-1. The leading subexpression <tt>"</tt> in the pattern matches the first character
-   <tt>"</tt> in the target string.
-2. The next subexpression <tt>.*</tt> matches the next substring <tt>Quote“</tt>
-   (including the trailing double-quote).
-3. Now there is nothing left in the target string to match
-   the trailing subexpression <tt>"</tt> in the pattern;
-   this would cause the overall match to fail.
-4. The matched substring is backtracked by one position: <tt>Quote</tt>.
-5. The final subexpression <tt>"</tt> now matches the final substring <tt>"</tt>,
-   and the overall match succeeds.
-
-If subexpression <tt>.*</tt> is grouped atomically,
-the backtracking is disabled, and the overall match fails:
-
-  /"(?>.*)"/.match('"Quote"') # => nil
-
-Atomic grouping can affect performance;
-see {Atomic Group}[https://www.regular-expressions.info/atomic.html].
-
-==== Subexpression Calls
-
-As seen above, a backreference number (<tt>\\_n_</tt>) or name (<tt>\k<_name_></tt>)
-gives access to a captured _substring_;
-the corresponding regexp _subexpression_ may also be accessed,
-via the number (<tt>\\g<i>n</i></tt>) or name (<tt>\g<_name_></tt>):
-
-  /\A(?<paren>\(\g<paren>*\))*\z/.match('(())')
-  # ^1
-  #      ^2
-  #           ^3
-  #                 ^4
-  #      ^5
-  #           ^6
-  #                      ^7
-  #                       ^8
-  #                       ^9
-  #                           ^10
-
-The pattern:
-
-1.  Matches at the beginning of the string, i.e. before the first character.
-2.  Enters a named group +paren+.
-3.  Matches the first character in the string, <tt>'('</tt>.
-4.  Calls the +paren+ group again, i.e. recurses back to the  second step.
-5.  Re-enters the +paren+ group.
-6.  Matches the second character in the string, <tt>'('</tt>.
-7.  Attempts to call +paren+ a third time,
-    but fails because doing so would prevent an overall successful match.
-8.  Matches the third character in the string, <tt>')'</tt>;
-    marks the end of the second recursive call
-9.  Matches the fourth character in the string, <tt>')'</tt>.
-10. Matches the end of the string.
-
-See {Subexpression calls}[https://learnbyexample.github.io/Ruby_Regexp/groupings-and-backreferences.html?highlight=subexpression#subexpression-calls].
-
-==== Conditionals
-
-The conditional construct takes the form <tt>(?(_cond_)_yes_|_no_)</tt>, where:
-
-- _cond_ may be a capture number or name.
-- The match to be applied is _yes_ if_cond_ is captured;
-  otherwise the match to be applied is _no_.
-- If not needed, <tt>|_no_</tt> may be omitted.
-
-Examples:
-
-  re = /\A(foo)?(?(1)(T)|(F))\z/
-  re.match('fooT') # => #<MatchData "fooT" 1:"foo" 2:"T" 3:nil>
-  re.match('F')    # => #<MatchData "F" 1:nil 2:nil 3:"F">
-  re.match('fooF') # => nil
-  re.match('T')    # => nil
-
-  re = /\A(?<xyzzy>foo)?(?(<xyzzy>)(T)|(F))\z/
-  re.match('fooT') # => #<MatchData "fooT" xyzzy:"foo">
-  re.match('F')    # => #<MatchData "F" xyzzy:nil>
-  re.match('fooF') # => nil
-  re.match('T')    # => nil
-
-
-==== Absence Operator
-
-The absence operator is a special group that matches anything which does _not_ match the contained subexpressions.
-
-  /(?~real)/.match('surrealist') # => #<MatchData "surrea">
-  /(?~real)ist/.match('surrealist') # => #<MatchData "ealist">
-  /sur(?~real)ist/.match('surrealist') # => nil
-
-=== Unicode
-
-==== Unicode Properties
-
-The <tt>/\p{_property_name_}/</tt> construct (with lowercase +p+)
-matches characters using a Unicode property name,
-much like a character class;
-property +Alpha+ specifies alphabetic characters:
-
-  /\p{Alpha}/.match('a') # => #<MatchData "a">
-  /\p{Alpha}/.match('1') # => nil
-
-A property can be inverted
-by prefixing the name with a caret character (<tt>^</tt>):
-
-  /\p{^Alpha}/.match('1') # => #<MatchData "1">
-  /\p{^Alpha}/.match('a') # => nil
-
-Or by using <tt>\P</tt> (uppercase +P+):
-
-  /\P{Alpha}/.match('1') # => #<MatchData "1">
-  /\P{Alpha}/.match('a') # => nil
-
-See {Unicode Properties}[./Regexp/unicode_properties_rdoc.html]
-for regexps based on the numerous properties.
-
-Some commonly-used properties correspond to POSIX bracket expressions:
-
-- <tt>/\p{Alnum}/</tt>: Alphabetic and numeric character
-- <tt>/\p{Alpha}/</tt>: Alphabetic character
-- <tt>/\p{Blank}/</tt>: Space or tab
-- <tt>/\p{Cntrl}/</tt>: Control character
-- <tt>/\p{Digit}/</tt>: Digit
-  characters, and similar)
-- <tt>/\p{Lower}/</tt>: Lowercase alphabetical character
-- <tt>/\p{Print}/</tt>: Like <tt>\p{Graph}</tt>, but includes the space character
-- <tt>/\p{Punct}/</tt>: Punctuation character
-- <tt>/\p{Space}/</tt>: Whitespace character (<tt>[:blank:]</tt>, newline,
-  carriage return, etc.)
-- <tt>/\p{Upper}/</tt>: Uppercase alphabetical
-- <tt>/\p{XDigit}/</tt>: Digit allowed in a hexadecimal number (i.e., 0-9a-fA-F)
-
-These are also commonly used:
-
-- <tt>/\p{Emoji}/</tt>: Unicode emoji.
-- <tt>/\p{Graph}/</tt>: Non-blank character
-  (excludes spaces, control characters, and similar).
-- <tt>/\p{Word}/</tt>: A member of one of the following Unicode character
-  categories (see below):
-
-  - +Mark+ (+M+).
-  - +Letter+ (+L+).
-  - +Number+ (+N+)
-  - <tt>Connector Punctuation</tt> (+Pc+).
-
-- <tt>/\p{ASCII}/</tt>: A character in the ASCII character set.
-- <tt>/\p{Any}/</tt>: Any Unicode character (including unassigned characters).
-- <tt>/\p{Assigned}/</tt>: An assigned character.
-
-==== Unicode Character Categories
-
-A Unicode character category name:
-
-- May be either its full name or its abbreviated name.
-- Is case-insensitive.
-- Treats a space, a hyphen, and an underscore as equivalent.
-
-Examples:
-
-  /\p{lu}/                # => /\p{lu}/
-  /\p{LU}/                # => /\p{LU}/
-  /\p{Uppercase Letter}/  # => /\p{Uppercase Letter}/
-  /\p{Uppercase_Letter}/  # => /\p{Uppercase_Letter}/
-  /\p{UPPERCASE-LETTER}/  # => /\p{UPPERCASE-LETTER}/
-
-Below are the Unicode character category abbreviations and names.
-Enumerations of characters in each category are at the links.
-
-Letters:
-
-- +L+, +Letter+: +LC+, +Lm+, or +Lo+.
-- +LC+, +Cased_Letter+: +Ll+, +Lt+, or +Lu+.
-- {Lu, Lowercase_Letter}[https://www.compart.com/en/unicode/category/Ll].
-- {Lu, Modifier_Letter}[https://www.compart.com/en/unicode/category/Lm].
-- {Lu, Other_Letter}[https://www.compart.com/en/unicode/category/Lo].
-- {Lu, Titlecase_Letter}[https://www.compart.com/en/unicode/category/Lt].
-- {Lu, Uppercase_Letter}[https://www.compart.com/en/unicode/category/Lu].
-
-Marks:
-
-- +M+, +Mark+: +Mc+, +Me+, or +Mn+.
-- {Mc, Spacing_Mark}[https://www.compart.com/en/unicode/category/Mc].
-- {Me, Enclosing_Mark}[https://www.compart.com/en/unicode/category/Me].
-- {Mn, Nonapacing_Mark}[https://www.compart.com/en/unicode/category/Mn].
-
-Numbers:
-
-- +N+, +Number+: +Nd+, +Nl+, or +No+.
-- {Nd, Decimal_Number}[https://www.compart.com/en/unicode/category/Nd].
-- {Nl, Letter_Number}[https://www.compart.com/en/unicode/category/Nl].
-- {No, Other_Number}[https://www.compart.com/en/unicode/category/No].
-
-Punctation:
-
-- +P+, +Punctuation+: +Pc+, +Pd+, +Pe+, +Pf+, +Pi+, +Po+, or +Ps+.
-- {Pc, Connector_Punctuation}[https://www.compart.com/en/unicode/category/Pc].
-- {Pd, Dash_Punctuation}[https://www.compart.com/en/unicode/category/Pd].
-- {Pe, Close_Punctuation}[https://www.compart.com/en/unicode/category/Pe].
-- {Pf, Final_Punctuation}[https://www.compart.com/en/unicode/category/Pf].
-- {Pi, Initial_Punctuation}[https://www.compart.com/en/unicode/category/Pi].
-- {Po, Open_Punctuation}[https://www.compart.com/en/unicode/category/Po].
-- {Ps, Open_Punctuation}[https://www.compart.com/en/unicode/category/Ps].
-
-- +S+, +Symbol+: +Sc+, +Sk+, +Sm+, or +So+.
-- {Sc, Currency_Symbol}[https://www.compart.com/en/unicode/category/Sc].
-- {Sk, Modifier_Symbol}[https://www.compart.com/en/unicode/category/Sk].
-- {Sm, Math_Symbol}[https://www.compart.com/en/unicode/category/Sm].
-- {So, Other_Symbol}[https://www.compart.com/en/unicode/category/So].
-
-- +Z+, +Separator+: +Zl+, +Zp+, or +Zs+.
-- {Zl, Line_Separator}[https://www.compart.com/en/unicode/category/Zl].
-- {Zp, Paragraph_Separator}[https://www.compart.com/en/unicode/category/Zp].
-- {Zs, Space_Separator}[https://www.compart.com/en/unicode/category/Zs].
-
-- +C+, +Other+: +Cc+, +Cf+, +Cn+, +Co+, or +Cs+.
-- {Cc, Control}[https://www.compart.com/en/unicode/category/Cc].
-- {Cf, Format}[https://www.compart.com/en/unicode/category/Cf].
-- {Cn, Unassigned}[https://www.compart.com/en/unicode/category/Cn].
-- {Co, Private_Use}[https://www.compart.com/en/unicode/category/Co].
-- {Cs, Surrogate}[https://www.compart.com/en/unicode/category/Cs].
-
-==== Unicode Scripts and Blocks
-
-Among the Unicode properties are:
-
-- {Unicode scripts}[https://en.wikipedia.org/wiki/Script_(Unicode)];
-  see {supported scripts}[https://www.unicode.org/standard/supported.html].
-- {Unicode blocks}[https://en.wikipedia.org/wiki/Unicode_block];
-  see {supported blocks}[http://www.unicode.org/Public/UNIDATA/Blocks.txt].
-
-=== POSIX Bracket Expressions
-
-A POSIX <i>bracket expression</i> is also similar to a character class.
-These expressions provide a portable alternative to the above,
-with the added benefit of encompassing non-ASCII characters:
-
-- <tt>/\d/</tt> matches only ASCII decimal digits +0+ through +9+.
-- <tt>/[[:digit:]]/</tt> matches any character in the Unicode
-  <tt>Decimal Number</tt> (+Nd+) category;
-  see below.
-
-The POSIX bracket expressions:
-
-- <tt>/[[:digit:]]/</tt>: Matches a {Unicode digit}[https://www.compart.com/en/unicode/category/Nd]:
-
-    /[[:digit:]]/.match('9')       # => #<MatchData "9">
-    /[[:digit:]]/.match("\u1fbf9") # => #<MatchData "9">
-
-- <tt>/[[:xdigit:]]/</tt>: Matches a digit allowed in a hexadecimal number;
-  equivalent to <tt>[0-9a-fA-F]</tt>.
-
-- <tt>/[[:upper:]]/</tt>: Matches a {Unicode uppercase letter}[https://www.compart.com/en/unicode/category/Lu]:
-
-    /[[:upper:]]/.match('A')      # => #<MatchData "A">
-    /[[:upper:]]/.match("\u00c6") # => #<MatchData "Æ">
-
-- <tt>/[[:lower:]]/</tt>: Matches a {Unicode lowercase letter}[https://www.compart.com/en/unicode/category/Ll]:
-
-    /[[:lower:]]/.match('a')      # => #<MatchData "a">
-    /[[:lower:]]/.match("\u01fd") # => #<MatchData "ǽ">
-
-- <tt>/[[:alpha:]]/</tt>: Matches <tt>/[[:upper:]]/</tt> or <tt>/[[:lower:]]/</tt>.
-
-- <tt>/[[:alnum:]]/</tt>: Matches <tt>/[[:alpha:]]/</tt> or <tt>/[[:digit:]]/</tt>.
-
-- <tt>/[[:space:]]/</tt>: Matches {Unicode space character}[https://www.compart.com/en/unicode/category/Zs]:
-
-    /[[:space:]]/.match(' ')      # => #<MatchData " ">
-    /[[:space:]]/.match("\u2005") # => #<MatchData " ">
-
-- <tt>/[[:blank:]]/</tt>: Matches <tt>/[[:space:]]/</tt> or tab character:
-
-    /[[:blank:]]/.match(' ')      # => #<MatchData " ">
-    /[[:blank:]]/.match("\u2005") # => #<MatchData " ">
-    /[[:blank:]]/.match("\t")     # => #<MatchData "\t">
-
-- <tt>/[[:cntrl:]]/</tt>: Matches {Unicode control character}[https://www.compart.com/en/unicode/category/Cc]:
-
-    /[[:cntrl:]]/.match("\u0000") # => #<MatchData "\u0000">
-    /[[:cntrl:]]/.match("\u009f") # => #<MatchData "\u009F">
-
-- <tt>/[[:graph:]]/</tt>: Matches any character
-  except <tt>/[[:space:]]/</tt> or <tt>/[[:cntrl:]]/</tt>.
-
-- <tt>/[[:print:]]/</tt>: Matches <tt>/[[:graph:]]/</tt> or space character.
-
-- <tt>/[[:punct:]]/</tt>: Matches any (Unicode punctuation character}[https://www.compart.com/en/unicode/category/Po]:
-
-Ruby also supports these (non-POSIX) bracket expressions:
-
-- <tt>/[[:ascii:]]/</tt>: Matches a character in the ASCII character set.
-- <tt>/[[:word:]]/</tt>: Matches a character in one of these Unicode character
-  categories (see below):
-
-  - +Mark+ (+M+).
-  - +Letter+ (+L+).
-  - +Number+ (+N+)
-  - <tt>Connector Punctuation</tt> (+Pc+).
-
-=== Comments
-
-A comment may be included in a regexp pattern
-using the <tt>(?#</tt>_comment_<tt>)</tt> construct,
-where _comment_ is a substring that is to be ignored.
-arbitrary text ignored by the regexp engine:
-
-  /foo(?#Ignore me)bar/.match('foobar') # => #<MatchData "foobar">
-
-The comment may not include an unescaped terminator character.
-
-See also {Extended Mode}[rdoc-ref:regexp.rdoc@Extended+Mode].
-
-== Modes
-
-Each of these modifiers sets a mode for the regexp:
-
-- +i+: <tt>/_pattern_/i</tt> sets
-  {Case-Insensitive Mode}[rdoc-ref:regexp.rdoc@Case-Insensitive+Mode].
-- +m+: <tt>/_pattern_/m</tt> sets
-  {Multiline Mode}[rdoc-ref:regexp.rdoc@Multiline+Mode].
-- +x+: <tt>/_pattern_/x</tt> sets
-  {Extended Mode}[rdoc-ref:regexp.rdoc@Extended+Mode].
-- +o+: <tt>/_pattern_/o</tt> sets
-  {Interpolation Mode}[rdoc-ref:regexp.rdoc@Interpolation+Mode].
-
-Any, all, or none of these may be applied.
-
-Modifiers +i+, +m+, and +x+ may be applied to subexpressions:
-
-- <tt>(?_modifier_)</tt> turns the mode "on" for ensuing subexpressions
-- <tt>(?-_modifier_)</tt> turns the mode "off" for ensuing subexpressions
-- <tt>(?_modifier_:_subexp_)</tt> turns the mode "on" for _subexp_ within the group
-- <tt>(?-_modifier_:_subexp_)</tt> turns the mode "off" for _subexp_ within the group
-
-Example:
-
-  re = /(?i)te(?-i)st/
-  re.match('test') # => #<MatchData "test">
-  re.match('TEst') # => #<MatchData "TEst">
-  re.match('TEST') # => nil
-  re.match('teST') # => nil
-  
-  re = /t(?i:e)st/
-  re.match('test') # => #<MatchData "test">
-  re.match('tEst') # => #<MatchData "tEst">
-  re.match('tEST') # => nil
-
-\Method Regexp#options returns an integer whose value showing
-the settings for case-insensitivity mode, multiline mode, and extended mode.
-
-=== Case-Insensitive Mode
-
-By default, a regexp is case-sensitive:
-
-  /foo/.match('FOO')  # => nil
-
-Modifier +i+ enables case-insensitive mode:
-
-  /foo/i.match('FOO')
-  # => #<MatchData "FOO">
-
-\Method Regexp#casefold? returns whether the mode is case-insensitive.
-
-=== Multiline Mode
-
-The multiline-mode in Ruby is what is commonly called a "dot-all mode":
-
-- Without the +m+ modifier, the subexpression <tt>.</tt> does not match newlines:
-
-    /a.c/.match("a\nc")  # => nil
-
-- With the modifier, it does match:
-
-    /a.c/m.match("a\nc") # => #<MatchData "a\nc">
-
-Unlike other languages, the modifier +m+ does not affect the anchors <tt>^</tt> and <tt>$</tt>.
-These anchors always match at line-boundaries in Ruby.
-
-=== Extended Mode
-
-Modifier +x+ enables extended mode, which means that:
-
-- Literal white space in the pattern is to be ignored.
-- Character <tt>#</tt> marks the remainder of its containing line as a comment,
-  which is also to be ignored for matching purposes.
-
-In extended mode, whitespace and comments may be used
-to form a self-documented regexp.
-
-Regexp not in extended mode (matches some Roman numerals):
-
-  pattern = '^M{0,3}(CM|CD|D?C{0,3})(XC|XL|L?X{0,3})(IX|IV|V?I{0,3})$'
-  re = /#{pattern}/
-  re.match('MCMXLIII') # => #<MatchData "MCMXLIII" 1:"CM" 2:"XL" 3:"III">
-
-Regexp in extended mode:
-
-  pattern = <<-EOT
-    ^                   # beginning of string
-    M{0,3}              # thousands - 0 to 3 Ms
-    (CM|CD|D?C{0,3})    # hundreds - 900 (CM), 400 (CD), 0-300 (0 to 3 Cs),
-                        #            or 500-800 (D, followed by 0 to 3 Cs)
-    (XC|XL|L?X{0,3})    # tens - 90 (XC), 40 (XL), 0-30 (0 to 3 Xs),
-                        #        or 50-80 (L, followed by 0 to 3 Xs)
-    (IX|IV|V?I{0,3})    # ones - 9 (IX), 4 (IV), 0-3 (0 to 3 Is),
-                        #        or 5-8 (V, followed by 0 to 3 Is)
-    $                   # end of string
-  EOT
-  re = /#{pattern}/x
-  re.match('MCMXLIII') # => #<MatchData "MCMXLIII" 1:"CM" 2:"XL" 3:"III">
-
-=== Interpolation Mode
-
-Modifier +o+ means that the first time a literal regexp with interpolations
-is encountered,
-the generated Regexp object is saved and used for all future evaluations
-of that literal regexp.
-Without modifier +o+, the generated Regexp is not saved,
-so each evaluation of the literal regexp generates a new Regexp object.
-
-Without modifier +o+:
-
-  def letters; sleep 5; /[A-Z][a-z]/; end
-  words = %w[abc def xyz]
-  start = Time.now
-  words.each {|word| word.match(/\A[#{letters}]+\z/) }
-  Time.now - start # => 15.0174892
-
-With modifier +o+:
-
-  start = Time.now
-  words.each {|word| word.match(/\A[#{letters}]+\z/o) }
-  Time.now - start # => 5.0010866
-
-Note that if the literal regexp does not have interpolations,
-the +o+ behavior is the default.
-
-== Encodings
-
-By default, a regexp with only US-ASCII characters has US-ASCII encoding:
-
-  re = /foo/
-  re.source.encoding # => #<Encoding:US-ASCII>
-  re.encoding        # => #<Encoding:US-ASCII>
-
-A regular expression containing non-US-ASCII characters
-is assumed to use the source encoding.
-This can be overridden with one of the following modifiers.
-
-- <tt>/_pat_/n</tt>: US-ASCII if only containing US-ASCII characters,
-  otherwise ASCII-8BIT:
-
-    /foo/n.encoding     # => #<Encoding:US-ASCII>
-    /foo\xff/n.encoding # => #<Encoding:ASCII-8BIT>
-    /foo\x7f/n.encoding # => #<Encoding:US-ASCII>
-
-- <tt>/_pat_/u</tt>: UTF-8
-
-    /foo/u.encoding # => #<Encoding:UTF-8>
-
-- <tt>/_pat_/e</tt>: EUC-JP
-
-    /foo/e.encoding # => #<Encoding:EUC-JP>
-
-- <tt>/_pat_/s</tt>: Windows-31J
-
-    /foo/s.encoding # => #<Encoding:Windows-31J>
-
-A regexp can be matched against a target string when either:
-
-- They have the same encoding.
-- The regexp's encoding is a fixed encoding and the string
-  contains only ASCII characters.
-  Method Regexp#fixed_encoding? returns whether the regexp
-  has a <i>fixed</i> encoding.
-
-If a match between incompatible encodings is attempted an
-<tt>Encoding::CompatibilityError</tt> exception is raised.
-
-Example:
-
-  re = eval("# encoding: ISO-8859-1\n/foo\\xff?/")
-  re.encoding                 # => #<Encoding:ISO-8859-1>
-  re =~ "foo".encode("UTF-8") # => 0
-  re =~ "foo\u0100"           # Raises Encoding::CompatibilityError
-
-The encoding may be explicitly fixed by including Regexp::FIXEDENCODING
-in the second argument for Regexp.new:
-
-  # Regexp with encoding ISO-8859-1.
-  re = Regexp.new("a".force_encoding('iso-8859-1'), Regexp::FIXEDENCODING)
-  re.encoding  # => #<Encoding:ISO-8859-1>
-  # Target string with encoding UTF-8.
-  s = "a\u3042"
-  s.encoding   # => #<Encoding:UTF-8>
-  re.match(s)  # Raises Encoding::CompatibilityError.
-
-== Timeouts
-
-When either a regexp source or a target string comes from untrusted input,
-malicious values could become a denial-of-service attack;
-to prevent such an attack, it is wise to set a timeout.
-
-\Regexp has two timeout values:
-
-- A class default timeout, used for a regexp whose instance timeout is +nil+;
-  this default is initially +nil+, and may be set by method Regexp.timeout=:
-
-    Regexp.timeout # => nil
-    Regexp.timeout = 3.0
-    Regexp.timeout # => 3.0
-
-- An instance timeout, which defaults to +nil+ and may be set in Regexp.new:
-
-    re = Regexp.new('foo', timeout: 5.0)
-    re.timeout # => 5.0
-
-When regexp.timeout is +nil+, the timeout "falls through" to Regexp.timeout;
-when regexp.timeout is non-+nil+, that value controls timing out:
-
-  | regexp.timeout Value | Regexp.timeout Value |            Result           |
-  |----------------------|----------------------|-----------------------------|
-  |         nil          |          nil         |       Never times out.      |
-  |         nil          |         Float        | Times out in Float seconds. |
-  |        Float         |          Any         | Times out in Float seconds. |
-
-== References
-
-Read (online PDF books):
-
-- {Mastering Regular Expressions}[https://ia902508.us.archive.org/10/items/allitebooks-02/Mastering%20Regular%20Expressions%2C%203rd%20Edition.pdf]
-  by Jeffrey E.F. Friedl.
-- {Regular Expressions Cookbook}[https://doc.lagout.org/programmation/Regular%20Expressions/Regular%20Expressions%20Cookbook_%20Detailed%20Solutions%20in%20Eight%20Programming%20Languages%20%282nd%20ed.%29%20%5BGoyvaerts%20%26%20Levithan%202012-09-06%5D.pdf]
-  by Jan Goyvaerts & Steven Levithan.
-
-Explore, test (interactive online editor):
-
-- {Rubular}[https://rubular.com/].
diff --git a/doc/regexp/unicode_properties.rdoc b/doc/regexp/unicode_properties.rdoc
index a1d7ecc38041c7..f1f1f9d6a9d37a 100644
--- a/doc/regexp/unicode_properties.rdoc
+++ b/doc/regexp/unicode_properties.rdoc
@@ -79,9 +79,13 @@ Older versions may not support all of these.
 - <tt>\p{Hyphen}</tt>
 - <tt>\p{IDS_Binary_Operator}</tt>, <tt>\p{IDSB}</tt>
 - <tt>\p{IDS_Trinary_Operator}</tt>, <tt>\p{IDST}</tt>
+- <tt>\p{IDS_Unary_Operator}</tt>, <tt>\p{IDSU}</tt>
+- <tt>\p{ID_Compat_Math_Continue}</tt>
+- <tt>\p{ID_Compat_Math_Start}</tt>
 - <tt>\p{Ideographic}</tt>, <tt>\p{Ideo}</tt>
 - <tt>\p{Join_Control}</tt>, <tt>\p{Join_C}</tt>
 - <tt>\p{Logical_Order_Exception}</tt>, <tt>\p{LOE}</tt>
+- <tt>\p{Modifier_Combining_Mark}</tt>, <tt>\p{MCM}</tt>
 - <tt>\p{Noncharacter_Code_Point}</tt>, <tt>\p{NChar}</tt>
 - <tt>\p{Other_Alphabetic}</tt>, <tt>\p{OAlpha}</tt>
 - <tt>\p{Other_Default_Ignorable_Code_Point}</tt>, <tt>\p{ODI}</tt>
@@ -120,6 +124,9 @@ Older versions may not support all of these.
 - <tt>\p{Grapheme_Link}</tt>, <tt>\p{Gr_Link}</tt>
 - <tt>\p{ID_Continue}</tt>, <tt>\p{IDC}</tt>
 - <tt>\p{ID_Start}</tt>, <tt>\p{IDS}</tt>
+- <tt>\p{InCB_Consonant}</tt>
+- <tt>\p{InCB_Extend}</tt>
+- <tt>\p{InCB_Linker}</tt>
 - <tt>\p{Lowercase}</tt>, <tt>\p{Lower}</tt>
 - <tt>\p{Math}</tt>
 - <tt>\p{Uppercase}</tt>, <tt>\p{Upper}</tt>
@@ -167,6 +174,7 @@ Older versions may not support all of these.
 - <tt>\p{Elbasan}</tt>, <tt>\p{Elba}</tt>
 - <tt>\p{Elymaic}</tt>, <tt>\p{Elym}</tt>
 - <tt>\p{Ethiopic}</tt>, <tt>\p{Ethi}</tt>
+- <tt>\p{Garay}</tt>, <tt>\p{Gara}</tt>
 - <tt>\p{Georgian}</tt>, <tt>\p{Geor}</tt>
 - <tt>\p{Glagolitic}</tt>, <tt>\p{Glag}</tt>
 - <tt>\p{Gothic}</tt>, <tt>\p{Goth}</tt>
@@ -175,6 +183,7 @@ Older versions may not support all of these.
 - <tt>\p{Gujarati}</tt>, <tt>\p{Gujr}</tt>
 - <tt>\p{Gunjala_Gondi}</tt>, <tt>\p{Gong}</tt>
 - <tt>\p{Gurmukhi}</tt>, <tt>\p{Guru}</tt>
+- <tt>\p{Gurung_Khema}</tt>, <tt>\p{Gukh}</tt>
 - <tt>\p{Han}</tt>, <tt>\p{Hani}</tt>
 - <tt>\p{Hangul}</tt>, <tt>\p{Hang}</tt>
 - <tt>\p{Hanifi_Rohingya}</tt>, <tt>\p{Rohg}</tt>
@@ -197,6 +206,7 @@ Older versions may not support all of these.
 - <tt>\p{Khmer}</tt>, <tt>\p{Khmr}</tt>
 - <tt>\p{Khojki}</tt>, <tt>\p{Khoj}</tt>
 - <tt>\p{Khudawadi}</tt>, <tt>\p{Sind}</tt>
+- <tt>\p{Kirat_Rai}</tt>, <tt>\p{Krai}</tt>
 - <tt>\p{Lao}</tt>, <tt>\p{Laoo}</tt>
 - <tt>\p{Latin}</tt>, <tt>\p{Latn}</tt>
 - <tt>\p{Lepcha}</tt>, <tt>\p{Lepc}</tt>
@@ -234,6 +244,7 @@ Older versions may not support all of these.
 - <tt>\p{Nyiakeng_Puachue_Hmong}</tt>, <tt>\p{Hmnp}</tt>
 - <tt>\p{Ogham}</tt>, <tt>\p{Ogam}</tt>
 - <tt>\p{Ol_Chiki}</tt>, <tt>\p{Olck}</tt>
+- <tt>\p{Ol_Onal}</tt>, <tt>\p{Onao}</tt>
 - <tt>\p{Old_Hungarian}</tt>, <tt>\p{Hung}</tt>
 - <tt>\p{Old_Italic}</tt>, <tt>\p{Ital}</tt>
 - <tt>\p{Old_North_Arabian}</tt>, <tt>\p{Narb}</tt>
@@ -265,6 +276,7 @@ Older versions may not support all of these.
 - <tt>\p{Sora_Sompeng}</tt>, <tt>\p{Sora}</tt>
 - <tt>\p{Soyombo}</tt>, <tt>\p{Soyo}</tt>
 - <tt>\p{Sundanese}</tt>, <tt>\p{Sund}</tt>
+- <tt>\p{Sunuwar}</tt>, <tt>\p{Sunu}</tt>
 - <tt>\p{Syloti_Nagri}</tt>, <tt>\p{Sylo}</tt>
 - <tt>\p{Syriac}</tt>, <tt>\p{Syrc}</tt>
 - <tt>\p{Tagalog}</tt>, <tt>\p{Tglg}</tt>
@@ -282,7 +294,9 @@ Older versions may not support all of these.
 - <tt>\p{Tibetan}</tt>, <tt>\p{Tibt}</tt>
 - <tt>\p{Tifinagh}</tt>, <tt>\p{Tfng}</tt>
 - <tt>\p{Tirhuta}</tt>, <tt>\p{Tirh}</tt>
+- <tt>\p{Todhri}</tt>, <tt>\p{Todr}</tt>
 - <tt>\p{Toto}</tt>
+- <tt>\p{Tulu_Tigalari}</tt>, <tt>\p{Tutg}</tt>
 - <tt>\p{Ugaritic}</tt>, <tt>\p{Ugar}</tt>
 - <tt>\p{Unknown}</tt>, <tt>\p{Zzzz}</tt>
 - <tt>\p{Vai}</tt>, <tt>\p{Vaii}</tt>
@@ -348,6 +362,7 @@ Older versions may not support all of these.
 - <tt>\p{In_CJK_Unified_Ideographs_Extension_F}</tt>
 - <tt>\p{In_CJK_Unified_Ideographs_Extension_G}</tt>
 - <tt>\p{In_CJK_Unified_Ideographs_Extension_H}</tt>
+- <tt>\p{In_CJK_Unified_Ideographs_Extension_I}</tt>
 - <tt>\p{In_Carian}</tt>
 - <tt>\p{In_Caucasian_Albanian}</tt>
 - <tt>\p{In_Chakma}</tt>
@@ -389,6 +404,7 @@ Older versions may not support all of these.
 - <tt>\p{In_Early_Dynastic_Cuneiform}</tt>
 - <tt>\p{In_Egyptian_Hieroglyph_Format_Controls}</tt>
 - <tt>\p{In_Egyptian_Hieroglyphs}</tt>
+- <tt>\p{In_Egyptian_Hieroglyphs_Extended_A}</tt>
 - <tt>\p{In_Elbasan}</tt>
 - <tt>\p{In_Elymaic}</tt>
 - <tt>\p{In_Emoticons}</tt>
@@ -401,6 +417,7 @@ Older versions may not support all of these.
 - <tt>\p{In_Ethiopic_Extended_A}</tt>
 - <tt>\p{In_Ethiopic_Extended_B}</tt>
 - <tt>\p{In_Ethiopic_Supplement}</tt>
+- <tt>\p{In_Garay}</tt>
 - <tt>\p{In_General_Punctuation}</tt>
 - <tt>\p{In_Geometric_Shapes}</tt>
 - <tt>\p{In_Geometric_Shapes_Extended}</tt>
@@ -416,6 +433,7 @@ Older versions may not support all of these.
 - <tt>\p{In_Gujarati}</tt>
 - <tt>\p{In_Gunjala_Gondi}</tt>
 - <tt>\p{In_Gurmukhi}</tt>
+- <tt>\p{In_Gurung_Khema}</tt>
 - <tt>\p{In_Halfwidth_and_Fullwidth_Forms}</tt>
 - <tt>\p{In_Hangul_Compatibility_Jamo}</tt>
 - <tt>\p{In_Hangul_Jamo}</tt>
@@ -455,6 +473,7 @@ Older versions may not support all of these.
 - <tt>\p{In_Khmer_Symbols}</tt>
 - <tt>\p{In_Khojki}</tt>
 - <tt>\p{In_Khudawadi}</tt>
+- <tt>\p{In_Kirat_Rai}</tt>
 - <tt>\p{In_Lao}</tt>
 - <tt>\p{In_Latin_1_Supplement}</tt>
 - <tt>\p{In_Latin_Extended_A}</tt>
@@ -510,6 +529,7 @@ Older versions may not support all of these.
 - <tt>\p{In_Myanmar}</tt>
 - <tt>\p{In_Myanmar_Extended_A}</tt>
 - <tt>\p{In_Myanmar_Extended_B}</tt>
+- <tt>\p{In_Myanmar_Extended_C}</tt>
 - <tt>\p{In_NKo}</tt>
 - <tt>\p{In_Nabataean}</tt>
 - <tt>\p{In_Nag_Mundari}</tt>
@@ -522,6 +542,7 @@ Older versions may not support all of these.
 - <tt>\p{In_Nyiakeng_Puachue_Hmong}</tt>
 - <tt>\p{In_Ogham}</tt>
 - <tt>\p{In_Ol_Chiki}</tt>
+- <tt>\p{In_Ol_Onal}</tt>
 - <tt>\p{In_Old_Hungarian}</tt>
 - <tt>\p{In_Old_Italic}</tt>
 - <tt>\p{In_Old_North_Arabian}</tt>
@@ -568,6 +589,7 @@ Older versions may not support all of these.
 - <tt>\p{In_Specials}</tt>
 - <tt>\p{In_Sundanese}</tt>
 - <tt>\p{In_Sundanese_Supplement}</tt>
+- <tt>\p{In_Sunuwar}</tt>
 - <tt>\p{In_Superscripts_and_Subscripts}</tt>
 - <tt>\p{In_Supplemental_Arrows_A}</tt>
 - <tt>\p{In_Supplemental_Arrows_B}</tt>
@@ -581,6 +603,7 @@ Older versions may not support all of these.
 - <tt>\p{In_Syloti_Nagri}</tt>
 - <tt>\p{In_Symbols_and_Pictographs_Extended_A}</tt>
 - <tt>\p{In_Symbols_for_Legacy_Computing}</tt>
+- <tt>\p{In_Symbols_for_Legacy_Computing_Supplement}</tt>
 - <tt>\p{In_Syriac}</tt>
 - <tt>\p{In_Syriac_Supplement}</tt>
 - <tt>\p{In_Tagalog}</tt>
@@ -603,8 +626,10 @@ Older versions may not support all of these.
 - <tt>\p{In_Tibetan}</tt>
 - <tt>\p{In_Tifinagh}</tt>
 - <tt>\p{In_Tirhuta}</tt>
+- <tt>\p{In_Todhri}</tt>
 - <tt>\p{In_Toto}</tt>
 - <tt>\p{In_Transport_and_Map_Symbols}</tt>
+- <tt>\p{In_Tulu_Tigalari}</tt>
 - <tt>\p{In_Ugaritic}</tt>
 - <tt>\p{In_Unified_Canadian_Aboriginal_Syllabics}</tt>
 - <tt>\p{In_Unified_Canadian_Aboriginal_Syllabics_Extended}</tt>
@@ -658,6 +683,8 @@ Older versions may not support all of these.
 - <tt>\p{Age_13_0}</tt>
 - <tt>\p{Age_14_0}</tt>
 - <tt>\p{Age_15_0}</tt>
+- <tt>\p{Age_15_1}</tt>
+- <tt>\p{Age_16_0}</tt>
 - <tt>\p{Age_1_1}</tt>
 - <tt>\p{Age_2_0}</tt>
 - <tt>\p{Age_2_1}</tt>
diff --git a/doc/reline/face.md b/doc/reline/face.md
new file mode 100644
index 00000000000000..1fa916123b5363
--- /dev/null
+++ b/doc/reline/face.md
@@ -0,0 +1,111 @@
+# Face
+
+With the `Reline::Face` class, you can modify the text color and text decorations in your terminal emulator.
+This is primarily used to customize the appearance of the method completion dialog in IRB.
+
+## Usage
+
+### ex: Change the background color of the completion dialog cyan to blue
+
+```ruby
+Reline::Face.config(:completion_dialog) do |conf|
+  conf.define :default, foreground: :white, background: :blue
+  #                                                     ^^^^^ `:cyan` by default
+  conf.define :enhanced, foreground: :white, background: :magenta
+  conf.define :scrollbar, foreground: :white, background: :blue
+end
+```
+
+If you provide the above code to an IRB session in some way, you can apply the configuration.
+It's generally done by writing it in `.irbrc`.
+
+Regarding `.irbrc`, please refer to the following link: [https://docs.ruby-lang.org/en/master/IRB.html](https://docs.ruby-lang.org/en/master/IRB.html)
+
+## Available parameters
+
+`Reline::Face` internally creates SGR (Select Graphic Rendition) code according to the block parameter of `Reline::Face.config` method.
+
+| Key         | Value             | SGR Code (numeric part following "\e[")|
+|:------------|:------------------|-----:|
+| :foreground | :black            | 30   |
+|             | :red              | 31   |
+|             | :green            | 32   |
+|             | :yellow           | 33   |
+|             | :blue             | 34   |
+|             | :magenta          | 35   |
+|             | :cyan             | 36   |
+|             | :white            | 37   |
+|             | :bright_black     | 90   |
+|             | :gray             | 90   |
+|             | :bright_red       | 91   |
+|             | :bright_green     | 92   |
+|             | :bright_yellow    | 93   |
+|             | :bright_blue      | 94   |
+|             | :bright_magenta   | 95   |
+|             | :bright_cyan      | 96   |
+|             | :bright_white     | 97   |
+| :background | :black            | 40   |
+|             | :red              | 41   |
+|             | :green            | 42   |
+|             | :yellow           | 43   |
+|             | :blue             | 44   |
+|             | :magenta          | 45   |
+|             | :cyan             | 46   |
+|             | :white            | 47   |
+|             | :bright_black     | 100  |
+|             | :gray             | 100  |
+|             | :bright_red       | 101  |
+|             | :bright_green     | 102  |
+|             | :bright_yellow    | 103  |
+|             | :bright_blue      | 104  |
+|             | :bright_magenta   | 105  |
+|             | :bright_cyan      | 106  |
+|             | :bright_white     | 107  |
+| :style      | :reset            | 0    |
+|             | :bold             | 1    |
+|             | :faint            | 2    |
+|             | :italicized       | 3    |
+|             | :underlined       | 4    |
+|             | :slowly_blinking  | 5    |
+|             | :blinking         | 5    |
+|             | :rapidly_blinking | 6    |
+|             | :negative         | 7    |
+|             | :concealed        | 8    |
+|             | :crossed_out      | 9    |
+
+- The value for `:style` can be both a Symbol and an Array
+    ```ruby
+      # Single symbol
+      conf.define :default, style: :bold
+      # Array
+      conf.define :default, style: [:bold, :negative]
+    ```
+- The availability of specific SGR codes depends on your terminal emulator
+- You can specify a hex color code to `:foreground` and `:background` color like `foreground: "#FF1020"`. Its availability also depends on your terminal emulator
+
+## Debugging
+
+You can see the current Face configuration by `Reline::Face.configs` method
+
+Example:
+
+```ruby
+irb(main):001:0> Reline::Face.configs
+=>
+{:default=>
+  {:default=>{:style=>:reset, :escape_sequence=>"\e[0m"},
+   :enhanced=>{:style=>:reset, :escape_sequence=>"\e[0m"},
+   :scrollbar=>{:style=>:reset, :escape_sequence=>"\e[0m"}},
+ :completion_dialog=>
+  {:default=>{:foreground=>:white, :background=>:cyan, :escape_sequence=>"\e[0m\e[37;46m"},
+   :enhanced=>{:foreground=>:white, :background=>:magenta, :escape_sequence=>"\e[0m\e[37;45m"},
+   :scrollbar=>{:foreground=>:white, :background=>:cyan, :escape_sequence=>"\e[0m\e[37;46m"}}}
+```
+
+## 256-Color and TrueColor
+
+Reline will automatically detect if your terminal emulator supports truecolor with `ENV['COLORTERM] in 'truecolor' | '24bit'`. When this env is not set, Reline will fallback to 256-color.
+If your terminal emulator supports truecolor but does not set COLORTERM env, add this line to `.irbrc`.
+```ruby
+Reline::Face.force_truecolor
+```
diff --git a/doc/rjit/README.md b/doc/rjit/README.md
deleted file mode 100644
index e3795e35b868f3..00000000000000
--- a/doc/rjit/README.md
+++ /dev/null
@@ -1,53 +0,0 @@
-# RJIT: Ruby JIT
-
-This document has some tips that might be useful when you work on RJIT.
-
-## Project purpose
-
-This project is for experimental purposes.
-For production deployment, consider using YJIT instead.
-
-## Supported platforms
-
-The following platforms are assumed to work. `linux-x86_64` is tested on CI.
-
-* OS: Linux, macOS, BSD
-* Arch: x86\_64
-
-## configure
-### --enable-rjit
-
-On supported platforms, `--enable-rjit` is set by default. You usually don't need to specify this.
-You may still manually pass `--enable-rjit` to try RJIT on unsupported platforms.
-
-### --enable-rjit=dev
-
-It enables `--rjit-dump-disasm` if libcapstone is available.
-
-It also enables `vm_insns_count` and `ratio_in_rjit` in `--rjit-stats`.
-However, it makes the interpreter a little slower.
-
-### --enable-rjit=disasm
-
-It enables `--rjit-dump-disasm` if libcapstone is available.
-
-## make
-### rjit-bindgen
-
-If you see an "RJIT bindgen" GitHub Actions failure, please commit the `git diff` shown on the failed job.
-
-For doing the same thing locally, run `make rjit-bindgen` after installing libclang.
-macOS seems to have libclang by default. On Ubuntu, you can install it with `apt install libclang1`.
-
-## ruby
-### --rjit-stats
-
-This prints RJIT stats at exit. Some stats are available only with `--enable-rjit=dev` on configure.
-
-### --rjit-dump-disasm
-
-This dumps all JIT code. You need to install libcapstone before configure and use `--enable-rjit=dev`
-or `--enable-rjit=disasm` on configure.
-
-* Ubuntu: `sudo apt-get install -y libcapstone-dev`
-* macOS: `brew install capstone`
diff --git a/doc/ruby/option_dump.md b/doc/ruby/option_dump.md
new file mode 100644
index 00000000000000..a156484bf6866d
--- /dev/null
+++ b/doc/ruby/option_dump.md
@@ -0,0 +1,265 @@
+# Option `--dump`
+
+For other argument values,
+see {Option --dump}[options_md.html#label--dump-3A+Dump+Items].
+
+For the examples here, we use this program:
+
+```console
+$ cat t.rb
+puts 'Foo'
+```
+
+The supported dump items:
+
+- `insns`: Instruction sequences:
+
+    ```sh
+    $ ruby --dump=insns t.rb
+    == disasm: #<ISeq:<main>@t.rb:1 (1,0)-(1,10)> (catch: FALSE)
+    0000 putself                                                          (   1)[Li]
+    0001 putstring                              "Foo"
+    0003 opt_send_without_block                 <calldata!mid:puts, argc:1, FCALL|ARGS_SIMPLE>
+    0005 leave
+    ```
+
+- `parsetree`: {Abstract syntax tree}[https://en.wikipedia.org/wiki/Abstract_syntax_tree]
+  (AST):
+
+    ```console
+    $ ruby --dump=parsetree t.rb
+    ###########################################################
+    ## Do NOT use this node dump for any purpose other than  ##
+    ## debug and research.  Compatibility is not guaranteed. ##
+    ###########################################################
+
+    # @ NODE_SCOPE (line: 1, location: (1,0)-(1,10))
+    # +- nd_tbl: (empty)
+    # +- nd_args:
+    # |   (null node)
+    # +- nd_body:
+    #     @ NODE_FCALL (line: 1, location: (1,0)-(1,10))*
+    #     +- nd_mid: :puts
+    #     +- nd_args:
+    #         @ NODE_LIST (line: 1, location: (1,5)-(1,10))
+    #         +- nd_alen: 1
+    #         +- nd_head:
+    #         |   @ NODE_STR (line: 1, location: (1,5)-(1,10))
+    #         |   +- nd_lit: "Foo"
+    #         +- nd_next:
+    #             (null node)
+    ```
+
+- `yydebug`: Debugging information from yacc parser generator:
+
+    ```
+    $ ruby --dump=yydebug t.rb
+    Starting parse
+    Entering state 0
+    Reducing stack by rule 1 (line 1295):
+    lex_state: NONE -> BEG at line 1296
+    vtable_alloc:12392: 0x0000558453df1a00
+    vtable_alloc:12393: 0x0000558453df1a60
+    cmdarg_stack(push): 0 at line 12406
+    cond_stack(push): 0 at line 12407
+    -> $$ = nterm $@1 (1.0-1.0: )
+    Stack now 0
+    Entering state 2
+    Reading a token:
+    lex_state: BEG -> CMDARG at line 9049
+    Next token is token "local variable or method" (1.0-1.4: puts)
+    Shifting token "local variable or method" (1.0-1.4: puts)
+    Entering state 35
+    Reading a token: Next token is token "string literal" (1.5-1.6: )
+    Reducing stack by rule 742 (line 5567):
+    $1 = token "local variable or method" (1.0-1.4: puts)
+    -> $$ = nterm operation (1.0-1.4: )
+    Stack now 0 2
+    Entering state 126
+    Reducing stack by rule 78 (line 1794):
+    $1 = nterm operation (1.0-1.4: )
+    -> $$ = nterm fcall (1.0-1.4: )
+    Stack now 0 2
+    Entering state 80
+    Next token is token "string literal" (1.5-1.6: )
+    Reducing stack by rule 292 (line 2723):
+    cmdarg_stack(push): 1 at line 2737
+    -> $$ = nterm $@16 (1.4-1.4: )
+    Stack now 0 2 80
+    Entering state 235
+    Next token is token "string literal" (1.5-1.6: )
+    Shifting token "string literal" (1.5-1.6: )
+    Entering state 216
+    Reducing stack by rule 607 (line 4706):
+    -> $$ = nterm string_contents (1.6-1.6: )
+    Stack now 0 2 80 235 216
+    Entering state 437
+    Reading a token: Next token is token "literal content" (1.6-1.9: "Foo")
+    Shifting token "literal content" (1.6-1.9: "Foo")
+    Entering state 503
+    Reducing stack by rule 613 (line 4802):
+    $1 = token "literal content" (1.6-1.9: "Foo")
+    -> $$ = nterm string_content (1.6-1.9: )
+    Stack now 0 2 80 235 216 437
+    Entering state 507
+    Reducing stack by rule 608 (line 4716):
+    $1 = nterm string_contents (1.6-1.6: )
+    $2 = nterm string_content (1.6-1.9: )
+    -> $$ = nterm string_contents (1.6-1.9: )
+    Stack now 0 2 80 235 216
+    Entering state 437
+    Reading a token:
+    lex_state: CMDARG -> END at line 7276
+    Next token is token "terminator" (1.9-1.10: )
+    Shifting token "terminator" (1.9-1.10: )
+    Entering state 508
+    Reducing stack by rule 590 (line 4569):
+    $1 = token "string literal" (1.5-1.6: )
+    $2 = nterm string_contents (1.6-1.9: )
+    $3 = token "terminator" (1.9-1.10: )
+    -> $$ = nterm string1 (1.5-1.10: )
+    Stack now 0 2 80 235
+    Entering state 109
+    Reducing stack by rule 588 (line 4559):
+    $1 = nterm string1 (1.5-1.10: )
+    -> $$ = nterm string (1.5-1.10: )
+    Stack now 0 2 80 235
+    Entering state 108
+    Reading a token:
+    lex_state: END -> BEG at line 9200
+    Next token is token '\n' (1.10-1.10: )
+    Reducing stack by rule 586 (line 4541):
+    $1 = nterm string (1.5-1.10: )
+    -> $$ = nterm strings (1.5-1.10: )
+    Stack now 0 2 80 235
+    Entering state 107
+    Reducing stack by rule 307 (line 2837):
+    $1 = nterm strings (1.5-1.10: )
+    -> $$ = nterm primary (1.5-1.10: )
+    Stack now 0 2 80 235
+    Entering state 90
+    Next token is token '\n' (1.10-1.10: )
+    Reducing stack by rule 261 (line 2553):
+    $1 = nterm primary (1.5-1.10: )
+    -> $$ = nterm arg (1.5-1.10: )
+    Stack now 0 2 80 235
+    Entering state 220
+    Next token is token '\n' (1.10-1.10: )
+    Reducing stack by rule 270 (line 2586):
+    $1 = nterm arg (1.5-1.10: )
+    -> $$ = nterm arg_value (1.5-1.10: )
+    Stack now 0 2 80 235
+    Entering state 221
+    Next token is token '\n' (1.10-1.10: )
+    Reducing stack by rule 297 (line 2779):
+    $1 = nterm arg_value (1.5-1.10: )
+    -> $$ = nterm args (1.5-1.10: )
+    Stack now 0 2 80 235
+    Entering state 224
+    Next token is token '\n' (1.10-1.10: )
+    Reducing stack by rule 772 (line 5626):
+    -> $$ = nterm none (1.10-1.10: )
+    Stack now 0 2 80 235 224
+    Entering state 442
+    Reducing stack by rule 296 (line 2773):
+    $1 = nterm none (1.10-1.10: )
+
+    -> $$ = nterm opt_block_arg (1.10-1.10: )
+    Stack now 0 2 80 235 224
+    Entering state 441
+    Reducing stack by rule 288 (line 2696):
+    $1 = nterm args (1.5-1.10: )
+    $2 = nterm opt_block_arg (1.10-1.10: )
+    -> $$ = nterm call_args (1.5-1.10: )
+    Stack now 0 2 80 235
+    Entering state 453
+    Reducing stack by rule 293 (line 2723):
+    $1 = nterm $@16 (1.4-1.4: )
+    $2 = nterm call_args (1.5-1.10: )
+    cmdarg_stack(pop): 0 at line 2754
+    -> $$ = nterm command_args (1.4-1.10: )
+    Stack now 0 2 80
+    Entering state 333
+    Next token is token '\n' (1.10-1.10: )
+    Reducing stack by rule 79 (line 1804):
+    $1 = nterm fcall (1.0-1.4: )
+    $2 = nterm command_args (1.4-1.10: )
+    -> $$ = nterm command (1.0-1.10: )
+    Stack now 0 2
+    Entering state 81
+    Next token is token '\n' (1.10-1.10: )
+    Reducing stack by rule 73 (line 1770):
+    $1 = nterm command (1.0-1.10: )
+    -> $$ = nterm command_call (1.0-1.10: )
+    Stack now 0 2
+    Entering state 78
+    Reducing stack by rule 51 (line 1659):
+    $1 = nterm command_call (1.0-1.10: )
+    -> $$ = nterm expr (1.0-1.10: )
+    Stack now 0 2
+    Entering state 75
+    Next token is token '\n' (1.10-1.10: )
+    Reducing stack by rule 39 (line 1578):
+    $1 = nterm expr (1.0-1.10: )
+    -> $$ = nterm stmt (1.0-1.10: )
+    Stack now 0 2
+    Entering state 73
+    Next token is token '\n' (1.10-1.10: )
+    Reducing stack by rule 8 (line 1354):
+    $1 = nterm stmt (1.0-1.10: )
+    -> $$ = nterm top_stmt (1.0-1.10: )
+    Stack now 0 2
+    Entering state 72
+    Reducing stack by rule 5 (line 1334):
+    $1 = nterm top_stmt (1.0-1.10: )
+    -> $$ = nterm top_stmts (1.0-1.10: )
+    Stack now 0 2
+    Entering state 71
+    Next token is token '\n' (1.10-1.10: )
+    Shifting token '\n' (1.10-1.10: )
+    Entering state 311
+    Reducing stack by rule 769 (line 5618):
+    $1 = token '\n' (1.10-1.10: )
+    -> $$ = nterm term (1.10-1.10: )
+    Stack now 0 2 71
+    Entering state 313
+    Reducing stack by rule 770 (line 5621):
+    $1 = nterm term (1.10-1.10: )
+    -> $$ = nterm terms (1.10-1.10: )
+    Stack now 0 2 71
+    Entering state 314
+    Reading a token: Now at end of input.
+    Reducing stack by rule 759 (line 5596):
+    $1 = nterm terms (1.10-1.10: )
+    -> $$ = nterm opt_terms (1.10-1.10: )
+    Stack now 0 2 71
+    Entering state 312
+    Reducing stack by rule 3 (line 1321):
+    $1 = nterm top_stmts (1.0-1.10: )
+    $2 = nterm opt_terms (1.10-1.10: )
+    -> $$ = nterm top_compstmt (1.0-1.10: )
+    Stack now 0 2
+    Entering state 70
+    Reducing stack by rule 2 (line 1295):
+    $1 = nterm $@1 (1.0-1.0: )
+    $2 = nterm top_compstmt (1.0-1.10: )
+    vtable_free:12426: p->lvtbl->args(0x0000558453df1a00)
+    vtable_free:12427: p->lvtbl->vars(0x0000558453df1a60)
+    cmdarg_stack(pop): 0 at line 12428
+    cond_stack(pop): 0 at line 12429
+    -> $$ = nterm program (1.0-1.10: )
+    Stack now 0
+    Entering state 1
+    Now at end of input.
+    Shifting token "end-of-input" (1.10-1.10: )
+    Entering state 3
+    Stack now 0 1 3
+    Cleanup: popping token "end-of-input" (1.10-1.10: )
+    Cleanup: popping nterm program (1.0-1.10: )
+    ```
+
+Additional flags can follow dump items.
+
+- `+comment`: Add comments to AST.
+- `+error-tolerant`: Parse in error-tolerant mode.
+- `-optimize`: Disable optimizations for instruction sequences.
diff --git a/doc/ruby/options.md b/doc/ruby/options.md
new file mode 100644
index 00000000000000..bfbd2530de397e
--- /dev/null
+++ b/doc/ruby/options.md
@@ -0,0 +1,724 @@
+# Ruby Command-Line Options
+
+## About the Examples
+
+Some examples here use command-line option `-e`,
+which passes the Ruby code to be executed on the command line itself:
+
+```console
+$ ruby -e 'puts "Hello, World."'
+```
+
+Some examples here assume that file `desiderata.txt` exists:
+
+```console
+$ cat desiderata.txt
+Go placidly amid the noise and the haste,
+and remember what peace there may be in silence.
+As far as possible, without surrender,
+be on good terms with all persons.
+```
+
+## Options
+
+### `-0`: Set `$/` (Input Record Separator)
+
+Option `-0` defines the input record separator `$/`
+for the invoked Ruby program.
+
+The optional argument to the option must be octal digits,
+each in the range `0..7`;
+these digits are prefixed with digit `0` to form an octal value.
+
+If no argument is given, the input record separator is `0x00`.
+
+If an argument is given, it must immediately follow the option
+(no intervening whitespace or equal-sign character `'='`);
+argument values:
+
+- `0`: the input record separator is `''`;
+  see {Special Line Separator Values}[rdoc-ref:IO@Special+Line+Separator+Values].
+- In range `(1..0377)`:
+  the input record separator `$/` is set to the character value of the argument.
+- Any other octal value: the input record separator is `nil`.
+
+Examples:
+
+```console
+$ ruby -0 -e 'p $/'
+"\x00"
+ruby -00 -e 'p $/'
+""
+$ ruby -012 -e 'p $/'
+"\n"
+$ ruby -015 -e 'p $/'
+"\r"
+$ ruby -0377 -e 'p $/'
+"\xFF"
+$ ruby -0400 -e 'p $/'
+nil
+```
+
+See also:
+
+- {Option -a}[rdoc-ref:ruby/options.md@a-3A+Split+Input+Lines+into+Fields]:
+  Split input lines into fields.
+- {Option -F}[rdoc-ref:ruby/options.md@F-3A+Set+Input+Field+Separator]:
+  Set input field separator.
+- {Option -l}[rdoc-ref:ruby/options.md@l-3A+Set+Output+Record+Separator-3B+Chop+Lines]:
+  Set output record separator; chop lines.
+- {Option -n}[rdoc-ref:ruby/options.md@n-3A+Run+Program+in+gets+Loop]:
+  Run program in `gets` loop.
+- {Option -p}[rdoc-ref:ruby/options.md@p-3A+-n-2C+with+Printing]:
+  `-n`, with printing.
+
+### `-a`: Split Input Lines into Fields
+
+Option `-a`, when given with either of options `-n` or `-p`,
+splits the string at `$_` into an array of strings at `$F`:
+
+```console
+$ ruby -an -e 'p $F' desiderata.txt
+["Go", "placidly", "amid", "the", "noise", "and", "the", "haste,"]
+["and", "remember", "what", "peace", "there", "may", "be", "in", "silence."]
+["As", "far", "as", "possible,", "without", "surrender,"]
+["be", "on", "good", "terms", "with", "all", "persons."]
+```
+
+For the splitting,
+the default record separator is `$/`,
+and the default field separator  is `$;`.
+
+See also:
+
+- {Option -0}[rdoc-ref:ruby/options.md@0-3A+Set+-24-2F+-28Input+Record+Separator-29]:
+  Set `$/` (input record separator).
+- {Option -F}[rdoc-ref:ruby/options.md@F-3A+Set+Input+Field+Separator]:
+  Set input field separator.
+- {Option -l}[rdoc-ref:ruby/options.md@l-3A+Set+Output+Record+Separator-3B+Chop+Lines]:
+  Set output record separator; chop lines.
+- {Option -n}[rdoc-ref:ruby/options.md@n-3A+Run+Program+in+gets+Loop]:
+  Run program in `gets` loop.
+- {Option -p}[rdoc-ref:ruby/options.md@p-3A+-n-2C+with+Printing]:
+  `-n`, with printing.
+
+### `-c`: Check Syntax
+
+Option `-c` specifies that the specified Ruby program
+should be checked for syntax, but not actually executed:
+
+```console
+$ ruby -e 'puts "Foo"'
+Foo
+$ ruby -c -e 'puts "Foo"'
+Syntax OK
+```
+
+### `-C`: Set Working Directory
+
+The argument to option `-C` specifies a working directory
+for the invoked Ruby program;
+does not change the working directory for the current process:
+
+```console
+$ basename `pwd`
+ruby
+$ ruby -C lib -e 'puts File.basename(Dir.pwd)'
+lib
+$ basename `pwd`
+ruby
+```
+
+Whitespace between the option and its argument may be omitted.
+
+### `-d`: Set `$DEBUG` to `true`
+
+Some code in (or called by) the Ruby program may include statements or blocks
+conditioned by the global variable `$DEBUG` (e.g., `if $DEBUG`);
+these commonly write to `$stdout` or `$stderr`.
+
+The default value for `$DEBUG` is `false`;
+option `-d` sets it to `true`:
+
+```console
+$ ruby -e 'p $DEBUG'
+false
+$ ruby -d -e 'p $DEBUG'
+true
+```
+
+Option `--debug` is an alias for option `-d`.
+
+### `-e`: Execute Given Ruby Code
+
+Option `-e` requires an argument, which is Ruby code to be executed;
+the option may be given more than once:
+
+```console
+$ ruby -e 'puts "Foo"' -e 'puts "Bar"'
+Foo
+Bar
+```
+
+Whitespace between the option and its argument may be omitted.
+
+The command may include other options,
+but should not include arguments (which, if given, are ignored).
+
+### `-E`: Set Default Encodings
+
+Option `-E` requires an argument, which specifies either the default external encoding,
+or both the default external and internal encodings for the invoked Ruby program:
+
+```console
+# No option -E.
+$ ruby -e 'p [Encoding::default_external, Encoding::default_internal]'
+[#<Encoding:UTF-8>, nil]
+# Option -E with default external encoding.
+$ ruby -E cesu-8 -e 'p [Encoding::default_external, Encoding::default_internal]'
+[#<Encoding:CESU-8>, nil]
+# Option -E with default external and internal encodings.
+$ ruby -E utf-8:cesu-8 -e 'p [Encoding::default_external, Encoding::default_internal]'
+[#<Encoding:UTF-8>, #<Encoding:CESU-8>]
+```
+
+Whitespace between the option and its argument may be omitted.
+
+See also:
+
+- {Option --external-encoding}[options_md.html#label--external-encoding-3A+Set+Default+External+Encoding]:
+  Set default external encoding.
+- {Option --internal-encoding}[options_md.html#label--internal-encoding-3A+Set+Default+Internal+Encoding]:
+  Set default internal encoding.
+
+Option `--encoding` is an alias for option `-E`.
+
+### `-F`: Set Input Field Separator
+
+Option `-F`, when given with option `-a`,
+specifies that its argument is to be the input field separator to be used for splitting:
+
+```console
+$ ruby -an -Fs -e 'p $F' desiderata.txt
+["Go placidly amid the noi", "e and the ha", "te,\n"]
+["and remember what peace there may be in ", "ilence.\n"]
+["A", " far a", " po", "", "ible, without ", "urrender,\n"]
+["be on good term", " with all per", "on", ".\n"]
+```
+
+The argument may be a regular expression:
+
+```console
+$ ruby -an -F'[.,]\s*' -e 'p $F' desiderata.txt
+["Go placidly amid the noise and the haste"]
+["and remember what peace there may be in silence"]
+["As far as possible", "without surrender"]
+["be on good terms with all persons"]
+```
+
+The argument must immediately follow the option
+(no intervening whitespace or equal-sign character `'='`).
+
+See also:
+
+- {Option -0}[rdoc-ref:ruby/options.md@0-3A+Set+-24-2F+-28Input+Record+Separator-29]:
+  Set `$/` (input record separator).
+- {Option -a}[rdoc-ref:ruby/options.md@a-3A+Split+Input+Lines+into+Fields]:
+  Split input lines into fields.
+- {Option -l}[rdoc-ref:ruby/options.md@l-3A+Set+Output+Record+Separator-3B+Chop+Lines]:
+  Set output record separator; chop lines.
+- {Option -n}[rdoc-ref:ruby/options.md@n-3A+Run+Program+in+gets+Loop]:
+  Run program in `gets` loop.
+- {Option -p}[rdoc-ref:ruby/options.md@p-3A+-n-2C+with+Printing]:
+  `-n`, with printing.
+
+### `-h`: Print Short Help Message
+
+Option `-h` prints a short help message
+that includes single-hyphen options (e.g. `-I`),
+and largely omits double-hyphen options (e.g., `--version`).
+
+Arguments and additional options are ignored.
+
+For a longer help message, use option `--help`.
+
+### `-i`: Set \ARGF In-Place Mode
+
+Option `-i` sets the \ARGF in-place mode for the invoked Ruby program;
+see ARGF#inplace_mode=:
+
+```console
+$ ruby -e 'p ARGF.inplace_mode'
+nil
+$ ruby -i -e 'p ARGF.inplace_mode'
+""
+$ ruby -i.bak -e 'p ARGF.inplace_mode'
+".bak"
+```
+
+### `-I`: Add to `$LOAD_PATH`
+
+The argument to option `-I` specifies a directory
+to be added to the array in global variable `$LOAD_PATH`;
+the option may be given more than once:
+
+```console
+$ pushd /tmp
+$ ruby -e 'p $LOAD_PATH.size'
+8
+$ ruby -I my_lib -I some_lib -e 'p $LOAD_PATH.size'
+10
+$ ruby -I my_lib -I some_lib -e 'p $LOAD_PATH.take(2)'
+["/tmp/my_lib", "/tmp/some_lib"]
+$ popd
+```
+
+Whitespace between the option and its argument may be omitted.
+
+### `-l`: Set Output Record Separator; Chop Lines
+
+Option `-l`, when given with option `-n` or `-p`,
+modifies line-ending processing by:
+
+- Setting global variable output record separator `$\`
+  to the current value of input record separator `$/`;
+  this affects line-oriented output (such a the output from Kernel#puts).
+- Calling String#chop! on each line read.
+
+Without option `-l` (unchopped):
+
+```console
+$ ruby -n -e 'p $_' desiderata.txt
+"Go placidly amid the noise and the haste,\n"
+"and remember what peace there may be in silence.\n"
+"As far as possible, without surrender,\n"
+"be on good terms with all persons.\n"
+```
+
+With option `-l' (chopped):
+
+```console
+$ ruby -ln -e 'p $_' desiderata.txt
+"Go placidly amid the noise and the haste,"
+"and remember what peace there may be in silence."
+"As far as possible, without surrender,"
+"be on good terms with all persons."
+```
+
+See also:
+
+- {Option -0}[rdoc-ref:ruby/options.md@0-3A+Set+-24-2F+-28Input+Record+Separator-29]:
+  Set `$/` (input record separator).
+- {Option -a}[rdoc-ref:ruby/options.md@a-3A+Split+Input+Lines+into+Fields]:
+  Split input lines into fields.
+- {Option -F}[rdoc-ref:ruby/options.md@F-3A+Set+Input+Field+Separator]:
+  Set input field separator.
+- {Option -n}[rdoc-ref:ruby/options.md@n-3A+Run+Program+in+gets+Loop]:
+  Run program in `gets` loop.
+- {Option -p}[rdoc-ref:ruby/options.md@p-3A+-n-2C+with+Printing]:
+  `-n`, with printing.
+
+### `-n`: Run Program in `gets` Loop
+
+Option `-n` runs your program in a `Kernel#gets` loop:
+
+```ruby
+while gets
+  # Your Ruby code.
+end
+```
+
+Note that `gets` reads the next line and sets global variable `$_`
+to the last read line:
+
+```console
+$ ruby -n -e 'puts $_' desiderata.txt
+Go placidly amid the noise and the haste,
+and remember what peace there may be in silence.
+As far as possible, without surrender,
+be on good terms with all persons.
+```
+
+See also:
+
+- {Option -0}[rdoc-ref:ruby/options.md@0-3A+Set+-24-2F+-28Input+Record+Separator-29]:
+  Set `$/` (input record separator).
+- {Option -a}[rdoc-ref:ruby/options.md@a-3A+Split+Input+Lines+into+Fields]:
+  Split input lines into fields.
+- {Option -F}[rdoc-ref:ruby/options.md@F-3A+Set+Input+Field+Separator]:
+  Set input field separator.
+- {Option -l}[rdoc-ref:ruby/options.md@l-3A+Set+Output+Record+Separator-3B+Chop+Lines]:
+  Set output record separator; chop lines.
+- {Option -p}[rdoc-ref:ruby/options.md@p-3A+-n-2C+with+Printing]:
+  `-n`, with printing.
+
+### `-p`: `-n`, with Printing
+
+Option `-p` is like option `-n`, but also prints each line:
+
+```console
+$ ruby -p -e 'puts $_.size' desiderata.txt
+42
+Go placidly amid the noise and the haste,
+49
+and remember what peace there may be in silence.
+39
+As far as possible, without surrender,
+35
+be on good terms with all persons.
+```
+
+See also:
+
+- {Option -0}[rdoc-ref:ruby/options.md@0-3A+Set+-24-2F+-28Input+Record+Separator-29]:
+  Set `$/` (input record separator).
+- {Option -a}[rdoc-ref:ruby/options.md@a-3A+Split+Input+Lines+into+Fields]:
+  Split input lines into fields.
+- {Option -F}[rdoc-ref:ruby/options.md@F-3A+Set+Input+Field+Separator]:
+  Set input field separator.
+- {Option -l}[rdoc-ref:ruby/options.md@l-3A+Set+Output+Record+Separator-3B+Chop+Lines]:
+  Set output record separator; chop lines.
+- {Option -n}[rdoc-ref:ruby/options.md@n-3A+Run+Program+in+gets+Loop]:
+  Run program in `gets` loop.
+
+### `-r`: Require Library
+
+The argument to option `-r` specifies a library to be required
+before executing the Ruby program;
+the option may be given more than once:
+
+```console
+$ ruby -e 'p defined?(JSON); p defined?(CSV)'
+nil
+nil
+$ ruby -r CSV -r JSON -e 'p defined?(JSON); p defined?(CSV)'
+"constant"
+"constant"
+```
+
+Whitespace between the option and its argument may be omitted.
+
+### `-s`: Define Global Variable
+
+Option `-s` specifies that a "custom option" is to define a global variable
+in the invoked Ruby program:
+
+- The custom option must appear _after_ the program name.
+- The custom option must begin with single hyphen (e.g., `-foo`),
+  not two hyphens (e.g., `--foo`).
+- The name of the global variable is based on the option name:
+  global variable `$foo` for custom option`-foo`.
+- The value of the global variable is the string option argument if given,
+  `true` otherwise.
+
+More than one custom option may be given:
+
+```console
+$ cat t.rb
+p [$foo, $bar]
+$ ruby t.rb
+[nil, nil]
+$ ruby -s t.rb -foo=baz
+["baz", nil]
+$ ruby -s t.rb -foo
+[true, nil]
+$ ruby -s t.rb -foo=baz -bar=bat
+["baz", "bat"]
+```
+
+The option may not be used with
+{option -e}[rdoc-ref:ruby/options.md@e-3A+Execute+Given+Ruby+Code]
+
+### `-S`: Search Directories in `ENV['PATH']`
+
+Option `-S` specifies that the Ruby interpreter
+is to search (if necessary) the directories whose paths are in the program's
+`PATH` environment variable;
+the program is executed in the shell's current working directory
+(not necessarily in the directory where the program is found).
+
+This example uses adds path `'tmp/'` to the `PATH` environment variable:
+
+```console
+$ export PATH=/tmp:$PATH
+$ echo "puts File.basename(Dir.pwd)" > /tmp/t.rb
+$ ruby -S t.rb
+ruby
+```
+
+### `-v`: Print Version; Set `$VERBOSE`
+
+Options `-v` prints the Ruby version and sets global variable `$VERBOSE`:
+
+```console
+$ ruby -e 'p $VERBOSE'
+false
+$ ruby -v -e 'p $VERBOSE'
+ruby 3.3.0 (2023-12-25 revision 5124f9ac75) [x64-mingw-ucrt]
+true
+```
+
+### `-w`: Synonym for `-W1`
+
+Option `-w` (lowercase letter) is equivalent to option `-W1` (uppercase letter).
+
+### `-W`: Set \Warning Policy
+
+Any Ruby code can create a <i>warning message</i> by calling method Kernel#warn;
+methods in the Ruby core and standard libraries can also create warning messages.
+Such a message may be printed on `$stderr`
+(or not, depending on certain settings).
+
+Option `-W` helps determine whether a particular warning message
+will be written,
+by setting the initial value of global variable `$-W`:
+
+- `-W0`: Sets `$-W` to `0` (silent; no warnings).
+- `-W1`: Sets `$-W` to `1` (moderate verbosity).
+- `-W2`: Sets `$-W` to `2` (high verbosity).
+- `-W`: Same as `-W2` (high verbosity).
+- Option not given: Same as `-W1` (moderate verbosity).
+
+The value of `$-W`, in turn, determines which warning messages (if any)
+are to be printed to `$stdout` (see Kernel#warn):
+
+```console
+$ ruby -W1 -e 'p $foo'
+nil
+$ ruby -W2 -e 'p $foo'
+-e:1: warning: global variable '$foo' not initialized
+nil
+```
+
+Ruby code may also define warnings for certain categories;
+these are the default settings for the defined categories:
+
+```rb
+Warning[:experimental] # => true
+Warning[:deprecated]   # => false
+Warning[:performance]  # => false
+```
+
+They may also be set:
+
+```rb
+Warning[:experimental] = false
+Warning[:deprecated]   = true
+Warning[:performance]  = true
+```
+
+You can suppress a category by prefixing `no-` to the category name:
+
+```console
+$ ruby -W:no-experimental -e 'p IO::Buffer.new'
+#<IO::Buffer>
+```
+
+### `-x`: Execute Ruby Code Found in Text
+
+Option `-x` executes a Ruby program whose code is embedded
+in other, non-code, text:
+
+The ruby code:
+
+- Begins after the first line beginning with `'#!` and containing string `'ruby'`.
+- Ends before any one of:
+
+    - End-of-file.
+    - A line consisting of `'__END__'`,
+    - Character `Ctrl-D` or `Ctrl-Z`.
+
+Example:
+
+```console
+$ cat t.txt
+Leading garbage.
+#!ruby
+puts File.basename(Dir.pwd)
+__END__
+Trailing garbage.
+
+$ ruby -x t.txt
+ruby
+```
+
+The optional argument specifies the directory where the text file
+is to be found;
+the Ruby code is executed in that directory:
+
+```console
+$ cp t.txt /tmp/
+$ ruby -x/tmp t.txt
+tmp
+$
+
+```
+
+If an argument is given, it must immediately follow the option
+(no intervening whitespace or equal-sign character `'='`).
+
+### `--backtrace-limit`: Set Backtrace Limit
+
+Option `--backtrace-limit` sets a limit on the number of entries
+to be displayed in a backtrace.
+
+See Thread::Backtrace.limit.
+
+### `--copyright`: Print Ruby Copyright
+
+Option `--copyright` prints a copyright message:
+
+```console
+$ ruby --copyright
+ruby - Copyright (C) 1993-2024 Yukihiro Matsumoto
+```
+
+### `--debug`: Alias for `-d`
+
+Option `--debug` is an alias for
+{option -d}[rdoc-ref:ruby/options.md@d-3A+Set+-24DEBUG+to+true].
+
+### `--disable`: Disable Features
+
+Option `--disable` specifies features to be disabled;
+the argument is a comma-separated list of the features to be disabled:
+
+```sh
+ruby --disable=gems,rubyopt t.rb
+```
+
+The supported features:
+
+- `gems`: Rubygems (default: enabled).
+- `did_you_mean`: [`did_you_mean`](https://github.com/ruby/did_you_mean) (default: enabled).
+- `rubyopt`: `RUBYOPT` environment variable (default: enabled).
+- `frozen-string-literal`: Freeze all string literals (default: disabled).
+- `jit`: JIT compiler (default: disabled).
+
+See also {option --enable}[options_md.html#label--enable-3A+Enable+Features].
+
+### `--dump`: Dump Items
+
+Option `--dump` specifies items to be dumped;
+the argument is a comma-separated list of the items.
+
+Some of the argument values cause the command to behave as if a different
+option was given:
+
+- `--dump=copyright`:
+  Same as {option \-\-copyright}[options_md.html#label--copyright-3A+Print+Ruby+Copyright].
+- `--dump=help`:
+  Same as {option \-\-help}[options_md.html#label--help-3A+Print+Help+Message].
+- `--dump=syntax`:
+  Same as {option -c}[rdoc-ref:ruby/options.md@c-3A+Check+Syntax].
+- `--dump=usage`:
+  Same as {option -h}[rdoc-ref:ruby/options.md@h-3A+Print+Short+Help+Message].
+- `--dump=version`:
+  Same as {option \-\-version}[options_md.html#label--version-3A+Print+Ruby+Version].
+
+For other argument values and examples,
+see {Option --dump}[option_dump_md.html].
+
+### `--enable`: Enable Features
+
+Option `--enable` specifies features to be enabled;
+the argument is a comma-separated list of the features to be enabled.
+
+```sh
+ruby --enable=gems,rubyopt t.rb
+```
+
+For the features,
+see {option --disable}[options_md.html#label--disable-3A+Disable+Features].
+
+### `--encoding`: Alias for `-E`.
+
+Option `--encoding` is an alias for
+{option -E}[rdoc-ref:ruby/options.md@E-3A+Set+Default+Encodings].
+
+### `--external-encoding`: Set Default External \Encoding
+
+Option `--external-encoding`
+sets the default external encoding for the invoked Ruby program;
+for values of +encoding+,
+see {Encoding: Names and Aliases}[rdoc-ref:encodings.rdoc@Names+and+Aliases].
+
+```console
+$ ruby -e 'puts Encoding::default_external'
+UTF-8
+$ ruby --external-encoding=cesu-8 -e 'puts Encoding::default_external'
+CESU-8
+```
+
+### `--help`: Print Help Message
+
+Option `--help` prints a long help message.
+
+Arguments and additional options are ignored.
+
+For a shorter help message, use option `-h`.
+
+### `--internal-encoding`: Set Default Internal \Encoding
+
+Option `--internal-encoding`
+sets the default internal encoding for the invoked Ruby program;
+for values of +encoding+,
+see {Encoding: Names and Aliases}[rdoc-ref:encodings.rdoc@Names+and+Aliases].
+
+```console
+$ ruby -e 'puts Encoding::default_internal.nil?'
+true
+$ ruby --internal-encoding=cesu-8 -e 'puts Encoding::default_internal'
+CESU-8
+```
+
+### `--verbose`: Set `$VERBOSE`
+
+Option `--verbose` sets global variable `$VERBOSE` to `true`
+and disables input from `$stdin`.
+
+### `--version`: Print Ruby Version
+
+Option `--version` prints the version of the Ruby interpreter, then exits.
+
+## Experimental Options
+
+These options are experimental in the current Ruby release,
+and may be modified or withdrawn in later releases.
+
+### `--jit`
+
+Option `-jit` enables JIT compilation with the default option.
+
+#### `--jit-debug`
+
+Option `--jit-debug` enables JIT debugging (very slow);
+adds compiler flags if given.
+
+#### `--jit-max-cache=num`
+
+Option `--jit-max-cache=num` sets the maximum number of methods
+to be JIT-ed in a cache; default: 100).
+
+#### `--jit-min-calls=num`
+
+Option `jit-min-calls=num` sets the minimum number of calls to trigger JIT
+(for testing); default: 10000).
+
+#### `--jit-save-temps`
+
+Option `--jit-save-temps` saves JIT temporary files in $TMP or /tmp (for testing).
+
+#### `--jit-verbose`
+
+Option `--jit-verbose` prints JIT logs of level `num` or less
+to `$stderr`; default: 0.
+
+#### `--jit-wait`
+
+Option `--jit-wait` waits until JIT compilation finishes every time (for testing).
+
+#### `--jit-warnings`
+
+Option `--jit-warnings` enables printing of JIT warnings.
+
diff --git a/doc/security.rdoc b/doc/security.rdoc
index ae20ed30fa2349..af9970d336e5ff 100644
--- a/doc/security.rdoc
+++ b/doc/security.rdoc
@@ -37,7 +37,7 @@ programs for configuration and database persistence of Ruby object trees.
 
 Similar to +Marshal+, it is able to deserialize into arbitrary Ruby classes.
 For example, the following YAML data will create an +ERB+ object when
-deserialized:
+deserialized, using the +unsafe_load+ method:
 
   !ruby/object:ERB
   src: puts `uname`
@@ -53,19 +53,16 @@ method, variable and constant names. The reason for this is that symbols are
 simply integers with names attached to them, so they are faster to look up in
 hashtables.
 
-Starting in version 2.2, most symbols can be garbage collected; these are
-called <i>mortal</i> symbols. Most symbols you create (e.g. by calling
-+to_sym+) are mortal.
+Most symbols can be garbage collected; these are called _mortal_
+symbols. Most symbols you create (e.g. by calling +to_sym+) are mortal.
 
-<i>Immortal</i> symbols on the other hand will never be garbage collected.
+_Immortal_ symbols on the other hand will never be garbage collected.
 They are created when modifying code:
 * defining a method (e.g. with +define_method+),
 * setting an instance variable (e.g. with +instance_variable_set+),
 * creating a variable or constant (e.g. with +const_set+)
-C extensions that have not been updated and are still calling `SYM2ID`
+C extensions that have not been updated and are still calling +SYM2ID+
 will create immortal symbols.
-Bugs in 2.2.0: +send+ and +__send__+ also created immortal symbols,
-and calling methods with keyword arguments could also create some.
 
 Don't create immortal symbols from user inputs. Otherwise, this would
 allow a user to mount a denial of service attack against your application by
@@ -128,12 +125,3 @@ Note that the use of +public_send+ is also dangerous, as +send+ itself is
 public:
 
   1.public_send("send", "eval", "...ruby code to be executed...")
-
-== DRb
-
-As DRb allows remote clients to invoke arbitrary methods, it is not suitable to
-expose to untrusted clients.
-
-When using DRb, try to avoid exposing it over the network if possible. If this
-isn't possible and you need to expose DRb to the world, you *must* configure an
-appropriate security policy with <code>DRb::ACL</code>.
diff --git a/doc/standard_library.md b/doc/standard_library.md
new file mode 100644
index 00000000000000..0c48ac0cdd7e0a
--- /dev/null
+++ b/doc/standard_library.md
@@ -0,0 +1,225 @@
+# Ruby Standard Library
+
+The Ruby Standard Library is a large collection of classes and modules you can
+require in your code to gain additional features.
+
+Below is an overview of the libraries and extensions, followed by a brief description
+of each.
+
+## Libraries
+
+- `MakeMakefile`: A module used to generate a Makefile for C extensions
+- `RbConfig`: Information about your Ruby configuration and build
+- `Gem`: A package management framework for Ruby
+
+## Extensions
+
+- `Coverage`: Provides coverage measurement for Ruby
+- `Monitor`: Provides a reentrant mutex
+- `objspace`: Extends the ObjectSpace module to add methods for internal statistics
+- `PTY`: Creates and manages pseudo-terminals
+- `Ripper`: Provides an interface for parsing Ruby programs into S-expressions
+- `Socket`: Accesses underlying OS socket implementations
+
+# Default gems
+
+- Default gems are shipped with Ruby releases and also available as rubygems.
+- Default gems are not uninstallable from the Ruby installation.
+- Default gems can be updated using rubygems.
+    - e.g. `gem update json`
+- Default gems can be used with bundler environments like `unbundled_env`.
+- Default gems can be used at any version in a Gemfile.
+    - e.g. `gem "json", ">= 2.6"`
+
+## Libraries
+
+- Bundler ([GitHub][bundler]): Manage your Ruby application's gem dependencies
+- Delegator ([GitHub][delegate]): Provides three abilities to delegate method calls to an object
+- DidYouMean ([GitHub][did_you_mean]): "Did you mean?" experience in Ruby
+- English ([GitHub][English]): Provides references to special global variables with less cryptic names
+- ERB ([GitHub][erb]): An easy-to-use but powerful templating system for Ruby
+- ErrorHighlight ([GitHub][error_highlight]): Highlight error locations in your code
+- FileUtils ([GitHub][fileutils]): Several file utility methods for copying, moving, removing, etc.
+- Find ([GitHub][find]): This module supports top-down traversal of a set of file paths
+- Forwardable ([GitHub][forwardable]): Provides delegation of specified methods to a designated object
+- IPAddr ([GitHub][ipaddr]): Provides methods to manipulate IPv4 and IPv6 IP addresses
+- OptionParser ([GitHub][optparse]): Ruby-oriented class for command-line option analysis
+- Net::HTTP ([GitHub][net-http]): HTTP client API for Ruby
+- Open3 ([GitHub][open3]): Provides access to stdin, stdout, and stderr when running other programs
+- OpenURI ([GitHub][open-uri]): An easy-to-use wrapper for URI::HTTP, URI::HTTPS, and URI::FTP
+- PP ([GitHub][pp]): Provides a PrettyPrinter for Ruby objects
+- PrettyPrint ([GitHub][prettyprint]): Implements a pretty printing algorithm for readable structure
+- Prism ([GitHub][prism]): A portable, error-tolerant Ruby parser
+- Resolv ([GitHub][resolv]): Thread-aware DNS resolver library in Ruby
+- SecureRandom ([GitHub][securerandom]): Interface for a secure random number generator
+- Shellwords ([GitHub][shellwords]): Manipulates strings with the word parsing rules of the UNIX Bourne shell
+- Singleton ([GitHub][singleton]): Implementation of the Singleton pattern for Ruby
+- Tempfile ([GitHub][tempfile]): A utility class for managing temporary files
+- Time ([GitHub][time]): Extends the Time class with methods for parsing and conversion
+- Timeout ([GitHub][timeout]): Auto-terminate potentially long-running operations in Ruby
+- TmpDir ([GitHub][tmpdir]): Extends the Dir class to manage the OS temporary file path
+- TSort ([GitHub][tsort]): Topological sorting using Tarjan's algorithm
+- UN ([GitHub][un]): Utilities to replace common UNIX commands
+- URI ([GitHub][uri]): A Ruby module providing support for Uniform Resource Identifiers
+- YAML ([GitHub][yaml]): The Ruby client library for the Psych YAML implementation
+- WeakRef ([GitHub][weakref]): Allows a referenced object to be garbage-collected
+
+## Extensions
+
+- Date ([GitHub][date]): Represents dates, with a subclass for dates with time and timezones
+- Digest ([GitHub][digest]): Provides a framework for message digest libraries
+- Etc ([GitHub][etc]): Provides access to information typically stored in the UNIX /etc directory
+- Fcntl ([GitHub][fcntl]): Loads constants defined in the OS fcntl.h C header file
+- IO.console ([GitHub][io-console]): Extensions for the IO class, including `IO.console`, `IO.winsize`, etc.
+- IO#nonblock ([GitHub][io-nonblock]): Enable non-blocking mode with IO class.
+- IO#wait ([GitHub][io-wait]): Provides the feature for waiting until IO is readable or writable without blocking.
+- JSON ([GitHub][json]): Implements JavaScript Object Notation for Ruby
+- OpenSSL ([GitHub][openssl]): Provides SSL, TLS, and general-purpose cryptography for Ruby
+- Pathname ([GitHub][pathname]): Representation of the name of a file or directory on the filesystem
+- Psych ([GitHub][psych]): A YAML parser and emitter for Ruby
+- StringIO ([GitHub][stringio]): Pseudo-I/O on String objects
+- StringScanner ([GitHub][strscan]): Provides lexical scanning operations on a String
+- Zlib ([GitHub][zlib]): Ruby interface for the zlib compression/decompression library
+
+# Bundled gems
+
+- Bundled gems are shipped with Ruby releases and also available as rubygems.
+    - They are only bundled with Ruby releases.
+    - They can be uninstalled from the Ruby installation.
+    - They need to be declared in a Gemfile when used with bundler.
+
+## Libraries
+
+- [minitest]: A test library supporting TDD, BDD, mocking, and benchmarking
+- [power_assert]: Power Assert for Ruby
+- [rake][rake-doc] ([GitHub][rake]): Ruby build program with capabilities similar to make
+- [test-unit]: A compatibility layer for MiniTest
+- [rexml][rexml-doc] ([GitHub][rexml]): An XML toolkit for Ruby
+- [rss]: A family of libraries supporting various XML-based "feeds"
+- [net-ftp]: Support for the File Transfer Protocol
+- [net-imap]: Ruby client API for the Internet Message Access Protocol
+- [net-pop]: Ruby client library for POP3
+- [net-smtp]: Simple Mail Transfer Protocol client library for Ruby
+- [matrix]: Represents a mathematical matrix
+- [prime]: Prime numbers and factorization library
+- [rbs]: RBS is a language to describe the structure of Ruby programs
+- [typeprof]: A type analysis tool for Ruby code based on abstract interpretation
+- [debug]: Debugging functionality for Ruby
+- [racc][racc-doc] ([GitHub][racc]): A LALR(1) parser generator written in Ruby
+- [mutex_m]: Mixin to extend objects to be handled like a Mutex
+- [getoptlong]: Parse command line options similar to the GNU C getopt_long()
+- [base64]: Support for encoding and decoding binary data using a Base64 representation
+- [bigdecimal]: Provides arbitrary-precision floating point decimal arithmetic
+- [observer]: Provides a mechanism for the publish/subscribe pattern in Ruby
+- [abbrev]: Calculates a set of unique abbreviations for a given set of strings
+- [resolv-replace]: Replace Socket DNS with Resolv
+- [rinda]: The Linda distributed computing paradigm in Ruby
+- [drb]: Distributed object system for Ruby
+- [nkf]: Ruby extension for the Network Kanji Filter
+- [syslog]: Ruby interface for the POSIX system logging facility
+- [csv][csv-doc] ([GitHub][csv]): Provides an interface to read and write CSV files and data
+- [ostruct]: A class to build custom data structures, similar to a Hash
+- [benchmark]: Provides methods to measure and report the time used to execute code
+- [logger][logger-doc] ([GitHub][logger]): Provides a simple logging utility for outputting messages
+- [pstore]: Implements a file-based persistence mechanism based on a Hash
+- [win32ole]: Provides an interface for OLE Automation in Ruby
+- [reline][reline-doc] ([GitHub][reline]): GNU Readline and Editline in a pure Ruby implementation
+- [readline]: Wrapper for the Readline extension and Reline
+- [fiddle]: A libffi wrapper for Ruby
+
+## Tools
+
+- [IRB][irb-doc] ([GitHub][irb]): Interactive Ruby command-line tool for REPL (Read Eval Print Loop)
+- [RDoc][rdoc-doc] ([GitHub][rdoc]): Documentation generator for Ruby
+
+[abbrev]: https://github.com/ruby/abbrev
+[base64]: https://github.com/ruby/base64
+[benchmark]: https://github.com/ruby/benchmark
+[bigdecimal]: https://github.com/ruby/bigdecimal
+[bundler]: https://github.com/rubygems/rubygems
+[csv]: https://github.com/ruby/csv
+[date]: https://github.com/ruby/date
+[debug]: https://github.com/ruby/debug
+[delegate]: https://github.com/ruby/delegate
+[did_you_mean]: https://github.com/ruby/did_you_mean
+[digest]: https://github.com/ruby/digest
+[drb]: https://github.com/ruby/drb
+[English]: https://github.com/ruby/English
+[erb]: https://github.com/ruby/erb
+[error_highlight]: https://github.com/ruby/error_highlight
+[etc]: https://github.com/ruby/etc
+[fcntl]: https://github.com/ruby/fcntl
+[fiddle]: https://github.com/ruby/fiddle
+[fileutils]: https://github.com/ruby/fileutils
+[find]: https://github.com/ruby/find
+[forwardable]: https://github.com/ruby/forwardable
+[getoptlong]: https://github.com/ruby/getoptlong
+[io-console]: https://github.com/ruby/io-console
+[io-nonblock]: https://github.com/ruby/io-nonblock
+[io-wait]: https://github.com/ruby/io-wait
+[ipaddr]: https://github.com/ruby/ipaddr
+[irb]: https://github.com/ruby/irb
+[json]: https://github.com/ruby/json
+[logger]: https://github.com/ruby/logger
+[matrix]: https://github.com/ruby/matrix
+[minitest]: https://github.com/seattlerb/minitest
+[mutex_m]: https://github.com/ruby/mutex_m
+[net-ftp]: https://github.com/ruby/net-ftp
+[net-http]: https://github.com/ruby/net-http
+[net-imap]: https://github.com/ruby/net-imap
+[net-pop]: https://github.com/ruby/net-pop
+[net-smtp]: https://github.com/ruby/net-smtp
+[nkf]: https://github.com/ruby/nkf
+[observer]: https://github.com/ruby/observer
+[open-uri]: https://github.com/ruby/open-uri
+[open3]: https://github.com/ruby/open3
+[openssl]: https://github.com/ruby/openssl
+[optparse]: https://github.com/ruby/optparse
+[ostruct]: https://github.com/ruby/ostruct
+[pathname]: https://github.com/ruby/pathname
+[power_assert]: https://github.com/ruby/power_assert
+[pp]: https://github.com/ruby/pp
+[prettyprint]: https://github.com/ruby/prettyprint
+[prime]: https://github.com/ruby/prime
+[prism]: https://github.com/ruby/prism
+[pstore]: https://github.com/ruby/pstore
+[psych]: https://github.com/ruby/psych
+[racc]: https://github.com/ruby/racc
+[rake]: https://github.com/ruby/rake
+[rbs]: https://github.com/ruby/rbs
+[rdoc]: https://github.com/ruby/rdoc
+[readline]: https://github.com/ruby/readline
+[reline]: https://github.com/ruby/reline
+[resolv-replace]: https://github.com/ruby/resolv-replace
+[resolv]: https://github.com/ruby/resolv
+[rexml]: https://github.com/ruby/rexml
+[rinda]: https://github.com/ruby/rinda
+[rss]: https://github.com/ruby/rss
+[securerandom]: https://github.com/ruby/securerandom
+[shellwords]: https://github.com/ruby/shellwords
+[singleton]: https://github.com/ruby/singleton
+[stringio]: https://github.com/ruby/stringio
+[strscan]: https://github.com/ruby/strscan
+[syslog]: https://github.com/ruby/syslog
+[tempfile]: https://github.com/ruby/tempfile
+[test-unit]: https://github.com/test-unit/test-unit
+[time]: https://github.com/ruby/time
+[timeout]: https://github.com/ruby/timeout
+[tmpdir]: https://github.com/ruby/tmpdir
+[tsort]: https://github.com/ruby/tsort
+[typeprof]: https://github.com/ruby/typeprof
+[un]: https://github.com/ruby/un
+[uri]: https://github.com/ruby/uri
+[weakref]: https://github.com/ruby/weakref
+[win32ole]: https://github.com/ruby/win32ole
+[yaml]: https://github.com/ruby/yaml
+[zlib]: https://github.com/ruby/zlib
+
+[reline-doc]: https://ruby.github.io/reline/
+[rake-doc]: https://ruby.github.io/rake/
+[irb-doc]: https://ruby.github.io/irb/
+[rdoc-doc]: https://ruby.github.io/rdoc/
+[logger-doc]: https://ruby.github.io/logger/
+[racc-doc]: https://ruby.github.io/racc/
+[csv-doc]: https://ruby.github.io/csv/
+[rexml-doc]: https://ruby.github.io/rexml/
diff --git a/doc/standard_library.rdoc b/doc/standard_library.rdoc
deleted file mode 100644
index b4baaca18b1ead..00000000000000
--- a/doc/standard_library.rdoc
+++ /dev/null
@@ -1,131 +0,0 @@
-= Ruby Standard Library
-
-The Ruby Standard Library is a vast collection of classes and modules that you
-can require in your code for additional features.
-
-Below is an overview of libraries and extensions followed by a brief
-description.
-
-== Libraries
-
-MakeMakefile:: Module used to generate a Makefile for C extensions
-RbConfig:: Information of your configure and build of Ruby
-Gem:: Package management framework for Ruby
-
-== Extensions
-
-Coverage:: Provides coverage measurement for Ruby
-Monitor:: Provides an object or module to use safely by more than one thread
-objspace:: Extends ObjectSpace module to add methods for internal statistics
-PTY:: Creates and manages pseudo terminals
-Ripper:: Provides an interface for parsing Ruby programs into S-expressions
-Socket:: Access underlying OS socket implementations
-
-= Default gems
-
-* default gems are shipped with Ruby releases and also available as rubygems.
-* default gems are not uninstallable from Ruby installation.
-* default gems can be updated used by rubygems.
-    * e.g. `gem update json`
-* default gems can be used with bundler environment like `unbundled_env`.
-* default gems can be used any version on Gemfile.
-    * e.g. `gem "json", ">= 2.6"`
-
-== Libraries
-
-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
-Benchmark:: Provides methods to measure and report the time used to execute code
-Bundler:: Manage your Ruby application's gem dependencies
-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
-DRb:: Distributed object system for Ruby
-English:: Provides references to special global variables with less cryptic names
-ERB:: An easy to use but powerful templating system for Ruby
-ErrorHighlight:: Highlight error location in your code
-FileUtils:: Several file utility methods for copying, moving, removing, etc
-Find:: This module supports top-down traversal of a set of file paths
-Forwardable:: Provides delegation of specified methods to a designated object
-GetoptLong:: Parse command line options similar to the GNU C getopt_long()
-IPAddr:: Provides methods to manipulate IPv4 and IPv6 IP addresses
-IRB:: Interactive Ruby command-line tool for REPL (Read Eval Print Loop)
-OptionParser:: Ruby-oriented class for command-line option analysis
-Logger:: Provides a simple logging utility for outputting messages
-Mutex_m:: Mixin to extend objects to be handled like a Mutex
-Net::HTTP:: HTTP client api for Ruby
-Observable:: Provides a mechanism for publish/subscribe pattern in Ruby
-Open3:: Provides access to stdin, stdout and stderr when running other programs
-OpenStruct:: Class to build custom data structures, similar to a Hash
-OpenURI:: An easy-to-use wrapper for Net::HTTP, Net::HTTPS and Net::FTP
-PP:: Provides a PrettyPrinter for Ruby objects
-PrettyPrinter:: Implements a pretty printing algorithm for readable structure
-PStore:: Implements a file based persistence mechanism based on a Hash
-Readline:: Wrapper for Readline extencion and Reline
-Reline:: GNU Readline and Editline by pure Ruby implementation.
-Resolv::  Thread-aware DNS resolver library in Ruby
-resolv-replace.rb:: Replace Socket DNS with Resolv
-RDoc:: Produces HTML and command-line documentation for Ruby
-Rinda:: The Linda distributed computing paradigm in 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
-Singleton:: Implementation of the Singleton pattern for Ruby
-Tempfile:: A utility class for managing temporary files
-Time:: Extends the Time class with methods for parsing and conversion
-Timeout:: Auto-terminate potentially long-running operations in Ruby
-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
-URI:: A Ruby module providing support for Uniform Resource Identifiers
-YAML:: Ruby client library for the Psych YAML implementation
-WeakRef:: Allows a referenced object to be garbage-collected
-
-== Extensions
-
-BigDecimal:: Provides arbitrary-precision floating point decimal arithmetic
-Date:: A subclass of Object includes Comparable module for handling dates
-DateTime:: Subclass of Date to handling dates, hours, minutes, seconds, offsets
-Digest:: Provides a framework for message digest libraries
-Etc:: Provides access to information typically stored in UNIX /etc directory
-Fcntl:: Loads constants defined in the OS fcntl.h C header file
-Fiddle:: A libffi wrapper for Ruby
-IO:: Extensions for Ruby IO class, including #wait, #nonblock and ::console
-JSON:: Implements Javascript Object Notation for Ruby
-NKF:: Ruby extension for Network Kanji Filter
-OpenSSL:: Provides SSL, TLS and general purpose cryptography for Ruby
-Pathname:: Representation of the name of a file or directory on the filesystem
-Psych:: A YAML parser and emitter for Ruby
-StringIO:: Pseudo I/O on String objects
-StringScanner:: Provides lexical scanning operations on a String
-Syslog:: Ruby interface for the POSIX system logging facility
-WIN32OLE:: Provides an interface for OLE Automation in Ruby
-Zlib:: Ruby interface for the zlib compression/decompression library
-
-= Bundled gems
-
-* bundled gems are shipped with Ruby releases and also available as rubygems.
-* bundled gems are same as normal gems like `rails`, `rack`.
-    * They are only bundled with Ruby releases.
-    * They can be uninstallable from Ruby installation.
-    * They are needed to declare in Gemfile when use with bundler.
-
-== Libraries
-
-MiniTest:: A test suite with TDD, BDD, mocking and benchmarking
-PowerAssert:: Power Assert for Ruby.
-Rake:: Ruby build program with capabilities similar to make
-Test::Unit:: A compatibility layer for MiniTest
-REXML:: An XML toolkit for Ruby
-RSS:: Family of libraries that support various formats of XML "feeds"
-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
-Matrix:: Represents a mathematical matrix.
-Prime:: Prime numbers and factorization library
-RBS:: RBS is a language to describe the structure of Ruby programs
-TypeProf:: A type analysis tool for Ruby code based on abstract interpretation
-DEBUGGER__:: Debugging functionality for Ruby
-Racc:: A LALR(1) parser generator written in Ruby.
diff --git a/doc/strftime_formatting.rdoc b/doc/strftime_formatting.rdoc
index 30a629bf683083..5c7b33155df9ec 100644
--- a/doc/strftime_formatting.rdoc
+++ b/doc/strftime_formatting.rdoc
@@ -1,4 +1,4 @@
-== Formats for Dates and Times
+= Formats for Dates and Times
 
 Several Ruby time-related classes have instance method +strftime+,
 which returns a formatted string representing all or part of a date or time:
@@ -32,9 +32,9 @@ It consists of:
 Except for the leading percent character,
 the only required part is the conversion specifier, so we begin with that.
 
-=== Conversion Specifiers
+== Conversion Specifiers
 
-==== \Date (Year, Month, Day)
+=== \Date (Year, Month, Day)
 
 - <tt>%Y</tt> - Year including century, zero-padded:
 
@@ -87,7 +87,7 @@ the only required part is the conversion specifier, so we begin with that.
     Time.new(2002, 1, 1).strftime('%j')   # => "001"
     Time.new(2002, 12, 31).strftime('%j') # => "365"
 
-==== \Time (Hour, Minute, Second, Subsecond)
+=== \Time (Hour, Minute, Second, Subsecond)
 
 - <tt>%H</tt> - Hour of the day, in range (0..23), zero-padded:
 
@@ -152,7 +152,7 @@ the only required part is the conversion specifier, so we begin with that.
 
     Time.now.strftime('%s') # => "1656505136"
 
-==== Timezone
+=== Timezone
 
 - <tt>%z</tt> - Timezone as hour and minute offset from UTC:
 
@@ -162,7 +162,7 @@ the only required part is the conversion specifier, so we begin with that.
 
     Time.now.strftime('%Z') # => "Central Daylight Time"
 
-==== Weekday
+=== Weekday
 
 - <tt>%A</tt> - Full weekday name:
 
@@ -184,7 +184,7 @@ the only required part is the conversion specifier, so we begin with that.
     t.strftime('%a')          # => "Sun"
     t.strftime('%w')          # => "0"
 
-==== Week Number
+=== Week Number
 
 - <tt>%U</tt> - Week number of the year, in range (0..53), zero-padded,
   where each week begins on a Sunday:
@@ -200,7 +200,7 @@ the only required part is the conversion specifier, so we begin with that.
     t.strftime('%a')          # => "Sun"
     t.strftime('%W')          # => "25"
 
-==== Week Dates
+=== Week Dates
 
 See {ISO 8601 week dates}[https://en.wikipedia.org/wiki/ISO_8601#Week_dates].
 
@@ -223,7 +223,7 @@ See {ISO 8601 week dates}[https://en.wikipedia.org/wiki/ISO_8601#Week_dates].
     t0.strftime('%V') # => "52"
     t1.strftime('%V') # => "01"
 
-==== Literals
+=== Literals
 
 - <tt>%n</tt> - Newline character "\n":
 
@@ -237,7 +237,7 @@ See {ISO 8601 week dates}[https://en.wikipedia.org/wiki/ISO_8601#Week_dates].
 
     Time.now.strftime('%%') # => "%"
 
-==== Shorthand Conversion Specifiers
+=== Shorthand Conversion Specifiers
 
 Each shorthand specifier here is shown with its corresponding
 longhand specifier.
@@ -294,14 +294,14 @@ longhand specifier.
     DateTime.now.strftime('%a %b %e %H:%M:%S %Z %Y')
     # => "Wed Jun 29 08:32:18 -05:00 2022"
 
-=== Flags
+== Flags
 
 Flags may affect certain formatting specifications.
 
 Multiple flags may be given with a single conversion specified;
 order does not matter.
 
-==== Padding Flags
+=== Padding Flags
 
 - <tt>0</tt> - Pad with zeroes:
 
@@ -315,7 +315,7 @@ order does not matter.
 
     Time.new(10).strftime('%-Y') # => "10"
 
-==== Casing Flags
+=== Casing Flags
 
 - <tt>^</tt> - Upcase result:
 
@@ -328,7 +328,7 @@ order does not matter.
     Time.now.strftime('%^p') # => "AM"
     Time.now.strftime('%#p') # => "am"
 
-==== Timezone Flags
+=== Timezone Flags
 
 - <tt>:</tt> - Put timezone as colon-separated hours and minutes:
 
@@ -338,7 +338,7 @@ order does not matter.
 
     Time.now.strftime('%::z') # => "-05:00:00"
 
-=== Width Specifiers
+== Width Specifiers
 
 The integer width specifier gives a minimum width for the returned string:
 
@@ -348,15 +348,15 @@ The integer width specifier gives a minimum width for the returned string:
   Time.new(2002, 12).strftime('%10B') # => "  December"
   Time.new(2002, 12).strftime('%3B')  # => "December" # Ignored if too small.
 
-== Specialized Format Strings
+= Specialized Format Strings
 
 Here are a few specialized format strings,
 each based on an external standard.
 
-=== HTTP Format
+== HTTP Format
 
 The HTTP date format is based on
-{RFC 2616}[https://datatracker.ietf.org/doc/html/rfc2616],
+{RFC 2616}[https://www.rfc-editor.org/rfc/rfc2616],
 and treats dates in the format <tt>'%a, %d %b %Y %T GMT'</tt>:
 
   d = Date.new(2001, 2, 3) # => #<Date: 2001-02-03>
@@ -368,10 +368,10 @@ and treats dates in the format <tt>'%a, %d %b %Y %T GMT'</tt>:
   Date._httpdate(httpdate)
   # => {:wday=>6, :mday=>3, :mon=>2, :year=>2001, :hour=>0, :min=>0, :sec=>0, :zone=>"GMT", :offset=>0}
 
-=== RFC 3339 Format
+== RFC 3339 Format
 
 The RFC 3339 date format is based on
-{RFC 3339}[https://datatracker.ietf.org/doc/html/rfc3339]:
+{RFC 3339}[https://www.rfc-editor.org/rfc/rfc3339]:
 
   d = Date.new(2001, 2, 3) # => #<Date: 2001-02-03>
   # Return 3339-formatted string.
@@ -382,10 +382,10 @@ The RFC 3339 date format is based on
   Date._rfc3339(rfc3339)
   # => {:year=>2001, :mon=>2, :mday=>3, :hour=>0, :min=>0, :sec=>0, :zone=>"+00:00", :offset=>0}
 
-=== RFC 2822 Format
+== RFC 2822 Format
 
 The RFC 2822 date format is based on
-{RFC 2822}[https://datatracker.ietf.org/doc/html/rfc2822],
+{RFC 2822}[https://www.rfc-editor.org/rfc/rfc2822],
 and treats dates in the format <tt>'%a, %-d %b %Y %T %z'</tt>]:
 
   d = Date.new(2001, 2, 3) # => #<Date: 2001-02-03>
@@ -397,7 +397,7 @@ and treats dates in the format <tt>'%a, %-d %b %Y %T %z'</tt>]:
   Date._rfc2822(rfc2822)
   # => {:wday=>6, :mday=>3, :mon=>2, :year=>2001, :hour=>0, :min=>0, :sec=>0, :zone=>"+0000", :offset=>0}
 
-=== JIS X 0301 Format
+== JIS X 0301 Format
 
 The JIS X 0301 format includes the
 {Japanese era name}[https://en.wikipedia.org/wiki/Japanese_era_name],
@@ -412,7 +412,7 @@ with the first letter of the romanized era name prefixed:
   # Return hash parsed from 0301-formatted string.
   Date._jisx0301(jisx0301) # => {:year=>2001, :mon=>2, :mday=>3}
 
-=== ISO 8601 Format Specifications
+== ISO 8601 Format Specifications
 
 This section shows format specifications that are compatible with
 {ISO 8601}[https://en.wikipedia.org/wiki/ISO_8601].
@@ -422,7 +422,7 @@ Examples in this section assume:
 
   t = Time.now # => 2022-06-29 16:49:25.465246 -0500
 
-==== Dates
+=== Dates
 
 See {ISO 8601 dates}[https://en.wikipedia.org/wiki/ISO_8601#Dates].
 
@@ -473,7 +473,7 @@ See {ISO 8601 dates}[https://en.wikipedia.org/wiki/ISO_8601#Dates].
 
       t.strftime('%Y-%j') # => "2022-180"
 
-==== Times
+=== Times
 
 See {ISO 8601 times}[https://en.wikipedia.org/wiki/ISO_8601#Times].
 
@@ -514,7 +514,7 @@ See {ISO 8601 times}[https://en.wikipedia.org/wiki/ISO_8601#Times].
     - {Coordinated Universal Time (UTC)}[https://en.wikipedia.org/wiki/ISO_8601#Coordinated_Universal_Time_(UTC)].
     - {Time offsets from UTC}[https://en.wikipedia.org/wiki/ISO_8601#Time_offsets_from_UTC].
 
-==== Combined \Date and \Time
+=== Combined \Date and \Time
 
 See {ISO 8601 Combined date and time representations}[https://en.wikipedia.org/wiki/ISO_8601#Combined_date_and_time_representations].
 
diff --git a/doc/string.rb b/doc/string.rb
new file mode 100644
index 00000000000000..d68b40743b9d77
--- /dev/null
+++ b/doc/string.rb
@@ -0,0 +1,560 @@
+# A +String+ object has an arbitrary sequence of bytes,
+# typically representing text or binary data.
+# A +String+ object may be created using String::new or as literals.
+#
+# String objects differ from Symbol objects in that Symbol objects are
+# designed to be used as identifiers, instead of text or data.
+#
+# You can create a +String+ object explicitly with:
+#
+# - A {string literal}[rdoc-ref:syntax/literals.rdoc@String+Literals].
+# - A {heredoc literal}[rdoc-ref:syntax/literals.rdoc@Here+Document+Literals].
+#
+# You can convert certain objects to Strings with:
+#
+# - Method #String.
+#
+# Some +String+ methods modify +self+.
+# Typically, a method whose name ends with <tt>!</tt> modifies +self+
+# and returns +self+;
+# often, a similarly named method (without the <tt>!</tt>)
+# returns a new string.
+#
+# In general, if both bang and non-bang versions of a method exist,
+# the bang method mutates and the non-bang method does not.
+# However, a method without a bang can also mutate, such as String#replace.
+#
+# == Substitution Methods
+#
+# These methods perform substitutions:
+#
+# - String#sub: One substitution (or none); returns a new string.
+# - String#sub!: One substitution (or none); returns +self+ if any changes,
+#   +nil+ otherwise.
+# - String#gsub: Zero or more substitutions; returns a new string.
+# - String#gsub!: Zero or more substitutions; returns +self+ if any changes,
+#   +nil+ otherwise.
+#
+# Each of these methods takes:
+#
+# - A first argument, +pattern+ (String or Regexp),
+#   that specifies the substring(s) to be replaced.
+#
+# - Either of the following:
+#
+#   - A second argument, +replacement+ (String or Hash),
+#     that determines the replacing string.
+#   - A block that will determine the replacing string.
+#
+# The examples in this section mostly use the String#sub and String#gsub methods;
+# the principles illustrated apply to all four substitution methods.
+#
+# <b>Argument +pattern+</b>
+#
+# Argument +pattern+ is commonly a regular expression:
+#
+#   s = 'hello'
+#   s.sub(/[aeiou]/, '*') # => "h*llo"
+#   s.gsub(/[aeiou]/, '*') # => "h*ll*"
+#   s.gsub(/[aeiou]/, '')  # => "hll"
+#   s.sub(/ell/, 'al')     # => "halo"
+#   s.gsub(/xyzzy/, '*')   # => "hello"
+#   'THX1138'.gsub(/\d+/, '00') # => "THX00"
+#
+# When +pattern+ is a string, all its characters are treated
+# as ordinary characters (not as Regexp special characters):
+#
+#   'THX1138'.gsub('\d+', '00') # => "THX1138"
+#
+# <b>+String+ +replacement+</b>
+#
+# If +replacement+ is a string, that string determines
+# the replacing string that is substituted for the matched text.
+#
+# Each of the examples above uses a simple string as the replacing string.
+#
+# +String+ +replacement+ may contain back-references to the pattern's captures:
+#
+# - <tt>\n</tt> (_n_ is a non-negative integer) refers to <tt>$n</tt>.
+# - <tt>\k<name></tt> refers to the named capture +name+.
+#
+# See Regexp for details.
+#
+# Note that within the string +replacement+, a character combination
+# such as <tt>$&</tt> is treated as ordinary text, not as
+# a special match variable.
+# However, you may refer to some special match variables using these
+# combinations:
+#
+# - <tt>\&</tt> and <tt>\0</tt> correspond to <tt>$&</tt>,
+#   which contains the complete matched text.
+# - <tt>\'</tt> corresponds to <tt>$'</tt>,
+#   which contains the string after the match.
+# - <tt>\`</tt> corresponds to <tt>$`</tt>,
+#   which contains the string before the match.
+# - <tt>\\+</tt> corresponds to <tt>$+</tt>,
+#   which contains the last capture group.
+#
+# See Regexp for details.
+#
+# Note that <tt>\\\\</tt> is interpreted as an escape, i.e., a single backslash.
+#
+# Note also that a string literal consumes backslashes.
+# See {String Literals}[rdoc-ref:syntax/literals.rdoc@String+Literals] for details about string literals.
+#
+# A back-reference is typically preceded by an additional backslash.
+# For example, if you want to write a back-reference <tt>\&</tt> in
+# +replacement+ with a double-quoted string literal, you need to write
+# <tt>"..\\\\&.."</tt>.
+#
+# If you want to write a non-back-reference string <tt>\&</tt> in
+# +replacement+, you need to first escape the backslash to prevent
+# this method from interpreting it as a back-reference, and then you
+# need to escape the backslashes again to prevent a string literal from
+# consuming them: <tt>"..\\\\\\\\&.."</tt>.
+#
+# You may want to use the block form to avoid excessive backslashes.
+#
+# <b>\Hash +replacement+</b>
+#
+# If the argument +replacement+ is a hash, and +pattern+ matches one of its keys,
+# the replacing string is the value for that key:
+#
+#   h = {'foo' => 'bar', 'baz' => 'bat'}
+#   'food'.sub('foo', h) # => "bard"
+#
+# Note that a symbol key does not match:
+#
+#   h = {foo: 'bar', baz: 'bat'}
+#   'food'.sub('foo', h) # => "d"
+#
+# <b>Block</b>
+#
+# In the block form, the current match string is passed to the block;
+# the block's return value becomes the replacing string:
+#
+#   s = '@'
+#   '1234'.gsub(/\d/) { |match| s.succ! } # => "ABCD"
+#
+# Special match variables such as <tt>$1</tt>, <tt>$2</tt>, <tt>$`</tt>,
+# <tt>$&</tt>, and <tt>$'</tt> are set appropriately.
+#
+# == Whitespace in Strings
+#
+# In the class +String+, _whitespace_ is defined as a contiguous sequence of characters
+# consisting of any mixture of the following:
+#
+# - NL (null): <tt>"\x00"</tt>, <tt>"\u0000"</tt>.
+# - HT (horizontal tab): <tt>"\x09"</tt>, <tt>"\t"</tt>.
+# - LF (line feed): <tt>"\x0a"</tt>, <tt>"\n"</tt>.
+# - VT (vertical tab): <tt>"\x0b"</tt>, <tt>"\v"</tt>.
+# - FF (form feed): <tt>"\x0c"</tt>, <tt>"\f"</tt>.
+# - CR (carriage return): <tt>"\x0d"</tt>, <tt>"\r"</tt>.
+# - SP (space): <tt>"\x20"</tt>, <tt>" "</tt>.
+#
+#
+# Whitespace is relevant for the following methods:
+#
+# - #lstrip, #lstrip!: Strip leading whitespace.
+# - #rstrip, #rstrip!: Strip trailing whitespace.
+# - #strip, #strip!: Strip leading and trailing whitespace.
+#
+# == +String+ Slices
+#
+# A _slice_ of a string is a substring selected by certain criteria.
+#
+# These instance methods utilize slicing:
+#
+# - String#[] (aliased as String#slice): Returns a slice copied from +self+.
+# - String#[]=: Mutates +self+ with the slice replaced.
+# - String#slice!: Mutates +self+ with the slice removed and returns the removed slice.
+#
+# Each of the above methods takes arguments that determine the slice
+# to be copied or replaced.
+#
+# The arguments have several forms.
+# For a string +string+, the forms are:
+#
+# - <tt>string[index]</tt>
+# - <tt>string[start, length]</tt>
+# - <tt>string[range]</tt>
+# - <tt>string[regexp, capture = 0]</tt>
+# - <tt>string[substring]</tt>
+#
+# <b><tt>string[index]</tt></b>
+#
+# When a non-negative integer argument +index+ is given,
+# the slice is the 1-character substring found in +self+ at character offset +index+:
+#
+#   'bar'[0]      # => "b"
+#   'bar'[2]      # => "r"
+#   'bar'[20]     # => nil
+#   'тест'[2]     # => "с"
+#   'こんにちは'[4] # => "は"
+#
+# When a negative integer +index+ is given,
+# the slice begins at the offset given by counting backward from the end of +self+:
+#
+#   'bar'[-3]      # => "b"
+#   'bar'[-1]      # => "r"
+#   'bar'[-20]     # => nil
+#
+# <b><tt>string[start, length]</tt></b>
+#
+# When non-negative integer arguments +start+ and +length+ are given,
+# the slice begins at character offset +start+, if it exists,
+# and continues for +length+ characters, if available:
+#
+#   'foo'[0, 2]      # => "fo"
+#   'тест'[1, 2]     # => "ес"
+#   'こんにちは'[2, 2] # => "にち"
+#   # Zero length.
+#   'foo'[2, 0]      # => ""
+#   # Length not entirely available.
+#   'foo'[1, 200]    # => "oo"
+#   # Start out of range.
+#   'foo'[4, 2]      # => nil
+#
+# Special case: if +start+ equals the length of +self+,
+# the slice is a new empty string:
+#
+#   'foo'[3, 2]    # => ""
+#   'foo'[3, 200]  # => ""
+#
+# When a negative +start+ and non-negative +length+ are given,
+# the slice begins by counting backward from the end of +self+,
+# and continues for +length+ characters, if available:
+#
+#   'foo'[-2, 2]     # => "oo"
+#   'foo'[-2, 200]   # => "oo"
+#   # Start out of range.
+#   'foo'[-4, 2]     # => nil
+#
+# When a negative +length+ is given, there is no slice:
+#
+#   'foo'[1, -1]   # => nil
+#   'foo'[-2, -1]  # => nil
+#
+# <b><tt>string[range]</tt></b>
+#
+# When a Range argument +range+ is given,
+# it creates a substring of +string+ using the indices in +range+.
+# The slice is then determined as above:
+#
+#   'foo'[0..1]     # => "fo"
+#   'foo'[0, 2]     # => "fo"
+#
+#   'foo'[2...2]    # => ""
+#   'foo'[2, 0]     # => ""
+#
+#   'foo'[1..200]   # => "oo"
+#   'foo'[1, 200]   # => "oo"
+#
+#   'foo'[4..5]     # => nil
+#   'foo'[4, 2]     # => nil
+#
+#   'foo'[-4..-3]   # => nil
+#   'foo'[-4, 2]    # => nil
+#
+#   'foo'[3..4]     # => ""
+#   'foo'[3, 2]     # => ""
+#
+#   'foo'[-2..-1]   # => "oo"
+#   'foo'[-2, 2]    # => "oo"
+#
+#   'foo'[-2..197]  # => "oo"
+#   'foo'[-2, 200]  # => "oo"
+#
+# <b><tt>string[regexp, capture = 0]</tt></b>
+#
+# When the Regexp argument +regexp+ is given,
+# and the +capture+ argument is <tt>0</tt>,
+# the slice is the first matching substring found in +self+:
+#
+#   'foo'[/o/]                # => "o"
+#   'foo'[/x/]                # => nil
+#   s = 'hello there'
+#   s[/[aeiou](.)\1/]        # => "ell"
+#   s[/[aeiou](.)\1/, 0]     # => "ell"
+#
+# If the argument +capture+ is provided and not <tt>0</tt>,
+# it should be either a capture group index (integer)
+# or a capture group name (String or Symbol);
+# the slice is the specified capture (see Regexp@Groups and Captures):
+#
+#   s = 'hello there'
+#   s[/[aeiou](.)\1/, 1] # => "l"
+#   s[/(?<vowel>[aeiou])(?<non_vowel>[^aeiou])/, "non_vowel"] # => "l"
+#   s[/(?<vowel>[aeiou])(?<non_vowel>[^aeiou])/, :vowel]      # => "e"
+#
+# If an invalid capture group index is given, there is no slice.
+# If an invalid capture group name is given, +IndexError+ is raised.
+#
+# <b><tt>string[substring]</tt></b>
+#
+# When the single +String+ argument +substring+ is given,
+# it returns the substring from +self+ if found, otherwise +nil+:
+#
+#   'foo'['oo'] # => "oo"
+#   'foo'['xx'] # => nil
+#
+# == What's Here
+#
+# First, what's elsewhere. Class +String+:
+#
+# - Inherits from the {Object class}[rdoc-ref:Object@What-27s+Here].
+# - Includes the {Comparable module}[rdoc-ref:Comparable@What-27s+Here].
+#
+# Here, class +String+ provides methods that are useful for:
+#
+# - {Creating a \String}[rdoc-ref:String@Creating+a+String].
+# - {Freezing/Unfreezing a \String}[rdoc-ref:String@Freezing-2FUnfreezing].
+# - {Querying a \String}[rdoc-ref:String@Querying].
+# - {Comparing Strings}[rdoc-ref:String@Comparing].
+# - {Modifying a \String}[rdoc-ref:String@Modifying].
+# - {Converting to a new \String}[rdoc-ref:String@Converting+to+New+String].
+# - {Converting to a non-\String}[rdoc-ref:String@Converting+to+Non--5CString].
+# - {Iterating over a \String}[rdoc-ref:String@Iterating].
+#
+# === Creating a \String
+#
+# - ::new: Returns a new string.
+# - ::try_convert: Returns a new string created from a given object.
+#
+# === Freezing/Unfreezing
+#
+# - #+@: Returns a string that is not frozen: +self+ if not frozen;
+#   +self.dup+ otherwise.
+# - #-@ (aliased as #dedup): Returns a string that is frozen: +self+ if already frozen;
+#   +self.freeze+ otherwise.
+# - #freeze: Freezes +self+ if not already frozen; returns +self+.
+#
+# === Querying
+#
+# _Counts_
+#
+# - #length (aliased as #size): Returns the count of characters (not bytes).
+# - #empty?: Returns +true+ if +self.length+ is zero; +false+ otherwise.
+# - #bytesize: Returns the count of bytes.
+# - #count: Returns the count of substrings matching given strings.
+#
+# _Substrings_
+#
+# - #=~: Returns the index of the first substring that matches a given
+#   Regexp or other object; returns +nil+ if no match is found.
+# - #byteindex: Returns the byte index of the first occurrence of a given substring.
+# - #byterindex: Returns the byte index of the last occurrence of a given substring.
+# - #index: Returns the index of the _first_ occurrence of a given substring;
+#   returns +nil+ if none found.
+# - #rindex: Returns the index of the _last_ occurrence of a given substring;
+#   returns +nil+ if none found.
+# - #include?: Returns +true+ if the string contains a given substring; +false+ otherwise.
+# - #match: Returns a MatchData object if the string matches a given Regexp; +nil+ otherwise.
+# - #match?: Returns +true+ if the string matches a given Regexp; +false+ otherwise.
+# - #start_with?: Returns +true+ if the string begins with any of the given substrings.
+# - #end_with?: Returns +true+ if the string ends with any of the given substrings.
+#
+# _Encodings_
+#
+# - #encoding\: Returns the Encoding object that represents the encoding of the string.
+# - #unicode_normalized?: Returns +true+ if the string is in Unicode normalized form; +false+ otherwise.
+# - #valid_encoding?: Returns +true+ if the string contains only characters that are valid
+#   for its encoding.
+# - #ascii_only?: Returns +true+ if the string has only ASCII characters; +false+ otherwise.
+#
+# _Other_
+#
+# - #sum: Returns a basic checksum for the string: the sum of each byte.
+# - #hash: Returns the integer hash code.
+#
+# === Comparing
+#
+# - #== (aliased as #===): Returns +true+ if a given other string has the same content as +self+.
+# - #eql?: Returns +true+ if the content is the same as the given other string.
+# - #<=>: Returns -1, 0, or 1 as a given other string is smaller than,
+#   equal to, or larger than +self+.
+# - #casecmp: Ignoring case, returns -1, 0, or 1 as
+#   +self+ is smaller than, equal to, or larger than a given other string.
+# - #casecmp?: Ignoring case, returns whether a given other string is equal to +self+.
+#
+# === Modifying
+#
+# Each of these methods modifies +self+.
+#
+# _Insertion_
+#
+# - #insert: Returns +self+ with a given string inserted at a specified offset.
+# - #<<: Returns +self+ concatenated with a given string or integer.
+# - #append_as_bytes: Returns +self+ concatenated with strings without performing any
+#   encoding validation or conversion.
+#
+# _Substitution_
+#
+# - #bytesplice: Replaces bytes of +self+ with bytes from a given string; returns +self+.
+# - #sub!: Replaces the first substring that matches a given pattern with a given replacement string;
+#   returns +self+ if any changes, +nil+ otherwise.
+# - #gsub!: Replaces each substring that matches a given pattern with a given replacement string;
+#   returns +self+ if any changes, +nil+ otherwise.
+# - #succ! (aliased as #next!): Returns +self+ modified to become its own successor.
+# - #initialize_copy (aliased as #replace): Returns +self+ with its entire content replaced by a given string.
+# - #reverse!: Returns +self+ with its characters in reverse order.
+# - #setbyte: Sets the byte at a given integer offset to a given value; returns the argument.
+# - #tr!: Replaces specified characters in +self+ with specified replacement characters;
+#   returns +self+ if any changes, +nil+ otherwise.
+# - #tr_s!: Replaces specified characters in +self+ with specified replacement characters,
+#   removing duplicates from the substrings that were modified;
+#   returns +self+ if any changes, +nil+ otherwise.
+#
+# _Casing_
+#
+# - #capitalize!: Upcases the initial character and downcases all others;
+#   returns +self+ if any changes, +nil+ otherwise.
+# - #downcase!: Downcases all characters; returns +self+ if any changes, +nil+ otherwise.
+# - #upcase!: Upcases all characters; returns +self+ if any changes, +nil+ otherwise.
+# - #swapcase!: Upcases each downcase character and downcases each upcase character;
+#   returns +self+ if any changes, +nil+ otherwise.
+#
+# _Encoding_
+#
+# - #encode!: Returns +self+ with all characters transcoded from one encoding to another.
+# - #unicode_normalize!: Unicode-normalizes +self+; returns +self+.
+# - #scrub!: Replaces each invalid byte with a given character; returns +self+.
+# - #force_encoding: Changes the encoding to a given encoding; returns +self+.
+#
+# _Deletion_
+#
+# - #clear: Removes all content, so that +self+ is empty; returns +self+.
+# - #slice!, #[]=: Removes a substring determined by a given index, start/length, range, regexp, or substring.
+# - #squeeze!: Removes contiguous duplicate characters; returns +self+.
+# - #delete!: Removes characters as determined by the intersection of substring arguments.
+# - #delete_prefix!: Removes leading prefix; returns +self+ if any changes, +nil+ otherwise.
+# - #delete_suffix!: Removes trailing suffix; returns +self+ if any changes, +nil+ otherwise.
+# - #lstrip!: Removes leading whitespace; returns +self+ if any changes, +nil+ otherwise.
+# - #rstrip!: Removes trailing whitespace; returns +self+ if any changes, +nil+ otherwise.
+# - #strip!: Removes leading and trailing whitespace; returns +self+ if any changes, +nil+ otherwise.
+# - #chomp!: Removes the trailing record separator, if found; returns +self+ if any changes, +nil+ otherwise.
+# - #chop!: Removes trailing newline characters if found; otherwise removes the last character;
+#   returns +self+ if any changes, +nil+ otherwise.
+#
+# === Converting to New \String
+#
+# Each of these methods returns a new +String+ based on +self+,
+# often just a modified copy of +self+.
+#
+# _Extension_
+#
+# - #*: Returns the concatenation of multiple copies of +self+.
+# - #+: Returns the concatenation of +self+ and a given other string.
+# - #center: Returns a copy of +self+, centered by specified padding.
+# - #concat: Returns the concatenation of +self+ with given other strings.
+# - #prepend: Returns the concatenation of a given other string with +self+.
+# - #ljust: Returns a copy of +self+ of a given length, right-padded with a given other string.
+# - #rjust: Returns a copy of +self+ of a given length, left-padded with a given other string.
+#
+# _Encoding_
+#
+# - #b: Returns a copy of +self+ with ASCII-8BIT encoding.
+# - #scrub: Returns a copy of +self+ with each invalid byte replaced with a given character.
+# - #unicode_normalize: Returns a copy of +self+ with each character Unicode-normalized.
+# - #encode: Returns a copy of +self+ with all characters transcoded from one encoding to another.
+#
+# _Substitution_
+#
+# - #dump: Returns a copy of +self+ with all non-printing characters replaced by \xHH notation
+#   and all special characters escaped.
+# - #undump: Returns a copy of +self+ with all <tt>\xNN</tt> notations replaced by <tt>\uNNNN</tt> notations
+#   and all escaped characters unescaped.
+# - #sub: Returns a copy of +self+ with the first substring matching a given pattern
+#   replaced with a given replacement string.
+# - #gsub: Returns a copy of +self+ with each substring that matches a given pattern
+#   replaced with a given replacement string.
+# - #succ (aliased as #next): Returns the string that is the successor to +self+.
+# - #reverse: Returns a copy of +self+ with its characters in reverse order.
+# - #tr: Returns a copy of +self+ with specified characters replaced with specified replacement characters.
+# - #tr_s: Returns a copy of +self+ with specified characters replaced with
+#   specified replacement characters,
+#   removing duplicates from the substrings that were modified.
+# - #%: Returns the string resulting from formatting a given object into +self+.
+#
+# _Casing_
+#
+# - #capitalize: Returns a copy of +self+ with the first character upcased
+#   and all other characters downcased.
+# - #downcase: Returns a copy of +self+ with all characters downcased.
+# - #upcase: Returns a copy of +self+ with all characters upcased.
+# - #swapcase: Returns a copy of +self+ with all upcase characters downcased
+#   and all downcase characters upcased.
+#
+# _Deletion_
+#
+# - #delete: Returns a copy of +self+ with characters removed.
+# - #delete_prefix: Returns a copy of +self+ with a given prefix removed.
+# - #delete_suffix: Returns a copy of +self+ with a given suffix removed.
+# - #lstrip: Returns a copy of +self+ with leading whitespace removed.
+# - #rstrip: Returns a copy of +self+ with trailing whitespace removed.
+# - #strip: Returns a copy of +self+ with leading and trailing whitespace removed.
+# - #chomp: Returns a copy of +self+ with a trailing record separator removed, if found.
+# - #chop: Returns a copy of +self+ with trailing newline characters or the last character removed.
+# - #squeeze: Returns a copy of +self+ with contiguous duplicate characters removed.
+# - #[] (aliased as #slice): Returns a substring determined by a given index, start/length, range, regexp, or string.
+# - #byteslice: Returns a substring determined by a given index, start/length, or range.
+# - #chr: Returns the first character.
+#
+# _Duplication_
+#
+# - #to_s (aliased as #to_str): If +self+ is a subclass of +String+, returns +self+ copied into a +String+;
+#   otherwise, returns +self+.
+#
+# === Converting to Non-\String
+#
+# Each of these methods converts the contents of +self+ to a non-+String+.
+#
+# <em>Characters, Bytes, and Clusters</em>
+#
+# - #bytes: Returns an array of the bytes in +self+.
+# - #chars: Returns an array of the characters in +self+.
+# - #codepoints: Returns an array of the integer ordinals in +self+.
+# - #getbyte: Returns the integer byte at the given index in +self+.
+# - #grapheme_clusters: Returns an array of the grapheme clusters in +self+.
+#
+# _Splitting_
+#
+# - #lines: Returns an array of the lines in +self+, as determined by a given record separator.
+# - #partition: Returns a 3-element array determined by the first substring that matches
+#   a given substring or regexp.
+# - #rpartition: Returns a 3-element array determined by the last substring that matches
+#   a given substring or regexp.
+# - #split: Returns an array of substrings determined by a given delimiter -- regexp or string --
+#   or, if a block is given, passes those substrings to the block.
+#
+# _Matching_
+#
+# - #scan: Returns an array of substrings matching a given regexp or string, or,
+#   if a block is given, passes each matching substring to the block.
+# - #unpack: Returns an array of substrings extracted from +self+ according to a given format.
+# - #unpack1: Returns the first substring extracted from +self+ according to a given format.
+#
+# _Numerics_
+#
+# - #hex: Returns the integer value of the leading characters, interpreted as hexadecimal digits.
+# - #oct: Returns the integer value of the leading characters, interpreted as octal digits.
+# - #ord: Returns the integer ordinal of the first character in +self+.
+# - #to_i: Returns the integer value of leading characters, interpreted as an integer.
+# - #to_f: Returns the floating-point value of leading characters, interpreted as a floating-point number.
+#
+# <em>Strings and Symbols</em>
+#
+# - #inspect: Returns a copy of +self+, enclosed in double quotes, with special characters escaped.
+# - #intern (aliased as #to_sym): Returns the symbol corresponding to +self+.
+#
+# === Iterating
+#
+# - #each_byte: Calls the given block with each successive byte in +self+.
+# - #each_char: Calls the given block with each successive character in +self+.
+# - #each_codepoint: Calls the given block with each successive integer codepoint in +self+.
+# - #each_grapheme_cluster: Calls the given block with each successive grapheme cluster in +self+.
+# - #each_line: Calls the given block with each successive line in +self+,
+#   as determined by a given record separator.
+# - #upto: Calls the given block with each string value returned by successive calls to #succ.
+
+class String; end
diff --git a/doc/string/b.rdoc b/doc/string/b.rdoc
index f8ad2910b4c82a..8abd6d9532bb3e 100644
--- a/doc/string/b.rdoc
+++ b/doc/string/b.rdoc
@@ -12,3 +12,5 @@ the underlying bytes are not modified:
   t = s.b      # => "\xE4\x82\x95"
   t.encoding   # => #<Encoding:ASCII-8BIT>
   t.bytes      # => [228, 130, 149]
+
+Related: see {Converting to New String}[rdoc-ref:String@Converting+to+New+String].
diff --git a/doc/string/bytes.rdoc b/doc/string/bytes.rdoc
index a9e89f1cd1a733..f4b071f6306394 100644
--- a/doc/string/bytes.rdoc
+++ b/doc/string/bytes.rdoc
@@ -4,3 +4,5 @@ Returns an array of the bytes in +self+:
   'тест'.bytes  # => [209, 130, 208, 181, 209, 129, 209, 130]
   'こんにちは'.bytes
   # => [227, 129, 147, 227, 130, 147, 227, 129, 171, 227, 129, 161, 227, 129, 175]
+
+Related: see {Converting to Non-String}[rdoc-ref:String@Converting+to+Non--5CString].
diff --git a/doc/string/bytesize.rdoc b/doc/string/bytesize.rdoc
index b0567ff67b2547..5166dd7dc614ac 100644
--- a/doc/string/bytesize.rdoc
+++ b/doc/string/bytesize.rdoc
@@ -1,11 +1,15 @@
-Returns the count of bytes (not characters) in +self+:
+Returns the count of bytes in +self+.
 
-  'foo'.bytesize        # => 3
-  'тест'.bytesize       # => 8
-  'こんにちは'.bytesize   # => 15
+Note that the byte count may be different from the character count (returned by #size):
 
-Contrast with String#length:
+  s = 'foo'
+  s.bytesize # => 3
+  s.size     # => 3
+  s = 'тест'
+  s.bytesize # => 8
+  s.size     # => 4
+  s = 'こんにちは'
+  s.bytesize # => 15
+  s.size     # => 5
 
-  'foo'.length       # => 3
-  'тест'.length      # => 4
-  'こんにちは'.length  # => 5
+Related: see {Querying}[rdoc-ref:String@Querying].
diff --git a/doc/string/byteslice.rdoc b/doc/string/byteslice.rdoc
new file mode 100644
index 00000000000000..d70441fb2b6d6d
--- /dev/null
+++ b/doc/string/byteslice.rdoc
@@ -0,0 +1,54 @@
+Returns a substring of +self+, or +nil+ if the substring cannot be constructed.
+
+With integer arguments +offset+ and +length+ given,
+returns the substring beginning at the given +offset+
+and of the given +length+ (as available):
+
+  s = '0123456789'   # => "0123456789"
+  s.byteslice(2)     # => "2"
+  s.byteslice(200)   # => nil
+  s.byteslice(4, 3)  # => "456"
+  s.byteslice(4, 30) # => "456789"
+
+Returns +nil+ if +length+ is negative or +offset+ falls outside of +self+:
+
+  s.byteslice(4, -1) # => nil
+  s.byteslice(40, 2) # => nil
+
+Counts backwards from the end of +self+
+if +offset+ is negative:
+
+  s = '0123456789'   # => "0123456789"
+  s.byteslice(-4)    # => "6"
+  s.byteslice(-4, 3) # => "678"
+
+With Range argument +range+ given, returns
+<tt>byteslice(range.begin, range.size)</tt>:
+
+  s = '0123456789'    # => "0123456789"
+  s.byteslice(4..6)   # => "456"
+  s.byteslice(-6..-4) # => "456"
+  s.byteslice(5..2)   # => "" # range.size is zero.
+  s.byteslice(40..42) # => nil
+
+The starting and ending offsets need not be on character boundaries:
+
+  s = 'こんにちは'
+  s.byteslice(0, 3) # => "こ"
+  s.byteslice(1, 3) # => "\x81\x93\xE3"
+
+The encodings of +self+ and the returned substring
+are always the same:
+
+  s.encoding                 # => #<Encoding:UTF-8>
+  s.byteslice(0, 3).encoding # => #<Encoding:UTF-8>
+  s.byteslice(1, 3).encoding # => #<Encoding:UTF-8>
+
+But, depending on the character boundaries,
+the encoding of the returned substring may not be valid:
+
+  s.valid_encoding?                 # => true
+  s.byteslice(0, 3).valid_encoding? # => true
+  s.byteslice(1, 3).valid_encoding? # => false
+
+Related: see {Converting to New String}[rdoc-ref:String@Converting+to+New+String].
diff --git a/doc/string/bytesplice.rdoc b/doc/string/bytesplice.rdoc
new file mode 100644
index 00000000000000..5689ef4a2ba79b
--- /dev/null
+++ b/doc/string/bytesplice.rdoc
@@ -0,0 +1,66 @@
+Replaces <i>target bytes</i> in +self+ with <i>source bytes</i> from the given string +str+;
+returns +self+.
+
+In the first form, arguments +offset+ and +length+ determine the target bytes,
+and the source bytes are all of the given +str+:
+
+  '0123456789'.bytesplice(0, 3, 'abc')  # => "abc3456789"
+  '0123456789'.bytesplice(3, 3, 'abc')  # => "012abc6789"
+  '0123456789'.bytesplice(0, 50, 'abc') # => "abc"
+  '0123456789'.bytesplice(50, 3, 'abc') # Raises IndexError.
+
+The counts of the target bytes and source source bytes may be different:
+
+  '0123456789'.bytesplice(0, 6, 'abc') # => "abc6789"      # Shorter source.
+  '0123456789'.bytesplice(0, 1, 'abc') # => "abc123456789" # Shorter target.
+
+And either count may be zero (i.e., specifying an empty string):
+
+  '0123456789'.bytesplice(0, 3, '')    # => "3456789"       # Empty source.
+  '0123456789'.bytesplice(0, 0, 'abc') # => "abc0123456789" # Empty target.
+
+In the second form, just as in the first,
+arugments +offset+ and +length+ determine the target bytes;
+argument +str+ _contains_ the source bytes,
+and the additional arguments +str_offset+ and +str_length+
+determine the actual source bytes:
+
+  '0123456789'.bytesplice(0, 3, 'abc', 0, 3) # => "abc3456789"
+  '0123456789'.bytesplice(0, 3, 'abc', 1, 1) # => "b3456789"      # Shorter source.
+  '0123456789'.bytesplice(0, 1, 'abc', 0, 3) # => "abc123456789"  # Shorter target.
+  '0123456789'.bytesplice(0, 3, 'abc', 1, 0) # => "3456789"       # Empty source.
+  '0123456789'.bytesplice(0, 0, 'abc', 0, 3) # => "abc0123456789" # Empty target.
+
+In the third form, argument +range+ determines the target bytes
+and the source bytes are all of the given +str+:
+
+  '0123456789'.bytesplice(0..2, 'abc')  # => "abc3456789"
+  '0123456789'.bytesplice(3..5, 'abc')  # => "012abc6789"
+  '0123456789'.bytesplice(0..5, 'abc')  # => "abc6789"       # Shorter source.
+  '0123456789'.bytesplice(0..0, 'abc')  # => "abc123456789"  # Shorter target.
+  '0123456789'.bytesplice(0..2, '')     # => "3456789"       # Empty source.
+  '0123456789'.bytesplice(0...0, 'abc') # => "abc0123456789" # Empty target.
+
+In the fourth form, just as in the third,
+arugment +range+ determines the target bytes;
+argument +str+ _contains_ the source bytes,
+and the additional argument +str_range+
+determines the actual source bytes:
+
+  '0123456789'.bytesplice(0..2, 'abc', 0..2)  # => "abc3456789"
+  '0123456789'.bytesplice(3..5, 'abc', 0..2)  # => "012abc6789"
+  '0123456789'.bytesplice(0..2, 'abc', 0..1)  # => "ab3456789"     # Shorter source.
+  '0123456789'.bytesplice(0..1, 'abc', 0..2)  # => "abc23456789"   # Shorter target.
+  '0123456789'.bytesplice(0..2, 'abc', 0...0) # => "3456789"       # Empty source.
+  '0123456789'.bytesplice(0...0, 'abc', 0..2) # => "abc0123456789" # Empty target.
+
+In any of the forms, the beginnings and endings of both source and target
+must be on character boundaries.
+
+In these examples, +self+ has five 3-byte characters,
+and so has character boundaries at offsets 0, 3, 6, 9, 12, and 15.
+
+  'こんにちは'.bytesplice(0, 3, 'abc') # => "abcんにちは"
+  'こんにちは'.bytesplice(1, 3, 'abc') # Raises IndexError.
+  'こんにちは'.bytesplice(0, 2, 'abc') # Raises IndexError.
+
diff --git a/doc/string/center.rdoc b/doc/string/center.rdoc
index d53d921ad52092..343f6ba263acae 100644
--- a/doc/string/center.rdoc
+++ b/doc/string/center.rdoc
@@ -2,15 +2,19 @@ Returns a centered copy of +self+.
 
 If integer argument +size+ is greater than the size (in characters) of +self+,
 returns a new string of length +size+ that is a copy of +self+,
-centered and padded on both ends with +pad_string+:
+centered and padded on one or both ends with +pad_string+:
 
-  'hello'.center(10)       # => "  hello   "
-  '  hello'.center(10)     # => "   hello  "
-  'hello'.center(10, 'ab') # => "abhelloaba"
-  'тест'.center(10)        # => "   тест   "
-  'こんにちは'.center(10)    # => "  こんにちは   "
+  'hello'.center(6)             # => "hello "               # Padded on one end.
+  'hello'.center(10)            # => "  hello   "           # Padded on both ends.
+  'hello'.center(20, '-|')      # => "-|-|-|-hello-|-|-|-|" # Some padding repeated.
+  'hello'.center(10, 'abcdefg') # => "abhelloabc"           # Some padding not used.
+  '  hello  '.center(13)        # => "    hello    "
+  'тест'.center(10)             # => "   тест   "
+  'こんにちは'.center(10)         # => "  こんにちは   "      # Multi-byte characters.
 
-If +size+ is not greater than the size of +self+, returns a copy of +self+:
+If +size+ is less than or equal to the size of +self+, returns an unpadded copy of +self+:
 
-  'hello'.center(5)  # => "hello"
-  'hello'.center(1)  # => "hello"
+  'hello'.center(5)   # => "hello"
+  'hello'.center(-10) # => "hello"
+
+Related: see {Converting to New String}[rdoc-ref:String@Converting+to+New+String].
diff --git a/doc/string/chars.rdoc b/doc/string/chars.rdoc
index d24a1cc3a925ca..094384271b1a77 100644
--- a/doc/string/chars.rdoc
+++ b/doc/string/chars.rdoc
@@ -3,3 +3,6 @@ Returns an array of the characters in +self+:
   'hello'.chars     # => ["h", "e", "l", "l", "o"]
   'тест'.chars      # => ["т", "е", "с", "т"]
   'こんにちは'.chars # => ["こ", "ん", "に", "ち", "は"]
+  ''.chars          # => []
+
+Related: see {Converting to Non-String}[rdoc-ref:String@Converting+to+Non--5CString].
diff --git a/doc/string/chomp.rdoc b/doc/string/chomp.rdoc
index b6fb9ff38ccc50..6ec7664f6b6832 100644
--- a/doc/string/chomp.rdoc
+++ b/doc/string/chomp.rdoc
@@ -25,5 +25,8 @@ removes multiple trailing occurrences of <tt>"\n"</tt> or <tt>"\r\n"</tt>
 When +line_sep+ is neither <tt>"\n"</tt> nor <tt>''</tt>,
 removes a single trailing line separator if there is one:
 
-  'abcd'.chomp('d')  # => "abc"
-  'abcdd'.chomp('d') # => "abcd"
+  'abcd'.chomp('cd')   # => "ab"
+  'abcdcd'.chomp('cd') # => "abcd"
+  'abcd'.chomp('xx')   # => "abcd"
+
+Related: see {Converting to New String}[rdoc-ref:String@Converting+to+New+String].
diff --git a/doc/string/chop.rdoc b/doc/string/chop.rdoc
index 8ef82f8a492548..2c48e911292eff 100644
--- a/doc/string/chop.rdoc
+++ b/doc/string/chop.rdoc
@@ -13,4 +13,7 @@ Otherwise removes the last character if it exists.
   'こんにちは'.chop # => "こんにち"
   ''.chop         # => ""
 
-If you only need to remove the newline separator at the end of the string, String#chomp is a better alternative.
+If you only need to remove the newline separator at the end of the string,
+String#chomp is a better alternative.
+
+Related: see {Converting to New String}[rdoc-ref:String@Converting+to+New+String].
diff --git a/doc/string/chr.rdoc b/doc/string/chr.rdoc
new file mode 100644
index 00000000000000..1ada3854cbeb27
--- /dev/null
+++ b/doc/string/chr.rdoc
@@ -0,0 +1,8 @@
+Returns a string containing the first character of +self+:
+
+  'hello'.chr     # => "h"
+  'тест'.chr      # => "т"
+  'こんにちは'.chr # => "こ"
+  ''.chr          # => ""
+
+Related: see {Converting to New String}[rdoc-ref:String@Converting+to+New+String].
diff --git a/doc/string/codepoints.rdoc b/doc/string/codepoints.rdoc
index 0c55d3f4b95c35..d9586d2e0bc2a5 100644
--- a/doc/string/codepoints.rdoc
+++ b/doc/string/codepoints.rdoc
@@ -4,3 +4,6 @@ each codepoint is the integer value for a character:
   'hello'.codepoints     # => [104, 101, 108, 108, 111]
   'тест'.codepoints      # => [1090, 1077, 1089, 1090]
   'こんにちは'.codepoints # => [12371, 12435, 12395, 12385, 12399]
+  ''.codepoints          # => []
+
+Related: see {Converting to Non-String}[rdoc-ref:String@Converting+to+Non--5CString].
diff --git a/doc/string/concat.rdoc b/doc/string/concat.rdoc
new file mode 100644
index 00000000000000..2ba0c714af57d3
--- /dev/null
+++ b/doc/string/concat.rdoc
@@ -0,0 +1,12 @@
+Concatenates each object in +objects+ to +self+; returns +self+:
+
+  'foo'.concat('bar', 'baz') # => "foobarbaz"
+
+For each given object +object+ that is an integer,
+the value is considered a codepoint and converted to a character before concatenation:
+
+  'foo'.concat(32, 'bar', 32, 'baz') # => "foo bar baz" # Embeds spaces.
+  'те'.concat(1089, 1090)            # => "тест"
+  'こん'.concat(12395, 12385, 12399)  # => "こんにちは"
+
+Related: see {Converting to New String}[rdoc-ref:String@Converting+to+New+String].
diff --git a/doc/string/count.rdoc b/doc/string/count.rdoc
new file mode 100644
index 00000000000000..092c672d7d113b
--- /dev/null
+++ b/doc/string/count.rdoc
@@ -0,0 +1,78 @@
+Returns the total number of characters in +self+ that are specified by the given selectors.
+
+For one 1-character selector,
+returns the count of instances of that character:
+
+  s = 'abracadabra'
+  s.count('a') # => 5
+  s.count('b') # => 2
+  s.count('x') # => 0
+  s.count('')  # => 0
+
+  s = 'тест'
+  s.count('т')  # => 2
+  s.count('е')  # => 1
+
+  s = 'よろしくお願いします'
+  s.count('よ')  # => 1
+  s.count('し')  # => 2
+
+For one multi-character selector,
+returns the count of instances for all specified characters:
+
+  s = 'abracadabra'
+  s.count('ab')     # => 7
+  s.count('abc')    # => 8
+  s.count('abcd')   # => 9
+  s.count('abcdr')  # => 11
+  s.count('abcdrx') # => 11
+
+Order and repetition do not matter:
+
+  s.count('ba')   == s.count('ab') # => true
+  s.count('baab') == s.count('ab') # => true
+
+For multiple selectors,
+forms a single selector that is the intersection of characters in all selectors
+and returns the count of instances for that selector:
+
+  s = 'abcdefg'
+  s.count('abcde', 'dcbfg') == s.count('bcd') # => true
+  s.count('abc', 'def')     == s.count('')    # => true
+
+In a character selector, three characters get special treatment:
+
+- A caret (<tt>'^'</tt>) functions as a _negation_ operator
+  for the immediately following characters:
+
+    s = 'abracadabra'
+    s.count('^bc') # => 8  # Count of all except 'b' and 'c'.
+
+- A hyphen (<tt>'-'</tt>) between two other characters defines a _range_ of characters:
+
+    s = 'abracadabra'
+    s.count('a-c') # => 8  # Count of all 'a', 'b', and 'c'.
+
+- A backslash (<tt>'\'</tt>) acts as an escape for a caret, a hyphen,
+  or another backslash:
+
+    s = 'abracadabra'
+    s.count('\^bc')           # => 3  # Count of '^', 'b', and 'c'.
+    s.count('a\-c')           # => 6  # Count of 'a', '-', and 'c'.
+    'foo\bar\baz'.count('\\') # => 2  # Count of '\'.
+
+These usages may be mixed:
+
+  s = 'abracadabra'
+  s.count('a-cq-t') # => 10  # Multiple ranges.
+  s.count('ac-d')   # => 7   # Range mixed with plain characters.
+  s.count('^a-c')   # => 3   # Range mixed with negation.
+
+For multiple selectors, all forms may be used, including negations, ranges, and escapes.
+
+  s = 'abracadabra'
+  s.count('^abc', '^def') == s.count('^abcdef') # => true
+  s.count('a-e', 'c-g')   == s.count('cde')     # => true
+  s.count('^abc', 'c-g')  == s.count('defg')    # => true
+
+Related: see {Querying}[rdoc-ref:String@Querying].
diff --git a/doc/string/delete.rdoc b/doc/string/delete.rdoc
new file mode 100644
index 00000000000000..e8ff4c0ae400af
--- /dev/null
+++ b/doc/string/delete.rdoc
@@ -0,0 +1,79 @@
+Returns a new string that is a copy of +self+ with certain characters removed;
+the removed characters are all instances of those specified by the given string +selectors+.
+
+For one 1-character selector,
+removes all instances of that character:
+
+  s = 'abracadabra'
+  s.delete('a') # => "brcdbr"
+  s.delete('b') # => "aracadara"
+  s.delete('x') # => "abracadabra"
+  s.delete('')  # => "abracadabra"
+
+  s = 'тест'
+  s.delete('т') # => "ес"
+  s.delete('е') # => "тст"
+
+  s = 'よろしくお願いします'
+  s.delete('よ') # => "ろしくお願いします"
+  s.delete('し') # => "よろくお願います"
+
+For one multi-character selector,
+removes all instances of the specified characters:
+
+  s = 'abracadabra'
+  s.delete('ab')     # => "rcdr"
+  s.delete('abc')    # => "rdr"
+  s.delete('abcd')   # => "rr"
+  s.delete('abcdr')  # => ""
+  s.delete('abcdrx') # => ""
+
+Order and repetition do not matter:
+
+  s.delete('ba')   == s.delete('ab') # => true
+  s.delete('baab') == s.delete('ab') # => true
+
+For multiple selectors,
+forms a single selector that is the intersection of characters in all selectors
+and removes all instances of characters specified by that selector:
+
+  s = 'abcdefg'
+  s.delete('abcde', 'dcbfg') == s.delete('bcd') # => true
+  s.delete('abc', 'def')     == s.delete('')    # => true
+
+In a character selector, three characters get special treatment:
+
+- A caret (<tt>'^'</tt>) functions as a _negation_ operator
+  for the immediately following characters:
+
+    s = 'abracadabra'
+    s.delete('^bc') # => "bcb"  # Deletes all except 'b' and 'c'.
+
+- A hyphen (<tt>'-'</tt>) between two other characters defines a _range_ of characters:
+
+    s = 'abracadabra'
+    s.delete('a-c') # => "rdr"  # Deletes all 'a', 'b', and 'c'.
+
+- A backslash (<tt>'\'</tt>) acts as an escape for a caret, a hyphen,
+  or another backslash:
+
+    s = 'abracadabra'
+    s.delete('\^bc')           # => "araadara"   # Deletes all '^', 'b', and 'c'.
+    s.delete('a\-c')           # => "brdbr"      # Deletes all 'a', '-', and 'c'.
+    'foo\bar\baz'.delete('\\') # => "foobarbaz"  # Deletes all '\'.
+
+These usages may be mixed:
+
+  s = 'abracadabra'
+  s.delete('a-cq-t') # => "d"         # Multiple ranges.
+  s.delete('ac-d')   # => "brbr"      # Range mixed with plain characters.
+  s.delete('^a-c')   # => "abacaaba"  # Range mixed with negation.
+
+For multiple selectors, all forms may be used, including negations, ranges, and escapes.
+
+  s = 'abracadabra'
+  s.delete('^abc', '^def') == s.delete('^abcdef') # => true
+  s.delete('a-e', 'c-g')   == s.delete('cde')     # => true
+  s.delete('^abc', 'c-g')  == s.delete('defg')    # => true
+
+Related: see {Converting to New String}[rdoc-ref:String@Converting+to+New+String].
diff --git a/doc/string/delete_prefix.rdoc b/doc/string/delete_prefix.rdoc
index fa9d8abd38f372..1135f3d19d26ed 100644
--- a/doc/string/delete_prefix.rdoc
+++ b/doc/string/delete_prefix.rdoc
@@ -1,8 +1,10 @@
-Returns a copy of +self+ with leading substring <tt>prefix</tt> removed:
+Returns a copy of +self+ with leading substring +prefix+ removed:
 
-  'hello'.delete_prefix('hel')      # => "lo"
-  'hello'.delete_prefix('llo')      # => "hello"
+  'oof'.delete_prefix('o')          # => "of"
+  'oof'.delete_prefix('oo')         # => "f"
+  'oof'.delete_prefix('oof')        # => ""
+  'oof'.delete_prefix('x')          # => "oof"
   'тест'.delete_prefix('те')        # => "ст"
   'こんにちは'.delete_prefix('こん')  # => "にちは"
 
-Related: String#delete_prefix!, String#delete_suffix.
+Related: see {Converting to New String}[rdoc-ref:String@Converting+to+New+String].
diff --git a/doc/string/delete_suffix.rdoc b/doc/string/delete_suffix.rdoc
index 4862b725cfc646..2fb70ce012aabc 100644
--- a/doc/string/delete_suffix.rdoc
+++ b/doc/string/delete_suffix.rdoc
@@ -1,8 +1,11 @@
 Returns a copy of +self+ with trailing substring <tt>suffix</tt> removed:
 
-  'hello'.delete_suffix('llo')      # => "he"
-  'hello'.delete_suffix('hel')      # => "hello"
-  'тест'.delete_suffix('ст')        # => "те"
+  'foo'.delete_suffix('o')           # => "fo"
+  'foo'.delete_suffix('oo')          # => "f"
+  'foo'.delete_suffix('foo')         # => ""
+  'foo'.delete_suffix('f')           # => "foo"
+  'foo'.delete_suffix('x')           # => "foo"
+  'тест'.delete_suffix('ст')         # => "те"
   'こんにちは'.delete_suffix('ちは')  # => "こんに"
 
-Related: String#delete_suffix!, String#delete_prefix.
+Related: see {Converting to New String}[rdoc-ref:String@Converting+to+New+String].
diff --git a/doc/string/new.rdoc b/doc/string/new.rdoc
index d955e61c8737a9..e2752d6e1fd16a 100644
--- a/doc/string/new.rdoc
+++ b/doc/string/new.rdoc
@@ -1,34 +1,38 @@
-Returns a new \String that is a copy of +string+.
+Returns a new \String object containing the given +string+.
 
-With no arguments, returns the empty string with the Encoding <tt>ASCII-8BIT</tt>:
+The +options+ are optional keyword options (see below).
 
-  s = String.new
-  s # => ""
-  s.encoding # => #<Encoding:ASCII-8BIT>
+With no argument given and keyword +encoding+ also not given,
+returns an empty string with the Encoding <tt>ASCII-8BIT</tt>:
 
-With optional argument +string+ and no keyword arguments,
-returns a copy of +string+ with the same encoding:
+  s = String.new # => ""
+  s.encoding     # => #<Encoding:ASCII-8BIT>
 
-  String.new('foo')               # => "foo"
-  String.new('тест')              # => "тест"
-  String.new('こんにちは')          # => "こんにちは"
+With argument +string+ given and keyword option +encoding+ not given,
+returns a new string with the same encoding as +string+:
+
+  s0 = 'foo'.encode(Encoding::UTF_16)
+  s1 = String.new(s0)
+  s1.encoding # => #<Encoding:UTF-16 (dummy)>
 
 (Unlike \String.new,
 a {string literal}[rdoc-ref:syntax/literals.rdoc@String+Literals] like <tt>''</tt> or a
 {here document literal}[rdoc-ref:syntax/literals.rdoc@Here+Document+Literals]
 always has {script encoding}[rdoc-ref:encodings.rdoc@Script+Encoding].)
 
-With optional keyword argument +encoding+, returns a copy of +string+
-with the specified encoding;
+With keyword option +encoding+ given,
+returns a string with the specified encoding;
 the +encoding+ may be an Encoding object, an encoding name,
 or an encoding name alias:
 
+  String.new(encoding: Encoding::US_ASCII).encoding        # => #<Encoding:US-ASCII>
+  String.new('', encoding: Encoding::US_ASCII).encoding    # => #<Encoding:US-ASCII>
   String.new('foo', encoding: Encoding::US_ASCII).encoding # => #<Encoding:US-ASCII>
   String.new('foo', encoding: 'US-ASCII').encoding         # => #<Encoding:US-ASCII>
   String.new('foo', encoding: 'ASCII').encoding            # => #<Encoding:US-ASCII>
 
 The given encoding need not be valid for the string's content,
-and that validity is not checked:
+and its validity is not checked:
 
   s = String.new('こんにちは', encoding: 'ascii')
   s.valid_encoding? # => false
@@ -37,15 +41,11 @@ But the given +encoding+ itself is checked:
 
   String.new('foo', encoding: 'bar') # Raises ArgumentError.
 
-With optional keyword argument +capacity+, returns a copy of +string+
-(or an empty string, if +string+ is not given);
-the given +capacity+ is advisory only,
+With keyword option +capacity+ given,
+the given value is advisory only,
 and may or may not set the size of the internal buffer,
 which may in turn affect performance:
 
-  String.new(capacity: 1)
-  String.new('foo', capacity: 4096)
-
-The +string+, +encoding+, and +capacity+ arguments may all be used together:
-
-  String.new('hello', encoding: 'UTF-8', capacity: 25)
+  String.new('foo', capacity: 1)    # Buffer size is at least 4 (includes terminal null byte).
+  String.new('foo', capacity: 4096) # Buffer size is at least 4;
+                                    # may be equal to, greater than, or less than 4096.
diff --git a/doc/string/split.rdoc b/doc/string/split.rdoc
index 2b5e14ddb699db..131c14b83fcbda 100644
--- a/doc/string/split.rdoc
+++ b/doc/string/split.rdoc
@@ -9,37 +9,37 @@ When +field_sep+ is <tt>$;</tt>:
   (see below).
 
 - If <tt>$;</tt> is a string,
-  the split ocurs just as if +field_sep+ were given as that string
+  the split occurs just as if +field_sep+ were given as that string
   (see below).
 
-When +field_sep+ is <tt>' '</tt> and +limit+ is +nil+,
+When +field_sep+ is <tt>' '</tt> and +limit+ is +0+ (its default value),
 the split occurs at each sequence of whitespace:
 
-  'abc def ghi'.split(' ')         => ["abc", "def", "ghi"]
+  'abc def ghi'.split(' ')          # => ["abc", "def", "ghi"]
   "abc \n\tdef\t\n  ghi".split(' ') # => ["abc", "def", "ghi"]
-  'abc  def   ghi'.split(' ')      => ["abc", "def", "ghi"]
-  ''.split(' ')                    => []
+  'abc  def   ghi'.split(' ')       # => ["abc", "def", "ghi"]
+  ''.split(' ')                     # => []
 
 When +field_sep+ is a string different from <tt>' '</tt>
-and +limit+ is +nil+,
+and +limit+ is +0+,
 the split occurs at each occurrence of +field_sep+;
 trailing empty substrings are not returned:
 
-  'abracadabra'.split('ab')  => ["", "racad", "ra"]
-  'aaabcdaaa'.split('a')     => ["", "", "", "bcd"]
-  ''.split('a')              => []
-  '3.14159'.split('1')       => ["3.", "4", "59"]
+  'abracadabra'.split('ab')   # => ["", "racad", "ra"]
+  'aaabcdaaa'.split('a')      # => ["", "", "", "bcd"]
+  ''.split('a')               # => []
+  '3.14159'.split('1')        # => ["3.", "4", "59"]
   '!@#$%^$&*($)_+'.split('$') # => ["!@#", "%^", "&*(", ")_+"]
-  'тест'.split('т')          => ["", "ес"]
-  'こんにちは'.split('に')     => ["こん", "ちは"]
+  'тест'.split('т')           # => ["", "ес"]
+  'こんにちは'.split('に')      # => ["こん", "ちは"]
 
-When +field_sep+ is a Regexp and +limit+ is +nil+,
+When +field_sep+ is a Regexp and +limit+ is +0+,
 the split occurs at each occurrence of a match;
 trailing empty substrings are not returned:
 
   'abracadabra'.split(/ab/) # => ["", "racad", "ra"]
-  'aaabcdaaa'.split(/a/)   => ["", "", "", "bcd"]
-  'aaabcdaaa'.split(//)    => ["a", "a", "a", "b", "c", "d", "a", "a", "a"]
+  'aaabcdaaa'.split(/a/)    # => ["", "", "", "bcd"]
+  'aaabcdaaa'.split(//)     # => ["a", "a", "a", "b", "c", "d", "a", "a", "a"]
   '1 + 1 == 2'.split(/\W+/) # => ["1", "1", "2"]
 
 If the \Regexp contains groups, their matches are also included
@@ -47,12 +47,10 @@ in the returned array:
 
   '1:2:3'.split(/(:)()()/, 2) # => ["1", ":", "", "", "2:3"]
 
-As seen above, if +limit+ is +nil+,
-trailing empty substrings are not returned;
-the same is true if +limit+ is zero:
+As seen above, if +limit+ is +0+,
+trailing empty substrings are not returned:
 
-  'aaabcdaaa'.split('a')   => ["", "", "", "bcd"]
-  'aaabcdaaa'.split('a', 0) # => ["", "", "", "bcd"]
+  'aaabcdaaa'.split('a')    # => ["", "", "", "bcd"]
 
 If +limit+ is positive integer +n+, no more than <tt>n - 1-</tt>
 splits occur, so that at most +n+ substrings are returned,
@@ -67,13 +65,13 @@ and trailing empty substrings are included:
 Note that if +field_sep+ is a \Regexp containing groups,
 their matches are in the returned array, but do not count toward the limit.
 
-If +limit+ is negative, it behaves the same as if +limit+ was +nil+,
+If +limit+ is negative, it behaves the same as if +limit+ was zero,
 meaning that there is no limit,
 and trailing empty substrings are included:
 
   'aaabcdaaa'.split('a', -1) # => ["", "", "", "bcd", "", "", ""]
 
-If a block is given, it is called with each substring:
+If a block is given, it is called with each substring and returns +self+:
 
   'abc def ghi'.split(' ') {|substring| p substring }
 
@@ -82,5 +80,20 @@ Output:
   "abc"
   "def"
   "ghi"
+  => "abc def ghi"
+
+Note that the above example is functionally the same as calling +#each+ after
++#split+ and giving the same block. However, the above example has better
+performance because it avoids the creation of an intermediate array. Also,
+note the different return values.
+
+  'abc def ghi'.split(' ').each {|substring| p substring }
+
+Output:
+
+  "abc"
+  "def"
+  "ghi"
+  => ["abc", "def", "ghi"]
 
 Related: String#partition, String#rpartition.
diff --git a/doc/strscan/helper_methods.md b/doc/strscan/helper_methods.md
new file mode 100644
index 00000000000000..9fb1d79bba91f7
--- /dev/null
+++ b/doc/strscan/helper_methods.md
@@ -0,0 +1,124 @@
+## Helper Methods
+
+These helper methods display values returned by scanner's methods.
+
+### `put_situation(scanner)`
+
+Display scanner's situation:
+
+- Byte position (`#pos`).
+- Character position (`#charpos`)
+- Target string (`#rest`) and size (`#rest_size`).
+
+```rb
+scanner = StringScanner.new('foobarbaz')
+scanner.scan(/foo/)
+put_situation(scanner)
+# Situation:
+#   pos:       3
+#   charpos:   3
+#   rest:      "barbaz"
+#   rest_size: 6
+```
+
+### `put_match_values(scanner)`
+
+Display the scanner's match values:
+
+```rb
+scanner = StringScanner.new('Fri Dec 12 1975 14:39')
+pattern = /(?<wday>\w+) (?<month>\w+) (?<day>\d+) /
+scanner.match?(pattern)
+put_match_values(scanner)
+# Basic match values:
+#   matched?:       true
+#   matched_size:   11
+#   pre_match:      ""
+#   matched  :      "Fri Dec 12 "
+#   post_match:     "1975 14:39"
+# Captured match values:
+#   size:           4
+#   captures:       ["Fri", "Dec", "12"]
+#   named_captures: {"wday"=>"Fri", "month"=>"Dec", "day"=>"12"}
+#   values_at:      ["Fri Dec 12 ", "Fri", "Dec", "12", nil]
+#   []:
+#     [0]:          "Fri Dec 12 "
+#     [1]:          "Fri"
+#     [2]:          "Dec"
+#     [3]:          "12"
+#     [4]:          nil
+```
+
+### `match_values_cleared?(scanner)`
+
+Returns whether the scanner's match values are all properly cleared:
+
+```rb
+scanner = StringScanner.new('foobarbaz')
+match_values_cleared?(scanner) # => true
+put_match_values(scanner)
+# Basic match values:
+#   matched?:       false
+#   matched_size:   nil
+#   pre_match:      nil
+#   matched  :      nil
+#   post_match:     nil
+# Captured match values:
+#   size:           nil
+#   captures:       nil
+#   named_captures: {}
+#   values_at:      nil
+#   [0]:            nil
+scanner.scan(/foo/)
+match_values_cleared?(scanner) # => false
+```
+
+## The Code
+
+```rb
+def put_situation(scanner)
+  puts '# Situation:'
+  puts "#   pos:       #{scanner.pos}"
+  puts "#   charpos:   #{scanner.charpos}"
+  puts "#   rest:      #{scanner.rest.inspect}"
+  puts "#   rest_size: #{scanner.rest_size}"
+end
+
+def put_match_values(scanner)
+  puts '# Basic match values:'
+  puts "#   matched?:       #{scanner.matched?}"
+  value = scanner.matched_size || 'nil'
+  puts "#   matched_size:   #{value}"
+  puts "#   pre_match:      #{scanner.pre_match.inspect}"
+  puts "#   matched  :      #{scanner.matched.inspect}"
+  puts "#   post_match:     #{scanner.post_match.inspect}"
+  puts '# Captured match values:'
+  puts "#   size:           #{scanner.size}"
+  puts "#   captures:       #{scanner.captures}"
+  puts "#   named_captures: #{scanner.named_captures}"
+  if scanner.size.nil?
+    puts "#   values_at:      #{scanner.values_at(0)}"
+    puts "#   [0]:            #{scanner[0]}"
+  else
+    puts "#   values_at:      #{scanner.values_at(*(0..scanner.size))}"
+    puts "#   []:"
+    scanner.size.times do |i|
+      puts "#     [#{i}]:          #{scanner[i].inspect}"
+    end
+  end
+end
+
+def match_values_cleared?(scanner)
+  scanner.matched? == false &&
+    scanner.matched_size.nil? &&
+    scanner.matched.nil? &&
+    scanner.pre_match.nil? &&
+    scanner.post_match.nil? &&
+    scanner.size.nil? &&
+    scanner[0].nil? &&
+    scanner.captures.nil? &&
+    scanner.values_at(0..1).nil? &&
+    scanner.named_captures == {}
+end
+```
+
diff --git a/doc/strscan/link_refs.txt b/doc/strscan/link_refs.txt
new file mode 100644
index 00000000000000..19f6f7ce5c9533
--- /dev/null
+++ b/doc/strscan/link_refs.txt
@@ -0,0 +1,17 @@
+[1]: rdoc-ref:StringScanner@Stored+String
+[2]: rdoc-ref:StringScanner@Byte+Position+-28Position-29
+[3]: rdoc-ref:StringScanner@Target+Substring
+[4]: rdoc-ref:StringScanner@Setting+the+Target+Substring
+[5]: rdoc-ref:StringScanner@Traversing+the+Target+Substring
+[6]: https://docs.ruby-lang.org/en/master/Regexp.html
+[7]: rdoc-ref:StringScanner@Character+Position
+[8]: https://docs.ruby-lang.org/en/master/String.html#method-i-5B-5D
+[9]: rdoc-ref:StringScanner@Match+Values
+[10]: rdoc-ref:StringScanner@Fixed-Anchor+Property
+[11]: rdoc-ref:StringScanner@Positions
+[13]: rdoc-ref:StringScanner@Captured+Match+Values
+[14]: rdoc-ref:StringScanner@Querying+the+Target+Substring
+[15]: rdoc-ref:StringScanner@Searching+the+Target+Substring
+[16]: https://docs.ruby-lang.org/en/master/Regexp.html#class-Regexp-label-Groups+and+Captures
+[17]: rdoc-ref:StringScanner@Matching
+[18]: rdoc-ref:StringScanner@Basic+Match+Values
diff --git a/doc/strscan/methods/get_byte.md b/doc/strscan/methods/get_byte.md
new file mode 100644
index 00000000000000..3208d77158b342
--- /dev/null
+++ b/doc/strscan/methods/get_byte.md
@@ -0,0 +1,30 @@
+call-seq:
+  get_byte -> byte_as_character or nil
+
+Returns the next byte, if available:
+
+- If the [position][2]
+  is not at the end of the [stored string][1]:
+
+    - Returns the next byte.
+    - Increments the [byte position][2].
+    - Adjusts the [character position][7].
+
+    ```rb
+    scanner = StringScanner.new(HIRAGANA_TEXT)
+    # => #<StringScanner 0/15 @ "\xE3\x81\x93\xE3\x82...">
+    scanner.string                                   # => "こんにちは"
+    [scanner.get_byte, scanner.pos, scanner.charpos] # => ["\xE3", 1, 1]
+    [scanner.get_byte, scanner.pos, scanner.charpos] # => ["\x81", 2, 2]
+    [scanner.get_byte, scanner.pos, scanner.charpos] # => ["\x93", 3, 1]
+    [scanner.get_byte, scanner.pos, scanner.charpos] # => ["\xE3", 4, 2]
+    [scanner.get_byte, scanner.pos, scanner.charpos] # => ["\x82", 5, 3]
+    [scanner.get_byte, scanner.pos, scanner.charpos] # => ["\x93", 6, 2]
+    ```
+
+- Otherwise, returns `nil`, and does not change the positions.
+
+    ```rb
+    scanner.terminate
+    [scanner.get_byte, scanner.pos, scanner.charpos] # => [nil, 15, 5]
+    ```
diff --git a/doc/strscan/methods/get_charpos.md b/doc/strscan/methods/get_charpos.md
new file mode 100644
index 00000000000000..954fcf5b44e599
--- /dev/null
+++ b/doc/strscan/methods/get_charpos.md
@@ -0,0 +1,19 @@
+call-seq:
+  charpos -> character_position
+
+Returns the [character position][7] (initially zero),
+which may be different from the [byte position][2]
+given by method #pos:
+
+```rb
+scanner = StringScanner.new(HIRAGANA_TEXT)
+scanner.string # => "こんにちは"
+scanner.getch  # => "こ" # 3-byte character.
+scanner.getch  # => "ん" # 3-byte character.
+put_situation(scanner)
+# Situation:
+#   pos:       6
+#   charpos:   2
+#   rest:      "にちは"
+#   rest_size: 9
+```
diff --git a/doc/strscan/methods/get_pos.md b/doc/strscan/methods/get_pos.md
new file mode 100644
index 00000000000000..81bbb2345e9268
--- /dev/null
+++ b/doc/strscan/methods/get_pos.md
@@ -0,0 +1,14 @@
+call-seq:
+  pos -> byte_position
+
+Returns the integer [byte position][2],
+which may be different from the [character position][7]:
+
+```rb
+scanner = StringScanner.new(HIRAGANA_TEXT)
+scanner.string  # => "こんにちは"
+scanner.pos     # => 0
+scanner.getch   # => "こ" # 3-byte character.
+scanner.charpos # => 1
+scanner.pos     # => 3
+```
diff --git a/doc/strscan/methods/getch.md b/doc/strscan/methods/getch.md
new file mode 100644
index 00000000000000..3dd70e4c5be04a
--- /dev/null
+++ b/doc/strscan/methods/getch.md
@@ -0,0 +1,43 @@
+call-seq:
+  getch -> character or nil
+
+Returns the next (possibly multibyte) character,
+if available:
+
+- If the [position][2]
+  is at the beginning of a character:
+
+    - Returns the character.
+    - Increments the [character position][7] by 1.
+    - Increments the [byte position][2]
+      by the size (in bytes) of the character.
+
+    ```rb
+    scanner = StringScanner.new(HIRAGANA_TEXT)
+    scanner.string                                # => "こんにちは"
+    [scanner.getch, scanner.pos, scanner.charpos] # => ["こ", 3, 1]
+    [scanner.getch, scanner.pos, scanner.charpos] # => ["ん", 6, 2]
+    [scanner.getch, scanner.pos, scanner.charpos] # => ["に", 9, 3]
+    [scanner.getch, scanner.pos, scanner.charpos] # => ["ち", 12, 4]
+    [scanner.getch, scanner.pos, scanner.charpos] # => ["は", 15, 5]
+    [scanner.getch, scanner.pos, scanner.charpos] # => [nil, 15, 5]
+    ```
+
+- If the [position][2] is within a multi-byte character
+  (that is, not at its beginning),
+  behaves like #get_byte (returns a 1-byte character):
+
+    ```rb
+    scanner.pos = 1
+    [scanner.getch, scanner.pos, scanner.charpos] # => ["\x81", 2, 2]
+    [scanner.getch, scanner.pos, scanner.charpos] # => ["\x93", 3, 1]
+    [scanner.getch, scanner.pos, scanner.charpos] # => ["ん", 6, 2]
+    ```
+
+- If the [position][2] is at the end of the [stored string][1],
+  returns `nil` and does not modify the positions:
+
+    ```rb
+    scanner.terminate
+    [scanner.getch, scanner.pos, scanner.charpos] # => [nil, 15, 5]
+    ```
diff --git a/doc/strscan/methods/scan.md b/doc/strscan/methods/scan.md
new file mode 100644
index 00000000000000..22ddd368b6f324
--- /dev/null
+++ b/doc/strscan/methods/scan.md
@@ -0,0 +1,51 @@
+call-seq:
+  scan(pattern) -> substring or nil
+
+Attempts to [match][17] the given `pattern`
+at the beginning of the [target substring][3].
+
+If the match succeeds:
+
+- Returns the matched substring.
+- Increments the [byte position][2] by <tt>substring.bytesize</tt>,
+  and may increment the [character position][7].
+- Sets [match values][9].
+
+```rb
+scanner = StringScanner.new(HIRAGANA_TEXT)
+scanner.string     # => "こんにちは"
+scanner.pos = 6
+scanner.scan(/に/) # => "に"
+put_match_values(scanner)
+# Basic match values:
+#   matched?:       true
+#   matched_size:   3
+#   pre_match:      "こん"
+#   matched  :      "に"
+#   post_match:     "ちは"
+# Captured match values:
+#   size:           1
+#   captures:       []
+#   named_captures: {}
+#   values_at:      ["に", nil]
+#   []:
+#     [0]:          "に"
+#     [1]:          nil
+put_situation(scanner)
+# Situation:
+#   pos:       9
+#   charpos:   3
+#   rest:      "ちは"
+#   rest_size: 6
+```
+
+If the match fails:
+
+- Returns `nil`.
+- Does not increment byte and character positions.
+- Clears match values.
+
+```rb
+scanner.scan(/nope/)           # => nil
+match_values_cleared?(scanner) # => true
+```
diff --git a/doc/strscan/methods/scan_until.md b/doc/strscan/methods/scan_until.md
new file mode 100644
index 00000000000000..9a8c7c02f68336
--- /dev/null
+++ b/doc/strscan/methods/scan_until.md
@@ -0,0 +1,52 @@
+call-seq:
+  scan_until(pattern) -> substring or nil
+
+Attempts to [match][17] the given `pattern`
+anywhere (at any [position][2]) in the [target substring][3].
+
+If the match attempt succeeds:
+
+- Sets [match values][9].
+- Sets the [byte position][2] to the end of the matched substring;
+  may adjust the [character position][7].
+- Returns the matched substring.
+
+
+```rb
+scanner = StringScanner.new(HIRAGANA_TEXT)
+scanner.string           # => "こんにちは"
+scanner.pos = 6
+scanner.scan_until(/ち/) # => "にち"
+put_match_values(scanner)
+# Basic match values:
+#   matched?:       true
+#   matched_size:   3
+#   pre_match:      "こんに"
+#   matched  :      "ち"
+#   post_match:     "は"
+# Captured match values:
+#   size:           1
+#   captures:       []
+#   named_captures: {}
+#   values_at:      ["ち", nil]
+#   []:
+#     [0]:          "ち"
+#     [1]:          nil
+put_situation(scanner)
+# Situation:
+#   pos:       12
+#   charpos:   4
+#   rest:      "は"
+#   rest_size: 3
+```
+
+If the match attempt fails:
+
+- Clears match data.
+- Returns `nil`.
+- Does not update positions.
+
+```rb
+scanner.scan_until(/nope/)     # => nil
+match_values_cleared?(scanner) # => true
+```
diff --git a/doc/strscan/methods/set_pos.md b/doc/strscan/methods/set_pos.md
new file mode 100644
index 00000000000000..3b7abe65e3379a
--- /dev/null
+++ b/doc/strscan/methods/set_pos.md
@@ -0,0 +1,27 @@
+call-seq:
+  pos = n -> n
+  pointer = n -> n
+
+Sets the [byte position][2] and the [character position][11];
+returns `n`.
+
+Does not affect [match values][9].
+
+For non-negative `n`, sets the position to `n`:
+
+```rb
+scanner = StringScanner.new(HIRAGANA_TEXT)
+scanner.string  # => "こんにちは"
+scanner.pos = 3 # => 3
+scanner.rest    # => "んにちは"
+scanner.charpos # => 1
+```
+
+For negative `n`, counts from the end of the [stored string][1]:
+
+```rb
+scanner.pos = -9 # => -9
+scanner.pos      # => 6
+scanner.rest     # => "にちは"
+scanner.charpos  # => 2
+```
diff --git a/doc/strscan/methods/skip.md b/doc/strscan/methods/skip.md
new file mode 100644
index 00000000000000..10a329e0e42f93
--- /dev/null
+++ b/doc/strscan/methods/skip.md
@@ -0,0 +1,43 @@
+call-seq:
+  skip(pattern) match_size or nil
+
+Attempts to [match][17] the given `pattern`
+at the beginning of the [target substring][3];
+
+If the match succeeds:
+
+- Increments the [byte position][2] by substring.bytesize,
+  and may increment the [character position][7].
+- Sets [match values][9].
+- Returns the size (bytes) of the matched substring.
+
+```rb
+scanner = StringScanner.new(HIRAGANA_TEXT)
+scanner.string                  # => "こんにちは"
+scanner.pos = 6
+scanner.skip(/に/)              # => 3
+put_match_values(scanner)
+# Basic match values:
+#   matched?:       true
+#   matched_size:   3
+#   pre_match:      "こん"
+#   matched  :      "に"
+#   post_match:     "ちは"
+# Captured match values:
+#   size:           1
+#   captures:       []
+#   named_captures: {}
+#   values_at:      ["に", nil]
+#   []:
+#     [0]:          "に"
+#     [1]:          nil
+put_situation(scanner)
+# Situation:
+#   pos:       9
+#   charpos:   3
+#   rest:      "ちは"
+#   rest_size: 6
+
+scanner.skip(/nope/)            # => nil
+match_values_cleared?(scanner)  # => true
+```
diff --git a/doc/strscan/methods/skip_until.md b/doc/strscan/methods/skip_until.md
new file mode 100644
index 00000000000000..b7dacf6da1ee13
--- /dev/null
+++ b/doc/strscan/methods/skip_until.md
@@ -0,0 +1,49 @@
+call-seq:
+  skip_until(pattern) -> matched_substring_size or nil
+
+Attempts to [match][17] the given `pattern`
+anywhere (at any [position][2]) in the [target substring][3];
+does not modify the positions.
+
+If the match attempt succeeds:
+
+- Sets [match values][9].
+- Returns the size of the matched substring.
+
+```rb
+scanner = StringScanner.new(HIRAGANA_TEXT)
+scanner.string           # => "こんにちは"
+scanner.pos = 6
+scanner.skip_until(/ち/) # => 6
+put_match_values(scanner)
+# Basic match values:
+#   matched?:       true
+#   matched_size:   3
+#   pre_match:      "こんに"
+#   matched  :      "ち"
+#   post_match:     "は"
+# Captured match values:
+#   size:           1
+#   captures:       []
+#   named_captures: {}
+#   values_at:      ["ち", nil]
+#   []:
+#     [0]:          "ち"
+#     [1]:          nil
+put_situation(scanner)
+# Situation:
+#   pos:       12
+#   charpos:   4
+#   rest:      "は"
+#   rest_size: 3
+```
+
+If the match attempt fails:
+
+- Clears match values.
+- Returns `nil`.
+
+```rb
+scanner.skip_until(/nope/)     # => nil
+match_values_cleared?(scanner) # => true
+```
diff --git a/doc/strscan/methods/terminate.md b/doc/strscan/methods/terminate.md
new file mode 100644
index 00000000000000..b03b37d2a289ab
--- /dev/null
+++ b/doc/strscan/methods/terminate.md
@@ -0,0 +1,30 @@
+call-seq:
+  terminate -> self
+
+Sets the scanner to end-of-string;
+returns +self+:
+
+- Sets both [positions][11] to end-of-stream.
+- Clears [match values][9].
+
+```rb
+scanner = StringScanner.new(HIRAGANA_TEXT)
+scanner.string                 # => "こんにちは"
+scanner.scan_until(/に/)
+put_situation(scanner)
+# Situation:
+#   pos:       9
+#   charpos:   3
+#   rest:      "ちは"
+#   rest_size: 6
+match_values_cleared?(scanner) # => false
+
+scanner.terminate              # => #<StringScanner fin>
+put_situation(scanner)
+# Situation:
+#   pos:       15
+#   charpos:   5
+#   rest:      ""
+#   rest_size: 0
+match_values_cleared?(scanner) # => true
+```
diff --git a/doc/strscan/strscan.md b/doc/strscan/strscan.md
new file mode 100644
index 00000000000000..1211a687c271a8
--- /dev/null
+++ b/doc/strscan/strscan.md
@@ -0,0 +1,544 @@
+\Class `StringScanner` supports processing a stored string as a stream;
+this code creates a new `StringScanner` object with string `'foobarbaz'`:
+
+```rb
+require 'strscan'
+scanner = StringScanner.new('foobarbaz')
+```
+
+## About the Examples
+
+All examples here assume that `StringScanner` has been required:
+
+```rb
+require 'strscan'
+```
+
+Some examples here assume that these constants are defined:
+
+```rb
+MULTILINE_TEXT = <<~EOT
+Go placidly amid the noise and haste,
+and remember what peace there may be in silence.
+EOT
+
+HIRAGANA_TEXT = 'こんにちは'
+
+ENGLISH_TEXT = 'Hello'
+```
+
+Some examples here assume that certain helper methods are defined:
+
+- `put_situation(scanner)`:
+  Displays the values of the scanner's
+  methods #pos, #charpos, #rest, and #rest_size.
+- `put_match_values(scanner)`:
+  Displays the scanner's [match values][9].
+- `match_values_cleared?(scanner)`:
+  Returns whether the scanner's [match values][9] are cleared.
+
+See examples [here][ext/strscan/helper_methods_md.html].
+
+## The `StringScanner` \Object
+
+This code creates a `StringScanner` object
+(we'll call it simply a _scanner_),
+and shows some of its basic properties:
+
+```rb
+scanner = StringScanner.new('foobarbaz')
+scanner.string # => "foobarbaz"
+put_situation(scanner)
+# Situation:
+#   pos:       0
+#   charpos:   0
+#   rest:      "foobarbaz"
+#   rest_size: 9
+```
+
+The scanner has:
+
+* A <i>stored string</i>, which is:
+
+    * Initially set by StringScanner.new(string) to the given `string`
+      (`'foobarbaz'` in the example above).
+    * Modifiable by methods #string=(new_string) and #concat(more_string).
+    * Returned by method #string.
+
+    More at [Stored String][1] below.
+
+* A _position_;
+  a zero-based index into the bytes of the stored string (_not_ into its characters):
+
+    * Initially set by StringScanner.new to `0`.
+    * Returned by method #pos.
+    * Modifiable explicitly by methods #reset, #terminate, and #pos=(new_pos).
+    * Modifiable implicitly (various traversing methods, among others).
+
+    More at [Byte Position][2] below.
+
+* A <i>target substring</i>,
+  which is a trailing substring of the stored string;
+  it extends from the current position to the end of the stored string:
+
+    * Initially set by StringScanner.new(string) to the given `string`
+      (`'foobarbaz'` in the example above).
+    * Returned by method #rest.
+    * Modified by any modification to either the stored string or the position.
+
+    <b>Most importantly</b>:
+    the searching and traversing methods operate on the target substring,
+    which may be (and often is) less than the entire stored string.
+
+    More at [Target Substring][3] below.
+
+## Stored \String
+
+The <i>stored string</i> is the string stored in the `StringScanner` object.
+
+Each of these methods sets, modifies, or returns the stored string:
+
+| Method               | Effect                                          |
+|----------------------|-------------------------------------------------|
+| ::new(string)        | Creates a new scanner for the given string.     |
+| #string=(new_string) | Replaces the existing stored string.            |
+| #concat(more_string) | Appends a string to the existing stored string. |
+| #string              | Returns the stored string.                      |
+
+## Positions
+
+A `StringScanner` object maintains a zero-based <i>byte position</i>
+and a zero-based <i>character position</i>.
+
+Each of these methods explicitly sets positions:
+
+| Method                   | Effect                                                    |
+|--------------------------|-----------------------------------------------------------|
+| #reset                   | Sets both positions to zero (beginning of stored string). |
+| #terminate               | Sets both positions to the end of the stored string.      |
+| #pos=(new_byte_position) | Sets byte position; adjusts character position.           |
+
+### Byte Position (Position)
+
+The byte position (or simply _position_)
+is a zero-based index into the bytes in the scanner's stored string;
+for a new `StringScanner` object, the byte position is zero.
+
+When the byte position is:
+
+* Zero (at the beginning), the target substring is the entire stored string.
+* Equal to the size of the stored string (at the end),
+  the target substring is the empty string `''`.
+
+To get or set the byte position:
+
+* \#pos: returns the byte position.
+* \#pos=(new_pos): sets the byte position.
+
+Many methods use the byte position as the basis for finding matches;
+many others set, increment, or decrement the byte position:
+
+```rb
+scanner = StringScanner.new('foobar')
+scanner.pos # => 0
+scanner.scan(/foo/) # => "foo" # Match found.
+scanner.pos         # => 3     # Byte position incremented.
+scanner.scan(/foo/) # => nil   # Match not found.
+scanner.pos # => 3             # Byte position not changed.
+```
+
+Some methods implicitly modify the byte position;
+see:
+
+* [Setting the Target Substring][4].
+* [Traversing the Target Substring][5].
+
+The values of these methods are derived directly from the values of #pos and #string:
+
+- \#charpos: the [character position][7].
+- \#rest: the [target substring][3].
+- \#rest_size: `rest.size`.
+
+### Character Position
+
+The character position is a zero-based index into the _characters_
+in the stored string;
+for a new `StringScanner` object, the character position is zero.
+
+\Method #charpos returns the character position;
+its value may not be reset explicitly.
+
+Some methods change (increment or reset) the character position;
+see:
+
+* [Setting the Target Substring][4].
+* [Traversing the Target Substring][5].
+
+Example (string includes multi-byte characters):
+
+```rb
+scanner = StringScanner.new(ENGLISH_TEXT) # Five 1-byte characters.
+scanner.concat(HIRAGANA_TEXT)             # Five 3-byte characters
+scanner.string # => "Helloこんにちは"       # Twenty bytes in all.
+put_situation(scanner)
+# Situation:
+#   pos:       0
+#   charpos:   0
+#   rest:      "Helloこんにちは"
+#   rest_size: 20
+scanner.scan(/Hello/) # => "Hello" # Five 1-byte characters.
+put_situation(scanner)
+# Situation:
+#   pos:       5
+#   charpos:   5
+#   rest:      "こんにちは"
+#   rest_size: 15
+scanner.getch         # => "こ"    # One 3-byte character.
+put_situation(scanner)
+# Situation:
+#   pos:       8
+#   charpos:   6
+#   rest:      "んにちは"
+#   rest_size: 12
+```
+
+## Target Substring
+
+The target substring is the the part of the [stored string][1]
+that extends from the current [byte position][2] to the end of the stored string;
+it is always either:
+
+- The entire stored string (byte position is zero).
+- A trailing substring of the stored string (byte position positive).
+
+The target substring is returned by method #rest,
+and its size is returned by method #rest_size.
+
+Examples:
+
+```rb
+scanner = StringScanner.new('foobarbaz')
+put_situation(scanner)
+# Situation:
+#   pos:       0
+#   charpos:   0
+#   rest:      "foobarbaz"
+#   rest_size: 9
+scanner.pos = 3
+put_situation(scanner)
+# Situation:
+#   pos:       3
+#   charpos:   3
+#   rest:      "barbaz"
+#   rest_size: 6
+scanner.pos = 9
+put_situation(scanner)
+# Situation:
+#   pos:       9
+#   charpos:   9
+#   rest:      ""
+#   rest_size: 0
+```
+
+### Setting the Target Substring
+
+The target substring is set whenever:
+
+* The [stored string][1] is set (position reset to zero; target substring set to stored string).
+* The [byte position][2] is set (target substring adjusted accordingly).
+
+### Querying the Target Substring
+
+This table summarizes (details and examples at the links):
+
+| Method     | Returns                           |
+|------------|-----------------------------------|
+| #rest      | Target substring.                 |
+| #rest_size | Size (bytes) of target substring. |
+
+### Searching the Target Substring
+
+A _search_ method examines the target substring,
+but does not advance the [positions][11]
+or (by implication) shorten the target substring.
+
+This table summarizes (details and examples at the links):
+
+| Method                | Returns                                       | Sets Match Values? |
+|-----------------------|-----------------------------------------------|--------------------|
+| #check(pattern)       | Matched leading substring or +nil+.           | Yes.               |
+| #check_until(pattern) | Matched substring (anywhere) or +nil+.        | Yes.               |
+| #exist?(pattern)      | Matched substring (anywhere) end index.       | Yes.               |
+| #match?(pattern)      | Size of matched leading substring or +nil+.   | Yes.               |
+| #peek(size)           | Leading substring of given length (bytes).    | No.                |
+| #peek_byte            | Integer leading byte or +nil+.                | No.                |
+| #rest                 | Target substring (from byte position to end). | No.                |
+
+### Traversing the Target Substring
+
+A _traversal_ method examines the target substring,
+and, if successful:
+
+- Advances the [positions][11].
+- Shortens the target substring.
+
+
+This table summarizes (details and examples at links):
+
+| Method               | Returns                                              | Sets Match Values? |
+|----------------------|------------------------------------------------------|--------------------|
+| #get_byte            | Leading byte or +nil+.                               | No.                |
+| #getch               | Leading character or +nil+.                          | No.                |
+| #scan(pattern)       | Matched leading substring or +nil+.                  | Yes.               |
+| #scan_byte           | Integer leading byte or +nil+.                       | No.                |
+| #scan_until(pattern) | Matched substring (anywhere) or +nil+.               | Yes.               |
+| #skip(pattern)       | Matched leading substring size or +nil+.             | Yes.               |
+| #skip_until(pattern) | Position delta to end-of-matched-substring or +nil+. | Yes.               |
+| #unscan              | +self+.                                              | No.                |
+
+## Querying the Scanner
+
+Each of these methods queries the scanner object
+without modifying it (details and examples at links)
+
+| Method              | Returns                          |
+|---------------------|----------------------------------|
+| #beginning_of_line? | +true+ or +false+.               |
+| #charpos            | Character position.              |
+| #eos?               | +true+ or +false+.               |
+| #fixed_anchor?      | +true+ or +false+.               |
+| #inspect            | String representation of +self+. |
+| #pos                | Byte position.                   |
+| #rest               | Target substring.                |
+| #rest_size          | Size of target substring.        |
+| #string             | Stored string.                   |
+
+## Matching
+
+`StringScanner` implements pattern matching via Ruby class [Regexp][6],
+and its matching behaviors are the same as Ruby's
+except for the [fixed-anchor property][10].
+
+### Matcher Methods
+
+Each <i>matcher method</i> takes a single argument `pattern`,
+and attempts to find a matching substring in the [target substring][3].
+
+| Method       | Pattern Type      | Matches Target Substring | Success Return     | May Update Positions? |
+|--------------|-------------------|--------------------------|--------------------|-----------------------|
+| #check       | Regexp or String. | At beginning.            | Matched substring. | No.                   |
+| #check_until | Regexp or String. | Anywhere.                | Substring.         | No.                   |
+| #match?      | Regexp or String. | At beginning.            | Match size.        | No.                   |
+| #exist?      | Regexp or String. | Anywhere.                | Substring size.    | No.                   |
+| #scan        | Regexp or String. | At beginning.            | Matched substring. | Yes.                  |
+| #scan_until  | Regexp or String. | Anywhere.                | Substring.         | Yes.                  |
+| #skip        | Regexp or String. | At beginning.            | Match size.        | Yes.                  |
+| #skip_until  | Regexp or String. | Anywhere.                | Substring size.    | Yes.                  |
+
+<br>
+
+Which matcher you choose will depend on:
+
+- Where you want to find a match:
+
+    - Only at the beginning of the target substring:
+      #check, #match?, #scan, #skip.
+    - Anywhere in the target substring:
+      #check_until, #exist?, #scan_until, #skip_until.
+
+- Whether you want to:
+
+    - Traverse, by advancing the positions:
+      #scan, #scan_until, #skip, #skip_until.
+    - Keep the positions unchanged:
+      #check, #check_until, #match?, #exist?.
+
+- What you want for the return value:
+
+    - The matched substring: #check, #scan.
+    - The substring: #check_until, #scan_until.
+    - The match size: #match?, #skip.
+    - The substring size: #exist?, #skip_until.
+
+### Match Values
+
+The <i>match values</i> in a `StringScanner` object
+generally contain the results of the most recent attempted match.
+
+Each match value may be thought of as:
+
+* _Clear_: Initially, or after an unsuccessful match attempt:
+  usually, `false`, `nil`, or `{}`.
+* _Set_: After a successful match attempt:
+  `true`, string, array, or hash.
+
+Each of these methods clears match values:
+
+- ::new(string).
+- \#reset.
+- \#terminate.
+
+Each of these methods attempts a match based on a pattern,
+and either sets match values (if successful) or clears them (if not);
+
+- \#check(pattern)
+- \#check_until(pattern)
+- \#exist?(pattern)
+- \#match?(pattern)
+- \#scan(pattern)
+- \#scan_until(pattern)
+- \#skip(pattern)
+- \#skip_until(pattern)
+
+#### Basic Match Values
+
+Basic match values are those not related to captures.
+
+Each of these methods returns a basic match value:
+
+| Method          | Return After Match                     | Return After No Match |
+|-----------------|----------------------------------------|-----------------------|
+| #matched?       | +true+.                                | +false+.              |
+| #matched_size   | Size of matched substring.             | +nil+.                |
+| #matched        | Matched substring.                     | +nil+.                |
+| #pre_match      | Substring preceding matched substring. | +nil+.                |
+| #post_match     | Substring following matched substring. | +nil+.                |
+
+<br>
+
+See examples below.
+
+#### Captured Match Values
+
+Captured match values are those related to [captures][16].
+
+Each of these methods returns a captured match value:
+
+| Method          | Return After Match                      | Return After No Match |
+|-----------------|-----------------------------------------|-----------------------|
+| #size           | Count of captured substrings.           | +nil+.                |
+| #[](n)          | <tt>n</tt>th captured substring.        | +nil+.                |
+| #captures       | Array of all captured substrings.       | +nil+.                |
+| #values_at(*n)  | Array of specified captured substrings. | +nil+.                |
+| #named_captures | Hash of named captures.                 | <tt>{}</tt>.          |
+
+<br>
+
+See examples below.
+
+#### Match Values Examples
+
+Successful basic match attempt (no captures):
+
+```rb
+scanner = StringScanner.new('foobarbaz')
+scanner.exist?(/bar/)
+put_match_values(scanner)
+# Basic match values:
+#   matched?:       true
+#   matched_size:   3
+#   pre_match:      "foo"
+#   matched  :      "bar"
+#   post_match:     "baz"
+# Captured match values:
+#   size:           1
+#   captures:       []
+#   named_captures: {}
+#   values_at:      ["bar", nil]
+#   []:
+#     [0]:          "bar"
+#     [1]:          nil
+```
+
+Failed basic match attempt (no captures);
+
+```rb
+scanner = StringScanner.new('foobarbaz')
+scanner.exist?(/nope/)
+match_values_cleared?(scanner) # => true
+```
+
+Successful unnamed capture match attempt:
+
+```rb
+scanner = StringScanner.new('foobarbazbatbam')
+scanner.exist?(/(foo)bar(baz)bat(bam)/)
+put_match_values(scanner)
+# Basic match values:
+#   matched?:       true
+#   matched_size:   15
+#   pre_match:      ""
+#   matched  :      "foobarbazbatbam"
+#   post_match:     ""
+# Captured match values:
+#   size:           4
+#   captures:       ["foo", "baz", "bam"]
+#   named_captures: {}
+#   values_at:      ["foobarbazbatbam", "foo", "baz", "bam", nil]
+#   []:
+#     [0]:          "foobarbazbatbam"
+#     [1]:          "foo"
+#     [2]:          "baz"
+#     [3]:          "bam"
+#     [4]:          nil
+```
+
+Successful named capture match attempt;
+same as unnamed above, except for #named_captures:
+
+```rb
+scanner = StringScanner.new('foobarbazbatbam')
+scanner.exist?(/(?<x>foo)bar(?<y>baz)bat(?<z>bam)/)
+scanner.named_captures # => {"x"=>"foo", "y"=>"baz", "z"=>"bam"}
+```
+
+Failed unnamed capture match attempt:
+
+```rb
+scanner = StringScanner.new('somestring')
+scanner.exist?(/(foo)bar(baz)bat(bam)/)
+match_values_cleared?(scanner) # => true
+```
+
+Failed named capture match attempt;
+same as unnamed above, except for #named_captures:
+
+```rb
+scanner = StringScanner.new('somestring')
+scanner.exist?(/(?<x>foo)bar(?<y>baz)bat(?<z>bam)/)
+match_values_cleared?(scanner) # => false
+scanner.named_captures # => {"x"=>nil, "y"=>nil, "z"=>nil}
+```
+
+## Fixed-Anchor Property
+
+Pattern matching in `StringScanner` is the same as in Ruby's,
+except for its fixed-anchor property,
+which determines the meaning of `'\A'`:
+
+* `false` (the default): matches the current byte position.
+
+    ```rb
+    scanner = StringScanner.new('foobar')
+    scanner.scan(/\A./) # => "f"
+    scanner.scan(/\A./) # => "o"
+    scanner.scan(/\A./) # => "o"
+    scanner.scan(/\A./) # => "b"
+    ```
+
+* `true`: matches the beginning of the target substring;
+  never matches unless the byte position is zero:
+
+    ```rb
+    scanner = StringScanner.new('foobar', fixed_anchor: true)
+    scanner.scan(/\A./) # => "f"
+    scanner.scan(/\A./) # => nil
+    scanner.reset
+    scanner.scan(/\A./) # => "f"
+    ```
+
+The fixed-anchor property is set when the `StringScanner` object is created,
+and may not be modified
+(see StringScanner.new);
+method #fixed_anchor? returns the setting.
+
diff --git a/doc/syntax.rdoc b/doc/syntax.rdoc
index 5895673f36a8f9..cb427b6f0f03a2 100644
--- a/doc/syntax.rdoc
+++ b/doc/syntax.rdoc
@@ -12,7 +12,7 @@ Assignment[rdoc-ref:syntax/assignment.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
+  Structural pattern matching and variable binding syntax
 
 Methods[rdoc-ref:syntax/methods.rdoc] ::
   Method and method argument syntax
@@ -37,3 +37,6 @@ Miscellaneous[rdoc-ref:syntax/miscellaneous.rdoc] ::
 
 Comments[rdoc-ref:syntax/comments.rdoc] ::
   Line and block code comments
+
+Operators[rdoc-ref:syntax/operators.rdoc] ::
+  Operator method behaviors
diff --git a/doc/syntax/assignment.rdoc b/doc/syntax/assignment.rdoc
index e30cb35adf8e48..f45f5bc0ea9504 100644
--- a/doc/syntax/assignment.rdoc
+++ b/doc/syntax/assignment.rdoc
@@ -162,9 +162,7 @@ Here is an example of instance variable usage:
   p object1.value # prints "some value"
   p object2.value # prints "other value"
 
-An uninitialized instance variable has a value of +nil+.  If you run Ruby with
-warnings enabled, you will get a warning when accessing an uninitialized
-instance variable.
+An uninitialized instance variable has a value of +nil+.
 
 The +value+ method has access to the value set by the +initialize+ method, but
 only for the same object.
diff --git a/doc/syntax/calling_methods.rdoc b/doc/syntax/calling_methods.rdoc
index da061dbfdb4f92..bf5916e99aa071 100644
--- a/doc/syntax/calling_methods.rdoc
+++ b/doc/syntax/calling_methods.rdoc
@@ -30,7 +30,7 @@ NoMethodError.
 You may also use <code>::</code> to designate a receiver, but this is rarely
 used due to the potential for confusion with <code>::</code> for namespaces.
 
-=== Chaining \Method Calls
+=== Chaining Method Calls
 
 You can "chain" method calls by immediately following one method call with another.
 
@@ -210,7 +210,7 @@ definition.  If a keyword argument is given that the method did not list,
 and the method definition does not accept arbitrary keyword arguments, an
 ArgumentError will be raised.
 
-Keyword argument value can be omitted, meaning the value will be be fetched
+Keyword argument value can be omitted, meaning the value will be fetched
 from the context by the name of the key
 
   keyword1 = 'some value'
@@ -291,16 +291,16 @@ override local arguments outside the block in the caller's scope:
 This prints:
 
   hello main this is block
-  place is world
+  place is: world
 
 So the +place+ variable in the block is not the same +place+ variable as
 outside the block.  Removing <code>; place</code> from the block arguments
 gives this result:
 
   hello main this is block
-  place is block
+  place is: block
 
-=== Array to Arguments Conversion
+=== Unpacking Positional Arguments
 
 Given the following method:
 
@@ -322,17 +322,59 @@ Both are equivalent to:
 
   my_method(1, 2, 3)
 
-If the method accepts keyword arguments, the splat operator will convert a
-hash at the end of the array into keyword arguments:
+The <code>*</code> unpacking operator can be applied to any object, not only
+arrays. If the object responds to a <code>#to_a</code> method, this method
+is called, and is expected to return an Array, and elements of this array are passed
+as separate positional arguments:
 
-  def my_method(a, b, c: 3)
+  class Name
+    def initialize(name)
+      @name = name
+    end
+
+    def to_a = @name.split(' ')
   end
 
-  arguments = [1, 2, { c: 4 }]
-  my_method(*arguments)
+  name = Name.new('Jane Doe')
+  p(*name)
+  # prints separate values:
+  #   Jane
+  #   Doe
+
+If the object doesn't have a <code>#to_a</code> method, the object itself is passed
+as one argument:
+
+  class Name
+    def initialize(name)
+      @name = name
+    end
+  end
+
+  name = Name.new('Jane Doe')
+  p(*name)
+  # Prints the object itself:
+  #   #<Name:0x00007f9d07bca650 @name="Jane Doe">
 
-Note that this behavior is currently deprecated and will emit a warning.
-This behavior will be removed in Ruby 3.0.
+This allows to handle one or many arguments polymorphically. Note also that +nil+
+has NilClass#to_a defined to return an empty array, so conditional unpacking is
+possible:
+
+  my_method(*(some_arguments if some_condition?))
+
+If <code>#to_a</code> method exists and does not return an Array, it would be an
+error on unpacking:
+
+  class Name
+    def initialize(name)
+      @name = name
+    end
+
+    def to_a = @name
+  end
+
+  name = Name.new('Jane Doe')
+  p(*name)
+  #  can't convert Name to Array (Name#to_a gives String) (TypeError)
 
 You may also use the <code>**</code> (described next) to convert a Hash into
 keyword arguments.
@@ -341,12 +383,13 @@ If the number of objects in the Array do not match the number of arguments for
 the method, an ArgumentError will be raised.
 
 If the splat operator comes first in the call, parentheses must be used to
-avoid a warning:
+avoid an ambiguity of interpretation as an unpacking operator or multiplication
+operator. In this case, Ruby issues a warning in verbose mode:
 
-  my_method *arguments  # warning
+  my_method *arguments  # warning: '*' interpreted as argument prefix
   my_method(*arguments) # no warning
 
-=== Hash to Keyword Arguments Conversion
+=== Unpacking Keyword Arguments
 
 Given the following method:
 
@@ -368,6 +411,35 @@ Both are equivalent to:
 
   my_method(first: 3, second: 4, third: 5)
 
+The <code>**</code> unpacking operator can be applied to any object, not only
+hashes. If the object responds to a <code>#to_hash</code> method, this method
+is called, and is expected to return an Hash, and elements of this hash are passed
+as keyword arguments:
+
+  class Name
+    def initialize(name)
+      @name = name
+    end
+
+    def to_hash = {first: @name.split(' ').first, last: @name.split(' ').last}
+  end
+
+  name = Name.new('Jane Doe')
+  p(**name)
+  # Prints: {name: "Jane", last: "Doe"}
+
+Unlike <code>*</code> operator, <code>**</code> raises an error when used on an
+object that doesn't respond to <code>#to_hash</code>. The one exception is
++nil+, which doesn't explicitly define this method, but is still allowed to
+be used in <code>**</code> unpacking, not adding any keyword arguments.
+
+Again, this allows for conditional unpacking:
+
+  my_method(some: params, **(some_extra_params if pass_extra_params?))
+
+Like <code>*</code> operator, <code>**</code> raises an error when the object responds
+to <code>#to_hash</code>, but it doesn't return a Hash.
+
 If the method definition uses the keyword splat operator to
 gather arbitrary keyword arguments, they will not be gathered
 by <code>*</code>:
diff --git a/doc/syntax/control_expressions.rdoc b/doc/syntax/control_expressions.rdoc
index 5350585f15e99b..3de6cd293f55c8 100644
--- a/doc/syntax/control_expressions.rdoc
+++ b/doc/syntax/control_expressions.rdoc
@@ -189,7 +189,7 @@ The same is true for +unless+.
 The +case+ expression can be used in two ways.
 
 The most common way is to compare an object against multiple patterns.  The
-patterns are matched using the +===+ method which is aliased to +==+ on
+patterns are matched using the <tt>===</tt> method which is aliased to <tt>==</tt> on
 Object.  Other classes must override it to give meaningful behavior.  See
 Module#=== and Regexp#=== for examples.
 
@@ -255,7 +255,7 @@ 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
+Since Ruby 2.7, +case+ expressions also provide a more powerful
 pattern matching feature via the +in+ keyword:
 
   case {a: 1, b: 2, c: 3}
diff --git a/doc/syntax/exceptions.rdoc b/doc/syntax/exceptions.rdoc
index 31e2f0175c5f7e..cdf9d367a7eade 100644
--- a/doc/syntax/exceptions.rdoc
+++ b/doc/syntax/exceptions.rdoc
@@ -86,7 +86,7 @@ To always run some code whether an exception was raised or not, use +ensure+:
   rescue
     # ...
   ensure
-    # this always runs
+    # this always runs BUT does not implicitly return the last evaluated statement.
   end
 
 You may also run some code when an exception is not raised:
@@ -96,7 +96,11 @@ You may also run some code when an exception is not raised:
   rescue
     # ...
   else
-    # this runs only when no exception was raised
+    # this runs only when no exception was raised AND return the last evaluated statement
   ensure
-    # ...
+    # this always runs.
+    # It is evaluated after the evaluation of either the `rescue` or the `else` block.
+    # It will not return implicitly.
   end
+
+NB : Without explicit +return+ in the +ensure+ block, +begin+/+end+ block will return the last evaluated statement before entering in the +ensure+ block.
diff --git a/doc/keywords.rdoc b/doc/syntax/keywords.rdoc
similarity index 99%
rename from doc/keywords.rdoc
rename to doc/syntax/keywords.rdoc
index cb1cff33f0be87..7c368205efabba 100644
--- a/doc/keywords.rdoc
+++ b/doc/syntax/keywords.rdoc
@@ -1,4 +1,4 @@
-== Keywords
+= Keywords
 
 The following keywords are used by Ruby.
 
diff --git a/doc/syntax/literals.rdoc b/doc/syntax/literals.rdoc
index 0c1e4a434be6fb..46bb7673f3e040 100644
--- a/doc/syntax/literals.rdoc
+++ b/doc/syntax/literals.rdoc
@@ -136,9 +136,9 @@ Also \Rational numbers may be imaginary numbers.
 
   12.3ir      #=> Syntax error
 
-== Strings
+== \String Literals
 
-=== \String Literals
+=== Double-Quoted \String Literals
 
 The most common way of writing strings is using <tt>"</tt>:
 
@@ -150,35 +150,14 @@ Any internal <tt>"</tt> must be escaped:
 
   "This string has a quote: \".  As you can see, it is escaped"
 
-Double-quote strings allow escaped characters such as <tt>\n</tt> for
-newline, <tt>\t</tt> for tab, etc.  The full list of supported escape
-sequences are as follows:
+Double-quoted strings allow escape sequences described in
+{Escape Sequences}[#label-Escape+Sequences].
 
-  \a             bell, ASCII 07h (BEL)
-  \b             backspace, ASCII 08h (BS)
-  \t             horizontal tab, ASCII 09h (TAB)
-  \n             newline (line feed), ASCII 0Ah (LF)
-  \v             vertical tab, ASCII 0Bh (VT)
-  \f             form feed, ASCII 0Ch (FF)
-  \r             carriage return, ASCII 0Dh (CR)
-  \e             escape, ASCII 1Bh (ESC)
-  \s             space, ASCII 20h (SPC)
-  \\             backslash, \
-  \nnn           octal bit pattern, where nnn is 1-3 octal digits ([0-7])
-  \xnn           hexadecimal bit pattern, where nn is 1-2 hexadecimal digits ([0-9a-fA-F])
-  \unnnn         Unicode character, where nnnn is exactly 4 hexadecimal digits ([0-9a-fA-F])
-  \u{nnnn ...}   Unicode character(s), where each nnnn is 1-6 hexadecimal digits ([0-9a-fA-F])
-  \cx or \C-x    control character, where x is an ASCII printable character
-  \M-x           meta character, where x is an ASCII printable character
-  \M-\C-x        meta control character, where x is an ASCII printable character
-  \M-\cx         same as above
-  \c\M-x         same as above
-  \c? or \C-?    delete, ASCII 7Fh (DEL)
-
-Any other character following a backslash is interpreted as the
+In a double-quoted string,
+any other character following a backslash is interpreted as the
 character itself.
 
-Double-quote strings allow interpolation of other values using
+Double-quoted strings allow interpolation of other values using
 <tt>#{...}</tt>:
 
   "One plus one is two: #{1 + 1}"
@@ -190,8 +169,14 @@ You can also use <tt>#@foo</tt>, <tt>#@@foo</tt> and <tt>#$foo</tt> as a
 shorthand for, respectively, <tt>#{ @foo }</tt>, <tt>#{ @@foo }</tt> and
 <tt>#{ $foo }</tt>.
 
+See also:
+
+* {% and %Q: Interpolable String Literals}[#label-25+and+-25Q-3A+Interpolable+String+Literals]
+
+=== Single-Quoted \String Literals
+
 Interpolation may be disabled by escaping the "#" character or using
-single-quote strings:
+single-quoted strings:
 
   '#{1 + 1}' #=> "\#{1 + 1}"
 
@@ -199,6 +184,16 @@ In addition to disabling interpolation, single-quoted strings also disable all
 escape sequences except for the single-quote (<tt>\'</tt>) and backslash
 (<tt>\\\\</tt>).
 
+In a single-quoted string,
+any other character following a backslash is interpreted as is:
+a backslash and the character itself.
+
+See also:
+
+* {%q: Non-Interpolable String Literals}[#label-25q-3A+Non-Interpolable+String+Literals]
+
+=== Literal String Concatenation
+
 Adjacent string literals are automatically concatenated by the interpreter:
 
   "con" "cat" "en" "at" "ion" #=> "concatenation"
@@ -209,12 +204,14 @@ Any combination of adjacent single-quote, double-quote, percent strings will
 be concatenated as long as a percent-string is not last.
 
   %q{a} 'b' "c" #=> "abc"
-  "a" 'b' %q{c} #=> NameError: uninitialized constant q
+  "a" 'b' %q{c} #=> NoMethodError: undefined method 'q' for main
+
+=== Character Literal
 
 There is also a character literal notation to represent single
 character strings, which syntax is a question mark (<tt>?</tt>)
-followed by a single character or escape sequence that corresponds to
-a single codepoint in the script encoding:
+followed by a single character or escape sequence (except continuation line)
+that corresponds to a single codepoint in the script encoding:
 
   ?a       #=> "a"
   ?abc     #=> SyntaxError
@@ -228,10 +225,45 @@ a single codepoint in the script encoding:
   ?\C-\M-a #=> "\x81", same as above
   ?あ      #=> "あ"
 
-See also:
+=== Escape Sequences
 
-* {%q: Non-Interpolable String Literals}[#label-25q-3A+Non-Interpolable+String+Literals]
-* {% and %Q: Interpolable String Literals}[#label-25+and+-25Q-3A+Interpolable+String+Literals]
+Some characters can be represented as escape sequences in
+double-quoted strings,
+character literals,
+here document literals (non-quoted, double-quoted, and with backticks),
+double-quoted symbols,
+double-quoted symbol keys in Hash literals,
+Regexp literals, and
+several percent literals (<tt>%</tt>, <tt>%Q</tt>, <tt>%W</tt>, <tt>%I</tt>, <tt>%r</tt>, <tt>%x</tt>).
+
+They allow escape sequences such as <tt>\n</tt> for
+newline, <tt>\t</tt> for tab, etc.  The full list of supported escape
+sequences are as follows:
+
+  \a             bell, ASCII 07h (BEL)
+  \b             backspace, ASCII 08h (BS)
+  \t             horizontal tab, ASCII 09h (TAB)
+  \n             newline (line feed), ASCII 0Ah (LF)
+  \v             vertical tab, ASCII 0Bh (VT)
+  \f             form feed, ASCII 0Ch (FF)
+  \r             carriage return, ASCII 0Dh (CR)
+  \e             escape, ASCII 1Bh (ESC)
+  \s             space, ASCII 20h (SPC)
+  \\             backslash, \
+  \nnn           octal bit pattern, where nnn is 1-3 octal digits ([0-7])
+  \xnn           hexadecimal bit pattern, where nn is 1-2 hexadecimal digits ([0-9a-fA-F])
+  \unnnn         Unicode character, where nnnn is exactly 4 hexadecimal digits ([0-9a-fA-F])
+  \u{nnnn ...}   Unicode character(s), where each nnnn is 1-6 hexadecimal digits ([0-9a-fA-F])
+  \cx or \C-x    control character, where x is an ASCII printable character
+  \M-x           meta character, where x is an ASCII printable character
+  \M-\C-x        meta control character, where x is an ASCII printable character
+  \M-\cx         same as above
+  \c\M-x         same as above
+  \c? or \C-?    delete, ASCII 7Fh (DEL)
+  \<newline>     continuation line (empty string)
+
+The last one, <tt>\<newline></tt>, represents an empty string instead of a character.
+It is used to fold a line in a string.
 
 === Here Document Literals
 
@@ -283,9 +315,10 @@ its end is a multiple of eight.  The amount to be removed is counted in terms
 of the number of spaces.  If the boundary appears in the middle of a tab, that
 tab is not removed.
 
-A heredoc allows interpolation and escaped characters.  You may disable
-interpolation and escaping by surrounding the opening identifier with single
-quotes:
+A heredoc allows interpolation and the escape sequences described in
+{Escape Sequences}[#label-Escape+Sequences].
+You may disable interpolation and the escaping by surrounding the opening
+identifier with single quotes:
 
   expected_result = <<-'EXPECTED'
   One plus one is #{1 + 1}
@@ -326,12 +359,15 @@ details on what symbols are and when ruby creates them internally.
 
 You may reference a symbol using a colon: <tt>:my_symbol</tt>.
 
-You may also create symbols by interpolation:
+You may also create symbols by interpolation and escape sequences described in
+{Escape Sequences}[#label-Escape+Sequences] with double-quotes:
 
   :"my_symbol1"
   :"my_symbol#{1 + 1}"
+  :"foo\sbar"
 
-Like strings, a single-quote may be used to disable interpolation:
+Like strings, a single-quote may be used to disable interpolation and
+escape sequences:
 
   :'my_symbol#{1 + 1}' #=> :"my_symbol\#{1 + 1}"
 
@@ -451,7 +487,12 @@ may use these paired delimiters:
 * <tt>(</tt> and <tt>)</tt>.
 * <tt>{</tt> and <tt>}</tt>.
 * <tt><</tt> and <tt>></tt>.
-* Any other character, as both beginning and ending delimiters.
+* Non-alphanumeric ASCII character except above, as both beginning and ending delimiters.
+
+The delimiters can be escaped with a backslash.
+However, the first four pairs (brackets, parenthesis, braces, and
+angle brackets) are allowed without backslash as far as they are correctly
+paired.
 
 These are demonstrated in the next section.
 
@@ -460,13 +501,20 @@ These are demonstrated in the next section.
 You can write a non-interpolable string with <tt>%q</tt>.
 The created string is the same as if you created it with single quotes:
 
-  %[foo bar baz]        # => "foo bar baz" # Using [].
-  %(foo bar baz)        # => "foo bar baz" # Using ().
-  %{foo bar baz}        # => "foo bar baz" # Using {}.
-  %<foo bar baz>        # => "foo bar baz" # Using <>.
-  %|foo bar baz|        # => "foo bar baz" # Using two |.
-  %:foo bar baz:        # => "foo bar baz" # Using two :.
+  %q[foo bar baz]       # => "foo bar baz" # Using [].
+  %q(foo bar baz)       # => "foo bar baz" # Using ().
+  %q{foo bar baz}       # => "foo bar baz" # Using {}.
+  %q<foo bar baz>       # => "foo bar baz" # Using <>.
+  %q|foo bar baz|       # => "foo bar baz" # Using two |.
+  %q:foo bar baz:       # => "foo bar baz" # Using two :.
   %q(1 + 1 is #{1 + 1}) # => "1 + 1 is \#{1 + 1}" # No interpolation.
+  %q[foo[bar]baz]       # => "foo[bar]baz" # brackets can be nested.
+  %q(foo(bar)baz)       # => "foo(bar)baz" # parenthesis can be nested.
+  %q{foo{bar}baz}       # => "foo{bar}baz" # braces can be nested.
+  %q<foo<bar>baz>       # => "foo<bar>baz" # angle brackets can be nested.
+
+This is similar to single-quoted string but only backslashes and
+the specified delimiters can be escaped with a backslash.
 
 === <tt>% and %Q</tt>: Interpolable String Literals
 
@@ -476,30 +524,63 @@ or with its alias <tt>%</tt>:
   %[foo bar baz]       # => "foo bar baz"
   %(1 + 1 is #{1 + 1}) # => "1 + 1 is 2" # Interpolation.
 
+This is similar to double-quoted string.
+It allow escape sequences described in
+{Escape Sequences}[#label-Escape+Sequences].
+Other escaped characters (a backslash followed by a character) are
+interpreted as the character.
+
 === <tt>%w and %W</tt>: String-Array Literals
 
-You can write an array of strings with <tt>%w</tt> (non-interpolable)
-or <tt>%W</tt> (interpolable):
+You can write an array of strings as whitespace-separated words
+with <tt>%w</tt> (non-interpolable) or <tt>%W</tt> (interpolable):
 
   %w[foo bar baz]       # => ["foo", "bar", "baz"]
   %w[1 % *]             # => ["1", "%", "*"]
   # Use backslash to embed spaces in the strings.
   %w[foo\ bar baz\ bat] # => ["foo bar", "baz bat"]
+  %W[foo\ bar baz\ bat] # => ["foo bar", "baz bat"]
   %w(#{1 + 1})          # => ["\#{1", "+", "1}"]
   %W(#{1 + 1})          # => ["2"]
 
+  # The nested delimiters evaluated to a flat array of strings
+  # (not nested array).
+  %w[foo[bar baz]qux]   # => ["foo[bar", "baz]qux"]
+
+The following characters are considered as white spaces to separate words:
+
+* space, ASCII 20h (SPC)
+* form feed, ASCII 0Ch (FF)
+* newline (line feed), ASCII 0Ah (LF)
+* carriage return, ASCII 0Dh (CR)
+* horizontal tab, ASCII 09h (TAB)
+* vertical tab, ASCII 0Bh (VT)
+
+The white space characters can be escaped with a backslash to make them
+part of a word.
+
+<tt>%W</tt> allow escape sequences described in
+{Escape Sequences}[#label-Escape+Sequences].
+However the continuation line <tt>\<newline></tt> is not usable because
+it is interpreted as the escaped newline described above.
+
 === <tt>%i and %I</tt>: Symbol-Array Literals
 
-You can write an array of symbols with <tt>%i</tt> (non-interpolable)
-or <tt>%I</tt> (interpolable):
+You can write an array of symbols as whitespace-separated words
+with <tt>%i</tt> (non-interpolable) or <tt>%I</tt> (interpolable):
 
   %i[foo bar baz]       # => [:foo, :bar, :baz]
   %i[1 % *]             # => [:"1", :%, :*]
   # Use backslash to embed spaces in the symbols.
   %i[foo\ bar baz\ bat] # => [:"foo bar", :"baz bat"]
+  %I[foo\ bar baz\ bat] # => [:"foo bar", :"baz bat"]
   %i(#{1 + 1})          # => [:"\#{1", :+, :"1}"]
   %I(#{1 + 1})          # => [:"2"]
 
+The white space characters and its escapes are interpreted as the same as
+string-array literals described in
+{%w and %W: String-Array Literals}[#label-25w+and+-25W-3A+String-Array+Literals].
+
 === <tt>%s</tt>: Symbol Literals
 
 You can write a symbol with <tt>%s</tt>:
@@ -507,6 +588,10 @@ You can write a symbol with <tt>%s</tt>:
   %s[foo]     # => :foo
   %s[foo bar] # => :"foo bar"
 
+This is non-interpolable.
+No interpolation allowed.
+Only backslashes and the specified delimiters can be escaped with a backslash.
+
 === <tt>%r</tt>: Regexp Literals
 
 You can write a regular expression with <tt>%r</tt>;
@@ -531,4 +616,10 @@ See {Regexp modes}[rdoc-ref:Regexp@Modes] for details.
 
 You can write and execute a shell command with <tt>%x</tt>:
 
-  %x(echo 1) # => "1\n"
+  %x(echo 1)      # => "1\n"
+  %x[echo #{1 + 2}] # => "3\n"
+  %x[echo \u0030] # => "0\n"
+
+This is interpolable.
+<tt>%x</tt> allow escape sequences described in
+{Escape Sequences}[#label-Escape+Sequences].
diff --git a/doc/syntax/modules_and_classes.rdoc b/doc/syntax/modules_and_classes.rdoc
index 024815a5a6f613..9e05c5c774e0a3 100644
--- a/doc/syntax/modules_and_classes.rdoc
+++ b/doc/syntax/modules_and_classes.rdoc
@@ -40,9 +40,9 @@ functionality:
     remove_method :my_method
   end
 
-Reopening classes is a very powerful feature of Ruby, but it is best to only
-reopen classes you own.  Reopening classes you do not own may lead to naming
-conflicts or difficult to diagnose bugs.
+Reopening modules (or classes) is a very powerful feature of Ruby, but it is
+best to only reopen modules you own.  Reopening modules you do not own may lead
+to naming conflicts or difficult to diagnose bugs.
 
 == Nesting
 
@@ -259,6 +259,28 @@ includes a minimum of built-in methods.  You can use BasicObject to create an
 independent inheritance structure.  See the BasicObject documentation for
 further details.
 
+Just like modules, classes can also be reopened.  You can omit its superclass
+when you reopen a class.  Specifying a different superclass than the previous
+definition will raise an error.
+
+  class C
+  end
+
+  class D < C
+  end
+
+  # OK
+  class D < C
+  end
+
+  # OK
+  class D
+  end
+
+  # TypeError: superclass mismatch for class D
+  class D < String
+  end
+
 == Inheritance
 
 Any method defined on a class is callable from its subclass:
diff --git a/doc/syntax/operators.rdoc b/doc/syntax/operators.rdoc
new file mode 100644
index 00000000000000..d3045ac99e35b3
--- /dev/null
+++ b/doc/syntax/operators.rdoc
@@ -0,0 +1,75 @@
+= Operators
+
+In Ruby, operators such as <code>+</code>, are defined as methods on the class.
+Literals[rdoc-ref:syntax/literals.rdoc] define their methods within the lower
+level, C language. String class, for example.
+
+Ruby objects can define or overload their own implementation for most operators.
+
+Here is an example:
+
+  class Foo < String
+    def +(str)
+      self.concat(str).concat("another string")
+    end
+  end
+
+  foobar = Foo.new("test ")
+  puts foobar + "baz "
+
+This prints:
+
+  test baz another string
+
+What operators are available is dependent on the implementing class.
+
+== Operator Behavior
+
+How a class behaves to a given operator is specific to that class, since
+operators are method implementations.
+
+When using an operator, it's the expression on the left-hand side of the
+operation that specifies the behavior.
+
+  'a' * 3         #=> "aaa"
+  3 * 'a'         # TypeError: String can't be coerced into Integer
+
+== Logical Operators
+
+Logical operators are not methods, and therefore cannot be
+redefined/overloaded. They are tokenized at a lower level.
+
+Short-circuit logical operators (<code>&&</code>, <code>||</code>,
+<code>and</code>, and <code>or</code>) do not always result in a boolean value.
+Similar to blocks, it's the last evaluated expression that defines the result
+of the operation.
+
+=== <code>&&</code>, <code>and</code>
+
+Both <code>&&</code>/<code>and</code> operators provide short-circuiting by executing each
+side of the operator, left to right, and stopping at the first occurrence of a
+falsey expression. The expression that defines the result is the last one
+executed, whether it be the final expression, or the first occurrence of a falsey
+expression.
+
+Some examples:
+
+  true && 9 && "string"                       #=> "string"
+  (1 + 2) && nil && "string"                  #=> nil
+  (a = 1) && (b = false) && (c = "string")    #=> false
+
+  puts a                                      #=> 1
+  puts b                                      #=> false
+  puts c                                      #=> nil
+
+In this last example, <code>c</code> was initialized, but not defined.
+
+=== <code>||</code>, <code>or</code>
+
+The means by which <code>||</code>/<code>or</code> short-circuits, is to return the result of
+the first expression that is truthy.
+
+Some examples:
+
+  (1 + 2) || true || "string"                 #=> 3
+  false || nil || "string"                    #=> "string"
diff --git a/doc/syntax/pattern_matching.rdoc b/doc/syntax/pattern_matching.rdoc
index e49c09a1f8b3e2..c43919ba14e5f4 100644
--- a/doc/syntax/pattern_matching.rdoc
+++ b/doc/syntax/pattern_matching.rdoc
@@ -221,7 +221,7 @@ For hash patterns, even a simpler form exists: key-only specification (without a
   end
   #=> "matched: 1"
 
-Binding works for nested patterns as well:
+\Binding works for nested patterns as well:
 
   case {name: 'John', friends: [{name: 'Jane'}, {name: 'Rajesh'}]}
   in name:, friends: [{name: first_friend}, *]
@@ -247,9 +247,9 @@ The "rest" part of a pattern also can be bound to a variable:
   else
     "not matched"
   end
-  #=> "matched: 1, {:b=>2, :c=>3}"
+  #=> "matched: 1, {b: 2, c: 3}"
 
-Binding to variables currently does NOT work for alternative patterns joined with <code>|</code>:
+\Binding to variables currently does NOT work for alternative patterns joined with <code>|</code>:
 
   case {a: 1, b: 2}
   in {a: } | Array
@@ -422,7 +422,8 @@ These core and library classes implement deconstruction:
 
 == Guard clauses
 
-+if+ can be used to attach an additional condition (guard clause) when the pattern matches. This condition may use bound variables:
++if+ can be used to attach an additional condition (guard clause) when the pattern matches in +case+/+in+ expressions.
+This condition may use bound variables:
 
   case [1, 2]
   in a, b if b == a*2
@@ -450,6 +451,11 @@ These core and library classes implement deconstruction:
   end
   #=> "matched"
 
+Note that <code>=></code> and +in+ operator can not have a guard clause.
+The following examples is parsed as a standalone expression with modifier +if+.
+
+  [1, 2] in a, b if b == a*2
+
 == Appendix A. Pattern syntax
 
 Approximate syntax is:
diff --git a/doc/timezones.rdoc b/doc/timezones.rdoc
deleted file mode 100644
index c3aae88fdec809..00000000000000
--- a/doc/timezones.rdoc
+++ /dev/null
@@ -1,108 +0,0 @@
-== Timezones
-
-=== Timezone Specifiers
-
-Certain \Time methods accept arguments that specify timezones:
-
-- Time.at: keyword argument +in:+.
-- Time.new: positional argument +zone+ or keyword argument +in:+.
-- Time.now: keyword argument +in:+.
-- Time#getlocal: positional argument +zone+.
-- Time#localtime: positional argument +zone+.
-
-The value given with any of these must be one of the following
-(each detailed below):
-
-- {Hours/minutes offset}[rdoc-ref:timezones.rdoc@Hours-2FMinutes+Offsets].
-- {Single-letter offset}[rdoc-ref:timezones.rdoc@Single-Letter+Offsets].
-- {Integer offset}[rdoc-ref:timezones.rdoc@Integer+Offsets].
-- {Timezone object}[rdoc-ref:timezones.rdoc@Timezone+Objects].
-
-==== Hours/Minutes Offsets
-
-The zone value may be a string offset from UTC
-in the form <tt>'+HH:MM'</tt> or <tt>'-HH:MM'</tt>,
-where:
-
-- +HH+ is the 2-digit hour in the range <tt>0..23</tt>.
-- +MM+ is the 2-digit minute in the range <tt>0..59</tt>.
-
-Examples:
-
-  t = Time.utc(2000, 1, 1, 20, 15, 1) # => 2000-01-01 20:15:01 UTC
-  Time.at(t, in: '-23:59')            # => 1999-12-31 20:16:01 -2359
-  Time.at(t, in: '+23:59')            # => 2000-01-02 20:14:01 +2359
-
-==== Single-Letter Offsets
-
-The zone value may be a  letter in the range <tt>'A'..'I'</tt>
-or <tt>'K'..'Z'</tt>;
-see {List of military time zones}[https://en.wikipedia.org/wiki/List_of_military_time_zones]:
-
-  t = Time.utc(2000, 1, 1, 20, 15, 1) # => 2000-01-01 20:15:01 UTC
-  Time.at(t, in: 'A')                 # => 2000-01-01 21:15:01 +0100
-  Time.at(t, in: 'I')                 # => 2000-01-02 05:15:01 +0900
-  Time.at(t, in: 'K')                 # => 2000-01-02 06:15:01 +1000
-  Time.at(t, in: 'Y')                 # => 2000-01-01 08:15:01 -1200
-  Time.at(t, in: 'Z')                 # => 2000-01-01 20:15:01 UTC
-
-==== \Integer Offsets
-
-The zone value may be an integer number of seconds
-in the range <tt>-86399..86399</tt>:
-
-  t = Time.utc(2000, 1, 1, 20, 15, 1) # => 2000-01-01 20:15:01 UTC
-  Time.at(t, in: -86399)              # => 1999-12-31 20:15:02 -235959
-  Time.at(t, in: 86399)               # => 2000-01-02 20:15:00 +235959
-
-==== Timezone Objects
-
-In most cases, the zone value may be an object
-responding to certain timezone methods.
-
-\Exceptions (timezone object not allowed):
-
-- Time.new with positional argument +zone+.
-- Time.now with keyword argument +in:+.
-
-The timezone methods are:
-
-- +local_to_utc+:
-
-  - Called when Time.new is invoked with +tz+
-    as the value of positional argument +zone+ or keyword argument +in:+.
-  - Argument: a <tt>Time::tm</tt> object.
-  - Returns: a \Time-like object in the UTC timezone.
-
-- +utc_to_local+:
-
-  - Called when Time.at or Time.now is invoked with +tz+
-    as the value for keyword argument +in:+,
-    and when Time#getlocal or Time#localtime is called with +tz+
-    as the value for positional argument +zone+.
-  - Argument: a <tt>Time::tm</tt> object.
-  - Returns: a \Time-like object in the local timezone.
-
-A custom timezone class may have these instance methods,
-which will be called if defined:
-
-- +abbr+:
-
-  - Called when Time#strftime is invoked with a format involving <tt>%Z</tt>.
-  - Argument: a <tt>Time::tm</tt> object.
-  - Returns: a string abbreviation for the timezone name.
-
-- +dst?+:
-
-  - Called when Time.at or Time.now is invoked with +tz+
-    as the value for keyword argument +in:+,
-    and when Time#getlocal or Time#localtime is called with +tz+
-    as the value for positional argument +zone+.
-  - Argument: a <tt>Time::tm</tt> object.
-  - Returns: whether the time is daylight saving time.
-
-- +name+:
-
-  - Called when <tt>Marshal.dump(t) is invoked
-  - Argument: none.
-  - Returns: the string name of the timezone.
diff --git a/doc/windows.md b/doc/windows.md
index 8159b25861b6b3..13c797875e6a3d 100644
--- a/doc/windows.md
+++ b/doc/windows.md
@@ -2,9 +2,9 @@
 
 Ruby supports a few native build platforms for Windows.
 
-* mswin: Build using Microsoft Visual C++ compiler
+* mswin: Build using Microsoft Visual C++ compiler with vcruntimeXXX.dll
 * mingw-msvcrt: Build using compiler for Mingw with msvcrtXX.dll
-* mingw-ucrt: Build using compiler for Mingw with vcruntime.dll
+* mingw-ucrt: Build using compiler for Mingw with Windows Universal CRT
 
 ## Building Ruby using Mingw with UCRT
 
@@ -16,41 +16,52 @@ editor.
 
 Ruby core development can be done either in Windows `cmd` like:
 
-```
+```batch
+ridk install
 ridk enable ucrt64
 
-pacman -S --needed %MINGW_PACKAGE_PREFIX%-openssl %MINGW_PACKAGE_PREFIX%-libyaml
+pacman -S --needed %MINGW_PACKAGE_PREFIX%-openssl %MINGW_PACKAGE_PREFIX%-libyaml %MINGW_PACKAGE_PREFIX%-libffi
+
+mkdir c:\work\ruby
+cd /d c:\work\ruby
+
+git clone https://github.com/ruby/ruby src
 
-cd c:\
-mkdir work
-cd work
-git clone https://github.com/ruby/ruby
+sh ./src/autogen.sh
 
-cd c:\work\ruby
-sh autogen.sh
-sh configure  -C --disable-install-doc
+mkdir build
+cd build
+sh ../src/configure -C --disable-install-doc
 make
 ```
 
 or in MSYS2 `bash` like:
 
-```
+```bash
+ridk install
 ridk enable ucrt64
 bash
 
-pacman -S --needed $MINGW_PACKAGE_PREFIX-openssl $MINGW_PACKAGE_PREFIX-libyaml
+pacman -S --needed $MINGW_PACKAGE_PREFIX-openssl $MINGW_PACKAGE_PREFIX-libyaml $MINGW_PACKAGE_PREFIX-libffi
+
+mkdir /c/work/ruby
+cd /c/work/ruby
 
-cd /c/
-mkdir work
-cd work
-git clone https://github.com/ruby/ruby
-cd ruby
+git clone https://github.com/ruby/ruby src
 
-./autogen.sh
-./configure -C --disable-install-doc
+./src/autogen.sh
+cd build
+../src/configure -C --disable-install-doc
 make
 ```
 
+If you have other MSYS2 environment via other package manager like `scoop`, you need to specify `$MINGW_PACKAGE_PREFIX` is `mingw-w64-ucrt-x86_64`.
+And you need to add `--with-opt-dir` option to `configure` command like:
+
+```batch
+sh ../../ruby/configure -C --disable-install-doc --with-opt-dir=C:\Users\username\scoop\apps\msys2\current\ucrt64
+```
+
 [RubyInstaller-Devkit]: https://rubyinstaller.org/
 [git-for-windows]: https://gitforwindows.org/
 [VSCode]: https://code.visualstudio.com/
@@ -59,39 +70,77 @@ make
 
 ### Requirement
 
-1.  Windows 7 or later.
+1.  Windows 10/Windows Server 2016 or later.
 
-2.  Visual C++ 12.0 (2013) or later.
+2.  Visual C++ 14.0 (2015) or later.
 
     **Note** if you want to build x64 version, use native compiler for
     x64.
 
-3.  Please set environment variable `INCLUDE`, `LIB`, `PATH`
-    to run required commands properly from the command line.
+    The minimum requirement is here:
+      * VC++/MSVC on VS 2017/2019/2022 version build tools.
+      * Windows 10/11 SDK
+
+    You can install Visual Studio Build Tools with `winget`.
+    `win32\install-buildtools.cmd` is a batch file to install the
+    minimum requirements excluding the IDE etc.
+
+3.  Please set environment variable `INCLUDE`, `LIB`, `PATH` to run
+    required commands properly from the command line.  These are set
+    properly by `vsdevcmd.bat` or `vcvarall*.bat` usually. You can run
+    the following command to set them in your command line.
+
+    To native build:
+
+    ```
+    cmd /k win32\vssetup.cmd
+    ```
+
+    To cross build arm64 binary:
+
+    ```
+    cmd /k win32\vssetup.cmd -arch arm64
+    ```
+
+    To cross build x64 binary:
+
+    ```
+    cmd /k win32\vssetup.cmd -arch x64
+    ```
+
+    See `win32\vssetup.cmd -help` for other command line options.
 
     **Note** building ruby requires following commands.
 
-    * nmake
-    * cl
-    * ml
-    * lib
-    * dumpbin
+    * `nmake`
+    * `cl`
+    * `ml`
+    * `lib`
+    * `dumpbin`
 
 4.  If you want to build from GIT source, following commands are required.
-    * patch
-    * sed
-    * ruby 2.0 or later
+    * `git`
+    * `ruby` 3.0 or later
 
     You can use [scoop](https://scoop.sh/) to install them like:
 
-    ```
-    scoop install git ruby sed patch
+    ```batch
+    scoop install git ruby
     ```
 
-5. You need to install required libraries using [vcpkg](https://vcpkg.io/) like:
+    The windows version of `git` configured with `autocrlf` is `true`. The Ruby
+    test suite may fail with `autocrlf` set to `true`. You can set it to `false`
+    like:
 
+    ```batch
+    git config --global core.autocrlf false
     ```
-    vcpkg --triplet x64-windows install openssl libffi libyaml zlib
+
+5.  You need to install required libraries using [vcpkg](https://vcpkg.io/) on
+    directory of ruby repository like:
+
+    ```batch
+    vcpkg --triplet x64-windows install
     ```
 
 6.  Enable Command Extension of your command line.  It's the default behavior
@@ -102,30 +151,37 @@ make
 
 1.  Execute `win32\configure.bat` on your build directory.
     You can specify the target platform as an argument.
-    For example, run `configure --target=i686-mswin32`
+    For example, run `configure --target=i686-mswin32`.
     You can also specify the install directory.
-    For example, run `configure --prefix=<install_directory>`
+    For example, run `configure --prefix=<install_directory>`.
     Default of the install directory is `/usr` .
-    The default _PLATFORM_ is `i386-mswin32_`_MSRTVERSION_ on 32-bit
-    platforms, or `x64-mswin64_`_MSRTVERSION_ on x64 platforms.
-    _MSRTVERSION_ is the 2- or 3-digits version of the Microsoft
-    Runtime Library.
 
-2.  Change _RUBY_INSTALL_NAME_ and _RUBY_SO_NAME_ in `Makefile`
-    if you want to change the name of the executable files.
-    And add _RUBYW_INSTALL_NAME_ to change the name of the
-    executable without console window if also you want.
+2.  If you want to append to the executable and DLL file names,
+    specify `--program-prefix` and `--program-suffix`, like
+    `win32\configure.bat --program-suffix=-$(MAJOR)$(MINOR)`.
+
+    Also, the `--install-name` and `--so-name` options specify the
+    exact base names of the executable and DLL files, respectively,
+    like `win32\configure.bat --install-name=$(RUBY_BASE_NAME)-$(MAJOR)$(MINOR)`.
+
+    By default, the name for the executable without a console window
+    is generated from the _RUBY_INSTALL_NAME_ specified as above by
+    replacing `ruby` with `rubyw`.  If you want to make it different
+    more, modify _RUBYW_INSTALL_NAME_ directly in the Makefile.
 
 3.  You need specify vcpkg directory to use `--with-opt-dir`
-    option like `configure --with-opt-dir=C:\vcpkg\installed\x64-windows`
+    option like `win32\configure.bat --with-opt-dir=C:/vcpkg_installed/x64-windows`
 
 4.  Run `nmake up` if you are building from GIT source.
 
 5.  Run `nmake`
 
-6.  Run `nmake check`
+6.  Run `nmake prepare-vcpkg` with administrator privilege if you need to
+    copy vcpkg installed libraries like `libssl-3-x64.dll` to the build directory.
 
-7.  Run `nmake install`
+7.  Run `nmake check`
+
+8.  Run `nmake install`
 
 ### Build examples
 
@@ -137,7 +193,7 @@ make
     install directory:      C:\usr\local
     ```
 
-    ```
+    ```batch
     C:
     cd \ruby
     win32\configure --prefix=/usr/local
@@ -154,7 +210,7 @@ make
     install directory:      C:\usr\local
     ```
 
-    ```
+    ```batch
     C:
     cd \ruby
     mkdir mswin32
@@ -173,7 +229,7 @@ make
     install directory:      C:\usr\local
     ```
 
-    ```
+    ```batch
     D:
     cd D:\build\ruby
     C:\src\ruby\win32\configure --prefix=/usr/local
@@ -190,7 +246,7 @@ make
     install directory:      C:\usr\local
     ```
 
-    ```
+    ```batch
     C:
     cd \ruby
     win32\configure --prefix=/usr/local --target=x64-mswin64
@@ -209,6 +265,18 @@ You can build ruby in any directory including the source directory,
 except `win32` directory in the source directory.
 This is restriction originating in the path search method of `NMAKE`.
 
+### Dependency management
+
+Ruby uses [vcpkg](https://vcpkg.io/) to manage dependencies on mswin platform.
+
+You can update and install it under the build directory like:
+
+```batch
+nmake update-vcpkg # Update baseline version of vcpkg
+nmake install-vcpkg # Install vcpkg from build directory
+```
+
+
 ## Icons
 
 Any icon files(`*.ico`) in the build directory, directories specified with
diff --git a/doc/yarv_frame_layout.md b/doc/yarv_frame_layout.md
new file mode 100644
index 00000000000000..ea8ad013cf85a6
--- /dev/null
+++ b/doc/yarv_frame_layout.md
@@ -0,0 +1,77 @@
+# YARV Frame Layout
+
+This document is an introduction to what happens on the VM stack as the VM
+services calls. The code holds the ultimate truth for this subject, so beware
+that this document can become stale.
+
+We'll walk through the following program, with explanation at selected points
+in execution and abridged disassembly listings:
+
+```ruby
+def foo(x, y)
+  z = x.casecmp(y)
+end
+
+foo(:one, :two)
+```
+
+First, after arguments are evaluated and right before the `send` to `foo`:
+
+```
+                                ┌────────────┐
+  putself                       │    :two    │
+  putobject :one            0x2 ├────────────┤
+  putobject :two                │    :one    │
+► send <:foo, argc:2>       0x1 ├────────────┤
+  leave                         │    self    │
+                            0x0 └────────────┘
+```
+
+The `put*` instructions have pushed 3 items onto the stack. It's now time to
+add a new control frame for `foo`. The following is the shape of the stack
+after one instruction in `foo`:
+
+```
+                                                cfp->sp=0x8 at this point.
+                           0x8 ┌────────────┐◄──Stack space for temporaries
+                               │    :one    │   live above the environment.
+                           0x7 ├────────────┤
+  getlocal      x@0            │ < flags  > │   foo's rb_control_frame_t
+► getlocal      y@1        0x6 ├────────────┤◄──has cfp->ep=0x6
+  send <:casecmp, argc:1>      │ <no block> │
+  dup                      0x5 ├────────────┤  The flags, block, and CME triple
+  setlocal      z@2            │ <CME: foo> │  (VM_ENV_DATA_SIZE) form an
+  leave                    0x4 ├────────────┤  environment. They can be used to
+                               │   z (nil)  │  figure out what local variables
+                           0x3 ├────────────┤  are below them.
+                               │    :two    │
+                           0x2 ├────────────┤  Notice how the arguments, now
+                               │    :one    │  locals, never moved. This layout
+                           0x1 ├────────────┤  allows for argument transfer
+                               │    self    │  without copying.
+                           0x0 └────────────┘
+```
+
+Given that locals have lower address than `cfp->ep`, it makes sense then that
+`getlocal` in `insns.def` has `val = *(vm_get_ep(GET_EP(), level) - idx);`.
+When accessing variables in the immediate scope, where `level=0`, it's
+essentially `val = cfp->ep[-idx];`.
+
+Note that this EP-relative index has a different basis the index that comes
+after "@" in disassembly listings. The "@" index is relative to the 0th local
+(`x` in this case).
+
+## Q&A
+
+Q: It seems that the receiver is always at an offset relative to EP,
+   like locals. Couldn't we use EP to access it instead of using `cfp->self`?
+
+A: Not all calls put the `self` in the callee on the stack. Two
+   examples are `Proc#call`, where the receiver is the Proc object, but `self`
+   inside the callee is `Proc#receiver`, and `yield`, where the receiver isn't
+   pushed onto the stack before the arguments.
+
+Q: Why have `cfp->ep` when it seems that everything is below `cfp->sp`?
+
+A: In the example, `cfp->ep` points to the stack, but it can also point to the
+   GC heap. Blocks can capture and evacuate their environment to the heap.
diff --git a/doc/yjit/yjit.md b/doc/yjit/yjit.md
index 8aac4ec555e7a5..0024c780b909d3 100644
--- a/doc/yjit/yjit.md
+++ b/doc/yjit/yjit.md
@@ -4,26 +4,29 @@
   </a>
 </p>
 
-
 YJIT - Yet Another Ruby JIT
 ===========================
 
 YJIT is a lightweight, minimalistic Ruby JIT built inside CRuby.
 It lazily compiles code using a Basic Block Versioning (BBV) architecture.
-The target use case is that of servers running Ruby on Rails.
 YJIT is currently supported for macOS, Linux and BSD on x86-64 and arm64/aarch64 CPUs.
 This project is open source and falls under the same license as CRuby.
 
 <p align="center"><b>
     If you're using YJIT in production, please
     <a href="mailto:maxime.chevalierboisvert@shopify.com">share your success stories with us!</a>
- </b></p>
+</b></p>
 
 If you wish to learn more about the approach taken, here are some conference talks and publications:
+
+- MPLR 2023 talk: [Evaluating YJIT’s Performance in a Production Context: A Pragmatic Approach](https://www.youtube.com/watch?v=pVRmPZcNUhc)
+- RubyKaigi 2023 keynote: [Optimizing YJIT’s Performance, from Inception to Production](https://www.youtube.com/watch?v=X0JRhh8w_4I)
+- RubyKaigi 2023 keynote: [Fitting Rust YJIT into CRuby](https://www.youtube.com/watch?v=GI7vvAgP_Qs)
 - RubyKaigi 2022 keynote: [Stories from developing YJIT](https://www.youtube.com/watch?v=EMchdR9C8XM)
 - RubyKaigi 2022 talk: [Building a Lightweight IR and Backend for YJIT](https://www.youtube.com/watch?v=BbLGqTxTRp0)
 - RubyKaigi 2021 talk: [YJIT: Building a New JIT Compiler Inside CRuby](https://www.youtube.com/watch?v=PBVLf3yfMs8)
 - Blog post: [YJIT: Building a New JIT Compiler Inside CRuby](https://pointersgonewild.com/2021/06/02/yjit-building-a-new-jit-compiler-inside-cruby/)
+- MPLR 2023 paper: [Evaluating YJIT’s Performance in a Production Context: A Pragmatic Approach](https://dl.acm.org/doi/10.1145/3617651.3622982)
 - VMIL 2021 paper: [YJIT: A Basic Block Versioning JIT Compiler for CRuby](https://dl.acm.org/doi/10.1145/3486606.3486781)
 - MoreVMs 2021 talk: [YJIT: Building a New JIT Compiler Inside CRuby](https://www.youtube.com/watch?v=vucLAqv7qpc)
 - ECOOP 2016 talk: [Interprocedural Type Specialization of JavaScript Programs Without Type Analysis](https://www.youtube.com/watch?v=sRNBY7Ss97A)
@@ -31,43 +34,50 @@ If you wish to learn more about the approach taken, here are some conference tal
 - ECOOP 2015 talk: [Simple and Effective Type Check Removal through Lazy Basic Block Versioning](https://www.youtube.com/watch?v=S-aHBuoiYE0)
 - ECOOP 2015 paper: [Simple and Effective Type Check Removal through Lazy Basic Block Versioning](https://arxiv.org/pdf/1411.0352.pdf)
 
-To cite YJIT in your publications, please cite the VMIL 2021 paper:
+To cite YJIT in your publications, please cite the MPLR 2023 paper:
 
-```
-@inproceedings{yjit_vmil2021,
-author = {Chevalier-Boisvert, Maxime and Gibbs, Noah and Boussier, Jean and Wu, Si Xing (Alan) and Patterson, Aaron and Newton, Kevin and Hawthorn, John},
-title = {YJIT: A Basic Block Versioning JIT Compiler for CRuby},
-year = {2021},
-isbn = {9781450391092},
+```BibTeX
+@inproceedings{yjit_mplr_2023,
+author = {Chevalier-Boisvert, Maxime and Kokubun, Takashi and Gibbs, Noah and Wu, Si Xing (Alan) and Patterson, Aaron and Issroff, Jemma},
+title = {Evaluating YJIT’s Performance in a Production Context: A Pragmatic Approach},
+year = {2023},
+isbn = {9798400703805},
 publisher = {Association for Computing Machinery},
 address = {New York, NY, USA},
-url = {https://doi.org/10.1145/3486606.3486781},
-doi = {10.1145/3486606.3486781},
-booktitle = {Proceedings of the 13th ACM SIGPLAN International Workshop on Virtual Machines and Intermediate Languages},
-pages = {25–32},
-numpages = {8},
-keywords = {ruby, dynamically typed, compiler, optimization, just-in-time, bytecode},
-location = {Chicago, IL, USA},
-series = {VMIL 2021}
+url = {https://doi.org/10.1145/3617651.3622982},
+doi = {10.1145/3617651.3622982},
+booktitle = {Proceedings of the 20th ACM SIGPLAN International Conference on Managed Programming Languages and Runtimes},
+pages = {20–33},
+numpages = {14},
+keywords = {dynamically typed, optimization, just-in-time, virtual machine, ruby, compiler, bytecode},
+location = {Cascais, Portugal},
+series = {MPLR 2023}
 }
 ```
 
 ## Current Limitations
 
-YJIT may not be suitable for certain applications. It currently only supports macOS and Linux on x86-64 and arm64/aarch64 CPUs. YJIT will use more memory than the Ruby interpreter because the JIT compiler needs to generate machine code in memory and maintain additional state information.
-You can change how much executable memory is allocated using [YJIT's command-line options](#command-line-options). There is a slight performance tradeoff because allocating less executable memory could result in the generated machine code being collected more often.
+YJIT may not be suitable for certain applications. It currently only supports macOS, Linux and BSD on x86-64 and arm64/aarch64 CPUs. YJIT will use more memory than the Ruby interpreter because the JIT compiler needs to generate machine code in memory and maintain additional state information.
+You can change how much executable memory is allocated using [YJIT's command-line options](#command-line-options).
 
 ## Installation
 
 ### Requirements
 
 You will need to install:
-- A C compiler such as GCC or Clang
-- GNU Make and Autoconf
-- The Rust compiler `rustc` and Cargo (if you want to build in dev/debug mode)
-  - The Rust version must be [>= 1.58.0](../../yjit/Cargo.toml).
 
-To install the Rust build toolchain, we suggest following the [recommended installation method][rust-install]. Rust also provides first class [support][editor-tools] for many source code editors.
+ - All the usual build tools for Ruby. See [Building Ruby](../contributing/building_ruby.md)
+ - The Rust compiler `rustc`
+    - The Rust version must be [>= 1.58.0](../../yjit/Cargo.toml).
+ - Optionally, only if you wish to build in dev/debug mode, Rust's `cargo`
+
+If you don't intend on making code changes to YJIT itself, we recommend
+obtaining `rustc` through your OS's package manager since that
+likely reuses the same vendor which provides the C toolchain.
+
+If you will be changing YJIT's Rust code, we suggest using the
+[first-party installation method][rust-install] for Rust. Rust also provides
+first class [support][editor-tools] for many source code editors.
 
 [rust-install]: https://www.rust-lang.org/tools/install
 [editor-tools]: https://www.rust-lang.org/tools
@@ -87,7 +97,7 @@ The YJIT `ruby` binary can be built with either GCC or Clang. It can be built ei
 # Configure in release mode for maximum performance, build and install
 ./autogen.sh
 ./configure --enable-yjit --prefix=$HOME/.rubies/ruby-yjit --disable-install-doc
-make -j install
+make -j && make install
 ```
 
 or
@@ -96,7 +106,7 @@ or
 # Configure in lower-performance dev (debug) mode for development, build and install
 ./autogen.sh
 ./configure --enable-yjit=dev --prefix=$HOME/.rubies/ruby-yjit --disable-install-doc
-make -j install
+make -j && make install
 ```
 
 Dev mode includes extended YJIT statistics, but can be slow. For only statistics you can configure in stats mode:
@@ -105,7 +115,7 @@ Dev mode includes extended YJIT statistics, but can be slow. For only statistics
 # Configure in extended-stats mode without slow runtime checks, build and install
 ./autogen.sh
 ./configure --enable-yjit=stats --prefix=$HOME/.rubies/ruby-yjit --disable-install-doc
-make -j install
+make -j && make install
 ```
 
 On macOS, you may need to specify where to find some libraries:
@@ -117,7 +127,7 @@ brew install openssl libyaml
 # Configure in dev (debug) mode for development, build and install
 ./autogen.sh
 ./configure --enable-yjit=dev --prefix=$HOME/.rubies/ruby-yjit --disable-install-doc --with-opt-dir="$(brew --prefix openssl):$(brew --prefix readline):$(brew --prefix libyaml)"
-make -j install
+make -j && make install
 ```
 
 Typically configure will choose the default C compiler. To specify the C compiler, use
@@ -157,59 +167,137 @@ You can dump statistics about compilation and execution by running YJIT with the
 ./miniruby --yjit-stats myscript.rb
 ```
 
+You can see what YJIT has compiled by running YJIT with the `--yjit-log` command-line option:
+
+```sh
+./miniruby --yjit-log myscript.rb
+```
+
 The machine code generated for a given method can be printed by adding `puts RubyVM::YJIT.disasm(method(:method_name))` to a Ruby script. Note that no code will be generated if the method is not compiled.
 
-### Command-Line Options
+<h3 id="command-line-options">Command-Line Options</h3>
 
 YJIT supports all command-line options supported by upstream CRuby, but also adds a few YJIT-specific options:
 
 - `--yjit`: enable YJIT (disabled by default)
-- `--yjit-call-threshold=N`: number of calls after which YJIT begins to compile a function (default 30)
-- `--yjit-exec-mem-size=N`: size of the executable memory block to allocate, in MiB (default 64 MiB)
+- `--yjit-mem-size=N`: soft limit on YJIT memory usage in MiB (default: 128). Tries to limit `code_region_size + yjit_alloc_size`
+- `--yjit-exec-mem-size=N`: hard limit on executable memory block in MiB. Limits `code_region_size`
+- `--yjit-call-threshold=N`: number of calls after which YJIT begins to compile a function.
+  It defaults to 30, and it's then increased to 120 when the number of ISEQs in the process reaches 40,000.
+- `--yjit-cold-threshold=N`: number of global calls after which an ISEQ is considered cold and not
+  compiled, lower values mean less code is compiled (default 200K)
 - `--yjit-stats`: print statistics after the execution of a program (incurs a run-time cost)
-- `--yjit-stats=quiet`: gather statistics while running a program but don't print them. Stats are accessible through `RubyVM::YJIT.runtime_stats`. (incurs a run-time cost) 
-- `--yjit-trace-exits`: produce a Marshal dump of backtraces from specific exits. Automatically enables `--yjit-stats` (must configure and build with `--enable-yjit=stats` to use this)
-- `--yjit-max-versions=N`: maximum number of versions to generate per basic block (default 4)
-- `--yjit-greedy-versioning`: greedy versioning mode (disabled by default, may increase code size)
+- `--yjit-stats=quiet`: gather statistics while running a program but don't print them. Stats are accessible through `RubyVM::YJIT.runtime_stats`. (incurs a run-time cost)
+- `--yjit-log[=file|dir]`: log all compilation events to the specified file or directory. If no name is supplied, the last 1024 log entries will be printed to stderr when the application exits.
+- `--yjit-log=quiet`: gather a circular buffer of recent YJIT compilations. The compilation log entries are accessible through `RubyVM::YJIT.log` and old entries will be discarded if the buffer is not drained quickly. (incurs a run-time cost)
+- `--yjit-disable`: disable YJIT despite other `--yjit*` flags for lazily enabling it with `RubyVM::YJIT.enable`
+- `--yjit-code-gc`: enable code GC (disabled by default as of Ruby 3.3).
+  It will cause all machine code to be discarded when the executable memory size limit is hit, meaning JIT compilation will then start over.
+  This can allow you to use a lower executable memory size limit, but may cause a slight drop in performance when the limit is hit.
+- `--yjit-perf`: enable frame pointers and profiling with the `perf` tool
+- `--yjit-trace-exits`: produce a Marshal dump of backtraces from all exits. Automatically enables `--yjit-stats`
+- `--yjit-trace-exits=COUNTER`: produce a Marshal dump of backtraces from a counted exit or a fallback. Automatically enables `--yjit-stats`
+- `--yjit-trace-exits-sample-rate=N`: trace exit locations only every Nth occurrence. Automatically enables `--yjit-trace-exits`
 
 Note that there is also an environment variable `RUBY_YJIT_ENABLE` which can be used to enable YJIT.
 This can be useful for some deployment scripts where specifying an extra command-line option to Ruby is not practical.
 
-You can verify that YJIT is enabled by checking that `ruby -v --yjit` includes the string `+YJIT`:
+You can also enable YJIT at run-time using `RubyVM::YJIT.enable`. This can allow you to enable YJIT after your application is done
+booting, which makes it possible to avoid compiling any initialization code.
+
+You can verify that YJIT is enabled using `RubyVM::YJIT.enabled?` or by checking that `ruby --yjit -v` includes the string `+YJIT`:
 
 ```sh
-ruby -v --yjit
+ruby --yjit -v
 ruby 3.3.0dev (2023-01-31T15:11:10Z master 2a0bf269c9) +YJIT dev [x86_64-darwin22]
+
+ruby --yjit -e "p RubyVM::YJIT.enabled?"
+true
+
+ruby -e "RubyVM::YJIT.enable; p RubyVM::YJIT.enabled?"
+true
 ```
 
 ### Benchmarking
 
-We have collected a set of benchmarks and implemented a simple benchmarking harness in the [yjit-bench](https://github.com/Shopify/yjit-bench) repository. This benchmarking harness is designed to disable CPU frequency scaling, set process affinity and disable address space randomization so that the variance between benchmarking runs will be as small as possible. Please kindly note that we are at an early stage in this project.
+We have collected a set of benchmarks and implemented a simple benchmarking harness in the [yjit-bench](https://github.com/Shopify/yjit-bench) repository. This benchmarking harness is designed to disable CPU frequency scaling, set process affinity and disable address space randomization so that the variance between benchmarking runs will be as small as possible.
+
+## Performance Tips for Production Deployments
+
+While YJIT options default to what we think would work well for most workloads,
+they might not necessarily be the best configuration for your application.
+This section covers tips on improving YJIT performance in case YJIT does not
+speed up your application in production.
+
+### Increasing --yjit-mem-size
 
-### Performance Tips
+The `--yjit-mem-size` value can be used to set the maximum amount of memory that YJIT
+is allowed to use. This corresponds to the total of `RubyVM::YJIT.runtime_stats[:code_region_size]`
+and `RubyVM::YJIT.runtime_stats[:yjit_alloc_size]`
+Increasing the `--yjit-mem-size` value means more code
+can be optimized by YJIT, at the cost of more memory usage.
+
+If you start Ruby with `--yjit-stats`, e.g. using an environment variable `RUBYOPT=--yjit-stats`,
+`RubyVM::YJIT.runtime_stats[:ratio_in_yjit]` shows the percentage of total YARV instructions
+executed by YJIT as opposed to the CRuby interpreter.
+Ideally, `ratio_in_yjit` should be as large as 99%, and increasing `--yjit-mem-size` often
+helps improving `ratio_in_yjit`.
+
+### Running workers as long as possible
+
+It's helpful to call the same code as many times as possible before a process restarts.
+If a process is killed too frequently, the time taken for compiling methods may outweigh
+the speedup obtained by compiling them.
+
+You should monitor the number of requests each process has served.
+If you're periodically killing worker processes, e.g. with `unicorn-worker-killer` or `puma_worker_killer`,
+you may want to reduce the killing frequency or increase the limit.
+
+## Reducing YJIT Memory Usage
+
+YJIT allocates memory for JIT code and metadata. Enabling YJIT generally results in more memory usage.
+This section goes over tips on minimizing YJIT memory usage in case it uses more than your capacity.
+
+### Decreasing --yjit-mem-size
+
+YJIT uses memory for compiled code and metadata. You can change the maximum amount of memory
+that YJIT can use by specifying a different `--yjit-mem-size` command-line option. The default value
+is currently `128`.
+When changing this value, you may want to monitor `RubyVM::YJIT.runtime_stats[:ratio_in_yjit]`
+as explained above.
+
+### Enabling YJIT lazily
+
+If you enable YJIT by `--yjit` options or `RUBY_YJIT_ENABLE=1`, YJIT may compile code that is
+used only during the application boot. `RubyVM::YJIT.enable` allows you to enable YJIT from Ruby code,
+and you can call this after your application is initialized, e.g. on Unicorn's `after_fork` hook.
+If you use any YJIT options (`--yjit-*`), YJIT will start at boot by default, but `--yjit-disable`
+allows you to start Ruby with the YJIT-disabled mode while passing YJIT tuning options.
+
+## Code Optimization Tips
 
 This section contains tips on writing Ruby code that will run as fast as possible on YJIT. Some of this advice is based on current limitations of YJIT, while other advice is broadly applicable. It probably won't be practical to apply these tips everywhere in your codebase. You should ideally start by profiling your application using a tool such as [stackprof](https://github.com/tmm1/stackprof) so that you can determine which methods make up most of the execution time. You can then refactor the specific methods that make up the largest fractions of the execution time. We do not recommend modifying your entire codebase based on the current limitations of YJIT.
 
-- Use exceptions for error recovery only, not as part of normal control-flow
+- Avoid using `OpenStruct`
 - Avoid redefining basic integer operations (i.e. +, -, <, >, etc.)
 - Avoid redefining the meaning of `nil`, equality, etc.
 - Avoid allocating objects in the hot parts of your code
 - Minimize layers of indirection
-  - Avoid classes that wrap objects if you can
-  - Avoid methods that just call another method, trivial one liner methods
-- Try to write code so that the same variables always have the same type
-- Use while loops if you can, instead of `integer.times`
-  - This is not idiomatic Ruby, but could help in hot methods
-- CRuby method calls are costly. Avoid things such as methods that only return a value from a hash or return a constant.
+  - Avoid writing wrapper classes if you can (e.g. a class that only wraps a Ruby hash)
+  - Avoid methods that just call another method
+- Ruby method calls are costly. Avoid things such as methods that only return a value from a hash
+- Try to write code so that the same variables and method arguments always have the same type
+- Avoid using `TracePoint` as it can cause YJIT to deoptimize code
+- Avoid using `binding` as it can cause YJIT to deoptimize code
 
 You can also use the `--yjit-stats` command-line option to see which bytecodes cause YJIT to exit, and refactor your code to avoid using these instructions in the hottest methods of your code.
 
 ### Other Statistics
 
-If you run `ruby` with `--yjit --yjit-stats`, YJIT will track and return performance statistics in `RubyVM::YJIT.runtime_stats`.
+If you run `ruby` with `--yjit-stats`, YJIT will track and return performance statistics in `RubyVM::YJIT.runtime_stats`.
 
 ```rb
-$ RUBYOPT="--yjit --yjit-stats" irb
+$ RUBYOPT="--yjit-stats" irb
 irb(main):001:0> RubyVM::YJIT.runtime_stats
 =>
 {:inline_code_size=>340745,
@@ -224,41 +312,43 @@ irb(main):001:0> RubyVM::YJIT.runtime_stats
 
 Some of the counters include:
 
-* :yjit_insns_count - how many Ruby bytecode instructions have been executed
-* :binding_allocations - number of bindings allocated
-* :binding_set - number of variables set via a binding
-* :code_gc_count - number of garbage collections of compiled code since process start
-* :vm_insns_count - number of instructions executed by the Ruby interpreter
-* :compiled_iseq_count - number of bytecode sequences compiled
-* :inline_code_size - size in bytes of compiled YJIT blocks
-* :outline_code_size - size in bytes of YJIT error-handling compiled code
-* :side_exit_count - number of side exits taken at runtime
-* :total_exit_count - number of exits, including side exits, taken at runtime
-* :avg_len_in_yjit - avg. number of instructions in compiled blocks before exiting to interpreter
+* `:yjit_insns_count` - how many Ruby bytecode instructions have been executed
+* `:binding_allocations` - number of bindings allocated
+* `:binding_set` - number of variables set via a binding
+* `:code_gc_count` - number of garbage collections of compiled code since process start
+* `:vm_insns_count` - number of instructions executed by the Ruby interpreter
+* `:compiled_iseq_count` - number of bytecode sequences compiled
+* `:inline_code_size` - size in bytes of compiled YJIT blocks
+* `:outline_code_size` - size in bytes of YJIT error-handling compiled code
+* `:side_exit_count` - number of side exits taken at runtime
+* `:total_exit_count` - number of exits, including side exits, taken at runtime
+* `:avg_len_in_yjit` - avg. number of instructions in compiled blocks before exiting to interpreter
 
-Counters starting with "exit_" show reasons for YJIT code taking a side exit (return to the interpreter.) See yjit_hacking.md for more details.
+Counters starting with "exit_" show reasons for YJIT code taking a side exit (return to the interpreter.)
 
-Performance counter names are not guaranteed to remain the same between Ruby versions. If you're curious what one does, it's usually best to search the source code for it &mdash; but it may change in a later Ruby version.
+Performance counter names are not guaranteed to remain the same between Ruby versions. If you're curious what each counter means,
+it's usually best to search the source code for it &mdash; but it may change in a later Ruby version.
 
-The printed text after a --yjit-stats run includes other information that may be named differently than the information in runtime_stats.
+The printed text after a `--yjit-stats` run includes other information that may be named differently than the information in `RubyVM::YJIT.runtime_stats`.
 
 ## Contributing
 
-We welcome open source contributors. You should feel free to open new issues to report bugs or just to ask questions.
+We welcome open source contributions. You should feel free to open new issues to report bugs or just to ask questions.
 Suggestions on how to make this readme file more helpful for new contributors are most welcome.
 
 Bug fixes and bug reports are very valuable to us. If you find a bug in YJIT, it's very possible be that nobody has reported it before,
 or that we don't have a good reproduction for it, so please open an issue and provide as much information as you can about your configuration and a description of how you encountered the problem. List the commands you used to run YJIT so that we can easily reproduce the issue on our end and investigate it. If you are able to produce a small program reproducing the error to help us track it down, that is very much appreciated as well.
 
-If you would like to contribute a large patch to YJIT, we suggest opening an issue or a discussion on this repository so that
+If you would like to contribute a large patch to YJIT, we suggest opening an issue or a discussion on the [Shopify/ruby repository](https://github.com/Shopify/ruby/issues) so that
 we can have an active discussion. A common problem is that sometimes people submit large pull requests to open source projects
 without prior communication, and we have to reject them because the work they implemented does not fit within the design of the
-project. We want to save you time and frustration, so please reach out and we can have a productive discussion as to how
-you can contribute things we will want to merge into YJIT.
+project. We want to save you time and frustration, so please reach out so we can have a productive discussion as to how
+you can contribute patches we will want to merge into YJIT.
 
 ### Source Code Organization
 
 The YJIT source code is divided between:
+
 - `yjit.c`: code YJIT uses to interface with the rest of CRuby
 - `yjit.h`: C definitions YJIT exposes to the rest of the CRuby
 - `yjit.rb`: `YJIT` Ruby module that is exposed to Ruby
@@ -267,10 +357,11 @@ The YJIT source code is divided between:
 - `yjit/src/core.rb`: basic block versioning logic, core structure of YJIT
 - `yjit/src/stats.rs`: gathering of run-time statistics
 - `yjit/src/options.rs`: handling of command-line options
-- `yjit/bindgen/src/main.rs`: C bindings exposed to the Rust codebase through bindgen
 - `yjit/src/cruby.rs`: C bindings manually exposed to the Rust codebase
+- `yjit/bindgen/src/main.rs`: C bindings exposed to the Rust codebase through bindgen
 
 The core of CRuby's interpreter logic is found in:
+
 - `insns.def`: defines Ruby's bytecode instructions (gets compiled into `vm.inc`)
 - `vm_insnshelper.c`: logic used by Ruby's bytecode instructions
 - `vm_exec.c`: Ruby interpreter loop
@@ -292,6 +383,7 @@ add them to `yjit/cruby.rs` instead.
 ### Coding & Debugging Protips
 
 There are multiple test suites:
+
 - `make btest` (see `/bootstraptest`)
 - `make test-all`
 - `make test-spec`
@@ -310,12 +402,18 @@ Or single-threaded like this, to more easily identify which specific test is fai
 make test-all TESTOPTS=--verbose RUN_OPTS="--yjit-call-threshold=1"
 ```
 
-To debug a single test in `test-all`:
+To run a single test file with `test-all`:
 
 ```sh
 make test-all TESTS='test/-ext-/marshal/test_usrmarshal.rb' RUNRUBYOPT=--debugger=lldb RUN_OPTS="--yjit-call-threshold=1"
 ```
 
+It's also possible to filter tests by name to run a single test:
+
+```sh
+make test-all TESTS='-n /test_float_plus/' RUN_OPTS="--yjit-call-threshold=1"
+```
+
 You can also run one specific test in `btest`:
 
 ```sh
@@ -342,7 +440,7 @@ instructions below, but there are a few caveats listed further down.
 
 First, install Rosetta:
 
-```sh
+```console
 $ softwareupdate --install-rosetta
 ```
 
@@ -350,13 +448,13 @@ Now any command can be run with Rosetta via the `arch` command line tool.
 
 Then you can start your shell in an x86 environment:
 
-```sh
+```console
 $ arch -x86_64 zsh
 ```
 
 You can double check your current architecture via the `arch` command:
 
-```sh
+```console
 $ arch -x86_64 zsh
 $ arch
 i386
@@ -364,7 +462,7 @@ i386
 
 You may need to set the default target for `rustc` to x86-64, e.g.
 
-```sh
+```console
 $ rustup default stable-x86_64-apple-darwin
 ```
 
@@ -376,3 +474,71 @@ While in your i386 shell, install Cargo and Homebrew, then hack away!
 2. Cargo will install in $HOME/.cargo by default, and I don't know a good way to change architectures after install
 
 If you use Fish shell you can [read this link](https://tenderlovemaking.com/2022/01/07/homebrew-rosetta-and-ruby.html) for information on making the dev environment easier.
+
+## Profiling with Linux perf
+
+`--yjit-perf` allows you to profile JIT-ed methods along with other native functions using Linux perf.
+When you run Ruby with `perf record`, perf looks up `/tmp/perf-{pid}.map` to resolve symbols in JIT code,
+and this option lets YJIT write method symbols into that file as well as enabling frame pointers.
+
+### Call graph
+
+Here's an example way to use this option with [Firefox Profiler](https://profiler.firefox.com)
+(See also: [Profiling with Linux perf](https://profiler.firefox.com/docs/#/./guide-perf-profiling)):
+
+```bash
+# Compile the interpreter with frame pointers enabled
+./configure --enable-yjit --prefix=$HOME/.rubies/ruby-yjit --disable-install-doc cflags=-fno-omit-frame-pointer
+make -j && make install
+
+# [Optional] Allow running perf without sudo
+echo 0 | sudo tee /proc/sys/kernel/kptr_restrict
+echo -1 | sudo tee /proc/sys/kernel/perf_event_paranoid
+
+# Profile Ruby with --yjit-perf
+cd ../yjit-bench
+PERF="record --call-graph fp" ruby --yjit-perf -Iharness-perf benchmarks/liquid-render/benchmark.rb
+
+# View results on Firefox Profiler https://profiler.firefox.com.
+# Create /tmp/test.perf as below and upload it using "Load a profile from file".
+perf script --fields +pid > /tmp/test.perf
+```
+
+### YJIT codegen
+
+You can also profile the number of cycles consumed by code generated by each YJIT function.
+
+```bash
+# Install perf
+apt-get install linux-tools-common linux-tools-generic linux-tools-`uname -r`
+
+# [Optional] Allow running perf without sudo
+echo 0 | sudo tee /proc/sys/kernel/kptr_restrict
+echo -1 | sudo tee /proc/sys/kernel/perf_event_paranoid
+
+# Profile Ruby with --yjit-perf=codegen
+cd ../yjit-bench
+PERF=record ruby --yjit-perf=codegen -Iharness-perf benchmarks/lobsters/benchmark.rb
+
+# Aggregate results
+perf script > /tmp/perf.txt
+../ruby/misc/yjit_perf.py /tmp/perf.txt
+```
+
+#### Building perf with Python support
+
+The above instructions work fine for most people, but you could also use
+a handy `perf script -s` interface if you build perf from source.
+
+```bash
+# Build perf from source for Python support
+sudo apt-get install libpython3-dev python3-pip flex libtraceevent-dev \
+  libelf-dev libunwind-dev libaudit-dev libslang2-dev libdw-dev
+git clone --depth=1 https://github.com/torvalds/linux
+cd linux/tools/perf
+make
+make install
+
+# Aggregate results
+perf script -s ../ruby/misc/yjit_perf.py
+```
diff --git a/doc/yjit/yjit_hacking.md b/doc/yjit/yjit_hacking.md
deleted file mode 100644
index 4c4d742b73e13a..00000000000000
--- a/doc/yjit/yjit_hacking.md
+++ /dev/null
@@ -1,75 +0,0 @@
-# YJIT Hacking
-
-## Code Generation and Assembly Language
-
-YJIT’s basic purpose is to take ISEQs and generate machine code.
-
-Documentation on each Ruby bytecode can be found in insns.def.
-
-YJIT uses those bytecodes as the “Basic Blocks” in Lazy Basic Block Versioning (LBBV.) For more deep details of LBBV, see yjit.md in this directory.
-
-Current YJIT has a simple assembler as a backend. Each method that generates code does it by emitting machine code:
-
-```
-# Excerpt of yjit_gen_exit() from yjit_codegen.c, Sept 2021
-// Generate an exit to return to the interpreter
-static uint32_t
-yjit_gen_exit(VALUE *exit_pc, ctx_t *ctx, codeblock_t *cb)
-{
-    const uint32_t code_pos = cb->write_pos;
-
-    ADD_COMMENT(cb, "exit to interpreter");
-
-    // Generate the code to exit to the interpreters
-    // Write the adjusted SP back into the CFP
-    if (ctx->sp_offset != 0) {
-        x86opnd_t stack_pointer = ctx_sp_opnd(ctx, 0);
-        lea(cb, REG_SP, stack_pointer);
-        mov(cb, member_opnd(REG_CFP, rb_control_frame_t, sp), REG_SP);
-    }
-
-    // Update CFP->PC
-    mov(cb, RAX, const_ptr_opnd(exit_pc));
-    mov(cb, member_opnd(REG_CFP, rb_control_frame_t, pc), RAX);
-```
-
-Later there will be a more complex backend.
-
-## Code Generation vs Code Execution
-
-When you see lea() call above (“load effective address,”) it’s not running the LEA x86 instruction. It’s generating an LEA instruction to the codeblock pointer in the first argument. It will execute that instruction later, when the codeblock gets executed.
-
-This is subtle because YJIT will often wait to compile the method until you’re about to run it -- that’s when it knows the most about what types of arguments the method will receive. So it’s a compile-time instruction, but often it will defer compile-time until just barely before runtime.
-
-The ctx structure tracks what is known at compile time about the arguments being passed into the Ruby bytecode. Often YJIT will “peek” at an expected type before it generates machine code.
-
-## Inlined and Outlined Code
-
-When YJIT is generating code, it needs a code pointer. In many cases it needs two, usually called “cb” (codeblock) and “ocb” (out-of-line codeblock.)
-
-cb is for “inlined” normal code and ocb is for “outline” code such as exits. Inlined code is normal generated code for Ruby operations, while outlined code is for unusual and error conditions, such as encountering an unexpected parameter type and exiting to the interpreter.
-
-The purpose of the outlined code block is to keep things we believe are going to be infrequent somewhere else. That way we can keep the code in the inline block more linear and compact. Linear code, with as few branches as possible, is more easily predicted by the CPU. An exception or unsupported operation will cause YJIT to generate outlined code to handle it.
-
-If you search for ocb in yjit_codegen.c, you can see some places where out-of-line code is generated.
-
-YJIT statistics are only gathered when RUBY_DEBUG or YJIT_STATS is true. In some cases the code to increment YJIT statistics will be generated out-of-line, especially if those statistics are gathered when a side exit happens.
-
-## Statistics and Comments
-
-When RUBY_DEBUG is defined to a true value, YJIT will emit comments into the generated machine code. This can make disassemblies a lot more readable. When RUBY_DEBUG or YJIT_STATS is defined and stats are active (--yjit-stats or export YJIT_STATS=1), code will be generated to collect statistics during the run, and a report will be printed when the process exits.
-
-## Entering and Exiting the Interpreter
-
-YJIT won’t generate machine code for an ISEQ until it’s been run a certain number of times (10 by default.) Then, the next time the interpreter would call that ISEQ, it will call the generated machine code version instead. If YJIT hits an unexpected or unsupported operation, it will return to the normal interpreter.
-
-If YJIT returns to the interpreter, the behaviour will be correct but slower. YJIT only optimises part of some operations - for instance, YJIT will not optimise a BMETHOD call yet.
-
-When the interpreter calls to a YJIT-optimised method again, control will return to YJIT’s generated machine code. The more time that’s spent in YJIT-generated code (“ratio in YJIT,”) the more CPU time YJIT can save with its optimisations.
-
-## Side Exits
-
-When YJIT has compiled an ISEQ and is running it later, sometimes it will hit an unexpected condition. It might see a parameter of a different type than before, or square-brackets might be used on a hash when they were first used on an array. In those cases, the generated code will contain a call to return to the interpreter at runtime, called a “side exit.”
-
-Side exits are generated as out-of-line code.
-
diff --git a/doc/zjit.md b/doc/zjit.md
new file mode 100644
index 00000000000000..f337487af88764
--- /dev/null
+++ b/doc/zjit.md
@@ -0,0 +1,123 @@
+# ZJIT: ADVANCED RUBY JIT PROTOTYPE
+
+## Build Instructions
+
+To build ZJIT on macOS:
+```
+./autogen.sh
+./configure --enable-zjit=dev --prefix=$HOME/.rubies/ruby-zjit --disable-install-doc --with-opt-dir="$(brew --prefix openssl):$(brew --prefix readline):$(brew --prefix libyaml)"
+make -j miniruby
+```
+
+## Useful dev commands
+
+To view YARV output for code snippets:
+```
+./miniruby --dump=insns -e0
+```
+
+To run code snippets with ZJIT:
+```
+./miniruby --zjit -e0
+```
+
+You can also try https://www.rubyexplorer.xyz/ to view Ruby YARV disasm output with syntax highlighting
+in a way that can be easily shared with other team members.
+
+## Testing
+
+Make sure you have a `--enable-zjit=dev` build, and run `brew install cargo-nextest` first.
+
+### make zjit-test-all
+
+This command runs all ZJIT tests: `make zjit-test` and `test/ruby/test_zjit.rb`.
+
+```
+make zjit-test-all
+```
+
+### make zjit-test
+
+This command runs Rust unit tests.
+
+```
+make zjit-test
+```
+
+You can also run a single test case by specifying the function name:
+
+```
+make zjit-test ZJIT_TESTS=test_putobject
+```
+
+If you expect that your changes cause tests to fail and they do, you can have
+`expect-test` fix the expected value for you by putting `UPDATE_EXPECT=1`
+before your test command, like so:
+
+```
+UPDATE_EXPECT=1 make zjit-test ZJIT_TESTS=test_putobject
+```
+
+Test changes will be reviewed alongside code changes.
+
+<details>
+
+<summary>Setting up zjit-test</summary>
+
+ZJIT uses `cargo-nextest` for Rust unit tests instead of `cargo test`.
+`cargo-nextest` runs each test in its own process, which is valuable since
+CRuby only supports booting once per process, and most APIs are not thread
+safe. Use `brew install cargo-nextest` to install it on macOS, otherwise, refer
+to <https://nexte.st/docs/installation/pre-built-binaries/> for installation
+instructions.
+
+Since it uses Cargo, you'll also need a `configure --enable-zjit=dev ...` build
+for `make zjit-test`. Since the tests need to link against CRuby, directly
+calling `cargo test`, or `cargo nextest` likely won't build. Make sure to
+use `make`.
+
+</details>
+
+### test/ruby/test\_zjit.rb
+
+This command runs Ruby execution tests.
+
+```
+make test-all TESTS="test/ruby/test_zjit.rb"
+```
+
+You can also run a single test case by matching the method name:
+
+```
+make test-all TESTS="test/ruby/test_zjit.rb -n TestZJIT#test_putobject"
+```
+
+## ZJIT Glossary
+
+This glossary contains terms that are helpful for understanding ZJIT.
+
+Please note that some terms may appear in CRuby internals too but with different meanings.
+
+| Term | Definition |
+| ---  | -----------|
+| HIR | High-level Intermediate Representation. High-level (Ruby semantics) graph representation in static single-assignment (SSA) form |
+| LIR | Low-level Intermediate Representation. Low-level IR used in the backend for assembly generation |
+| SSA | Static Single Assignment. A form where each variable is assigned exactly once |
+| `opnd` | Operand. An operand to an IR instruction (can be register, memory, immediate, etc.) |
+| `dst` | Destination. The output operand of an instruction where the result is stored |
+| VReg | Virtual Register. A virtual register that gets lowered to physical register or memory |
+| `insn_id` | Instruction ID. An index of an instruction in a function |
+| `block_id` | The index of a basic block, which effectively acts like a pointer |
+| `branch` | Control flow edge between basic blocks in the compiled code |
+| `cb` | Code Block. Memory region for generated machine code |
+| `entry` | The starting address of compiled code for an ISEQ |
+| Patch Point | Location in generated code that can be modified later in case assumptions get invalidated |
+| Frame State | Captured state of the Ruby stack frame at a specific point for deoptimization |
+| Guard | A run-time check that ensures assumptions are still valid |
+| `invariant` | An assumption that JIT code relies on, requiring invalidation if broken |
+| Deopt | Deoptimization. Process of falling back from JIT code to interpreter |
+| Side Exit | Exit from JIT code back to interpreter |
+| Type Lattice | Hierarchy of types used for type inference and optimization |
+| Constant Folding | Optimization that evaluates constant expressions at compile time |
+| RSP | x86-64 stack pointer register used for native stack operations |
+| Register Spilling | Process of moving register values to memory when running out of physical registers |
diff --git a/enc/Makefile.in b/enc/Makefile.in
index dd8ca1b5281aad..ce93fdd22d2350 100644
--- a/enc/Makefile.in
+++ b/enc/Makefile.in
@@ -40,6 +40,7 @@ BUILTRUBY = $(topdir)/miniruby$(EXEEXT)
 
 empty =
 AR = @AR@
+LD = @LD@
 CC = @CC@
 ARFLAGS = @ARFLAGS@$(empty)
 RANLIB = @RANLIB@
@@ -51,11 +52,12 @@ optflags = @optflags@
 debugflags = @debugflags@
 warnflags = @warnflags@
 CCDLFLAGS = @CCDLFLAGS@
-INCFLAGS = -I. -I$(arch_hdrdir) -I$(hdrdir) -I$(top_srcdir)
+INCFLAGS = -I. -I$(arch_hdrdir) -I$(hdrdir) -I$(top_srcdir) @incflags@
 DEFS = @DEFS@
 CPPFLAGS = @CPPFLAGS@ -DONIG_ENC_REGISTER=rb_enc_register
 LDFLAGS = @LDFLAGS@
 LDSHARED = @LDSHARED@
+POSTLINK = @POSTLINK@
 ldflags  = $(LDFLAGS)
 dldflags = @DLDFLAGS@
 extdldflags = @EXTDLDFLAGS@
@@ -70,6 +72,7 @@ WORKDIRS = @WORKDIRS@
 
 NULLCMD = @NULLCMD@
 RM = @RM@
+RMALL = @RMALL@
 RMDIR = @RMDIR@
 RMDIRS = @RMDIRS@
 MAKEDIRS = @MAKEDIRS@
@@ -81,6 +84,9 @@ all:
 make-workdir:
 	$(Q)$(MAKEDIRS) $(WORKDIRS)
 
+.PHONY: encs all modencs libencs enc libenc trans libtrans srcs
+.PHONY: clean distclean realclean clean-srcs
+
 clean:
 
 distclean: clean
diff --git a/enc/depend b/enc/depend
index 47a20e957acdb5..a458b63887e858 100644
--- a/enc/depend
+++ b/enc/depend
@@ -35,6 +35,7 @@ ENCSOS =<%ENCS.map {|e|%> $(ENCSODIR)/<%=e%>.$(DLEXT) \
         <%}%> #
 ENCCLEANLIBS = <%=cleanlibs.map {|clean|
   clean.gsub(/\$\*(\.\w+)?/) {"$(ENCOBJS#{$1 ? ":.#{CONFIG["OBJEXT"]}=#{$1}" : ""})"}
+       .gsub(/\$\(\KTARGET_SO(?=[:\)])/) {"ENCSOS"}
 }.join(" ")%>
 ENCCLEANOBJS = <%=cleanobjs.map {|clean|
   clean.gsub(/\$\*(\.\w+)?/) {"$(ENCOBJS#{$1 ? ":.#{CONFIG["OBJEXT"]}=#{$1}" : ""})"}
@@ -51,6 +52,7 @@ TRANSSOS =<%TRANS.map {|e|%> $(ENCSODIR)/<%=e%>.$(DLEXT) \
           <%}%> #
 TRANSCLEANLIBS = <%=cleanlibs.map {|clean|
   clean.gsub(/\$\*(\.\w+)?/) {"$(TRANSOBJS#{$1 ? ":.#{CONFIG["OBJEXT"]}=#{$1}" : ""})"}
+       .gsub(/\$\(\KTARGET_SO(?=[:\)])/) {"TRANSSOS"}
 }.join(" ")%>
 TRANSCLEANOBJS = <%=cleanobjs.map {|clean|
   clean.gsub(/\$\*(\.\w+)?/) {"$(TRANSOBJS#{$1 ? ":.#{CONFIG["OBJEXT"]}=#{$1}" : ""})"}
@@ -58,12 +60,8 @@ TRANSCLEANOBJS = <%=cleanobjs.map {|clean|
 LIBTRANS=enc/libtrans.$(LIBEXT)
 UNICODE_HDR_DIR = --missing-unicode-header-dir--
 
-encs: all
-% if MODULE_TYPE == :static
-all: libenc libtrans
-% else
-all: enc trans
-%end
+encs all: <%= MODULE_TYPE == :static ? "lib" : "mod" %>encs
+modencs: enc trans
 libencs: libenc libtrans
 enc: $(ENCSOS)
 libenc: $(LIBENC)
@@ -155,7 +153,7 @@ enc/trans/transdb.$(OBJEXT): transdb.h
 
 clean:
 % %w[$(ENCSOS) $(LIBENC) $(ENCOBJS) $(ENCCLEANOBJS) $(ENCCLEANLIBS) $(TRANSSOS) $(LIBTRANS) $(TRANSOBJS) $(TRANSCLEANOBJS) $(TRANSCLEANLIBS) $(ENC_TRANS_D) $(ENC_TRANS_SO_D)].each do |clean|
-	$(Q)$(RM) <%=pathrep[clean]%>
+	$(Q)$(RMALL) <%=pathrep[clean]%>
 % end
 % unless inplace
 	$(Q)$(RM) enc/unicode/*/casefold.h enc/unicode/*/name2ctype.h
@@ -319,6 +317,7 @@ enc/ascii.$(OBJEXT): internal/intern/re.h
 enc/ascii.$(OBJEXT): internal/intern/ruby.h
 enc/ascii.$(OBJEXT): internal/intern/select.h
 enc/ascii.$(OBJEXT): internal/intern/select/largesize.h
+enc/ascii.$(OBJEXT): internal/intern/set.h
 enc/ascii.$(OBJEXT): internal/intern/signal.h
 enc/ascii.$(OBJEXT): internal/intern/sprintf.h
 enc/ascii.$(OBJEXT): internal/intern/string.h
@@ -338,6 +337,7 @@ enc/ascii.$(OBJEXT): internal/special_consts.h
 enc/ascii.$(OBJEXT): internal/static_assert.h
 enc/ascii.$(OBJEXT): internal/stdalign.h
 enc/ascii.$(OBJEXT): internal/stdbool.h
+enc/ascii.$(OBJEXT): internal/stdckdint.h
 enc/ascii.$(OBJEXT): internal/symbol.h
 enc/ascii.$(OBJEXT): internal/value.h
 enc/ascii.$(OBJEXT): internal/value_type.h
@@ -480,6 +480,7 @@ enc/big5.$(OBJEXT): internal/intern/re.h
 enc/big5.$(OBJEXT): internal/intern/ruby.h
 enc/big5.$(OBJEXT): internal/intern/select.h
 enc/big5.$(OBJEXT): internal/intern/select/largesize.h
+enc/big5.$(OBJEXT): internal/intern/set.h
 enc/big5.$(OBJEXT): internal/intern/signal.h
 enc/big5.$(OBJEXT): internal/intern/sprintf.h
 enc/big5.$(OBJEXT): internal/intern/string.h
@@ -499,6 +500,7 @@ enc/big5.$(OBJEXT): internal/special_consts.h
 enc/big5.$(OBJEXT): internal/static_assert.h
 enc/big5.$(OBJEXT): internal/stdalign.h
 enc/big5.$(OBJEXT): internal/stdbool.h
+enc/big5.$(OBJEXT): internal/stdckdint.h
 enc/big5.$(OBJEXT): internal/symbol.h
 enc/big5.$(OBJEXT): internal/value.h
 enc/big5.$(OBJEXT): internal/value_type.h
@@ -651,6 +653,7 @@ enc/cesu_8.$(OBJEXT): internal/intern/re.h
 enc/cesu_8.$(OBJEXT): internal/intern/ruby.h
 enc/cesu_8.$(OBJEXT): internal/intern/select.h
 enc/cesu_8.$(OBJEXT): internal/intern/select/largesize.h
+enc/cesu_8.$(OBJEXT): internal/intern/set.h
 enc/cesu_8.$(OBJEXT): internal/intern/signal.h
 enc/cesu_8.$(OBJEXT): internal/intern/sprintf.h
 enc/cesu_8.$(OBJEXT): internal/intern/string.h
@@ -670,6 +673,7 @@ enc/cesu_8.$(OBJEXT): internal/special_consts.h
 enc/cesu_8.$(OBJEXT): internal/static_assert.h
 enc/cesu_8.$(OBJEXT): internal/stdalign.h
 enc/cesu_8.$(OBJEXT): internal/stdbool.h
+enc/cesu_8.$(OBJEXT): internal/stdckdint.h
 enc/cesu_8.$(OBJEXT): internal/symbol.h
 enc/cesu_8.$(OBJEXT): internal/value.h
 enc/cesu_8.$(OBJEXT): internal/value_type.h
@@ -812,6 +816,7 @@ enc/cp949.$(OBJEXT): internal/intern/re.h
 enc/cp949.$(OBJEXT): internal/intern/ruby.h
 enc/cp949.$(OBJEXT): internal/intern/select.h
 enc/cp949.$(OBJEXT): internal/intern/select/largesize.h
+enc/cp949.$(OBJEXT): internal/intern/set.h
 enc/cp949.$(OBJEXT): internal/intern/signal.h
 enc/cp949.$(OBJEXT): internal/intern/sprintf.h
 enc/cp949.$(OBJEXT): internal/intern/string.h
@@ -831,6 +836,7 @@ enc/cp949.$(OBJEXT): internal/special_consts.h
 enc/cp949.$(OBJEXT): internal/static_assert.h
 enc/cp949.$(OBJEXT): internal/stdalign.h
 enc/cp949.$(OBJEXT): internal/stdbool.h
+enc/cp949.$(OBJEXT): internal/stdckdint.h
 enc/cp949.$(OBJEXT): internal/symbol.h
 enc/cp949.$(OBJEXT): internal/value.h
 enc/cp949.$(OBJEXT): internal/value_type.h
@@ -972,6 +978,7 @@ enc/emacs_mule.$(OBJEXT): internal/intern/re.h
 enc/emacs_mule.$(OBJEXT): internal/intern/ruby.h
 enc/emacs_mule.$(OBJEXT): internal/intern/select.h
 enc/emacs_mule.$(OBJEXT): internal/intern/select/largesize.h
+enc/emacs_mule.$(OBJEXT): internal/intern/set.h
 enc/emacs_mule.$(OBJEXT): internal/intern/signal.h
 enc/emacs_mule.$(OBJEXT): internal/intern/sprintf.h
 enc/emacs_mule.$(OBJEXT): internal/intern/string.h
@@ -991,6 +998,7 @@ enc/emacs_mule.$(OBJEXT): internal/special_consts.h
 enc/emacs_mule.$(OBJEXT): internal/static_assert.h
 enc/emacs_mule.$(OBJEXT): internal/stdalign.h
 enc/emacs_mule.$(OBJEXT): internal/stdbool.h
+enc/emacs_mule.$(OBJEXT): internal/stdckdint.h
 enc/emacs_mule.$(OBJEXT): internal/symbol.h
 enc/emacs_mule.$(OBJEXT): internal/value.h
 enc/emacs_mule.$(OBJEXT): internal/value_type.h
@@ -1142,6 +1150,7 @@ enc/encdb.$(OBJEXT): internal/intern/re.h
 enc/encdb.$(OBJEXT): internal/intern/ruby.h
 enc/encdb.$(OBJEXT): internal/intern/select.h
 enc/encdb.$(OBJEXT): internal/intern/select/largesize.h
+enc/encdb.$(OBJEXT): internal/intern/set.h
 enc/encdb.$(OBJEXT): internal/intern/signal.h
 enc/encdb.$(OBJEXT): internal/intern/sprintf.h
 enc/encdb.$(OBJEXT): internal/intern/string.h
@@ -1161,6 +1170,7 @@ enc/encdb.$(OBJEXT): internal/special_consts.h
 enc/encdb.$(OBJEXT): internal/static_assert.h
 enc/encdb.$(OBJEXT): internal/stdalign.h
 enc/encdb.$(OBJEXT): internal/stdbool.h
+enc/encdb.$(OBJEXT): internal/stdckdint.h
 enc/encdb.$(OBJEXT): internal/symbol.h
 enc/encdb.$(OBJEXT): internal/value.h
 enc/encdb.$(OBJEXT): internal/value_type.h
@@ -1305,6 +1315,7 @@ enc/euc_jp.$(OBJEXT): internal/intern/re.h
 enc/euc_jp.$(OBJEXT): internal/intern/ruby.h
 enc/euc_jp.$(OBJEXT): internal/intern/select.h
 enc/euc_jp.$(OBJEXT): internal/intern/select/largesize.h
+enc/euc_jp.$(OBJEXT): internal/intern/set.h
 enc/euc_jp.$(OBJEXT): internal/intern/signal.h
 enc/euc_jp.$(OBJEXT): internal/intern/sprintf.h
 enc/euc_jp.$(OBJEXT): internal/intern/string.h
@@ -1324,6 +1335,7 @@ enc/euc_jp.$(OBJEXT): internal/special_consts.h
 enc/euc_jp.$(OBJEXT): internal/static_assert.h
 enc/euc_jp.$(OBJEXT): internal/stdalign.h
 enc/euc_jp.$(OBJEXT): internal/stdbool.h
+enc/euc_jp.$(OBJEXT): internal/stdckdint.h
 enc/euc_jp.$(OBJEXT): internal/symbol.h
 enc/euc_jp.$(OBJEXT): internal/value.h
 enc/euc_jp.$(OBJEXT): internal/value_type.h
@@ -1465,6 +1477,7 @@ enc/euc_kr.$(OBJEXT): internal/intern/re.h
 enc/euc_kr.$(OBJEXT): internal/intern/ruby.h
 enc/euc_kr.$(OBJEXT): internal/intern/select.h
 enc/euc_kr.$(OBJEXT): internal/intern/select/largesize.h
+enc/euc_kr.$(OBJEXT): internal/intern/set.h
 enc/euc_kr.$(OBJEXT): internal/intern/signal.h
 enc/euc_kr.$(OBJEXT): internal/intern/sprintf.h
 enc/euc_kr.$(OBJEXT): internal/intern/string.h
@@ -1484,6 +1497,7 @@ enc/euc_kr.$(OBJEXT): internal/special_consts.h
 enc/euc_kr.$(OBJEXT): internal/static_assert.h
 enc/euc_kr.$(OBJEXT): internal/stdalign.h
 enc/euc_kr.$(OBJEXT): internal/stdbool.h
+enc/euc_kr.$(OBJEXT): internal/stdckdint.h
 enc/euc_kr.$(OBJEXT): internal/symbol.h
 enc/euc_kr.$(OBJEXT): internal/value.h
 enc/euc_kr.$(OBJEXT): internal/value_type.h
@@ -1625,6 +1639,7 @@ enc/euc_tw.$(OBJEXT): internal/intern/re.h
 enc/euc_tw.$(OBJEXT): internal/intern/ruby.h
 enc/euc_tw.$(OBJEXT): internal/intern/select.h
 enc/euc_tw.$(OBJEXT): internal/intern/select/largesize.h
+enc/euc_tw.$(OBJEXT): internal/intern/set.h
 enc/euc_tw.$(OBJEXT): internal/intern/signal.h
 enc/euc_tw.$(OBJEXT): internal/intern/sprintf.h
 enc/euc_tw.$(OBJEXT): internal/intern/string.h
@@ -1644,6 +1659,7 @@ enc/euc_tw.$(OBJEXT): internal/special_consts.h
 enc/euc_tw.$(OBJEXT): internal/static_assert.h
 enc/euc_tw.$(OBJEXT): internal/stdalign.h
 enc/euc_tw.$(OBJEXT): internal/stdbool.h
+enc/euc_tw.$(OBJEXT): internal/stdckdint.h
 enc/euc_tw.$(OBJEXT): internal/symbol.h
 enc/euc_tw.$(OBJEXT): internal/value.h
 enc/euc_tw.$(OBJEXT): internal/value_type.h
@@ -1785,6 +1801,7 @@ enc/gb18030.$(OBJEXT): internal/intern/re.h
 enc/gb18030.$(OBJEXT): internal/intern/ruby.h
 enc/gb18030.$(OBJEXT): internal/intern/select.h
 enc/gb18030.$(OBJEXT): internal/intern/select/largesize.h
+enc/gb18030.$(OBJEXT): internal/intern/set.h
 enc/gb18030.$(OBJEXT): internal/intern/signal.h
 enc/gb18030.$(OBJEXT): internal/intern/sprintf.h
 enc/gb18030.$(OBJEXT): internal/intern/string.h
@@ -1804,6 +1821,7 @@ enc/gb18030.$(OBJEXT): internal/special_consts.h
 enc/gb18030.$(OBJEXT): internal/static_assert.h
 enc/gb18030.$(OBJEXT): internal/stdalign.h
 enc/gb18030.$(OBJEXT): internal/stdbool.h
+enc/gb18030.$(OBJEXT): internal/stdckdint.h
 enc/gb18030.$(OBJEXT): internal/symbol.h
 enc/gb18030.$(OBJEXT): internal/value.h
 enc/gb18030.$(OBJEXT): internal/value_type.h
@@ -1945,6 +1963,7 @@ enc/gb2312.$(OBJEXT): internal/intern/re.h
 enc/gb2312.$(OBJEXT): internal/intern/ruby.h
 enc/gb2312.$(OBJEXT): internal/intern/select.h
 enc/gb2312.$(OBJEXT): internal/intern/select/largesize.h
+enc/gb2312.$(OBJEXT): internal/intern/set.h
 enc/gb2312.$(OBJEXT): internal/intern/signal.h
 enc/gb2312.$(OBJEXT): internal/intern/sprintf.h
 enc/gb2312.$(OBJEXT): internal/intern/string.h
@@ -1964,6 +1983,7 @@ enc/gb2312.$(OBJEXT): internal/special_consts.h
 enc/gb2312.$(OBJEXT): internal/static_assert.h
 enc/gb2312.$(OBJEXT): internal/stdalign.h
 enc/gb2312.$(OBJEXT): internal/stdbool.h
+enc/gb2312.$(OBJEXT): internal/stdckdint.h
 enc/gb2312.$(OBJEXT): internal/symbol.h
 enc/gb2312.$(OBJEXT): internal/value.h
 enc/gb2312.$(OBJEXT): internal/value_type.h
@@ -2105,6 +2125,7 @@ enc/gbk.$(OBJEXT): internal/intern/re.h
 enc/gbk.$(OBJEXT): internal/intern/ruby.h
 enc/gbk.$(OBJEXT): internal/intern/select.h
 enc/gbk.$(OBJEXT): internal/intern/select/largesize.h
+enc/gbk.$(OBJEXT): internal/intern/set.h
 enc/gbk.$(OBJEXT): internal/intern/signal.h
 enc/gbk.$(OBJEXT): internal/intern/sprintf.h
 enc/gbk.$(OBJEXT): internal/intern/string.h
@@ -2124,6 +2145,7 @@ enc/gbk.$(OBJEXT): internal/special_consts.h
 enc/gbk.$(OBJEXT): internal/static_assert.h
 enc/gbk.$(OBJEXT): internal/stdalign.h
 enc/gbk.$(OBJEXT): internal/stdbool.h
+enc/gbk.$(OBJEXT): internal/stdckdint.h
 enc/gbk.$(OBJEXT): internal/symbol.h
 enc/gbk.$(OBJEXT): internal/value.h
 enc/gbk.$(OBJEXT): internal/value_type.h
@@ -2266,6 +2288,7 @@ enc/iso_8859_1.$(OBJEXT): internal/intern/re.h
 enc/iso_8859_1.$(OBJEXT): internal/intern/ruby.h
 enc/iso_8859_1.$(OBJEXT): internal/intern/select.h
 enc/iso_8859_1.$(OBJEXT): internal/intern/select/largesize.h
+enc/iso_8859_1.$(OBJEXT): internal/intern/set.h
 enc/iso_8859_1.$(OBJEXT): internal/intern/signal.h
 enc/iso_8859_1.$(OBJEXT): internal/intern/sprintf.h
 enc/iso_8859_1.$(OBJEXT): internal/intern/string.h
@@ -2285,6 +2308,7 @@ enc/iso_8859_1.$(OBJEXT): internal/special_consts.h
 enc/iso_8859_1.$(OBJEXT): internal/static_assert.h
 enc/iso_8859_1.$(OBJEXT): internal/stdalign.h
 enc/iso_8859_1.$(OBJEXT): internal/stdbool.h
+enc/iso_8859_1.$(OBJEXT): internal/stdckdint.h
 enc/iso_8859_1.$(OBJEXT): internal/symbol.h
 enc/iso_8859_1.$(OBJEXT): internal/value.h
 enc/iso_8859_1.$(OBJEXT): internal/value_type.h
@@ -2427,6 +2451,7 @@ enc/iso_8859_10.$(OBJEXT): internal/intern/re.h
 enc/iso_8859_10.$(OBJEXT): internal/intern/ruby.h
 enc/iso_8859_10.$(OBJEXT): internal/intern/select.h
 enc/iso_8859_10.$(OBJEXT): internal/intern/select/largesize.h
+enc/iso_8859_10.$(OBJEXT): internal/intern/set.h
 enc/iso_8859_10.$(OBJEXT): internal/intern/signal.h
 enc/iso_8859_10.$(OBJEXT): internal/intern/sprintf.h
 enc/iso_8859_10.$(OBJEXT): internal/intern/string.h
@@ -2446,6 +2471,7 @@ enc/iso_8859_10.$(OBJEXT): internal/special_consts.h
 enc/iso_8859_10.$(OBJEXT): internal/static_assert.h
 enc/iso_8859_10.$(OBJEXT): internal/stdalign.h
 enc/iso_8859_10.$(OBJEXT): internal/stdbool.h
+enc/iso_8859_10.$(OBJEXT): internal/stdckdint.h
 enc/iso_8859_10.$(OBJEXT): internal/symbol.h
 enc/iso_8859_10.$(OBJEXT): internal/value.h
 enc/iso_8859_10.$(OBJEXT): internal/value_type.h
@@ -2587,6 +2613,7 @@ enc/iso_8859_11.$(OBJEXT): internal/intern/re.h
 enc/iso_8859_11.$(OBJEXT): internal/intern/ruby.h
 enc/iso_8859_11.$(OBJEXT): internal/intern/select.h
 enc/iso_8859_11.$(OBJEXT): internal/intern/select/largesize.h
+enc/iso_8859_11.$(OBJEXT): internal/intern/set.h
 enc/iso_8859_11.$(OBJEXT): internal/intern/signal.h
 enc/iso_8859_11.$(OBJEXT): internal/intern/sprintf.h
 enc/iso_8859_11.$(OBJEXT): internal/intern/string.h
@@ -2606,6 +2633,7 @@ enc/iso_8859_11.$(OBJEXT): internal/special_consts.h
 enc/iso_8859_11.$(OBJEXT): internal/static_assert.h
 enc/iso_8859_11.$(OBJEXT): internal/stdalign.h
 enc/iso_8859_11.$(OBJEXT): internal/stdbool.h
+enc/iso_8859_11.$(OBJEXT): internal/stdckdint.h
 enc/iso_8859_11.$(OBJEXT): internal/symbol.h
 enc/iso_8859_11.$(OBJEXT): internal/value.h
 enc/iso_8859_11.$(OBJEXT): internal/value_type.h
@@ -2748,6 +2776,7 @@ enc/iso_8859_13.$(OBJEXT): internal/intern/re.h
 enc/iso_8859_13.$(OBJEXT): internal/intern/ruby.h
 enc/iso_8859_13.$(OBJEXT): internal/intern/select.h
 enc/iso_8859_13.$(OBJEXT): internal/intern/select/largesize.h
+enc/iso_8859_13.$(OBJEXT): internal/intern/set.h
 enc/iso_8859_13.$(OBJEXT): internal/intern/signal.h
 enc/iso_8859_13.$(OBJEXT): internal/intern/sprintf.h
 enc/iso_8859_13.$(OBJEXT): internal/intern/string.h
@@ -2767,6 +2796,7 @@ enc/iso_8859_13.$(OBJEXT): internal/special_consts.h
 enc/iso_8859_13.$(OBJEXT): internal/static_assert.h
 enc/iso_8859_13.$(OBJEXT): internal/stdalign.h
 enc/iso_8859_13.$(OBJEXT): internal/stdbool.h
+enc/iso_8859_13.$(OBJEXT): internal/stdckdint.h
 enc/iso_8859_13.$(OBJEXT): internal/symbol.h
 enc/iso_8859_13.$(OBJEXT): internal/value.h
 enc/iso_8859_13.$(OBJEXT): internal/value_type.h
@@ -2909,6 +2939,7 @@ enc/iso_8859_14.$(OBJEXT): internal/intern/re.h
 enc/iso_8859_14.$(OBJEXT): internal/intern/ruby.h
 enc/iso_8859_14.$(OBJEXT): internal/intern/select.h
 enc/iso_8859_14.$(OBJEXT): internal/intern/select/largesize.h
+enc/iso_8859_14.$(OBJEXT): internal/intern/set.h
 enc/iso_8859_14.$(OBJEXT): internal/intern/signal.h
 enc/iso_8859_14.$(OBJEXT): internal/intern/sprintf.h
 enc/iso_8859_14.$(OBJEXT): internal/intern/string.h
@@ -2928,6 +2959,7 @@ enc/iso_8859_14.$(OBJEXT): internal/special_consts.h
 enc/iso_8859_14.$(OBJEXT): internal/static_assert.h
 enc/iso_8859_14.$(OBJEXT): internal/stdalign.h
 enc/iso_8859_14.$(OBJEXT): internal/stdbool.h
+enc/iso_8859_14.$(OBJEXT): internal/stdckdint.h
 enc/iso_8859_14.$(OBJEXT): internal/symbol.h
 enc/iso_8859_14.$(OBJEXT): internal/value.h
 enc/iso_8859_14.$(OBJEXT): internal/value_type.h
@@ -3070,6 +3102,7 @@ enc/iso_8859_15.$(OBJEXT): internal/intern/re.h
 enc/iso_8859_15.$(OBJEXT): internal/intern/ruby.h
 enc/iso_8859_15.$(OBJEXT): internal/intern/select.h
 enc/iso_8859_15.$(OBJEXT): internal/intern/select/largesize.h
+enc/iso_8859_15.$(OBJEXT): internal/intern/set.h
 enc/iso_8859_15.$(OBJEXT): internal/intern/signal.h
 enc/iso_8859_15.$(OBJEXT): internal/intern/sprintf.h
 enc/iso_8859_15.$(OBJEXT): internal/intern/string.h
@@ -3089,6 +3122,7 @@ enc/iso_8859_15.$(OBJEXT): internal/special_consts.h
 enc/iso_8859_15.$(OBJEXT): internal/static_assert.h
 enc/iso_8859_15.$(OBJEXT): internal/stdalign.h
 enc/iso_8859_15.$(OBJEXT): internal/stdbool.h
+enc/iso_8859_15.$(OBJEXT): internal/stdckdint.h
 enc/iso_8859_15.$(OBJEXT): internal/symbol.h
 enc/iso_8859_15.$(OBJEXT): internal/value.h
 enc/iso_8859_15.$(OBJEXT): internal/value_type.h
@@ -3231,6 +3265,7 @@ enc/iso_8859_16.$(OBJEXT): internal/intern/re.h
 enc/iso_8859_16.$(OBJEXT): internal/intern/ruby.h
 enc/iso_8859_16.$(OBJEXT): internal/intern/select.h
 enc/iso_8859_16.$(OBJEXT): internal/intern/select/largesize.h
+enc/iso_8859_16.$(OBJEXT): internal/intern/set.h
 enc/iso_8859_16.$(OBJEXT): internal/intern/signal.h
 enc/iso_8859_16.$(OBJEXT): internal/intern/sprintf.h
 enc/iso_8859_16.$(OBJEXT): internal/intern/string.h
@@ -3250,6 +3285,7 @@ enc/iso_8859_16.$(OBJEXT): internal/special_consts.h
 enc/iso_8859_16.$(OBJEXT): internal/static_assert.h
 enc/iso_8859_16.$(OBJEXT): internal/stdalign.h
 enc/iso_8859_16.$(OBJEXT): internal/stdbool.h
+enc/iso_8859_16.$(OBJEXT): internal/stdckdint.h
 enc/iso_8859_16.$(OBJEXT): internal/symbol.h
 enc/iso_8859_16.$(OBJEXT): internal/value.h
 enc/iso_8859_16.$(OBJEXT): internal/value_type.h
@@ -3392,6 +3428,7 @@ enc/iso_8859_2.$(OBJEXT): internal/intern/re.h
 enc/iso_8859_2.$(OBJEXT): internal/intern/ruby.h
 enc/iso_8859_2.$(OBJEXT): internal/intern/select.h
 enc/iso_8859_2.$(OBJEXT): internal/intern/select/largesize.h
+enc/iso_8859_2.$(OBJEXT): internal/intern/set.h
 enc/iso_8859_2.$(OBJEXT): internal/intern/signal.h
 enc/iso_8859_2.$(OBJEXT): internal/intern/sprintf.h
 enc/iso_8859_2.$(OBJEXT): internal/intern/string.h
@@ -3411,6 +3448,7 @@ enc/iso_8859_2.$(OBJEXT): internal/special_consts.h
 enc/iso_8859_2.$(OBJEXT): internal/static_assert.h
 enc/iso_8859_2.$(OBJEXT): internal/stdalign.h
 enc/iso_8859_2.$(OBJEXT): internal/stdbool.h
+enc/iso_8859_2.$(OBJEXT): internal/stdckdint.h
 enc/iso_8859_2.$(OBJEXT): internal/symbol.h
 enc/iso_8859_2.$(OBJEXT): internal/value.h
 enc/iso_8859_2.$(OBJEXT): internal/value_type.h
@@ -3553,6 +3591,7 @@ enc/iso_8859_3.$(OBJEXT): internal/intern/re.h
 enc/iso_8859_3.$(OBJEXT): internal/intern/ruby.h
 enc/iso_8859_3.$(OBJEXT): internal/intern/select.h
 enc/iso_8859_3.$(OBJEXT): internal/intern/select/largesize.h
+enc/iso_8859_3.$(OBJEXT): internal/intern/set.h
 enc/iso_8859_3.$(OBJEXT): internal/intern/signal.h
 enc/iso_8859_3.$(OBJEXT): internal/intern/sprintf.h
 enc/iso_8859_3.$(OBJEXT): internal/intern/string.h
@@ -3572,6 +3611,7 @@ enc/iso_8859_3.$(OBJEXT): internal/special_consts.h
 enc/iso_8859_3.$(OBJEXT): internal/static_assert.h
 enc/iso_8859_3.$(OBJEXT): internal/stdalign.h
 enc/iso_8859_3.$(OBJEXT): internal/stdbool.h
+enc/iso_8859_3.$(OBJEXT): internal/stdckdint.h
 enc/iso_8859_3.$(OBJEXT): internal/symbol.h
 enc/iso_8859_3.$(OBJEXT): internal/value.h
 enc/iso_8859_3.$(OBJEXT): internal/value_type.h
@@ -3714,6 +3754,7 @@ enc/iso_8859_4.$(OBJEXT): internal/intern/re.h
 enc/iso_8859_4.$(OBJEXT): internal/intern/ruby.h
 enc/iso_8859_4.$(OBJEXT): internal/intern/select.h
 enc/iso_8859_4.$(OBJEXT): internal/intern/select/largesize.h
+enc/iso_8859_4.$(OBJEXT): internal/intern/set.h
 enc/iso_8859_4.$(OBJEXT): internal/intern/signal.h
 enc/iso_8859_4.$(OBJEXT): internal/intern/sprintf.h
 enc/iso_8859_4.$(OBJEXT): internal/intern/string.h
@@ -3733,6 +3774,7 @@ enc/iso_8859_4.$(OBJEXT): internal/special_consts.h
 enc/iso_8859_4.$(OBJEXT): internal/static_assert.h
 enc/iso_8859_4.$(OBJEXT): internal/stdalign.h
 enc/iso_8859_4.$(OBJEXT): internal/stdbool.h
+enc/iso_8859_4.$(OBJEXT): internal/stdckdint.h
 enc/iso_8859_4.$(OBJEXT): internal/symbol.h
 enc/iso_8859_4.$(OBJEXT): internal/value.h
 enc/iso_8859_4.$(OBJEXT): internal/value_type.h
@@ -3874,6 +3916,7 @@ enc/iso_8859_5.$(OBJEXT): internal/intern/re.h
 enc/iso_8859_5.$(OBJEXT): internal/intern/ruby.h
 enc/iso_8859_5.$(OBJEXT): internal/intern/select.h
 enc/iso_8859_5.$(OBJEXT): internal/intern/select/largesize.h
+enc/iso_8859_5.$(OBJEXT): internal/intern/set.h
 enc/iso_8859_5.$(OBJEXT): internal/intern/signal.h
 enc/iso_8859_5.$(OBJEXT): internal/intern/sprintf.h
 enc/iso_8859_5.$(OBJEXT): internal/intern/string.h
@@ -3893,6 +3936,7 @@ enc/iso_8859_5.$(OBJEXT): internal/special_consts.h
 enc/iso_8859_5.$(OBJEXT): internal/static_assert.h
 enc/iso_8859_5.$(OBJEXT): internal/stdalign.h
 enc/iso_8859_5.$(OBJEXT): internal/stdbool.h
+enc/iso_8859_5.$(OBJEXT): internal/stdckdint.h
 enc/iso_8859_5.$(OBJEXT): internal/symbol.h
 enc/iso_8859_5.$(OBJEXT): internal/value.h
 enc/iso_8859_5.$(OBJEXT): internal/value_type.h
@@ -4034,6 +4078,7 @@ enc/iso_8859_6.$(OBJEXT): internal/intern/re.h
 enc/iso_8859_6.$(OBJEXT): internal/intern/ruby.h
 enc/iso_8859_6.$(OBJEXT): internal/intern/select.h
 enc/iso_8859_6.$(OBJEXT): internal/intern/select/largesize.h
+enc/iso_8859_6.$(OBJEXT): internal/intern/set.h
 enc/iso_8859_6.$(OBJEXT): internal/intern/signal.h
 enc/iso_8859_6.$(OBJEXT): internal/intern/sprintf.h
 enc/iso_8859_6.$(OBJEXT): internal/intern/string.h
@@ -4053,6 +4098,7 @@ enc/iso_8859_6.$(OBJEXT): internal/special_consts.h
 enc/iso_8859_6.$(OBJEXT): internal/static_assert.h
 enc/iso_8859_6.$(OBJEXT): internal/stdalign.h
 enc/iso_8859_6.$(OBJEXT): internal/stdbool.h
+enc/iso_8859_6.$(OBJEXT): internal/stdckdint.h
 enc/iso_8859_6.$(OBJEXT): internal/symbol.h
 enc/iso_8859_6.$(OBJEXT): internal/value.h
 enc/iso_8859_6.$(OBJEXT): internal/value_type.h
@@ -4194,6 +4240,7 @@ enc/iso_8859_7.$(OBJEXT): internal/intern/re.h
 enc/iso_8859_7.$(OBJEXT): internal/intern/ruby.h
 enc/iso_8859_7.$(OBJEXT): internal/intern/select.h
 enc/iso_8859_7.$(OBJEXT): internal/intern/select/largesize.h
+enc/iso_8859_7.$(OBJEXT): internal/intern/set.h
 enc/iso_8859_7.$(OBJEXT): internal/intern/signal.h
 enc/iso_8859_7.$(OBJEXT): internal/intern/sprintf.h
 enc/iso_8859_7.$(OBJEXT): internal/intern/string.h
@@ -4213,6 +4260,7 @@ enc/iso_8859_7.$(OBJEXT): internal/special_consts.h
 enc/iso_8859_7.$(OBJEXT): internal/static_assert.h
 enc/iso_8859_7.$(OBJEXT): internal/stdalign.h
 enc/iso_8859_7.$(OBJEXT): internal/stdbool.h
+enc/iso_8859_7.$(OBJEXT): internal/stdckdint.h
 enc/iso_8859_7.$(OBJEXT): internal/symbol.h
 enc/iso_8859_7.$(OBJEXT): internal/value.h
 enc/iso_8859_7.$(OBJEXT): internal/value_type.h
@@ -4354,6 +4402,7 @@ enc/iso_8859_8.$(OBJEXT): internal/intern/re.h
 enc/iso_8859_8.$(OBJEXT): internal/intern/ruby.h
 enc/iso_8859_8.$(OBJEXT): internal/intern/select.h
 enc/iso_8859_8.$(OBJEXT): internal/intern/select/largesize.h
+enc/iso_8859_8.$(OBJEXT): internal/intern/set.h
 enc/iso_8859_8.$(OBJEXT): internal/intern/signal.h
 enc/iso_8859_8.$(OBJEXT): internal/intern/sprintf.h
 enc/iso_8859_8.$(OBJEXT): internal/intern/string.h
@@ -4373,6 +4422,7 @@ enc/iso_8859_8.$(OBJEXT): internal/special_consts.h
 enc/iso_8859_8.$(OBJEXT): internal/static_assert.h
 enc/iso_8859_8.$(OBJEXT): internal/stdalign.h
 enc/iso_8859_8.$(OBJEXT): internal/stdbool.h
+enc/iso_8859_8.$(OBJEXT): internal/stdckdint.h
 enc/iso_8859_8.$(OBJEXT): internal/symbol.h
 enc/iso_8859_8.$(OBJEXT): internal/value.h
 enc/iso_8859_8.$(OBJEXT): internal/value_type.h
@@ -4515,6 +4565,7 @@ enc/iso_8859_9.$(OBJEXT): internal/intern/re.h
 enc/iso_8859_9.$(OBJEXT): internal/intern/ruby.h
 enc/iso_8859_9.$(OBJEXT): internal/intern/select.h
 enc/iso_8859_9.$(OBJEXT): internal/intern/select/largesize.h
+enc/iso_8859_9.$(OBJEXT): internal/intern/set.h
 enc/iso_8859_9.$(OBJEXT): internal/intern/signal.h
 enc/iso_8859_9.$(OBJEXT): internal/intern/sprintf.h
 enc/iso_8859_9.$(OBJEXT): internal/intern/string.h
@@ -4534,6 +4585,7 @@ enc/iso_8859_9.$(OBJEXT): internal/special_consts.h
 enc/iso_8859_9.$(OBJEXT): internal/static_assert.h
 enc/iso_8859_9.$(OBJEXT): internal/stdalign.h
 enc/iso_8859_9.$(OBJEXT): internal/stdbool.h
+enc/iso_8859_9.$(OBJEXT): internal/stdckdint.h
 enc/iso_8859_9.$(OBJEXT): internal/symbol.h
 enc/iso_8859_9.$(OBJEXT): internal/value.h
 enc/iso_8859_9.$(OBJEXT): internal/value_type.h
@@ -4675,6 +4727,7 @@ enc/koi8_r.$(OBJEXT): internal/intern/re.h
 enc/koi8_r.$(OBJEXT): internal/intern/ruby.h
 enc/koi8_r.$(OBJEXT): internal/intern/select.h
 enc/koi8_r.$(OBJEXT): internal/intern/select/largesize.h
+enc/koi8_r.$(OBJEXT): internal/intern/set.h
 enc/koi8_r.$(OBJEXT): internal/intern/signal.h
 enc/koi8_r.$(OBJEXT): internal/intern/sprintf.h
 enc/koi8_r.$(OBJEXT): internal/intern/string.h
@@ -4694,6 +4747,7 @@ enc/koi8_r.$(OBJEXT): internal/special_consts.h
 enc/koi8_r.$(OBJEXT): internal/static_assert.h
 enc/koi8_r.$(OBJEXT): internal/stdalign.h
 enc/koi8_r.$(OBJEXT): internal/stdbool.h
+enc/koi8_r.$(OBJEXT): internal/stdckdint.h
 enc/koi8_r.$(OBJEXT): internal/symbol.h
 enc/koi8_r.$(OBJEXT): internal/value.h
 enc/koi8_r.$(OBJEXT): internal/value_type.h
@@ -4835,6 +4889,7 @@ enc/koi8_u.$(OBJEXT): internal/intern/re.h
 enc/koi8_u.$(OBJEXT): internal/intern/ruby.h
 enc/koi8_u.$(OBJEXT): internal/intern/select.h
 enc/koi8_u.$(OBJEXT): internal/intern/select/largesize.h
+enc/koi8_u.$(OBJEXT): internal/intern/set.h
 enc/koi8_u.$(OBJEXT): internal/intern/signal.h
 enc/koi8_u.$(OBJEXT): internal/intern/sprintf.h
 enc/koi8_u.$(OBJEXT): internal/intern/string.h
@@ -4854,6 +4909,7 @@ enc/koi8_u.$(OBJEXT): internal/special_consts.h
 enc/koi8_u.$(OBJEXT): internal/static_assert.h
 enc/koi8_u.$(OBJEXT): internal/stdalign.h
 enc/koi8_u.$(OBJEXT): internal/stdbool.h
+enc/koi8_u.$(OBJEXT): internal/stdckdint.h
 enc/koi8_u.$(OBJEXT): internal/symbol.h
 enc/koi8_u.$(OBJEXT): internal/value.h
 enc/koi8_u.$(OBJEXT): internal/value_type.h
@@ -4998,6 +5054,7 @@ enc/shift_jis.$(OBJEXT): internal/intern/re.h
 enc/shift_jis.$(OBJEXT): internal/intern/ruby.h
 enc/shift_jis.$(OBJEXT): internal/intern/select.h
 enc/shift_jis.$(OBJEXT): internal/intern/select/largesize.h
+enc/shift_jis.$(OBJEXT): internal/intern/set.h
 enc/shift_jis.$(OBJEXT): internal/intern/signal.h
 enc/shift_jis.$(OBJEXT): internal/intern/sprintf.h
 enc/shift_jis.$(OBJEXT): internal/intern/string.h
@@ -5017,6 +5074,7 @@ enc/shift_jis.$(OBJEXT): internal/special_consts.h
 enc/shift_jis.$(OBJEXT): internal/static_assert.h
 enc/shift_jis.$(OBJEXT): internal/stdalign.h
 enc/shift_jis.$(OBJEXT): internal/stdbool.h
+enc/shift_jis.$(OBJEXT): internal/stdckdint.h
 enc/shift_jis.$(OBJEXT): internal/symbol.h
 enc/shift_jis.$(OBJEXT): internal/value.h
 enc/shift_jis.$(OBJEXT): internal/value_type.h
@@ -5157,6 +5215,7 @@ enc/trans/big5.$(OBJEXT): internal/intern/re.h
 enc/trans/big5.$(OBJEXT): internal/intern/ruby.h
 enc/trans/big5.$(OBJEXT): internal/intern/select.h
 enc/trans/big5.$(OBJEXT): internal/intern/select/largesize.h
+enc/trans/big5.$(OBJEXT): internal/intern/set.h
 enc/trans/big5.$(OBJEXT): internal/intern/signal.h
 enc/trans/big5.$(OBJEXT): internal/intern/sprintf.h
 enc/trans/big5.$(OBJEXT): internal/intern/string.h
@@ -5176,6 +5235,7 @@ enc/trans/big5.$(OBJEXT): internal/special_consts.h
 enc/trans/big5.$(OBJEXT): internal/static_assert.h
 enc/trans/big5.$(OBJEXT): internal/stdalign.h
 enc/trans/big5.$(OBJEXT): internal/stdbool.h
+enc/trans/big5.$(OBJEXT): internal/stdckdint.h
 enc/trans/big5.$(OBJEXT): internal/symbol.h
 enc/trans/big5.$(OBJEXT): internal/value.h
 enc/trans/big5.$(OBJEXT): internal/value_type.h
@@ -5315,6 +5375,7 @@ enc/trans/cesu_8.$(OBJEXT): internal/intern/re.h
 enc/trans/cesu_8.$(OBJEXT): internal/intern/ruby.h
 enc/trans/cesu_8.$(OBJEXT): internal/intern/select.h
 enc/trans/cesu_8.$(OBJEXT): internal/intern/select/largesize.h
+enc/trans/cesu_8.$(OBJEXT): internal/intern/set.h
 enc/trans/cesu_8.$(OBJEXT): internal/intern/signal.h
 enc/trans/cesu_8.$(OBJEXT): internal/intern/sprintf.h
 enc/trans/cesu_8.$(OBJEXT): internal/intern/string.h
@@ -5334,6 +5395,7 @@ enc/trans/cesu_8.$(OBJEXT): internal/special_consts.h
 enc/trans/cesu_8.$(OBJEXT): internal/static_assert.h
 enc/trans/cesu_8.$(OBJEXT): internal/stdalign.h
 enc/trans/cesu_8.$(OBJEXT): internal/stdbool.h
+enc/trans/cesu_8.$(OBJEXT): internal/stdckdint.h
 enc/trans/cesu_8.$(OBJEXT): internal/symbol.h
 enc/trans/cesu_8.$(OBJEXT): internal/value.h
 enc/trans/cesu_8.$(OBJEXT): internal/value_type.h
@@ -5473,6 +5535,7 @@ enc/trans/chinese.$(OBJEXT): internal/intern/re.h
 enc/trans/chinese.$(OBJEXT): internal/intern/ruby.h
 enc/trans/chinese.$(OBJEXT): internal/intern/select.h
 enc/trans/chinese.$(OBJEXT): internal/intern/select/largesize.h
+enc/trans/chinese.$(OBJEXT): internal/intern/set.h
 enc/trans/chinese.$(OBJEXT): internal/intern/signal.h
 enc/trans/chinese.$(OBJEXT): internal/intern/sprintf.h
 enc/trans/chinese.$(OBJEXT): internal/intern/string.h
@@ -5492,6 +5555,7 @@ enc/trans/chinese.$(OBJEXT): internal/special_consts.h
 enc/trans/chinese.$(OBJEXT): internal/static_assert.h
 enc/trans/chinese.$(OBJEXT): internal/stdalign.h
 enc/trans/chinese.$(OBJEXT): internal/stdbool.h
+enc/trans/chinese.$(OBJEXT): internal/stdckdint.h
 enc/trans/chinese.$(OBJEXT): internal/symbol.h
 enc/trans/chinese.$(OBJEXT): internal/value.h
 enc/trans/chinese.$(OBJEXT): internal/value_type.h
@@ -5631,6 +5695,7 @@ enc/trans/ebcdic.$(OBJEXT): internal/intern/re.h
 enc/trans/ebcdic.$(OBJEXT): internal/intern/ruby.h
 enc/trans/ebcdic.$(OBJEXT): internal/intern/select.h
 enc/trans/ebcdic.$(OBJEXT): internal/intern/select/largesize.h
+enc/trans/ebcdic.$(OBJEXT): internal/intern/set.h
 enc/trans/ebcdic.$(OBJEXT): internal/intern/signal.h
 enc/trans/ebcdic.$(OBJEXT): internal/intern/sprintf.h
 enc/trans/ebcdic.$(OBJEXT): internal/intern/string.h
@@ -5650,6 +5715,7 @@ enc/trans/ebcdic.$(OBJEXT): internal/special_consts.h
 enc/trans/ebcdic.$(OBJEXT): internal/static_assert.h
 enc/trans/ebcdic.$(OBJEXT): internal/stdalign.h
 enc/trans/ebcdic.$(OBJEXT): internal/stdbool.h
+enc/trans/ebcdic.$(OBJEXT): internal/stdckdint.h
 enc/trans/ebcdic.$(OBJEXT): internal/symbol.h
 enc/trans/ebcdic.$(OBJEXT): internal/value.h
 enc/trans/ebcdic.$(OBJEXT): internal/value_type.h
@@ -5789,6 +5855,7 @@ enc/trans/emoji.$(OBJEXT): internal/intern/re.h
 enc/trans/emoji.$(OBJEXT): internal/intern/ruby.h
 enc/trans/emoji.$(OBJEXT): internal/intern/select.h
 enc/trans/emoji.$(OBJEXT): internal/intern/select/largesize.h
+enc/trans/emoji.$(OBJEXT): internal/intern/set.h
 enc/trans/emoji.$(OBJEXT): internal/intern/signal.h
 enc/trans/emoji.$(OBJEXT): internal/intern/sprintf.h
 enc/trans/emoji.$(OBJEXT): internal/intern/string.h
@@ -5808,6 +5875,7 @@ enc/trans/emoji.$(OBJEXT): internal/special_consts.h
 enc/trans/emoji.$(OBJEXT): internal/static_assert.h
 enc/trans/emoji.$(OBJEXT): internal/stdalign.h
 enc/trans/emoji.$(OBJEXT): internal/stdbool.h
+enc/trans/emoji.$(OBJEXT): internal/stdckdint.h
 enc/trans/emoji.$(OBJEXT): internal/symbol.h
 enc/trans/emoji.$(OBJEXT): internal/value.h
 enc/trans/emoji.$(OBJEXT): internal/value_type.h
@@ -5947,6 +6015,7 @@ enc/trans/emoji_iso2022_kddi.$(OBJEXT): internal/intern/re.h
 enc/trans/emoji_iso2022_kddi.$(OBJEXT): internal/intern/ruby.h
 enc/trans/emoji_iso2022_kddi.$(OBJEXT): internal/intern/select.h
 enc/trans/emoji_iso2022_kddi.$(OBJEXT): internal/intern/select/largesize.h
+enc/trans/emoji_iso2022_kddi.$(OBJEXT): internal/intern/set.h
 enc/trans/emoji_iso2022_kddi.$(OBJEXT): internal/intern/signal.h
 enc/trans/emoji_iso2022_kddi.$(OBJEXT): internal/intern/sprintf.h
 enc/trans/emoji_iso2022_kddi.$(OBJEXT): internal/intern/string.h
@@ -5966,6 +6035,7 @@ enc/trans/emoji_iso2022_kddi.$(OBJEXT): internal/special_consts.h
 enc/trans/emoji_iso2022_kddi.$(OBJEXT): internal/static_assert.h
 enc/trans/emoji_iso2022_kddi.$(OBJEXT): internal/stdalign.h
 enc/trans/emoji_iso2022_kddi.$(OBJEXT): internal/stdbool.h
+enc/trans/emoji_iso2022_kddi.$(OBJEXT): internal/stdckdint.h
 enc/trans/emoji_iso2022_kddi.$(OBJEXT): internal/symbol.h
 enc/trans/emoji_iso2022_kddi.$(OBJEXT): internal/value.h
 enc/trans/emoji_iso2022_kddi.$(OBJEXT): internal/value_type.h
@@ -6105,6 +6175,7 @@ enc/trans/emoji_sjis_docomo.$(OBJEXT): internal/intern/re.h
 enc/trans/emoji_sjis_docomo.$(OBJEXT): internal/intern/ruby.h
 enc/trans/emoji_sjis_docomo.$(OBJEXT): internal/intern/select.h
 enc/trans/emoji_sjis_docomo.$(OBJEXT): internal/intern/select/largesize.h
+enc/trans/emoji_sjis_docomo.$(OBJEXT): internal/intern/set.h
 enc/trans/emoji_sjis_docomo.$(OBJEXT): internal/intern/signal.h
 enc/trans/emoji_sjis_docomo.$(OBJEXT): internal/intern/sprintf.h
 enc/trans/emoji_sjis_docomo.$(OBJEXT): internal/intern/string.h
@@ -6124,6 +6195,7 @@ enc/trans/emoji_sjis_docomo.$(OBJEXT): internal/special_consts.h
 enc/trans/emoji_sjis_docomo.$(OBJEXT): internal/static_assert.h
 enc/trans/emoji_sjis_docomo.$(OBJEXT): internal/stdalign.h
 enc/trans/emoji_sjis_docomo.$(OBJEXT): internal/stdbool.h
+enc/trans/emoji_sjis_docomo.$(OBJEXT): internal/stdckdint.h
 enc/trans/emoji_sjis_docomo.$(OBJEXT): internal/symbol.h
 enc/trans/emoji_sjis_docomo.$(OBJEXT): internal/value.h
 enc/trans/emoji_sjis_docomo.$(OBJEXT): internal/value_type.h
@@ -6263,6 +6335,7 @@ enc/trans/emoji_sjis_kddi.$(OBJEXT): internal/intern/re.h
 enc/trans/emoji_sjis_kddi.$(OBJEXT): internal/intern/ruby.h
 enc/trans/emoji_sjis_kddi.$(OBJEXT): internal/intern/select.h
 enc/trans/emoji_sjis_kddi.$(OBJEXT): internal/intern/select/largesize.h
+enc/trans/emoji_sjis_kddi.$(OBJEXT): internal/intern/set.h
 enc/trans/emoji_sjis_kddi.$(OBJEXT): internal/intern/signal.h
 enc/trans/emoji_sjis_kddi.$(OBJEXT): internal/intern/sprintf.h
 enc/trans/emoji_sjis_kddi.$(OBJEXT): internal/intern/string.h
@@ -6282,6 +6355,7 @@ enc/trans/emoji_sjis_kddi.$(OBJEXT): internal/special_consts.h
 enc/trans/emoji_sjis_kddi.$(OBJEXT): internal/static_assert.h
 enc/trans/emoji_sjis_kddi.$(OBJEXT): internal/stdalign.h
 enc/trans/emoji_sjis_kddi.$(OBJEXT): internal/stdbool.h
+enc/trans/emoji_sjis_kddi.$(OBJEXT): internal/stdckdint.h
 enc/trans/emoji_sjis_kddi.$(OBJEXT): internal/symbol.h
 enc/trans/emoji_sjis_kddi.$(OBJEXT): internal/value.h
 enc/trans/emoji_sjis_kddi.$(OBJEXT): internal/value_type.h
@@ -6421,6 +6495,7 @@ enc/trans/emoji_sjis_softbank.$(OBJEXT): internal/intern/re.h
 enc/trans/emoji_sjis_softbank.$(OBJEXT): internal/intern/ruby.h
 enc/trans/emoji_sjis_softbank.$(OBJEXT): internal/intern/select.h
 enc/trans/emoji_sjis_softbank.$(OBJEXT): internal/intern/select/largesize.h
+enc/trans/emoji_sjis_softbank.$(OBJEXT): internal/intern/set.h
 enc/trans/emoji_sjis_softbank.$(OBJEXT): internal/intern/signal.h
 enc/trans/emoji_sjis_softbank.$(OBJEXT): internal/intern/sprintf.h
 enc/trans/emoji_sjis_softbank.$(OBJEXT): internal/intern/string.h
@@ -6440,6 +6515,7 @@ enc/trans/emoji_sjis_softbank.$(OBJEXT): internal/special_consts.h
 enc/trans/emoji_sjis_softbank.$(OBJEXT): internal/static_assert.h
 enc/trans/emoji_sjis_softbank.$(OBJEXT): internal/stdalign.h
 enc/trans/emoji_sjis_softbank.$(OBJEXT): internal/stdbool.h
+enc/trans/emoji_sjis_softbank.$(OBJEXT): internal/stdckdint.h
 enc/trans/emoji_sjis_softbank.$(OBJEXT): internal/symbol.h
 enc/trans/emoji_sjis_softbank.$(OBJEXT): internal/value.h
 enc/trans/emoji_sjis_softbank.$(OBJEXT): internal/value_type.h
@@ -6579,6 +6655,7 @@ enc/trans/escape.$(OBJEXT): internal/intern/re.h
 enc/trans/escape.$(OBJEXT): internal/intern/ruby.h
 enc/trans/escape.$(OBJEXT): internal/intern/select.h
 enc/trans/escape.$(OBJEXT): internal/intern/select/largesize.h
+enc/trans/escape.$(OBJEXT): internal/intern/set.h
 enc/trans/escape.$(OBJEXT): internal/intern/signal.h
 enc/trans/escape.$(OBJEXT): internal/intern/sprintf.h
 enc/trans/escape.$(OBJEXT): internal/intern/string.h
@@ -6598,6 +6675,7 @@ enc/trans/escape.$(OBJEXT): internal/special_consts.h
 enc/trans/escape.$(OBJEXT): internal/static_assert.h
 enc/trans/escape.$(OBJEXT): internal/stdalign.h
 enc/trans/escape.$(OBJEXT): internal/stdbool.h
+enc/trans/escape.$(OBJEXT): internal/stdckdint.h
 enc/trans/escape.$(OBJEXT): internal/symbol.h
 enc/trans/escape.$(OBJEXT): internal/value.h
 enc/trans/escape.$(OBJEXT): internal/value_type.h
@@ -6737,6 +6815,7 @@ enc/trans/gb18030.$(OBJEXT): internal/intern/re.h
 enc/trans/gb18030.$(OBJEXT): internal/intern/ruby.h
 enc/trans/gb18030.$(OBJEXT): internal/intern/select.h
 enc/trans/gb18030.$(OBJEXT): internal/intern/select/largesize.h
+enc/trans/gb18030.$(OBJEXT): internal/intern/set.h
 enc/trans/gb18030.$(OBJEXT): internal/intern/signal.h
 enc/trans/gb18030.$(OBJEXT): internal/intern/sprintf.h
 enc/trans/gb18030.$(OBJEXT): internal/intern/string.h
@@ -6756,6 +6835,7 @@ enc/trans/gb18030.$(OBJEXT): internal/special_consts.h
 enc/trans/gb18030.$(OBJEXT): internal/static_assert.h
 enc/trans/gb18030.$(OBJEXT): internal/stdalign.h
 enc/trans/gb18030.$(OBJEXT): internal/stdbool.h
+enc/trans/gb18030.$(OBJEXT): internal/stdckdint.h
 enc/trans/gb18030.$(OBJEXT): internal/symbol.h
 enc/trans/gb18030.$(OBJEXT): internal/value.h
 enc/trans/gb18030.$(OBJEXT): internal/value_type.h
@@ -6895,6 +6975,7 @@ enc/trans/gbk.$(OBJEXT): internal/intern/re.h
 enc/trans/gbk.$(OBJEXT): internal/intern/ruby.h
 enc/trans/gbk.$(OBJEXT): internal/intern/select.h
 enc/trans/gbk.$(OBJEXT): internal/intern/select/largesize.h
+enc/trans/gbk.$(OBJEXT): internal/intern/set.h
 enc/trans/gbk.$(OBJEXT): internal/intern/signal.h
 enc/trans/gbk.$(OBJEXT): internal/intern/sprintf.h
 enc/trans/gbk.$(OBJEXT): internal/intern/string.h
@@ -6914,6 +6995,7 @@ enc/trans/gbk.$(OBJEXT): internal/special_consts.h
 enc/trans/gbk.$(OBJEXT): internal/static_assert.h
 enc/trans/gbk.$(OBJEXT): internal/stdalign.h
 enc/trans/gbk.$(OBJEXT): internal/stdbool.h
+enc/trans/gbk.$(OBJEXT): internal/stdckdint.h
 enc/trans/gbk.$(OBJEXT): internal/symbol.h
 enc/trans/gbk.$(OBJEXT): internal/value.h
 enc/trans/gbk.$(OBJEXT): internal/value_type.h
@@ -6976,6 +7058,7 @@ enc/trans/iso2022.$(OBJEXT): internal/attr/nodiscard.h
 enc/trans/iso2022.$(OBJEXT): internal/attr/noexcept.h
 enc/trans/iso2022.$(OBJEXT): internal/attr/noinline.h
 enc/trans/iso2022.$(OBJEXT): internal/attr/nonnull.h
+enc/trans/iso2022.$(OBJEXT): internal/attr/nonstring.h
 enc/trans/iso2022.$(OBJEXT): internal/attr/noreturn.h
 enc/trans/iso2022.$(OBJEXT): internal/attr/packed_struct.h
 enc/trans/iso2022.$(OBJEXT): internal/attr/pure.h
@@ -7053,6 +7136,7 @@ enc/trans/iso2022.$(OBJEXT): internal/intern/re.h
 enc/trans/iso2022.$(OBJEXT): internal/intern/ruby.h
 enc/trans/iso2022.$(OBJEXT): internal/intern/select.h
 enc/trans/iso2022.$(OBJEXT): internal/intern/select/largesize.h
+enc/trans/iso2022.$(OBJEXT): internal/intern/set.h
 enc/trans/iso2022.$(OBJEXT): internal/intern/signal.h
 enc/trans/iso2022.$(OBJEXT): internal/intern/sprintf.h
 enc/trans/iso2022.$(OBJEXT): internal/intern/string.h
@@ -7072,6 +7156,7 @@ enc/trans/iso2022.$(OBJEXT): internal/special_consts.h
 enc/trans/iso2022.$(OBJEXT): internal/static_assert.h
 enc/trans/iso2022.$(OBJEXT): internal/stdalign.h
 enc/trans/iso2022.$(OBJEXT): internal/stdbool.h
+enc/trans/iso2022.$(OBJEXT): internal/stdckdint.h
 enc/trans/iso2022.$(OBJEXT): internal/symbol.h
 enc/trans/iso2022.$(OBJEXT): internal/value.h
 enc/trans/iso2022.$(OBJEXT): internal/value_type.h
@@ -7211,6 +7296,7 @@ enc/trans/japanese.$(OBJEXT): internal/intern/re.h
 enc/trans/japanese.$(OBJEXT): internal/intern/ruby.h
 enc/trans/japanese.$(OBJEXT): internal/intern/select.h
 enc/trans/japanese.$(OBJEXT): internal/intern/select/largesize.h
+enc/trans/japanese.$(OBJEXT): internal/intern/set.h
 enc/trans/japanese.$(OBJEXT): internal/intern/signal.h
 enc/trans/japanese.$(OBJEXT): internal/intern/sprintf.h
 enc/trans/japanese.$(OBJEXT): internal/intern/string.h
@@ -7230,6 +7316,7 @@ enc/trans/japanese.$(OBJEXT): internal/special_consts.h
 enc/trans/japanese.$(OBJEXT): internal/static_assert.h
 enc/trans/japanese.$(OBJEXT): internal/stdalign.h
 enc/trans/japanese.$(OBJEXT): internal/stdbool.h
+enc/trans/japanese.$(OBJEXT): internal/stdckdint.h
 enc/trans/japanese.$(OBJEXT): internal/symbol.h
 enc/trans/japanese.$(OBJEXT): internal/value.h
 enc/trans/japanese.$(OBJEXT): internal/value_type.h
@@ -7369,6 +7456,7 @@ enc/trans/japanese_euc.$(OBJEXT): internal/intern/re.h
 enc/trans/japanese_euc.$(OBJEXT): internal/intern/ruby.h
 enc/trans/japanese_euc.$(OBJEXT): internal/intern/select.h
 enc/trans/japanese_euc.$(OBJEXT): internal/intern/select/largesize.h
+enc/trans/japanese_euc.$(OBJEXT): internal/intern/set.h
 enc/trans/japanese_euc.$(OBJEXT): internal/intern/signal.h
 enc/trans/japanese_euc.$(OBJEXT): internal/intern/sprintf.h
 enc/trans/japanese_euc.$(OBJEXT): internal/intern/string.h
@@ -7388,6 +7476,7 @@ enc/trans/japanese_euc.$(OBJEXT): internal/special_consts.h
 enc/trans/japanese_euc.$(OBJEXT): internal/static_assert.h
 enc/trans/japanese_euc.$(OBJEXT): internal/stdalign.h
 enc/trans/japanese_euc.$(OBJEXT): internal/stdbool.h
+enc/trans/japanese_euc.$(OBJEXT): internal/stdckdint.h
 enc/trans/japanese_euc.$(OBJEXT): internal/symbol.h
 enc/trans/japanese_euc.$(OBJEXT): internal/value.h
 enc/trans/japanese_euc.$(OBJEXT): internal/value_type.h
@@ -7527,6 +7616,7 @@ enc/trans/japanese_sjis.$(OBJEXT): internal/intern/re.h
 enc/trans/japanese_sjis.$(OBJEXT): internal/intern/ruby.h
 enc/trans/japanese_sjis.$(OBJEXT): internal/intern/select.h
 enc/trans/japanese_sjis.$(OBJEXT): internal/intern/select/largesize.h
+enc/trans/japanese_sjis.$(OBJEXT): internal/intern/set.h
 enc/trans/japanese_sjis.$(OBJEXT): internal/intern/signal.h
 enc/trans/japanese_sjis.$(OBJEXT): internal/intern/sprintf.h
 enc/trans/japanese_sjis.$(OBJEXT): internal/intern/string.h
@@ -7546,6 +7636,7 @@ enc/trans/japanese_sjis.$(OBJEXT): internal/special_consts.h
 enc/trans/japanese_sjis.$(OBJEXT): internal/static_assert.h
 enc/trans/japanese_sjis.$(OBJEXT): internal/stdalign.h
 enc/trans/japanese_sjis.$(OBJEXT): internal/stdbool.h
+enc/trans/japanese_sjis.$(OBJEXT): internal/stdckdint.h
 enc/trans/japanese_sjis.$(OBJEXT): internal/symbol.h
 enc/trans/japanese_sjis.$(OBJEXT): internal/value.h
 enc/trans/japanese_sjis.$(OBJEXT): internal/value_type.h
@@ -7685,6 +7776,7 @@ enc/trans/korean.$(OBJEXT): internal/intern/re.h
 enc/trans/korean.$(OBJEXT): internal/intern/ruby.h
 enc/trans/korean.$(OBJEXT): internal/intern/select.h
 enc/trans/korean.$(OBJEXT): internal/intern/select/largesize.h
+enc/trans/korean.$(OBJEXT): internal/intern/set.h
 enc/trans/korean.$(OBJEXT): internal/intern/signal.h
 enc/trans/korean.$(OBJEXT): internal/intern/sprintf.h
 enc/trans/korean.$(OBJEXT): internal/intern/string.h
@@ -7704,6 +7796,7 @@ enc/trans/korean.$(OBJEXT): internal/special_consts.h
 enc/trans/korean.$(OBJEXT): internal/static_assert.h
 enc/trans/korean.$(OBJEXT): internal/stdalign.h
 enc/trans/korean.$(OBJEXT): internal/stdbool.h
+enc/trans/korean.$(OBJEXT): internal/stdckdint.h
 enc/trans/korean.$(OBJEXT): internal/symbol.h
 enc/trans/korean.$(OBJEXT): internal/value.h
 enc/trans/korean.$(OBJEXT): internal/value_type.h
@@ -7842,6 +7935,7 @@ enc/trans/newline.$(OBJEXT): internal/intern/re.h
 enc/trans/newline.$(OBJEXT): internal/intern/ruby.h
 enc/trans/newline.$(OBJEXT): internal/intern/select.h
 enc/trans/newline.$(OBJEXT): internal/intern/select/largesize.h
+enc/trans/newline.$(OBJEXT): internal/intern/set.h
 enc/trans/newline.$(OBJEXT): internal/intern/signal.h
 enc/trans/newline.$(OBJEXT): internal/intern/sprintf.h
 enc/trans/newline.$(OBJEXT): internal/intern/string.h
@@ -7861,6 +7955,7 @@ enc/trans/newline.$(OBJEXT): internal/special_consts.h
 enc/trans/newline.$(OBJEXT): internal/static_assert.h
 enc/trans/newline.$(OBJEXT): internal/stdalign.h
 enc/trans/newline.$(OBJEXT): internal/stdbool.h
+enc/trans/newline.$(OBJEXT): internal/stdckdint.h
 enc/trans/newline.$(OBJEXT): internal/symbol.h
 enc/trans/newline.$(OBJEXT): internal/value.h
 enc/trans/newline.$(OBJEXT): internal/value_type.h
@@ -8000,6 +8095,7 @@ enc/trans/single_byte.$(OBJEXT): internal/intern/re.h
 enc/trans/single_byte.$(OBJEXT): internal/intern/ruby.h
 enc/trans/single_byte.$(OBJEXT): internal/intern/select.h
 enc/trans/single_byte.$(OBJEXT): internal/intern/select/largesize.h
+enc/trans/single_byte.$(OBJEXT): internal/intern/set.h
 enc/trans/single_byte.$(OBJEXT): internal/intern/signal.h
 enc/trans/single_byte.$(OBJEXT): internal/intern/sprintf.h
 enc/trans/single_byte.$(OBJEXT): internal/intern/string.h
@@ -8019,6 +8115,7 @@ enc/trans/single_byte.$(OBJEXT): internal/special_consts.h
 enc/trans/single_byte.$(OBJEXT): internal/static_assert.h
 enc/trans/single_byte.$(OBJEXT): internal/stdalign.h
 enc/trans/single_byte.$(OBJEXT): internal/stdbool.h
+enc/trans/single_byte.$(OBJEXT): internal/stdckdint.h
 enc/trans/single_byte.$(OBJEXT): internal/symbol.h
 enc/trans/single_byte.$(OBJEXT): internal/value.h
 enc/trans/single_byte.$(OBJEXT): internal/value_type.h
@@ -8158,6 +8255,7 @@ enc/trans/transdb.$(OBJEXT): internal/intern/re.h
 enc/trans/transdb.$(OBJEXT): internal/intern/ruby.h
 enc/trans/transdb.$(OBJEXT): internal/intern/select.h
 enc/trans/transdb.$(OBJEXT): internal/intern/select/largesize.h
+enc/trans/transdb.$(OBJEXT): internal/intern/set.h
 enc/trans/transdb.$(OBJEXT): internal/intern/signal.h
 enc/trans/transdb.$(OBJEXT): internal/intern/sprintf.h
 enc/trans/transdb.$(OBJEXT): internal/intern/string.h
@@ -8177,6 +8275,7 @@ enc/trans/transdb.$(OBJEXT): internal/special_consts.h
 enc/trans/transdb.$(OBJEXT): internal/static_assert.h
 enc/trans/transdb.$(OBJEXT): internal/stdalign.h
 enc/trans/transdb.$(OBJEXT): internal/stdbool.h
+enc/trans/transdb.$(OBJEXT): internal/stdckdint.h
 enc/trans/transdb.$(OBJEXT): internal/symbol.h
 enc/trans/transdb.$(OBJEXT): internal/value.h
 enc/trans/transdb.$(OBJEXT): internal/value_type.h
@@ -8317,6 +8416,7 @@ enc/trans/utf8_mac.$(OBJEXT): internal/intern/re.h
 enc/trans/utf8_mac.$(OBJEXT): internal/intern/ruby.h
 enc/trans/utf8_mac.$(OBJEXT): internal/intern/select.h
 enc/trans/utf8_mac.$(OBJEXT): internal/intern/select/largesize.h
+enc/trans/utf8_mac.$(OBJEXT): internal/intern/set.h
 enc/trans/utf8_mac.$(OBJEXT): internal/intern/signal.h
 enc/trans/utf8_mac.$(OBJEXT): internal/intern/sprintf.h
 enc/trans/utf8_mac.$(OBJEXT): internal/intern/string.h
@@ -8336,6 +8436,7 @@ enc/trans/utf8_mac.$(OBJEXT): internal/special_consts.h
 enc/trans/utf8_mac.$(OBJEXT): internal/static_assert.h
 enc/trans/utf8_mac.$(OBJEXT): internal/stdalign.h
 enc/trans/utf8_mac.$(OBJEXT): internal/stdbool.h
+enc/trans/utf8_mac.$(OBJEXT): internal/stdckdint.h
 enc/trans/utf8_mac.$(OBJEXT): internal/symbol.h
 enc/trans/utf8_mac.$(OBJEXT): internal/value.h
 enc/trans/utf8_mac.$(OBJEXT): internal/value_type.h
@@ -8475,6 +8576,7 @@ enc/trans/utf_16_32.$(OBJEXT): internal/intern/re.h
 enc/trans/utf_16_32.$(OBJEXT): internal/intern/ruby.h
 enc/trans/utf_16_32.$(OBJEXT): internal/intern/select.h
 enc/trans/utf_16_32.$(OBJEXT): internal/intern/select/largesize.h
+enc/trans/utf_16_32.$(OBJEXT): internal/intern/set.h
 enc/trans/utf_16_32.$(OBJEXT): internal/intern/signal.h
 enc/trans/utf_16_32.$(OBJEXT): internal/intern/sprintf.h
 enc/trans/utf_16_32.$(OBJEXT): internal/intern/string.h
@@ -8494,6 +8596,7 @@ enc/trans/utf_16_32.$(OBJEXT): internal/special_consts.h
 enc/trans/utf_16_32.$(OBJEXT): internal/static_assert.h
 enc/trans/utf_16_32.$(OBJEXT): internal/stdalign.h
 enc/trans/utf_16_32.$(OBJEXT): internal/stdbool.h
+enc/trans/utf_16_32.$(OBJEXT): internal/stdckdint.h
 enc/trans/utf_16_32.$(OBJEXT): internal/symbol.h
 enc/trans/utf_16_32.$(OBJEXT): internal/value.h
 enc/trans/utf_16_32.$(OBJEXT): internal/value_type.h
@@ -8636,6 +8739,7 @@ enc/unicode.$(OBJEXT): internal/intern/re.h
 enc/unicode.$(OBJEXT): internal/intern/ruby.h
 enc/unicode.$(OBJEXT): internal/intern/select.h
 enc/unicode.$(OBJEXT): internal/intern/select/largesize.h
+enc/unicode.$(OBJEXT): internal/intern/set.h
 enc/unicode.$(OBJEXT): internal/intern/signal.h
 enc/unicode.$(OBJEXT): internal/intern/sprintf.h
 enc/unicode.$(OBJEXT): internal/intern/string.h
@@ -8655,6 +8759,7 @@ enc/unicode.$(OBJEXT): internal/special_consts.h
 enc/unicode.$(OBJEXT): internal/static_assert.h
 enc/unicode.$(OBJEXT): internal/stdalign.h
 enc/unicode.$(OBJEXT): internal/stdbool.h
+enc/unicode.$(OBJEXT): internal/stdckdint.h
 enc/unicode.$(OBJEXT): internal/symbol.h
 enc/unicode.$(OBJEXT): internal/value.h
 enc/unicode.$(OBJEXT): internal/value_type.h
@@ -8806,6 +8911,7 @@ enc/us_ascii.$(OBJEXT): internal/intern/re.h
 enc/us_ascii.$(OBJEXT): internal/intern/ruby.h
 enc/us_ascii.$(OBJEXT): internal/intern/select.h
 enc/us_ascii.$(OBJEXT): internal/intern/select/largesize.h
+enc/us_ascii.$(OBJEXT): internal/intern/set.h
 enc/us_ascii.$(OBJEXT): internal/intern/signal.h
 enc/us_ascii.$(OBJEXT): internal/intern/sprintf.h
 enc/us_ascii.$(OBJEXT): internal/intern/string.h
@@ -8825,6 +8931,7 @@ enc/us_ascii.$(OBJEXT): internal/special_consts.h
 enc/us_ascii.$(OBJEXT): internal/static_assert.h
 enc/us_ascii.$(OBJEXT): internal/stdalign.h
 enc/us_ascii.$(OBJEXT): internal/stdbool.h
+enc/us_ascii.$(OBJEXT): internal/stdckdint.h
 enc/us_ascii.$(OBJEXT): internal/symbol.h
 enc/us_ascii.$(OBJEXT): internal/value.h
 enc/us_ascii.$(OBJEXT): internal/value_type.h
@@ -8968,6 +9075,7 @@ enc/utf_16be.$(OBJEXT): internal/intern/re.h
 enc/utf_16be.$(OBJEXT): internal/intern/ruby.h
 enc/utf_16be.$(OBJEXT): internal/intern/select.h
 enc/utf_16be.$(OBJEXT): internal/intern/select/largesize.h
+enc/utf_16be.$(OBJEXT): internal/intern/set.h
 enc/utf_16be.$(OBJEXT): internal/intern/signal.h
 enc/utf_16be.$(OBJEXT): internal/intern/sprintf.h
 enc/utf_16be.$(OBJEXT): internal/intern/string.h
@@ -8987,6 +9095,7 @@ enc/utf_16be.$(OBJEXT): internal/special_consts.h
 enc/utf_16be.$(OBJEXT): internal/static_assert.h
 enc/utf_16be.$(OBJEXT): internal/stdalign.h
 enc/utf_16be.$(OBJEXT): internal/stdbool.h
+enc/utf_16be.$(OBJEXT): internal/stdckdint.h
 enc/utf_16be.$(OBJEXT): internal/symbol.h
 enc/utf_16be.$(OBJEXT): internal/value.h
 enc/utf_16be.$(OBJEXT): internal/value_type.h
@@ -9129,6 +9238,7 @@ enc/utf_16le.$(OBJEXT): internal/intern/re.h
 enc/utf_16le.$(OBJEXT): internal/intern/ruby.h
 enc/utf_16le.$(OBJEXT): internal/intern/select.h
 enc/utf_16le.$(OBJEXT): internal/intern/select/largesize.h
+enc/utf_16le.$(OBJEXT): internal/intern/set.h
 enc/utf_16le.$(OBJEXT): internal/intern/signal.h
 enc/utf_16le.$(OBJEXT): internal/intern/sprintf.h
 enc/utf_16le.$(OBJEXT): internal/intern/string.h
@@ -9148,6 +9258,7 @@ enc/utf_16le.$(OBJEXT): internal/special_consts.h
 enc/utf_16le.$(OBJEXT): internal/static_assert.h
 enc/utf_16le.$(OBJEXT): internal/stdalign.h
 enc/utf_16le.$(OBJEXT): internal/stdbool.h
+enc/utf_16le.$(OBJEXT): internal/stdckdint.h
 enc/utf_16le.$(OBJEXT): internal/symbol.h
 enc/utf_16le.$(OBJEXT): internal/value.h
 enc/utf_16le.$(OBJEXT): internal/value_type.h
@@ -9290,6 +9401,7 @@ enc/utf_32be.$(OBJEXT): internal/intern/re.h
 enc/utf_32be.$(OBJEXT): internal/intern/ruby.h
 enc/utf_32be.$(OBJEXT): internal/intern/select.h
 enc/utf_32be.$(OBJEXT): internal/intern/select/largesize.h
+enc/utf_32be.$(OBJEXT): internal/intern/set.h
 enc/utf_32be.$(OBJEXT): internal/intern/signal.h
 enc/utf_32be.$(OBJEXT): internal/intern/sprintf.h
 enc/utf_32be.$(OBJEXT): internal/intern/string.h
@@ -9309,6 +9421,7 @@ enc/utf_32be.$(OBJEXT): internal/special_consts.h
 enc/utf_32be.$(OBJEXT): internal/static_assert.h
 enc/utf_32be.$(OBJEXT): internal/stdalign.h
 enc/utf_32be.$(OBJEXT): internal/stdbool.h
+enc/utf_32be.$(OBJEXT): internal/stdckdint.h
 enc/utf_32be.$(OBJEXT): internal/symbol.h
 enc/utf_32be.$(OBJEXT): internal/value.h
 enc/utf_32be.$(OBJEXT): internal/value_type.h
@@ -9451,6 +9564,7 @@ enc/utf_32le.$(OBJEXT): internal/intern/re.h
 enc/utf_32le.$(OBJEXT): internal/intern/ruby.h
 enc/utf_32le.$(OBJEXT): internal/intern/select.h
 enc/utf_32le.$(OBJEXT): internal/intern/select/largesize.h
+enc/utf_32le.$(OBJEXT): internal/intern/set.h
 enc/utf_32le.$(OBJEXT): internal/intern/signal.h
 enc/utf_32le.$(OBJEXT): internal/intern/sprintf.h
 enc/utf_32le.$(OBJEXT): internal/intern/string.h
@@ -9470,6 +9584,7 @@ enc/utf_32le.$(OBJEXT): internal/special_consts.h
 enc/utf_32le.$(OBJEXT): internal/static_assert.h
 enc/utf_32le.$(OBJEXT): internal/stdalign.h
 enc/utf_32le.$(OBJEXT): internal/stdbool.h
+enc/utf_32le.$(OBJEXT): internal/stdckdint.h
 enc/utf_32le.$(OBJEXT): internal/symbol.h
 enc/utf_32le.$(OBJEXT): internal/value.h
 enc/utf_32le.$(OBJEXT): internal/value_type.h
@@ -9621,6 +9736,7 @@ enc/utf_8.$(OBJEXT): internal/intern/re.h
 enc/utf_8.$(OBJEXT): internal/intern/ruby.h
 enc/utf_8.$(OBJEXT): internal/intern/select.h
 enc/utf_8.$(OBJEXT): internal/intern/select/largesize.h
+enc/utf_8.$(OBJEXT): internal/intern/set.h
 enc/utf_8.$(OBJEXT): internal/intern/signal.h
 enc/utf_8.$(OBJEXT): internal/intern/sprintf.h
 enc/utf_8.$(OBJEXT): internal/intern/string.h
@@ -9640,6 +9756,7 @@ enc/utf_8.$(OBJEXT): internal/special_consts.h
 enc/utf_8.$(OBJEXT): internal/static_assert.h
 enc/utf_8.$(OBJEXT): internal/stdalign.h
 enc/utf_8.$(OBJEXT): internal/stdbool.h
+enc/utf_8.$(OBJEXT): internal/stdckdint.h
 enc/utf_8.$(OBJEXT): internal/symbol.h
 enc/utf_8.$(OBJEXT): internal/value.h
 enc/utf_8.$(OBJEXT): internal/value_type.h
@@ -9783,6 +9900,7 @@ enc/windows_1250.$(OBJEXT): internal/intern/re.h
 enc/windows_1250.$(OBJEXT): internal/intern/ruby.h
 enc/windows_1250.$(OBJEXT): internal/intern/select.h
 enc/windows_1250.$(OBJEXT): internal/intern/select/largesize.h
+enc/windows_1250.$(OBJEXT): internal/intern/set.h
 enc/windows_1250.$(OBJEXT): internal/intern/signal.h
 enc/windows_1250.$(OBJEXT): internal/intern/sprintf.h
 enc/windows_1250.$(OBJEXT): internal/intern/string.h
@@ -9802,6 +9920,7 @@ enc/windows_1250.$(OBJEXT): internal/special_consts.h
 enc/windows_1250.$(OBJEXT): internal/static_assert.h
 enc/windows_1250.$(OBJEXT): internal/stdalign.h
 enc/windows_1250.$(OBJEXT): internal/stdbool.h
+enc/windows_1250.$(OBJEXT): internal/stdckdint.h
 enc/windows_1250.$(OBJEXT): internal/symbol.h
 enc/windows_1250.$(OBJEXT): internal/value.h
 enc/windows_1250.$(OBJEXT): internal/value_type.h
@@ -9943,6 +10062,7 @@ enc/windows_1251.$(OBJEXT): internal/intern/re.h
 enc/windows_1251.$(OBJEXT): internal/intern/ruby.h
 enc/windows_1251.$(OBJEXT): internal/intern/select.h
 enc/windows_1251.$(OBJEXT): internal/intern/select/largesize.h
+enc/windows_1251.$(OBJEXT): internal/intern/set.h
 enc/windows_1251.$(OBJEXT): internal/intern/signal.h
 enc/windows_1251.$(OBJEXT): internal/intern/sprintf.h
 enc/windows_1251.$(OBJEXT): internal/intern/string.h
@@ -9962,6 +10082,7 @@ enc/windows_1251.$(OBJEXT): internal/special_consts.h
 enc/windows_1251.$(OBJEXT): internal/static_assert.h
 enc/windows_1251.$(OBJEXT): internal/stdalign.h
 enc/windows_1251.$(OBJEXT): internal/stdbool.h
+enc/windows_1251.$(OBJEXT): internal/stdckdint.h
 enc/windows_1251.$(OBJEXT): internal/symbol.h
 enc/windows_1251.$(OBJEXT): internal/value.h
 enc/windows_1251.$(OBJEXT): internal/value_type.h
@@ -10104,6 +10225,7 @@ enc/windows_1252.$(OBJEXT): internal/intern/re.h
 enc/windows_1252.$(OBJEXT): internal/intern/ruby.h
 enc/windows_1252.$(OBJEXT): internal/intern/select.h
 enc/windows_1252.$(OBJEXT): internal/intern/select/largesize.h
+enc/windows_1252.$(OBJEXT): internal/intern/set.h
 enc/windows_1252.$(OBJEXT): internal/intern/signal.h
 enc/windows_1252.$(OBJEXT): internal/intern/sprintf.h
 enc/windows_1252.$(OBJEXT): internal/intern/string.h
@@ -10123,6 +10245,7 @@ enc/windows_1252.$(OBJEXT): internal/special_consts.h
 enc/windows_1252.$(OBJEXT): internal/static_assert.h
 enc/windows_1252.$(OBJEXT): internal/stdalign.h
 enc/windows_1252.$(OBJEXT): internal/stdbool.h
+enc/windows_1252.$(OBJEXT): internal/stdckdint.h
 enc/windows_1252.$(OBJEXT): internal/symbol.h
 enc/windows_1252.$(OBJEXT): internal/value.h
 enc/windows_1252.$(OBJEXT): internal/value_type.h
@@ -10264,6 +10387,7 @@ enc/windows_1253.$(OBJEXT): internal/intern/re.h
 enc/windows_1253.$(OBJEXT): internal/intern/ruby.h
 enc/windows_1253.$(OBJEXT): internal/intern/select.h
 enc/windows_1253.$(OBJEXT): internal/intern/select/largesize.h
+enc/windows_1253.$(OBJEXT): internal/intern/set.h
 enc/windows_1253.$(OBJEXT): internal/intern/signal.h
 enc/windows_1253.$(OBJEXT): internal/intern/sprintf.h
 enc/windows_1253.$(OBJEXT): internal/intern/string.h
@@ -10283,6 +10407,7 @@ enc/windows_1253.$(OBJEXT): internal/special_consts.h
 enc/windows_1253.$(OBJEXT): internal/static_assert.h
 enc/windows_1253.$(OBJEXT): internal/stdalign.h
 enc/windows_1253.$(OBJEXT): internal/stdbool.h
+enc/windows_1253.$(OBJEXT): internal/stdckdint.h
 enc/windows_1253.$(OBJEXT): internal/symbol.h
 enc/windows_1253.$(OBJEXT): internal/value.h
 enc/windows_1253.$(OBJEXT): internal/value_type.h
@@ -10425,6 +10550,7 @@ enc/windows_1254.$(OBJEXT): internal/intern/re.h
 enc/windows_1254.$(OBJEXT): internal/intern/ruby.h
 enc/windows_1254.$(OBJEXT): internal/intern/select.h
 enc/windows_1254.$(OBJEXT): internal/intern/select/largesize.h
+enc/windows_1254.$(OBJEXT): internal/intern/set.h
 enc/windows_1254.$(OBJEXT): internal/intern/signal.h
 enc/windows_1254.$(OBJEXT): internal/intern/sprintf.h
 enc/windows_1254.$(OBJEXT): internal/intern/string.h
@@ -10444,6 +10570,7 @@ enc/windows_1254.$(OBJEXT): internal/special_consts.h
 enc/windows_1254.$(OBJEXT): internal/static_assert.h
 enc/windows_1254.$(OBJEXT): internal/stdalign.h
 enc/windows_1254.$(OBJEXT): internal/stdbool.h
+enc/windows_1254.$(OBJEXT): internal/stdckdint.h
 enc/windows_1254.$(OBJEXT): internal/symbol.h
 enc/windows_1254.$(OBJEXT): internal/value.h
 enc/windows_1254.$(OBJEXT): internal/value_type.h
@@ -10586,6 +10713,7 @@ enc/windows_1257.$(OBJEXT): internal/intern/re.h
 enc/windows_1257.$(OBJEXT): internal/intern/ruby.h
 enc/windows_1257.$(OBJEXT): internal/intern/select.h
 enc/windows_1257.$(OBJEXT): internal/intern/select/largesize.h
+enc/windows_1257.$(OBJEXT): internal/intern/set.h
 enc/windows_1257.$(OBJEXT): internal/intern/signal.h
 enc/windows_1257.$(OBJEXT): internal/intern/sprintf.h
 enc/windows_1257.$(OBJEXT): internal/intern/string.h
@@ -10605,6 +10733,7 @@ enc/windows_1257.$(OBJEXT): internal/special_consts.h
 enc/windows_1257.$(OBJEXT): internal/static_assert.h
 enc/windows_1257.$(OBJEXT): internal/stdalign.h
 enc/windows_1257.$(OBJEXT): internal/stdbool.h
+enc/windows_1257.$(OBJEXT): internal/stdckdint.h
 enc/windows_1257.$(OBJEXT): internal/symbol.h
 enc/windows_1257.$(OBJEXT): internal/value.h
 enc/windows_1257.$(OBJEXT): internal/value_type.h
@@ -10749,6 +10878,7 @@ enc/windows_31j.$(OBJEXT): internal/intern/re.h
 enc/windows_31j.$(OBJEXT): internal/intern/ruby.h
 enc/windows_31j.$(OBJEXT): internal/intern/select.h
 enc/windows_31j.$(OBJEXT): internal/intern/select/largesize.h
+enc/windows_31j.$(OBJEXT): internal/intern/set.h
 enc/windows_31j.$(OBJEXT): internal/intern/signal.h
 enc/windows_31j.$(OBJEXT): internal/intern/sprintf.h
 enc/windows_31j.$(OBJEXT): internal/intern/string.h
@@ -10768,6 +10898,7 @@ enc/windows_31j.$(OBJEXT): internal/special_consts.h
 enc/windows_31j.$(OBJEXT): internal/static_assert.h
 enc/windows_31j.$(OBJEXT): internal/stdalign.h
 enc/windows_31j.$(OBJEXT): internal/stdbool.h
+enc/windows_31j.$(OBJEXT): internal/stdckdint.h
 enc/windows_31j.$(OBJEXT): internal/symbol.h
 enc/windows_31j.$(OBJEXT): internal/value.h
 enc/windows_31j.$(OBJEXT): internal/value_type.h
diff --git a/enc/ebcdic.h b/enc/ebcdic.h
index a3b380a32760ad..5109bf7065abb1 100644
--- a/enc/ebcdic.h
+++ b/enc/ebcdic.h
@@ -7,5 +7,5 @@ ENC_ALIAS("ebcdic-cp-us", "IBM037");
  * hopefully the most widely used one.
  *
  * See http://www.iana.org/assignments/character-sets/character-sets.xhtml
- *     http://tools.ietf.org/html/rfc1345
+ *     https://www.rfc-editor.org/rfc/rfc1345
  */
diff --git a/enc/encinit.c.erb b/enc/encinit.c.erb
index 120408f8e331b9..3662ba200d5b14 100644
--- a/enc/encinit.c.erb
+++ b/enc/encinit.c.erb
@@ -1,3 +1,6 @@
+/* Automatically generated from <%= erb.filename %>
+ * Do not edit<%# directly%>.
+ */
 /* Copyright 2012 Google Inc. Some Rights Reserved.
  * Author: yugui@google.com (Yugui Sonoda)
  */
diff --git a/enc/jis/props.h.blt b/enc/jis/props.h.blt
index 508a0844498441..865ae6b6516b7f 100644
--- a/enc/jis/props.h.blt
+++ b/enc/jis/props.h.blt
@@ -1,5 +1,5 @@
 /* ANSI-C code produced by gperf version 3.1 */
-/* Command-line: gperf -k1,3 -7 -c -j1 -i1 -t -C -P -t --ignore-case -H onig_jis_property_hash -Q onig_jis_property_pool -N onig_jis_property enc/jis/props.kwd  */
+/* Command-line: gperf -L ANSI-C -k1,3 -7 -c -j1 -i1 -t -C -P -t --ignore-case -H onig_jis_property_hash -Q onig_jis_property_pool -N onig_jis_property enc/jis/props.kwd  */
 
 #if !((' ' == 32) && ('!' == 33) && ('"' == 34) && ('#' == 35) \
       && ('%' == 37) && ('&' == 38) && ('\'' == 39) && ('(' == 40) \
@@ -28,7 +28,6 @@
 #error "gperf generated tables don't work with this execution character set. Please report a bug to <bug-gperf@gnu.org>."
 #endif
 
-#define gperf_offsetof(s, n) (short)offsetof(struct s##_t, s##_str##n)
 #line 1 "enc/jis/props.kwd"
 /* -*- c -*- */
 #define GPERF_DOWNCASE 1
@@ -82,7 +81,7 @@ struct enc_property;
 
 #ifndef GPERF_DOWNCASE
 #define GPERF_DOWNCASE 1
-static const unsigned char gperf_downcase[256] =
+static unsigned char gperf_downcase[256] =
   {
       0,   1,   2,   3,   4,   5,   6,   7,   8,   9,  10,  11,  12,  13,  14,
      15,  16,  17,  18,  19,  20,  21,  22,  23,  24,  25,  26,  27,  28,  29,
@@ -180,19 +179,19 @@ onig_jis_property (register const char *str, register size_t len)
     {
       {-1}, {-1}, {-1}, {-1}, {-1},
 #line 48 "enc/jis/props.kwd"
-      {gperf_offsetof(onig_jis_property_pool, 5),      onigenc_jis_han},
+      {(int)(size_t)&((struct onig_jis_property_pool_t *)0)->onig_jis_property_pool_str5,      onigenc_jis_han},
       {-1},
 #line 49 "enc/jis/props.kwd"
-      {gperf_offsetof(onig_jis_property_pool, 7),    onigenc_jis_latin},
+      {(int)(size_t)&((struct onig_jis_property_pool_t *)0)->onig_jis_property_pool_str7,    onigenc_jis_latin},
 #line 50 "enc/jis/props.kwd"
-      {gperf_offsetof(onig_jis_property_pool, 8),    onigenc_jis_greek},
+      {(int)(size_t)&((struct onig_jis_property_pool_t *)0)->onig_jis_property_pool_str8,    onigenc_jis_greek},
       {-1},
 #line 46 "enc/jis/props.kwd"
-      {gperf_offsetof(onig_jis_property_pool, 10), onigenc_jis_hiragana},
+      {(int)(size_t)&((struct onig_jis_property_pool_t *)0)->onig_jis_property_pool_str10, onigenc_jis_hiragana},
 #line 47 "enc/jis/props.kwd"
-      {gperf_offsetof(onig_jis_property_pool, 11), onigenc_jis_katakana},
+      {(int)(size_t)&((struct onig_jis_property_pool_t *)0)->onig_jis_property_pool_str11, onigenc_jis_katakana},
 #line 51 "enc/jis/props.kwd"
-      {gperf_offsetof(onig_jis_property_pool, 12), onigenc_jis_cyrillic}
+      {(int)(size_t)&((struct onig_jis_property_pool_t *)0)->onig_jis_property_pool_str12, onigenc_jis_cyrillic}
     };
 
   if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
diff --git a/enc/make_encmake.rb b/enc/make_encmake.rb
index fcfc2c92678b3d..96d1944bcba31c 100755
--- a/enc/make_encmake.rb
+++ b/enc/make_encmake.rb
@@ -121,39 +121,32 @@ def target_transcoders
 ATRANS, TRANS = target_transcoders
 
 if File.exist?(depend = File.join($srcdir, "depend"))
-  if ERB.instance_method(:initialize).parameters.assoc(:key) # Ruby 2.6+
-    erb = ERB.new(File.read(depend), trim_mode: '%')
-  else
-    erb = ERB.new(File.read(depend), nil, '%')
-  end
+  erb = ERB.new(File.read(depend), trim_mode: '%')
   erb.filename = depend
   tmp = erb.result(binding)
-  dep = "\n#### depend ####\n\n" << depend_rules(tmp).join
+  dep = "\n#### depend ####\n\n" + depend_rules(tmp).join
 else
   dep = ""
 end
 mkin = File.read(File.join($srcdir, "Makefile.in"))
-mkin.gsub!(/@(#{CONFIG.keys.join('|')})@/) {CONFIG[$1]}
+# Variables that should not be expanded in Makefile.in to allow
+# overriding inherited variables at make-time.
+not_expand_vars = %w(CFLAGS)
+mkin.gsub!(/@(#{RbConfig::CONFIG.keys.join('|')})@/) do
+  not_expand_vars.include?($1) ? CONFIG[$1] : RbConfig::CONFIG[$1]
+end
 File.open(ARGV[0], 'wb') {|f|
   f.puts mkin, dep
 }
 if MODULE_TYPE == :static
   filename = "encinit.c.erb"
-  if ERB.instance_method(:initialize).parameters.assoc(:key) # Ruby 2.6+
-    erb = ERB.new(File.read(File.join($srcdir, filename)), trim_mode: '%-')
-  else
-    erb = ERB.new(File.read(File.join($srcdir, filename)), nil, '%-')
-  end
+  erb = ERB.new(File.read(File.join($srcdir, filename)), trim_mode: '%-')
   erb.filename = "enc/#{filename}"
   tmp = erb.result(binding)
   begin
     Dir.mkdir 'enc'
   rescue Errno::EEXIST
   end
-  File.open("enc/encinit.c", "w") {|f|
-    f.puts "/* Automatically generated from enc/encinit.c.erb"
-    f.puts " * Do not edit."
-    f.puts " */"
-    f.puts tmp
-  }
+  require 'tool/lib/output'
+  Output.new(path: "enc/encinit.c", ifchange: true).write(tmp)
 end
diff --git a/enc/trans/ibm864-tbl.rb b/enc/trans/ibm864-tbl.rb
new file mode 100644
index 00000000000000..13f8a27f1d89cf
--- /dev/null
+++ b/enc/trans/ibm864-tbl.rb
@@ -0,0 +1,126 @@
+IBM864_TO_UCS_TBL = [
+  ["80",0x00B0],
+  ["81",0x00B7],
+  ["82",0x2219],
+  ["83",0x221A],
+  ["84",0x2592],
+  ["85",0x2500],
+  ["86",0x2502],
+  ["87",0x253C],
+  ["88",0x2524],
+  ["89",0x252C],
+  ["8A",0x251C],
+  ["8B",0x2534],
+  ["8C",0x2510],
+  ["8D",0x250C],
+  ["8E",0x2514],
+  ["8F",0x2518],
+  ["90",0x03B2],
+  ["91",0x221E],
+  ["92",0x03C6],
+  ["93",0x00B1],
+  ["94",0x00BD],
+  ["95",0x00BC],
+  ["96",0x2248],
+  ["97",0x00AB],
+  ["98",0x00BB],
+  ["99",0xFEF7],
+  ["9A",0xFEF8],
+  ["9D",0xFEFB],
+  ["9E",0xFEFC],
+  ["9F",0xFE73],
+  ["A0",0x00A0],
+  ["A1",0x00AD],
+  ["A2",0xFE82],
+  ["A3",0x00A3],
+  ["A4",0x00A4],
+  ["A5",0xFE84],
+  ["A7",0x20AC], # Euro sign from CCSID 864
+  ["A8",0xFE8E],
+  ["A9",0xFE8F],
+  ["AA",0xFE95],
+  ["AB",0xFE99],
+  ["AC",0x060C],
+  ["AD",0xFE9D],
+  ["AE",0xFEA1],
+  ["AF",0xFEA5],
+  ["B0",0x0660],
+  ["B1",0x0661],
+  ["B2",0x0662],
+  ["B3",0x0663],
+  ["B4",0x0664],
+  ["B5",0x0665],
+  ["B6",0x0666],
+  ["B7",0x0667],
+  ["B8",0x0668],
+  ["B9",0x0669],
+  ["BA",0xFED1],
+  ["BB",0x061B],
+  ["BC",0xFEB1],
+  ["BD",0xFEB5],
+  ["BE",0xFEB9],
+  ["BF",0x061F],
+  ["C0",0x00A2],
+  ["C1",0xFE80],
+  ["C2",0xFE81],
+  ["C3",0xFE83],
+  ["C4",0xFE85],
+  ["C5",0xFECA],
+  ["C6",0xFE8B],
+  ["C7",0xFE8D],
+  ["C8",0xFE91],
+  ["C9",0xFE93],
+  ["CA",0xFE97],
+  ["CB",0xFE9B],
+  ["CC",0xFE9F],
+  ["CD",0xFEA3],
+  ["CE",0xFEA7],
+  ["CF",0xFEA9],
+  ["D0",0xFEAB],
+  ["D1",0xFEAD],
+  ["D2",0xFEAF],
+  ["D3",0xFEB3],
+  ["D4",0xFEB7],
+  ["D5",0xFEBB],
+  ["D6",0xFEBF],
+  ["D7",0xFEC1],
+  ["D8",0xFEC5],
+  ["D9",0xFECB],
+  ["DA",0xFECF],
+  ["DB",0x00A6],
+  ["DC",0x00AC],
+  ["DD",0x00F7],
+  ["DE",0x00D7],
+  ["DF",0xFEC9],
+  ["E0",0x0640],
+  ["E1",0xFED3],
+  ["E2",0xFED7],
+  ["E3",0xFEDB],
+  ["E4",0xFEDF],
+  ["E5",0xFEE3],
+  ["E6",0xFEE7],
+  ["E7",0xFEEB],
+  ["E8",0xFEED],
+  ["E9",0xFEEF],
+  ["EA",0xFEF3],
+  ["EB",0xFEBD],
+  ["EC",0xFECC],
+  ["ED",0xFECE],
+  ["EE",0xFECD],
+  ["EF",0xFEE1],
+  ["F0",0xFE7D],
+  ["F1",0x0651],
+  ["F2",0xFEE5],
+  ["F3",0xFEE9],
+  ["F4",0xFEEC],
+  ["F5",0xFEF0],
+  ["F6",0xFEF2],
+  ["F7",0xFED0],
+  ["F8",0xFED5],
+  ["F9",0xFEF5],
+  ["FA",0xFEF6],
+  ["FB",0xFEDD],
+  ["FC",0xFED9],
+  ["FD",0xFEF1],
+  ["FE",0x25A0]
+]
diff --git a/enc/trans/iso2022.trans b/enc/trans/iso2022.trans
index a441f1596dc6ca..bc42bbc19c3c05 100644
--- a/enc/trans/iso2022.trans
+++ b/enc/trans/iso2022.trans
@@ -1,4 +1,5 @@
 #include "transcode_data.h"
+#include "ruby/internal/attr/nonstring.h"
 
 <%
   map = {
@@ -79,6 +80,34 @@ iso2022jp_init(void *statep)
     return 0;
 }
 
+static unsigned char *
+iso2022jp_put_state(unsigned char *sp, unsigned char *o, int oldstate, int newstate)
+{
+    if (oldstate != newstate) {
+        *o++ = 0x1b;
+        switch (newstate) {
+          case G0_ASCII:
+            *o++ = '(';
+            *o++ = 'B';
+            break;
+          case G0_JISX0201_KATAKANA:
+            *o++ = '(';
+            *o++ = 'I';
+            break;
+          case G0_JISX0208_1978:
+            *o++ = '$';
+            *o++ = '@';
+            break;
+          default:
+            *o++ = '$';
+            *o++ = 'B';
+            break;
+        }
+        *sp = newstate;
+    }
+    return o;
+}
+
 static VALUE
 fun_si_iso2022jp_decoder(void *statep, const unsigned char *s, size_t l)
 {
@@ -154,24 +183,7 @@ fun_so_iso2022jp_encoder(void *statep, const unsigned char *s, size_t l, unsigne
     else
         newstate = G0_JISX0208_1983;
 
-    if (*sp != newstate) {
-        if (newstate == G0_ASCII) {
-            *o++ = 0x1b;
-            *o++ = '(';
-            *o++ = 'B';
-        }
-        else if (newstate == G0_JISX0208_1978) {
-            *o++ = 0x1b;
-            *o++ = '$';
-            *o++ = '@';
-        }
-        else {
-            *o++ = 0x1b;
-            *o++ = '$';
-            *o++ = 'B';
-        }
-        *sp = newstate;
-    }
+    o = iso2022jp_put_state(sp, o, *sp, newstate);
 
     if (l == 1) {
         *o++ = s[0] & 0x7f;
@@ -202,10 +214,7 @@ finish_iso2022jp_encoder(void *statep, unsigned char *o, size_t osize)
     if (*sp == G0_ASCII)
         return 0;
 
-    *o++ = 0x1b;
-    *o++ = '(';
-    *o++ = 'B';
-    *sp = G0_ASCII;
+    o = iso2022jp_put_state(sp, o, *sp, G0_ASCII);
 
     return o - output0;
 }
@@ -399,24 +408,7 @@ fun_so_cp5022x_encoder(void *statep, const unsigned char *s, size_t l,
     else
         newstate = G0_JISX0208_1983;
 
-    if (*sp != newstate) {
-        if (newstate == G0_ASCII) {
-            *o++ = 0x1b;
-            *o++ = '(';
-            *o++ = 'B';
-        }
-        else if (newstate == G0_JISX0201_KATAKANA) {
-            *o++ = 0x1b;
-            *o++ = '(';
-            *o++ = 'I';
-        }
-        else {
-            *o++ = 0x1b;
-            *o++ = '$';
-            *o++ = 'B';
-        }
-        *sp = newstate;
-    }
+    o = iso2022jp_put_state(sp, o, sp[0], newstate);
 
     if (l == 1) {
         *o++ = s[0] & 0x7f;
@@ -443,15 +435,26 @@ rb_cp50221_encoder = {
     iso2022jp_encoder_reset_sequence_size, finish_iso2022jp_encoder
 };
 
-static const char *tbl0208 =
-    "\x21\x23\x21\x56\x21\x57\x21\x22\x21\x26\x25\x72\x25\x21\x25\x23" \
-    "\x25\x25\x25\x27\x25\x29\x25\x63\x25\x65\x25\x67\x25\x43\x21\x3C" \
-    "\x25\x22\x25\x24\x25\x26\x25\x28\x25\x2A\x25\x2B\x25\x2D\x25\x2F" \
-    "\x25\x31\x25\x33\x25\x35\x25\x37\x25\x39\x25\x3B\x25\x3D\x25\x3F" \
-    "\x25\x41\x25\x44\x25\x46\x25\x48\x25\x4A\x25\x4B\x25\x4C\x25\x4D" \
-    "\x25\x4E\x25\x4F\x25\x52\x25\x55\x25\x58\x25\x5B\x25\x5E\x25\x5F" \
-    "\x25\x60\x25\x61\x25\x62\x25\x64\x25\x66\x25\x68\x25\x69\x25\x6A" \
-    "\x25\x6B\x25\x6C\x25\x6D\x25\x6F\x25\x73\x21\x2B\x21\x2C";
+/* JIS0201 to JIS0208 conversion table */
+enum {tbl0208_num = 0xDF - 0xA1 + 1};
+RBIMPL_ATTR_NONSTRING_ARRAY() static const char tbl0208[tbl0208_num][2] = {
+    "\x21\x23", "\x21\x56", "\x21\x57", "\x21\x22",
+    "\x21\x26", "\x25\x72", "\x25\x21", "\x25\x23",
+    "\x25\x25", "\x25\x27", "\x25\x29", "\x25\x63",
+    "\x25\x65", "\x25\x67", "\x25\x43", "\x21\x3C",
+    "\x25\x22", "\x25\x24", "\x25\x26", "\x25\x28",
+    "\x25\x2A", "\x25\x2B", "\x25\x2D", "\x25\x2F",
+    "\x25\x31", "\x25\x33", "\x25\x35", "\x25\x37",
+    "\x25\x39", "\x25\x3B", "\x25\x3D", "\x25\x3F",
+    "\x25\x41", "\x25\x44", "\x25\x46", "\x25\x48",
+    "\x25\x4A", "\x25\x4B", "\x25\x4C", "\x25\x4D",
+    "\x25\x4E", "\x25\x4F", "\x25\x52", "\x25\x55",
+    "\x25\x58", "\x25\x5B", "\x25\x5E", "\x25\x5F",
+    "\x25\x60", "\x25\x61", "\x25\x62", "\x25\x64",
+    "\x25\x66", "\x25\x68", "\x25\x69", "\x25\x6A",
+    "\x25\x6B", "\x25\x6C", "\x25\x6D", "\x25\x6F",
+    "\x25\x73", "\x21\x2B", "\x21\x2C"
+};
 
 static ssize_t
 fun_so_cp50220_encoder(void *statep, const unsigned char *s, size_t l,
@@ -460,22 +463,21 @@ fun_so_cp50220_encoder(void *statep, const unsigned char *s, size_t l,
     unsigned char *output0 = o;
     unsigned char *sp = statep;
 
-    if (sp[0] == G0_JISX0201_KATAKANA) {
+    if (sp[0] == G0_JISX0201_KATAKANA && sp[2]) {
         int c = sp[2] & 0x7F;
-        const char *p = tbl0208 + (c - 0x21) * 2;
-        if (sp[1] != G0_JISX0208_1983) {
-            *o++ = 0x1b;
-            *o++ = '$';
-            *o++ = 'B';
-        }
+        const char *p = tbl0208[c - 0x21];
+        sp[2] = 0;
+        o = iso2022jp_put_state(sp, o, sp[1], G0_JISX0208_1983);
         sp[0] = G0_JISX0208_1983;
         *o++ = *p++;
         if (l == 2 && s[0] == 0x8E) {
             if (s[1] == 0xDE) {
+                /* VOICED SOUND MARK */
                 *o++ = *p + 1;
                 return o - output0;
             }
             else if (s[1] == 0xDF && (0x4A <= c && c <= 0x4E)) {
+                /* SEMI-VOICED SOUND MARK */
                 *o++ = *p + 2;
                 return o - output0;
             }
@@ -484,21 +486,25 @@ fun_so_cp50220_encoder(void *statep, const unsigned char *s, size_t l,
     }
 
     if (l == 2 && s[0] == 0x8E) {
-        const char *p = tbl0208 + (s[1] - 0xA1) * 2;
         if ((0xA1 <= s[1] && s[1] <= 0xB5) ||
             (0xC5 <= s[1] && s[1] <= 0xC9) ||
             (0xCF <= s[1] && s[1] <= 0xDF)) {
-            if (*sp != G0_JISX0208_1983) {
-                *o++ = 0x1b;
-                *o++ = '$';
-                *o++ = 'B';
-                *sp = G0_JISX0208_1983;
-            }
+            /* May not be followed by a sound mark */
+            const char *p = tbl0208[s[1] - 0xA1];
+            o = iso2022jp_put_state(sp, o, *sp, G0_JISX0208_1983);
             *o++ = *p++;
             *o++ = *p;
             return o - output0;
         }
 
+        if (s[1] > 0xDF) {      /* undef */
+            o = iso2022jp_put_state(sp, o, *sp, G0_JISX0201_KATAKANA);
+            *o++ = s[1] & 0x7F;
+            sp[2] = 0;
+            return o - output0;
+        }
+
+        /* Katakana that may be followed by a sound mark */
         sp[2] = s[1];
         sp[1] = sp[0];
         sp[0] = G0_JISX0201_KATAKANA;
@@ -518,23 +524,16 @@ finish_cp50220_encoder(void *statep, unsigned char *o, size_t osize)
     if (*sp == G0_ASCII)
         return 0;
 
-    if (sp[0] == G0_JISX0201_KATAKANA) {
+    if (sp[0] == G0_JISX0201_KATAKANA && sp[2]) {
         int c = sp[2] & 0x7F;
-        const char *p = tbl0208 + (c - 0x21) * 2;
-        if (sp[1] != G0_JISX0208_1983) {
-            *o++ = 0x1b;
-            *o++ = '$';
-            *o++ = 'B';
-        }
+        const char *p = tbl0208[c - 0x21];
+        o = iso2022jp_put_state(sp, o, sp[1], G0_JISX0208_1983);
         sp[0] = G0_JISX0208_1983;
         *o++ = *p++;
         *o++ = *p;
     }
 
-    *o++ = 0x1b;
-    *o++ = '(';
-    *o++ = 'B';
-    *sp = G0_ASCII;
+    o = iso2022jp_put_state(sp, o, sp[0], G0_ASCII);
 
     return o - output0;
 }
@@ -564,4 +563,3 @@ TRANS_INIT(iso2022)
     rb_register_transcoder(&rb_cp50220_encoder);
     rb_register_transcoder(&rb_cp50221_encoder);
 }
-
diff --git a/enc/trans/single_byte.trans b/enc/trans/single_byte.trans
index 0d5407b9188bf4..c326cbebea1143 100644
--- a/enc/trans/single_byte.trans
+++ b/enc/trans/single_byte.trans
@@ -61,6 +61,7 @@
   transcode_tblgen_singlebyte "IBM861"
   transcode_tblgen_singlebyte "IBM862"
   transcode_tblgen_singlebyte "IBM863"
+  transcode_tblgen_singlebyte "IBM864"
   transcode_tblgen_singlebyte "IBM865"
   transcode_tblgen_singlebyte "IBM866"
   transcode_tblgen_singlebyte "IBM869"
diff --git a/enc/unicode.c b/enc/unicode.c
index 18fba02476af66..cbfc6cdf589681 100644
--- a/enc/unicode.c
+++ b/enc/unicode.c
@@ -801,7 +801,6 @@ onigenc_unicode_case_map(OnigCaseFoldType* flagP,
   return (int )(to - to_start);
 }
 
-#if 0
 const char onigenc_unicode_version_string[] =
 #ifdef ONIG_UNICODE_VERSION_STRING
     ONIG_UNICODE_VERSION_STRING
@@ -817,4 +816,3 @@ const int onigenc_unicode_version_number[3] = {
     0
 #endif
 };
-#endif
diff --git a/enc/unicode/15.0.0/casefold.h b/enc/unicode/15.0.0/casefold.h
deleted file mode 100644
index 51120d867d1794..00000000000000
--- a/enc/unicode/15.0.0/casefold.h
+++ /dev/null
@@ -1,7629 +0,0 @@
-/* DO NOT EDIT THIS FILE. */
-/* Generated by enc-case-folding.rb */
-
-#if defined ONIG_UNICODE_VERSION_STRING && !( \
-      ONIG_UNICODE_VERSION_MAJOR == 15 && \
-      ONIG_UNICODE_VERSION_MINOR == 0 && \
-      ONIG_UNICODE_VERSION_TEENY == 0 && \
-      1)
-# error ONIG_UNICODE_VERSION_STRING mismatch
-#endif
-#define ONIG_UNICODE_VERSION_STRING "15.0.0"
-#define ONIG_UNICODE_VERSION_MAJOR 15
-#define ONIG_UNICODE_VERSION_MINOR 0
-#define ONIG_UNICODE_VERSION_TEENY 0
-
-static const CaseFold_11_Type CaseFold_11_Table[] = {
-#define CaseFold (*(CaseFold_11_Type (*)[1528])(CaseFold_11_Table+0))
-  {0x0041, {1|F|D, {0x0061}}},
-  {0x0042, {1|F|D, {0x0062}}},
-  {0x0043, {1|F|D, {0x0063}}},
-  {0x0044, {1|F|D, {0x0064}}},
-  {0x0045, {1|F|D, {0x0065}}},
-  {0x0046, {1|F|D, {0x0066}}},
-  {0x0047, {1|F|D, {0x0067}}},
-  {0x0048, {1|F|D, {0x0068}}},
-  {0x004a, {1|F|D, {0x006a}}},
-  {0x004b, {1|F|D, {0x006b}}},
-  {0x004c, {1|F|D, {0x006c}}},
-  {0x004d, {1|F|D, {0x006d}}},
-  {0x004e, {1|F|D, {0x006e}}},
-  {0x004f, {1|F|D, {0x006f}}},
-  {0x0050, {1|F|D, {0x0070}}},
-  {0x0051, {1|F|D, {0x0071}}},
-  {0x0052, {1|F|D, {0x0072}}},
-  {0x0053, {1|F|D, {0x0073}}},
-  {0x0054, {1|F|D, {0x0074}}},
-  {0x0055, {1|F|D, {0x0075}}},
-  {0x0056, {1|F|D, {0x0076}}},
-  {0x0057, {1|F|D, {0x0077}}},
-  {0x0058, {1|F|D, {0x0078}}},
-  {0x0059, {1|F|D, {0x0079}}},
-  {0x005a, {1|F|D, {0x007a}}},
-  {0x00b5, {1|F|SU|I(0), {0x03bc}}},
-  {0x00c0, {1|F|D, {0x00e0}}},
-  {0x00c1, {1|F|D, {0x00e1}}},
-  {0x00c2, {1|F|D, {0x00e2}}},
-  {0x00c3, {1|F|D, {0x00e3}}},
-  {0x00c4, {1|F|D, {0x00e4}}},
-  {0x00c5, {1|F|D, {0x00e5}}},
-  {0x00c6, {1|F|D, {0x00e6}}},
-  {0x00c7, {1|F|D, {0x00e7}}},
-  {0x00c8, {1|F|D, {0x00e8}}},
-  {0x00c9, {1|F|D, {0x00e9}}},
-  {0x00ca, {1|F|D, {0x00ea}}},
-  {0x00cb, {1|F|D, {0x00eb}}},
-  {0x00cc, {1|F|D, {0x00ec}}},
-  {0x00cd, {1|F|D, {0x00ed}}},
-  {0x00ce, {1|F|D, {0x00ee}}},
-  {0x00cf, {1|F|D, {0x00ef}}},
-  {0x00d0, {1|F|D, {0x00f0}}},
-  {0x00d1, {1|F|D, {0x00f1}}},
-  {0x00d2, {1|F|D, {0x00f2}}},
-  {0x00d3, {1|F|D, {0x00f3}}},
-  {0x00d4, {1|F|D, {0x00f4}}},
-  {0x00d5, {1|F|D, {0x00f5}}},
-  {0x00d6, {1|F|D, {0x00f6}}},
-  {0x00d8, {1|F|D, {0x00f8}}},
-  {0x00d9, {1|F|D, {0x00f9}}},
-  {0x00da, {1|F|D, {0x00fa}}},
-  {0x00db, {1|F|D, {0x00fb}}},
-  {0x00dc, {1|F|D, {0x00fc}}},
-  {0x00dd, {1|F|D, {0x00fd}}},
-  {0x00de, {1|F|D, {0x00fe}}},
-  {0x00df, {2|F|ST|SU|I(1), {0x0073, 0x0073}}},
-  {0x0100, {1|F|D, {0x0101}}},
-  {0x0102, {1|F|D, {0x0103}}},
-  {0x0104, {1|F|D, {0x0105}}},
-  {0x0106, {1|F|D, {0x0107}}},
-  {0x0108, {1|F|D, {0x0109}}},
-  {0x010a, {1|F|D, {0x010b}}},
-  {0x010c, {1|F|D, {0x010d}}},
-  {0x010e, {1|F|D, {0x010f}}},
-  {0x0110, {1|F|D, {0x0111}}},
-  {0x0112, {1|F|D, {0x0113}}},
-  {0x0114, {1|F|D, {0x0115}}},
-  {0x0116, {1|F|D, {0x0117}}},
-  {0x0118, {1|F|D, {0x0119}}},
-  {0x011a, {1|F|D, {0x011b}}},
-  {0x011c, {1|F|D, {0x011d}}},
-  {0x011e, {1|F|D, {0x011f}}},
-  {0x0120, {1|F|D, {0x0121}}},
-  {0x0122, {1|F|D, {0x0123}}},
-  {0x0124, {1|F|D, {0x0125}}},
-  {0x0126, {1|F|D, {0x0127}}},
-  {0x0128, {1|F|D, {0x0129}}},
-  {0x012a, {1|F|D, {0x012b}}},
-  {0x012c, {1|F|D, {0x012d}}},
-  {0x012e, {1|F|D, {0x012f}}},
-  {0x0132, {1|F|D, {0x0133}}},
-  {0x0134, {1|F|D, {0x0135}}},
-  {0x0136, {1|F|D, {0x0137}}},
-  {0x0139, {1|F|D, {0x013a}}},
-  {0x013b, {1|F|D, {0x013c}}},
-  {0x013d, {1|F|D, {0x013e}}},
-  {0x013f, {1|F|D, {0x0140}}},
-  {0x0141, {1|F|D, {0x0142}}},
-  {0x0143, {1|F|D, {0x0144}}},
-  {0x0145, {1|F|D, {0x0146}}},
-  {0x0147, {1|F|D, {0x0148}}},
-  {0x0149, {2|F|SU|I(5), {0x02bc, 0x006e}}},
-  {0x014a, {1|F|D, {0x014b}}},
-  {0x014c, {1|F|D, {0x014d}}},
-  {0x014e, {1|F|D, {0x014f}}},
-  {0x0150, {1|F|D, {0x0151}}},
-  {0x0152, {1|F|D, {0x0153}}},
-  {0x0154, {1|F|D, {0x0155}}},
-  {0x0156, {1|F|D, {0x0157}}},
-  {0x0158, {1|F|D, {0x0159}}},
-  {0x015a, {1|F|D, {0x015b}}},
-  {0x015c, {1|F|D, {0x015d}}},
-  {0x015e, {1|F|D, {0x015f}}},
-  {0x0160, {1|F|D, {0x0161}}},
-  {0x0162, {1|F|D, {0x0163}}},
-  {0x0164, {1|F|D, {0x0165}}},
-  {0x0166, {1|F|D, {0x0167}}},
-  {0x0168, {1|F|D, {0x0169}}},
-  {0x016a, {1|F|D, {0x016b}}},
-  {0x016c, {1|F|D, {0x016d}}},
-  {0x016e, {1|F|D, {0x016f}}},
-  {0x0170, {1|F|D, {0x0171}}},
-  {0x0172, {1|F|D, {0x0173}}},
-  {0x0174, {1|F|D, {0x0175}}},
-  {0x0176, {1|F|D, {0x0177}}},
-  {0x0178, {1|F|D, {0x00ff}}},
-  {0x0179, {1|F|D, {0x017a}}},
-  {0x017b, {1|F|D, {0x017c}}},
-  {0x017d, {1|F|D, {0x017e}}},
-  {0x017f, {1|F|SU|I(7), {0x0073}}},
-  {0x0181, {1|F|D, {0x0253}}},
-  {0x0182, {1|F|D, {0x0183}}},
-  {0x0184, {1|F|D, {0x0185}}},
-  {0x0186, {1|F|D, {0x0254}}},
-  {0x0187, {1|F|D, {0x0188}}},
-  {0x0189, {1|F|D, {0x0256}}},
-  {0x018a, {1|F|D, {0x0257}}},
-  {0x018b, {1|F|D, {0x018c}}},
-  {0x018e, {1|F|D, {0x01dd}}},
-  {0x018f, {1|F|D, {0x0259}}},
-  {0x0190, {1|F|D, {0x025b}}},
-  {0x0191, {1|F|D, {0x0192}}},
-  {0x0193, {1|F|D, {0x0260}}},
-  {0x0194, {1|F|D, {0x0263}}},
-  {0x0196, {1|F|D, {0x0269}}},
-  {0x0197, {1|F|D, {0x0268}}},
-  {0x0198, {1|F|D, {0x0199}}},
-  {0x019c, {1|F|D, {0x026f}}},
-  {0x019d, {1|F|D, {0x0272}}},
-  {0x019f, {1|F|D, {0x0275}}},
-  {0x01a0, {1|F|D, {0x01a1}}},
-  {0x01a2, {1|F|D, {0x01a3}}},
-  {0x01a4, {1|F|D, {0x01a5}}},
-  {0x01a6, {1|F|D, {0x0280}}},
-  {0x01a7, {1|F|D, {0x01a8}}},
-  {0x01a9, {1|F|D, {0x0283}}},
-  {0x01ac, {1|F|D, {0x01ad}}},
-  {0x01ae, {1|F|D, {0x0288}}},
-  {0x01af, {1|F|D, {0x01b0}}},
-  {0x01b1, {1|F|D, {0x028a}}},
-  {0x01b2, {1|F|D, {0x028b}}},
-  {0x01b3, {1|F|D, {0x01b4}}},
-  {0x01b5, {1|F|D, {0x01b6}}},
-  {0x01b7, {1|F|D, {0x0292}}},
-  {0x01b8, {1|F|D, {0x01b9}}},
-  {0x01bc, {1|F|D, {0x01bd}}},
-  {0x01c4, {1|F|D|ST|I(8), {0x01c6}}},
-  {0x01c5, {1|F|D|IT|SU|I(9), {0x01c6}}},
-  {0x01c7, {1|F|D|ST|I(12), {0x01c9}}},
-  {0x01c8, {1|F|D|IT|SU|I(13), {0x01c9}}},
-  {0x01ca, {1|F|D|ST|I(16), {0x01cc}}},
-  {0x01cb, {1|F|D|IT|SU|I(17), {0x01cc}}},
-  {0x01cd, {1|F|D, {0x01ce}}},
-  {0x01cf, {1|F|D, {0x01d0}}},
-  {0x01d1, {1|F|D, {0x01d2}}},
-  {0x01d3, {1|F|D, {0x01d4}}},
-  {0x01d5, {1|F|D, {0x01d6}}},
-  {0x01d7, {1|F|D, {0x01d8}}},
-  {0x01d9, {1|F|D, {0x01da}}},
-  {0x01db, {1|F|D, {0x01dc}}},
-  {0x01de, {1|F|D, {0x01df}}},
-  {0x01e0, {1|F|D, {0x01e1}}},
-  {0x01e2, {1|F|D, {0x01e3}}},
-  {0x01e4, {1|F|D, {0x01e5}}},
-  {0x01e6, {1|F|D, {0x01e7}}},
-  {0x01e8, {1|F|D, {0x01e9}}},
-  {0x01ea, {1|F|D, {0x01eb}}},
-  {0x01ec, {1|F|D, {0x01ed}}},
-  {0x01ee, {1|F|D, {0x01ef}}},
-  {0x01f0, {2|F|SU|I(20), {0x006a, 0x030c}}},
-  {0x01f1, {1|F|D|ST|I(22), {0x01f3}}},
-  {0x01f2, {1|F|D|IT|SU|I(23), {0x01f3}}},
-  {0x01f4, {1|F|D, {0x01f5}}},
-  {0x01f6, {1|F|D, {0x0195}}},
-  {0x01f7, {1|F|D, {0x01bf}}},
-  {0x01f8, {1|F|D, {0x01f9}}},
-  {0x01fa, {1|F|D, {0x01fb}}},
-  {0x01fc, {1|F|D, {0x01fd}}},
-  {0x01fe, {1|F|D, {0x01ff}}},
-  {0x0200, {1|F|D, {0x0201}}},
-  {0x0202, {1|F|D, {0x0203}}},
-  {0x0204, {1|F|D, {0x0205}}},
-  {0x0206, {1|F|D, {0x0207}}},
-  {0x0208, {1|F|D, {0x0209}}},
-  {0x020a, {1|F|D, {0x020b}}},
-  {0x020c, {1|F|D, {0x020d}}},
-  {0x020e, {1|F|D, {0x020f}}},
-  {0x0210, {1|F|D, {0x0211}}},
-  {0x0212, {1|F|D, {0x0213}}},
-  {0x0214, {1|F|D, {0x0215}}},
-  {0x0216, {1|F|D, {0x0217}}},
-  {0x0218, {1|F|D, {0x0219}}},
-  {0x021a, {1|F|D, {0x021b}}},
-  {0x021c, {1|F|D, {0x021d}}},
-  {0x021e, {1|F|D, {0x021f}}},
-  {0x0220, {1|F|D, {0x019e}}},
-  {0x0222, {1|F|D, {0x0223}}},
-  {0x0224, {1|F|D, {0x0225}}},
-  {0x0226, {1|F|D, {0x0227}}},
-  {0x0228, {1|F|D, {0x0229}}},
-  {0x022a, {1|F|D, {0x022b}}},
-  {0x022c, {1|F|D, {0x022d}}},
-  {0x022e, {1|F|D, {0x022f}}},
-  {0x0230, {1|F|D, {0x0231}}},
-  {0x0232, {1|F|D, {0x0233}}},
-  {0x023a, {1|F|D, {0x2c65}}},
-  {0x023b, {1|F|D, {0x023c}}},
-  {0x023d, {1|F|D, {0x019a}}},
-  {0x023e, {1|F|D, {0x2c66}}},
-  {0x0241, {1|F|D, {0x0242}}},
-  {0x0243, {1|F|D, {0x0180}}},
-  {0x0244, {1|F|D, {0x0289}}},
-  {0x0245, {1|F|D, {0x028c}}},
-  {0x0246, {1|F|D, {0x0247}}},
-  {0x0248, {1|F|D, {0x0249}}},
-  {0x024a, {1|F|D, {0x024b}}},
-  {0x024c, {1|F|D, {0x024d}}},
-  {0x024e, {1|F|D, {0x024f}}},
-  {0x0345, {1|F|SU|I(26), {0x03b9}}},
-  {0x0370, {1|F|D, {0x0371}}},
-  {0x0372, {1|F|D, {0x0373}}},
-  {0x0376, {1|F|D, {0x0377}}},
-  {0x037f, {1|F|D, {0x03f3}}},
-  {0x0386, {1|F|D, {0x03ac}}},
-  {0x0388, {1|F|D, {0x03ad}}},
-  {0x0389, {1|F|D, {0x03ae}}},
-  {0x038a, {1|F|D, {0x03af}}},
-  {0x038c, {1|F|D, {0x03cc}}},
-  {0x038e, {1|F|D, {0x03cd}}},
-  {0x038f, {1|F|D, {0x03ce}}},
-  {0x0390, {3|F|SU|I(27), {0x03b9, 0x0308, 0x0301}}},
-  {0x0391, {1|F|D, {0x03b1}}},
-  {0x0392, {1|F|D, {0x03b2}}},
-  {0x0393, {1|F|D, {0x03b3}}},
-  {0x0394, {1|F|D, {0x03b4}}},
-  {0x0395, {1|F|D, {0x03b5}}},
-  {0x0396, {1|F|D, {0x03b6}}},
-  {0x0397, {1|F|D, {0x03b7}}},
-  {0x0398, {1|F|D, {0x03b8}}},
-  {0x0399, {1|F|D, {0x03b9}}},
-  {0x039a, {1|F|D, {0x03ba}}},
-  {0x039b, {1|F|D, {0x03bb}}},
-  {0x039c, {1|F|D, {0x03bc}}},
-  {0x039d, {1|F|D, {0x03bd}}},
-  {0x039e, {1|F|D, {0x03be}}},
-  {0x039f, {1|F|D, {0x03bf}}},
-  {0x03a0, {1|F|D, {0x03c0}}},
-  {0x03a1, {1|F|D, {0x03c1}}},
-  {0x03a3, {1|F|D, {0x03c3}}},
-  {0x03a4, {1|F|D, {0x03c4}}},
-  {0x03a5, {1|F|D, {0x03c5}}},
-  {0x03a6, {1|F|D, {0x03c6}}},
-  {0x03a7, {1|F|D, {0x03c7}}},
-  {0x03a8, {1|F|D, {0x03c8}}},
-  {0x03a9, {1|F|D, {0x03c9}}},
-  {0x03aa, {1|F|D, {0x03ca}}},
-  {0x03ab, {1|F|D, {0x03cb}}},
-  {0x03b0, {3|F|SU|I(30), {0x03c5, 0x0308, 0x0301}}},
-  {0x03c2, {1|F|SU|I(33), {0x03c3}}},
-  {0x03cf, {1|F|D, {0x03d7}}},
-  {0x03d0, {1|F|SU|I(34), {0x03b2}}},
-  {0x03d1, {1|F|SU|I(35), {0x03b8}}},
-  {0x03d5, {1|F|SU|I(36), {0x03c6}}},
-  {0x03d6, {1|F|SU|I(37), {0x03c0}}},
-  {0x03d8, {1|F|D, {0x03d9}}},
-  {0x03da, {1|F|D, {0x03db}}},
-  {0x03dc, {1|F|D, {0x03dd}}},
-  {0x03de, {1|F|D, {0x03df}}},
-  {0x03e0, {1|F|D, {0x03e1}}},
-  {0x03e2, {1|F|D, {0x03e3}}},
-  {0x03e4, {1|F|D, {0x03e5}}},
-  {0x03e6, {1|F|D, {0x03e7}}},
-  {0x03e8, {1|F|D, {0x03e9}}},
-  {0x03ea, {1|F|D, {0x03eb}}},
-  {0x03ec, {1|F|D, {0x03ed}}},
-  {0x03ee, {1|F|D, {0x03ef}}},
-  {0x03f0, {1|F|SU|I(38), {0x03ba}}},
-  {0x03f1, {1|F|SU|I(39), {0x03c1}}},
-  {0x03f4, {1|F|D, {0x03b8}}},
-  {0x03f5, {1|F|SU|I(40), {0x03b5}}},
-  {0x03f7, {1|F|D, {0x03f8}}},
-  {0x03f9, {1|F|D, {0x03f2}}},
-  {0x03fa, {1|F|D, {0x03fb}}},
-  {0x03fd, {1|F|D, {0x037b}}},
-  {0x03fe, {1|F|D, {0x037c}}},
-  {0x03ff, {1|F|D, {0x037d}}},
-  {0x0400, {1|F|D, {0x0450}}},
-  {0x0401, {1|F|D, {0x0451}}},
-  {0x0402, {1|F|D, {0x0452}}},
-  {0x0403, {1|F|D, {0x0453}}},
-  {0x0404, {1|F|D, {0x0454}}},
-  {0x0405, {1|F|D, {0x0455}}},
-  {0x0406, {1|F|D, {0x0456}}},
-  {0x0407, {1|F|D, {0x0457}}},
-  {0x0408, {1|F|D, {0x0458}}},
-  {0x0409, {1|F|D, {0x0459}}},
-  {0x040a, {1|F|D, {0x045a}}},
-  {0x040b, {1|F|D, {0x045b}}},
-  {0x040c, {1|F|D, {0x045c}}},
-  {0x040d, {1|F|D, {0x045d}}},
-  {0x040e, {1|F|D, {0x045e}}},
-  {0x040f, {1|F|D, {0x045f}}},
-  {0x0410, {1|F|D, {0x0430}}},
-  {0x0411, {1|F|D, {0x0431}}},
-  {0x0412, {1|F|D, {0x0432}}},
-  {0x0413, {1|F|D, {0x0433}}},
-  {0x0414, {1|F|D, {0x0434}}},
-  {0x0415, {1|F|D, {0x0435}}},
-  {0x0416, {1|F|D, {0x0436}}},
-  {0x0417, {1|F|D, {0x0437}}},
-  {0x0418, {1|F|D, {0x0438}}},
-  {0x0419, {1|F|D, {0x0439}}},
-  {0x041a, {1|F|D, {0x043a}}},
-  {0x041b, {1|F|D, {0x043b}}},
-  {0x041c, {1|F|D, {0x043c}}},
-  {0x041d, {1|F|D, {0x043d}}},
-  {0x041e, {1|F|D, {0x043e}}},
-  {0x041f, {1|F|D, {0x043f}}},
-  {0x0420, {1|F|D, {0x0440}}},
-  {0x0421, {1|F|D, {0x0441}}},
-  {0x0422, {1|F|D, {0x0442}}},
-  {0x0423, {1|F|D, {0x0443}}},
-  {0x0424, {1|F|D, {0x0444}}},
-  {0x0425, {1|F|D, {0x0445}}},
-  {0x0426, {1|F|D, {0x0446}}},
-  {0x0427, {1|F|D, {0x0447}}},
-  {0x0428, {1|F|D, {0x0448}}},
-  {0x0429, {1|F|D, {0x0449}}},
-  {0x042a, {1|F|D, {0x044a}}},
-  {0x042b, {1|F|D, {0x044b}}},
-  {0x042c, {1|F|D, {0x044c}}},
-  {0x042d, {1|F|D, {0x044d}}},
-  {0x042e, {1|F|D, {0x044e}}},
-  {0x042f, {1|F|D, {0x044f}}},
-  {0x0460, {1|F|D, {0x0461}}},
-  {0x0462, {1|F|D, {0x0463}}},
-  {0x0464, {1|F|D, {0x0465}}},
-  {0x0466, {1|F|D, {0x0467}}},
-  {0x0468, {1|F|D, {0x0469}}},
-  {0x046a, {1|F|D, {0x046b}}},
-  {0x046c, {1|F|D, {0x046d}}},
-  {0x046e, {1|F|D, {0x046f}}},
-  {0x0470, {1|F|D, {0x0471}}},
-  {0x0472, {1|F|D, {0x0473}}},
-  {0x0474, {1|F|D, {0x0475}}},
-  {0x0476, {1|F|D, {0x0477}}},
-  {0x0478, {1|F|D, {0x0479}}},
-  {0x047a, {1|F|D, {0x047b}}},
-  {0x047c, {1|F|D, {0x047d}}},
-  {0x047e, {1|F|D, {0x047f}}},
-  {0x0480, {1|F|D, {0x0481}}},
-  {0x048a, {1|F|D, {0x048b}}},
-  {0x048c, {1|F|D, {0x048d}}},
-  {0x048e, {1|F|D, {0x048f}}},
-  {0x0490, {1|F|D, {0x0491}}},
-  {0x0492, {1|F|D, {0x0493}}},
-  {0x0494, {1|F|D, {0x0495}}},
-  {0x0496, {1|F|D, {0x0497}}},
-  {0x0498, {1|F|D, {0x0499}}},
-  {0x049a, {1|F|D, {0x049b}}},
-  {0x049c, {1|F|D, {0x049d}}},
-  {0x049e, {1|F|D, {0x049f}}},
-  {0x04a0, {1|F|D, {0x04a1}}},
-  {0x04a2, {1|F|D, {0x04a3}}},
-  {0x04a4, {1|F|D, {0x04a5}}},
-  {0x04a6, {1|F|D, {0x04a7}}},
-  {0x04a8, {1|F|D, {0x04a9}}},
-  {0x04aa, {1|F|D, {0x04ab}}},
-  {0x04ac, {1|F|D, {0x04ad}}},
-  {0x04ae, {1|F|D, {0x04af}}},
-  {0x04b0, {1|F|D, {0x04b1}}},
-  {0x04b2, {1|F|D, {0x04b3}}},
-  {0x04b4, {1|F|D, {0x04b5}}},
-  {0x04b6, {1|F|D, {0x04b7}}},
-  {0x04b8, {1|F|D, {0x04b9}}},
-  {0x04ba, {1|F|D, {0x04bb}}},
-  {0x04bc, {1|F|D, {0x04bd}}},
-  {0x04be, {1|F|D, {0x04bf}}},
-  {0x04c0, {1|F|D, {0x04cf}}},
-  {0x04c1, {1|F|D, {0x04c2}}},
-  {0x04c3, {1|F|D, {0x04c4}}},
-  {0x04c5, {1|F|D, {0x04c6}}},
-  {0x04c7, {1|F|D, {0x04c8}}},
-  {0x04c9, {1|F|D, {0x04ca}}},
-  {0x04cb, {1|F|D, {0x04cc}}},
-  {0x04cd, {1|F|D, {0x04ce}}},
-  {0x04d0, {1|F|D, {0x04d1}}},
-  {0x04d2, {1|F|D, {0x04d3}}},
-  {0x04d4, {1|F|D, {0x04d5}}},
-  {0x04d6, {1|F|D, {0x04d7}}},
-  {0x04d8, {1|F|D, {0x04d9}}},
-  {0x04da, {1|F|D, {0x04db}}},
-  {0x04dc, {1|F|D, {0x04dd}}},
-  {0x04de, {1|F|D, {0x04df}}},
-  {0x04e0, {1|F|D, {0x04e1}}},
-  {0x04e2, {1|F|D, {0x04e3}}},
-  {0x04e4, {1|F|D, {0x04e5}}},
-  {0x04e6, {1|F|D, {0x04e7}}},
-  {0x04e8, {1|F|D, {0x04e9}}},
-  {0x04ea, {1|F|D, {0x04eb}}},
-  {0x04ec, {1|F|D, {0x04ed}}},
-  {0x04ee, {1|F|D, {0x04ef}}},
-  {0x04f0, {1|F|D, {0x04f1}}},
-  {0x04f2, {1|F|D, {0x04f3}}},
-  {0x04f4, {1|F|D, {0x04f5}}},
-  {0x04f6, {1|F|D, {0x04f7}}},
-  {0x04f8, {1|F|D, {0x04f9}}},
-  {0x04fa, {1|F|D, {0x04fb}}},
-  {0x04fc, {1|F|D, {0x04fd}}},
-  {0x04fe, {1|F|D, {0x04ff}}},
-  {0x0500, {1|F|D, {0x0501}}},
-  {0x0502, {1|F|D, {0x0503}}},
-  {0x0504, {1|F|D, {0x0505}}},
-  {0x0506, {1|F|D, {0x0507}}},
-  {0x0508, {1|F|D, {0x0509}}},
-  {0x050a, {1|F|D, {0x050b}}},
-  {0x050c, {1|F|D, {0x050d}}},
-  {0x050e, {1|F|D, {0x050f}}},
-  {0x0510, {1|F|D, {0x0511}}},
-  {0x0512, {1|F|D, {0x0513}}},
-  {0x0514, {1|F|D, {0x0515}}},
-  {0x0516, {1|F|D, {0x0517}}},
-  {0x0518, {1|F|D, {0x0519}}},
-  {0x051a, {1|F|D, {0x051b}}},
-  {0x051c, {1|F|D, {0x051d}}},
-  {0x051e, {1|F|D, {0x051f}}},
-  {0x0520, {1|F|D, {0x0521}}},
-  {0x0522, {1|F|D, {0x0523}}},
-  {0x0524, {1|F|D, {0x0525}}},
-  {0x0526, {1|F|D, {0x0527}}},
-  {0x0528, {1|F|D, {0x0529}}},
-  {0x052a, {1|F|D, {0x052b}}},
-  {0x052c, {1|F|D, {0x052d}}},
-  {0x052e, {1|F|D, {0x052f}}},
-  {0x0531, {1|F|D, {0x0561}}},
-  {0x0532, {1|F|D, {0x0562}}},
-  {0x0533, {1|F|D, {0x0563}}},
-  {0x0534, {1|F|D, {0x0564}}},
-  {0x0535, {1|F|D, {0x0565}}},
-  {0x0536, {1|F|D, {0x0566}}},
-  {0x0537, {1|F|D, {0x0567}}},
-  {0x0538, {1|F|D, {0x0568}}},
-  {0x0539, {1|F|D, {0x0569}}},
-  {0x053a, {1|F|D, {0x056a}}},
-  {0x053b, {1|F|D, {0x056b}}},
-  {0x053c, {1|F|D, {0x056c}}},
-  {0x053d, {1|F|D, {0x056d}}},
-  {0x053e, {1|F|D, {0x056e}}},
-  {0x053f, {1|F|D, {0x056f}}},
-  {0x0540, {1|F|D, {0x0570}}},
-  {0x0541, {1|F|D, {0x0571}}},
-  {0x0542, {1|F|D, {0x0572}}},
-  {0x0543, {1|F|D, {0x0573}}},
-  {0x0544, {1|F|D, {0x0574}}},
-  {0x0545, {1|F|D, {0x0575}}},
-  {0x0546, {1|F|D, {0x0576}}},
-  {0x0547, {1|F|D, {0x0577}}},
-  {0x0548, {1|F|D, {0x0578}}},
-  {0x0549, {1|F|D, {0x0579}}},
-  {0x054a, {1|F|D, {0x057a}}},
-  {0x054b, {1|F|D, {0x057b}}},
-  {0x054c, {1|F|D, {0x057c}}},
-  {0x054d, {1|F|D, {0x057d}}},
-  {0x054e, {1|F|D, {0x057e}}},
-  {0x054f, {1|F|D, {0x057f}}},
-  {0x0550, {1|F|D, {0x0580}}},
-  {0x0551, {1|F|D, {0x0581}}},
-  {0x0552, {1|F|D, {0x0582}}},
-  {0x0553, {1|F|D, {0x0583}}},
-  {0x0554, {1|F|D, {0x0584}}},
-  {0x0555, {1|F|D, {0x0585}}},
-  {0x0556, {1|F|D, {0x0586}}},
-  {0x0587, {2|F|ST|SU|I(41), {0x0565, 0x0582}}},
-  {0x10a0, {1|F|D, {0x2d00}}},
-  {0x10a1, {1|F|D, {0x2d01}}},
-  {0x10a2, {1|F|D, {0x2d02}}},
-  {0x10a3, {1|F|D, {0x2d03}}},
-  {0x10a4, {1|F|D, {0x2d04}}},
-  {0x10a5, {1|F|D, {0x2d05}}},
-  {0x10a6, {1|F|D, {0x2d06}}},
-  {0x10a7, {1|F|D, {0x2d07}}},
-  {0x10a8, {1|F|D, {0x2d08}}},
-  {0x10a9, {1|F|D, {0x2d09}}},
-  {0x10aa, {1|F|D, {0x2d0a}}},
-  {0x10ab, {1|F|D, {0x2d0b}}},
-  {0x10ac, {1|F|D, {0x2d0c}}},
-  {0x10ad, {1|F|D, {0x2d0d}}},
-  {0x10ae, {1|F|D, {0x2d0e}}},
-  {0x10af, {1|F|D, {0x2d0f}}},
-  {0x10b0, {1|F|D, {0x2d10}}},
-  {0x10b1, {1|F|D, {0x2d11}}},
-  {0x10b2, {1|F|D, {0x2d12}}},
-  {0x10b3, {1|F|D, {0x2d13}}},
-  {0x10b4, {1|F|D, {0x2d14}}},
-  {0x10b5, {1|F|D, {0x2d15}}},
-  {0x10b6, {1|F|D, {0x2d16}}},
-  {0x10b7, {1|F|D, {0x2d17}}},
-  {0x10b8, {1|F|D, {0x2d18}}},
-  {0x10b9, {1|F|D, {0x2d19}}},
-  {0x10ba, {1|F|D, {0x2d1a}}},
-  {0x10bb, {1|F|D, {0x2d1b}}},
-  {0x10bc, {1|F|D, {0x2d1c}}},
-  {0x10bd, {1|F|D, {0x2d1d}}},
-  {0x10be, {1|F|D, {0x2d1e}}},
-  {0x10bf, {1|F|D, {0x2d1f}}},
-  {0x10c0, {1|F|D, {0x2d20}}},
-  {0x10c1, {1|F|D, {0x2d21}}},
-  {0x10c2, {1|F|D, {0x2d22}}},
-  {0x10c3, {1|F|D, {0x2d23}}},
-  {0x10c4, {1|F|D, {0x2d24}}},
-  {0x10c5, {1|F|D, {0x2d25}}},
-  {0x10c7, {1|F|D, {0x2d27}}},
-  {0x10cd, {1|F|D, {0x2d2d}}},
-  {0x13f8, {1|F|U, {0x13f0}}},
-  {0x13f9, {1|F|U, {0x13f1}}},
-  {0x13fa, {1|F|U, {0x13f2}}},
-  {0x13fb, {1|F|U, {0x13f3}}},
-  {0x13fc, {1|F|U, {0x13f4}}},
-  {0x13fd, {1|F|U, {0x13f5}}},
-  {0x1c80, {1|F|SU|I(45), {0x0432}}},
-  {0x1c81, {1|F|SU|I(46), {0x0434}}},
-  {0x1c82, {1|F|SU|I(47), {0x043e}}},
-  {0x1c83, {1|F|SU|I(48), {0x0441}}},
-  {0x1c84, {1|F|SU|I(49), {0x0442}}},
-  {0x1c85, {1|F|SU|I(50), {0x0442}}},
-  {0x1c86, {1|F|SU|I(51), {0x044a}}},
-  {0x1c87, {1|F|SU|I(52), {0x0463}}},
-  {0x1c88, {1|F|SU|I(53), {0xa64b}}},
-  {0x1c90, {1|F|D, {0x10d0}}},
-  {0x1c91, {1|F|D, {0x10d1}}},
-  {0x1c92, {1|F|D, {0x10d2}}},
-  {0x1c93, {1|F|D, {0x10d3}}},
-  {0x1c94, {1|F|D, {0x10d4}}},
-  {0x1c95, {1|F|D, {0x10d5}}},
-  {0x1c96, {1|F|D, {0x10d6}}},
-  {0x1c97, {1|F|D, {0x10d7}}},
-  {0x1c98, {1|F|D, {0x10d8}}},
-  {0x1c99, {1|F|D, {0x10d9}}},
-  {0x1c9a, {1|F|D, {0x10da}}},
-  {0x1c9b, {1|F|D, {0x10db}}},
-  {0x1c9c, {1|F|D, {0x10dc}}},
-  {0x1c9d, {1|F|D, {0x10dd}}},
-  {0x1c9e, {1|F|D, {0x10de}}},
-  {0x1c9f, {1|F|D, {0x10df}}},
-  {0x1ca0, {1|F|D, {0x10e0}}},
-  {0x1ca1, {1|F|D, {0x10e1}}},
-  {0x1ca2, {1|F|D, {0x10e2}}},
-  {0x1ca3, {1|F|D, {0x10e3}}},
-  {0x1ca4, {1|F|D, {0x10e4}}},
-  {0x1ca5, {1|F|D, {0x10e5}}},
-  {0x1ca6, {1|F|D, {0x10e6}}},
-  {0x1ca7, {1|F|D, {0x10e7}}},
-  {0x1ca8, {1|F|D, {0x10e8}}},
-  {0x1ca9, {1|F|D, {0x10e9}}},
-  {0x1caa, {1|F|D, {0x10ea}}},
-  {0x1cab, {1|F|D, {0x10eb}}},
-  {0x1cac, {1|F|D, {0x10ec}}},
-  {0x1cad, {1|F|D, {0x10ed}}},
-  {0x1cae, {1|F|D, {0x10ee}}},
-  {0x1caf, {1|F|D, {0x10ef}}},
-  {0x1cb0, {1|F|D, {0x10f0}}},
-  {0x1cb1, {1|F|D, {0x10f1}}},
-  {0x1cb2, {1|F|D, {0x10f2}}},
-  {0x1cb3, {1|F|D, {0x10f3}}},
-  {0x1cb4, {1|F|D, {0x10f4}}},
-  {0x1cb5, {1|F|D, {0x10f5}}},
-  {0x1cb6, {1|F|D, {0x10f6}}},
-  {0x1cb7, {1|F|D, {0x10f7}}},
-  {0x1cb8, {1|F|D, {0x10f8}}},
-  {0x1cb9, {1|F|D, {0x10f9}}},
-  {0x1cba, {1|F|D, {0x10fa}}},
-  {0x1cbd, {1|F|D, {0x10fd}}},
-  {0x1cbe, {1|F|D, {0x10fe}}},
-  {0x1cbf, {1|F|D, {0x10ff}}},
-  {0x1e00, {1|F|D, {0x1e01}}},
-  {0x1e02, {1|F|D, {0x1e03}}},
-  {0x1e04, {1|F|D, {0x1e05}}},
-  {0x1e06, {1|F|D, {0x1e07}}},
-  {0x1e08, {1|F|D, {0x1e09}}},
-  {0x1e0a, {1|F|D, {0x1e0b}}},
-  {0x1e0c, {1|F|D, {0x1e0d}}},
-  {0x1e0e, {1|F|D, {0x1e0f}}},
-  {0x1e10, {1|F|D, {0x1e11}}},
-  {0x1e12, {1|F|D, {0x1e13}}},
-  {0x1e14, {1|F|D, {0x1e15}}},
-  {0x1e16, {1|F|D, {0x1e17}}},
-  {0x1e18, {1|F|D, {0x1e19}}},
-  {0x1e1a, {1|F|D, {0x1e1b}}},
-  {0x1e1c, {1|F|D, {0x1e1d}}},
-  {0x1e1e, {1|F|D, {0x1e1f}}},
-  {0x1e20, {1|F|D, {0x1e21}}},
-  {0x1e22, {1|F|D, {0x1e23}}},
-  {0x1e24, {1|F|D, {0x1e25}}},
-  {0x1e26, {1|F|D, {0x1e27}}},
-  {0x1e28, {1|F|D, {0x1e29}}},
-  {0x1e2a, {1|F|D, {0x1e2b}}},
-  {0x1e2c, {1|F|D, {0x1e2d}}},
-  {0x1e2e, {1|F|D, {0x1e2f}}},
-  {0x1e30, {1|F|D, {0x1e31}}},
-  {0x1e32, {1|F|D, {0x1e33}}},
-  {0x1e34, {1|F|D, {0x1e35}}},
-  {0x1e36, {1|F|D, {0x1e37}}},
-  {0x1e38, {1|F|D, {0x1e39}}},
-  {0x1e3a, {1|F|D, {0x1e3b}}},
-  {0x1e3c, {1|F|D, {0x1e3d}}},
-  {0x1e3e, {1|F|D, {0x1e3f}}},
-  {0x1e40, {1|F|D, {0x1e41}}},
-  {0x1e42, {1|F|D, {0x1e43}}},
-  {0x1e44, {1|F|D, {0x1e45}}},
-  {0x1e46, {1|F|D, {0x1e47}}},
-  {0x1e48, {1|F|D, {0x1e49}}},
-  {0x1e4a, {1|F|D, {0x1e4b}}},
-  {0x1e4c, {1|F|D, {0x1e4d}}},
-  {0x1e4e, {1|F|D, {0x1e4f}}},
-  {0x1e50, {1|F|D, {0x1e51}}},
-  {0x1e52, {1|F|D, {0x1e53}}},
-  {0x1e54, {1|F|D, {0x1e55}}},
-  {0x1e56, {1|F|D, {0x1e57}}},
-  {0x1e58, {1|F|D, {0x1e59}}},
-  {0x1e5a, {1|F|D, {0x1e5b}}},
-  {0x1e5c, {1|F|D, {0x1e5d}}},
-  {0x1e5e, {1|F|D, {0x1e5f}}},
-  {0x1e60, {1|F|D, {0x1e61}}},
-  {0x1e62, {1|F|D, {0x1e63}}},
-  {0x1e64, {1|F|D, {0x1e65}}},
-  {0x1e66, {1|F|D, {0x1e67}}},
-  {0x1e68, {1|F|D, {0x1e69}}},
-  {0x1e6a, {1|F|D, {0x1e6b}}},
-  {0x1e6c, {1|F|D, {0x1e6d}}},
-  {0x1e6e, {1|F|D, {0x1e6f}}},
-  {0x1e70, {1|F|D, {0x1e71}}},
-  {0x1e72, {1|F|D, {0x1e73}}},
-  {0x1e74, {1|F|D, {0x1e75}}},
-  {0x1e76, {1|F|D, {0x1e77}}},
-  {0x1e78, {1|F|D, {0x1e79}}},
-  {0x1e7a, {1|F|D, {0x1e7b}}},
-  {0x1e7c, {1|F|D, {0x1e7d}}},
-  {0x1e7e, {1|F|D, {0x1e7f}}},
-  {0x1e80, {1|F|D, {0x1e81}}},
-  {0x1e82, {1|F|D, {0x1e83}}},
-  {0x1e84, {1|F|D, {0x1e85}}},
-  {0x1e86, {1|F|D, {0x1e87}}},
-  {0x1e88, {1|F|D, {0x1e89}}},
-  {0x1e8a, {1|F|D, {0x1e8b}}},
-  {0x1e8c, {1|F|D, {0x1e8d}}},
-  {0x1e8e, {1|F|D, {0x1e8f}}},
-  {0x1e90, {1|F|D, {0x1e91}}},
-  {0x1e92, {1|F|D, {0x1e93}}},
-  {0x1e94, {1|F|D, {0x1e95}}},
-  {0x1e96, {2|F|SU|I(54), {0x0068, 0x0331}}},
-  {0x1e97, {2|F|SU|I(56), {0x0074, 0x0308}}},
-  {0x1e98, {2|F|SU|I(58), {0x0077, 0x030a}}},
-  {0x1e99, {2|F|SU|I(60), {0x0079, 0x030a}}},
-  {0x1e9a, {2|F|SU|I(62), {0x0061, 0x02be}}},
-  {0x1e9b, {1|F|SU|I(64), {0x1e61}}},
-  {0x1e9e, {2|F|SL|I(65), {0x0073, 0x0073}}},
-  {0x1ea0, {1|F|D, {0x1ea1}}},
-  {0x1ea2, {1|F|D, {0x1ea3}}},
-  {0x1ea4, {1|F|D, {0x1ea5}}},
-  {0x1ea6, {1|F|D, {0x1ea7}}},
-  {0x1ea8, {1|F|D, {0x1ea9}}},
-  {0x1eaa, {1|F|D, {0x1eab}}},
-  {0x1eac, {1|F|D, {0x1ead}}},
-  {0x1eae, {1|F|D, {0x1eaf}}},
-  {0x1eb0, {1|F|D, {0x1eb1}}},
-  {0x1eb2, {1|F|D, {0x1eb3}}},
-  {0x1eb4, {1|F|D, {0x1eb5}}},
-  {0x1eb6, {1|F|D, {0x1eb7}}},
-  {0x1eb8, {1|F|D, {0x1eb9}}},
-  {0x1eba, {1|F|D, {0x1ebb}}},
-  {0x1ebc, {1|F|D, {0x1ebd}}},
-  {0x1ebe, {1|F|D, {0x1ebf}}},
-  {0x1ec0, {1|F|D, {0x1ec1}}},
-  {0x1ec2, {1|F|D, {0x1ec3}}},
-  {0x1ec4, {1|F|D, {0x1ec5}}},
-  {0x1ec6, {1|F|D, {0x1ec7}}},
-  {0x1ec8, {1|F|D, {0x1ec9}}},
-  {0x1eca, {1|F|D, {0x1ecb}}},
-  {0x1ecc, {1|F|D, {0x1ecd}}},
-  {0x1ece, {1|F|D, {0x1ecf}}},
-  {0x1ed0, {1|F|D, {0x1ed1}}},
-  {0x1ed2, {1|F|D, {0x1ed3}}},
-  {0x1ed4, {1|F|D, {0x1ed5}}},
-  {0x1ed6, {1|F|D, {0x1ed7}}},
-  {0x1ed8, {1|F|D, {0x1ed9}}},
-  {0x1eda, {1|F|D, {0x1edb}}},
-  {0x1edc, {1|F|D, {0x1edd}}},
-  {0x1ede, {1|F|D, {0x1edf}}},
-  {0x1ee0, {1|F|D, {0x1ee1}}},
-  {0x1ee2, {1|F|D, {0x1ee3}}},
-  {0x1ee4, {1|F|D, {0x1ee5}}},
-  {0x1ee6, {1|F|D, {0x1ee7}}},
-  {0x1ee8, {1|F|D, {0x1ee9}}},
-  {0x1eea, {1|F|D, {0x1eeb}}},
-  {0x1eec, {1|F|D, {0x1eed}}},
-  {0x1eee, {1|F|D, {0x1eef}}},
-  {0x1ef0, {1|F|D, {0x1ef1}}},
-  {0x1ef2, {1|F|D, {0x1ef3}}},
-  {0x1ef4, {1|F|D, {0x1ef5}}},
-  {0x1ef6, {1|F|D, {0x1ef7}}},
-  {0x1ef8, {1|F|D, {0x1ef9}}},
-  {0x1efa, {1|F|D, {0x1efb}}},
-  {0x1efc, {1|F|D, {0x1efd}}},
-  {0x1efe, {1|F|D, {0x1eff}}},
-  {0x1f08, {1|F|D, {0x1f00}}},
-  {0x1f09, {1|F|D, {0x1f01}}},
-  {0x1f0a, {1|F|D, {0x1f02}}},
-  {0x1f0b, {1|F|D, {0x1f03}}},
-  {0x1f0c, {1|F|D, {0x1f04}}},
-  {0x1f0d, {1|F|D, {0x1f05}}},
-  {0x1f0e, {1|F|D, {0x1f06}}},
-  {0x1f0f, {1|F|D, {0x1f07}}},
-  {0x1f18, {1|F|D, {0x1f10}}},
-  {0x1f19, {1|F|D, {0x1f11}}},
-  {0x1f1a, {1|F|D, {0x1f12}}},
-  {0x1f1b, {1|F|D, {0x1f13}}},
-  {0x1f1c, {1|F|D, {0x1f14}}},
-  {0x1f1d, {1|F|D, {0x1f15}}},
-  {0x1f28, {1|F|D, {0x1f20}}},
-  {0x1f29, {1|F|D, {0x1f21}}},
-  {0x1f2a, {1|F|D, {0x1f22}}},
-  {0x1f2b, {1|F|D, {0x1f23}}},
-  {0x1f2c, {1|F|D, {0x1f24}}},
-  {0x1f2d, {1|F|D, {0x1f25}}},
-  {0x1f2e, {1|F|D, {0x1f26}}},
-  {0x1f2f, {1|F|D, {0x1f27}}},
-  {0x1f38, {1|F|D, {0x1f30}}},
-  {0x1f39, {1|F|D, {0x1f31}}},
-  {0x1f3a, {1|F|D, {0x1f32}}},
-  {0x1f3b, {1|F|D, {0x1f33}}},
-  {0x1f3c, {1|F|D, {0x1f34}}},
-  {0x1f3d, {1|F|D, {0x1f35}}},
-  {0x1f3e, {1|F|D, {0x1f36}}},
-  {0x1f3f, {1|F|D, {0x1f37}}},
-  {0x1f48, {1|F|D, {0x1f40}}},
-  {0x1f49, {1|F|D, {0x1f41}}},
-  {0x1f4a, {1|F|D, {0x1f42}}},
-  {0x1f4b, {1|F|D, {0x1f43}}},
-  {0x1f4c, {1|F|D, {0x1f44}}},
-  {0x1f4d, {1|F|D, {0x1f45}}},
-  {0x1f50, {2|F|SU|I(66), {0x03c5, 0x0313}}},
-  {0x1f52, {3|F|SU|I(68), {0x03c5, 0x0313, 0x0300}}},
-  {0x1f54, {3|F|SU|I(71), {0x03c5, 0x0313, 0x0301}}},
-  {0x1f56, {3|F|SU|I(74), {0x03c5, 0x0313, 0x0342}}},
-  {0x1f59, {1|F|D, {0x1f51}}},
-  {0x1f5b, {1|F|D, {0x1f53}}},
-  {0x1f5d, {1|F|D, {0x1f55}}},
-  {0x1f5f, {1|F|D, {0x1f57}}},
-  {0x1f68, {1|F|D, {0x1f60}}},
-  {0x1f69, {1|F|D, {0x1f61}}},
-  {0x1f6a, {1|F|D, {0x1f62}}},
-  {0x1f6b, {1|F|D, {0x1f63}}},
-  {0x1f6c, {1|F|D, {0x1f64}}},
-  {0x1f6d, {1|F|D, {0x1f65}}},
-  {0x1f6e, {1|F|D, {0x1f66}}},
-  {0x1f6f, {1|F|D, {0x1f67}}},
-  {0x1f80, {2|F|ST|SU|I(77), {0x1f00, 0x03b9}}},
-  {0x1f81, {2|F|ST|SU|I(80), {0x1f01, 0x03b9}}},
-  {0x1f82, {2|F|ST|SU|I(83), {0x1f02, 0x03b9}}},
-  {0x1f83, {2|F|ST|SU|I(86), {0x1f03, 0x03b9}}},
-  {0x1f84, {2|F|ST|SU|I(89), {0x1f04, 0x03b9}}},
-  {0x1f85, {2|F|ST|SU|I(92), {0x1f05, 0x03b9}}},
-  {0x1f86, {2|F|ST|SU|I(95), {0x1f06, 0x03b9}}},
-  {0x1f87, {2|F|ST|SU|I(98), {0x1f07, 0x03b9}}},
-  {0x1f88, {2|F|IT|SL|SU|I(101), {0x1f00, 0x03b9}}},
-  {0x1f89, {2|F|IT|SL|SU|I(106), {0x1f01, 0x03b9}}},
-  {0x1f8a, {2|F|IT|SL|SU|I(111), {0x1f02, 0x03b9}}},
-  {0x1f8b, {2|F|IT|SL|SU|I(116), {0x1f03, 0x03b9}}},
-  {0x1f8c, {2|F|IT|SL|SU|I(121), {0x1f04, 0x03b9}}},
-  {0x1f8d, {2|F|IT|SL|SU|I(126), {0x1f05, 0x03b9}}},
-  {0x1f8e, {2|F|IT|SL|SU|I(131), {0x1f06, 0x03b9}}},
-  {0x1f8f, {2|F|IT|SL|SU|I(136), {0x1f07, 0x03b9}}},
-  {0x1f90, {2|F|ST|SU|I(141), {0x1f20, 0x03b9}}},
-  {0x1f91, {2|F|ST|SU|I(144), {0x1f21, 0x03b9}}},
-  {0x1f92, {2|F|ST|SU|I(147), {0x1f22, 0x03b9}}},
-  {0x1f93, {2|F|ST|SU|I(150), {0x1f23, 0x03b9}}},
-  {0x1f94, {2|F|ST|SU|I(153), {0x1f24, 0x03b9}}},
-  {0x1f95, {2|F|ST|SU|I(156), {0x1f25, 0x03b9}}},
-  {0x1f96, {2|F|ST|SU|I(159), {0x1f26, 0x03b9}}},
-  {0x1f97, {2|F|ST|SU|I(162), {0x1f27, 0x03b9}}},
-  {0x1f98, {2|F|IT|SL|SU|I(165), {0x1f20, 0x03b9}}},
-  {0x1f99, {2|F|IT|SL|SU|I(170), {0x1f21, 0x03b9}}},
-  {0x1f9a, {2|F|IT|SL|SU|I(175), {0x1f22, 0x03b9}}},
-  {0x1f9b, {2|F|IT|SL|SU|I(180), {0x1f23, 0x03b9}}},
-  {0x1f9c, {2|F|IT|SL|SU|I(185), {0x1f24, 0x03b9}}},
-  {0x1f9d, {2|F|IT|SL|SU|I(190), {0x1f25, 0x03b9}}},
-  {0x1f9e, {2|F|IT|SL|SU|I(195), {0x1f26, 0x03b9}}},
-  {0x1f9f, {2|F|IT|SL|SU|I(200), {0x1f27, 0x03b9}}},
-  {0x1fa0, {2|F|ST|SU|I(205), {0x1f60, 0x03b9}}},
-  {0x1fa1, {2|F|ST|SU|I(208), {0x1f61, 0x03b9}}},
-  {0x1fa2, {2|F|ST|SU|I(211), {0x1f62, 0x03b9}}},
-  {0x1fa3, {2|F|ST|SU|I(214), {0x1f63, 0x03b9}}},
-  {0x1fa4, {2|F|ST|SU|I(217), {0x1f64, 0x03b9}}},
-  {0x1fa5, {2|F|ST|SU|I(220), {0x1f65, 0x03b9}}},
-  {0x1fa6, {2|F|ST|SU|I(223), {0x1f66, 0x03b9}}},
-  {0x1fa7, {2|F|ST|SU|I(226), {0x1f67, 0x03b9}}},
-  {0x1fa8, {2|F|IT|SL|SU|I(229), {0x1f60, 0x03b9}}},
-  {0x1fa9, {2|F|IT|SL|SU|I(234), {0x1f61, 0x03b9}}},
-  {0x1faa, {2|F|IT|SL|SU|I(239), {0x1f62, 0x03b9}}},
-  {0x1fab, {2|F|IT|SL|SU|I(244), {0x1f63, 0x03b9}}},
-  {0x1fac, {2|F|IT|SL|SU|I(249), {0x1f64, 0x03b9}}},
-  {0x1fad, {2|F|IT|SL|SU|I(254), {0x1f65, 0x03b9}}},
-  {0x1fae, {2|F|IT|SL|SU|I(259), {0x1f66, 0x03b9}}},
-  {0x1faf, {2|F|IT|SL|SU|I(264), {0x1f67, 0x03b9}}},
-  {0x1fb2, {2|F|ST|SU|I(269), {0x1f70, 0x03b9}}},
-  {0x1fb3, {2|F|ST|SU|I(273), {0x03b1, 0x03b9}}},
-  {0x1fb4, {2|F|ST|SU|I(276), {0x03ac, 0x03b9}}},
-  {0x1fb6, {2|F|SU|I(280), {0x03b1, 0x0342}}},
-  {0x1fb7, {3|F|ST|SU|I(282), {0x03b1, 0x0342, 0x03b9}}},
-  {0x1fb8, {1|F|D, {0x1fb0}}},
-  {0x1fb9, {1|F|D, {0x1fb1}}},
-  {0x1fba, {1|F|D, {0x1f70}}},
-  {0x1fbb, {1|F|D, {0x1f71}}},
-  {0x1fbc, {2|F|IT|SL|SU|I(288), {0x03b1, 0x03b9}}},
-  {0x1fbe, {1|F|SU|I(293), {0x03b9}}},
-  {0x1fc2, {2|F|ST|SU|I(294), {0x1f74, 0x03b9}}},
-  {0x1fc3, {2|F|ST|SU|I(298), {0x03b7, 0x03b9}}},
-  {0x1fc4, {2|F|ST|SU|I(301), {0x03ae, 0x03b9}}},
-  {0x1fc6, {2|F|SU|I(305), {0x03b7, 0x0342}}},
-  {0x1fc7, {3|F|ST|SU|I(307), {0x03b7, 0x0342, 0x03b9}}},
-  {0x1fc8, {1|F|D, {0x1f72}}},
-  {0x1fc9, {1|F|D, {0x1f73}}},
-  {0x1fca, {1|F|D, {0x1f74}}},
-  {0x1fcb, {1|F|D, {0x1f75}}},
-  {0x1fcc, {2|F|IT|SL|SU|I(313), {0x03b7, 0x03b9}}},
-  {0x1fd2, {3|F|SU|I(318), {0x03b9, 0x0308, 0x0300}}},
-  {0x1fd3, {3|F|SU|I(321), {0x03b9, 0x0308, 0x0301}}},
-  {0x1fd6, {2|F|SU|I(324), {0x03b9, 0x0342}}},
-  {0x1fd7, {3|F|SU|I(326), {0x03b9, 0x0308, 0x0342}}},
-  {0x1fd8, {1|F|D, {0x1fd0}}},
-  {0x1fd9, {1|F|D, {0x1fd1}}},
-  {0x1fda, {1|F|D, {0x1f76}}},
-  {0x1fdb, {1|F|D, {0x1f77}}},
-  {0x1fe2, {3|F|SU|I(329), {0x03c5, 0x0308, 0x0300}}},
-  {0x1fe3, {3|F|SU|I(332), {0x03c5, 0x0308, 0x0301}}},
-  {0x1fe4, {2|F|SU|I(335), {0x03c1, 0x0313}}},
-  {0x1fe6, {2|F|SU|I(337), {0x03c5, 0x0342}}},
-  {0x1fe7, {3|F|SU|I(339), {0x03c5, 0x0308, 0x0342}}},
-  {0x1fe8, {1|F|D, {0x1fe0}}},
-  {0x1fe9, {1|F|D, {0x1fe1}}},
-  {0x1fea, {1|F|D, {0x1f7a}}},
-  {0x1feb, {1|F|D, {0x1f7b}}},
-  {0x1fec, {1|F|D, {0x1fe5}}},
-  {0x1ff2, {2|F|ST|SU|I(342), {0x1f7c, 0x03b9}}},
-  {0x1ff3, {2|F|ST|SU|I(346), {0x03c9, 0x03b9}}},
-  {0x1ff4, {2|F|ST|SU|I(349), {0x03ce, 0x03b9}}},
-  {0x1ff6, {2|F|SU|I(353), {0x03c9, 0x0342}}},
-  {0x1ff7, {3|F|ST|SU|I(355), {0x03c9, 0x0342, 0x03b9}}},
-  {0x1ff8, {1|F|D, {0x1f78}}},
-  {0x1ff9, {1|F|D, {0x1f79}}},
-  {0x1ffa, {1|F|D, {0x1f7c}}},
-  {0x1ffb, {1|F|D, {0x1f7d}}},
-  {0x1ffc, {2|F|IT|SL|SU|I(361), {0x03c9, 0x03b9}}},
-  {0x2126, {1|F|D, {0x03c9}}},
-  {0x212a, {1|F|D, {0x006b}}},
-  {0x212b, {1|F|D, {0x00e5}}},
-  {0x2132, {1|F|D, {0x214e}}},
-  {0x2160, {1|F|D, {0x2170}}},
-  {0x2161, {1|F|D, {0x2171}}},
-  {0x2162, {1|F|D, {0x2172}}},
-  {0x2163, {1|F|D, {0x2173}}},
-  {0x2164, {1|F|D, {0x2174}}},
-  {0x2165, {1|F|D, {0x2175}}},
-  {0x2166, {1|F|D, {0x2176}}},
-  {0x2167, {1|F|D, {0x2177}}},
-  {0x2168, {1|F|D, {0x2178}}},
-  {0x2169, {1|F|D, {0x2179}}},
-  {0x216a, {1|F|D, {0x217a}}},
-  {0x216b, {1|F|D, {0x217b}}},
-  {0x216c, {1|F|D, {0x217c}}},
-  {0x216d, {1|F|D, {0x217d}}},
-  {0x216e, {1|F|D, {0x217e}}},
-  {0x216f, {1|F|D, {0x217f}}},
-  {0x2183, {1|F|D, {0x2184}}},
-  {0x24b6, {1|F|D, {0x24d0}}},
-  {0x24b7, {1|F|D, {0x24d1}}},
-  {0x24b8, {1|F|D, {0x24d2}}},
-  {0x24b9, {1|F|D, {0x24d3}}},
-  {0x24ba, {1|F|D, {0x24d4}}},
-  {0x24bb, {1|F|D, {0x24d5}}},
-  {0x24bc, {1|F|D, {0x24d6}}},
-  {0x24bd, {1|F|D, {0x24d7}}},
-  {0x24be, {1|F|D, {0x24d8}}},
-  {0x24bf, {1|F|D, {0x24d9}}},
-  {0x24c0, {1|F|D, {0x24da}}},
-  {0x24c1, {1|F|D, {0x24db}}},
-  {0x24c2, {1|F|D, {0x24dc}}},
-  {0x24c3, {1|F|D, {0x24dd}}},
-  {0x24c4, {1|F|D, {0x24de}}},
-  {0x24c5, {1|F|D, {0x24df}}},
-  {0x24c6, {1|F|D, {0x24e0}}},
-  {0x24c7, {1|F|D, {0x24e1}}},
-  {0x24c8, {1|F|D, {0x24e2}}},
-  {0x24c9, {1|F|D, {0x24e3}}},
-  {0x24ca, {1|F|D, {0x24e4}}},
-  {0x24cb, {1|F|D, {0x24e5}}},
-  {0x24cc, {1|F|D, {0x24e6}}},
-  {0x24cd, {1|F|D, {0x24e7}}},
-  {0x24ce, {1|F|D, {0x24e8}}},
-  {0x24cf, {1|F|D, {0x24e9}}},
-  {0x2c00, {1|F|D, {0x2c30}}},
-  {0x2c01, {1|F|D, {0x2c31}}},
-  {0x2c02, {1|F|D, {0x2c32}}},
-  {0x2c03, {1|F|D, {0x2c33}}},
-  {0x2c04, {1|F|D, {0x2c34}}},
-  {0x2c05, {1|F|D, {0x2c35}}},
-  {0x2c06, {1|F|D, {0x2c36}}},
-  {0x2c07, {1|F|D, {0x2c37}}},
-  {0x2c08, {1|F|D, {0x2c38}}},
-  {0x2c09, {1|F|D, {0x2c39}}},
-  {0x2c0a, {1|F|D, {0x2c3a}}},
-  {0x2c0b, {1|F|D, {0x2c3b}}},
-  {0x2c0c, {1|F|D, {0x2c3c}}},
-  {0x2c0d, {1|F|D, {0x2c3d}}},
-  {0x2c0e, {1|F|D, {0x2c3e}}},
-  {0x2c0f, {1|F|D, {0x2c3f}}},
-  {0x2c10, {1|F|D, {0x2c40}}},
-  {0x2c11, {1|F|D, {0x2c41}}},
-  {0x2c12, {1|F|D, {0x2c42}}},
-  {0x2c13, {1|F|D, {0x2c43}}},
-  {0x2c14, {1|F|D, {0x2c44}}},
-  {0x2c15, {1|F|D, {0x2c45}}},
-  {0x2c16, {1|F|D, {0x2c46}}},
-  {0x2c17, {1|F|D, {0x2c47}}},
-  {0x2c18, {1|F|D, {0x2c48}}},
-  {0x2c19, {1|F|D, {0x2c49}}},
-  {0x2c1a, {1|F|D, {0x2c4a}}},
-  {0x2c1b, {1|F|D, {0x2c4b}}},
-  {0x2c1c, {1|F|D, {0x2c4c}}},
-  {0x2c1d, {1|F|D, {0x2c4d}}},
-  {0x2c1e, {1|F|D, {0x2c4e}}},
-  {0x2c1f, {1|F|D, {0x2c4f}}},
-  {0x2c20, {1|F|D, {0x2c50}}},
-  {0x2c21, {1|F|D, {0x2c51}}},
-  {0x2c22, {1|F|D, {0x2c52}}},
-  {0x2c23, {1|F|D, {0x2c53}}},
-  {0x2c24, {1|F|D, {0x2c54}}},
-  {0x2c25, {1|F|D, {0x2c55}}},
-  {0x2c26, {1|F|D, {0x2c56}}},
-  {0x2c27, {1|F|D, {0x2c57}}},
-  {0x2c28, {1|F|D, {0x2c58}}},
-  {0x2c29, {1|F|D, {0x2c59}}},
-  {0x2c2a, {1|F|D, {0x2c5a}}},
-  {0x2c2b, {1|F|D, {0x2c5b}}},
-  {0x2c2c, {1|F|D, {0x2c5c}}},
-  {0x2c2d, {1|F|D, {0x2c5d}}},
-  {0x2c2e, {1|F|D, {0x2c5e}}},
-  {0x2c2f, {1|F|D, {0x2c5f}}},
-  {0x2c60, {1|F|D, {0x2c61}}},
-  {0x2c62, {1|F|D, {0x026b}}},
-  {0x2c63, {1|F|D, {0x1d7d}}},
-  {0x2c64, {1|F|D, {0x027d}}},
-  {0x2c67, {1|F|D, {0x2c68}}},
-  {0x2c69, {1|F|D, {0x2c6a}}},
-  {0x2c6b, {1|F|D, {0x2c6c}}},
-  {0x2c6d, {1|F|D, {0x0251}}},
-  {0x2c6e, {1|F|D, {0x0271}}},
-  {0x2c6f, {1|F|D, {0x0250}}},
-  {0x2c70, {1|F|D, {0x0252}}},
-  {0x2c72, {1|F|D, {0x2c73}}},
-  {0x2c75, {1|F|D, {0x2c76}}},
-  {0x2c7e, {1|F|D, {0x023f}}},
-  {0x2c7f, {1|F|D, {0x0240}}},
-  {0x2c80, {1|F|D, {0x2c81}}},
-  {0x2c82, {1|F|D, {0x2c83}}},
-  {0x2c84, {1|F|D, {0x2c85}}},
-  {0x2c86, {1|F|D, {0x2c87}}},
-  {0x2c88, {1|F|D, {0x2c89}}},
-  {0x2c8a, {1|F|D, {0x2c8b}}},
-  {0x2c8c, {1|F|D, {0x2c8d}}},
-  {0x2c8e, {1|F|D, {0x2c8f}}},
-  {0x2c90, {1|F|D, {0x2c91}}},
-  {0x2c92, {1|F|D, {0x2c93}}},
-  {0x2c94, {1|F|D, {0x2c95}}},
-  {0x2c96, {1|F|D, {0x2c97}}},
-  {0x2c98, {1|F|D, {0x2c99}}},
-  {0x2c9a, {1|F|D, {0x2c9b}}},
-  {0x2c9c, {1|F|D, {0x2c9d}}},
-  {0x2c9e, {1|F|D, {0x2c9f}}},
-  {0x2ca0, {1|F|D, {0x2ca1}}},
-  {0x2ca2, {1|F|D, {0x2ca3}}},
-  {0x2ca4, {1|F|D, {0x2ca5}}},
-  {0x2ca6, {1|F|D, {0x2ca7}}},
-  {0x2ca8, {1|F|D, {0x2ca9}}},
-  {0x2caa, {1|F|D, {0x2cab}}},
-  {0x2cac, {1|F|D, {0x2cad}}},
-  {0x2cae, {1|F|D, {0x2caf}}},
-  {0x2cb0, {1|F|D, {0x2cb1}}},
-  {0x2cb2, {1|F|D, {0x2cb3}}},
-  {0x2cb4, {1|F|D, {0x2cb5}}},
-  {0x2cb6, {1|F|D, {0x2cb7}}},
-  {0x2cb8, {1|F|D, {0x2cb9}}},
-  {0x2cba, {1|F|D, {0x2cbb}}},
-  {0x2cbc, {1|F|D, {0x2cbd}}},
-  {0x2cbe, {1|F|D, {0x2cbf}}},
-  {0x2cc0, {1|F|D, {0x2cc1}}},
-  {0x2cc2, {1|F|D, {0x2cc3}}},
-  {0x2cc4, {1|F|D, {0x2cc5}}},
-  {0x2cc6, {1|F|D, {0x2cc7}}},
-  {0x2cc8, {1|F|D, {0x2cc9}}},
-  {0x2cca, {1|F|D, {0x2ccb}}},
-  {0x2ccc, {1|F|D, {0x2ccd}}},
-  {0x2cce, {1|F|D, {0x2ccf}}},
-  {0x2cd0, {1|F|D, {0x2cd1}}},
-  {0x2cd2, {1|F|D, {0x2cd3}}},
-  {0x2cd4, {1|F|D, {0x2cd5}}},
-  {0x2cd6, {1|F|D, {0x2cd7}}},
-  {0x2cd8, {1|F|D, {0x2cd9}}},
-  {0x2cda, {1|F|D, {0x2cdb}}},
-  {0x2cdc, {1|F|D, {0x2cdd}}},
-  {0x2cde, {1|F|D, {0x2cdf}}},
-  {0x2ce0, {1|F|D, {0x2ce1}}},
-  {0x2ce2, {1|F|D, {0x2ce3}}},
-  {0x2ceb, {1|F|D, {0x2cec}}},
-  {0x2ced, {1|F|D, {0x2cee}}},
-  {0x2cf2, {1|F|D, {0x2cf3}}},
-  {0xa640, {1|F|D, {0xa641}}},
-  {0xa642, {1|F|D, {0xa643}}},
-  {0xa644, {1|F|D, {0xa645}}},
-  {0xa646, {1|F|D, {0xa647}}},
-  {0xa648, {1|F|D, {0xa649}}},
-  {0xa64a, {1|F|D, {0xa64b}}},
-  {0xa64c, {1|F|D, {0xa64d}}},
-  {0xa64e, {1|F|D, {0xa64f}}},
-  {0xa650, {1|F|D, {0xa651}}},
-  {0xa652, {1|F|D, {0xa653}}},
-  {0xa654, {1|F|D, {0xa655}}},
-  {0xa656, {1|F|D, {0xa657}}},
-  {0xa658, {1|F|D, {0xa659}}},
-  {0xa65a, {1|F|D, {0xa65b}}},
-  {0xa65c, {1|F|D, {0xa65d}}},
-  {0xa65e, {1|F|D, {0xa65f}}},
-  {0xa660, {1|F|D, {0xa661}}},
-  {0xa662, {1|F|D, {0xa663}}},
-  {0xa664, {1|F|D, {0xa665}}},
-  {0xa666, {1|F|D, {0xa667}}},
-  {0xa668, {1|F|D, {0xa669}}},
-  {0xa66a, {1|F|D, {0xa66b}}},
-  {0xa66c, {1|F|D, {0xa66d}}},
-  {0xa680, {1|F|D, {0xa681}}},
-  {0xa682, {1|F|D, {0xa683}}},
-  {0xa684, {1|F|D, {0xa685}}},
-  {0xa686, {1|F|D, {0xa687}}},
-  {0xa688, {1|F|D, {0xa689}}},
-  {0xa68a, {1|F|D, {0xa68b}}},
-  {0xa68c, {1|F|D, {0xa68d}}},
-  {0xa68e, {1|F|D, {0xa68f}}},
-  {0xa690, {1|F|D, {0xa691}}},
-  {0xa692, {1|F|D, {0xa693}}},
-  {0xa694, {1|F|D, {0xa695}}},
-  {0xa696, {1|F|D, {0xa697}}},
-  {0xa698, {1|F|D, {0xa699}}},
-  {0xa69a, {1|F|D, {0xa69b}}},
-  {0xa722, {1|F|D, {0xa723}}},
-  {0xa724, {1|F|D, {0xa725}}},
-  {0xa726, {1|F|D, {0xa727}}},
-  {0xa728, {1|F|D, {0xa729}}},
-  {0xa72a, {1|F|D, {0xa72b}}},
-  {0xa72c, {1|F|D, {0xa72d}}},
-  {0xa72e, {1|F|D, {0xa72f}}},
-  {0xa732, {1|F|D, {0xa733}}},
-  {0xa734, {1|F|D, {0xa735}}},
-  {0xa736, {1|F|D, {0xa737}}},
-  {0xa738, {1|F|D, {0xa739}}},
-  {0xa73a, {1|F|D, {0xa73b}}},
-  {0xa73c, {1|F|D, {0xa73d}}},
-  {0xa73e, {1|F|D, {0xa73f}}},
-  {0xa740, {1|F|D, {0xa741}}},
-  {0xa742, {1|F|D, {0xa743}}},
-  {0xa744, {1|F|D, {0xa745}}},
-  {0xa746, {1|F|D, {0xa747}}},
-  {0xa748, {1|F|D, {0xa749}}},
-  {0xa74a, {1|F|D, {0xa74b}}},
-  {0xa74c, {1|F|D, {0xa74d}}},
-  {0xa74e, {1|F|D, {0xa74f}}},
-  {0xa750, {1|F|D, {0xa751}}},
-  {0xa752, {1|F|D, {0xa753}}},
-  {0xa754, {1|F|D, {0xa755}}},
-  {0xa756, {1|F|D, {0xa757}}},
-  {0xa758, {1|F|D, {0xa759}}},
-  {0xa75a, {1|F|D, {0xa75b}}},
-  {0xa75c, {1|F|D, {0xa75d}}},
-  {0xa75e, {1|F|D, {0xa75f}}},
-  {0xa760, {1|F|D, {0xa761}}},
-  {0xa762, {1|F|D, {0xa763}}},
-  {0xa764, {1|F|D, {0xa765}}},
-  {0xa766, {1|F|D, {0xa767}}},
-  {0xa768, {1|F|D, {0xa769}}},
-  {0xa76a, {1|F|D, {0xa76b}}},
-  {0xa76c, {1|F|D, {0xa76d}}},
-  {0xa76e, {1|F|D, {0xa76f}}},
-  {0xa779, {1|F|D, {0xa77a}}},
-  {0xa77b, {1|F|D, {0xa77c}}},
-  {0xa77d, {1|F|D, {0x1d79}}},
-  {0xa77e, {1|F|D, {0xa77f}}},
-  {0xa780, {1|F|D, {0xa781}}},
-  {0xa782, {1|F|D, {0xa783}}},
-  {0xa784, {1|F|D, {0xa785}}},
-  {0xa786, {1|F|D, {0xa787}}},
-  {0xa78b, {1|F|D, {0xa78c}}},
-  {0xa78d, {1|F|D, {0x0265}}},
-  {0xa790, {1|F|D, {0xa791}}},
-  {0xa792, {1|F|D, {0xa793}}},
-  {0xa796, {1|F|D, {0xa797}}},
-  {0xa798, {1|F|D, {0xa799}}},
-  {0xa79a, {1|F|D, {0xa79b}}},
-  {0xa79c, {1|F|D, {0xa79d}}},
-  {0xa79e, {1|F|D, {0xa79f}}},
-  {0xa7a0, {1|F|D, {0xa7a1}}},
-  {0xa7a2, {1|F|D, {0xa7a3}}},
-  {0xa7a4, {1|F|D, {0xa7a5}}},
-  {0xa7a6, {1|F|D, {0xa7a7}}},
-  {0xa7a8, {1|F|D, {0xa7a9}}},
-  {0xa7aa, {1|F|D, {0x0266}}},
-  {0xa7ab, {1|F|D, {0x025c}}},
-  {0xa7ac, {1|F|D, {0x0261}}},
-  {0xa7ad, {1|F|D, {0x026c}}},
-  {0xa7ae, {1|F|D, {0x026a}}},
-  {0xa7b0, {1|F|D, {0x029e}}},
-  {0xa7b1, {1|F|D, {0x0287}}},
-  {0xa7b2, {1|F|D, {0x029d}}},
-  {0xa7b3, {1|F|D, {0xab53}}},
-  {0xa7b4, {1|F|D, {0xa7b5}}},
-  {0xa7b6, {1|F|D, {0xa7b7}}},
-  {0xa7b8, {1|F|D, {0xa7b9}}},
-  {0xa7ba, {1|F|D, {0xa7bb}}},
-  {0xa7bc, {1|F|D, {0xa7bd}}},
-  {0xa7be, {1|F|D, {0xa7bf}}},
-  {0xa7c0, {1|F|D, {0xa7c1}}},
-  {0xa7c2, {1|F|D, {0xa7c3}}},
-  {0xa7c4, {1|F|D, {0xa794}}},
-  {0xa7c5, {1|F|D, {0x0282}}},
-  {0xa7c6, {1|F|D, {0x1d8e}}},
-  {0xa7c7, {1|F|D, {0xa7c8}}},
-  {0xa7c9, {1|F|D, {0xa7ca}}},
-  {0xa7d0, {1|F|D, {0xa7d1}}},
-  {0xa7d6, {1|F|D, {0xa7d7}}},
-  {0xa7d8, {1|F|D, {0xa7d9}}},
-  {0xa7f5, {1|F|D, {0xa7f6}}},
-  {0xab70, {1|F|U, {0x13a0}}},
-  {0xab71, {1|F|U, {0x13a1}}},
-  {0xab72, {1|F|U, {0x13a2}}},
-  {0xab73, {1|F|U, {0x13a3}}},
-  {0xab74, {1|F|U, {0x13a4}}},
-  {0xab75, {1|F|U, {0x13a5}}},
-  {0xab76, {1|F|U, {0x13a6}}},
-  {0xab77, {1|F|U, {0x13a7}}},
-  {0xab78, {1|F|U, {0x13a8}}},
-  {0xab79, {1|F|U, {0x13a9}}},
-  {0xab7a, {1|F|U, {0x13aa}}},
-  {0xab7b, {1|F|U, {0x13ab}}},
-  {0xab7c, {1|F|U, {0x13ac}}},
-  {0xab7d, {1|F|U, {0x13ad}}},
-  {0xab7e, {1|F|U, {0x13ae}}},
-  {0xab7f, {1|F|U, {0x13af}}},
-  {0xab80, {1|F|U, {0x13b0}}},
-  {0xab81, {1|F|U, {0x13b1}}},
-  {0xab82, {1|F|U, {0x13b2}}},
-  {0xab83, {1|F|U, {0x13b3}}},
-  {0xab84, {1|F|U, {0x13b4}}},
-  {0xab85, {1|F|U, {0x13b5}}},
-  {0xab86, {1|F|U, {0x13b6}}},
-  {0xab87, {1|F|U, {0x13b7}}},
-  {0xab88, {1|F|U, {0x13b8}}},
-  {0xab89, {1|F|U, {0x13b9}}},
-  {0xab8a, {1|F|U, {0x13ba}}},
-  {0xab8b, {1|F|U, {0x13bb}}},
-  {0xab8c, {1|F|U, {0x13bc}}},
-  {0xab8d, {1|F|U, {0x13bd}}},
-  {0xab8e, {1|F|U, {0x13be}}},
-  {0xab8f, {1|F|U, {0x13bf}}},
-  {0xab90, {1|F|U, {0x13c0}}},
-  {0xab91, {1|F|U, {0x13c1}}},
-  {0xab92, {1|F|U, {0x13c2}}},
-  {0xab93, {1|F|U, {0x13c3}}},
-  {0xab94, {1|F|U, {0x13c4}}},
-  {0xab95, {1|F|U, {0x13c5}}},
-  {0xab96, {1|F|U, {0x13c6}}},
-  {0xab97, {1|F|U, {0x13c7}}},
-  {0xab98, {1|F|U, {0x13c8}}},
-  {0xab99, {1|F|U, {0x13c9}}},
-  {0xab9a, {1|F|U, {0x13ca}}},
-  {0xab9b, {1|F|U, {0x13cb}}},
-  {0xab9c, {1|F|U, {0x13cc}}},
-  {0xab9d, {1|F|U, {0x13cd}}},
-  {0xab9e, {1|F|U, {0x13ce}}},
-  {0xab9f, {1|F|U, {0x13cf}}},
-  {0xaba0, {1|F|U, {0x13d0}}},
-  {0xaba1, {1|F|U, {0x13d1}}},
-  {0xaba2, {1|F|U, {0x13d2}}},
-  {0xaba3, {1|F|U, {0x13d3}}},
-  {0xaba4, {1|F|U, {0x13d4}}},
-  {0xaba5, {1|F|U, {0x13d5}}},
-  {0xaba6, {1|F|U, {0x13d6}}},
-  {0xaba7, {1|F|U, {0x13d7}}},
-  {0xaba8, {1|F|U, {0x13d8}}},
-  {0xaba9, {1|F|U, {0x13d9}}},
-  {0xabaa, {1|F|U, {0x13da}}},
-  {0xabab, {1|F|U, {0x13db}}},
-  {0xabac, {1|F|U, {0x13dc}}},
-  {0xabad, {1|F|U, {0x13dd}}},
-  {0xabae, {1|F|U, {0x13de}}},
-  {0xabaf, {1|F|U, {0x13df}}},
-  {0xabb0, {1|F|U, {0x13e0}}},
-  {0xabb1, {1|F|U, {0x13e1}}},
-  {0xabb2, {1|F|U, {0x13e2}}},
-  {0xabb3, {1|F|U, {0x13e3}}},
-  {0xabb4, {1|F|U, {0x13e4}}},
-  {0xabb5, {1|F|U, {0x13e5}}},
-  {0xabb6, {1|F|U, {0x13e6}}},
-  {0xabb7, {1|F|U, {0x13e7}}},
-  {0xabb8, {1|F|U, {0x13e8}}},
-  {0xabb9, {1|F|U, {0x13e9}}},
-  {0xabba, {1|F|U, {0x13ea}}},
-  {0xabbb, {1|F|U, {0x13eb}}},
-  {0xabbc, {1|F|U, {0x13ec}}},
-  {0xabbd, {1|F|U, {0x13ed}}},
-  {0xabbe, {1|F|U, {0x13ee}}},
-  {0xabbf, {1|F|U, {0x13ef}}},
-  {0xfb00, {2|F|ST|SU|I(366), {0x0066, 0x0066}}},
-  {0xfb01, {2|F|ST|SU|I(370), {0x0066, 0x0069}}},
-  {0xfb02, {2|F|ST|SU|I(374), {0x0066, 0x006c}}},
-  {0xfb03, {3|F|ST|SU|I(378), {0x0066, 0x0066, 0x0069}}},
-  {0xfb04, {3|F|ST|SU|I(384), {0x0066, 0x0066, 0x006c}}},
-  {0xfb05, {2|F|ST|SU|I(390), {0x0073, 0x0074}}},
-  {0xfb06, {2|F|ST|SU|I(394), {0x0073, 0x0074}}},
-  {0xfb13, {2|F|ST|SU|I(398), {0x0574, 0x0576}}},
-  {0xfb14, {2|F|ST|SU|I(402), {0x0574, 0x0565}}},
-  {0xfb15, {2|F|ST|SU|I(406), {0x0574, 0x056b}}},
-  {0xfb16, {2|F|ST|SU|I(410), {0x057e, 0x0576}}},
-  {0xfb17, {2|F|ST|SU|I(414), {0x0574, 0x056d}}},
-  {0xff21, {1|F|D, {0xff41}}},
-  {0xff22, {1|F|D, {0xff42}}},
-  {0xff23, {1|F|D, {0xff43}}},
-  {0xff24, {1|F|D, {0xff44}}},
-  {0xff25, {1|F|D, {0xff45}}},
-  {0xff26, {1|F|D, {0xff46}}},
-  {0xff27, {1|F|D, {0xff47}}},
-  {0xff28, {1|F|D, {0xff48}}},
-  {0xff29, {1|F|D, {0xff49}}},
-  {0xff2a, {1|F|D, {0xff4a}}},
-  {0xff2b, {1|F|D, {0xff4b}}},
-  {0xff2c, {1|F|D, {0xff4c}}},
-  {0xff2d, {1|F|D, {0xff4d}}},
-  {0xff2e, {1|F|D, {0xff4e}}},
-  {0xff2f, {1|F|D, {0xff4f}}},
-  {0xff30, {1|F|D, {0xff50}}},
-  {0xff31, {1|F|D, {0xff51}}},
-  {0xff32, {1|F|D, {0xff52}}},
-  {0xff33, {1|F|D, {0xff53}}},
-  {0xff34, {1|F|D, {0xff54}}},
-  {0xff35, {1|F|D, {0xff55}}},
-  {0xff36, {1|F|D, {0xff56}}},
-  {0xff37, {1|F|D, {0xff57}}},
-  {0xff38, {1|F|D, {0xff58}}},
-  {0xff39, {1|F|D, {0xff59}}},
-  {0xff3a, {1|F|D, {0xff5a}}},
-  {0x10400, {1|F|D, {0x10428}}},
-  {0x10401, {1|F|D, {0x10429}}},
-  {0x10402, {1|F|D, {0x1042a}}},
-  {0x10403, {1|F|D, {0x1042b}}},
-  {0x10404, {1|F|D, {0x1042c}}},
-  {0x10405, {1|F|D, {0x1042d}}},
-  {0x10406, {1|F|D, {0x1042e}}},
-  {0x10407, {1|F|D, {0x1042f}}},
-  {0x10408, {1|F|D, {0x10430}}},
-  {0x10409, {1|F|D, {0x10431}}},
-  {0x1040a, {1|F|D, {0x10432}}},
-  {0x1040b, {1|F|D, {0x10433}}},
-  {0x1040c, {1|F|D, {0x10434}}},
-  {0x1040d, {1|F|D, {0x10435}}},
-  {0x1040e, {1|F|D, {0x10436}}},
-  {0x1040f, {1|F|D, {0x10437}}},
-  {0x10410, {1|F|D, {0x10438}}},
-  {0x10411, {1|F|D, {0x10439}}},
-  {0x10412, {1|F|D, {0x1043a}}},
-  {0x10413, {1|F|D, {0x1043b}}},
-  {0x10414, {1|F|D, {0x1043c}}},
-  {0x10415, {1|F|D, {0x1043d}}},
-  {0x10416, {1|F|D, {0x1043e}}},
-  {0x10417, {1|F|D, {0x1043f}}},
-  {0x10418, {1|F|D, {0x10440}}},
-  {0x10419, {1|F|D, {0x10441}}},
-  {0x1041a, {1|F|D, {0x10442}}},
-  {0x1041b, {1|F|D, {0x10443}}},
-  {0x1041c, {1|F|D, {0x10444}}},
-  {0x1041d, {1|F|D, {0x10445}}},
-  {0x1041e, {1|F|D, {0x10446}}},
-  {0x1041f, {1|F|D, {0x10447}}},
-  {0x10420, {1|F|D, {0x10448}}},
-  {0x10421, {1|F|D, {0x10449}}},
-  {0x10422, {1|F|D, {0x1044a}}},
-  {0x10423, {1|F|D, {0x1044b}}},
-  {0x10424, {1|F|D, {0x1044c}}},
-  {0x10425, {1|F|D, {0x1044d}}},
-  {0x10426, {1|F|D, {0x1044e}}},
-  {0x10427, {1|F|D, {0x1044f}}},
-  {0x104b0, {1|F|D, {0x104d8}}},
-  {0x104b1, {1|F|D, {0x104d9}}},
-  {0x104b2, {1|F|D, {0x104da}}},
-  {0x104b3, {1|F|D, {0x104db}}},
-  {0x104b4, {1|F|D, {0x104dc}}},
-  {0x104b5, {1|F|D, {0x104dd}}},
-  {0x104b6, {1|F|D, {0x104de}}},
-  {0x104b7, {1|F|D, {0x104df}}},
-  {0x104b8, {1|F|D, {0x104e0}}},
-  {0x104b9, {1|F|D, {0x104e1}}},
-  {0x104ba, {1|F|D, {0x104e2}}},
-  {0x104bb, {1|F|D, {0x104e3}}},
-  {0x104bc, {1|F|D, {0x104e4}}},
-  {0x104bd, {1|F|D, {0x104e5}}},
-  {0x104be, {1|F|D, {0x104e6}}},
-  {0x104bf, {1|F|D, {0x104e7}}},
-  {0x104c0, {1|F|D, {0x104e8}}},
-  {0x104c1, {1|F|D, {0x104e9}}},
-  {0x104c2, {1|F|D, {0x104ea}}},
-  {0x104c3, {1|F|D, {0x104eb}}},
-  {0x104c4, {1|F|D, {0x104ec}}},
-  {0x104c5, {1|F|D, {0x104ed}}},
-  {0x104c6, {1|F|D, {0x104ee}}},
-  {0x104c7, {1|F|D, {0x104ef}}},
-  {0x104c8, {1|F|D, {0x104f0}}},
-  {0x104c9, {1|F|D, {0x104f1}}},
-  {0x104ca, {1|F|D, {0x104f2}}},
-  {0x104cb, {1|F|D, {0x104f3}}},
-  {0x104cc, {1|F|D, {0x104f4}}},
-  {0x104cd, {1|F|D, {0x104f5}}},
-  {0x104ce, {1|F|D, {0x104f6}}},
-  {0x104cf, {1|F|D, {0x104f7}}},
-  {0x104d0, {1|F|D, {0x104f8}}},
-  {0x104d1, {1|F|D, {0x104f9}}},
-  {0x104d2, {1|F|D, {0x104fa}}},
-  {0x104d3, {1|F|D, {0x104fb}}},
-  {0x10570, {1|F|D, {0x10597}}},
-  {0x10571, {1|F|D, {0x10598}}},
-  {0x10572, {1|F|D, {0x10599}}},
-  {0x10573, {1|F|D, {0x1059a}}},
-  {0x10574, {1|F|D, {0x1059b}}},
-  {0x10575, {1|F|D, {0x1059c}}},
-  {0x10576, {1|F|D, {0x1059d}}},
-  {0x10577, {1|F|D, {0x1059e}}},
-  {0x10578, {1|F|D, {0x1059f}}},
-  {0x10579, {1|F|D, {0x105a0}}},
-  {0x1057a, {1|F|D, {0x105a1}}},
-  {0x1057c, {1|F|D, {0x105a3}}},
-  {0x1057d, {1|F|D, {0x105a4}}},
-  {0x1057e, {1|F|D, {0x105a5}}},
-  {0x1057f, {1|F|D, {0x105a6}}},
-  {0x10580, {1|F|D, {0x105a7}}},
-  {0x10581, {1|F|D, {0x105a8}}},
-  {0x10582, {1|F|D, {0x105a9}}},
-  {0x10583, {1|F|D, {0x105aa}}},
-  {0x10584, {1|F|D, {0x105ab}}},
-  {0x10585, {1|F|D, {0x105ac}}},
-  {0x10586, {1|F|D, {0x105ad}}},
-  {0x10587, {1|F|D, {0x105ae}}},
-  {0x10588, {1|F|D, {0x105af}}},
-  {0x10589, {1|F|D, {0x105b0}}},
-  {0x1058a, {1|F|D, {0x105b1}}},
-  {0x1058c, {1|F|D, {0x105b3}}},
-  {0x1058d, {1|F|D, {0x105b4}}},
-  {0x1058e, {1|F|D, {0x105b5}}},
-  {0x1058f, {1|F|D, {0x105b6}}},
-  {0x10590, {1|F|D, {0x105b7}}},
-  {0x10591, {1|F|D, {0x105b8}}},
-  {0x10592, {1|F|D, {0x105b9}}},
-  {0x10594, {1|F|D, {0x105bb}}},
-  {0x10595, {1|F|D, {0x105bc}}},
-  {0x10c80, {1|F|D, {0x10cc0}}},
-  {0x10c81, {1|F|D, {0x10cc1}}},
-  {0x10c82, {1|F|D, {0x10cc2}}},
-  {0x10c83, {1|F|D, {0x10cc3}}},
-  {0x10c84, {1|F|D, {0x10cc4}}},
-  {0x10c85, {1|F|D, {0x10cc5}}},
-  {0x10c86, {1|F|D, {0x10cc6}}},
-  {0x10c87, {1|F|D, {0x10cc7}}},
-  {0x10c88, {1|F|D, {0x10cc8}}},
-  {0x10c89, {1|F|D, {0x10cc9}}},
-  {0x10c8a, {1|F|D, {0x10cca}}},
-  {0x10c8b, {1|F|D, {0x10ccb}}},
-  {0x10c8c, {1|F|D, {0x10ccc}}},
-  {0x10c8d, {1|F|D, {0x10ccd}}},
-  {0x10c8e, {1|F|D, {0x10cce}}},
-  {0x10c8f, {1|F|D, {0x10ccf}}},
-  {0x10c90, {1|F|D, {0x10cd0}}},
-  {0x10c91, {1|F|D, {0x10cd1}}},
-  {0x10c92, {1|F|D, {0x10cd2}}},
-  {0x10c93, {1|F|D, {0x10cd3}}},
-  {0x10c94, {1|F|D, {0x10cd4}}},
-  {0x10c95, {1|F|D, {0x10cd5}}},
-  {0x10c96, {1|F|D, {0x10cd6}}},
-  {0x10c97, {1|F|D, {0x10cd7}}},
-  {0x10c98, {1|F|D, {0x10cd8}}},
-  {0x10c99, {1|F|D, {0x10cd9}}},
-  {0x10c9a, {1|F|D, {0x10cda}}},
-  {0x10c9b, {1|F|D, {0x10cdb}}},
-  {0x10c9c, {1|F|D, {0x10cdc}}},
-  {0x10c9d, {1|F|D, {0x10cdd}}},
-  {0x10c9e, {1|F|D, {0x10cde}}},
-  {0x10c9f, {1|F|D, {0x10cdf}}},
-  {0x10ca0, {1|F|D, {0x10ce0}}},
-  {0x10ca1, {1|F|D, {0x10ce1}}},
-  {0x10ca2, {1|F|D, {0x10ce2}}},
-  {0x10ca3, {1|F|D, {0x10ce3}}},
-  {0x10ca4, {1|F|D, {0x10ce4}}},
-  {0x10ca5, {1|F|D, {0x10ce5}}},
-  {0x10ca6, {1|F|D, {0x10ce6}}},
-  {0x10ca7, {1|F|D, {0x10ce7}}},
-  {0x10ca8, {1|F|D, {0x10ce8}}},
-  {0x10ca9, {1|F|D, {0x10ce9}}},
-  {0x10caa, {1|F|D, {0x10cea}}},
-  {0x10cab, {1|F|D, {0x10ceb}}},
-  {0x10cac, {1|F|D, {0x10cec}}},
-  {0x10cad, {1|F|D, {0x10ced}}},
-  {0x10cae, {1|F|D, {0x10cee}}},
-  {0x10caf, {1|F|D, {0x10cef}}},
-  {0x10cb0, {1|F|D, {0x10cf0}}},
-  {0x10cb1, {1|F|D, {0x10cf1}}},
-  {0x10cb2, {1|F|D, {0x10cf2}}},
-  {0x118a0, {1|F|D, {0x118c0}}},
-  {0x118a1, {1|F|D, {0x118c1}}},
-  {0x118a2, {1|F|D, {0x118c2}}},
-  {0x118a3, {1|F|D, {0x118c3}}},
-  {0x118a4, {1|F|D, {0x118c4}}},
-  {0x118a5, {1|F|D, {0x118c5}}},
-  {0x118a6, {1|F|D, {0x118c6}}},
-  {0x118a7, {1|F|D, {0x118c7}}},
-  {0x118a8, {1|F|D, {0x118c8}}},
-  {0x118a9, {1|F|D, {0x118c9}}},
-  {0x118aa, {1|F|D, {0x118ca}}},
-  {0x118ab, {1|F|D, {0x118cb}}},
-  {0x118ac, {1|F|D, {0x118cc}}},
-  {0x118ad, {1|F|D, {0x118cd}}},
-  {0x118ae, {1|F|D, {0x118ce}}},
-  {0x118af, {1|F|D, {0x118cf}}},
-  {0x118b0, {1|F|D, {0x118d0}}},
-  {0x118b1, {1|F|D, {0x118d1}}},
-  {0x118b2, {1|F|D, {0x118d2}}},
-  {0x118b3, {1|F|D, {0x118d3}}},
-  {0x118b4, {1|F|D, {0x118d4}}},
-  {0x118b5, {1|F|D, {0x118d5}}},
-  {0x118b6, {1|F|D, {0x118d6}}},
-  {0x118b7, {1|F|D, {0x118d7}}},
-  {0x118b8, {1|F|D, {0x118d8}}},
-  {0x118b9, {1|F|D, {0x118d9}}},
-  {0x118ba, {1|F|D, {0x118da}}},
-  {0x118bb, {1|F|D, {0x118db}}},
-  {0x118bc, {1|F|D, {0x118dc}}},
-  {0x118bd, {1|F|D, {0x118dd}}},
-  {0x118be, {1|F|D, {0x118de}}},
-  {0x118bf, {1|F|D, {0x118df}}},
-  {0x16e40, {1|F|D, {0x16e60}}},
-  {0x16e41, {1|F|D, {0x16e61}}},
-  {0x16e42, {1|F|D, {0x16e62}}},
-  {0x16e43, {1|F|D, {0x16e63}}},
-  {0x16e44, {1|F|D, {0x16e64}}},
-  {0x16e45, {1|F|D, {0x16e65}}},
-  {0x16e46, {1|F|D, {0x16e66}}},
-  {0x16e47, {1|F|D, {0x16e67}}},
-  {0x16e48, {1|F|D, {0x16e68}}},
-  {0x16e49, {1|F|D, {0x16e69}}},
-  {0x16e4a, {1|F|D, {0x16e6a}}},
-  {0x16e4b, {1|F|D, {0x16e6b}}},
-  {0x16e4c, {1|F|D, {0x16e6c}}},
-  {0x16e4d, {1|F|D, {0x16e6d}}},
-  {0x16e4e, {1|F|D, {0x16e6e}}},
-  {0x16e4f, {1|F|D, {0x16e6f}}},
-  {0x16e50, {1|F|D, {0x16e70}}},
-  {0x16e51, {1|F|D, {0x16e71}}},
-  {0x16e52, {1|F|D, {0x16e72}}},
-  {0x16e53, {1|F|D, {0x16e73}}},
-  {0x16e54, {1|F|D, {0x16e74}}},
-  {0x16e55, {1|F|D, {0x16e75}}},
-  {0x16e56, {1|F|D, {0x16e76}}},
-  {0x16e57, {1|F|D, {0x16e77}}},
-  {0x16e58, {1|F|D, {0x16e78}}},
-  {0x16e59, {1|F|D, {0x16e79}}},
-  {0x16e5a, {1|F|D, {0x16e7a}}},
-  {0x16e5b, {1|F|D, {0x16e7b}}},
-  {0x16e5c, {1|F|D, {0x16e7c}}},
-  {0x16e5d, {1|F|D, {0x16e7d}}},
-  {0x16e5e, {1|F|D, {0x16e7e}}},
-  {0x16e5f, {1|F|D, {0x16e7f}}},
-  {0x1e900, {1|F|D, {0x1e922}}},
-  {0x1e901, {1|F|D, {0x1e923}}},
-  {0x1e902, {1|F|D, {0x1e924}}},
-  {0x1e903, {1|F|D, {0x1e925}}},
-  {0x1e904, {1|F|D, {0x1e926}}},
-  {0x1e905, {1|F|D, {0x1e927}}},
-  {0x1e906, {1|F|D, {0x1e928}}},
-  {0x1e907, {1|F|D, {0x1e929}}},
-  {0x1e908, {1|F|D, {0x1e92a}}},
-  {0x1e909, {1|F|D, {0x1e92b}}},
-  {0x1e90a, {1|F|D, {0x1e92c}}},
-  {0x1e90b, {1|F|D, {0x1e92d}}},
-  {0x1e90c, {1|F|D, {0x1e92e}}},
-  {0x1e90d, {1|F|D, {0x1e92f}}},
-  {0x1e90e, {1|F|D, {0x1e930}}},
-  {0x1e90f, {1|F|D, {0x1e931}}},
-  {0x1e910, {1|F|D, {0x1e932}}},
-  {0x1e911, {1|F|D, {0x1e933}}},
-  {0x1e912, {1|F|D, {0x1e934}}},
-  {0x1e913, {1|F|D, {0x1e935}}},
-  {0x1e914, {1|F|D, {0x1e936}}},
-  {0x1e915, {1|F|D, {0x1e937}}},
-  {0x1e916, {1|F|D, {0x1e938}}},
-  {0x1e917, {1|F|D, {0x1e939}}},
-  {0x1e918, {1|F|D, {0x1e93a}}},
-  {0x1e919, {1|F|D, {0x1e93b}}},
-  {0x1e91a, {1|F|D, {0x1e93c}}},
-  {0x1e91b, {1|F|D, {0x1e93d}}},
-  {0x1e91c, {1|F|D, {0x1e93e}}},
-  {0x1e91d, {1|F|D, {0x1e93f}}},
-  {0x1e91e, {1|F|D, {0x1e940}}},
-  {0x1e91f, {1|F|D, {0x1e941}}},
-  {0x1e920, {1|F|D, {0x1e942}}},
-  {0x1e921, {1|F|D, {0x1e943}}},
-#define CaseFold_Locale (*(CaseFold_11_Type (*)[2])(CaseFold_11_Table+1528))
-  {0x0049, {1|F|D, {0x0069}}},
-  {0x0130, {2|F|D, {0x0069, 0x0307}}},
-};
-
-/* ANSI-C code produced by gperf version 3.1 */
-/* Command-line: gperf -7 -k1,2,3 -F,-1 -c -j1 -i1 -t -T -E -C -H onigenc_unicode_CaseFold_11_hash -N onigenc_unicode_CaseFold_11_lookup -n  */
-
-/* maximum key range = 3080, duplicates = 0 */
-
-#ifdef __GNUC__
-__inline
-#else
-#ifdef __cplusplus
-inline
-#endif
-#endif
-/*ARGSUSED*/
-static unsigned int
-onigenc_unicode_CaseFold_11_hash(const OnigCodePoint code)
-{
-  static const unsigned short asso_values[] =
-    {
-         1, 3085,    2,   20,    3,  307,  200,    8,   31,  159,
-         2,  253,   33,  967, 3085, 3085, 3085, 3085, 3085, 3085,
-      3085, 3085, 3085, 3085, 3085, 3085, 3085,   30, 3085, 3085,
-      3085, 3085, 3085, 3085, 3085,  352, 3085, 3085, 3085, 3085,
-      3085,   93, 3085, 3085, 3085, 3085, 3085, 3085, 3085, 3085,
-      3085,  407, 3085, 3085, 3085, 3085, 3085, 3085, 3085,  201,
-      3085, 3085,   14,   13,  373,    1, 3085, 3085,  503,   19,
-      3085, 3085, 3085, 3085, 3085,  325, 3085, 3085,  290, 1064,
-       484,   28, 1906,  447,  272,  414, 2002,   79,  905,    5,
-        11,   22, 2024,  623,  761,  617, 1893,   45, 1874,  113,
-      1856,  255, 1823,   96, 1463,   62, 1841,  130, 1798,  331,
-      1771,  238, 1977,  147, 1387,  464, 1691,  187, 1639,  181,
-       366,  580, 1331,  508, 1287,  547, 1583,  541,  400,  783,
-      1944,  657, 1850,  932, 1785,  858, 1645,  681, 1412,  722,
-      1622,  972, 1306,  807, 1942, 1282,  283, 1218, 1557, 1055,
-      1406, 1258, 1401, 1168, 1327,  864,  893, 1123, 1714, 1195,
-      1885, 1083, 2016, 1232,  823,  678, 1420, 1017,  155, 1261,
-        86, 1351,  794, 1929,   51, 1525,   50,  221,    4, 1383,
-       196,  325,    1, 1562,  102, 1441,    3, 1356,  226, 1304,
-       271, 1516,   68, 1752,   37, 1469,   51, 1920,  143, 2059,
-       198, 2095,  370, 2069,  137,  718,  407, 1926,  136
-    };
-  return asso_values[bits_of(code, 2)+81] + asso_values[bits_of(code, 1)+2] + asso_values[bits_of(code, 0)];
-}
-
-static const CodePointList3 *
-onigenc_unicode_CaseFold_11_lookup(const OnigCodePoint code)
-{
-  enum
-    {
-      MIN_CODE_VALUE = 0x41,
-      MAX_CODE_VALUE = 0x1e921,
-      TOTAL_KEYWORDS = 1530,
-      MIN_WORD_LENGTH = 3,
-      MAX_WORD_LENGTH = 3,
-      MIN_HASH_VALUE = 5,
-      MAX_HASH_VALUE = 3084
-    };
-
-  static const short wordlist[] =
-    {
-      -1, -1, -1, -1, -1,
-      /*0x1fe9*/ 850,
-      -1,
-      /*0x1f88*/ 775,
-      /*0x0408*/ 305,
-      /*0x0108*/ 61,
-      /*0x10408*/ 1276,
-      -1,
-      /*0xab88*/ 1174,
-      /*0x1f89*/ 776,
-      /*0x0409*/ 306,
-      /*0x2c69*/ 964,
-      /*0x10409*/ 1277,
-      /*0x2c08*/ 919,
-      /*0xab89*/ 1175,
-      /*0x1e88*/ 653,
-      /*0x1e08*/ 589,
-      -1, -1,
-      /*0x2c09*/ 920,
-      /*0x1f8a*/ 777,
-      /*0x040a*/ 307,
-      /*0x010a*/ 62,
-      /*0x1040a*/ 1278,
-      /*0x2c88*/ 978,
-      /*0xab8a*/ 1176,
-      /*0x1f80*/ 767,
-      /*0x0400*/ 297,
-      /*0x0100*/ 57,
-      /*0x10400*/ 1268,
-      /*0x2c0a*/ 921,
-      /*0xab80*/ 1166,
-      /*0x1e8a*/ 654,
-      /*0x1e0a*/ 590,
-      /*0x10c88*/ 1387,
-      /*0x0508*/ 425,
-      /*0x2c00*/ 911,
-      -1,
-      /*0x1e80*/ 649,
-      /*0x1e00*/ 585,
-      /*0x10c89*/ 1388,
-      /*0x2c8a*/ 979,
-      -1,
-      /*0x1f90*/ 783,
-      /*0x0410*/ 313,
-      /*0x0110*/ 65,
-      /*0x10410*/ 1284,
-      /*0x2c80*/ 974,
-      /*0xab90*/ 1182,
-      /*0x1ff3*/ 855,
-      -1,
-      /*0x10c8a*/ 1389,
-      /*0x050a*/ 426,
-      /*0x2c10*/ 927,
-      /*0xa780*/ 1106,
-      /*0x1e90*/ 657,
-      /*0x1e10*/ 593,
-      /*0x10c80*/ 1379,
-      /*0x0500*/ 421,
-      -1,
-      /*0x1f98*/ 791,
-      /*0x0418*/ 321,
-      /*0x0118*/ 69,
-      /*0x10418*/ 1292,
-      /*0x2c90*/ 982,
-      /*0xab98*/ 1190,
-      -1,
-      /*0x00df*/ 56,
-      /*0x00dd*/ 54,
-      /*0x10571*/ 1345,
-      /*0x2c18*/ 935,
-      /*0xa790*/ 1112,
-      /*0x1e98*/ 662,
-      /*0x1e18*/ 597,
-      /*0x10c90*/ 1395,
-      /*0x0510*/ 429,
-      /*0x2c6f*/ 968,
-      /*0x1f86*/ 773,
-      /*0x0406*/ 303,
-      /*0x0106*/ 60,
-      /*0x10406*/ 1274,
-      /*0x2c98*/ 986,
-      /*0xab86*/ 1172,
-      /*0x10573*/ 1347,
-      /*0x1fd9*/ 841,
-      /*0x0059*/ 23,
-      -1,
-      /*0x2c06*/ 917,
-      /*0xa798*/ 1115,
-      /*0x1e86*/ 652,
-      /*0x1e06*/ 588,
-      /*0x10c98*/ 1403,
-      /*0x0518*/ 433,
-      -1,
-      /*0x1f96*/ 789,
-      /*0x0416*/ 319,
-      /*0x0116*/ 68,
-      /*0x10416*/ 1290,
-      /*0x2c86*/ 977,
-      /*0xab96*/ 1188,
-      /*0x1fe7*/ 848,
-      -1, -1,
-      /*0x00d9*/ 50,
-      /*0x2c16*/ 933,
-      /*0xa786*/ 1109,
-      /*0x1e96*/ 660,
-      /*0x1e16*/ 596,
-      /*0x10c86*/ 1385,
-      /*0x0506*/ 424,
-      /*0x2c67*/ 963,
-      /*0x1f92*/ 785,
-      /*0x0412*/ 315,
-      /*0x0112*/ 66,
-      /*0x10412*/ 1286,
-      /*0x2c96*/ 985,
-      /*0xab92*/ 1184,
-      -1, -1, -1, -1,
-      /*0x2c12*/ 929,
-      /*0xa796*/ 1114,
-      /*0x1e92*/ 658,
-      /*0x1e12*/ 594,
-      /*0x10c96*/ 1401,
-      /*0x0516*/ 432,
-      -1,
-      /*0x1f9a*/ 793,
-      /*0x041a*/ 323,
-      /*0x011a*/ 70,
-      /*0x1041a*/ 1294,
-      /*0x2c92*/ 983,
-      /*0xab9a*/ 1192,
-      -1,
-      /*0x1ffb*/ 862,
-      /*0x017f*/ 120,
-      /*0x017b*/ 118,
-      /*0x2c1a*/ 937,
-      /*0xa792*/ 1113,
-      /*0x1e9a*/ 664,
-      /*0x1e1a*/ 598,
-      /*0x10c92*/ 1397,
-      /*0x0512*/ 430,
-      /*0x2c7f*/ 973,
-      /*0x1fa0*/ 799,
-      /*0x0420*/ 329,
-      /*0x0120*/ 73,
-      /*0x10420*/ 1300,
-      /*0x2c9a*/ 987,
-      /*0xaba0*/ 1198,
-      /*0x2c75*/ 971,
-      -1,
-      /*0x1fd7*/ 839,
-      /*0x0057*/ 21,
-      /*0x2c20*/ 943,
-      /*0xa79a*/ 1116,
-      /*0x1ea0*/ 667,
-      /*0x1e20*/ 601,
-      /*0x10c9a*/ 1405,
-      /*0x051a*/ 434,
-      /*0x0388*/ 235,
-      -1, -1,
-      /*0x037f*/ 233,
-      -1,
-      /*0x2ca0*/ 990,
-      /*0x0389*/ 236,
-      /*0x1057f*/ 1358,
-      /*0xa7f5*/ 1149,
-      -1, -1, -1,
-      /*0xa7a0*/ 1119,
-      -1,
-      /*0x10575*/ 1349,
-      /*0x10ca0*/ 1411,
-      /*0x0520*/ 437,
-      /*0x038a*/ 237,
-      /*0x1fa6*/ 805,
-      /*0x0426*/ 335,
-      /*0x0126*/ 76,
-      /*0x10426*/ 1306,
-      -1,
-      /*0xaba6*/ 1204,
-      /*0x1fa4*/ 803,
-      /*0x0424*/ 333,
-      /*0x0124*/ 75,
-      /*0x10424*/ 1304,
-      /*0x2c26*/ 949,
-      /*0xaba4*/ 1202,
-      /*0x1ea6*/ 670,
-      /*0x1e26*/ 604,
-      /*0x03f1*/ 288,
-      /*0x1fe3*/ 845,
-      /*0x2c24*/ 947,
-      /*0x1ff7*/ 858,
-      /*0x1ea4*/ 669,
-      /*0x1e24*/ 603,
-      -1,
-      /*0x2ca6*/ 993,
-      /*0x0390*/ 241,
-      /*0x0208*/ 194,
-      /*0x1c88*/ 538,
-      /*0x2c63*/ 961,
-      -1,
-      /*0x2ca4*/ 992,
-      /*0xa7a6*/ 1122,
-      -1, -1,
-      /*0x10ca6*/ 1417,
-      /*0x0526*/ 440,
-      -1,
-      /*0xa7a4*/ 1121,
-      -1, -1,
-      /*0x10ca4*/ 1415,
-      /*0x0524*/ 439,
-      /*0x0398*/ 249,
-      /*0x020a*/ 195,
-      /*0x0460*/ 345,
-      /*0x0160*/ 104,
-      -1, -1,
-      /*0x1feb*/ 852,
-      /*0x0200*/ 190,
-      /*0x1c80*/ 530,
-      /*0x13fb*/ 527,
-      -1,
-      /*0x2c60*/ 959,
-      /*0x10577*/ 1351,
-      /*0x1ee0*/ 699,
-      /*0x1e60*/ 633,
-      -1,
-      /*0x2c6b*/ 965,
-      /*0x0386*/ 234,
-      /*0x1f9e*/ 797,
-      /*0x041e*/ 327,
-      /*0x011e*/ 72,
-      /*0x1041e*/ 1298,
-      /*0x2ce0*/ 1022,
-      /*0xab9e*/ 1196,
-      /*0x0210*/ 198,
-      /*0x1c90*/ 539,
-      -1,
-      /*0x2ceb*/ 1024,
-      /*0x2c1e*/ 941,
-      -1,
-      /*0x1e9e*/ 666,
-      /*0x1e1e*/ 600,
-      -1, -1,
-      /*0x0396*/ 247,
-      /*0x1f94*/ 787,
-      /*0x0414*/ 317,
-      /*0x0114*/ 67,
-      /*0x10414*/ 1288,
-      /*0x2c9e*/ 989,
-      /*0xab94*/ 1186,
-      /*0x0218*/ 202,
-      /*0x1c98*/ 547,
-      -1, -1,
-      /*0x2c14*/ 931,
-      /*0xa79e*/ 1118,
-      /*0x1e94*/ 659,
-      /*0x1e14*/ 595,
-      /*0x10c9e*/ 1409,
-      /*0x051e*/ 436,
-      /*0x0392*/ 243,
-      /*0x1f83*/ 770,
-      /*0x0403*/ 300,
-      /*0x048a*/ 362,
-      /*0x10403*/ 1271,
-      /*0x2c94*/ 984,
-      /*0xab83*/ 1169,
-      /*0x0206*/ 193,
-      /*0x1c86*/ 536,
-      /*0x0480*/ 361,
-      /*0x2c6d*/ 966,
-      /*0x2c03*/ 914,
-      /*0x1e908*/ 1502,
-      /*0x0041*/ 0,
-      /*0x0141*/ 88,
-      /*0x10c94*/ 1399,
-      /*0x0514*/ 431,
-      /*0x039a*/ 251,
-      /*0x1e909*/ 1503,
-      /*0x2183*/ 884,
-      -1,
-      /*0x2ced*/ 1025,
-      -1,
-      /*0x03ff*/ 296,
-      /*0x0216*/ 201,
-      /*0x1c96*/ 545,
-      /*0x0490*/ 365,
-      -1, -1,
-      /*0x1e90a*/ 1504,
-      /*0x03f5*/ 290,
-      /*0x00c1*/ 27,
-      /*0x10c83*/ 1382,
-      -1,
-      /*0x03a0*/ 257,
-      /*0x1e900*/ 1494,
-      -1, -1, -1, -1, -1,
-      /*0x0212*/ 199,
-      /*0x1c92*/ 541,
-      /*0x0498*/ 369,
-      /*0x0541*/ 461,
-      -1,
-      /*0x0189*/ 126,
-      -1, -1, -1, -1, -1,
-      /*0x1e910*/ 1510,
-      -1,
-      /*0x1fe4*/ 846,
-      /*0x0464*/ 347,
-      /*0x0164*/ 106,
-      /*0x018a*/ 127,
-      /*0x021a*/ 203,
-      /*0x1c9a*/ 549,
-      /*0x1f9c*/ 795,
-      /*0x041c*/ 325,
-      /*0x011c*/ 71,
-      /*0x1041c*/ 1296,
-      /*0x2c64*/ 962,
-      /*0xab9c*/ 1194,
-      /*0x1ee4*/ 701,
-      /*0x1e64*/ 635,
-      /*0x03a6*/ 262,
-      /*0x1e918*/ 1518,
-      /*0x2c1c*/ 939,
-      -1,
-      /*0x01f1*/ 181,
-      /*0x1e1c*/ 599,
-      /*0x03a4*/ 260,
-      /*0x0220*/ 206,
-      /*0x1ca0*/ 555,
-      /*0x0496*/ 368,
-      -1, -1,
-      /*0x0190*/ 131,
-      /*0x2c9c*/ 988,
-      -1, -1, -1,
-      /*0x03f7*/ 291,
-      /*0x1e906*/ 1500,
-      -1,
-      /*0xa79c*/ 1117,
-      -1, -1,
-      /*0x10c9c*/ 1407,
-      /*0x051c*/ 435,
-      -1,
-      /*0x0492*/ 366,
-      /*0x1fa7*/ 806,
-      /*0x0427*/ 336,
-      /*0x0198*/ 137,
-      /*0x10427*/ 1307,
-      /*0x1ff9*/ 860,
-      /*0xaba7*/ 1205,
-      /*0x0179*/ 117,
-      -1,
-      /*0x1e916*/ 1516,
-      /*0x1f69*/ 760,
-      /*0x2c27*/ 950,
-      /*0x1f08*/ 715,
-      -1,
-      /*0x03e0*/ 279,
-      /*0x0226*/ 209,
-      /*0x1ca6*/ 561,
-      /*0x049a*/ 370,
-      /*0x1f09*/ 716,
-      -1,
-      /*0x0186*/ 124,
-      /*0x0224*/ 208,
-      /*0x1ca4*/ 559,
-      -1, -1, -1,
-      /*0x1e912*/ 1512,
-      /*0x01d9*/ 169,
-      -1,
-      /*0x1f0a*/ 717,
-      -1,
-      /*0x039e*/ 255,
-      /*0x10ca7*/ 1418,
-      -1,
-      /*0x04a0*/ 373,
-      /*0x1faf*/ 814,
-      /*0x042f*/ 344,
-      /*0x0196*/ 135,
-      -1,
-      /*0x10579*/ 1353,
-      /*0xabaf*/ 1213,
-      -1, -1,
-      /*0x1e91a*/ 1520,
-      /*0x017d*/ 119,
-      /*0x2c2f*/ 958,
-      -1,
-      /*0xfb00*/ 1230,
-      /*0x0394*/ 245,
-      /*0x1f84*/ 771,
-      /*0x0404*/ 301,
-      /*0x0104*/ 59,
-      /*0x10404*/ 1272,
-      -1,
-      /*0xab84*/ 1170,
-      -1, -1,
-      /*0x1f5f*/ 758,
-      /*0x1f5d*/ 757,
-      /*0x2c04*/ 915,
-      /*0x1e920*/ 1526,
-      /*0x1e84*/ 651,
-      /*0x1e04*/ 587,
-      -1, -1, -1,
-      /*0x10caf*/ 1426,
-      -1,
-      /*0x04a6*/ 376,
-      /*0x1f18*/ 723,
-      /*0x2c84*/ 976,
-      -1,
-      /*0x021e*/ 205,
-      /*0x1c9e*/ 553,
-      /*0x04a4*/ 375,
-      /*0x1f6f*/ 766,
-      /*0x1057d*/ 1356,
-      /*0xa784*/ 1108,
-      -1, -1,
-      /*0x10c84*/ 1383,
-      /*0x0504*/ 423,
-      /*0x1f82*/ 769,
-      /*0x0402*/ 299,
-      /*0x0102*/ 58,
-      /*0x10402*/ 1270,
-      -1,
-      /*0xab82*/ 1168,
-      /*0x01a0*/ 141,
-      /*0x0214*/ 200,
-      /*0x1c94*/ 543,
-      -1,
-      /*0x2c02*/ 913,
-      /*0x1f59*/ 755,
-      /*0x1e82*/ 650,
-      /*0x1e02*/ 586,
-      /*0x01d7*/ 168,
-      /*0x13f9*/ 525,
-      /*0xfb06*/ 1236,
-      /*0x1fa2*/ 801,
-      /*0x0422*/ 331,
-      /*0x0122*/ 74,
-      /*0x10422*/ 1302,
-      /*0x2c82*/ 975,
-      /*0xaba2*/ 1200,
-      -1, -1,
-      /*0x1c83*/ 533,
-      /*0x04e0*/ 405,
-      /*0x2c22*/ 945,
-      /*0xa782*/ 1107,
-      /*0x1ea2*/ 668,
-      /*0x1e22*/ 602,
-      /*0x10c82*/ 1381,
-      /*0x0502*/ 422,
-      /*0xfb16*/ 1240,
-      -1,
-      /*0x0241*/ 220,
-      /*0x03e4*/ 281,
-      -1,
-      /*0x2ca2*/ 991,
-      -1,
-      /*0x01a6*/ 144,
-      -1,
-      /*0x039c*/ 253,
-      /*0x049e*/ 372,
-      -1,
-      /*0xa7a2*/ 1120,
-      /*0x01a4*/ 143,
-      -1,
-      /*0x10ca2*/ 1413,
-      /*0x0522*/ 438,
-      -1,
-      /*0x10a0*/ 484,
-      /*0x13fd*/ 529,
-      -1, -1,
-      /*0x1f1a*/ 725,
-      /*0x2165*/ 873,
-      /*0x01f7*/ 185,
-      /*0x2169*/ 877,
-      /*0x2161*/ 869,
-      /*0x0494*/ 367,
-      /*0x1faa*/ 809,
-      /*0x042a*/ 339,
-      /*0x012a*/ 78,
-      /*0xa660*/ 1043,
-      -1,
-      /*0xabaa*/ 1208,
-      -1, -1,
-      /*0x1e91e*/ 1524,
-      -1,
-      /*0x2c2a*/ 953,
-      -1,
-      /*0x1eaa*/ 672,
-      /*0x1e2a*/ 606,
-      -1, -1,
-      /*0x03a7*/ 263,
-      -1, -1,
-      /*0x01e0*/ 172,
-      /*0x03f9*/ 292,
-      /*0x2caa*/ 995,
-      /*0x021c*/ 204,
-      /*0x1c9c*/ 551,
-      /*0x10a6*/ 490,
-      /*0x1e914*/ 1514,
-      -1,
-      /*0x04c1*/ 390,
-      /*0xa7aa*/ 1124,
-      /*0x104c1*/ 1325,
-      /*0x10a4*/ 488,
-      /*0x10caa*/ 1421,
-      /*0x052a*/ 442,
-      /*0x1fae*/ 813,
-      /*0x042e*/ 343,
-      /*0x012e*/ 80,
-      -1, -1,
-      /*0xabae*/ 1212,
-      /*0x1fac*/ 811,
-      /*0x042c*/ 341,
-      /*0x012c*/ 79,
-      /*0x1e903*/ 1497,
-      /*0x2c2e*/ 957,
-      /*0xabac*/ 1210,
-      /*0x1eae*/ 674,
-      /*0x1e2e*/ 608,
-      /*0x118a0*/ 1430,
-      -1,
-      /*0x2c2c*/ 955,
-      -1,
-      /*0x1eac*/ 673,
-      /*0x1e2c*/ 607,
-      /*0x0194*/ 134,
-      /*0x2cae*/ 997,
-      -1, -1,
-      /*0x03fd*/ 294,
-      /*0x1ca7*/ 562,
-      -1,
-      /*0x2cac*/ 996,
-      /*0xa7ae*/ 1128,
-      /*0x216f*/ 883,
-      -1,
-      /*0x10cae*/ 1425,
-      /*0x052e*/ 444,
-      -1,
-      /*0xa7ac*/ 1126,
-      -1,
-      /*0x04e4*/ 407,
-      /*0x10cac*/ 1423,
-      /*0x052c*/ 443,
-      /*0x1fa8*/ 807,
-      /*0x0428*/ 337,
-      /*0x0128*/ 77,
-      /*0x049c*/ 371,
-      -1,
-      /*0xaba8*/ 1206,
-      -1, -1, -1,
-      /*0x118a6*/ 1436,
-      /*0x2c28*/ 951,
-      -1,
-      /*0x1ea8*/ 671,
-      /*0x1e28*/ 605,
-      -1,
-      /*0x118a4*/ 1434,
-      -1, -1,
-      /*0x1f6b*/ 762,
-      /*0xff26*/ 1247,
-      /*0x1caf*/ 570,
-      /*0x2ca8*/ 994,
-      -1, -1,
-      /*0x2167*/ 875,
-      /*0xff24*/ 1245,
-      -1,
-      /*0x24c1*/ 896,
-      /*0xa7a8*/ 1123,
-      /*0x1e91c*/ 1522,
-      -1,
-      /*0x10ca8*/ 1419,
-      /*0x0528*/ 441,
-      /*0x0204*/ 192,
-      /*0x1c84*/ 534,
-      /*0xa664*/ 1045,
-      -1,
-      /*0x1f8e*/ 781,
-      /*0x040e*/ 311,
-      /*0x010e*/ 64,
-      /*0x1040e*/ 1282,
-      /*0xa77b*/ 1103,
-      /*0xab8e*/ 1180,
-      /*0x1f8c*/ 779,
-      /*0x040c*/ 309,
-      /*0x010c*/ 63,
-      /*0x1040c*/ 1280,
-      /*0x2c0e*/ 925,
-      /*0xab8c*/ 1178,
-      /*0x1e8e*/ 656,
-      /*0x1e0e*/ 592,
-      /*0x01e4*/ 174,
-      -1,
-      /*0x2c0c*/ 923,
-      /*0x10c1*/ 517,
-      /*0x1e8c*/ 655,
-      /*0x1e0c*/ 591,
-      /*0x019c*/ 138,
-      /*0x2c8e*/ 981,
-      /*0xfb14*/ 1238,
-      -1, -1, -1,
-      /*0x1f6d*/ 764,
-      /*0x2c8c*/ 980,
-      -1,
-      /*0x0202*/ 191,
-      /*0x1c82*/ 532,
-      /*0x10c8e*/ 1393,
-      /*0x050e*/ 428,
-      -1, -1, -1, -1,
-      /*0x10c8c*/ 1391,
-      /*0x050c*/ 427,
-      /*0xfb03*/ 1233,
-      /*0x1fb2*/ 815,
-      -1,
-      /*0x0132*/ 81,
-      -1, -1,
-      /*0xabb2*/ 1216,
-      /*0x0222*/ 207,
-      /*0x1ca2*/ 557,
-      /*0xa726*/ 1066,
-      /*0x03aa*/ 266,
-      -1, -1,
-      /*0x1eb2*/ 676,
-      /*0x1e32*/ 610,
-      /*0xa724*/ 1065,
-      /*0x01a7*/ 145,
-      -1, -1, -1, -1, -1,
-      /*0x2cb2*/ 999,
-      /*0x0054*/ 18,
-      /*0x0154*/ 98,
-      /*0x1fb8*/ 820,
-      -1,
-      /*0x2126*/ 864,
-      -1,
-      /*0xa7b2*/ 1131,
-      /*0xabb8*/ 1222,
-      -1,
-      /*0x10cb2*/ 1429,
-      /*0x0532*/ 446,
-      /*0x1ed4*/ 693,
-      /*0x1e54*/ 627,
-      /*0x1e904*/ 1498,
-      /*0x1eb8*/ 679,
-      /*0x1e38*/ 613,
-      -1, -1,
-      /*0x00d4*/ 46,
-      /*0x2163*/ 871,
-      /*0x2cd4*/ 1016,
-      -1, -1,
-      /*0x2cb8*/ 1002,
-      /*0x1f1c*/ 727,
-      -1,
-      /*0xa760*/ 1094,
-      /*0x01af*/ 149,
-      /*0x022a*/ 211,
-      /*0x1caa*/ 565,
-      /*0xa7b8*/ 1135,
-      /*0x0554*/ 480,
-      -1, -1,
-      /*0x0538*/ 452,
-      -1, -1,
-      /*0x04a2*/ 374,
-      /*0x10a7*/ 491,
-      /*0x1ffc*/ 863,
-      /*0x047c*/ 359,
-      /*0x0184*/ 123,
-      -1,
-      /*0x1fba*/ 822,
-      /*0x2160*/ 868,
-      -1,
-      /*0x1e902*/ 1496,
-      -1,
-      /*0xabba*/ 1224,
-      /*0x216b*/ 879,
-      -1,
-      /*0x1efc*/ 713,
-      /*0x1e7c*/ 647,
-      -1, -1,
-      /*0x1eba*/ 680,
-      /*0x1e3a*/ 614,
-      -1, -1,
-      /*0x03a8*/ 264,
-      -1,
-      /*0x022e*/ 213,
-      /*0x1cae*/ 569,
-      -1,
-      /*0x2cba*/ 1003,
-      -1, -1,
-      /*0x022c*/ 212,
-      /*0x1cac*/ 567,
-      -1, -1,
-      /*0xa7ba*/ 1136,
-      /*0x10af*/ 499,
-      /*0x1057c*/ 1355,
-      /*0x0182*/ 122,
-      /*0x053a*/ 454,
-      -1, -1, -1, -1, -1,
-      /*0x04aa*/ 378,
-      /*0x1f8d*/ 780,
-      /*0x040d*/ 310,
-      -1,
-      /*0x1040d*/ 1281,
-      -1,
-      /*0xab8d*/ 1179,
-      -1, -1, -1,
-      /*0x01a2*/ 142,
-      /*0x2c0d*/ 924,
-      /*0x1f2f*/ 736,
-      /*0x216d*/ 881,
-      /*0x118a7*/ 1437,
-      /*0x038e*/ 239,
-      -1, -1, -1,
-      /*0x0228*/ 210,
-      /*0x1ca8*/ 563,
-      /*0x038c*/ 238,
-      -1, -1,
-      /*0xff27*/ 1248,
-      /*0x0130*/ 1529,
-      -1, -1,
-      /*0xabb0*/ 1214,
-      /*0xa78d*/ 1111,
-      -1, -1,
-      /*0x10c8d*/ 1392,
-      /*0x04ae*/ 380,
-      /*0x1fdb*/ 843,
-      /*0x1eb0*/ 675,
-      /*0x1e30*/ 609,
-      -1,
-      /*0xfb04*/ 1234,
-      /*0x04ac*/ 379,
-      -1, -1, -1, -1,
-      /*0x2cb0*/ 998,
-      -1, -1,
-      /*0x1fbe*/ 825,
-      /*0x118af*/ 1445,
-      /*0xa764*/ 1096,
-      /*0x13fc*/ 528,
-      /*0xa7b0*/ 1129,
-      /*0xabbe*/ 1228,
-      /*0x00db*/ 52,
-      /*0x10cb0*/ 1427,
-      /*0x10a2*/ 486,
-      /*0x020e*/ 197,
-      -1,
-      /*0xff2f*/ 1256,
-      /*0x1ebe*/ 682,
-      /*0x1e3e*/ 616,
-      -1,
-      /*0x020c*/ 196,
-      /*0x1fd3*/ 837,
-      /*0x0053*/ 17,
-      -1, -1,
-      /*0x2164*/ 872,
-      /*0x2cbe*/ 1005,
-      -1, -1,
-      /*0xfb02*/ 1232,
-      /*0x04a8*/ 377,
-      -1, -1,
-      /*0xa7be*/ 1138,
-      -1, -1, -1,
-      /*0x053e*/ 458,
-      -1, -1,
-      /*0x00d3*/ 45,
-      -1, -1, -1, -1,
-      /*0x01ae*/ 148,
-      -1, -1, -1, -1, -1,
-      /*0x01ac*/ 147,
-      /*0xa779*/ 1102,
-      /*0x0553*/ 479,
-      /*0x0232*/ 215,
-      /*0x1cb2*/ 573,
-      /*0x1fb6*/ 818,
-      /*0x10aa*/ 494,
-      /*0x0136*/ 83,
-      -1, -1,
-      /*0xabb6*/ 1220,
-      /*0x1fca*/ 833,
-      /*0x004a*/ 8,
-      /*0x014a*/ 93,
-      -1, -1,
-      /*0x048e*/ 364,
-      /*0x1eb6*/ 678,
-      /*0x1e36*/ 612,
-      /*0x118a2*/ 1432,
-      -1, -1,
-      /*0x048c*/ 363,
-      /*0x1eca*/ 688,
-      /*0x1e4a*/ 622,
-      -1,
-      /*0x2cb6*/ 1001,
-      /*0x1f2a*/ 731,
-      /*0x1cb8*/ 579,
-      /*0xff22*/ 1243,
-      /*0x00ca*/ 36,
-      -1,
-      /*0x2cca*/ 1011,
-      /*0xa7b6*/ 1134,
-      -1, -1, -1,
-      /*0x0536*/ 450,
-      /*0xa77d*/ 1104,
-      /*0x10ae*/ 498,
-      /*0x1fcb*/ 834,
-      /*0x004b*/ 9,
-      /*0x1e90e*/ 1508,
-      /*0x054a*/ 470,
-      -1,
-      /*0x10ac*/ 496,
-      -1, -1,
-      /*0x1e90c*/ 1506,
-      -1, -1, -1,
-      /*0x1f87*/ 774,
-      /*0x0407*/ 304,
-      -1,
-      /*0x10407*/ 1275,
-      /*0x04b2*/ 382,
-      /*0xab87*/ 1173,
-      /*0x104b2*/ 1310,
-      /*0x00cb*/ 37,
-      /*0x1f2e*/ 735,
-      -1,
-      /*0x2c07*/ 918,
-      /*0x118aa*/ 1440,
-      -1, -1,
-      /*0x1f2c*/ 733,
-      -1,
-      /*0x023a*/ 216,
-      /*0x1cba*/ 581,
-      /*0x018e*/ 129,
-      -1,
-      /*0x054b*/ 471,
-      /*0xff2a*/ 1251,
-      -1, -1, -1,
-      /*0x04d4*/ 399,
-      /*0x10a8*/ 492,
-      /*0x1fb4*/ 817,
-      /*0x04b8*/ 385,
-      /*0x0134*/ 82,
-      /*0x104b8*/ 1316,
-      /*0x10c87*/ 1386,
-      /*0xabb4*/ 1218,
-      -1, -1, -1,
-      /*0x03b0*/ 268,
-      /*0xab71*/ 1151,
-      -1,
-      /*0x1eb4*/ 677,
-      /*0x1e34*/ 611,
-      -1, -1,
-      /*0xa722*/ 1064,
-      /*0x118ae*/ 1444,
-      -1, -1,
-      /*0x1f28*/ 729,
-      /*0x2cb4*/ 1000,
-      -1,
-      /*0x118ac*/ 1442,
-      /*0xab73*/ 1153,
-      -1, -1,
-      /*0xff2e*/ 1255,
-      /*0xa7b4*/ 1133,
-      -1, -1,
-      /*0x01b2*/ 151,
-      /*0x0534*/ 448,
-      /*0xff2c*/ 1253,
-      -1, -1,
-      /*0xa654*/ 1037,
-      -1,
-      /*0x04fc*/ 419,
-      -1,
-      /*0x1fbc*/ 824,
-      /*0x10588*/ 1367,
-      /*0x04ba*/ 386,
-      -1,
-      /*0x104ba*/ 1318,
-      /*0xabbc*/ 1226,
-      -1,
-      /*0x10589*/ 1368,
-      -1, -1,
-      /*0x0230*/ 214,
-      /*0x1cb0*/ 571,
-      /*0x1ebc*/ 681,
-      /*0x1e3c*/ 615,
-      -1,
-      /*0x01b8*/ 155,
-      /*0x118a8*/ 1438,
-      /*0x1f0e*/ 721,
-      /*0x1058a*/ 1369,
-      -1,
-      /*0xa72a*/ 1068,
-      /*0x2cbc*/ 1004,
-      -1,
-      /*0x1f0c*/ 719,
-      /*0x10580*/ 1359,
-      -1,
-      /*0xff28*/ 1249,
-      -1,
-      /*0xa7bc*/ 1137,
-      -1, -1, -1,
-      /*0x053c*/ 456,
-      /*0x24b8*/ 887,
-      /*0x023e*/ 219,
-      /*0x1cbe*/ 583,
-      /*0x10b2*/ 502,
-      -1,
-      /*0x212a*/ 865,
-      -1, -1,
-      /*0x10590*/ 1374,
-      -1, -1, -1,
-      /*0x1fd6*/ 838,
-      /*0x0056*/ 20,
-      /*0x0156*/ 99,
-      -1, -1, -1, -1,
-      /*0x01fc*/ 188,
-      /*0xa72e*/ 1070,
-      -1, -1, -1,
-      /*0x1ed6*/ 694,
-      /*0x1e56*/ 628,
-      /*0xa72c*/ 1069,
-      /*0x10b8*/ 508,
-      -1, -1,
-      /*0x04b0*/ 381,
-      /*0x00d6*/ 48,
-      /*0x104b0*/ 1308,
-      /*0x2cd6*/ 1017,
-      /*0x1e90d*/ 1507,
-      -1,
-      /*0xab7f*/ 1165,
-      /*0xab7b*/ 1161,
-      -1, -1,
-      /*0xa7d6*/ 1147,
-      /*0x24ba*/ 889,
-      /*0x10586*/ 1365,
-      /*0xab75*/ 1155,
-      /*0x0556*/ 482,
-      /*0x1f54*/ 753,
-      -1, -1,
-      /*0x1f38*/ 737,
-      -1,
-      /*0x1fc4*/ 828,
-      /*0x0044*/ 3,
-      -1,
-      /*0x1cb6*/ 577,
-      /*0x04be*/ 388,
-      -1,
-      /*0x104be*/ 1322,
-      -1,
-      /*0x024a*/ 226,
-      /*0xa728*/ 1067,
-      /*0x118b2*/ 1448,
-      -1,
-      /*0x1ec4*/ 685,
-      /*0x1e44*/ 619,
-      /*0xa688*/ 1054,
-      -1, -1, -1,
-      /*0x10ba*/ 510,
-      /*0x00c4*/ 30,
-      /*0xff32*/ 1259,
-      /*0x2cc4*/ 1008,
-      /*0x104d3*/ 1343,
-      -1, -1, -1,
-      /*0x10592*/ 1376,
-      -1,
-      /*0xa7c4*/ 1141,
-      /*0x0050*/ 14,
-      /*0x0150*/ 96,
-      /*0xa68a*/ 1055,
-      /*0x0544*/ 464,
-      -1,
-      /*0x118b8*/ 1454,
-      -1, -1,
-      /*0xa680*/ 1050,
-      -1,
-      /*0x1f3a*/ 739,
-      /*0x1ed0*/ 691,
-      /*0x1e50*/ 625,
-      -1, -1,
-      /*0xff38*/ 1265,
-      /*0x01db*/ 170,
-      -1,
-      /*0x00d0*/ 42,
-      /*0xab77*/ 1157,
-      /*0x2cd0*/ 1014,
-      /*0x1c87*/ 537,
-      -1, -1, -1,
-      /*0xa690*/ 1058,
-      /*0x04b6*/ 384,
-      /*0xa7d0*/ 1146,
-      /*0x104b6*/ 1314,
-      -1, -1,
-      /*0x0550*/ 476,
-      /*0x16e5f*/ 1493,
-      /*0x16e5d*/ 1491,
-      /*0x104ca*/ 1334,
-      -1, -1, -1, -1,
-      /*0x1fcc*/ 835,
-      /*0x004c*/ 10,
-      /*0x014c*/ 94,
-      /*0xa698*/ 1062,
-      -1, -1,
-      /*0x01d3*/ 166,
-      /*0x118ba*/ 1456,
-      /*0x24be*/ 893,
-      /*0x1cb4*/ 575,
-      /*0x1f0d*/ 720,
-      /*0x10b0*/ 500,
-      /*0x1ecc*/ 689,
-      /*0x1e4c*/ 623,
-      -1, -1, -1,
-      /*0xff3a*/ 1267,
-      /*0xa732*/ 1071,
-      /*0x00cc*/ 38,
-      /*0xa686*/ 1053,
-      /*0x2ccc*/ 1012,
-      /*0x04cb*/ 395,
-      -1,
-      /*0x104cb*/ 1335,
-      -1, -1, -1, -1,
-      /*0x16e59*/ 1487,
-      -1,
-      /*0xa64a*/ 1032,
-      /*0x054c*/ 472,
-      -1, -1,
-      /*0x10be*/ 514,
-      /*0x2132*/ 867,
-      /*0xa696*/ 1061,
-      -1,
-      /*0xa754*/ 1088,
-      -1, -1,
-      /*0xa738*/ 1074,
-      /*0x1f5b*/ 756,
-      -1,
-      /*0x1fc8*/ 831,
-      /*0x0048*/ 7,
-      /*0x01ca*/ 161,
-      -1, -1, -1, -1,
-      /*0x03d6*/ 274,
-      -1,
-      /*0xa692*/ 1059,
-      -1,
-      /*0x1f3e*/ 743,
-      /*0x1ec8*/ 687,
-      /*0x1e48*/ 621,
-      /*0x24b6*/ 885,
-      /*0x1e907*/ 1501,
-      /*0x04b4*/ 383,
-      -1,
-      /*0x104b4*/ 1312,
-      /*0x00c8*/ 34,
-      /*0x24ca*/ 905,
-      /*0x2cc8*/ 1010,
-      -1,
-      /*0x118b0*/ 1446,
-      -1, -1,
-      /*0xa69a*/ 1063,
-      -1,
-      /*0x004e*/ 12,
-      /*0x014e*/ 95,
-      -1,
-      /*0x01cb*/ 162,
-      /*0x0548*/ 468,
-      /*0xff30*/ 1257,
-      -1, -1, -1, -1,
-      /*0xa73a*/ 1075,
-      /*0x1ece*/ 690,
-      /*0x1e4e*/ 624,
-      /*0x10b6*/ 506,
-      -1,
-      /*0x0187*/ 125,
-      -1, -1,
-      /*0x00ce*/ 40,
-      /*0x118be*/ 1460,
-      /*0x2cce*/ 1013,
-      /*0x24cb*/ 906,
-      /*0x1fc2*/ 826,
-      /*0x0042*/ 1,
-      -1,
-      /*0x16e57*/ 1485,
-      -1,
-      /*0x10594*/ 1377,
-      /*0x04bc*/ 387,
-      -1,
-      /*0x104bc*/ 1320,
-      /*0x054e*/ 474,
-      -1, -1,
-      /*0x1ec2*/ 684,
-      /*0x1e42*/ 618,
-      /*0x1fd2*/ 836,
-      /*0x0052*/ 16,
-      /*0x0152*/ 97,
-      -1,
-      /*0x1f4a*/ 747,
-      /*0x00c2*/ 28,
-      -1,
-      /*0x2cc2*/ 1007,
-      /*0x10583*/ 1362,
-      /*0x03d0*/ 271,
-      -1, -1,
-      /*0x1ed2*/ 692,
-      /*0x1e52*/ 626,
-      /*0xa7c2*/ 1140,
-      -1, -1, -1,
-      /*0x0542*/ 462,
-      /*0x00d2*/ 44,
-      -1,
-      /*0x2cd2*/ 1015,
-      /*0x0244*/ 222,
-      -1, -1, -1,
-      /*0x1fc6*/ 829,
-      /*0x0046*/ 5,
-      -1,
-      /*0x1fd8*/ 840,
-      /*0x0058*/ 22,
-      /*0x0158*/ 100,
-      /*0x0552*/ 478,
-      /*0x1f4b*/ 748,
-      /*0x118b6*/ 1452,
-      -1, -1,
-      /*0x04d6*/ 400,
-      /*0x1ec6*/ 686,
-      /*0x1e46*/ 620,
-      -1,
-      /*0x1ed8*/ 695,
-      /*0x1e58*/ 629,
-      /*0xab79*/ 1159,
-      /*0xff36*/ 1263,
-      /*0x00c6*/ 32,
-      /*0x01bc*/ 156,
-      /*0x2cc6*/ 1009,
-      /*0x00d8*/ 49,
-      -1,
-      /*0x2cd8*/ 1018,
-      /*0x10b4*/ 504,
-      -1, -1,
-      /*0xa7c6*/ 1143,
-      /*0x1fab*/ 810,
-      /*0x042b*/ 340,
-      /*0xa7d8*/ 1148,
-      /*0x0546*/ 466,
-      /*0xa73e*/ 1077,
-      /*0xabab*/ 1209,
-      -1,
-      /*0x1ec0*/ 683,
-      /*0x1e40*/ 617,
-      /*0x24bc*/ 891,
-      /*0x2c2b*/ 954,
-      -1, -1, -1,
-      /*0x00c0*/ 26,
-      -1,
-      /*0x2cc0*/ 1006,
-      /*0x1fec*/ 853,
-      /*0x046c*/ 351,
-      /*0x016c*/ 110,
-      /*0xa656*/ 1038,
-      /*0x013d*/ 86,
-      /*0x104c4*/ 1328,
-      /*0xa7c0*/ 1139,
-      /*0xabbd*/ 1227,
-      /*0xab7d*/ 1163,
-      -1,
-      /*0x0540*/ 460,
-      /*0xa7ab*/ 1125,
-      /*0x1eec*/ 705,
-      /*0x1e6c*/ 639,
-      /*0x10cab*/ 1422,
-      /*0xa694*/ 1060,
-      -1, -1,
-      /*0x024c*/ 227,
-      /*0x10bc*/ 512,
-      -1, -1, -1,
-      /*0x1fc9*/ 832,
-      /*0x0049*/ 1528,
-      /*0x0149*/ 92,
-      -1,
-      /*0x1fa9*/ 808,
-      /*0x0429*/ 338,
-      -1, -1,
-      /*0x04d0*/ 397,
-      /*0xaba9*/ 1207,
-      /*0x104d0*/ 1340,
-      /*0x053d*/ 457,
-      -1,
-      /*0x118b4*/ 1450,
-      /*0x2c29*/ 952,
-      /*0xa736*/ 1073,
-      -1,
-      /*0x1f3c*/ 741,
-      /*0xa644*/ 1029,
-      /*0x00c9*/ 35,
-      -1,
-      /*0xa74a*/ 1083,
-      /*0x16e41*/ 1463,
-      /*0xff34*/ 1261,
-      /*0x1fda*/ 842,
-      /*0x005a*/ 24,
-      /*0x015a*/ 101,
-      -1,
-      /*0xa7c9*/ 1145,
-      /*0x1fea*/ 851,
-      /*0x046a*/ 350,
-      /*0x016a*/ 109,
-      /*0x0549*/ 469,
-      -1,
-      /*0x01c4*/ 157,
-      /*0x10ca9*/ 1420,
-      /*0x1eda*/ 696,
-      /*0x1e5a*/ 630,
-      -1, -1,
-      /*0x0248*/ 225,
-      /*0x1eea*/ 704,
-      /*0x1e6a*/ 638,
-      /*0x00da*/ 51,
-      -1,
-      /*0x2cda*/ 1019,
-      /*0xa650*/ 1035,
-      -1, -1,
-      /*0x03c2*/ 269,
-      /*0x104cc*/ 1336,
-      -1,
-      /*0x24c4*/ 899,
-      /*0x118bc*/ 1458,
-      -1,
-      /*0x10584*/ 1363,
-      /*0x1fe2*/ 844,
-      /*0x0462*/ 346,
-      /*0x0162*/ 105,
-      -1,
-      /*0x1fa1*/ 800,
-      /*0x0421*/ 330,
-      /*0x1f56*/ 754,
-      /*0x10421*/ 1301,
-      -1,
-      /*0xaba1*/ 1199,
-      /*0x2c62*/ 960,
-      /*0x024e*/ 228,
-      /*0x1ee2*/ 700,
-      /*0x1e62*/ 634,
-      /*0x2c21*/ 944,
-      -1, -1, -1,
-      /*0x1fc7*/ 830,
-      /*0x0047*/ 6,
-      /*0x0147*/ 91,
-      /*0x2ce2*/ 1023,
-      -1,
-      /*0x10c4*/ 520,
-      /*0x0045*/ 4,
-      /*0x0145*/ 90,
-      -1, -1, -1,
-      /*0x1fb9*/ 821,
-      /*0xa64c*/ 1033,
-      /*0x0139*/ 84,
-      /*0x10582*/ 1361,
-      /*0xa734*/ 1072,
-      /*0xabb9*/ 1223,
-      /*0x10ca1*/ 1412,
-      /*0x03d8*/ 275,
-      /*0x00c7*/ 33,
-      /*0x0055*/ 19,
-      /*0x104c8*/ 1332,
-      -1, -1,
-      /*0x00c5*/ 31,
-      -1, -1, -1,
-      /*0xa7c7*/ 1144,
-      -1, -1, -1,
-      /*0x0547*/ 467,
-      /*0xa7c5*/ 1142,
-      -1,
-      /*0x0345*/ 229,
-      -1,
-      /*0x0545*/ 465,
-      /*0x00d5*/ 47,
-      -1,
-      /*0x1fe8*/ 849,
-      /*0x0468*/ 349,
-      /*0x0168*/ 108,
-      /*0x0539*/ 453,
-      /*0x03ab*/ 267,
-      -1,
-      /*0x24cc*/ 907,
-      -1,
-      /*0x104ce*/ 1338,
-      -1, -1,
-      /*0x0555*/ 481,
-      /*0x1ee8*/ 703,
-      /*0x1e68*/ 637,
-      /*0x1f50*/ 751,
-      /*0xa73c*/ 1076,
-      /*0x0246*/ 224,
-      /*0xa648*/ 1031,
-      -1, -1, -1,
-      /*0x03ec*/ 285,
-      /*0x1f97*/ 790,
-      /*0x0417*/ 320,
-      -1,
-      /*0x10417*/ 1291,
-      -1,
-      /*0xab97*/ 1189,
-      /*0x1ff2*/ 854,
-      /*0x0472*/ 354,
-      /*0x0172*/ 113,
-      /*0x104c2*/ 1326,
-      /*0x2c17*/ 934,
-      /*0x01c8*/ 160,
-      /*0x1e97*/ 661,
-      -1, -1,
-      /*0xa684*/ 1052,
-      /*0x2c72*/ 970,
-      -1,
-      /*0x1ef2*/ 708,
-      /*0x1e72*/ 642,
-      -1,
-      /*0x04d2*/ 398,
-      /*0xa64e*/ 1034,
-      /*0x104d2*/ 1342,
-      /*0x1cab*/ 566,
-      -1,
-      /*0x03a9*/ 265,
-      /*0x2cf2*/ 1026,
-      -1,
-      /*0x24c8*/ 903,
-      -1,
-      /*0x10c97*/ 1402,
-      /*0x1f4c*/ 749,
-      -1, -1, -1,
-      /*0x0372*/ 231,
-      -1,
-      /*0xa756*/ 1089,
-      -1,
-      /*0x10572*/ 1346,
-      -1,
-      /*0x023d*/ 218,
-      /*0x1cbd*/ 582,
-      -1,
-      /*0xa642*/ 1028,
-      /*0x03da*/ 276,
-      -1,
-      /*0xa682*/ 1051,
-      /*0x104c6*/ 1330,
-      /*0x04d8*/ 401,
-      /*0x03ea*/ 284,
-      -1, -1,
-      /*0x046e*/ 352,
-      /*0x016e*/ 111,
-      /*0x24ce*/ 909,
-      -1, -1,
-      /*0xa652*/ 1036,
-      -1, -1, -1,
-      /*0x2c6e*/ 967,
-      /*0x015e*/ 103,
-      /*0x1eee*/ 706,
-      /*0x1e6e*/ 640,
-      -1,
-      /*0x1ca9*/ 564,
-      -1, -1,
-      /*0x04c0*/ 389,
-      -1,
-      /*0x104c0*/ 1324,
-      /*0x1ede*/ 698,
-      /*0x1e5e*/ 632,
-      /*0xa744*/ 1080,
-      /*0x1f48*/ 745,
-      /*0x03e2*/ 280,
-      /*0x24c2*/ 897,
-      -1,
-      /*0x00de*/ 55,
-      /*0x03a1*/ 258,
-      /*0x2cde*/ 1021,
-      -1,
-      /*0xa646*/ 1030,
-      -1, -1,
-      /*0xa658*/ 1039,
-      -1, -1, -1, -1,
-      /*0x04ec*/ 411,
-      /*0x1fc3*/ 827,
-      /*0x0043*/ 2,
-      /*0x0143*/ 89,
-      /*0x104bd*/ 1321,
-      -1,
-      /*0x1fe6*/ 847,
-      /*0x0466*/ 348,
-      /*0x0166*/ 107,
-      -1, -1,
-      /*0xa750*/ 1086,
-      -1,
-      /*0x10c2*/ 518,
-      -1, -1,
-      /*0xa640*/ 1027,
-      -1,
-      /*0x1ee6*/ 702,
-      /*0x1e66*/ 636,
-      /*0x00c3*/ 29,
-      -1,
-      /*0x03d5*/ 273,
-      /*0x04c9*/ 394,
-      -1,
-      /*0x104c9*/ 1333,
-      /*0x24c6*/ 901,
-      /*0x1fad*/ 812,
-      /*0x042d*/ 342,
-      /*0x1058e*/ 1372,
-      -1,
-      /*0x1ca1*/ 556,
-      /*0xabad*/ 1211,
-      /*0x0543*/ 463,
-      -1,
-      /*0x1058c*/ 1370,
-      -1,
-      /*0x2c2d*/ 956,
-      /*0xa66c*/ 1049,
-      -1, -1, -1, -1,
-      /*0x03e8*/ 283,
-      -1, -1, -1,
-      /*0x04da*/ 402,
-      /*0x1f52*/ 752,
-      /*0x0245*/ 223,
-      /*0x24c0*/ 895,
-      /*0xa74c*/ 1084,
-      /*0x04ea*/ 410,
-      -1,
-      /*0x01ec*/ 178,
-      /*0xa7ad*/ 1127,
-      /*0x1cb9*/ 580,
-      -1,
-      /*0x10cad*/ 1424,
-      -1, -1, -1, -1, -1, -1,
-      /*0x0397*/ 248,
-      /*0x1fbb*/ 823,
-      /*0xab7c*/ 1162,
-      /*0x013b*/ 85,
-      -1, -1,
-      /*0xabbb*/ 1225,
-      -1, -1,
-      /*0x24bd*/ 892,
-      -1, -1,
-      /*0x10c0*/ 516,
-      -1,
-      /*0x04e2*/ 406,
-      -1,
-      /*0x01a9*/ 146,
-      /*0x10ab*/ 495,
-      /*0x1fa5*/ 804,
-      /*0x0425*/ 334,
-      /*0xa65a*/ 1040,
-      /*0x10425*/ 1305,
-      -1,
-      /*0xaba5*/ 1203,
-      /*0x1fb7*/ 819,
-      /*0xa66a*/ 1048,
-      -1, -1,
-      /*0x2c25*/ 948,
-      /*0xabb7*/ 1221,
-      /*0x24c9*/ 904,
-      /*0xa748*/ 1082,
-      /*0x04c7*/ 393,
-      /*0x053b*/ 455,
-      /*0x104c7*/ 1331,
-      -1,
-      /*0x10bd*/ 513,
-      /*0x04c5*/ 392,
-      /*0x1f2b*/ 732,
-      /*0x104c5*/ 1329,
-      -1,
-      /*0x01ea*/ 177,
-      /*0x1c97*/ 546,
-      -1,
-      /*0x1e921*/ 1527,
-      /*0x104b9*/ 1317,
-      -1, -1, -1,
-      /*0x10ca5*/ 1416,
-      -1, -1,
-      /*0xa662*/ 1044,
-      /*0x03ee*/ 286,
-      -1,
-      /*0x1f6c*/ 763,
-      /*0x0537*/ 451,
-      /*0x1f3d*/ 742,
-      /*0xa74e*/ 1085,
-      -1,
-      /*0xa68e*/ 1057,
-      /*0x10a9*/ 493,
-      /*0x03de*/ 278,
-      -1, -1, -1,
-      /*0xa68c*/ 1056,
-      -1,
-      /*0x01e2*/ 173,
-      -1,
-      /*0x1fa3*/ 802,
-      /*0x0423*/ 332,
-      /*0x04e8*/ 409,
-      /*0x10423*/ 1303,
-      /*0x118ab*/ 1441,
-      /*0xaba3*/ 1201,
-      -1, -1,
-      /*0x1f49*/ 746,
-      -1,
-      /*0x2c23*/ 946,
-      /*0xa742*/ 1079,
-      /*0x1f29*/ 730,
-      -1,
-      /*0xff2b*/ 1252,
-      -1,
-      /*0x01c7*/ 159,
-      -1, -1, -1, -1,
-      /*0x01c5*/ 158,
-      -1,
-      /*0x118bd*/ 1459,
-      /*0x004d*/ 11,
-      /*0xa752*/ 1087,
-      -1, -1, -1,
-      /*0x03e6*/ 282,
-      /*0x04f2*/ 414,
-      /*0x10ca3*/ 1414,
-      -1, -1,
-      /*0x24c7*/ 902,
-      /*0x01d5*/ 167,
-      -1,
-      /*0x1f6a*/ 761,
-      /*0x1058d*/ 1371,
-      /*0x24c5*/ 900,
-      /*0xa668*/ 1047,
-      -1,
-      /*0x00cd*/ 39,
-      -1, -1,
-      /*0x24b9*/ 888,
-      -1,
-      /*0x10a1*/ 485,
-      /*0x118a9*/ 1439,
-      -1,
-      /*0x1e917*/ 1517,
-      /*0xa746*/ 1081,
-      -1,
-      /*0x16e54*/ 1482,
-      /*0xa758*/ 1090,
-      /*0x054d*/ 473,
-      /*0x01e8*/ 176,
-      -1,
-      /*0xff29*/ 1250,
-      -1, -1,
-      /*0x10c7*/ 522,
-      /*0x0470*/ 353,
-      /*0x0170*/ 112,
-      -1,
-      /*0x0243*/ 221,
-      /*0x10c5*/ 521,
-      -1, -1, -1, -1,
-      /*0x2c70*/ 969,
-      /*0x10b9*/ 509,
-      /*0x1ef0*/ 707,
-      /*0x1e70*/ 641,
-      /*0xa740*/ 1078,
-      -1,
-      /*0x04ee*/ 412,
-      /*0x0197*/ 136,
-      -1,
-      /*0x1f9d*/ 796,
-      /*0x041d*/ 326,
-      -1,
-      /*0x1041d*/ 1297,
-      /*0x01f2*/ 182,
-      /*0xab9d*/ 1195,
-      /*0x04de*/ 404,
-      -1, -1, -1,
-      /*0x2c1d*/ 940,
-      /*0x0370*/ 230,
-      /*0x1cad*/ 568,
-      /*0x1f39*/ 738,
-      -1,
-      /*0x10570*/ 1344,
-      -1,
-      /*0xa76c*/ 1100,
-      /*0x212b*/ 866,
-      /*0xabb5*/ 1219,
-      -1, -1, -1, -1,
-      /*0x118a1*/ 1431,
-      -1,
-      /*0x03a5*/ 261,
-      /*0x1f9b*/ 794,
-      /*0x041b*/ 324,
-      -1,
-      /*0x1041b*/ 1295,
-      /*0x10c9d*/ 1408,
-      /*0xab9b*/ 1193,
-      /*0x00b5*/ 25,
-      /*0xff21*/ 1242,
-      /*0x216c*/ 880,
-      -1,
-      /*0x2c1b*/ 938,
-      /*0x04c3*/ 391,
-      /*0x1e9b*/ 665,
-      /*0x104c3*/ 1327,
-      -1,
-      /*0x1f68*/ 759,
-      /*0x04e6*/ 408,
-      /*0xa65e*/ 1042,
-      -1,
-      /*0x0535*/ 449,
-      -1, -1,
-      /*0x118b9*/ 1455,
-      /*0x023b*/ 217,
-      /*0x01ee*/ 179,
-      /*0x1f95*/ 788,
-      /*0x0415*/ 318,
-      -1,
-      /*0x10415*/ 1289,
-      -1,
-      /*0xab95*/ 1187,
-      /*0x10c9b*/ 1406,
-      /*0xff39*/ 1266,
-      /*0x01de*/ 171,
-      -1,
-      /*0x2c15*/ 932,
-      -1,
-      /*0xa75a*/ 1091,
-      -1, -1, -1,
-      /*0x1ca5*/ 560,
-      /*0xa76a*/ 1099,
-      /*0x1f99*/ 792,
-      /*0x0419*/ 322,
-      -1,
-      /*0x10419*/ 1293,
-      /*0x1cb7*/ 578,
-      /*0xab99*/ 1191,
-      /*0xfb17*/ 1241,
-      -1,
-      /*0x03a3*/ 259,
-      /*0x1fb3*/ 816,
-      /*0x2c19*/ 936,
-      /*0xa666*/ 1046,
-      /*0x1e99*/ 663,
-      /*0x10c95*/ 1400,
-      /*0xabb3*/ 1217,
-      /*0x1f93*/ 786,
-      /*0x0413*/ 316,
-      /*0x216a*/ 878,
-      /*0x10413*/ 1287,
-      /*0x16e5b*/ 1489,
-      /*0xab93*/ 1185,
-      -1, -1, -1, -1,
-      /*0x2c13*/ 930,
-      /*0xa762*/ 1095,
-      /*0x01e6*/ 175,
-      -1, -1,
-      /*0x0587*/ 483,
-      /*0x10c99*/ 1404,
-      /*0x10587*/ 1366,
-      /*0x1f91*/ 784,
-      /*0x0411*/ 314,
-      /*0x104bb*/ 1319,
-      /*0x10411*/ 1285,
-      /*0xa7b3*/ 1132,
-      /*0xab91*/ 1183,
-      -1,
-      /*0x24c3*/ 898,
-      /*0x0533*/ 447,
-      -1,
-      /*0x2c11*/ 928,
-      /*0x2162*/ 870,
-      /*0x004f*/ 13,
-      /*0x10c93*/ 1398,
-      /*0x1f6e*/ 765,
-      /*0x16e53*/ 1481,
-      -1,
-      /*0x1ca3*/ 558,
-      -1,
-      /*0x1f8f*/ 782,
-      /*0x040f*/ 312,
-      -1,
-      /*0x1040f*/ 1283,
-      -1,
-      /*0xab8f*/ 1181,
-      /*0x104b7*/ 1315,
-      -1, -1, -1,
-      /*0x2c0f*/ 926,
-      /*0x00cf*/ 41,
-      /*0x10c91*/ 1396,
-      /*0x1f81*/ 768,
-      /*0x0401*/ 298,
-      /*0x10c3*/ 519,
-      /*0x10401*/ 1269,
-      /*0x03f0*/ 287,
-      /*0xab81*/ 1167,
-      -1, -1, -1, -1,
-      /*0x2c01*/ 912,
-      /*0x054f*/ 475,
-      -1, -1,
-      /*0x1ff4*/ 856,
-      /*0x0474*/ 355,
-      /*0x0174*/ 114,
-      -1,
-      /*0x10c8f*/ 1394,
-      /*0xa768*/ 1098,
-      -1,
-      /*0x047e*/ 360,
-      -1,
-      /*0x039d*/ 254,
-      /*0x16e4a*/ 1472,
-      /*0x015c*/ 102,
-      /*0x1ef4*/ 709,
-      /*0x1e74*/ 643,
-      /*0x10ad*/ 497,
-      -1,
-      /*0x2c7e*/ 972,
-      /*0x10c81*/ 1380,
-      /*0x1efe*/ 714,
-      /*0x1e7e*/ 648,
-      -1,
-      /*0x1edc*/ 697,
-      /*0x1e5c*/ 631,
-      /*0x2168*/ 876,
-      /*0x013f*/ 87,
-      -1,
-      /*0x24bb*/ 890,
-      /*0xabbf*/ 1229,
-      /*0x00dc*/ 53,
-      /*0xabb1*/ 1215,
-      /*0x2cdc*/ 1020,
-      /*0x01b7*/ 154,
-      -1, -1,
-      /*0x10574*/ 1348,
-      /*0x1f2d*/ 734,
-      /*0x039b*/ 252,
-      -1, -1,
-      /*0x16e4b*/ 1473,
-      /*0x1057e*/ 1357,
-      -1, -1, -1, -1, -1,
-      /*0x04cd*/ 396,
-      -1,
-      /*0x104cd*/ 1337,
-      /*0x24b7*/ 886,
-      -1,
-      /*0x1c9d*/ 552,
-      /*0xa7b1*/ 1130,
-      /*0x10bb*/ 511,
-      /*0x053f*/ 459,
-      /*0x10cb1*/ 1428,
-      /*0x0531*/ 445,
-      /*0x1f9f*/ 798,
-      /*0x041f*/ 328,
-      -1,
-      /*0x1041f*/ 1299,
-      /*0x0395*/ 246,
-      /*0xab9f*/ 1197,
-      -1, -1,
-      /*0x1cb5*/ 576,
-      -1,
-      /*0x2c1f*/ 942,
-      -1, -1,
-      /*0x10a5*/ 489,
-      /*0x118ad*/ 1443,
-      -1, -1,
-      /*0x1f3b*/ 740,
-      -1,
-      /*0x10b7*/ 507,
-      -1,
-      /*0x1c9b*/ 550,
-      /*0x0399*/ 250,
-      /*0xa76e*/ 1101,
-      /*0xff2d*/ 1254,
-      /*0x1f85*/ 772,
-      /*0x0405*/ 302,
-      /*0x04f0*/ 413,
-      /*0x10405*/ 1273,
-      -1,
-      /*0xab85*/ 1171,
-      /*0x10c9f*/ 1410,
-      /*0xa75e*/ 1093,
-      -1, -1,
-      /*0x2c05*/ 916,
-      -1,
-      /*0x0393*/ 244,
-      -1, -1,
-      /*0x0051*/ 15,
-      /*0x216e*/ 882,
-      -1,
-      /*0x01cd*/ 163,
-      -1, -1,
-      /*0x1c95*/ 544,
-      /*0x1f8b*/ 778,
-      /*0x040b*/ 308,
-      -1,
-      /*0x1040b*/ 1279,
-      -1,
-      /*0xab8b*/ 1177,
-      /*0x118bb*/ 1457,
-      -1,
-      /*0x0391*/ 242,
-      /*0x10c85*/ 1384,
-      /*0x2c0b*/ 922,
-      /*0x00d1*/ 43,
-      -1, -1,
-      /*0x24cd*/ 908,
-      /*0x104b5*/ 1313,
-      -1,
-      /*0x1c99*/ 548,
-      /*0x10a3*/ 487,
-      /*0x03cf*/ 270,
-      -1, -1,
-      /*0xa766*/ 1097,
-      /*0x118a5*/ 1435,
-      /*0x0551*/ 477,
-      /*0x1e91d*/ 1523,
-      /*0x1cb3*/ 574,
-      /*0x038f*/ 240,
-      /*0xa78b*/ 1110,
-      /*0x118b7*/ 1453,
-      -1,
-      /*0x10c8b*/ 1390,
-      /*0x1c93*/ 542,
-      /*0xff25*/ 1246,
-      /*0x01f0*/ 180,
-      /*0x1ff6*/ 857,
-      /*0x0476*/ 356,
-      /*0x0176*/ 115,
-      -1,
-      /*0xff37*/ 1264,
-      /*0x2166*/ 874,
-      /*0x10cd*/ 523,
-      -1, -1, -1,
-      /*0x1ffa*/ 861,
-      /*0x047a*/ 358,
-      /*0x1ef6*/ 710,
-      /*0x1e76*/ 644,
-      -1,
-      /*0x1c91*/ 540,
-      -1,
-      /*0x1e91b*/ 1521,
-      /*0x019d*/ 139,
-      /*0x03f4*/ 289,
-      -1, -1,
-      /*0x1efa*/ 712,
-      /*0x1e7a*/ 646,
-      /*0x16e56*/ 1484,
-      /*0x03fe*/ 295,
-      -1,
-      /*0x1f4d*/ 750,
-      /*0x03dc*/ 277,
-      -1,
-      /*0x0376*/ 232,
-      -1,
-      /*0x01b5*/ 153,
-      -1,
-      /*0x10576*/ 1350,
-      -1,
-      /*0x1ff8*/ 859,
-      /*0x0478*/ 357,
-      /*0x0178*/ 116,
-      -1,
-      /*0x118a3*/ 1433,
-      -1,
-      /*0x1e915*/ 1515,
-      -1,
-      /*0x1057a*/ 1354,
-      /*0x104b3*/ 1311,
-      -1,
-      /*0x1c81*/ 531,
-      /*0x1ef8*/ 711,
-      /*0x1e78*/ 645,
-      /*0xff23*/ 1244,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1,
-      /*0x1e919*/ 1519,
-      -1,
-      /*0x16e44*/ 1466,
-      -1, -1, -1, -1, -1, -1,
-      -1,
-      /*0x10578*/ 1352,
-      -1, -1, -1, -1,
-      /*0x1e913*/ 1513,
-      /*0x039f*/ 256,
-      /*0x10b5*/ 505,
-      -1, -1,
-      /*0x104cf*/ 1339,
-      -1, -1,
-      /*0x1cbf*/ 584,
-      /*0x1f1d*/ 728,
-      /*0x1cb1*/ 572,
-      -1, -1, -1, -1,
-      /*0x16e50*/ 1478,
-      -1, -1,
-      /*0x1e911*/ 1511,
-      -1, -1, -1,
-      /*0x01b3*/ 152,
-      -1, -1, -1, -1,
-      /*0x13fa*/ 526,
-      /*0x0193*/ 133,
-      -1, -1, -1, -1, -1, -1,
-      -1,
-      /*0x1f1b*/ 726,
-      /*0x1e90f*/ 1509,
-      /*0x04f4*/ 415,
-      -1,
-      /*0x03d1*/ 272,
-      -1, -1,
-      /*0x1c9f*/ 554,
-      /*0x04fe*/ 420,
-      -1,
-      /*0x0191*/ 132,
-      /*0x04dc*/ 403,
-      -1, -1,
-      /*0x1e901*/ 1495,
-      -1, -1,
-      /*0x13f8*/ 524,
-      -1,
-      /*0x16e4c*/ 1474,
-      -1,
-      /*0x01cf*/ 164,
-      -1,
-      /*0x118b5*/ 1451,
-      -1, -1,
-      /*0x104bf*/ 1323,
-      -1,
-      /*0x104b1*/ 1309,
-      /*0x018f*/ 130,
-      -1,
-      /*0x10b3*/ 503,
-      /*0x1c85*/ 535,
-      /*0xff35*/ 1262,
-      -1, -1, -1,
-      /*0xfb15*/ 1239,
-      -1,
-      /*0x24cf*/ 910,
-      -1, -1,
-      /*0x0181*/ 121,
-      /*0x1f19*/ 724,
-      -1, -1, -1, -1, -1,
-      /*0xa65c*/ 1041,
-      -1, -1, -1, -1, -1, -1,
-      /*0x01f4*/ 183,
-      /*0x03fa*/ 293,
-      -1, -1, -1, -1,
-      /*0x01fe*/ 189,
-      -1,
-      /*0x16e48*/ 1470,
-      -1, -1, -1, -1, -1,
-      /*0xfb13*/ 1237,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1,
-      /*0x01b1*/ 150,
-      -1, -1, -1, -1,
-      /*0x1e91f*/ 1525,
-      -1, -1,
-      /*0x118b3*/ 1449,
-      -1, -1,
-      /*0x16e4e*/ 1476,
-      -1, -1, -1,
-      /*0x1f0f*/ 722,
-      /*0x24bf*/ 894,
-      -1,
-      /*0xff33*/ 1260,
-      -1,
-      /*0x104d1*/ 1341,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1,
-      /*0x1e905*/ 1499,
-      -1, -1,
-      /*0x019f*/ 140,
-      /*0x16e42*/ 1464,
-      -1, -1, -1, -1, -1,
-      /*0xfb01*/ 1231,
-      -1, -1,
-      /*0x10bf*/ 515,
-      -1,
-      /*0x10b1*/ 501,
-      -1, -1,
-      /*0x16e52*/ 1480,
-      -1, -1, -1,
-      /*0x1e90b*/ 1505,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1,
-      /*0x04f6*/ 416,
-      -1, -1,
-      /*0x1f3f*/ 744,
-      -1, -1, -1, -1, -1, -1,
-      /*0x04fa*/ 418,
-      /*0x01d1*/ 165,
-      -1,
-      /*0x16e46*/ 1468,
-      -1, -1,
-      /*0x16e58*/ 1486,
-      -1, -1,
-      /*0x018b*/ 128,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1,
-      /*0x04f8*/ 417,
-      /*0x16e40*/ 1462,
-      -1,
-      /*0x118bf*/ 1461,
-      -1,
-      /*0x118b1*/ 1447,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1,
-      /*0xff31*/ 1258,
-      -1, -1,
-      /*0x01f6*/ 184,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1,
-      /*0xab72*/ 1152,
-      /*0x01fa*/ 187,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1,
-      /*0xfb05*/ 1235,
-      -1, -1, -1, -1, -1, -1,
-      /*0x16e49*/ 1471,
-      -1, -1,
-      /*0x1f0b*/ 718,
-      -1, -1, -1, -1,
-      /*0x01f8*/ 186,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1,
-      /*0xa77e*/ 1105,
-      -1, -1,
-      /*0xa75c*/ 1092,
-      -1, -1, -1,
-      /*0x16e5a*/ 1488,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1,
-      /*0x16e47*/ 1469,
-      -1, -1, -1, -1,
-      /*0x16e45*/ 1467,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1,
-      /*0x16e55*/ 1483,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1,
-      /*0x16e5e*/ 1492,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1,
-      /*0x16e43*/ 1465,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1,
-      /*0xab70*/ 1150,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1,
-      /*0x16e4d*/ 1475,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1,
-      /*0x10595*/ 1378,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1,
-      /*0xab74*/ 1154,
-      -1, -1, -1, -1, -1,
-      /*0xab7e*/ 1164,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1,
-      /*0x10591*/ 1375,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      /*0x1058f*/ 1373,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      /*0x10581*/ 1360,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1,
-      /*0x16e4f*/ 1477,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      /*0xab76*/ 1156,
-      -1, -1, -1, -1, -1,
-      /*0x10585*/ 1364,
-      -1, -1, -1,
-      /*0xab7a*/ 1160,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1,
-      /*0x16e5c*/ 1490,
-      -1, -1, -1, -1,
-      /*0xab78*/ 1158,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1,
-      /*0x16e51*/ 1479
-    };
-
-  if (code <= MAX_CODE_VALUE && code >= MIN_CODE_VALUE)
-    {
-      register unsigned int key = onigenc_unicode_CaseFold_11_hash(code);
-
-      if (key <= MAX_HASH_VALUE)
-        {
-          register short s = wordlist[key];
-
-          if (s >= 0 && code1_equal(code, CaseFold_11_Table[s].from))
-            return &CaseFold_11_Table[s].to;
-        }
-    }
-  return 0;
-}
-
-static const CaseUnfold_11_Type CaseUnfold_11_Table[] = {
-#define CaseUnfold_11 (*(CaseUnfold_11_Type (*)[1395])(CaseUnfold_11_Table+0))
-  {0x0061, {1|U, {0x0041}}},
-  {0x0062, {1|U, {0x0042}}},
-  {0x0063, {1|U, {0x0043}}},
-  {0x0064, {1|U, {0x0044}}},
-  {0x0065, {1|U, {0x0045}}},
-  {0x0066, {1|U, {0x0046}}},
-  {0x0067, {1|U, {0x0047}}},
-  {0x0068, {1|U, {0x0048}}},
-  {0x006a, {1|U, {0x004a}}},
-  {0x006b, {2|U, {0x004b, 0x212a}}},
-  {0x006c, {1|U, {0x004c}}},
-  {0x006d, {1|U, {0x004d}}},
-  {0x006e, {1|U, {0x004e}}},
-  {0x006f, {1|U, {0x004f}}},
-  {0x0070, {1|U, {0x0050}}},
-  {0x0071, {1|U, {0x0051}}},
-  {0x0072, {1|U, {0x0052}}},
-  {0x0073, {2|U, {0x0053, 0x017f}}},
-  {0x0074, {1|U, {0x0054}}},
-  {0x0075, {1|U, {0x0055}}},
-  {0x0076, {1|U, {0x0056}}},
-  {0x0077, {1|U, {0x0057}}},
-  {0x0078, {1|U, {0x0058}}},
-  {0x0079, {1|U, {0x0059}}},
-  {0x007a, {1|U, {0x005a}}},
-  {0x00e0, {1|U, {0x00c0}}},
-  {0x00e1, {1|U, {0x00c1}}},
-  {0x00e2, {1|U, {0x00c2}}},
-  {0x00e3, {1|U, {0x00c3}}},
-  {0x00e4, {1|U, {0x00c4}}},
-  {0x00e5, {2|U, {0x00c5, 0x212b}}},
-  {0x00e6, {1|U, {0x00c6}}},
-  {0x00e7, {1|U, {0x00c7}}},
-  {0x00e8, {1|U, {0x00c8}}},
-  {0x00e9, {1|U, {0x00c9}}},
-  {0x00ea, {1|U, {0x00ca}}},
-  {0x00eb, {1|U, {0x00cb}}},
-  {0x00ec, {1|U, {0x00cc}}},
-  {0x00ed, {1|U, {0x00cd}}},
-  {0x00ee, {1|U, {0x00ce}}},
-  {0x00ef, {1|U, {0x00cf}}},
-  {0x00f0, {1|U, {0x00d0}}},
-  {0x00f1, {1|U, {0x00d1}}},
-  {0x00f2, {1|U, {0x00d2}}},
-  {0x00f3, {1|U, {0x00d3}}},
-  {0x00f4, {1|U, {0x00d4}}},
-  {0x00f5, {1|U, {0x00d5}}},
-  {0x00f6, {1|U, {0x00d6}}},
-  {0x00f8, {1|U, {0x00d8}}},
-  {0x00f9, {1|U, {0x00d9}}},
-  {0x00fa, {1|U, {0x00da}}},
-  {0x00fb, {1|U, {0x00db}}},
-  {0x00fc, {1|U, {0x00dc}}},
-  {0x00fd, {1|U, {0x00dd}}},
-  {0x00fe, {1|U, {0x00de}}},
-  {0x00ff, {1|U, {0x0178}}},
-  {0x0101, {1|U, {0x0100}}},
-  {0x0103, {1|U, {0x0102}}},
-  {0x0105, {1|U, {0x0104}}},
-  {0x0107, {1|U, {0x0106}}},
-  {0x0109, {1|U, {0x0108}}},
-  {0x010b, {1|U, {0x010a}}},
-  {0x010d, {1|U, {0x010c}}},
-  {0x010f, {1|U, {0x010e}}},
-  {0x0111, {1|U, {0x0110}}},
-  {0x0113, {1|U, {0x0112}}},
-  {0x0115, {1|U, {0x0114}}},
-  {0x0117, {1|U, {0x0116}}},
-  {0x0119, {1|U, {0x0118}}},
-  {0x011b, {1|U, {0x011a}}},
-  {0x011d, {1|U, {0x011c}}},
-  {0x011f, {1|U, {0x011e}}},
-  {0x0121, {1|U, {0x0120}}},
-  {0x0123, {1|U, {0x0122}}},
-  {0x0125, {1|U, {0x0124}}},
-  {0x0127, {1|U, {0x0126}}},
-  {0x0129, {1|U, {0x0128}}},
-  {0x012b, {1|U, {0x012a}}},
-  {0x012d, {1|U, {0x012c}}},
-  {0x012f, {1|U, {0x012e}}},
-  {0x0133, {1|U, {0x0132}}},
-  {0x0135, {1|U, {0x0134}}},
-  {0x0137, {1|U, {0x0136}}},
-  {0x013a, {1|U, {0x0139}}},
-  {0x013c, {1|U, {0x013b}}},
-  {0x013e, {1|U, {0x013d}}},
-  {0x0140, {1|U, {0x013f}}},
-  {0x0142, {1|U, {0x0141}}},
-  {0x0144, {1|U, {0x0143}}},
-  {0x0146, {1|U, {0x0145}}},
-  {0x0148, {1|U, {0x0147}}},
-  {0x014b, {1|U, {0x014a}}},
-  {0x014d, {1|U, {0x014c}}},
-  {0x014f, {1|U, {0x014e}}},
-  {0x0151, {1|U, {0x0150}}},
-  {0x0153, {1|U, {0x0152}}},
-  {0x0155, {1|U, {0x0154}}},
-  {0x0157, {1|U, {0x0156}}},
-  {0x0159, {1|U, {0x0158}}},
-  {0x015b, {1|U, {0x015a}}},
-  {0x015d, {1|U, {0x015c}}},
-  {0x015f, {1|U, {0x015e}}},
-  {0x0161, {1|U, {0x0160}}},
-  {0x0163, {1|U, {0x0162}}},
-  {0x0165, {1|U, {0x0164}}},
-  {0x0167, {1|U, {0x0166}}},
-  {0x0169, {1|U, {0x0168}}},
-  {0x016b, {1|U, {0x016a}}},
-  {0x016d, {1|U, {0x016c}}},
-  {0x016f, {1|U, {0x016e}}},
-  {0x0171, {1|U, {0x0170}}},
-  {0x0173, {1|U, {0x0172}}},
-  {0x0175, {1|U, {0x0174}}},
-  {0x0177, {1|U, {0x0176}}},
-  {0x017a, {1|U, {0x0179}}},
-  {0x017c, {1|U, {0x017b}}},
-  {0x017e, {1|U, {0x017d}}},
-  {0x0180, {1|U, {0x0243}}},
-  {0x0183, {1|U, {0x0182}}},
-  {0x0185, {1|U, {0x0184}}},
-  {0x0188, {1|U, {0x0187}}},
-  {0x018c, {1|U, {0x018b}}},
-  {0x0192, {1|U, {0x0191}}},
-  {0x0195, {1|U, {0x01f6}}},
-  {0x0199, {1|U, {0x0198}}},
-  {0x019a, {1|U, {0x023d}}},
-  {0x019e, {1|U, {0x0220}}},
-  {0x01a1, {1|U, {0x01a0}}},
-  {0x01a3, {1|U, {0x01a2}}},
-  {0x01a5, {1|U, {0x01a4}}},
-  {0x01a8, {1|U, {0x01a7}}},
-  {0x01ad, {1|U, {0x01ac}}},
-  {0x01b0, {1|U, {0x01af}}},
-  {0x01b4, {1|U, {0x01b3}}},
-  {0x01b6, {1|U, {0x01b5}}},
-  {0x01b9, {1|U, {0x01b8}}},
-  {0x01bd, {1|U, {0x01bc}}},
-  {0x01bf, {1|U, {0x01f7}}},
-  {0x01c6, {2|U|ST, {0x01c4, 0x01c5}}},
-  {0x01c9, {2|U|ST, {0x01c7, 0x01c8}}},
-  {0x01cc, {2|U|ST, {0x01ca, 0x01cb}}},
-  {0x01ce, {1|U, {0x01cd}}},
-  {0x01d0, {1|U, {0x01cf}}},
-  {0x01d2, {1|U, {0x01d1}}},
-  {0x01d4, {1|U, {0x01d3}}},
-  {0x01d6, {1|U, {0x01d5}}},
-  {0x01d8, {1|U, {0x01d7}}},
-  {0x01da, {1|U, {0x01d9}}},
-  {0x01dc, {1|U, {0x01db}}},
-  {0x01dd, {1|U, {0x018e}}},
-  {0x01df, {1|U, {0x01de}}},
-  {0x01e1, {1|U, {0x01e0}}},
-  {0x01e3, {1|U, {0x01e2}}},
-  {0x01e5, {1|U, {0x01e4}}},
-  {0x01e7, {1|U, {0x01e6}}},
-  {0x01e9, {1|U, {0x01e8}}},
-  {0x01eb, {1|U, {0x01ea}}},
-  {0x01ed, {1|U, {0x01ec}}},
-  {0x01ef, {1|U, {0x01ee}}},
-  {0x01f3, {2|U|ST, {0x01f1, 0x01f2}}},
-  {0x01f5, {1|U, {0x01f4}}},
-  {0x01f9, {1|U, {0x01f8}}},
-  {0x01fb, {1|U, {0x01fa}}},
-  {0x01fd, {1|U, {0x01fc}}},
-  {0x01ff, {1|U, {0x01fe}}},
-  {0x0201, {1|U, {0x0200}}},
-  {0x0203, {1|U, {0x0202}}},
-  {0x0205, {1|U, {0x0204}}},
-  {0x0207, {1|U, {0x0206}}},
-  {0x0209, {1|U, {0x0208}}},
-  {0x020b, {1|U, {0x020a}}},
-  {0x020d, {1|U, {0x020c}}},
-  {0x020f, {1|U, {0x020e}}},
-  {0x0211, {1|U, {0x0210}}},
-  {0x0213, {1|U, {0x0212}}},
-  {0x0215, {1|U, {0x0214}}},
-  {0x0217, {1|U, {0x0216}}},
-  {0x0219, {1|U, {0x0218}}},
-  {0x021b, {1|U, {0x021a}}},
-  {0x021d, {1|U, {0x021c}}},
-  {0x021f, {1|U, {0x021e}}},
-  {0x0223, {1|U, {0x0222}}},
-  {0x0225, {1|U, {0x0224}}},
-  {0x0227, {1|U, {0x0226}}},
-  {0x0229, {1|U, {0x0228}}},
-  {0x022b, {1|U, {0x022a}}},
-  {0x022d, {1|U, {0x022c}}},
-  {0x022f, {1|U, {0x022e}}},
-  {0x0231, {1|U, {0x0230}}},
-  {0x0233, {1|U, {0x0232}}},
-  {0x023c, {1|U, {0x023b}}},
-  {0x023f, {1|U, {0x2c7e}}},
-  {0x0240, {1|U, {0x2c7f}}},
-  {0x0242, {1|U, {0x0241}}},
-  {0x0247, {1|U, {0x0246}}},
-  {0x0249, {1|U, {0x0248}}},
-  {0x024b, {1|U, {0x024a}}},
-  {0x024d, {1|U, {0x024c}}},
-  {0x024f, {1|U, {0x024e}}},
-  {0x0250, {1|U, {0x2c6f}}},
-  {0x0251, {1|U, {0x2c6d}}},
-  {0x0252, {1|U, {0x2c70}}},
-  {0x0253, {1|U, {0x0181}}},
-  {0x0254, {1|U, {0x0186}}},
-  {0x0256, {1|U, {0x0189}}},
-  {0x0257, {1|U, {0x018a}}},
-  {0x0259, {1|U, {0x018f}}},
-  {0x025b, {1|U, {0x0190}}},
-  {0x025c, {1|U, {0xa7ab}}},
-  {0x0260, {1|U, {0x0193}}},
-  {0x0261, {1|U, {0xa7ac}}},
-  {0x0263, {1|U, {0x0194}}},
-  {0x0265, {1|U, {0xa78d}}},
-  {0x0266, {1|U, {0xa7aa}}},
-  {0x0268, {1|U, {0x0197}}},
-  {0x0269, {1|U, {0x0196}}},
-  {0x026a, {1|U, {0xa7ae}}},
-  {0x026b, {1|U, {0x2c62}}},
-  {0x026c, {1|U, {0xa7ad}}},
-  {0x026f, {1|U, {0x019c}}},
-  {0x0271, {1|U, {0x2c6e}}},
-  {0x0272, {1|U, {0x019d}}},
-  {0x0275, {1|U, {0x019f}}},
-  {0x027d, {1|U, {0x2c64}}},
-  {0x0280, {1|U, {0x01a6}}},
-  {0x0282, {1|U, {0xa7c5}}},
-  {0x0283, {1|U, {0x01a9}}},
-  {0x0287, {1|U, {0xa7b1}}},
-  {0x0288, {1|U, {0x01ae}}},
-  {0x0289, {1|U, {0x0244}}},
-  {0x028a, {1|U, {0x01b1}}},
-  {0x028b, {1|U, {0x01b2}}},
-  {0x028c, {1|U, {0x0245}}},
-  {0x0292, {1|U, {0x01b7}}},
-  {0x029d, {1|U, {0xa7b2}}},
-  {0x029e, {1|U, {0xa7b0}}},
-  {0x0371, {1|U, {0x0370}}},
-  {0x0373, {1|U, {0x0372}}},
-  {0x0377, {1|U, {0x0376}}},
-  {0x037b, {1|U, {0x03fd}}},
-  {0x037c, {1|U, {0x03fe}}},
-  {0x037d, {1|U, {0x03ff}}},
-  {0x03ac, {1|U, {0x0386}}},
-  {0x03ad, {1|U, {0x0388}}},
-  {0x03ae, {1|U, {0x0389}}},
-  {0x03af, {1|U, {0x038a}}},
-  {0x03b1, {1|U, {0x0391}}},
-  {0x03b2, {2|U, {0x0392, 0x03d0}}},
-  {0x03b3, {1|U, {0x0393}}},
-  {0x03b4, {1|U, {0x0394}}},
-  {0x03b5, {2|U, {0x0395, 0x03f5}}},
-  {0x03b6, {1|U, {0x0396}}},
-  {0x03b7, {1|U, {0x0397}}},
-  {0x03b8, {3|U, {0x0398, 0x03d1, 0x03f4}}},
-  {0x03b9, {3|U, {0x0399, 0x0345, 0x1fbe}}},
-  {0x03ba, {2|U, {0x039a, 0x03f0}}},
-  {0x03bb, {1|U, {0x039b}}},
-  {0x03bc, {2|U, {0x039c, 0x00b5}}},
-  {0x03bd, {1|U, {0x039d}}},
-  {0x03be, {1|U, {0x039e}}},
-  {0x03bf, {1|U, {0x039f}}},
-  {0x03c0, {2|U, {0x03a0, 0x03d6}}},
-  {0x03c1, {2|U, {0x03a1, 0x03f1}}},
-  {0x03c3, {2|U, {0x03a3, 0x03c2}}},
-  {0x03c4, {1|U, {0x03a4}}},
-  {0x03c5, {1|U, {0x03a5}}},
-  {0x03c6, {2|U, {0x03a6, 0x03d5}}},
-  {0x03c7, {1|U, {0x03a7}}},
-  {0x03c8, {1|U, {0x03a8}}},
-  {0x03c9, {2|U, {0x03a9, 0x2126}}},
-  {0x03ca, {1|U, {0x03aa}}},
-  {0x03cb, {1|U, {0x03ab}}},
-  {0x03cc, {1|U, {0x038c}}},
-  {0x03cd, {1|U, {0x038e}}},
-  {0x03ce, {1|U, {0x038f}}},
-  {0x03d7, {1|U, {0x03cf}}},
-  {0x03d9, {1|U, {0x03d8}}},
-  {0x03db, {1|U, {0x03da}}},
-  {0x03dd, {1|U, {0x03dc}}},
-  {0x03df, {1|U, {0x03de}}},
-  {0x03e1, {1|U, {0x03e0}}},
-  {0x03e3, {1|U, {0x03e2}}},
-  {0x03e5, {1|U, {0x03e4}}},
-  {0x03e7, {1|U, {0x03e6}}},
-  {0x03e9, {1|U, {0x03e8}}},
-  {0x03eb, {1|U, {0x03ea}}},
-  {0x03ed, {1|U, {0x03ec}}},
-  {0x03ef, {1|U, {0x03ee}}},
-  {0x03f2, {1|U, {0x03f9}}},
-  {0x03f3, {1|U, {0x037f}}},
-  {0x03f8, {1|U, {0x03f7}}},
-  {0x03fb, {1|U, {0x03fa}}},
-  {0x0430, {1|U, {0x0410}}},
-  {0x0431, {1|U, {0x0411}}},
-  {0x0432, {2|U, {0x0412, 0x1c80}}},
-  {0x0433, {1|U, {0x0413}}},
-  {0x0434, {2|U, {0x0414, 0x1c81}}},
-  {0x0435, {1|U, {0x0415}}},
-  {0x0436, {1|U, {0x0416}}},
-  {0x0437, {1|U, {0x0417}}},
-  {0x0438, {1|U, {0x0418}}},
-  {0x0439, {1|U, {0x0419}}},
-  {0x043a, {1|U, {0x041a}}},
-  {0x043b, {1|U, {0x041b}}},
-  {0x043c, {1|U, {0x041c}}},
-  {0x043d, {1|U, {0x041d}}},
-  {0x043e, {2|U, {0x041e, 0x1c82}}},
-  {0x043f, {1|U, {0x041f}}},
-  {0x0440, {1|U, {0x0420}}},
-  {0x0441, {2|U, {0x0421, 0x1c83}}},
-  {0x0442, {3|U, {0x0422, 0x1c84, 0x1c85}}},
-  {0x0443, {1|U, {0x0423}}},
-  {0x0444, {1|U, {0x0424}}},
-  {0x0445, {1|U, {0x0425}}},
-  {0x0446, {1|U, {0x0426}}},
-  {0x0447, {1|U, {0x0427}}},
-  {0x0448, {1|U, {0x0428}}},
-  {0x0449, {1|U, {0x0429}}},
-  {0x044a, {2|U, {0x042a, 0x1c86}}},
-  {0x044b, {1|U, {0x042b}}},
-  {0x044c, {1|U, {0x042c}}},
-  {0x044d, {1|U, {0x042d}}},
-  {0x044e, {1|U, {0x042e}}},
-  {0x044f, {1|U, {0x042f}}},
-  {0x0450, {1|U, {0x0400}}},
-  {0x0451, {1|U, {0x0401}}},
-  {0x0452, {1|U, {0x0402}}},
-  {0x0453, {1|U, {0x0403}}},
-  {0x0454, {1|U, {0x0404}}},
-  {0x0455, {1|U, {0x0405}}},
-  {0x0456, {1|U, {0x0406}}},
-  {0x0457, {1|U, {0x0407}}},
-  {0x0458, {1|U, {0x0408}}},
-  {0x0459, {1|U, {0x0409}}},
-  {0x045a, {1|U, {0x040a}}},
-  {0x045b, {1|U, {0x040b}}},
-  {0x045c, {1|U, {0x040c}}},
-  {0x045d, {1|U, {0x040d}}},
-  {0x045e, {1|U, {0x040e}}},
-  {0x045f, {1|U, {0x040f}}},
-  {0x0461, {1|U, {0x0460}}},
-  {0x0463, {2|U, {0x0462, 0x1c87}}},
-  {0x0465, {1|U, {0x0464}}},
-  {0x0467, {1|U, {0x0466}}},
-  {0x0469, {1|U, {0x0468}}},
-  {0x046b, {1|U, {0x046a}}},
-  {0x046d, {1|U, {0x046c}}},
-  {0x046f, {1|U, {0x046e}}},
-  {0x0471, {1|U, {0x0470}}},
-  {0x0473, {1|U, {0x0472}}},
-  {0x0475, {1|U, {0x0474}}},
-  {0x0477, {1|U, {0x0476}}},
-  {0x0479, {1|U, {0x0478}}},
-  {0x047b, {1|U, {0x047a}}},
-  {0x047d, {1|U, {0x047c}}},
-  {0x047f, {1|U, {0x047e}}},
-  {0x0481, {1|U, {0x0480}}},
-  {0x048b, {1|U, {0x048a}}},
-  {0x048d, {1|U, {0x048c}}},
-  {0x048f, {1|U, {0x048e}}},
-  {0x0491, {1|U, {0x0490}}},
-  {0x0493, {1|U, {0x0492}}},
-  {0x0495, {1|U, {0x0494}}},
-  {0x0497, {1|U, {0x0496}}},
-  {0x0499, {1|U, {0x0498}}},
-  {0x049b, {1|U, {0x049a}}},
-  {0x049d, {1|U, {0x049c}}},
-  {0x049f, {1|U, {0x049e}}},
-  {0x04a1, {1|U, {0x04a0}}},
-  {0x04a3, {1|U, {0x04a2}}},
-  {0x04a5, {1|U, {0x04a4}}},
-  {0x04a7, {1|U, {0x04a6}}},
-  {0x04a9, {1|U, {0x04a8}}},
-  {0x04ab, {1|U, {0x04aa}}},
-  {0x04ad, {1|U, {0x04ac}}},
-  {0x04af, {1|U, {0x04ae}}},
-  {0x04b1, {1|U, {0x04b0}}},
-  {0x04b3, {1|U, {0x04b2}}},
-  {0x04b5, {1|U, {0x04b4}}},
-  {0x04b7, {1|U, {0x04b6}}},
-  {0x04b9, {1|U, {0x04b8}}},
-  {0x04bb, {1|U, {0x04ba}}},
-  {0x04bd, {1|U, {0x04bc}}},
-  {0x04bf, {1|U, {0x04be}}},
-  {0x04c2, {1|U, {0x04c1}}},
-  {0x04c4, {1|U, {0x04c3}}},
-  {0x04c6, {1|U, {0x04c5}}},
-  {0x04c8, {1|U, {0x04c7}}},
-  {0x04ca, {1|U, {0x04c9}}},
-  {0x04cc, {1|U, {0x04cb}}},
-  {0x04ce, {1|U, {0x04cd}}},
-  {0x04cf, {1|U, {0x04c0}}},
-  {0x04d1, {1|U, {0x04d0}}},
-  {0x04d3, {1|U, {0x04d2}}},
-  {0x04d5, {1|U, {0x04d4}}},
-  {0x04d7, {1|U, {0x04d6}}},
-  {0x04d9, {1|U, {0x04d8}}},
-  {0x04db, {1|U, {0x04da}}},
-  {0x04dd, {1|U, {0x04dc}}},
-  {0x04df, {1|U, {0x04de}}},
-  {0x04e1, {1|U, {0x04e0}}},
-  {0x04e3, {1|U, {0x04e2}}},
-  {0x04e5, {1|U, {0x04e4}}},
-  {0x04e7, {1|U, {0x04e6}}},
-  {0x04e9, {1|U, {0x04e8}}},
-  {0x04eb, {1|U, {0x04ea}}},
-  {0x04ed, {1|U, {0x04ec}}},
-  {0x04ef, {1|U, {0x04ee}}},
-  {0x04f1, {1|U, {0x04f0}}},
-  {0x04f3, {1|U, {0x04f2}}},
-  {0x04f5, {1|U, {0x04f4}}},
-  {0x04f7, {1|U, {0x04f6}}},
-  {0x04f9, {1|U, {0x04f8}}},
-  {0x04fb, {1|U, {0x04fa}}},
-  {0x04fd, {1|U, {0x04fc}}},
-  {0x04ff, {1|U, {0x04fe}}},
-  {0x0501, {1|U, {0x0500}}},
-  {0x0503, {1|U, {0x0502}}},
-  {0x0505, {1|U, {0x0504}}},
-  {0x0507, {1|U, {0x0506}}},
-  {0x0509, {1|U, {0x0508}}},
-  {0x050b, {1|U, {0x050a}}},
-  {0x050d, {1|U, {0x050c}}},
-  {0x050f, {1|U, {0x050e}}},
-  {0x0511, {1|U, {0x0510}}},
-  {0x0513, {1|U, {0x0512}}},
-  {0x0515, {1|U, {0x0514}}},
-  {0x0517, {1|U, {0x0516}}},
-  {0x0519, {1|U, {0x0518}}},
-  {0x051b, {1|U, {0x051a}}},
-  {0x051d, {1|U, {0x051c}}},
-  {0x051f, {1|U, {0x051e}}},
-  {0x0521, {1|U, {0x0520}}},
-  {0x0523, {1|U, {0x0522}}},
-  {0x0525, {1|U, {0x0524}}},
-  {0x0527, {1|U, {0x0526}}},
-  {0x0529, {1|U, {0x0528}}},
-  {0x052b, {1|U, {0x052a}}},
-  {0x052d, {1|U, {0x052c}}},
-  {0x052f, {1|U, {0x052e}}},
-  {0x0561, {1|U, {0x0531}}},
-  {0x0562, {1|U, {0x0532}}},
-  {0x0563, {1|U, {0x0533}}},
-  {0x0564, {1|U, {0x0534}}},
-  {0x0565, {1|U, {0x0535}}},
-  {0x0566, {1|U, {0x0536}}},
-  {0x0567, {1|U, {0x0537}}},
-  {0x0568, {1|U, {0x0538}}},
-  {0x0569, {1|U, {0x0539}}},
-  {0x056a, {1|U, {0x053a}}},
-  {0x056b, {1|U, {0x053b}}},
-  {0x056c, {1|U, {0x053c}}},
-  {0x056d, {1|U, {0x053d}}},
-  {0x056e, {1|U, {0x053e}}},
-  {0x056f, {1|U, {0x053f}}},
-  {0x0570, {1|U, {0x0540}}},
-  {0x0571, {1|U, {0x0541}}},
-  {0x0572, {1|U, {0x0542}}},
-  {0x0573, {1|U, {0x0543}}},
-  {0x0574, {1|U, {0x0544}}},
-  {0x0575, {1|U, {0x0545}}},
-  {0x0576, {1|U, {0x0546}}},
-  {0x0577, {1|U, {0x0547}}},
-  {0x0578, {1|U, {0x0548}}},
-  {0x0579, {1|U, {0x0549}}},
-  {0x057a, {1|U, {0x054a}}},
-  {0x057b, {1|U, {0x054b}}},
-  {0x057c, {1|U, {0x054c}}},
-  {0x057d, {1|U, {0x054d}}},
-  {0x057e, {1|U, {0x054e}}},
-  {0x057f, {1|U, {0x054f}}},
-  {0x0580, {1|U, {0x0550}}},
-  {0x0581, {1|U, {0x0551}}},
-  {0x0582, {1|U, {0x0552}}},
-  {0x0583, {1|U, {0x0553}}},
-  {0x0584, {1|U, {0x0554}}},
-  {0x0585, {1|U, {0x0555}}},
-  {0x0586, {1|U, {0x0556}}},
-  {0x10d0, {1|U|IT, {0x1c90}}},
-  {0x10d1, {1|U|IT, {0x1c91}}},
-  {0x10d2, {1|U|IT, {0x1c92}}},
-  {0x10d3, {1|U|IT, {0x1c93}}},
-  {0x10d4, {1|U|IT, {0x1c94}}},
-  {0x10d5, {1|U|IT, {0x1c95}}},
-  {0x10d6, {1|U|IT, {0x1c96}}},
-  {0x10d7, {1|U|IT, {0x1c97}}},
-  {0x10d8, {1|U|IT, {0x1c98}}},
-  {0x10d9, {1|U|IT, {0x1c99}}},
-  {0x10da, {1|U|IT, {0x1c9a}}},
-  {0x10db, {1|U|IT, {0x1c9b}}},
-  {0x10dc, {1|U|IT, {0x1c9c}}},
-  {0x10dd, {1|U|IT, {0x1c9d}}},
-  {0x10de, {1|U|IT, {0x1c9e}}},
-  {0x10df, {1|U|IT, {0x1c9f}}},
-  {0x10e0, {1|U|IT, {0x1ca0}}},
-  {0x10e1, {1|U|IT, {0x1ca1}}},
-  {0x10e2, {1|U|IT, {0x1ca2}}},
-  {0x10e3, {1|U|IT, {0x1ca3}}},
-  {0x10e4, {1|U|IT, {0x1ca4}}},
-  {0x10e5, {1|U|IT, {0x1ca5}}},
-  {0x10e6, {1|U|IT, {0x1ca6}}},
-  {0x10e7, {1|U|IT, {0x1ca7}}},
-  {0x10e8, {1|U|IT, {0x1ca8}}},
-  {0x10e9, {1|U|IT, {0x1ca9}}},
-  {0x10ea, {1|U|IT, {0x1caa}}},
-  {0x10eb, {1|U|IT, {0x1cab}}},
-  {0x10ec, {1|U|IT, {0x1cac}}},
-  {0x10ed, {1|U|IT, {0x1cad}}},
-  {0x10ee, {1|U|IT, {0x1cae}}},
-  {0x10ef, {1|U|IT, {0x1caf}}},
-  {0x10f0, {1|U|IT, {0x1cb0}}},
-  {0x10f1, {1|U|IT, {0x1cb1}}},
-  {0x10f2, {1|U|IT, {0x1cb2}}},
-  {0x10f3, {1|U|IT, {0x1cb3}}},
-  {0x10f4, {1|U|IT, {0x1cb4}}},
-  {0x10f5, {1|U|IT, {0x1cb5}}},
-  {0x10f6, {1|U|IT, {0x1cb6}}},
-  {0x10f7, {1|U|IT, {0x1cb7}}},
-  {0x10f8, {1|U|IT, {0x1cb8}}},
-  {0x10f9, {1|U|IT, {0x1cb9}}},
-  {0x10fa, {1|U|IT, {0x1cba}}},
-  {0x10fd, {1|U|IT, {0x1cbd}}},
-  {0x10fe, {1|U|IT, {0x1cbe}}},
-  {0x10ff, {1|U|IT, {0x1cbf}}},
-  {0x13a0, {1|D, {0xab70}}},
-  {0x13a1, {1|D, {0xab71}}},
-  {0x13a2, {1|D, {0xab72}}},
-  {0x13a3, {1|D, {0xab73}}},
-  {0x13a4, {1|D, {0xab74}}},
-  {0x13a5, {1|D, {0xab75}}},
-  {0x13a6, {1|D, {0xab76}}},
-  {0x13a7, {1|D, {0xab77}}},
-  {0x13a8, {1|D, {0xab78}}},
-  {0x13a9, {1|D, {0xab79}}},
-  {0x13aa, {1|D, {0xab7a}}},
-  {0x13ab, {1|D, {0xab7b}}},
-  {0x13ac, {1|D, {0xab7c}}},
-  {0x13ad, {1|D, {0xab7d}}},
-  {0x13ae, {1|D, {0xab7e}}},
-  {0x13af, {1|D, {0xab7f}}},
-  {0x13b0, {1|D, {0xab80}}},
-  {0x13b1, {1|D, {0xab81}}},
-  {0x13b2, {1|D, {0xab82}}},
-  {0x13b3, {1|D, {0xab83}}},
-  {0x13b4, {1|D, {0xab84}}},
-  {0x13b5, {1|D, {0xab85}}},
-  {0x13b6, {1|D, {0xab86}}},
-  {0x13b7, {1|D, {0xab87}}},
-  {0x13b8, {1|D, {0xab88}}},
-  {0x13b9, {1|D, {0xab89}}},
-  {0x13ba, {1|D, {0xab8a}}},
-  {0x13bb, {1|D, {0xab8b}}},
-  {0x13bc, {1|D, {0xab8c}}},
-  {0x13bd, {1|D, {0xab8d}}},
-  {0x13be, {1|D, {0xab8e}}},
-  {0x13bf, {1|D, {0xab8f}}},
-  {0x13c0, {1|D, {0xab90}}},
-  {0x13c1, {1|D, {0xab91}}},
-  {0x13c2, {1|D, {0xab92}}},
-  {0x13c3, {1|D, {0xab93}}},
-  {0x13c4, {1|D, {0xab94}}},
-  {0x13c5, {1|D, {0xab95}}},
-  {0x13c6, {1|D, {0xab96}}},
-  {0x13c7, {1|D, {0xab97}}},
-  {0x13c8, {1|D, {0xab98}}},
-  {0x13c9, {1|D, {0xab99}}},
-  {0x13ca, {1|D, {0xab9a}}},
-  {0x13cb, {1|D, {0xab9b}}},
-  {0x13cc, {1|D, {0xab9c}}},
-  {0x13cd, {1|D, {0xab9d}}},
-  {0x13ce, {1|D, {0xab9e}}},
-  {0x13cf, {1|D, {0xab9f}}},
-  {0x13d0, {1|D, {0xaba0}}},
-  {0x13d1, {1|D, {0xaba1}}},
-  {0x13d2, {1|D, {0xaba2}}},
-  {0x13d3, {1|D, {0xaba3}}},
-  {0x13d4, {1|D, {0xaba4}}},
-  {0x13d5, {1|D, {0xaba5}}},
-  {0x13d6, {1|D, {0xaba6}}},
-  {0x13d7, {1|D, {0xaba7}}},
-  {0x13d8, {1|D, {0xaba8}}},
-  {0x13d9, {1|D, {0xaba9}}},
-  {0x13da, {1|D, {0xabaa}}},
-  {0x13db, {1|D, {0xabab}}},
-  {0x13dc, {1|D, {0xabac}}},
-  {0x13dd, {1|D, {0xabad}}},
-  {0x13de, {1|D, {0xabae}}},
-  {0x13df, {1|D, {0xabaf}}},
-  {0x13e0, {1|D, {0xabb0}}},
-  {0x13e1, {1|D, {0xabb1}}},
-  {0x13e2, {1|D, {0xabb2}}},
-  {0x13e3, {1|D, {0xabb3}}},
-  {0x13e4, {1|D, {0xabb4}}},
-  {0x13e5, {1|D, {0xabb5}}},
-  {0x13e6, {1|D, {0xabb6}}},
-  {0x13e7, {1|D, {0xabb7}}},
-  {0x13e8, {1|D, {0xabb8}}},
-  {0x13e9, {1|D, {0xabb9}}},
-  {0x13ea, {1|D, {0xabba}}},
-  {0x13eb, {1|D, {0xabbb}}},
-  {0x13ec, {1|D, {0xabbc}}},
-  {0x13ed, {1|D, {0xabbd}}},
-  {0x13ee, {1|D, {0xabbe}}},
-  {0x13ef, {1|D, {0xabbf}}},
-  {0x13f0, {1|D, {0x13f8}}},
-  {0x13f1, {1|D, {0x13f9}}},
-  {0x13f2, {1|D, {0x13fa}}},
-  {0x13f3, {1|D, {0x13fb}}},
-  {0x13f4, {1|D, {0x13fc}}},
-  {0x13f5, {1|D, {0x13fd}}},
-  {0x1d79, {1|U, {0xa77d}}},
-  {0x1d7d, {1|U, {0x2c63}}},
-  {0x1d8e, {1|U, {0xa7c6}}},
-  {0x1e01, {1|U, {0x1e00}}},
-  {0x1e03, {1|U, {0x1e02}}},
-  {0x1e05, {1|U, {0x1e04}}},
-  {0x1e07, {1|U, {0x1e06}}},
-  {0x1e09, {1|U, {0x1e08}}},
-  {0x1e0b, {1|U, {0x1e0a}}},
-  {0x1e0d, {1|U, {0x1e0c}}},
-  {0x1e0f, {1|U, {0x1e0e}}},
-  {0x1e11, {1|U, {0x1e10}}},
-  {0x1e13, {1|U, {0x1e12}}},
-  {0x1e15, {1|U, {0x1e14}}},
-  {0x1e17, {1|U, {0x1e16}}},
-  {0x1e19, {1|U, {0x1e18}}},
-  {0x1e1b, {1|U, {0x1e1a}}},
-  {0x1e1d, {1|U, {0x1e1c}}},
-  {0x1e1f, {1|U, {0x1e1e}}},
-  {0x1e21, {1|U, {0x1e20}}},
-  {0x1e23, {1|U, {0x1e22}}},
-  {0x1e25, {1|U, {0x1e24}}},
-  {0x1e27, {1|U, {0x1e26}}},
-  {0x1e29, {1|U, {0x1e28}}},
-  {0x1e2b, {1|U, {0x1e2a}}},
-  {0x1e2d, {1|U, {0x1e2c}}},
-  {0x1e2f, {1|U, {0x1e2e}}},
-  {0x1e31, {1|U, {0x1e30}}},
-  {0x1e33, {1|U, {0x1e32}}},
-  {0x1e35, {1|U, {0x1e34}}},
-  {0x1e37, {1|U, {0x1e36}}},
-  {0x1e39, {1|U, {0x1e38}}},
-  {0x1e3b, {1|U, {0x1e3a}}},
-  {0x1e3d, {1|U, {0x1e3c}}},
-  {0x1e3f, {1|U, {0x1e3e}}},
-  {0x1e41, {1|U, {0x1e40}}},
-  {0x1e43, {1|U, {0x1e42}}},
-  {0x1e45, {1|U, {0x1e44}}},
-  {0x1e47, {1|U, {0x1e46}}},
-  {0x1e49, {1|U, {0x1e48}}},
-  {0x1e4b, {1|U, {0x1e4a}}},
-  {0x1e4d, {1|U, {0x1e4c}}},
-  {0x1e4f, {1|U, {0x1e4e}}},
-  {0x1e51, {1|U, {0x1e50}}},
-  {0x1e53, {1|U, {0x1e52}}},
-  {0x1e55, {1|U, {0x1e54}}},
-  {0x1e57, {1|U, {0x1e56}}},
-  {0x1e59, {1|U, {0x1e58}}},
-  {0x1e5b, {1|U, {0x1e5a}}},
-  {0x1e5d, {1|U, {0x1e5c}}},
-  {0x1e5f, {1|U, {0x1e5e}}},
-  {0x1e61, {2|U, {0x1e60, 0x1e9b}}},
-  {0x1e63, {1|U, {0x1e62}}},
-  {0x1e65, {1|U, {0x1e64}}},
-  {0x1e67, {1|U, {0x1e66}}},
-  {0x1e69, {1|U, {0x1e68}}},
-  {0x1e6b, {1|U, {0x1e6a}}},
-  {0x1e6d, {1|U, {0x1e6c}}},
-  {0x1e6f, {1|U, {0x1e6e}}},
-  {0x1e71, {1|U, {0x1e70}}},
-  {0x1e73, {1|U, {0x1e72}}},
-  {0x1e75, {1|U, {0x1e74}}},
-  {0x1e77, {1|U, {0x1e76}}},
-  {0x1e79, {1|U, {0x1e78}}},
-  {0x1e7b, {1|U, {0x1e7a}}},
-  {0x1e7d, {1|U, {0x1e7c}}},
-  {0x1e7f, {1|U, {0x1e7e}}},
-  {0x1e81, {1|U, {0x1e80}}},
-  {0x1e83, {1|U, {0x1e82}}},
-  {0x1e85, {1|U, {0x1e84}}},
-  {0x1e87, {1|U, {0x1e86}}},
-  {0x1e89, {1|U, {0x1e88}}},
-  {0x1e8b, {1|U, {0x1e8a}}},
-  {0x1e8d, {1|U, {0x1e8c}}},
-  {0x1e8f, {1|U, {0x1e8e}}},
-  {0x1e91, {1|U, {0x1e90}}},
-  {0x1e93, {1|U, {0x1e92}}},
-  {0x1e95, {1|U, {0x1e94}}},
-  {0x1ea1, {1|U, {0x1ea0}}},
-  {0x1ea3, {1|U, {0x1ea2}}},
-  {0x1ea5, {1|U, {0x1ea4}}},
-  {0x1ea7, {1|U, {0x1ea6}}},
-  {0x1ea9, {1|U, {0x1ea8}}},
-  {0x1eab, {1|U, {0x1eaa}}},
-  {0x1ead, {1|U, {0x1eac}}},
-  {0x1eaf, {1|U, {0x1eae}}},
-  {0x1eb1, {1|U, {0x1eb0}}},
-  {0x1eb3, {1|U, {0x1eb2}}},
-  {0x1eb5, {1|U, {0x1eb4}}},
-  {0x1eb7, {1|U, {0x1eb6}}},
-  {0x1eb9, {1|U, {0x1eb8}}},
-  {0x1ebb, {1|U, {0x1eba}}},
-  {0x1ebd, {1|U, {0x1ebc}}},
-  {0x1ebf, {1|U, {0x1ebe}}},
-  {0x1ec1, {1|U, {0x1ec0}}},
-  {0x1ec3, {1|U, {0x1ec2}}},
-  {0x1ec5, {1|U, {0x1ec4}}},
-  {0x1ec7, {1|U, {0x1ec6}}},
-  {0x1ec9, {1|U, {0x1ec8}}},
-  {0x1ecb, {1|U, {0x1eca}}},
-  {0x1ecd, {1|U, {0x1ecc}}},
-  {0x1ecf, {1|U, {0x1ece}}},
-  {0x1ed1, {1|U, {0x1ed0}}},
-  {0x1ed3, {1|U, {0x1ed2}}},
-  {0x1ed5, {1|U, {0x1ed4}}},
-  {0x1ed7, {1|U, {0x1ed6}}},
-  {0x1ed9, {1|U, {0x1ed8}}},
-  {0x1edb, {1|U, {0x1eda}}},
-  {0x1edd, {1|U, {0x1edc}}},
-  {0x1edf, {1|U, {0x1ede}}},
-  {0x1ee1, {1|U, {0x1ee0}}},
-  {0x1ee3, {1|U, {0x1ee2}}},
-  {0x1ee5, {1|U, {0x1ee4}}},
-  {0x1ee7, {1|U, {0x1ee6}}},
-  {0x1ee9, {1|U, {0x1ee8}}},
-  {0x1eeb, {1|U, {0x1eea}}},
-  {0x1eed, {1|U, {0x1eec}}},
-  {0x1eef, {1|U, {0x1eee}}},
-  {0x1ef1, {1|U, {0x1ef0}}},
-  {0x1ef3, {1|U, {0x1ef2}}},
-  {0x1ef5, {1|U, {0x1ef4}}},
-  {0x1ef7, {1|U, {0x1ef6}}},
-  {0x1ef9, {1|U, {0x1ef8}}},
-  {0x1efb, {1|U, {0x1efa}}},
-  {0x1efd, {1|U, {0x1efc}}},
-  {0x1eff, {1|U, {0x1efe}}},
-  {0x1f00, {1|U, {0x1f08}}},
-  {0x1f01, {1|U, {0x1f09}}},
-  {0x1f02, {1|U, {0x1f0a}}},
-  {0x1f03, {1|U, {0x1f0b}}},
-  {0x1f04, {1|U, {0x1f0c}}},
-  {0x1f05, {1|U, {0x1f0d}}},
-  {0x1f06, {1|U, {0x1f0e}}},
-  {0x1f07, {1|U, {0x1f0f}}},
-  {0x1f10, {1|U, {0x1f18}}},
-  {0x1f11, {1|U, {0x1f19}}},
-  {0x1f12, {1|U, {0x1f1a}}},
-  {0x1f13, {1|U, {0x1f1b}}},
-  {0x1f14, {1|U, {0x1f1c}}},
-  {0x1f15, {1|U, {0x1f1d}}},
-  {0x1f20, {1|U, {0x1f28}}},
-  {0x1f21, {1|U, {0x1f29}}},
-  {0x1f22, {1|U, {0x1f2a}}},
-  {0x1f23, {1|U, {0x1f2b}}},
-  {0x1f24, {1|U, {0x1f2c}}},
-  {0x1f25, {1|U, {0x1f2d}}},
-  {0x1f26, {1|U, {0x1f2e}}},
-  {0x1f27, {1|U, {0x1f2f}}},
-  {0x1f30, {1|U, {0x1f38}}},
-  {0x1f31, {1|U, {0x1f39}}},
-  {0x1f32, {1|U, {0x1f3a}}},
-  {0x1f33, {1|U, {0x1f3b}}},
-  {0x1f34, {1|U, {0x1f3c}}},
-  {0x1f35, {1|U, {0x1f3d}}},
-  {0x1f36, {1|U, {0x1f3e}}},
-  {0x1f37, {1|U, {0x1f3f}}},
-  {0x1f40, {1|U, {0x1f48}}},
-  {0x1f41, {1|U, {0x1f49}}},
-  {0x1f42, {1|U, {0x1f4a}}},
-  {0x1f43, {1|U, {0x1f4b}}},
-  {0x1f44, {1|U, {0x1f4c}}},
-  {0x1f45, {1|U, {0x1f4d}}},
-  {0x1f51, {1|U, {0x1f59}}},
-  {0x1f53, {1|U, {0x1f5b}}},
-  {0x1f55, {1|U, {0x1f5d}}},
-  {0x1f57, {1|U, {0x1f5f}}},
-  {0x1f60, {1|U, {0x1f68}}},
-  {0x1f61, {1|U, {0x1f69}}},
-  {0x1f62, {1|U, {0x1f6a}}},
-  {0x1f63, {1|U, {0x1f6b}}},
-  {0x1f64, {1|U, {0x1f6c}}},
-  {0x1f65, {1|U, {0x1f6d}}},
-  {0x1f66, {1|U, {0x1f6e}}},
-  {0x1f67, {1|U, {0x1f6f}}},
-  {0x1f70, {1|U, {0x1fba}}},
-  {0x1f71, {1|U, {0x1fbb}}},
-  {0x1f72, {1|U, {0x1fc8}}},
-  {0x1f73, {1|U, {0x1fc9}}},
-  {0x1f74, {1|U, {0x1fca}}},
-  {0x1f75, {1|U, {0x1fcb}}},
-  {0x1f76, {1|U, {0x1fda}}},
-  {0x1f77, {1|U, {0x1fdb}}},
-  {0x1f78, {1|U, {0x1ff8}}},
-  {0x1f79, {1|U, {0x1ff9}}},
-  {0x1f7a, {1|U, {0x1fea}}},
-  {0x1f7b, {1|U, {0x1feb}}},
-  {0x1f7c, {1|U, {0x1ffa}}},
-  {0x1f7d, {1|U, {0x1ffb}}},
-  {0x1fb0, {1|U, {0x1fb8}}},
-  {0x1fb1, {1|U, {0x1fb9}}},
-  {0x1fd0, {1|U, {0x1fd8}}},
-  {0x1fd1, {1|U, {0x1fd9}}},
-  {0x1fe0, {1|U, {0x1fe8}}},
-  {0x1fe1, {1|U, {0x1fe9}}},
-  {0x1fe5, {1|U, {0x1fec}}},
-  {0x214e, {1|U, {0x2132}}},
-  {0x2170, {1|U, {0x2160}}},
-  {0x2171, {1|U, {0x2161}}},
-  {0x2172, {1|U, {0x2162}}},
-  {0x2173, {1|U, {0x2163}}},
-  {0x2174, {1|U, {0x2164}}},
-  {0x2175, {1|U, {0x2165}}},
-  {0x2176, {1|U, {0x2166}}},
-  {0x2177, {1|U, {0x2167}}},
-  {0x2178, {1|U, {0x2168}}},
-  {0x2179, {1|U, {0x2169}}},
-  {0x217a, {1|U, {0x216a}}},
-  {0x217b, {1|U, {0x216b}}},
-  {0x217c, {1|U, {0x216c}}},
-  {0x217d, {1|U, {0x216d}}},
-  {0x217e, {1|U, {0x216e}}},
-  {0x217f, {1|U, {0x216f}}},
-  {0x2184, {1|U, {0x2183}}},
-  {0x24d0, {1|U, {0x24b6}}},
-  {0x24d1, {1|U, {0x24b7}}},
-  {0x24d2, {1|U, {0x24b8}}},
-  {0x24d3, {1|U, {0x24b9}}},
-  {0x24d4, {1|U, {0x24ba}}},
-  {0x24d5, {1|U, {0x24bb}}},
-  {0x24d6, {1|U, {0x24bc}}},
-  {0x24d7, {1|U, {0x24bd}}},
-  {0x24d8, {1|U, {0x24be}}},
-  {0x24d9, {1|U, {0x24bf}}},
-  {0x24da, {1|U, {0x24c0}}},
-  {0x24db, {1|U, {0x24c1}}},
-  {0x24dc, {1|U, {0x24c2}}},
-  {0x24dd, {1|U, {0x24c3}}},
-  {0x24de, {1|U, {0x24c4}}},
-  {0x24df, {1|U, {0x24c5}}},
-  {0x24e0, {1|U, {0x24c6}}},
-  {0x24e1, {1|U, {0x24c7}}},
-  {0x24e2, {1|U, {0x24c8}}},
-  {0x24e3, {1|U, {0x24c9}}},
-  {0x24e4, {1|U, {0x24ca}}},
-  {0x24e5, {1|U, {0x24cb}}},
-  {0x24e6, {1|U, {0x24cc}}},
-  {0x24e7, {1|U, {0x24cd}}},
-  {0x24e8, {1|U, {0x24ce}}},
-  {0x24e9, {1|U, {0x24cf}}},
-  {0x2c30, {1|U, {0x2c00}}},
-  {0x2c31, {1|U, {0x2c01}}},
-  {0x2c32, {1|U, {0x2c02}}},
-  {0x2c33, {1|U, {0x2c03}}},
-  {0x2c34, {1|U, {0x2c04}}},
-  {0x2c35, {1|U, {0x2c05}}},
-  {0x2c36, {1|U, {0x2c06}}},
-  {0x2c37, {1|U, {0x2c07}}},
-  {0x2c38, {1|U, {0x2c08}}},
-  {0x2c39, {1|U, {0x2c09}}},
-  {0x2c3a, {1|U, {0x2c0a}}},
-  {0x2c3b, {1|U, {0x2c0b}}},
-  {0x2c3c, {1|U, {0x2c0c}}},
-  {0x2c3d, {1|U, {0x2c0d}}},
-  {0x2c3e, {1|U, {0x2c0e}}},
-  {0x2c3f, {1|U, {0x2c0f}}},
-  {0x2c40, {1|U, {0x2c10}}},
-  {0x2c41, {1|U, {0x2c11}}},
-  {0x2c42, {1|U, {0x2c12}}},
-  {0x2c43, {1|U, {0x2c13}}},
-  {0x2c44, {1|U, {0x2c14}}},
-  {0x2c45, {1|U, {0x2c15}}},
-  {0x2c46, {1|U, {0x2c16}}},
-  {0x2c47, {1|U, {0x2c17}}},
-  {0x2c48, {1|U, {0x2c18}}},
-  {0x2c49, {1|U, {0x2c19}}},
-  {0x2c4a, {1|U, {0x2c1a}}},
-  {0x2c4b, {1|U, {0x2c1b}}},
-  {0x2c4c, {1|U, {0x2c1c}}},
-  {0x2c4d, {1|U, {0x2c1d}}},
-  {0x2c4e, {1|U, {0x2c1e}}},
-  {0x2c4f, {1|U, {0x2c1f}}},
-  {0x2c50, {1|U, {0x2c20}}},
-  {0x2c51, {1|U, {0x2c21}}},
-  {0x2c52, {1|U, {0x2c22}}},
-  {0x2c53, {1|U, {0x2c23}}},
-  {0x2c54, {1|U, {0x2c24}}},
-  {0x2c55, {1|U, {0x2c25}}},
-  {0x2c56, {1|U, {0x2c26}}},
-  {0x2c57, {1|U, {0x2c27}}},
-  {0x2c58, {1|U, {0x2c28}}},
-  {0x2c59, {1|U, {0x2c29}}},
-  {0x2c5a, {1|U, {0x2c2a}}},
-  {0x2c5b, {1|U, {0x2c2b}}},
-  {0x2c5c, {1|U, {0x2c2c}}},
-  {0x2c5d, {1|U, {0x2c2d}}},
-  {0x2c5e, {1|U, {0x2c2e}}},
-  {0x2c5f, {1|U, {0x2c2f}}},
-  {0x2c61, {1|U, {0x2c60}}},
-  {0x2c65, {1|U, {0x023a}}},
-  {0x2c66, {1|U, {0x023e}}},
-  {0x2c68, {1|U, {0x2c67}}},
-  {0x2c6a, {1|U, {0x2c69}}},
-  {0x2c6c, {1|U, {0x2c6b}}},
-  {0x2c73, {1|U, {0x2c72}}},
-  {0x2c76, {1|U, {0x2c75}}},
-  {0x2c81, {1|U, {0x2c80}}},
-  {0x2c83, {1|U, {0x2c82}}},
-  {0x2c85, {1|U, {0x2c84}}},
-  {0x2c87, {1|U, {0x2c86}}},
-  {0x2c89, {1|U, {0x2c88}}},
-  {0x2c8b, {1|U, {0x2c8a}}},
-  {0x2c8d, {1|U, {0x2c8c}}},
-  {0x2c8f, {1|U, {0x2c8e}}},
-  {0x2c91, {1|U, {0x2c90}}},
-  {0x2c93, {1|U, {0x2c92}}},
-  {0x2c95, {1|U, {0x2c94}}},
-  {0x2c97, {1|U, {0x2c96}}},
-  {0x2c99, {1|U, {0x2c98}}},
-  {0x2c9b, {1|U, {0x2c9a}}},
-  {0x2c9d, {1|U, {0x2c9c}}},
-  {0x2c9f, {1|U, {0x2c9e}}},
-  {0x2ca1, {1|U, {0x2ca0}}},
-  {0x2ca3, {1|U, {0x2ca2}}},
-  {0x2ca5, {1|U, {0x2ca4}}},
-  {0x2ca7, {1|U, {0x2ca6}}},
-  {0x2ca9, {1|U, {0x2ca8}}},
-  {0x2cab, {1|U, {0x2caa}}},
-  {0x2cad, {1|U, {0x2cac}}},
-  {0x2caf, {1|U, {0x2cae}}},
-  {0x2cb1, {1|U, {0x2cb0}}},
-  {0x2cb3, {1|U, {0x2cb2}}},
-  {0x2cb5, {1|U, {0x2cb4}}},
-  {0x2cb7, {1|U, {0x2cb6}}},
-  {0x2cb9, {1|U, {0x2cb8}}},
-  {0x2cbb, {1|U, {0x2cba}}},
-  {0x2cbd, {1|U, {0x2cbc}}},
-  {0x2cbf, {1|U, {0x2cbe}}},
-  {0x2cc1, {1|U, {0x2cc0}}},
-  {0x2cc3, {1|U, {0x2cc2}}},
-  {0x2cc5, {1|U, {0x2cc4}}},
-  {0x2cc7, {1|U, {0x2cc6}}},
-  {0x2cc9, {1|U, {0x2cc8}}},
-  {0x2ccb, {1|U, {0x2cca}}},
-  {0x2ccd, {1|U, {0x2ccc}}},
-  {0x2ccf, {1|U, {0x2cce}}},
-  {0x2cd1, {1|U, {0x2cd0}}},
-  {0x2cd3, {1|U, {0x2cd2}}},
-  {0x2cd5, {1|U, {0x2cd4}}},
-  {0x2cd7, {1|U, {0x2cd6}}},
-  {0x2cd9, {1|U, {0x2cd8}}},
-  {0x2cdb, {1|U, {0x2cda}}},
-  {0x2cdd, {1|U, {0x2cdc}}},
-  {0x2cdf, {1|U, {0x2cde}}},
-  {0x2ce1, {1|U, {0x2ce0}}},
-  {0x2ce3, {1|U, {0x2ce2}}},
-  {0x2cec, {1|U, {0x2ceb}}},
-  {0x2cee, {1|U, {0x2ced}}},
-  {0x2cf3, {1|U, {0x2cf2}}},
-  {0x2d00, {1|U, {0x10a0}}},
-  {0x2d01, {1|U, {0x10a1}}},
-  {0x2d02, {1|U, {0x10a2}}},
-  {0x2d03, {1|U, {0x10a3}}},
-  {0x2d04, {1|U, {0x10a4}}},
-  {0x2d05, {1|U, {0x10a5}}},
-  {0x2d06, {1|U, {0x10a6}}},
-  {0x2d07, {1|U, {0x10a7}}},
-  {0x2d08, {1|U, {0x10a8}}},
-  {0x2d09, {1|U, {0x10a9}}},
-  {0x2d0a, {1|U, {0x10aa}}},
-  {0x2d0b, {1|U, {0x10ab}}},
-  {0x2d0c, {1|U, {0x10ac}}},
-  {0x2d0d, {1|U, {0x10ad}}},
-  {0x2d0e, {1|U, {0x10ae}}},
-  {0x2d0f, {1|U, {0x10af}}},
-  {0x2d10, {1|U, {0x10b0}}},
-  {0x2d11, {1|U, {0x10b1}}},
-  {0x2d12, {1|U, {0x10b2}}},
-  {0x2d13, {1|U, {0x10b3}}},
-  {0x2d14, {1|U, {0x10b4}}},
-  {0x2d15, {1|U, {0x10b5}}},
-  {0x2d16, {1|U, {0x10b6}}},
-  {0x2d17, {1|U, {0x10b7}}},
-  {0x2d18, {1|U, {0x10b8}}},
-  {0x2d19, {1|U, {0x10b9}}},
-  {0x2d1a, {1|U, {0x10ba}}},
-  {0x2d1b, {1|U, {0x10bb}}},
-  {0x2d1c, {1|U, {0x10bc}}},
-  {0x2d1d, {1|U, {0x10bd}}},
-  {0x2d1e, {1|U, {0x10be}}},
-  {0x2d1f, {1|U, {0x10bf}}},
-  {0x2d20, {1|U, {0x10c0}}},
-  {0x2d21, {1|U, {0x10c1}}},
-  {0x2d22, {1|U, {0x10c2}}},
-  {0x2d23, {1|U, {0x10c3}}},
-  {0x2d24, {1|U, {0x10c4}}},
-  {0x2d25, {1|U, {0x10c5}}},
-  {0x2d27, {1|U, {0x10c7}}},
-  {0x2d2d, {1|U, {0x10cd}}},
-  {0xa641, {1|U, {0xa640}}},
-  {0xa643, {1|U, {0xa642}}},
-  {0xa645, {1|U, {0xa644}}},
-  {0xa647, {1|U, {0xa646}}},
-  {0xa649, {1|U, {0xa648}}},
-  {0xa64b, {2|U, {0xa64a, 0x1c88}}},
-  {0xa64d, {1|U, {0xa64c}}},
-  {0xa64f, {1|U, {0xa64e}}},
-  {0xa651, {1|U, {0xa650}}},
-  {0xa653, {1|U, {0xa652}}},
-  {0xa655, {1|U, {0xa654}}},
-  {0xa657, {1|U, {0xa656}}},
-  {0xa659, {1|U, {0xa658}}},
-  {0xa65b, {1|U, {0xa65a}}},
-  {0xa65d, {1|U, {0xa65c}}},
-  {0xa65f, {1|U, {0xa65e}}},
-  {0xa661, {1|U, {0xa660}}},
-  {0xa663, {1|U, {0xa662}}},
-  {0xa665, {1|U, {0xa664}}},
-  {0xa667, {1|U, {0xa666}}},
-  {0xa669, {1|U, {0xa668}}},
-  {0xa66b, {1|U, {0xa66a}}},
-  {0xa66d, {1|U, {0xa66c}}},
-  {0xa681, {1|U, {0xa680}}},
-  {0xa683, {1|U, {0xa682}}},
-  {0xa685, {1|U, {0xa684}}},
-  {0xa687, {1|U, {0xa686}}},
-  {0xa689, {1|U, {0xa688}}},
-  {0xa68b, {1|U, {0xa68a}}},
-  {0xa68d, {1|U, {0xa68c}}},
-  {0xa68f, {1|U, {0xa68e}}},
-  {0xa691, {1|U, {0xa690}}},
-  {0xa693, {1|U, {0xa692}}},
-  {0xa695, {1|U, {0xa694}}},
-  {0xa697, {1|U, {0xa696}}},
-  {0xa699, {1|U, {0xa698}}},
-  {0xa69b, {1|U, {0xa69a}}},
-  {0xa723, {1|U, {0xa722}}},
-  {0xa725, {1|U, {0xa724}}},
-  {0xa727, {1|U, {0xa726}}},
-  {0xa729, {1|U, {0xa728}}},
-  {0xa72b, {1|U, {0xa72a}}},
-  {0xa72d, {1|U, {0xa72c}}},
-  {0xa72f, {1|U, {0xa72e}}},
-  {0xa733, {1|U, {0xa732}}},
-  {0xa735, {1|U, {0xa734}}},
-  {0xa737, {1|U, {0xa736}}},
-  {0xa739, {1|U, {0xa738}}},
-  {0xa73b, {1|U, {0xa73a}}},
-  {0xa73d, {1|U, {0xa73c}}},
-  {0xa73f, {1|U, {0xa73e}}},
-  {0xa741, {1|U, {0xa740}}},
-  {0xa743, {1|U, {0xa742}}},
-  {0xa745, {1|U, {0xa744}}},
-  {0xa747, {1|U, {0xa746}}},
-  {0xa749, {1|U, {0xa748}}},
-  {0xa74b, {1|U, {0xa74a}}},
-  {0xa74d, {1|U, {0xa74c}}},
-  {0xa74f, {1|U, {0xa74e}}},
-  {0xa751, {1|U, {0xa750}}},
-  {0xa753, {1|U, {0xa752}}},
-  {0xa755, {1|U, {0xa754}}},
-  {0xa757, {1|U, {0xa756}}},
-  {0xa759, {1|U, {0xa758}}},
-  {0xa75b, {1|U, {0xa75a}}},
-  {0xa75d, {1|U, {0xa75c}}},
-  {0xa75f, {1|U, {0xa75e}}},
-  {0xa761, {1|U, {0xa760}}},
-  {0xa763, {1|U, {0xa762}}},
-  {0xa765, {1|U, {0xa764}}},
-  {0xa767, {1|U, {0xa766}}},
-  {0xa769, {1|U, {0xa768}}},
-  {0xa76b, {1|U, {0xa76a}}},
-  {0xa76d, {1|U, {0xa76c}}},
-  {0xa76f, {1|U, {0xa76e}}},
-  {0xa77a, {1|U, {0xa779}}},
-  {0xa77c, {1|U, {0xa77b}}},
-  {0xa77f, {1|U, {0xa77e}}},
-  {0xa781, {1|U, {0xa780}}},
-  {0xa783, {1|U, {0xa782}}},
-  {0xa785, {1|U, {0xa784}}},
-  {0xa787, {1|U, {0xa786}}},
-  {0xa78c, {1|U, {0xa78b}}},
-  {0xa791, {1|U, {0xa790}}},
-  {0xa793, {1|U, {0xa792}}},
-  {0xa794, {1|U, {0xa7c4}}},
-  {0xa797, {1|U, {0xa796}}},
-  {0xa799, {1|U, {0xa798}}},
-  {0xa79b, {1|U, {0xa79a}}},
-  {0xa79d, {1|U, {0xa79c}}},
-  {0xa79f, {1|U, {0xa79e}}},
-  {0xa7a1, {1|U, {0xa7a0}}},
-  {0xa7a3, {1|U, {0xa7a2}}},
-  {0xa7a5, {1|U, {0xa7a4}}},
-  {0xa7a7, {1|U, {0xa7a6}}},
-  {0xa7a9, {1|U, {0xa7a8}}},
-  {0xa7b5, {1|U, {0xa7b4}}},
-  {0xa7b7, {1|U, {0xa7b6}}},
-  {0xa7b9, {1|U, {0xa7b8}}},
-  {0xa7bb, {1|U, {0xa7ba}}},
-  {0xa7bd, {1|U, {0xa7bc}}},
-  {0xa7bf, {1|U, {0xa7be}}},
-  {0xa7c1, {1|U, {0xa7c0}}},
-  {0xa7c3, {1|U, {0xa7c2}}},
-  {0xa7c8, {1|U, {0xa7c7}}},
-  {0xa7ca, {1|U, {0xa7c9}}},
-  {0xa7d1, {1|U, {0xa7d0}}},
-  {0xa7d7, {1|U, {0xa7d6}}},
-  {0xa7d9, {1|U, {0xa7d8}}},
-  {0xa7f6, {1|U, {0xa7f5}}},
-  {0xab53, {1|U, {0xa7b3}}},
-  {0xff41, {1|U, {0xff21}}},
-  {0xff42, {1|U, {0xff22}}},
-  {0xff43, {1|U, {0xff23}}},
-  {0xff44, {1|U, {0xff24}}},
-  {0xff45, {1|U, {0xff25}}},
-  {0xff46, {1|U, {0xff26}}},
-  {0xff47, {1|U, {0xff27}}},
-  {0xff48, {1|U, {0xff28}}},
-  {0xff49, {1|U, {0xff29}}},
-  {0xff4a, {1|U, {0xff2a}}},
-  {0xff4b, {1|U, {0xff2b}}},
-  {0xff4c, {1|U, {0xff2c}}},
-  {0xff4d, {1|U, {0xff2d}}},
-  {0xff4e, {1|U, {0xff2e}}},
-  {0xff4f, {1|U, {0xff2f}}},
-  {0xff50, {1|U, {0xff30}}},
-  {0xff51, {1|U, {0xff31}}},
-  {0xff52, {1|U, {0xff32}}},
-  {0xff53, {1|U, {0xff33}}},
-  {0xff54, {1|U, {0xff34}}},
-  {0xff55, {1|U, {0xff35}}},
-  {0xff56, {1|U, {0xff36}}},
-  {0xff57, {1|U, {0xff37}}},
-  {0xff58, {1|U, {0xff38}}},
-  {0xff59, {1|U, {0xff39}}},
-  {0xff5a, {1|U, {0xff3a}}},
-  {0x10428, {1|U, {0x10400}}},
-  {0x10429, {1|U, {0x10401}}},
-  {0x1042a, {1|U, {0x10402}}},
-  {0x1042b, {1|U, {0x10403}}},
-  {0x1042c, {1|U, {0x10404}}},
-  {0x1042d, {1|U, {0x10405}}},
-  {0x1042e, {1|U, {0x10406}}},
-  {0x1042f, {1|U, {0x10407}}},
-  {0x10430, {1|U, {0x10408}}},
-  {0x10431, {1|U, {0x10409}}},
-  {0x10432, {1|U, {0x1040a}}},
-  {0x10433, {1|U, {0x1040b}}},
-  {0x10434, {1|U, {0x1040c}}},
-  {0x10435, {1|U, {0x1040d}}},
-  {0x10436, {1|U, {0x1040e}}},
-  {0x10437, {1|U, {0x1040f}}},
-  {0x10438, {1|U, {0x10410}}},
-  {0x10439, {1|U, {0x10411}}},
-  {0x1043a, {1|U, {0x10412}}},
-  {0x1043b, {1|U, {0x10413}}},
-  {0x1043c, {1|U, {0x10414}}},
-  {0x1043d, {1|U, {0x10415}}},
-  {0x1043e, {1|U, {0x10416}}},
-  {0x1043f, {1|U, {0x10417}}},
-  {0x10440, {1|U, {0x10418}}},
-  {0x10441, {1|U, {0x10419}}},
-  {0x10442, {1|U, {0x1041a}}},
-  {0x10443, {1|U, {0x1041b}}},
-  {0x10444, {1|U, {0x1041c}}},
-  {0x10445, {1|U, {0x1041d}}},
-  {0x10446, {1|U, {0x1041e}}},
-  {0x10447, {1|U, {0x1041f}}},
-  {0x10448, {1|U, {0x10420}}},
-  {0x10449, {1|U, {0x10421}}},
-  {0x1044a, {1|U, {0x10422}}},
-  {0x1044b, {1|U, {0x10423}}},
-  {0x1044c, {1|U, {0x10424}}},
-  {0x1044d, {1|U, {0x10425}}},
-  {0x1044e, {1|U, {0x10426}}},
-  {0x1044f, {1|U, {0x10427}}},
-  {0x104d8, {1|U, {0x104b0}}},
-  {0x104d9, {1|U, {0x104b1}}},
-  {0x104da, {1|U, {0x104b2}}},
-  {0x104db, {1|U, {0x104b3}}},
-  {0x104dc, {1|U, {0x104b4}}},
-  {0x104dd, {1|U, {0x104b5}}},
-  {0x104de, {1|U, {0x104b6}}},
-  {0x104df, {1|U, {0x104b7}}},
-  {0x104e0, {1|U, {0x104b8}}},
-  {0x104e1, {1|U, {0x104b9}}},
-  {0x104e2, {1|U, {0x104ba}}},
-  {0x104e3, {1|U, {0x104bb}}},
-  {0x104e4, {1|U, {0x104bc}}},
-  {0x104e5, {1|U, {0x104bd}}},
-  {0x104e6, {1|U, {0x104be}}},
-  {0x104e7, {1|U, {0x104bf}}},
-  {0x104e8, {1|U, {0x104c0}}},
-  {0x104e9, {1|U, {0x104c1}}},
-  {0x104ea, {1|U, {0x104c2}}},
-  {0x104eb, {1|U, {0x104c3}}},
-  {0x104ec, {1|U, {0x104c4}}},
-  {0x104ed, {1|U, {0x104c5}}},
-  {0x104ee, {1|U, {0x104c6}}},
-  {0x104ef, {1|U, {0x104c7}}},
-  {0x104f0, {1|U, {0x104c8}}},
-  {0x104f1, {1|U, {0x104c9}}},
-  {0x104f2, {1|U, {0x104ca}}},
-  {0x104f3, {1|U, {0x104cb}}},
-  {0x104f4, {1|U, {0x104cc}}},
-  {0x104f5, {1|U, {0x104cd}}},
-  {0x104f6, {1|U, {0x104ce}}},
-  {0x104f7, {1|U, {0x104cf}}},
-  {0x104f8, {1|U, {0x104d0}}},
-  {0x104f9, {1|U, {0x104d1}}},
-  {0x104fa, {1|U, {0x104d2}}},
-  {0x104fb, {1|U, {0x104d3}}},
-  {0x10597, {1|U, {0x10570}}},
-  {0x10598, {1|U, {0x10571}}},
-  {0x10599, {1|U, {0x10572}}},
-  {0x1059a, {1|U, {0x10573}}},
-  {0x1059b, {1|U, {0x10574}}},
-  {0x1059c, {1|U, {0x10575}}},
-  {0x1059d, {1|U, {0x10576}}},
-  {0x1059e, {1|U, {0x10577}}},
-  {0x1059f, {1|U, {0x10578}}},
-  {0x105a0, {1|U, {0x10579}}},
-  {0x105a1, {1|U, {0x1057a}}},
-  {0x105a3, {1|U, {0x1057c}}},
-  {0x105a4, {1|U, {0x1057d}}},
-  {0x105a5, {1|U, {0x1057e}}},
-  {0x105a6, {1|U, {0x1057f}}},
-  {0x105a7, {1|U, {0x10580}}},
-  {0x105a8, {1|U, {0x10581}}},
-  {0x105a9, {1|U, {0x10582}}},
-  {0x105aa, {1|U, {0x10583}}},
-  {0x105ab, {1|U, {0x10584}}},
-  {0x105ac, {1|U, {0x10585}}},
-  {0x105ad, {1|U, {0x10586}}},
-  {0x105ae, {1|U, {0x10587}}},
-  {0x105af, {1|U, {0x10588}}},
-  {0x105b0, {1|U, {0x10589}}},
-  {0x105b1, {1|U, {0x1058a}}},
-  {0x105b3, {1|U, {0x1058c}}},
-  {0x105b4, {1|U, {0x1058d}}},
-  {0x105b5, {1|U, {0x1058e}}},
-  {0x105b6, {1|U, {0x1058f}}},
-  {0x105b7, {1|U, {0x10590}}},
-  {0x105b8, {1|U, {0x10591}}},
-  {0x105b9, {1|U, {0x10592}}},
-  {0x105bb, {1|U, {0x10594}}},
-  {0x105bc, {1|U, {0x10595}}},
-  {0x10cc0, {1|U, {0x10c80}}},
-  {0x10cc1, {1|U, {0x10c81}}},
-  {0x10cc2, {1|U, {0x10c82}}},
-  {0x10cc3, {1|U, {0x10c83}}},
-  {0x10cc4, {1|U, {0x10c84}}},
-  {0x10cc5, {1|U, {0x10c85}}},
-  {0x10cc6, {1|U, {0x10c86}}},
-  {0x10cc7, {1|U, {0x10c87}}},
-  {0x10cc8, {1|U, {0x10c88}}},
-  {0x10cc9, {1|U, {0x10c89}}},
-  {0x10cca, {1|U, {0x10c8a}}},
-  {0x10ccb, {1|U, {0x10c8b}}},
-  {0x10ccc, {1|U, {0x10c8c}}},
-  {0x10ccd, {1|U, {0x10c8d}}},
-  {0x10cce, {1|U, {0x10c8e}}},
-  {0x10ccf, {1|U, {0x10c8f}}},
-  {0x10cd0, {1|U, {0x10c90}}},
-  {0x10cd1, {1|U, {0x10c91}}},
-  {0x10cd2, {1|U, {0x10c92}}},
-  {0x10cd3, {1|U, {0x10c93}}},
-  {0x10cd4, {1|U, {0x10c94}}},
-  {0x10cd5, {1|U, {0x10c95}}},
-  {0x10cd6, {1|U, {0x10c96}}},
-  {0x10cd7, {1|U, {0x10c97}}},
-  {0x10cd8, {1|U, {0x10c98}}},
-  {0x10cd9, {1|U, {0x10c99}}},
-  {0x10cda, {1|U, {0x10c9a}}},
-  {0x10cdb, {1|U, {0x10c9b}}},
-  {0x10cdc, {1|U, {0x10c9c}}},
-  {0x10cdd, {1|U, {0x10c9d}}},
-  {0x10cde, {1|U, {0x10c9e}}},
-  {0x10cdf, {1|U, {0x10c9f}}},
-  {0x10ce0, {1|U, {0x10ca0}}},
-  {0x10ce1, {1|U, {0x10ca1}}},
-  {0x10ce2, {1|U, {0x10ca2}}},
-  {0x10ce3, {1|U, {0x10ca3}}},
-  {0x10ce4, {1|U, {0x10ca4}}},
-  {0x10ce5, {1|U, {0x10ca5}}},
-  {0x10ce6, {1|U, {0x10ca6}}},
-  {0x10ce7, {1|U, {0x10ca7}}},
-  {0x10ce8, {1|U, {0x10ca8}}},
-  {0x10ce9, {1|U, {0x10ca9}}},
-  {0x10cea, {1|U, {0x10caa}}},
-  {0x10ceb, {1|U, {0x10cab}}},
-  {0x10cec, {1|U, {0x10cac}}},
-  {0x10ced, {1|U, {0x10cad}}},
-  {0x10cee, {1|U, {0x10cae}}},
-  {0x10cef, {1|U, {0x10caf}}},
-  {0x10cf0, {1|U, {0x10cb0}}},
-  {0x10cf1, {1|U, {0x10cb1}}},
-  {0x10cf2, {1|U, {0x10cb2}}},
-  {0x118c0, {1|U, {0x118a0}}},
-  {0x118c1, {1|U, {0x118a1}}},
-  {0x118c2, {1|U, {0x118a2}}},
-  {0x118c3, {1|U, {0x118a3}}},
-  {0x118c4, {1|U, {0x118a4}}},
-  {0x118c5, {1|U, {0x118a5}}},
-  {0x118c6, {1|U, {0x118a6}}},
-  {0x118c7, {1|U, {0x118a7}}},
-  {0x118c8, {1|U, {0x118a8}}},
-  {0x118c9, {1|U, {0x118a9}}},
-  {0x118ca, {1|U, {0x118aa}}},
-  {0x118cb, {1|U, {0x118ab}}},
-  {0x118cc, {1|U, {0x118ac}}},
-  {0x118cd, {1|U, {0x118ad}}},
-  {0x118ce, {1|U, {0x118ae}}},
-  {0x118cf, {1|U, {0x118af}}},
-  {0x118d0, {1|U, {0x118b0}}},
-  {0x118d1, {1|U, {0x118b1}}},
-  {0x118d2, {1|U, {0x118b2}}},
-  {0x118d3, {1|U, {0x118b3}}},
-  {0x118d4, {1|U, {0x118b4}}},
-  {0x118d5, {1|U, {0x118b5}}},
-  {0x118d6, {1|U, {0x118b6}}},
-  {0x118d7, {1|U, {0x118b7}}},
-  {0x118d8, {1|U, {0x118b8}}},
-  {0x118d9, {1|U, {0x118b9}}},
-  {0x118da, {1|U, {0x118ba}}},
-  {0x118db, {1|U, {0x118bb}}},
-  {0x118dc, {1|U, {0x118bc}}},
-  {0x118dd, {1|U, {0x118bd}}},
-  {0x118de, {1|U, {0x118be}}},
-  {0x118df, {1|U, {0x118bf}}},
-  {0x16e60, {1|U, {0x16e40}}},
-  {0x16e61, {1|U, {0x16e41}}},
-  {0x16e62, {1|U, {0x16e42}}},
-  {0x16e63, {1|U, {0x16e43}}},
-  {0x16e64, {1|U, {0x16e44}}},
-  {0x16e65, {1|U, {0x16e45}}},
-  {0x16e66, {1|U, {0x16e46}}},
-  {0x16e67, {1|U, {0x16e47}}},
-  {0x16e68, {1|U, {0x16e48}}},
-  {0x16e69, {1|U, {0x16e49}}},
-  {0x16e6a, {1|U, {0x16e4a}}},
-  {0x16e6b, {1|U, {0x16e4b}}},
-  {0x16e6c, {1|U, {0x16e4c}}},
-  {0x16e6d, {1|U, {0x16e4d}}},
-  {0x16e6e, {1|U, {0x16e4e}}},
-  {0x16e6f, {1|U, {0x16e4f}}},
-  {0x16e70, {1|U, {0x16e50}}},
-  {0x16e71, {1|U, {0x16e51}}},
-  {0x16e72, {1|U, {0x16e52}}},
-  {0x16e73, {1|U, {0x16e53}}},
-  {0x16e74, {1|U, {0x16e54}}},
-  {0x16e75, {1|U, {0x16e55}}},
-  {0x16e76, {1|U, {0x16e56}}},
-  {0x16e77, {1|U, {0x16e57}}},
-  {0x16e78, {1|U, {0x16e58}}},
-  {0x16e79, {1|U, {0x16e59}}},
-  {0x16e7a, {1|U, {0x16e5a}}},
-  {0x16e7b, {1|U, {0x16e5b}}},
-  {0x16e7c, {1|U, {0x16e5c}}},
-  {0x16e7d, {1|U, {0x16e5d}}},
-  {0x16e7e, {1|U, {0x16e5e}}},
-  {0x16e7f, {1|U, {0x16e5f}}},
-  {0x1e922, {1|U, {0x1e900}}},
-  {0x1e923, {1|U, {0x1e901}}},
-  {0x1e924, {1|U, {0x1e902}}},
-  {0x1e925, {1|U, {0x1e903}}},
-  {0x1e926, {1|U, {0x1e904}}},
-  {0x1e927, {1|U, {0x1e905}}},
-  {0x1e928, {1|U, {0x1e906}}},
-  {0x1e929, {1|U, {0x1e907}}},
-  {0x1e92a, {1|U, {0x1e908}}},
-  {0x1e92b, {1|U, {0x1e909}}},
-  {0x1e92c, {1|U, {0x1e90a}}},
-  {0x1e92d, {1|U, {0x1e90b}}},
-  {0x1e92e, {1|U, {0x1e90c}}},
-  {0x1e92f, {1|U, {0x1e90d}}},
-  {0x1e930, {1|U, {0x1e90e}}},
-  {0x1e931, {1|U, {0x1e90f}}},
-  {0x1e932, {1|U, {0x1e910}}},
-  {0x1e933, {1|U, {0x1e911}}},
-  {0x1e934, {1|U, {0x1e912}}},
-  {0x1e935, {1|U, {0x1e913}}},
-  {0x1e936, {1|U, {0x1e914}}},
-  {0x1e937, {1|U, {0x1e915}}},
-  {0x1e938, {1|U, {0x1e916}}},
-  {0x1e939, {1|U, {0x1e917}}},
-  {0x1e93a, {1|U, {0x1e918}}},
-  {0x1e93b, {1|U, {0x1e919}}},
-  {0x1e93c, {1|U, {0x1e91a}}},
-  {0x1e93d, {1|U, {0x1e91b}}},
-  {0x1e93e, {1|U, {0x1e91c}}},
-  {0x1e93f, {1|U, {0x1e91d}}},
-  {0x1e940, {1|U, {0x1e91e}}},
-  {0x1e941, {1|U, {0x1e91f}}},
-  {0x1e942, {1|U, {0x1e920}}},
-  {0x1e943, {1|U, {0x1e921}}},
-#define CaseUnfold_11_Locale (*(CaseUnfold_11_Type (*)[1])(CaseUnfold_11_Table+1395))
-  {0x0069, {1|U, {0x0049}}},
-};
-
-/* ANSI-C code produced by gperf version 3.1 */
-/* Command-line: gperf -7 -k1,2,3 -F,-1 -c -j1 -i1 -t -T -E -C -H onigenc_unicode_CaseUnfold_11_hash -N onigenc_unicode_CaseUnfold_11_lookup -n  */
-
-/* maximum key range = 2771, duplicates = 0 */
-
-#ifdef __GNUC__
-__inline
-#else
-#ifdef __cplusplus
-inline
-#endif
-#endif
-/*ARGSUSED*/
-static unsigned int
-onigenc_unicode_CaseUnfold_11_hash(const OnigCodePoint code)
-{
-  static const unsigned short asso_values[] =
-    {
-         1, 2774,    2,    2,    4,  421,    9,  371,  231,  463,
-        37,   20,    2,    3,  419,  408, 2774, 2774, 2774, 2774,
-      2774, 2774, 2774, 2774, 2774, 2774, 2774, 2774, 2774,  112,
-      2774, 2774, 2774, 2774, 2774, 2774, 2774,  120, 2774, 2774,
-      2774, 2774, 2774,    1, 2774, 2774, 2774, 2774, 2774, 2774,
-      2774, 2774, 2774,  355, 2774, 2774, 2774, 2774, 2774, 2774,
-      2774, 2774,   10,    9,    7,    8,  244,  689,  226,  993,
-       561,  710,  104, 1429,   36, 1190,   28,   15,  114, 1768,
-       241, 1003,   87,  285,   26, 1399,   78, 1360,    7, 1455,
-        90, 1076,  113,   10,  724, 1460,  167, 1727,  155, 1040,
-        67,  754,   66,  705,  246,  886,  331, 1140,  430, 1251,
-       864,  768,  643, 1064, 1591,  865,  834,  720, 1700,  671,
-      1581,  657, 1794,  842, 1782, 1050, 1537, 1024, 1760,  814,
-       975,  440, 1187,  407, 1440,  951, 1384,  909, 1320,  555,
-      1567,  541, 1723,  525,  383,  501, 1179,  250, 1596,  342,
-      1575,  352, 1501,  194, 1559,   70, 1512,   85, 1509,  129,
-       467,  100, 1413,    1, 1485,   25, 1351,   35, 1088,   55,
-      1262,   45, 1277,  160, 1245,  317,  118,  220, 1300,  596,
-      1100,  373, 1632,  617, 1337, 1236, 1500, 1152,  148,  793,
-      1538,  979,  385, 1228
-    };
-  return asso_values[bits_of(code, 2)+66] + asso_values[bits_of(code, 1)+4] + asso_values[bits_of(code, 0)];
-}
-
-static const CodePointList3 *
-onigenc_unicode_CaseUnfold_11_lookup(const OnigCodePoint code)
-{
-  enum
-    {
-      MIN_CODE_VALUE = 0x61,
-      MAX_CODE_VALUE = 0x1e943,
-      TOTAL_KEYWORDS = 1396,
-      MIN_WORD_LENGTH = 3,
-      MAX_WORD_LENGTH = 3,
-      MIN_HASH_VALUE = 3,
-      MAX_HASH_VALUE = 2773
-    };
-
-  static const short wordlist[] =
-    {
-      -1, -1, -1,
-      /*0x13e1*/ 589,
-      /*0x0461*/ 340,
-      /*0x04e1*/ 400,
-      /*0x0061*/ 0,
-      -1,
-      /*0x104e1*/ 1184,
-      /*0x1e61*/ 661,
-      /*0x1ee1*/ 720,
-      /*0x0161*/ 102,
-      /*0x2ce1*/ 953,
-      -1,
-      /*0x049b*/ 365,
-      -1, -1,
-      /*0x24e1*/ 840,
-      /*0x1e1b*/ 626,
-      /*0x048b*/ 357,
-      /*0x011b*/ 69,
-      /*0x2c9b*/ 918,
-      /*0x03e1*/ 280,
-      /*0x1e0b*/ 618,
-      /*0x1e8b*/ 682,
-      /*0x010b*/ 61,
-      /*0x2c8b*/ 910,
-      /*0x13e3*/ 591,
-      /*0x0463*/ 341,
-      /*0x04e3*/ 401,
-      /*0x0063*/ 2,
-      -1,
-      /*0x104e3*/ 1186,
-      /*0x1e63*/ 662,
-      /*0x1ee3*/ 721,
-      /*0x0163*/ 103,
-      /*0x2ce3*/ 954,
-      /*0x13e5*/ 593,
-      /*0x0465*/ 342,
-      /*0x04e5*/ 402,
-      /*0x0065*/ 4,
-      /*0x24e3*/ 842,
-      /*0x104e5*/ 1188,
-      /*0x1e65*/ 663,
-      /*0x1ee5*/ 722,
-      /*0x0165*/ 104,
-      /*0x03e3*/ 281,
-      /*0x13e9*/ 597,
-      /*0x0469*/ 344,
-      /*0x04e9*/ 404,
-      /*0x0069*/ 1395,
-      /*0x24e5*/ 844,
-      /*0x104e9*/ 1192,
-      /*0x1e69*/ 665,
-      /*0x1ee9*/ 724,
-      /*0x0169*/ 106,
-      /*0x03e5*/ 282,
-      /*0x13e7*/ 595,
-      /*0x0467*/ 343,
-      /*0x04e7*/ 403,
-      /*0x0067*/ 6,
-      /*0x24e9*/ 848,
-      /*0x104e7*/ 1190,
-      /*0x1e67*/ 664,
-      /*0x1ee7*/ 723,
-      /*0x0167*/ 105,
-      /*0x03e9*/ 284,
-      -1,
-      /*0x13a4*/ 528,
-      /*0x13a2*/ 526,
-      -1,
-      /*0x24e7*/ 846,
-      /*0x13d9*/ 581,
-      /*0x0459*/ 333,
-      /*0x04d9*/ 396,
-      -1,
-      /*0x03e7*/ 283,
-      /*0x104d9*/ 1176,
-      /*0x1e59*/ 657,
-      /*0x1ed9*/ 716,
-      /*0x0159*/ 98,
-      /*0x2cd9*/ 949,
-      -1, -1, -1, -1,
-      /*0x24d9*/ 832,
-      /*0x13db*/ 583,
-      /*0x045b*/ 335,
-      /*0x04db*/ 397,
-      /*0xa761*/ 1065,
-      /*0x03d9*/ 276,
-      /*0x104db*/ 1178,
-      /*0x1e5b*/ 658,
-      /*0x1edb*/ 717,
-      /*0x015b*/ 99,
-      /*0x2cdb*/ 950,
-      -1, -1, -1, -1,
-      /*0x24db*/ 834,
-      /*0x13df*/ 587,
-      /*0x045f*/ 339,
-      /*0x04df*/ 399,
-      -1,
-      /*0x03db*/ 277,
-      /*0x104df*/ 1182,
-      /*0x1e5f*/ 660,
-      /*0x1edf*/ 719,
-      /*0x015f*/ 101,
-      /*0x2cdf*/ 952,
-      -1, -1,
-      /*0xa763*/ 1066,
-      /*0x2c61*/ 897,
-      /*0x24df*/ 838,
-      /*0x10ce1*/ 1279,
-      -1, -1,
-      /*0x13ee*/ 602,
-      /*0x03df*/ 279,
-      /*0x10e1*/ 495,
-      /*0x006e*/ 12,
-      /*0xa765*/ 1067,
-      /*0x104ee*/ 1197,
-      -1, -1, -1,
-      /*0x2cee*/ 956,
-      -1,
-      /*0x13dd*/ 585,
-      /*0x045d*/ 337,
-      /*0x04dd*/ 398,
-      /*0xa769*/ 1069,
-      -1,
-      /*0x104dd*/ 1180,
-      /*0x1e5d*/ 659,
-      /*0x1edd*/ 718,
-      /*0x015d*/ 100,
-      /*0x2cdd*/ 951,
-      /*0x10ce3*/ 1281,
-      -1, -1,
-      /*0xa767*/ 1068,
-      /*0x24dd*/ 836,
-      /*0x10e3*/ 497,
-      -1, -1,
-      /*0x2c65*/ 898,
-      /*0x03dd*/ 278,
-      /*0x10ce5*/ 1283,
-      -1,
-      /*0x007a*/ 24,
-      -1,
-      /*0x104fa*/ 1209,
-      /*0x10e5*/ 499,
-      /*0x13a0*/ 524,
-      /*0x017a*/ 114,
-      /*0xa759*/ 1061,
-      -1,
-      /*0x10ce9*/ 1287,
-      /*0x13eb*/ 599,
-      /*0x046b*/ 345,
-      /*0x04eb*/ 405,
-      /*0x006b*/ 9,
-      /*0x10e9*/ 503,
-      /*0x104eb*/ 1194,
-      /*0x1e6b*/ 666,
-      /*0x1eeb*/ 725,
-      /*0x016b*/ 107,
-      /*0x10ce7*/ 1285,
-      -1, -1,
-      /*0xa75b*/ 1062,
-      -1,
-      /*0x10e7*/ 501,
-      -1, -1, -1, -1,
-      /*0x03eb*/ 285,
-      -1, -1,
-      /*0x2c59*/ 890,
-      -1,
-      /*0x10cd9*/ 1271,
-      -1, -1,
-      /*0xa75f*/ 1064,
-      -1,
-      /*0x10d9*/ 487,
-      -1, -1, -1, -1,
-      /*0x13d7*/ 579,
-      /*0x0457*/ 331,
-      /*0x04d7*/ 395,
-      /*0x2c5b*/ 892,
-      -1,
-      /*0x10cdb*/ 1273,
-      /*0x1e57*/ 656,
-      /*0x1ed7*/ 715,
-      /*0x0157*/ 97,
-      /*0x2cd7*/ 948,
-      /*0x10db*/ 489,
-      -1, -1, -1,
-      /*0x24d7*/ 830,
-      -1, -1, -1,
-      /*0x2c5f*/ 896,
-      /*0x03d7*/ 275,
-      /*0x10cdf*/ 1277,
-      -1,
-      /*0xa75d*/ 1063,
-      -1, -1,
-      /*0x10df*/ 493,
-      /*0x13ef*/ 603,
-      /*0x046f*/ 347,
-      /*0x04ef*/ 407,
-      /*0x006f*/ 13,
-      -1,
-      /*0x104ef*/ 1198,
-      /*0x1e6f*/ 668,
-      /*0x1eef*/ 727,
-      /*0x016f*/ 109,
-      -1, -1,
-      /*0x0261*/ 210,
-      /*0x10cee*/ 1292,
-      -1, -1,
-      /*0xa77a*/ 1073,
-      -1,
-      /*0x10ee*/ 508,
-      -1,
-      /*0x03ef*/ 287,
-      /*0x021b*/ 178,
-      /*0x2c5d*/ 894,
-      /*0xa661*/ 1014,
-      /*0x10cdd*/ 1275,
-      /*0x1f61*/ 777,
-      /*0x020b*/ 170,
-      /*0x13a6*/ 530,
-      /*0xa76b*/ 1070,
-      /*0x10dd*/ 491,
-      /*0x1d8e*/ 612,
-      /*0x13d1*/ 573,
-      /*0x0451*/ 325,
-      /*0x04d1*/ 392,
-      -1, -1,
-      /*0x0263*/ 211,
-      /*0x1e51*/ 653,
-      /*0x1ed1*/ 712,
-      /*0x0151*/ 94,
-      /*0x2cd1*/ 945,
-      -1, -1, -1, -1,
-      /*0x24d1*/ 824,
-      /*0x0265*/ 212,
-      /*0xa663*/ 1015,
-      /*0x10fa*/ 520,
-      /*0x1f63*/ 779,
-      /*0x1f12*/ 746,
-      -1, -1, -1, -1,
-      /*0x10ceb*/ 1289,
-      /*0x0269*/ 215,
-      /*0xa665*/ 1016,
-      -1,
-      /*0x1f65*/ 781,
-      /*0x10eb*/ 505,
-      -1,
-      /*0xa757*/ 1060,
-      -1, -1, -1, -1,
-      /*0xa669*/ 1018,
-      /*0x0491*/ 360,
-      -1, -1, -1,
-      /*0x1e11*/ 621,
-      /*0x1e91*/ 685,
-      /*0x0111*/ 64,
-      /*0x2c91*/ 913,
-      /*0xa79b*/ 1086,
-      /*0xa667*/ 1017,
-      -1,
-      /*0x1f67*/ 783,
-      -1,
-      /*0x0259*/ 206,
-      -1, -1, -1, -1, -1,
-      /*0x2c57*/ 888,
-      /*0xa76f*/ 1072,
-      /*0x10cd7*/ 1269,
-      /*0x1f24*/ 754,
-      /*0x1f22*/ 752,
-      /*0xa659*/ 1010,
-      -1,
-      /*0x10d7*/ 485,
-      -1,
-      /*0x025b*/ 207,
-      -1,
-      /*0x13ed*/ 601,
-      /*0x046d*/ 346,
-      /*0x04ed*/ 406,
-      /*0x006d*/ 11,
-      /*0x1f14*/ 748,
-      /*0x104ed*/ 1196,
-      /*0x1e6d*/ 667,
-      /*0x1eed*/ 726,
-      /*0x016d*/ 108,
-      /*0xa65b*/ 1011,
-      -1, -1, -1,
-      /*0x1f10*/ 744,
-      /*0x13a8*/ 532,
-      -1, -1,
-      /*0x10cef*/ 1293,
-      /*0x10428*/ 1135,
-      /*0x03ed*/ 286,
-      /*0xa751*/ 1057,
-      -1,
-      /*0x10ef*/ 509,
-      -1,
-      /*0xa65f*/ 1013,
-      /*0x13d3*/ 575,
-      /*0x0453*/ 327,
-      /*0x04d3*/ 393,
-      -1, -1,
-      /*0x1f06*/ 742,
-      /*0x1e53*/ 654,
-      /*0x1ed3*/ 713,
-      /*0x0153*/ 95,
-      /*0x2cd3*/ 946,
-      /*0x13d5*/ 577,
-      /*0x0455*/ 329,
-      /*0x04d5*/ 394,
-      /*0xa7d9*/ 1106,
-      /*0x24d3*/ 826,
-      -1,
-      /*0x1e55*/ 655,
-      /*0x1ed5*/ 714,
-      /*0x0155*/ 96,
-      /*0x2cd5*/ 947,
-      /*0x2c51*/ 882,
-      /*0xa794*/ 1083,
-      /*0x10cd1*/ 1263,
-      -1,
-      /*0x24d5*/ 828,
-      -1, -1,
-      /*0x10d1*/ 479,
-      /*0xa65d*/ 1012,
-      /*0x01e1*/ 151,
-      -1,
-      /*0x13f3*/ 607,
-      /*0x0473*/ 349,
-      /*0x04f3*/ 409,
-      /*0x0073*/ 17,
-      -1,
-      /*0x104f3*/ 1202,
-      /*0x1e73*/ 670,
-      /*0x1ef3*/ 729,
-      /*0x0173*/ 111,
-      /*0x2cf3*/ 957,
-      /*0x13ce*/ 570,
-      /*0x044e*/ 322,
-      /*0x04ce*/ 390,
-      -1,
-      /*0x1044e*/ 1173,
-      -1, -1,
-      /*0x026b*/ 217,
-      /*0x1f7a*/ 794,
-      /*0x03f3*/ 289,
-      /*0x017e*/ 116,
-      -1,
-      /*0x01e3*/ 152,
-      /*0x0192*/ 122,
-      -1,
-      /*0x1f20*/ 750,
-      /*0xa78c*/ 1080,
-      -1,
-      /*0xa66b*/ 1019,
-      /*0x03ce*/ 274,
-      -1,
-      /*0xa76d*/ 1071,
-      /*0x01e5*/ 153,
-      /*0x0188*/ 120,
-      /*0x13c3*/ 559,
-      /*0x0443*/ 311,
-      /*0x0373*/ 237,
-      -1,
-      /*0x10443*/ 1162,
-      -1,
-      /*0x1e43*/ 646,
-      /*0x1ec3*/ 705,
-      /*0x01e9*/ 155,
-      /*0x2cc3*/ 938,
-      -1, -1,
-      /*0x0561*/ 440,
-      /*0x1059b*/ 1215,
-      /*0x00e1*/ 26,
-      -1, -1,
-      /*0x0257*/ 205,
-      /*0x01e7*/ 154,
-      /*0x03c3*/ 263,
-      /*0x118d9*/ 1322,
-      /*0x051b*/ 429,
-      /*0xa753*/ 1058,
-      /*0x13aa*/ 534,
-      /*0x10ced*/ 1291,
-      /*0xab53*/ 1108,
-      /*0x050b*/ 421,
-      /*0x1042a*/ 1137,
-      /*0xa657*/ 1009,
-      /*0x10ed*/ 507,
-      /*0x1f57*/ 775,
-      -1,
-      /*0xa755*/ 1059,
-      /*0x13c1*/ 557,
-      /*0x0441*/ 309,
-      /*0x118db*/ 1324,
-      /*0x0563*/ 442,
-      /*0x10441*/ 1160,
-      /*0x00e3*/ 28,
-      /*0x1e41*/ 645,
-      /*0x1ec1*/ 704,
-      -1,
-      /*0x2cc1*/ 937,
-      /*0x026f*/ 219,
-      -1, -1,
-      /*0x0565*/ 444,
-      /*0x2c53*/ 884,
-      /*0x00e5*/ 30,
-      /*0x10cd3*/ 1265,
-      /*0x118df*/ 1328,
-      -1,
-      /*0x03c1*/ 262,
-      -1,
-      /*0x10d3*/ 481,
-      -1,
-      /*0x0569*/ 448,
-      /*0x2c55*/ 886,
-      /*0x00e9*/ 34,
-      /*0x10cd5*/ 1267,
-      /*0x13de*/ 586,
-      /*0x045e*/ 338,
-      /*0x1f02*/ 738,
-      /*0x01df*/ 150,
-      /*0x10d5*/ 483,
-      /*0x104de*/ 1181,
-      /*0x0567*/ 446,
-      -1,
-      /*0x00e7*/ 32,
-      /*0x105a4*/ 1223,
-      /*0x028b*/ 231,
-      -1,
-      /*0xa7d7*/ 1105,
-      /*0x0251*/ 200,
-      /*0x24de*/ 837,
-      -1,
-      /*0x019a*/ 125,
-      /*0x018c*/ 121,
-      /*0x2c73*/ 903,
-      /*0x118dd*/ 1326,
-      /*0x1f00*/ 736,
-      /*0x0292*/ 233,
-      /*0x1f26*/ 756,
-      /*0x028a*/ 230,
-      /*0xa651*/ 1006,
-      /*0x10f3*/ 513,
-      /*0x1f51*/ 772,
-      /*0xa743*/ 1050,
-      /*0x2c4e*/ 879,
-      -1,
-      /*0x10cce*/ 1260,
-      /*0x0288*/ 228,
-      /*0x01dd*/ 149,
-      /*0x10598*/ 1212,
-      /*0x13cf*/ 571,
-      /*0x044f*/ 323,
-      /*0x04cf*/ 391,
-      /*0x10fe*/ 522,
-      /*0x1044f*/ 1174,
-      -1,
-      /*0x1e4f*/ 652,
-      /*0x1ecf*/ 711,
-      /*0x014f*/ 93,
-      /*0x2ccf*/ 944,
-      /*0x0586*/ 477,
-      -1,
-      /*0x1e924*/ 1363,
-      /*0x1e922*/ 1361,
-      /*0x0211*/ 173,
-      -1, -1, -1,
-      /*0x2c43*/ 868,
-      -1,
-      /*0x10cc3*/ 1249,
-      -1,
-      /*0x1059a*/ 1214,
-      -1,
-      /*0x13cd*/ 569,
-      /*0x044d*/ 321,
-      /*0xa741*/ 1049,
-      /*0x1f11*/ 745,
-      /*0x1044d*/ 1172,
-      /*0x01eb*/ 156,
-      /*0x1e4d*/ 651,
-      /*0x1ecd*/ 710,
-      /*0x014d*/ 92,
-      /*0x2ccd*/ 943,
-      /*0xa7d1*/ 1104,
-      /*0x056e*/ 453,
-      /*0x019e*/ 126,
-      /*0x00ee*/ 39,
-      -1, -1,
-      /*0x13cb*/ 567,
-      /*0x044b*/ 319,
-      -1,
-      /*0x03cd*/ 273,
-      /*0x1044b*/ 1170,
-      -1,
-      /*0x1e4b*/ 650,
-      /*0x1ecb*/ 709,
-      /*0x014b*/ 91,
-      /*0x2ccb*/ 942,
-      /*0x118d7*/ 1320,
-      /*0x2c41*/ 866,
-      -1,
-      /*0x10cc1*/ 1247,
-      /*0x13c9*/ 565,
-      /*0x0449*/ 317,
-      -1,
-      /*0xa66d*/ 1020,
-      /*0x10449*/ 1168,
-      /*0x03cb*/ 271,
-      /*0x1e49*/ 649,
-      /*0x1ec9*/ 708,
-      -1,
-      /*0x2cc9*/ 941,
-      /*0x105a0*/ 1220,
-      /*0x057a*/ 465,
-      -1,
-      /*0x00fa*/ 50,
-      -1,
-      /*0xa791*/ 1081,
-      -1,
-      /*0x0253*/ 202,
-      -1,
-      /*0x03c9*/ 269,
-      -1,
-      /*0x028c*/ 232,
-      /*0x1059e*/ 1218,
-      /*0x056b*/ 450,
-      /*0x2c5e*/ 895,
-      /*0x00eb*/ 36,
-      /*0x10cde*/ 1276,
-      -1,
-      /*0xa653*/ 1007,
-      -1,
-      /*0x1f53*/ 773,
-      /*0x10de*/ 492,
-      /*0x16e61*/ 1330,
-      /*0xa74f*/ 1056,
-      -1,
-      /*0x01ef*/ 158,
-      -1, -1,
-      /*0xa655*/ 1008,
-      -1,
-      /*0x1f55*/ 774,
-      /*0x13f1*/ 605,
-      /*0x0471*/ 348,
-      /*0x04f1*/ 408,
-      /*0x0071*/ 15,
-      -1,
-      /*0x104f1*/ 1200,
-      /*0x1e71*/ 669,
-      /*0x1ef1*/ 728,
-      /*0x0171*/ 110,
-      -1, -1,
-      /*0x118d1*/ 1314,
-      -1, -1, -1,
-      /*0x16e63*/ 1332,
-      /*0xa74d*/ 1055,
-      /*0x2c4f*/ 880,
-      /*0x0180*/ 117,
-      /*0x10ccf*/ 1261,
-      /*0x1f73*/ 787,
-      /*0x13f5*/ 609,
-      /*0x0475*/ 350,
-      /*0x04f5*/ 410,
-      /*0x0075*/ 19,
-      /*0x16e65*/ 1334,
-      /*0x104f5*/ 1204,
-      /*0x1e75*/ 671,
-      /*0x1ef5*/ 730,
-      /*0x0175*/ 112,
-      -1, -1,
-      /*0xa74b*/ 1054,
-      /*0x029e*/ 235,
-      -1,
-      /*0x16e69*/ 1338,
-      /*0x0371*/ 236,
-      /*0x0582*/ 473,
-      -1, -1, -1,
-      /*0x2c4d*/ 878,
-      /*0x056f*/ 454,
-      /*0x10ccd*/ 1259,
-      /*0x00ef*/ 40,
-      /*0x16e67*/ 1336,
-      /*0xa749*/ 1053,
-      /*0x13ae*/ 538,
-      -1, -1, -1,
-      /*0x1042e*/ 1141,
-      /*0xa643*/ 999,
-      -1,
-      /*0x1f43*/ 769,
-      /*0x0580*/ 471,
-      -1,
-      /*0x2c4b*/ 876,
-      -1,
-      /*0x10ccb*/ 1257,
-      /*0x105a6*/ 1225,
-      /*0x13b7*/ 547,
-      /*0x0437*/ 299,
-      /*0x04b7*/ 379,
-      -1,
-      /*0x10437*/ 1150,
-      /*0x03ae*/ 244,
-      /*0x1e37*/ 640,
-      /*0x1eb7*/ 699,
-      /*0x0137*/ 82,
-      /*0x2cb7*/ 932,
-      /*0x2c49*/ 874,
-      -1,
-      /*0x10cc9*/ 1255,
-      -1,
-      /*0x13b5*/ 545,
-      /*0x0435*/ 297,
-      /*0x04b5*/ 378,
-      -1,
-      /*0x10435*/ 1148,
-      /*0x03b7*/ 252,
-      /*0x1e35*/ 639,
-      /*0x1eb5*/ 698,
-      /*0x0135*/ 81,
-      /*0x2cb5*/ 931,
-      /*0xa641*/ 998,
-      -1,
-      /*0x1f41*/ 767,
-      -1, -1, -1,
-      /*0x01ed*/ 157,
-      /*0x0282*/ 225,
-      /*0x1fe1*/ 803,
-      /*0x03b5*/ 250,
-      /*0x0481*/ 356,
-      /*0xa7c3*/ 1101,
-      /*0x1e926*/ 1365,
-      -1,
-      /*0x1e01*/ 613,
-      /*0x1e81*/ 677,
-      /*0x0101*/ 56,
-      /*0x2c81*/ 905,
-      /*0x118d3*/ 1316,
-      -1,
-      /*0x01a8*/ 130,
-      -1,
-      /*0x0511*/ 424,
-      /*0x16e6e*/ 1343,
-      /*0x13a5*/ 529,
-      /*0x0280*/ 224,
-      /*0x04a5*/ 370,
-      /*0x217a*/ 816,
-      /*0x118d5*/ 1318,
-      /*0x10cf1*/ 1295,
-      /*0x1e25*/ 631,
-      /*0x1ea5*/ 690,
-      /*0x0125*/ 74,
-      /*0x2ca5*/ 923,
-      /*0x10f1*/ 511,
-      /*0x1e05*/ 615,
-      /*0x1e85*/ 679,
-      /*0x0105*/ 58,
-      /*0x2c85*/ 907,
-      /*0x13b3*/ 543,
-      /*0x0433*/ 295,
-      /*0x04b3*/ 377,
-      /*0x1fe5*/ 804,
-      /*0x10433*/ 1146,
-      /*0xa7c1*/ 1100,
-      /*0x1e33*/ 638,
-      /*0x1eb3*/ 697,
-      /*0x0133*/ 80,
-      /*0x2cb3*/ 930,
-      /*0x2d16*/ 980,
-      /*0x024f*/ 198,
-      -1,
-      /*0x2d1b*/ 985,
-      /*0x16e7a*/ 1355,
-      /*0x056d*/ 452,
-      /*0x10f5*/ 515,
-      /*0x00ed*/ 38,
-      /*0x2d0b*/ 969,
-      /*0x03b3*/ 248,
-      /*0x118ce*/ 1311,
-      /*0x105a8*/ 1227,
-      /*0xa64f*/ 1005,
-      /*0x01f3*/ 159,
-      /*0xa737*/ 1044,
-      -1,
-      /*0x16e6b*/ 1340,
-      -1, -1,
-      /*0x2d12*/ 976,
-      -1,
-      /*0x2d0a*/ 968,
-      -1,
-      /*0x01ce*/ 141,
-      /*0x13a3*/ 527,
-      /*0x024d*/ 197,
-      /*0x04a3*/ 369,
-      -1,
-      /*0xa735*/ 1043,
-      /*0x2d08*/ 966,
-      /*0x1e23*/ 630,
-      /*0x1ea3*/ 689,
-      /*0x0123*/ 73,
-      /*0x2ca3*/ 922,
-      /*0x118c3*/ 1300,
-      -1,
-      /*0xa64d*/ 1004,
-      -1,
-      /*0x13ad*/ 537,
-      /*0x2c37*/ 856,
-      /*0x04ad*/ 374,
-      /*0x024b*/ 196,
-      /*0x1042d*/ 1140,
-      -1,
-      /*0x1e2d*/ 635,
-      /*0x1ead*/ 694,
-      /*0x012d*/ 78,
-      /*0x2cad*/ 927,
-      /*0x1e928*/ 1367,
-      -1, -1, -1,
-      /*0xa64b*/ 1003,
-      /*0x2c35*/ 854,
-      -1,
-      /*0x0249*/ 195,
-      -1,
-      /*0x03ad*/ 243,
-      -1,
-      /*0x2d24*/ 994,
-      /*0x2d22*/ 992,
-      /*0x0573*/ 458,
-      /*0xa725*/ 1036,
-      /*0x00f3*/ 44,
-      /*0x047b*/ 353,
-      /*0x04fb*/ 413,
-      /*0xa649*/ 1002,
-      /*0x118c1*/ 1298,
-      /*0x104fb*/ 1210,
-      /*0x1e7b*/ 674,
-      /*0x1efb*/ 733,
-      /*0x2d14*/ 978,
-      -1,
-      /*0x057e*/ 469,
-      /*0x1f04*/ 740,
-      /*0x00fe*/ 54,
-      /*0x16e6f*/ 1344,
-      /*0xa733*/ 1042,
-      -1, -1,
-      /*0x2d10*/ 974,
-      -1,
-      /*0x03fb*/ 291,
-      /*0x2d18*/ 982,
-      /*0x13bf*/ 555,
-      /*0x043f*/ 307,
-      /*0x04bf*/ 383,
-      -1,
-      /*0x1043f*/ 1158,
-      -1,
-      /*0x1e3f*/ 644,
-      /*0x1ebf*/ 703,
-      -1,
-      /*0x2cbf*/ 936,
-      /*0x118de*/ 1327,
-      -1,
-      /*0x0271*/ 220,
-      /*0x2d06*/ 964,
-      -1,
-      /*0x037b*/ 239,
-      -1, -1,
-      /*0x2c33*/ 852,
-      /*0x03bf*/ 260,
-      /*0x13b2*/ 542,
-      /*0x0432*/ 294,
-      /*0x2d1a*/ 984,
-      /*0x2d0c*/ 970,
-      /*0x10432*/ 1145,
-      /*0x1f71*/ 785,
-      /*0x105aa*/ 1229,
-      /*0xa723*/ 1035,
-      /*0x13b9*/ 549,
-      /*0x0439*/ 301,
-      /*0x04b9*/ 380,
-      -1,
-      /*0x10439*/ 1152,
-      /*0x0275*/ 222,
-      /*0x1e39*/ 641,
-      /*0x1eb9*/ 700,
-      -1,
-      /*0x2cb9*/ 933,
-      -1,
-      /*0x03b2*/ 247,
-      /*0x1e943*/ 1394,
-      /*0xa72d*/ 1040,
-      -1, -1,
-      /*0x118cf*/ 1312,
-      -1,
-      /*0x1f75*/ 789,
-      /*0x03b9*/ 254,
-      -1, -1,
-      /*0x13ac*/ 536,
-      /*0x13b1*/ 541,
-      /*0x0431*/ 293,
-      /*0x04b1*/ 376,
-      /*0x1042c*/ 1139,
-      /*0x10431*/ 1144,
-      -1,
-      /*0x1e31*/ 637,
-      /*0x1eb1*/ 696,
-      -1,
-      /*0x2cb1*/ 929,
-      -1, -1,
-      /*0x1e92a*/ 1369,
-      /*0x2d20*/ 990,
-      -1, -1, -1,
-      /*0x118cd*/ 1310,
-      /*0x03ac*/ 242,
-      /*0x03b1*/ 246,
-      -1,
-      /*0x13a7*/ 531,
-      /*0x1e941*/ 1392,
-      /*0x04a7*/ 371,
-      -1,
-      /*0x2d1e*/ 988,
-      -1,
-      /*0x1e27*/ 632,
-      /*0x1ea7*/ 691,
-      /*0x0127*/ 75,
-      /*0x2ca7*/ 924,
-      -1, -1,
-      /*0x118cb*/ 1308,
-      -1,
-      /*0x1f37*/ 765,
-      /*0xa73f*/ 1048,
-      -1,
-      /*0x16e6d*/ 1342,
-      -1, -1, -1, -1, -1,
-      /*0x13c7*/ 563,
-      /*0x0447*/ 315,
-      -1,
-      /*0x118c9*/ 1306,
-      /*0x10447*/ 1166,
-      /*0x1f35*/ 763,
-      /*0x1e47*/ 648,
-      /*0x1ec7*/ 707,
-      -1,
-      /*0x2cc7*/ 940,
-      /*0x0201*/ 165,
-      -1, -1, -1, -1, -1,
-      /*0x01c9*/ 139,
-      /*0x2c3f*/ 864,
-      -1,
-      /*0x03c7*/ 267,
-      /*0xa739*/ 1045,
-      -1, -1,
-      /*0x1f01*/ 737,
-      /*0x2173*/ 809,
-      -1,
-      /*0x0225*/ 182,
-      -1, -1,
-      /*0x1fd1*/ 801,
-      -1,
-      /*0x0205*/ 167,
-      -1,
-      /*0xa7b7*/ 1095,
-      /*0x214e*/ 805,
-      -1,
-      /*0x217e*/ 820,
-      /*0x2c32*/ 851,
-      -1,
-      /*0x1f25*/ 755,
-      /*0x2d02*/ 960,
-      /*0x0233*/ 189,
-      /*0x13c5*/ 561,
-      /*0x0445*/ 313,
-      /*0x1f05*/ 741,
-      /*0x2c39*/ 858,
-      /*0x10445*/ 1164,
-      /*0xa7b5*/ 1094,
-      /*0x1e45*/ 647,
-      /*0x1ec5*/ 706,
-      /*0x16e73*/ 1348,
-      /*0x2cc5*/ 939,
-      -1, -1,
-      /*0x1f33*/ 761,
-      /*0x2d0e*/ 972,
-      -1, -1,
-      /*0x2d00*/ 958,
-      /*0x0584*/ 475,
-      -1,
-      /*0x03c5*/ 265,
-      /*0x16e7e*/ 1359,
-      -1,
-      /*0xa727*/ 1037,
-      /*0xa781*/ 1076,
-      /*0x13c0*/ 556,
-      /*0x0440*/ 308,
-      /*0x2c31*/ 850,
-      -1,
-      /*0x10440*/ 1159,
-      /*0x047d*/ 354,
-      /*0x04fd*/ 414,
-      -1,
-      /*0x0140*/ 86,
-      /*0x0223*/ 181,
-      /*0x1e7d*/ 675,
-      /*0x1efd*/ 734,
-      /*0x01f5*/ 160,
-      /*0x1d7d*/ 611,
-      -1,
-      /*0xa7a5*/ 1091,
-      -1, -1, -1,
-      /*0x03c0*/ 261,
-      /*0xa785*/ 1078,
-      /*0xa747*/ 1052,
-      /*0x1f23*/ 753,
-      /*0x022d*/ 186,
-      /*0x1e03*/ 614,
-      /*0x1e83*/ 678,
-      /*0x0103*/ 57,
-      /*0x2c83*/ 906,
-      -1, -1,
-      /*0x048f*/ 359,
-      -1, -1,
-      /*0x2d11*/ 975,
-      /*0x1e0f*/ 620,
-      /*0x1e8f*/ 684,
-      /*0x010f*/ 63,
-      /*0x2c8f*/ 912,
-      /*0xa69b*/ 1034,
-      /*0x0571*/ 456,
-      /*0x037d*/ 241,
-      /*0x00f1*/ 42,
-      -1,
-      /*0xa68b*/ 1026,
-      -1, -1,
-      /*0x2c47*/ 872,
-      -1,
-      /*0x10cc7*/ 1253,
-      /*0x13bd*/ 553,
-      /*0x043d*/ 305,
-      /*0x04bd*/ 382,
-      -1,
-      /*0x1043d*/ 1156,
-      -1,
-      /*0x1e3d*/ 643,
-      /*0x1ebd*/ 702,
-      -1,
-      /*0x2cbd*/ 935,
-      -1,
-      /*0x0575*/ 460,
-      /*0x1f7b*/ 795,
-      /*0x00f5*/ 46,
-      /*0xa745*/ 1051,
-      /*0xa7a3*/ 1090,
-      /*0x13a1*/ 525,
-      -1,
-      /*0x04a1*/ 368,
-      /*0x03bd*/ 258,
-      /*0x023f*/ 191,
-      /*0xff59*/ 1133,
-      /*0x1e21*/ 629,
-      /*0x1ea1*/ 688,
-      /*0x0121*/ 72,
-      /*0x2ca1*/ 921,
-      /*0x13bb*/ 551,
-      /*0x043b*/ 303,
-      /*0x04bb*/ 381,
-      /*0x105ae*/ 1233,
-      /*0x1043b*/ 1154,
-      -1,
-      /*0x1e3b*/ 642,
-      /*0x1ebb*/ 701,
-      -1,
-      /*0x2cbb*/ 934,
-      -1, -1, -1,
-      /*0x2c45*/ 870,
-      /*0x13af*/ 539,
-      /*0x10cc5*/ 1251,
-      /*0x04af*/ 375,
-      /*0x105b7*/ 1241,
-      /*0x1042f*/ 1142,
-      /*0x03bb*/ 256,
-      /*0x1e2f*/ 636,
-      /*0x1eaf*/ 695,
-      /*0x012f*/ 79,
-      /*0x2caf*/ 928,
-      -1,
-      /*0x01a5*/ 129,
-      -1,
-      /*0x1f32*/ 760,
-      /*0x0499*/ 364,
-      -1,
-      /*0x0185*/ 119,
-      /*0x105b5*/ 1239,
-      /*0x1e19*/ 625,
-      /*0x03af*/ 245,
-      /*0x0119*/ 68,
-      /*0x2c99*/ 917,
-      -1,
-      /*0x2c40*/ 865,
-      /*0x13e6*/ 594,
-      /*0x10cc0*/ 1246,
-      /*0x1e92e*/ 1373,
-      /*0x0066*/ 5,
-      -1,
-      /*0x104e6*/ 1189,
-      -1,
-      /*0x0231*/ 188,
-      /*0x0581*/ 472,
-      -1,
-      /*0x10fd*/ 521,
-      /*0xa7bf*/ 1099,
-      /*0x13f2*/ 606,
-      -1,
-      /*0x24e6*/ 845,
-      /*0x0072*/ 16,
-      /*0x1e937*/ 1382,
-      /*0x104f2*/ 1201,
-      -1,
-      /*0x0501*/ 416,
-      /*0x1f31*/ 759,
-      -1, -1,
-      /*0xa73d*/ 1047,
-      -1, -1, -1,
-      /*0x105a5*/ 1224,
-      /*0x0227*/ 183,
-      /*0x0585*/ 476,
-      /*0x1e935*/ 1380,
-      /*0x03f2*/ 288,
-      -1, -1, -1,
-      /*0x0525*/ 434,
-      /*0x01a3*/ 128,
-      -1, -1,
-      /*0xa7b9*/ 1096,
-      /*0x0505*/ 418,
-      /*0x1f27*/ 757,
-      /*0x105b3*/ 1237,
-      -1, -1, -1,
-      /*0x1059c*/ 1216,
-      -1,
-      /*0x2c3d*/ 862,
-      /*0xa73b*/ 1046,
-      /*0x01ad*/ 131,
-      /*0x0247*/ 194,
-      /*0x13a9*/ 533,
-      -1,
-      /*0x04a9*/ 372,
-      -1,
-      /*0x10429*/ 1136,
-      -1,
-      /*0x1e29*/ 633,
-      /*0x1ea9*/ 692,
-      /*0x0129*/ 76,
-      /*0x2ca9*/ 925,
-      /*0xa647*/ 1001,
-      /*0xa72f*/ 1041,
-      /*0x1e925*/ 1364,
-      /*0x0479*/ 352,
-      /*0x04f9*/ 412,
-      /*0x0079*/ 23,
-      /*0x2171*/ 807,
-      /*0x104f9*/ 1208,
-      /*0x1e79*/ 673,
-      /*0x1ef9*/ 732,
-      -1,
-      /*0x1d79*/ 610,
-      /*0x2c3b*/ 860,
-      /*0x01fb*/ 162,
-      /*0x105a3*/ 1222,
-      -1, -1,
-      /*0x1e933*/ 1378,
-      -1,
-      /*0xff57*/ 1131,
-      -1,
-      /*0xa7a7*/ 1092,
-      /*0x0523*/ 433,
-      -1, -1, -1, -1,
-      /*0x2175*/ 811,
-      /*0x105ad*/ 1232,
-      /*0x13d0*/ 572,
-      /*0x0450*/ 324,
-      -1,
-      /*0x16e71*/ 1346,
-      -1,
-      /*0x01bf*/ 137,
-      -1,
-      /*0x052d*/ 438,
-      /*0x13c2*/ 558,
-      /*0x0442*/ 310,
-      /*0x04c2*/ 384,
-      -1,
-      /*0x10442*/ 1161,
-      /*0xa645*/ 1000,
-      /*0x24d0*/ 823,
-      /*0x1f45*/ 771,
-      /*0x0142*/ 87,
-      /*0x1e09*/ 617,
-      /*0x1e89*/ 681,
-      /*0x0109*/ 60,
-      /*0x2c89*/ 909,
-      /*0x2c66*/ 899,
-      /*0x1e923*/ 1362,
-      /*0x10ce6*/ 1284,
-      /*0x16e75*/ 1350,
-      -1,
-      /*0x0240*/ 192,
-      -1,
-      /*0x10e6*/ 500,
-      -1,
-      /*0x027d*/ 223,
-      -1,
-      /*0x057b*/ 466,
-      /*0x01b9*/ 135,
-      /*0x00fb*/ 51,
-      /*0x10cf2*/ 1296,
-      /*0x1e92d*/ 1372,
-      -1, -1,
-      /*0x1f40*/ 766,
-      /*0x10f2*/ 512,
-      -1, -1,
-      /*0x1f7d*/ 797,
-      /*0x0203*/ 166,
-      -1,
-      /*0xff51*/ 1125,
-      -1,
-      /*0xa729*/ 1038,
-      -1,
-      /*0x047f*/ 355,
-      /*0x04ff*/ 415,
-      -1, -1,
-      /*0x020f*/ 172,
-      /*0x1e7f*/ 676,
-      /*0x1eff*/ 735,
-      /*0x1f03*/ 739,
-      /*0x0477*/ 351,
-      /*0x04f7*/ 411,
-      /*0x0077*/ 21,
-      -1,
-      /*0x104f7*/ 1206,
-      /*0x1e77*/ 672,
-      /*0x1ef7*/ 731,
-      /*0x0177*/ 113,
-      /*0x13ec*/ 600,
-      -1, -1,
-      /*0x006c*/ 10,
-      -1,
-      /*0x104ec*/ 1195,
-      /*0x13ab*/ 535,
-      /*0x105b9*/ 1243,
-      /*0x04ab*/ 373,
-      /*0x2cec*/ 955,
-      /*0x1042b*/ 1138,
-      -1,
-      /*0x1e2b*/ 634,
-      /*0x1eab*/ 693,
-      /*0x012b*/ 77,
-      /*0x2cab*/ 926,
-      /*0x1e93f*/ 1390,
-      /*0x13e8*/ 596,
-      -1, -1,
-      /*0x0068*/ 7,
-      /*0x118c7*/ 1304,
-      /*0x104e8*/ 1191,
-      -1, -1,
-      /*0x2184*/ 822,
-      /*0x10f9*/ 519,
-      /*0x0377*/ 238,
-      -1,
-      /*0x105ac*/ 1231,
-      /*0x105b1*/ 1236,
-      /*0x24e8*/ 847,
-      /*0x13ea*/ 598,
-      /*0xa783*/ 1077,
-      -1,
-      /*0x006a*/ 8,
-      /*0x1e932*/ 1377,
-      /*0x104ea*/ 1193,
-      /*0x1f21*/ 751,
-      /*0x2d04*/ 962,
-      -1, -1, -1,
-      /*0xa691*/ 1029,
-      /*0x1e939*/ 1384,
-      -1,
-      /*0x2c50*/ 881,
-      -1,
-      /*0x10cd0*/ 1262,
-      /*0x022f*/ 187,
-      -1,
-      /*0x105a7*/ 1226,
-      -1,
-      /*0x10d0*/ 478,
-      /*0x2c42*/ 867,
-      /*0x13f0*/ 604,
-      /*0x10cc2*/ 1248,
-      -1,
-      /*0x0070*/ 14,
-      /*0x0527*/ 435,
-      /*0x104f0*/ 1199,
-      /*0x0219*/ 177,
-      -1,
-      /*0x118c5*/ 1302,
-      /*0xa7bd*/ 1098,
-      -1,
-      /*0x1e92c*/ 1371,
-      /*0x1e931*/ 1376,
-      -1, -1,
-      /*0xa77f*/ 1075,
-      -1,
-      /*0xff53*/ 1127,
-      /*0x0266*/ 213,
-      -1,
-      /*0x13c8*/ 564,
-      /*0x0448*/ 316,
-      /*0x04c8*/ 387,
-      -1,
-      /*0x10448*/ 1167,
-      /*0xa7a1*/ 1089,
-      -1,
-      /*0xff55*/ 1129,
-      /*0x0148*/ 90,
-      -1,
-      /*0x0272*/ 221,
-      /*0x1f66*/ 782,
-      /*0x118c0*/ 1297,
-      /*0x1e927*/ 1366,
-      -1,
-      /*0xa7bb*/ 1097,
-      -1, -1,
-      /*0xa72b*/ 1039,
-      /*0x03c8*/ 268,
-      /*0x0076*/ 20,
-      -1,
-      /*0x104f6*/ 1205,
-      /*0x1f72*/ 786,
-      -1, -1, -1,
-      /*0x10ff*/ 523,
-      -1,
-      /*0x01fd*/ 163,
-      -1,
-      /*0x13e4*/ 592,
-      -1,
-      /*0x217b*/ 817,
-      /*0x0064*/ 3,
-      /*0x10f7*/ 517,
-      /*0x104e4*/ 1187,
-      /*0x2c6c*/ 902,
-      /*0xff4e*/ 1122,
-      /*0x10cec*/ 1290,
-      -1,
-      /*0xa799*/ 1085,
-      /*0x0495*/ 362,
-      /*0x0183*/ 118,
-      /*0x10ec*/ 506,
-      /*0x24e4*/ 843,
-      /*0x1e15*/ 623,
-      /*0x1e95*/ 687,
-      /*0x0115*/ 66,
-      /*0x2c95*/ 915,
-      /*0x0229*/ 184,
-      -1, -1, -1,
-      /*0x2c68*/ 900,
-      -1,
-      /*0x10ce8*/ 1286,
-      -1, -1,
-      /*0x16e7b*/ 1356,
-      -1,
-      /*0x10e8*/ 502,
-      /*0xff43*/ 1111,
-      -1,
-      /*0x13c6*/ 562,
-      /*0x0446*/ 314,
-      /*0x04c6*/ 386,
-      -1,
-      /*0x10446*/ 1165,
-      /*0x2c6a*/ 901,
-      -1,
-      /*0x10cea*/ 1288,
-      /*0x0146*/ 89,
-      -1,
-      /*0x01bd*/ 136,
-      /*0x1f79*/ 793,
-      /*0x10ea*/ 504,
-      /*0x057d*/ 468,
-      -1,
-      /*0x00fd*/ 53,
-      /*0x0583*/ 474,
-      /*0x0493*/ 361,
-      -1,
-      /*0x03c6*/ 266,
-      -1,
-      /*0x1e13*/ 622,
-      /*0x1e93*/ 686,
-      /*0x0113*/ 65,
-      /*0x2c93*/ 914,
-      /*0x0250*/ 199,
-      /*0x01a1*/ 127,
-      /*0x0503*/ 417,
-      /*0x2d01*/ 959,
-      /*0x13e0*/ 588,
-      /*0x10cf0*/ 1294,
-      /*0xff41*/ 1109,
-      -1,
-      /*0x0242*/ 193,
-      /*0x104e0*/ 1183,
-      /*0x10f0*/ 510,
-      /*0x0209*/ 169,
-      /*0x050f*/ 423,
-      /*0x1e940*/ 1391,
-      -1, -1,
-      /*0xa7a9*/ 1093,
-      -1,
-      /*0x24e0*/ 839,
-      /*0x2d25*/ 995,
-      -1,
-      /*0x1f42*/ 768,
-      -1,
-      /*0x2c48*/ 873,
-      /*0x2d05*/ 963,
-      /*0x10cc8*/ 1254,
-      /*0x1e07*/ 616,
-      /*0x1e87*/ 680,
-      /*0x0107*/ 59,
-      /*0x2c87*/ 908,
-      -1,
-      /*0x13c4*/ 560,
-      /*0x0444*/ 312,
-      /*0x04c4*/ 385,
-      -1,
-      /*0x10444*/ 1163,
-      -1,
-      /*0x0199*/ 124,
-      /*0x2d1c*/ 986,
-      /*0x0144*/ 88,
-      /*0x2c76*/ 904,
-      /*0x105a1*/ 1221,
-      -1, -1, -1, -1,
-      /*0x0283*/ 226,
-      /*0x10f6*/ 516,
-      /*0x0497*/ 363,
-      /*0x0521*/ 432,
-      /*0x03c4*/ 264,
-      /*0x105bb*/ 1244,
-      /*0x1e17*/ 624,
-      /*0x049d*/ 366,
-      /*0x0117*/ 67,
-      /*0x2c97*/ 916,
-      /*0x10ce4*/ 1282,
-      /*0x1e1d*/ 627,
-      -1,
-      /*0x011d*/ 70,
-      /*0x2c9d*/ 919,
-      /*0x10e4*/ 498,
-      /*0x1e93d*/ 1388,
-      -1, -1,
-      /*0x105af*/ 1234,
-      /*0x026c*/ 218,
-      /*0xff4f*/ 1123,
-      /*0x2d23*/ 993,
-      -1,
-      /*0x1f77*/ 791,
-      -1,
-      /*0x022b*/ 185,
-      /*0x052f*/ 439,
-      -1, -1,
-      /*0x13e2*/ 590,
-      /*0x10599*/ 1213,
-      -1,
-      /*0x0062*/ 1,
-      -1,
-      /*0x104e2*/ 1185,
-      /*0x2d2d*/ 997,
-      /*0x0268*/ 214,
-      -1,
-      /*0x0519*/ 428,
-      -1,
-      /*0x2c46*/ 871,
-      /*0x1e93b*/ 1386,
-      /*0x10cc6*/ 1252,
-      /*0x24e2*/ 841,
-      /*0xff4d*/ 1121,
-      /*0x13d6*/ 578,
-      /*0x0456*/ 330,
-      /*0x0078*/ 22,
-      -1,
-      /*0x104f8*/ 1207,
-      /*0x0566*/ 445,
-      /*0x026a*/ 216,
-      /*0x00e6*/ 31,
-      /*0x13dc*/ 584,
-      /*0x045c*/ 336,
-      /*0x1e92f*/ 1374,
-      /*0x13da*/ 582,
-      /*0x045a*/ 334,
-      /*0x104dc*/ 1179,
-      /*0x24d6*/ 829,
-      /*0xff4b*/ 1119,
-      /*0x104da*/ 1177,
-      /*0x0572*/ 457,
-      /*0x03f8*/ 290,
-      /*0x00f2*/ 43,
-      -1,
-      /*0x01f9*/ 161,
-      /*0x24dc*/ 835,
-      -1, -1,
-      /*0x24da*/ 833,
-      /*0x10ce0*/ 1278,
-      -1, -1,
-      /*0xff49*/ 1117,
-      -1,
-      /*0x10e0*/ 494,
-      -1, -1, -1,
-      /*0x118d0*/ 1313,
-      /*0x13bc*/ 552,
-      /*0x043c*/ 304,
-      /*0x217d*/ 819,
-      -1,
-      /*0x1043c*/ 1155,
-      -1,
-      /*0x1f70*/ 784,
-      /*0x118c2*/ 1299,
-      /*0x013c*/ 84,
-      /*0x017c*/ 115,
-      -1, -1,
-      /*0x01d0*/ 142,
-      /*0x105a9*/ 1228,
-      -1,
-      /*0x2c44*/ 869,
-      /*0x1fb1*/ 799,
-      /*0x10cc4*/ 1250,
-      -1,
-      /*0x03bc*/ 257,
-      -1,
-      /*0x0529*/ 436,
-      /*0x13d8*/ 580,
-      /*0x0458*/ 332,
-      -1, -1, -1,
-      /*0x104d8*/ 1175,
-      /*0x16e7d*/ 1358,
-      -1,
-      /*0x13ca*/ 566,
-      /*0x044a*/ 318,
-      /*0x04ca*/ 388,
-      /*0x0579*/ 464,
-      /*0x1044a*/ 1169,
-      /*0x00f9*/ 49,
-      /*0x24d8*/ 831,
-      /*0x037c*/ 240,
-      /*0x13d4*/ 576,
-      /*0x0454*/ 328,
-      -1, -1, -1,
-      /*0x1f76*/ 790,
-      /*0x13b6*/ 546,
-      /*0x0436*/ 298,
-      -1, -1,
-      /*0x10436*/ 1149,
-      /*0x03ca*/ 270,
-      /*0x1e929*/ 1368,
-      -1,
-      /*0x24d4*/ 827,
-      /*0x0215*/ 175,
-      /*0x13b0*/ 540,
-      /*0x0430*/ 292,
-      -1,
-      /*0x1f64*/ 780,
-      /*0x10430*/ 1143,
-      /*0x13d2*/ 574,
-      /*0x0452*/ 326,
-      /*0x01ff*/ 164,
-      /*0x10ce2*/ 1280,
-      /*0x03b6*/ 251,
-      -1, -1,
-      /*0x1f15*/ 749,
-      /*0x10e2*/ 496,
-      /*0xa7c8*/ 1102,
-      -1, -1,
-      /*0x0509*/ 420,
-      /*0x2d27*/ 996,
-      /*0x24d2*/ 825,
-      -1, -1,
-      /*0x2c56*/ 887,
-      -1,
-      /*0x10cd6*/ 1268,
-      -1, -1, -1,
-      /*0x10f8*/ 518,
-      /*0x10d6*/ 484,
-      /*0x2c5c*/ 893,
-      /*0xa7f6*/ 1107,
-      /*0x10cdc*/ 1274,
-      /*0x2c5a*/ 891,
-      /*0xa77c*/ 1074,
-      /*0x10cda*/ 1272,
-      -1,
-      /*0x10dc*/ 490,
-      /*0x0213*/ 174,
-      -1,
-      /*0x10da*/ 488,
-      /*0x13f4*/ 608,
-      -1,
-      /*0x1e942*/ 1393,
-      /*0x0074*/ 18,
-      -1,
-      /*0x104f4*/ 1203,
-      -1, -1, -1, -1,
-      /*0x1f13*/ 747,
-      /*0x0260*/ 209,
-      -1, -1,
-      /*0x057f*/ 470,
-      -1,
-      /*0x00ff*/ 55,
-      /*0x2c3c*/ 861,
-      -1, -1,
-      /*0x0289*/ 229,
-      -1,
-      /*0x0577*/ 462,
-      -1,
-      /*0x1f60*/ 776,
-      -1, -1,
-      /*0x0207*/ 168,
-      /*0x2172*/ 808,
-      /*0x105ab*/ 1230,
-      -1,
-      /*0x056c*/ 451,
-      -1,
-      /*0x00ec*/ 37,
-      -1, -1, -1,
-      /*0x052b*/ 437,
-      -1,
-      /*0x2c58*/ 889,
-      /*0x1f07*/ 743,
-      /*0x10cd8*/ 1270,
-      /*0x16e66*/ 1335,
-      -1, -1,
-      /*0x118c8*/ 1305,
-      /*0x10d8*/ 486,
-      /*0x2c4a*/ 875,
-      /*0x0568*/ 447,
-      /*0x10cca*/ 1256,
-      /*0x00e8*/ 33,
-      /*0x1f44*/ 770,
-      /*0xa793*/ 1082,
-      /*0x0217*/ 176,
-      /*0x16e72*/ 1347,
-      /*0x2c54*/ 885,
-      -1,
-      /*0x10cd4*/ 1266,
-      /*0x021d*/ 179,
-      -1,
-      /*0xa681*/ 1021,
-      /*0x2c36*/ 855,
-      /*0x10d4*/ 482,
-      /*0x056a*/ 449,
-      -1,
-      /*0x00ea*/ 35,
-      /*0x1e92b*/ 1370,
-      -1,
-      /*0x13b4*/ 544,
-      /*0x0434*/ 296,
-      -1,
-      /*0x2c30*/ 849,
-      /*0x10434*/ 1147,
-      -1, -1, -1,
-      /*0x2c52*/ 883,
-      -1,
-      /*0x10cd2*/ 1264,
-      -1,
-      /*0x2179*/ 815,
-      /*0xa685*/ 1023,
-      /*0xa787*/ 1079,
-      /*0x10d2*/ 480,
-      /*0x2d03*/ 961,
-      -1,
-      /*0x0570*/ 455,
-      /*0x03b4*/ 249,
-      /*0x00f0*/ 41,
-      -1, -1,
-      /*0x13cc*/ 568,
-      /*0x044c*/ 320,
-      /*0x04cc*/ 389,
-      /*0x2d0f*/ 973,
-      /*0x1044c*/ 1171,
-      /*0x1f62*/ 778,
-      /*0x049f*/ 367,
-      /*0x0195*/ 123,
-      /*0x0256*/ 204,
-      -1,
-      /*0x1e1f*/ 628,
-      -1,
-      /*0x011f*/ 71,
-      /*0x2c9f*/ 920,
-      -1,
-      /*0x16e79*/ 1354,
-      /*0x025c*/ 208,
-      /*0xa797*/ 1084,
-      /*0x118c6*/ 1303,
-      /*0x03cc*/ 272,
-      /*0x1f78*/ 792,
-      -1,
-      /*0xa79d*/ 1087,
-      -1, -1, -1, -1, -1,
-      /*0x10f4*/ 514,
-      -1, -1,
-      /*0x01c6*/ 138,
-      /*0x0576*/ 461,
-      -1,
-      /*0x00f6*/ 47,
-      -1, -1,
-      /*0x13be*/ 554,
-      /*0x043e*/ 306,
-      -1,
-      /*0x2d21*/ 991,
-      /*0x1043e*/ 1157,
-      -1, -1,
-      /*0x023c*/ 190,
-      /*0x013e*/ 85,
-      /*0x0564*/ 443,
-      /*0x048d*/ 358,
-      /*0x00e4*/ 29,
-      -1, -1,
-      /*0x1e0d*/ 619,
-      /*0x1e8d*/ 683,
-      /*0x010d*/ 62,
-      /*0x2c8d*/ 911,
-      /*0x0515*/ 426,
-      /*0x03be*/ 259,
-      -1,
-      /*0x1f7c*/ 796,
-      /*0x13ba*/ 550,
-      /*0x043a*/ 302,
-      -1, -1,
-      /*0x1043a*/ 1153,
-      -1,
-      /*0x217f*/ 821,
-      -1,
-      /*0x013a*/ 83,
-      -1, -1, -1,
-      /*0x13b8*/ 548,
-      /*0x0438*/ 300,
-      /*0x2177*/ 813,
-      /*0x118c4*/ 1301,
-      /*0x10438*/ 1151,
-      /*0x2d19*/ 983,
-      -1,
-      /*0x03ba*/ 255,
-      -1, -1, -1,
-      /*0x0254*/ 203,
-      -1, -1, -1, -1, -1, -1,
-      /*0x2c34*/ 853,
-      /*0x03b8*/ 253,
-      /*0x16e7f*/ 1360,
-      -1, -1,
-      /*0x0513*/ 425,
-      -1, -1, -1, -1,
-      /*0x16e77*/ 1352,
-      -1,
-      /*0x1f36*/ 764,
-      -1,
-      /*0x0252*/ 201,
-      -1, -1, -1, -1,
-      /*0x16e6c*/ 1341,
-      -1,
-      /*0x00e0*/ 25,
-      /*0x1f30*/ 758,
-      /*0x2c4c*/ 877,
-      -1,
-      /*0x10ccc*/ 1258,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1,
-      /*0x0507*/ 419,
-      /*0x16e68*/ 1337,
-      -1, -1, -1,
-      /*0xa7ca*/ 1103,
-      -1, -1, -1, -1, -1,
-      /*0x118d6*/ 1319,
-      -1,
-      /*0x2170*/ 806,
-      -1, -1,
-      /*0x16e6a*/ 1339,
-      -1,
-      /*0x10597*/ 1211,
-      /*0x118dc*/ 1325,
-      /*0x1fd0*/ 800,
-      -1,
-      /*0x118da*/ 1323,
-      /*0x1059d*/ 1217,
-      /*0x01d6*/ 145,
-      /*0x2c3e*/ 863,
-      /*0x0517*/ 427,
-      -1,
-      /*0x1f74*/ 788,
-      -1, -1,
-      /*0x051d*/ 430,
-      /*0x01dc*/ 148,
-      -1, -1,
-      /*0x01da*/ 147,
-      -1,
-      /*0xff47*/ 1115,
-      -1,
-      /*0x16e70*/ 1345,
-      -1, -1, -1, -1,
-      /*0x0287*/ 227,
-      -1, -1,
-      /*0x2c3a*/ 859,
-      -1, -1,
-      /*0x2176*/ 812,
-      -1, -1, -1, -1, -1,
-      /*0x0562*/ 441,
-      -1,
-      /*0x00e2*/ 27,
-      /*0x2c38*/ 857,
-      -1, -1, -1, -1, -1, -1,
-      /*0x2d09*/ 967,
-      -1, -1,
-      /*0x118d8*/ 1321,
-      -1,
-      /*0x0578*/ 463,
-      -1,
-      /*0x00f8*/ 48,
-      -1,
-      /*0x029d*/ 234,
-      /*0x16e76*/ 1351,
-      /*0x118ca*/ 1307,
-      -1,
-      /*0xff45*/ 1113,
-      -1, -1,
-      /*0x01d8*/ 146,
-      -1, -1,
-      /*0x118d4*/ 1317,
-      -1, -1, -1, -1,
-      /*0x16e64*/ 1333,
-      -1, -1, -1, -1, -1,
-      /*0x1f34*/ 762,
-      -1,
-      /*0x01d4*/ 144,
-      -1,
-      /*0x105bc*/ 1245,
-      -1, -1, -1,
-      /*0x01b6*/ 134,
-      -1,
-      /*0x118d2*/ 1315,
-      -1, -1,
-      /*0x057c*/ 467,
-      /*0x021f*/ 180,
-      /*0x00fc*/ 52,
-      -1, -1,
-      /*0x01b0*/ 132,
-      -1, -1, -1, -1,
-      /*0x01d2*/ 143,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1,
-      /*0x1e93c*/ 1387,
-      -1, -1, -1, -1, -1, -1,
-      /*0x105b6*/ 1240,
-      -1, -1, -1, -1,
-      /*0xa683*/ 1022,
-      -1,
-      /*0x020d*/ 171,
-      /*0x16e60*/ 1329,
-      -1,
-      /*0x105b0*/ 1235,
-      -1, -1, -1, -1,
-      /*0xa68f*/ 1028,
-      -1, -1, -1, -1, -1,
-      /*0xa79f*/ 1088,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1,
-      /*0x1e936*/ 1381,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1,
-      /*0x1e930*/ 1375,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1,
-      /*0x0574*/ 459,
-      -1,
-      /*0x00f4*/ 45,
-      -1, -1, -1, -1, -1, -1,
-      -1,
-      /*0x2178*/ 814,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1,
-      /*0x01b4*/ 133,
-      /*0x16e62*/ 1331,
-      -1, -1, -1, -1, -1, -1,
-      -1,
-      /*0xa699*/ 1033,
-      /*0x118cc*/ 1309,
-      -1, -1,
-      /*0x2d15*/ 979,
-      -1, -1,
-      /*0x16e78*/ 1353,
-      -1, -1, -1, -1, -1, -1,
-      /*0x01cc*/ 140,
-      -1, -1, -1, -1,
-      /*0x217c*/ 818,
-      -1, -1,
-      /*0x1fe0*/ 802,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1,
-      /*0x105b4*/ 1238,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1,
-      /*0x2d13*/ 977,
-      -1,
-      /*0x16e7c*/ 1357,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      /*0x1059f*/ 1219,
-      -1, -1, -1, -1, -1, -1,
-      -1,
-      /*0x051f*/ 431,
-      -1,
-      /*0x1e934*/ 1379,
-      -1, -1, -1, -1,
-      /*0x2d07*/ 965,
-      -1,
-      /*0xff50*/ 1124,
-      -1, -1, -1, -1, -1, -1,
-      -1,
-      /*0xff42*/ 1110,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1,
-      /*0x2d17*/ 981,
-      -1, -1, -1, -1,
-      /*0x2d1d*/ 987,
-      -1, -1,
-      /*0x050d*/ 422,
-      -1, -1, -1, -1, -1,
-      /*0x2174*/ 810,
-      /*0xa689*/ 1025,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1,
-      /*0x105b8*/ 1242,
-      -1, -1,
-      /*0x1e93e*/ 1389,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1,
-      /*0x16e74*/ 1349,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1,
-      /*0x1e93a*/ 1385,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1,
-      /*0x1e938*/ 1383,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1,
-      /*0x1fb0*/ 798,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1,
-      /*0xff48*/ 1116,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1,
-      /*0xff46*/ 1114,
-      -1, -1, -1,
-      /*0xa695*/ 1031,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1,
-      /*0xa693*/ 1030,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      /*0xff44*/ 1112,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1,
-      /*0xa687*/ 1024,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1,
-      /*0x2d1f*/ 989,
-      -1, -1, -1, -1, -1, -1,
-      -1,
-      /*0xa697*/ 1032,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1,
-      /*0xff56*/ 1130,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1,
-      /*0xff5a*/ 1134,
-      -1, -1, -1,
-      /*0x2d0d*/ 971,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      /*0xff58*/ 1132,
-      -1, -1, -1, -1, -1, -1,
-      -1,
-      /*0xff4a*/ 1118,
-      -1, -1, -1, -1, -1, -1,
-      -1,
-      /*0xff54*/ 1128,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1,
-      /*0xff52*/ 1126,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      /*0xff4c*/ 1120,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      /*0xa68d*/ 1027
-    };
-
-  if (code <= MAX_CODE_VALUE && code >= MIN_CODE_VALUE)
-    {
-      register unsigned int key = onigenc_unicode_CaseUnfold_11_hash(code);
-
-      if (key <= MAX_HASH_VALUE)
-        {
-          register short s = wordlist[key];
-
-          if (s >= 0 && code1_equal(code, CaseUnfold_11_Table[s].from))
-            return &CaseUnfold_11_Table[s].to;
-        }
-    }
-  return 0;
-}
-
-static const CaseUnfold_12_Type CaseUnfold_12_Table[] = {
-#define CaseUnfold_12 (*(CaseUnfold_12_Type (*)[58])(CaseUnfold_12_Table+0))
-  {{0x0061, 0x02be}, {1, {0x1e9a}}},
-  {{0x0066, 0x0066}, {1, {0xfb00}}},
-  {{0x0066, 0x0069}, {1, {0xfb01}}},
-  {{0x0066, 0x006c}, {1, {0xfb02}}},
-  {{0x0068, 0x0331}, {1, {0x1e96}}},
-  {{0x006a, 0x030c}, {1, {0x01f0}}},
-  {{0x0073, 0x0073}, {2, {0x00df, 0x1e9e}}},
-  {{0x0073, 0x0074}, {2, {0xfb05, 0xfb06}}},
-  {{0x0074, 0x0308}, {1, {0x1e97}}},
-  {{0x0077, 0x030a}, {1, {0x1e98}}},
-  {{0x0079, 0x030a}, {1, {0x1e99}}},
-  {{0x02bc, 0x006e}, {1, {0x0149}}},
-  {{0x03ac, 0x03b9}, {1, {0x1fb4}}},
-  {{0x03ae, 0x03b9}, {1, {0x1fc4}}},
-  {{0x03b1, 0x0342}, {1, {0x1fb6}}},
-  {{0x03b1, 0x03b9}, {2, {0x1fb3, 0x1fbc}}},
-  {{0x03b7, 0x0342}, {1, {0x1fc6}}},
-  {{0x03b7, 0x03b9}, {2, {0x1fc3, 0x1fcc}}},
-  {{0x03b9, 0x0342}, {1, {0x1fd6}}},
-  {{0x03c1, 0x0313}, {1, {0x1fe4}}},
-  {{0x03c5, 0x0313}, {1, {0x1f50}}},
-  {{0x03c5, 0x0342}, {1, {0x1fe6}}},
-  {{0x03c9, 0x0342}, {1, {0x1ff6}}},
-  {{0x03c9, 0x03b9}, {2, {0x1ff3, 0x1ffc}}},
-  {{0x03ce, 0x03b9}, {1, {0x1ff4}}},
-  {{0x0565, 0x0582}, {1, {0x0587}}},
-  {{0x0574, 0x0565}, {1, {0xfb14}}},
-  {{0x0574, 0x056b}, {1, {0xfb15}}},
-  {{0x0574, 0x056d}, {1, {0xfb17}}},
-  {{0x0574, 0x0576}, {1, {0xfb13}}},
-  {{0x057e, 0x0576}, {1, {0xfb16}}},
-  {{0x1f00, 0x03b9}, {2, {0x1f80, 0x1f88}}},
-  {{0x1f01, 0x03b9}, {2, {0x1f81, 0x1f89}}},
-  {{0x1f02, 0x03b9}, {2, {0x1f82, 0x1f8a}}},
-  {{0x1f03, 0x03b9}, {2, {0x1f83, 0x1f8b}}},
-  {{0x1f04, 0x03b9}, {2, {0x1f84, 0x1f8c}}},
-  {{0x1f05, 0x03b9}, {2, {0x1f85, 0x1f8d}}},
-  {{0x1f06, 0x03b9}, {2, {0x1f86, 0x1f8e}}},
-  {{0x1f07, 0x03b9}, {2, {0x1f87, 0x1f8f}}},
-  {{0x1f20, 0x03b9}, {2, {0x1f90, 0x1f98}}},
-  {{0x1f21, 0x03b9}, {2, {0x1f91, 0x1f99}}},
-  {{0x1f22, 0x03b9}, {2, {0x1f92, 0x1f9a}}},
-  {{0x1f23, 0x03b9}, {2, {0x1f93, 0x1f9b}}},
-  {{0x1f24, 0x03b9}, {2, {0x1f94, 0x1f9c}}},
-  {{0x1f25, 0x03b9}, {2, {0x1f95, 0x1f9d}}},
-  {{0x1f26, 0x03b9}, {2, {0x1f96, 0x1f9e}}},
-  {{0x1f27, 0x03b9}, {2, {0x1f97, 0x1f9f}}},
-  {{0x1f60, 0x03b9}, {2, {0x1fa0, 0x1fa8}}},
-  {{0x1f61, 0x03b9}, {2, {0x1fa1, 0x1fa9}}},
-  {{0x1f62, 0x03b9}, {2, {0x1fa2, 0x1faa}}},
-  {{0x1f63, 0x03b9}, {2, {0x1fa3, 0x1fab}}},
-  {{0x1f64, 0x03b9}, {2, {0x1fa4, 0x1fac}}},
-  {{0x1f65, 0x03b9}, {2, {0x1fa5, 0x1fad}}},
-  {{0x1f66, 0x03b9}, {2, {0x1fa6, 0x1fae}}},
-  {{0x1f67, 0x03b9}, {2, {0x1fa7, 0x1faf}}},
-  {{0x1f70, 0x03b9}, {1, {0x1fb2}}},
-  {{0x1f74, 0x03b9}, {1, {0x1fc2}}},
-  {{0x1f7c, 0x03b9}, {1, {0x1ff2}}},
-#define CaseUnfold_12_Locale (*(CaseUnfold_12_Type (*)[1])(CaseUnfold_12_Table+58))
-  {{0x0069, 0x0307}, {1, {0x0130}}},
-};
-
-/* ANSI-C code produced by gperf version 3.1 */
-/* Command-line: gperf -7 -k1,2,3,4,5,6 -F,-1 -c -j1 -i1 -t -T -E -C -H onigenc_unicode_CaseUnfold_12_hash -N onigenc_unicode_CaseUnfold_12_lookup -n  */
-
-/* maximum key range = 71, duplicates = 0 */
-
-#ifdef __GNUC__
-__inline
-#else
-#ifdef __cplusplus
-inline
-#endif
-#endif
-/*ARGSUSED*/
-static unsigned int
-onigenc_unicode_CaseUnfold_12_hash(const OnigCodePoint *codes)
-{
-  static const unsigned char asso_values[] =
-    {
-       3, 58, 54, 57, 56, 16,  8,  2, 43, 82,
-       3,  1, 23, 82, 82, 82, 82, 82, 82,  4,
-      82, 82, 82, 82, 82, 82, 82, 82, 82, 82,
-      82, 82, 52, 51, 50, 49, 48, 47, 46, 45,
-      82, 82, 82, 82, 43, 82, 42, 82, 82, 13,
-      82, 82, 82, 82, 82, 11, 82,  1, 82, 82,
-      14, 82,  1, 82, 82, 31,  3, 82, 82, 30,
-      82, 82, 82, 10, 82, 82, 82, 82, 37, 82,
-      82, 82, 82, 82, 82, 82, 82, 82, 82, 82,
-      82, 82, 82, 82, 82, 82, 37, 15, 36, 35,
-      34, 17,  1, 33, 12,  4, 23, 23, 26, 21,
-      13, 82, 27, 82, 82,  2,  5, 82, 11, 16,
-      82, 15, 82, 82, 23, 82,  8, 82
-    };
-  return asso_values[bits_at(codes, 5)] + asso_values[bits_at(codes, 4)] + asso_values[bits_at(codes, 3)] + asso_values[bits_at(codes, 2)] + asso_values[bits_at(codes, 1)] + asso_values[bits_at(codes, 0)];
-}
-
-static const CodePointList2 *
-onigenc_unicode_CaseUnfold_12_lookup(const OnigCodePoint *codes)
-{
-  enum
-    {
-      MIN_CODE_VALUE = 0x61,
-      MAX_CODE_VALUE = 0x1f7c,
-      TOTAL_KEYWORDS = 59,
-      MIN_WORD_LENGTH = 6,
-      MAX_WORD_LENGTH = 6,
-      MIN_HASH_VALUE = 11,
-      MAX_HASH_VALUE = 81
-    };
-
-  static const short wordlist[] =
-    {
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1,
-      /*0x1f66,0x03b9*/ 53,
-      /*0x1f07,0x03b9*/ 38,
-      /*0x1f00,0x03b9*/ 31,
-      /*0x0066,0x0066*/ 1,
-      /*0x1f74,0x03b9*/ 56,
-      /*0x0073,0x0073*/ 6,
-      /*0x0066,0x0069*/ 2,
-      /*0x1f06,0x03b9*/ 37,
-      /*0x0073,0x0074*/ 7,
-      /*0x03b9,0x0342*/ 18,
-      /*0x03c9,0x03b9*/ 23,
-      /*0x03b7,0x03b9*/ 17,
-      /*0x0069,0x0307*/ 58,
-      /*0x03b1,0x03b9*/ 15,
-      /*0x1f61,0x03b9*/ 48,
-      /*0x1f05,0x03b9*/ 36,
-      /*0x1f65,0x03b9*/ 52,
-      /*0x0574,0x0576*/ 29,
-      /*0x03c9,0x0342*/ 22,
-      /*0x03b7,0x0342*/ 16,
-      /*0x057e,0x0576*/ 30,
-      /*0x03b1,0x0342*/ 14,
-      /*0x1f7c,0x03b9*/ 57,
-      /*0x0574,0x0565*/ 26,
-      /*0x0079,0x030a*/ 10,
-      /*0x0077,0x030a*/ 9,
-      /*0x1f70,0x03b9*/ 55,
-      /*0x0574,0x056d*/ 28,
-      /*0x0066,0x006c*/ 3,
-      /*0x0574,0x056b*/ 27,
-      /*0x0061,0x02be*/ 0,
-      /*0x0068,0x0331*/ 4,
-      /*0x1f67,0x03b9*/ 54,
-      /*0x1f64,0x03b9*/ 51,
-      /*0x1f63,0x03b9*/ 50,
-      /*0x1f62,0x03b9*/ 49,
-      /*0x1f60,0x03b9*/ 47,
-      /*0x03ce,0x03b9*/ 24,
-      /*0x03c5,0x0342*/ 21,
-      /*0x03c5,0x0313*/ 20,
-      /*0x03c1,0x0313*/ 19,
-      /*0x02bc,0x006e*/ 11,
-      /*0x03ae,0x03b9*/ 13,
-      /*0x03ac,0x03b9*/ 12,
-      /*0x1f27,0x03b9*/ 46,
-      /*0x1f26,0x03b9*/ 45,
-      /*0x1f25,0x03b9*/ 44,
-      /*0x1f24,0x03b9*/ 43,
-      /*0x1f23,0x03b9*/ 42,
-      /*0x1f22,0x03b9*/ 41,
-      /*0x1f21,0x03b9*/ 40,
-      /*0x1f20,0x03b9*/ 39,
-      /*0x006a,0x030c*/ 5,
-      /*0x1f02,0x03b9*/ 33,
-      /*0x0074,0x0308*/ 8,
-      /*0x1f04,0x03b9*/ 35,
-      /*0x1f03,0x03b9*/ 34,
-      /*0x1f01,0x03b9*/ 32,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      /*0x0565,0x0582*/ 25
-    };
-
-  if (codes[0] <= MAX_CODE_VALUE && codes[0] >= MIN_CODE_VALUE &&
-      codes[1] <= MAX_CODE_VALUE && codes[1] >= MIN_CODE_VALUE)
-    {
-      register unsigned int key = onigenc_unicode_CaseUnfold_12_hash(codes);
-
-      if (key <= MAX_HASH_VALUE)
-        {
-          register short s = wordlist[key];
-
-          if (s >= 0 && code2_equal(codes, CaseUnfold_12_Table[s].from))
-            return &CaseUnfold_12_Table[s].to;
-        }
-    }
-  return 0;
-}
-
-static const CaseUnfold_13_Type CaseUnfold_13_Table[] = {
-#define CaseUnfold_13 (*(CaseUnfold_13_Type (*)[14])(CaseUnfold_13_Table+0))
-  {{0x0066, 0x0066, 0x0069}, {1, {0xfb03}}},
-  {{0x0066, 0x0066, 0x006c}, {1, {0xfb04}}},
-  {{0x03b1, 0x0342, 0x03b9}, {1, {0x1fb7}}},
-  {{0x03b7, 0x0342, 0x03b9}, {1, {0x1fc7}}},
-  {{0x03b9, 0x0308, 0x0300}, {1, {0x1fd2}}},
-  {{0x03b9, 0x0308, 0x0301}, {2, {0x0390, 0x1fd3}}},
-  {{0x03b9, 0x0308, 0x0342}, {1, {0x1fd7}}},
-  {{0x03c5, 0x0308, 0x0300}, {1, {0x1fe2}}},
-  {{0x03c5, 0x0308, 0x0301}, {2, {0x03b0, 0x1fe3}}},
-  {{0x03c5, 0x0308, 0x0342}, {1, {0x1fe7}}},
-  {{0x03c5, 0x0313, 0x0300}, {1, {0x1f52}}},
-  {{0x03c5, 0x0313, 0x0301}, {1, {0x1f54}}},
-  {{0x03c5, 0x0313, 0x0342}, {1, {0x1f56}}},
-  {{0x03c9, 0x0342, 0x03b9}, {1, {0x1ff7}}},
-};
-
-/* ANSI-C code produced by gperf version 3.1 */
-/* Command-line: gperf -7 -k1,2,3,4,5,6,7,8,9 -F,-1 -c -j1 -i1 -t -T -E -C -H onigenc_unicode_CaseUnfold_13_hash -N onigenc_unicode_CaseUnfold_13_lookup -n  */
-
-/* maximum key range = 20, duplicates = 0 */
-
-#ifdef __GNUC__
-__inline
-#else
-#ifdef __cplusplus
-inline
-#endif
-#endif
-/*ARGSUSED*/
-static unsigned int
-onigenc_unicode_CaseUnfold_13_hash(const OnigCodePoint *codes)
-{
-  static const unsigned char asso_values[] =
-    {
-       7,  4, 47, 47, 47, 47,  1,  1,  2, 47,
-      47, 47, 47, 47, 47, 47, 47, 47, 47,  1,
-      47, 47, 47, 47, 47, 47, 47, 47, 47, 47,
-      47, 47, 47, 47, 47, 47, 47, 47, 47, 47,
-      47, 47, 47, 47, 47, 47, 47, 47, 47, 11,
-      47, 47, 47, 47, 47, 10, 47,  2, 47, 47,
-      47, 47, 47, 47, 47, 47,  1, 47, 47,  1,
-      47, 47, 47,  9, 47, 47, 47, 47, 47, 47,
-      47, 47, 47, 47, 47, 47, 47, 47, 47, 47,
-      47, 47, 47, 47, 47, 47, 47, 47, 47, 47,
-      47, 47,  1, 47, 47,  2, 47, 47,  1, 47,
-      47, 47, 47, 47, 47, 47, 47, 47, 47, 47,
-      47, 47, 47, 47, 47, 47, 47, 47
-    };
-  return asso_values[bits_at(codes, 8)] + asso_values[bits_at(codes, 7)] + asso_values[bits_at(codes, 6)] + asso_values[bits_at(codes, 5)] + asso_values[bits_at(codes, 4)] + asso_values[bits_at(codes, 3)] + asso_values[bits_at(codes, 2)] + asso_values[bits_at(codes, 1)] + asso_values[bits_at(codes, 0)];
-}
-
-static const CodePointList2 *
-onigenc_unicode_CaseUnfold_13_lookup(const OnigCodePoint *codes)
-{
-  enum
-    {
-      MIN_CODE_VALUE = 0x66,
-      MAX_CODE_VALUE = 0x3c9,
-      TOTAL_KEYWORDS = 14,
-      MIN_WORD_LENGTH = 9,
-      MAX_WORD_LENGTH = 9,
-      MIN_HASH_VALUE = 27,
-      MAX_HASH_VALUE = 46
-    };
-
-  static const short wordlist[] =
-    {
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1,
-      /*0x03c5,0x0313,0x0342*/ 12,
-      /*0x03c5,0x0308,0x0342*/ 9,
-      /*0x03b9,0x0308,0x0342*/ 6,
-      /*0x03c5,0x0313,0x0301*/ 11,
-      /*0x03c5,0x0308,0x0301*/ 8,
-      /*0x03b9,0x0308,0x0301*/ 5,
-      /*0x03c5,0x0313,0x0300*/ 10,
-      /*0x03c5,0x0308,0x0300*/ 7,
-      /*0x03b9,0x0308,0x0300*/ 4,
-      /*0x03c9,0x0342,0x03b9*/ 13,
-      /*0x03b7,0x0342,0x03b9*/ 3,
-      /*0x03b1,0x0342,0x03b9*/ 2,
-      -1, -1, -1, -1, -1, -1,
-      /*0x0066,0x0066,0x006c*/ 1,
-      /*0x0066,0x0066,0x0069*/ 0
-    };
-
-  if (codes[0] <= MAX_CODE_VALUE && codes[0] >= MIN_CODE_VALUE &&
-      codes[1] <= MAX_CODE_VALUE && codes[1] >= MIN_CODE_VALUE &&
-      codes[2] <= MAX_CODE_VALUE && codes[2] >= MIN_CODE_VALUE)
-    {
-      register unsigned int key = onigenc_unicode_CaseUnfold_13_hash(codes);
-
-      if (key <= MAX_HASH_VALUE)
-        {
-          register short s = wordlist[key];
-
-          if (s >= 0 && code3_equal(codes, CaseUnfold_13_Table[s].from))
-            return &CaseUnfold_13_Table[s].to;
-        }
-    }
-  return 0;
-}
-
-static const OnigCodePoint CaseMappingSpecials[] = {
-    L(1)|0x039C,
-    L(2)|0x0053, 0x0073, L(2)|0x0053, 0x0053,
-    L(2)|0x02BC, 0x004E,
-    L(1)|0x0053,
-    L(1)|0x01C5,
-    L(2)|0x0064, 0x017D, L(1)|0x01C4,
-    L(1)|0x01C8,
-    L(2)|0x006C, 0x004A, L(1)|0x01C7,
-    L(1)|0x01CB,
-    L(2)|0x006E, 0x004A, L(1)|0x01CA,
-    L(2)|0x004A, 0x030C,
-    L(1)|0x01F2,
-    L(2)|0x0064, 0x005A, L(1)|0x01F1,
-    L(1)|0x0399,
-    L(3)|0x0399, 0x0308, 0x0301,
-    L(3)|0x03A5, 0x0308, 0x0301,
-    L(1)|0x03A3,
-    L(1)|0x0392,
-    L(1)|0x0398,
-    L(1)|0x03A6,
-    L(1)|0x03A0,
-    L(1)|0x039A,
-    L(1)|0x03A1,
-    L(1)|0x0395,
-    L(2)|0x0535, 0x0582, L(2)|0x0535, 0x0552,
-    L(1)|0x0412,
-    L(1)|0x0414,
-    L(1)|0x041E,
-    L(1)|0x0421,
-    L(1)|0x0422,
-    L(1)|0x0422,
-    L(1)|0x042A,
-    L(1)|0x0462,
-    L(1)|0xA64A,
-    L(2)|0x0048, 0x0331,
-    L(2)|0x0054, 0x0308,
-    L(2)|0x0057, 0x030A,
-    L(2)|0x0059, 0x030A,
-    L(2)|0x0041, 0x02BE,
-    L(1)|0x1E60,
-    L(1)|0x00DF,
-    L(2)|0x03A5, 0x0313,
-    L(3)|0x03A5, 0x0313, 0x0300,
-    L(3)|0x03A5, 0x0313, 0x0301,
-    L(3)|0x03A5, 0x0313, 0x0342,
-    L(1)|0x1F88, L(2)|0x1F08, 0x0399,
-    L(1)|0x1F89, L(2)|0x1F09, 0x0399,
-    L(1)|0x1F8A, L(2)|0x1F0A, 0x0399,
-    L(1)|0x1F8B, L(2)|0x1F0B, 0x0399,
-    L(1)|0x1F8C, L(2)|0x1F0C, 0x0399,
-    L(1)|0x1F8D, L(2)|0x1F0D, 0x0399,
-    L(1)|0x1F8E, L(2)|0x1F0E, 0x0399,
-    L(1)|0x1F8F, L(2)|0x1F0F, 0x0399,
-    L(2)|0x1F00, 0x0399, L(1)|0x1F80, L(2)|0x1F08, 0x0399,
-    L(2)|0x1F01, 0x0399, L(1)|0x1F81, L(2)|0x1F09, 0x0399,
-    L(2)|0x1F02, 0x0399, L(1)|0x1F82, L(2)|0x1F0A, 0x0399,
-    L(2)|0x1F03, 0x0399, L(1)|0x1F83, L(2)|0x1F0B, 0x0399,
-    L(2)|0x1F04, 0x0399, L(1)|0x1F84, L(2)|0x1F0C, 0x0399,
-    L(2)|0x1F05, 0x0399, L(1)|0x1F85, L(2)|0x1F0D, 0x0399,
-    L(2)|0x1F06, 0x0399, L(1)|0x1F86, L(2)|0x1F0E, 0x0399,
-    L(2)|0x1F07, 0x0399, L(1)|0x1F87, L(2)|0x1F0F, 0x0399,
-    L(1)|0x1F98, L(2)|0x1F28, 0x0399,
-    L(1)|0x1F99, L(2)|0x1F29, 0x0399,
-    L(1)|0x1F9A, L(2)|0x1F2A, 0x0399,
-    L(1)|0x1F9B, L(2)|0x1F2B, 0x0399,
-    L(1)|0x1F9C, L(2)|0x1F2C, 0x0399,
-    L(1)|0x1F9D, L(2)|0x1F2D, 0x0399,
-    L(1)|0x1F9E, L(2)|0x1F2E, 0x0399,
-    L(1)|0x1F9F, L(2)|0x1F2F, 0x0399,
-    L(2)|0x1F20, 0x0399, L(1)|0x1F90, L(2)|0x1F28, 0x0399,
-    L(2)|0x1F21, 0x0399, L(1)|0x1F91, L(2)|0x1F29, 0x0399,
-    L(2)|0x1F22, 0x0399, L(1)|0x1F92, L(2)|0x1F2A, 0x0399,
-    L(2)|0x1F23, 0x0399, L(1)|0x1F93, L(2)|0x1F2B, 0x0399,
-    L(2)|0x1F24, 0x0399, L(1)|0x1F94, L(2)|0x1F2C, 0x0399,
-    L(2)|0x1F25, 0x0399, L(1)|0x1F95, L(2)|0x1F2D, 0x0399,
-    L(2)|0x1F26, 0x0399, L(1)|0x1F96, L(2)|0x1F2E, 0x0399,
-    L(2)|0x1F27, 0x0399, L(1)|0x1F97, L(2)|0x1F2F, 0x0399,
-    L(1)|0x1FA8, L(2)|0x1F68, 0x0399,
-    L(1)|0x1FA9, L(2)|0x1F69, 0x0399,
-    L(1)|0x1FAA, L(2)|0x1F6A, 0x0399,
-    L(1)|0x1FAB, L(2)|0x1F6B, 0x0399,
-    L(1)|0x1FAC, L(2)|0x1F6C, 0x0399,
-    L(1)|0x1FAD, L(2)|0x1F6D, 0x0399,
-    L(1)|0x1FAE, L(2)|0x1F6E, 0x0399,
-    L(1)|0x1FAF, L(2)|0x1F6F, 0x0399,
-    L(2)|0x1F60, 0x0399, L(1)|0x1FA0, L(2)|0x1F68, 0x0399,
-    L(2)|0x1F61, 0x0399, L(1)|0x1FA1, L(2)|0x1F69, 0x0399,
-    L(2)|0x1F62, 0x0399, L(1)|0x1FA2, L(2)|0x1F6A, 0x0399,
-    L(2)|0x1F63, 0x0399, L(1)|0x1FA3, L(2)|0x1F6B, 0x0399,
-    L(2)|0x1F64, 0x0399, L(1)|0x1FA4, L(2)|0x1F6C, 0x0399,
-    L(2)|0x1F65, 0x0399, L(1)|0x1FA5, L(2)|0x1F6D, 0x0399,
-    L(2)|0x1F66, 0x0399, L(1)|0x1FA6, L(2)|0x1F6E, 0x0399,
-    L(2)|0x1F67, 0x0399, L(1)|0x1FA7, L(2)|0x1F6F, 0x0399,
-    L(2)|0x1FBA, 0x0345, L(2)|0x1FBA, 0x0399,
-    L(1)|0x1FBC, L(2)|0x0391, 0x0399,
-    L(2)|0x0386, 0x0345, L(2)|0x0386, 0x0399,
-    L(2)|0x0391, 0x0342,
-    L(3)|0x0391, 0x0342, 0x0345, L(3)|0x0391, 0x0342, 0x0399,
-    L(2)|0x03B1, 0x0399, L(1)|0x1FB3, L(2)|0x0391, 0x0399,
-    L(1)|0x0399,
-    L(2)|0x1FCA, 0x0345, L(2)|0x1FCA, 0x0399,
-    L(1)|0x1FCC, L(2)|0x0397, 0x0399,
-    L(2)|0x0389, 0x0345, L(2)|0x0389, 0x0399,
-    L(2)|0x0397, 0x0342,
-    L(3)|0x0397, 0x0342, 0x0345, L(3)|0x0397, 0x0342, 0x0399,
-    L(2)|0x03B7, 0x0399, L(1)|0x1FC3, L(2)|0x0397, 0x0399,
-    L(3)|0x0399, 0x0308, 0x0300,
-    L(3)|0x0399, 0x0308, 0x0301,
-    L(2)|0x0399, 0x0342,
-    L(3)|0x0399, 0x0308, 0x0342,
-    L(3)|0x03A5, 0x0308, 0x0300,
-    L(3)|0x03A5, 0x0308, 0x0301,
-    L(2)|0x03A1, 0x0313,
-    L(2)|0x03A5, 0x0342,
-    L(3)|0x03A5, 0x0308, 0x0342,
-    L(2)|0x1FFA, 0x0345, L(2)|0x1FFA, 0x0399,
-    L(1)|0x1FFC, L(2)|0x03A9, 0x0399,
-    L(2)|0x038F, 0x0345, L(2)|0x038F, 0x0399,
-    L(2)|0x03A9, 0x0342,
-    L(3)|0x03A9, 0x0342, 0x0345, L(3)|0x03A9, 0x0342, 0x0399,
-    L(2)|0x03C9, 0x0399, L(1)|0x1FF3, L(2)|0x03A9, 0x0399,
-    L(2)|0x0046, 0x0066, L(2)|0x0046, 0x0046,
-    L(2)|0x0046, 0x0069, L(2)|0x0046, 0x0049,
-    L(2)|0x0046, 0x006C, L(2)|0x0046, 0x004C,
-    L(3)|0x0046, 0x0066, 0x0069, L(3)|0x0046, 0x0046, 0x0049,
-    L(3)|0x0046, 0x0066, 0x006C, L(3)|0x0046, 0x0046, 0x004C,
-    L(2)|0x0053, 0x0074, L(2)|0x0053, 0x0054,
-    L(2)|0x0053, 0x0074, L(2)|0x0053, 0x0054,
-    L(2)|0x0544, 0x0576, L(2)|0x0544, 0x0546,
-    L(2)|0x0544, 0x0565, L(2)|0x0544, 0x0535,
-    L(2)|0x0544, 0x056B, L(2)|0x0544, 0x053B,
-    L(2)|0x054E, 0x0576, L(2)|0x054E, 0x0546,
-    L(2)|0x0544, 0x056D, L(2)|0x0544, 0x053D,
-};
diff --git a/enc/unicode/16.0.0/casefold.h b/enc/unicode/16.0.0/casefold.h
new file mode 100644
index 00000000000000..f14c0777d77983
--- /dev/null
+++ b/enc/unicode/16.0.0/casefold.h
@@ -0,0 +1,7804 @@
+/* DO NOT EDIT THIS FILE. */
+/* Generated by enc-case-folding.rb */
+
+#if defined ONIG_UNICODE_VERSION_STRING && !( \
+      ONIG_UNICODE_VERSION_MAJOR == 16 && \
+      ONIG_UNICODE_VERSION_MINOR == 0 && \
+      ONIG_UNICODE_VERSION_TEENY == 0 && \
+      1)
+# error ONIG_UNICODE_VERSION_STRING mismatch
+#endif
+#define ONIG_UNICODE_VERSION_STRING "16.0.0"
+#define ONIG_UNICODE_VERSION_MAJOR 16
+#define ONIG_UNICODE_VERSION_MINOR 0
+#define ONIG_UNICODE_VERSION_TEENY 0
+
+static const CaseFold_11_Type CaseFold_11_Table[] = {
+#define CaseFold (*(CaseFold_11_Type (*)[1555])(CaseFold_11_Table+0))
+  {0x0041, {1|F|D, {0x0061}}},
+  {0x0042, {1|F|D, {0x0062}}},
+  {0x0043, {1|F|D, {0x0063}}},
+  {0x0044, {1|F|D, {0x0064}}},
+  {0x0045, {1|F|D, {0x0065}}},
+  {0x0046, {1|F|D, {0x0066}}},
+  {0x0047, {1|F|D, {0x0067}}},
+  {0x0048, {1|F|D, {0x0068}}},
+  {0x004a, {1|F|D, {0x006a}}},
+  {0x004b, {1|F|D, {0x006b}}},
+  {0x004c, {1|F|D, {0x006c}}},
+  {0x004d, {1|F|D, {0x006d}}},
+  {0x004e, {1|F|D, {0x006e}}},
+  {0x004f, {1|F|D, {0x006f}}},
+  {0x0050, {1|F|D, {0x0070}}},
+  {0x0051, {1|F|D, {0x0071}}},
+  {0x0052, {1|F|D, {0x0072}}},
+  {0x0053, {1|F|D, {0x0073}}},
+  {0x0054, {1|F|D, {0x0074}}},
+  {0x0055, {1|F|D, {0x0075}}},
+  {0x0056, {1|F|D, {0x0076}}},
+  {0x0057, {1|F|D, {0x0077}}},
+  {0x0058, {1|F|D, {0x0078}}},
+  {0x0059, {1|F|D, {0x0079}}},
+  {0x005a, {1|F|D, {0x007a}}},
+  {0x00b5, {1|F|SU|I(0), {0x03bc}}},
+  {0x00c0, {1|F|D, {0x00e0}}},
+  {0x00c1, {1|F|D, {0x00e1}}},
+  {0x00c2, {1|F|D, {0x00e2}}},
+  {0x00c3, {1|F|D, {0x00e3}}},
+  {0x00c4, {1|F|D, {0x00e4}}},
+  {0x00c5, {1|F|D, {0x00e5}}},
+  {0x00c6, {1|F|D, {0x00e6}}},
+  {0x00c7, {1|F|D, {0x00e7}}},
+  {0x00c8, {1|F|D, {0x00e8}}},
+  {0x00c9, {1|F|D, {0x00e9}}},
+  {0x00ca, {1|F|D, {0x00ea}}},
+  {0x00cb, {1|F|D, {0x00eb}}},
+  {0x00cc, {1|F|D, {0x00ec}}},
+  {0x00cd, {1|F|D, {0x00ed}}},
+  {0x00ce, {1|F|D, {0x00ee}}},
+  {0x00cf, {1|F|D, {0x00ef}}},
+  {0x00d0, {1|F|D, {0x00f0}}},
+  {0x00d1, {1|F|D, {0x00f1}}},
+  {0x00d2, {1|F|D, {0x00f2}}},
+  {0x00d3, {1|F|D, {0x00f3}}},
+  {0x00d4, {1|F|D, {0x00f4}}},
+  {0x00d5, {1|F|D, {0x00f5}}},
+  {0x00d6, {1|F|D, {0x00f6}}},
+  {0x00d8, {1|F|D, {0x00f8}}},
+  {0x00d9, {1|F|D, {0x00f9}}},
+  {0x00da, {1|F|D, {0x00fa}}},
+  {0x00db, {1|F|D, {0x00fb}}},
+  {0x00dc, {1|F|D, {0x00fc}}},
+  {0x00dd, {1|F|D, {0x00fd}}},
+  {0x00de, {1|F|D, {0x00fe}}},
+  {0x00df, {2|F|ST|SU|I(1), {0x0073, 0x0073}}},
+  {0x0100, {1|F|D, {0x0101}}},
+  {0x0102, {1|F|D, {0x0103}}},
+  {0x0104, {1|F|D, {0x0105}}},
+  {0x0106, {1|F|D, {0x0107}}},
+  {0x0108, {1|F|D, {0x0109}}},
+  {0x010a, {1|F|D, {0x010b}}},
+  {0x010c, {1|F|D, {0x010d}}},
+  {0x010e, {1|F|D, {0x010f}}},
+  {0x0110, {1|F|D, {0x0111}}},
+  {0x0112, {1|F|D, {0x0113}}},
+  {0x0114, {1|F|D, {0x0115}}},
+  {0x0116, {1|F|D, {0x0117}}},
+  {0x0118, {1|F|D, {0x0119}}},
+  {0x011a, {1|F|D, {0x011b}}},
+  {0x011c, {1|F|D, {0x011d}}},
+  {0x011e, {1|F|D, {0x011f}}},
+  {0x0120, {1|F|D, {0x0121}}},
+  {0x0122, {1|F|D, {0x0123}}},
+  {0x0124, {1|F|D, {0x0125}}},
+  {0x0126, {1|F|D, {0x0127}}},
+  {0x0128, {1|F|D, {0x0129}}},
+  {0x012a, {1|F|D, {0x012b}}},
+  {0x012c, {1|F|D, {0x012d}}},
+  {0x012e, {1|F|D, {0x012f}}},
+  {0x0132, {1|F|D, {0x0133}}},
+  {0x0134, {1|F|D, {0x0135}}},
+  {0x0136, {1|F|D, {0x0137}}},
+  {0x0139, {1|F|D, {0x013a}}},
+  {0x013b, {1|F|D, {0x013c}}},
+  {0x013d, {1|F|D, {0x013e}}},
+  {0x013f, {1|F|D, {0x0140}}},
+  {0x0141, {1|F|D, {0x0142}}},
+  {0x0143, {1|F|D, {0x0144}}},
+  {0x0145, {1|F|D, {0x0146}}},
+  {0x0147, {1|F|D, {0x0148}}},
+  {0x0149, {2|F|SU|I(5), {0x02bc, 0x006e}}},
+  {0x014a, {1|F|D, {0x014b}}},
+  {0x014c, {1|F|D, {0x014d}}},
+  {0x014e, {1|F|D, {0x014f}}},
+  {0x0150, {1|F|D, {0x0151}}},
+  {0x0152, {1|F|D, {0x0153}}},
+  {0x0154, {1|F|D, {0x0155}}},
+  {0x0156, {1|F|D, {0x0157}}},
+  {0x0158, {1|F|D, {0x0159}}},
+  {0x015a, {1|F|D, {0x015b}}},
+  {0x015c, {1|F|D, {0x015d}}},
+  {0x015e, {1|F|D, {0x015f}}},
+  {0x0160, {1|F|D, {0x0161}}},
+  {0x0162, {1|F|D, {0x0163}}},
+  {0x0164, {1|F|D, {0x0165}}},
+  {0x0166, {1|F|D, {0x0167}}},
+  {0x0168, {1|F|D, {0x0169}}},
+  {0x016a, {1|F|D, {0x016b}}},
+  {0x016c, {1|F|D, {0x016d}}},
+  {0x016e, {1|F|D, {0x016f}}},
+  {0x0170, {1|F|D, {0x0171}}},
+  {0x0172, {1|F|D, {0x0173}}},
+  {0x0174, {1|F|D, {0x0175}}},
+  {0x0176, {1|F|D, {0x0177}}},
+  {0x0178, {1|F|D, {0x00ff}}},
+  {0x0179, {1|F|D, {0x017a}}},
+  {0x017b, {1|F|D, {0x017c}}},
+  {0x017d, {1|F|D, {0x017e}}},
+  {0x017f, {1|F|SU|I(7), {0x0073}}},
+  {0x0181, {1|F|D, {0x0253}}},
+  {0x0182, {1|F|D, {0x0183}}},
+  {0x0184, {1|F|D, {0x0185}}},
+  {0x0186, {1|F|D, {0x0254}}},
+  {0x0187, {1|F|D, {0x0188}}},
+  {0x0189, {1|F|D, {0x0256}}},
+  {0x018a, {1|F|D, {0x0257}}},
+  {0x018b, {1|F|D, {0x018c}}},
+  {0x018e, {1|F|D, {0x01dd}}},
+  {0x018f, {1|F|D, {0x0259}}},
+  {0x0190, {1|F|D, {0x025b}}},
+  {0x0191, {1|F|D, {0x0192}}},
+  {0x0193, {1|F|D, {0x0260}}},
+  {0x0194, {1|F|D, {0x0263}}},
+  {0x0196, {1|F|D, {0x0269}}},
+  {0x0197, {1|F|D, {0x0268}}},
+  {0x0198, {1|F|D, {0x0199}}},
+  {0x019c, {1|F|D, {0x026f}}},
+  {0x019d, {1|F|D, {0x0272}}},
+  {0x019f, {1|F|D, {0x0275}}},
+  {0x01a0, {1|F|D, {0x01a1}}},
+  {0x01a2, {1|F|D, {0x01a3}}},
+  {0x01a4, {1|F|D, {0x01a5}}},
+  {0x01a6, {1|F|D, {0x0280}}},
+  {0x01a7, {1|F|D, {0x01a8}}},
+  {0x01a9, {1|F|D, {0x0283}}},
+  {0x01ac, {1|F|D, {0x01ad}}},
+  {0x01ae, {1|F|D, {0x0288}}},
+  {0x01af, {1|F|D, {0x01b0}}},
+  {0x01b1, {1|F|D, {0x028a}}},
+  {0x01b2, {1|F|D, {0x028b}}},
+  {0x01b3, {1|F|D, {0x01b4}}},
+  {0x01b5, {1|F|D, {0x01b6}}},
+  {0x01b7, {1|F|D, {0x0292}}},
+  {0x01b8, {1|F|D, {0x01b9}}},
+  {0x01bc, {1|F|D, {0x01bd}}},
+  {0x01c4, {1|F|D|ST|I(8), {0x01c6}}},
+  {0x01c5, {1|F|D|IT|SU|I(9), {0x01c6}}},
+  {0x01c7, {1|F|D|ST|I(12), {0x01c9}}},
+  {0x01c8, {1|F|D|IT|SU|I(13), {0x01c9}}},
+  {0x01ca, {1|F|D|ST|I(16), {0x01cc}}},
+  {0x01cb, {1|F|D|IT|SU|I(17), {0x01cc}}},
+  {0x01cd, {1|F|D, {0x01ce}}},
+  {0x01cf, {1|F|D, {0x01d0}}},
+  {0x01d1, {1|F|D, {0x01d2}}},
+  {0x01d3, {1|F|D, {0x01d4}}},
+  {0x01d5, {1|F|D, {0x01d6}}},
+  {0x01d7, {1|F|D, {0x01d8}}},
+  {0x01d9, {1|F|D, {0x01da}}},
+  {0x01db, {1|F|D, {0x01dc}}},
+  {0x01de, {1|F|D, {0x01df}}},
+  {0x01e0, {1|F|D, {0x01e1}}},
+  {0x01e2, {1|F|D, {0x01e3}}},
+  {0x01e4, {1|F|D, {0x01e5}}},
+  {0x01e6, {1|F|D, {0x01e7}}},
+  {0x01e8, {1|F|D, {0x01e9}}},
+  {0x01ea, {1|F|D, {0x01eb}}},
+  {0x01ec, {1|F|D, {0x01ed}}},
+  {0x01ee, {1|F|D, {0x01ef}}},
+  {0x01f0, {2|F|SU|I(20), {0x006a, 0x030c}}},
+  {0x01f1, {1|F|D|ST|I(22), {0x01f3}}},
+  {0x01f2, {1|F|D|IT|SU|I(23), {0x01f3}}},
+  {0x01f4, {1|F|D, {0x01f5}}},
+  {0x01f6, {1|F|D, {0x0195}}},
+  {0x01f7, {1|F|D, {0x01bf}}},
+  {0x01f8, {1|F|D, {0x01f9}}},
+  {0x01fa, {1|F|D, {0x01fb}}},
+  {0x01fc, {1|F|D, {0x01fd}}},
+  {0x01fe, {1|F|D, {0x01ff}}},
+  {0x0200, {1|F|D, {0x0201}}},
+  {0x0202, {1|F|D, {0x0203}}},
+  {0x0204, {1|F|D, {0x0205}}},
+  {0x0206, {1|F|D, {0x0207}}},
+  {0x0208, {1|F|D, {0x0209}}},
+  {0x020a, {1|F|D, {0x020b}}},
+  {0x020c, {1|F|D, {0x020d}}},
+  {0x020e, {1|F|D, {0x020f}}},
+  {0x0210, {1|F|D, {0x0211}}},
+  {0x0212, {1|F|D, {0x0213}}},
+  {0x0214, {1|F|D, {0x0215}}},
+  {0x0216, {1|F|D, {0x0217}}},
+  {0x0218, {1|F|D, {0x0219}}},
+  {0x021a, {1|F|D, {0x021b}}},
+  {0x021c, {1|F|D, {0x021d}}},
+  {0x021e, {1|F|D, {0x021f}}},
+  {0x0220, {1|F|D, {0x019e}}},
+  {0x0222, {1|F|D, {0x0223}}},
+  {0x0224, {1|F|D, {0x0225}}},
+  {0x0226, {1|F|D, {0x0227}}},
+  {0x0228, {1|F|D, {0x0229}}},
+  {0x022a, {1|F|D, {0x022b}}},
+  {0x022c, {1|F|D, {0x022d}}},
+  {0x022e, {1|F|D, {0x022f}}},
+  {0x0230, {1|F|D, {0x0231}}},
+  {0x0232, {1|F|D, {0x0233}}},
+  {0x023a, {1|F|D, {0x2c65}}},
+  {0x023b, {1|F|D, {0x023c}}},
+  {0x023d, {1|F|D, {0x019a}}},
+  {0x023e, {1|F|D, {0x2c66}}},
+  {0x0241, {1|F|D, {0x0242}}},
+  {0x0243, {1|F|D, {0x0180}}},
+  {0x0244, {1|F|D, {0x0289}}},
+  {0x0245, {1|F|D, {0x028c}}},
+  {0x0246, {1|F|D, {0x0247}}},
+  {0x0248, {1|F|D, {0x0249}}},
+  {0x024a, {1|F|D, {0x024b}}},
+  {0x024c, {1|F|D, {0x024d}}},
+  {0x024e, {1|F|D, {0x024f}}},
+  {0x0345, {1|F|SU|I(26), {0x03b9}}},
+  {0x0370, {1|F|D, {0x0371}}},
+  {0x0372, {1|F|D, {0x0373}}},
+  {0x0376, {1|F|D, {0x0377}}},
+  {0x037f, {1|F|D, {0x03f3}}},
+  {0x0386, {1|F|D, {0x03ac}}},
+  {0x0388, {1|F|D, {0x03ad}}},
+  {0x0389, {1|F|D, {0x03ae}}},
+  {0x038a, {1|F|D, {0x03af}}},
+  {0x038c, {1|F|D, {0x03cc}}},
+  {0x038e, {1|F|D, {0x03cd}}},
+  {0x038f, {1|F|D, {0x03ce}}},
+  {0x0390, {3|F|SU|I(27), {0x03b9, 0x0308, 0x0301}}},
+  {0x0391, {1|F|D, {0x03b1}}},
+  {0x0392, {1|F|D, {0x03b2}}},
+  {0x0393, {1|F|D, {0x03b3}}},
+  {0x0394, {1|F|D, {0x03b4}}},
+  {0x0395, {1|F|D, {0x03b5}}},
+  {0x0396, {1|F|D, {0x03b6}}},
+  {0x0397, {1|F|D, {0x03b7}}},
+  {0x0398, {1|F|D, {0x03b8}}},
+  {0x0399, {1|F|D, {0x03b9}}},
+  {0x039a, {1|F|D, {0x03ba}}},
+  {0x039b, {1|F|D, {0x03bb}}},
+  {0x039c, {1|F|D, {0x03bc}}},
+  {0x039d, {1|F|D, {0x03bd}}},
+  {0x039e, {1|F|D, {0x03be}}},
+  {0x039f, {1|F|D, {0x03bf}}},
+  {0x03a0, {1|F|D, {0x03c0}}},
+  {0x03a1, {1|F|D, {0x03c1}}},
+  {0x03a3, {1|F|D, {0x03c3}}},
+  {0x03a4, {1|F|D, {0x03c4}}},
+  {0x03a5, {1|F|D, {0x03c5}}},
+  {0x03a6, {1|F|D, {0x03c6}}},
+  {0x03a7, {1|F|D, {0x03c7}}},
+  {0x03a8, {1|F|D, {0x03c8}}},
+  {0x03a9, {1|F|D, {0x03c9}}},
+  {0x03aa, {1|F|D, {0x03ca}}},
+  {0x03ab, {1|F|D, {0x03cb}}},
+  {0x03b0, {3|F|SU|I(30), {0x03c5, 0x0308, 0x0301}}},
+  {0x03c2, {1|F|SU|I(33), {0x03c3}}},
+  {0x03cf, {1|F|D, {0x03d7}}},
+  {0x03d0, {1|F|SU|I(34), {0x03b2}}},
+  {0x03d1, {1|F|SU|I(35), {0x03b8}}},
+  {0x03d5, {1|F|SU|I(36), {0x03c6}}},
+  {0x03d6, {1|F|SU|I(37), {0x03c0}}},
+  {0x03d8, {1|F|D, {0x03d9}}},
+  {0x03da, {1|F|D, {0x03db}}},
+  {0x03dc, {1|F|D, {0x03dd}}},
+  {0x03de, {1|F|D, {0x03df}}},
+  {0x03e0, {1|F|D, {0x03e1}}},
+  {0x03e2, {1|F|D, {0x03e3}}},
+  {0x03e4, {1|F|D, {0x03e5}}},
+  {0x03e6, {1|F|D, {0x03e7}}},
+  {0x03e8, {1|F|D, {0x03e9}}},
+  {0x03ea, {1|F|D, {0x03eb}}},
+  {0x03ec, {1|F|D, {0x03ed}}},
+  {0x03ee, {1|F|D, {0x03ef}}},
+  {0x03f0, {1|F|SU|I(38), {0x03ba}}},
+  {0x03f1, {1|F|SU|I(39), {0x03c1}}},
+  {0x03f4, {1|F|D, {0x03b8}}},
+  {0x03f5, {1|F|SU|I(40), {0x03b5}}},
+  {0x03f7, {1|F|D, {0x03f8}}},
+  {0x03f9, {1|F|D, {0x03f2}}},
+  {0x03fa, {1|F|D, {0x03fb}}},
+  {0x03fd, {1|F|D, {0x037b}}},
+  {0x03fe, {1|F|D, {0x037c}}},
+  {0x03ff, {1|F|D, {0x037d}}},
+  {0x0400, {1|F|D, {0x0450}}},
+  {0x0401, {1|F|D, {0x0451}}},
+  {0x0402, {1|F|D, {0x0452}}},
+  {0x0403, {1|F|D, {0x0453}}},
+  {0x0404, {1|F|D, {0x0454}}},
+  {0x0405, {1|F|D, {0x0455}}},
+  {0x0406, {1|F|D, {0x0456}}},
+  {0x0407, {1|F|D, {0x0457}}},
+  {0x0408, {1|F|D, {0x0458}}},
+  {0x0409, {1|F|D, {0x0459}}},
+  {0x040a, {1|F|D, {0x045a}}},
+  {0x040b, {1|F|D, {0x045b}}},
+  {0x040c, {1|F|D, {0x045c}}},
+  {0x040d, {1|F|D, {0x045d}}},
+  {0x040e, {1|F|D, {0x045e}}},
+  {0x040f, {1|F|D, {0x045f}}},
+  {0x0410, {1|F|D, {0x0430}}},
+  {0x0411, {1|F|D, {0x0431}}},
+  {0x0412, {1|F|D, {0x0432}}},
+  {0x0413, {1|F|D, {0x0433}}},
+  {0x0414, {1|F|D, {0x0434}}},
+  {0x0415, {1|F|D, {0x0435}}},
+  {0x0416, {1|F|D, {0x0436}}},
+  {0x0417, {1|F|D, {0x0437}}},
+  {0x0418, {1|F|D, {0x0438}}},
+  {0x0419, {1|F|D, {0x0439}}},
+  {0x041a, {1|F|D, {0x043a}}},
+  {0x041b, {1|F|D, {0x043b}}},
+  {0x041c, {1|F|D, {0x043c}}},
+  {0x041d, {1|F|D, {0x043d}}},
+  {0x041e, {1|F|D, {0x043e}}},
+  {0x041f, {1|F|D, {0x043f}}},
+  {0x0420, {1|F|D, {0x0440}}},
+  {0x0421, {1|F|D, {0x0441}}},
+  {0x0422, {1|F|D, {0x0442}}},
+  {0x0423, {1|F|D, {0x0443}}},
+  {0x0424, {1|F|D, {0x0444}}},
+  {0x0425, {1|F|D, {0x0445}}},
+  {0x0426, {1|F|D, {0x0446}}},
+  {0x0427, {1|F|D, {0x0447}}},
+  {0x0428, {1|F|D, {0x0448}}},
+  {0x0429, {1|F|D, {0x0449}}},
+  {0x042a, {1|F|D, {0x044a}}},
+  {0x042b, {1|F|D, {0x044b}}},
+  {0x042c, {1|F|D, {0x044c}}},
+  {0x042d, {1|F|D, {0x044d}}},
+  {0x042e, {1|F|D, {0x044e}}},
+  {0x042f, {1|F|D, {0x044f}}},
+  {0x0460, {1|F|D, {0x0461}}},
+  {0x0462, {1|F|D, {0x0463}}},
+  {0x0464, {1|F|D, {0x0465}}},
+  {0x0466, {1|F|D, {0x0467}}},
+  {0x0468, {1|F|D, {0x0469}}},
+  {0x046a, {1|F|D, {0x046b}}},
+  {0x046c, {1|F|D, {0x046d}}},
+  {0x046e, {1|F|D, {0x046f}}},
+  {0x0470, {1|F|D, {0x0471}}},
+  {0x0472, {1|F|D, {0x0473}}},
+  {0x0474, {1|F|D, {0x0475}}},
+  {0x0476, {1|F|D, {0x0477}}},
+  {0x0478, {1|F|D, {0x0479}}},
+  {0x047a, {1|F|D, {0x047b}}},
+  {0x047c, {1|F|D, {0x047d}}},
+  {0x047e, {1|F|D, {0x047f}}},
+  {0x0480, {1|F|D, {0x0481}}},
+  {0x048a, {1|F|D, {0x048b}}},
+  {0x048c, {1|F|D, {0x048d}}},
+  {0x048e, {1|F|D, {0x048f}}},
+  {0x0490, {1|F|D, {0x0491}}},
+  {0x0492, {1|F|D, {0x0493}}},
+  {0x0494, {1|F|D, {0x0495}}},
+  {0x0496, {1|F|D, {0x0497}}},
+  {0x0498, {1|F|D, {0x0499}}},
+  {0x049a, {1|F|D, {0x049b}}},
+  {0x049c, {1|F|D, {0x049d}}},
+  {0x049e, {1|F|D, {0x049f}}},
+  {0x04a0, {1|F|D, {0x04a1}}},
+  {0x04a2, {1|F|D, {0x04a3}}},
+  {0x04a4, {1|F|D, {0x04a5}}},
+  {0x04a6, {1|F|D, {0x04a7}}},
+  {0x04a8, {1|F|D, {0x04a9}}},
+  {0x04aa, {1|F|D, {0x04ab}}},
+  {0x04ac, {1|F|D, {0x04ad}}},
+  {0x04ae, {1|F|D, {0x04af}}},
+  {0x04b0, {1|F|D, {0x04b1}}},
+  {0x04b2, {1|F|D, {0x04b3}}},
+  {0x04b4, {1|F|D, {0x04b5}}},
+  {0x04b6, {1|F|D, {0x04b7}}},
+  {0x04b8, {1|F|D, {0x04b9}}},
+  {0x04ba, {1|F|D, {0x04bb}}},
+  {0x04bc, {1|F|D, {0x04bd}}},
+  {0x04be, {1|F|D, {0x04bf}}},
+  {0x04c0, {1|F|D, {0x04cf}}},
+  {0x04c1, {1|F|D, {0x04c2}}},
+  {0x04c3, {1|F|D, {0x04c4}}},
+  {0x04c5, {1|F|D, {0x04c6}}},
+  {0x04c7, {1|F|D, {0x04c8}}},
+  {0x04c9, {1|F|D, {0x04ca}}},
+  {0x04cb, {1|F|D, {0x04cc}}},
+  {0x04cd, {1|F|D, {0x04ce}}},
+  {0x04d0, {1|F|D, {0x04d1}}},
+  {0x04d2, {1|F|D, {0x04d3}}},
+  {0x04d4, {1|F|D, {0x04d5}}},
+  {0x04d6, {1|F|D, {0x04d7}}},
+  {0x04d8, {1|F|D, {0x04d9}}},
+  {0x04da, {1|F|D, {0x04db}}},
+  {0x04dc, {1|F|D, {0x04dd}}},
+  {0x04de, {1|F|D, {0x04df}}},
+  {0x04e0, {1|F|D, {0x04e1}}},
+  {0x04e2, {1|F|D, {0x04e3}}},
+  {0x04e4, {1|F|D, {0x04e5}}},
+  {0x04e6, {1|F|D, {0x04e7}}},
+  {0x04e8, {1|F|D, {0x04e9}}},
+  {0x04ea, {1|F|D, {0x04eb}}},
+  {0x04ec, {1|F|D, {0x04ed}}},
+  {0x04ee, {1|F|D, {0x04ef}}},
+  {0x04f0, {1|F|D, {0x04f1}}},
+  {0x04f2, {1|F|D, {0x04f3}}},
+  {0x04f4, {1|F|D, {0x04f5}}},
+  {0x04f6, {1|F|D, {0x04f7}}},
+  {0x04f8, {1|F|D, {0x04f9}}},
+  {0x04fa, {1|F|D, {0x04fb}}},
+  {0x04fc, {1|F|D, {0x04fd}}},
+  {0x04fe, {1|F|D, {0x04ff}}},
+  {0x0500, {1|F|D, {0x0501}}},
+  {0x0502, {1|F|D, {0x0503}}},
+  {0x0504, {1|F|D, {0x0505}}},
+  {0x0506, {1|F|D, {0x0507}}},
+  {0x0508, {1|F|D, {0x0509}}},
+  {0x050a, {1|F|D, {0x050b}}},
+  {0x050c, {1|F|D, {0x050d}}},
+  {0x050e, {1|F|D, {0x050f}}},
+  {0x0510, {1|F|D, {0x0511}}},
+  {0x0512, {1|F|D, {0x0513}}},
+  {0x0514, {1|F|D, {0x0515}}},
+  {0x0516, {1|F|D, {0x0517}}},
+  {0x0518, {1|F|D, {0x0519}}},
+  {0x051a, {1|F|D, {0x051b}}},
+  {0x051c, {1|F|D, {0x051d}}},
+  {0x051e, {1|F|D, {0x051f}}},
+  {0x0520, {1|F|D, {0x0521}}},
+  {0x0522, {1|F|D, {0x0523}}},
+  {0x0524, {1|F|D, {0x0525}}},
+  {0x0526, {1|F|D, {0x0527}}},
+  {0x0528, {1|F|D, {0x0529}}},
+  {0x052a, {1|F|D, {0x052b}}},
+  {0x052c, {1|F|D, {0x052d}}},
+  {0x052e, {1|F|D, {0x052f}}},
+  {0x0531, {1|F|D, {0x0561}}},
+  {0x0532, {1|F|D, {0x0562}}},
+  {0x0533, {1|F|D, {0x0563}}},
+  {0x0534, {1|F|D, {0x0564}}},
+  {0x0535, {1|F|D, {0x0565}}},
+  {0x0536, {1|F|D, {0x0566}}},
+  {0x0537, {1|F|D, {0x0567}}},
+  {0x0538, {1|F|D, {0x0568}}},
+  {0x0539, {1|F|D, {0x0569}}},
+  {0x053a, {1|F|D, {0x056a}}},
+  {0x053b, {1|F|D, {0x056b}}},
+  {0x053c, {1|F|D, {0x056c}}},
+  {0x053d, {1|F|D, {0x056d}}},
+  {0x053e, {1|F|D, {0x056e}}},
+  {0x053f, {1|F|D, {0x056f}}},
+  {0x0540, {1|F|D, {0x0570}}},
+  {0x0541, {1|F|D, {0x0571}}},
+  {0x0542, {1|F|D, {0x0572}}},
+  {0x0543, {1|F|D, {0x0573}}},
+  {0x0544, {1|F|D, {0x0574}}},
+  {0x0545, {1|F|D, {0x0575}}},
+  {0x0546, {1|F|D, {0x0576}}},
+  {0x0547, {1|F|D, {0x0577}}},
+  {0x0548, {1|F|D, {0x0578}}},
+  {0x0549, {1|F|D, {0x0579}}},
+  {0x054a, {1|F|D, {0x057a}}},
+  {0x054b, {1|F|D, {0x057b}}},
+  {0x054c, {1|F|D, {0x057c}}},
+  {0x054d, {1|F|D, {0x057d}}},
+  {0x054e, {1|F|D, {0x057e}}},
+  {0x054f, {1|F|D, {0x057f}}},
+  {0x0550, {1|F|D, {0x0580}}},
+  {0x0551, {1|F|D, {0x0581}}},
+  {0x0552, {1|F|D, {0x0582}}},
+  {0x0553, {1|F|D, {0x0583}}},
+  {0x0554, {1|F|D, {0x0584}}},
+  {0x0555, {1|F|D, {0x0585}}},
+  {0x0556, {1|F|D, {0x0586}}},
+  {0x0587, {2|F|ST|SU|I(41), {0x0565, 0x0582}}},
+  {0x10a0, {1|F|D, {0x2d00}}},
+  {0x10a1, {1|F|D, {0x2d01}}},
+  {0x10a2, {1|F|D, {0x2d02}}},
+  {0x10a3, {1|F|D, {0x2d03}}},
+  {0x10a4, {1|F|D, {0x2d04}}},
+  {0x10a5, {1|F|D, {0x2d05}}},
+  {0x10a6, {1|F|D, {0x2d06}}},
+  {0x10a7, {1|F|D, {0x2d07}}},
+  {0x10a8, {1|F|D, {0x2d08}}},
+  {0x10a9, {1|F|D, {0x2d09}}},
+  {0x10aa, {1|F|D, {0x2d0a}}},
+  {0x10ab, {1|F|D, {0x2d0b}}},
+  {0x10ac, {1|F|D, {0x2d0c}}},
+  {0x10ad, {1|F|D, {0x2d0d}}},
+  {0x10ae, {1|F|D, {0x2d0e}}},
+  {0x10af, {1|F|D, {0x2d0f}}},
+  {0x10b0, {1|F|D, {0x2d10}}},
+  {0x10b1, {1|F|D, {0x2d11}}},
+  {0x10b2, {1|F|D, {0x2d12}}},
+  {0x10b3, {1|F|D, {0x2d13}}},
+  {0x10b4, {1|F|D, {0x2d14}}},
+  {0x10b5, {1|F|D, {0x2d15}}},
+  {0x10b6, {1|F|D, {0x2d16}}},
+  {0x10b7, {1|F|D, {0x2d17}}},
+  {0x10b8, {1|F|D, {0x2d18}}},
+  {0x10b9, {1|F|D, {0x2d19}}},
+  {0x10ba, {1|F|D, {0x2d1a}}},
+  {0x10bb, {1|F|D, {0x2d1b}}},
+  {0x10bc, {1|F|D, {0x2d1c}}},
+  {0x10bd, {1|F|D, {0x2d1d}}},
+  {0x10be, {1|F|D, {0x2d1e}}},
+  {0x10bf, {1|F|D, {0x2d1f}}},
+  {0x10c0, {1|F|D, {0x2d20}}},
+  {0x10c1, {1|F|D, {0x2d21}}},
+  {0x10c2, {1|F|D, {0x2d22}}},
+  {0x10c3, {1|F|D, {0x2d23}}},
+  {0x10c4, {1|F|D, {0x2d24}}},
+  {0x10c5, {1|F|D, {0x2d25}}},
+  {0x10c7, {1|F|D, {0x2d27}}},
+  {0x10cd, {1|F|D, {0x2d2d}}},
+  {0x13f8, {1|F|U, {0x13f0}}},
+  {0x13f9, {1|F|U, {0x13f1}}},
+  {0x13fa, {1|F|U, {0x13f2}}},
+  {0x13fb, {1|F|U, {0x13f3}}},
+  {0x13fc, {1|F|U, {0x13f4}}},
+  {0x13fd, {1|F|U, {0x13f5}}},
+  {0x1c80, {1|F|SU|I(45), {0x0432}}},
+  {0x1c81, {1|F|SU|I(46), {0x0434}}},
+  {0x1c82, {1|F|SU|I(47), {0x043e}}},
+  {0x1c83, {1|F|SU|I(48), {0x0441}}},
+  {0x1c84, {1|F|SU|I(49), {0x0442}}},
+  {0x1c85, {1|F|SU|I(50), {0x0442}}},
+  {0x1c86, {1|F|SU|I(51), {0x044a}}},
+  {0x1c87, {1|F|SU|I(52), {0x0463}}},
+  {0x1c88, {1|F|SU|I(53), {0xa64b}}},
+  {0x1c89, {1|F|D, {0x1c8a}}},
+  {0x1c90, {1|F|D, {0x10d0}}},
+  {0x1c91, {1|F|D, {0x10d1}}},
+  {0x1c92, {1|F|D, {0x10d2}}},
+  {0x1c93, {1|F|D, {0x10d3}}},
+  {0x1c94, {1|F|D, {0x10d4}}},
+  {0x1c95, {1|F|D, {0x10d5}}},
+  {0x1c96, {1|F|D, {0x10d6}}},
+  {0x1c97, {1|F|D, {0x10d7}}},
+  {0x1c98, {1|F|D, {0x10d8}}},
+  {0x1c99, {1|F|D, {0x10d9}}},
+  {0x1c9a, {1|F|D, {0x10da}}},
+  {0x1c9b, {1|F|D, {0x10db}}},
+  {0x1c9c, {1|F|D, {0x10dc}}},
+  {0x1c9d, {1|F|D, {0x10dd}}},
+  {0x1c9e, {1|F|D, {0x10de}}},
+  {0x1c9f, {1|F|D, {0x10df}}},
+  {0x1ca0, {1|F|D, {0x10e0}}},
+  {0x1ca1, {1|F|D, {0x10e1}}},
+  {0x1ca2, {1|F|D, {0x10e2}}},
+  {0x1ca3, {1|F|D, {0x10e3}}},
+  {0x1ca4, {1|F|D, {0x10e4}}},
+  {0x1ca5, {1|F|D, {0x10e5}}},
+  {0x1ca6, {1|F|D, {0x10e6}}},
+  {0x1ca7, {1|F|D, {0x10e7}}},
+  {0x1ca8, {1|F|D, {0x10e8}}},
+  {0x1ca9, {1|F|D, {0x10e9}}},
+  {0x1caa, {1|F|D, {0x10ea}}},
+  {0x1cab, {1|F|D, {0x10eb}}},
+  {0x1cac, {1|F|D, {0x10ec}}},
+  {0x1cad, {1|F|D, {0x10ed}}},
+  {0x1cae, {1|F|D, {0x10ee}}},
+  {0x1caf, {1|F|D, {0x10ef}}},
+  {0x1cb0, {1|F|D, {0x10f0}}},
+  {0x1cb1, {1|F|D, {0x10f1}}},
+  {0x1cb2, {1|F|D, {0x10f2}}},
+  {0x1cb3, {1|F|D, {0x10f3}}},
+  {0x1cb4, {1|F|D, {0x10f4}}},
+  {0x1cb5, {1|F|D, {0x10f5}}},
+  {0x1cb6, {1|F|D, {0x10f6}}},
+  {0x1cb7, {1|F|D, {0x10f7}}},
+  {0x1cb8, {1|F|D, {0x10f8}}},
+  {0x1cb9, {1|F|D, {0x10f9}}},
+  {0x1cba, {1|F|D, {0x10fa}}},
+  {0x1cbd, {1|F|D, {0x10fd}}},
+  {0x1cbe, {1|F|D, {0x10fe}}},
+  {0x1cbf, {1|F|D, {0x10ff}}},
+  {0x1e00, {1|F|D, {0x1e01}}},
+  {0x1e02, {1|F|D, {0x1e03}}},
+  {0x1e04, {1|F|D, {0x1e05}}},
+  {0x1e06, {1|F|D, {0x1e07}}},
+  {0x1e08, {1|F|D, {0x1e09}}},
+  {0x1e0a, {1|F|D, {0x1e0b}}},
+  {0x1e0c, {1|F|D, {0x1e0d}}},
+  {0x1e0e, {1|F|D, {0x1e0f}}},
+  {0x1e10, {1|F|D, {0x1e11}}},
+  {0x1e12, {1|F|D, {0x1e13}}},
+  {0x1e14, {1|F|D, {0x1e15}}},
+  {0x1e16, {1|F|D, {0x1e17}}},
+  {0x1e18, {1|F|D, {0x1e19}}},
+  {0x1e1a, {1|F|D, {0x1e1b}}},
+  {0x1e1c, {1|F|D, {0x1e1d}}},
+  {0x1e1e, {1|F|D, {0x1e1f}}},
+  {0x1e20, {1|F|D, {0x1e21}}},
+  {0x1e22, {1|F|D, {0x1e23}}},
+  {0x1e24, {1|F|D, {0x1e25}}},
+  {0x1e26, {1|F|D, {0x1e27}}},
+  {0x1e28, {1|F|D, {0x1e29}}},
+  {0x1e2a, {1|F|D, {0x1e2b}}},
+  {0x1e2c, {1|F|D, {0x1e2d}}},
+  {0x1e2e, {1|F|D, {0x1e2f}}},
+  {0x1e30, {1|F|D, {0x1e31}}},
+  {0x1e32, {1|F|D, {0x1e33}}},
+  {0x1e34, {1|F|D, {0x1e35}}},
+  {0x1e36, {1|F|D, {0x1e37}}},
+  {0x1e38, {1|F|D, {0x1e39}}},
+  {0x1e3a, {1|F|D, {0x1e3b}}},
+  {0x1e3c, {1|F|D, {0x1e3d}}},
+  {0x1e3e, {1|F|D, {0x1e3f}}},
+  {0x1e40, {1|F|D, {0x1e41}}},
+  {0x1e42, {1|F|D, {0x1e43}}},
+  {0x1e44, {1|F|D, {0x1e45}}},
+  {0x1e46, {1|F|D, {0x1e47}}},
+  {0x1e48, {1|F|D, {0x1e49}}},
+  {0x1e4a, {1|F|D, {0x1e4b}}},
+  {0x1e4c, {1|F|D, {0x1e4d}}},
+  {0x1e4e, {1|F|D, {0x1e4f}}},
+  {0x1e50, {1|F|D, {0x1e51}}},
+  {0x1e52, {1|F|D, {0x1e53}}},
+  {0x1e54, {1|F|D, {0x1e55}}},
+  {0x1e56, {1|F|D, {0x1e57}}},
+  {0x1e58, {1|F|D, {0x1e59}}},
+  {0x1e5a, {1|F|D, {0x1e5b}}},
+  {0x1e5c, {1|F|D, {0x1e5d}}},
+  {0x1e5e, {1|F|D, {0x1e5f}}},
+  {0x1e60, {1|F|D, {0x1e61}}},
+  {0x1e62, {1|F|D, {0x1e63}}},
+  {0x1e64, {1|F|D, {0x1e65}}},
+  {0x1e66, {1|F|D, {0x1e67}}},
+  {0x1e68, {1|F|D, {0x1e69}}},
+  {0x1e6a, {1|F|D, {0x1e6b}}},
+  {0x1e6c, {1|F|D, {0x1e6d}}},
+  {0x1e6e, {1|F|D, {0x1e6f}}},
+  {0x1e70, {1|F|D, {0x1e71}}},
+  {0x1e72, {1|F|D, {0x1e73}}},
+  {0x1e74, {1|F|D, {0x1e75}}},
+  {0x1e76, {1|F|D, {0x1e77}}},
+  {0x1e78, {1|F|D, {0x1e79}}},
+  {0x1e7a, {1|F|D, {0x1e7b}}},
+  {0x1e7c, {1|F|D, {0x1e7d}}},
+  {0x1e7e, {1|F|D, {0x1e7f}}},
+  {0x1e80, {1|F|D, {0x1e81}}},
+  {0x1e82, {1|F|D, {0x1e83}}},
+  {0x1e84, {1|F|D, {0x1e85}}},
+  {0x1e86, {1|F|D, {0x1e87}}},
+  {0x1e88, {1|F|D, {0x1e89}}},
+  {0x1e8a, {1|F|D, {0x1e8b}}},
+  {0x1e8c, {1|F|D, {0x1e8d}}},
+  {0x1e8e, {1|F|D, {0x1e8f}}},
+  {0x1e90, {1|F|D, {0x1e91}}},
+  {0x1e92, {1|F|D, {0x1e93}}},
+  {0x1e94, {1|F|D, {0x1e95}}},
+  {0x1e96, {2|F|SU|I(54), {0x0068, 0x0331}}},
+  {0x1e97, {2|F|SU|I(56), {0x0074, 0x0308}}},
+  {0x1e98, {2|F|SU|I(58), {0x0077, 0x030a}}},
+  {0x1e99, {2|F|SU|I(60), {0x0079, 0x030a}}},
+  {0x1e9a, {2|F|SU|I(62), {0x0061, 0x02be}}},
+  {0x1e9b, {1|F|SU|I(64), {0x1e61}}},
+  {0x1e9e, {2|F|SL|I(65), {0x0073, 0x0073}}},
+  {0x1ea0, {1|F|D, {0x1ea1}}},
+  {0x1ea2, {1|F|D, {0x1ea3}}},
+  {0x1ea4, {1|F|D, {0x1ea5}}},
+  {0x1ea6, {1|F|D, {0x1ea7}}},
+  {0x1ea8, {1|F|D, {0x1ea9}}},
+  {0x1eaa, {1|F|D, {0x1eab}}},
+  {0x1eac, {1|F|D, {0x1ead}}},
+  {0x1eae, {1|F|D, {0x1eaf}}},
+  {0x1eb0, {1|F|D, {0x1eb1}}},
+  {0x1eb2, {1|F|D, {0x1eb3}}},
+  {0x1eb4, {1|F|D, {0x1eb5}}},
+  {0x1eb6, {1|F|D, {0x1eb7}}},
+  {0x1eb8, {1|F|D, {0x1eb9}}},
+  {0x1eba, {1|F|D, {0x1ebb}}},
+  {0x1ebc, {1|F|D, {0x1ebd}}},
+  {0x1ebe, {1|F|D, {0x1ebf}}},
+  {0x1ec0, {1|F|D, {0x1ec1}}},
+  {0x1ec2, {1|F|D, {0x1ec3}}},
+  {0x1ec4, {1|F|D, {0x1ec5}}},
+  {0x1ec6, {1|F|D, {0x1ec7}}},
+  {0x1ec8, {1|F|D, {0x1ec9}}},
+  {0x1eca, {1|F|D, {0x1ecb}}},
+  {0x1ecc, {1|F|D, {0x1ecd}}},
+  {0x1ece, {1|F|D, {0x1ecf}}},
+  {0x1ed0, {1|F|D, {0x1ed1}}},
+  {0x1ed2, {1|F|D, {0x1ed3}}},
+  {0x1ed4, {1|F|D, {0x1ed5}}},
+  {0x1ed6, {1|F|D, {0x1ed7}}},
+  {0x1ed8, {1|F|D, {0x1ed9}}},
+  {0x1eda, {1|F|D, {0x1edb}}},
+  {0x1edc, {1|F|D, {0x1edd}}},
+  {0x1ede, {1|F|D, {0x1edf}}},
+  {0x1ee0, {1|F|D, {0x1ee1}}},
+  {0x1ee2, {1|F|D, {0x1ee3}}},
+  {0x1ee4, {1|F|D, {0x1ee5}}},
+  {0x1ee6, {1|F|D, {0x1ee7}}},
+  {0x1ee8, {1|F|D, {0x1ee9}}},
+  {0x1eea, {1|F|D, {0x1eeb}}},
+  {0x1eec, {1|F|D, {0x1eed}}},
+  {0x1eee, {1|F|D, {0x1eef}}},
+  {0x1ef0, {1|F|D, {0x1ef1}}},
+  {0x1ef2, {1|F|D, {0x1ef3}}},
+  {0x1ef4, {1|F|D, {0x1ef5}}},
+  {0x1ef6, {1|F|D, {0x1ef7}}},
+  {0x1ef8, {1|F|D, {0x1ef9}}},
+  {0x1efa, {1|F|D, {0x1efb}}},
+  {0x1efc, {1|F|D, {0x1efd}}},
+  {0x1efe, {1|F|D, {0x1eff}}},
+  {0x1f08, {1|F|D, {0x1f00}}},
+  {0x1f09, {1|F|D, {0x1f01}}},
+  {0x1f0a, {1|F|D, {0x1f02}}},
+  {0x1f0b, {1|F|D, {0x1f03}}},
+  {0x1f0c, {1|F|D, {0x1f04}}},
+  {0x1f0d, {1|F|D, {0x1f05}}},
+  {0x1f0e, {1|F|D, {0x1f06}}},
+  {0x1f0f, {1|F|D, {0x1f07}}},
+  {0x1f18, {1|F|D, {0x1f10}}},
+  {0x1f19, {1|F|D, {0x1f11}}},
+  {0x1f1a, {1|F|D, {0x1f12}}},
+  {0x1f1b, {1|F|D, {0x1f13}}},
+  {0x1f1c, {1|F|D, {0x1f14}}},
+  {0x1f1d, {1|F|D, {0x1f15}}},
+  {0x1f28, {1|F|D, {0x1f20}}},
+  {0x1f29, {1|F|D, {0x1f21}}},
+  {0x1f2a, {1|F|D, {0x1f22}}},
+  {0x1f2b, {1|F|D, {0x1f23}}},
+  {0x1f2c, {1|F|D, {0x1f24}}},
+  {0x1f2d, {1|F|D, {0x1f25}}},
+  {0x1f2e, {1|F|D, {0x1f26}}},
+  {0x1f2f, {1|F|D, {0x1f27}}},
+  {0x1f38, {1|F|D, {0x1f30}}},
+  {0x1f39, {1|F|D, {0x1f31}}},
+  {0x1f3a, {1|F|D, {0x1f32}}},
+  {0x1f3b, {1|F|D, {0x1f33}}},
+  {0x1f3c, {1|F|D, {0x1f34}}},
+  {0x1f3d, {1|F|D, {0x1f35}}},
+  {0x1f3e, {1|F|D, {0x1f36}}},
+  {0x1f3f, {1|F|D, {0x1f37}}},
+  {0x1f48, {1|F|D, {0x1f40}}},
+  {0x1f49, {1|F|D, {0x1f41}}},
+  {0x1f4a, {1|F|D, {0x1f42}}},
+  {0x1f4b, {1|F|D, {0x1f43}}},
+  {0x1f4c, {1|F|D, {0x1f44}}},
+  {0x1f4d, {1|F|D, {0x1f45}}},
+  {0x1f50, {2|F|SU|I(66), {0x03c5, 0x0313}}},
+  {0x1f52, {3|F|SU|I(68), {0x03c5, 0x0313, 0x0300}}},
+  {0x1f54, {3|F|SU|I(71), {0x03c5, 0x0313, 0x0301}}},
+  {0x1f56, {3|F|SU|I(74), {0x03c5, 0x0313, 0x0342}}},
+  {0x1f59, {1|F|D, {0x1f51}}},
+  {0x1f5b, {1|F|D, {0x1f53}}},
+  {0x1f5d, {1|F|D, {0x1f55}}},
+  {0x1f5f, {1|F|D, {0x1f57}}},
+  {0x1f68, {1|F|D, {0x1f60}}},
+  {0x1f69, {1|F|D, {0x1f61}}},
+  {0x1f6a, {1|F|D, {0x1f62}}},
+  {0x1f6b, {1|F|D, {0x1f63}}},
+  {0x1f6c, {1|F|D, {0x1f64}}},
+  {0x1f6d, {1|F|D, {0x1f65}}},
+  {0x1f6e, {1|F|D, {0x1f66}}},
+  {0x1f6f, {1|F|D, {0x1f67}}},
+  {0x1f80, {2|F|ST|SU|I(77), {0x1f00, 0x03b9}}},
+  {0x1f81, {2|F|ST|SU|I(80), {0x1f01, 0x03b9}}},
+  {0x1f82, {2|F|ST|SU|I(83), {0x1f02, 0x03b9}}},
+  {0x1f83, {2|F|ST|SU|I(86), {0x1f03, 0x03b9}}},
+  {0x1f84, {2|F|ST|SU|I(89), {0x1f04, 0x03b9}}},
+  {0x1f85, {2|F|ST|SU|I(92), {0x1f05, 0x03b9}}},
+  {0x1f86, {2|F|ST|SU|I(95), {0x1f06, 0x03b9}}},
+  {0x1f87, {2|F|ST|SU|I(98), {0x1f07, 0x03b9}}},
+  {0x1f88, {2|F|IT|SL|SU|I(101), {0x1f00, 0x03b9}}},
+  {0x1f89, {2|F|IT|SL|SU|I(106), {0x1f01, 0x03b9}}},
+  {0x1f8a, {2|F|IT|SL|SU|I(111), {0x1f02, 0x03b9}}},
+  {0x1f8b, {2|F|IT|SL|SU|I(116), {0x1f03, 0x03b9}}},
+  {0x1f8c, {2|F|IT|SL|SU|I(121), {0x1f04, 0x03b9}}},
+  {0x1f8d, {2|F|IT|SL|SU|I(126), {0x1f05, 0x03b9}}},
+  {0x1f8e, {2|F|IT|SL|SU|I(131), {0x1f06, 0x03b9}}},
+  {0x1f8f, {2|F|IT|SL|SU|I(136), {0x1f07, 0x03b9}}},
+  {0x1f90, {2|F|ST|SU|I(141), {0x1f20, 0x03b9}}},
+  {0x1f91, {2|F|ST|SU|I(144), {0x1f21, 0x03b9}}},
+  {0x1f92, {2|F|ST|SU|I(147), {0x1f22, 0x03b9}}},
+  {0x1f93, {2|F|ST|SU|I(150), {0x1f23, 0x03b9}}},
+  {0x1f94, {2|F|ST|SU|I(153), {0x1f24, 0x03b9}}},
+  {0x1f95, {2|F|ST|SU|I(156), {0x1f25, 0x03b9}}},
+  {0x1f96, {2|F|ST|SU|I(159), {0x1f26, 0x03b9}}},
+  {0x1f97, {2|F|ST|SU|I(162), {0x1f27, 0x03b9}}},
+  {0x1f98, {2|F|IT|SL|SU|I(165), {0x1f20, 0x03b9}}},
+  {0x1f99, {2|F|IT|SL|SU|I(170), {0x1f21, 0x03b9}}},
+  {0x1f9a, {2|F|IT|SL|SU|I(175), {0x1f22, 0x03b9}}},
+  {0x1f9b, {2|F|IT|SL|SU|I(180), {0x1f23, 0x03b9}}},
+  {0x1f9c, {2|F|IT|SL|SU|I(185), {0x1f24, 0x03b9}}},
+  {0x1f9d, {2|F|IT|SL|SU|I(190), {0x1f25, 0x03b9}}},
+  {0x1f9e, {2|F|IT|SL|SU|I(195), {0x1f26, 0x03b9}}},
+  {0x1f9f, {2|F|IT|SL|SU|I(200), {0x1f27, 0x03b9}}},
+  {0x1fa0, {2|F|ST|SU|I(205), {0x1f60, 0x03b9}}},
+  {0x1fa1, {2|F|ST|SU|I(208), {0x1f61, 0x03b9}}},
+  {0x1fa2, {2|F|ST|SU|I(211), {0x1f62, 0x03b9}}},
+  {0x1fa3, {2|F|ST|SU|I(214), {0x1f63, 0x03b9}}},
+  {0x1fa4, {2|F|ST|SU|I(217), {0x1f64, 0x03b9}}},
+  {0x1fa5, {2|F|ST|SU|I(220), {0x1f65, 0x03b9}}},
+  {0x1fa6, {2|F|ST|SU|I(223), {0x1f66, 0x03b9}}},
+  {0x1fa7, {2|F|ST|SU|I(226), {0x1f67, 0x03b9}}},
+  {0x1fa8, {2|F|IT|SL|SU|I(229), {0x1f60, 0x03b9}}},
+  {0x1fa9, {2|F|IT|SL|SU|I(234), {0x1f61, 0x03b9}}},
+  {0x1faa, {2|F|IT|SL|SU|I(239), {0x1f62, 0x03b9}}},
+  {0x1fab, {2|F|IT|SL|SU|I(244), {0x1f63, 0x03b9}}},
+  {0x1fac, {2|F|IT|SL|SU|I(249), {0x1f64, 0x03b9}}},
+  {0x1fad, {2|F|IT|SL|SU|I(254), {0x1f65, 0x03b9}}},
+  {0x1fae, {2|F|IT|SL|SU|I(259), {0x1f66, 0x03b9}}},
+  {0x1faf, {2|F|IT|SL|SU|I(264), {0x1f67, 0x03b9}}},
+  {0x1fb2, {2|F|ST|SU|I(269), {0x1f70, 0x03b9}}},
+  {0x1fb3, {2|F|ST|SU|I(273), {0x03b1, 0x03b9}}},
+  {0x1fb4, {2|F|ST|SU|I(276), {0x03ac, 0x03b9}}},
+  {0x1fb6, {2|F|SU|I(280), {0x03b1, 0x0342}}},
+  {0x1fb7, {3|F|ST|SU|I(282), {0x03b1, 0x0342, 0x03b9}}},
+  {0x1fb8, {1|F|D, {0x1fb0}}},
+  {0x1fb9, {1|F|D, {0x1fb1}}},
+  {0x1fba, {1|F|D, {0x1f70}}},
+  {0x1fbb, {1|F|D, {0x1f71}}},
+  {0x1fbc, {2|F|IT|SL|SU|I(288), {0x03b1, 0x03b9}}},
+  {0x1fbe, {1|F|SU|I(293), {0x03b9}}},
+  {0x1fc2, {2|F|ST|SU|I(294), {0x1f74, 0x03b9}}},
+  {0x1fc3, {2|F|ST|SU|I(298), {0x03b7, 0x03b9}}},
+  {0x1fc4, {2|F|ST|SU|I(301), {0x03ae, 0x03b9}}},
+  {0x1fc6, {2|F|SU|I(305), {0x03b7, 0x0342}}},
+  {0x1fc7, {3|F|ST|SU|I(307), {0x03b7, 0x0342, 0x03b9}}},
+  {0x1fc8, {1|F|D, {0x1f72}}},
+  {0x1fc9, {1|F|D, {0x1f73}}},
+  {0x1fca, {1|F|D, {0x1f74}}},
+  {0x1fcb, {1|F|D, {0x1f75}}},
+  {0x1fcc, {2|F|IT|SL|SU|I(313), {0x03b7, 0x03b9}}},
+  {0x1fd2, {3|F|SU|I(318), {0x03b9, 0x0308, 0x0300}}},
+  {0x1fd3, {3|F|SU|I(321), {0x03b9, 0x0308, 0x0301}}},
+  {0x1fd6, {2|F|SU|I(324), {0x03b9, 0x0342}}},
+  {0x1fd7, {3|F|SU|I(326), {0x03b9, 0x0308, 0x0342}}},
+  {0x1fd8, {1|F|D, {0x1fd0}}},
+  {0x1fd9, {1|F|D, {0x1fd1}}},
+  {0x1fda, {1|F|D, {0x1f76}}},
+  {0x1fdb, {1|F|D, {0x1f77}}},
+  {0x1fe2, {3|F|SU|I(329), {0x03c5, 0x0308, 0x0300}}},
+  {0x1fe3, {3|F|SU|I(332), {0x03c5, 0x0308, 0x0301}}},
+  {0x1fe4, {2|F|SU|I(335), {0x03c1, 0x0313}}},
+  {0x1fe6, {2|F|SU|I(337), {0x03c5, 0x0342}}},
+  {0x1fe7, {3|F|SU|I(339), {0x03c5, 0x0308, 0x0342}}},
+  {0x1fe8, {1|F|D, {0x1fe0}}},
+  {0x1fe9, {1|F|D, {0x1fe1}}},
+  {0x1fea, {1|F|D, {0x1f7a}}},
+  {0x1feb, {1|F|D, {0x1f7b}}},
+  {0x1fec, {1|F|D, {0x1fe5}}},
+  {0x1ff2, {2|F|ST|SU|I(342), {0x1f7c, 0x03b9}}},
+  {0x1ff3, {2|F|ST|SU|I(346), {0x03c9, 0x03b9}}},
+  {0x1ff4, {2|F|ST|SU|I(349), {0x03ce, 0x03b9}}},
+  {0x1ff6, {2|F|SU|I(353), {0x03c9, 0x0342}}},
+  {0x1ff7, {3|F|ST|SU|I(355), {0x03c9, 0x0342, 0x03b9}}},
+  {0x1ff8, {1|F|D, {0x1f78}}},
+  {0x1ff9, {1|F|D, {0x1f79}}},
+  {0x1ffa, {1|F|D, {0x1f7c}}},
+  {0x1ffb, {1|F|D, {0x1f7d}}},
+  {0x1ffc, {2|F|IT|SL|SU|I(361), {0x03c9, 0x03b9}}},
+  {0x2126, {1|F|D, {0x03c9}}},
+  {0x212a, {1|F|D, {0x006b}}},
+  {0x212b, {1|F|D, {0x00e5}}},
+  {0x2132, {1|F|D, {0x214e}}},
+  {0x2160, {1|F|D, {0x2170}}},
+  {0x2161, {1|F|D, {0x2171}}},
+  {0x2162, {1|F|D, {0x2172}}},
+  {0x2163, {1|F|D, {0x2173}}},
+  {0x2164, {1|F|D, {0x2174}}},
+  {0x2165, {1|F|D, {0x2175}}},
+  {0x2166, {1|F|D, {0x2176}}},
+  {0x2167, {1|F|D, {0x2177}}},
+  {0x2168, {1|F|D, {0x2178}}},
+  {0x2169, {1|F|D, {0x2179}}},
+  {0x216a, {1|F|D, {0x217a}}},
+  {0x216b, {1|F|D, {0x217b}}},
+  {0x216c, {1|F|D, {0x217c}}},
+  {0x216d, {1|F|D, {0x217d}}},
+  {0x216e, {1|F|D, {0x217e}}},
+  {0x216f, {1|F|D, {0x217f}}},
+  {0x2183, {1|F|D, {0x2184}}},
+  {0x24b6, {1|F|D, {0x24d0}}},
+  {0x24b7, {1|F|D, {0x24d1}}},
+  {0x24b8, {1|F|D, {0x24d2}}},
+  {0x24b9, {1|F|D, {0x24d3}}},
+  {0x24ba, {1|F|D, {0x24d4}}},
+  {0x24bb, {1|F|D, {0x24d5}}},
+  {0x24bc, {1|F|D, {0x24d6}}},
+  {0x24bd, {1|F|D, {0x24d7}}},
+  {0x24be, {1|F|D, {0x24d8}}},
+  {0x24bf, {1|F|D, {0x24d9}}},
+  {0x24c0, {1|F|D, {0x24da}}},
+  {0x24c1, {1|F|D, {0x24db}}},
+  {0x24c2, {1|F|D, {0x24dc}}},
+  {0x24c3, {1|F|D, {0x24dd}}},
+  {0x24c4, {1|F|D, {0x24de}}},
+  {0x24c5, {1|F|D, {0x24df}}},
+  {0x24c6, {1|F|D, {0x24e0}}},
+  {0x24c7, {1|F|D, {0x24e1}}},
+  {0x24c8, {1|F|D, {0x24e2}}},
+  {0x24c9, {1|F|D, {0x24e3}}},
+  {0x24ca, {1|F|D, {0x24e4}}},
+  {0x24cb, {1|F|D, {0x24e5}}},
+  {0x24cc, {1|F|D, {0x24e6}}},
+  {0x24cd, {1|F|D, {0x24e7}}},
+  {0x24ce, {1|F|D, {0x24e8}}},
+  {0x24cf, {1|F|D, {0x24e9}}},
+  {0x2c00, {1|F|D, {0x2c30}}},
+  {0x2c01, {1|F|D, {0x2c31}}},
+  {0x2c02, {1|F|D, {0x2c32}}},
+  {0x2c03, {1|F|D, {0x2c33}}},
+  {0x2c04, {1|F|D, {0x2c34}}},
+  {0x2c05, {1|F|D, {0x2c35}}},
+  {0x2c06, {1|F|D, {0x2c36}}},
+  {0x2c07, {1|F|D, {0x2c37}}},
+  {0x2c08, {1|F|D, {0x2c38}}},
+  {0x2c09, {1|F|D, {0x2c39}}},
+  {0x2c0a, {1|F|D, {0x2c3a}}},
+  {0x2c0b, {1|F|D, {0x2c3b}}},
+  {0x2c0c, {1|F|D, {0x2c3c}}},
+  {0x2c0d, {1|F|D, {0x2c3d}}},
+  {0x2c0e, {1|F|D, {0x2c3e}}},
+  {0x2c0f, {1|F|D, {0x2c3f}}},
+  {0x2c10, {1|F|D, {0x2c40}}},
+  {0x2c11, {1|F|D, {0x2c41}}},
+  {0x2c12, {1|F|D, {0x2c42}}},
+  {0x2c13, {1|F|D, {0x2c43}}},
+  {0x2c14, {1|F|D, {0x2c44}}},
+  {0x2c15, {1|F|D, {0x2c45}}},
+  {0x2c16, {1|F|D, {0x2c46}}},
+  {0x2c17, {1|F|D, {0x2c47}}},
+  {0x2c18, {1|F|D, {0x2c48}}},
+  {0x2c19, {1|F|D, {0x2c49}}},
+  {0x2c1a, {1|F|D, {0x2c4a}}},
+  {0x2c1b, {1|F|D, {0x2c4b}}},
+  {0x2c1c, {1|F|D, {0x2c4c}}},
+  {0x2c1d, {1|F|D, {0x2c4d}}},
+  {0x2c1e, {1|F|D, {0x2c4e}}},
+  {0x2c1f, {1|F|D, {0x2c4f}}},
+  {0x2c20, {1|F|D, {0x2c50}}},
+  {0x2c21, {1|F|D, {0x2c51}}},
+  {0x2c22, {1|F|D, {0x2c52}}},
+  {0x2c23, {1|F|D, {0x2c53}}},
+  {0x2c24, {1|F|D, {0x2c54}}},
+  {0x2c25, {1|F|D, {0x2c55}}},
+  {0x2c26, {1|F|D, {0x2c56}}},
+  {0x2c27, {1|F|D, {0x2c57}}},
+  {0x2c28, {1|F|D, {0x2c58}}},
+  {0x2c29, {1|F|D, {0x2c59}}},
+  {0x2c2a, {1|F|D, {0x2c5a}}},
+  {0x2c2b, {1|F|D, {0x2c5b}}},
+  {0x2c2c, {1|F|D, {0x2c5c}}},
+  {0x2c2d, {1|F|D, {0x2c5d}}},
+  {0x2c2e, {1|F|D, {0x2c5e}}},
+  {0x2c2f, {1|F|D, {0x2c5f}}},
+  {0x2c60, {1|F|D, {0x2c61}}},
+  {0x2c62, {1|F|D, {0x026b}}},
+  {0x2c63, {1|F|D, {0x1d7d}}},
+  {0x2c64, {1|F|D, {0x027d}}},
+  {0x2c67, {1|F|D, {0x2c68}}},
+  {0x2c69, {1|F|D, {0x2c6a}}},
+  {0x2c6b, {1|F|D, {0x2c6c}}},
+  {0x2c6d, {1|F|D, {0x0251}}},
+  {0x2c6e, {1|F|D, {0x0271}}},
+  {0x2c6f, {1|F|D, {0x0250}}},
+  {0x2c70, {1|F|D, {0x0252}}},
+  {0x2c72, {1|F|D, {0x2c73}}},
+  {0x2c75, {1|F|D, {0x2c76}}},
+  {0x2c7e, {1|F|D, {0x023f}}},
+  {0x2c7f, {1|F|D, {0x0240}}},
+  {0x2c80, {1|F|D, {0x2c81}}},
+  {0x2c82, {1|F|D, {0x2c83}}},
+  {0x2c84, {1|F|D, {0x2c85}}},
+  {0x2c86, {1|F|D, {0x2c87}}},
+  {0x2c88, {1|F|D, {0x2c89}}},
+  {0x2c8a, {1|F|D, {0x2c8b}}},
+  {0x2c8c, {1|F|D, {0x2c8d}}},
+  {0x2c8e, {1|F|D, {0x2c8f}}},
+  {0x2c90, {1|F|D, {0x2c91}}},
+  {0x2c92, {1|F|D, {0x2c93}}},
+  {0x2c94, {1|F|D, {0x2c95}}},
+  {0x2c96, {1|F|D, {0x2c97}}},
+  {0x2c98, {1|F|D, {0x2c99}}},
+  {0x2c9a, {1|F|D, {0x2c9b}}},
+  {0x2c9c, {1|F|D, {0x2c9d}}},
+  {0x2c9e, {1|F|D, {0x2c9f}}},
+  {0x2ca0, {1|F|D, {0x2ca1}}},
+  {0x2ca2, {1|F|D, {0x2ca3}}},
+  {0x2ca4, {1|F|D, {0x2ca5}}},
+  {0x2ca6, {1|F|D, {0x2ca7}}},
+  {0x2ca8, {1|F|D, {0x2ca9}}},
+  {0x2caa, {1|F|D, {0x2cab}}},
+  {0x2cac, {1|F|D, {0x2cad}}},
+  {0x2cae, {1|F|D, {0x2caf}}},
+  {0x2cb0, {1|F|D, {0x2cb1}}},
+  {0x2cb2, {1|F|D, {0x2cb3}}},
+  {0x2cb4, {1|F|D, {0x2cb5}}},
+  {0x2cb6, {1|F|D, {0x2cb7}}},
+  {0x2cb8, {1|F|D, {0x2cb9}}},
+  {0x2cba, {1|F|D, {0x2cbb}}},
+  {0x2cbc, {1|F|D, {0x2cbd}}},
+  {0x2cbe, {1|F|D, {0x2cbf}}},
+  {0x2cc0, {1|F|D, {0x2cc1}}},
+  {0x2cc2, {1|F|D, {0x2cc3}}},
+  {0x2cc4, {1|F|D, {0x2cc5}}},
+  {0x2cc6, {1|F|D, {0x2cc7}}},
+  {0x2cc8, {1|F|D, {0x2cc9}}},
+  {0x2cca, {1|F|D, {0x2ccb}}},
+  {0x2ccc, {1|F|D, {0x2ccd}}},
+  {0x2cce, {1|F|D, {0x2ccf}}},
+  {0x2cd0, {1|F|D, {0x2cd1}}},
+  {0x2cd2, {1|F|D, {0x2cd3}}},
+  {0x2cd4, {1|F|D, {0x2cd5}}},
+  {0x2cd6, {1|F|D, {0x2cd7}}},
+  {0x2cd8, {1|F|D, {0x2cd9}}},
+  {0x2cda, {1|F|D, {0x2cdb}}},
+  {0x2cdc, {1|F|D, {0x2cdd}}},
+  {0x2cde, {1|F|D, {0x2cdf}}},
+  {0x2ce0, {1|F|D, {0x2ce1}}},
+  {0x2ce2, {1|F|D, {0x2ce3}}},
+  {0x2ceb, {1|F|D, {0x2cec}}},
+  {0x2ced, {1|F|D, {0x2cee}}},
+  {0x2cf2, {1|F|D, {0x2cf3}}},
+  {0xa640, {1|F|D, {0xa641}}},
+  {0xa642, {1|F|D, {0xa643}}},
+  {0xa644, {1|F|D, {0xa645}}},
+  {0xa646, {1|F|D, {0xa647}}},
+  {0xa648, {1|F|D, {0xa649}}},
+  {0xa64a, {1|F|D, {0xa64b}}},
+  {0xa64c, {1|F|D, {0xa64d}}},
+  {0xa64e, {1|F|D, {0xa64f}}},
+  {0xa650, {1|F|D, {0xa651}}},
+  {0xa652, {1|F|D, {0xa653}}},
+  {0xa654, {1|F|D, {0xa655}}},
+  {0xa656, {1|F|D, {0xa657}}},
+  {0xa658, {1|F|D, {0xa659}}},
+  {0xa65a, {1|F|D, {0xa65b}}},
+  {0xa65c, {1|F|D, {0xa65d}}},
+  {0xa65e, {1|F|D, {0xa65f}}},
+  {0xa660, {1|F|D, {0xa661}}},
+  {0xa662, {1|F|D, {0xa663}}},
+  {0xa664, {1|F|D, {0xa665}}},
+  {0xa666, {1|F|D, {0xa667}}},
+  {0xa668, {1|F|D, {0xa669}}},
+  {0xa66a, {1|F|D, {0xa66b}}},
+  {0xa66c, {1|F|D, {0xa66d}}},
+  {0xa680, {1|F|D, {0xa681}}},
+  {0xa682, {1|F|D, {0xa683}}},
+  {0xa684, {1|F|D, {0xa685}}},
+  {0xa686, {1|F|D, {0xa687}}},
+  {0xa688, {1|F|D, {0xa689}}},
+  {0xa68a, {1|F|D, {0xa68b}}},
+  {0xa68c, {1|F|D, {0xa68d}}},
+  {0xa68e, {1|F|D, {0xa68f}}},
+  {0xa690, {1|F|D, {0xa691}}},
+  {0xa692, {1|F|D, {0xa693}}},
+  {0xa694, {1|F|D, {0xa695}}},
+  {0xa696, {1|F|D, {0xa697}}},
+  {0xa698, {1|F|D, {0xa699}}},
+  {0xa69a, {1|F|D, {0xa69b}}},
+  {0xa722, {1|F|D, {0xa723}}},
+  {0xa724, {1|F|D, {0xa725}}},
+  {0xa726, {1|F|D, {0xa727}}},
+  {0xa728, {1|F|D, {0xa729}}},
+  {0xa72a, {1|F|D, {0xa72b}}},
+  {0xa72c, {1|F|D, {0xa72d}}},
+  {0xa72e, {1|F|D, {0xa72f}}},
+  {0xa732, {1|F|D, {0xa733}}},
+  {0xa734, {1|F|D, {0xa735}}},
+  {0xa736, {1|F|D, {0xa737}}},
+  {0xa738, {1|F|D, {0xa739}}},
+  {0xa73a, {1|F|D, {0xa73b}}},
+  {0xa73c, {1|F|D, {0xa73d}}},
+  {0xa73e, {1|F|D, {0xa73f}}},
+  {0xa740, {1|F|D, {0xa741}}},
+  {0xa742, {1|F|D, {0xa743}}},
+  {0xa744, {1|F|D, {0xa745}}},
+  {0xa746, {1|F|D, {0xa747}}},
+  {0xa748, {1|F|D, {0xa749}}},
+  {0xa74a, {1|F|D, {0xa74b}}},
+  {0xa74c, {1|F|D, {0xa74d}}},
+  {0xa74e, {1|F|D, {0xa74f}}},
+  {0xa750, {1|F|D, {0xa751}}},
+  {0xa752, {1|F|D, {0xa753}}},
+  {0xa754, {1|F|D, {0xa755}}},
+  {0xa756, {1|F|D, {0xa757}}},
+  {0xa758, {1|F|D, {0xa759}}},
+  {0xa75a, {1|F|D, {0xa75b}}},
+  {0xa75c, {1|F|D, {0xa75d}}},
+  {0xa75e, {1|F|D, {0xa75f}}},
+  {0xa760, {1|F|D, {0xa761}}},
+  {0xa762, {1|F|D, {0xa763}}},
+  {0xa764, {1|F|D, {0xa765}}},
+  {0xa766, {1|F|D, {0xa767}}},
+  {0xa768, {1|F|D, {0xa769}}},
+  {0xa76a, {1|F|D, {0xa76b}}},
+  {0xa76c, {1|F|D, {0xa76d}}},
+  {0xa76e, {1|F|D, {0xa76f}}},
+  {0xa779, {1|F|D, {0xa77a}}},
+  {0xa77b, {1|F|D, {0xa77c}}},
+  {0xa77d, {1|F|D, {0x1d79}}},
+  {0xa77e, {1|F|D, {0xa77f}}},
+  {0xa780, {1|F|D, {0xa781}}},
+  {0xa782, {1|F|D, {0xa783}}},
+  {0xa784, {1|F|D, {0xa785}}},
+  {0xa786, {1|F|D, {0xa787}}},
+  {0xa78b, {1|F|D, {0xa78c}}},
+  {0xa78d, {1|F|D, {0x0265}}},
+  {0xa790, {1|F|D, {0xa791}}},
+  {0xa792, {1|F|D, {0xa793}}},
+  {0xa796, {1|F|D, {0xa797}}},
+  {0xa798, {1|F|D, {0xa799}}},
+  {0xa79a, {1|F|D, {0xa79b}}},
+  {0xa79c, {1|F|D, {0xa79d}}},
+  {0xa79e, {1|F|D, {0xa79f}}},
+  {0xa7a0, {1|F|D, {0xa7a1}}},
+  {0xa7a2, {1|F|D, {0xa7a3}}},
+  {0xa7a4, {1|F|D, {0xa7a5}}},
+  {0xa7a6, {1|F|D, {0xa7a7}}},
+  {0xa7a8, {1|F|D, {0xa7a9}}},
+  {0xa7aa, {1|F|D, {0x0266}}},
+  {0xa7ab, {1|F|D, {0x025c}}},
+  {0xa7ac, {1|F|D, {0x0261}}},
+  {0xa7ad, {1|F|D, {0x026c}}},
+  {0xa7ae, {1|F|D, {0x026a}}},
+  {0xa7b0, {1|F|D, {0x029e}}},
+  {0xa7b1, {1|F|D, {0x0287}}},
+  {0xa7b2, {1|F|D, {0x029d}}},
+  {0xa7b3, {1|F|D, {0xab53}}},
+  {0xa7b4, {1|F|D, {0xa7b5}}},
+  {0xa7b6, {1|F|D, {0xa7b7}}},
+  {0xa7b8, {1|F|D, {0xa7b9}}},
+  {0xa7ba, {1|F|D, {0xa7bb}}},
+  {0xa7bc, {1|F|D, {0xa7bd}}},
+  {0xa7be, {1|F|D, {0xa7bf}}},
+  {0xa7c0, {1|F|D, {0xa7c1}}},
+  {0xa7c2, {1|F|D, {0xa7c3}}},
+  {0xa7c4, {1|F|D, {0xa794}}},
+  {0xa7c5, {1|F|D, {0x0282}}},
+  {0xa7c6, {1|F|D, {0x1d8e}}},
+  {0xa7c7, {1|F|D, {0xa7c8}}},
+  {0xa7c9, {1|F|D, {0xa7ca}}},
+  {0xa7cb, {1|F|D, {0x0264}}},
+  {0xa7cc, {1|F|D, {0xa7cd}}},
+  {0xa7d0, {1|F|D, {0xa7d1}}},
+  {0xa7d6, {1|F|D, {0xa7d7}}},
+  {0xa7d8, {1|F|D, {0xa7d9}}},
+  {0xa7da, {1|F|D, {0xa7db}}},
+  {0xa7dc, {1|F|D, {0x019b}}},
+  {0xa7f5, {1|F|D, {0xa7f6}}},
+  {0xab70, {1|F|U, {0x13a0}}},
+  {0xab71, {1|F|U, {0x13a1}}},
+  {0xab72, {1|F|U, {0x13a2}}},
+  {0xab73, {1|F|U, {0x13a3}}},
+  {0xab74, {1|F|U, {0x13a4}}},
+  {0xab75, {1|F|U, {0x13a5}}},
+  {0xab76, {1|F|U, {0x13a6}}},
+  {0xab77, {1|F|U, {0x13a7}}},
+  {0xab78, {1|F|U, {0x13a8}}},
+  {0xab79, {1|F|U, {0x13a9}}},
+  {0xab7a, {1|F|U, {0x13aa}}},
+  {0xab7b, {1|F|U, {0x13ab}}},
+  {0xab7c, {1|F|U, {0x13ac}}},
+  {0xab7d, {1|F|U, {0x13ad}}},
+  {0xab7e, {1|F|U, {0x13ae}}},
+  {0xab7f, {1|F|U, {0x13af}}},
+  {0xab80, {1|F|U, {0x13b0}}},
+  {0xab81, {1|F|U, {0x13b1}}},
+  {0xab82, {1|F|U, {0x13b2}}},
+  {0xab83, {1|F|U, {0x13b3}}},
+  {0xab84, {1|F|U, {0x13b4}}},
+  {0xab85, {1|F|U, {0x13b5}}},
+  {0xab86, {1|F|U, {0x13b6}}},
+  {0xab87, {1|F|U, {0x13b7}}},
+  {0xab88, {1|F|U, {0x13b8}}},
+  {0xab89, {1|F|U, {0x13b9}}},
+  {0xab8a, {1|F|U, {0x13ba}}},
+  {0xab8b, {1|F|U, {0x13bb}}},
+  {0xab8c, {1|F|U, {0x13bc}}},
+  {0xab8d, {1|F|U, {0x13bd}}},
+  {0xab8e, {1|F|U, {0x13be}}},
+  {0xab8f, {1|F|U, {0x13bf}}},
+  {0xab90, {1|F|U, {0x13c0}}},
+  {0xab91, {1|F|U, {0x13c1}}},
+  {0xab92, {1|F|U, {0x13c2}}},
+  {0xab93, {1|F|U, {0x13c3}}},
+  {0xab94, {1|F|U, {0x13c4}}},
+  {0xab95, {1|F|U, {0x13c5}}},
+  {0xab96, {1|F|U, {0x13c6}}},
+  {0xab97, {1|F|U, {0x13c7}}},
+  {0xab98, {1|F|U, {0x13c8}}},
+  {0xab99, {1|F|U, {0x13c9}}},
+  {0xab9a, {1|F|U, {0x13ca}}},
+  {0xab9b, {1|F|U, {0x13cb}}},
+  {0xab9c, {1|F|U, {0x13cc}}},
+  {0xab9d, {1|F|U, {0x13cd}}},
+  {0xab9e, {1|F|U, {0x13ce}}},
+  {0xab9f, {1|F|U, {0x13cf}}},
+  {0xaba0, {1|F|U, {0x13d0}}},
+  {0xaba1, {1|F|U, {0x13d1}}},
+  {0xaba2, {1|F|U, {0x13d2}}},
+  {0xaba3, {1|F|U, {0x13d3}}},
+  {0xaba4, {1|F|U, {0x13d4}}},
+  {0xaba5, {1|F|U, {0x13d5}}},
+  {0xaba6, {1|F|U, {0x13d6}}},
+  {0xaba7, {1|F|U, {0x13d7}}},
+  {0xaba8, {1|F|U, {0x13d8}}},
+  {0xaba9, {1|F|U, {0x13d9}}},
+  {0xabaa, {1|F|U, {0x13da}}},
+  {0xabab, {1|F|U, {0x13db}}},
+  {0xabac, {1|F|U, {0x13dc}}},
+  {0xabad, {1|F|U, {0x13dd}}},
+  {0xabae, {1|F|U, {0x13de}}},
+  {0xabaf, {1|F|U, {0x13df}}},
+  {0xabb0, {1|F|U, {0x13e0}}},
+  {0xabb1, {1|F|U, {0x13e1}}},
+  {0xabb2, {1|F|U, {0x13e2}}},
+  {0xabb3, {1|F|U, {0x13e3}}},
+  {0xabb4, {1|F|U, {0x13e4}}},
+  {0xabb5, {1|F|U, {0x13e5}}},
+  {0xabb6, {1|F|U, {0x13e6}}},
+  {0xabb7, {1|F|U, {0x13e7}}},
+  {0xabb8, {1|F|U, {0x13e8}}},
+  {0xabb9, {1|F|U, {0x13e9}}},
+  {0xabba, {1|F|U, {0x13ea}}},
+  {0xabbb, {1|F|U, {0x13eb}}},
+  {0xabbc, {1|F|U, {0x13ec}}},
+  {0xabbd, {1|F|U, {0x13ed}}},
+  {0xabbe, {1|F|U, {0x13ee}}},
+  {0xabbf, {1|F|U, {0x13ef}}},
+  {0xfb00, {2|F|ST|SU|I(366), {0x0066, 0x0066}}},
+  {0xfb01, {2|F|ST|SU|I(370), {0x0066, 0x0069}}},
+  {0xfb02, {2|F|ST|SU|I(374), {0x0066, 0x006c}}},
+  {0xfb03, {3|F|ST|SU|I(378), {0x0066, 0x0066, 0x0069}}},
+  {0xfb04, {3|F|ST|SU|I(384), {0x0066, 0x0066, 0x006c}}},
+  {0xfb05, {2|F|ST|SU|I(390), {0x0073, 0x0074}}},
+  {0xfb06, {2|F|ST|SU|I(394), {0x0073, 0x0074}}},
+  {0xfb13, {2|F|ST|SU|I(398), {0x0574, 0x0576}}},
+  {0xfb14, {2|F|ST|SU|I(402), {0x0574, 0x0565}}},
+  {0xfb15, {2|F|ST|SU|I(406), {0x0574, 0x056b}}},
+  {0xfb16, {2|F|ST|SU|I(410), {0x057e, 0x0576}}},
+  {0xfb17, {2|F|ST|SU|I(414), {0x0574, 0x056d}}},
+  {0xff21, {1|F|D, {0xff41}}},
+  {0xff22, {1|F|D, {0xff42}}},
+  {0xff23, {1|F|D, {0xff43}}},
+  {0xff24, {1|F|D, {0xff44}}},
+  {0xff25, {1|F|D, {0xff45}}},
+  {0xff26, {1|F|D, {0xff46}}},
+  {0xff27, {1|F|D, {0xff47}}},
+  {0xff28, {1|F|D, {0xff48}}},
+  {0xff29, {1|F|D, {0xff49}}},
+  {0xff2a, {1|F|D, {0xff4a}}},
+  {0xff2b, {1|F|D, {0xff4b}}},
+  {0xff2c, {1|F|D, {0xff4c}}},
+  {0xff2d, {1|F|D, {0xff4d}}},
+  {0xff2e, {1|F|D, {0xff4e}}},
+  {0xff2f, {1|F|D, {0xff4f}}},
+  {0xff30, {1|F|D, {0xff50}}},
+  {0xff31, {1|F|D, {0xff51}}},
+  {0xff32, {1|F|D, {0xff52}}},
+  {0xff33, {1|F|D, {0xff53}}},
+  {0xff34, {1|F|D, {0xff54}}},
+  {0xff35, {1|F|D, {0xff55}}},
+  {0xff36, {1|F|D, {0xff56}}},
+  {0xff37, {1|F|D, {0xff57}}},
+  {0xff38, {1|F|D, {0xff58}}},
+  {0xff39, {1|F|D, {0xff59}}},
+  {0xff3a, {1|F|D, {0xff5a}}},
+  {0x10400, {1|F|D, {0x10428}}},
+  {0x10401, {1|F|D, {0x10429}}},
+  {0x10402, {1|F|D, {0x1042a}}},
+  {0x10403, {1|F|D, {0x1042b}}},
+  {0x10404, {1|F|D, {0x1042c}}},
+  {0x10405, {1|F|D, {0x1042d}}},
+  {0x10406, {1|F|D, {0x1042e}}},
+  {0x10407, {1|F|D, {0x1042f}}},
+  {0x10408, {1|F|D, {0x10430}}},
+  {0x10409, {1|F|D, {0x10431}}},
+  {0x1040a, {1|F|D, {0x10432}}},
+  {0x1040b, {1|F|D, {0x10433}}},
+  {0x1040c, {1|F|D, {0x10434}}},
+  {0x1040d, {1|F|D, {0x10435}}},
+  {0x1040e, {1|F|D, {0x10436}}},
+  {0x1040f, {1|F|D, {0x10437}}},
+  {0x10410, {1|F|D, {0x10438}}},
+  {0x10411, {1|F|D, {0x10439}}},
+  {0x10412, {1|F|D, {0x1043a}}},
+  {0x10413, {1|F|D, {0x1043b}}},
+  {0x10414, {1|F|D, {0x1043c}}},
+  {0x10415, {1|F|D, {0x1043d}}},
+  {0x10416, {1|F|D, {0x1043e}}},
+  {0x10417, {1|F|D, {0x1043f}}},
+  {0x10418, {1|F|D, {0x10440}}},
+  {0x10419, {1|F|D, {0x10441}}},
+  {0x1041a, {1|F|D, {0x10442}}},
+  {0x1041b, {1|F|D, {0x10443}}},
+  {0x1041c, {1|F|D, {0x10444}}},
+  {0x1041d, {1|F|D, {0x10445}}},
+  {0x1041e, {1|F|D, {0x10446}}},
+  {0x1041f, {1|F|D, {0x10447}}},
+  {0x10420, {1|F|D, {0x10448}}},
+  {0x10421, {1|F|D, {0x10449}}},
+  {0x10422, {1|F|D, {0x1044a}}},
+  {0x10423, {1|F|D, {0x1044b}}},
+  {0x10424, {1|F|D, {0x1044c}}},
+  {0x10425, {1|F|D, {0x1044d}}},
+  {0x10426, {1|F|D, {0x1044e}}},
+  {0x10427, {1|F|D, {0x1044f}}},
+  {0x104b0, {1|F|D, {0x104d8}}},
+  {0x104b1, {1|F|D, {0x104d9}}},
+  {0x104b2, {1|F|D, {0x104da}}},
+  {0x104b3, {1|F|D, {0x104db}}},
+  {0x104b4, {1|F|D, {0x104dc}}},
+  {0x104b5, {1|F|D, {0x104dd}}},
+  {0x104b6, {1|F|D, {0x104de}}},
+  {0x104b7, {1|F|D, {0x104df}}},
+  {0x104b8, {1|F|D, {0x104e0}}},
+  {0x104b9, {1|F|D, {0x104e1}}},
+  {0x104ba, {1|F|D, {0x104e2}}},
+  {0x104bb, {1|F|D, {0x104e3}}},
+  {0x104bc, {1|F|D, {0x104e4}}},
+  {0x104bd, {1|F|D, {0x104e5}}},
+  {0x104be, {1|F|D, {0x104e6}}},
+  {0x104bf, {1|F|D, {0x104e7}}},
+  {0x104c0, {1|F|D, {0x104e8}}},
+  {0x104c1, {1|F|D, {0x104e9}}},
+  {0x104c2, {1|F|D, {0x104ea}}},
+  {0x104c3, {1|F|D, {0x104eb}}},
+  {0x104c4, {1|F|D, {0x104ec}}},
+  {0x104c5, {1|F|D, {0x104ed}}},
+  {0x104c6, {1|F|D, {0x104ee}}},
+  {0x104c7, {1|F|D, {0x104ef}}},
+  {0x104c8, {1|F|D, {0x104f0}}},
+  {0x104c9, {1|F|D, {0x104f1}}},
+  {0x104ca, {1|F|D, {0x104f2}}},
+  {0x104cb, {1|F|D, {0x104f3}}},
+  {0x104cc, {1|F|D, {0x104f4}}},
+  {0x104cd, {1|F|D, {0x104f5}}},
+  {0x104ce, {1|F|D, {0x104f6}}},
+  {0x104cf, {1|F|D, {0x104f7}}},
+  {0x104d0, {1|F|D, {0x104f8}}},
+  {0x104d1, {1|F|D, {0x104f9}}},
+  {0x104d2, {1|F|D, {0x104fa}}},
+  {0x104d3, {1|F|D, {0x104fb}}},
+  {0x10570, {1|F|D, {0x10597}}},
+  {0x10571, {1|F|D, {0x10598}}},
+  {0x10572, {1|F|D, {0x10599}}},
+  {0x10573, {1|F|D, {0x1059a}}},
+  {0x10574, {1|F|D, {0x1059b}}},
+  {0x10575, {1|F|D, {0x1059c}}},
+  {0x10576, {1|F|D, {0x1059d}}},
+  {0x10577, {1|F|D, {0x1059e}}},
+  {0x10578, {1|F|D, {0x1059f}}},
+  {0x10579, {1|F|D, {0x105a0}}},
+  {0x1057a, {1|F|D, {0x105a1}}},
+  {0x1057c, {1|F|D, {0x105a3}}},
+  {0x1057d, {1|F|D, {0x105a4}}},
+  {0x1057e, {1|F|D, {0x105a5}}},
+  {0x1057f, {1|F|D, {0x105a6}}},
+  {0x10580, {1|F|D, {0x105a7}}},
+  {0x10581, {1|F|D, {0x105a8}}},
+  {0x10582, {1|F|D, {0x105a9}}},
+  {0x10583, {1|F|D, {0x105aa}}},
+  {0x10584, {1|F|D, {0x105ab}}},
+  {0x10585, {1|F|D, {0x105ac}}},
+  {0x10586, {1|F|D, {0x105ad}}},
+  {0x10587, {1|F|D, {0x105ae}}},
+  {0x10588, {1|F|D, {0x105af}}},
+  {0x10589, {1|F|D, {0x105b0}}},
+  {0x1058a, {1|F|D, {0x105b1}}},
+  {0x1058c, {1|F|D, {0x105b3}}},
+  {0x1058d, {1|F|D, {0x105b4}}},
+  {0x1058e, {1|F|D, {0x105b5}}},
+  {0x1058f, {1|F|D, {0x105b6}}},
+  {0x10590, {1|F|D, {0x105b7}}},
+  {0x10591, {1|F|D, {0x105b8}}},
+  {0x10592, {1|F|D, {0x105b9}}},
+  {0x10594, {1|F|D, {0x105bb}}},
+  {0x10595, {1|F|D, {0x105bc}}},
+  {0x10c80, {1|F|D, {0x10cc0}}},
+  {0x10c81, {1|F|D, {0x10cc1}}},
+  {0x10c82, {1|F|D, {0x10cc2}}},
+  {0x10c83, {1|F|D, {0x10cc3}}},
+  {0x10c84, {1|F|D, {0x10cc4}}},
+  {0x10c85, {1|F|D, {0x10cc5}}},
+  {0x10c86, {1|F|D, {0x10cc6}}},
+  {0x10c87, {1|F|D, {0x10cc7}}},
+  {0x10c88, {1|F|D, {0x10cc8}}},
+  {0x10c89, {1|F|D, {0x10cc9}}},
+  {0x10c8a, {1|F|D, {0x10cca}}},
+  {0x10c8b, {1|F|D, {0x10ccb}}},
+  {0x10c8c, {1|F|D, {0x10ccc}}},
+  {0x10c8d, {1|F|D, {0x10ccd}}},
+  {0x10c8e, {1|F|D, {0x10cce}}},
+  {0x10c8f, {1|F|D, {0x10ccf}}},
+  {0x10c90, {1|F|D, {0x10cd0}}},
+  {0x10c91, {1|F|D, {0x10cd1}}},
+  {0x10c92, {1|F|D, {0x10cd2}}},
+  {0x10c93, {1|F|D, {0x10cd3}}},
+  {0x10c94, {1|F|D, {0x10cd4}}},
+  {0x10c95, {1|F|D, {0x10cd5}}},
+  {0x10c96, {1|F|D, {0x10cd6}}},
+  {0x10c97, {1|F|D, {0x10cd7}}},
+  {0x10c98, {1|F|D, {0x10cd8}}},
+  {0x10c99, {1|F|D, {0x10cd9}}},
+  {0x10c9a, {1|F|D, {0x10cda}}},
+  {0x10c9b, {1|F|D, {0x10cdb}}},
+  {0x10c9c, {1|F|D, {0x10cdc}}},
+  {0x10c9d, {1|F|D, {0x10cdd}}},
+  {0x10c9e, {1|F|D, {0x10cde}}},
+  {0x10c9f, {1|F|D, {0x10cdf}}},
+  {0x10ca0, {1|F|D, {0x10ce0}}},
+  {0x10ca1, {1|F|D, {0x10ce1}}},
+  {0x10ca2, {1|F|D, {0x10ce2}}},
+  {0x10ca3, {1|F|D, {0x10ce3}}},
+  {0x10ca4, {1|F|D, {0x10ce4}}},
+  {0x10ca5, {1|F|D, {0x10ce5}}},
+  {0x10ca6, {1|F|D, {0x10ce6}}},
+  {0x10ca7, {1|F|D, {0x10ce7}}},
+  {0x10ca8, {1|F|D, {0x10ce8}}},
+  {0x10ca9, {1|F|D, {0x10ce9}}},
+  {0x10caa, {1|F|D, {0x10cea}}},
+  {0x10cab, {1|F|D, {0x10ceb}}},
+  {0x10cac, {1|F|D, {0x10cec}}},
+  {0x10cad, {1|F|D, {0x10ced}}},
+  {0x10cae, {1|F|D, {0x10cee}}},
+  {0x10caf, {1|F|D, {0x10cef}}},
+  {0x10cb0, {1|F|D, {0x10cf0}}},
+  {0x10cb1, {1|F|D, {0x10cf1}}},
+  {0x10cb2, {1|F|D, {0x10cf2}}},
+  {0x10d50, {1|F|D, {0x10d70}}},
+  {0x10d51, {1|F|D, {0x10d71}}},
+  {0x10d52, {1|F|D, {0x10d72}}},
+  {0x10d53, {1|F|D, {0x10d73}}},
+  {0x10d54, {1|F|D, {0x10d74}}},
+  {0x10d55, {1|F|D, {0x10d75}}},
+  {0x10d56, {1|F|D, {0x10d76}}},
+  {0x10d57, {1|F|D, {0x10d77}}},
+  {0x10d58, {1|F|D, {0x10d78}}},
+  {0x10d59, {1|F|D, {0x10d79}}},
+  {0x10d5a, {1|F|D, {0x10d7a}}},
+  {0x10d5b, {1|F|D, {0x10d7b}}},
+  {0x10d5c, {1|F|D, {0x10d7c}}},
+  {0x10d5d, {1|F|D, {0x10d7d}}},
+  {0x10d5e, {1|F|D, {0x10d7e}}},
+  {0x10d5f, {1|F|D, {0x10d7f}}},
+  {0x10d60, {1|F|D, {0x10d80}}},
+  {0x10d61, {1|F|D, {0x10d81}}},
+  {0x10d62, {1|F|D, {0x10d82}}},
+  {0x10d63, {1|F|D, {0x10d83}}},
+  {0x10d64, {1|F|D, {0x10d84}}},
+  {0x10d65, {1|F|D, {0x10d85}}},
+  {0x118a0, {1|F|D, {0x118c0}}},
+  {0x118a1, {1|F|D, {0x118c1}}},
+  {0x118a2, {1|F|D, {0x118c2}}},
+  {0x118a3, {1|F|D, {0x118c3}}},
+  {0x118a4, {1|F|D, {0x118c4}}},
+  {0x118a5, {1|F|D, {0x118c5}}},
+  {0x118a6, {1|F|D, {0x118c6}}},
+  {0x118a7, {1|F|D, {0x118c7}}},
+  {0x118a8, {1|F|D, {0x118c8}}},
+  {0x118a9, {1|F|D, {0x118c9}}},
+  {0x118aa, {1|F|D, {0x118ca}}},
+  {0x118ab, {1|F|D, {0x118cb}}},
+  {0x118ac, {1|F|D, {0x118cc}}},
+  {0x118ad, {1|F|D, {0x118cd}}},
+  {0x118ae, {1|F|D, {0x118ce}}},
+  {0x118af, {1|F|D, {0x118cf}}},
+  {0x118b0, {1|F|D, {0x118d0}}},
+  {0x118b1, {1|F|D, {0x118d1}}},
+  {0x118b2, {1|F|D, {0x118d2}}},
+  {0x118b3, {1|F|D, {0x118d3}}},
+  {0x118b4, {1|F|D, {0x118d4}}},
+  {0x118b5, {1|F|D, {0x118d5}}},
+  {0x118b6, {1|F|D, {0x118d6}}},
+  {0x118b7, {1|F|D, {0x118d7}}},
+  {0x118b8, {1|F|D, {0x118d8}}},
+  {0x118b9, {1|F|D, {0x118d9}}},
+  {0x118ba, {1|F|D, {0x118da}}},
+  {0x118bb, {1|F|D, {0x118db}}},
+  {0x118bc, {1|F|D, {0x118dc}}},
+  {0x118bd, {1|F|D, {0x118dd}}},
+  {0x118be, {1|F|D, {0x118de}}},
+  {0x118bf, {1|F|D, {0x118df}}},
+  {0x16e40, {1|F|D, {0x16e60}}},
+  {0x16e41, {1|F|D, {0x16e61}}},
+  {0x16e42, {1|F|D, {0x16e62}}},
+  {0x16e43, {1|F|D, {0x16e63}}},
+  {0x16e44, {1|F|D, {0x16e64}}},
+  {0x16e45, {1|F|D, {0x16e65}}},
+  {0x16e46, {1|F|D, {0x16e66}}},
+  {0x16e47, {1|F|D, {0x16e67}}},
+  {0x16e48, {1|F|D, {0x16e68}}},
+  {0x16e49, {1|F|D, {0x16e69}}},
+  {0x16e4a, {1|F|D, {0x16e6a}}},
+  {0x16e4b, {1|F|D, {0x16e6b}}},
+  {0x16e4c, {1|F|D, {0x16e6c}}},
+  {0x16e4d, {1|F|D, {0x16e6d}}},
+  {0x16e4e, {1|F|D, {0x16e6e}}},
+  {0x16e4f, {1|F|D, {0x16e6f}}},
+  {0x16e50, {1|F|D, {0x16e70}}},
+  {0x16e51, {1|F|D, {0x16e71}}},
+  {0x16e52, {1|F|D, {0x16e72}}},
+  {0x16e53, {1|F|D, {0x16e73}}},
+  {0x16e54, {1|F|D, {0x16e74}}},
+  {0x16e55, {1|F|D, {0x16e75}}},
+  {0x16e56, {1|F|D, {0x16e76}}},
+  {0x16e57, {1|F|D, {0x16e77}}},
+  {0x16e58, {1|F|D, {0x16e78}}},
+  {0x16e59, {1|F|D, {0x16e79}}},
+  {0x16e5a, {1|F|D, {0x16e7a}}},
+  {0x16e5b, {1|F|D, {0x16e7b}}},
+  {0x16e5c, {1|F|D, {0x16e7c}}},
+  {0x16e5d, {1|F|D, {0x16e7d}}},
+  {0x16e5e, {1|F|D, {0x16e7e}}},
+  {0x16e5f, {1|F|D, {0x16e7f}}},
+  {0x1e900, {1|F|D, {0x1e922}}},
+  {0x1e901, {1|F|D, {0x1e923}}},
+  {0x1e902, {1|F|D, {0x1e924}}},
+  {0x1e903, {1|F|D, {0x1e925}}},
+  {0x1e904, {1|F|D, {0x1e926}}},
+  {0x1e905, {1|F|D, {0x1e927}}},
+  {0x1e906, {1|F|D, {0x1e928}}},
+  {0x1e907, {1|F|D, {0x1e929}}},
+  {0x1e908, {1|F|D, {0x1e92a}}},
+  {0x1e909, {1|F|D, {0x1e92b}}},
+  {0x1e90a, {1|F|D, {0x1e92c}}},
+  {0x1e90b, {1|F|D, {0x1e92d}}},
+  {0x1e90c, {1|F|D, {0x1e92e}}},
+  {0x1e90d, {1|F|D, {0x1e92f}}},
+  {0x1e90e, {1|F|D, {0x1e930}}},
+  {0x1e90f, {1|F|D, {0x1e931}}},
+  {0x1e910, {1|F|D, {0x1e932}}},
+  {0x1e911, {1|F|D, {0x1e933}}},
+  {0x1e912, {1|F|D, {0x1e934}}},
+  {0x1e913, {1|F|D, {0x1e935}}},
+  {0x1e914, {1|F|D, {0x1e936}}},
+  {0x1e915, {1|F|D, {0x1e937}}},
+  {0x1e916, {1|F|D, {0x1e938}}},
+  {0x1e917, {1|F|D, {0x1e939}}},
+  {0x1e918, {1|F|D, {0x1e93a}}},
+  {0x1e919, {1|F|D, {0x1e93b}}},
+  {0x1e91a, {1|F|D, {0x1e93c}}},
+  {0x1e91b, {1|F|D, {0x1e93d}}},
+  {0x1e91c, {1|F|D, {0x1e93e}}},
+  {0x1e91d, {1|F|D, {0x1e93f}}},
+  {0x1e91e, {1|F|D, {0x1e940}}},
+  {0x1e91f, {1|F|D, {0x1e941}}},
+  {0x1e920, {1|F|D, {0x1e942}}},
+  {0x1e921, {1|F|D, {0x1e943}}},
+#define CaseFold_Locale (*(CaseFold_11_Type (*)[2])(CaseFold_11_Table+1555))
+  {0x0049, {1|F|D, {0x0069}}},
+  {0x0130, {2|F|D, {0x0069, 0x0307}}},
+};
+
+/* ANSI-C code produced by gperf version 3.1 */
+/* Command-line: gperf -7 -k1,2,3 -F,-1 -c -j1 -i1 -t -T -E -C -H onigenc_unicode_CaseFold_11_hash -N onigenc_unicode_CaseFold_11_lookup -n  */
+
+/* maximum key range = 3358, duplicates = 0 */
+
+#ifdef __GNUC__
+__inline
+#else
+#ifdef __cplusplus
+inline
+#endif
+#endif
+/*ARGSUSED*/
+static unsigned int
+onigenc_unicode_CaseFold_11_hash(const OnigCodePoint code)
+{
+  static const unsigned short asso_values[] =
+    {
+         2,  271,    6,   43,    1,    1,   64,   14,    5,  396,
+       239,  791, 3364, 3364, 3364, 3364, 3364, 3364, 3364, 3364,
+      3364, 3364, 3364, 3364, 3364,   45,  553, 3364, 3364, 3364,
+      3364, 3364, 3364,  400, 3364, 3364, 3364, 3364, 3364,   11,
+      3364, 3364, 3364, 3364, 3364, 3364, 3364, 3364, 3364,  500,
+      3364, 3364, 3364, 3364, 3364, 3364, 3364,  163, 3364, 3364,
+       311,  310,  445,    3, 3364, 3364,  129,   15, 3364, 3364,
+      3364, 3364, 3364,  410, 3364, 3364,  400,  863,  428,   38,
+      2012,  226,   42,  182, 2175,   94, 1252,    7,   12,   24,
+      2080,  764, 1166,  684, 1635,  168, 1891,  308, 1977,  153,
+      1790,  108, 1520,  261, 1811,  426, 1766,  484, 1720,  506,
+      2127,  286, 1445,  411, 1715,  366, 1703,  352,   60,  667,
+      1428,  551, 1322,  611, 1650,  597,  631,  614, 1994,  691,
+        82,  876, 1670,  870, 1699,  707, 1301,  542, 1886,  816,
+      1751,  822, 1813, 1101, 1662, 1117,    3, 1003, 1187, 1134,
+      1275,  989, 1600,  933, 1567,  925, 1764, 1197, 1051,  843,
+      1847, 1034,  212, 1071, 1244, 1020,   85, 1143,   30,  942,
+        17, 1478,  308, 1394,  203, 1476,   26, 1347,  178, 1380,
+        24, 1629,  104, 1574,  123, 1553,  520, 1547,  122, 1608,
+         2,  135,   38, 1613,   55, 1826,  206, 1996,  281, 2105,
+       488, 1794,  348, 1917,  368, 1655,  235
+    };
+  return asso_values[bits_of(code, 2)+79] + asso_values[bits_of(code, 1)] + asso_values[bits_of(code, 0)];
+}
+
+static const CodePointList3 *
+onigenc_unicode_CaseFold_11_lookup(const OnigCodePoint code)
+{
+  enum
+    {
+      MIN_CODE_VALUE = 0x41,
+      MAX_CODE_VALUE = 0x1e921,
+      TOTAL_KEYWORDS = 1557,
+      MIN_WORD_LENGTH = 3,
+      MAX_WORD_LENGTH = 3,
+      MIN_HASH_VALUE = 6,
+      MAX_HASH_VALUE = 3363
+    };
+
+  static const short wordlist[] =
+    {
+      -1, -1, -1, -1, -1, -1,
+      /*0x0243*/ 221,
+      /*0x0043*/ 2,
+      /*0x1fc3*/ 828,
+      -1,
+      /*0x0208*/ 194,
+      /*0x0143*/ 89,
+      /*0x1f88*/ 776,
+      /*0x10408*/ 1281,
+      /*0x0408*/ 305,
+      /*0x0108*/ 61,
+      /*0x2c6f*/ 969,
+      /*0x1f89*/ 777,
+      /*0x10409*/ 1282,
+      /*0x0409*/ 306,
+      /*0xab88*/ 1179,
+      /*0x2c08*/ 920,
+      /*0x1fdb*/ 844,
+      /*0x0388*/ 235,
+      -1,
+      /*0xab89*/ 1180,
+      /*0x2c09*/ 921,
+      /*0x020a*/ 195,
+      /*0x0389*/ 236,
+      /*0x1f8a*/ 778,
+      /*0x1040a*/ 1283,
+      /*0x040a*/ 307,
+      /*0x010a*/ 62,
+      /*0x2c88*/ 979,
+      /*0x0059*/ 23,
+      /*0x1fd9*/ 842,
+      -1,
+      /*0xab8a*/ 1181,
+      /*0x2c0a*/ 922,
+      -1,
+      /*0x038a*/ 237,
+      /*0x0200*/ 190,
+      -1,
+      /*0x1f80*/ 768,
+      /*0x10400*/ 1273,
+      /*0x0400*/ 297,
+      /*0x0100*/ 57,
+      /*0x1f83*/ 771,
+      /*0x10403*/ 1276,
+      /*0x0403*/ 300,
+      /*0x2c8a*/ 980,
+      /*0xab80*/ 1171,
+      /*0x2c00*/ 912,
+      /*0x10c88*/ 1392,
+      /*0x03f1*/ 288,
+      /*0xab83*/ 1174,
+      /*0x2c03*/ 915,
+      /*0x0189*/ 126,
+      /*0x10c89*/ 1393,
+      /*0x2183*/ 885,
+      /*0x1ff3*/ 856,
+      -1,
+      /*0x01db*/ 170,
+      /*0x1e908*/ 1529,
+      /*0x2c80*/ 975,
+      /*0x1fa7*/ 807,
+      /*0x10427*/ 1312,
+      /*0x0427*/ 336,
+      /*0x1e909*/ 1530,
+      /*0x018a*/ 127,
+      /*0x10c8a*/ 1394,
+      -1, -1,
+      /*0xaba7*/ 1210,
+      /*0x2c27*/ 951,
+      /*0x01d9*/ 169,
+      /*0x03a7*/ 263,
+      -1, -1, -1,
+      /*0x1e90a*/ 1531,
+      -1,
+      /*0xa780*/ 1107,
+      /*0x01f1*/ 181,
+      /*0x10c80*/ 1384,
+      -1, -1,
+      /*0x1fb3*/ 817,
+      /*0x10c83*/ 1387,
+      /*0x0057*/ 21,
+      /*0x1fd7*/ 840,
+      -1, -1, -1,
+      /*0x1e900*/ 1521,
+      /*0xabb3*/ 1222,
+      -1,
+      /*0x0206*/ 193,
+      /*0x1e903*/ 1524,
+      /*0x1f86*/ 774,
+      /*0x10406*/ 1279,
+      /*0x0406*/ 303,
+      /*0x0106*/ 60,
+      -1, -1,
+      /*0x01a7*/ 145,
+      /*0x10ca7*/ 1423,
+      /*0xab86*/ 1177,
+      /*0x2c06*/ 918,
+      /*0x1fe7*/ 849,
+      /*0x0386*/ 234,
+      /*0x0216*/ 201,
+      -1,
+      /*0x1f96*/ 790,
+      /*0x10416*/ 1295,
+      /*0x0416*/ 319,
+      /*0x0116*/ 68,
+      -1,
+      /*0x2c67*/ 964,
+      -1,
+      /*0x2c86*/ 978,
+      /*0xab96*/ 1193,
+      /*0x2c16*/ 934,
+      -1,
+      /*0x0396*/ 247,
+      -1,
+      /*0xa7b3*/ 1133,
+      /*0x01b3*/ 152,
+      /*0x1fe9*/ 851,
+      -1,
+      /*0x01d7*/ 168,
+      -1, -1,
+      /*0x216f*/ 884,
+      /*0x2c96*/ 986,
+      -1,
+      /*0x2c6d*/ 967,
+      /*0x2c69*/ 965,
+      /*0xa786*/ 1110,
+      /*0x0186*/ 124,
+      /*0x10c86*/ 1390,
+      /*0xfb00*/ 1235,
+      /*0x0470*/ 353,
+      /*0x0170*/ 112,
+      -1,
+      /*0xfb03*/ 1238,
+      -1, -1,
+      /*0x2ced*/ 1026,
+      /*0x2c70*/ 970,
+      /*0x1e906*/ 1527,
+      /*0x03f0*/ 287,
+      /*0xa796*/ 1115,
+      /*0x0196*/ 135,
+      /*0x10c96*/ 1406,
+      /*0x2165*/ 874,
+      /*0x0214*/ 200,
+      /*0x2161*/ 870,
+      /*0x1f94*/ 788,
+      /*0x10414*/ 1293,
+      /*0x0414*/ 317,
+      /*0x0114*/ 67,
+      -1, -1,
+      /*0x1e916*/ 1543,
+      -1,
+      /*0xab94*/ 1191,
+      /*0x2c14*/ 932,
+      -1,
+      /*0x0394*/ 245,
+      -1,
+      /*0x0210*/ 198,
+      /*0x1c88*/ 538,
+      /*0x1f90*/ 784,
+      /*0x10410*/ 1289,
+      /*0x0410*/ 313,
+      /*0x0110*/ 65,
+      /*0x1c89*/ 539,
+      -1,
+      /*0x2c94*/ 985,
+      /*0x01f0*/ 180,
+      /*0xab90*/ 1187,
+      /*0x2c10*/ 928,
+      /*0x1fe3*/ 846,
+      /*0x0390*/ 241,
+      /*0x0204*/ 192,
+      -1,
+      /*0x1f84*/ 772,
+      /*0x10404*/ 1277,
+      /*0x0404*/ 301,
+      /*0x0104*/ 59,
+      -1,
+      /*0x2c63*/ 962,
+      -1,
+      /*0x2c90*/ 983,
+      /*0xab84*/ 1175,
+      /*0x2c04*/ 916,
+      /*0xfb06*/ 1241,
+      /*0x0194*/ 134,
+      /*0x10c94*/ 1404,
+      -1,
+      /*0x0370*/ 230,
+      -1,
+      /*0x1c80*/ 530,
+      -1, -1, -1,
+      /*0x1c83*/ 533,
+      /*0x2c84*/ 977,
+      /*0x1e914*/ 1541,
+      -1,
+      /*0xfb16*/ 1245,
+      /*0xa790*/ 1113,
+      /*0x0190*/ 131,
+      /*0x10c90*/ 1400,
+      -1,
+      /*0x0053*/ 17,
+      /*0x1fd3*/ 838,
+      -1, -1,
+      /*0x2c75*/ 972,
+      -1,
+      /*0x03f5*/ 290,
+      -1,
+      /*0x1e910*/ 1537,
+      /*0x1ca7*/ 563,
+      /*0xa784*/ 1109,
+      /*0x0184*/ 123,
+      /*0x10c84*/ 1388,
+      /*0x0202*/ 191,
+      -1,
+      /*0x1f82*/ 770,
+      /*0x10402*/ 1275,
+      /*0x0402*/ 299,
+      /*0x0102*/ 58,
+      /*0x2167*/ 876,
+      -1, -1,
+      /*0x1e904*/ 1525,
+      /*0xab82*/ 1173,
+      /*0x2c02*/ 914,
+      -1, -1,
+      /*0x017f*/ 120,
+      /*0x0543*/ 463,
+      -1, -1,
+      /*0x1cb3*/ 575,
+      /*0x0508*/ 425,
+      /*0x2c7f*/ 974,
+      /*0xa7f5*/ 1154,
+      /*0x03ff*/ 296,
+      /*0x2c82*/ 976,
+      /*0x216d*/ 882,
+      /*0x2169*/ 878,
+      -1,
+      /*0xfb14*/ 1243,
+      /*0x01d3*/ 166,
+      -1,
+      /*0x1c86*/ 536,
+      -1, -1, -1, -1,
+      /*0x0218*/ 202,
+      /*0x050a*/ 426,
+      /*0x1f98*/ 792,
+      /*0x10418*/ 1297,
+      /*0x0418*/ 321,
+      /*0x0118*/ 69,
+      /*0xa782*/ 1108,
+      /*0x0182*/ 122,
+      /*0x10c82*/ 1386,
+      /*0x1c96*/ 546,
+      /*0xab98*/ 1195,
+      /*0x2c18*/ 936,
+      /*0x00c3*/ 29,
+      /*0x0398*/ 249,
+      /*0x10571*/ 1350,
+      /*0x0500*/ 421,
+      -1, -1,
+      /*0x1e902*/ 1523,
+      -1, -1,
+      /*0xfb04*/ 1239,
+      /*0x1ff7*/ 859,
+      /*0x2c98*/ 987,
+      -1,
+      /*0x0220*/ 206,
+      /*0x00db*/ 52,
+      /*0x1fa0*/ 800,
+      /*0x10420*/ 1305,
+      /*0x0420*/ 329,
+      /*0x0120*/ 73,
+      /*0x10573*/ 1352,
+      -1,
+      /*0x03f7*/ 291,
+      -1,
+      /*0xaba0*/ 1203,
+      /*0x2c20*/ 944,
+      /*0x037f*/ 233,
+      /*0x03a0*/ 257,
+      /*0x00d9*/ 50,
+      -1,
+      /*0xa798*/ 1116,
+      /*0x0198*/ 137,
+      /*0x10c98*/ 1408,
+      -1,
+      /*0x2163*/ 872,
+      -1,
+      /*0x0212*/ 199,
+      /*0x2ca0*/ 991,
+      /*0x1f92*/ 786,
+      /*0x10412*/ 1291,
+      /*0x0412*/ 315,
+      /*0x0112*/ 66,
+      /*0x1e918*/ 1545,
+      /*0x1c94*/ 544,
+      /*0x1e88*/ 654,
+      /*0x1e08*/ 590,
+      /*0xab92*/ 1189,
+      /*0x2c12*/ 930,
+      /*0x0533*/ 447,
+      /*0x0392*/ 243,
+      -1,
+      /*0x01f7*/ 185,
+      -1, -1,
+      /*0xfb02*/ 1237,
+      /*0xa7a0*/ 1120,
+      /*0x01a0*/ 141,
+      /*0x10ca0*/ 1416,
+      /*0x1c90*/ 540,
+      /*0x2c92*/ 984,
+      /*0x0506*/ 424,
+      /*0x1e8a*/ 655,
+      /*0x1e0a*/ 591,
+      -1, -1, -1, -1,
+      /*0x1e920*/ 1553,
+      -1, -1, -1, -1,
+      /*0x1c84*/ 534,
+      -1,
+      /*0x0516*/ 432,
+      /*0x1e80*/ 650,
+      /*0x1e00*/ 586,
+      /*0xa792*/ 1114,
+      /*0x1ffb*/ 863,
+      /*0x10c92*/ 1402,
+      /*0x0226*/ 209,
+      /*0x017b*/ 118,
+      /*0x1fa6*/ 806,
+      /*0x10426*/ 1311,
+      /*0x0426*/ 335,
+      /*0x0126*/ 76,
+      /*0x13fb*/ 527,
+      -1, -1,
+      /*0x1e912*/ 1539,
+      /*0xaba6*/ 1209,
+      /*0x2c26*/ 950,
+      -1,
+      /*0x03a6*/ 262,
+      /*0x0224*/ 208,
+      -1,
+      /*0x1fa4*/ 804,
+      /*0x10424*/ 1309,
+      /*0x0424*/ 333,
+      /*0x0124*/ 75,
+      /*0x10570*/ 1349,
+      /*0x017d*/ 119,
+      -1,
+      /*0x2ca6*/ 994,
+      /*0xaba4*/ 1207,
+      /*0x2c24*/ 948,
+      /*0x13fd*/ 529,
+      /*0x03a4*/ 260,
+      -1,
+      /*0x03fd*/ 294,
+      -1, -1, -1, -1, -1, -1,
+      /*0x1c82*/ 532,
+      /*0x2ca4*/ 993,
+      -1,
+      /*0x0514*/ 431,
+      -1,
+      /*0xa7a6*/ 1123,
+      /*0x01a6*/ 144,
+      /*0x10ca6*/ 1422,
+      -1,
+      /*0x104c3*/ 1332,
+      /*0x04c3*/ 391,
+      -1, -1, -1,
+      /*0x10c3*/ 519,
+      /*0x1e86*/ 653,
+      /*0x1e06*/ 589,
+      -1,
+      /*0x0510*/ 429,
+      /*0xa7a4*/ 1122,
+      /*0x01a4*/ 143,
+      /*0x10ca4*/ 1420,
+      -1,
+      /*0x0222*/ 207,
+      /*0x24c3*/ 899,
+      /*0x1fa2*/ 802,
+      /*0x10422*/ 1307,
+      /*0x0422*/ 331,
+      /*0x0122*/ 74,
+      /*0x1e96*/ 661,
+      /*0x1e16*/ 597,
+      /*0x048a*/ 362,
+      /*0x0504*/ 423,
+      /*0xaba2*/ 1205,
+      /*0x2c22*/ 946,
+      /*0x1c98*/ 548,
+      -1, -1,
+      /*0x021a*/ 203,
+      -1,
+      /*0x1f9a*/ 794,
+      /*0x1041a*/ 1299,
+      /*0x041a*/ 323,
+      /*0x011a*/ 70,
+      -1,
+      /*0x0480*/ 361,
+      /*0x2ca2*/ 992,
+      -1,
+      /*0xab9a*/ 1197,
+      /*0x2c1a*/ 938,
+      -1,
+      /*0x039a*/ 251,
+      -1, -1, -1,
+      /*0x10575*/ 1354,
+      /*0x1ef0*/ 708,
+      /*0x1e70*/ 642,
+      /*0x1f6f*/ 767,
+      -1,
+      /*0x1ca0*/ 556,
+      /*0x2c9a*/ 988,
+      /*0x0553*/ 479,
+      /*0x1f08*/ 716,
+      /*0xa7a2*/ 1121,
+      /*0x01a2*/ 142,
+      /*0x10ca2*/ 1418,
+      -1,
+      /*0x1f09*/ 717,
+      -1, -1,
+      /*0x10a7*/ 491,
+      -1,
+      /*0x1f5b*/ 757,
+      /*0x1e94*/ 660,
+      /*0x1e14*/ 596,
+      /*0x0502*/ 422,
+      -1, -1,
+      /*0xa79a*/ 1117,
+      /*0x1f0a*/ 718,
+      /*0x10c9a*/ 1410,
+      /*0x1c92*/ 542,
+      -1,
+      /*0x1057f*/ 1363,
+      /*0x00df*/ 56,
+      /*0x1f59*/ 756,
+      -1,
+      /*0x104b3*/ 1316,
+      /*0x1e90*/ 658,
+      /*0x1e10*/ 594,
+      /*0x1e91a*/ 1547,
+      /*0x2126*/ 865,
+      /*0x10b3*/ 503,
+      /*0x00d3*/ 45,
+      -1,
+      /*0x021c*/ 204,
+      -1,
+      /*0x1f9c*/ 796,
+      /*0x1041c*/ 1301,
+      /*0x041c*/ 325,
+      /*0x011c*/ 71,
+      /*0x1ff9*/ 861,
+      /*0x1e84*/ 652,
+      /*0x1e04*/ 588,
+      /*0x0179*/ 117,
+      /*0xab9c*/ 1199,
+      /*0x2c1c*/ 940,
+      -1,
+      /*0x039c*/ 253,
+      /*0x13f9*/ 525,
+      /*0x0518*/ 433,
+      -1,
+      /*0x03f9*/ 292,
+      -1,
+      /*0x0496*/ 368,
+      -1, -1,
+      /*0x021e*/ 205,
+      /*0x2c9c*/ 989,
+      /*0x1f9e*/ 798,
+      /*0x1041e*/ 1303,
+      /*0x041e*/ 327,
+      /*0x011e*/ 72,
+      -1, -1,
+      /*0x1ca6*/ 562,
+      -1,
+      /*0xab9e*/ 1201,
+      /*0x2c1e*/ 942,
+      /*0x10577*/ 1356,
+      /*0x039e*/ 255,
+      -1, -1,
+      /*0x1feb*/ 853,
+      -1,
+      /*0x0520*/ 437,
+      /*0xa79c*/ 1118,
+      /*0x019c*/ 138,
+      /*0x10c9c*/ 1412,
+      /*0x1ca4*/ 560,
+      /*0x2c9e*/ 990,
+      /*0x04f0*/ 413,
+      /*0x2c6b*/ 966,
+      -1, -1, -1,
+      /*0x1e82*/ 651,
+      /*0x1e02*/ 587,
+      /*0x1e91c*/ 1549,
+      -1, -1, -1, -1,
+      /*0x023a*/ 216,
+      /*0x2ceb*/ 1025,
+      /*0x1fba*/ 823,
+      -1,
+      /*0x0512*/ 430,
+      /*0xa79e*/ 1119,
+      /*0x0494*/ 367,
+      /*0x10c9e*/ 1414,
+      -1,
+      /*0x022a*/ 211,
+      /*0xabba*/ 1229,
+      /*0x1faa*/ 810,
+      -1,
+      /*0x042a*/ 339,
+      /*0x012a*/ 78,
+      -1,
+      /*0x118a7*/ 1464,
+      /*0x1e91e*/ 1551,
+      -1,
+      /*0xabaa*/ 1213,
+      /*0x2c2a*/ 954,
+      /*0x0490*/ 365,
+      /*0x03aa*/ 266,
+      /*0x2cba*/ 1004,
+      /*0x1f6d*/ 765,
+      /*0x1f69*/ 761,
+      /*0x10d5b*/ 1446,
+      -1,
+      /*0x1e98*/ 663,
+      /*0x1e18*/ 598,
+      -1,
+      /*0x1ca2*/ 558,
+      /*0x2caa*/ 996,
+      /*0x10d65*/ 1456,
+      -1,
+      /*0x10d61*/ 1452,
+      /*0x00dd*/ 54,
+      -1,
+      /*0x118b3*/ 1476,
+      /*0x10d59*/ 1444,
+      -1,
+      /*0xa7ba*/ 1137,
+      -1, -1, -1, -1,
+      /*0x1c9a*/ 550,
+      -1,
+      /*0x0526*/ 440,
+      -1,
+      /*0xa7aa*/ 1125,
+      -1,
+      /*0x10caa*/ 1426,
+      /*0x1ea0*/ 668,
+      /*0x1e20*/ 602,
+      /*0x022e*/ 213,
+      -1,
+      /*0x1fae*/ 814,
+      -1,
+      /*0x042e*/ 343,
+      /*0x012e*/ 80,
+      -1,
+      /*0x0524*/ 439,
+      /*0x1057d*/ 1361,
+      /*0x104d3*/ 1348,
+      /*0xabae*/ 1217,
+      /*0x2c2e*/ 958,
+      -1, -1,
+      /*0x022c*/ 212,
+      -1,
+      /*0x1fac*/ 812,
+      /*0x0230*/ 214,
+      /*0x042c*/ 341,
+      /*0x012c*/ 79,
+      /*0x1e92*/ 659,
+      /*0x1e12*/ 595,
+      /*0x0130*/ 1556,
+      /*0x2cae*/ 998,
+      /*0xabac*/ 1215,
+      /*0x2c2c*/ 956,
+      -1,
+      /*0xabb0*/ 1219,
+      -1, -1,
+      /*0x03b0*/ 268,
+      -1, -1, -1, -1, -1,
+      /*0x1faf*/ 815,
+      /*0x2cac*/ 997,
+      /*0x042f*/ 344,
+      /*0x10d57*/ 1442,
+      /*0x2cb0*/ 999,
+      /*0xa7ae*/ 1129,
+      /*0x01ae*/ 148,
+      /*0x10cae*/ 1430,
+      /*0xabaf*/ 1218,
+      /*0x2c2f*/ 959,
+      -1, -1, -1,
+      /*0x1c9c*/ 552,
+      /*0x1f5f*/ 759,
+      /*0x216b*/ 880,
+      /*0x0522*/ 438,
+      -1, -1,
+      /*0xa7ac*/ 1127,
+      /*0x01ac*/ 147,
+      /*0x10cac*/ 1428,
+      /*0xa7b0*/ 1130,
+      /*0x0498*/ 369,
+      /*0x10cb0*/ 1432,
+      -1, -1, -1,
+      /*0x1ea6*/ 671,
+      /*0x1e26*/ 605,
+      -1,
+      /*0x051a*/ 434,
+      -1, -1,
+      /*0x0228*/ 210,
+      /*0x1c9e*/ 554,
+      /*0x1fa8*/ 808,
+      -1,
+      /*0x0428*/ 337,
+      /*0x0128*/ 77,
+      /*0x01af*/ 149,
+      /*0x10caf*/ 1431,
+      /*0x1ea4*/ 670,
+      /*0x1e24*/ 604,
+      /*0xaba8*/ 1211,
+      /*0x2c28*/ 952,
+      /*0x212a*/ 866,
+      /*0x03a8*/ 264,
+      /*0x04a0*/ 373,
+      -1, -1,
+      /*0x020e*/ 197,
+      /*0x10a0*/ 484,
+      /*0x1f8e*/ 782,
+      /*0x1040e*/ 1287,
+      /*0x040e*/ 311,
+      /*0x010e*/ 64,
+      /*0x2ca8*/ 995,
+      /*0x0232*/ 215,
+      -1,
+      /*0x1fb2*/ 816,
+      /*0xab8e*/ 1185,
+      /*0x2c0e*/ 926,
+      /*0x0132*/ 81,
+      /*0x038e*/ 239,
+      -1, -1, -1,
+      /*0xabb2*/ 1221,
+      -1,
+      /*0x0492*/ 366,
+      /*0x1cba*/ 582,
+      /*0x1f18*/ 724,
+      -1,
+      /*0x2c8e*/ 982,
+      /*0xa7a8*/ 1124,
+      /*0x1fb8*/ 821,
+      /*0x10ca8*/ 1424,
+      -1, -1,
+      /*0x1caa*/ 566,
+      /*0x2cb2*/ 1000,
+      -1, -1,
+      /*0xabb8*/ 1227,
+      -1, -1,
+      /*0x1ea2*/ 669,
+      /*0x1e22*/ 603,
+      /*0x051c*/ 435,
+      -1, -1,
+      /*0x10579*/ 1358,
+      /*0x018e*/ 129,
+      /*0x10c8e*/ 1398,
+      -1,
+      /*0x10d63*/ 1454,
+      /*0x2cb8*/ 1003,
+      /*0xff27*/ 1253,
+      /*0xa7b2*/ 1132,
+      /*0x01b2*/ 151,
+      /*0x10cb2*/ 1434,
+      /*0x1e9a*/ 665,
+      /*0x1e1a*/ 599,
+      /*0x1e90e*/ 1535,
+      -1, -1, -1, -1, -1, -1,
+      /*0x051e*/ 436,
+      -1, -1,
+      /*0x04a6*/ 376,
+      /*0xa7b8*/ 1136,
+      /*0x01b8*/ 155,
+      -1,
+      /*0x10a6*/ 490,
+      /*0x1f5d*/ 758,
+      /*0xff33*/ 1265,
+      /*0x10d5f*/ 1450,
+      -1, -1, -1, -1,
+      /*0x1cae*/ 570,
+      -1,
+      /*0x04a4*/ 375,
+      -1,
+      /*0x10d53*/ 1438,
+      /*0x020c*/ 196,
+      /*0x10a4*/ 488,
+      /*0x1f8c*/ 780,
+      /*0x1040c*/ 1285,
+      /*0x040c*/ 309,
+      /*0x010c*/ 63,
+      -1, -1, -1,
+      /*0x1cac*/ 568,
+      /*0xab8c*/ 1183,
+      /*0x2c0c*/ 924,
+      /*0x1cb0*/ 572,
+      /*0x038c*/ 238,
+      -1,
+      /*0xa77b*/ 1104,
+      /*0x053a*/ 454,
+      -1, -1,
+      /*0xa726*/ 1067,
+      /*0x118a0*/ 1457,
+      -1, -1,
+      /*0x2c8c*/ 981,
+      -1,
+      /*0x052a*/ 442,
+      -1, -1, -1,
+      /*0x1caf*/ 571,
+      /*0x1e1c*/ 600,
+      -1,
+      /*0x10588*/ 1372,
+      /*0xa724*/ 1066,
+      -1,
+      /*0xa77d*/ 1105,
+      -1,
+      /*0x10589*/ 1373,
+      -1, -1, -1, -1,
+      /*0x04a2*/ 374,
+      /*0x10c8c*/ 1396,
+      -1, -1,
+      /*0x10a2*/ 486,
+      -1, -1,
+      /*0x1058a*/ 1374,
+      -1,
+      /*0x1e9e*/ 667,
+      /*0x1e1e*/ 601,
+      /*0x1e90c*/ 1533,
+      /*0x1fbc*/ 825,
+      /*0x2132*/ 868,
+      -1,
+      /*0x049a*/ 370,
+      /*0x023e*/ 219,
+      -1,
+      /*0x1fbe*/ 826,
+      -1,
+      /*0xabbc*/ 1231,
+      /*0x10580*/ 1364,
+      -1,
+      /*0x1ca8*/ 564,
+      -1,
+      /*0x10583*/ 1367,
+      /*0xabbe*/ 1233,
+      -1, -1,
+      /*0x052e*/ 444,
+      -1, -1, -1,
+      /*0x2cbc*/ 1005,
+      -1, -1,
+      /*0xa722*/ 1065,
+      -1,
+      /*0x0050*/ 14,
+      /*0x2cbe*/ 1006,
+      -1, -1,
+      /*0x0150*/ 96,
+      /*0x052c*/ 443,
+      /*0x118a6*/ 1463,
+      /*0x1eba*/ 681,
+      /*0x1e3a*/ 615,
+      /*0x1cb2*/ 574,
+      -1, -1,
+      /*0x03d0*/ 271,
+      /*0xa7bc*/ 1138,
+      /*0x01bc*/ 156,
+      /*0x10d5d*/ 1448,
+      /*0x1eaa*/ 673,
+      /*0x1e2a*/ 607,
+      -1,
+      /*0xa7be*/ 1139,
+      /*0x118a4*/ 1461,
+      -1,
+      /*0x2cd0*/ 1015,
+      -1, -1,
+      /*0x1cb8*/ 580,
+      /*0x1f1a*/ 726,
+      -1,
+      /*0x1fb6*/ 819,
+      /*0xa688*/ 1055,
+      -1,
+      /*0x0136*/ 83,
+      -1, -1,
+      /*0x1fb4*/ 818,
+      /*0x049c*/ 371,
+      /*0xabb6*/ 1225,
+      /*0x0134*/ 82,
+      -1,
+      /*0x10586*/ 1370,
+      /*0xa7d0*/ 1149,
+      -1,
+      /*0xabb4*/ 1223,
+      -1, -1, -1,
+      /*0xa68a*/ 1056,
+      -1, -1,
+      /*0x2cb6*/ 1002,
+      -1, -1, -1, -1, -1,
+      /*0x2cb4*/ 1001,
+      -1,
+      /*0x049e*/ 372,
+      -1, -1,
+      /*0xa680*/ 1051,
+      /*0x0528*/ 441,
+      /*0x1eae*/ 675,
+      /*0x1e2e*/ 609,
+      -1,
+      /*0x118a2*/ 1459,
+      -1,
+      /*0xa7b6*/ 1135,
+      -1, -1, -1, -1, -1,
+      /*0xa7b4*/ 1134,
+      -1,
+      /*0xa779*/ 1103,
+      /*0x1eac*/ 674,
+      /*0x1e2c*/ 608,
+      /*0x050e*/ 428,
+      /*0x1eb0*/ 676,
+      /*0x1e30*/ 610,
+      /*0x024c*/ 227,
+      /*0x004c*/ 10,
+      /*0x1fcc*/ 836,
+      /*0x1f1c*/ 728,
+      /*0x0532*/ 446,
+      /*0x014c*/ 94,
+      -1, -1,
+      /*0x024a*/ 226,
+      /*0x004a*/ 8,
+      /*0x1fca*/ 834,
+      /*0x104ba*/ 1323,
+      /*0x04ba*/ 386,
+      /*0x014a*/ 93,
+      -1, -1,
+      /*0x10ba*/ 510,
+      /*0x10594*/ 1382,
+      /*0x005a*/ 24,
+      /*0x1fda*/ 843,
+      /*0x0538*/ 452,
+      /*0x04aa*/ 378,
+      /*0x015a*/ 101,
+      /*0x2ccc*/ 1013,
+      -1,
+      /*0x10aa*/ 494,
+      /*0x24ba*/ 890,
+      -1, -1, -1,
+      /*0x03da*/ 276,
+      /*0x2cca*/ 1012,
+      /*0x10590*/ 1379,
+      -1, -1,
+      /*0xa686*/ 1054,
+      -1, -1, -1,
+      /*0x1f6b*/ 763,
+      /*0x2cda*/ 1020,
+      /*0xa7cc*/ 1148,
+      -1, -1, -1, -1,
+      /*0x10584*/ 1368,
+      -1,
+      /*0xa73a*/ 1076,
+      /*0xa696*/ 1062,
+      /*0x01ca*/ 161,
+      /*0x1ea8*/ 672,
+      /*0x1e28*/ 606,
+      -1, -1, -1, -1,
+      /*0xa72a*/ 1069,
+      /*0xa7da*/ 1152,
+      /*0x1cbe*/ 584,
+      -1,
+      /*0x1f3a*/ 740,
+      -1, -1,
+      /*0x0248*/ 225,
+      /*0x0048*/ 7,
+      /*0x1fc8*/ 832,
+      /*0x04ae*/ 380,
+      /*0x1e8e*/ 657,
+      /*0x1e0e*/ 593,
+      /*0x1f2a*/ 732,
+      /*0x10ae*/ 498,
+      -1, -1, -1,
+      /*0x1eb2*/ 677,
+      /*0x1e32*/ 611,
+      /*0x050c*/ 427,
+      /*0x0244*/ 222,
+      /*0x0044*/ 3,
+      /*0x1fc4*/ 829,
+      /*0x04ac*/ 379,
+      -1,
+      /*0x104b0*/ 1313,
+      /*0x04b0*/ 381,
+      /*0x10ac*/ 496,
+      -1,
+      /*0x2cc8*/ 1011,
+      /*0x10b0*/ 500,
+      -1,
+      /*0x10582*/ 1366,
+      /*0x1eb8*/ 680,
+      /*0x1e38*/ 614,
+      -1,
+      /*0xa694*/ 1061,
+      -1,
+      /*0x0056*/ 20,
+      /*0x1fd6*/ 839,
+      /*0xff26*/ 1252,
+      -1,
+      /*0x0156*/ 99,
+      /*0x2cc4*/ 1009,
+      -1,
+      /*0xa72e*/ 1071,
+      -1,
+      /*0x10af*/ 499,
+      /*0x01c8*/ 160,
+      /*0x1cb6*/ 578,
+      /*0x03d6*/ 274,
+      /*0xa690*/ 1059,
+      /*0x0052*/ 16,
+      /*0x1fd2*/ 837,
+      /*0xff24*/ 1250,
+      /*0x1cb4*/ 576,
+      /*0x0152*/ 97,
+      /*0x118ba*/ 1483,
+      /*0x1f2e*/ 736,
+      /*0xa72c*/ 1070,
+      /*0x2cd6*/ 1018,
+      /*0xa7c4*/ 1142,
+      /*0x01c4*/ 157,
+      -1, -1,
+      /*0xa684*/ 1053,
+      /*0x118aa*/ 1467,
+      -1, -1,
+      /*0x004f*/ 13,
+      -1,
+      /*0x053c*/ 456,
+      /*0x1f2c*/ 734,
+      -1,
+      /*0x2cd2*/ 1016,
+      -1, -1,
+      /*0x053e*/ 458,
+      /*0xa7d6*/ 1150,
+      /*0x04a8*/ 377,
+      -1,
+      /*0x03cf*/ 270,
+      -1,
+      /*0x10a8*/ 492,
+      -1, -1, -1, -1, -1,
+      /*0x0054*/ 18,
+      /*0x1e8c*/ 656,
+      /*0x1e0c*/ 592,
+      /*0x1f2f*/ 737,
+      /*0x0154*/ 98,
+      -1, -1,
+      /*0x048e*/ 364,
+      -1,
+      /*0x0550*/ 476,
+      /*0xff22*/ 1248,
+      -1, -1,
+      /*0x104b2*/ 1315,
+      /*0x04b2*/ 382,
+      -1, -1, -1,
+      /*0x10b2*/ 502,
+      -1,
+      /*0xa682*/ 1052,
+      /*0x01cf*/ 164,
+      /*0x2cd4*/ 1017,
+      /*0x118ae*/ 1471,
+      -1,
+      /*0x10592*/ 1381,
+      /*0xa728*/ 1068,
+      -1, -1,
+      /*0x104b8*/ 1321,
+      /*0x04b8*/ 385,
+      -1, -1, -1,
+      /*0x10b8*/ 508,
+      -1,
+      /*0x0536*/ 450,
+      /*0x118ac*/ 1469,
+      -1,
+      /*0x1f28*/ 730,
+      /*0x118b0*/ 1473,
+      /*0x00d0*/ 42,
+      /*0x0534*/ 448,
+      -1,
+      /*0x24b8*/ 888,
+      -1,
+      /*0x0042*/ 1,
+      /*0x1fc2*/ 827,
+      -1, -1,
+      /*0xa732*/ 1072,
+      -1,
+      /*0x2cc0*/ 1007,
+      /*0x1ebc*/ 682,
+      /*0x1e3c*/ 616,
+      /*0xa698*/ 1063,
+      /*0x1f0e*/ 722,
+      /*0x118af*/ 1472,
+      /*0x03c2*/ 269,
+      /*0x1ebe*/ 683,
+      /*0x1e3e*/ 617,
+      -1,
+      /*0x0246*/ 224,
+      /*0x0046*/ 5,
+      /*0x1fc6*/ 830,
+      -1,
+      /*0xa738*/ 1075,
+      -1,
+      /*0x2cc2*/ 1008,
+      -1,
+      /*0xa7c0*/ 1140,
+      -1,
+      /*0x0058*/ 22,
+      /*0x1fd8*/ 841,
+      -1, -1,
+      /*0x0158*/ 100,
+      -1, -1,
+      /*0x1f38*/ 738,
+      /*0x1ed0*/ 692,
+      /*0x1e50*/ 626,
+      -1, -1,
+      /*0x03d8*/ 275,
+      /*0x2cc6*/ 1010,
+      /*0xa7c2*/ 1141,
+      /*0x048c*/ 363,
+      -1, -1, -1,
+      /*0x054c*/ 472,
+      -1,
+      /*0x118a8*/ 1465,
+      /*0x2cd8*/ 1019,
+      /*0x16e43*/ 1492,
+      /*0x1f8d*/ 781,
+      /*0x1040d*/ 1286,
+      /*0x040d*/ 310,
+      /*0x054a*/ 470,
+      -1, -1,
+      /*0xa692*/ 1060,
+      /*0xa7c6*/ 1144,
+      /*0xab8d*/ 1184,
+      /*0x2c0d*/ 925,
+      -1,
+      /*0x1eb6*/ 679,
+      /*0x1e36*/ 613,
+      /*0x16e5b*/ 1516,
+      -1, -1,
+      /*0xa7d8*/ 1151,
+      /*0x1eb4*/ 678,
+      /*0x1e34*/ 612,
+      /*0x0245*/ 223,
+      /*0x0045*/ 4,
+      /*0x118b2*/ 1475,
+      -1, -1,
+      /*0x0145*/ 90,
+      -1,
+      /*0x16e59*/ 1514,
+      /*0x00cc*/ 38,
+      -1,
+      /*0x024e*/ 228,
+      /*0x004e*/ 12,
+      -1, -1, -1,
+      /*0x014e*/ 95,
+      /*0x00ca*/ 36,
+      -1,
+      /*0x118b8*/ 1481,
+      -1,
+      /*0xa78d*/ 1112,
+      /*0x1f0c*/ 720,
+      /*0x10c8d*/ 1397,
+      /*0x104bc*/ 1325,
+      /*0x04bc*/ 387,
+      /*0x00da*/ 51,
+      /*0xff3a*/ 1272,
+      -1,
+      /*0x10bc*/ 512,
+      /*0x104be*/ 1327,
+      /*0x04be*/ 388,
+      -1,
+      /*0x1e90d*/ 1534,
+      /*0x2cce*/ 1014,
+      /*0x10be*/ 514,
+      /*0xff2a*/ 1256,
+      -1, -1,
+      /*0x24bc*/ 892,
+      -1,
+      /*0x0548*/ 468,
+      /*0xa7c5*/ 1143,
+      /*0x01c5*/ 158,
+      -1,
+      /*0x24be*/ 894,
+      -1, -1,
+      /*0x1ecc*/ 690,
+      /*0x1e4c*/ 624,
+      -1,
+      /*0x104d0*/ 1345,
+      /*0x04d0*/ 397,
+      -1, -1,
+      /*0x0544*/ 464,
+      /*0x1eca*/ 689,
+      /*0x1e4a*/ 623,
+      -1,
+      /*0x0055*/ 19,
+      /*0xa650*/ 1036,
+      /*0xa73c*/ 1077,
+      -1,
+      /*0x16e57*/ 1512,
+      /*0x0345*/ 229,
+      /*0x1eda*/ 697,
+      /*0x1e5a*/ 631,
+      /*0xa73e*/ 1078,
+      /*0x1f87*/ 775,
+      /*0x10407*/ 1280,
+      /*0x0407*/ 304,
+      /*0x03d5*/ 273,
+      /*0x0556*/ 482,
+      /*0x00c8*/ 34,
+      /*0x1f3c*/ 742,
+      -1,
+      /*0xab87*/ 1178,
+      /*0x2c07*/ 919,
+      /*0x104b6*/ 1319,
+      /*0x04b6*/ 384,
+      /*0x1f3e*/ 744,
+      -1,
+      /*0xff2e*/ 1260,
+      /*0x10b6*/ 506,
+      /*0x104b4*/ 1317,
+      /*0x04b4*/ 383,
+      /*0x0552*/ 478,
+      /*0x00c4*/ 30,
+      /*0xa750*/ 1087,
+      /*0x10b4*/ 504,
+      /*0x0047*/ 6,
+      /*0x1fc7*/ 831,
+      -1,
+      /*0x24b6*/ 886,
+      /*0x0147*/ 91,
+      -1,
+      /*0xff2c*/ 1258,
+      -1, -1,
+      /*0xff30*/ 1262,
+      /*0x01d5*/ 167,
+      /*0x1f50*/ 752,
+      -1,
+      /*0x054f*/ 475,
+      /*0x00d6*/ 48,
+      -1,
+      /*0xa69a*/ 1064,
+      /*0xab71*/ 1156,
+      /*0x0187*/ 125,
+      /*0x10c87*/ 1391,
+      -1, -1,
+      /*0x1ec8*/ 688,
+      /*0x1e48*/ 622,
+      -1,
+      /*0xa736*/ 1074,
+      /*0xff2f*/ 1261,
+      /*0x1fb9*/ 822,
+      /*0x00d2*/ 44,
+      /*0x1e907*/ 1528,
+      /*0x0139*/ 84,
+      /*0xa734*/ 1073,
+      -1,
+      /*0x0554*/ 480,
+      /*0xab73*/ 1158,
+      /*0xabb9*/ 1228,
+      /*0x1ec4*/ 686,
+      /*0x1e44*/ 620,
+      /*0x118bc*/ 1485,
+      -1,
+      /*0xa7c7*/ 1145,
+      /*0x01c7*/ 159,
+      -1,
+      /*0x104cc*/ 1341,
+      /*0x118be*/ 1487,
+      /*0x00cf*/ 41,
+      -1, -1,
+      /*0x1fab*/ 811,
+      -1,
+      /*0x042b*/ 340,
+      /*0x104ca*/ 1339,
+      /*0xa64c*/ 1034,
+      /*0x1ed6*/ 695,
+      /*0x1e56*/ 629,
+      -1,
+      /*0xabab*/ 1214,
+      /*0x2c2b*/ 955,
+      /*0x24cc*/ 908,
+      /*0x03ab*/ 267,
+      /*0xa64a*/ 1033,
+      /*0x04da*/ 402,
+      /*0xff28*/ 1254,
+      /*0x0540*/ 460,
+      -1,
+      /*0x00d4*/ 46,
+      /*0x24ca*/ 906,
+      /*0x1ed2*/ 693,
+      /*0x1e52*/ 627,
+      /*0xa65a*/ 1041,
+      -1, -1, -1,
+      /*0x1fe2*/ 845,
+      -1,
+      /*0x0462*/ 346,
+      /*0x0162*/ 105,
+      -1, -1,
+      /*0x0542*/ 462,
+      /*0xa74c*/ 1085,
+      -1,
+      /*0x2c62*/ 961,
+      -1,
+      /*0x03e2*/ 280,
+      -1,
+      /*0xff32*/ 1264,
+      /*0xa7ab*/ 1126,
+      /*0xa74a*/ 1084,
+      /*0x10cab*/ 1427,
+      -1,
+      /*0x16e5f*/ 1520,
+      /*0x118b6*/ 1479,
+      /*0x1f4c*/ 750,
+      /*0x2ce2*/ 1024,
+      /*0x00c0*/ 26,
+      /*0x0546*/ 466,
+      /*0xa75a*/ 1092,
+      /*0x118b4*/ 1477,
+      -1,
+      /*0x16e53*/ 1508,
+      /*0x1f4a*/ 748,
+      /*0xff38*/ 1270,
+      -1,
+      /*0x1ed4*/ 694,
+      /*0x1e54*/ 628,
+      /*0x1fe4*/ 847,
+      /*0x104c8*/ 1337,
+      /*0x0464*/ 347,
+      /*0x0164*/ 106,
+      -1,
+      /*0x00c2*/ 28,
+      -1,
+      /*0x01e2*/ 173,
+      /*0xab70*/ 1155,
+      /*0x2c64*/ 963,
+      /*0xa648*/ 1032,
+      /*0x03e4*/ 281,
+      /*0x10d50*/ 1435,
+      -1, -1,
+      /*0x104c4*/ 1333,
+      /*0x24c8*/ 904,
+      /*0x015e*/ 103,
+      -1, -1,
+      /*0x10c4*/ 520,
+      -1,
+      /*0x00c6*/ 32,
+      -1,
+      /*0xa644*/ 1030,
+      /*0x03de*/ 278,
+      -1, -1,
+      /*0x1ec0*/ 684,
+      /*0x1e40*/ 618,
+      /*0x24c4*/ 900,
+      /*0x00d8*/ 49,
+      /*0x1c87*/ 537,
+      /*0x04d6*/ 400,
+      -1,
+      /*0x2cde*/ 1022,
+      -1, -1,
+      /*0xa748*/ 1083,
+      -1,
+      /*0x01e4*/ 174,
+      /*0xa656*/ 1039,
+      -1,
+      /*0x0545*/ 465,
+      /*0x1ec2*/ 685,
+      /*0x1e42*/ 619,
+      /*0x104d2*/ 1347,
+      /*0x04d2*/ 398,
+      /*0x1fa9*/ 809,
+      -1,
+      /*0x0429*/ 338,
+      /*0x1f48*/ 746,
+      /*0xa744*/ 1081,
+      /*0x054e*/ 474,
+      /*0x01de*/ 171,
+      /*0xa652*/ 1037,
+      /*0xaba9*/ 1212,
+      /*0x2c29*/ 953,
+      -1,
+      /*0x03a9*/ 265,
+      -1,
+      /*0x1ec6*/ 687,
+      /*0x1e46*/ 621,
+      /*0x104cf*/ 1344,
+      -1,
+      /*0x1fa1*/ 801,
+      /*0x10421*/ 1306,
+      /*0x0421*/ 330,
+      /*0x212b*/ 867,
+      /*0xa756*/ 1090,
+      /*0x1ed8*/ 696,
+      /*0x1e58*/ 630,
+      -1,
+      /*0xaba1*/ 1204,
+      /*0x2c21*/ 945,
+      /*0x00c5*/ 31,
+      /*0x03a1*/ 258,
+      -1,
+      /*0x24cf*/ 911,
+      /*0xab75*/ 1160,
+      -1,
+      /*0x1cb9*/ 581,
+      /*0x1f56*/ 755,
+      /*0xa752*/ 1088,
+      /*0x04d4*/ 399,
+      /*0x00ce*/ 40,
+      -1, -1,
+      /*0x01a9*/ 146,
+      /*0x10ca9*/ 1425,
+      /*0x16e5d*/ 1518,
+      /*0x1058e*/ 1377,
+      /*0xa654*/ 1038,
+      /*0x2162*/ 871,
+      -1, -1,
+      /*0x1f52*/ 753,
+      -1,
+      /*0x0460*/ 345,
+      /*0x0160*/ 104,
+      /*0x0555*/ 481,
+      /*0x015c*/ 102,
+      /*0x1cab*/ 567,
+      -1, -1,
+      /*0x2c60*/ 960,
+      /*0x10ca1*/ 1417,
+      /*0x03e0*/ 279,
+      /*0xab7f*/ 1170,
+      /*0x03dc*/ 277,
+      -1,
+      /*0x10d5a*/ 1445,
+      -1,
+      /*0x104c0*/ 1329,
+      /*0x04c0*/ 389,
+      -1,
+      /*0x1e921*/ 1554,
+      /*0x2ce0*/ 1023,
+      /*0x10c0*/ 516,
+      /*0x2cdc*/ 1021,
+      /*0xa754*/ 1089,
+      -1,
+      /*0xa640*/ 1028,
+      -1,
+      /*0x1ece*/ 691,
+      /*0x1e4e*/ 625,
+      /*0x2164*/ 873,
+      -1,
+      /*0x24c0*/ 896,
+      /*0x104c2*/ 1331,
+      -1,
+      /*0x0547*/ 467,
+      /*0x00d5*/ 47,
+      /*0x1f54*/ 754,
+      /*0x10c2*/ 518,
+      -1,
+      /*0x01e0*/ 172,
+      /*0xa7dc*/ 1153,
+      /*0xa642*/ 1029,
+      -1,
+      /*0x1f97*/ 791,
+      /*0x10417*/ 1296,
+      /*0x0417*/ 320,
+      -1,
+      /*0x24c2*/ 898,
+      -1,
+      /*0x104c6*/ 1335,
+      -1,
+      /*0xab97*/ 1194,
+      /*0x2c17*/ 935,
+      /*0xa740*/ 1079,
+      /*0x0397*/ 248,
+      -1, -1,
+      /*0xab77*/ 1162,
+      /*0xa646*/ 1031,
+      /*0x04d8*/ 401,
+      /*0x0539*/ 453,
+      -1,
+      /*0xff36*/ 1268,
+      -1,
+      /*0x24c6*/ 902,
+      -1,
+      /*0x00c7*/ 33,
+      /*0xa658*/ 1040,
+      /*0xff34*/ 1266,
+      /*0xa742*/ 1080,
+      /*0x1fec*/ 854,
+      /*0xa68e*/ 1058,
+      /*0x046c*/ 351,
+      /*0x016c*/ 110,
+      /*0x1058c*/ 1375,
+      -1,
+      /*0x1fea*/ 852,
+      -1,
+      /*0x046a*/ 350,
+      /*0x016a*/ 109,
+      -1,
+      /*0x03ec*/ 285,
+      -1,
+      /*0x0197*/ 136,
+      /*0x10c97*/ 1407,
+      -1,
+      /*0xa746*/ 1082,
+      /*0x03ea*/ 284,
+      -1,
+      /*0x004b*/ 9,
+      /*0x1fcb*/ 835,
+      -1,
+      /*0x10d56*/ 1441,
+      -1,
+      /*0x1e917*/ 1544,
+      /*0xa758*/ 1091,
+      -1,
+      /*0x1fe8*/ 850,
+      -1,
+      /*0x0468*/ 349,
+      /*0x0168*/ 108,
+      -1,
+      /*0x104c5*/ 1334,
+      /*0x04c5*/ 392,
+      -1, -1,
+      /*0x10d52*/ 1437,
+      /*0x10c5*/ 521,
+      /*0x03e8*/ 283,
+      -1,
+      /*0x01ec*/ 178,
+      /*0x1ca9*/ 565,
+      /*0x104ce*/ 1343,
+      -1, -1, -1,
+      /*0x01ea*/ 177,
+      /*0x24c5*/ 901,
+      -1, -1, -1,
+      /*0xa64e*/ 1035,
+      /*0x0049*/ 1555,
+      /*0x1fc9*/ 833,
+      /*0xab7b*/ 1166,
+      /*0x2160*/ 869,
+      /*0x0149*/ 92,
+      /*0x24ce*/ 910,
+      /*0x1ca1*/ 557,
+      /*0xa7cb*/ 1147,
+      /*0x01cb*/ 162,
+      /*0x1f0d*/ 721,
+      -1,
+      /*0x046e*/ 352,
+      /*0x016e*/ 111,
+      -1,
+      /*0x1ff2*/ 855,
+      /*0x01e8*/ 176,
+      /*0x0472*/ 354,
+      /*0x0172*/ 113,
+      /*0x2c6e*/ 968,
+      /*0xfb17*/ 1246,
+      /*0x03ee*/ 286,
+      /*0x10d54*/ 1439,
+      /*0xab7d*/ 1168,
+      /*0x2c72*/ 971,
+      -1, -1, -1,
+      /*0xa74e*/ 1086,
+      -1,
+      /*0xa68c*/ 1057,
+      /*0x1fe6*/ 848,
+      -1,
+      /*0x0466*/ 348,
+      /*0x0166*/ 107,
+      -1,
+      /*0x2cf2*/ 1027,
+      /*0x1f8f*/ 783,
+      /*0x1040f*/ 1288,
+      /*0x040f*/ 312,
+      -1,
+      /*0xa7c9*/ 1146,
+      /*0x03e6*/ 282,
+      -1, -1,
+      /*0xab8f*/ 1186,
+      /*0x2c0f*/ 927,
+      -1,
+      /*0x038f*/ 240,
+      -1,
+      /*0x01ee*/ 179,
+      -1,
+      /*0x1fad*/ 813,
+      -1,
+      /*0x042d*/ 342,
+      /*0x01f2*/ 182,
+      /*0x1ee2*/ 701,
+      /*0x1e62*/ 635,
+      -1,
+      /*0x047e*/ 360,
+      /*0xabad*/ 1216,
+      /*0x2c2d*/ 957,
+      /*0x0241*/ 220,
+      /*0x0041*/ 0,
+      /*0x00de*/ 55,
+      -1,
+      /*0x2c7e*/ 973,
+      /*0x0141*/ 88,
+      /*0x03fe*/ 295,
+      /*0x104c7*/ 1336,
+      /*0x04c7*/ 393,
+      /*0x01e6*/ 175,
+      -1, -1,
+      /*0x10c7*/ 522,
+      /*0x216c*/ 881,
+      /*0x0372*/ 231,
+      /*0x018f*/ 130,
+      /*0x10c8f*/ 1399,
+      -1,
+      /*0xabb5*/ 1224,
+      /*0x216a*/ 879,
+      /*0x1c97*/ 547,
+      -1,
+      /*0x24c7*/ 903,
+      -1, -1, -1,
+      /*0x1e90f*/ 1536,
+      /*0x1ee4*/ 702,
+      /*0x1e64*/ 636,
+      /*0xa7ad*/ 1128,
+      -1,
+      /*0x10cad*/ 1429,
+      /*0x10d58*/ 1443,
+      /*0x104b9*/ 1322,
+      -1,
+      /*0x01fe*/ 189,
+      -1, -1,
+      /*0x10b9*/ 509,
+      /*0x1fb7*/ 820,
+      /*0x2168*/ 877,
+      /*0x1ede*/ 699,
+      /*0x1e5e*/ 633,
+      /*0x1fa5*/ 805,
+      /*0x10425*/ 1310,
+      /*0x0425*/ 334,
+      -1,
+      /*0xabb7*/ 1226,
+      /*0x24b9*/ 889,
+      -1,
+      /*0x01b5*/ 153,
+      /*0xaba5*/ 1208,
+      /*0x2c25*/ 949,
+      -1,
+      /*0x03a5*/ 261,
+      /*0x1fa3*/ 803,
+      /*0x10423*/ 1308,
+      /*0x0423*/ 332,
+      -1,
+      /*0x10ab*/ 495,
+      /*0x1f9d*/ 797,
+      /*0x1041d*/ 1302,
+      /*0x041d*/ 326,
+      /*0xaba3*/ 1206,
+      /*0x2c23*/ 947,
+      -1,
+      /*0x03a3*/ 259,
+      -1,
+      /*0xab9d*/ 1200,
+      /*0x2c1d*/ 941,
+      -1,
+      /*0x039d*/ 254,
+      -1, -1,
+      /*0x216e*/ 883,
+      -1, -1, -1, -1,
+      /*0x01b7*/ 154,
+      /*0x04e2*/ 406,
+      /*0xab79*/ 1164,
+      -1,
+      /*0x1f39*/ 739,
+      /*0x10ca5*/ 1421,
+      -1,
+      /*0x00dc*/ 53,
+      -1,
+      /*0xa662*/ 1045,
+      /*0x023d*/ 218,
+      -1, -1, -1, -1,
+      /*0x013d*/ 86,
+      /*0x2166*/ 875,
+      /*0x10ca3*/ 1419,
+      -1, -1,
+      /*0xabbd*/ 1232,
+      /*0x019d*/ 139,
+      /*0x10c9d*/ 1413,
+      -1,
+      /*0x004d*/ 11,
+      /*0x1f2b*/ 733,
+      -1,
+      /*0x1f9b*/ 795,
+      /*0x1041b*/ 1300,
+      /*0x041b*/ 324,
+      -1, -1,
+      /*0x1e91d*/ 1550,
+      -1,
+      /*0x04e4*/ 407,
+      /*0xab9b*/ 1198,
+      /*0x2c1b*/ 939,
+      /*0xa762*/ 1096,
+      /*0x039b*/ 252,
+      -1, -1, -1,
+      /*0xa664*/ 1046,
+      -1,
+      /*0x1ee0*/ 700,
+      /*0x1e60*/ 634,
+      /*0x1edc*/ 698,
+      /*0x1e5c*/ 632,
+      /*0x04de*/ 404,
+      -1, -1,
+      /*0x1f95*/ 789,
+      /*0x10415*/ 1294,
+      /*0x0415*/ 318,
+      /*0x10d55*/ 1440,
+      /*0x1ffa*/ 862,
+      /*0xa65e*/ 1043,
+      /*0x047a*/ 358,
+      /*0x118b9*/ 1482,
+      /*0xab95*/ 1192,
+      /*0x2c15*/ 933,
+      -1,
+      /*0x0395*/ 246,
+      /*0x13fa*/ 526,
+      /*0x054b*/ 471,
+      /*0x01cd*/ 163,
+      /*0x03fa*/ 293,
+      -1,
+      /*0x10c9b*/ 1411,
+      -1,
+      /*0xa764*/ 1097,
+      /*0x1cad*/ 569,
+      /*0x1f99*/ 793,
+      /*0x10419*/ 1298,
+      /*0x0419*/ 322,
+      -1, -1,
+      /*0x013f*/ 87,
+      /*0x1e91b*/ 1548,
+      /*0x118ab*/ 1468,
+      /*0xab99*/ 1196,
+      /*0x2c19*/ 937,
+      /*0xabbf*/ 1234,
+      /*0x0399*/ 250,
+      /*0xa75e*/ 1094,
+      -1,
+      /*0x10a9*/ 493,
+      /*0x1ff4*/ 857,
+      /*0x1e97*/ 662,
+      /*0x0474*/ 355,
+      /*0x0174*/ 114,
+      /*0x1cb5*/ 577,
+      /*0x10c95*/ 1405,
+      -1, -1,
+      /*0x01fa*/ 187,
+      /*0x00cb*/ 37,
+      /*0x0549*/ 469,
+      /*0x03f4*/ 289,
+      -1, -1, -1,
+      /*0x1e915*/ 1542,
+      /*0x10a1*/ 485,
+      -1, -1, -1,
+      /*0x0051*/ 15,
+      -1,
+      /*0x10572*/ 1351,
+      -1, -1, -1,
+      /*0x10c99*/ 1409,
+      -1,
+      /*0x1eec*/ 706,
+      /*0x1e6c*/ 640,
+      -1, -1,
+      /*0x03d1*/ 272,
+      /*0x1cb7*/ 579,
+      /*0x1eea*/ 705,
+      /*0x1e6a*/ 639,
+      /*0x1e919*/ 1546,
+      /*0x1ca5*/ 561,
+      -1, -1,
+      /*0x01f4*/ 183,
+      -1,
+      /*0x00c9*/ 35,
+      /*0x04e0*/ 405,
+      /*0x1f29*/ 731,
+      /*0x04dc*/ 403,
+      -1, -1, -1,
+      /*0x1ca3*/ 559,
+      -1,
+      /*0xa660*/ 1044,
+      -1,
+      /*0xa65c*/ 1042,
+      /*0x1c9d*/ 553,
+      /*0x1ee8*/ 704,
+      /*0x1e68*/ 638,
+      -1,
+      /*0x023b*/ 217,
+      -1,
+      /*0x1fbb*/ 824,
+      /*0x01d1*/ 165,
+      /*0xfb15*/ 1244,
+      /*0x013b*/ 85,
+      /*0x1057e*/ 1362,
+      /*0x1f91*/ 785,
+      /*0x10411*/ 1290,
+      /*0x0411*/ 314,
+      /*0xabbb*/ 1230,
+      -1,
+      /*0x10d62*/ 1453,
+      -1,
+      /*0x0541*/ 461,
+      /*0xab91*/ 1188,
+      /*0x2c11*/ 929,
+      -1,
+      /*0x0391*/ 242,
+      -1, -1,
+      /*0xa760*/ 1095,
+      /*0x0535*/ 449,
+      /*0xa75c*/ 1093,
+      -1, -1, -1,
+      /*0x1cbd*/ 583,
+      -1, -1, -1,
+      /*0x1eee*/ 707,
+      /*0x1e6e*/ 641,
+      /*0x1ffc*/ 864,
+      -1,
+      /*0x047c*/ 359,
+      /*0x1ef2*/ 709,
+      /*0x1e72*/ 643,
+      -1, -1,
+      /*0x118a9*/ 1466,
+      /*0x13fc*/ 528,
+      /*0x1c9b*/ 551,
+      -1, -1,
+      /*0x10d64*/ 1455,
+      /*0x00c1*/ 27,
+      /*0x0191*/ 132,
+      /*0x10c91*/ 1401,
+      -1, -1,
+      /*0x0537*/ 451,
+      /*0x1ee6*/ 703,
+      /*0x1e66*/ 637,
+      /*0x00b5*/ 25,
+      -1,
+      /*0x04ec*/ 411,
+      /*0x118a1*/ 1458,
+      /*0x1e911*/ 1538,
+      /*0x10d5e*/ 1449,
+      -1, -1,
+      /*0x04ea*/ 410,
+      -1,
+      /*0xa66c*/ 1050,
+      -1,
+      /*0x1c95*/ 545,
+      -1, -1,
+      /*0x1058d*/ 1376,
+      /*0xa66a*/ 1049,
+      -1, -1,
+      /*0x01fc*/ 188,
+      -1,
+      /*0x104cb*/ 1340,
+      /*0x04cb*/ 395,
+      -1,
+      /*0x1efe*/ 715,
+      /*0x1e7e*/ 649,
+      -1, -1, -1,
+      /*0x04e8*/ 409,
+      -1, -1,
+      /*0xff39*/ 1271,
+      /*0x1c99*/ 549,
+      -1,
+      /*0x1cbf*/ 585,
+      /*0x24cb*/ 907,
+      /*0xa668*/ 1048,
+      /*0xa76c*/ 1101,
+      /*0x1f93*/ 787,
+      /*0x10413*/ 1292,
+      /*0x0413*/ 316,
+      -1, -1,
+      /*0xa76a*/ 1100,
+      -1, -1,
+      /*0xab93*/ 1190,
+      /*0x2c13*/ 931,
+      /*0x053d*/ 457,
+      /*0x0393*/ 244,
+      /*0x1f6c*/ 764,
+      -1,
+      /*0xff2b*/ 1257,
+      /*0x104c9*/ 1338,
+      /*0x04c9*/ 394,
+      -1,
+      /*0x1f6a*/ 762,
+      /*0x1ff6*/ 858,
+      -1,
+      /*0x0476*/ 356,
+      /*0x0176*/ 115,
+      /*0x054d*/ 473,
+      /*0x04ee*/ 412,
+      /*0xabb1*/ 1220,
+      /*0xa768*/ 1099,
+      -1,
+      /*0x16e50*/ 1505,
+      /*0x04f2*/ 414,
+      /*0x24c9*/ 905,
+      -1,
+      /*0x1f4b*/ 749,
+      -1, -1,
+      /*0x1f81*/ 769,
+      /*0x10401*/ 1274,
+      /*0x0401*/ 298,
+      -1,
+      /*0x1f68*/ 760,
+      /*0x0193*/ 133,
+      /*0x10c93*/ 1403,
+      -1,
+      /*0xab81*/ 1172,
+      /*0x2c01*/ 913,
+      /*0x04e6*/ 408,
+      -1, -1,
+      /*0x10d60*/ 1451,
+      -1,
+      /*0x10d5c*/ 1447,
+      /*0x1e913*/ 1540,
+      /*0x1057a*/ 1359,
+      /*0xa666*/ 1047,
+      -1,
+      /*0x00cd*/ 39,
+      /*0xa7b1*/ 1131,
+      /*0x01b1*/ 150,
+      /*0x10cb1*/ 1433,
+      /*0x01f6*/ 184,
+      /*0xa76e*/ 1102,
+      -1,
+      /*0x10587*/ 1371,
+      /*0x0587*/ 483,
+      -1,
+      /*0x1f49*/ 747,
+      -1, -1, -1, -1,
+      /*0x10ad*/ 497,
+      /*0x04fe*/ 420,
+      /*0x053f*/ 459,
+      /*0x1f6e*/ 766,
+      /*0x1c91*/ 541,
+      /*0x0181*/ 121,
+      /*0x10c81*/ 1385,
+      /*0x104c1*/ 1330,
+      /*0x04c1*/ 390,
+      -1,
+      /*0x0376*/ 232,
+      /*0xa766*/ 1098,
+      /*0x10c1*/ 517,
+      -1,
+      /*0x10574*/ 1353,
+      /*0x104b5*/ 1318,
+      /*0x1e901*/ 1522,
+      -1, -1, -1,
+      /*0x10b5*/ 505,
+      -1,
+      /*0x24c1*/ 897,
+      -1, -1, -1,
+      /*0x1e9b*/ 666,
+      -1,
+      /*0xfb13*/ 1242,
+      -1,
+      /*0x1f0f*/ 723,
+      -1, -1,
+      /*0x1f8b*/ 779,
+      /*0x1040b*/ 1284,
+      /*0x040b*/ 308,
+      /*0x0551*/ 477,
+      /*0xa77e*/ 1106,
+      -1, -1,
+      /*0x16e4c*/ 1501,
+      /*0xab8b*/ 1182,
+      /*0x2c0b*/ 923,
+      -1,
+      /*0x104b7*/ 1320,
+      /*0x1f2d*/ 735,
+      -1, -1,
+      /*0x16e4a*/ 1499,
+      /*0x10b7*/ 507,
+      /*0xff29*/ 1255,
+      -1, -1,
+      /*0x10a5*/ 489,
+      /*0x1efa*/ 713,
+      /*0x1e7a*/ 647,
+      -1,
+      /*0x16e5a*/ 1515,
+      /*0x1ff8*/ 860,
+      /*0x24b7*/ 887,
+      /*0x0478*/ 357,
+      /*0x0178*/ 116,
+      -1,
+      /*0xfb01*/ 1236,
+      -1,
+      /*0x10a3*/ 487,
+      /*0x13f8*/ 524,
+      /*0xff21*/ 1247,
+      /*0x00d1*/ 43,
+      -1, -1,
+      /*0x1e99*/ 664,
+      /*0xa78b*/ 1111,
+      /*0x018b*/ 128,
+      /*0x10c8b*/ 1395,
+      /*0x053b*/ 455,
+      -1, -1, -1, -1,
+      /*0x1f9f*/ 799,
+      /*0x1041f*/ 1304,
+      /*0x041f*/ 328,
+      -1,
+      /*0x1e90b*/ 1532,
+      -1,
+      /*0x1ef4*/ 710,
+      /*0x1e74*/ 644,
+      /*0xab9f*/ 1202,
+      /*0x2c1f*/ 943,
+      /*0x1c93*/ 543,
+      /*0x039f*/ 256,
+      -1, -1, -1, -1,
+      /*0x104bd*/ 1326,
+      -1,
+      /*0x01f8*/ 186,
+      /*0x118ad*/ 1470,
+      -1,
+      /*0x10bd*/ 513,
+      -1, -1,
+      /*0x16e48*/ 1497,
+      /*0x1057c*/ 1360,
+      -1,
+      /*0x1cb1*/ 573,
+      -1,
+      /*0x104cd*/ 1342,
+      /*0x04cd*/ 396,
+      /*0x24bd*/ 893,
+      -1, -1,
+      /*0x10cd*/ 523,
+      /*0x1f1d*/ 729,
+      -1, -1,
+      /*0x16e44*/ 1493,
+      /*0x118b5*/ 1478,
+      /*0x019f*/ 140,
+      /*0x10c9f*/ 1415,
+      -1, -1,
+      /*0x24cd*/ 909,
+      /*0x1c81*/ 531,
+      -1, -1,
+      /*0x1f85*/ 773,
+      /*0x10405*/ 1278,
+      /*0x0405*/ 302,
+      /*0x1e91f*/ 1552,
+      -1, -1, -1,
+      /*0x16e56*/ 1511,
+      /*0xab85*/ 1176,
+      /*0x2c05*/ 917,
+      -1, -1,
+      /*0x04fa*/ 418,
+      -1, -1, -1, -1, -1,
+      /*0x1f3d*/ 743,
+      -1,
+      /*0x118b7*/ 1480,
+      /*0x16e52*/ 1507,
+      -1, -1,
+      /*0x118a5*/ 1462,
+      -1, -1, -1, -1, -1,
+      /*0x104bf*/ 1328,
+      /*0x1f4d*/ 751,
+      -1,
+      /*0x1f1b*/ 727,
+      -1,
+      /*0x10bf*/ 515,
+      /*0x118a3*/ 1460,
+      -1,
+      /*0x16e4f*/ 1504,
+      -1, -1,
+      /*0x10c85*/ 1389,
+      -1, -1,
+      /*0x04f4*/ 415,
+      /*0x24bf*/ 895,
+      -1, -1, -1,
+      /*0x1efc*/ 714,
+      /*0x1e7c*/ 648,
+      /*0x1e905*/ 1526,
+      -1, -1, -1,
+      /*0x0531*/ 445,
+      /*0x10576*/ 1355,
+      -1,
+      /*0x16e54*/ 1509,
+      -1, -1, -1, -1, -1,
+      /*0x104d1*/ 1346,
+      -1, -1, -1, -1, -1, -1,
+      -1,
+      /*0x118bd*/ 1486,
+      -1, -1, -1, -1, -1,
+      /*0x1f19*/ 725,
+      -1,
+      /*0x1f3f*/ 745,
+      -1, -1, -1, -1, -1, -1,
+      -1,
+      /*0x16e40*/ 1489,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1,
+      /*0xfb05*/ 1240,
+      -1, -1, -1, -1,
+      /*0x104bb*/ 1324,
+      /*0x16e42*/ 1491,
+      -1, -1, -1,
+      /*0x10bb*/ 511,
+      -1, -1, -1,
+      /*0x1c9f*/ 555,
+      -1, -1, -1, -1, -1,
+      /*0x24bb*/ 891,
+      -1, -1,
+      /*0x16e46*/ 1495,
+      -1, -1, -1, -1, -1, -1,
+      /*0x1ef6*/ 711,
+      /*0x1e76*/ 645,
+      /*0x16e58*/ 1513,
+      -1, -1, -1,
+      /*0x118bf*/ 1488,
+      /*0x04fc*/ 419,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1,
+      /*0xff2d*/ 1259,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1,
+      /*0x1f3b*/ 741,
+      -1, -1, -1, -1, -1, -1,
+      /*0x1c85*/ 535,
+      -1, -1, -1,
+      /*0xff35*/ 1267,
+      /*0x10578*/ 1357,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1,
+      /*0x16e45*/ 1494,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1,
+      /*0x16e4e*/ 1503,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1,
+      /*0xff37*/ 1269,
+      -1, -1, -1,
+      /*0xff25*/ 1251,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1,
+      /*0x118bb*/ 1484,
+      -1,
+      /*0xff23*/ 1249,
+      -1,
+      /*0x104b1*/ 1314,
+      -1, -1,
+      /*0x04f6*/ 416,
+      -1,
+      /*0x10b1*/ 501,
+      -1, -1, -1, -1,
+      /*0x10d51*/ 1436,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1,
+      /*0x16e55*/ 1510,
+      -1, -1, -1, -1, -1,
+      /*0x1ef8*/ 712,
+      /*0x1e78*/ 646,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1,
+      /*0x1058f*/ 1378,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1,
+      /*0x16e47*/ 1496,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1,
+      /*0x118b1*/ 1474,
+      -1, -1, -1, -1, -1, -1,
+      -1,
+      /*0x04f8*/ 417,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1,
+      /*0x1f0b*/ 719,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1,
+      /*0x16e5e*/ 1519,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1,
+      /*0x10595*/ 1383,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1,
+      /*0x16e5c*/ 1517,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1,
+      /*0xff31*/ 1263,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1,
+      /*0x10591*/ 1380,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1,
+      /*0x16e4b*/ 1500,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1,
+      /*0x16e49*/ 1498,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      /*0x10581*/ 1365,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      /*0x16e41*/ 1490,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1,
+      /*0xab72*/ 1157,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1,
+      /*0xab7e*/ 1169,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1,
+      /*0x16e4d*/ 1502,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1,
+      /*0x10585*/ 1369,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1,
+      /*0x16e51*/ 1506,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1,
+      /*0xab7a*/ 1165,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1,
+      /*0xab74*/ 1159,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      /*0xab7c*/ 1167,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      /*0xab76*/ 1161,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      /*0xab78*/ 1163
+    };
+
+  if (code <= MAX_CODE_VALUE && code >= MIN_CODE_VALUE)
+    {
+      register unsigned int key = onigenc_unicode_CaseFold_11_hash(code);
+
+      if (key <= MAX_HASH_VALUE)
+        {
+          register short s = wordlist[key];
+
+          if (s >= 0 && code1_equal(code, CaseFold_11_Table[s].from))
+            return &CaseFold_11_Table[s].to;
+        }
+    }
+  return 0;
+}
+
+static const CaseUnfold_11_Type CaseUnfold_11_Table[] = {
+#define CaseUnfold_11 (*(CaseUnfold_11_Type (*)[1422])(CaseUnfold_11_Table+0))
+  {0x0061, {1|U, {0x0041}}},
+  {0x0062, {1|U, {0x0042}}},
+  {0x0063, {1|U, {0x0043}}},
+  {0x0064, {1|U, {0x0044}}},
+  {0x0065, {1|U, {0x0045}}},
+  {0x0066, {1|U, {0x0046}}},
+  {0x0067, {1|U, {0x0047}}},
+  {0x0068, {1|U, {0x0048}}},
+  {0x006a, {1|U, {0x004a}}},
+  {0x006b, {2|U, {0x004b, 0x212a}}},
+  {0x006c, {1|U, {0x004c}}},
+  {0x006d, {1|U, {0x004d}}},
+  {0x006e, {1|U, {0x004e}}},
+  {0x006f, {1|U, {0x004f}}},
+  {0x0070, {1|U, {0x0050}}},
+  {0x0071, {1|U, {0x0051}}},
+  {0x0072, {1|U, {0x0052}}},
+  {0x0073, {2|U, {0x0053, 0x017f}}},
+  {0x0074, {1|U, {0x0054}}},
+  {0x0075, {1|U, {0x0055}}},
+  {0x0076, {1|U, {0x0056}}},
+  {0x0077, {1|U, {0x0057}}},
+  {0x0078, {1|U, {0x0058}}},
+  {0x0079, {1|U, {0x0059}}},
+  {0x007a, {1|U, {0x005a}}},
+  {0x00e0, {1|U, {0x00c0}}},
+  {0x00e1, {1|U, {0x00c1}}},
+  {0x00e2, {1|U, {0x00c2}}},
+  {0x00e3, {1|U, {0x00c3}}},
+  {0x00e4, {1|U, {0x00c4}}},
+  {0x00e5, {2|U, {0x00c5, 0x212b}}},
+  {0x00e6, {1|U, {0x00c6}}},
+  {0x00e7, {1|U, {0x00c7}}},
+  {0x00e8, {1|U, {0x00c8}}},
+  {0x00e9, {1|U, {0x00c9}}},
+  {0x00ea, {1|U, {0x00ca}}},
+  {0x00eb, {1|U, {0x00cb}}},
+  {0x00ec, {1|U, {0x00cc}}},
+  {0x00ed, {1|U, {0x00cd}}},
+  {0x00ee, {1|U, {0x00ce}}},
+  {0x00ef, {1|U, {0x00cf}}},
+  {0x00f0, {1|U, {0x00d0}}},
+  {0x00f1, {1|U, {0x00d1}}},
+  {0x00f2, {1|U, {0x00d2}}},
+  {0x00f3, {1|U, {0x00d3}}},
+  {0x00f4, {1|U, {0x00d4}}},
+  {0x00f5, {1|U, {0x00d5}}},
+  {0x00f6, {1|U, {0x00d6}}},
+  {0x00f8, {1|U, {0x00d8}}},
+  {0x00f9, {1|U, {0x00d9}}},
+  {0x00fa, {1|U, {0x00da}}},
+  {0x00fb, {1|U, {0x00db}}},
+  {0x00fc, {1|U, {0x00dc}}},
+  {0x00fd, {1|U, {0x00dd}}},
+  {0x00fe, {1|U, {0x00de}}},
+  {0x00ff, {1|U, {0x0178}}},
+  {0x0101, {1|U, {0x0100}}},
+  {0x0103, {1|U, {0x0102}}},
+  {0x0105, {1|U, {0x0104}}},
+  {0x0107, {1|U, {0x0106}}},
+  {0x0109, {1|U, {0x0108}}},
+  {0x010b, {1|U, {0x010a}}},
+  {0x010d, {1|U, {0x010c}}},
+  {0x010f, {1|U, {0x010e}}},
+  {0x0111, {1|U, {0x0110}}},
+  {0x0113, {1|U, {0x0112}}},
+  {0x0115, {1|U, {0x0114}}},
+  {0x0117, {1|U, {0x0116}}},
+  {0x0119, {1|U, {0x0118}}},
+  {0x011b, {1|U, {0x011a}}},
+  {0x011d, {1|U, {0x011c}}},
+  {0x011f, {1|U, {0x011e}}},
+  {0x0121, {1|U, {0x0120}}},
+  {0x0123, {1|U, {0x0122}}},
+  {0x0125, {1|U, {0x0124}}},
+  {0x0127, {1|U, {0x0126}}},
+  {0x0129, {1|U, {0x0128}}},
+  {0x012b, {1|U, {0x012a}}},
+  {0x012d, {1|U, {0x012c}}},
+  {0x012f, {1|U, {0x012e}}},
+  {0x0133, {1|U, {0x0132}}},
+  {0x0135, {1|U, {0x0134}}},
+  {0x0137, {1|U, {0x0136}}},
+  {0x013a, {1|U, {0x0139}}},
+  {0x013c, {1|U, {0x013b}}},
+  {0x013e, {1|U, {0x013d}}},
+  {0x0140, {1|U, {0x013f}}},
+  {0x0142, {1|U, {0x0141}}},
+  {0x0144, {1|U, {0x0143}}},
+  {0x0146, {1|U, {0x0145}}},
+  {0x0148, {1|U, {0x0147}}},
+  {0x014b, {1|U, {0x014a}}},
+  {0x014d, {1|U, {0x014c}}},
+  {0x014f, {1|U, {0x014e}}},
+  {0x0151, {1|U, {0x0150}}},
+  {0x0153, {1|U, {0x0152}}},
+  {0x0155, {1|U, {0x0154}}},
+  {0x0157, {1|U, {0x0156}}},
+  {0x0159, {1|U, {0x0158}}},
+  {0x015b, {1|U, {0x015a}}},
+  {0x015d, {1|U, {0x015c}}},
+  {0x015f, {1|U, {0x015e}}},
+  {0x0161, {1|U, {0x0160}}},
+  {0x0163, {1|U, {0x0162}}},
+  {0x0165, {1|U, {0x0164}}},
+  {0x0167, {1|U, {0x0166}}},
+  {0x0169, {1|U, {0x0168}}},
+  {0x016b, {1|U, {0x016a}}},
+  {0x016d, {1|U, {0x016c}}},
+  {0x016f, {1|U, {0x016e}}},
+  {0x0171, {1|U, {0x0170}}},
+  {0x0173, {1|U, {0x0172}}},
+  {0x0175, {1|U, {0x0174}}},
+  {0x0177, {1|U, {0x0176}}},
+  {0x017a, {1|U, {0x0179}}},
+  {0x017c, {1|U, {0x017b}}},
+  {0x017e, {1|U, {0x017d}}},
+  {0x0180, {1|U, {0x0243}}},
+  {0x0183, {1|U, {0x0182}}},
+  {0x0185, {1|U, {0x0184}}},
+  {0x0188, {1|U, {0x0187}}},
+  {0x018c, {1|U, {0x018b}}},
+  {0x0192, {1|U, {0x0191}}},
+  {0x0195, {1|U, {0x01f6}}},
+  {0x0199, {1|U, {0x0198}}},
+  {0x019a, {1|U, {0x023d}}},
+  {0x019b, {1|U, {0xa7dc}}},
+  {0x019e, {1|U, {0x0220}}},
+  {0x01a1, {1|U, {0x01a0}}},
+  {0x01a3, {1|U, {0x01a2}}},
+  {0x01a5, {1|U, {0x01a4}}},
+  {0x01a8, {1|U, {0x01a7}}},
+  {0x01ad, {1|U, {0x01ac}}},
+  {0x01b0, {1|U, {0x01af}}},
+  {0x01b4, {1|U, {0x01b3}}},
+  {0x01b6, {1|U, {0x01b5}}},
+  {0x01b9, {1|U, {0x01b8}}},
+  {0x01bd, {1|U, {0x01bc}}},
+  {0x01bf, {1|U, {0x01f7}}},
+  {0x01c6, {2|U|ST, {0x01c4, 0x01c5}}},
+  {0x01c9, {2|U|ST, {0x01c7, 0x01c8}}},
+  {0x01cc, {2|U|ST, {0x01ca, 0x01cb}}},
+  {0x01ce, {1|U, {0x01cd}}},
+  {0x01d0, {1|U, {0x01cf}}},
+  {0x01d2, {1|U, {0x01d1}}},
+  {0x01d4, {1|U, {0x01d3}}},
+  {0x01d6, {1|U, {0x01d5}}},
+  {0x01d8, {1|U, {0x01d7}}},
+  {0x01da, {1|U, {0x01d9}}},
+  {0x01dc, {1|U, {0x01db}}},
+  {0x01dd, {1|U, {0x018e}}},
+  {0x01df, {1|U, {0x01de}}},
+  {0x01e1, {1|U, {0x01e0}}},
+  {0x01e3, {1|U, {0x01e2}}},
+  {0x01e5, {1|U, {0x01e4}}},
+  {0x01e7, {1|U, {0x01e6}}},
+  {0x01e9, {1|U, {0x01e8}}},
+  {0x01eb, {1|U, {0x01ea}}},
+  {0x01ed, {1|U, {0x01ec}}},
+  {0x01ef, {1|U, {0x01ee}}},
+  {0x01f3, {2|U|ST, {0x01f1, 0x01f2}}},
+  {0x01f5, {1|U, {0x01f4}}},
+  {0x01f9, {1|U, {0x01f8}}},
+  {0x01fb, {1|U, {0x01fa}}},
+  {0x01fd, {1|U, {0x01fc}}},
+  {0x01ff, {1|U, {0x01fe}}},
+  {0x0201, {1|U, {0x0200}}},
+  {0x0203, {1|U, {0x0202}}},
+  {0x0205, {1|U, {0x0204}}},
+  {0x0207, {1|U, {0x0206}}},
+  {0x0209, {1|U, {0x0208}}},
+  {0x020b, {1|U, {0x020a}}},
+  {0x020d, {1|U, {0x020c}}},
+  {0x020f, {1|U, {0x020e}}},
+  {0x0211, {1|U, {0x0210}}},
+  {0x0213, {1|U, {0x0212}}},
+  {0x0215, {1|U, {0x0214}}},
+  {0x0217, {1|U, {0x0216}}},
+  {0x0219, {1|U, {0x0218}}},
+  {0x021b, {1|U, {0x021a}}},
+  {0x021d, {1|U, {0x021c}}},
+  {0x021f, {1|U, {0x021e}}},
+  {0x0223, {1|U, {0x0222}}},
+  {0x0225, {1|U, {0x0224}}},
+  {0x0227, {1|U, {0x0226}}},
+  {0x0229, {1|U, {0x0228}}},
+  {0x022b, {1|U, {0x022a}}},
+  {0x022d, {1|U, {0x022c}}},
+  {0x022f, {1|U, {0x022e}}},
+  {0x0231, {1|U, {0x0230}}},
+  {0x0233, {1|U, {0x0232}}},
+  {0x023c, {1|U, {0x023b}}},
+  {0x023f, {1|U, {0x2c7e}}},
+  {0x0240, {1|U, {0x2c7f}}},
+  {0x0242, {1|U, {0x0241}}},
+  {0x0247, {1|U, {0x0246}}},
+  {0x0249, {1|U, {0x0248}}},
+  {0x024b, {1|U, {0x024a}}},
+  {0x024d, {1|U, {0x024c}}},
+  {0x024f, {1|U, {0x024e}}},
+  {0x0250, {1|U, {0x2c6f}}},
+  {0x0251, {1|U, {0x2c6d}}},
+  {0x0252, {1|U, {0x2c70}}},
+  {0x0253, {1|U, {0x0181}}},
+  {0x0254, {1|U, {0x0186}}},
+  {0x0256, {1|U, {0x0189}}},
+  {0x0257, {1|U, {0x018a}}},
+  {0x0259, {1|U, {0x018f}}},
+  {0x025b, {1|U, {0x0190}}},
+  {0x025c, {1|U, {0xa7ab}}},
+  {0x0260, {1|U, {0x0193}}},
+  {0x0261, {1|U, {0xa7ac}}},
+  {0x0263, {1|U, {0x0194}}},
+  {0x0264, {1|U, {0xa7cb}}},
+  {0x0265, {1|U, {0xa78d}}},
+  {0x0266, {1|U, {0xa7aa}}},
+  {0x0268, {1|U, {0x0197}}},
+  {0x0269, {1|U, {0x0196}}},
+  {0x026a, {1|U, {0xa7ae}}},
+  {0x026b, {1|U, {0x2c62}}},
+  {0x026c, {1|U, {0xa7ad}}},
+  {0x026f, {1|U, {0x019c}}},
+  {0x0271, {1|U, {0x2c6e}}},
+  {0x0272, {1|U, {0x019d}}},
+  {0x0275, {1|U, {0x019f}}},
+  {0x027d, {1|U, {0x2c64}}},
+  {0x0280, {1|U, {0x01a6}}},
+  {0x0282, {1|U, {0xa7c5}}},
+  {0x0283, {1|U, {0x01a9}}},
+  {0x0287, {1|U, {0xa7b1}}},
+  {0x0288, {1|U, {0x01ae}}},
+  {0x0289, {1|U, {0x0244}}},
+  {0x028a, {1|U, {0x01b1}}},
+  {0x028b, {1|U, {0x01b2}}},
+  {0x028c, {1|U, {0x0245}}},
+  {0x0292, {1|U, {0x01b7}}},
+  {0x029d, {1|U, {0xa7b2}}},
+  {0x029e, {1|U, {0xa7b0}}},
+  {0x0371, {1|U, {0x0370}}},
+  {0x0373, {1|U, {0x0372}}},
+  {0x0377, {1|U, {0x0376}}},
+  {0x037b, {1|U, {0x03fd}}},
+  {0x037c, {1|U, {0x03fe}}},
+  {0x037d, {1|U, {0x03ff}}},
+  {0x03ac, {1|U, {0x0386}}},
+  {0x03ad, {1|U, {0x0388}}},
+  {0x03ae, {1|U, {0x0389}}},
+  {0x03af, {1|U, {0x038a}}},
+  {0x03b1, {1|U, {0x0391}}},
+  {0x03b2, {2|U, {0x0392, 0x03d0}}},
+  {0x03b3, {1|U, {0x0393}}},
+  {0x03b4, {1|U, {0x0394}}},
+  {0x03b5, {2|U, {0x0395, 0x03f5}}},
+  {0x03b6, {1|U, {0x0396}}},
+  {0x03b7, {1|U, {0x0397}}},
+  {0x03b8, {3|U, {0x0398, 0x03d1, 0x03f4}}},
+  {0x03b9, {3|U, {0x0399, 0x0345, 0x1fbe}}},
+  {0x03ba, {2|U, {0x039a, 0x03f0}}},
+  {0x03bb, {1|U, {0x039b}}},
+  {0x03bc, {2|U, {0x039c, 0x00b5}}},
+  {0x03bd, {1|U, {0x039d}}},
+  {0x03be, {1|U, {0x039e}}},
+  {0x03bf, {1|U, {0x039f}}},
+  {0x03c0, {2|U, {0x03a0, 0x03d6}}},
+  {0x03c1, {2|U, {0x03a1, 0x03f1}}},
+  {0x03c3, {2|U, {0x03a3, 0x03c2}}},
+  {0x03c4, {1|U, {0x03a4}}},
+  {0x03c5, {1|U, {0x03a5}}},
+  {0x03c6, {2|U, {0x03a6, 0x03d5}}},
+  {0x03c7, {1|U, {0x03a7}}},
+  {0x03c8, {1|U, {0x03a8}}},
+  {0x03c9, {2|U, {0x03a9, 0x2126}}},
+  {0x03ca, {1|U, {0x03aa}}},
+  {0x03cb, {1|U, {0x03ab}}},
+  {0x03cc, {1|U, {0x038c}}},
+  {0x03cd, {1|U, {0x038e}}},
+  {0x03ce, {1|U, {0x038f}}},
+  {0x03d7, {1|U, {0x03cf}}},
+  {0x03d9, {1|U, {0x03d8}}},
+  {0x03db, {1|U, {0x03da}}},
+  {0x03dd, {1|U, {0x03dc}}},
+  {0x03df, {1|U, {0x03de}}},
+  {0x03e1, {1|U, {0x03e0}}},
+  {0x03e3, {1|U, {0x03e2}}},
+  {0x03e5, {1|U, {0x03e4}}},
+  {0x03e7, {1|U, {0x03e6}}},
+  {0x03e9, {1|U, {0x03e8}}},
+  {0x03eb, {1|U, {0x03ea}}},
+  {0x03ed, {1|U, {0x03ec}}},
+  {0x03ef, {1|U, {0x03ee}}},
+  {0x03f2, {1|U, {0x03f9}}},
+  {0x03f3, {1|U, {0x037f}}},
+  {0x03f8, {1|U, {0x03f7}}},
+  {0x03fb, {1|U, {0x03fa}}},
+  {0x0430, {1|U, {0x0410}}},
+  {0x0431, {1|U, {0x0411}}},
+  {0x0432, {2|U, {0x0412, 0x1c80}}},
+  {0x0433, {1|U, {0x0413}}},
+  {0x0434, {2|U, {0x0414, 0x1c81}}},
+  {0x0435, {1|U, {0x0415}}},
+  {0x0436, {1|U, {0x0416}}},
+  {0x0437, {1|U, {0x0417}}},
+  {0x0438, {1|U, {0x0418}}},
+  {0x0439, {1|U, {0x0419}}},
+  {0x043a, {1|U, {0x041a}}},
+  {0x043b, {1|U, {0x041b}}},
+  {0x043c, {1|U, {0x041c}}},
+  {0x043d, {1|U, {0x041d}}},
+  {0x043e, {2|U, {0x041e, 0x1c82}}},
+  {0x043f, {1|U, {0x041f}}},
+  {0x0440, {1|U, {0x0420}}},
+  {0x0441, {2|U, {0x0421, 0x1c83}}},
+  {0x0442, {3|U, {0x0422, 0x1c84, 0x1c85}}},
+  {0x0443, {1|U, {0x0423}}},
+  {0x0444, {1|U, {0x0424}}},
+  {0x0445, {1|U, {0x0425}}},
+  {0x0446, {1|U, {0x0426}}},
+  {0x0447, {1|U, {0x0427}}},
+  {0x0448, {1|U, {0x0428}}},
+  {0x0449, {1|U, {0x0429}}},
+  {0x044a, {2|U, {0x042a, 0x1c86}}},
+  {0x044b, {1|U, {0x042b}}},
+  {0x044c, {1|U, {0x042c}}},
+  {0x044d, {1|U, {0x042d}}},
+  {0x044e, {1|U, {0x042e}}},
+  {0x044f, {1|U, {0x042f}}},
+  {0x0450, {1|U, {0x0400}}},
+  {0x0451, {1|U, {0x0401}}},
+  {0x0452, {1|U, {0x0402}}},
+  {0x0453, {1|U, {0x0403}}},
+  {0x0454, {1|U, {0x0404}}},
+  {0x0455, {1|U, {0x0405}}},
+  {0x0456, {1|U, {0x0406}}},
+  {0x0457, {1|U, {0x0407}}},
+  {0x0458, {1|U, {0x0408}}},
+  {0x0459, {1|U, {0x0409}}},
+  {0x045a, {1|U, {0x040a}}},
+  {0x045b, {1|U, {0x040b}}},
+  {0x045c, {1|U, {0x040c}}},
+  {0x045d, {1|U, {0x040d}}},
+  {0x045e, {1|U, {0x040e}}},
+  {0x045f, {1|U, {0x040f}}},
+  {0x0461, {1|U, {0x0460}}},
+  {0x0463, {2|U, {0x0462, 0x1c87}}},
+  {0x0465, {1|U, {0x0464}}},
+  {0x0467, {1|U, {0x0466}}},
+  {0x0469, {1|U, {0x0468}}},
+  {0x046b, {1|U, {0x046a}}},
+  {0x046d, {1|U, {0x046c}}},
+  {0x046f, {1|U, {0x046e}}},
+  {0x0471, {1|U, {0x0470}}},
+  {0x0473, {1|U, {0x0472}}},
+  {0x0475, {1|U, {0x0474}}},
+  {0x0477, {1|U, {0x0476}}},
+  {0x0479, {1|U, {0x0478}}},
+  {0x047b, {1|U, {0x047a}}},
+  {0x047d, {1|U, {0x047c}}},
+  {0x047f, {1|U, {0x047e}}},
+  {0x0481, {1|U, {0x0480}}},
+  {0x048b, {1|U, {0x048a}}},
+  {0x048d, {1|U, {0x048c}}},
+  {0x048f, {1|U, {0x048e}}},
+  {0x0491, {1|U, {0x0490}}},
+  {0x0493, {1|U, {0x0492}}},
+  {0x0495, {1|U, {0x0494}}},
+  {0x0497, {1|U, {0x0496}}},
+  {0x0499, {1|U, {0x0498}}},
+  {0x049b, {1|U, {0x049a}}},
+  {0x049d, {1|U, {0x049c}}},
+  {0x049f, {1|U, {0x049e}}},
+  {0x04a1, {1|U, {0x04a0}}},
+  {0x04a3, {1|U, {0x04a2}}},
+  {0x04a5, {1|U, {0x04a4}}},
+  {0x04a7, {1|U, {0x04a6}}},
+  {0x04a9, {1|U, {0x04a8}}},
+  {0x04ab, {1|U, {0x04aa}}},
+  {0x04ad, {1|U, {0x04ac}}},
+  {0x04af, {1|U, {0x04ae}}},
+  {0x04b1, {1|U, {0x04b0}}},
+  {0x04b3, {1|U, {0x04b2}}},
+  {0x04b5, {1|U, {0x04b4}}},
+  {0x04b7, {1|U, {0x04b6}}},
+  {0x04b9, {1|U, {0x04b8}}},
+  {0x04bb, {1|U, {0x04ba}}},
+  {0x04bd, {1|U, {0x04bc}}},
+  {0x04bf, {1|U, {0x04be}}},
+  {0x04c2, {1|U, {0x04c1}}},
+  {0x04c4, {1|U, {0x04c3}}},
+  {0x04c6, {1|U, {0x04c5}}},
+  {0x04c8, {1|U, {0x04c7}}},
+  {0x04ca, {1|U, {0x04c9}}},
+  {0x04cc, {1|U, {0x04cb}}},
+  {0x04ce, {1|U, {0x04cd}}},
+  {0x04cf, {1|U, {0x04c0}}},
+  {0x04d1, {1|U, {0x04d0}}},
+  {0x04d3, {1|U, {0x04d2}}},
+  {0x04d5, {1|U, {0x04d4}}},
+  {0x04d7, {1|U, {0x04d6}}},
+  {0x04d9, {1|U, {0x04d8}}},
+  {0x04db, {1|U, {0x04da}}},
+  {0x04dd, {1|U, {0x04dc}}},
+  {0x04df, {1|U, {0x04de}}},
+  {0x04e1, {1|U, {0x04e0}}},
+  {0x04e3, {1|U, {0x04e2}}},
+  {0x04e5, {1|U, {0x04e4}}},
+  {0x04e7, {1|U, {0x04e6}}},
+  {0x04e9, {1|U, {0x04e8}}},
+  {0x04eb, {1|U, {0x04ea}}},
+  {0x04ed, {1|U, {0x04ec}}},
+  {0x04ef, {1|U, {0x04ee}}},
+  {0x04f1, {1|U, {0x04f0}}},
+  {0x04f3, {1|U, {0x04f2}}},
+  {0x04f5, {1|U, {0x04f4}}},
+  {0x04f7, {1|U, {0x04f6}}},
+  {0x04f9, {1|U, {0x04f8}}},
+  {0x04fb, {1|U, {0x04fa}}},
+  {0x04fd, {1|U, {0x04fc}}},
+  {0x04ff, {1|U, {0x04fe}}},
+  {0x0501, {1|U, {0x0500}}},
+  {0x0503, {1|U, {0x0502}}},
+  {0x0505, {1|U, {0x0504}}},
+  {0x0507, {1|U, {0x0506}}},
+  {0x0509, {1|U, {0x0508}}},
+  {0x050b, {1|U, {0x050a}}},
+  {0x050d, {1|U, {0x050c}}},
+  {0x050f, {1|U, {0x050e}}},
+  {0x0511, {1|U, {0x0510}}},
+  {0x0513, {1|U, {0x0512}}},
+  {0x0515, {1|U, {0x0514}}},
+  {0x0517, {1|U, {0x0516}}},
+  {0x0519, {1|U, {0x0518}}},
+  {0x051b, {1|U, {0x051a}}},
+  {0x051d, {1|U, {0x051c}}},
+  {0x051f, {1|U, {0x051e}}},
+  {0x0521, {1|U, {0x0520}}},
+  {0x0523, {1|U, {0x0522}}},
+  {0x0525, {1|U, {0x0524}}},
+  {0x0527, {1|U, {0x0526}}},
+  {0x0529, {1|U, {0x0528}}},
+  {0x052b, {1|U, {0x052a}}},
+  {0x052d, {1|U, {0x052c}}},
+  {0x052f, {1|U, {0x052e}}},
+  {0x0561, {1|U, {0x0531}}},
+  {0x0562, {1|U, {0x0532}}},
+  {0x0563, {1|U, {0x0533}}},
+  {0x0564, {1|U, {0x0534}}},
+  {0x0565, {1|U, {0x0535}}},
+  {0x0566, {1|U, {0x0536}}},
+  {0x0567, {1|U, {0x0537}}},
+  {0x0568, {1|U, {0x0538}}},
+  {0x0569, {1|U, {0x0539}}},
+  {0x056a, {1|U, {0x053a}}},
+  {0x056b, {1|U, {0x053b}}},
+  {0x056c, {1|U, {0x053c}}},
+  {0x056d, {1|U, {0x053d}}},
+  {0x056e, {1|U, {0x053e}}},
+  {0x056f, {1|U, {0x053f}}},
+  {0x0570, {1|U, {0x0540}}},
+  {0x0571, {1|U, {0x0541}}},
+  {0x0572, {1|U, {0x0542}}},
+  {0x0573, {1|U, {0x0543}}},
+  {0x0574, {1|U, {0x0544}}},
+  {0x0575, {1|U, {0x0545}}},
+  {0x0576, {1|U, {0x0546}}},
+  {0x0577, {1|U, {0x0547}}},
+  {0x0578, {1|U, {0x0548}}},
+  {0x0579, {1|U, {0x0549}}},
+  {0x057a, {1|U, {0x054a}}},
+  {0x057b, {1|U, {0x054b}}},
+  {0x057c, {1|U, {0x054c}}},
+  {0x057d, {1|U, {0x054d}}},
+  {0x057e, {1|U, {0x054e}}},
+  {0x057f, {1|U, {0x054f}}},
+  {0x0580, {1|U, {0x0550}}},
+  {0x0581, {1|U, {0x0551}}},
+  {0x0582, {1|U, {0x0552}}},
+  {0x0583, {1|U, {0x0553}}},
+  {0x0584, {1|U, {0x0554}}},
+  {0x0585, {1|U, {0x0555}}},
+  {0x0586, {1|U, {0x0556}}},
+  {0x10d0, {1|U|IT, {0x1c90}}},
+  {0x10d1, {1|U|IT, {0x1c91}}},
+  {0x10d2, {1|U|IT, {0x1c92}}},
+  {0x10d3, {1|U|IT, {0x1c93}}},
+  {0x10d4, {1|U|IT, {0x1c94}}},
+  {0x10d5, {1|U|IT, {0x1c95}}},
+  {0x10d6, {1|U|IT, {0x1c96}}},
+  {0x10d7, {1|U|IT, {0x1c97}}},
+  {0x10d8, {1|U|IT, {0x1c98}}},
+  {0x10d9, {1|U|IT, {0x1c99}}},
+  {0x10da, {1|U|IT, {0x1c9a}}},
+  {0x10db, {1|U|IT, {0x1c9b}}},
+  {0x10dc, {1|U|IT, {0x1c9c}}},
+  {0x10dd, {1|U|IT, {0x1c9d}}},
+  {0x10de, {1|U|IT, {0x1c9e}}},
+  {0x10df, {1|U|IT, {0x1c9f}}},
+  {0x10e0, {1|U|IT, {0x1ca0}}},
+  {0x10e1, {1|U|IT, {0x1ca1}}},
+  {0x10e2, {1|U|IT, {0x1ca2}}},
+  {0x10e3, {1|U|IT, {0x1ca3}}},
+  {0x10e4, {1|U|IT, {0x1ca4}}},
+  {0x10e5, {1|U|IT, {0x1ca5}}},
+  {0x10e6, {1|U|IT, {0x1ca6}}},
+  {0x10e7, {1|U|IT, {0x1ca7}}},
+  {0x10e8, {1|U|IT, {0x1ca8}}},
+  {0x10e9, {1|U|IT, {0x1ca9}}},
+  {0x10ea, {1|U|IT, {0x1caa}}},
+  {0x10eb, {1|U|IT, {0x1cab}}},
+  {0x10ec, {1|U|IT, {0x1cac}}},
+  {0x10ed, {1|U|IT, {0x1cad}}},
+  {0x10ee, {1|U|IT, {0x1cae}}},
+  {0x10ef, {1|U|IT, {0x1caf}}},
+  {0x10f0, {1|U|IT, {0x1cb0}}},
+  {0x10f1, {1|U|IT, {0x1cb1}}},
+  {0x10f2, {1|U|IT, {0x1cb2}}},
+  {0x10f3, {1|U|IT, {0x1cb3}}},
+  {0x10f4, {1|U|IT, {0x1cb4}}},
+  {0x10f5, {1|U|IT, {0x1cb5}}},
+  {0x10f6, {1|U|IT, {0x1cb6}}},
+  {0x10f7, {1|U|IT, {0x1cb7}}},
+  {0x10f8, {1|U|IT, {0x1cb8}}},
+  {0x10f9, {1|U|IT, {0x1cb9}}},
+  {0x10fa, {1|U|IT, {0x1cba}}},
+  {0x10fd, {1|U|IT, {0x1cbd}}},
+  {0x10fe, {1|U|IT, {0x1cbe}}},
+  {0x10ff, {1|U|IT, {0x1cbf}}},
+  {0x13a0, {1|D, {0xab70}}},
+  {0x13a1, {1|D, {0xab71}}},
+  {0x13a2, {1|D, {0xab72}}},
+  {0x13a3, {1|D, {0xab73}}},
+  {0x13a4, {1|D, {0xab74}}},
+  {0x13a5, {1|D, {0xab75}}},
+  {0x13a6, {1|D, {0xab76}}},
+  {0x13a7, {1|D, {0xab77}}},
+  {0x13a8, {1|D, {0xab78}}},
+  {0x13a9, {1|D, {0xab79}}},
+  {0x13aa, {1|D, {0xab7a}}},
+  {0x13ab, {1|D, {0xab7b}}},
+  {0x13ac, {1|D, {0xab7c}}},
+  {0x13ad, {1|D, {0xab7d}}},
+  {0x13ae, {1|D, {0xab7e}}},
+  {0x13af, {1|D, {0xab7f}}},
+  {0x13b0, {1|D, {0xab80}}},
+  {0x13b1, {1|D, {0xab81}}},
+  {0x13b2, {1|D, {0xab82}}},
+  {0x13b3, {1|D, {0xab83}}},
+  {0x13b4, {1|D, {0xab84}}},
+  {0x13b5, {1|D, {0xab85}}},
+  {0x13b6, {1|D, {0xab86}}},
+  {0x13b7, {1|D, {0xab87}}},
+  {0x13b8, {1|D, {0xab88}}},
+  {0x13b9, {1|D, {0xab89}}},
+  {0x13ba, {1|D, {0xab8a}}},
+  {0x13bb, {1|D, {0xab8b}}},
+  {0x13bc, {1|D, {0xab8c}}},
+  {0x13bd, {1|D, {0xab8d}}},
+  {0x13be, {1|D, {0xab8e}}},
+  {0x13bf, {1|D, {0xab8f}}},
+  {0x13c0, {1|D, {0xab90}}},
+  {0x13c1, {1|D, {0xab91}}},
+  {0x13c2, {1|D, {0xab92}}},
+  {0x13c3, {1|D, {0xab93}}},
+  {0x13c4, {1|D, {0xab94}}},
+  {0x13c5, {1|D, {0xab95}}},
+  {0x13c6, {1|D, {0xab96}}},
+  {0x13c7, {1|D, {0xab97}}},
+  {0x13c8, {1|D, {0xab98}}},
+  {0x13c9, {1|D, {0xab99}}},
+  {0x13ca, {1|D, {0xab9a}}},
+  {0x13cb, {1|D, {0xab9b}}},
+  {0x13cc, {1|D, {0xab9c}}},
+  {0x13cd, {1|D, {0xab9d}}},
+  {0x13ce, {1|D, {0xab9e}}},
+  {0x13cf, {1|D, {0xab9f}}},
+  {0x13d0, {1|D, {0xaba0}}},
+  {0x13d1, {1|D, {0xaba1}}},
+  {0x13d2, {1|D, {0xaba2}}},
+  {0x13d3, {1|D, {0xaba3}}},
+  {0x13d4, {1|D, {0xaba4}}},
+  {0x13d5, {1|D, {0xaba5}}},
+  {0x13d6, {1|D, {0xaba6}}},
+  {0x13d7, {1|D, {0xaba7}}},
+  {0x13d8, {1|D, {0xaba8}}},
+  {0x13d9, {1|D, {0xaba9}}},
+  {0x13da, {1|D, {0xabaa}}},
+  {0x13db, {1|D, {0xabab}}},
+  {0x13dc, {1|D, {0xabac}}},
+  {0x13dd, {1|D, {0xabad}}},
+  {0x13de, {1|D, {0xabae}}},
+  {0x13df, {1|D, {0xabaf}}},
+  {0x13e0, {1|D, {0xabb0}}},
+  {0x13e1, {1|D, {0xabb1}}},
+  {0x13e2, {1|D, {0xabb2}}},
+  {0x13e3, {1|D, {0xabb3}}},
+  {0x13e4, {1|D, {0xabb4}}},
+  {0x13e5, {1|D, {0xabb5}}},
+  {0x13e6, {1|D, {0xabb6}}},
+  {0x13e7, {1|D, {0xabb7}}},
+  {0x13e8, {1|D, {0xabb8}}},
+  {0x13e9, {1|D, {0xabb9}}},
+  {0x13ea, {1|D, {0xabba}}},
+  {0x13eb, {1|D, {0xabbb}}},
+  {0x13ec, {1|D, {0xabbc}}},
+  {0x13ed, {1|D, {0xabbd}}},
+  {0x13ee, {1|D, {0xabbe}}},
+  {0x13ef, {1|D, {0xabbf}}},
+  {0x13f0, {1|D, {0x13f8}}},
+  {0x13f1, {1|D, {0x13f9}}},
+  {0x13f2, {1|D, {0x13fa}}},
+  {0x13f3, {1|D, {0x13fb}}},
+  {0x13f4, {1|D, {0x13fc}}},
+  {0x13f5, {1|D, {0x13fd}}},
+  {0x1c8a, {1|U, {0x1c89}}},
+  {0x1d79, {1|U, {0xa77d}}},
+  {0x1d7d, {1|U, {0x2c63}}},
+  {0x1d8e, {1|U, {0xa7c6}}},
+  {0x1e01, {1|U, {0x1e00}}},
+  {0x1e03, {1|U, {0x1e02}}},
+  {0x1e05, {1|U, {0x1e04}}},
+  {0x1e07, {1|U, {0x1e06}}},
+  {0x1e09, {1|U, {0x1e08}}},
+  {0x1e0b, {1|U, {0x1e0a}}},
+  {0x1e0d, {1|U, {0x1e0c}}},
+  {0x1e0f, {1|U, {0x1e0e}}},
+  {0x1e11, {1|U, {0x1e10}}},
+  {0x1e13, {1|U, {0x1e12}}},
+  {0x1e15, {1|U, {0x1e14}}},
+  {0x1e17, {1|U, {0x1e16}}},
+  {0x1e19, {1|U, {0x1e18}}},
+  {0x1e1b, {1|U, {0x1e1a}}},
+  {0x1e1d, {1|U, {0x1e1c}}},
+  {0x1e1f, {1|U, {0x1e1e}}},
+  {0x1e21, {1|U, {0x1e20}}},
+  {0x1e23, {1|U, {0x1e22}}},
+  {0x1e25, {1|U, {0x1e24}}},
+  {0x1e27, {1|U, {0x1e26}}},
+  {0x1e29, {1|U, {0x1e28}}},
+  {0x1e2b, {1|U, {0x1e2a}}},
+  {0x1e2d, {1|U, {0x1e2c}}},
+  {0x1e2f, {1|U, {0x1e2e}}},
+  {0x1e31, {1|U, {0x1e30}}},
+  {0x1e33, {1|U, {0x1e32}}},
+  {0x1e35, {1|U, {0x1e34}}},
+  {0x1e37, {1|U, {0x1e36}}},
+  {0x1e39, {1|U, {0x1e38}}},
+  {0x1e3b, {1|U, {0x1e3a}}},
+  {0x1e3d, {1|U, {0x1e3c}}},
+  {0x1e3f, {1|U, {0x1e3e}}},
+  {0x1e41, {1|U, {0x1e40}}},
+  {0x1e43, {1|U, {0x1e42}}},
+  {0x1e45, {1|U, {0x1e44}}},
+  {0x1e47, {1|U, {0x1e46}}},
+  {0x1e49, {1|U, {0x1e48}}},
+  {0x1e4b, {1|U, {0x1e4a}}},
+  {0x1e4d, {1|U, {0x1e4c}}},
+  {0x1e4f, {1|U, {0x1e4e}}},
+  {0x1e51, {1|U, {0x1e50}}},
+  {0x1e53, {1|U, {0x1e52}}},
+  {0x1e55, {1|U, {0x1e54}}},
+  {0x1e57, {1|U, {0x1e56}}},
+  {0x1e59, {1|U, {0x1e58}}},
+  {0x1e5b, {1|U, {0x1e5a}}},
+  {0x1e5d, {1|U, {0x1e5c}}},
+  {0x1e5f, {1|U, {0x1e5e}}},
+  {0x1e61, {2|U, {0x1e60, 0x1e9b}}},
+  {0x1e63, {1|U, {0x1e62}}},
+  {0x1e65, {1|U, {0x1e64}}},
+  {0x1e67, {1|U, {0x1e66}}},
+  {0x1e69, {1|U, {0x1e68}}},
+  {0x1e6b, {1|U, {0x1e6a}}},
+  {0x1e6d, {1|U, {0x1e6c}}},
+  {0x1e6f, {1|U, {0x1e6e}}},
+  {0x1e71, {1|U, {0x1e70}}},
+  {0x1e73, {1|U, {0x1e72}}},
+  {0x1e75, {1|U, {0x1e74}}},
+  {0x1e77, {1|U, {0x1e76}}},
+  {0x1e79, {1|U, {0x1e78}}},
+  {0x1e7b, {1|U, {0x1e7a}}},
+  {0x1e7d, {1|U, {0x1e7c}}},
+  {0x1e7f, {1|U, {0x1e7e}}},
+  {0x1e81, {1|U, {0x1e80}}},
+  {0x1e83, {1|U, {0x1e82}}},
+  {0x1e85, {1|U, {0x1e84}}},
+  {0x1e87, {1|U, {0x1e86}}},
+  {0x1e89, {1|U, {0x1e88}}},
+  {0x1e8b, {1|U, {0x1e8a}}},
+  {0x1e8d, {1|U, {0x1e8c}}},
+  {0x1e8f, {1|U, {0x1e8e}}},
+  {0x1e91, {1|U, {0x1e90}}},
+  {0x1e93, {1|U, {0x1e92}}},
+  {0x1e95, {1|U, {0x1e94}}},
+  {0x1ea1, {1|U, {0x1ea0}}},
+  {0x1ea3, {1|U, {0x1ea2}}},
+  {0x1ea5, {1|U, {0x1ea4}}},
+  {0x1ea7, {1|U, {0x1ea6}}},
+  {0x1ea9, {1|U, {0x1ea8}}},
+  {0x1eab, {1|U, {0x1eaa}}},
+  {0x1ead, {1|U, {0x1eac}}},
+  {0x1eaf, {1|U, {0x1eae}}},
+  {0x1eb1, {1|U, {0x1eb0}}},
+  {0x1eb3, {1|U, {0x1eb2}}},
+  {0x1eb5, {1|U, {0x1eb4}}},
+  {0x1eb7, {1|U, {0x1eb6}}},
+  {0x1eb9, {1|U, {0x1eb8}}},
+  {0x1ebb, {1|U, {0x1eba}}},
+  {0x1ebd, {1|U, {0x1ebc}}},
+  {0x1ebf, {1|U, {0x1ebe}}},
+  {0x1ec1, {1|U, {0x1ec0}}},
+  {0x1ec3, {1|U, {0x1ec2}}},
+  {0x1ec5, {1|U, {0x1ec4}}},
+  {0x1ec7, {1|U, {0x1ec6}}},
+  {0x1ec9, {1|U, {0x1ec8}}},
+  {0x1ecb, {1|U, {0x1eca}}},
+  {0x1ecd, {1|U, {0x1ecc}}},
+  {0x1ecf, {1|U, {0x1ece}}},
+  {0x1ed1, {1|U, {0x1ed0}}},
+  {0x1ed3, {1|U, {0x1ed2}}},
+  {0x1ed5, {1|U, {0x1ed4}}},
+  {0x1ed7, {1|U, {0x1ed6}}},
+  {0x1ed9, {1|U, {0x1ed8}}},
+  {0x1edb, {1|U, {0x1eda}}},
+  {0x1edd, {1|U, {0x1edc}}},
+  {0x1edf, {1|U, {0x1ede}}},
+  {0x1ee1, {1|U, {0x1ee0}}},
+  {0x1ee3, {1|U, {0x1ee2}}},
+  {0x1ee5, {1|U, {0x1ee4}}},
+  {0x1ee7, {1|U, {0x1ee6}}},
+  {0x1ee9, {1|U, {0x1ee8}}},
+  {0x1eeb, {1|U, {0x1eea}}},
+  {0x1eed, {1|U, {0x1eec}}},
+  {0x1eef, {1|U, {0x1eee}}},
+  {0x1ef1, {1|U, {0x1ef0}}},
+  {0x1ef3, {1|U, {0x1ef2}}},
+  {0x1ef5, {1|U, {0x1ef4}}},
+  {0x1ef7, {1|U, {0x1ef6}}},
+  {0x1ef9, {1|U, {0x1ef8}}},
+  {0x1efb, {1|U, {0x1efa}}},
+  {0x1efd, {1|U, {0x1efc}}},
+  {0x1eff, {1|U, {0x1efe}}},
+  {0x1f00, {1|U, {0x1f08}}},
+  {0x1f01, {1|U, {0x1f09}}},
+  {0x1f02, {1|U, {0x1f0a}}},
+  {0x1f03, {1|U, {0x1f0b}}},
+  {0x1f04, {1|U, {0x1f0c}}},
+  {0x1f05, {1|U, {0x1f0d}}},
+  {0x1f06, {1|U, {0x1f0e}}},
+  {0x1f07, {1|U, {0x1f0f}}},
+  {0x1f10, {1|U, {0x1f18}}},
+  {0x1f11, {1|U, {0x1f19}}},
+  {0x1f12, {1|U, {0x1f1a}}},
+  {0x1f13, {1|U, {0x1f1b}}},
+  {0x1f14, {1|U, {0x1f1c}}},
+  {0x1f15, {1|U, {0x1f1d}}},
+  {0x1f20, {1|U, {0x1f28}}},
+  {0x1f21, {1|U, {0x1f29}}},
+  {0x1f22, {1|U, {0x1f2a}}},
+  {0x1f23, {1|U, {0x1f2b}}},
+  {0x1f24, {1|U, {0x1f2c}}},
+  {0x1f25, {1|U, {0x1f2d}}},
+  {0x1f26, {1|U, {0x1f2e}}},
+  {0x1f27, {1|U, {0x1f2f}}},
+  {0x1f30, {1|U, {0x1f38}}},
+  {0x1f31, {1|U, {0x1f39}}},
+  {0x1f32, {1|U, {0x1f3a}}},
+  {0x1f33, {1|U, {0x1f3b}}},
+  {0x1f34, {1|U, {0x1f3c}}},
+  {0x1f35, {1|U, {0x1f3d}}},
+  {0x1f36, {1|U, {0x1f3e}}},
+  {0x1f37, {1|U, {0x1f3f}}},
+  {0x1f40, {1|U, {0x1f48}}},
+  {0x1f41, {1|U, {0x1f49}}},
+  {0x1f42, {1|U, {0x1f4a}}},
+  {0x1f43, {1|U, {0x1f4b}}},
+  {0x1f44, {1|U, {0x1f4c}}},
+  {0x1f45, {1|U, {0x1f4d}}},
+  {0x1f51, {1|U, {0x1f59}}},
+  {0x1f53, {1|U, {0x1f5b}}},
+  {0x1f55, {1|U, {0x1f5d}}},
+  {0x1f57, {1|U, {0x1f5f}}},
+  {0x1f60, {1|U, {0x1f68}}},
+  {0x1f61, {1|U, {0x1f69}}},
+  {0x1f62, {1|U, {0x1f6a}}},
+  {0x1f63, {1|U, {0x1f6b}}},
+  {0x1f64, {1|U, {0x1f6c}}},
+  {0x1f65, {1|U, {0x1f6d}}},
+  {0x1f66, {1|U, {0x1f6e}}},
+  {0x1f67, {1|U, {0x1f6f}}},
+  {0x1f70, {1|U, {0x1fba}}},
+  {0x1f71, {1|U, {0x1fbb}}},
+  {0x1f72, {1|U, {0x1fc8}}},
+  {0x1f73, {1|U, {0x1fc9}}},
+  {0x1f74, {1|U, {0x1fca}}},
+  {0x1f75, {1|U, {0x1fcb}}},
+  {0x1f76, {1|U, {0x1fda}}},
+  {0x1f77, {1|U, {0x1fdb}}},
+  {0x1f78, {1|U, {0x1ff8}}},
+  {0x1f79, {1|U, {0x1ff9}}},
+  {0x1f7a, {1|U, {0x1fea}}},
+  {0x1f7b, {1|U, {0x1feb}}},
+  {0x1f7c, {1|U, {0x1ffa}}},
+  {0x1f7d, {1|U, {0x1ffb}}},
+  {0x1fb0, {1|U, {0x1fb8}}},
+  {0x1fb1, {1|U, {0x1fb9}}},
+  {0x1fd0, {1|U, {0x1fd8}}},
+  {0x1fd1, {1|U, {0x1fd9}}},
+  {0x1fe0, {1|U, {0x1fe8}}},
+  {0x1fe1, {1|U, {0x1fe9}}},
+  {0x1fe5, {1|U, {0x1fec}}},
+  {0x214e, {1|U, {0x2132}}},
+  {0x2170, {1|U, {0x2160}}},
+  {0x2171, {1|U, {0x2161}}},
+  {0x2172, {1|U, {0x2162}}},
+  {0x2173, {1|U, {0x2163}}},
+  {0x2174, {1|U, {0x2164}}},
+  {0x2175, {1|U, {0x2165}}},
+  {0x2176, {1|U, {0x2166}}},
+  {0x2177, {1|U, {0x2167}}},
+  {0x2178, {1|U, {0x2168}}},
+  {0x2179, {1|U, {0x2169}}},
+  {0x217a, {1|U, {0x216a}}},
+  {0x217b, {1|U, {0x216b}}},
+  {0x217c, {1|U, {0x216c}}},
+  {0x217d, {1|U, {0x216d}}},
+  {0x217e, {1|U, {0x216e}}},
+  {0x217f, {1|U, {0x216f}}},
+  {0x2184, {1|U, {0x2183}}},
+  {0x24d0, {1|U, {0x24b6}}},
+  {0x24d1, {1|U, {0x24b7}}},
+  {0x24d2, {1|U, {0x24b8}}},
+  {0x24d3, {1|U, {0x24b9}}},
+  {0x24d4, {1|U, {0x24ba}}},
+  {0x24d5, {1|U, {0x24bb}}},
+  {0x24d6, {1|U, {0x24bc}}},
+  {0x24d7, {1|U, {0x24bd}}},
+  {0x24d8, {1|U, {0x24be}}},
+  {0x24d9, {1|U, {0x24bf}}},
+  {0x24da, {1|U, {0x24c0}}},
+  {0x24db, {1|U, {0x24c1}}},
+  {0x24dc, {1|U, {0x24c2}}},
+  {0x24dd, {1|U, {0x24c3}}},
+  {0x24de, {1|U, {0x24c4}}},
+  {0x24df, {1|U, {0x24c5}}},
+  {0x24e0, {1|U, {0x24c6}}},
+  {0x24e1, {1|U, {0x24c7}}},
+  {0x24e2, {1|U, {0x24c8}}},
+  {0x24e3, {1|U, {0x24c9}}},
+  {0x24e4, {1|U, {0x24ca}}},
+  {0x24e5, {1|U, {0x24cb}}},
+  {0x24e6, {1|U, {0x24cc}}},
+  {0x24e7, {1|U, {0x24cd}}},
+  {0x24e8, {1|U, {0x24ce}}},
+  {0x24e9, {1|U, {0x24cf}}},
+  {0x2c30, {1|U, {0x2c00}}},
+  {0x2c31, {1|U, {0x2c01}}},
+  {0x2c32, {1|U, {0x2c02}}},
+  {0x2c33, {1|U, {0x2c03}}},
+  {0x2c34, {1|U, {0x2c04}}},
+  {0x2c35, {1|U, {0x2c05}}},
+  {0x2c36, {1|U, {0x2c06}}},
+  {0x2c37, {1|U, {0x2c07}}},
+  {0x2c38, {1|U, {0x2c08}}},
+  {0x2c39, {1|U, {0x2c09}}},
+  {0x2c3a, {1|U, {0x2c0a}}},
+  {0x2c3b, {1|U, {0x2c0b}}},
+  {0x2c3c, {1|U, {0x2c0c}}},
+  {0x2c3d, {1|U, {0x2c0d}}},
+  {0x2c3e, {1|U, {0x2c0e}}},
+  {0x2c3f, {1|U, {0x2c0f}}},
+  {0x2c40, {1|U, {0x2c10}}},
+  {0x2c41, {1|U, {0x2c11}}},
+  {0x2c42, {1|U, {0x2c12}}},
+  {0x2c43, {1|U, {0x2c13}}},
+  {0x2c44, {1|U, {0x2c14}}},
+  {0x2c45, {1|U, {0x2c15}}},
+  {0x2c46, {1|U, {0x2c16}}},
+  {0x2c47, {1|U, {0x2c17}}},
+  {0x2c48, {1|U, {0x2c18}}},
+  {0x2c49, {1|U, {0x2c19}}},
+  {0x2c4a, {1|U, {0x2c1a}}},
+  {0x2c4b, {1|U, {0x2c1b}}},
+  {0x2c4c, {1|U, {0x2c1c}}},
+  {0x2c4d, {1|U, {0x2c1d}}},
+  {0x2c4e, {1|U, {0x2c1e}}},
+  {0x2c4f, {1|U, {0x2c1f}}},
+  {0x2c50, {1|U, {0x2c20}}},
+  {0x2c51, {1|U, {0x2c21}}},
+  {0x2c52, {1|U, {0x2c22}}},
+  {0x2c53, {1|U, {0x2c23}}},
+  {0x2c54, {1|U, {0x2c24}}},
+  {0x2c55, {1|U, {0x2c25}}},
+  {0x2c56, {1|U, {0x2c26}}},
+  {0x2c57, {1|U, {0x2c27}}},
+  {0x2c58, {1|U, {0x2c28}}},
+  {0x2c59, {1|U, {0x2c29}}},
+  {0x2c5a, {1|U, {0x2c2a}}},
+  {0x2c5b, {1|U, {0x2c2b}}},
+  {0x2c5c, {1|U, {0x2c2c}}},
+  {0x2c5d, {1|U, {0x2c2d}}},
+  {0x2c5e, {1|U, {0x2c2e}}},
+  {0x2c5f, {1|U, {0x2c2f}}},
+  {0x2c61, {1|U, {0x2c60}}},
+  {0x2c65, {1|U, {0x023a}}},
+  {0x2c66, {1|U, {0x023e}}},
+  {0x2c68, {1|U, {0x2c67}}},
+  {0x2c6a, {1|U, {0x2c69}}},
+  {0x2c6c, {1|U, {0x2c6b}}},
+  {0x2c73, {1|U, {0x2c72}}},
+  {0x2c76, {1|U, {0x2c75}}},
+  {0x2c81, {1|U, {0x2c80}}},
+  {0x2c83, {1|U, {0x2c82}}},
+  {0x2c85, {1|U, {0x2c84}}},
+  {0x2c87, {1|U, {0x2c86}}},
+  {0x2c89, {1|U, {0x2c88}}},
+  {0x2c8b, {1|U, {0x2c8a}}},
+  {0x2c8d, {1|U, {0x2c8c}}},
+  {0x2c8f, {1|U, {0x2c8e}}},
+  {0x2c91, {1|U, {0x2c90}}},
+  {0x2c93, {1|U, {0x2c92}}},
+  {0x2c95, {1|U, {0x2c94}}},
+  {0x2c97, {1|U, {0x2c96}}},
+  {0x2c99, {1|U, {0x2c98}}},
+  {0x2c9b, {1|U, {0x2c9a}}},
+  {0x2c9d, {1|U, {0x2c9c}}},
+  {0x2c9f, {1|U, {0x2c9e}}},
+  {0x2ca1, {1|U, {0x2ca0}}},
+  {0x2ca3, {1|U, {0x2ca2}}},
+  {0x2ca5, {1|U, {0x2ca4}}},
+  {0x2ca7, {1|U, {0x2ca6}}},
+  {0x2ca9, {1|U, {0x2ca8}}},
+  {0x2cab, {1|U, {0x2caa}}},
+  {0x2cad, {1|U, {0x2cac}}},
+  {0x2caf, {1|U, {0x2cae}}},
+  {0x2cb1, {1|U, {0x2cb0}}},
+  {0x2cb3, {1|U, {0x2cb2}}},
+  {0x2cb5, {1|U, {0x2cb4}}},
+  {0x2cb7, {1|U, {0x2cb6}}},
+  {0x2cb9, {1|U, {0x2cb8}}},
+  {0x2cbb, {1|U, {0x2cba}}},
+  {0x2cbd, {1|U, {0x2cbc}}},
+  {0x2cbf, {1|U, {0x2cbe}}},
+  {0x2cc1, {1|U, {0x2cc0}}},
+  {0x2cc3, {1|U, {0x2cc2}}},
+  {0x2cc5, {1|U, {0x2cc4}}},
+  {0x2cc7, {1|U, {0x2cc6}}},
+  {0x2cc9, {1|U, {0x2cc8}}},
+  {0x2ccb, {1|U, {0x2cca}}},
+  {0x2ccd, {1|U, {0x2ccc}}},
+  {0x2ccf, {1|U, {0x2cce}}},
+  {0x2cd1, {1|U, {0x2cd0}}},
+  {0x2cd3, {1|U, {0x2cd2}}},
+  {0x2cd5, {1|U, {0x2cd4}}},
+  {0x2cd7, {1|U, {0x2cd6}}},
+  {0x2cd9, {1|U, {0x2cd8}}},
+  {0x2cdb, {1|U, {0x2cda}}},
+  {0x2cdd, {1|U, {0x2cdc}}},
+  {0x2cdf, {1|U, {0x2cde}}},
+  {0x2ce1, {1|U, {0x2ce0}}},
+  {0x2ce3, {1|U, {0x2ce2}}},
+  {0x2cec, {1|U, {0x2ceb}}},
+  {0x2cee, {1|U, {0x2ced}}},
+  {0x2cf3, {1|U, {0x2cf2}}},
+  {0x2d00, {1|U, {0x10a0}}},
+  {0x2d01, {1|U, {0x10a1}}},
+  {0x2d02, {1|U, {0x10a2}}},
+  {0x2d03, {1|U, {0x10a3}}},
+  {0x2d04, {1|U, {0x10a4}}},
+  {0x2d05, {1|U, {0x10a5}}},
+  {0x2d06, {1|U, {0x10a6}}},
+  {0x2d07, {1|U, {0x10a7}}},
+  {0x2d08, {1|U, {0x10a8}}},
+  {0x2d09, {1|U, {0x10a9}}},
+  {0x2d0a, {1|U, {0x10aa}}},
+  {0x2d0b, {1|U, {0x10ab}}},
+  {0x2d0c, {1|U, {0x10ac}}},
+  {0x2d0d, {1|U, {0x10ad}}},
+  {0x2d0e, {1|U, {0x10ae}}},
+  {0x2d0f, {1|U, {0x10af}}},
+  {0x2d10, {1|U, {0x10b0}}},
+  {0x2d11, {1|U, {0x10b1}}},
+  {0x2d12, {1|U, {0x10b2}}},
+  {0x2d13, {1|U, {0x10b3}}},
+  {0x2d14, {1|U, {0x10b4}}},
+  {0x2d15, {1|U, {0x10b5}}},
+  {0x2d16, {1|U, {0x10b6}}},
+  {0x2d17, {1|U, {0x10b7}}},
+  {0x2d18, {1|U, {0x10b8}}},
+  {0x2d19, {1|U, {0x10b9}}},
+  {0x2d1a, {1|U, {0x10ba}}},
+  {0x2d1b, {1|U, {0x10bb}}},
+  {0x2d1c, {1|U, {0x10bc}}},
+  {0x2d1d, {1|U, {0x10bd}}},
+  {0x2d1e, {1|U, {0x10be}}},
+  {0x2d1f, {1|U, {0x10bf}}},
+  {0x2d20, {1|U, {0x10c0}}},
+  {0x2d21, {1|U, {0x10c1}}},
+  {0x2d22, {1|U, {0x10c2}}},
+  {0x2d23, {1|U, {0x10c3}}},
+  {0x2d24, {1|U, {0x10c4}}},
+  {0x2d25, {1|U, {0x10c5}}},
+  {0x2d27, {1|U, {0x10c7}}},
+  {0x2d2d, {1|U, {0x10cd}}},
+  {0xa641, {1|U, {0xa640}}},
+  {0xa643, {1|U, {0xa642}}},
+  {0xa645, {1|U, {0xa644}}},
+  {0xa647, {1|U, {0xa646}}},
+  {0xa649, {1|U, {0xa648}}},
+  {0xa64b, {2|U, {0xa64a, 0x1c88}}},
+  {0xa64d, {1|U, {0xa64c}}},
+  {0xa64f, {1|U, {0xa64e}}},
+  {0xa651, {1|U, {0xa650}}},
+  {0xa653, {1|U, {0xa652}}},
+  {0xa655, {1|U, {0xa654}}},
+  {0xa657, {1|U, {0xa656}}},
+  {0xa659, {1|U, {0xa658}}},
+  {0xa65b, {1|U, {0xa65a}}},
+  {0xa65d, {1|U, {0xa65c}}},
+  {0xa65f, {1|U, {0xa65e}}},
+  {0xa661, {1|U, {0xa660}}},
+  {0xa663, {1|U, {0xa662}}},
+  {0xa665, {1|U, {0xa664}}},
+  {0xa667, {1|U, {0xa666}}},
+  {0xa669, {1|U, {0xa668}}},
+  {0xa66b, {1|U, {0xa66a}}},
+  {0xa66d, {1|U, {0xa66c}}},
+  {0xa681, {1|U, {0xa680}}},
+  {0xa683, {1|U, {0xa682}}},
+  {0xa685, {1|U, {0xa684}}},
+  {0xa687, {1|U, {0xa686}}},
+  {0xa689, {1|U, {0xa688}}},
+  {0xa68b, {1|U, {0xa68a}}},
+  {0xa68d, {1|U, {0xa68c}}},
+  {0xa68f, {1|U, {0xa68e}}},
+  {0xa691, {1|U, {0xa690}}},
+  {0xa693, {1|U, {0xa692}}},
+  {0xa695, {1|U, {0xa694}}},
+  {0xa697, {1|U, {0xa696}}},
+  {0xa699, {1|U, {0xa698}}},
+  {0xa69b, {1|U, {0xa69a}}},
+  {0xa723, {1|U, {0xa722}}},
+  {0xa725, {1|U, {0xa724}}},
+  {0xa727, {1|U, {0xa726}}},
+  {0xa729, {1|U, {0xa728}}},
+  {0xa72b, {1|U, {0xa72a}}},
+  {0xa72d, {1|U, {0xa72c}}},
+  {0xa72f, {1|U, {0xa72e}}},
+  {0xa733, {1|U, {0xa732}}},
+  {0xa735, {1|U, {0xa734}}},
+  {0xa737, {1|U, {0xa736}}},
+  {0xa739, {1|U, {0xa738}}},
+  {0xa73b, {1|U, {0xa73a}}},
+  {0xa73d, {1|U, {0xa73c}}},
+  {0xa73f, {1|U, {0xa73e}}},
+  {0xa741, {1|U, {0xa740}}},
+  {0xa743, {1|U, {0xa742}}},
+  {0xa745, {1|U, {0xa744}}},
+  {0xa747, {1|U, {0xa746}}},
+  {0xa749, {1|U, {0xa748}}},
+  {0xa74b, {1|U, {0xa74a}}},
+  {0xa74d, {1|U, {0xa74c}}},
+  {0xa74f, {1|U, {0xa74e}}},
+  {0xa751, {1|U, {0xa750}}},
+  {0xa753, {1|U, {0xa752}}},
+  {0xa755, {1|U, {0xa754}}},
+  {0xa757, {1|U, {0xa756}}},
+  {0xa759, {1|U, {0xa758}}},
+  {0xa75b, {1|U, {0xa75a}}},
+  {0xa75d, {1|U, {0xa75c}}},
+  {0xa75f, {1|U, {0xa75e}}},
+  {0xa761, {1|U, {0xa760}}},
+  {0xa763, {1|U, {0xa762}}},
+  {0xa765, {1|U, {0xa764}}},
+  {0xa767, {1|U, {0xa766}}},
+  {0xa769, {1|U, {0xa768}}},
+  {0xa76b, {1|U, {0xa76a}}},
+  {0xa76d, {1|U, {0xa76c}}},
+  {0xa76f, {1|U, {0xa76e}}},
+  {0xa77a, {1|U, {0xa779}}},
+  {0xa77c, {1|U, {0xa77b}}},
+  {0xa77f, {1|U, {0xa77e}}},
+  {0xa781, {1|U, {0xa780}}},
+  {0xa783, {1|U, {0xa782}}},
+  {0xa785, {1|U, {0xa784}}},
+  {0xa787, {1|U, {0xa786}}},
+  {0xa78c, {1|U, {0xa78b}}},
+  {0xa791, {1|U, {0xa790}}},
+  {0xa793, {1|U, {0xa792}}},
+  {0xa794, {1|U, {0xa7c4}}},
+  {0xa797, {1|U, {0xa796}}},
+  {0xa799, {1|U, {0xa798}}},
+  {0xa79b, {1|U, {0xa79a}}},
+  {0xa79d, {1|U, {0xa79c}}},
+  {0xa79f, {1|U, {0xa79e}}},
+  {0xa7a1, {1|U, {0xa7a0}}},
+  {0xa7a3, {1|U, {0xa7a2}}},
+  {0xa7a5, {1|U, {0xa7a4}}},
+  {0xa7a7, {1|U, {0xa7a6}}},
+  {0xa7a9, {1|U, {0xa7a8}}},
+  {0xa7b5, {1|U, {0xa7b4}}},
+  {0xa7b7, {1|U, {0xa7b6}}},
+  {0xa7b9, {1|U, {0xa7b8}}},
+  {0xa7bb, {1|U, {0xa7ba}}},
+  {0xa7bd, {1|U, {0xa7bc}}},
+  {0xa7bf, {1|U, {0xa7be}}},
+  {0xa7c1, {1|U, {0xa7c0}}},
+  {0xa7c3, {1|U, {0xa7c2}}},
+  {0xa7c8, {1|U, {0xa7c7}}},
+  {0xa7ca, {1|U, {0xa7c9}}},
+  {0xa7cd, {1|U, {0xa7cc}}},
+  {0xa7d1, {1|U, {0xa7d0}}},
+  {0xa7d7, {1|U, {0xa7d6}}},
+  {0xa7d9, {1|U, {0xa7d8}}},
+  {0xa7db, {1|U, {0xa7da}}},
+  {0xa7f6, {1|U, {0xa7f5}}},
+  {0xab53, {1|U, {0xa7b3}}},
+  {0xff41, {1|U, {0xff21}}},
+  {0xff42, {1|U, {0xff22}}},
+  {0xff43, {1|U, {0xff23}}},
+  {0xff44, {1|U, {0xff24}}},
+  {0xff45, {1|U, {0xff25}}},
+  {0xff46, {1|U, {0xff26}}},
+  {0xff47, {1|U, {0xff27}}},
+  {0xff48, {1|U, {0xff28}}},
+  {0xff49, {1|U, {0xff29}}},
+  {0xff4a, {1|U, {0xff2a}}},
+  {0xff4b, {1|U, {0xff2b}}},
+  {0xff4c, {1|U, {0xff2c}}},
+  {0xff4d, {1|U, {0xff2d}}},
+  {0xff4e, {1|U, {0xff2e}}},
+  {0xff4f, {1|U, {0xff2f}}},
+  {0xff50, {1|U, {0xff30}}},
+  {0xff51, {1|U, {0xff31}}},
+  {0xff52, {1|U, {0xff32}}},
+  {0xff53, {1|U, {0xff33}}},
+  {0xff54, {1|U, {0xff34}}},
+  {0xff55, {1|U, {0xff35}}},
+  {0xff56, {1|U, {0xff36}}},
+  {0xff57, {1|U, {0xff37}}},
+  {0xff58, {1|U, {0xff38}}},
+  {0xff59, {1|U, {0xff39}}},
+  {0xff5a, {1|U, {0xff3a}}},
+  {0x10428, {1|U, {0x10400}}},
+  {0x10429, {1|U, {0x10401}}},
+  {0x1042a, {1|U, {0x10402}}},
+  {0x1042b, {1|U, {0x10403}}},
+  {0x1042c, {1|U, {0x10404}}},
+  {0x1042d, {1|U, {0x10405}}},
+  {0x1042e, {1|U, {0x10406}}},
+  {0x1042f, {1|U, {0x10407}}},
+  {0x10430, {1|U, {0x10408}}},
+  {0x10431, {1|U, {0x10409}}},
+  {0x10432, {1|U, {0x1040a}}},
+  {0x10433, {1|U, {0x1040b}}},
+  {0x10434, {1|U, {0x1040c}}},
+  {0x10435, {1|U, {0x1040d}}},
+  {0x10436, {1|U, {0x1040e}}},
+  {0x10437, {1|U, {0x1040f}}},
+  {0x10438, {1|U, {0x10410}}},
+  {0x10439, {1|U, {0x10411}}},
+  {0x1043a, {1|U, {0x10412}}},
+  {0x1043b, {1|U, {0x10413}}},
+  {0x1043c, {1|U, {0x10414}}},
+  {0x1043d, {1|U, {0x10415}}},
+  {0x1043e, {1|U, {0x10416}}},
+  {0x1043f, {1|U, {0x10417}}},
+  {0x10440, {1|U, {0x10418}}},
+  {0x10441, {1|U, {0x10419}}},
+  {0x10442, {1|U, {0x1041a}}},
+  {0x10443, {1|U, {0x1041b}}},
+  {0x10444, {1|U, {0x1041c}}},
+  {0x10445, {1|U, {0x1041d}}},
+  {0x10446, {1|U, {0x1041e}}},
+  {0x10447, {1|U, {0x1041f}}},
+  {0x10448, {1|U, {0x10420}}},
+  {0x10449, {1|U, {0x10421}}},
+  {0x1044a, {1|U, {0x10422}}},
+  {0x1044b, {1|U, {0x10423}}},
+  {0x1044c, {1|U, {0x10424}}},
+  {0x1044d, {1|U, {0x10425}}},
+  {0x1044e, {1|U, {0x10426}}},
+  {0x1044f, {1|U, {0x10427}}},
+  {0x104d8, {1|U, {0x104b0}}},
+  {0x104d9, {1|U, {0x104b1}}},
+  {0x104da, {1|U, {0x104b2}}},
+  {0x104db, {1|U, {0x104b3}}},
+  {0x104dc, {1|U, {0x104b4}}},
+  {0x104dd, {1|U, {0x104b5}}},
+  {0x104de, {1|U, {0x104b6}}},
+  {0x104df, {1|U, {0x104b7}}},
+  {0x104e0, {1|U, {0x104b8}}},
+  {0x104e1, {1|U, {0x104b9}}},
+  {0x104e2, {1|U, {0x104ba}}},
+  {0x104e3, {1|U, {0x104bb}}},
+  {0x104e4, {1|U, {0x104bc}}},
+  {0x104e5, {1|U, {0x104bd}}},
+  {0x104e6, {1|U, {0x104be}}},
+  {0x104e7, {1|U, {0x104bf}}},
+  {0x104e8, {1|U, {0x104c0}}},
+  {0x104e9, {1|U, {0x104c1}}},
+  {0x104ea, {1|U, {0x104c2}}},
+  {0x104eb, {1|U, {0x104c3}}},
+  {0x104ec, {1|U, {0x104c4}}},
+  {0x104ed, {1|U, {0x104c5}}},
+  {0x104ee, {1|U, {0x104c6}}},
+  {0x104ef, {1|U, {0x104c7}}},
+  {0x104f0, {1|U, {0x104c8}}},
+  {0x104f1, {1|U, {0x104c9}}},
+  {0x104f2, {1|U, {0x104ca}}},
+  {0x104f3, {1|U, {0x104cb}}},
+  {0x104f4, {1|U, {0x104cc}}},
+  {0x104f5, {1|U, {0x104cd}}},
+  {0x104f6, {1|U, {0x104ce}}},
+  {0x104f7, {1|U, {0x104cf}}},
+  {0x104f8, {1|U, {0x104d0}}},
+  {0x104f9, {1|U, {0x104d1}}},
+  {0x104fa, {1|U, {0x104d2}}},
+  {0x104fb, {1|U, {0x104d3}}},
+  {0x10597, {1|U, {0x10570}}},
+  {0x10598, {1|U, {0x10571}}},
+  {0x10599, {1|U, {0x10572}}},
+  {0x1059a, {1|U, {0x10573}}},
+  {0x1059b, {1|U, {0x10574}}},
+  {0x1059c, {1|U, {0x10575}}},
+  {0x1059d, {1|U, {0x10576}}},
+  {0x1059e, {1|U, {0x10577}}},
+  {0x1059f, {1|U, {0x10578}}},
+  {0x105a0, {1|U, {0x10579}}},
+  {0x105a1, {1|U, {0x1057a}}},
+  {0x105a3, {1|U, {0x1057c}}},
+  {0x105a4, {1|U, {0x1057d}}},
+  {0x105a5, {1|U, {0x1057e}}},
+  {0x105a6, {1|U, {0x1057f}}},
+  {0x105a7, {1|U, {0x10580}}},
+  {0x105a8, {1|U, {0x10581}}},
+  {0x105a9, {1|U, {0x10582}}},
+  {0x105aa, {1|U, {0x10583}}},
+  {0x105ab, {1|U, {0x10584}}},
+  {0x105ac, {1|U, {0x10585}}},
+  {0x105ad, {1|U, {0x10586}}},
+  {0x105ae, {1|U, {0x10587}}},
+  {0x105af, {1|U, {0x10588}}},
+  {0x105b0, {1|U, {0x10589}}},
+  {0x105b1, {1|U, {0x1058a}}},
+  {0x105b3, {1|U, {0x1058c}}},
+  {0x105b4, {1|U, {0x1058d}}},
+  {0x105b5, {1|U, {0x1058e}}},
+  {0x105b6, {1|U, {0x1058f}}},
+  {0x105b7, {1|U, {0x10590}}},
+  {0x105b8, {1|U, {0x10591}}},
+  {0x105b9, {1|U, {0x10592}}},
+  {0x105bb, {1|U, {0x10594}}},
+  {0x105bc, {1|U, {0x10595}}},
+  {0x10cc0, {1|U, {0x10c80}}},
+  {0x10cc1, {1|U, {0x10c81}}},
+  {0x10cc2, {1|U, {0x10c82}}},
+  {0x10cc3, {1|U, {0x10c83}}},
+  {0x10cc4, {1|U, {0x10c84}}},
+  {0x10cc5, {1|U, {0x10c85}}},
+  {0x10cc6, {1|U, {0x10c86}}},
+  {0x10cc7, {1|U, {0x10c87}}},
+  {0x10cc8, {1|U, {0x10c88}}},
+  {0x10cc9, {1|U, {0x10c89}}},
+  {0x10cca, {1|U, {0x10c8a}}},
+  {0x10ccb, {1|U, {0x10c8b}}},
+  {0x10ccc, {1|U, {0x10c8c}}},
+  {0x10ccd, {1|U, {0x10c8d}}},
+  {0x10cce, {1|U, {0x10c8e}}},
+  {0x10ccf, {1|U, {0x10c8f}}},
+  {0x10cd0, {1|U, {0x10c90}}},
+  {0x10cd1, {1|U, {0x10c91}}},
+  {0x10cd2, {1|U, {0x10c92}}},
+  {0x10cd3, {1|U, {0x10c93}}},
+  {0x10cd4, {1|U, {0x10c94}}},
+  {0x10cd5, {1|U, {0x10c95}}},
+  {0x10cd6, {1|U, {0x10c96}}},
+  {0x10cd7, {1|U, {0x10c97}}},
+  {0x10cd8, {1|U, {0x10c98}}},
+  {0x10cd9, {1|U, {0x10c99}}},
+  {0x10cda, {1|U, {0x10c9a}}},
+  {0x10cdb, {1|U, {0x10c9b}}},
+  {0x10cdc, {1|U, {0x10c9c}}},
+  {0x10cdd, {1|U, {0x10c9d}}},
+  {0x10cde, {1|U, {0x10c9e}}},
+  {0x10cdf, {1|U, {0x10c9f}}},
+  {0x10ce0, {1|U, {0x10ca0}}},
+  {0x10ce1, {1|U, {0x10ca1}}},
+  {0x10ce2, {1|U, {0x10ca2}}},
+  {0x10ce3, {1|U, {0x10ca3}}},
+  {0x10ce4, {1|U, {0x10ca4}}},
+  {0x10ce5, {1|U, {0x10ca5}}},
+  {0x10ce6, {1|U, {0x10ca6}}},
+  {0x10ce7, {1|U, {0x10ca7}}},
+  {0x10ce8, {1|U, {0x10ca8}}},
+  {0x10ce9, {1|U, {0x10ca9}}},
+  {0x10cea, {1|U, {0x10caa}}},
+  {0x10ceb, {1|U, {0x10cab}}},
+  {0x10cec, {1|U, {0x10cac}}},
+  {0x10ced, {1|U, {0x10cad}}},
+  {0x10cee, {1|U, {0x10cae}}},
+  {0x10cef, {1|U, {0x10caf}}},
+  {0x10cf0, {1|U, {0x10cb0}}},
+  {0x10cf1, {1|U, {0x10cb1}}},
+  {0x10cf2, {1|U, {0x10cb2}}},
+  {0x10d70, {1|U, {0x10d50}}},
+  {0x10d71, {1|U, {0x10d51}}},
+  {0x10d72, {1|U, {0x10d52}}},
+  {0x10d73, {1|U, {0x10d53}}},
+  {0x10d74, {1|U, {0x10d54}}},
+  {0x10d75, {1|U, {0x10d55}}},
+  {0x10d76, {1|U, {0x10d56}}},
+  {0x10d77, {1|U, {0x10d57}}},
+  {0x10d78, {1|U, {0x10d58}}},
+  {0x10d79, {1|U, {0x10d59}}},
+  {0x10d7a, {1|U, {0x10d5a}}},
+  {0x10d7b, {1|U, {0x10d5b}}},
+  {0x10d7c, {1|U, {0x10d5c}}},
+  {0x10d7d, {1|U, {0x10d5d}}},
+  {0x10d7e, {1|U, {0x10d5e}}},
+  {0x10d7f, {1|U, {0x10d5f}}},
+  {0x10d80, {1|U, {0x10d60}}},
+  {0x10d81, {1|U, {0x10d61}}},
+  {0x10d82, {1|U, {0x10d62}}},
+  {0x10d83, {1|U, {0x10d63}}},
+  {0x10d84, {1|U, {0x10d64}}},
+  {0x10d85, {1|U, {0x10d65}}},
+  {0x118c0, {1|U, {0x118a0}}},
+  {0x118c1, {1|U, {0x118a1}}},
+  {0x118c2, {1|U, {0x118a2}}},
+  {0x118c3, {1|U, {0x118a3}}},
+  {0x118c4, {1|U, {0x118a4}}},
+  {0x118c5, {1|U, {0x118a5}}},
+  {0x118c6, {1|U, {0x118a6}}},
+  {0x118c7, {1|U, {0x118a7}}},
+  {0x118c8, {1|U, {0x118a8}}},
+  {0x118c9, {1|U, {0x118a9}}},
+  {0x118ca, {1|U, {0x118aa}}},
+  {0x118cb, {1|U, {0x118ab}}},
+  {0x118cc, {1|U, {0x118ac}}},
+  {0x118cd, {1|U, {0x118ad}}},
+  {0x118ce, {1|U, {0x118ae}}},
+  {0x118cf, {1|U, {0x118af}}},
+  {0x118d0, {1|U, {0x118b0}}},
+  {0x118d1, {1|U, {0x118b1}}},
+  {0x118d2, {1|U, {0x118b2}}},
+  {0x118d3, {1|U, {0x118b3}}},
+  {0x118d4, {1|U, {0x118b4}}},
+  {0x118d5, {1|U, {0x118b5}}},
+  {0x118d6, {1|U, {0x118b6}}},
+  {0x118d7, {1|U, {0x118b7}}},
+  {0x118d8, {1|U, {0x118b8}}},
+  {0x118d9, {1|U, {0x118b9}}},
+  {0x118da, {1|U, {0x118ba}}},
+  {0x118db, {1|U, {0x118bb}}},
+  {0x118dc, {1|U, {0x118bc}}},
+  {0x118dd, {1|U, {0x118bd}}},
+  {0x118de, {1|U, {0x118be}}},
+  {0x118df, {1|U, {0x118bf}}},
+  {0x16e60, {1|U, {0x16e40}}},
+  {0x16e61, {1|U, {0x16e41}}},
+  {0x16e62, {1|U, {0x16e42}}},
+  {0x16e63, {1|U, {0x16e43}}},
+  {0x16e64, {1|U, {0x16e44}}},
+  {0x16e65, {1|U, {0x16e45}}},
+  {0x16e66, {1|U, {0x16e46}}},
+  {0x16e67, {1|U, {0x16e47}}},
+  {0x16e68, {1|U, {0x16e48}}},
+  {0x16e69, {1|U, {0x16e49}}},
+  {0x16e6a, {1|U, {0x16e4a}}},
+  {0x16e6b, {1|U, {0x16e4b}}},
+  {0x16e6c, {1|U, {0x16e4c}}},
+  {0x16e6d, {1|U, {0x16e4d}}},
+  {0x16e6e, {1|U, {0x16e4e}}},
+  {0x16e6f, {1|U, {0x16e4f}}},
+  {0x16e70, {1|U, {0x16e50}}},
+  {0x16e71, {1|U, {0x16e51}}},
+  {0x16e72, {1|U, {0x16e52}}},
+  {0x16e73, {1|U, {0x16e53}}},
+  {0x16e74, {1|U, {0x16e54}}},
+  {0x16e75, {1|U, {0x16e55}}},
+  {0x16e76, {1|U, {0x16e56}}},
+  {0x16e77, {1|U, {0x16e57}}},
+  {0x16e78, {1|U, {0x16e58}}},
+  {0x16e79, {1|U, {0x16e59}}},
+  {0x16e7a, {1|U, {0x16e5a}}},
+  {0x16e7b, {1|U, {0x16e5b}}},
+  {0x16e7c, {1|U, {0x16e5c}}},
+  {0x16e7d, {1|U, {0x16e5d}}},
+  {0x16e7e, {1|U, {0x16e5e}}},
+  {0x16e7f, {1|U, {0x16e5f}}},
+  {0x1e922, {1|U, {0x1e900}}},
+  {0x1e923, {1|U, {0x1e901}}},
+  {0x1e924, {1|U, {0x1e902}}},
+  {0x1e925, {1|U, {0x1e903}}},
+  {0x1e926, {1|U, {0x1e904}}},
+  {0x1e927, {1|U, {0x1e905}}},
+  {0x1e928, {1|U, {0x1e906}}},
+  {0x1e929, {1|U, {0x1e907}}},
+  {0x1e92a, {1|U, {0x1e908}}},
+  {0x1e92b, {1|U, {0x1e909}}},
+  {0x1e92c, {1|U, {0x1e90a}}},
+  {0x1e92d, {1|U, {0x1e90b}}},
+  {0x1e92e, {1|U, {0x1e90c}}},
+  {0x1e92f, {1|U, {0x1e90d}}},
+  {0x1e930, {1|U, {0x1e90e}}},
+  {0x1e931, {1|U, {0x1e90f}}},
+  {0x1e932, {1|U, {0x1e910}}},
+  {0x1e933, {1|U, {0x1e911}}},
+  {0x1e934, {1|U, {0x1e912}}},
+  {0x1e935, {1|U, {0x1e913}}},
+  {0x1e936, {1|U, {0x1e914}}},
+  {0x1e937, {1|U, {0x1e915}}},
+  {0x1e938, {1|U, {0x1e916}}},
+  {0x1e939, {1|U, {0x1e917}}},
+  {0x1e93a, {1|U, {0x1e918}}},
+  {0x1e93b, {1|U, {0x1e919}}},
+  {0x1e93c, {1|U, {0x1e91a}}},
+  {0x1e93d, {1|U, {0x1e91b}}},
+  {0x1e93e, {1|U, {0x1e91c}}},
+  {0x1e93f, {1|U, {0x1e91d}}},
+  {0x1e940, {1|U, {0x1e91e}}},
+  {0x1e941, {1|U, {0x1e91f}}},
+  {0x1e942, {1|U, {0x1e920}}},
+  {0x1e943, {1|U, {0x1e921}}},
+#define CaseUnfold_11_Locale (*(CaseUnfold_11_Type (*)[1])(CaseUnfold_11_Table+1422))
+  {0x0069, {1|U, {0x0049}}},
+};
+
+/* ANSI-C code produced by gperf version 3.1 */
+/* Command-line: gperf -7 -k1,2,3 -F,-1 -c -j1 -i1 -t -T -E -C -H onigenc_unicode_CaseUnfold_11_hash -N onigenc_unicode_CaseUnfold_11_lookup -n  */
+
+/* maximum key range = 2713, duplicates = 0 */
+
+#ifdef __GNUC__
+__inline
+#else
+#ifdef __cplusplus
+inline
+#endif
+#endif
+/*ARGSUSED*/
+static unsigned int
+onigenc_unicode_CaseUnfold_11_hash(const OnigCodePoint code)
+{
+  static const unsigned short asso_values[] =
+    {
+         1, 2716,    2,    1,    4,  640,    9,  260,  231,  142,
+       589,   20,    2,    3,  434,  372, 2716, 2716, 2716, 2716,
+      2716, 2716, 2716, 2716, 2716, 2716, 2716, 2716, 2716,  112,
+       404,  141, 2716, 2716, 2716, 2716, 2716,  120, 2716, 2716,
+      2716, 2716, 2716,    1, 2716, 2716, 2716, 2716, 2716, 2716,
+      2716, 2716, 2716,  395, 2716, 2716, 2716, 2716, 2716, 2716,
+      2716,    3,   11,    6,    7,    8,  244,  723,   34, 1143,
+       365, 1012,   56, 1546,   12, 1709,    9,   15,   14, 1796,
+       241,  917,   87,  227,   47, 1535,  267, 1468,    1, 1612,
+        49, 1184,  361,   10,  557, 1704,   51, 1814,   66, 1385,
+       338,  786,  740,  659,  125,  801,  354, 1134,  249, 1252,
+       327,  756,  193, 1116, 1511,  838, 1898,  703, 1796,  679,
+      1745,  629, 1856,  827, 1832,  995, 1531,  973, 1806,  811,
+       850,  511,  903,  500, 1517,  935, 1483,  876, 1461,  555,
+      1790,  541, 1703,  465, 1274,  531, 1340,  250, 1667,  342,
+      1660,  408, 1652,  194, 1622,   85, 1595,   70, 1578,  129,
+      1492,  100, 1489,    1, 1450,   25, 1432,   35, 1180,   55,
+      1415,   45,  459,  160, 1298,  317,  577,  220, 1224,  594,
+       965,  373, 1322,  670, 1062, 1243,  966, 1045, 1124, 1160,
+      1223, 1094, 1497, 1314
+    };
+  return asso_values[bits_of(code, 2)+66] + asso_values[bits_of(code, 1)+4] + asso_values[bits_of(code, 0)];
+}
+
+static const CodePointList3 *
+onigenc_unicode_CaseUnfold_11_lookup(const OnigCodePoint code)
+{
+  enum
+    {
+      MIN_CODE_VALUE = 0x61,
+      MAX_CODE_VALUE = 0x1e943,
+      TOTAL_KEYWORDS = 1423,
+      MIN_WORD_LENGTH = 3,
+      MAX_WORD_LENGTH = 3,
+      MIN_HASH_VALUE = 3,
+      MAX_HASH_VALUE = 2715
+    };
+
+  static const short wordlist[] =
+    {
+      -1, -1, -1,
+      /*0x13e1*/ 591,
+      /*0x0461*/ 342,
+      /*0x04e1*/ 402,
+      /*0x0061*/ 0,
+      -1,
+      /*0x104e1*/ 1189,
+      /*0x1e61*/ 664,
+      /*0x1ee1*/ 723,
+      /*0x0161*/ 102,
+      /*0x2ce1*/ 956,
+      /*0x1c8a*/ 612,
+      /*0x049b*/ 367,
+      -1, -1,
+      /*0x24e1*/ 843,
+      /*0x1e1b*/ 629,
+      /*0x048b*/ 359,
+      /*0x011b*/ 69,
+      /*0x2c9b*/ 921,
+      /*0x03e1*/ 282,
+      /*0x1e0b*/ 621,
+      /*0x1e8b*/ 685,
+      /*0x010b*/ 61,
+      /*0x2c8b*/ 913,
+      /*0x13e3*/ 593,
+      /*0x0463*/ 343,
+      /*0x04e3*/ 403,
+      /*0x0063*/ 2,
+      -1,
+      /*0x104e3*/ 1191,
+      /*0x1e63*/ 665,
+      /*0x1ee3*/ 724,
+      /*0x0163*/ 103,
+      /*0x2ce3*/ 957,
+      /*0x13e5*/ 595,
+      /*0x0465*/ 344,
+      /*0x04e5*/ 404,
+      /*0x0065*/ 4,
+      /*0x24e3*/ 845,
+      /*0x104e5*/ 1193,
+      /*0x1e65*/ 666,
+      /*0x1ee5*/ 725,
+      /*0x0165*/ 104,
+      /*0x03e3*/ 283,
+      /*0x13e9*/ 599,
+      /*0x0469*/ 346,
+      /*0x04e9*/ 406,
+      /*0x0069*/ 1422,
+      /*0x24e5*/ 847,
+      /*0x104e9*/ 1197,
+      /*0x1e69*/ 668,
+      /*0x1ee9*/ 727,
+      /*0x0169*/ 106,
+      /*0x03e5*/ 284,
+      /*0x13e7*/ 597,
+      /*0x0467*/ 345,
+      /*0x04e7*/ 405,
+      /*0x0067*/ 6,
+      /*0x24e9*/ 851,
+      /*0x104e7*/ 1195,
+      /*0x1e67*/ 667,
+      /*0x1ee7*/ 726,
+      /*0x0167*/ 105,
+      /*0x03e9*/ 286,
+      -1,
+      /*0x13a0*/ 526,
+      -1, -1,
+      /*0x24e7*/ 849,
+      /*0x13db*/ 585,
+      /*0x045b*/ 337,
+      /*0x04db*/ 399,
+      -1,
+      /*0x03e7*/ 285,
+      /*0x104db*/ 1183,
+      /*0x1e5b*/ 661,
+      /*0x1edb*/ 720,
+      /*0x015b*/ 99,
+      /*0x2cdb*/ 953,
+      -1, -1, -1, -1,
+      /*0x24db*/ 837,
+      /*0x13d9*/ 583,
+      /*0x0459*/ 335,
+      /*0x04d9*/ 398,
+      /*0xa761*/ 1068,
+      /*0x03db*/ 279,
+      /*0x104d9*/ 1181,
+      /*0x1e59*/ 660,
+      /*0x1ed9*/ 719,
+      /*0x0159*/ 98,
+      /*0x2cd9*/ 952,
+      -1, -1, -1, -1,
+      /*0x24d9*/ 835,
+      /*0x13df*/ 589,
+      /*0x045f*/ 341,
+      /*0x04df*/ 401,
+      -1,
+      /*0x03d9*/ 278,
+      /*0x104df*/ 1187,
+      /*0x1e5f*/ 663,
+      /*0x1edf*/ 722,
+      /*0x015f*/ 101,
+      /*0x2cdf*/ 955,
+      -1, -1,
+      /*0xa763*/ 1069,
+      -1,
+      /*0x24df*/ 841,
+      /*0x10ce1*/ 1284,
+      -1, -1, -1,
+      /*0x03df*/ 281,
+      /*0x10e1*/ 497,
+      -1,
+      /*0xa765*/ 1070,
+      -1, -1,
+      /*0x13a6*/ 532,
+      -1, -1, -1,
+      /*0x13dd*/ 587,
+      /*0x045d*/ 339,
+      /*0x04dd*/ 400,
+      /*0xa769*/ 1072,
+      -1,
+      /*0x104dd*/ 1185,
+      /*0x1e5d*/ 662,
+      /*0x1edd*/ 721,
+      /*0x015d*/ 100,
+      /*0x2cdd*/ 954,
+      /*0x10ce3*/ 1286,
+      -1, -1,
+      /*0xa767*/ 1071,
+      /*0x24dd*/ 839,
+      /*0x10e3*/ 499,
+      -1, -1, -1,
+      /*0x03dd*/ 280,
+      /*0x10ce5*/ 1288,
+      /*0x028a*/ 232,
+      -1, -1,
+      /*0x0288*/ 230,
+      /*0x10e5*/ 501,
+      /*0x028c*/ 234,
+      /*0x028b*/ 233,
+      /*0xa75b*/ 1065,
+      -1,
+      /*0x10ce9*/ 1292,
+      /*0x13eb*/ 601,
+      /*0x046b*/ 347,
+      /*0x04eb*/ 407,
+      /*0x006b*/ 9,
+      /*0x10e9*/ 505,
+      /*0x104eb*/ 1199,
+      /*0x1e6b*/ 669,
+      /*0x1eeb*/ 728,
+      /*0x016b*/ 107,
+      /*0x10ce7*/ 1290,
+      -1, -1,
+      /*0xa759*/ 1064,
+      -1,
+      /*0x10e7*/ 503,
+      /*0x0282*/ 227,
+      -1,
+      /*0x10d82*/ 1320,
+      -1,
+      /*0x03eb*/ 287,
+      -1, -1, -1, -1,
+      /*0x10cdb*/ 1278,
+      -1, -1,
+      /*0xa75f*/ 1067,
+      /*0x0292*/ 235,
+      /*0x10db*/ 491,
+      -1, -1,
+      /*0x029e*/ 237,
+      /*0x13ae*/ 540,
+      /*0x13d7*/ 581,
+      /*0x0457*/ 333,
+      /*0x04d7*/ 397,
+      /*0x1042e*/ 1146,
+      -1,
+      /*0x10cd9*/ 1276,
+      /*0x1e57*/ 659,
+      /*0x1ed7*/ 718,
+      /*0x0157*/ 97,
+      /*0x2cd7*/ 951,
+      /*0x10d9*/ 489,
+      -1, -1, -1,
+      /*0x24d7*/ 833,
+      -1, -1, -1,
+      /*0x03ae*/ 246,
+      /*0x03d7*/ 277,
+      /*0x10cdf*/ 1282,
+      -1,
+      /*0xa75d*/ 1066,
+      -1, -1,
+      /*0x10df*/ 495,
+      /*0x13ef*/ 605,
+      /*0x046f*/ 349,
+      /*0x04ef*/ 409,
+      /*0x006f*/ 13,
+      -1,
+      /*0x104ef*/ 1203,
+      /*0x1e6f*/ 671,
+      /*0x1eef*/ 730,
+      /*0x016f*/ 109,
+      /*0x0491*/ 362,
+      -1,
+      /*0x0261*/ 211,
+      -1,
+      /*0x1e11*/ 624,
+      /*0x1e91*/ 688,
+      /*0x0111*/ 64,
+      /*0x2c91*/ 916,
+      /*0xa79b*/ 1089,
+      -1,
+      /*0x03ef*/ 289,
+      /*0x021b*/ 179,
+      /*0xa78c*/ 1083,
+      /*0xa661*/ 1017,
+      /*0x10cdd*/ 1280,
+      /*0x1f61*/ 780,
+      /*0x020b*/ 171,
+      /*0x1d8e*/ 615,
+      /*0xa76b*/ 1073,
+      /*0x10dd*/ 493,
+      /*0x13aa*/ 536,
+      /*0x13d1*/ 575,
+      /*0x0451*/ 327,
+      /*0x04d1*/ 394,
+      /*0x1042a*/ 1142,
+      -1,
+      /*0x0263*/ 212,
+      /*0x1e51*/ 656,
+      /*0x1ed1*/ 715,
+      /*0x0151*/ 94,
+      /*0x2cd1*/ 948,
+      /*0x01e1*/ 152,
+      -1, -1, -1,
+      /*0x24d1*/ 827,
+      /*0x0265*/ 214,
+      /*0xa663*/ 1018,
+      -1,
+      /*0x1f63*/ 782,
+      /*0x019b*/ 126,
+      -1,
+      /*0x0188*/ 120,
+      -1,
+      /*0x018c*/ 121,
+      /*0x10ceb*/ 1294,
+      /*0x0269*/ 217,
+      /*0xa665*/ 1019,
+      /*0x1f02*/ 741,
+      /*0x1f65*/ 784,
+      /*0x10eb*/ 507,
+      -1,
+      /*0xa757*/ 1063,
+      -1, -1,
+      /*0x01e3*/ 153,
+      -1,
+      /*0xa669*/ 1021,
+      -1, -1, -1,
+      /*0x1f12*/ 749,
+      -1, -1, -1,
+      /*0x01e5*/ 154,
+      -1,
+      /*0xa667*/ 1020,
+      /*0xa7db*/ 1111,
+      /*0x1f67*/ 786,
+      /*0x1f06*/ 745,
+      /*0x025b*/ 208,
+      -1, -1, -1,
+      /*0x01e9*/ 156,
+      -1,
+      /*0x0192*/ 122,
+      /*0xa76f*/ 1075,
+      /*0x10cd7*/ 1274,
+      /*0x1f20*/ 753,
+      /*0x019e*/ 127,
+      /*0xa65b*/ 1014,
+      /*0xa7d9*/ 1110,
+      /*0x10d7*/ 487,
+      /*0x01e7*/ 155,
+      /*0x0259*/ 207,
+      -1,
+      /*0x13ed*/ 603,
+      /*0x046d*/ 348,
+      /*0x04ed*/ 408,
+      /*0x006d*/ 11,
+      -1,
+      /*0x104ed*/ 1201,
+      /*0x1e6d*/ 670,
+      /*0x1eed*/ 729,
+      /*0x016d*/ 108,
+      /*0xa659*/ 1013,
+      /*0x13ac*/ 538,
+      -1, -1,
+      /*0x1f10*/ 747,
+      /*0x1042c*/ 1144,
+      -1, -1,
+      /*0x10cef*/ 1298,
+      -1,
+      /*0x03ed*/ 288,
+      /*0xa751*/ 1060,
+      /*0x13a2*/ 528,
+      /*0x10ef*/ 511,
+      -1,
+      /*0xa65f*/ 1016,
+      /*0x13d3*/ 577,
+      /*0x0453*/ 329,
+      /*0x04d3*/ 395,
+      -1,
+      /*0x03ac*/ 244,
+      -1,
+      /*0x1e53*/ 657,
+      /*0x1ed3*/ 716,
+      /*0x0153*/ 95,
+      /*0x2cd3*/ 949,
+      -1, -1,
+      /*0x13a8*/ 534,
+      -1,
+      /*0x24d3*/ 829,
+      -1,
+      /*0x10428*/ 1140,
+      /*0x01df*/ 151,
+      -1,
+      /*0x2c61*/ 900,
+      -1, -1,
+      /*0x10cd1*/ 1268,
+      -1, -1, -1,
+      /*0x1f26*/ 759,
+      /*0x10d1*/ 481,
+      /*0xa65d*/ 1015,
+      -1, -1,
+      /*0x13f3*/ 609,
+      /*0x0473*/ 351,
+      /*0x04f3*/ 411,
+      /*0x0073*/ 17,
+      -1,
+      /*0x104f3*/ 1207,
+      /*0x1e73*/ 673,
+      /*0x1ef3*/ 732,
+      /*0x0173*/ 111,
+      /*0x2cf3*/ 960,
+      -1,
+      /*0x1059b*/ 1220,
+      /*0x0280*/ 226,
+      -1,
+      /*0x10d80*/ 1318,
+      /*0x01dd*/ 150,
+      -1,
+      /*0x026b*/ 219,
+      /*0xab53*/ 1113,
+      /*0x03f3*/ 291,
+      -1, -1,
+      /*0x2c65*/ 901,
+      -1, -1, -1, -1, -1,
+      /*0xa66b*/ 1022,
+      -1, -1,
+      /*0xa76d*/ 1074,
+      /*0x0582*/ 475,
+      -1, -1,
+      /*0x13d5*/ 579,
+      /*0x0455*/ 331,
+      /*0x04d5*/ 396,
+      -1, -1, -1,
+      /*0x1e55*/ 658,
+      /*0x1ed5*/ 717,
+      /*0x0155*/ 96,
+      /*0x2cd5*/ 950,
+      -1,
+      /*0x01eb*/ 157,
+      -1,
+      /*0xa7d7*/ 1109,
+      /*0x24d5*/ 831,
+      /*0x10598*/ 1217,
+      /*0x0257*/ 206,
+      /*0x1059e*/ 1223,
+      -1,
+      /*0x0586*/ 479,
+      -1,
+      /*0xa753*/ 1061,
+      /*0x2c5b*/ 895,
+      /*0x10ced*/ 1296,
+      -1, -1,
+      /*0x0561*/ 442,
+      /*0xa657*/ 1012,
+      /*0x10ed*/ 509,
+      /*0x1f57*/ 778,
+      -1, -1,
+      /*0x105a0*/ 1225,
+      -1, -1,
+      /*0x051b*/ 431,
+      -1,
+      /*0x2c59*/ 893,
+      -1, -1,
+      /*0x050b*/ 423,
+      -1,
+      /*0x026f*/ 221,
+      -1, -1, -1,
+      /*0xa791*/ 1084,
+      -1,
+      /*0x10cd3*/ 1270,
+      /*0x0211*/ 174,
+      /*0x0563*/ 444,
+      /*0x13ea*/ 600,
+      /*0x2c5f*/ 899,
+      /*0x10d3*/ 483,
+      /*0x006a*/ 8,
+      -1,
+      /*0x104ea*/ 1198,
+      /*0x13cd*/ 571,
+      /*0x044d*/ 323,
+      /*0x118db*/ 1351,
+      /*0x0565*/ 446,
+      /*0x1044d*/ 1177,
+      /*0x1f11*/ 748,
+      /*0x1e4d*/ 654,
+      /*0x1ecd*/ 713,
+      /*0x014d*/ 92,
+      /*0x2ccd*/ 946,
+      -1, -1,
+      /*0xa7d1*/ 1108,
+      /*0x0569*/ 450,
+      /*0x01ef*/ 159,
+      /*0x0251*/ 201,
+      -1,
+      /*0x118d9*/ 1349,
+      -1,
+      /*0x03cd*/ 275,
+      -1, -1,
+      /*0x1f00*/ 739,
+      /*0x0567*/ 448,
+      /*0x2c5d*/ 897,
+      -1,
+      /*0xa651*/ 1009,
+      /*0x10f3*/ 515,
+      /*0x1f51*/ 775,
+      /*0xa794*/ 1086,
+      /*0xa755*/ 1062,
+      -1,
+      /*0x118df*/ 1355,
+      -1,
+      /*0x105a6*/ 1230,
+      /*0x13c3*/ 561,
+      /*0x0443*/ 313,
+      -1,
+      /*0x0180*/ 117,
+      /*0x10443*/ 1167,
+      -1,
+      /*0x1e43*/ 649,
+      /*0x1ec3*/ 708,
+      /*0x10d84*/ 1322,
+      /*0x2cc3*/ 941,
+      /*0x1f14*/ 751,
+      /*0x13c1*/ 559,
+      /*0x0441*/ 311,
+      -1, -1,
+      /*0x10441*/ 1165,
+      -1,
+      /*0x1e41*/ 648,
+      /*0x1ec1*/ 707,
+      /*0x03c3*/ 265,
+      /*0x2cc1*/ 940,
+      -1,
+      /*0x10cd5*/ 1272,
+      -1, -1, -1,
+      /*0x118dd*/ 1353,
+      /*0x10d5*/ 485,
+      -1, -1,
+      /*0x03c1*/ 264,
+      /*0x13cf*/ 573,
+      /*0x044f*/ 325,
+      /*0x04cf*/ 393,
+      -1,
+      /*0x1044f*/ 1179,
+      -1,
+      /*0x1e4f*/ 655,
+      /*0x1ecf*/ 714,
+      /*0x014f*/ 93,
+      /*0x2ccf*/ 947,
+      /*0x13cb*/ 569,
+      /*0x044b*/ 321,
+      -1, -1,
+      /*0x1044b*/ 1175,
+      -1,
+      /*0x1e4b*/ 653,
+      /*0x1ecb*/ 712,
+      /*0x014b*/ 91,
+      /*0x2ccb*/ 945,
+      -1,
+      /*0xa74d*/ 1058,
+      -1,
+      /*0x2c57*/ 891,
+      /*0x13c9*/ 567,
+      /*0x0449*/ 319,
+      /*0x2d16*/ 983,
+      /*0xa66d*/ 1023,
+      /*0x10449*/ 1173,
+      /*0x03cb*/ 273,
+      /*0x1e49*/ 652,
+      /*0x1ec9*/ 711,
+      -1,
+      /*0x2cc9*/ 944,
+      /*0x2d0a*/ 971,
+      /*0x2d1b*/ 988,
+      /*0x105ae*/ 1238,
+      /*0x2d08*/ 969,
+      -1,
+      /*0x2d0c*/ 973,
+      /*0x2d0b*/ 972,
+      /*0x0253*/ 203,
+      /*0x10cea*/ 1293,
+      /*0x03c9*/ 271,
+      -1,
+      /*0x01ed*/ 158,
+      /*0x13ee*/ 604,
+      /*0x10ea*/ 506,
+      /*0x10ccd*/ 1264,
+      /*0x006e*/ 12,
+      /*0x1f22*/ 755,
+      /*0x104ee*/ 1202,
+      /*0xa653*/ 1010,
+      -1,
+      /*0x1f53*/ 776,
+      /*0x2cee*/ 959,
+      /*0xa743*/ 1053,
+      -1, -1,
+      /*0x2d02*/ 963,
+      /*0x118d7*/ 1347,
+      -1,
+      /*0x056b*/ 452,
+      /*0x13f1*/ 607,
+      /*0x0471*/ 350,
+      /*0x04f1*/ 410,
+      /*0x0071*/ 15,
+      /*0xa741*/ 1052,
+      /*0x104f1*/ 1205,
+      /*0x1e71*/ 672,
+      /*0x1ef1*/ 731,
+      /*0x0171*/ 110,
+      /*0x2d12*/ 979,
+      -1,
+      /*0x2d18*/ 985,
+      -1,
+      /*0x2d1e*/ 991,
+      /*0x1f04*/ 743,
+      -1,
+      /*0x2c51*/ 885,
+      -1,
+      /*0x2d06*/ 967,
+      /*0x01a8*/ 131,
+      /*0x10cc3*/ 1254,
+      /*0x0580*/ 473,
+      /*0x1f73*/ 790,
+      -1,
+      /*0xa74f*/ 1059,
+      -1,
+      /*0x019a*/ 125,
+      -1,
+      /*0x2d20*/ 993,
+      /*0x105aa*/ 1234,
+      -1,
+      /*0x10cc1*/ 1252,
+      -1, -1,
+      /*0xa74b*/ 1057,
+      /*0x13b7*/ 549,
+      /*0x0437*/ 301,
+      /*0x04b7*/ 381,
+      /*0x01f3*/ 160,
+      /*0x10437*/ 1155,
+      -1,
+      /*0x1e37*/ 643,
+      /*0x1eb7*/ 702,
+      /*0x0137*/ 82,
+      /*0x2cb7*/ 935,
+      -1,
+      /*0x00e1*/ 26,
+      -1,
+      /*0xa749*/ 1056,
+      /*0x2d10*/ 977,
+      -1,
+      /*0x10ccf*/ 1266,
+      -1,
+      /*0x118d1*/ 1341,
+      /*0x03b7*/ 254,
+      /*0xa655*/ 1011,
+      /*0x1e926*/ 1392,
+      /*0x1f55*/ 777,
+      -1,
+      /*0x056f*/ 456,
+      -1,
+      /*0x10ccb*/ 1262,
+      -1, -1, -1,
+      /*0x13a5*/ 531,
+      /*0x0511*/ 426,
+      /*0x04a5*/ 372,
+      -1, -1,
+      /*0x00e3*/ 28,
+      /*0x1e25*/ 634,
+      /*0x1ea5*/ 693,
+      /*0x0125*/ 74,
+      /*0x2ca5*/ 926,
+      /*0x10cc9*/ 1260,
+      /*0x13f5*/ 611,
+      /*0x0475*/ 352,
+      /*0x04f5*/ 412,
+      /*0x0075*/ 19,
+      /*0x00e5*/ 30,
+      /*0x104f5*/ 1209,
+      /*0x1e75*/ 674,
+      /*0x1ef5*/ 733,
+      /*0x0175*/ 112,
+      /*0x13b5*/ 547,
+      /*0x0435*/ 299,
+      /*0x04b5*/ 380,
+      -1,
+      /*0x10435*/ 1153,
+      /*0x00e9*/ 34,
+      /*0x1e35*/ 642,
+      /*0x1eb5*/ 701,
+      /*0x0135*/ 81,
+      /*0x2cb5*/ 934,
+      /*0x026a*/ 218,
+      /*0x16e61*/ 1357,
+      /*0x10cee*/ 1297,
+      /*0xa7cd*/ 1107,
+      -1,
+      /*0x00e7*/ 32,
+      /*0x024d*/ 198,
+      /*0x10ee*/ 510,
+      -1,
+      /*0x03b5*/ 252,
+      -1, -1,
+      /*0x105ac*/ 1236,
+      /*0x2c53*/ 887,
+      /*0x13b3*/ 545,
+      /*0x0433*/ 297,
+      /*0x04b3*/ 379,
+      /*0xa64d*/ 1007,
+      /*0x10433*/ 1151,
+      /*0x10cf1*/ 1300,
+      /*0x1e33*/ 641,
+      /*0x1eb3*/ 700,
+      /*0x0133*/ 80,
+      /*0x2cb3*/ 933,
+      /*0x10f1*/ 513,
+      /*0x16e63*/ 1359,
+      -1,
+      /*0xa737*/ 1047,
+      -1,
+      /*0x1e92e*/ 1400,
+      -1, -1, -1,
+      /*0x03b3*/ 250,
+      /*0x1fe1*/ 806,
+      /*0x16e65*/ 1361,
+      /*0x0481*/ 358,
+      -1,
+      /*0xa7c3*/ 1104,
+      /*0x105a8*/ 1232,
+      /*0x1e01*/ 616,
+      /*0x1e81*/ 680,
+      /*0x0101*/ 56,
+      /*0x2c81*/ 908,
+      /*0x2c73*/ 906,
+      /*0x16e69*/ 1365,
+      /*0x1059a*/ 1219,
+      /*0x0584*/ 477,
+      /*0x2173*/ 812,
+      /*0xa7c1*/ 1103,
+      /*0x118d3*/ 1343,
+      /*0x13a4*/ 530,
+      /*0xa643*/ 1002,
+      -1,
+      /*0x1f43*/ 772,
+      /*0x16e67*/ 1363,
+      -1,
+      /*0xa725*/ 1039,
+      -1, -1, -1,
+      /*0x056d*/ 454,
+      -1,
+      /*0xa641*/ 1001,
+      -1,
+      /*0x1f41*/ 770,
+      -1,
+      /*0x13ad*/ 539,
+      /*0x1fe5*/ 807,
+      /*0x04ad*/ 376,
+      -1,
+      /*0x1042d*/ 1145,
+      /*0x024f*/ 199,
+      /*0x1e2d*/ 638,
+      /*0x1ead*/ 697,
+      /*0x012d*/ 78,
+      /*0x2cad*/ 930,
+      /*0xa735*/ 1046,
+      -1,
+      /*0x2c55*/ 889,
+      -1, -1,
+      /*0x024b*/ 197,
+      /*0xa64f*/ 1008,
+      -1,
+      /*0x1e92a*/ 1396,
+      /*0x03ad*/ 245,
+      -1, -1, -1,
+      /*0x10d73*/ 1305,
+      -1, -1,
+      /*0xa64b*/ 1006,
+      /*0x2d11*/ 978,
+      -1,
+      /*0x0249*/ 196,
+      /*0x13a3*/ 529,
+      -1,
+      /*0x04a3*/ 371,
+      /*0x10f5*/ 517,
+      /*0xa733*/ 1045,
+      -1,
+      /*0x1e23*/ 633,
+      /*0x1ea3*/ 692,
+      /*0x0123*/ 73,
+      /*0x2ca3*/ 925,
+      /*0xa649*/ 1005,
+      /*0x2d0e*/ 975,
+      -1,
+      /*0x00eb*/ 36,
+      /*0x2d00*/ 961,
+      /*0x13a7*/ 533,
+      -1,
+      /*0x04a7*/ 373,
+      -1,
+      /*0x118d5*/ 1345,
+      /*0x0573*/ 460,
+      /*0x1e27*/ 635,
+      /*0x1ea7*/ 694,
+      /*0x0127*/ 75,
+      /*0x2ca7*/ 927,
+      /*0x13bf*/ 557,
+      /*0x043f*/ 309,
+      /*0x04bf*/ 385,
+      /*0x01c9*/ 140,
+      /*0x1043f*/ 1163,
+      -1,
+      /*0x1e3f*/ 647,
+      /*0x1ebf*/ 706,
+      /*0x2c6a*/ 904,
+      /*0x2cbf*/ 939,
+      -1, -1,
+      /*0x2d14*/ 981,
+      /*0x0271*/ 222,
+      /*0x2c4d*/ 881,
+      -1,
+      /*0x13b9*/ 551,
+      /*0x0439*/ 303,
+      /*0x04b9*/ 382,
+      /*0x03bf*/ 262,
+      /*0x10439*/ 1157,
+      -1,
+      /*0x1e39*/ 644,
+      /*0x1eb9*/ 703,
+      -1,
+      /*0x2cb9*/ 936,
+      /*0x1f71*/ 788,
+      /*0x13b1*/ 543,
+      /*0x0431*/ 295,
+      /*0x04b1*/ 378,
+      -1,
+      /*0x10431*/ 1149,
+      /*0xa72d*/ 1043,
+      /*0x1e31*/ 640,
+      /*0x1eb1*/ 699,
+      /*0x03b9*/ 256,
+      /*0x2cb1*/ 932,
+      -1,
+      /*0x16e6b*/ 1367,
+      /*0x13c0*/ 558,
+      /*0x0440*/ 310,
+      /*0x1e92c*/ 1398,
+      -1,
+      /*0x10440*/ 1164,
+      -1,
+      /*0xa7b7*/ 1098,
+      /*0x03b1*/ 248,
+      /*0x0140*/ 86,
+      /*0x00ef*/ 40,
+      /*0x2c43*/ 871,
+      -1,
+      /*0x118cd*/ 1337,
+      /*0x1e922*/ 1388,
+      -1, -1,
+      /*0x10d81*/ 1319,
+      -1, -1,
+      /*0x03c0*/ 263,
+      -1,
+      /*0x2c41*/ 869,
+      /*0x1f37*/ 768,
+      /*0xa723*/ 1038,
+      -1, -1,
+      /*0x13c7*/ 565,
+      /*0x0447*/ 317,
+      -1,
+      /*0x1e928*/ 1394,
+      /*0x10447*/ 1171,
+      -1,
+      /*0x1e47*/ 651,
+      /*0x1ec7*/ 710,
+      -1,
+      /*0x2cc7*/ 943,
+      /*0xa7a5*/ 1094,
+      -1,
+      /*0xa727*/ 1040,
+      /*0x0225*/ 183,
+      -1,
+      /*0x2c4f*/ 883,
+      /*0x056a*/ 451,
+      -1,
+      /*0x2d22*/ 995,
+      /*0x03c7*/ 269,
+      -1,
+      /*0x118c3*/ 1327,
+      /*0xa73f*/ 1051,
+      -1,
+      /*0x0275*/ 224,
+      /*0x2c4b*/ 879,
+      /*0x1f25*/ 758,
+      /*0x13c2*/ 560,
+      /*0x0442*/ 312,
+      /*0x04c2*/ 386,
+      /*0xa7b5*/ 1097,
+      /*0x10442*/ 1166,
+      /*0x118c1*/ 1325,
+      /*0x16e6f*/ 1371,
+      -1,
+      /*0x0142*/ 87,
+      -1,
+      /*0x1f75*/ 792,
+      /*0xa739*/ 1048,
+      /*0x2c49*/ 877,
+      -1,
+      /*0x2d1a*/ 987,
+      /*0x01a5*/ 130,
+      /*0x048f*/ 361,
+      -1,
+      /*0x2d04*/ 965,
+      /*0x1f35*/ 766,
+      /*0x1e0f*/ 623,
+      /*0x1e8f*/ 687,
+      /*0x010f*/ 63,
+      /*0x2c8f*/ 915,
+      /*0xa69b*/ 1037,
+      /*0x118cf*/ 1339,
+      /*0x01f5*/ 161,
+      -1,
+      /*0x1059c*/ 1221,
+      /*0xa68b*/ 1029,
+      /*0x0233*/ 190,
+      /*0xff59*/ 1138,
+      /*0x13c5*/ 563,
+      /*0x0445*/ 315,
+      -1,
+      /*0x118cb*/ 1335,
+      /*0x10445*/ 1169,
+      -1,
+      /*0x1e45*/ 650,
+      /*0x1ec5*/ 709,
+      -1,
+      /*0x2cc5*/ 942,
+      -1,
+      /*0x1f33*/ 764,
+      -1, -1, -1,
+      /*0xa781*/ 1079,
+      -1,
+      /*0x118c9*/ 1333,
+      /*0x0201*/ 166,
+      /*0x03c5*/ 267,
+      -1,
+      /*0x00ed*/ 38,
+      -1,
+      /*0x2171*/ 810,
+      -1, -1,
+      /*0x0373*/ 239,
+      -1,
+      /*0xa747*/ 1055,
+      /*0x10cc0*/ 1251,
+      /*0x13f2*/ 608,
+      /*0x1f01*/ 740,
+      -1,
+      /*0x0072*/ 16,
+      /*0x0078*/ 22,
+      /*0x104f2*/ 1206,
+      /*0x104f8*/ 1212,
+      /*0x1fd1*/ 804,
+      /*0x13bd*/ 555,
+      /*0x043d*/ 307,
+      /*0x04bd*/ 384,
+      -1,
+      /*0x1043d*/ 1161,
+      -1,
+      /*0x1e3d*/ 646,
+      /*0x1ebd*/ 705,
+      -1,
+      /*0x2cbd*/ 938,
+      /*0x1f24*/ 757,
+      /*0x03f2*/ 290,
+      /*0x03f8*/ 292,
+      /*0x022d*/ 187,
+      -1, -1,
+      /*0x2c37*/ 859,
+      /*0x10cc7*/ 1258,
+      -1,
+      /*0x03bd*/ 260,
+      -1, -1,
+      /*0x13bb*/ 553,
+      /*0x043b*/ 305,
+      /*0x04bb*/ 383,
+      -1,
+      /*0x1043b*/ 1159,
+      /*0x10d71*/ 1303,
+      /*0x1e3b*/ 645,
+      /*0x1ebb*/ 704,
+      /*0x105b7*/ 1246,
+      /*0x2cbb*/ 937,
+      -1,
+      /*0x16e6d*/ 1369,
+      -1, -1, -1,
+      /*0x056e*/ 455,
+      -1,
+      /*0x00f3*/ 44,
+      /*0xa7a3*/ 1093,
+      /*0x03bb*/ 258,
+      /*0x01ad*/ 132,
+      /*0x0223*/ 182,
+      /*0x10cc2*/ 1253,
+      /*0x1e05*/ 618,
+      /*0x1e85*/ 682,
+      /*0x0105*/ 58,
+      /*0x2c85*/ 910,
+      /*0xa745*/ 1054,
+      -1, -1,
+      /*0x1e943*/ 1421,
+      -1,
+      /*0x0571*/ 458,
+      /*0xa7a7*/ 1095,
+      /*0x1f23*/ 756,
+      -1,
+      /*0x0227*/ 184,
+      -1,
+      /*0x105a5*/ 1229,
+      /*0x2175*/ 814,
+      -1,
+      /*0x1e941*/ 1419,
+      -1,
+      /*0xa7bf*/ 1102,
+      /*0x2c35*/ 857,
+      -1,
+      /*0x023f*/ 192,
+      -1,
+      /*0xff57*/ 1136,
+      /*0x1f27*/ 760,
+      /*0x01a3*/ 129,
+      /*0x0479*/ 354,
+      /*0x04f9*/ 414,
+      /*0x0079*/ 23,
+      /*0x10cc5*/ 1256,
+      /*0x104f9*/ 1213,
+      /*0x1e79*/ 676,
+      /*0x1ef9*/ 735,
+      /*0x105b5*/ 1244,
+      /*0xa7b9*/ 1099,
+      /*0x1d79*/ 613,
+      -1, -1, -1, -1,
+      /*0xa73d*/ 1050,
+      -1,
+      /*0x16e73*/ 1375,
+      /*0x2c33*/ 855,
+      -1,
+      /*0x0076*/ 20,
+      -1,
+      /*0x104f6*/ 1210,
+      /*0x0231*/ 189,
+      -1,
+      /*0x01bf*/ 138,
+      -1, -1, -1, -1, -1,
+      /*0x10d75*/ 1307,
+      /*0x105b3*/ 1242,
+      -1,
+      /*0x10cf2*/ 1301,
+      /*0x0240*/ 193,
+      /*0x1f31*/ 762,
+      /*0xa73b*/ 1049,
+      -1,
+      /*0x10f2*/ 514,
+      /*0x10f8*/ 520,
+      /*0x01b9*/ 136,
+      -1, -1, -1, -1, -1,
+      /*0x0525*/ 436,
+      /*0x1f40*/ 769,
+      /*0x0581*/ 474,
+      /*0x047d*/ 356,
+      /*0x04fd*/ 416,
+      -1,
+      /*0x00ea*/ 35,
+      /*0xff51*/ 1130,
+      /*0x1e7d*/ 678,
+      /*0x1efd*/ 737,
+      -1,
+      /*0x0575*/ 462,
+      /*0x1d7d*/ 614,
+      -1,
+      /*0x0247*/ 195,
+      -1, -1, -1, -1, -1, -1,
+      /*0x2d1c*/ 989,
+      /*0x105a4*/ 1228,
+      -1,
+      /*0x13af*/ 541,
+      /*0xa647*/ 1004,
+      /*0x04af*/ 377,
+      -1,
+      /*0x1042f*/ 1147,
+      -1,
+      /*0x1e2f*/ 639,
+      /*0x1eaf*/ 698,
+      /*0x012f*/ 79,
+      /*0x2caf*/ 931,
+      -1,
+      /*0x007a*/ 24,
+      -1,
+      /*0x104fa*/ 1214,
+      /*0x105ad*/ 1237,
+      -1,
+      /*0x017a*/ 114,
+      /*0x0242*/ 194,
+      /*0x13a9*/ 535,
+      /*0x03af*/ 247,
+      /*0x04a9*/ 374,
+      -1,
+      /*0x10429*/ 1141,
+      -1,
+      /*0x1e29*/ 636,
+      /*0x1ea9*/ 695,
+      /*0x0129*/ 76,
+      /*0x2ca9*/ 928,
+      /*0xa691*/ 1032,
+      -1,
+      /*0x1f42*/ 771,
+      /*0x020f*/ 173,
+      /*0x16e6a*/ 1366,
+      /*0x1e03*/ 617,
+      /*0x1e83*/ 681,
+      /*0x0103*/ 57,
+      /*0x2c83*/ 909,
+      -1,
+      /*0x1e937*/ 1409,
+      /*0x10d85*/ 1323,
+      /*0x0501*/ 418,
+      -1, -1, -1,
+      /*0x105a3*/ 1227,
+      /*0x047b*/ 355,
+      /*0x04fb*/ 415,
+      -1,
+      /*0x10f9*/ 521,
+      /*0x104fb*/ 1215,
+      /*0x1e7b*/ 677,
+      /*0x1efb*/ 736,
+      -1, -1, -1,
+      /*0x2c3f*/ 867,
+      -1, -1, -1,
+      /*0x105a7*/ 1231,
+      /*0xa645*/ 1003,
+      -1,
+      /*0x1f45*/ 774,
+      /*0x03fb*/ 293,
+      /*0x13e6*/ 596,
+      /*0x10f6*/ 518,
+      /*0x0371*/ 238,
+      /*0x0066*/ 5,
+      /*0x1e925*/ 1391,
+      /*0x104e6*/ 1194,
+      /*0x0499*/ 366,
+      /*0x2c39*/ 861,
+      -1,
+      /*0x052d*/ 440,
+      /*0x1e19*/ 628,
+      /*0xff53*/ 1132,
+      /*0x0119*/ 68,
+      /*0x2c99*/ 920,
+      /*0x24e6*/ 848,
+      /*0x0272*/ 223,
+      -1, -1,
+      /*0x2c31*/ 853,
+      -1,
+      /*0xa7bd*/ 1101,
+      /*0x105b9*/ 1248,
+      -1,
+      /*0xa72f*/ 1044,
+      /*0x1e935*/ 1407,
+      -1, -1, -1,
+      /*0x1f72*/ 789,
+      /*0x1f78*/ 795,
+      /*0x2c40*/ 868,
+      /*0xa77a*/ 1076,
+      /*0x105b1*/ 1241,
+      /*0x10fd*/ 523,
+      -1,
+      /*0x2d25*/ 998,
+      /*0x00ee*/ 39,
+      -1, -1,
+      /*0x0523*/ 435,
+      -1,
+      /*0xa729*/ 1041,
+      /*0xa7bb*/ 1100,
+      -1,
+      /*0x13f0*/ 606,
+      -1, -1,
+      /*0x0070*/ 14,
+      /*0x1e933*/ 1405,
+      /*0x104f0*/ 1204,
+      -1,
+      /*0x017c*/ 115,
+      /*0x01bd*/ 137,
+      /*0x00f1*/ 42,
+      /*0x0527*/ 437,
+      -1,
+      /*0x2c47*/ 875,
+      -1, -1,
+      /*0xa785*/ 1081,
+      -1, -1,
+      /*0x0205*/ 168,
+      /*0x10fa*/ 522,
+      /*0x0477*/ 353,
+      /*0x04f7*/ 413,
+      /*0x0077*/ 21,
+      /*0x118c0*/ 1324,
+      /*0x104f7*/ 1211,
+      /*0x1e77*/ 675,
+      /*0x1ef7*/ 734,
+      /*0x0177*/ 113,
+      /*0x13ab*/ 537,
+      -1,
+      /*0x04ab*/ 375,
+      /*0x1f05*/ 744,
+      /*0x1042b*/ 1143,
+      /*0xff55*/ 1134,
+      /*0x1e2b*/ 637,
+      /*0x1eab*/ 696,
+      /*0x012b*/ 77,
+      /*0x2cab*/ 929,
+      -1,
+      /*0x2c42*/ 870,
+      -1,
+      /*0x1e924*/ 1390,
+      /*0x16e6e*/ 1370,
+      -1, -1, -1, -1,
+      /*0x0185*/ 119,
+      -1,
+      /*0x118c7*/ 1331,
+      /*0x13ce*/ 572,
+      /*0x044e*/ 324,
+      /*0x04ce*/ 392,
+      -1,
+      /*0x1044e*/ 1178,
+      /*0x2d01*/ 962,
+      -1,
+      /*0x1e92d*/ 1399,
+      -1,
+      /*0x16e71*/ 1373,
+      /*0x0283*/ 228,
+      -1,
+      /*0x10d83*/ 1321,
+      -1,
+      /*0x1f79*/ 796,
+      /*0xa7f6*/ 1112,
+      -1, -1, -1,
+      /*0x03ce*/ 276,
+      /*0x10ce6*/ 1289,
+      /*0x2c45*/ 873,
+      /*0x2d24*/ 997,
+      -1,
+      /*0x13ec*/ 602,
+      /*0x10e6*/ 502,
+      /*0x118c2*/ 1326,
+      /*0x006c*/ 10,
+      -1,
+      /*0x104ec*/ 1200,
+      /*0x01f9*/ 162,
+      /*0x1f76*/ 793,
+      -1,
+      /*0x2cec*/ 958,
+      -1,
+      /*0x00f5*/ 46,
+      /*0xa77c*/ 1077,
+      /*0x1e923*/ 1389,
+      /*0x2d2d*/ 1000,
+      -1,
+      /*0xff4d*/ 1126,
+      /*0x047f*/ 357,
+      /*0x04ff*/ 417,
+      -1, -1, -1,
+      /*0x1e7f*/ 679,
+      /*0x1eff*/ 738,
+      /*0x13f4*/ 610,
+      -1,
+      /*0x027d*/ 225,
+      /*0x0074*/ 18,
+      /*0x1e927*/ 1393,
+      /*0x104f4*/ 1208,
+      -1,
+      /*0x2172*/ 811,
+      /*0x2178*/ 817,
+      -1,
+      /*0x118c5*/ 1329,
+      /*0x2c3d*/ 865,
+      -1, -1,
+      /*0x1e93f*/ 1417,
+      /*0x1f7d*/ 800,
+      /*0x10cf0*/ 1299,
+      /*0xa72b*/ 1042,
+      /*0x13d0*/ 574,
+      /*0x0450*/ 326,
+      /*0x2d23*/ 996,
+      /*0x10f0*/ 512,
+      -1, -1,
+      /*0x022f*/ 188,
+      -1, -1,
+      /*0xff43*/ 1116,
+      /*0x050f*/ 425,
+      -1,
+      /*0x1e939*/ 1411,
+      /*0x01fd*/ 164,
+      /*0x24d0*/ 826,
+      /*0x2c3b*/ 863,
+      -1,
+      /*0x2d27*/ 999,
+      -1,
+      /*0x16e75*/ 1377,
+      /*0xff41*/ 1114,
+      /*0xa7a9*/ 1096,
+      /*0x10f7*/ 519,
+      /*0x1e931*/ 1403,
+      /*0x0229*/ 185,
+      -1, -1,
+      /*0x1f7a*/ 797,
+      -1,
+      /*0x105bb*/ 1249,
+      /*0xa783*/ 1080,
+      /*0x10d72*/ 1304,
+      /*0x10d78*/ 1310,
+      /*0x0203*/ 167,
+      -1,
+      /*0x1e940*/ 1418,
+      /*0x2184*/ 825,
+      -1, -1, -1,
+      /*0xff4f*/ 1128,
+      -1, -1,
+      /*0x0585*/ 478,
+      -1,
+      /*0x13a1*/ 527,
+      /*0x1f03*/ 742,
+      /*0x04a1*/ 370,
+      /*0x10cce*/ 1265,
+      -1,
+      /*0xff4b*/ 1124,
+      /*0x1e21*/ 632,
+      /*0x1ea1*/ 691,
+      /*0x0121*/ 72,
+      /*0x2ca1*/ 924,
+      -1, -1, -1,
+      /*0x0572*/ 459,
+      /*0x0578*/ 465,
+      -1,
+      /*0xa77f*/ 1078,
+      /*0x0183*/ 118,
+      /*0x1f7b*/ 798,
+      /*0xff49*/ 1122,
+      -1, -1, -1, -1,
+      /*0x2179*/ 818,
+      /*0x0266*/ 215,
+      /*0xa799*/ 1088,
+      /*0x10cec*/ 1295,
+      -1,
+      /*0x0219*/ 178,
+      /*0x13e8*/ 598,
+      -1,
+      /*0x10ec*/ 508,
+      /*0x0068*/ 7,
+      /*0x01fb*/ 163,
+      /*0x104e8*/ 1196,
+      -1,
+      /*0x2c76*/ 907,
+      /*0x1f66*/ 785,
+      -1, -1,
+      /*0x2176*/ 815,
+      -1,
+      /*0x1e942*/ 1420,
+      /*0x24e8*/ 850,
+      -1, -1,
+      /*0x13e4*/ 594,
+      /*0x10ff*/ 525,
+      -1,
+      /*0x0064*/ 3,
+      -1,
+      /*0x104e4*/ 1192,
+      -1, -1, -1,
+      /*0x10f4*/ 516,
+      -1,
+      /*0x0199*/ 124,
+      -1,
+      /*0x0505*/ 420,
+      /*0x24e4*/ 846,
+      -1, -1, -1,
+      /*0x13e2*/ 592,
+      /*0x10d79*/ 1311,
+      -1,
+      /*0x0062*/ 1,
+      /*0x10cd0*/ 1267,
+      /*0x104e2*/ 1190,
+      -1, -1,
+      /*0x217d*/ 822,
+      /*0x10d0*/ 480,
+      -1,
+      /*0x13c8*/ 566,
+      /*0x0448*/ 318,
+      /*0x04c8*/ 389,
+      /*0x24e2*/ 844,
+      /*0x10448*/ 1172,
+      /*0x1f7c*/ 799,
+      /*0x1f70*/ 787,
+      /*0x10d76*/ 1308,
+      /*0x0148*/ 90,
+      /*0x0495*/ 364,
+      -1, -1,
+      /*0x2d0f*/ 976,
+      /*0x1e15*/ 626,
+      /*0x1e95*/ 690,
+      /*0x0115*/ 66,
+      /*0x2c95*/ 918,
+      /*0x0579*/ 466,
+      -1,
+      /*0x03c8*/ 270,
+      -1,
+      /*0x022b*/ 186,
+      /*0x13c6*/ 564,
+      /*0x0446*/ 316,
+      /*0x04c6*/ 388,
+      /*0x1f77*/ 794,
+      /*0x10446*/ 1170,
+      /*0x217a*/ 819,
+      /*0x13e0*/ 590,
+      /*0x105af*/ 1239,
+      /*0x0146*/ 89,
+      /*0x13de*/ 588,
+      /*0x045e*/ 340,
+      /*0x104e0*/ 1188,
+      /*0x0576*/ 463,
+      -1,
+      /*0x104de*/ 1186,
+      /*0x1e93d*/ 1415,
+      -1,
+      /*0x10d7d*/ 1315,
+      -1,
+      /*0x03c6*/ 268,
+      /*0x24e0*/ 842,
+      -1,
+      /*0x017e*/ 116,
+      /*0x24de*/ 840,
+      -1,
+      /*0x105a9*/ 1233,
+      -1, -1,
+      /*0x13b0*/ 542,
+      /*0x0430*/ 294,
+      -1,
+      /*0x0583*/ 476,
+      /*0x10430*/ 1148,
+      -1,
+      /*0x13c4*/ 562,
+      /*0x0444*/ 314,
+      /*0x04c4*/ 387,
+      /*0x1e93b*/ 1413,
+      /*0x10444*/ 1168,
+      -1, -1,
+      /*0x217b*/ 820,
+      /*0x0144*/ 88,
+      -1,
+      /*0x057d*/ 470,
+      /*0x026c*/ 220,
+      /*0x10ce8*/ 1291,
+      /*0x10d7a*/ 1312,
+      /*0x13bc*/ 554,
+      /*0x043c*/ 306,
+      /*0x01ce*/ 142,
+      /*0x10e8*/ 504,
+      /*0x1043c*/ 1160,
+      /*0x03c4*/ 266,
+      /*0x0493*/ 363,
+      -1,
+      /*0x013c*/ 84,
+      /*0x2c66*/ 902,
+      /*0x1e13*/ 625,
+      /*0x1e93*/ 689,
+      /*0x0113*/ 65,
+      /*0x2c93*/ 917,
+      -1,
+      /*0x10ce4*/ 1287,
+      -1, -1,
+      /*0x052f*/ 441,
+      /*0x03bc*/ 259,
+      /*0x10e4*/ 500,
+      /*0x1e07*/ 619,
+      /*0x1e87*/ 683,
+      /*0x0107*/ 59,
+      /*0x2c87*/ 911,
+      -1,
+      /*0x057a*/ 467,
+      /*0x10599*/ 1218,
+      -1,
+      /*0x1fb1*/ 802,
+      -1, -1, -1,
+      /*0x10ce2*/ 1285,
+      /*0x1f74*/ 791,
+      /*0x10d7b*/ 1313,
+      /*0x0529*/ 438,
+      /*0x2d05*/ 966,
+      /*0x10e2*/ 498,
+      /*0x0250*/ 200,
+      -1, -1,
+      /*0x01ff*/ 165,
+      -1,
+      /*0x10cc8*/ 1259,
+      /*0x0503*/ 419,
+      -1,
+      /*0x13dc*/ 586,
+      /*0x045c*/ 338,
+      -1, -1, -1,
+      /*0x104dc*/ 1184,
+      -1, -1, -1,
+      /*0x217c*/ 821,
+      /*0x2170*/ 809,
+      -1, -1, -1,
+      /*0x24dc*/ 838,
+      /*0x057b*/ 468,
+      -1,
+      /*0x13da*/ 584,
+      /*0x045a*/ 336,
+      /*0x10cc6*/ 1257,
+      -1,
+      /*0x01d0*/ 143,
+      /*0x104da*/ 1182,
+      -1, -1,
+      /*0x10ce0*/ 1283,
+      /*0x00f2*/ 43,
+      /*0x00f8*/ 48,
+      /*0x10cde*/ 1281,
+      /*0x2177*/ 816,
+      /*0x10e0*/ 496,
+      /*0x24da*/ 836,
+      -1,
+      /*0x10de*/ 494,
+      /*0xa7a1*/ 1092,
+      /*0x0566*/ 447,
+      /*0x0497*/ 365,
+      -1,
+      /*0x10fe*/ 524,
+      /*0x0519*/ 430,
+      /*0x1e17*/ 627,
+      -1,
+      /*0x0117*/ 67,
+      /*0x2c97*/ 919,
+      /*0x13d8*/ 582,
+      /*0x0458*/ 334,
+      -1, -1,
+      /*0x105ab*/ 1235,
+      /*0x104d8*/ 1180,
+      /*0x1f21*/ 754,
+      /*0x10d7c*/ 1314,
+      /*0x10d70*/ 1302,
+      /*0x10cc4*/ 1255,
+      -1, -1,
+      /*0x2c4e*/ 882,
+      -1,
+      /*0x24d8*/ 834,
+      -1,
+      /*0x214e*/ 808,
+      -1,
+      /*0xa681*/ 1024,
+      /*0x1e92f*/ 1401,
+      -1, -1,
+      /*0x01a1*/ 128,
+      /*0x0268*/ 216,
+      -1, -1, -1,
+      /*0x10d77*/ 1309,
+      -1, -1,
+      /*0x13d6*/ 580,
+      /*0x0456*/ 332,
+      /*0x16e72*/ 1374,
+      /*0x16e78*/ 1380,
+      /*0x057c*/ 469,
+      /*0x0570*/ 457,
+      /*0x2c6c*/ 905,
+      /*0x1e929*/ 1395,
+      /*0x13d4*/ 578,
+      /*0x0454*/ 330,
+      /*0x0264*/ 213,
+      -1, -1, -1,
+      /*0x24d6*/ 832,
+      /*0x13d2*/ 576,
+      /*0x0452*/ 328,
+      -1, -1,
+      /*0x118ce*/ 1338,
+      -1, -1,
+      /*0x24d4*/ 830,
+      /*0x1f64*/ 783,
+      /*0x0577*/ 464,
+      -1,
+      /*0x217f*/ 824,
+      -1, -1,
+      /*0x24d2*/ 828,
+      /*0x037d*/ 243,
+      -1,
+      /*0x00f9*/ 49,
+      /*0x052b*/ 439,
+      /*0x2174*/ 813,
+      /*0x0287*/ 229,
+      /*0xa7c8*/ 1105,
+      -1, -1, -1,
+      /*0x10cdc*/ 1279,
+      /*0x1f62*/ 781,
+      -1, -1, -1,
+      /*0x10dc*/ 492,
+      /*0x0215*/ 176,
+      /*0x2d03*/ 964,
+      /*0x2c50*/ 884,
+      /*0x00f6*/ 47,
+      -1,
+      /*0x13cc*/ 570,
+      /*0x044c*/ 322,
+      /*0x04cc*/ 391,
+      /*0x049d*/ 368,
+      /*0x1044c*/ 1176,
+      -1,
+      /*0x10cda*/ 1277,
+      /*0x1e1d*/ 630,
+      /*0x1f15*/ 752,
+      /*0x011d*/ 70,
+      /*0x2c9d*/ 922,
+      /*0x10da*/ 490,
+      /*0x1e09*/ 620,
+      /*0x1e89*/ 684,
+      /*0x0109*/ 60,
+      /*0x2c89*/ 912,
+      /*0x0260*/ 210,
+      /*0x10d7f*/ 1317,
+      -1,
+      /*0x03cc*/ 274,
+      -1, -1,
+      /*0xff47*/ 1120,
+      -1,
+      /*0x0195*/ 123,
+      /*0x10d74*/ 1306,
+      -1, -1,
+      /*0x056c*/ 453,
+      /*0x1f60*/ 779,
+      /*0x00fd*/ 53,
+      /*0x16e79*/ 1381,
+      -1,
+      /*0x10cd8*/ 1275,
+      /*0x118d0*/ 1340,
+      -1, -1,
+      /*0x2d19*/ 986,
+      /*0x10d8*/ 488,
+      /*0x01c6*/ 139,
+      -1, -1,
+      /*0x13b6*/ 548,
+      /*0x0436*/ 300,
+      /*0x057f*/ 472,
+      /*0x037b*/ 241,
+      /*0x10436*/ 1154,
+      -1,
+      /*0x16e76*/ 1378,
+      /*0xff42*/ 1115,
+      -1,
+      /*0x1f30*/ 761,
+      /*0x0574*/ 461,
+      -1, -1, -1,
+      /*0x105a1*/ 1226,
+      /*0x1f44*/ 773,
+      /*0x023c*/ 191,
+      /*0xa793*/ 1085,
+      /*0x00fa*/ 50,
+      /*0x03b6*/ 253,
+      /*0x0213*/ 175,
+      /*0x10cd6*/ 1273,
+      -1, -1, -1,
+      /*0x01b0*/ 133,
+      /*0x10d6*/ 486,
+      -1,
+      /*0xa787*/ 1082,
+      /*0x10cd4*/ 1271,
+      /*0x2c68*/ 903,
+      /*0x0207*/ 169,
+      /*0x1e92b*/ 1397,
+      /*0x1f13*/ 750,
+      /*0x10d4*/ 484,
+      -1,
+      /*0x10cd2*/ 1269,
+      -1,
+      /*0x16e7d*/ 1385,
+      /*0xff45*/ 1118,
+      -1,
+      /*0x10d2*/ 482,
+      -1, -1,
+      /*0x1f07*/ 746,
+      /*0x13ca*/ 568,
+      /*0x044a*/ 320,
+      /*0x04ca*/ 390,
+      -1,
+      /*0x1044a*/ 1174,
+      -1,
+      /*0x13b4*/ 546,
+      /*0x0434*/ 298,
+      /*0x048d*/ 360,
+      /*0x00fb*/ 51,
+      /*0x10434*/ 1152,
+      -1,
+      /*0x1e0d*/ 622,
+      /*0x1e8d*/ 686,
+      /*0x010d*/ 62,
+      /*0x2c8d*/ 914,
+      /*0x13be*/ 556,
+      /*0x043e*/ 308,
+      /*0x025c*/ 209,
+      /*0x03ca*/ 272,
+      /*0x1043e*/ 1162,
+      /*0x037c*/ 242,
+      -1,
+      /*0x16e7a*/ 1382,
+      /*0x013e*/ 85,
+      /*0x03b4*/ 251,
+      /*0x049f*/ 369,
+      /*0x10ccc*/ 1263,
+      /*0x0521*/ 434,
+      /*0x00e6*/ 31,
+      /*0x1e1f*/ 631,
+      /*0x2c48*/ 876,
+      /*0x011f*/ 71,
+      /*0x2c9f*/ 923,
+      -1,
+      /*0x03be*/ 261,
+      -1, -1, -1, -1, -1,
+      /*0x0377*/ 240,
+      /*0x13ba*/ 552,
+      /*0x043a*/ 304,
+      /*0xa68f*/ 1031,
+      -1,
+      /*0x1043a*/ 1158,
+      /*0x01dc*/ 149,
+      -1,
+      /*0xa797*/ 1087,
+      /*0x013a*/ 83,
+      -1,
+      /*0x0217*/ 177,
+      /*0x2c46*/ 874,
+      -1,
+      /*0x029d*/ 236,
+      -1, -1,
+      /*0x0568*/ 449,
+      /*0x16e7b*/ 1383,
+      /*0x0289*/ 231,
+      /*0x03ba*/ 257,
+      /*0x2c5e*/ 898,
+      -1,
+      /*0x01da*/ 148,
+      -1,
+      /*0x13b8*/ 550,
+      /*0x0438*/ 302,
+      /*0x118c8*/ 1332,
+      -1,
+      /*0x10438*/ 1156,
+      /*0x217e*/ 823,
+      /*0x00fc*/ 52,
+      /*0x00f0*/ 41,
+      -1,
+      /*0x0564*/ 445,
+      -1, -1, -1,
+      /*0x16e66*/ 1362,
+      -1,
+      /*0x2c30*/ 852,
+      -1, -1, -1,
+      /*0x03b8*/ 255,
+      -1,
+      /*0x2c44*/ 872,
+      -1, -1,
+      /*0x118c6*/ 1330,
+      /*0x01d8*/ 147,
+      /*0x0256*/ 205,
+      /*0x0562*/ 443,
+      -1,
+      /*0x105b0*/ 1240,
+      -1, -1, -1,
+      /*0x118de*/ 1354,
+      /*0x0254*/ 204,
+      /*0x2c3c*/ 864,
+      -1, -1, -1, -1, -1,
+      /*0x0252*/ 202,
+      /*0x13b2*/ 544,
+      /*0x0432*/ 296,
+      -1,
+      /*0x0515*/ 428,
+      /*0x10432*/ 1150,
+      /*0x10d7e*/ 1316,
+      /*0x10cca*/ 1261,
+      /*0x105bc*/ 1250,
+      -1, -1, -1, -1, -1,
+      /*0x01d6*/ 146,
+      /*0x16e7c*/ 1384,
+      /*0x16e70*/ 1372,
+      /*0x118c4*/ 1328,
+      -1, -1,
+      /*0x03b2*/ 249,
+      -1,
+      /*0x01d4*/ 145,
+      -1, -1, -1, -1, -1, -1,
+      /*0x01d2*/ 144,
+      -1, -1,
+      /*0xa685*/ 1026,
+      /*0x057e*/ 471,
+      /*0xa79d*/ 1090,
+      /*0x16e77*/ 1379,
+      -1,
+      /*0x021d*/ 180,
+      -1, -1,
+      /*0x00ec*/ 37,
+      /*0x2c5c*/ 896,
+      /*0x0209*/ 170,
+      -1,
+      /*0x2d21*/ 994,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1,
+      /*0x00ff*/ 55,
+      -1,
+      /*0x2c5a*/ 894,
+      -1, -1, -1, -1, -1,
+      /*0x00f4*/ 45,
+      /*0x01cc*/ 141,
+      -1, -1, -1, -1, -1,
+      /*0x0513*/ 427,
+      -1, -1, -1, -1, -1, -1,
+      /*0x118dc*/ 1352,
+      -1, -1, -1,
+      /*0x0507*/ 421,
+      -1, -1,
+      /*0x2c58*/ 892,
+      -1, -1, -1,
+      /*0x10597*/ 1216,
+      /*0x16e6c*/ 1368,
+      /*0x1f36*/ 767,
+      -1, -1, -1,
+      /*0x118da*/ 1350,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1,
+      /*0x16e7f*/ 1387,
+      /*0x01b6*/ 135,
+      -1, -1, -1, -1, -1, -1,
+      /*0x16e74*/ 1376,
+      /*0x2c56*/ 890,
+      -1, -1, -1, -1,
+      /*0xa7ca*/ 1106,
+      -1,
+      /*0x118d8*/ 1348,
+      /*0x2c54*/ 888,
+      -1, -1, -1,
+      /*0x2d15*/ 982,
+      -1,
+      /*0x020d*/ 172,
+      /*0x2c52*/ 886,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1,
+      /*0x1e930*/ 1402,
+      -1, -1,
+      /*0x1f34*/ 765,
+      -1,
+      /*0xa79f*/ 1091,
+      -1, -1,
+      /*0x021f*/ 181,
+      /*0x0517*/ 429,
+      -1, -1, -1,
+      /*0x118d6*/ 1346,
+      -1, -1, -1, -1,
+      /*0x00e8*/ 33,
+      /*0x01b4*/ 134,
+      /*0x1e93c*/ 1414,
+      /*0x118d4*/ 1344,
+      -1, -1,
+      /*0xa683*/ 1025,
+      -1,
+      /*0x1fd0*/ 803,
+      /*0x2c4c*/ 880,
+      /*0x118d2*/ 1342,
+      -1, -1, -1, -1, -1, -1,
+      /*0x00e4*/ 29,
+      -1, -1, -1, -1, -1, -1,
+      /*0x1059d*/ 1222,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1,
+      /*0x00e2*/ 27,
+      -1,
+      /*0x2d13*/ 980,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1,
+      /*0x118cc*/ 1336,
+      /*0xa699*/ 1036,
+      /*0x2d07*/ 968,
+      -1,
+      /*0x16e68*/ 1364,
+      /*0x2c36*/ 858,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1,
+      /*0x105b6*/ 1245,
+      -1,
+      /*0x16e64*/ 1360,
+      -1,
+      /*0xff4e*/ 1127,
+      -1, -1, -1, -1,
+      /*0x00e0*/ 25,
+      -1, -1, -1, -1, -1, -1,
+      -1,
+      /*0x00fe*/ 54,
+      /*0x051d*/ 432,
+      -1,
+      /*0x16e62*/ 1358,
+      -1,
+      /*0x1f32*/ 763,
+      /*0x0509*/ 422,
+      -1, -1, -1, -1, -1, -1,
+      -1,
+      /*0x2c4a*/ 878,
+      -1, -1, -1, -1, -1,
+      /*0x2c34*/ 856,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1,
+      /*0x2c3e*/ 866,
+      -1,
+      /*0x2d17*/ 984,
+      -1,
+      /*0x105b4*/ 1243,
+      -1, -1, -1, -1, -1, -1,
+      -1,
+      /*0x16e60*/ 1356,
+      -1, -1, -1, -1, -1, -1,
+      -1,
+      /*0x16e7e*/ 1386,
+      /*0x118ca*/ 1334,
+      /*0x1059f*/ 1224,
+      /*0xff50*/ 1129,
+      -1, -1,
+      /*0x2c3a*/ 862,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      /*0x1fe0*/ 805,
+      -1, -1, -1, -1,
+      /*0x2c38*/ 860,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      /*0x050d*/ 424,
+      /*0x105b8*/ 1247,
+      -1, -1,
+      /*0x1fb0*/ 801,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1,
+      /*0x051f*/ 433,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1,
+      /*0x2c32*/ 854,
+      -1,
+      /*0x2d1d*/ 990,
+      -1, -1, -1, -1,
+      /*0x2d09*/ 970,
+      -1, -1, -1, -1,
+      /*0x1e936*/ 1408,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1,
+      /*0xff48*/ 1121,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1,
+      /*0x1e934*/ 1406,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1,
+      /*0x1e93e*/ 1416,
+      /*0xff46*/ 1119,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1,
+      /*0x2d0d*/ 974,
+      -1, -1, -1, -1,
+      /*0x1e93a*/ 1412,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1,
+      /*0xff44*/ 1117,
+      -1, -1, -1,
+      /*0x2d1f*/ 992,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1,
+      /*0x1e938*/ 1410,
+      -1, -1, -1,
+      /*0xa695*/ 1034,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1,
+      /*0x1e932*/ 1404,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1,
+      /*0xff5a*/ 1139,
+      -1, -1, -1, -1, -1, -1,
+      -1,
+      /*0xa693*/ 1033,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1,
+      /*0xa687*/ 1027,
+      -1, -1, -1, -1, -1, -1,
+      -1,
+      /*0xff58*/ 1137,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1,
+      /*0xff56*/ 1135,
+      -1, -1, -1, -1, -1, -1,
+      -1,
+      /*0xff54*/ 1133,
+      -1, -1, -1, -1, -1, -1,
+      /*0xff52*/ 1131,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      /*0xa697*/ 1035,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1,
+      /*0xff4c*/ 1125,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1,
+      /*0xa689*/ 1028,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      /*0xff4a*/ 1123,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1,
+      /*0xa68d*/ 1030
+    };
+
+  if (code <= MAX_CODE_VALUE && code >= MIN_CODE_VALUE)
+    {
+      register unsigned int key = onigenc_unicode_CaseUnfold_11_hash(code);
+
+      if (key <= MAX_HASH_VALUE)
+        {
+          register short s = wordlist[key];
+
+          if (s >= 0 && code1_equal(code, CaseUnfold_11_Table[s].from))
+            return &CaseUnfold_11_Table[s].to;
+        }
+    }
+  return 0;
+}
+
+static const CaseUnfold_12_Type CaseUnfold_12_Table[] = {
+#define CaseUnfold_12 (*(CaseUnfold_12_Type (*)[58])(CaseUnfold_12_Table+0))
+  {{0x0061, 0x02be}, {1, {0x1e9a}}},
+  {{0x0066, 0x0066}, {1, {0xfb00}}},
+  {{0x0066, 0x0069}, {1, {0xfb01}}},
+  {{0x0066, 0x006c}, {1, {0xfb02}}},
+  {{0x0068, 0x0331}, {1, {0x1e96}}},
+  {{0x006a, 0x030c}, {1, {0x01f0}}},
+  {{0x0073, 0x0073}, {2, {0x00df, 0x1e9e}}},
+  {{0x0073, 0x0074}, {2, {0xfb05, 0xfb06}}},
+  {{0x0074, 0x0308}, {1, {0x1e97}}},
+  {{0x0077, 0x030a}, {1, {0x1e98}}},
+  {{0x0079, 0x030a}, {1, {0x1e99}}},
+  {{0x02bc, 0x006e}, {1, {0x0149}}},
+  {{0x03ac, 0x03b9}, {1, {0x1fb4}}},
+  {{0x03ae, 0x03b9}, {1, {0x1fc4}}},
+  {{0x03b1, 0x0342}, {1, {0x1fb6}}},
+  {{0x03b1, 0x03b9}, {2, {0x1fb3, 0x1fbc}}},
+  {{0x03b7, 0x0342}, {1, {0x1fc6}}},
+  {{0x03b7, 0x03b9}, {2, {0x1fc3, 0x1fcc}}},
+  {{0x03b9, 0x0342}, {1, {0x1fd6}}},
+  {{0x03c1, 0x0313}, {1, {0x1fe4}}},
+  {{0x03c5, 0x0313}, {1, {0x1f50}}},
+  {{0x03c5, 0x0342}, {1, {0x1fe6}}},
+  {{0x03c9, 0x0342}, {1, {0x1ff6}}},
+  {{0x03c9, 0x03b9}, {2, {0x1ff3, 0x1ffc}}},
+  {{0x03ce, 0x03b9}, {1, {0x1ff4}}},
+  {{0x0565, 0x0582}, {1, {0x0587}}},
+  {{0x0574, 0x0565}, {1, {0xfb14}}},
+  {{0x0574, 0x056b}, {1, {0xfb15}}},
+  {{0x0574, 0x056d}, {1, {0xfb17}}},
+  {{0x0574, 0x0576}, {1, {0xfb13}}},
+  {{0x057e, 0x0576}, {1, {0xfb16}}},
+  {{0x1f00, 0x03b9}, {2, {0x1f80, 0x1f88}}},
+  {{0x1f01, 0x03b9}, {2, {0x1f81, 0x1f89}}},
+  {{0x1f02, 0x03b9}, {2, {0x1f82, 0x1f8a}}},
+  {{0x1f03, 0x03b9}, {2, {0x1f83, 0x1f8b}}},
+  {{0x1f04, 0x03b9}, {2, {0x1f84, 0x1f8c}}},
+  {{0x1f05, 0x03b9}, {2, {0x1f85, 0x1f8d}}},
+  {{0x1f06, 0x03b9}, {2, {0x1f86, 0x1f8e}}},
+  {{0x1f07, 0x03b9}, {2, {0x1f87, 0x1f8f}}},
+  {{0x1f20, 0x03b9}, {2, {0x1f90, 0x1f98}}},
+  {{0x1f21, 0x03b9}, {2, {0x1f91, 0x1f99}}},
+  {{0x1f22, 0x03b9}, {2, {0x1f92, 0x1f9a}}},
+  {{0x1f23, 0x03b9}, {2, {0x1f93, 0x1f9b}}},
+  {{0x1f24, 0x03b9}, {2, {0x1f94, 0x1f9c}}},
+  {{0x1f25, 0x03b9}, {2, {0x1f95, 0x1f9d}}},
+  {{0x1f26, 0x03b9}, {2, {0x1f96, 0x1f9e}}},
+  {{0x1f27, 0x03b9}, {2, {0x1f97, 0x1f9f}}},
+  {{0x1f60, 0x03b9}, {2, {0x1fa0, 0x1fa8}}},
+  {{0x1f61, 0x03b9}, {2, {0x1fa1, 0x1fa9}}},
+  {{0x1f62, 0x03b9}, {2, {0x1fa2, 0x1faa}}},
+  {{0x1f63, 0x03b9}, {2, {0x1fa3, 0x1fab}}},
+  {{0x1f64, 0x03b9}, {2, {0x1fa4, 0x1fac}}},
+  {{0x1f65, 0x03b9}, {2, {0x1fa5, 0x1fad}}},
+  {{0x1f66, 0x03b9}, {2, {0x1fa6, 0x1fae}}},
+  {{0x1f67, 0x03b9}, {2, {0x1fa7, 0x1faf}}},
+  {{0x1f70, 0x03b9}, {1, {0x1fb2}}},
+  {{0x1f74, 0x03b9}, {1, {0x1fc2}}},
+  {{0x1f7c, 0x03b9}, {1, {0x1ff2}}},
+#define CaseUnfold_12_Locale (*(CaseUnfold_12_Type (*)[1])(CaseUnfold_12_Table+58))
+  {{0x0069, 0x0307}, {1, {0x0130}}},
+};
+
+/* ANSI-C code produced by gperf version 3.1 */
+/* Command-line: gperf -7 -k1,2,3,4,5,6 -F,-1 -c -j1 -i1 -t -T -E -C -H onigenc_unicode_CaseUnfold_12_hash -N onigenc_unicode_CaseUnfold_12_lookup -n  */
+
+/* maximum key range = 71, duplicates = 0 */
+
+#ifdef __GNUC__
+__inline
+#else
+#ifdef __cplusplus
+inline
+#endif
+#endif
+/*ARGSUSED*/
+static unsigned int
+onigenc_unicode_CaseUnfold_12_hash(const OnigCodePoint *codes)
+{
+  static const unsigned char asso_values[] =
+    {
+       3, 58, 54, 57, 56, 16,  8,  2, 43, 82,
+       3,  1, 23, 82, 82, 82, 82, 82, 82,  4,
+      82, 82, 82, 82, 82, 82, 82, 82, 82, 82,
+      82, 82, 52, 51, 50, 49, 48, 47, 46, 45,
+      82, 82, 82, 82, 43, 82, 42, 82, 82, 13,
+      82, 82, 82, 82, 82, 11, 82,  1, 82, 82,
+      14, 82,  1, 82, 82, 31,  3, 82, 82, 30,
+      82, 82, 82, 10, 82, 82, 82, 82, 37, 82,
+      82, 82, 82, 82, 82, 82, 82, 82, 82, 82,
+      82, 82, 82, 82, 82, 82, 37, 15, 36, 35,
+      34, 17,  1, 33, 12,  4, 23, 23, 26, 21,
+      13, 82, 27, 82, 82,  2,  5, 82, 11, 16,
+      82, 15, 82, 82, 23, 82,  8, 82
+    };
+  return asso_values[bits_at(codes, 5)] + asso_values[bits_at(codes, 4)] + asso_values[bits_at(codes, 3)] + asso_values[bits_at(codes, 2)] + asso_values[bits_at(codes, 1)] + asso_values[bits_at(codes, 0)];
+}
+
+static const CodePointList2 *
+onigenc_unicode_CaseUnfold_12_lookup(const OnigCodePoint *codes)
+{
+  enum
+    {
+      MIN_CODE_VALUE = 0x61,
+      MAX_CODE_VALUE = 0x1f7c,
+      TOTAL_KEYWORDS = 59,
+      MIN_WORD_LENGTH = 6,
+      MAX_WORD_LENGTH = 6,
+      MIN_HASH_VALUE = 11,
+      MAX_HASH_VALUE = 81
+    };
+
+  static const short wordlist[] =
+    {
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1,
+      /*0x1f66,0x03b9*/ 53,
+      /*0x1f07,0x03b9*/ 38,
+      /*0x1f00,0x03b9*/ 31,
+      /*0x0066,0x0066*/ 1,
+      /*0x1f74,0x03b9*/ 56,
+      /*0x0073,0x0073*/ 6,
+      /*0x0066,0x0069*/ 2,
+      /*0x1f06,0x03b9*/ 37,
+      /*0x0073,0x0074*/ 7,
+      /*0x03b9,0x0342*/ 18,
+      /*0x03c9,0x03b9*/ 23,
+      /*0x03b7,0x03b9*/ 17,
+      /*0x0069,0x0307*/ 58,
+      /*0x03b1,0x03b9*/ 15,
+      /*0x1f61,0x03b9*/ 48,
+      /*0x1f05,0x03b9*/ 36,
+      /*0x1f65,0x03b9*/ 52,
+      /*0x0574,0x0576*/ 29,
+      /*0x03c9,0x0342*/ 22,
+      /*0x03b7,0x0342*/ 16,
+      /*0x057e,0x0576*/ 30,
+      /*0x03b1,0x0342*/ 14,
+      /*0x1f7c,0x03b9*/ 57,
+      /*0x0574,0x0565*/ 26,
+      /*0x0079,0x030a*/ 10,
+      /*0x0077,0x030a*/ 9,
+      /*0x1f70,0x03b9*/ 55,
+      /*0x0574,0x056d*/ 28,
+      /*0x0066,0x006c*/ 3,
+      /*0x0574,0x056b*/ 27,
+      /*0x0061,0x02be*/ 0,
+      /*0x0068,0x0331*/ 4,
+      /*0x1f67,0x03b9*/ 54,
+      /*0x1f64,0x03b9*/ 51,
+      /*0x1f63,0x03b9*/ 50,
+      /*0x1f62,0x03b9*/ 49,
+      /*0x1f60,0x03b9*/ 47,
+      /*0x03ce,0x03b9*/ 24,
+      /*0x03c5,0x0342*/ 21,
+      /*0x03c5,0x0313*/ 20,
+      /*0x03c1,0x0313*/ 19,
+      /*0x02bc,0x006e*/ 11,
+      /*0x03ae,0x03b9*/ 13,
+      /*0x03ac,0x03b9*/ 12,
+      /*0x1f27,0x03b9*/ 46,
+      /*0x1f26,0x03b9*/ 45,
+      /*0x1f25,0x03b9*/ 44,
+      /*0x1f24,0x03b9*/ 43,
+      /*0x1f23,0x03b9*/ 42,
+      /*0x1f22,0x03b9*/ 41,
+      /*0x1f21,0x03b9*/ 40,
+      /*0x1f20,0x03b9*/ 39,
+      /*0x006a,0x030c*/ 5,
+      /*0x1f02,0x03b9*/ 33,
+      /*0x0074,0x0308*/ 8,
+      /*0x1f04,0x03b9*/ 35,
+      /*0x1f03,0x03b9*/ 34,
+      /*0x1f01,0x03b9*/ 32,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      /*0x0565,0x0582*/ 25
+    };
+
+  if (codes[0] <= MAX_CODE_VALUE && codes[0] >= MIN_CODE_VALUE &&
+      codes[1] <= MAX_CODE_VALUE && codes[1] >= MIN_CODE_VALUE)
+    {
+      register unsigned int key = onigenc_unicode_CaseUnfold_12_hash(codes);
+
+      if (key <= MAX_HASH_VALUE)
+        {
+          register short s = wordlist[key];
+
+          if (s >= 0 && code2_equal(codes, CaseUnfold_12_Table[s].from))
+            return &CaseUnfold_12_Table[s].to;
+        }
+    }
+  return 0;
+}
+
+static const CaseUnfold_13_Type CaseUnfold_13_Table[] = {
+#define CaseUnfold_13 (*(CaseUnfold_13_Type (*)[14])(CaseUnfold_13_Table+0))
+  {{0x0066, 0x0066, 0x0069}, {1, {0xfb03}}},
+  {{0x0066, 0x0066, 0x006c}, {1, {0xfb04}}},
+  {{0x03b1, 0x0342, 0x03b9}, {1, {0x1fb7}}},
+  {{0x03b7, 0x0342, 0x03b9}, {1, {0x1fc7}}},
+  {{0x03b9, 0x0308, 0x0300}, {1, {0x1fd2}}},
+  {{0x03b9, 0x0308, 0x0301}, {2, {0x0390, 0x1fd3}}},
+  {{0x03b9, 0x0308, 0x0342}, {1, {0x1fd7}}},
+  {{0x03c5, 0x0308, 0x0300}, {1, {0x1fe2}}},
+  {{0x03c5, 0x0308, 0x0301}, {2, {0x03b0, 0x1fe3}}},
+  {{0x03c5, 0x0308, 0x0342}, {1, {0x1fe7}}},
+  {{0x03c5, 0x0313, 0x0300}, {1, {0x1f52}}},
+  {{0x03c5, 0x0313, 0x0301}, {1, {0x1f54}}},
+  {{0x03c5, 0x0313, 0x0342}, {1, {0x1f56}}},
+  {{0x03c9, 0x0342, 0x03b9}, {1, {0x1ff7}}},
+};
+
+/* ANSI-C code produced by gperf version 3.1 */
+/* Command-line: gperf -7 -k1,2,3,4,5,6,7,8,9 -F,-1 -c -j1 -i1 -t -T -E -C -H onigenc_unicode_CaseUnfold_13_hash -N onigenc_unicode_CaseUnfold_13_lookup -n  */
+
+/* maximum key range = 20, duplicates = 0 */
+
+#ifdef __GNUC__
+__inline
+#else
+#ifdef __cplusplus
+inline
+#endif
+#endif
+/*ARGSUSED*/
+static unsigned int
+onigenc_unicode_CaseUnfold_13_hash(const OnigCodePoint *codes)
+{
+  static const unsigned char asso_values[] =
+    {
+       7,  4, 47, 47, 47, 47,  1,  1,  2, 47,
+      47, 47, 47, 47, 47, 47, 47, 47, 47,  1,
+      47, 47, 47, 47, 47, 47, 47, 47, 47, 47,
+      47, 47, 47, 47, 47, 47, 47, 47, 47, 47,
+      47, 47, 47, 47, 47, 47, 47, 47, 47, 11,
+      47, 47, 47, 47, 47, 10, 47,  2, 47, 47,
+      47, 47, 47, 47, 47, 47,  1, 47, 47,  1,
+      47, 47, 47,  9, 47, 47, 47, 47, 47, 47,
+      47, 47, 47, 47, 47, 47, 47, 47, 47, 47,
+      47, 47, 47, 47, 47, 47, 47, 47, 47, 47,
+      47, 47,  1, 47, 47,  2, 47, 47,  1, 47,
+      47, 47, 47, 47, 47, 47, 47, 47, 47, 47,
+      47, 47, 47, 47, 47, 47, 47, 47
+    };
+  return asso_values[bits_at(codes, 8)] + asso_values[bits_at(codes, 7)] + asso_values[bits_at(codes, 6)] + asso_values[bits_at(codes, 5)] + asso_values[bits_at(codes, 4)] + asso_values[bits_at(codes, 3)] + asso_values[bits_at(codes, 2)] + asso_values[bits_at(codes, 1)] + asso_values[bits_at(codes, 0)];
+}
+
+static const CodePointList2 *
+onigenc_unicode_CaseUnfold_13_lookup(const OnigCodePoint *codes)
+{
+  enum
+    {
+      MIN_CODE_VALUE = 0x66,
+      MAX_CODE_VALUE = 0x3c9,
+      TOTAL_KEYWORDS = 14,
+      MIN_WORD_LENGTH = 9,
+      MAX_WORD_LENGTH = 9,
+      MIN_HASH_VALUE = 27,
+      MAX_HASH_VALUE = 46
+    };
+
+  static const short wordlist[] =
+    {
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1,
+      /*0x03c5,0x0313,0x0342*/ 12,
+      /*0x03c5,0x0308,0x0342*/ 9,
+      /*0x03b9,0x0308,0x0342*/ 6,
+      /*0x03c5,0x0313,0x0301*/ 11,
+      /*0x03c5,0x0308,0x0301*/ 8,
+      /*0x03b9,0x0308,0x0301*/ 5,
+      /*0x03c5,0x0313,0x0300*/ 10,
+      /*0x03c5,0x0308,0x0300*/ 7,
+      /*0x03b9,0x0308,0x0300*/ 4,
+      /*0x03c9,0x0342,0x03b9*/ 13,
+      /*0x03b7,0x0342,0x03b9*/ 3,
+      /*0x03b1,0x0342,0x03b9*/ 2,
+      -1, -1, -1, -1, -1, -1,
+      /*0x0066,0x0066,0x006c*/ 1,
+      /*0x0066,0x0066,0x0069*/ 0
+    };
+
+  if (codes[0] <= MAX_CODE_VALUE && codes[0] >= MIN_CODE_VALUE &&
+      codes[1] <= MAX_CODE_VALUE && codes[1] >= MIN_CODE_VALUE &&
+      codes[2] <= MAX_CODE_VALUE && codes[2] >= MIN_CODE_VALUE)
+    {
+      register unsigned int key = onigenc_unicode_CaseUnfold_13_hash(codes);
+
+      if (key <= MAX_HASH_VALUE)
+        {
+          register short s = wordlist[key];
+
+          if (s >= 0 && code3_equal(codes, CaseUnfold_13_Table[s].from))
+            return &CaseUnfold_13_Table[s].to;
+        }
+    }
+  return 0;
+}
+
+static const OnigCodePoint CaseMappingSpecials[] = {
+    L(1)|0x039C,
+    L(2)|0x0053, 0x0073, L(2)|0x0053, 0x0053,
+    L(2)|0x02BC, 0x004E,
+    L(1)|0x0053,
+    L(1)|0x01C5,
+    L(2)|0x0064, 0x017D, L(1)|0x01C4,
+    L(1)|0x01C8,
+    L(2)|0x006C, 0x004A, L(1)|0x01C7,
+    L(1)|0x01CB,
+    L(2)|0x006E, 0x004A, L(1)|0x01CA,
+    L(2)|0x004A, 0x030C,
+    L(1)|0x01F2,
+    L(2)|0x0064, 0x005A, L(1)|0x01F1,
+    L(1)|0x0399,
+    L(3)|0x0399, 0x0308, 0x0301,
+    L(3)|0x03A5, 0x0308, 0x0301,
+    L(1)|0x03A3,
+    L(1)|0x0392,
+    L(1)|0x0398,
+    L(1)|0x03A6,
+    L(1)|0x03A0,
+    L(1)|0x039A,
+    L(1)|0x03A1,
+    L(1)|0x0395,
+    L(2)|0x0535, 0x0582, L(2)|0x0535, 0x0552,
+    L(1)|0x0412,
+    L(1)|0x0414,
+    L(1)|0x041E,
+    L(1)|0x0421,
+    L(1)|0x0422,
+    L(1)|0x0422,
+    L(1)|0x042A,
+    L(1)|0x0462,
+    L(1)|0xA64A,
+    L(2)|0x0048, 0x0331,
+    L(2)|0x0054, 0x0308,
+    L(2)|0x0057, 0x030A,
+    L(2)|0x0059, 0x030A,
+    L(2)|0x0041, 0x02BE,
+    L(1)|0x1E60,
+    L(1)|0x00DF,
+    L(2)|0x03A5, 0x0313,
+    L(3)|0x03A5, 0x0313, 0x0300,
+    L(3)|0x03A5, 0x0313, 0x0301,
+    L(3)|0x03A5, 0x0313, 0x0342,
+    L(1)|0x1F88, L(2)|0x1F08, 0x0399,
+    L(1)|0x1F89, L(2)|0x1F09, 0x0399,
+    L(1)|0x1F8A, L(2)|0x1F0A, 0x0399,
+    L(1)|0x1F8B, L(2)|0x1F0B, 0x0399,
+    L(1)|0x1F8C, L(2)|0x1F0C, 0x0399,
+    L(1)|0x1F8D, L(2)|0x1F0D, 0x0399,
+    L(1)|0x1F8E, L(2)|0x1F0E, 0x0399,
+    L(1)|0x1F8F, L(2)|0x1F0F, 0x0399,
+    L(2)|0x1F00, 0x0399, L(1)|0x1F80, L(2)|0x1F08, 0x0399,
+    L(2)|0x1F01, 0x0399, L(1)|0x1F81, L(2)|0x1F09, 0x0399,
+    L(2)|0x1F02, 0x0399, L(1)|0x1F82, L(2)|0x1F0A, 0x0399,
+    L(2)|0x1F03, 0x0399, L(1)|0x1F83, L(2)|0x1F0B, 0x0399,
+    L(2)|0x1F04, 0x0399, L(1)|0x1F84, L(2)|0x1F0C, 0x0399,
+    L(2)|0x1F05, 0x0399, L(1)|0x1F85, L(2)|0x1F0D, 0x0399,
+    L(2)|0x1F06, 0x0399, L(1)|0x1F86, L(2)|0x1F0E, 0x0399,
+    L(2)|0x1F07, 0x0399, L(1)|0x1F87, L(2)|0x1F0F, 0x0399,
+    L(1)|0x1F98, L(2)|0x1F28, 0x0399,
+    L(1)|0x1F99, L(2)|0x1F29, 0x0399,
+    L(1)|0x1F9A, L(2)|0x1F2A, 0x0399,
+    L(1)|0x1F9B, L(2)|0x1F2B, 0x0399,
+    L(1)|0x1F9C, L(2)|0x1F2C, 0x0399,
+    L(1)|0x1F9D, L(2)|0x1F2D, 0x0399,
+    L(1)|0x1F9E, L(2)|0x1F2E, 0x0399,
+    L(1)|0x1F9F, L(2)|0x1F2F, 0x0399,
+    L(2)|0x1F20, 0x0399, L(1)|0x1F90, L(2)|0x1F28, 0x0399,
+    L(2)|0x1F21, 0x0399, L(1)|0x1F91, L(2)|0x1F29, 0x0399,
+    L(2)|0x1F22, 0x0399, L(1)|0x1F92, L(2)|0x1F2A, 0x0399,
+    L(2)|0x1F23, 0x0399, L(1)|0x1F93, L(2)|0x1F2B, 0x0399,
+    L(2)|0x1F24, 0x0399, L(1)|0x1F94, L(2)|0x1F2C, 0x0399,
+    L(2)|0x1F25, 0x0399, L(1)|0x1F95, L(2)|0x1F2D, 0x0399,
+    L(2)|0x1F26, 0x0399, L(1)|0x1F96, L(2)|0x1F2E, 0x0399,
+    L(2)|0x1F27, 0x0399, L(1)|0x1F97, L(2)|0x1F2F, 0x0399,
+    L(1)|0x1FA8, L(2)|0x1F68, 0x0399,
+    L(1)|0x1FA9, L(2)|0x1F69, 0x0399,
+    L(1)|0x1FAA, L(2)|0x1F6A, 0x0399,
+    L(1)|0x1FAB, L(2)|0x1F6B, 0x0399,
+    L(1)|0x1FAC, L(2)|0x1F6C, 0x0399,
+    L(1)|0x1FAD, L(2)|0x1F6D, 0x0399,
+    L(1)|0x1FAE, L(2)|0x1F6E, 0x0399,
+    L(1)|0x1FAF, L(2)|0x1F6F, 0x0399,
+    L(2)|0x1F60, 0x0399, L(1)|0x1FA0, L(2)|0x1F68, 0x0399,
+    L(2)|0x1F61, 0x0399, L(1)|0x1FA1, L(2)|0x1F69, 0x0399,
+    L(2)|0x1F62, 0x0399, L(1)|0x1FA2, L(2)|0x1F6A, 0x0399,
+    L(2)|0x1F63, 0x0399, L(1)|0x1FA3, L(2)|0x1F6B, 0x0399,
+    L(2)|0x1F64, 0x0399, L(1)|0x1FA4, L(2)|0x1F6C, 0x0399,
+    L(2)|0x1F65, 0x0399, L(1)|0x1FA5, L(2)|0x1F6D, 0x0399,
+    L(2)|0x1F66, 0x0399, L(1)|0x1FA6, L(2)|0x1F6E, 0x0399,
+    L(2)|0x1F67, 0x0399, L(1)|0x1FA7, L(2)|0x1F6F, 0x0399,
+    L(2)|0x1FBA, 0x0345, L(2)|0x1FBA, 0x0399,
+    L(1)|0x1FBC, L(2)|0x0391, 0x0399,
+    L(2)|0x0386, 0x0345, L(2)|0x0386, 0x0399,
+    L(2)|0x0391, 0x0342,
+    L(3)|0x0391, 0x0342, 0x0345, L(3)|0x0391, 0x0342, 0x0399,
+    L(2)|0x03B1, 0x0399, L(1)|0x1FB3, L(2)|0x0391, 0x0399,
+    L(1)|0x0399,
+    L(2)|0x1FCA, 0x0345, L(2)|0x1FCA, 0x0399,
+    L(1)|0x1FCC, L(2)|0x0397, 0x0399,
+    L(2)|0x0389, 0x0345, L(2)|0x0389, 0x0399,
+    L(2)|0x0397, 0x0342,
+    L(3)|0x0397, 0x0342, 0x0345, L(3)|0x0397, 0x0342, 0x0399,
+    L(2)|0x03B7, 0x0399, L(1)|0x1FC3, L(2)|0x0397, 0x0399,
+    L(3)|0x0399, 0x0308, 0x0300,
+    L(3)|0x0399, 0x0308, 0x0301,
+    L(2)|0x0399, 0x0342,
+    L(3)|0x0399, 0x0308, 0x0342,
+    L(3)|0x03A5, 0x0308, 0x0300,
+    L(3)|0x03A5, 0x0308, 0x0301,
+    L(2)|0x03A1, 0x0313,
+    L(2)|0x03A5, 0x0342,
+    L(3)|0x03A5, 0x0308, 0x0342,
+    L(2)|0x1FFA, 0x0345, L(2)|0x1FFA, 0x0399,
+    L(1)|0x1FFC, L(2)|0x03A9, 0x0399,
+    L(2)|0x038F, 0x0345, L(2)|0x038F, 0x0399,
+    L(2)|0x03A9, 0x0342,
+    L(3)|0x03A9, 0x0342, 0x0345, L(3)|0x03A9, 0x0342, 0x0399,
+    L(2)|0x03C9, 0x0399, L(1)|0x1FF3, L(2)|0x03A9, 0x0399,
+    L(2)|0x0046, 0x0066, L(2)|0x0046, 0x0046,
+    L(2)|0x0046, 0x0069, L(2)|0x0046, 0x0049,
+    L(2)|0x0046, 0x006C, L(2)|0x0046, 0x004C,
+    L(3)|0x0046, 0x0066, 0x0069, L(3)|0x0046, 0x0046, 0x0049,
+    L(3)|0x0046, 0x0066, 0x006C, L(3)|0x0046, 0x0046, 0x004C,
+    L(2)|0x0053, 0x0074, L(2)|0x0053, 0x0054,
+    L(2)|0x0053, 0x0074, L(2)|0x0053, 0x0054,
+    L(2)|0x0544, 0x0576, L(2)|0x0544, 0x0546,
+    L(2)|0x0544, 0x0565, L(2)|0x0544, 0x0535,
+    L(2)|0x0544, 0x056B, L(2)|0x0544, 0x053B,
+    L(2)|0x054E, 0x0576, L(2)|0x054E, 0x0546,
+    L(2)|0x0544, 0x056D, L(2)|0x0544, 0x053D,
+};
diff --git a/enc/unicode/15.0.0/name2ctype.h b/enc/unicode/16.0.0/name2ctype.h
similarity index 83%
rename from enc/unicode/15.0.0/name2ctype.h
rename to enc/unicode/16.0.0/name2ctype.h
index 6bbbb3512ff460..42da74f3181eab 100644
--- a/enc/unicode/15.0.0/name2ctype.h
+++ b/enc/unicode/16.0.0/name2ctype.h
@@ -43,7 +43,7 @@ static const OnigCodePoint CR_NEWLINE[] = {
 
 /* 'Alpha': [[:Alpha:]] */
 static const OnigCodePoint CR_Alpha[] = {
-	732,
+	757,
 	0x0041, 0x005a,
 	0x0061, 0x007a,
 	0x00aa, 0x00aa,
@@ -57,7 +57,7 @@ static const OnigCodePoint CR_Alpha[] = {
 	0x02ec, 0x02ec,
 	0x02ee, 0x02ee,
 	0x0345, 0x0345,
-	0x0370, 0x0374,
+	0x0363, 0x0374,
 	0x0376, 0x0377,
 	0x037a, 0x037d,
 	0x037f, 0x037f,
@@ -98,6 +98,7 @@ static const OnigCodePoint CR_Alpha[] = {
 	0x0860, 0x086a,
 	0x0870, 0x0887,
 	0x0889, 0x088e,
+	0x0897, 0x0897,
 	0x08a0, 0x08c9,
 	0x08d4, 0x08df,
 	0x08e3, 0x08e9,
@@ -311,7 +312,7 @@ static const OnigCodePoint CR_Alpha[] = {
 	0x1c00, 0x1c36,
 	0x1c4d, 0x1c4f,
 	0x1c5a, 0x1c7d,
-	0x1c80, 0x1c88,
+	0x1c80, 0x1c8a,
 	0x1c90, 0x1cba,
 	0x1cbd, 0x1cbf,
 	0x1ce9, 0x1cec,
@@ -319,7 +320,7 @@ static const OnigCodePoint CR_Alpha[] = {
 	0x1cf5, 0x1cf6,
 	0x1cfa, 0x1cfa,
 	0x1d00, 0x1dbf,
-	0x1de7, 0x1df4,
+	0x1dd3, 0x1df4,
 	0x1e00, 0x1f15,
 	0x1f18, 0x1f1d,
 	0x1f20, 0x1f45,
@@ -399,10 +400,10 @@ static const OnigCodePoint CR_Alpha[] = {
 	0xa67f, 0xa6ef,
 	0xa717, 0xa71f,
 	0xa722, 0xa788,
-	0xa78b, 0xa7ca,
+	0xa78b, 0xa7cd,
 	0xa7d0, 0xa7d1,
 	0xa7d3, 0xa7d3,
-	0xa7d5, 0xa7d9,
+	0xa7d5, 0xa7dc,
 	0xa7f2, 0xa805,
 	0xa807, 0xa827,
 	0xa840, 0xa873,
@@ -493,6 +494,7 @@ static const OnigCodePoint CR_Alpha[] = {
 	0x105a3, 0x105b1,
 	0x105b3, 0x105b9,
 	0x105bb, 0x105bc,
+	0x105c0, 0x105f3,
 	0x10600, 0x10736,
 	0x10740, 0x10755,
 	0x10760, 0x10767,
@@ -530,9 +532,14 @@ static const OnigCodePoint CR_Alpha[] = {
 	0x10c80, 0x10cb2,
 	0x10cc0, 0x10cf2,
 	0x10d00, 0x10d27,
+	0x10d4a, 0x10d65,
+	0x10d69, 0x10d69,
+	0x10d6f, 0x10d85,
 	0x10e80, 0x10ea9,
 	0x10eab, 0x10eac,
 	0x10eb0, 0x10eb1,
+	0x10ec2, 0x10ec4,
+	0x10efc, 0x10efc,
 	0x10f00, 0x10f1c,
 	0x10f27, 0x10f27,
 	0x10f30, 0x10f45,
@@ -576,6 +583,17 @@ static const OnigCodePoint CR_Alpha[] = {
 	0x11350, 0x11350,
 	0x11357, 0x11357,
 	0x1135d, 0x11363,
+	0x11380, 0x11389,
+	0x1138b, 0x1138b,
+	0x1138e, 0x1138e,
+	0x11390, 0x113b5,
+	0x113b7, 0x113c0,
+	0x113c2, 0x113c2,
+	0x113c5, 0x113c5,
+	0x113c7, 0x113ca,
+	0x113cc, 0x113cd,
+	0x113d1, 0x113d1,
+	0x113d3, 0x113d3,
 	0x11400, 0x11441,
 	0x11443, 0x11445,
 	0x11447, 0x1144a,
@@ -614,6 +632,7 @@ static const OnigCodePoint CR_Alpha[] = {
 	0x11a50, 0x11a97,
 	0x11a9d, 0x11a9d,
 	0x11ab0, 0x11af8,
+	0x11bc0, 0x11be0,
 	0x11c00, 0x11c08,
 	0x11c0a, 0x11c36,
 	0x11c38, 0x11c3e,
@@ -646,7 +665,9 @@ static const OnigCodePoint CR_Alpha[] = {
 	0x12f90, 0x12ff0,
 	0x13000, 0x1342f,
 	0x13441, 0x13446,
+	0x13460, 0x143fa,
 	0x14400, 0x14646,
+	0x16100, 0x1612e,
 	0x16800, 0x16a38,
 	0x16a40, 0x16a5e,
 	0x16a70, 0x16abe,
@@ -655,6 +676,7 @@ static const OnigCodePoint CR_Alpha[] = {
 	0x16b40, 0x16b43,
 	0x16b63, 0x16b77,
 	0x16b7d, 0x16b8f,
+	0x16d40, 0x16d6c,
 	0x16e40, 0x16e7f,
 	0x16f00, 0x16f4a,
 	0x16f4f, 0x16f87,
@@ -664,7 +686,7 @@ static const OnigCodePoint CR_Alpha[] = {
 	0x16ff0, 0x16ff1,
 	0x17000, 0x187f7,
 	0x18800, 0x18cd5,
-	0x18d00, 0x18d08,
+	0x18cff, 0x18d08,
 	0x1aff0, 0x1aff3,
 	0x1aff5, 0x1affb,
 	0x1affd, 0x1affe,
@@ -724,6 +746,8 @@ static const OnigCodePoint CR_Alpha[] = {
 	0x1e290, 0x1e2ad,
 	0x1e2c0, 0x1e2eb,
 	0x1e4d0, 0x1e4eb,
+	0x1e5d0, 0x1e5ed,
+	0x1e5f0, 0x1e5f0,
 	0x1e7e0, 0x1e7e6,
 	0x1e7e8, 0x1e7eb,
 	0x1e7ed, 0x1e7ee,
@@ -773,6 +797,7 @@ static const OnigCodePoint CR_Alpha[] = {
 	0x2b740, 0x2b81d,
 	0x2b820, 0x2cea1,
 	0x2ceb0, 0x2ebe0,
+	0x2ebf0, 0x2ee5d,
 	0x2f800, 0x2fa1d,
 	0x30000, 0x3134a,
 	0x31350, 0x323af,
@@ -800,7 +825,7 @@ static const OnigCodePoint CR_Cntrl[] = {
 
 /* 'Digit': [[:Digit:]] */
 static const OnigCodePoint CR_Digit[] = {
-	64,
+	71,
 	0x0030, 0x0039,
 	0x0660, 0x0669,
 	0x06f0, 0x06f9,
@@ -840,6 +865,7 @@ static const OnigCodePoint CR_Digit[] = {
 	0xff10, 0xff19,
 	0x104a0, 0x104a9,
 	0x10d30, 0x10d39,
+	0x10d40, 0x10d49,
 	0x11066, 0x1106f,
 	0x110f0, 0x110f9,
 	0x11136, 0x1113f,
@@ -849,27 +875,33 @@ static const OnigCodePoint CR_Digit[] = {
 	0x114d0, 0x114d9,
 	0x11650, 0x11659,
 	0x116c0, 0x116c9,
+	0x116d0, 0x116e3,
 	0x11730, 0x11739,
 	0x118e0, 0x118e9,
 	0x11950, 0x11959,
+	0x11bf0, 0x11bf9,
 	0x11c50, 0x11c59,
 	0x11d50, 0x11d59,
 	0x11da0, 0x11da9,
 	0x11f50, 0x11f59,
+	0x16130, 0x16139,
 	0x16a60, 0x16a69,
 	0x16ac0, 0x16ac9,
 	0x16b50, 0x16b59,
+	0x16d70, 0x16d79,
+	0x1ccf0, 0x1ccf9,
 	0x1d7ce, 0x1d7ff,
 	0x1e140, 0x1e149,
 	0x1e2f0, 0x1e2f9,
 	0x1e4f0, 0x1e4f9,
+	0x1e5f1, 0x1e5fa,
 	0x1e950, 0x1e959,
 	0x1fbf0, 0x1fbf9,
 }; /* CR_Digit */
 
 /* 'Graph': [[:Graph:]] */
 static const OnigCodePoint CR_Graph[] = {
-	712,
+	737,
 	0x0021, 0x007e,
 	0x00a1, 0x0377,
 	0x037a, 0x037f,
@@ -894,7 +926,7 @@ static const OnigCodePoint CR_Graph[] = {
 	0x0860, 0x086a,
 	0x0870, 0x088e,
 	0x0890, 0x0891,
-	0x0898, 0x0983,
+	0x0897, 0x0983,
 	0x0985, 0x098c,
 	0x098f, 0x0990,
 	0x0993, 0x09a8,
@@ -1087,11 +1119,10 @@ static const OnigCodePoint CR_Graph[] = {
 	0x1aa0, 0x1aad,
 	0x1ab0, 0x1ace,
 	0x1b00, 0x1b4c,
-	0x1b50, 0x1b7e,
-	0x1b80, 0x1bf3,
+	0x1b4e, 0x1bf3,
 	0x1bfc, 0x1c37,
 	0x1c3b, 0x1c49,
-	0x1c4d, 0x1c88,
+	0x1c4d, 0x1c8a,
 	0x1c90, 0x1cba,
 	0x1cbd, 0x1cc7,
 	0x1cd0, 0x1cfa,
@@ -1121,7 +1152,7 @@ static const OnigCodePoint CR_Graph[] = {
 	0x20a0, 0x20c0,
 	0x20d0, 0x20f0,
 	0x2100, 0x218b,
-	0x2190, 0x2426,
+	0x2190, 0x2429,
 	0x2440, 0x244a,
 	0x2460, 0x2b73,
 	0x2b76, 0x2b95,
@@ -1144,22 +1175,22 @@ static const OnigCodePoint CR_Graph[] = {
 	0x2e80, 0x2e99,
 	0x2e9b, 0x2ef3,
 	0x2f00, 0x2fd5,
-	0x2ff0, 0x2ffb,
+	0x2ff0, 0x2fff,
 	0x3001, 0x303f,
 	0x3041, 0x3096,
 	0x3099, 0x30ff,
 	0x3105, 0x312f,
 	0x3131, 0x318e,
-	0x3190, 0x31e3,
-	0x31f0, 0x321e,
+	0x3190, 0x31e5,
+	0x31ef, 0x321e,
 	0x3220, 0xa48c,
 	0xa490, 0xa4c6,
 	0xa4d0, 0xa62b,
 	0xa640, 0xa6f7,
-	0xa700, 0xa7ca,
+	0xa700, 0xa7cd,
 	0xa7d0, 0xa7d1,
 	0xa7d3, 0xa7d3,
-	0xa7d5, 0xa7d9,
+	0xa7d5, 0xa7dc,
 	0xa7f2, 0xa82c,
 	0xa830, 0xa839,
 	0xa840, 0xa877,
@@ -1250,6 +1281,7 @@ static const OnigCodePoint CR_Graph[] = {
 	0x105a3, 0x105b1,
 	0x105b3, 0x105b9,
 	0x105bb, 0x105bc,
+	0x105c0, 0x105f3,
 	0x10600, 0x10736,
 	0x10740, 0x10755,
 	0x10760, 0x10767,
@@ -1293,11 +1325,15 @@ static const OnigCodePoint CR_Graph[] = {
 	0x10cc0, 0x10cf2,
 	0x10cfa, 0x10d27,
 	0x10d30, 0x10d39,
+	0x10d40, 0x10d65,
+	0x10d69, 0x10d85,
+	0x10d8e, 0x10d8f,
 	0x10e60, 0x10e7e,
 	0x10e80, 0x10ea9,
 	0x10eab, 0x10ead,
 	0x10eb0, 0x10eb1,
-	0x10efd, 0x10f27,
+	0x10ec2, 0x10ec4,
+	0x10efc, 0x10f27,
 	0x10f30, 0x10f59,
 	0x10f70, 0x10f89,
 	0x10fb0, 0x10fcb,
@@ -1337,6 +1373,17 @@ static const OnigCodePoint CR_Graph[] = {
 	0x1135d, 0x11363,
 	0x11366, 0x1136c,
 	0x11370, 0x11374,
+	0x11380, 0x11389,
+	0x1138b, 0x1138b,
+	0x1138e, 0x1138e,
+	0x11390, 0x113b5,
+	0x113b7, 0x113c0,
+	0x113c2, 0x113c2,
+	0x113c5, 0x113c5,
+	0x113c7, 0x113ca,
+	0x113cc, 0x113d5,
+	0x113d7, 0x113d8,
+	0x113e1, 0x113e2,
 	0x11400, 0x1145b,
 	0x1145d, 0x11461,
 	0x11480, 0x114c7,
@@ -1348,6 +1395,7 @@ static const OnigCodePoint CR_Graph[] = {
 	0x11660, 0x1166c,
 	0x11680, 0x116b9,
 	0x116c0, 0x116c9,
+	0x116d0, 0x116e3,
 	0x11700, 0x1171a,
 	0x1171d, 0x1172b,
 	0x11730, 0x11746,
@@ -1368,6 +1416,8 @@ static const OnigCodePoint CR_Graph[] = {
 	0x11a50, 0x11aa2,
 	0x11ab0, 0x11af8,
 	0x11b00, 0x11b09,
+	0x11bc0, 0x11be1,
+	0x11bf0, 0x11bf9,
 	0x11c00, 0x11c08,
 	0x11c0a, 0x11c36,
 	0x11c38, 0x11c45,
@@ -1391,7 +1441,7 @@ static const OnigCodePoint CR_Graph[] = {
 	0x11ee0, 0x11ef8,
 	0x11f00, 0x11f10,
 	0x11f12, 0x11f3a,
-	0x11f3e, 0x11f59,
+	0x11f3e, 0x11f5a,
 	0x11fb0, 0x11fb0,
 	0x11fc0, 0x11ff1,
 	0x11fff, 0x12399,
@@ -1400,7 +1450,9 @@ static const OnigCodePoint CR_Graph[] = {
 	0x12480, 0x12543,
 	0x12f90, 0x12ff2,
 	0x13000, 0x13455,
+	0x13460, 0x143fa,
 	0x14400, 0x14646,
+	0x16100, 0x16139,
 	0x16800, 0x16a38,
 	0x16a40, 0x16a5e,
 	0x16a60, 0x16a69,
@@ -1413,6 +1465,7 @@ static const OnigCodePoint CR_Graph[] = {
 	0x16b5b, 0x16b61,
 	0x16b63, 0x16b77,
 	0x16b7d, 0x16b8f,
+	0x16d40, 0x16d79,
 	0x16e40, 0x16e9a,
 	0x16f00, 0x16f4a,
 	0x16f4f, 0x16f87,
@@ -1421,7 +1474,7 @@ static const OnigCodePoint CR_Graph[] = {
 	0x16ff0, 0x16ff1,
 	0x17000, 0x187f7,
 	0x18800, 0x18cd5,
-	0x18d00, 0x18d08,
+	0x18cff, 0x18d08,
 	0x1aff0, 0x1aff3,
 	0x1aff5, 0x1affb,
 	0x1affd, 0x1affe,
@@ -1436,6 +1489,8 @@ static const OnigCodePoint CR_Graph[] = {
 	0x1bc80, 0x1bc88,
 	0x1bc90, 0x1bc99,
 	0x1bc9c, 0x1bca3,
+	0x1cc00, 0x1ccf9,
+	0x1cd00, 0x1ceb3,
 	0x1cf00, 0x1cf2d,
 	0x1cf30, 0x1cf46,
 	0x1cf50, 0x1cfc3,
@@ -1487,6 +1542,8 @@ static const OnigCodePoint CR_Graph[] = {
 	0x1e2c0, 0x1e2f9,
 	0x1e2ff, 0x1e2ff,
 	0x1e4d0, 0x1e4f9,
+	0x1e5d0, 0x1e5fa,
+	0x1e5ff, 0x1e5ff,
 	0x1e7e0, 0x1e7e6,
 	0x1e7e8, 0x1e7eb,
 	0x1e7ed, 0x1e7ee,
@@ -1556,24 +1613,24 @@ static const OnigCodePoint CR_Graph[] = {
 	0x1f850, 0x1f859,
 	0x1f860, 0x1f887,
 	0x1f890, 0x1f8ad,
-	0x1f8b0, 0x1f8b1,
+	0x1f8b0, 0x1f8bb,
+	0x1f8c0, 0x1f8c1,
 	0x1f900, 0x1fa53,
 	0x1fa60, 0x1fa6d,
 	0x1fa70, 0x1fa7c,
-	0x1fa80, 0x1fa88,
-	0x1fa90, 0x1fabd,
-	0x1fabf, 0x1fac5,
-	0x1face, 0x1fadb,
-	0x1fae0, 0x1fae8,
+	0x1fa80, 0x1fa89,
+	0x1fa8f, 0x1fac6,
+	0x1face, 0x1fadc,
+	0x1fadf, 0x1fae9,
 	0x1faf0, 0x1faf8,
 	0x1fb00, 0x1fb92,
-	0x1fb94, 0x1fbca,
-	0x1fbf0, 0x1fbf9,
+	0x1fb94, 0x1fbf9,
 	0x20000, 0x2a6df,
 	0x2a700, 0x2b739,
 	0x2b740, 0x2b81d,
 	0x2b820, 0x2cea1,
 	0x2ceb0, 0x2ebe0,
+	0x2ebf0, 0x2ee5d,
 	0x2f800, 0x2fa1d,
 	0x30000, 0x3134a,
 	0x31350, 0x323af,
@@ -1586,7 +1643,7 @@ static const OnigCodePoint CR_Graph[] = {
 
 /* 'Lower': [[:Lower:]] */
 static const OnigCodePoint CR_Lower[] = {
-	671,
+	675,
 	0x0061, 0x007a,
 	0x00aa, 0x00aa,
 	0x00b5, 0x00b5,
@@ -1866,6 +1923,7 @@ static const OnigCodePoint CR_Lower[] = {
 	0x10fc, 0x10ff,
 	0x13f8, 0x13fd,
 	0x1c80, 0x1c88,
+	0x1c8a, 0x1c8a,
 	0x1d00, 0x1dbf,
 	0x1e01, 0x1e01,
 	0x1e03, 0x1e03,
@@ -2198,11 +2256,13 @@ static const OnigCodePoint CR_Lower[] = {
 	0xa7c3, 0xa7c3,
 	0xa7c8, 0xa7c8,
 	0xa7ca, 0xa7ca,
+	0xa7cd, 0xa7cd,
 	0xa7d1, 0xa7d1,
 	0xa7d3, 0xa7d3,
 	0xa7d5, 0xa7d5,
 	0xa7d7, 0xa7d7,
 	0xa7d9, 0xa7d9,
+	0xa7db, 0xa7db,
 	0xa7f2, 0xa7f4,
 	0xa7f6, 0xa7f6,
 	0xa7f8, 0xa7fa,
@@ -2223,6 +2283,7 @@ static const OnigCodePoint CR_Lower[] = {
 	0x10787, 0x107b0,
 	0x107b2, 0x107ba,
 	0x10cc0, 0x10cf2,
+	0x10d70, 0x10d85,
 	0x118c0, 0x118df,
 	0x16e60, 0x16e7f,
 	0x1d41a, 0x1d433,
@@ -2262,7 +2323,7 @@ static const OnigCodePoint CR_Lower[] = {
 
 /* 'Print': [[:Print:]] */
 static const OnigCodePoint CR_Print[] = {
-	709,
+	733,
 	0x0020, 0x007e,
 	0x00a0, 0x0377,
 	0x037a, 0x037f,
@@ -2287,7 +2348,7 @@ static const OnigCodePoint CR_Print[] = {
 	0x0860, 0x086a,
 	0x0870, 0x088e,
 	0x0890, 0x0891,
-	0x0898, 0x0983,
+	0x0897, 0x0983,
 	0x0985, 0x098c,
 	0x098f, 0x0990,
 	0x0993, 0x09a8,
@@ -2479,11 +2540,10 @@ static const OnigCodePoint CR_Print[] = {
 	0x1aa0, 0x1aad,
 	0x1ab0, 0x1ace,
 	0x1b00, 0x1b4c,
-	0x1b50, 0x1b7e,
-	0x1b80, 0x1bf3,
+	0x1b4e, 0x1bf3,
 	0x1bfc, 0x1c37,
 	0x1c3b, 0x1c49,
-	0x1c4d, 0x1c88,
+	0x1c4d, 0x1c8a,
 	0x1c90, 0x1cba,
 	0x1cbd, 0x1cc7,
 	0x1cd0, 0x1cfa,
@@ -2511,7 +2571,7 @@ static const OnigCodePoint CR_Print[] = {
 	0x20a0, 0x20c0,
 	0x20d0, 0x20f0,
 	0x2100, 0x218b,
-	0x2190, 0x2426,
+	0x2190, 0x2429,
 	0x2440, 0x244a,
 	0x2460, 0x2b73,
 	0x2b76, 0x2b95,
@@ -2534,22 +2594,21 @@ static const OnigCodePoint CR_Print[] = {
 	0x2e80, 0x2e99,
 	0x2e9b, 0x2ef3,
 	0x2f00, 0x2fd5,
-	0x2ff0, 0x2ffb,
-	0x3000, 0x303f,
+	0x2ff0, 0x303f,
 	0x3041, 0x3096,
 	0x3099, 0x30ff,
 	0x3105, 0x312f,
 	0x3131, 0x318e,
-	0x3190, 0x31e3,
-	0x31f0, 0x321e,
+	0x3190, 0x31e5,
+	0x31ef, 0x321e,
 	0x3220, 0xa48c,
 	0xa490, 0xa4c6,
 	0xa4d0, 0xa62b,
 	0xa640, 0xa6f7,
-	0xa700, 0xa7ca,
+	0xa700, 0xa7cd,
 	0xa7d0, 0xa7d1,
 	0xa7d3, 0xa7d3,
-	0xa7d5, 0xa7d9,
+	0xa7d5, 0xa7dc,
 	0xa7f2, 0xa82c,
 	0xa830, 0xa839,
 	0xa840, 0xa877,
@@ -2640,6 +2699,7 @@ static const OnigCodePoint CR_Print[] = {
 	0x105a3, 0x105b1,
 	0x105b3, 0x105b9,
 	0x105bb, 0x105bc,
+	0x105c0, 0x105f3,
 	0x10600, 0x10736,
 	0x10740, 0x10755,
 	0x10760, 0x10767,
@@ -2683,11 +2743,15 @@ static const OnigCodePoint CR_Print[] = {
 	0x10cc0, 0x10cf2,
 	0x10cfa, 0x10d27,
 	0x10d30, 0x10d39,
+	0x10d40, 0x10d65,
+	0x10d69, 0x10d85,
+	0x10d8e, 0x10d8f,
 	0x10e60, 0x10e7e,
 	0x10e80, 0x10ea9,
 	0x10eab, 0x10ead,
 	0x10eb0, 0x10eb1,
-	0x10efd, 0x10f27,
+	0x10ec2, 0x10ec4,
+	0x10efc, 0x10f27,
 	0x10f30, 0x10f59,
 	0x10f70, 0x10f89,
 	0x10fb0, 0x10fcb,
@@ -2727,6 +2791,17 @@ static const OnigCodePoint CR_Print[] = {
 	0x1135d, 0x11363,
 	0x11366, 0x1136c,
 	0x11370, 0x11374,
+	0x11380, 0x11389,
+	0x1138b, 0x1138b,
+	0x1138e, 0x1138e,
+	0x11390, 0x113b5,
+	0x113b7, 0x113c0,
+	0x113c2, 0x113c2,
+	0x113c5, 0x113c5,
+	0x113c7, 0x113ca,
+	0x113cc, 0x113d5,
+	0x113d7, 0x113d8,
+	0x113e1, 0x113e2,
 	0x11400, 0x1145b,
 	0x1145d, 0x11461,
 	0x11480, 0x114c7,
@@ -2738,6 +2813,7 @@ static const OnigCodePoint CR_Print[] = {
 	0x11660, 0x1166c,
 	0x11680, 0x116b9,
 	0x116c0, 0x116c9,
+	0x116d0, 0x116e3,
 	0x11700, 0x1171a,
 	0x1171d, 0x1172b,
 	0x11730, 0x11746,
@@ -2758,6 +2834,8 @@ static const OnigCodePoint CR_Print[] = {
 	0x11a50, 0x11aa2,
 	0x11ab0, 0x11af8,
 	0x11b00, 0x11b09,
+	0x11bc0, 0x11be1,
+	0x11bf0, 0x11bf9,
 	0x11c00, 0x11c08,
 	0x11c0a, 0x11c36,
 	0x11c38, 0x11c45,
@@ -2781,7 +2859,7 @@ static const OnigCodePoint CR_Print[] = {
 	0x11ee0, 0x11ef8,
 	0x11f00, 0x11f10,
 	0x11f12, 0x11f3a,
-	0x11f3e, 0x11f59,
+	0x11f3e, 0x11f5a,
 	0x11fb0, 0x11fb0,
 	0x11fc0, 0x11ff1,
 	0x11fff, 0x12399,
@@ -2790,7 +2868,9 @@ static const OnigCodePoint CR_Print[] = {
 	0x12480, 0x12543,
 	0x12f90, 0x12ff2,
 	0x13000, 0x13455,
+	0x13460, 0x143fa,
 	0x14400, 0x14646,
+	0x16100, 0x16139,
 	0x16800, 0x16a38,
 	0x16a40, 0x16a5e,
 	0x16a60, 0x16a69,
@@ -2803,6 +2883,7 @@ static const OnigCodePoint CR_Print[] = {
 	0x16b5b, 0x16b61,
 	0x16b63, 0x16b77,
 	0x16b7d, 0x16b8f,
+	0x16d40, 0x16d79,
 	0x16e40, 0x16e9a,
 	0x16f00, 0x16f4a,
 	0x16f4f, 0x16f87,
@@ -2811,7 +2892,7 @@ static const OnigCodePoint CR_Print[] = {
 	0x16ff0, 0x16ff1,
 	0x17000, 0x187f7,
 	0x18800, 0x18cd5,
-	0x18d00, 0x18d08,
+	0x18cff, 0x18d08,
 	0x1aff0, 0x1aff3,
 	0x1aff5, 0x1affb,
 	0x1affd, 0x1affe,
@@ -2826,6 +2907,8 @@ static const OnigCodePoint CR_Print[] = {
 	0x1bc80, 0x1bc88,
 	0x1bc90, 0x1bc99,
 	0x1bc9c, 0x1bca3,
+	0x1cc00, 0x1ccf9,
+	0x1cd00, 0x1ceb3,
 	0x1cf00, 0x1cf2d,
 	0x1cf30, 0x1cf46,
 	0x1cf50, 0x1cfc3,
@@ -2877,6 +2960,8 @@ static const OnigCodePoint CR_Print[] = {
 	0x1e2c0, 0x1e2f9,
 	0x1e2ff, 0x1e2ff,
 	0x1e4d0, 0x1e4f9,
+	0x1e5d0, 0x1e5fa,
+	0x1e5ff, 0x1e5ff,
 	0x1e7e0, 0x1e7e6,
 	0x1e7e8, 0x1e7eb,
 	0x1e7ed, 0x1e7ee,
@@ -2946,24 +3031,24 @@ static const OnigCodePoint CR_Print[] = {
 	0x1f850, 0x1f859,
 	0x1f860, 0x1f887,
 	0x1f890, 0x1f8ad,
-	0x1f8b0, 0x1f8b1,
+	0x1f8b0, 0x1f8bb,
+	0x1f8c0, 0x1f8c1,
 	0x1f900, 0x1fa53,
 	0x1fa60, 0x1fa6d,
 	0x1fa70, 0x1fa7c,
-	0x1fa80, 0x1fa88,
-	0x1fa90, 0x1fabd,
-	0x1fabf, 0x1fac5,
-	0x1face, 0x1fadb,
-	0x1fae0, 0x1fae8,
+	0x1fa80, 0x1fa89,
+	0x1fa8f, 0x1fac6,
+	0x1face, 0x1fadc,
+	0x1fadf, 0x1fae9,
 	0x1faf0, 0x1faf8,
 	0x1fb00, 0x1fb92,
-	0x1fb94, 0x1fbca,
-	0x1fbf0, 0x1fbf9,
+	0x1fb94, 0x1fbf9,
 	0x20000, 0x2a6df,
 	0x2a700, 0x2b739,
 	0x2b740, 0x2b81d,
 	0x2b820, 0x2cea1,
 	0x2ceb0, 0x2ebe0,
+	0x2ebf0, 0x2ee5d,
 	0x2f800, 0x2fa1d,
 	0x30000, 0x3134a,
 	0x31350, 0x323af,
@@ -2976,7 +3061,7 @@ static const OnigCodePoint CR_Print[] = {
 
 /* 'XPosixPunct': [[:Punct:]] */
 static const OnigCodePoint CR_XPosixPunct[] = {
-	186,
+	193,
 	0x0021, 0x002f,
 	0x003a, 0x0040,
 	0x005b, 0x0060,
@@ -3037,8 +3122,9 @@ static const OnigCodePoint CR_XPosixPunct[] = {
 	0x1a1e, 0x1a1f,
 	0x1aa0, 0x1aa6,
 	0x1aa8, 0x1aad,
+	0x1b4e, 0x1b4f,
 	0x1b5a, 0x1b60,
-	0x1b7d, 0x1b7e,
+	0x1b7d, 0x1b7f,
 	0x1bfc, 0x1bff,
 	0x1c3b, 0x1c3f,
 	0x1c7e, 0x1c7f,
@@ -3117,6 +3203,7 @@ static const OnigCodePoint CR_XPosixPunct[] = {
 	0x10af0, 0x10af6,
 	0x10b39, 0x10b3f,
 	0x10b99, 0x10b9c,
+	0x10d6e, 0x10d6e,
 	0x10ead, 0x10ead,
 	0x10f55, 0x10f59,
 	0x10f86, 0x10f89,
@@ -3131,6 +3218,8 @@ static const OnigCodePoint CR_XPosixPunct[] = {
 	0x111dd, 0x111df,
 	0x11238, 0x1123d,
 	0x112a9, 0x112a9,
+	0x113d4, 0x113d5,
+	0x113d7, 0x113d8,
 	0x1144b, 0x1144f,
 	0x1145a, 0x1145b,
 	0x1145d, 0x1145d,
@@ -3147,6 +3236,7 @@ static const OnigCodePoint CR_XPosixPunct[] = {
 	0x11a9a, 0x11a9c,
 	0x11a9e, 0x11aa2,
 	0x11b00, 0x11b09,
+	0x11be1, 0x11be1,
 	0x11c41, 0x11c45,
 	0x11c70, 0x11c71,
 	0x11ef7, 0x11ef8,
@@ -3158,10 +3248,12 @@ static const OnigCodePoint CR_XPosixPunct[] = {
 	0x16af5, 0x16af5,
 	0x16b37, 0x16b3b,
 	0x16b44, 0x16b44,
+	0x16d6d, 0x16d6f,
 	0x16e97, 0x16e9a,
 	0x16fe2, 0x16fe2,
 	0x1bc9f, 0x1bc9f,
 	0x1da87, 0x1da8b,
+	0x1e5ff, 0x1e5ff,
 	0x1e95e, 0x1e95f,
 }; /* CR_XPosixPunct */
 
@@ -3182,7 +3274,7 @@ static const OnigCodePoint CR_Space[] = {
 
 /* 'Upper': [[:Upper:]] */
 static const OnigCodePoint CR_Upper[] = {
-	651,
+	656,
 	0x0041, 0x005a,
 	0x00c0, 0x00d6,
 	0x00d8, 0x00de,
@@ -3459,6 +3551,7 @@ static const OnigCodePoint CR_Upper[] = {
 	0x10c7, 0x10c7,
 	0x10cd, 0x10cd,
 	0x13a0, 0x13f5,
+	0x1c89, 0x1c89,
 	0x1c90, 0x1cba,
 	0x1cbd, 0x1cbf,
 	0x1e00, 0x1e00,
@@ -3785,9 +3878,12 @@ static const OnigCodePoint CR_Upper[] = {
 	0xa7c2, 0xa7c2,
 	0xa7c4, 0xa7c7,
 	0xa7c9, 0xa7c9,
+	0xa7cb, 0xa7cc,
 	0xa7d0, 0xa7d0,
 	0xa7d6, 0xa7d6,
 	0xa7d8, 0xa7d8,
+	0xa7da, 0xa7da,
+	0xa7dc, 0xa7dc,
 	0xa7f5, 0xa7f5,
 	0xff21, 0xff3a,
 	0x10400, 0x10427,
@@ -3797,6 +3893,7 @@ static const OnigCodePoint CR_Upper[] = {
 	0x1058c, 0x10592,
 	0x10594, 0x10595,
 	0x10c80, 0x10cb2,
+	0x10d50, 0x10d65,
 	0x118a0, 0x118bf,
 	0x16e40, 0x16e5f,
 	0x1d400, 0x1d419,
@@ -3846,7 +3943,7 @@ static const OnigCodePoint CR_XDigit[] = {
 
 /* 'Word': [[:Word:]] */
 static const OnigCodePoint CR_Word[] = {
-	770,
+	796,
 	0x0030, 0x0039,
 	0x0041, 0x005a,
 	0x005f, 0x005f,
@@ -3899,7 +3996,7 @@ static const OnigCodePoint CR_Word[] = {
 	0x0860, 0x086a,
 	0x0870, 0x0887,
 	0x0889, 0x088e,
-	0x0898, 0x08e1,
+	0x0897, 0x08e1,
 	0x08e3, 0x0963,
 	0x0966, 0x096f,
 	0x0971, 0x0983,
@@ -4120,7 +4217,7 @@ static const OnigCodePoint CR_Word[] = {
 	0x1c00, 0x1c37,
 	0x1c40, 0x1c49,
 	0x1c4d, 0x1c7d,
-	0x1c80, 0x1c88,
+	0x1c80, 0x1c8a,
 	0x1c90, 0x1cba,
 	0x1cbd, 0x1cbf,
 	0x1cd0, 0x1cd2,
@@ -4144,6 +4241,7 @@ static const OnigCodePoint CR_Word[] = {
 	0x1fe0, 0x1fec,
 	0x1ff2, 0x1ff4,
 	0x1ff6, 0x1ffc,
+	0x200c, 0x200d,
 	0x203f, 0x2040,
 	0x2054, 0x2054,
 	0x2071, 0x2071,
@@ -4206,10 +4304,10 @@ static const OnigCodePoint CR_Word[] = {
 	0xa67f, 0xa6f1,
 	0xa717, 0xa71f,
 	0xa722, 0xa788,
-	0xa78b, 0xa7ca,
+	0xa78b, 0xa7cd,
 	0xa7d0, 0xa7d1,
 	0xa7d3, 0xa7d3,
-	0xa7d5, 0xa7d9,
+	0xa7d5, 0xa7dc,
 	0xa7f2, 0xa827,
 	0xa82c, 0xa82c,
 	0xa840, 0xa873,
@@ -4307,6 +4405,7 @@ static const OnigCodePoint CR_Word[] = {
 	0x105a3, 0x105b1,
 	0x105b3, 0x105b9,
 	0x105bb, 0x105bc,
+	0x105c0, 0x105f3,
 	0x10600, 0x10736,
 	0x10740, 0x10755,
 	0x10760, 0x10767,
@@ -4347,10 +4446,14 @@ static const OnigCodePoint CR_Word[] = {
 	0x10cc0, 0x10cf2,
 	0x10d00, 0x10d27,
 	0x10d30, 0x10d39,
+	0x10d40, 0x10d65,
+	0x10d69, 0x10d6d,
+	0x10d6f, 0x10d85,
 	0x10e80, 0x10ea9,
 	0x10eab, 0x10eac,
 	0x10eb0, 0x10eb1,
-	0x10efd, 0x10f1c,
+	0x10ec2, 0x10ec4,
+	0x10efc, 0x10f1c,
 	0x10f27, 0x10f27,
 	0x10f30, 0x10f50,
 	0x10f70, 0x10f85,
@@ -4396,6 +4499,16 @@ static const OnigCodePoint CR_Word[] = {
 	0x1135d, 0x11363,
 	0x11366, 0x1136c,
 	0x11370, 0x11374,
+	0x11380, 0x11389,
+	0x1138b, 0x1138b,
+	0x1138e, 0x1138e,
+	0x11390, 0x113b5,
+	0x113b7, 0x113c0,
+	0x113c2, 0x113c2,
+	0x113c5, 0x113c5,
+	0x113c7, 0x113ca,
+	0x113cc, 0x113d3,
+	0x113e1, 0x113e2,
 	0x11400, 0x1144a,
 	0x11450, 0x11459,
 	0x1145e, 0x11461,
@@ -4410,6 +4523,7 @@ static const OnigCodePoint CR_Word[] = {
 	0x11650, 0x11659,
 	0x11680, 0x116b8,
 	0x116c0, 0x116c9,
+	0x116d0, 0x116e3,
 	0x11700, 0x1171a,
 	0x1171d, 0x1172b,
 	0x11730, 0x11739,
@@ -4433,6 +4547,8 @@ static const OnigCodePoint CR_Word[] = {
 	0x11a50, 0x11a99,
 	0x11a9d, 0x11a9d,
 	0x11ab0, 0x11af8,
+	0x11bc0, 0x11be0,
+	0x11bf0, 0x11bf9,
 	0x11c00, 0x11c08,
 	0x11c0a, 0x11c36,
 	0x11c38, 0x11c40,
@@ -4457,7 +4573,7 @@ static const OnigCodePoint CR_Word[] = {
 	0x11f00, 0x11f10,
 	0x11f12, 0x11f3a,
 	0x11f3e, 0x11f42,
-	0x11f50, 0x11f59,
+	0x11f50, 0x11f5a,
 	0x11fb0, 0x11fb0,
 	0x12000, 0x12399,
 	0x12400, 0x1246e,
@@ -4465,7 +4581,9 @@ static const OnigCodePoint CR_Word[] = {
 	0x12f90, 0x12ff0,
 	0x13000, 0x1342f,
 	0x13440, 0x13455,
+	0x13460, 0x143fa,
 	0x14400, 0x14646,
+	0x16100, 0x16139,
 	0x16800, 0x16a38,
 	0x16a40, 0x16a5e,
 	0x16a60, 0x16a69,
@@ -4478,6 +4596,8 @@ static const OnigCodePoint CR_Word[] = {
 	0x16b50, 0x16b59,
 	0x16b63, 0x16b77,
 	0x16b7d, 0x16b8f,
+	0x16d40, 0x16d6c,
+	0x16d70, 0x16d79,
 	0x16e40, 0x16e7f,
 	0x16f00, 0x16f4a,
 	0x16f4f, 0x16f87,
@@ -4487,7 +4607,7 @@ static const OnigCodePoint CR_Word[] = {
 	0x16ff0, 0x16ff1,
 	0x17000, 0x187f7,
 	0x18800, 0x18cd5,
-	0x18d00, 0x18d08,
+	0x18cff, 0x18d08,
 	0x1aff0, 0x1aff3,
 	0x1aff5, 0x1affb,
 	0x1affd, 0x1affe,
@@ -4502,6 +4622,7 @@ static const OnigCodePoint CR_Word[] = {
 	0x1bc80, 0x1bc88,
 	0x1bc90, 0x1bc99,
 	0x1bc9d, 0x1bc9e,
+	0x1ccf0, 0x1ccf9,
 	0x1cf00, 0x1cf2d,
 	0x1cf30, 0x1cf46,
 	0x1d165, 0x1d169,
@@ -4563,6 +4684,7 @@ static const OnigCodePoint CR_Word[] = {
 	0x1e290, 0x1e2ae,
 	0x1e2c0, 0x1e2f9,
 	0x1e4d0, 0x1e4f9,
+	0x1e5d0, 0x1e5fa,
 	0x1e7e0, 0x1e7e6,
 	0x1e7e8, 0x1e7eb,
 	0x1e7ed, 0x1e7ee,
@@ -4613,6 +4735,7 @@ static const OnigCodePoint CR_Word[] = {
 	0x2b740, 0x2b81d,
 	0x2b820, 0x2cea1,
 	0x2ceb0, 0x2ebe0,
+	0x2ebf0, 0x2ee5d,
 	0x2f800, 0x2fa1d,
 	0x30000, 0x3134a,
 	0x31350, 0x323af,
@@ -4621,7 +4744,7 @@ static const OnigCodePoint CR_Word[] = {
 
 /* 'Alnum': [[:Alnum:]] */
 static const OnigCodePoint CR_Alnum[] = {
-	772,
+	802,
 	0x0030, 0x0039,
 	0x0041, 0x005a,
 	0x0061, 0x007a,
@@ -4636,7 +4759,7 @@ static const OnigCodePoint CR_Alnum[] = {
 	0x02ec, 0x02ec,
 	0x02ee, 0x02ee,
 	0x0345, 0x0345,
-	0x0370, 0x0374,
+	0x0363, 0x0374,
 	0x0376, 0x0377,
 	0x037a, 0x037d,
 	0x037f, 0x037f,
@@ -4676,6 +4799,7 @@ static const OnigCodePoint CR_Alnum[] = {
 	0x0860, 0x086a,
 	0x0870, 0x0887,
 	0x0889, 0x088e,
+	0x0897, 0x0897,
 	0x08a0, 0x08c9,
 	0x08d4, 0x08df,
 	0x08e3, 0x08e9,
@@ -4904,7 +5028,7 @@ static const OnigCodePoint CR_Alnum[] = {
 	0x1c00, 0x1c36,
 	0x1c40, 0x1c49,
 	0x1c4d, 0x1c7d,
-	0x1c80, 0x1c88,
+	0x1c80, 0x1c8a,
 	0x1c90, 0x1cba,
 	0x1cbd, 0x1cbf,
 	0x1ce9, 0x1cec,
@@ -4912,7 +5036,7 @@ static const OnigCodePoint CR_Alnum[] = {
 	0x1cf5, 0x1cf6,
 	0x1cfa, 0x1cfa,
 	0x1d00, 0x1dbf,
-	0x1de7, 0x1df4,
+	0x1dd3, 0x1df4,
 	0x1e00, 0x1f15,
 	0x1f18, 0x1f1d,
 	0x1f20, 0x1f45,
@@ -4991,10 +5115,10 @@ static const OnigCodePoint CR_Alnum[] = {
 	0xa67f, 0xa6ef,
 	0xa717, 0xa71f,
 	0xa722, 0xa788,
-	0xa78b, 0xa7ca,
+	0xa78b, 0xa7cd,
 	0xa7d0, 0xa7d1,
 	0xa7d3, 0xa7d3,
-	0xa7d5, 0xa7d9,
+	0xa7d5, 0xa7dc,
 	0xa7f2, 0xa805,
 	0xa807, 0xa827,
 	0xa840, 0xa873,
@@ -5088,6 +5212,7 @@ static const OnigCodePoint CR_Alnum[] = {
 	0x105a3, 0x105b1,
 	0x105b3, 0x105b9,
 	0x105bb, 0x105bc,
+	0x105c0, 0x105f3,
 	0x10600, 0x10736,
 	0x10740, 0x10755,
 	0x10760, 0x10767,
@@ -5126,9 +5251,14 @@ static const OnigCodePoint CR_Alnum[] = {
 	0x10cc0, 0x10cf2,
 	0x10d00, 0x10d27,
 	0x10d30, 0x10d39,
+	0x10d40, 0x10d65,
+	0x10d69, 0x10d69,
+	0x10d6f, 0x10d85,
 	0x10e80, 0x10ea9,
 	0x10eab, 0x10eac,
 	0x10eb0, 0x10eb1,
+	0x10ec2, 0x10ec4,
+	0x10efc, 0x10efc,
 	0x10f00, 0x10f1c,
 	0x10f27, 0x10f27,
 	0x10f30, 0x10f45,
@@ -5175,6 +5305,17 @@ static const OnigCodePoint CR_Alnum[] = {
 	0x11350, 0x11350,
 	0x11357, 0x11357,
 	0x1135d, 0x11363,
+	0x11380, 0x11389,
+	0x1138b, 0x1138b,
+	0x1138e, 0x1138e,
+	0x11390, 0x113b5,
+	0x113b7, 0x113c0,
+	0x113c2, 0x113c2,
+	0x113c5, 0x113c5,
+	0x113c7, 0x113ca,
+	0x113cc, 0x113cd,
+	0x113d1, 0x113d1,
+	0x113d3, 0x113d3,
 	0x11400, 0x11441,
 	0x11443, 0x11445,
 	0x11447, 0x1144a,
@@ -5194,6 +5335,7 @@ static const OnigCodePoint CR_Alnum[] = {
 	0x11680, 0x116b5,
 	0x116b8, 0x116b8,
 	0x116c0, 0x116c9,
+	0x116d0, 0x116e3,
 	0x11700, 0x1171a,
 	0x1171d, 0x1172a,
 	0x11730, 0x11739,
@@ -5219,6 +5361,8 @@ static const OnigCodePoint CR_Alnum[] = {
 	0x11a50, 0x11a97,
 	0x11a9d, 0x11a9d,
 	0x11ab0, 0x11af8,
+	0x11bc0, 0x11be0,
+	0x11bf0, 0x11bf9,
 	0x11c00, 0x11c08,
 	0x11c0a, 0x11c36,
 	0x11c38, 0x11c3e,
@@ -5255,7 +5399,10 @@ static const OnigCodePoint CR_Alnum[] = {
 	0x12f90, 0x12ff0,
 	0x13000, 0x1342f,
 	0x13441, 0x13446,
+	0x13460, 0x143fa,
 	0x14400, 0x14646,
+	0x16100, 0x1612e,
+	0x16130, 0x16139,
 	0x16800, 0x16a38,
 	0x16a40, 0x16a5e,
 	0x16a60, 0x16a69,
@@ -5267,6 +5414,8 @@ static const OnigCodePoint CR_Alnum[] = {
 	0x16b50, 0x16b59,
 	0x16b63, 0x16b77,
 	0x16b7d, 0x16b8f,
+	0x16d40, 0x16d6c,
+	0x16d70, 0x16d79,
 	0x16e40, 0x16e7f,
 	0x16f00, 0x16f4a,
 	0x16f4f, 0x16f87,
@@ -5276,7 +5425,7 @@ static const OnigCodePoint CR_Alnum[] = {
 	0x16ff0, 0x16ff1,
 	0x17000, 0x187f7,
 	0x18800, 0x18cd5,
-	0x18d00, 0x18d08,
+	0x18cff, 0x18d08,
 	0x1aff0, 0x1aff3,
 	0x1aff5, 0x1affb,
 	0x1affd, 0x1affe,
@@ -5291,6 +5440,7 @@ static const OnigCodePoint CR_Alnum[] = {
 	0x1bc80, 0x1bc88,
 	0x1bc90, 0x1bc99,
 	0x1bc9e, 0x1bc9e,
+	0x1ccf0, 0x1ccf9,
 	0x1d400, 0x1d454,
 	0x1d456, 0x1d49c,
 	0x1d49e, 0x1d49f,
@@ -5340,6 +5490,8 @@ static const OnigCodePoint CR_Alnum[] = {
 	0x1e2f0, 0x1e2f9,
 	0x1e4d0, 0x1e4eb,
 	0x1e4f0, 0x1e4f9,
+	0x1e5d0, 0x1e5ed,
+	0x1e5f0, 0x1e5fa,
 	0x1e7e0, 0x1e7e6,
 	0x1e7e8, 0x1e7eb,
 	0x1e7ed, 0x1e7ee,
@@ -5391,6 +5543,7 @@ static const OnigCodePoint CR_Alnum[] = {
 	0x2b740, 0x2b81d,
 	0x2b820, 0x2cea1,
 	0x2ceb0, 0x2ebe0,
+	0x2ebf0, 0x2ee5d,
 	0x2f800, 0x2fa1d,
 	0x30000, 0x3134a,
 	0x31350, 0x323af,
@@ -5404,7 +5557,7 @@ static const OnigCodePoint CR_ASCII[] = {
 
 /* 'Punct': [[:Punct:]] */
 static const OnigCodePoint CR_Punct[] = {
-	191,
+	198,
 	0x0021, 0x0023,
 	0x0025, 0x002a,
 	0x002c, 0x002f,
@@ -5470,8 +5623,9 @@ static const OnigCodePoint CR_Punct[] = {
 	0x1a1e, 0x1a1f,
 	0x1aa0, 0x1aa6,
 	0x1aa8, 0x1aad,
+	0x1b4e, 0x1b4f,
 	0x1b5a, 0x1b60,
-	0x1b7d, 0x1b7e,
+	0x1b7d, 0x1b7f,
 	0x1bfc, 0x1bff,
 	0x1c3b, 0x1c3f,
 	0x1c7e, 0x1c7f,
@@ -5550,6 +5704,7 @@ static const OnigCodePoint CR_Punct[] = {
 	0x10af0, 0x10af6,
 	0x10b39, 0x10b3f,
 	0x10b99, 0x10b9c,
+	0x10d6e, 0x10d6e,
 	0x10ead, 0x10ead,
 	0x10f55, 0x10f59,
 	0x10f86, 0x10f89,
@@ -5564,6 +5719,8 @@ static const OnigCodePoint CR_Punct[] = {
 	0x111dd, 0x111df,
 	0x11238, 0x1123d,
 	0x112a9, 0x112a9,
+	0x113d4, 0x113d5,
+	0x113d7, 0x113d8,
 	0x1144b, 0x1144f,
 	0x1145a, 0x1145b,
 	0x1145d, 0x1145d,
@@ -5580,6 +5737,7 @@ static const OnigCodePoint CR_Punct[] = {
 	0x11a9a, 0x11a9c,
 	0x11a9e, 0x11aa2,
 	0x11b00, 0x11b09,
+	0x11be1, 0x11be1,
 	0x11c41, 0x11c45,
 	0x11c70, 0x11c71,
 	0x11ef7, 0x11ef8,
@@ -5591,10 +5749,12 @@ static const OnigCodePoint CR_Punct[] = {
 	0x16af5, 0x16af5,
 	0x16b37, 0x16b3b,
 	0x16b44, 0x16b44,
+	0x16d6d, 0x16d6f,
 	0x16e97, 0x16e9a,
 	0x16fe2, 0x16fe2,
 	0x1bc9f, 0x1bc9f,
 	0x1da87, 0x1da8b,
+	0x1e5ff, 0x1e5ff,
 	0x1e95e, 0x1e95f,
 }; /* CR_Punct */
 
@@ -5607,7 +5767,7 @@ static const OnigCodePoint CR_Any[] = {
 
 /* 'Assigned': - */
 static const OnigCodePoint CR_Assigned[] = {
-	707,
+	731,
 	0x0000, 0x0377,
 	0x037a, 0x037f,
 	0x0384, 0x038a,
@@ -5631,7 +5791,7 @@ static const OnigCodePoint CR_Assigned[] = {
 	0x0860, 0x086a,
 	0x0870, 0x088e,
 	0x0890, 0x0891,
-	0x0898, 0x0983,
+	0x0897, 0x0983,
 	0x0985, 0x098c,
 	0x098f, 0x0990,
 	0x0993, 0x09a8,
@@ -5823,11 +5983,10 @@ static const OnigCodePoint CR_Assigned[] = {
 	0x1aa0, 0x1aad,
 	0x1ab0, 0x1ace,
 	0x1b00, 0x1b4c,
-	0x1b50, 0x1b7e,
-	0x1b80, 0x1bf3,
+	0x1b4e, 0x1bf3,
 	0x1bfc, 0x1c37,
 	0x1c3b, 0x1c49,
-	0x1c4d, 0x1c88,
+	0x1c4d, 0x1c8a,
 	0x1c90, 0x1cba,
 	0x1cbd, 0x1cc7,
 	0x1cd0, 0x1cfa,
@@ -5854,7 +6013,7 @@ static const OnigCodePoint CR_Assigned[] = {
 	0x20a0, 0x20c0,
 	0x20d0, 0x20f0,
 	0x2100, 0x218b,
-	0x2190, 0x2426,
+	0x2190, 0x2429,
 	0x2440, 0x244a,
 	0x2460, 0x2b73,
 	0x2b76, 0x2b95,
@@ -5877,22 +6036,21 @@ static const OnigCodePoint CR_Assigned[] = {
 	0x2e80, 0x2e99,
 	0x2e9b, 0x2ef3,
 	0x2f00, 0x2fd5,
-	0x2ff0, 0x2ffb,
-	0x3000, 0x303f,
+	0x2ff0, 0x303f,
 	0x3041, 0x3096,
 	0x3099, 0x30ff,
 	0x3105, 0x312f,
 	0x3131, 0x318e,
-	0x3190, 0x31e3,
-	0x31f0, 0x321e,
+	0x3190, 0x31e5,
+	0x31ef, 0x321e,
 	0x3220, 0xa48c,
 	0xa490, 0xa4c6,
 	0xa4d0, 0xa62b,
 	0xa640, 0xa6f7,
-	0xa700, 0xa7ca,
+	0xa700, 0xa7cd,
 	0xa7d0, 0xa7d1,
 	0xa7d3, 0xa7d3,
-	0xa7d5, 0xa7d9,
+	0xa7d5, 0xa7dc,
 	0xa7f2, 0xa82c,
 	0xa830, 0xa839,
 	0xa840, 0xa877,
@@ -5983,6 +6141,7 @@ static const OnigCodePoint CR_Assigned[] = {
 	0x105a3, 0x105b1,
 	0x105b3, 0x105b9,
 	0x105bb, 0x105bc,
+	0x105c0, 0x105f3,
 	0x10600, 0x10736,
 	0x10740, 0x10755,
 	0x10760, 0x10767,
@@ -6026,11 +6185,15 @@ static const OnigCodePoint CR_Assigned[] = {
 	0x10cc0, 0x10cf2,
 	0x10cfa, 0x10d27,
 	0x10d30, 0x10d39,
+	0x10d40, 0x10d65,
+	0x10d69, 0x10d85,
+	0x10d8e, 0x10d8f,
 	0x10e60, 0x10e7e,
 	0x10e80, 0x10ea9,
 	0x10eab, 0x10ead,
 	0x10eb0, 0x10eb1,
-	0x10efd, 0x10f27,
+	0x10ec2, 0x10ec4,
+	0x10efc, 0x10f27,
 	0x10f30, 0x10f59,
 	0x10f70, 0x10f89,
 	0x10fb0, 0x10fcb,
@@ -6070,6 +6233,17 @@ static const OnigCodePoint CR_Assigned[] = {
 	0x1135d, 0x11363,
 	0x11366, 0x1136c,
 	0x11370, 0x11374,
+	0x11380, 0x11389,
+	0x1138b, 0x1138b,
+	0x1138e, 0x1138e,
+	0x11390, 0x113b5,
+	0x113b7, 0x113c0,
+	0x113c2, 0x113c2,
+	0x113c5, 0x113c5,
+	0x113c7, 0x113ca,
+	0x113cc, 0x113d5,
+	0x113d7, 0x113d8,
+	0x113e1, 0x113e2,
 	0x11400, 0x1145b,
 	0x1145d, 0x11461,
 	0x11480, 0x114c7,
@@ -6081,6 +6255,7 @@ static const OnigCodePoint CR_Assigned[] = {
 	0x11660, 0x1166c,
 	0x11680, 0x116b9,
 	0x116c0, 0x116c9,
+	0x116d0, 0x116e3,
 	0x11700, 0x1171a,
 	0x1171d, 0x1172b,
 	0x11730, 0x11746,
@@ -6101,6 +6276,8 @@ static const OnigCodePoint CR_Assigned[] = {
 	0x11a50, 0x11aa2,
 	0x11ab0, 0x11af8,
 	0x11b00, 0x11b09,
+	0x11bc0, 0x11be1,
+	0x11bf0, 0x11bf9,
 	0x11c00, 0x11c08,
 	0x11c0a, 0x11c36,
 	0x11c38, 0x11c45,
@@ -6124,7 +6301,7 @@ static const OnigCodePoint CR_Assigned[] = {
 	0x11ee0, 0x11ef8,
 	0x11f00, 0x11f10,
 	0x11f12, 0x11f3a,
-	0x11f3e, 0x11f59,
+	0x11f3e, 0x11f5a,
 	0x11fb0, 0x11fb0,
 	0x11fc0, 0x11ff1,
 	0x11fff, 0x12399,
@@ -6133,7 +6310,9 @@ static const OnigCodePoint CR_Assigned[] = {
 	0x12480, 0x12543,
 	0x12f90, 0x12ff2,
 	0x13000, 0x13455,
+	0x13460, 0x143fa,
 	0x14400, 0x14646,
+	0x16100, 0x16139,
 	0x16800, 0x16a38,
 	0x16a40, 0x16a5e,
 	0x16a60, 0x16a69,
@@ -6146,6 +6325,7 @@ static const OnigCodePoint CR_Assigned[] = {
 	0x16b5b, 0x16b61,
 	0x16b63, 0x16b77,
 	0x16b7d, 0x16b8f,
+	0x16d40, 0x16d79,
 	0x16e40, 0x16e9a,
 	0x16f00, 0x16f4a,
 	0x16f4f, 0x16f87,
@@ -6154,7 +6334,7 @@ static const OnigCodePoint CR_Assigned[] = {
 	0x16ff0, 0x16ff1,
 	0x17000, 0x187f7,
 	0x18800, 0x18cd5,
-	0x18d00, 0x18d08,
+	0x18cff, 0x18d08,
 	0x1aff0, 0x1aff3,
 	0x1aff5, 0x1affb,
 	0x1affd, 0x1affe,
@@ -6169,6 +6349,8 @@ static const OnigCodePoint CR_Assigned[] = {
 	0x1bc80, 0x1bc88,
 	0x1bc90, 0x1bc99,
 	0x1bc9c, 0x1bca3,
+	0x1cc00, 0x1ccf9,
+	0x1cd00, 0x1ceb3,
 	0x1cf00, 0x1cf2d,
 	0x1cf30, 0x1cf46,
 	0x1cf50, 0x1cfc3,
@@ -6220,6 +6402,8 @@ static const OnigCodePoint CR_Assigned[] = {
 	0x1e2c0, 0x1e2f9,
 	0x1e2ff, 0x1e2ff,
 	0x1e4d0, 0x1e4f9,
+	0x1e5d0, 0x1e5fa,
+	0x1e5ff, 0x1e5ff,
 	0x1e7e0, 0x1e7e6,
 	0x1e7e8, 0x1e7eb,
 	0x1e7ed, 0x1e7ee,
@@ -6289,24 +6473,24 @@ static const OnigCodePoint CR_Assigned[] = {
 	0x1f850, 0x1f859,
 	0x1f860, 0x1f887,
 	0x1f890, 0x1f8ad,
-	0x1f8b0, 0x1f8b1,
+	0x1f8b0, 0x1f8bb,
+	0x1f8c0, 0x1f8c1,
 	0x1f900, 0x1fa53,
 	0x1fa60, 0x1fa6d,
 	0x1fa70, 0x1fa7c,
-	0x1fa80, 0x1fa88,
-	0x1fa90, 0x1fabd,
-	0x1fabf, 0x1fac5,
-	0x1face, 0x1fadb,
-	0x1fae0, 0x1fae8,
+	0x1fa80, 0x1fa89,
+	0x1fa8f, 0x1fac6,
+	0x1face, 0x1fadc,
+	0x1fadf, 0x1fae9,
 	0x1faf0, 0x1faf8,
 	0x1fb00, 0x1fb92,
-	0x1fb94, 0x1fbca,
-	0x1fbf0, 0x1fbf9,
+	0x1fb94, 0x1fbf9,
 	0x20000, 0x2a6df,
 	0x2a700, 0x2b739,
 	0x2b740, 0x2b81d,
 	0x2b820, 0x2cea1,
 	0x2ceb0, 0x2ebe0,
+	0x2ebf0, 0x2ee5d,
 	0x2f800, 0x2fa1d,
 	0x30000, 0x3134a,
 	0x31350, 0x323af,
@@ -6319,7 +6503,7 @@ static const OnigCodePoint CR_Assigned[] = {
 
 /* 'C': Major Category */
 static const OnigCodePoint CR_C[] = {
-	712,
+	736,
 	0x0000, 0x001f,
 	0x007f, 0x009f,
 	0x00ad, 0x00ad,
@@ -6346,7 +6530,7 @@ static const OnigCodePoint CR_C[] = {
 	0x085c, 0x085d,
 	0x085f, 0x085f,
 	0x086b, 0x086f,
-	0x088f, 0x0897,
+	0x088f, 0x0896,
 	0x08e2, 0x08e2,
 	0x0984, 0x0984,
 	0x098d, 0x098e,
@@ -6540,12 +6724,11 @@ static const OnigCodePoint CR_C[] = {
 	0x1a9a, 0x1a9f,
 	0x1aae, 0x1aaf,
 	0x1acf, 0x1aff,
-	0x1b4d, 0x1b4f,
-	0x1b7f, 0x1b7f,
+	0x1b4d, 0x1b4d,
 	0x1bf4, 0x1bfb,
 	0x1c38, 0x1c3a,
 	0x1c4a, 0x1c4c,
-	0x1c89, 0x1c8f,
+	0x1c8b, 0x1c8f,
 	0x1cbb, 0x1cbc,
 	0x1cc8, 0x1ccf,
 	0x1cfb, 0x1cff,
@@ -6574,7 +6757,7 @@ static const OnigCodePoint CR_C[] = {
 	0x20c1, 0x20cf,
 	0x20f1, 0x20ff,
 	0x218c, 0x218f,
-	0x2427, 0x243f,
+	0x242a, 0x243f,
 	0x244b, 0x245f,
 	0x2b74, 0x2b75,
 	0x2b96, 0x2b96,
@@ -6597,22 +6780,21 @@ static const OnigCodePoint CR_C[] = {
 	0x2e9a, 0x2e9a,
 	0x2ef4, 0x2eff,
 	0x2fd6, 0x2fef,
-	0x2ffc, 0x2fff,
 	0x3040, 0x3040,
 	0x3097, 0x3098,
 	0x3100, 0x3104,
 	0x3130, 0x3130,
 	0x318f, 0x318f,
-	0x31e4, 0x31ef,
+	0x31e6, 0x31ee,
 	0x321f, 0x321f,
 	0xa48d, 0xa48f,
 	0xa4c7, 0xa4cf,
 	0xa62c, 0xa63f,
 	0xa6f8, 0xa6ff,
-	0xa7cb, 0xa7cf,
+	0xa7ce, 0xa7cf,
 	0xa7d2, 0xa7d2,
 	0xa7d4, 0xa7d4,
-	0xa7da, 0xa7f1,
+	0xa7dd, 0xa7f1,
 	0xa82d, 0xa82f,
 	0xa83a, 0xa83f,
 	0xa878, 0xa87f,
@@ -6701,7 +6883,8 @@ static const OnigCodePoint CR_C[] = {
 	0x105a2, 0x105a2,
 	0x105b2, 0x105b2,
 	0x105ba, 0x105ba,
-	0x105bd, 0x105ff,
+	0x105bd, 0x105bf,
+	0x105f4, 0x105ff,
 	0x10737, 0x1073f,
 	0x10756, 0x1075f,
 	0x10768, 0x1077f,
@@ -6744,11 +6927,15 @@ static const OnigCodePoint CR_C[] = {
 	0x10cb3, 0x10cbf,
 	0x10cf3, 0x10cf9,
 	0x10d28, 0x10d2f,
-	0x10d3a, 0x10e5f,
+	0x10d3a, 0x10d3f,
+	0x10d66, 0x10d68,
+	0x10d86, 0x10d8d,
+	0x10d90, 0x10e5f,
 	0x10e7f, 0x10e7f,
 	0x10eaa, 0x10eaa,
 	0x10eae, 0x10eaf,
-	0x10eb2, 0x10efc,
+	0x10eb2, 0x10ec1,
+	0x10ec5, 0x10efb,
 	0x10f28, 0x10f2f,
 	0x10f5a, 0x10f6f,
 	0x10f8a, 0x10faf,
@@ -6788,7 +6975,18 @@ static const OnigCodePoint CR_C[] = {
 	0x11358, 0x1135c,
 	0x11364, 0x11365,
 	0x1136d, 0x1136f,
-	0x11375, 0x113ff,
+	0x11375, 0x1137f,
+	0x1138a, 0x1138a,
+	0x1138c, 0x1138d,
+	0x1138f, 0x1138f,
+	0x113b6, 0x113b6,
+	0x113c1, 0x113c1,
+	0x113c3, 0x113c4,
+	0x113c6, 0x113c6,
+	0x113cb, 0x113cb,
+	0x113d6, 0x113d6,
+	0x113d9, 0x113e0,
+	0x113e3, 0x113ff,
 	0x1145c, 0x1145c,
 	0x11462, 0x1147f,
 	0x114c8, 0x114cf,
@@ -6799,7 +6997,8 @@ static const OnigCodePoint CR_C[] = {
 	0x1165a, 0x1165f,
 	0x1166d, 0x1167f,
 	0x116ba, 0x116bf,
-	0x116ca, 0x116ff,
+	0x116ca, 0x116cf,
+	0x116e4, 0x116ff,
 	0x1171b, 0x1171c,
 	0x1172c, 0x1172f,
 	0x11747, 0x117ff,
@@ -6819,7 +7018,9 @@ static const OnigCodePoint CR_C[] = {
 	0x11a48, 0x11a4f,
 	0x11aa3, 0x11aaf,
 	0x11af9, 0x11aff,
-	0x11b0a, 0x11bff,
+	0x11b0a, 0x11bbf,
+	0x11be2, 0x11bef,
+	0x11bfa, 0x11bff,
 	0x11c09, 0x11c09,
 	0x11c37, 0x11c37,
 	0x11c46, 0x11c4f,
@@ -6843,7 +7044,7 @@ static const OnigCodePoint CR_C[] = {
 	0x11ef9, 0x11eff,
 	0x11f11, 0x11f11,
 	0x11f3b, 0x11f3d,
-	0x11f5a, 0x11faf,
+	0x11f5b, 0x11faf,
 	0x11fb1, 0x11fbf,
 	0x11ff2, 0x11ffe,
 	0x1239a, 0x123ff,
@@ -6852,8 +7053,10 @@ static const OnigCodePoint CR_C[] = {
 	0x12544, 0x12f8f,
 	0x12ff3, 0x12fff,
 	0x13430, 0x1343f,
-	0x13456, 0x143ff,
-	0x14647, 0x167ff,
+	0x13456, 0x1345f,
+	0x143fb, 0x143ff,
+	0x14647, 0x160ff,
+	0x1613a, 0x167ff,
 	0x16a39, 0x16a3f,
 	0x16a5f, 0x16a5f,
 	0x16a6a, 0x16a6d,
@@ -6865,7 +7068,8 @@ static const OnigCodePoint CR_C[] = {
 	0x16b5a, 0x16b5a,
 	0x16b62, 0x16b62,
 	0x16b78, 0x16b7c,
-	0x16b90, 0x16e3f,
+	0x16b90, 0x16d3f,
+	0x16d7a, 0x16e3f,
 	0x16e9b, 0x16eff,
 	0x16f4b, 0x16f4e,
 	0x16f88, 0x16f8e,
@@ -6873,7 +7077,7 @@ static const OnigCodePoint CR_C[] = {
 	0x16fe5, 0x16fef,
 	0x16ff2, 0x16fff,
 	0x187f8, 0x187ff,
-	0x18cd6, 0x18cff,
+	0x18cd6, 0x18cfe,
 	0x18d09, 0x1afef,
 	0x1aff4, 0x1aff4,
 	0x1affc, 0x1affc,
@@ -6888,7 +7092,9 @@ static const OnigCodePoint CR_C[] = {
 	0x1bc7d, 0x1bc7f,
 	0x1bc89, 0x1bc8f,
 	0x1bc9a, 0x1bc9b,
-	0x1bca0, 0x1ceff,
+	0x1bca0, 0x1cbff,
+	0x1ccfa, 0x1ccff,
+	0x1ceb4, 0x1ceff,
 	0x1cf2e, 0x1cf2f,
 	0x1cf47, 0x1cf4f,
 	0x1cfc4, 0x1cfff,
@@ -6940,7 +7146,9 @@ static const OnigCodePoint CR_C[] = {
 	0x1e2af, 0x1e2bf,
 	0x1e2fa, 0x1e2fe,
 	0x1e300, 0x1e4cf,
-	0x1e4fa, 0x1e7df,
+	0x1e4fa, 0x1e5cf,
+	0x1e5fb, 0x1e5fe,
+	0x1e600, 0x1e7df,
 	0x1e7e7, 0x1e7e7,
 	0x1e7ec, 0x1e7ec,
 	0x1e7ef, 0x1e7ef,
@@ -7010,24 +7218,24 @@ static const OnigCodePoint CR_C[] = {
 	0x1f85a, 0x1f85f,
 	0x1f888, 0x1f88f,
 	0x1f8ae, 0x1f8af,
-	0x1f8b2, 0x1f8ff,
+	0x1f8bc, 0x1f8bf,
+	0x1f8c2, 0x1f8ff,
 	0x1fa54, 0x1fa5f,
 	0x1fa6e, 0x1fa6f,
 	0x1fa7d, 0x1fa7f,
-	0x1fa89, 0x1fa8f,
-	0x1fabe, 0x1fabe,
-	0x1fac6, 0x1facd,
-	0x1fadc, 0x1fadf,
-	0x1fae9, 0x1faef,
+	0x1fa8a, 0x1fa8e,
+	0x1fac7, 0x1facd,
+	0x1fadd, 0x1fade,
+	0x1faea, 0x1faef,
 	0x1faf9, 0x1faff,
 	0x1fb93, 0x1fb93,
-	0x1fbcb, 0x1fbef,
 	0x1fbfa, 0x1ffff,
 	0x2a6e0, 0x2a6ff,
 	0x2b73a, 0x2b73f,
 	0x2b81e, 0x2b81f,
 	0x2cea2, 0x2ceaf,
-	0x2ebe1, 0x2f7ff,
+	0x2ebe1, 0x2ebef,
+	0x2ee5e, 0x2f7ff,
 	0x2fa1e, 0x2ffff,
 	0x3134b, 0x3134f,
 	0x323b0, 0xe00ff,
@@ -7065,7 +7273,7 @@ static const OnigCodePoint CR_Cf[] = {
 
 /* 'Cn': General Category */
 static const OnigCodePoint CR_Cn[] = {
-	707,
+	731,
 	0x0378, 0x0379,
 	0x0380, 0x0383,
 	0x038b, 0x038b,
@@ -7088,7 +7296,7 @@ static const OnigCodePoint CR_Cn[] = {
 	0x085f, 0x085f,
 	0x086b, 0x086f,
 	0x088f, 0x088f,
-	0x0892, 0x0897,
+	0x0892, 0x0896,
 	0x0984, 0x0984,
 	0x098d, 0x098e,
 	0x0991, 0x0992,
@@ -7280,12 +7488,11 @@ static const OnigCodePoint CR_Cn[] = {
 	0x1a9a, 0x1a9f,
 	0x1aae, 0x1aaf,
 	0x1acf, 0x1aff,
-	0x1b4d, 0x1b4f,
-	0x1b7f, 0x1b7f,
+	0x1b4d, 0x1b4d,
 	0x1bf4, 0x1bfb,
 	0x1c38, 0x1c3a,
 	0x1c4a, 0x1c4c,
-	0x1c89, 0x1c8f,
+	0x1c8b, 0x1c8f,
 	0x1cbb, 0x1cbc,
 	0x1cc8, 0x1ccf,
 	0x1cfb, 0x1cff,
@@ -7312,7 +7519,7 @@ static const OnigCodePoint CR_Cn[] = {
 	0x20c1, 0x20cf,
 	0x20f1, 0x20ff,
 	0x218c, 0x218f,
-	0x2427, 0x243f,
+	0x242a, 0x243f,
 	0x244b, 0x245f,
 	0x2b74, 0x2b75,
 	0x2b96, 0x2b96,
@@ -7335,22 +7542,21 @@ static const OnigCodePoint CR_Cn[] = {
 	0x2e9a, 0x2e9a,
 	0x2ef4, 0x2eff,
 	0x2fd6, 0x2fef,
-	0x2ffc, 0x2fff,
 	0x3040, 0x3040,
 	0x3097, 0x3098,
 	0x3100, 0x3104,
 	0x3130, 0x3130,
 	0x318f, 0x318f,
-	0x31e4, 0x31ef,
+	0x31e6, 0x31ee,
 	0x321f, 0x321f,
 	0xa48d, 0xa48f,
 	0xa4c7, 0xa4cf,
 	0xa62c, 0xa63f,
 	0xa6f8, 0xa6ff,
-	0xa7cb, 0xa7cf,
+	0xa7ce, 0xa7cf,
 	0xa7d2, 0xa7d2,
 	0xa7d4, 0xa7d4,
-	0xa7da, 0xa7f1,
+	0xa7dd, 0xa7f1,
 	0xa82d, 0xa82f,
 	0xa83a, 0xa83f,
 	0xa878, 0xa87f,
@@ -7440,7 +7646,8 @@ static const OnigCodePoint CR_Cn[] = {
 	0x105a2, 0x105a2,
 	0x105b2, 0x105b2,
 	0x105ba, 0x105ba,
-	0x105bd, 0x105ff,
+	0x105bd, 0x105bf,
+	0x105f4, 0x105ff,
 	0x10737, 0x1073f,
 	0x10756, 0x1075f,
 	0x10768, 0x1077f,
@@ -7483,11 +7690,15 @@ static const OnigCodePoint CR_Cn[] = {
 	0x10cb3, 0x10cbf,
 	0x10cf3, 0x10cf9,
 	0x10d28, 0x10d2f,
-	0x10d3a, 0x10e5f,
+	0x10d3a, 0x10d3f,
+	0x10d66, 0x10d68,
+	0x10d86, 0x10d8d,
+	0x10d90, 0x10e5f,
 	0x10e7f, 0x10e7f,
 	0x10eaa, 0x10eaa,
 	0x10eae, 0x10eaf,
-	0x10eb2, 0x10efc,
+	0x10eb2, 0x10ec1,
+	0x10ec5, 0x10efb,
 	0x10f28, 0x10f2f,
 	0x10f5a, 0x10f6f,
 	0x10f8a, 0x10faf,
@@ -7527,7 +7738,18 @@ static const OnigCodePoint CR_Cn[] = {
 	0x11358, 0x1135c,
 	0x11364, 0x11365,
 	0x1136d, 0x1136f,
-	0x11375, 0x113ff,
+	0x11375, 0x1137f,
+	0x1138a, 0x1138a,
+	0x1138c, 0x1138d,
+	0x1138f, 0x1138f,
+	0x113b6, 0x113b6,
+	0x113c1, 0x113c1,
+	0x113c3, 0x113c4,
+	0x113c6, 0x113c6,
+	0x113cb, 0x113cb,
+	0x113d6, 0x113d6,
+	0x113d9, 0x113e0,
+	0x113e3, 0x113ff,
 	0x1145c, 0x1145c,
 	0x11462, 0x1147f,
 	0x114c8, 0x114cf,
@@ -7538,7 +7760,8 @@ static const OnigCodePoint CR_Cn[] = {
 	0x1165a, 0x1165f,
 	0x1166d, 0x1167f,
 	0x116ba, 0x116bf,
-	0x116ca, 0x116ff,
+	0x116ca, 0x116cf,
+	0x116e4, 0x116ff,
 	0x1171b, 0x1171c,
 	0x1172c, 0x1172f,
 	0x11747, 0x117ff,
@@ -7558,7 +7781,9 @@ static const OnigCodePoint CR_Cn[] = {
 	0x11a48, 0x11a4f,
 	0x11aa3, 0x11aaf,
 	0x11af9, 0x11aff,
-	0x11b0a, 0x11bff,
+	0x11b0a, 0x11bbf,
+	0x11be2, 0x11bef,
+	0x11bfa, 0x11bff,
 	0x11c09, 0x11c09,
 	0x11c37, 0x11c37,
 	0x11c46, 0x11c4f,
@@ -7582,7 +7807,7 @@ static const OnigCodePoint CR_Cn[] = {
 	0x11ef9, 0x11eff,
 	0x11f11, 0x11f11,
 	0x11f3b, 0x11f3d,
-	0x11f5a, 0x11faf,
+	0x11f5b, 0x11faf,
 	0x11fb1, 0x11fbf,
 	0x11ff2, 0x11ffe,
 	0x1239a, 0x123ff,
@@ -7590,8 +7815,10 @@ static const OnigCodePoint CR_Cn[] = {
 	0x12475, 0x1247f,
 	0x12544, 0x12f8f,
 	0x12ff3, 0x12fff,
-	0x13456, 0x143ff,
-	0x14647, 0x167ff,
+	0x13456, 0x1345f,
+	0x143fb, 0x143ff,
+	0x14647, 0x160ff,
+	0x1613a, 0x167ff,
 	0x16a39, 0x16a3f,
 	0x16a5f, 0x16a5f,
 	0x16a6a, 0x16a6d,
@@ -7603,7 +7830,8 @@ static const OnigCodePoint CR_Cn[] = {
 	0x16b5a, 0x16b5a,
 	0x16b62, 0x16b62,
 	0x16b78, 0x16b7c,
-	0x16b90, 0x16e3f,
+	0x16b90, 0x16d3f,
+	0x16d7a, 0x16e3f,
 	0x16e9b, 0x16eff,
 	0x16f4b, 0x16f4e,
 	0x16f88, 0x16f8e,
@@ -7611,7 +7839,7 @@ static const OnigCodePoint CR_Cn[] = {
 	0x16fe5, 0x16fef,
 	0x16ff2, 0x16fff,
 	0x187f8, 0x187ff,
-	0x18cd6, 0x18cff,
+	0x18cd6, 0x18cfe,
 	0x18d09, 0x1afef,
 	0x1aff4, 0x1aff4,
 	0x1affc, 0x1affc,
@@ -7626,7 +7854,9 @@ static const OnigCodePoint CR_Cn[] = {
 	0x1bc7d, 0x1bc7f,
 	0x1bc89, 0x1bc8f,
 	0x1bc9a, 0x1bc9b,
-	0x1bca4, 0x1ceff,
+	0x1bca4, 0x1cbff,
+	0x1ccfa, 0x1ccff,
+	0x1ceb4, 0x1ceff,
 	0x1cf2e, 0x1cf2f,
 	0x1cf47, 0x1cf4f,
 	0x1cfc4, 0x1cfff,
@@ -7677,7 +7907,9 @@ static const OnigCodePoint CR_Cn[] = {
 	0x1e2af, 0x1e2bf,
 	0x1e2fa, 0x1e2fe,
 	0x1e300, 0x1e4cf,
-	0x1e4fa, 0x1e7df,
+	0x1e4fa, 0x1e5cf,
+	0x1e5fb, 0x1e5fe,
+	0x1e600, 0x1e7df,
 	0x1e7e7, 0x1e7e7,
 	0x1e7ec, 0x1e7ec,
 	0x1e7ef, 0x1e7ef,
@@ -7747,24 +7979,24 @@ static const OnigCodePoint CR_Cn[] = {
 	0x1f85a, 0x1f85f,
 	0x1f888, 0x1f88f,
 	0x1f8ae, 0x1f8af,
-	0x1f8b2, 0x1f8ff,
+	0x1f8bc, 0x1f8bf,
+	0x1f8c2, 0x1f8ff,
 	0x1fa54, 0x1fa5f,
 	0x1fa6e, 0x1fa6f,
 	0x1fa7d, 0x1fa7f,
-	0x1fa89, 0x1fa8f,
-	0x1fabe, 0x1fabe,
-	0x1fac6, 0x1facd,
-	0x1fadc, 0x1fadf,
-	0x1fae9, 0x1faef,
+	0x1fa8a, 0x1fa8e,
+	0x1fac7, 0x1facd,
+	0x1fadd, 0x1fade,
+	0x1faea, 0x1faef,
 	0x1faf9, 0x1faff,
 	0x1fb93, 0x1fb93,
-	0x1fbcb, 0x1fbef,
 	0x1fbfa, 0x1ffff,
 	0x2a6e0, 0x2a6ff,
 	0x2b73a, 0x2b73f,
 	0x2b81e, 0x2b81f,
 	0x2cea2, 0x2ceaf,
-	0x2ebe1, 0x2f7ff,
+	0x2ebe1, 0x2ebef,
+	0x2ee5e, 0x2f7ff,
 	0x2fa1e, 0x2ffff,
 	0x3134b, 0x3134f,
 	0x323b0, 0xe0000,
@@ -7791,7 +8023,7 @@ static const OnigCodePoint CR_Cs[] = {
 
 /* 'L': Major Category */
 static const OnigCodePoint CR_L[] = {
-	659,
+	677,
 	0x0041, 0x005a,
 	0x0061, 0x007a,
 	0x00aa, 0x00aa,
@@ -8017,7 +8249,7 @@ static const OnigCodePoint CR_L[] = {
 	0x1c00, 0x1c23,
 	0x1c4d, 0x1c4f,
 	0x1c5a, 0x1c7d,
-	0x1c80, 0x1c88,
+	0x1c80, 0x1c8a,
 	0x1c90, 0x1cba,
 	0x1cbd, 0x1cbf,
 	0x1ce9, 0x1cec,
@@ -8101,10 +8333,10 @@ static const OnigCodePoint CR_L[] = {
 	0xa6a0, 0xa6e5,
 	0xa717, 0xa71f,
 	0xa722, 0xa788,
-	0xa78b, 0xa7ca,
+	0xa78b, 0xa7cd,
 	0xa7d0, 0xa7d1,
 	0xa7d3, 0xa7d3,
-	0xa7d5, 0xa7d9,
+	0xa7d5, 0xa7dc,
 	0xa7f2, 0xa801,
 	0xa803, 0xa805,
 	0xa807, 0xa80a,
@@ -8201,6 +8433,7 @@ static const OnigCodePoint CR_L[] = {
 	0x105a3, 0x105b1,
 	0x105b3, 0x105b9,
 	0x105bb, 0x105bc,
+	0x105c0, 0x105f3,
 	0x10600, 0x10736,
 	0x10740, 0x10755,
 	0x10760, 0x10767,
@@ -8237,8 +8470,11 @@ static const OnigCodePoint CR_L[] = {
 	0x10c80, 0x10cb2,
 	0x10cc0, 0x10cf2,
 	0x10d00, 0x10d23,
+	0x10d4a, 0x10d65,
+	0x10d6f, 0x10d85,
 	0x10e80, 0x10ea9,
 	0x10eb0, 0x10eb1,
+	0x10ec2, 0x10ec4,
 	0x10f00, 0x10f1c,
 	0x10f27, 0x10f27,
 	0x10f30, 0x10f45,
@@ -8277,6 +8513,13 @@ static const OnigCodePoint CR_L[] = {
 	0x1133d, 0x1133d,
 	0x11350, 0x11350,
 	0x1135d, 0x11361,
+	0x11380, 0x11389,
+	0x1138b, 0x1138b,
+	0x1138e, 0x1138e,
+	0x11390, 0x113b5,
+	0x113b7, 0x113b7,
+	0x113d1, 0x113d1,
+	0x113d3, 0x113d3,
 	0x11400, 0x11434,
 	0x11447, 0x1144a,
 	0x1145f, 0x11461,
@@ -8311,6 +8554,7 @@ static const OnigCodePoint CR_L[] = {
 	0x11a5c, 0x11a89,
 	0x11a9d, 0x11a9d,
 	0x11ab0, 0x11af8,
+	0x11bc0, 0x11be0,
 	0x11c00, 0x11c08,
 	0x11c0a, 0x11c2e,
 	0x11c40, 0x11c40,
@@ -8333,7 +8577,9 @@ static const OnigCodePoint CR_L[] = {
 	0x12f90, 0x12ff0,
 	0x13000, 0x1342f,
 	0x13441, 0x13446,
+	0x13460, 0x143fa,
 	0x14400, 0x14646,
+	0x16100, 0x1611d,
 	0x16800, 0x16a38,
 	0x16a40, 0x16a5e,
 	0x16a70, 0x16abe,
@@ -8342,6 +8588,7 @@ static const OnigCodePoint CR_L[] = {
 	0x16b40, 0x16b43,
 	0x16b63, 0x16b77,
 	0x16b7d, 0x16b8f,
+	0x16d40, 0x16d6c,
 	0x16e40, 0x16e7f,
 	0x16f00, 0x16f4a,
 	0x16f50, 0x16f50,
@@ -8350,7 +8597,7 @@ static const OnigCodePoint CR_L[] = {
 	0x16fe3, 0x16fe3,
 	0x17000, 0x187f7,
 	0x18800, 0x18cd5,
-	0x18d00, 0x18d08,
+	0x18cff, 0x18d08,
 	0x1aff0, 0x1aff3,
 	0x1aff5, 0x1affb,
 	0x1affd, 0x1affe,
@@ -8403,6 +8650,8 @@ static const OnigCodePoint CR_L[] = {
 	0x1e290, 0x1e2ad,
 	0x1e2c0, 0x1e2eb,
 	0x1e4d0, 0x1e4eb,
+	0x1e5d0, 0x1e5ed,
+	0x1e5f0, 0x1e5f0,
 	0x1e7e0, 0x1e7e6,
 	0x1e7e8, 0x1e7eb,
 	0x1e7ed, 0x1e7ee,
@@ -8448,6 +8697,7 @@ static const OnigCodePoint CR_L[] = {
 	0x2b740, 0x2b81d,
 	0x2b820, 0x2cea1,
 	0x2ceb0, 0x2ebe0,
+	0x2ebf0, 0x2ee5d,
 	0x2f800, 0x2fa1d,
 	0x30000, 0x3134a,
 	0x31350, 0x323af,
@@ -8455,7 +8705,7 @@ static const OnigCodePoint CR_L[] = {
 
 /* 'LC': General Category */
 static const OnigCodePoint CR_LC[] = {
-	143,
+	145,
 	0x0041, 0x005a,
 	0x0061, 0x007a,
 	0x00b5, 0x00b5,
@@ -8485,7 +8735,7 @@ static const OnigCodePoint CR_LC[] = {
 	0x10fd, 0x10ff,
 	0x13a0, 0x13f5,
 	0x13f8, 0x13fd,
-	0x1c80, 0x1c88,
+	0x1c80, 0x1c8a,
 	0x1c90, 0x1cba,
 	0x1cbd, 0x1cbf,
 	0x1d00, 0x1d2b,
@@ -8537,10 +8787,10 @@ static const OnigCodePoint CR_LC[] = {
 	0xa722, 0xa76f,
 	0xa771, 0xa787,
 	0xa78b, 0xa78e,
-	0xa790, 0xa7ca,
+	0xa790, 0xa7cd,
 	0xa7d0, 0xa7d1,
 	0xa7d3, 0xa7d3,
-	0xa7d5, 0xa7d9,
+	0xa7d5, 0xa7dc,
 	0xa7f5, 0xa7f6,
 	0xa7fa, 0xa7fa,
 	0xab30, 0xab5a,
@@ -8563,6 +8813,8 @@ static const OnigCodePoint CR_LC[] = {
 	0x105bb, 0x105bc,
 	0x10c80, 0x10cb2,
 	0x10cc0, 0x10cf2,
+	0x10d50, 0x10d65,
+	0x10d70, 0x10d85,
 	0x118a0, 0x118df,
 	0x16e40, 0x16e7f,
 	0x1d400, 0x1d454,
@@ -8603,7 +8855,7 @@ static const OnigCodePoint CR_LC[] = {
 
 /* 'Ll': General Category */
 static const OnigCodePoint CR_Ll[] = {
-	658,
+	662,
 	0x0061, 0x007a,
 	0x00b5, 0x00b5,
 	0x00df, 0x00f6,
@@ -8878,6 +9130,7 @@ static const OnigCodePoint CR_Ll[] = {
 	0x10fd, 0x10ff,
 	0x13f8, 0x13fd,
 	0x1c80, 0x1c88,
+	0x1c8a, 0x1c8a,
 	0x1d00, 0x1d2b,
 	0x1d6b, 0x1d77,
 	0x1d79, 0x1d9a,
@@ -9208,11 +9461,13 @@ static const OnigCodePoint CR_Ll[] = {
 	0xa7c3, 0xa7c3,
 	0xa7c8, 0xa7c8,
 	0xa7ca, 0xa7ca,
+	0xa7cd, 0xa7cd,
 	0xa7d1, 0xa7d1,
 	0xa7d3, 0xa7d3,
 	0xa7d5, 0xa7d5,
 	0xa7d7, 0xa7d7,
 	0xa7d9, 0xa7d9,
+	0xa7db, 0xa7db,
 	0xa7f6, 0xa7f6,
 	0xa7fa, 0xa7fa,
 	0xab30, 0xab5a,
@@ -9228,6 +9483,7 @@ static const OnigCodePoint CR_Ll[] = {
 	0x105b3, 0x105b9,
 	0x105bb, 0x105bc,
 	0x10cc0, 0x10cf2,
+	0x10d70, 0x10d85,
 	0x118c0, 0x118df,
 	0x16e60, 0x16e7f,
 	0x1d41a, 0x1d433,
@@ -9266,7 +9522,7 @@ static const OnigCodePoint CR_Ll[] = {
 
 /* 'Lm': General Category */
 static const OnigCodePoint CR_Lm[] = {
-	71,
+	75,
 	0x02b0, 0x02c1,
 	0x02c6, 0x02d1,
 	0x02e0, 0x02e4,
@@ -9327,7 +9583,11 @@ static const OnigCodePoint CR_Lm[] = {
 	0x10780, 0x10785,
 	0x10787, 0x107b0,
 	0x107b2, 0x107ba,
+	0x10d4e, 0x10d4e,
+	0x10d6f, 0x10d6f,
 	0x16b40, 0x16b43,
+	0x16d40, 0x16d42,
+	0x16d6b, 0x16d6c,
 	0x16f93, 0x16f9f,
 	0x16fe0, 0x16fe1,
 	0x16fe3, 0x16fe3,
@@ -9342,7 +9602,7 @@ static const OnigCodePoint CR_Lm[] = {
 
 /* 'Lo': General Category */
 static const OnigCodePoint CR_Lo[] = {
-	510,
+	528,
 	0x00aa, 0x00aa,
 	0x00ba, 0x00ba,
 	0x01bb, 0x01bb,
@@ -9652,6 +9912,7 @@ static const OnigCodePoint CR_Lo[] = {
 	0x10450, 0x1049d,
 	0x10500, 0x10527,
 	0x10530, 0x10563,
+	0x105c0, 0x105f3,
 	0x10600, 0x10736,
 	0x10740, 0x10755,
 	0x10760, 0x10767,
@@ -9683,8 +9944,11 @@ static const OnigCodePoint CR_Lo[] = {
 	0x10b80, 0x10b91,
 	0x10c00, 0x10c48,
 	0x10d00, 0x10d23,
+	0x10d4a, 0x10d4d,
+	0x10d4f, 0x10d4f,
 	0x10e80, 0x10ea9,
 	0x10eb0, 0x10eb1,
+	0x10ec2, 0x10ec4,
 	0x10f00, 0x10f1c,
 	0x10f27, 0x10f27,
 	0x10f30, 0x10f45,
@@ -9723,6 +9987,13 @@ static const OnigCodePoint CR_Lo[] = {
 	0x1133d, 0x1133d,
 	0x11350, 0x11350,
 	0x1135d, 0x11361,
+	0x11380, 0x11389,
+	0x1138b, 0x1138b,
+	0x1138e, 0x1138e,
+	0x11390, 0x113b5,
+	0x113b7, 0x113b7,
+	0x113d1, 0x113d1,
+	0x113d3, 0x113d3,
 	0x11400, 0x11434,
 	0x11447, 0x1144a,
 	0x1145f, 0x11461,
@@ -9756,6 +10027,7 @@ static const OnigCodePoint CR_Lo[] = {
 	0x11a5c, 0x11a89,
 	0x11a9d, 0x11a9d,
 	0x11ab0, 0x11af8,
+	0x11bc0, 0x11be0,
 	0x11c00, 0x11c08,
 	0x11c0a, 0x11c2e,
 	0x11c40, 0x11c40,
@@ -9778,7 +10050,9 @@ static const OnigCodePoint CR_Lo[] = {
 	0x12f90, 0x12ff0,
 	0x13000, 0x1342f,
 	0x13441, 0x13446,
+	0x13460, 0x143fa,
 	0x14400, 0x14646,
+	0x16100, 0x1611d,
 	0x16800, 0x16a38,
 	0x16a40, 0x16a5e,
 	0x16a70, 0x16abe,
@@ -9786,11 +10060,12 @@ static const OnigCodePoint CR_Lo[] = {
 	0x16b00, 0x16b2f,
 	0x16b63, 0x16b77,
 	0x16b7d, 0x16b8f,
+	0x16d43, 0x16d6a,
 	0x16f00, 0x16f4a,
 	0x16f50, 0x16f50,
 	0x17000, 0x187f7,
 	0x18800, 0x18cd5,
-	0x18d00, 0x18d08,
+	0x18cff, 0x18d08,
 	0x1b000, 0x1b122,
 	0x1b132, 0x1b132,
 	0x1b150, 0x1b152,
@@ -9807,6 +10082,8 @@ static const OnigCodePoint CR_Lo[] = {
 	0x1e290, 0x1e2ad,
 	0x1e2c0, 0x1e2eb,
 	0x1e4d0, 0x1e4ea,
+	0x1e5d0, 0x1e5ed,
+	0x1e5f0, 0x1e5f0,
 	0x1e7e0, 0x1e7e6,
 	0x1e7e8, 0x1e7eb,
 	0x1e7ed, 0x1e7ee,
@@ -9850,6 +10127,7 @@ static const OnigCodePoint CR_Lo[] = {
 	0x2b740, 0x2b81d,
 	0x2b820, 0x2cea1,
 	0x2ceb0, 0x2ebe0,
+	0x2ebf0, 0x2ee5d,
 	0x2f800, 0x2fa1d,
 	0x30000, 0x3134a,
 	0x31350, 0x323af,
@@ -9872,7 +10150,7 @@ static const OnigCodePoint CR_Lt[] = {
 
 /* 'Lu': General Category */
 static const OnigCodePoint CR_Lu[] = {
-	646,
+	651,
 	0x0041, 0x005a,
 	0x00c0, 0x00d6,
 	0x00d8, 0x00de,
@@ -10149,6 +10427,7 @@ static const OnigCodePoint CR_Lu[] = {
 	0x10c7, 0x10c7,
 	0x10cd, 0x10cd,
 	0x13a0, 0x13f5,
+	0x1c89, 0x1c89,
 	0x1c90, 0x1cba,
 	0x1cbd, 0x1cbf,
 	0x1e00, 0x1e00,
@@ -10473,9 +10752,12 @@ static const OnigCodePoint CR_Lu[] = {
 	0xa7c2, 0xa7c2,
 	0xa7c4, 0xa7c7,
 	0xa7c9, 0xa7c9,
+	0xa7cb, 0xa7cc,
 	0xa7d0, 0xa7d0,
 	0xa7d6, 0xa7d6,
 	0xa7d8, 0xa7d8,
+	0xa7da, 0xa7da,
+	0xa7dc, 0xa7dc,
 	0xa7f5, 0xa7f5,
 	0xff21, 0xff3a,
 	0x10400, 0x10427,
@@ -10485,6 +10767,7 @@ static const OnigCodePoint CR_Lu[] = {
 	0x1058c, 0x10592,
 	0x10594, 0x10595,
 	0x10c80, 0x10cb2,
+	0x10d50, 0x10d65,
 	0x118a0, 0x118bf,
 	0x16e40, 0x16e5f,
 	0x1d400, 0x1d419,
@@ -10523,7 +10806,7 @@ static const OnigCodePoint CR_Lu[] = {
 
 /* 'M': Major Category */
 static const OnigCodePoint CR_M[] = {
-	310,
+	321,
 	0x0300, 0x036f,
 	0x0483, 0x0489,
 	0x0591, 0x05bd,
@@ -10548,7 +10831,7 @@ static const OnigCodePoint CR_M[] = {
 	0x0825, 0x0827,
 	0x0829, 0x082d,
 	0x0859, 0x085b,
-	0x0898, 0x089f,
+	0x0897, 0x089f,
 	0x08ca, 0x08e1,
 	0x08e3, 0x0903,
 	0x093a, 0x093c,
@@ -10724,8 +11007,9 @@ static const OnigCodePoint CR_M[] = {
 	0x10a3f, 0x10a3f,
 	0x10ae5, 0x10ae6,
 	0x10d24, 0x10d27,
+	0x10d69, 0x10d6d,
 	0x10eab, 0x10eac,
-	0x10efd, 0x10eff,
+	0x10efc, 0x10eff,
 	0x10f46, 0x10f50,
 	0x10f82, 0x10f85,
 	0x11000, 0x11002,
@@ -10756,6 +11040,13 @@ static const OnigCodePoint CR_M[] = {
 	0x11362, 0x11363,
 	0x11366, 0x1136c,
 	0x11370, 0x11374,
+	0x113b8, 0x113c0,
+	0x113c2, 0x113c2,
+	0x113c5, 0x113c5,
+	0x113c7, 0x113ca,
+	0x113cc, 0x113d0,
+	0x113d2, 0x113d2,
+	0x113e1, 0x113e2,
 	0x11435, 0x11446,
 	0x1145e, 0x1145e,
 	0x114b0, 0x114c3,
@@ -10797,8 +11088,10 @@ static const OnigCodePoint CR_M[] = {
 	0x11f03, 0x11f03,
 	0x11f34, 0x11f3a,
 	0x11f3e, 0x11f42,
+	0x11f5a, 0x11f5a,
 	0x13440, 0x13440,
 	0x13447, 0x13455,
+	0x1611e, 0x1612f,
 	0x16af0, 0x16af4,
 	0x16b30, 0x16b36,
 	0x16f4f, 0x16f4f,
@@ -10831,6 +11124,7 @@ static const OnigCodePoint CR_M[] = {
 	0x1e2ae, 0x1e2ae,
 	0x1e2ec, 0x1e2ef,
 	0x1e4ec, 0x1e4ef,
+	0x1e5ee, 0x1e5ef,
 	0x1e8d0, 0x1e8d6,
 	0x1e944, 0x1e94a,
 	0xe0100, 0xe01ef,
@@ -10838,7 +11132,7 @@ static const OnigCodePoint CR_M[] = {
 
 /* 'Mc': General Category */
 static const OnigCodePoint CR_Mc[] = {
-	182,
+	190,
 	0x0903, 0x0903,
 	0x093b, 0x093b,
 	0x093e, 0x0940,
@@ -10973,6 +11267,12 @@ static const OnigCodePoint CR_Mc[] = {
 	0x1134b, 0x1134d,
 	0x11357, 0x11357,
 	0x11362, 0x11363,
+	0x113b8, 0x113ba,
+	0x113c2, 0x113c2,
+	0x113c5, 0x113c5,
+	0x113c7, 0x113ca,
+	0x113cc, 0x113cd,
+	0x113cf, 0x113cf,
 	0x11435, 0x11437,
 	0x11440, 0x11441,
 	0x11445, 0x11445,
@@ -10989,6 +11289,7 @@ static const OnigCodePoint CR_Mc[] = {
 	0x116ac, 0x116ac,
 	0x116ae, 0x116af,
 	0x116b6, 0x116b6,
+	0x1171e, 0x1171e,
 	0x11720, 0x11721,
 	0x11726, 0x11726,
 	0x1182c, 0x1182e,
@@ -11017,6 +11318,7 @@ static const OnigCodePoint CR_Mc[] = {
 	0x11f34, 0x11f35,
 	0x11f3e, 0x11f3f,
 	0x11f41, 0x11f41,
+	0x1612a, 0x1612c,
 	0x16f51, 0x16f87,
 	0x16ff0, 0x16ff1,
 	0x1d165, 0x1d166,
@@ -11035,7 +11337,7 @@ static const OnigCodePoint CR_Me[] = {
 
 /* 'Mn': General Category */
 static const OnigCodePoint CR_Mn[] = {
-	346,
+	357,
 	0x0300, 0x036f,
 	0x0483, 0x0487,
 	0x0591, 0x05bd,
@@ -11060,7 +11362,7 @@ static const OnigCodePoint CR_Mn[] = {
 	0x0825, 0x0827,
 	0x0829, 0x082d,
 	0x0859, 0x085b,
-	0x0898, 0x089f,
+	0x0897, 0x089f,
 	0x08ca, 0x08e1,
 	0x08e3, 0x0902,
 	0x093a, 0x093a,
@@ -11258,8 +11560,9 @@ static const OnigCodePoint CR_Mn[] = {
 	0x10a3f, 0x10a3f,
 	0x10ae5, 0x10ae6,
 	0x10d24, 0x10d27,
+	0x10d69, 0x10d6d,
 	0x10eab, 0x10eac,
-	0x10efd, 0x10eff,
+	0x10efc, 0x10eff,
 	0x10f46, 0x10f50,
 	0x10f82, 0x10f85,
 	0x11001, 0x11001,
@@ -11290,6 +11593,11 @@ static const OnigCodePoint CR_Mn[] = {
 	0x11340, 0x11340,
 	0x11366, 0x1136c,
 	0x11370, 0x11374,
+	0x113bb, 0x113c0,
+	0x113ce, 0x113ce,
+	0x113d0, 0x113d0,
+	0x113d2, 0x113d2,
+	0x113e1, 0x113e2,
 	0x11438, 0x1143f,
 	0x11442, 0x11444,
 	0x11446, 0x11446,
@@ -11309,7 +11617,8 @@ static const OnigCodePoint CR_Mn[] = {
 	0x116ad, 0x116ad,
 	0x116b0, 0x116b5,
 	0x116b7, 0x116b7,
-	0x1171d, 0x1171f,
+	0x1171d, 0x1171d,
+	0x1171f, 0x1171f,
 	0x11722, 0x11725,
 	0x11727, 0x1172b,
 	0x1182f, 0x11837,
@@ -11348,8 +11657,11 @@ static const OnigCodePoint CR_Mn[] = {
 	0x11f36, 0x11f3a,
 	0x11f40, 0x11f40,
 	0x11f42, 0x11f42,
+	0x11f5a, 0x11f5a,
 	0x13440, 0x13440,
 	0x13447, 0x13455,
+	0x1611e, 0x16129,
+	0x1612d, 0x1612f,
 	0x16af0, 0x16af4,
 	0x16b30, 0x16b36,
 	0x16f4f, 0x16f4f,
@@ -11379,6 +11691,7 @@ static const OnigCodePoint CR_Mn[] = {
 	0x1e2ae, 0x1e2ae,
 	0x1e2ec, 0x1e2ef,
 	0x1e4ec, 0x1e4ef,
+	0x1e5ee, 0x1e5ef,
 	0x1e8d0, 0x1e8d6,
 	0x1e944, 0x1e94a,
 	0xe0100, 0xe01ef,
@@ -11386,7 +11699,7 @@ static const OnigCodePoint CR_Mn[] = {
 
 /* 'N': Major Category */
 static const OnigCodePoint CR_N[] = {
-	137,
+	144,
 	0x0030, 0x0039,
 	0x00b2, 0x00b3,
 	0x00b9, 0x00b9,
@@ -11480,6 +11793,7 @@ static const OnigCodePoint CR_N[] = {
 	0x10ba9, 0x10baf,
 	0x10cfa, 0x10cff,
 	0x10d30, 0x10d39,
+	0x10d40, 0x10d49,
 	0x10e60, 0x10e7e,
 	0x10f1d, 0x10f26,
 	0x10f51, 0x10f54,
@@ -11494,20 +11808,25 @@ static const OnigCodePoint CR_N[] = {
 	0x114d0, 0x114d9,
 	0x11650, 0x11659,
 	0x116c0, 0x116c9,
+	0x116d0, 0x116e3,
 	0x11730, 0x1173b,
 	0x118e0, 0x118f2,
 	0x11950, 0x11959,
+	0x11bf0, 0x11bf9,
 	0x11c50, 0x11c6c,
 	0x11d50, 0x11d59,
 	0x11da0, 0x11da9,
 	0x11f50, 0x11f59,
 	0x11fc0, 0x11fd4,
 	0x12400, 0x1246e,
+	0x16130, 0x16139,
 	0x16a60, 0x16a69,
 	0x16ac0, 0x16ac9,
 	0x16b50, 0x16b59,
 	0x16b5b, 0x16b61,
+	0x16d70, 0x16d79,
 	0x16e80, 0x16e96,
+	0x1ccf0, 0x1ccf9,
 	0x1d2c0, 0x1d2d3,
 	0x1d2e0, 0x1d2f3,
 	0x1d360, 0x1d378,
@@ -11515,6 +11834,7 @@ static const OnigCodePoint CR_N[] = {
 	0x1e140, 0x1e149,
 	0x1e2f0, 0x1e2f9,
 	0x1e4f0, 0x1e4f9,
+	0x1e5f1, 0x1e5fa,
 	0x1e8c7, 0x1e8cf,
 	0x1e950, 0x1e959,
 	0x1ec71, 0x1ecab,
@@ -11639,7 +11959,7 @@ static const OnigCodePoint CR_Pc[] = {
 
 /* 'Pd': General Category */
 static const OnigCodePoint CR_Pd[] = {
-	19,
+	20,
 	0x002d, 0x002d,
 	0x058a, 0x058a,
 	0x05be, 0x05be,
@@ -11658,6 +11978,7 @@ static const OnigCodePoint CR_Pd[] = {
 	0xfe58, 0xfe58,
 	0xfe63, 0xfe63,
 	0xff0d, 0xff0d,
+	0x10d6e, 0x10d6e,
 	0x10ead, 0x10ead,
 }; /* CR_Pd */
 
@@ -11775,7 +12096,7 @@ static const OnigCodePoint CR_Pi[] = {
 
 /* 'Po': General Category */
 static const OnigCodePoint CR_Po[] = {
-	187,
+	193,
 	0x0021, 0x0023,
 	0x0025, 0x0027,
 	0x002a, 0x002a,
@@ -11835,8 +12156,9 @@ static const OnigCodePoint CR_Po[] = {
 	0x1a1e, 0x1a1f,
 	0x1aa0, 0x1aa6,
 	0x1aa8, 0x1aad,
+	0x1b4e, 0x1b4f,
 	0x1b5a, 0x1b60,
-	0x1b7d, 0x1b7e,
+	0x1b7d, 0x1b7f,
 	0x1bfc, 0x1bff,
 	0x1c3b, 0x1c3f,
 	0x1c7e, 0x1c7f,
@@ -11931,6 +12253,8 @@ static const OnigCodePoint CR_Po[] = {
 	0x111dd, 0x111df,
 	0x11238, 0x1123d,
 	0x112a9, 0x112a9,
+	0x113d4, 0x113d5,
+	0x113d7, 0x113d8,
 	0x1144b, 0x1144f,
 	0x1145a, 0x1145b,
 	0x1145d, 0x1145d,
@@ -11947,6 +12271,7 @@ static const OnigCodePoint CR_Po[] = {
 	0x11a9a, 0x11a9c,
 	0x11a9e, 0x11aa2,
 	0x11b00, 0x11b09,
+	0x11be1, 0x11be1,
 	0x11c41, 0x11c45,
 	0x11c70, 0x11c71,
 	0x11ef7, 0x11ef8,
@@ -11958,10 +12283,12 @@ static const OnigCodePoint CR_Po[] = {
 	0x16af5, 0x16af5,
 	0x16b37, 0x16b3b,
 	0x16b44, 0x16b44,
+	0x16d6d, 0x16d6f,
 	0x16e97, 0x16e9a,
 	0x16fe2, 0x16fe2,
 	0x1bc9f, 0x1bc9f,
 	0x1da87, 0x1da8b,
+	0x1e5ff, 0x1e5ff,
 	0x1e95e, 0x1e95f,
 }; /* CR_Po */
 
@@ -12051,7 +12378,7 @@ static const OnigCodePoint CR_Ps[] = {
 
 /* 'S': Major Category */
 static const OnigCodePoint CR_S[] = {
-	232,
+	236,
 	0x0024, 0x0024,
 	0x002b, 0x002b,
 	0x003c, 0x003e,
@@ -12142,7 +12469,7 @@ static const OnigCodePoint CR_S[] = {
 	0x218a, 0x218b,
 	0x2190, 0x2307,
 	0x230c, 0x2328,
-	0x232b, 0x2426,
+	0x232b, 0x2429,
 	0x2440, 0x244a,
 	0x249c, 0x24e9,
 	0x2500, 0x2767,
@@ -12159,7 +12486,7 @@ static const OnigCodePoint CR_S[] = {
 	0x2e80, 0x2e99,
 	0x2e9b, 0x2ef3,
 	0x2f00, 0x2fd5,
-	0x2ff0, 0x2ffb,
+	0x2ff0, 0x2fff,
 	0x3004, 0x3004,
 	0x3012, 0x3013,
 	0x3020, 0x3020,
@@ -12168,7 +12495,8 @@ static const OnigCodePoint CR_S[] = {
 	0x309b, 0x309c,
 	0x3190, 0x3191,
 	0x3196, 0x319f,
-	0x31c0, 0x31e3,
+	0x31c0, 0x31e5,
+	0x31ef, 0x31ef,
 	0x3200, 0x321e,
 	0x322a, 0x3247,
 	0x3250, 0x3250,
@@ -12211,11 +12539,14 @@ static const OnigCodePoint CR_S[] = {
 	0x101d0, 0x101fc,
 	0x10877, 0x10878,
 	0x10ac8, 0x10ac8,
+	0x10d8e, 0x10d8f,
 	0x1173f, 0x1173f,
 	0x11fd5, 0x11ff1,
 	0x16b3c, 0x16b3f,
 	0x16b45, 0x16b45,
 	0x1bc9c, 0x1bc9c,
+	0x1cc00, 0x1ccef,
+	0x1cd00, 0x1ceb3,
 	0x1cf50, 0x1cfc3,
 	0x1d000, 0x1d0f5,
 	0x1d100, 0x1d126,
@@ -12272,18 +12603,18 @@ static const OnigCodePoint CR_S[] = {
 	0x1f850, 0x1f859,
 	0x1f860, 0x1f887,
 	0x1f890, 0x1f8ad,
-	0x1f8b0, 0x1f8b1,
+	0x1f8b0, 0x1f8bb,
+	0x1f8c0, 0x1f8c1,
 	0x1f900, 0x1fa53,
 	0x1fa60, 0x1fa6d,
 	0x1fa70, 0x1fa7c,
-	0x1fa80, 0x1fa88,
-	0x1fa90, 0x1fabd,
-	0x1fabf, 0x1fac5,
-	0x1face, 0x1fadb,
-	0x1fae0, 0x1fae8,
+	0x1fa80, 0x1fa89,
+	0x1fa8f, 0x1fac6,
+	0x1face, 0x1fadc,
+	0x1fadf, 0x1fae9,
 	0x1faf0, 0x1faf8,
 	0x1fb00, 0x1fb92,
-	0x1fb94, 0x1fbca,
+	0x1fb94, 0x1fbef,
 }; /* CR_S */
 
 /* 'Sc': General Category */
@@ -12350,7 +12681,7 @@ static const OnigCodePoint CR_Sk[] = {
 
 /* 'Sm': General Category */
 static const OnigCodePoint CR_Sm[] = {
-	64,
+	65,
 	0x002b, 0x002b,
 	0x003c, 0x003e,
 	0x007c, 0x007c,
@@ -12404,6 +12735,7 @@ static const OnigCodePoint CR_Sm[] = {
 	0xff5e, 0xff5e,
 	0xffe2, 0xffe2,
 	0xffe9, 0xffec,
+	0x10d8e, 0x10d8f,
 	0x1d6c1, 0x1d6c1,
 	0x1d6db, 0x1d6db,
 	0x1d6fb, 0x1d6fb,
@@ -12419,7 +12751,7 @@ static const OnigCodePoint CR_Sm[] = {
 
 /* 'So': General Category */
 static const OnigCodePoint CR_So[] = {
-	184,
+	187,
 	0x00a6, 0x00a6,
 	0x00a9, 0x00a9,
 	0x00ae, 0x00ae,
@@ -12486,7 +12818,7 @@ static const OnigCodePoint CR_So[] = {
 	0x232b, 0x237b,
 	0x237d, 0x239a,
 	0x23b4, 0x23db,
-	0x23e2, 0x2426,
+	0x23e2, 0x2429,
 	0x2440, 0x244a,
 	0x249c, 0x24e9,
 	0x2500, 0x25b6,
@@ -12506,7 +12838,7 @@ static const OnigCodePoint CR_So[] = {
 	0x2e80, 0x2e99,
 	0x2e9b, 0x2ef3,
 	0x2f00, 0x2fd5,
-	0x2ff0, 0x2ffb,
+	0x2ff0, 0x2fff,
 	0x3004, 0x3004,
 	0x3012, 0x3013,
 	0x3020, 0x3020,
@@ -12514,7 +12846,8 @@ static const OnigCodePoint CR_So[] = {
 	0x303e, 0x303f,
 	0x3190, 0x3191,
 	0x3196, 0x319f,
-	0x31c0, 0x31e3,
+	0x31c0, 0x31e5,
+	0x31ef, 0x31ef,
 	0x3200, 0x321e,
 	0x322a, 0x3247,
 	0x3250, 0x3250,
@@ -12548,6 +12881,8 @@ static const OnigCodePoint CR_So[] = {
 	0x16b3c, 0x16b3f,
 	0x16b45, 0x16b45,
 	0x1bc9c, 0x1bc9c,
+	0x1cc00, 0x1ccef,
+	0x1cd00, 0x1ceb3,
 	0x1cf50, 0x1cfc3,
 	0x1d000, 0x1d0f5,
 	0x1d100, 0x1d126,
@@ -12592,18 +12927,18 @@ static const OnigCodePoint CR_So[] = {
 	0x1f850, 0x1f859,
 	0x1f860, 0x1f887,
 	0x1f890, 0x1f8ad,
-	0x1f8b0, 0x1f8b1,
+	0x1f8b0, 0x1f8bb,
+	0x1f8c0, 0x1f8c1,
 	0x1f900, 0x1fa53,
 	0x1fa60, 0x1fa6d,
 	0x1fa70, 0x1fa7c,
-	0x1fa80, 0x1fa88,
-	0x1fa90, 0x1fabd,
-	0x1fabf, 0x1fac5,
-	0x1face, 0x1fadb,
-	0x1fae0, 0x1fae8,
+	0x1fa80, 0x1fa89,
+	0x1fa8f, 0x1fac6,
+	0x1face, 0x1fadc,
+	0x1fadf, 0x1fae9,
 	0x1faf0, 0x1faf8,
 	0x1fb00, 0x1fb92,
-	0x1fb94, 0x1fbca,
+	0x1fb94, 0x1fbef,
 }; /* CR_So */
 
 /* 'Z': Major Category */
@@ -12645,7 +12980,7 @@ static const OnigCodePoint CR_Zs[] = {
 
 /* 'Math': Derived Property */
 static const OnigCodePoint CR_Math[] = {
-	138,
+	139,
 	0x002b, 0x002b,
 	0x003c, 0x003e,
 	0x005e, 0x005e,
@@ -12729,6 +13064,7 @@ static const OnigCodePoint CR_Math[] = {
 	0xff5e, 0xff5e,
 	0xffe2, 0xffe2,
 	0xffe9, 0xffec,
+	0x10d8e, 0x10d8f,
 	0x1d400, 0x1d454,
 	0x1d456, 0x1d49c,
 	0x1d49e, 0x1d49f,
@@ -12797,7 +13133,7 @@ static const OnigCodePoint CR_Math[] = {
 
 /* 'Cased': Derived Property */
 static const OnigCodePoint CR_Cased[] = {
-	157,
+	159,
 	0x0041, 0x005a,
 	0x0061, 0x007a,
 	0x00aa, 0x00aa,
@@ -12832,7 +13168,7 @@ static const OnigCodePoint CR_Cased[] = {
 	0x10fc, 0x10ff,
 	0x13a0, 0x13f5,
 	0x13f8, 0x13fd,
-	0x1c80, 0x1c88,
+	0x1c80, 0x1c8a,
 	0x1c90, 0x1cba,
 	0x1cbd, 0x1cbf,
 	0x1d00, 0x1dbf,
@@ -12885,10 +13221,10 @@ static const OnigCodePoint CR_Cased[] = {
 	0xa680, 0xa69d,
 	0xa722, 0xa787,
 	0xa78b, 0xa78e,
-	0xa790, 0xa7ca,
+	0xa790, 0xa7cd,
 	0xa7d0, 0xa7d1,
 	0xa7d3, 0xa7d3,
-	0xa7d5, 0xa7d9,
+	0xa7d5, 0xa7dc,
 	0xa7f2, 0xa7f6,
 	0xa7f8, 0xa7fa,
 	0xab30, 0xab5a,
@@ -12915,6 +13251,8 @@ static const OnigCodePoint CR_Cased[] = {
 	0x107b2, 0x107ba,
 	0x10c80, 0x10cb2,
 	0x10cc0, 0x10cf2,
+	0x10d50, 0x10d65,
+	0x10d70, 0x10d85,
 	0x118a0, 0x118df,
 	0x16e40, 0x16e7f,
 	0x1d400, 0x1d454,
@@ -12959,7 +13297,7 @@ static const OnigCodePoint CR_Cased[] = {
 
 /* 'Case_Ignorable': Derived Property */
 static const OnigCodePoint CR_Case_Ignorable[] = {
-	437,
+	452,
 	0x0027, 0x0027,
 	0x002e, 0x002e,
 	0x003a, 0x003a,
@@ -13004,7 +13342,7 @@ static const OnigCodePoint CR_Case_Ignorable[] = {
 	0x0859, 0x085b,
 	0x0888, 0x0888,
 	0x0890, 0x0891,
-	0x0898, 0x089f,
+	0x0897, 0x089f,
 	0x08c9, 0x0902,
 	0x093a, 0x093a,
 	0x093c, 0x093c,
@@ -13261,8 +13599,11 @@ static const OnigCodePoint CR_Case_Ignorable[] = {
 	0x10a3f, 0x10a3f,
 	0x10ae5, 0x10ae6,
 	0x10d24, 0x10d27,
+	0x10d4e, 0x10d4e,
+	0x10d69, 0x10d6d,
+	0x10d6f, 0x10d6f,
 	0x10eab, 0x10eac,
-	0x10efd, 0x10eff,
+	0x10efc, 0x10eff,
 	0x10f46, 0x10f50,
 	0x10f82, 0x10f85,
 	0x11001, 0x11001,
@@ -13295,6 +13636,11 @@ static const OnigCodePoint CR_Case_Ignorable[] = {
 	0x11340, 0x11340,
 	0x11366, 0x1136c,
 	0x11370, 0x11374,
+	0x113bb, 0x113c0,
+	0x113ce, 0x113ce,
+	0x113d0, 0x113d0,
+	0x113d2, 0x113d2,
+	0x113e1, 0x113e2,
 	0x11438, 0x1143f,
 	0x11442, 0x11444,
 	0x11446, 0x11446,
@@ -13314,7 +13660,8 @@ static const OnigCodePoint CR_Case_Ignorable[] = {
 	0x116ad, 0x116ad,
 	0x116b0, 0x116b5,
 	0x116b7, 0x116b7,
-	0x1171d, 0x1171f,
+	0x1171d, 0x1171d,
+	0x1171f, 0x1171f,
 	0x11722, 0x11725,
 	0x11727, 0x1172b,
 	0x1182f, 0x11837,
@@ -13353,11 +13700,16 @@ static const OnigCodePoint CR_Case_Ignorable[] = {
 	0x11f36, 0x11f3a,
 	0x11f40, 0x11f40,
 	0x11f42, 0x11f42,
+	0x11f5a, 0x11f5a,
 	0x13430, 0x13440,
 	0x13447, 0x13455,
+	0x1611e, 0x16129,
+	0x1612d, 0x1612f,
 	0x16af0, 0x16af4,
 	0x16b30, 0x16b36,
 	0x16b40, 0x16b43,
+	0x16d40, 0x16d42,
+	0x16d6b, 0x16d6c,
 	0x16f4f, 0x16f4f,
 	0x16f8f, 0x16f9f,
 	0x16fe0, 0x16fe1,
@@ -13391,6 +13743,7 @@ static const OnigCodePoint CR_Case_Ignorable[] = {
 	0x1e2ae, 0x1e2ae,
 	0x1e2ec, 0x1e2ef,
 	0x1e4eb, 0x1e4ef,
+	0x1e5ee, 0x1e5ef,
 	0x1e8d0, 0x1e8d6,
 	0x1e944, 0x1e94b,
 	0x1f3fb, 0x1f3ff,
@@ -13401,7 +13754,7 @@ static const OnigCodePoint CR_Case_Ignorable[] = {
 
 /* 'Changes_When_Lowercased': Derived Property */
 static const OnigCodePoint CR_Changes_When_Lowercased[] = {
-	609,
+	614,
 	0x0041, 0x005a,
 	0x00c0, 0x00d6,
 	0x00d8, 0x00de,
@@ -13677,6 +14030,7 @@ static const OnigCodePoint CR_Changes_When_Lowercased[] = {
 	0x10c7, 0x10c7,
 	0x10cd, 0x10cd,
 	0x13a0, 0x13f5,
+	0x1c89, 0x1c89,
 	0x1c90, 0x1cba,
 	0x1cbd, 0x1cbf,
 	0x1e00, 0x1e00,
@@ -13996,9 +14350,12 @@ static const OnigCodePoint CR_Changes_When_Lowercased[] = {
 	0xa7c2, 0xa7c2,
 	0xa7c4, 0xa7c7,
 	0xa7c9, 0xa7c9,
+	0xa7cb, 0xa7cc,
 	0xa7d0, 0xa7d0,
 	0xa7d6, 0xa7d6,
 	0xa7d8, 0xa7d8,
+	0xa7da, 0xa7da,
+	0xa7dc, 0xa7dc,
 	0xa7f5, 0xa7f5,
 	0xff21, 0xff3a,
 	0x10400, 0x10427,
@@ -14008,6 +14365,7 @@ static const OnigCodePoint CR_Changes_When_Lowercased[] = {
 	0x1058c, 0x10592,
 	0x10594, 0x10595,
 	0x10c80, 0x10cb2,
+	0x10d50, 0x10d65,
 	0x118a0, 0x118bf,
 	0x16e40, 0x16e5f,
 	0x1e900, 0x1e921,
@@ -14015,7 +14373,7 @@ static const OnigCodePoint CR_Changes_When_Lowercased[] = {
 
 /* 'Changes_When_Uppercased': Derived Property */
 static const OnigCodePoint CR_Changes_When_Uppercased[] = {
-	627,
+	630,
 	0x0061, 0x007a,
 	0x00b5, 0x00b5,
 	0x00df, 0x00f6,
@@ -14088,7 +14446,7 @@ static const OnigCodePoint CR_Changes_When_Uppercased[] = {
 	0x018c, 0x018c,
 	0x0192, 0x0192,
 	0x0195, 0x0195,
-	0x0199, 0x019a,
+	0x0199, 0x019b,
 	0x019e, 0x019e,
 	0x01a1, 0x01a1,
 	0x01a3, 0x01a3,
@@ -14164,8 +14522,7 @@ static const OnigCodePoint CR_Changes_When_Uppercased[] = {
 	0x0259, 0x0259,
 	0x025b, 0x025c,
 	0x0260, 0x0261,
-	0x0263, 0x0263,
-	0x0265, 0x0266,
+	0x0263, 0x0266,
 	0x0268, 0x026c,
 	0x026f, 0x026f,
 	0x0271, 0x0272,
@@ -14305,6 +14662,7 @@ static const OnigCodePoint CR_Changes_When_Uppercased[] = {
 	0x10fd, 0x10ff,
 	0x13f8, 0x13fd,
 	0x1c80, 0x1c88,
+	0x1c8a, 0x1c8a,
 	0x1d79, 0x1d79,
 	0x1d7d, 0x1d7d,
 	0x1d8e, 0x1d8e,
@@ -14624,9 +14982,11 @@ static const OnigCodePoint CR_Changes_When_Uppercased[] = {
 	0xa7c3, 0xa7c3,
 	0xa7c8, 0xa7c8,
 	0xa7ca, 0xa7ca,
+	0xa7cd, 0xa7cd,
 	0xa7d1, 0xa7d1,
 	0xa7d7, 0xa7d7,
 	0xa7d9, 0xa7d9,
+	0xa7db, 0xa7db,
 	0xa7f6, 0xa7f6,
 	0xab53, 0xab53,
 	0xab70, 0xabbf,
@@ -14640,6 +15000,7 @@ static const OnigCodePoint CR_Changes_When_Uppercased[] = {
 	0x105b3, 0x105b9,
 	0x105bb, 0x105bc,
 	0x10cc0, 0x10cf2,
+	0x10d70, 0x10d85,
 	0x118c0, 0x118df,
 	0x16e60, 0x16e7f,
 	0x1e922, 0x1e943,
@@ -14647,7 +15008,7 @@ static const OnigCodePoint CR_Changes_When_Uppercased[] = {
 
 /* 'Changes_When_Titlecased': Derived Property */
 static const OnigCodePoint CR_Changes_When_Titlecased[] = {
-	626,
+	629,
 	0x0061, 0x007a,
 	0x00b5, 0x00b5,
 	0x00df, 0x00f6,
@@ -14720,7 +15081,7 @@ static const OnigCodePoint CR_Changes_When_Titlecased[] = {
 	0x018c, 0x018c,
 	0x0192, 0x0192,
 	0x0195, 0x0195,
-	0x0199, 0x019a,
+	0x0199, 0x019b,
 	0x019e, 0x019e,
 	0x01a1, 0x01a1,
 	0x01a3, 0x01a3,
@@ -14797,8 +15158,7 @@ static const OnigCodePoint CR_Changes_When_Titlecased[] = {
 	0x0259, 0x0259,
 	0x025b, 0x025c,
 	0x0260, 0x0261,
-	0x0263, 0x0263,
-	0x0265, 0x0266,
+	0x0263, 0x0266,
 	0x0268, 0x026c,
 	0x026f, 0x026f,
 	0x0271, 0x0272,
@@ -14936,6 +15296,7 @@ static const OnigCodePoint CR_Changes_When_Titlecased[] = {
 	0x0561, 0x0587,
 	0x13f8, 0x13fd,
 	0x1c80, 0x1c88,
+	0x1c8a, 0x1c8a,
 	0x1d79, 0x1d79,
 	0x1d7d, 0x1d7d,
 	0x1d8e, 0x1d8e,
@@ -15255,9 +15616,11 @@ static const OnigCodePoint CR_Changes_When_Titlecased[] = {
 	0xa7c3, 0xa7c3,
 	0xa7c8, 0xa7c8,
 	0xa7ca, 0xa7ca,
+	0xa7cd, 0xa7cd,
 	0xa7d1, 0xa7d1,
 	0xa7d7, 0xa7d7,
 	0xa7d9, 0xa7d9,
+	0xa7db, 0xa7db,
 	0xa7f6, 0xa7f6,
 	0xab53, 0xab53,
 	0xab70, 0xabbf,
@@ -15271,6 +15634,7 @@ static const OnigCodePoint CR_Changes_When_Titlecased[] = {
 	0x105b3, 0x105b9,
 	0x105bb, 0x105bc,
 	0x10cc0, 0x10cf2,
+	0x10d70, 0x10d85,
 	0x118c0, 0x118df,
 	0x16e60, 0x16e7f,
 	0x1e922, 0x1e943,
@@ -15278,7 +15642,7 @@ static const OnigCodePoint CR_Changes_When_Titlecased[] = {
 
 /* 'Changes_When_Casefolded': Derived Property */
 static const OnigCodePoint CR_Changes_When_Casefolded[] = {
-	622,
+	626,
 	0x0041, 0x005a,
 	0x00b5, 0x00b5,
 	0x00c0, 0x00d6,
@@ -15561,7 +15925,7 @@ static const OnigCodePoint CR_Changes_When_Casefolded[] = {
 	0x10c7, 0x10c7,
 	0x10cd, 0x10cd,
 	0x13f8, 0x13fd,
-	0x1c80, 0x1c88,
+	0x1c80, 0x1c89,
 	0x1c90, 0x1cba,
 	0x1cbd, 0x1cbf,
 	0x1e00, 0x1e00,
@@ -15883,9 +16247,12 @@ static const OnigCodePoint CR_Changes_When_Casefolded[] = {
 	0xa7c2, 0xa7c2,
 	0xa7c4, 0xa7c7,
 	0xa7c9, 0xa7c9,
+	0xa7cb, 0xa7cc,
 	0xa7d0, 0xa7d0,
 	0xa7d6, 0xa7d6,
 	0xa7d8, 0xa7d8,
+	0xa7da, 0xa7da,
+	0xa7dc, 0xa7dc,
 	0xa7f5, 0xa7f5,
 	0xab70, 0xabbf,
 	0xfb00, 0xfb06,
@@ -15898,6 +16265,7 @@ static const OnigCodePoint CR_Changes_When_Casefolded[] = {
 	0x1058c, 0x10592,
 	0x10594, 0x10595,
 	0x10c80, 0x10cb2,
+	0x10d50, 0x10d65,
 	0x118a0, 0x118bf,
 	0x16e40, 0x16e5f,
 	0x1e900, 0x1e921,
@@ -15913,8 +16281,7 @@ static const OnigCodePoint CR_Changes_When_Casemapped[] = {
 	0x00d8, 0x00f6,
 	0x00f8, 0x0137,
 	0x0139, 0x018c,
-	0x018e, 0x019a,
-	0x019c, 0x01a9,
+	0x018e, 0x01a9,
 	0x01ac, 0x01b9,
 	0x01bc, 0x01bd,
 	0x01bf, 0x01bf,
@@ -15925,8 +16292,7 @@ static const OnigCodePoint CR_Changes_When_Casemapped[] = {
 	0x0259, 0x0259,
 	0x025b, 0x025c,
 	0x0260, 0x0261,
-	0x0263, 0x0263,
-	0x0265, 0x0266,
+	0x0263, 0x0266,
 	0x0268, 0x026c,
 	0x026f, 0x026f,
 	0x0271, 0x0272,
@@ -15960,7 +16326,7 @@ static const OnigCodePoint CR_Changes_When_Casemapped[] = {
 	0x10fd, 0x10ff,
 	0x13a0, 0x13f5,
 	0x13f8, 0x13fd,
-	0x1c80, 0x1c88,
+	0x1c80, 0x1c8a,
 	0x1c90, 0x1cba,
 	0x1cbd, 0x1cbf,
 	0x1d79, 0x1d79,
@@ -16011,9 +16377,9 @@ static const OnigCodePoint CR_Changes_When_Casemapped[] = {
 	0xa78b, 0xa78d,
 	0xa790, 0xa794,
 	0xa796, 0xa7ae,
-	0xa7b0, 0xa7ca,
+	0xa7b0, 0xa7cd,
 	0xa7d0, 0xa7d1,
-	0xa7d6, 0xa7d9,
+	0xa7d6, 0xa7dc,
 	0xa7f5, 0xa7f6,
 	0xab53, 0xab53,
 	0xab70, 0xabbf,
@@ -16034,6 +16400,8 @@ static const OnigCodePoint CR_Changes_When_Casemapped[] = {
 	0x105bb, 0x105bc,
 	0x10c80, 0x10cb2,
 	0x10cc0, 0x10cf2,
+	0x10d50, 0x10d65,
+	0x10d70, 0x10d85,
 	0x118a0, 0x118df,
 	0x16e40, 0x16e7f,
 	0x1e900, 0x1e943,
@@ -16041,7 +16409,7 @@ static const OnigCodePoint CR_Changes_When_Casemapped[] = {
 
 /* 'ID_Start': Derived Property */
 static const OnigCodePoint CR_ID_Start[] = {
-	659,
+	677,
 	0x0041, 0x005a,
 	0x0061, 0x007a,
 	0x00aa, 0x00aa,
@@ -16266,7 +16634,7 @@ static const OnigCodePoint CR_ID_Start[] = {
 	0x1c00, 0x1c23,
 	0x1c4d, 0x1c4f,
 	0x1c5a, 0x1c7d,
-	0x1c80, 0x1c88,
+	0x1c80, 0x1c8a,
 	0x1c90, 0x1cba,
 	0x1cbd, 0x1cbf,
 	0x1ce9, 0x1cec,
@@ -16349,10 +16717,10 @@ static const OnigCodePoint CR_ID_Start[] = {
 	0xa6a0, 0xa6ef,
 	0xa717, 0xa71f,
 	0xa722, 0xa788,
-	0xa78b, 0xa7ca,
+	0xa78b, 0xa7cd,
 	0xa7d0, 0xa7d1,
 	0xa7d3, 0xa7d3,
-	0xa7d5, 0xa7d9,
+	0xa7d5, 0xa7dc,
 	0xa7f2, 0xa801,
 	0xa803, 0xa805,
 	0xa807, 0xa80a,
@@ -16450,6 +16818,7 @@ static const OnigCodePoint CR_ID_Start[] = {
 	0x105a3, 0x105b1,
 	0x105b3, 0x105b9,
 	0x105bb, 0x105bc,
+	0x105c0, 0x105f3,
 	0x10600, 0x10736,
 	0x10740, 0x10755,
 	0x10760, 0x10767,
@@ -16486,8 +16855,11 @@ static const OnigCodePoint CR_ID_Start[] = {
 	0x10c80, 0x10cb2,
 	0x10cc0, 0x10cf2,
 	0x10d00, 0x10d23,
+	0x10d4a, 0x10d65,
+	0x10d6f, 0x10d85,
 	0x10e80, 0x10ea9,
 	0x10eb0, 0x10eb1,
+	0x10ec2, 0x10ec4,
 	0x10f00, 0x10f1c,
 	0x10f27, 0x10f27,
 	0x10f30, 0x10f45,
@@ -16526,6 +16898,13 @@ static const OnigCodePoint CR_ID_Start[] = {
 	0x1133d, 0x1133d,
 	0x11350, 0x11350,
 	0x1135d, 0x11361,
+	0x11380, 0x11389,
+	0x1138b, 0x1138b,
+	0x1138e, 0x1138e,
+	0x11390, 0x113b5,
+	0x113b7, 0x113b7,
+	0x113d1, 0x113d1,
+	0x113d3, 0x113d3,
 	0x11400, 0x11434,
 	0x11447, 0x1144a,
 	0x1145f, 0x11461,
@@ -16560,6 +16939,7 @@ static const OnigCodePoint CR_ID_Start[] = {
 	0x11a5c, 0x11a89,
 	0x11a9d, 0x11a9d,
 	0x11ab0, 0x11af8,
+	0x11bc0, 0x11be0,
 	0x11c00, 0x11c08,
 	0x11c0a, 0x11c2e,
 	0x11c40, 0x11c40,
@@ -16583,7 +16963,9 @@ static const OnigCodePoint CR_ID_Start[] = {
 	0x12f90, 0x12ff0,
 	0x13000, 0x1342f,
 	0x13441, 0x13446,
+	0x13460, 0x143fa,
 	0x14400, 0x14646,
+	0x16100, 0x1611d,
 	0x16800, 0x16a38,
 	0x16a40, 0x16a5e,
 	0x16a70, 0x16abe,
@@ -16592,6 +16974,7 @@ static const OnigCodePoint CR_ID_Start[] = {
 	0x16b40, 0x16b43,
 	0x16b63, 0x16b77,
 	0x16b7d, 0x16b8f,
+	0x16d40, 0x16d6c,
 	0x16e40, 0x16e7f,
 	0x16f00, 0x16f4a,
 	0x16f50, 0x16f50,
@@ -16600,7 +16983,7 @@ static const OnigCodePoint CR_ID_Start[] = {
 	0x16fe3, 0x16fe3,
 	0x17000, 0x187f7,
 	0x18800, 0x18cd5,
-	0x18d00, 0x18d08,
+	0x18cff, 0x18d08,
 	0x1aff0, 0x1aff3,
 	0x1aff5, 0x1affb,
 	0x1affd, 0x1affe,
@@ -16653,6 +17036,8 @@ static const OnigCodePoint CR_ID_Start[] = {
 	0x1e290, 0x1e2ad,
 	0x1e2c0, 0x1e2eb,
 	0x1e4d0, 0x1e4eb,
+	0x1e5d0, 0x1e5ed,
+	0x1e5f0, 0x1e5f0,
 	0x1e7e0, 0x1e7e6,
 	0x1e7e8, 0x1e7eb,
 	0x1e7ed, 0x1e7ee,
@@ -16698,6 +17083,7 @@ static const OnigCodePoint CR_ID_Start[] = {
 	0x2b740, 0x2b81d,
 	0x2b820, 0x2cea1,
 	0x2ceb0, 0x2ebe0,
+	0x2ebf0, 0x2ee5d,
 	0x2f800, 0x2fa1d,
 	0x30000, 0x3134a,
 	0x31350, 0x323af,
@@ -16705,7 +17091,7 @@ static const OnigCodePoint CR_ID_Start[] = {
 
 /* 'ID_Continue': Derived Property */
 static const OnigCodePoint CR_ID_Continue[] = {
-	768,
+	793,
 	0x0030, 0x0039,
 	0x0041, 0x005a,
 	0x005f, 0x005f,
@@ -16759,7 +17145,7 @@ static const OnigCodePoint CR_ID_Continue[] = {
 	0x0860, 0x086a,
 	0x0870, 0x0887,
 	0x0889, 0x088e,
-	0x0898, 0x08e1,
+	0x0897, 0x08e1,
 	0x08e3, 0x0963,
 	0x0966, 0x096f,
 	0x0971, 0x0983,
@@ -16982,7 +17368,7 @@ static const OnigCodePoint CR_ID_Continue[] = {
 	0x1c00, 0x1c37,
 	0x1c40, 0x1c49,
 	0x1c4d, 0x1c7d,
-	0x1c80, 0x1c88,
+	0x1c80, 0x1c8a,
 	0x1c90, 0x1cba,
 	0x1cbd, 0x1cbf,
 	0x1cd0, 0x1cd2,
@@ -17006,6 +17392,7 @@ static const OnigCodePoint CR_ID_Continue[] = {
 	0x1fe0, 0x1fec,
 	0x1ff2, 0x1ff4,
 	0x1ff6, 0x1ffc,
+	0x200c, 0x200d,
 	0x203f, 0x2040,
 	0x2054, 0x2054,
 	0x2071, 0x2071,
@@ -17050,8 +17437,7 @@ static const OnigCodePoint CR_ID_Continue[] = {
 	0x3038, 0x303c,
 	0x3041, 0x3096,
 	0x3099, 0x309f,
-	0x30a1, 0x30fa,
-	0x30fc, 0x30ff,
+	0x30a1, 0x30ff,
 	0x3105, 0x312f,
 	0x3131, 0x318e,
 	0x31a0, 0x31bf,
@@ -17066,10 +17452,10 @@ static const OnigCodePoint CR_ID_Continue[] = {
 	0xa67f, 0xa6f1,
 	0xa717, 0xa71f,
 	0xa722, 0xa788,
-	0xa78b, 0xa7ca,
+	0xa78b, 0xa7cd,
 	0xa7d0, 0xa7d1,
 	0xa7d3, 0xa7d3,
-	0xa7d5, 0xa7d9,
+	0xa7d5, 0xa7dc,
 	0xa7f2, 0xa827,
 	0xa82c, 0xa82c,
 	0xa840, 0xa873,
@@ -17129,7 +17515,7 @@ static const OnigCodePoint CR_ID_Continue[] = {
 	0xff21, 0xff3a,
 	0xff3f, 0xff3f,
 	0xff41, 0xff5a,
-	0xff66, 0xffbe,
+	0xff65, 0xffbe,
 	0xffc2, 0xffc7,
 	0xffca, 0xffcf,
 	0xffd2, 0xffd7,
@@ -17167,6 +17553,7 @@ static const OnigCodePoint CR_ID_Continue[] = {
 	0x105a3, 0x105b1,
 	0x105b3, 0x105b9,
 	0x105bb, 0x105bc,
+	0x105c0, 0x105f3,
 	0x10600, 0x10736,
 	0x10740, 0x10755,
 	0x10760, 0x10767,
@@ -17207,10 +17594,14 @@ static const OnigCodePoint CR_ID_Continue[] = {
 	0x10cc0, 0x10cf2,
 	0x10d00, 0x10d27,
 	0x10d30, 0x10d39,
+	0x10d40, 0x10d65,
+	0x10d69, 0x10d6d,
+	0x10d6f, 0x10d85,
 	0x10e80, 0x10ea9,
 	0x10eab, 0x10eac,
 	0x10eb0, 0x10eb1,
-	0x10efd, 0x10f1c,
+	0x10ec2, 0x10ec4,
+	0x10efc, 0x10f1c,
 	0x10f27, 0x10f27,
 	0x10f30, 0x10f50,
 	0x10f70, 0x10f85,
@@ -17256,6 +17647,16 @@ static const OnigCodePoint CR_ID_Continue[] = {
 	0x1135d, 0x11363,
 	0x11366, 0x1136c,
 	0x11370, 0x11374,
+	0x11380, 0x11389,
+	0x1138b, 0x1138b,
+	0x1138e, 0x1138e,
+	0x11390, 0x113b5,
+	0x113b7, 0x113c0,
+	0x113c2, 0x113c2,
+	0x113c5, 0x113c5,
+	0x113c7, 0x113ca,
+	0x113cc, 0x113d3,
+	0x113e1, 0x113e2,
 	0x11400, 0x1144a,
 	0x11450, 0x11459,
 	0x1145e, 0x11461,
@@ -17270,6 +17671,7 @@ static const OnigCodePoint CR_ID_Continue[] = {
 	0x11650, 0x11659,
 	0x11680, 0x116b8,
 	0x116c0, 0x116c9,
+	0x116d0, 0x116e3,
 	0x11700, 0x1171a,
 	0x1171d, 0x1172b,
 	0x11730, 0x11739,
@@ -17293,6 +17695,8 @@ static const OnigCodePoint CR_ID_Continue[] = {
 	0x11a50, 0x11a99,
 	0x11a9d, 0x11a9d,
 	0x11ab0, 0x11af8,
+	0x11bc0, 0x11be0,
+	0x11bf0, 0x11bf9,
 	0x11c00, 0x11c08,
 	0x11c0a, 0x11c36,
 	0x11c38, 0x11c40,
@@ -17317,7 +17721,7 @@ static const OnigCodePoint CR_ID_Continue[] = {
 	0x11f00, 0x11f10,
 	0x11f12, 0x11f3a,
 	0x11f3e, 0x11f42,
-	0x11f50, 0x11f59,
+	0x11f50, 0x11f5a,
 	0x11fb0, 0x11fb0,
 	0x12000, 0x12399,
 	0x12400, 0x1246e,
@@ -17325,7 +17729,9 @@ static const OnigCodePoint CR_ID_Continue[] = {
 	0x12f90, 0x12ff0,
 	0x13000, 0x1342f,
 	0x13440, 0x13455,
+	0x13460, 0x143fa,
 	0x14400, 0x14646,
+	0x16100, 0x16139,
 	0x16800, 0x16a38,
 	0x16a40, 0x16a5e,
 	0x16a60, 0x16a69,
@@ -17338,6 +17744,8 @@ static const OnigCodePoint CR_ID_Continue[] = {
 	0x16b50, 0x16b59,
 	0x16b63, 0x16b77,
 	0x16b7d, 0x16b8f,
+	0x16d40, 0x16d6c,
+	0x16d70, 0x16d79,
 	0x16e40, 0x16e7f,
 	0x16f00, 0x16f4a,
 	0x16f4f, 0x16f87,
@@ -17347,7 +17755,7 @@ static const OnigCodePoint CR_ID_Continue[] = {
 	0x16ff0, 0x16ff1,
 	0x17000, 0x187f7,
 	0x18800, 0x18cd5,
-	0x18d00, 0x18d08,
+	0x18cff, 0x18d08,
 	0x1aff0, 0x1aff3,
 	0x1aff5, 0x1affb,
 	0x1affd, 0x1affe,
@@ -17362,6 +17770,7 @@ static const OnigCodePoint CR_ID_Continue[] = {
 	0x1bc80, 0x1bc88,
 	0x1bc90, 0x1bc99,
 	0x1bc9d, 0x1bc9e,
+	0x1ccf0, 0x1ccf9,
 	0x1cf00, 0x1cf2d,
 	0x1cf30, 0x1cf46,
 	0x1d165, 0x1d169,
@@ -17423,6 +17832,7 @@ static const OnigCodePoint CR_ID_Continue[] = {
 	0x1e290, 0x1e2ae,
 	0x1e2c0, 0x1e2f9,
 	0x1e4d0, 0x1e4f9,
+	0x1e5d0, 0x1e5fa,
 	0x1e7e0, 0x1e7e6,
 	0x1e7e8, 0x1e7eb,
 	0x1e7ed, 0x1e7ee,
@@ -17470,6 +17880,7 @@ static const OnigCodePoint CR_ID_Continue[] = {
 	0x2b740, 0x2b81d,
 	0x2b820, 0x2cea1,
 	0x2ceb0, 0x2ebe0,
+	0x2ebf0, 0x2ee5d,
 	0x2f800, 0x2fa1d,
 	0x30000, 0x3134a,
 	0x31350, 0x323af,
@@ -17478,7 +17889,7 @@ static const OnigCodePoint CR_ID_Continue[] = {
 
 /* 'XID_Start': Derived Property */
 static const OnigCodePoint CR_XID_Start[] = {
-	666,
+	684,
 	0x0041, 0x005a,
 	0x0061, 0x007a,
 	0x00aa, 0x00aa,
@@ -17703,7 +18114,7 @@ static const OnigCodePoint CR_XID_Start[] = {
 	0x1c00, 0x1c23,
 	0x1c4d, 0x1c4f,
 	0x1c5a, 0x1c7d,
-	0x1c80, 0x1c88,
+	0x1c80, 0x1c8a,
 	0x1c90, 0x1cba,
 	0x1cbd, 0x1cbf,
 	0x1ce9, 0x1cec,
@@ -17786,10 +18197,10 @@ static const OnigCodePoint CR_XID_Start[] = {
 	0xa6a0, 0xa6ef,
 	0xa717, 0xa71f,
 	0xa722, 0xa788,
-	0xa78b, 0xa7ca,
+	0xa78b, 0xa7cd,
 	0xa7d0, 0xa7d1,
 	0xa7d3, 0xa7d3,
-	0xa7d5, 0xa7d9,
+	0xa7d5, 0xa7dc,
 	0xa7f2, 0xa801,
 	0xa803, 0xa805,
 	0xa807, 0xa80a,
@@ -17894,6 +18305,7 @@ static const OnigCodePoint CR_XID_Start[] = {
 	0x105a3, 0x105b1,
 	0x105b3, 0x105b9,
 	0x105bb, 0x105bc,
+	0x105c0, 0x105f3,
 	0x10600, 0x10736,
 	0x10740, 0x10755,
 	0x10760, 0x10767,
@@ -17930,8 +18342,11 @@ static const OnigCodePoint CR_XID_Start[] = {
 	0x10c80, 0x10cb2,
 	0x10cc0, 0x10cf2,
 	0x10d00, 0x10d23,
+	0x10d4a, 0x10d65,
+	0x10d6f, 0x10d85,
 	0x10e80, 0x10ea9,
 	0x10eb0, 0x10eb1,
+	0x10ec2, 0x10ec4,
 	0x10f00, 0x10f1c,
 	0x10f27, 0x10f27,
 	0x10f30, 0x10f45,
@@ -17970,6 +18385,13 @@ static const OnigCodePoint CR_XID_Start[] = {
 	0x1133d, 0x1133d,
 	0x11350, 0x11350,
 	0x1135d, 0x11361,
+	0x11380, 0x11389,
+	0x1138b, 0x1138b,
+	0x1138e, 0x1138e,
+	0x11390, 0x113b5,
+	0x113b7, 0x113b7,
+	0x113d1, 0x113d1,
+	0x113d3, 0x113d3,
 	0x11400, 0x11434,
 	0x11447, 0x1144a,
 	0x1145f, 0x11461,
@@ -18004,6 +18426,7 @@ static const OnigCodePoint CR_XID_Start[] = {
 	0x11a5c, 0x11a89,
 	0x11a9d, 0x11a9d,
 	0x11ab0, 0x11af8,
+	0x11bc0, 0x11be0,
 	0x11c00, 0x11c08,
 	0x11c0a, 0x11c2e,
 	0x11c40, 0x11c40,
@@ -18027,7 +18450,9 @@ static const OnigCodePoint CR_XID_Start[] = {
 	0x12f90, 0x12ff0,
 	0x13000, 0x1342f,
 	0x13441, 0x13446,
+	0x13460, 0x143fa,
 	0x14400, 0x14646,
+	0x16100, 0x1611d,
 	0x16800, 0x16a38,
 	0x16a40, 0x16a5e,
 	0x16a70, 0x16abe,
@@ -18036,6 +18461,7 @@ static const OnigCodePoint CR_XID_Start[] = {
 	0x16b40, 0x16b43,
 	0x16b63, 0x16b77,
 	0x16b7d, 0x16b8f,
+	0x16d40, 0x16d6c,
 	0x16e40, 0x16e7f,
 	0x16f00, 0x16f4a,
 	0x16f50, 0x16f50,
@@ -18044,7 +18470,7 @@ static const OnigCodePoint CR_XID_Start[] = {
 	0x16fe3, 0x16fe3,
 	0x17000, 0x187f7,
 	0x18800, 0x18cd5,
-	0x18d00, 0x18d08,
+	0x18cff, 0x18d08,
 	0x1aff0, 0x1aff3,
 	0x1aff5, 0x1affb,
 	0x1affd, 0x1affe,
@@ -18097,6 +18523,8 @@ static const OnigCodePoint CR_XID_Start[] = {
 	0x1e290, 0x1e2ad,
 	0x1e2c0, 0x1e2eb,
 	0x1e4d0, 0x1e4eb,
+	0x1e5d0, 0x1e5ed,
+	0x1e5f0, 0x1e5f0,
 	0x1e7e0, 0x1e7e6,
 	0x1e7e8, 0x1e7eb,
 	0x1e7ed, 0x1e7ee,
@@ -18142,6 +18570,7 @@ static const OnigCodePoint CR_XID_Start[] = {
 	0x2b740, 0x2b81d,
 	0x2b820, 0x2cea1,
 	0x2ceb0, 0x2ebe0,
+	0x2ebf0, 0x2ee5d,
 	0x2f800, 0x2fa1d,
 	0x30000, 0x3134a,
 	0x31350, 0x323af,
@@ -18149,7 +18578,7 @@ static const OnigCodePoint CR_XID_Start[] = {
 
 /* 'XID_Continue': Derived Property */
 static const OnigCodePoint CR_XID_Continue[] = {
-	775,
+	800,
 	0x0030, 0x0039,
 	0x0041, 0x005a,
 	0x005f, 0x005f,
@@ -18203,7 +18632,7 @@ static const OnigCodePoint CR_XID_Continue[] = {
 	0x0860, 0x086a,
 	0x0870, 0x0887,
 	0x0889, 0x088e,
-	0x0898, 0x08e1,
+	0x0897, 0x08e1,
 	0x08e3, 0x0963,
 	0x0966, 0x096f,
 	0x0971, 0x0983,
@@ -18426,7 +18855,7 @@ static const OnigCodePoint CR_XID_Continue[] = {
 	0x1c00, 0x1c37,
 	0x1c40, 0x1c49,
 	0x1c4d, 0x1c7d,
-	0x1c80, 0x1c88,
+	0x1c80, 0x1c8a,
 	0x1c90, 0x1cba,
 	0x1cbd, 0x1cbf,
 	0x1cd0, 0x1cd2,
@@ -18450,6 +18879,7 @@ static const OnigCodePoint CR_XID_Continue[] = {
 	0x1fe0, 0x1fec,
 	0x1ff2, 0x1ff4,
 	0x1ff6, 0x1ffc,
+	0x200c, 0x200d,
 	0x203f, 0x2040,
 	0x2054, 0x2054,
 	0x2071, 0x2071,
@@ -18495,8 +18925,7 @@ static const OnigCodePoint CR_XID_Continue[] = {
 	0x3041, 0x3096,
 	0x3099, 0x309a,
 	0x309d, 0x309f,
-	0x30a1, 0x30fa,
-	0x30fc, 0x30ff,
+	0x30a1, 0x30ff,
 	0x3105, 0x312f,
 	0x3131, 0x318e,
 	0x31a0, 0x31bf,
@@ -18511,10 +18940,10 @@ static const OnigCodePoint CR_XID_Continue[] = {
 	0xa67f, 0xa6f1,
 	0xa717, 0xa71f,
 	0xa722, 0xa788,
-	0xa78b, 0xa7ca,
+	0xa78b, 0xa7cd,
 	0xa7d0, 0xa7d1,
 	0xa7d3, 0xa7d3,
-	0xa7d5, 0xa7d9,
+	0xa7d5, 0xa7dc,
 	0xa7f2, 0xa827,
 	0xa82c, 0xa82c,
 	0xa840, 0xa873,
@@ -18580,7 +19009,7 @@ static const OnigCodePoint CR_XID_Continue[] = {
 	0xff21, 0xff3a,
 	0xff3f, 0xff3f,
 	0xff41, 0xff5a,
-	0xff66, 0xffbe,
+	0xff65, 0xffbe,
 	0xffc2, 0xffc7,
 	0xffca, 0xffcf,
 	0xffd2, 0xffd7,
@@ -18618,6 +19047,7 @@ static const OnigCodePoint CR_XID_Continue[] = {
 	0x105a3, 0x105b1,
 	0x105b3, 0x105b9,
 	0x105bb, 0x105bc,
+	0x105c0, 0x105f3,
 	0x10600, 0x10736,
 	0x10740, 0x10755,
 	0x10760, 0x10767,
@@ -18658,10 +19088,14 @@ static const OnigCodePoint CR_XID_Continue[] = {
 	0x10cc0, 0x10cf2,
 	0x10d00, 0x10d27,
 	0x10d30, 0x10d39,
+	0x10d40, 0x10d65,
+	0x10d69, 0x10d6d,
+	0x10d6f, 0x10d85,
 	0x10e80, 0x10ea9,
 	0x10eab, 0x10eac,
 	0x10eb0, 0x10eb1,
-	0x10efd, 0x10f1c,
+	0x10ec2, 0x10ec4,
+	0x10efc, 0x10f1c,
 	0x10f27, 0x10f27,
 	0x10f30, 0x10f50,
 	0x10f70, 0x10f85,
@@ -18707,6 +19141,16 @@ static const OnigCodePoint CR_XID_Continue[] = {
 	0x1135d, 0x11363,
 	0x11366, 0x1136c,
 	0x11370, 0x11374,
+	0x11380, 0x11389,
+	0x1138b, 0x1138b,
+	0x1138e, 0x1138e,
+	0x11390, 0x113b5,
+	0x113b7, 0x113c0,
+	0x113c2, 0x113c2,
+	0x113c5, 0x113c5,
+	0x113c7, 0x113ca,
+	0x113cc, 0x113d3,
+	0x113e1, 0x113e2,
 	0x11400, 0x1144a,
 	0x11450, 0x11459,
 	0x1145e, 0x11461,
@@ -18721,6 +19165,7 @@ static const OnigCodePoint CR_XID_Continue[] = {
 	0x11650, 0x11659,
 	0x11680, 0x116b8,
 	0x116c0, 0x116c9,
+	0x116d0, 0x116e3,
 	0x11700, 0x1171a,
 	0x1171d, 0x1172b,
 	0x11730, 0x11739,
@@ -18744,6 +19189,8 @@ static const OnigCodePoint CR_XID_Continue[] = {
 	0x11a50, 0x11a99,
 	0x11a9d, 0x11a9d,
 	0x11ab0, 0x11af8,
+	0x11bc0, 0x11be0,
+	0x11bf0, 0x11bf9,
 	0x11c00, 0x11c08,
 	0x11c0a, 0x11c36,
 	0x11c38, 0x11c40,
@@ -18768,7 +19215,7 @@ static const OnigCodePoint CR_XID_Continue[] = {
 	0x11f00, 0x11f10,
 	0x11f12, 0x11f3a,
 	0x11f3e, 0x11f42,
-	0x11f50, 0x11f59,
+	0x11f50, 0x11f5a,
 	0x11fb0, 0x11fb0,
 	0x12000, 0x12399,
 	0x12400, 0x1246e,
@@ -18776,7 +19223,9 @@ static const OnigCodePoint CR_XID_Continue[] = {
 	0x12f90, 0x12ff0,
 	0x13000, 0x1342f,
 	0x13440, 0x13455,
+	0x13460, 0x143fa,
 	0x14400, 0x14646,
+	0x16100, 0x16139,
 	0x16800, 0x16a38,
 	0x16a40, 0x16a5e,
 	0x16a60, 0x16a69,
@@ -18789,6 +19238,8 @@ static const OnigCodePoint CR_XID_Continue[] = {
 	0x16b50, 0x16b59,
 	0x16b63, 0x16b77,
 	0x16b7d, 0x16b8f,
+	0x16d40, 0x16d6c,
+	0x16d70, 0x16d79,
 	0x16e40, 0x16e7f,
 	0x16f00, 0x16f4a,
 	0x16f4f, 0x16f87,
@@ -18798,7 +19249,7 @@ static const OnigCodePoint CR_XID_Continue[] = {
 	0x16ff0, 0x16ff1,
 	0x17000, 0x187f7,
 	0x18800, 0x18cd5,
-	0x18d00, 0x18d08,
+	0x18cff, 0x18d08,
 	0x1aff0, 0x1aff3,
 	0x1aff5, 0x1affb,
 	0x1affd, 0x1affe,
@@ -18813,6 +19264,7 @@ static const OnigCodePoint CR_XID_Continue[] = {
 	0x1bc80, 0x1bc88,
 	0x1bc90, 0x1bc99,
 	0x1bc9d, 0x1bc9e,
+	0x1ccf0, 0x1ccf9,
 	0x1cf00, 0x1cf2d,
 	0x1cf30, 0x1cf46,
 	0x1d165, 0x1d169,
@@ -18874,6 +19326,7 @@ static const OnigCodePoint CR_XID_Continue[] = {
 	0x1e290, 0x1e2ae,
 	0x1e2c0, 0x1e2f9,
 	0x1e4d0, 0x1e4f9,
+	0x1e5d0, 0x1e5fa,
 	0x1e7e0, 0x1e7e6,
 	0x1e7e8, 0x1e7eb,
 	0x1e7ed, 0x1e7ee,
@@ -18921,6 +19374,7 @@ static const OnigCodePoint CR_XID_Continue[] = {
 	0x2b740, 0x2b81d,
 	0x2b820, 0x2cea1,
 	0x2ceb0, 0x2ebe0,
+	0x2ebf0, 0x2ee5d,
 	0x2f800, 0x2fa1d,
 	0x30000, 0x3134a,
 	0x31350, 0x323af,
@@ -18951,7 +19405,7 @@ static const OnigCodePoint CR_Default_Ignorable_Code_Point[] = {
 
 /* 'Grapheme_Extend': Derived Property */
 static const OnigCodePoint CR_Grapheme_Extend[] = {
-	363,
+	375,
 	0x0300, 0x036f,
 	0x0483, 0x0489,
 	0x0591, 0x05bd,
@@ -18976,7 +19430,7 @@ static const OnigCodePoint CR_Grapheme_Extend[] = {
 	0x0825, 0x0827,
 	0x0829, 0x082d,
 	0x0859, 0x085b,
-	0x0898, 0x089f,
+	0x0897, 0x089f,
 	0x08ca, 0x08e1,
 	0x08e3, 0x0902,
 	0x093a, 0x093a,
@@ -19030,10 +19484,10 @@ static const OnigCodePoint CR_Grapheme_Extend[] = {
 	0x0c62, 0x0c63,
 	0x0c81, 0x0c81,
 	0x0cbc, 0x0cbc,
-	0x0cbf, 0x0cbf,
+	0x0cbf, 0x0cc0,
 	0x0cc2, 0x0cc2,
-	0x0cc6, 0x0cc6,
-	0x0ccc, 0x0ccd,
+	0x0cc6, 0x0cc8,
+	0x0cca, 0x0ccd,
 	0x0cd5, 0x0cd6,
 	0x0ce2, 0x0ce3,
 	0x0d00, 0x0d01,
@@ -19077,8 +19531,8 @@ static const OnigCodePoint CR_Grapheme_Extend[] = {
 	0x108d, 0x108d,
 	0x109d, 0x109d,
 	0x135d, 0x135f,
-	0x1712, 0x1714,
-	0x1732, 0x1733,
+	0x1712, 0x1715,
+	0x1732, 0x1734,
 	0x1752, 0x1753,
 	0x1772, 0x1773,
 	0x17b4, 0x17b5,
@@ -19105,18 +19559,16 @@ static const OnigCodePoint CR_Grapheme_Extend[] = {
 	0x1a7f, 0x1a7f,
 	0x1ab0, 0x1ace,
 	0x1b00, 0x1b03,
-	0x1b34, 0x1b3a,
-	0x1b3c, 0x1b3c,
-	0x1b42, 0x1b42,
+	0x1b34, 0x1b3d,
+	0x1b42, 0x1b44,
 	0x1b6b, 0x1b73,
 	0x1b80, 0x1b81,
 	0x1ba2, 0x1ba5,
-	0x1ba8, 0x1ba9,
-	0x1bab, 0x1bad,
+	0x1ba8, 0x1bad,
 	0x1be6, 0x1be6,
 	0x1be8, 0x1be9,
 	0x1bed, 0x1bed,
-	0x1bef, 0x1bf1,
+	0x1bef, 0x1bf3,
 	0x1c2c, 0x1c33,
 	0x1c36, 0x1c37,
 	0x1cd0, 0x1cd2,
@@ -19147,10 +19599,12 @@ static const OnigCodePoint CR_Grapheme_Extend[] = {
 	0xa8ff, 0xa8ff,
 	0xa926, 0xa92d,
 	0xa947, 0xa951,
+	0xa953, 0xa953,
 	0xa980, 0xa982,
 	0xa9b3, 0xa9b3,
 	0xa9b6, 0xa9b9,
 	0xa9bc, 0xa9bd,
+	0xa9c0, 0xa9c0,
 	0xa9e5, 0xa9e5,
 	0xaa29, 0xaa2e,
 	0xaa31, 0xaa32,
@@ -19182,8 +19636,9 @@ static const OnigCodePoint CR_Grapheme_Extend[] = {
 	0x10a3f, 0x10a3f,
 	0x10ae5, 0x10ae6,
 	0x10d24, 0x10d27,
+	0x10d69, 0x10d6d,
 	0x10eab, 0x10eac,
-	0x10efd, 0x10eff,
+	0x10efc, 0x10eff,
 	0x10f46, 0x10f50,
 	0x10f82, 0x10f85,
 	0x11001, 0x11001,
@@ -19200,11 +19655,11 @@ static const OnigCodePoint CR_Grapheme_Extend[] = {
 	0x11173, 0x11173,
 	0x11180, 0x11181,
 	0x111b6, 0x111be,
+	0x111c0, 0x111c0,
 	0x111c9, 0x111cc,
 	0x111cf, 0x111cf,
 	0x1122f, 0x11231,
-	0x11234, 0x11234,
-	0x11236, 0x11237,
+	0x11234, 0x11237,
 	0x1123e, 0x1123e,
 	0x11241, 0x11241,
 	0x112df, 0x112df,
@@ -19213,9 +19668,18 @@ static const OnigCodePoint CR_Grapheme_Extend[] = {
 	0x1133b, 0x1133c,
 	0x1133e, 0x1133e,
 	0x11340, 0x11340,
+	0x1134d, 0x1134d,
 	0x11357, 0x11357,
 	0x11366, 0x1136c,
 	0x11370, 0x11374,
+	0x113b8, 0x113b8,
+	0x113bb, 0x113c0,
+	0x113c2, 0x113c2,
+	0x113c5, 0x113c5,
+	0x113c7, 0x113c9,
+	0x113ce, 0x113d0,
+	0x113d2, 0x113d2,
+	0x113e1, 0x113e2,
 	0x11438, 0x1143f,
 	0x11442, 0x11444,
 	0x11446, 0x11446,
@@ -19236,16 +19700,15 @@ static const OnigCodePoint CR_Grapheme_Extend[] = {
 	0x1163f, 0x11640,
 	0x116ab, 0x116ab,
 	0x116ad, 0x116ad,
-	0x116b0, 0x116b5,
-	0x116b7, 0x116b7,
-	0x1171d, 0x1171f,
+	0x116b0, 0x116b7,
+	0x1171d, 0x1171d,
+	0x1171f, 0x1171f,
 	0x11722, 0x11725,
 	0x11727, 0x1172b,
 	0x1182f, 0x11837,
 	0x11839, 0x1183a,
 	0x11930, 0x11930,
-	0x1193b, 0x1193c,
-	0x1193e, 0x1193e,
+	0x1193b, 0x1193e,
 	0x11943, 0x11943,
 	0x119d4, 0x119d7,
 	0x119da, 0x119db,
@@ -19276,21 +19739,23 @@ static const OnigCodePoint CR_Grapheme_Extend[] = {
 	0x11ef3, 0x11ef4,
 	0x11f00, 0x11f01,
 	0x11f36, 0x11f3a,
-	0x11f40, 0x11f40,
-	0x11f42, 0x11f42,
+	0x11f40, 0x11f42,
+	0x11f5a, 0x11f5a,
 	0x13440, 0x13440,
 	0x13447, 0x13455,
+	0x1611e, 0x16129,
+	0x1612d, 0x1612f,
 	0x16af0, 0x16af4,
 	0x16b30, 0x16b36,
 	0x16f4f, 0x16f4f,
 	0x16f8f, 0x16f92,
 	0x16fe4, 0x16fe4,
+	0x16ff0, 0x16ff1,
 	0x1bc9d, 0x1bc9e,
 	0x1cf00, 0x1cf2d,
 	0x1cf30, 0x1cf46,
-	0x1d165, 0x1d165,
-	0x1d167, 0x1d169,
-	0x1d16e, 0x1d172,
+	0x1d165, 0x1d169,
+	0x1d16d, 0x1d172,
 	0x1d17b, 0x1d182,
 	0x1d185, 0x1d18b,
 	0x1d1aa, 0x1d1ad,
@@ -19311,6 +19776,7 @@ static const OnigCodePoint CR_Grapheme_Extend[] = {
 	0x1e2ae, 0x1e2ae,
 	0x1e2ec, 0x1e2ef,
 	0x1e4ec, 0x1e4ef,
+	0x1e5ee, 0x1e5ef,
 	0x1e8d0, 0x1e8d6,
 	0x1e944, 0x1e94a,
 	0xe0020, 0xe007f,
@@ -19319,7 +19785,7 @@ static const OnigCodePoint CR_Grapheme_Extend[] = {
 
 /* 'Grapheme_Base': Derived Property */
 static const OnigCodePoint CR_Grapheme_Base[] = {
-	875,
+	894,
 	0x0020, 0x007e,
 	0x00a0, 0x00ac,
 	0x00ae, 0x02ff,
@@ -19462,10 +19928,8 @@ static const OnigCodePoint CR_Grapheme_Base[] = {
 	0x0caa, 0x0cb3,
 	0x0cb5, 0x0cb9,
 	0x0cbd, 0x0cbe,
-	0x0cc0, 0x0cc1,
+	0x0cc1, 0x0cc1,
 	0x0cc3, 0x0cc4,
-	0x0cc7, 0x0cc8,
-	0x0cca, 0x0ccb,
 	0x0cdd, 0x0cde,
 	0x0ce0, 0x0ce1,
 	0x0ce6, 0x0cef,
@@ -19556,9 +20020,8 @@ static const OnigCodePoint CR_Grapheme_Base[] = {
 	0x1400, 0x169c,
 	0x16a0, 0x16f8,
 	0x1700, 0x1711,
-	0x1715, 0x1715,
 	0x171f, 0x1731,
-	0x1734, 0x1736,
+	0x1735, 0x1736,
 	0x1740, 0x1751,
 	0x1760, 0x176c,
 	0x176e, 0x1770,
@@ -19598,23 +20061,20 @@ static const OnigCodePoint CR_Grapheme_Base[] = {
 	0x1a90, 0x1a99,
 	0x1aa0, 0x1aad,
 	0x1b04, 0x1b33,
-	0x1b3b, 0x1b3b,
-	0x1b3d, 0x1b41,
-	0x1b43, 0x1b4c,
-	0x1b50, 0x1b6a,
-	0x1b74, 0x1b7e,
+	0x1b3e, 0x1b41,
+	0x1b45, 0x1b4c,
+	0x1b4e, 0x1b6a,
+	0x1b74, 0x1b7f,
 	0x1b82, 0x1ba1,
 	0x1ba6, 0x1ba7,
-	0x1baa, 0x1baa,
 	0x1bae, 0x1be5,
 	0x1be7, 0x1be7,
 	0x1bea, 0x1bec,
 	0x1bee, 0x1bee,
-	0x1bf2, 0x1bf3,
 	0x1bfc, 0x1c2b,
 	0x1c34, 0x1c35,
 	0x1c3b, 0x1c49,
-	0x1c4d, 0x1c88,
+	0x1c4d, 0x1c8a,
 	0x1c90, 0x1cba,
 	0x1cbd, 0x1cc7,
 	0x1cd3, 0x1cd3,
@@ -19648,7 +20108,7 @@ static const OnigCodePoint CR_Grapheme_Base[] = {
 	0x2090, 0x209c,
 	0x20a0, 0x20c0,
 	0x2100, 0x218b,
-	0x2190, 0x2426,
+	0x2190, 0x2429,
 	0x2440, 0x244a,
 	0x2460, 0x2b73,
 	0x2b76, 0x2b95,
@@ -19672,15 +20132,14 @@ static const OnigCodePoint CR_Grapheme_Base[] = {
 	0x2e80, 0x2e99,
 	0x2e9b, 0x2ef3,
 	0x2f00, 0x2fd5,
-	0x2ff0, 0x2ffb,
-	0x3000, 0x3029,
+	0x2ff0, 0x3029,
 	0x3030, 0x303f,
 	0x3041, 0x3096,
 	0x309b, 0x30ff,
 	0x3105, 0x312f,
 	0x3131, 0x318e,
-	0x3190, 0x31e3,
-	0x31f0, 0x321e,
+	0x3190, 0x31e5,
+	0x31ef, 0x321e,
 	0x3220, 0xa48c,
 	0xa490, 0xa4c6,
 	0xa4d0, 0xa62b,
@@ -19689,10 +20148,10 @@ static const OnigCodePoint CR_Grapheme_Base[] = {
 	0xa67e, 0xa69d,
 	0xa6a0, 0xa6ef,
 	0xa6f2, 0xa6f7,
-	0xa700, 0xa7ca,
+	0xa700, 0xa7cd,
 	0xa7d0, 0xa7d1,
 	0xa7d3, 0xa7d3,
-	0xa7d5, 0xa7d9,
+	0xa7d5, 0xa7dc,
 	0xa7f2, 0xa801,
 	0xa803, 0xa805,
 	0xa807, 0xa80a,
@@ -19705,12 +20164,13 @@ static const OnigCodePoint CR_Grapheme_Base[] = {
 	0xa8f2, 0xa8fe,
 	0xa900, 0xa925,
 	0xa92e, 0xa946,
-	0xa952, 0xa953,
+	0xa952, 0xa952,
 	0xa95f, 0xa97c,
 	0xa983, 0xa9b2,
 	0xa9b4, 0xa9b5,
 	0xa9ba, 0xa9bb,
-	0xa9be, 0xa9cd,
+	0xa9be, 0xa9bf,
+	0xa9c1, 0xa9cd,
 	0xa9cf, 0xa9d9,
 	0xa9de, 0xa9e4,
 	0xa9e6, 0xa9fe,
@@ -19809,6 +20269,7 @@ static const OnigCodePoint CR_Grapheme_Base[] = {
 	0x105a3, 0x105b1,
 	0x105b3, 0x105b9,
 	0x105bb, 0x105bc,
+	0x105c0, 0x105f3,
 	0x10600, 0x10736,
 	0x10740, 0x10755,
 	0x10760, 0x10767,
@@ -19850,10 +20311,14 @@ static const OnigCodePoint CR_Grapheme_Base[] = {
 	0x10cc0, 0x10cf2,
 	0x10cfa, 0x10d23,
 	0x10d30, 0x10d39,
+	0x10d40, 0x10d65,
+	0x10d6e, 0x10d85,
+	0x10d8e, 0x10d8f,
 	0x10e60, 0x10e7e,
 	0x10e80, 0x10ea9,
 	0x10ead, 0x10ead,
 	0x10eb0, 0x10eb1,
+	0x10ec2, 0x10ec4,
 	0x10f00, 0x10f27,
 	0x10f30, 0x10f45,
 	0x10f51, 0x10f59,
@@ -19879,14 +20344,14 @@ static const OnigCodePoint CR_Grapheme_Base[] = {
 	0x11150, 0x11172,
 	0x11174, 0x11176,
 	0x11182, 0x111b5,
-	0x111bf, 0x111c8,
+	0x111bf, 0x111bf,
+	0x111c1, 0x111c8,
 	0x111cd, 0x111ce,
 	0x111d0, 0x111df,
 	0x111e1, 0x111f4,
 	0x11200, 0x11211,
 	0x11213, 0x1122e,
 	0x11232, 0x11233,
-	0x11235, 0x11235,
 	0x11238, 0x1123d,
 	0x1123f, 0x11240,
 	0x11280, 0x11286,
@@ -19908,9 +20373,20 @@ static const OnigCodePoint CR_Grapheme_Base[] = {
 	0x1133f, 0x1133f,
 	0x11341, 0x11344,
 	0x11347, 0x11348,
-	0x1134b, 0x1134d,
+	0x1134b, 0x1134c,
 	0x11350, 0x11350,
 	0x1135d, 0x11363,
+	0x11380, 0x11389,
+	0x1138b, 0x1138b,
+	0x1138e, 0x1138e,
+	0x11390, 0x113b5,
+	0x113b7, 0x113b7,
+	0x113b9, 0x113ba,
+	0x113ca, 0x113ca,
+	0x113cc, 0x113cd,
+	0x113d1, 0x113d1,
+	0x113d3, 0x113d5,
+	0x113d7, 0x113d8,
 	0x11400, 0x11437,
 	0x11440, 0x11441,
 	0x11445, 0x11445,
@@ -19939,10 +20415,11 @@ static const OnigCodePoint CR_Grapheme_Base[] = {
 	0x11680, 0x116aa,
 	0x116ac, 0x116ac,
 	0x116ae, 0x116af,
-	0x116b6, 0x116b6,
 	0x116b8, 0x116b9,
 	0x116c0, 0x116c9,
+	0x116d0, 0x116e3,
 	0x11700, 0x1171a,
+	0x1171e, 0x1171e,
 	0x11720, 0x11721,
 	0x11726, 0x11726,
 	0x11730, 0x11746,
@@ -19957,7 +20434,6 @@ static const OnigCodePoint CR_Grapheme_Base[] = {
 	0x11918, 0x1192f,
 	0x11931, 0x11935,
 	0x11937, 0x11938,
-	0x1193d, 0x1193d,
 	0x1193f, 0x11942,
 	0x11944, 0x11946,
 	0x11950, 0x11959,
@@ -19976,6 +20452,8 @@ static const OnigCodePoint CR_Grapheme_Base[] = {
 	0x11a9a, 0x11aa2,
 	0x11ab0, 0x11af8,
 	0x11b00, 0x11b09,
+	0x11bc0, 0x11be1,
+	0x11bf0, 0x11bf9,
 	0x11c00, 0x11c08,
 	0x11c0a, 0x11c2f,
 	0x11c3e, 0x11c3e,
@@ -20002,7 +20480,6 @@ static const OnigCodePoint CR_Grapheme_Base[] = {
 	0x11f02, 0x11f10,
 	0x11f12, 0x11f35,
 	0x11f3e, 0x11f3f,
-	0x11f41, 0x11f41,
 	0x11f43, 0x11f59,
 	0x11fb0, 0x11fb0,
 	0x11fc0, 0x11ff1,
@@ -20013,7 +20490,11 @@ static const OnigCodePoint CR_Grapheme_Base[] = {
 	0x12f90, 0x12ff2,
 	0x13000, 0x1342f,
 	0x13441, 0x13446,
+	0x13460, 0x143fa,
 	0x14400, 0x14646,
+	0x16100, 0x1611d,
+	0x1612a, 0x1612c,
+	0x16130, 0x16139,
 	0x16800, 0x16a38,
 	0x16a40, 0x16a5e,
 	0x16a60, 0x16a69,
@@ -20027,15 +20508,15 @@ static const OnigCodePoint CR_Grapheme_Base[] = {
 	0x16b5b, 0x16b61,
 	0x16b63, 0x16b77,
 	0x16b7d, 0x16b8f,
+	0x16d40, 0x16d79,
 	0x16e40, 0x16e9a,
 	0x16f00, 0x16f4a,
 	0x16f50, 0x16f87,
 	0x16f93, 0x16f9f,
 	0x16fe0, 0x16fe3,
-	0x16ff0, 0x16ff1,
 	0x17000, 0x187f7,
 	0x18800, 0x18cd5,
-	0x18d00, 0x18d08,
+	0x18cff, 0x18d08,
 	0x1aff0, 0x1aff3,
 	0x1aff5, 0x1affb,
 	0x1affd, 0x1affe,
@@ -20051,12 +20532,13 @@ static const OnigCodePoint CR_Grapheme_Base[] = {
 	0x1bc90, 0x1bc99,
 	0x1bc9c, 0x1bc9c,
 	0x1bc9f, 0x1bc9f,
+	0x1cc00, 0x1ccf9,
+	0x1cd00, 0x1ceb3,
 	0x1cf50, 0x1cfc3,
 	0x1d000, 0x1d0f5,
 	0x1d100, 0x1d126,
 	0x1d129, 0x1d164,
-	0x1d166, 0x1d166,
-	0x1d16a, 0x1d16d,
+	0x1d16a, 0x1d16c,
 	0x1d183, 0x1d184,
 	0x1d18c, 0x1d1a9,
 	0x1d1ae, 0x1d1ea,
@@ -20104,6 +20586,9 @@ static const OnigCodePoint CR_Grapheme_Base[] = {
 	0x1e2ff, 0x1e2ff,
 	0x1e4d0, 0x1e4eb,
 	0x1e4f0, 0x1e4f9,
+	0x1e5d0, 0x1e5ed,
+	0x1e5f0, 0x1e5fa,
+	0x1e5ff, 0x1e5ff,
 	0x1e7e0, 0x1e7e6,
 	0x1e7e8, 0x1e7eb,
 	0x1e7ed, 0x1e7ee,
@@ -20174,24 +20659,24 @@ static const OnigCodePoint CR_Grapheme_Base[] = {
 	0x1f850, 0x1f859,
 	0x1f860, 0x1f887,
 	0x1f890, 0x1f8ad,
-	0x1f8b0, 0x1f8b1,
+	0x1f8b0, 0x1f8bb,
+	0x1f8c0, 0x1f8c1,
 	0x1f900, 0x1fa53,
 	0x1fa60, 0x1fa6d,
 	0x1fa70, 0x1fa7c,
-	0x1fa80, 0x1fa88,
-	0x1fa90, 0x1fabd,
-	0x1fabf, 0x1fac5,
-	0x1face, 0x1fadb,
-	0x1fae0, 0x1fae8,
+	0x1fa80, 0x1fa89,
+	0x1fa8f, 0x1fac6,
+	0x1face, 0x1fadc,
+	0x1fadf, 0x1fae9,
 	0x1faf0, 0x1faf8,
 	0x1fb00, 0x1fb92,
-	0x1fb94, 0x1fbca,
-	0x1fbf0, 0x1fbf9,
+	0x1fb94, 0x1fbf9,
 	0x20000, 0x2a6df,
 	0x2a700, 0x2b739,
 	0x2b740, 0x2b81d,
 	0x2b820, 0x2cea1,
 	0x2ceb0, 0x2ebe0,
+	0x2ebf0, 0x2ee5d,
 	0x2f800, 0x2fa1d,
 	0x30000, 0x3134a,
 	0x31350, 0x323af,
@@ -20199,7 +20684,7 @@ static const OnigCodePoint CR_Grapheme_Base[] = {
 
 /* 'Grapheme_Link': Derived Property */
 static const OnigCodePoint CR_Grapheme_Link[] = {
-	56,
+	58,
 	0x094d, 0x094d,
 	0x09cd, 0x09cd,
 	0x0a4d, 0x0a4d,
@@ -20240,6 +20725,7 @@ static const OnigCodePoint CR_Grapheme_Link[] = {
 	0x11235, 0x11235,
 	0x112ea, 0x112ea,
 	0x1134d, 0x1134d,
+	0x113ce, 0x113d0,
 	0x11442, 0x11442,
 	0x114c2, 0x114c2,
 	0x115bf, 0x115bf,
@@ -20256,279 +20742,699 @@ static const OnigCodePoint CR_Grapheme_Link[] = {
 	0x11d44, 0x11d45,
 	0x11d97, 0x11d97,
 	0x11f41, 0x11f42,
+	0x1612f, 0x1612f,
 }; /* CR_Grapheme_Link */
 
-/* 'Common': Script */
-static const OnigCodePoint CR_Common[] = {
-	173,
-	0x0000, 0x0040,
-	0x005b, 0x0060,
-	0x007b, 0x00a9,
-	0x00ab, 0x00b9,
-	0x00bb, 0x00bf,
-	0x00d7, 0x00d7,
-	0x00f7, 0x00f7,
-	0x02b9, 0x02df,
-	0x02e5, 0x02e9,
-	0x02ec, 0x02ff,
-	0x0374, 0x0374,
-	0x037e, 0x037e,
-	0x0385, 0x0385,
-	0x0387, 0x0387,
-	0x0605, 0x0605,
-	0x060c, 0x060c,
-	0x061b, 0x061b,
-	0x061f, 0x061f,
-	0x0640, 0x0640,
-	0x06dd, 0x06dd,
-	0x08e2, 0x08e2,
-	0x0964, 0x0965,
-	0x0e3f, 0x0e3f,
-	0x0fd5, 0x0fd8,
-	0x10fb, 0x10fb,
-	0x16eb, 0x16ed,
-	0x1735, 0x1736,
-	0x1802, 0x1803,
-	0x1805, 0x1805,
-	0x1cd3, 0x1cd3,
-	0x1ce1, 0x1ce1,
-	0x1ce9, 0x1cec,
-	0x1cee, 0x1cf3,
-	0x1cf5, 0x1cf7,
-	0x1cfa, 0x1cfa,
-	0x2000, 0x200b,
-	0x200e, 0x2064,
-	0x2066, 0x2070,
-	0x2074, 0x207e,
-	0x2080, 0x208e,
-	0x20a0, 0x20c0,
-	0x2100, 0x2125,
-	0x2127, 0x2129,
-	0x212c, 0x2131,
-	0x2133, 0x214d,
-	0x214f, 0x215f,
-	0x2189, 0x218b,
-	0x2190, 0x2426,
-	0x2440, 0x244a,
-	0x2460, 0x27ff,
-	0x2900, 0x2b73,
-	0x2b76, 0x2b95,
-	0x2b97, 0x2bff,
-	0x2e00, 0x2e5d,
-	0x2ff0, 0x2ffb,
-	0x3000, 0x3004,
-	0x3006, 0x3006,
-	0x3008, 0x3020,
-	0x3030, 0x3037,
-	0x303c, 0x303f,
-	0x309b, 0x309c,
-	0x30a0, 0x30a0,
-	0x30fb, 0x30fc,
-	0x3190, 0x319f,
-	0x31c0, 0x31e3,
-	0x3220, 0x325f,
-	0x327f, 0x32cf,
-	0x32ff, 0x32ff,
-	0x3358, 0x33ff,
-	0x4dc0, 0x4dff,
-	0xa700, 0xa721,
-	0xa788, 0xa78a,
-	0xa830, 0xa839,
-	0xa92e, 0xa92e,
-	0xa9cf, 0xa9cf,
-	0xab5b, 0xab5b,
-	0xab6a, 0xab6b,
-	0xfd3e, 0xfd3f,
-	0xfe10, 0xfe19,
-	0xfe30, 0xfe52,
-	0xfe54, 0xfe66,
-	0xfe68, 0xfe6b,
-	0xfeff, 0xfeff,
-	0xff01, 0xff20,
-	0xff3b, 0xff40,
-	0xff5b, 0xff65,
-	0xff70, 0xff70,
-	0xff9e, 0xff9f,
-	0xffe0, 0xffe6,
-	0xffe8, 0xffee,
-	0xfff9, 0xfffd,
-	0x10100, 0x10102,
-	0x10107, 0x10133,
-	0x10137, 0x1013f,
-	0x10190, 0x1019c,
-	0x101d0, 0x101fc,
-	0x102e1, 0x102fb,
-	0x1bca0, 0x1bca3,
-	0x1cf50, 0x1cfc3,
-	0x1d000, 0x1d0f5,
-	0x1d100, 0x1d126,
-	0x1d129, 0x1d166,
-	0x1d16a, 0x1d17a,
-	0x1d183, 0x1d184,
-	0x1d18c, 0x1d1a9,
-	0x1d1ae, 0x1d1ea,
-	0x1d2c0, 0x1d2d3,
-	0x1d2e0, 0x1d2f3,
-	0x1d300, 0x1d356,
-	0x1d360, 0x1d378,
-	0x1d400, 0x1d454,
-	0x1d456, 0x1d49c,
-	0x1d49e, 0x1d49f,
-	0x1d4a2, 0x1d4a2,
-	0x1d4a5, 0x1d4a6,
-	0x1d4a9, 0x1d4ac,
-	0x1d4ae, 0x1d4b9,
-	0x1d4bb, 0x1d4bb,
-	0x1d4bd, 0x1d4c3,
-	0x1d4c5, 0x1d505,
-	0x1d507, 0x1d50a,
-	0x1d50d, 0x1d514,
-	0x1d516, 0x1d51c,
-	0x1d51e, 0x1d539,
-	0x1d53b, 0x1d53e,
-	0x1d540, 0x1d544,
-	0x1d546, 0x1d546,
-	0x1d54a, 0x1d550,
-	0x1d552, 0x1d6a5,
-	0x1d6a8, 0x1d7cb,
-	0x1d7ce, 0x1d7ff,
-	0x1ec71, 0x1ecb4,
-	0x1ed01, 0x1ed3d,
-	0x1f000, 0x1f02b,
-	0x1f030, 0x1f093,
-	0x1f0a0, 0x1f0ae,
-	0x1f0b1, 0x1f0bf,
-	0x1f0c1, 0x1f0cf,
-	0x1f0d1, 0x1f0f5,
-	0x1f100, 0x1f1ad,
-	0x1f1e6, 0x1f1ff,
-	0x1f201, 0x1f202,
-	0x1f210, 0x1f23b,
-	0x1f240, 0x1f248,
-	0x1f250, 0x1f251,
-	0x1f260, 0x1f265,
-	0x1f300, 0x1f6d7,
-	0x1f6dc, 0x1f6ec,
-	0x1f6f0, 0x1f6fc,
-	0x1f700, 0x1f776,
-	0x1f77b, 0x1f7d9,
-	0x1f7e0, 0x1f7eb,
-	0x1f7f0, 0x1f7f0,
-	0x1f800, 0x1f80b,
-	0x1f810, 0x1f847,
-	0x1f850, 0x1f859,
-	0x1f860, 0x1f887,
-	0x1f890, 0x1f8ad,
-	0x1f8b0, 0x1f8b1,
-	0x1f900, 0x1fa53,
-	0x1fa60, 0x1fa6d,
-	0x1fa70, 0x1fa7c,
-	0x1fa80, 0x1fa88,
-	0x1fa90, 0x1fabd,
-	0x1fabf, 0x1fac5,
-	0x1face, 0x1fadb,
-	0x1fae0, 0x1fae8,
-	0x1faf0, 0x1faf8,
-	0x1fb00, 0x1fb92,
-	0x1fb94, 0x1fbca,
-	0x1fbf0, 0x1fbf9,
-	0xe0001, 0xe0001,
-	0xe0020, 0xe007f,
-}; /* CR_Common */
-
-/* 'Latin': Script */
-static const OnigCodePoint CR_Latin[] = {
-	39,
-	0x0041, 0x005a,
-	0x0061, 0x007a,
-	0x00aa, 0x00aa,
-	0x00ba, 0x00ba,
-	0x00c0, 0x00d6,
-	0x00d8, 0x00f6,
-	0x00f8, 0x02b8,
-	0x02e0, 0x02e4,
-	0x1d00, 0x1d25,
-	0x1d2c, 0x1d5c,
-	0x1d62, 0x1d65,
-	0x1d6b, 0x1d77,
-	0x1d79, 0x1dbe,
-	0x1e00, 0x1eff,
-	0x2071, 0x2071,
-	0x207f, 0x207f,
-	0x2090, 0x209c,
-	0x212a, 0x212b,
-	0x2132, 0x2132,
-	0x214e, 0x214e,
-	0x2160, 0x2188,
-	0x2c60, 0x2c7f,
-	0xa722, 0xa787,
-	0xa78b, 0xa7ca,
-	0xa7d0, 0xa7d1,
-	0xa7d3, 0xa7d3,
-	0xa7d5, 0xa7d9,
-	0xa7f2, 0xa7ff,
-	0xab30, 0xab5a,
-	0xab5c, 0xab64,
-	0xab66, 0xab69,
-	0xfb00, 0xfb06,
-	0xff21, 0xff3a,
-	0xff41, 0xff5a,
-	0x10780, 0x10785,
-	0x10787, 0x107b0,
-	0x107b2, 0x107ba,
-	0x1df00, 0x1df1e,
-	0x1df25, 0x1df2a,
-}; /* CR_Latin */
-
-/* 'Greek': Script */
-static const OnigCodePoint CR_Greek[] = {
-	36,
-	0x0370, 0x0373,
-	0x0375, 0x0377,
-	0x037a, 0x037d,
-	0x037f, 0x037f,
-	0x0384, 0x0384,
-	0x0386, 0x0386,
-	0x0388, 0x038a,
-	0x038c, 0x038c,
-	0x038e, 0x03a1,
-	0x03a3, 0x03e1,
-	0x03f0, 0x03ff,
-	0x1d26, 0x1d2a,
-	0x1d5d, 0x1d61,
-	0x1d66, 0x1d6a,
-	0x1dbf, 0x1dbf,
-	0x1f00, 0x1f15,
-	0x1f18, 0x1f1d,
-	0x1f20, 0x1f45,
-	0x1f48, 0x1f4d,
-	0x1f50, 0x1f57,
-	0x1f59, 0x1f59,
-	0x1f5b, 0x1f5b,
-	0x1f5d, 0x1f5d,
-	0x1f5f, 0x1f7d,
-	0x1f80, 0x1fb4,
-	0x1fb6, 0x1fc4,
-	0x1fc6, 0x1fd3,
-	0x1fd6, 0x1fdb,
-	0x1fdd, 0x1fef,
-	0x1ff2, 0x1ff4,
-	0x1ff6, 0x1ffe,
-	0x2126, 0x2126,
-	0xab65, 0xab65,
-	0x10140, 0x1018e,
-	0x101a0, 0x101a0,
-	0x1d200, 0x1d245,
-}; /* CR_Greek */
+/* 'InCB_Linker': Derived Property */
+static const OnigCodePoint CR_InCB_Linker[] = {
+	6,
+	0x094d, 0x094d,
+	0x09cd, 0x09cd,
+	0x0acd, 0x0acd,
+	0x0b4d, 0x0b4d,
+	0x0c4d, 0x0c4d,
+	0x0d4d, 0x0d4d,
+}; /* CR_InCB_Linker */
+
+/* 'InCB_Consonant': Derived Property */
+static const OnigCodePoint CR_InCB_Consonant[] = {
+	26,
+	0x0915, 0x0939,
+	0x0958, 0x095f,
+	0x0978, 0x097f,
+	0x0995, 0x09a8,
+	0x09aa, 0x09b0,
+	0x09b2, 0x09b2,
+	0x09b6, 0x09b9,
+	0x09dc, 0x09dd,
+	0x09df, 0x09df,
+	0x09f0, 0x09f1,
+	0x0a95, 0x0aa8,
+	0x0aaa, 0x0ab0,
+	0x0ab2, 0x0ab3,
+	0x0ab5, 0x0ab9,
+	0x0af9, 0x0af9,
+	0x0b15, 0x0b28,
+	0x0b2a, 0x0b30,
+	0x0b32, 0x0b33,
+	0x0b35, 0x0b39,
+	0x0b5c, 0x0b5d,
+	0x0b5f, 0x0b5f,
+	0x0b71, 0x0b71,
+	0x0c15, 0x0c28,
+	0x0c2a, 0x0c39,
+	0x0c58, 0x0c5a,
+	0x0d15, 0x0d3a,
+}; /* CR_InCB_Consonant */
 
-/* 'Cyrillic': Script */
-static const OnigCodePoint CR_Cyrillic[] = {
-	10,
-	0x0400, 0x0484,
-	0x0487, 0x052f,
-	0x1c80, 0x1c88,
-	0x1d2b, 0x1d2b,
-	0x1d78, 0x1d78,
+/* 'InCB_Extend': Derived Property */
+static const OnigCodePoint CR_InCB_Extend[] = {
+	371,
+	0x0300, 0x036f,
+	0x0483, 0x0489,
+	0x0591, 0x05bd,
+	0x05bf, 0x05bf,
+	0x05c1, 0x05c2,
+	0x05c4, 0x05c5,
+	0x05c7, 0x05c7,
+	0x0610, 0x061a,
+	0x064b, 0x065f,
+	0x0670, 0x0670,
+	0x06d6, 0x06dc,
+	0x06df, 0x06e4,
+	0x06e7, 0x06e8,
+	0x06ea, 0x06ed,
+	0x0711, 0x0711,
+	0x0730, 0x074a,
+	0x07a6, 0x07b0,
+	0x07eb, 0x07f3,
+	0x07fd, 0x07fd,
+	0x0816, 0x0819,
+	0x081b, 0x0823,
+	0x0825, 0x0827,
+	0x0829, 0x082d,
+	0x0859, 0x085b,
+	0x0897, 0x089f,
+	0x08ca, 0x08e1,
+	0x08e3, 0x0902,
+	0x093a, 0x093a,
+	0x093c, 0x093c,
+	0x0941, 0x0948,
+	0x0951, 0x0957,
+	0x0962, 0x0963,
+	0x0981, 0x0981,
+	0x09bc, 0x09bc,
+	0x09be, 0x09be,
+	0x09c1, 0x09c4,
+	0x09d7, 0x09d7,
+	0x09e2, 0x09e3,
+	0x09fe, 0x09fe,
+	0x0a01, 0x0a02,
+	0x0a3c, 0x0a3c,
+	0x0a41, 0x0a42,
+	0x0a47, 0x0a48,
+	0x0a4b, 0x0a4d,
+	0x0a51, 0x0a51,
+	0x0a70, 0x0a71,
+	0x0a75, 0x0a75,
+	0x0a81, 0x0a82,
+	0x0abc, 0x0abc,
+	0x0ac1, 0x0ac5,
+	0x0ac7, 0x0ac8,
+	0x0ae2, 0x0ae3,
+	0x0afa, 0x0aff,
+	0x0b01, 0x0b01,
+	0x0b3c, 0x0b3c,
+	0x0b3e, 0x0b3f,
+	0x0b41, 0x0b44,
+	0x0b55, 0x0b57,
+	0x0b62, 0x0b63,
+	0x0b82, 0x0b82,
+	0x0bbe, 0x0bbe,
+	0x0bc0, 0x0bc0,
+	0x0bcd, 0x0bcd,
+	0x0bd7, 0x0bd7,
+	0x0c00, 0x0c00,
+	0x0c04, 0x0c04,
+	0x0c3c, 0x0c3c,
+	0x0c3e, 0x0c40,
+	0x0c46, 0x0c48,
+	0x0c4a, 0x0c4c,
+	0x0c55, 0x0c56,
+	0x0c62, 0x0c63,
+	0x0c81, 0x0c81,
+	0x0cbc, 0x0cbc,
+	0x0cbf, 0x0cc0,
+	0x0cc2, 0x0cc2,
+	0x0cc6, 0x0cc8,
+	0x0cca, 0x0ccd,
+	0x0cd5, 0x0cd6,
+	0x0ce2, 0x0ce3,
+	0x0d00, 0x0d01,
+	0x0d3b, 0x0d3c,
+	0x0d3e, 0x0d3e,
+	0x0d41, 0x0d44,
+	0x0d57, 0x0d57,
+	0x0d62, 0x0d63,
+	0x0d81, 0x0d81,
+	0x0dca, 0x0dca,
+	0x0dcf, 0x0dcf,
+	0x0dd2, 0x0dd4,
+	0x0dd6, 0x0dd6,
+	0x0ddf, 0x0ddf,
+	0x0e31, 0x0e31,
+	0x0e34, 0x0e3a,
+	0x0e47, 0x0e4e,
+	0x0eb1, 0x0eb1,
+	0x0eb4, 0x0ebc,
+	0x0ec8, 0x0ece,
+	0x0f18, 0x0f19,
+	0x0f35, 0x0f35,
+	0x0f37, 0x0f37,
+	0x0f39, 0x0f39,
+	0x0f71, 0x0f7e,
+	0x0f80, 0x0f84,
+	0x0f86, 0x0f87,
+	0x0f8d, 0x0f97,
+	0x0f99, 0x0fbc,
+	0x0fc6, 0x0fc6,
+	0x102d, 0x1030,
+	0x1032, 0x1037,
+	0x1039, 0x103a,
+	0x103d, 0x103e,
+	0x1058, 0x1059,
+	0x105e, 0x1060,
+	0x1071, 0x1074,
+	0x1082, 0x1082,
+	0x1085, 0x1086,
+	0x108d, 0x108d,
+	0x109d, 0x109d,
+	0x135d, 0x135f,
+	0x1712, 0x1715,
+	0x1732, 0x1734,
+	0x1752, 0x1753,
+	0x1772, 0x1773,
+	0x17b4, 0x17b5,
+	0x17b7, 0x17bd,
+	0x17c6, 0x17c6,
+	0x17c9, 0x17d3,
+	0x17dd, 0x17dd,
+	0x180b, 0x180d,
+	0x180f, 0x180f,
+	0x1885, 0x1886,
+	0x18a9, 0x18a9,
+	0x1920, 0x1922,
+	0x1927, 0x1928,
+	0x1932, 0x1932,
+	0x1939, 0x193b,
+	0x1a17, 0x1a18,
+	0x1a1b, 0x1a1b,
+	0x1a56, 0x1a56,
+	0x1a58, 0x1a5e,
+	0x1a60, 0x1a60,
+	0x1a62, 0x1a62,
+	0x1a65, 0x1a6c,
+	0x1a73, 0x1a7c,
+	0x1a7f, 0x1a7f,
+	0x1ab0, 0x1ace,
+	0x1b00, 0x1b03,
+	0x1b34, 0x1b3d,
+	0x1b42, 0x1b44,
+	0x1b6b, 0x1b73,
+	0x1b80, 0x1b81,
+	0x1ba2, 0x1ba5,
+	0x1ba8, 0x1bad,
+	0x1be6, 0x1be6,
+	0x1be8, 0x1be9,
+	0x1bed, 0x1bed,
+	0x1bef, 0x1bf3,
+	0x1c2c, 0x1c33,
+	0x1c36, 0x1c37,
+	0x1cd0, 0x1cd2,
+	0x1cd4, 0x1ce0,
+	0x1ce2, 0x1ce8,
+	0x1ced, 0x1ced,
+	0x1cf4, 0x1cf4,
+	0x1cf8, 0x1cf9,
+	0x1dc0, 0x1dff,
+	0x200d, 0x200d,
+	0x20d0, 0x20f0,
+	0x2cef, 0x2cf1,
+	0x2d7f, 0x2d7f,
+	0x2de0, 0x2dff,
+	0x302a, 0x302f,
+	0x3099, 0x309a,
+	0xa66f, 0xa672,
+	0xa674, 0xa67d,
+	0xa69e, 0xa69f,
+	0xa6f0, 0xa6f1,
+	0xa802, 0xa802,
+	0xa806, 0xa806,
+	0xa80b, 0xa80b,
+	0xa825, 0xa826,
+	0xa82c, 0xa82c,
+	0xa8c4, 0xa8c5,
+	0xa8e0, 0xa8f1,
+	0xa8ff, 0xa8ff,
+	0xa926, 0xa92d,
+	0xa947, 0xa951,
+	0xa953, 0xa953,
+	0xa980, 0xa982,
+	0xa9b3, 0xa9b3,
+	0xa9b6, 0xa9b9,
+	0xa9bc, 0xa9bd,
+	0xa9c0, 0xa9c0,
+	0xa9e5, 0xa9e5,
+	0xaa29, 0xaa2e,
+	0xaa31, 0xaa32,
+	0xaa35, 0xaa36,
+	0xaa43, 0xaa43,
+	0xaa4c, 0xaa4c,
+	0xaa7c, 0xaa7c,
+	0xaab0, 0xaab0,
+	0xaab2, 0xaab4,
+	0xaab7, 0xaab8,
+	0xaabe, 0xaabf,
+	0xaac1, 0xaac1,
+	0xaaec, 0xaaed,
+	0xaaf6, 0xaaf6,
+	0xabe5, 0xabe5,
+	0xabe8, 0xabe8,
+	0xabed, 0xabed,
+	0xfb1e, 0xfb1e,
+	0xfe00, 0xfe0f,
+	0xfe20, 0xfe2f,
+	0xff9e, 0xff9f,
+	0x101fd, 0x101fd,
+	0x102e0, 0x102e0,
+	0x10376, 0x1037a,
+	0x10a01, 0x10a03,
+	0x10a05, 0x10a06,
+	0x10a0c, 0x10a0f,
+	0x10a38, 0x10a3a,
+	0x10a3f, 0x10a3f,
+	0x10ae5, 0x10ae6,
+	0x10d24, 0x10d27,
+	0x10d69, 0x10d6d,
+	0x10eab, 0x10eac,
+	0x10efc, 0x10eff,
+	0x10f46, 0x10f50,
+	0x10f82, 0x10f85,
+	0x11001, 0x11001,
+	0x11038, 0x11046,
+	0x11070, 0x11070,
+	0x11073, 0x11074,
+	0x1107f, 0x11081,
+	0x110b3, 0x110b6,
+	0x110b9, 0x110ba,
+	0x110c2, 0x110c2,
+	0x11100, 0x11102,
+	0x11127, 0x1112b,
+	0x1112d, 0x11134,
+	0x11173, 0x11173,
+	0x11180, 0x11181,
+	0x111b6, 0x111be,
+	0x111c0, 0x111c0,
+	0x111c9, 0x111cc,
+	0x111cf, 0x111cf,
+	0x1122f, 0x11231,
+	0x11234, 0x11237,
+	0x1123e, 0x1123e,
+	0x11241, 0x11241,
+	0x112df, 0x112df,
+	0x112e3, 0x112ea,
+	0x11300, 0x11301,
+	0x1133b, 0x1133c,
+	0x1133e, 0x1133e,
+	0x11340, 0x11340,
+	0x1134d, 0x1134d,
+	0x11357, 0x11357,
+	0x11366, 0x1136c,
+	0x11370, 0x11374,
+	0x113b8, 0x113b8,
+	0x113bb, 0x113c0,
+	0x113c2, 0x113c2,
+	0x113c5, 0x113c5,
+	0x113c7, 0x113c9,
+	0x113ce, 0x113d0,
+	0x113d2, 0x113d2,
+	0x113e1, 0x113e2,
+	0x11438, 0x1143f,
+	0x11442, 0x11444,
+	0x11446, 0x11446,
+	0x1145e, 0x1145e,
+	0x114b0, 0x114b0,
+	0x114b3, 0x114b8,
+	0x114ba, 0x114ba,
+	0x114bd, 0x114bd,
+	0x114bf, 0x114c0,
+	0x114c2, 0x114c3,
+	0x115af, 0x115af,
+	0x115b2, 0x115b5,
+	0x115bc, 0x115bd,
+	0x115bf, 0x115c0,
+	0x115dc, 0x115dd,
+	0x11633, 0x1163a,
+	0x1163d, 0x1163d,
+	0x1163f, 0x11640,
+	0x116ab, 0x116ab,
+	0x116ad, 0x116ad,
+	0x116b0, 0x116b7,
+	0x1171d, 0x1171d,
+	0x1171f, 0x1171f,
+	0x11722, 0x11725,
+	0x11727, 0x1172b,
+	0x1182f, 0x11837,
+	0x11839, 0x1183a,
+	0x11930, 0x11930,
+	0x1193b, 0x1193e,
+	0x11943, 0x11943,
+	0x119d4, 0x119d7,
+	0x119da, 0x119db,
+	0x119e0, 0x119e0,
+	0x11a01, 0x11a0a,
+	0x11a33, 0x11a38,
+	0x11a3b, 0x11a3e,
+	0x11a47, 0x11a47,
+	0x11a51, 0x11a56,
+	0x11a59, 0x11a5b,
+	0x11a8a, 0x11a96,
+	0x11a98, 0x11a99,
+	0x11c30, 0x11c36,
+	0x11c38, 0x11c3d,
+	0x11c3f, 0x11c3f,
+	0x11c92, 0x11ca7,
+	0x11caa, 0x11cb0,
+	0x11cb2, 0x11cb3,
+	0x11cb5, 0x11cb6,
+	0x11d31, 0x11d36,
+	0x11d3a, 0x11d3a,
+	0x11d3c, 0x11d3d,
+	0x11d3f, 0x11d45,
+	0x11d47, 0x11d47,
+	0x11d90, 0x11d91,
+	0x11d95, 0x11d95,
+	0x11d97, 0x11d97,
+	0x11ef3, 0x11ef4,
+	0x11f00, 0x11f01,
+	0x11f36, 0x11f3a,
+	0x11f40, 0x11f42,
+	0x11f5a, 0x11f5a,
+	0x13440, 0x13440,
+	0x13447, 0x13455,
+	0x1611e, 0x16129,
+	0x1612d, 0x1612f,
+	0x16af0, 0x16af4,
+	0x16b30, 0x16b36,
+	0x16f4f, 0x16f4f,
+	0x16f8f, 0x16f92,
+	0x16fe4, 0x16fe4,
+	0x16ff0, 0x16ff1,
+	0x1bc9d, 0x1bc9e,
+	0x1cf00, 0x1cf2d,
+	0x1cf30, 0x1cf46,
+	0x1d165, 0x1d169,
+	0x1d16d, 0x1d172,
+	0x1d17b, 0x1d182,
+	0x1d185, 0x1d18b,
+	0x1d1aa, 0x1d1ad,
+	0x1d242, 0x1d244,
+	0x1da00, 0x1da36,
+	0x1da3b, 0x1da6c,
+	0x1da75, 0x1da75,
+	0x1da84, 0x1da84,
+	0x1da9b, 0x1da9f,
+	0x1daa1, 0x1daaf,
+	0x1e000, 0x1e006,
+	0x1e008, 0x1e018,
+	0x1e01b, 0x1e021,
+	0x1e023, 0x1e024,
+	0x1e026, 0x1e02a,
+	0x1e08f, 0x1e08f,
+	0x1e130, 0x1e136,
+	0x1e2ae, 0x1e2ae,
+	0x1e2ec, 0x1e2ef,
+	0x1e4ec, 0x1e4ef,
+	0x1e5ee, 0x1e5ef,
+	0x1e8d0, 0x1e8d6,
+	0x1e944, 0x1e94a,
+	0x1f3fb, 0x1f3ff,
+	0xe0020, 0xe007f,
+	0xe0100, 0xe01ef,
+}; /* CR_InCB_Extend */
+
+/* 'Common': Script */
+static const OnigCodePoint CR_Common[] = {
+	174,
+	0x0000, 0x0040,
+	0x005b, 0x0060,
+	0x007b, 0x00a9,
+	0x00ab, 0x00b9,
+	0x00bb, 0x00bf,
+	0x00d7, 0x00d7,
+	0x00f7, 0x00f7,
+	0x02b9, 0x02df,
+	0x02e5, 0x02e9,
+	0x02ec, 0x02ff,
+	0x0374, 0x0374,
+	0x037e, 0x037e,
+	0x0385, 0x0385,
+	0x0387, 0x0387,
+	0x0605, 0x0605,
+	0x060c, 0x060c,
+	0x061b, 0x061b,
+	0x061f, 0x061f,
+	0x0640, 0x0640,
+	0x06dd, 0x06dd,
+	0x08e2, 0x08e2,
+	0x0964, 0x0965,
+	0x0e3f, 0x0e3f,
+	0x0fd5, 0x0fd8,
+	0x10fb, 0x10fb,
+	0x16eb, 0x16ed,
+	0x1735, 0x1736,
+	0x1802, 0x1803,
+	0x1805, 0x1805,
+	0x1cd3, 0x1cd3,
+	0x1ce1, 0x1ce1,
+	0x1ce9, 0x1cec,
+	0x1cee, 0x1cf3,
+	0x1cf5, 0x1cf7,
+	0x1cfa, 0x1cfa,
+	0x2000, 0x200b,
+	0x200e, 0x2064,
+	0x2066, 0x2070,
+	0x2074, 0x207e,
+	0x2080, 0x208e,
+	0x20a0, 0x20c0,
+	0x2100, 0x2125,
+	0x2127, 0x2129,
+	0x212c, 0x2131,
+	0x2133, 0x214d,
+	0x214f, 0x215f,
+	0x2189, 0x218b,
+	0x2190, 0x2429,
+	0x2440, 0x244a,
+	0x2460, 0x27ff,
+	0x2900, 0x2b73,
+	0x2b76, 0x2b95,
+	0x2b97, 0x2bff,
+	0x2e00, 0x2e5d,
+	0x2ff0, 0x3004,
+	0x3006, 0x3006,
+	0x3008, 0x3020,
+	0x3030, 0x3037,
+	0x303c, 0x303f,
+	0x309b, 0x309c,
+	0x30a0, 0x30a0,
+	0x30fb, 0x30fc,
+	0x3190, 0x319f,
+	0x31c0, 0x31e5,
+	0x31ef, 0x31ef,
+	0x3220, 0x325f,
+	0x327f, 0x32cf,
+	0x32ff, 0x32ff,
+	0x3358, 0x33ff,
+	0x4dc0, 0x4dff,
+	0xa700, 0xa721,
+	0xa788, 0xa78a,
+	0xa830, 0xa839,
+	0xa92e, 0xa92e,
+	0xa9cf, 0xa9cf,
+	0xab5b, 0xab5b,
+	0xab6a, 0xab6b,
+	0xfd3e, 0xfd3f,
+	0xfe10, 0xfe19,
+	0xfe30, 0xfe52,
+	0xfe54, 0xfe66,
+	0xfe68, 0xfe6b,
+	0xfeff, 0xfeff,
+	0xff01, 0xff20,
+	0xff3b, 0xff40,
+	0xff5b, 0xff65,
+	0xff70, 0xff70,
+	0xff9e, 0xff9f,
+	0xffe0, 0xffe6,
+	0xffe8, 0xffee,
+	0xfff9, 0xfffd,
+	0x10100, 0x10102,
+	0x10107, 0x10133,
+	0x10137, 0x1013f,
+	0x10190, 0x1019c,
+	0x101d0, 0x101fc,
+	0x102e1, 0x102fb,
+	0x1bca0, 0x1bca3,
+	0x1cc00, 0x1ccf9,
+	0x1cd00, 0x1ceb3,
+	0x1cf50, 0x1cfc3,
+	0x1d000, 0x1d0f5,
+	0x1d100, 0x1d126,
+	0x1d129, 0x1d166,
+	0x1d16a, 0x1d17a,
+	0x1d183, 0x1d184,
+	0x1d18c, 0x1d1a9,
+	0x1d1ae, 0x1d1ea,
+	0x1d2c0, 0x1d2d3,
+	0x1d2e0, 0x1d2f3,
+	0x1d300, 0x1d356,
+	0x1d360, 0x1d378,
+	0x1d400, 0x1d454,
+	0x1d456, 0x1d49c,
+	0x1d49e, 0x1d49f,
+	0x1d4a2, 0x1d4a2,
+	0x1d4a5, 0x1d4a6,
+	0x1d4a9, 0x1d4ac,
+	0x1d4ae, 0x1d4b9,
+	0x1d4bb, 0x1d4bb,
+	0x1d4bd, 0x1d4c3,
+	0x1d4c5, 0x1d505,
+	0x1d507, 0x1d50a,
+	0x1d50d, 0x1d514,
+	0x1d516, 0x1d51c,
+	0x1d51e, 0x1d539,
+	0x1d53b, 0x1d53e,
+	0x1d540, 0x1d544,
+	0x1d546, 0x1d546,
+	0x1d54a, 0x1d550,
+	0x1d552, 0x1d6a5,
+	0x1d6a8, 0x1d7cb,
+	0x1d7ce, 0x1d7ff,
+	0x1ec71, 0x1ecb4,
+	0x1ed01, 0x1ed3d,
+	0x1f000, 0x1f02b,
+	0x1f030, 0x1f093,
+	0x1f0a0, 0x1f0ae,
+	0x1f0b1, 0x1f0bf,
+	0x1f0c1, 0x1f0cf,
+	0x1f0d1, 0x1f0f5,
+	0x1f100, 0x1f1ad,
+	0x1f1e6, 0x1f1ff,
+	0x1f201, 0x1f202,
+	0x1f210, 0x1f23b,
+	0x1f240, 0x1f248,
+	0x1f250, 0x1f251,
+	0x1f260, 0x1f265,
+	0x1f300, 0x1f6d7,
+	0x1f6dc, 0x1f6ec,
+	0x1f6f0, 0x1f6fc,
+	0x1f700, 0x1f776,
+	0x1f77b, 0x1f7d9,
+	0x1f7e0, 0x1f7eb,
+	0x1f7f0, 0x1f7f0,
+	0x1f800, 0x1f80b,
+	0x1f810, 0x1f847,
+	0x1f850, 0x1f859,
+	0x1f860, 0x1f887,
+	0x1f890, 0x1f8ad,
+	0x1f8b0, 0x1f8bb,
+	0x1f8c0, 0x1f8c1,
+	0x1f900, 0x1fa53,
+	0x1fa60, 0x1fa6d,
+	0x1fa70, 0x1fa7c,
+	0x1fa80, 0x1fa89,
+	0x1fa8f, 0x1fac6,
+	0x1face, 0x1fadc,
+	0x1fadf, 0x1fae9,
+	0x1faf0, 0x1faf8,
+	0x1fb00, 0x1fb92,
+	0x1fb94, 0x1fbf9,
+	0xe0001, 0xe0001,
+	0xe0020, 0xe007f,
+}; /* CR_Common */
+
+/* 'Latin': Script */
+static const OnigCodePoint CR_Latin[] = {
+	39,
+	0x0041, 0x005a,
+	0x0061, 0x007a,
+	0x00aa, 0x00aa,
+	0x00ba, 0x00ba,
+	0x00c0, 0x00d6,
+	0x00d8, 0x00f6,
+	0x00f8, 0x02b8,
+	0x02e0, 0x02e4,
+	0x1d00, 0x1d25,
+	0x1d2c, 0x1d5c,
+	0x1d62, 0x1d65,
+	0x1d6b, 0x1d77,
+	0x1d79, 0x1dbe,
+	0x1e00, 0x1eff,
+	0x2071, 0x2071,
+	0x207f, 0x207f,
+	0x2090, 0x209c,
+	0x212a, 0x212b,
+	0x2132, 0x2132,
+	0x214e, 0x214e,
+	0x2160, 0x2188,
+	0x2c60, 0x2c7f,
+	0xa722, 0xa787,
+	0xa78b, 0xa7cd,
+	0xa7d0, 0xa7d1,
+	0xa7d3, 0xa7d3,
+	0xa7d5, 0xa7dc,
+	0xa7f2, 0xa7ff,
+	0xab30, 0xab5a,
+	0xab5c, 0xab64,
+	0xab66, 0xab69,
+	0xfb00, 0xfb06,
+	0xff21, 0xff3a,
+	0xff41, 0xff5a,
+	0x10780, 0x10785,
+	0x10787, 0x107b0,
+	0x107b2, 0x107ba,
+	0x1df00, 0x1df1e,
+	0x1df25, 0x1df2a,
+}; /* CR_Latin */
+
+/* 'Greek': Script */
+static const OnigCodePoint CR_Greek[] = {
+	36,
+	0x0370, 0x0373,
+	0x0375, 0x0377,
+	0x037a, 0x037d,
+	0x037f, 0x037f,
+	0x0384, 0x0384,
+	0x0386, 0x0386,
+	0x0388, 0x038a,
+	0x038c, 0x038c,
+	0x038e, 0x03a1,
+	0x03a3, 0x03e1,
+	0x03f0, 0x03ff,
+	0x1d26, 0x1d2a,
+	0x1d5d, 0x1d61,
+	0x1d66, 0x1d6a,
+	0x1dbf, 0x1dbf,
+	0x1f00, 0x1f15,
+	0x1f18, 0x1f1d,
+	0x1f20, 0x1f45,
+	0x1f48, 0x1f4d,
+	0x1f50, 0x1f57,
+	0x1f59, 0x1f59,
+	0x1f5b, 0x1f5b,
+	0x1f5d, 0x1f5d,
+	0x1f5f, 0x1f7d,
+	0x1f80, 0x1fb4,
+	0x1fb6, 0x1fc4,
+	0x1fc6, 0x1fd3,
+	0x1fd6, 0x1fdb,
+	0x1fdd, 0x1fef,
+	0x1ff2, 0x1ff4,
+	0x1ff6, 0x1ffe,
+	0x2126, 0x2126,
+	0xab65, 0xab65,
+	0x10140, 0x1018e,
+	0x101a0, 0x101a0,
+	0x1d200, 0x1d245,
+}; /* CR_Greek */
+
+/* 'Cyrillic': Script */
+static const OnigCodePoint CR_Cyrillic[] = {
+	10,
+	0x0400, 0x0484,
+	0x0487, 0x052f,
+	0x1c80, 0x1c8a,
+	0x1d2b, 0x1d2b,
+	0x1d78, 0x1d78,
 	0x2de0, 0x2dff,
 	0xa640, 0xa69f,
 	0xfe2e, 0xfe2f,
@@ -20561,7 +21467,7 @@ static const OnigCodePoint CR_Hebrew[] = {
 
 /* 'Arabic': Script */
 static const OnigCodePoint CR_Arabic[] = {
-	58,
+	59,
 	0x0600, 0x0604,
 	0x0606, 0x060b,
 	0x060d, 0x061a,
@@ -20574,7 +21480,7 @@ static const OnigCodePoint CR_Arabic[] = {
 	0x0750, 0x077f,
 	0x0870, 0x088e,
 	0x0890, 0x0891,
-	0x0898, 0x08e1,
+	0x0897, 0x08e1,
 	0x08e3, 0x08ff,
 	0xfb50, 0xfbc2,
 	0xfbd3, 0xfd3d,
@@ -20585,7 +21491,8 @@ static const OnigCodePoint CR_Arabic[] = {
 	0xfe70, 0xfe74,
 	0xfe76, 0xfefc,
 	0x10e60, 0x10e7e,
-	0x10efd, 0x10eff,
+	0x10ec2, 0x10ec4,
+	0x10efc, 0x10eff,
 	0x1ee00, 0x1ee03,
 	0x1ee05, 0x1ee1f,
 	0x1ee21, 0x1ee22,
@@ -20851,10 +21758,11 @@ static const OnigCodePoint CR_Tibetan[] = {
 
 /* 'Myanmar': Script */
 static const OnigCodePoint CR_Myanmar[] = {
-	3,
+	4,
 	0x1000, 0x109f,
 	0xa9e0, 0xa9fe,
 	0xaa60, 0xaa7f,
+	0x116d0, 0x116e3,
 }; /* CR_Myanmar */
 
 /* 'Georgian': Script */
@@ -21021,7 +21929,7 @@ static const OnigCodePoint CR_Bopomofo[] = {
 
 /* 'Han': Script */
 static const OnigCodePoint CR_Han[] = {
-	21,
+	22,
 	0x2e80, 0x2e99,
 	0x2e9b, 0x2ef3,
 	0x2f00, 0x2fd5,
@@ -21040,6 +21948,7 @@ static const OnigCodePoint CR_Han[] = {
 	0x2b740, 0x2b81d,
 	0x2b820, 0x2cea1,
 	0x2ceb0, 0x2ebe0,
+	0x2ebf0, 0x2ee5d,
 	0x2f800, 0x2fa1d,
 	0x30000, 0x3134a,
 	0x31350, 0x323af,
@@ -21271,7 +22180,7 @@ static const OnigCodePoint CR_Kharoshthi[] = {
 static const OnigCodePoint CR_Balinese[] = {
 	2,
 	0x1b00, 0x1b4c,
-	0x1b50, 0x1b7e,
+	0x1b4e, 0x1b7f,
 }; /* CR_Balinese */
 
 /* 'Cuneiform': Script */
@@ -21405,8 +22314,9 @@ static const OnigCodePoint CR_Avestan[] = {
 
 /* 'Egyptian_Hieroglyphs': Script */
 static const OnigCodePoint CR_Egyptian_Hieroglyphs[] = {
-	1,
+	2,
 	0x13000, 0x13455,
+	0x13460, 0x143fa,
 }; /* CR_Egyptian_Hieroglyphs */
 
 /* 'Samaritan': Script */
@@ -21960,9 +22870,10 @@ static const OnigCodePoint CR_Dives_Akuru[] = {
 
 /* 'Khitan_Small_Script': Script */
 static const OnigCodePoint CR_Khitan_Small_Script[] = {
-	2,
+	3,
 	0x16fe4, 0x16fe4,
 	0x18b00, 0x18cd5,
+	0x18cff, 0x18cff,
 }; /* CR_Khitan_Small_Script */
 
 /* 'Yezidi': Script */
@@ -22016,7 +22927,7 @@ static const OnigCodePoint CR_Kawi[] = {
 	3,
 	0x11f00, 0x11f10,
 	0x11f12, 0x11f3a,
-	0x11f3e, 0x11f59,
+	0x11f3e, 0x11f5a,
 }; /* CR_Kawi */
 
 /* 'Nag_Mundari': Script */
@@ -22025,6 +22936,62 @@ static const OnigCodePoint CR_Nag_Mundari[] = {
 	0x1e4d0, 0x1e4f9,
 }; /* CR_Nag_Mundari */
 
+/* 'Garay': Script */
+static const OnigCodePoint CR_Garay[] = {
+	3,
+	0x10d40, 0x10d65,
+	0x10d69, 0x10d85,
+	0x10d8e, 0x10d8f,
+}; /* CR_Garay */
+
+/* 'Gurung_Khema': Script */
+static const OnigCodePoint CR_Gurung_Khema[] = {
+	1,
+	0x16100, 0x16139,
+}; /* CR_Gurung_Khema */
+
+/* 'Kirat_Rai': Script */
+static const OnigCodePoint CR_Kirat_Rai[] = {
+	1,
+	0x16d40, 0x16d79,
+}; /* CR_Kirat_Rai */
+
+/* 'Ol_Onal': Script */
+static const OnigCodePoint CR_Ol_Onal[] = {
+	2,
+	0x1e5d0, 0x1e5fa,
+	0x1e5ff, 0x1e5ff,
+}; /* CR_Ol_Onal */
+
+/* 'Sunuwar': Script */
+static const OnigCodePoint CR_Sunuwar[] = {
+	2,
+	0x11bc0, 0x11be1,
+	0x11bf0, 0x11bf9,
+}; /* CR_Sunuwar */
+
+/* 'Todhri': Script */
+static const OnigCodePoint CR_Todhri[] = {
+	1,
+	0x105c0, 0x105f3,
+}; /* CR_Todhri */
+
+/* 'Tulu_Tigalari': Script */
+static const OnigCodePoint CR_Tulu_Tigalari[] = {
+	11,
+	0x11380, 0x11389,
+	0x1138b, 0x1138b,
+	0x1138e, 0x1138e,
+	0x11390, 0x113b5,
+	0x113b7, 0x113c0,
+	0x113c2, 0x113c2,
+	0x113c5, 0x113c5,
+	0x113c7, 0x113ca,
+	0x113cc, 0x113d5,
+	0x113d7, 0x113d8,
+	0x113e1, 0x113e2,
+}; /* CR_Tulu_Tigalari */
+
 /* 'White_Space': Binary Property */
 #define CR_White_Space CR_Space
 
@@ -22045,7 +23012,7 @@ static const OnigCodePoint CR_Join_Control[] = {
 
 /* 'Dash': Binary Property */
 static const OnigCodePoint CR_Dash[] = {
-	23,
+	24,
 	0x002d, 0x002d,
 	0x058a, 0x058a,
 	0x05be, 0x05be,
@@ -22068,6 +23035,7 @@ static const OnigCodePoint CR_Dash[] = {
 	0xfe58, 0xfe58,
 	0xfe63, 0xfe63,
 	0xff0d, 0xff0d,
+	0x10d6e, 0x10d6e,
 	0x10ead, 0x10ead,
 }; /* CR_Dash */
 
@@ -22106,7 +23074,7 @@ static const OnigCodePoint CR_Quotation_Mark[] = {
 
 /* 'Terminal_Punctuation': Binary Property */
 static const OnigCodePoint CR_Terminal_Punctuation[] = {
-	108,
+	116,
 	0x0021, 0x0021,
 	0x002c, 0x002c,
 	0x002e, 0x002e,
@@ -22123,7 +23091,8 @@ static const OnigCodePoint CR_Terminal_Punctuation[] = {
 	0x0700, 0x070a,
 	0x070c, 0x070c,
 	0x07f8, 0x07f9,
-	0x0830, 0x083e,
+	0x0830, 0x0835,
+	0x0837, 0x083e,
 	0x085e, 0x085e,
 	0x0964, 0x0965,
 	0x0e5a, 0x0e5b,
@@ -22140,13 +23109,16 @@ static const OnigCodePoint CR_Terminal_Punctuation[] = {
 	0x1808, 0x1809,
 	0x1944, 0x1945,
 	0x1aa8, 0x1aab,
+	0x1b4e, 0x1b4f,
 	0x1b5a, 0x1b5b,
 	0x1b5d, 0x1b5f,
-	0x1b7d, 0x1b7e,
+	0x1b7d, 0x1b7f,
 	0x1c3b, 0x1c3f,
 	0x1c7e, 0x1c7f,
+	0x2024, 0x2024,
 	0x203c, 0x203d,
 	0x2047, 0x2049,
+	0x2cf9, 0x2cfb,
 	0x2e2e, 0x2e2e,
 	0x2e3c, 0x2e3c,
 	0x2e41, 0x2e41,
@@ -22165,6 +23137,8 @@ static const OnigCodePoint CR_Terminal_Punctuation[] = {
 	0xaadf, 0xaadf,
 	0xaaf0, 0xaaf1,
 	0xabeb, 0xabeb,
+	0xfe12, 0xfe12,
+	0xfe15, 0xfe16,
 	0xfe50, 0xfe52,
 	0xfe54, 0xfe57,
 	0xff01, 0xff01,
@@ -22192,6 +23166,7 @@ static const OnigCodePoint CR_Terminal_Punctuation[] = {
 	0x111de, 0x111df,
 	0x11238, 0x1123c,
 	0x112a9, 0x112a9,
+	0x113d4, 0x113d5,
 	0x1144b, 0x1144d,
 	0x1145a, 0x1145b,
 	0x115c2, 0x115c5,
@@ -22212,6 +23187,7 @@ static const OnigCodePoint CR_Terminal_Punctuation[] = {
 	0x16af5, 0x16af5,
 	0x16b37, 0x16b39,
 	0x16b44, 0x16b44,
+	0x16d6e, 0x16d6f,
 	0x16e97, 0x16e98,
 	0x1bc9f, 0x1bc9f,
 	0x1da87, 0x1da8a,
@@ -22372,8 +23348,9 @@ static const OnigCodePoint CR_Hex_Digit[] = {
 
 /* 'Other_Alphabetic': Binary Property */
 static const OnigCodePoint CR_Other_Alphabetic[] = {
-	240,
+	250,
 	0x0345, 0x0345,
+	0x0363, 0x036f,
 	0x05b0, 0x05bd,
 	0x05bf, 0x05bf,
 	0x05c1, 0x05c2,
@@ -22394,6 +23371,7 @@ static const OnigCodePoint CR_Other_Alphabetic[] = {
 	0x081b, 0x0823,
 	0x0825, 0x0827,
 	0x0829, 0x082c,
+	0x0897, 0x0897,
 	0x08d4, 0x08df,
 	0x08e3, 0x08e9,
 	0x08f0, 0x0903,
@@ -22498,7 +23476,7 @@ static const OnigCodePoint CR_Other_Alphabetic[] = {
 	0x1bac, 0x1bad,
 	0x1be7, 0x1bf1,
 	0x1c24, 0x1c36,
-	0x1de7, 0x1df4,
+	0x1dd3, 0x1df4,
 	0x24b6, 0x24e9,
 	0x2de0, 0x2dff,
 	0xa674, 0xa67b,
@@ -22532,7 +23510,9 @@ static const OnigCodePoint CR_Other_Alphabetic[] = {
 	0x10a05, 0x10a06,
 	0x10a0c, 0x10a0f,
 	0x10d24, 0x10d27,
+	0x10d69, 0x10d69,
 	0x10eab, 0x10eac,
+	0x10efc, 0x10efc,
 	0x11000, 0x11002,
 	0x11038, 0x11045,
 	0x11073, 0x11074,
@@ -22556,6 +23536,11 @@ static const OnigCodePoint CR_Other_Alphabetic[] = {
 	0x1134b, 0x1134c,
 	0x11357, 0x11357,
 	0x11362, 0x11363,
+	0x113b8, 0x113c0,
+	0x113c2, 0x113c2,
+	0x113c5, 0x113c5,
+	0x113c7, 0x113ca,
+	0x113cc, 0x113cd,
 	0x11435, 0x11441,
 	0x11443, 0x11445,
 	0x114b0, 0x114c1,
@@ -22598,6 +23583,7 @@ static const OnigCodePoint CR_Other_Alphabetic[] = {
 	0x11f03, 0x11f03,
 	0x11f34, 0x11f3a,
 	0x11f3e, 0x11f40,
+	0x1611e, 0x1612e,
 	0x16f4f, 0x16f4f,
 	0x16f51, 0x16f87,
 	0x16f8f, 0x16f92,
@@ -22617,7 +23603,7 @@ static const OnigCodePoint CR_Other_Alphabetic[] = {
 
 /* 'Ideographic': Binary Property */
 static const OnigCodePoint CR_Ideographic[] = {
-	20,
+	21,
 	0x3006, 0x3007,
 	0x3021, 0x3029,
 	0x3038, 0x303a,
@@ -22628,13 +23614,14 @@ static const OnigCodePoint CR_Ideographic[] = {
 	0x16fe4, 0x16fe4,
 	0x17000, 0x187f7,
 	0x18800, 0x18cd5,
-	0x18d00, 0x18d08,
+	0x18cff, 0x18d08,
 	0x1b170, 0x1b2fb,
 	0x20000, 0x2a6df,
 	0x2a700, 0x2b739,
 	0x2b740, 0x2b81d,
 	0x2b820, 0x2cea1,
 	0x2ceb0, 0x2ebe0,
+	0x2ebf0, 0x2ee5d,
 	0x2f800, 0x2fa1d,
 	0x30000, 0x3134a,
 	0x31350, 0x323af,
@@ -22642,7 +23629,7 @@ static const OnigCodePoint CR_Ideographic[] = {
 
 /* 'Diacritic': Binary Property */
 static const OnigCodePoint CR_Diacritic[] = {
-	195,
+	214,
 	0x005e, 0x005e,
 	0x0060, 0x0060,
 	0x00a8, 0x00a8,
@@ -22696,6 +23683,7 @@ static const OnigCodePoint CR_Diacritic[] = {
 	0x0d3b, 0x0d3c,
 	0x0d4d, 0x0d4d,
 	0x0dca, 0x0dca,
+	0x0e3a, 0x0e3a,
 	0x0e47, 0x0e4c,
 	0x0e4e, 0x0e4e,
 	0x0eba, 0x0eba,
@@ -22717,9 +23705,11 @@ static const OnigCodePoint CR_Diacritic[] = {
 	0x109a, 0x109b,
 	0x135d, 0x135f,
 	0x1714, 0x1715,
+	0x1734, 0x1734,
 	0x17c9, 0x17d3,
 	0x17dd, 0x17dd,
 	0x1939, 0x193b,
+	0x1a60, 0x1a60,
 	0x1a75, 0x1a7c,
 	0x1a7f, 0x1a7f,
 	0x1ab0, 0x1abe,
@@ -22728,6 +23718,8 @@ static const OnigCodePoint CR_Diacritic[] = {
 	0x1b44, 0x1b44,
 	0x1b6b, 0x1b73,
 	0x1baa, 0x1bab,
+	0x1be6, 0x1be6,
+	0x1bf2, 0x1bf3,
 	0x1c36, 0x1c37,
 	0x1c78, 0x1c7d,
 	0x1cd0, 0x1ce8,
@@ -22756,6 +23748,8 @@ static const OnigCodePoint CR_Diacritic[] = {
 	0xa700, 0xa721,
 	0xa788, 0xa78a,
 	0xa7f8, 0xa7f9,
+	0xa806, 0xa806,
+	0xa82c, 0xa82c,
 	0xa8c4, 0xa8c4,
 	0xa8e0, 0xa8f1,
 	0xa92b, 0xa92e,
@@ -22780,8 +23774,12 @@ static const OnigCodePoint CR_Diacritic[] = {
 	0x10780, 0x10785,
 	0x10787, 0x107b0,
 	0x107b2, 0x107ba,
+	0x10a38, 0x10a3a,
+	0x10a3f, 0x10a3f,
 	0x10ae5, 0x10ae6,
 	0x10d22, 0x10d27,
+	0x10d4e, 0x10d4e,
+	0x10d69, 0x10d6d,
 	0x10efd, 0x10eff,
 	0x10f46, 0x10f50,
 	0x10f82, 0x10f85,
@@ -22794,10 +23792,13 @@ static const OnigCodePoint CR_Diacritic[] = {
 	0x111ca, 0x111cc,
 	0x11235, 0x11236,
 	0x112e9, 0x112ea,
-	0x1133c, 0x1133c,
+	0x1133b, 0x1133c,
 	0x1134d, 0x1134d,
 	0x11366, 0x1136c,
 	0x11370, 0x11374,
+	0x113ce, 0x113d0,
+	0x113d2, 0x113d3,
+	0x113e1, 0x113e2,
 	0x11442, 0x11442,
 	0x11446, 0x11446,
 	0x114c2, 0x114c3,
@@ -22816,9 +23817,13 @@ static const OnigCodePoint CR_Diacritic[] = {
 	0x11d42, 0x11d42,
 	0x11d44, 0x11d45,
 	0x11d97, 0x11d97,
+	0x11f41, 0x11f42,
+	0x11f5a, 0x11f5a,
 	0x13447, 0x13455,
+	0x1612f, 0x1612f,
 	0x16af0, 0x16af4,
 	0x16b30, 0x16b36,
+	0x16d6b, 0x16d6c,
 	0x16f8f, 0x16f9f,
 	0x16ff0, 0x16ff1,
 	0x1aff0, 0x1aff3,
@@ -22835,6 +23840,7 @@ static const OnigCodePoint CR_Diacritic[] = {
 	0x1e130, 0x1e136,
 	0x1e2ae, 0x1e2ae,
 	0x1e2ec, 0x1e2ef,
+	0x1e5ee, 0x1e5ef,
 	0x1e8d0, 0x1e8d6,
 	0x1e944, 0x1e946,
 	0x1e948, 0x1e94a,
@@ -22842,11 +23848,13 @@ static const OnigCodePoint CR_Diacritic[] = {
 
 /* 'Extender': Binary Property */
 static const OnigCodePoint CR_Extender[] = {
-	33,
+	41,
 	0x00b7, 0x00b7,
 	0x02d0, 0x02d1,
 	0x0640, 0x0640,
 	0x07fa, 0x07fa,
+	0x0a71, 0x0a71,
+	0x0afb, 0x0afb,
 	0x0b55, 0x0b55,
 	0x0e46, 0x0e46,
 	0x0ec6, 0x0ec6,
@@ -22868,13 +23876,19 @@ static const OnigCodePoint CR_Extender[] = {
 	0xaaf3, 0xaaf4,
 	0xff70, 0xff70,
 	0x10781, 0x10782,
+	0x10d4e, 0x10d4e,
+	0x10d6a, 0x10d6a,
+	0x10d6f, 0x10d6f,
+	0x11237, 0x11237,
 	0x1135d, 0x1135d,
+	0x113d2, 0x113d3,
 	0x115c6, 0x115c8,
 	0x11a98, 0x11a98,
 	0x16b42, 0x16b43,
 	0x16fe0, 0x16fe1,
 	0x16fe3, 0x16fe3,
 	0x1e13c, 0x1e13d,
+	0x1e5ef, 0x1e5ef,
 	0x1e944, 0x1e946,
 }; /* CR_Extender */
 
@@ -22946,39 +23960,64 @@ static const OnigCodePoint CR_Noncharacter_Code_Point[] = {
 
 /* 'Other_Grapheme_Extend': Binary Property */
 static const OnigCodePoint CR_Other_Grapheme_Extend[] = {
-	25,
+	49,
 	0x09be, 0x09be,
 	0x09d7, 0x09d7,
 	0x0b3e, 0x0b3e,
 	0x0b57, 0x0b57,
 	0x0bbe, 0x0bbe,
 	0x0bd7, 0x0bd7,
+	0x0cc0, 0x0cc0,
 	0x0cc2, 0x0cc2,
+	0x0cc7, 0x0cc8,
+	0x0cca, 0x0ccb,
 	0x0cd5, 0x0cd6,
 	0x0d3e, 0x0d3e,
 	0x0d57, 0x0d57,
 	0x0dcf, 0x0dcf,
 	0x0ddf, 0x0ddf,
+	0x1715, 0x1715,
+	0x1734, 0x1734,
 	0x1b35, 0x1b35,
+	0x1b3b, 0x1b3b,
+	0x1b3d, 0x1b3d,
+	0x1b43, 0x1b44,
+	0x1baa, 0x1baa,
+	0x1bf2, 0x1bf3,
 	0x200c, 0x200c,
 	0x302e, 0x302f,
+	0xa953, 0xa953,
+	0xa9c0, 0xa9c0,
 	0xff9e, 0xff9f,
+	0x111c0, 0x111c0,
+	0x11235, 0x11235,
 	0x1133e, 0x1133e,
+	0x1134d, 0x1134d,
 	0x11357, 0x11357,
+	0x113b8, 0x113b8,
+	0x113c2, 0x113c2,
+	0x113c5, 0x113c5,
+	0x113c7, 0x113c9,
+	0x113cf, 0x113cf,
 	0x114b0, 0x114b0,
 	0x114bd, 0x114bd,
 	0x115af, 0x115af,
+	0x116b6, 0x116b6,
 	0x11930, 0x11930,
-	0x1d165, 0x1d165,
-	0x1d16e, 0x1d172,
+	0x1193d, 0x1193d,
+	0x11f41, 0x11f41,
+	0x16ff0, 0x16ff1,
+	0x1d165, 0x1d166,
+	0x1d16d, 0x1d172,
 	0xe0020, 0xe007f,
 }; /* CR_Other_Grapheme_Extend */
 
 /* 'IDS_Binary_Operator': Binary Property */
 static const OnigCodePoint CR_IDS_Binary_Operator[] = {
-	2,
+	3,
 	0x2ff0, 0x2ff1,
-	0x2ff4, 0x2ffb,
+	0x2ff4, 0x2ffd,
+	0x31ef, 0x31ef,
 }; /* CR_IDS_Binary_Operator */
 
 /* 'IDS_Trinary_Operator': Binary Property */
@@ -22987,6 +24026,12 @@ static const OnigCodePoint CR_IDS_Trinary_Operator[] = {
 	0x2ff2, 0x2ff3,
 }; /* CR_IDS_Trinary_Operator */
 
+/* 'IDS_Unary_Operator': Binary Property */
+static const OnigCodePoint CR_IDS_Unary_Operator[] = {
+	1,
+	0x2ffe, 0x2fff,
+}; /* CR_IDS_Unary_Operator */
+
 /* 'Radical': Binary Property */
 static const OnigCodePoint CR_Radical[] = {
 	3,
@@ -22997,7 +24042,7 @@ static const OnigCodePoint CR_Radical[] = {
 
 /* 'Unified_Ideograph': Binary Property */
 static const OnigCodePoint CR_Unified_Ideograph[] = {
-	16,
+	17,
 	0x3400, 0x4dbf,
 	0x4e00, 0x9fff,
 	0xfa0e, 0xfa0f,
@@ -23012,6 +24057,7 @@ static const OnigCodePoint CR_Unified_Ideograph[] = {
 	0x2b740, 0x2b81d,
 	0x2b820, 0x2cea1,
 	0x2ceb0, 0x2ebe0,
+	0x2ebf0, 0x2ee5d,
 	0x30000, 0x3134a,
 	0x31350, 0x323af,
 }; /* CR_Unified_Ideograph */
@@ -23107,16 +24153,60 @@ static const OnigCodePoint CR_Other_ID_Start[] = {
 
 /* 'Other_ID_Continue': Binary Property */
 static const OnigCodePoint CR_Other_ID_Continue[] = {
-	4,
+	7,
 	0x00b7, 0x00b7,
 	0x0387, 0x0387,
 	0x1369, 0x1371,
 	0x19da, 0x19da,
+	0x200c, 0x200d,
+	0x30fb, 0x30fb,
+	0xff65, 0xff65,
 }; /* CR_Other_ID_Continue */
 
+/* 'ID_Compat_Math_Continue': Binary Property */
+static const OnigCodePoint CR_ID_Compat_Math_Continue[] = {
+	18,
+	0x00b2, 0x00b3,
+	0x00b9, 0x00b9,
+	0x2070, 0x2070,
+	0x2074, 0x207e,
+	0x2080, 0x208e,
+	0x2202, 0x2202,
+	0x2207, 0x2207,
+	0x221e, 0x221e,
+	0x1d6c1, 0x1d6c1,
+	0x1d6db, 0x1d6db,
+	0x1d6fb, 0x1d6fb,
+	0x1d715, 0x1d715,
+	0x1d735, 0x1d735,
+	0x1d74f, 0x1d74f,
+	0x1d76f, 0x1d76f,
+	0x1d789, 0x1d789,
+	0x1d7a9, 0x1d7a9,
+	0x1d7c3, 0x1d7c3,
+}; /* CR_ID_Compat_Math_Continue */
+
+/* 'ID_Compat_Math_Start': Binary Property */
+static const OnigCodePoint CR_ID_Compat_Math_Start[] = {
+	13,
+	0x2202, 0x2202,
+	0x2207, 0x2207,
+	0x221e, 0x221e,
+	0x1d6c1, 0x1d6c1,
+	0x1d6db, 0x1d6db,
+	0x1d6fb, 0x1d6fb,
+	0x1d715, 0x1d715,
+	0x1d735, 0x1d735,
+	0x1d74f, 0x1d74f,
+	0x1d76f, 0x1d76f,
+	0x1d789, 0x1d789,
+	0x1d7a9, 0x1d7a9,
+	0x1d7c3, 0x1d7c3,
+}; /* CR_ID_Compat_Math_Start */
+
 /* 'Sentence_Terminal': Binary Property */
 static const OnigCodePoint CR_Sentence_Terminal[] = {
-	80,
+	88,
 	0x0021, 0x0021,
 	0x002e, 0x002e,
 	0x003f, 0x003f,
@@ -23134,17 +24224,21 @@ static const OnigCodePoint CR_Sentence_Terminal[] = {
 	0x1367, 0x1368,
 	0x166e, 0x166e,
 	0x1735, 0x1736,
+	0x17d4, 0x17d5,
 	0x1803, 0x1803,
 	0x1809, 0x1809,
 	0x1944, 0x1945,
 	0x1aa8, 0x1aab,
+	0x1b4e, 0x1b4f,
 	0x1b5a, 0x1b5b,
 	0x1b5e, 0x1b5f,
-	0x1b7d, 0x1b7e,
+	0x1b7d, 0x1b7f,
 	0x1c3b, 0x1c3c,
 	0x1c7e, 0x1c7f,
+	0x2024, 0x2024,
 	0x203c, 0x203d,
 	0x2047, 0x2049,
+	0x2cf9, 0x2cfb,
 	0x2e2e, 0x2e2e,
 	0x2e3c, 0x2e3c,
 	0x2e53, 0x2e54,
@@ -23160,6 +24254,8 @@ static const OnigCodePoint CR_Sentence_Terminal[] = {
 	0xaa5d, 0xaa5f,
 	0xaaf0, 0xaaf1,
 	0xabeb, 0xabeb,
+	0xfe12, 0xfe12,
+	0xfe15, 0xfe16,
 	0xfe52, 0xfe52,
 	0xfe56, 0xfe57,
 	0xff01, 0xff01,
@@ -23178,6 +24274,7 @@ static const OnigCodePoint CR_Sentence_Terminal[] = {
 	0x11238, 0x11239,
 	0x1123b, 0x1123c,
 	0x112a9, 0x112a9,
+	0x113d4, 0x113d5,
 	0x1144b, 0x1144c,
 	0x115c2, 0x115c3,
 	0x115c9, 0x115d7,
@@ -23194,6 +24291,7 @@ static const OnigCodePoint CR_Sentence_Terminal[] = {
 	0x16af5, 0x16af5,
 	0x16b37, 0x16b38,
 	0x16b44, 0x16b44,
+	0x16d6e, 0x16d6f,
 	0x16e98, 0x16e98,
 	0x1bc9f, 0x1bc9f,
 	0x1da88, 0x1da88,
@@ -23269,9 +24367,23 @@ static const OnigCodePoint CR_Regional_Indicator[] = {
 	0x1f1e6, 0x1f1ff,
 }; /* CR_Regional_Indicator */
 
+/* 'Modifier_Combining_Mark': Binary Property */
+static const OnigCodePoint CR_Modifier_Combining_Mark[] = {
+	9,
+	0x0654, 0x0655,
+	0x0658, 0x0658,
+	0x06dc, 0x06dc,
+	0x06e3, 0x06e3,
+	0x06e7, 0x06e8,
+	0x08ca, 0x08cb,
+	0x08cd, 0x08cf,
+	0x08d3, 0x08d3,
+	0x08f3, 0x08f3,
+}; /* CR_Modifier_Combining_Mark */
+
 /* 'Emoji': Emoji */
 static const OnigCodePoint CR_Emoji[] = {
-	151,
+	150,
 	0x0023, 0x0023,
 	0x002a, 0x002a,
 	0x0030, 0x0039,
@@ -23417,17 +24529,16 @@ static const OnigCodePoint CR_Emoji[] = {
 	0x1f93c, 0x1f945,
 	0x1f947, 0x1f9ff,
 	0x1fa70, 0x1fa7c,
-	0x1fa80, 0x1fa88,
-	0x1fa90, 0x1fabd,
-	0x1fabf, 0x1fac5,
-	0x1face, 0x1fadb,
-	0x1fae0, 0x1fae8,
+	0x1fa80, 0x1fa89,
+	0x1fa8f, 0x1fac6,
+	0x1face, 0x1fadc,
+	0x1fadf, 0x1fae9,
 	0x1faf0, 0x1faf8,
 }; /* CR_Emoji */
 
 /* 'Emoji_Presentation': Emoji */
 static const OnigCodePoint CR_Emoji_Presentation[] = {
-	81,
+	80,
 	0x231a, 0x231b,
 	0x23e9, 0x23ec,
 	0x23f0, 0x23f0,
@@ -23503,11 +24614,10 @@ static const OnigCodePoint CR_Emoji_Presentation[] = {
 	0x1f93c, 0x1f945,
 	0x1f947, 0x1f9ff,
 	0x1fa70, 0x1fa7c,
-	0x1fa80, 0x1fa88,
-	0x1fa90, 0x1fabd,
-	0x1fabf, 0x1fac5,
-	0x1face, 0x1fadb,
-	0x1fae0, 0x1fae8,
+	0x1fa80, 0x1fa89,
+	0x1fa8f, 0x1fac6,
+	0x1face, 0x1fadc,
+	0x1fadf, 0x1fae9,
 	0x1faf0, 0x1faf8,
 }; /* CR_Emoji_Presentation */
 
@@ -23662,7 +24772,7 @@ static const OnigCodePoint CR_Extended_Pictographic[] = {
 
 /* 'Unknown': Script */
 static const OnigCodePoint CR_Unknown[] = {
-	705,
+	729,
 	0x0378, 0x0379,
 	0x0380, 0x0383,
 	0x038b, 0x038b,
@@ -23685,7 +24795,7 @@ static const OnigCodePoint CR_Unknown[] = {
 	0x085f, 0x085f,
 	0x086b, 0x086f,
 	0x088f, 0x088f,
-	0x0892, 0x0897,
+	0x0892, 0x0896,
 	0x0984, 0x0984,
 	0x098d, 0x098e,
 	0x0991, 0x0992,
@@ -23877,12 +24987,11 @@ static const OnigCodePoint CR_Unknown[] = {
 	0x1a9a, 0x1a9f,
 	0x1aae, 0x1aaf,
 	0x1acf, 0x1aff,
-	0x1b4d, 0x1b4f,
-	0x1b7f, 0x1b7f,
+	0x1b4d, 0x1b4d,
 	0x1bf4, 0x1bfb,
 	0x1c38, 0x1c3a,
 	0x1c4a, 0x1c4c,
-	0x1c89, 0x1c8f,
+	0x1c8b, 0x1c8f,
 	0x1cbb, 0x1cbc,
 	0x1cc8, 0x1ccf,
 	0x1cfb, 0x1cff,
@@ -23909,7 +25018,7 @@ static const OnigCodePoint CR_Unknown[] = {
 	0x20c1, 0x20cf,
 	0x20f1, 0x20ff,
 	0x218c, 0x218f,
-	0x2427, 0x243f,
+	0x242a, 0x243f,
 	0x244b, 0x245f,
 	0x2b74, 0x2b75,
 	0x2b96, 0x2b96,
@@ -23932,22 +25041,21 @@ static const OnigCodePoint CR_Unknown[] = {
 	0x2e9a, 0x2e9a,
 	0x2ef4, 0x2eff,
 	0x2fd6, 0x2fef,
-	0x2ffc, 0x2fff,
 	0x3040, 0x3040,
 	0x3097, 0x3098,
 	0x3100, 0x3104,
 	0x3130, 0x3130,
 	0x318f, 0x318f,
-	0x31e4, 0x31ef,
+	0x31e6, 0x31ee,
 	0x321f, 0x321f,
 	0xa48d, 0xa48f,
 	0xa4c7, 0xa4cf,
 	0xa62c, 0xa63f,
 	0xa6f8, 0xa6ff,
-	0xa7cb, 0xa7cf,
+	0xa7ce, 0xa7cf,
 	0xa7d2, 0xa7d2,
 	0xa7d4, 0xa7d4,
-	0xa7da, 0xa7f1,
+	0xa7dd, 0xa7f1,
 	0xa82d, 0xa82f,
 	0xa83a, 0xa83f,
 	0xa878, 0xa87f,
@@ -24037,7 +25145,8 @@ static const OnigCodePoint CR_Unknown[] = {
 	0x105a2, 0x105a2,
 	0x105b2, 0x105b2,
 	0x105ba, 0x105ba,
-	0x105bd, 0x105ff,
+	0x105bd, 0x105bf,
+	0x105f4, 0x105ff,
 	0x10737, 0x1073f,
 	0x10756, 0x1075f,
 	0x10768, 0x1077f,
@@ -24080,11 +25189,15 @@ static const OnigCodePoint CR_Unknown[] = {
 	0x10cb3, 0x10cbf,
 	0x10cf3, 0x10cf9,
 	0x10d28, 0x10d2f,
-	0x10d3a, 0x10e5f,
+	0x10d3a, 0x10d3f,
+	0x10d66, 0x10d68,
+	0x10d86, 0x10d8d,
+	0x10d90, 0x10e5f,
 	0x10e7f, 0x10e7f,
 	0x10eaa, 0x10eaa,
 	0x10eae, 0x10eaf,
-	0x10eb2, 0x10efc,
+	0x10eb2, 0x10ec1,
+	0x10ec5, 0x10efb,
 	0x10f28, 0x10f2f,
 	0x10f5a, 0x10f6f,
 	0x10f8a, 0x10faf,
@@ -24124,7 +25237,18 @@ static const OnigCodePoint CR_Unknown[] = {
 	0x11358, 0x1135c,
 	0x11364, 0x11365,
 	0x1136d, 0x1136f,
-	0x11375, 0x113ff,
+	0x11375, 0x1137f,
+	0x1138a, 0x1138a,
+	0x1138c, 0x1138d,
+	0x1138f, 0x1138f,
+	0x113b6, 0x113b6,
+	0x113c1, 0x113c1,
+	0x113c3, 0x113c4,
+	0x113c6, 0x113c6,
+	0x113cb, 0x113cb,
+	0x113d6, 0x113d6,
+	0x113d9, 0x113e0,
+	0x113e3, 0x113ff,
 	0x1145c, 0x1145c,
 	0x11462, 0x1147f,
 	0x114c8, 0x114cf,
@@ -24135,7 +25259,8 @@ static const OnigCodePoint CR_Unknown[] = {
 	0x1165a, 0x1165f,
 	0x1166d, 0x1167f,
 	0x116ba, 0x116bf,
-	0x116ca, 0x116ff,
+	0x116ca, 0x116cf,
+	0x116e4, 0x116ff,
 	0x1171b, 0x1171c,
 	0x1172c, 0x1172f,
 	0x11747, 0x117ff,
@@ -24155,7 +25280,9 @@ static const OnigCodePoint CR_Unknown[] = {
 	0x11a48, 0x11a4f,
 	0x11aa3, 0x11aaf,
 	0x11af9, 0x11aff,
-	0x11b0a, 0x11bff,
+	0x11b0a, 0x11bbf,
+	0x11be2, 0x11bef,
+	0x11bfa, 0x11bff,
 	0x11c09, 0x11c09,
 	0x11c37, 0x11c37,
 	0x11c46, 0x11c4f,
@@ -24179,7 +25306,7 @@ static const OnigCodePoint CR_Unknown[] = {
 	0x11ef9, 0x11eff,
 	0x11f11, 0x11f11,
 	0x11f3b, 0x11f3d,
-	0x11f5a, 0x11faf,
+	0x11f5b, 0x11faf,
 	0x11fb1, 0x11fbf,
 	0x11ff2, 0x11ffe,
 	0x1239a, 0x123ff,
@@ -24187,8 +25314,10 @@ static const OnigCodePoint CR_Unknown[] = {
 	0x12475, 0x1247f,
 	0x12544, 0x12f8f,
 	0x12ff3, 0x12fff,
-	0x13456, 0x143ff,
-	0x14647, 0x167ff,
+	0x13456, 0x1345f,
+	0x143fb, 0x143ff,
+	0x14647, 0x160ff,
+	0x1613a, 0x167ff,
 	0x16a39, 0x16a3f,
 	0x16a5f, 0x16a5f,
 	0x16a6a, 0x16a6d,
@@ -24200,7 +25329,8 @@ static const OnigCodePoint CR_Unknown[] = {
 	0x16b5a, 0x16b5a,
 	0x16b62, 0x16b62,
 	0x16b78, 0x16b7c,
-	0x16b90, 0x16e3f,
+	0x16b90, 0x16d3f,
+	0x16d7a, 0x16e3f,
 	0x16e9b, 0x16eff,
 	0x16f4b, 0x16f4e,
 	0x16f88, 0x16f8e,
@@ -24208,7 +25338,7 @@ static const OnigCodePoint CR_Unknown[] = {
 	0x16fe5, 0x16fef,
 	0x16ff2, 0x16fff,
 	0x187f8, 0x187ff,
-	0x18cd6, 0x18cff,
+	0x18cd6, 0x18cfe,
 	0x18d09, 0x1afef,
 	0x1aff4, 0x1aff4,
 	0x1affc, 0x1affc,
@@ -24223,7 +25353,9 @@ static const OnigCodePoint CR_Unknown[] = {
 	0x1bc7d, 0x1bc7f,
 	0x1bc89, 0x1bc8f,
 	0x1bc9a, 0x1bc9b,
-	0x1bca4, 0x1ceff,
+	0x1bca4, 0x1cbff,
+	0x1ccfa, 0x1ccff,
+	0x1ceb4, 0x1ceff,
 	0x1cf2e, 0x1cf2f,
 	0x1cf47, 0x1cf4f,
 	0x1cfc4, 0x1cfff,
@@ -24274,7 +25406,9 @@ static const OnigCodePoint CR_Unknown[] = {
 	0x1e2af, 0x1e2bf,
 	0x1e2fa, 0x1e2fe,
 	0x1e300, 0x1e4cf,
-	0x1e4fa, 0x1e7df,
+	0x1e4fa, 0x1e5cf,
+	0x1e5fb, 0x1e5fe,
+	0x1e600, 0x1e7df,
 	0x1e7e7, 0x1e7e7,
 	0x1e7ec, 0x1e7ec,
 	0x1e7ef, 0x1e7ef,
@@ -24344,24 +25478,24 @@ static const OnigCodePoint CR_Unknown[] = {
 	0x1f85a, 0x1f85f,
 	0x1f888, 0x1f88f,
 	0x1f8ae, 0x1f8af,
-	0x1f8b2, 0x1f8ff,
+	0x1f8bc, 0x1f8bf,
+	0x1f8c2, 0x1f8ff,
 	0x1fa54, 0x1fa5f,
 	0x1fa6e, 0x1fa6f,
 	0x1fa7d, 0x1fa7f,
-	0x1fa89, 0x1fa8f,
-	0x1fabe, 0x1fabe,
-	0x1fac6, 0x1facd,
-	0x1fadc, 0x1fadf,
-	0x1fae9, 0x1faef,
+	0x1fa8a, 0x1fa8e,
+	0x1fac7, 0x1facd,
+	0x1fadd, 0x1fade,
+	0x1faea, 0x1faef,
 	0x1faf9, 0x1faff,
 	0x1fb93, 0x1fb93,
-	0x1fbcb, 0x1fbef,
 	0x1fbfa, 0x1ffff,
 	0x2a6e0, 0x2a6ff,
 	0x2b73a, 0x2b73f,
 	0x2b81e, 0x2b81f,
 	0x2cea2, 0x2ceaf,
-	0x2ebe1, 0x2f7ff,
+	0x2ebe1, 0x2ebef,
+	0x2ee5e, 0x2f7ff,
 	0x2fa1e, 0x2ffff,
 	0x3134b, 0x3134f,
 	0x323b0, 0xe0000,
@@ -24370,10 +25504,303 @@ static const OnigCodePoint CR_Unknown[] = {
 	0xe01f0, 0x10ffff,
 }; /* CR_Unknown */
 
-#ifdef USE_UNICODE_AGE_PROPERTIES
-/* 'Age_1_1': Derived Age 1.1 */
-static const OnigCodePoint CR_Age_1_1[] = {
-	288,
+#ifdef USE_UNICODE_AGE_PROPERTIES
+/* 'Age_1_1': Derived Age 1.1 */
+static const OnigCodePoint CR_Age_1_1[] = {
+	288,
+	0x0000, 0x01f5,
+	0x01fa, 0x0217,
+	0x0250, 0x02a8,
+	0x02b0, 0x02de,
+	0x02e0, 0x02e9,
+	0x0300, 0x0345,
+	0x0360, 0x0361,
+	0x0374, 0x0375,
+	0x037a, 0x037a,
+	0x037e, 0x037e,
+	0x0384, 0x038a,
+	0x038c, 0x038c,
+	0x038e, 0x03a1,
+	0x03a3, 0x03ce,
+	0x03d0, 0x03d6,
+	0x03da, 0x03da,
+	0x03dc, 0x03dc,
+	0x03de, 0x03de,
+	0x03e0, 0x03e0,
+	0x03e2, 0x03f3,
+	0x0401, 0x040c,
+	0x040e, 0x044f,
+	0x0451, 0x045c,
+	0x045e, 0x0486,
+	0x0490, 0x04c4,
+	0x04c7, 0x04c8,
+	0x04cb, 0x04cc,
+	0x04d0, 0x04eb,
+	0x04ee, 0x04f5,
+	0x04f8, 0x04f9,
+	0x0531, 0x0556,
+	0x0559, 0x055f,
+	0x0561, 0x0587,
+	0x0589, 0x0589,
+	0x05b0, 0x05b9,
+	0x05bb, 0x05c3,
+	0x05d0, 0x05ea,
+	0x05f0, 0x05f4,
+	0x060c, 0x060c,
+	0x061b, 0x061b,
+	0x061f, 0x061f,
+	0x0621, 0x063a,
+	0x0640, 0x0652,
+	0x0660, 0x066d,
+	0x0670, 0x06b7,
+	0x06ba, 0x06be,
+	0x06c0, 0x06ce,
+	0x06d0, 0x06ed,
+	0x06f0, 0x06f9,
+	0x0901, 0x0903,
+	0x0905, 0x0939,
+	0x093c, 0x094d,
+	0x0950, 0x0954,
+	0x0958, 0x0970,
+	0x0981, 0x0983,
+	0x0985, 0x098c,
+	0x098f, 0x0990,
+	0x0993, 0x09a8,
+	0x09aa, 0x09b0,
+	0x09b2, 0x09b2,
+	0x09b6, 0x09b9,
+	0x09bc, 0x09bc,
+	0x09be, 0x09c4,
+	0x09c7, 0x09c8,
+	0x09cb, 0x09cd,
+	0x09d7, 0x09d7,
+	0x09dc, 0x09dd,
+	0x09df, 0x09e3,
+	0x09e6, 0x09fa,
+	0x0a02, 0x0a02,
+	0x0a05, 0x0a0a,
+	0x0a0f, 0x0a10,
+	0x0a13, 0x0a28,
+	0x0a2a, 0x0a30,
+	0x0a32, 0x0a33,
+	0x0a35, 0x0a36,
+	0x0a38, 0x0a39,
+	0x0a3c, 0x0a3c,
+	0x0a3e, 0x0a42,
+	0x0a47, 0x0a48,
+	0x0a4b, 0x0a4d,
+	0x0a59, 0x0a5c,
+	0x0a5e, 0x0a5e,
+	0x0a66, 0x0a74,
+	0x0a81, 0x0a83,
+	0x0a85, 0x0a8b,
+	0x0a8d, 0x0a8d,
+	0x0a8f, 0x0a91,
+	0x0a93, 0x0aa8,
+	0x0aaa, 0x0ab0,
+	0x0ab2, 0x0ab3,
+	0x0ab5, 0x0ab9,
+	0x0abc, 0x0ac5,
+	0x0ac7, 0x0ac9,
+	0x0acb, 0x0acd,
+	0x0ad0, 0x0ad0,
+	0x0ae0, 0x0ae0,
+	0x0ae6, 0x0aef,
+	0x0b01, 0x0b03,
+	0x0b05, 0x0b0c,
+	0x0b0f, 0x0b10,
+	0x0b13, 0x0b28,
+	0x0b2a, 0x0b30,
+	0x0b32, 0x0b33,
+	0x0b36, 0x0b39,
+	0x0b3c, 0x0b43,
+	0x0b47, 0x0b48,
+	0x0b4b, 0x0b4d,
+	0x0b56, 0x0b57,
+	0x0b5c, 0x0b5d,
+	0x0b5f, 0x0b61,
+	0x0b66, 0x0b70,
+	0x0b82, 0x0b83,
+	0x0b85, 0x0b8a,
+	0x0b8e, 0x0b90,
+	0x0b92, 0x0b95,
+	0x0b99, 0x0b9a,
+	0x0b9c, 0x0b9c,
+	0x0b9e, 0x0b9f,
+	0x0ba3, 0x0ba4,
+	0x0ba8, 0x0baa,
+	0x0bae, 0x0bb5,
+	0x0bb7, 0x0bb9,
+	0x0bbe, 0x0bc2,
+	0x0bc6, 0x0bc8,
+	0x0bca, 0x0bcd,
+	0x0bd7, 0x0bd7,
+	0x0be7, 0x0bf2,
+	0x0c01, 0x0c03,
+	0x0c05, 0x0c0c,
+	0x0c0e, 0x0c10,
+	0x0c12, 0x0c28,
+	0x0c2a, 0x0c33,
+	0x0c35, 0x0c39,
+	0x0c3e, 0x0c44,
+	0x0c46, 0x0c48,
+	0x0c4a, 0x0c4d,
+	0x0c55, 0x0c56,
+	0x0c60, 0x0c61,
+	0x0c66, 0x0c6f,
+	0x0c82, 0x0c83,
+	0x0c85, 0x0c8c,
+	0x0c8e, 0x0c90,
+	0x0c92, 0x0ca8,
+	0x0caa, 0x0cb3,
+	0x0cb5, 0x0cb9,
+	0x0cbe, 0x0cc4,
+	0x0cc6, 0x0cc8,
+	0x0cca, 0x0ccd,
+	0x0cd5, 0x0cd6,
+	0x0cde, 0x0cde,
+	0x0ce0, 0x0ce1,
+	0x0ce6, 0x0cef,
+	0x0d02, 0x0d03,
+	0x0d05, 0x0d0c,
+	0x0d0e, 0x0d10,
+	0x0d12, 0x0d28,
+	0x0d2a, 0x0d39,
+	0x0d3e, 0x0d43,
+	0x0d46, 0x0d48,
+	0x0d4a, 0x0d4d,
+	0x0d57, 0x0d57,
+	0x0d60, 0x0d61,
+	0x0d66, 0x0d6f,
+	0x0e01, 0x0e3a,
+	0x0e3f, 0x0e5b,
+	0x0e81, 0x0e82,
+	0x0e84, 0x0e84,
+	0x0e87, 0x0e88,
+	0x0e8a, 0x0e8a,
+	0x0e8d, 0x0e8d,
+	0x0e94, 0x0e97,
+	0x0e99, 0x0e9f,
+	0x0ea1, 0x0ea3,
+	0x0ea5, 0x0ea5,
+	0x0ea7, 0x0ea7,
+	0x0eaa, 0x0eab,
+	0x0ead, 0x0eb9,
+	0x0ebb, 0x0ebd,
+	0x0ec0, 0x0ec4,
+	0x0ec6, 0x0ec6,
+	0x0ec8, 0x0ecd,
+	0x0ed0, 0x0ed9,
+	0x0edc, 0x0edd,
+	0x10a0, 0x10c5,
+	0x10d0, 0x10f6,
+	0x10fb, 0x10fb,
+	0x1100, 0x1159,
+	0x115f, 0x11a2,
+	0x11a8, 0x11f9,
+	0x1e00, 0x1e9a,
+	0x1ea0, 0x1ef9,
+	0x1f00, 0x1f15,
+	0x1f18, 0x1f1d,
+	0x1f20, 0x1f45,
+	0x1f48, 0x1f4d,
+	0x1f50, 0x1f57,
+	0x1f59, 0x1f59,
+	0x1f5b, 0x1f5b,
+	0x1f5d, 0x1f5d,
+	0x1f5f, 0x1f7d,
+	0x1f80, 0x1fb4,
+	0x1fb6, 0x1fc4,
+	0x1fc6, 0x1fd3,
+	0x1fd6, 0x1fdb,
+	0x1fdd, 0x1fef,
+	0x1ff2, 0x1ff4,
+	0x1ff6, 0x1ffe,
+	0x2000, 0x202e,
+	0x2030, 0x2046,
+	0x206a, 0x2070,
+	0x2074, 0x208e,
+	0x20a0, 0x20aa,
+	0x20d0, 0x20e1,
+	0x2100, 0x2138,
+	0x2153, 0x2182,
+	0x2190, 0x21ea,
+	0x2200, 0x22f1,
+	0x2300, 0x2300,
+	0x2302, 0x237a,
+	0x2400, 0x2424,
+	0x2440, 0x244a,
+	0x2460, 0x24ea,
+	0x2500, 0x2595,
+	0x25a0, 0x25ef,
+	0x2600, 0x2613,
+	0x261a, 0x266f,
+	0x2701, 0x2704,
+	0x2706, 0x2709,
+	0x270c, 0x2727,
+	0x2729, 0x274b,
+	0x274d, 0x274d,
+	0x274f, 0x2752,
+	0x2756, 0x2756,
+	0x2758, 0x275e,
+	0x2761, 0x2767,
+	0x2776, 0x2794,
+	0x2798, 0x27af,
+	0x27b1, 0x27be,
+	0x3000, 0x3037,
+	0x303f, 0x303f,
+	0x3041, 0x3094,
+	0x3099, 0x309e,
+	0x30a1, 0x30fe,
+	0x3105, 0x312c,
+	0x3131, 0x318e,
+	0x3190, 0x319f,
+	0x3200, 0x321c,
+	0x3220, 0x3243,
+	0x3260, 0x327b,
+	0x327f, 0x32b0,
+	0x32c0, 0x32cb,
+	0x32d0, 0x32fe,
+	0x3300, 0x3376,
+	0x337b, 0x33dd,
+	0x33e0, 0x33fe,
+	0x4e00, 0x9fa5,
+	0xe000, 0xfa2d,
+	0xfb00, 0xfb06,
+	0xfb13, 0xfb17,
+	0xfb1e, 0xfb36,
+	0xfb38, 0xfb3c,
+	0xfb3e, 0xfb3e,
+	0xfb40, 0xfb41,
+	0xfb43, 0xfb44,
+	0xfb46, 0xfbb1,
+	0xfbd3, 0xfd3f,
+	0xfd50, 0xfd8f,
+	0xfd92, 0xfdc7,
+	0xfdf0, 0xfdfb,
+	0xfe20, 0xfe23,
+	0xfe30, 0xfe44,
+	0xfe49, 0xfe52,
+	0xfe54, 0xfe66,
+	0xfe68, 0xfe6b,
+	0xfe70, 0xfe72,
+	0xfe74, 0xfe74,
+	0xfe76, 0xfefc,
+	0xfeff, 0xfeff,
+	0xff01, 0xff5e,
+	0xff61, 0xffbe,
+	0xffc2, 0xffc7,
+	0xffca, 0xffcf,
+	0xffd2, 0xffd7,
+	0xffda, 0xffdc,
+	0xffe0, 0xffe6,
+	0xffe8, 0xffee,
+	0xfffd, 0xffff,
+}; /* CR_Age_1_1 */
+
+/* 'Age_2_0': Derived Age 2.0 */
+static const OnigCodePoint CR_Age_2_0[] = {
+	312,
 	0x0000, 0x01f5,
 	0x01fa, 0x0217,
 	0x0250, 0x02a8,
@@ -24408,8 +25835,326 @@ static const OnigCodePoint CR_Age_1_1[] = {
 	0x0559, 0x055f,
 	0x0561, 0x0587,
 	0x0589, 0x0589,
-	0x05b0, 0x05b9,
-	0x05bb, 0x05c3,
+	0x0591, 0x05a1,
+	0x05a3, 0x05b9,
+	0x05bb, 0x05c4,
+	0x05d0, 0x05ea,
+	0x05f0, 0x05f4,
+	0x060c, 0x060c,
+	0x061b, 0x061b,
+	0x061f, 0x061f,
+	0x0621, 0x063a,
+	0x0640, 0x0652,
+	0x0660, 0x066d,
+	0x0670, 0x06b7,
+	0x06ba, 0x06be,
+	0x06c0, 0x06ce,
+	0x06d0, 0x06ed,
+	0x06f0, 0x06f9,
+	0x0901, 0x0903,
+	0x0905, 0x0939,
+	0x093c, 0x094d,
+	0x0950, 0x0954,
+	0x0958, 0x0970,
+	0x0981, 0x0983,
+	0x0985, 0x098c,
+	0x098f, 0x0990,
+	0x0993, 0x09a8,
+	0x09aa, 0x09b0,
+	0x09b2, 0x09b2,
+	0x09b6, 0x09b9,
+	0x09bc, 0x09bc,
+	0x09be, 0x09c4,
+	0x09c7, 0x09c8,
+	0x09cb, 0x09cd,
+	0x09d7, 0x09d7,
+	0x09dc, 0x09dd,
+	0x09df, 0x09e3,
+	0x09e6, 0x09fa,
+	0x0a02, 0x0a02,
+	0x0a05, 0x0a0a,
+	0x0a0f, 0x0a10,
+	0x0a13, 0x0a28,
+	0x0a2a, 0x0a30,
+	0x0a32, 0x0a33,
+	0x0a35, 0x0a36,
+	0x0a38, 0x0a39,
+	0x0a3c, 0x0a3c,
+	0x0a3e, 0x0a42,
+	0x0a47, 0x0a48,
+	0x0a4b, 0x0a4d,
+	0x0a59, 0x0a5c,
+	0x0a5e, 0x0a5e,
+	0x0a66, 0x0a74,
+	0x0a81, 0x0a83,
+	0x0a85, 0x0a8b,
+	0x0a8d, 0x0a8d,
+	0x0a8f, 0x0a91,
+	0x0a93, 0x0aa8,
+	0x0aaa, 0x0ab0,
+	0x0ab2, 0x0ab3,
+	0x0ab5, 0x0ab9,
+	0x0abc, 0x0ac5,
+	0x0ac7, 0x0ac9,
+	0x0acb, 0x0acd,
+	0x0ad0, 0x0ad0,
+	0x0ae0, 0x0ae0,
+	0x0ae6, 0x0aef,
+	0x0b01, 0x0b03,
+	0x0b05, 0x0b0c,
+	0x0b0f, 0x0b10,
+	0x0b13, 0x0b28,
+	0x0b2a, 0x0b30,
+	0x0b32, 0x0b33,
+	0x0b36, 0x0b39,
+	0x0b3c, 0x0b43,
+	0x0b47, 0x0b48,
+	0x0b4b, 0x0b4d,
+	0x0b56, 0x0b57,
+	0x0b5c, 0x0b5d,
+	0x0b5f, 0x0b61,
+	0x0b66, 0x0b70,
+	0x0b82, 0x0b83,
+	0x0b85, 0x0b8a,
+	0x0b8e, 0x0b90,
+	0x0b92, 0x0b95,
+	0x0b99, 0x0b9a,
+	0x0b9c, 0x0b9c,
+	0x0b9e, 0x0b9f,
+	0x0ba3, 0x0ba4,
+	0x0ba8, 0x0baa,
+	0x0bae, 0x0bb5,
+	0x0bb7, 0x0bb9,
+	0x0bbe, 0x0bc2,
+	0x0bc6, 0x0bc8,
+	0x0bca, 0x0bcd,
+	0x0bd7, 0x0bd7,
+	0x0be7, 0x0bf2,
+	0x0c01, 0x0c03,
+	0x0c05, 0x0c0c,
+	0x0c0e, 0x0c10,
+	0x0c12, 0x0c28,
+	0x0c2a, 0x0c33,
+	0x0c35, 0x0c39,
+	0x0c3e, 0x0c44,
+	0x0c46, 0x0c48,
+	0x0c4a, 0x0c4d,
+	0x0c55, 0x0c56,
+	0x0c60, 0x0c61,
+	0x0c66, 0x0c6f,
+	0x0c82, 0x0c83,
+	0x0c85, 0x0c8c,
+	0x0c8e, 0x0c90,
+	0x0c92, 0x0ca8,
+	0x0caa, 0x0cb3,
+	0x0cb5, 0x0cb9,
+	0x0cbe, 0x0cc4,
+	0x0cc6, 0x0cc8,
+	0x0cca, 0x0ccd,
+	0x0cd5, 0x0cd6,
+	0x0cde, 0x0cde,
+	0x0ce0, 0x0ce1,
+	0x0ce6, 0x0cef,
+	0x0d02, 0x0d03,
+	0x0d05, 0x0d0c,
+	0x0d0e, 0x0d10,
+	0x0d12, 0x0d28,
+	0x0d2a, 0x0d39,
+	0x0d3e, 0x0d43,
+	0x0d46, 0x0d48,
+	0x0d4a, 0x0d4d,
+	0x0d57, 0x0d57,
+	0x0d60, 0x0d61,
+	0x0d66, 0x0d6f,
+	0x0e01, 0x0e3a,
+	0x0e3f, 0x0e5b,
+	0x0e81, 0x0e82,
+	0x0e84, 0x0e84,
+	0x0e87, 0x0e88,
+	0x0e8a, 0x0e8a,
+	0x0e8d, 0x0e8d,
+	0x0e94, 0x0e97,
+	0x0e99, 0x0e9f,
+	0x0ea1, 0x0ea3,
+	0x0ea5, 0x0ea5,
+	0x0ea7, 0x0ea7,
+	0x0eaa, 0x0eab,
+	0x0ead, 0x0eb9,
+	0x0ebb, 0x0ebd,
+	0x0ec0, 0x0ec4,
+	0x0ec6, 0x0ec6,
+	0x0ec8, 0x0ecd,
+	0x0ed0, 0x0ed9,
+	0x0edc, 0x0edd,
+	0x0f00, 0x0f47,
+	0x0f49, 0x0f69,
+	0x0f71, 0x0f8b,
+	0x0f90, 0x0f95,
+	0x0f97, 0x0f97,
+	0x0f99, 0x0fad,
+	0x0fb1, 0x0fb7,
+	0x0fb9, 0x0fb9,
+	0x10a0, 0x10c5,
+	0x10d0, 0x10f6,
+	0x10fb, 0x10fb,
+	0x1100, 0x1159,
+	0x115f, 0x11a2,
+	0x11a8, 0x11f9,
+	0x1e00, 0x1e9b,
+	0x1ea0, 0x1ef9,
+	0x1f00, 0x1f15,
+	0x1f18, 0x1f1d,
+	0x1f20, 0x1f45,
+	0x1f48, 0x1f4d,
+	0x1f50, 0x1f57,
+	0x1f59, 0x1f59,
+	0x1f5b, 0x1f5b,
+	0x1f5d, 0x1f5d,
+	0x1f5f, 0x1f7d,
+	0x1f80, 0x1fb4,
+	0x1fb6, 0x1fc4,
+	0x1fc6, 0x1fd3,
+	0x1fd6, 0x1fdb,
+	0x1fdd, 0x1fef,
+	0x1ff2, 0x1ff4,
+	0x1ff6, 0x1ffe,
+	0x2000, 0x202e,
+	0x2030, 0x2046,
+	0x206a, 0x2070,
+	0x2074, 0x208e,
+	0x20a0, 0x20ab,
+	0x20d0, 0x20e1,
+	0x2100, 0x2138,
+	0x2153, 0x2182,
+	0x2190, 0x21ea,
+	0x2200, 0x22f1,
+	0x2300, 0x2300,
+	0x2302, 0x237a,
+	0x2400, 0x2424,
+	0x2440, 0x244a,
+	0x2460, 0x24ea,
+	0x2500, 0x2595,
+	0x25a0, 0x25ef,
+	0x2600, 0x2613,
+	0x261a, 0x266f,
+	0x2701, 0x2704,
+	0x2706, 0x2709,
+	0x270c, 0x2727,
+	0x2729, 0x274b,
+	0x274d, 0x274d,
+	0x274f, 0x2752,
+	0x2756, 0x2756,
+	0x2758, 0x275e,
+	0x2761, 0x2767,
+	0x2776, 0x2794,
+	0x2798, 0x27af,
+	0x27b1, 0x27be,
+	0x3000, 0x3037,
+	0x303f, 0x303f,
+	0x3041, 0x3094,
+	0x3099, 0x309e,
+	0x30a1, 0x30fe,
+	0x3105, 0x312c,
+	0x3131, 0x318e,
+	0x3190, 0x319f,
+	0x3200, 0x321c,
+	0x3220, 0x3243,
+	0x3260, 0x327b,
+	0x327f, 0x32b0,
+	0x32c0, 0x32cb,
+	0x32d0, 0x32fe,
+	0x3300, 0x3376,
+	0x337b, 0x33dd,
+	0x33e0, 0x33fe,
+	0x4e00, 0x9fa5,
+	0xac00, 0xd7a3,
+	0xd800, 0xfa2d,
+	0xfb00, 0xfb06,
+	0xfb13, 0xfb17,
+	0xfb1e, 0xfb36,
+	0xfb38, 0xfb3c,
+	0xfb3e, 0xfb3e,
+	0xfb40, 0xfb41,
+	0xfb43, 0xfb44,
+	0xfb46, 0xfbb1,
+	0xfbd3, 0xfd3f,
+	0xfd50, 0xfd8f,
+	0xfd92, 0xfdc7,
+	0xfdf0, 0xfdfb,
+	0xfe20, 0xfe23,
+	0xfe30, 0xfe44,
+	0xfe49, 0xfe52,
+	0xfe54, 0xfe66,
+	0xfe68, 0xfe6b,
+	0xfe70, 0xfe72,
+	0xfe74, 0xfe74,
+	0xfe76, 0xfefc,
+	0xfeff, 0xfeff,
+	0xff01, 0xff5e,
+	0xff61, 0xffbe,
+	0xffc2, 0xffc7,
+	0xffca, 0xffcf,
+	0xffd2, 0xffd7,
+	0xffda, 0xffdc,
+	0xffe0, 0xffe6,
+	0xffe8, 0xffee,
+	0xfffd, 0xffff,
+	0x1fffe, 0x1ffff,
+	0x2fffe, 0x2ffff,
+	0x3fffe, 0x3ffff,
+	0x4fffe, 0x4ffff,
+	0x5fffe, 0x5ffff,
+	0x6fffe, 0x6ffff,
+	0x7fffe, 0x7ffff,
+	0x8fffe, 0x8ffff,
+	0x9fffe, 0x9ffff,
+	0xafffe, 0xaffff,
+	0xbfffe, 0xbffff,
+	0xcfffe, 0xcffff,
+	0xdfffe, 0xdffff,
+	0xefffe, 0x10ffff,
+}; /* CR_Age_2_0 */
+
+/* 'Age_2_1': Derived Age 2.1 */
+static const OnigCodePoint CR_Age_2_1[] = {
+	312,
+	0x0000, 0x01f5,
+	0x01fa, 0x0217,
+	0x0250, 0x02a8,
+	0x02b0, 0x02de,
+	0x02e0, 0x02e9,
+	0x0300, 0x0345,
+	0x0360, 0x0361,
+	0x0374, 0x0375,
+	0x037a, 0x037a,
+	0x037e, 0x037e,
+	0x0384, 0x038a,
+	0x038c, 0x038c,
+	0x038e, 0x03a1,
+	0x03a3, 0x03ce,
+	0x03d0, 0x03d6,
+	0x03da, 0x03da,
+	0x03dc, 0x03dc,
+	0x03de, 0x03de,
+	0x03e0, 0x03e0,
+	0x03e2, 0x03f3,
+	0x0401, 0x040c,
+	0x040e, 0x044f,
+	0x0451, 0x045c,
+	0x045e, 0x0486,
+	0x0490, 0x04c4,
+	0x04c7, 0x04c8,
+	0x04cb, 0x04cc,
+	0x04d0, 0x04eb,
+	0x04ee, 0x04f5,
+	0x04f8, 0x04f9,
+	0x0531, 0x0556,
+	0x0559, 0x055f,
+	0x0561, 0x0587,
+	0x0589, 0x0589,
+	0x0591, 0x05a1,
+	0x05a3, 0x05b9,
+	0x05bb, 0x05c4,
 	0x05d0, 0x05ea,
 	0x05f0, 0x05f4,
 	0x060c, 0x060c,
@@ -24558,13 +26303,21 @@ static const OnigCodePoint CR_Age_1_1[] = {
 	0x0ec8, 0x0ecd,
 	0x0ed0, 0x0ed9,
 	0x0edc, 0x0edd,
+	0x0f00, 0x0f47,
+	0x0f49, 0x0f69,
+	0x0f71, 0x0f8b,
+	0x0f90, 0x0f95,
+	0x0f97, 0x0f97,
+	0x0f99, 0x0fad,
+	0x0fb1, 0x0fb7,
+	0x0fb9, 0x0fb9,
 	0x10a0, 0x10c5,
 	0x10d0, 0x10f6,
 	0x10fb, 0x10fb,
 	0x1100, 0x1159,
 	0x115f, 0x11a2,
 	0x11a8, 0x11f9,
-	0x1e00, 0x1e9a,
+	0x1e00, 0x1e9b,
 	0x1ea0, 0x1ef9,
 	0x1f00, 0x1f15,
 	0x1f18, 0x1f1d,
@@ -24586,7 +26339,7 @@ static const OnigCodePoint CR_Age_1_1[] = {
 	0x2030, 0x2046,
 	0x206a, 0x2070,
 	0x2074, 0x208e,
-	0x20a0, 0x20aa,
+	0x20a0, 0x20ac,
 	0x20d0, 0x20e1,
 	0x2100, 0x2138,
 	0x2153, 0x2182,
@@ -24631,7 +26384,8 @@ static const OnigCodePoint CR_Age_1_1[] = {
 	0x337b, 0x33dd,
 	0x33e0, 0x33fe,
 	0x4e00, 0x9fa5,
-	0xe000, 0xfa2d,
+	0xac00, 0xd7a3,
+	0xd800, 0xfa2d,
 	0xfb00, 0xfb06,
 	0xfb13, 0xfb17,
 	0xfb1e, 0xfb36,
@@ -24661,19 +26415,32 @@ static const OnigCodePoint CR_Age_1_1[] = {
 	0xffda, 0xffdc,
 	0xffe0, 0xffe6,
 	0xffe8, 0xffee,
-	0xfffd, 0xffff,
-}; /* CR_Age_1_1 */
+	0xfffc, 0xffff,
+	0x1fffe, 0x1ffff,
+	0x2fffe, 0x2ffff,
+	0x3fffe, 0x3ffff,
+	0x4fffe, 0x4ffff,
+	0x5fffe, 0x5ffff,
+	0x6fffe, 0x6ffff,
+	0x7fffe, 0x7ffff,
+	0x8fffe, 0x8ffff,
+	0x9fffe, 0x9ffff,
+	0xafffe, 0xaffff,
+	0xbfffe, 0xbffff,
+	0xcfffe, 0xcffff,
+	0xdfffe, 0xdffff,
+	0xefffe, 0x10ffff,
+}; /* CR_Age_2_1 */
 
-/* 'Age_2_0': Derived Age 2.0 */
-static const OnigCodePoint CR_Age_2_0[] = {
-	312,
-	0x0000, 0x01f5,
-	0x01fa, 0x0217,
-	0x0250, 0x02a8,
-	0x02b0, 0x02de,
-	0x02e0, 0x02e9,
-	0x0300, 0x0345,
-	0x0360, 0x0361,
+/* 'Age_3_0': Derived Age 3.0 */
+static const OnigCodePoint CR_Age_3_0[] = {
+	369,
+	0x0000, 0x021f,
+	0x0222, 0x0233,
+	0x0250, 0x02ad,
+	0x02b0, 0x02ee,
+	0x0300, 0x034e,
+	0x0360, 0x0362,
 	0x0374, 0x0375,
 	0x037a, 0x037a,
 	0x037e, 0x037e,
@@ -24681,26 +26448,19 @@ static const OnigCodePoint CR_Age_2_0[] = {
 	0x038c, 0x038c,
 	0x038e, 0x03a1,
 	0x03a3, 0x03ce,
-	0x03d0, 0x03d6,
-	0x03da, 0x03da,
-	0x03dc, 0x03dc,
-	0x03de, 0x03de,
-	0x03e0, 0x03e0,
-	0x03e2, 0x03f3,
-	0x0401, 0x040c,
-	0x040e, 0x044f,
-	0x0451, 0x045c,
-	0x045e, 0x0486,
-	0x0490, 0x04c4,
+	0x03d0, 0x03d7,
+	0x03da, 0x03f3,
+	0x0400, 0x0486,
+	0x0488, 0x0489,
+	0x048c, 0x04c4,
 	0x04c7, 0x04c8,
 	0x04cb, 0x04cc,
-	0x04d0, 0x04eb,
-	0x04ee, 0x04f5,
+	0x04d0, 0x04f5,
 	0x04f8, 0x04f9,
 	0x0531, 0x0556,
 	0x0559, 0x055f,
 	0x0561, 0x0587,
-	0x0589, 0x0589,
+	0x0589, 0x058a,
 	0x0591, 0x05a1,
 	0x05a3, 0x05b9,
 	0x05bb, 0x05c4,
@@ -24710,13 +26470,14 @@ static const OnigCodePoint CR_Age_2_0[] = {
 	0x061b, 0x061b,
 	0x061f, 0x061f,
 	0x0621, 0x063a,
-	0x0640, 0x0652,
+	0x0640, 0x0655,
 	0x0660, 0x066d,
-	0x0670, 0x06b7,
-	0x06ba, 0x06be,
-	0x06c0, 0x06ce,
-	0x06d0, 0x06ed,
-	0x06f0, 0x06f9,
+	0x0670, 0x06ed,
+	0x06f0, 0x06fe,
+	0x0700, 0x070d,
+	0x070f, 0x072c,
+	0x0730, 0x074a,
+	0x0780, 0x07b0,
 	0x0901, 0x0903,
 	0x0905, 0x0939,
 	0x093c, 0x094d,
@@ -24832,6 +26593,17 @@ static const OnigCodePoint CR_Age_2_0[] = {
 	0x0d57, 0x0d57,
 	0x0d60, 0x0d61,
 	0x0d66, 0x0d6f,
+	0x0d82, 0x0d83,
+	0x0d85, 0x0d96,
+	0x0d9a, 0x0db1,
+	0x0db3, 0x0dbb,
+	0x0dbd, 0x0dbd,
+	0x0dc0, 0x0dc6,
+	0x0dca, 0x0dca,
+	0x0dcf, 0x0dd4,
+	0x0dd6, 0x0dd6,
+	0x0dd8, 0x0ddf,
+	0x0df2, 0x0df4,
 	0x0e01, 0x0e3a,
 	0x0e3f, 0x0e5b,
 	0x0e81, 0x0e82,
@@ -24853,19 +26625,60 @@ static const OnigCodePoint CR_Age_2_0[] = {
 	0x0ed0, 0x0ed9,
 	0x0edc, 0x0edd,
 	0x0f00, 0x0f47,
-	0x0f49, 0x0f69,
+	0x0f49, 0x0f6a,
 	0x0f71, 0x0f8b,
-	0x0f90, 0x0f95,
-	0x0f97, 0x0f97,
-	0x0f99, 0x0fad,
-	0x0fb1, 0x0fb7,
-	0x0fb9, 0x0fb9,
+	0x0f90, 0x0f97,
+	0x0f99, 0x0fbc,
+	0x0fbe, 0x0fcc,
+	0x0fcf, 0x0fcf,
+	0x1000, 0x1021,
+	0x1023, 0x1027,
+	0x1029, 0x102a,
+	0x102c, 0x1032,
+	0x1036, 0x1039,
+	0x1040, 0x1059,
 	0x10a0, 0x10c5,
 	0x10d0, 0x10f6,
 	0x10fb, 0x10fb,
 	0x1100, 0x1159,
 	0x115f, 0x11a2,
 	0x11a8, 0x11f9,
+	0x1200, 0x1206,
+	0x1208, 0x1246,
+	0x1248, 0x1248,
+	0x124a, 0x124d,
+	0x1250, 0x1256,
+	0x1258, 0x1258,
+	0x125a, 0x125d,
+	0x1260, 0x1286,
+	0x1288, 0x1288,
+	0x128a, 0x128d,
+	0x1290, 0x12ae,
+	0x12b0, 0x12b0,
+	0x12b2, 0x12b5,
+	0x12b8, 0x12be,
+	0x12c0, 0x12c0,
+	0x12c2, 0x12c5,
+	0x12c8, 0x12ce,
+	0x12d0, 0x12d6,
+	0x12d8, 0x12ee,
+	0x12f0, 0x130e,
+	0x1310, 0x1310,
+	0x1312, 0x1315,
+	0x1318, 0x131e,
+	0x1320, 0x1346,
+	0x1348, 0x135a,
+	0x1361, 0x137c,
+	0x13a0, 0x13f4,
+	0x1401, 0x1676,
+	0x1680, 0x169c,
+	0x16a0, 0x16f0,
+	0x1780, 0x17dc,
+	0x17e0, 0x17e9,
+	0x1800, 0x180e,
+	0x1810, 0x1819,
+	0x1820, 0x1877,
+	0x1880, 0x18a9,
 	0x1e00, 0x1e9b,
 	0x1ea0, 0x1ef9,
 	0x1f00, 0x1f15,
@@ -24884,25 +26697,25 @@ static const OnigCodePoint CR_Age_2_0[] = {
 	0x1fdd, 0x1fef,
 	0x1ff2, 0x1ff4,
 	0x1ff6, 0x1ffe,
-	0x2000, 0x202e,
-	0x2030, 0x2046,
+	0x2000, 0x2046,
+	0x2048, 0x204d,
 	0x206a, 0x2070,
 	0x2074, 0x208e,
-	0x20a0, 0x20ab,
-	0x20d0, 0x20e1,
-	0x2100, 0x2138,
-	0x2153, 0x2182,
-	0x2190, 0x21ea,
+	0x20a0, 0x20af,
+	0x20d0, 0x20e3,
+	0x2100, 0x213a,
+	0x2153, 0x2183,
+	0x2190, 0x21f3,
 	0x2200, 0x22f1,
-	0x2300, 0x2300,
-	0x2302, 0x237a,
-	0x2400, 0x2424,
+	0x2300, 0x237b,
+	0x237d, 0x239a,
+	0x2400, 0x2426,
 	0x2440, 0x244a,
 	0x2460, 0x24ea,
 	0x2500, 0x2595,
-	0x25a0, 0x25ef,
+	0x25a0, 0x25f7,
 	0x2600, 0x2613,
-	0x261a, 0x266f,
+	0x2619, 0x2671,
 	0x2701, 0x2704,
 	0x2706, 0x2709,
 	0x270c, 0x2727,
@@ -24915,14 +26728,19 @@ static const OnigCodePoint CR_Age_2_0[] = {
 	0x2776, 0x2794,
 	0x2798, 0x27af,
 	0x27b1, 0x27be,
-	0x3000, 0x3037,
-	0x303f, 0x303f,
+	0x2800, 0x28ff,
+	0x2e80, 0x2e99,
+	0x2e9b, 0x2ef3,
+	0x2f00, 0x2fd5,
+	0x2ff0, 0x2ffb,
+	0x3000, 0x303a,
+	0x303e, 0x303f,
 	0x3041, 0x3094,
 	0x3099, 0x309e,
 	0x30a1, 0x30fe,
 	0x3105, 0x312c,
 	0x3131, 0x318e,
-	0x3190, 0x319f,
+	0x3190, 0x31b7,
 	0x3200, 0x321c,
 	0x3220, 0x3243,
 	0x3260, 0x327b,
@@ -24932,12 +26750,19 @@ static const OnigCodePoint CR_Age_2_0[] = {
 	0x3300, 0x3376,
 	0x337b, 0x33dd,
 	0x33e0, 0x33fe,
+	0x3400, 0x4db5,
 	0x4e00, 0x9fa5,
+	0xa000, 0xa48c,
+	0xa490, 0xa4a1,
+	0xa4a4, 0xa4b3,
+	0xa4b5, 0xa4c0,
+	0xa4c2, 0xa4c4,
+	0xa4c6, 0xa4c6,
 	0xac00, 0xd7a3,
 	0xd800, 0xfa2d,
 	0xfb00, 0xfb06,
 	0xfb13, 0xfb17,
-	0xfb1e, 0xfb36,
+	0xfb1d, 0xfb36,
 	0xfb38, 0xfb3c,
 	0xfb3e, 0xfb3e,
 	0xfb40, 0xfb41,
@@ -24964,7 +26789,7 @@ static const OnigCodePoint CR_Age_2_0[] = {
 	0xffda, 0xffdc,
 	0xffe0, 0xffe6,
 	0xffe8, 0xffee,
-	0xfffd, 0xffff,
+	0xfff9, 0xffff,
 	0x1fffe, 0x1ffff,
 	0x2fffe, 0x2ffff,
 	0x3fffe, 0x3ffff,
@@ -24979,18 +26804,17 @@ static const OnigCodePoint CR_Age_2_0[] = {
 	0xcfffe, 0xcffff,
 	0xdfffe, 0xdffff,
 	0xefffe, 0x10ffff,
-}; /* CR_Age_2_0 */
+}; /* CR_Age_3_0 */
 
-/* 'Age_2_1': Derived Age 2.1 */
-static const OnigCodePoint CR_Age_2_1[] = {
-	312,
-	0x0000, 0x01f5,
-	0x01fa, 0x0217,
-	0x0250, 0x02a8,
-	0x02b0, 0x02de,
-	0x02e0, 0x02e9,
-	0x0300, 0x0345,
-	0x0360, 0x0361,
+/* 'Age_3_1': Derived Age 3.1 */
+static const OnigCodePoint CR_Age_3_1[] = {
+	402,
+	0x0000, 0x021f,
+	0x0222, 0x0233,
+	0x0250, 0x02ad,
+	0x02b0, 0x02ee,
+	0x0300, 0x034e,
+	0x0360, 0x0362,
 	0x0374, 0x0375,
 	0x037a, 0x037a,
 	0x037e, 0x037e,
@@ -24998,26 +26822,19 @@ static const OnigCodePoint CR_Age_2_1[] = {
 	0x038c, 0x038c,
 	0x038e, 0x03a1,
 	0x03a3, 0x03ce,
-	0x03d0, 0x03d6,
-	0x03da, 0x03da,
-	0x03dc, 0x03dc,
-	0x03de, 0x03de,
-	0x03e0, 0x03e0,
-	0x03e2, 0x03f3,
-	0x0401, 0x040c,
-	0x040e, 0x044f,
-	0x0451, 0x045c,
-	0x045e, 0x0486,
-	0x0490, 0x04c4,
+	0x03d0, 0x03d7,
+	0x03da, 0x03f5,
+	0x0400, 0x0486,
+	0x0488, 0x0489,
+	0x048c, 0x04c4,
 	0x04c7, 0x04c8,
 	0x04cb, 0x04cc,
-	0x04d0, 0x04eb,
-	0x04ee, 0x04f5,
+	0x04d0, 0x04f5,
 	0x04f8, 0x04f9,
 	0x0531, 0x0556,
 	0x0559, 0x055f,
 	0x0561, 0x0587,
-	0x0589, 0x0589,
+	0x0589, 0x058a,
 	0x0591, 0x05a1,
 	0x05a3, 0x05b9,
 	0x05bb, 0x05c4,
@@ -25027,13 +26844,14 @@ static const OnigCodePoint CR_Age_2_1[] = {
 	0x061b, 0x061b,
 	0x061f, 0x061f,
 	0x0621, 0x063a,
-	0x0640, 0x0652,
+	0x0640, 0x0655,
 	0x0660, 0x066d,
-	0x0670, 0x06b7,
-	0x06ba, 0x06be,
-	0x06c0, 0x06ce,
-	0x06d0, 0x06ed,
-	0x06f0, 0x06f9,
+	0x0670, 0x06ed,
+	0x06f0, 0x06fe,
+	0x0700, 0x070d,
+	0x070f, 0x072c,
+	0x0730, 0x074a,
+	0x0780, 0x07b0,
 	0x0901, 0x0903,
 	0x0905, 0x0939,
 	0x093c, 0x094d,
@@ -25149,6 +26967,17 @@ static const OnigCodePoint CR_Age_2_1[] = {
 	0x0d57, 0x0d57,
 	0x0d60, 0x0d61,
 	0x0d66, 0x0d6f,
+	0x0d82, 0x0d83,
+	0x0d85, 0x0d96,
+	0x0d9a, 0x0db1,
+	0x0db3, 0x0dbb,
+	0x0dbd, 0x0dbd,
+	0x0dc0, 0x0dc6,
+	0x0dca, 0x0dca,
+	0x0dcf, 0x0dd4,
+	0x0dd6, 0x0dd6,
+	0x0dd8, 0x0ddf,
+	0x0df2, 0x0df4,
 	0x0e01, 0x0e3a,
 	0x0e3f, 0x0e5b,
 	0x0e81, 0x0e82,
@@ -25170,19 +26999,60 @@ static const OnigCodePoint CR_Age_2_1[] = {
 	0x0ed0, 0x0ed9,
 	0x0edc, 0x0edd,
 	0x0f00, 0x0f47,
-	0x0f49, 0x0f69,
+	0x0f49, 0x0f6a,
 	0x0f71, 0x0f8b,
-	0x0f90, 0x0f95,
-	0x0f97, 0x0f97,
-	0x0f99, 0x0fad,
-	0x0fb1, 0x0fb7,
-	0x0fb9, 0x0fb9,
+	0x0f90, 0x0f97,
+	0x0f99, 0x0fbc,
+	0x0fbe, 0x0fcc,
+	0x0fcf, 0x0fcf,
+	0x1000, 0x1021,
+	0x1023, 0x1027,
+	0x1029, 0x102a,
+	0x102c, 0x1032,
+	0x1036, 0x1039,
+	0x1040, 0x1059,
 	0x10a0, 0x10c5,
 	0x10d0, 0x10f6,
 	0x10fb, 0x10fb,
 	0x1100, 0x1159,
 	0x115f, 0x11a2,
 	0x11a8, 0x11f9,
+	0x1200, 0x1206,
+	0x1208, 0x1246,
+	0x1248, 0x1248,
+	0x124a, 0x124d,
+	0x1250, 0x1256,
+	0x1258, 0x1258,
+	0x125a, 0x125d,
+	0x1260, 0x1286,
+	0x1288, 0x1288,
+	0x128a, 0x128d,
+	0x1290, 0x12ae,
+	0x12b0, 0x12b0,
+	0x12b2, 0x12b5,
+	0x12b8, 0x12be,
+	0x12c0, 0x12c0,
+	0x12c2, 0x12c5,
+	0x12c8, 0x12ce,
+	0x12d0, 0x12d6,
+	0x12d8, 0x12ee,
+	0x12f0, 0x130e,
+	0x1310, 0x1310,
+	0x1312, 0x1315,
+	0x1318, 0x131e,
+	0x1320, 0x1346,
+	0x1348, 0x135a,
+	0x1361, 0x137c,
+	0x13a0, 0x13f4,
+	0x1401, 0x1676,
+	0x1680, 0x169c,
+	0x16a0, 0x16f0,
+	0x1780, 0x17dc,
+	0x17e0, 0x17e9,
+	0x1800, 0x180e,
+	0x1810, 0x1819,
+	0x1820, 0x1877,
+	0x1880, 0x18a9,
 	0x1e00, 0x1e9b,
 	0x1ea0, 0x1ef9,
 	0x1f00, 0x1f15,
@@ -25201,25 +27071,25 @@ static const OnigCodePoint CR_Age_2_1[] = {
 	0x1fdd, 0x1fef,
 	0x1ff2, 0x1ff4,
 	0x1ff6, 0x1ffe,
-	0x2000, 0x202e,
-	0x2030, 0x2046,
+	0x2000, 0x2046,
+	0x2048, 0x204d,
 	0x206a, 0x2070,
 	0x2074, 0x208e,
-	0x20a0, 0x20ac,
-	0x20d0, 0x20e1,
-	0x2100, 0x2138,
-	0x2153, 0x2182,
-	0x2190, 0x21ea,
+	0x20a0, 0x20af,
+	0x20d0, 0x20e3,
+	0x2100, 0x213a,
+	0x2153, 0x2183,
+	0x2190, 0x21f3,
 	0x2200, 0x22f1,
-	0x2300, 0x2300,
-	0x2302, 0x237a,
-	0x2400, 0x2424,
+	0x2300, 0x237b,
+	0x237d, 0x239a,
+	0x2400, 0x2426,
 	0x2440, 0x244a,
 	0x2460, 0x24ea,
 	0x2500, 0x2595,
-	0x25a0, 0x25ef,
+	0x25a0, 0x25f7,
 	0x2600, 0x2613,
-	0x261a, 0x266f,
+	0x2619, 0x2671,
 	0x2701, 0x2704,
 	0x2706, 0x2709,
 	0x270c, 0x2727,
@@ -25232,14 +27102,19 @@ static const OnigCodePoint CR_Age_2_1[] = {
 	0x2776, 0x2794,
 	0x2798, 0x27af,
 	0x27b1, 0x27be,
-	0x3000, 0x3037,
-	0x303f, 0x303f,
+	0x2800, 0x28ff,
+	0x2e80, 0x2e99,
+	0x2e9b, 0x2ef3,
+	0x2f00, 0x2fd5,
+	0x2ff0, 0x2ffb,
+	0x3000, 0x303a,
+	0x303e, 0x303f,
 	0x3041, 0x3094,
 	0x3099, 0x309e,
 	0x30a1, 0x30fe,
 	0x3105, 0x312c,
 	0x3131, 0x318e,
-	0x3190, 0x319f,
+	0x3190, 0x31b7,
 	0x3200, 0x321c,
 	0x3220, 0x3243,
 	0x3260, 0x327b,
@@ -25249,12 +27124,19 @@ static const OnigCodePoint CR_Age_2_1[] = {
 	0x3300, 0x3376,
 	0x337b, 0x33dd,
 	0x33e0, 0x33fe,
+	0x3400, 0x4db5,
 	0x4e00, 0x9fa5,
+	0xa000, 0xa48c,
+	0xa490, 0xa4a1,
+	0xa4a4, 0xa4b3,
+	0xa4b5, 0xa4c0,
+	0xa4c2, 0xa4c4,
+	0xa4c6, 0xa4c6,
 	0xac00, 0xd7a3,
 	0xd800, 0xfa2d,
 	0xfb00, 0xfb06,
 	0xfb13, 0xfb17,
-	0xfb1e, 0xfb36,
+	0xfb1d, 0xfb36,
 	0xfb38, 0xfb3c,
 	0xfb3e, 0xfb3e,
 	0xfb40, 0xfb41,
@@ -25263,7 +27145,7 @@ static const OnigCodePoint CR_Age_2_1[] = {
 	0xfbd3, 0xfd3f,
 	0xfd50, 0xfd8f,
 	0xfd92, 0xfdc7,
-	0xfdf0, 0xfdfb,
+	0xfdd0, 0xfdfb,
 	0xfe20, 0xfe23,
 	0xfe30, 0xfe44,
 	0xfe49, 0xfe52,
@@ -25281,8 +27163,39 @@ static const OnigCodePoint CR_Age_2_1[] = {
 	0xffda, 0xffdc,
 	0xffe0, 0xffe6,
 	0xffe8, 0xffee,
-	0xfffc, 0xffff,
-	0x1fffe, 0x1ffff,
+	0xfff9, 0xffff,
+	0x10300, 0x1031e,
+	0x10320, 0x10323,
+	0x10330, 0x1034a,
+	0x10400, 0x10425,
+	0x10428, 0x1044d,
+	0x1d000, 0x1d0f5,
+	0x1d100, 0x1d126,
+	0x1d12a, 0x1d1dd,
+	0x1d400, 0x1d454,
+	0x1d456, 0x1d49c,
+	0x1d49e, 0x1d49f,
+	0x1d4a2, 0x1d4a2,
+	0x1d4a5, 0x1d4a6,
+	0x1d4a9, 0x1d4ac,
+	0x1d4ae, 0x1d4b9,
+	0x1d4bb, 0x1d4bb,
+	0x1d4bd, 0x1d4c0,
+	0x1d4c2, 0x1d4c3,
+	0x1d4c5, 0x1d505,
+	0x1d507, 0x1d50a,
+	0x1d50d, 0x1d514,
+	0x1d516, 0x1d51c,
+	0x1d51e, 0x1d539,
+	0x1d53b, 0x1d53e,
+	0x1d540, 0x1d544,
+	0x1d546, 0x1d546,
+	0x1d54a, 0x1d550,
+	0x1d552, 0x1d6a3,
+	0x1d6a8, 0x1d7c9,
+	0x1d7ce, 0x1d7ff,
+	0x1fffe, 0x2a6d6,
+	0x2f800, 0x2fa1d,
 	0x2fffe, 0x2ffff,
 	0x3fffe, 0x3ffff,
 	0x4fffe, 0x4ffff,
@@ -25295,18 +27208,20 @@ static const OnigCodePoint CR_Age_2_1[] = {
 	0xbfffe, 0xbffff,
 	0xcfffe, 0xcffff,
 	0xdfffe, 0xdffff,
+	0xe0001, 0xe0001,
+	0xe0020, 0xe007f,
 	0xefffe, 0x10ffff,
-}; /* CR_Age_2_1 */
+}; /* CR_Age_3_1 */
 
-/* 'Age_3_0': Derived Age 3.0 */
-static const OnigCodePoint CR_Age_3_0[] = {
-	369,
-	0x0000, 0x021f,
+/* 'Age_3_2': Derived Age 3.2 */
+static const OnigCodePoint CR_Age_3_2[] = {
+	397,
+	0x0000, 0x0220,
 	0x0222, 0x0233,
 	0x0250, 0x02ad,
 	0x02b0, 0x02ee,
-	0x0300, 0x034e,
-	0x0360, 0x0362,
+	0x0300, 0x034f,
+	0x0360, 0x036f,
 	0x0374, 0x0375,
 	0x037a, 0x037a,
 	0x037e, 0x037e,
@@ -25314,15 +27229,12 @@ static const OnigCodePoint CR_Age_3_0[] = {
 	0x038c, 0x038c,
 	0x038e, 0x03a1,
 	0x03a3, 0x03ce,
-	0x03d0, 0x03d7,
-	0x03da, 0x03f3,
+	0x03d0, 0x03f6,
 	0x0400, 0x0486,
-	0x0488, 0x0489,
-	0x048c, 0x04c4,
-	0x04c7, 0x04c8,
-	0x04cb, 0x04cc,
+	0x0488, 0x04ce,
 	0x04d0, 0x04f5,
 	0x04f8, 0x04f9,
+	0x0500, 0x050f,
 	0x0531, 0x0556,
 	0x0559, 0x055f,
 	0x0561, 0x0587,
@@ -25337,13 +27249,12 @@ static const OnigCodePoint CR_Age_3_0[] = {
 	0x061f, 0x061f,
 	0x0621, 0x063a,
 	0x0640, 0x0655,
-	0x0660, 0x066d,
-	0x0670, 0x06ed,
+	0x0660, 0x06ed,
 	0x06f0, 0x06fe,
 	0x0700, 0x070d,
 	0x070f, 0x072c,
 	0x0730, 0x074a,
-	0x0780, 0x07b0,
+	0x0780, 0x07b1,
 	0x0901, 0x0903,
 	0x0905, 0x0939,
 	0x093c, 0x094d,
@@ -25504,7 +27415,7 @@ static const OnigCodePoint CR_Age_3_0[] = {
 	0x1036, 0x1039,
 	0x1040, 0x1059,
 	0x10a0, 0x10c5,
-	0x10d0, 0x10f6,
+	0x10d0, 0x10f8,
 	0x10fb, 0x10fb,
 	0x1100, 0x1159,
 	0x115f, 0x11a2,
@@ -25539,6 +27450,13 @@ static const OnigCodePoint CR_Age_3_0[] = {
 	0x1401, 0x1676,
 	0x1680, 0x169c,
 	0x16a0, 0x16f0,
+	0x1700, 0x170c,
+	0x170e, 0x1714,
+	0x1720, 0x1736,
+	0x1740, 0x1753,
+	0x1760, 0x176c,
+	0x176e, 0x1770,
+	0x1772, 0x1773,
 	0x1780, 0x17dc,
 	0x17e0, 0x17e9,
 	0x1800, 0x180e,
@@ -25563,25 +27481,24 @@ static const OnigCodePoint CR_Age_3_0[] = {
 	0x1fdd, 0x1fef,
 	0x1ff2, 0x1ff4,
 	0x1ff6, 0x1ffe,
-	0x2000, 0x2046,
-	0x2048, 0x204d,
-	0x206a, 0x2070,
+	0x2000, 0x2052,
+	0x2057, 0x2057,
+	0x205f, 0x2063,
+	0x206a, 0x2071,
 	0x2074, 0x208e,
-	0x20a0, 0x20af,
-	0x20d0, 0x20e3,
+	0x20a0, 0x20b1,
+	0x20d0, 0x20ea,
 	0x2100, 0x213a,
+	0x213d, 0x214b,
 	0x2153, 0x2183,
-	0x2190, 0x21f3,
-	0x2200, 0x22f1,
-	0x2300, 0x237b,
-	0x237d, 0x239a,
+	0x2190, 0x23ce,
 	0x2400, 0x2426,
 	0x2440, 0x244a,
-	0x2460, 0x24ea,
-	0x2500, 0x2595,
-	0x25a0, 0x25f7,
-	0x2600, 0x2613,
-	0x2619, 0x2671,
+	0x2460, 0x24fe,
+	0x2500, 0x2613,
+	0x2616, 0x2617,
+	0x2619, 0x267d,
+	0x2680, 0x2689,
 	0x2701, 0x2704,
 	0x2706, 0x2709,
 	0x270c, 0x2727,
@@ -25590,28 +27507,25 @@ static const OnigCodePoint CR_Age_3_0[] = {
 	0x274f, 0x2752,
 	0x2756, 0x2756,
 	0x2758, 0x275e,
-	0x2761, 0x2767,
-	0x2776, 0x2794,
+	0x2761, 0x2794,
 	0x2798, 0x27af,
 	0x27b1, 0x27be,
-	0x2800, 0x28ff,
+	0x27d0, 0x27eb,
+	0x27f0, 0x2aff,
 	0x2e80, 0x2e99,
 	0x2e9b, 0x2ef3,
 	0x2f00, 0x2fd5,
 	0x2ff0, 0x2ffb,
-	0x3000, 0x303a,
-	0x303e, 0x303f,
-	0x3041, 0x3094,
-	0x3099, 0x309e,
-	0x30a1, 0x30fe,
+	0x3000, 0x303f,
+	0x3041, 0x3096,
+	0x3099, 0x30ff,
 	0x3105, 0x312c,
 	0x3131, 0x318e,
 	0x3190, 0x31b7,
-	0x3200, 0x321c,
+	0x31f0, 0x321c,
 	0x3220, 0x3243,
-	0x3260, 0x327b,
-	0x327f, 0x32b0,
-	0x32c0, 0x32cb,
+	0x3251, 0x327b,
+	0x327f, 0x32cb,
 	0x32d0, 0x32fe,
 	0x3300, 0x3376,
 	0x337b, 0x33dd,
@@ -25619,13 +27533,10 @@ static const OnigCodePoint CR_Age_3_0[] = {
 	0x3400, 0x4db5,
 	0x4e00, 0x9fa5,
 	0xa000, 0xa48c,
-	0xa490, 0xa4a1,
-	0xa4a4, 0xa4b3,
-	0xa4b5, 0xa4c0,
-	0xa4c2, 0xa4c4,
-	0xa4c6, 0xa4c6,
+	0xa490, 0xa4c6,
 	0xac00, 0xd7a3,
 	0xd800, 0xfa2d,
+	0xfa30, 0xfa6a,
 	0xfb00, 0xfb06,
 	0xfb13, 0xfb17,
 	0xfb1d, 0xfb36,
@@ -25637,18 +27548,17 @@ static const OnigCodePoint CR_Age_3_0[] = {
 	0xfbd3, 0xfd3f,
 	0xfd50, 0xfd8f,
 	0xfd92, 0xfdc7,
-	0xfdf0, 0xfdfb,
+	0xfdd0, 0xfdfc,
+	0xfe00, 0xfe0f,
 	0xfe20, 0xfe23,
-	0xfe30, 0xfe44,
+	0xfe30, 0xfe46,
 	0xfe49, 0xfe52,
 	0xfe54, 0xfe66,
 	0xfe68, 0xfe6b,
-	0xfe70, 0xfe72,
-	0xfe74, 0xfe74,
+	0xfe70, 0xfe74,
 	0xfe76, 0xfefc,
 	0xfeff, 0xfeff,
-	0xff01, 0xff5e,
-	0xff61, 0xffbe,
+	0xff01, 0xffbe,
 	0xffc2, 0xffc7,
 	0xffca, 0xffcf,
 	0xffd2, 0xffd7,
@@ -25656,7 +27566,38 @@ static const OnigCodePoint CR_Age_3_0[] = {
 	0xffe0, 0xffe6,
 	0xffe8, 0xffee,
 	0xfff9, 0xffff,
-	0x1fffe, 0x1ffff,
+	0x10300, 0x1031e,
+	0x10320, 0x10323,
+	0x10330, 0x1034a,
+	0x10400, 0x10425,
+	0x10428, 0x1044d,
+	0x1d000, 0x1d0f5,
+	0x1d100, 0x1d126,
+	0x1d12a, 0x1d1dd,
+	0x1d400, 0x1d454,
+	0x1d456, 0x1d49c,
+	0x1d49e, 0x1d49f,
+	0x1d4a2, 0x1d4a2,
+	0x1d4a5, 0x1d4a6,
+	0x1d4a9, 0x1d4ac,
+	0x1d4ae, 0x1d4b9,
+	0x1d4bb, 0x1d4bb,
+	0x1d4bd, 0x1d4c0,
+	0x1d4c2, 0x1d4c3,
+	0x1d4c5, 0x1d505,
+	0x1d507, 0x1d50a,
+	0x1d50d, 0x1d514,
+	0x1d516, 0x1d51c,
+	0x1d51e, 0x1d539,
+	0x1d53b, 0x1d53e,
+	0x1d540, 0x1d544,
+	0x1d546, 0x1d546,
+	0x1d54a, 0x1d550,
+	0x1d552, 0x1d6a3,
+	0x1d6a8, 0x1d7c9,
+	0x1d7ce, 0x1d7ff,
+	0x1fffe, 0x2a6d6,
+	0x2f800, 0x2fa1d,
 	0x2fffe, 0x2ffff,
 	0x3fffe, 0x3ffff,
 	0x4fffe, 0x4ffff,
@@ -25669,18 +27610,17 @@ static const OnigCodePoint CR_Age_3_0[] = {
 	0xbfffe, 0xbffff,
 	0xcfffe, 0xcffff,
 	0xdfffe, 0xdffff,
+	0xe0001, 0xe0001,
+	0xe0020, 0xe007f,
 	0xefffe, 0x10ffff,
-}; /* CR_Age_3_0 */
+}; /* CR_Age_3_2 */
 
-/* 'Age_3_1': Derived Age 3.1 */
-static const OnigCodePoint CR_Age_3_1[] = {
-	402,
-	0x0000, 0x021f,
-	0x0222, 0x0233,
-	0x0250, 0x02ad,
-	0x02b0, 0x02ee,
-	0x0300, 0x034e,
-	0x0360, 0x0362,
+/* 'Age_4_0': Derived Age 4.0 */
+static const OnigCodePoint CR_Age_4_0[] = {
+	412,
+	0x0000, 0x0236,
+	0x0250, 0x0357,
+	0x035d, 0x036f,
 	0x0374, 0x0375,
 	0x037a, 0x037a,
 	0x037e, 0x037e,
@@ -25688,15 +27628,12 @@ static const OnigCodePoint CR_Age_3_1[] = {
 	0x038c, 0x038c,
 	0x038e, 0x03a1,
 	0x03a3, 0x03ce,
-	0x03d0, 0x03d7,
-	0x03da, 0x03f5,
+	0x03d0, 0x03fb,
 	0x0400, 0x0486,
-	0x0488, 0x0489,
-	0x048c, 0x04c4,
-	0x04c7, 0x04c8,
-	0x04cb, 0x04cc,
+	0x0488, 0x04ce,
 	0x04d0, 0x04f5,
 	0x04f8, 0x04f9,
+	0x0500, 0x050f,
 	0x0531, 0x0556,
 	0x0559, 0x055f,
 	0x0561, 0x0587,
@@ -25706,20 +27643,17 @@ static const OnigCodePoint CR_Age_3_1[] = {
 	0x05bb, 0x05c4,
 	0x05d0, 0x05ea,
 	0x05f0, 0x05f4,
-	0x060c, 0x060c,
+	0x0600, 0x0603,
+	0x060c, 0x0615,
 	0x061b, 0x061b,
 	0x061f, 0x061f,
 	0x0621, 0x063a,
-	0x0640, 0x0655,
-	0x0660, 0x066d,
-	0x0670, 0x06ed,
-	0x06f0, 0x06fe,
-	0x0700, 0x070d,
-	0x070f, 0x072c,
-	0x0730, 0x074a,
-	0x0780, 0x07b0,
-	0x0901, 0x0903,
-	0x0905, 0x0939,
+	0x0640, 0x0658,
+	0x0660, 0x070d,
+	0x070f, 0x074a,
+	0x074d, 0x074f,
+	0x0780, 0x07b1,
+	0x0901, 0x0939,
 	0x093c, 0x094d,
 	0x0950, 0x0954,
 	0x0958, 0x0970,
@@ -25730,15 +27664,14 @@ static const OnigCodePoint CR_Age_3_1[] = {
 	0x09aa, 0x09b0,
 	0x09b2, 0x09b2,
 	0x09b6, 0x09b9,
-	0x09bc, 0x09bc,
-	0x09be, 0x09c4,
+	0x09bc, 0x09c4,
 	0x09c7, 0x09c8,
 	0x09cb, 0x09cd,
 	0x09d7, 0x09d7,
 	0x09dc, 0x09dd,
 	0x09df, 0x09e3,
 	0x09e6, 0x09fa,
-	0x0a02, 0x0a02,
+	0x0a01, 0x0a03,
 	0x0a05, 0x0a0a,
 	0x0a0f, 0x0a10,
 	0x0a13, 0x0a28,
@@ -25754,8 +27687,7 @@ static const OnigCodePoint CR_Age_3_1[] = {
 	0x0a5e, 0x0a5e,
 	0x0a66, 0x0a74,
 	0x0a81, 0x0a83,
-	0x0a85, 0x0a8b,
-	0x0a8d, 0x0a8d,
+	0x0a85, 0x0a8d,
 	0x0a8f, 0x0a91,
 	0x0a93, 0x0aa8,
 	0x0aaa, 0x0ab0,
@@ -25765,22 +27697,23 @@ static const OnigCodePoint CR_Age_3_1[] = {
 	0x0ac7, 0x0ac9,
 	0x0acb, 0x0acd,
 	0x0ad0, 0x0ad0,
-	0x0ae0, 0x0ae0,
+	0x0ae0, 0x0ae3,
 	0x0ae6, 0x0aef,
+	0x0af1, 0x0af1,
 	0x0b01, 0x0b03,
 	0x0b05, 0x0b0c,
 	0x0b0f, 0x0b10,
 	0x0b13, 0x0b28,
 	0x0b2a, 0x0b30,
 	0x0b32, 0x0b33,
-	0x0b36, 0x0b39,
+	0x0b35, 0x0b39,
 	0x0b3c, 0x0b43,
 	0x0b47, 0x0b48,
 	0x0b4b, 0x0b4d,
 	0x0b56, 0x0b57,
 	0x0b5c, 0x0b5d,
 	0x0b5f, 0x0b61,
-	0x0b66, 0x0b70,
+	0x0b66, 0x0b71,
 	0x0b82, 0x0b83,
 	0x0b85, 0x0b8a,
 	0x0b8e, 0x0b90,
@@ -25796,7 +27729,7 @@ static const OnigCodePoint CR_Age_3_1[] = {
 	0x0bc6, 0x0bc8,
 	0x0bca, 0x0bcd,
 	0x0bd7, 0x0bd7,
-	0x0be7, 0x0bf2,
+	0x0be7, 0x0bfa,
 	0x0c01, 0x0c03,
 	0x0c05, 0x0c0c,
 	0x0c0e, 0x0c10,
@@ -25815,7 +27748,7 @@ static const OnigCodePoint CR_Age_3_1[] = {
 	0x0c92, 0x0ca8,
 	0x0caa, 0x0cb3,
 	0x0cb5, 0x0cb9,
-	0x0cbe, 0x0cc4,
+	0x0cbc, 0x0cc4,
 	0x0cc6, 0x0cc8,
 	0x0cca, 0x0ccd,
 	0x0cd5, 0x0cd6,
@@ -25878,7 +27811,7 @@ static const OnigCodePoint CR_Age_3_1[] = {
 	0x1036, 0x1039,
 	0x1040, 0x1059,
 	0x10a0, 0x10c5,
-	0x10d0, 0x10f6,
+	0x10d0, 0x10f8,
 	0x10fb, 0x10fb,
 	0x1100, 0x1159,
 	0x115f, 0x11a2,
@@ -25913,12 +27846,28 @@ static const OnigCodePoint CR_Age_3_1[] = {
 	0x1401, 0x1676,
 	0x1680, 0x169c,
 	0x16a0, 0x16f0,
-	0x1780, 0x17dc,
+	0x1700, 0x170c,
+	0x170e, 0x1714,
+	0x1720, 0x1736,
+	0x1740, 0x1753,
+	0x1760, 0x176c,
+	0x176e, 0x1770,
+	0x1772, 0x1773,
+	0x1780, 0x17dd,
 	0x17e0, 0x17e9,
+	0x17f0, 0x17f9,
 	0x1800, 0x180e,
 	0x1810, 0x1819,
 	0x1820, 0x1877,
 	0x1880, 0x18a9,
+	0x1900, 0x191c,
+	0x1920, 0x192b,
+	0x1930, 0x193b,
+	0x1940, 0x1940,
+	0x1944, 0x196d,
+	0x1970, 0x1974,
+	0x19e0, 0x19ff,
+	0x1d00, 0x1d6b,
 	0x1e00, 0x1e9b,
 	0x1ea0, 0x1ef9,
 	0x1f00, 0x1f15,
@@ -25937,25 +27886,23 @@ static const OnigCodePoint CR_Age_3_1[] = {
 	0x1fdd, 0x1fef,
 	0x1ff2, 0x1ff4,
 	0x1ff6, 0x1ffe,
-	0x2000, 0x2046,
-	0x2048, 0x204d,
-	0x206a, 0x2070,
+	0x2000, 0x2054,
+	0x2057, 0x2057,
+	0x205f, 0x2063,
+	0x206a, 0x2071,
 	0x2074, 0x208e,
-	0x20a0, 0x20af,
-	0x20d0, 0x20e3,
-	0x2100, 0x213a,
+	0x20a0, 0x20b1,
+	0x20d0, 0x20ea,
+	0x2100, 0x213b,
+	0x213d, 0x214b,
 	0x2153, 0x2183,
-	0x2190, 0x21f3,
-	0x2200, 0x22f1,
-	0x2300, 0x237b,
-	0x237d, 0x239a,
+	0x2190, 0x23d0,
 	0x2400, 0x2426,
 	0x2440, 0x244a,
-	0x2460, 0x24ea,
-	0x2500, 0x2595,
-	0x25a0, 0x25f7,
-	0x2600, 0x2613,
-	0x2619, 0x2671,
+	0x2460, 0x2617,
+	0x2619, 0x267d,
+	0x2680, 0x2691,
+	0x26a0, 0x26a1,
 	0x2701, 0x2704,
 	0x2706, 0x2709,
 	0x270c, 0x2727,
@@ -25964,42 +27911,32 @@ static const OnigCodePoint CR_Age_3_1[] = {
 	0x274f, 0x2752,
 	0x2756, 0x2756,
 	0x2758, 0x275e,
-	0x2761, 0x2767,
-	0x2776, 0x2794,
+	0x2761, 0x2794,
 	0x2798, 0x27af,
 	0x27b1, 0x27be,
-	0x2800, 0x28ff,
+	0x27d0, 0x27eb,
+	0x27f0, 0x2b0d,
 	0x2e80, 0x2e99,
 	0x2e9b, 0x2ef3,
 	0x2f00, 0x2fd5,
 	0x2ff0, 0x2ffb,
-	0x3000, 0x303a,
-	0x303e, 0x303f,
-	0x3041, 0x3094,
-	0x3099, 0x309e,
-	0x30a1, 0x30fe,
+	0x3000, 0x303f,
+	0x3041, 0x3096,
+	0x3099, 0x30ff,
 	0x3105, 0x312c,
 	0x3131, 0x318e,
 	0x3190, 0x31b7,
-	0x3200, 0x321c,
+	0x31f0, 0x321e,
 	0x3220, 0x3243,
-	0x3260, 0x327b,
-	0x327f, 0x32b0,
-	0x32c0, 0x32cb,
-	0x32d0, 0x32fe,
-	0x3300, 0x3376,
-	0x337b, 0x33dd,
-	0x33e0, 0x33fe,
-	0x3400, 0x4db5,
-	0x4e00, 0x9fa5,
+	0x3250, 0x327d,
+	0x327f, 0x32fe,
+	0x3300, 0x4db5,
+	0x4dc0, 0x9fa5,
 	0xa000, 0xa48c,
-	0xa490, 0xa4a1,
-	0xa4a4, 0xa4b3,
-	0xa4b5, 0xa4c0,
-	0xa4c2, 0xa4c4,
-	0xa4c6, 0xa4c6,
+	0xa490, 0xa4c6,
 	0xac00, 0xd7a3,
 	0xd800, 0xfa2d,
+	0xfa30, 0xfa6a,
 	0xfb00, 0xfb06,
 	0xfb13, 0xfb17,
 	0xfb1d, 0xfb36,
@@ -26011,33 +27948,49 @@ static const OnigCodePoint CR_Age_3_1[] = {
 	0xfbd3, 0xfd3f,
 	0xfd50, 0xfd8f,
 	0xfd92, 0xfdc7,
-	0xfdd0, 0xfdfb,
+	0xfdd0, 0xfdfd,
+	0xfe00, 0xfe0f,
 	0xfe20, 0xfe23,
-	0xfe30, 0xfe44,
-	0xfe49, 0xfe52,
+	0xfe30, 0xfe52,
 	0xfe54, 0xfe66,
 	0xfe68, 0xfe6b,
-	0xfe70, 0xfe72,
-	0xfe74, 0xfe74,
+	0xfe70, 0xfe74,
 	0xfe76, 0xfefc,
 	0xfeff, 0xfeff,
-	0xff01, 0xff5e,
-	0xff61, 0xffbe,
+	0xff01, 0xffbe,
 	0xffc2, 0xffc7,
 	0xffca, 0xffcf,
 	0xffd2, 0xffd7,
 	0xffda, 0xffdc,
 	0xffe0, 0xffe6,
 	0xffe8, 0xffee,
-	0xfff9, 0xffff,
+	0xfff9, 0x1000b,
+	0x1000d, 0x10026,
+	0x10028, 0x1003a,
+	0x1003c, 0x1003d,
+	0x1003f, 0x1004d,
+	0x10050, 0x1005d,
+	0x10080, 0x100fa,
+	0x10100, 0x10102,
+	0x10107, 0x10133,
+	0x10137, 0x1013f,
 	0x10300, 0x1031e,
 	0x10320, 0x10323,
 	0x10330, 0x1034a,
-	0x10400, 0x10425,
-	0x10428, 0x1044d,
+	0x10380, 0x1039d,
+	0x1039f, 0x1039f,
+	0x10400, 0x1049d,
+	0x104a0, 0x104a9,
+	0x10800, 0x10805,
+	0x10808, 0x10808,
+	0x1080a, 0x10835,
+	0x10837, 0x10838,
+	0x1083c, 0x1083c,
+	0x1083f, 0x1083f,
 	0x1d000, 0x1d0f5,
 	0x1d100, 0x1d126,
 	0x1d12a, 0x1d1dd,
+	0x1d300, 0x1d356,
 	0x1d400, 0x1d454,
 	0x1d456, 0x1d49c,
 	0x1d49e, 0x1d49f,
@@ -26046,8 +27999,7 @@ static const OnigCodePoint CR_Age_3_1[] = {
 	0x1d4a9, 0x1d4ac,
 	0x1d4ae, 0x1d4b9,
 	0x1d4bb, 0x1d4bb,
-	0x1d4bd, 0x1d4c0,
-	0x1d4c2, 0x1d4c3,
+	0x1d4bd, 0x1d4c3,
 	0x1d4c5, 0x1d505,
 	0x1d507, 0x1d50a,
 	0x1d50d, 0x1d514,
@@ -26076,18 +28028,15 @@ static const OnigCodePoint CR_Age_3_1[] = {
 	0xdfffe, 0xdffff,
 	0xe0001, 0xe0001,
 	0xe0020, 0xe007f,
+	0xe0100, 0xe01ef,
 	0xefffe, 0x10ffff,
-}; /* CR_Age_3_1 */
+}; /* CR_Age_4_0 */
 
-/* 'Age_3_2': Derived Age 3.2 */
-static const OnigCodePoint CR_Age_3_2[] = {
-	397,
-	0x0000, 0x0220,
-	0x0222, 0x0233,
-	0x0250, 0x02ad,
-	0x02b0, 0x02ee,
-	0x0300, 0x034f,
-	0x0360, 0x036f,
+/* 'Age_4_1': Derived Age 4.1 */
+static const OnigCodePoint CR_Age_4_1[] = {
+	430,
+	0x0000, 0x0241,
+	0x0250, 0x036f,
 	0x0374, 0x0375,
 	0x037a, 0x037a,
 	0x037e, 0x037e,
@@ -26095,37 +28044,33 @@ static const OnigCodePoint CR_Age_3_2[] = {
 	0x038c, 0x038c,
 	0x038e, 0x03a1,
 	0x03a3, 0x03ce,
-	0x03d0, 0x03f6,
-	0x0400, 0x0486,
+	0x03d0, 0x0486,
 	0x0488, 0x04ce,
-	0x04d0, 0x04f5,
-	0x04f8, 0x04f9,
+	0x04d0, 0x04f9,
 	0x0500, 0x050f,
 	0x0531, 0x0556,
 	0x0559, 0x055f,
 	0x0561, 0x0587,
 	0x0589, 0x058a,
-	0x0591, 0x05a1,
-	0x05a3, 0x05b9,
-	0x05bb, 0x05c4,
+	0x0591, 0x05b9,
+	0x05bb, 0x05c7,
 	0x05d0, 0x05ea,
 	0x05f0, 0x05f4,
-	0x060c, 0x060c,
+	0x0600, 0x0603,
+	0x060b, 0x0615,
 	0x061b, 0x061b,
-	0x061f, 0x061f,
+	0x061e, 0x061f,
 	0x0621, 0x063a,
-	0x0640, 0x0655,
-	0x0660, 0x06ed,
-	0x06f0, 0x06fe,
-	0x0700, 0x070d,
-	0x070f, 0x072c,
-	0x0730, 0x074a,
+	0x0640, 0x065e,
+	0x0660, 0x070d,
+	0x070f, 0x074a,
+	0x074d, 0x076d,
 	0x0780, 0x07b1,
-	0x0901, 0x0903,
-	0x0905, 0x0939,
+	0x0901, 0x0939,
 	0x093c, 0x094d,
 	0x0950, 0x0954,
 	0x0958, 0x0970,
+	0x097d, 0x097d,
 	0x0981, 0x0983,
 	0x0985, 0x098c,
 	0x098f, 0x0990,
@@ -26133,15 +28078,14 @@ static const OnigCodePoint CR_Age_3_2[] = {
 	0x09aa, 0x09b0,
 	0x09b2, 0x09b2,
 	0x09b6, 0x09b9,
-	0x09bc, 0x09bc,
-	0x09be, 0x09c4,
+	0x09bc, 0x09c4,
 	0x09c7, 0x09c8,
-	0x09cb, 0x09cd,
+	0x09cb, 0x09ce,
 	0x09d7, 0x09d7,
 	0x09dc, 0x09dd,
 	0x09df, 0x09e3,
 	0x09e6, 0x09fa,
-	0x0a02, 0x0a02,
+	0x0a01, 0x0a03,
 	0x0a05, 0x0a0a,
 	0x0a0f, 0x0a10,
 	0x0a13, 0x0a28,
@@ -26157,8 +28101,7 @@ static const OnigCodePoint CR_Age_3_2[] = {
 	0x0a5e, 0x0a5e,
 	0x0a66, 0x0a74,
 	0x0a81, 0x0a83,
-	0x0a85, 0x0a8b,
-	0x0a8d, 0x0a8d,
+	0x0a85, 0x0a8d,
 	0x0a8f, 0x0a91,
 	0x0a93, 0x0aa8,
 	0x0aaa, 0x0ab0,
@@ -26168,22 +28111,23 @@ static const OnigCodePoint CR_Age_3_2[] = {
 	0x0ac7, 0x0ac9,
 	0x0acb, 0x0acd,
 	0x0ad0, 0x0ad0,
-	0x0ae0, 0x0ae0,
+	0x0ae0, 0x0ae3,
 	0x0ae6, 0x0aef,
+	0x0af1, 0x0af1,
 	0x0b01, 0x0b03,
 	0x0b05, 0x0b0c,
 	0x0b0f, 0x0b10,
 	0x0b13, 0x0b28,
 	0x0b2a, 0x0b30,
 	0x0b32, 0x0b33,
-	0x0b36, 0x0b39,
+	0x0b35, 0x0b39,
 	0x0b3c, 0x0b43,
 	0x0b47, 0x0b48,
 	0x0b4b, 0x0b4d,
 	0x0b56, 0x0b57,
 	0x0b5c, 0x0b5d,
 	0x0b5f, 0x0b61,
-	0x0b66, 0x0b70,
+	0x0b66, 0x0b71,
 	0x0b82, 0x0b83,
 	0x0b85, 0x0b8a,
 	0x0b8e, 0x0b90,
@@ -26193,13 +28137,12 @@ static const OnigCodePoint CR_Age_3_2[] = {
 	0x0b9e, 0x0b9f,
 	0x0ba3, 0x0ba4,
 	0x0ba8, 0x0baa,
-	0x0bae, 0x0bb5,
-	0x0bb7, 0x0bb9,
+	0x0bae, 0x0bb9,
 	0x0bbe, 0x0bc2,
 	0x0bc6, 0x0bc8,
 	0x0bca, 0x0bcd,
 	0x0bd7, 0x0bd7,
-	0x0be7, 0x0bf2,
+	0x0be6, 0x0bfa,
 	0x0c01, 0x0c03,
 	0x0c05, 0x0c0c,
 	0x0c0e, 0x0c10,
@@ -26218,7 +28161,7 @@ static const OnigCodePoint CR_Age_3_2[] = {
 	0x0c92, 0x0ca8,
 	0x0caa, 0x0cb3,
 	0x0cb5, 0x0cb9,
-	0x0cbe, 0x0cc4,
+	0x0cbc, 0x0cc4,
 	0x0cc6, 0x0cc8,
 	0x0cca, 0x0ccd,
 	0x0cd5, 0x0cd6,
@@ -26273,7 +28216,7 @@ static const OnigCodePoint CR_Age_3_2[] = {
 	0x0f90, 0x0f97,
 	0x0f99, 0x0fbc,
 	0x0fbe, 0x0fcc,
-	0x0fcf, 0x0fcf,
+	0x0fcf, 0x0fd1,
 	0x1000, 0x1021,
 	0x1023, 0x1027,
 	0x1029, 0x102a,
@@ -26281,37 +28224,28 @@ static const OnigCodePoint CR_Age_3_2[] = {
 	0x1036, 0x1039,
 	0x1040, 0x1059,
 	0x10a0, 0x10c5,
-	0x10d0, 0x10f8,
-	0x10fb, 0x10fb,
+	0x10d0, 0x10fc,
 	0x1100, 0x1159,
 	0x115f, 0x11a2,
 	0x11a8, 0x11f9,
-	0x1200, 0x1206,
-	0x1208, 0x1246,
-	0x1248, 0x1248,
+	0x1200, 0x1248,
 	0x124a, 0x124d,
 	0x1250, 0x1256,
 	0x1258, 0x1258,
 	0x125a, 0x125d,
-	0x1260, 0x1286,
-	0x1288, 0x1288,
+	0x1260, 0x1288,
 	0x128a, 0x128d,
-	0x1290, 0x12ae,
-	0x12b0, 0x12b0,
+	0x1290, 0x12b0,
 	0x12b2, 0x12b5,
 	0x12b8, 0x12be,
 	0x12c0, 0x12c0,
 	0x12c2, 0x12c5,
-	0x12c8, 0x12ce,
-	0x12d0, 0x12d6,
-	0x12d8, 0x12ee,
-	0x12f0, 0x130e,
-	0x1310, 0x1310,
+	0x12c8, 0x12d6,
+	0x12d8, 0x1310,
 	0x1312, 0x1315,
-	0x1318, 0x131e,
-	0x1320, 0x1346,
-	0x1348, 0x135a,
-	0x1361, 0x137c,
+	0x1318, 0x135a,
+	0x135f, 0x137c,
+	0x1380, 0x1399,
 	0x13a0, 0x13f4,
 	0x1401, 0x1676,
 	0x1680, 0x169c,
@@ -26323,12 +28257,25 @@ static const OnigCodePoint CR_Age_3_2[] = {
 	0x1760, 0x176c,
 	0x176e, 0x1770,
 	0x1772, 0x1773,
-	0x1780, 0x17dc,
+	0x1780, 0x17dd,
 	0x17e0, 0x17e9,
+	0x17f0, 0x17f9,
 	0x1800, 0x180e,
 	0x1810, 0x1819,
 	0x1820, 0x1877,
 	0x1880, 0x18a9,
+	0x1900, 0x191c,
+	0x1920, 0x192b,
+	0x1930, 0x193b,
+	0x1940, 0x1940,
+	0x1944, 0x196d,
+	0x1970, 0x1974,
+	0x1980, 0x19a9,
+	0x19b0, 0x19c9,
+	0x19d0, 0x19d9,
+	0x19de, 0x1a1b,
+	0x1a1e, 0x1a1f,
+	0x1d00, 0x1dc3,
 	0x1e00, 0x1e9b,
 	0x1ea0, 0x1ef9,
 	0x1f00, 0x1f15,
@@ -26347,24 +28294,19 @@ static const OnigCodePoint CR_Age_3_2[] = {
 	0x1fdd, 0x1fef,
 	0x1ff2, 0x1ff4,
 	0x1ff6, 0x1ffe,
-	0x2000, 0x2052,
-	0x2057, 0x2057,
-	0x205f, 0x2063,
+	0x2000, 0x2063,
 	0x206a, 0x2071,
 	0x2074, 0x208e,
-	0x20a0, 0x20b1,
-	0x20d0, 0x20ea,
-	0x2100, 0x213a,
-	0x213d, 0x214b,
+	0x2090, 0x2094,
+	0x20a0, 0x20b5,
+	0x20d0, 0x20eb,
+	0x2100, 0x214c,
 	0x2153, 0x2183,
-	0x2190, 0x23ce,
+	0x2190, 0x23db,
 	0x2400, 0x2426,
 	0x2440, 0x244a,
-	0x2460, 0x24fe,
-	0x2500, 0x2613,
-	0x2616, 0x2617,
-	0x2619, 0x267d,
-	0x2680, 0x2689,
+	0x2460, 0x269c,
+	0x26a0, 0x26b1,
 	0x2701, 0x2704,
 	0x2706, 0x2709,
 	0x270c, 0x2727,
@@ -26376,8 +28318,26 @@ static const OnigCodePoint CR_Age_3_2[] = {
 	0x2761, 0x2794,
 	0x2798, 0x27af,
 	0x27b1, 0x27be,
+	0x27c0, 0x27c6,
 	0x27d0, 0x27eb,
-	0x27f0, 0x2aff,
+	0x27f0, 0x2b13,
+	0x2c00, 0x2c2e,
+	0x2c30, 0x2c5e,
+	0x2c80, 0x2cea,
+	0x2cf9, 0x2d25,
+	0x2d30, 0x2d65,
+	0x2d6f, 0x2d6f,
+	0x2d80, 0x2d96,
+	0x2da0, 0x2da6,
+	0x2da8, 0x2dae,
+	0x2db0, 0x2db6,
+	0x2db8, 0x2dbe,
+	0x2dc0, 0x2dc6,
+	0x2dc8, 0x2dce,
+	0x2dd0, 0x2dd6,
+	0x2dd8, 0x2dde,
+	0x2e00, 0x2e17,
+	0x2e1c, 0x2e1d,
 	0x2e80, 0x2e99,
 	0x2e9b, 0x2ef3,
 	0x2f00, 0x2fd5,
@@ -26388,21 +28348,20 @@ static const OnigCodePoint CR_Age_3_2[] = {
 	0x3105, 0x312c,
 	0x3131, 0x318e,
 	0x3190, 0x31b7,
-	0x31f0, 0x321c,
+	0x31c0, 0x31cf,
+	0x31f0, 0x321e,
 	0x3220, 0x3243,
-	0x3251, 0x327b,
-	0x327f, 0x32cb,
-	0x32d0, 0x32fe,
-	0x3300, 0x3376,
-	0x337b, 0x33dd,
-	0x33e0, 0x33fe,
-	0x3400, 0x4db5,
-	0x4e00, 0x9fa5,
+	0x3250, 0x32fe,
+	0x3300, 0x4db5,
+	0x4dc0, 0x9fbb,
 	0xa000, 0xa48c,
 	0xa490, 0xa4c6,
+	0xa700, 0xa716,
+	0xa800, 0xa82b,
 	0xac00, 0xd7a3,
 	0xd800, 0xfa2d,
 	0xfa30, 0xfa6a,
+	0xfa70, 0xfad9,
 	0xfb00, 0xfb06,
 	0xfb13, 0xfb17,
 	0xfb1d, 0xfb36,
@@ -26414,11 +28373,10 @@ static const OnigCodePoint CR_Age_3_2[] = {
 	0xfbd3, 0xfd3f,
 	0xfd50, 0xfd8f,
 	0xfd92, 0xfdc7,
-	0xfdd0, 0xfdfc,
-	0xfe00, 0xfe0f,
+	0xfdd0, 0xfdfd,
+	0xfe00, 0xfe19,
 	0xfe20, 0xfe23,
-	0xfe30, 0xfe46,
-	0xfe49, 0xfe52,
+	0xfe30, 0xfe52,
 	0xfe54, 0xfe66,
 	0xfe68, 0xfe6b,
 	0xfe70, 0xfe74,
@@ -26431,15 +28389,43 @@ static const OnigCodePoint CR_Age_3_2[] = {
 	0xffda, 0xffdc,
 	0xffe0, 0xffe6,
 	0xffe8, 0xffee,
-	0xfff9, 0xffff,
+	0xfff9, 0x1000b,
+	0x1000d, 0x10026,
+	0x10028, 0x1003a,
+	0x1003c, 0x1003d,
+	0x1003f, 0x1004d,
+	0x10050, 0x1005d,
+	0x10080, 0x100fa,
+	0x10100, 0x10102,
+	0x10107, 0x10133,
+	0x10137, 0x1018a,
 	0x10300, 0x1031e,
 	0x10320, 0x10323,
 	0x10330, 0x1034a,
-	0x10400, 0x10425,
-	0x10428, 0x1044d,
+	0x10380, 0x1039d,
+	0x1039f, 0x103c3,
+	0x103c8, 0x103d5,
+	0x10400, 0x1049d,
+	0x104a0, 0x104a9,
+	0x10800, 0x10805,
+	0x10808, 0x10808,
+	0x1080a, 0x10835,
+	0x10837, 0x10838,
+	0x1083c, 0x1083c,
+	0x1083f, 0x1083f,
+	0x10a00, 0x10a03,
+	0x10a05, 0x10a06,
+	0x10a0c, 0x10a13,
+	0x10a15, 0x10a17,
+	0x10a19, 0x10a33,
+	0x10a38, 0x10a3a,
+	0x10a3f, 0x10a47,
+	0x10a50, 0x10a58,
 	0x1d000, 0x1d0f5,
 	0x1d100, 0x1d126,
 	0x1d12a, 0x1d1dd,
+	0x1d200, 0x1d245,
+	0x1d300, 0x1d356,
 	0x1d400, 0x1d454,
 	0x1d456, 0x1d49c,
 	0x1d49e, 0x1d49f,
@@ -26448,8 +28434,7 @@ static const OnigCodePoint CR_Age_3_2[] = {
 	0x1d4a9, 0x1d4ac,
 	0x1d4ae, 0x1d4b9,
 	0x1d4bb, 0x1d4bb,
-	0x1d4bd, 0x1d4c0,
-	0x1d4c2, 0x1d4c3,
+	0x1d4bd, 0x1d4c3,
 	0x1d4c5, 0x1d505,
 	0x1d507, 0x1d50a,
 	0x1d50d, 0x1d514,
@@ -26459,7 +28444,7 @@ static const OnigCodePoint CR_Age_3_2[] = {
 	0x1d540, 0x1d544,
 	0x1d546, 0x1d546,
 	0x1d54a, 0x1d550,
-	0x1d552, 0x1d6a3,
+	0x1d552, 0x1d6a5,
 	0x1d6a8, 0x1d7c9,
 	0x1d7ce, 0x1d7ff,
 	0x1fffe, 0x2a6d6,
@@ -26478,51 +28463,45 @@ static const OnigCodePoint CR_Age_3_2[] = {
 	0xdfffe, 0xdffff,
 	0xe0001, 0xe0001,
 	0xe0020, 0xe007f,
+	0xe0100, 0xe01ef,
 	0xefffe, 0x10ffff,
-}; /* CR_Age_3_2 */
+}; /* CR_Age_4_1 */
 
-/* 'Age_4_0': Derived Age 4.0 */
-static const OnigCodePoint CR_Age_4_0[] = {
-	412,
-	0x0000, 0x0236,
-	0x0250, 0x0357,
-	0x035d, 0x036f,
+/* 'Age_5_0': Derived Age 5.0 */
+static const OnigCodePoint CR_Age_5_0[] = {
+	440,
+	0x0000, 0x036f,
 	0x0374, 0x0375,
-	0x037a, 0x037a,
-	0x037e, 0x037e,
+	0x037a, 0x037e,
 	0x0384, 0x038a,
 	0x038c, 0x038c,
 	0x038e, 0x03a1,
 	0x03a3, 0x03ce,
-	0x03d0, 0x03fb,
-	0x0400, 0x0486,
-	0x0488, 0x04ce,
-	0x04d0, 0x04f5,
-	0x04f8, 0x04f9,
-	0x0500, 0x050f,
+	0x03d0, 0x0486,
+	0x0488, 0x0513,
 	0x0531, 0x0556,
 	0x0559, 0x055f,
 	0x0561, 0x0587,
 	0x0589, 0x058a,
-	0x0591, 0x05a1,
-	0x05a3, 0x05b9,
-	0x05bb, 0x05c4,
+	0x0591, 0x05c7,
 	0x05d0, 0x05ea,
 	0x05f0, 0x05f4,
 	0x0600, 0x0603,
-	0x060c, 0x0615,
+	0x060b, 0x0615,
 	0x061b, 0x061b,
-	0x061f, 0x061f,
+	0x061e, 0x061f,
 	0x0621, 0x063a,
-	0x0640, 0x0658,
+	0x0640, 0x065e,
 	0x0660, 0x070d,
 	0x070f, 0x074a,
-	0x074d, 0x074f,
+	0x074d, 0x076d,
 	0x0780, 0x07b1,
+	0x07c0, 0x07fa,
 	0x0901, 0x0939,
 	0x093c, 0x094d,
 	0x0950, 0x0954,
 	0x0958, 0x0970,
+	0x097b, 0x097f,
 	0x0981, 0x0983,
 	0x0985, 0x098c,
 	0x098f, 0x0990,
@@ -26532,7 +28511,7 @@ static const OnigCodePoint CR_Age_4_0[] = {
 	0x09b6, 0x09b9,
 	0x09bc, 0x09c4,
 	0x09c7, 0x09c8,
-	0x09cb, 0x09cd,
+	0x09cb, 0x09ce,
 	0x09d7, 0x09d7,
 	0x09dc, 0x09dd,
 	0x09df, 0x09e3,
@@ -26589,13 +28568,12 @@ static const OnigCodePoint CR_Age_4_0[] = {
 	0x0b9e, 0x0b9f,
 	0x0ba3, 0x0ba4,
 	0x0ba8, 0x0baa,
-	0x0bae, 0x0bb5,
-	0x0bb7, 0x0bb9,
+	0x0bae, 0x0bb9,
 	0x0bbe, 0x0bc2,
 	0x0bc6, 0x0bc8,
 	0x0bca, 0x0bcd,
 	0x0bd7, 0x0bd7,
-	0x0be7, 0x0bfa,
+	0x0be6, 0x0bfa,
 	0x0c01, 0x0c03,
 	0x0c05, 0x0c0c,
 	0x0c0e, 0x0c10,
@@ -26619,8 +28597,9 @@ static const OnigCodePoint CR_Age_4_0[] = {
 	0x0cca, 0x0ccd,
 	0x0cd5, 0x0cd6,
 	0x0cde, 0x0cde,
-	0x0ce0, 0x0ce1,
+	0x0ce0, 0x0ce3,
 	0x0ce6, 0x0cef,
+	0x0cf1, 0x0cf2,
 	0x0d02, 0x0d03,
 	0x0d05, 0x0d0c,
 	0x0d0e, 0x0d10,
@@ -26669,7 +28648,7 @@ static const OnigCodePoint CR_Age_4_0[] = {
 	0x0f90, 0x0f97,
 	0x0f99, 0x0fbc,
 	0x0fbe, 0x0fcc,
-	0x0fcf, 0x0fcf,
+	0x0fcf, 0x0fd1,
 	0x1000, 0x1021,
 	0x1023, 0x1027,
 	0x1029, 0x102a,
@@ -26677,37 +28656,28 @@ static const OnigCodePoint CR_Age_4_0[] = {
 	0x1036, 0x1039,
 	0x1040, 0x1059,
 	0x10a0, 0x10c5,
-	0x10d0, 0x10f8,
-	0x10fb, 0x10fb,
+	0x10d0, 0x10fc,
 	0x1100, 0x1159,
 	0x115f, 0x11a2,
 	0x11a8, 0x11f9,
-	0x1200, 0x1206,
-	0x1208, 0x1246,
-	0x1248, 0x1248,
+	0x1200, 0x1248,
 	0x124a, 0x124d,
 	0x1250, 0x1256,
 	0x1258, 0x1258,
 	0x125a, 0x125d,
-	0x1260, 0x1286,
-	0x1288, 0x1288,
+	0x1260, 0x1288,
 	0x128a, 0x128d,
-	0x1290, 0x12ae,
-	0x12b0, 0x12b0,
+	0x1290, 0x12b0,
 	0x12b2, 0x12b5,
 	0x12b8, 0x12be,
 	0x12c0, 0x12c0,
 	0x12c2, 0x12c5,
-	0x12c8, 0x12ce,
-	0x12d0, 0x12d6,
-	0x12d8, 0x12ee,
-	0x12f0, 0x130e,
-	0x1310, 0x1310,
+	0x12c8, 0x12d6,
+	0x12d8, 0x1310,
 	0x1312, 0x1315,
-	0x1318, 0x131e,
-	0x1320, 0x1346,
-	0x1348, 0x135a,
-	0x1361, 0x137c,
+	0x1318, 0x135a,
+	0x135f, 0x137c,
+	0x1380, 0x1399,
 	0x13a0, 0x13f4,
 	0x1401, 0x1676,
 	0x1680, 0x169c,
@@ -26732,9 +28702,15 @@ static const OnigCodePoint CR_Age_4_0[] = {
 	0x1940, 0x1940,
 	0x1944, 0x196d,
 	0x1970, 0x1974,
-	0x19e0, 0x19ff,
-	0x1d00, 0x1d6b,
-	0x1e00, 0x1e9b,
+	0x1980, 0x19a9,
+	0x19b0, 0x19c9,
+	0x19d0, 0x19d9,
+	0x19de, 0x1a1b,
+	0x1a1e, 0x1a1f,
+	0x1b00, 0x1b4b,
+	0x1b50, 0x1b7c,
+	0x1d00, 0x1dca,
+	0x1dfe, 0x1e9b,
 	0x1ea0, 0x1ef9,
 	0x1f00, 0x1f15,
 	0x1f18, 0x1f1d,
@@ -26752,23 +28728,19 @@ static const OnigCodePoint CR_Age_4_0[] = {
 	0x1fdd, 0x1fef,
 	0x1ff2, 0x1ff4,
 	0x1ff6, 0x1ffe,
-	0x2000, 0x2054,
-	0x2057, 0x2057,
-	0x205f, 0x2063,
+	0x2000, 0x2063,
 	0x206a, 0x2071,
 	0x2074, 0x208e,
-	0x20a0, 0x20b1,
-	0x20d0, 0x20ea,
-	0x2100, 0x213b,
-	0x213d, 0x214b,
-	0x2153, 0x2183,
-	0x2190, 0x23d0,
+	0x2090, 0x2094,
+	0x20a0, 0x20b5,
+	0x20d0, 0x20ef,
+	0x2100, 0x214e,
+	0x2153, 0x2184,
+	0x2190, 0x23e7,
 	0x2400, 0x2426,
 	0x2440, 0x244a,
-	0x2460, 0x2617,
-	0x2619, 0x267d,
-	0x2680, 0x2691,
-	0x26a0, 0x26a1,
+	0x2460, 0x269c,
+	0x26a0, 0x26b2,
 	0x2701, 0x2704,
 	0x2706, 0x2709,
 	0x270c, 0x2727,
@@ -26780,8 +28752,29 @@ static const OnigCodePoint CR_Age_4_0[] = {
 	0x2761, 0x2794,
 	0x2798, 0x27af,
 	0x27b1, 0x27be,
+	0x27c0, 0x27ca,
 	0x27d0, 0x27eb,
-	0x27f0, 0x2b0d,
+	0x27f0, 0x2b1a,
+	0x2b20, 0x2b23,
+	0x2c00, 0x2c2e,
+	0x2c30, 0x2c5e,
+	0x2c60, 0x2c6c,
+	0x2c74, 0x2c77,
+	0x2c80, 0x2cea,
+	0x2cf9, 0x2d25,
+	0x2d30, 0x2d65,
+	0x2d6f, 0x2d6f,
+	0x2d80, 0x2d96,
+	0x2da0, 0x2da6,
+	0x2da8, 0x2dae,
+	0x2db0, 0x2db6,
+	0x2db8, 0x2dbe,
+	0x2dc0, 0x2dc6,
+	0x2dc8, 0x2dce,
+	0x2dd0, 0x2dd6,
+	0x2dd8, 0x2dde,
+	0x2e00, 0x2e17,
+	0x2e1c, 0x2e1d,
 	0x2e80, 0x2e99,
 	0x2e9b, 0x2ef3,
 	0x2f00, 0x2fd5,
@@ -26792,17 +28785,22 @@ static const OnigCodePoint CR_Age_4_0[] = {
 	0x3105, 0x312c,
 	0x3131, 0x318e,
 	0x3190, 0x31b7,
+	0x31c0, 0x31cf,
 	0x31f0, 0x321e,
 	0x3220, 0x3243,
-	0x3250, 0x327d,
-	0x327f, 0x32fe,
+	0x3250, 0x32fe,
 	0x3300, 0x4db5,
-	0x4dc0, 0x9fa5,
+	0x4dc0, 0x9fbb,
 	0xa000, 0xa48c,
 	0xa490, 0xa4c6,
+	0xa700, 0xa71a,
+	0xa720, 0xa721,
+	0xa800, 0xa82b,
+	0xa840, 0xa877,
 	0xac00, 0xd7a3,
 	0xd800, 0xfa2d,
 	0xfa30, 0xfa6a,
+	0xfa70, 0xfad9,
 	0xfb00, 0xfb06,
 	0xfb13, 0xfb17,
 	0xfb1d, 0xfb36,
@@ -26815,7 +28813,7 @@ static const OnigCodePoint CR_Age_4_0[] = {
 	0xfd50, 0xfd8f,
 	0xfd92, 0xfdc7,
 	0xfdd0, 0xfdfd,
-	0xfe00, 0xfe0f,
+	0xfe00, 0xfe19,
 	0xfe20, 0xfe23,
 	0xfe30, 0xfe52,
 	0xfe54, 0xfe66,
@@ -26839,12 +28837,13 @@ static const OnigCodePoint CR_Age_4_0[] = {
 	0x10080, 0x100fa,
 	0x10100, 0x10102,
 	0x10107, 0x10133,
-	0x10137, 0x1013f,
+	0x10137, 0x1018a,
 	0x10300, 0x1031e,
 	0x10320, 0x10323,
 	0x10330, 0x1034a,
 	0x10380, 0x1039d,
-	0x1039f, 0x1039f,
+	0x1039f, 0x103c3,
+	0x103c8, 0x103d5,
 	0x10400, 0x1049d,
 	0x104a0, 0x104a9,
 	0x10800, 0x10805,
@@ -26853,10 +28852,25 @@ static const OnigCodePoint CR_Age_4_0[] = {
 	0x10837, 0x10838,
 	0x1083c, 0x1083c,
 	0x1083f, 0x1083f,
+	0x10900, 0x10919,
+	0x1091f, 0x1091f,
+	0x10a00, 0x10a03,
+	0x10a05, 0x10a06,
+	0x10a0c, 0x10a13,
+	0x10a15, 0x10a17,
+	0x10a19, 0x10a33,
+	0x10a38, 0x10a3a,
+	0x10a3f, 0x10a47,
+	0x10a50, 0x10a58,
+	0x12000, 0x1236e,
+	0x12400, 0x12462,
+	0x12470, 0x12473,
 	0x1d000, 0x1d0f5,
 	0x1d100, 0x1d126,
 	0x1d12a, 0x1d1dd,
+	0x1d200, 0x1d245,
 	0x1d300, 0x1d356,
+	0x1d360, 0x1d371,
 	0x1d400, 0x1d454,
 	0x1d456, 0x1d49c,
 	0x1d49e, 0x1d49f,
@@ -26875,8 +28889,8 @@ static const OnigCodePoint CR_Age_4_0[] = {
 	0x1d540, 0x1d544,
 	0x1d546, 0x1d546,
 	0x1d54a, 0x1d550,
-	0x1d552, 0x1d6a3,
-	0x1d6a8, 0x1d7c9,
+	0x1d552, 0x1d6a5,
+	0x1d6a8, 0x1d7cb,
 	0x1d7ce, 0x1d7ff,
 	0x1fffe, 0x2a6d6,
 	0x2f800, 0x2fa1d,
@@ -26896,47 +28910,37 @@ static const OnigCodePoint CR_Age_4_0[] = {
 	0xe0020, 0xe007f,
 	0xe0100, 0xe01ef,
 	0xefffe, 0x10ffff,
-}; /* CR_Age_4_0 */
+}; /* CR_Age_5_0 */
 
-/* 'Age_4_1': Derived Age 4.1 */
-static const OnigCodePoint CR_Age_4_1[] = {
-	430,
-	0x0000, 0x0241,
-	0x0250, 0x036f,
-	0x0374, 0x0375,
-	0x037a, 0x037a,
-	0x037e, 0x037e,
+/* 'Age_5_1': Derived Age 5.1 */
+static const OnigCodePoint CR_Age_5_1[] = {
+	455,
+	0x0000, 0x0377,
+	0x037a, 0x037e,
 	0x0384, 0x038a,
 	0x038c, 0x038c,
 	0x038e, 0x03a1,
-	0x03a3, 0x03ce,
-	0x03d0, 0x0486,
-	0x0488, 0x04ce,
-	0x04d0, 0x04f9,
-	0x0500, 0x050f,
+	0x03a3, 0x0523,
 	0x0531, 0x0556,
 	0x0559, 0x055f,
 	0x0561, 0x0587,
 	0x0589, 0x058a,
-	0x0591, 0x05b9,
-	0x05bb, 0x05c7,
+	0x0591, 0x05c7,
 	0x05d0, 0x05ea,
 	0x05f0, 0x05f4,
 	0x0600, 0x0603,
-	0x060b, 0x0615,
-	0x061b, 0x061b,
+	0x0606, 0x061b,
 	0x061e, 0x061f,
-	0x0621, 0x063a,
-	0x0640, 0x065e,
+	0x0621, 0x065e,
 	0x0660, 0x070d,
 	0x070f, 0x074a,
-	0x074d, 0x076d,
-	0x0780, 0x07b1,
+	0x074d, 0x07b1,
+	0x07c0, 0x07fa,
 	0x0901, 0x0939,
 	0x093c, 0x094d,
 	0x0950, 0x0954,
-	0x0958, 0x0970,
-	0x097d, 0x097d,
+	0x0958, 0x0972,
+	0x097b, 0x097f,
 	0x0981, 0x0983,
 	0x0985, 0x098c,
 	0x098f, 0x0990,
@@ -26963,9 +28967,10 @@ static const OnigCodePoint CR_Age_4_1[] = {
 	0x0a3e, 0x0a42,
 	0x0a47, 0x0a48,
 	0x0a4b, 0x0a4d,
+	0x0a51, 0x0a51,
 	0x0a59, 0x0a5c,
 	0x0a5e, 0x0a5e,
-	0x0a66, 0x0a74,
+	0x0a66, 0x0a75,
 	0x0a81, 0x0a83,
 	0x0a85, 0x0a8d,
 	0x0a8f, 0x0a91,
@@ -26987,12 +28992,12 @@ static const OnigCodePoint CR_Age_4_1[] = {
 	0x0b2a, 0x0b30,
 	0x0b32, 0x0b33,
 	0x0b35, 0x0b39,
-	0x0b3c, 0x0b43,
+	0x0b3c, 0x0b44,
 	0x0b47, 0x0b48,
 	0x0b4b, 0x0b4d,
 	0x0b56, 0x0b57,
 	0x0b5c, 0x0b5d,
-	0x0b5f, 0x0b61,
+	0x0b5f, 0x0b63,
 	0x0b66, 0x0b71,
 	0x0b82, 0x0b83,
 	0x0b85, 0x0b8a,
@@ -27007,6 +29012,7 @@ static const OnigCodePoint CR_Age_4_1[] = {
 	0x0bbe, 0x0bc2,
 	0x0bc6, 0x0bc8,
 	0x0bca, 0x0bcd,
+	0x0bd0, 0x0bd0,
 	0x0bd7, 0x0bd7,
 	0x0be6, 0x0bfa,
 	0x0c01, 0x0c03,
@@ -27015,12 +29021,14 @@ static const OnigCodePoint CR_Age_4_1[] = {
 	0x0c12, 0x0c28,
 	0x0c2a, 0x0c33,
 	0x0c35, 0x0c39,
-	0x0c3e, 0x0c44,
+	0x0c3d, 0x0c44,
 	0x0c46, 0x0c48,
 	0x0c4a, 0x0c4d,
 	0x0c55, 0x0c56,
-	0x0c60, 0x0c61,
+	0x0c58, 0x0c59,
+	0x0c60, 0x0c63,
 	0x0c66, 0x0c6f,
+	0x0c78, 0x0c7f,
 	0x0c82, 0x0c83,
 	0x0c85, 0x0c8c,
 	0x0c8e, 0x0c90,
@@ -27032,19 +29040,21 @@ static const OnigCodePoint CR_Age_4_1[] = {
 	0x0cca, 0x0ccd,
 	0x0cd5, 0x0cd6,
 	0x0cde, 0x0cde,
-	0x0ce0, 0x0ce1,
+	0x0ce0, 0x0ce3,
 	0x0ce6, 0x0cef,
+	0x0cf1, 0x0cf2,
 	0x0d02, 0x0d03,
 	0x0d05, 0x0d0c,
 	0x0d0e, 0x0d10,
 	0x0d12, 0x0d28,
 	0x0d2a, 0x0d39,
-	0x0d3e, 0x0d43,
+	0x0d3d, 0x0d44,
 	0x0d46, 0x0d48,
 	0x0d4a, 0x0d4d,
 	0x0d57, 0x0d57,
-	0x0d60, 0x0d61,
-	0x0d66, 0x0d6f,
+	0x0d60, 0x0d63,
+	0x0d66, 0x0d75,
+	0x0d79, 0x0d7f,
 	0x0d82, 0x0d83,
 	0x0d85, 0x0d96,
 	0x0d9a, 0x0db1,
@@ -27077,19 +29087,14 @@ static const OnigCodePoint CR_Age_4_1[] = {
 	0x0ed0, 0x0ed9,
 	0x0edc, 0x0edd,
 	0x0f00, 0x0f47,
-	0x0f49, 0x0f6a,
+	0x0f49, 0x0f6c,
 	0x0f71, 0x0f8b,
 	0x0f90, 0x0f97,
 	0x0f99, 0x0fbc,
 	0x0fbe, 0x0fcc,
-	0x0fcf, 0x0fd1,
-	0x1000, 0x1021,
-	0x1023, 0x1027,
-	0x1029, 0x102a,
-	0x102c, 0x1032,
-	0x1036, 0x1039,
-	0x1040, 0x1059,
-	0x10a0, 0x10c5,
+	0x0fce, 0x0fd4,
+	0x1000, 0x1099,
+	0x109e, 0x10c5,
 	0x10d0, 0x10fc,
 	0x1100, 0x1159,
 	0x115f, 0x11a2,
@@ -27129,7 +29134,7 @@ static const OnigCodePoint CR_Age_4_1[] = {
 	0x1800, 0x180e,
 	0x1810, 0x1819,
 	0x1820, 0x1877,
-	0x1880, 0x18a9,
+	0x1880, 0x18aa,
 	0x1900, 0x191c,
 	0x1920, 0x192b,
 	0x1930, 0x193b,
@@ -27141,10 +29146,15 @@ static const OnigCodePoint CR_Age_4_1[] = {
 	0x19d0, 0x19d9,
 	0x19de, 0x1a1b,
 	0x1a1e, 0x1a1f,
-	0x1d00, 0x1dc3,
-	0x1e00, 0x1e9b,
-	0x1ea0, 0x1ef9,
-	0x1f00, 0x1f15,
+	0x1b00, 0x1b4b,
+	0x1b50, 0x1b7c,
+	0x1b80, 0x1baa,
+	0x1bae, 0x1bb9,
+	0x1c00, 0x1c37,
+	0x1c3b, 0x1c49,
+	0x1c4d, 0x1c7f,
+	0x1d00, 0x1de6,
+	0x1dfe, 0x1f15,
 	0x1f18, 0x1f1d,
 	0x1f20, 0x1f45,
 	0x1f48, 0x1f4d,
@@ -27160,19 +29170,20 @@ static const OnigCodePoint CR_Age_4_1[] = {
 	0x1fdd, 0x1fef,
 	0x1ff2, 0x1ff4,
 	0x1ff6, 0x1ffe,
-	0x2000, 0x2063,
+	0x2000, 0x2064,
 	0x206a, 0x2071,
 	0x2074, 0x208e,
 	0x2090, 0x2094,
 	0x20a0, 0x20b5,
-	0x20d0, 0x20eb,
-	0x2100, 0x214c,
-	0x2153, 0x2183,
-	0x2190, 0x23db,
+	0x20d0, 0x20f0,
+	0x2100, 0x214f,
+	0x2153, 0x2188,
+	0x2190, 0x23e7,
 	0x2400, 0x2426,
 	0x2440, 0x244a,
-	0x2460, 0x269c,
-	0x26a0, 0x26b1,
+	0x2460, 0x269d,
+	0x26a0, 0x26bc,
+	0x26c0, 0x26c3,
 	0x2701, 0x2704,
 	0x2706, 0x2709,
 	0x270c, 0x2727,
@@ -27184,11 +29195,14 @@ static const OnigCodePoint CR_Age_4_1[] = {
 	0x2761, 0x2794,
 	0x2798, 0x27af,
 	0x27b1, 0x27be,
-	0x27c0, 0x27c6,
-	0x27d0, 0x27eb,
-	0x27f0, 0x2b13,
+	0x27c0, 0x27ca,
+	0x27cc, 0x27cc,
+	0x27d0, 0x2b4c,
+	0x2b50, 0x2b54,
 	0x2c00, 0x2c2e,
 	0x2c30, 0x2c5e,
+	0x2c60, 0x2c6f,
+	0x2c71, 0x2c7d,
 	0x2c80, 0x2cea,
 	0x2cf9, 0x2d25,
 	0x2d30, 0x2d65,
@@ -27202,8 +29216,7 @@ static const OnigCodePoint CR_Age_4_1[] = {
 	0x2dc8, 0x2dce,
 	0x2dd0, 0x2dd6,
 	0x2dd8, 0x2dde,
-	0x2e00, 0x2e17,
-	0x2e1c, 0x2e1d,
+	0x2de0, 0x2e30,
 	0x2e80, 0x2e99,
 	0x2e9b, 0x2ef3,
 	0x2f00, 0x2fd5,
@@ -27211,19 +29224,32 @@ static const OnigCodePoint CR_Age_4_1[] = {
 	0x3000, 0x303f,
 	0x3041, 0x3096,
 	0x3099, 0x30ff,
-	0x3105, 0x312c,
+	0x3105, 0x312d,
 	0x3131, 0x318e,
 	0x3190, 0x31b7,
-	0x31c0, 0x31cf,
+	0x31c0, 0x31e3,
 	0x31f0, 0x321e,
 	0x3220, 0x3243,
 	0x3250, 0x32fe,
 	0x3300, 0x4db5,
-	0x4dc0, 0x9fbb,
+	0x4dc0, 0x9fc3,
 	0xa000, 0xa48c,
 	0xa490, 0xa4c6,
-	0xa700, 0xa716,
-	0xa800, 0xa82b,
+	0xa500, 0xa62b,
+	0xa640, 0xa65f,
+	0xa662, 0xa673,
+	0xa67c, 0xa697,
+	0xa700, 0xa78c,
+	0xa7fb, 0xa82b,
+	0xa840, 0xa877,
+	0xa880, 0xa8c4,
+	0xa8ce, 0xa8d9,
+	0xa900, 0xa953,
+	0xa95f, 0xa95f,
+	0xaa00, 0xaa36,
+	0xaa40, 0xaa4d,
+	0xaa50, 0xaa59,
+	0xaa5c, 0xaa5f,
 	0xac00, 0xd7a3,
 	0xd800, 0xfa2d,
 	0xfa30, 0xfa6a,
@@ -27241,7 +29267,7 @@ static const OnigCodePoint CR_Age_4_1[] = {
 	0xfd92, 0xfdc7,
 	0xfdd0, 0xfdfd,
 	0xfe00, 0xfe19,
-	0xfe20, 0xfe23,
+	0xfe20, 0xfe26,
 	0xfe30, 0xfe52,
 	0xfe54, 0xfe66,
 	0xfe68, 0xfe6b,
@@ -27265,6 +29291,10 @@ static const OnigCodePoint CR_Age_4_1[] = {
 	0x10100, 0x10102,
 	0x10107, 0x10133,
 	0x10137, 0x1018a,
+	0x10190, 0x1019b,
+	0x101d0, 0x101fd,
+	0x10280, 0x1029c,
+	0x102a0, 0x102d0,
 	0x10300, 0x1031e,
 	0x10320, 0x10323,
 	0x10330, 0x1034a,
@@ -27279,6 +29309,9 @@ static const OnigCodePoint CR_Age_4_1[] = {
 	0x10837, 0x10838,
 	0x1083c, 0x1083c,
 	0x1083f, 0x1083f,
+	0x10900, 0x10919,
+	0x1091f, 0x10939,
+	0x1093f, 0x1093f,
 	0x10a00, 0x10a03,
 	0x10a05, 0x10a06,
 	0x10a0c, 0x10a13,
@@ -27287,11 +29320,15 @@ static const OnigCodePoint CR_Age_4_1[] = {
 	0x10a38, 0x10a3a,
 	0x10a3f, 0x10a47,
 	0x10a50, 0x10a58,
+	0x12000, 0x1236e,
+	0x12400, 0x12462,
+	0x12470, 0x12473,
 	0x1d000, 0x1d0f5,
 	0x1d100, 0x1d126,
-	0x1d12a, 0x1d1dd,
+	0x1d129, 0x1d1dd,
 	0x1d200, 0x1d245,
 	0x1d300, 0x1d356,
+	0x1d360, 0x1d371,
 	0x1d400, 0x1d454,
 	0x1d456, 0x1d49c,
 	0x1d49e, 0x1d49f,
@@ -27311,8 +29348,10 @@ static const OnigCodePoint CR_Age_4_1[] = {
 	0x1d546, 0x1d546,
 	0x1d54a, 0x1d550,
 	0x1d552, 0x1d6a5,
-	0x1d6a8, 0x1d7c9,
+	0x1d6a8, 0x1d7cb,
 	0x1d7ce, 0x1d7ff,
+	0x1f000, 0x1f02b,
+	0x1f030, 0x1f093,
 	0x1fffe, 0x2a6d6,
 	0x2f800, 0x2fa1d,
 	0x2fffe, 0x2ffff,
@@ -27331,20 +29370,17 @@ static const OnigCodePoint CR_Age_4_1[] = {
 	0xe0020, 0xe007f,
 	0xe0100, 0xe01ef,
 	0xefffe, 0x10ffff,
-}; /* CR_Age_4_1 */
+}; /* CR_Age_5_1 */
 
-/* 'Age_5_0': Derived Age 5.0 */
-static const OnigCodePoint CR_Age_5_0[] = {
-	440,
-	0x0000, 0x036f,
-	0x0374, 0x0375,
+/* 'Age_5_2': Derived Age 5.2 */
+static const OnigCodePoint CR_Age_5_2[] = {
+	495,
+	0x0000, 0x0377,
 	0x037a, 0x037e,
 	0x0384, 0x038a,
 	0x038c, 0x038c,
 	0x038e, 0x03a1,
-	0x03a3, 0x03ce,
-	0x03d0, 0x0486,
-	0x0488, 0x0513,
+	0x03a3, 0x0525,
 	0x0531, 0x0556,
 	0x0559, 0x055f,
 	0x0561, 0x0587,
@@ -27353,21 +29389,20 @@ static const OnigCodePoint CR_Age_5_0[] = {
 	0x05d0, 0x05ea,
 	0x05f0, 0x05f4,
 	0x0600, 0x0603,
-	0x060b, 0x0615,
-	0x061b, 0x061b,
+	0x0606, 0x061b,
 	0x061e, 0x061f,
-	0x0621, 0x063a,
-	0x0640, 0x065e,
+	0x0621, 0x065e,
 	0x0660, 0x070d,
 	0x070f, 0x074a,
-	0x074d, 0x076d,
-	0x0780, 0x07b1,
+	0x074d, 0x07b1,
 	0x07c0, 0x07fa,
-	0x0901, 0x0939,
-	0x093c, 0x094d,
-	0x0950, 0x0954,
-	0x0958, 0x0970,
-	0x097b, 0x097f,
+	0x0800, 0x082d,
+	0x0830, 0x083e,
+	0x0900, 0x0939,
+	0x093c, 0x094e,
+	0x0950, 0x0955,
+	0x0958, 0x0972,
+	0x0979, 0x097f,
 	0x0981, 0x0983,
 	0x0985, 0x098c,
 	0x098f, 0x0990,
@@ -27381,7 +29416,7 @@ static const OnigCodePoint CR_Age_5_0[] = {
 	0x09d7, 0x09d7,
 	0x09dc, 0x09dd,
 	0x09df, 0x09e3,
-	0x09e6, 0x09fa,
+	0x09e6, 0x09fb,
 	0x0a01, 0x0a03,
 	0x0a05, 0x0a0a,
 	0x0a0f, 0x0a10,
@@ -27394,9 +29429,10 @@ static const OnigCodePoint CR_Age_5_0[] = {
 	0x0a3e, 0x0a42,
 	0x0a47, 0x0a48,
 	0x0a4b, 0x0a4d,
+	0x0a51, 0x0a51,
 	0x0a59, 0x0a5c,
 	0x0a5e, 0x0a5e,
-	0x0a66, 0x0a74,
+	0x0a66, 0x0a75,
 	0x0a81, 0x0a83,
 	0x0a85, 0x0a8d,
 	0x0a8f, 0x0a91,
@@ -27418,12 +29454,12 @@ static const OnigCodePoint CR_Age_5_0[] = {
 	0x0b2a, 0x0b30,
 	0x0b32, 0x0b33,
 	0x0b35, 0x0b39,
-	0x0b3c, 0x0b43,
+	0x0b3c, 0x0b44,
 	0x0b47, 0x0b48,
 	0x0b4b, 0x0b4d,
 	0x0b56, 0x0b57,
 	0x0b5c, 0x0b5d,
-	0x0b5f, 0x0b61,
+	0x0b5f, 0x0b63,
 	0x0b66, 0x0b71,
 	0x0b82, 0x0b83,
 	0x0b85, 0x0b8a,
@@ -27438,6 +29474,7 @@ static const OnigCodePoint CR_Age_5_0[] = {
 	0x0bbe, 0x0bc2,
 	0x0bc6, 0x0bc8,
 	0x0bca, 0x0bcd,
+	0x0bd0, 0x0bd0,
 	0x0bd7, 0x0bd7,
 	0x0be6, 0x0bfa,
 	0x0c01, 0x0c03,
@@ -27446,12 +29483,14 @@ static const OnigCodePoint CR_Age_5_0[] = {
 	0x0c12, 0x0c28,
 	0x0c2a, 0x0c33,
 	0x0c35, 0x0c39,
-	0x0c3e, 0x0c44,
+	0x0c3d, 0x0c44,
 	0x0c46, 0x0c48,
 	0x0c4a, 0x0c4d,
 	0x0c55, 0x0c56,
-	0x0c60, 0x0c61,
+	0x0c58, 0x0c59,
+	0x0c60, 0x0c63,
 	0x0c66, 0x0c6f,
+	0x0c78, 0x0c7f,
 	0x0c82, 0x0c83,
 	0x0c85, 0x0c8c,
 	0x0c8e, 0x0c90,
@@ -27471,12 +29510,13 @@ static const OnigCodePoint CR_Age_5_0[] = {
 	0x0d0e, 0x0d10,
 	0x0d12, 0x0d28,
 	0x0d2a, 0x0d39,
-	0x0d3e, 0x0d43,
+	0x0d3d, 0x0d44,
 	0x0d46, 0x0d48,
 	0x0d4a, 0x0d4d,
 	0x0d57, 0x0d57,
-	0x0d60, 0x0d61,
-	0x0d66, 0x0d6f,
+	0x0d60, 0x0d63,
+	0x0d66, 0x0d75,
+	0x0d79, 0x0d7f,
 	0x0d82, 0x0d83,
 	0x0d85, 0x0d96,
 	0x0d9a, 0x0db1,
@@ -27509,24 +29549,15 @@ static const OnigCodePoint CR_Age_5_0[] = {
 	0x0ed0, 0x0ed9,
 	0x0edc, 0x0edd,
 	0x0f00, 0x0f47,
-	0x0f49, 0x0f6a,
+	0x0f49, 0x0f6c,
 	0x0f71, 0x0f8b,
 	0x0f90, 0x0f97,
 	0x0f99, 0x0fbc,
 	0x0fbe, 0x0fcc,
-	0x0fcf, 0x0fd1,
-	0x1000, 0x1021,
-	0x1023, 0x1027,
-	0x1029, 0x102a,
-	0x102c, 0x1032,
-	0x1036, 0x1039,
-	0x1040, 0x1059,
-	0x10a0, 0x10c5,
+	0x0fce, 0x0fd8,
+	0x1000, 0x10c5,
 	0x10d0, 0x10fc,
-	0x1100, 0x1159,
-	0x115f, 0x11a2,
-	0x11a8, 0x11f9,
-	0x1200, 0x1248,
+	0x1100, 0x1248,
 	0x124a, 0x124d,
 	0x1250, 0x1256,
 	0x1258, 0x1258,
@@ -27545,8 +29576,7 @@ static const OnigCodePoint CR_Age_5_0[] = {
 	0x135f, 0x137c,
 	0x1380, 0x1399,
 	0x13a0, 0x13f4,
-	0x1401, 0x1676,
-	0x1680, 0x169c,
+	0x1400, 0x169c,
 	0x16a0, 0x16f0,
 	0x1700, 0x170c,
 	0x170e, 0x1714,
@@ -27561,24 +29591,33 @@ static const OnigCodePoint CR_Age_5_0[] = {
 	0x1800, 0x180e,
 	0x1810, 0x1819,
 	0x1820, 0x1877,
-	0x1880, 0x18a9,
+	0x1880, 0x18aa,
+	0x18b0, 0x18f5,
 	0x1900, 0x191c,
 	0x1920, 0x192b,
 	0x1930, 0x193b,
 	0x1940, 0x1940,
 	0x1944, 0x196d,
 	0x1970, 0x1974,
-	0x1980, 0x19a9,
+	0x1980, 0x19ab,
 	0x19b0, 0x19c9,
-	0x19d0, 0x19d9,
+	0x19d0, 0x19da,
 	0x19de, 0x1a1b,
-	0x1a1e, 0x1a1f,
+	0x1a1e, 0x1a5e,
+	0x1a60, 0x1a7c,
+	0x1a7f, 0x1a89,
+	0x1a90, 0x1a99,
+	0x1aa0, 0x1aad,
 	0x1b00, 0x1b4b,
 	0x1b50, 0x1b7c,
-	0x1d00, 0x1dca,
-	0x1dfe, 0x1e9b,
-	0x1ea0, 0x1ef9,
-	0x1f00, 0x1f15,
+	0x1b80, 0x1baa,
+	0x1bae, 0x1bb9,
+	0x1c00, 0x1c37,
+	0x1c3b, 0x1c49,
+	0x1c4d, 0x1c7f,
+	0x1cd0, 0x1cf2,
+	0x1d00, 0x1de6,
+	0x1dfd, 0x1f15,
 	0x1f18, 0x1f1d,
 	0x1f20, 0x1f45,
 	0x1f48, 0x1f4d,
@@ -27594,39 +29633,37 @@ static const OnigCodePoint CR_Age_5_0[] = {
 	0x1fdd, 0x1fef,
 	0x1ff2, 0x1ff4,
 	0x1ff6, 0x1ffe,
-	0x2000, 0x2063,
+	0x2000, 0x2064,
 	0x206a, 0x2071,
 	0x2074, 0x208e,
 	0x2090, 0x2094,
-	0x20a0, 0x20b5,
-	0x20d0, 0x20ef,
-	0x2100, 0x214e,
-	0x2153, 0x2184,
-	0x2190, 0x23e7,
+	0x20a0, 0x20b8,
+	0x20d0, 0x20f0,
+	0x2100, 0x2189,
+	0x2190, 0x23e8,
 	0x2400, 0x2426,
 	0x2440, 0x244a,
-	0x2460, 0x269c,
-	0x26a0, 0x26b2,
+	0x2460, 0x26cd,
+	0x26cf, 0x26e1,
+	0x26e3, 0x26e3,
+	0x26e8, 0x26ff,
 	0x2701, 0x2704,
 	0x2706, 0x2709,
 	0x270c, 0x2727,
 	0x2729, 0x274b,
 	0x274d, 0x274d,
 	0x274f, 0x2752,
-	0x2756, 0x2756,
-	0x2758, 0x275e,
+	0x2756, 0x275e,
 	0x2761, 0x2794,
 	0x2798, 0x27af,
 	0x27b1, 0x27be,
 	0x27c0, 0x27ca,
-	0x27d0, 0x27eb,
-	0x27f0, 0x2b1a,
-	0x2b20, 0x2b23,
+	0x27cc, 0x27cc,
+	0x27d0, 0x2b4c,
+	0x2b50, 0x2b59,
 	0x2c00, 0x2c2e,
 	0x2c30, 0x2c5e,
-	0x2c60, 0x2c6c,
-	0x2c74, 0x2c77,
-	0x2c80, 0x2cea,
+	0x2c60, 0x2cf1,
 	0x2cf9, 0x2d25,
 	0x2d30, 0x2d65,
 	0x2d6f, 0x2d6f,
@@ -27639,8 +29676,7 @@ static const OnigCodePoint CR_Age_5_0[] = {
 	0x2dc8, 0x2dce,
 	0x2dd0, 0x2dd6,
 	0x2dd8, 0x2dde,
-	0x2e00, 0x2e17,
-	0x2e1c, 0x2e1d,
+	0x2de0, 0x2e31,
 	0x2e80, 0x2e99,
 	0x2e9b, 0x2ef3,
 	0x2f00, 0x2fd5,
@@ -27648,24 +29684,46 @@ static const OnigCodePoint CR_Age_5_0[] = {
 	0x3000, 0x303f,
 	0x3041, 0x3096,
 	0x3099, 0x30ff,
-	0x3105, 0x312c,
+	0x3105, 0x312d,
 	0x3131, 0x318e,
 	0x3190, 0x31b7,
-	0x31c0, 0x31cf,
+	0x31c0, 0x31e3,
 	0x31f0, 0x321e,
-	0x3220, 0x3243,
-	0x3250, 0x32fe,
+	0x3220, 0x32fe,
 	0x3300, 0x4db5,
-	0x4dc0, 0x9fbb,
+	0x4dc0, 0x9fcb,
 	0xa000, 0xa48c,
 	0xa490, 0xa4c6,
-	0xa700, 0xa71a,
-	0xa720, 0xa721,
-	0xa800, 0xa82b,
+	0xa4d0, 0xa62b,
+	0xa640, 0xa65f,
+	0xa662, 0xa673,
+	0xa67c, 0xa697,
+	0xa6a0, 0xa6f7,
+	0xa700, 0xa78c,
+	0xa7fb, 0xa82b,
+	0xa830, 0xa839,
 	0xa840, 0xa877,
+	0xa880, 0xa8c4,
+	0xa8ce, 0xa8d9,
+	0xa8e0, 0xa8fb,
+	0xa900, 0xa953,
+	0xa95f, 0xa97c,
+	0xa980, 0xa9cd,
+	0xa9cf, 0xa9d9,
+	0xa9de, 0xa9df,
+	0xaa00, 0xaa36,
+	0xaa40, 0xaa4d,
+	0xaa50, 0xaa59,
+	0xaa5c, 0xaa7b,
+	0xaa80, 0xaac2,
+	0xaadb, 0xaadf,
+	0xabc0, 0xabed,
+	0xabf0, 0xabf9,
 	0xac00, 0xd7a3,
+	0xd7b0, 0xd7c6,
+	0xd7cb, 0xd7fb,
 	0xd800, 0xfa2d,
-	0xfa30, 0xfa6a,
+	0xfa30, 0xfa6d,
 	0xfa70, 0xfad9,
 	0xfb00, 0xfb06,
 	0xfb13, 0xfb17,
@@ -27680,7 +29738,7 @@ static const OnigCodePoint CR_Age_5_0[] = {
 	0xfd92, 0xfdc7,
 	0xfdd0, 0xfdfd,
 	0xfe00, 0xfe19,
-	0xfe20, 0xfe23,
+	0xfe20, 0xfe26,
 	0xfe30, 0xfe52,
 	0xfe54, 0xfe66,
 	0xfe68, 0xfe6b,
@@ -27704,6 +29762,10 @@ static const OnigCodePoint CR_Age_5_0[] = {
 	0x10100, 0x10102,
 	0x10107, 0x10133,
 	0x10137, 0x1018a,
+	0x10190, 0x1019b,
+	0x101d0, 0x101fd,
+	0x10280, 0x1029c,
+	0x102a0, 0x102d0,
 	0x10300, 0x1031e,
 	0x10320, 0x10323,
 	0x10330, 0x1034a,
@@ -27717,9 +29779,11 @@ static const OnigCodePoint CR_Age_5_0[] = {
 	0x1080a, 0x10835,
 	0x10837, 0x10838,
 	0x1083c, 0x1083c,
-	0x1083f, 0x1083f,
-	0x10900, 0x10919,
-	0x1091f, 0x1091f,
+	0x1083f, 0x10855,
+	0x10857, 0x1085f,
+	0x10900, 0x1091b,
+	0x1091f, 0x10939,
+	0x1093f, 0x1093f,
 	0x10a00, 0x10a03,
 	0x10a05, 0x10a06,
 	0x10a0c, 0x10a13,
@@ -27728,12 +29792,21 @@ static const OnigCodePoint CR_Age_5_0[] = {
 	0x10a38, 0x10a3a,
 	0x10a3f, 0x10a47,
 	0x10a50, 0x10a58,
+	0x10a60, 0x10a7f,
+	0x10b00, 0x10b35,
+	0x10b39, 0x10b55,
+	0x10b58, 0x10b72,
+	0x10b78, 0x10b7f,
+	0x10c00, 0x10c48,
+	0x10e60, 0x10e7e,
+	0x11080, 0x110c1,
 	0x12000, 0x1236e,
 	0x12400, 0x12462,
 	0x12470, 0x12473,
+	0x13000, 0x1342e,
 	0x1d000, 0x1d0f5,
 	0x1d100, 0x1d126,
-	0x1d12a, 0x1d1dd,
+	0x1d129, 0x1d1dd,
 	0x1d200, 0x1d245,
 	0x1d300, 0x1d356,
 	0x1d360, 0x1d371,
@@ -27758,7 +29831,28 @@ static const OnigCodePoint CR_Age_5_0[] = {
 	0x1d552, 0x1d6a5,
 	0x1d6a8, 0x1d7cb,
 	0x1d7ce, 0x1d7ff,
+	0x1f000, 0x1f02b,
+	0x1f030, 0x1f093,
+	0x1f100, 0x1f10a,
+	0x1f110, 0x1f12e,
+	0x1f131, 0x1f131,
+	0x1f13d, 0x1f13d,
+	0x1f13f, 0x1f13f,
+	0x1f142, 0x1f142,
+	0x1f146, 0x1f146,
+	0x1f14a, 0x1f14e,
+	0x1f157, 0x1f157,
+	0x1f15f, 0x1f15f,
+	0x1f179, 0x1f179,
+	0x1f17b, 0x1f17c,
+	0x1f17f, 0x1f17f,
+	0x1f18a, 0x1f18d,
+	0x1f190, 0x1f190,
+	0x1f200, 0x1f200,
+	0x1f210, 0x1f231,
+	0x1f240, 0x1f248,
 	0x1fffe, 0x2a6d6,
+	0x2a700, 0x2b734,
 	0x2f800, 0x2fa1d,
 	0x2fffe, 0x2ffff,
 	0x3fffe, 0x3ffff,
@@ -27776,17 +29870,17 @@ static const OnigCodePoint CR_Age_5_0[] = {
 	0xe0020, 0xe007f,
 	0xe0100, 0xe01ef,
 	0xefffe, 0x10ffff,
-}; /* CR_Age_5_0 */
+}; /* CR_Age_5_2 */
 
-/* 'Age_5_1': Derived Age 5.1 */
-static const OnigCodePoint CR_Age_5_1[] = {
-	455,
+/* 'Age_6_0': Derived Age 6.0 */
+static const OnigCodePoint CR_Age_6_0[] = {
+	511,
 	0x0000, 0x0377,
 	0x037a, 0x037e,
 	0x0384, 0x038a,
 	0x038c, 0x038c,
 	0x038e, 0x03a1,
-	0x03a3, 0x0523,
+	0x03a3, 0x0527,
 	0x0531, 0x0556,
 	0x0559, 0x055f,
 	0x0561, 0x0587,
@@ -27796,17 +29890,16 @@ static const OnigCodePoint CR_Age_5_1[] = {
 	0x05f0, 0x05f4,
 	0x0600, 0x0603,
 	0x0606, 0x061b,
-	0x061e, 0x061f,
-	0x0621, 0x065e,
-	0x0660, 0x070d,
+	0x061e, 0x070d,
 	0x070f, 0x074a,
 	0x074d, 0x07b1,
 	0x07c0, 0x07fa,
-	0x0901, 0x0939,
-	0x093c, 0x094d,
-	0x0950, 0x0954,
-	0x0958, 0x0972,
-	0x097b, 0x097f,
+	0x0800, 0x082d,
+	0x0830, 0x083e,
+	0x0840, 0x085b,
+	0x085e, 0x085e,
+	0x0900, 0x0977,
+	0x0979, 0x097f,
 	0x0981, 0x0983,
 	0x0985, 0x098c,
 	0x098f, 0x0990,
@@ -27820,7 +29913,7 @@ static const OnigCodePoint CR_Age_5_1[] = {
 	0x09d7, 0x09d7,
 	0x09dc, 0x09dd,
 	0x09df, 0x09e3,
-	0x09e6, 0x09fa,
+	0x09e6, 0x09fb,
 	0x0a01, 0x0a03,
 	0x0a05, 0x0a0a,
 	0x0a0f, 0x0a10,
@@ -27864,7 +29957,7 @@ static const OnigCodePoint CR_Age_5_1[] = {
 	0x0b56, 0x0b57,
 	0x0b5c, 0x0b5d,
 	0x0b5f, 0x0b63,
-	0x0b66, 0x0b71,
+	0x0b66, 0x0b77,
 	0x0b82, 0x0b83,
 	0x0b85, 0x0b8a,
 	0x0b8e, 0x0b90,
@@ -27912,11 +30005,10 @@ static const OnigCodePoint CR_Age_5_1[] = {
 	0x0d02, 0x0d03,
 	0x0d05, 0x0d0c,
 	0x0d0e, 0x0d10,
-	0x0d12, 0x0d28,
-	0x0d2a, 0x0d39,
+	0x0d12, 0x0d3a,
 	0x0d3d, 0x0d44,
 	0x0d46, 0x0d48,
-	0x0d4a, 0x0d4d,
+	0x0d4a, 0x0d4e,
 	0x0d57, 0x0d57,
 	0x0d60, 0x0d63,
 	0x0d66, 0x0d75,
@@ -27954,18 +30046,13 @@ static const OnigCodePoint CR_Age_5_1[] = {
 	0x0edc, 0x0edd,
 	0x0f00, 0x0f47,
 	0x0f49, 0x0f6c,
-	0x0f71, 0x0f8b,
-	0x0f90, 0x0f97,
+	0x0f71, 0x0f97,
 	0x0f99, 0x0fbc,
 	0x0fbe, 0x0fcc,
-	0x0fce, 0x0fd4,
-	0x1000, 0x1099,
-	0x109e, 0x10c5,
+	0x0fce, 0x0fda,
+	0x1000, 0x10c5,
 	0x10d0, 0x10fc,
-	0x1100, 0x1159,
-	0x115f, 0x11a2,
-	0x11a8, 0x11f9,
-	0x1200, 0x1248,
+	0x1100, 0x1248,
 	0x124a, 0x124d,
 	0x1250, 0x1256,
 	0x1258, 0x1258,
@@ -27981,11 +30068,10 @@ static const OnigCodePoint CR_Age_5_1[] = {
 	0x12d8, 0x1310,
 	0x1312, 0x1315,
 	0x1318, 0x135a,
-	0x135f, 0x137c,
+	0x135d, 0x137c,
 	0x1380, 0x1399,
 	0x13a0, 0x13f4,
-	0x1401, 0x1676,
-	0x1680, 0x169c,
+	0x1400, 0x169c,
 	0x16a0, 0x16f0,
 	0x1700, 0x170c,
 	0x170e, 0x1714,
@@ -28001,26 +30087,33 @@ static const OnigCodePoint CR_Age_5_1[] = {
 	0x1810, 0x1819,
 	0x1820, 0x1877,
 	0x1880, 0x18aa,
+	0x18b0, 0x18f5,
 	0x1900, 0x191c,
 	0x1920, 0x192b,
 	0x1930, 0x193b,
 	0x1940, 0x1940,
 	0x1944, 0x196d,
 	0x1970, 0x1974,
-	0x1980, 0x19a9,
+	0x1980, 0x19ab,
 	0x19b0, 0x19c9,
-	0x19d0, 0x19d9,
+	0x19d0, 0x19da,
 	0x19de, 0x1a1b,
-	0x1a1e, 0x1a1f,
+	0x1a1e, 0x1a5e,
+	0x1a60, 0x1a7c,
+	0x1a7f, 0x1a89,
+	0x1a90, 0x1a99,
+	0x1aa0, 0x1aad,
 	0x1b00, 0x1b4b,
 	0x1b50, 0x1b7c,
 	0x1b80, 0x1baa,
 	0x1bae, 0x1bb9,
-	0x1c00, 0x1c37,
+	0x1bc0, 0x1bf3,
+	0x1bfc, 0x1c37,
 	0x1c3b, 0x1c49,
 	0x1c4d, 0x1c7f,
+	0x1cd0, 0x1cf2,
 	0x1d00, 0x1de6,
-	0x1dfe, 0x1f15,
+	0x1dfc, 0x1f15,
 	0x1f18, 0x1f1d,
 	0x1f20, 0x1f45,
 	0x1f48, 0x1f4d,
@@ -28039,41 +30132,25 @@ static const OnigCodePoint CR_Age_5_1[] = {
 	0x2000, 0x2064,
 	0x206a, 0x2071,
 	0x2074, 0x208e,
-	0x2090, 0x2094,
-	0x20a0, 0x20b5,
+	0x2090, 0x209c,
+	0x20a0, 0x20b9,
 	0x20d0, 0x20f0,
-	0x2100, 0x214f,
-	0x2153, 0x2188,
-	0x2190, 0x23e7,
+	0x2100, 0x2189,
+	0x2190, 0x23f3,
 	0x2400, 0x2426,
 	0x2440, 0x244a,
-	0x2460, 0x269d,
-	0x26a0, 0x26bc,
-	0x26c0, 0x26c3,
-	0x2701, 0x2704,
-	0x2706, 0x2709,
-	0x270c, 0x2727,
-	0x2729, 0x274b,
-	0x274d, 0x274d,
-	0x274f, 0x2752,
-	0x2756, 0x2756,
-	0x2758, 0x275e,
-	0x2761, 0x2794,
-	0x2798, 0x27af,
-	0x27b1, 0x27be,
-	0x27c0, 0x27ca,
+	0x2460, 0x26ff,
+	0x2701, 0x27ca,
 	0x27cc, 0x27cc,
-	0x27d0, 0x2b4c,
-	0x2b50, 0x2b54,
+	0x27ce, 0x2b4c,
+	0x2b50, 0x2b59,
 	0x2c00, 0x2c2e,
 	0x2c30, 0x2c5e,
-	0x2c60, 0x2c6f,
-	0x2c71, 0x2c7d,
-	0x2c80, 0x2cea,
+	0x2c60, 0x2cf1,
 	0x2cf9, 0x2d25,
 	0x2d30, 0x2d65,
-	0x2d6f, 0x2d6f,
-	0x2d80, 0x2d96,
+	0x2d6f, 0x2d70,
+	0x2d7f, 0x2d96,
 	0x2da0, 0x2da6,
 	0x2da8, 0x2dae,
 	0x2db0, 0x2db6,
@@ -28082,7 +30159,7 @@ static const OnigCodePoint CR_Age_5_1[] = {
 	0x2dc8, 0x2dce,
 	0x2dd0, 0x2dd6,
 	0x2dd8, 0x2dde,
-	0x2de0, 0x2e30,
+	0x2de0, 0x2e31,
 	0x2e80, 0x2e99,
 	0x2e9b, 0x2ef3,
 	0x2f00, 0x2fd5,
@@ -28092,33 +30169,50 @@ static const OnigCodePoint CR_Age_5_1[] = {
 	0x3099, 0x30ff,
 	0x3105, 0x312d,
 	0x3131, 0x318e,
-	0x3190, 0x31b7,
+	0x3190, 0x31ba,
 	0x31c0, 0x31e3,
 	0x31f0, 0x321e,
-	0x3220, 0x3243,
-	0x3250, 0x32fe,
+	0x3220, 0x32fe,
 	0x3300, 0x4db5,
-	0x4dc0, 0x9fc3,
+	0x4dc0, 0x9fcb,
 	0xa000, 0xa48c,
 	0xa490, 0xa4c6,
-	0xa500, 0xa62b,
-	0xa640, 0xa65f,
-	0xa662, 0xa673,
+	0xa4d0, 0xa62b,
+	0xa640, 0xa673,
 	0xa67c, 0xa697,
-	0xa700, 0xa78c,
-	0xa7fb, 0xa82b,
+	0xa6a0, 0xa6f7,
+	0xa700, 0xa78e,
+	0xa790, 0xa791,
+	0xa7a0, 0xa7a9,
+	0xa7fa, 0xa82b,
+	0xa830, 0xa839,
 	0xa840, 0xa877,
 	0xa880, 0xa8c4,
 	0xa8ce, 0xa8d9,
+	0xa8e0, 0xa8fb,
 	0xa900, 0xa953,
-	0xa95f, 0xa95f,
+	0xa95f, 0xa97c,
+	0xa980, 0xa9cd,
+	0xa9cf, 0xa9d9,
+	0xa9de, 0xa9df,
 	0xaa00, 0xaa36,
 	0xaa40, 0xaa4d,
 	0xaa50, 0xaa59,
-	0xaa5c, 0xaa5f,
+	0xaa5c, 0xaa7b,
+	0xaa80, 0xaac2,
+	0xaadb, 0xaadf,
+	0xab01, 0xab06,
+	0xab09, 0xab0e,
+	0xab11, 0xab16,
+	0xab20, 0xab26,
+	0xab28, 0xab2e,
+	0xabc0, 0xabed,
+	0xabf0, 0xabf9,
 	0xac00, 0xd7a3,
+	0xd7b0, 0xd7c6,
+	0xd7cb, 0xd7fb,
 	0xd800, 0xfa2d,
-	0xfa30, 0xfa6a,
+	0xfa30, 0xfa6d,
 	0xfa70, 0xfad9,
 	0xfb00, 0xfb06,
 	0xfb13, 0xfb17,
@@ -28127,7 +30221,7 @@ static const OnigCodePoint CR_Age_5_1[] = {
 	0xfb3e, 0xfb3e,
 	0xfb40, 0xfb41,
 	0xfb43, 0xfb44,
-	0xfb46, 0xfbb1,
+	0xfb46, 0xfbc1,
 	0xfbd3, 0xfd3f,
 	0xfd50, 0xfd8f,
 	0xfd92, 0xfdc7,
@@ -28174,8 +30268,9 @@ static const OnigCodePoint CR_Age_5_1[] = {
 	0x1080a, 0x10835,
 	0x10837, 0x10838,
 	0x1083c, 0x1083c,
-	0x1083f, 0x1083f,
-	0x10900, 0x10919,
+	0x1083f, 0x10855,
+	0x10857, 0x1085f,
+	0x10900, 0x1091b,
 	0x1091f, 0x10939,
 	0x1093f, 0x1093f,
 	0x10a00, 0x10a03,
@@ -28186,9 +30281,22 @@ static const OnigCodePoint CR_Age_5_1[] = {
 	0x10a38, 0x10a3a,
 	0x10a3f, 0x10a47,
 	0x10a50, 0x10a58,
+	0x10a60, 0x10a7f,
+	0x10b00, 0x10b35,
+	0x10b39, 0x10b55,
+	0x10b58, 0x10b72,
+	0x10b78, 0x10b7f,
+	0x10c00, 0x10c48,
+	0x10e60, 0x10e7e,
+	0x11000, 0x1104d,
+	0x11052, 0x1106f,
+	0x11080, 0x110c1,
 	0x12000, 0x1236e,
 	0x12400, 0x12462,
 	0x12470, 0x12473,
+	0x13000, 0x1342e,
+	0x16800, 0x16a38,
+	0x1b000, 0x1b001,
 	0x1d000, 0x1d0f5,
 	0x1d100, 0x1d126,
 	0x1d129, 0x1d1dd,
@@ -28218,7 +30326,49 @@ static const OnigCodePoint CR_Age_5_1[] = {
 	0x1d7ce, 0x1d7ff,
 	0x1f000, 0x1f02b,
 	0x1f030, 0x1f093,
+	0x1f0a0, 0x1f0ae,
+	0x1f0b1, 0x1f0be,
+	0x1f0c1, 0x1f0cf,
+	0x1f0d1, 0x1f0df,
+	0x1f100, 0x1f10a,
+	0x1f110, 0x1f12e,
+	0x1f130, 0x1f169,
+	0x1f170, 0x1f19a,
+	0x1f1e6, 0x1f202,
+	0x1f210, 0x1f23a,
+	0x1f240, 0x1f248,
+	0x1f250, 0x1f251,
+	0x1f300, 0x1f320,
+	0x1f330, 0x1f335,
+	0x1f337, 0x1f37c,
+	0x1f380, 0x1f393,
+	0x1f3a0, 0x1f3c4,
+	0x1f3c6, 0x1f3ca,
+	0x1f3e0, 0x1f3f0,
+	0x1f400, 0x1f43e,
+	0x1f440, 0x1f440,
+	0x1f442, 0x1f4f7,
+	0x1f4f9, 0x1f4fc,
+	0x1f500, 0x1f53d,
+	0x1f550, 0x1f567,
+	0x1f5fb, 0x1f5ff,
+	0x1f601, 0x1f610,
+	0x1f612, 0x1f614,
+	0x1f616, 0x1f616,
+	0x1f618, 0x1f618,
+	0x1f61a, 0x1f61a,
+	0x1f61c, 0x1f61e,
+	0x1f620, 0x1f625,
+	0x1f628, 0x1f62b,
+	0x1f62d, 0x1f62d,
+	0x1f630, 0x1f633,
+	0x1f635, 0x1f640,
+	0x1f645, 0x1f64f,
+	0x1f680, 0x1f6c5,
+	0x1f700, 0x1f773,
 	0x1fffe, 0x2a6d6,
+	0x2a700, 0x2b734,
+	0x2b740, 0x2b81d,
 	0x2f800, 0x2fa1d,
 	0x2fffe, 0x2ffff,
 	0x3fffe, 0x3ffff,
@@ -28236,38 +30386,39 @@ static const OnigCodePoint CR_Age_5_1[] = {
 	0xe0020, 0xe007f,
 	0xe0100, 0xe01ef,
 	0xefffe, 0x10ffff,
-}; /* CR_Age_5_1 */
+}; /* CR_Age_6_0 */
 
-/* 'Age_5_2': Derived Age 5.2 */
-static const OnigCodePoint CR_Age_5_2[] = {
-	495,
+/* 'Age_6_1': Derived Age 6.1 */
+static const OnigCodePoint CR_Age_6_1[] = {
+	549,
 	0x0000, 0x0377,
 	0x037a, 0x037e,
 	0x0384, 0x038a,
 	0x038c, 0x038c,
 	0x038e, 0x03a1,
-	0x03a3, 0x0525,
+	0x03a3, 0x0527,
 	0x0531, 0x0556,
 	0x0559, 0x055f,
 	0x0561, 0x0587,
 	0x0589, 0x058a,
+	0x058f, 0x058f,
 	0x0591, 0x05c7,
 	0x05d0, 0x05ea,
 	0x05f0, 0x05f4,
-	0x0600, 0x0603,
+	0x0600, 0x0604,
 	0x0606, 0x061b,
-	0x061e, 0x061f,
-	0x0621, 0x065e,
-	0x0660, 0x070d,
+	0x061e, 0x070d,
 	0x070f, 0x074a,
 	0x074d, 0x07b1,
 	0x07c0, 0x07fa,
 	0x0800, 0x082d,
 	0x0830, 0x083e,
-	0x0900, 0x0939,
-	0x093c, 0x094e,
-	0x0950, 0x0955,
-	0x0958, 0x0972,
+	0x0840, 0x085b,
+	0x085e, 0x085e,
+	0x08a0, 0x08a0,
+	0x08a2, 0x08ac,
+	0x08e4, 0x08fe,
+	0x0900, 0x0977,
 	0x0979, 0x097f,
 	0x0981, 0x0983,
 	0x0985, 0x098c,
@@ -28311,8 +30462,7 @@ static const OnigCodePoint CR_Age_5_2[] = {
 	0x0acb, 0x0acd,
 	0x0ad0, 0x0ad0,
 	0x0ae0, 0x0ae3,
-	0x0ae6, 0x0aef,
-	0x0af1, 0x0af1,
+	0x0ae6, 0x0af1,
 	0x0b01, 0x0b03,
 	0x0b05, 0x0b0c,
 	0x0b0f, 0x0b10,
@@ -28326,7 +30476,7 @@ static const OnigCodePoint CR_Age_5_2[] = {
 	0x0b56, 0x0b57,
 	0x0b5c, 0x0b5d,
 	0x0b5f, 0x0b63,
-	0x0b66, 0x0b71,
+	0x0b66, 0x0b77,
 	0x0b82, 0x0b83,
 	0x0b85, 0x0b8a,
 	0x0b8e, 0x0b90,
@@ -28374,11 +30524,10 @@ static const OnigCodePoint CR_Age_5_2[] = {
 	0x0d02, 0x0d03,
 	0x0d05, 0x0d0c,
 	0x0d0e, 0x0d10,
-	0x0d12, 0x0d28,
-	0x0d2a, 0x0d39,
+	0x0d12, 0x0d3a,
 	0x0d3d, 0x0d44,
 	0x0d46, 0x0d48,
-	0x0d4a, 0x0d4d,
+	0x0d4a, 0x0d4e,
 	0x0d57, 0x0d57,
 	0x0d60, 0x0d63,
 	0x0d66, 0x0d75,
@@ -28413,17 +30562,17 @@ static const OnigCodePoint CR_Age_5_2[] = {
 	0x0ec6, 0x0ec6,
 	0x0ec8, 0x0ecd,
 	0x0ed0, 0x0ed9,
-	0x0edc, 0x0edd,
+	0x0edc, 0x0edf,
 	0x0f00, 0x0f47,
 	0x0f49, 0x0f6c,
-	0x0f71, 0x0f8b,
-	0x0f90, 0x0f97,
+	0x0f71, 0x0f97,
 	0x0f99, 0x0fbc,
 	0x0fbe, 0x0fcc,
-	0x0fce, 0x0fd8,
+	0x0fce, 0x0fda,
 	0x1000, 0x10c5,
-	0x10d0, 0x10fc,
-	0x1100, 0x1248,
+	0x10c7, 0x10c7,
+	0x10cd, 0x10cd,
+	0x10d0, 0x1248,
 	0x124a, 0x124d,
 	0x1250, 0x1256,
 	0x1258, 0x1258,
@@ -28439,7 +30588,7 @@ static const OnigCodePoint CR_Age_5_2[] = {
 	0x12d8, 0x1310,
 	0x1312, 0x1315,
 	0x1318, 0x135a,
-	0x135f, 0x137c,
+	0x135d, 0x137c,
 	0x1380, 0x1399,
 	0x13a0, 0x13f4,
 	0x1400, 0x169c,
@@ -28476,14 +30625,14 @@ static const OnigCodePoint CR_Age_5_2[] = {
 	0x1aa0, 0x1aad,
 	0x1b00, 0x1b4b,
 	0x1b50, 0x1b7c,
-	0x1b80, 0x1baa,
-	0x1bae, 0x1bb9,
-	0x1c00, 0x1c37,
+	0x1b80, 0x1bf3,
+	0x1bfc, 0x1c37,
 	0x1c3b, 0x1c49,
 	0x1c4d, 0x1c7f,
-	0x1cd0, 0x1cf2,
+	0x1cc0, 0x1cc7,
+	0x1cd0, 0x1cf6,
 	0x1d00, 0x1de6,
-	0x1dfd, 0x1f15,
+	0x1dfc, 0x1f15,
 	0x1f18, 0x1f1d,
 	0x1f20, 0x1f45,
 	0x1f48, 0x1f4d,
@@ -28502,38 +30651,25 @@ static const OnigCodePoint CR_Age_5_2[] = {
 	0x2000, 0x2064,
 	0x206a, 0x2071,
 	0x2074, 0x208e,
-	0x2090, 0x2094,
-	0x20a0, 0x20b8,
+	0x2090, 0x209c,
+	0x20a0, 0x20b9,
 	0x20d0, 0x20f0,
 	0x2100, 0x2189,
-	0x2190, 0x23e8,
+	0x2190, 0x23f3,
 	0x2400, 0x2426,
 	0x2440, 0x244a,
-	0x2460, 0x26cd,
-	0x26cf, 0x26e1,
-	0x26e3, 0x26e3,
-	0x26e8, 0x26ff,
-	0x2701, 0x2704,
-	0x2706, 0x2709,
-	0x270c, 0x2727,
-	0x2729, 0x274b,
-	0x274d, 0x274d,
-	0x274f, 0x2752,
-	0x2756, 0x275e,
-	0x2761, 0x2794,
-	0x2798, 0x27af,
-	0x27b1, 0x27be,
-	0x27c0, 0x27ca,
-	0x27cc, 0x27cc,
-	0x27d0, 0x2b4c,
+	0x2460, 0x26ff,
+	0x2701, 0x2b4c,
 	0x2b50, 0x2b59,
 	0x2c00, 0x2c2e,
 	0x2c30, 0x2c5e,
-	0x2c60, 0x2cf1,
+	0x2c60, 0x2cf3,
 	0x2cf9, 0x2d25,
-	0x2d30, 0x2d65,
-	0x2d6f, 0x2d6f,
-	0x2d80, 0x2d96,
+	0x2d27, 0x2d27,
+	0x2d2d, 0x2d2d,
+	0x2d30, 0x2d67,
+	0x2d6f, 0x2d70,
+	0x2d7f, 0x2d96,
 	0x2da0, 0x2da6,
 	0x2da8, 0x2dae,
 	0x2db0, 0x2db6,
@@ -28542,7 +30678,7 @@ static const OnigCodePoint CR_Age_5_2[] = {
 	0x2dc8, 0x2dce,
 	0x2dd0, 0x2dd6,
 	0x2dd8, 0x2dde,
-	0x2de0, 0x2e31,
+	0x2de0, 0x2e3b,
 	0x2e80, 0x2e99,
 	0x2e9b, 0x2ef3,
 	0x2f00, 0x2fd5,
@@ -28552,21 +30688,21 @@ static const OnigCodePoint CR_Age_5_2[] = {
 	0x3099, 0x30ff,
 	0x3105, 0x312d,
 	0x3131, 0x318e,
-	0x3190, 0x31b7,
+	0x3190, 0x31ba,
 	0x31c0, 0x31e3,
 	0x31f0, 0x321e,
 	0x3220, 0x32fe,
 	0x3300, 0x4db5,
-	0x4dc0, 0x9fcb,
+	0x4dc0, 0x9fcc,
 	0xa000, 0xa48c,
 	0xa490, 0xa4c6,
 	0xa4d0, 0xa62b,
-	0xa640, 0xa65f,
-	0xa662, 0xa673,
-	0xa67c, 0xa697,
-	0xa6a0, 0xa6f7,
-	0xa700, 0xa78c,
-	0xa7fb, 0xa82b,
+	0xa640, 0xa697,
+	0xa69f, 0xa6f7,
+	0xa700, 0xa78e,
+	0xa790, 0xa793,
+	0xa7a0, 0xa7aa,
+	0xa7f8, 0xa82b,
 	0xa830, 0xa839,
 	0xa840, 0xa877,
 	0xa880, 0xa8c4,
@@ -28582,14 +30718,18 @@ static const OnigCodePoint CR_Age_5_2[] = {
 	0xaa50, 0xaa59,
 	0xaa5c, 0xaa7b,
 	0xaa80, 0xaac2,
-	0xaadb, 0xaadf,
+	0xaadb, 0xaaf6,
+	0xab01, 0xab06,
+	0xab09, 0xab0e,
+	0xab11, 0xab16,
+	0xab20, 0xab26,
+	0xab28, 0xab2e,
 	0xabc0, 0xabed,
 	0xabf0, 0xabf9,
 	0xac00, 0xd7a3,
 	0xd7b0, 0xd7c6,
 	0xd7cb, 0xd7fb,
-	0xd800, 0xfa2d,
-	0xfa30, 0xfa6d,
+	0xd800, 0xfa6d,
 	0xfa70, 0xfad9,
 	0xfb00, 0xfb06,
 	0xfb13, 0xfb17,
@@ -28598,7 +30738,7 @@ static const OnigCodePoint CR_Age_5_2[] = {
 	0xfb3e, 0xfb3e,
 	0xfb40, 0xfb41,
 	0xfb43, 0xfb44,
-	0xfb46, 0xfbb1,
+	0xfb46, 0xfbc1,
 	0xfbd3, 0xfd3f,
 	0xfd50, 0xfd8f,
 	0xfd92, 0xfdc7,
@@ -28650,6 +30790,8 @@ static const OnigCodePoint CR_Age_5_2[] = {
 	0x10900, 0x1091b,
 	0x1091f, 0x10939,
 	0x1093f, 0x1093f,
+	0x10980, 0x109b7,
+	0x109be, 0x109bf,
 	0x10a00, 0x10a03,
 	0x10a05, 0x10a06,
 	0x10a0c, 0x10a13,
@@ -28665,11 +30807,26 @@ static const OnigCodePoint CR_Age_5_2[] = {
 	0x10b78, 0x10b7f,
 	0x10c00, 0x10c48,
 	0x10e60, 0x10e7e,
+	0x11000, 0x1104d,
+	0x11052, 0x1106f,
 	0x11080, 0x110c1,
+	0x110d0, 0x110e8,
+	0x110f0, 0x110f9,
+	0x11100, 0x11134,
+	0x11136, 0x11143,
+	0x11180, 0x111c8,
+	0x111d0, 0x111d9,
+	0x11680, 0x116b7,
+	0x116c0, 0x116c9,
 	0x12000, 0x1236e,
 	0x12400, 0x12462,
 	0x12470, 0x12473,
 	0x13000, 0x1342e,
+	0x16800, 0x16a38,
+	0x16f00, 0x16f44,
+	0x16f50, 0x16f7e,
+	0x16f8f, 0x16f9f,
+	0x1b000, 0x1b001,
 	0x1d000, 0x1d0f5,
 	0x1d100, 0x1d126,
 	0x1d129, 0x1d1dd,
@@ -28697,28 +30854,75 @@ static const OnigCodePoint CR_Age_5_2[] = {
 	0x1d552, 0x1d6a5,
 	0x1d6a8, 0x1d7cb,
 	0x1d7ce, 0x1d7ff,
+	0x1ee00, 0x1ee03,
+	0x1ee05, 0x1ee1f,
+	0x1ee21, 0x1ee22,
+	0x1ee24, 0x1ee24,
+	0x1ee27, 0x1ee27,
+	0x1ee29, 0x1ee32,
+	0x1ee34, 0x1ee37,
+	0x1ee39, 0x1ee39,
+	0x1ee3b, 0x1ee3b,
+	0x1ee42, 0x1ee42,
+	0x1ee47, 0x1ee47,
+	0x1ee49, 0x1ee49,
+	0x1ee4b, 0x1ee4b,
+	0x1ee4d, 0x1ee4f,
+	0x1ee51, 0x1ee52,
+	0x1ee54, 0x1ee54,
+	0x1ee57, 0x1ee57,
+	0x1ee59, 0x1ee59,
+	0x1ee5b, 0x1ee5b,
+	0x1ee5d, 0x1ee5d,
+	0x1ee5f, 0x1ee5f,
+	0x1ee61, 0x1ee62,
+	0x1ee64, 0x1ee64,
+	0x1ee67, 0x1ee6a,
+	0x1ee6c, 0x1ee72,
+	0x1ee74, 0x1ee77,
+	0x1ee79, 0x1ee7c,
+	0x1ee7e, 0x1ee7e,
+	0x1ee80, 0x1ee89,
+	0x1ee8b, 0x1ee9b,
+	0x1eea1, 0x1eea3,
+	0x1eea5, 0x1eea9,
+	0x1eeab, 0x1eebb,
+	0x1eef0, 0x1eef1,
 	0x1f000, 0x1f02b,
 	0x1f030, 0x1f093,
+	0x1f0a0, 0x1f0ae,
+	0x1f0b1, 0x1f0be,
+	0x1f0c1, 0x1f0cf,
+	0x1f0d1, 0x1f0df,
 	0x1f100, 0x1f10a,
 	0x1f110, 0x1f12e,
-	0x1f131, 0x1f131,
-	0x1f13d, 0x1f13d,
-	0x1f13f, 0x1f13f,
-	0x1f142, 0x1f142,
-	0x1f146, 0x1f146,
-	0x1f14a, 0x1f14e,
-	0x1f157, 0x1f157,
-	0x1f15f, 0x1f15f,
-	0x1f179, 0x1f179,
-	0x1f17b, 0x1f17c,
-	0x1f17f, 0x1f17f,
-	0x1f18a, 0x1f18d,
-	0x1f190, 0x1f190,
-	0x1f200, 0x1f200,
-	0x1f210, 0x1f231,
+	0x1f130, 0x1f16b,
+	0x1f170, 0x1f19a,
+	0x1f1e6, 0x1f202,
+	0x1f210, 0x1f23a,
 	0x1f240, 0x1f248,
+	0x1f250, 0x1f251,
+	0x1f300, 0x1f320,
+	0x1f330, 0x1f335,
+	0x1f337, 0x1f37c,
+	0x1f380, 0x1f393,
+	0x1f3a0, 0x1f3c4,
+	0x1f3c6, 0x1f3ca,
+	0x1f3e0, 0x1f3f0,
+	0x1f400, 0x1f43e,
+	0x1f440, 0x1f440,
+	0x1f442, 0x1f4f7,
+	0x1f4f9, 0x1f4fc,
+	0x1f500, 0x1f53d,
+	0x1f540, 0x1f543,
+	0x1f550, 0x1f567,
+	0x1f5fb, 0x1f640,
+	0x1f645, 0x1f64f,
+	0x1f680, 0x1f6c5,
+	0x1f700, 0x1f773,
 	0x1fffe, 0x2a6d6,
 	0x2a700, 0x2b734,
+	0x2b740, 0x2b81d,
 	0x2f800, 0x2fa1d,
 	0x2fffe, 0x2ffff,
 	0x3fffe, 0x3ffff,
@@ -28736,11 +30940,11 @@ static const OnigCodePoint CR_Age_5_2[] = {
 	0xe0020, 0xe007f,
 	0xe0100, 0xe01ef,
 	0xefffe, 0x10ffff,
-}; /* CR_Age_5_2 */
+}; /* CR_Age_6_1 */
 
-/* 'Age_6_0': Derived Age 6.0 */
-static const OnigCodePoint CR_Age_6_0[] = {
-	511,
+/* 'Age_6_2': Derived Age 6.2 */
+static const OnigCodePoint CR_Age_6_2[] = {
+	549,
 	0x0000, 0x0377,
 	0x037a, 0x037e,
 	0x0384, 0x038a,
@@ -28751,10 +30955,11 @@ static const OnigCodePoint CR_Age_6_0[] = {
 	0x0559, 0x055f,
 	0x0561, 0x0587,
 	0x0589, 0x058a,
+	0x058f, 0x058f,
 	0x0591, 0x05c7,
 	0x05d0, 0x05ea,
 	0x05f0, 0x05f4,
-	0x0600, 0x0603,
+	0x0600, 0x0604,
 	0x0606, 0x061b,
 	0x061e, 0x070d,
 	0x070f, 0x074a,
@@ -28764,6 +30969,9 @@ static const OnigCodePoint CR_Age_6_0[] = {
 	0x0830, 0x083e,
 	0x0840, 0x085b,
 	0x085e, 0x085e,
+	0x08a0, 0x08a0,
+	0x08a2, 0x08ac,
+	0x08e4, 0x08fe,
 	0x0900, 0x0977,
 	0x0979, 0x097f,
 	0x0981, 0x0983,
@@ -28808,8 +31016,7 @@ static const OnigCodePoint CR_Age_6_0[] = {
 	0x0acb, 0x0acd,
 	0x0ad0, 0x0ad0,
 	0x0ae0, 0x0ae3,
-	0x0ae6, 0x0aef,
-	0x0af1, 0x0af1,
+	0x0ae6, 0x0af1,
 	0x0b01, 0x0b03,
 	0x0b05, 0x0b0c,
 	0x0b0f, 0x0b10,
@@ -28909,7 +31116,7 @@ static const OnigCodePoint CR_Age_6_0[] = {
 	0x0ec6, 0x0ec6,
 	0x0ec8, 0x0ecd,
 	0x0ed0, 0x0ed9,
-	0x0edc, 0x0edd,
+	0x0edc, 0x0edf,
 	0x0f00, 0x0f47,
 	0x0f49, 0x0f6c,
 	0x0f71, 0x0f97,
@@ -28917,8 +31124,9 @@ static const OnigCodePoint CR_Age_6_0[] = {
 	0x0fbe, 0x0fcc,
 	0x0fce, 0x0fda,
 	0x1000, 0x10c5,
-	0x10d0, 0x10fc,
-	0x1100, 0x1248,
+	0x10c7, 0x10c7,
+	0x10cd, 0x10cd,
+	0x10d0, 0x1248,
 	0x124a, 0x124d,
 	0x1250, 0x1256,
 	0x1258, 0x1258,
@@ -28971,13 +31179,12 @@ static const OnigCodePoint CR_Age_6_0[] = {
 	0x1aa0, 0x1aad,
 	0x1b00, 0x1b4b,
 	0x1b50, 0x1b7c,
-	0x1b80, 0x1baa,
-	0x1bae, 0x1bb9,
-	0x1bc0, 0x1bf3,
+	0x1b80, 0x1bf3,
 	0x1bfc, 0x1c37,
 	0x1c3b, 0x1c49,
 	0x1c4d, 0x1c7f,
-	0x1cd0, 0x1cf2,
+	0x1cc0, 0x1cc7,
+	0x1cd0, 0x1cf6,
 	0x1d00, 0x1de6,
 	0x1dfc, 0x1f15,
 	0x1f18, 0x1f1d,
@@ -28999,22 +31206,22 @@ static const OnigCodePoint CR_Age_6_0[] = {
 	0x206a, 0x2071,
 	0x2074, 0x208e,
 	0x2090, 0x209c,
-	0x20a0, 0x20b9,
+	0x20a0, 0x20ba,
 	0x20d0, 0x20f0,
 	0x2100, 0x2189,
 	0x2190, 0x23f3,
 	0x2400, 0x2426,
 	0x2440, 0x244a,
 	0x2460, 0x26ff,
-	0x2701, 0x27ca,
-	0x27cc, 0x27cc,
-	0x27ce, 0x2b4c,
+	0x2701, 0x2b4c,
 	0x2b50, 0x2b59,
 	0x2c00, 0x2c2e,
 	0x2c30, 0x2c5e,
-	0x2c60, 0x2cf1,
+	0x2c60, 0x2cf3,
 	0x2cf9, 0x2d25,
-	0x2d30, 0x2d65,
+	0x2d27, 0x2d27,
+	0x2d2d, 0x2d2d,
+	0x2d30, 0x2d67,
 	0x2d6f, 0x2d70,
 	0x2d7f, 0x2d96,
 	0x2da0, 0x2da6,
@@ -29025,7 +31232,7 @@ static const OnigCodePoint CR_Age_6_0[] = {
 	0x2dc8, 0x2dce,
 	0x2dd0, 0x2dd6,
 	0x2dd8, 0x2dde,
-	0x2de0, 0x2e31,
+	0x2de0, 0x2e3b,
 	0x2e80, 0x2e99,
 	0x2e9b, 0x2ef3,
 	0x2f00, 0x2fd5,
@@ -29040,17 +31247,16 @@ static const OnigCodePoint CR_Age_6_0[] = {
 	0x31f0, 0x321e,
 	0x3220, 0x32fe,
 	0x3300, 0x4db5,
-	0x4dc0, 0x9fcb,
+	0x4dc0, 0x9fcc,
 	0xa000, 0xa48c,
 	0xa490, 0xa4c6,
 	0xa4d0, 0xa62b,
-	0xa640, 0xa673,
-	0xa67c, 0xa697,
-	0xa6a0, 0xa6f7,
+	0xa640, 0xa697,
+	0xa69f, 0xa6f7,
 	0xa700, 0xa78e,
-	0xa790, 0xa791,
-	0xa7a0, 0xa7a9,
-	0xa7fa, 0xa82b,
+	0xa790, 0xa793,
+	0xa7a0, 0xa7aa,
+	0xa7f8, 0xa82b,
 	0xa830, 0xa839,
 	0xa840, 0xa877,
 	0xa880, 0xa8c4,
@@ -29066,7 +31272,7 @@ static const OnigCodePoint CR_Age_6_0[] = {
 	0xaa50, 0xaa59,
 	0xaa5c, 0xaa7b,
 	0xaa80, 0xaac2,
-	0xaadb, 0xaadf,
+	0xaadb, 0xaaf6,
 	0xab01, 0xab06,
 	0xab09, 0xab0e,
 	0xab11, 0xab16,
@@ -29077,8 +31283,7 @@ static const OnigCodePoint CR_Age_6_0[] = {
 	0xac00, 0xd7a3,
 	0xd7b0, 0xd7c6,
 	0xd7cb, 0xd7fb,
-	0xd800, 0xfa2d,
-	0xfa30, 0xfa6d,
+	0xd800, 0xfa6d,
 	0xfa70, 0xfad9,
 	0xfb00, 0xfb06,
 	0xfb13, 0xfb17,
@@ -29139,6 +31344,8 @@ static const OnigCodePoint CR_Age_6_0[] = {
 	0x10900, 0x1091b,
 	0x1091f, 0x10939,
 	0x1093f, 0x1093f,
+	0x10980, 0x109b7,
+	0x109be, 0x109bf,
 	0x10a00, 0x10a03,
 	0x10a05, 0x10a06,
 	0x10a0c, 0x10a13,
@@ -29157,11 +31364,22 @@ static const OnigCodePoint CR_Age_6_0[] = {
 	0x11000, 0x1104d,
 	0x11052, 0x1106f,
 	0x11080, 0x110c1,
+	0x110d0, 0x110e8,
+	0x110f0, 0x110f9,
+	0x11100, 0x11134,
+	0x11136, 0x11143,
+	0x11180, 0x111c8,
+	0x111d0, 0x111d9,
+	0x11680, 0x116b7,
+	0x116c0, 0x116c9,
 	0x12000, 0x1236e,
 	0x12400, 0x12462,
 	0x12470, 0x12473,
 	0x13000, 0x1342e,
 	0x16800, 0x16a38,
+	0x16f00, 0x16f44,
+	0x16f50, 0x16f7e,
+	0x16f8f, 0x16f9f,
 	0x1b000, 0x1b001,
 	0x1d000, 0x1d0f5,
 	0x1d100, 0x1d126,
@@ -29190,6 +31408,40 @@ static const OnigCodePoint CR_Age_6_0[] = {
 	0x1d552, 0x1d6a5,
 	0x1d6a8, 0x1d7cb,
 	0x1d7ce, 0x1d7ff,
+	0x1ee00, 0x1ee03,
+	0x1ee05, 0x1ee1f,
+	0x1ee21, 0x1ee22,
+	0x1ee24, 0x1ee24,
+	0x1ee27, 0x1ee27,
+	0x1ee29, 0x1ee32,
+	0x1ee34, 0x1ee37,
+	0x1ee39, 0x1ee39,
+	0x1ee3b, 0x1ee3b,
+	0x1ee42, 0x1ee42,
+	0x1ee47, 0x1ee47,
+	0x1ee49, 0x1ee49,
+	0x1ee4b, 0x1ee4b,
+	0x1ee4d, 0x1ee4f,
+	0x1ee51, 0x1ee52,
+	0x1ee54, 0x1ee54,
+	0x1ee57, 0x1ee57,
+	0x1ee59, 0x1ee59,
+	0x1ee5b, 0x1ee5b,
+	0x1ee5d, 0x1ee5d,
+	0x1ee5f, 0x1ee5f,
+	0x1ee61, 0x1ee62,
+	0x1ee64, 0x1ee64,
+	0x1ee67, 0x1ee6a,
+	0x1ee6c, 0x1ee72,
+	0x1ee74, 0x1ee77,
+	0x1ee79, 0x1ee7c,
+	0x1ee7e, 0x1ee7e,
+	0x1ee80, 0x1ee89,
+	0x1ee8b, 0x1ee9b,
+	0x1eea1, 0x1eea3,
+	0x1eea5, 0x1eea9,
+	0x1eeab, 0x1eebb,
+	0x1eef0, 0x1eef1,
 	0x1f000, 0x1f02b,
 	0x1f030, 0x1f093,
 	0x1f0a0, 0x1f0ae,
@@ -29198,7 +31450,7 @@ static const OnigCodePoint CR_Age_6_0[] = {
 	0x1f0d1, 0x1f0df,
 	0x1f100, 0x1f10a,
 	0x1f110, 0x1f12e,
-	0x1f130, 0x1f169,
+	0x1f130, 0x1f16b,
 	0x1f170, 0x1f19a,
 	0x1f1e6, 0x1f202,
 	0x1f210, 0x1f23a,
@@ -29216,19 +31468,9 @@ static const OnigCodePoint CR_Age_6_0[] = {
 	0x1f442, 0x1f4f7,
 	0x1f4f9, 0x1f4fc,
 	0x1f500, 0x1f53d,
+	0x1f540, 0x1f543,
 	0x1f550, 0x1f567,
-	0x1f5fb, 0x1f5ff,
-	0x1f601, 0x1f610,
-	0x1f612, 0x1f614,
-	0x1f616, 0x1f616,
-	0x1f618, 0x1f618,
-	0x1f61a, 0x1f61a,
-	0x1f61c, 0x1f61e,
-	0x1f620, 0x1f625,
-	0x1f628, 0x1f62b,
-	0x1f62d, 0x1f62d,
-	0x1f630, 0x1f633,
-	0x1f635, 0x1f640,
+	0x1f5fb, 0x1f640,
 	0x1f645, 0x1f64f,
 	0x1f680, 0x1f6c5,
 	0x1f700, 0x1f773,
@@ -29252,10 +31494,10 @@ static const OnigCodePoint CR_Age_6_0[] = {
 	0xe0020, 0xe007f,
 	0xe0100, 0xe01ef,
 	0xefffe, 0x10ffff,
-}; /* CR_Age_6_0 */
+}; /* CR_Age_6_2 */
 
-/* 'Age_6_1': Derived Age 6.1 */
-static const OnigCodePoint CR_Age_6_1[] = {
+/* 'Age_6_3': Derived Age 6.3 */
+static const OnigCodePoint CR_Age_6_3[] = {
 	549,
 	0x0000, 0x0377,
 	0x037a, 0x037e,
@@ -29272,7 +31514,7 @@ static const OnigCodePoint CR_Age_6_1[] = {
 	0x05d0, 0x05ea,
 	0x05f0, 0x05f4,
 	0x0600, 0x0604,
-	0x0606, 0x061b,
+	0x0606, 0x061c,
 	0x061e, 0x070d,
 	0x070f, 0x074a,
 	0x074d, 0x07b1,
@@ -29515,10 +31757,10 @@ static const OnigCodePoint CR_Age_6_1[] = {
 	0x1ff2, 0x1ff4,
 	0x1ff6, 0x1ffe,
 	0x2000, 0x2064,
-	0x206a, 0x2071,
+	0x2066, 0x2071,
 	0x2074, 0x208e,
 	0x2090, 0x209c,
-	0x20a0, 0x20b9,
+	0x20a0, 0x20ba,
 	0x20d0, 0x20f0,
 	0x2100, 0x2189,
 	0x2190, 0x23f3,
@@ -29806,27 +32048,26 @@ static const OnigCodePoint CR_Age_6_1[] = {
 	0xe0020, 0xe007f,
 	0xe0100, 0xe01ef,
 	0xefffe, 0x10ffff,
-}; /* CR_Age_6_1 */
+}; /* CR_Age_6_3 */
 
-/* 'Age_6_2': Derived Age 6.2 */
-static const OnigCodePoint CR_Age_6_2[] = {
-	549,
+/* 'Age_7_0': Derived Age 7.0 */
+static const OnigCodePoint CR_Age_7_0[] = {
+	610,
 	0x0000, 0x0377,
-	0x037a, 0x037e,
+	0x037a, 0x037f,
 	0x0384, 0x038a,
 	0x038c, 0x038c,
 	0x038e, 0x03a1,
-	0x03a3, 0x0527,
+	0x03a3, 0x052f,
 	0x0531, 0x0556,
 	0x0559, 0x055f,
 	0x0561, 0x0587,
 	0x0589, 0x058a,
-	0x058f, 0x058f,
+	0x058d, 0x058f,
 	0x0591, 0x05c7,
 	0x05d0, 0x05ea,
 	0x05f0, 0x05f4,
-	0x0600, 0x0604,
-	0x0606, 0x061b,
+	0x0600, 0x061c,
 	0x061e, 0x070d,
 	0x070f, 0x074a,
 	0x074d, 0x07b1,
@@ -29835,12 +32076,8 @@ static const OnigCodePoint CR_Age_6_2[] = {
 	0x0830, 0x083e,
 	0x0840, 0x085b,
 	0x085e, 0x085e,
-	0x08a0, 0x08a0,
-	0x08a2, 0x08ac,
-	0x08e4, 0x08fe,
-	0x0900, 0x0977,
-	0x0979, 0x097f,
-	0x0981, 0x0983,
+	0x08a0, 0x08b2,
+	0x08e4, 0x0983,
 	0x0985, 0x098c,
 	0x098f, 0x0990,
 	0x0993, 0x09a8,
@@ -29913,12 +32150,11 @@ static const OnigCodePoint CR_Age_6_2[] = {
 	0x0bd0, 0x0bd0,
 	0x0bd7, 0x0bd7,
 	0x0be6, 0x0bfa,
-	0x0c01, 0x0c03,
+	0x0c00, 0x0c03,
 	0x0c05, 0x0c0c,
 	0x0c0e, 0x0c10,
 	0x0c12, 0x0c28,
-	0x0c2a, 0x0c33,
-	0x0c35, 0x0c39,
+	0x0c2a, 0x0c39,
 	0x0c3d, 0x0c44,
 	0x0c46, 0x0c48,
 	0x0c4a, 0x0c4d,
@@ -29927,7 +32163,7 @@ static const OnigCodePoint CR_Age_6_2[] = {
 	0x0c60, 0x0c63,
 	0x0c66, 0x0c6f,
 	0x0c78, 0x0c7f,
-	0x0c82, 0x0c83,
+	0x0c81, 0x0c83,
 	0x0c85, 0x0c8c,
 	0x0c8e, 0x0c90,
 	0x0c92, 0x0ca8,
@@ -29941,7 +32177,7 @@ static const OnigCodePoint CR_Age_6_2[] = {
 	0x0ce0, 0x0ce3,
 	0x0ce6, 0x0cef,
 	0x0cf1, 0x0cf2,
-	0x0d02, 0x0d03,
+	0x0d01, 0x0d03,
 	0x0d05, 0x0d0c,
 	0x0d0e, 0x0d10,
 	0x0d12, 0x0d3a,
@@ -29962,6 +32198,7 @@ static const OnigCodePoint CR_Age_6_2[] = {
 	0x0dcf, 0x0dd4,
 	0x0dd6, 0x0dd6,
 	0x0dd8, 0x0ddf,
+	0x0de6, 0x0def,
 	0x0df2, 0x0df4,
 	0x0e01, 0x0e3a,
 	0x0e3f, 0x0e5b,
@@ -30012,7 +32249,7 @@ static const OnigCodePoint CR_Age_6_2[] = {
 	0x1380, 0x1399,
 	0x13a0, 0x13f4,
 	0x1400, 0x169c,
-	0x16a0, 0x16f0,
+	0x16a0, 0x16f8,
 	0x1700, 0x170c,
 	0x170e, 0x1714,
 	0x1720, 0x1736,
@@ -30028,7 +32265,7 @@ static const OnigCodePoint CR_Age_6_2[] = {
 	0x1820, 0x1877,
 	0x1880, 0x18aa,
 	0x18b0, 0x18f5,
-	0x1900, 0x191c,
+	0x1900, 0x191e,
 	0x1920, 0x192b,
 	0x1930, 0x193b,
 	0x1940, 0x1940,
@@ -30043,6 +32280,7 @@ static const OnigCodePoint CR_Age_6_2[] = {
 	0x1a7f, 0x1a89,
 	0x1a90, 0x1a99,
 	0x1aa0, 0x1aad,
+	0x1ab0, 0x1abe,
 	0x1b00, 0x1b4b,
 	0x1b50, 0x1b7c,
 	0x1b80, 0x1bf3,
@@ -30051,7 +32289,8 @@ static const OnigCodePoint CR_Age_6_2[] = {
 	0x1c4d, 0x1c7f,
 	0x1cc0, 0x1cc7,
 	0x1cd0, 0x1cf6,
-	0x1d00, 0x1de6,
+	0x1cf8, 0x1cf9,
+	0x1d00, 0x1df5,
 	0x1dfc, 0x1f15,
 	0x1f18, 0x1f1d,
 	0x1f20, 0x1f45,
@@ -30069,18 +32308,20 @@ static const OnigCodePoint CR_Age_6_2[] = {
 	0x1ff2, 0x1ff4,
 	0x1ff6, 0x1ffe,
 	0x2000, 0x2064,
-	0x206a, 0x2071,
+	0x2066, 0x2071,
 	0x2074, 0x208e,
 	0x2090, 0x209c,
-	0x20a0, 0x20ba,
+	0x20a0, 0x20bd,
 	0x20d0, 0x20f0,
 	0x2100, 0x2189,
-	0x2190, 0x23f3,
+	0x2190, 0x23fa,
 	0x2400, 0x2426,
 	0x2440, 0x244a,
-	0x2460, 0x26ff,
-	0x2701, 0x2b4c,
-	0x2b50, 0x2b59,
+	0x2460, 0x2b73,
+	0x2b76, 0x2b95,
+	0x2b98, 0x2bb9,
+	0x2bbd, 0x2bc8,
+	0x2bca, 0x2bd1,
 	0x2c00, 0x2c2e,
 	0x2c30, 0x2c5e,
 	0x2c60, 0x2cf3,
@@ -30098,7 +32339,7 @@ static const OnigCodePoint CR_Age_6_2[] = {
 	0x2dc8, 0x2dce,
 	0x2dd0, 0x2dd6,
 	0x2dd8, 0x2dde,
-	0x2de0, 0x2e3b,
+	0x2de0, 0x2e42,
 	0x2e80, 0x2e99,
 	0x2e9b, 0x2ef3,
 	0x2f00, 0x2fd5,
@@ -30117,12 +32358,12 @@ static const OnigCodePoint CR_Age_6_2[] = {
 	0xa000, 0xa48c,
 	0xa490, 0xa4c6,
 	0xa4d0, 0xa62b,
-	0xa640, 0xa697,
+	0xa640, 0xa69d,
 	0xa69f, 0xa6f7,
 	0xa700, 0xa78e,
-	0xa790, 0xa793,
-	0xa7a0, 0xa7aa,
-	0xa7f8, 0xa82b,
+	0xa790, 0xa7ad,
+	0xa7b0, 0xa7b1,
+	0xa7f7, 0xa82b,
 	0xa830, 0xa839,
 	0xa840, 0xa877,
 	0xa880, 0xa8c4,
@@ -30132,18 +32373,19 @@ static const OnigCodePoint CR_Age_6_2[] = {
 	0xa95f, 0xa97c,
 	0xa980, 0xa9cd,
 	0xa9cf, 0xa9d9,
-	0xa9de, 0xa9df,
+	0xa9de, 0xa9fe,
 	0xaa00, 0xaa36,
 	0xaa40, 0xaa4d,
 	0xaa50, 0xaa59,
-	0xaa5c, 0xaa7b,
-	0xaa80, 0xaac2,
+	0xaa5c, 0xaac2,
 	0xaadb, 0xaaf6,
 	0xab01, 0xab06,
 	0xab09, 0xab0e,
 	0xab11, 0xab16,
 	0xab20, 0xab26,
 	0xab28, 0xab2e,
+	0xab30, 0xab5f,
+	0xab64, 0xab65,
 	0xabc0, 0xabed,
 	0xabf0, 0xabf9,
 	0xac00, 0xd7a3,
@@ -30164,7 +32406,7 @@ static const OnigCodePoint CR_Age_6_2[] = {
 	0xfd92, 0xfdc7,
 	0xfdd0, 0xfdfd,
 	0xfe00, 0xfe19,
-	0xfe20, 0xfe26,
+	0xfe20, 0xfe2d,
 	0xfe30, 0xfe52,
 	0xfe54, 0xfe66,
 	0xfe68, 0xfe6b,
@@ -30187,26 +32429,35 @@ static const OnigCodePoint CR_Age_6_2[] = {
 	0x10080, 0x100fa,
 	0x10100, 0x10102,
 	0x10107, 0x10133,
-	0x10137, 0x1018a,
+	0x10137, 0x1018c,
 	0x10190, 0x1019b,
+	0x101a0, 0x101a0,
 	0x101d0, 0x101fd,
 	0x10280, 0x1029c,
 	0x102a0, 0x102d0,
-	0x10300, 0x1031e,
-	0x10320, 0x10323,
+	0x102e0, 0x102fb,
+	0x10300, 0x10323,
 	0x10330, 0x1034a,
+	0x10350, 0x1037a,
 	0x10380, 0x1039d,
 	0x1039f, 0x103c3,
 	0x103c8, 0x103d5,
 	0x10400, 0x1049d,
 	0x104a0, 0x104a9,
+	0x10500, 0x10527,
+	0x10530, 0x10563,
+	0x1056f, 0x1056f,
+	0x10600, 0x10736,
+	0x10740, 0x10755,
+	0x10760, 0x10767,
 	0x10800, 0x10805,
 	0x10808, 0x10808,
 	0x1080a, 0x10835,
 	0x10837, 0x10838,
 	0x1083c, 0x1083c,
 	0x1083f, 0x10855,
-	0x10857, 0x1085f,
+	0x10857, 0x1089e,
+	0x108a7, 0x108af,
 	0x10900, 0x1091b,
 	0x1091f, 0x10939,
 	0x1093f, 0x1093f,
@@ -30220,33 +32471,82 @@ static const OnigCodePoint CR_Age_6_2[] = {
 	0x10a38, 0x10a3a,
 	0x10a3f, 0x10a47,
 	0x10a50, 0x10a58,
-	0x10a60, 0x10a7f,
+	0x10a60, 0x10a9f,
+	0x10ac0, 0x10ae6,
+	0x10aeb, 0x10af6,
 	0x10b00, 0x10b35,
 	0x10b39, 0x10b55,
 	0x10b58, 0x10b72,
-	0x10b78, 0x10b7f,
+	0x10b78, 0x10b91,
+	0x10b99, 0x10b9c,
+	0x10ba9, 0x10baf,
 	0x10c00, 0x10c48,
 	0x10e60, 0x10e7e,
 	0x11000, 0x1104d,
 	0x11052, 0x1106f,
-	0x11080, 0x110c1,
+	0x1107f, 0x110c1,
 	0x110d0, 0x110e8,
 	0x110f0, 0x110f9,
 	0x11100, 0x11134,
 	0x11136, 0x11143,
+	0x11150, 0x11176,
 	0x11180, 0x111c8,
-	0x111d0, 0x111d9,
+	0x111cd, 0x111cd,
+	0x111d0, 0x111da,
+	0x111e1, 0x111f4,
+	0x11200, 0x11211,
+	0x11213, 0x1123d,
+	0x112b0, 0x112ea,
+	0x112f0, 0x112f9,
+	0x11301, 0x11303,
+	0x11305, 0x1130c,
+	0x1130f, 0x11310,
+	0x11313, 0x11328,
+	0x1132a, 0x11330,
+	0x11332, 0x11333,
+	0x11335, 0x11339,
+	0x1133c, 0x11344,
+	0x11347, 0x11348,
+	0x1134b, 0x1134d,
+	0x11357, 0x11357,
+	0x1135d, 0x11363,
+	0x11366, 0x1136c,
+	0x11370, 0x11374,
+	0x11480, 0x114c7,
+	0x114d0, 0x114d9,
+	0x11580, 0x115b5,
+	0x115b8, 0x115c9,
+	0x11600, 0x11644,
+	0x11650, 0x11659,
 	0x11680, 0x116b7,
 	0x116c0, 0x116c9,
-	0x12000, 0x1236e,
-	0x12400, 0x12462,
-	0x12470, 0x12473,
+	0x118a0, 0x118f2,
+	0x118ff, 0x118ff,
+	0x11ac0, 0x11af8,
+	0x12000, 0x12398,
+	0x12400, 0x1246e,
+	0x12470, 0x12474,
 	0x13000, 0x1342e,
 	0x16800, 0x16a38,
+	0x16a40, 0x16a5e,
+	0x16a60, 0x16a69,
+	0x16a6e, 0x16a6f,
+	0x16ad0, 0x16aed,
+	0x16af0, 0x16af5,
+	0x16b00, 0x16b45,
+	0x16b50, 0x16b59,
+	0x16b5b, 0x16b61,
+	0x16b63, 0x16b77,
+	0x16b7d, 0x16b8f,
 	0x16f00, 0x16f44,
 	0x16f50, 0x16f7e,
 	0x16f8f, 0x16f9f,
 	0x1b000, 0x1b001,
+	0x1bc00, 0x1bc6a,
+	0x1bc70, 0x1bc7c,
+	0x1bc80, 0x1bc88,
+	0x1bc90, 0x1bc99,
+	0x1bc9c, 0x1bca3,
 	0x1d000, 0x1d0f5,
 	0x1d100, 0x1d126,
 	0x1d129, 0x1d1dd,
@@ -30274,6 +32574,8 @@ static const OnigCodePoint CR_Age_6_2[] = {
 	0x1d552, 0x1d6a5,
 	0x1d6a8, 0x1d7cb,
 	0x1d7ce, 0x1d7ff,
+	0x1e800, 0x1e8c4,
+	0x1e8c7, 0x1e8d6,
 	0x1ee00, 0x1ee03,
 	0x1ee05, 0x1ee1f,
 	0x1ee21, 0x1ee22,
@@ -30311,10 +32613,10 @@ static const OnigCodePoint CR_Age_6_2[] = {
 	0x1f000, 0x1f02b,
 	0x1f030, 0x1f093,
 	0x1f0a0, 0x1f0ae,
-	0x1f0b1, 0x1f0be,
+	0x1f0b1, 0x1f0bf,
 	0x1f0c1, 0x1f0cf,
-	0x1f0d1, 0x1f0df,
-	0x1f100, 0x1f10a,
+	0x1f0d1, 0x1f0f5,
+	0x1f100, 0x1f10c,
 	0x1f110, 0x1f12e,
 	0x1f130, 0x1f16b,
 	0x1f170, 0x1f19a,
@@ -30322,24 +32624,25 @@ static const OnigCodePoint CR_Age_6_2[] = {
 	0x1f210, 0x1f23a,
 	0x1f240, 0x1f248,
 	0x1f250, 0x1f251,
-	0x1f300, 0x1f320,
-	0x1f330, 0x1f335,
-	0x1f337, 0x1f37c,
-	0x1f380, 0x1f393,
-	0x1f3a0, 0x1f3c4,
-	0x1f3c6, 0x1f3ca,
-	0x1f3e0, 0x1f3f0,
-	0x1f400, 0x1f43e,
-	0x1f440, 0x1f440,
-	0x1f442, 0x1f4f7,
-	0x1f4f9, 0x1f4fc,
-	0x1f500, 0x1f53d,
-	0x1f540, 0x1f543,
-	0x1f550, 0x1f567,
-	0x1f5fb, 0x1f640,
-	0x1f645, 0x1f64f,
-	0x1f680, 0x1f6c5,
+	0x1f300, 0x1f32c,
+	0x1f330, 0x1f37d,
+	0x1f380, 0x1f3ce,
+	0x1f3d4, 0x1f3f7,
+	0x1f400, 0x1f4fe,
+	0x1f500, 0x1f54a,
+	0x1f550, 0x1f579,
+	0x1f57b, 0x1f5a3,
+	0x1f5a5, 0x1f642,
+	0x1f645, 0x1f6cf,
+	0x1f6e0, 0x1f6ec,
+	0x1f6f0, 0x1f6f3,
 	0x1f700, 0x1f773,
+	0x1f780, 0x1f7d4,
+	0x1f800, 0x1f80b,
+	0x1f810, 0x1f847,
+	0x1f850, 0x1f859,
+	0x1f860, 0x1f887,
+	0x1f890, 0x1f8ad,
 	0x1fffe, 0x2a6d6,
 	0x2a700, 0x2b734,
 	0x2b740, 0x2b81d,
@@ -30360,27 +32663,26 @@ static const OnigCodePoint CR_Age_6_2[] = {
 	0xe0020, 0xe007f,
 	0xe0100, 0xe01ef,
 	0xefffe, 0x10ffff,
-}; /* CR_Age_6_2 */
+}; /* CR_Age_7_0 */
 
-/* 'Age_6_3': Derived Age 6.3 */
-static const OnigCodePoint CR_Age_6_3[] = {
-	549,
+/* 'Age_8_0': Derived Age 8.0 */
+static const OnigCodePoint CR_Age_8_0[] = {
+	623,
 	0x0000, 0x0377,
-	0x037a, 0x037e,
+	0x037a, 0x037f,
 	0x0384, 0x038a,
 	0x038c, 0x038c,
 	0x038e, 0x03a1,
-	0x03a3, 0x0527,
+	0x03a3, 0x052f,
 	0x0531, 0x0556,
 	0x0559, 0x055f,
 	0x0561, 0x0587,
 	0x0589, 0x058a,
-	0x058f, 0x058f,
+	0x058d, 0x058f,
 	0x0591, 0x05c7,
 	0x05d0, 0x05ea,
 	0x05f0, 0x05f4,
-	0x0600, 0x0604,
-	0x0606, 0x061c,
+	0x0600, 0x061c,
 	0x061e, 0x070d,
 	0x070f, 0x074a,
 	0x074d, 0x07b1,
@@ -30389,12 +32691,8 @@ static const OnigCodePoint CR_Age_6_3[] = {
 	0x0830, 0x083e,
 	0x0840, 0x085b,
 	0x085e, 0x085e,
-	0x08a0, 0x08a0,
-	0x08a2, 0x08ac,
-	0x08e4, 0x08fe,
-	0x0900, 0x0977,
-	0x0979, 0x097f,
-	0x0981, 0x0983,
+	0x08a0, 0x08b4,
+	0x08e3, 0x0983,
 	0x0985, 0x098c,
 	0x098f, 0x0990,
 	0x0993, 0x09a8,
@@ -30437,6 +32735,7 @@ static const OnigCodePoint CR_Age_6_3[] = {
 	0x0ad0, 0x0ad0,
 	0x0ae0, 0x0ae3,
 	0x0ae6, 0x0af1,
+	0x0af9, 0x0af9,
 	0x0b01, 0x0b03,
 	0x0b05, 0x0b0c,
 	0x0b0f, 0x0b10,
@@ -30467,21 +32766,20 @@ static const OnigCodePoint CR_Age_6_3[] = {
 	0x0bd0, 0x0bd0,
 	0x0bd7, 0x0bd7,
 	0x0be6, 0x0bfa,
-	0x0c01, 0x0c03,
+	0x0c00, 0x0c03,
 	0x0c05, 0x0c0c,
 	0x0c0e, 0x0c10,
 	0x0c12, 0x0c28,
-	0x0c2a, 0x0c33,
-	0x0c35, 0x0c39,
+	0x0c2a, 0x0c39,
 	0x0c3d, 0x0c44,
 	0x0c46, 0x0c48,
 	0x0c4a, 0x0c4d,
 	0x0c55, 0x0c56,
-	0x0c58, 0x0c59,
+	0x0c58, 0x0c5a,
 	0x0c60, 0x0c63,
 	0x0c66, 0x0c6f,
 	0x0c78, 0x0c7f,
-	0x0c82, 0x0c83,
+	0x0c81, 0x0c83,
 	0x0c85, 0x0c8c,
 	0x0c8e, 0x0c90,
 	0x0c92, 0x0ca8,
@@ -30495,7 +32793,7 @@ static const OnigCodePoint CR_Age_6_3[] = {
 	0x0ce0, 0x0ce3,
 	0x0ce6, 0x0cef,
 	0x0cf1, 0x0cf2,
-	0x0d02, 0x0d03,
+	0x0d01, 0x0d03,
 	0x0d05, 0x0d0c,
 	0x0d0e, 0x0d10,
 	0x0d12, 0x0d3a,
@@ -30503,7 +32801,7 @@ static const OnigCodePoint CR_Age_6_3[] = {
 	0x0d46, 0x0d48,
 	0x0d4a, 0x0d4e,
 	0x0d57, 0x0d57,
-	0x0d60, 0x0d63,
+	0x0d5f, 0x0d63,
 	0x0d66, 0x0d75,
 	0x0d79, 0x0d7f,
 	0x0d82, 0x0d83,
@@ -30516,6 +32814,7 @@ static const OnigCodePoint CR_Age_6_3[] = {
 	0x0dcf, 0x0dd4,
 	0x0dd6, 0x0dd6,
 	0x0dd8, 0x0ddf,
+	0x0de6, 0x0def,
 	0x0df2, 0x0df4,
 	0x0e01, 0x0e3a,
 	0x0e3f, 0x0e5b,
@@ -30564,9 +32863,10 @@ static const OnigCodePoint CR_Age_6_3[] = {
 	0x1318, 0x135a,
 	0x135d, 0x137c,
 	0x1380, 0x1399,
-	0x13a0, 0x13f4,
+	0x13a0, 0x13f5,
+	0x13f8, 0x13fd,
 	0x1400, 0x169c,
-	0x16a0, 0x16f0,
+	0x16a0, 0x16f8,
 	0x1700, 0x170c,
 	0x170e, 0x1714,
 	0x1720, 0x1736,
@@ -30582,7 +32882,7 @@ static const OnigCodePoint CR_Age_6_3[] = {
 	0x1820, 0x1877,
 	0x1880, 0x18aa,
 	0x18b0, 0x18f5,
-	0x1900, 0x191c,
+	0x1900, 0x191e,
 	0x1920, 0x192b,
 	0x1930, 0x193b,
 	0x1940, 0x1940,
@@ -30597,6 +32897,7 @@ static const OnigCodePoint CR_Age_6_3[] = {
 	0x1a7f, 0x1a89,
 	0x1a90, 0x1a99,
 	0x1aa0, 0x1aad,
+	0x1ab0, 0x1abe,
 	0x1b00, 0x1b4b,
 	0x1b50, 0x1b7c,
 	0x1b80, 0x1bf3,
@@ -30605,7 +32906,8 @@ static const OnigCodePoint CR_Age_6_3[] = {
 	0x1c4d, 0x1c7f,
 	0x1cc0, 0x1cc7,
 	0x1cd0, 0x1cf6,
-	0x1d00, 0x1de6,
+	0x1cf8, 0x1cf9,
+	0x1d00, 0x1df5,
 	0x1dfc, 0x1f15,
 	0x1f18, 0x1f1d,
 	0x1f20, 0x1f45,
@@ -30626,15 +32928,18 @@ static const OnigCodePoint CR_Age_6_3[] = {
 	0x2066, 0x2071,
 	0x2074, 0x208e,
 	0x2090, 0x209c,
-	0x20a0, 0x20ba,
+	0x20a0, 0x20be,
 	0x20d0, 0x20f0,
-	0x2100, 0x2189,
-	0x2190, 0x23f3,
+	0x2100, 0x218b,
+	0x2190, 0x23fa,
 	0x2400, 0x2426,
 	0x2440, 0x244a,
-	0x2460, 0x26ff,
-	0x2701, 0x2b4c,
-	0x2b50, 0x2b59,
+	0x2460, 0x2b73,
+	0x2b76, 0x2b95,
+	0x2b98, 0x2bb9,
+	0x2bbd, 0x2bc8,
+	0x2bca, 0x2bd1,
+	0x2bec, 0x2bef,
 	0x2c00, 0x2c2e,
 	0x2c30, 0x2c5e,
 	0x2c60, 0x2cf3,
@@ -30652,7 +32957,7 @@ static const OnigCodePoint CR_Age_6_3[] = {
 	0x2dc8, 0x2dce,
 	0x2dd0, 0x2dd6,
 	0x2dd8, 0x2dde,
-	0x2de0, 0x2e3b,
+	0x2de0, 0x2e42,
 	0x2e80, 0x2e99,
 	0x2e9b, 0x2ef3,
 	0x2f00, 0x2fd5,
@@ -30667,38 +32972,36 @@ static const OnigCodePoint CR_Age_6_3[] = {
 	0x31f0, 0x321e,
 	0x3220, 0x32fe,
 	0x3300, 0x4db5,
-	0x4dc0, 0x9fcc,
+	0x4dc0, 0x9fd5,
 	0xa000, 0xa48c,
 	0xa490, 0xa4c6,
 	0xa4d0, 0xa62b,
-	0xa640, 0xa697,
-	0xa69f, 0xa6f7,
-	0xa700, 0xa78e,
-	0xa790, 0xa793,
-	0xa7a0, 0xa7aa,
-	0xa7f8, 0xa82b,
+	0xa640, 0xa6f7,
+	0xa700, 0xa7ad,
+	0xa7b0, 0xa7b7,
+	0xa7f7, 0xa82b,
 	0xa830, 0xa839,
 	0xa840, 0xa877,
 	0xa880, 0xa8c4,
 	0xa8ce, 0xa8d9,
-	0xa8e0, 0xa8fb,
+	0xa8e0, 0xa8fd,
 	0xa900, 0xa953,
 	0xa95f, 0xa97c,
 	0xa980, 0xa9cd,
 	0xa9cf, 0xa9d9,
-	0xa9de, 0xa9df,
+	0xa9de, 0xa9fe,
 	0xaa00, 0xaa36,
 	0xaa40, 0xaa4d,
 	0xaa50, 0xaa59,
-	0xaa5c, 0xaa7b,
-	0xaa80, 0xaac2,
+	0xaa5c, 0xaac2,
 	0xaadb, 0xaaf6,
 	0xab01, 0xab06,
 	0xab09, 0xab0e,
 	0xab11, 0xab16,
 	0xab20, 0xab26,
 	0xab28, 0xab2e,
-	0xabc0, 0xabed,
+	0xab30, 0xab65,
+	0xab70, 0xabed,
 	0xabf0, 0xabf9,
 	0xac00, 0xd7a3,
 	0xd7b0, 0xd7c6,
@@ -30718,8 +33021,7 @@ static const OnigCodePoint CR_Age_6_3[] = {
 	0xfd92, 0xfdc7,
 	0xfdd0, 0xfdfd,
 	0xfe00, 0xfe19,
-	0xfe20, 0xfe26,
-	0xfe30, 0xfe52,
+	0xfe20, 0xfe52,
 	0xfe54, 0xfe66,
 	0xfe68, 0xfe6b,
 	0xfe70, 0xfe74,
@@ -30741,32 +33043,43 @@ static const OnigCodePoint CR_Age_6_3[] = {
 	0x10080, 0x100fa,
 	0x10100, 0x10102,
 	0x10107, 0x10133,
-	0x10137, 0x1018a,
+	0x10137, 0x1018c,
 	0x10190, 0x1019b,
+	0x101a0, 0x101a0,
 	0x101d0, 0x101fd,
 	0x10280, 0x1029c,
 	0x102a0, 0x102d0,
-	0x10300, 0x1031e,
-	0x10320, 0x10323,
+	0x102e0, 0x102fb,
+	0x10300, 0x10323,
 	0x10330, 0x1034a,
+	0x10350, 0x1037a,
 	0x10380, 0x1039d,
 	0x1039f, 0x103c3,
 	0x103c8, 0x103d5,
 	0x10400, 0x1049d,
 	0x104a0, 0x104a9,
+	0x10500, 0x10527,
+	0x10530, 0x10563,
+	0x1056f, 0x1056f,
+	0x10600, 0x10736,
+	0x10740, 0x10755,
+	0x10760, 0x10767,
 	0x10800, 0x10805,
 	0x10808, 0x10808,
 	0x1080a, 0x10835,
 	0x10837, 0x10838,
 	0x1083c, 0x1083c,
 	0x1083f, 0x10855,
-	0x10857, 0x1085f,
-	0x10900, 0x1091b,
+	0x10857, 0x1089e,
+	0x108a7, 0x108af,
+	0x108e0, 0x108f2,
+	0x108f4, 0x108f5,
+	0x108fb, 0x1091b,
 	0x1091f, 0x10939,
 	0x1093f, 0x1093f,
 	0x10980, 0x109b7,
-	0x109be, 0x109bf,
-	0x10a00, 0x10a03,
+	0x109bc, 0x109cf,
+	0x109d2, 0x10a03,
 	0x10a05, 0x10a06,
 	0x10a0c, 0x10a13,
 	0x10a15, 0x10a17,
@@ -30774,36 +33087,98 @@ static const OnigCodePoint CR_Age_6_3[] = {
 	0x10a38, 0x10a3a,
 	0x10a3f, 0x10a47,
 	0x10a50, 0x10a58,
-	0x10a60, 0x10a7f,
+	0x10a60, 0x10a9f,
+	0x10ac0, 0x10ae6,
+	0x10aeb, 0x10af6,
 	0x10b00, 0x10b35,
 	0x10b39, 0x10b55,
 	0x10b58, 0x10b72,
-	0x10b78, 0x10b7f,
+	0x10b78, 0x10b91,
+	0x10b99, 0x10b9c,
+	0x10ba9, 0x10baf,
 	0x10c00, 0x10c48,
+	0x10c80, 0x10cb2,
+	0x10cc0, 0x10cf2,
+	0x10cfa, 0x10cff,
 	0x10e60, 0x10e7e,
 	0x11000, 0x1104d,
 	0x11052, 0x1106f,
-	0x11080, 0x110c1,
+	0x1107f, 0x110c1,
 	0x110d0, 0x110e8,
 	0x110f0, 0x110f9,
 	0x11100, 0x11134,
 	0x11136, 0x11143,
-	0x11180, 0x111c8,
-	0x111d0, 0x111d9,
+	0x11150, 0x11176,
+	0x11180, 0x111cd,
+	0x111d0, 0x111df,
+	0x111e1, 0x111f4,
+	0x11200, 0x11211,
+	0x11213, 0x1123d,
+	0x11280, 0x11286,
+	0x11288, 0x11288,
+	0x1128a, 0x1128d,
+	0x1128f, 0x1129d,
+	0x1129f, 0x112a9,
+	0x112b0, 0x112ea,
+	0x112f0, 0x112f9,
+	0x11300, 0x11303,
+	0x11305, 0x1130c,
+	0x1130f, 0x11310,
+	0x11313, 0x11328,
+	0x1132a, 0x11330,
+	0x11332, 0x11333,
+	0x11335, 0x11339,
+	0x1133c, 0x11344,
+	0x11347, 0x11348,
+	0x1134b, 0x1134d,
+	0x11350, 0x11350,
+	0x11357, 0x11357,
+	0x1135d, 0x11363,
+	0x11366, 0x1136c,
+	0x11370, 0x11374,
+	0x11480, 0x114c7,
+	0x114d0, 0x114d9,
+	0x11580, 0x115b5,
+	0x115b8, 0x115dd,
+	0x11600, 0x11644,
+	0x11650, 0x11659,
 	0x11680, 0x116b7,
 	0x116c0, 0x116c9,
-	0x12000, 0x1236e,
-	0x12400, 0x12462,
-	0x12470, 0x12473,
+	0x11700, 0x11719,
+	0x1171d, 0x1172b,
+	0x11730, 0x1173f,
+	0x118a0, 0x118f2,
+	0x118ff, 0x118ff,
+	0x11ac0, 0x11af8,
+	0x12000, 0x12399,
+	0x12400, 0x1246e,
+	0x12470, 0x12474,
+	0x12480, 0x12543,
 	0x13000, 0x1342e,
+	0x14400, 0x14646,
 	0x16800, 0x16a38,
+	0x16a40, 0x16a5e,
+	0x16a60, 0x16a69,
+	0x16a6e, 0x16a6f,
+	0x16ad0, 0x16aed,
+	0x16af0, 0x16af5,
+	0x16b00, 0x16b45,
+	0x16b50, 0x16b59,
+	0x16b5b, 0x16b61,
+	0x16b63, 0x16b77,
+	0x16b7d, 0x16b8f,
 	0x16f00, 0x16f44,
 	0x16f50, 0x16f7e,
 	0x16f8f, 0x16f9f,
 	0x1b000, 0x1b001,
+	0x1bc00, 0x1bc6a,
+	0x1bc70, 0x1bc7c,
+	0x1bc80, 0x1bc88,
+	0x1bc90, 0x1bc99,
+	0x1bc9c, 0x1bca3,
 	0x1d000, 0x1d0f5,
 	0x1d100, 0x1d126,
-	0x1d129, 0x1d1dd,
+	0x1d129, 0x1d1e8,
 	0x1d200, 0x1d245,
 	0x1d300, 0x1d356,
 	0x1d360, 0x1d371,
@@ -30827,7 +33202,11 @@ static const OnigCodePoint CR_Age_6_3[] = {
 	0x1d54a, 0x1d550,
 	0x1d552, 0x1d6a5,
 	0x1d6a8, 0x1d7cb,
-	0x1d7ce, 0x1d7ff,
+	0x1d7ce, 0x1da8b,
+	0x1da9b, 0x1da9f,
+	0x1daa1, 0x1daaf,
+	0x1e800, 0x1e8c4,
+	0x1e8c7, 0x1e8d6,
 	0x1ee00, 0x1ee03,
 	0x1ee05, 0x1ee1f,
 	0x1ee21, 0x1ee22,
@@ -30865,10 +33244,10 @@ static const OnigCodePoint CR_Age_6_3[] = {
 	0x1f000, 0x1f02b,
 	0x1f030, 0x1f093,
 	0x1f0a0, 0x1f0ae,
-	0x1f0b1, 0x1f0be,
+	0x1f0b1, 0x1f0bf,
 	0x1f0c1, 0x1f0cf,
-	0x1f0d1, 0x1f0df,
-	0x1f100, 0x1f10a,
+	0x1f0d1, 0x1f0f5,
+	0x1f100, 0x1f10c,
 	0x1f110, 0x1f12e,
 	0x1f130, 0x1f16b,
 	0x1f170, 0x1f19a,
@@ -30876,27 +33255,25 @@ static const OnigCodePoint CR_Age_6_3[] = {
 	0x1f210, 0x1f23a,
 	0x1f240, 0x1f248,
 	0x1f250, 0x1f251,
-	0x1f300, 0x1f320,
-	0x1f330, 0x1f335,
-	0x1f337, 0x1f37c,
-	0x1f380, 0x1f393,
-	0x1f3a0, 0x1f3c4,
-	0x1f3c6, 0x1f3ca,
-	0x1f3e0, 0x1f3f0,
-	0x1f400, 0x1f43e,
-	0x1f440, 0x1f440,
-	0x1f442, 0x1f4f7,
-	0x1f4f9, 0x1f4fc,
-	0x1f500, 0x1f53d,
-	0x1f540, 0x1f543,
-	0x1f550, 0x1f567,
-	0x1f5fb, 0x1f640,
-	0x1f645, 0x1f64f,
-	0x1f680, 0x1f6c5,
+	0x1f300, 0x1f579,
+	0x1f57b, 0x1f5a3,
+	0x1f5a5, 0x1f6d0,
+	0x1f6e0, 0x1f6ec,
+	0x1f6f0, 0x1f6f3,
 	0x1f700, 0x1f773,
+	0x1f780, 0x1f7d4,
+	0x1f800, 0x1f80b,
+	0x1f810, 0x1f847,
+	0x1f850, 0x1f859,
+	0x1f860, 0x1f887,
+	0x1f890, 0x1f8ad,
+	0x1f910, 0x1f918,
+	0x1f980, 0x1f984,
+	0x1f9c0, 0x1f9c0,
 	0x1fffe, 0x2a6d6,
 	0x2a700, 0x2b734,
 	0x2b740, 0x2b81d,
+	0x2b820, 0x2cea1,
 	0x2f800, 0x2fa1d,
 	0x2fffe, 0x2ffff,
 	0x3fffe, 0x3ffff,
@@ -30914,11 +33291,11 @@ static const OnigCodePoint CR_Age_6_3[] = {
 	0xe0020, 0xe007f,
 	0xe0100, 0xe01ef,
 	0xefffe, 0x10ffff,
-}; /* CR_Age_6_3 */
+}; /* CR_Age_8_0 */
 
-/* 'Age_7_0': Derived Age 7.0 */
-static const OnigCodePoint CR_Age_7_0[] = {
-	610,
+/* 'Age_9_0': Derived Age 9.0 */
+static const OnigCodePoint CR_Age_9_0[] = {
+	648,
 	0x0000, 0x0377,
 	0x037a, 0x037f,
 	0x0384, 0x038a,
@@ -30942,8 +33319,9 @@ static const OnigCodePoint CR_Age_7_0[] = {
 	0x0830, 0x083e,
 	0x0840, 0x085b,
 	0x085e, 0x085e,
-	0x08a0, 0x08b2,
-	0x08e4, 0x0983,
+	0x08a0, 0x08b4,
+	0x08b6, 0x08bd,
+	0x08d4, 0x0983,
 	0x0985, 0x098c,
 	0x098f, 0x0990,
 	0x0993, 0x09a8,
@@ -30986,6 +33364,7 @@ static const OnigCodePoint CR_Age_7_0[] = {
 	0x0ad0, 0x0ad0,
 	0x0ae0, 0x0ae3,
 	0x0ae6, 0x0af1,
+	0x0af9, 0x0af9,
 	0x0b01, 0x0b03,
 	0x0b05, 0x0b0c,
 	0x0b0f, 0x0b10,
@@ -31025,11 +33404,10 @@ static const OnigCodePoint CR_Age_7_0[] = {
 	0x0c46, 0x0c48,
 	0x0c4a, 0x0c4d,
 	0x0c55, 0x0c56,
-	0x0c58, 0x0c59,
+	0x0c58, 0x0c5a,
 	0x0c60, 0x0c63,
 	0x0c66, 0x0c6f,
-	0x0c78, 0x0c7f,
-	0x0c81, 0x0c83,
+	0x0c78, 0x0c83,
 	0x0c85, 0x0c8c,
 	0x0c8e, 0x0c90,
 	0x0c92, 0x0ca8,
@@ -31049,11 +33427,9 @@ static const OnigCodePoint CR_Age_7_0[] = {
 	0x0d12, 0x0d3a,
 	0x0d3d, 0x0d44,
 	0x0d46, 0x0d48,
-	0x0d4a, 0x0d4e,
-	0x0d57, 0x0d57,
-	0x0d60, 0x0d63,
-	0x0d66, 0x0d75,
-	0x0d79, 0x0d7f,
+	0x0d4a, 0x0d4f,
+	0x0d54, 0x0d63,
+	0x0d66, 0x0d7f,
 	0x0d82, 0x0d83,
 	0x0d85, 0x0d96,
 	0x0d9a, 0x0db1,
@@ -31113,7 +33489,8 @@ static const OnigCodePoint CR_Age_7_0[] = {
 	0x1318, 0x135a,
 	0x135d, 0x137c,
 	0x1380, 0x1399,
-	0x13a0, 0x13f4,
+	0x13a0, 0x13f5,
+	0x13f8, 0x13fd,
 	0x1400, 0x169c,
 	0x16a0, 0x16f8,
 	0x1700, 0x170c,
@@ -31152,12 +33529,12 @@ static const OnigCodePoint CR_Age_7_0[] = {
 	0x1b80, 0x1bf3,
 	0x1bfc, 0x1c37,
 	0x1c3b, 0x1c49,
-	0x1c4d, 0x1c7f,
+	0x1c4d, 0x1c88,
 	0x1cc0, 0x1cc7,
 	0x1cd0, 0x1cf6,
 	0x1cf8, 0x1cf9,
 	0x1d00, 0x1df5,
-	0x1dfc, 0x1f15,
+	0x1dfb, 0x1f15,
 	0x1f18, 0x1f1d,
 	0x1f20, 0x1f45,
 	0x1f48, 0x1f4d,
@@ -31177,10 +33554,10 @@ static const OnigCodePoint CR_Age_7_0[] = {
 	0x2066, 0x2071,
 	0x2074, 0x208e,
 	0x2090, 0x209c,
-	0x20a0, 0x20bd,
+	0x20a0, 0x20be,
 	0x20d0, 0x20f0,
-	0x2100, 0x2189,
-	0x2190, 0x23fa,
+	0x2100, 0x218b,
+	0x2190, 0x23fe,
 	0x2400, 0x2426,
 	0x2440, 0x244a,
 	0x2460, 0x2b73,
@@ -31188,6 +33565,7 @@ static const OnigCodePoint CR_Age_7_0[] = {
 	0x2b98, 0x2bb9,
 	0x2bbd, 0x2bc8,
 	0x2bca, 0x2bd1,
+	0x2bec, 0x2bef,
 	0x2c00, 0x2c2e,
 	0x2c30, 0x2c5e,
 	0x2c60, 0x2cf3,
@@ -31205,7 +33583,7 @@ static const OnigCodePoint CR_Age_7_0[] = {
 	0x2dc8, 0x2dce,
 	0x2dd0, 0x2dd6,
 	0x2dd8, 0x2dde,
-	0x2de0, 0x2e42,
+	0x2de0, 0x2e44,
 	0x2e80, 0x2e99,
 	0x2e9b, 0x2ef3,
 	0x2f00, 0x2fd5,
@@ -31220,21 +33598,19 @@ static const OnigCodePoint CR_Age_7_0[] = {
 	0x31f0, 0x321e,
 	0x3220, 0x32fe,
 	0x3300, 0x4db5,
-	0x4dc0, 0x9fcc,
+	0x4dc0, 0x9fd5,
 	0xa000, 0xa48c,
 	0xa490, 0xa4c6,
 	0xa4d0, 0xa62b,
-	0xa640, 0xa69d,
-	0xa69f, 0xa6f7,
-	0xa700, 0xa78e,
-	0xa790, 0xa7ad,
-	0xa7b0, 0xa7b1,
+	0xa640, 0xa6f7,
+	0xa700, 0xa7ae,
+	0xa7b0, 0xa7b7,
 	0xa7f7, 0xa82b,
 	0xa830, 0xa839,
 	0xa840, 0xa877,
-	0xa880, 0xa8c4,
+	0xa880, 0xa8c5,
 	0xa8ce, 0xa8d9,
-	0xa8e0, 0xa8fb,
+	0xa8e0, 0xa8fd,
 	0xa900, 0xa953,
 	0xa95f, 0xa97c,
 	0xa980, 0xa9cd,
@@ -31250,9 +33626,8 @@ static const OnigCodePoint CR_Age_7_0[] = {
 	0xab11, 0xab16,
 	0xab20, 0xab26,
 	0xab28, 0xab2e,
-	0xab30, 0xab5f,
-	0xab64, 0xab65,
-	0xabc0, 0xabed,
+	0xab30, 0xab65,
+	0xab70, 0xabed,
 	0xabf0, 0xabf9,
 	0xac00, 0xd7a3,
 	0xd7b0, 0xd7c6,
@@ -31272,8 +33647,7 @@ static const OnigCodePoint CR_Age_7_0[] = {
 	0xfd92, 0xfdc7,
 	0xfdd0, 0xfdfd,
 	0xfe00, 0xfe19,
-	0xfe20, 0xfe2d,
-	0xfe30, 0xfe52,
+	0xfe20, 0xfe52,
 	0xfe54, 0xfe66,
 	0xfe68, 0xfe6b,
 	0xfe70, 0xfe74,
@@ -31295,7 +33669,7 @@ static const OnigCodePoint CR_Age_7_0[] = {
 	0x10080, 0x100fa,
 	0x10100, 0x10102,
 	0x10107, 0x10133,
-	0x10137, 0x1018c,
+	0x10137, 0x1018e,
 	0x10190, 0x1019b,
 	0x101a0, 0x101a0,
 	0x101d0, 0x101fd,
@@ -31310,6 +33684,8 @@ static const OnigCodePoint CR_Age_7_0[] = {
 	0x103c8, 0x103d5,
 	0x10400, 0x1049d,
 	0x104a0, 0x104a9,
+	0x104b0, 0x104d3,
+	0x104d8, 0x104fb,
 	0x10500, 0x10527,
 	0x10530, 0x10563,
 	0x1056f, 0x1056f,
@@ -31324,12 +33700,14 @@ static const OnigCodePoint CR_Age_7_0[] = {
 	0x1083f, 0x10855,
 	0x10857, 0x1089e,
 	0x108a7, 0x108af,
-	0x10900, 0x1091b,
+	0x108e0, 0x108f2,
+	0x108f4, 0x108f5,
+	0x108fb, 0x1091b,
 	0x1091f, 0x10939,
 	0x1093f, 0x1093f,
 	0x10980, 0x109b7,
-	0x109be, 0x109bf,
-	0x10a00, 0x10a03,
+	0x109bc, 0x109cf,
+	0x109d2, 0x10a03,
 	0x10a05, 0x10a06,
 	0x10a0c, 0x10a13,
 	0x10a15, 0x10a17,
@@ -31347,6 +33725,9 @@ static const OnigCodePoint CR_Age_7_0[] = {
 	0x10b99, 0x10b9c,
 	0x10ba9, 0x10baf,
 	0x10c00, 0x10c48,
+	0x10c80, 0x10cb2,
+	0x10cc0, 0x10cf2,
+	0x10cfa, 0x10cff,
 	0x10e60, 0x10e7e,
 	0x11000, 0x1104d,
 	0x11052, 0x1106f,
@@ -31356,15 +33737,19 @@ static const OnigCodePoint CR_Age_7_0[] = {
 	0x11100, 0x11134,
 	0x11136, 0x11143,
 	0x11150, 0x11176,
-	0x11180, 0x111c8,
-	0x111cd, 0x111cd,
-	0x111d0, 0x111da,
+	0x11180, 0x111cd,
+	0x111d0, 0x111df,
 	0x111e1, 0x111f4,
 	0x11200, 0x11211,
-	0x11213, 0x1123d,
+	0x11213, 0x1123e,
+	0x11280, 0x11286,
+	0x11288, 0x11288,
+	0x1128a, 0x1128d,
+	0x1128f, 0x1129d,
+	0x1129f, 0x112a9,
 	0x112b0, 0x112ea,
 	0x112f0, 0x112f9,
-	0x11301, 0x11303,
+	0x11300, 0x11303,
 	0x11305, 0x1130c,
 	0x1130f, 0x11310,
 	0x11313, 0x11328,
@@ -31374,25 +33759,42 @@ static const OnigCodePoint CR_Age_7_0[] = {
 	0x1133c, 0x11344,
 	0x11347, 0x11348,
 	0x1134b, 0x1134d,
+	0x11350, 0x11350,
 	0x11357, 0x11357,
 	0x1135d, 0x11363,
 	0x11366, 0x1136c,
 	0x11370, 0x11374,
+	0x11400, 0x11459,
+	0x1145b, 0x1145b,
+	0x1145d, 0x1145d,
 	0x11480, 0x114c7,
 	0x114d0, 0x114d9,
 	0x11580, 0x115b5,
-	0x115b8, 0x115c9,
+	0x115b8, 0x115dd,
 	0x11600, 0x11644,
 	0x11650, 0x11659,
+	0x11660, 0x1166c,
 	0x11680, 0x116b7,
 	0x116c0, 0x116c9,
+	0x11700, 0x11719,
+	0x1171d, 0x1172b,
+	0x11730, 0x1173f,
 	0x118a0, 0x118f2,
 	0x118ff, 0x118ff,
 	0x11ac0, 0x11af8,
-	0x12000, 0x12398,
+	0x11c00, 0x11c08,
+	0x11c0a, 0x11c36,
+	0x11c38, 0x11c45,
+	0x11c50, 0x11c6c,
+	0x11c70, 0x11c8f,
+	0x11c92, 0x11ca7,
+	0x11ca9, 0x11cb6,
+	0x12000, 0x12399,
 	0x12400, 0x1246e,
 	0x12470, 0x12474,
+	0x12480, 0x12543,
 	0x13000, 0x1342e,
+	0x14400, 0x14646,
 	0x16800, 0x16a38,
 	0x16a40, 0x16a5e,
 	0x16a60, 0x16a69,
@@ -31407,6 +33809,9 @@ static const OnigCodePoint CR_Age_7_0[] = {
 	0x16f00, 0x16f44,
 	0x16f50, 0x16f7e,
 	0x16f8f, 0x16f9f,
+	0x16fe0, 0x16fe0,
+	0x17000, 0x187ec,
+	0x18800, 0x18af2,
 	0x1b000, 0x1b001,
 	0x1bc00, 0x1bc6a,
 	0x1bc70, 0x1bc7c,
@@ -31415,7 +33820,7 @@ static const OnigCodePoint CR_Age_7_0[] = {
 	0x1bc9c, 0x1bca3,
 	0x1d000, 0x1d0f5,
 	0x1d100, 0x1d126,
-	0x1d129, 0x1d1dd,
+	0x1d129, 0x1d1e8,
 	0x1d200, 0x1d245,
 	0x1d300, 0x1d356,
 	0x1d360, 0x1d371,
@@ -31439,9 +33844,19 @@ static const OnigCodePoint CR_Age_7_0[] = {
 	0x1d54a, 0x1d550,
 	0x1d552, 0x1d6a5,
 	0x1d6a8, 0x1d7cb,
-	0x1d7ce, 0x1d7ff,
+	0x1d7ce, 0x1da8b,
+	0x1da9b, 0x1da9f,
+	0x1daa1, 0x1daaf,
+	0x1e000, 0x1e006,
+	0x1e008, 0x1e018,
+	0x1e01b, 0x1e021,
+	0x1e023, 0x1e024,
+	0x1e026, 0x1e02a,
 	0x1e800, 0x1e8c4,
 	0x1e8c7, 0x1e8d6,
+	0x1e900, 0x1e94a,
+	0x1e950, 0x1e959,
+	0x1e95e, 0x1e95f,
 	0x1ee00, 0x1ee03,
 	0x1ee05, 0x1ee1f,
 	0x1ee21, 0x1ee22,
@@ -31485,23 +33900,14 @@ static const OnigCodePoint CR_Age_7_0[] = {
 	0x1f100, 0x1f10c,
 	0x1f110, 0x1f12e,
 	0x1f130, 0x1f16b,
-	0x1f170, 0x1f19a,
+	0x1f170, 0x1f1ac,
 	0x1f1e6, 0x1f202,
-	0x1f210, 0x1f23a,
+	0x1f210, 0x1f23b,
 	0x1f240, 0x1f248,
 	0x1f250, 0x1f251,
-	0x1f300, 0x1f32c,
-	0x1f330, 0x1f37d,
-	0x1f380, 0x1f3ce,
-	0x1f3d4, 0x1f3f7,
-	0x1f400, 0x1f4fe,
-	0x1f500, 0x1f54a,
-	0x1f550, 0x1f579,
-	0x1f57b, 0x1f5a3,
-	0x1f5a5, 0x1f642,
-	0x1f645, 0x1f6cf,
+	0x1f300, 0x1f6d2,
 	0x1f6e0, 0x1f6ec,
-	0x1f6f0, 0x1f6f3,
+	0x1f6f0, 0x1f6f6,
 	0x1f700, 0x1f773,
 	0x1f780, 0x1f7d4,
 	0x1f800, 0x1f80b,
@@ -31509,9 +33915,18 @@ static const OnigCodePoint CR_Age_7_0[] = {
 	0x1f850, 0x1f859,
 	0x1f860, 0x1f887,
 	0x1f890, 0x1f8ad,
+	0x1f910, 0x1f91e,
+	0x1f920, 0x1f927,
+	0x1f930, 0x1f930,
+	0x1f933, 0x1f93e,
+	0x1f940, 0x1f94b,
+	0x1f950, 0x1f95e,
+	0x1f980, 0x1f991,
+	0x1f9c0, 0x1f9c0,
 	0x1fffe, 0x2a6d6,
 	0x2a700, 0x2b734,
 	0x2b740, 0x2b81d,
+	0x2b820, 0x2cea1,
 	0x2f800, 0x2fa1d,
 	0x2fffe, 0x2ffff,
 	0x3fffe, 0x3ffff,
@@ -31529,11 +33944,11 @@ static const OnigCodePoint CR_Age_7_0[] = {
 	0xe0020, 0xe007f,
 	0xe0100, 0xe01ef,
 	0xefffe, 0x10ffff,
-}; /* CR_Age_7_0 */
+}; /* CR_Age_9_0 */
 
-/* 'Age_8_0': Derived Age 8.0 */
-static const OnigCodePoint CR_Age_8_0[] = {
-	623,
+/* 'Age_10_0': Derived Age 10.0 */
+static const OnigCodePoint CR_Age_10_0[] = {
+	659,
 	0x0000, 0x0377,
 	0x037a, 0x037f,
 	0x0384, 0x038a,
@@ -31557,8 +33972,10 @@ static const OnigCodePoint CR_Age_8_0[] = {
 	0x0830, 0x083e,
 	0x0840, 0x085b,
 	0x085e, 0x085e,
+	0x0860, 0x086a,
 	0x08a0, 0x08b4,
-	0x08e3, 0x0983,
+	0x08b6, 0x08bd,
+	0x08d4, 0x0983,
 	0x0985, 0x098c,
 	0x098f, 0x0990,
 	0x0993, 0x09a8,
@@ -31571,7 +33988,7 @@ static const OnigCodePoint CR_Age_8_0[] = {
 	0x09d7, 0x09d7,
 	0x09dc, 0x09dd,
 	0x09df, 0x09e3,
-	0x09e6, 0x09fb,
+	0x09e6, 0x09fd,
 	0x0a01, 0x0a03,
 	0x0a05, 0x0a0a,
 	0x0a0f, 0x0a10,
@@ -31601,7 +34018,7 @@ static const OnigCodePoint CR_Age_8_0[] = {
 	0x0ad0, 0x0ad0,
 	0x0ae0, 0x0ae3,
 	0x0ae6, 0x0af1,
-	0x0af9, 0x0af9,
+	0x0af9, 0x0aff,
 	0x0b01, 0x0b03,
 	0x0b05, 0x0b0c,
 	0x0b0f, 0x0b10,
@@ -31644,8 +34061,7 @@ static const OnigCodePoint CR_Age_8_0[] = {
 	0x0c58, 0x0c5a,
 	0x0c60, 0x0c63,
 	0x0c66, 0x0c6f,
-	0x0c78, 0x0c7f,
-	0x0c81, 0x0c83,
+	0x0c78, 0x0c83,
 	0x0c85, 0x0c8c,
 	0x0c8e, 0x0c90,
 	0x0c92, 0x0ca8,
@@ -31659,17 +34075,14 @@ static const OnigCodePoint CR_Age_8_0[] = {
 	0x0ce0, 0x0ce3,
 	0x0ce6, 0x0cef,
 	0x0cf1, 0x0cf2,
-	0x0d01, 0x0d03,
+	0x0d00, 0x0d03,
 	0x0d05, 0x0d0c,
 	0x0d0e, 0x0d10,
-	0x0d12, 0x0d3a,
-	0x0d3d, 0x0d44,
+	0x0d12, 0x0d44,
 	0x0d46, 0x0d48,
-	0x0d4a, 0x0d4e,
-	0x0d57, 0x0d57,
-	0x0d5f, 0x0d63,
-	0x0d66, 0x0d75,
-	0x0d79, 0x0d7f,
+	0x0d4a, 0x0d4f,
+	0x0d54, 0x0d63,
+	0x0d66, 0x0d7f,
 	0x0d82, 0x0d83,
 	0x0d85, 0x0d96,
 	0x0d9a, 0x0db1,
@@ -31769,12 +34182,11 @@ static const OnigCodePoint CR_Age_8_0[] = {
 	0x1b80, 0x1bf3,
 	0x1bfc, 0x1c37,
 	0x1c3b, 0x1c49,
-	0x1c4d, 0x1c7f,
+	0x1c4d, 0x1c88,
 	0x1cc0, 0x1cc7,
-	0x1cd0, 0x1cf6,
-	0x1cf8, 0x1cf9,
-	0x1d00, 0x1df5,
-	0x1dfc, 0x1f15,
+	0x1cd0, 0x1cf9,
+	0x1d00, 0x1df9,
+	0x1dfb, 0x1f15,
 	0x1f18, 0x1f1d,
 	0x1f20, 0x1f45,
 	0x1f48, 0x1f4d,
@@ -31794,17 +34206,16 @@ static const OnigCodePoint CR_Age_8_0[] = {
 	0x2066, 0x2071,
 	0x2074, 0x208e,
 	0x2090, 0x209c,
-	0x20a0, 0x20be,
+	0x20a0, 0x20bf,
 	0x20d0, 0x20f0,
 	0x2100, 0x218b,
-	0x2190, 0x23fa,
-	0x2400, 0x2426,
+	0x2190, 0x2426,
 	0x2440, 0x244a,
 	0x2460, 0x2b73,
 	0x2b76, 0x2b95,
 	0x2b98, 0x2bb9,
 	0x2bbd, 0x2bc8,
-	0x2bca, 0x2bd1,
+	0x2bca, 0x2bd2,
 	0x2bec, 0x2bef,
 	0x2c00, 0x2c2e,
 	0x2c30, 0x2c5e,
@@ -31823,7 +34234,7 @@ static const OnigCodePoint CR_Age_8_0[] = {
 	0x2dc8, 0x2dce,
 	0x2dd0, 0x2dd6,
 	0x2dd8, 0x2dde,
-	0x2de0, 0x2e42,
+	0x2de0, 0x2e49,
 	0x2e80, 0x2e99,
 	0x2e9b, 0x2ef3,
 	0x2f00, 0x2fd5,
@@ -31831,24 +34242,24 @@ static const OnigCodePoint CR_Age_8_0[] = {
 	0x3000, 0x303f,
 	0x3041, 0x3096,
 	0x3099, 0x30ff,
-	0x3105, 0x312d,
+	0x3105, 0x312e,
 	0x3131, 0x318e,
 	0x3190, 0x31ba,
 	0x31c0, 0x31e3,
 	0x31f0, 0x321e,
 	0x3220, 0x32fe,
 	0x3300, 0x4db5,
-	0x4dc0, 0x9fd5,
+	0x4dc0, 0x9fea,
 	0xa000, 0xa48c,
 	0xa490, 0xa4c6,
 	0xa4d0, 0xa62b,
 	0xa640, 0xa6f7,
-	0xa700, 0xa7ad,
+	0xa700, 0xa7ae,
 	0xa7b0, 0xa7b7,
 	0xa7f7, 0xa82b,
 	0xa830, 0xa839,
 	0xa840, 0xa877,
-	0xa880, 0xa8c4,
+	0xa880, 0xa8c5,
 	0xa8ce, 0xa8d9,
 	0xa8e0, 0xa8fd,
 	0xa900, 0xa953,
@@ -31909,7 +34320,7 @@ static const OnigCodePoint CR_Age_8_0[] = {
 	0x10080, 0x100fa,
 	0x10100, 0x10102,
 	0x10107, 0x10133,
-	0x10137, 0x1018c,
+	0x10137, 0x1018e,
 	0x10190, 0x1019b,
 	0x101a0, 0x101a0,
 	0x101d0, 0x101fd,
@@ -31917,13 +34328,15 @@ static const OnigCodePoint CR_Age_8_0[] = {
 	0x102a0, 0x102d0,
 	0x102e0, 0x102fb,
 	0x10300, 0x10323,
-	0x10330, 0x1034a,
+	0x1032d, 0x1034a,
 	0x10350, 0x1037a,
 	0x10380, 0x1039d,
 	0x1039f, 0x103c3,
 	0x103c8, 0x103d5,
 	0x10400, 0x1049d,
 	0x104a0, 0x104a9,
+	0x104b0, 0x104d3,
+	0x104d8, 0x104fb,
 	0x10500, 0x10527,
 	0x10530, 0x10563,
 	0x1056f, 0x1056f,
@@ -31979,7 +34392,7 @@ static const OnigCodePoint CR_Age_8_0[] = {
 	0x111d0, 0x111df,
 	0x111e1, 0x111f4,
 	0x11200, 0x11211,
-	0x11213, 0x1123d,
+	0x11213, 0x1123e,
 	0x11280, 0x11286,
 	0x11288, 0x11288,
 	0x1128a, 0x1128d,
@@ -32002,12 +34415,16 @@ static const OnigCodePoint CR_Age_8_0[] = {
 	0x1135d, 0x11363,
 	0x11366, 0x1136c,
 	0x11370, 0x11374,
+	0x11400, 0x11459,
+	0x1145b, 0x1145b,
+	0x1145d, 0x1145d,
 	0x11480, 0x114c7,
 	0x114d0, 0x114d9,
 	0x11580, 0x115b5,
 	0x115b8, 0x115dd,
 	0x11600, 0x11644,
 	0x11650, 0x11659,
+	0x11660, 0x1166c,
 	0x11680, 0x116b7,
 	0x116c0, 0x116c9,
 	0x11700, 0x11719,
@@ -32015,7 +34432,25 @@ static const OnigCodePoint CR_Age_8_0[] = {
 	0x11730, 0x1173f,
 	0x118a0, 0x118f2,
 	0x118ff, 0x118ff,
+	0x11a00, 0x11a47,
+	0x11a50, 0x11a83,
+	0x11a86, 0x11a9c,
+	0x11a9e, 0x11aa2,
 	0x11ac0, 0x11af8,
+	0x11c00, 0x11c08,
+	0x11c0a, 0x11c36,
+	0x11c38, 0x11c45,
+	0x11c50, 0x11c6c,
+	0x11c70, 0x11c8f,
+	0x11c92, 0x11ca7,
+	0x11ca9, 0x11cb6,
+	0x11d00, 0x11d06,
+	0x11d08, 0x11d09,
+	0x11d0b, 0x11d36,
+	0x11d3a, 0x11d3a,
+	0x11d3c, 0x11d3d,
+	0x11d3f, 0x11d47,
+	0x11d50, 0x11d59,
 	0x12000, 0x12399,
 	0x12400, 0x1246e,
 	0x12470, 0x12474,
@@ -32036,7 +34471,11 @@ static const OnigCodePoint CR_Age_8_0[] = {
 	0x16f00, 0x16f44,
 	0x16f50, 0x16f7e,
 	0x16f8f, 0x16f9f,
-	0x1b000, 0x1b001,
+	0x16fe0, 0x16fe1,
+	0x17000, 0x187ec,
+	0x18800, 0x18af2,
+	0x1b000, 0x1b11e,
+	0x1b170, 0x1b2fb,
 	0x1bc00, 0x1bc6a,
 	0x1bc70, 0x1bc7c,
 	0x1bc80, 0x1bc88,
@@ -32071,8 +34510,16 @@ static const OnigCodePoint CR_Age_8_0[] = {
 	0x1d7ce, 0x1da8b,
 	0x1da9b, 0x1da9f,
 	0x1daa1, 0x1daaf,
+	0x1e000, 0x1e006,
+	0x1e008, 0x1e018,
+	0x1e01b, 0x1e021,
+	0x1e023, 0x1e024,
+	0x1e026, 0x1e02a,
 	0x1e800, 0x1e8c4,
 	0x1e8c7, 0x1e8d6,
+	0x1e900, 0x1e94a,
+	0x1e950, 0x1e959,
+	0x1e95e, 0x1e95f,
 	0x1ee00, 0x1ee03,
 	0x1ee05, 0x1ee1f,
 	0x1ee21, 0x1ee22,
@@ -32116,16 +34563,15 @@ static const OnigCodePoint CR_Age_8_0[] = {
 	0x1f100, 0x1f10c,
 	0x1f110, 0x1f12e,
 	0x1f130, 0x1f16b,
-	0x1f170, 0x1f19a,
+	0x1f170, 0x1f1ac,
 	0x1f1e6, 0x1f202,
-	0x1f210, 0x1f23a,
+	0x1f210, 0x1f23b,
 	0x1f240, 0x1f248,
 	0x1f250, 0x1f251,
-	0x1f300, 0x1f579,
-	0x1f57b, 0x1f5a3,
-	0x1f5a5, 0x1f6d0,
+	0x1f260, 0x1f265,
+	0x1f300, 0x1f6d4,
 	0x1f6e0, 0x1f6ec,
-	0x1f6f0, 0x1f6f3,
+	0x1f6f0, 0x1f6f8,
 	0x1f700, 0x1f773,
 	0x1f780, 0x1f7d4,
 	0x1f800, 0x1f80b,
@@ -32133,13 +34579,18 @@ static const OnigCodePoint CR_Age_8_0[] = {
 	0x1f850, 0x1f859,
 	0x1f860, 0x1f887,
 	0x1f890, 0x1f8ad,
-	0x1f910, 0x1f918,
-	0x1f980, 0x1f984,
+	0x1f900, 0x1f90b,
+	0x1f910, 0x1f93e,
+	0x1f940, 0x1f94c,
+	0x1f950, 0x1f96b,
+	0x1f980, 0x1f997,
 	0x1f9c0, 0x1f9c0,
+	0x1f9d0, 0x1f9e6,
 	0x1fffe, 0x2a6d6,
 	0x2a700, 0x2b734,
 	0x2b740, 0x2b81d,
 	0x2b820, 0x2cea1,
+	0x2ceb0, 0x2ebe0,
 	0x2f800, 0x2fa1d,
 	0x2fffe, 0x2ffff,
 	0x3fffe, 0x3ffff,
@@ -32157,11 +34608,11 @@ static const OnigCodePoint CR_Age_8_0[] = {
 	0xe0020, 0xe007f,
 	0xe0100, 0xe01ef,
 	0xefffe, 0x10ffff,
-}; /* CR_Age_8_0 */
+}; /* CR_Age_10_0 */
 
-/* 'Age_9_0': Derived Age 9.0 */
-static const OnigCodePoint CR_Age_9_0[] = {
-	648,
+/* 'Age_11_0': Derived Age 11.0 */
+static const OnigCodePoint CR_Age_11_0[] = {
+	668,
 	0x0000, 0x0377,
 	0x037a, 0x037f,
 	0x0384, 0x038a,
@@ -32169,25 +34620,24 @@ static const OnigCodePoint CR_Age_9_0[] = {
 	0x038e, 0x03a1,
 	0x03a3, 0x052f,
 	0x0531, 0x0556,
-	0x0559, 0x055f,
-	0x0561, 0x0587,
-	0x0589, 0x058a,
+	0x0559, 0x058a,
 	0x058d, 0x058f,
 	0x0591, 0x05c7,
 	0x05d0, 0x05ea,
-	0x05f0, 0x05f4,
+	0x05ef, 0x05f4,
 	0x0600, 0x061c,
 	0x061e, 0x070d,
 	0x070f, 0x074a,
 	0x074d, 0x07b1,
 	0x07c0, 0x07fa,
-	0x0800, 0x082d,
+	0x07fd, 0x082d,
 	0x0830, 0x083e,
 	0x0840, 0x085b,
 	0x085e, 0x085e,
+	0x0860, 0x086a,
 	0x08a0, 0x08b4,
 	0x08b6, 0x08bd,
-	0x08d4, 0x0983,
+	0x08d3, 0x0983,
 	0x0985, 0x098c,
 	0x098f, 0x0990,
 	0x0993, 0x09a8,
@@ -32200,7 +34650,7 @@ static const OnigCodePoint CR_Age_9_0[] = {
 	0x09d7, 0x09d7,
 	0x09dc, 0x09dd,
 	0x09df, 0x09e3,
-	0x09e6, 0x09fb,
+	0x09e6, 0x09fe,
 	0x0a01, 0x0a03,
 	0x0a05, 0x0a0a,
 	0x0a0f, 0x0a10,
@@ -32216,7 +34666,7 @@ static const OnigCodePoint CR_Age_9_0[] = {
 	0x0a51, 0x0a51,
 	0x0a59, 0x0a5c,
 	0x0a5e, 0x0a5e,
-	0x0a66, 0x0a75,
+	0x0a66, 0x0a76,
 	0x0a81, 0x0a83,
 	0x0a85, 0x0a8d,
 	0x0a8f, 0x0a91,
@@ -32230,7 +34680,7 @@ static const OnigCodePoint CR_Age_9_0[] = {
 	0x0ad0, 0x0ad0,
 	0x0ae0, 0x0ae3,
 	0x0ae6, 0x0af1,
-	0x0af9, 0x0af9,
+	0x0af9, 0x0aff,
 	0x0b01, 0x0b03,
 	0x0b05, 0x0b0c,
 	0x0b0f, 0x0b10,
@@ -32261,8 +34711,7 @@ static const OnigCodePoint CR_Age_9_0[] = {
 	0x0bd0, 0x0bd0,
 	0x0bd7, 0x0bd7,
 	0x0be6, 0x0bfa,
-	0x0c00, 0x0c03,
-	0x0c05, 0x0c0c,
+	0x0c00, 0x0c0c,
 	0x0c0e, 0x0c10,
 	0x0c12, 0x0c28,
 	0x0c2a, 0x0c39,
@@ -32273,8 +34722,7 @@ static const OnigCodePoint CR_Age_9_0[] = {
 	0x0c58, 0x0c5a,
 	0x0c60, 0x0c63,
 	0x0c66, 0x0c6f,
-	0x0c78, 0x0c83,
-	0x0c85, 0x0c8c,
+	0x0c78, 0x0c8c,
 	0x0c8e, 0x0c90,
 	0x0c92, 0x0ca8,
 	0x0caa, 0x0cb3,
@@ -32287,11 +34735,10 @@ static const OnigCodePoint CR_Age_9_0[] = {
 	0x0ce0, 0x0ce3,
 	0x0ce6, 0x0cef,
 	0x0cf1, 0x0cf2,
-	0x0d01, 0x0d03,
+	0x0d00, 0x0d03,
 	0x0d05, 0x0d0c,
 	0x0d0e, 0x0d10,
-	0x0d12, 0x0d3a,
-	0x0d3d, 0x0d44,
+	0x0d12, 0x0d44,
 	0x0d46, 0x0d48,
 	0x0d4a, 0x0d4f,
 	0x0d54, 0x0d63,
@@ -32371,7 +34818,7 @@ static const OnigCodePoint CR_Age_9_0[] = {
 	0x17f0, 0x17f9,
 	0x1800, 0x180e,
 	0x1810, 0x1819,
-	0x1820, 0x1877,
+	0x1820, 0x1878,
 	0x1880, 0x18aa,
 	0x18b0, 0x18f5,
 	0x1900, 0x191e,
@@ -32396,10 +34843,10 @@ static const OnigCodePoint CR_Age_9_0[] = {
 	0x1bfc, 0x1c37,
 	0x1c3b, 0x1c49,
 	0x1c4d, 0x1c88,
-	0x1cc0, 0x1cc7,
-	0x1cd0, 0x1cf6,
-	0x1cf8, 0x1cf9,
-	0x1d00, 0x1df5,
+	0x1c90, 0x1cba,
+	0x1cbd, 0x1cc7,
+	0x1cd0, 0x1cf9,
+	0x1d00, 0x1df9,
 	0x1dfb, 0x1f15,
 	0x1f18, 0x1f1d,
 	0x1f20, 0x1f45,
@@ -32420,18 +34867,15 @@ static const OnigCodePoint CR_Age_9_0[] = {
 	0x2066, 0x2071,
 	0x2074, 0x208e,
 	0x2090, 0x209c,
-	0x20a0, 0x20be,
+	0x20a0, 0x20bf,
 	0x20d0, 0x20f0,
 	0x2100, 0x218b,
-	0x2190, 0x23fe,
-	0x2400, 0x2426,
+	0x2190, 0x2426,
 	0x2440, 0x244a,
 	0x2460, 0x2b73,
 	0x2b76, 0x2b95,
-	0x2b98, 0x2bb9,
-	0x2bbd, 0x2bc8,
-	0x2bca, 0x2bd1,
-	0x2bec, 0x2bef,
+	0x2b98, 0x2bc8,
+	0x2bca, 0x2bfe,
 	0x2c00, 0x2c2e,
 	0x2c30, 0x2c5e,
 	0x2c60, 0x2cf3,
@@ -32449,7 +34893,7 @@ static const OnigCodePoint CR_Age_9_0[] = {
 	0x2dc8, 0x2dce,
 	0x2dd0, 0x2dd6,
 	0x2dd8, 0x2dde,
-	0x2de0, 0x2e44,
+	0x2de0, 0x2e4e,
 	0x2e80, 0x2e99,
 	0x2e9b, 0x2ef3,
 	0x2f00, 0x2fd5,
@@ -32457,27 +34901,25 @@ static const OnigCodePoint CR_Age_9_0[] = {
 	0x3000, 0x303f,
 	0x3041, 0x3096,
 	0x3099, 0x30ff,
-	0x3105, 0x312d,
+	0x3105, 0x312f,
 	0x3131, 0x318e,
 	0x3190, 0x31ba,
 	0x31c0, 0x31e3,
 	0x31f0, 0x321e,
 	0x3220, 0x32fe,
 	0x3300, 0x4db5,
-	0x4dc0, 0x9fd5,
+	0x4dc0, 0x9fef,
 	0xa000, 0xa48c,
 	0xa490, 0xa4c6,
 	0xa4d0, 0xa62b,
 	0xa640, 0xa6f7,
-	0xa700, 0xa7ae,
-	0xa7b0, 0xa7b7,
+	0xa700, 0xa7b9,
 	0xa7f7, 0xa82b,
 	0xa830, 0xa839,
 	0xa840, 0xa877,
 	0xa880, 0xa8c5,
 	0xa8ce, 0xa8d9,
-	0xa8e0, 0xa8fd,
-	0xa900, 0xa953,
+	0xa8e0, 0xa953,
 	0xa95f, 0xa97c,
 	0xa980, 0xa9cd,
 	0xa9cf, 0xa9d9,
@@ -32543,7 +34985,7 @@ static const OnigCodePoint CR_Age_9_0[] = {
 	0x102a0, 0x102d0,
 	0x102e0, 0x102fb,
 	0x10300, 0x10323,
-	0x10330, 0x1034a,
+	0x1032d, 0x1034a,
 	0x10350, 0x1037a,
 	0x10380, 0x1039d,
 	0x1039f, 0x103c3,
@@ -32577,9 +35019,9 @@ static const OnigCodePoint CR_Age_9_0[] = {
 	0x10a05, 0x10a06,
 	0x10a0c, 0x10a13,
 	0x10a15, 0x10a17,
-	0x10a19, 0x10a33,
+	0x10a19, 0x10a35,
 	0x10a38, 0x10a3a,
-	0x10a3f, 0x10a47,
+	0x10a3f, 0x10a48,
 	0x10a50, 0x10a58,
 	0x10a60, 0x10a9f,
 	0x10ac0, 0x10ae6,
@@ -32593,15 +35035,19 @@ static const OnigCodePoint CR_Age_9_0[] = {
 	0x10c00, 0x10c48,
 	0x10c80, 0x10cb2,
 	0x10cc0, 0x10cf2,
-	0x10cfa, 0x10cff,
+	0x10cfa, 0x10d27,
+	0x10d30, 0x10d39,
 	0x10e60, 0x10e7e,
+	0x10f00, 0x10f27,
+	0x10f30, 0x10f59,
 	0x11000, 0x1104d,
 	0x11052, 0x1106f,
 	0x1107f, 0x110c1,
+	0x110cd, 0x110cd,
 	0x110d0, 0x110e8,
 	0x110f0, 0x110f9,
 	0x11100, 0x11134,
-	0x11136, 0x11143,
+	0x11136, 0x11146,
 	0x11150, 0x11176,
 	0x11180, 0x111cd,
 	0x111d0, 0x111df,
@@ -32622,7 +35068,7 @@ static const OnigCodePoint CR_Age_9_0[] = {
 	0x1132a, 0x11330,
 	0x11332, 0x11333,
 	0x11335, 0x11339,
-	0x1133c, 0x11344,
+	0x1133b, 0x11344,
 	0x11347, 0x11348,
 	0x1134b, 0x1134d,
 	0x11350, 0x11350,
@@ -32632,7 +35078,7 @@ static const OnigCodePoint CR_Age_9_0[] = {
 	0x11370, 0x11374,
 	0x11400, 0x11459,
 	0x1145b, 0x1145b,
-	0x1145d, 0x1145d,
+	0x1145d, 0x1145e,
 	0x11480, 0x114c7,
 	0x114d0, 0x114d9,
 	0x11580, 0x115b5,
@@ -32642,11 +35088,15 @@ static const OnigCodePoint CR_Age_9_0[] = {
 	0x11660, 0x1166c,
 	0x11680, 0x116b7,
 	0x116c0, 0x116c9,
-	0x11700, 0x11719,
+	0x11700, 0x1171a,
 	0x1171d, 0x1172b,
 	0x11730, 0x1173f,
+	0x11800, 0x1183b,
 	0x118a0, 0x118f2,
 	0x118ff, 0x118ff,
+	0x11a00, 0x11a47,
+	0x11a50, 0x11a83,
+	0x11a86, 0x11aa2,
 	0x11ac0, 0x11af8,
 	0x11c00, 0x11c08,
 	0x11c0a, 0x11c36,
@@ -32655,6 +35105,20 @@ static const OnigCodePoint CR_Age_9_0[] = {
 	0x11c70, 0x11c8f,
 	0x11c92, 0x11ca7,
 	0x11ca9, 0x11cb6,
+	0x11d00, 0x11d06,
+	0x11d08, 0x11d09,
+	0x11d0b, 0x11d36,
+	0x11d3a, 0x11d3a,
+	0x11d3c, 0x11d3d,
+	0x11d3f, 0x11d47,
+	0x11d50, 0x11d59,
+	0x11d60, 0x11d65,
+	0x11d67, 0x11d68,
+	0x11d6a, 0x11d8e,
+	0x11d90, 0x11d91,
+	0x11d93, 0x11d98,
+	0x11da0, 0x11da9,
+	0x11ee0, 0x11ef8,
 	0x12000, 0x12399,
 	0x12400, 0x1246e,
 	0x12470, 0x12474,
@@ -32672,13 +35136,15 @@ static const OnigCodePoint CR_Age_9_0[] = {
 	0x16b5b, 0x16b61,
 	0x16b63, 0x16b77,
 	0x16b7d, 0x16b8f,
+	0x16e40, 0x16e9a,
 	0x16f00, 0x16f44,
 	0x16f50, 0x16f7e,
 	0x16f8f, 0x16f9f,
-	0x16fe0, 0x16fe0,
-	0x17000, 0x187ec,
+	0x16fe0, 0x16fe1,
+	0x17000, 0x187f1,
 	0x18800, 0x18af2,
-	0x1b000, 0x1b001,
+	0x1b000, 0x1b11e,
+	0x1b170, 0x1b2fb,
 	0x1bc00, 0x1bc6a,
 	0x1bc70, 0x1bc7c,
 	0x1bc80, 0x1bc88,
@@ -32688,8 +35154,9 @@ static const OnigCodePoint CR_Age_9_0[] = {
 	0x1d100, 0x1d126,
 	0x1d129, 0x1d1e8,
 	0x1d200, 0x1d245,
+	0x1d2e0, 0x1d2f3,
 	0x1d300, 0x1d356,
-	0x1d360, 0x1d371,
+	0x1d360, 0x1d378,
 	0x1d400, 0x1d454,
 	0x1d456, 0x1d49c,
 	0x1d49e, 0x1d49f,
@@ -32723,6 +35190,7 @@ static const OnigCodePoint CR_Age_9_0[] = {
 	0x1e900, 0x1e94a,
 	0x1e950, 0x1e959,
 	0x1e95e, 0x1e95f,
+	0x1ec71, 0x1ecb4,
 	0x1ee00, 0x1ee03,
 	0x1ee05, 0x1ee1f,
 	0x1ee21, 0x1ee22,
@@ -32764,35 +35232,38 @@ static const OnigCodePoint CR_Age_9_0[] = {
 	0x1f0c1, 0x1f0cf,
 	0x1f0d1, 0x1f0f5,
 	0x1f100, 0x1f10c,
-	0x1f110, 0x1f12e,
-	0x1f130, 0x1f16b,
+	0x1f110, 0x1f16b,
 	0x1f170, 0x1f1ac,
 	0x1f1e6, 0x1f202,
 	0x1f210, 0x1f23b,
 	0x1f240, 0x1f248,
 	0x1f250, 0x1f251,
-	0x1f300, 0x1f6d2,
+	0x1f260, 0x1f265,
+	0x1f300, 0x1f6d4,
 	0x1f6e0, 0x1f6ec,
-	0x1f6f0, 0x1f6f6,
+	0x1f6f0, 0x1f6f9,
 	0x1f700, 0x1f773,
-	0x1f780, 0x1f7d4,
+	0x1f780, 0x1f7d8,
 	0x1f800, 0x1f80b,
 	0x1f810, 0x1f847,
 	0x1f850, 0x1f859,
 	0x1f860, 0x1f887,
 	0x1f890, 0x1f8ad,
-	0x1f910, 0x1f91e,
-	0x1f920, 0x1f927,
-	0x1f930, 0x1f930,
-	0x1f933, 0x1f93e,
-	0x1f940, 0x1f94b,
-	0x1f950, 0x1f95e,
-	0x1f980, 0x1f991,
-	0x1f9c0, 0x1f9c0,
+	0x1f900, 0x1f90b,
+	0x1f910, 0x1f93e,
+	0x1f940, 0x1f970,
+	0x1f973, 0x1f976,
+	0x1f97a, 0x1f97a,
+	0x1f97c, 0x1f9a2,
+	0x1f9b0, 0x1f9b9,
+	0x1f9c0, 0x1f9c2,
+	0x1f9d0, 0x1f9ff,
+	0x1fa60, 0x1fa6d,
 	0x1fffe, 0x2a6d6,
 	0x2a700, 0x2b734,
 	0x2b740, 0x2b81d,
 	0x2b820, 0x2cea1,
+	0x2ceb0, 0x2ebe0,
 	0x2f800, 0x2fa1d,
 	0x2fffe, 0x2ffff,
 	0x3fffe, 0x3ffff,
@@ -32810,11 +35281,11 @@ static const OnigCodePoint CR_Age_9_0[] = {
 	0xe0020, 0xe007f,
 	0xe0100, 0xe01ef,
 	0xefffe, 0x10ffff,
-}; /* CR_Age_9_0 */
+}; /* CR_Age_11_0 */
 
-/* 'Age_10_0': Derived Age 10.0 */
-static const OnigCodePoint CR_Age_10_0[] = {
-	659,
+/* 'Age_12_0': Derived Age 12.0 */
+static const OnigCodePoint CR_Age_12_0[] = {
+	677,
 	0x0000, 0x0377,
 	0x037a, 0x037f,
 	0x0384, 0x038a,
@@ -32822,26 +35293,24 @@ static const OnigCodePoint CR_Age_10_0[] = {
 	0x038e, 0x03a1,
 	0x03a3, 0x052f,
 	0x0531, 0x0556,
-	0x0559, 0x055f,
-	0x0561, 0x0587,
-	0x0589, 0x058a,
+	0x0559, 0x058a,
 	0x058d, 0x058f,
 	0x0591, 0x05c7,
 	0x05d0, 0x05ea,
-	0x05f0, 0x05f4,
+	0x05ef, 0x05f4,
 	0x0600, 0x061c,
 	0x061e, 0x070d,
 	0x070f, 0x074a,
 	0x074d, 0x07b1,
 	0x07c0, 0x07fa,
-	0x0800, 0x082d,
+	0x07fd, 0x082d,
 	0x0830, 0x083e,
 	0x0840, 0x085b,
 	0x085e, 0x085e,
 	0x0860, 0x086a,
 	0x08a0, 0x08b4,
 	0x08b6, 0x08bd,
-	0x08d4, 0x0983,
+	0x08d3, 0x0983,
 	0x0985, 0x098c,
 	0x098f, 0x0990,
 	0x0993, 0x09a8,
@@ -32854,7 +35323,7 @@ static const OnigCodePoint CR_Age_10_0[] = {
 	0x09d7, 0x09d7,
 	0x09dc, 0x09dd,
 	0x09df, 0x09e3,
-	0x09e6, 0x09fd,
+	0x09e6, 0x09fe,
 	0x0a01, 0x0a03,
 	0x0a05, 0x0a0a,
 	0x0a0f, 0x0a10,
@@ -32870,7 +35339,7 @@ static const OnigCodePoint CR_Age_10_0[] = {
 	0x0a51, 0x0a51,
 	0x0a59, 0x0a5c,
 	0x0a5e, 0x0a5e,
-	0x0a66, 0x0a75,
+	0x0a66, 0x0a76,
 	0x0a81, 0x0a83,
 	0x0a85, 0x0a8d,
 	0x0a8f, 0x0a91,
@@ -32915,8 +35384,7 @@ static const OnigCodePoint CR_Age_10_0[] = {
 	0x0bd0, 0x0bd0,
 	0x0bd7, 0x0bd7,
 	0x0be6, 0x0bfa,
-	0x0c00, 0x0c03,
-	0x0c05, 0x0c0c,
+	0x0c00, 0x0c0c,
 	0x0c0e, 0x0c10,
 	0x0c12, 0x0c28,
 	0x0c2a, 0x0c39,
@@ -32927,8 +35395,7 @@ static const OnigCodePoint CR_Age_10_0[] = {
 	0x0c58, 0x0c5a,
 	0x0c60, 0x0c63,
 	0x0c66, 0x0c6f,
-	0x0c78, 0x0c83,
-	0x0c85, 0x0c8c,
+	0x0c77, 0x0c8c,
 	0x0c8e, 0x0c90,
 	0x0c92, 0x0ca8,
 	0x0caa, 0x0cb3,
@@ -32965,17 +35432,10 @@ static const OnigCodePoint CR_Age_10_0[] = {
 	0x0e3f, 0x0e5b,
 	0x0e81, 0x0e82,
 	0x0e84, 0x0e84,
-	0x0e87, 0x0e88,
-	0x0e8a, 0x0e8a,
-	0x0e8d, 0x0e8d,
-	0x0e94, 0x0e97,
-	0x0e99, 0x0e9f,
-	0x0ea1, 0x0ea3,
+	0x0e86, 0x0e8a,
+	0x0e8c, 0x0ea3,
 	0x0ea5, 0x0ea5,
-	0x0ea7, 0x0ea7,
-	0x0eaa, 0x0eab,
-	0x0ead, 0x0eb9,
-	0x0ebb, 0x0ebd,
+	0x0ea7, 0x0ebd,
 	0x0ec0, 0x0ec4,
 	0x0ec6, 0x0ec6,
 	0x0ec8, 0x0ecd,
@@ -33024,7 +35484,7 @@ static const OnigCodePoint CR_Age_10_0[] = {
 	0x17f0, 0x17f9,
 	0x1800, 0x180e,
 	0x1810, 0x1819,
-	0x1820, 0x1877,
+	0x1820, 0x1878,
 	0x1880, 0x18aa,
 	0x18b0, 0x18f5,
 	0x1900, 0x191e,
@@ -33049,8 +35509,9 @@ static const OnigCodePoint CR_Age_10_0[] = {
 	0x1bfc, 0x1c37,
 	0x1c3b, 0x1c49,
 	0x1c4d, 0x1c88,
-	0x1cc0, 0x1cc7,
-	0x1cd0, 0x1cf9,
+	0x1c90, 0x1cba,
+	0x1cbd, 0x1cc7,
+	0x1cd0, 0x1cfa,
 	0x1d00, 0x1df9,
 	0x1dfb, 0x1f15,
 	0x1f18, 0x1f1d,
@@ -33079,11 +35540,7 @@ static const OnigCodePoint CR_Age_10_0[] = {
 	0x2440, 0x244a,
 	0x2460, 0x2b73,
 	0x2b76, 0x2b95,
-	0x2b98, 0x2bb9,
-	0x2bbd, 0x2bc8,
-	0x2bca, 0x2bd2,
-	0x2bec, 0x2bef,
-	0x2c00, 0x2c2e,
+	0x2b98, 0x2c2e,
 	0x2c30, 0x2c5e,
 	0x2c60, 0x2cf3,
 	0x2cf9, 0x2d25,
@@ -33100,7 +35557,7 @@ static const OnigCodePoint CR_Age_10_0[] = {
 	0x2dc8, 0x2dce,
 	0x2dd0, 0x2dd6,
 	0x2dd8, 0x2dde,
-	0x2de0, 0x2e49,
+	0x2de0, 0x2e4f,
 	0x2e80, 0x2e99,
 	0x2e9b, 0x2ef3,
 	0x2f00, 0x2fd5,
@@ -33108,27 +35565,26 @@ static const OnigCodePoint CR_Age_10_0[] = {
 	0x3000, 0x303f,
 	0x3041, 0x3096,
 	0x3099, 0x30ff,
-	0x3105, 0x312e,
+	0x3105, 0x312f,
 	0x3131, 0x318e,
 	0x3190, 0x31ba,
 	0x31c0, 0x31e3,
 	0x31f0, 0x321e,
 	0x3220, 0x32fe,
 	0x3300, 0x4db5,
-	0x4dc0, 0x9fea,
+	0x4dc0, 0x9fef,
 	0xa000, 0xa48c,
 	0xa490, 0xa4c6,
 	0xa4d0, 0xa62b,
 	0xa640, 0xa6f7,
-	0xa700, 0xa7ae,
-	0xa7b0, 0xa7b7,
+	0xa700, 0xa7bf,
+	0xa7c2, 0xa7c6,
 	0xa7f7, 0xa82b,
 	0xa830, 0xa839,
 	0xa840, 0xa877,
 	0xa880, 0xa8c5,
 	0xa8ce, 0xa8d9,
-	0xa8e0, 0xa8fd,
-	0xa900, 0xa953,
+	0xa8e0, 0xa953,
 	0xa95f, 0xa97c,
 	0xa980, 0xa9cd,
 	0xa9cf, 0xa9d9,
@@ -33143,7 +35599,7 @@ static const OnigCodePoint CR_Age_10_0[] = {
 	0xab11, 0xab16,
 	0xab20, 0xab26,
 	0xab28, 0xab2e,
-	0xab30, 0xab65,
+	0xab30, 0xab67,
 	0xab70, 0xabed,
 	0xabf0, 0xabf9,
 	0xac00, 0xd7a3,
@@ -33228,9 +35684,9 @@ static const OnigCodePoint CR_Age_10_0[] = {
 	0x10a05, 0x10a06,
 	0x10a0c, 0x10a13,
 	0x10a15, 0x10a17,
-	0x10a19, 0x10a33,
+	0x10a19, 0x10a35,
 	0x10a38, 0x10a3a,
-	0x10a3f, 0x10a47,
+	0x10a3f, 0x10a48,
 	0x10a50, 0x10a58,
 	0x10a60, 0x10a9f,
 	0x10ac0, 0x10ae6,
@@ -33244,15 +35700,20 @@ static const OnigCodePoint CR_Age_10_0[] = {
 	0x10c00, 0x10c48,
 	0x10c80, 0x10cb2,
 	0x10cc0, 0x10cf2,
-	0x10cfa, 0x10cff,
+	0x10cfa, 0x10d27,
+	0x10d30, 0x10d39,
 	0x10e60, 0x10e7e,
+	0x10f00, 0x10f27,
+	0x10f30, 0x10f59,
+	0x10fe0, 0x10ff6,
 	0x11000, 0x1104d,
 	0x11052, 0x1106f,
 	0x1107f, 0x110c1,
+	0x110cd, 0x110cd,
 	0x110d0, 0x110e8,
 	0x110f0, 0x110f9,
 	0x11100, 0x11134,
-	0x11136, 0x11143,
+	0x11136, 0x11146,
 	0x11150, 0x11176,
 	0x11180, 0x111cd,
 	0x111d0, 0x111df,
@@ -33273,7 +35734,7 @@ static const OnigCodePoint CR_Age_10_0[] = {
 	0x1132a, 0x11330,
 	0x11332, 0x11333,
 	0x11335, 0x11339,
-	0x1133c, 0x11344,
+	0x1133b, 0x11344,
 	0x11347, 0x11348,
 	0x1134b, 0x1134d,
 	0x11350, 0x11350,
@@ -33283,7 +35744,7 @@ static const OnigCodePoint CR_Age_10_0[] = {
 	0x11370, 0x11374,
 	0x11400, 0x11459,
 	0x1145b, 0x1145b,
-	0x1145d, 0x1145d,
+	0x1145d, 0x1145f,
 	0x11480, 0x114c7,
 	0x114d0, 0x114d9,
 	0x11580, 0x115b5,
@@ -33291,17 +35752,19 @@ static const OnigCodePoint CR_Age_10_0[] = {
 	0x11600, 0x11644,
 	0x11650, 0x11659,
 	0x11660, 0x1166c,
-	0x11680, 0x116b7,
+	0x11680, 0x116b8,
 	0x116c0, 0x116c9,
-	0x11700, 0x11719,
+	0x11700, 0x1171a,
 	0x1171d, 0x1172b,
 	0x11730, 0x1173f,
+	0x11800, 0x1183b,
 	0x118a0, 0x118f2,
 	0x118ff, 0x118ff,
+	0x119a0, 0x119a7,
+	0x119aa, 0x119d7,
+	0x119da, 0x119e4,
 	0x11a00, 0x11a47,
-	0x11a50, 0x11a83,
-	0x11a86, 0x11a9c,
-	0x11a9e, 0x11aa2,
+	0x11a50, 0x11aa2,
 	0x11ac0, 0x11af8,
 	0x11c00, 0x11c08,
 	0x11c0a, 0x11c36,
@@ -33317,11 +35780,20 @@ static const OnigCodePoint CR_Age_10_0[] = {
 	0x11d3c, 0x11d3d,
 	0x11d3f, 0x11d47,
 	0x11d50, 0x11d59,
-	0x12000, 0x12399,
+	0x11d60, 0x11d65,
+	0x11d67, 0x11d68,
+	0x11d6a, 0x11d8e,
+	0x11d90, 0x11d91,
+	0x11d93, 0x11d98,
+	0x11da0, 0x11da9,
+	0x11ee0, 0x11ef8,
+	0x11fc0, 0x11ff1,
+	0x11fff, 0x12399,
 	0x12400, 0x1246e,
 	0x12470, 0x12474,
 	0x12480, 0x12543,
 	0x13000, 0x1342e,
+	0x13430, 0x13438,
 	0x14400, 0x14646,
 	0x16800, 0x16a38,
 	0x16a40, 0x16a5e,
@@ -33334,13 +35806,16 @@ static const OnigCodePoint CR_Age_10_0[] = {
 	0x16b5b, 0x16b61,
 	0x16b63, 0x16b77,
 	0x16b7d, 0x16b8f,
-	0x16f00, 0x16f44,
-	0x16f50, 0x16f7e,
+	0x16e40, 0x16e9a,
+	0x16f00, 0x16f4a,
+	0x16f4f, 0x16f87,
 	0x16f8f, 0x16f9f,
-	0x16fe0, 0x16fe1,
-	0x17000, 0x187ec,
+	0x16fe0, 0x16fe3,
+	0x17000, 0x187f7,
 	0x18800, 0x18af2,
 	0x1b000, 0x1b11e,
+	0x1b150, 0x1b152,
+	0x1b164, 0x1b167,
 	0x1b170, 0x1b2fb,
 	0x1bc00, 0x1bc6a,
 	0x1bc70, 0x1bc7c,
@@ -33351,8 +35826,9 @@ static const OnigCodePoint CR_Age_10_0[] = {
 	0x1d100, 0x1d126,
 	0x1d129, 0x1d1e8,
 	0x1d200, 0x1d245,
+	0x1d2e0, 0x1d2f3,
 	0x1d300, 0x1d356,
-	0x1d360, 0x1d371,
+	0x1d360, 0x1d378,
 	0x1d400, 0x1d454,
 	0x1d456, 0x1d49c,
 	0x1d49e, 0x1d49f,
@@ -33381,11 +35857,19 @@ static const OnigCodePoint CR_Age_10_0[] = {
 	0x1e01b, 0x1e021,
 	0x1e023, 0x1e024,
 	0x1e026, 0x1e02a,
+	0x1e100, 0x1e12c,
+	0x1e130, 0x1e13d,
+	0x1e140, 0x1e149,
+	0x1e14e, 0x1e14f,
+	0x1e2c0, 0x1e2f9,
+	0x1e2ff, 0x1e2ff,
 	0x1e800, 0x1e8c4,
 	0x1e8c7, 0x1e8d6,
-	0x1e900, 0x1e94a,
+	0x1e900, 0x1e94b,
 	0x1e950, 0x1e959,
 	0x1e95e, 0x1e95f,
+	0x1ec71, 0x1ecb4,
+	0x1ed01, 0x1ed3d,
 	0x1ee00, 0x1ee03,
 	0x1ee05, 0x1ee1f,
 	0x1ee21, 0x1ee22,
@@ -33427,31 +35911,36 @@ static const OnigCodePoint CR_Age_10_0[] = {
 	0x1f0c1, 0x1f0cf,
 	0x1f0d1, 0x1f0f5,
 	0x1f100, 0x1f10c,
-	0x1f110, 0x1f12e,
-	0x1f130, 0x1f16b,
+	0x1f110, 0x1f16c,
 	0x1f170, 0x1f1ac,
 	0x1f1e6, 0x1f202,
 	0x1f210, 0x1f23b,
 	0x1f240, 0x1f248,
 	0x1f250, 0x1f251,
 	0x1f260, 0x1f265,
-	0x1f300, 0x1f6d4,
+	0x1f300, 0x1f6d5,
 	0x1f6e0, 0x1f6ec,
-	0x1f6f0, 0x1f6f8,
+	0x1f6f0, 0x1f6fa,
 	0x1f700, 0x1f773,
-	0x1f780, 0x1f7d4,
+	0x1f780, 0x1f7d8,
+	0x1f7e0, 0x1f7eb,
 	0x1f800, 0x1f80b,
 	0x1f810, 0x1f847,
 	0x1f850, 0x1f859,
 	0x1f860, 0x1f887,
 	0x1f890, 0x1f8ad,
 	0x1f900, 0x1f90b,
-	0x1f910, 0x1f93e,
-	0x1f940, 0x1f94c,
-	0x1f950, 0x1f96b,
-	0x1f980, 0x1f997,
-	0x1f9c0, 0x1f9c0,
-	0x1f9d0, 0x1f9e6,
+	0x1f90d, 0x1f971,
+	0x1f973, 0x1f976,
+	0x1f97a, 0x1f9a2,
+	0x1f9a5, 0x1f9aa,
+	0x1f9ae, 0x1f9ca,
+	0x1f9cd, 0x1fa53,
+	0x1fa60, 0x1fa6d,
+	0x1fa70, 0x1fa73,
+	0x1fa78, 0x1fa7a,
+	0x1fa80, 0x1fa82,
+	0x1fa90, 0x1fa95,
 	0x1fffe, 0x2a6d6,
 	0x2a700, 0x2b734,
 	0x2b740, 0x2b81d,
@@ -33474,11 +35963,11 @@ static const OnigCodePoint CR_Age_10_0[] = {
 	0xe0020, 0xe007f,
 	0xe0100, 0xe01ef,
 	0xefffe, 0x10ffff,
-}; /* CR_Age_10_0 */
+}; /* CR_Age_12_0 */
 
-/* 'Age_11_0': Derived Age 11.0 */
-static const OnigCodePoint CR_Age_11_0[] = {
-	668,
+/* 'Age_12_1': Derived Age 12.1 */
+static const OnigCodePoint CR_Age_12_1[] = {
+	676,
 	0x0000, 0x0377,
 	0x037a, 0x037f,
 	0x0384, 0x038a,
@@ -33588,7 +36077,7 @@ static const OnigCodePoint CR_Age_11_0[] = {
 	0x0c58, 0x0c5a,
 	0x0c60, 0x0c63,
 	0x0c66, 0x0c6f,
-	0x0c78, 0x0c8c,
+	0x0c77, 0x0c8c,
 	0x0c8e, 0x0c90,
 	0x0c92, 0x0ca8,
 	0x0caa, 0x0cb3,
@@ -33625,17 +36114,10 @@ static const OnigCodePoint CR_Age_11_0[] = {
 	0x0e3f, 0x0e5b,
 	0x0e81, 0x0e82,
 	0x0e84, 0x0e84,
-	0x0e87, 0x0e88,
-	0x0e8a, 0x0e8a,
-	0x0e8d, 0x0e8d,
-	0x0e94, 0x0e97,
-	0x0e99, 0x0e9f,
-	0x0ea1, 0x0ea3,
+	0x0e86, 0x0e8a,
+	0x0e8c, 0x0ea3,
 	0x0ea5, 0x0ea5,
-	0x0ea7, 0x0ea7,
-	0x0eaa, 0x0eab,
-	0x0ead, 0x0eb9,
-	0x0ebb, 0x0ebd,
+	0x0ea7, 0x0ebd,
 	0x0ec0, 0x0ec4,
 	0x0ec6, 0x0ec6,
 	0x0ec8, 0x0ecd,
@@ -33711,7 +36193,7 @@ static const OnigCodePoint CR_Age_11_0[] = {
 	0x1c4d, 0x1c88,
 	0x1c90, 0x1cba,
 	0x1cbd, 0x1cc7,
-	0x1cd0, 0x1cf9,
+	0x1cd0, 0x1cfa,
 	0x1d00, 0x1df9,
 	0x1dfb, 0x1f15,
 	0x1f18, 0x1f1d,
@@ -33740,9 +36222,7 @@ static const OnigCodePoint CR_Age_11_0[] = {
 	0x2440, 0x244a,
 	0x2460, 0x2b73,
 	0x2b76, 0x2b95,
-	0x2b98, 0x2bc8,
-	0x2bca, 0x2bfe,
-	0x2c00, 0x2c2e,
+	0x2b98, 0x2c2e,
 	0x2c30, 0x2c5e,
 	0x2c60, 0x2cf3,
 	0x2cf9, 0x2d25,
@@ -33759,7 +36239,7 @@ static const OnigCodePoint CR_Age_11_0[] = {
 	0x2dc8, 0x2dce,
 	0x2dd0, 0x2dd6,
 	0x2dd8, 0x2dde,
-	0x2de0, 0x2e4e,
+	0x2de0, 0x2e4f,
 	0x2e80, 0x2e99,
 	0x2e9b, 0x2ef3,
 	0x2f00, 0x2fd5,
@@ -33772,14 +36252,14 @@ static const OnigCodePoint CR_Age_11_0[] = {
 	0x3190, 0x31ba,
 	0x31c0, 0x31e3,
 	0x31f0, 0x321e,
-	0x3220, 0x32fe,
-	0x3300, 0x4db5,
+	0x3220, 0x4db5,
 	0x4dc0, 0x9fef,
 	0xa000, 0xa48c,
 	0xa490, 0xa4c6,
 	0xa4d0, 0xa62b,
 	0xa640, 0xa6f7,
-	0xa700, 0xa7b9,
+	0xa700, 0xa7bf,
+	0xa7c2, 0xa7c6,
 	0xa7f7, 0xa82b,
 	0xa830, 0xa839,
 	0xa840, 0xa877,
@@ -33800,7 +36280,7 @@ static const OnigCodePoint CR_Age_11_0[] = {
 	0xab11, 0xab16,
 	0xab20, 0xab26,
 	0xab28, 0xab2e,
-	0xab30, 0xab65,
+	0xab30, 0xab67,
 	0xab70, 0xabed,
 	0xabf0, 0xabf9,
 	0xac00, 0xd7a3,
@@ -33906,6 +36386,7 @@ static const OnigCodePoint CR_Age_11_0[] = {
 	0x10e60, 0x10e7e,
 	0x10f00, 0x10f27,
 	0x10f30, 0x10f59,
+	0x10fe0, 0x10ff6,
 	0x11000, 0x1104d,
 	0x11052, 0x1106f,
 	0x1107f, 0x110c1,
@@ -33944,7 +36425,7 @@ static const OnigCodePoint CR_Age_11_0[] = {
 	0x11370, 0x11374,
 	0x11400, 0x11459,
 	0x1145b, 0x1145b,
-	0x1145d, 0x1145e,
+	0x1145d, 0x1145f,
 	0x11480, 0x114c7,
 	0x114d0, 0x114d9,
 	0x11580, 0x115b5,
@@ -33952,7 +36433,7 @@ static const OnigCodePoint CR_Age_11_0[] = {
 	0x11600, 0x11644,
 	0x11650, 0x11659,
 	0x11660, 0x1166c,
-	0x11680, 0x116b7,
+	0x11680, 0x116b8,
 	0x116c0, 0x116c9,
 	0x11700, 0x1171a,
 	0x1171d, 0x1172b,
@@ -33960,9 +36441,11 @@ static const OnigCodePoint CR_Age_11_0[] = {
 	0x11800, 0x1183b,
 	0x118a0, 0x118f2,
 	0x118ff, 0x118ff,
+	0x119a0, 0x119a7,
+	0x119aa, 0x119d7,
+	0x119da, 0x119e4,
 	0x11a00, 0x11a47,
-	0x11a50, 0x11a83,
-	0x11a86, 0x11aa2,
+	0x11a50, 0x11aa2,
 	0x11ac0, 0x11af8,
 	0x11c00, 0x11c08,
 	0x11c0a, 0x11c36,
@@ -33985,11 +36468,13 @@ static const OnigCodePoint CR_Age_11_0[] = {
 	0x11d93, 0x11d98,
 	0x11da0, 0x11da9,
 	0x11ee0, 0x11ef8,
-	0x12000, 0x12399,
+	0x11fc0, 0x11ff1,
+	0x11fff, 0x12399,
 	0x12400, 0x1246e,
 	0x12470, 0x12474,
 	0x12480, 0x12543,
 	0x13000, 0x1342e,
+	0x13430, 0x13438,
 	0x14400, 0x14646,
 	0x16800, 0x16a38,
 	0x16a40, 0x16a5e,
@@ -34003,13 +36488,15 @@ static const OnigCodePoint CR_Age_11_0[] = {
 	0x16b63, 0x16b77,
 	0x16b7d, 0x16b8f,
 	0x16e40, 0x16e9a,
-	0x16f00, 0x16f44,
-	0x16f50, 0x16f7e,
+	0x16f00, 0x16f4a,
+	0x16f4f, 0x16f87,
 	0x16f8f, 0x16f9f,
-	0x16fe0, 0x16fe1,
-	0x17000, 0x187f1,
+	0x16fe0, 0x16fe3,
+	0x17000, 0x187f7,
 	0x18800, 0x18af2,
 	0x1b000, 0x1b11e,
+	0x1b150, 0x1b152,
+	0x1b164, 0x1b167,
 	0x1b170, 0x1b2fb,
 	0x1bc00, 0x1bc6a,
 	0x1bc70, 0x1bc7c,
@@ -34051,12 +36538,19 @@ static const OnigCodePoint CR_Age_11_0[] = {
 	0x1e01b, 0x1e021,
 	0x1e023, 0x1e024,
 	0x1e026, 0x1e02a,
+	0x1e100, 0x1e12c,
+	0x1e130, 0x1e13d,
+	0x1e140, 0x1e149,
+	0x1e14e, 0x1e14f,
+	0x1e2c0, 0x1e2f9,
+	0x1e2ff, 0x1e2ff,
 	0x1e800, 0x1e8c4,
 	0x1e8c7, 0x1e8d6,
-	0x1e900, 0x1e94a,
+	0x1e900, 0x1e94b,
 	0x1e950, 0x1e959,
 	0x1e95e, 0x1e95f,
 	0x1ec71, 0x1ecb4,
+	0x1ed01, 0x1ed3d,
 	0x1ee00, 0x1ee03,
 	0x1ee05, 0x1ee1f,
 	0x1ee21, 0x1ee22,
@@ -34098,33 +36592,36 @@ static const OnigCodePoint CR_Age_11_0[] = {
 	0x1f0c1, 0x1f0cf,
 	0x1f0d1, 0x1f0f5,
 	0x1f100, 0x1f10c,
-	0x1f110, 0x1f16b,
+	0x1f110, 0x1f16c,
 	0x1f170, 0x1f1ac,
 	0x1f1e6, 0x1f202,
 	0x1f210, 0x1f23b,
 	0x1f240, 0x1f248,
 	0x1f250, 0x1f251,
 	0x1f260, 0x1f265,
-	0x1f300, 0x1f6d4,
+	0x1f300, 0x1f6d5,
 	0x1f6e0, 0x1f6ec,
-	0x1f6f0, 0x1f6f9,
+	0x1f6f0, 0x1f6fa,
 	0x1f700, 0x1f773,
 	0x1f780, 0x1f7d8,
+	0x1f7e0, 0x1f7eb,
 	0x1f800, 0x1f80b,
 	0x1f810, 0x1f847,
 	0x1f850, 0x1f859,
 	0x1f860, 0x1f887,
 	0x1f890, 0x1f8ad,
 	0x1f900, 0x1f90b,
-	0x1f910, 0x1f93e,
-	0x1f940, 0x1f970,
+	0x1f90d, 0x1f971,
 	0x1f973, 0x1f976,
-	0x1f97a, 0x1f97a,
-	0x1f97c, 0x1f9a2,
-	0x1f9b0, 0x1f9b9,
-	0x1f9c0, 0x1f9c2,
-	0x1f9d0, 0x1f9ff,
+	0x1f97a, 0x1f9a2,
+	0x1f9a5, 0x1f9aa,
+	0x1f9ae, 0x1f9ca,
+	0x1f9cd, 0x1fa53,
 	0x1fa60, 0x1fa6d,
+	0x1fa70, 0x1fa73,
+	0x1fa78, 0x1fa7a,
+	0x1fa80, 0x1fa82,
+	0x1fa90, 0x1fa95,
 	0x1fffe, 0x2a6d6,
 	0x2a700, 0x2b734,
 	0x2b740, 0x2b81d,
@@ -34147,11 +36644,11 @@ static const OnigCodePoint CR_Age_11_0[] = {
 	0xe0020, 0xe007f,
 	0xe0100, 0xe01ef,
 	0xefffe, 0x10ffff,
-}; /* CR_Age_11_0 */
+}; /* CR_Age_12_1 */
 
-/* 'Age_12_0': Derived Age 12.0 */
-static const OnigCodePoint CR_Age_12_0[] = {
-	677,
+/* 'Age_13_0': Derived Age 13.0 */
+static const OnigCodePoint CR_Age_13_0[] = {
+	686,
 	0x0000, 0x0377,
 	0x037a, 0x037f,
 	0x0384, 0x038a,
@@ -34175,7 +36672,7 @@ static const OnigCodePoint CR_Age_12_0[] = {
 	0x085e, 0x085e,
 	0x0860, 0x086a,
 	0x08a0, 0x08b4,
-	0x08b6, 0x08bd,
+	0x08b6, 0x08c7,
 	0x08d3, 0x0983,
 	0x0985, 0x098c,
 	0x098f, 0x0990,
@@ -34230,7 +36727,7 @@ static const OnigCodePoint CR_Age_12_0[] = {
 	0x0b3c, 0x0b44,
 	0x0b47, 0x0b48,
 	0x0b4b, 0x0b4d,
-	0x0b56, 0x0b57,
+	0x0b55, 0x0b57,
 	0x0b5c, 0x0b5d,
 	0x0b5f, 0x0b63,
 	0x0b66, 0x0b77,
@@ -34274,15 +36771,14 @@ static const OnigCodePoint CR_Age_12_0[] = {
 	0x0ce0, 0x0ce3,
 	0x0ce6, 0x0cef,
 	0x0cf1, 0x0cf2,
-	0x0d00, 0x0d03,
-	0x0d05, 0x0d0c,
+	0x0d00, 0x0d0c,
 	0x0d0e, 0x0d10,
 	0x0d12, 0x0d44,
 	0x0d46, 0x0d48,
 	0x0d4a, 0x0d4f,
 	0x0d54, 0x0d63,
 	0x0d66, 0x0d7f,
-	0x0d82, 0x0d83,
+	0x0d81, 0x0d83,
 	0x0d85, 0x0d96,
 	0x0d9a, 0x0db1,
 	0x0db3, 0x0dbb,
@@ -34368,7 +36864,7 @@ static const OnigCodePoint CR_Age_12_0[] = {
 	0x1a7f, 0x1a89,
 	0x1a90, 0x1a99,
 	0x1aa0, 0x1aad,
-	0x1ab0, 0x1abe,
+	0x1ab0, 0x1ac0,
 	0x1b00, 0x1b4b,
 	0x1b50, 0x1b7c,
 	0x1b80, 0x1bf3,
@@ -34406,7 +36902,7 @@ static const OnigCodePoint CR_Age_12_0[] = {
 	0x2440, 0x244a,
 	0x2460, 0x2b73,
 	0x2b76, 0x2b95,
-	0x2b98, 0x2c2e,
+	0x2b97, 0x2c2e,
 	0x2c30, 0x2c5e,
 	0x2c60, 0x2cf3,
 	0x2cf9, 0x2d25,
@@ -34423,7 +36919,7 @@ static const OnigCodePoint CR_Age_12_0[] = {
 	0x2dc8, 0x2dce,
 	0x2dd0, 0x2dd6,
 	0x2dd8, 0x2dde,
-	0x2de0, 0x2e4f,
+	0x2de0, 0x2e52,
 	0x2e80, 0x2e99,
 	0x2e9b, 0x2ef3,
 	0x2f00, 0x2fd5,
@@ -34433,19 +36929,16 @@ static const OnigCodePoint CR_Age_12_0[] = {
 	0x3099, 0x30ff,
 	0x3105, 0x312f,
 	0x3131, 0x318e,
-	0x3190, 0x31ba,
-	0x31c0, 0x31e3,
+	0x3190, 0x31e3,
 	0x31f0, 0x321e,
-	0x3220, 0x32fe,
-	0x3300, 0x4db5,
-	0x4dc0, 0x9fef,
+	0x3220, 0x9ffc,
 	0xa000, 0xa48c,
 	0xa490, 0xa4c6,
 	0xa4d0, 0xa62b,
 	0xa640, 0xa6f7,
 	0xa700, 0xa7bf,
-	0xa7c2, 0xa7c6,
-	0xa7f7, 0xa82b,
+	0xa7c2, 0xa7ca,
+	0xa7f5, 0xa82c,
 	0xa830, 0xa839,
 	0xa840, 0xa877,
 	0xa880, 0xa8c5,
@@ -34465,7 +36958,7 @@ static const OnigCodePoint CR_Age_12_0[] = {
 	0xab11, 0xab16,
 	0xab20, 0xab26,
 	0xab28, 0xab2e,
-	0xab30, 0xab67,
+	0xab30, 0xab6b,
 	0xab70, 0xabed,
 	0xabf0, 0xabf9,
 	0xac00, 0xd7a3,
@@ -34509,7 +37002,7 @@ static const OnigCodePoint CR_Age_12_0[] = {
 	0x10100, 0x10102,
 	0x10107, 0x10133,
 	0x10137, 0x1018e,
-	0x10190, 0x1019b,
+	0x10190, 0x1019c,
 	0x101a0, 0x101a0,
 	0x101d0, 0x101fd,
 	0x10280, 0x1029c,
@@ -34569,8 +37062,12 @@ static const OnigCodePoint CR_Age_12_0[] = {
 	0x10cfa, 0x10d27,
 	0x10d30, 0x10d39,
 	0x10e60, 0x10e7e,
+	0x10e80, 0x10ea9,
+	0x10eab, 0x10ead,
+	0x10eb0, 0x10eb1,
 	0x10f00, 0x10f27,
 	0x10f30, 0x10f59,
+	0x10fb0, 0x10fcb,
 	0x10fe0, 0x10ff6,
 	0x11000, 0x1104d,
 	0x11052, 0x1106f,
@@ -34579,10 +37076,9 @@ static const OnigCodePoint CR_Age_12_0[] = {
 	0x110d0, 0x110e8,
 	0x110f0, 0x110f9,
 	0x11100, 0x11134,
-	0x11136, 0x11146,
+	0x11136, 0x11147,
 	0x11150, 0x11176,
-	0x11180, 0x111cd,
-	0x111d0, 0x111df,
+	0x11180, 0x111df,
 	0x111e1, 0x111f4,
 	0x11200, 0x11211,
 	0x11213, 0x1123e,
@@ -34608,9 +37104,8 @@ static const OnigCodePoint CR_Age_12_0[] = {
 	0x1135d, 0x11363,
 	0x11366, 0x1136c,
 	0x11370, 0x11374,
-	0x11400, 0x11459,
-	0x1145b, 0x1145b,
-	0x1145d, 0x1145f,
+	0x11400, 0x1145b,
+	0x1145d, 0x11461,
 	0x11480, 0x114c7,
 	0x114d0, 0x114d9,
 	0x11580, 0x115b5,
@@ -34625,7 +37120,14 @@ static const OnigCodePoint CR_Age_12_0[] = {
 	0x11730, 0x1173f,
 	0x11800, 0x1183b,
 	0x118a0, 0x118f2,
-	0x118ff, 0x118ff,
+	0x118ff, 0x11906,
+	0x11909, 0x11909,
+	0x1190c, 0x11913,
+	0x11915, 0x11916,
+	0x11918, 0x11935,
+	0x11937, 0x11938,
+	0x1193b, 0x11946,
+	0x11950, 0x11959,
 	0x119a0, 0x119a7,
 	0x119aa, 0x119d7,
 	0x119da, 0x119e4,
@@ -34653,6 +37155,7 @@ static const OnigCodePoint CR_Age_12_0[] = {
 	0x11d93, 0x11d98,
 	0x11da0, 0x11da9,
 	0x11ee0, 0x11ef8,
+	0x11fb0, 0x11fb0,
 	0x11fc0, 0x11ff1,
 	0x11fff, 0x12399,
 	0x12400, 0x1246e,
@@ -34676,9 +37179,11 @@ static const OnigCodePoint CR_Age_12_0[] = {
 	0x16f00, 0x16f4a,
 	0x16f4f, 0x16f87,
 	0x16f8f, 0x16f9f,
-	0x16fe0, 0x16fe3,
+	0x16fe0, 0x16fe4,
+	0x16ff0, 0x16ff1,
 	0x17000, 0x187f7,
-	0x18800, 0x18af2,
+	0x18800, 0x18cd5,
+	0x18d00, 0x18d08,
 	0x1b000, 0x1b11e,
 	0x1b150, 0x1b152,
 	0x1b164, 0x1b167,
@@ -34776,17 +37281,15 @@ static const OnigCodePoint CR_Age_12_0[] = {
 	0x1f0b1, 0x1f0bf,
 	0x1f0c1, 0x1f0cf,
 	0x1f0d1, 0x1f0f5,
-	0x1f100, 0x1f10c,
-	0x1f110, 0x1f16c,
-	0x1f170, 0x1f1ac,
+	0x1f100, 0x1f1ad,
 	0x1f1e6, 0x1f202,
 	0x1f210, 0x1f23b,
 	0x1f240, 0x1f248,
 	0x1f250, 0x1f251,
 	0x1f260, 0x1f265,
-	0x1f300, 0x1f6d5,
+	0x1f300, 0x1f6d7,
 	0x1f6e0, 0x1f6ec,
-	0x1f6f0, 0x1f6fa,
+	0x1f6f0, 0x1f6fc,
 	0x1f700, 0x1f773,
 	0x1f780, 0x1f7d8,
 	0x1f7e0, 0x1f7eb,
@@ -34795,25 +37298,28 @@ static const OnigCodePoint CR_Age_12_0[] = {
 	0x1f850, 0x1f859,
 	0x1f860, 0x1f887,
 	0x1f890, 0x1f8ad,
-	0x1f900, 0x1f90b,
-	0x1f90d, 0x1f971,
-	0x1f973, 0x1f976,
-	0x1f97a, 0x1f9a2,
-	0x1f9a5, 0x1f9aa,
-	0x1f9ae, 0x1f9ca,
+	0x1f8b0, 0x1f8b1,
+	0x1f900, 0x1f978,
+	0x1f97a, 0x1f9cb,
 	0x1f9cd, 0x1fa53,
 	0x1fa60, 0x1fa6d,
-	0x1fa70, 0x1fa73,
+	0x1fa70, 0x1fa74,
 	0x1fa78, 0x1fa7a,
-	0x1fa80, 0x1fa82,
-	0x1fa90, 0x1fa95,
-	0x1fffe, 0x2a6d6,
+	0x1fa80, 0x1fa86,
+	0x1fa90, 0x1faa8,
+	0x1fab0, 0x1fab6,
+	0x1fac0, 0x1fac2,
+	0x1fad0, 0x1fad6,
+	0x1fb00, 0x1fb92,
+	0x1fb94, 0x1fbca,
+	0x1fbf0, 0x1fbf9,
+	0x1fffe, 0x2a6dd,
 	0x2a700, 0x2b734,
 	0x2b740, 0x2b81d,
 	0x2b820, 0x2cea1,
 	0x2ceb0, 0x2ebe0,
 	0x2f800, 0x2fa1d,
-	0x2fffe, 0x2ffff,
+	0x2fffe, 0x3134a,
 	0x3fffe, 0x3ffff,
 	0x4fffe, 0x4ffff,
 	0x5fffe, 0x5ffff,
@@ -34829,11 +37335,11 @@ static const OnigCodePoint CR_Age_12_0[] = {
 	0xe0020, 0xe007f,
 	0xe0100, 0xe01ef,
 	0xefffe, 0x10ffff,
-}; /* CR_Age_12_0 */
+}; /* CR_Age_13_0 */
 
-/* 'Age_12_1': Derived Age 12.1 */
-static const OnigCodePoint CR_Age_12_1[] = {
-	676,
+/* 'Age_14_0': Derived Age 14.0 */
+static const OnigCodePoint CR_Age_14_0[] = {
+	706,
 	0x0000, 0x0377,
 	0x037a, 0x037f,
 	0x0384, 0x038a,
@@ -34846,8 +37352,7 @@ static const OnigCodePoint CR_Age_12_1[] = {
 	0x0591, 0x05c7,
 	0x05d0, 0x05ea,
 	0x05ef, 0x05f4,
-	0x0600, 0x061c,
-	0x061e, 0x070d,
+	0x0600, 0x070d,
 	0x070f, 0x074a,
 	0x074d, 0x07b1,
 	0x07c0, 0x07fa,
@@ -34856,9 +37361,9 @@ static const OnigCodePoint CR_Age_12_1[] = {
 	0x0840, 0x085b,
 	0x085e, 0x085e,
 	0x0860, 0x086a,
-	0x08a0, 0x08b4,
-	0x08b6, 0x08bd,
-	0x08d3, 0x0983,
+	0x0870, 0x088e,
+	0x0890, 0x0891,
+	0x0898, 0x0983,
 	0x0985, 0x098c,
 	0x098f, 0x0990,
 	0x0993, 0x09a8,
@@ -34912,7 +37417,7 @@ static const OnigCodePoint CR_Age_12_1[] = {
 	0x0b3c, 0x0b44,
 	0x0b47, 0x0b48,
 	0x0b4b, 0x0b4d,
-	0x0b56, 0x0b57,
+	0x0b55, 0x0b57,
 	0x0b5c, 0x0b5d,
 	0x0b5f, 0x0b63,
 	0x0b66, 0x0b77,
@@ -34936,11 +37441,12 @@ static const OnigCodePoint CR_Age_12_1[] = {
 	0x0c0e, 0x0c10,
 	0x0c12, 0x0c28,
 	0x0c2a, 0x0c39,
-	0x0c3d, 0x0c44,
+	0x0c3c, 0x0c44,
 	0x0c46, 0x0c48,
 	0x0c4a, 0x0c4d,
 	0x0c55, 0x0c56,
 	0x0c58, 0x0c5a,
+	0x0c5d, 0x0c5d,
 	0x0c60, 0x0c63,
 	0x0c66, 0x0c6f,
 	0x0c77, 0x0c8c,
@@ -34952,19 +37458,18 @@ static const OnigCodePoint CR_Age_12_1[] = {
 	0x0cc6, 0x0cc8,
 	0x0cca, 0x0ccd,
 	0x0cd5, 0x0cd6,
-	0x0cde, 0x0cde,
+	0x0cdd, 0x0cde,
 	0x0ce0, 0x0ce3,
 	0x0ce6, 0x0cef,
 	0x0cf1, 0x0cf2,
-	0x0d00, 0x0d03,
-	0x0d05, 0x0d0c,
+	0x0d00, 0x0d0c,
 	0x0d0e, 0x0d10,
 	0x0d12, 0x0d44,
 	0x0d46, 0x0d48,
 	0x0d4a, 0x0d4f,
 	0x0d54, 0x0d63,
 	0x0d66, 0x0d7f,
-	0x0d82, 0x0d83,
+	0x0d81, 0x0d83,
 	0x0d85, 0x0d96,
 	0x0d9a, 0x0db1,
 	0x0db3, 0x0dbb,
@@ -35020,9 +37525,8 @@ static const OnigCodePoint CR_Age_12_1[] = {
 	0x13f8, 0x13fd,
 	0x1400, 0x169c,
 	0x16a0, 0x16f8,
-	0x1700, 0x170c,
-	0x170e, 0x1714,
-	0x1720, 0x1736,
+	0x1700, 0x1715,
+	0x171f, 0x1736,
 	0x1740, 0x1753,
 	0x1760, 0x176c,
 	0x176e, 0x1770,
@@ -35030,8 +37534,7 @@ static const OnigCodePoint CR_Age_12_1[] = {
 	0x1780, 0x17dd,
 	0x17e0, 0x17e9,
 	0x17f0, 0x17f9,
-	0x1800, 0x180e,
-	0x1810, 0x1819,
+	0x1800, 0x1819,
 	0x1820, 0x1878,
 	0x1880, 0x18aa,
 	0x18b0, 0x18f5,
@@ -35050,9 +37553,9 @@ static const OnigCodePoint CR_Age_12_1[] = {
 	0x1a7f, 0x1a89,
 	0x1a90, 0x1a99,
 	0x1aa0, 0x1aad,
-	0x1ab0, 0x1abe,
-	0x1b00, 0x1b4b,
-	0x1b50, 0x1b7c,
+	0x1ab0, 0x1ace,
+	0x1b00, 0x1b4c,
+	0x1b50, 0x1b7e,
 	0x1b80, 0x1bf3,
 	0x1bfc, 0x1c37,
 	0x1c3b, 0x1c49,
@@ -35060,8 +37563,7 @@ static const OnigCodePoint CR_Age_12_1[] = {
 	0x1c90, 0x1cba,
 	0x1cbd, 0x1cc7,
 	0x1cd0, 0x1cfa,
-	0x1d00, 0x1df9,
-	0x1dfb, 0x1f15,
+	0x1d00, 0x1f15,
 	0x1f18, 0x1f1d,
 	0x1f20, 0x1f45,
 	0x1f48, 0x1f4d,
@@ -35081,16 +37583,14 @@ static const OnigCodePoint CR_Age_12_1[] = {
 	0x2066, 0x2071,
 	0x2074, 0x208e,
 	0x2090, 0x209c,
-	0x20a0, 0x20bf,
+	0x20a0, 0x20c0,
 	0x20d0, 0x20f0,
 	0x2100, 0x218b,
 	0x2190, 0x2426,
 	0x2440, 0x244a,
 	0x2460, 0x2b73,
 	0x2b76, 0x2b95,
-	0x2b98, 0x2c2e,
-	0x2c30, 0x2c5e,
-	0x2c60, 0x2cf3,
+	0x2b97, 0x2cf3,
 	0x2cf9, 0x2d25,
 	0x2d27, 0x2d27,
 	0x2d2d, 0x2d2d,
@@ -35105,7 +37605,7 @@ static const OnigCodePoint CR_Age_12_1[] = {
 	0x2dc8, 0x2dce,
 	0x2dd0, 0x2dd6,
 	0x2dd8, 0x2dde,
-	0x2de0, 0x2e4f,
+	0x2de0, 0x2e5d,
 	0x2e80, 0x2e99,
 	0x2e9b, 0x2ef3,
 	0x2f00, 0x2fd5,
@@ -35115,18 +37615,17 @@ static const OnigCodePoint CR_Age_12_1[] = {
 	0x3099, 0x30ff,
 	0x3105, 0x312f,
 	0x3131, 0x318e,
-	0x3190, 0x31ba,
-	0x31c0, 0x31e3,
+	0x3190, 0x31e3,
 	0x31f0, 0x321e,
-	0x3220, 0x4db5,
-	0x4dc0, 0x9fef,
-	0xa000, 0xa48c,
+	0x3220, 0xa48c,
 	0xa490, 0xa4c6,
 	0xa4d0, 0xa62b,
 	0xa640, 0xa6f7,
-	0xa700, 0xa7bf,
-	0xa7c2, 0xa7c6,
-	0xa7f7, 0xa82b,
+	0xa700, 0xa7ca,
+	0xa7d0, 0xa7d1,
+	0xa7d3, 0xa7d3,
+	0xa7d5, 0xa7d9,
+	0xa7f2, 0xa82c,
 	0xa830, 0xa839,
 	0xa840, 0xa877,
 	0xa880, 0xa8c5,
@@ -35146,7 +37645,7 @@ static const OnigCodePoint CR_Age_12_1[] = {
 	0xab11, 0xab16,
 	0xab20, 0xab26,
 	0xab28, 0xab2e,
-	0xab30, 0xab67,
+	0xab30, 0xab6b,
 	0xab70, 0xabed,
 	0xabf0, 0xabf9,
 	0xac00, 0xd7a3,
@@ -35161,12 +37660,10 @@ static const OnigCodePoint CR_Age_12_1[] = {
 	0xfb3e, 0xfb3e,
 	0xfb40, 0xfb41,
 	0xfb43, 0xfb44,
-	0xfb46, 0xfbc1,
-	0xfbd3, 0xfd3f,
-	0xfd50, 0xfd8f,
+	0xfb46, 0xfbc2,
+	0xfbd3, 0xfd8f,
 	0xfd92, 0xfdc7,
-	0xfdd0, 0xfdfd,
-	0xfe00, 0xfe19,
+	0xfdcf, 0xfe19,
 	0xfe20, 0xfe52,
 	0xfe54, 0xfe66,
 	0xfe68, 0xfe6b,
@@ -35190,7 +37687,7 @@ static const OnigCodePoint CR_Age_12_1[] = {
 	0x10100, 0x10102,
 	0x10107, 0x10133,
 	0x10137, 0x1018e,
-	0x10190, 0x1019b,
+	0x10190, 0x1019c,
 	0x101a0, 0x101a0,
 	0x101d0, 0x101fd,
 	0x10280, 0x1029c,
@@ -35208,10 +37705,20 @@ static const OnigCodePoint CR_Age_12_1[] = {
 	0x104d8, 0x104fb,
 	0x10500, 0x10527,
 	0x10530, 0x10563,
-	0x1056f, 0x1056f,
+	0x1056f, 0x1057a,
+	0x1057c, 0x1058a,
+	0x1058c, 0x10592,
+	0x10594, 0x10595,
+	0x10597, 0x105a1,
+	0x105a3, 0x105b1,
+	0x105b3, 0x105b9,
+	0x105bb, 0x105bc,
 	0x10600, 0x10736,
 	0x10740, 0x10755,
 	0x10760, 0x10767,
+	0x10780, 0x10785,
+	0x10787, 0x107b0,
+	0x107b2, 0x107ba,
 	0x10800, 0x10805,
 	0x10808, 0x10808,
 	0x1080a, 0x10835,
@@ -35250,20 +37757,24 @@ static const OnigCodePoint CR_Age_12_1[] = {
 	0x10cfa, 0x10d27,
 	0x10d30, 0x10d39,
 	0x10e60, 0x10e7e,
+	0x10e80, 0x10ea9,
+	0x10eab, 0x10ead,
+	0x10eb0, 0x10eb1,
 	0x10f00, 0x10f27,
 	0x10f30, 0x10f59,
+	0x10f70, 0x10f89,
+	0x10fb0, 0x10fcb,
 	0x10fe0, 0x10ff6,
 	0x11000, 0x1104d,
-	0x11052, 0x1106f,
-	0x1107f, 0x110c1,
+	0x11052, 0x11075,
+	0x1107f, 0x110c2,
 	0x110cd, 0x110cd,
 	0x110d0, 0x110e8,
 	0x110f0, 0x110f9,
 	0x11100, 0x11134,
-	0x11136, 0x11146,
+	0x11136, 0x11147,
 	0x11150, 0x11176,
-	0x11180, 0x111cd,
-	0x111d0, 0x111df,
+	0x11180, 0x111df,
 	0x111e1, 0x111f4,
 	0x11200, 0x11211,
 	0x11213, 0x1123e,
@@ -35289,9 +37800,8 @@ static const OnigCodePoint CR_Age_12_1[] = {
 	0x1135d, 0x11363,
 	0x11366, 0x1136c,
 	0x11370, 0x11374,
-	0x11400, 0x11459,
-	0x1145b, 0x1145b,
-	0x1145d, 0x1145f,
+	0x11400, 0x1145b,
+	0x1145d, 0x11461,
 	0x11480, 0x114c7,
 	0x114d0, 0x114d9,
 	0x11580, 0x115b5,
@@ -35299,20 +37809,27 @@ static const OnigCodePoint CR_Age_12_1[] = {
 	0x11600, 0x11644,
 	0x11650, 0x11659,
 	0x11660, 0x1166c,
-	0x11680, 0x116b8,
+	0x11680, 0x116b9,
 	0x116c0, 0x116c9,
 	0x11700, 0x1171a,
 	0x1171d, 0x1172b,
-	0x11730, 0x1173f,
+	0x11730, 0x11746,
 	0x11800, 0x1183b,
 	0x118a0, 0x118f2,
-	0x118ff, 0x118ff,
+	0x118ff, 0x11906,
+	0x11909, 0x11909,
+	0x1190c, 0x11913,
+	0x11915, 0x11916,
+	0x11918, 0x11935,
+	0x11937, 0x11938,
+	0x1193b, 0x11946,
+	0x11950, 0x11959,
 	0x119a0, 0x119a7,
 	0x119aa, 0x119d7,
 	0x119da, 0x119e4,
 	0x11a00, 0x11a47,
 	0x11a50, 0x11aa2,
-	0x11ac0, 0x11af8,
+	0x11ab0, 0x11af8,
 	0x11c00, 0x11c08,
 	0x11c0a, 0x11c36,
 	0x11c38, 0x11c45,
@@ -35334,18 +37851,21 @@ static const OnigCodePoint CR_Age_12_1[] = {
 	0x11d93, 0x11d98,
 	0x11da0, 0x11da9,
 	0x11ee0, 0x11ef8,
+	0x11fb0, 0x11fb0,
 	0x11fc0, 0x11ff1,
 	0x11fff, 0x12399,
 	0x12400, 0x1246e,
 	0x12470, 0x12474,
 	0x12480, 0x12543,
+	0x12f90, 0x12ff2,
 	0x13000, 0x1342e,
 	0x13430, 0x13438,
 	0x14400, 0x14646,
 	0x16800, 0x16a38,
 	0x16a40, 0x16a5e,
 	0x16a60, 0x16a69,
-	0x16a6e, 0x16a6f,
+	0x16a6e, 0x16abe,
+	0x16ac0, 0x16ac9,
 	0x16ad0, 0x16aed,
 	0x16af0, 0x16af5,
 	0x16b00, 0x16b45,
@@ -35357,10 +37877,15 @@ static const OnigCodePoint CR_Age_12_1[] = {
 	0x16f00, 0x16f4a,
 	0x16f4f, 0x16f87,
 	0x16f8f, 0x16f9f,
-	0x16fe0, 0x16fe3,
+	0x16fe0, 0x16fe4,
+	0x16ff0, 0x16ff1,
 	0x17000, 0x187f7,
-	0x18800, 0x18af2,
-	0x1b000, 0x1b11e,
+	0x18800, 0x18cd5,
+	0x18d00, 0x18d08,
+	0x1aff0, 0x1aff3,
+	0x1aff5, 0x1affb,
+	0x1affd, 0x1affe,
+	0x1b000, 0x1b122,
 	0x1b150, 0x1b152,
 	0x1b164, 0x1b167,
 	0x1b170, 0x1b2fb,
@@ -35369,9 +37894,12 @@ static const OnigCodePoint CR_Age_12_1[] = {
 	0x1bc80, 0x1bc88,
 	0x1bc90, 0x1bc99,
 	0x1bc9c, 0x1bca3,
+	0x1cf00, 0x1cf2d,
+	0x1cf30, 0x1cf46,
+	0x1cf50, 0x1cfc3,
 	0x1d000, 0x1d0f5,
 	0x1d100, 0x1d126,
-	0x1d129, 0x1d1e8,
+	0x1d129, 0x1d1ea,
 	0x1d200, 0x1d245,
 	0x1d2e0, 0x1d2f3,
 	0x1d300, 0x1d356,
@@ -35399,6 +37927,7 @@ static const OnigCodePoint CR_Age_12_1[] = {
 	0x1d7ce, 0x1da8b,
 	0x1da9b, 0x1da9f,
 	0x1daa1, 0x1daaf,
+	0x1df00, 0x1df1e,
 	0x1e000, 0x1e006,
 	0x1e008, 0x1e018,
 	0x1e01b, 0x1e021,
@@ -35408,8 +37937,13 @@ static const OnigCodePoint CR_Age_12_1[] = {
 	0x1e130, 0x1e13d,
 	0x1e140, 0x1e149,
 	0x1e14e, 0x1e14f,
+	0x1e290, 0x1e2ae,
 	0x1e2c0, 0x1e2f9,
 	0x1e2ff, 0x1e2ff,
+	0x1e7e0, 0x1e7e6,
+	0x1e7e8, 0x1e7eb,
+	0x1e7ed, 0x1e7ee,
+	0x1e7f0, 0x1e7fe,
 	0x1e800, 0x1e8c4,
 	0x1e8c7, 0x1e8d6,
 	0x1e900, 0x1e94b,
@@ -35457,44 +37991,46 @@ static const OnigCodePoint CR_Age_12_1[] = {
 	0x1f0b1, 0x1f0bf,
 	0x1f0c1, 0x1f0cf,
 	0x1f0d1, 0x1f0f5,
-	0x1f100, 0x1f10c,
-	0x1f110, 0x1f16c,
-	0x1f170, 0x1f1ac,
+	0x1f100, 0x1f1ad,
 	0x1f1e6, 0x1f202,
 	0x1f210, 0x1f23b,
 	0x1f240, 0x1f248,
 	0x1f250, 0x1f251,
 	0x1f260, 0x1f265,
-	0x1f300, 0x1f6d5,
-	0x1f6e0, 0x1f6ec,
-	0x1f6f0, 0x1f6fa,
+	0x1f300, 0x1f6d7,
+	0x1f6dd, 0x1f6ec,
+	0x1f6f0, 0x1f6fc,
 	0x1f700, 0x1f773,
 	0x1f780, 0x1f7d8,
 	0x1f7e0, 0x1f7eb,
+	0x1f7f0, 0x1f7f0,
 	0x1f800, 0x1f80b,
 	0x1f810, 0x1f847,
 	0x1f850, 0x1f859,
 	0x1f860, 0x1f887,
 	0x1f890, 0x1f8ad,
-	0x1f900, 0x1f90b,
-	0x1f90d, 0x1f971,
-	0x1f973, 0x1f976,
-	0x1f97a, 0x1f9a2,
-	0x1f9a5, 0x1f9aa,
-	0x1f9ae, 0x1f9ca,
-	0x1f9cd, 0x1fa53,
+	0x1f8b0, 0x1f8b1,
+	0x1f900, 0x1fa53,
 	0x1fa60, 0x1fa6d,
-	0x1fa70, 0x1fa73,
-	0x1fa78, 0x1fa7a,
-	0x1fa80, 0x1fa82,
-	0x1fa90, 0x1fa95,
-	0x1fffe, 0x2a6d6,
-	0x2a700, 0x2b734,
+	0x1fa70, 0x1fa74,
+	0x1fa78, 0x1fa7c,
+	0x1fa80, 0x1fa86,
+	0x1fa90, 0x1faac,
+	0x1fab0, 0x1faba,
+	0x1fac0, 0x1fac5,
+	0x1fad0, 0x1fad9,
+	0x1fae0, 0x1fae7,
+	0x1faf0, 0x1faf6,
+	0x1fb00, 0x1fb92,
+	0x1fb94, 0x1fbca,
+	0x1fbf0, 0x1fbf9,
+	0x1fffe, 0x2a6df,
+	0x2a700, 0x2b738,
 	0x2b740, 0x2b81d,
 	0x2b820, 0x2cea1,
 	0x2ceb0, 0x2ebe0,
 	0x2f800, 0x2fa1d,
-	0x2fffe, 0x2ffff,
+	0x2fffe, 0x3134a,
 	0x3fffe, 0x3ffff,
 	0x4fffe, 0x4ffff,
 	0x5fffe, 0x5ffff,
@@ -35510,11 +38046,11 @@ static const OnigCodePoint CR_Age_12_1[] = {
 	0xe0020, 0xe007f,
 	0xe0100, 0xe01ef,
 	0xefffe, 0x10ffff,
-}; /* CR_Age_12_1 */
+}; /* CR_Age_14_0 */
 
-/* 'Age_13_0': Derived Age 13.0 */
-static const OnigCodePoint CR_Age_13_0[] = {
-	686,
+/* 'Age_15_0': Derived Age 15.0 */
+static const OnigCodePoint CR_Age_15_0[] = {
+	715,
 	0x0000, 0x0377,
 	0x037a, 0x037f,
 	0x0384, 0x038a,
@@ -35527,8 +38063,7 @@ static const OnigCodePoint CR_Age_13_0[] = {
 	0x0591, 0x05c7,
 	0x05d0, 0x05ea,
 	0x05ef, 0x05f4,
-	0x0600, 0x061c,
-	0x061e, 0x070d,
+	0x0600, 0x070d,
 	0x070f, 0x074a,
 	0x074d, 0x07b1,
 	0x07c0, 0x07fa,
@@ -35537,9 +38072,9 @@ static const OnigCodePoint CR_Age_13_0[] = {
 	0x0840, 0x085b,
 	0x085e, 0x085e,
 	0x0860, 0x086a,
-	0x08a0, 0x08b4,
-	0x08b6, 0x08c7,
-	0x08d3, 0x0983,
+	0x0870, 0x088e,
+	0x0890, 0x0891,
+	0x0898, 0x0983,
 	0x0985, 0x098c,
 	0x098f, 0x0990,
 	0x0993, 0x09a8,
@@ -35617,11 +38152,12 @@ static const OnigCodePoint CR_Age_13_0[] = {
 	0x0c0e, 0x0c10,
 	0x0c12, 0x0c28,
 	0x0c2a, 0x0c39,
-	0x0c3d, 0x0c44,
+	0x0c3c, 0x0c44,
 	0x0c46, 0x0c48,
 	0x0c4a, 0x0c4d,
 	0x0c55, 0x0c56,
 	0x0c58, 0x0c5a,
+	0x0c5d, 0x0c5d,
 	0x0c60, 0x0c63,
 	0x0c66, 0x0c6f,
 	0x0c77, 0x0c8c,
@@ -35633,10 +38169,10 @@ static const OnigCodePoint CR_Age_13_0[] = {
 	0x0cc6, 0x0cc8,
 	0x0cca, 0x0ccd,
 	0x0cd5, 0x0cd6,
-	0x0cde, 0x0cde,
+	0x0cdd, 0x0cde,
 	0x0ce0, 0x0ce3,
 	0x0ce6, 0x0cef,
-	0x0cf1, 0x0cf2,
+	0x0cf1, 0x0cf3,
 	0x0d00, 0x0d0c,
 	0x0d0e, 0x0d10,
 	0x0d12, 0x0d44,
@@ -35666,7 +38202,7 @@ static const OnigCodePoint CR_Age_13_0[] = {
 	0x0ea7, 0x0ebd,
 	0x0ec0, 0x0ec4,
 	0x0ec6, 0x0ec6,
-	0x0ec8, 0x0ecd,
+	0x0ec8, 0x0ece,
 	0x0ed0, 0x0ed9,
 	0x0edc, 0x0edf,
 	0x0f00, 0x0f47,
@@ -35700,9 +38236,8 @@ static const OnigCodePoint CR_Age_13_0[] = {
 	0x13f8, 0x13fd,
 	0x1400, 0x169c,
 	0x16a0, 0x16f8,
-	0x1700, 0x170c,
-	0x170e, 0x1714,
-	0x1720, 0x1736,
+	0x1700, 0x1715,
+	0x171f, 0x1736,
 	0x1740, 0x1753,
 	0x1760, 0x176c,
 	0x176e, 0x1770,
@@ -35710,8 +38245,7 @@ static const OnigCodePoint CR_Age_13_0[] = {
 	0x1780, 0x17dd,
 	0x17e0, 0x17e9,
 	0x17f0, 0x17f9,
-	0x1800, 0x180e,
-	0x1810, 0x1819,
+	0x1800, 0x1819,
 	0x1820, 0x1878,
 	0x1880, 0x18aa,
 	0x18b0, 0x18f5,
@@ -35730,9 +38264,9 @@ static const OnigCodePoint CR_Age_13_0[] = {
 	0x1a7f, 0x1a89,
 	0x1a90, 0x1a99,
 	0x1aa0, 0x1aad,
-	0x1ab0, 0x1ac0,
-	0x1b00, 0x1b4b,
-	0x1b50, 0x1b7c,
+	0x1ab0, 0x1ace,
+	0x1b00, 0x1b4c,
+	0x1b50, 0x1b7e,
 	0x1b80, 0x1bf3,
 	0x1bfc, 0x1c37,
 	0x1c3b, 0x1c49,
@@ -35740,8 +38274,7 @@ static const OnigCodePoint CR_Age_13_0[] = {
 	0x1c90, 0x1cba,
 	0x1cbd, 0x1cc7,
 	0x1cd0, 0x1cfa,
-	0x1d00, 0x1df9,
-	0x1dfb, 0x1f15,
+	0x1d00, 0x1f15,
 	0x1f18, 0x1f1d,
 	0x1f20, 0x1f45,
 	0x1f48, 0x1f4d,
@@ -35761,16 +38294,14 @@ static const OnigCodePoint CR_Age_13_0[] = {
 	0x2066, 0x2071,
 	0x2074, 0x208e,
 	0x2090, 0x209c,
-	0x20a0, 0x20bf,
+	0x20a0, 0x20c0,
 	0x20d0, 0x20f0,
 	0x2100, 0x218b,
 	0x2190, 0x2426,
 	0x2440, 0x244a,
 	0x2460, 0x2b73,
 	0x2b76, 0x2b95,
-	0x2b97, 0x2c2e,
-	0x2c30, 0x2c5e,
-	0x2c60, 0x2cf3,
+	0x2b97, 0x2cf3,
 	0x2cf9, 0x2d25,
 	0x2d27, 0x2d27,
 	0x2d2d, 0x2d2d,
@@ -35785,7 +38316,7 @@ static const OnigCodePoint CR_Age_13_0[] = {
 	0x2dc8, 0x2dce,
 	0x2dd0, 0x2dd6,
 	0x2dd8, 0x2dde,
-	0x2de0, 0x2e52,
+	0x2de0, 0x2e5d,
 	0x2e80, 0x2e99,
 	0x2e9b, 0x2ef3,
 	0x2f00, 0x2fd5,
@@ -35797,14 +38328,15 @@ static const OnigCodePoint CR_Age_13_0[] = {
 	0x3131, 0x318e,
 	0x3190, 0x31e3,
 	0x31f0, 0x321e,
-	0x3220, 0x9ffc,
-	0xa000, 0xa48c,
+	0x3220, 0xa48c,
 	0xa490, 0xa4c6,
 	0xa4d0, 0xa62b,
 	0xa640, 0xa6f7,
-	0xa700, 0xa7bf,
-	0xa7c2, 0xa7ca,
-	0xa7f5, 0xa82c,
+	0xa700, 0xa7ca,
+	0xa7d0, 0xa7d1,
+	0xa7d3, 0xa7d3,
+	0xa7d5, 0xa7d9,
+	0xa7f2, 0xa82c,
 	0xa830, 0xa839,
 	0xa840, 0xa877,
 	0xa880, 0xa8c5,
@@ -35839,12 +38371,10 @@ static const OnigCodePoint CR_Age_13_0[] = {
 	0xfb3e, 0xfb3e,
 	0xfb40, 0xfb41,
 	0xfb43, 0xfb44,
-	0xfb46, 0xfbc1,
-	0xfbd3, 0xfd3f,
-	0xfd50, 0xfd8f,
+	0xfb46, 0xfbc2,
+	0xfbd3, 0xfd8f,
 	0xfd92, 0xfdc7,
-	0xfdd0, 0xfdfd,
-	0xfe00, 0xfe19,
+	0xfdcf, 0xfe19,
 	0xfe20, 0xfe52,
 	0xfe54, 0xfe66,
 	0xfe68, 0xfe6b,
@@ -35886,10 +38416,20 @@ static const OnigCodePoint CR_Age_13_0[] = {
 	0x104d8, 0x104fb,
 	0x10500, 0x10527,
 	0x10530, 0x10563,
-	0x1056f, 0x1056f,
+	0x1056f, 0x1057a,
+	0x1057c, 0x1058a,
+	0x1058c, 0x10592,
+	0x10594, 0x10595,
+	0x10597, 0x105a1,
+	0x105a3, 0x105b1,
+	0x105b3, 0x105b9,
+	0x105bb, 0x105bc,
 	0x10600, 0x10736,
 	0x10740, 0x10755,
 	0x10760, 0x10767,
+	0x10780, 0x10785,
+	0x10787, 0x107b0,
+	0x107b2, 0x107ba,
 	0x10800, 0x10805,
 	0x10808, 0x10808,
 	0x1080a, 0x10835,
@@ -35931,13 +38471,14 @@ static const OnigCodePoint CR_Age_13_0[] = {
 	0x10e80, 0x10ea9,
 	0x10eab, 0x10ead,
 	0x10eb0, 0x10eb1,
-	0x10f00, 0x10f27,
+	0x10efd, 0x10f27,
 	0x10f30, 0x10f59,
+	0x10f70, 0x10f89,
 	0x10fb0, 0x10fcb,
 	0x10fe0, 0x10ff6,
 	0x11000, 0x1104d,
-	0x11052, 0x1106f,
-	0x1107f, 0x110c1,
+	0x11052, 0x11075,
+	0x1107f, 0x110c2,
 	0x110cd, 0x110cd,
 	0x110d0, 0x110e8,
 	0x110f0, 0x110f9,
@@ -35947,7 +38488,7 @@ static const OnigCodePoint CR_Age_13_0[] = {
 	0x11180, 0x111df,
 	0x111e1, 0x111f4,
 	0x11200, 0x11211,
-	0x11213, 0x1123e,
+	0x11213, 0x11241,
 	0x11280, 0x11286,
 	0x11288, 0x11288,
 	0x1128a, 0x1128d,
@@ -35979,11 +38520,11 @@ static const OnigCodePoint CR_Age_13_0[] = {
 	0x11600, 0x11644,
 	0x11650, 0x11659,
 	0x11660, 0x1166c,
-	0x11680, 0x116b8,
+	0x11680, 0x116b9,
 	0x116c0, 0x116c9,
 	0x11700, 0x1171a,
 	0x1171d, 0x1172b,
-	0x11730, 0x1173f,
+	0x11730, 0x11746,
 	0x11800, 0x1183b,
 	0x118a0, 0x118f2,
 	0x118ff, 0x11906,
@@ -35999,7 +38540,8 @@ static const OnigCodePoint CR_Age_13_0[] = {
 	0x119da, 0x119e4,
 	0x11a00, 0x11a47,
 	0x11a50, 0x11aa2,
-	0x11ac0, 0x11af8,
+	0x11ab0, 0x11af8,
+	0x11b00, 0x11b09,
 	0x11c00, 0x11c08,
 	0x11c0a, 0x11c36,
 	0x11c38, 0x11c45,
@@ -36021,19 +38563,23 @@ static const OnigCodePoint CR_Age_13_0[] = {
 	0x11d93, 0x11d98,
 	0x11da0, 0x11da9,
 	0x11ee0, 0x11ef8,
+	0x11f00, 0x11f10,
+	0x11f12, 0x11f3a,
+	0x11f3e, 0x11f59,
 	0x11fb0, 0x11fb0,
 	0x11fc0, 0x11ff1,
 	0x11fff, 0x12399,
 	0x12400, 0x1246e,
 	0x12470, 0x12474,
 	0x12480, 0x12543,
-	0x13000, 0x1342e,
-	0x13430, 0x13438,
+	0x12f90, 0x12ff2,
+	0x13000, 0x13455,
 	0x14400, 0x14646,
 	0x16800, 0x16a38,
 	0x16a40, 0x16a5e,
 	0x16a60, 0x16a69,
-	0x16a6e, 0x16a6f,
+	0x16a6e, 0x16abe,
+	0x16ac0, 0x16ac9,
 	0x16ad0, 0x16aed,
 	0x16af0, 0x16af5,
 	0x16b00, 0x16b45,
@@ -36050,8 +38596,13 @@ static const OnigCodePoint CR_Age_13_0[] = {
 	0x17000, 0x187f7,
 	0x18800, 0x18cd5,
 	0x18d00, 0x18d08,
-	0x1b000, 0x1b11e,
+	0x1aff0, 0x1aff3,
+	0x1aff5, 0x1affb,
+	0x1affd, 0x1affe,
+	0x1b000, 0x1b122,
+	0x1b132, 0x1b132,
 	0x1b150, 0x1b152,
+	0x1b155, 0x1b155,
 	0x1b164, 0x1b167,
 	0x1b170, 0x1b2fb,
 	0x1bc00, 0x1bc6a,
@@ -36059,10 +38610,14 @@ static const OnigCodePoint CR_Age_13_0[] = {
 	0x1bc80, 0x1bc88,
 	0x1bc90, 0x1bc99,
 	0x1bc9c, 0x1bca3,
+	0x1cf00, 0x1cf2d,
+	0x1cf30, 0x1cf46,
+	0x1cf50, 0x1cfc3,
 	0x1d000, 0x1d0f5,
 	0x1d100, 0x1d126,
-	0x1d129, 0x1d1e8,
+	0x1d129, 0x1d1ea,
 	0x1d200, 0x1d245,
+	0x1d2c0, 0x1d2d3,
 	0x1d2e0, 0x1d2f3,
 	0x1d300, 0x1d356,
 	0x1d360, 0x1d378,
@@ -36089,17 +38644,27 @@ static const OnigCodePoint CR_Age_13_0[] = {
 	0x1d7ce, 0x1da8b,
 	0x1da9b, 0x1da9f,
 	0x1daa1, 0x1daaf,
+	0x1df00, 0x1df1e,
+	0x1df25, 0x1df2a,
 	0x1e000, 0x1e006,
 	0x1e008, 0x1e018,
 	0x1e01b, 0x1e021,
 	0x1e023, 0x1e024,
 	0x1e026, 0x1e02a,
+	0x1e030, 0x1e06d,
+	0x1e08f, 0x1e08f,
 	0x1e100, 0x1e12c,
 	0x1e130, 0x1e13d,
 	0x1e140, 0x1e149,
 	0x1e14e, 0x1e14f,
+	0x1e290, 0x1e2ae,
 	0x1e2c0, 0x1e2f9,
 	0x1e2ff, 0x1e2ff,
+	0x1e4d0, 0x1e4f9,
+	0x1e7e0, 0x1e7e6,
+	0x1e7e8, 0x1e7eb,
+	0x1e7ed, 0x1e7ee,
+	0x1e7f0, 0x1e7fe,
 	0x1e800, 0x1e8c4,
 	0x1e8c7, 0x1e8d6,
 	0x1e900, 0x1e94b,
@@ -36154,38 +38719,38 @@ static const OnigCodePoint CR_Age_13_0[] = {
 	0x1f250, 0x1f251,
 	0x1f260, 0x1f265,
 	0x1f300, 0x1f6d7,
-	0x1f6e0, 0x1f6ec,
+	0x1f6dc, 0x1f6ec,
 	0x1f6f0, 0x1f6fc,
-	0x1f700, 0x1f773,
-	0x1f780, 0x1f7d8,
+	0x1f700, 0x1f776,
+	0x1f77b, 0x1f7d9,
 	0x1f7e0, 0x1f7eb,
+	0x1f7f0, 0x1f7f0,
 	0x1f800, 0x1f80b,
 	0x1f810, 0x1f847,
 	0x1f850, 0x1f859,
 	0x1f860, 0x1f887,
 	0x1f890, 0x1f8ad,
 	0x1f8b0, 0x1f8b1,
-	0x1f900, 0x1f978,
-	0x1f97a, 0x1f9cb,
-	0x1f9cd, 0x1fa53,
+	0x1f900, 0x1fa53,
 	0x1fa60, 0x1fa6d,
-	0x1fa70, 0x1fa74,
-	0x1fa78, 0x1fa7a,
-	0x1fa80, 0x1fa86,
-	0x1fa90, 0x1faa8,
-	0x1fab0, 0x1fab6,
-	0x1fac0, 0x1fac2,
-	0x1fad0, 0x1fad6,
+	0x1fa70, 0x1fa7c,
+	0x1fa80, 0x1fa88,
+	0x1fa90, 0x1fabd,
+	0x1fabf, 0x1fac5,
+	0x1face, 0x1fadb,
+	0x1fae0, 0x1fae8,
+	0x1faf0, 0x1faf8,
 	0x1fb00, 0x1fb92,
 	0x1fb94, 0x1fbca,
 	0x1fbf0, 0x1fbf9,
-	0x1fffe, 0x2a6dd,
-	0x2a700, 0x2b734,
+	0x1fffe, 0x2a6df,
+	0x2a700, 0x2b739,
 	0x2b740, 0x2b81d,
 	0x2b820, 0x2cea1,
 	0x2ceb0, 0x2ebe0,
 	0x2f800, 0x2fa1d,
 	0x2fffe, 0x3134a,
+	0x31350, 0x323af,
 	0x3fffe, 0x3ffff,
 	0x4fffe, 0x4ffff,
 	0x5fffe, 0x5ffff,
@@ -36201,11 +38766,11 @@ static const OnigCodePoint CR_Age_13_0[] = {
 	0xe0020, 0xe007f,
 	0xe0100, 0xe01ef,
 	0xefffe, 0x10ffff,
-}; /* CR_Age_13_0 */
+}; /* CR_Age_15_0 */
 
-/* 'Age_14_0': Derived Age 14.0 */
-static const OnigCodePoint CR_Age_14_0[] = {
-	706,
+/* 'Age_15_1': Derived Age 15.1 */
+static const OnigCodePoint CR_Age_15_1[] = {
+	715,
 	0x0000, 0x0377,
 	0x037a, 0x037f,
 	0x0384, 0x038a,
@@ -36327,7 +38892,7 @@ static const OnigCodePoint CR_Age_14_0[] = {
 	0x0cdd, 0x0cde,
 	0x0ce0, 0x0ce3,
 	0x0ce6, 0x0cef,
-	0x0cf1, 0x0cf2,
+	0x0cf1, 0x0cf3,
 	0x0d00, 0x0d0c,
 	0x0d0e, 0x0d10,
 	0x0d12, 0x0d44,
@@ -36357,7 +38922,7 @@ static const OnigCodePoint CR_Age_14_0[] = {
 	0x0ea7, 0x0ebd,
 	0x0ec0, 0x0ec4,
 	0x0ec6, 0x0ec6,
-	0x0ec8, 0x0ecd,
+	0x0ec8, 0x0ece,
 	0x0ed0, 0x0ed9,
 	0x0edc, 0x0edf,
 	0x0f00, 0x0f47,
@@ -36475,14 +39040,13 @@ static const OnigCodePoint CR_Age_14_0[] = {
 	0x2e80, 0x2e99,
 	0x2e9b, 0x2ef3,
 	0x2f00, 0x2fd5,
-	0x2ff0, 0x2ffb,
-	0x3000, 0x303f,
+	0x2ff0, 0x303f,
 	0x3041, 0x3096,
 	0x3099, 0x30ff,
 	0x3105, 0x312f,
 	0x3131, 0x318e,
 	0x3190, 0x31e3,
-	0x31f0, 0x321e,
+	0x31ef, 0x321e,
 	0x3220, 0xa48c,
 	0xa490, 0xa4c6,
 	0xa4d0, 0xa62b,
@@ -36626,7 +39190,7 @@ static const OnigCodePoint CR_Age_14_0[] = {
 	0x10e80, 0x10ea9,
 	0x10eab, 0x10ead,
 	0x10eb0, 0x10eb1,
-	0x10f00, 0x10f27,
+	0x10efd, 0x10f27,
 	0x10f30, 0x10f59,
 	0x10f70, 0x10f89,
 	0x10fb0, 0x10fcb,
@@ -36643,7 +39207,7 @@ static const OnigCodePoint CR_Age_14_0[] = {
 	0x11180, 0x111df,
 	0x111e1, 0x111f4,
 	0x11200, 0x11211,
-	0x11213, 0x1123e,
+	0x11213, 0x11241,
 	0x11280, 0x11286,
 	0x11288, 0x11288,
 	0x1128a, 0x1128d,
@@ -36696,6 +39260,7 @@ static const OnigCodePoint CR_Age_14_0[] = {
 	0x11a00, 0x11a47,
 	0x11a50, 0x11aa2,
 	0x11ab0, 0x11af8,
+	0x11b00, 0x11b09,
 	0x11c00, 0x11c08,
 	0x11c0a, 0x11c36,
 	0x11c38, 0x11c45,
@@ -36717,6 +39282,9 @@ static const OnigCodePoint CR_Age_14_0[] = {
 	0x11d93, 0x11d98,
 	0x11da0, 0x11da9,
 	0x11ee0, 0x11ef8,
+	0x11f00, 0x11f10,
+	0x11f12, 0x11f3a,
+	0x11f3e, 0x11f59,
 	0x11fb0, 0x11fb0,
 	0x11fc0, 0x11ff1,
 	0x11fff, 0x12399,
@@ -36724,8 +39292,7 @@ static const OnigCodePoint CR_Age_14_0[] = {
 	0x12470, 0x12474,
 	0x12480, 0x12543,
 	0x12f90, 0x12ff2,
-	0x13000, 0x1342e,
-	0x13430, 0x13438,
+	0x13000, 0x13455,
 	0x14400, 0x14646,
 	0x16800, 0x16a38,
 	0x16a40, 0x16a5e,
@@ -36752,7 +39319,9 @@ static const OnigCodePoint CR_Age_14_0[] = {
 	0x1aff5, 0x1affb,
 	0x1affd, 0x1affe,
 	0x1b000, 0x1b122,
+	0x1b132, 0x1b132,
 	0x1b150, 0x1b152,
+	0x1b155, 0x1b155,
 	0x1b164, 0x1b167,
 	0x1b170, 0x1b2fb,
 	0x1bc00, 0x1bc6a,
@@ -36767,6 +39336,7 @@ static const OnigCodePoint CR_Age_14_0[] = {
 	0x1d100, 0x1d126,
 	0x1d129, 0x1d1ea,
 	0x1d200, 0x1d245,
+	0x1d2c0, 0x1d2d3,
 	0x1d2e0, 0x1d2f3,
 	0x1d300, 0x1d356,
 	0x1d360, 0x1d378,
@@ -36794,11 +39364,14 @@ static const OnigCodePoint CR_Age_14_0[] = {
 	0x1da9b, 0x1da9f,
 	0x1daa1, 0x1daaf,
 	0x1df00, 0x1df1e,
+	0x1df25, 0x1df2a,
 	0x1e000, 0x1e006,
 	0x1e008, 0x1e018,
 	0x1e01b, 0x1e021,
 	0x1e023, 0x1e024,
 	0x1e026, 0x1e02a,
+	0x1e030, 0x1e06d,
+	0x1e08f, 0x1e08f,
 	0x1e100, 0x1e12c,
 	0x1e130, 0x1e13d,
 	0x1e140, 0x1e149,
@@ -36806,6 +39379,7 @@ static const OnigCodePoint CR_Age_14_0[] = {
 	0x1e290, 0x1e2ae,
 	0x1e2c0, 0x1e2f9,
 	0x1e2ff, 0x1e2ff,
+	0x1e4d0, 0x1e4f9,
 	0x1e7e0, 0x1e7e6,
 	0x1e7e8, 0x1e7eb,
 	0x1e7ed, 0x1e7ee,
@@ -36864,10 +39438,10 @@ static const OnigCodePoint CR_Age_14_0[] = {
 	0x1f250, 0x1f251,
 	0x1f260, 0x1f265,
 	0x1f300, 0x1f6d7,
-	0x1f6dd, 0x1f6ec,
+	0x1f6dc, 0x1f6ec,
 	0x1f6f0, 0x1f6fc,
-	0x1f700, 0x1f773,
-	0x1f780, 0x1f7d8,
+	0x1f700, 0x1f776,
+	0x1f77b, 0x1f7d9,
 	0x1f7e0, 0x1f7eb,
 	0x1f7f0, 0x1f7f0,
 	0x1f800, 0x1f80b,
@@ -36878,25 +39452,25 @@ static const OnigCodePoint CR_Age_14_0[] = {
 	0x1f8b0, 0x1f8b1,
 	0x1f900, 0x1fa53,
 	0x1fa60, 0x1fa6d,
-	0x1fa70, 0x1fa74,
-	0x1fa78, 0x1fa7c,
-	0x1fa80, 0x1fa86,
-	0x1fa90, 0x1faac,
-	0x1fab0, 0x1faba,
-	0x1fac0, 0x1fac5,
-	0x1fad0, 0x1fad9,
-	0x1fae0, 0x1fae7,
-	0x1faf0, 0x1faf6,
+	0x1fa70, 0x1fa7c,
+	0x1fa80, 0x1fa88,
+	0x1fa90, 0x1fabd,
+	0x1fabf, 0x1fac5,
+	0x1face, 0x1fadb,
+	0x1fae0, 0x1fae8,
+	0x1faf0, 0x1faf8,
 	0x1fb00, 0x1fb92,
 	0x1fb94, 0x1fbca,
 	0x1fbf0, 0x1fbf9,
 	0x1fffe, 0x2a6df,
-	0x2a700, 0x2b738,
+	0x2a700, 0x2b739,
 	0x2b740, 0x2b81d,
 	0x2b820, 0x2cea1,
 	0x2ceb0, 0x2ebe0,
+	0x2ebf0, 0x2ee5d,
 	0x2f800, 0x2fa1d,
 	0x2fffe, 0x3134a,
+	0x31350, 0x323af,
 	0x3fffe, 0x3ffff,
 	0x4fffe, 0x4ffff,
 	0x5fffe, 0x5ffff,
@@ -36912,11 +39486,11 @@ static const OnigCodePoint CR_Age_14_0[] = {
 	0xe0020, 0xe007f,
 	0xe0100, 0xe01ef,
 	0xefffe, 0x10ffff,
-}; /* CR_Age_14_0 */
+}; /* CR_Age_15_1 */
 
-/* 'Age_15_0': Derived Age 15.0 */
-static const OnigCodePoint CR_Age_15_0[] = {
-	715,
+/* 'Age_16_0': Derived Age 16.0 */
+static const OnigCodePoint CR_Age_16_0[] = {
+	739,
 	0x0000, 0x0377,
 	0x037a, 0x037f,
 	0x0384, 0x038a,
@@ -36940,7 +39514,7 @@ static const OnigCodePoint CR_Age_15_0[] = {
 	0x0860, 0x086a,
 	0x0870, 0x088e,
 	0x0890, 0x0891,
-	0x0898, 0x0983,
+	0x0897, 0x0983,
 	0x0985, 0x098c,
 	0x098f, 0x0990,
 	0x0993, 0x09a8,
@@ -37132,11 +39706,10 @@ static const OnigCodePoint CR_Age_15_0[] = {
 	0x1aa0, 0x1aad,
 	0x1ab0, 0x1ace,
 	0x1b00, 0x1b4c,
-	0x1b50, 0x1b7e,
-	0x1b80, 0x1bf3,
+	0x1b4e, 0x1bf3,
 	0x1bfc, 0x1c37,
 	0x1c3b, 0x1c49,
-	0x1c4d, 0x1c88,
+	0x1c4d, 0x1c8a,
 	0x1c90, 0x1cba,
 	0x1cbd, 0x1cc7,
 	0x1cd0, 0x1cfa,
@@ -37163,7 +39736,7 @@ static const OnigCodePoint CR_Age_15_0[] = {
 	0x20a0, 0x20c0,
 	0x20d0, 0x20f0,
 	0x2100, 0x218b,
-	0x2190, 0x2426,
+	0x2190, 0x2429,
 	0x2440, 0x244a,
 	0x2460, 0x2b73,
 	0x2b76, 0x2b95,
@@ -37186,22 +39759,21 @@ static const OnigCodePoint CR_Age_15_0[] = {
 	0x2e80, 0x2e99,
 	0x2e9b, 0x2ef3,
 	0x2f00, 0x2fd5,
-	0x2ff0, 0x2ffb,
-	0x3000, 0x303f,
+	0x2ff0, 0x303f,
 	0x3041, 0x3096,
 	0x3099, 0x30ff,
 	0x3105, 0x312f,
 	0x3131, 0x318e,
-	0x3190, 0x31e3,
-	0x31f0, 0x321e,
+	0x3190, 0x31e5,
+	0x31ef, 0x321e,
 	0x3220, 0xa48c,
 	0xa490, 0xa4c6,
 	0xa4d0, 0xa62b,
 	0xa640, 0xa6f7,
-	0xa700, 0xa7ca,
+	0xa700, 0xa7cd,
 	0xa7d0, 0xa7d1,
 	0xa7d3, 0xa7d3,
-	0xa7d5, 0xa7d9,
+	0xa7d5, 0xa7dc,
 	0xa7f2, 0xa82c,
 	0xa830, 0xa839,
 	0xa840, 0xa877,
@@ -37290,6 +39862,7 @@ static const OnigCodePoint CR_Age_15_0[] = {
 	0x105a3, 0x105b1,
 	0x105b3, 0x105b9,
 	0x105bb, 0x105bc,
+	0x105c0, 0x105f3,
 	0x10600, 0x10736,
 	0x10740, 0x10755,
 	0x10760, 0x10767,
@@ -37333,11 +39906,15 @@ static const OnigCodePoint CR_Age_15_0[] = {
 	0x10cc0, 0x10cf2,
 	0x10cfa, 0x10d27,
 	0x10d30, 0x10d39,
+	0x10d40, 0x10d65,
+	0x10d69, 0x10d85,
+	0x10d8e, 0x10d8f,
 	0x10e60, 0x10e7e,
 	0x10e80, 0x10ea9,
 	0x10eab, 0x10ead,
 	0x10eb0, 0x10eb1,
-	0x10efd, 0x10f27,
+	0x10ec2, 0x10ec4,
+	0x10efc, 0x10f27,
 	0x10f30, 0x10f59,
 	0x10f70, 0x10f89,
 	0x10fb0, 0x10fcb,
@@ -37377,6 +39954,17 @@ static const OnigCodePoint CR_Age_15_0[] = {
 	0x1135d, 0x11363,
 	0x11366, 0x1136c,
 	0x11370, 0x11374,
+	0x11380, 0x11389,
+	0x1138b, 0x1138b,
+	0x1138e, 0x1138e,
+	0x11390, 0x113b5,
+	0x113b7, 0x113c0,
+	0x113c2, 0x113c2,
+	0x113c5, 0x113c5,
+	0x113c7, 0x113ca,
+	0x113cc, 0x113d5,
+	0x113d7, 0x113d8,
+	0x113e1, 0x113e2,
 	0x11400, 0x1145b,
 	0x1145d, 0x11461,
 	0x11480, 0x114c7,
@@ -37388,6 +39976,7 @@ static const OnigCodePoint CR_Age_15_0[] = {
 	0x11660, 0x1166c,
 	0x11680, 0x116b9,
 	0x116c0, 0x116c9,
+	0x116d0, 0x116e3,
 	0x11700, 0x1171a,
 	0x1171d, 0x1172b,
 	0x11730, 0x11746,
@@ -37408,6 +39997,8 @@ static const OnigCodePoint CR_Age_15_0[] = {
 	0x11a50, 0x11aa2,
 	0x11ab0, 0x11af8,
 	0x11b00, 0x11b09,
+	0x11bc0, 0x11be1,
+	0x11bf0, 0x11bf9,
 	0x11c00, 0x11c08,
 	0x11c0a, 0x11c36,
 	0x11c38, 0x11c45,
@@ -37431,7 +40022,7 @@ static const OnigCodePoint CR_Age_15_0[] = {
 	0x11ee0, 0x11ef8,
 	0x11f00, 0x11f10,
 	0x11f12, 0x11f3a,
-	0x11f3e, 0x11f59,
+	0x11f3e, 0x11f5a,
 	0x11fb0, 0x11fb0,
 	0x11fc0, 0x11ff1,
 	0x11fff, 0x12399,
@@ -37440,7 +40031,9 @@ static const OnigCodePoint CR_Age_15_0[] = {
 	0x12480, 0x12543,
 	0x12f90, 0x12ff2,
 	0x13000, 0x13455,
+	0x13460, 0x143fa,
 	0x14400, 0x14646,
+	0x16100, 0x16139,
 	0x16800, 0x16a38,
 	0x16a40, 0x16a5e,
 	0x16a60, 0x16a69,
@@ -37453,6 +40046,7 @@ static const OnigCodePoint CR_Age_15_0[] = {
 	0x16b5b, 0x16b61,
 	0x16b63, 0x16b77,
 	0x16b7d, 0x16b8f,
+	0x16d40, 0x16d79,
 	0x16e40, 0x16e9a,
 	0x16f00, 0x16f4a,
 	0x16f4f, 0x16f87,
@@ -37461,7 +40055,7 @@ static const OnigCodePoint CR_Age_15_0[] = {
 	0x16ff0, 0x16ff1,
 	0x17000, 0x187f7,
 	0x18800, 0x18cd5,
-	0x18d00, 0x18d08,
+	0x18cff, 0x18d08,
 	0x1aff0, 0x1aff3,
 	0x1aff5, 0x1affb,
 	0x1affd, 0x1affe,
@@ -37476,6 +40070,8 @@ static const OnigCodePoint CR_Age_15_0[] = {
 	0x1bc80, 0x1bc88,
 	0x1bc90, 0x1bc99,
 	0x1bc9c, 0x1bca3,
+	0x1cc00, 0x1ccf9,
+	0x1cd00, 0x1ceb3,
 	0x1cf00, 0x1cf2d,
 	0x1cf30, 0x1cf46,
 	0x1cf50, 0x1cfc3,
@@ -37527,6 +40123,8 @@ static const OnigCodePoint CR_Age_15_0[] = {
 	0x1e2c0, 0x1e2f9,
 	0x1e2ff, 0x1e2ff,
 	0x1e4d0, 0x1e4f9,
+	0x1e5d0, 0x1e5fa,
+	0x1e5ff, 0x1e5ff,
 	0x1e7e0, 0x1e7e6,
 	0x1e7e8, 0x1e7eb,
 	0x1e7ed, 0x1e7ee,
@@ -37596,24 +40194,24 @@ static const OnigCodePoint CR_Age_15_0[] = {
 	0x1f850, 0x1f859,
 	0x1f860, 0x1f887,
 	0x1f890, 0x1f8ad,
-	0x1f8b0, 0x1f8b1,
+	0x1f8b0, 0x1f8bb,
+	0x1f8c0, 0x1f8c1,
 	0x1f900, 0x1fa53,
 	0x1fa60, 0x1fa6d,
 	0x1fa70, 0x1fa7c,
-	0x1fa80, 0x1fa88,
-	0x1fa90, 0x1fabd,
-	0x1fabf, 0x1fac5,
-	0x1face, 0x1fadb,
-	0x1fae0, 0x1fae8,
+	0x1fa80, 0x1fa89,
+	0x1fa8f, 0x1fac6,
+	0x1face, 0x1fadc,
+	0x1fadf, 0x1fae9,
 	0x1faf0, 0x1faf8,
 	0x1fb00, 0x1fb92,
-	0x1fb94, 0x1fbca,
-	0x1fbf0, 0x1fbf9,
+	0x1fb94, 0x1fbf9,
 	0x1fffe, 0x2a6df,
 	0x2a700, 0x2b739,
 	0x2b740, 0x2b81d,
 	0x2b820, 0x2cea1,
 	0x2ceb0, 0x2ebe0,
+	0x2ebf0, 0x2ee5d,
 	0x2f800, 0x2fa1d,
 	0x2fffe, 0x3134a,
 	0x31350, 0x323af,
@@ -37632,12 +40230,12 @@ static const OnigCodePoint CR_Age_15_0[] = {
 	0xe0020, 0xe007f,
 	0xe0100, 0xe01ef,
 	0xefffe, 0x10ffff,
-}; /* CR_Age_15_0 */
+}; /* CR_Age_16_0 */
 
 #endif /* USE_UNICODE_AGE_PROPERTIES */
 /* 'Grapheme_Cluster_Break_Prepend': Grapheme_Cluster_Break=Prepend */
 static const OnigCodePoint CR_Grapheme_Cluster_Break_Prepend[] = {
-	15,
+	16,
 	0x0600, 0x0605,
 	0x06dd, 0x06dd,
 	0x070f, 0x070f,
@@ -37647,6 +40245,7 @@ static const OnigCodePoint CR_Grapheme_Cluster_Break_Prepend[] = {
 	0x110bd, 0x110bd,
 	0x110cd, 0x110cd,
 	0x111c2, 0x111c3,
+	0x113d1, 0x113d1,
 	0x1193f, 0x1193f,
 	0x11941, 0x11941,
 	0x11a3a, 0x11a3a,
@@ -37690,7 +40289,7 @@ static const OnigCodePoint CR_Grapheme_Cluster_Break_Control[] = {
 
 /* 'Grapheme_Cluster_Break_Extend': Grapheme_Cluster_Break=Extend */
 static const OnigCodePoint CR_Grapheme_Cluster_Break_Extend[] = {
-	364,
+	376,
 	0x0300, 0x036f,
 	0x0483, 0x0489,
 	0x0591, 0x05bd,
@@ -37715,7 +40314,7 @@ static const OnigCodePoint CR_Grapheme_Cluster_Break_Extend[] = {
 	0x0825, 0x0827,
 	0x0829, 0x082d,
 	0x0859, 0x085b,
-	0x0898, 0x089f,
+	0x0897, 0x089f,
 	0x08ca, 0x08e1,
 	0x08e3, 0x0902,
 	0x093a, 0x093a,
@@ -37769,10 +40368,10 @@ static const OnigCodePoint CR_Grapheme_Cluster_Break_Extend[] = {
 	0x0c62, 0x0c63,
 	0x0c81, 0x0c81,
 	0x0cbc, 0x0cbc,
-	0x0cbf, 0x0cbf,
+	0x0cbf, 0x0cc0,
 	0x0cc2, 0x0cc2,
-	0x0cc6, 0x0cc6,
-	0x0ccc, 0x0ccd,
+	0x0cc6, 0x0cc8,
+	0x0cca, 0x0ccd,
 	0x0cd5, 0x0cd6,
 	0x0ce2, 0x0ce3,
 	0x0d00, 0x0d01,
@@ -37816,8 +40415,8 @@ static const OnigCodePoint CR_Grapheme_Cluster_Break_Extend[] = {
 	0x108d, 0x108d,
 	0x109d, 0x109d,
 	0x135d, 0x135f,
-	0x1712, 0x1714,
-	0x1732, 0x1733,
+	0x1712, 0x1715,
+	0x1732, 0x1734,
 	0x1752, 0x1753,
 	0x1772, 0x1773,
 	0x17b4, 0x17b5,
@@ -37844,18 +40443,16 @@ static const OnigCodePoint CR_Grapheme_Cluster_Break_Extend[] = {
 	0x1a7f, 0x1a7f,
 	0x1ab0, 0x1ace,
 	0x1b00, 0x1b03,
-	0x1b34, 0x1b3a,
-	0x1b3c, 0x1b3c,
-	0x1b42, 0x1b42,
+	0x1b34, 0x1b3d,
+	0x1b42, 0x1b44,
 	0x1b6b, 0x1b73,
 	0x1b80, 0x1b81,
 	0x1ba2, 0x1ba5,
-	0x1ba8, 0x1ba9,
-	0x1bab, 0x1bad,
+	0x1ba8, 0x1bad,
 	0x1be6, 0x1be6,
 	0x1be8, 0x1be9,
 	0x1bed, 0x1bed,
-	0x1bef, 0x1bf1,
+	0x1bef, 0x1bf3,
 	0x1c2c, 0x1c33,
 	0x1c36, 0x1c37,
 	0x1cd0, 0x1cd2,
@@ -37886,10 +40483,12 @@ static const OnigCodePoint CR_Grapheme_Cluster_Break_Extend[] = {
 	0xa8ff, 0xa8ff,
 	0xa926, 0xa92d,
 	0xa947, 0xa951,
+	0xa953, 0xa953,
 	0xa980, 0xa982,
 	0xa9b3, 0xa9b3,
 	0xa9b6, 0xa9b9,
 	0xa9bc, 0xa9bd,
+	0xa9c0, 0xa9c0,
 	0xa9e5, 0xa9e5,
 	0xaa29, 0xaa2e,
 	0xaa31, 0xaa32,
@@ -37921,8 +40520,9 @@ static const OnigCodePoint CR_Grapheme_Cluster_Break_Extend[] = {
 	0x10a3f, 0x10a3f,
 	0x10ae5, 0x10ae6,
 	0x10d24, 0x10d27,
+	0x10d69, 0x10d6d,
 	0x10eab, 0x10eac,
-	0x10efd, 0x10eff,
+	0x10efc, 0x10eff,
 	0x10f46, 0x10f50,
 	0x10f82, 0x10f85,
 	0x11001, 0x11001,
@@ -37939,11 +40539,11 @@ static const OnigCodePoint CR_Grapheme_Cluster_Break_Extend[] = {
 	0x11173, 0x11173,
 	0x11180, 0x11181,
 	0x111b6, 0x111be,
+	0x111c0, 0x111c0,
 	0x111c9, 0x111cc,
 	0x111cf, 0x111cf,
 	0x1122f, 0x11231,
-	0x11234, 0x11234,
-	0x11236, 0x11237,
+	0x11234, 0x11237,
 	0x1123e, 0x1123e,
 	0x11241, 0x11241,
 	0x112df, 0x112df,
@@ -37952,9 +40552,18 @@ static const OnigCodePoint CR_Grapheme_Cluster_Break_Extend[] = {
 	0x1133b, 0x1133c,
 	0x1133e, 0x1133e,
 	0x11340, 0x11340,
+	0x1134d, 0x1134d,
 	0x11357, 0x11357,
 	0x11366, 0x1136c,
 	0x11370, 0x11374,
+	0x113b8, 0x113b8,
+	0x113bb, 0x113c0,
+	0x113c2, 0x113c2,
+	0x113c5, 0x113c5,
+	0x113c7, 0x113c9,
+	0x113ce, 0x113d0,
+	0x113d2, 0x113d2,
+	0x113e1, 0x113e2,
 	0x11438, 0x1143f,
 	0x11442, 0x11444,
 	0x11446, 0x11446,
@@ -37975,16 +40584,15 @@ static const OnigCodePoint CR_Grapheme_Cluster_Break_Extend[] = {
 	0x1163f, 0x11640,
 	0x116ab, 0x116ab,
 	0x116ad, 0x116ad,
-	0x116b0, 0x116b5,
-	0x116b7, 0x116b7,
-	0x1171d, 0x1171f,
+	0x116b0, 0x116b7,
+	0x1171d, 0x1171d,
+	0x1171f, 0x1171f,
 	0x11722, 0x11725,
 	0x11727, 0x1172b,
 	0x1182f, 0x11837,
 	0x11839, 0x1183a,
 	0x11930, 0x11930,
-	0x1193b, 0x1193c,
-	0x1193e, 0x1193e,
+	0x1193b, 0x1193e,
 	0x11943, 0x11943,
 	0x119d4, 0x119d7,
 	0x119da, 0x119db,
@@ -38015,21 +40623,23 @@ static const OnigCodePoint CR_Grapheme_Cluster_Break_Extend[] = {
 	0x11ef3, 0x11ef4,
 	0x11f00, 0x11f01,
 	0x11f36, 0x11f3a,
-	0x11f40, 0x11f40,
-	0x11f42, 0x11f42,
+	0x11f40, 0x11f42,
+	0x11f5a, 0x11f5a,
 	0x13440, 0x13440,
 	0x13447, 0x13455,
+	0x1611e, 0x16129,
+	0x1612d, 0x1612f,
 	0x16af0, 0x16af4,
 	0x16b30, 0x16b36,
 	0x16f4f, 0x16f4f,
 	0x16f8f, 0x16f92,
 	0x16fe4, 0x16fe4,
+	0x16ff0, 0x16ff1,
 	0x1bc9d, 0x1bc9e,
 	0x1cf00, 0x1cf2d,
 	0x1cf30, 0x1cf46,
-	0x1d165, 0x1d165,
-	0x1d167, 0x1d169,
-	0x1d16e, 0x1d172,
+	0x1d165, 0x1d169,
+	0x1d16d, 0x1d172,
 	0x1d17b, 0x1d182,
 	0x1d185, 0x1d18b,
 	0x1d1aa, 0x1d1ad,
@@ -38050,6 +40660,7 @@ static const OnigCodePoint CR_Grapheme_Cluster_Break_Extend[] = {
 	0x1e2ae, 0x1e2ae,
 	0x1e2ec, 0x1e2ef,
 	0x1e4ec, 0x1e4ef,
+	0x1e5ee, 0x1e5ef,
 	0x1e8d0, 0x1e8d6,
 	0x1e944, 0x1e94a,
 	0x1f3fb, 0x1f3ff,
@@ -38062,7 +40673,7 @@ static const OnigCodePoint CR_Grapheme_Cluster_Break_Extend[] = {
 
 /* 'Grapheme_Cluster_Break_SpacingMark': Grapheme_Cluster_Break=SpacingMark */
 static const OnigCodePoint CR_Grapheme_Cluster_Break_SpacingMark[] = {
-	165,
+	155,
 	0x0903, 0x0903,
 	0x093b, 0x093b,
 	0x093e, 0x0940,
@@ -38090,10 +40701,8 @@ static const OnigCodePoint CR_Grapheme_Cluster_Break_SpacingMark[] = {
 	0x0c41, 0x0c44,
 	0x0c82, 0x0c83,
 	0x0cbe, 0x0cbe,
-	0x0cc0, 0x0cc1,
+	0x0cc1, 0x0cc1,
 	0x0cc3, 0x0cc4,
-	0x0cc7, 0x0cc8,
-	0x0cca, 0x0ccb,
 	0x0cf3, 0x0cf3,
 	0x0d02, 0x0d03,
 	0x0d3f, 0x0d40,
@@ -38111,8 +40720,6 @@ static const OnigCodePoint CR_Grapheme_Cluster_Break_SpacingMark[] = {
 	0x103b, 0x103c,
 	0x1056, 0x1057,
 	0x1084, 0x1084,
-	0x1715, 0x1715,
-	0x1734, 0x1734,
 	0x17b6, 0x17b6,
 	0x17be, 0x17c5,
 	0x17c7, 0x17c8,
@@ -38125,17 +40732,13 @@ static const OnigCodePoint CR_Grapheme_Cluster_Break_SpacingMark[] = {
 	0x1a57, 0x1a57,
 	0x1a6d, 0x1a72,
 	0x1b04, 0x1b04,
-	0x1b3b, 0x1b3b,
-	0x1b3d, 0x1b41,
-	0x1b43, 0x1b44,
+	0x1b3e, 0x1b41,
 	0x1b82, 0x1b82,
 	0x1ba1, 0x1ba1,
 	0x1ba6, 0x1ba7,
-	0x1baa, 0x1baa,
 	0x1be7, 0x1be7,
 	0x1bea, 0x1bec,
 	0x1bee, 0x1bee,
-	0x1bf2, 0x1bf3,
 	0x1c24, 0x1c2b,
 	0x1c34, 0x1c35,
 	0x1ce1, 0x1ce1,
@@ -38144,11 +40747,11 @@ static const OnigCodePoint CR_Grapheme_Cluster_Break_SpacingMark[] = {
 	0xa827, 0xa827,
 	0xa880, 0xa881,
 	0xa8b4, 0xa8c3,
-	0xa952, 0xa953,
+	0xa952, 0xa952,
 	0xa983, 0xa983,
 	0xa9b4, 0xa9b5,
 	0xa9ba, 0xa9bb,
-	0xa9be, 0xa9c0,
+	0xa9be, 0xa9bf,
 	0xaa2f, 0xaa30,
 	0xaa33, 0xaa34,
 	0xaa4d, 0xaa4d,
@@ -38168,18 +40771,20 @@ static const OnigCodePoint CR_Grapheme_Cluster_Break_SpacingMark[] = {
 	0x11145, 0x11146,
 	0x11182, 0x11182,
 	0x111b3, 0x111b5,
-	0x111bf, 0x111c0,
+	0x111bf, 0x111bf,
 	0x111ce, 0x111ce,
 	0x1122c, 0x1122e,
 	0x11232, 0x11233,
-	0x11235, 0x11235,
 	0x112e0, 0x112e2,
 	0x11302, 0x11303,
 	0x1133f, 0x1133f,
 	0x11341, 0x11344,
 	0x11347, 0x11348,
-	0x1134b, 0x1134d,
+	0x1134b, 0x1134c,
 	0x11362, 0x11363,
+	0x113b9, 0x113ba,
+	0x113ca, 0x113ca,
+	0x113cc, 0x113cd,
 	0x11435, 0x11437,
 	0x11440, 0x11441,
 	0x11445, 0x11445,
@@ -38196,13 +40801,12 @@ static const OnigCodePoint CR_Grapheme_Cluster_Break_SpacingMark[] = {
 	0x1163e, 0x1163e,
 	0x116ac, 0x116ac,
 	0x116ae, 0x116af,
-	0x116b6, 0x116b6,
+	0x1171e, 0x1171e,
 	0x11726, 0x11726,
 	0x1182c, 0x1182e,
 	0x11838, 0x11838,
 	0x11931, 0x11935,
 	0x11937, 0x11938,
-	0x1193d, 0x1193d,
 	0x11940, 0x11940,
 	0x11942, 0x11942,
 	0x119d1, 0x119d3,
@@ -38223,11 +40827,8 @@ static const OnigCodePoint CR_Grapheme_Cluster_Break_SpacingMark[] = {
 	0x11f03, 0x11f03,
 	0x11f34, 0x11f35,
 	0x11f3e, 0x11f3f,
-	0x11f41, 0x11f41,
+	0x1612a, 0x1612c,
 	0x16f51, 0x16f87,
-	0x16ff0, 0x16ff1,
-	0x1d166, 0x1d166,
-	0x1d16d, 0x1d16d,
 }; /* CR_Grapheme_Cluster_Break_SpacingMark */
 
 /* 'Grapheme_Cluster_Break_L': Grapheme_Cluster_Break=L */
@@ -38239,9 +40840,11 @@ static const OnigCodePoint CR_Grapheme_Cluster_Break_L[] = {
 
 /* 'Grapheme_Cluster_Break_V': Grapheme_Cluster_Break=V */
 static const OnigCodePoint CR_Grapheme_Cluster_Break_V[] = {
-	2,
+	4,
 	0x1160, 0x11a7,
 	0xd7b0, 0xd7c6,
+	0x16d63, 0x16d63,
+	0x16d67, 0x16d6a,
 }; /* CR_Grapheme_Cluster_Break_V */
 
 /* 'Grapheme_Cluster_Break_T': Grapheme_Cluster_Break=T */
@@ -40160,6 +42763,12 @@ static const OnigCodePoint CR_In_Vithkuqi[] = {
 	0x10570, 0x105bf,
 }; /* CR_In_Vithkuqi */
 
+/* 'In_Todhri': Block */
+static const OnigCodePoint CR_In_Todhri[] = {
+	1,
+	0x105c0, 0x105ff,
+}; /* CR_In_Todhri */
+
 /* 'In_Linear_A': Block */
 static const OnigCodePoint CR_In_Linear_A[] = {
 	1,
@@ -40280,6 +42889,12 @@ static const OnigCodePoint CR_In_Hanifi_Rohingya[] = {
 	0x10d00, 0x10d3f,
 }; /* CR_In_Hanifi_Rohingya */
 
+/* 'In_Garay': Block */
+static const OnigCodePoint CR_In_Garay[] = {
+	1,
+	0x10d40, 0x10d8f,
+}; /* CR_In_Garay */
+
 /* 'In_Rumi_Numeral_Symbols': Block */
 static const OnigCodePoint CR_In_Rumi_Numeral_Symbols[] = {
 	1,
@@ -40391,6 +43006,12 @@ static const OnigCodePoint CR_In_Grantha[] = {
 	0x11300, 0x1137f,
 }; /* CR_In_Grantha */
 
+/* 'In_Tulu_Tigalari': Block */
+static const OnigCodePoint CR_In_Tulu_Tigalari[] = {
+	1,
+	0x11380, 0x113ff,
+}; /* CR_In_Tulu_Tigalari */
+
 /* 'In_Newa': Block */
 static const OnigCodePoint CR_In_Newa[] = {
 	1,
@@ -40427,6 +43048,12 @@ static const OnigCodePoint CR_In_Takri[] = {
 	0x11680, 0x116cf,
 }; /* CR_In_Takri */
 
+/* 'In_Myanmar_Extended_C': Block */
+static const OnigCodePoint CR_In_Myanmar_Extended_C[] = {
+	1,
+	0x116d0, 0x116ff,
+}; /* CR_In_Myanmar_Extended_C */
+
 /* 'In_Ahom': Block */
 static const OnigCodePoint CR_In_Ahom[] = {
 	1,
@@ -40487,6 +43114,12 @@ static const OnigCodePoint CR_In_Devanagari_Extended_A[] = {
 	0x11b00, 0x11b5f,
 }; /* CR_In_Devanagari_Extended_A */
 
+/* 'In_Sunuwar': Block */
+static const OnigCodePoint CR_In_Sunuwar[] = {
+	1,
+	0x11bc0, 0x11bff,
+}; /* CR_In_Sunuwar */
+
 /* 'In_Bhaiksuki': Block */
 static const OnigCodePoint CR_In_Bhaiksuki[] = {
 	1,
@@ -40571,12 +43204,24 @@ static const OnigCodePoint CR_In_Egyptian_Hieroglyph_Format_Controls[] = {
 	0x13430, 0x1345f,
 }; /* CR_In_Egyptian_Hieroglyph_Format_Controls */
 
+/* 'In_Egyptian_Hieroglyphs_Extended_A': Block */
+static const OnigCodePoint CR_In_Egyptian_Hieroglyphs_Extended_A[] = {
+	1,
+	0x13460, 0x143ff,
+}; /* CR_In_Egyptian_Hieroglyphs_Extended_A */
+
 /* 'In_Anatolian_Hieroglyphs': Block */
 static const OnigCodePoint CR_In_Anatolian_Hieroglyphs[] = {
 	1,
 	0x14400, 0x1467f,
 }; /* CR_In_Anatolian_Hieroglyphs */
 
+/* 'In_Gurung_Khema': Block */
+static const OnigCodePoint CR_In_Gurung_Khema[] = {
+	1,
+	0x16100, 0x1613f,
+}; /* CR_In_Gurung_Khema */
+
 /* 'In_Bamum_Supplement': Block */
 static const OnigCodePoint CR_In_Bamum_Supplement[] = {
 	1,
@@ -40607,6 +43252,12 @@ static const OnigCodePoint CR_In_Pahawh_Hmong[] = {
 	0x16b00, 0x16b8f,
 }; /* CR_In_Pahawh_Hmong */
 
+/* 'In_Kirat_Rai': Block */
+static const OnigCodePoint CR_In_Kirat_Rai[] = {
+	1,
+	0x16d40, 0x16d7f,
+}; /* CR_In_Kirat_Rai */
+
 /* 'In_Medefaidrin': Block */
 static const OnigCodePoint CR_In_Medefaidrin[] = {
 	1,
@@ -40691,6 +43342,12 @@ static const OnigCodePoint CR_In_Shorthand_Format_Controls[] = {
 	0x1bca0, 0x1bcaf,
 }; /* CR_In_Shorthand_Format_Controls */
 
+/* 'In_Symbols_for_Legacy_Computing_Supplement': Block */
+static const OnigCodePoint CR_In_Symbols_for_Legacy_Computing_Supplement[] = {
+	1,
+	0x1cc00, 0x1cebf,
+}; /* CR_In_Symbols_for_Legacy_Computing_Supplement */
+
 /* 'In_Znamenny_Musical_Notation': Block */
 static const OnigCodePoint CR_In_Znamenny_Musical_Notation[] = {
 	1,
@@ -40793,6 +43450,12 @@ static const OnigCodePoint CR_In_Nag_Mundari[] = {
 	0x1e4d0, 0x1e4ff,
 }; /* CR_In_Nag_Mundari */
 
+/* 'In_Ol_Onal': Block */
+static const OnigCodePoint CR_In_Ol_Onal[] = {
+	1,
+	0x1e5d0, 0x1e5ff,
+}; /* CR_In_Ol_Onal */
+
 /* 'In_Ethiopic_Extended_B': Block */
 static const OnigCodePoint CR_In_Ethiopic_Extended_B[] = {
 	1,
@@ -40955,6 +43618,12 @@ static const OnigCodePoint CR_In_CJK_Unified_Ideographs_Extension_F[] = {
 	0x2ceb0, 0x2ebef,
 }; /* CR_In_CJK_Unified_Ideographs_Extension_F */
 
+/* 'In_CJK_Unified_Ideographs_Extension_I': Block */
+static const OnigCodePoint CR_In_CJK_Unified_Ideographs_Extension_I[] = {
+	1,
+	0x2ebf0, 0x2ee5f,
+}; /* CR_In_CJK_Unified_Ideographs_Extension_I */
+
 /* 'In_CJK_Compatibility_Ideographs_Supplement': Block */
 static const OnigCodePoint CR_In_CJK_Compatibility_Ideographs_Supplement[] = {
 	1,
@@ -41003,34 +43672,33 @@ static const OnigCodePoint CR_In_No_Block[] = {
 	0x2fe0, 0x2fef,
 	0x10200, 0x1027f,
 	0x103e0, 0x103ff,
-	0x105c0, 0x105ff,
 	0x107c0, 0x107ff,
 	0x108b0, 0x108df,
 	0x10940, 0x1097f,
 	0x10aa0, 0x10abf,
 	0x10bb0, 0x10bff,
 	0x10c50, 0x10c7f,
-	0x10d40, 0x10e5f,
+	0x10d90, 0x10e5f,
 	0x11250, 0x1127f,
-	0x11380, 0x113ff,
 	0x114e0, 0x1157f,
-	0x116d0, 0x116ff,
 	0x11750, 0x117ff,
 	0x11850, 0x1189f,
 	0x11960, 0x1199f,
-	0x11b60, 0x11bff,
+	0x11b60, 0x11bbf,
 	0x11cc0, 0x11cff,
 	0x11db0, 0x11edf,
 	0x11f60, 0x11faf,
 	0x12550, 0x12f8f,
-	0x13460, 0x143ff,
-	0x14680, 0x167ff,
-	0x16b90, 0x16e3f,
+	0x14680, 0x160ff,
+	0x16140, 0x167ff,
+	0x16b90, 0x16d3f,
+	0x16d80, 0x16e3f,
 	0x16ea0, 0x16eff,
 	0x16fa0, 0x16fdf,
 	0x18d80, 0x1afef,
 	0x1b300, 0x1bbff,
-	0x1bcb0, 0x1ceff,
+	0x1bcb0, 0x1cbff,
+	0x1cec0, 0x1ceff,
 	0x1cfd0, 0x1cfff,
 	0x1d250, 0x1d2bf,
 	0x1d380, 0x1d3ff,
@@ -41038,7 +43706,8 @@ static const OnigCodePoint CR_In_No_Block[] = {
 	0x1e090, 0x1e0ff,
 	0x1e150, 0x1e28f,
 	0x1e300, 0x1e4cf,
-	0x1e500, 0x1e7df,
+	0x1e500, 0x1e5cf,
+	0x1e600, 0x1e7df,
 	0x1e8e0, 0x1e8ff,
 	0x1e960, 0x1ec6f,
 	0x1ecc0, 0x1ecff,
@@ -41046,7 +43715,7 @@ static const OnigCodePoint CR_In_No_Block[] = {
 	0x1ef00, 0x1efff,
 	0x1fc00, 0x1ffff,
 	0x2a6e0, 0x2a6ff,
-	0x2ebf0, 0x2f7ff,
+	0x2ee60, 0x2f7ff,
 	0x2fa20, 0x2ffff,
 	0x323b0, 0xdffff,
 	0xe0080, 0xe00ff,
@@ -41131,6 +43800,9 @@ static const OnigCodePoint* const CodeRanges[] = {
   CR_Grapheme_Extend,
   CR_Grapheme_Base,
   CR_Grapheme_Link,
+  CR_InCB_Linker,
+  CR_InCB_Consonant,
+  CR_InCB_Extend,
   CR_Common,
   CR_Latin,
   CR_Greek,
@@ -41294,6 +43966,13 @@ static const OnigCodePoint* const CodeRanges[] = {
   CR_Vithkuqi,
   CR_Kawi,
   CR_Nag_Mundari,
+  CR_Garay,
+  CR_Gurung_Khema,
+  CR_Kirat_Rai,
+  CR_Ol_Onal,
+  CR_Sunuwar,
+  CR_Todhri,
+  CR_Tulu_Tigalari,
   CR_White_Space,
   CR_Bidi_Control,
   CR_Join_Control,
@@ -41314,6 +43993,7 @@ static const OnigCodePoint* const CodeRanges[] = {
   CR_Other_Grapheme_Extend,
   CR_IDS_Binary_Operator,
   CR_IDS_Trinary_Operator,
+  CR_IDS_Unary_Operator,
   CR_Radical,
   CR_Unified_Ideograph,
   CR_Other_Default_Ignorable_Code_Point,
@@ -41322,12 +44002,15 @@ static const OnigCodePoint* const CodeRanges[] = {
   CR_Logical_Order_Exception,
   CR_Other_ID_Start,
   CR_Other_ID_Continue,
+  CR_ID_Compat_Math_Continue,
+  CR_ID_Compat_Math_Start,
   CR_Sentence_Terminal,
   CR_Variation_Selector,
   CR_Pattern_White_Space,
   CR_Pattern_Syntax,
   CR_Prepended_Concatenation_Mark,
   CR_Regional_Indicator,
+  CR_Modifier_Combining_Mark,
   CR_Emoji,
   CR_Emoji_Presentation,
   CR_Emoji_Modifier,
@@ -41361,6 +44044,8 @@ static const OnigCodePoint* const CodeRanges[] = {
   CR_Age_13_0,
   CR_Age_14_0,
   CR_Age_15_0,
+  CR_Age_15_1,
+  CR_Age_16_0,
 #endif /* USE_UNICODE_AGE_PROPERTIES */
   CR_Grapheme_Cluster_Break_Prepend,
   CR_Grapheme_Cluster_Break_CR,
@@ -41560,6 +44245,7 @@ static const OnigCodePoint* const CodeRanges[] = {
   CR_In_Elbasan,
   CR_In_Caucasian_Albanian,
   CR_In_Vithkuqi,
+  CR_In_Todhri,
   CR_In_Linear_A,
   CR_In_Latin_Extended_F,
   CR_In_Cypriot_Syllabary,
@@ -41582,6 +44268,7 @@ static const OnigCodePoint* const CodeRanges[] = {
   CR_In_Old_Turkic,
   CR_In_Old_Hungarian,
   CR_In_Hanifi_Rohingya,
+  CR_In_Garay,
   CR_In_Rumi_Numeral_Symbols,
   CR_In_Yezidi,
   CR_In_Arabic_Extended_C,
@@ -41601,12 +44288,14 @@ static const OnigCodePoint* const CodeRanges[] = {
   CR_In_Multani,
   CR_In_Khudawadi,
   CR_In_Grantha,
+  CR_In_Tulu_Tigalari,
   CR_In_Newa,
   CR_In_Tirhuta,
   CR_In_Siddham,
   CR_In_Modi,
   CR_In_Mongolian_Supplement,
   CR_In_Takri,
+  CR_In_Myanmar_Extended_C,
   CR_In_Ahom,
   CR_In_Dogra,
   CR_In_Warang_Citi,
@@ -41617,6 +44306,7 @@ static const OnigCodePoint* const CodeRanges[] = {
   CR_In_Unified_Canadian_Aboriginal_Syllabics_Extended_A,
   CR_In_Pau_Cin_Hau,
   CR_In_Devanagari_Extended_A,
+  CR_In_Sunuwar,
   CR_In_Bhaiksuki,
   CR_In_Marchen,
   CR_In_Masaram_Gondi,
@@ -41631,12 +44321,15 @@ static const OnigCodePoint* const CodeRanges[] = {
   CR_In_Cypro_Minoan,
   CR_In_Egyptian_Hieroglyphs,
   CR_In_Egyptian_Hieroglyph_Format_Controls,
+  CR_In_Egyptian_Hieroglyphs_Extended_A,
   CR_In_Anatolian_Hieroglyphs,
+  CR_In_Gurung_Khema,
   CR_In_Bamum_Supplement,
   CR_In_Mro,
   CR_In_Tangsa,
   CR_In_Bassa_Vah,
   CR_In_Pahawh_Hmong,
+  CR_In_Kirat_Rai,
   CR_In_Medefaidrin,
   CR_In_Miao,
   CR_In_Ideographic_Symbols_and_Punctuation,
@@ -41651,6 +44344,7 @@ static const OnigCodePoint* const CodeRanges[] = {
   CR_In_Nushu,
   CR_In_Duployan,
   CR_In_Shorthand_Format_Controls,
+  CR_In_Symbols_for_Legacy_Computing_Supplement,
   CR_In_Znamenny_Musical_Notation,
   CR_In_Byzantine_Musical_Symbols,
   CR_In_Musical_Symbols,
@@ -41668,6 +44362,7 @@ static const OnigCodePoint* const CodeRanges[] = {
   CR_In_Toto,
   CR_In_Wancho,
   CR_In_Nag_Mundari,
+  CR_In_Ol_Onal,
   CR_In_Ethiopic_Extended_B,
   CR_In_Mende_Kikakui,
   CR_In_Adlam,
@@ -41695,6 +44390,7 @@ static const OnigCodePoint* const CodeRanges[] = {
   CR_In_CJK_Unified_Ideographs_Extension_D,
   CR_In_CJK_Unified_Ideographs_Extension_E,
   CR_In_CJK_Unified_Ideographs_Extension_F,
+  CR_In_CJK_Unified_Ideographs_Extension_I,
   CR_In_CJK_Compatibility_Ideographs_Supplement,
   CR_In_CJK_Unified_Ideographs_Extension_G,
   CR_In_CJK_Unified_Ideographs_Extension_H,
@@ -41722,15 +44418,15 @@ static const struct uniname2ctype_struct *uniname2ctype_p(register const char *s
 /* maximum key range = 15, duplicates = 0 */
 #else /* USE_UNICODE_PROPERTIES */
 #ifndef USE_UNICODE_AGE_PROPERTIES
-#define TOTAL_KEYWORDS 866
+#define TOTAL_KEYWORDS 900
 #else /* USE_UNICODE_AGE_PROPERTIES */
-#define TOTAL_KEYWORDS 891
+#define TOTAL_KEYWORDS 927
 #endif /* USE_UNICODE_AGE_PROPERTIES */
 #define MIN_WORD_LENGTH 1
 #define MAX_WORD_LENGTH 45
-#define MIN_HASH_VALUE 11
-#define MAX_HASH_VALUE 6098
-/* maximum key range = 6088, duplicates = 0 */
+#define MIN_HASH_VALUE 12
+#define MAX_HASH_VALUE 6807
+/* maximum key range = 6796, duplicates = 0 */
 #endif /* USE_UNICODE_PROPERTIES */
 
 #ifdef __GNUC__
@@ -41764,24 +44460,24 @@ uniname2ctype_hash (register const char *str, register size_t len)
        2,  1,  1, 21,  1,  7,  4,  6, 21,  1,
        4, 21, 21, 21, 21, 21, 21, 21
 #else /* USE_UNICODE_PROPERTIES */
-      6099, 6099, 6099, 6099, 6099, 6099, 6099, 6099, 6099, 6099,
-      6099, 6099, 6099, 6099, 6099, 6099, 6099, 6099, 6099, 6099,
-      6099, 6099, 6099, 6099, 6099, 6099, 6099, 6099, 6099, 6099,
-      6099, 6099, 6099, 6099, 6099, 6099, 6099, 6099, 6099, 6099,
+      6808, 6808, 6808, 6808, 6808, 6808, 6808, 6808, 6808, 6808,
+      6808, 6808, 6808, 6808, 6808, 6808, 6808, 6808, 6808, 6808,
+      6808, 6808, 6808, 6808, 6808, 6808, 6808, 6808, 6808, 6808,
+      6808, 6808, 6808, 6808, 6808, 6808, 6808, 6808, 6808, 6808,
 #ifndef USE_UNICODE_AGE_PROPERTIES
-      6099, 6099, 6099, 6099, 6099, 6099, 6099, 6099, 6099, 6099,
-      6099, 6099, 6099, 6099, 6099, 6099, 6099, 6099, 6099, 6099,
+      6808, 6808, 6808, 6808, 6808, 6808, 6808, 6808, 6808, 6808,
+      6808, 6808, 6808, 6808, 6808, 6808, 6808, 6808, 6808, 6808,
 #else /* USE_UNICODE_AGE_PROPERTIES */
-      6099, 6099, 6099, 6099, 6099, 6099,   12, 6099,    3,    1,
-         4,    8,   32,   26,   14,   17,   10,    7, 6099, 6099,
+      6808, 6808, 6808, 6808, 6808, 6808,    7, 6808,    2,    1,
+         4,   42,   27,   21,    6,   10,    9,    2, 6808, 6808,
 #endif /* USE_UNICODE_AGE_PROPERTIES */
-      6099, 6099, 6099, 6099, 6099, 6099, 6099, 6099, 6099, 6099,
-      6099, 6099, 6099, 6099, 6099, 6099, 6099, 6099, 6099, 6099,
-      6099, 6099, 6099, 6099, 6099, 6099, 6099, 6099, 6099, 6099,
-      6099, 6099, 6099, 6099, 6099, 6099, 6099,    1, 1425,  113,
-       437,   37, 1086, 1071, 1051,    4, 1984,    9,  500,   88,
-         8,   18, 1371, 1287,   54,  203,  310,  619, 1958,  603,
-       275, 1624,   44,    1,   22, 6099, 6099, 6099, 6099, 6099
+      6808,    1, 6808, 6808, 6808, 6808, 6808, 6808, 6808, 6808,
+      6808, 6808, 6808, 6808, 6808, 6808, 6808, 6808, 6808, 6808,
+      6808, 6808, 6808, 6808, 6808, 6808, 6808, 6808, 6808, 6808,
+      6808, 6808, 6808, 6808, 6808, 6808, 6808,    1, 1475,  140,
+       423,   30, 1736, 1065, 1241,    5,  907,    6,  795,   96,
+         3,   10, 1388,  543,   48,  197,  370,  502, 1709, 2040,
+       816, 2019,   52,    5,   12, 6808, 6808, 6808, 6808, 6808
 #endif /* USE_UNICODE_PROPERTIES */
     };
 #ifndef USE_UNICODE_PROPERTIES
@@ -41845,917 +44541,943 @@ struct uniname2ctype_pool_t
     char uniname2ctype_pool_str19[sizeof("digit")];
     char uniname2ctype_pool_str20[sizeof("blank")];
 #else /* USE_UNICODE_PROPERTIES */
-    char uniname2ctype_pool_str11[sizeof("yi")];
-    char uniname2ctype_pool_str17[sizeof("yiii")];
-    char uniname2ctype_pool_str22[sizeof("lana")];
-    char uniname2ctype_pool_str25[sizeof("lina")];
-    char uniname2ctype_pool_str33[sizeof("maka")];
-    char uniname2ctype_pool_str35[sizeof("mani")];
-    char uniname2ctype_pool_str36[sizeof("mn")];
-    char uniname2ctype_pool_str45[sizeof("miao")];
-    char uniname2ctype_pool_str46[sizeof("lo")];
-    char uniname2ctype_pool_str47[sizeof("ci")];
-    char uniname2ctype_pool_str48[sizeof("lao")];
-    char uniname2ctype_pool_str49[sizeof("laoo")];
-    char uniname2ctype_pool_str52[sizeof("inkannada")];
-    char uniname2ctype_pool_str55[sizeof("cn")];
-    char uniname2ctype_pool_str64[sizeof("pi")];
-    char uniname2ctype_pool_str66[sizeof("innko")];
-    char uniname2ctype_pool_str67[sizeof("z")];
-    char uniname2ctype_pool_str71[sizeof("gran")];
-    char uniname2ctype_pool_str75[sizeof("co")];
-    char uniname2ctype_pool_str83[sizeof("lineara")];
-    char uniname2ctype_pool_str86[sizeof("mark")];
-    char uniname2ctype_pool_str90[sizeof("yezi")];
-    char uniname2ctype_pool_str92[sizeof("po")];
-    char uniname2ctype_pool_str94[sizeof("me")];
-    char uniname2ctype_pool_str100[sizeof("cari")];
-    char uniname2ctype_pool_str101[sizeof("inkharoshthi")];
-    char uniname2ctype_pool_str102[sizeof("kana")];
-    char uniname2ctype_pool_str103[sizeof("loe")];
+    char uniname2ctype_pool_str12[sizeof("lana")];
+    char uniname2ctype_pool_str16[sizeof("lina")];
+    char uniname2ctype_pool_str17[sizeof("yi")];
+    char uniname2ctype_pool_str18[sizeof("mn")];
+    char uniname2ctype_pool_str22[sizeof("maka")];
+    char uniname2ctype_pool_str23[sizeof("mani")];
+    char uniname2ctype_pool_str24[sizeof("yiii")];
+    char uniname2ctype_pool_str25[sizeof("lo")];
+    char uniname2ctype_pool_str27[sizeof("lao")];
+    char uniname2ctype_pool_str28[sizeof("laoo")];
+    char uniname2ctype_pool_str30[sizeof("miao")];
+    char uniname2ctype_pool_str31[sizeof("inkannada")];
+    char uniname2ctype_pool_str37[sizeof("innko")];
+    char uniname2ctype_pool_str38[sizeof("cn")];
+    char uniname2ctype_pool_str42[sizeof("ci")];
+    char uniname2ctype_pool_str52[sizeof("co")];
+    char uniname2ctype_pool_str59[sizeof("gara")];
+    char uniname2ctype_pool_str60[sizeof("pi")];
+    char uniname2ctype_pool_str61[sizeof("gran")];
+    char uniname2ctype_pool_str65[sizeof("z")];
+    char uniname2ctype_pool_str68[sizeof("lineara")];
+    char uniname2ctype_pool_str69[sizeof("mark")];
+    char uniname2ctype_pool_str70[sizeof("po")];
+    char uniname2ctype_pool_str72[sizeof("me")];
+    char uniname2ctype_pool_str76[sizeof("loe")];
+    char uniname2ctype_pool_str79[sizeof("inkiratrai")];
+    char uniname2ctype_pool_str81[sizeof("mro")];
+    char uniname2ctype_pool_str82[sizeof("mroo")];
+    char uniname2ctype_pool_str86[sizeof("inkharoshthi")];
+    char uniname2ctype_pool_str88[sizeof("cari")];
+    char uniname2ctype_pool_str92[sizeof("carian")];
+    char uniname2ctype_pool_str93[sizeof("grek")];
+    char uniname2ctype_pool_str96[sizeof("yezi")];
+    char uniname2ctype_pool_str97[sizeof("geor")];
+    char uniname2ctype_pool_str100[sizeof("greek")];
+    char uniname2ctype_pool_str101[sizeof("mendekikakui")];
+    char uniname2ctype_pool_str102[sizeof("mero")];
+    char uniname2ctype_pool_str105[sizeof("kana")];
     char uniname2ctype_pool_str107[sizeof("m")];
-    char uniname2ctype_pool_str108[sizeof("grek")];
-    char uniname2ctype_pool_str111[sizeof("mro")];
-    char uniname2ctype_pool_str112[sizeof("mroo")];
-    char uniname2ctype_pool_str115[sizeof("carian")];
-    char uniname2ctype_pool_str117[sizeof("geor")];
-    char uniname2ctype_pool_str118[sizeof("greek")];
-    char uniname2ctype_pool_str122[sizeof("gonm")];
-    char uniname2ctype_pool_str129[sizeof("mendekikakui")];
-    char uniname2ctype_pool_str130[sizeof("pe")];
-    char uniname2ctype_pool_str131[sizeof("mero")];
-    char uniname2ctype_pool_str134[sizeof("inosmanya")];
-    char uniname2ctype_pool_str139[sizeof("cakm")];
-    char uniname2ctype_pool_str145[sizeof("inmanichaean")];
-    char uniname2ctype_pool_str146[sizeof("inmro")];
-    char uniname2ctype_pool_str148[sizeof("inmiao")];
-    char uniname2ctype_pool_str149[sizeof("inchakma")];
-    char uniname2ctype_pool_str151[sizeof("c")];
-    char uniname2ctype_pool_str152[sizeof("mandaic")];
-    char uniname2ctype_pool_str153[sizeof("meeteimayek")];
-    char uniname2ctype_pool_str158[sizeof("zzzz")];
-    char uniname2ctype_pool_str161[sizeof("inarmenian")];
-    char uniname2ctype_pool_str177[sizeof("inmyanmar")];
-    char uniname2ctype_pool_str178[sizeof("inmakasar")];
-    char uniname2ctype_pool_str183[sizeof("common")];
-    char uniname2ctype_pool_str186[sizeof("lm")];
-    char uniname2ctype_pool_str190[sizeof("marc")];
-    char uniname2ctype_pool_str203[sizeof("inrunic")];
-    char uniname2ctype_pool_str204[sizeof("incarian")];
-    char uniname2ctype_pool_str210[sizeof("inideographicsymbolsandpunctuation")];
-    char uniname2ctype_pool_str212[sizeof("inkhmer")];
-    char uniname2ctype_pool_str213[sizeof("qaai")];
+    char uniname2ctype_pool_str110[sizeof("pe")];
+    char uniname2ctype_pool_str118[sizeof("gonm")];
+    char uniname2ctype_pool_str122[sizeof("meeteimayek")];
+    char uniname2ctype_pool_str126[sizeof("inosmanya")];
+    char uniname2ctype_pool_str130[sizeof("inmro")];
+    char uniname2ctype_pool_str131[sizeof("inmanichaean")];
+    char uniname2ctype_pool_str132[sizeof("inmiao")];
+    char uniname2ctype_pool_str137[sizeof("cakm")];
+    char uniname2ctype_pool_str149[sizeof("inarmenian")];
+    char uniname2ctype_pool_str154[sizeof("krai")];
+    char uniname2ctype_pool_str158[sizeof("common")];
+    char uniname2ctype_pool_str165[sizeof("inchakma")];
+    char uniname2ctype_pool_str166[sizeof("inmyanmar")];
+    char uniname2ctype_pool_str167[sizeof("mandaic")];
+    char uniname2ctype_pool_str169[sizeof("inmakasar")];
+    char uniname2ctype_pool_str171[sizeof("c")];
+    char uniname2ctype_pool_str172[sizeof("zzzz")];
+    char uniname2ctype_pool_str192[sizeof("inideographicsymbolsandpunctuation")];
+    char uniname2ctype_pool_str196[sizeof("inkhmer")];
+    char uniname2ctype_pool_str197[sizeof("lm")];
+    char uniname2ctype_pool_str203[sizeof("marc")];
+    char uniname2ctype_pool_str208[sizeof("qaai")];
+    char uniname2ctype_pool_str211[sizeof("combiningmark")];
+    char uniname2ctype_pool_str212[sizeof("inrunic")];
+    char uniname2ctype_pool_str213[sizeof("incarian")];
     char uniname2ctype_pool_str218[sizeof("inahom")];
-    char uniname2ctype_pool_str226[sizeof("merc")];
-    char uniname2ctype_pool_str230[sizeof("inchorasmian")];
-    char uniname2ctype_pool_str231[sizeof("combiningmark")];
-    char uniname2ctype_pool_str236[sizeof("lc")];
-    char uniname2ctype_pool_str237[sizeof("perm")];
-    char uniname2ctype_pool_str246[sizeof("mc")];
-    char uniname2ctype_pool_str250[sizeof("connectorpunctuation")];
-    char uniname2ctype_pool_str253[sizeof("cans")];
-    char uniname2ctype_pool_str260[sizeof("incuneiformnumbersandpunctuation")];
-    char uniname2ctype_pool_str263[sizeof("armi")];
-    char uniname2ctype_pool_str265[sizeof("cc")];
-    char uniname2ctype_pool_str267[sizeof("armn")];
-    char uniname2ctype_pool_str268[sizeof("incherokee")];
-    char uniname2ctype_pool_str270[sizeof("prependedconcatenationmark")];
-    char uniname2ctype_pool_str274[sizeof("incuneiform")];
-    char uniname2ctype_pool_str275[sizeof("inavestan")];
-    char uniname2ctype_pool_str281[sizeof("inipaextensions")];
-    char uniname2ctype_pool_str282[sizeof("pc")];
-    char uniname2ctype_pool_str283[sizeof("armenian")];
-    char uniname2ctype_pool_str285[sizeof("insharada")];
-    char uniname2ctype_pool_str287[sizeof("vai")];
-    char uniname2ctype_pool_str288[sizeof("vaii")];
-    char uniname2ctype_pool_str289[sizeof("inmarchen")];
-    char uniname2ctype_pool_str293[sizeof("makasar")];
-    char uniname2ctype_pool_str297[sizeof("masaramgondi")];
-    char uniname2ctype_pool_str301[sizeof("inarrows")];
-    char uniname2ctype_pool_str311[sizeof("incyrillic")];
-    char uniname2ctype_pool_str313[sizeof("incham")];
-    char uniname2ctype_pool_str315[sizeof("qmark")];
-    char uniname2ctype_pool_str320[sizeof("ri")];
-    char uniname2ctype_pool_str322[sizeof("qaac")];
-    char uniname2ctype_pool_str328[sizeof("insamaritan")];
-    char uniname2ctype_pool_str331[sizeof("latn")];
-    char uniname2ctype_pool_str335[sizeof("inmasaramgondi")];
-    char uniname2ctype_pool_str338[sizeof("inthaana")];
-    char uniname2ctype_pool_str340[sizeof("latin")];
-    char uniname2ctype_pool_str342[sizeof("inthai")];
-    char uniname2ctype_pool_str345[sizeof("lineseparator")];
-    char uniname2ctype_pool_str346[sizeof("pcm")];
-    char uniname2ctype_pool_str348[sizeof("inkatakana")];
-    char uniname2ctype_pool_str352[sizeof("inkaithi")];
-    char uniname2ctype_pool_str362[sizeof("inscriptionalparthian")];
-    char uniname2ctype_pool_str366[sizeof("initialpunctuation")];
-    char uniname2ctype_pool_str373[sizeof("mtei")];
-    char uniname2ctype_pool_str381[sizeof("inzanabazarsquare")];
-    char uniname2ctype_pool_str386[sizeof("inkhmersymbols")];
-    char uniname2ctype_pool_str399[sizeof("insyriac")];
-    char uniname2ctype_pool_str401[sizeof("intakri")];
-    char uniname2ctype_pool_str404[sizeof("arabic")];
-    char uniname2ctype_pool_str418[sizeof("katakana")];
-    char uniname2ctype_pool_str426[sizeof("prti")];
-    char uniname2ctype_pool_str430[sizeof("zs")];
-    char uniname2ctype_pool_str442[sizeof("ascii")];
-    char uniname2ctype_pool_str445[sizeof("cs")];
-    char uniname2ctype_pool_str462[sizeof("ps")];
-    char uniname2ctype_pool_str468[sizeof("mand")];
-    char uniname2ctype_pool_str470[sizeof("privateuse")];
-    char uniname2ctype_pool_str475[sizeof("inruminumeralsymbols")];
-    char uniname2ctype_pool_str480[sizeof("inmyanmarextendeda")];
-    char uniname2ctype_pool_str481[sizeof("modi")];
-    char uniname2ctype_pool_str486[sizeof("incjkcompatibilityforms")];
-    char uniname2ctype_pool_str488[sizeof("inkanaextendeda")];
-    char uniname2ctype_pool_str491[sizeof("incjkcompatibilityideographs")];
-    char uniname2ctype_pool_str500[sizeof("brai")];
-    char uniname2ctype_pool_str504[sizeof("mend")];
-    char uniname2ctype_pool_str505[sizeof("ideo")];
-    char uniname2ctype_pool_str506[sizeof("letter")];
-    char uniname2ctype_pool_str509[sizeof("l")];
-    char uniname2ctype_pool_str511[sizeof("inmeeteimayek")];
-    char uniname2ctype_pool_str520[sizeof("inideographicdescriptioncharacters")];
-    char uniname2ctype_pool_str533[sizeof("yezidi")];
-    char uniname2ctype_pool_str538[sizeof("knda")];
-    char uniname2ctype_pool_str541[sizeof("innandinagari")];
-    char uniname2ctype_pool_str543[sizeof("kannada")];
-    char uniname2ctype_pool_str556[sizeof("inmodi")];
-    char uniname2ctype_pool_str558[sizeof("inlao")];
-    char uniname2ctype_pool_str559[sizeof("xidcontinue")];
-    char uniname2ctype_pool_str560[sizeof("inoldnortharabian")];
-    char uniname2ctype_pool_str565[sizeof("intransportandmapsymbols")];
-    char uniname2ctype_pool_str566[sizeof("letternumber")];
-    char uniname2ctype_pool_str568[sizeof("gothic")];
-    char uniname2ctype_pool_str572[sizeof("inlineara")];
-    char uniname2ctype_pool_str577[sizeof("inmendekikakui")];
-    char uniname2ctype_pool_str579[sizeof("mongolian")];
-    char uniname2ctype_pool_str582[sizeof("inmiscellaneousmathematicalsymbolsa")];
+    char uniname2ctype_pool_str224[sizeof("prependedconcatenationmark")];
+    char uniname2ctype_pool_str225[sizeof("inchorasmian")];
+    char uniname2ctype_pool_str226[sizeof("perm")];
+    char uniname2ctype_pool_str232[sizeof("merc")];
+    char uniname2ctype_pool_str235[sizeof("cans")];
+    char uniname2ctype_pool_str240[sizeof("connectorpunctuation")];
+    char uniname2ctype_pool_str249[sizeof("inavestan")];
+    char uniname2ctype_pool_str250[sizeof("incuneiformnumbersandpunctuation")];
+    char uniname2ctype_pool_str262[sizeof("inipaextensions")];
+    char uniname2ctype_pool_str265[sizeof("insharada")];
+    char uniname2ctype_pool_str267[sizeof("incherokee")];
+    char uniname2ctype_pool_str270[sizeof("makasar")];
+    char uniname2ctype_pool_str273[sizeof("inarrows")];
+    char uniname2ctype_pool_str279[sizeof("masaramgondi")];
+    char uniname2ctype_pool_str285[sizeof("lc")];
+    char uniname2ctype_pool_str289[sizeof("incuneiform")];
+    char uniname2ctype_pool_str291[sizeof("armn")];
+    char uniname2ctype_pool_str292[sizeof("mc")];
+    char uniname2ctype_pool_str293[sizeof("armi")];
+    char uniname2ctype_pool_str303[sizeof("armenian")];
+    char uniname2ctype_pool_str305[sizeof("inmarchen")];
+    char uniname2ctype_pool_str309[sizeof("lineseparator")];
+    char uniname2ctype_pool_str311[sizeof("qmark")];
+    char uniname2ctype_pool_str312[sizeof("cc")];
+    char uniname2ctype_pool_str317[sizeof("insamaritan")];
+    char uniname2ctype_pool_str325[sizeof("inmasaramgondi")];
+    char uniname2ctype_pool_str330[sizeof("pc")];
+    char uniname2ctype_pool_str332[sizeof("inscriptionalparthian")];
+    char uniname2ctype_pool_str343[sizeof("qaac")];
+    char uniname2ctype_pool_str345[sizeof("mcm")];
+    char uniname2ctype_pool_str348[sizeof("incham")];
+    char uniname2ctype_pool_str352[sizeof("incyrillic")];
+    char uniname2ctype_pool_str357[sizeof("inzanabazarsquare")];
+    char uniname2ctype_pool_str362[sizeof("inkhmersymbols")];
+    char uniname2ctype_pool_str381[sizeof("latn")];
+    char uniname2ctype_pool_str382[sizeof("ri")];
+    char uniname2ctype_pool_str383[sizeof("pcm")];
+    char uniname2ctype_pool_str385[sizeof("latin")];
+    char uniname2ctype_pool_str390[sizeof("inthaana")];
+    char uniname2ctype_pool_str396[sizeof("inthai")];
+    char uniname2ctype_pool_str397[sizeof("inkatakana")];
+    char uniname2ctype_pool_str403[sizeof("inkaithi")];
+    char uniname2ctype_pool_str407[sizeof("insyriac")];
+    char uniname2ctype_pool_str408[sizeof("zs")];
+    char uniname2ctype_pool_str416[sizeof("initialpunctuation")];
+    char uniname2ctype_pool_str419[sizeof("mtei")];
+    char uniname2ctype_pool_str426[sizeof("cs")];
+    char uniname2ctype_pool_str441[sizeof("mand")];
+    char uniname2ctype_pool_str444[sizeof("ps")];
+    char uniname2ctype_pool_str445[sizeof("intakri")];
+    char uniname2ctype_pool_str452[sizeof("modi")];
+    char uniname2ctype_pool_str458[sizeof("inkanaextendeda")];
+    char uniname2ctype_pool_str470[sizeof("mend")];
+    char uniname2ctype_pool_str472[sizeof("inruminumeralsymbols")];
+    char uniname2ctype_pool_str473[sizeof("ideo")];
+    char uniname2ctype_pool_str475[sizeof("prti")];
+    char uniname2ctype_pool_str480[sizeof("arabic")];
+    char uniname2ctype_pool_str481[sizeof("brai")];
+    char uniname2ctype_pool_str483[sizeof("katakana")];
+    char uniname2ctype_pool_str487[sizeof("inideographicdescriptioncharacters")];
+    char uniname2ctype_pool_str492[sizeof("ascii")];
+    char uniname2ctype_pool_str504[sizeof("innandinagari")];
+    char uniname2ctype_pool_str512[sizeof("privateuse")];
+    char uniname2ctype_pool_str514[sizeof("inoldnortharabian")];
+    char uniname2ctype_pool_str516[sizeof("sk")];
+    char uniname2ctype_pool_str524[sizeof("so")];
+    char uniname2ctype_pool_str525[sizeof("incjkcompatibilityforms")];
+    char uniname2ctype_pool_str526[sizeof("yezidi")];
+    char uniname2ctype_pool_str527[sizeof("knda")];
+    char uniname2ctype_pool_str528[sizeof("inmyanmarextendeda")];
+    char uniname2ctype_pool_str530[sizeof("incjkcompatibilityideographs")];
+    char uniname2ctype_pool_str532[sizeof("kannada")];
+    char uniname2ctype_pool_str534[sizeof("xidcontinue")];
+    char uniname2ctype_pool_str535[sizeof("letter")];
+    char uniname2ctype_pool_str544[sizeof("inmodi")];
+    char uniname2ctype_pool_str554[sizeof("inmeeteimayek")];
+    char uniname2ctype_pool_str556[sizeof("inmendekikakui")];
+    char uniname2ctype_pool_str561[sizeof("onao")];
+    char uniname2ctype_pool_str565[sizeof("sora")];
+    char uniname2ctype_pool_str579[sizeof("inmedefaidrin")];
+    char uniname2ctype_pool_str580[sizeof("kiratrai")];
     char uniname2ctype_pool_str583[sizeof("inspecials")];
-    char uniname2ctype_pool_str590[sizeof("grlink")];
-    char uniname2ctype_pool_str594[sizeof("brahmi")];
-    char uniname2ctype_pool_str596[sizeof("inemoticons")];
-    char uniname2ctype_pool_str597[sizeof("kali")];
-    char uniname2ctype_pool_str600[sizeof("inolditalic")];
-    char uniname2ctype_pool_str602[sizeof("xidc")];
-    char uniname2ctype_pool_str604[sizeof("inmedefaidrin")];
-    char uniname2ctype_pool_str605[sizeof("inchesssymbols")];
-    char uniname2ctype_pool_str608[sizeof("incjkcompatibilityideographssupplement")];
-    char uniname2ctype_pool_str609[sizeof("kits")];
-    char uniname2ctype_pool_str614[sizeof("inadlam")];
-    char uniname2ctype_pool_str624[sizeof("psalterpahlavi")];
-    char uniname2ctype_pool_str625[sizeof("incommonindicnumberforms")];
-    char uniname2ctype_pool_str630[sizeof("lt")];
-    char uniname2ctype_pool_str636[sizeof("innewa")];
-    char uniname2ctype_pool_str639[sizeof("sk")];
-    char uniname2ctype_pool_str642[sizeof("control")];
-    char uniname2ctype_pool_str643[sizeof("inkawi")];
-    char uniname2ctype_pool_str645[sizeof("inancientsymbols")];
-    char uniname2ctype_pool_str647[sizeof("palm")];
-    char uniname2ctype_pool_str650[sizeof("inlycian")];
-    char uniname2ctype_pool_str657[sizeof("so")];
-    char uniname2ctype_pool_str660[sizeof("patternwhitespace")];
-    char uniname2ctype_pool_str672[sizeof("inmandaic")];
-    char uniname2ctype_pool_str675[sizeof("idc")];
-    char uniname2ctype_pool_str678[sizeof("meroiticcursive")];
-    char uniname2ctype_pool_str679[sizeof("intoto")];
-    char uniname2ctype_pool_str683[sizeof("vs")];
-    char uniname2ctype_pool_str692[sizeof("xids")];
-    char uniname2ctype_pool_str695[sizeof("inwarangciti")];
-    char uniname2ctype_pool_str696[sizeof("sora")];
-    char uniname2ctype_pool_str697[sizeof("inopticalcharacterrecognition")];
-    char uniname2ctype_pool_str700[sizeof("kawi")];
-    char uniname2ctype_pool_str703[sizeof("inoldsogdian")];
-    char uniname2ctype_pool_str705[sizeof("inmalayalam")];
-    char uniname2ctype_pool_str707[sizeof("bamum")];
-    char uniname2ctype_pool_str708[sizeof("inkanasupplement")];
-    char uniname2ctype_pool_str713[sizeof("insundanese")];
-    char uniname2ctype_pool_str720[sizeof("grext")];
-    char uniname2ctype_pool_str737[sizeof("print")];
-    char uniname2ctype_pool_str738[sizeof("intaitham")];
-    char uniname2ctype_pool_str742[sizeof("lower")];
-    char uniname2ctype_pool_str745[sizeof("patternsyntax")];
-    char uniname2ctype_pool_str753[sizeof("joinc")];
-    char uniname2ctype_pool_str755[sizeof("inoldsoutharabian")];
-    char uniname2ctype_pool_str760[sizeof("incjkstrokes")];
-    char uniname2ctype_pool_str761[sizeof("batk")];
-    char uniname2ctype_pool_str766[sizeof("samr")];
-    char uniname2ctype_pool_str767[sizeof("inwancho")];
-    char uniname2ctype_pool_str771[sizeof("batak")];
-    char uniname2ctype_pool_str776[sizeof("patws")];
-    char uniname2ctype_pool_str783[sizeof("samaritan")];
-    char uniname2ctype_pool_str787[sizeof("idsbinaryoperator")];
-    char uniname2ctype_pool_str791[sizeof("pauc")];
-    char uniname2ctype_pool_str794[sizeof("insmallkanaextension")];
-    char uniname2ctype_pool_str797[sizeof("sm")];
-    char uniname2ctype_pool_str799[sizeof("indominotiles")];
-    char uniname2ctype_pool_str802[sizeof("alnum")];
-    char uniname2ctype_pool_str803[sizeof("inznamennymusicalnotation")];
-    char uniname2ctype_pool_str809[sizeof("insylotinagri")];
-    char uniname2ctype_pool_str814[sizeof("inugaritic")];
-    char uniname2ctype_pool_str818[sizeof("incontrolpictures")];
-    char uniname2ctype_pool_str821[sizeof("inlinearbideograms")];
-    char uniname2ctype_pool_str822[sizeof("inmusicalsymbols")];
-    char uniname2ctype_pool_str823[sizeof("s")];
-    char uniname2ctype_pool_str824[sizeof("ital")];
-    char uniname2ctype_pool_str825[sizeof("inmodifiertoneletters")];
-    char uniname2ctype_pool_str828[sizeof("inancientgreekmusicalnotation")];
-    char uniname2ctype_pool_str838[sizeof("lisu")];
-    char uniname2ctype_pool_str842[sizeof("lowercase")];
-    char uniname2ctype_pool_str845[sizeof("cwcm")];
-    char uniname2ctype_pool_str847[sizeof("sc")];
-    char uniname2ctype_pool_str848[sizeof("bass")];
-    char uniname2ctype_pool_str855[sizeof("ids")];
-    char uniname2ctype_pool_str857[sizeof("inlatinextendeda")];
-    char uniname2ctype_pool_str875[sizeof("intaile")];
-    char uniname2ctype_pool_str886[sizeof("inmiscellaneoussymbols")];
-    char uniname2ctype_pool_str895[sizeof("inmiscellaneoussymbolsandarrows")];
-    char uniname2ctype_pool_str898[sizeof("incaucasianalbanian")];
-    char uniname2ctype_pool_str900[sizeof("inmiscellaneoussymbolsandpictographs")];
-    char uniname2ctype_pool_str906[sizeof("inoldturkic")];
-    char uniname2ctype_pool_str907[sizeof("insaurashtra")];
-    char uniname2ctype_pool_str920[sizeof("incyrillicextendeda")];
-    char uniname2ctype_pool_str924[sizeof("idcontinue")];
-    char uniname2ctype_pool_str925[sizeof("intaixuanjingsymbols")];
-    char uniname2ctype_pool_str926[sizeof("intamil")];
-    char uniname2ctype_pool_str928[sizeof("inmultani")];
-    char uniname2ctype_pool_str929[sizeof("inlatinextendede")];
-    char uniname2ctype_pool_str930[sizeof("pd")];
-    char uniname2ctype_pool_str946[sizeof("bali")];
-    char uniname2ctype_pool_str961[sizeof("blank")];
-    char uniname2ctype_pool_str963[sizeof("idst")];
-    char uniname2ctype_pool_str974[sizeof("inlydian")];
-    char uniname2ctype_pool_str986[sizeof("innewtailue")];
-    char uniname2ctype_pool_str994[sizeof("bengali")];
-    char uniname2ctype_pool_str995[sizeof("runr")];
-    char uniname2ctype_pool_str1010[sizeof("ll")];
-    char uniname2ctype_pool_str1013[sizeof("indeseret")];
-    char uniname2ctype_pool_str1015[sizeof("inancientgreeknumbers")];
-    char uniname2ctype_pool_str1021[sizeof("idstart")];
-    char uniname2ctype_pool_str1024[sizeof("zl")];
-    char uniname2ctype_pool_str1025[sizeof("inmeeteimayekextensions")];
-    char uniname2ctype_pool_str1028[sizeof("balinese")];
-    char uniname2ctype_pool_str1032[sizeof("incyrillicextendedc")];
-    char uniname2ctype_pool_str1035[sizeof("inspacingmodifierletters")];
-    char uniname2ctype_pool_str1036[sizeof("inearlydynasticcuneiform")];
-    char uniname2ctype_pool_str1049[sizeof("plrd")];
-    char uniname2ctype_pool_str1067[sizeof("canadianaboriginal")];
-    char uniname2ctype_pool_str1072[sizeof("sind")];
-    char uniname2ctype_pool_str1081[sizeof("inlatinextendedc")];
-    char uniname2ctype_pool_str1085[sizeof("uideo")];
-    char uniname2ctype_pool_str1087[sizeof("incountingrodnumerals")];
-    char uniname2ctype_pool_str1089[sizeof("zinh")];
-    char uniname2ctype_pool_str1095[sizeof("dia")];
-    char uniname2ctype_pool_str1096[sizeof("di")];
-    char uniname2ctype_pool_str1097[sizeof("inkhudawadi")];
-    char uniname2ctype_pool_str1102[sizeof("inhanifirohingya")];
-    char uniname2ctype_pool_str1104[sizeof("diak")];
-    char uniname2ctype_pool_str1105[sizeof("gong")];
-    char uniname2ctype_pool_str1107[sizeof("ingrantha")];
-    char uniname2ctype_pool_str1109[sizeof("bidic")];
-    char uniname2ctype_pool_str1114[sizeof("xidstart")];
-    char uniname2ctype_pool_str1115[sizeof("xdigit")];
-    char uniname2ctype_pool_str1119[sizeof("mong")];
-    char uniname2ctype_pool_str1120[sizeof("cased")];
-    char uniname2ctype_pool_str1134[sizeof("inhiragana")];
-    char uniname2ctype_pool_str1140[sizeof("sinhala")];
-    char uniname2ctype_pool_str1142[sizeof("adlm")];
-    char uniname2ctype_pool_str1145[sizeof("xsux")];
-    char uniname2ctype_pool_str1146[sizeof("glagolitic")];
-    char uniname2ctype_pool_str1147[sizeof("sterm")];
-    char uniname2ctype_pool_str1149[sizeof("bamu")];
-    char uniname2ctype_pool_str1150[sizeof("georgian")];
-    char uniname2ctype_pool_str1151[sizeof("inosage")];
-    char uniname2ctype_pool_str1152[sizeof("gunjalagondi")];
-    char uniname2ctype_pool_str1153[sizeof("phoenician")];
-    char uniname2ctype_pool_str1156[sizeof("inolduyghur")];
-    char uniname2ctype_pool_str1157[sizeof("multani")];
-    char uniname2ctype_pool_str1158[sizeof("kaithi")];
-    char uniname2ctype_pool_str1164[sizeof("joincontrol")];
-    char uniname2ctype_pool_str1168[sizeof("runic")];
-    char uniname2ctype_pool_str1170[sizeof("ingeneralpunctuation")];
-    char uniname2ctype_pool_str1171[sizeof("inmahajani")];
-    char uniname2ctype_pool_str1174[sizeof("incyrillicsupplement")];
-    char uniname2ctype_pool_str1175[sizeof("lowercaseletter")];
-    char uniname2ctype_pool_str1176[sizeof("marchen")];
-    char uniname2ctype_pool_str1177[sizeof("graphemelink")];
-    char uniname2ctype_pool_str1178[sizeof("ingeorgian")];
-    char uniname2ctype_pool_str1180[sizeof("khojki")];
-    char uniname2ctype_pool_str1181[sizeof("cham")];
-    char uniname2ctype_pool_str1182[sizeof("inogham")];
-    char uniname2ctype_pool_str1183[sizeof("cher")];
-    char uniname2ctype_pool_str1185[sizeof("chakma")];
-    char uniname2ctype_pool_str1186[sizeof("inkaktoviknumerals")];
-    char uniname2ctype_pool_str1190[sizeof("emoji")];
-    char uniname2ctype_pool_str1191[sizeof("insiddham")];
-    char uniname2ctype_pool_str1197[sizeof("cherokee")];
-    char uniname2ctype_pool_str1198[sizeof("khar")];
-    char uniname2ctype_pool_str1203[sizeof("inmongolian")];
-    char uniname2ctype_pool_str1204[sizeof("innagmundari")];
-    char uniname2ctype_pool_str1207[sizeof("incherokeesupplement")];
-    char uniname2ctype_pool_str1209[sizeof("manichaean")];
-    char uniname2ctype_pool_str1212[sizeof("inolchiki")];
-    char uniname2ctype_pool_str1223[sizeof("inkhitansmallscript")];
-    char uniname2ctype_pool_str1227[sizeof("quotationmark")];
-    char uniname2ctype_pool_str1229[sizeof("vithkuqi")];
-    char uniname2ctype_pool_str1230[sizeof("variationselector")];
-    char uniname2ctype_pool_str1231[sizeof("adlam")];
-    char uniname2ctype_pool_str1232[sizeof("inethiopic")];
-    char uniname2ctype_pool_str1233[sizeof("graphemebase")];
-#ifdef USE_UNICODE_AGE_PROPERTIES
-    char uniname2ctype_pool_str1234[sizeof("age=11.0")];
-    char uniname2ctype_pool_str1235[sizeof("age=12.1")];
-    char uniname2ctype_pool_str1236[sizeof("age=10.0")];
-    char uniname2ctype_pool_str1237[sizeof("age=12.0")];
-    char uniname2ctype_pool_str1241[sizeof("age=13.0")];
-    char uniname2ctype_pool_str1242[sizeof("age=1.1")];
-#endif /* USE_UNICODE_AGE_PROPERTIES */
-    char uniname2ctype_pool_str1243[sizeof("casedletter")];
-    char uniname2ctype_pool_str1244[sizeof("ingurmukhi")];
-#ifdef USE_UNICODE_AGE_PROPERTIES
-    char uniname2ctype_pool_str1245[sizeof("age=2.1")];
-#endif /* USE_UNICODE_AGE_PROPERTIES */
-    char uniname2ctype_pool_str1246[sizeof("incjkunifiedideographsextensiona")];
-#ifdef USE_UNICODE_AGE_PROPERTIES
-    char uniname2ctype_pool_str1247[sizeof("age=2.0")];
-#endif /* USE_UNICODE_AGE_PROPERTIES */
-    char uniname2ctype_pool_str1248[sizeof("lu")];
-#ifdef USE_UNICODE_AGE_PROPERTIES
-    char uniname2ctype_pool_str1249[sizeof("age=3.1")];
-    char uniname2ctype_pool_str1250[sizeof("age=9.0")];
-    char uniname2ctype_pool_str1251[sizeof("age=3.0")];
-    char uniname2ctype_pool_str1252[sizeof("age=3.2")];
-    char uniname2ctype_pool_str1253[sizeof("age=8.0")];
-#endif /* USE_UNICODE_AGE_PROPERTIES */
-    char uniname2ctype_pool_str1254[sizeof("intamilsupplement")];
-#ifdef USE_UNICODE_AGE_PROPERTIES
-    char uniname2ctype_pool_str1255[sizeof("age=6.1")];
-#endif /* USE_UNICODE_AGE_PROPERTIES */
-    char uniname2ctype_pool_str1256[sizeof("unknown")];
+    char uniname2ctype_pool_str584[sizeof("brahmi")];
+    char uniname2ctype_pool_str589[sizeof("letternumber")];
+    char uniname2ctype_pool_str597[sizeof("inchesssymbols")];
+    char uniname2ctype_pool_str598[sizeof("inolditalic")];
+    char uniname2ctype_pool_str603[sizeof("oriya")];
+    char uniname2ctype_pool_str604[sizeof("inmiscellaneousmathematicalsymbolsa")];
+    char uniname2ctype_pool_str606[sizeof("intransportandmapsymbols")];
+    char uniname2ctype_pool_str614[sizeof("incb=extend")];
+    char uniname2ctype_pool_str624[sizeof("xidc")];
+    char uniname2ctype_pool_str627[sizeof("inemoticons")];
+    char uniname2ctype_pool_str651[sizeof("samr")];
+    char uniname2ctype_pool_str657[sizeof("inoldsogdian")];
+    char uniname2ctype_pool_str661[sizeof("inancientsymbols")];
+    char uniname2ctype_pool_str663[sizeof("incommonindicnumberforms")];
+    char uniname2ctype_pool_str664[sizeof("samaritan")];
+    char uniname2ctype_pool_str666[sizeof("psalterpahlavi")];
+    char uniname2ctype_pool_str667[sizeof("inmyanmarextendedc")];
+    char uniname2ctype_pool_str672[sizeof("kits")];
+    char uniname2ctype_pool_str673[sizeof("insundanese")];
+    char uniname2ctype_pool_str675[sizeof("incb=consonant")];
+    char uniname2ctype_pool_str676[sizeof("gothic")];
+    char uniname2ctype_pool_str680[sizeof("inmandaic")];
+    char uniname2ctype_pool_str681[sizeof("xids")];
+    char uniname2ctype_pool_str689[sizeof("inznamennymusicalnotation")];
+    char uniname2ctype_pool_str695[sizeof("pauc")];
+    char uniname2ctype_pool_str696[sizeof("sm")];
+    char uniname2ctype_pool_str700[sizeof("s")];
+    char uniname2ctype_pool_str705[sizeof("meroiticcursive")];
+    char uniname2ctype_pool_str708[sizeof("inoldsoutharabian")];
+    char uniname2ctype_pool_str710[sizeof("inugaritic")];
+    char uniname2ctype_pool_str711[sizeof("lisu")];
+    char uniname2ctype_pool_str712[sizeof("idc")];
+    char uniname2ctype_pool_str713[sizeof("incjkcompatibilityideographssupplement")];
+    char uniname2ctype_pool_str714[sizeof("patternwhitespace")];
+    char uniname2ctype_pool_str717[sizeof("bamum")];
+    char uniname2ctype_pool_str719[sizeof("inancientgreekmusicalnotation")];
+    char uniname2ctype_pool_str739[sizeof("idsbinaryoperator")];
+    char uniname2ctype_pool_str745[sizeof("lt")];
+    char uniname2ctype_pool_str758[sizeof("incjkstrokes")];
+    char uniname2ctype_pool_str768[sizeof("insunuwar")];
+    char uniname2ctype_pool_str770[sizeof("insaurashtra")];
+    char uniname2ctype_pool_str773[sizeof("indominotiles")];
+    char uniname2ctype_pool_str775[sizeof("intoto")];
+    char uniname2ctype_pool_str784[sizeof("sc")];
+    char uniname2ctype_pool_str790[sizeof("idsunaryoperator")];
+    char uniname2ctype_pool_str791[sizeof("inmodifiertoneletters")];
+    char uniname2ctype_pool_str797[sizeof("inopticalcharacterrecognition")];
+    char uniname2ctype_pool_str799[sizeof("l")];
+    char uniname2ctype_pool_str804[sizeof("batk")];
+    char uniname2ctype_pool_str805[sizeof("inkanasupplement")];
+    char uniname2ctype_pool_str806[sizeof("osage")];
+    char uniname2ctype_pool_str811[sizeof("batak")];
+    char uniname2ctype_pool_str813[sizeof("inmusicalsymbols")];
+    char uniname2ctype_pool_str817[sizeof("incaucasianalbanian")];
+    char uniname2ctype_pool_str818[sizeof("patws")];
+    char uniname2ctype_pool_str822[sizeof("bass")];
+    char uniname2ctype_pool_str826[sizeof("ids")];
+    char uniname2ctype_pool_str828[sizeof("grext")];
+    char uniname2ctype_pool_str829[sizeof("inlao")];
+    char uniname2ctype_pool_str830[sizeof("vai")];
+    char uniname2ctype_pool_str831[sizeof("vaii")];
+    char uniname2ctype_pool_str835[sizeof("inolonal")];
+    char uniname2ctype_pool_str840[sizeof("mongolian")];
+    char uniname2ctype_pool_str841[sizeof("osma")];
+    char uniname2ctype_pool_str846[sizeof("print")];
+    char uniname2ctype_pool_str847[sizeof("inlineara")];
+    char uniname2ctype_pool_str859[sizeof("intaitham")];
+    char uniname2ctype_pool_str869[sizeof("grlink")];
+    char uniname2ctype_pool_str888[sizeof("inmiscellaneoussymbols")];
+    char uniname2ctype_pool_str896[sizeof("pd")];
+    char uniname2ctype_pool_str897[sizeof("inmiscellaneoussymbolsandarrows")];
+    char uniname2ctype_pool_str901[sizeof("kali")];
+    char uniname2ctype_pool_str902[sizeof("inmiscellaneoussymbolsandpictographs")];
+    char uniname2ctype_pool_str903[sizeof("control")];
+    char uniname2ctype_pool_str905[sizeof("inancientgreeknumbers")];
+    char uniname2ctype_pool_str906[sizeof("incontrolpictures")];
+    char uniname2ctype_pool_str909[sizeof("inadlam")];
+    char uniname2ctype_pool_str917[sizeof("han")];
+    char uniname2ctype_pool_str920[sizeof("hani")];
+    char uniname2ctype_pool_str925[sizeof("hano")];
+    char uniname2ctype_pool_str927[sizeof("runr")];
+    char uniname2ctype_pool_str937[sizeof("sind")];
+    char uniname2ctype_pool_str941[sizeof("hanunoo")];
+    char uniname2ctype_pool_str944[sizeof("palm")];
+    char uniname2ctype_pool_str945[sizeof("inkhojki")];
+    char uniname2ctype_pool_str956[sizeof("inkhudawadi")];
+    char uniname2ctype_pool_str960[sizeof("inlycian")];
+    char uniname2ctype_pool_str963[sizeof("inoldturkic")];
+    char uniname2ctype_pool_str965[sizeof("hira")];
+    char uniname2ctype_pool_str978[sizeof("incountingrodnumerals")];
+    char uniname2ctype_pool_str979[sizeof("odi")];
+    char uniname2ctype_pool_str982[sizeof("idcontinue")];
+    char uniname2ctype_pool_str1000[sizeof("idst")];
+    char uniname2ctype_pool_str1003[sizeof("inolduyghur")];
+    char uniname2ctype_pool_str1004[sizeof("incb=linker")];
+    char uniname2ctype_pool_str1008[sizeof("inmalayalam")];
+    char uniname2ctype_pool_str1009[sizeof("lu")];
+    char uniname2ctype_pool_str1021[sizeof("inspacingmodifierletters")];
+    char uniname2ctype_pool_str1026[sizeof("bamu")];
+    char uniname2ctype_pool_str1038[sizeof("indeseret")];
+    char uniname2ctype_pool_str1050[sizeof("sundanese")];
+    char uniname2ctype_pool_str1052[sizeof("idstart")];
+    char uniname2ctype_pool_str1057[sizeof("saur")];
+    char uniname2ctype_pool_str1058[sizeof("insmallkanaextension")];
+    char uniname2ctype_pool_str1061[sizeof("guru")];
+    char uniname2ctype_pool_str1070[sizeof("paucinhau")];
+    char uniname2ctype_pool_str1076[sizeof("gurmukhi")];
+    char uniname2ctype_pool_str1077[sizeof("insylotinagri")];
+    char uniname2ctype_pool_str1079[sizeof("cased")];
+    char uniname2ctype_pool_str1083[sizeof("inlinearbideograms")];
+    char uniname2ctype_pool_str1087[sizeof("gong")];
+    char uniname2ctype_pool_str1088[sizeof("ingrantha")];
+    char uniname2ctype_pool_str1092[sizeof("mong")];
+    char uniname2ctype_pool_str1095[sizeof("joinc")];
+    char uniname2ctype_pool_str1099[sizeof("sterm")];
+    char uniname2ctype_pool_str1109[sizeof("inkaktoviknumerals")];
+    char uniname2ctype_pool_str1113[sizeof("limbu")];
+    char uniname2ctype_pool_str1115[sizeof("oidc")];
+    char uniname2ctype_pool_str1122[sizeof("inosage")];
+    char uniname2ctype_pool_str1123[sizeof("incjkunifiedideographsextensiona")];
+    char uniname2ctype_pool_str1124[sizeof("incyrillicsupplement")];
+    char uniname2ctype_pool_str1125[sizeof("inmeeteimayekextensions")];
+    char uniname2ctype_pool_str1126[sizeof("georgian")];
+    char uniname2ctype_pool_str1127[sizeof("incjkunifiedideographsextensioni")];
+    char uniname2ctype_pool_str1132[sizeof("idsu")];
+    char uniname2ctype_pool_str1134[sizeof("ingeneralpunctuation")];
+    char uniname2ctype_pool_str1135[sizeof("alnum")];
+    char uniname2ctype_pool_str1136[sizeof("bidic")];
+    char uniname2ctype_pool_str1145[sizeof("ingeorgian")];
+    char uniname2ctype_pool_str1147[sizeof("quotationmark")];
+    char uniname2ctype_pool_str1149[sizeof("incherokeesupplement")];
+    char uniname2ctype_pool_str1152[sizeof("incjkunifiedideographsextensione")];
+    char uniname2ctype_pool_str1157[sizeof("insiddham")];
+    char uniname2ctype_pool_str1160[sizeof("runic")];
+    char uniname2ctype_pool_str1172[sizeof("oids")];
+    char uniname2ctype_pool_str1176[sizeof("ital")];
+    char uniname2ctype_pool_str1186[sizeof("emoji")];
+    char uniname2ctype_pool_str1187[sizeof("inmongolian")];
+    char uniname2ctype_pool_str1195[sizeof("innagmundari")];
+    char uniname2ctype_pool_str1200[sizeof("inlatinextendeda")];
+    char uniname2ctype_pool_str1212[sizeof("vs")];
+    char uniname2ctype_pool_str1214[sizeof("saurashtra")];
+    char uniname2ctype_pool_str1216[sizeof("intaile")];
+    char uniname2ctype_pool_str1228[sizeof("bali")];
+    char uniname2ctype_pool_str1229[sizeof("xidstart")];
+    char uniname2ctype_pool_str1231[sizeof("xdigit")];
+    char uniname2ctype_pool_str1233[sizeof("ingurmukhi")];
+    char uniname2ctype_pool_str1236[sizeof("blank")];
+    char uniname2ctype_pool_str1243[sizeof("inlydian")];
 #ifdef USE_UNICODE_AGE_PROPERTIES
+    char uniname2ctype_pool_str1247[sizeof("age=11.0")];
+    char uniname2ctype_pool_str1248[sizeof("age=10.0")];
+    char uniname2ctype_pool_str1249[sizeof("age=12.1")];
+    char uniname2ctype_pool_str1250[sizeof("age=12.0")];
+    char uniname2ctype_pool_str1251[sizeof("age=1.1")];
+    char uniname2ctype_pool_str1252[sizeof("age=16.0")];
+    char uniname2ctype_pool_str1253[sizeof("age=9.0")];
+    char uniname2ctype_pool_str1254[sizeof("age=2.1")];
+    char uniname2ctype_pool_str1255[sizeof("age=2.0")];
+    char uniname2ctype_pool_str1256[sizeof("age=6.1")];
     char uniname2ctype_pool_str1257[sizeof("age=6.0")];
-    char uniname2ctype_pool_str1258[sizeof("age=6.2")];
-    char uniname2ctype_pool_str1259[sizeof("age=15.0")];
-    char uniname2ctype_pool_str1260[sizeof("age=7.0")];
-    char uniname2ctype_pool_str1262[sizeof("age=6.3")];
 #endif /* USE_UNICODE_AGE_PROPERTIES */
-    char uniname2ctype_pool_str1263[sizeof("cwt")];
+    char uniname2ctype_pool_str1258[sizeof("inlatinextendede")];
 #ifdef USE_UNICODE_AGE_PROPERTIES
-    char uniname2ctype_pool_str1265[sizeof("age=14.0")];
+    char uniname2ctype_pool_str1259[sizeof("age=6.2")];
+    char uniname2ctype_pool_str1260[sizeof("age=8.0")];
+    char uniname2ctype_pool_str1261[sizeof("age=7.0")];
 #endif /* USE_UNICODE_AGE_PROPERTIES */
-    char uniname2ctype_pool_str1266[sizeof("unassigned")];
+    char uniname2ctype_pool_str1262[sizeof("incjkunifiedideographsextensionc")];
+    char uniname2ctype_pool_str1264[sizeof("bengali")];
+    char uniname2ctype_pool_str1265[sizeof("zinh")];
 #ifdef USE_UNICODE_AGE_PROPERTIES
-    char uniname2ctype_pool_str1267[sizeof("age=5.1")];
-    char uniname2ctype_pool_str1269[sizeof("age=5.0")];
-    char uniname2ctype_pool_str1270[sizeof("age=5.2")];
+    char uniname2ctype_pool_str1266[sizeof("age=15.1")];
+    char uniname2ctype_pool_str1267[sizeof("age=15.0")];
+    char uniname2ctype_pool_str1271[sizeof("age=5.1")];
+    char uniname2ctype_pool_str1272[sizeof("age=5.0")];
+    char uniname2ctype_pool_str1273[sizeof("age=14.0")];
+    char uniname2ctype_pool_str1274[sizeof("age=5.2")];
+    char uniname2ctype_pool_str1277[sizeof("age=4.1")];
+    char uniname2ctype_pool_str1278[sizeof("age=4.0")];
 #endif /* USE_UNICODE_AGE_PROPERTIES */
-    char uniname2ctype_pool_str1271[sizeof("diacritic")];
+    char uniname2ctype_pool_str1281[sizeof("inhanifirohingya")];
+    char uniname2ctype_pool_str1282[sizeof("intamil")];
+    char uniname2ctype_pool_str1284[sizeof("inmultani")];
 #ifdef USE_UNICODE_AGE_PROPERTIES
-    char uniname2ctype_pool_str1273[sizeof("age=4.1")];
+    char uniname2ctype_pool_str1288[sizeof("age=13.0")];
 #endif /* USE_UNICODE_AGE_PROPERTIES */
-    char uniname2ctype_pool_str1274[sizeof("ahom")];
+    char uniname2ctype_pool_str1290[sizeof("balinese")];
+    char uniname2ctype_pool_str1291[sizeof("hatran")];
 #ifdef USE_UNICODE_AGE_PROPERTIES
-    char uniname2ctype_pool_str1275[sizeof("age=4.0")];
+    char uniname2ctype_pool_str1292[sizeof("age=3.1")];
+    char uniname2ctype_pool_str1293[sizeof("age=3.0")];
+    char uniname2ctype_pool_str1295[sizeof("age=3.2")];
+    char uniname2ctype_pool_str1297[sizeof("age=6.3")];
 #endif /* USE_UNICODE_AGE_PROPERTIES */
-    char uniname2ctype_pool_str1282[sizeof("incjkunifiedideographsextensione")];
-    char uniname2ctype_pool_str1285[sizeof("khmr")];
-    char uniname2ctype_pool_str1289[sizeof("insinhala")];
-    char uniname2ctype_pool_str1292[sizeof("inmiscellaneoustechnical")];
-    char uniname2ctype_pool_str1297[sizeof("saur")];
-    char uniname2ctype_pool_str1300[sizeof("guru")];
-    char uniname2ctype_pool_str1301[sizeof("sundanese")];
-    char uniname2ctype_pool_str1306[sizeof("punct")];
-    char uniname2ctype_pool_str1314[sizeof("paucinhau")];
-    char uniname2ctype_pool_str1317[sizeof("gurmukhi")];
-    char uniname2ctype_pool_str1328[sizeof("chorasmian")];
-    char uniname2ctype_pool_str1331[sizeof("logicalorderexception")];
-    char uniname2ctype_pool_str1340[sizeof("khmer")];
-    char uniname2ctype_pool_str1343[sizeof("limbu")];
-    char uniname2ctype_pool_str1349[sizeof("chrs")];
-    char uniname2ctype_pool_str1352[sizeof("oriya")];
-    char uniname2ctype_pool_str1354[sizeof("inscriptionalpahlavi")];
-    char uniname2ctype_pool_str1356[sizeof("incyrillicextendedd")];
-    char uniname2ctype_pool_str1358[sizeof("incjkunifiedideographsextensionc")];
-    char uniname2ctype_pool_str1360[sizeof("cntrl")];
-    char uniname2ctype_pool_str1365[sizeof("inlatinextendedadditional")];
-    char uniname2ctype_pool_str1367[sizeof("insorasompeng")];
-    char uniname2ctype_pool_str1369[sizeof("radical")];
-    char uniname2ctype_pool_str1373[sizeof("emojimodifier")];
-    char uniname2ctype_pool_str1375[sizeof("kharoshthi")];
-    char uniname2ctype_pool_str1380[sizeof("n")];
-    char uniname2ctype_pool_str1384[sizeof("math")];
-    char uniname2ctype_pool_str1387[sizeof("goth")];
-    char uniname2ctype_pool_str1392[sizeof("phnx")];
-    char uniname2ctype_pool_str1400[sizeof("anatolianhieroglyphs")];
-    char uniname2ctype_pool_str1401[sizeof("inenclosedalphanumerics")];
-    char uniname2ctype_pool_str1407[sizeof("nandinagari")];
-    char uniname2ctype_pool_str1409[sizeof("no")];
-    char uniname2ctype_pool_str1415[sizeof("intangsa")];
-    char uniname2ctype_pool_str1419[sizeof("nko")];
-    char uniname2ctype_pool_str1420[sizeof("nkoo")];
-    char uniname2ctype_pool_str1422[sizeof("ingreekandcoptic")];
-    char uniname2ctype_pool_str1426[sizeof("p")];
-    char uniname2ctype_pool_str1428[sizeof("grantha")];
-    char uniname2ctype_pool_str1429[sizeof("decimalnumber")];
-    char uniname2ctype_pool_str1438[sizeof("incjkunifiedideographs")];
-    char uniname2ctype_pool_str1442[sizeof("intirhuta")];
-    char uniname2ctype_pool_str1448[sizeof("inhatran")];
-    char uniname2ctype_pool_str1449[sizeof("linb")];
-    char uniname2ctype_pool_str1451[sizeof("mult")];
-    char uniname2ctype_pool_str1454[sizeof("saurashtra")];
-    char uniname2ctype_pool_str1457[sizeof("kthi")];
-    char uniname2ctype_pool_str1460[sizeof("zanb")];
-    char uniname2ctype_pool_str1462[sizeof("inbhaiksuki")];
-    char uniname2ctype_pool_str1470[sizeof("innabataean")];
-    char uniname2ctype_pool_str1471[sizeof("inphoenician")];
-    char uniname2ctype_pool_str1474[sizeof("xpeo")];
-    char uniname2ctype_pool_str1475[sizeof("inkanbun")];
-    char uniname2ctype_pool_str1476[sizeof("inmeroitichieroglyphs")];
-    char uniname2ctype_pool_str1480[sizeof("ahex")];
-    char uniname2ctype_pool_str1489[sizeof("enclosingmark")];
-    char uniname2ctype_pool_str1495[sizeof("sd")];
-    char uniname2ctype_pool_str1497[sizeof("inelbasan")];
-    char uniname2ctype_pool_str1499[sizeof("inenclosedideographicsupplement")];
-    char uniname2ctype_pool_str1501[sizeof("sidd")];
-    char uniname2ctype_pool_str1507[sizeof("linearb")];
-    char uniname2ctype_pool_str1508[sizeof("cpmn")];
-    char uniname2ctype_pool_str1517[sizeof("inenclosedalphanumericsupplement")];
-    char uniname2ctype_pool_str1520[sizeof("bidicontrol")];
-    char uniname2ctype_pool_str1524[sizeof("inphaistosdisc")];
-    char uniname2ctype_pool_str1529[sizeof("limb")];
-    char uniname2ctype_pool_str1531[sizeof("inkangxiradicals")];
-    char uniname2ctype_pool_str1533[sizeof("lepc")];
-    char uniname2ctype_pool_str1536[sizeof("braille")];
-    char uniname2ctype_pool_str1537[sizeof("regionalindicator")];
-    char uniname2ctype_pool_str1542[sizeof("inlowsurrogates")];
-    char uniname2ctype_pool_str1547[sizeof("brah")];
-    char uniname2ctype_pool_str1549[sizeof("inoldhungarian")];
-    char uniname2ctype_pool_str1557[sizeof("beng")];
-    char uniname2ctype_pool_str1563[sizeof("emojimodifierbase")];
-    char uniname2ctype_pool_str1565[sizeof("inarabic")];
-    char uniname2ctype_pool_str1570[sizeof("osage")];
-    char uniname2ctype_pool_str1572[sizeof("inherited")];
-    char uniname2ctype_pool_str1577[sizeof("incyprominoan")];
-    char uniname2ctype_pool_str1580[sizeof("glag")];
-    char uniname2ctype_pool_str1582[sizeof("medf")];
-    char uniname2ctype_pool_str1583[sizeof("osma")];
-    char uniname2ctype_pool_str1587[sizeof("indogra")];
-    char uniname2ctype_pool_str1597[sizeof("arab")];
-    char uniname2ctype_pool_str1598[sizeof("medefaidrin")];
-    char uniname2ctype_pool_str1607[sizeof("inshorthandformatcontrols")];
-    char uniname2ctype_pool_str1613[sizeof("phli")];
-    char uniname2ctype_pool_str1617[sizeof("inimperialaramaic")];
-    char uniname2ctype_pool_str1618[sizeof("emod")];
-    char uniname2ctype_pool_str1622[sizeof("ingreekextended")];
-    char uniname2ctype_pool_str1623[sizeof("inanatolianhieroglyphs")];
-    char uniname2ctype_pool_str1629[sizeof("punctuation")];
-    char uniname2ctype_pool_str1635[sizeof("graphemeextend")];
-    char uniname2ctype_pool_str1643[sizeof("cwl")];
-    char uniname2ctype_pool_str1644[sizeof("vith")];
-    char uniname2ctype_pool_str1654[sizeof("ingeometricshapes")];
-    char uniname2ctype_pool_str1655[sizeof("emojicomponent")];
-    char uniname2ctype_pool_str1657[sizeof("dsrt")];
-    char uniname2ctype_pool_str1662[sizeof("coptic")];
-    char uniname2ctype_pool_str1664[sizeof("inkayahli")];
-    char uniname2ctype_pool_str1671[sizeof("inoriya")];
-    char uniname2ctype_pool_str1675[sizeof("inarabicpresentationformsa")];
-    char uniname2ctype_pool_str1677[sizeof("inbasiclatin")];
-    char uniname2ctype_pool_str1682[sizeof("incjkunifiedideographsextensiond")];
-    char uniname2ctype_pool_str1684[sizeof("wara")];
-    char uniname2ctype_pool_str1686[sizeof("sinh")];
-    char uniname2ctype_pool_str1687[sizeof("sund")];
-    char uniname2ctype_pool_str1691[sizeof("shavian")];
-    char uniname2ctype_pool_str1699[sizeof("insundanesesupplement")];
-    char uniname2ctype_pool_str1701[sizeof("inyezidi")];
-    char uniname2ctype_pool_str1704[sizeof("bhks")];
-    char uniname2ctype_pool_str1714[sizeof("bhaiksuki")];
-    char uniname2ctype_pool_str1722[sizeof("inhanunoo")];
-    char uniname2ctype_pool_str1724[sizeof("intangut")];
-    char uniname2ctype_pool_str1728[sizeof("sogdian")];
-    char uniname2ctype_pool_str1729[sizeof("inlatinextendedd")];
-    char uniname2ctype_pool_str1730[sizeof("sogo")];
-    char uniname2ctype_pool_str1731[sizeof("insinhalaarchaicnumbers")];
-    char uniname2ctype_pool_str1732[sizeof("ideographic")];
-    char uniname2ctype_pool_str1733[sizeof("ugar")];
-    char uniname2ctype_pool_str1734[sizeof("deseret")];
-    char uniname2ctype_pool_str1735[sizeof("odi")];
-    char uniname2ctype_pool_str1740[sizeof("copt")];
-    char uniname2ctype_pool_str1742[sizeof("imperialaramaic")];
-    char uniname2ctype_pool_str1745[sizeof("insogdian")];
-    char uniname2ctype_pool_str1746[sizeof("indingbats")];
-    char uniname2ctype_pool_str1750[sizeof("format")];
-    char uniname2ctype_pool_str1752[sizeof("ininscriptionalpahlavi")];
-    char uniname2ctype_pool_str1753[sizeof("lyci")];
-    char uniname2ctype_pool_str1757[sizeof("ininscriptionalparthian")];
-    char uniname2ctype_pool_str1766[sizeof("grbase")];
-    char uniname2ctype_pool_str1768[sizeof("lycian")];
-    char uniname2ctype_pool_str1769[sizeof("inbatak")];
-    char uniname2ctype_pool_str1776[sizeof("cprt")];
-    char uniname2ctype_pool_str1781[sizeof("inunifiedcanadianaboriginalsyllabicsextendeda")];
-    char uniname2ctype_pool_str1788[sizeof("mymr")];
-    char uniname2ctype_pool_str1793[sizeof("myanmar")];
-    char uniname2ctype_pool_str1806[sizeof("intibetan")];
-    char uniname2ctype_pool_str1810[sizeof("intags")];
-    char uniname2ctype_pool_str1811[sizeof("asciihexdigit")];
-    char uniname2ctype_pool_str1813[sizeof("sentenceterminal")];
-    char uniname2ctype_pool_str1821[sizeof("nand")];
-    char uniname2ctype_pool_str1828[sizeof("inblockelements")];
-    char uniname2ctype_pool_str1838[sizeof("inornamentaldingbats")];
-    char uniname2ctype_pool_str1841[sizeof("inethiopicextendeda")];
-    char uniname2ctype_pool_str1842[sizeof("innumberforms")];
-    char uniname2ctype_pool_str1843[sizeof("cwcf")];
-    char uniname2ctype_pool_str1845[sizeof("oidc")];
-    char uniname2ctype_pool_str1848[sizeof("bopo")];
-    char uniname2ctype_pool_str1851[sizeof("cuneiform")];
-    char uniname2ctype_pool_str1866[sizeof("caseignorable")];
-    char uniname2ctype_pool_str1871[sizeof("inoldpersian")];
-    char uniname2ctype_pool_str1881[sizeof("cwu")];
-    char uniname2ctype_pool_str1888[sizeof("inelymaic")];
-    char uniname2ctype_pool_str1889[sizeof("insoyombo")];
-    char uniname2ctype_pool_str1896[sizeof("ingeometricshapesextended")];
-    char uniname2ctype_pool_str1902[sizeof("incjkcompatibility")];
-    char uniname2ctype_pool_str1904[sizeof("inmyanmarextendedb")];
-    char uniname2ctype_pool_str1905[sizeof("innushu")];
-    char uniname2ctype_pool_str1912[sizeof("inkanaextendedb")];
-    char uniname2ctype_pool_str1913[sizeof("olck")];
-    char uniname2ctype_pool_str1916[sizeof("inbyzantinemusicalsymbols")];
-    char uniname2ctype_pool_str1924[sizeof("olchiki")];
-    char uniname2ctype_pool_str1929[sizeof("inkatakanaphoneticextensions")];
-    char uniname2ctype_pool_str1932[sizeof("incoptic")];
-    char uniname2ctype_pool_str1935[sizeof("oids")];
-    char uniname2ctype_pool_str1936[sizeof("inarabicextendeda")];
-    char uniname2ctype_pool_str1941[sizeof("modifierletter")];
-    char uniname2ctype_pool_str1950[sizeof("incjksymbolsandpunctuation")];
-    char uniname2ctype_pool_str1956[sizeof("olower")];
-    char uniname2ctype_pool_str1958[sizeof("bopomofo")];
-    char uniname2ctype_pool_str1964[sizeof("inlisu")];
-    char uniname2ctype_pool_str1967[sizeof("inoldpermic")];
-    char uniname2ctype_pool_str1968[sizeof("innoblock")];
-    char uniname2ctype_pool_str1969[sizeof("ext")];
-    char uniname2ctype_pool_str1974[sizeof("inunifiedcanadianaboriginalsyllabics")];
-    char uniname2ctype_pool_str1981[sizeof("takri")];
-    char uniname2ctype_pool_str1985[sizeof("inbraillepatterns")];
-    char uniname2ctype_pool_str1988[sizeof("invai")];
-    char uniname2ctype_pool_str1991[sizeof("alpha")];
-    char uniname2ctype_pool_str1993[sizeof("inbalinese")];
-    char uniname2ctype_pool_str1994[sizeof("sorasompeng")];
-    char uniname2ctype_pool_str1996[sizeof("closepunctuation")];
-    char uniname2ctype_pool_str2001[sizeof("hani")];
-    char uniname2ctype_pool_str2002[sizeof("inmayannumerals")];
-    char uniname2ctype_pool_str2004[sizeof("han")];
-    char uniname2ctype_pool_str2006[sizeof("inmiscellaneousmathematicalsymbolsb")];
-    char uniname2ctype_pool_str2010[sizeof("inlepcha")];
-    char uniname2ctype_pool_str2011[sizeof("patsyn")];
-    char uniname2ctype_pool_str2012[sizeof("inlisusupplement")];
-    char uniname2ctype_pool_str2014[sizeof("insyriacsupplement")];
-    char uniname2ctype_pool_str2015[sizeof("hano")];
-    char uniname2ctype_pool_str2016[sizeof("newa")];
-    char uniname2ctype_pool_str2023[sizeof("spacingmark")];
-    char uniname2ctype_pool_str2024[sizeof("inpalmyrene")];
-    char uniname2ctype_pool_str2026[sizeof("takr")];
-    char uniname2ctype_pool_str2033[sizeof("xposixpunct")];
-    char uniname2ctype_pool_str2040[sizeof("inkhojki")];
-    char uniname2ctype_pool_str2042[sizeof("taile")];
-    char uniname2ctype_pool_str2043[sizeof("assigned")];
-    char uniname2ctype_pool_str2044[sizeof("hanunoo")];
-    char uniname2ctype_pool_str2047[sizeof("hira")];
-    char uniname2ctype_pool_str2048[sizeof("inarabicextendedc")];
-    char uniname2ctype_pool_str2062[sizeof("newtailue")];
-    char uniname2ctype_pool_str2070[sizeof("space")];
-    char uniname2ctype_pool_str2073[sizeof("intelugu")];
-    char uniname2ctype_pool_str2077[sizeof("lydi")];
-    char uniname2ctype_pool_str2078[sizeof("idsb")];
-    char uniname2ctype_pool_str2090[sizeof("extpict")];
-    char uniname2ctype_pool_str2092[sizeof("lydian")];
-    char uniname2ctype_pool_str2095[sizeof("inethiopicsupplement")];
-    char uniname2ctype_pool_str2103[sizeof("sarb")];
-    char uniname2ctype_pool_str2110[sizeof("ugaritic")];
-    char uniname2ctype_pool_str2114[sizeof("inyiradicals")];
-    char uniname2ctype_pool_str2115[sizeof("inphoneticextensions")];
-    char uniname2ctype_pool_str2117[sizeof("sharada")];
-    char uniname2ctype_pool_str2128[sizeof("zanabazarsquare")];
-    char uniname2ctype_pool_str2135[sizeof("bugi")];
-    char uniname2ctype_pool_str2137[sizeof("word")];
-    char uniname2ctype_pool_str2141[sizeof("term")];
-    char uniname2ctype_pool_str2145[sizeof("separator")];
-    char uniname2ctype_pool_str2146[sizeof("ingeorgiansupplement")];
-    char uniname2ctype_pool_str2149[sizeof("sogd")];
-    char uniname2ctype_pool_str2163[sizeof("extender")];
-    char uniname2ctype_pool_str2165[sizeof("shrd")];
-    char uniname2ctype_pool_str2166[sizeof("graph")];
-    char uniname2ctype_pool_str2174[sizeof("tnsa")];
-    char uniname2ctype_pool_str2178[sizeof("tangsa")];
-    char uniname2ctype_pool_str2181[sizeof("phag")];
-    char uniname2ctype_pool_str2182[sizeof("dogra")];
-    char uniname2ctype_pool_str2195[sizeof("inhanguljamo")];
-    char uniname2ctype_pool_str2196[sizeof("inshavian")];
-    char uniname2ctype_pool_str2207[sizeof("siddham")];
-    char uniname2ctype_pool_str2211[sizeof("cf")];
-    char uniname2ctype_pool_str2216[sizeof("inunifiedcanadianaboriginalsyllabicsextended")];
-    char uniname2ctype_pool_str2217[sizeof("buginese")];
-    char uniname2ctype_pool_str2218[sizeof("inmongoliansupplement")];
-    char uniname2ctype_pool_str2219[sizeof("cyrl")];
-    char uniname2ctype_pool_str2224[sizeof("inhanguljamoextendeda")];
-    char uniname2ctype_pool_str2228[sizeof("pf")];
-    char uniname2ctype_pool_str2229[sizeof("number")];
-    char uniname2ctype_pool_str2232[sizeof("inphoneticextensionssupplement")];
-    char uniname2ctype_pool_str2233[sizeof("dogr")];
-    char uniname2ctype_pool_str2234[sizeof("mlym")];
-    char uniname2ctype_pool_str2235[sizeof("incopticepactnumbers")];
-    char uniname2ctype_pool_str2241[sizeof("malayalam")];
-    char uniname2ctype_pool_str2244[sizeof("inbamum")];
-    char uniname2ctype_pool_str2247[sizeof("nd")];
-    char uniname2ctype_pool_str2248[sizeof("insuttonsignwriting")];
-    char uniname2ctype_pool_str2276[sizeof("inethiopicextended")];
-    char uniname2ctype_pool_str2278[sizeof("shaw")];
-    char uniname2ctype_pool_str2279[sizeof("palmyrene")];
-    char uniname2ctype_pool_str2283[sizeof("soyo")];
-    char uniname2ctype_pool_str2296[sizeof("incjkunifiedideographsextensionh")];
-    char uniname2ctype_pool_str2305[sizeof("sgnw")];
-    char uniname2ctype_pool_str2308[sizeof("toto")];
-    char uniname2ctype_pool_str2312[sizeof("caucasianalbanian")];
-    char uniname2ctype_pool_str2315[sizeof("inmathematicalalphanumericsymbols")];
-    char uniname2ctype_pool_str2316[sizeof("incjkunifiedideographsextensiong")];
-    char uniname2ctype_pool_str2318[sizeof("hatran")];
-    char uniname2ctype_pool_str2321[sizeof("taiviet")];
-    char uniname2ctype_pool_str2323[sizeof("meroitichieroglyphs")];
-    char uniname2ctype_pool_str2327[sizeof("ingeorgianextended")];
-    char uniname2ctype_pool_str2331[sizeof("incjkunifiedideographsextensionf")];
-    char uniname2ctype_pool_str2333[sizeof("oldpersian")];
-    char uniname2ctype_pool_str2343[sizeof("induployan")];
-    char uniname2ctype_pool_str2344[sizeof("incyrillicextendedb")];
-    char uniname2ctype_pool_str2345[sizeof("dash")];
-    char uniname2ctype_pool_str2353[sizeof("hatr")];
-    char uniname2ctype_pool_str2361[sizeof("innyiakengpuachuehmong")];
-    char uniname2ctype_pool_str2364[sizeof("incombiningdiacriticalmarks")];
-    char uniname2ctype_pool_str2373[sizeof("nl")];
-    char uniname2ctype_pool_str2374[sizeof("incombiningdiacriticalmarksforsymbols")];
-    char uniname2ctype_pool_str2375[sizeof("khudawadi")];
-    char uniname2ctype_pool_str2397[sizeof("incjkradicalssupplement")];
-    char uniname2ctype_pool_str2398[sizeof("inglagolitic")];
-    char uniname2ctype_pool_str2405[sizeof("orkh")];
-    char uniname2ctype_pool_str2414[sizeof("syrc")];
-    char uniname2ctype_pool_str2427[sizeof("surrogate")];
-    char uniname2ctype_pool_str2433[sizeof("indevanagari")];
-    char uniname2ctype_pool_str2434[sizeof("avestan")];
-    char uniname2ctype_pool_str2437[sizeof("oldpermic")];
-    char uniname2ctype_pool_str2440[sizeof("ethi")];
-    char uniname2ctype_pool_str2451[sizeof("ogam")];
-    char uniname2ctype_pool_str2454[sizeof("rohg")];
-    char uniname2ctype_pool_str2460[sizeof("idstrinaryoperator")];
-    char uniname2ctype_pool_str2464[sizeof("java")];
-    char uniname2ctype_pool_str2470[sizeof("inphagspa")];
-    char uniname2ctype_pool_str2475[sizeof("lepcha")];
-    char uniname2ctype_pool_str2476[sizeof("indevanagariextendeda")];
-    char uniname2ctype_pool_str2478[sizeof("intifinagh")];
-    char uniname2ctype_pool_str2479[sizeof("intagalog")];
-    char uniname2ctype_pool_str2481[sizeof("incombiningdiacriticalmarkssupplement")];
-    char uniname2ctype_pool_str2500[sizeof("tale")];
-    char uniname2ctype_pool_str2506[sizeof("inbrahmi")];
-    char uniname2ctype_pool_str2511[sizeof("terminalpunctuation")];
-    char uniname2ctype_pool_str2513[sizeof("insymbolsandpictographsextendeda")];
-    char uniname2ctype_pool_str2530[sizeof("syriac")];
-    char uniname2ctype_pool_str2534[sizeof("inbengali")];
-    char uniname2ctype_pool_str2535[sizeof("nagm")];
-    char uniname2ctype_pool_str2545[sizeof("extendedpictographic")];
-    char uniname2ctype_pool_str2548[sizeof("buhd")];
-    char uniname2ctype_pool_str2549[sizeof("javanese")];
-    char uniname2ctype_pool_str2551[sizeof("taml")];
-    char uniname2ctype_pool_str2564[sizeof("inbuginese")];
-    char uniname2ctype_pool_str2567[sizeof("inlatin1supplement")];
-    char uniname2ctype_pool_str2570[sizeof("ingothic")];
-    char uniname2ctype_pool_str2572[sizeof("invariationselectors")];
-    char uniname2ctype_pool_str2574[sizeof("hex")];
-    char uniname2ctype_pool_str2575[sizeof("inverticalforms")];
-    char uniname2ctype_pool_str2576[sizeof("ebase")];
-    char uniname2ctype_pool_str2582[sizeof("incurrencysymbols")];
-    char uniname2ctype_pool_str2588[sizeof("avst")];
-    char uniname2ctype_pool_str2602[sizeof("osge")];
-    char uniname2ctype_pool_str2606[sizeof("incombiningdiacriticalmarksextended")];
-    char uniname2ctype_pool_str2608[sizeof("intaiviet")];
-    char uniname2ctype_pool_str2609[sizeof("spaceseparator")];
-    char uniname2ctype_pool_str2625[sizeof("softdotted")];
-    char uniname2ctype_pool_str2648[sizeof("nchar")];
-    char uniname2ctype_pool_str2652[sizeof("invedicextensions")];
-    char uniname2ctype_pool_str2656[sizeof("inlimbu")];
-    char uniname2ctype_pool_str2657[sizeof("olditalic")];
-    char uniname2ctype_pool_str2665[sizeof("gujr")];
-    char uniname2ctype_pool_str2666[sizeof("mathsymbol")];
-    char uniname2ctype_pool_str2670[sizeof("incjkunifiedideographsextensionb")];
-    char uniname2ctype_pool_str2674[sizeof("gujarati")];
-    char uniname2ctype_pool_str2688[sizeof("phagspa")];
-    char uniname2ctype_pool_str2689[sizeof("invariationselectorssupplement")];
-    char uniname2ctype_pool_str2694[sizeof("currencysymbol")];
-    char uniname2ctype_pool_str2705[sizeof("inlinearbsyllabary")];
-    char uniname2ctype_pool_str2726[sizeof("wancho")];
-    char uniname2ctype_pool_str2750[sizeof("inpaucinhau")];
-    char uniname2ctype_pool_str2761[sizeof("other")];
-    char uniname2ctype_pool_str2762[sizeof("otheridcontinue")];
-    char uniname2ctype_pool_str2765[sizeof("sylo")];
-    char uniname2ctype_pool_str2766[sizeof("zp")];
-    char uniname2ctype_pool_str2769[sizeof("inaegeannumbers")];
-    char uniname2ctype_pool_str2772[sizeof("warangciti")];
-    char uniname2ctype_pool_str2775[sizeof("othernumber")];
-    char uniname2ctype_pool_str2786[sizeof("digit")];
-    char uniname2ctype_pool_str2793[sizeof("nonspacingmark")];
-    char uniname2ctype_pool_str2801[sizeof("titlecaseletter")];
-    char uniname2ctype_pool_str2808[sizeof("inmeroiticcursive")];
-    char uniname2ctype_pool_str2810[sizeof("wcho")];
-    char uniname2ctype_pool_str2816[sizeof("graphemeclusterbreak=spacingmark")];
-    char uniname2ctype_pool_str2821[sizeof("inletterlikesymbols")];
-    char uniname2ctype_pool_str2830[sizeof("inottomansiyaqnumbers")];
-    char uniname2ctype_pool_str2834[sizeof("intagbanwa")];
-    char uniname2ctype_pool_str2836[sizeof("cyrillic")];
-    char uniname2ctype_pool_str2847[sizeof("oalpha")];
-    char uniname2ctype_pool_str2852[sizeof("graphemeclusterbreak=cr")];
-    char uniname2ctype_pool_str2855[sizeof("narb")];
-    char uniname2ctype_pool_str2856[sizeof("changeswhencasemapped")];
-    char uniname2ctype_pool_str2859[sizeof("inbopomofo")];
-    char uniname2ctype_pool_str2867[sizeof("graphemeclusterbreak=regionalindicator")];
-    char uniname2ctype_pool_str2868[sizeof("otheralphabetic")];
-    char uniname2ctype_pool_str2871[sizeof("noncharactercodepoint")];
-    char uniname2ctype_pool_str2879[sizeof("oldhungarian")];
-    char uniname2ctype_pool_str2886[sizeof("insymbolsforlegacycomputing")];
-    char uniname2ctype_pool_str2902[sizeof("insmallformvariants")];
-    char uniname2ctype_pool_str2904[sizeof("inhangulsyllables")];
-    char uniname2ctype_pool_str2905[sizeof("emojipresentation")];
-    char uniname2ctype_pool_str2907[sizeof("epres")];
-    char uniname2ctype_pool_str2909[sizeof("inbassavah")];
-    char uniname2ctype_pool_str2911[sizeof("indevanagariextended")];
-    char uniname2ctype_pool_str2941[sizeof("inbuhid")];
-    char uniname2ctype_pool_str2953[sizeof("tirhuta")];
-    char uniname2ctype_pool_str2964[sizeof("inpsalterpahlavi")];
-    char uniname2ctype_pool_str2966[sizeof("whitespace")];
-    char uniname2ctype_pool_str2967[sizeof("finalpunctuation")];
-    char uniname2ctype_pool_str2970[sizeof("orya")];
-    char uniname2ctype_pool_str2980[sizeof("phlp")];
-    char uniname2ctype_pool_str2984[sizeof("inbamumsupplement")];
-    char uniname2ctype_pool_str2986[sizeof("buhid")];
-    char uniname2ctype_pool_str2987[sizeof("paragraphseparator")];
-    char uniname2ctype_pool_str2988[sizeof("inalphabeticpresentationforms")];
-    char uniname2ctype_pool_str2997[sizeof("inlatinextendedg")];
-    char uniname2ctype_pool_str3001[sizeof("elba")];
-    char uniname2ctype_pool_str3002[sizeof("changeswhentitlecased")];
-    char uniname2ctype_pool_str3005[sizeof("incombininghalfmarks")];
-    char uniname2ctype_pool_str3006[sizeof("intangutcomponents")];
-    char uniname2ctype_pool_str3015[sizeof("thaa")];
-    char uniname2ctype_pool_str3018[sizeof("thai")];
-    char uniname2ctype_pool_str3019[sizeof("oldturkic")];
-    char uniname2ctype_pool_str3026[sizeof("thaana")];
-    char uniname2ctype_pool_str3027[sizeof("inlatinextendedf")];
-    char uniname2ctype_pool_str3035[sizeof("ougr")];
-    char uniname2ctype_pool_str3042[sizeof("tang")];
-    char uniname2ctype_pool_str3045[sizeof("inarabicmathematicalalphabeticsymbols")];
-    char uniname2ctype_pool_str3048[sizeof("tagbanwa")];
-    char uniname2ctype_pool_str3052[sizeof("tamil")];
-    char uniname2ctype_pool_str3053[sizeof("khitansmallscript")];
-    char uniname2ctype_pool_str3058[sizeof("mahj")];
-    char uniname2ctype_pool_str3067[sizeof("mahajani")];
-    char uniname2ctype_pool_str3068[sizeof("hang")];
-    char uniname2ctype_pool_str3071[sizeof("tirh")];
-    char uniname2ctype_pool_str3072[sizeof("sylotinagri")];
-    char uniname2ctype_pool_str3082[sizeof("talu")];
-    char uniname2ctype_pool_str3084[sizeof("nagmundari")];
-    char uniname2ctype_pool_str3086[sizeof("deva")];
-    char uniname2ctype_pool_str3087[sizeof("ingujarati")];
-    char uniname2ctype_pool_str3091[sizeof("deprecated")];
-    char uniname2ctype_pool_str3099[sizeof("inarabicpresentationformsb")];
-    char uniname2ctype_pool_str3104[sizeof("devanagari")];
-    char uniname2ctype_pool_str3106[sizeof("ingunjalagondi")];
-    char uniname2ctype_pool_str3107[sizeof("graphemeclusterbreak=t")];
-    char uniname2ctype_pool_str3109[sizeof("graphemeclusterbreak=lvt")];
-    char uniname2ctype_pool_str3110[sizeof("taitham")];
-    char uniname2ctype_pool_str3111[sizeof("nbat")];
-    char uniname2ctype_pool_str3118[sizeof("telu")];
-    char uniname2ctype_pool_str3123[sizeof("hiragana")];
-    char uniname2ctype_pool_str3125[sizeof("nabataean")];
-    char uniname2ctype_pool_str3135[sizeof("inrejang")];
-    char uniname2ctype_pool_str3142[sizeof("intangutsupplement")];
-    char uniname2ctype_pool_str3145[sizeof("khoj")];
-    char uniname2ctype_pool_str3155[sizeof("hmng")];
-    char uniname2ctype_pool_str3157[sizeof("cyprominoan")];
-    char uniname2ctype_pool_str3158[sizeof("inhebrew")];
-    char uniname2ctype_pool_str3176[sizeof("inmathematicaloperators")];
-    char uniname2ctype_pool_str3180[sizeof("inarabicsupplement")];
-    char uniname2ctype_pool_str3193[sizeof("inenclosedcjklettersandmonths")];
-    char uniname2ctype_pool_str3209[sizeof("changeswhenlowercased")];
-    char uniname2ctype_pool_str3212[sizeof("tangut")];
-    char uniname2ctype_pool_str3215[sizeof("elbasan")];
-    char uniname2ctype_pool_str3218[sizeof("osmanya")];
-    char uniname2ctype_pool_str3237[sizeof("insuperscriptsandsubscripts")];
-    char uniname2ctype_pool_str3239[sizeof("graphemeclusterbreak=extend")];
-    char uniname2ctype_pool_str3240[sizeof("graphemeclusterbreak=prepend")];
-    char uniname2ctype_pool_str3248[sizeof("nshu")];
-    char uniname2ctype_pool_str3254[sizeof("otherlowercase")];
-    char uniname2ctype_pool_str3265[sizeof("inethiopicextendedb")];
-    char uniname2ctype_pool_str3267[sizeof("otherletter")];
-    char uniname2ctype_pool_str3275[sizeof("kayahli")];
-    char uniname2ctype_pool_str3284[sizeof("inplayingcards")];
-    char uniname2ctype_pool_str3287[sizeof("elym")];
-    char uniname2ctype_pool_str3297[sizeof("graphemeclusterbreak=l")];
-    char uniname2ctype_pool_str3303[sizeof("graphemeclusterbreak=control")];
-    char uniname2ctype_pool_str3313[sizeof("ogrext")];
-    char uniname2ctype_pool_str3320[sizeof("elymaic")];
-    char uniname2ctype_pool_str3328[sizeof("changeswhenuppercased")];
-    char uniname2ctype_pool_str3329[sizeof("inalchemicalsymbols")];
-    char uniname2ctype_pool_str3331[sizeof("oldsogdian")];
-    char uniname2ctype_pool_str3338[sizeof("otheridstart")];
-    char uniname2ctype_pool_str3348[sizeof("insupplementalarrowsa")];
-    char uniname2ctype_pool_str3350[sizeof("invithkuqi")];
-    char uniname2ctype_pool_str3355[sizeof("symbol")];
-    char uniname2ctype_pool_str3360[sizeof("inarabicextendedb")];
-    char uniname2ctype_pool_str3371[sizeof("cypriot")];
-    char uniname2ctype_pool_str3372[sizeof("any")];
-    char uniname2ctype_pool_str3373[sizeof("otheruppercase")];
-    char uniname2ctype_pool_str3377[sizeof("rjng")];
-    char uniname2ctype_pool_str3391[sizeof("wspace")];
-    char uniname2ctype_pool_str3396[sizeof("inindicsiyaqnumbers")];
-    char uniname2ctype_pool_str3405[sizeof("inprivateusearea")];
-    char uniname2ctype_pool_str3416[sizeof("othersymbol")];
-    char uniname2ctype_pool_str3428[sizeof("oupper")];
-    char uniname2ctype_pool_str3433[sizeof("signwriting")];
-    char uniname2ctype_pool_str3436[sizeof("nushu")];
-    char uniname2ctype_pool_str3455[sizeof("hmnp")];
-    char uniname2ctype_pool_str3458[sizeof("upper")];
-    char uniname2ctype_pool_str3460[sizeof("insupplementalarrowsc")];
-    char uniname2ctype_pool_str3483[sizeof("omath")];
-    char uniname2ctype_pool_str3502[sizeof("modifiersymbol")];
-    char uniname2ctype_pool_str3504[sizeof("hebr")];
-    char uniname2ctype_pool_str3505[sizeof("inhalfwidthandfullwidthforms")];
-    char uniname2ctype_pool_str3511[sizeof("insupplementalmathematicaloperators")];
-    char uniname2ctype_pool_str3532[sizeof("inpahawhhmong")];
-    char uniname2ctype_pool_str3533[sizeof("alphabetic")];
-    char uniname2ctype_pool_str3558[sizeof("uppercase")];
-    char uniname2ctype_pool_str3580[sizeof("dupl")];
-    char uniname2ctype_pool_str3590[sizeof("ogham")];
-    char uniname2ctype_pool_str3613[sizeof("dashpunctuation")];
-    char uniname2ctype_pool_str3618[sizeof("hangul")];
-    char uniname2ctype_pool_str3648[sizeof("inhanguljamoextendedb")];
-    char uniname2ctype_pool_str3659[sizeof("bassavah")];
-    char uniname2ctype_pool_str3664[sizeof("aghb")];
-    char uniname2ctype_pool_str3686[sizeof("hung")];
-    char uniname2ctype_pool_str3689[sizeof("hexdigit")];
-    char uniname2ctype_pool_str3698[sizeof("incypriotsyllabary")];
-    char uniname2ctype_pool_str3699[sizeof("indivesakuru")];
-    char uniname2ctype_pool_str3701[sizeof("tibt")];
-    char uniname2ctype_pool_str3705[sizeof("inlatinextendedb")];
-    char uniname2ctype_pool_str3710[sizeof("hluw")];
-    char uniname2ctype_pool_str3713[sizeof("tibetan")];
-    char uniname2ctype_pool_str3721[sizeof("inyisyllables")];
-    char uniname2ctype_pool_str3744[sizeof("oldnortharabian")];
-    char uniname2ctype_pool_str3754[sizeof("defaultignorablecodepoint")];
-    char uniname2ctype_pool_str3766[sizeof("inhighprivateusesurrogates")];
-    char uniname2ctype_pool_str3799[sizeof("soyombo")];
-    char uniname2ctype_pool_str3807[sizeof("otherdefaultignorablecodepoint")];
-    char uniname2ctype_pool_str3842[sizeof("pahawhhmong")];
-    char uniname2ctype_pool_str3845[sizeof("unifiedideograph")];
-    char uniname2ctype_pool_str3850[sizeof("othermath")];
-    char uniname2ctype_pool_str3854[sizeof("changeswhencasefolded")];
-    char uniname2ctype_pool_str3857[sizeof("inmahjongtiles")];
-    char uniname2ctype_pool_str3868[sizeof("dep")];
-    char uniname2ctype_pool_str3881[sizeof("divesakuru")];
-    char uniname2ctype_pool_str3884[sizeof("graphemeclusterbreak=lf")];
-    char uniname2ctype_pool_str3891[sizeof("uppercaseletter")];
-    char uniname2ctype_pool_str3924[sizeof("insupplementalpunctuation")];
-    char uniname2ctype_pool_str3942[sizeof("ethiopic")];
-    char uniname2ctype_pool_str3944[sizeof("inyijinghexagramsymbols")];
-    char uniname2ctype_pool_str3949[sizeof("ecomp")];
-    char uniname2ctype_pool_str3976[sizeof("inglagoliticsupplement")];
-    char uniname2ctype_pool_str3998[sizeof("inbopomofoextended")];
-    char uniname2ctype_pool_str4007[sizeof("injavanese")];
-    char uniname2ctype_pool_str4106[sizeof("otherpunctuation")];
-    char uniname2ctype_pool_str4116[sizeof("tifinagh")];
-    char uniname2ctype_pool_str4127[sizeof("tfng")];
-    char uniname2ctype_pool_str4169[sizeof("hanifirohingya")];
-    char uniname2ctype_pool_str4231[sizeof("tavt")];
-    char uniname2ctype_pool_str4308[sizeof("inboxdrawing")];
-    char uniname2ctype_pool_str4309[sizeof("oldsoutharabian")];
-    char uniname2ctype_pool_str4348[sizeof("inegyptianhieroglyphs")];
-    char uniname2ctype_pool_str4361[sizeof("inegyptianhieroglyphformatcontrols")];
-    char uniname2ctype_pool_str4459[sizeof("tagb")];
-    char uniname2ctype_pool_str4487[sizeof("rejang")];
-    char uniname2ctype_pool_str4604[sizeof("tglg")];
-    char uniname2ctype_pool_str4626[sizeof("tagalog")];
-    char uniname2ctype_pool_str4627[sizeof("othergraphemeextend")];
-    char uniname2ctype_pool_str4674[sizeof("insupplementaryprivateuseareaa")];
-    char uniname2ctype_pool_str4683[sizeof("inhighsurrogates")];
-    char uniname2ctype_pool_str4695[sizeof("hebrew")];
-    char uniname2ctype_pool_str4734[sizeof("duployan")];
-    char uniname2ctype_pool_str4755[sizeof("graphemeclusterbreak=v")];
-    char uniname2ctype_pool_str4756[sizeof("graphemeclusterbreak=lv")];
-    char uniname2ctype_pool_str4772[sizeof("insupplementalarrowsb")];
-    char uniname2ctype_pool_str4783[sizeof("graphemeclusterbreak=zwj")];
-    char uniname2ctype_pool_str4810[sizeof("telugu")];
-    char uniname2ctype_pool_str4898[sizeof("zyyy")];
-    char uniname2ctype_pool_str4982[sizeof("olduyghur")];
-    char uniname2ctype_pool_str4986[sizeof("inhangulcompatibilityjamo")];
-    char uniname2ctype_pool_str5018[sizeof("openpunctuation")];
-    char uniname2ctype_pool_str5038[sizeof("hyphen")];
-    char uniname2ctype_pool_str5134[sizeof("insupplementalsymbolsandpictographs")];
-    char uniname2ctype_pool_str5141[sizeof("egyp")];
-    char uniname2ctype_pool_str5300[sizeof("nyiakengpuachuehmong")];
-    char uniname2ctype_pool_str5980[sizeof("egyptianhieroglyphs")];
-    char uniname2ctype_pool_str6098[sizeof("insupplementaryprivateuseareab")];
+    char uniname2ctype_pool_str1298[sizeof("punct")];
+    char uniname2ctype_pool_str1309[sizeof("incjkunifiedideographs")];
+    char uniname2ctype_pool_str1310[sizeof("inhiragana")];
+    char uniname2ctype_pool_str1314[sizeof("sinhala")];
+    char uniname2ctype_pool_str1318[sizeof("plrd")];
+    char uniname2ctype_pool_str1320[sizeof("phoenician")];
+    char uniname2ctype_pool_str1321[sizeof("logicalorderexception")];
+    char uniname2ctype_pool_str1323[sizeof("multani")];
+    char uniname2ctype_pool_str1326[sizeof("canadianaboriginal")];
+    char uniname2ctype_pool_str1327[sizeof("patternsyntax")];
+    char uniname2ctype_pool_str1328[sizeof("gunjalagondi")];
+    char uniname2ctype_pool_str1330[sizeof("hatr")];
+    char uniname2ctype_pool_str1336[sizeof("insorasompeng")];
+    char uniname2ctype_pool_str1339[sizeof("inearlydynasticcuneiform")];
+    char uniname2ctype_pool_str1340[sizeof("marchen")];
+    char uniname2ctype_pool_str1349[sizeof("graphemelink")];
+    char uniname2ctype_pool_str1350[sizeof("sd")];
+    char uniname2ctype_pool_str1353[sizeof("cher")];
+    char uniname2ctype_pool_str1355[sizeof("cherokee")];
+    char uniname2ctype_pool_str1357[sizeof("sidd")];
+    char uniname2ctype_pool_str1359[sizeof("kaithi")];
+    char uniname2ctype_pool_str1362[sizeof("inmahajani")];
+    char uniname2ctype_pool_str1363[sizeof("emojimodifier")];
+    char uniname2ctype_pool_str1364[sizeof("inogham")];
+    char uniname2ctype_pool_str1369[sizeof("khojki")];
+    char uniname2ctype_pool_str1372[sizeof("cham")];
+    char uniname2ctype_pool_str1376[sizeof("chakma")];
+    char uniname2ctype_pool_str1390[sizeof("khar")];
+    char uniname2ctype_pool_str1392[sizeof("n")];
+    char uniname2ctype_pool_str1397[sizeof("graphemebase")];
+    char uniname2ctype_pool_str1408[sizeof("manichaean")];
+    char uniname2ctype_pool_str1410[sizeof("no")];
+    char uniname2ctype_pool_str1414[sizeof("inolchiki")];
+    char uniname2ctype_pool_str1416[sizeof("nandinagari")];
+    char uniname2ctype_pool_str1417[sizeof("nko")];
+    char uniname2ctype_pool_str1418[sizeof("nkoo")];
+    char uniname2ctype_pool_str1434[sizeof("sund")];
+    char uniname2ctype_pool_str1435[sizeof("inethiopic")];
+    char uniname2ctype_pool_str1437[sizeof("p")];
+    char uniname2ctype_pool_str1439[sizeof("punctuation")];
+    char uniname2ctype_pool_str1440[sizeof("ingreekandcoptic")];
+    char uniname2ctype_pool_str1451[sizeof("inmeroitichieroglyphs")];
+    char uniname2ctype_pool_str1455[sizeof("inphoenician")];
+    char uniname2ctype_pool_str1456[sizeof("intangsa")];
+    char uniname2ctype_pool_str1458[sizeof("adlm")];
+    char uniname2ctype_pool_str1460[sizeof("insinhala")];
+    char uniname2ctype_pool_str1461[sizeof("incyrillicextendeda")];
+    char uniname2ctype_pool_str1466[sizeof("gujr")];
+    char uniname2ctype_pool_str1476[sizeof("gujarati")];
+    char uniname2ctype_pool_str1478[sizeof("inlatinextendedc")];
+    char uniname2ctype_pool_str1480[sizeof("olower")];
+    char uniname2ctype_pool_str1482[sizeof("enclosingmark")];
+    char uniname2ctype_pool_str1484[sizeof("xpeo")];
+    char uniname2ctype_pool_str1485[sizeof("khmr")];
+    char uniname2ctype_pool_str1488[sizeof("olck")];
+    char uniname2ctype_pool_str1490[sizeof("linb")];
+    char uniname2ctype_pool_str1491[sizeof("ahom")];
+    char uniname2ctype_pool_str1492[sizeof("chorasmian")];
+    char uniname2ctype_pool_str1495[sizeof("zanb")];
+    char uniname2ctype_pool_str1498[sizeof("inkangxiradicals")];
+    char uniname2ctype_pool_str1501[sizeof("olchiki")];
+    char uniname2ctype_pool_str1502[sizeof("innabataean")];
+    char uniname2ctype_pool_str1504[sizeof("inkanbun")];
+    char uniname2ctype_pool_str1505[sizeof("casedletter")];
+    char uniname2ctype_pool_str1506[sizeof("inbhaiksuki")];
+    char uniname2ctype_pool_str1513[sizeof("sunu")];
+    char uniname2ctype_pool_str1516[sizeof("intaixuanjingsymbols")];
+    char uniname2ctype_pool_str1520[sizeof("chrs")];
+    char uniname2ctype_pool_str1521[sizeof("cpmn")];
+    char uniname2ctype_pool_str1525[sizeof("beng")];
+    char uniname2ctype_pool_str1526[sizeof("inscriptionalpahlavi")];
+    char uniname2ctype_pool_str1527[sizeof("inelbasan")];
+    char uniname2ctype_pool_str1534[sizeof("khmer")];
+    char uniname2ctype_pool_str1542[sizeof("linearb")];
+    char uniname2ctype_pool_str1545[sizeof("incjkunifiedideographsextensiond")];
+    char uniname2ctype_pool_str1546[sizeof("emojimodifierbase")];
+    char uniname2ctype_pool_str1553[sizeof("indogra")];
+    char uniname2ctype_pool_str1555[sizeof("adlam")];
+    char uniname2ctype_pool_str1558[sizeof("regionalindicator")];
+    char uniname2ctype_pool_str1560[sizeof("kharoshthi")];
+    char uniname2ctype_pool_str1562[sizeof("inphaistosdisc")];
+    char uniname2ctype_pool_str1565[sizeof("lepc")];
+    char uniname2ctype_pool_str1571[sizeof("xsux")];
+    char uniname2ctype_pool_str1575[sizeof("ingreekextended")];
+    char uniname2ctype_pool_str1583[sizeof("limb")];
+    char uniname2ctype_pool_str1591[sizeof("sogo")];
+    char uniname2ctype_pool_str1593[sizeof("sogdian")];
+    char uniname2ctype_pool_str1595[sizeof("ll")];
+    char uniname2ctype_pool_str1598[sizeof("emod")];
+    char uniname2ctype_pool_str1600[sizeof("incyrillicextendedc")];
+    char uniname2ctype_pool_str1602[sizeof("incyprominoan")];
+    char uniname2ctype_pool_str1604[sizeof("zl")];
+    char uniname2ctype_pool_str1621[sizeof("ingeometricshapes")];
+    char uniname2ctype_pool_str1622[sizeof("inkhitansmallscript")];
+    char uniname2ctype_pool_str1626[sizeof("math")];
+    char uniname2ctype_pool_str1630[sizeof("goth")];
+    char uniname2ctype_pool_str1634[sizeof("inarabic")];
+    char uniname2ctype_pool_str1635[sizeof("gurungkhema")];
+    char uniname2ctype_pool_str1642[sizeof("inimperialaramaic")];
+    char uniname2ctype_pool_str1661[sizeof("inmiscellaneoustechnical")];
+    char uniname2ctype_pool_str1665[sizeof("intamilsupplement")];
+    char uniname2ctype_pool_str1668[sizeof("arab")];
+    char uniname2ctype_pool_str1673[sizeof("grantha")];
+    char uniname2ctype_pool_str1678[sizeof("intirhuta")];
+    char uniname2ctype_pool_str1679[sizeof("inhatran")];
+    char uniname2ctype_pool_str1681[sizeof("mult")];
+    char uniname2ctype_pool_str1696[sizeof("intulutigalari")];
+    char uniname2ctype_pool_str1704[sizeof("inbasiclatin")];
+    char uniname2ctype_pool_str1705[sizeof("inoldhungarian")];
+    char uniname2ctype_pool_str1706[sizeof("insogdian")];
+    char uniname2ctype_pool_str1707[sizeof("indingbats")];
+    char uniname2ctype_pool_str1709[sizeof("ogam")];
+    char uniname2ctype_pool_str1711[sizeof("inarabicpresentationformsa")];
+    char uniname2ctype_pool_str1712[sizeof("vithkuqi")];
+    char uniname2ctype_pool_str1716[sizeof("kthi")];
+    char uniname2ctype_pool_str1717[sizeof("brah")];
+    char uniname2ctype_pool_str1719[sizeof("coptic")];
+    char uniname2ctype_pool_str1723[sizeof("ideographic")];
+    char uniname2ctype_pool_str1730[sizeof("emojicomponent")];
+    char uniname2ctype_pool_str1731[sizeof("takri")];
+    char uniname2ctype_pool_str1733[sizeof("invai")];
+    char uniname2ctype_pool_str1734[sizeof("ingurungkhema")];
+    char uniname2ctype_pool_str1735[sizeof("inherited")];
+    char uniname2ctype_pool_str1737[sizeof("radical")];
+    char uniname2ctype_pool_str1746[sizeof("dia")];
+    char uniname2ctype_pool_str1748[sizeof("di")];
+    char uniname2ctype_pool_str1752[sizeof("diak")];
+    char uniname2ctype_pool_str1755[sizeof("sinh")];
+    char uniname2ctype_pool_str1756[sizeof("glagolitic")];
+    char uniname2ctype_pool_str1758[sizeof("gukh")];
+    char uniname2ctype_pool_str1760[sizeof("shavian")];
+    char uniname2ctype_pool_str1766[sizeof("joincontrol")];
+    char uniname2ctype_pool_str1768[sizeof("takr")];
+    char uniname2ctype_pool_str1774[sizeof("inhanunoo")];
+    char uniname2ctype_pool_str1775[sizeof("ininscriptionalparthian")];
+    char uniname2ctype_pool_str1776[sizeof("ininscriptionalpahlavi")];
+    char uniname2ctype_pool_str1780[sizeof("taile")];
+    char uniname2ctype_pool_str1791[sizeof("grbase")];
+    char uniname2ctype_pool_str1792[sizeof("graphemeextend")];
+    char uniname2ctype_pool_str1794[sizeof("imperialaramaic")];
+    char uniname2ctype_pool_str1802[sizeof("copt")];
+    char uniname2ctype_pool_str1807[sizeof("bidicontrol")];
+    char uniname2ctype_pool_str1819[sizeof("nand")];
+    char uniname2ctype_pool_str1825[sizeof("intangut")];
+    char uniname2ctype_pool_str1835[sizeof("bopo")];
+    char uniname2ctype_pool_str1839[sizeof("osge")];
+    char uniname2ctype_pool_str1840[sizeof("cprt")];
+    char uniname2ctype_pool_str1842[sizeof("orkh")];
+    char uniname2ctype_pool_str1843[sizeof("sorasompeng")];
+    char uniname2ctype_pool_str1844[sizeof("intags")];
+    char uniname2ctype_pool_str1846[sizeof("inenclosedideographicsupplement")];
+    char uniname2ctype_pool_str1848[sizeof("inoldpersian")];
+    char uniname2ctype_pool_str1851[sizeof("inanatolianhieroglyphs")];
+    char uniname2ctype_pool_str1852[sizeof("oldpersian")];
+    char uniname2ctype_pool_str1855[sizeof("ingeometricshapesextended")];
+    char uniname2ctype_pool_str1868[sizeof("inbatak")];
+    char uniname2ctype_pool_str1870[sizeof("glag")];
+    char uniname2ctype_pool_str1871[sizeof("bhks")];
+    char uniname2ctype_pool_str1876[sizeof("inblockelements")];
+    char uniname2ctype_pool_str1882[sizeof("bhaiksuki")];
+    char uniname2ctype_pool_str1883[sizeof("incyrillicextendedd")];
+    char uniname2ctype_pool_str1887[sizeof("term")];
+    char uniname2ctype_pool_str1889[sizeof("innumberforms")];
+    char uniname2ctype_pool_str1896[sizeof("intibetan")];
+    char uniname2ctype_pool_str1914[sizeof("tnsa")];
+    char uniname2ctype_pool_str1916[sizeof("spacingmark")];
+    char uniname2ctype_pool_str1918[sizeof("tangsa")];
+    char uniname2ctype_pool_str1928[sizeof("inshavian")];
+    char uniname2ctype_pool_str1932[sizeof("inkanaextendedb")];
+    char uniname2ctype_pool_str1944[sizeof("diacritic")];
+    char uniname2ctype_pool_str1945[sizeof("bopomofo")];
+    char uniname2ctype_pool_str1950[sizeof("insinhalaarchaicnumbers")];
+    char uniname2ctype_pool_str1956[sizeof("space")];
+    char uniname2ctype_pool_str1957[sizeof("inarabicextendeda")];
+    char uniname2ctype_pool_str1959[sizeof("innushu")];
+    char uniname2ctype_pool_str1966[sizeof("incjksymbolsandpunctuation")];
+    char uniname2ctype_pool_str1980[sizeof("hang")];
+    char uniname2ctype_pool_str1981[sizeof("inoldpermic")];
+    char uniname2ctype_pool_str1988[sizeof("oldpermic")];
+    char uniname2ctype_pool_str1991[sizeof("anatolianhieroglyphs")];
+    char uniname2ctype_pool_str1992[sizeof("inenclosedalphanumerics")];
+    char uniname2ctype_pool_str1995[sizeof("inbyzantinemusicalsymbols")];
+    char uniname2ctype_pool_str1997[sizeof("ingujarati")];
+    char uniname2ctype_pool_str1998[sizeof("cntrl")];
+    char uniname2ctype_pool_str1999[sizeof("bugi")];
+    char uniname2ctype_pool_str2002[sizeof("inmyanmarextendedb")];
+    char uniname2ctype_pool_str2003[sizeof("inlatinextendedadditional")];
+    char uniname2ctype_pool_str2004[sizeof("sogd")];
+    char uniname2ctype_pool_str2006[sizeof("ingunjalagondi")];
+    char uniname2ctype_pool_str2011[sizeof("inlisu")];
+    char uniname2ctype_pool_str2015[sizeof("insundanesesupplement")];
+    char uniname2ctype_pool_str2026[sizeof("separator")];
+    char uniname2ctype_pool_str2030[sizeof("sarb")];
+    char uniname2ctype_pool_str2033[sizeof("assigned")];
+    char uniname2ctype_pool_str2035[sizeof("hiragana")];
+    char uniname2ctype_pool_str2038[sizeof("inrejang")];
+    char uniname2ctype_pool_str2039[sizeof("zanabazarsquare")];
+    char uniname2ctype_pool_str2044[sizeof("inlatinextendedd")];
+    char uniname2ctype_pool_str2046[sizeof("format")];
+    char uniname2ctype_pool_str2049[sizeof("inkayahli")];
+    char uniname2ctype_pool_str2051[sizeof("inoriya")];
+    char uniname2ctype_pool_str2054[sizeof("ingeorgiansupplement")];
+    char uniname2ctype_pool_str2055[sizeof("incoptic")];
+    char uniname2ctype_pool_str2056[sizeof("intodhri")];
+    char uniname2ctype_pool_str2060[sizeof("innewa")];
+    char uniname2ctype_pool_str2061[sizeof("buginese")];
+    char uniname2ctype_pool_str2065[sizeof("insyriacsupplement")];
+    char uniname2ctype_pool_str2071[sizeof("inkawi")];
+    char uniname2ctype_pool_str2073[sizeof("wara")];
+    char uniname2ctype_pool_str2075[sizeof("hmng")];
+    char uniname2ctype_pool_str2077[sizeof("inbraillepatterns")];
+    char uniname2ctype_pool_str2078[sizeof("inmiscellaneousmathematicalsymbolsb")];
+    char uniname2ctype_pool_str2093[sizeof("phli")];
+    char uniname2ctype_pool_str2094[sizeof("decimalnumber")];
+    char uniname2ctype_pool_str2096[sizeof("inarabicextendedc")];
+    char uniname2ctype_pool_str2098[sizeof("inyezidi")];
+    char uniname2ctype_pool_str2099[sizeof("braille")];
+    char uniname2ctype_pool_str2100[sizeof("inornamentaldingbats")];
+    char uniname2ctype_pool_str2103[sizeof("toto")];
+    char uniname2ctype_pool_str2105[sizeof("idsb")];
+    char uniname2ctype_pool_str2106[sizeof("variationselector")];
+    char uniname2ctype_pool_str2109[sizeof("innyiakengpuachuehmong")];
+    char uniname2ctype_pool_str2111[sizeof("asciihexdigit")];
+    char uniname2ctype_pool_str2112[sizeof("phnx")];
+    char uniname2ctype_pool_str2118[sizeof("number")];
+    char uniname2ctype_pool_str2120[sizeof("inwarangciti")];
+    char uniname2ctype_pool_str2127[sizeof("taiviet")];
+    char uniname2ctype_pool_str2136[sizeof("caseignorable")];
+    char uniname2ctype_pool_str2146[sizeof("kawi")];
+    char uniname2ctype_pool_str2154[sizeof("lower")];
+    char uniname2ctype_pool_str2162[sizeof("ougr")];
+    char uniname2ctype_pool_str2163[sizeof("mahj")];
+    char uniname2ctype_pool_str2164[sizeof("indevanagari")];
+    char uniname2ctype_pool_str2166[sizeof("surrogate")];
+    char uniname2ctype_pool_str2171[sizeof("lyci")];
+    char uniname2ctype_pool_str2173[sizeof("mahajani")];
+    char uniname2ctype_pool_str2174[sizeof("inenclosedalphanumericsupplement")];
+    char uniname2ctype_pool_str2175[sizeof("lycian")];
+    char uniname2ctype_pool_str2176[sizeof("sharada")];
+    char uniname2ctype_pool_str2177[sizeof("mymr")];
+    char uniname2ctype_pool_str2182[sizeof("myanmar")];
+    char uniname2ctype_pool_str2185[sizeof("inbamum")];
+    char uniname2ctype_pool_str2186[sizeof("intelugu")];
+    char uniname2ctype_pool_str2187[sizeof("incjkunifiedideographsextensiong")];
+    char uniname2ctype_pool_str2194[sizeof("todr")];
+    char uniname2ctype_pool_str2199[sizeof("indevanagariextendeda")];
+    char uniname2ctype_pool_str2203[sizeof("medf")];
+    char uniname2ctype_pool_str2206[sizeof("todhri")];
+    char uniname2ctype_pool_str2207[sizeof("inethiopicsupplement")];
+    char uniname2ctype_pool_str2210[sizeof("inwancho")];
+    char uniname2ctype_pool_str2214[sizeof("medefaidrin")];
+    char uniname2ctype_pool_str2218[sizeof("shrd")];
+    char uniname2ctype_pool_str2222[sizeof("inkatakanaphoneticextensions")];
+    char uniname2ctype_pool_str2223[sizeof("inshorthandformatcontrols")];
+    char uniname2ctype_pool_str2227[sizeof("caucasianalbanian")];
+    char uniname2ctype_pool_str2231[sizeof("ahex")];
+    char uniname2ctype_pool_str2233[sizeof("insymbolsforlegacycomputingsupplement")];
+    char uniname2ctype_pool_str2236[sizeof("nd")];
+    char uniname2ctype_pool_str2254[sizeof("insoyombo")];
+    char uniname2ctype_pool_str2255[sizeof("other")];
+    char uniname2ctype_pool_str2257[sizeof("otheridcontinue")];
+    char uniname2ctype_pool_str2258[sizeof("khoj")];
+    char uniname2ctype_pool_str2260[sizeof("avestan")];
+    char uniname2ctype_pool_str2264[sizeof("othernumber")];
+    char uniname2ctype_pool_str2270[sizeof("sentenceterminal")];
+    char uniname2ctype_pool_str2275[sizeof("siddham")];
+    char uniname2ctype_pool_str2276[sizeof("closepunctuation")];
+    char uniname2ctype_pool_str2280[sizeof("lowercase")];
+    char uniname2ctype_pool_str2281[sizeof("olditalic")];
+    char uniname2ctype_pool_str2284[sizeof("oldhungarian")];
+    char uniname2ctype_pool_str2289[sizeof("inlisusupplement")];
+    char uniname2ctype_pool_str2297[sizeof("innoblock")];
+    char uniname2ctype_pool_str2302[sizeof("inunifiedcanadianaboriginalsyllabicsextendeda")];
+    char uniname2ctype_pool_str2303[sizeof("inelymaic")];
+    char uniname2ctype_pool_str2310[sizeof("cwcm")];
+    char uniname2ctype_pool_str2324[sizeof("inbalinese")];
+    char uniname2ctype_pool_str2325[sizeof("invariationselectors")];
+    char uniname2ctype_pool_str2327[sizeof("terminalpunctuation")];
+    char uniname2ctype_pool_str2329[sizeof("inpalmyrene")];
+    char uniname2ctype_pool_str2330[sizeof("alpha")];
+    char uniname2ctype_pool_str2341[sizeof("inlepcha")];
+    char uniname2ctype_pool_str2342[sizeof("incjkcompatibility")];
+    char uniname2ctype_pool_str2349[sizeof("rjng")];
+    char uniname2ctype_pool_str2350[sizeof("inhanguljamo")];
+    char uniname2ctype_pool_str2355[sizeof("dsrt")];
+    char uniname2ctype_pool_str2358[sizeof("inverticalforms")];
+    char uniname2ctype_pool_str2359[sizeof("phag")];
+    char uniname2ctype_pool_str2360[sizeof("incopticepactnumbers")];
+    char uniname2ctype_pool_str2363[sizeof("incjkunifiedideographsextensionh")];
+    char uniname2ctype_pool_str2366[sizeof("invedicextensions")];
+    char uniname2ctype_pool_str2380[sizeof("inhanguljamoextendeda")];
+    char uniname2ctype_pool_str2381[sizeof("cuneiform")];
+    char uniname2ctype_pool_str2385[sizeof("inmayannumerals")];
+    char uniname2ctype_pool_str2388[sizeof("otheralphabetic")];
+    char uniname2ctype_pool_str2398[sizeof("hmnp")];
+    char uniname2ctype_pool_str2403[sizeof("insuttonsignwriting")];
+    char uniname2ctype_pool_str2415[sizeof("incombiningdiacriticalmarks")];
+    char uniname2ctype_pool_str2418[sizeof("deseret")];
+    char uniname2ctype_pool_str2420[sizeof("avst")];
+    char uniname2ctype_pool_str2421[sizeof("inmeroiticcursive")];
+    char uniname2ctype_pool_str2425[sizeof("incombiningdiacriticalmarksforsymbols")];
+    char uniname2ctype_pool_str2432[sizeof("inglagolitic")];
+    char uniname2ctype_pool_str2436[sizeof("vith")];
+    char uniname2ctype_pool_str2450[sizeof("patsyn")];
+    char uniname2ctype_pool_str2454[sizeof("lydi")];
+    char uniname2ctype_pool_str2458[sizeof("lydian")];
+    char uniname2ctype_pool_str2460[sizeof("oldturkic")];
+    char uniname2ctype_pool_str2463[sizeof("innewtailue")];
+    char uniname2ctype_pool_str2464[sizeof("hebr")];
+    char uniname2ctype_pool_str2472[sizeof("intaiviet")];
+    char uniname2ctype_pool_str2473[sizeof("inphagspa")];
+    char uniname2ctype_pool_str2477[sizeof("inenclosedcjklettersandmonths")];
+    char uniname2ctype_pool_str2481[sizeof("hung")];
+    char uniname2ctype_pool_str2483[sizeof("inyiradicals")];
+    char uniname2ctype_pool_str2489[sizeof("inunifiedcanadianaboriginalsyllabics")];
+    char uniname2ctype_pool_str2493[sizeof("uideo")];
+    char uniname2ctype_pool_str2503[sizeof("idstrinaryoperator")];
+    char uniname2ctype_pool_str2504[sizeof("word")];
+    char uniname2ctype_pool_str2508[sizeof("invariationselectorssupplement")];
+    char uniname2ctype_pool_str2510[sizeof("java")];
+    char uniname2ctype_pool_str2519[sizeof("intagalog")];
+    char uniname2ctype_pool_str2539[sizeof("tale")];
+    char uniname2ctype_pool_str2541[sizeof("graph")];
+    char uniname2ctype_pool_str2544[sizeof("inethiopicextendeda")];
+    char uniname2ctype_pool_str2545[sizeof("soyo")];
+    char uniname2ctype_pool_str2550[sizeof("spaceseparator")];
+    char uniname2ctype_pool_str2552[sizeof("inpaucinhau")];
+    char uniname2ctype_pool_str2554[sizeof("nagm")];
+    char uniname2ctype_pool_str2556[sizeof("inmongoliansupplement")];
+    char uniname2ctype_pool_str2565[sizeof("oupper")];
+    char uniname2ctype_pool_str2566[sizeof("inbengali")];
+    char uniname2ctype_pool_str2572[sizeof("hex")];
+    char uniname2ctype_pool_str2576[sizeof("javanese")];
+    char uniname2ctype_pool_str2588[sizeof("oalpha")];
+    char uniname2ctype_pool_str2593[sizeof("buhd")];
+    char uniname2ctype_pool_str2594[sizeof("inbuginese")];
+    char uniname2ctype_pool_str2597[sizeof("incjkunifiedideographsextensionb")];
+    char uniname2ctype_pool_str2598[sizeof("incombiningdiacriticalmarkssupplement")];
+    char uniname2ctype_pool_str2603[sizeof("insymbolsandpictographsextendeda")];
+    char uniname2ctype_pool_str2605[sizeof("taml")];
+    char uniname2ctype_pool_str2606[sizeof("ebase")];
+    char uniname2ctype_pool_str2615[sizeof("orya")];
+    char uniname2ctype_pool_str2616[sizeof("modifierletter")];
+    char uniname2ctype_pool_str2620[sizeof("indevanagariextended")];
+    char uniname2ctype_pool_str2624[sizeof("ext")];
+    char uniname2ctype_pool_str2628[sizeof("induployan")];
+    char uniname2ctype_pool_str2640[sizeof("inphoneticextensions")];
+    char uniname2ctype_pool_str2642[sizeof("tirhuta")];
+    char uniname2ctype_pool_str2649[sizeof("incombiningdiacriticalmarksextended")];
+    char uniname2ctype_pool_str2652[sizeof("xposixpunct")];
+    char uniname2ctype_pool_str2666[sizeof("injavanese")];
+    char uniname2ctype_pool_str2670[sizeof("lepcha")];
+    char uniname2ctype_pool_str2674[sizeof("lowercaseletter")];
+    char uniname2ctype_pool_str2676[sizeof("inindicsiyaqnumbers")];
+    char uniname2ctype_pool_str2679[sizeof("unassigned")];
+    char uniname2ctype_pool_str2685[sizeof("ethi")];
+    char uniname2ctype_pool_str2687[sizeof("titlecaseletter")];
+    char uniname2ctype_pool_str2690[sizeof("rohg")];
+    char uniname2ctype_pool_str2713[sizeof("syrc")];
+    char uniname2ctype_pool_str2723[sizeof("inunifiedcanadianaboriginalsyllabicsextended")];
+    char uniname2ctype_pool_str2733[sizeof("extender")];
+    char uniname2ctype_pool_str2739[sizeof("inbrahmi")];
+    char uniname2ctype_pool_str2746[sizeof("meroitichieroglyphs")];
+    char uniname2ctype_pool_str2749[sizeof("otheruppercase")];
+    char uniname2ctype_pool_str2773[sizeof("extpict")];
+    char uniname2ctype_pool_str2779[sizeof("incjkradicalssupplement")];
+    char uniname2ctype_pool_str2782[sizeof("tang")];
+    char uniname2ctype_pool_str2788[sizeof("tagbanwa")];
+    char uniname2ctype_pool_str2790[sizeof("zp")];
+    char uniname2ctype_pool_str2792[sizeof("inaegeannumbers")];
+    char uniname2ctype_pool_str2811[sizeof("nonspacingmark")];
+    char uniname2ctype_pool_str2812[sizeof("ingeorgianextended")];
+    char uniname2ctype_pool_str2813[sizeof("cwt")];
+    char uniname2ctype_pool_str2818[sizeof("dogra")];
+    char uniname2ctype_pool_str2823[sizeof("inphoneticextensionssupplement")];
+    char uniname2ctype_pool_str2833[sizeof("ingothic")];
+    char uniname2ctype_pool_str2849[sizeof("oldsogdian")];
+    char uniname2ctype_pool_str2856[sizeof("syriac")];
+    char uniname2ctype_pool_str2858[sizeof("incjkunifiedideographsextensionf")];
+    char uniname2ctype_pool_str2863[sizeof("dogr")];
+    char uniname2ctype_pool_str2866[sizeof("osmanya")];
+    char uniname2ctype_pool_str2870[sizeof("nchar")];
+    char uniname2ctype_pool_str2881[sizeof("inmathematicalalphanumericsymbols")];
+    char uniname2ctype_pool_str2883[sizeof("phagspa")];
+    char uniname2ctype_pool_str2884[sizeof("inlimbu")];
+    char uniname2ctype_pool_str2896[sizeof("cyrl")];
+    char uniname2ctype_pool_str2897[sizeof("currencysymbol")];
+    char uniname2ctype_pool_str2900[sizeof("epres")];
+    char uniname2ctype_pool_str2902[sizeof("inbopomofo")];
+    char uniname2ctype_pool_str2916[sizeof("narb")];
+    char uniname2ctype_pool_str2918[sizeof("insymbolsforlegacycomputing")];
+    char uniname2ctype_pool_str2924[sizeof("mlym")];
+    char uniname2ctype_pool_str2928[sizeof("insmallformvariants")];
+    char uniname2ctype_pool_str2930[sizeof("intagbanwa")];
+    char uniname2ctype_pool_str2931[sizeof("malayalam")];
+    char uniname2ctype_pool_str2935[sizeof("incyrillicextendedb")];
+    char uniname2ctype_pool_str2945[sizeof("olonal")];
+    char uniname2ctype_pool_str2950[sizeof("palmyrene")];
+    char uniname2ctype_pool_str2956[sizeof("thaa")];
+    char uniname2ctype_pool_str2959[sizeof("otheridstart")];
+    char uniname2ctype_pool_str2960[sizeof("thai")];
+    char uniname2ctype_pool_str2961[sizeof("tangut")];
+    char uniname2ctype_pool_str2962[sizeof("thaana")];
+    char uniname2ctype_pool_str2964[sizeof("emojipresentation")];
+    char uniname2ctype_pool_str2965[sizeof("inethiopicextended")];
+    char uniname2ctype_pool_str2974[sizeof("nagmundari")];
+    char uniname2ctype_pool_str2980[sizeof("nl")];
+    char uniname2ctype_pool_str2985[sizeof("inlatin1supplement")];
+    char uniname2ctype_pool_str3007[sizeof("tirh")];
+    char uniname2ctype_pool_str3009[sizeof("hangul")];
+    char uniname2ctype_pool_str3011[sizeof("talu")];
+    char uniname2ctype_pool_str3017[sizeof("buhid")];
+    char uniname2ctype_pool_str3034[sizeof("paragraphseparator")];
+    char uniname2ctype_pool_str3035[sizeof("graphemeclusterbreak=spacingmark")];
+    char uniname2ctype_pool_str3040[sizeof("telu")];
+    char uniname2ctype_pool_str3042[sizeof("otherlowercase")];
+    char uniname2ctype_pool_str3046[sizeof("ogham")];
+    char uniname2ctype_pool_str3047[sizeof("changeswhencasemapped")];
+    char uniname2ctype_pool_str3053[sizeof("intangutcomponents")];
+    char uniname2ctype_pool_str3056[sizeof("otherletter")];
+    char uniname2ctype_pool_str3060[sizeof("taitham")];
+    char uniname2ctype_pool_str3068[sizeof("graphemeclusterbreak=cr")];
+    char uniname2ctype_pool_str3077[sizeof("cwu")];
+    char uniname2ctype_pool_str3083[sizeof("graphemeclusterbreak=regionalindicator")];
+    char uniname2ctype_pool_str3096[sizeof("nushu")];
+    char uniname2ctype_pool_str3103[sizeof("sunuwar")];
+    char uniname2ctype_pool_str3112[sizeof("noncharactercodepoint")];
+    char uniname2ctype_pool_str3114[sizeof("softdotted")];
+    char uniname2ctype_pool_str3127[sizeof("omath")];
+    char uniname2ctype_pool_str3129[sizeof("inbassavah")];
+    char uniname2ctype_pool_str3138[sizeof("inottomansiyaqnumbers")];
+    char uniname2ctype_pool_str3149[sizeof("ingaray")];
+    char uniname2ctype_pool_str3151[sizeof("warangciti")];
+    char uniname2ctype_pool_str3158[sizeof("ugar")];
+    char uniname2ctype_pool_str3159[sizeof("inprivateusearea")];
+    char uniname2ctype_pool_str3160[sizeof("inbuhid")];
+    char uniname2ctype_pool_str3179[sizeof("dash")];
+    char uniname2ctype_pool_str3185[sizeof("inarabicpresentationformsb")];
+    char uniname2ctype_pool_str3187[sizeof("indivesakuru")];
+    char uniname2ctype_pool_str3201[sizeof("hexdigit")];
+    char uniname2ctype_pool_str3202[sizeof("inalphabeticpresentationforms")];
+    char uniname2ctype_pool_str3205[sizeof("othersymbol")];
+    char uniname2ctype_pool_str3208[sizeof("extendedpictographic")];
+    char uniname2ctype_pool_str3211[sizeof("changeswhentitlecased")];
+    char uniname2ctype_pool_str3218[sizeof("ogrext")];
+    char uniname2ctype_pool_str3238[sizeof("nbat")];
+    char uniname2ctype_pool_str3239[sizeof("insuperscriptsandsubscripts")];
+    char uniname2ctype_pool_str3247[sizeof("nabataean")];
+    char uniname2ctype_pool_str3253[sizeof("intangutsupplement")];
+    char uniname2ctype_pool_str3254[sizeof("inlowsurrogates")];
+    char uniname2ctype_pool_str3257[sizeof("inyijinghexagramsymbols")];
+    char uniname2ctype_pool_str3259[sizeof("inmahjongtiles")];
+    char uniname2ctype_pool_str3265[sizeof("inletterlikesymbols")];
+    char uniname2ctype_pool_str3267[sizeof("inbamumsupplement")];
+    char uniname2ctype_pool_str3273[sizeof("incurrencysymbols")];
+    char uniname2ctype_pool_str3274[sizeof("incombininghalfmarks")];
+    char uniname2ctype_pool_str3290[sizeof("wancho")];
+    char uniname2ctype_pool_str3292[sizeof("inarabicsupplement")];
+    char uniname2ctype_pool_str3312[sizeof("oldnortharabian")];
+    char uniname2ctype_pool_str3318[sizeof("khitansmallscript")];
+    char uniname2ctype_pool_str3328[sizeof("inlatinextendedg")];
+    char uniname2ctype_pool_str3330[sizeof("sylo")];
+    char uniname2ctype_pool_str3331[sizeof("inarabicmathematicalalphabeticsymbols")];
+    char uniname2ctype_pool_str3332[sizeof("nshu")];
+    char uniname2ctype_pool_str3340[sizeof("elba")];
+    char uniname2ctype_pool_str3344[sizeof("invithkuqi")];
+    char uniname2ctype_pool_str3357[sizeof("inhangulsyllables")];
+    char uniname2ctype_pool_str3361[sizeof("changeswhenuppercased")];
+    char uniname2ctype_pool_str3371[sizeof("intifinagh")];
+    char uniname2ctype_pool_str3389[sizeof("graphemeclusterbreak=t")];
+    char uniname2ctype_pool_str3391[sizeof("graphemeclusterbreak=lvt")];
+    char uniname2ctype_pool_str3401[sizeof("tamil")];
+    char uniname2ctype_pool_str3402[sizeof("mathsymbol")];
+    char uniname2ctype_pool_str3403[sizeof("tulutigalari")];
+    char uniname2ctype_pool_str3405[sizeof("otherdefaultignorablecodepoint")];
+    char uniname2ctype_pool_str3414[sizeof("wcho")];
+    char uniname2ctype_pool_str3422[sizeof("insupplementalarrowsa")];
+    char uniname2ctype_pool_str3431[sizeof("inarabicextendedb")];
+    char uniname2ctype_pool_str3446[sizeof("rejang")];
+    char uniname2ctype_pool_str3447[sizeof("graphemeclusterbreak=extend")];
+    char uniname2ctype_pool_str3448[sizeof("graphemeclusterbreak=prepend")];
+    char uniname2ctype_pool_str3455[sizeof("finalpunctuation")];
+    char uniname2ctype_pool_str3460[sizeof("inpsalterpahlavi")];
+    char uniname2ctype_pool_str3463[sizeof("newa")];
+    char uniname2ctype_pool_str3464[sizeof("inmathematicaloperators")];
+    char uniname2ctype_pool_str3476[sizeof("phlp")];
+    char uniname2ctype_pool_str3480[sizeof("deva")];
+    char uniname2ctype_pool_str3494[sizeof("devanagari")];
+    char uniname2ctype_pool_str3503[sizeof("newtailue")];
+    char uniname2ctype_pool_str3504[sizeof("cf")];
+    char uniname2ctype_pool_str3522[sizeof("pf")];
+    char uniname2ctype_pool_str3532[sizeof("whitespace")];
+    char uniname2ctype_pool_str3543[sizeof("elbasan")];
+    char uniname2ctype_pool_str3548[sizeof("othermath")];
+    char uniname2ctype_pool_str3551[sizeof("digit")];
+    char uniname2ctype_pool_str3557[sizeof("cyprominoan")];
+    char uniname2ctype_pool_str3561[sizeof("insupplementalarrowsc")];
+    char uniname2ctype_pool_str3563[sizeof("tibt")];
+    char uniname2ctype_pool_str3570[sizeof("tibetan")];
+    char uniname2ctype_pool_str3580[sizeof("bassavah")];
+    char uniname2ctype_pool_str3585[sizeof("insupplementalmathematicaloperators")];
+    char uniname2ctype_pool_str3613[sizeof("otherpunctuation")];
+    char uniname2ctype_pool_str3614[sizeof("sgnw")];
+    char uniname2ctype_pool_str3629[sizeof("ugaritic")];
+    char uniname2ctype_pool_str3650[sizeof("tutg")];
+    char uniname2ctype_pool_str3654[sizeof("changeswhenlowercased")];
+    char uniname2ctype_pool_str3663[sizeof("cwl")];
+    char uniname2ctype_pool_str3670[sizeof("inlinearbsyllabary")];
+    char uniname2ctype_pool_str3676[sizeof("inplayingcards")];
+    char uniname2ctype_pool_str3689[sizeof("modifiercombiningmark")];
+    char uniname2ctype_pool_str3707[sizeof("sylotinagri")];
+    char uniname2ctype_pool_str3714[sizeof("idcompatmathcontinue")];
+    char uniname2ctype_pool_str3720[sizeof("inpahawhhmong")];
+    char uniname2ctype_pool_str3729[sizeof("idcompatmathstart")];
+    char uniname2ctype_pool_str3732[sizeof("hanifirohingya")];
+    char uniname2ctype_pool_str3757[sizeof("deprecated")];
+    char uniname2ctype_pool_str3766[sizeof("oldsoutharabian")];
+    char uniname2ctype_pool_str3788[sizeof("shaw")];
+    char uniname2ctype_pool_str3793[sizeof("tavt")];
+    char uniname2ctype_pool_str3810[sizeof("wspace")];
+    char uniname2ctype_pool_str3814[sizeof("graphemeclusterbreak=l")];
+    char uniname2ctype_pool_str3820[sizeof("graphemeclusterbreak=control")];
+    char uniname2ctype_pool_str3829[sizeof("cypriot")];
+    char uniname2ctype_pool_str3835[sizeof("cyrillic")];
+    char uniname2ctype_pool_str3854[sizeof("inhanguljamoextendedb")];
+    char uniname2ctype_pool_str3877[sizeof("inalchemicalsymbols")];
+    char uniname2ctype_pool_str3882[sizeof("insupplementalpunctuation")];
+    char uniname2ctype_pool_str3894[sizeof("khudawadi")];
+    char uniname2ctype_pool_str3925[sizeof("aghb")];
+    char uniname2ctype_pool_str3928[sizeof("graphemeclusterbreak=zwj")];
+    char uniname2ctype_pool_str3949[sizeof("alphabetic")];
+    char uniname2ctype_pool_str3950[sizeof("cwcf")];
+    char uniname2ctype_pool_str3979[sizeof("elym")];
+    char uniname2ctype_pool_str3996[sizeof("ecomp")];
+    char uniname2ctype_pool_str4018[sizeof("inethiopicextendedb")];
+    char uniname2ctype_pool_str4032[sizeof("elymaic")];
+    char uniname2ctype_pool_str4060[sizeof("inglagoliticsupplement")];
+    char uniname2ctype_pool_str4097[sizeof("garay")];
+    char uniname2ctype_pool_str4109[sizeof("unknown")];
+    char uniname2ctype_pool_str4119[sizeof("soyombo")];
+    char uniname2ctype_pool_str4148[sizeof("inlatinextendedb")];
+    char uniname2ctype_pool_str4160[sizeof("divesakuru")];
+    char uniname2ctype_pool_str4164[sizeof("kayahli")];
+    char uniname2ctype_pool_str4175[sizeof("othergraphemeextend")];
+    char uniname2ctype_pool_str4179[sizeof("inhighprivateusesurrogates")];
+    char uniname2ctype_pool_str4184[sizeof("any")];
+    char uniname2ctype_pool_str4212[sizeof("dashpunctuation")];
+    char uniname2ctype_pool_str4222[sizeof("ethiopic")];
+    char uniname2ctype_pool_str4223[sizeof("symbol")];
+    char uniname2ctype_pool_str4239[sizeof("openpunctuation")];
+    char uniname2ctype_pool_str4248[sizeof("hluw")];
+    char uniname2ctype_pool_str4254[sizeof("tagb")];
+    char uniname2ctype_pool_str4356[sizeof("hyphen")];
+    char uniname2ctype_pool_str4418[sizeof("incypriotsyllabary")];
+    char uniname2ctype_pool_str4425[sizeof("dupl")];
+    char uniname2ctype_pool_str4468[sizeof("modifiersymbol")];
+    char uniname2ctype_pool_str4484[sizeof("inyisyllables")];
+    char uniname2ctype_pool_str4509[sizeof("inhalfwidthandfullwidthforms")];
+    char uniname2ctype_pool_str4517[sizeof("tfng")];
+    char uniname2ctype_pool_str4545[sizeof("dep")];
+    char uniname2ctype_pool_str4547[sizeof("inegyptianhieroglyphsextendeda")];
+    char uniname2ctype_pool_str4562[sizeof("inbopomofoextended")];
+    char uniname2ctype_pool_str4609[sizeof("telugu")];
+    char uniname2ctype_pool_str4638[sizeof("tglg")];
+    char uniname2ctype_pool_str4652[sizeof("tagalog")];
+    char uniname2ctype_pool_str4670[sizeof("inlatinextendedf")];
+    char uniname2ctype_pool_str4687[sizeof("changeswhencasefolded")];
+    char uniname2ctype_pool_str4703[sizeof("tifinagh")];
+    char uniname2ctype_pool_str4728[sizeof("graphemeclusterbreak=v")];
+    char uniname2ctype_pool_str4729[sizeof("graphemeclusterbreak=lv")];
+    char uniname2ctype_pool_str4734[sizeof("inegyptianhieroglyphs")];
+    char uniname2ctype_pool_str4736[sizeof("signwriting")];
+    char uniname2ctype_pool_str4747[sizeof("inegyptianhieroglyphformatcontrols")];
+    char uniname2ctype_pool_str4756[sizeof("graphemeclusterbreak=lf")];
+    char uniname2ctype_pool_str4771[sizeof("insupplementaryprivateuseareaa")];
+    char uniname2ctype_pool_str4821[sizeof("inhebrew")];
+    char uniname2ctype_pool_str4865[sizeof("inboxdrawing")];
+    char uniname2ctype_pool_str4896[sizeof("insupplementalarrowsb")];
+    char uniname2ctype_pool_str4902[sizeof("olduyghur")];
+    char uniname2ctype_pool_str4917[sizeof("upper")];
+    char uniname2ctype_pool_str5031[sizeof("inhighsurrogates")];
+    char uniname2ctype_pool_str5043[sizeof("uppercase")];
+    char uniname2ctype_pool_str5216[sizeof("inhangulcompatibilityjamo")];
+    char uniname2ctype_pool_str5272[sizeof("defaultignorablecodepoint")];
+    char uniname2ctype_pool_str5437[sizeof("uppercaseletter")];
+    char uniname2ctype_pool_str5541[sizeof("egyp")];
+    char uniname2ctype_pool_str5603[sizeof("insupplementalsymbolsandpictographs")];
+    char uniname2ctype_pool_str5646[sizeof("unifiedideograph")];
+    char uniname2ctype_pool_str5647[sizeof("pahawhhmong")];
+    char uniname2ctype_pool_str5666[sizeof("duployan")];
+    char uniname2ctype_pool_str5914[sizeof("nyiakengpuachuehmong")];
+    char uniname2ctype_pool_str6073[sizeof("zyyy")];
+    char uniname2ctype_pool_str6245[sizeof("insupplementaryprivateuseareab")];
+    char uniname2ctype_pool_str6528[sizeof("hebrew")];
+    char uniname2ctype_pool_str6807[sizeof("egyptianhieroglyphs")];
 #endif /* USE_UNICODE_PROPERTIES */
   };
 static const struct uniname2ctype_pool_t uniname2ctype_pool_contents =
@@ -42763,943 +45485,968 @@ static const struct uniname2ctype_pool_t uniname2ctype_pool_contents =
 #ifndef USE_UNICODE_PROPERTIES
     "word",
 #else /* USE_UNICODE_PROPERTIES */
-    "yi",
-    "yiii",
     "lana",
     "lina",
+    "yi",
+    "mn",
     "maka",
     "mani",
-    "mn",
-    "miao",
+    "yiii",
     "lo",
-    "ci",
     "lao",
     "laoo",
+    "miao",
     "inkannada",
+    "innko",
     "cn",
+    "ci",
+    "co",
+    "gara",
     "pi",
-    "innko",
-    "z",
     "gran",
-    "co",
+    "z",
     "lineara",
     "mark",
-    "yezi",
     "po",
     "me",
-    "cari",
-    "inkharoshthi",
-    "kana",
     "loe",
-    "m",
-    "grek",
+    "inkiratrai",
     "mro",
     "mroo",
+    "inkharoshthi",
+    "cari",
     "carian",
+    "grek",
+    "yezi",
     "geor",
     "greek",
-    "gonm",
     "mendekikakui",
-    "pe",
     "mero",
+    "kana",
+    "m",
+    "pe",
+    "gonm",
+    "meeteimayek",
     "inosmanya",
-    "cakm",
-    "inmanichaean",
     "inmro",
+    "inmanichaean",
     "inmiao",
-    "inchakma",
-    "c",
-    "mandaic",
-    "meeteimayek",
-    "zzzz",
+    "cakm",
     "inarmenian",
+    "krai",
+    "common",
+    "inchakma",
     "inmyanmar",
+    "mandaic",
     "inmakasar",
-    "common",
+    "c",
+    "zzzz",
+    "inideographicsymbolsandpunctuation",
+    "inkhmer",
     "lm",
     "marc",
+    "qaai",
+    "combiningmark",
     "inrunic",
     "incarian",
-    "inideographicsymbolsandpunctuation",
-    "inkhmer",
-    "qaai",
     "inahom",
-    "merc",
+    "prependedconcatenationmark",
     "inchorasmian",
-    "combiningmark",
-    "lc",
     "perm",
-    "mc",
-    "connectorpunctuation",
+    "merc",
     "cans",
-    "incuneiformnumbersandpunctuation",
-    "armi",
-    "cc",
-    "armn",
-    "incherokee",
-    "prependedconcatenationmark",
-    "incuneiform",
+    "connectorpunctuation",
     "inavestan",
+    "incuneiformnumbersandpunctuation",
     "inipaextensions",
-    "pc",
-    "armenian",
     "insharada",
-    "vai",
-    "vaii",
-    "inmarchen",
+    "incherokee",
     "makasar",
-    "masaramgondi",
     "inarrows",
-    "incyrillic",
-    "incham",
+    "masaramgondi",
+    "lc",
+    "incuneiform",
+    "armn",
+    "mc",
+    "armi",
+    "armenian",
+    "inmarchen",
+    "lineseparator",
     "qmark",
-    "ri",
-    "qaac",
+    "cc",
     "insamaritan",
-    "latn",
     "inmasaramgondi",
-    "inthaana",
+    "pc",
+    "inscriptionalparthian",
+    "qaac",
+    "mcm",
+    "incham",
+    "incyrillic",
+    "inzanabazarsquare",
+    "inkhmersymbols",
+    "latn",
+    "ri",
+    "pcm",
     "latin",
+    "inthaana",
     "inthai",
-    "lineseparator",
-    "pcm",
     "inkatakana",
     "inkaithi",
-    "inscriptionalparthian",
-    "initialpunctuation",
-    "mtei",
-    "inzanabazarsquare",
-    "inkhmersymbols",
     "insyriac",
-    "intakri",
-    "arabic",
-    "katakana",
-    "prti",
     "zs",
-    "ascii",
+    "initialpunctuation",
+    "mtei",
     "cs",
-    "ps",
     "mand",
-    "privateuse",
-    "inruminumeralsymbols",
-    "inmyanmarextendeda",
+    "ps",
+    "intakri",
     "modi",
-    "incjkcompatibilityforms",
     "inkanaextendeda",
-    "incjkcompatibilityideographs",
-    "brai",
     "mend",
+    "inruminumeralsymbols",
     "ideo",
-    "letter",
-    "l",
-    "inmeeteimayek",
+    "prti",
+    "arabic",
+    "brai",
+    "katakana",
     "inideographicdescriptioncharacters",
+    "ascii",
+    "innandinagari",
+    "privateuse",
+    "inoldnortharabian",
+    "sk",
+    "so",
+    "incjkcompatibilityforms",
     "yezidi",
     "knda",
-    "innandinagari",
+    "inmyanmarextendeda",
+    "incjkcompatibilityideographs",
     "kannada",
-    "inmodi",
-    "inlao",
     "xidcontinue",
-    "inoldnortharabian",
-    "intransportandmapsymbols",
-    "letternumber",
-    "gothic",
-    "inlineara",
+    "letter",
+    "inmodi",
+    "inmeeteimayek",
     "inmendekikakui",
-    "mongolian",
-    "inmiscellaneousmathematicalsymbolsa",
+    "onao",
+    "sora",
+    "inmedefaidrin",
+    "kiratrai",
     "inspecials",
-    "grlink",
     "brahmi",
-    "inemoticons",
-    "kali",
+    "letternumber",
+    "inchesssymbols",
     "inolditalic",
+    "oriya",
+    "inmiscellaneousmathematicalsymbolsa",
+    "intransportandmapsymbols",
+    "incb=extend",
     "xidc",
-    "inmedefaidrin",
-    "inchesssymbols",
-    "incjkcompatibilityideographssupplement",
-    "kits",
-    "inadlam",
-    "psalterpahlavi",
-    "incommonindicnumberforms",
-    "lt",
-    "innewa",
-    "sk",
-    "control",
-    "inkawi",
+    "inemoticons",
+    "samr",
+    "inoldsogdian",
     "inancientsymbols",
-    "palm",
-    "inlycian",
-    "so",
-    "patternwhitespace",
+    "incommonindicnumberforms",
+    "samaritan",
+    "psalterpahlavi",
+    "inmyanmarextendedc",
+    "kits",
+    "insundanese",
+    "incb=consonant",
+    "gothic",
     "inmandaic",
-    "idc",
-    "meroiticcursive",
-    "intoto",
-    "vs",
     "xids",
-    "inwarangciti",
-    "sora",
-    "inopticalcharacterrecognition",
-    "kawi",
-    "inoldsogdian",
-    "inmalayalam",
-    "bamum",
-    "inkanasupplement",
-    "insundanese",
-    "grext",
-#endif /* USE_UNICODE_PROPERTIES */
-    "print",
-#ifndef USE_UNICODE_PROPERTIES
-    "punct",
-    "alpha",
-#else /* USE_UNICODE_PROPERTIES */
-    "intaitham",
-    "lower",
-    "patternsyntax",
-    "joinc",
-    "inoldsoutharabian",
-    "incjkstrokes",
-    "batk",
-    "samr",
-    "inwancho",
-    "batak",
-    "patws",
-    "samaritan",
-    "idsbinaryoperator",
+    "inznamennymusicalnotation",
     "pauc",
-    "insmallkanaextension",
     "sm",
-    "indominotiles",
-#endif /* USE_UNICODE_PROPERTIES */
-    "alnum",
-#ifdef USE_UNICODE_PROPERTIES
-    "inznamennymusicalnotation",
-    "insylotinagri",
-    "inugaritic",
-    "incontrolpictures",
-    "inlinearbideograms",
-    "inmusicalsymbols",
     "s",
-    "ital",
-    "inmodifiertoneletters",
-    "inancientgreekmusicalnotation",
+    "meroiticcursive",
+    "inoldsoutharabian",
+    "inugaritic",
     "lisu",
-    "lowercase",
-    "cwcm",
+    "idc",
+    "incjkcompatibilityideographssupplement",
+    "patternwhitespace",
+    "bamum",
+    "inancientgreekmusicalnotation",
+    "idsbinaryoperator",
+    "lt",
+    "incjkstrokes",
+    "insunuwar",
+    "insaurashtra",
+    "indominotiles",
+    "intoto",
     "sc",
+    "idsunaryoperator",
+    "inmodifiertoneletters",
+    "inopticalcharacterrecognition",
+    "l",
+    "batk",
+    "inkanasupplement",
+    "osage",
+    "batak",
+    "inmusicalsymbols",
+    "incaucasianalbanian",
+    "patws",
     "bass",
     "ids",
-    "inlatinextendeda",
-    "intaile",
+    "grext",
+    "inlao",
+    "vai",
+    "vaii",
+    "inolonal",
+    "mongolian",
+    "osma",
+#endif /* USE_UNICODE_PROPERTIES */
+    "print",
+#ifndef USE_UNICODE_PROPERTIES
+    "punct",
+    "alpha",
+#else /* USE_UNICODE_PROPERTIES */
+    "inlineara",
+    "intaitham",
+    "grlink",
     "inmiscellaneoussymbols",
+    "pd",
     "inmiscellaneoussymbolsandarrows",
-    "incaucasianalbanian",
+    "kali",
     "inmiscellaneoussymbolsandpictographs",
+    "control",
+    "inancientgreeknumbers",
+    "incontrolpictures",
+    "inadlam",
+    "han",
+    "hani",
+    "hano",
+    "runr",
+    "sind",
+    "hanunoo",
+    "palm",
+    "inkhojki",
+    "inkhudawadi",
+    "inlycian",
     "inoldturkic",
-    "insaurashtra",
-    "incyrillicextendeda",
+    "hira",
+    "incountingrodnumerals",
+    "odi",
     "idcontinue",
-    "intaixuanjingsymbols",
-    "intamil",
-    "inmultani",
-    "inlatinextendede",
-    "pd",
-    "bali",
-    "blank",
     "idst",
-    "inlydian",
-    "innewtailue",
-    "bengali",
-    "runr",
-    "ll",
+    "inolduyghur",
+    "incb=linker",
+    "inmalayalam",
+    "lu",
+    "inspacingmodifierletters",
+    "bamu",
     "indeseret",
-    "inancientgreeknumbers",
+    "sundanese",
     "idstart",
-    "zl",
-    "inmeeteimayekextensions",
-    "balinese",
-    "incyrillicextendedc",
-    "inspacingmodifierletters",
-    "inearlydynasticcuneiform",
-    "plrd",
-    "canadianaboriginal",
-    "sind",
-    "inlatinextendedc",
-    "uideo",
-    "incountingrodnumerals",
-    "zinh",
-    "dia",
-    "di",
-    "inkhudawadi",
-    "inhanifirohingya",
-    "diak",
+    "saur",
+    "insmallkanaextension",
+    "guru",
+    "paucinhau",
+    "gurmukhi",
+    "insylotinagri",
+    "cased",
+    "inlinearbideograms",
     "gong",
     "ingrantha",
-    "bidic",
-    "xidstart",
-#endif /* USE_UNICODE_PROPERTIES */
-    "xdigit",
-#ifndef USE_UNICODE_PROPERTIES
-    "upper",
-    "ascii",
-#else /* USE_UNICODE_PROPERTIES */
     "mong",
-    "cased",
-    "inhiragana",
-    "sinhala",
-    "adlm",
-    "xsux",
-    "glagolitic",
+    "joinc",
     "sterm",
-    "bamu",
-    "georgian",
+    "inkaktoviknumerals",
+    "limbu",
+    "oidc",
     "inosage",
-    "gunjalagondi",
-    "phoenician",
-    "inolduyghur",
-    "multani",
-    "kaithi",
-    "joincontrol",
-    "runic",
-    "ingeneralpunctuation",
-    "inmahajani",
+    "incjkunifiedideographsextensiona",
     "incyrillicsupplement",
-    "lowercaseletter",
-    "marchen",
-    "graphemelink",
+    "inmeeteimayekextensions",
+    "georgian",
+    "incjkunifiedideographsextensioni",
+    "idsu",
+    "ingeneralpunctuation",
+#endif /* USE_UNICODE_PROPERTIES */
+    "alnum",
+#ifdef USE_UNICODE_PROPERTIES
+    "bidic",
     "ingeorgian",
-    "khojki",
-    "cham",
-    "inogham",
-    "cher",
-    "chakma",
-    "inkaktoviknumerals",
-    "emoji",
+    "quotationmark",
+    "incherokeesupplement",
+    "incjkunifiedideographsextensione",
     "insiddham",
-    "cherokee",
-    "khar",
+    "runic",
+    "oids",
+    "ital",
+    "emoji",
     "inmongolian",
     "innagmundari",
-    "incherokeesupplement",
-    "manichaean",
-    "inolchiki",
-    "inkhitansmallscript",
-    "quotationmark",
-    "vithkuqi",
-    "variationselector",
-    "adlam",
-    "inethiopic",
-    "graphemebase",
+    "inlatinextendeda",
+    "vs",
+    "saurashtra",
+    "intaile",
+    "bali",
+    "xidstart",
+#endif /* USE_UNICODE_PROPERTIES */
+    "xdigit",
+#ifndef USE_UNICODE_PROPERTIES
+    "upper",
+    "ascii",
+    "cntrl",
+#else /* USE_UNICODE_PROPERTIES */
+    "ingurmukhi",
+    "blank",
+    "inlydian",
 #ifdef USE_UNICODE_AGE_PROPERTIES
     "age=11.0",
-    "age=12.1",
     "age=10.0",
+    "age=12.1",
     "age=12.0",
-    "age=13.0",
     "age=1.1",
-#endif /* USE_UNICODE_AGE_PROPERTIES */
-    "casedletter",
-    "ingurmukhi",
-#ifdef USE_UNICODE_AGE_PROPERTIES
+    "age=16.0",
+    "age=9.0",
     "age=2.1",
-#endif /* USE_UNICODE_AGE_PROPERTIES */
-    "incjkunifiedideographsextensiona",
-#ifdef USE_UNICODE_AGE_PROPERTIES
     "age=2.0",
-#endif /* USE_UNICODE_AGE_PROPERTIES */
-    "lu",
-#ifdef USE_UNICODE_AGE_PROPERTIES
-    "age=3.1",
-    "age=9.0",
-    "age=3.0",
-    "age=3.2",
-    "age=8.0",
-#endif /* USE_UNICODE_AGE_PROPERTIES */
-    "intamilsupplement",
-#ifdef USE_UNICODE_AGE_PROPERTIES
     "age=6.1",
+    "age=6.0",
 #endif /* USE_UNICODE_AGE_PROPERTIES */
-    "unknown",
+    "inlatinextendede",
 #ifdef USE_UNICODE_AGE_PROPERTIES
-    "age=6.0",
     "age=6.2",
-    "age=15.0",
+    "age=8.0",
     "age=7.0",
-    "age=6.3",
-#endif /* USE_UNICODE_AGE_PROPERTIES */
-    "cwt",
-#ifdef USE_UNICODE_AGE_PROPERTIES
-    "age=14.0",
 #endif /* USE_UNICODE_AGE_PROPERTIES */
-    "unassigned",
+    "incjkunifiedideographsextensionc",
+    "bengali",
+    "zinh",
 #ifdef USE_UNICODE_AGE_PROPERTIES
+    "age=15.1",
+    "age=15.0",
     "age=5.1",
     "age=5.0",
+    "age=14.0",
     "age=5.2",
+    "age=4.1",
+    "age=4.0",
 #endif /* USE_UNICODE_AGE_PROPERTIES */
-    "diacritic",
+    "inhanifirohingya",
+    "intamil",
+    "inmultani",
 #ifdef USE_UNICODE_AGE_PROPERTIES
-    "age=4.1",
+    "age=13.0",
 #endif /* USE_UNICODE_AGE_PROPERTIES */
-    "ahom",
+    "balinese",
+    "hatran",
 #ifdef USE_UNICODE_AGE_PROPERTIES
-    "age=4.0",
+    "age=3.1",
+    "age=3.0",
+    "age=3.2",
+    "age=6.3",
 #endif /* USE_UNICODE_AGE_PROPERTIES */
-    "incjkunifiedideographsextensione",
-    "khmr",
-    "insinhala",
-    "inmiscellaneoustechnical",
-    "saur",
-    "guru",
-    "sundanese",
     "punct",
-    "paucinhau",
-    "gurmukhi",
-    "chorasmian",
+    "incjkunifiedideographs",
+    "inhiragana",
+    "sinhala",
+    "plrd",
+    "phoenician",
     "logicalorderexception",
-    "khmer",
-    "limbu",
-    "chrs",
-    "oriya",
-    "inscriptionalpahlavi",
-    "incyrillicextendedd",
-    "incjkunifiedideographsextensionc",
-#endif /* USE_UNICODE_PROPERTIES */
-    "cntrl",
-#ifndef USE_UNICODE_PROPERTIES
-    "space",
-#else /* USE_UNICODE_PROPERTIES */
-    "inlatinextendedadditional",
+    "multani",
+    "canadianaboriginal",
+    "patternsyntax",
+    "gunjalagondi",
+    "hatr",
     "insorasompeng",
-    "radical",
+    "inearlydynasticcuneiform",
+    "marchen",
+    "graphemelink",
+    "sd",
+    "cher",
+    "cherokee",
+    "sidd",
+    "kaithi",
+    "inmahajani",
     "emojimodifier",
-    "kharoshthi",
+    "inogham",
+    "khojki",
+    "cham",
+    "chakma",
+    "khar",
     "n",
-    "math",
-    "goth",
-    "phnx",
-    "anatolianhieroglyphs",
-    "inenclosedalphanumerics",
-    "nandinagari",
+    "graphemebase",
+    "manichaean",
     "no",
-    "intangsa",
+    "inolchiki",
+    "nandinagari",
     "nko",
     "nkoo",
-    "ingreekandcoptic",
+    "sund",
+    "inethiopic",
     "p",
-    "grantha",
-    "decimalnumber",
-    "incjkunifiedideographs",
-    "intirhuta",
-    "inhatran",
+    "punctuation",
+    "ingreekandcoptic",
+    "inmeroitichieroglyphs",
+    "inphoenician",
+    "intangsa",
+    "adlm",
+    "insinhala",
+    "incyrillicextendeda",
+    "gujr",
+    "gujarati",
+    "inlatinextendedc",
+    "olower",
+    "enclosingmark",
+    "xpeo",
+    "khmr",
+    "olck",
     "linb",
-    "mult",
-    "saurashtra",
-    "kthi",
+    "ahom",
+    "chorasmian",
     "zanb",
-    "inbhaiksuki",
+    "inkangxiradicals",
+    "olchiki",
     "innabataean",
-    "inphoenician",
-    "xpeo",
     "inkanbun",
-    "inmeroitichieroglyphs",
-    "ahex",
-    "enclosingmark",
-    "sd",
-    "inelbasan",
-    "inenclosedideographicsupplement",
-    "sidd",
-    "linearb",
+    "casedletter",
+    "inbhaiksuki",
+    "sunu",
+    "intaixuanjingsymbols",
+    "chrs",
     "cpmn",
-    "inenclosedalphanumericsupplement",
-    "bidicontrol",
-    "inphaistosdisc",
-    "limb",
-    "inkangxiradicals",
-    "lepc",
-    "braille",
-    "regionalindicator",
-    "inlowsurrogates",
-    "brah",
-    "inoldhungarian",
     "beng",
+    "inscriptionalpahlavi",
+    "inelbasan",
+    "khmer",
+    "linearb",
+    "incjkunifiedideographsextensiond",
     "emojimodifierbase",
-    "inarabic",
-    "osage",
-    "inherited",
-    "incyprominoan",
-    "glag",
-    "medf",
-    "osma",
     "indogra",
-    "arab",
-    "medefaidrin",
-    "inshorthandformatcontrols",
-    "phli",
-    "inimperialaramaic",
-    "emod",
+    "adlam",
+    "regionalindicator",
+    "kharoshthi",
+    "inphaistosdisc",
+    "lepc",
+    "xsux",
     "ingreekextended",
-    "inanatolianhieroglyphs",
-    "punctuation",
-    "graphemeextend",
-    "cwl",
-    "vith",
+    "limb",
+    "sogo",
+    "sogdian",
+    "ll",
+    "emod",
+    "incyrillicextendedc",
+    "incyprominoan",
+    "zl",
     "ingeometricshapes",
-    "emojicomponent",
-    "dsrt",
-    "coptic",
-    "inkayahli",
-    "inoriya",
-    "inarabicpresentationformsa",
+    "inkhitansmallscript",
+    "math",
+    "goth",
+    "inarabic",
+    "gurungkhema",
+    "inimperialaramaic",
+    "inmiscellaneoustechnical",
+    "intamilsupplement",
+    "arab",
+    "grantha",
+    "intirhuta",
+    "inhatran",
+    "mult",
+    "intulutigalari",
     "inbasiclatin",
-    "incjkunifiedideographsextensiond",
-    "wara",
+    "inoldhungarian",
+    "insogdian",
+    "indingbats",
+    "ogam",
+    "inarabicpresentationformsa",
+    "vithkuqi",
+    "kthi",
+    "brah",
+    "coptic",
+    "ideographic",
+    "emojicomponent",
+    "takri",
+    "invai",
+    "ingurungkhema",
+    "inherited",
+    "radical",
+    "dia",
+    "di",
+    "diak",
     "sinh",
-    "sund",
+    "glagolitic",
+    "gukh",
     "shavian",
-    "insundanesesupplement",
-    "inyezidi",
-    "bhks",
-    "bhaiksuki",
+    "joincontrol",
+    "takr",
     "inhanunoo",
-    "intangut",
-    "sogdian",
-    "inlatinextendedd",
-    "sogo",
-    "insinhalaarchaicnumbers",
-    "ideographic",
-    "ugar",
-    "deseret",
-    "odi",
-    "copt",
-    "imperialaramaic",
-    "insogdian",
-    "indingbats",
-    "format",
-    "ininscriptionalpahlavi",
-    "lyci",
     "ininscriptionalparthian",
+    "ininscriptionalpahlavi",
+    "taile",
     "grbase",
-    "lycian",
-    "inbatak",
-    "cprt",
-    "inunifiedcanadianaboriginalsyllabicsextendeda",
-    "mymr",
-    "myanmar",
-    "intibetan",
-    "intags",
-    "asciihexdigit",
-    "sentenceterminal",
+    "graphemeextend",
+    "imperialaramaic",
+    "copt",
+    "bidicontrol",
     "nand",
-    "inblockelements",
-    "inornamentaldingbats",
-    "inethiopicextendeda",
-    "innumberforms",
-    "cwcf",
-    "oidc",
+    "intangut",
     "bopo",
-    "cuneiform",
-    "caseignorable",
+    "osge",
+    "cprt",
+    "orkh",
+    "sorasompeng",
+    "intags",
+    "inenclosedideographicsupplement",
     "inoldpersian",
-    "cwu",
-    "inelymaic",
-    "insoyombo",
+    "inanatolianhieroglyphs",
+    "oldpersian",
     "ingeometricshapesextended",
-    "incjkcompatibility",
-    "inmyanmarextendedb",
-    "innushu",
-    "inkanaextendedb",
-    "olck",
-    "inbyzantinemusicalsymbols",
-    "olchiki",
-    "inkatakanaphoneticextensions",
-    "incoptic",
-    "oids",
-    "inarabicextendeda",
-    "modifierletter",
-    "incjksymbolsandpunctuation",
-    "olower",
-    "bopomofo",
-    "inlisu",
-    "inoldpermic",
-    "innoblock",
-    "ext",
-    "inunifiedcanadianaboriginalsyllabics",
-    "takri",
-    "inbraillepatterns",
-    "invai",
-    "alpha",
-    "inbalinese",
-    "sorasompeng",
-    "closepunctuation",
-    "hani",
-    "inmayannumerals",
-    "han",
-    "inmiscellaneousmathematicalsymbolsb",
-    "inlepcha",
-    "patsyn",
-    "inlisusupplement",
-    "insyriacsupplement",
-    "hano",
-    "newa",
+    "inbatak",
+    "glag",
+    "bhks",
+    "inblockelements",
+    "bhaiksuki",
+    "incyrillicextendedd",
+    "term",
+    "innumberforms",
+    "intibetan",
+    "tnsa",
     "spacingmark",
-    "inpalmyrene",
-    "takr",
+    "tangsa",
+    "inshavian",
+    "inkanaextendedb",
+    "diacritic",
+    "bopomofo",
+    "insinhalaarchaicnumbers",
 #endif /* USE_UNICODE_PROPERTIES */
-    "xposixpunct",
+    "space",
 #ifndef USE_UNICODE_PROPERTIES
-    "lower",
+    "xposixpunct",
 #else /* USE_UNICODE_PROPERTIES */
-    "inkhojki",
-    "taile",
-    "assigned",
-    "hanunoo",
-    "hira",
-    "inarabicextendedc",
-    "newtailue",
-    "space",
-    "intelugu",
-    "lydi",
-    "idsb",
-    "extpict",
-    "lydian",
-    "inethiopicsupplement",
-    "sarb",
-    "ugaritic",
-    "inyiradicals",
-    "inphoneticextensions",
-    "sharada",
-    "zanabazarsquare",
+    "inarabicextendeda",
+    "innushu",
+    "incjksymbolsandpunctuation",
+    "hang",
+    "inoldpermic",
+    "oldpermic",
+    "anatolianhieroglyphs",
+    "inenclosedalphanumerics",
+    "inbyzantinemusicalsymbols",
+    "ingujarati",
+    "cntrl",
     "bugi",
-    "word",
-    "term",
+    "inmyanmarextendedb",
+    "inlatinextendedadditional",
+    "sogd",
+    "ingunjalagondi",
+    "inlisu",
+    "insundanesesupplement",
     "separator",
+    "sarb",
+    "assigned",
+    "hiragana",
+    "inrejang",
+    "zanabazarsquare",
+    "inlatinextendedd",
+    "format",
+    "inkayahli",
+    "inoriya",
     "ingeorgiansupplement",
-    "sogd",
-    "extender",
-    "shrd",
-#endif /* USE_UNICODE_PROPERTIES */
-    "graph",
-#ifdef USE_UNICODE_PROPERTIES
-    "tnsa",
-    "tangsa",
-    "phag",
-    "dogra",
-    "inhanguljamo",
-    "inshavian",
-    "siddham",
-    "cf",
-    "inunifiedcanadianaboriginalsyllabicsextended",
+    "incoptic",
+    "intodhri",
+    "innewa",
     "buginese",
-    "inmongoliansupplement",
-    "cyrl",
-    "inhanguljamoextendeda",
-    "pf",
+    "insyriacsupplement",
+    "inkawi",
+    "wara",
+    "hmng",
+    "inbraillepatterns",
+    "inmiscellaneousmathematicalsymbolsb",
+    "phli",
+    "decimalnumber",
+    "inarabicextendedc",
+    "inyezidi",
+    "braille",
+    "inornamentaldingbats",
+    "toto",
+    "idsb",
+    "variationselector",
+    "innyiakengpuachuehmong",
+    "asciihexdigit",
+    "phnx",
     "number",
-    "inphoneticextensionssupplement",
-    "dogr",
-    "mlym",
-    "incopticepactnumbers",
-    "malayalam",
+    "inwarangciti",
+    "taiviet",
+    "caseignorable",
+    "kawi",
+#endif /* USE_UNICODE_PROPERTIES */
+    "lower",
+#ifdef USE_UNICODE_PROPERTIES
+    "ougr",
+    "mahj",
+    "indevanagari",
+    "surrogate",
+    "lyci",
+    "mahajani",
+    "inenclosedalphanumericsupplement",
+    "lycian",
+    "sharada",
+    "mymr",
+    "myanmar",
     "inbamum",
+    "intelugu",
+    "incjkunifiedideographsextensiong",
+    "todr",
+    "indevanagariextendeda",
+    "medf",
+    "todhri",
+    "inethiopicsupplement",
+    "inwancho",
+    "medefaidrin",
+    "shrd",
+    "inkatakanaphoneticextensions",
+    "inshorthandformatcontrols",
+    "caucasianalbanian",
+    "ahex",
+    "insymbolsforlegacycomputingsupplement",
     "nd",
-    "insuttonsignwriting",
-    "inethiopicextended",
-    "shaw",
-    "palmyrene",
-    "soyo",
+    "insoyombo",
+    "other",
+    "otheridcontinue",
+    "khoj",
+    "avestan",
+    "othernumber",
+    "sentenceterminal",
+    "siddham",
+    "closepunctuation",
+    "lowercase",
+    "olditalic",
+    "oldhungarian",
+    "inlisusupplement",
+    "innoblock",
+    "inunifiedcanadianaboriginalsyllabicsextendeda",
+    "inelymaic",
+    "cwcm",
+    "inbalinese",
+    "invariationselectors",
+    "terminalpunctuation",
+    "inpalmyrene",
+    "alpha",
+    "inlepcha",
+    "incjkcompatibility",
+    "rjng",
+    "inhanguljamo",
+    "dsrt",
+    "inverticalforms",
+    "phag",
+    "incopticepactnumbers",
     "incjkunifiedideographsextensionh",
-    "sgnw",
-    "toto",
-    "caucasianalbanian",
-    "inmathematicalalphanumericsymbols",
-    "incjkunifiedideographsextensiong",
-    "hatran",
-    "taiviet",
-    "meroitichieroglyphs",
-    "ingeorgianextended",
-    "incjkunifiedideographsextensionf",
-    "oldpersian",
-    "induployan",
-    "incyrillicextendedb",
-    "dash",
-    "hatr",
-    "innyiakengpuachuehmong",
+    "invedicextensions",
+    "inhanguljamoextendeda",
+    "cuneiform",
+    "inmayannumerals",
+    "otheralphabetic",
+    "hmnp",
+    "insuttonsignwriting",
     "incombiningdiacriticalmarks",
-    "nl",
+    "deseret",
+    "avst",
+    "inmeroiticcursive",
     "incombiningdiacriticalmarksforsymbols",
-    "khudawadi",
-    "incjkradicalssupplement",
     "inglagolitic",
-    "orkh",
-    "syrc",
-    "surrogate",
-    "indevanagari",
-    "avestan",
-    "oldpermic",
-    "ethi",
-    "ogam",
-    "rohg",
+    "vith",
+    "patsyn",
+    "lydi",
+    "lydian",
+    "oldturkic",
+    "innewtailue",
+    "hebr",
+    "intaiviet",
+    "inphagspa",
+    "inenclosedcjklettersandmonths",
+    "hung",
+    "inyiradicals",
+    "inunifiedcanadianaboriginalsyllabics",
+    "uideo",
     "idstrinaryoperator",
+    "word",
+    "invariationselectorssupplement",
     "java",
-    "inphagspa",
-    "lepcha",
-    "indevanagariextendeda",
-    "intifinagh",
     "intagalog",
-    "incombiningdiacriticalmarkssupplement",
     "tale",
-    "inbrahmi",
-    "terminalpunctuation",
-    "insymbolsandpictographsextendeda",
-    "syriac",
-    "inbengali",
+#endif /* USE_UNICODE_PROPERTIES */
+    "graph",
+#ifdef USE_UNICODE_PROPERTIES
+    "inethiopicextendeda",
+    "soyo",
+    "spaceseparator",
+    "inpaucinhau",
     "nagm",
-    "extendedpictographic",
-    "buhd",
+    "inmongoliansupplement",
+    "oupper",
+    "inbengali",
+    "hex",
     "javanese",
-    "taml",
+    "oalpha",
+    "buhd",
     "inbuginese",
-    "inlatin1supplement",
-    "ingothic",
-    "invariationselectors",
-    "hex",
-    "inverticalforms",
+    "incjkunifiedideographsextensionb",
+    "incombiningdiacriticalmarkssupplement",
+    "insymbolsandpictographsextendeda",
+    "taml",
     "ebase",
-    "incurrencysymbols",
-    "avst",
-    "osge",
+    "orya",
+    "modifierletter",
+    "indevanagariextended",
+    "ext",
+    "induployan",
+    "inphoneticextensions",
+    "tirhuta",
     "incombiningdiacriticalmarksextended",
-    "intaiviet",
-    "spaceseparator",
-    "softdotted",
-    "nchar",
-    "invedicextensions",
-    "inlimbu",
-    "olditalic",
-    "gujr",
-    "mathsymbol",
-    "incjkunifiedideographsextensionb",
-    "gujarati",
-    "phagspa",
-    "invariationselectorssupplement",
-    "currencysymbol",
-    "inlinearbsyllabary",
-    "wancho",
-    "inpaucinhau",
-    "other",
-    "otheridcontinue",
-    "sylo",
+    "xposixpunct",
+    "injavanese",
+    "lepcha",
+    "lowercaseletter",
+    "inindicsiyaqnumbers",
+    "unassigned",
+    "ethi",
+    "titlecaseletter",
+    "rohg",
+    "syrc",
+    "inunifiedcanadianaboriginalsyllabicsextended",
+    "extender",
+    "inbrahmi",
+    "meroitichieroglyphs",
+    "otheruppercase",
+    "extpict",
+    "incjkradicalssupplement",
+    "tang",
+    "tagbanwa",
     "zp",
     "inaegeannumbers",
-    "warangciti",
-    "othernumber",
-#endif /* USE_UNICODE_PROPERTIES */
-    "digit",
-#ifndef USE_UNICODE_PROPERTIES
-    "blank"
-#else /* USE_UNICODE_PROPERTIES */
     "nonspacingmark",
-    "titlecaseletter",
-    "inmeroiticcursive",
-    "wcho",
-    "graphemeclusterbreak=spacingmark",
-    "inletterlikesymbols",
-    "inottomansiyaqnumbers",
-    "intagbanwa",
-    "cyrillic",
-    "oalpha",
-    "graphemeclusterbreak=cr",
-    "narb",
-    "changeswhencasemapped",
+    "ingeorgianextended",
+    "cwt",
+    "dogra",
+    "inphoneticextensionssupplement",
+    "ingothic",
+    "oldsogdian",
+    "syriac",
+    "incjkunifiedideographsextensionf",
+    "dogr",
+    "osmanya",
+    "nchar",
+    "inmathematicalalphanumericsymbols",
+    "phagspa",
+    "inlimbu",
+    "cyrl",
+    "currencysymbol",
+    "epres",
     "inbopomofo",
-    "graphemeclusterbreak=regionalindicator",
-    "otheralphabetic",
-    "noncharactercodepoint",
-    "oldhungarian",
+    "narb",
     "insymbolsforlegacycomputing",
+    "mlym",
     "insmallformvariants",
-    "inhangulsyllables",
-    "emojipresentation",
-    "epres",
-    "inbassavah",
-    "indevanagariextended",
-    "inbuhid",
-    "tirhuta",
-    "inpsalterpahlavi",
-    "whitespace",
-    "finalpunctuation",
-    "orya",
-    "phlp",
-    "inbamumsupplement",
-    "buhid",
-    "paragraphseparator",
-    "inalphabeticpresentationforms",
-    "inlatinextendedg",
-    "elba",
-    "changeswhentitlecased",
-    "incombininghalfmarks",
-    "intangutcomponents",
+    "intagbanwa",
+    "malayalam",
+    "incyrillicextendedb",
+    "olonal",
+    "palmyrene",
     "thaa",
+    "otheridstart",
     "thai",
-    "oldturkic",
+    "tangut",
     "thaana",
-    "inlatinextendedf",
-    "ougr",
-    "tang",
-    "inarabicmathematicalalphabeticsymbols",
-    "tagbanwa",
-    "tamil",
-    "khitansmallscript",
-    "mahj",
-    "mahajani",
-    "hang",
+    "emojipresentation",
+    "inethiopicextended",
+    "nagmundari",
+    "nl",
+    "inlatin1supplement",
     "tirh",
-    "sylotinagri",
+    "hangul",
     "talu",
-    "nagmundari",
-    "deva",
-    "ingujarati",
-    "deprecated",
-    "inarabicpresentationformsb",
-    "devanagari",
-    "ingunjalagondi",
-    "graphemeclusterbreak=t",
-    "graphemeclusterbreak=lvt",
+    "buhid",
+    "paragraphseparator",
+    "graphemeclusterbreak=spacingmark",
+    "telu",
+    "otherlowercase",
+    "ogham",
+    "changeswhencasemapped",
+    "intangutcomponents",
+    "otherletter",
     "taitham",
+    "graphemeclusterbreak=cr",
+    "cwu",
+    "graphemeclusterbreak=regionalindicator",
+    "nushu",
+    "sunuwar",
+    "noncharactercodepoint",
+    "softdotted",
+    "omath",
+    "inbassavah",
+    "inottomansiyaqnumbers",
+    "ingaray",
+    "warangciti",
+    "ugar",
+    "inprivateusearea",
+    "inbuhid",
+    "dash",
+    "inarabicpresentationformsb",
+    "indivesakuru",
+    "hexdigit",
+    "inalphabeticpresentationforms",
+    "othersymbol",
+    "extendedpictographic",
+    "changeswhentitlecased",
+    "ogrext",
     "nbat",
-    "telu",
-    "hiragana",
+    "insuperscriptsandsubscripts",
     "nabataean",
-    "inrejang",
     "intangutsupplement",
-    "khoj",
-    "hmng",
-    "cyprominoan",
-    "inhebrew",
-    "inmathematicaloperators",
+    "inlowsurrogates",
+    "inyijinghexagramsymbols",
+    "inmahjongtiles",
+    "inletterlikesymbols",
+    "inbamumsupplement",
+    "incurrencysymbols",
+    "incombininghalfmarks",
+    "wancho",
     "inarabicsupplement",
-    "inenclosedcjklettersandmonths",
-    "changeswhenlowercased",
-    "tangut",
-    "elbasan",
-    "osmanya",
-    "insuperscriptsandsubscripts",
-    "graphemeclusterbreak=extend",
-    "graphemeclusterbreak=prepend",
+    "oldnortharabian",
+    "khitansmallscript",
+    "inlatinextendedg",
+    "sylo",
+    "inarabicmathematicalalphabeticsymbols",
     "nshu",
-    "otherlowercase",
-    "inethiopicextendedb",
-    "otherletter",
-    "kayahli",
-    "inplayingcards",
-    "elym",
-    "graphemeclusterbreak=l",
-    "graphemeclusterbreak=control",
-    "ogrext",
-    "elymaic",
+    "elba",
+    "invithkuqi",
+    "inhangulsyllables",
     "changeswhenuppercased",
-    "inalchemicalsymbols",
-    "oldsogdian",
-    "otheridstart",
+    "intifinagh",
+    "graphemeclusterbreak=t",
+    "graphemeclusterbreak=lvt",
+    "tamil",
+    "mathsymbol",
+    "tulutigalari",
+    "otherdefaultignorablecodepoint",
+    "wcho",
     "insupplementalarrowsa",
-    "invithkuqi",
-    "symbol",
     "inarabicextendedb",
-    "cypriot",
-    "any",
-    "otheruppercase",
-    "rjng",
-    "wspace",
-    "inindicsiyaqnumbers",
-    "inprivateusearea",
-    "othersymbol",
-    "oupper",
-    "signwriting",
-    "nushu",
-    "hmnp",
-    "upper",
+    "rejang",
+    "graphemeclusterbreak=extend",
+    "graphemeclusterbreak=prepend",
+    "finalpunctuation",
+    "inpsalterpahlavi",
+    "newa",
+    "inmathematicaloperators",
+    "phlp",
+    "deva",
+    "devanagari",
+    "newtailue",
+    "cf",
+    "pf",
+    "whitespace",
+    "elbasan",
+    "othermath",
+#endif /* USE_UNICODE_PROPERTIES */
+    "digit",
+#ifndef USE_UNICODE_PROPERTIES
+    "blank"
+#else /* USE_UNICODE_PROPERTIES */
+    "cyprominoan",
     "insupplementalarrowsc",
-    "omath",
-    "modifiersymbol",
-    "hebr",
-    "inhalfwidthandfullwidthforms",
+    "tibt",
+    "tibetan",
+    "bassavah",
     "insupplementalmathematicaloperators",
+    "otherpunctuation",
+    "sgnw",
+    "ugaritic",
+    "tutg",
+    "changeswhenlowercased",
+    "cwl",
+    "inlinearbsyllabary",
+    "inplayingcards",
+    "modifiercombiningmark",
+    "sylotinagri",
+    "idcompatmathcontinue",
     "inpahawhhmong",
-    "alphabetic",
-    "uppercase",
-    "dupl",
-    "ogham",
-    "dashpunctuation",
-    "hangul",
+    "idcompatmathstart",
+    "hanifirohingya",
+    "deprecated",
+    "oldsoutharabian",
+    "shaw",
+    "tavt",
+    "wspace",
+    "graphemeclusterbreak=l",
+    "graphemeclusterbreak=control",
+    "cypriot",
+    "cyrillic",
     "inhanguljamoextendedb",
-    "bassavah",
+    "inalchemicalsymbols",
+    "insupplementalpunctuation",
+    "khudawadi",
     "aghb",
-    "hung",
-    "hexdigit",
-    "incypriotsyllabary",
-    "indivesakuru",
-    "tibt",
+    "graphemeclusterbreak=zwj",
+    "alphabetic",
+    "cwcf",
+    "elym",
+    "ecomp",
+    "inethiopicextendedb",
+    "elymaic",
+    "inglagoliticsupplement",
+    "garay",
+    "unknown",
+    "soyombo",
     "inlatinextendedb",
+    "divesakuru",
+    "kayahli",
+    "othergraphemeextend",
+    "inhighprivateusesurrogates",
+    "any",
+    "dashpunctuation",
+    "ethiopic",
+    "symbol",
+    "openpunctuation",
     "hluw",
-    "tibetan",
+    "tagb",
+    "hyphen",
+    "incypriotsyllabary",
+    "dupl",
+    "modifiersymbol",
     "inyisyllables",
-    "oldnortharabian",
-    "defaultignorablecodepoint",
-    "inhighprivateusesurrogates",
-    "soyombo",
-    "otherdefaultignorablecodepoint",
-    "pahawhhmong",
-    "unifiedideograph",
-    "othermath",
-    "changeswhencasefolded",
-    "inmahjongtiles",
+    "inhalfwidthandfullwidthforms",
+    "tfng",
     "dep",
-    "divesakuru",
-    "graphemeclusterbreak=lf",
-    "uppercaseletter",
-    "insupplementalpunctuation",
-    "ethiopic",
-    "inyijinghexagramsymbols",
-    "ecomp",
-    "inglagoliticsupplement",
+    "inegyptianhieroglyphsextendeda",
     "inbopomofoextended",
-    "injavanese",
-    "otherpunctuation",
-    "tifinagh",
-    "tfng",
-    "hanifirohingya",
-    "tavt",
-    "inboxdrawing",
-    "oldsoutharabian",
-    "inegyptianhieroglyphs",
-    "inegyptianhieroglyphformatcontrols",
-    "tagb",
-    "rejang",
+    "telugu",
     "tglg",
     "tagalog",
-    "othergraphemeextend",
-    "insupplementaryprivateuseareaa",
-    "inhighsurrogates",
-    "hebrew",
-    "duployan",
+    "inlatinextendedf",
+    "changeswhencasefolded",
+    "tifinagh",
     "graphemeclusterbreak=v",
     "graphemeclusterbreak=lv",
+    "inegyptianhieroglyphs",
+    "signwriting",
+    "inegyptianhieroglyphformatcontrols",
+    "graphemeclusterbreak=lf",
+    "insupplementaryprivateuseareaa",
+    "inhebrew",
+    "inboxdrawing",
     "insupplementalarrowsb",
-    "graphemeclusterbreak=zwj",
-    "telugu",
-    "zyyy",
     "olduyghur",
+    "upper",
+    "inhighsurrogates",
+    "uppercase",
     "inhangulcompatibilityjamo",
-    "openpunctuation",
-    "hyphen",
-    "insupplementalsymbolsandpictographs",
+    "defaultignorablecodepoint",
+    "uppercaseletter",
     "egyp",
+    "insupplementalsymbolsandpictographs",
+    "unifiedideograph",
+    "pahawhhmong",
+    "duployan",
     "nyiakengpuachuehmong",
-    "egyptianhieroglyphs",
-    "insupplementaryprivateuseareab"
+    "zyyy",
+    "insupplementaryprivateuseareab",
+    "hebrew",
+    "egyptianhieroglyphs"
 #endif /* USE_UNICODE_PROPERTIES */
   };
 #define uniname2ctype_pool ((const char *) &uniname2ctype_pool_contents)
@@ -43710,1672 +46457,1812 @@ uniname2ctype_p (register const char *str, register size_t len)
     {
 #ifdef USE_UNICODE_PROPERTIES
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1},
-      {uniname2ctype_offset(str11), 111},
-      {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str17), 111},
-      {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str22), 152},
-      {-1}, {-1},
-      {uniname2ctype_offset(str25), 184},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str33), 218},
-      {-1},
-      {uniname2ctype_offset(str35), 186},
-      {uniname2ctype_offset(str36), 34},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str45), 173},
-      {uniname2ctype_offset(str46), 28},
-      {uniname2ctype_offset(str47), 61},
-      {uniname2ctype_offset(str48), 95},
-      {uniname2ctype_offset(str49), 95},
-      {-1}, {-1},
-      {uniname2ctype_offset(str52), 346},
-      {-1}, {-1},
-      {uniname2ctype_offset(str55), 21},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str64), 44},
-      {-1},
-      {uniname2ctype_offset(str66), 333},
-      {uniname2ctype_offset(str67), 52},
       {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str71), 181},
+      {uniname2ctype_offset(str12), 155},
       {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str75), 22},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str83), 184},
-      {-1}, {-1},
-      {uniname2ctype_offset(str86), 31},
+      {uniname2ctype_offset(str16), 187},
+      {uniname2ctype_offset(str17), 114},
+      {uniname2ctype_offset(str18), 34},
       {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str90), 230},
+      {uniname2ctype_offset(str22), 221},
+      {uniname2ctype_offset(str23), 189},
+      {uniname2ctype_offset(str24), 114},
+      {uniname2ctype_offset(str25), 28},
       {-1},
-      {uniname2ctype_offset(str92), 45},
+      {uniname2ctype_offset(str27), 98},
+      {uniname2ctype_offset(str28), 98},
       {-1},
-      {uniname2ctype_offset(str94), 33},
+      {uniname2ctype_offset(str30), 176},
+      {uniname2ctype_offset(str31), 362},
       {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str100), 149},
-      {uniname2ctype_offset(str101), 513},
-      {uniname2ctype_offset(str102), 108},
-      {uniname2ctype_offset(str103), 263},
+      {uniname2ctype_offset(str37), 349},
+      {uniname2ctype_offset(str38), 21},
       {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str107), 31},
-      {uniname2ctype_offset(str108), 77},
-      {-1}, {-1},
-      {uniname2ctype_offset(str111), 189},
-      {uniname2ctype_offset(str112), 189},
+      {uniname2ctype_offset(str42), 61},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str52), 22},
+#endif /* USE_UNICODE_PROPERTIES */
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+#ifndef USE_UNICODE_PROPERTIES
+      {uniname2ctype_offset(str6), 12},
+      {uniname2ctype_offset(str7), 7},
+      {uniname2ctype_offset(str8), 15},
+      {uniname2ctype_offset(str9), 1},
+      {uniname2ctype_offset(str10), 13},
+      {uniname2ctype_offset(str11), 11},
+      {uniname2ctype_offset(str12), 10},
+      {uniname2ctype_offset(str13), 14},
+      {uniname2ctype_offset(str14), 3},
+      {uniname2ctype_offset(str15), 9},
+      {uniname2ctype_offset(str16), 8},
+      {uniname2ctype_offset(str17), 6},
+      {uniname2ctype_offset(str18), 5},
+      {uniname2ctype_offset(str19), 4},
+      {uniname2ctype_offset(str20), 2}
+#else /* USE_UNICODE_PROPERTIES */
+      {uniname2ctype_offset(str59), 241},
+      {uniname2ctype_offset(str60), 44},
+      {uniname2ctype_offset(str61), 184},
+      {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str65), 52},
       {-1}, {-1},
-      {uniname2ctype_offset(str115), 149},
+      {uniname2ctype_offset(str68), 187},
+      {uniname2ctype_offset(str69), 31},
+      {uniname2ctype_offset(str70), 45},
       {-1},
-      {uniname2ctype_offset(str117), 98},
-      {uniname2ctype_offset(str118), 77},
+      {uniname2ctype_offset(str72), 33},
       {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str122), 212},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str129), 187},
-      {uniname2ctype_offset(str130), 42},
-      {uniname2ctype_offset(str131), 172},
+      {uniname2ctype_offset(str76), 274},
       {-1}, {-1},
-      {uniname2ctype_offset(str134), 497},
-      {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str139), 170},
-      {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str145), 516},
-      {uniname2ctype_offset(str146), 575},
+      {uniname2ctype_offset(str79), 602},
       {-1},
-      {uniname2ctype_offset(str148), 580},
-      {uniname2ctype_offset(str149), 535},
+      {uniname2ctype_offset(str81), 192},
+      {uniname2ctype_offset(str82), 192},
+      {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str86), 530},
       {-1},
-      {uniname2ctype_offset(str151), 18},
-      {uniname2ctype_offset(str152), 169},
-      {uniname2ctype_offset(str153), 160},
-      {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str158), 278},
+      {uniname2ctype_offset(str88), 152},
+      {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str92), 152},
+      {uniname2ctype_offset(str93), 80},
       {-1}, {-1},
-      {uniname2ctype_offset(str161), 327},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str177), 352},
-      {uniname2ctype_offset(str178), 563},
-      {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str183), 75},
+      {uniname2ctype_offset(str96), 233},
+      {uniname2ctype_offset(str97), 101},
       {-1}, {-1},
-      {uniname2ctype_offset(str186), 27},
-      {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str190), 208},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str203), 360},
-      {uniname2ctype_offset(str204), 488},
-      {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str210), 581},
+      {uniname2ctype_offset(str100), 80},
+      {uniname2ctype_offset(str101), 190},
+      {uniname2ctype_offset(str102), 175},
+      {-1}, {-1},
+      {uniname2ctype_offset(str105), 111},
       {-1},
-      {uniname2ctype_offset(str212), 365},
-      {uniname2ctype_offset(str213), 115},
-      {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str218), 549},
+      {uniname2ctype_offset(str107), 31},
+      {-1}, {-1},
+      {uniname2ctype_offset(str110), 42},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str226), 171},
+      {uniname2ctype_offset(str118), 215},
       {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str230), 530},
-      {uniname2ctype_offset(str231), 31},
-      {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str236), 25},
-      {uniname2ctype_offset(str237), 194},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str246), 32},
+      {uniname2ctype_offset(str122), 163},
       {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str250), 40},
+      {uniname2ctype_offset(str126), 513},
+      {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str130), 598},
+      {uniname2ctype_offset(str131), 533},
+      {uniname2ctype_offset(str132), 604},
+      {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str137), 173},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1},
-      {uniname2ctype_offset(str253), 102},
+      {uniname2ctype_offset(str149), 343},
+      {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str154), 243},
+      {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str158), 78},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str260), 568},
-      {-1}, {-1},
-      {uniname2ctype_offset(str263), 161},
+      {uniname2ctype_offset(str165), 553},
+      {uniname2ctype_offset(str166), 368},
+      {uniname2ctype_offset(str167), 172},
       {-1},
-      {uniname2ctype_offset(str265), 19},
+      {uniname2ctype_offset(str169), 584},
       {-1},
-      {uniname2ctype_offset(str267), 79},
-      {uniname2ctype_offset(str268), 357},
+      {uniname2ctype_offset(str171), 18},
+      {uniname2ctype_offset(str172), 292},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1},
-      {uniname2ctype_offset(str270), 270},
+      {uniname2ctype_offset(str192), 605},
       {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str274), 567},
-      {uniname2ctype_offset(str275), 517},
+      {uniname2ctype_offset(str196), 381},
+      {uniname2ctype_offset(str197), 27},
       {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str281), 321},
-      {uniname2ctype_offset(str282), 40},
-      {uniname2ctype_offset(str283), 79},
-      {-1},
-      {uniname2ctype_offset(str285), 537},
-      {-1},
-      {uniname2ctype_offset(str287), 144},
-      {uniname2ctype_offset(str288), 144},
-      {uniname2ctype_offset(str289), 560},
-      {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str293), 218},
-      {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str297), 212},
-      {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str301), 395},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str311), 325},
-      {-1},
-      {uniname2ctype_offset(str313), 456},
-      {-1},
-      {uniname2ctype_offset(str315), 243},
+      {uniname2ctype_offset(str203), 211},
       {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str320), 271},
-      {-1},
-      {uniname2ctype_offset(str322), 129},
+      {uniname2ctype_offset(str208), 118},
+      {-1}, {-1},
+      {uniname2ctype_offset(str211), 31},
+      {uniname2ctype_offset(str212), 376},
+      {uniname2ctype_offset(str213), 504},
+      {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str218), 569},
+      {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str224), 283},
+      {uniname2ctype_offset(str225), 548},
+      {uniname2ctype_offset(str226), 197},
       {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str328), 334},
+      {uniname2ctype_offset(str232), 174},
       {-1}, {-1},
-      {uniname2ctype_offset(str331), 76},
-      {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str335), 561},
+      {uniname2ctype_offset(str235), 105},
+      {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str240), 40},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str249), 534},
+      {uniname2ctype_offset(str250), 589},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1},
-      {uniname2ctype_offset(str338), 332},
-      {-1},
-      {uniname2ctype_offset(str340), 76},
-      {-1},
-      {uniname2ctype_offset(str342), 349},
+      {uniname2ctype_offset(str262), 337},
       {-1}, {-1},
-      {uniname2ctype_offset(str345), 53},
-      {uniname2ctype_offset(str346), 270},
+      {uniname2ctype_offset(str265), 555},
       {-1},
-      {uniname2ctype_offset(str348), 426},
+      {uniname2ctype_offset(str267), 373},
+      {-1}, {-1},
+      {uniname2ctype_offset(str270), 221},
+      {-1}, {-1},
+      {uniname2ctype_offset(str273), 411},
+      {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str279), 215},
+      {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str285), 25},
       {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str352), 533},
+      {uniname2ctype_offset(str289), 588},
+      {-1},
+      {uniname2ctype_offset(str291), 82},
+      {uniname2ctype_offset(str292), 32},
+      {uniname2ctype_offset(str293), 164},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str362), 163},
+      {uniname2ctype_offset(str303), 82},
+      {-1},
+      {uniname2ctype_offset(str305), 581},
       {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str366), 44},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str373), 160},
+      {uniname2ctype_offset(str309), 53},
+      {-1},
+      {uniname2ctype_offset(str311), 253},
+      {uniname2ctype_offset(str312), 19},
+      {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str317), 350},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str381), 554},
+      {uniname2ctype_offset(str325), 582},
       {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str386), 371},
+      {uniname2ctype_offset(str330), 40},
+      {-1},
+      {uniname2ctype_offset(str332), 166},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str399), 330},
       {-1},
-      {uniname2ctype_offset(str401), 548},
+      {uniname2ctype_offset(str343), 132},
+      {-1},
+      {uniname2ctype_offset(str345), 285},
       {-1}, {-1},
-      {uniname2ctype_offset(str404), 81},
+      {uniname2ctype_offset(str348), 472},
+      {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str352), 341},
+      {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str357), 574},
+      {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str362), 387},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str381), 79},
+      {uniname2ctype_offset(str382), 284},
+      {uniname2ctype_offset(str383), 283},
+      {-1},
+      {uniname2ctype_offset(str385), 79},
       {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str418), 108},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str426), 163},
+      {uniname2ctype_offset(str390), 348},
+      {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str396), 365},
+      {uniname2ctype_offset(str397), 442},
+      {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str403), 551},
       {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str430), 55},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1},
-      {uniname2ctype_offset(str442), 14},
+      {uniname2ctype_offset(str407), 346},
+      {uniname2ctype_offset(str408), 55},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str416), 44},
       {-1}, {-1},
-      {uniname2ctype_offset(str445), 23},
+      {uniname2ctype_offset(str419), 163},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str426), 23},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str462), 46},
       {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str468), 169},
+      {uniname2ctype_offset(str441), 172},
+      {-1}, {-1},
+      {uniname2ctype_offset(str444), 46},
+      {uniname2ctype_offset(str445), 567},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str452), 191},
+      {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str458), 612},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1},
+      {uniname2ctype_offset(str470), 190},
       {-1},
-      {uniname2ctype_offset(str470), 22},
-      {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str475), 524},
-      {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str480), 457},
-      {uniname2ctype_offset(str481), 188},
+      {uniname2ctype_offset(str472), 542},
+      {uniname2ctype_offset(str473), 259},
+      {-1},
+      {uniname2ctype_offset(str475), 166},
       {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str486), 476},
+      {uniname2ctype_offset(str480), 84},
+      {uniname2ctype_offset(str481), 130},
       {-1},
-      {uniname2ctype_offset(str488), 588},
-      {-1}, {-1},
-      {uniname2ctype_offset(str491), 470},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str500), 127},
+      {uniname2ctype_offset(str483), 111},
       {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str504), 187},
-      {uniname2ctype_offset(str505), 249},
-      {uniname2ctype_offset(str506), 24},
+      {uniname2ctype_offset(str487), 439},
+      {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str492), 14},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1},
-      {uniname2ctype_offset(str509), 24},
+      {uniname2ctype_offset(str504), 573},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str512), 22},
+      {-1},
+      {uniname2ctype_offset(str514), 532},
+      {-1},
+      {uniname2ctype_offset(str516), 49},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str524), 51},
+      {uniname2ctype_offset(str525), 492},
+      {uniname2ctype_offset(str526), 233},
+      {uniname2ctype_offset(str527), 94},
+      {uniname2ctype_offset(str528), 473},
+      {-1},
+      {uniname2ctype_offset(str530), 486},
       {-1},
-      {uniname2ctype_offset(str511), 463},
+      {uniname2ctype_offset(str532), 94},
+      {-1},
+      {uniname2ctype_offset(str534), 70},
+      {uniname2ctype_offset(str535), 24},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str520), 423},
+      {uniname2ctype_offset(str544), 565},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str554), 479},
+      {-1},
+      {uniname2ctype_offset(str556), 637},
+      {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str561), 244},
       {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str533), 230},
+      {uniname2ctype_offset(str565), 178},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str538), 91},
+      {uniname2ctype_offset(str579), 603},
+      {uniname2ctype_offset(str580), 243},
       {-1}, {-1},
-      {uniname2ctype_offset(str541), 553},
+      {uniname2ctype_offset(str583), 496},
+      {uniname2ctype_offset(str584), 171},
+      {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str589), 37},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str597), 655},
+      {uniname2ctype_offset(str598), 506},
+      {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str603), 91},
+      {uniname2ctype_offset(str604), 422},
       {-1},
-      {uniname2ctype_offset(str543), 91},
+      {uniname2ctype_offset(str606), 650},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str614), 77},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str624), 70},
+      {-1}, {-1},
+      {uniname2ctype_offset(str627), 648},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str651), 159},
+      {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str657), 545},
       {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str556), 546},
+      {uniname2ctype_offset(str661), 501},
+      {-1},
+      {uniname2ctype_offset(str663), 463},
+      {uniname2ctype_offset(str664), 159},
       {-1},
-      {uniname2ctype_offset(str558), 350},
-      {uniname2ctype_offset(str559), 70},
-      {uniname2ctype_offset(str560), 515},
+      {uniname2ctype_offset(str666), 198},
+      {uniname2ctype_offset(str667), 568},
       {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str565), 624},
-      {uniname2ctype_offset(str566), 37},
+      {uniname2ctype_offset(str672), 232},
+      {uniname2ctype_offset(str673), 392},
       {-1},
-      {uniname2ctype_offset(str568), 113},
+      {uniname2ctype_offset(str675), 76},
+      {uniname2ctype_offset(str676), 116},
       {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str572), 502},
+      {uniname2ctype_offset(str680), 351},
+      {uniname2ctype_offset(str681), 69},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str689), 618},
+      {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str695), 196},
+      {uniname2ctype_offset(str696), 50},
+      {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str700), 47},
       {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str577), 611},
+      {uniname2ctype_offset(str705), 174},
+      {-1}, {-1},
+      {uniname2ctype_offset(str708), 531},
       {-1},
-      {uniname2ctype_offset(str579), 106},
+      {uniname2ctype_offset(str710), 509},
+      {uniname2ctype_offset(str711), 160},
+      {uniname2ctype_offset(str712), 68},
+      {uniname2ctype_offset(str713), 664},
+      {uniname2ctype_offset(str714), 281},
       {-1}, {-1},
-      {uniname2ctype_offset(str582), 406},
-      {uniname2ctype_offset(str583), 480},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str590), 74},
+      {uniname2ctype_offset(str717), 161},
+      {-1},
+      {uniname2ctype_offset(str719), 621},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1},
+      {uniname2ctype_offset(str739), 266},
+      {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str745), 29},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str594), 168},
+      {uniname2ctype_offset(str758), 447},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str768), 579},
       {-1},
-      {uniname2ctype_offset(str596), 622},
-      {uniname2ctype_offset(str597), 146},
+      {uniname2ctype_offset(str770), 465},
       {-1}, {-1},
-      {uniname2ctype_offset(str600), 490},
+      {uniname2ctype_offset(str773), 643},
       {-1},
-      {uniname2ctype_offset(str602), 70},
+      {uniname2ctype_offset(str775), 632},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str784), 48},
+      {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str790), 268},
+      {uniname2ctype_offset(str791), 460},
+      {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str797), 415},
       {-1},
-      {uniname2ctype_offset(str604), 579},
-      {uniname2ctype_offset(str605), 629},
-      {-1}, {-1},
-      {uniname2ctype_offset(str608), 637},
-      {uniname2ctype_offset(str609), 229},
+      {uniname2ctype_offset(str799), 24},
       {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str614), 612},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str624), 195},
-      {uniname2ctype_offset(str625), 447},
+      {uniname2ctype_offset(str804), 170},
+      {uniname2ctype_offset(str805), 611},
+      {uniname2ctype_offset(str806), 213},
       {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str630), 29},
-      {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str636), 543},
-      {-1}, {-1},
-      {uniname2ctype_offset(str639), 49},
-      {-1}, {-1},
-      {uniname2ctype_offset(str642), 19},
-      {uniname2ctype_offset(str643), 564},
+      {uniname2ctype_offset(str811), 170},
       {-1},
-      {uniname2ctype_offset(str645), 485},
+      {uniname2ctype_offset(str813), 620},
+      {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str817), 516},
+      {uniname2ctype_offset(str818), 281},
+      {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str822), 181},
+      {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str826), 67},
       {-1},
-      {uniname2ctype_offset(str647), 192},
-      {-1}, {-1},
-      {uniname2ctype_offset(str650), 487},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str657), 51},
-      {-1}, {-1},
-      {uniname2ctype_offset(str660), 268},
+      {uniname2ctype_offset(str828), 72},
+      {uniname2ctype_offset(str829), 366},
+      {uniname2ctype_offset(str830), 147},
+      {uniname2ctype_offset(str831), 147},
+      {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str835), 635},
+      {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str840), 109},
+      {uniname2ctype_offset(str841), 128},
+      {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str846), 7},
+      {uniname2ctype_offset(str847), 519},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1},
-      {uniname2ctype_offset(str672), 335},
-      {-1}, {-1},
-      {uniname2ctype_offset(str675), 68},
-      {-1}, {-1},
-      {uniname2ctype_offset(str678), 171},
-      {uniname2ctype_offset(str679), 607},
+      {uniname2ctype_offset(str859), 389},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str869), 74},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str888), 420},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str896), 41},
+      {uniname2ctype_offset(str897), 428},
       {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str683), 267},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str692), 69},
-      {-1}, {-1},
-      {uniname2ctype_offset(str695), 551},
-      {uniname2ctype_offset(str696), 175},
-      {uniname2ctype_offset(str697), 399},
+      {uniname2ctype_offset(str901), 149},
+      {uniname2ctype_offset(str902), 647},
+      {uniname2ctype_offset(str903), 19},
+      {-1},
+      {uniname2ctype_offset(str905), 500},
+      {uniname2ctype_offset(str906), 414},
       {-1}, {-1},
-      {uniname2ctype_offset(str700), 236},
+      {uniname2ctype_offset(str909), 638},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str917), 113},
       {-1}, {-1},
-      {uniname2ctype_offset(str703), 527},
-      {-1},
-      {uniname2ctype_offset(str705), 347},
-      {-1},
-      {uniname2ctype_offset(str707), 158},
-      {uniname2ctype_offset(str708), 587},
+      {uniname2ctype_offset(str920), 113},
       {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str713), 376},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str720), 72},
+      {uniname2ctype_offset(str925), 120},
+      {-1},
+      {uniname2ctype_offset(str927), 107},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str737), 7},
-      {uniname2ctype_offset(str738), 373},
+      {uniname2ctype_offset(str937), 200},
       {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str742), 6},
+      {uniname2ctype_offset(str941), 120},
       {-1}, {-1},
-      {uniname2ctype_offset(str745), 269},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str753), 240},
+      {uniname2ctype_offset(str944), 195},
+      {uniname2ctype_offset(str945), 557},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1},
-      {uniname2ctype_offset(str755), 514},
-      {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str760), 431},
-      {uniname2ctype_offset(str761), 167},
-      {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str766), 156},
-      {uniname2ctype_offset(str767), 608},
+      {uniname2ctype_offset(str956), 559},
       {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str771), 167},
-      {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str776), 268},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str783), 156},
+      {uniname2ctype_offset(str960), 503},
+      {-1}, {-1},
+      {uniname2ctype_offset(str963), 538},
+      {-1},
+      {uniname2ctype_offset(str965), 110},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str787), 256},
+      {uniname2ctype_offset(str978), 625},
+      {uniname2ctype_offset(str979), 271},
+      {-1}, {-1},
+      {uniname2ctype_offset(str982), 68},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str1000), 267},
+      {-1}, {-1},
+      {uniname2ctype_offset(str1003), 547},
+      {uniname2ctype_offset(str1004), 75},
       {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str791), 193},
+      {uniname2ctype_offset(str1008), 363},
+      {uniname2ctype_offset(str1009), 30},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1},
+      {uniname2ctype_offset(str1021), 338},
+      {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str1026), 161},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1},
-      {uniname2ctype_offset(str794), 589},
+      {uniname2ctype_offset(str1038), 511},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1},
-      {uniname2ctype_offset(str797), 50},
+      {uniname2ctype_offset(str1050), 144},
       {-1},
-      {uniname2ctype_offset(str799), 617},
+      {uniname2ctype_offset(str1052), 67},
+      {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str1057), 148},
+      {uniname2ctype_offset(str1058), 613},
       {-1}, {-1},
-      {uniname2ctype_offset(str802), 13},
-      {uniname2ctype_offset(str803), 593},
+      {uniname2ctype_offset(str1061), 89},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str1070), 196},
       {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str809), 446},
-      {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str814), 493},
+      {uniname2ctype_offset(str1076), 89},
+      {uniname2ctype_offset(str1077), 462},
+      {-1},
+      {uniname2ctype_offset(str1079), 60},
       {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str818), 398},
-      {-1}, {-1},
-      {uniname2ctype_offset(str821), 482},
-      {uniname2ctype_offset(str822), 595},
-      {uniname2ctype_offset(str823), 47},
-      {uniname2ctype_offset(str824), 112},
-      {uniname2ctype_offset(str825), 444},
+      {uniname2ctype_offset(str1083), 498},
+      {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str1087), 220},
+      {uniname2ctype_offset(str1088), 560},
+      {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str1092), 109},
       {-1}, {-1},
-      {uniname2ctype_offset(str828), 596},
+      {uniname2ctype_offset(str1095), 250},
+      {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str1099), 279},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str838), 157},
+      {uniname2ctype_offset(str1109), 622},
       {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str842), 58},
-      {-1}, {-1},
-      {uniname2ctype_offset(str845), 66},
+      {uniname2ctype_offset(str1113), 123},
       {-1},
-      {uniname2ctype_offset(str847), 48},
-      {uniname2ctype_offset(str848), 178},
+      {uniname2ctype_offset(str1115), 276},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str855), 67},
+      {uniname2ctype_offset(str1122), 514},
+      {uniname2ctype_offset(str1123), 451},
+      {uniname2ctype_offset(str1124), 342},
+      {uniname2ctype_offset(str1125), 475},
+      {uniname2ctype_offset(str1126), 101},
+      {uniname2ctype_offset(str1127), 663},
+      {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str1132), 268},
       {-1},
-      {uniname2ctype_offset(str857), 319},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str1134), 405},
+      {uniname2ctype_offset(str1135), 13},
+      {uniname2ctype_offset(str1136), 249},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str875), 369},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str1145), 369},
       {-1},
-      {uniname2ctype_offset(str886), 404},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str895), 412},
-      {-1}, {-1},
-      {uniname2ctype_offset(str898), 500},
+      {uniname2ctype_offset(str1147), 253},
       {-1},
-      {uniname2ctype_offset(str900), 621},
-      {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str906), 521},
-      {uniname2ctype_offset(str907), 449},
+      {uniname2ctype_offset(str1149), 478},
+      {-1}, {-1},
+      {uniname2ctype_offset(str1152), 661},
+      {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str1157), 564},
+      {-1}, {-1},
+      {uniname2ctype_offset(str1160), 107},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1},
+      {uniname2ctype_offset(str1172), 275},
       {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str920), 419},
-      {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str924), 68},
-      {uniname2ctype_offset(str925), 599},
-      {uniname2ctype_offset(str926), 344},
-      {-1},
-      {uniname2ctype_offset(str928), 540},
-      {uniname2ctype_offset(str929), 461},
-      {uniname2ctype_offset(str930), 41},
+      {uniname2ctype_offset(str1176), 115},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str946), 136},
+      {uniname2ctype_offset(str1186), 286},
+      {uniname2ctype_offset(str1187), 382},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str1195), 634},
+      {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str1200), 335},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str961), 2},
+      {-1}, {-1},
+      {uniname2ctype_offset(str1212), 280},
       {-1},
-      {uniname2ctype_offset(str963), 257},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str1214), 148},
       {-1},
-      {uniname2ctype_offset(str974), 510},
+      {uniname2ctype_offset(str1216), 385},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1},
-      {uniname2ctype_offset(str986), 370},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str994), 85},
-      {uniname2ctype_offset(str995), 104},
+      {uniname2ctype_offset(str1228), 139},
+      {uniname2ctype_offset(str1229), 69},
+      {-1},
+      {uniname2ctype_offset(str1231), 11},
+      {-1},
+      {uniname2ctype_offset(str1233), 357},
+      {-1}, {-1},
+      {uniname2ctype_offset(str1236), 2},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str1243), 527},
+#ifndef USE_UNICODE_AGE_PROPERTIES
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str1010), 26},
-      {-1}, {-1},
-      {uniname2ctype_offset(str1013), 495},
+      {uniname2ctype_offset(str1258), 477},
+#endif /* USE_UNICODE_AGE_PROPERTIES */
+      {-1}, {-1}, {-1},
+#ifdef USE_UNICODE_AGE_PROPERTIES
+      {uniname2ctype_offset(str1247), 312},
+      {uniname2ctype_offset(str1248), 311},
+      {uniname2ctype_offset(str1249), 314},
+      {uniname2ctype_offset(str1250), 313},
+      {uniname2ctype_offset(str1251), 293},
+      {uniname2ctype_offset(str1252), 319},
+      {uniname2ctype_offset(str1253), 310},
+      {uniname2ctype_offset(str1254), 295},
+      {uniname2ctype_offset(str1255), 294},
+      {uniname2ctype_offset(str1256), 305},
+      {uniname2ctype_offset(str1257), 304},
+      {uniname2ctype_offset(str1258), 477},
+      {uniname2ctype_offset(str1259), 306},
+      {uniname2ctype_offset(str1260), 309},
+      {uniname2ctype_offset(str1261), 308},
+#endif /* USE_UNICODE_AGE_PROPERTIES */
+      {uniname2ctype_offset(str1262), 659},
       {-1},
-      {uniname2ctype_offset(str1015), 484},
-      {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str1021), 67},
+      {uniname2ctype_offset(str1264), 88},
+      {uniname2ctype_offset(str1265), 118},
+#ifndef USE_UNICODE_AGE_PROPERTIES
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+#else /* USE_UNICODE_AGE_PROPERTIES */
+      {uniname2ctype_offset(str1266), 318},
+      {uniname2ctype_offset(str1267), 317},
+      {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str1271), 302},
+      {uniname2ctype_offset(str1272), 301},
+      {uniname2ctype_offset(str1273), 316},
+      {uniname2ctype_offset(str1274), 303},
       {-1}, {-1},
-      {uniname2ctype_offset(str1024), 53},
-      {uniname2ctype_offset(str1025), 459},
+      {uniname2ctype_offset(str1277), 300},
+      {uniname2ctype_offset(str1278), 299},
       {-1}, {-1},
-      {uniname2ctype_offset(str1028), 136},
+#endif /* USE_UNICODE_AGE_PROPERTIES */
+      {uniname2ctype_offset(str1281), 540},
+      {uniname2ctype_offset(str1282), 360},
+      {-1},
+      {uniname2ctype_offset(str1284), 558},
+#ifndef USE_UNICODE_AGE_PROPERTIES
+      {-1}, {-1}, {-1}, {-1}, {-1},
+#else /* USE_UNICODE_AGE_PROPERTIES */
       {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str1032), 380},
-      {-1}, {-1},
-      {uniname2ctype_offset(str1035), 322},
-      {uniname2ctype_offset(str1036), 569},
+      {uniname2ctype_offset(str1288), 315},
+      {-1},
+#endif /* USE_UNICODE_AGE_PROPERTIES */
+      {uniname2ctype_offset(str1290), 139},
+      {uniname2ctype_offset(str1291), 205},
+#ifndef USE_UNICODE_AGE_PROPERTIES
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+#else /* USE_UNICODE_AGE_PROPERTIES */
+      {uniname2ctype_offset(str1292), 297},
+      {uniname2ctype_offset(str1293), 296},
+      {-1},
+      {uniname2ctype_offset(str1295), 298},
+      {-1},
+      {uniname2ctype_offset(str1297), 307},
+#endif /* USE_UNICODE_AGE_PROPERTIES */
+      {uniname2ctype_offset(str1298), 15},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1},
+      {uniname2ctype_offset(str1309), 453},
+      {uniname2ctype_offset(str1310), 441},
       {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str1049), 173},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str1067), 102},
-      {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str1072), 197},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str1081), 414},
+      {uniname2ctype_offset(str1314), 96},
       {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str1085), 259},
+      {uniname2ctype_offset(str1318), 176},
       {-1},
-      {uniname2ctype_offset(str1087), 600},
+      {uniname2ctype_offset(str1320), 141},
+      {uniname2ctype_offset(str1321), 274},
+      {-1},
+      {uniname2ctype_offset(str1323), 206},
+      {-1}, {-1},
+      {uniname2ctype_offset(str1326), 105},
+      {uniname2ctype_offset(str1327), 282},
+      {uniname2ctype_offset(str1328), 220},
       {-1},
-      {uniname2ctype_offset(str1089), 115},
+      {uniname2ctype_offset(str1330), 205},
       {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str1095), 250},
-      {uniname2ctype_offset(str1096), 71},
-      {uniname2ctype_offset(str1097), 541},
-      {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str1102), 523},
+      {uniname2ctype_offset(str1336), 552},
+      {-1}, {-1},
+      {uniname2ctype_offset(str1339), 590},
+      {uniname2ctype_offset(str1340), 211},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str1349), 74},
+      {uniname2ctype_offset(str1350), 273},
+      {-1}, {-1},
+      {uniname2ctype_offset(str1353), 104},
       {-1},
-      {uniname2ctype_offset(str1104), 228},
-      {uniname2ctype_offset(str1105), 217},
+      {uniname2ctype_offset(str1355), 104},
       {-1},
-      {uniname2ctype_offset(str1107), 542},
+      {uniname2ctype_offset(str1357), 199},
       {-1},
-      {uniname2ctype_offset(str1109), 239},
+      {uniname2ctype_offset(str1359), 169},
+      {-1}, {-1},
+      {uniname2ctype_offset(str1362), 554},
+      {uniname2ctype_offset(str1363), 288},
+      {uniname2ctype_offset(str1364), 375},
       {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str1114), 69},
-      {uniname2ctype_offset(str1115), 11},
+      {uniname2ctype_offset(str1369), 186},
+      {-1}, {-1},
+      {uniname2ctype_offset(str1372), 154},
       {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str1119), 106},
-      {uniname2ctype_offset(str1120), 60},
+      {uniname2ctype_offset(str1376), 173},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str1134), 425},
-      {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str1140), 93},
+      {uniname2ctype_offset(str1390), 138},
       {-1},
-      {uniname2ctype_offset(str1142), 206},
-      {-1}, {-1},
-      {uniname2ctype_offset(str1145), 137},
-      {uniname2ctype_offset(str1146), 131},
-      {uniname2ctype_offset(str1147), 266},
+      {uniname2ctype_offset(str1392), 35},
+      {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str1397), 73},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1},
-      {uniname2ctype_offset(str1149), 158},
-      {uniname2ctype_offset(str1150), 98},
-      {uniname2ctype_offset(str1151), 498},
-      {uniname2ctype_offset(str1152), 217},
-      {uniname2ctype_offset(str1153), 138},
-      {-1}, {-1},
-      {uniname2ctype_offset(str1156), 529},
-      {uniname2ctype_offset(str1157), 203},
-      {uniname2ctype_offset(str1158), 166},
-      {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str1164), 240},
+      {uniname2ctype_offset(str1408), 189},
+      {-1},
+      {uniname2ctype_offset(str1410), 38},
       {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str1168), 104},
+      {uniname2ctype_offset(str1414), 395},
       {-1},
-      {uniname2ctype_offset(str1170), 389},
-      {uniname2ctype_offset(str1171), 536},
-      {-1}, {-1},
-      {uniname2ctype_offset(str1174), 326},
-      {uniname2ctype_offset(str1175), 26},
-      {uniname2ctype_offset(str1176), 208},
-      {uniname2ctype_offset(str1177), 74},
-      {uniname2ctype_offset(str1178), 353},
+      {uniname2ctype_offset(str1416), 227},
+      {uniname2ctype_offset(str1417), 143},
+      {uniname2ctype_offset(str1418), 143},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str1434), 144},
+      {uniname2ctype_offset(str1435), 371},
+      {-1},
+      {uniname2ctype_offset(str1437), 39},
       {-1},
-      {uniname2ctype_offset(str1180), 183},
-      {uniname2ctype_offset(str1181), 151},
-      {uniname2ctype_offset(str1182), 359},
-      {uniname2ctype_offset(str1183), 101},
+      {uniname2ctype_offset(str1439), 39},
+      {uniname2ctype_offset(str1440), 340},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1},
-      {uniname2ctype_offset(str1185), 170},
-      {uniname2ctype_offset(str1186), 597},
+      {uniname2ctype_offset(str1451), 528},
       {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str1190), 272},
-      {uniname2ctype_offset(str1191), 545},
-      {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str1197), 101},
-      {uniname2ctype_offset(str1198), 135},
+      {uniname2ctype_offset(str1455), 526},
+      {uniname2ctype_offset(str1456), 599},
+      {-1},
+      {uniname2ctype_offset(str1458), 209},
+      {-1},
+      {uniname2ctype_offset(str1460), 364},
+      {uniname2ctype_offset(str1461), 435},
       {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str1203), 366},
-      {uniname2ctype_offset(str1204), 609},
+      {uniname2ctype_offset(str1466), 90},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str1476), 90},
+      {-1},
+      {uniname2ctype_offset(str1478), 430},
+      {-1},
+      {uniname2ctype_offset(str1480), 262},
+      {-1},
+      {uniname2ctype_offset(str1482), 33},
+      {-1},
+      {uniname2ctype_offset(str1484), 137},
+      {uniname2ctype_offset(str1485), 108},
       {-1}, {-1},
-      {uniname2ctype_offset(str1207), 462},
+      {uniname2ctype_offset(str1488), 146},
       {-1},
-      {uniname2ctype_offset(str1209), 186},
+      {uniname2ctype_offset(str1490), 125},
+      {uniname2ctype_offset(str1491), 203},
+      {uniname2ctype_offset(str1492), 230},
       {-1}, {-1},
-      {uniname2ctype_offset(str1212), 379},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str1495), 218},
+      {-1}, {-1},
+      {uniname2ctype_offset(str1498), 438},
+      {-1}, {-1},
+      {uniname2ctype_offset(str1501), 146},
+      {uniname2ctype_offset(str1502), 524},
       {-1},
-      {uniname2ctype_offset(str1223), 584},
+      {uniname2ctype_offset(str1504), 445},
+      {uniname2ctype_offset(str1505), 25},
+      {uniname2ctype_offset(str1506), 580},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str1513), 245},
+      {-1}, {-1},
+      {uniname2ctype_offset(str1516), 624},
       {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str1227), 243},
-      {-1},
-      {uniname2ctype_offset(str1229), 235},
-      {uniname2ctype_offset(str1230), 267},
-      {uniname2ctype_offset(str1231), 206},
-      {uniname2ctype_offset(str1232), 355},
-      {uniname2ctype_offset(str1233), 73},
-#ifndef USE_UNICODE_AGE_PROPERTIES
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-#else /* USE_UNICODE_AGE_PROPERTIES */
-      {uniname2ctype_offset(str1234), 298},
-      {uniname2ctype_offset(str1235), 300},
-      {uniname2ctype_offset(str1236), 297},
-      {uniname2ctype_offset(str1237), 299},
+      {uniname2ctype_offset(str1520), 230},
+      {uniname2ctype_offset(str1521), 234},
       {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str1241), 301},
-      {uniname2ctype_offset(str1242), 279},
-#endif /* USE_UNICODE_AGE_PROPERTIES */
-      {uniname2ctype_offset(str1243), 25},
-      {uniname2ctype_offset(str1244), 341},
-#ifndef USE_UNICODE_AGE_PROPERTIES
+      {uniname2ctype_offset(str1525), 88},
+      {uniname2ctype_offset(str1526), 167},
+      {uniname2ctype_offset(str1527), 515},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str1534), 108},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str1542), 125},
+      {-1}, {-1},
+      {uniname2ctype_offset(str1545), 660},
+      {uniname2ctype_offset(str1546), 289},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str1553), 570},
       {-1},
-#else /* USE_UNICODE_AGE_PROPERTIES */
-      {uniname2ctype_offset(str1245), 281},
-#endif /* USE_UNICODE_AGE_PROPERTIES */
-      {uniname2ctype_offset(str1246), 435},
-#ifndef USE_UNICODE_AGE_PROPERTIES
+      {uniname2ctype_offset(str1555), 209},
+      {-1}, {-1},
+      {uniname2ctype_offset(str1558), 284},
       {-1},
-#else /* USE_UNICODE_AGE_PROPERTIES */
-      {uniname2ctype_offset(str1247), 280},
-#endif /* USE_UNICODE_AGE_PROPERTIES */
-      {uniname2ctype_offset(str1248), 30},
-#ifndef USE_UNICODE_AGE_PROPERTIES
+      {uniname2ctype_offset(str1560), 138},
+      {-1},
+      {uniname2ctype_offset(str1562), 502},
+      {-1}, {-1},
+      {uniname2ctype_offset(str1565), 145},
       {-1}, {-1}, {-1}, {-1}, {-1},
-#else /* USE_UNICODE_AGE_PROPERTIES */
-      {uniname2ctype_offset(str1249), 283},
-      {uniname2ctype_offset(str1250), 296},
-      {uniname2ctype_offset(str1251), 282},
-      {uniname2ctype_offset(str1252), 284},
-      {uniname2ctype_offset(str1253), 295},
-#endif /* USE_UNICODE_AGE_PROPERTIES */
-      {uniname2ctype_offset(str1254), 566},
-#ifndef USE_UNICODE_AGE_PROPERTIES
+      {uniname2ctype_offset(str1571), 140},
+      {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str1575), 404},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str1583), 123},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str1591), 225},
       {-1},
-#else /* USE_UNICODE_AGE_PROPERTIES */
-      {uniname2ctype_offset(str1255), 291},
-#endif /* USE_UNICODE_AGE_PROPERTIES */
-      {uniname2ctype_offset(str1256), 278},
-#ifndef USE_UNICODE_AGE_PROPERTIES
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-#else /* USE_UNICODE_AGE_PROPERTIES */
-      {uniname2ctype_offset(str1257), 290},
-      {uniname2ctype_offset(str1258), 292},
-      {uniname2ctype_offset(str1259), 303},
-      {uniname2ctype_offset(str1260), 294},
+      {uniname2ctype_offset(str1593), 224},
       {-1},
-      {uniname2ctype_offset(str1262), 293},
-#endif /* USE_UNICODE_AGE_PROPERTIES */
-      {uniname2ctype_offset(str1263), 64},
-#ifndef USE_UNICODE_AGE_PROPERTIES
+      {uniname2ctype_offset(str1595), 26},
       {-1}, {-1},
-#else /* USE_UNICODE_AGE_PROPERTIES */
+      {uniname2ctype_offset(str1598), 288},
       {-1},
-      {uniname2ctype_offset(str1265), 302},
-#endif /* USE_UNICODE_AGE_PROPERTIES */
-      {uniname2ctype_offset(str1266), 21},
-#ifndef USE_UNICODE_AGE_PROPERTIES
-      {-1}, {-1}, {-1}, {-1},
-#else /* USE_UNICODE_AGE_PROPERTIES */
-      {uniname2ctype_offset(str1267), 288},
+      {uniname2ctype_offset(str1600), 396},
       {-1},
-      {uniname2ctype_offset(str1269), 287},
-      {uniname2ctype_offset(str1270), 289},
-#endif /* USE_UNICODE_AGE_PROPERTIES */
-      {uniname2ctype_offset(str1271), 250},
-#ifndef USE_UNICODE_AGE_PROPERTIES
-      {-1}, {-1},
-#else /* USE_UNICODE_AGE_PROPERTIES */
+      {uniname2ctype_offset(str1602), 591},
       {-1},
-      {uniname2ctype_offset(str1273), 286},
-#endif /* USE_UNICODE_AGE_PROPERTIES */
-      {uniname2ctype_offset(str1274), 200},
-#ifndef USE_UNICODE_AGE_PROPERTIES
+      {uniname2ctype_offset(str1604), 53},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-#else /* USE_UNICODE_AGE_PROPERTIES */
-      {uniname2ctype_offset(str1275), 285},
+      {uniname2ctype_offset(str1621), 419},
+      {uniname2ctype_offset(str1622), 608},
+      {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str1626), 56},
+      {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str1630), 116},
+      {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str1634), 345},
+      {uniname2ctype_offset(str1635), 242},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-#endif /* USE_UNICODE_AGE_PROPERTIES */
-      {uniname2ctype_offset(str1282), 635},
-      {-1}, {-1},
-      {uniname2ctype_offset(str1285), 105},
+      {uniname2ctype_offset(str1642), 522},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str1661), 413},
       {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str1289), 348},
+      {uniname2ctype_offset(str1665), 587},
       {-1}, {-1},
-      {uniname2ctype_offset(str1292), 397},
+      {uniname2ctype_offset(str1668), 84},
       {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str1297), 145},
-      {-1}, {-1},
-      {uniname2ctype_offset(str1300), 86},
-      {uniname2ctype_offset(str1301), 141},
+      {uniname2ctype_offset(str1673), 184},
       {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str1306), 15},
+      {uniname2ctype_offset(str1678), 563},
+      {uniname2ctype_offset(str1679), 525},
+      {-1},
+      {uniname2ctype_offset(str1681), 206},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str1696), 561},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str1314), 193},
+      {uniname2ctype_offset(str1704), 333},
+      {uniname2ctype_offset(str1705), 539},
+      {uniname2ctype_offset(str1706), 546},
+      {uniname2ctype_offset(str1707), 421},
+      {-1},
+      {uniname2ctype_offset(str1709), 106},
+      {-1},
+      {uniname2ctype_offset(str1711), 488},
+      {uniname2ctype_offset(str1712), 238},
+      {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str1716), 169},
+      {uniname2ctype_offset(str1717), 171},
+      {-1},
+      {uniname2ctype_offset(str1719), 132},
+      {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str1723), 259},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str1730), 290},
+      {uniname2ctype_offset(str1731), 179},
+      {-1},
+      {uniname2ctype_offset(str1733), 457},
+      {uniname2ctype_offset(str1734), 596},
+      {uniname2ctype_offset(str1735), 118},
+      {-1},
+      {uniname2ctype_offset(str1737), 269},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str1746), 260},
+      {-1},
+      {uniname2ctype_offset(str1748), 71},
+      {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str1752), 231},
       {-1}, {-1},
-      {uniname2ctype_offset(str1317), 86},
+      {uniname2ctype_offset(str1755), 96},
+      {uniname2ctype_offset(str1756), 134},
+      {-1},
+      {uniname2ctype_offset(str1758), 242},
+      {-1},
+      {uniname2ctype_offset(str1760), 127},
+      {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str1766), 250},
+      {-1},
+      {uniname2ctype_offset(str1768), 179},
+      {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str1774), 378},
+      {uniname2ctype_offset(str1775), 535},
+      {uniname2ctype_offset(str1776), 536},
+      {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str1780), 124},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1},
-      {uniname2ctype_offset(str1328), 227},
-      {-1}, {-1},
-      {uniname2ctype_offset(str1331), 263},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str1340), 105},
+      {uniname2ctype_offset(str1791), 73},
+      {uniname2ctype_offset(str1792), 72},
+      {-1},
+      {uniname2ctype_offset(str1794), 164},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str1802), 132},
+      {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str1807), 249},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1},
-      {uniname2ctype_offset(str1343), 120},
+      {uniname2ctype_offset(str1819), 227},
       {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str1349), 227},
-      {-1}, {-1},
-      {uniname2ctype_offset(str1352), 88},
+      {uniname2ctype_offset(str1825), 606},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str1835), 112},
+      {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str1839), 213},
+      {uniname2ctype_offset(str1840), 129},
       {-1},
-      {uniname2ctype_offset(str1354), 164},
+      {uniname2ctype_offset(str1842), 168},
+      {uniname2ctype_offset(str1843), 178},
+      {uniname2ctype_offset(str1844), 667},
       {-1},
-      {uniname2ctype_offset(str1356), 605},
+      {uniname2ctype_offset(str1846), 646},
       {-1},
-      {uniname2ctype_offset(str1358), 633},
+      {uniname2ctype_offset(str1848), 510},
+      {-1}, {-1},
+      {uniname2ctype_offset(str1851), 595},
+      {uniname2ctype_offset(str1852), 137},
+      {-1}, {-1},
+      {uniname2ctype_offset(str1855), 652},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str1868), 393},
       {-1},
-      {uniname2ctype_offset(str1360), 3},
+      {uniname2ctype_offset(str1870), 134},
+      {uniname2ctype_offset(str1871), 210},
       {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str1365), 387},
+      {uniname2ctype_offset(str1876), 418},
+      {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str1882), 210},
+      {uniname2ctype_offset(str1883), 630},
+      {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str1887), 254},
       {-1},
-      {uniname2ctype_offset(str1367), 534},
+      {uniname2ctype_offset(str1889), 410},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str1896), 367},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str1914), 236},
       {-1},
-      {uniname2ctype_offset(str1369), 258},
-      {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str1373), 274},
+      {uniname2ctype_offset(str1916), 32},
       {-1},
-      {uniname2ctype_offset(str1375), 135},
-      {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str1380), 35},
+      {uniname2ctype_offset(str1918), 236},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str1928), 512},
       {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str1384), 56},
+      {uniname2ctype_offset(str1932), 610},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1},
-      {uniname2ctype_offset(str1387), 113},
+      {uniname2ctype_offset(str1944), 260},
+      {uniname2ctype_offset(str1945), 112},
       {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str1392), 138},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str1400), 201},
-      {uniname2ctype_offset(str1401), 400},
+      {uniname2ctype_offset(str1950), 556},
       {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str1407), 224},
+      {uniname2ctype_offset(str1956), 9},
+      {uniname2ctype_offset(str1957), 354},
       {-1},
-      {uniname2ctype_offset(str1409), 38},
-      {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str1415), 576},
-      {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str1419), 140},
-      {uniname2ctype_offset(str1420), 140},
+      {uniname2ctype_offset(str1959), 614},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str1966), 440},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str1980), 102},
+      {uniname2ctype_offset(str1981), 508},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str1988), 197},
+      {-1}, {-1},
+      {uniname2ctype_offset(str1991), 204},
+      {uniname2ctype_offset(str1992), 416},
+      {-1}, {-1},
+      {uniname2ctype_offset(str1995), 619},
       {-1},
-      {uniname2ctype_offset(str1422), 324},
-      {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str1426), 39},
+      {uniname2ctype_offset(str1997), 358},
+      {uniname2ctype_offset(str1998), 3},
+      {uniname2ctype_offset(str1999), 131},
+      {-1}, {-1},
+      {uniname2ctype_offset(str2002), 471},
+      {uniname2ctype_offset(str2003), 403},
+      {uniname2ctype_offset(str2004), 224},
       {-1},
-      {uniname2ctype_offset(str1428), 181},
-      {uniname2ctype_offset(str1429), 36},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str1438), 437},
+      {uniname2ctype_offset(str2006), 583},
+      {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str2011), 456},
       {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str1442), 544},
-      {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str1448), 508},
-      {uniname2ctype_offset(str1449), 122},
+      {uniname2ctype_offset(str2015), 398},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1},
-      {uniname2ctype_offset(str1451), 203},
+      {uniname2ctype_offset(str2026), 52},
+      {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str2030), 165},
       {-1}, {-1},
-      {uniname2ctype_offset(str1454), 145},
+      {uniname2ctype_offset(str2033), 17},
+      {-1},
+      {uniname2ctype_offset(str2035), 110},
       {-1}, {-1},
-      {uniname2ctype_offset(str1457), 166},
+      {uniname2ctype_offset(str2038), 468},
+      {uniname2ctype_offset(str2039), 218},
+      {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str2044), 461},
+      {-1},
+      {uniname2ctype_offset(str2046), 20},
       {-1}, {-1},
-      {uniname2ctype_offset(str1460), 215},
+      {uniname2ctype_offset(str2049), 467},
       {-1},
-      {uniname2ctype_offset(str1462), 559},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str1470), 507},
-      {uniname2ctype_offset(str1471), 509},
+      {uniname2ctype_offset(str2051), 359},
       {-1}, {-1},
-      {uniname2ctype_offset(str1474), 134},
-      {uniname2ctype_offset(str1475), 429},
-      {uniname2ctype_offset(str1476), 511},
+      {uniname2ctype_offset(str2054), 432},
+      {uniname2ctype_offset(str2055), 431},
+      {uniname2ctype_offset(str2056), 518},
       {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str1480), 247},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str1489), 33},
+      {uniname2ctype_offset(str2060), 562},
+      {uniname2ctype_offset(str2061), 131},
+      {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str2065), 352},
       {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str1495), 262},
+      {uniname2ctype_offset(str2071), 585},
       {-1},
-      {uniname2ctype_offset(str1497), 499},
+      {uniname2ctype_offset(str2073), 202},
       {-1},
-      {uniname2ctype_offset(str1499), 620},
+      {uniname2ctype_offset(str2075), 185},
       {-1},
-      {uniname2ctype_offset(str1501), 196},
+      {uniname2ctype_offset(str2077), 424},
+      {uniname2ctype_offset(str2078), 426},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str1507), 122},
-      {uniname2ctype_offset(str1508), 231},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str1517), 619},
-      {-1}, {-1},
-      {uniname2ctype_offset(str1520), 239},
-      {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str1524), 486},
-      {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str1529), 120},
+      {uniname2ctype_offset(str2093), 167},
+      {uniname2ctype_offset(str2094), 36},
       {-1},
-      {uniname2ctype_offset(str1531), 422},
+      {uniname2ctype_offset(str2096), 544},
       {-1},
-      {uniname2ctype_offset(str1533), 142},
+      {uniname2ctype_offset(str2098), 543},
+      {uniname2ctype_offset(str2099), 130},
+      {uniname2ctype_offset(str2100), 649},
       {-1}, {-1},
-      {uniname2ctype_offset(str1536), 127},
-      {uniname2ctype_offset(str1537), 271},
-      {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str1542), 468},
-      {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str1547), 168},
+      {uniname2ctype_offset(str2103), 237},
       {-1},
-      {uniname2ctype_offset(str1549), 522},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str1557), 85},
+      {uniname2ctype_offset(str2105), 266},
+      {uniname2ctype_offset(str2106), 280},
+      {-1}, {-1},
+      {uniname2ctype_offset(str2109), 631},
+      {-1},
+      {uniname2ctype_offset(str2111), 257},
+      {uniname2ctype_offset(str2112), 141},
       {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str1563), 275},
+      {uniname2ctype_offset(str2118), 35},
+      {-1},
+      {uniname2ctype_offset(str2120), 571},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str2127), 156},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str2136), 61},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str2146), 239},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str2154), 6},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str2162), 235},
+      {uniname2ctype_offset(str2163), 188},
+      {uniname2ctype_offset(str2164), 355},
       {-1},
-      {uniname2ctype_offset(str1565), 329},
+      {uniname2ctype_offset(str2166), 23},
       {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str1570), 210},
+      {uniname2ctype_offset(str2171), 151},
       {-1},
-      {uniname2ctype_offset(str1572), 115},
+      {uniname2ctype_offset(str2173), 188},
+      {uniname2ctype_offset(str2174), 645},
+      {uniname2ctype_offset(str2175), 151},
+      {uniname2ctype_offset(str2176), 177},
+      {uniname2ctype_offset(str2177), 100},
       {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str1577), 570},
+      {uniname2ctype_offset(str2182), 100},
       {-1}, {-1},
-      {uniname2ctype_offset(str1580), 131},
-      {-1},
-      {uniname2ctype_offset(str1582), 219},
-      {uniname2ctype_offset(str1583), 125},
+      {uniname2ctype_offset(str2185), 459},
+      {uniname2ctype_offset(str2186), 361},
+      {uniname2ctype_offset(str2187), 665},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str2194), 246},
+      {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str2199), 578},
       {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str1587), 550},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str1597), 81},
-      {uniname2ctype_offset(str1598), 219},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str1607), 592},
-      {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str1613), 164},
+      {uniname2ctype_offset(str2203), 222},
+      {-1}, {-1},
+      {uniname2ctype_offset(str2206), 246},
+      {uniname2ctype_offset(str2207), 372},
+      {-1}, {-1},
+      {uniname2ctype_offset(str2210), 633},
       {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str1617), 505},
-      {uniname2ctype_offset(str1618), 274},
+      {uniname2ctype_offset(str2214), 222},
       {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str1622), 388},
-      {uniname2ctype_offset(str1623), 573},
-      {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str1629), 39},
-      {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str1635), 72},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str1643), 62},
-      {uniname2ctype_offset(str1644), 235},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str1654), 403},
-      {uniname2ctype_offset(str1655), 276},
-      {-1},
-      {uniname2ctype_offset(str1657), 114},
-      {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str1662), 129},
-      {-1},
-      {uniname2ctype_offset(str1664), 451},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str1671), 343},
+      {uniname2ctype_offset(str2218), 177},
       {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str1675), 472},
-      {-1},
-      {uniname2ctype_offset(str1677), 317},
-      {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str1682), 634},
-      {-1},
-      {uniname2ctype_offset(str1684), 199},
-      {-1},
-      {uniname2ctype_offset(str1686), 93},
-      {uniname2ctype_offset(str1687), 141},
+      {uniname2ctype_offset(str2222), 448},
+      {uniname2ctype_offset(str2223), 616},
       {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str1691), 124},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str1699), 382},
+      {uniname2ctype_offset(str2227), 180},
+      {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str2231), 257},
       {-1},
-      {uniname2ctype_offset(str1701), 525},
+      {uniname2ctype_offset(str2233), 617},
       {-1}, {-1},
-      {uniname2ctype_offset(str1704), 207},
+      {uniname2ctype_offset(str2236), 36},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str1714), 207},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str1722), 362},
-      {-1},
-      {uniname2ctype_offset(str1724), 582},
-      {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str1728), 221},
-      {uniname2ctype_offset(str1729), 445},
-      {uniname2ctype_offset(str1730), 222},
-      {uniname2ctype_offset(str1731), 538},
-      {uniname2ctype_offset(str1732), 249},
-      {uniname2ctype_offset(str1733), 123},
-      {uniname2ctype_offset(str1734), 114},
-      {uniname2ctype_offset(str1735), 260},
-      {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str1740), 129},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str2254), 575},
+      {uniname2ctype_offset(str2255), 18},
       {-1},
-      {uniname2ctype_offset(str1742), 161},
-      {-1}, {-1},
-      {uniname2ctype_offset(str1745), 528},
-      {uniname2ctype_offset(str1746), 405},
-      {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str1750), 20},
+      {uniname2ctype_offset(str2257), 276},
+      {uniname2ctype_offset(str2258), 186},
       {-1},
-      {uniname2ctype_offset(str1752), 519},
-      {uniname2ctype_offset(str1753), 148},
+      {uniname2ctype_offset(str2260), 157},
       {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str1757), 518},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str1766), 73},
-      {-1},
-      {uniname2ctype_offset(str1768), 148},
-      {uniname2ctype_offset(str1769), 377},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str1776), 126},
-      {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str1781), 556},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str1788), 97},
+      {uniname2ctype_offset(str2264), 38},
+      {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str2270), 279},
       {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str1793), 97},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str1806), 351},
+      {uniname2ctype_offset(str2275), 199},
+      {uniname2ctype_offset(str2276), 42},
       {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str1810), 640},
-      {uniname2ctype_offset(str1811), 247},
-      {-1},
-      {uniname2ctype_offset(str1813), 266},
+      {uniname2ctype_offset(str2280), 58},
+      {uniname2ctype_offset(str2281), 115},
+      {-1}, {-1},
+      {uniname2ctype_offset(str2284), 207},
+      {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str2289), 586},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str1821), 224},
+      {uniname2ctype_offset(str2297), 671},
+      {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str2302), 576},
+      {uniname2ctype_offset(str2303), 549},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str1828), 402},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str1838), 623},
-      {-1}, {-1},
-      {uniname2ctype_offset(str1841), 460},
-      {uniname2ctype_offset(str1842), 394},
-      {uniname2ctype_offset(str1843), 65},
-      {-1},
-      {uniname2ctype_offset(str1845), 265},
-      {-1}, {-1},
-      {uniname2ctype_offset(str1848), 109},
-      {-1}, {-1},
-      {uniname2ctype_offset(str1851), 137},
+      {uniname2ctype_offset(str2310), 66},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str1866), 61},
       {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str1871), 494},
+      {uniname2ctype_offset(str2324), 391},
+      {uniname2ctype_offset(str2325), 489},
+      {-1},
+      {uniname2ctype_offset(str2327), 254},
+      {-1},
+      {uniname2ctype_offset(str2329), 523},
+      {uniname2ctype_offset(str2330), 1},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str1881), 63},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str1888), 531},
-      {uniname2ctype_offset(str1889), 555},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str1896), 626},
-      {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str1902), 434},
       {-1},
-      {uniname2ctype_offset(str1904), 455},
-      {uniname2ctype_offset(str1905), 590},
+      {uniname2ctype_offset(str2341), 394},
+      {uniname2ctype_offset(str2342), 450},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str1912), 586},
-      {uniname2ctype_offset(str1913), 143},
-      {-1}, {-1},
-      {uniname2ctype_offset(str1916), 594},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str1924), 143},
+      {uniname2ctype_offset(str2349), 150},
+      {uniname2ctype_offset(str2350), 370},
       {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str1929), 432},
+      {uniname2ctype_offset(str2355), 117},
       {-1}, {-1},
-      {uniname2ctype_offset(str1932), 415},
+      {uniname2ctype_offset(str2358), 490},
+      {uniname2ctype_offset(str2359), 142},
+      {uniname2ctype_offset(str2360), 505},
       {-1}, {-1},
-      {uniname2ctype_offset(str1935), 264},
-      {uniname2ctype_offset(str1936), 338},
-      {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str1941), 27},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str1950), 424},
-      {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str1956), 252},
-      {-1},
-      {uniname2ctype_offset(str1958), 109},
-      {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str1964), 440},
+      {uniname2ctype_offset(str2363), 666},
       {-1}, {-1},
-      {uniname2ctype_offset(str1967), 492},
-      {uniname2ctype_offset(str1968), 644},
-      {uniname2ctype_offset(str1969), 251},
+      {uniname2ctype_offset(str2366), 399},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str1974), 358},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str1981), 176},
+      {uniname2ctype_offset(str2380), 469},
+      {uniname2ctype_offset(str2381), 140},
       {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str1985), 408},
+      {uniname2ctype_offset(str2385), 623},
       {-1}, {-1},
-      {uniname2ctype_offset(str1988), 441},
-      {-1}, {-1},
-      {uniname2ctype_offset(str1991), 1},
-      {-1},
-      {uniname2ctype_offset(str1993), 375},
-      {uniname2ctype_offset(str1994), 175},
-      {-1},
-      {uniname2ctype_offset(str1996), 42},
+      {uniname2ctype_offset(str2388), 258},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str2398), 228},
       {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str2001), 110},
-      {uniname2ctype_offset(str2002), 598},
-      {-1},
-      {uniname2ctype_offset(str2004), 110},
+      {uniname2ctype_offset(str2403), 627},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1},
+      {uniname2ctype_offset(str2415), 339},
+      {-1}, {-1},
+      {uniname2ctype_offset(str2418), 117},
       {-1},
-      {uniname2ctype_offset(str2006), 410},
+      {uniname2ctype_offset(str2420), 157},
+      {uniname2ctype_offset(str2421), 529},
       {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str2010), 378},
-      {uniname2ctype_offset(str2011), 269},
-      {uniname2ctype_offset(str2012), 565},
-      {-1},
-      {uniname2ctype_offset(str2014), 336},
-      {uniname2ctype_offset(str2015), 117},
-      {uniname2ctype_offset(str2016), 209},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str2023), 32},
-      {uniname2ctype_offset(str2024), 506},
-      {-1},
-      {uniname2ctype_offset(str2026), 176},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str2033), 8},
+      {uniname2ctype_offset(str2425), 408},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str2040), 539},
-      {-1},
-      {uniname2ctype_offset(str2042), 121},
-      {uniname2ctype_offset(str2043), 17},
-      {uniname2ctype_offset(str2044), 117},
-      {-1}, {-1},
-      {uniname2ctype_offset(str2047), 107},
-      {uniname2ctype_offset(str2048), 526},
+      {uniname2ctype_offset(str2432), 429},
+      {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str2436), 238},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str2062), 130},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str2070), 9},
-      {-1}, {-1},
-      {uniname2ctype_offset(str2073), 345},
+      {uniname2ctype_offset(str2450), 282},
       {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str2077), 150},
-      {uniname2ctype_offset(str2078), 256},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1},
-      {uniname2ctype_offset(str2090), 277},
+      {uniname2ctype_offset(str2454), 153},
+      {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str2458), 153},
       {-1},
-      {uniname2ctype_offset(str2092), 150},
+      {uniname2ctype_offset(str2460), 168},
       {-1}, {-1},
-      {uniname2ctype_offset(str2095), 356},
+      {uniname2ctype_offset(str2463), 386},
+      {uniname2ctype_offset(str2464), 83},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str2103), 162},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str2110), 123},
-      {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str2114), 439},
-      {uniname2ctype_offset(str2115), 384},
-      {-1},
-      {uniname2ctype_offset(str2117), 174},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1},
-      {uniname2ctype_offset(str2128), 215},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str2135), 128},
-      {-1},
-      {uniname2ctype_offset(str2137), 12},
+      {uniname2ctype_offset(str2472), 474},
+      {uniname2ctype_offset(str2473), 464},
       {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str2141), 244},
+      {uniname2ctype_offset(str2477), 449},
       {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str2145), 52},
-      {uniname2ctype_offset(str2146), 416},
-      {-1}, {-1},
-      {uniname2ctype_offset(str2149), 221},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str2163), 251},
+      {uniname2ctype_offset(str2481), 207},
       {-1},
-      {uniname2ctype_offset(str2165), 174},
-      {uniname2ctype_offset(str2166), 5},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str2174), 233},
+      {uniname2ctype_offset(str2483), 455},
+      {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str2489), 374},
       {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str2178), 233},
-      {-1}, {-1},
-      {uniname2ctype_offset(str2181), 139},
-      {uniname2ctype_offset(str2182), 216},
+      {uniname2ctype_offset(str2493), 270},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str2503), 267},
+      {uniname2ctype_offset(str2504), 12},
       {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str2195), 354},
-      {uniname2ctype_offset(str2196), 496},
+      {uniname2ctype_offset(str2508), 668},
+      {-1},
+      {uniname2ctype_offset(str2510), 162},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str2519), 377},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1},
-      {uniname2ctype_offset(str2207), 196},
-      {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str2211), 20},
-      {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str2216), 367},
-      {uniname2ctype_offset(str2217), 128},
-      {uniname2ctype_offset(str2218), 547},
-      {uniname2ctype_offset(str2219), 78},
-      {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str2224), 453},
-      {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str2228), 43},
-      {uniname2ctype_offset(str2229), 35},
+      {uniname2ctype_offset(str2539), 124},
+      {-1},
+      {uniname2ctype_offset(str2541), 5},
       {-1}, {-1},
-      {uniname2ctype_offset(str2232), 385},
-      {uniname2ctype_offset(str2233), 216},
-      {uniname2ctype_offset(str2234), 92},
-      {uniname2ctype_offset(str2235), 489},
+      {uniname2ctype_offset(str2544), 476},
+      {uniname2ctype_offset(str2545), 217},
+      {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str2550), 55},
+      {-1},
+      {uniname2ctype_offset(str2552), 577},
+      {-1},
+      {uniname2ctype_offset(str2554), 240},
+      {-1},
+      {uniname2ctype_offset(str2556), 566},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str2565), 263},
+      {uniname2ctype_offset(str2566), 356},
       {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str2241), 92},
+      {uniname2ctype_offset(str2572), 256},
+      {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str2576), 162},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1},
-      {uniname2ctype_offset(str2244), 443},
+      {uniname2ctype_offset(str2588), 258},
+      {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str2593), 121},
+      {uniname2ctype_offset(str2594), 388},
       {-1}, {-1},
-      {uniname2ctype_offset(str2247), 36},
-      {uniname2ctype_offset(str2248), 602},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str2276), 418},
+      {uniname2ctype_offset(str2597), 658},
+      {uniname2ctype_offset(str2598), 402},
+      {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str2603), 656},
       {-1},
-      {uniname2ctype_offset(str2278), 124},
-      {uniname2ctype_offset(str2279), 192},
+      {uniname2ctype_offset(str2605), 92},
+      {uniname2ctype_offset(str2606), 289},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str2615), 91},
+      {uniname2ctype_offset(str2616), 27},
       {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str2283), 214},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str2620), 466},
       {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str2296), 639},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str2305), 205},
-      {-1}, {-1},
-      {uniname2ctype_offset(str2308), 234},
+      {uniname2ctype_offset(str2624), 261},
       {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str2312), 177},
+      {uniname2ctype_offset(str2628), 615},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1},
-      {uniname2ctype_offset(str2315), 601},
-      {uniname2ctype_offset(str2316), 638},
+      {uniname2ctype_offset(str2640), 400},
       {-1},
-      {uniname2ctype_offset(str2318), 202},
+      {uniname2ctype_offset(str2642), 201},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str2649), 390},
       {-1}, {-1},
-      {uniname2ctype_offset(str2321), 153},
-      {-1},
-      {uniname2ctype_offset(str2323), 172},
+      {uniname2ctype_offset(str2652), 8},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str2666), 470},
       {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str2327), 381},
+      {uniname2ctype_offset(str2670), 145},
       {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str2331), 636},
+      {uniname2ctype_offset(str2674), 26},
       {-1},
-      {uniname2ctype_offset(str2333), 134},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str2343), 591},
-      {uniname2ctype_offset(str2344), 442},
-      {uniname2ctype_offset(str2345), 241},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str2353), 202},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str2361), 606},
+      {uniname2ctype_offset(str2676), 639},
       {-1}, {-1},
-      {uniname2ctype_offset(str2364), 323},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str2373), 37},
-      {uniname2ctype_offset(str2374), 392},
-      {uniname2ctype_offset(str2375), 197},
+      {uniname2ctype_offset(str2679), 21},
+      {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str2685), 103},
+      {-1},
+      {uniname2ctype_offset(str2687), 29},
+      {-1}, {-1},
+      {uniname2ctype_offset(str2690), 223},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str2397), 421},
-      {uniname2ctype_offset(str2398), 413},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str2405), 165},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str2414), 82},
+      {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str2713), 85},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str2427), 23},
+      {uniname2ctype_offset(str2723), 383},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str2733), 261},
       {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str2433), 339},
-      {uniname2ctype_offset(str2434), 154},
-      {-1}, {-1},
-      {uniname2ctype_offset(str2437), 194},
+      {uniname2ctype_offset(str2739), 550},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str2746), 175},
       {-1}, {-1},
-      {uniname2ctype_offset(str2440), 100},
+      {uniname2ctype_offset(str2749), 263},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1},
-      {uniname2ctype_offset(str2451), 103},
-      {-1}, {-1},
-      {uniname2ctype_offset(str2454), 220},
       {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str2460), 257},
-      {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str2464), 159},
+      {uniname2ctype_offset(str2773), 291},
       {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str2470), 448},
-      {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str2475), 142},
-      {uniname2ctype_offset(str2476), 558},
+      {uniname2ctype_offset(str2779), 437},
+      {-1}, {-1},
+      {uniname2ctype_offset(str2782), 214},
+      {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str2788), 122},
       {-1},
-      {uniname2ctype_offset(str2478), 417},
-      {uniname2ctype_offset(str2479), 361},
+      {uniname2ctype_offset(str2790), 54},
       {-1},
-      {uniname2ctype_offset(str2481), 386},
+      {uniname2ctype_offset(str2792), 499},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str2500), 121},
-      {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str2506), 532},
+      {uniname2ctype_offset(str2811), 34},
+      {uniname2ctype_offset(str2812), 397},
+      {uniname2ctype_offset(str2813), 64},
       {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str2511), 244},
-      {-1},
-      {uniname2ctype_offset(str2513), 630},
+      {uniname2ctype_offset(str2818), 219},
+      {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str2823), 401},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str2530), 82},
-      {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str2534), 340},
-      {uniname2ctype_offset(str2535), 237},
+      {uniname2ctype_offset(str2833), 507},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str2545), 277},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str2849), 225},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str2856), 85},
+      {-1},
+      {uniname2ctype_offset(str2858), 662},
+      {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str2863), 219},
       {-1}, {-1},
-      {uniname2ctype_offset(str2548), 118},
-      {uniname2ctype_offset(str2549), 159},
+      {uniname2ctype_offset(str2866), 128},
+      {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str2870), 264},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1},
+      {uniname2ctype_offset(str2881), 626},
       {-1},
-      {uniname2ctype_offset(str2551), 89},
+      {uniname2ctype_offset(str2883), 142},
+      {uniname2ctype_offset(str2884), 384},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str2564), 372},
       {-1}, {-1},
-      {uniname2ctype_offset(str2567), 318},
+      {uniname2ctype_offset(str2896), 81},
+      {uniname2ctype_offset(str2897), 48},
       {-1}, {-1},
-      {uniname2ctype_offset(str2570), 491},
+      {uniname2ctype_offset(str2900), 287},
       {-1},
-      {uniname2ctype_offset(str2572), 473},
+      {uniname2ctype_offset(str2902), 443},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str2916), 193},
       {-1},
-      {uniname2ctype_offset(str2574), 246},
-      {uniname2ctype_offset(str2575), 474},
-      {uniname2ctype_offset(str2576), 275},
-      {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str2582), 391},
+      {uniname2ctype_offset(str2918), 657},
       {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str2588), 154},
+      {uniname2ctype_offset(str2924), 95},
+      {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str2928), 493},
+      {-1},
+      {uniname2ctype_offset(str2930), 380},
+      {uniname2ctype_offset(str2931), 95},
+      {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str2935), 458},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str2945), 244},
       {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str2602), 210},
-      {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str2606), 374},
+      {uniname2ctype_offset(str2950), 195},
+      {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str2956), 86},
+      {-1}, {-1},
+      {uniname2ctype_offset(str2959), 275},
+      {uniname2ctype_offset(str2960), 97},
+      {uniname2ctype_offset(str2961), 214},
+      {uniname2ctype_offset(str2962), 86},
       {-1},
-      {uniname2ctype_offset(str2608), 458},
-      {uniname2ctype_offset(str2609), 55},
+      {uniname2ctype_offset(str2964), 287},
+      {uniname2ctype_offset(str2965), 434},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str2974), 240},
+      {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str2980), 37},
+      {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str2985), 334},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str2625), 262},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str3007), 201},
+      {-1},
+      {uniname2ctype_offset(str3009), 102},
+      {-1},
+      {uniname2ctype_offset(str3011), 133},
+      {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str3017), 121},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str3034), 54},
+      {uniname2ctype_offset(str3035), 326},
       {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str2648), 254},
+      {uniname2ctype_offset(str3040), 93},
+      {-1},
+      {uniname2ctype_offset(str3042), 262},
       {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str2652), 383},
+      {uniname2ctype_offset(str3046), 106},
+      {uniname2ctype_offset(str3047), 66},
+      {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str3053), 607},
+      {-1}, {-1},
+      {uniname2ctype_offset(str3056), 28},
       {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str2656), 368},
-      {uniname2ctype_offset(str2657), 112},
+      {uniname2ctype_offset(str3060), 155},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str2665), 87},
-      {uniname2ctype_offset(str2666), 50},
-      {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str2670), 632},
-      {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str2674), 87},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str2688), 139},
-      {uniname2ctype_offset(str2689), 641},
-      {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str2694), 48},
+      {uniname2ctype_offset(str3068), 321},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str3077), 63},
+      {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str3083), 325},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str3096), 216},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str3103), 245},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str3112), 264},
       {-1},
-      {uniname2ctype_offset(str2705), 481},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1},
-      {uniname2ctype_offset(str2726), 226},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str2750), 557},
+      {uniname2ctype_offset(str3114), 273},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str3127), 255},
       {-1},
-      {uniname2ctype_offset(str2761), 18},
-      {uniname2ctype_offset(str2762), 265},
-      {-1}, {-1},
-      {uniname2ctype_offset(str2765), 133},
-      {uniname2ctype_offset(str2766), 54},
-      {-1}, {-1},
-      {uniname2ctype_offset(str2769), 483},
-      {-1}, {-1},
-      {uniname2ctype_offset(str2772), 199},
-      {-1}, {-1},
-      {uniname2ctype_offset(str2775), 38},
+      {uniname2ctype_offset(str3129), 600},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str3138), 640},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1},
-      {uniname2ctype_offset(str2786), 4},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str2793), 34},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str2801), 29},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str2808), 512},
+      {uniname2ctype_offset(str3149), 541},
       {-1},
-      {uniname2ctype_offset(str2810), 226},
+      {uniname2ctype_offset(str3151), 202},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str3158), 126},
+      {uniname2ctype_offset(str3159), 485},
+      {uniname2ctype_offset(str3160), 379},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str3179), 251},
       {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str2816), 310},
-      {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str2821), 393},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str2830), 614},
-      {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str2834), 364},
+      {uniname2ctype_offset(str3185), 494},
       {-1},
-      {uniname2ctype_offset(str2836), 78},
+      {uniname2ctype_offset(str3187), 572},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1},
-      {uniname2ctype_offset(str2847), 248},
       {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str2852), 305},
+      {uniname2ctype_offset(str3201), 256},
+      {uniname2ctype_offset(str3202), 487},
       {-1}, {-1},
-      {uniname2ctype_offset(str2855), 190},
-      {uniname2ctype_offset(str2856), 66},
+      {uniname2ctype_offset(str3205), 51},
       {-1}, {-1},
-      {uniname2ctype_offset(str2859), 427},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str2867), 309},
-      {uniname2ctype_offset(str2868), 248},
+      {uniname2ctype_offset(str3208), 291},
       {-1}, {-1},
-      {uniname2ctype_offset(str2871), 254},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str2879), 204},
+      {uniname2ctype_offset(str3211), 64},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str2886), 631},
+      {uniname2ctype_offset(str3218), 265},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str2902), 477},
       {-1},
-      {uniname2ctype_offset(str2904), 464},
-      {uniname2ctype_offset(str2905), 273},
+      {uniname2ctype_offset(str3238), 194},
+      {uniname2ctype_offset(str3239), 406},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str3247), 194},
+      {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str3253), 609},
+      {uniname2ctype_offset(str3254), 484},
+      {-1}, {-1},
+      {uniname2ctype_offset(str3257), 452},
       {-1},
-      {uniname2ctype_offset(str2907), 273},
+      {uniname2ctype_offset(str3259), 642},
+      {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str3265), 409},
       {-1},
-      {uniname2ctype_offset(str2909), 577},
+      {uniname2ctype_offset(str3267), 597},
+      {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str3273), 407},
+      {uniname2ctype_offset(str3274), 491},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str3290), 229},
       {-1},
-      {uniname2ctype_offset(str2911), 450},
+      {uniname2ctype_offset(str3292), 347},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1},
+      {uniname2ctype_offset(str3312), 193},
+      {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str3318), 232},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1},
-      {uniname2ctype_offset(str2941), 363},
+      {uniname2ctype_offset(str3328), 628},
+      {-1},
+      {uniname2ctype_offset(str3330), 136},
+      {uniname2ctype_offset(str3331), 641},
+      {uniname2ctype_offset(str3332), 216},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str3340), 183},
+      {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str3344), 517},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1},
-      {uniname2ctype_offset(str2953), 198},
+      {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str3357), 480},
+      {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str3361), 63},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str3371), 433},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str3389), 329},
       {-1},
-      {uniname2ctype_offset(str2964), 520},
-      {-1},
-      {uniname2ctype_offset(str2966), 238},
-      {uniname2ctype_offset(str2967), 43},
-      {-1}, {-1},
-      {uniname2ctype_offset(str2970), 88},
+      {uniname2ctype_offset(str3391), 331},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str2980), 195},
-      {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str2984), 574},
+      {uniname2ctype_offset(str3401), 92},
+      {uniname2ctype_offset(str3402), 50},
+      {uniname2ctype_offset(str3403), 247},
       {-1},
-      {uniname2ctype_offset(str2986), 118},
-      {uniname2ctype_offset(str2987), 54},
-      {uniname2ctype_offset(str2988), 471},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str2997), 603},
-      {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str3001), 180},
-      {uniname2ctype_offset(str3002), 64},
-      {-1}, {-1},
-      {uniname2ctype_offset(str3005), 475},
-      {uniname2ctype_offset(str3006), 583},
+      {uniname2ctype_offset(str3405), 271},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str3015), 83},
-      {-1}, {-1},
-      {uniname2ctype_offset(str3018), 94},
-      {uniname2ctype_offset(str3019), 165},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str3026), 83},
-      {uniname2ctype_offset(str3027), 503},
+      {uniname2ctype_offset(str3414), 229},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str3035), 232},
+      {uniname2ctype_offset(str3422), 423},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str3431), 353},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str3446), 150},
+      {uniname2ctype_offset(str3447), 324},
+      {uniname2ctype_offset(str3448), 320},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str3042), 211},
+      {uniname2ctype_offset(str3455), 43},
+      {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str3460), 537},
       {-1}, {-1},
-      {uniname2ctype_offset(str3045), 615},
+      {uniname2ctype_offset(str3463), 212},
+      {uniname2ctype_offset(str3464), 412},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1},
-      {uniname2ctype_offset(str3048), 119},
+      {uniname2ctype_offset(str3476), 198},
       {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str3052), 89},
-      {uniname2ctype_offset(str3053), 229},
+      {uniname2ctype_offset(str3480), 87},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str3058), 185},
+      {uniname2ctype_offset(str3494), 87},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str3067), 185},
-      {uniname2ctype_offset(str3068), 99},
-      {-1}, {-1},
-      {uniname2ctype_offset(str3071), 198},
-      {uniname2ctype_offset(str3072), 133},
+      {uniname2ctype_offset(str3503), 133},
+      {uniname2ctype_offset(str3504), 20},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str3522), 43},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str3532), 248},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str3082), 130},
-      {-1},
-      {uniname2ctype_offset(str3084), 237},
       {-1},
-      {uniname2ctype_offset(str3086), 84},
-      {uniname2ctype_offset(str3087), 342},
-      {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str3091), 261},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str3099), 478},
+      {uniname2ctype_offset(str3543), 183},
       {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str3104), 84},
-      {-1},
-      {uniname2ctype_offset(str3106), 562},
-      {uniname2ctype_offset(str3107), 313},
+      {uniname2ctype_offset(str3548), 255},
+      {-1}, {-1},
+      {uniname2ctype_offset(str3551), 4},
+      {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str3557), 234},
+      {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str3561), 653},
       {-1},
-      {uniname2ctype_offset(str3109), 315},
-      {uniname2ctype_offset(str3110), 152},
-      {uniname2ctype_offset(str3111), 191},
+      {uniname2ctype_offset(str3563), 99},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str3118), 90},
+      {uniname2ctype_offset(str3570), 99},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str3580), 181},
       {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str3123), 107},
-      {-1},
-      {uniname2ctype_offset(str3125), 191},
+      {uniname2ctype_offset(str3585), 427},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str3135), 452},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str3142), 585},
-      {-1}, {-1},
-      {uniname2ctype_offset(str3145), 183},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str3155), 182},
-      {-1},
-      {uniname2ctype_offset(str3157), 231},
-      {uniname2ctype_offset(str3158), 328},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str3176), 396},
-      {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str3180), 331},
+      {uniname2ctype_offset(str3613), 45},
+      {uniname2ctype_offset(str3614), 208},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str3629), 126},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str3193), 433},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str3209), 62},
-      {-1}, {-1},
-      {uniname2ctype_offset(str3212), 211},
-      {-1}, {-1},
-      {uniname2ctype_offset(str3215), 180},
       {-1}, {-1},
-      {uniname2ctype_offset(str3218), 125},
+      {uniname2ctype_offset(str3650), 247},
+      {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str3654), 62},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str3663), 62},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str3670), 497},
+      {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str3676), 644},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str3689), 285},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str3237), 390},
-      {-1},
-      {uniname2ctype_offset(str3239), 308},
-      {uniname2ctype_offset(str3240), 304},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str3248), 213},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str3707), 136},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str3714), 277},
       {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str3254), 252},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1},
-      {uniname2ctype_offset(str3265), 610},
-      {-1},
-      {uniname2ctype_offset(str3267), 28},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str3275), 146},
+      {uniname2ctype_offset(str3720), 601},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str3284), 618},
+      {uniname2ctype_offset(str3729), 278},
       {-1}, {-1},
-      {uniname2ctype_offset(str3287), 223},
+      {uniname2ctype_offset(str3732), 223},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str3297), 311},
-      {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str3303), 307},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str3313), 255},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str3320), 223},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str3328), 63},
-      {uniname2ctype_offset(str3329), 625},
-      {-1},
-      {uniname2ctype_offset(str3331), 222},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str3338), 264},
+      {uniname2ctype_offset(str3757), 272},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str3766), 165},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str3348), 407},
-      {-1},
-      {uniname2ctype_offset(str3350), 501},
-      {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str3355), 47},
-      {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str3360), 337},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1},
-      {uniname2ctype_offset(str3371), 126},
-      {uniname2ctype_offset(str3372), 16},
-      {uniname2ctype_offset(str3373), 253},
       {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str3377), 147},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str3391), 238},
+      {uniname2ctype_offset(str3788), 127},
       {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str3396), 613},
+      {uniname2ctype_offset(str3793), 156},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str3810), 248},
+      {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str3814), 327},
+      {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str3820), 323},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str3405), 469},
+      {uniname2ctype_offset(str3829), 129},
+      {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str3835), 81},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1},
-      {uniname2ctype_offset(str3416), 51},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1},
-      {uniname2ctype_offset(str3428), 253},
+      {uniname2ctype_offset(str3854), 481},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str3877), 651},
       {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str3433), 205},
+      {uniname2ctype_offset(str3882), 436},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1},
-      {uniname2ctype_offset(str3436), 213},
+      {uniname2ctype_offset(str3894), 200},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str3455), 225},
+      {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str3925), 180},
       {-1}, {-1},
-      {uniname2ctype_offset(str3458), 10},
-      {-1},
-      {uniname2ctype_offset(str3460), 627},
+      {uniname2ctype_offset(str3928), 332},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str3483), 245},
+      {-1}, {-1},
+      {uniname2ctype_offset(str3949), 57},
+      {uniname2ctype_offset(str3950), 65},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str3502), 49},
       {-1},
-      {uniname2ctype_offset(str3504), 80},
-      {uniname2ctype_offset(str3505), 479},
-      {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str3511), 411},
+      {uniname2ctype_offset(str3979), 226},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str3996), 290},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1},
-      {uniname2ctype_offset(str3532), 578},
-      {uniname2ctype_offset(str3533), 57},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str4018), 636},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str3558), 59},
+      {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str4032), 226},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str3580), 179},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str3590), 103},
+      {uniname2ctype_offset(str4060), 629},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str3613), 41},
-      {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str3618), 99},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str4097), 241},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1},
-      {uniname2ctype_offset(str3648), 465},
+      {uniname2ctype_offset(str4109), 292},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1},
-      {uniname2ctype_offset(str3659), 178},
-      {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str3664), 177},
+      {uniname2ctype_offset(str4119), 217},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str3686), 204},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1},
+      {uniname2ctype_offset(str4148), 336},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1},
-      {uniname2ctype_offset(str3689), 246},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str3698), 504},
-      {uniname2ctype_offset(str3699), 552},
+      {uniname2ctype_offset(str4160), 231},
+      {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str4164), 149},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1},
-      {uniname2ctype_offset(str3701), 96},
+      {uniname2ctype_offset(str4175), 265},
       {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str3705), 320},
+      {uniname2ctype_offset(str4179), 483},
       {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str3710), 201},
-      {-1}, {-1},
-      {uniname2ctype_offset(str3713), 96},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str3721), 438},
+      {uniname2ctype_offset(str4184), 16},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str4212), 41},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str4222), 103},
+      {uniname2ctype_offset(str4223), 47},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str4239), 46},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str4248), 204},
+      {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str4254), 122},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str3744), 190},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str3754), 71},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1},
-      {uniname2ctype_offset(str3766), 467},
+      {uniname2ctype_offset(str4356), 252},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str3799), 214},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str3807), 260},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str3842), 182},
-      {-1}, {-1},
-      {uniname2ctype_offset(str3845), 259},
-      {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str3850), 245},
-      {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str3854), 65},
-      {-1}, {-1},
-      {uniname2ctype_offset(str3857), 616},
+      {uniname2ctype_offset(str4418), 521},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str4425), 182},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1},
-      {uniname2ctype_offset(str3868), 261},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str3881), 228},
-      {-1}, {-1},
-      {uniname2ctype_offset(str3884), 306},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str3891), 30},
+      {uniname2ctype_offset(str4468), 49},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str4484), 454},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str3924), 420},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str4509), 495},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str4517), 135},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str3942), 100},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str4545), 272},
       {-1},
-      {uniname2ctype_offset(str3944), 436},
-      {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str3949), 276},
+      {uniname2ctype_offset(str4547), 594},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str4562), 446},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str3976), 604},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str3998), 430},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str4007), 454},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1},
+      {uniname2ctype_offset(str4609), 93},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1},
+      {uniname2ctype_offset(str4638), 119},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str4652), 119},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str4670), 520},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str4687), 65},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str4703), 135},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str4106), 45},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str4116), 132},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str4728), 328},
+      {uniname2ctype_offset(str4729), 330},
+      {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str4734), 592},
+      {-1},
+      {uniname2ctype_offset(str4736), 208},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1},
-      {uniname2ctype_offset(str4127), 132},
+      {uniname2ctype_offset(str4747), 593},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str4756), 322},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str4771), 669},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str4169), 220},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str4821), 344},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str4231), 153},
+      {uniname2ctype_offset(str4865), 417},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str4896), 425},
+      {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str4902), 235},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str4917), 10},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
@@ -45384,18 +48271,15 @@ uniname2ctype_p (register const char *str, register size_t len)
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str4308), 401},
-      {uniname2ctype_offset(str4309), 162},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str5031), 482},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1},
-      {uniname2ctype_offset(str4348), 571},
+      {uniname2ctype_offset(str5043), 59},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str4361), 572},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
@@ -45406,64 +48290,48 @@ uniname2ctype_p (register const char *str, register size_t len)
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str4459), 119},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str4487), 147},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1},
+      {uniname2ctype_offset(str5216), 444},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1},
+      {uniname2ctype_offset(str5272), 71},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str4604), 116},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str4626), 116},
-      {uniname2ctype_offset(str4627), 255},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1},
-      {uniname2ctype_offset(str4674), 642},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str4683), 466},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1},
-      {uniname2ctype_offset(str4695), 80},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1},
-      {uniname2ctype_offset(str4734), 179},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1},
-      {uniname2ctype_offset(str4755), 312},
-      {uniname2ctype_offset(str4756), 314},
+      {uniname2ctype_offset(str5437), 30},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str4772), 409},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1},
-      {uniname2ctype_offset(str4783), 316},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str4810), 90},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
@@ -45471,32 +48339,31 @@ uniname2ctype_p (register const char *str, register size_t len)
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str5541), 158},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str4898), 75},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str5603), 654},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str5646), 270},
+      {uniname2ctype_offset(str5647), 185},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1},
-      {uniname2ctype_offset(str4982), 232},
-      {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str4986), 428},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str5666), 182},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str5018), 46},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1},
-      {uniname2ctype_offset(str5038), 242},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
@@ -45507,28 +48374,6 @@ uniname2ctype_p (register const char *str, register size_t len)
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str5134), 628},
-#endif /* USE_UNICODE_PROPERTIES */
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-#ifndef USE_UNICODE_PROPERTIES
-      {uniname2ctype_offset(str6), 12},
-      {uniname2ctype_offset(str7), 7},
-      {uniname2ctype_offset(str8), 15},
-      {uniname2ctype_offset(str9), 1},
-      {uniname2ctype_offset(str10), 13},
-      {uniname2ctype_offset(str11), 11},
-      {uniname2ctype_offset(str12), 10},
-      {uniname2ctype_offset(str13), 14},
-      {uniname2ctype_offset(str14), 3},
-      {uniname2ctype_offset(str15), 9},
-      {uniname2ctype_offset(str16), 8},
-      {uniname2ctype_offset(str17), 6},
-      {uniname2ctype_offset(str18), 5},
-      {uniname2ctype_offset(str19), 4},
-      {uniname2ctype_offset(str20), 2}
-#else /* USE_UNICODE_PROPERTIES */
-      {uniname2ctype_offset(str5141), 155},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
@@ -45541,13 +48386,13 @@ uniname2ctype_p (register const char *str, register size_t len)
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str5914), 228},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str5300), 225},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
@@ -45560,6 +48405,9 @@ uniname2ctype_p (register const char *str, register size_t len)
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str6073), 78},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
@@ -45578,6 +48426,7 @@ uniname2ctype_p (register const char *str, register size_t len)
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str6245), 670},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
@@ -45609,6 +48458,8 @@ uniname2ctype_p (register const char *str, register size_t len)
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str6528), 83},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
@@ -45623,8 +48474,6 @@ uniname2ctype_p (register const char *str, register size_t len)
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str5980), 155},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
@@ -45638,7 +48487,11 @@ uniname2ctype_p (register const char *str, register size_t len)
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str6098), 643}
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str6807), 158}
 #endif /* USE_UNICODE_PROPERTIES */
     };
 
@@ -45669,22 +48522,22 @@ uniname2ctype(const UChar *name, unsigned int len)
   return -1;
 }
 #if defined ONIG_UNICODE_VERSION_STRING && !( \
-      ONIG_UNICODE_VERSION_MAJOR == 15 && \
+      ONIG_UNICODE_VERSION_MAJOR == 16 && \
       ONIG_UNICODE_VERSION_MINOR == 0 && \
       ONIG_UNICODE_VERSION_TEENY == 0 && \
       1)
 # error ONIG_UNICODE_VERSION_STRING mismatch
 #endif
-#define ONIG_UNICODE_VERSION_STRING "15.0.0"
-#define ONIG_UNICODE_VERSION_MAJOR 15
+#define ONIG_UNICODE_VERSION_STRING "16.0.0"
+#define ONIG_UNICODE_VERSION_MAJOR 16
 #define ONIG_UNICODE_VERSION_MINOR 0
 #define ONIG_UNICODE_VERSION_TEENY 0
 #if defined ONIG_UNICODE_EMOJI_VERSION_STRING && !( \
-      ONIG_UNICODE_EMOJI_VERSION_MAJOR == 15 && \
+      ONIG_UNICODE_EMOJI_VERSION_MAJOR == 16 && \
       ONIG_UNICODE_EMOJI_VERSION_MINOR == 0 && \
       1)
 # error ONIG_UNICODE_EMOJI_VERSION_STRING mismatch
 #endif
-#define ONIG_UNICODE_EMOJI_VERSION_STRING "15.0"
-#define ONIG_UNICODE_EMOJI_VERSION_MAJOR 15
+#define ONIG_UNICODE_EMOJI_VERSION_STRING "16.0"
+#define ONIG_UNICODE_EMOJI_VERSION_MAJOR 16
 #define ONIG_UNICODE_EMOJI_VERSION_MINOR 0
diff --git a/encoding.c b/encoding.c
index 8bfab731770fdb..6fbb739bb631b7 100644
--- a/encoding.c
+++ b/encoding.c
@@ -24,6 +24,7 @@
 #include "internal/string.h"
 #include "internal/vm.h"
 #include "regenc.h"
+#include "ruby/atomic.h"
 #include "ruby/encoding.h"
 #include "ruby/util.h"
 #include "ruby_assert.h"
@@ -60,6 +61,7 @@ VALUE rb_cEncoding;
 static VALUE rb_encoding_list;
 
 struct rb_encoding_entry {
+    rb_atomic_t loaded;
     const char *name;
     rb_encoding *enc;
     rb_encoding *base;
@@ -71,19 +73,33 @@ static struct enc_table {
     st_table *names;
 } global_enc_table;
 
+static int
+enc_names_free_i(st_data_t name, st_data_t idx, st_data_t args)
+{
+    ruby_xfree((void *)name);
+    return ST_DELETE;
+}
+
+void
+rb_free_global_enc_table(void)
+{
+    for (size_t i = 0; i < ENCODING_LIST_CAPA; i++) {
+        xfree((void *)global_enc_table.list[i].enc);
+    }
+
+    st_foreach(global_enc_table.names, enc_names_free_i, (st_data_t)0);
+    st_free_table(global_enc_table.names);
+}
+
 static rb_encoding *global_enc_ascii,
                    *global_enc_utf_8,
                    *global_enc_us_ascii;
 
-#define GLOBAL_ENC_TABLE_ENTER(enc_table) struct enc_table *enc_table = &global_enc_table; RB_VM_LOCK_ENTER()
-#define GLOBAL_ENC_TABLE_LEAVE()                                                           RB_VM_LOCK_LEAVE()
-#define GLOBAL_ENC_TABLE_EVAL(enc_table, expr) do { \
-    GLOBAL_ENC_TABLE_ENTER(enc_table); \
-    { \
-        expr; \
-    } \
-    GLOBAL_ENC_TABLE_LEAVE(); \
-} while (0)
+#define GLOBAL_ENC_TABLE_LOCKING(tbl) \
+    for (struct enc_table *tbl = &global_enc_table, **locking = &tbl; \
+         locking; \
+         locking = NULL) \
+        RB_VM_LOCKING()
 
 
 #define ENC_DUMMY_FLAG (1<<24)
@@ -330,6 +346,8 @@ enc_table_expand(struct enc_table *enc_table, int newsize)
 static int
 enc_register_at(struct enc_table *enc_table, int index, const char *name, rb_encoding *base_encoding)
 {
+    ASSERT_vm_locking();
+
     struct rb_encoding_entry *ent = &enc_table->list[index];
     rb_raw_encoding *encoding;
 
@@ -344,6 +362,7 @@ enc_register_at(struct enc_table *enc_table, int index, const char *name, rb_enc
     if (!encoding) {
         encoding = xmalloc(sizeof(rb_encoding));
     }
+
     if (base_encoding) {
         *encoding = *base_encoding;
     }
@@ -356,12 +375,18 @@ enc_register_at(struct enc_table *enc_table, int index, const char *name, rb_enc
     st_insert(enc_table->names, (st_data_t)name, (st_data_t)index);
 
     enc_list_update(index, encoding);
+
+    // max_enc_len is used to mark a fully loaded encoding.
+    RUBY_ATOMIC_SET(ent->loaded, encoding->max_enc_len);
+
     return index;
 }
 
 static int
 enc_register(struct enc_table *enc_table, const char *name, rb_encoding *encoding)
 {
+    ASSERT_vm_locking();
+
     int index = enc_table->count;
 
     enc_table->count = enc_table_expand(enc_table, index + 1);
@@ -391,8 +416,7 @@ rb_enc_register(const char *name, rb_encoding *encoding)
 {
     int index;
 
-    GLOBAL_ENC_TABLE_ENTER(enc_table);
-    {
+    GLOBAL_ENC_TABLE_LOCKING(enc_table) {
         index = enc_registered(enc_table, name);
 
         if (index >= 0) {
@@ -412,13 +436,13 @@ rb_enc_register(const char *name, rb_encoding *encoding)
             set_encoding_const(name, rb_enc_from_index(index));
         }
     }
-    GLOBAL_ENC_TABLE_LEAVE();
     return index;
 }
 
 int
 enc_registered(struct enc_table *enc_table, const char *name)
 {
+    ASSERT_vm_locking();
     st_data_t idx = 0;
 
     if (!name) return -1;
@@ -432,15 +456,13 @@ enc_registered(struct enc_table *enc_table, const char *name)
 void
 rb_encdb_declare(const char *name)
 {
-    GLOBAL_ENC_TABLE_ENTER(enc_table);
-    {
+    GLOBAL_ENC_TABLE_LOCKING(enc_table) {
         int idx = enc_registered(enc_table, name);
         if (idx < 0) {
             idx = enc_register(enc_table, name, 0);
         }
         set_encoding_const(name, rb_enc_from_index(idx));
     }
-    GLOBAL_ENC_TABLE_LEAVE();
 }
 
 static void
@@ -472,13 +494,11 @@ set_base_encoding(struct enc_table *enc_table, int index, rb_encoding *base)
 void
 rb_enc_set_base(const char *name, const char *orig)
 {
-    GLOBAL_ENC_TABLE_ENTER(enc_table);
-    {
+    GLOBAL_ENC_TABLE_LOCKING(enc_table) {
         int idx = enc_registered(enc_table, name);
         int origidx = enc_registered(enc_table, orig);
         set_base_encoding(enc_table, idx, rb_enc_from_index(origidx));
     }
-    GLOBAL_ENC_TABLE_LEAVE();
 }
 
 /* for encdb.h
@@ -529,8 +549,7 @@ rb_encdb_replicate(const char *name, const char *orig)
 {
     int r;
 
-    GLOBAL_ENC_TABLE_ENTER(enc_table);
-    {
+    GLOBAL_ENC_TABLE_LOCKING(enc_table) {
         int origidx = enc_registered(enc_table, orig);
         int idx = enc_registered(enc_table, name);
 
@@ -539,7 +558,6 @@ rb_encdb_replicate(const char *name, const char *orig)
         }
         r = enc_replicate_with_index(enc_table, name, rb_enc_from_index(origidx), idx);
     }
-    GLOBAL_ENC_TABLE_LEAVE();
 
     return r;
 }
@@ -549,13 +567,11 @@ rb_define_dummy_encoding(const char *name)
 {
     int index;
 
-    GLOBAL_ENC_TABLE_ENTER(enc_table);
-    {
+    GLOBAL_ENC_TABLE_LOCKING(enc_table) {
         index = enc_replicate(enc_table, name, rb_ascii8bit_encoding());
         rb_encoding *enc = enc_table->list[index].enc;
         ENC_SET_DUMMY((rb_raw_encoding *)enc);
     }
-    GLOBAL_ENC_TABLE_LEAVE();
 
     return index;
 }
@@ -565,15 +581,13 @@ rb_encdb_dummy(const char *name)
 {
     int index;
 
-    GLOBAL_ENC_TABLE_ENTER(enc_table);
-    {
+    GLOBAL_ENC_TABLE_LOCKING(enc_table) {
         index = enc_replicate_with_index(enc_table, name,
                                          rb_ascii8bit_encoding(),
                                          enc_registered(enc_table, name));
         rb_encoding *enc = enc_table->list[index].enc;
         ENC_SET_DUMMY((rb_raw_encoding *)enc);
     }
-    GLOBAL_ENC_TABLE_LEAVE();
 
     return index;
 }
@@ -635,6 +649,7 @@ enc_dup_name(st_data_t name)
 static int
 enc_alias_internal(struct enc_table *enc_table, const char *alias, int idx)
 {
+    ASSERT_vm_locking();
     return st_insert2(enc_table->names, (st_data_t)alias, (st_data_t)idx,
                       enc_dup_name);
 }
@@ -653,8 +668,7 @@ rb_enc_alias(const char *alias, const char *orig)
 {
     int idx, r;
 
-    GLOBAL_ENC_TABLE_ENTER(enc_table);
-    {
+    GLOBAL_ENC_TABLE_LOCKING(enc_table) {
         enc_check_addable(enc_table, alias);
         if ((idx = rb_enc_find_index(orig)) < 0) {
             r =  -1;
@@ -663,7 +677,6 @@ rb_enc_alias(const char *alias, const char *orig)
             r = enc_alias(enc_table, alias, idx);
         }
     }
-    GLOBAL_ENC_TABLE_LEAVE();
 
     return r;
 }
@@ -673,8 +686,7 @@ rb_encdb_alias(const char *alias, const char *orig)
 {
     int r;
 
-    GLOBAL_ENC_TABLE_ENTER(enc_table);
-    {
+    GLOBAL_ENC_TABLE_LOCKING(enc_table) {
         int idx = enc_registered(enc_table, orig);
 
         if (idx < 0) {
@@ -682,7 +694,6 @@ rb_encdb_alias(const char *alias, const char *orig)
         }
         r = enc_alias(enc_table, alias, idx);
     }
-    GLOBAL_ENC_TABLE_LEAVE();
 
     return r;
 }
@@ -690,6 +701,7 @@ rb_encdb_alias(const char *alias, const char *orig)
 static void
 rb_enc_init(struct enc_table *enc_table)
 {
+    ASSERT_vm_locking();
     enc_table_expand(enc_table, ENCODING_COUNT + 1);
     if (!enc_table->names) {
         enc_table->names = st_init_strcasetable_with_size(ENCODING_LIST_CAPA);
@@ -749,8 +761,7 @@ load_encoding(const char *name)
     ruby_debug = debug;
     rb_set_errinfo(errinfo);
 
-    GLOBAL_ENC_TABLE_ENTER(enc_table);
-    {
+    GLOBAL_ENC_TABLE_LOCKING(enc_table) {
         if (loaded < 0 || 1 < loaded) {
             idx = -1;
         }
@@ -761,51 +772,74 @@ load_encoding(const char *name)
             idx = -1;
         }
     }
-    GLOBAL_ENC_TABLE_LEAVE();
 
     return idx;
 }
 
 static int
-enc_autoload_body(struct enc_table *enc_table, rb_encoding *enc)
+enc_autoload_body(rb_encoding *enc)
 {
-    rb_encoding *base = enc_table->list[ENC_TO_ENCINDEX(enc)].base;
+    rb_encoding *base;
+    int i = 0;
+
+    GLOBAL_ENC_TABLE_LOCKING(enc_table) {
+        base = enc_table->list[ENC_TO_ENCINDEX(enc)].base;
+        if (base) {
+            do {
+                if (i >= enc_table->count) {
+                    i = -1;
+                    break;
+                }
+            } while (enc_table->list[i].enc != base && (++i, 1));
+        }
+    }
+
+    if (i == -1) return -1;
 
     if (base) {
-        int i = 0;
-        do {
-            if (i >= enc_table->count) return -1;
-        } while (enc_table->list[i].enc != base && (++i, 1));
         if (rb_enc_autoload_p(base)) {
             if (rb_enc_autoload(base) < 0) return -1;
         }
         i = enc->ruby_encoding_index;
-        enc_register_at(enc_table, i & ENC_INDEX_MASK, rb_enc_name(enc), base);
+
+        GLOBAL_ENC_TABLE_LOCKING(enc_table) {
+            enc_register_at(enc_table, i & ENC_INDEX_MASK, rb_enc_name(enc), base);
+        }
+
         ((rb_raw_encoding *)enc)->ruby_encoding_index = i;
         i &= ENC_INDEX_MASK;
         return i;
     }
-    else {
-        return -2;
-    }
+
+    return -2;
 }
 
 int
 rb_enc_autoload(rb_encoding *enc)
 {
-    int i;
-    GLOBAL_ENC_TABLE_EVAL(enc_table, i = enc_autoload_body(enc_table, enc));
+    int i = enc_autoload_body(enc);
     if (i == -2) {
         i = load_encoding(rb_enc_name(enc));
     }
     return i;
 }
 
+bool
+rb_enc_autoload_p(rb_encoding *enc)
+{
+    int idx = ENC_TO_ENCINDEX(enc);
+    RUBY_ASSERT(rb_enc_from_index(idx) == enc);
+    return !RUBY_ATOMIC_LOAD(global_enc_table.list[idx].loaded);
+}
+
 /* Return encoding index or UNSPECIFIED_ENCODING from encoding name */
 int
 rb_enc_find_index(const char *name)
 {
-    int i = enc_registered(&global_enc_table, name);
+    int i;
+    GLOBAL_ENC_TABLE_LOCKING(enc_table) {
+        i = enc_registered(enc_table, name);
+    }
     rb_encoding *enc;
 
     if (i < 0) {
@@ -949,6 +983,21 @@ enc_set_index(VALUE obj, int idx)
     rb_ivar_set(obj, rb_id_encoding(), INT2NUM(idx));
 }
 
+void
+rb_enc_raw_set(VALUE obj, rb_encoding *enc)
+{
+    RUBY_ASSERT(enc_capable(obj));
+
+    int idx = enc ? ENC_TO_ENCINDEX(enc) : 0;
+
+    if (idx < ENCODING_INLINE_MAX) {
+        ENCODING_SET_INLINED(obj, idx);
+        return;
+    }
+    ENCODING_SET_INLINED(obj, ENCODING_INLINE_MAX);
+    rb_ivar_set(obj, rb_id_encoding(), INT2NUM(idx));
+}
+
 void
 rb_enc_set_index(VALUE obj, int idx)
 {
@@ -997,13 +1046,22 @@ rb_enc_get(VALUE obj)
     return rb_enc_from_index(rb_enc_get_index(obj));
 }
 
+const char *
+rb_enc_inspect_name(rb_encoding *enc)
+{
+    if (enc == global_enc_ascii) {
+        return "BINARY (ASCII-8BIT)";
+    }
+    return enc->name;
+}
+
 static rb_encoding*
 rb_encoding_check(rb_encoding* enc, VALUE str1, VALUE str2)
 {
     if (!enc)
         rb_raise(rb_eEncCompatError, "incompatible character encodings: %s and %s",
-                 rb_enc_name(rb_enc_get(str1)),
-                 rb_enc_name(rb_enc_get(str2)));
+                 rb_enc_inspect_name(rb_enc_get(str1)),
+                 rb_enc_inspect_name(rb_enc_get(str2)));
     return enc;
 }
 
@@ -1026,6 +1084,13 @@ rb_enc_check(VALUE str1, VALUE str2)
 static rb_encoding*
 enc_compatible_latter(VALUE str1, VALUE str2, int idx1, int idx2)
 {
+    if (idx1 < 0 || idx2 < 0)
+        return 0;
+
+    if (idx1 == idx2) {
+        return rb_enc_from_index(idx1);
+    }
+
     int isstr1, isstr2;
     rb_encoding *enc1 = rb_enc_from_index(idx1);
     rb_encoding *enc2 = rb_enc_from_index(idx2);
@@ -1084,15 +1149,7 @@ enc_compatible_str(VALUE str1, VALUE str2)
     int idx1 = enc_get_index_str(str1);
     int idx2 = enc_get_index_str(str2);
 
-    if (idx1 < 0 || idx2 < 0)
-        return 0;
-
-    if (idx1 == idx2) {
-        return rb_enc_from_index(idx1);
-    }
-    else {
-        return enc_compatible_latter(str1, str2, idx1, idx2);
-    }
+    return enc_compatible_latter(str1, str2, idx1, idx2);
 }
 
 rb_encoding*
@@ -1101,13 +1158,6 @@ rb_enc_compatible(VALUE str1, VALUE str2)
     int idx1 = rb_enc_get_index(str1);
     int idx2 = rb_enc_get_index(str2);
 
-    if (idx1 < 0 || idx2 < 0)
-        return 0;
-
-    if (idx1 == idx2) {
-        return rb_enc_from_index(idx1);
-    }
-
     return enc_compatible_latter(str1, str2, idx1, idx2);
 }
 
@@ -1245,9 +1295,10 @@ enc_inspect(VALUE self)
     if (!(enc = DATA_PTR(self)) || rb_enc_from_index(rb_enc_to_index(enc)) != enc) {
         rb_raise(rb_eTypeError, "broken Encoding");
     }
+
     return rb_enc_sprintf(rb_usascii_encoding(),
                           "#<%"PRIsVALUE":%s%s%s>", rb_obj_class(self),
-                          rb_enc_name(enc),
+                          rb_enc_inspect_name(enc),
                           (ENC_DUMMY_P(enc) ? " (dummy)" : ""),
                           rb_enc_autoload_p(enc) ? " (autoload)" : "");
 }
@@ -1273,7 +1324,7 @@ enc_names_i(st_data_t name, st_data_t idx, st_data_t args)
     VALUE *arg = (VALUE *)args;
 
     if ((int)idx == (int)arg[0]) {
-        VALUE str = rb_fstring_cstr((char *)name);
+        VALUE str = rb_interned_str_cstr((char *)name);
         rb_ary_push(arg[1], str);
     }
     return ST_CONTINUE;
@@ -1469,16 +1520,16 @@ rb_locale_encindex(void)
 
     if (idx < 0) idx = ENCINDEX_UTF_8;
 
-    if (enc_registered(&global_enc_table, "locale") < 0) {
+    GLOBAL_ENC_TABLE_LOCKING(enc_table) {
+        if (enc_registered(enc_table, "locale") < 0) {
 # if defined _WIN32
-        void Init_w32_codepage(void);
-        Init_w32_codepage();
+            void Init_w32_codepage(void);
+            Init_w32_codepage();
 # endif
-        GLOBAL_ENC_TABLE_ENTER(enc_table);
-        {
-            enc_alias_internal(enc_table, "locale", idx);
+            GLOBAL_ENC_TABLE_LOCKING(enc_table) {
+                enc_alias_internal(enc_table, "locale", idx);
+            }
         }
-        GLOBAL_ENC_TABLE_LEAVE();
     }
 
     return idx;
@@ -1493,7 +1544,10 @@ rb_locale_encoding(void)
 int
 rb_filesystem_encindex(void)
 {
-    int idx = enc_registered(&global_enc_table, "filesystem");
+    int idx;
+    GLOBAL_ENC_TABLE_LOCKING(enc_table) {
+        idx = enc_registered(enc_table, "filesystem");
+    }
     if (idx < 0) idx = ENCINDEX_ASCII_8BIT;
     return idx;
 }
@@ -1520,12 +1574,18 @@ enc_set_default_encoding(struct default_encoding *def, VALUE encoding, const cha
         /* Already set */
         overridden = TRUE;
 
-    GLOBAL_ENC_TABLE_ENTER(enc_table);
-    {
+    GLOBAL_ENC_TABLE_LOCKING(enc_table) {
         if (NIL_P(encoding)) {
             def->index = -1;
             def->enc = 0;
-            st_insert(enc_table->names, (st_data_t)strdup(name),
+            char *name_dup = strdup(name);
+
+            st_data_t existing_name = (st_data_t)name_dup;
+            if (st_delete(enc_table->names, &existing_name, NULL)) {
+                xfree((void *)existing_name);
+            }
+
+            st_insert(enc_table->names, (st_data_t)name_dup,
                       (st_data_t)UNSPECIFIED_ENCODING);
         }
         else {
@@ -1538,7 +1598,6 @@ enc_set_default_encoding(struct default_encoding *def, VALUE encoding, const cha
             enc_alias_internal(enc_table, "filesystem", Init_enc_set_filesystem_encoding());
         }
     }
-    GLOBAL_ENC_TABLE_LEAVE();
 
     return overridden;
 }
@@ -1763,7 +1822,7 @@ static int
 rb_enc_name_list_i(st_data_t name, st_data_t idx, st_data_t arg)
 {
     VALUE ary = (VALUE)arg;
-    VALUE str = rb_fstring_cstr((char *)name);
+    VALUE str = rb_interned_str_cstr((char *)name);
     rb_ary_push(ary, str);
     return ST_CONTINUE;
 }
@@ -1808,7 +1867,7 @@ rb_enc_aliases_enc_i(st_data_t name, st_data_t orig, st_data_t arg)
         str = rb_fstring_cstr(rb_enc_name(enc));
         rb_ary_store(ary, idx, str);
     }
-    key = rb_fstring_cstr((char *)name);
+    key = rb_interned_str_cstr((char *)name);
     rb_hash_aset(aliases, key, str);
     return ST_CONTINUE;
 }
@@ -1902,7 +1961,7 @@ Init_Encoding(void)
 
     list = rb_encoding_list = rb_ary_new2(ENCODING_LIST_CAPA);
     RBASIC_CLEAR_CLASS(list);
-    rb_gc_register_mark_object(list);
+    rb_vm_register_global_object(list);
 
     for (i = 0; i < enc_table->count; ++i) {
         rb_ary_push(list, enc_new(enc_table->list[i].enc));
@@ -1911,6 +1970,17 @@ Init_Encoding(void)
     rb_marshal_define_compat(rb_cEncoding, Qnil, 0, enc_m_loader);
 }
 
+void
+Init_unicode_version(void)
+{
+    extern const char onigenc_unicode_version_string[];
+
+    VALUE str = rb_usascii_str_new_static(onigenc_unicode_version_string,
+                                          strlen(onigenc_unicode_version_string));
+    OBJ_FREEZE(str);
+    rb_define_const(rb_cEncoding, "UNICODE_VERSION", str);
+}
+
 void
 Init_encodings(void)
 {
diff --git a/enum.c b/enum.c
index 355170cc3ecb68..cbf74df484bbcd 100644
--- a/enum.c
+++ b/enum.c
@@ -322,16 +322,33 @@ enum_count(int argc, VALUE *argv, VALUE obj)
     return imemo_count_value(memo);
 }
 
+NORETURN(static void found(VALUE i, VALUE memop));
+static void
+found(VALUE i, VALUE memop)
+{
+    struct MEMO *memo = MEMO_CAST(memop);
+    MEMO_V1_SET(memo, i);
+    memo->u3.cnt = 1;
+    rb_iter_break();
+}
+
+static VALUE
+find_i_fast(RB_BLOCK_CALL_FUNC_ARGLIST(i, memop))
+{
+    if (RTEST(rb_yield_values2(argc, argv))) {
+        ENUM_WANT_SVALUE();
+        found(i, memop);
+    }
+    return Qnil;
+}
+
 static VALUE
 find_i(RB_BLOCK_CALL_FUNC_ARGLIST(i, memop))
 {
     ENUM_WANT_SVALUE();
 
     if (RTEST(enum_yield(argc, i))) {
-        struct MEMO *memo = MEMO_CAST(memop);
-        MEMO_V1_SET(memo, i);
-        memo->u3.cnt = 1;
-        rb_iter_break();
+        found(i, memop);
     }
     return Qnil;
 }
@@ -366,7 +383,10 @@ enum_find(int argc, VALUE *argv, VALUE obj)
     if_none = rb_check_arity(argc, 0, 1) ? argv[0] : Qnil;
     RETURN_ENUMERATOR(obj, argc, argv);
     memo = MEMO_NEW(Qundef, 0, 0);
-    rb_block_call(obj, id_each, 0, 0, find_i, (VALUE)memo);
+    if (rb_block_pair_yield_optimizable())
+        rb_block_call2(obj, id_each, 0, 0, find_i_fast, (VALUE)memo, RB_BLOCK_NO_USE_PACKED_ARGS);
+    else
+        rb_block_call2(obj, id_each, 0, 0, find_i, (VALUE)memo, RB_BLOCK_NO_USE_PACKED_ARGS);
     if (memo->u3.cnt) {
         return memo->v1;
     }
@@ -870,134 +890,151 @@ ary_inject_op(VALUE ary, VALUE init, VALUE op)
 
 /*
  *  call-seq:
- *    inject(symbol) -> object
- *    inject(initial_operand, symbol) -> object
- *    inject {|memo, operand| ... } -> object
- *    inject(initial_operand) {|memo, operand| ... } -> object
- *
- *  Returns an object formed from operands via either:
+ *    inject(symbol)                -> object
+ *    inject(initial_value, symbol) -> object
+ *    inject {|memo, value| ... }   -> object
+ *    inject(initial_value) {|memo, value| ... } -> object
+ *
+ *  Returns the result of applying a reducer to an initial value and
+ *  the first element of the Enumerable. It then takes the result and applies the
+ *  function to it and the second element of the collection, and so on. The
+ *  return value is the result returned by the final call to the function.
  *
- *  - A method named by +symbol+.
- *  - A block to which each operand is passed.
- *
- *  With method-name argument +symbol+,
- *  combines operands using the method:
- *
- *    # Sum, without initial_operand.
- *    (1..4).inject(:+)     # => 10
- *    # Sum, with initial_operand.
- *    (1..4).inject(10, :+) # => 20
+ *  You can think of
  *
- *  With a block, passes each operand to the block:
- *
- *    # Sum of squares, without initial_operand.
- *    (1..4).inject {|sum, n| sum + n*n }    # => 30
- *    # Sum of squares, with initial_operand.
- *    (1..4).inject(2) {|sum, n| sum + n*n } # => 32
+ *      [ a, b, c, d ].inject(i) { |r, v| fn(r, v) }
  *
- *  <b>Operands</b>
+ *  as being
  *
- *  If argument +initial_operand+ is not given,
- *  the operands for +inject+ are simply the elements of +self+.
- *  Example calls and their operands:
+ *      fn(fn(fn(fn(i, a), b), c), d)
  *
- *  - <tt>(1..4).inject(:+)</tt>:: <tt>[1, 2, 3, 4]</tt>.
- *  - <tt>(1...4).inject(:+)</tt>:: <tt>[1, 2, 3]</tt>.
- *  - <tt>('a'..'d').inject(:+)</tt>:: <tt>['a', 'b', 'c', 'd']</tt>.
- *  - <tt>('a'...'d').inject(:+)</tt>:: <tt>['a', 'b', 'c']</tt>.
+ *  In a way the +inject+ function _injects_ the function
+ *  between the elements of the enumerable.
  *
- *  Examples with first operand (which is <tt>self.first</tt>) of various types:
+ *  +inject+ is aliased as +reduce+. You use it when you want to
+ *  _reduce_ a collection to a single value.
  *
- *    # Integer.
- *    (1..4).inject(:+)                # => 10
- *    # Float.
- *    [1.0, 2, 3, 4].inject(:+)        # => 10.0
- *    # Character.
- *    ('a'..'d').inject(:+)            # => "abcd"
- *    # Complex.
- *    [Complex(1, 2), 3, 4].inject(:+) # => (8+2i)
+ *  <b>The Calling Sequences</b>
  *
- *  If argument +initial_operand+ is given,
- *  the operands for +inject+ are that value plus the elements of +self+.
- *  Example calls their operands:
+ *  Let's start with the most verbose:
+ *
+ *      enum.inject(initial_value) do |result, next_value|
+ *        # do something with +result+ and +next_value+
+ *        # the value returned by the block becomes the
+ *        # value passed in to the next iteration
+ *        # as +result+
+ *      end
  *
- *  - <tt>(1..4).inject(10, :+)</tt>:: <tt>[10, 1, 2, 3, 4]</tt>.
- *  - <tt>(1...4).inject(10, :+)</tt>:: <tt>[10, 1, 2, 3]</tt>.
- *  - <tt>('a'..'d').inject('e', :+)</tt>:: <tt>['e', 'a', 'b', 'c', 'd']</tt>.
- *  - <tt>('a'...'d').inject('e', :+)</tt>:: <tt>['e', 'a', 'b', 'c']</tt>.
+ *  For example:
  *
- *  Examples with +initial_operand+ of various types:
+ *      product = [ 2, 3, 4 ].inject(1) do |result, next_value|
+ *        result * next_value
+ *      end
+ *      product #=> 24
  *
- *    # Integer.
- *    (1..4).inject(2, :+)               # => 12
- *    # Float.
- *    (1..4).inject(2.0, :+)             # => 12.0
- *    # String.
- *    ('a'..'d').inject('foo', :+)       # => "fooabcd"
- *    # Array.
- *    %w[a b c].inject(['x'], :push)     # => ["x", "a", "b", "c"]
- *    # Complex.
- *    (1..4).inject(Complex(2, 2), :+)   # => (12+2i)
+ *  When this runs, the block is first called with +1+ (the initial value) and
+ *  +2+ (the first element of the array). The block returns <tt>1*2</tt>, so on
+ *  the next iteration the block is called with +2+ (the previous result) and
+ *  +3+. The block returns +6+, and is called one last time with +6+ and +4+.
+ *  The result of the block, +24+ becomes the value returned by +inject+. This
+ *  code returns the product of the elements in the enumerable.
  *
- *  <b>Combination by Given \Method</b>
+ *  <b>First Shortcut: Default Initial value</b>
  *
- *  If the method-name argument +symbol+ is given,
- *  the operands are combined by that method:
+ *  In the case of the previous example, the initial value, +1+, wasn't really
+ *  necessary: the calculation of the product of a list of numbers is self-contained.
  *
- *  - The first and second operands are combined.
- *  - That result is combined with the third operand.
- *  - That result is combined with the fourth operand.
- *  - And so on.
+ *  In these circumstances, you can omit the +initial_value+ parameter. +inject+
+ *  will then initially call the block with the first element of the collection
+ *  as the +result+ parameter and the second element as the +next_value+.
  *
- *  The return value from +inject+ is the result of the last combination.
+ *      [ 2, 3, 4 ].inject do |result, next_value|
+ *        result * next_value
+ *      end
  *
- *  This call to +inject+ computes the sum of the operands:
+ *  This shortcut is convenient, but can only be used when the block produces a result
+ *  which can be passed back to it as a first parameter.
  *
- *    (1..4).inject(:+) # => 10
+ *  Here's an example where that's not the case: it returns a hash where the keys are words
+ *  and the values are the number of occurrences of that word in the enumerable.
  *
- *  Examples with various methods:
+ *    freqs = File.read("README.md")
+ *      .scan(/\w{2,}/)
+ *      .reduce(Hash.new(0)) do |counts, word|
+ *        counts[word] += 1
+ *        counts
+ *      end
+ *    freqs #=> {"Actions"=>4,
+ *               "Status"=>5,
+ *               "MinGW"=>3,
+ *               "https"=>27,
+ *               "github"=>10,
+ *               "com"=>15, ...
  *
- *    # Integer addition.
- *    (1..4).inject(:+)                # => 10
- *    # Integer multiplication.
- *    (1..4).inject(:*)                # => 24
- *    # Character range concatenation.
- *    ('a'..'d').inject('', :+)        # => "abcd"
- *    # String array concatenation.
- *    %w[foo bar baz].inject('', :+)   # => "foobarbaz"
- *    # Hash update.
- *    h = [{foo: 0, bar: 1}, {baz: 2}, {bat: 3}].inject(:update)
- *    h # => {:foo=>0, :bar=>1, :baz=>2, :bat=>3}
- *    # Hash conversion to nested arrays.
- *    h = {foo: 0, bar: 1}.inject([], :push)
- *    h # => [[:foo, 0], [:bar, 1]]
+ *  Note that the last line of the block is just the word +counts+. This ensures the
+ *  return value of the block is the result that's being calculated.
  *
- *  <b>Combination by Given Block</b>
+ *  <b>Second Shortcut: a Reducer function</b>
  *
- *  If a block is given, the operands are passed to the block:
+ *  A <i>reducer function</i> is a function that takes a partial result and the next value,
+ *  returning the next partial result. The block that is given to +inject+ is a reducer.
  *
- *  - The first call passes the first and second operands.
- *  - The second call passes the result of the first call,
- *    along with the third operand.
- *  - The third call passes the result of the second call,
- *    along with the fourth operand.
- *  - And so on.
+ *  You can also write a reducer as a function and pass the name of that function
+ *  (as a symbol) to +inject+. However, for this to work, the function
  *
- *  The return value from +inject+ is the return value from the last block call.
- *
- *  This call to +inject+ gives a block
- *  that writes the memo and element, and also sums the elements:
+ *  1. Must be defined on the type of the result value
+ *  2. Must accept a single parameter, the next value in the collection, and
+ *  3. Must return an updated result which will also implement the function.
  *
- *    (1..4).inject do |memo, element|
- *      p "Memo: #{memo}; element: #{element}"
- *      memo + element
- *    end # => 10
+ *  Here's an example that adds elements to a string. The two calls invoke the functions
+ *  String#concat and String#+ on the result so far, passing it the next value.
  *
- *  Output:
+ *      s = [ "cat", " ", "dog" ].inject("", :concat)
+ *      s #=> "cat dog"
+ *      s = [ "cat", " ", "dog" ].inject("The result is:", :+)
+ *      s #=> "The result is: cat dog"
+ *
+ *  Here's a more complex example when the result object maintains
+ *  state of a different type to the enumerable elements.
+ *
+ *      class Turtle
+ *
+ *        def initialize
+ *          @x = @y = 0
+ *        end
+ *
+ *        def move(dir)
+ *          case dir
+ *          when "n" then @y += 1
+ *          when "s" then @y -= 1
+ *          when "e" then @x += 1
+ *          when "w" then @x -= 1
+ *          end
+ *          self
+ *        end
+ *      end
+ *
+ *      position = "nnneesw".chars.reduce(Turtle.new, :move)
+ *      position  #=>> #<Turtle:0x00000001052f4698 @y=2, @x=1>
  *
- *    "Memo: 1; element: 2"
- *    "Memo: 3; element: 3"
- *    "Memo: 6; element: 4"
+ *  <b>Third Shortcut: Reducer With no Initial Value</b>
+ *
+ *  If your reducer returns a value that it can accept as a parameter, then you
+ *  don't have to pass in an initial value. Here <tt>:*</tt> is the name of the
+ *  _times_ function:
+ *
+ *      product = [ 2, 3, 4 ].inject(:*)
+ *      product # => 24
+ *
+ *  String concatenation again:
+ *
+ *      s = [ "cat", " ", "dog" ].inject(:+)
+ *      s #=> "cat dog"
+ *
+ *  And an example that converts a hash to an array of two-element subarrays.
+ *
+ *      nested = {foo: 0, bar: 1}.inject([], :push)
+ *      nested # => [[:foo, 0], [:bar, 1]]
  *
  *
  */
@@ -1178,14 +1215,15 @@ tally_up(st_data_t *group, st_data_t *value, st_data_t arg, int existing)
         RB_OBJ_WRITTEN(hash, Qundef, tally);
     }
     *value = (st_data_t)tally;
-    if (!SPECIAL_CONST_P(*group)) RB_OBJ_WRITTEN(hash, Qundef, *group);
     return ST_CONTINUE;
 }
 
 static VALUE
 rb_enum_tally_up(VALUE hash, VALUE group)
 {
-    rb_hash_stlike_update(hash, group, tally_up, (st_data_t)hash);
+    if (!rb_hash_stlike_update(hash, group, tally_up, (st_data_t)hash)) {
+        RB_OBJ_WRITTEN(hash, Qundef, group);
+    }
     return hash;
 }
 
@@ -1199,29 +1237,47 @@ tally_i(RB_BLOCK_CALL_FUNC_ARGLIST(i, hash))
 
 /*
  *  call-seq:
- *    tally -> new_hash
- *    tally(hash) -> hash
+ *    tally(hash = {}) -> hash
  *
- *  Returns a hash containing the counts of equal elements:
+ *  When argument +hash+ is not given,
+ *  returns a new hash whose keys are the distinct elements in +self+;
+ *  each integer value is the count of occurrences of each element:
  *
- *  - Each key is an element of +self+.
- *  - Each value is the number elements equal to that key.
+ *    %w[a b c b c a c b].tally # => {"a"=>2, "b"=>3, "c"=>3}
  *
- *  With no argument:
+ *  When argument +hash+ is given,
+ *  returns +hash+, possibly augmented; for each element +ele+ in +self+:
  *
- *    %w[a b c b c a c b].tally # => {"a"=>2, "b"=>3, "c"=>3}
+ *  - Adds it as a key with a zero value if that key does not already exist:
+ *
+ *      hash[ele] = 0 unless hash.include?(ele)
+ *
+ *  - Increments the value of key +ele+:
+ *
+ *      hash[ele] += 1
+ *
+ *  This is useful for accumulating tallies across multiple enumerables:
+ *
+ *    h = {}                   # => {}
+ *    %w[a c d b c a].tally(h) # => {"a"=>2, "c"=>2, "d"=>1, "b"=>1}
+ *    %w[b a z].tally(h)       # => {"a"=>3, "c"=>2, "d"=>1, "b"=>2, "z"=>1}
+ *    %w[b a m].tally(h)       # => {"a"=>4, "c"=>2, "d"=>1, "b"=>3, "z"=>1, "m"=>1}
+ *
+ *  The key to be added or found for an element depends on the class of +self+;
+ *  see {Enumerable in Ruby Classes}[rdoc-ref:Enumerable@Enumerable+in+Ruby+Classes].
  *
- *  With a hash argument, that hash is used for the tally (instead of a new hash),
- *  and is returned;
- *  this may be useful for accumulating tallies across multiple enumerables:
+ *  Examples:
+ *
+ *  - Array (and certain array-like classes):
+ *    the key is the element (as above).
+ *  - Hash (and certain hash-like classes):
+ *    the key is the 2-element array formed from the key-value pair:
  *
- *    hash = {}
- *    hash = %w[a c d b c a].tally(hash)
- *    hash # => {"a"=>2, "c"=>2, "d"=>1, "b"=>1}
- *    hash = %w[b a z].tally(hash)
- *    hash # => {"a"=>3, "c"=>2, "d"=>1, "b"=>2, "z"=>1}
- *    hash = %w[b a m].tally(hash)
- *    hash # => {"a"=>4, "c"=>2, "d"=>1, "b"=>3, "z"=>1, "m"=> 1}
+ *      h = {}                        # => {}
+ *      {foo: 'a', bar: 'b'}.tally(h) # => {[:foo, "a"]=>1, [:bar, "b"]=>1}
+ *      {foo: 'c', bar: 'd'}.tally(h) # => {[:foo, "a"]=>1, [:bar, "b"]=>1, [:foo, "c"]=>1, [:bar, "d"]=>1}
+ *      {foo: 'a', bar: 'b'}.tally(h) # => {[:foo, "a"]=>2, [:bar, "b"]=>2, [:foo, "c"]=>1, [:bar, "d"]=>1}
+ *      {foo: 'c', bar: 'd'}.tally(h) # => {[:foo, "a"]=>2, [:bar, "b"]=>2, [:foo, "c"]=>2, [:bar, "d"]=>2}
  *
  */
 
@@ -1304,7 +1360,7 @@ enum_first(int argc, VALUE *argv, VALUE obj)
  *  The ordering of equal elements is indeterminate and may be unstable.
  *
  *  With no block given, the sort compares
- *  using the elements' own method <tt><=></tt>:
+ *  using the elements' own method <tt>#<=></tt>:
  *
  *    %w[b c a d].sort              # => ["a", "b", "c", "d"]
  *    {foo: 0, bar: 1, baz: 2}.sort # => [[:bar, 1], [:baz, 2], [:foo, 0]]
@@ -1707,6 +1763,9 @@ enum_sort_by(VALUE obj)
 
 #define ENUMFUNC(name) argc ? name##_eqq : rb_block_given_p() ? name##_iter_i : name##_i
 
+#define ENUM_BLOCK_CALL(name) \
+    rb_block_call2(obj, id_each, 0, 0, ENUMFUNC(name), (VALUE)memo, rb_block_given_p() && rb_block_pair_yield_optimizable() ? RB_BLOCK_NO_USE_PACKED_ARGS : 0);
+
 #define MEMO_ENUM_NEW(v1) (rb_check_arity(argc, 0, 1), MEMO_NEW((v1), (argc ? *argv : 0), 0))
 
 #define DEFINE_ENUMFUNCS(name) \
@@ -1800,7 +1859,7 @@ enum_all(int argc, VALUE *argv, VALUE obj)
 {
     struct MEMO *memo = MEMO_ENUM_NEW(Qtrue);
     WARN_UNUSED_BLOCK(argc);
-    rb_block_call(obj, id_each, 0, 0, ENUMFUNC(all), (VALUE)memo);
+    ENUM_BLOCK_CALL(all);
     return memo->v1;
 }
 
@@ -1862,7 +1921,7 @@ enum_any(int argc, VALUE *argv, VALUE obj)
 {
     struct MEMO *memo = MEMO_ENUM_NEW(Qfalse);
     WARN_UNUSED_BLOCK(argc);
-    rb_block_call(obj, id_each, 0, 0, ENUMFUNC(any), (VALUE)memo);
+    ENUM_BLOCK_CALL(any);
     return memo->v1;
 }
 
@@ -2151,7 +2210,7 @@ enum_one(int argc, VALUE *argv, VALUE obj)
     VALUE result;
 
     WARN_UNUSED_BLOCK(argc);
-    rb_block_call(obj, id_each, 0, 0, ENUMFUNC(one), (VALUE)memo);
+    ENUM_BLOCK_CALL(one);
     result = memo->v1;
     if (UNDEF_P(result)) return Qfalse;
     return result;
@@ -2212,7 +2271,7 @@ enum_none(int argc, VALUE *argv, VALUE obj)
     struct MEMO *memo = MEMO_ENUM_NEW(Qtrue);
 
     WARN_UNUSED_BLOCK(argc);
-    rb_block_call(obj, id_each, 0, 0, ENUMFUNC(none), (VALUE)memo);
+    ENUM_BLOCK_CALL(none);
     return memo->v1;
 }
 
@@ -2270,7 +2329,7 @@ min_ii(RB_BLOCK_CALL_FUNC_ARGLIST(i, args))
  *  The ordering of equal elements is indeterminate and may be unstable.
  *
  *  With no argument and no block, returns the minimum element,
- *  using the elements' own method <tt><=></tt> for comparison:
+ *  using the elements' own method <tt>#<=></tt> for comparison:
  *
  *    (1..4).min                   # => 1
  *    (-4..-1).min                 # => -4
@@ -2392,7 +2451,7 @@ max_ii(RB_BLOCK_CALL_FUNC_ARGLIST(i, args))
  *  The ordering of equal elements is indeterminate and may be unstable.
  *
  *  With no argument and no block, returns the maximum element,
- *  using the elements' own method <tt><=></tt> for comparison:
+ *  using the elements' own method <tt>#<=></tt> for comparison:
  *
  *    (1..4).max                   # => 4
  *    (-4..-1).max                 # => -1
@@ -2581,7 +2640,7 @@ minmax_ii(RB_BLOCK_CALL_FUNC_ARGLIST(i, _memo))
  *  The ordering of equal elements is indeterminate and may be unstable.
  *
  *  With no argument and no block, returns the minimum and maximum elements,
- *  using the elements' own method <tt><=></tt> for comparison:
+ *  using the elements' own method <tt>#<=></tt> for comparison:
  *
  *    (1..4).minmax                   # => [1, 4]
  *    (-4..-1).minmax                 # => [-4, -1]
@@ -2927,13 +2986,12 @@ enum_member(VALUE obj, VALUE val)
 }
 
 static VALUE
-each_with_index_i(RB_BLOCK_CALL_FUNC_ARGLIST(i, memo))
+each_with_index_i(RB_BLOCK_CALL_FUNC_ARGLIST(_, index))
 {
-    struct MEMO *m = MEMO_CAST(memo);
-    VALUE n = imemo_count_value(m);
+    struct vm_ifunc *ifunc = rb_current_ifunc();
+    ifunc->data = (const void *)rb_int_succ(index);
 
-    imemo_count_up(m);
-    return rb_yield_values(2, rb_enum_values_pack(argc, argv), n);
+    return rb_yield_values(2, rb_enum_values_pack(argc, argv), index);
 }
 
 /*
@@ -2941,7 +2999,8 @@ each_with_index_i(RB_BLOCK_CALL_FUNC_ARGLIST(i, memo))
  *    each_with_index(*args) {|element, i| ..... } -> self
  *    each_with_index(*args)                       -> enumerator
  *
- *  With a block given, calls the block with each element and its index;
+ *  Invoke <tt>self.each</tt> with <tt>*args</tt>.
+ *  With a block given, the block receives each element and its index;
  *  returns +self+:
  *
  *    h = {}
@@ -2966,12 +3025,9 @@ each_with_index_i(RB_BLOCK_CALL_FUNC_ARGLIST(i, memo))
 static VALUE
 enum_each_with_index(int argc, VALUE *argv, VALUE obj)
 {
-    struct MEMO *memo;
-
     RETURN_SIZED_ENUMERATOR(obj, argc, argv, enum_size);
 
-    memo = MEMO_NEW(0, 0, 0);
-    rb_block_call(obj, id_each, argc, argv, each_with_index_i, (VALUE)memo);
+    rb_block_call(obj, id_each, argc, argv, each_with_index_i, INT2FIX(0));
     return obj;
 }
 
@@ -3649,6 +3705,17 @@ drop_while_i(RB_BLOCK_CALL_FUNC_ARGLIST(i, args))
  *
  *  With no block given, returns an Enumerator.
  *
+ *    e = (1..4).drop_while
+ *    p e #=> #<Enumerator: 1..4:drop_while>
+ *    i = e.next; p i; e.feed(i < 3) #=> 1
+ *    i = e.next; p i; e.feed(i < 3) #=> 2
+ *    i = e.next; p i; e.feed(i < 3) #=> 3
+ *    begin
+ *      e.next
+ *    rescue StopIteration
+ *      p $!.result #=> [3, 4]
+ *    end
+ *
  */
 
 static VALUE
@@ -3858,7 +3925,7 @@ chunk_i(RB_BLOCK_CALL_FUNC_ARGLIST(yielder, enumerator))
  *    e.next # => [2, [6, 7, 8]]
  *    e.next # => [3, [9, 10]]
  *
- *  \Method +chunk+ is especially useful for an enumerable that is already sorted.
+ *  Method +chunk+ is especially useful for an enumerable that is already sorted.
  *  This example counts words for each initial letter in a large array of words:
  *
  *    # Get sorted words from a web page.
@@ -4538,7 +4605,7 @@ struct enum_sum_memo {
 static void
 sum_iter_normalize_memo(struct enum_sum_memo *memo)
 {
-    assert(FIXABLE(memo->n));
+    RUBY_ASSERT(FIXABLE(memo->n));
     memo->v = rb_fix_plus(LONG2FIX(memo->n), memo->v);
     memo->n = 0;
 
@@ -4640,7 +4707,7 @@ sum_iter_Kahan_Babuska(VALUE i, struct enum_sum_memo *memo)
 static void
 sum_iter(VALUE i, struct enum_sum_memo *memo)
 {
-    assert(memo != NULL);
+    RUBY_ASSERT(memo != NULL);
     if (memo->block_given) {
         i = rb_yield(i);
     }
@@ -4650,7 +4717,7 @@ sum_iter(VALUE i, struct enum_sum_memo *memo)
     }
     else switch (TYPE(memo->v)) {
       default:      sum_iter_some_value(i, memo);    return;
-      case T_FLOAT: sum_iter_Kahan_Babuska(i, memo); return;
+      case T_FLOAT:
       case T_FIXNUM:
       case T_BIGNUM:
       case T_RATIONAL:
@@ -4691,8 +4758,8 @@ hash_sum_i(VALUE key, VALUE value, VALUE arg)
 static void
 hash_sum(VALUE hash, struct enum_sum_memo *memo)
 {
-    assert(RB_TYPE_P(hash, T_HASH));
-    assert(memo != NULL);
+    RUBY_ASSERT(RB_TYPE_P(hash, T_HASH));
+    RUBY_ASSERT(memo != NULL);
 
     rb_hash_foreach(hash, hash_sum_i, (VALUE)memo);
 }
@@ -4885,7 +4952,7 @@ enum_compact(VALUE obj)
 /*
  * == What's Here
  *
- * \Module \Enumerable provides methods that are useful to a collection class for:
+ * Module \Enumerable provides methods that are useful to a collection class for:
  *
  * - {Querying}[rdoc-ref:Enumerable@Methods+for+Querying]
  * - {Fetching}[rdoc-ref:Enumerable@Methods+for+Fetching]
@@ -4898,7 +4965,7 @@ enum_compact(VALUE obj)
  *
  * These methods return information about the \Enumerable other than the elements themselves:
  *
- * - #include?, #member?: Returns +true+ if <tt>self == object</tt>, +false+ otherwise.
+ * - #member? (aliased as #include?): Returns +true+ if <tt>self == object</tt>, +false+ otherwise.
  * - #all?: Returns +true+ if all elements meet a specified criterion; +false+ otherwise.
  * - #any?: Returns +true+ if any element meets a specified criterion; +false+ otherwise.
  * - #none?: Returns +true+ if no element meets a specified criterion; +false+ otherwise.
@@ -4913,7 +4980,7 @@ enum_compact(VALUE obj)
  *
  * <i>Leading, trailing, or all elements</i>:
  *
- * - #entries, #to_a: Returns all elements.
+ * - #to_a (aliased as #entries): Returns all elements.
  * - #first: Returns the first element or leading elements.
  * - #take: Returns a specified number of leading elements.
  * - #drop: Returns a specified number of trailing elements.
@@ -4923,9 +4990,9 @@ enum_compact(VALUE obj)
  * <i>Minimum and maximum value elements</i>:
  *
  * - #min: Returns the elements whose values are smallest among the elements,
- *   as determined by <tt><=></tt> or a given block.
+ *   as determined by <tt>#<=></tt> or a given block.
  * - #max: Returns the elements whose values are largest among the elements,
- *   as determined by <tt><=></tt> or a given block.
+ *   as determined by <tt>#<=></tt> or a given block.
  * - #minmax: Returns a 2-element Array containing the smallest and largest elements.
  * - #min_by: Returns the smallest element, as determined by the given block.
  * - #max_by: Returns the largest element, as determined by the given block.
@@ -4936,11 +5003,11 @@ enum_compact(VALUE obj)
  * - #group_by: Returns a Hash that partitions the elements into groups.
  * - #partition: Returns elements partitioned into two new Arrays, as determined by the given block.
  * - #slice_after: Returns a new Enumerator whose entries are a partition of +self+,
-     based either on a given +object+ or a given block.
+ *   based either on a given +object+ or a given block.
  * - #slice_before: Returns a new Enumerator whose entries are a partition of +self+,
-     based either on a given +object+ or a given block.
+ *   based either on a given +object+ or a given block.
  * - #slice_when: Returns a new Enumerator whose entries are a partition of +self+
-     based on the given block.
+ *   based on the given block.
  * - #chunk: Returns elements organized into chunks as specified by the given block.
  * - #chunk_while: Returns elements organized into chunks as specified by the given block.
  *
@@ -4948,8 +5015,8 @@ enum_compact(VALUE obj)
  *
  * These methods return elements that meet a specified criterion:
  *
- * - #find, #detect: Returns an element selected by the block.
- * - #find_all, #filter, #select: Returns elements selected by the block.
+ * - #find (aliased as #detect): Returns an element selected by the block.
+ * - #find_all (aliased as #filter, #select): Returns elements selected by the block.
  * - #find_index: Returns the index of an element selected by a given object or block.
  * - #reject: Returns elements not rejected by the block.
  * - #uniq: Returns elements that are not duplicates.
@@ -4958,7 +5025,7 @@ enum_compact(VALUE obj)
  *
  * These methods return elements in sorted order:
  *
- * - #sort: Returns the elements, sorted by <tt><=></tt> or the given block.
+ * - #sort: Returns the elements, sorted by <tt>#<=></tt> or the given block.
  * - #sort_by: Returns the elements, sorted by the given block.
  *
  * === Methods for Iterating
@@ -4974,14 +5041,14 @@ enum_compact(VALUE obj)
  *
  * === Other Methods
  *
- * - #map, #collect: Returns objects returned by the block.
+ * - #collect (aliased as #map): Returns objects returned by the block.
  * - #filter_map: Returns truthy objects returned by the block.
- * - #flat_map, #collect_concat: Returns flattened objects returned by the block.
+ * - #flat_map (aliased as #collect_concat): Returns flattened objects returned by the block.
  * - #grep: Returns elements selected by a given object
  *   or objects returned by a given block.
- * - #grep_v: Returns elements selected by a given object
+ * - #grep_v: Returns elements not selected by a given object
  *   or objects returned by a given block.
- * - #reduce, #inject: Returns the object formed by combining all elements.
+ * - #inject (aliased as #reduce): Returns the object formed by combining all elements.
  * - #sum: Returns the sum of the elements, using method <tt>+</tt>.
  * - #zip: Combines each element with elements from other enumerables;
  *   returns the n-tuples or calls the block with each.
@@ -5053,6 +5120,82 @@ enum_compact(VALUE obj)
  *   For some methods, though, the usage would not make sense,
  *   and so it is not shown.  Example: #tally would find exactly one of each Hash entry.
  *
+ * == Extended Methods
+ *
+ * A Enumerable class may define extended methods. This section describes the standard
+ * behavior of extension methods for reference purposes.
+ *
+ * === #size
+ *
+ * \Enumerator has a #size method.
+ * It uses the size function argument passed to +Enumerator.new+.
+ *
+ *   e = Enumerator.new(-> { 3 }) {|y| p y; y.yield :a; y.yield :b; y.yield :c; :z }
+ *   p e.size #=> 3
+ *   p e.next #=> :a
+ *   p e.next #=> :b
+ *   p e.next #=> :c
+ *   begin
+ *     e.next
+ *   rescue StopIteration
+ *     p $!.result #=> :z
+ *   end
+ *
+ * The result of the size function should represent the number of iterations
+ * (i.e., the number of times Enumerator::Yielder#yield is called).
+ * In the above example, the block calls #yield three times, and
+ * the size function, +-> { 3 }+, returns 3 accordingly.
+ * The result of the size function can be an integer, +Float::INFINITY+,
+ * or +nil+.
+ * An integer means the exact number of times #yield will be called,
+ * as shown above.
+ * +Float::INFINITY+ indicates an infinite number of #yield calls.
+ * +nil+ means the number of #yield calls is difficult or impossible to
+ * determine.
+ *
+ * Many iteration methods return an \Enumerator object with an
+ * appropriate size function if no block is given.
+ *
+ * Examples:
+ *
+ *   ["a", "b", "c"].each.size #=> 3
+ *   {a: "x", b: "y", c: "z"}.each.size #=> 3
+ *   (0..20).to_a.permutation.size #=> 51090942171709440000
+ *   loop.size #=> Float::INFINITY
+ *   (1..100).drop_while.size #=> nil  # size depends on the block's behavior
+ *   STDIN.each.size #=> nil # cannot be computed without consuming input
+ *   File.open("/etc/resolv.conf").each.size #=> nil # cannot be computed without reading the file
+ *
+ * The behavior of #size for Range-based enumerators depends on the #begin element:
+ *
+ * - If the #begin element is an Integer, the #size method returns an Integer or +Float::INFINITY+.
+ * - If the #begin element is an object with a #succ method (other than Integer), #size returns +nil+.
+ *   (Computing the size would require repeatedly calling #succ, which may be too slow.)
+ * - If the #begin element does not have a #succ method, #size raises a TypeError.
+ *
+ * Examples:
+ *
+ *   (10..42).each.size #=> 33
+ *   (10..42.9).each.size #=> 33 (the #end element may be a non-integer numeric)
+ *   (10..).each.size #=> Float::INFINITY
+ *   ("a".."z").each.size #=> nil
+ *   ("a"..).each.size #=> nil
+ *   (1.0..9.0).each.size # raises TypeError (Float does not have #succ)
+ *   (..10).each.size # raises TypeError (beginless range has nil as its #begin)
+ *
+ * The \Enumerable module itself does not define a #size method.
+ * A class that includes \Enumerable may define its own #size method.
+ * It is recommended that such a #size method be consistent with
+ * Enumerator#size.
+ *
+ * Array and Hash implement #size and return values consistent with
+ * Enumerator#size.
+ * IO and Dir do not define #size, which is also consistent because the
+ * corresponding enumerator's size function returns +nil+.
+ *
+ * However, it is not strictly required for a class's #size method to match Enumerator#size.
+ * For example, File#size returns the number of bytes in the file, not the number of lines.
+ *
  */
 
 void
diff --git a/enumerator.c b/enumerator.c
index 252333f303ea22..b91b2eb940d445 100644
--- a/enumerator.c
+++ b/enumerator.c
@@ -85,12 +85,16 @@
  *   puts e.next   # => 3
  *   puts e.next   # raises StopIteration
  *
- * +next+, +next_values+, +peek+ and +peek_values+ are the only methods
- * which use external iteration (and Array#zip(Enumerable-not-Array) which uses +next+).
+ * +next+, +next_values+, +peek+, and +peek_values+ are the only methods
+ * which use external iteration (and Array#zip(Enumerable-not-Array) which uses +next+ internally).
  *
  * These methods do not affect other internal enumeration methods,
  * unless the underlying iteration method itself has side-effect, e.g. IO#each_line.
  *
+ * FrozenError will be raised if these methods are called against a frozen enumerator.
+ * Since +rewind+ and +feed+ also change state for external iteration,
+ * these methods may raise FrozenError too.
+ *
  * External iteration differs *significantly* from internal iteration
  * due to using a Fiber:
  * - The Fiber adds some overhead compared to internal enumeration.
@@ -158,10 +162,9 @@
  */
 VALUE rb_cEnumerator;
 static VALUE rb_cLazy;
-static ID id_rewind, id_new, id_to_enum, id_each_entry;
+static ID id_rewind, id_to_enum, id_each_entry;
 static ID id_next, id_result, id_receiver, id_arguments, id_memo, id_method, id_force;
-static ID id_begin, id_end, id_step, id_exclude_end;
-static VALUE sym_each, sym_cycle, sym_yield;
+static VALUE sym_each, sym_yield;
 
 static VALUE lazy_use_super_method;
 
@@ -191,17 +194,18 @@ struct enumerator {
     int kw_splat;
 };
 
-RUBY_REFERENCES_START(enumerator_refs)
-    REF_EDGE(enumerator, obj),
-    REF_EDGE(enumerator, args),
-    REF_EDGE(enumerator, fib),
-    REF_EDGE(enumerator, dst),
-    REF_EDGE(enumerator, lookahead),
-    REF_EDGE(enumerator, feedvalue),
-    REF_EDGE(enumerator, stop_exc),
-    REF_EDGE(enumerator, size),
-    REF_EDGE(enumerator, procs),
-RUBY_REFERENCES_END
+RUBY_REFERENCES(enumerator_refs) = {
+    RUBY_REF_EDGE(struct enumerator, obj),
+    RUBY_REF_EDGE(struct enumerator, args),
+    RUBY_REF_EDGE(struct enumerator, fib),
+    RUBY_REF_EDGE(struct enumerator, dst),
+    RUBY_REF_EDGE(struct enumerator, lookahead),
+    RUBY_REF_EDGE(struct enumerator, feedvalue),
+    RUBY_REF_EDGE(struct enumerator, stop_exc),
+    RUBY_REF_EDGE(struct enumerator, size),
+    RUBY_REF_EDGE(struct enumerator, procs),
+    RUBY_REF_END
+};
 
 static VALUE rb_cGenerator, rb_cYielder, rb_cEnumProducer;
 
@@ -252,23 +256,15 @@ struct enum_product {
 
 VALUE rb_cArithSeq;
 
-#define enumerator_free RUBY_TYPED_DEFAULT_FREE
-
-static size_t
-enumerator_memsize(const void *p)
-{
-    return sizeof(struct enumerator);
-}
-
 static const rb_data_type_t enumerator_data_type = {
     "enumerator",
     {
-        REFS_LIST_PTR(enumerator_refs),
-        enumerator_free,
-        enumerator_memsize,
+        RUBY_REFS_LIST_PTR(enumerator_refs),
+        RUBY_TYPED_DEFAULT_FREE,
+        NULL, // Nothing allocated externally, so don't need a memsize function
         NULL,
     },
-    0, NULL, RUBY_TYPED_FREE_IMMEDIATELY | RUBY_TYPED_DECL_MARKING
+    0, NULL, RUBY_TYPED_FREE_IMMEDIATELY | RUBY_TYPED_WB_PROTECTED | RUBY_TYPED_DECL_MARKING | RUBY_TYPED_EMBEDDABLE
 };
 
 static struct enumerator *
@@ -299,22 +295,15 @@ proc_entry_compact(void *p)
     ptr->memo = rb_gc_location(ptr->memo);
 }
 
-#define proc_entry_free RUBY_TYPED_DEFAULT_FREE
-
-static size_t
-proc_entry_memsize(const void *p)
-{
-    return p ? sizeof(struct proc_entry) : 0;
-}
-
 static const rb_data_type_t proc_entry_data_type = {
     "proc_entry",
     {
         proc_entry_mark,
-        proc_entry_free,
-        proc_entry_memsize,
+        RUBY_TYPED_DEFAULT_FREE,
+        NULL, // Nothing allocated externally, so don't need a memsize function
         proc_entry_compact,
     },
+    0, 0, RUBY_TYPED_FREE_IMMEDIATELY | RUBY_TYPED_WB_PROTECTED | RUBY_TYPED_EMBEDDABLE
 };
 
 static struct proc_entry *
@@ -399,7 +388,7 @@ obj_to_enum(int argc, VALUE *argv, VALUE obj)
     }
     enumerator = rb_enumeratorize_with_size(obj, meth, argc, argv, 0);
     if (rb_block_given_p()) {
-        enumerator_ptr(enumerator)->size = rb_block_proc();
+        RB_OBJ_WRITE(enumerator, &enumerator_ptr(enumerator)->size, rb_block_proc());
     }
     return enumerator;
 }
@@ -428,15 +417,15 @@ enumerator_init(VALUE enum_obj, VALUE obj, VALUE meth, int argc, const VALUE *ar
         rb_raise(rb_eArgError, "unallocated enumerator");
     }
 
-    ptr->obj  = obj;
+    RB_OBJ_WRITE(enum_obj, &ptr->obj, obj);
     ptr->meth = rb_to_id(meth);
-    if (argc) ptr->args = rb_ary_new4(argc, argv);
+    if (argc) RB_OBJ_WRITE(enum_obj, &ptr->args, rb_ary_new4(argc, argv));
     ptr->fib = 0;
     ptr->dst = Qnil;
     ptr->lookahead = Qundef;
     ptr->feedvalue = Qundef;
     ptr->stop_exc = Qfalse;
-    ptr->size = size;
+    RB_OBJ_WRITE(enum_obj, &ptr->size, size);
     ptr->size_fn = size_fn;
     ptr->kw_splat = kw_splat;
 
@@ -515,13 +504,13 @@ enumerator_init_copy(VALUE obj, VALUE orig)
         rb_raise(rb_eArgError, "unallocated enumerator");
     }
 
-    ptr1->obj  = ptr0->obj;
+    RB_OBJ_WRITE(obj, &ptr1->obj, ptr0->obj);
     ptr1->meth = ptr0->meth;
-    ptr1->args = ptr0->args;
+    RB_OBJ_WRITE(obj, &ptr1->args, ptr0->args);
     ptr1->fib  = 0;
     ptr1->lookahead  = Qundef;
     ptr1->feedvalue  = Qundef;
-    ptr1->size  = ptr0->size;
+    RB_OBJ_WRITE(obj, &ptr1->size, ptr0->size);
     ptr1->size_fn  = ptr0->size_fn;
 
     return obj;
@@ -569,11 +558,17 @@ enumerator_block_call(VALUE obj, rb_block_call_func *func, VALUE arg)
     const struct enumerator *e = enumerator_ptr(obj);
     ID meth = e->meth;
 
-    if (e->args) {
-        argc = RARRAY_LENINT(e->args);
-        argv = RARRAY_CONST_PTR(e->args);
+    VALUE args = e->args;
+    if (args) {
+        argc = RARRAY_LENINT(args);
+        argv = RARRAY_CONST_PTR(args);
     }
-    return rb_block_call_kw(e->obj, meth, argc, argv, func, arg, e->kw_splat);
+
+    VALUE ret = rb_block_call_kw(e->obj, meth, argc, argv, func, arg, e->kw_splat);
+
+    RB_GC_GUARD(args);
+
+    return ret;
 }
 
 /*
@@ -630,7 +625,7 @@ enumerator_each(int argc, VALUE *argv, VALUE obj)
         else {
             args = rb_ary_new4(argc, argv);
         }
-        e->args = args;
+        RB_OBJ_WRITE(obj, &e->args, args);
         e->size = Qnil;
         e->size_fn = 0;
     }
@@ -771,7 +766,7 @@ next_i(RB_BLOCK_CALL_FUNC_ARGLIST(_, obj))
     VALUE result;
 
     result = rb_block_call(obj, id_each, 0, 0, next_ii, obj);
-    e->stop_exc = rb_exc_new2(rb_eStopIteration, "iteration reached an end");
+    RB_OBJ_WRITE(obj, &e->stop_exc, rb_exc_new2(rb_eStopIteration, "iteration reached an end"));
     rb_ivar_set(e->stop_exc, id_result, result);
     return rb_fiber_yield(1, &nil);
 }
@@ -780,8 +775,8 @@ static void
 next_init(VALUE obj, struct enumerator *e)
 {
     VALUE curr = rb_fiber_current();
-    e->dst = curr;
-    e->fib = rb_fiber_new(next_i, obj);
+    RB_OBJ_WRITE(obj, &e->dst, curr);
+    RB_OBJ_WRITE(obj, &e->fib, rb_fiber_new(next_i, obj));
     e->lookahead = Qundef;
 }
 
@@ -869,6 +864,8 @@ enumerator_next_values(VALUE obj)
     struct enumerator *e = enumerator_ptr(obj);
     VALUE vs;
 
+    rb_check_frozen(obj);
+
     if (!UNDEF_P(e->lookahead)) {
         vs = e->lookahead;
         e->lookahead = Qundef;
@@ -930,9 +927,12 @@ enumerator_peek_values(VALUE obj)
 {
     struct enumerator *e = enumerator_ptr(obj);
 
+    rb_check_frozen(obj);
+
     if (UNDEF_P(e->lookahead)) {
-        e->lookahead = get_next_values(obj, e);
+        RB_OBJ_WRITE(obj, &e->lookahead, get_next_values(obj, e));
     }
+
     return e->lookahead;
 }
 
@@ -1054,10 +1054,12 @@ enumerator_feed(VALUE obj, VALUE v)
 {
     struct enumerator *e = enumerator_ptr(obj);
 
+    rb_check_frozen(obj);
+
     if (!UNDEF_P(e->feedvalue)) {
         rb_raise(rb_eTypeError, "feed value already set");
     }
-    e->feedvalue = v;
+    RB_OBJ_WRITE(obj, &e->feedvalue, v);
 
     return Qnil;
 }
@@ -1076,6 +1078,8 @@ enumerator_rewind(VALUE obj)
 {
     struct enumerator *e = enumerator_ptr(obj);
 
+    rb_check_frozen(obj);
+
     rb_check_funcall(e->obj, id_rewind, 0, 0);
 
     e->fib = 0;
@@ -1289,23 +1293,15 @@ yielder_compact(void *p)
     ptr->proc = rb_gc_location(ptr->proc);
 }
 
-#define yielder_free RUBY_TYPED_DEFAULT_FREE
-
-static size_t
-yielder_memsize(const void *p)
-{
-    return sizeof(struct yielder);
-}
-
 static const rb_data_type_t yielder_data_type = {
     "yielder",
     {
         yielder_mark,
-        yielder_free,
-        yielder_memsize,
+        RUBY_TYPED_DEFAULT_FREE,
+        NULL,
         yielder_compact,
     },
-    0, 0, RUBY_TYPED_FREE_IMMEDIATELY
+    0, 0, RUBY_TYPED_FREE_IMMEDIATELY | RUBY_TYPED_WB_PROTECTED | RUBY_TYPED_EMBEDDABLE
 };
 
 static struct yielder *
@@ -1344,7 +1340,7 @@ yielder_init(VALUE obj, VALUE proc)
         rb_raise(rb_eArgError, "unallocated yielder");
     }
 
-    ptr->proc = proc;
+    RB_OBJ_WRITE(obj, &ptr->proc, proc);
 
     return obj;
 }
@@ -1429,23 +1425,15 @@ generator_compact(void *p)
     ptr->obj = rb_gc_location(ptr->obj);
 }
 
-#define generator_free RUBY_TYPED_DEFAULT_FREE
-
-static size_t
-generator_memsize(const void *p)
-{
-    return sizeof(struct generator);
-}
-
 static const rb_data_type_t generator_data_type = {
     "generator",
     {
         generator_mark,
-        generator_free,
-        generator_memsize,
+        RUBY_TYPED_DEFAULT_FREE,
+        NULL,
         generator_compact,
     },
-    0, 0, RUBY_TYPED_FREE_IMMEDIATELY
+    0, 0, RUBY_TYPED_FREE_IMMEDIATELY | RUBY_TYPED_WB_PROTECTED | RUBY_TYPED_EMBEDDABLE
 };
 
 static struct generator *
@@ -1485,7 +1473,7 @@ generator_init(VALUE obj, VALUE proc)
         rb_raise(rb_eArgError, "unallocated generator");
     }
 
-    ptr->proc = proc;
+    RB_OBJ_WRITE(obj, &ptr->proc, proc);
 
     return obj;
 }
@@ -1533,7 +1521,7 @@ generator_init_copy(VALUE obj, VALUE orig)
         rb_raise(rb_eArgError, "unallocated generator");
     }
 
-    ptr1->proc = ptr0->proc;
+    RB_OBJ_WRITE(obj, &ptr1->proc, ptr0->proc);
 
     return obj;
 }
@@ -1700,7 +1688,7 @@ lazy_generator_init(VALUE enumerator, VALUE procs)
                   lazy_init_block, rb_ary_new3(2, obj, procs));
 
     gen_ptr = generator_ptr(generator);
-    gen_ptr->obj = obj;
+    RB_OBJ_WRITE(generator, &gen_ptr->obj, obj);
 
     return generator;
 }
@@ -1885,10 +1873,10 @@ lazy_add_method(VALUE obj, int argc, VALUE *argv, VALUE args, VALUE memo,
     VALUE entry_obj = TypedData_Make_Struct(rb_cObject, struct proc_entry,
                                             &proc_entry_data_type, entry);
     if (rb_block_given_p()) {
-        entry->proc = rb_block_proc();
+        RB_OBJ_WRITE(entry_obj, &entry->proc, rb_block_proc());
     }
     entry->fn = fn;
-    entry->memo = args;
+    RB_OBJ_WRITE(entry_obj, &entry->memo, args);
 
     lazy_set_args(entry_obj, memo);
 
@@ -1897,9 +1885,9 @@ lazy_add_method(VALUE obj, int argc, VALUE *argv, VALUE args, VALUE memo,
     rb_ary_push(new_procs, entry_obj);
 
     new_obj = enumerator_init_copy(enumerator_allocate(rb_cLazy), obj);
-    new_e = DATA_PTR(new_obj);
-    new_e->obj = new_generator;
-    new_e->procs = new_procs;
+    new_e = RTYPEDDATA_GET_DATA(new_obj);
+    RB_OBJ_WRITE(new_obj, &new_e->obj, new_generator);
+    RB_OBJ_WRITE(new_obj, &new_e->procs, new_procs);
 
     if (argc > 0) {
         new_e->meth = rb_to_id(*argv++);
@@ -1908,7 +1896,9 @@ lazy_add_method(VALUE obj, int argc, VALUE *argv, VALUE args, VALUE memo,
     else {
         new_e->meth = id_each;
     }
-    new_e->args = rb_ary_new4(argc, argv);
+
+    RB_OBJ_WRITE(new_obj, &new_e->args, rb_ary_new4(argc, argv));
+
     return new_obj;
 }
 
@@ -1994,7 +1984,7 @@ lazy_to_enum(int argc, VALUE *argv, VALUE self)
     }
     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();
+        RB_OBJ_WRITE(lazy, &enumerator_ptr(lazy)->size, rb_block_proc());
     }
     return lazy;
 }
@@ -2409,7 +2399,6 @@ lazy_zip_func(VALUE proc_entry, struct MEMO *result, VALUE memos, long memo_inde
         rb_ary_push(ary, v);
     }
     LAZY_MEMO_SET_VALUE(result, ary);
-    LAZY_MEMO_SET_PACKED(result);
     return result;
 }
 
@@ -2954,7 +2943,7 @@ static const rb_data_type_t producer_data_type = {
         producer_memsize,
         producer_compact,
     },
-    0, 0, RUBY_TYPED_FREE_IMMEDIATELY
+    0, 0, RUBY_TYPED_FREE_IMMEDIATELY | RUBY_TYPED_WB_PROTECTED | RUBY_TYPED_EMBEDDABLE
 };
 
 static struct producer *
@@ -2994,8 +2983,8 @@ producer_init(VALUE obj, VALUE init, VALUE proc)
         rb_raise(rb_eArgError, "unallocated producer");
     }
 
-    ptr->init = init;
-    ptr->proc = proc;
+    RB_OBJ_WRITE(obj, &ptr->init, init);
+    RB_OBJ_WRITE(obj, &ptr->proc, proc);
 
     return obj;
 }
@@ -3190,7 +3179,7 @@ enum_chain_initialize(VALUE obj, VALUE enums)
 
     if (!ptr) rb_raise(rb_eArgError, "unallocated chain");
 
-    ptr->enums = rb_obj_freeze(enums);
+    ptr->enums = rb_ary_freeze(enums);
     ptr->pos = -1;
 
     return obj;
@@ -3518,7 +3507,7 @@ enum_product_initialize(int argc, VALUE *argv, VALUE obj)
 
     if (!ptr) rb_raise(rb_eArgError, "unallocated product");
 
-    ptr->enums = rb_obj_freeze(enums);
+    ptr->enums = rb_ary_freeze(enums);
 
     return obj;
 }
@@ -3545,10 +3534,19 @@ static VALUE
 enum_product_total_size(VALUE enums)
 {
     VALUE total = INT2FIX(1);
+    VALUE sizes = rb_ary_hidden_new(RARRAY_LEN(enums));
     long i;
 
     for (i = 0; i < RARRAY_LEN(enums); i++) {
         VALUE size = enum_size(RARRAY_AREF(enums, i));
+        if (size == INT2FIX(0)) {
+            rb_ary_resize(sizes, 0);
+            return size;
+        }
+        rb_ary_push(sizes, size);
+    }
+    for (i = 0; i < RARRAY_LEN(sizes); i++) {
+        VALUE size = RARRAY_AREF(sizes, i);
 
         if (NIL_P(size) || (RB_TYPE_P(size, T_FLOAT) && isinf(NUM2DBL(size)))) {
             return size;
@@ -3749,6 +3747,55 @@ enumerator_s_product(int argc, VALUE *argv, VALUE klass)
     return obj;
 }
 
+struct arith_seq {
+    struct enumerator enumerator;
+    VALUE begin;
+    VALUE end;
+    VALUE step;
+    bool exclude_end;
+};
+
+RUBY_REFERENCES(arith_seq_refs) = {
+    RUBY_REF_EDGE(struct enumerator, obj),
+    RUBY_REF_EDGE(struct enumerator, args),
+    RUBY_REF_EDGE(struct enumerator, fib),
+    RUBY_REF_EDGE(struct enumerator, dst),
+    RUBY_REF_EDGE(struct enumerator, lookahead),
+    RUBY_REF_EDGE(struct enumerator, feedvalue),
+    RUBY_REF_EDGE(struct enumerator, stop_exc),
+    RUBY_REF_EDGE(struct enumerator, size),
+    RUBY_REF_EDGE(struct enumerator, procs),
+
+    RUBY_REF_EDGE(struct arith_seq, begin),
+    RUBY_REF_EDGE(struct arith_seq, end),
+    RUBY_REF_EDGE(struct arith_seq, step),
+    RUBY_REF_END
+};
+
+static const rb_data_type_t arith_seq_data_type = {
+    "arithmetic_sequence",
+    {
+        RUBY_REFS_LIST_PTR(arith_seq_refs),
+        RUBY_TYPED_DEFAULT_FREE,
+        NULL, // Nothing allocated externally, so don't need a memsize function
+        NULL,
+    },
+    .parent = &enumerator_data_type,
+    .flags = RUBY_TYPED_FREE_IMMEDIATELY | RUBY_TYPED_WB_PROTECTED | RUBY_TYPED_DECL_MARKING | RUBY_TYPED_EMBEDDABLE
+};
+
+static VALUE
+arith_seq_allocate(VALUE klass)
+{
+    struct arith_seq *ptr;
+    VALUE enum_obj;
+
+    enum_obj = TypedData_Make_Struct(klass, struct arith_seq, &arith_seq_data_type, ptr);
+    ptr->enumerator.obj = Qundef;
+
+    return enum_obj;
+}
+
 /*
  * Document-class: Enumerator::ArithmeticSequence
  *
@@ -3766,12 +3813,16 @@ 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)
 {
-    VALUE aseq = enumerator_init(enumerator_allocate(rb_cArithSeq),
+    VALUE aseq = enumerator_init(arith_seq_allocate(rb_cArithSeq),
                                  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);
-    rb_ivar_set(aseq, id_exclude_end, RBOOL(excl));
+    struct arith_seq *ptr;
+    TypedData_Get_Struct(aseq, struct arith_seq, &enumerator_data_type, ptr);
+
+    RB_OBJ_WRITE(aseq, &ptr->begin, beg);
+    RB_OBJ_WRITE(aseq, &ptr->end, end);
+    RB_OBJ_WRITE(aseq, &ptr->step, step);
+    ptr->exclude_end = excl;
+
     return aseq;
 }
 
@@ -3784,7 +3835,9 @@ rb_arith_seq_new(VALUE obj, VALUE meth, int argc, VALUE const *argv,
 static inline VALUE
 arith_seq_begin(VALUE self)
 {
-    return rb_ivar_get(self, id_begin);
+    struct arith_seq *ptr;
+    TypedData_Get_Struct(self, struct arith_seq, &enumerator_data_type, ptr);
+    return ptr->begin;
 }
 
 /*
@@ -3795,7 +3848,9 @@ arith_seq_begin(VALUE self)
 static inline VALUE
 arith_seq_end(VALUE self)
 {
-    return rb_ivar_get(self, id_end);
+    struct arith_seq *ptr;
+    TypedData_Get_Struct(self, struct arith_seq, &enumerator_data_type, ptr);
+    return ptr->end;
 }
 
 /*
@@ -3807,7 +3862,9 @@ arith_seq_end(VALUE self)
 static inline VALUE
 arith_seq_step(VALUE self)
 {
-    return rb_ivar_get(self, id_step);
+    struct arith_seq *ptr;
+    TypedData_Get_Struct(self, struct arith_seq, &enumerator_data_type, ptr);
+    return ptr->step;
 }
 
 /*
@@ -3818,13 +3875,17 @@ arith_seq_step(VALUE self)
 static inline VALUE
 arith_seq_exclude_end(VALUE self)
 {
-    return rb_ivar_get(self, id_exclude_end);
+    struct arith_seq *ptr;
+    TypedData_Get_Struct(self, struct arith_seq, &enumerator_data_type, ptr);
+    return RBOOL(ptr->exclude_end);
 }
 
 static inline int
 arith_seq_exclude_end_p(VALUE self)
 {
-    return RTEST(arith_seq_exclude_end(self));
+    struct arith_seq *ptr;
+    TypedData_Get_Struct(self, struct arith_seq, &enumerator_data_type, ptr);
+    return ptr->exclude_end;
 }
 
 int
@@ -4571,7 +4632,7 @@ InitVM_Enumerator(void)
     rb_hash_aset(lazy_use_super_method, sym("uniq"), sym("_enumerable_uniq"));
     rb_hash_aset(lazy_use_super_method, sym("with_index"), sym("_enumerable_with_index"));
     rb_obj_freeze(lazy_use_super_method);
-    rb_gc_register_mark_object(lazy_use_super_method);
+    rb_vm_register_global_object(lazy_use_super_method);
 
 #if 0 /* for RDoc */
     rb_define_method(rb_cLazy, "to_a", lazy_to_a, 0);
@@ -4665,7 +4726,6 @@ void
 Init_Enumerator(void)
 {
     id_rewind = rb_intern_const("rewind");
-    id_new = rb_intern_const("new");
     id_next = rb_intern_const("next");
     id_result = rb_intern_const("result");
     id_receiver = rb_intern_const("receiver");
@@ -4675,12 +4735,7 @@ Init_Enumerator(void)
     id_force = rb_intern_const("force");
     id_to_enum = rb_intern_const("to_enum");
     id_each_entry = rb_intern_const("each_entry");
-    id_begin = rb_intern_const("begin");
-    id_end = rb_intern_const("end");
-    id_step = rb_intern_const("step");
-    id_exclude_end = rb_intern_const("exclude_end");
     sym_each = ID2SYM(id_each);
-    sym_cycle = ID2SYM(rb_intern_const("cycle"));
     sym_yield = ID2SYM(rb_intern_const("yield"));
 
     InitVM(Enumerator);
diff --git a/error.c b/error.c
index 13a6e3a5e28a11..d3aeec54d8b97c 100644
--- a/error.c
+++ b/error.c
@@ -23,25 +23,33 @@
 # include <unistd.h>
 #endif
 
+#ifdef HAVE_SYS_WAIT_H
+# include <sys/wait.h>
+#endif
+
 #if defined __APPLE__
 # include <AvailabilityMacros.h>
 #endif
 
 #include "internal.h"
+#include "internal/class.h"
 #include "internal/error.h"
 #include "internal/eval.h"
 #include "internal/hash.h"
 #include "internal/io.h"
 #include "internal/load.h"
 #include "internal/object.h"
+#include "internal/process.h"
 #include "internal/string.h"
 #include "internal/symbol.h"
 #include "internal/thread.h"
 #include "internal/variable.h"
 #include "ruby/encoding.h"
 #include "ruby/st.h"
+#include "ruby/util.h"
 #include "ruby_assert.h"
 #include "vm_core.h"
+#include "yjit.h"
 
 #include "builtin.h"
 
@@ -78,6 +86,7 @@ static ID id_category;
 static ID id_deprecated;
 static ID id_experimental;
 static ID id_performance;
+static ID id_strict_unused_block;
 static VALUE sym_category;
 static VALUE sym_highlight;
 static struct {
@@ -205,12 +214,10 @@ rb_warning_category_enabled_p(rb_warning_category_t category)
  *   deprecation warnings
  *   * assignment of non-nil value to <code>$,</code> and <code>$;</code>
  *   * keyword arguments
- *   * proc/lambda without block
  *   etc.
  *
  * +:experimental+ ::
  *   experimental features
- *   * Pattern matching
  *
  * +:performance+ ::
  *   performance hints
@@ -245,6 +252,26 @@ rb_warning_s_aset(VALUE mod, VALUE category, VALUE flag)
     return flag;
 }
 
+/*
+ * call-seq:
+ *   categories  -> array
+ *
+ * Returns a list of the supported category symbols.
+ */
+
+static VALUE
+rb_warning_s_categories(VALUE mod)
+{
+    st_index_t num = warning_categories.id2enum->num_entries;
+    ID *ids = ALLOCA_N(ID, num);
+    num = st_keys(warning_categories.id2enum, ids, num);
+    VALUE ary = rb_ary_new_capa(num);
+    for (st_index_t i = 0; i < num; ++i) {
+        rb_ary_push(ary, ID2SYM(ids[i]));
+    }
+    return rb_ary_freeze(ary);
+}
+
 /*
  * call-seq:
  *    warn(msg, category: nil)  -> nil
@@ -286,11 +313,11 @@ rb_warning_s_warn(int argc, VALUE *argv, VALUE mod)
  *
  *  Changing the behavior of Warning.warn is useful to customize how warnings are
  *  handled by Ruby, for instance by filtering some warnings, and/or outputting
- *  warnings somewhere other than $stderr.
+ *  warnings somewhere other than <tt>$stderr</tt>.
  *
  *  If you want to change the behavior of Warning.warn you should use
- *  +Warning.extend(MyNewModuleWithWarnMethod)+ and you can use `super`
- *  to get the default behavior of printing the warning to $stderr.
+ *  <tt>Warning.extend(MyNewModuleWithWarnMethod)</tt> and you can use +super+
+ *  to get the default behavior of printing the warning to <tt>$stderr</tt>.
  *
  *  Example:
  *    module MyWarningFilter
@@ -307,7 +334,7 @@ rb_warning_s_warn(int argc, VALUE *argv, VALUE mod)
  *  You should never redefine Warning#warn (the instance method), as that will
  *  then no longer provide a way to use the default behavior.
  *
- *  The +warning+ gem provides convenient ways to customize Warning.warn.
+ *  The warning[https://rubygems.org/gems/warning] gem provides convenient ways to customize Warning.warn.
  */
 
 static VALUE
@@ -359,18 +386,28 @@ warn_vsprintf(rb_encoding *enc, const char *file, int line, const char *fmt, va_
     return rb_str_cat2(str, "\n");
 }
 
-#define with_warn_vsprintf(file, line, fmt) \
+#define with_warn_vsprintf(enc, file, line, fmt) \
     VALUE str; \
     va_list args; \
     va_start(args, fmt); \
-    str = warn_vsprintf(NULL, file, line, fmt, args); \
+    str = warn_vsprintf(enc, file, line, fmt, args); \
     va_end(args);
 
 void
 rb_compile_warn(const char *file, int line, const char *fmt, ...)
 {
     if (!NIL_P(ruby_verbose)) {
-        with_warn_vsprintf(file, line, fmt) {
+        with_warn_vsprintf(NULL, file, line, fmt) {
+            rb_write_warning_str(str);
+        }
+    }
+}
+
+void
+rb_enc_compile_warn(rb_encoding *enc, const char *file, int line, const char *fmt, ...)
+{
+    if (!NIL_P(ruby_verbose)) {
+        with_warn_vsprintf(enc, file, line, fmt) {
             rb_write_warning_str(str);
         }
     }
@@ -381,7 +418,18 @@ void
 rb_compile_warning(const char *file, int line, const char *fmt, ...)
 {
     if (RTEST(ruby_verbose)) {
-        with_warn_vsprintf(file, line, fmt) {
+        with_warn_vsprintf(NULL, file, line, fmt) {
+            rb_write_warning_str(str);
+        }
+    }
+}
+
+/* rb_enc_compile_warning() reports only in verbose mode */
+void
+rb_enc_compile_warning(rb_encoding *enc, const char *file, int line, const char *fmt, ...)
+{
+    if (RTEST(ruby_verbose)) {
+        with_warn_vsprintf(enc, file, line, fmt) {
             rb_write_warning_str(str);
         }
     }
@@ -391,7 +439,7 @@ void
 rb_category_compile_warn(rb_warning_category_t category, const char *file, int line, const char *fmt, ...)
 {
     if (!NIL_P(ruby_verbose)) {
-        with_warn_vsprintf(file, line, fmt) {
+        with_warn_vsprintf(NULL, file, line, fmt) {
             rb_warn_category(str, rb_warning_category_to_name(category));
         }
     }
@@ -427,7 +475,7 @@ rb_warn(const char *fmt, ...)
 void
 rb_category_warn(rb_warning_category_t category, const char *fmt, ...)
 {
-    if (!NIL_P(ruby_verbose)) {
+    if (!NIL_P(ruby_verbose) && rb_warning_category_enabled_p(category)) {
         with_warning_string(mesg, 0, fmt) {
             rb_warn_category(mesg, rb_warning_category_to_name(category));
         }
@@ -459,7 +507,7 @@ rb_warning(const char *fmt, ...)
 void
 rb_category_warning(rb_warning_category_t category, const char *fmt, ...)
 {
-    if (RTEST(ruby_verbose)) {
+    if (RTEST(ruby_verbose) && rb_warning_category_enabled_p(category)) {
         with_warning_string(mesg, 0, fmt) {
             rb_warn_category(mesg, rb_warning_category_to_name(category));
         }
@@ -527,6 +575,18 @@ rb_warn_deprecated_to_remove(const char *removal, const char *fmt, const char *s
     }
 }
 
+void
+rb_warn_reserved_name(const char *coming, const char *fmt, ...)
+{
+    if (!deprecation_warning_enabled()) return;
+
+    with_warning_string_from(mesg, 0, fmt, fmt) {
+        rb_str_set_len(mesg, RSTRING_LEN(mesg) - 1);
+        rb_str_catf(mesg, " is reserved for Ruby %s\n", coming);
+        rb_warn_category(mesg, ID2SYM(id_deprecated));
+    }
+}
+
 static inline int
 end_with_asciichar(VALUE str, int c)
 {
@@ -623,18 +683,239 @@ rb_bug_reporter_add(void (*func)(FILE *, void *), void *data)
     return 1;
 }
 
+/* returns true if x can not be used as file name */
+static bool
+path_sep_p(char x)
+{
+#if defined __CYGWIN__ || defined DOSISH
+# define PATH_SEP_ENCODING 1
+    // Assume that "/" is only the first byte in any encoding.
+    if (x == ':') return true; // drive letter or ADS
+    if (x == '\\') return true;
+#endif
+    return x == '/';
+}
+
+struct path_string {
+    const char *ptr;
+    size_t len;
+};
+
+static const char PATHSEP_REPLACE = '!';
+
+static char *
+append_pathname(char *p, const char *pe, VALUE str)
+{
+#ifdef PATH_SEP_ENCODING
+    rb_encoding *enc = rb_enc_get(str);
+#endif
+    const char *s = RSTRING_PTR(str);
+    const char *const se = s + RSTRING_LEN(str);
+    char c;
+
+    --pe; // for terminator
+
+    while (p < pe && s < se && (c = *s) != '\0') {
+        if (c == '.') {
+            if (s == se || !*s) break; // chomp "." basename
+            if (path_sep_p(s[1])) goto skipsep; // skip "./"
+        }
+        else if (path_sep_p(c)) {
+            // squeeze successive separators
+            *p++ = PATHSEP_REPLACE;
+          skipsep:
+            while (++s < se && path_sep_p(*s));
+            continue;
+        }
+        const char *const ss = s;
+        while (p < pe && s < se && *s && !path_sep_p(*s)) {
+#ifdef PATH_SEP_ENCODING
+            int n = rb_enc_mbclen(s, se, enc);
+#else
+            const int n = 1;
+#endif
+            p += n;
+            s += n;
+        }
+        if (s > ss) memcpy(p - (s - ss), ss, s - ss);
+    }
+
+    return p;
+}
+
+static char *
+append_basename(char *p, const char *pe, struct path_string *path, VALUE str)
+{
+    if (!path->ptr) {
+#ifdef PATH_SEP_ENCODING
+        rb_encoding *enc = rb_enc_get(str);
+#endif
+        const char *const b = RSTRING_PTR(str), *const e = RSTRING_END(str), *p = e;
+
+        while (p > b) {
+            if (path_sep_p(p[-1])) {
+#ifdef PATH_SEP_ENCODING
+                const char *t = rb_enc_prev_char(b, p, e, enc);
+                if (t == p-1) break;
+                p = t;
+#else
+                break;
+#endif
+            }
+            else {
+                --p;
+            }
+        }
+
+        path->ptr = p;
+        path->len = e - p;
+    }
+    size_t n = path->len;
+    if (p + n > pe) n = pe - p;
+    memcpy(p, path->ptr, n);
+    return p + n;
+}
+
+static void
+finish_report(FILE *out, rb_pid_t pid)
+{
+    if (out != stdout && out != stderr) fclose(out);
+#ifdef HAVE_WORKING_FORK
+    if (pid > 0) waitpid(pid, NULL, 0);
+#endif
+}
+
+struct report_expansion {
+    struct path_string exe, script;
+    rb_pid_t pid;
+    time_t time;
+};
+
+/*
+ * Open a bug report file to write.  The `RUBY_CRASH_REPORT`
+ * environment variable can be set to define a template that is used
+ * to name bug report files.  The template can contain % specifiers
+ * which are substituted by the following values when a bug report
+ * file is created:
+ *
+ *   %%    A single % character.
+ *   %e    The base name of the executable filename.
+ *   %E    Pathname of executable, with slashes ('/') replaced by
+ *         exclamation marks ('!').
+ *   %f    Similar to %e with the main script filename.
+ *   %F    Similar to %E with the main script filename.
+ *   %p    PID of dumped process in decimal.
+ *   %t    Time of dump, expressed as seconds since the Epoch,
+ *         1970-01-01 00:00:00 +0000 (UTC).
+ *   %NNN  Octal char code, upto 3 digits.
+ */
+static char *
+expand_report_argument(const char **input_template, struct report_expansion *values,
+                       char *buf, size_t size, bool word)
+{
+    char *p = buf;
+    char *end = buf + size;
+    const char *template = *input_template;
+    bool store = true;
+
+    if (p >= end-1 || !*template) return NULL;
+    do {
+        char c = *template++;
+        if (word && ISSPACE(c)) break;
+        if (!store) continue;
+        if (c == '%') {
+            size_t n;
+            switch (c = *template++) {
+              case 'e':
+                p = append_basename(p, end, &values->exe, rb_argv0);
+                continue;
+              case 'E':
+                p = append_pathname(p, end, rb_argv0);
+                continue;
+              case 'f':
+                p = append_basename(p, end, &values->script, GET_VM()->orig_progname);
+                continue;
+              case 'F':
+                p = append_pathname(p, end, GET_VM()->orig_progname);
+                continue;
+              case 'p':
+                if (!values->pid) values->pid = getpid();
+                snprintf(p, end-p, "%" PRI_PIDT_PREFIX "d", values->pid);
+                p += strlen(p);
+                continue;
+              case 't':
+                if (!values->time) values->time = time(NULL);
+                snprintf(p, end-p, "%" PRI_TIMET_PREFIX "d", values->time);
+                p += strlen(p);
+                continue;
+              default:
+                if (c >= '0' && c <= '7') {
+                    c = (unsigned char)ruby_scan_oct(template-1, 3, &n);
+                    template += n - 1;
+                    if (!c) store = false;
+                }
+                break;
+            }
+        }
+        if (p < end-1) *p++ = c;
+    } while (*template);
+    *input_template = template;
+    *p = '\0';
+    return ++p;
+}
+
+FILE *ruby_popen_writer(char *const *argv, rb_pid_t *pid);
+
+static FILE *
+open_report_path(const char *template, char *buf, size_t size, rb_pid_t *pid)
+{
+    struct report_expansion values = {{0}};
+
+    if (!template) return NULL;
+    if (0) fprintf(stderr, "RUBY_CRASH_REPORT=%s\n", buf);
+    if (*template == '|') {
+        char *argv[16], *bufend = buf + size, *p;
+        int argc;
+        template++;
+        for (argc = 0; argc < numberof(argv) - 1; ++argc) {
+            while (*template && ISSPACE(*template)) template++;
+            p = expand_report_argument(&template, &values, buf, bufend-buf, true);
+            if (!p) break;
+            argv[argc] = buf;
+            buf = p;
+        }
+        argv[argc] = NULL;
+        if (!p) return ruby_popen_writer(argv, pid);
+    }
+    else if (*template) {
+        expand_report_argument(&template, &values, buf, size, false);
+        return fopen(buf, "w");
+    }
+    return NULL;
+}
+
+static const char *crash_report;
+
 /* SIGSEGV handler might have a very small stack. Thus we need to use it carefully. */
 #define REPORT_BUG_BUFSIZ 256
 static FILE *
-bug_report_file(const char *file, int line)
+bug_report_file(const char *file, int line, rb_pid_t *pid)
 {
     char buf[REPORT_BUG_BUFSIZ];
-    FILE *out = stderr;
+    const char *report = crash_report;
+    if (!report) report = getenv("RUBY_CRASH_REPORT");
+    FILE *out = open_report_path(report, buf, sizeof(buf), pid);
     int len = err_position_0(buf, sizeof(buf), file, line);
 
-    if ((ssize_t)fwrite(buf, 1, len, out) == (ssize_t)len ||
-        (ssize_t)fwrite(buf, 1, len, (out = stdout)) == (ssize_t)len) {
-        return out;
+    if (out) {
+        if ((ssize_t)fwrite(buf, 1, len, out) == (ssize_t)len) return out;
+        fclose(out);
+    }
+    if ((ssize_t)fwrite(buf, 1, len, stderr) == (ssize_t)len) {
+        return stderr;
+    }
+    if ((ssize_t)fwrite(buf, 1, len, stdout) == (ssize_t)len) {
+        return stdout;
     }
 
     return NULL;
@@ -741,7 +1022,7 @@ bug_report_begin_valist(FILE *out, const char *fmt, va_list args)
 } while (0)
 
 static void
-bug_report_end(FILE *out)
+bug_report_end(FILE *out, rb_pid_t pid)
 {
     /* call additional bug reporters */
     {
@@ -752,26 +1033,45 @@ bug_report_end(FILE *out)
         }
     }
     postscript_dump(out);
+    finish_report(out, pid);
 }
 
 #define report_bug(file, line, fmt, ctx) do { \
-    FILE *out = bug_report_file(file, line); \
+    rb_pid_t pid = -1; \
+    FILE *out = bug_report_file(file, line, &pid); \
     if (out) { \
         bug_report_begin(out, fmt); \
-        rb_vm_bugreport(ctx); \
-        bug_report_end(out); \
+        rb_vm_bugreport(ctx, out); \
+        bug_report_end(out, pid); \
     } \
 } while (0) \
 
 #define report_bug_valist(file, line, fmt, ctx, args) do { \
-    FILE *out = bug_report_file(file, line); \
+    rb_pid_t pid = -1; \
+    FILE *out = bug_report_file(file, line, &pid); \
     if (out) { \
         bug_report_begin_valist(out, fmt, args); \
-        rb_vm_bugreport(ctx); \
-        bug_report_end(out); \
+        rb_vm_bugreport(ctx, out); \
+        bug_report_end(out, pid); \
     } \
 } while (0) \
 
+void
+ruby_set_crash_report(const char *template)
+{
+    crash_report = template;
+#if RUBY_DEBUG
+    rb_pid_t pid = -1;
+    char buf[REPORT_BUG_BUFSIZ];
+    FILE *out = open_report_path(template, buf, sizeof(buf), &pid);
+    if (out) {
+        time_t t = time(NULL);
+        fprintf(out, "ruby_test_bug_report: %s", ctime(&t));
+        finish_report(out, pid);
+    }
+#endif
+}
+
 NORETURN(static void die(void));
 static void
 die(void)
@@ -784,8 +1084,8 @@ die(void)
 }
 
 RBIMPL_ATTR_FORMAT(RBIMPL_PRINTF_FORMAT, 1, 0)
-void
-rb_bug_without_die(const char *fmt, va_list args)
+static void
+rb_bug_without_die_internal(const char *fmt, va_list args)
 {
     const char *file = NULL;
     int line = 0;
@@ -797,12 +1097,22 @@ rb_bug_without_die(const char *fmt, va_list args)
     report_bug_valist(file, line, fmt, NULL, args);
 }
 
+RBIMPL_ATTR_FORMAT(RBIMPL_PRINTF_FORMAT, 1, 0)
+void
+rb_bug_without_die(const char *fmt, ...)
+{
+    va_list args;
+    va_start(args, fmt);
+    rb_bug_without_die_internal(fmt, args);
+    va_end(args);
+}
+
 void
 rb_bug(const char *fmt, ...)
 {
     va_list args;
     va_start(args, fmt);
-    rb_bug_without_die(fmt, args);
+    rb_bug_without_die_internal(fmt, args);
     va_end(args);
     die();
 }
@@ -821,6 +1131,7 @@ rb_bug_for_fatal_signal(ruby_sighandler_t default_sighandler, int sig, const voi
 
     if (default_sighandler) default_sighandler(sig);
 
+    ruby_default_signal(sig);
     die();
 }
 
@@ -877,13 +1188,34 @@ rb_report_bug_valist(VALUE file, int line, const char *fmt, va_list args)
 void
 rb_assert_failure(const char *file, int line, const char *name, const char *expr)
 {
-    FILE *out = stderr;
-    fprintf(out, "Assertion Failed: %s:%d:", file, line);
-    if (name) fprintf(out, "%s:", name);
-    fprintf(out, "%s\n%s\n\n", expr, rb_dynamic_description);
-    preface_dump(out);
-    rb_vm_bugreport(NULL);
-    bug_report_end(out);
+    rb_assert_failure_detail(file, line, name, expr, NULL);
+}
+
+void
+rb_assert_failure_detail(const char *file, int line, const char *name, const char *expr,
+                         const char *fmt, ...)
+{
+    rb_pid_t pid = -1;
+    FILE *out = bug_report_file(file, line, &pid);
+    if (out) {
+        fputs("Assertion Failed: ", out);
+        if (name) fprintf(out, "%s:", name);
+        fputs(expr, out);
+
+        if (fmt && *fmt) {
+            va_list args;
+            va_start(args, fmt);
+            fputs(": ", out);
+            vfprintf(out, fmt, args);
+            va_end(args);
+        }
+        fprintf(out, "\n%s\n\n", rb_dynamic_description);
+
+        preface_dump(out);
+        rb_vm_bugreport(NULL, out);
+        bug_report_end(out, pid);
+    }
+
     die();
 }
 
@@ -1077,7 +1409,7 @@ rb_check_typeddata(VALUE obj, const rb_data_type_t *data_type)
         actual = rb_str_new_cstr(name); /* or rb_fstring_cstr? not sure... */
     }
     else {
-        return DATA_PTR(obj);
+        return RTYPEDDATA_GET_DATA(obj);
     }
 
     const char *expected = data_type->wrap_struct_name;
@@ -1148,6 +1480,7 @@ rb_exc_new_cstr(VALUE etype, const char *s)
 VALUE
 rb_exc_new_str(VALUE etype, VALUE str)
 {
+    rb_yjit_lazy_push_frame(GET_EC()->cfp->pc);
     StringValue(str);
     return rb_class_new_instance(1, &str, etype);
 }
@@ -1162,12 +1495,23 @@ exc_init(VALUE exc, VALUE mesg)
 }
 
 /*
- * call-seq:
- *    Exception.new(msg = nil)        ->  exception
- *    Exception.exception(msg = nil)  ->  exception
+ *  call-seq:
+ *    Exception.new(message = nil) -> exception
+ *
+ *  Returns a new exception object.
+ *
+ *  The given +message+ should be
+ *  a {string-convertible object}[rdoc-ref:implicit_conversion.rdoc@String-Convertible+Objects];
+ *  see method #message;
+ *  if not given, the message is the class name of the new instance
+ *  (which may be the name of a subclass):
+ *
+ *  Examples:
+ *
+ *    Exception.new         # => #<Exception: Exception>
+ *    LoadError.new         # => #<LoadError: LoadError> # Subclass of Exception.
+ *    Exception.new('Boom') # => #<Exception: Boom>
  *
- *  Construct a new Exception object, optionally passing in
- *  a message.
  */
 
 static VALUE
@@ -1183,12 +1527,24 @@ exc_initialize(int argc, VALUE *argv, VALUE exc)
  *  Document-method: exception
  *
  *  call-seq:
- *     exc.exception([string])  ->  an_exception or exc
+ *    exception(message = nil) -> self or new_exception
+ *
+ *  Returns an exception object of the same class as +self+;
+ *  useful for creating a similar exception, but with a different message.
  *
- *  With no argument, or if the argument is the same as the receiver,
- *  return the receiver. Otherwise, create a new
- *  exception object of the same class as the receiver, but with a
- *  message equal to <code>string.to_str</code>.
+ *  With +message+ +nil+, returns +self+:
+ *
+ *    x0 = StandardError.new('Boom') # => #<StandardError: Boom>
+ *    x1 = x0.exception              # => #<StandardError: Boom>
+ *    x0.__id__ == x1.__id__         # => true
+ *
+ *  With {string-convertible object}[rdoc-ref:implicit_conversion.rdoc@String-Convertible+Objects]
+ *  +message+ (even the same as the original message),
+ *  returns a new exception object whose class is the same as +self+,
+ *  and whose message is the given +message+:
+ *
+ *    x1 = x0.exception('Boom') # => #<StandardError: Boom>
+ *    x0..equal?(x1)            # => false
  *
  */
 
@@ -1207,10 +1563,15 @@ exc_exception(int argc, VALUE *argv, VALUE self)
 
 /*
  * call-seq:
- *   exception.to_s   ->  string
+ *   to_s -> string
+ *
+ * Returns a string representation of +self+:
+ *
+ *   x = RuntimeError.new('Boom')
+ *   x.to_s # => "Boom"
+ *   x = RuntimeError.new
+ *   x.to_s # => "RuntimeError"
  *
- * Returns exception's message (or the name of the exception if
- * no message is set).
  */
 
 static VALUE
@@ -1250,10 +1611,10 @@ rb_get_detailed_message(VALUE exc, VALUE opt)
 }
 
 /*
- * call-seq:
- *    Exception.to_tty?   ->  true or false
+ *  call-seq:
+ *    Exception.to_tty? -> true or false
  *
- * Returns +true+ if exception messages will be sent to a tty.
+ *  Returns +true+ if exception messages will be sent to a terminal device.
  */
 static VALUE
 exc_s_to_tty_p(VALUE self)
@@ -1313,20 +1674,51 @@ check_order_keyword(VALUE opt)
 
 /*
  * call-seq:
- *   exception.full_message(highlight: bool, order: [:top or :bottom]) ->  string
+ *   full_message(highlight: true, order: :top) -> string
  *
- * Returns formatted string of _exception_.
- * The returned string is formatted using the same format that Ruby uses
- * when printing an uncaught exceptions to stderr.
+ * Returns an enhanced message string:
  *
- * If _highlight_ is +true+ the default error handler will send the
- * messages to a tty.
+ * - Includes the exception class name.
+ * - If the value of keyword +highlight+ is true (not +nil+ or +false+),
+ *   includes bolding ANSI codes (see below) to enhance the appearance of the message.
+ * - Includes the {backtrace}[rdoc-ref:exceptions.md@Backtraces]:
  *
- * _order_ must be either of +:top+ or +:bottom+, and places the error
- * message and the innermost backtrace come at the top or the bottom.
+ *   - If the value of keyword +order+ is +:top+ (the default),
+ *     lists the error message and the innermost backtrace entry first.
+ *   - If the value of keyword +order+ is +:bottom+,
+ *     lists the error message the the innermost entry last.
  *
- * The default values of these options depend on <code>$stderr</code>
- * and its +tty?+ at the timing of a call.
+ * Example:
+ *
+ *   def baz
+ *     begin
+ *       1 / 0
+ *     rescue => x
+ *       pp x.message
+ *       pp x.full_message(highlight: false).split("\n")
+ *       pp x.full_message.split("\n")
+ *     end
+ *   end
+ *   def bar; baz; end
+ *   def foo; bar; end
+ *   foo
+ *
+ * Output:
+ *
+ *   "divided by 0"
+ *   ["t.rb:3:in 'Integer#/': divided by 0 (ZeroDivisionError)",
+ *    "\tfrom t.rb:3:in 'Object#baz'",
+ *    "\tfrom t.rb:10:in 'Object#bar'",
+ *    "\tfrom t.rb:11:in 'Object#foo'",
+ *    "\tfrom t.rb:12:in '<main>'"]
+ *   ["t.rb:3:in 'Integer#/': \e[1mdivided by 0 (\e[1;4mZeroDivisionError\e[m\e[1m)\e[m",
+ *    "\tfrom t.rb:3:in 'Object#baz'",
+ *    "\tfrom t.rb:10:in 'Object#bar'",
+ *    "\tfrom t.rb:11:in 'Object#foo'",
+ *    "\tfrom t.rb:12:in '<main>'"]
+ *
+ * An overriding method should be careful with ANSI code enhancements;
+ * see {Messages}[rdoc-ref:exceptions.md@Messages].
  */
 
 static VALUE
@@ -1355,10 +1747,11 @@ exc_full_message(int argc, VALUE *argv, VALUE exc)
 
 /*
  * call-seq:
- *   exception.message   ->  string
+ *   message -> string
+ *
+ * Returns #to_s.
  *
- * Returns the result of invoking <code>exception.to_s</code>.
- * Normally this returns the exception's message or name.
+ * See {Messages}[rdoc-ref:exceptions.md@Messages].
  */
 
 static VALUE
@@ -1369,42 +1762,47 @@ exc_message(VALUE exc)
 
 /*
  * call-seq:
- *   exception.detailed_message(highlight: bool, **opt)   ->  string
+ *   detailed_message(highlight: false, **kwargs) -> string
+ *
+ * Returns the message string with enhancements:
+ *
+ * - Includes the exception class name in the first line.
+ * - If the value of keyword +highlight+ is +true+,
+ *   includes bolding and underlining ANSI codes (see below)
+ *   to enhance the appearance of the message.
  *
- * Processes a string returned by #message.
+ * Examples:
  *
- * It may add the class name of the exception to the end of the first line.
- * Also, when +highlight+ keyword is true, it adds ANSI escape sequences to
- * make the message bold.
+ *   begin
+ *     1 / 0
+ *   rescue => x
+ *     p x.message
+ *     p x.detailed_message                  # Class name added.
+ *     p x.detailed_message(highlight: true) # Class name, bolding, and underlining added.
+ *   end
  *
- * If you override this method, it must be tolerant for unknown keyword
- * arguments. All keyword arguments passed to #full_message are delegated
- * to this method.
+ * Output:
  *
- * This method is overridden by did_you_mean and error_highlight to add
- * their information.
+ *   "divided by 0"
+ *   "divided by 0 (ZeroDivisionError)"
+ *   "\e[1mdivided by 0 (\e[1;4mZeroDivisionError\e[m\e[1m)\e[m"
  *
- * A user-defined exception class can also define their own
- * +detailed_message+ method to add supplemental information.
- * When +highlight+ is true, it can return a string containing escape
- * sequences, but use widely-supported ones. It is recommended to limit
- * the following codes:
+ * This method is overridden by some gems in the Ruby standard library to add information:
  *
- * - Reset (+\e[0m+)
- * - Bold (+\e[1m+)
- * - Underline (+\e[4m+)
- * - Foreground color except white and black
- *   - Red (+\e[31m+)
- *   - Green (+\e[32m+)
- *   - Yellow (+\e[33m+)
- *   - Blue (+\e[34m+)
- *   - Magenta (+\e[35m+)
- *   - Cyan (+\e[36m+)
+ * - DidYouMean::Correctable#detailed_message.
+ * - ErrorHighlight::CoreExt#detailed_message.
+ * - SyntaxSuggest#detailed_message.
  *
- * Use escape sequences carefully even if +highlight+ is true.
- * Do not use escape sequences to express essential information;
- * the message should be readable even if all escape sequences are
- * ignored.
+ * An overriding method must be tolerant of passed keyword arguments,
+ * which may include (but may not be limited to):
+ *
+ * - +:highlight+.
+ * - +:did_you_mean+.
+ * - +:error_highlight+.
+ * - +:syntax_suggest+.
+ *
+ * An overriding method should also be careful with ANSI code enhancements;
+ * see {Messages}[rdoc-ref:exceptions.md@Messages].
  */
 
 static VALUE
@@ -1416,16 +1814,22 @@ exc_detailed_message(int argc, VALUE *argv, VALUE exc)
 
     VALUE highlight = check_highlight_keyword(opt, 0);
 
-    extern VALUE rb_decorate_message(const VALUE eclass, const VALUE emesg, int highlight);
+    extern VALUE rb_decorate_message(const VALUE eclass, VALUE emesg, int highlight);
 
     return rb_decorate_message(CLASS_OF(exc), rb_get_message(exc), RTEST(highlight));
 }
 
 /*
  * call-seq:
- *   exception.inspect   -> string
+ *   inspect -> string
+ *
+ * Returns a string representation of +self+:
+ *
+ *   x = RuntimeError.new('Boom')
+ *   x.inspect # => "#<RuntimeError: Boom>"
+ *   x = RuntimeError.new
+ *   x.inspect # => "#<RuntimeError: RuntimeError>"
  *
- * Return this exception's class name and message.
  */
 
 static VALUE
@@ -1458,38 +1862,36 @@ exc_inspect(VALUE exc)
 
 /*
  *  call-seq:
- *     exception.backtrace    -> array or nil
+ *    backtrace -> array or nil
  *
- *  Returns any backtrace associated with the exception. The backtrace
- *  is an array of strings, each containing either ``filename:lineNo: in
- *  `method''' or ``filename:lineNo.''
+ *  Returns the backtrace (the list of code locations that led to the exception),
+ *  as an array of strings.
  *
- *     def a
- *       raise "boom"
- *     end
+ *  Example (assuming the code is stored in the file named <tt>t.rb</tt>):
  *
- *     def b
- *       a()
- *     end
- *
- *     begin
- *       b()
- *     rescue => detail
- *       print detail.backtrace.join("\n")
- *     end
+ *    def division(numerator, denominator)
+ *      numerator / denominator
+ *    end
  *
- *  <em>produces:</em>
+ *    begin
+ *      division(1, 0)
+ *    rescue => ex
+ *      p ex.backtrace
+ *      # ["t.rb:2:in 'Integer#/'", "t.rb:2:in 'Object#division'", "t.rb:6:in '<main>'"]
+ *      loc = ex.backtrace.first
+ *      p loc.class
+ *      # String
+ *    end
  *
- *     prog.rb:2:in `a'
- *     prog.rb:6:in `b'
- *     prog.rb:10
+ *  The value returned by this method migth be adjusted when raising (see Kernel#raise),
+ *  or during intermediate handling by #set_backtrace.
  *
- *  In the case no backtrace has been set, +nil+ is returned
+ *  See also #backtrace_locations that provide the same value, as structured objects.
+ *  (Note though that two values might not be consistent with each other when
+ *  backtraces are manually adjusted.)
  *
- *    ex = StandardError.new
- *    ex.backtrace
- *    #=> nil
-*/
+ *  see {Backtraces}[rdoc-ref:exceptions.md@Backtraces].
+ */
 
 static VALUE
 exc_backtrace(VALUE exc)
@@ -1531,13 +1933,41 @@ rb_get_backtrace(VALUE exc)
 
 /*
  *  call-seq:
- *     exception.backtrace_locations    -> array or nil
+ *    backtrace_locations -> array or nil
+ *
+ *  Returns the backtrace (the list of code locations that led to the exception),
+ *  as an array of Thread::Backtrace::Location instances.
+ *
+ *  Example (assuming the code is stored in the file named <tt>t.rb</tt>):
+ *
+ *    def division(numerator, denominator)
+ *      numerator / denominator
+ *    end
+ *
+ *    begin
+ *      division(1, 0)
+ *    rescue => ex
+ *      p ex.backtrace_locations
+ *      # ["t.rb:2:in 'Integer#/'", "t.rb:2:in 'Object#division'", "t.rb:6:in '<main>'"]
+ *      loc = ex.backtrace_locations.first
+ *      p loc.class
+ *      # Thread::Backtrace::Location
+ *      p loc.path
+ *      # "t.rb"
+ *      p loc.lineno
+ *      # 2
+ *      p loc.label
+ *      # "Integer#/"
+ *    end
  *
- *  Returns any backtrace associated with the exception. This method is
- *  similar to Exception#backtrace, but the backtrace is an array of
- *  Thread::Backtrace::Location.
+ *  The value returned by this method might be adjusted when raising (see Kernel#raise),
+ *  or during intermediate handling by #set_backtrace.
  *
- *  This method is not affected by Exception#set_backtrace().
+ *  See also #backtrace that provide the same value as an array of strings.
+ *  (Note though that two values might not be consistent with each other when
+ *  backtraces are manually adjusted.)
+ *
+ *  See {Backtraces}[rdoc-ref:exceptions.md@Backtraces].
  */
 static VALUE
 exc_backtrace_locations(VALUE exc)
@@ -1555,7 +1985,7 @@ static VALUE
 rb_check_backtrace(VALUE bt)
 {
     long i;
-    static const char err[] = "backtrace must be Array of String";
+    static const char err[] = "backtrace must be an Array of String or an Array of Thread::Backtrace::Location";
 
     if (!NIL_P(bt)) {
         if (RB_TYPE_P(bt, T_STRING)) return rb_ary_new3(1, bt);
@@ -1575,18 +2005,118 @@ rb_check_backtrace(VALUE bt)
 
 /*
  *  call-seq:
- *     exc.set_backtrace(backtrace)   ->  array
+ *    set_backtrace(value) -> value
+ *
+ *  Sets the backtrace value for +self+; returns the given +value+.
+ *
+ *  The +value+ might be:
+ *
+ *  - an array of Thread::Backtrace::Location;
+ *  - an array of String instances;
+ *  - a single String instance; or
+ *  - +nil+.
+ *
+ *  Using array of Thread::Backtrace::Location is the most consistent
+ *  option: it sets both #backtrace and #backtrace_locations. It should be
+ *  preferred when possible. The suitable array of locations can be obtained
+ *  from Kernel#caller_locations, copied from another error, or just set to
+ *  the adjusted result of the current error's #backtrace_locations:
  *
- *  Sets the backtrace information associated with +exc+. The +backtrace+ must
- *  be an array of String objects or a single String in the format described
- *  in Exception#backtrace.
+ *      require 'json'
+ *
+ *      def parse_payload(text)
+ *        JSON.parse(text)  # test.rb, line 4
+ *      rescue JSON::ParserError => ex
+ *        ex.set_backtrace(ex.backtrace_locations[2...])
+ *        raise
+ *      end
+ *
+ *      parse_payload('{"wrong: "json"')
+ *      # test.rb:4:in 'Object#parse_payload': unexpected token at '{"wrong: "json"' (JSON::ParserError)
+ *      #
+ *      # An error points to the body of parse_payload method,
+ *      # hiding the parts of the backtrace related to the internals
+ *      # of the "json" library
+ *
+ *      # The error has both #backtace and #backtrace_locations set
+ *      # consistently:
+ *      begin
+ *        parse_payload('{"wrong: "json"')
+ *      rescue => ex
+ *        p ex.backtrace
+ *        # ["test.rb:4:in 'Object#parse_payload'", "test.rb:20:in '<main>'"]
+ *        p ex.backtrace_locations
+ *        # ["test.rb:4:in 'Object#parse_payload'", "test.rb:20:in '<main>'"]
+ *      end
  *
+ *  When the desired stack of locations is not available and should
+ *  be constructed from scratch, an array of strings or a singular
+ *  string can be used. In this case, only #backtrace is affected:
+ *
+ *      def parse_payload(text)
+ *        JSON.parse(text)
+ *      rescue JSON::ParserError => ex
+ *        ex.set_backtrace(["dsl.rb:34", "framework.rb:1"])
+ *        # The error have the new value in #backtrace:
+ *        p ex.backtrace
+ *        # ["dsl.rb:34", "framework.rb:1"]
+ *
+ *        # but the original one in #backtrace_locations
+ *        p ex.backtrace_locations
+ *        # [".../json/common.rb:221:in 'JSON::Ext::Parser.parse'", ...]
+ *      end
+ *
+ *      parse_payload('{"wrong: "json"')
+ *
+ *  Calling #set_backtrace with +nil+ clears up #backtrace but doesn't affect
+ *  #backtrace_locations:
+ *
+ *      def parse_payload(text)
+ *        JSON.parse(text)
+ *      rescue JSON::ParserError => ex
+ *        ex.set_backtrace(nil)
+ *        p ex.backtrace
+ *        # nil
+ *        p ex.backtrace_locations
+ *        # [".../json/common.rb:221:in 'JSON::Ext::Parser.parse'", ...]
+ *      end
+ *
+ *      parse_payload('{"wrong: "json"')
+ *
+ *  On reraising of such an exception, both #backtrace and #backtrace_locations
+ *  is set to the place of reraising:
+ *
+ *      def parse_payload(text)
+ *        JSON.parse(text)
+ *      rescue JSON::ParserError => ex
+ *        ex.set_backtrace(nil)
+ *        raise # test.rb, line 7
+ *      end
+ *
+ *      begin
+ *        parse_payload('{"wrong: "json"')
+ *      rescue => ex
+ *        p ex.backtrace
+ *        # ["test.rb:7:in 'Object#parse_payload'", "test.rb:11:in '<main>'"]
+ *        p ex.backtrace_locations
+ *        # ["test.rb:7:in 'Object#parse_payload'", "test.rb:11:in '<main>'"]
+ *      end
+ *
+ *  See {Backtraces}[rdoc-ref:exceptions.md@Backtraces].
  */
 
 static VALUE
 exc_set_backtrace(VALUE exc, VALUE bt)
 {
-    return rb_ivar_set(exc, id_bt, rb_check_backtrace(bt));
+    VALUE btobj = rb_location_ary_to_backtrace(bt);
+    if (RTEST(btobj)) {
+        rb_ivar_set(exc, id_bt, btobj);
+        rb_ivar_set(exc, id_bt_locations, btobj);
+        return bt;
+    }
+    else {
+        return rb_ivar_set(exc, id_bt, rb_check_backtrace(bt));
+    }
 }
 
 VALUE
@@ -1596,12 +2126,35 @@ rb_exc_set_backtrace(VALUE exc, VALUE bt)
 }
 
 /*
- * call-seq:
- *   exception.cause   -> an_exception or nil
+ *  call-seq:
+ *    cause -> exception or nil
+ *
+ *  Returns the previous value of global variable <tt>$!</tt>,
+ *  which may be +nil+
+ *  (see {Global Variables}[rdoc-ref:exceptions.md@Global+Variables]):
+ *
+ *    begin
+ *      raise('Boom 0')
+ *    rescue => x0
+ *      puts "Exception: #{x0};  $!: #{$!};  cause: #{x0.cause.inspect}."
+ *      begin
+ *        raise('Boom 1')
+ *      rescue => x1
+ *        puts "Exception: #{x1};  $!: #{$!};  cause: #{x1.cause}."
+ *        begin
+ *          raise('Boom 2')
+ *        rescue => x2
+ *          puts "Exception: #{x2};  $!: #{$!};  cause: #{x2.cause}."
+ *        end
+ *      end
+ *    end
+ *
+ *  Output:
+ *
+ *    Exception: Boom 0;  $!: Boom 0;  cause: nil.
+ *    Exception: Boom 1;  $!: Boom 1;  cause: Boom 0.
+ *    Exception: Boom 2;  $!: Boom 2;  cause: Boom 1.
  *
- * Returns the previous exception ($!) at the time this exception was raised.
- * This is useful for wrapping exceptions and retaining the original exception
- * information.
  */
 
 static VALUE
@@ -1618,11 +2171,11 @@ try_convert_to_exception(VALUE obj)
 
 /*
  *  call-seq:
- *     exc == obj   -> true or false
+ *    self == object -> true or false
+ *
+ *  Returns whether +object+ is the same class as +self+
+ *  and its #message and #backtrace are equal to those of +self+.
  *
- *  Equality---If <i>obj</i> is not an Exception, returns
- *  <code>false</code>. Otherwise, returns <code>true</code> if <i>exc</i> and
- *  <i>obj</i> share same class, messages, and backtrace.
  */
 
 static VALUE
@@ -1957,50 +2510,50 @@ rb_nomethod_err_new(VALUE mesg, VALUE recv, VALUE method, VALUE args, int priv)
     return nometh_err_init_attr(exc, args, priv);
 }
 
-/* :nodoc: */
-enum {
-    NAME_ERR_MESG__MESG,
-    NAME_ERR_MESG__RECV,
-    NAME_ERR_MESG__NAME,
-    NAME_ERR_MESG_COUNT
-};
+typedef struct name_error_message_struct {
+    VALUE mesg;
+    VALUE recv;
+    VALUE name;
+} name_error_message_t;
 
 static void
 name_err_mesg_mark(void *p)
 {
-    VALUE *ptr = p;
-    rb_gc_mark_locations(ptr, ptr+NAME_ERR_MESG_COUNT);
+    name_error_message_t *ptr = (name_error_message_t *)p;
+    rb_gc_mark_movable(ptr->mesg);
+    rb_gc_mark_movable(ptr->recv);
+    rb_gc_mark_movable(ptr->name);
 }
 
-#define name_err_mesg_free RUBY_TYPED_DEFAULT_FREE
-
-static size_t
-name_err_mesg_memsize(const void *p)
+static void
+name_err_mesg_update(void *p)
 {
-    return NAME_ERR_MESG_COUNT * sizeof(VALUE);
+    name_error_message_t *ptr = (name_error_message_t *)p;
+    ptr->mesg = rb_gc_location(ptr->mesg);
+    ptr->recv = rb_gc_location(ptr->recv);
+    ptr->name = rb_gc_location(ptr->name);
 }
 
 static const rb_data_type_t name_err_mesg_data_type = {
     "name_err_mesg",
     {
         name_err_mesg_mark,
-        name_err_mesg_free,
-        name_err_mesg_memsize,
+        RUBY_TYPED_DEFAULT_FREE,
+        NULL, // No external memory to report,
+        name_err_mesg_update,
     },
-    0, 0, RUBY_TYPED_FREE_IMMEDIATELY
+    0, 0, RUBY_TYPED_FREE_IMMEDIATELY | RUBY_TYPED_WB_PROTECTED | RUBY_TYPED_EMBEDDABLE
 };
 
 /* :nodoc: */
 static VALUE
-rb_name_err_mesg_init(VALUE klass, VALUE mesg, VALUE recv, VALUE method)
+rb_name_err_mesg_init(VALUE klass, VALUE mesg, VALUE recv, VALUE name)
 {
-    VALUE result = TypedData_Wrap_Struct(klass, &name_err_mesg_data_type, 0);
-    VALUE *ptr = ALLOC_N(VALUE, NAME_ERR_MESG_COUNT);
-
-    ptr[NAME_ERR_MESG__MESG] = mesg;
-    ptr[NAME_ERR_MESG__RECV] = recv;
-    ptr[NAME_ERR_MESG__NAME] = method;
-    RTYPEDDATA_DATA(result) = ptr;
+    name_error_message_t *message;
+    VALUE result = TypedData_Make_Struct(klass, name_error_message_t, &name_err_mesg_data_type, message);
+    RB_OBJ_WRITE(result, &message->mesg, mesg);
+    RB_OBJ_WRITE(result, &message->recv, recv);
+    RB_OBJ_WRITE(result, &message->name, name);
     return result;
 }
 
@@ -2022,14 +2575,16 @@ name_err_mesg_alloc(VALUE klass)
 static VALUE
 name_err_mesg_init_copy(VALUE obj1, VALUE obj2)
 {
-    VALUE *ptr1, *ptr2;
-
     if (obj1 == obj2) return obj1;
     rb_obj_init_copy(obj1, obj2);
 
-    TypedData_Get_Struct(obj1, VALUE, &name_err_mesg_data_type, ptr1);
-    TypedData_Get_Struct(obj2, VALUE, &name_err_mesg_data_type, ptr2);
-    MEMCPY(ptr1, ptr2, VALUE, NAME_ERR_MESG_COUNT);
+    name_error_message_t *ptr1, *ptr2;
+    TypedData_Get_Struct(obj1, name_error_message_t, &name_err_mesg_data_type, ptr1);
+    TypedData_Get_Struct(obj2, name_error_message_t, &name_err_mesg_data_type, ptr2);
+
+    RB_OBJ_WRITE(obj1, &ptr1->mesg, ptr2->mesg);
+    RB_OBJ_WRITE(obj1, &ptr1->recv, ptr2->recv);
+    RB_OBJ_WRITE(obj1, &ptr1->name, ptr2->name);
     return obj1;
 }
 
@@ -2037,19 +2592,18 @@ name_err_mesg_init_copy(VALUE obj1, VALUE obj2)
 static VALUE
 name_err_mesg_equal(VALUE obj1, VALUE obj2)
 {
-    VALUE *ptr1, *ptr2;
-    int i;
-
     if (obj1 == obj2) return Qtrue;
+
     if (rb_obj_class(obj2) != rb_cNameErrorMesg)
         return Qfalse;
 
-    TypedData_Get_Struct(obj1, VALUE, &name_err_mesg_data_type, ptr1);
-    TypedData_Get_Struct(obj2, VALUE, &name_err_mesg_data_type, ptr2);
-    for (i=0; i<NAME_ERR_MESG_COUNT; i++) {
-        if (!rb_equal(ptr1[i], ptr2[i]))
-            return Qfalse;
-    }
+    name_error_message_t *ptr1, *ptr2;
+    TypedData_Get_Struct(obj1, name_error_message_t, &name_err_mesg_data_type, ptr1);
+    TypedData_Get_Struct(obj2, name_error_message_t, &name_err_mesg_data_type, ptr2);
+
+    if (!rb_equal(ptr1->mesg, ptr2->mesg)) return Qfalse;
+    if (!rb_equal(ptr1->recv, ptr2->recv)) return Qfalse;
+    if (!rb_equal(ptr1->name, ptr2->name)) return Qfalse;
     return Qtrue;
 }
 
@@ -2068,10 +2622,10 @@ name_err_mesg_receiver_name(VALUE obj)
 static VALUE
 name_err_mesg_to_str(VALUE obj)
 {
-    VALUE *ptr, mesg;
-    TypedData_Get_Struct(obj, VALUE, &name_err_mesg_data_type, ptr);
+    name_error_message_t *ptr;
+    TypedData_Get_Struct(obj, name_error_message_t, &name_err_mesg_data_type, ptr);
 
-    mesg = ptr[NAME_ERR_MESG__MESG];
+    VALUE mesg = ptr->mesg;
     if (NIL_P(mesg)) return Qnil;
     else {
         struct RString s_str, c_str, d_str;
@@ -2081,7 +2635,7 @@ name_err_mesg_to_str(VALUE obj)
 
 #define FAKE_CSTR(v, str) rb_setup_fake_str((v), (str), rb_strlen_lit(str), usascii)
         c = s = FAKE_CSTR(&s_str, "");
-        obj = ptr[NAME_ERR_MESG__RECV];
+        obj = ptr->recv;
         switch (obj) {
           case Qnil:
             c = d = FAKE_CSTR(&d_str, "nil");
@@ -2124,7 +2678,7 @@ name_err_mesg_to_str(VALUE obj)
                 VALUE klass;
               object:
                 klass = CLASS_OF(obj);
-                if (RB_TYPE_P(klass, T_CLASS) && FL_TEST(klass, FL_SINGLETON)) {
+                if (RB_TYPE_P(klass, T_CLASS) && RCLASS_SINGLETON_P(klass)) {
                     s = FAKE_CSTR(&s_str, "");
                     if (obj == rb_vm_top_self()) {
                         c = FAKE_CSTR(&c_str, "main");
@@ -2152,7 +2706,7 @@ name_err_mesg_to_str(VALUE obj)
             c = c2;
             break;
         }
-        args[0] = rb_obj_as_string(ptr[NAME_ERR_MESG__NAME]);
+        args[0] = rb_obj_as_string(ptr->name);
         args[1] = d;
         args[2] = s;
         args[3] = c;
@@ -2185,17 +2739,17 @@ name_err_mesg_load(VALUE klass, VALUE str)
 static VALUE
 name_err_receiver(VALUE self)
 {
-    VALUE *ptr, recv, mesg;
-
-    recv = rb_ivar_lookup(self, id_recv, Qundef);
+    VALUE recv = rb_ivar_lookup(self, id_recv, Qundef);
     if (!UNDEF_P(recv)) return recv;
 
-    mesg = rb_attr_get(self, id_mesg);
+    VALUE mesg = rb_attr_get(self, id_mesg);
     if (!rb_typeddata_is_kind_of(mesg, &name_err_mesg_data_type)) {
         rb_raise(rb_eArgError, "no receiver is available");
     }
-    ptr = DATA_PTR(mesg);
-    return ptr[NAME_ERR_MESG__RECV];
+
+    name_error_message_t *ptr;
+    TypedData_Get_Struct(mesg, name_error_message_t, &name_err_mesg_data_type, ptr);
+    return ptr->recv;
 }
 
 /*
@@ -2405,8 +2959,18 @@ syntax_error_with_path(VALUE exc, VALUE path, VALUE *mesg, rb_encoding *enc)
         rb_ivar_set(exc, id_i_path, path);
     }
     else {
-        if (rb_attr_get(exc, id_i_path) != path) {
-            rb_raise(rb_eArgError, "SyntaxError#path changed");
+        VALUE old_path = rb_attr_get(exc, id_i_path);
+        if (old_path != path) {
+            if (rb_str_equal(path, old_path)) {
+                rb_raise(rb_eArgError, "SyntaxError#path changed: %+"PRIsVALUE" (%p->%p)",
+                         old_path, (void *)old_path, (void *)path);
+            }
+            else {
+                rb_raise(rb_eArgError, "SyntaxError#path changed: %+"PRIsVALUE"(%s%s)->%+"PRIsVALUE"(%s)",
+                         old_path, rb_enc_name(rb_enc_get(old_path)),
+                         (FL_TEST(old_path, RSTRING_FSTR) ? ":FSTR" : ""),
+                         path, rb_enc_name(rb_enc_get(path)));
+            }
         }
         VALUE s = *mesg = rb_attr_get(exc, idMesg);
         if (RSTRING_LEN(s) > 0 && *(RSTRING_END(s)-1) != '\n')
@@ -2418,67 +2982,105 @@ syntax_error_with_path(VALUE exc, VALUE path, VALUE *mesg, rb_encoding *enc)
 /*
  *  Document-module: Errno
  *
- *  Ruby exception objects are subclasses of Exception.  However,
- *  operating systems typically report errors using plain
- *  integers. Module Errno is created dynamically to map these
- *  operating system errors to Ruby classes, with each error number
- *  generating its own subclass of SystemCallError.  As the subclass
- *  is created in module Errno, its name will start
- *  <code>Errno::</code>.
+ *  When an operating system encounters an error,
+ *  it typically reports the error as an integer error code:
+ *
+ *    $ ls nosuch.txt
+ *    ls: cannot access 'nosuch.txt': No such file or directory
+ *    $ echo $? # Code for last error.
+ *    2
+ *
+ *  When the Ruby interpreter interacts with the operating system
+ *  and receives such an error code (e.g., +2+),
+ *  it maps the code to a particular Ruby exception class (e.g., +Errno::ENOENT+):
+ *
+ *    File.open('nosuch.txt')
+ *    # => No such file or directory @ rb_sysopen - nosuch.txt (Errno::ENOENT)
+ *
+ *  Each such class is:
  *
- *  The names of the <code>Errno::</code> classes depend on the
- *  environment in which Ruby runs. On a typical Unix or Windows
- *  platform, there are Errno classes such as Errno::EACCES,
- *  Errno::EAGAIN, Errno::EINTR, and so on.
+ *  - A nested class in this module, +Errno+.
+ *  - A subclass of class SystemCallError.
+ *  - Associated with an error code.
  *
- *  The integer operating system error number corresponding to a
- *  particular error is available as the class constant
- *  <code>Errno::</code><em>error</em><code>::Errno</code>.
+ *  Thus:
  *
- *     Errno::EACCES::Errno   #=> 13
- *     Errno::EAGAIN::Errno   #=> 11
- *     Errno::EINTR::Errno    #=> 4
+ *    Errno::ENOENT.superclass # => SystemCallError
+ *    Errno::ENOENT::Errno     # => 2
  *
- *  The full list of operating system errors on your particular platform
- *  are available as the constants of Errno.
+ *  The names of nested classes are returned by method +Errno.constants+:
  *
- *     Errno.constants   #=> :E2BIG, :EACCES, :EADDRINUSE, :EADDRNOTAVAIL, ...
+ *    Errno.constants.size         # => 158
+ *    Errno.constants.sort.take(5) # => [:E2BIG, :EACCES, :EADDRINUSE, :EADDRNOTAVAIL, :EADV]
+ *
+ *  As seen above, the error code associated with each class
+ *  is available as the value of a constant;
+ *  the value for a particular class may vary among operating systems.
+ *  If the class is not needed for the particular operating system,
+ *  the value is zero:
+ *
+ *    Errno::ENOENT::Errno      # => 2
+ *    Errno::ENOTCAPABLE::Errno # => 0
+ *
+ *  Each class in Errno can be created with optional messages:
+ *
+ *    Errno::EPIPE.new                  # => #<Errno::EPIPE: Broken pipe>
+ *    Errno::EPIPE.new("foo")           # => #<Errno::EPIPE: Broken pipe - foo>
+ *    Errno::EPIPE.new("foo", "here")   # => #<Errno::EPIPE: Broken pipe @ here - foo>
+ *
+ *  See SystemCallError.new.
  */
 
 static st_table *syserr_tbl;
 
-static VALUE
-set_syserr(int n, const char *name)
+void
+rb_free_warning(void)
 {
-    st_data_t error;
+    st_free_table(warning_categories.id2enum);
+    st_free_table(warning_categories.enum2id);
+    st_free_table(syserr_tbl);
+}
 
-    if (!st_lookup(syserr_tbl, n, &error)) {
-        error = rb_define_class_under(rb_mErrno, name, rb_eSystemCallError);
+static VALUE
+setup_syserr(int n, const char *name)
+{
+    VALUE error = rb_define_class_under(rb_mErrno, name, rb_eSystemCallError);
 
-        /* capture nonblock errnos for WaitReadable/WaitWritable subclasses */
-        switch (n) {
-          case EAGAIN:
-            rb_eEAGAIN = error;
+    /* capture nonblock errnos for WaitReadable/WaitWritable subclasses */
+    switch (n) {
+      case EAGAIN:
+        rb_eEAGAIN = error;
 
 #if defined(EWOULDBLOCK) && EWOULDBLOCK != EAGAIN
-            break;
-          case EWOULDBLOCK:
+        break;
+      case EWOULDBLOCK:
 #endif
 
-            rb_eEWOULDBLOCK = error;
-            break;
-          case EINPROGRESS:
-            rb_eEINPROGRESS = error;
-            break;
-        }
+        rb_eEWOULDBLOCK = error;
+        break;
+      case EINPROGRESS:
+        rb_eEINPROGRESS = error;
+        break;
+    }
 
-        rb_define_const(error, "Errno", INT2NUM(n));
-        st_add_direct(syserr_tbl, n, error);
+    rb_define_const(error, "Errno", INT2NUM(n));
+    st_add_direct(syserr_tbl, n, (st_data_t)error);
+    return error;
+}
+
+static VALUE
+set_syserr(int n, const char *name)
+{
+    st_data_t error;
+
+    if (!st_lookup(syserr_tbl, n, &error)) {
+        return setup_syserr(n, name);
     }
     else {
-        rb_define_const(rb_mErrno, name, error);
+        VALUE errclass = (VALUE)error;
+        rb_define_const(rb_mErrno, name, errclass);
+        return errclass;
     }
-    return error;
 }
 
 static VALUE
@@ -2487,22 +3089,43 @@ get_syserr(int n)
     st_data_t error;
 
     if (!st_lookup(syserr_tbl, n, &error)) {
-        char name[8];	/* some Windows' errno have 5 digits. */
+        char name[DECIMAL_SIZE_OF(n) + sizeof("E-")];
 
         snprintf(name, sizeof(name), "E%03d", n);
-        error = set_syserr(n, name);
+        return setup_syserr(n, name);
     }
-    return error;
+    return (VALUE)error;
 }
 
 /*
  * call-seq:
- *   SystemCallError.new(msg, errno)  -> system_call_error_subclass
+ *   SystemCallError.new(msg, errno = nil, func = nil)  -> system_call_error_subclass
  *
  * If _errno_ corresponds to a known system error code, constructs the
  * appropriate Errno class for that error, otherwise constructs a
  * generic SystemCallError object. The error number is subsequently
  * available via the #errno method.
+ *
+ * If only numeric object is given, it is treated as an Integer _errno_,
+ * and _msg_ is omitted, otherwise the first argument _msg_ is used as
+ * the additional error message.
+ *
+ *   SystemCallError.new(Errno::EPIPE::Errno)
+ *   #=> #<Errno::EPIPE: Broken pipe>
+ *
+ *   SystemCallError.new("foo")
+ *   #=> #<SystemCallError: unknown error - foo>
+ *
+ *   SystemCallError.new("foo", Errno::EPIPE::Errno)
+ *   #=> #<Errno::EPIPE: Broken pipe - foo>
+ *
+ * If _func_ is not +nil+, it is appended to the message with "<tt> @ </tt>".
+ *
+ *   SystemCallError.new("foo", Errno::EPIPE::Errno, "here")
+ *   #=> #<Errno::EPIPE: Broken pipe @ here - foo>
+ *
+ * A subclass of SystemCallError can also be instantiated via the
+ * +new+ method of the subclass.  See Errno.
  */
 
 static VALUE
@@ -2806,7 +3429,7 @@ syserr_eqq(VALUE self, VALUE exc)
  *
  *  <em>raises the exception:</em>
  *
- *     NoMethodError: undefined method `to_ary' for "hello":String
+ *     NoMethodError: undefined method `to_ary' for an instance of String
  */
 
 /*
@@ -2879,7 +3502,7 @@ syserr_eqq(VALUE self, VALUE exc)
 /*
  * Document-class: fatal
  *
- * fatal is an Exception that is raised when Ruby has encountered a fatal
+ * +fatal+ is an Exception that is raised when Ruby has encountered a fatal
  * error and must exit.
  */
 
@@ -2891,62 +3514,26 @@ syserr_eqq(VALUE self, VALUE exc)
 /*
  *  Document-class: Exception
  *
- *  \Class Exception and its subclasses are used to communicate between
- *  Kernel#raise and +rescue+ statements in <code>begin ... end</code> blocks.
- *
- *  An Exception object carries information about an exception:
- *  - Its type (the exception's class).
- *  - An optional descriptive message.
- *  - Optional backtrace information.
+ *  Class +Exception+ and its subclasses are used to indicate that an error
+ *  or other problem has occurred,
+ *  and may need to be handled.
+ *  See {Exceptions}[rdoc-ref:exceptions.md].
  *
- *  Some built-in subclasses of Exception have additional methods: e.g., NameError#name.
+ *  An +Exception+ object carries certain information:
  *
- *  == Defaults
+ *  - The type (the exception's class),
+ *    commonly StandardError, RuntimeError, or a subclass of one or the other;
+ *    see {Built-In Exception Class Hierarchy}[rdoc-ref:Exception@Built-In+Exception+Class+Hierarchy].
+ *  - An optional descriptive message;
+ *    see methods ::new, #message.
+ *  - Optional backtrace information;
+ *    see methods #backtrace, #backtrace_locations, #set_backtrace.
+ *  - An optional cause;
+ *    see method #cause.
  *
- *  Two Ruby statements have default exception classes:
- *  - +raise+: defaults to RuntimeError.
- *  - +rescue+: defaults to StandardError.
+ *  == Built-In \Exception Class Hierarchy
  *
- *  == Global Variables
- *
- *  When an exception has been raised but not yet handled (in +rescue+,
- *  +ensure+, +at_exit+ and +END+ blocks), two global variables are set:
- *  - <code>$!</code> contains the current exception.
- *  - <code>$@</code> contains its backtrace.
- *
- *  == Custom Exceptions
- *
- *  To provide additional or alternate information,
- *  a program may create custom exception classes
- *  that derive from the built-in exception classes.
- *
- *  A good practice is for a library to create a single "generic" exception class
- *  (typically a subclass of StandardError or RuntimeError)
- *  and have its other exception classes derive from that class.
- *  This allows the user to rescue the generic exception, thus catching all exceptions
- *  the library may raise even if future versions of the library add new
- *  exception subclasses.
- *
- *  For example:
- *
- *    class MyLibrary
- *      class Error < ::StandardError
- *      end
- *
- *      class WidgetError < Error
- *      end
- *
- *      class FrobError < Error
- *      end
- *
- *    end
- *
- *  To handle both MyLibrary::WidgetError and MyLibrary::FrobError the library
- *  user can rescue MyLibrary::Error.
- *
- *  == Built-In Exception Classes
- *
- *  The built-in subclasses of Exception are:
+ *  The hierarchy of built-in subclasses of class +Exception+:
  *
  *  * NoMemoryError
  *  * ScriptError
@@ -2976,13 +3563,14 @@ syserr_eqq(VALUE self, VALUE exc)
  *    * RuntimeError
  *      * FrozenError
  *    * SystemCallError
- *      * Errno::*
+ *      * Errno (and its subclasses, representing system errors)
  *    * ThreadError
  *    * TypeError
  *    * ZeroDivisionError
  *  * SystemExit
  *  * SystemStackError
- *  * fatal
+ *  * {fatal}[rdoc-ref:fatal]
+ *
  */
 
 static VALUE
@@ -3002,9 +3590,9 @@ exception_dumper(VALUE exc)
 }
 
 static int
-ivar_copy_i(st_data_t key, st_data_t val, st_data_t exc)
+ivar_copy_i(ID key, VALUE val, st_data_t exc)
 {
-    rb_ivar_set((VALUE) exc, (ID) key, (VALUE) val);
+    rb_ivar_set((VALUE)exc, key, val);
     return ST_CONTINUE;
 }
 
@@ -3081,11 +3669,11 @@ Init_Exception(void)
     *  and will render `idPath` as an attribute name without this trick */
     ID path = idPath;
 
-    /* the path failed to parse */
+    /* the path that failed to parse */
     rb_attr(rb_eSyntaxError, path, TRUE, FALSE, FALSE);
 
     rb_eLoadError   = rb_define_class("LoadError", rb_eScriptError);
-    /* the path failed to load */
+    /* the path that failed to load */
     rb_attr(rb_eLoadError, path, TRUE, FALSE, FALSE);
 
     rb_eNotImpError = rb_define_class("NotImplementedError", rb_eScriptError);
@@ -3132,6 +3720,7 @@ Init_Exception(void)
     rb_mWarning = rb_define_module("Warning");
     rb_define_singleton_method(rb_mWarning, "[]", rb_warning_s_aref, 1);
     rb_define_singleton_method(rb_mWarning, "[]=", rb_warning_s_aset, 2);
+    rb_define_singleton_method(rb_mWarning, "categories", rb_warning_s_categories, 0);
     rb_define_method(rb_mWarning, "warn", rb_warning_s_warn, -1);
     rb_extend_object(rb_mWarning, rb_mWarning);
 
@@ -3157,6 +3746,7 @@ Init_Exception(void)
     id_deprecated = rb_intern_const("deprecated");
     id_experimental = rb_intern_const("experimental");
     id_performance = rb_intern_const("performance");
+    id_strict_unused_block = rb_intern_const("strict_unused_block");
     id_top = rb_intern_const("top");
     id_bottom = rb_intern_const("bottom");
     id_iseq = rb_make_internal_id();
@@ -3169,12 +3759,14 @@ Init_Exception(void)
     st_add_direct(warning_categories.id2enum, id_deprecated, RB_WARN_CATEGORY_DEPRECATED);
     st_add_direct(warning_categories.id2enum, id_experimental, RB_WARN_CATEGORY_EXPERIMENTAL);
     st_add_direct(warning_categories.id2enum, id_performance, RB_WARN_CATEGORY_PERFORMANCE);
+    st_add_direct(warning_categories.id2enum, id_strict_unused_block, RB_WARN_CATEGORY_STRICT_UNUSED_BLOCK);
 
     warning_categories.enum2id = rb_init_identtable();
     st_add_direct(warning_categories.enum2id, RB_WARN_CATEGORY_NONE, 0);
     st_add_direct(warning_categories.enum2id, RB_WARN_CATEGORY_DEPRECATED, id_deprecated);
     st_add_direct(warning_categories.enum2id, RB_WARN_CATEGORY_EXPERIMENTAL, id_experimental);
     st_add_direct(warning_categories.enum2id, RB_WARN_CATEGORY_PERFORMANCE, id_performance);
+    st_add_direct(warning_categories.enum2id, RB_WARN_CATEGORY_STRICT_UNUSED_BLOCK, id_strict_unused_block);
 }
 
 void
@@ -3197,12 +3789,13 @@ rb_vraise(VALUE exc, const char *fmt, va_list ap)
 }
 
 void
-rb_raise(VALUE exc, const char *fmt, ...)
+rb_raise(VALUE exc_class, const char *fmt, ...)
 {
     va_list args;
     va_start(args, fmt);
-    rb_vraise(exc, fmt, args);
+    VALUE exc = rb_exc_new3(exc_class, rb_vsprintf(fmt, args));
     va_end(args);
+    rb_exc_raise(exc);
 }
 
 NORETURN(static void raise_loaderror(VALUE path, VALUE mesg));
@@ -3257,7 +3850,7 @@ rb_fatal(const char *fmt, ...)
         /* The thread has no GVL.  Object allocation impossible (cant run GC),
          * thus no message can be printed out. */
         fprintf(stderr, "[FATAL] rb_fatal() outside of GVL\n");
-        rb_print_backtrace();
+        rb_print_backtrace(stderr);
         die();
     }
 
@@ -3546,11 +4139,25 @@ inspect_frozen_obj(VALUE obj, VALUE mesg, int recur)
     return mesg;
 }
 
+static VALUE
+get_created_info(VALUE obj, int *pline)
+{
+    VALUE info = rb_attr_get(obj, id_debug_created_info);
+
+    if (NIL_P(info)) return Qnil;
+
+    VALUE path = rb_ary_entry(info, 0);
+    VALUE line = rb_ary_entry(info, 1);
+    if (NIL_P(path)) return Qnil;
+    *pline = NUM2INT(line);
+    return StringValue(path);
+}
+
 void
 rb_error_frozen_object(VALUE frozen_obj)
 {
-    VALUE debug_info;
-    const ID created_info = id_debug_created_info;
+    rb_yjit_lazy_push_frame(GET_EC()->cfp->pc);
+
     VALUE mesg = rb_sprintf("can't modify frozen %"PRIsVALUE": ",
                             CLASS_OF(frozen_obj));
     VALUE exc = rb_exc_new_str(rb_eFrozenError, mesg);
@@ -3558,36 +4165,81 @@ rb_error_frozen_object(VALUE frozen_obj)
     rb_ivar_set(exc, id_recv, frozen_obj);
     rb_exec_recursive(inspect_frozen_obj, frozen_obj, mesg);
 
-    if (!NIL_P(debug_info = rb_attr_get(frozen_obj, created_info))) {
-        VALUE path = rb_ary_entry(debug_info, 0);
-        VALUE line = rb_ary_entry(debug_info, 1);
-
-        rb_str_catf(mesg, ", created at %"PRIsVALUE":%"PRIsVALUE, path, line);
+    int created_line;
+    VALUE created_path = get_created_info(frozen_obj, &created_line);
+    if (!NIL_P(created_path)) {
+        rb_str_catf(mesg, ", created at %"PRIsVALUE":%d", created_path, created_line);
     }
     rb_exc_raise(exc);
 }
 
+void
+rb_warn_unchilled_literal(VALUE obj)
+{
+    rb_warning_category_t category = RB_WARN_CATEGORY_DEPRECATED;
+    if (!NIL_P(ruby_verbose) && rb_warning_category_enabled_p(category)) {
+        int line;
+        VALUE file = rb_source_location(&line);
+        VALUE mesg = NIL_P(file) ? rb_str_new(0, 0) : rb_str_dup(file);
+
+        if (!NIL_P(file)) {
+            if (line) rb_str_catf(mesg, ":%d", line);
+            rb_str_cat2(mesg, ": ");
+        }
+        rb_str_cat2(mesg, "warning: literal string will be frozen in the future");
+
+        VALUE str = obj;
+        if (STR_SHARED_P(str)) {
+            str = RSTRING(obj)->as.heap.aux.shared;
+        }
+        VALUE created = get_created_info(str, &line);
+        if (NIL_P(created)) {
+            rb_str_cat2(mesg, " (run with --debug-frozen-string-literal for more information)\n");
+        }
+        else {
+            rb_str_cat2(mesg, "\n");
+            rb_str_append(mesg, created);
+            if (line) rb_str_catf(mesg, ":%d", line);
+            rb_str_cat2(mesg, ": info: the string was created here\n");
+        }
+        rb_warn_category(mesg, rb_warning_category_to_name(category));
+    }
+}
+
+void
+rb_warn_unchilled_symbol_to_s(VALUE obj)
+{
+    rb_category_warn(
+        RB_WARN_CATEGORY_DEPRECATED,
+        "string returned by :%s.to_s will be frozen in the future", RSTRING_PTR(obj)
+    );
+}
+
 #undef rb_check_frozen
 void
 rb_check_frozen(VALUE obj)
 {
-    rb_check_frozen_internal(obj);
+    rb_check_frozen_inline(obj);
 }
 
 void
 rb_check_copyable(VALUE obj, VALUE orig)
 {
     if (!FL_ABLE(obj)) return;
-    rb_check_frozen_internal(obj);
+    rb_check_frozen(obj);
     if (!FL_ABLE(orig)) return;
 }
 
 void
 Init_syserr(void)
 {
-    rb_eNOERROR = set_syserr(0, "NOERROR");
+    rb_eNOERROR = setup_syserr(0, "NOERROR");
+#if 0
+    /* No error */
+    rb_define_const(rb_mErrno, "NOERROR", rb_eNOERROR);
+#endif
 #define defined_error(name, num) set_syserr((num), (name));
-#define undefined_error(name) set_syserr(0, (name));
+#define undefined_error(name) rb_define_const(rb_mErrno, (name), rb_eNOERROR);
 #include "known_errors.inc"
 #undef defined_error
 #undef undefined_error
diff --git a/eval.c b/eval.c
index 844c537cc41d06..74f31db5c02259 100644
--- a/eval.c
+++ b/eval.c
@@ -32,7 +32,6 @@
 #include "internal/variable.h"
 #include "ruby/fiber/scheduler.h"
 #include "iseq.h"
-#include "rjit.h"
 #include "probes.h"
 #include "probes_helper.h"
 #include "ruby/vm.h"
@@ -70,8 +69,6 @@ ruby_setup(void)
     if (GET_VM())
         return 0;
 
-    ruby_init_stack((void *)&state);
-
     /*
      * Disable THP early before mallocs happen because we want this to
      * affect as many future pages as possible for CoW-friendliness
@@ -80,9 +77,10 @@ ruby_setup(void)
     prctl(PR_SET_THP_DISABLE, 1, 0, 0, 0);
 #endif
     Init_BareVM();
-    Init_heap();
     rb_vm_encoded_insn_data_table_init();
+    Init_enable_namespace();
     Init_vm_objects();
+    Init_fstring_table();
 
     EC_PUSH_TAG(GET_EC());
     if ((state = EC_EXEC_TAG()) == TAG_NONE) {
@@ -115,10 +113,9 @@ ruby_options(int argc, char **argv)
     enum ruby_tag_type state;
     void *volatile iseq = 0;
 
-    ruby_init_stack((void *)&iseq);
     EC_PUSH_TAG(ec);
     if ((state = EC_EXEC_TAG()) == TAG_NONE) {
-        SAVE_ROOT_JMPBUF(GET_THREAD(), iseq = ruby_process_options(argc, argv));
+        iseq = ruby_process_options(argc, argv);
     }
     else {
         rb_ec_clear_current_thread_trace_func(ec);
@@ -165,7 +162,7 @@ rb_ec_finalize(rb_execution_context_t *ec)
 {
     ruby_sig_finalize();
     ec->errinfo = Qnil;
-    rb_objspace_call_finalizer(rb_ec_vm_ptr(ec)->objspace);
+    rb_objspace_call_finalizer();
 }
 
 void
@@ -200,16 +197,15 @@ rb_ec_cleanup(rb_execution_context_t *ec, enum ruby_tag_type ex)
 
     EC_PUSH_TAG(ec);
     if ((state = EC_EXEC_TAG()) == TAG_NONE) {
-        SAVE_ROOT_JMPBUF(th, { RUBY_VM_CHECK_INTS(ec); });
+        RUBY_VM_CHECK_INTS(ec);
 
       step_0: step++;
         save_error = ec->errinfo;
         if (THROW_DATA_P(ec->errinfo)) ec->errinfo = Qnil;
-        ruby_init_stack(&message);
 
         /* exits with failure but silently when an exception raised
          * here */
-        SAVE_ROOT_JMPBUF(th, rb_ec_teardown(ec));
+        rb_ec_teardown(ec);
 
       step_1: step++;
         VALUE err = ec->errinfo;
@@ -227,7 +223,7 @@ rb_ec_cleanup(rb_execution_context_t *ec, enum ruby_tag_type ex)
             mode1 = exiting_split(err, (mode0 & EXITING_WITH_STATUS) ? NULL : &sysex, &signaled);
             if (mode1 & EXITING_WITH_MESSAGE) {
                 buf = rb_str_new(NULL, 0);
-                SAVE_ROOT_JMPBUF(th, rb_ec_error_print_detailed(ec, err, buf, Qundef));
+                rb_ec_error_print_detailed(ec, err, buf, Qundef);
                 message = buf;
             }
         }
@@ -236,7 +232,7 @@ rb_ec_cleanup(rb_execution_context_t *ec, enum ruby_tag_type ex)
         /* protect from Thread#raise */
         th->status = THREAD_KILLED;
 
-        SAVE_ROOT_JMPBUF(th, rb_ractor_terminate_all());
+        rb_ractor_terminate_all();
 
       step_3: step++;
         if (!NIL_P(buf = message)) {
@@ -283,10 +279,7 @@ rb_ec_exec_node(rb_execution_context_t *ec, void *n)
 
     EC_PUSH_TAG(ec);
     if ((state = EC_EXEC_TAG()) == TAG_NONE) {
-        rb_thread_t *const th = rb_ec_thread_ptr(ec);
-        SAVE_ROOT_JMPBUF(th, {
-            rb_iseq_eval_main(iseq);
-        });
+        rb_iseq_eval_main(iseq);
     }
     EC_POP_TAG();
     return state;
@@ -324,14 +317,12 @@ ruby_run_node(void *n)
         rb_ec_cleanup(ec, (NIL_P(ec->errinfo) ? TAG_NONE : TAG_RAISE));
         return status;
     }
-    ruby_init_stack((void *)&status);
     return rb_ec_cleanup(ec, rb_ec_exec_node(ec, n));
 }
 
 int
 ruby_exec_node(void *n)
 {
-    ruby_init_stack((void *)&n);
     return rb_ec_exec_node(GET_EC(), n);
 }
 
@@ -419,11 +410,11 @@ rb_mod_s_constants(int argc, VALUE *argv, VALUE mod)
     return rb_const_list(data);
 }
 
-/*!
- * Asserts that \a klass is not a frozen class.
- * \param[in] klass a \c Module object
- * \exception RuntimeError if \a klass is not a class or frozen.
- * \ingroup class
+/**
+ * Asserts that `klass` is not a frozen class.
+ * @param[in] klass a `Module` object
+ * @exception RuntimeError if `klass` is not a class or frozen.
+ * @ingroup class
  */
 void
 rb_class_modify_check(VALUE klass)
@@ -432,12 +423,13 @@ rb_class_modify_check(VALUE klass)
         Check_Type(klass, T_CLASS);
     }
     if (RB_TYPE_P(klass, T_MODULE)) {
-        rb_module_set_initialized(klass);
+        // TODO: shouldn't this only happen in a few places?
+        rb_class_set_initialized(klass);
     }
     if (OBJ_FROZEN(klass)) {
         const char *desc;
 
-        if (FL_TEST(klass, FL_SINGLETON)) {
+        if (RCLASS_SINGLETON_P(klass)) {
             desc = "object";
             klass = RCLASS_ATTACHED_OBJECT(klass);
             if (!SPECIAL_CONST_P(klass)) {
@@ -472,7 +464,7 @@ rb_class_modify_check(VALUE klass)
     }
 }
 
-NORETURN(static void rb_longjmp(rb_execution_context_t *, int, volatile VALUE, VALUE));
+NORETURN(static void rb_longjmp(rb_execution_context_t *, enum ruby_tag_type, volatile VALUE, VALUE));
 static VALUE get_errinfo(void);
 #define get_ec_errinfo(ec) rb_ec_get_errinfo(ec)
 
@@ -539,10 +531,14 @@ exc_setup_message(const rb_execution_context_t *ec, VALUE mesg, VALUE *cause)
         rb_exc_check_circular_cause(*cause);
 #else
         VALUE c = *cause;
-        while (!NIL_P(c = rb_attr_get(c, id_cause))) {
+        while (!NIL_P(c)) {
             if (c == mesg) {
                 rb_raise(rb_eArgError, "circular causes");
             }
+            if (THROW_DATA_P(c)) {
+                break;
+            }
+            c = rb_attr_get(c, id_cause);
         }
 #endif
     }
@@ -550,7 +546,7 @@ exc_setup_message(const rb_execution_context_t *ec, VALUE mesg, VALUE *cause)
 }
 
 static void
-setup_exception(rb_execution_context_t *ec, int tag, volatile VALUE mesg, VALUE cause)
+setup_exception(rb_execution_context_t *ec, enum ruby_tag_type tag, volatile VALUE mesg, VALUE cause)
 {
     VALUE e;
     int line;
@@ -598,15 +594,15 @@ setup_exception(rb_execution_context_t *ec, int tag, volatile VALUE mesg, VALUE
             e = rb_obj_as_string(mesg);
             ec->errinfo = mesg;
             if (file && line) {
-                e = rb_sprintf("Exception `%"PRIsVALUE"' at %s:%d - %"PRIsVALUE"\n",
+                e = rb_sprintf("Exception '%"PRIsVALUE"' at %s:%d - %"PRIsVALUE"\n",
                                rb_obj_class(mesg), file, line, e);
             }
             else if (file) {
-                e = rb_sprintf("Exception `%"PRIsVALUE"' at %s - %"PRIsVALUE"\n",
+                e = rb_sprintf("Exception '%"PRIsVALUE"' at %s - %"PRIsVALUE"\n",
                                rb_obj_class(mesg), file, e);
             }
             else {
-                e = rb_sprintf("Exception `%"PRIsVALUE"' - %"PRIsVALUE"\n",
+                e = rb_sprintf("Exception '%"PRIsVALUE"' - %"PRIsVALUE"\n",
                                rb_obj_class(mesg), e);
             }
             warn_print_str(e);
@@ -654,7 +650,7 @@ rb_ec_setup_exception(const rb_execution_context_t *ec, VALUE mesg, VALUE cause)
 }
 
 static void
-rb_longjmp(rb_execution_context_t *ec, int tag, volatile VALUE mesg, VALUE cause)
+rb_longjmp(rb_execution_context_t *ec, enum ruby_tag_type tag, volatile VALUE mesg, VALUE cause)
 {
     mesg = exc_setup_message(ec, mesg, &cause);
     setup_exception(ec, tag, mesg, cause);
@@ -664,10 +660,10 @@ rb_longjmp(rb_execution_context_t *ec, int tag, volatile VALUE mesg, VALUE cause
 
 static VALUE make_exception(int argc, const VALUE *argv, int isstr);
 
-NORETURN(static void rb_exc_exception(VALUE mesg, int tag, VALUE cause));
+NORETURN(static void rb_exc_exception(VALUE mesg, enum ruby_tag_type tag, VALUE cause));
 
 static void
-rb_exc_exception(VALUE mesg, int tag, VALUE cause)
+rb_exc_exception(VALUE mesg, enum ruby_tag_type tag, VALUE cause)
 {
     if (!NIL_P(mesg)) {
         mesg = make_exception(1, &mesg, FALSE);
@@ -675,12 +671,12 @@ rb_exc_exception(VALUE mesg, int tag, VALUE cause)
     rb_longjmp(GET_EC(), tag, mesg, cause);
 }
 
-/*!
+/**
  * Raises an exception in the current thread.
- * \param[in] mesg an Exception class or an \c Exception object.
- * \exception always raises an instance of the given exception class or
- *   the given \c Exception object.
- * \ingroup exception
+ * @param[in] mesg an Exception class or an `Exception` object.
+ * @exception always raises an instance of the given exception class or
+ *   the given `Exception` object.
+ * @ingroup exception
  */
 void
 rb_exc_raise(VALUE mesg)
@@ -756,31 +752,112 @@ rb_f_raise(int argc, VALUE *argv)
 
 /*
  *  call-seq:
- *     raise
- *     raise(string, cause: $!)
- *     raise(exception [, string [, array]], cause: $!)
- *     fail
- *     fail(string, cause: $!)
- *     fail(exception [, string [, array]], cause: $!)
- *
- *  With no arguments, raises the exception in <code>$!</code> or raises
- *  a RuntimeError if <code>$!</code> is +nil+.  With a single +String+
- *  argument, raises a +RuntimeError+ with the string as a message. Otherwise,
- *  the first parameter should be an +Exception+ class (or another
- *  object that returns an +Exception+ object when sent an +exception+
- *  message).  The optional second parameter sets the message associated with
- *  the exception (accessible via Exception#message), and the third parameter
- *  is an array of callback information (accessible via Exception#backtrace).
- *  The +cause+ of the generated exception (accessible via Exception#cause)
- *  is automatically set to the "current" exception (<code>$!</code>), if any.
- *  An alternative value, either an +Exception+ object or +nil+, can be
- *  specified via the +:cause+ argument.
- *
- *  Exceptions are caught by the +rescue+ clause of
- *  <code>begin...end</code> blocks.
- *
- *     raise "Failed to create socket"
- *     raise ArgumentError, "No parameters", caller
+ *    raise(exception, message = exception.to_s, backtrace = nil, cause: $!)
+ *    raise(message = nil, cause: $!)
+ *
+ *  Raises an exception;
+ *  see {Exceptions}[rdoc-ref:exceptions.md].
+ *
+ *  Argument +exception+ sets the class of the new exception;
+ *  it should be class Exception or one of its subclasses
+ *  (most commonly, RuntimeError or StandardError),
+ *  or an instance of one of those classes:
+ *
+ *    begin
+ *      raise(StandardError)
+ *    rescue => x
+ *      p x.class
+ *    end
+ *    # => StandardError
+ *
+ *  Argument +message+ sets the stored message in the new exception,
+ *  which may be retrieved by method Exception#message;
+ *  the message must be
+ *  a {string-convertible object}[rdoc-ref:implicit_conversion.rdoc@String-Convertible+Objects]
+ *  or +nil+:
+ *
+ *    begin
+ *      raise(StandardError, 'Boom')
+ *    rescue => x
+ *      p x.message
+ *    end
+ *    # => "Boom"
+ *
+ *  If argument +message+ is not given,
+ *  the message is the exception class name.
+ *
+ *  See {Messages}[rdoc-ref:exceptions.md@Messages].
+ *
+ *  Argument +backtrace+ might be used to modify the backtrace of the new exception,
+ *  as reported by Exception#backtrace and Exception#backtrace_locations;
+ *  the backtrace must be an array of Thread::Backtrace::Location, an array of
+ *  strings, a single string, or +nil+.
+ *
+ *  Using the array of Thread::Backtrace::Location instances is the most consistent option
+ *  and should be preferred when possible. The necessary value might be obtained
+ *  from #caller_locations, or copied from Exception#backtrace_locations of another
+ *  error:
+ *
+ *    begin
+ *      do_some_work()
+ *    rescue ZeroDivisionError => ex
+ *      raise(LogicalError, "You have an error in your math", ex.backtrace_locations)
+ *    end
+ *
+ *  The ways, both Exception#backtrace and Exception#backtrace_locations of the
+ *  raised error are set to the same backtrace.
+ *
+ *  When the desired stack of locations is not available and should
+ *  be constructed from scratch, an array of strings or a singular
+ *  string can be used. In this case, only Exception#backtrace is set:
+ *
+ *    begin
+ *      raise(StandardError, 'Boom', %w[dsl.rb:3 framework.rb:1])
+ *    rescue => ex
+ *      p ex.backtrace
+ *      # => ["dsl.rb:3", "framework.rb:1"]
+ *      p ex.backtrace_locations
+ *      # => nil
+ *    end
+ *
+ *  If argument +backtrace+ is not given,
+ *  the backtrace is set according to an array of Thread::Backtrace::Location objects,
+ *  as derived from the call stack.
+ *
+ *  See {Backtraces}[rdoc-ref:exceptions.md@Backtraces].
+ *
+ *  Keyword argument +cause+ sets the stored cause in the new exception,
+ *  which may be retrieved by method Exception#cause;
+ *  the cause must be an exception object (Exception or one of its subclasses),
+ *  or +nil+:
+ *
+ *    begin
+ *      raise(StandardError, cause: RuntimeError.new)
+ *    rescue => x
+ *      p x.cause
+ *    end
+ *    # => #<RuntimeError: RuntimeError>
+ *
+ *  If keyword argument +cause+ is not given,
+ *  the cause is the value of <tt>$!</tt>.
+ *
+ *  See {Cause}[rdoc-ref:exceptions.md@Cause].
+ *
+ *  In the alternate calling sequence,
+ *  where argument +exception+ _not_ given,
+ *  raises a new exception of the class given by <tt>$!</tt>,
+ *  or of class RuntimeError if <tt>$!</tt> is +nil+:
+ *
+ *    begin
+ *      raise
+ *    rescue => x
+ *      p x
+ *    end
+ *    # => RuntimeError
+ *
+ *  With argument +exception+ not given,
+ *  argument +message+ and keyword argument +cause+ may be given,
+ *  but argument +backtrace+ may not be given.
  */
 
 static VALUE
@@ -980,7 +1057,7 @@ rb_protect(VALUE (* proc) (VALUE), VALUE data, int *pstate)
 
     EC_PUSH_TAG(ec);
     if ((state = EC_EXEC_TAG()) == TAG_NONE) {
-        SAVE_ROOT_JMPBUF(rb_ec_thread_ptr(ec), result = (*proc) (data));
+        result = (*proc)(data);
     }
     else {
         rb_vm_rewind_cfp(ec, cfp);
@@ -994,16 +1071,10 @@ rb_protect(VALUE (* proc) (VALUE), VALUE data, int *pstate)
 VALUE
 rb_ensure(VALUE (*b_proc)(VALUE), VALUE data1, VALUE (*e_proc)(VALUE), VALUE data2)
 {
-    int state;
+    enum ruby_tag_type state;
     volatile VALUE result = Qnil;
     VALUE errinfo;
     rb_execution_context_t * volatile ec = GET_EC();
-    rb_ensure_list_t ensure_list;
-    ensure_list.entry.marker = 0;
-    ensure_list.entry.e_proc = e_proc;
-    ensure_list.entry.data2 = data2;
-    ensure_list.next = ec->ensure_list;
-    ec->ensure_list = &ensure_list;
     EC_PUSH_TAG(ec);
     if ((state = EC_EXEC_TAG()) == TAG_NONE) {
         result = (*b_proc) (data1);
@@ -1013,8 +1084,7 @@ rb_ensure(VALUE (*b_proc)(VALUE), VALUE data1, VALUE (*e_proc)(VALUE), VALUE dat
     if (!NIL_P(errinfo) && !RB_TYPE_P(errinfo, T_OBJECT)) {
         ec->errinfo = Qnil;
     }
-    ec->ensure_list=ensure_list.next;
-    (*ensure_list.entry.e_proc)(ensure_list.entry.data2);
+    (*e_proc)(data2);
     ec->errinfo = errinfo;
     if (state)
         EC_JUMP_TAG(ec, state);
@@ -1128,6 +1198,8 @@ rb_mod_append_features(VALUE module, VALUE include)
     return module;
 }
 
+static VALUE refinement_import_methods(int argc, VALUE *argv, VALUE refinement);
+
 /*
  *  call-seq:
  *     include(module, ...)    -> self
@@ -1281,16 +1353,10 @@ rb_using_refinement(rb_cref_t *cref, VALUE klass, VALUE module)
     }
     superclass = refinement_superclass(superclass);
     c = iclass = rb_include_class_new(module, superclass);
-    RB_OBJ_WRITE(c, &RCLASS_REFINED_CLASS(c), klass);
+    RCLASS_SET_REFINED_CLASS(c, klass);
 
-    RCLASS_M_TBL(c) = RCLASS_M_TBL(module);
+    RCLASS_WRITE_M_TBL(c, RCLASS_M_TBL(module));
 
-    module = RCLASS_SUPER(module);
-    while (module && module != klass) {
-        c = RCLASS_SET_SUPER(c, rb_include_class_new(module, RCLASS_SUPER(c)));
-        RB_OBJ_WRITE(c, &RCLASS_REFINED_CLASS(c), klass);
-        module = RCLASS_SUPER(module);
-    }
     rb_hash_aset(CREF_REFINEMENTS(cref), klass, iclass);
 }
 
@@ -1344,11 +1410,24 @@ rb_using_module(const rb_cref_t *cref, VALUE module)
     rb_clear_all_refinement_method_cache();
 }
 
+void
+rb_vm_using_module(VALUE module)
+{
+    rb_using_module(rb_vm_cref_replace_with_duplicated_cref(), module);
+}
+
 /*
  *  call-seq:
- *     target    -> class
+ *     target    -> class_or_module
  *
  *  Return the class or module refined by the receiver.
+ *
+ *     module M
+ *       refine String do
+ *       end
+ *     end
+ *
+ *     M.refinements[0].target # => String
  */
 VALUE
 rb_refinement_module_get_refined_class(VALUE module)
@@ -1359,19 +1438,6 @@ rb_refinement_module_get_refined_class(VALUE module)
     return rb_attr_get(module, id_refined_class);
 }
 
-/*
- *  call-seq:
- *     refined_class    -> class
- *
- *  Return the class refined by the receiver.
- */
-static VALUE
-rb_refinement_refined_class(VALUE module)
-{
-    rb_warn_deprecated_to_remove("3.4", "Refinement#refined_class", "Refinement#target");
-    return rb_refinement_module_get_refined_class(module);
-}
-
 static void
 add_activated_refinement(VALUE activated_refinements,
                          VALUE klass, VALUE refinement)
@@ -1390,43 +1456,24 @@ add_activated_refinement(VALUE activated_refinements,
     }
     superclass = refinement_superclass(superclass);
     c = iclass = rb_include_class_new(refinement, superclass);
-    RB_OBJ_WRITE(c, &RCLASS_REFINED_CLASS(c), klass);
+    RCLASS_SET_REFINED_CLASS(c, klass);
     refinement = RCLASS_SUPER(refinement);
     while (refinement && refinement != klass) {
-        c = RCLASS_SET_SUPER(c, rb_include_class_new(refinement, RCLASS_SUPER(c)));
-        RB_OBJ_WRITE(c, &RCLASS_REFINED_CLASS(c), klass);
+        c = rb_class_set_super(c, rb_include_class_new(refinement, RCLASS_SUPER(c)));
+        RCLASS_SET_REFINED_CLASS(c, klass);
         refinement = RCLASS_SUPER(refinement);
     }
     rb_hash_aset(activated_refinements, klass, iclass);
 }
 
-/*
- *  call-seq:
- *     refine(mod) { block }   -> module
- *
- *  Refine <i>mod</i> in the receiver.
- *
- *  Returns a module, where refined methods are defined.
- */
-
-static VALUE
-rb_mod_refine(VALUE module, VALUE klass)
+void
+rb_refinement_setup(struct rb_refinements_data *data, VALUE module, VALUE klass)
 {
     VALUE refinement;
     ID id_refinements, id_activated_refinements,
        id_refined_class, id_defined_at;
     VALUE refinements, activated_refinements;
-    rb_thread_t *th = GET_THREAD();
-    VALUE block_handler = rb_vm_frame_block_handler(th->ec->cfp);
 
-    if (block_handler == VM_BLOCK_HANDLER_NONE) {
-        rb_raise(rb_eArgError, "no block given");
-    }
-    if (vm_block_handler_type(block_handler) != block_handler_type_iseq) {
-        rb_raise(rb_eArgError, "can't pass a Proc as a block to Module#refine");
-    }
-
-    ensure_class_or_module(klass);
     CONST_ID(id_refinements, "__refinements__");
     refinements = rb_attr_get(module, id_refinements);
     if (NIL_P(refinements)) {
@@ -1444,7 +1491,7 @@ rb_mod_refine(VALUE module, VALUE klass)
     if (NIL_P(refinement)) {
         VALUE superclass = refinement_superclass(klass);
         refinement = rb_refinement_new();
-        RCLASS_SET_SUPER(refinement, superclass);
+        rb_class_set_super(refinement, superclass);
         RUBY_ASSERT(BUILTIN_TYPE(refinement) == T_MODULE);
         FL_SET(refinement, RMODULE_IS_REFINEMENT);
         CONST_ID(id_refined_class, "__refined_class__");
@@ -1454,8 +1501,41 @@ rb_mod_refine(VALUE module, VALUE klass)
         rb_hash_aset(refinements, klass, refinement);
         add_activated_refinement(activated_refinements, klass, refinement);
     }
-    rb_yield_refine_block(refinement, activated_refinements);
-    return refinement;
+
+    data->refinement = refinement;
+    data->refinements = activated_refinements;
+}
+
+/*
+ *  call-seq:
+ *     refine(mod) { block }   -> module
+ *
+ *  Refine <i>mod</i> in the receiver.
+ *
+ *  Returns a module, where refined methods are defined.
+ */
+
+static VALUE
+rb_mod_refine(VALUE module, VALUE klass)
+{
+    /* module is the receiver of #refine, klass is a module to be refined (`mod` in the doc) */
+    rb_thread_t *th = GET_THREAD();
+    VALUE block_handler = rb_vm_frame_block_handler(th->ec->cfp);
+    struct rb_refinements_data data;
+
+    if (block_handler == VM_BLOCK_HANDLER_NONE) {
+        rb_raise(rb_eArgError, "no block given");
+    }
+    if (vm_block_handler_type(block_handler) != block_handler_type_iseq) {
+        rb_raise(rb_eArgError, "can't pass a Proc as a block to Module#refine");
+    }
+
+    ensure_class_or_module(klass);
+
+    rb_refinement_setup(&data, module, klass);
+
+    rb_yield_refine_block(data.refinement, data.refinements);
+    return data.refinement;
 }
 
 static void
@@ -1501,7 +1581,7 @@ mod_using(VALUE self, VALUE module)
  *  call-seq:
  *     refinements -> array
  *
- *  Returns an array of modules defined within the receiver.
+ *  Returns an array of +Refinement+ defined within the receiver.
  *
  *     module A
  *       refine Integer do
@@ -1788,6 +1868,16 @@ rb_obj_extend(int argc, VALUE *argv, VALUE obj)
     return obj;
 }
 
+VALUE
+rb_top_main_class(const char *method)
+{
+    VALUE klass = GET_THREAD()->top_wrapper;
+
+    if (!klass) return rb_cObject;
+    rb_warning("main.%s in the wrapped load is effective only in wrapper module", method);
+    return klass;
+}
+
 /*
  *  call-seq:
  *     include(module, ...)   -> self
@@ -1800,13 +1890,7 @@ rb_obj_extend(int argc, VALUE *argv, VALUE obj)
 static VALUE
 top_include(int argc, VALUE *argv, VALUE self)
 {
-    rb_thread_t *th = GET_THREAD();
-
-    if (th->top_wrapper) {
-        rb_warning("main.include in the wrapped load is effective only in wrapper module");
-        return rb_mod_include(argc, argv, th->top_wrapper);
-    }
-    return rb_mod_include(argc, argv, rb_cObject);
+    return rb_mod_include(argc, argv, rb_top_main_class("include"));
 }
 
 /*
@@ -1820,7 +1904,7 @@ top_include(int argc, VALUE *argv, VALUE self)
 static VALUE
 top_using(VALUE self, VALUE module)
 {
-    const rb_cref_t *cref = CREF_NEXT(rb_vm_cref());;
+    const rb_cref_t *cref = CREF_NEXT(rb_vm_cref());
     rb_control_frame_t *prev_cfp = previous_frame(GET_EC());
     rb_thread_t *th = GET_THREAD();
 
@@ -2013,7 +2097,7 @@ f_global_variables(VALUE _)
  *  +Proc+ object) or block is executed whenever the variable
  *  is assigned. The block or +Proc+ object receives the
  *  variable's new value as a parameter. Also see
- *  Kernel::untrace_var.
+ *  #untrace_var.
  *
  *     trace_var :$_, proc {|v| puts "$_ is now '#{v}'" }
  *     $_ = "hello"
@@ -2081,7 +2165,6 @@ Init_eval(void)
     rb_undef_method(rb_cClass, "refine");
     rb_define_private_method(rb_cRefinement, "import_methods", refinement_import_methods, -1);
     rb_define_method(rb_cRefinement, "target", rb_refinement_module_get_refined_class, 0);
-    rb_define_method(rb_cRefinement, "refined_class", rb_refinement_refined_class, 0);
     rb_undef_method(rb_cRefinement, "append_features");
     rb_undef_method(rb_cRefinement, "prepend_features");
     rb_undef_method(rb_cRefinement, "extend_object");
@@ -2110,3 +2193,21 @@ Init_eval(void)
     id_signo = rb_intern_const("signo");
     id_status = rb_intern_const("status");
 }
+
+int
+rb_errno(void)
+{
+    return *rb_orig_errno_ptr();
+}
+
+void
+rb_errno_set(int e)
+{
+    *rb_orig_errno_ptr() = e;
+}
+
+int *
+rb_errno_ptr(void)
+{
+    return rb_orig_errno_ptr();
+}
diff --git a/eval_error.c b/eval_error.c
index bdce295f6ec5b3..f3d05a1043fea7 100644
--- a/eval_error.c
+++ b/eval_error.c
@@ -47,7 +47,7 @@ error_pos_str(void)
             return rb_sprintf("%"PRIsVALUE": ", sourcefile);
         }
         else if ((caller_name = rb_frame_callee()) != 0) {
-            return rb_sprintf("%"PRIsVALUE":%d:in `%"PRIsVALUE"': ",
+            return rb_sprintf("%"PRIsVALUE":%d:in '%"PRIsVALUE"': ",
                               sourcefile, sourceline,
                               rb_id2str(caller_name));
         }
@@ -125,7 +125,7 @@ print_errinfo(const VALUE eclass, const VALUE errat, const VALUE emesg, const VA
 }
 
 VALUE
-rb_decorate_message(const VALUE eclass, const VALUE emesg, int highlight)
+rb_decorate_message(const VALUE eclass, VALUE emesg, int highlight)
 {
     const char *einfo = "";
     long elen = 0;
@@ -210,6 +210,8 @@ rb_decorate_message(const VALUE eclass, const VALUE emesg, int highlight)
         }
     }
 
+    RB_GC_GUARD(emesg);
+
     return str;
 }
 
@@ -390,7 +392,7 @@ rb_ec_error_print(rb_execution_context_t *volatile ec, volatile VALUE errinfo)
     rb_ec_error_print_detailed(ec, errinfo, Qnil, Qundef);
 }
 
-#define undef_mesg_for(v, k) rb_fstring_lit("undefined"v" method `%1$s' for "k" `%2$s'")
+#define undef_mesg_for(v, k) rb_fstring_lit("undefined"v" method '%1$s' for "k" '%2$s'")
 #define undef_mesg(v) ( \
         is_mod ? \
         undef_mesg_for(v, "module") : \
@@ -418,7 +420,7 @@ rb_print_undef_str(VALUE klass, VALUE name)
     rb_name_err_raise_str(undef_mesg(""), klass, name);
 }
 
-#define inaccessible_mesg_for(v, k) rb_fstring_lit("method `%1$s' for "k" `%2$s' is "v)
+#define inaccessible_mesg_for(v, k) rb_fstring_lit("method '%1$s' for "k" '%2$s' is "v)
 #define inaccessible_mesg(v) ( \
         is_mod ? \
         inaccessible_mesg_for(v, "module") : \
diff --git a/eval_intern.h b/eval_intern.h
index 778b63e0ea61bd..2c244aa5e09b40 100644
--- a/eval_intern.h
+++ b/eval_intern.h
@@ -95,14 +95,6 @@ extern int select_large_fdset(int, fd_set *, fd_set *, fd_set *, struct timeval
 
 #include <sys/stat.h>
 
-
-#define SAVE_ROOT_JMPBUF(th, stmt) do \
-  if (true) { \
-      stmt; \
-  } \
-  else if (th) { /* suppress unused-variable warning */ \
-  } while (0)
-
 #define EC_PUSH_TAG(ec) do { \
   rb_execution_context_t * const _ec = (ec); \
   struct rb_vm_tag _tag; \
@@ -110,9 +102,11 @@ extern int select_large_fdset(int, fd_set *, fd_set *, fd_set *, struct timeval
   _tag.tag = Qundef; \
   _tag.prev = _ec->tag; \
   _tag.lock_rec = rb_ec_vm_lock_rec(_ec); \
+  rb_vm_tag_jmpbuf_init(&_tag.buf); \
 
 #define EC_POP_TAG() \
   _ec->tag = _tag.prev; \
+  rb_vm_tag_jmpbuf_deinit(&_tag.buf); \
 } while (0)
 
 #define EC_TMPPOP_TAG() \
@@ -151,7 +145,8 @@ rb_ec_tag_state(const rb_execution_context_t *ec)
     enum ruby_tag_type state = tag->state;
     tag->state = TAG_NONE;
     rb_ec_vm_lock_rec_check(ec, tag->lock_rec);
-    RBIMPL_ASSUME(state != TAG_NONE);
+    RBIMPL_ASSUME(state > TAG_NONE);
+    RBIMPL_ASSUME(state <= TAG_FATAL);
     return state;
 }
 
@@ -159,9 +154,9 @@ NORETURN(static inline void rb_ec_tag_jump(const rb_execution_context_t *ec, enu
 static inline void
 rb_ec_tag_jump(const rb_execution_context_t *ec, enum ruby_tag_type st)
 {
-    RUBY_ASSERT(st != TAG_NONE);
+    RUBY_ASSERT(st > TAG_NONE && st <= TAG_FATAL, ": Invalid tag jump: %d", (int)st);
     ec->tag->state = st;
-    ruby_longjmp(ec->tag->buf, 1);
+    ruby_longjmp(RB_VM_TAG_JMPBUF_GET(ec->tag->buf), 1);
 }
 
 /*
@@ -169,7 +164,7 @@ rb_ec_tag_jump(const rb_execution_context_t *ec, enum ruby_tag_type st)
   [ISO/IEC 9899:1999] 7.13.1.1
 */
 #define EC_EXEC_TAG() \
-    (UNLIKELY(ruby_setjmp(_tag.buf)) ? rb_ec_tag_state(VAR_FROM_MEMORY(_ec)) : (EC_REPUSH_TAG(), 0))
+    (UNLIKELY(ruby_setjmp(RB_VM_TAG_JMPBUF_GET(_tag.buf))) ? rb_ec_tag_state(VAR_FROM_MEMORY(_ec)) : (EC_REPUSH_TAG(), 0))
 
 #define EC_JUMP_TAG(ec, st) rb_ec_tag_jump(ec, st)
 
@@ -295,16 +290,19 @@ NORETURN(void rb_print_undef(VALUE, ID, rb_method_visibility_t));
 NORETURN(void rb_print_undef_str(VALUE, VALUE));
 NORETURN(void rb_print_inaccessible(VALUE, ID, rb_method_visibility_t));
 NORETURN(void rb_vm_localjump_error(const char *,VALUE, int));
-NORETURN(void rb_vm_jump_tag_but_local_jump(int));
+NORETURN(void rb_vm_jump_tag_but_local_jump(enum ruby_tag_type));
 
-VALUE rb_vm_make_jump_tag_but_local_jump(int state, VALUE val);
+VALUE rb_vm_make_jump_tag_but_local_jump(enum ruby_tag_type state, VALUE val);
 rb_cref_t *rb_vm_cref(void);
 rb_cref_t *rb_vm_cref_replace_with_duplicated_cref(void);
 VALUE rb_vm_call_cfunc(VALUE recv, VALUE (*func)(VALUE), VALUE arg, VALUE block_handler, VALUE filename);
+VALUE rb_vm_call_cfunc2(VALUE recv, VALUE (*func)(VALUE, VALUE), VALUE arg1, VALUE arg2, VALUE block_handler, VALUE filename);
 void rb_vm_set_progname(VALUE filename);
 VALUE rb_vm_cbase(void);
 
 /* vm_backtrace.c */
+#define RUBY_BACKTRACE_START 0
+#define RUBY_ALL_BACKTRACE_LINES -1
 VALUE rb_ec_backtrace_object(const rb_execution_context_t *ec);
 VALUE rb_ec_backtrace_str_ary(const rb_execution_context_t *ec, long lev, long n);
 VALUE rb_ec_backtrace_location_ary(const rb_execution_context_t *ec, long lev, long n, bool skip_internal);
@@ -326,16 +324,4 @@ rb_char_next(const char *p)
 # endif
 #endif
 
-#if defined DOSISH || defined __CYGWIN__
-static inline void
-translit_char(char *p, int from, int to)
-{
-    while (*p) {
-        if ((unsigned char)*p == from)
-            *p = to;
-        p = CharNext(p);
-    }
-}
-#endif
-
 #endif /* RUBY_EVAL_INTERN_H */
diff --git a/eval_jump.c b/eval_jump.c
index e8e74f4e70050a..7593a35e360152 100644
--- a/eval_jump.c
+++ b/eval_jump.c
@@ -112,21 +112,21 @@ rb_ec_exec_end_proc(rb_execution_context_t * ec)
 {
     enum ruby_tag_type state;
     volatile VALUE errinfo = ec->errinfo;
-
-    EC_PUSH_TAG(ec);
-    if ((state = EC_EXEC_TAG()) == TAG_NONE) {
-      again:
-        exec_end_procs_chain(&ephemeral_end_procs, &ec->errinfo);
-        exec_end_procs_chain(&end_procs, &ec->errinfo);
-    }
-    else {
-        EC_TMPPOP_TAG();
-        error_handle(ec, ec->errinfo, state);
-        if (!NIL_P(ec->errinfo)) errinfo = ec->errinfo;
-        EC_REPUSH_TAG();
-        goto again;
+    volatile bool finished = false;
+
+    while (!finished) {
+        EC_PUSH_TAG(ec);
+        if ((state = EC_EXEC_TAG()) == TAG_NONE) {
+            exec_end_procs_chain(&ephemeral_end_procs, &ec->errinfo);
+            exec_end_procs_chain(&end_procs, &ec->errinfo);
+            finished = true;
+        }
+        EC_POP_TAG();
+        if (state != TAG_NONE) {
+            error_handle(ec, ec->errinfo, state);
+            if (!NIL_P(ec->errinfo)) errinfo = ec->errinfo;
+        }
     }
-    EC_POP_TAG();
 
     ec->errinfo = errinfo;
 }
diff --git a/ext/-test-/RUBY_ALIGNOF/depend b/ext/-test-/RUBY_ALIGNOF/depend
index 3011b637e5366e..103d20b33c8de5 100644
--- a/ext/-test-/RUBY_ALIGNOF/depend
+++ b/ext/-test-/RUBY_ALIGNOF/depend
@@ -128,6 +128,7 @@ c.o: $(hdrdir)/ruby/internal/intern/re.h
 c.o: $(hdrdir)/ruby/internal/intern/ruby.h
 c.o: $(hdrdir)/ruby/internal/intern/select.h
 c.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+c.o: $(hdrdir)/ruby/internal/intern/set.h
 c.o: $(hdrdir)/ruby/internal/intern/signal.h
 c.o: $(hdrdir)/ruby/internal/intern/sprintf.h
 c.o: $(hdrdir)/ruby/internal/intern/string.h
@@ -147,6 +148,7 @@ c.o: $(hdrdir)/ruby/internal/special_consts.h
 c.o: $(hdrdir)/ruby/internal/static_assert.h
 c.o: $(hdrdir)/ruby/internal/stdalign.h
 c.o: $(hdrdir)/ruby/internal/stdbool.h
+c.o: $(hdrdir)/ruby/internal/stdckdint.h
 c.o: $(hdrdir)/ruby/internal/symbol.h
 c.o: $(hdrdir)/ruby/internal/value.h
 c.o: $(hdrdir)/ruby/internal/value_type.h
diff --git a/ext/-test-/abi/depend b/ext/-test-/abi/depend
new file mode 100644
index 00000000000000..716a7b13568470
--- /dev/null
+++ b/ext/-test-/abi/depend
@@ -0,0 +1,3 @@
+# AUTOGENERATED DEPENDENCIES START
+abi.o: abi.c
+# AUTOGENERATED DEPENDENCIES END
diff --git a/ext/-test-/arith_seq/beg_len_step/depend b/ext/-test-/arith_seq/beg_len_step/depend
index dc807eaa992ae4..098c8ff1f0f0fb 100644
--- a/ext/-test-/arith_seq/beg_len_step/depend
+++ b/ext/-test-/arith_seq/beg_len_step/depend
@@ -127,6 +127,7 @@ beg_len_step.o: $(hdrdir)/ruby/internal/intern/re.h
 beg_len_step.o: $(hdrdir)/ruby/internal/intern/ruby.h
 beg_len_step.o: $(hdrdir)/ruby/internal/intern/select.h
 beg_len_step.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+beg_len_step.o: $(hdrdir)/ruby/internal/intern/set.h
 beg_len_step.o: $(hdrdir)/ruby/internal/intern/signal.h
 beg_len_step.o: $(hdrdir)/ruby/internal/intern/sprintf.h
 beg_len_step.o: $(hdrdir)/ruby/internal/intern/string.h
@@ -146,6 +147,7 @@ beg_len_step.o: $(hdrdir)/ruby/internal/special_consts.h
 beg_len_step.o: $(hdrdir)/ruby/internal/static_assert.h
 beg_len_step.o: $(hdrdir)/ruby/internal/stdalign.h
 beg_len_step.o: $(hdrdir)/ruby/internal/stdbool.h
+beg_len_step.o: $(hdrdir)/ruby/internal/stdckdint.h
 beg_len_step.o: $(hdrdir)/ruby/internal/symbol.h
 beg_len_step.o: $(hdrdir)/ruby/internal/value.h
 beg_len_step.o: $(hdrdir)/ruby/internal/value_type.h
diff --git a/ext/-test-/arith_seq/extract/depend b/ext/-test-/arith_seq/extract/depend
index 231736b277ddf6..5c07cea4b4b1dd 100644
--- a/ext/-test-/arith_seq/extract/depend
+++ b/ext/-test-/arith_seq/extract/depend
@@ -127,6 +127,7 @@ extract.o: $(hdrdir)/ruby/internal/intern/re.h
 extract.o: $(hdrdir)/ruby/internal/intern/ruby.h
 extract.o: $(hdrdir)/ruby/internal/intern/select.h
 extract.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+extract.o: $(hdrdir)/ruby/internal/intern/set.h
 extract.o: $(hdrdir)/ruby/internal/intern/signal.h
 extract.o: $(hdrdir)/ruby/internal/intern/sprintf.h
 extract.o: $(hdrdir)/ruby/internal/intern/string.h
@@ -146,6 +147,7 @@ extract.o: $(hdrdir)/ruby/internal/special_consts.h
 extract.o: $(hdrdir)/ruby/internal/static_assert.h
 extract.o: $(hdrdir)/ruby/internal/stdalign.h
 extract.o: $(hdrdir)/ruby/internal/stdbool.h
+extract.o: $(hdrdir)/ruby/internal/stdckdint.h
 extract.o: $(hdrdir)/ruby/internal/symbol.h
 extract.o: $(hdrdir)/ruby/internal/value.h
 extract.o: $(hdrdir)/ruby/internal/value_type.h
diff --git a/ext/-test-/array/concat/depend b/ext/-test-/array/concat/depend
index d66e7a540f311e..8edf45465f707d 100644
--- a/ext/-test-/array/concat/depend
+++ b/ext/-test-/array/concat/depend
@@ -128,6 +128,7 @@ to_ary_concat.o: $(hdrdir)/ruby/internal/intern/re.h
 to_ary_concat.o: $(hdrdir)/ruby/internal/intern/ruby.h
 to_ary_concat.o: $(hdrdir)/ruby/internal/intern/select.h
 to_ary_concat.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+to_ary_concat.o: $(hdrdir)/ruby/internal/intern/set.h
 to_ary_concat.o: $(hdrdir)/ruby/internal/intern/signal.h
 to_ary_concat.o: $(hdrdir)/ruby/internal/intern/sprintf.h
 to_ary_concat.o: $(hdrdir)/ruby/internal/intern/string.h
@@ -147,6 +148,7 @@ to_ary_concat.o: $(hdrdir)/ruby/internal/special_consts.h
 to_ary_concat.o: $(hdrdir)/ruby/internal/static_assert.h
 to_ary_concat.o: $(hdrdir)/ruby/internal/stdalign.h
 to_ary_concat.o: $(hdrdir)/ruby/internal/stdbool.h
+to_ary_concat.o: $(hdrdir)/ruby/internal/stdckdint.h
 to_ary_concat.o: $(hdrdir)/ruby/internal/symbol.h
 to_ary_concat.o: $(hdrdir)/ruby/internal/value.h
 to_ary_concat.o: $(hdrdir)/ruby/internal/value_type.h
diff --git a/ext/-test-/array/resize/depend b/ext/-test-/array/resize/depend
index a9c02b3db2cddd..e6a228b43d779c 100644
--- a/ext/-test-/array/resize/depend
+++ b/ext/-test-/array/resize/depend
@@ -127,6 +127,7 @@ resize.o: $(hdrdir)/ruby/internal/intern/re.h
 resize.o: $(hdrdir)/ruby/internal/intern/ruby.h
 resize.o: $(hdrdir)/ruby/internal/intern/select.h
 resize.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+resize.o: $(hdrdir)/ruby/internal/intern/set.h
 resize.o: $(hdrdir)/ruby/internal/intern/signal.h
 resize.o: $(hdrdir)/ruby/internal/intern/sprintf.h
 resize.o: $(hdrdir)/ruby/internal/intern/string.h
@@ -146,6 +147,7 @@ resize.o: $(hdrdir)/ruby/internal/special_consts.h
 resize.o: $(hdrdir)/ruby/internal/static_assert.h
 resize.o: $(hdrdir)/ruby/internal/stdalign.h
 resize.o: $(hdrdir)/ruby/internal/stdbool.h
+resize.o: $(hdrdir)/ruby/internal/stdckdint.h
 resize.o: $(hdrdir)/ruby/internal/symbol.h
 resize.o: $(hdrdir)/ruby/internal/value.h
 resize.o: $(hdrdir)/ruby/internal/value_type.h
diff --git a/ext/-test-/asan/asan.c b/ext/-test-/asan/asan.c
new file mode 100644
index 00000000000000..45b6253fdac8c8
--- /dev/null
+++ b/ext/-test-/asan/asan.c
@@ -0,0 +1,24 @@
+#include "ruby/ruby.h"
+
+static VALUE
+asan_enabled_p(VALUE self)
+{
+#if defined(__has_feature)
+    /* clang uses __has_feature for determining asan */
+    return __has_feature(address_sanitizer) ? Qtrue : Qfalse;
+#elif defined(__SANITIZE_ADDRESS__)
+    /* GCC sets __SANITIZE_ADDRESS__ for determining asan */
+    return Qtrue;
+#else
+    return Qfalse;
+#endif
+}
+
+void
+Init_asan(void)
+{
+    VALUE m = rb_define_module("Test");
+    VALUE c = rb_define_class_under(m, "ASAN", rb_cObject);
+    rb_define_singleton_method(c, "enabled?", asan_enabled_p, 0);
+}
+
diff --git a/ext/-test-/asan/depend b/ext/-test-/asan/depend
new file mode 100644
index 00000000000000..93cdc739ec63b7
--- /dev/null
+++ b/ext/-test-/asan/depend
@@ -0,0 +1,162 @@
+# AUTOGENERATED DEPENDENCIES START
+asan.o: $(RUBY_EXTCONF_H)
+asan.o: $(arch_hdrdir)/ruby/config.h
+asan.o: $(hdrdir)/ruby/assert.h
+asan.o: $(hdrdir)/ruby/backward.h
+asan.o: $(hdrdir)/ruby/backward/2/assume.h
+asan.o: $(hdrdir)/ruby/backward/2/attributes.h
+asan.o: $(hdrdir)/ruby/backward/2/bool.h
+asan.o: $(hdrdir)/ruby/backward/2/inttypes.h
+asan.o: $(hdrdir)/ruby/backward/2/limits.h
+asan.o: $(hdrdir)/ruby/backward/2/long_long.h
+asan.o: $(hdrdir)/ruby/backward/2/stdalign.h
+asan.o: $(hdrdir)/ruby/backward/2/stdarg.h
+asan.o: $(hdrdir)/ruby/defines.h
+asan.o: $(hdrdir)/ruby/intern.h
+asan.o: $(hdrdir)/ruby/internal/abi.h
+asan.o: $(hdrdir)/ruby/internal/anyargs.h
+asan.o: $(hdrdir)/ruby/internal/arithmetic.h
+asan.o: $(hdrdir)/ruby/internal/arithmetic/char.h
+asan.o: $(hdrdir)/ruby/internal/arithmetic/double.h
+asan.o: $(hdrdir)/ruby/internal/arithmetic/fixnum.h
+asan.o: $(hdrdir)/ruby/internal/arithmetic/gid_t.h
+asan.o: $(hdrdir)/ruby/internal/arithmetic/int.h
+asan.o: $(hdrdir)/ruby/internal/arithmetic/intptr_t.h
+asan.o: $(hdrdir)/ruby/internal/arithmetic/long.h
+asan.o: $(hdrdir)/ruby/internal/arithmetic/long_long.h
+asan.o: $(hdrdir)/ruby/internal/arithmetic/mode_t.h
+asan.o: $(hdrdir)/ruby/internal/arithmetic/off_t.h
+asan.o: $(hdrdir)/ruby/internal/arithmetic/pid_t.h
+asan.o: $(hdrdir)/ruby/internal/arithmetic/short.h
+asan.o: $(hdrdir)/ruby/internal/arithmetic/size_t.h
+asan.o: $(hdrdir)/ruby/internal/arithmetic/st_data_t.h
+asan.o: $(hdrdir)/ruby/internal/arithmetic/uid_t.h
+asan.o: $(hdrdir)/ruby/internal/assume.h
+asan.o: $(hdrdir)/ruby/internal/attr/alloc_size.h
+asan.o: $(hdrdir)/ruby/internal/attr/artificial.h
+asan.o: $(hdrdir)/ruby/internal/attr/cold.h
+asan.o: $(hdrdir)/ruby/internal/attr/const.h
+asan.o: $(hdrdir)/ruby/internal/attr/constexpr.h
+asan.o: $(hdrdir)/ruby/internal/attr/deprecated.h
+asan.o: $(hdrdir)/ruby/internal/attr/diagnose_if.h
+asan.o: $(hdrdir)/ruby/internal/attr/enum_extensibility.h
+asan.o: $(hdrdir)/ruby/internal/attr/error.h
+asan.o: $(hdrdir)/ruby/internal/attr/flag_enum.h
+asan.o: $(hdrdir)/ruby/internal/attr/forceinline.h
+asan.o: $(hdrdir)/ruby/internal/attr/format.h
+asan.o: $(hdrdir)/ruby/internal/attr/maybe_unused.h
+asan.o: $(hdrdir)/ruby/internal/attr/noalias.h
+asan.o: $(hdrdir)/ruby/internal/attr/nodiscard.h
+asan.o: $(hdrdir)/ruby/internal/attr/noexcept.h
+asan.o: $(hdrdir)/ruby/internal/attr/noinline.h
+asan.o: $(hdrdir)/ruby/internal/attr/nonnull.h
+asan.o: $(hdrdir)/ruby/internal/attr/noreturn.h
+asan.o: $(hdrdir)/ruby/internal/attr/packed_struct.h
+asan.o: $(hdrdir)/ruby/internal/attr/pure.h
+asan.o: $(hdrdir)/ruby/internal/attr/restrict.h
+asan.o: $(hdrdir)/ruby/internal/attr/returns_nonnull.h
+asan.o: $(hdrdir)/ruby/internal/attr/warning.h
+asan.o: $(hdrdir)/ruby/internal/attr/weakref.h
+asan.o: $(hdrdir)/ruby/internal/cast.h
+asan.o: $(hdrdir)/ruby/internal/compiler_is.h
+asan.o: $(hdrdir)/ruby/internal/compiler_is/apple.h
+asan.o: $(hdrdir)/ruby/internal/compiler_is/clang.h
+asan.o: $(hdrdir)/ruby/internal/compiler_is/gcc.h
+asan.o: $(hdrdir)/ruby/internal/compiler_is/intel.h
+asan.o: $(hdrdir)/ruby/internal/compiler_is/msvc.h
+asan.o: $(hdrdir)/ruby/internal/compiler_is/sunpro.h
+asan.o: $(hdrdir)/ruby/internal/compiler_since.h
+asan.o: $(hdrdir)/ruby/internal/config.h
+asan.o: $(hdrdir)/ruby/internal/constant_p.h
+asan.o: $(hdrdir)/ruby/internal/core.h
+asan.o: $(hdrdir)/ruby/internal/core/rarray.h
+asan.o: $(hdrdir)/ruby/internal/core/rbasic.h
+asan.o: $(hdrdir)/ruby/internal/core/rbignum.h
+asan.o: $(hdrdir)/ruby/internal/core/rclass.h
+asan.o: $(hdrdir)/ruby/internal/core/rdata.h
+asan.o: $(hdrdir)/ruby/internal/core/rfile.h
+asan.o: $(hdrdir)/ruby/internal/core/rhash.h
+asan.o: $(hdrdir)/ruby/internal/core/robject.h
+asan.o: $(hdrdir)/ruby/internal/core/rregexp.h
+asan.o: $(hdrdir)/ruby/internal/core/rstring.h
+asan.o: $(hdrdir)/ruby/internal/core/rstruct.h
+asan.o: $(hdrdir)/ruby/internal/core/rtypeddata.h
+asan.o: $(hdrdir)/ruby/internal/ctype.h
+asan.o: $(hdrdir)/ruby/internal/dllexport.h
+asan.o: $(hdrdir)/ruby/internal/dosish.h
+asan.o: $(hdrdir)/ruby/internal/error.h
+asan.o: $(hdrdir)/ruby/internal/eval.h
+asan.o: $(hdrdir)/ruby/internal/event.h
+asan.o: $(hdrdir)/ruby/internal/fl_type.h
+asan.o: $(hdrdir)/ruby/internal/gc.h
+asan.o: $(hdrdir)/ruby/internal/glob.h
+asan.o: $(hdrdir)/ruby/internal/globals.h
+asan.o: $(hdrdir)/ruby/internal/has/attribute.h
+asan.o: $(hdrdir)/ruby/internal/has/builtin.h
+asan.o: $(hdrdir)/ruby/internal/has/c_attribute.h
+asan.o: $(hdrdir)/ruby/internal/has/cpp_attribute.h
+asan.o: $(hdrdir)/ruby/internal/has/declspec_attribute.h
+asan.o: $(hdrdir)/ruby/internal/has/extension.h
+asan.o: $(hdrdir)/ruby/internal/has/feature.h
+asan.o: $(hdrdir)/ruby/internal/has/warning.h
+asan.o: $(hdrdir)/ruby/internal/intern/array.h
+asan.o: $(hdrdir)/ruby/internal/intern/bignum.h
+asan.o: $(hdrdir)/ruby/internal/intern/class.h
+asan.o: $(hdrdir)/ruby/internal/intern/compar.h
+asan.o: $(hdrdir)/ruby/internal/intern/complex.h
+asan.o: $(hdrdir)/ruby/internal/intern/cont.h
+asan.o: $(hdrdir)/ruby/internal/intern/dir.h
+asan.o: $(hdrdir)/ruby/internal/intern/enum.h
+asan.o: $(hdrdir)/ruby/internal/intern/enumerator.h
+asan.o: $(hdrdir)/ruby/internal/intern/error.h
+asan.o: $(hdrdir)/ruby/internal/intern/eval.h
+asan.o: $(hdrdir)/ruby/internal/intern/file.h
+asan.o: $(hdrdir)/ruby/internal/intern/hash.h
+asan.o: $(hdrdir)/ruby/internal/intern/io.h
+asan.o: $(hdrdir)/ruby/internal/intern/load.h
+asan.o: $(hdrdir)/ruby/internal/intern/marshal.h
+asan.o: $(hdrdir)/ruby/internal/intern/numeric.h
+asan.o: $(hdrdir)/ruby/internal/intern/object.h
+asan.o: $(hdrdir)/ruby/internal/intern/parse.h
+asan.o: $(hdrdir)/ruby/internal/intern/proc.h
+asan.o: $(hdrdir)/ruby/internal/intern/process.h
+asan.o: $(hdrdir)/ruby/internal/intern/random.h
+asan.o: $(hdrdir)/ruby/internal/intern/range.h
+asan.o: $(hdrdir)/ruby/internal/intern/rational.h
+asan.o: $(hdrdir)/ruby/internal/intern/re.h
+asan.o: $(hdrdir)/ruby/internal/intern/ruby.h
+asan.o: $(hdrdir)/ruby/internal/intern/select.h
+asan.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+asan.o: $(hdrdir)/ruby/internal/intern/set.h
+asan.o: $(hdrdir)/ruby/internal/intern/signal.h
+asan.o: $(hdrdir)/ruby/internal/intern/sprintf.h
+asan.o: $(hdrdir)/ruby/internal/intern/string.h
+asan.o: $(hdrdir)/ruby/internal/intern/struct.h
+asan.o: $(hdrdir)/ruby/internal/intern/thread.h
+asan.o: $(hdrdir)/ruby/internal/intern/time.h
+asan.o: $(hdrdir)/ruby/internal/intern/variable.h
+asan.o: $(hdrdir)/ruby/internal/intern/vm.h
+asan.o: $(hdrdir)/ruby/internal/interpreter.h
+asan.o: $(hdrdir)/ruby/internal/iterator.h
+asan.o: $(hdrdir)/ruby/internal/memory.h
+asan.o: $(hdrdir)/ruby/internal/method.h
+asan.o: $(hdrdir)/ruby/internal/module.h
+asan.o: $(hdrdir)/ruby/internal/newobj.h
+asan.o: $(hdrdir)/ruby/internal/scan_args.h
+asan.o: $(hdrdir)/ruby/internal/special_consts.h
+asan.o: $(hdrdir)/ruby/internal/static_assert.h
+asan.o: $(hdrdir)/ruby/internal/stdalign.h
+asan.o: $(hdrdir)/ruby/internal/stdbool.h
+asan.o: $(hdrdir)/ruby/internal/stdckdint.h
+asan.o: $(hdrdir)/ruby/internal/symbol.h
+asan.o: $(hdrdir)/ruby/internal/value.h
+asan.o: $(hdrdir)/ruby/internal/value_type.h
+asan.o: $(hdrdir)/ruby/internal/variable.h
+asan.o: $(hdrdir)/ruby/internal/warning_push.h
+asan.o: $(hdrdir)/ruby/internal/xmalloc.h
+asan.o: $(hdrdir)/ruby/missing.h
+asan.o: $(hdrdir)/ruby/ruby.h
+asan.o: $(hdrdir)/ruby/st.h
+asan.o: $(hdrdir)/ruby/subst.h
+asan.o: asan.c
+# AUTOGENERATED DEPENDENCIES END
diff --git a/ext/-test-/asan/extconf.rb b/ext/-test-/asan/extconf.rb
new file mode 100644
index 00000000000000..ec02742b8145e4
--- /dev/null
+++ b/ext/-test-/asan/extconf.rb
@@ -0,0 +1,2 @@
+require 'mkmf'
+create_makefile('-test-/asan')
diff --git a/ext/-test-/bignum/depend b/ext/-test-/bignum/depend
index d4392bb6a12996..049f0c7b520970 100644
--- a/ext/-test-/bignum/depend
+++ b/ext/-test-/bignum/depend
@@ -127,6 +127,7 @@ big2str.o: $(hdrdir)/ruby/internal/intern/re.h
 big2str.o: $(hdrdir)/ruby/internal/intern/ruby.h
 big2str.o: $(hdrdir)/ruby/internal/intern/select.h
 big2str.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+big2str.o: $(hdrdir)/ruby/internal/intern/set.h
 big2str.o: $(hdrdir)/ruby/internal/intern/signal.h
 big2str.o: $(hdrdir)/ruby/internal/intern/sprintf.h
 big2str.o: $(hdrdir)/ruby/internal/intern/string.h
@@ -146,6 +147,7 @@ big2str.o: $(hdrdir)/ruby/internal/special_consts.h
 big2str.o: $(hdrdir)/ruby/internal/static_assert.h
 big2str.o: $(hdrdir)/ruby/internal/stdalign.h
 big2str.o: $(hdrdir)/ruby/internal/stdbool.h
+big2str.o: $(hdrdir)/ruby/internal/stdckdint.h
 big2str.o: $(hdrdir)/ruby/internal/symbol.h
 big2str.o: $(hdrdir)/ruby/internal/value.h
 big2str.o: $(hdrdir)/ruby/internal/value_type.h
@@ -286,6 +288,7 @@ bigzero.o: $(hdrdir)/ruby/internal/intern/re.h
 bigzero.o: $(hdrdir)/ruby/internal/intern/ruby.h
 bigzero.o: $(hdrdir)/ruby/internal/intern/select.h
 bigzero.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+bigzero.o: $(hdrdir)/ruby/internal/intern/set.h
 bigzero.o: $(hdrdir)/ruby/internal/intern/signal.h
 bigzero.o: $(hdrdir)/ruby/internal/intern/sprintf.h
 bigzero.o: $(hdrdir)/ruby/internal/intern/string.h
@@ -305,6 +308,7 @@ bigzero.o: $(hdrdir)/ruby/internal/special_consts.h
 bigzero.o: $(hdrdir)/ruby/internal/static_assert.h
 bigzero.o: $(hdrdir)/ruby/internal/stdalign.h
 bigzero.o: $(hdrdir)/ruby/internal/stdbool.h
+bigzero.o: $(hdrdir)/ruby/internal/stdckdint.h
 bigzero.o: $(hdrdir)/ruby/internal/symbol.h
 bigzero.o: $(hdrdir)/ruby/internal/value.h
 bigzero.o: $(hdrdir)/ruby/internal/value_type.h
@@ -445,6 +449,7 @@ div.o: $(hdrdir)/ruby/internal/intern/re.h
 div.o: $(hdrdir)/ruby/internal/intern/ruby.h
 div.o: $(hdrdir)/ruby/internal/intern/select.h
 div.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+div.o: $(hdrdir)/ruby/internal/intern/set.h
 div.o: $(hdrdir)/ruby/internal/intern/signal.h
 div.o: $(hdrdir)/ruby/internal/intern/sprintf.h
 div.o: $(hdrdir)/ruby/internal/intern/string.h
@@ -464,6 +469,7 @@ div.o: $(hdrdir)/ruby/internal/special_consts.h
 div.o: $(hdrdir)/ruby/internal/static_assert.h
 div.o: $(hdrdir)/ruby/internal/stdalign.h
 div.o: $(hdrdir)/ruby/internal/stdbool.h
+div.o: $(hdrdir)/ruby/internal/stdckdint.h
 div.o: $(hdrdir)/ruby/internal/symbol.h
 div.o: $(hdrdir)/ruby/internal/value.h
 div.o: $(hdrdir)/ruby/internal/value_type.h
@@ -605,6 +611,7 @@ init.o: $(hdrdir)/ruby/internal/intern/re.h
 init.o: $(hdrdir)/ruby/internal/intern/ruby.h
 init.o: $(hdrdir)/ruby/internal/intern/select.h
 init.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+init.o: $(hdrdir)/ruby/internal/intern/set.h
 init.o: $(hdrdir)/ruby/internal/intern/signal.h
 init.o: $(hdrdir)/ruby/internal/intern/sprintf.h
 init.o: $(hdrdir)/ruby/internal/intern/string.h
@@ -624,6 +631,7 @@ init.o: $(hdrdir)/ruby/internal/special_consts.h
 init.o: $(hdrdir)/ruby/internal/static_assert.h
 init.o: $(hdrdir)/ruby/internal/stdalign.h
 init.o: $(hdrdir)/ruby/internal/stdbool.h
+init.o: $(hdrdir)/ruby/internal/stdckdint.h
 init.o: $(hdrdir)/ruby/internal/symbol.h
 init.o: $(hdrdir)/ruby/internal/value.h
 init.o: $(hdrdir)/ruby/internal/value_type.h
@@ -763,6 +771,7 @@ intpack.o: $(hdrdir)/ruby/internal/intern/re.h
 intpack.o: $(hdrdir)/ruby/internal/intern/ruby.h
 intpack.o: $(hdrdir)/ruby/internal/intern/select.h
 intpack.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+intpack.o: $(hdrdir)/ruby/internal/intern/set.h
 intpack.o: $(hdrdir)/ruby/internal/intern/signal.h
 intpack.o: $(hdrdir)/ruby/internal/intern/sprintf.h
 intpack.o: $(hdrdir)/ruby/internal/intern/string.h
@@ -782,6 +791,7 @@ intpack.o: $(hdrdir)/ruby/internal/special_consts.h
 intpack.o: $(hdrdir)/ruby/internal/static_assert.h
 intpack.o: $(hdrdir)/ruby/internal/stdalign.h
 intpack.o: $(hdrdir)/ruby/internal/stdbool.h
+intpack.o: $(hdrdir)/ruby/internal/stdckdint.h
 intpack.o: $(hdrdir)/ruby/internal/symbol.h
 intpack.o: $(hdrdir)/ruby/internal/value.h
 intpack.o: $(hdrdir)/ruby/internal/value_type.h
@@ -922,6 +932,7 @@ mul.o: $(hdrdir)/ruby/internal/intern/re.h
 mul.o: $(hdrdir)/ruby/internal/intern/ruby.h
 mul.o: $(hdrdir)/ruby/internal/intern/select.h
 mul.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+mul.o: $(hdrdir)/ruby/internal/intern/set.h
 mul.o: $(hdrdir)/ruby/internal/intern/signal.h
 mul.o: $(hdrdir)/ruby/internal/intern/sprintf.h
 mul.o: $(hdrdir)/ruby/internal/intern/string.h
@@ -941,6 +952,7 @@ mul.o: $(hdrdir)/ruby/internal/special_consts.h
 mul.o: $(hdrdir)/ruby/internal/static_assert.h
 mul.o: $(hdrdir)/ruby/internal/stdalign.h
 mul.o: $(hdrdir)/ruby/internal/stdbool.h
+mul.o: $(hdrdir)/ruby/internal/stdckdint.h
 mul.o: $(hdrdir)/ruby/internal/symbol.h
 mul.o: $(hdrdir)/ruby/internal/value.h
 mul.o: $(hdrdir)/ruby/internal/value_type.h
@@ -1081,6 +1093,7 @@ str2big.o: $(hdrdir)/ruby/internal/intern/re.h
 str2big.o: $(hdrdir)/ruby/internal/intern/ruby.h
 str2big.o: $(hdrdir)/ruby/internal/intern/select.h
 str2big.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+str2big.o: $(hdrdir)/ruby/internal/intern/set.h
 str2big.o: $(hdrdir)/ruby/internal/intern/signal.h
 str2big.o: $(hdrdir)/ruby/internal/intern/sprintf.h
 str2big.o: $(hdrdir)/ruby/internal/intern/string.h
@@ -1100,6 +1113,7 @@ str2big.o: $(hdrdir)/ruby/internal/special_consts.h
 str2big.o: $(hdrdir)/ruby/internal/static_assert.h
 str2big.o: $(hdrdir)/ruby/internal/stdalign.h
 str2big.o: $(hdrdir)/ruby/internal/stdbool.h
+str2big.o: $(hdrdir)/ruby/internal/stdckdint.h
 str2big.o: $(hdrdir)/ruby/internal/symbol.h
 str2big.o: $(hdrdir)/ruby/internal/value.h
 str2big.o: $(hdrdir)/ruby/internal/value_type.h
diff --git a/ext/-test-/bug-14834/bug-14384.c b/ext/-test-/bug-14834/bug-14384.c
deleted file mode 100644
index 3a16a2d222c832..00000000000000
--- a/ext/-test-/bug-14834/bug-14384.c
+++ /dev/null
@@ -1,39 +0,0 @@
-#include <ruby/ruby.h>
-#include <ruby/debug.h>
-
-#ifndef MAYBE_UNUSED
-# define MAYBE_UNUSED(x) x
-#endif
-
-static NOINLINE(VALUE f(VALUE));
-static NOINLINE(void g(VALUE, void*));
-extern NOINLINE(void Init_bug_14384(void));
-
-void
-Init_bug_14834(void)
-{
-    VALUE q = rb_define_module("Bug");
-    rb_define_module_function(q, "bug_14834", f, 0);
-}
-
-VALUE
-f(VALUE q)
-{
-    int   w[] = { 0, 1024 };
-    VALUE e   = rb_tracepoint_new(Qnil, RUBY_INTERNAL_EVENT_NEWOBJ, g, w);
-
-    rb_tracepoint_enable(e);
-    return rb_ensure(rb_yield, q, rb_tracepoint_disable, e);
-}
-
-void
-g(MAYBE_UNUSED(VALUE q), void* w)
-{
-    const int *e = (const int *)w;
-    const int  r = *e++;
-    const int  t = *e++;
-    VALUE     *y = ALLOCA_N(VALUE, t);
-    int       *u = ALLOCA_N(int, t);
-
-    rb_profile_frames(r, t, y, u);
-}
diff --git a/ext/-test-/bug-14834/bug-14834.c b/ext/-test-/bug-14834/bug-14834.c
new file mode 100644
index 00000000000000..af2070d303ff38
--- /dev/null
+++ b/ext/-test-/bug-14834/bug-14834.c
@@ -0,0 +1,39 @@
+#include <ruby/ruby.h>
+#include <ruby/debug.h>
+
+#ifndef MAYBE_UNUSED
+# define MAYBE_UNUSED(x) x
+#endif
+
+static NOINLINE(VALUE f(VALUE));
+static NOINLINE(void g(VALUE, void*));
+extern NOINLINE(void Init_bug_14834(void));
+
+void
+Init_bug_14834(void)
+{
+    VALUE q = rb_define_module("Bug");
+    rb_define_module_function(q, "bug_14834", f, 0);
+}
+
+VALUE
+f(VALUE q)
+{
+    int   w[] = { 0, 1024 };
+    VALUE e   = rb_tracepoint_new(Qnil, RUBY_INTERNAL_EVENT_NEWOBJ, g, w);
+
+    rb_tracepoint_enable(e);
+    return rb_ensure(rb_yield, q, rb_tracepoint_disable, e);
+}
+
+void
+g(MAYBE_UNUSED(VALUE q), void* w)
+{
+    const int *e = (const int *)w;
+    const int  r = *e++;
+    const int  t = *e++;
+    VALUE     *y = ALLOCA_N(VALUE, t);
+    int       *u = ALLOCA_N(int, t);
+
+    rb_profile_frames(r, t, y, u);
+}
diff --git a/ext/-test-/bug-14834/depend b/ext/-test-/bug-14834/depend
index bf26a571aaab86..f83939d559f63c 100644
--- a/ext/-test-/bug-14834/depend
+++ b/ext/-test-/bug-14834/depend
@@ -1,161 +1,163 @@
 # AUTOGENERATED DEPENDENCIES START
-bug-14384.o: $(RUBY_EXTCONF_H)
-bug-14384.o: $(arch_hdrdir)/ruby/config.h
-bug-14384.o: $(hdrdir)/ruby/assert.h
-bug-14384.o: $(hdrdir)/ruby/backward.h
-bug-14384.o: $(hdrdir)/ruby/backward/2/assume.h
-bug-14384.o: $(hdrdir)/ruby/backward/2/attributes.h
-bug-14384.o: $(hdrdir)/ruby/backward/2/bool.h
-bug-14384.o: $(hdrdir)/ruby/backward/2/inttypes.h
-bug-14384.o: $(hdrdir)/ruby/backward/2/limits.h
-bug-14384.o: $(hdrdir)/ruby/backward/2/long_long.h
-bug-14384.o: $(hdrdir)/ruby/backward/2/stdalign.h
-bug-14384.o: $(hdrdir)/ruby/backward/2/stdarg.h
-bug-14384.o: $(hdrdir)/ruby/debug.h
-bug-14384.o: $(hdrdir)/ruby/defines.h
-bug-14384.o: $(hdrdir)/ruby/intern.h
-bug-14384.o: $(hdrdir)/ruby/internal/abi.h
-bug-14384.o: $(hdrdir)/ruby/internal/anyargs.h
-bug-14384.o: $(hdrdir)/ruby/internal/arithmetic.h
-bug-14384.o: $(hdrdir)/ruby/internal/arithmetic/char.h
-bug-14384.o: $(hdrdir)/ruby/internal/arithmetic/double.h
-bug-14384.o: $(hdrdir)/ruby/internal/arithmetic/fixnum.h
-bug-14384.o: $(hdrdir)/ruby/internal/arithmetic/gid_t.h
-bug-14384.o: $(hdrdir)/ruby/internal/arithmetic/int.h
-bug-14384.o: $(hdrdir)/ruby/internal/arithmetic/intptr_t.h
-bug-14384.o: $(hdrdir)/ruby/internal/arithmetic/long.h
-bug-14384.o: $(hdrdir)/ruby/internal/arithmetic/long_long.h
-bug-14384.o: $(hdrdir)/ruby/internal/arithmetic/mode_t.h
-bug-14384.o: $(hdrdir)/ruby/internal/arithmetic/off_t.h
-bug-14384.o: $(hdrdir)/ruby/internal/arithmetic/pid_t.h
-bug-14384.o: $(hdrdir)/ruby/internal/arithmetic/short.h
-bug-14384.o: $(hdrdir)/ruby/internal/arithmetic/size_t.h
-bug-14384.o: $(hdrdir)/ruby/internal/arithmetic/st_data_t.h
-bug-14384.o: $(hdrdir)/ruby/internal/arithmetic/uid_t.h
-bug-14384.o: $(hdrdir)/ruby/internal/assume.h
-bug-14384.o: $(hdrdir)/ruby/internal/attr/alloc_size.h
-bug-14384.o: $(hdrdir)/ruby/internal/attr/artificial.h
-bug-14384.o: $(hdrdir)/ruby/internal/attr/cold.h
-bug-14384.o: $(hdrdir)/ruby/internal/attr/const.h
-bug-14384.o: $(hdrdir)/ruby/internal/attr/constexpr.h
-bug-14384.o: $(hdrdir)/ruby/internal/attr/deprecated.h
-bug-14384.o: $(hdrdir)/ruby/internal/attr/diagnose_if.h
-bug-14384.o: $(hdrdir)/ruby/internal/attr/enum_extensibility.h
-bug-14384.o: $(hdrdir)/ruby/internal/attr/error.h
-bug-14384.o: $(hdrdir)/ruby/internal/attr/flag_enum.h
-bug-14384.o: $(hdrdir)/ruby/internal/attr/forceinline.h
-bug-14384.o: $(hdrdir)/ruby/internal/attr/format.h
-bug-14384.o: $(hdrdir)/ruby/internal/attr/maybe_unused.h
-bug-14384.o: $(hdrdir)/ruby/internal/attr/noalias.h
-bug-14384.o: $(hdrdir)/ruby/internal/attr/nodiscard.h
-bug-14384.o: $(hdrdir)/ruby/internal/attr/noexcept.h
-bug-14384.o: $(hdrdir)/ruby/internal/attr/noinline.h
-bug-14384.o: $(hdrdir)/ruby/internal/attr/nonnull.h
-bug-14384.o: $(hdrdir)/ruby/internal/attr/noreturn.h
-bug-14384.o: $(hdrdir)/ruby/internal/attr/packed_struct.h
-bug-14384.o: $(hdrdir)/ruby/internal/attr/pure.h
-bug-14384.o: $(hdrdir)/ruby/internal/attr/restrict.h
-bug-14384.o: $(hdrdir)/ruby/internal/attr/returns_nonnull.h
-bug-14384.o: $(hdrdir)/ruby/internal/attr/warning.h
-bug-14384.o: $(hdrdir)/ruby/internal/attr/weakref.h
-bug-14384.o: $(hdrdir)/ruby/internal/cast.h
-bug-14384.o: $(hdrdir)/ruby/internal/compiler_is.h
-bug-14384.o: $(hdrdir)/ruby/internal/compiler_is/apple.h
-bug-14384.o: $(hdrdir)/ruby/internal/compiler_is/clang.h
-bug-14384.o: $(hdrdir)/ruby/internal/compiler_is/gcc.h
-bug-14384.o: $(hdrdir)/ruby/internal/compiler_is/intel.h
-bug-14384.o: $(hdrdir)/ruby/internal/compiler_is/msvc.h
-bug-14384.o: $(hdrdir)/ruby/internal/compiler_is/sunpro.h
-bug-14384.o: $(hdrdir)/ruby/internal/compiler_since.h
-bug-14384.o: $(hdrdir)/ruby/internal/config.h
-bug-14384.o: $(hdrdir)/ruby/internal/constant_p.h
-bug-14384.o: $(hdrdir)/ruby/internal/core.h
-bug-14384.o: $(hdrdir)/ruby/internal/core/rarray.h
-bug-14384.o: $(hdrdir)/ruby/internal/core/rbasic.h
-bug-14384.o: $(hdrdir)/ruby/internal/core/rbignum.h
-bug-14384.o: $(hdrdir)/ruby/internal/core/rclass.h
-bug-14384.o: $(hdrdir)/ruby/internal/core/rdata.h
-bug-14384.o: $(hdrdir)/ruby/internal/core/rfile.h
-bug-14384.o: $(hdrdir)/ruby/internal/core/rhash.h
-bug-14384.o: $(hdrdir)/ruby/internal/core/robject.h
-bug-14384.o: $(hdrdir)/ruby/internal/core/rregexp.h
-bug-14384.o: $(hdrdir)/ruby/internal/core/rstring.h
-bug-14384.o: $(hdrdir)/ruby/internal/core/rstruct.h
-bug-14384.o: $(hdrdir)/ruby/internal/core/rtypeddata.h
-bug-14384.o: $(hdrdir)/ruby/internal/ctype.h
-bug-14384.o: $(hdrdir)/ruby/internal/dllexport.h
-bug-14384.o: $(hdrdir)/ruby/internal/dosish.h
-bug-14384.o: $(hdrdir)/ruby/internal/error.h
-bug-14384.o: $(hdrdir)/ruby/internal/eval.h
-bug-14384.o: $(hdrdir)/ruby/internal/event.h
-bug-14384.o: $(hdrdir)/ruby/internal/fl_type.h
-bug-14384.o: $(hdrdir)/ruby/internal/gc.h
-bug-14384.o: $(hdrdir)/ruby/internal/glob.h
-bug-14384.o: $(hdrdir)/ruby/internal/globals.h
-bug-14384.o: $(hdrdir)/ruby/internal/has/attribute.h
-bug-14384.o: $(hdrdir)/ruby/internal/has/builtin.h
-bug-14384.o: $(hdrdir)/ruby/internal/has/c_attribute.h
-bug-14384.o: $(hdrdir)/ruby/internal/has/cpp_attribute.h
-bug-14384.o: $(hdrdir)/ruby/internal/has/declspec_attribute.h
-bug-14384.o: $(hdrdir)/ruby/internal/has/extension.h
-bug-14384.o: $(hdrdir)/ruby/internal/has/feature.h
-bug-14384.o: $(hdrdir)/ruby/internal/has/warning.h
-bug-14384.o: $(hdrdir)/ruby/internal/intern/array.h
-bug-14384.o: $(hdrdir)/ruby/internal/intern/bignum.h
-bug-14384.o: $(hdrdir)/ruby/internal/intern/class.h
-bug-14384.o: $(hdrdir)/ruby/internal/intern/compar.h
-bug-14384.o: $(hdrdir)/ruby/internal/intern/complex.h
-bug-14384.o: $(hdrdir)/ruby/internal/intern/cont.h
-bug-14384.o: $(hdrdir)/ruby/internal/intern/dir.h
-bug-14384.o: $(hdrdir)/ruby/internal/intern/enum.h
-bug-14384.o: $(hdrdir)/ruby/internal/intern/enumerator.h
-bug-14384.o: $(hdrdir)/ruby/internal/intern/error.h
-bug-14384.o: $(hdrdir)/ruby/internal/intern/eval.h
-bug-14384.o: $(hdrdir)/ruby/internal/intern/file.h
-bug-14384.o: $(hdrdir)/ruby/internal/intern/hash.h
-bug-14384.o: $(hdrdir)/ruby/internal/intern/io.h
-bug-14384.o: $(hdrdir)/ruby/internal/intern/load.h
-bug-14384.o: $(hdrdir)/ruby/internal/intern/marshal.h
-bug-14384.o: $(hdrdir)/ruby/internal/intern/numeric.h
-bug-14384.o: $(hdrdir)/ruby/internal/intern/object.h
-bug-14384.o: $(hdrdir)/ruby/internal/intern/parse.h
-bug-14384.o: $(hdrdir)/ruby/internal/intern/proc.h
-bug-14384.o: $(hdrdir)/ruby/internal/intern/process.h
-bug-14384.o: $(hdrdir)/ruby/internal/intern/random.h
-bug-14384.o: $(hdrdir)/ruby/internal/intern/range.h
-bug-14384.o: $(hdrdir)/ruby/internal/intern/rational.h
-bug-14384.o: $(hdrdir)/ruby/internal/intern/re.h
-bug-14384.o: $(hdrdir)/ruby/internal/intern/ruby.h
-bug-14384.o: $(hdrdir)/ruby/internal/intern/select.h
-bug-14384.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
-bug-14384.o: $(hdrdir)/ruby/internal/intern/signal.h
-bug-14384.o: $(hdrdir)/ruby/internal/intern/sprintf.h
-bug-14384.o: $(hdrdir)/ruby/internal/intern/string.h
-bug-14384.o: $(hdrdir)/ruby/internal/intern/struct.h
-bug-14384.o: $(hdrdir)/ruby/internal/intern/thread.h
-bug-14384.o: $(hdrdir)/ruby/internal/intern/time.h
-bug-14384.o: $(hdrdir)/ruby/internal/intern/variable.h
-bug-14384.o: $(hdrdir)/ruby/internal/intern/vm.h
-bug-14384.o: $(hdrdir)/ruby/internal/interpreter.h
-bug-14384.o: $(hdrdir)/ruby/internal/iterator.h
-bug-14384.o: $(hdrdir)/ruby/internal/memory.h
-bug-14384.o: $(hdrdir)/ruby/internal/method.h
-bug-14384.o: $(hdrdir)/ruby/internal/module.h
-bug-14384.o: $(hdrdir)/ruby/internal/newobj.h
-bug-14384.o: $(hdrdir)/ruby/internal/scan_args.h
-bug-14384.o: $(hdrdir)/ruby/internal/special_consts.h
-bug-14384.o: $(hdrdir)/ruby/internal/static_assert.h
-bug-14384.o: $(hdrdir)/ruby/internal/stdalign.h
-bug-14384.o: $(hdrdir)/ruby/internal/stdbool.h
-bug-14384.o: $(hdrdir)/ruby/internal/symbol.h
-bug-14384.o: $(hdrdir)/ruby/internal/value.h
-bug-14384.o: $(hdrdir)/ruby/internal/value_type.h
-bug-14384.o: $(hdrdir)/ruby/internal/variable.h
-bug-14384.o: $(hdrdir)/ruby/internal/warning_push.h
-bug-14384.o: $(hdrdir)/ruby/internal/xmalloc.h
-bug-14384.o: $(hdrdir)/ruby/missing.h
-bug-14384.o: $(hdrdir)/ruby/ruby.h
-bug-14384.o: $(hdrdir)/ruby/st.h
-bug-14384.o: $(hdrdir)/ruby/subst.h
-bug-14384.o: bug-14384.c
+bug-14834.o: $(RUBY_EXTCONF_H)
+bug-14834.o: $(arch_hdrdir)/ruby/config.h
+bug-14834.o: $(hdrdir)/ruby/assert.h
+bug-14834.o: $(hdrdir)/ruby/backward.h
+bug-14834.o: $(hdrdir)/ruby/backward/2/assume.h
+bug-14834.o: $(hdrdir)/ruby/backward/2/attributes.h
+bug-14834.o: $(hdrdir)/ruby/backward/2/bool.h
+bug-14834.o: $(hdrdir)/ruby/backward/2/inttypes.h
+bug-14834.o: $(hdrdir)/ruby/backward/2/limits.h
+bug-14834.o: $(hdrdir)/ruby/backward/2/long_long.h
+bug-14834.o: $(hdrdir)/ruby/backward/2/stdalign.h
+bug-14834.o: $(hdrdir)/ruby/backward/2/stdarg.h
+bug-14834.o: $(hdrdir)/ruby/debug.h
+bug-14834.o: $(hdrdir)/ruby/defines.h
+bug-14834.o: $(hdrdir)/ruby/intern.h
+bug-14834.o: $(hdrdir)/ruby/internal/abi.h
+bug-14834.o: $(hdrdir)/ruby/internal/anyargs.h
+bug-14834.o: $(hdrdir)/ruby/internal/arithmetic.h
+bug-14834.o: $(hdrdir)/ruby/internal/arithmetic/char.h
+bug-14834.o: $(hdrdir)/ruby/internal/arithmetic/double.h
+bug-14834.o: $(hdrdir)/ruby/internal/arithmetic/fixnum.h
+bug-14834.o: $(hdrdir)/ruby/internal/arithmetic/gid_t.h
+bug-14834.o: $(hdrdir)/ruby/internal/arithmetic/int.h
+bug-14834.o: $(hdrdir)/ruby/internal/arithmetic/intptr_t.h
+bug-14834.o: $(hdrdir)/ruby/internal/arithmetic/long.h
+bug-14834.o: $(hdrdir)/ruby/internal/arithmetic/long_long.h
+bug-14834.o: $(hdrdir)/ruby/internal/arithmetic/mode_t.h
+bug-14834.o: $(hdrdir)/ruby/internal/arithmetic/off_t.h
+bug-14834.o: $(hdrdir)/ruby/internal/arithmetic/pid_t.h
+bug-14834.o: $(hdrdir)/ruby/internal/arithmetic/short.h
+bug-14834.o: $(hdrdir)/ruby/internal/arithmetic/size_t.h
+bug-14834.o: $(hdrdir)/ruby/internal/arithmetic/st_data_t.h
+bug-14834.o: $(hdrdir)/ruby/internal/arithmetic/uid_t.h
+bug-14834.o: $(hdrdir)/ruby/internal/assume.h
+bug-14834.o: $(hdrdir)/ruby/internal/attr/alloc_size.h
+bug-14834.o: $(hdrdir)/ruby/internal/attr/artificial.h
+bug-14834.o: $(hdrdir)/ruby/internal/attr/cold.h
+bug-14834.o: $(hdrdir)/ruby/internal/attr/const.h
+bug-14834.o: $(hdrdir)/ruby/internal/attr/constexpr.h
+bug-14834.o: $(hdrdir)/ruby/internal/attr/deprecated.h
+bug-14834.o: $(hdrdir)/ruby/internal/attr/diagnose_if.h
+bug-14834.o: $(hdrdir)/ruby/internal/attr/enum_extensibility.h
+bug-14834.o: $(hdrdir)/ruby/internal/attr/error.h
+bug-14834.o: $(hdrdir)/ruby/internal/attr/flag_enum.h
+bug-14834.o: $(hdrdir)/ruby/internal/attr/forceinline.h
+bug-14834.o: $(hdrdir)/ruby/internal/attr/format.h
+bug-14834.o: $(hdrdir)/ruby/internal/attr/maybe_unused.h
+bug-14834.o: $(hdrdir)/ruby/internal/attr/noalias.h
+bug-14834.o: $(hdrdir)/ruby/internal/attr/nodiscard.h
+bug-14834.o: $(hdrdir)/ruby/internal/attr/noexcept.h
+bug-14834.o: $(hdrdir)/ruby/internal/attr/noinline.h
+bug-14834.o: $(hdrdir)/ruby/internal/attr/nonnull.h
+bug-14834.o: $(hdrdir)/ruby/internal/attr/noreturn.h
+bug-14834.o: $(hdrdir)/ruby/internal/attr/packed_struct.h
+bug-14834.o: $(hdrdir)/ruby/internal/attr/pure.h
+bug-14834.o: $(hdrdir)/ruby/internal/attr/restrict.h
+bug-14834.o: $(hdrdir)/ruby/internal/attr/returns_nonnull.h
+bug-14834.o: $(hdrdir)/ruby/internal/attr/warning.h
+bug-14834.o: $(hdrdir)/ruby/internal/attr/weakref.h
+bug-14834.o: $(hdrdir)/ruby/internal/cast.h
+bug-14834.o: $(hdrdir)/ruby/internal/compiler_is.h
+bug-14834.o: $(hdrdir)/ruby/internal/compiler_is/apple.h
+bug-14834.o: $(hdrdir)/ruby/internal/compiler_is/clang.h
+bug-14834.o: $(hdrdir)/ruby/internal/compiler_is/gcc.h
+bug-14834.o: $(hdrdir)/ruby/internal/compiler_is/intel.h
+bug-14834.o: $(hdrdir)/ruby/internal/compiler_is/msvc.h
+bug-14834.o: $(hdrdir)/ruby/internal/compiler_is/sunpro.h
+bug-14834.o: $(hdrdir)/ruby/internal/compiler_since.h
+bug-14834.o: $(hdrdir)/ruby/internal/config.h
+bug-14834.o: $(hdrdir)/ruby/internal/constant_p.h
+bug-14834.o: $(hdrdir)/ruby/internal/core.h
+bug-14834.o: $(hdrdir)/ruby/internal/core/rarray.h
+bug-14834.o: $(hdrdir)/ruby/internal/core/rbasic.h
+bug-14834.o: $(hdrdir)/ruby/internal/core/rbignum.h
+bug-14834.o: $(hdrdir)/ruby/internal/core/rclass.h
+bug-14834.o: $(hdrdir)/ruby/internal/core/rdata.h
+bug-14834.o: $(hdrdir)/ruby/internal/core/rfile.h
+bug-14834.o: $(hdrdir)/ruby/internal/core/rhash.h
+bug-14834.o: $(hdrdir)/ruby/internal/core/robject.h
+bug-14834.o: $(hdrdir)/ruby/internal/core/rregexp.h
+bug-14834.o: $(hdrdir)/ruby/internal/core/rstring.h
+bug-14834.o: $(hdrdir)/ruby/internal/core/rstruct.h
+bug-14834.o: $(hdrdir)/ruby/internal/core/rtypeddata.h
+bug-14834.o: $(hdrdir)/ruby/internal/ctype.h
+bug-14834.o: $(hdrdir)/ruby/internal/dllexport.h
+bug-14834.o: $(hdrdir)/ruby/internal/dosish.h
+bug-14834.o: $(hdrdir)/ruby/internal/error.h
+bug-14834.o: $(hdrdir)/ruby/internal/eval.h
+bug-14834.o: $(hdrdir)/ruby/internal/event.h
+bug-14834.o: $(hdrdir)/ruby/internal/fl_type.h
+bug-14834.o: $(hdrdir)/ruby/internal/gc.h
+bug-14834.o: $(hdrdir)/ruby/internal/glob.h
+bug-14834.o: $(hdrdir)/ruby/internal/globals.h
+bug-14834.o: $(hdrdir)/ruby/internal/has/attribute.h
+bug-14834.o: $(hdrdir)/ruby/internal/has/builtin.h
+bug-14834.o: $(hdrdir)/ruby/internal/has/c_attribute.h
+bug-14834.o: $(hdrdir)/ruby/internal/has/cpp_attribute.h
+bug-14834.o: $(hdrdir)/ruby/internal/has/declspec_attribute.h
+bug-14834.o: $(hdrdir)/ruby/internal/has/extension.h
+bug-14834.o: $(hdrdir)/ruby/internal/has/feature.h
+bug-14834.o: $(hdrdir)/ruby/internal/has/warning.h
+bug-14834.o: $(hdrdir)/ruby/internal/intern/array.h
+bug-14834.o: $(hdrdir)/ruby/internal/intern/bignum.h
+bug-14834.o: $(hdrdir)/ruby/internal/intern/class.h
+bug-14834.o: $(hdrdir)/ruby/internal/intern/compar.h
+bug-14834.o: $(hdrdir)/ruby/internal/intern/complex.h
+bug-14834.o: $(hdrdir)/ruby/internal/intern/cont.h
+bug-14834.o: $(hdrdir)/ruby/internal/intern/dir.h
+bug-14834.o: $(hdrdir)/ruby/internal/intern/enum.h
+bug-14834.o: $(hdrdir)/ruby/internal/intern/enumerator.h
+bug-14834.o: $(hdrdir)/ruby/internal/intern/error.h
+bug-14834.o: $(hdrdir)/ruby/internal/intern/eval.h
+bug-14834.o: $(hdrdir)/ruby/internal/intern/file.h
+bug-14834.o: $(hdrdir)/ruby/internal/intern/hash.h
+bug-14834.o: $(hdrdir)/ruby/internal/intern/io.h
+bug-14834.o: $(hdrdir)/ruby/internal/intern/load.h
+bug-14834.o: $(hdrdir)/ruby/internal/intern/marshal.h
+bug-14834.o: $(hdrdir)/ruby/internal/intern/numeric.h
+bug-14834.o: $(hdrdir)/ruby/internal/intern/object.h
+bug-14834.o: $(hdrdir)/ruby/internal/intern/parse.h
+bug-14834.o: $(hdrdir)/ruby/internal/intern/proc.h
+bug-14834.o: $(hdrdir)/ruby/internal/intern/process.h
+bug-14834.o: $(hdrdir)/ruby/internal/intern/random.h
+bug-14834.o: $(hdrdir)/ruby/internal/intern/range.h
+bug-14834.o: $(hdrdir)/ruby/internal/intern/rational.h
+bug-14834.o: $(hdrdir)/ruby/internal/intern/re.h
+bug-14834.o: $(hdrdir)/ruby/internal/intern/ruby.h
+bug-14834.o: $(hdrdir)/ruby/internal/intern/select.h
+bug-14834.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+bug-14834.o: $(hdrdir)/ruby/internal/intern/set.h
+bug-14834.o: $(hdrdir)/ruby/internal/intern/signal.h
+bug-14834.o: $(hdrdir)/ruby/internal/intern/sprintf.h
+bug-14834.o: $(hdrdir)/ruby/internal/intern/string.h
+bug-14834.o: $(hdrdir)/ruby/internal/intern/struct.h
+bug-14834.o: $(hdrdir)/ruby/internal/intern/thread.h
+bug-14834.o: $(hdrdir)/ruby/internal/intern/time.h
+bug-14834.o: $(hdrdir)/ruby/internal/intern/variable.h
+bug-14834.o: $(hdrdir)/ruby/internal/intern/vm.h
+bug-14834.o: $(hdrdir)/ruby/internal/interpreter.h
+bug-14834.o: $(hdrdir)/ruby/internal/iterator.h
+bug-14834.o: $(hdrdir)/ruby/internal/memory.h
+bug-14834.o: $(hdrdir)/ruby/internal/method.h
+bug-14834.o: $(hdrdir)/ruby/internal/module.h
+bug-14834.o: $(hdrdir)/ruby/internal/newobj.h
+bug-14834.o: $(hdrdir)/ruby/internal/scan_args.h
+bug-14834.o: $(hdrdir)/ruby/internal/special_consts.h
+bug-14834.o: $(hdrdir)/ruby/internal/static_assert.h
+bug-14834.o: $(hdrdir)/ruby/internal/stdalign.h
+bug-14834.o: $(hdrdir)/ruby/internal/stdbool.h
+bug-14834.o: $(hdrdir)/ruby/internal/stdckdint.h
+bug-14834.o: $(hdrdir)/ruby/internal/symbol.h
+bug-14834.o: $(hdrdir)/ruby/internal/value.h
+bug-14834.o: $(hdrdir)/ruby/internal/value_type.h
+bug-14834.o: $(hdrdir)/ruby/internal/variable.h
+bug-14834.o: $(hdrdir)/ruby/internal/warning_push.h
+bug-14834.o: $(hdrdir)/ruby/internal/xmalloc.h
+bug-14834.o: $(hdrdir)/ruby/missing.h
+bug-14834.o: $(hdrdir)/ruby/ruby.h
+bug-14834.o: $(hdrdir)/ruby/st.h
+bug-14834.o: $(hdrdir)/ruby/subst.h
+bug-14834.o: bug-14834.c
 # AUTOGENERATED DEPENDENCIES END
diff --git a/ext/-test-/bug-3571/depend b/ext/-test-/bug-3571/depend
index 9105093b0d39b1..69c970b6f25703 100644
--- a/ext/-test-/bug-3571/depend
+++ b/ext/-test-/bug-3571/depend
@@ -128,6 +128,7 @@ bug.o: $(hdrdir)/ruby/internal/intern/re.h
 bug.o: $(hdrdir)/ruby/internal/intern/ruby.h
 bug.o: $(hdrdir)/ruby/internal/intern/select.h
 bug.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+bug.o: $(hdrdir)/ruby/internal/intern/set.h
 bug.o: $(hdrdir)/ruby/internal/intern/signal.h
 bug.o: $(hdrdir)/ruby/internal/intern/sprintf.h
 bug.o: $(hdrdir)/ruby/internal/intern/string.h
@@ -147,6 +148,7 @@ bug.o: $(hdrdir)/ruby/internal/special_consts.h
 bug.o: $(hdrdir)/ruby/internal/static_assert.h
 bug.o: $(hdrdir)/ruby/internal/stdalign.h
 bug.o: $(hdrdir)/ruby/internal/stdbool.h
+bug.o: $(hdrdir)/ruby/internal/stdckdint.h
 bug.o: $(hdrdir)/ruby/internal/symbol.h
 bug.o: $(hdrdir)/ruby/internal/value.h
 bug.o: $(hdrdir)/ruby/internal/value_type.h
diff --git a/ext/-test-/bug-5832/depend b/ext/-test-/bug-5832/depend
index 9105093b0d39b1..69c970b6f25703 100644
--- a/ext/-test-/bug-5832/depend
+++ b/ext/-test-/bug-5832/depend
@@ -128,6 +128,7 @@ bug.o: $(hdrdir)/ruby/internal/intern/re.h
 bug.o: $(hdrdir)/ruby/internal/intern/ruby.h
 bug.o: $(hdrdir)/ruby/internal/intern/select.h
 bug.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+bug.o: $(hdrdir)/ruby/internal/intern/set.h
 bug.o: $(hdrdir)/ruby/internal/intern/signal.h
 bug.o: $(hdrdir)/ruby/internal/intern/sprintf.h
 bug.o: $(hdrdir)/ruby/internal/intern/string.h
@@ -147,6 +148,7 @@ bug.o: $(hdrdir)/ruby/internal/special_consts.h
 bug.o: $(hdrdir)/ruby/internal/static_assert.h
 bug.o: $(hdrdir)/ruby/internal/stdalign.h
 bug.o: $(hdrdir)/ruby/internal/stdbool.h
+bug.o: $(hdrdir)/ruby/internal/stdckdint.h
 bug.o: $(hdrdir)/ruby/internal/symbol.h
 bug.o: $(hdrdir)/ruby/internal/value.h
 bug.o: $(hdrdir)/ruby/internal/value_type.h
diff --git a/ext/-test-/bug_reporter/depend b/ext/-test-/bug_reporter/depend
index 20882708d1ba13..e9993c3295505e 100644
--- a/ext/-test-/bug_reporter/depend
+++ b/ext/-test-/bug_reporter/depend
@@ -128,6 +128,7 @@ bug_reporter.o: $(hdrdir)/ruby/internal/intern/re.h
 bug_reporter.o: $(hdrdir)/ruby/internal/intern/ruby.h
 bug_reporter.o: $(hdrdir)/ruby/internal/intern/select.h
 bug_reporter.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+bug_reporter.o: $(hdrdir)/ruby/internal/intern/set.h
 bug_reporter.o: $(hdrdir)/ruby/internal/intern/signal.h
 bug_reporter.o: $(hdrdir)/ruby/internal/intern/sprintf.h
 bug_reporter.o: $(hdrdir)/ruby/internal/intern/string.h
@@ -147,6 +148,7 @@ bug_reporter.o: $(hdrdir)/ruby/internal/special_consts.h
 bug_reporter.o: $(hdrdir)/ruby/internal/static_assert.h
 bug_reporter.o: $(hdrdir)/ruby/internal/stdalign.h
 bug_reporter.o: $(hdrdir)/ruby/internal/stdbool.h
+bug_reporter.o: $(hdrdir)/ruby/internal/stdckdint.h
 bug_reporter.o: $(hdrdir)/ruby/internal/symbol.h
 bug_reporter.o: $(hdrdir)/ruby/internal/value.h
 bug_reporter.o: $(hdrdir)/ruby/internal/value_type.h
diff --git a/ext/-test-/class/depend b/ext/-test-/class/depend
index 0a805f815e15ba..557206cefb41f4 100644
--- a/ext/-test-/class/depend
+++ b/ext/-test-/class/depend
@@ -127,6 +127,7 @@ class2name.o: $(hdrdir)/ruby/internal/intern/re.h
 class2name.o: $(hdrdir)/ruby/internal/intern/ruby.h
 class2name.o: $(hdrdir)/ruby/internal/intern/select.h
 class2name.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+class2name.o: $(hdrdir)/ruby/internal/intern/set.h
 class2name.o: $(hdrdir)/ruby/internal/intern/signal.h
 class2name.o: $(hdrdir)/ruby/internal/intern/sprintf.h
 class2name.o: $(hdrdir)/ruby/internal/intern/string.h
@@ -146,6 +147,7 @@ class2name.o: $(hdrdir)/ruby/internal/special_consts.h
 class2name.o: $(hdrdir)/ruby/internal/static_assert.h
 class2name.o: $(hdrdir)/ruby/internal/stdalign.h
 class2name.o: $(hdrdir)/ruby/internal/stdbool.h
+class2name.o: $(hdrdir)/ruby/internal/stdckdint.h
 class2name.o: $(hdrdir)/ruby/internal/symbol.h
 class2name.o: $(hdrdir)/ruby/internal/value.h
 class2name.o: $(hdrdir)/ruby/internal/value_type.h
@@ -286,6 +288,7 @@ init.o: $(hdrdir)/ruby/internal/intern/re.h
 init.o: $(hdrdir)/ruby/internal/intern/ruby.h
 init.o: $(hdrdir)/ruby/internal/intern/select.h
 init.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+init.o: $(hdrdir)/ruby/internal/intern/set.h
 init.o: $(hdrdir)/ruby/internal/intern/signal.h
 init.o: $(hdrdir)/ruby/internal/intern/sprintf.h
 init.o: $(hdrdir)/ruby/internal/intern/string.h
@@ -305,6 +308,7 @@ init.o: $(hdrdir)/ruby/internal/special_consts.h
 init.o: $(hdrdir)/ruby/internal/static_assert.h
 init.o: $(hdrdir)/ruby/internal/stdalign.h
 init.o: $(hdrdir)/ruby/internal/stdbool.h
+init.o: $(hdrdir)/ruby/internal/stdckdint.h
 init.o: $(hdrdir)/ruby/internal/symbol.h
 init.o: $(hdrdir)/ruby/internal/value.h
 init.o: $(hdrdir)/ruby/internal/value_type.h
diff --git a/ext/-test-/class/init.c b/ext/-test-/class/init.c
index ed715c1942492c..108ff7525cef85 100644
--- a/ext/-test-/class/init.c
+++ b/ext/-test-/class/init.c
@@ -7,5 +7,6 @@ Init_class(void)
 {
     VALUE mBug = rb_define_module("Bug");
     VALUE mod = rb_define_module_under(mBug, "Class");
+    rb_define_class_under(mod, "TestClassDefinedInC", rb_cObject);
     TEST_INIT_FUNCS(init);
 }
diff --git a/ext/-test-/debug/depend b/ext/-test-/debug/depend
index 5feeea6d989dd1..4ae0378ef2072d 100644
--- a/ext/-test-/debug/depend
+++ b/ext/-test-/debug/depend
@@ -128,6 +128,7 @@ init.o: $(hdrdir)/ruby/internal/intern/re.h
 init.o: $(hdrdir)/ruby/internal/intern/ruby.h
 init.o: $(hdrdir)/ruby/internal/intern/select.h
 init.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+init.o: $(hdrdir)/ruby/internal/intern/set.h
 init.o: $(hdrdir)/ruby/internal/intern/signal.h
 init.o: $(hdrdir)/ruby/internal/intern/sprintf.h
 init.o: $(hdrdir)/ruby/internal/intern/string.h
@@ -147,6 +148,7 @@ init.o: $(hdrdir)/ruby/internal/special_consts.h
 init.o: $(hdrdir)/ruby/internal/static_assert.h
 init.o: $(hdrdir)/ruby/internal/stdalign.h
 init.o: $(hdrdir)/ruby/internal/stdbool.h
+init.o: $(hdrdir)/ruby/internal/stdckdint.h
 init.o: $(hdrdir)/ruby/internal/symbol.h
 init.o: $(hdrdir)/ruby/internal/value.h
 init.o: $(hdrdir)/ruby/internal/value_type.h
@@ -287,6 +289,7 @@ inspector.o: $(hdrdir)/ruby/internal/intern/re.h
 inspector.o: $(hdrdir)/ruby/internal/intern/ruby.h
 inspector.o: $(hdrdir)/ruby/internal/intern/select.h
 inspector.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+inspector.o: $(hdrdir)/ruby/internal/intern/set.h
 inspector.o: $(hdrdir)/ruby/internal/intern/signal.h
 inspector.o: $(hdrdir)/ruby/internal/intern/sprintf.h
 inspector.o: $(hdrdir)/ruby/internal/intern/string.h
@@ -306,6 +309,7 @@ inspector.o: $(hdrdir)/ruby/internal/special_consts.h
 inspector.o: $(hdrdir)/ruby/internal/static_assert.h
 inspector.o: $(hdrdir)/ruby/internal/stdalign.h
 inspector.o: $(hdrdir)/ruby/internal/stdbool.h
+inspector.o: $(hdrdir)/ruby/internal/stdckdint.h
 inspector.o: $(hdrdir)/ruby/internal/symbol.h
 inspector.o: $(hdrdir)/ruby/internal/value.h
 inspector.o: $(hdrdir)/ruby/internal/value_type.h
@@ -446,6 +450,7 @@ profile_frames.o: $(hdrdir)/ruby/internal/intern/re.h
 profile_frames.o: $(hdrdir)/ruby/internal/intern/ruby.h
 profile_frames.o: $(hdrdir)/ruby/internal/intern/select.h
 profile_frames.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+profile_frames.o: $(hdrdir)/ruby/internal/intern/set.h
 profile_frames.o: $(hdrdir)/ruby/internal/intern/signal.h
 profile_frames.o: $(hdrdir)/ruby/internal/intern/sprintf.h
 profile_frames.o: $(hdrdir)/ruby/internal/intern/string.h
@@ -465,6 +470,7 @@ profile_frames.o: $(hdrdir)/ruby/internal/special_consts.h
 profile_frames.o: $(hdrdir)/ruby/internal/static_assert.h
 profile_frames.o: $(hdrdir)/ruby/internal/stdalign.h
 profile_frames.o: $(hdrdir)/ruby/internal/stdbool.h
+profile_frames.o: $(hdrdir)/ruby/internal/stdckdint.h
 profile_frames.o: $(hdrdir)/ruby/internal/symbol.h
 profile_frames.o: $(hdrdir)/ruby/internal/value.h
 profile_frames.o: $(hdrdir)/ruby/internal/value_type.h
diff --git a/ext/-test-/debug/profile_frames.c b/ext/-test-/debug/profile_frames.c
index d2bba7d1834e1b..f9a77a5a780f18 100644
--- a/ext/-test-/debug/profile_frames.c
+++ b/ext/-test-/debug/profile_frames.c
@@ -37,8 +37,29 @@ profile_frames(VALUE self, VALUE start_v, VALUE num_v)
     return result;
 }
 
+static VALUE
+profile_thread_frames(VALUE self, VALUE thread, VALUE start_v, VALUE num_v)
+{
+    int i, collected_size;
+    int start = NUM2INT(start_v);
+    int buff_size = NUM2INT(num_v);
+    VALUE buff[MAX_BUF_SIZE];
+    int lines[MAX_BUF_SIZE];
+    VALUE result = rb_ary_new();
+
+    if (buff_size > MAX_BUF_SIZE) rb_raise(rb_eRuntimeError, "too long buff_size");
+
+    collected_size = rb_profile_thread_frames(thread, start, buff_size, buff, lines);
+    for (i=0; i<collected_size; i++) {
+        rb_ary_push(result, rb_profile_frame_full_label(buff[i]));
+    }
+
+    return result;
+}
+
 void
 Init_profile_frames(VALUE klass)
 {
     rb_define_module_function(klass, "profile_frames", profile_frames, 2);
+    rb_define_module_function(klass, "profile_thread_frames", profile_thread_frames, 3);
 }
diff --git a/ext/-test-/dln/empty/depend b/ext/-test-/dln/empty/depend
index a460159087cf97..58f15085983101 100644
--- a/ext/-test-/dln/empty/depend
+++ b/ext/-test-/dln/empty/depend
@@ -128,6 +128,7 @@ empty.o: $(hdrdir)/ruby/internal/intern/re.h
 empty.o: $(hdrdir)/ruby/internal/intern/ruby.h
 empty.o: $(hdrdir)/ruby/internal/intern/select.h
 empty.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+empty.o: $(hdrdir)/ruby/internal/intern/set.h
 empty.o: $(hdrdir)/ruby/internal/intern/signal.h
 empty.o: $(hdrdir)/ruby/internal/intern/sprintf.h
 empty.o: $(hdrdir)/ruby/internal/intern/string.h
@@ -147,6 +148,7 @@ empty.o: $(hdrdir)/ruby/internal/special_consts.h
 empty.o: $(hdrdir)/ruby/internal/static_assert.h
 empty.o: $(hdrdir)/ruby/internal/stdalign.h
 empty.o: $(hdrdir)/ruby/internal/stdbool.h
+empty.o: $(hdrdir)/ruby/internal/stdckdint.h
 empty.o: $(hdrdir)/ruby/internal/symbol.h
 empty.o: $(hdrdir)/ruby/internal/value.h
 empty.o: $(hdrdir)/ruby/internal/value_type.h
diff --git a/ext/-test-/econv/append.c b/ext/-test-/econv/append.c
index 724cd136c02e40..eb473c47a3f303 100644
--- a/ext/-test-/econv/append.c
+++ b/ext/-test-/econv/append.c
@@ -5,6 +5,8 @@ static VALUE
 econv_append(VALUE self, VALUE src, VALUE dst)
 {
     rb_econv_t *ec = DATA_PTR(self);
+    StringValue(src);
+    StringValue(dst);
     return rb_econv_str_append(ec, src, dst, 0);
 }
 
diff --git a/ext/-test-/econv/depend b/ext/-test-/econv/depend
new file mode 100644
index 00000000000000..3a5bc9c6590a1b
--- /dev/null
+++ b/ext/-test-/econv/depend
@@ -0,0 +1,336 @@
+# AUTOGENERATED DEPENDENCIES START
+append.o: $(RUBY_EXTCONF_H)
+append.o: $(arch_hdrdir)/ruby/config.h
+append.o: $(hdrdir)/ruby.h
+append.o: $(hdrdir)/ruby/assert.h
+append.o: $(hdrdir)/ruby/backward.h
+append.o: $(hdrdir)/ruby/backward/2/assume.h
+append.o: $(hdrdir)/ruby/backward/2/attributes.h
+append.o: $(hdrdir)/ruby/backward/2/bool.h
+append.o: $(hdrdir)/ruby/backward/2/inttypes.h
+append.o: $(hdrdir)/ruby/backward/2/limits.h
+append.o: $(hdrdir)/ruby/backward/2/long_long.h
+append.o: $(hdrdir)/ruby/backward/2/stdalign.h
+append.o: $(hdrdir)/ruby/backward/2/stdarg.h
+append.o: $(hdrdir)/ruby/defines.h
+append.o: $(hdrdir)/ruby/encoding.h
+append.o: $(hdrdir)/ruby/intern.h
+append.o: $(hdrdir)/ruby/internal/abi.h
+append.o: $(hdrdir)/ruby/internal/anyargs.h
+append.o: $(hdrdir)/ruby/internal/arithmetic.h
+append.o: $(hdrdir)/ruby/internal/arithmetic/char.h
+append.o: $(hdrdir)/ruby/internal/arithmetic/double.h
+append.o: $(hdrdir)/ruby/internal/arithmetic/fixnum.h
+append.o: $(hdrdir)/ruby/internal/arithmetic/gid_t.h
+append.o: $(hdrdir)/ruby/internal/arithmetic/int.h
+append.o: $(hdrdir)/ruby/internal/arithmetic/intptr_t.h
+append.o: $(hdrdir)/ruby/internal/arithmetic/long.h
+append.o: $(hdrdir)/ruby/internal/arithmetic/long_long.h
+append.o: $(hdrdir)/ruby/internal/arithmetic/mode_t.h
+append.o: $(hdrdir)/ruby/internal/arithmetic/off_t.h
+append.o: $(hdrdir)/ruby/internal/arithmetic/pid_t.h
+append.o: $(hdrdir)/ruby/internal/arithmetic/short.h
+append.o: $(hdrdir)/ruby/internal/arithmetic/size_t.h
+append.o: $(hdrdir)/ruby/internal/arithmetic/st_data_t.h
+append.o: $(hdrdir)/ruby/internal/arithmetic/uid_t.h
+append.o: $(hdrdir)/ruby/internal/assume.h
+append.o: $(hdrdir)/ruby/internal/attr/alloc_size.h
+append.o: $(hdrdir)/ruby/internal/attr/artificial.h
+append.o: $(hdrdir)/ruby/internal/attr/cold.h
+append.o: $(hdrdir)/ruby/internal/attr/const.h
+append.o: $(hdrdir)/ruby/internal/attr/constexpr.h
+append.o: $(hdrdir)/ruby/internal/attr/deprecated.h
+append.o: $(hdrdir)/ruby/internal/attr/diagnose_if.h
+append.o: $(hdrdir)/ruby/internal/attr/enum_extensibility.h
+append.o: $(hdrdir)/ruby/internal/attr/error.h
+append.o: $(hdrdir)/ruby/internal/attr/flag_enum.h
+append.o: $(hdrdir)/ruby/internal/attr/forceinline.h
+append.o: $(hdrdir)/ruby/internal/attr/format.h
+append.o: $(hdrdir)/ruby/internal/attr/maybe_unused.h
+append.o: $(hdrdir)/ruby/internal/attr/noalias.h
+append.o: $(hdrdir)/ruby/internal/attr/nodiscard.h
+append.o: $(hdrdir)/ruby/internal/attr/noexcept.h
+append.o: $(hdrdir)/ruby/internal/attr/noinline.h
+append.o: $(hdrdir)/ruby/internal/attr/nonnull.h
+append.o: $(hdrdir)/ruby/internal/attr/noreturn.h
+append.o: $(hdrdir)/ruby/internal/attr/packed_struct.h
+append.o: $(hdrdir)/ruby/internal/attr/pure.h
+append.o: $(hdrdir)/ruby/internal/attr/restrict.h
+append.o: $(hdrdir)/ruby/internal/attr/returns_nonnull.h
+append.o: $(hdrdir)/ruby/internal/attr/warning.h
+append.o: $(hdrdir)/ruby/internal/attr/weakref.h
+append.o: $(hdrdir)/ruby/internal/cast.h
+append.o: $(hdrdir)/ruby/internal/compiler_is.h
+append.o: $(hdrdir)/ruby/internal/compiler_is/apple.h
+append.o: $(hdrdir)/ruby/internal/compiler_is/clang.h
+append.o: $(hdrdir)/ruby/internal/compiler_is/gcc.h
+append.o: $(hdrdir)/ruby/internal/compiler_is/intel.h
+append.o: $(hdrdir)/ruby/internal/compiler_is/msvc.h
+append.o: $(hdrdir)/ruby/internal/compiler_is/sunpro.h
+append.o: $(hdrdir)/ruby/internal/compiler_since.h
+append.o: $(hdrdir)/ruby/internal/config.h
+append.o: $(hdrdir)/ruby/internal/constant_p.h
+append.o: $(hdrdir)/ruby/internal/core.h
+append.o: $(hdrdir)/ruby/internal/core/rarray.h
+append.o: $(hdrdir)/ruby/internal/core/rbasic.h
+append.o: $(hdrdir)/ruby/internal/core/rbignum.h
+append.o: $(hdrdir)/ruby/internal/core/rclass.h
+append.o: $(hdrdir)/ruby/internal/core/rdata.h
+append.o: $(hdrdir)/ruby/internal/core/rfile.h
+append.o: $(hdrdir)/ruby/internal/core/rhash.h
+append.o: $(hdrdir)/ruby/internal/core/robject.h
+append.o: $(hdrdir)/ruby/internal/core/rregexp.h
+append.o: $(hdrdir)/ruby/internal/core/rstring.h
+append.o: $(hdrdir)/ruby/internal/core/rstruct.h
+append.o: $(hdrdir)/ruby/internal/core/rtypeddata.h
+append.o: $(hdrdir)/ruby/internal/ctype.h
+append.o: $(hdrdir)/ruby/internal/dllexport.h
+append.o: $(hdrdir)/ruby/internal/dosish.h
+append.o: $(hdrdir)/ruby/internal/encoding/coderange.h
+append.o: $(hdrdir)/ruby/internal/encoding/ctype.h
+append.o: $(hdrdir)/ruby/internal/encoding/encoding.h
+append.o: $(hdrdir)/ruby/internal/encoding/pathname.h
+append.o: $(hdrdir)/ruby/internal/encoding/re.h
+append.o: $(hdrdir)/ruby/internal/encoding/sprintf.h
+append.o: $(hdrdir)/ruby/internal/encoding/string.h
+append.o: $(hdrdir)/ruby/internal/encoding/symbol.h
+append.o: $(hdrdir)/ruby/internal/encoding/transcode.h
+append.o: $(hdrdir)/ruby/internal/error.h
+append.o: $(hdrdir)/ruby/internal/eval.h
+append.o: $(hdrdir)/ruby/internal/event.h
+append.o: $(hdrdir)/ruby/internal/fl_type.h
+append.o: $(hdrdir)/ruby/internal/gc.h
+append.o: $(hdrdir)/ruby/internal/glob.h
+append.o: $(hdrdir)/ruby/internal/globals.h
+append.o: $(hdrdir)/ruby/internal/has/attribute.h
+append.o: $(hdrdir)/ruby/internal/has/builtin.h
+append.o: $(hdrdir)/ruby/internal/has/c_attribute.h
+append.o: $(hdrdir)/ruby/internal/has/cpp_attribute.h
+append.o: $(hdrdir)/ruby/internal/has/declspec_attribute.h
+append.o: $(hdrdir)/ruby/internal/has/extension.h
+append.o: $(hdrdir)/ruby/internal/has/feature.h
+append.o: $(hdrdir)/ruby/internal/has/warning.h
+append.o: $(hdrdir)/ruby/internal/intern/array.h
+append.o: $(hdrdir)/ruby/internal/intern/bignum.h
+append.o: $(hdrdir)/ruby/internal/intern/class.h
+append.o: $(hdrdir)/ruby/internal/intern/compar.h
+append.o: $(hdrdir)/ruby/internal/intern/complex.h
+append.o: $(hdrdir)/ruby/internal/intern/cont.h
+append.o: $(hdrdir)/ruby/internal/intern/dir.h
+append.o: $(hdrdir)/ruby/internal/intern/enum.h
+append.o: $(hdrdir)/ruby/internal/intern/enumerator.h
+append.o: $(hdrdir)/ruby/internal/intern/error.h
+append.o: $(hdrdir)/ruby/internal/intern/eval.h
+append.o: $(hdrdir)/ruby/internal/intern/file.h
+append.o: $(hdrdir)/ruby/internal/intern/hash.h
+append.o: $(hdrdir)/ruby/internal/intern/io.h
+append.o: $(hdrdir)/ruby/internal/intern/load.h
+append.o: $(hdrdir)/ruby/internal/intern/marshal.h
+append.o: $(hdrdir)/ruby/internal/intern/numeric.h
+append.o: $(hdrdir)/ruby/internal/intern/object.h
+append.o: $(hdrdir)/ruby/internal/intern/parse.h
+append.o: $(hdrdir)/ruby/internal/intern/proc.h
+append.o: $(hdrdir)/ruby/internal/intern/process.h
+append.o: $(hdrdir)/ruby/internal/intern/random.h
+append.o: $(hdrdir)/ruby/internal/intern/range.h
+append.o: $(hdrdir)/ruby/internal/intern/rational.h
+append.o: $(hdrdir)/ruby/internal/intern/re.h
+append.o: $(hdrdir)/ruby/internal/intern/ruby.h
+append.o: $(hdrdir)/ruby/internal/intern/select.h
+append.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+append.o: $(hdrdir)/ruby/internal/intern/set.h
+append.o: $(hdrdir)/ruby/internal/intern/signal.h
+append.o: $(hdrdir)/ruby/internal/intern/sprintf.h
+append.o: $(hdrdir)/ruby/internal/intern/string.h
+append.o: $(hdrdir)/ruby/internal/intern/struct.h
+append.o: $(hdrdir)/ruby/internal/intern/thread.h
+append.o: $(hdrdir)/ruby/internal/intern/time.h
+append.o: $(hdrdir)/ruby/internal/intern/variable.h
+append.o: $(hdrdir)/ruby/internal/intern/vm.h
+append.o: $(hdrdir)/ruby/internal/interpreter.h
+append.o: $(hdrdir)/ruby/internal/iterator.h
+append.o: $(hdrdir)/ruby/internal/memory.h
+append.o: $(hdrdir)/ruby/internal/method.h
+append.o: $(hdrdir)/ruby/internal/module.h
+append.o: $(hdrdir)/ruby/internal/newobj.h
+append.o: $(hdrdir)/ruby/internal/scan_args.h
+append.o: $(hdrdir)/ruby/internal/special_consts.h
+append.o: $(hdrdir)/ruby/internal/static_assert.h
+append.o: $(hdrdir)/ruby/internal/stdalign.h
+append.o: $(hdrdir)/ruby/internal/stdbool.h
+append.o: $(hdrdir)/ruby/internal/stdckdint.h
+append.o: $(hdrdir)/ruby/internal/symbol.h
+append.o: $(hdrdir)/ruby/internal/value.h
+append.o: $(hdrdir)/ruby/internal/value_type.h
+append.o: $(hdrdir)/ruby/internal/variable.h
+append.o: $(hdrdir)/ruby/internal/warning_push.h
+append.o: $(hdrdir)/ruby/internal/xmalloc.h
+append.o: $(hdrdir)/ruby/missing.h
+append.o: $(hdrdir)/ruby/onigmo.h
+append.o: $(hdrdir)/ruby/oniguruma.h
+append.o: $(hdrdir)/ruby/ruby.h
+append.o: $(hdrdir)/ruby/st.h
+append.o: $(hdrdir)/ruby/subst.h
+append.o: append.c
+init.o: $(RUBY_EXTCONF_H)
+init.o: $(arch_hdrdir)/ruby/config.h
+init.o: $(hdrdir)/ruby.h
+init.o: $(hdrdir)/ruby/assert.h
+init.o: $(hdrdir)/ruby/backward.h
+init.o: $(hdrdir)/ruby/backward/2/assume.h
+init.o: $(hdrdir)/ruby/backward/2/attributes.h
+init.o: $(hdrdir)/ruby/backward/2/bool.h
+init.o: $(hdrdir)/ruby/backward/2/inttypes.h
+init.o: $(hdrdir)/ruby/backward/2/limits.h
+init.o: $(hdrdir)/ruby/backward/2/long_long.h
+init.o: $(hdrdir)/ruby/backward/2/stdalign.h
+init.o: $(hdrdir)/ruby/backward/2/stdarg.h
+init.o: $(hdrdir)/ruby/defines.h
+init.o: $(hdrdir)/ruby/intern.h
+init.o: $(hdrdir)/ruby/internal/abi.h
+init.o: $(hdrdir)/ruby/internal/anyargs.h
+init.o: $(hdrdir)/ruby/internal/arithmetic.h
+init.o: $(hdrdir)/ruby/internal/arithmetic/char.h
+init.o: $(hdrdir)/ruby/internal/arithmetic/double.h
+init.o: $(hdrdir)/ruby/internal/arithmetic/fixnum.h
+init.o: $(hdrdir)/ruby/internal/arithmetic/gid_t.h
+init.o: $(hdrdir)/ruby/internal/arithmetic/int.h
+init.o: $(hdrdir)/ruby/internal/arithmetic/intptr_t.h
+init.o: $(hdrdir)/ruby/internal/arithmetic/long.h
+init.o: $(hdrdir)/ruby/internal/arithmetic/long_long.h
+init.o: $(hdrdir)/ruby/internal/arithmetic/mode_t.h
+init.o: $(hdrdir)/ruby/internal/arithmetic/off_t.h
+init.o: $(hdrdir)/ruby/internal/arithmetic/pid_t.h
+init.o: $(hdrdir)/ruby/internal/arithmetic/short.h
+init.o: $(hdrdir)/ruby/internal/arithmetic/size_t.h
+init.o: $(hdrdir)/ruby/internal/arithmetic/st_data_t.h
+init.o: $(hdrdir)/ruby/internal/arithmetic/uid_t.h
+init.o: $(hdrdir)/ruby/internal/assume.h
+init.o: $(hdrdir)/ruby/internal/attr/alloc_size.h
+init.o: $(hdrdir)/ruby/internal/attr/artificial.h
+init.o: $(hdrdir)/ruby/internal/attr/cold.h
+init.o: $(hdrdir)/ruby/internal/attr/const.h
+init.o: $(hdrdir)/ruby/internal/attr/constexpr.h
+init.o: $(hdrdir)/ruby/internal/attr/deprecated.h
+init.o: $(hdrdir)/ruby/internal/attr/diagnose_if.h
+init.o: $(hdrdir)/ruby/internal/attr/enum_extensibility.h
+init.o: $(hdrdir)/ruby/internal/attr/error.h
+init.o: $(hdrdir)/ruby/internal/attr/flag_enum.h
+init.o: $(hdrdir)/ruby/internal/attr/forceinline.h
+init.o: $(hdrdir)/ruby/internal/attr/format.h
+init.o: $(hdrdir)/ruby/internal/attr/maybe_unused.h
+init.o: $(hdrdir)/ruby/internal/attr/noalias.h
+init.o: $(hdrdir)/ruby/internal/attr/nodiscard.h
+init.o: $(hdrdir)/ruby/internal/attr/noexcept.h
+init.o: $(hdrdir)/ruby/internal/attr/noinline.h
+init.o: $(hdrdir)/ruby/internal/attr/nonnull.h
+init.o: $(hdrdir)/ruby/internal/attr/noreturn.h
+init.o: $(hdrdir)/ruby/internal/attr/packed_struct.h
+init.o: $(hdrdir)/ruby/internal/attr/pure.h
+init.o: $(hdrdir)/ruby/internal/attr/restrict.h
+init.o: $(hdrdir)/ruby/internal/attr/returns_nonnull.h
+init.o: $(hdrdir)/ruby/internal/attr/warning.h
+init.o: $(hdrdir)/ruby/internal/attr/weakref.h
+init.o: $(hdrdir)/ruby/internal/cast.h
+init.o: $(hdrdir)/ruby/internal/compiler_is.h
+init.o: $(hdrdir)/ruby/internal/compiler_is/apple.h
+init.o: $(hdrdir)/ruby/internal/compiler_is/clang.h
+init.o: $(hdrdir)/ruby/internal/compiler_is/gcc.h
+init.o: $(hdrdir)/ruby/internal/compiler_is/intel.h
+init.o: $(hdrdir)/ruby/internal/compiler_is/msvc.h
+init.o: $(hdrdir)/ruby/internal/compiler_is/sunpro.h
+init.o: $(hdrdir)/ruby/internal/compiler_since.h
+init.o: $(hdrdir)/ruby/internal/config.h
+init.o: $(hdrdir)/ruby/internal/constant_p.h
+init.o: $(hdrdir)/ruby/internal/core.h
+init.o: $(hdrdir)/ruby/internal/core/rarray.h
+init.o: $(hdrdir)/ruby/internal/core/rbasic.h
+init.o: $(hdrdir)/ruby/internal/core/rbignum.h
+init.o: $(hdrdir)/ruby/internal/core/rclass.h
+init.o: $(hdrdir)/ruby/internal/core/rdata.h
+init.o: $(hdrdir)/ruby/internal/core/rfile.h
+init.o: $(hdrdir)/ruby/internal/core/rhash.h
+init.o: $(hdrdir)/ruby/internal/core/robject.h
+init.o: $(hdrdir)/ruby/internal/core/rregexp.h
+init.o: $(hdrdir)/ruby/internal/core/rstring.h
+init.o: $(hdrdir)/ruby/internal/core/rstruct.h
+init.o: $(hdrdir)/ruby/internal/core/rtypeddata.h
+init.o: $(hdrdir)/ruby/internal/ctype.h
+init.o: $(hdrdir)/ruby/internal/dllexport.h
+init.o: $(hdrdir)/ruby/internal/dosish.h
+init.o: $(hdrdir)/ruby/internal/error.h
+init.o: $(hdrdir)/ruby/internal/eval.h
+init.o: $(hdrdir)/ruby/internal/event.h
+init.o: $(hdrdir)/ruby/internal/fl_type.h
+init.o: $(hdrdir)/ruby/internal/gc.h
+init.o: $(hdrdir)/ruby/internal/glob.h
+init.o: $(hdrdir)/ruby/internal/globals.h
+init.o: $(hdrdir)/ruby/internal/has/attribute.h
+init.o: $(hdrdir)/ruby/internal/has/builtin.h
+init.o: $(hdrdir)/ruby/internal/has/c_attribute.h
+init.o: $(hdrdir)/ruby/internal/has/cpp_attribute.h
+init.o: $(hdrdir)/ruby/internal/has/declspec_attribute.h
+init.o: $(hdrdir)/ruby/internal/has/extension.h
+init.o: $(hdrdir)/ruby/internal/has/feature.h
+init.o: $(hdrdir)/ruby/internal/has/warning.h
+init.o: $(hdrdir)/ruby/internal/intern/array.h
+init.o: $(hdrdir)/ruby/internal/intern/bignum.h
+init.o: $(hdrdir)/ruby/internal/intern/class.h
+init.o: $(hdrdir)/ruby/internal/intern/compar.h
+init.o: $(hdrdir)/ruby/internal/intern/complex.h
+init.o: $(hdrdir)/ruby/internal/intern/cont.h
+init.o: $(hdrdir)/ruby/internal/intern/dir.h
+init.o: $(hdrdir)/ruby/internal/intern/enum.h
+init.o: $(hdrdir)/ruby/internal/intern/enumerator.h
+init.o: $(hdrdir)/ruby/internal/intern/error.h
+init.o: $(hdrdir)/ruby/internal/intern/eval.h
+init.o: $(hdrdir)/ruby/internal/intern/file.h
+init.o: $(hdrdir)/ruby/internal/intern/hash.h
+init.o: $(hdrdir)/ruby/internal/intern/io.h
+init.o: $(hdrdir)/ruby/internal/intern/load.h
+init.o: $(hdrdir)/ruby/internal/intern/marshal.h
+init.o: $(hdrdir)/ruby/internal/intern/numeric.h
+init.o: $(hdrdir)/ruby/internal/intern/object.h
+init.o: $(hdrdir)/ruby/internal/intern/parse.h
+init.o: $(hdrdir)/ruby/internal/intern/proc.h
+init.o: $(hdrdir)/ruby/internal/intern/process.h
+init.o: $(hdrdir)/ruby/internal/intern/random.h
+init.o: $(hdrdir)/ruby/internal/intern/range.h
+init.o: $(hdrdir)/ruby/internal/intern/rational.h
+init.o: $(hdrdir)/ruby/internal/intern/re.h
+init.o: $(hdrdir)/ruby/internal/intern/ruby.h
+init.o: $(hdrdir)/ruby/internal/intern/select.h
+init.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+init.o: $(hdrdir)/ruby/internal/intern/set.h
+init.o: $(hdrdir)/ruby/internal/intern/signal.h
+init.o: $(hdrdir)/ruby/internal/intern/sprintf.h
+init.o: $(hdrdir)/ruby/internal/intern/string.h
+init.o: $(hdrdir)/ruby/internal/intern/struct.h
+init.o: $(hdrdir)/ruby/internal/intern/thread.h
+init.o: $(hdrdir)/ruby/internal/intern/time.h
+init.o: $(hdrdir)/ruby/internal/intern/variable.h
+init.o: $(hdrdir)/ruby/internal/intern/vm.h
+init.o: $(hdrdir)/ruby/internal/interpreter.h
+init.o: $(hdrdir)/ruby/internal/iterator.h
+init.o: $(hdrdir)/ruby/internal/memory.h
+init.o: $(hdrdir)/ruby/internal/method.h
+init.o: $(hdrdir)/ruby/internal/module.h
+init.o: $(hdrdir)/ruby/internal/newobj.h
+init.o: $(hdrdir)/ruby/internal/scan_args.h
+init.o: $(hdrdir)/ruby/internal/special_consts.h
+init.o: $(hdrdir)/ruby/internal/static_assert.h
+init.o: $(hdrdir)/ruby/internal/stdalign.h
+init.o: $(hdrdir)/ruby/internal/stdbool.h
+init.o: $(hdrdir)/ruby/internal/stdckdint.h
+init.o: $(hdrdir)/ruby/internal/symbol.h
+init.o: $(hdrdir)/ruby/internal/value.h
+init.o: $(hdrdir)/ruby/internal/value_type.h
+init.o: $(hdrdir)/ruby/internal/variable.h
+init.o: $(hdrdir)/ruby/internal/warning_push.h
+init.o: $(hdrdir)/ruby/internal/xmalloc.h
+init.o: $(hdrdir)/ruby/missing.h
+init.o: $(hdrdir)/ruby/ruby.h
+init.o: $(hdrdir)/ruby/st.h
+init.o: $(hdrdir)/ruby/subst.h
+init.o: init.c
+# AUTOGENERATED DEPENDENCIES END
diff --git a/ext/-test-/ensure_and_callcc/depend b/ext/-test-/ensure_and_callcc/depend
new file mode 100644
index 00000000000000..54431847a687bf
--- /dev/null
+++ b/ext/-test-/ensure_and_callcc/depend
@@ -0,0 +1,163 @@
+# AUTOGENERATED DEPENDENCIES START
+ensure_and_callcc.o: $(RUBY_EXTCONF_H)
+ensure_and_callcc.o: $(arch_hdrdir)/ruby/config.h
+ensure_and_callcc.o: $(hdrdir)/ruby.h
+ensure_and_callcc.o: $(hdrdir)/ruby/assert.h
+ensure_and_callcc.o: $(hdrdir)/ruby/backward.h
+ensure_and_callcc.o: $(hdrdir)/ruby/backward/2/assume.h
+ensure_and_callcc.o: $(hdrdir)/ruby/backward/2/attributes.h
+ensure_and_callcc.o: $(hdrdir)/ruby/backward/2/bool.h
+ensure_and_callcc.o: $(hdrdir)/ruby/backward/2/inttypes.h
+ensure_and_callcc.o: $(hdrdir)/ruby/backward/2/limits.h
+ensure_and_callcc.o: $(hdrdir)/ruby/backward/2/long_long.h
+ensure_and_callcc.o: $(hdrdir)/ruby/backward/2/stdalign.h
+ensure_and_callcc.o: $(hdrdir)/ruby/backward/2/stdarg.h
+ensure_and_callcc.o: $(hdrdir)/ruby/defines.h
+ensure_and_callcc.o: $(hdrdir)/ruby/intern.h
+ensure_and_callcc.o: $(hdrdir)/ruby/internal/abi.h
+ensure_and_callcc.o: $(hdrdir)/ruby/internal/anyargs.h
+ensure_and_callcc.o: $(hdrdir)/ruby/internal/arithmetic.h
+ensure_and_callcc.o: $(hdrdir)/ruby/internal/arithmetic/char.h
+ensure_and_callcc.o: $(hdrdir)/ruby/internal/arithmetic/double.h
+ensure_and_callcc.o: $(hdrdir)/ruby/internal/arithmetic/fixnum.h
+ensure_and_callcc.o: $(hdrdir)/ruby/internal/arithmetic/gid_t.h
+ensure_and_callcc.o: $(hdrdir)/ruby/internal/arithmetic/int.h
+ensure_and_callcc.o: $(hdrdir)/ruby/internal/arithmetic/intptr_t.h
+ensure_and_callcc.o: $(hdrdir)/ruby/internal/arithmetic/long.h
+ensure_and_callcc.o: $(hdrdir)/ruby/internal/arithmetic/long_long.h
+ensure_and_callcc.o: $(hdrdir)/ruby/internal/arithmetic/mode_t.h
+ensure_and_callcc.o: $(hdrdir)/ruby/internal/arithmetic/off_t.h
+ensure_and_callcc.o: $(hdrdir)/ruby/internal/arithmetic/pid_t.h
+ensure_and_callcc.o: $(hdrdir)/ruby/internal/arithmetic/short.h
+ensure_and_callcc.o: $(hdrdir)/ruby/internal/arithmetic/size_t.h
+ensure_and_callcc.o: $(hdrdir)/ruby/internal/arithmetic/st_data_t.h
+ensure_and_callcc.o: $(hdrdir)/ruby/internal/arithmetic/uid_t.h
+ensure_and_callcc.o: $(hdrdir)/ruby/internal/assume.h
+ensure_and_callcc.o: $(hdrdir)/ruby/internal/attr/alloc_size.h
+ensure_and_callcc.o: $(hdrdir)/ruby/internal/attr/artificial.h
+ensure_and_callcc.o: $(hdrdir)/ruby/internal/attr/cold.h
+ensure_and_callcc.o: $(hdrdir)/ruby/internal/attr/const.h
+ensure_and_callcc.o: $(hdrdir)/ruby/internal/attr/constexpr.h
+ensure_and_callcc.o: $(hdrdir)/ruby/internal/attr/deprecated.h
+ensure_and_callcc.o: $(hdrdir)/ruby/internal/attr/diagnose_if.h
+ensure_and_callcc.o: $(hdrdir)/ruby/internal/attr/enum_extensibility.h
+ensure_and_callcc.o: $(hdrdir)/ruby/internal/attr/error.h
+ensure_and_callcc.o: $(hdrdir)/ruby/internal/attr/flag_enum.h
+ensure_and_callcc.o: $(hdrdir)/ruby/internal/attr/forceinline.h
+ensure_and_callcc.o: $(hdrdir)/ruby/internal/attr/format.h
+ensure_and_callcc.o: $(hdrdir)/ruby/internal/attr/maybe_unused.h
+ensure_and_callcc.o: $(hdrdir)/ruby/internal/attr/noalias.h
+ensure_and_callcc.o: $(hdrdir)/ruby/internal/attr/nodiscard.h
+ensure_and_callcc.o: $(hdrdir)/ruby/internal/attr/noexcept.h
+ensure_and_callcc.o: $(hdrdir)/ruby/internal/attr/noinline.h
+ensure_and_callcc.o: $(hdrdir)/ruby/internal/attr/nonnull.h
+ensure_and_callcc.o: $(hdrdir)/ruby/internal/attr/noreturn.h
+ensure_and_callcc.o: $(hdrdir)/ruby/internal/attr/packed_struct.h
+ensure_and_callcc.o: $(hdrdir)/ruby/internal/attr/pure.h
+ensure_and_callcc.o: $(hdrdir)/ruby/internal/attr/restrict.h
+ensure_and_callcc.o: $(hdrdir)/ruby/internal/attr/returns_nonnull.h
+ensure_and_callcc.o: $(hdrdir)/ruby/internal/attr/warning.h
+ensure_and_callcc.o: $(hdrdir)/ruby/internal/attr/weakref.h
+ensure_and_callcc.o: $(hdrdir)/ruby/internal/cast.h
+ensure_and_callcc.o: $(hdrdir)/ruby/internal/compiler_is.h
+ensure_and_callcc.o: $(hdrdir)/ruby/internal/compiler_is/apple.h
+ensure_and_callcc.o: $(hdrdir)/ruby/internal/compiler_is/clang.h
+ensure_and_callcc.o: $(hdrdir)/ruby/internal/compiler_is/gcc.h
+ensure_and_callcc.o: $(hdrdir)/ruby/internal/compiler_is/intel.h
+ensure_and_callcc.o: $(hdrdir)/ruby/internal/compiler_is/msvc.h
+ensure_and_callcc.o: $(hdrdir)/ruby/internal/compiler_is/sunpro.h
+ensure_and_callcc.o: $(hdrdir)/ruby/internal/compiler_since.h
+ensure_and_callcc.o: $(hdrdir)/ruby/internal/config.h
+ensure_and_callcc.o: $(hdrdir)/ruby/internal/constant_p.h
+ensure_and_callcc.o: $(hdrdir)/ruby/internal/core.h
+ensure_and_callcc.o: $(hdrdir)/ruby/internal/core/rarray.h
+ensure_and_callcc.o: $(hdrdir)/ruby/internal/core/rbasic.h
+ensure_and_callcc.o: $(hdrdir)/ruby/internal/core/rbignum.h
+ensure_and_callcc.o: $(hdrdir)/ruby/internal/core/rclass.h
+ensure_and_callcc.o: $(hdrdir)/ruby/internal/core/rdata.h
+ensure_and_callcc.o: $(hdrdir)/ruby/internal/core/rfile.h
+ensure_and_callcc.o: $(hdrdir)/ruby/internal/core/rhash.h
+ensure_and_callcc.o: $(hdrdir)/ruby/internal/core/robject.h
+ensure_and_callcc.o: $(hdrdir)/ruby/internal/core/rregexp.h
+ensure_and_callcc.o: $(hdrdir)/ruby/internal/core/rstring.h
+ensure_and_callcc.o: $(hdrdir)/ruby/internal/core/rstruct.h
+ensure_and_callcc.o: $(hdrdir)/ruby/internal/core/rtypeddata.h
+ensure_and_callcc.o: $(hdrdir)/ruby/internal/ctype.h
+ensure_and_callcc.o: $(hdrdir)/ruby/internal/dllexport.h
+ensure_and_callcc.o: $(hdrdir)/ruby/internal/dosish.h
+ensure_and_callcc.o: $(hdrdir)/ruby/internal/error.h
+ensure_and_callcc.o: $(hdrdir)/ruby/internal/eval.h
+ensure_and_callcc.o: $(hdrdir)/ruby/internal/event.h
+ensure_and_callcc.o: $(hdrdir)/ruby/internal/fl_type.h
+ensure_and_callcc.o: $(hdrdir)/ruby/internal/gc.h
+ensure_and_callcc.o: $(hdrdir)/ruby/internal/glob.h
+ensure_and_callcc.o: $(hdrdir)/ruby/internal/globals.h
+ensure_and_callcc.o: $(hdrdir)/ruby/internal/has/attribute.h
+ensure_and_callcc.o: $(hdrdir)/ruby/internal/has/builtin.h
+ensure_and_callcc.o: $(hdrdir)/ruby/internal/has/c_attribute.h
+ensure_and_callcc.o: $(hdrdir)/ruby/internal/has/cpp_attribute.h
+ensure_and_callcc.o: $(hdrdir)/ruby/internal/has/declspec_attribute.h
+ensure_and_callcc.o: $(hdrdir)/ruby/internal/has/extension.h
+ensure_and_callcc.o: $(hdrdir)/ruby/internal/has/feature.h
+ensure_and_callcc.o: $(hdrdir)/ruby/internal/has/warning.h
+ensure_and_callcc.o: $(hdrdir)/ruby/internal/intern/array.h
+ensure_and_callcc.o: $(hdrdir)/ruby/internal/intern/bignum.h
+ensure_and_callcc.o: $(hdrdir)/ruby/internal/intern/class.h
+ensure_and_callcc.o: $(hdrdir)/ruby/internal/intern/compar.h
+ensure_and_callcc.o: $(hdrdir)/ruby/internal/intern/complex.h
+ensure_and_callcc.o: $(hdrdir)/ruby/internal/intern/cont.h
+ensure_and_callcc.o: $(hdrdir)/ruby/internal/intern/dir.h
+ensure_and_callcc.o: $(hdrdir)/ruby/internal/intern/enum.h
+ensure_and_callcc.o: $(hdrdir)/ruby/internal/intern/enumerator.h
+ensure_and_callcc.o: $(hdrdir)/ruby/internal/intern/error.h
+ensure_and_callcc.o: $(hdrdir)/ruby/internal/intern/eval.h
+ensure_and_callcc.o: $(hdrdir)/ruby/internal/intern/file.h
+ensure_and_callcc.o: $(hdrdir)/ruby/internal/intern/hash.h
+ensure_and_callcc.o: $(hdrdir)/ruby/internal/intern/io.h
+ensure_and_callcc.o: $(hdrdir)/ruby/internal/intern/load.h
+ensure_and_callcc.o: $(hdrdir)/ruby/internal/intern/marshal.h
+ensure_and_callcc.o: $(hdrdir)/ruby/internal/intern/numeric.h
+ensure_and_callcc.o: $(hdrdir)/ruby/internal/intern/object.h
+ensure_and_callcc.o: $(hdrdir)/ruby/internal/intern/parse.h
+ensure_and_callcc.o: $(hdrdir)/ruby/internal/intern/proc.h
+ensure_and_callcc.o: $(hdrdir)/ruby/internal/intern/process.h
+ensure_and_callcc.o: $(hdrdir)/ruby/internal/intern/random.h
+ensure_and_callcc.o: $(hdrdir)/ruby/internal/intern/range.h
+ensure_and_callcc.o: $(hdrdir)/ruby/internal/intern/rational.h
+ensure_and_callcc.o: $(hdrdir)/ruby/internal/intern/re.h
+ensure_and_callcc.o: $(hdrdir)/ruby/internal/intern/ruby.h
+ensure_and_callcc.o: $(hdrdir)/ruby/internal/intern/select.h
+ensure_and_callcc.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+ensure_and_callcc.o: $(hdrdir)/ruby/internal/intern/set.h
+ensure_and_callcc.o: $(hdrdir)/ruby/internal/intern/signal.h
+ensure_and_callcc.o: $(hdrdir)/ruby/internal/intern/sprintf.h
+ensure_and_callcc.o: $(hdrdir)/ruby/internal/intern/string.h
+ensure_and_callcc.o: $(hdrdir)/ruby/internal/intern/struct.h
+ensure_and_callcc.o: $(hdrdir)/ruby/internal/intern/thread.h
+ensure_and_callcc.o: $(hdrdir)/ruby/internal/intern/time.h
+ensure_and_callcc.o: $(hdrdir)/ruby/internal/intern/variable.h
+ensure_and_callcc.o: $(hdrdir)/ruby/internal/intern/vm.h
+ensure_and_callcc.o: $(hdrdir)/ruby/internal/interpreter.h
+ensure_and_callcc.o: $(hdrdir)/ruby/internal/iterator.h
+ensure_and_callcc.o: $(hdrdir)/ruby/internal/memory.h
+ensure_and_callcc.o: $(hdrdir)/ruby/internal/method.h
+ensure_and_callcc.o: $(hdrdir)/ruby/internal/module.h
+ensure_and_callcc.o: $(hdrdir)/ruby/internal/newobj.h
+ensure_and_callcc.o: $(hdrdir)/ruby/internal/scan_args.h
+ensure_and_callcc.o: $(hdrdir)/ruby/internal/special_consts.h
+ensure_and_callcc.o: $(hdrdir)/ruby/internal/static_assert.h
+ensure_and_callcc.o: $(hdrdir)/ruby/internal/stdalign.h
+ensure_and_callcc.o: $(hdrdir)/ruby/internal/stdbool.h
+ensure_and_callcc.o: $(hdrdir)/ruby/internal/stdckdint.h
+ensure_and_callcc.o: $(hdrdir)/ruby/internal/symbol.h
+ensure_and_callcc.o: $(hdrdir)/ruby/internal/value.h
+ensure_and_callcc.o: $(hdrdir)/ruby/internal/value_type.h
+ensure_and_callcc.o: $(hdrdir)/ruby/internal/variable.h
+ensure_and_callcc.o: $(hdrdir)/ruby/internal/warning_push.h
+ensure_and_callcc.o: $(hdrdir)/ruby/internal/xmalloc.h
+ensure_and_callcc.o: $(hdrdir)/ruby/missing.h
+ensure_and_callcc.o: $(hdrdir)/ruby/ruby.h
+ensure_and_callcc.o: $(hdrdir)/ruby/st.h
+ensure_and_callcc.o: $(hdrdir)/ruby/subst.h
+ensure_and_callcc.o: ensure_and_callcc.c
+# AUTOGENERATED DEPENDENCIES END
diff --git a/ext/-test-/ensure_and_callcc/ensure_and_callcc.c b/ext/-test-/ensure_and_callcc/ensure_and_callcc.c
new file mode 100644
index 00000000000000..1a92de69c37854
--- /dev/null
+++ b/ext/-test-/ensure_and_callcc/ensure_and_callcc.c
@@ -0,0 +1,58 @@
+#include "ruby.h"
+
+static VALUE rb_mEnsureAndCallcc;
+
+struct require_data {
+    VALUE obj;
+    VALUE fname;
+};
+
+static VALUE
+call_require(VALUE arg)
+{
+    struct require_data *data = (struct require_data *)arg;
+    rb_f_require(data->obj, data->fname);
+    return Qnil;
+}
+
+static VALUE
+call_ensure(VALUE _)
+{
+    VALUE v = rb_iv_get(rb_mEnsureAndCallcc, "@ensure_called");
+    int called = FIX2INT(v) + 1;
+    rb_iv_set(rb_mEnsureAndCallcc, "@ensure_called", INT2FIX(called));
+    return Qnil;
+}
+
+static VALUE
+require_with_ensure(VALUE self, VALUE fname)
+{
+    struct require_data data = {
+        .obj = self,
+        .fname = fname
+    };
+    return rb_ensure(call_require, (VALUE)&data, call_ensure, Qnil);
+}
+
+static VALUE
+ensure_called(VALUE self)
+{
+    return rb_iv_get(rb_mEnsureAndCallcc, "@ensure_called");
+}
+
+static VALUE
+reset(VALUE self)
+{
+    rb_iv_set(rb_mEnsureAndCallcc, "@ensure_called", INT2FIX(0));
+    return Qnil;
+}
+
+void
+Init_ensure_and_callcc(void)
+{
+    rb_mEnsureAndCallcc = rb_define_module("EnsureAndCallcc");
+    rb_iv_set(rb_mEnsureAndCallcc, "@ensure_called", INT2FIX(0));
+    rb_define_singleton_method(rb_mEnsureAndCallcc, "reset", reset, 0);
+    rb_define_singleton_method(rb_mEnsureAndCallcc, "ensure_called", ensure_called, 0);
+    rb_define_singleton_method(rb_mEnsureAndCallcc, "require_with_ensure", require_with_ensure, 1);
+}
diff --git a/ext/-test-/ensure_and_callcc/extconf.rb b/ext/-test-/ensure_and_callcc/extconf.rb
new file mode 100644
index 00000000000000..123b80b8d02470
--- /dev/null
+++ b/ext/-test-/ensure_and_callcc/extconf.rb
@@ -0,0 +1,5 @@
+# frozen_string_literal: false
+require "mkmf"
+
+require_relative "../auto_ext.rb"
+auto_ext(inc: true)
diff --git a/ext/-test-/enumerator_kw/depend b/ext/-test-/enumerator_kw/depend
index 49ea4954213bae..b6d2f0a9989788 100644
--- a/ext/-test-/enumerator_kw/depend
+++ b/ext/-test-/enumerator_kw/depend
@@ -128,6 +128,7 @@ enumerator_kw.o: $(hdrdir)/ruby/internal/intern/re.h
 enumerator_kw.o: $(hdrdir)/ruby/internal/intern/ruby.h
 enumerator_kw.o: $(hdrdir)/ruby/internal/intern/select.h
 enumerator_kw.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+enumerator_kw.o: $(hdrdir)/ruby/internal/intern/set.h
 enumerator_kw.o: $(hdrdir)/ruby/internal/intern/signal.h
 enumerator_kw.o: $(hdrdir)/ruby/internal/intern/sprintf.h
 enumerator_kw.o: $(hdrdir)/ruby/internal/intern/string.h
@@ -147,6 +148,7 @@ enumerator_kw.o: $(hdrdir)/ruby/internal/special_consts.h
 enumerator_kw.o: $(hdrdir)/ruby/internal/static_assert.h
 enumerator_kw.o: $(hdrdir)/ruby/internal/stdalign.h
 enumerator_kw.o: $(hdrdir)/ruby/internal/stdbool.h
+enumerator_kw.o: $(hdrdir)/ruby/internal/stdckdint.h
 enumerator_kw.o: $(hdrdir)/ruby/internal/symbol.h
 enumerator_kw.o: $(hdrdir)/ruby/internal/value.h
 enumerator_kw.o: $(hdrdir)/ruby/internal/value_type.h
diff --git a/ext/-test-/eval/depend b/ext/-test-/eval/depend
new file mode 100644
index 00000000000000..03a1c7d7ef9bee
--- /dev/null
+++ b/ext/-test-/eval/depend
@@ -0,0 +1,162 @@
+# AUTOGENERATED DEPENDENCIES START
+eval.o: $(RUBY_EXTCONF_H)
+eval.o: $(arch_hdrdir)/ruby/config.h
+eval.o: $(hdrdir)/ruby/assert.h
+eval.o: $(hdrdir)/ruby/backward.h
+eval.o: $(hdrdir)/ruby/backward/2/assume.h
+eval.o: $(hdrdir)/ruby/backward/2/attributes.h
+eval.o: $(hdrdir)/ruby/backward/2/bool.h
+eval.o: $(hdrdir)/ruby/backward/2/inttypes.h
+eval.o: $(hdrdir)/ruby/backward/2/limits.h
+eval.o: $(hdrdir)/ruby/backward/2/long_long.h
+eval.o: $(hdrdir)/ruby/backward/2/stdalign.h
+eval.o: $(hdrdir)/ruby/backward/2/stdarg.h
+eval.o: $(hdrdir)/ruby/defines.h
+eval.o: $(hdrdir)/ruby/intern.h
+eval.o: $(hdrdir)/ruby/internal/abi.h
+eval.o: $(hdrdir)/ruby/internal/anyargs.h
+eval.o: $(hdrdir)/ruby/internal/arithmetic.h
+eval.o: $(hdrdir)/ruby/internal/arithmetic/char.h
+eval.o: $(hdrdir)/ruby/internal/arithmetic/double.h
+eval.o: $(hdrdir)/ruby/internal/arithmetic/fixnum.h
+eval.o: $(hdrdir)/ruby/internal/arithmetic/gid_t.h
+eval.o: $(hdrdir)/ruby/internal/arithmetic/int.h
+eval.o: $(hdrdir)/ruby/internal/arithmetic/intptr_t.h
+eval.o: $(hdrdir)/ruby/internal/arithmetic/long.h
+eval.o: $(hdrdir)/ruby/internal/arithmetic/long_long.h
+eval.o: $(hdrdir)/ruby/internal/arithmetic/mode_t.h
+eval.o: $(hdrdir)/ruby/internal/arithmetic/off_t.h
+eval.o: $(hdrdir)/ruby/internal/arithmetic/pid_t.h
+eval.o: $(hdrdir)/ruby/internal/arithmetic/short.h
+eval.o: $(hdrdir)/ruby/internal/arithmetic/size_t.h
+eval.o: $(hdrdir)/ruby/internal/arithmetic/st_data_t.h
+eval.o: $(hdrdir)/ruby/internal/arithmetic/uid_t.h
+eval.o: $(hdrdir)/ruby/internal/assume.h
+eval.o: $(hdrdir)/ruby/internal/attr/alloc_size.h
+eval.o: $(hdrdir)/ruby/internal/attr/artificial.h
+eval.o: $(hdrdir)/ruby/internal/attr/cold.h
+eval.o: $(hdrdir)/ruby/internal/attr/const.h
+eval.o: $(hdrdir)/ruby/internal/attr/constexpr.h
+eval.o: $(hdrdir)/ruby/internal/attr/deprecated.h
+eval.o: $(hdrdir)/ruby/internal/attr/diagnose_if.h
+eval.o: $(hdrdir)/ruby/internal/attr/enum_extensibility.h
+eval.o: $(hdrdir)/ruby/internal/attr/error.h
+eval.o: $(hdrdir)/ruby/internal/attr/flag_enum.h
+eval.o: $(hdrdir)/ruby/internal/attr/forceinline.h
+eval.o: $(hdrdir)/ruby/internal/attr/format.h
+eval.o: $(hdrdir)/ruby/internal/attr/maybe_unused.h
+eval.o: $(hdrdir)/ruby/internal/attr/noalias.h
+eval.o: $(hdrdir)/ruby/internal/attr/nodiscard.h
+eval.o: $(hdrdir)/ruby/internal/attr/noexcept.h
+eval.o: $(hdrdir)/ruby/internal/attr/noinline.h
+eval.o: $(hdrdir)/ruby/internal/attr/nonnull.h
+eval.o: $(hdrdir)/ruby/internal/attr/noreturn.h
+eval.o: $(hdrdir)/ruby/internal/attr/packed_struct.h
+eval.o: $(hdrdir)/ruby/internal/attr/pure.h
+eval.o: $(hdrdir)/ruby/internal/attr/restrict.h
+eval.o: $(hdrdir)/ruby/internal/attr/returns_nonnull.h
+eval.o: $(hdrdir)/ruby/internal/attr/warning.h
+eval.o: $(hdrdir)/ruby/internal/attr/weakref.h
+eval.o: $(hdrdir)/ruby/internal/cast.h
+eval.o: $(hdrdir)/ruby/internal/compiler_is.h
+eval.o: $(hdrdir)/ruby/internal/compiler_is/apple.h
+eval.o: $(hdrdir)/ruby/internal/compiler_is/clang.h
+eval.o: $(hdrdir)/ruby/internal/compiler_is/gcc.h
+eval.o: $(hdrdir)/ruby/internal/compiler_is/intel.h
+eval.o: $(hdrdir)/ruby/internal/compiler_is/msvc.h
+eval.o: $(hdrdir)/ruby/internal/compiler_is/sunpro.h
+eval.o: $(hdrdir)/ruby/internal/compiler_since.h
+eval.o: $(hdrdir)/ruby/internal/config.h
+eval.o: $(hdrdir)/ruby/internal/constant_p.h
+eval.o: $(hdrdir)/ruby/internal/core.h
+eval.o: $(hdrdir)/ruby/internal/core/rarray.h
+eval.o: $(hdrdir)/ruby/internal/core/rbasic.h
+eval.o: $(hdrdir)/ruby/internal/core/rbignum.h
+eval.o: $(hdrdir)/ruby/internal/core/rclass.h
+eval.o: $(hdrdir)/ruby/internal/core/rdata.h
+eval.o: $(hdrdir)/ruby/internal/core/rfile.h
+eval.o: $(hdrdir)/ruby/internal/core/rhash.h
+eval.o: $(hdrdir)/ruby/internal/core/robject.h
+eval.o: $(hdrdir)/ruby/internal/core/rregexp.h
+eval.o: $(hdrdir)/ruby/internal/core/rstring.h
+eval.o: $(hdrdir)/ruby/internal/core/rstruct.h
+eval.o: $(hdrdir)/ruby/internal/core/rtypeddata.h
+eval.o: $(hdrdir)/ruby/internal/ctype.h
+eval.o: $(hdrdir)/ruby/internal/dllexport.h
+eval.o: $(hdrdir)/ruby/internal/dosish.h
+eval.o: $(hdrdir)/ruby/internal/error.h
+eval.o: $(hdrdir)/ruby/internal/eval.h
+eval.o: $(hdrdir)/ruby/internal/event.h
+eval.o: $(hdrdir)/ruby/internal/fl_type.h
+eval.o: $(hdrdir)/ruby/internal/gc.h
+eval.o: $(hdrdir)/ruby/internal/glob.h
+eval.o: $(hdrdir)/ruby/internal/globals.h
+eval.o: $(hdrdir)/ruby/internal/has/attribute.h
+eval.o: $(hdrdir)/ruby/internal/has/builtin.h
+eval.o: $(hdrdir)/ruby/internal/has/c_attribute.h
+eval.o: $(hdrdir)/ruby/internal/has/cpp_attribute.h
+eval.o: $(hdrdir)/ruby/internal/has/declspec_attribute.h
+eval.o: $(hdrdir)/ruby/internal/has/extension.h
+eval.o: $(hdrdir)/ruby/internal/has/feature.h
+eval.o: $(hdrdir)/ruby/internal/has/warning.h
+eval.o: $(hdrdir)/ruby/internal/intern/array.h
+eval.o: $(hdrdir)/ruby/internal/intern/bignum.h
+eval.o: $(hdrdir)/ruby/internal/intern/class.h
+eval.o: $(hdrdir)/ruby/internal/intern/compar.h
+eval.o: $(hdrdir)/ruby/internal/intern/complex.h
+eval.o: $(hdrdir)/ruby/internal/intern/cont.h
+eval.o: $(hdrdir)/ruby/internal/intern/dir.h
+eval.o: $(hdrdir)/ruby/internal/intern/enum.h
+eval.o: $(hdrdir)/ruby/internal/intern/enumerator.h
+eval.o: $(hdrdir)/ruby/internal/intern/error.h
+eval.o: $(hdrdir)/ruby/internal/intern/eval.h
+eval.o: $(hdrdir)/ruby/internal/intern/file.h
+eval.o: $(hdrdir)/ruby/internal/intern/hash.h
+eval.o: $(hdrdir)/ruby/internal/intern/io.h
+eval.o: $(hdrdir)/ruby/internal/intern/load.h
+eval.o: $(hdrdir)/ruby/internal/intern/marshal.h
+eval.o: $(hdrdir)/ruby/internal/intern/numeric.h
+eval.o: $(hdrdir)/ruby/internal/intern/object.h
+eval.o: $(hdrdir)/ruby/internal/intern/parse.h
+eval.o: $(hdrdir)/ruby/internal/intern/proc.h
+eval.o: $(hdrdir)/ruby/internal/intern/process.h
+eval.o: $(hdrdir)/ruby/internal/intern/random.h
+eval.o: $(hdrdir)/ruby/internal/intern/range.h
+eval.o: $(hdrdir)/ruby/internal/intern/rational.h
+eval.o: $(hdrdir)/ruby/internal/intern/re.h
+eval.o: $(hdrdir)/ruby/internal/intern/ruby.h
+eval.o: $(hdrdir)/ruby/internal/intern/select.h
+eval.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+eval.o: $(hdrdir)/ruby/internal/intern/set.h
+eval.o: $(hdrdir)/ruby/internal/intern/signal.h
+eval.o: $(hdrdir)/ruby/internal/intern/sprintf.h
+eval.o: $(hdrdir)/ruby/internal/intern/string.h
+eval.o: $(hdrdir)/ruby/internal/intern/struct.h
+eval.o: $(hdrdir)/ruby/internal/intern/thread.h
+eval.o: $(hdrdir)/ruby/internal/intern/time.h
+eval.o: $(hdrdir)/ruby/internal/intern/variable.h
+eval.o: $(hdrdir)/ruby/internal/intern/vm.h
+eval.o: $(hdrdir)/ruby/internal/interpreter.h
+eval.o: $(hdrdir)/ruby/internal/iterator.h
+eval.o: $(hdrdir)/ruby/internal/memory.h
+eval.o: $(hdrdir)/ruby/internal/method.h
+eval.o: $(hdrdir)/ruby/internal/module.h
+eval.o: $(hdrdir)/ruby/internal/newobj.h
+eval.o: $(hdrdir)/ruby/internal/scan_args.h
+eval.o: $(hdrdir)/ruby/internal/special_consts.h
+eval.o: $(hdrdir)/ruby/internal/static_assert.h
+eval.o: $(hdrdir)/ruby/internal/stdalign.h
+eval.o: $(hdrdir)/ruby/internal/stdbool.h
+eval.o: $(hdrdir)/ruby/internal/stdckdint.h
+eval.o: $(hdrdir)/ruby/internal/symbol.h
+eval.o: $(hdrdir)/ruby/internal/value.h
+eval.o: $(hdrdir)/ruby/internal/value_type.h
+eval.o: $(hdrdir)/ruby/internal/variable.h
+eval.o: $(hdrdir)/ruby/internal/warning_push.h
+eval.o: $(hdrdir)/ruby/internal/xmalloc.h
+eval.o: $(hdrdir)/ruby/missing.h
+eval.o: $(hdrdir)/ruby/ruby.h
+eval.o: $(hdrdir)/ruby/st.h
+eval.o: $(hdrdir)/ruby/subst.h
+eval.o: eval.c
+# AUTOGENERATED DEPENDENCIES END
diff --git a/ext/-test-/exception/depend b/ext/-test-/exception/depend
index 818b4c79dfca25..690e5ad3776231 100644
--- a/ext/-test-/exception/depend
+++ b/ext/-test-/exception/depend
@@ -127,6 +127,7 @@ dataerror.o: $(hdrdir)/ruby/internal/intern/re.h
 dataerror.o: $(hdrdir)/ruby/internal/intern/ruby.h
 dataerror.o: $(hdrdir)/ruby/internal/intern/select.h
 dataerror.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+dataerror.o: $(hdrdir)/ruby/internal/intern/set.h
 dataerror.o: $(hdrdir)/ruby/internal/intern/signal.h
 dataerror.o: $(hdrdir)/ruby/internal/intern/sprintf.h
 dataerror.o: $(hdrdir)/ruby/internal/intern/string.h
@@ -146,6 +147,7 @@ dataerror.o: $(hdrdir)/ruby/internal/special_consts.h
 dataerror.o: $(hdrdir)/ruby/internal/static_assert.h
 dataerror.o: $(hdrdir)/ruby/internal/stdalign.h
 dataerror.o: $(hdrdir)/ruby/internal/stdbool.h
+dataerror.o: $(hdrdir)/ruby/internal/stdckdint.h
 dataerror.o: $(hdrdir)/ruby/internal/symbol.h
 dataerror.o: $(hdrdir)/ruby/internal/value.h
 dataerror.o: $(hdrdir)/ruby/internal/value_type.h
@@ -296,6 +298,7 @@ enc_raise.o: $(hdrdir)/ruby/internal/intern/re.h
 enc_raise.o: $(hdrdir)/ruby/internal/intern/ruby.h
 enc_raise.o: $(hdrdir)/ruby/internal/intern/select.h
 enc_raise.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+enc_raise.o: $(hdrdir)/ruby/internal/intern/set.h
 enc_raise.o: $(hdrdir)/ruby/internal/intern/signal.h
 enc_raise.o: $(hdrdir)/ruby/internal/intern/sprintf.h
 enc_raise.o: $(hdrdir)/ruby/internal/intern/string.h
@@ -315,6 +318,7 @@ enc_raise.o: $(hdrdir)/ruby/internal/special_consts.h
 enc_raise.o: $(hdrdir)/ruby/internal/static_assert.h
 enc_raise.o: $(hdrdir)/ruby/internal/stdalign.h
 enc_raise.o: $(hdrdir)/ruby/internal/stdbool.h
+enc_raise.o: $(hdrdir)/ruby/internal/stdckdint.h
 enc_raise.o: $(hdrdir)/ruby/internal/symbol.h
 enc_raise.o: $(hdrdir)/ruby/internal/value.h
 enc_raise.o: $(hdrdir)/ruby/internal/value_type.h
@@ -457,6 +461,7 @@ ensured.o: $(hdrdir)/ruby/internal/intern/re.h
 ensured.o: $(hdrdir)/ruby/internal/intern/ruby.h
 ensured.o: $(hdrdir)/ruby/internal/intern/select.h
 ensured.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+ensured.o: $(hdrdir)/ruby/internal/intern/set.h
 ensured.o: $(hdrdir)/ruby/internal/intern/signal.h
 ensured.o: $(hdrdir)/ruby/internal/intern/sprintf.h
 ensured.o: $(hdrdir)/ruby/internal/intern/string.h
@@ -476,6 +481,7 @@ ensured.o: $(hdrdir)/ruby/internal/special_consts.h
 ensured.o: $(hdrdir)/ruby/internal/static_assert.h
 ensured.o: $(hdrdir)/ruby/internal/stdalign.h
 ensured.o: $(hdrdir)/ruby/internal/stdbool.h
+ensured.o: $(hdrdir)/ruby/internal/stdckdint.h
 ensured.o: $(hdrdir)/ruby/internal/symbol.h
 ensured.o: $(hdrdir)/ruby/internal/value.h
 ensured.o: $(hdrdir)/ruby/internal/value_type.h
@@ -616,6 +622,7 @@ init.o: $(hdrdir)/ruby/internal/intern/re.h
 init.o: $(hdrdir)/ruby/internal/intern/ruby.h
 init.o: $(hdrdir)/ruby/internal/intern/select.h
 init.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+init.o: $(hdrdir)/ruby/internal/intern/set.h
 init.o: $(hdrdir)/ruby/internal/intern/signal.h
 init.o: $(hdrdir)/ruby/internal/intern/sprintf.h
 init.o: $(hdrdir)/ruby/internal/intern/string.h
@@ -635,6 +642,7 @@ init.o: $(hdrdir)/ruby/internal/special_consts.h
 init.o: $(hdrdir)/ruby/internal/static_assert.h
 init.o: $(hdrdir)/ruby/internal/stdalign.h
 init.o: $(hdrdir)/ruby/internal/stdbool.h
+init.o: $(hdrdir)/ruby/internal/stdckdint.h
 init.o: $(hdrdir)/ruby/internal/symbol.h
 init.o: $(hdrdir)/ruby/internal/value.h
 init.o: $(hdrdir)/ruby/internal/value_type.h
diff --git a/ext/-test-/fatal/depend b/ext/-test-/fatal/depend
index 730a72e52a4180..306bc9099c2dbd 100644
--- a/ext/-test-/fatal/depend
+++ b/ext/-test-/fatal/depend
@@ -1,4 +1,327 @@
 # AUTOGENERATED DEPENDENCIES START
+
+init.o: $(RUBY_EXTCONF_H)
+init.o: $(arch_hdrdir)/ruby/config.h
+init.o: $(hdrdir)/ruby.h
+init.o: $(hdrdir)/ruby/assert.h
+init.o: $(hdrdir)/ruby/backward.h
+init.o: $(hdrdir)/ruby/backward/2/assume.h
+init.o: $(hdrdir)/ruby/backward/2/attributes.h
+init.o: $(hdrdir)/ruby/backward/2/bool.h
+init.o: $(hdrdir)/ruby/backward/2/inttypes.h
+init.o: $(hdrdir)/ruby/backward/2/limits.h
+init.o: $(hdrdir)/ruby/backward/2/long_long.h
+init.o: $(hdrdir)/ruby/backward/2/stdalign.h
+init.o: $(hdrdir)/ruby/backward/2/stdarg.h
+init.o: $(hdrdir)/ruby/defines.h
+init.o: $(hdrdir)/ruby/intern.h
+init.o: $(hdrdir)/ruby/internal/abi.h
+init.o: $(hdrdir)/ruby/internal/anyargs.h
+init.o: $(hdrdir)/ruby/internal/arithmetic.h
+init.o: $(hdrdir)/ruby/internal/arithmetic/char.h
+init.o: $(hdrdir)/ruby/internal/arithmetic/double.h
+init.o: $(hdrdir)/ruby/internal/arithmetic/fixnum.h
+init.o: $(hdrdir)/ruby/internal/arithmetic/gid_t.h
+init.o: $(hdrdir)/ruby/internal/arithmetic/int.h
+init.o: $(hdrdir)/ruby/internal/arithmetic/intptr_t.h
+init.o: $(hdrdir)/ruby/internal/arithmetic/long.h
+init.o: $(hdrdir)/ruby/internal/arithmetic/long_long.h
+init.o: $(hdrdir)/ruby/internal/arithmetic/mode_t.h
+init.o: $(hdrdir)/ruby/internal/arithmetic/off_t.h
+init.o: $(hdrdir)/ruby/internal/arithmetic/pid_t.h
+init.o: $(hdrdir)/ruby/internal/arithmetic/short.h
+init.o: $(hdrdir)/ruby/internal/arithmetic/size_t.h
+init.o: $(hdrdir)/ruby/internal/arithmetic/st_data_t.h
+init.o: $(hdrdir)/ruby/internal/arithmetic/uid_t.h
+init.o: $(hdrdir)/ruby/internal/assume.h
+init.o: $(hdrdir)/ruby/internal/attr/alloc_size.h
+init.o: $(hdrdir)/ruby/internal/attr/artificial.h
+init.o: $(hdrdir)/ruby/internal/attr/cold.h
+init.o: $(hdrdir)/ruby/internal/attr/const.h
+init.o: $(hdrdir)/ruby/internal/attr/constexpr.h
+init.o: $(hdrdir)/ruby/internal/attr/deprecated.h
+init.o: $(hdrdir)/ruby/internal/attr/diagnose_if.h
+init.o: $(hdrdir)/ruby/internal/attr/enum_extensibility.h
+init.o: $(hdrdir)/ruby/internal/attr/error.h
+init.o: $(hdrdir)/ruby/internal/attr/flag_enum.h
+init.o: $(hdrdir)/ruby/internal/attr/forceinline.h
+init.o: $(hdrdir)/ruby/internal/attr/format.h
+init.o: $(hdrdir)/ruby/internal/attr/maybe_unused.h
+init.o: $(hdrdir)/ruby/internal/attr/noalias.h
+init.o: $(hdrdir)/ruby/internal/attr/nodiscard.h
+init.o: $(hdrdir)/ruby/internal/attr/noexcept.h
+init.o: $(hdrdir)/ruby/internal/attr/noinline.h
+init.o: $(hdrdir)/ruby/internal/attr/nonnull.h
+init.o: $(hdrdir)/ruby/internal/attr/noreturn.h
+init.o: $(hdrdir)/ruby/internal/attr/packed_struct.h
+init.o: $(hdrdir)/ruby/internal/attr/pure.h
+init.o: $(hdrdir)/ruby/internal/attr/restrict.h
+init.o: $(hdrdir)/ruby/internal/attr/returns_nonnull.h
+init.o: $(hdrdir)/ruby/internal/attr/warning.h
+init.o: $(hdrdir)/ruby/internal/attr/weakref.h
+init.o: $(hdrdir)/ruby/internal/cast.h
+init.o: $(hdrdir)/ruby/internal/compiler_is.h
+init.o: $(hdrdir)/ruby/internal/compiler_is/apple.h
+init.o: $(hdrdir)/ruby/internal/compiler_is/clang.h
+init.o: $(hdrdir)/ruby/internal/compiler_is/gcc.h
+init.o: $(hdrdir)/ruby/internal/compiler_is/intel.h
+init.o: $(hdrdir)/ruby/internal/compiler_is/msvc.h
+init.o: $(hdrdir)/ruby/internal/compiler_is/sunpro.h
+init.o: $(hdrdir)/ruby/internal/compiler_since.h
+init.o: $(hdrdir)/ruby/internal/config.h
+init.o: $(hdrdir)/ruby/internal/constant_p.h
+init.o: $(hdrdir)/ruby/internal/core.h
+init.o: $(hdrdir)/ruby/internal/core/rarray.h
+init.o: $(hdrdir)/ruby/internal/core/rbasic.h
+init.o: $(hdrdir)/ruby/internal/core/rbignum.h
+init.o: $(hdrdir)/ruby/internal/core/rclass.h
+init.o: $(hdrdir)/ruby/internal/core/rdata.h
+init.o: $(hdrdir)/ruby/internal/core/rfile.h
+init.o: $(hdrdir)/ruby/internal/core/rhash.h
+init.o: $(hdrdir)/ruby/internal/core/robject.h
+init.o: $(hdrdir)/ruby/internal/core/rregexp.h
+init.o: $(hdrdir)/ruby/internal/core/rstring.h
+init.o: $(hdrdir)/ruby/internal/core/rstruct.h
+init.o: $(hdrdir)/ruby/internal/core/rtypeddata.h
+init.o: $(hdrdir)/ruby/internal/ctype.h
+init.o: $(hdrdir)/ruby/internal/dllexport.h
+init.o: $(hdrdir)/ruby/internal/dosish.h
+init.o: $(hdrdir)/ruby/internal/error.h
+init.o: $(hdrdir)/ruby/internal/eval.h
+init.o: $(hdrdir)/ruby/internal/event.h
+init.o: $(hdrdir)/ruby/internal/fl_type.h
+init.o: $(hdrdir)/ruby/internal/gc.h
+init.o: $(hdrdir)/ruby/internal/glob.h
+init.o: $(hdrdir)/ruby/internal/globals.h
+init.o: $(hdrdir)/ruby/internal/has/attribute.h
+init.o: $(hdrdir)/ruby/internal/has/builtin.h
+init.o: $(hdrdir)/ruby/internal/has/c_attribute.h
+init.o: $(hdrdir)/ruby/internal/has/cpp_attribute.h
+init.o: $(hdrdir)/ruby/internal/has/declspec_attribute.h
+init.o: $(hdrdir)/ruby/internal/has/extension.h
+init.o: $(hdrdir)/ruby/internal/has/feature.h
+init.o: $(hdrdir)/ruby/internal/has/warning.h
+init.o: $(hdrdir)/ruby/internal/intern/array.h
+init.o: $(hdrdir)/ruby/internal/intern/bignum.h
+init.o: $(hdrdir)/ruby/internal/intern/class.h
+init.o: $(hdrdir)/ruby/internal/intern/compar.h
+init.o: $(hdrdir)/ruby/internal/intern/complex.h
+init.o: $(hdrdir)/ruby/internal/intern/cont.h
+init.o: $(hdrdir)/ruby/internal/intern/dir.h
+init.o: $(hdrdir)/ruby/internal/intern/enum.h
+init.o: $(hdrdir)/ruby/internal/intern/enumerator.h
+init.o: $(hdrdir)/ruby/internal/intern/error.h
+init.o: $(hdrdir)/ruby/internal/intern/eval.h
+init.o: $(hdrdir)/ruby/internal/intern/file.h
+init.o: $(hdrdir)/ruby/internal/intern/hash.h
+init.o: $(hdrdir)/ruby/internal/intern/io.h
+init.o: $(hdrdir)/ruby/internal/intern/load.h
+init.o: $(hdrdir)/ruby/internal/intern/marshal.h
+init.o: $(hdrdir)/ruby/internal/intern/numeric.h
+init.o: $(hdrdir)/ruby/internal/intern/object.h
+init.o: $(hdrdir)/ruby/internal/intern/parse.h
+init.o: $(hdrdir)/ruby/internal/intern/proc.h
+init.o: $(hdrdir)/ruby/internal/intern/process.h
+init.o: $(hdrdir)/ruby/internal/intern/random.h
+init.o: $(hdrdir)/ruby/internal/intern/range.h
+init.o: $(hdrdir)/ruby/internal/intern/rational.h
+init.o: $(hdrdir)/ruby/internal/intern/re.h
+init.o: $(hdrdir)/ruby/internal/intern/ruby.h
+init.o: $(hdrdir)/ruby/internal/intern/select.h
+init.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+init.o: $(hdrdir)/ruby/internal/intern/set.h
+init.o: $(hdrdir)/ruby/internal/intern/signal.h
+init.o: $(hdrdir)/ruby/internal/intern/sprintf.h
+init.o: $(hdrdir)/ruby/internal/intern/string.h
+init.o: $(hdrdir)/ruby/internal/intern/struct.h
+init.o: $(hdrdir)/ruby/internal/intern/thread.h
+init.o: $(hdrdir)/ruby/internal/intern/time.h
+init.o: $(hdrdir)/ruby/internal/intern/variable.h
+init.o: $(hdrdir)/ruby/internal/intern/vm.h
+init.o: $(hdrdir)/ruby/internal/interpreter.h
+init.o: $(hdrdir)/ruby/internal/iterator.h
+init.o: $(hdrdir)/ruby/internal/memory.h
+init.o: $(hdrdir)/ruby/internal/method.h
+init.o: $(hdrdir)/ruby/internal/module.h
+init.o: $(hdrdir)/ruby/internal/newobj.h
+init.o: $(hdrdir)/ruby/internal/scan_args.h
+init.o: $(hdrdir)/ruby/internal/special_consts.h
+init.o: $(hdrdir)/ruby/internal/static_assert.h
+init.o: $(hdrdir)/ruby/internal/stdalign.h
+init.o: $(hdrdir)/ruby/internal/stdbool.h
+init.o: $(hdrdir)/ruby/internal/stdckdint.h
+init.o: $(hdrdir)/ruby/internal/symbol.h
+init.o: $(hdrdir)/ruby/internal/value.h
+init.o: $(hdrdir)/ruby/internal/value_type.h
+init.o: $(hdrdir)/ruby/internal/variable.h
+init.o: $(hdrdir)/ruby/internal/warning_push.h
+init.o: $(hdrdir)/ruby/internal/xmalloc.h
+init.o: $(hdrdir)/ruby/missing.h
+init.o: $(hdrdir)/ruby/ruby.h
+init.o: $(hdrdir)/ruby/st.h
+init.o: $(hdrdir)/ruby/subst.h
+init.o: init.c
+invalid.o: $(RUBY_EXTCONF_H)
+invalid.o: $(arch_hdrdir)/ruby/config.h
+invalid.o: $(hdrdir)/ruby.h
+invalid.o: $(hdrdir)/ruby/assert.h
+invalid.o: $(hdrdir)/ruby/backward.h
+invalid.o: $(hdrdir)/ruby/backward/2/assume.h
+invalid.o: $(hdrdir)/ruby/backward/2/attributes.h
+invalid.o: $(hdrdir)/ruby/backward/2/bool.h
+invalid.o: $(hdrdir)/ruby/backward/2/inttypes.h
+invalid.o: $(hdrdir)/ruby/backward/2/limits.h
+invalid.o: $(hdrdir)/ruby/backward/2/long_long.h
+invalid.o: $(hdrdir)/ruby/backward/2/stdalign.h
+invalid.o: $(hdrdir)/ruby/backward/2/stdarg.h
+invalid.o: $(hdrdir)/ruby/defines.h
+invalid.o: $(hdrdir)/ruby/intern.h
+invalid.o: $(hdrdir)/ruby/internal/abi.h
+invalid.o: $(hdrdir)/ruby/internal/anyargs.h
+invalid.o: $(hdrdir)/ruby/internal/arithmetic.h
+invalid.o: $(hdrdir)/ruby/internal/arithmetic/char.h
+invalid.o: $(hdrdir)/ruby/internal/arithmetic/double.h
+invalid.o: $(hdrdir)/ruby/internal/arithmetic/fixnum.h
+invalid.o: $(hdrdir)/ruby/internal/arithmetic/gid_t.h
+invalid.o: $(hdrdir)/ruby/internal/arithmetic/int.h
+invalid.o: $(hdrdir)/ruby/internal/arithmetic/intptr_t.h
+invalid.o: $(hdrdir)/ruby/internal/arithmetic/long.h
+invalid.o: $(hdrdir)/ruby/internal/arithmetic/long_long.h
+invalid.o: $(hdrdir)/ruby/internal/arithmetic/mode_t.h
+invalid.o: $(hdrdir)/ruby/internal/arithmetic/off_t.h
+invalid.o: $(hdrdir)/ruby/internal/arithmetic/pid_t.h
+invalid.o: $(hdrdir)/ruby/internal/arithmetic/short.h
+invalid.o: $(hdrdir)/ruby/internal/arithmetic/size_t.h
+invalid.o: $(hdrdir)/ruby/internal/arithmetic/st_data_t.h
+invalid.o: $(hdrdir)/ruby/internal/arithmetic/uid_t.h
+invalid.o: $(hdrdir)/ruby/internal/assume.h
+invalid.o: $(hdrdir)/ruby/internal/attr/alloc_size.h
+invalid.o: $(hdrdir)/ruby/internal/attr/artificial.h
+invalid.o: $(hdrdir)/ruby/internal/attr/cold.h
+invalid.o: $(hdrdir)/ruby/internal/attr/const.h
+invalid.o: $(hdrdir)/ruby/internal/attr/constexpr.h
+invalid.o: $(hdrdir)/ruby/internal/attr/deprecated.h
+invalid.o: $(hdrdir)/ruby/internal/attr/diagnose_if.h
+invalid.o: $(hdrdir)/ruby/internal/attr/enum_extensibility.h
+invalid.o: $(hdrdir)/ruby/internal/attr/error.h
+invalid.o: $(hdrdir)/ruby/internal/attr/flag_enum.h
+invalid.o: $(hdrdir)/ruby/internal/attr/forceinline.h
+invalid.o: $(hdrdir)/ruby/internal/attr/format.h
+invalid.o: $(hdrdir)/ruby/internal/attr/maybe_unused.h
+invalid.o: $(hdrdir)/ruby/internal/attr/noalias.h
+invalid.o: $(hdrdir)/ruby/internal/attr/nodiscard.h
+invalid.o: $(hdrdir)/ruby/internal/attr/noexcept.h
+invalid.o: $(hdrdir)/ruby/internal/attr/noinline.h
+invalid.o: $(hdrdir)/ruby/internal/attr/nonnull.h
+invalid.o: $(hdrdir)/ruby/internal/attr/noreturn.h
+invalid.o: $(hdrdir)/ruby/internal/attr/packed_struct.h
+invalid.o: $(hdrdir)/ruby/internal/attr/pure.h
+invalid.o: $(hdrdir)/ruby/internal/attr/restrict.h
+invalid.o: $(hdrdir)/ruby/internal/attr/returns_nonnull.h
+invalid.o: $(hdrdir)/ruby/internal/attr/warning.h
+invalid.o: $(hdrdir)/ruby/internal/attr/weakref.h
+invalid.o: $(hdrdir)/ruby/internal/cast.h
+invalid.o: $(hdrdir)/ruby/internal/compiler_is.h
+invalid.o: $(hdrdir)/ruby/internal/compiler_is/apple.h
+invalid.o: $(hdrdir)/ruby/internal/compiler_is/clang.h
+invalid.o: $(hdrdir)/ruby/internal/compiler_is/gcc.h
+invalid.o: $(hdrdir)/ruby/internal/compiler_is/intel.h
+invalid.o: $(hdrdir)/ruby/internal/compiler_is/msvc.h
+invalid.o: $(hdrdir)/ruby/internal/compiler_is/sunpro.h
+invalid.o: $(hdrdir)/ruby/internal/compiler_since.h
+invalid.o: $(hdrdir)/ruby/internal/config.h
+invalid.o: $(hdrdir)/ruby/internal/constant_p.h
+invalid.o: $(hdrdir)/ruby/internal/core.h
+invalid.o: $(hdrdir)/ruby/internal/core/rarray.h
+invalid.o: $(hdrdir)/ruby/internal/core/rbasic.h
+invalid.o: $(hdrdir)/ruby/internal/core/rbignum.h
+invalid.o: $(hdrdir)/ruby/internal/core/rclass.h
+invalid.o: $(hdrdir)/ruby/internal/core/rdata.h
+invalid.o: $(hdrdir)/ruby/internal/core/rfile.h
+invalid.o: $(hdrdir)/ruby/internal/core/rhash.h
+invalid.o: $(hdrdir)/ruby/internal/core/robject.h
+invalid.o: $(hdrdir)/ruby/internal/core/rregexp.h
+invalid.o: $(hdrdir)/ruby/internal/core/rstring.h
+invalid.o: $(hdrdir)/ruby/internal/core/rstruct.h
+invalid.o: $(hdrdir)/ruby/internal/core/rtypeddata.h
+invalid.o: $(hdrdir)/ruby/internal/ctype.h
+invalid.o: $(hdrdir)/ruby/internal/dllexport.h
+invalid.o: $(hdrdir)/ruby/internal/dosish.h
+invalid.o: $(hdrdir)/ruby/internal/error.h
+invalid.o: $(hdrdir)/ruby/internal/eval.h
+invalid.o: $(hdrdir)/ruby/internal/event.h
+invalid.o: $(hdrdir)/ruby/internal/fl_type.h
+invalid.o: $(hdrdir)/ruby/internal/gc.h
+invalid.o: $(hdrdir)/ruby/internal/glob.h
+invalid.o: $(hdrdir)/ruby/internal/globals.h
+invalid.o: $(hdrdir)/ruby/internal/has/attribute.h
+invalid.o: $(hdrdir)/ruby/internal/has/builtin.h
+invalid.o: $(hdrdir)/ruby/internal/has/c_attribute.h
+invalid.o: $(hdrdir)/ruby/internal/has/cpp_attribute.h
+invalid.o: $(hdrdir)/ruby/internal/has/declspec_attribute.h
+invalid.o: $(hdrdir)/ruby/internal/has/extension.h
+invalid.o: $(hdrdir)/ruby/internal/has/feature.h
+invalid.o: $(hdrdir)/ruby/internal/has/warning.h
+invalid.o: $(hdrdir)/ruby/internal/intern/array.h
+invalid.o: $(hdrdir)/ruby/internal/intern/bignum.h
+invalid.o: $(hdrdir)/ruby/internal/intern/class.h
+invalid.o: $(hdrdir)/ruby/internal/intern/compar.h
+invalid.o: $(hdrdir)/ruby/internal/intern/complex.h
+invalid.o: $(hdrdir)/ruby/internal/intern/cont.h
+invalid.o: $(hdrdir)/ruby/internal/intern/dir.h
+invalid.o: $(hdrdir)/ruby/internal/intern/enum.h
+invalid.o: $(hdrdir)/ruby/internal/intern/enumerator.h
+invalid.o: $(hdrdir)/ruby/internal/intern/error.h
+invalid.o: $(hdrdir)/ruby/internal/intern/eval.h
+invalid.o: $(hdrdir)/ruby/internal/intern/file.h
+invalid.o: $(hdrdir)/ruby/internal/intern/hash.h
+invalid.o: $(hdrdir)/ruby/internal/intern/io.h
+invalid.o: $(hdrdir)/ruby/internal/intern/load.h
+invalid.o: $(hdrdir)/ruby/internal/intern/marshal.h
+invalid.o: $(hdrdir)/ruby/internal/intern/numeric.h
+invalid.o: $(hdrdir)/ruby/internal/intern/object.h
+invalid.o: $(hdrdir)/ruby/internal/intern/parse.h
+invalid.o: $(hdrdir)/ruby/internal/intern/proc.h
+invalid.o: $(hdrdir)/ruby/internal/intern/process.h
+invalid.o: $(hdrdir)/ruby/internal/intern/random.h
+invalid.o: $(hdrdir)/ruby/internal/intern/range.h
+invalid.o: $(hdrdir)/ruby/internal/intern/rational.h
+invalid.o: $(hdrdir)/ruby/internal/intern/re.h
+invalid.o: $(hdrdir)/ruby/internal/intern/ruby.h
+invalid.o: $(hdrdir)/ruby/internal/intern/select.h
+invalid.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+invalid.o: $(hdrdir)/ruby/internal/intern/set.h
+invalid.o: $(hdrdir)/ruby/internal/intern/signal.h
+invalid.o: $(hdrdir)/ruby/internal/intern/sprintf.h
+invalid.o: $(hdrdir)/ruby/internal/intern/string.h
+invalid.o: $(hdrdir)/ruby/internal/intern/struct.h
+invalid.o: $(hdrdir)/ruby/internal/intern/thread.h
+invalid.o: $(hdrdir)/ruby/internal/intern/time.h
+invalid.o: $(hdrdir)/ruby/internal/intern/variable.h
+invalid.o: $(hdrdir)/ruby/internal/intern/vm.h
+invalid.o: $(hdrdir)/ruby/internal/interpreter.h
+invalid.o: $(hdrdir)/ruby/internal/iterator.h
+invalid.o: $(hdrdir)/ruby/internal/memory.h
+invalid.o: $(hdrdir)/ruby/internal/method.h
+invalid.o: $(hdrdir)/ruby/internal/module.h
+invalid.o: $(hdrdir)/ruby/internal/newobj.h
+invalid.o: $(hdrdir)/ruby/internal/scan_args.h
+invalid.o: $(hdrdir)/ruby/internal/special_consts.h
+invalid.o: $(hdrdir)/ruby/internal/static_assert.h
+invalid.o: $(hdrdir)/ruby/internal/stdalign.h
+invalid.o: $(hdrdir)/ruby/internal/stdbool.h
+invalid.o: $(hdrdir)/ruby/internal/stdckdint.h
+invalid.o: $(hdrdir)/ruby/internal/symbol.h
+invalid.o: $(hdrdir)/ruby/internal/value.h
+invalid.o: $(hdrdir)/ruby/internal/value_type.h
+invalid.o: $(hdrdir)/ruby/internal/variable.h
+invalid.o: $(hdrdir)/ruby/internal/warning_push.h
+invalid.o: $(hdrdir)/ruby/internal/xmalloc.h
+invalid.o: $(hdrdir)/ruby/missing.h
+invalid.o: $(hdrdir)/ruby/ruby.h
+invalid.o: $(hdrdir)/ruby/st.h
+invalid.o: $(hdrdir)/ruby/subst.h
+invalid.o: invalid.c
 rb_fatal.o: $(RUBY_EXTCONF_H)
 rb_fatal.o: $(arch_hdrdir)/ruby/config.h
 rb_fatal.o: $(hdrdir)/ruby.h
@@ -128,6 +451,7 @@ rb_fatal.o: $(hdrdir)/ruby/internal/intern/re.h
 rb_fatal.o: $(hdrdir)/ruby/internal/intern/ruby.h
 rb_fatal.o: $(hdrdir)/ruby/internal/intern/select.h
 rb_fatal.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+rb_fatal.o: $(hdrdir)/ruby/internal/intern/set.h
 rb_fatal.o: $(hdrdir)/ruby/internal/intern/signal.h
 rb_fatal.o: $(hdrdir)/ruby/internal/intern/sprintf.h
 rb_fatal.o: $(hdrdir)/ruby/internal/intern/string.h
@@ -147,6 +471,7 @@ rb_fatal.o: $(hdrdir)/ruby/internal/special_consts.h
 rb_fatal.o: $(hdrdir)/ruby/internal/static_assert.h
 rb_fatal.o: $(hdrdir)/ruby/internal/stdalign.h
 rb_fatal.o: $(hdrdir)/ruby/internal/stdbool.h
+rb_fatal.o: $(hdrdir)/ruby/internal/stdckdint.h
 rb_fatal.o: $(hdrdir)/ruby/internal/symbol.h
 rb_fatal.o: $(hdrdir)/ruby/internal/value.h
 rb_fatal.o: $(hdrdir)/ruby/internal/value_type.h
diff --git a/ext/-test-/fatal/extconf.rb b/ext/-test-/fatal/extconf.rb
index d5849c073328b5..ca51178a18b200 100644
--- a/ext/-test-/fatal/extconf.rb
+++ b/ext/-test-/fatal/extconf.rb
@@ -1,2 +1,3 @@
 # frozen_string_literal: false
-create_makefile("-test-/fatal/rb_fatal")
+require_relative "../auto_ext.rb"
+auto_ext
diff --git a/ext/-test-/fatal/init.c b/ext/-test-/fatal/init.c
new file mode 100644
index 00000000000000..3b71708789502c
--- /dev/null
+++ b/ext/-test-/fatal/init.c
@@ -0,0 +1,10 @@
+#include "ruby.h"
+
+#define init(n) {void Init_##n(VALUE klass); Init_##n(klass);}
+
+void
+Init_fatal(void)
+{
+    VALUE klass = rb_define_module("Bug");
+    TEST_INIT_FUNCS(init);
+}
diff --git a/ext/-test-/fatal/invalid.c b/ext/-test-/fatal/invalid.c
new file mode 100644
index 00000000000000..393465416a0f6c
--- /dev/null
+++ b/ext/-test-/fatal/invalid.c
@@ -0,0 +1,28 @@
+#include <ruby.h>
+
+#if SIZEOF_LONG == SIZEOF_VOIDP
+# define NUM2PTR(x) NUM2ULONG(x)
+#elif SIZEOF_LONG_LONG == SIZEOF_VOIDP
+# define NUM2PTR(x) NUM2ULL(x)
+#endif
+
+static VALUE
+invalid_call(VALUE obj, VALUE address)
+{
+    typedef VALUE (*func_type)(VALUE);
+
+    return (*(func_type)NUM2PTR(address))(obj);
+}
+
+static VALUE
+invalid_access(VALUE obj, VALUE address)
+{
+    return *(VALUE *)NUM2PTR(address) == obj ? Qtrue : Qfalse;
+}
+
+void
+Init_invalid(VALUE mBug)
+{
+    rb_define_singleton_method(mBug, "invalid_call", invalid_call, 1);
+    rb_define_singleton_method(mBug, "invalid_access", invalid_access, 1);
+}
diff --git a/ext/-test-/fatal/rb_fatal.c b/ext/-test-/fatal/rb_fatal.c
index eedbc51f8b83d6..6c7bb89628fdd4 100644
--- a/ext/-test-/fatal/rb_fatal.c
+++ b/ext/-test-/fatal/rb_fatal.c
@@ -13,8 +13,7 @@ ruby_fatal(VALUE obj, VALUE msg)
 }
 
 void
-Init_rb_fatal(void)
+Init_rb_fatal(VALUE mBug)
 {
-    VALUE mBug = rb_define_module("Bug");
     rb_define_singleton_method(mBug, "rb_fatal", ruby_fatal, 1);
 }
diff --git a/ext/-test-/file/depend b/ext/-test-/file/depend
index 662136f1ba069b..fe320f3d44a98f 100644
--- a/ext/-test-/file/depend
+++ b/ext/-test-/file/depend
@@ -137,6 +137,7 @@ fs.o: $(hdrdir)/ruby/internal/intern/re.h
 fs.o: $(hdrdir)/ruby/internal/intern/ruby.h
 fs.o: $(hdrdir)/ruby/internal/intern/select.h
 fs.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+fs.o: $(hdrdir)/ruby/internal/intern/set.h
 fs.o: $(hdrdir)/ruby/internal/intern/signal.h
 fs.o: $(hdrdir)/ruby/internal/intern/sprintf.h
 fs.o: $(hdrdir)/ruby/internal/intern/string.h
@@ -156,6 +157,7 @@ fs.o: $(hdrdir)/ruby/internal/special_consts.h
 fs.o: $(hdrdir)/ruby/internal/static_assert.h
 fs.o: $(hdrdir)/ruby/internal/stdalign.h
 fs.o: $(hdrdir)/ruby/internal/stdbool.h
+fs.o: $(hdrdir)/ruby/internal/stdckdint.h
 fs.o: $(hdrdir)/ruby/internal/symbol.h
 fs.o: $(hdrdir)/ruby/internal/value.h
 fs.o: $(hdrdir)/ruby/internal/value_type.h
@@ -299,6 +301,7 @@ init.o: $(hdrdir)/ruby/internal/intern/re.h
 init.o: $(hdrdir)/ruby/internal/intern/ruby.h
 init.o: $(hdrdir)/ruby/internal/intern/select.h
 init.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+init.o: $(hdrdir)/ruby/internal/intern/set.h
 init.o: $(hdrdir)/ruby/internal/intern/signal.h
 init.o: $(hdrdir)/ruby/internal/intern/sprintf.h
 init.o: $(hdrdir)/ruby/internal/intern/string.h
@@ -318,6 +321,7 @@ init.o: $(hdrdir)/ruby/internal/special_consts.h
 init.o: $(hdrdir)/ruby/internal/static_assert.h
 init.o: $(hdrdir)/ruby/internal/stdalign.h
 init.o: $(hdrdir)/ruby/internal/stdbool.h
+init.o: $(hdrdir)/ruby/internal/stdckdint.h
 init.o: $(hdrdir)/ruby/internal/symbol.h
 init.o: $(hdrdir)/ruby/internal/value.h
 init.o: $(hdrdir)/ruby/internal/value_type.h
@@ -329,6 +333,179 @@ init.o: $(hdrdir)/ruby/ruby.h
 init.o: $(hdrdir)/ruby/st.h
 init.o: $(hdrdir)/ruby/subst.h
 init.o: init.c
+newline_conv.o: $(RUBY_EXTCONF_H)
+newline_conv.o: $(arch_hdrdir)/ruby/config.h
+newline_conv.o: $(hdrdir)/ruby/assert.h
+newline_conv.o: $(hdrdir)/ruby/backward.h
+newline_conv.o: $(hdrdir)/ruby/backward/2/assume.h
+newline_conv.o: $(hdrdir)/ruby/backward/2/attributes.h
+newline_conv.o: $(hdrdir)/ruby/backward/2/bool.h
+newline_conv.o: $(hdrdir)/ruby/backward/2/inttypes.h
+newline_conv.o: $(hdrdir)/ruby/backward/2/limits.h
+newline_conv.o: $(hdrdir)/ruby/backward/2/long_long.h
+newline_conv.o: $(hdrdir)/ruby/backward/2/stdalign.h
+newline_conv.o: $(hdrdir)/ruby/backward/2/stdarg.h
+newline_conv.o: $(hdrdir)/ruby/defines.h
+newline_conv.o: $(hdrdir)/ruby/encoding.h
+newline_conv.o: $(hdrdir)/ruby/intern.h
+newline_conv.o: $(hdrdir)/ruby/internal/abi.h
+newline_conv.o: $(hdrdir)/ruby/internal/anyargs.h
+newline_conv.o: $(hdrdir)/ruby/internal/arithmetic.h
+newline_conv.o: $(hdrdir)/ruby/internal/arithmetic/char.h
+newline_conv.o: $(hdrdir)/ruby/internal/arithmetic/double.h
+newline_conv.o: $(hdrdir)/ruby/internal/arithmetic/fixnum.h
+newline_conv.o: $(hdrdir)/ruby/internal/arithmetic/gid_t.h
+newline_conv.o: $(hdrdir)/ruby/internal/arithmetic/int.h
+newline_conv.o: $(hdrdir)/ruby/internal/arithmetic/intptr_t.h
+newline_conv.o: $(hdrdir)/ruby/internal/arithmetic/long.h
+newline_conv.o: $(hdrdir)/ruby/internal/arithmetic/long_long.h
+newline_conv.o: $(hdrdir)/ruby/internal/arithmetic/mode_t.h
+newline_conv.o: $(hdrdir)/ruby/internal/arithmetic/off_t.h
+newline_conv.o: $(hdrdir)/ruby/internal/arithmetic/pid_t.h
+newline_conv.o: $(hdrdir)/ruby/internal/arithmetic/short.h
+newline_conv.o: $(hdrdir)/ruby/internal/arithmetic/size_t.h
+newline_conv.o: $(hdrdir)/ruby/internal/arithmetic/st_data_t.h
+newline_conv.o: $(hdrdir)/ruby/internal/arithmetic/uid_t.h
+newline_conv.o: $(hdrdir)/ruby/internal/assume.h
+newline_conv.o: $(hdrdir)/ruby/internal/attr/alloc_size.h
+newline_conv.o: $(hdrdir)/ruby/internal/attr/artificial.h
+newline_conv.o: $(hdrdir)/ruby/internal/attr/cold.h
+newline_conv.o: $(hdrdir)/ruby/internal/attr/const.h
+newline_conv.o: $(hdrdir)/ruby/internal/attr/constexpr.h
+newline_conv.o: $(hdrdir)/ruby/internal/attr/deprecated.h
+newline_conv.o: $(hdrdir)/ruby/internal/attr/diagnose_if.h
+newline_conv.o: $(hdrdir)/ruby/internal/attr/enum_extensibility.h
+newline_conv.o: $(hdrdir)/ruby/internal/attr/error.h
+newline_conv.o: $(hdrdir)/ruby/internal/attr/flag_enum.h
+newline_conv.o: $(hdrdir)/ruby/internal/attr/forceinline.h
+newline_conv.o: $(hdrdir)/ruby/internal/attr/format.h
+newline_conv.o: $(hdrdir)/ruby/internal/attr/maybe_unused.h
+newline_conv.o: $(hdrdir)/ruby/internal/attr/noalias.h
+newline_conv.o: $(hdrdir)/ruby/internal/attr/nodiscard.h
+newline_conv.o: $(hdrdir)/ruby/internal/attr/noexcept.h
+newline_conv.o: $(hdrdir)/ruby/internal/attr/noinline.h
+newline_conv.o: $(hdrdir)/ruby/internal/attr/nonnull.h
+newline_conv.o: $(hdrdir)/ruby/internal/attr/noreturn.h
+newline_conv.o: $(hdrdir)/ruby/internal/attr/packed_struct.h
+newline_conv.o: $(hdrdir)/ruby/internal/attr/pure.h
+newline_conv.o: $(hdrdir)/ruby/internal/attr/restrict.h
+newline_conv.o: $(hdrdir)/ruby/internal/attr/returns_nonnull.h
+newline_conv.o: $(hdrdir)/ruby/internal/attr/warning.h
+newline_conv.o: $(hdrdir)/ruby/internal/attr/weakref.h
+newline_conv.o: $(hdrdir)/ruby/internal/cast.h
+newline_conv.o: $(hdrdir)/ruby/internal/compiler_is.h
+newline_conv.o: $(hdrdir)/ruby/internal/compiler_is/apple.h
+newline_conv.o: $(hdrdir)/ruby/internal/compiler_is/clang.h
+newline_conv.o: $(hdrdir)/ruby/internal/compiler_is/gcc.h
+newline_conv.o: $(hdrdir)/ruby/internal/compiler_is/intel.h
+newline_conv.o: $(hdrdir)/ruby/internal/compiler_is/msvc.h
+newline_conv.o: $(hdrdir)/ruby/internal/compiler_is/sunpro.h
+newline_conv.o: $(hdrdir)/ruby/internal/compiler_since.h
+newline_conv.o: $(hdrdir)/ruby/internal/config.h
+newline_conv.o: $(hdrdir)/ruby/internal/constant_p.h
+newline_conv.o: $(hdrdir)/ruby/internal/core.h
+newline_conv.o: $(hdrdir)/ruby/internal/core/rarray.h
+newline_conv.o: $(hdrdir)/ruby/internal/core/rbasic.h
+newline_conv.o: $(hdrdir)/ruby/internal/core/rbignum.h
+newline_conv.o: $(hdrdir)/ruby/internal/core/rclass.h
+newline_conv.o: $(hdrdir)/ruby/internal/core/rdata.h
+newline_conv.o: $(hdrdir)/ruby/internal/core/rfile.h
+newline_conv.o: $(hdrdir)/ruby/internal/core/rhash.h
+newline_conv.o: $(hdrdir)/ruby/internal/core/robject.h
+newline_conv.o: $(hdrdir)/ruby/internal/core/rregexp.h
+newline_conv.o: $(hdrdir)/ruby/internal/core/rstring.h
+newline_conv.o: $(hdrdir)/ruby/internal/core/rstruct.h
+newline_conv.o: $(hdrdir)/ruby/internal/core/rtypeddata.h
+newline_conv.o: $(hdrdir)/ruby/internal/ctype.h
+newline_conv.o: $(hdrdir)/ruby/internal/dllexport.h
+newline_conv.o: $(hdrdir)/ruby/internal/dosish.h
+newline_conv.o: $(hdrdir)/ruby/internal/encoding/coderange.h
+newline_conv.o: $(hdrdir)/ruby/internal/encoding/ctype.h
+newline_conv.o: $(hdrdir)/ruby/internal/encoding/encoding.h
+newline_conv.o: $(hdrdir)/ruby/internal/encoding/pathname.h
+newline_conv.o: $(hdrdir)/ruby/internal/encoding/re.h
+newline_conv.o: $(hdrdir)/ruby/internal/encoding/sprintf.h
+newline_conv.o: $(hdrdir)/ruby/internal/encoding/string.h
+newline_conv.o: $(hdrdir)/ruby/internal/encoding/symbol.h
+newline_conv.o: $(hdrdir)/ruby/internal/encoding/transcode.h
+newline_conv.o: $(hdrdir)/ruby/internal/error.h
+newline_conv.o: $(hdrdir)/ruby/internal/eval.h
+newline_conv.o: $(hdrdir)/ruby/internal/event.h
+newline_conv.o: $(hdrdir)/ruby/internal/fl_type.h
+newline_conv.o: $(hdrdir)/ruby/internal/gc.h
+newline_conv.o: $(hdrdir)/ruby/internal/glob.h
+newline_conv.o: $(hdrdir)/ruby/internal/globals.h
+newline_conv.o: $(hdrdir)/ruby/internal/has/attribute.h
+newline_conv.o: $(hdrdir)/ruby/internal/has/builtin.h
+newline_conv.o: $(hdrdir)/ruby/internal/has/c_attribute.h
+newline_conv.o: $(hdrdir)/ruby/internal/has/cpp_attribute.h
+newline_conv.o: $(hdrdir)/ruby/internal/has/declspec_attribute.h
+newline_conv.o: $(hdrdir)/ruby/internal/has/extension.h
+newline_conv.o: $(hdrdir)/ruby/internal/has/feature.h
+newline_conv.o: $(hdrdir)/ruby/internal/has/warning.h
+newline_conv.o: $(hdrdir)/ruby/internal/intern/array.h
+newline_conv.o: $(hdrdir)/ruby/internal/intern/bignum.h
+newline_conv.o: $(hdrdir)/ruby/internal/intern/class.h
+newline_conv.o: $(hdrdir)/ruby/internal/intern/compar.h
+newline_conv.o: $(hdrdir)/ruby/internal/intern/complex.h
+newline_conv.o: $(hdrdir)/ruby/internal/intern/cont.h
+newline_conv.o: $(hdrdir)/ruby/internal/intern/dir.h
+newline_conv.o: $(hdrdir)/ruby/internal/intern/enum.h
+newline_conv.o: $(hdrdir)/ruby/internal/intern/enumerator.h
+newline_conv.o: $(hdrdir)/ruby/internal/intern/error.h
+newline_conv.o: $(hdrdir)/ruby/internal/intern/eval.h
+newline_conv.o: $(hdrdir)/ruby/internal/intern/file.h
+newline_conv.o: $(hdrdir)/ruby/internal/intern/hash.h
+newline_conv.o: $(hdrdir)/ruby/internal/intern/io.h
+newline_conv.o: $(hdrdir)/ruby/internal/intern/load.h
+newline_conv.o: $(hdrdir)/ruby/internal/intern/marshal.h
+newline_conv.o: $(hdrdir)/ruby/internal/intern/numeric.h
+newline_conv.o: $(hdrdir)/ruby/internal/intern/object.h
+newline_conv.o: $(hdrdir)/ruby/internal/intern/parse.h
+newline_conv.o: $(hdrdir)/ruby/internal/intern/proc.h
+newline_conv.o: $(hdrdir)/ruby/internal/intern/process.h
+newline_conv.o: $(hdrdir)/ruby/internal/intern/random.h
+newline_conv.o: $(hdrdir)/ruby/internal/intern/range.h
+newline_conv.o: $(hdrdir)/ruby/internal/intern/rational.h
+newline_conv.o: $(hdrdir)/ruby/internal/intern/re.h
+newline_conv.o: $(hdrdir)/ruby/internal/intern/ruby.h
+newline_conv.o: $(hdrdir)/ruby/internal/intern/select.h
+newline_conv.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+newline_conv.o: $(hdrdir)/ruby/internal/intern/set.h
+newline_conv.o: $(hdrdir)/ruby/internal/intern/signal.h
+newline_conv.o: $(hdrdir)/ruby/internal/intern/sprintf.h
+newline_conv.o: $(hdrdir)/ruby/internal/intern/string.h
+newline_conv.o: $(hdrdir)/ruby/internal/intern/struct.h
+newline_conv.o: $(hdrdir)/ruby/internal/intern/thread.h
+newline_conv.o: $(hdrdir)/ruby/internal/intern/time.h
+newline_conv.o: $(hdrdir)/ruby/internal/intern/variable.h
+newline_conv.o: $(hdrdir)/ruby/internal/intern/vm.h
+newline_conv.o: $(hdrdir)/ruby/internal/interpreter.h
+newline_conv.o: $(hdrdir)/ruby/internal/iterator.h
+newline_conv.o: $(hdrdir)/ruby/internal/memory.h
+newline_conv.o: $(hdrdir)/ruby/internal/method.h
+newline_conv.o: $(hdrdir)/ruby/internal/module.h
+newline_conv.o: $(hdrdir)/ruby/internal/newobj.h
+newline_conv.o: $(hdrdir)/ruby/internal/scan_args.h
+newline_conv.o: $(hdrdir)/ruby/internal/special_consts.h
+newline_conv.o: $(hdrdir)/ruby/internal/static_assert.h
+newline_conv.o: $(hdrdir)/ruby/internal/stdalign.h
+newline_conv.o: $(hdrdir)/ruby/internal/stdbool.h
+newline_conv.o: $(hdrdir)/ruby/internal/stdckdint.h
+newline_conv.o: $(hdrdir)/ruby/internal/symbol.h
+newline_conv.o: $(hdrdir)/ruby/internal/value.h
+newline_conv.o: $(hdrdir)/ruby/internal/value_type.h
+newline_conv.o: $(hdrdir)/ruby/internal/variable.h
+newline_conv.o: $(hdrdir)/ruby/internal/warning_push.h
+newline_conv.o: $(hdrdir)/ruby/internal/xmalloc.h
+newline_conv.o: $(hdrdir)/ruby/io.h
+newline_conv.o: $(hdrdir)/ruby/missing.h
+newline_conv.o: $(hdrdir)/ruby/onigmo.h
+newline_conv.o: $(hdrdir)/ruby/oniguruma.h
+newline_conv.o: $(hdrdir)/ruby/ruby.h
+newline_conv.o: $(hdrdir)/ruby/st.h
+newline_conv.o: $(hdrdir)/ruby/subst.h
+newline_conv.o: newline_conv.c
 stat.o: $(RUBY_EXTCONF_H)
 stat.o: $(arch_hdrdir)/ruby/config.h
 stat.o: $(hdrdir)/ruby/assert.h
@@ -467,6 +644,7 @@ stat.o: $(hdrdir)/ruby/internal/intern/re.h
 stat.o: $(hdrdir)/ruby/internal/intern/ruby.h
 stat.o: $(hdrdir)/ruby/internal/intern/select.h
 stat.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+stat.o: $(hdrdir)/ruby/internal/intern/set.h
 stat.o: $(hdrdir)/ruby/internal/intern/signal.h
 stat.o: $(hdrdir)/ruby/internal/intern/sprintf.h
 stat.o: $(hdrdir)/ruby/internal/intern/string.h
@@ -486,6 +664,7 @@ stat.o: $(hdrdir)/ruby/internal/special_consts.h
 stat.o: $(hdrdir)/ruby/internal/static_assert.h
 stat.o: $(hdrdir)/ruby/internal/stdalign.h
 stat.o: $(hdrdir)/ruby/internal/stdbool.h
+stat.o: $(hdrdir)/ruby/internal/stdckdint.h
 stat.o: $(hdrdir)/ruby/internal/symbol.h
 stat.o: $(hdrdir)/ruby/internal/value.h
 stat.o: $(hdrdir)/ruby/internal/value_type.h
diff --git a/ext/-test-/file/newline_conv.c b/ext/-test-/file/newline_conv.c
new file mode 100644
index 00000000000000..2ac5aef801ef7f
--- /dev/null
+++ b/ext/-test-/file/newline_conv.c
@@ -0,0 +1,73 @@
+#include "ruby/ruby.h"
+#include "ruby/io.h"
+#include <fcntl.h>
+
+static VALUE
+open_with_rb_file_open(VALUE self, VALUE filename, VALUE read_or_write, VALUE binary_or_text)
+{
+    char fmode[3] = { 0 };
+    if (rb_sym2id(read_or_write) == rb_intern("read")) {
+        fmode[0] = 'r';
+    }
+    else if (rb_sym2id(read_or_write) == rb_intern("write")) {
+        fmode[0] = 'w';
+    }
+    else {
+        rb_raise(rb_eArgError, "read_or_write param must be :read or :write");
+    }
+
+    if (rb_sym2id(binary_or_text) == rb_intern("binary")) {
+        fmode[1] = 'b';
+    }
+    else if (rb_sym2id(binary_or_text) == rb_intern("text")) {
+
+    }
+    else {
+        rb_raise(rb_eArgError, "binary_or_text param must be :binary or :text");
+    }
+
+    return rb_file_open(StringValueCStr(filename), fmode);
+}
+
+static VALUE
+open_with_rb_io_fdopen(VALUE self, VALUE filename, VALUE read_or_write, VALUE binary_or_text)
+{
+    int omode = 0;
+    if (rb_sym2id(read_or_write) == rb_intern("read")) {
+        omode |= O_RDONLY;
+    }
+    else if (rb_sym2id(read_or_write) == rb_intern("write")) {
+        omode |= O_WRONLY;
+    }
+    else {
+        rb_raise(rb_eArgError, "read_or_write param must be :read or :write");
+    }
+
+    if (rb_sym2id(binary_or_text) == rb_intern("binary")) {
+#ifdef O_BINARY
+        omode |= O_BINARY;
+#endif
+    }
+    else if (rb_sym2id(binary_or_text) == rb_intern("text")) {
+
+    }
+    else {
+        rb_raise(rb_eArgError, "binary_or_text param must be :binary or :text");
+    }
+
+    int fd = rb_cloexec_open(StringValueCStr(filename), omode, 0);
+    if (fd < 0) {
+        rb_raise(rb_eIOError, "failed to open the file");
+    }
+
+    rb_update_max_fd(fd);
+    return rb_io_fdopen(fd, omode, StringValueCStr(filename));
+}
+
+void
+Init_newline_conv(VALUE module)
+{
+    VALUE newline_conv = rb_define_module_under(module, "NewlineConv");
+    rb_define_module_function(newline_conv, "rb_file_open", open_with_rb_file_open, 3);
+    rb_define_module_function(newline_conv, "rb_io_fdopen", open_with_rb_io_fdopen, 3);
+}
diff --git a/ext/-test-/float/depend b/ext/-test-/float/depend
index 9580a0416c4d6e..334ed33c3b2299 100644
--- a/ext/-test-/float/depend
+++ b/ext/-test-/float/depend
@@ -131,6 +131,7 @@ init.o: $(hdrdir)/ruby/internal/intern/re.h
 init.o: $(hdrdir)/ruby/internal/intern/ruby.h
 init.o: $(hdrdir)/ruby/internal/intern/select.h
 init.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+init.o: $(hdrdir)/ruby/internal/intern/set.h
 init.o: $(hdrdir)/ruby/internal/intern/signal.h
 init.o: $(hdrdir)/ruby/internal/intern/sprintf.h
 init.o: $(hdrdir)/ruby/internal/intern/string.h
@@ -150,6 +151,7 @@ init.o: $(hdrdir)/ruby/internal/special_consts.h
 init.o: $(hdrdir)/ruby/internal/static_assert.h
 init.o: $(hdrdir)/ruby/internal/stdalign.h
 init.o: $(hdrdir)/ruby/internal/stdbool.h
+init.o: $(hdrdir)/ruby/internal/stdckdint.h
 init.o: $(hdrdir)/ruby/internal/symbol.h
 init.o: $(hdrdir)/ruby/internal/value.h
 init.o: $(hdrdir)/ruby/internal/value_type.h
@@ -290,6 +292,7 @@ nextafter.o: $(hdrdir)/ruby/internal/intern/re.h
 nextafter.o: $(hdrdir)/ruby/internal/intern/ruby.h
 nextafter.o: $(hdrdir)/ruby/internal/intern/select.h
 nextafter.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+nextafter.o: $(hdrdir)/ruby/internal/intern/set.h
 nextafter.o: $(hdrdir)/ruby/internal/intern/signal.h
 nextafter.o: $(hdrdir)/ruby/internal/intern/sprintf.h
 nextafter.o: $(hdrdir)/ruby/internal/intern/string.h
@@ -309,6 +312,7 @@ nextafter.o: $(hdrdir)/ruby/internal/special_consts.h
 nextafter.o: $(hdrdir)/ruby/internal/static_assert.h
 nextafter.o: $(hdrdir)/ruby/internal/stdalign.h
 nextafter.o: $(hdrdir)/ruby/internal/stdbool.h
+nextafter.o: $(hdrdir)/ruby/internal/stdckdint.h
 nextafter.o: $(hdrdir)/ruby/internal/symbol.h
 nextafter.o: $(hdrdir)/ruby/internal/value.h
 nextafter.o: $(hdrdir)/ruby/internal/value_type.h
diff --git a/ext/-test-/funcall/depend b/ext/-test-/funcall/depend
index 6719e4e6760489..e54370306f47ca 100644
--- a/ext/-test-/funcall/depend
+++ b/ext/-test-/funcall/depend
@@ -128,6 +128,7 @@ funcall.o: $(hdrdir)/ruby/internal/intern/re.h
 funcall.o: $(hdrdir)/ruby/internal/intern/ruby.h
 funcall.o: $(hdrdir)/ruby/internal/intern/select.h
 funcall.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+funcall.o: $(hdrdir)/ruby/internal/intern/set.h
 funcall.o: $(hdrdir)/ruby/internal/intern/signal.h
 funcall.o: $(hdrdir)/ruby/internal/intern/sprintf.h
 funcall.o: $(hdrdir)/ruby/internal/intern/string.h
@@ -147,6 +148,7 @@ funcall.o: $(hdrdir)/ruby/internal/special_consts.h
 funcall.o: $(hdrdir)/ruby/internal/static_assert.h
 funcall.o: $(hdrdir)/ruby/internal/stdalign.h
 funcall.o: $(hdrdir)/ruby/internal/stdbool.h
+funcall.o: $(hdrdir)/ruby/internal/stdckdint.h
 funcall.o: $(hdrdir)/ruby/internal/symbol.h
 funcall.o: $(hdrdir)/ruby/internal/value.h
 funcall.o: $(hdrdir)/ruby/internal/value_type.h
diff --git a/ext/-test-/gvl/call_without_gvl/depend b/ext/-test-/gvl/call_without_gvl/depend
index a4987a65ca75c5..236d1e1d3b6148 100644
--- a/ext/-test-/gvl/call_without_gvl/depend
+++ b/ext/-test-/gvl/call_without_gvl/depend
@@ -127,6 +127,7 @@ call_without_gvl.o: $(hdrdir)/ruby/internal/intern/re.h
 call_without_gvl.o: $(hdrdir)/ruby/internal/intern/ruby.h
 call_without_gvl.o: $(hdrdir)/ruby/internal/intern/select.h
 call_without_gvl.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+call_without_gvl.o: $(hdrdir)/ruby/internal/intern/set.h
 call_without_gvl.o: $(hdrdir)/ruby/internal/intern/signal.h
 call_without_gvl.o: $(hdrdir)/ruby/internal/intern/sprintf.h
 call_without_gvl.o: $(hdrdir)/ruby/internal/intern/string.h
@@ -146,6 +147,7 @@ call_without_gvl.o: $(hdrdir)/ruby/internal/special_consts.h
 call_without_gvl.o: $(hdrdir)/ruby/internal/static_assert.h
 call_without_gvl.o: $(hdrdir)/ruby/internal/stdalign.h
 call_without_gvl.o: $(hdrdir)/ruby/internal/stdbool.h
+call_without_gvl.o: $(hdrdir)/ruby/internal/stdckdint.h
 call_without_gvl.o: $(hdrdir)/ruby/internal/symbol.h
 call_without_gvl.o: $(hdrdir)/ruby/internal/value.h
 call_without_gvl.o: $(hdrdir)/ruby/internal/value_type.h
diff --git a/ext/-test-/hash/depend b/ext/-test-/hash/depend
index 58d9a6247e6d6b..416b93f9de37b1 100644
--- a/ext/-test-/hash/depend
+++ b/ext/-test-/hash/depend
@@ -128,6 +128,7 @@ delete.o: $(hdrdir)/ruby/internal/intern/re.h
 delete.o: $(hdrdir)/ruby/internal/intern/ruby.h
 delete.o: $(hdrdir)/ruby/internal/intern/select.h
 delete.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+delete.o: $(hdrdir)/ruby/internal/intern/set.h
 delete.o: $(hdrdir)/ruby/internal/intern/signal.h
 delete.o: $(hdrdir)/ruby/internal/intern/sprintf.h
 delete.o: $(hdrdir)/ruby/internal/intern/string.h
@@ -147,6 +148,7 @@ delete.o: $(hdrdir)/ruby/internal/special_consts.h
 delete.o: $(hdrdir)/ruby/internal/static_assert.h
 delete.o: $(hdrdir)/ruby/internal/stdalign.h
 delete.o: $(hdrdir)/ruby/internal/stdbool.h
+delete.o: $(hdrdir)/ruby/internal/stdckdint.h
 delete.o: $(hdrdir)/ruby/internal/symbol.h
 delete.o: $(hdrdir)/ruby/internal/value.h
 delete.o: $(hdrdir)/ruby/internal/value_type.h
@@ -287,6 +289,7 @@ init.o: $(hdrdir)/ruby/internal/intern/re.h
 init.o: $(hdrdir)/ruby/internal/intern/ruby.h
 init.o: $(hdrdir)/ruby/internal/intern/select.h
 init.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+init.o: $(hdrdir)/ruby/internal/intern/set.h
 init.o: $(hdrdir)/ruby/internal/intern/signal.h
 init.o: $(hdrdir)/ruby/internal/intern/sprintf.h
 init.o: $(hdrdir)/ruby/internal/intern/string.h
@@ -306,6 +309,7 @@ init.o: $(hdrdir)/ruby/internal/special_consts.h
 init.o: $(hdrdir)/ruby/internal/static_assert.h
 init.o: $(hdrdir)/ruby/internal/stdalign.h
 init.o: $(hdrdir)/ruby/internal/stdbool.h
+init.o: $(hdrdir)/ruby/internal/stdckdint.h
 init.o: $(hdrdir)/ruby/internal/symbol.h
 init.o: $(hdrdir)/ruby/internal/value.h
 init.o: $(hdrdir)/ruby/internal/value_type.h
diff --git a/ext/-test-/integer/depend b/ext/-test-/integer/depend
index b68a68ce7344a2..0ea007e814128d 100644
--- a/ext/-test-/integer/depend
+++ b/ext/-test-/integer/depend
@@ -128,6 +128,7 @@ core_ext.o: $(hdrdir)/ruby/internal/intern/re.h
 core_ext.o: $(hdrdir)/ruby/internal/intern/ruby.h
 core_ext.o: $(hdrdir)/ruby/internal/intern/select.h
 core_ext.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+core_ext.o: $(hdrdir)/ruby/internal/intern/set.h
 core_ext.o: $(hdrdir)/ruby/internal/intern/signal.h
 core_ext.o: $(hdrdir)/ruby/internal/intern/sprintf.h
 core_ext.o: $(hdrdir)/ruby/internal/intern/string.h
@@ -147,6 +148,7 @@ core_ext.o: $(hdrdir)/ruby/internal/special_consts.h
 core_ext.o: $(hdrdir)/ruby/internal/static_assert.h
 core_ext.o: $(hdrdir)/ruby/internal/stdalign.h
 core_ext.o: $(hdrdir)/ruby/internal/stdbool.h
+core_ext.o: $(hdrdir)/ruby/internal/stdckdint.h
 core_ext.o: $(hdrdir)/ruby/internal/symbol.h
 core_ext.o: $(hdrdir)/ruby/internal/value.h
 core_ext.o: $(hdrdir)/ruby/internal/value_type.h
@@ -295,6 +297,7 @@ init.o: $(hdrdir)/ruby/internal/intern/re.h
 init.o: $(hdrdir)/ruby/internal/intern/ruby.h
 init.o: $(hdrdir)/ruby/internal/intern/select.h
 init.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+init.o: $(hdrdir)/ruby/internal/intern/set.h
 init.o: $(hdrdir)/ruby/internal/intern/signal.h
 init.o: $(hdrdir)/ruby/internal/intern/sprintf.h
 init.o: $(hdrdir)/ruby/internal/intern/string.h
@@ -314,6 +317,7 @@ init.o: $(hdrdir)/ruby/internal/special_consts.h
 init.o: $(hdrdir)/ruby/internal/static_assert.h
 init.o: $(hdrdir)/ruby/internal/stdalign.h
 init.o: $(hdrdir)/ruby/internal/stdbool.h
+init.o: $(hdrdir)/ruby/internal/stdckdint.h
 init.o: $(hdrdir)/ruby/internal/symbol.h
 init.o: $(hdrdir)/ruby/internal/value.h
 init.o: $(hdrdir)/ruby/internal/value_type.h
@@ -454,6 +458,7 @@ my_integer.o: $(hdrdir)/ruby/internal/intern/re.h
 my_integer.o: $(hdrdir)/ruby/internal/intern/ruby.h
 my_integer.o: $(hdrdir)/ruby/internal/intern/select.h
 my_integer.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+my_integer.o: $(hdrdir)/ruby/internal/intern/set.h
 my_integer.o: $(hdrdir)/ruby/internal/intern/signal.h
 my_integer.o: $(hdrdir)/ruby/internal/intern/sprintf.h
 my_integer.o: $(hdrdir)/ruby/internal/intern/string.h
@@ -473,6 +478,7 @@ my_integer.o: $(hdrdir)/ruby/internal/special_consts.h
 my_integer.o: $(hdrdir)/ruby/internal/static_assert.h
 my_integer.o: $(hdrdir)/ruby/internal/stdalign.h
 my_integer.o: $(hdrdir)/ruby/internal/stdbool.h
+my_integer.o: $(hdrdir)/ruby/internal/stdckdint.h
 my_integer.o: $(hdrdir)/ruby/internal/symbol.h
 my_integer.o: $(hdrdir)/ruby/internal/value.h
 my_integer.o: $(hdrdir)/ruby/internal/value_type.h
diff --git a/ext/-test-/integer/my_integer.c b/ext/-test-/integer/my_integer.c
index d86474bd7dfd48..94f14d27651a3f 100644
--- a/ext/-test-/integer/my_integer.c
+++ b/ext/-test-/integer/my_integer.c
@@ -1,9 +1,13 @@
 #include "ruby.h"
 
+static const rb_data_type_t my_integer_type = {
+    "MyInteger", {0}, 0, 0, RUBY_TYPED_FREE_IMMEDIATELY
+};
+
 static VALUE
 my_integer_s_new(VALUE klass)
 {
-    return Data_Wrap_Struct(klass, 0, 0, 0);
+    return TypedData_Wrap_Struct(klass, &my_integer_type, 0);
 }
 
 void
diff --git a/ext/-test-/iseq_load/depend b/ext/-test-/iseq_load/depend
index 30deb6e039ea23..9361ddb93844ce 100644
--- a/ext/-test-/iseq_load/depend
+++ b/ext/-test-/iseq_load/depend
@@ -128,6 +128,7 @@ iseq_load.o: $(hdrdir)/ruby/internal/intern/re.h
 iseq_load.o: $(hdrdir)/ruby/internal/intern/ruby.h
 iseq_load.o: $(hdrdir)/ruby/internal/intern/select.h
 iseq_load.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+iseq_load.o: $(hdrdir)/ruby/internal/intern/set.h
 iseq_load.o: $(hdrdir)/ruby/internal/intern/signal.h
 iseq_load.o: $(hdrdir)/ruby/internal/intern/sprintf.h
 iseq_load.o: $(hdrdir)/ruby/internal/intern/string.h
@@ -147,6 +148,7 @@ iseq_load.o: $(hdrdir)/ruby/internal/special_consts.h
 iseq_load.o: $(hdrdir)/ruby/internal/static_assert.h
 iseq_load.o: $(hdrdir)/ruby/internal/stdalign.h
 iseq_load.o: $(hdrdir)/ruby/internal/stdbool.h
+iseq_load.o: $(hdrdir)/ruby/internal/stdckdint.h
 iseq_load.o: $(hdrdir)/ruby/internal/symbol.h
 iseq_load.o: $(hdrdir)/ruby/internal/value.h
 iseq_load.o: $(hdrdir)/ruby/internal/value_type.h
diff --git a/ext/-test-/iter/depend b/ext/-test-/iter/depend
index 077a2835328083..161947382cd91b 100644
--- a/ext/-test-/iter/depend
+++ b/ext/-test-/iter/depend
@@ -128,6 +128,7 @@ break.o: $(hdrdir)/ruby/internal/intern/re.h
 break.o: $(hdrdir)/ruby/internal/intern/ruby.h
 break.o: $(hdrdir)/ruby/internal/intern/select.h
 break.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+break.o: $(hdrdir)/ruby/internal/intern/set.h
 break.o: $(hdrdir)/ruby/internal/intern/signal.h
 break.o: $(hdrdir)/ruby/internal/intern/sprintf.h
 break.o: $(hdrdir)/ruby/internal/intern/string.h
@@ -147,6 +148,7 @@ break.o: $(hdrdir)/ruby/internal/special_consts.h
 break.o: $(hdrdir)/ruby/internal/static_assert.h
 break.o: $(hdrdir)/ruby/internal/stdalign.h
 break.o: $(hdrdir)/ruby/internal/stdbool.h
+break.o: $(hdrdir)/ruby/internal/stdckdint.h
 break.o: $(hdrdir)/ruby/internal/symbol.h
 break.o: $(hdrdir)/ruby/internal/value.h
 break.o: $(hdrdir)/ruby/internal/value_type.h
@@ -287,6 +289,7 @@ init.o: $(hdrdir)/ruby/internal/intern/re.h
 init.o: $(hdrdir)/ruby/internal/intern/ruby.h
 init.o: $(hdrdir)/ruby/internal/intern/select.h
 init.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+init.o: $(hdrdir)/ruby/internal/intern/set.h
 init.o: $(hdrdir)/ruby/internal/intern/signal.h
 init.o: $(hdrdir)/ruby/internal/intern/sprintf.h
 init.o: $(hdrdir)/ruby/internal/intern/string.h
@@ -306,6 +309,7 @@ init.o: $(hdrdir)/ruby/internal/special_consts.h
 init.o: $(hdrdir)/ruby/internal/static_assert.h
 init.o: $(hdrdir)/ruby/internal/stdalign.h
 init.o: $(hdrdir)/ruby/internal/stdbool.h
+init.o: $(hdrdir)/ruby/internal/stdckdint.h
 init.o: $(hdrdir)/ruby/internal/symbol.h
 init.o: $(hdrdir)/ruby/internal/value.h
 init.o: $(hdrdir)/ruby/internal/value_type.h
@@ -446,6 +450,7 @@ yield.o: $(hdrdir)/ruby/internal/intern/re.h
 yield.o: $(hdrdir)/ruby/internal/intern/ruby.h
 yield.o: $(hdrdir)/ruby/internal/intern/select.h
 yield.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+yield.o: $(hdrdir)/ruby/internal/intern/set.h
 yield.o: $(hdrdir)/ruby/internal/intern/signal.h
 yield.o: $(hdrdir)/ruby/internal/intern/sprintf.h
 yield.o: $(hdrdir)/ruby/internal/intern/string.h
@@ -465,6 +470,7 @@ yield.o: $(hdrdir)/ruby/internal/special_consts.h
 yield.o: $(hdrdir)/ruby/internal/static_assert.h
 yield.o: $(hdrdir)/ruby/internal/stdalign.h
 yield.o: $(hdrdir)/ruby/internal/stdbool.h
+yield.o: $(hdrdir)/ruby/internal/stdckdint.h
 yield.o: $(hdrdir)/ruby/internal/symbol.h
 yield.o: $(hdrdir)/ruby/internal/value.h
 yield.o: $(hdrdir)/ruby/internal/value_type.h
diff --git a/ext/-test-/load/dot.dot/depend b/ext/-test-/load/dot.dot/depend
index be835d3ea5b970..339837d1832ad7 100644
--- a/ext/-test-/load/dot.dot/depend
+++ b/ext/-test-/load/dot.dot/depend
@@ -128,6 +128,7 @@ dot.dot.o: $(hdrdir)/ruby/internal/intern/re.h
 dot.dot.o: $(hdrdir)/ruby/internal/intern/ruby.h
 dot.dot.o: $(hdrdir)/ruby/internal/intern/select.h
 dot.dot.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+dot.dot.o: $(hdrdir)/ruby/internal/intern/set.h
 dot.dot.o: $(hdrdir)/ruby/internal/intern/signal.h
 dot.dot.o: $(hdrdir)/ruby/internal/intern/sprintf.h
 dot.dot.o: $(hdrdir)/ruby/internal/intern/string.h
@@ -147,6 +148,7 @@ dot.dot.o: $(hdrdir)/ruby/internal/special_consts.h
 dot.dot.o: $(hdrdir)/ruby/internal/static_assert.h
 dot.dot.o: $(hdrdir)/ruby/internal/stdalign.h
 dot.dot.o: $(hdrdir)/ruby/internal/stdbool.h
+dot.dot.o: $(hdrdir)/ruby/internal/stdckdint.h
 dot.dot.o: $(hdrdir)/ruby/internal/symbol.h
 dot.dot.o: $(hdrdir)/ruby/internal/value.h
 dot.dot.o: $(hdrdir)/ruby/internal/value_type.h
diff --git a/ext/-test-/load/protect/depend b/ext/-test-/load/protect/depend
index 57cf02990115a3..c76c6f88ed9591 100644
--- a/ext/-test-/load/protect/depend
+++ b/ext/-test-/load/protect/depend
@@ -128,6 +128,7 @@ protect.o: $(hdrdir)/ruby/internal/intern/re.h
 protect.o: $(hdrdir)/ruby/internal/intern/ruby.h
 protect.o: $(hdrdir)/ruby/internal/intern/select.h
 protect.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+protect.o: $(hdrdir)/ruby/internal/intern/set.h
 protect.o: $(hdrdir)/ruby/internal/intern/signal.h
 protect.o: $(hdrdir)/ruby/internal/intern/sprintf.h
 protect.o: $(hdrdir)/ruby/internal/intern/string.h
@@ -147,6 +148,7 @@ protect.o: $(hdrdir)/ruby/internal/special_consts.h
 protect.o: $(hdrdir)/ruby/internal/static_assert.h
 protect.o: $(hdrdir)/ruby/internal/stdalign.h
 protect.o: $(hdrdir)/ruby/internal/stdbool.h
+protect.o: $(hdrdir)/ruby/internal/stdckdint.h
 protect.o: $(hdrdir)/ruby/internal/symbol.h
 protect.o: $(hdrdir)/ruby/internal/value.h
 protect.o: $(hdrdir)/ruby/internal/value_type.h
diff --git a/ext/-test-/load/resolve_symbol_resolver/depend b/ext/-test-/load/resolve_symbol_resolver/depend
new file mode 100644
index 00000000000000..f422898b691af7
--- /dev/null
+++ b/ext/-test-/load/resolve_symbol_resolver/depend
@@ -0,0 +1,163 @@
+# AUTOGENERATED DEPENDENCIES START
+resolve_symbol_resolver.o: $(RUBY_EXTCONF_H)
+resolve_symbol_resolver.o: $(arch_hdrdir)/ruby/config.h
+resolve_symbol_resolver.o: $(hdrdir)/ruby.h
+resolve_symbol_resolver.o: $(hdrdir)/ruby/assert.h
+resolve_symbol_resolver.o: $(hdrdir)/ruby/backward.h
+resolve_symbol_resolver.o: $(hdrdir)/ruby/backward/2/assume.h
+resolve_symbol_resolver.o: $(hdrdir)/ruby/backward/2/attributes.h
+resolve_symbol_resolver.o: $(hdrdir)/ruby/backward/2/bool.h
+resolve_symbol_resolver.o: $(hdrdir)/ruby/backward/2/inttypes.h
+resolve_symbol_resolver.o: $(hdrdir)/ruby/backward/2/limits.h
+resolve_symbol_resolver.o: $(hdrdir)/ruby/backward/2/long_long.h
+resolve_symbol_resolver.o: $(hdrdir)/ruby/backward/2/stdalign.h
+resolve_symbol_resolver.o: $(hdrdir)/ruby/backward/2/stdarg.h
+resolve_symbol_resolver.o: $(hdrdir)/ruby/defines.h
+resolve_symbol_resolver.o: $(hdrdir)/ruby/intern.h
+resolve_symbol_resolver.o: $(hdrdir)/ruby/internal/abi.h
+resolve_symbol_resolver.o: $(hdrdir)/ruby/internal/anyargs.h
+resolve_symbol_resolver.o: $(hdrdir)/ruby/internal/arithmetic.h
+resolve_symbol_resolver.o: $(hdrdir)/ruby/internal/arithmetic/char.h
+resolve_symbol_resolver.o: $(hdrdir)/ruby/internal/arithmetic/double.h
+resolve_symbol_resolver.o: $(hdrdir)/ruby/internal/arithmetic/fixnum.h
+resolve_symbol_resolver.o: $(hdrdir)/ruby/internal/arithmetic/gid_t.h
+resolve_symbol_resolver.o: $(hdrdir)/ruby/internal/arithmetic/int.h
+resolve_symbol_resolver.o: $(hdrdir)/ruby/internal/arithmetic/intptr_t.h
+resolve_symbol_resolver.o: $(hdrdir)/ruby/internal/arithmetic/long.h
+resolve_symbol_resolver.o: $(hdrdir)/ruby/internal/arithmetic/long_long.h
+resolve_symbol_resolver.o: $(hdrdir)/ruby/internal/arithmetic/mode_t.h
+resolve_symbol_resolver.o: $(hdrdir)/ruby/internal/arithmetic/off_t.h
+resolve_symbol_resolver.o: $(hdrdir)/ruby/internal/arithmetic/pid_t.h
+resolve_symbol_resolver.o: $(hdrdir)/ruby/internal/arithmetic/short.h
+resolve_symbol_resolver.o: $(hdrdir)/ruby/internal/arithmetic/size_t.h
+resolve_symbol_resolver.o: $(hdrdir)/ruby/internal/arithmetic/st_data_t.h
+resolve_symbol_resolver.o: $(hdrdir)/ruby/internal/arithmetic/uid_t.h
+resolve_symbol_resolver.o: $(hdrdir)/ruby/internal/assume.h
+resolve_symbol_resolver.o: $(hdrdir)/ruby/internal/attr/alloc_size.h
+resolve_symbol_resolver.o: $(hdrdir)/ruby/internal/attr/artificial.h
+resolve_symbol_resolver.o: $(hdrdir)/ruby/internal/attr/cold.h
+resolve_symbol_resolver.o: $(hdrdir)/ruby/internal/attr/const.h
+resolve_symbol_resolver.o: $(hdrdir)/ruby/internal/attr/constexpr.h
+resolve_symbol_resolver.o: $(hdrdir)/ruby/internal/attr/deprecated.h
+resolve_symbol_resolver.o: $(hdrdir)/ruby/internal/attr/diagnose_if.h
+resolve_symbol_resolver.o: $(hdrdir)/ruby/internal/attr/enum_extensibility.h
+resolve_symbol_resolver.o: $(hdrdir)/ruby/internal/attr/error.h
+resolve_symbol_resolver.o: $(hdrdir)/ruby/internal/attr/flag_enum.h
+resolve_symbol_resolver.o: $(hdrdir)/ruby/internal/attr/forceinline.h
+resolve_symbol_resolver.o: $(hdrdir)/ruby/internal/attr/format.h
+resolve_symbol_resolver.o: $(hdrdir)/ruby/internal/attr/maybe_unused.h
+resolve_symbol_resolver.o: $(hdrdir)/ruby/internal/attr/noalias.h
+resolve_symbol_resolver.o: $(hdrdir)/ruby/internal/attr/nodiscard.h
+resolve_symbol_resolver.o: $(hdrdir)/ruby/internal/attr/noexcept.h
+resolve_symbol_resolver.o: $(hdrdir)/ruby/internal/attr/noinline.h
+resolve_symbol_resolver.o: $(hdrdir)/ruby/internal/attr/nonnull.h
+resolve_symbol_resolver.o: $(hdrdir)/ruby/internal/attr/noreturn.h
+resolve_symbol_resolver.o: $(hdrdir)/ruby/internal/attr/packed_struct.h
+resolve_symbol_resolver.o: $(hdrdir)/ruby/internal/attr/pure.h
+resolve_symbol_resolver.o: $(hdrdir)/ruby/internal/attr/restrict.h
+resolve_symbol_resolver.o: $(hdrdir)/ruby/internal/attr/returns_nonnull.h
+resolve_symbol_resolver.o: $(hdrdir)/ruby/internal/attr/warning.h
+resolve_symbol_resolver.o: $(hdrdir)/ruby/internal/attr/weakref.h
+resolve_symbol_resolver.o: $(hdrdir)/ruby/internal/cast.h
+resolve_symbol_resolver.o: $(hdrdir)/ruby/internal/compiler_is.h
+resolve_symbol_resolver.o: $(hdrdir)/ruby/internal/compiler_is/apple.h
+resolve_symbol_resolver.o: $(hdrdir)/ruby/internal/compiler_is/clang.h
+resolve_symbol_resolver.o: $(hdrdir)/ruby/internal/compiler_is/gcc.h
+resolve_symbol_resolver.o: $(hdrdir)/ruby/internal/compiler_is/intel.h
+resolve_symbol_resolver.o: $(hdrdir)/ruby/internal/compiler_is/msvc.h
+resolve_symbol_resolver.o: $(hdrdir)/ruby/internal/compiler_is/sunpro.h
+resolve_symbol_resolver.o: $(hdrdir)/ruby/internal/compiler_since.h
+resolve_symbol_resolver.o: $(hdrdir)/ruby/internal/config.h
+resolve_symbol_resolver.o: $(hdrdir)/ruby/internal/constant_p.h
+resolve_symbol_resolver.o: $(hdrdir)/ruby/internal/core.h
+resolve_symbol_resolver.o: $(hdrdir)/ruby/internal/core/rarray.h
+resolve_symbol_resolver.o: $(hdrdir)/ruby/internal/core/rbasic.h
+resolve_symbol_resolver.o: $(hdrdir)/ruby/internal/core/rbignum.h
+resolve_symbol_resolver.o: $(hdrdir)/ruby/internal/core/rclass.h
+resolve_symbol_resolver.o: $(hdrdir)/ruby/internal/core/rdata.h
+resolve_symbol_resolver.o: $(hdrdir)/ruby/internal/core/rfile.h
+resolve_symbol_resolver.o: $(hdrdir)/ruby/internal/core/rhash.h
+resolve_symbol_resolver.o: $(hdrdir)/ruby/internal/core/robject.h
+resolve_symbol_resolver.o: $(hdrdir)/ruby/internal/core/rregexp.h
+resolve_symbol_resolver.o: $(hdrdir)/ruby/internal/core/rstring.h
+resolve_symbol_resolver.o: $(hdrdir)/ruby/internal/core/rstruct.h
+resolve_symbol_resolver.o: $(hdrdir)/ruby/internal/core/rtypeddata.h
+resolve_symbol_resolver.o: $(hdrdir)/ruby/internal/ctype.h
+resolve_symbol_resolver.o: $(hdrdir)/ruby/internal/dllexport.h
+resolve_symbol_resolver.o: $(hdrdir)/ruby/internal/dosish.h
+resolve_symbol_resolver.o: $(hdrdir)/ruby/internal/error.h
+resolve_symbol_resolver.o: $(hdrdir)/ruby/internal/eval.h
+resolve_symbol_resolver.o: $(hdrdir)/ruby/internal/event.h
+resolve_symbol_resolver.o: $(hdrdir)/ruby/internal/fl_type.h
+resolve_symbol_resolver.o: $(hdrdir)/ruby/internal/gc.h
+resolve_symbol_resolver.o: $(hdrdir)/ruby/internal/glob.h
+resolve_symbol_resolver.o: $(hdrdir)/ruby/internal/globals.h
+resolve_symbol_resolver.o: $(hdrdir)/ruby/internal/has/attribute.h
+resolve_symbol_resolver.o: $(hdrdir)/ruby/internal/has/builtin.h
+resolve_symbol_resolver.o: $(hdrdir)/ruby/internal/has/c_attribute.h
+resolve_symbol_resolver.o: $(hdrdir)/ruby/internal/has/cpp_attribute.h
+resolve_symbol_resolver.o: $(hdrdir)/ruby/internal/has/declspec_attribute.h
+resolve_symbol_resolver.o: $(hdrdir)/ruby/internal/has/extension.h
+resolve_symbol_resolver.o: $(hdrdir)/ruby/internal/has/feature.h
+resolve_symbol_resolver.o: $(hdrdir)/ruby/internal/has/warning.h
+resolve_symbol_resolver.o: $(hdrdir)/ruby/internal/intern/array.h
+resolve_symbol_resolver.o: $(hdrdir)/ruby/internal/intern/bignum.h
+resolve_symbol_resolver.o: $(hdrdir)/ruby/internal/intern/class.h
+resolve_symbol_resolver.o: $(hdrdir)/ruby/internal/intern/compar.h
+resolve_symbol_resolver.o: $(hdrdir)/ruby/internal/intern/complex.h
+resolve_symbol_resolver.o: $(hdrdir)/ruby/internal/intern/cont.h
+resolve_symbol_resolver.o: $(hdrdir)/ruby/internal/intern/dir.h
+resolve_symbol_resolver.o: $(hdrdir)/ruby/internal/intern/enum.h
+resolve_symbol_resolver.o: $(hdrdir)/ruby/internal/intern/enumerator.h
+resolve_symbol_resolver.o: $(hdrdir)/ruby/internal/intern/error.h
+resolve_symbol_resolver.o: $(hdrdir)/ruby/internal/intern/eval.h
+resolve_symbol_resolver.o: $(hdrdir)/ruby/internal/intern/file.h
+resolve_symbol_resolver.o: $(hdrdir)/ruby/internal/intern/hash.h
+resolve_symbol_resolver.o: $(hdrdir)/ruby/internal/intern/io.h
+resolve_symbol_resolver.o: $(hdrdir)/ruby/internal/intern/load.h
+resolve_symbol_resolver.o: $(hdrdir)/ruby/internal/intern/marshal.h
+resolve_symbol_resolver.o: $(hdrdir)/ruby/internal/intern/numeric.h
+resolve_symbol_resolver.o: $(hdrdir)/ruby/internal/intern/object.h
+resolve_symbol_resolver.o: $(hdrdir)/ruby/internal/intern/parse.h
+resolve_symbol_resolver.o: $(hdrdir)/ruby/internal/intern/proc.h
+resolve_symbol_resolver.o: $(hdrdir)/ruby/internal/intern/process.h
+resolve_symbol_resolver.o: $(hdrdir)/ruby/internal/intern/random.h
+resolve_symbol_resolver.o: $(hdrdir)/ruby/internal/intern/range.h
+resolve_symbol_resolver.o: $(hdrdir)/ruby/internal/intern/rational.h
+resolve_symbol_resolver.o: $(hdrdir)/ruby/internal/intern/re.h
+resolve_symbol_resolver.o: $(hdrdir)/ruby/internal/intern/ruby.h
+resolve_symbol_resolver.o: $(hdrdir)/ruby/internal/intern/select.h
+resolve_symbol_resolver.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+resolve_symbol_resolver.o: $(hdrdir)/ruby/internal/intern/set.h
+resolve_symbol_resolver.o: $(hdrdir)/ruby/internal/intern/signal.h
+resolve_symbol_resolver.o: $(hdrdir)/ruby/internal/intern/sprintf.h
+resolve_symbol_resolver.o: $(hdrdir)/ruby/internal/intern/string.h
+resolve_symbol_resolver.o: $(hdrdir)/ruby/internal/intern/struct.h
+resolve_symbol_resolver.o: $(hdrdir)/ruby/internal/intern/thread.h
+resolve_symbol_resolver.o: $(hdrdir)/ruby/internal/intern/time.h
+resolve_symbol_resolver.o: $(hdrdir)/ruby/internal/intern/variable.h
+resolve_symbol_resolver.o: $(hdrdir)/ruby/internal/intern/vm.h
+resolve_symbol_resolver.o: $(hdrdir)/ruby/internal/interpreter.h
+resolve_symbol_resolver.o: $(hdrdir)/ruby/internal/iterator.h
+resolve_symbol_resolver.o: $(hdrdir)/ruby/internal/memory.h
+resolve_symbol_resolver.o: $(hdrdir)/ruby/internal/method.h
+resolve_symbol_resolver.o: $(hdrdir)/ruby/internal/module.h
+resolve_symbol_resolver.o: $(hdrdir)/ruby/internal/newobj.h
+resolve_symbol_resolver.o: $(hdrdir)/ruby/internal/scan_args.h
+resolve_symbol_resolver.o: $(hdrdir)/ruby/internal/special_consts.h
+resolve_symbol_resolver.o: $(hdrdir)/ruby/internal/static_assert.h
+resolve_symbol_resolver.o: $(hdrdir)/ruby/internal/stdalign.h
+resolve_symbol_resolver.o: $(hdrdir)/ruby/internal/stdbool.h
+resolve_symbol_resolver.o: $(hdrdir)/ruby/internal/stdckdint.h
+resolve_symbol_resolver.o: $(hdrdir)/ruby/internal/symbol.h
+resolve_symbol_resolver.o: $(hdrdir)/ruby/internal/value.h
+resolve_symbol_resolver.o: $(hdrdir)/ruby/internal/value_type.h
+resolve_symbol_resolver.o: $(hdrdir)/ruby/internal/variable.h
+resolve_symbol_resolver.o: $(hdrdir)/ruby/internal/warning_push.h
+resolve_symbol_resolver.o: $(hdrdir)/ruby/internal/xmalloc.h
+resolve_symbol_resolver.o: $(hdrdir)/ruby/missing.h
+resolve_symbol_resolver.o: $(hdrdir)/ruby/ruby.h
+resolve_symbol_resolver.o: $(hdrdir)/ruby/st.h
+resolve_symbol_resolver.o: $(hdrdir)/ruby/subst.h
+resolve_symbol_resolver.o: resolve_symbol_resolver.c
+# AUTOGENERATED DEPENDENCIES END
diff --git a/ext/-test-/load/resolve_symbol_resolver/extconf.rb b/ext/-test-/load/resolve_symbol_resolver/extconf.rb
new file mode 100644
index 00000000000000..2299efcfd3780f
--- /dev/null
+++ b/ext/-test-/load/resolve_symbol_resolver/extconf.rb
@@ -0,0 +1 @@
+create_makefile('-test-/load/resolve_symbol_resolver')
diff --git a/ext/-test-/load/resolve_symbol_resolver/resolve_symbol_resolver.c b/ext/-test-/load/resolve_symbol_resolver/resolve_symbol_resolver.c
new file mode 100644
index 00000000000000..6cc07cc1f84b14
--- /dev/null
+++ b/ext/-test-/load/resolve_symbol_resolver/resolve_symbol_resolver.c
@@ -0,0 +1,56 @@
+#include <ruby.h>
+#include "ruby/internal/intern/load.h"
+
+typedef VALUE(*target_func)(VALUE);
+
+static target_func rst_any_method;
+
+#define resolve_func(file, name) (target_func)(uintptr_t)rb_ext_resolve_symbol(file, name)
+VALUE
+rsr_any_method(VALUE klass)
+{
+    return rst_any_method((VALUE)NULL);
+}
+
+VALUE
+rsr_try_resolve_fname(VALUE klass)
+{
+    target_func rst_something_missing =
+        resolve_func("-test-/load/resolve_symbol_missing", "rst_any_method");
+    if (rst_something_missing == NULL) {
+        // This should be done in Init_*, so the error is LoadError
+        rb_raise(rb_eLoadError, "symbol not found: missing fname");
+    }
+    return Qtrue;
+}
+
+VALUE
+rsr_try_resolve_sname(VALUE klass)
+{
+    target_func rst_something_missing =
+        resolve_func("-test-/load/resolve_symbol_target", "rst_something_missing");
+    if (rst_something_missing == NULL) {
+        // This should be done in Init_*, so the error is LoadError
+        rb_raise(rb_eLoadError, "symbol not found: missing sname");
+    }
+    return Qtrue;
+}
+
+void
+Init_resolve_symbol_resolver(void)
+{
+    /*
+     * Resolving symbols at the head of Init_ because it raises LoadError (in cases).
+     * If the module and methods are defined before raising LoadError, retrying `require "this.so"` will
+     * cause re-defining those methods (and will be warned).
+     */
+    rst_any_method = resolve_func("-test-/load/resolve_symbol_target", "rst_any_method");
+    if (rst_any_method == NULL) {
+        rb_raise(rb_eLoadError, "resolve_symbol_target is not loaded");
+    }
+
+    VALUE mod = rb_define_module("ResolveSymbolResolver");
+    rb_define_singleton_method(mod, "any_method", rsr_any_method, 0);
+    rb_define_singleton_method(mod, "try_resolve_fname", rsr_try_resolve_fname, 0);
+    rb_define_singleton_method(mod, "try_resolve_sname", rsr_try_resolve_sname, 0);
+}
diff --git a/ext/-test-/load/resolve_symbol_target/depend b/ext/-test-/load/resolve_symbol_target/depend
new file mode 100644
index 00000000000000..aa0b5327bee023
--- /dev/null
+++ b/ext/-test-/load/resolve_symbol_target/depend
@@ -0,0 +1,164 @@
+# AUTOGENERATED DEPENDENCIES START
+resolve_symbol_target.o: $(RUBY_EXTCONF_H)
+resolve_symbol_target.o: $(arch_hdrdir)/ruby/config.h
+resolve_symbol_target.o: $(hdrdir)/ruby.h
+resolve_symbol_target.o: $(hdrdir)/ruby/assert.h
+resolve_symbol_target.o: $(hdrdir)/ruby/backward.h
+resolve_symbol_target.o: $(hdrdir)/ruby/backward/2/assume.h
+resolve_symbol_target.o: $(hdrdir)/ruby/backward/2/attributes.h
+resolve_symbol_target.o: $(hdrdir)/ruby/backward/2/bool.h
+resolve_symbol_target.o: $(hdrdir)/ruby/backward/2/inttypes.h
+resolve_symbol_target.o: $(hdrdir)/ruby/backward/2/limits.h
+resolve_symbol_target.o: $(hdrdir)/ruby/backward/2/long_long.h
+resolve_symbol_target.o: $(hdrdir)/ruby/backward/2/stdalign.h
+resolve_symbol_target.o: $(hdrdir)/ruby/backward/2/stdarg.h
+resolve_symbol_target.o: $(hdrdir)/ruby/defines.h
+resolve_symbol_target.o: $(hdrdir)/ruby/intern.h
+resolve_symbol_target.o: $(hdrdir)/ruby/internal/abi.h
+resolve_symbol_target.o: $(hdrdir)/ruby/internal/anyargs.h
+resolve_symbol_target.o: $(hdrdir)/ruby/internal/arithmetic.h
+resolve_symbol_target.o: $(hdrdir)/ruby/internal/arithmetic/char.h
+resolve_symbol_target.o: $(hdrdir)/ruby/internal/arithmetic/double.h
+resolve_symbol_target.o: $(hdrdir)/ruby/internal/arithmetic/fixnum.h
+resolve_symbol_target.o: $(hdrdir)/ruby/internal/arithmetic/gid_t.h
+resolve_symbol_target.o: $(hdrdir)/ruby/internal/arithmetic/int.h
+resolve_symbol_target.o: $(hdrdir)/ruby/internal/arithmetic/intptr_t.h
+resolve_symbol_target.o: $(hdrdir)/ruby/internal/arithmetic/long.h
+resolve_symbol_target.o: $(hdrdir)/ruby/internal/arithmetic/long_long.h
+resolve_symbol_target.o: $(hdrdir)/ruby/internal/arithmetic/mode_t.h
+resolve_symbol_target.o: $(hdrdir)/ruby/internal/arithmetic/off_t.h
+resolve_symbol_target.o: $(hdrdir)/ruby/internal/arithmetic/pid_t.h
+resolve_symbol_target.o: $(hdrdir)/ruby/internal/arithmetic/short.h
+resolve_symbol_target.o: $(hdrdir)/ruby/internal/arithmetic/size_t.h
+resolve_symbol_target.o: $(hdrdir)/ruby/internal/arithmetic/st_data_t.h
+resolve_symbol_target.o: $(hdrdir)/ruby/internal/arithmetic/uid_t.h
+resolve_symbol_target.o: $(hdrdir)/ruby/internal/assume.h
+resolve_symbol_target.o: $(hdrdir)/ruby/internal/attr/alloc_size.h
+resolve_symbol_target.o: $(hdrdir)/ruby/internal/attr/artificial.h
+resolve_symbol_target.o: $(hdrdir)/ruby/internal/attr/cold.h
+resolve_symbol_target.o: $(hdrdir)/ruby/internal/attr/const.h
+resolve_symbol_target.o: $(hdrdir)/ruby/internal/attr/constexpr.h
+resolve_symbol_target.o: $(hdrdir)/ruby/internal/attr/deprecated.h
+resolve_symbol_target.o: $(hdrdir)/ruby/internal/attr/diagnose_if.h
+resolve_symbol_target.o: $(hdrdir)/ruby/internal/attr/enum_extensibility.h
+resolve_symbol_target.o: $(hdrdir)/ruby/internal/attr/error.h
+resolve_symbol_target.o: $(hdrdir)/ruby/internal/attr/flag_enum.h
+resolve_symbol_target.o: $(hdrdir)/ruby/internal/attr/forceinline.h
+resolve_symbol_target.o: $(hdrdir)/ruby/internal/attr/format.h
+resolve_symbol_target.o: $(hdrdir)/ruby/internal/attr/maybe_unused.h
+resolve_symbol_target.o: $(hdrdir)/ruby/internal/attr/noalias.h
+resolve_symbol_target.o: $(hdrdir)/ruby/internal/attr/nodiscard.h
+resolve_symbol_target.o: $(hdrdir)/ruby/internal/attr/noexcept.h
+resolve_symbol_target.o: $(hdrdir)/ruby/internal/attr/noinline.h
+resolve_symbol_target.o: $(hdrdir)/ruby/internal/attr/nonnull.h
+resolve_symbol_target.o: $(hdrdir)/ruby/internal/attr/noreturn.h
+resolve_symbol_target.o: $(hdrdir)/ruby/internal/attr/packed_struct.h
+resolve_symbol_target.o: $(hdrdir)/ruby/internal/attr/pure.h
+resolve_symbol_target.o: $(hdrdir)/ruby/internal/attr/restrict.h
+resolve_symbol_target.o: $(hdrdir)/ruby/internal/attr/returns_nonnull.h
+resolve_symbol_target.o: $(hdrdir)/ruby/internal/attr/warning.h
+resolve_symbol_target.o: $(hdrdir)/ruby/internal/attr/weakref.h
+resolve_symbol_target.o: $(hdrdir)/ruby/internal/cast.h
+resolve_symbol_target.o: $(hdrdir)/ruby/internal/compiler_is.h
+resolve_symbol_target.o: $(hdrdir)/ruby/internal/compiler_is/apple.h
+resolve_symbol_target.o: $(hdrdir)/ruby/internal/compiler_is/clang.h
+resolve_symbol_target.o: $(hdrdir)/ruby/internal/compiler_is/gcc.h
+resolve_symbol_target.o: $(hdrdir)/ruby/internal/compiler_is/intel.h
+resolve_symbol_target.o: $(hdrdir)/ruby/internal/compiler_is/msvc.h
+resolve_symbol_target.o: $(hdrdir)/ruby/internal/compiler_is/sunpro.h
+resolve_symbol_target.o: $(hdrdir)/ruby/internal/compiler_since.h
+resolve_symbol_target.o: $(hdrdir)/ruby/internal/config.h
+resolve_symbol_target.o: $(hdrdir)/ruby/internal/constant_p.h
+resolve_symbol_target.o: $(hdrdir)/ruby/internal/core.h
+resolve_symbol_target.o: $(hdrdir)/ruby/internal/core/rarray.h
+resolve_symbol_target.o: $(hdrdir)/ruby/internal/core/rbasic.h
+resolve_symbol_target.o: $(hdrdir)/ruby/internal/core/rbignum.h
+resolve_symbol_target.o: $(hdrdir)/ruby/internal/core/rclass.h
+resolve_symbol_target.o: $(hdrdir)/ruby/internal/core/rdata.h
+resolve_symbol_target.o: $(hdrdir)/ruby/internal/core/rfile.h
+resolve_symbol_target.o: $(hdrdir)/ruby/internal/core/rhash.h
+resolve_symbol_target.o: $(hdrdir)/ruby/internal/core/robject.h
+resolve_symbol_target.o: $(hdrdir)/ruby/internal/core/rregexp.h
+resolve_symbol_target.o: $(hdrdir)/ruby/internal/core/rstring.h
+resolve_symbol_target.o: $(hdrdir)/ruby/internal/core/rstruct.h
+resolve_symbol_target.o: $(hdrdir)/ruby/internal/core/rtypeddata.h
+resolve_symbol_target.o: $(hdrdir)/ruby/internal/ctype.h
+resolve_symbol_target.o: $(hdrdir)/ruby/internal/dllexport.h
+resolve_symbol_target.o: $(hdrdir)/ruby/internal/dosish.h
+resolve_symbol_target.o: $(hdrdir)/ruby/internal/error.h
+resolve_symbol_target.o: $(hdrdir)/ruby/internal/eval.h
+resolve_symbol_target.o: $(hdrdir)/ruby/internal/event.h
+resolve_symbol_target.o: $(hdrdir)/ruby/internal/fl_type.h
+resolve_symbol_target.o: $(hdrdir)/ruby/internal/gc.h
+resolve_symbol_target.o: $(hdrdir)/ruby/internal/glob.h
+resolve_symbol_target.o: $(hdrdir)/ruby/internal/globals.h
+resolve_symbol_target.o: $(hdrdir)/ruby/internal/has/attribute.h
+resolve_symbol_target.o: $(hdrdir)/ruby/internal/has/builtin.h
+resolve_symbol_target.o: $(hdrdir)/ruby/internal/has/c_attribute.h
+resolve_symbol_target.o: $(hdrdir)/ruby/internal/has/cpp_attribute.h
+resolve_symbol_target.o: $(hdrdir)/ruby/internal/has/declspec_attribute.h
+resolve_symbol_target.o: $(hdrdir)/ruby/internal/has/extension.h
+resolve_symbol_target.o: $(hdrdir)/ruby/internal/has/feature.h
+resolve_symbol_target.o: $(hdrdir)/ruby/internal/has/warning.h
+resolve_symbol_target.o: $(hdrdir)/ruby/internal/intern/array.h
+resolve_symbol_target.o: $(hdrdir)/ruby/internal/intern/bignum.h
+resolve_symbol_target.o: $(hdrdir)/ruby/internal/intern/class.h
+resolve_symbol_target.o: $(hdrdir)/ruby/internal/intern/compar.h
+resolve_symbol_target.o: $(hdrdir)/ruby/internal/intern/complex.h
+resolve_symbol_target.o: $(hdrdir)/ruby/internal/intern/cont.h
+resolve_symbol_target.o: $(hdrdir)/ruby/internal/intern/dir.h
+resolve_symbol_target.o: $(hdrdir)/ruby/internal/intern/enum.h
+resolve_symbol_target.o: $(hdrdir)/ruby/internal/intern/enumerator.h
+resolve_symbol_target.o: $(hdrdir)/ruby/internal/intern/error.h
+resolve_symbol_target.o: $(hdrdir)/ruby/internal/intern/eval.h
+resolve_symbol_target.o: $(hdrdir)/ruby/internal/intern/file.h
+resolve_symbol_target.o: $(hdrdir)/ruby/internal/intern/hash.h
+resolve_symbol_target.o: $(hdrdir)/ruby/internal/intern/io.h
+resolve_symbol_target.o: $(hdrdir)/ruby/internal/intern/load.h
+resolve_symbol_target.o: $(hdrdir)/ruby/internal/intern/marshal.h
+resolve_symbol_target.o: $(hdrdir)/ruby/internal/intern/numeric.h
+resolve_symbol_target.o: $(hdrdir)/ruby/internal/intern/object.h
+resolve_symbol_target.o: $(hdrdir)/ruby/internal/intern/parse.h
+resolve_symbol_target.o: $(hdrdir)/ruby/internal/intern/proc.h
+resolve_symbol_target.o: $(hdrdir)/ruby/internal/intern/process.h
+resolve_symbol_target.o: $(hdrdir)/ruby/internal/intern/random.h
+resolve_symbol_target.o: $(hdrdir)/ruby/internal/intern/range.h
+resolve_symbol_target.o: $(hdrdir)/ruby/internal/intern/rational.h
+resolve_symbol_target.o: $(hdrdir)/ruby/internal/intern/re.h
+resolve_symbol_target.o: $(hdrdir)/ruby/internal/intern/ruby.h
+resolve_symbol_target.o: $(hdrdir)/ruby/internal/intern/select.h
+resolve_symbol_target.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+resolve_symbol_target.o: $(hdrdir)/ruby/internal/intern/set.h
+resolve_symbol_target.o: $(hdrdir)/ruby/internal/intern/signal.h
+resolve_symbol_target.o: $(hdrdir)/ruby/internal/intern/sprintf.h
+resolve_symbol_target.o: $(hdrdir)/ruby/internal/intern/string.h
+resolve_symbol_target.o: $(hdrdir)/ruby/internal/intern/struct.h
+resolve_symbol_target.o: $(hdrdir)/ruby/internal/intern/thread.h
+resolve_symbol_target.o: $(hdrdir)/ruby/internal/intern/time.h
+resolve_symbol_target.o: $(hdrdir)/ruby/internal/intern/variable.h
+resolve_symbol_target.o: $(hdrdir)/ruby/internal/intern/vm.h
+resolve_symbol_target.o: $(hdrdir)/ruby/internal/interpreter.h
+resolve_symbol_target.o: $(hdrdir)/ruby/internal/iterator.h
+resolve_symbol_target.o: $(hdrdir)/ruby/internal/memory.h
+resolve_symbol_target.o: $(hdrdir)/ruby/internal/method.h
+resolve_symbol_target.o: $(hdrdir)/ruby/internal/module.h
+resolve_symbol_target.o: $(hdrdir)/ruby/internal/newobj.h
+resolve_symbol_target.o: $(hdrdir)/ruby/internal/scan_args.h
+resolve_symbol_target.o: $(hdrdir)/ruby/internal/special_consts.h
+resolve_symbol_target.o: $(hdrdir)/ruby/internal/static_assert.h
+resolve_symbol_target.o: $(hdrdir)/ruby/internal/stdalign.h
+resolve_symbol_target.o: $(hdrdir)/ruby/internal/stdbool.h
+resolve_symbol_target.o: $(hdrdir)/ruby/internal/stdckdint.h
+resolve_symbol_target.o: $(hdrdir)/ruby/internal/symbol.h
+resolve_symbol_target.o: $(hdrdir)/ruby/internal/value.h
+resolve_symbol_target.o: $(hdrdir)/ruby/internal/value_type.h
+resolve_symbol_target.o: $(hdrdir)/ruby/internal/variable.h
+resolve_symbol_target.o: $(hdrdir)/ruby/internal/warning_push.h
+resolve_symbol_target.o: $(hdrdir)/ruby/internal/xmalloc.h
+resolve_symbol_target.o: $(hdrdir)/ruby/missing.h
+resolve_symbol_target.o: $(hdrdir)/ruby/ruby.h
+resolve_symbol_target.o: $(hdrdir)/ruby/st.h
+resolve_symbol_target.o: $(hdrdir)/ruby/subst.h
+resolve_symbol_target.o: resolve_symbol_target.c
+resolve_symbol_target.o: resolve_symbol_target.h
+# AUTOGENERATED DEPENDENCIES END
diff --git a/ext/-test-/load/resolve_symbol_target/extconf.rb b/ext/-test-/load/resolve_symbol_target/extconf.rb
new file mode 100644
index 00000000000000..b5a99ca7f1ec64
--- /dev/null
+++ b/ext/-test-/load/resolve_symbol_target/extconf.rb
@@ -0,0 +1 @@
+create_makefile('-test-/load/resolve_symbol_target')
diff --git a/ext/-test-/load/resolve_symbol_target/resolve_symbol_target.c b/ext/-test-/load/resolve_symbol_target/resolve_symbol_target.c
new file mode 100644
index 00000000000000..b5bc9e8ee0a564
--- /dev/null
+++ b/ext/-test-/load/resolve_symbol_target/resolve_symbol_target.c
@@ -0,0 +1,15 @@
+#include <ruby.h>
+#include "resolve_symbol_target.h"
+
+VALUE
+rst_any_method(VALUE klass)
+{
+    return rb_str_new_cstr("from target");
+}
+
+void
+Init_resolve_symbol_target(void)
+{
+    VALUE mod = rb_define_module("ResolveSymbolTarget");
+    rb_define_singleton_method(mod, "any_method", rst_any_method, 0);
+}
diff --git a/ext/-test-/load/resolve_symbol_target/resolve_symbol_target.h b/ext/-test-/load/resolve_symbol_target/resolve_symbol_target.h
new file mode 100644
index 00000000000000..847dcb7dd336d7
--- /dev/null
+++ b/ext/-test-/load/resolve_symbol_target/resolve_symbol_target.h
@@ -0,0 +1,4 @@
+#include <ruby.h>
+#include "ruby/internal/dllexport.h"
+
+RUBY_FUNC_EXPORTED VALUE rst_any_method(VALUE);
diff --git a/ext/-test-/load/stringify_symbols/depend b/ext/-test-/load/stringify_symbols/depend
new file mode 100644
index 00000000000000..2d4d79a7b7a21a
--- /dev/null
+++ b/ext/-test-/load/stringify_symbols/depend
@@ -0,0 +1,164 @@
+# AUTOGENERATED DEPENDENCIES START
+stringify_symbols.o: $(RUBY_EXTCONF_H)
+stringify_symbols.o: $(arch_hdrdir)/ruby/config.h
+stringify_symbols.o: $(hdrdir)/ruby.h
+stringify_symbols.o: $(hdrdir)/ruby/assert.h
+stringify_symbols.o: $(hdrdir)/ruby/backward.h
+stringify_symbols.o: $(hdrdir)/ruby/backward/2/assume.h
+stringify_symbols.o: $(hdrdir)/ruby/backward/2/attributes.h
+stringify_symbols.o: $(hdrdir)/ruby/backward/2/bool.h
+stringify_symbols.o: $(hdrdir)/ruby/backward/2/inttypes.h
+stringify_symbols.o: $(hdrdir)/ruby/backward/2/limits.h
+stringify_symbols.o: $(hdrdir)/ruby/backward/2/long_long.h
+stringify_symbols.o: $(hdrdir)/ruby/backward/2/stdalign.h
+stringify_symbols.o: $(hdrdir)/ruby/backward/2/stdarg.h
+stringify_symbols.o: $(hdrdir)/ruby/defines.h
+stringify_symbols.o: $(hdrdir)/ruby/intern.h
+stringify_symbols.o: $(hdrdir)/ruby/internal/abi.h
+stringify_symbols.o: $(hdrdir)/ruby/internal/anyargs.h
+stringify_symbols.o: $(hdrdir)/ruby/internal/arithmetic.h
+stringify_symbols.o: $(hdrdir)/ruby/internal/arithmetic/char.h
+stringify_symbols.o: $(hdrdir)/ruby/internal/arithmetic/double.h
+stringify_symbols.o: $(hdrdir)/ruby/internal/arithmetic/fixnum.h
+stringify_symbols.o: $(hdrdir)/ruby/internal/arithmetic/gid_t.h
+stringify_symbols.o: $(hdrdir)/ruby/internal/arithmetic/int.h
+stringify_symbols.o: $(hdrdir)/ruby/internal/arithmetic/intptr_t.h
+stringify_symbols.o: $(hdrdir)/ruby/internal/arithmetic/long.h
+stringify_symbols.o: $(hdrdir)/ruby/internal/arithmetic/long_long.h
+stringify_symbols.o: $(hdrdir)/ruby/internal/arithmetic/mode_t.h
+stringify_symbols.o: $(hdrdir)/ruby/internal/arithmetic/off_t.h
+stringify_symbols.o: $(hdrdir)/ruby/internal/arithmetic/pid_t.h
+stringify_symbols.o: $(hdrdir)/ruby/internal/arithmetic/short.h
+stringify_symbols.o: $(hdrdir)/ruby/internal/arithmetic/size_t.h
+stringify_symbols.o: $(hdrdir)/ruby/internal/arithmetic/st_data_t.h
+stringify_symbols.o: $(hdrdir)/ruby/internal/arithmetic/uid_t.h
+stringify_symbols.o: $(hdrdir)/ruby/internal/assume.h
+stringify_symbols.o: $(hdrdir)/ruby/internal/attr/alloc_size.h
+stringify_symbols.o: $(hdrdir)/ruby/internal/attr/artificial.h
+stringify_symbols.o: $(hdrdir)/ruby/internal/attr/cold.h
+stringify_symbols.o: $(hdrdir)/ruby/internal/attr/const.h
+stringify_symbols.o: $(hdrdir)/ruby/internal/attr/constexpr.h
+stringify_symbols.o: $(hdrdir)/ruby/internal/attr/deprecated.h
+stringify_symbols.o: $(hdrdir)/ruby/internal/attr/diagnose_if.h
+stringify_symbols.o: $(hdrdir)/ruby/internal/attr/enum_extensibility.h
+stringify_symbols.o: $(hdrdir)/ruby/internal/attr/error.h
+stringify_symbols.o: $(hdrdir)/ruby/internal/attr/flag_enum.h
+stringify_symbols.o: $(hdrdir)/ruby/internal/attr/forceinline.h
+stringify_symbols.o: $(hdrdir)/ruby/internal/attr/format.h
+stringify_symbols.o: $(hdrdir)/ruby/internal/attr/maybe_unused.h
+stringify_symbols.o: $(hdrdir)/ruby/internal/attr/noalias.h
+stringify_symbols.o: $(hdrdir)/ruby/internal/attr/nodiscard.h
+stringify_symbols.o: $(hdrdir)/ruby/internal/attr/noexcept.h
+stringify_symbols.o: $(hdrdir)/ruby/internal/attr/noinline.h
+stringify_symbols.o: $(hdrdir)/ruby/internal/attr/nonnull.h
+stringify_symbols.o: $(hdrdir)/ruby/internal/attr/noreturn.h
+stringify_symbols.o: $(hdrdir)/ruby/internal/attr/packed_struct.h
+stringify_symbols.o: $(hdrdir)/ruby/internal/attr/pure.h
+stringify_symbols.o: $(hdrdir)/ruby/internal/attr/restrict.h
+stringify_symbols.o: $(hdrdir)/ruby/internal/attr/returns_nonnull.h
+stringify_symbols.o: $(hdrdir)/ruby/internal/attr/warning.h
+stringify_symbols.o: $(hdrdir)/ruby/internal/attr/weakref.h
+stringify_symbols.o: $(hdrdir)/ruby/internal/cast.h
+stringify_symbols.o: $(hdrdir)/ruby/internal/compiler_is.h
+stringify_symbols.o: $(hdrdir)/ruby/internal/compiler_is/apple.h
+stringify_symbols.o: $(hdrdir)/ruby/internal/compiler_is/clang.h
+stringify_symbols.o: $(hdrdir)/ruby/internal/compiler_is/gcc.h
+stringify_symbols.o: $(hdrdir)/ruby/internal/compiler_is/intel.h
+stringify_symbols.o: $(hdrdir)/ruby/internal/compiler_is/msvc.h
+stringify_symbols.o: $(hdrdir)/ruby/internal/compiler_is/sunpro.h
+stringify_symbols.o: $(hdrdir)/ruby/internal/compiler_since.h
+stringify_symbols.o: $(hdrdir)/ruby/internal/config.h
+stringify_symbols.o: $(hdrdir)/ruby/internal/constant_p.h
+stringify_symbols.o: $(hdrdir)/ruby/internal/core.h
+stringify_symbols.o: $(hdrdir)/ruby/internal/core/rarray.h
+stringify_symbols.o: $(hdrdir)/ruby/internal/core/rbasic.h
+stringify_symbols.o: $(hdrdir)/ruby/internal/core/rbignum.h
+stringify_symbols.o: $(hdrdir)/ruby/internal/core/rclass.h
+stringify_symbols.o: $(hdrdir)/ruby/internal/core/rdata.h
+stringify_symbols.o: $(hdrdir)/ruby/internal/core/rfile.h
+stringify_symbols.o: $(hdrdir)/ruby/internal/core/rhash.h
+stringify_symbols.o: $(hdrdir)/ruby/internal/core/robject.h
+stringify_symbols.o: $(hdrdir)/ruby/internal/core/rregexp.h
+stringify_symbols.o: $(hdrdir)/ruby/internal/core/rstring.h
+stringify_symbols.o: $(hdrdir)/ruby/internal/core/rstruct.h
+stringify_symbols.o: $(hdrdir)/ruby/internal/core/rtypeddata.h
+stringify_symbols.o: $(hdrdir)/ruby/internal/ctype.h
+stringify_symbols.o: $(hdrdir)/ruby/internal/dllexport.h
+stringify_symbols.o: $(hdrdir)/ruby/internal/dosish.h
+stringify_symbols.o: $(hdrdir)/ruby/internal/error.h
+stringify_symbols.o: $(hdrdir)/ruby/internal/eval.h
+stringify_symbols.o: $(hdrdir)/ruby/internal/event.h
+stringify_symbols.o: $(hdrdir)/ruby/internal/fl_type.h
+stringify_symbols.o: $(hdrdir)/ruby/internal/gc.h
+stringify_symbols.o: $(hdrdir)/ruby/internal/glob.h
+stringify_symbols.o: $(hdrdir)/ruby/internal/globals.h
+stringify_symbols.o: $(hdrdir)/ruby/internal/has/attribute.h
+stringify_symbols.o: $(hdrdir)/ruby/internal/has/builtin.h
+stringify_symbols.o: $(hdrdir)/ruby/internal/has/c_attribute.h
+stringify_symbols.o: $(hdrdir)/ruby/internal/has/cpp_attribute.h
+stringify_symbols.o: $(hdrdir)/ruby/internal/has/declspec_attribute.h
+stringify_symbols.o: $(hdrdir)/ruby/internal/has/extension.h
+stringify_symbols.o: $(hdrdir)/ruby/internal/has/feature.h
+stringify_symbols.o: $(hdrdir)/ruby/internal/has/warning.h
+stringify_symbols.o: $(hdrdir)/ruby/internal/intern/array.h
+stringify_symbols.o: $(hdrdir)/ruby/internal/intern/bignum.h
+stringify_symbols.o: $(hdrdir)/ruby/internal/intern/class.h
+stringify_symbols.o: $(hdrdir)/ruby/internal/intern/compar.h
+stringify_symbols.o: $(hdrdir)/ruby/internal/intern/complex.h
+stringify_symbols.o: $(hdrdir)/ruby/internal/intern/cont.h
+stringify_symbols.o: $(hdrdir)/ruby/internal/intern/dir.h
+stringify_symbols.o: $(hdrdir)/ruby/internal/intern/enum.h
+stringify_symbols.o: $(hdrdir)/ruby/internal/intern/enumerator.h
+stringify_symbols.o: $(hdrdir)/ruby/internal/intern/error.h
+stringify_symbols.o: $(hdrdir)/ruby/internal/intern/eval.h
+stringify_symbols.o: $(hdrdir)/ruby/internal/intern/file.h
+stringify_symbols.o: $(hdrdir)/ruby/internal/intern/hash.h
+stringify_symbols.o: $(hdrdir)/ruby/internal/intern/io.h
+stringify_symbols.o: $(hdrdir)/ruby/internal/intern/load.h
+stringify_symbols.o: $(hdrdir)/ruby/internal/intern/marshal.h
+stringify_symbols.o: $(hdrdir)/ruby/internal/intern/numeric.h
+stringify_symbols.o: $(hdrdir)/ruby/internal/intern/object.h
+stringify_symbols.o: $(hdrdir)/ruby/internal/intern/parse.h
+stringify_symbols.o: $(hdrdir)/ruby/internal/intern/proc.h
+stringify_symbols.o: $(hdrdir)/ruby/internal/intern/process.h
+stringify_symbols.o: $(hdrdir)/ruby/internal/intern/random.h
+stringify_symbols.o: $(hdrdir)/ruby/internal/intern/range.h
+stringify_symbols.o: $(hdrdir)/ruby/internal/intern/rational.h
+stringify_symbols.o: $(hdrdir)/ruby/internal/intern/re.h
+stringify_symbols.o: $(hdrdir)/ruby/internal/intern/ruby.h
+stringify_symbols.o: $(hdrdir)/ruby/internal/intern/select.h
+stringify_symbols.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+stringify_symbols.o: $(hdrdir)/ruby/internal/intern/set.h
+stringify_symbols.o: $(hdrdir)/ruby/internal/intern/signal.h
+stringify_symbols.o: $(hdrdir)/ruby/internal/intern/sprintf.h
+stringify_symbols.o: $(hdrdir)/ruby/internal/intern/string.h
+stringify_symbols.o: $(hdrdir)/ruby/internal/intern/struct.h
+stringify_symbols.o: $(hdrdir)/ruby/internal/intern/thread.h
+stringify_symbols.o: $(hdrdir)/ruby/internal/intern/time.h
+stringify_symbols.o: $(hdrdir)/ruby/internal/intern/variable.h
+stringify_symbols.o: $(hdrdir)/ruby/internal/intern/vm.h
+stringify_symbols.o: $(hdrdir)/ruby/internal/interpreter.h
+stringify_symbols.o: $(hdrdir)/ruby/internal/iterator.h
+stringify_symbols.o: $(hdrdir)/ruby/internal/memory.h
+stringify_symbols.o: $(hdrdir)/ruby/internal/method.h
+stringify_symbols.o: $(hdrdir)/ruby/internal/module.h
+stringify_symbols.o: $(hdrdir)/ruby/internal/newobj.h
+stringify_symbols.o: $(hdrdir)/ruby/internal/scan_args.h
+stringify_symbols.o: $(hdrdir)/ruby/internal/special_consts.h
+stringify_symbols.o: $(hdrdir)/ruby/internal/static_assert.h
+stringify_symbols.o: $(hdrdir)/ruby/internal/stdalign.h
+stringify_symbols.o: $(hdrdir)/ruby/internal/stdbool.h
+stringify_symbols.o: $(hdrdir)/ruby/internal/stdckdint.h
+stringify_symbols.o: $(hdrdir)/ruby/internal/symbol.h
+stringify_symbols.o: $(hdrdir)/ruby/internal/value.h
+stringify_symbols.o: $(hdrdir)/ruby/internal/value_type.h
+stringify_symbols.o: $(hdrdir)/ruby/internal/variable.h
+stringify_symbols.o: $(hdrdir)/ruby/internal/warning_push.h
+stringify_symbols.o: $(hdrdir)/ruby/internal/xmalloc.h
+stringify_symbols.o: $(hdrdir)/ruby/missing.h
+stringify_symbols.o: $(hdrdir)/ruby/ruby.h
+stringify_symbols.o: $(hdrdir)/ruby/st.h
+stringify_symbols.o: $(hdrdir)/ruby/subst.h
+stringify_symbols.o: $(hdrdir)/ruby/util.h
+stringify_symbols.o: stringify_symbols.c
+# AUTOGENERATED DEPENDENCIES END
diff --git a/ext/-test-/load/stringify_symbols/extconf.rb b/ext/-test-/load/stringify_symbols/extconf.rb
new file mode 100644
index 00000000000000..ac39c15f09c9f8
--- /dev/null
+++ b/ext/-test-/load/stringify_symbols/extconf.rb
@@ -0,0 +1 @@
+create_makefile('-test-/load/stringify_symbols')
diff --git a/ext/-test-/load/stringify_symbols/stringify_symbols.c b/ext/-test-/load/stringify_symbols/stringify_symbols.c
new file mode 100644
index 00000000000000..11a5ee3bc5514c
--- /dev/null
+++ b/ext/-test-/load/stringify_symbols/stringify_symbols.c
@@ -0,0 +1,29 @@
+#include <ruby.h>
+#include "ruby/internal/intern/load.h"
+#include "ruby/util.h"
+
+#if SIZEOF_INTPTR_T == SIZEOF_LONG_LONG
+#   define UINTPTR2NUM ULL2NUM
+#elif SIZEOF_INTPTR_T == SIZEOF_LONG
+#   define UINTPTR2NUM ULONG2NUM
+#else
+#   define UINTPTR2NUM UINT2NUM
+#endif
+
+static VALUE
+stringify_symbol(VALUE klass, VALUE fname, VALUE sname)
+{
+    void *ptr = rb_ext_resolve_symbol(StringValueCStr(fname), StringValueCStr(sname));
+    if (ptr == NULL) {
+        return Qnil;
+    }
+    uintptr_t uintptr = (uintptr_t)ptr;
+    return UINTPTR2NUM(uintptr);
+}
+
+void
+Init_stringify_symbols(void)
+{
+    VALUE mod = rb_define_module("StringifySymbols");
+    rb_define_singleton_method(mod, "stringify_symbol", stringify_symbol, 2);
+}
diff --git a/ext/-test-/load/stringify_target/depend b/ext/-test-/load/stringify_target/depend
new file mode 100644
index 00000000000000..c66575d4e4fbc5
--- /dev/null
+++ b/ext/-test-/load/stringify_target/depend
@@ -0,0 +1,164 @@
+# AUTOGENERATED DEPENDENCIES START
+stringify_target.o: $(RUBY_EXTCONF_H)
+stringify_target.o: $(arch_hdrdir)/ruby/config.h
+stringify_target.o: $(hdrdir)/ruby.h
+stringify_target.o: $(hdrdir)/ruby/assert.h
+stringify_target.o: $(hdrdir)/ruby/backward.h
+stringify_target.o: $(hdrdir)/ruby/backward/2/assume.h
+stringify_target.o: $(hdrdir)/ruby/backward/2/attributes.h
+stringify_target.o: $(hdrdir)/ruby/backward/2/bool.h
+stringify_target.o: $(hdrdir)/ruby/backward/2/inttypes.h
+stringify_target.o: $(hdrdir)/ruby/backward/2/limits.h
+stringify_target.o: $(hdrdir)/ruby/backward/2/long_long.h
+stringify_target.o: $(hdrdir)/ruby/backward/2/stdalign.h
+stringify_target.o: $(hdrdir)/ruby/backward/2/stdarg.h
+stringify_target.o: $(hdrdir)/ruby/defines.h
+stringify_target.o: $(hdrdir)/ruby/intern.h
+stringify_target.o: $(hdrdir)/ruby/internal/abi.h
+stringify_target.o: $(hdrdir)/ruby/internal/anyargs.h
+stringify_target.o: $(hdrdir)/ruby/internal/arithmetic.h
+stringify_target.o: $(hdrdir)/ruby/internal/arithmetic/char.h
+stringify_target.o: $(hdrdir)/ruby/internal/arithmetic/double.h
+stringify_target.o: $(hdrdir)/ruby/internal/arithmetic/fixnum.h
+stringify_target.o: $(hdrdir)/ruby/internal/arithmetic/gid_t.h
+stringify_target.o: $(hdrdir)/ruby/internal/arithmetic/int.h
+stringify_target.o: $(hdrdir)/ruby/internal/arithmetic/intptr_t.h
+stringify_target.o: $(hdrdir)/ruby/internal/arithmetic/long.h
+stringify_target.o: $(hdrdir)/ruby/internal/arithmetic/long_long.h
+stringify_target.o: $(hdrdir)/ruby/internal/arithmetic/mode_t.h
+stringify_target.o: $(hdrdir)/ruby/internal/arithmetic/off_t.h
+stringify_target.o: $(hdrdir)/ruby/internal/arithmetic/pid_t.h
+stringify_target.o: $(hdrdir)/ruby/internal/arithmetic/short.h
+stringify_target.o: $(hdrdir)/ruby/internal/arithmetic/size_t.h
+stringify_target.o: $(hdrdir)/ruby/internal/arithmetic/st_data_t.h
+stringify_target.o: $(hdrdir)/ruby/internal/arithmetic/uid_t.h
+stringify_target.o: $(hdrdir)/ruby/internal/assume.h
+stringify_target.o: $(hdrdir)/ruby/internal/attr/alloc_size.h
+stringify_target.o: $(hdrdir)/ruby/internal/attr/artificial.h
+stringify_target.o: $(hdrdir)/ruby/internal/attr/cold.h
+stringify_target.o: $(hdrdir)/ruby/internal/attr/const.h
+stringify_target.o: $(hdrdir)/ruby/internal/attr/constexpr.h
+stringify_target.o: $(hdrdir)/ruby/internal/attr/deprecated.h
+stringify_target.o: $(hdrdir)/ruby/internal/attr/diagnose_if.h
+stringify_target.o: $(hdrdir)/ruby/internal/attr/enum_extensibility.h
+stringify_target.o: $(hdrdir)/ruby/internal/attr/error.h
+stringify_target.o: $(hdrdir)/ruby/internal/attr/flag_enum.h
+stringify_target.o: $(hdrdir)/ruby/internal/attr/forceinline.h
+stringify_target.o: $(hdrdir)/ruby/internal/attr/format.h
+stringify_target.o: $(hdrdir)/ruby/internal/attr/maybe_unused.h
+stringify_target.o: $(hdrdir)/ruby/internal/attr/noalias.h
+stringify_target.o: $(hdrdir)/ruby/internal/attr/nodiscard.h
+stringify_target.o: $(hdrdir)/ruby/internal/attr/noexcept.h
+stringify_target.o: $(hdrdir)/ruby/internal/attr/noinline.h
+stringify_target.o: $(hdrdir)/ruby/internal/attr/nonnull.h
+stringify_target.o: $(hdrdir)/ruby/internal/attr/noreturn.h
+stringify_target.o: $(hdrdir)/ruby/internal/attr/packed_struct.h
+stringify_target.o: $(hdrdir)/ruby/internal/attr/pure.h
+stringify_target.o: $(hdrdir)/ruby/internal/attr/restrict.h
+stringify_target.o: $(hdrdir)/ruby/internal/attr/returns_nonnull.h
+stringify_target.o: $(hdrdir)/ruby/internal/attr/warning.h
+stringify_target.o: $(hdrdir)/ruby/internal/attr/weakref.h
+stringify_target.o: $(hdrdir)/ruby/internal/cast.h
+stringify_target.o: $(hdrdir)/ruby/internal/compiler_is.h
+stringify_target.o: $(hdrdir)/ruby/internal/compiler_is/apple.h
+stringify_target.o: $(hdrdir)/ruby/internal/compiler_is/clang.h
+stringify_target.o: $(hdrdir)/ruby/internal/compiler_is/gcc.h
+stringify_target.o: $(hdrdir)/ruby/internal/compiler_is/intel.h
+stringify_target.o: $(hdrdir)/ruby/internal/compiler_is/msvc.h
+stringify_target.o: $(hdrdir)/ruby/internal/compiler_is/sunpro.h
+stringify_target.o: $(hdrdir)/ruby/internal/compiler_since.h
+stringify_target.o: $(hdrdir)/ruby/internal/config.h
+stringify_target.o: $(hdrdir)/ruby/internal/constant_p.h
+stringify_target.o: $(hdrdir)/ruby/internal/core.h
+stringify_target.o: $(hdrdir)/ruby/internal/core/rarray.h
+stringify_target.o: $(hdrdir)/ruby/internal/core/rbasic.h
+stringify_target.o: $(hdrdir)/ruby/internal/core/rbignum.h
+stringify_target.o: $(hdrdir)/ruby/internal/core/rclass.h
+stringify_target.o: $(hdrdir)/ruby/internal/core/rdata.h
+stringify_target.o: $(hdrdir)/ruby/internal/core/rfile.h
+stringify_target.o: $(hdrdir)/ruby/internal/core/rhash.h
+stringify_target.o: $(hdrdir)/ruby/internal/core/robject.h
+stringify_target.o: $(hdrdir)/ruby/internal/core/rregexp.h
+stringify_target.o: $(hdrdir)/ruby/internal/core/rstring.h
+stringify_target.o: $(hdrdir)/ruby/internal/core/rstruct.h
+stringify_target.o: $(hdrdir)/ruby/internal/core/rtypeddata.h
+stringify_target.o: $(hdrdir)/ruby/internal/ctype.h
+stringify_target.o: $(hdrdir)/ruby/internal/dllexport.h
+stringify_target.o: $(hdrdir)/ruby/internal/dosish.h
+stringify_target.o: $(hdrdir)/ruby/internal/error.h
+stringify_target.o: $(hdrdir)/ruby/internal/eval.h
+stringify_target.o: $(hdrdir)/ruby/internal/event.h
+stringify_target.o: $(hdrdir)/ruby/internal/fl_type.h
+stringify_target.o: $(hdrdir)/ruby/internal/gc.h
+stringify_target.o: $(hdrdir)/ruby/internal/glob.h
+stringify_target.o: $(hdrdir)/ruby/internal/globals.h
+stringify_target.o: $(hdrdir)/ruby/internal/has/attribute.h
+stringify_target.o: $(hdrdir)/ruby/internal/has/builtin.h
+stringify_target.o: $(hdrdir)/ruby/internal/has/c_attribute.h
+stringify_target.o: $(hdrdir)/ruby/internal/has/cpp_attribute.h
+stringify_target.o: $(hdrdir)/ruby/internal/has/declspec_attribute.h
+stringify_target.o: $(hdrdir)/ruby/internal/has/extension.h
+stringify_target.o: $(hdrdir)/ruby/internal/has/feature.h
+stringify_target.o: $(hdrdir)/ruby/internal/has/warning.h
+stringify_target.o: $(hdrdir)/ruby/internal/intern/array.h
+stringify_target.o: $(hdrdir)/ruby/internal/intern/bignum.h
+stringify_target.o: $(hdrdir)/ruby/internal/intern/class.h
+stringify_target.o: $(hdrdir)/ruby/internal/intern/compar.h
+stringify_target.o: $(hdrdir)/ruby/internal/intern/complex.h
+stringify_target.o: $(hdrdir)/ruby/internal/intern/cont.h
+stringify_target.o: $(hdrdir)/ruby/internal/intern/dir.h
+stringify_target.o: $(hdrdir)/ruby/internal/intern/enum.h
+stringify_target.o: $(hdrdir)/ruby/internal/intern/enumerator.h
+stringify_target.o: $(hdrdir)/ruby/internal/intern/error.h
+stringify_target.o: $(hdrdir)/ruby/internal/intern/eval.h
+stringify_target.o: $(hdrdir)/ruby/internal/intern/file.h
+stringify_target.o: $(hdrdir)/ruby/internal/intern/hash.h
+stringify_target.o: $(hdrdir)/ruby/internal/intern/io.h
+stringify_target.o: $(hdrdir)/ruby/internal/intern/load.h
+stringify_target.o: $(hdrdir)/ruby/internal/intern/marshal.h
+stringify_target.o: $(hdrdir)/ruby/internal/intern/numeric.h
+stringify_target.o: $(hdrdir)/ruby/internal/intern/object.h
+stringify_target.o: $(hdrdir)/ruby/internal/intern/parse.h
+stringify_target.o: $(hdrdir)/ruby/internal/intern/proc.h
+stringify_target.o: $(hdrdir)/ruby/internal/intern/process.h
+stringify_target.o: $(hdrdir)/ruby/internal/intern/random.h
+stringify_target.o: $(hdrdir)/ruby/internal/intern/range.h
+stringify_target.o: $(hdrdir)/ruby/internal/intern/rational.h
+stringify_target.o: $(hdrdir)/ruby/internal/intern/re.h
+stringify_target.o: $(hdrdir)/ruby/internal/intern/ruby.h
+stringify_target.o: $(hdrdir)/ruby/internal/intern/select.h
+stringify_target.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+stringify_target.o: $(hdrdir)/ruby/internal/intern/set.h
+stringify_target.o: $(hdrdir)/ruby/internal/intern/signal.h
+stringify_target.o: $(hdrdir)/ruby/internal/intern/sprintf.h
+stringify_target.o: $(hdrdir)/ruby/internal/intern/string.h
+stringify_target.o: $(hdrdir)/ruby/internal/intern/struct.h
+stringify_target.o: $(hdrdir)/ruby/internal/intern/thread.h
+stringify_target.o: $(hdrdir)/ruby/internal/intern/time.h
+stringify_target.o: $(hdrdir)/ruby/internal/intern/variable.h
+stringify_target.o: $(hdrdir)/ruby/internal/intern/vm.h
+stringify_target.o: $(hdrdir)/ruby/internal/interpreter.h
+stringify_target.o: $(hdrdir)/ruby/internal/iterator.h
+stringify_target.o: $(hdrdir)/ruby/internal/memory.h
+stringify_target.o: $(hdrdir)/ruby/internal/method.h
+stringify_target.o: $(hdrdir)/ruby/internal/module.h
+stringify_target.o: $(hdrdir)/ruby/internal/newobj.h
+stringify_target.o: $(hdrdir)/ruby/internal/scan_args.h
+stringify_target.o: $(hdrdir)/ruby/internal/special_consts.h
+stringify_target.o: $(hdrdir)/ruby/internal/static_assert.h
+stringify_target.o: $(hdrdir)/ruby/internal/stdalign.h
+stringify_target.o: $(hdrdir)/ruby/internal/stdbool.h
+stringify_target.o: $(hdrdir)/ruby/internal/stdckdint.h
+stringify_target.o: $(hdrdir)/ruby/internal/symbol.h
+stringify_target.o: $(hdrdir)/ruby/internal/value.h
+stringify_target.o: $(hdrdir)/ruby/internal/value_type.h
+stringify_target.o: $(hdrdir)/ruby/internal/variable.h
+stringify_target.o: $(hdrdir)/ruby/internal/warning_push.h
+stringify_target.o: $(hdrdir)/ruby/internal/xmalloc.h
+stringify_target.o: $(hdrdir)/ruby/missing.h
+stringify_target.o: $(hdrdir)/ruby/ruby.h
+stringify_target.o: $(hdrdir)/ruby/st.h
+stringify_target.o: $(hdrdir)/ruby/subst.h
+stringify_target.o: stringify_target.c
+stringify_target.o: stringify_target.h
+# AUTOGENERATED DEPENDENCIES END
diff --git a/ext/-test-/load/stringify_target/extconf.rb b/ext/-test-/load/stringify_target/extconf.rb
new file mode 100644
index 00000000000000..4aa201cb09ef57
--- /dev/null
+++ b/ext/-test-/load/stringify_target/extconf.rb
@@ -0,0 +1 @@
+create_makefile('-test-/load/stringify_target')
diff --git a/ext/-test-/load/stringify_target/stringify_target.c b/ext/-test-/load/stringify_target/stringify_target.c
new file mode 100644
index 00000000000000..ce09b8fd77e208
--- /dev/null
+++ b/ext/-test-/load/stringify_target/stringify_target.c
@@ -0,0 +1,15 @@
+#include <ruby.h>
+#include "stringify_target.h"
+
+VALUE
+stt_any_method(VALUE klass)
+{
+    return rb_str_new_cstr("from target");
+}
+
+void
+Init_stringify_target(void)
+{
+    VALUE mod = rb_define_module("StringifyTarget");
+    rb_define_singleton_method(mod, "any_method", stt_any_method, 0);
+}
diff --git a/ext/-test-/load/stringify_target/stringify_target.h b/ext/-test-/load/stringify_target/stringify_target.h
new file mode 100644
index 00000000000000..d95fb65d7ca7e7
--- /dev/null
+++ b/ext/-test-/load/stringify_target/stringify_target.h
@@ -0,0 +1,4 @@
+#include <ruby.h>
+#include "ruby/internal/dllexport.h"
+
+RUBY_FUNC_EXPORTED VALUE stt_any_method(VALUE);
diff --git a/ext/-test-/marshal/compat/depend b/ext/-test-/marshal/compat/depend
index ff675ccabbc092..36b9235c230de1 100644
--- a/ext/-test-/marshal/compat/depend
+++ b/ext/-test-/marshal/compat/depend
@@ -128,6 +128,7 @@ usrcompat.o: $(hdrdir)/ruby/internal/intern/re.h
 usrcompat.o: $(hdrdir)/ruby/internal/intern/ruby.h
 usrcompat.o: $(hdrdir)/ruby/internal/intern/select.h
 usrcompat.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+usrcompat.o: $(hdrdir)/ruby/internal/intern/set.h
 usrcompat.o: $(hdrdir)/ruby/internal/intern/signal.h
 usrcompat.o: $(hdrdir)/ruby/internal/intern/sprintf.h
 usrcompat.o: $(hdrdir)/ruby/internal/intern/string.h
@@ -147,6 +148,7 @@ usrcompat.o: $(hdrdir)/ruby/internal/special_consts.h
 usrcompat.o: $(hdrdir)/ruby/internal/static_assert.h
 usrcompat.o: $(hdrdir)/ruby/internal/stdalign.h
 usrcompat.o: $(hdrdir)/ruby/internal/stdbool.h
+usrcompat.o: $(hdrdir)/ruby/internal/stdckdint.h
 usrcompat.o: $(hdrdir)/ruby/internal/symbol.h
 usrcompat.o: $(hdrdir)/ruby/internal/value.h
 usrcompat.o: $(hdrdir)/ruby/internal/value_type.h
diff --git a/ext/-test-/marshal/internal_ivar/depend b/ext/-test-/marshal/internal_ivar/depend
index 4fe36834d8135f..a2e093d809b941 100644
--- a/ext/-test-/marshal/internal_ivar/depend
+++ b/ext/-test-/marshal/internal_ivar/depend
@@ -128,6 +128,7 @@ internal_ivar.o: $(hdrdir)/ruby/internal/intern/re.h
 internal_ivar.o: $(hdrdir)/ruby/internal/intern/ruby.h
 internal_ivar.o: $(hdrdir)/ruby/internal/intern/select.h
 internal_ivar.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+internal_ivar.o: $(hdrdir)/ruby/internal/intern/set.h
 internal_ivar.o: $(hdrdir)/ruby/internal/intern/signal.h
 internal_ivar.o: $(hdrdir)/ruby/internal/intern/sprintf.h
 internal_ivar.o: $(hdrdir)/ruby/internal/intern/string.h
@@ -147,6 +148,7 @@ internal_ivar.o: $(hdrdir)/ruby/internal/special_consts.h
 internal_ivar.o: $(hdrdir)/ruby/internal/static_assert.h
 internal_ivar.o: $(hdrdir)/ruby/internal/stdalign.h
 internal_ivar.o: $(hdrdir)/ruby/internal/stdbool.h
+internal_ivar.o: $(hdrdir)/ruby/internal/stdckdint.h
 internal_ivar.o: $(hdrdir)/ruby/internal/symbol.h
 internal_ivar.o: $(hdrdir)/ruby/internal/value.h
 internal_ivar.o: $(hdrdir)/ruby/internal/value_type.h
diff --git a/ext/-test-/marshal/internal_ivar/internal_ivar.c b/ext/-test-/marshal/internal_ivar/internal_ivar.c
index b2188f737a14e3..2e2f9cb235f02e 100644
--- a/ext/-test-/marshal/internal_ivar/internal_ivar.c
+++ b/ext/-test-/marshal/internal_ivar/internal_ivar.c
@@ -1,13 +1,14 @@
 #include <ruby.h>
 
-static ID id_normal_ivar, id_internal_ivar, id_encoding_short;
+static ID id_normal_ivar, id_internal_ivar, id_encoding_short, id_encoding_long;
 
 static VALUE
-init(VALUE self, VALUE arg1, VALUE arg2, VALUE arg3)
+init(VALUE self, VALUE arg1, VALUE arg2, VALUE arg3, VALUE arg4)
 {
     rb_ivar_set(self, id_normal_ivar, arg1);
     rb_ivar_set(self, id_internal_ivar, arg2);
     rb_ivar_set(self, id_encoding_short, arg3);
+    rb_ivar_set(self, id_encoding_long, arg4);
     return self;
 }
 
@@ -29,6 +30,12 @@ get_encoding_short(VALUE self)
     return rb_attr_get(self, id_encoding_short);
 }
 
+static VALUE
+get_encoding_long(VALUE self)
+{
+    return rb_attr_get(self, id_encoding_long);
+}
+
 void
 Init_internal_ivar(void)
 {
@@ -38,8 +45,10 @@ Init_internal_ivar(void)
     id_normal_ivar = rb_intern_const("normal");
     id_internal_ivar = rb_intern_const("K");
     id_encoding_short = rb_intern_const("E");
-    rb_define_method(newclass, "initialize", init, 3);
+    id_encoding_long = rb_intern_const("encoding");
+    rb_define_method(newclass, "initialize", init, 4);
     rb_define_method(newclass, "normal", get_normal, 0);
     rb_define_method(newclass, "internal", get_internal, 0);
     rb_define_method(newclass, "encoding_short", get_encoding_short, 0);
+    rb_define_method(newclass, "encoding_long", get_encoding_long, 0);
 }
diff --git a/ext/-test-/marshal/usr/depend b/ext/-test-/marshal/usr/depend
index 1d56cc82022750..5ffb8c58de24be 100644
--- a/ext/-test-/marshal/usr/depend
+++ b/ext/-test-/marshal/usr/depend
@@ -128,6 +128,7 @@ usrmarshal.o: $(hdrdir)/ruby/internal/intern/re.h
 usrmarshal.o: $(hdrdir)/ruby/internal/intern/ruby.h
 usrmarshal.o: $(hdrdir)/ruby/internal/intern/select.h
 usrmarshal.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+usrmarshal.o: $(hdrdir)/ruby/internal/intern/set.h
 usrmarshal.o: $(hdrdir)/ruby/internal/intern/signal.h
 usrmarshal.o: $(hdrdir)/ruby/internal/intern/sprintf.h
 usrmarshal.o: $(hdrdir)/ruby/internal/intern/string.h
@@ -147,6 +148,7 @@ usrmarshal.o: $(hdrdir)/ruby/internal/special_consts.h
 usrmarshal.o: $(hdrdir)/ruby/internal/static_assert.h
 usrmarshal.o: $(hdrdir)/ruby/internal/stdalign.h
 usrmarshal.o: $(hdrdir)/ruby/internal/stdbool.h
+usrmarshal.o: $(hdrdir)/ruby/internal/stdckdint.h
 usrmarshal.o: $(hdrdir)/ruby/internal/symbol.h
 usrmarshal.o: $(hdrdir)/ruby/internal/value.h
 usrmarshal.o: $(hdrdir)/ruby/internal/value_type.h
diff --git a/ext/-test-/memory_status/depend b/ext/-test-/memory_status/depend
index 52e2fe8e1f2875..4dd503e1bba59c 100644
--- a/ext/-test-/memory_status/depend
+++ b/ext/-test-/memory_status/depend
@@ -147,6 +147,7 @@ memory_status.o: $(hdrdir)/ruby/internal/special_consts.h
 memory_status.o: $(hdrdir)/ruby/internal/static_assert.h
 memory_status.o: $(hdrdir)/ruby/internal/stdalign.h
 memory_status.o: $(hdrdir)/ruby/internal/stdbool.h
+memory_status.o: $(hdrdir)/ruby/internal/stdckdint.h
 memory_status.o: $(hdrdir)/ruby/internal/symbol.h
 memory_status.o: $(hdrdir)/ruby/internal/value.h
 memory_status.o: $(hdrdir)/ruby/internal/value_type.h
diff --git a/ext/-test-/memory_view/depend b/ext/-test-/memory_view/depend
index c9ef06a15c5e1d..a6ffd76f459669 100644
--- a/ext/-test-/memory_view/depend
+++ b/ext/-test-/memory_view/depend
@@ -128,6 +128,7 @@ memory_view.o: $(hdrdir)/ruby/internal/intern/re.h
 memory_view.o: $(hdrdir)/ruby/internal/intern/ruby.h
 memory_view.o: $(hdrdir)/ruby/internal/intern/select.h
 memory_view.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+memory_view.o: $(hdrdir)/ruby/internal/intern/set.h
 memory_view.o: $(hdrdir)/ruby/internal/intern/signal.h
 memory_view.o: $(hdrdir)/ruby/internal/intern/sprintf.h
 memory_view.o: $(hdrdir)/ruby/internal/intern/string.h
@@ -147,6 +148,7 @@ memory_view.o: $(hdrdir)/ruby/internal/special_consts.h
 memory_view.o: $(hdrdir)/ruby/internal/static_assert.h
 memory_view.o: $(hdrdir)/ruby/internal/stdalign.h
 memory_view.o: $(hdrdir)/ruby/internal/stdbool.h
+memory_view.o: $(hdrdir)/ruby/internal/stdckdint.h
 memory_view.o: $(hdrdir)/ruby/internal/symbol.h
 memory_view.o: $(hdrdir)/ruby/internal/value.h
 memory_view.o: $(hdrdir)/ruby/internal/value_type.h
diff --git a/ext/-test-/memory_view/memory_view.c b/ext/-test-/memory_view/memory_view.c
index c1df0353cfc596..63f0beb81e42aa 100644
--- a/ext/-test-/memory_view/memory_view.c
+++ b/ext/-test-/memory_view/memory_view.c
@@ -313,8 +313,8 @@ mdview_get_memory_view(VALUE obj, rb_memory_view_t *view, int flags)
 static bool
 mdview_release_memory_view(VALUE obj, rb_memory_view_t *view)
 {
-    if (view->shape) xfree((void *)view->shape);
-    if (view->strides) xfree((void *)view->strides);
+    xfree((void *)view->shape);
+    xfree((void *)view->strides);
 
     return true;
 }
diff --git a/ext/-test-/method/depend b/ext/-test-/method/depend
index dbf513f48fc3ee..95745b3daea8eb 100644
--- a/ext/-test-/method/depend
+++ b/ext/-test-/method/depend
@@ -128,6 +128,7 @@ arity.o: $(hdrdir)/ruby/internal/intern/re.h
 arity.o: $(hdrdir)/ruby/internal/intern/ruby.h
 arity.o: $(hdrdir)/ruby/internal/intern/select.h
 arity.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+arity.o: $(hdrdir)/ruby/internal/intern/set.h
 arity.o: $(hdrdir)/ruby/internal/intern/signal.h
 arity.o: $(hdrdir)/ruby/internal/intern/sprintf.h
 arity.o: $(hdrdir)/ruby/internal/intern/string.h
@@ -147,6 +148,7 @@ arity.o: $(hdrdir)/ruby/internal/special_consts.h
 arity.o: $(hdrdir)/ruby/internal/static_assert.h
 arity.o: $(hdrdir)/ruby/internal/stdalign.h
 arity.o: $(hdrdir)/ruby/internal/stdbool.h
+arity.o: $(hdrdir)/ruby/internal/stdckdint.h
 arity.o: $(hdrdir)/ruby/internal/symbol.h
 arity.o: $(hdrdir)/ruby/internal/value.h
 arity.o: $(hdrdir)/ruby/internal/value_type.h
@@ -287,6 +289,7 @@ init.o: $(hdrdir)/ruby/internal/intern/re.h
 init.o: $(hdrdir)/ruby/internal/intern/ruby.h
 init.o: $(hdrdir)/ruby/internal/intern/select.h
 init.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+init.o: $(hdrdir)/ruby/internal/intern/set.h
 init.o: $(hdrdir)/ruby/internal/intern/signal.h
 init.o: $(hdrdir)/ruby/internal/intern/sprintf.h
 init.o: $(hdrdir)/ruby/internal/intern/string.h
@@ -306,6 +309,7 @@ init.o: $(hdrdir)/ruby/internal/special_consts.h
 init.o: $(hdrdir)/ruby/internal/static_assert.h
 init.o: $(hdrdir)/ruby/internal/stdalign.h
 init.o: $(hdrdir)/ruby/internal/stdbool.h
+init.o: $(hdrdir)/ruby/internal/stdckdint.h
 init.o: $(hdrdir)/ruby/internal/symbol.h
 init.o: $(hdrdir)/ruby/internal/value.h
 init.o: $(hdrdir)/ruby/internal/value_type.h
diff --git a/ext/-test-/namespace/yay1/extconf.rb b/ext/-test-/namespace/yay1/extconf.rb
new file mode 100644
index 00000000000000..539e99ab091b34
--- /dev/null
+++ b/ext/-test-/namespace/yay1/extconf.rb
@@ -0,0 +1 @@
+create_makefile('-test-/namespace/yay1')
diff --git a/ext/-test-/namespace/yay1/yay1.c b/ext/-test-/namespace/yay1/yay1.c
new file mode 100644
index 00000000000000..564a221c8c2be8
--- /dev/null
+++ b/ext/-test-/namespace/yay1/yay1.c
@@ -0,0 +1,28 @@
+#include "yay1.h"
+
+VALUE
+yay_value(void)
+{
+    return rb_str_new_cstr("yay");
+}
+
+static VALUE
+yay1_f_version(VALUE klass)
+{
+    return rb_str_new_cstr("1.0.0");
+}
+
+static VALUE
+yay1_yay(VALUE klass)
+{
+    return yay_value();
+}
+
+void
+Init_yay1(void)
+{
+    VALUE mod = rb_define_module("Yay");
+    rb_define_const(mod, "VERSION", rb_str_new_cstr("1.0.0"));
+    rb_define_singleton_method(mod, "version", yay1_f_version, 0);
+    rb_define_singleton_method(mod, "yay", yay1_yay, 0);
+}
diff --git a/ext/-test-/namespace/yay1/yay1.def b/ext/-test-/namespace/yay1/yay1.def
new file mode 100644
index 00000000000000..edbae873126604
--- /dev/null
+++ b/ext/-test-/namespace/yay1/yay1.def
@@ -0,0 +1,4 @@
+LIBRARY yay1
+EXPORTS
+  Init_yay1
+  yay_value
diff --git a/ext/-test-/namespace/yay1/yay1.h b/ext/-test-/namespace/yay1/yay1.h
new file mode 100644
index 00000000000000..d68f8b552324b9
--- /dev/null
+++ b/ext/-test-/namespace/yay1/yay1.h
@@ -0,0 +1,4 @@
+#include <ruby.h>
+#include "ruby/internal/dllexport.h"
+
+RUBY_EXTERN VALUE yay_value(void);
diff --git a/ext/-test-/namespace/yay2/extconf.rb b/ext/-test-/namespace/yay2/extconf.rb
new file mode 100644
index 00000000000000..2027a42860ba6a
--- /dev/null
+++ b/ext/-test-/namespace/yay2/extconf.rb
@@ -0,0 +1 @@
+create_makefile('-test-/namespace/yay2')
diff --git a/ext/-test-/namespace/yay2/yay2.c b/ext/-test-/namespace/yay2/yay2.c
new file mode 100644
index 00000000000000..b632ae8495be32
--- /dev/null
+++ b/ext/-test-/namespace/yay2/yay2.c
@@ -0,0 +1,28 @@
+#include "yay2.h"
+
+VALUE
+yay_value(void)
+{
+    return rb_str_new_cstr("yaaay");
+}
+
+static VALUE
+yay2_f_version(VALUE klass)
+{
+    return rb_str_new_cstr("2.0.0");
+}
+
+static VALUE
+yay2_yay(VALUE klass)
+{
+    return yay_value();
+}
+
+void
+Init_yay2(void)
+{
+    VALUE mod = rb_define_module("Yay");
+    rb_define_const(mod, "VERSION", rb_str_new_cstr("2.0.0"));
+    rb_define_singleton_method(mod, "version", yay2_f_version, 0);
+    rb_define_singleton_method(mod, "yay", yay2_yay, 0);
+}
diff --git a/ext/-test-/namespace/yay2/yay2.def b/ext/-test-/namespace/yay2/yay2.def
new file mode 100644
index 00000000000000..6bb6011f4b841d
--- /dev/null
+++ b/ext/-test-/namespace/yay2/yay2.def
@@ -0,0 +1,4 @@
+LIBRARY yay2
+EXPORTS
+  Init_yay2
+  yay_value
diff --git a/ext/-test-/namespace/yay2/yay2.h b/ext/-test-/namespace/yay2/yay2.h
new file mode 100644
index 00000000000000..d68f8b552324b9
--- /dev/null
+++ b/ext/-test-/namespace/yay2/yay2.h
@@ -0,0 +1,4 @@
+#include <ruby.h>
+#include "ruby/internal/dllexport.h"
+
+RUBY_EXTERN VALUE yay_value(void);
diff --git a/ext/-test-/notimplement/depend b/ext/-test-/notimplement/depend
index 9105093b0d39b1..69c970b6f25703 100644
--- a/ext/-test-/notimplement/depend
+++ b/ext/-test-/notimplement/depend
@@ -128,6 +128,7 @@ bug.o: $(hdrdir)/ruby/internal/intern/re.h
 bug.o: $(hdrdir)/ruby/internal/intern/ruby.h
 bug.o: $(hdrdir)/ruby/internal/intern/select.h
 bug.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+bug.o: $(hdrdir)/ruby/internal/intern/set.h
 bug.o: $(hdrdir)/ruby/internal/intern/signal.h
 bug.o: $(hdrdir)/ruby/internal/intern/sprintf.h
 bug.o: $(hdrdir)/ruby/internal/intern/string.h
@@ -147,6 +148,7 @@ bug.o: $(hdrdir)/ruby/internal/special_consts.h
 bug.o: $(hdrdir)/ruby/internal/static_assert.h
 bug.o: $(hdrdir)/ruby/internal/stdalign.h
 bug.o: $(hdrdir)/ruby/internal/stdbool.h
+bug.o: $(hdrdir)/ruby/internal/stdckdint.h
 bug.o: $(hdrdir)/ruby/internal/symbol.h
 bug.o: $(hdrdir)/ruby/internal/value.h
 bug.o: $(hdrdir)/ruby/internal/value_type.h
diff --git a/ext/-test-/num2int/depend b/ext/-test-/num2int/depend
index 4e05d1e8c1f319..75536363ac650d 100644
--- a/ext/-test-/num2int/depend
+++ b/ext/-test-/num2int/depend
@@ -128,6 +128,7 @@ num2int.o: $(hdrdir)/ruby/internal/intern/re.h
 num2int.o: $(hdrdir)/ruby/internal/intern/ruby.h
 num2int.o: $(hdrdir)/ruby/internal/intern/select.h
 num2int.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+num2int.o: $(hdrdir)/ruby/internal/intern/set.h
 num2int.o: $(hdrdir)/ruby/internal/intern/signal.h
 num2int.o: $(hdrdir)/ruby/internal/intern/sprintf.h
 num2int.o: $(hdrdir)/ruby/internal/intern/string.h
@@ -147,6 +148,7 @@ num2int.o: $(hdrdir)/ruby/internal/special_consts.h
 num2int.o: $(hdrdir)/ruby/internal/static_assert.h
 num2int.o: $(hdrdir)/ruby/internal/stdalign.h
 num2int.o: $(hdrdir)/ruby/internal/stdbool.h
+num2int.o: $(hdrdir)/ruby/internal/stdckdint.h
 num2int.o: $(hdrdir)/ruby/internal/symbol.h
 num2int.o: $(hdrdir)/ruby/internal/value.h
 num2int.o: $(hdrdir)/ruby/internal/value_type.h
diff --git a/ext/-test-/path_to_class/depend b/ext/-test-/path_to_class/depend
index 8fe6ee37c2e9e3..e535058e092935 100644
--- a/ext/-test-/path_to_class/depend
+++ b/ext/-test-/path_to_class/depend
@@ -128,6 +128,7 @@ path_to_class.o: $(hdrdir)/ruby/internal/intern/re.h
 path_to_class.o: $(hdrdir)/ruby/internal/intern/ruby.h
 path_to_class.o: $(hdrdir)/ruby/internal/intern/select.h
 path_to_class.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+path_to_class.o: $(hdrdir)/ruby/internal/intern/set.h
 path_to_class.o: $(hdrdir)/ruby/internal/intern/signal.h
 path_to_class.o: $(hdrdir)/ruby/internal/intern/sprintf.h
 path_to_class.o: $(hdrdir)/ruby/internal/intern/string.h
@@ -147,6 +148,7 @@ path_to_class.o: $(hdrdir)/ruby/internal/special_consts.h
 path_to_class.o: $(hdrdir)/ruby/internal/static_assert.h
 path_to_class.o: $(hdrdir)/ruby/internal/stdalign.h
 path_to_class.o: $(hdrdir)/ruby/internal/stdbool.h
+path_to_class.o: $(hdrdir)/ruby/internal/stdckdint.h
 path_to_class.o: $(hdrdir)/ruby/internal/symbol.h
 path_to_class.o: $(hdrdir)/ruby/internal/value.h
 path_to_class.o: $(hdrdir)/ruby/internal/value_type.h
diff --git a/ext/-test-/popen_deadlock/depend b/ext/-test-/popen_deadlock/depend
index fb58ca30e9900b..0b8932e8b8a191 100644
--- a/ext/-test-/popen_deadlock/depend
+++ b/ext/-test-/popen_deadlock/depend
@@ -128,6 +128,7 @@ infinite_loop_dlsym.o: $(hdrdir)/ruby/internal/intern/re.h
 infinite_loop_dlsym.o: $(hdrdir)/ruby/internal/intern/ruby.h
 infinite_loop_dlsym.o: $(hdrdir)/ruby/internal/intern/select.h
 infinite_loop_dlsym.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+infinite_loop_dlsym.o: $(hdrdir)/ruby/internal/intern/set.h
 infinite_loop_dlsym.o: $(hdrdir)/ruby/internal/intern/signal.h
 infinite_loop_dlsym.o: $(hdrdir)/ruby/internal/intern/sprintf.h
 infinite_loop_dlsym.o: $(hdrdir)/ruby/internal/intern/string.h
@@ -147,6 +148,7 @@ infinite_loop_dlsym.o: $(hdrdir)/ruby/internal/special_consts.h
 infinite_loop_dlsym.o: $(hdrdir)/ruby/internal/static_assert.h
 infinite_loop_dlsym.o: $(hdrdir)/ruby/internal/stdalign.h
 infinite_loop_dlsym.o: $(hdrdir)/ruby/internal/stdbool.h
+infinite_loop_dlsym.o: $(hdrdir)/ruby/internal/stdckdint.h
 infinite_loop_dlsym.o: $(hdrdir)/ruby/internal/symbol.h
 infinite_loop_dlsym.o: $(hdrdir)/ruby/internal/value.h
 infinite_loop_dlsym.o: $(hdrdir)/ruby/internal/value_type.h
diff --git a/ext/-test-/postponed_job/depend b/ext/-test-/postponed_job/depend
index e44d9d51b75e04..ff567e39215ce5 100644
--- a/ext/-test-/postponed_job/depend
+++ b/ext/-test-/postponed_job/depend
@@ -129,6 +129,7 @@ postponed_job.o: $(hdrdir)/ruby/internal/intern/re.h
 postponed_job.o: $(hdrdir)/ruby/internal/intern/ruby.h
 postponed_job.o: $(hdrdir)/ruby/internal/intern/select.h
 postponed_job.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+postponed_job.o: $(hdrdir)/ruby/internal/intern/set.h
 postponed_job.o: $(hdrdir)/ruby/internal/intern/signal.h
 postponed_job.o: $(hdrdir)/ruby/internal/intern/sprintf.h
 postponed_job.o: $(hdrdir)/ruby/internal/intern/string.h
@@ -148,6 +149,7 @@ postponed_job.o: $(hdrdir)/ruby/internal/special_consts.h
 postponed_job.o: $(hdrdir)/ruby/internal/static_assert.h
 postponed_job.o: $(hdrdir)/ruby/internal/stdalign.h
 postponed_job.o: $(hdrdir)/ruby/internal/stdbool.h
+postponed_job.o: $(hdrdir)/ruby/internal/stdckdint.h
 postponed_job.o: $(hdrdir)/ruby/internal/symbol.h
 postponed_job.o: $(hdrdir)/ruby/internal/value.h
 postponed_job.o: $(hdrdir)/ruby/internal/value_type.h
diff --git a/ext/-test-/postponed_job/postponed_job.c b/ext/-test-/postponed_job/postponed_job.c
index fa57bef6f5acec..9ac866ae7733ce 100644
--- a/ext/-test-/postponed_job/postponed_job.c
+++ b/ext/-test-/postponed_job/postponed_job.c
@@ -1,6 +1,29 @@
 #include "ruby.h"
 #include "ruby/debug.h"
 
+// We're testing deprecated things, don't print the compiler warnings
+#if 0
+
+#elif defined(_MSC_VER)
+#pragma warning(disable : 4996)
+
+#elif defined(__INTEL_COMPILER)
+#pragma warning(disable : 1786)
+
+#elif defined(__clang__)
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
+
+#elif defined(__GNUC__)
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+
+#elif defined(__SUNPRO_CC)
+#pragma error_messages (off,symdeprecated)
+
+#else
+// :FIXME: improve here for your compiler.
+
+#endif
+
 static int counter;
 
 static void
@@ -58,6 +81,22 @@ pjob_call_direct(VALUE self, VALUE obj)
     return self;
 }
 
+static void pjob_noop_callback(void *data) { }
+
+static VALUE
+pjob_register_one_same(VALUE self)
+{
+    rb_gc_start();
+    int r1 = rb_postponed_job_register_one(0, pjob_noop_callback, NULL);
+    int r2 = rb_postponed_job_register_one(0, pjob_noop_callback, NULL);
+    int r3 = rb_postponed_job_register_one(0, pjob_noop_callback, NULL);
+    VALUE ary = rb_ary_new();
+    rb_ary_push(ary, INT2FIX(r1));
+    rb_ary_push(ary, INT2FIX(r2));
+    rb_ary_push(ary, INT2FIX(r3));
+    return ary;
+}
+
 #ifdef HAVE_PTHREAD_H
 #include <pthread.h>
 
@@ -86,6 +125,93 @@ pjob_register_in_c_thread(VALUE self, VALUE obj)
 }
 #endif
 
+static void
+pjob_preregistered_callback(void *data)
+{
+    VALUE ary = (VALUE)data;
+    Check_Type(ary, T_ARRAY);
+    rb_ary_push(ary, INT2FIX(counter));
+}
+
+static VALUE
+pjob_preregister_and_call_with_sleep(VALUE self, VALUE obj)
+{
+    counter = 0;
+    rb_postponed_job_handle_t h = rb_postponed_job_preregister(0, pjob_preregistered_callback, (void *)obj);
+    counter++;
+    rb_postponed_job_trigger(h);
+    rb_thread_sleep(0);
+    counter++;
+    rb_postponed_job_trigger(h);
+    rb_thread_sleep(0);
+    counter++;
+    rb_postponed_job_trigger(h);
+    rb_thread_sleep(0);
+    return self;
+}
+
+static VALUE
+pjob_preregister_and_call_without_sleep(VALUE self, VALUE obj)
+{
+    counter = 0;
+    rb_postponed_job_handle_t h = rb_postponed_job_preregister(0, pjob_preregistered_callback, (void *)obj);
+    counter = 3;
+    rb_postponed_job_trigger(h);
+    rb_postponed_job_trigger(h);
+    rb_postponed_job_trigger(h);
+    return self;
+}
+
+static VALUE
+pjob_preregister_multiple_times(VALUE self)
+{
+    int r1 = rb_postponed_job_preregister(0, pjob_noop_callback, NULL);
+    int r2 = rb_postponed_job_preregister(0, pjob_noop_callback, NULL);
+    int r3 = rb_postponed_job_preregister(0, pjob_noop_callback, NULL);
+    VALUE ary = rb_ary_new();
+    rb_ary_push(ary, INT2FIX(r1));
+    rb_ary_push(ary, INT2FIX(r2));
+    rb_ary_push(ary, INT2FIX(r3));
+    return ary;
+
+}
+
+struct pjob_append_data_args {
+    VALUE ary;
+    VALUE data;
+};
+
+static void
+pjob_append_data_callback(void *vctx) {
+    struct pjob_append_data_args *ctx = (struct pjob_append_data_args *)vctx;
+    Check_Type(ctx->ary, T_ARRAY);
+    rb_ary_push(ctx->ary, ctx->data);
+}
+
+static VALUE
+pjob_preregister_calls_with_last_argument(VALUE self)
+{
+    VALUE ary = rb_ary_new();
+
+    struct pjob_append_data_args arg1 = { .ary = ary, .data = INT2FIX(1) };
+    struct pjob_append_data_args arg2 = { .ary = ary, .data = INT2FIX(2) };
+    struct pjob_append_data_args arg3 = { .ary = ary, .data = INT2FIX(3) };
+    struct pjob_append_data_args arg4 = { .ary = ary, .data = INT2FIX(4) };
+
+    rb_postponed_job_handle_t h;
+    h = rb_postponed_job_preregister(0, pjob_append_data_callback, &arg1);
+    rb_postponed_job_preregister(0, pjob_append_data_callback, &arg2);
+    rb_postponed_job_trigger(h);
+    rb_postponed_job_preregister(0, pjob_append_data_callback, &arg3);
+    rb_thread_sleep(0); // should execute with arg3
+
+    rb_postponed_job_preregister(0, pjob_append_data_callback, &arg4);
+    rb_postponed_job_trigger(h);
+    rb_thread_sleep(0); // should execute with arg4
+
+    return ary;
+}
+
 void
 Init_postponed_job(VALUE self)
 {
@@ -93,8 +219,13 @@ Init_postponed_job(VALUE self)
     rb_define_module_function(mBug, "postponed_job_register", pjob_register, 1);
     rb_define_module_function(mBug, "postponed_job_register_one", pjob_register_one, 1);
     rb_define_module_function(mBug, "postponed_job_call_direct", pjob_call_direct, 1);
+    rb_define_module_function(mBug, "postponed_job_register_one_same", pjob_register_one_same, 0);
 #ifdef HAVE_PTHREAD_H
     rb_define_module_function(mBug, "postponed_job_register_in_c_thread", pjob_register_in_c_thread, 1);
 #endif
+    rb_define_module_function(mBug, "postponed_job_preregister_and_call_with_sleep", pjob_preregister_and_call_with_sleep, 1);
+    rb_define_module_function(mBug, "postponed_job_preregister_and_call_without_sleep", pjob_preregister_and_call_without_sleep, 1);
+    rb_define_module_function(mBug, "postponed_job_preregister_multiple_times", pjob_preregister_multiple_times, 0);
+    rb_define_module_function(mBug, "postponed_job_preregister_calls_with_last_argument", pjob_preregister_calls_with_last_argument, 0);
 }
 
diff --git a/ext/-test-/printf/depend b/ext/-test-/printf/depend
index b3970411033ebd..be895cf769a056 100644
--- a/ext/-test-/printf/depend
+++ b/ext/-test-/printf/depend
@@ -138,6 +138,7 @@ printf.o: $(hdrdir)/ruby/internal/intern/re.h
 printf.o: $(hdrdir)/ruby/internal/intern/ruby.h
 printf.o: $(hdrdir)/ruby/internal/intern/select.h
 printf.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+printf.o: $(hdrdir)/ruby/internal/intern/set.h
 printf.o: $(hdrdir)/ruby/internal/intern/signal.h
 printf.o: $(hdrdir)/ruby/internal/intern/sprintf.h
 printf.o: $(hdrdir)/ruby/internal/intern/string.h
@@ -157,6 +158,7 @@ printf.o: $(hdrdir)/ruby/internal/special_consts.h
 printf.o: $(hdrdir)/ruby/internal/static_assert.h
 printf.o: $(hdrdir)/ruby/internal/stdalign.h
 printf.o: $(hdrdir)/ruby/internal/stdbool.h
+printf.o: $(hdrdir)/ruby/internal/stdckdint.h
 printf.o: $(hdrdir)/ruby/internal/symbol.h
 printf.o: $(hdrdir)/ruby/internal/value.h
 printf.o: $(hdrdir)/ruby/internal/value_type.h
diff --git a/ext/-test-/proc/depend b/ext/-test-/proc/depend
index 7e78aa6f836cdc..97834db0a2d422 100644
--- a/ext/-test-/proc/depend
+++ b/ext/-test-/proc/depend
@@ -128,6 +128,7 @@ init.o: $(hdrdir)/ruby/internal/intern/re.h
 init.o: $(hdrdir)/ruby/internal/intern/ruby.h
 init.o: $(hdrdir)/ruby/internal/intern/select.h
 init.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+init.o: $(hdrdir)/ruby/internal/intern/set.h
 init.o: $(hdrdir)/ruby/internal/intern/signal.h
 init.o: $(hdrdir)/ruby/internal/intern/sprintf.h
 init.o: $(hdrdir)/ruby/internal/intern/string.h
@@ -147,6 +148,7 @@ init.o: $(hdrdir)/ruby/internal/special_consts.h
 init.o: $(hdrdir)/ruby/internal/static_assert.h
 init.o: $(hdrdir)/ruby/internal/stdalign.h
 init.o: $(hdrdir)/ruby/internal/stdbool.h
+init.o: $(hdrdir)/ruby/internal/stdckdint.h
 init.o: $(hdrdir)/ruby/internal/symbol.h
 init.o: $(hdrdir)/ruby/internal/value.h
 init.o: $(hdrdir)/ruby/internal/value_type.h
@@ -287,6 +289,7 @@ receiver.o: $(hdrdir)/ruby/internal/intern/re.h
 receiver.o: $(hdrdir)/ruby/internal/intern/ruby.h
 receiver.o: $(hdrdir)/ruby/internal/intern/select.h
 receiver.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+receiver.o: $(hdrdir)/ruby/internal/intern/set.h
 receiver.o: $(hdrdir)/ruby/internal/intern/signal.h
 receiver.o: $(hdrdir)/ruby/internal/intern/sprintf.h
 receiver.o: $(hdrdir)/ruby/internal/intern/string.h
@@ -306,6 +309,7 @@ receiver.o: $(hdrdir)/ruby/internal/special_consts.h
 receiver.o: $(hdrdir)/ruby/internal/static_assert.h
 receiver.o: $(hdrdir)/ruby/internal/stdalign.h
 receiver.o: $(hdrdir)/ruby/internal/stdbool.h
+receiver.o: $(hdrdir)/ruby/internal/stdckdint.h
 receiver.o: $(hdrdir)/ruby/internal/symbol.h
 receiver.o: $(hdrdir)/ruby/internal/value.h
 receiver.o: $(hdrdir)/ruby/internal/value_type.h
@@ -446,6 +450,7 @@ super.o: $(hdrdir)/ruby/internal/intern/re.h
 super.o: $(hdrdir)/ruby/internal/intern/ruby.h
 super.o: $(hdrdir)/ruby/internal/intern/select.h
 super.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+super.o: $(hdrdir)/ruby/internal/intern/set.h
 super.o: $(hdrdir)/ruby/internal/intern/signal.h
 super.o: $(hdrdir)/ruby/internal/intern/sprintf.h
 super.o: $(hdrdir)/ruby/internal/intern/string.h
@@ -465,6 +470,7 @@ super.o: $(hdrdir)/ruby/internal/special_consts.h
 super.o: $(hdrdir)/ruby/internal/static_assert.h
 super.o: $(hdrdir)/ruby/internal/stdalign.h
 super.o: $(hdrdir)/ruby/internal/stdbool.h
+super.o: $(hdrdir)/ruby/internal/stdckdint.h
 super.o: $(hdrdir)/ruby/internal/symbol.h
 super.o: $(hdrdir)/ruby/internal/value.h
 super.o: $(hdrdir)/ruby/internal/value_type.h
diff --git a/ext/-test-/public_header_warnings/extconf.rb b/ext/-test-/public_header_warnings/extconf.rb
new file mode 100644
index 00000000000000..4431e09da40a69
--- /dev/null
+++ b/ext/-test-/public_header_warnings/extconf.rb
@@ -0,0 +1,28 @@
+#
+#  Under compilers with WERRORFLAG, MakeMakefile.try_compile treats warnings as errors, so we can
+#  use append_cflags to test whether the public header files emit warnings with certain flags turned
+#  on.
+#
+def check_append_cflags(flag, msg = nil)
+  msg ||= "flag #{flag} is not acceptable"
+  if $CFLAGS.include?(flag)
+    raise("flag #{flag} already present in $CFLAGS")
+  end
+  append_cflags(flag)
+  unless $CFLAGS.include?(flag)
+    system("cat mkmf.log")
+    raise(msg)
+  end
+end
+
+if %w[gcc clang].include?(RbConfig::CONFIG['CC'])
+  config_string("WERRORFLAG") or raise("expected WERRORFLAG to be defined")
+
+  # should be acceptable on all modern C compilers
+  check_append_cflags("-D_TEST_OK", "baseline compiler warning test failed")
+
+  # Feature #20507: Allow compilation of C extensions with -Wconversion
+  check_append_cflags("-Wconversion", "-Wconversion raising warnings in public headers")
+end
+
+create_makefile("-test-/public_header_warnings")
diff --git a/ext/-test-/random/depend b/ext/-test-/random/depend
index 3f9a52be446540..380c30fbe4a355 100644
--- a/ext/-test-/random/depend
+++ b/ext/-test-/random/depend
@@ -127,6 +127,7 @@ bad_version.o: $(hdrdir)/ruby/internal/intern/re.h
 bad_version.o: $(hdrdir)/ruby/internal/intern/ruby.h
 bad_version.o: $(hdrdir)/ruby/internal/intern/select.h
 bad_version.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+bad_version.o: $(hdrdir)/ruby/internal/intern/set.h
 bad_version.o: $(hdrdir)/ruby/internal/intern/signal.h
 bad_version.o: $(hdrdir)/ruby/internal/intern/sprintf.h
 bad_version.o: $(hdrdir)/ruby/internal/intern/string.h
@@ -146,6 +147,7 @@ bad_version.o: $(hdrdir)/ruby/internal/special_consts.h
 bad_version.o: $(hdrdir)/ruby/internal/static_assert.h
 bad_version.o: $(hdrdir)/ruby/internal/stdalign.h
 bad_version.o: $(hdrdir)/ruby/internal/stdbool.h
+bad_version.o: $(hdrdir)/ruby/internal/stdckdint.h
 bad_version.o: $(hdrdir)/ruby/internal/symbol.h
 bad_version.o: $(hdrdir)/ruby/internal/value.h
 bad_version.o: $(hdrdir)/ruby/internal/value_type.h
@@ -287,6 +289,7 @@ init.o: $(hdrdir)/ruby/internal/intern/re.h
 init.o: $(hdrdir)/ruby/internal/intern/ruby.h
 init.o: $(hdrdir)/ruby/internal/intern/select.h
 init.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+init.o: $(hdrdir)/ruby/internal/intern/set.h
 init.o: $(hdrdir)/ruby/internal/intern/signal.h
 init.o: $(hdrdir)/ruby/internal/intern/sprintf.h
 init.o: $(hdrdir)/ruby/internal/intern/string.h
@@ -306,6 +309,7 @@ init.o: $(hdrdir)/ruby/internal/special_consts.h
 init.o: $(hdrdir)/ruby/internal/static_assert.h
 init.o: $(hdrdir)/ruby/internal/stdalign.h
 init.o: $(hdrdir)/ruby/internal/stdbool.h
+init.o: $(hdrdir)/ruby/internal/stdckdint.h
 init.o: $(hdrdir)/ruby/internal/symbol.h
 init.o: $(hdrdir)/ruby/internal/value.h
 init.o: $(hdrdir)/ruby/internal/value_type.h
@@ -445,6 +449,7 @@ loop.o: $(hdrdir)/ruby/internal/intern/re.h
 loop.o: $(hdrdir)/ruby/internal/intern/ruby.h
 loop.o: $(hdrdir)/ruby/internal/intern/select.h
 loop.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+loop.o: $(hdrdir)/ruby/internal/intern/set.h
 loop.o: $(hdrdir)/ruby/internal/intern/signal.h
 loop.o: $(hdrdir)/ruby/internal/intern/sprintf.h
 loop.o: $(hdrdir)/ruby/internal/intern/string.h
@@ -464,6 +469,7 @@ loop.o: $(hdrdir)/ruby/internal/special_consts.h
 loop.o: $(hdrdir)/ruby/internal/static_assert.h
 loop.o: $(hdrdir)/ruby/internal/stdalign.h
 loop.o: $(hdrdir)/ruby/internal/stdbool.h
+loop.o: $(hdrdir)/ruby/internal/stdckdint.h
 loop.o: $(hdrdir)/ruby/internal/symbol.h
 loop.o: $(hdrdir)/ruby/internal/value.h
 loop.o: $(hdrdir)/ruby/internal/value_type.h
diff --git a/ext/-test-/random/loop.c b/ext/-test-/random/loop.c
index b789ab1d0177d4..f79e5cfd832549 100644
--- a/ext/-test-/random/loop.c
+++ b/ext/-test-/random/loop.c
@@ -13,6 +13,15 @@ static const rb_random_interface_t random_loop_if = {
     RB_RANDOM_INTERFACE_DEFINE_WITH_REAL(loop)
 };
 
+static void
+loop_free(void *ptr)
+{
+    rand_loop_t *r = ptr;
+
+    xfree(r->buf);
+    xfree(r);
+}
+
 RB_RANDOM_DEFINE_INIT_INT32_FUNC(loop)
 static size_t
 random_loop_memsize(const void *ptr)
@@ -25,7 +34,7 @@ static rb_random_data_type_t random_loop_type = {
     "random/loop",
     {
         rb_random_mark,
-        RUBY_TYPED_DEFAULT_FREE,
+        loop_free,
         random_loop_memsize,
     },
     RB_RANDOM_PARENT,
diff --git a/ext/-test-/rational/depend b/ext/-test-/rational/depend
index cff2eae38d4bcf..56d6ab77d6c36a 100644
--- a/ext/-test-/rational/depend
+++ b/ext/-test-/rational/depend
@@ -132,6 +132,7 @@ rat.o: $(hdrdir)/ruby/internal/intern/re.h
 rat.o: $(hdrdir)/ruby/internal/intern/ruby.h
 rat.o: $(hdrdir)/ruby/internal/intern/select.h
 rat.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+rat.o: $(hdrdir)/ruby/internal/intern/set.h
 rat.o: $(hdrdir)/ruby/internal/intern/signal.h
 rat.o: $(hdrdir)/ruby/internal/intern/sprintf.h
 rat.o: $(hdrdir)/ruby/internal/intern/string.h
@@ -151,6 +152,7 @@ rat.o: $(hdrdir)/ruby/internal/special_consts.h
 rat.o: $(hdrdir)/ruby/internal/static_assert.h
 rat.o: $(hdrdir)/ruby/internal/stdalign.h
 rat.o: $(hdrdir)/ruby/internal/stdbool.h
+rat.o: $(hdrdir)/ruby/internal/stdckdint.h
 rat.o: $(hdrdir)/ruby/internal/symbol.h
 rat.o: $(hdrdir)/ruby/internal/value.h
 rat.o: $(hdrdir)/ruby/internal/value_type.h
diff --git a/ext/-test-/rb_call_super_kw/depend b/ext/-test-/rb_call_super_kw/depend
index a42ddc85acc456..bf34323ca7ddc8 100644
--- a/ext/-test-/rb_call_super_kw/depend
+++ b/ext/-test-/rb_call_super_kw/depend
@@ -128,6 +128,7 @@ rb_call_super_kw.o: $(hdrdir)/ruby/internal/intern/re.h
 rb_call_super_kw.o: $(hdrdir)/ruby/internal/intern/ruby.h
 rb_call_super_kw.o: $(hdrdir)/ruby/internal/intern/select.h
 rb_call_super_kw.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+rb_call_super_kw.o: $(hdrdir)/ruby/internal/intern/set.h
 rb_call_super_kw.o: $(hdrdir)/ruby/internal/intern/signal.h
 rb_call_super_kw.o: $(hdrdir)/ruby/internal/intern/sprintf.h
 rb_call_super_kw.o: $(hdrdir)/ruby/internal/intern/string.h
@@ -147,6 +148,7 @@ rb_call_super_kw.o: $(hdrdir)/ruby/internal/special_consts.h
 rb_call_super_kw.o: $(hdrdir)/ruby/internal/static_assert.h
 rb_call_super_kw.o: $(hdrdir)/ruby/internal/stdalign.h
 rb_call_super_kw.o: $(hdrdir)/ruby/internal/stdbool.h
+rb_call_super_kw.o: $(hdrdir)/ruby/internal/stdckdint.h
 rb_call_super_kw.o: $(hdrdir)/ruby/internal/symbol.h
 rb_call_super_kw.o: $(hdrdir)/ruby/internal/value.h
 rb_call_super_kw.o: $(hdrdir)/ruby/internal/value_type.h
diff --git a/ext/-test-/recursion/depend b/ext/-test-/recursion/depend
index 49377250efe760..b6487eb4dfa624 100644
--- a/ext/-test-/recursion/depend
+++ b/ext/-test-/recursion/depend
@@ -128,6 +128,7 @@ recursion.o: $(hdrdir)/ruby/internal/intern/re.h
 recursion.o: $(hdrdir)/ruby/internal/intern/ruby.h
 recursion.o: $(hdrdir)/ruby/internal/intern/select.h
 recursion.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+recursion.o: $(hdrdir)/ruby/internal/intern/set.h
 recursion.o: $(hdrdir)/ruby/internal/intern/signal.h
 recursion.o: $(hdrdir)/ruby/internal/intern/sprintf.h
 recursion.o: $(hdrdir)/ruby/internal/intern/string.h
@@ -147,6 +148,7 @@ recursion.o: $(hdrdir)/ruby/internal/special_consts.h
 recursion.o: $(hdrdir)/ruby/internal/static_assert.h
 recursion.o: $(hdrdir)/ruby/internal/stdalign.h
 recursion.o: $(hdrdir)/ruby/internal/stdbool.h
+recursion.o: $(hdrdir)/ruby/internal/stdckdint.h
 recursion.o: $(hdrdir)/ruby/internal/symbol.h
 recursion.o: $(hdrdir)/ruby/internal/value.h
 recursion.o: $(hdrdir)/ruby/internal/value_type.h
diff --git a/ext/-test-/regexp/depend b/ext/-test-/regexp/depend
index 484f0320dde545..5ba1b92f18898c 100644
--- a/ext/-test-/regexp/depend
+++ b/ext/-test-/regexp/depend
@@ -128,6 +128,7 @@ init.o: $(hdrdir)/ruby/internal/intern/re.h
 init.o: $(hdrdir)/ruby/internal/intern/ruby.h
 init.o: $(hdrdir)/ruby/internal/intern/select.h
 init.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+init.o: $(hdrdir)/ruby/internal/intern/set.h
 init.o: $(hdrdir)/ruby/internal/intern/signal.h
 init.o: $(hdrdir)/ruby/internal/intern/sprintf.h
 init.o: $(hdrdir)/ruby/internal/intern/string.h
@@ -147,6 +148,7 @@ init.o: $(hdrdir)/ruby/internal/special_consts.h
 init.o: $(hdrdir)/ruby/internal/static_assert.h
 init.o: $(hdrdir)/ruby/internal/stdalign.h
 init.o: $(hdrdir)/ruby/internal/stdbool.h
+init.o: $(hdrdir)/ruby/internal/stdckdint.h
 init.o: $(hdrdir)/ruby/internal/symbol.h
 init.o: $(hdrdir)/ruby/internal/value.h
 init.o: $(hdrdir)/ruby/internal/value_type.h
@@ -287,6 +289,7 @@ parse_depth_limit.o: $(hdrdir)/ruby/internal/intern/re.h
 parse_depth_limit.o: $(hdrdir)/ruby/internal/intern/ruby.h
 parse_depth_limit.o: $(hdrdir)/ruby/internal/intern/select.h
 parse_depth_limit.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+parse_depth_limit.o: $(hdrdir)/ruby/internal/intern/set.h
 parse_depth_limit.o: $(hdrdir)/ruby/internal/intern/signal.h
 parse_depth_limit.o: $(hdrdir)/ruby/internal/intern/sprintf.h
 parse_depth_limit.o: $(hdrdir)/ruby/internal/intern/string.h
@@ -306,6 +309,7 @@ parse_depth_limit.o: $(hdrdir)/ruby/internal/special_consts.h
 parse_depth_limit.o: $(hdrdir)/ruby/internal/static_assert.h
 parse_depth_limit.o: $(hdrdir)/ruby/internal/stdalign.h
 parse_depth_limit.o: $(hdrdir)/ruby/internal/stdbool.h
+parse_depth_limit.o: $(hdrdir)/ruby/internal/stdckdint.h
 parse_depth_limit.o: $(hdrdir)/ruby/internal/symbol.h
 parse_depth_limit.o: $(hdrdir)/ruby/internal/value.h
 parse_depth_limit.o: $(hdrdir)/ruby/internal/value_type.h
diff --git a/ext/-test-/scan_args/depend b/ext/-test-/scan_args/depend
index 3bedc6a7cfca27..ca0fc1923860b0 100644
--- a/ext/-test-/scan_args/depend
+++ b/ext/-test-/scan_args/depend
@@ -128,6 +128,7 @@ scan_args.o: $(hdrdir)/ruby/internal/intern/re.h
 scan_args.o: $(hdrdir)/ruby/internal/intern/ruby.h
 scan_args.o: $(hdrdir)/ruby/internal/intern/select.h
 scan_args.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+scan_args.o: $(hdrdir)/ruby/internal/intern/set.h
 scan_args.o: $(hdrdir)/ruby/internal/intern/signal.h
 scan_args.o: $(hdrdir)/ruby/internal/intern/sprintf.h
 scan_args.o: $(hdrdir)/ruby/internal/intern/string.h
@@ -147,6 +148,7 @@ scan_args.o: $(hdrdir)/ruby/internal/special_consts.h
 scan_args.o: $(hdrdir)/ruby/internal/static_assert.h
 scan_args.o: $(hdrdir)/ruby/internal/stdalign.h
 scan_args.o: $(hdrdir)/ruby/internal/stdbool.h
+scan_args.o: $(hdrdir)/ruby/internal/stdckdint.h
 scan_args.o: $(hdrdir)/ruby/internal/symbol.h
 scan_args.o: $(hdrdir)/ruby/internal/value.h
 scan_args.o: $(hdrdir)/ruby/internal/value_type.h
diff --git a/ext/-test-/st/foreach/depend b/ext/-test-/st/foreach/depend
index fdfe356805fd5b..29aab2bb29511f 100644
--- a/ext/-test-/st/foreach/depend
+++ b/ext/-test-/st/foreach/depend
@@ -128,6 +128,7 @@ foreach.o: $(hdrdir)/ruby/internal/intern/re.h
 foreach.o: $(hdrdir)/ruby/internal/intern/ruby.h
 foreach.o: $(hdrdir)/ruby/internal/intern/select.h
 foreach.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+foreach.o: $(hdrdir)/ruby/internal/intern/set.h
 foreach.o: $(hdrdir)/ruby/internal/intern/signal.h
 foreach.o: $(hdrdir)/ruby/internal/intern/sprintf.h
 foreach.o: $(hdrdir)/ruby/internal/intern/string.h
@@ -147,6 +148,7 @@ foreach.o: $(hdrdir)/ruby/internal/special_consts.h
 foreach.o: $(hdrdir)/ruby/internal/static_assert.h
 foreach.o: $(hdrdir)/ruby/internal/stdalign.h
 foreach.o: $(hdrdir)/ruby/internal/stdbool.h
+foreach.o: $(hdrdir)/ruby/internal/stdckdint.h
 foreach.o: $(hdrdir)/ruby/internal/symbol.h
 foreach.o: $(hdrdir)/ruby/internal/value.h
 foreach.o: $(hdrdir)/ruby/internal/value_type.h
diff --git a/ext/-test-/st/numhash/depend b/ext/-test-/st/numhash/depend
index ef28c892f364e8..18320d55f56805 100644
--- a/ext/-test-/st/numhash/depend
+++ b/ext/-test-/st/numhash/depend
@@ -128,6 +128,7 @@ numhash.o: $(hdrdir)/ruby/internal/intern/re.h
 numhash.o: $(hdrdir)/ruby/internal/intern/ruby.h
 numhash.o: $(hdrdir)/ruby/internal/intern/select.h
 numhash.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+numhash.o: $(hdrdir)/ruby/internal/intern/set.h
 numhash.o: $(hdrdir)/ruby/internal/intern/signal.h
 numhash.o: $(hdrdir)/ruby/internal/intern/sprintf.h
 numhash.o: $(hdrdir)/ruby/internal/intern/string.h
@@ -147,6 +148,7 @@ numhash.o: $(hdrdir)/ruby/internal/special_consts.h
 numhash.o: $(hdrdir)/ruby/internal/static_assert.h
 numhash.o: $(hdrdir)/ruby/internal/stdalign.h
 numhash.o: $(hdrdir)/ruby/internal/stdbool.h
+numhash.o: $(hdrdir)/ruby/internal/stdckdint.h
 numhash.o: $(hdrdir)/ruby/internal/symbol.h
 numhash.o: $(hdrdir)/ruby/internal/value.h
 numhash.o: $(hdrdir)/ruby/internal/value_type.h
diff --git a/ext/-test-/st/update/depend b/ext/-test-/st/update/depend
index 2d5ff224a2852f..247f0efd6b39b6 100644
--- a/ext/-test-/st/update/depend
+++ b/ext/-test-/st/update/depend
@@ -128,6 +128,7 @@ update.o: $(hdrdir)/ruby/internal/intern/re.h
 update.o: $(hdrdir)/ruby/internal/intern/ruby.h
 update.o: $(hdrdir)/ruby/internal/intern/select.h
 update.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+update.o: $(hdrdir)/ruby/internal/intern/set.h
 update.o: $(hdrdir)/ruby/internal/intern/signal.h
 update.o: $(hdrdir)/ruby/internal/intern/sprintf.h
 update.o: $(hdrdir)/ruby/internal/intern/string.h
@@ -147,6 +148,7 @@ update.o: $(hdrdir)/ruby/internal/special_consts.h
 update.o: $(hdrdir)/ruby/internal/static_assert.h
 update.o: $(hdrdir)/ruby/internal/stdalign.h
 update.o: $(hdrdir)/ruby/internal/stdbool.h
+update.o: $(hdrdir)/ruby/internal/stdckdint.h
 update.o: $(hdrdir)/ruby/internal/symbol.h
 update.o: $(hdrdir)/ruby/internal/value.h
 update.o: $(hdrdir)/ruby/internal/value_type.h
diff --git a/ext/-test-/stack/depend b/ext/-test-/stack/depend
new file mode 100644
index 00000000000000..31571c882e6eb7
--- /dev/null
+++ b/ext/-test-/stack/depend
@@ -0,0 +1,178 @@
+# AUTOGENERATED DEPENDENCIES START
+stack.o: $(RUBY_EXTCONF_H)
+stack.o: $(arch_hdrdir)/ruby/config.h
+stack.o: $(hdrdir)/ruby.h
+stack.o: $(hdrdir)/ruby/assert.h
+stack.o: $(hdrdir)/ruby/backward.h
+stack.o: $(hdrdir)/ruby/backward/2/assume.h
+stack.o: $(hdrdir)/ruby/backward/2/attributes.h
+stack.o: $(hdrdir)/ruby/backward/2/bool.h
+stack.o: $(hdrdir)/ruby/backward/2/gcc_version_since.h
+stack.o: $(hdrdir)/ruby/backward/2/inttypes.h
+stack.o: $(hdrdir)/ruby/backward/2/limits.h
+stack.o: $(hdrdir)/ruby/backward/2/long_long.h
+stack.o: $(hdrdir)/ruby/backward/2/stdalign.h
+stack.o: $(hdrdir)/ruby/backward/2/stdarg.h
+stack.o: $(hdrdir)/ruby/defines.h
+stack.o: $(hdrdir)/ruby/encoding.h
+stack.o: $(hdrdir)/ruby/intern.h
+stack.o: $(hdrdir)/ruby/internal/abi.h
+stack.o: $(hdrdir)/ruby/internal/anyargs.h
+stack.o: $(hdrdir)/ruby/internal/arithmetic.h
+stack.o: $(hdrdir)/ruby/internal/arithmetic/char.h
+stack.o: $(hdrdir)/ruby/internal/arithmetic/double.h
+stack.o: $(hdrdir)/ruby/internal/arithmetic/fixnum.h
+stack.o: $(hdrdir)/ruby/internal/arithmetic/gid_t.h
+stack.o: $(hdrdir)/ruby/internal/arithmetic/int.h
+stack.o: $(hdrdir)/ruby/internal/arithmetic/intptr_t.h
+stack.o: $(hdrdir)/ruby/internal/arithmetic/long.h
+stack.o: $(hdrdir)/ruby/internal/arithmetic/long_long.h
+stack.o: $(hdrdir)/ruby/internal/arithmetic/mode_t.h
+stack.o: $(hdrdir)/ruby/internal/arithmetic/off_t.h
+stack.o: $(hdrdir)/ruby/internal/arithmetic/pid_t.h
+stack.o: $(hdrdir)/ruby/internal/arithmetic/short.h
+stack.o: $(hdrdir)/ruby/internal/arithmetic/size_t.h
+stack.o: $(hdrdir)/ruby/internal/arithmetic/st_data_t.h
+stack.o: $(hdrdir)/ruby/internal/arithmetic/uid_t.h
+stack.o: $(hdrdir)/ruby/internal/assume.h
+stack.o: $(hdrdir)/ruby/internal/attr/alloc_size.h
+stack.o: $(hdrdir)/ruby/internal/attr/artificial.h
+stack.o: $(hdrdir)/ruby/internal/attr/cold.h
+stack.o: $(hdrdir)/ruby/internal/attr/const.h
+stack.o: $(hdrdir)/ruby/internal/attr/constexpr.h
+stack.o: $(hdrdir)/ruby/internal/attr/deprecated.h
+stack.o: $(hdrdir)/ruby/internal/attr/diagnose_if.h
+stack.o: $(hdrdir)/ruby/internal/attr/enum_extensibility.h
+stack.o: $(hdrdir)/ruby/internal/attr/error.h
+stack.o: $(hdrdir)/ruby/internal/attr/flag_enum.h
+stack.o: $(hdrdir)/ruby/internal/attr/forceinline.h
+stack.o: $(hdrdir)/ruby/internal/attr/format.h
+stack.o: $(hdrdir)/ruby/internal/attr/maybe_unused.h
+stack.o: $(hdrdir)/ruby/internal/attr/noalias.h
+stack.o: $(hdrdir)/ruby/internal/attr/nodiscard.h
+stack.o: $(hdrdir)/ruby/internal/attr/noexcept.h
+stack.o: $(hdrdir)/ruby/internal/attr/noinline.h
+stack.o: $(hdrdir)/ruby/internal/attr/nonnull.h
+stack.o: $(hdrdir)/ruby/internal/attr/noreturn.h
+stack.o: $(hdrdir)/ruby/internal/attr/packed_struct.h
+stack.o: $(hdrdir)/ruby/internal/attr/pure.h
+stack.o: $(hdrdir)/ruby/internal/attr/restrict.h
+stack.o: $(hdrdir)/ruby/internal/attr/returns_nonnull.h
+stack.o: $(hdrdir)/ruby/internal/attr/warning.h
+stack.o: $(hdrdir)/ruby/internal/attr/weakref.h
+stack.o: $(hdrdir)/ruby/internal/cast.h
+stack.o: $(hdrdir)/ruby/internal/compiler_is.h
+stack.o: $(hdrdir)/ruby/internal/compiler_is/apple.h
+stack.o: $(hdrdir)/ruby/internal/compiler_is/clang.h
+stack.o: $(hdrdir)/ruby/internal/compiler_is/gcc.h
+stack.o: $(hdrdir)/ruby/internal/compiler_is/intel.h
+stack.o: $(hdrdir)/ruby/internal/compiler_is/msvc.h
+stack.o: $(hdrdir)/ruby/internal/compiler_is/sunpro.h
+stack.o: $(hdrdir)/ruby/internal/compiler_since.h
+stack.o: $(hdrdir)/ruby/internal/config.h
+stack.o: $(hdrdir)/ruby/internal/constant_p.h
+stack.o: $(hdrdir)/ruby/internal/core.h
+stack.o: $(hdrdir)/ruby/internal/core/rarray.h
+stack.o: $(hdrdir)/ruby/internal/core/rbasic.h
+stack.o: $(hdrdir)/ruby/internal/core/rbignum.h
+stack.o: $(hdrdir)/ruby/internal/core/rclass.h
+stack.o: $(hdrdir)/ruby/internal/core/rdata.h
+stack.o: $(hdrdir)/ruby/internal/core/rfile.h
+stack.o: $(hdrdir)/ruby/internal/core/rhash.h
+stack.o: $(hdrdir)/ruby/internal/core/robject.h
+stack.o: $(hdrdir)/ruby/internal/core/rregexp.h
+stack.o: $(hdrdir)/ruby/internal/core/rstring.h
+stack.o: $(hdrdir)/ruby/internal/core/rstruct.h
+stack.o: $(hdrdir)/ruby/internal/core/rtypeddata.h
+stack.o: $(hdrdir)/ruby/internal/ctype.h
+stack.o: $(hdrdir)/ruby/internal/dllexport.h
+stack.o: $(hdrdir)/ruby/internal/dosish.h
+stack.o: $(hdrdir)/ruby/internal/encoding/coderange.h
+stack.o: $(hdrdir)/ruby/internal/encoding/ctype.h
+stack.o: $(hdrdir)/ruby/internal/encoding/encoding.h
+stack.o: $(hdrdir)/ruby/internal/encoding/pathname.h
+stack.o: $(hdrdir)/ruby/internal/encoding/re.h
+stack.o: $(hdrdir)/ruby/internal/encoding/sprintf.h
+stack.o: $(hdrdir)/ruby/internal/encoding/string.h
+stack.o: $(hdrdir)/ruby/internal/encoding/symbol.h
+stack.o: $(hdrdir)/ruby/internal/encoding/transcode.h
+stack.o: $(hdrdir)/ruby/internal/error.h
+stack.o: $(hdrdir)/ruby/internal/eval.h
+stack.o: $(hdrdir)/ruby/internal/event.h
+stack.o: $(hdrdir)/ruby/internal/fl_type.h
+stack.o: $(hdrdir)/ruby/internal/gc.h
+stack.o: $(hdrdir)/ruby/internal/glob.h
+stack.o: $(hdrdir)/ruby/internal/globals.h
+stack.o: $(hdrdir)/ruby/internal/has/attribute.h
+stack.o: $(hdrdir)/ruby/internal/has/builtin.h
+stack.o: $(hdrdir)/ruby/internal/has/c_attribute.h
+stack.o: $(hdrdir)/ruby/internal/has/cpp_attribute.h
+stack.o: $(hdrdir)/ruby/internal/has/declspec_attribute.h
+stack.o: $(hdrdir)/ruby/internal/has/extension.h
+stack.o: $(hdrdir)/ruby/internal/has/feature.h
+stack.o: $(hdrdir)/ruby/internal/has/warning.h
+stack.o: $(hdrdir)/ruby/internal/intern/array.h
+stack.o: $(hdrdir)/ruby/internal/intern/bignum.h
+stack.o: $(hdrdir)/ruby/internal/intern/class.h
+stack.o: $(hdrdir)/ruby/internal/intern/compar.h
+stack.o: $(hdrdir)/ruby/internal/intern/complex.h
+stack.o: $(hdrdir)/ruby/internal/intern/cont.h
+stack.o: $(hdrdir)/ruby/internal/intern/dir.h
+stack.o: $(hdrdir)/ruby/internal/intern/enum.h
+stack.o: $(hdrdir)/ruby/internal/intern/enumerator.h
+stack.o: $(hdrdir)/ruby/internal/intern/error.h
+stack.o: $(hdrdir)/ruby/internal/intern/eval.h
+stack.o: $(hdrdir)/ruby/internal/intern/file.h
+stack.o: $(hdrdir)/ruby/internal/intern/hash.h
+stack.o: $(hdrdir)/ruby/internal/intern/io.h
+stack.o: $(hdrdir)/ruby/internal/intern/load.h
+stack.o: $(hdrdir)/ruby/internal/intern/marshal.h
+stack.o: $(hdrdir)/ruby/internal/intern/numeric.h
+stack.o: $(hdrdir)/ruby/internal/intern/object.h
+stack.o: $(hdrdir)/ruby/internal/intern/parse.h
+stack.o: $(hdrdir)/ruby/internal/intern/proc.h
+stack.o: $(hdrdir)/ruby/internal/intern/process.h
+stack.o: $(hdrdir)/ruby/internal/intern/random.h
+stack.o: $(hdrdir)/ruby/internal/intern/range.h
+stack.o: $(hdrdir)/ruby/internal/intern/rational.h
+stack.o: $(hdrdir)/ruby/internal/intern/re.h
+stack.o: $(hdrdir)/ruby/internal/intern/ruby.h
+stack.o: $(hdrdir)/ruby/internal/intern/select.h
+stack.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+stack.o: $(hdrdir)/ruby/internal/intern/set.h
+stack.o: $(hdrdir)/ruby/internal/intern/signal.h
+stack.o: $(hdrdir)/ruby/internal/intern/sprintf.h
+stack.o: $(hdrdir)/ruby/internal/intern/string.h
+stack.o: $(hdrdir)/ruby/internal/intern/struct.h
+stack.o: $(hdrdir)/ruby/internal/intern/thread.h
+stack.o: $(hdrdir)/ruby/internal/intern/time.h
+stack.o: $(hdrdir)/ruby/internal/intern/variable.h
+stack.o: $(hdrdir)/ruby/internal/intern/vm.h
+stack.o: $(hdrdir)/ruby/internal/interpreter.h
+stack.o: $(hdrdir)/ruby/internal/iterator.h
+stack.o: $(hdrdir)/ruby/internal/memory.h
+stack.o: $(hdrdir)/ruby/internal/method.h
+stack.o: $(hdrdir)/ruby/internal/module.h
+stack.o: $(hdrdir)/ruby/internal/newobj.h
+stack.o: $(hdrdir)/ruby/internal/scan_args.h
+stack.o: $(hdrdir)/ruby/internal/special_consts.h
+stack.o: $(hdrdir)/ruby/internal/static_assert.h
+stack.o: $(hdrdir)/ruby/internal/stdalign.h
+stack.o: $(hdrdir)/ruby/internal/stdbool.h
+stack.o: $(hdrdir)/ruby/internal/stdckdint.h
+stack.o: $(hdrdir)/ruby/internal/symbol.h
+stack.o: $(hdrdir)/ruby/internal/value.h
+stack.o: $(hdrdir)/ruby/internal/value_type.h
+stack.o: $(hdrdir)/ruby/internal/variable.h
+stack.o: $(hdrdir)/ruby/internal/warning_push.h
+stack.o: $(hdrdir)/ruby/internal/xmalloc.h
+stack.o: $(hdrdir)/ruby/missing.h
+stack.o: $(hdrdir)/ruby/onigmo.h
+stack.o: $(hdrdir)/ruby/oniguruma.h
+stack.o: $(hdrdir)/ruby/ruby.h
+stack.o: $(hdrdir)/ruby/st.h
+stack.o: $(hdrdir)/ruby/subst.h
+stack.o: $(top_srcdir)/internal/compilers.h
+stack.o: $(top_srcdir)/internal/string.h
+stack.o: stack.c
+# AUTOGENERATED DEPENDENCIES END
diff --git a/ext/-test-/stack/extconf.rb b/ext/-test-/stack/extconf.rb
new file mode 100644
index 00000000000000..d786b15db98c7f
--- /dev/null
+++ b/ext/-test-/stack/extconf.rb
@@ -0,0 +1,3 @@
+# frozen_string_literal: false
+require_relative "../auto_ext.rb"
+auto_ext(inc: true)
diff --git a/ext/-test-/stack/stack.c b/ext/-test-/stack/stack.c
new file mode 100644
index 00000000000000..8ff32f9737b218
--- /dev/null
+++ b/ext/-test-/stack/stack.c
@@ -0,0 +1,35 @@
+#include "ruby.h"
+#include "internal/string.h"
+
+static VALUE
+stack_alloca_overflow(VALUE self)
+{
+    size_t i = 0;
+
+    while (1) {
+        // Allocate and touch memory to force actual stack usage:
+        volatile char *stack = alloca(1024);
+        stack[0] = (char)i;
+        stack[1023] = (char)i;
+        i++;
+    }
+
+    return Qnil;
+}
+
+static VALUE
+asan_p(VALUE klass)
+{
+#if defined(__SANITIZE_ADDRESS__) || __has_feature(address_sanitizer)
+    return Qtrue;
+#else
+    return Qfalse;
+#endif
+}
+
+void
+Init_stack(VALUE klass)
+{
+    rb_define_singleton_method(rb_cThread, "alloca_overflow", stack_alloca_overflow, 0);
+    rb_define_singleton_method(rb_cThread, "asan?", asan_p, 0);
+}
diff --git a/ext/-test-/string/depend b/ext/-test-/string/depend
index 26720282b2dabf..de6e775accf395 100644
--- a/ext/-test-/string/depend
+++ b/ext/-test-/string/depend
@@ -139,6 +139,7 @@ capacity.o: $(hdrdir)/ruby/internal/intern/re.h
 capacity.o: $(hdrdir)/ruby/internal/intern/ruby.h
 capacity.o: $(hdrdir)/ruby/internal/intern/select.h
 capacity.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+capacity.o: $(hdrdir)/ruby/internal/intern/set.h
 capacity.o: $(hdrdir)/ruby/internal/intern/signal.h
 capacity.o: $(hdrdir)/ruby/internal/intern/sprintf.h
 capacity.o: $(hdrdir)/ruby/internal/intern/string.h
@@ -158,6 +159,7 @@ capacity.o: $(hdrdir)/ruby/internal/special_consts.h
 capacity.o: $(hdrdir)/ruby/internal/static_assert.h
 capacity.o: $(hdrdir)/ruby/internal/stdalign.h
 capacity.o: $(hdrdir)/ruby/internal/stdbool.h
+capacity.o: $(hdrdir)/ruby/internal/stdckdint.h
 capacity.o: $(hdrdir)/ruby/internal/symbol.h
 capacity.o: $(hdrdir)/ruby/internal/value.h
 capacity.o: $(hdrdir)/ruby/internal/value_type.h
@@ -173,6 +175,166 @@ capacity.o: $(hdrdir)/ruby/subst.h
 capacity.o: $(top_srcdir)/internal/compilers.h
 capacity.o: $(top_srcdir)/internal/string.h
 capacity.o: capacity.c
+chilled.o: $(RUBY_EXTCONF_H)
+chilled.o: $(arch_hdrdir)/ruby/config.h
+chilled.o: $(hdrdir)/ruby.h
+chilled.o: $(hdrdir)/ruby/assert.h
+chilled.o: $(hdrdir)/ruby/backward.h
+chilled.o: $(hdrdir)/ruby/backward/2/assume.h
+chilled.o: $(hdrdir)/ruby/backward/2/attributes.h
+chilled.o: $(hdrdir)/ruby/backward/2/bool.h
+chilled.o: $(hdrdir)/ruby/backward/2/inttypes.h
+chilled.o: $(hdrdir)/ruby/backward/2/limits.h
+chilled.o: $(hdrdir)/ruby/backward/2/long_long.h
+chilled.o: $(hdrdir)/ruby/backward/2/stdalign.h
+chilled.o: $(hdrdir)/ruby/backward/2/stdarg.h
+chilled.o: $(hdrdir)/ruby/defines.h
+chilled.o: $(hdrdir)/ruby/intern.h
+chilled.o: $(hdrdir)/ruby/internal/abi.h
+chilled.o: $(hdrdir)/ruby/internal/anyargs.h
+chilled.o: $(hdrdir)/ruby/internal/arithmetic.h
+chilled.o: $(hdrdir)/ruby/internal/arithmetic/char.h
+chilled.o: $(hdrdir)/ruby/internal/arithmetic/double.h
+chilled.o: $(hdrdir)/ruby/internal/arithmetic/fixnum.h
+chilled.o: $(hdrdir)/ruby/internal/arithmetic/gid_t.h
+chilled.o: $(hdrdir)/ruby/internal/arithmetic/int.h
+chilled.o: $(hdrdir)/ruby/internal/arithmetic/intptr_t.h
+chilled.o: $(hdrdir)/ruby/internal/arithmetic/long.h
+chilled.o: $(hdrdir)/ruby/internal/arithmetic/long_long.h
+chilled.o: $(hdrdir)/ruby/internal/arithmetic/mode_t.h
+chilled.o: $(hdrdir)/ruby/internal/arithmetic/off_t.h
+chilled.o: $(hdrdir)/ruby/internal/arithmetic/pid_t.h
+chilled.o: $(hdrdir)/ruby/internal/arithmetic/short.h
+chilled.o: $(hdrdir)/ruby/internal/arithmetic/size_t.h
+chilled.o: $(hdrdir)/ruby/internal/arithmetic/st_data_t.h
+chilled.o: $(hdrdir)/ruby/internal/arithmetic/uid_t.h
+chilled.o: $(hdrdir)/ruby/internal/assume.h
+chilled.o: $(hdrdir)/ruby/internal/attr/alloc_size.h
+chilled.o: $(hdrdir)/ruby/internal/attr/artificial.h
+chilled.o: $(hdrdir)/ruby/internal/attr/cold.h
+chilled.o: $(hdrdir)/ruby/internal/attr/const.h
+chilled.o: $(hdrdir)/ruby/internal/attr/constexpr.h
+chilled.o: $(hdrdir)/ruby/internal/attr/deprecated.h
+chilled.o: $(hdrdir)/ruby/internal/attr/diagnose_if.h
+chilled.o: $(hdrdir)/ruby/internal/attr/enum_extensibility.h
+chilled.o: $(hdrdir)/ruby/internal/attr/error.h
+chilled.o: $(hdrdir)/ruby/internal/attr/flag_enum.h
+chilled.o: $(hdrdir)/ruby/internal/attr/forceinline.h
+chilled.o: $(hdrdir)/ruby/internal/attr/format.h
+chilled.o: $(hdrdir)/ruby/internal/attr/maybe_unused.h
+chilled.o: $(hdrdir)/ruby/internal/attr/noalias.h
+chilled.o: $(hdrdir)/ruby/internal/attr/nodiscard.h
+chilled.o: $(hdrdir)/ruby/internal/attr/noexcept.h
+chilled.o: $(hdrdir)/ruby/internal/attr/noinline.h
+chilled.o: $(hdrdir)/ruby/internal/attr/nonnull.h
+chilled.o: $(hdrdir)/ruby/internal/attr/noreturn.h
+chilled.o: $(hdrdir)/ruby/internal/attr/packed_struct.h
+chilled.o: $(hdrdir)/ruby/internal/attr/pure.h
+chilled.o: $(hdrdir)/ruby/internal/attr/restrict.h
+chilled.o: $(hdrdir)/ruby/internal/attr/returns_nonnull.h
+chilled.o: $(hdrdir)/ruby/internal/attr/warning.h
+chilled.o: $(hdrdir)/ruby/internal/attr/weakref.h
+chilled.o: $(hdrdir)/ruby/internal/cast.h
+chilled.o: $(hdrdir)/ruby/internal/compiler_is.h
+chilled.o: $(hdrdir)/ruby/internal/compiler_is/apple.h
+chilled.o: $(hdrdir)/ruby/internal/compiler_is/clang.h
+chilled.o: $(hdrdir)/ruby/internal/compiler_is/gcc.h
+chilled.o: $(hdrdir)/ruby/internal/compiler_is/intel.h
+chilled.o: $(hdrdir)/ruby/internal/compiler_is/msvc.h
+chilled.o: $(hdrdir)/ruby/internal/compiler_is/sunpro.h
+chilled.o: $(hdrdir)/ruby/internal/compiler_since.h
+chilled.o: $(hdrdir)/ruby/internal/config.h
+chilled.o: $(hdrdir)/ruby/internal/constant_p.h
+chilled.o: $(hdrdir)/ruby/internal/core.h
+chilled.o: $(hdrdir)/ruby/internal/core/rarray.h
+chilled.o: $(hdrdir)/ruby/internal/core/rbasic.h
+chilled.o: $(hdrdir)/ruby/internal/core/rbignum.h
+chilled.o: $(hdrdir)/ruby/internal/core/rclass.h
+chilled.o: $(hdrdir)/ruby/internal/core/rdata.h
+chilled.o: $(hdrdir)/ruby/internal/core/rfile.h
+chilled.o: $(hdrdir)/ruby/internal/core/rhash.h
+chilled.o: $(hdrdir)/ruby/internal/core/robject.h
+chilled.o: $(hdrdir)/ruby/internal/core/rregexp.h
+chilled.o: $(hdrdir)/ruby/internal/core/rstring.h
+chilled.o: $(hdrdir)/ruby/internal/core/rstruct.h
+chilled.o: $(hdrdir)/ruby/internal/core/rtypeddata.h
+chilled.o: $(hdrdir)/ruby/internal/ctype.h
+chilled.o: $(hdrdir)/ruby/internal/dllexport.h
+chilled.o: $(hdrdir)/ruby/internal/dosish.h
+chilled.o: $(hdrdir)/ruby/internal/error.h
+chilled.o: $(hdrdir)/ruby/internal/eval.h
+chilled.o: $(hdrdir)/ruby/internal/event.h
+chilled.o: $(hdrdir)/ruby/internal/fl_type.h
+chilled.o: $(hdrdir)/ruby/internal/gc.h
+chilled.o: $(hdrdir)/ruby/internal/glob.h
+chilled.o: $(hdrdir)/ruby/internal/globals.h
+chilled.o: $(hdrdir)/ruby/internal/has/attribute.h
+chilled.o: $(hdrdir)/ruby/internal/has/builtin.h
+chilled.o: $(hdrdir)/ruby/internal/has/c_attribute.h
+chilled.o: $(hdrdir)/ruby/internal/has/cpp_attribute.h
+chilled.o: $(hdrdir)/ruby/internal/has/declspec_attribute.h
+chilled.o: $(hdrdir)/ruby/internal/has/extension.h
+chilled.o: $(hdrdir)/ruby/internal/has/feature.h
+chilled.o: $(hdrdir)/ruby/internal/has/warning.h
+chilled.o: $(hdrdir)/ruby/internal/intern/array.h
+chilled.o: $(hdrdir)/ruby/internal/intern/bignum.h
+chilled.o: $(hdrdir)/ruby/internal/intern/class.h
+chilled.o: $(hdrdir)/ruby/internal/intern/compar.h
+chilled.o: $(hdrdir)/ruby/internal/intern/complex.h
+chilled.o: $(hdrdir)/ruby/internal/intern/cont.h
+chilled.o: $(hdrdir)/ruby/internal/intern/dir.h
+chilled.o: $(hdrdir)/ruby/internal/intern/enum.h
+chilled.o: $(hdrdir)/ruby/internal/intern/enumerator.h
+chilled.o: $(hdrdir)/ruby/internal/intern/error.h
+chilled.o: $(hdrdir)/ruby/internal/intern/eval.h
+chilled.o: $(hdrdir)/ruby/internal/intern/file.h
+chilled.o: $(hdrdir)/ruby/internal/intern/hash.h
+chilled.o: $(hdrdir)/ruby/internal/intern/io.h
+chilled.o: $(hdrdir)/ruby/internal/intern/load.h
+chilled.o: $(hdrdir)/ruby/internal/intern/marshal.h
+chilled.o: $(hdrdir)/ruby/internal/intern/numeric.h
+chilled.o: $(hdrdir)/ruby/internal/intern/object.h
+chilled.o: $(hdrdir)/ruby/internal/intern/parse.h
+chilled.o: $(hdrdir)/ruby/internal/intern/proc.h
+chilled.o: $(hdrdir)/ruby/internal/intern/process.h
+chilled.o: $(hdrdir)/ruby/internal/intern/random.h
+chilled.o: $(hdrdir)/ruby/internal/intern/range.h
+chilled.o: $(hdrdir)/ruby/internal/intern/rational.h
+chilled.o: $(hdrdir)/ruby/internal/intern/re.h
+chilled.o: $(hdrdir)/ruby/internal/intern/ruby.h
+chilled.o: $(hdrdir)/ruby/internal/intern/select.h
+chilled.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+chilled.o: $(hdrdir)/ruby/internal/intern/signal.h
+chilled.o: $(hdrdir)/ruby/internal/intern/sprintf.h
+chilled.o: $(hdrdir)/ruby/internal/intern/string.h
+chilled.o: $(hdrdir)/ruby/internal/intern/struct.h
+chilled.o: $(hdrdir)/ruby/internal/intern/thread.h
+chilled.o: $(hdrdir)/ruby/internal/intern/time.h
+chilled.o: $(hdrdir)/ruby/internal/intern/variable.h
+chilled.o: $(hdrdir)/ruby/internal/intern/vm.h
+chilled.o: $(hdrdir)/ruby/internal/interpreter.h
+chilled.o: $(hdrdir)/ruby/internal/iterator.h
+chilled.o: $(hdrdir)/ruby/internal/memory.h
+chilled.o: $(hdrdir)/ruby/internal/method.h
+chilled.o: $(hdrdir)/ruby/internal/module.h
+chilled.o: $(hdrdir)/ruby/internal/newobj.h
+chilled.o: $(hdrdir)/ruby/internal/scan_args.h
+chilled.o: $(hdrdir)/ruby/internal/special_consts.h
+chilled.o: $(hdrdir)/ruby/internal/static_assert.h
+chilled.o: $(hdrdir)/ruby/internal/stdalign.h
+chilled.o: $(hdrdir)/ruby/internal/stdbool.h
+chilled.o: $(hdrdir)/ruby/internal/stdckdint.h
+chilled.o: $(hdrdir)/ruby/internal/symbol.h
+chilled.o: $(hdrdir)/ruby/internal/value.h
+chilled.o: $(hdrdir)/ruby/internal/value_type.h
+chilled.o: $(hdrdir)/ruby/internal/variable.h
+chilled.o: $(hdrdir)/ruby/internal/warning_push.h
+chilled.o: $(hdrdir)/ruby/internal/xmalloc.h
+chilled.o: $(hdrdir)/ruby/missing.h
+chilled.o: $(hdrdir)/ruby/ruby.h
+chilled.o: $(hdrdir)/ruby/st.h
+chilled.o: $(hdrdir)/ruby/subst.h
+chilled.o: chilled.c
 coderange.o: $(RUBY_EXTCONF_H)
 coderange.o: $(arch_hdrdir)/ruby/config.h
 coderange.o: $(hdrdir)/ruby/assert.h
@@ -311,6 +473,7 @@ coderange.o: $(hdrdir)/ruby/internal/intern/re.h
 coderange.o: $(hdrdir)/ruby/internal/intern/ruby.h
 coderange.o: $(hdrdir)/ruby/internal/intern/select.h
 coderange.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+coderange.o: $(hdrdir)/ruby/internal/intern/set.h
 coderange.o: $(hdrdir)/ruby/internal/intern/signal.h
 coderange.o: $(hdrdir)/ruby/internal/intern/sprintf.h
 coderange.o: $(hdrdir)/ruby/internal/intern/string.h
@@ -330,6 +493,7 @@ coderange.o: $(hdrdir)/ruby/internal/special_consts.h
 coderange.o: $(hdrdir)/ruby/internal/static_assert.h
 coderange.o: $(hdrdir)/ruby/internal/stdalign.h
 coderange.o: $(hdrdir)/ruby/internal/stdbool.h
+coderange.o: $(hdrdir)/ruby/internal/stdckdint.h
 coderange.o: $(hdrdir)/ruby/internal/symbol.h
 coderange.o: $(hdrdir)/ruby/internal/value.h
 coderange.o: $(hdrdir)/ruby/internal/value_type.h
@@ -482,6 +646,7 @@ cstr.o: $(hdrdir)/ruby/internal/intern/re.h
 cstr.o: $(hdrdir)/ruby/internal/intern/ruby.h
 cstr.o: $(hdrdir)/ruby/internal/intern/select.h
 cstr.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+cstr.o: $(hdrdir)/ruby/internal/intern/set.h
 cstr.o: $(hdrdir)/ruby/internal/intern/signal.h
 cstr.o: $(hdrdir)/ruby/internal/intern/sprintf.h
 cstr.o: $(hdrdir)/ruby/internal/intern/string.h
@@ -501,6 +666,7 @@ cstr.o: $(hdrdir)/ruby/internal/special_consts.h
 cstr.o: $(hdrdir)/ruby/internal/static_assert.h
 cstr.o: $(hdrdir)/ruby/internal/stdalign.h
 cstr.o: $(hdrdir)/ruby/internal/stdbool.h
+cstr.o: $(hdrdir)/ruby/internal/stdckdint.h
 cstr.o: $(hdrdir)/ruby/internal/symbol.h
 cstr.o: $(hdrdir)/ruby/internal/value.h
 cstr.o: $(hdrdir)/ruby/internal/value_type.h
@@ -646,6 +812,7 @@ ellipsize.o: $(hdrdir)/ruby/internal/intern/re.h
 ellipsize.o: $(hdrdir)/ruby/internal/intern/ruby.h
 ellipsize.o: $(hdrdir)/ruby/internal/intern/select.h
 ellipsize.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+ellipsize.o: $(hdrdir)/ruby/internal/intern/set.h
 ellipsize.o: $(hdrdir)/ruby/internal/intern/signal.h
 ellipsize.o: $(hdrdir)/ruby/internal/intern/sprintf.h
 ellipsize.o: $(hdrdir)/ruby/internal/intern/string.h
@@ -665,6 +832,7 @@ ellipsize.o: $(hdrdir)/ruby/internal/special_consts.h
 ellipsize.o: $(hdrdir)/ruby/internal/static_assert.h
 ellipsize.o: $(hdrdir)/ruby/internal/stdalign.h
 ellipsize.o: $(hdrdir)/ruby/internal/stdbool.h
+ellipsize.o: $(hdrdir)/ruby/internal/stdckdint.h
 ellipsize.o: $(hdrdir)/ruby/internal/symbol.h
 ellipsize.o: $(hdrdir)/ruby/internal/value.h
 ellipsize.o: $(hdrdir)/ruby/internal/value_type.h
@@ -815,6 +983,7 @@ enc_associate.o: $(hdrdir)/ruby/internal/intern/re.h
 enc_associate.o: $(hdrdir)/ruby/internal/intern/ruby.h
 enc_associate.o: $(hdrdir)/ruby/internal/intern/select.h
 enc_associate.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+enc_associate.o: $(hdrdir)/ruby/internal/intern/set.h
 enc_associate.o: $(hdrdir)/ruby/internal/intern/signal.h
 enc_associate.o: $(hdrdir)/ruby/internal/intern/sprintf.h
 enc_associate.o: $(hdrdir)/ruby/internal/intern/string.h
@@ -834,6 +1003,7 @@ enc_associate.o: $(hdrdir)/ruby/internal/special_consts.h
 enc_associate.o: $(hdrdir)/ruby/internal/static_assert.h
 enc_associate.o: $(hdrdir)/ruby/internal/stdalign.h
 enc_associate.o: $(hdrdir)/ruby/internal/stdbool.h
+enc_associate.o: $(hdrdir)/ruby/internal/stdckdint.h
 enc_associate.o: $(hdrdir)/ruby/internal/symbol.h
 enc_associate.o: $(hdrdir)/ruby/internal/value.h
 enc_associate.o: $(hdrdir)/ruby/internal/value_type.h
@@ -986,6 +1156,7 @@ enc_dummy.o: $(hdrdir)/ruby/internal/intern/re.h
 enc_dummy.o: $(hdrdir)/ruby/internal/intern/ruby.h
 enc_dummy.o: $(hdrdir)/ruby/internal/intern/select.h
 enc_dummy.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+enc_dummy.o: $(hdrdir)/ruby/internal/intern/set.h
 enc_dummy.o: $(hdrdir)/ruby/internal/intern/signal.h
 enc_dummy.o: $(hdrdir)/ruby/internal/intern/sprintf.h
 enc_dummy.o: $(hdrdir)/ruby/internal/intern/string.h
@@ -1005,6 +1176,7 @@ enc_dummy.o: $(hdrdir)/ruby/internal/special_consts.h
 enc_dummy.o: $(hdrdir)/ruby/internal/static_assert.h
 enc_dummy.o: $(hdrdir)/ruby/internal/stdalign.h
 enc_dummy.o: $(hdrdir)/ruby/internal/stdbool.h
+enc_dummy.o: $(hdrdir)/ruby/internal/stdckdint.h
 enc_dummy.o: $(hdrdir)/ruby/internal/symbol.h
 enc_dummy.o: $(hdrdir)/ruby/internal/value.h
 enc_dummy.o: $(hdrdir)/ruby/internal/value_type.h
@@ -1156,6 +1328,7 @@ enc_str_buf_cat.o: $(hdrdir)/ruby/internal/intern/re.h
 enc_str_buf_cat.o: $(hdrdir)/ruby/internal/intern/ruby.h
 enc_str_buf_cat.o: $(hdrdir)/ruby/internal/intern/select.h
 enc_str_buf_cat.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+enc_str_buf_cat.o: $(hdrdir)/ruby/internal/intern/set.h
 enc_str_buf_cat.o: $(hdrdir)/ruby/internal/intern/signal.h
 enc_str_buf_cat.o: $(hdrdir)/ruby/internal/intern/sprintf.h
 enc_str_buf_cat.o: $(hdrdir)/ruby/internal/intern/string.h
@@ -1175,6 +1348,7 @@ enc_str_buf_cat.o: $(hdrdir)/ruby/internal/special_consts.h
 enc_str_buf_cat.o: $(hdrdir)/ruby/internal/static_assert.h
 enc_str_buf_cat.o: $(hdrdir)/ruby/internal/stdalign.h
 enc_str_buf_cat.o: $(hdrdir)/ruby/internal/stdbool.h
+enc_str_buf_cat.o: $(hdrdir)/ruby/internal/stdckdint.h
 enc_str_buf_cat.o: $(hdrdir)/ruby/internal/symbol.h
 enc_str_buf_cat.o: $(hdrdir)/ruby/internal/value.h
 enc_str_buf_cat.o: $(hdrdir)/ruby/internal/value_type.h
@@ -1196,6 +1370,7 @@ fstring.o: $(hdrdir)/ruby/backward.h
 fstring.o: $(hdrdir)/ruby/backward/2/assume.h
 fstring.o: $(hdrdir)/ruby/backward/2/attributes.h
 fstring.o: $(hdrdir)/ruby/backward/2/bool.h
+fstring.o: $(hdrdir)/ruby/backward/2/gcc_version_since.h
 fstring.o: $(hdrdir)/ruby/backward/2/inttypes.h
 fstring.o: $(hdrdir)/ruby/backward/2/limits.h
 fstring.o: $(hdrdir)/ruby/backward/2/long_long.h
@@ -1327,6 +1502,7 @@ fstring.o: $(hdrdir)/ruby/internal/intern/re.h
 fstring.o: $(hdrdir)/ruby/internal/intern/ruby.h
 fstring.o: $(hdrdir)/ruby/internal/intern/select.h
 fstring.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+fstring.o: $(hdrdir)/ruby/internal/intern/set.h
 fstring.o: $(hdrdir)/ruby/internal/intern/signal.h
 fstring.o: $(hdrdir)/ruby/internal/intern/sprintf.h
 fstring.o: $(hdrdir)/ruby/internal/intern/string.h
@@ -1346,6 +1522,7 @@ fstring.o: $(hdrdir)/ruby/internal/special_consts.h
 fstring.o: $(hdrdir)/ruby/internal/static_assert.h
 fstring.o: $(hdrdir)/ruby/internal/stdalign.h
 fstring.o: $(hdrdir)/ruby/internal/stdbool.h
+fstring.o: $(hdrdir)/ruby/internal/stdckdint.h
 fstring.o: $(hdrdir)/ruby/internal/symbol.h
 fstring.o: $(hdrdir)/ruby/internal/value.h
 fstring.o: $(hdrdir)/ruby/internal/value_type.h
@@ -1358,6 +1535,8 @@ fstring.o: $(hdrdir)/ruby/oniguruma.h
 fstring.o: $(hdrdir)/ruby/ruby.h
 fstring.o: $(hdrdir)/ruby/st.h
 fstring.o: $(hdrdir)/ruby/subst.h
+fstring.o: $(top_srcdir)/internal/compilers.h
+fstring.o: $(top_srcdir)/internal/string.h
 fstring.o: fstring.c
 init.o: $(RUBY_EXTCONF_H)
 init.o: $(arch_hdrdir)/ruby/config.h
@@ -1488,6 +1667,7 @@ init.o: $(hdrdir)/ruby/internal/intern/re.h
 init.o: $(hdrdir)/ruby/internal/intern/ruby.h
 init.o: $(hdrdir)/ruby/internal/intern/select.h
 init.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+init.o: $(hdrdir)/ruby/internal/intern/set.h
 init.o: $(hdrdir)/ruby/internal/intern/signal.h
 init.o: $(hdrdir)/ruby/internal/intern/sprintf.h
 init.o: $(hdrdir)/ruby/internal/intern/string.h
@@ -1507,6 +1687,7 @@ init.o: $(hdrdir)/ruby/internal/special_consts.h
 init.o: $(hdrdir)/ruby/internal/static_assert.h
 init.o: $(hdrdir)/ruby/internal/stdalign.h
 init.o: $(hdrdir)/ruby/internal/stdbool.h
+init.o: $(hdrdir)/ruby/internal/stdckdint.h
 init.o: $(hdrdir)/ruby/internal/symbol.h
 init.o: $(hdrdir)/ruby/internal/value.h
 init.o: $(hdrdir)/ruby/internal/value_type.h
@@ -1647,6 +1828,7 @@ modify.o: $(hdrdir)/ruby/internal/intern/re.h
 modify.o: $(hdrdir)/ruby/internal/intern/ruby.h
 modify.o: $(hdrdir)/ruby/internal/intern/select.h
 modify.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+modify.o: $(hdrdir)/ruby/internal/intern/set.h
 modify.o: $(hdrdir)/ruby/internal/intern/signal.h
 modify.o: $(hdrdir)/ruby/internal/intern/sprintf.h
 modify.o: $(hdrdir)/ruby/internal/intern/string.h
@@ -1666,6 +1848,7 @@ modify.o: $(hdrdir)/ruby/internal/special_consts.h
 modify.o: $(hdrdir)/ruby/internal/static_assert.h
 modify.o: $(hdrdir)/ruby/internal/stdalign.h
 modify.o: $(hdrdir)/ruby/internal/stdbool.h
+modify.o: $(hdrdir)/ruby/internal/stdckdint.h
 modify.o: $(hdrdir)/ruby/internal/symbol.h
 modify.o: $(hdrdir)/ruby/internal/value.h
 modify.o: $(hdrdir)/ruby/internal/value_type.h
@@ -1816,6 +1999,7 @@ new.o: $(hdrdir)/ruby/internal/intern/re.h
 new.o: $(hdrdir)/ruby/internal/intern/ruby.h
 new.o: $(hdrdir)/ruby/internal/intern/select.h
 new.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+new.o: $(hdrdir)/ruby/internal/intern/set.h
 new.o: $(hdrdir)/ruby/internal/intern/signal.h
 new.o: $(hdrdir)/ruby/internal/intern/sprintf.h
 new.o: $(hdrdir)/ruby/internal/intern/string.h
@@ -1835,6 +2019,7 @@ new.o: $(hdrdir)/ruby/internal/special_consts.h
 new.o: $(hdrdir)/ruby/internal/static_assert.h
 new.o: $(hdrdir)/ruby/internal/stdalign.h
 new.o: $(hdrdir)/ruby/internal/stdbool.h
+new.o: $(hdrdir)/ruby/internal/stdckdint.h
 new.o: $(hdrdir)/ruby/internal/symbol.h
 new.o: $(hdrdir)/ruby/internal/value.h
 new.o: $(hdrdir)/ruby/internal/value_type.h
@@ -1977,6 +2162,7 @@ nofree.o: $(hdrdir)/ruby/internal/intern/re.h
 nofree.o: $(hdrdir)/ruby/internal/intern/ruby.h
 nofree.o: $(hdrdir)/ruby/internal/intern/select.h
 nofree.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+nofree.o: $(hdrdir)/ruby/internal/intern/set.h
 nofree.o: $(hdrdir)/ruby/internal/intern/signal.h
 nofree.o: $(hdrdir)/ruby/internal/intern/sprintf.h
 nofree.o: $(hdrdir)/ruby/internal/intern/string.h
@@ -1996,6 +2182,7 @@ nofree.o: $(hdrdir)/ruby/internal/special_consts.h
 nofree.o: $(hdrdir)/ruby/internal/static_assert.h
 nofree.o: $(hdrdir)/ruby/internal/stdalign.h
 nofree.o: $(hdrdir)/ruby/internal/stdbool.h
+nofree.o: $(hdrdir)/ruby/internal/stdckdint.h
 nofree.o: $(hdrdir)/ruby/internal/symbol.h
 nofree.o: $(hdrdir)/ruby/internal/value.h
 nofree.o: $(hdrdir)/ruby/internal/value_type.h
@@ -2145,6 +2332,7 @@ normalize.o: $(hdrdir)/ruby/internal/intern/re.h
 normalize.o: $(hdrdir)/ruby/internal/intern/ruby.h
 normalize.o: $(hdrdir)/ruby/internal/intern/select.h
 normalize.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+normalize.o: $(hdrdir)/ruby/internal/intern/set.h
 normalize.o: $(hdrdir)/ruby/internal/intern/signal.h
 normalize.o: $(hdrdir)/ruby/internal/intern/sprintf.h
 normalize.o: $(hdrdir)/ruby/internal/intern/string.h
@@ -2164,6 +2352,7 @@ normalize.o: $(hdrdir)/ruby/internal/special_consts.h
 normalize.o: $(hdrdir)/ruby/internal/static_assert.h
 normalize.o: $(hdrdir)/ruby/internal/stdalign.h
 normalize.o: $(hdrdir)/ruby/internal/stdbool.h
+normalize.o: $(hdrdir)/ruby/internal/stdckdint.h
 normalize.o: $(hdrdir)/ruby/internal/symbol.h
 normalize.o: $(hdrdir)/ruby/internal/value.h
 normalize.o: $(hdrdir)/ruby/internal/value_type.h
@@ -2317,6 +2506,7 @@ qsort.o: $(hdrdir)/ruby/internal/intern/re.h
 qsort.o: $(hdrdir)/ruby/internal/intern/ruby.h
 qsort.o: $(hdrdir)/ruby/internal/intern/select.h
 qsort.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+qsort.o: $(hdrdir)/ruby/internal/intern/set.h
 qsort.o: $(hdrdir)/ruby/internal/intern/signal.h
 qsort.o: $(hdrdir)/ruby/internal/intern/sprintf.h
 qsort.o: $(hdrdir)/ruby/internal/intern/string.h
@@ -2336,6 +2526,7 @@ qsort.o: $(hdrdir)/ruby/internal/special_consts.h
 qsort.o: $(hdrdir)/ruby/internal/static_assert.h
 qsort.o: $(hdrdir)/ruby/internal/stdalign.h
 qsort.o: $(hdrdir)/ruby/internal/stdbool.h
+qsort.o: $(hdrdir)/ruby/internal/stdckdint.h
 qsort.o: $(hdrdir)/ruby/internal/symbol.h
 qsort.o: $(hdrdir)/ruby/internal/value.h
 qsort.o: $(hdrdir)/ruby/internal/value_type.h
@@ -2479,6 +2670,7 @@ rb_interned_str.o: $(hdrdir)/ruby/internal/intern/re.h
 rb_interned_str.o: $(hdrdir)/ruby/internal/intern/ruby.h
 rb_interned_str.o: $(hdrdir)/ruby/internal/intern/select.h
 rb_interned_str.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+rb_interned_str.o: $(hdrdir)/ruby/internal/intern/set.h
 rb_interned_str.o: $(hdrdir)/ruby/internal/intern/signal.h
 rb_interned_str.o: $(hdrdir)/ruby/internal/intern/sprintf.h
 rb_interned_str.o: $(hdrdir)/ruby/internal/intern/string.h
@@ -2498,6 +2690,7 @@ rb_interned_str.o: $(hdrdir)/ruby/internal/special_consts.h
 rb_interned_str.o: $(hdrdir)/ruby/internal/static_assert.h
 rb_interned_str.o: $(hdrdir)/ruby/internal/stdalign.h
 rb_interned_str.o: $(hdrdir)/ruby/internal/stdbool.h
+rb_interned_str.o: $(hdrdir)/ruby/internal/stdckdint.h
 rb_interned_str.o: $(hdrdir)/ruby/internal/symbol.h
 rb_interned_str.o: $(hdrdir)/ruby/internal/value.h
 rb_interned_str.o: $(hdrdir)/ruby/internal/value_type.h
@@ -2638,6 +2831,7 @@ rb_str_dup.o: $(hdrdir)/ruby/internal/intern/re.h
 rb_str_dup.o: $(hdrdir)/ruby/internal/intern/ruby.h
 rb_str_dup.o: $(hdrdir)/ruby/internal/intern/select.h
 rb_str_dup.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+rb_str_dup.o: $(hdrdir)/ruby/internal/intern/set.h
 rb_str_dup.o: $(hdrdir)/ruby/internal/intern/signal.h
 rb_str_dup.o: $(hdrdir)/ruby/internal/intern/sprintf.h
 rb_str_dup.o: $(hdrdir)/ruby/internal/intern/string.h
@@ -2657,6 +2851,7 @@ rb_str_dup.o: $(hdrdir)/ruby/internal/special_consts.h
 rb_str_dup.o: $(hdrdir)/ruby/internal/static_assert.h
 rb_str_dup.o: $(hdrdir)/ruby/internal/stdalign.h
 rb_str_dup.o: $(hdrdir)/ruby/internal/stdbool.h
+rb_str_dup.o: $(hdrdir)/ruby/internal/stdckdint.h
 rb_str_dup.o: $(hdrdir)/ruby/internal/symbol.h
 rb_str_dup.o: $(hdrdir)/ruby/internal/value.h
 rb_str_dup.o: $(hdrdir)/ruby/internal/value_type.h
@@ -2797,6 +2992,7 @@ set_len.o: $(hdrdir)/ruby/internal/intern/re.h
 set_len.o: $(hdrdir)/ruby/internal/intern/ruby.h
 set_len.o: $(hdrdir)/ruby/internal/intern/select.h
 set_len.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+set_len.o: $(hdrdir)/ruby/internal/intern/set.h
 set_len.o: $(hdrdir)/ruby/internal/intern/signal.h
 set_len.o: $(hdrdir)/ruby/internal/intern/sprintf.h
 set_len.o: $(hdrdir)/ruby/internal/intern/string.h
@@ -2816,6 +3012,7 @@ set_len.o: $(hdrdir)/ruby/internal/special_consts.h
 set_len.o: $(hdrdir)/ruby/internal/static_assert.h
 set_len.o: $(hdrdir)/ruby/internal/stdalign.h
 set_len.o: $(hdrdir)/ruby/internal/stdbool.h
+set_len.o: $(hdrdir)/ruby/internal/stdckdint.h
 set_len.o: $(hdrdir)/ruby/internal/symbol.h
 set_len.o: $(hdrdir)/ruby/internal/value.h
 set_len.o: $(hdrdir)/ruby/internal/value_type.h
diff --git a/ext/-test-/string/fstring.c b/ext/-test-/string/fstring.c
index 2374319fe340b0..71c4b7f97eee44 100644
--- a/ext/-test-/string/fstring.c
+++ b/ext/-test-/string/fstring.c
@@ -1,30 +1,38 @@
 #include "ruby.h"
 #include "ruby/encoding.h"
-
-VALUE rb_fstring(VALUE str);
+#include "internal/string.h"
 
 VALUE
 bug_s_fstring(VALUE self, VALUE str)
 {
-    return rb_fstring(str);
+    return rb_str_to_interned_str(str);
+}
+
+VALUE
+bug_s_fstring_fake_str(VALUE self)
+{
+    static const char literal[] = "abcdefghijklmnopqrstuvwxyz";
+    struct RString fake_str;
+    return rb_str_to_interned_str(rb_setup_fake_str(&fake_str, literal, sizeof(literal) - 1, 0));
 }
 
 VALUE
 bug_s_rb_enc_interned_str(VALUE self, VALUE encoding)
 {
-    return rb_enc_interned_str("foo", 3, RDATA(encoding)->data);
+    return rb_enc_interned_str("foo", 3, NIL_P(encoding) ? NULL : RDATA(encoding)->data);
 }
 
 VALUE
 bug_s_rb_enc_str_new(VALUE self, VALUE encoding)
 {
-    return rb_enc_str_new("foo", 3, RDATA(encoding)->data);
+    return rb_enc_str_new("foo", 3, NIL_P(encoding) ? NULL : RDATA(encoding)->data);
 }
 
 void
 Init_string_fstring(VALUE klass)
 {
     rb_define_singleton_method(klass, "fstring", bug_s_fstring, 1);
+    rb_define_singleton_method(klass, "fstring_fake_str", bug_s_fstring_fake_str, 0);
     rb_define_singleton_method(klass, "rb_enc_interned_str", bug_s_rb_enc_interned_str, 1);
     rb_define_singleton_method(klass, "rb_enc_str_new", bug_s_rb_enc_str_new, 1);
 }
diff --git a/ext/-test-/string/set_len.c b/ext/-test-/string/set_len.c
index 219cea404cffe5..b55ef6f4691b89 100644
--- a/ext/-test-/string/set_len.c
+++ b/ext/-test-/string/set_len.c
@@ -7,8 +7,26 @@ bug_str_set_len(VALUE str, VALUE len)
     return str;
 }
 
+static VALUE
+bug_str_append(VALUE str, VALUE addendum)
+{
+    StringValue(addendum);
+    rb_str_modify_expand(str, RSTRING_LEN(addendum));
+    memcpy(RSTRING_END(str), RSTRING_PTR(addendum), RSTRING_LEN(addendum));
+    return str;
+}
+
+static VALUE
+bug_str_resize(VALUE str, VALUE len)
+{
+    rb_str_resize(str, NUM2LONG(len));
+    return str;
+}
+
 void
 Init_string_set_len(VALUE klass)
 {
     rb_define_method(klass, "set_len", bug_str_set_len, 1);
+    rb_define_method(klass, "append", bug_str_append, 1);
+    rb_define_method(klass, "resize", bug_str_resize, 1);
 }
diff --git a/ext/-test-/struct/depend b/ext/-test-/struct/depend
index 5db943e28637f1..e2638e4cdf5115 100644
--- a/ext/-test-/struct/depend
+++ b/ext/-test-/struct/depend
@@ -128,6 +128,7 @@ data.o: $(hdrdir)/ruby/internal/intern/re.h
 data.o: $(hdrdir)/ruby/internal/intern/ruby.h
 data.o: $(hdrdir)/ruby/internal/intern/select.h
 data.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+data.o: $(hdrdir)/ruby/internal/intern/set.h
 data.o: $(hdrdir)/ruby/internal/intern/signal.h
 data.o: $(hdrdir)/ruby/internal/intern/sprintf.h
 data.o: $(hdrdir)/ruby/internal/intern/string.h
@@ -147,6 +148,7 @@ data.o: $(hdrdir)/ruby/internal/special_consts.h
 data.o: $(hdrdir)/ruby/internal/static_assert.h
 data.o: $(hdrdir)/ruby/internal/stdalign.h
 data.o: $(hdrdir)/ruby/internal/stdbool.h
+data.o: $(hdrdir)/ruby/internal/stdckdint.h
 data.o: $(hdrdir)/ruby/internal/symbol.h
 data.o: $(hdrdir)/ruby/internal/value.h
 data.o: $(hdrdir)/ruby/internal/value_type.h
@@ -287,6 +289,7 @@ duplicate.o: $(hdrdir)/ruby/internal/intern/re.h
 duplicate.o: $(hdrdir)/ruby/internal/intern/ruby.h
 duplicate.o: $(hdrdir)/ruby/internal/intern/select.h
 duplicate.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+duplicate.o: $(hdrdir)/ruby/internal/intern/set.h
 duplicate.o: $(hdrdir)/ruby/internal/intern/signal.h
 duplicate.o: $(hdrdir)/ruby/internal/intern/sprintf.h
 duplicate.o: $(hdrdir)/ruby/internal/intern/string.h
@@ -306,6 +309,7 @@ duplicate.o: $(hdrdir)/ruby/internal/special_consts.h
 duplicate.o: $(hdrdir)/ruby/internal/static_assert.h
 duplicate.o: $(hdrdir)/ruby/internal/stdalign.h
 duplicate.o: $(hdrdir)/ruby/internal/stdbool.h
+duplicate.o: $(hdrdir)/ruby/internal/stdckdint.h
 duplicate.o: $(hdrdir)/ruby/internal/symbol.h
 duplicate.o: $(hdrdir)/ruby/internal/value.h
 duplicate.o: $(hdrdir)/ruby/internal/value_type.h
@@ -446,6 +450,7 @@ init.o: $(hdrdir)/ruby/internal/intern/re.h
 init.o: $(hdrdir)/ruby/internal/intern/ruby.h
 init.o: $(hdrdir)/ruby/internal/intern/select.h
 init.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+init.o: $(hdrdir)/ruby/internal/intern/set.h
 init.o: $(hdrdir)/ruby/internal/intern/signal.h
 init.o: $(hdrdir)/ruby/internal/intern/sprintf.h
 init.o: $(hdrdir)/ruby/internal/intern/string.h
@@ -465,6 +470,7 @@ init.o: $(hdrdir)/ruby/internal/special_consts.h
 init.o: $(hdrdir)/ruby/internal/static_assert.h
 init.o: $(hdrdir)/ruby/internal/stdalign.h
 init.o: $(hdrdir)/ruby/internal/stdbool.h
+init.o: $(hdrdir)/ruby/internal/stdckdint.h
 init.o: $(hdrdir)/ruby/internal/symbol.h
 init.o: $(hdrdir)/ruby/internal/value.h
 init.o: $(hdrdir)/ruby/internal/value_type.h
@@ -605,6 +611,7 @@ len.o: $(hdrdir)/ruby/internal/intern/re.h
 len.o: $(hdrdir)/ruby/internal/intern/ruby.h
 len.o: $(hdrdir)/ruby/internal/intern/select.h
 len.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+len.o: $(hdrdir)/ruby/internal/intern/set.h
 len.o: $(hdrdir)/ruby/internal/intern/signal.h
 len.o: $(hdrdir)/ruby/internal/intern/sprintf.h
 len.o: $(hdrdir)/ruby/internal/intern/string.h
@@ -624,6 +631,7 @@ len.o: $(hdrdir)/ruby/internal/special_consts.h
 len.o: $(hdrdir)/ruby/internal/static_assert.h
 len.o: $(hdrdir)/ruby/internal/stdalign.h
 len.o: $(hdrdir)/ruby/internal/stdbool.h
+len.o: $(hdrdir)/ruby/internal/stdckdint.h
 len.o: $(hdrdir)/ruby/internal/symbol.h
 len.o: $(hdrdir)/ruby/internal/value.h
 len.o: $(hdrdir)/ruby/internal/value_type.h
@@ -764,6 +772,7 @@ member.o: $(hdrdir)/ruby/internal/intern/re.h
 member.o: $(hdrdir)/ruby/internal/intern/ruby.h
 member.o: $(hdrdir)/ruby/internal/intern/select.h
 member.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+member.o: $(hdrdir)/ruby/internal/intern/set.h
 member.o: $(hdrdir)/ruby/internal/intern/signal.h
 member.o: $(hdrdir)/ruby/internal/intern/sprintf.h
 member.o: $(hdrdir)/ruby/internal/intern/string.h
@@ -783,6 +792,7 @@ member.o: $(hdrdir)/ruby/internal/special_consts.h
 member.o: $(hdrdir)/ruby/internal/static_assert.h
 member.o: $(hdrdir)/ruby/internal/stdalign.h
 member.o: $(hdrdir)/ruby/internal/stdbool.h
+member.o: $(hdrdir)/ruby/internal/stdckdint.h
 member.o: $(hdrdir)/ruby/internal/symbol.h
 member.o: $(hdrdir)/ruby/internal/value.h
 member.o: $(hdrdir)/ruby/internal/value_type.h
diff --git a/ext/-test-/struct/member.c b/ext/-test-/struct/member.c
index f5400fe477ba63..29ddff93e8e24a 100644
--- a/ext/-test-/struct/member.c
+++ b/ext/-test-/struct/member.c
@@ -6,7 +6,7 @@ bug_struct_get(VALUE obj, VALUE name)
     ID id = rb_check_id(&name);
 
     if (!id) {
-        rb_name_error_str(name, "`%"PRIsVALUE"' is not a struct member", name);
+        rb_name_error_str(name, "'%"PRIsVALUE"' is not a struct member", name);
     }
     return rb_struct_getmember(obj, id);
 }
diff --git a/ext/-test-/symbol/depend b/ext/-test-/symbol/depend
index dd1b5c305f85f5..b1d8e1aab6fd3c 100644
--- a/ext/-test-/symbol/depend
+++ b/ext/-test-/symbol/depend
@@ -128,6 +128,7 @@ init.o: $(hdrdir)/ruby/internal/intern/re.h
 init.o: $(hdrdir)/ruby/internal/intern/ruby.h
 init.o: $(hdrdir)/ruby/internal/intern/select.h
 init.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+init.o: $(hdrdir)/ruby/internal/intern/set.h
 init.o: $(hdrdir)/ruby/internal/intern/signal.h
 init.o: $(hdrdir)/ruby/internal/intern/sprintf.h
 init.o: $(hdrdir)/ruby/internal/intern/string.h
@@ -147,6 +148,7 @@ init.o: $(hdrdir)/ruby/internal/special_consts.h
 init.o: $(hdrdir)/ruby/internal/static_assert.h
 init.o: $(hdrdir)/ruby/internal/stdalign.h
 init.o: $(hdrdir)/ruby/internal/stdbool.h
+init.o: $(hdrdir)/ruby/internal/stdckdint.h
 init.o: $(hdrdir)/ruby/internal/symbol.h
 init.o: $(hdrdir)/ruby/internal/value.h
 init.o: $(hdrdir)/ruby/internal/value_type.h
@@ -287,6 +289,7 @@ type.o: $(hdrdir)/ruby/internal/intern/re.h
 type.o: $(hdrdir)/ruby/internal/intern/ruby.h
 type.o: $(hdrdir)/ruby/internal/intern/select.h
 type.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+type.o: $(hdrdir)/ruby/internal/intern/set.h
 type.o: $(hdrdir)/ruby/internal/intern/signal.h
 type.o: $(hdrdir)/ruby/internal/intern/sprintf.h
 type.o: $(hdrdir)/ruby/internal/intern/string.h
@@ -306,6 +309,7 @@ type.o: $(hdrdir)/ruby/internal/special_consts.h
 type.o: $(hdrdir)/ruby/internal/static_assert.h
 type.o: $(hdrdir)/ruby/internal/stdalign.h
 type.o: $(hdrdir)/ruby/internal/stdbool.h
+type.o: $(hdrdir)/ruby/internal/stdckdint.h
 type.o: $(hdrdir)/ruby/internal/symbol.h
 type.o: $(hdrdir)/ruby/internal/value.h
 type.o: $(hdrdir)/ruby/internal/value_type.h
diff --git a/ext/-test-/thread/id/depend b/ext/-test-/thread/id/depend
new file mode 100644
index 00000000000000..6b76b31ddcc3b7
--- /dev/null
+++ b/ext/-test-/thread/id/depend
@@ -0,0 +1,163 @@
+# AUTOGENERATED DEPENDENCIES START
+id.o: $(RUBY_EXTCONF_H)
+id.o: $(arch_hdrdir)/ruby/config.h
+id.o: $(hdrdir)/ruby.h
+id.o: $(hdrdir)/ruby/assert.h
+id.o: $(hdrdir)/ruby/backward.h
+id.o: $(hdrdir)/ruby/backward/2/assume.h
+id.o: $(hdrdir)/ruby/backward/2/attributes.h
+id.o: $(hdrdir)/ruby/backward/2/bool.h
+id.o: $(hdrdir)/ruby/backward/2/inttypes.h
+id.o: $(hdrdir)/ruby/backward/2/limits.h
+id.o: $(hdrdir)/ruby/backward/2/long_long.h
+id.o: $(hdrdir)/ruby/backward/2/stdalign.h
+id.o: $(hdrdir)/ruby/backward/2/stdarg.h
+id.o: $(hdrdir)/ruby/defines.h
+id.o: $(hdrdir)/ruby/intern.h
+id.o: $(hdrdir)/ruby/internal/abi.h
+id.o: $(hdrdir)/ruby/internal/anyargs.h
+id.o: $(hdrdir)/ruby/internal/arithmetic.h
+id.o: $(hdrdir)/ruby/internal/arithmetic/char.h
+id.o: $(hdrdir)/ruby/internal/arithmetic/double.h
+id.o: $(hdrdir)/ruby/internal/arithmetic/fixnum.h
+id.o: $(hdrdir)/ruby/internal/arithmetic/gid_t.h
+id.o: $(hdrdir)/ruby/internal/arithmetic/int.h
+id.o: $(hdrdir)/ruby/internal/arithmetic/intptr_t.h
+id.o: $(hdrdir)/ruby/internal/arithmetic/long.h
+id.o: $(hdrdir)/ruby/internal/arithmetic/long_long.h
+id.o: $(hdrdir)/ruby/internal/arithmetic/mode_t.h
+id.o: $(hdrdir)/ruby/internal/arithmetic/off_t.h
+id.o: $(hdrdir)/ruby/internal/arithmetic/pid_t.h
+id.o: $(hdrdir)/ruby/internal/arithmetic/short.h
+id.o: $(hdrdir)/ruby/internal/arithmetic/size_t.h
+id.o: $(hdrdir)/ruby/internal/arithmetic/st_data_t.h
+id.o: $(hdrdir)/ruby/internal/arithmetic/uid_t.h
+id.o: $(hdrdir)/ruby/internal/assume.h
+id.o: $(hdrdir)/ruby/internal/attr/alloc_size.h
+id.o: $(hdrdir)/ruby/internal/attr/artificial.h
+id.o: $(hdrdir)/ruby/internal/attr/cold.h
+id.o: $(hdrdir)/ruby/internal/attr/const.h
+id.o: $(hdrdir)/ruby/internal/attr/constexpr.h
+id.o: $(hdrdir)/ruby/internal/attr/deprecated.h
+id.o: $(hdrdir)/ruby/internal/attr/diagnose_if.h
+id.o: $(hdrdir)/ruby/internal/attr/enum_extensibility.h
+id.o: $(hdrdir)/ruby/internal/attr/error.h
+id.o: $(hdrdir)/ruby/internal/attr/flag_enum.h
+id.o: $(hdrdir)/ruby/internal/attr/forceinline.h
+id.o: $(hdrdir)/ruby/internal/attr/format.h
+id.o: $(hdrdir)/ruby/internal/attr/maybe_unused.h
+id.o: $(hdrdir)/ruby/internal/attr/noalias.h
+id.o: $(hdrdir)/ruby/internal/attr/nodiscard.h
+id.o: $(hdrdir)/ruby/internal/attr/noexcept.h
+id.o: $(hdrdir)/ruby/internal/attr/noinline.h
+id.o: $(hdrdir)/ruby/internal/attr/nonnull.h
+id.o: $(hdrdir)/ruby/internal/attr/noreturn.h
+id.o: $(hdrdir)/ruby/internal/attr/packed_struct.h
+id.o: $(hdrdir)/ruby/internal/attr/pure.h
+id.o: $(hdrdir)/ruby/internal/attr/restrict.h
+id.o: $(hdrdir)/ruby/internal/attr/returns_nonnull.h
+id.o: $(hdrdir)/ruby/internal/attr/warning.h
+id.o: $(hdrdir)/ruby/internal/attr/weakref.h
+id.o: $(hdrdir)/ruby/internal/cast.h
+id.o: $(hdrdir)/ruby/internal/compiler_is.h
+id.o: $(hdrdir)/ruby/internal/compiler_is/apple.h
+id.o: $(hdrdir)/ruby/internal/compiler_is/clang.h
+id.o: $(hdrdir)/ruby/internal/compiler_is/gcc.h
+id.o: $(hdrdir)/ruby/internal/compiler_is/intel.h
+id.o: $(hdrdir)/ruby/internal/compiler_is/msvc.h
+id.o: $(hdrdir)/ruby/internal/compiler_is/sunpro.h
+id.o: $(hdrdir)/ruby/internal/compiler_since.h
+id.o: $(hdrdir)/ruby/internal/config.h
+id.o: $(hdrdir)/ruby/internal/constant_p.h
+id.o: $(hdrdir)/ruby/internal/core.h
+id.o: $(hdrdir)/ruby/internal/core/rarray.h
+id.o: $(hdrdir)/ruby/internal/core/rbasic.h
+id.o: $(hdrdir)/ruby/internal/core/rbignum.h
+id.o: $(hdrdir)/ruby/internal/core/rclass.h
+id.o: $(hdrdir)/ruby/internal/core/rdata.h
+id.o: $(hdrdir)/ruby/internal/core/rfile.h
+id.o: $(hdrdir)/ruby/internal/core/rhash.h
+id.o: $(hdrdir)/ruby/internal/core/robject.h
+id.o: $(hdrdir)/ruby/internal/core/rregexp.h
+id.o: $(hdrdir)/ruby/internal/core/rstring.h
+id.o: $(hdrdir)/ruby/internal/core/rstruct.h
+id.o: $(hdrdir)/ruby/internal/core/rtypeddata.h
+id.o: $(hdrdir)/ruby/internal/ctype.h
+id.o: $(hdrdir)/ruby/internal/dllexport.h
+id.o: $(hdrdir)/ruby/internal/dosish.h
+id.o: $(hdrdir)/ruby/internal/error.h
+id.o: $(hdrdir)/ruby/internal/eval.h
+id.o: $(hdrdir)/ruby/internal/event.h
+id.o: $(hdrdir)/ruby/internal/fl_type.h
+id.o: $(hdrdir)/ruby/internal/gc.h
+id.o: $(hdrdir)/ruby/internal/glob.h
+id.o: $(hdrdir)/ruby/internal/globals.h
+id.o: $(hdrdir)/ruby/internal/has/attribute.h
+id.o: $(hdrdir)/ruby/internal/has/builtin.h
+id.o: $(hdrdir)/ruby/internal/has/c_attribute.h
+id.o: $(hdrdir)/ruby/internal/has/cpp_attribute.h
+id.o: $(hdrdir)/ruby/internal/has/declspec_attribute.h
+id.o: $(hdrdir)/ruby/internal/has/extension.h
+id.o: $(hdrdir)/ruby/internal/has/feature.h
+id.o: $(hdrdir)/ruby/internal/has/warning.h
+id.o: $(hdrdir)/ruby/internal/intern/array.h
+id.o: $(hdrdir)/ruby/internal/intern/bignum.h
+id.o: $(hdrdir)/ruby/internal/intern/class.h
+id.o: $(hdrdir)/ruby/internal/intern/compar.h
+id.o: $(hdrdir)/ruby/internal/intern/complex.h
+id.o: $(hdrdir)/ruby/internal/intern/cont.h
+id.o: $(hdrdir)/ruby/internal/intern/dir.h
+id.o: $(hdrdir)/ruby/internal/intern/enum.h
+id.o: $(hdrdir)/ruby/internal/intern/enumerator.h
+id.o: $(hdrdir)/ruby/internal/intern/error.h
+id.o: $(hdrdir)/ruby/internal/intern/eval.h
+id.o: $(hdrdir)/ruby/internal/intern/file.h
+id.o: $(hdrdir)/ruby/internal/intern/hash.h
+id.o: $(hdrdir)/ruby/internal/intern/io.h
+id.o: $(hdrdir)/ruby/internal/intern/load.h
+id.o: $(hdrdir)/ruby/internal/intern/marshal.h
+id.o: $(hdrdir)/ruby/internal/intern/numeric.h
+id.o: $(hdrdir)/ruby/internal/intern/object.h
+id.o: $(hdrdir)/ruby/internal/intern/parse.h
+id.o: $(hdrdir)/ruby/internal/intern/proc.h
+id.o: $(hdrdir)/ruby/internal/intern/process.h
+id.o: $(hdrdir)/ruby/internal/intern/random.h
+id.o: $(hdrdir)/ruby/internal/intern/range.h
+id.o: $(hdrdir)/ruby/internal/intern/rational.h
+id.o: $(hdrdir)/ruby/internal/intern/re.h
+id.o: $(hdrdir)/ruby/internal/intern/ruby.h
+id.o: $(hdrdir)/ruby/internal/intern/select.h
+id.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+id.o: $(hdrdir)/ruby/internal/intern/set.h
+id.o: $(hdrdir)/ruby/internal/intern/signal.h
+id.o: $(hdrdir)/ruby/internal/intern/sprintf.h
+id.o: $(hdrdir)/ruby/internal/intern/string.h
+id.o: $(hdrdir)/ruby/internal/intern/struct.h
+id.o: $(hdrdir)/ruby/internal/intern/thread.h
+id.o: $(hdrdir)/ruby/internal/intern/time.h
+id.o: $(hdrdir)/ruby/internal/intern/variable.h
+id.o: $(hdrdir)/ruby/internal/intern/vm.h
+id.o: $(hdrdir)/ruby/internal/interpreter.h
+id.o: $(hdrdir)/ruby/internal/iterator.h
+id.o: $(hdrdir)/ruby/internal/memory.h
+id.o: $(hdrdir)/ruby/internal/method.h
+id.o: $(hdrdir)/ruby/internal/module.h
+id.o: $(hdrdir)/ruby/internal/newobj.h
+id.o: $(hdrdir)/ruby/internal/scan_args.h
+id.o: $(hdrdir)/ruby/internal/special_consts.h
+id.o: $(hdrdir)/ruby/internal/static_assert.h
+id.o: $(hdrdir)/ruby/internal/stdalign.h
+id.o: $(hdrdir)/ruby/internal/stdbool.h
+id.o: $(hdrdir)/ruby/internal/stdckdint.h
+id.o: $(hdrdir)/ruby/internal/symbol.h
+id.o: $(hdrdir)/ruby/internal/value.h
+id.o: $(hdrdir)/ruby/internal/value_type.h
+id.o: $(hdrdir)/ruby/internal/variable.h
+id.o: $(hdrdir)/ruby/internal/warning_push.h
+id.o: $(hdrdir)/ruby/internal/xmalloc.h
+id.o: $(hdrdir)/ruby/missing.h
+id.o: $(hdrdir)/ruby/ruby.h
+id.o: $(hdrdir)/ruby/st.h
+id.o: $(hdrdir)/ruby/subst.h
+id.o: id.c
+# AUTOGENERATED DEPENDENCIES END
diff --git a/ext/-test-/thread/id/extconf.rb b/ext/-test-/thread/id/extconf.rb
new file mode 100644
index 00000000000000..a0ae0eff15fb2e
--- /dev/null
+++ b/ext/-test-/thread/id/extconf.rb
@@ -0,0 +1,3 @@
+if have_func("gettid")
+  create_makefile("-test-/thread/id")
+end
diff --git a/ext/-test-/thread/id/id.c b/ext/-test-/thread/id/id.c
new file mode 100644
index 00000000000000..b46a5955e21086
--- /dev/null
+++ b/ext/-test-/thread/id/id.c
@@ -0,0 +1,15 @@
+#include <ruby.h>
+
+static VALUE
+bug_gettid(VALUE self)
+{
+    pid_t tid = gettid();
+    return PIDT2NUM(tid);
+}
+
+void
+Init_id(void)
+{
+    VALUE klass = rb_define_module_under(rb_define_module("Bug"), "ThreadID");
+    rb_define_module_function(klass, "gettid", bug_gettid, 0);
+}
diff --git a/ext/-test-/thread/instrumentation/depend b/ext/-test-/thread/instrumentation/depend
index b03f51870f2853..63e1c7e44fb63f 100644
--- a/ext/-test-/thread/instrumentation/depend
+++ b/ext/-test-/thread/instrumentation/depend
@@ -128,6 +128,7 @@ instrumentation.o: $(hdrdir)/ruby/internal/intern/re.h
 instrumentation.o: $(hdrdir)/ruby/internal/intern/ruby.h
 instrumentation.o: $(hdrdir)/ruby/internal/intern/select.h
 instrumentation.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+instrumentation.o: $(hdrdir)/ruby/internal/intern/set.h
 instrumentation.o: $(hdrdir)/ruby/internal/intern/signal.h
 instrumentation.o: $(hdrdir)/ruby/internal/intern/sprintf.h
 instrumentation.o: $(hdrdir)/ruby/internal/intern/string.h
@@ -147,6 +148,7 @@ instrumentation.o: $(hdrdir)/ruby/internal/special_consts.h
 instrumentation.o: $(hdrdir)/ruby/internal/static_assert.h
 instrumentation.o: $(hdrdir)/ruby/internal/stdalign.h
 instrumentation.o: $(hdrdir)/ruby/internal/stdbool.h
+instrumentation.o: $(hdrdir)/ruby/internal/stdckdint.h
 instrumentation.o: $(hdrdir)/ruby/internal/symbol.h
 instrumentation.o: $(hdrdir)/ruby/internal/value.h
 instrumentation.o: $(hdrdir)/ruby/internal/value_type.h
diff --git a/ext/-test-/thread/instrumentation/instrumentation.c b/ext/-test-/thread/instrumentation/instrumentation.c
index edb8738a292687..25e2902a78601b 100644
--- a/ext/-test-/thread/instrumentation/instrumentation.c
+++ b/ext/-test-/thread/instrumentation/instrumentation.c
@@ -2,85 +2,136 @@
 #include "ruby/atomic.h"
 #include "ruby/thread.h"
 
-static rb_atomic_t started_count = 0;
-static rb_atomic_t ready_count = 0;
-static rb_atomic_t resumed_count = 0;
-static rb_atomic_t suspended_count = 0;
-static rb_atomic_t exited_count = 0;
-
 #ifndef RB_THREAD_LOCAL_SPECIFIER
 #  define RB_THREAD_LOCAL_SPECIFIER
 #endif
 
-static RB_THREAD_LOCAL_SPECIFIER unsigned int local_ready_count = 0;
-static RB_THREAD_LOCAL_SPECIFIER unsigned int local_resumed_count = 0;
-static RB_THREAD_LOCAL_SPECIFIER unsigned int local_suspended_count = 0;
+static VALUE timeline_value = Qnil;
+
+struct thread_event {
+    VALUE thread;
+    rb_event_flag_t event;
+};
+
+#define MAX_EVENTS 1024
+static struct thread_event event_timeline[MAX_EVENTS];
+static rb_atomic_t timeline_cursor;
 
 static void
-ex_callback(rb_event_flag_t event, const rb_internal_thread_event_data_t *event_data, void *user_data)
+event_timeline_gc_mark(void *ptr) {
+    rb_atomic_t cursor;
+    for (cursor = 0; cursor < timeline_cursor; cursor++) {
+        rb_gc_mark(event_timeline[cursor].thread);
+    }
+}
+
+static const rb_data_type_t event_timeline_type = {
+    "TestThreadInstrumentation/event_timeline",
+    {event_timeline_gc_mark, NULL, NULL,},
+    0, 0,
+    RUBY_TYPED_FREE_IMMEDIATELY,
+};
+
+static void
+reset_timeline(void)
+{
+    timeline_cursor = 0;
+    memset(event_timeline, 0, sizeof(struct thread_event) * MAX_EVENTS);
+}
+
+static rb_event_flag_t
+find_last_event(VALUE thread)
+{
+    rb_atomic_t cursor = timeline_cursor;
+    if (cursor) {
+        do {
+            if (event_timeline[cursor].thread == thread){
+                return event_timeline[cursor].event;
+            }
+            cursor--;
+        } while (cursor > 0);
+    }
+    return 0;
+}
+
+static const char *
+event_name(rb_event_flag_t event)
 {
     switch (event) {
       case RUBY_INTERNAL_THREAD_EVENT_STARTED:
-        RUBY_ATOMIC_INC(started_count);
-        break;
+        return "started";
       case RUBY_INTERNAL_THREAD_EVENT_READY:
-        RUBY_ATOMIC_INC(ready_count);
-        local_ready_count++;
-        break;
+        return "ready";
       case RUBY_INTERNAL_THREAD_EVENT_RESUMED:
-        RUBY_ATOMIC_INC(resumed_count);
-        local_resumed_count++;
-        break;
+        return "resumed";
       case RUBY_INTERNAL_THREAD_EVENT_SUSPENDED:
-        RUBY_ATOMIC_INC(suspended_count);
-        local_suspended_count++;
-        break;
+        return "suspended";
       case RUBY_INTERNAL_THREAD_EVENT_EXITED:
-        RUBY_ATOMIC_INC(exited_count);
-        break;
+        return "exited";
     }
+    return "no-event";
 }
 
-static rb_internal_thread_event_hook_t * single_hook = NULL;
-
-static VALUE
-thread_counters(VALUE thread)
+static void
+unexpected(bool strict, const char *format, VALUE thread, rb_event_flag_t last_event)
 {
-    VALUE array = rb_ary_new2(5);
-    rb_ary_push(array, UINT2NUM(started_count));
-    rb_ary_push(array, UINT2NUM(ready_count));
-    rb_ary_push(array, UINT2NUM(resumed_count));
-    rb_ary_push(array, UINT2NUM(suspended_count));
-    rb_ary_push(array, UINT2NUM(exited_count));
-    return array;
+     const char *last_event_name = event_name(last_event);
+    if (strict) {
+        rb_bug(format, thread, last_event_name);
+    }
+    else {
+        fprintf(stderr, format, thread, last_event_name);
+        fprintf(stderr, "\n");
+    }
 }
 
-static VALUE
-thread_local_counters(VALUE thread)
+static void
+ex_callback(rb_event_flag_t event, const rb_internal_thread_event_data_t *event_data, void *user_data)
 {
-    VALUE array = rb_ary_new2(3);
-    rb_ary_push(array, UINT2NUM(local_ready_count));
-    rb_ary_push(array, UINT2NUM(local_resumed_count));
-    rb_ary_push(array, UINT2NUM(local_suspended_count));
-    return array;
-}
+    rb_event_flag_t last_event = find_last_event(event_data->thread);
+    bool strict = (bool)user_data;
 
-static VALUE
-thread_reset_counters(VALUE thread)
-{
-    RUBY_ATOMIC_SET(started_count, 0);
-    RUBY_ATOMIC_SET(ready_count, 0);
-    RUBY_ATOMIC_SET(resumed_count, 0);
-    RUBY_ATOMIC_SET(suspended_count, 0);
-    RUBY_ATOMIC_SET(exited_count, 0);
-    local_ready_count = 0;
-    local_resumed_count = 0;
-    local_suspended_count = 0;
-    return Qtrue;
+    if (last_event != 0) {
+        switch (event) {
+          case RUBY_INTERNAL_THREAD_EVENT_STARTED:
+            unexpected(strict, "[thread=%"PRIxVALUE"] `started` event can't be preceded by `%s`", event_data->thread, last_event);
+            break;
+          case RUBY_INTERNAL_THREAD_EVENT_READY:
+            if (last_event != RUBY_INTERNAL_THREAD_EVENT_STARTED && last_event != RUBY_INTERNAL_THREAD_EVENT_SUSPENDED) {
+                unexpected(strict, "[thread=%"PRIxVALUE"] `ready` must be preceded by `started` or `suspended`, got: `%s`", event_data->thread, last_event);
+            }
+            break;
+          case RUBY_INTERNAL_THREAD_EVENT_RESUMED:
+            if (last_event != RUBY_INTERNAL_THREAD_EVENT_READY) {
+                unexpected(strict, "[thread=%"PRIxVALUE"] `resumed` must be preceded by `ready`, got: `%s`", event_data->thread, last_event);
+            }
+            break;
+          case RUBY_INTERNAL_THREAD_EVENT_SUSPENDED:
+            if (last_event != RUBY_INTERNAL_THREAD_EVENT_RESUMED) {
+                unexpected(strict, "[thread=%"PRIxVALUE"] `suspended` must be preceded by `resumed`, got: `%s`", event_data->thread, last_event);
+            }
+            break;
+          case RUBY_INTERNAL_THREAD_EVENT_EXITED:
+            if (last_event != RUBY_INTERNAL_THREAD_EVENT_RESUMED && last_event != RUBY_INTERNAL_THREAD_EVENT_SUSPENDED) {
+                unexpected(strict, "[thread=%"PRIxVALUE"] `exited` must be preceded by `resumed` or `suspended`, got: `%s`", event_data->thread, last_event);
+            }
+            break;
+        }
+    }
+
+    rb_atomic_t cursor = RUBY_ATOMIC_FETCH_ADD(timeline_cursor, 1);
+    if (cursor >= MAX_EVENTS) {
+        rb_bug("TestThreadInstrumentation: ran out of event_timeline space");
+    }
+
+    event_timeline[cursor].thread = event_data->thread;
+    event_timeline[cursor].event = event;
 }
 
+static rb_internal_thread_event_hook_t * single_hook = NULL;
+
 static VALUE
-thread_register_callback(VALUE thread)
+thread_register_callback(VALUE thread, VALUE strict)
 {
     single_hook = rb_internal_thread_add_event_hook(
         ex_callback,
@@ -89,12 +140,32 @@ thread_register_callback(VALUE thread)
         RUBY_INTERNAL_THREAD_EVENT_RESUMED |
         RUBY_INTERNAL_THREAD_EVENT_SUSPENDED |
         RUBY_INTERNAL_THREAD_EVENT_EXITED,
-        NULL
+        (void *)RTEST(strict)
     );
 
     return Qnil;
 }
 
+static VALUE
+event_symbol(rb_event_flag_t event)
+{
+    switch (event) {
+      case RUBY_INTERNAL_THREAD_EVENT_STARTED:
+        return rb_id2sym(rb_intern("started"));
+      case RUBY_INTERNAL_THREAD_EVENT_READY:
+        return rb_id2sym(rb_intern("ready"));
+      case RUBY_INTERNAL_THREAD_EVENT_RESUMED:
+        return rb_id2sym(rb_intern("resumed"));
+      case RUBY_INTERNAL_THREAD_EVENT_SUSPENDED:
+        return rb_id2sym(rb_intern("suspended"));
+      case RUBY_INTERNAL_THREAD_EVENT_EXITED:
+        return rb_id2sym(rb_intern("exited"));
+      default:
+        rb_bug("TestThreadInstrumentation: Unexpected event");
+        break;
+    }
+}
+
 static VALUE
 thread_unregister_callback(VALUE thread)
 {
@@ -103,7 +174,18 @@ thread_unregister_callback(VALUE thread)
         single_hook = NULL;
     }
 
-    return Qnil;
+    VALUE events = rb_ary_new_capa(timeline_cursor);
+    rb_atomic_t cursor;
+    for (cursor = 0; cursor < timeline_cursor; cursor++) {
+        VALUE pair = rb_ary_new_capa(2);
+        rb_ary_push(pair, event_timeline[cursor].thread);
+        rb_ary_push(pair, event_symbol(event_timeline[cursor].event));
+        rb_ary_push(events, pair);
+    }
+
+    reset_timeline();
+
+    return events;
 }
 
 static VALUE
@@ -127,10 +209,10 @@ Init_instrumentation(void)
 {
     VALUE mBug = rb_define_module("Bug");
     VALUE klass = rb_define_module_under(mBug, "ThreadInstrumentation");
-    rb_define_singleton_method(klass, "counters", thread_counters, 0);
-    rb_define_singleton_method(klass, "local_counters", thread_local_counters, 0);
-    rb_define_singleton_method(klass, "reset_counters", thread_reset_counters, 0);
-    rb_define_singleton_method(klass, "register_callback", thread_register_callback, 0);
+    rb_global_variable(&timeline_value);
+    timeline_value = TypedData_Wrap_Struct(0, &event_timeline_type, (void *)1);
+
+    rb_define_singleton_method(klass, "register_callback", thread_register_callback, 1);
     rb_define_singleton_method(klass, "unregister_callback", thread_unregister_callback, 0);
     rb_define_singleton_method(klass, "register_and_unregister_callbacks", thread_register_and_unregister_callback, 0);
 }
diff --git a/ext/-test-/thread/lock_native_thread/depend b/ext/-test-/thread/lock_native_thread/depend
new file mode 100644
index 00000000000000..a32843e531494a
--- /dev/null
+++ b/ext/-test-/thread/lock_native_thread/depend
@@ -0,0 +1,163 @@
+# AUTOGENERATED DEPENDENCIES START
+lock_native_thread.o: $(RUBY_EXTCONF_H)
+lock_native_thread.o: $(arch_hdrdir)/ruby/config.h
+lock_native_thread.o: $(hdrdir)/ruby/assert.h
+lock_native_thread.o: $(hdrdir)/ruby/backward.h
+lock_native_thread.o: $(hdrdir)/ruby/backward/2/assume.h
+lock_native_thread.o: $(hdrdir)/ruby/backward/2/attributes.h
+lock_native_thread.o: $(hdrdir)/ruby/backward/2/bool.h
+lock_native_thread.o: $(hdrdir)/ruby/backward/2/inttypes.h
+lock_native_thread.o: $(hdrdir)/ruby/backward/2/limits.h
+lock_native_thread.o: $(hdrdir)/ruby/backward/2/long_long.h
+lock_native_thread.o: $(hdrdir)/ruby/backward/2/stdalign.h
+lock_native_thread.o: $(hdrdir)/ruby/backward/2/stdarg.h
+lock_native_thread.o: $(hdrdir)/ruby/defines.h
+lock_native_thread.o: $(hdrdir)/ruby/intern.h
+lock_native_thread.o: $(hdrdir)/ruby/internal/abi.h
+lock_native_thread.o: $(hdrdir)/ruby/internal/anyargs.h
+lock_native_thread.o: $(hdrdir)/ruby/internal/arithmetic.h
+lock_native_thread.o: $(hdrdir)/ruby/internal/arithmetic/char.h
+lock_native_thread.o: $(hdrdir)/ruby/internal/arithmetic/double.h
+lock_native_thread.o: $(hdrdir)/ruby/internal/arithmetic/fixnum.h
+lock_native_thread.o: $(hdrdir)/ruby/internal/arithmetic/gid_t.h
+lock_native_thread.o: $(hdrdir)/ruby/internal/arithmetic/int.h
+lock_native_thread.o: $(hdrdir)/ruby/internal/arithmetic/intptr_t.h
+lock_native_thread.o: $(hdrdir)/ruby/internal/arithmetic/long.h
+lock_native_thread.o: $(hdrdir)/ruby/internal/arithmetic/long_long.h
+lock_native_thread.o: $(hdrdir)/ruby/internal/arithmetic/mode_t.h
+lock_native_thread.o: $(hdrdir)/ruby/internal/arithmetic/off_t.h
+lock_native_thread.o: $(hdrdir)/ruby/internal/arithmetic/pid_t.h
+lock_native_thread.o: $(hdrdir)/ruby/internal/arithmetic/short.h
+lock_native_thread.o: $(hdrdir)/ruby/internal/arithmetic/size_t.h
+lock_native_thread.o: $(hdrdir)/ruby/internal/arithmetic/st_data_t.h
+lock_native_thread.o: $(hdrdir)/ruby/internal/arithmetic/uid_t.h
+lock_native_thread.o: $(hdrdir)/ruby/internal/assume.h
+lock_native_thread.o: $(hdrdir)/ruby/internal/attr/alloc_size.h
+lock_native_thread.o: $(hdrdir)/ruby/internal/attr/artificial.h
+lock_native_thread.o: $(hdrdir)/ruby/internal/attr/cold.h
+lock_native_thread.o: $(hdrdir)/ruby/internal/attr/const.h
+lock_native_thread.o: $(hdrdir)/ruby/internal/attr/constexpr.h
+lock_native_thread.o: $(hdrdir)/ruby/internal/attr/deprecated.h
+lock_native_thread.o: $(hdrdir)/ruby/internal/attr/diagnose_if.h
+lock_native_thread.o: $(hdrdir)/ruby/internal/attr/enum_extensibility.h
+lock_native_thread.o: $(hdrdir)/ruby/internal/attr/error.h
+lock_native_thread.o: $(hdrdir)/ruby/internal/attr/flag_enum.h
+lock_native_thread.o: $(hdrdir)/ruby/internal/attr/forceinline.h
+lock_native_thread.o: $(hdrdir)/ruby/internal/attr/format.h
+lock_native_thread.o: $(hdrdir)/ruby/internal/attr/maybe_unused.h
+lock_native_thread.o: $(hdrdir)/ruby/internal/attr/noalias.h
+lock_native_thread.o: $(hdrdir)/ruby/internal/attr/nodiscard.h
+lock_native_thread.o: $(hdrdir)/ruby/internal/attr/noexcept.h
+lock_native_thread.o: $(hdrdir)/ruby/internal/attr/noinline.h
+lock_native_thread.o: $(hdrdir)/ruby/internal/attr/nonnull.h
+lock_native_thread.o: $(hdrdir)/ruby/internal/attr/noreturn.h
+lock_native_thread.o: $(hdrdir)/ruby/internal/attr/packed_struct.h
+lock_native_thread.o: $(hdrdir)/ruby/internal/attr/pure.h
+lock_native_thread.o: $(hdrdir)/ruby/internal/attr/restrict.h
+lock_native_thread.o: $(hdrdir)/ruby/internal/attr/returns_nonnull.h
+lock_native_thread.o: $(hdrdir)/ruby/internal/attr/warning.h
+lock_native_thread.o: $(hdrdir)/ruby/internal/attr/weakref.h
+lock_native_thread.o: $(hdrdir)/ruby/internal/cast.h
+lock_native_thread.o: $(hdrdir)/ruby/internal/compiler_is.h
+lock_native_thread.o: $(hdrdir)/ruby/internal/compiler_is/apple.h
+lock_native_thread.o: $(hdrdir)/ruby/internal/compiler_is/clang.h
+lock_native_thread.o: $(hdrdir)/ruby/internal/compiler_is/gcc.h
+lock_native_thread.o: $(hdrdir)/ruby/internal/compiler_is/intel.h
+lock_native_thread.o: $(hdrdir)/ruby/internal/compiler_is/msvc.h
+lock_native_thread.o: $(hdrdir)/ruby/internal/compiler_is/sunpro.h
+lock_native_thread.o: $(hdrdir)/ruby/internal/compiler_since.h
+lock_native_thread.o: $(hdrdir)/ruby/internal/config.h
+lock_native_thread.o: $(hdrdir)/ruby/internal/constant_p.h
+lock_native_thread.o: $(hdrdir)/ruby/internal/core.h
+lock_native_thread.o: $(hdrdir)/ruby/internal/core/rarray.h
+lock_native_thread.o: $(hdrdir)/ruby/internal/core/rbasic.h
+lock_native_thread.o: $(hdrdir)/ruby/internal/core/rbignum.h
+lock_native_thread.o: $(hdrdir)/ruby/internal/core/rclass.h
+lock_native_thread.o: $(hdrdir)/ruby/internal/core/rdata.h
+lock_native_thread.o: $(hdrdir)/ruby/internal/core/rfile.h
+lock_native_thread.o: $(hdrdir)/ruby/internal/core/rhash.h
+lock_native_thread.o: $(hdrdir)/ruby/internal/core/robject.h
+lock_native_thread.o: $(hdrdir)/ruby/internal/core/rregexp.h
+lock_native_thread.o: $(hdrdir)/ruby/internal/core/rstring.h
+lock_native_thread.o: $(hdrdir)/ruby/internal/core/rstruct.h
+lock_native_thread.o: $(hdrdir)/ruby/internal/core/rtypeddata.h
+lock_native_thread.o: $(hdrdir)/ruby/internal/ctype.h
+lock_native_thread.o: $(hdrdir)/ruby/internal/dllexport.h
+lock_native_thread.o: $(hdrdir)/ruby/internal/dosish.h
+lock_native_thread.o: $(hdrdir)/ruby/internal/error.h
+lock_native_thread.o: $(hdrdir)/ruby/internal/eval.h
+lock_native_thread.o: $(hdrdir)/ruby/internal/event.h
+lock_native_thread.o: $(hdrdir)/ruby/internal/fl_type.h
+lock_native_thread.o: $(hdrdir)/ruby/internal/gc.h
+lock_native_thread.o: $(hdrdir)/ruby/internal/glob.h
+lock_native_thread.o: $(hdrdir)/ruby/internal/globals.h
+lock_native_thread.o: $(hdrdir)/ruby/internal/has/attribute.h
+lock_native_thread.o: $(hdrdir)/ruby/internal/has/builtin.h
+lock_native_thread.o: $(hdrdir)/ruby/internal/has/c_attribute.h
+lock_native_thread.o: $(hdrdir)/ruby/internal/has/cpp_attribute.h
+lock_native_thread.o: $(hdrdir)/ruby/internal/has/declspec_attribute.h
+lock_native_thread.o: $(hdrdir)/ruby/internal/has/extension.h
+lock_native_thread.o: $(hdrdir)/ruby/internal/has/feature.h
+lock_native_thread.o: $(hdrdir)/ruby/internal/has/warning.h
+lock_native_thread.o: $(hdrdir)/ruby/internal/intern/array.h
+lock_native_thread.o: $(hdrdir)/ruby/internal/intern/bignum.h
+lock_native_thread.o: $(hdrdir)/ruby/internal/intern/class.h
+lock_native_thread.o: $(hdrdir)/ruby/internal/intern/compar.h
+lock_native_thread.o: $(hdrdir)/ruby/internal/intern/complex.h
+lock_native_thread.o: $(hdrdir)/ruby/internal/intern/cont.h
+lock_native_thread.o: $(hdrdir)/ruby/internal/intern/dir.h
+lock_native_thread.o: $(hdrdir)/ruby/internal/intern/enum.h
+lock_native_thread.o: $(hdrdir)/ruby/internal/intern/enumerator.h
+lock_native_thread.o: $(hdrdir)/ruby/internal/intern/error.h
+lock_native_thread.o: $(hdrdir)/ruby/internal/intern/eval.h
+lock_native_thread.o: $(hdrdir)/ruby/internal/intern/file.h
+lock_native_thread.o: $(hdrdir)/ruby/internal/intern/hash.h
+lock_native_thread.o: $(hdrdir)/ruby/internal/intern/io.h
+lock_native_thread.o: $(hdrdir)/ruby/internal/intern/load.h
+lock_native_thread.o: $(hdrdir)/ruby/internal/intern/marshal.h
+lock_native_thread.o: $(hdrdir)/ruby/internal/intern/numeric.h
+lock_native_thread.o: $(hdrdir)/ruby/internal/intern/object.h
+lock_native_thread.o: $(hdrdir)/ruby/internal/intern/parse.h
+lock_native_thread.o: $(hdrdir)/ruby/internal/intern/proc.h
+lock_native_thread.o: $(hdrdir)/ruby/internal/intern/process.h
+lock_native_thread.o: $(hdrdir)/ruby/internal/intern/random.h
+lock_native_thread.o: $(hdrdir)/ruby/internal/intern/range.h
+lock_native_thread.o: $(hdrdir)/ruby/internal/intern/rational.h
+lock_native_thread.o: $(hdrdir)/ruby/internal/intern/re.h
+lock_native_thread.o: $(hdrdir)/ruby/internal/intern/ruby.h
+lock_native_thread.o: $(hdrdir)/ruby/internal/intern/select.h
+lock_native_thread.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+lock_native_thread.o: $(hdrdir)/ruby/internal/intern/set.h
+lock_native_thread.o: $(hdrdir)/ruby/internal/intern/signal.h
+lock_native_thread.o: $(hdrdir)/ruby/internal/intern/sprintf.h
+lock_native_thread.o: $(hdrdir)/ruby/internal/intern/string.h
+lock_native_thread.o: $(hdrdir)/ruby/internal/intern/struct.h
+lock_native_thread.o: $(hdrdir)/ruby/internal/intern/thread.h
+lock_native_thread.o: $(hdrdir)/ruby/internal/intern/time.h
+lock_native_thread.o: $(hdrdir)/ruby/internal/intern/variable.h
+lock_native_thread.o: $(hdrdir)/ruby/internal/intern/vm.h
+lock_native_thread.o: $(hdrdir)/ruby/internal/interpreter.h
+lock_native_thread.o: $(hdrdir)/ruby/internal/iterator.h
+lock_native_thread.o: $(hdrdir)/ruby/internal/memory.h
+lock_native_thread.o: $(hdrdir)/ruby/internal/method.h
+lock_native_thread.o: $(hdrdir)/ruby/internal/module.h
+lock_native_thread.o: $(hdrdir)/ruby/internal/newobj.h
+lock_native_thread.o: $(hdrdir)/ruby/internal/scan_args.h
+lock_native_thread.o: $(hdrdir)/ruby/internal/special_consts.h
+lock_native_thread.o: $(hdrdir)/ruby/internal/static_assert.h
+lock_native_thread.o: $(hdrdir)/ruby/internal/stdalign.h
+lock_native_thread.o: $(hdrdir)/ruby/internal/stdbool.h
+lock_native_thread.o: $(hdrdir)/ruby/internal/stdckdint.h
+lock_native_thread.o: $(hdrdir)/ruby/internal/symbol.h
+lock_native_thread.o: $(hdrdir)/ruby/internal/value.h
+lock_native_thread.o: $(hdrdir)/ruby/internal/value_type.h
+lock_native_thread.o: $(hdrdir)/ruby/internal/variable.h
+lock_native_thread.o: $(hdrdir)/ruby/internal/warning_push.h
+lock_native_thread.o: $(hdrdir)/ruby/internal/xmalloc.h
+lock_native_thread.o: $(hdrdir)/ruby/missing.h
+lock_native_thread.o: $(hdrdir)/ruby/ruby.h
+lock_native_thread.o: $(hdrdir)/ruby/st.h
+lock_native_thread.o: $(hdrdir)/ruby/subst.h
+lock_native_thread.o: $(hdrdir)/ruby/thread.h
+lock_native_thread.o: lock_native_thread.c
+# AUTOGENERATED DEPENDENCIES END
diff --git a/ext/-test-/thread/lock_native_thread/extconf.rb b/ext/-test-/thread/lock_native_thread/extconf.rb
new file mode 100644
index 00000000000000..832bfde01afeb6
--- /dev/null
+++ b/ext/-test-/thread/lock_native_thread/extconf.rb
@@ -0,0 +1,2 @@
+# frozen_string_literal: false
+create_makefile("-test-/thread/lock_native_thread")
diff --git a/ext/-test-/thread/lock_native_thread/lock_native_thread.c b/ext/-test-/thread/lock_native_thread/lock_native_thread.c
new file mode 100644
index 00000000000000..2eb75809a9a57e
--- /dev/null
+++ b/ext/-test-/thread/lock_native_thread/lock_native_thread.c
@@ -0,0 +1,50 @@
+
+#include "ruby/ruby.h"
+#include "ruby/thread.h"
+
+#ifdef HAVE_PTHREAD_H
+#include <pthread.h>
+
+static pthread_key_t tls_key;
+
+static VALUE
+get_tls(VALUE self)
+{
+    return (VALUE)pthread_getspecific(tls_key);
+}
+
+static VALUE
+set_tls(VALUE self, VALUE vn)
+{
+    pthread_setspecific(tls_key, (void *)vn);
+    return Qnil;
+}
+
+static VALUE
+lock_native_thread(VALUE self)
+{
+    return rb_thread_lock_native_thread() ? Qtrue : Qfalse;
+}
+
+void
+Init_lock_native_thread(void)
+{
+    int r;
+
+    if ((r = pthread_key_create(&tls_key, NULL)) != 0) {
+        rb_bug("pthread_key_create() returns %d", r);
+    }
+    pthread_setspecific(tls_key, NULL);
+
+    rb_define_method(rb_cThread, "lock_native_thread", lock_native_thread, 0);
+    rb_define_method(rb_cThread, "get_tls", get_tls, 0);
+    rb_define_method(rb_cThread, "set_tls", set_tls, 1);
+}
+
+#else // HAVE_PTHREAD_H
+void
+Init_lock_native_thread(void)
+{
+    // do nothing
+}
+#endif // HAVE_PTHREAD_H
diff --git a/ext/-test-/thread_fd/depend b/ext/-test-/thread_fd/depend
deleted file mode 100644
index d4cc772526fdb8..00000000000000
--- a/ext/-test-/thread_fd/depend
+++ /dev/null
@@ -1,160 +0,0 @@
-# AUTOGENERATED DEPENDENCIES START
-thread_fd.o: $(RUBY_EXTCONF_H)
-thread_fd.o: $(arch_hdrdir)/ruby/config.h
-thread_fd.o: $(hdrdir)/ruby/assert.h
-thread_fd.o: $(hdrdir)/ruby/backward.h
-thread_fd.o: $(hdrdir)/ruby/backward/2/assume.h
-thread_fd.o: $(hdrdir)/ruby/backward/2/attributes.h
-thread_fd.o: $(hdrdir)/ruby/backward/2/bool.h
-thread_fd.o: $(hdrdir)/ruby/backward/2/inttypes.h
-thread_fd.o: $(hdrdir)/ruby/backward/2/limits.h
-thread_fd.o: $(hdrdir)/ruby/backward/2/long_long.h
-thread_fd.o: $(hdrdir)/ruby/backward/2/stdalign.h
-thread_fd.o: $(hdrdir)/ruby/backward/2/stdarg.h
-thread_fd.o: $(hdrdir)/ruby/defines.h
-thread_fd.o: $(hdrdir)/ruby/intern.h
-thread_fd.o: $(hdrdir)/ruby/internal/abi.h
-thread_fd.o: $(hdrdir)/ruby/internal/anyargs.h
-thread_fd.o: $(hdrdir)/ruby/internal/arithmetic.h
-thread_fd.o: $(hdrdir)/ruby/internal/arithmetic/char.h
-thread_fd.o: $(hdrdir)/ruby/internal/arithmetic/double.h
-thread_fd.o: $(hdrdir)/ruby/internal/arithmetic/fixnum.h
-thread_fd.o: $(hdrdir)/ruby/internal/arithmetic/gid_t.h
-thread_fd.o: $(hdrdir)/ruby/internal/arithmetic/int.h
-thread_fd.o: $(hdrdir)/ruby/internal/arithmetic/intptr_t.h
-thread_fd.o: $(hdrdir)/ruby/internal/arithmetic/long.h
-thread_fd.o: $(hdrdir)/ruby/internal/arithmetic/long_long.h
-thread_fd.o: $(hdrdir)/ruby/internal/arithmetic/mode_t.h
-thread_fd.o: $(hdrdir)/ruby/internal/arithmetic/off_t.h
-thread_fd.o: $(hdrdir)/ruby/internal/arithmetic/pid_t.h
-thread_fd.o: $(hdrdir)/ruby/internal/arithmetic/short.h
-thread_fd.o: $(hdrdir)/ruby/internal/arithmetic/size_t.h
-thread_fd.o: $(hdrdir)/ruby/internal/arithmetic/st_data_t.h
-thread_fd.o: $(hdrdir)/ruby/internal/arithmetic/uid_t.h
-thread_fd.o: $(hdrdir)/ruby/internal/assume.h
-thread_fd.o: $(hdrdir)/ruby/internal/attr/alloc_size.h
-thread_fd.o: $(hdrdir)/ruby/internal/attr/artificial.h
-thread_fd.o: $(hdrdir)/ruby/internal/attr/cold.h
-thread_fd.o: $(hdrdir)/ruby/internal/attr/const.h
-thread_fd.o: $(hdrdir)/ruby/internal/attr/constexpr.h
-thread_fd.o: $(hdrdir)/ruby/internal/attr/deprecated.h
-thread_fd.o: $(hdrdir)/ruby/internal/attr/diagnose_if.h
-thread_fd.o: $(hdrdir)/ruby/internal/attr/enum_extensibility.h
-thread_fd.o: $(hdrdir)/ruby/internal/attr/error.h
-thread_fd.o: $(hdrdir)/ruby/internal/attr/flag_enum.h
-thread_fd.o: $(hdrdir)/ruby/internal/attr/forceinline.h
-thread_fd.o: $(hdrdir)/ruby/internal/attr/format.h
-thread_fd.o: $(hdrdir)/ruby/internal/attr/maybe_unused.h
-thread_fd.o: $(hdrdir)/ruby/internal/attr/noalias.h
-thread_fd.o: $(hdrdir)/ruby/internal/attr/nodiscard.h
-thread_fd.o: $(hdrdir)/ruby/internal/attr/noexcept.h
-thread_fd.o: $(hdrdir)/ruby/internal/attr/noinline.h
-thread_fd.o: $(hdrdir)/ruby/internal/attr/nonnull.h
-thread_fd.o: $(hdrdir)/ruby/internal/attr/noreturn.h
-thread_fd.o: $(hdrdir)/ruby/internal/attr/packed_struct.h
-thread_fd.o: $(hdrdir)/ruby/internal/attr/pure.h
-thread_fd.o: $(hdrdir)/ruby/internal/attr/restrict.h
-thread_fd.o: $(hdrdir)/ruby/internal/attr/returns_nonnull.h
-thread_fd.o: $(hdrdir)/ruby/internal/attr/warning.h
-thread_fd.o: $(hdrdir)/ruby/internal/attr/weakref.h
-thread_fd.o: $(hdrdir)/ruby/internal/cast.h
-thread_fd.o: $(hdrdir)/ruby/internal/compiler_is.h
-thread_fd.o: $(hdrdir)/ruby/internal/compiler_is/apple.h
-thread_fd.o: $(hdrdir)/ruby/internal/compiler_is/clang.h
-thread_fd.o: $(hdrdir)/ruby/internal/compiler_is/gcc.h
-thread_fd.o: $(hdrdir)/ruby/internal/compiler_is/intel.h
-thread_fd.o: $(hdrdir)/ruby/internal/compiler_is/msvc.h
-thread_fd.o: $(hdrdir)/ruby/internal/compiler_is/sunpro.h
-thread_fd.o: $(hdrdir)/ruby/internal/compiler_since.h
-thread_fd.o: $(hdrdir)/ruby/internal/config.h
-thread_fd.o: $(hdrdir)/ruby/internal/constant_p.h
-thread_fd.o: $(hdrdir)/ruby/internal/core.h
-thread_fd.o: $(hdrdir)/ruby/internal/core/rarray.h
-thread_fd.o: $(hdrdir)/ruby/internal/core/rbasic.h
-thread_fd.o: $(hdrdir)/ruby/internal/core/rbignum.h
-thread_fd.o: $(hdrdir)/ruby/internal/core/rclass.h
-thread_fd.o: $(hdrdir)/ruby/internal/core/rdata.h
-thread_fd.o: $(hdrdir)/ruby/internal/core/rfile.h
-thread_fd.o: $(hdrdir)/ruby/internal/core/rhash.h
-thread_fd.o: $(hdrdir)/ruby/internal/core/robject.h
-thread_fd.o: $(hdrdir)/ruby/internal/core/rregexp.h
-thread_fd.o: $(hdrdir)/ruby/internal/core/rstring.h
-thread_fd.o: $(hdrdir)/ruby/internal/core/rstruct.h
-thread_fd.o: $(hdrdir)/ruby/internal/core/rtypeddata.h
-thread_fd.o: $(hdrdir)/ruby/internal/ctype.h
-thread_fd.o: $(hdrdir)/ruby/internal/dllexport.h
-thread_fd.o: $(hdrdir)/ruby/internal/dosish.h
-thread_fd.o: $(hdrdir)/ruby/internal/error.h
-thread_fd.o: $(hdrdir)/ruby/internal/eval.h
-thread_fd.o: $(hdrdir)/ruby/internal/event.h
-thread_fd.o: $(hdrdir)/ruby/internal/fl_type.h
-thread_fd.o: $(hdrdir)/ruby/internal/gc.h
-thread_fd.o: $(hdrdir)/ruby/internal/glob.h
-thread_fd.o: $(hdrdir)/ruby/internal/globals.h
-thread_fd.o: $(hdrdir)/ruby/internal/has/attribute.h
-thread_fd.o: $(hdrdir)/ruby/internal/has/builtin.h
-thread_fd.o: $(hdrdir)/ruby/internal/has/c_attribute.h
-thread_fd.o: $(hdrdir)/ruby/internal/has/cpp_attribute.h
-thread_fd.o: $(hdrdir)/ruby/internal/has/declspec_attribute.h
-thread_fd.o: $(hdrdir)/ruby/internal/has/extension.h
-thread_fd.o: $(hdrdir)/ruby/internal/has/feature.h
-thread_fd.o: $(hdrdir)/ruby/internal/has/warning.h
-thread_fd.o: $(hdrdir)/ruby/internal/intern/array.h
-thread_fd.o: $(hdrdir)/ruby/internal/intern/bignum.h
-thread_fd.o: $(hdrdir)/ruby/internal/intern/class.h
-thread_fd.o: $(hdrdir)/ruby/internal/intern/compar.h
-thread_fd.o: $(hdrdir)/ruby/internal/intern/complex.h
-thread_fd.o: $(hdrdir)/ruby/internal/intern/cont.h
-thread_fd.o: $(hdrdir)/ruby/internal/intern/dir.h
-thread_fd.o: $(hdrdir)/ruby/internal/intern/enum.h
-thread_fd.o: $(hdrdir)/ruby/internal/intern/enumerator.h
-thread_fd.o: $(hdrdir)/ruby/internal/intern/error.h
-thread_fd.o: $(hdrdir)/ruby/internal/intern/eval.h
-thread_fd.o: $(hdrdir)/ruby/internal/intern/file.h
-thread_fd.o: $(hdrdir)/ruby/internal/intern/hash.h
-thread_fd.o: $(hdrdir)/ruby/internal/intern/io.h
-thread_fd.o: $(hdrdir)/ruby/internal/intern/load.h
-thread_fd.o: $(hdrdir)/ruby/internal/intern/marshal.h
-thread_fd.o: $(hdrdir)/ruby/internal/intern/numeric.h
-thread_fd.o: $(hdrdir)/ruby/internal/intern/object.h
-thread_fd.o: $(hdrdir)/ruby/internal/intern/parse.h
-thread_fd.o: $(hdrdir)/ruby/internal/intern/proc.h
-thread_fd.o: $(hdrdir)/ruby/internal/intern/process.h
-thread_fd.o: $(hdrdir)/ruby/internal/intern/random.h
-thread_fd.o: $(hdrdir)/ruby/internal/intern/range.h
-thread_fd.o: $(hdrdir)/ruby/internal/intern/rational.h
-thread_fd.o: $(hdrdir)/ruby/internal/intern/re.h
-thread_fd.o: $(hdrdir)/ruby/internal/intern/ruby.h
-thread_fd.o: $(hdrdir)/ruby/internal/intern/select.h
-thread_fd.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
-thread_fd.o: $(hdrdir)/ruby/internal/intern/signal.h
-thread_fd.o: $(hdrdir)/ruby/internal/intern/sprintf.h
-thread_fd.o: $(hdrdir)/ruby/internal/intern/string.h
-thread_fd.o: $(hdrdir)/ruby/internal/intern/struct.h
-thread_fd.o: $(hdrdir)/ruby/internal/intern/thread.h
-thread_fd.o: $(hdrdir)/ruby/internal/intern/time.h
-thread_fd.o: $(hdrdir)/ruby/internal/intern/variable.h
-thread_fd.o: $(hdrdir)/ruby/internal/intern/vm.h
-thread_fd.o: $(hdrdir)/ruby/internal/interpreter.h
-thread_fd.o: $(hdrdir)/ruby/internal/iterator.h
-thread_fd.o: $(hdrdir)/ruby/internal/memory.h
-thread_fd.o: $(hdrdir)/ruby/internal/method.h
-thread_fd.o: $(hdrdir)/ruby/internal/module.h
-thread_fd.o: $(hdrdir)/ruby/internal/newobj.h
-thread_fd.o: $(hdrdir)/ruby/internal/scan_args.h
-thread_fd.o: $(hdrdir)/ruby/internal/special_consts.h
-thread_fd.o: $(hdrdir)/ruby/internal/static_assert.h
-thread_fd.o: $(hdrdir)/ruby/internal/stdalign.h
-thread_fd.o: $(hdrdir)/ruby/internal/stdbool.h
-thread_fd.o: $(hdrdir)/ruby/internal/symbol.h
-thread_fd.o: $(hdrdir)/ruby/internal/value.h
-thread_fd.o: $(hdrdir)/ruby/internal/value_type.h
-thread_fd.o: $(hdrdir)/ruby/internal/variable.h
-thread_fd.o: $(hdrdir)/ruby/internal/warning_push.h
-thread_fd.o: $(hdrdir)/ruby/internal/xmalloc.h
-thread_fd.o: $(hdrdir)/ruby/missing.h
-thread_fd.o: $(hdrdir)/ruby/ruby.h
-thread_fd.o: $(hdrdir)/ruby/st.h
-thread_fd.o: $(hdrdir)/ruby/subst.h
-thread_fd.o: thread_fd.c
-# AUTOGENERATED DEPENDENCIES END
diff --git a/ext/-test-/thread_fd/extconf.rb b/ext/-test-/thread_fd/extconf.rb
deleted file mode 100644
index a8bbe9d1697d3f..00000000000000
--- a/ext/-test-/thread_fd/extconf.rb
+++ /dev/null
@@ -1,2 +0,0 @@
-# frozen_string_literal: true
-create_makefile('-test-/thread_fd')
diff --git a/ext/-test-/thread_fd/thread_fd.c b/ext/-test-/thread_fd/thread_fd.c
deleted file mode 100644
index 042b799dc8dc24..00000000000000
--- a/ext/-test-/thread_fd/thread_fd.c
+++ /dev/null
@@ -1,30 +0,0 @@
-#include "ruby/ruby.h"
-
-static VALUE
-thread_fd_close(VALUE ign, VALUE fd)
-{
-    rb_thread_fd_close(NUM2INT(fd));
-    return Qnil;
-}
-
-static VALUE
-thread_fd_wait(VALUE ign, VALUE fd)
-{
-    int ret = rb_thread_wait_fd(NUM2INT(fd));
-    return INT2NUM(ret);
-}
-
-static VALUE
-thread_fd_writable(VALUE ign, VALUE fd)
-{
-    int ret = rb_thread_fd_writable(NUM2INT(fd));
-    return INT2NUM(ret);
-}
-
-void
-Init_thread_fd(void)
-{
-    rb_define_singleton_method(rb_cIO, "thread_fd_close", thread_fd_close, 1);
-    rb_define_singleton_method(rb_cIO, "thread_fd_wait", thread_fd_wait, 1);
-    rb_define_singleton_method(rb_cIO, "thread_fd_writable", thread_fd_writable, 1);
-}
diff --git a/ext/-test-/time/depend b/ext/-test-/time/depend
index c015588b091525..e5b05f311358e8 100644
--- a/ext/-test-/time/depend
+++ b/ext/-test-/time/depend
@@ -128,6 +128,7 @@ init.o: $(hdrdir)/ruby/internal/intern/re.h
 init.o: $(hdrdir)/ruby/internal/intern/ruby.h
 init.o: $(hdrdir)/ruby/internal/intern/select.h
 init.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+init.o: $(hdrdir)/ruby/internal/intern/set.h
 init.o: $(hdrdir)/ruby/internal/intern/signal.h
 init.o: $(hdrdir)/ruby/internal/intern/sprintf.h
 init.o: $(hdrdir)/ruby/internal/intern/string.h
@@ -147,6 +148,7 @@ init.o: $(hdrdir)/ruby/internal/special_consts.h
 init.o: $(hdrdir)/ruby/internal/static_assert.h
 init.o: $(hdrdir)/ruby/internal/stdalign.h
 init.o: $(hdrdir)/ruby/internal/stdbool.h
+init.o: $(hdrdir)/ruby/internal/stdckdint.h
 init.o: $(hdrdir)/ruby/internal/symbol.h
 init.o: $(hdrdir)/ruby/internal/value.h
 init.o: $(hdrdir)/ruby/internal/value_type.h
@@ -288,6 +290,7 @@ leap_second.o: $(hdrdir)/ruby/internal/intern/re.h
 leap_second.o: $(hdrdir)/ruby/internal/intern/ruby.h
 leap_second.o: $(hdrdir)/ruby/internal/intern/select.h
 leap_second.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+leap_second.o: $(hdrdir)/ruby/internal/intern/set.h
 leap_second.o: $(hdrdir)/ruby/internal/intern/signal.h
 leap_second.o: $(hdrdir)/ruby/internal/intern/sprintf.h
 leap_second.o: $(hdrdir)/ruby/internal/intern/string.h
@@ -307,6 +310,7 @@ leap_second.o: $(hdrdir)/ruby/internal/special_consts.h
 leap_second.o: $(hdrdir)/ruby/internal/static_assert.h
 leap_second.o: $(hdrdir)/ruby/internal/stdalign.h
 leap_second.o: $(hdrdir)/ruby/internal/stdbool.h
+leap_second.o: $(hdrdir)/ruby/internal/stdckdint.h
 leap_second.o: $(hdrdir)/ruby/internal/symbol.h
 leap_second.o: $(hdrdir)/ruby/internal/value.h
 leap_second.o: $(hdrdir)/ruby/internal/value_type.h
@@ -451,6 +455,7 @@ new.o: $(hdrdir)/ruby/internal/intern/re.h
 new.o: $(hdrdir)/ruby/internal/intern/ruby.h
 new.o: $(hdrdir)/ruby/internal/intern/select.h
 new.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+new.o: $(hdrdir)/ruby/internal/intern/set.h
 new.o: $(hdrdir)/ruby/internal/intern/signal.h
 new.o: $(hdrdir)/ruby/internal/intern/sprintf.h
 new.o: $(hdrdir)/ruby/internal/intern/string.h
@@ -470,6 +475,7 @@ new.o: $(hdrdir)/ruby/internal/special_consts.h
 new.o: $(hdrdir)/ruby/internal/static_assert.h
 new.o: $(hdrdir)/ruby/internal/stdalign.h
 new.o: $(hdrdir)/ruby/internal/stdbool.h
+new.o: $(hdrdir)/ruby/internal/stdckdint.h
 new.o: $(hdrdir)/ruby/internal/symbol.h
 new.o: $(hdrdir)/ruby/internal/value.h
 new.o: $(hdrdir)/ruby/internal/value_type.h
diff --git a/ext/-test-/tracepoint/depend b/ext/-test-/tracepoint/depend
index 396004926e6427..014ba83b16af6a 100644
--- a/ext/-test-/tracepoint/depend
+++ b/ext/-test-/tracepoint/depend
@@ -128,6 +128,7 @@ gc_hook.o: $(hdrdir)/ruby/internal/intern/re.h
 gc_hook.o: $(hdrdir)/ruby/internal/intern/ruby.h
 gc_hook.o: $(hdrdir)/ruby/internal/intern/select.h
 gc_hook.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+gc_hook.o: $(hdrdir)/ruby/internal/intern/set.h
 gc_hook.o: $(hdrdir)/ruby/internal/intern/signal.h
 gc_hook.o: $(hdrdir)/ruby/internal/intern/sprintf.h
 gc_hook.o: $(hdrdir)/ruby/internal/intern/string.h
@@ -147,6 +148,7 @@ gc_hook.o: $(hdrdir)/ruby/internal/special_consts.h
 gc_hook.o: $(hdrdir)/ruby/internal/static_assert.h
 gc_hook.o: $(hdrdir)/ruby/internal/stdalign.h
 gc_hook.o: $(hdrdir)/ruby/internal/stdbool.h
+gc_hook.o: $(hdrdir)/ruby/internal/stdckdint.h
 gc_hook.o: $(hdrdir)/ruby/internal/symbol.h
 gc_hook.o: $(hdrdir)/ruby/internal/value.h
 gc_hook.o: $(hdrdir)/ruby/internal/value_type.h
@@ -287,6 +289,7 @@ tracepoint.o: $(hdrdir)/ruby/internal/intern/re.h
 tracepoint.o: $(hdrdir)/ruby/internal/intern/ruby.h
 tracepoint.o: $(hdrdir)/ruby/internal/intern/select.h
 tracepoint.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+tracepoint.o: $(hdrdir)/ruby/internal/intern/set.h
 tracepoint.o: $(hdrdir)/ruby/internal/intern/signal.h
 tracepoint.o: $(hdrdir)/ruby/internal/intern/sprintf.h
 tracepoint.o: $(hdrdir)/ruby/internal/intern/string.h
@@ -306,6 +309,7 @@ tracepoint.o: $(hdrdir)/ruby/internal/special_consts.h
 tracepoint.o: $(hdrdir)/ruby/internal/static_assert.h
 tracepoint.o: $(hdrdir)/ruby/internal/stdalign.h
 tracepoint.o: $(hdrdir)/ruby/internal/stdbool.h
+tracepoint.o: $(hdrdir)/ruby/internal/stdckdint.h
 tracepoint.o: $(hdrdir)/ruby/internal/symbol.h
 tracepoint.o: $(hdrdir)/ruby/internal/value.h
 tracepoint.o: $(hdrdir)/ruby/internal/value_type.h
diff --git a/ext/-test-/tracepoint/gc_hook.c b/ext/-test-/tracepoint/gc_hook.c
index a3f4e7f68af06f..54c06c54a5b9b7 100644
--- a/ext/-test-/tracepoint/gc_hook.c
+++ b/ext/-test-/tracepoint/gc_hook.c
@@ -33,7 +33,9 @@ gc_start_end_i(VALUE tpval, void *data)
     }
 
     if (invoking == 0) {
-        rb_postponed_job_register(0, invoke_proc, data);
+        /* will overwrite the existing handle with new data on the second and subsequent call */
+        rb_postponed_job_handle_t h = rb_postponed_job_preregister(0, invoke_proc, data);
+        rb_postponed_job_trigger(h);
     }
 }
 
diff --git a/ext/-test-/typeddata/depend b/ext/-test-/typeddata/depend
index cbeafa800097d8..b9b4915eeed590 100644
--- a/ext/-test-/typeddata/depend
+++ b/ext/-test-/typeddata/depend
@@ -128,6 +128,7 @@ typeddata.o: $(hdrdir)/ruby/internal/intern/re.h
 typeddata.o: $(hdrdir)/ruby/internal/intern/ruby.h
 typeddata.o: $(hdrdir)/ruby/internal/intern/select.h
 typeddata.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+typeddata.o: $(hdrdir)/ruby/internal/intern/set.h
 typeddata.o: $(hdrdir)/ruby/internal/intern/signal.h
 typeddata.o: $(hdrdir)/ruby/internal/intern/sprintf.h
 typeddata.o: $(hdrdir)/ruby/internal/intern/string.h
@@ -147,6 +148,7 @@ typeddata.o: $(hdrdir)/ruby/internal/special_consts.h
 typeddata.o: $(hdrdir)/ruby/internal/static_assert.h
 typeddata.o: $(hdrdir)/ruby/internal/stdalign.h
 typeddata.o: $(hdrdir)/ruby/internal/stdbool.h
+typeddata.o: $(hdrdir)/ruby/internal/stdckdint.h
 typeddata.o: $(hdrdir)/ruby/internal/symbol.h
 typeddata.o: $(hdrdir)/ruby/internal/value.h
 typeddata.o: $(hdrdir)/ruby/internal/value_type.h
diff --git a/ext/-test-/vm/depend b/ext/-test-/vm/depend
index f0b3f3b1f4879a..9313f2ee36fa19 100644
--- a/ext/-test-/vm/depend
+++ b/ext/-test-/vm/depend
@@ -127,6 +127,7 @@ at_exit.o: $(hdrdir)/ruby/internal/intern/re.h
 at_exit.o: $(hdrdir)/ruby/internal/intern/ruby.h
 at_exit.o: $(hdrdir)/ruby/internal/intern/select.h
 at_exit.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+at_exit.o: $(hdrdir)/ruby/internal/intern/set.h
 at_exit.o: $(hdrdir)/ruby/internal/intern/signal.h
 at_exit.o: $(hdrdir)/ruby/internal/intern/sprintf.h
 at_exit.o: $(hdrdir)/ruby/internal/intern/string.h
@@ -146,6 +147,7 @@ at_exit.o: $(hdrdir)/ruby/internal/special_consts.h
 at_exit.o: $(hdrdir)/ruby/internal/static_assert.h
 at_exit.o: $(hdrdir)/ruby/internal/stdalign.h
 at_exit.o: $(hdrdir)/ruby/internal/stdbool.h
+at_exit.o: $(hdrdir)/ruby/internal/stdckdint.h
 at_exit.o: $(hdrdir)/ruby/internal/symbol.h
 at_exit.o: $(hdrdir)/ruby/internal/value.h
 at_exit.o: $(hdrdir)/ruby/internal/value_type.h
diff --git a/ext/-test-/wait/depend b/ext/-test-/wait/depend
index 2e4887559cd4ab..f793d848319cbb 100644
--- a/ext/-test-/wait/depend
+++ b/ext/-test-/wait/depend
@@ -137,6 +137,7 @@ wait.o: $(hdrdir)/ruby/internal/intern/re.h
 wait.o: $(hdrdir)/ruby/internal/intern/ruby.h
 wait.o: $(hdrdir)/ruby/internal/intern/select.h
 wait.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+wait.o: $(hdrdir)/ruby/internal/intern/set.h
 wait.o: $(hdrdir)/ruby/internal/intern/signal.h
 wait.o: $(hdrdir)/ruby/internal/intern/sprintf.h
 wait.o: $(hdrdir)/ruby/internal/intern/string.h
@@ -156,6 +157,7 @@ wait.o: $(hdrdir)/ruby/internal/special_consts.h
 wait.o: $(hdrdir)/ruby/internal/static_assert.h
 wait.o: $(hdrdir)/ruby/internal/stdalign.h
 wait.o: $(hdrdir)/ruby/internal/stdbool.h
+wait.o: $(hdrdir)/ruby/internal/stdckdint.h
 wait.o: $(hdrdir)/ruby/internal/symbol.h
 wait.o: $(hdrdir)/ruby/internal/value.h
 wait.o: $(hdrdir)/ruby/internal/value_type.h
diff --git a/ext/-test-/win32/dln/extconf.rb b/ext/-test-/win32/dln/extconf.rb
index d72b6a868cc513..bea52cfec36564 100644
--- a/ext/-test-/win32/dln/extconf.rb
+++ b/ext/-test-/win32/dln/extconf.rb
@@ -7,6 +7,7 @@
   testdll = "dlntest.dll"
   $cleanfiles << testdll
   $cleanfiles << "dlntest.#{$LIBEXT}"
+  $cleanfiles << "libdlntest.#{$OBJEXT}"
   config_string('cleanobjs') {|t| $cleanfiles.concat(t.gsub(/\$\*/, 'dlntest').split)}
 
   create_makefile("-test-/win32/dln") do |m|
diff --git a/ext/.document b/ext/.document
index f2fa5b5ba2d6ef..0efd511a61c450 100644
--- a/ext/.document
+++ b/ext/.document
@@ -29,8 +29,7 @@ fiddle/pinned.c
 fiddle/pointer.c
 fiddle/handle.c
 fiddle/lib
-io/console/console.c
-io/console/lib
+io/console/
 io/nonblock/nonblock.c
 io/wait/wait.c
 json/generator/generator.c
diff --git a/ext/bigdecimal/bigdecimal.c b/ext/bigdecimal/bigdecimal.c
deleted file mode 100644
index bcfa400539ccbf..00000000000000
--- a/ext/bigdecimal/bigdecimal.c
+++ /dev/null
@@ -1,7725 +0,0 @@
-/*
- *
- * Ruby BigDecimal(Variable decimal precision) extension library.
- *
- * Copyright(C) 2002 by Shigeo Kobayashi(shigeo@tinyforest.gr.jp)
- *
- */
-
-/* #define BIGDECIMAL_DEBUG 1 */
-
-#include "bigdecimal.h"
-#include "ruby/util.h"
-
-#ifndef BIGDECIMAL_DEBUG
-# undef NDEBUG
-# define NDEBUG
-#endif
-#include <assert.h>
-
-#include <ctype.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <errno.h>
-#include <math.h>
-
-#ifdef HAVE_IEEEFP_H
-#include <ieeefp.h>
-#endif
-
-#include "bits.h"
-#include "static_assert.h"
-
-#define BIGDECIMAL_VERSION "3.1.4"
-
-/* #define ENABLE_NUMERIC_STRING */
-
-#define SIGNED_VALUE_MAX INTPTR_MAX
-#define SIGNED_VALUE_MIN INTPTR_MIN
-#define MUL_OVERFLOW_SIGNED_VALUE_P(a, b) MUL_OVERFLOW_SIGNED_INTEGER_P(a, b, SIGNED_VALUE_MIN, SIGNED_VALUE_MAX)
-
-VALUE rb_cBigDecimal;
-VALUE rb_mBigMath;
-
-static ID id_BigDecimal_exception_mode;
-static ID id_BigDecimal_rounding_mode;
-static ID id_BigDecimal_precision_limit;
-
-static ID id_up;
-static ID id_down;
-static ID id_truncate;
-static ID id_half_up;
-static ID id_default;
-static ID id_half_down;
-static ID id_half_even;
-static ID id_banker;
-static ID id_ceiling;
-static ID id_ceil;
-static ID id_floor;
-static ID id_to_r;
-static ID id_eq;
-static ID id_half;
-
-#define RBD_NUM_ROUNDING_MODES 11
-
-static struct {
-    ID id;
-    uint8_t mode;
-} rbd_rounding_modes[RBD_NUM_ROUNDING_MODES];
-
-/* MACRO's to guard objects from GC by keeping them in stack */
-#ifdef RBIMPL_ATTR_MAYBE_UNUSED
-#define ENTER(n) RBIMPL_ATTR_MAYBE_UNUSED() volatile VALUE vStack[n];int iStack=0
-#else
-#define ENTER(n) volatile VALUE RB_UNUSED_VAR(vStack[n]);int iStack=0
-#endif
-#define PUSH(x)  (vStack[iStack++] = (VALUE)(x))
-#define SAVE(p)  PUSH((p)->obj)
-#define GUARD_OBJ(p,y) ((p)=(y), SAVE(p))
-
-#define BASE_FIG  BIGDECIMAL_COMPONENT_FIGURES
-#define BASE      BIGDECIMAL_BASE
-
-#define HALF_BASE (BASE/2)
-#define BASE1 (BASE/10)
-
-#define LOG10_2 0.3010299956639812
-
-#ifndef RRATIONAL_ZERO_P
-# define RRATIONAL_ZERO_P(x) (FIXNUM_P(rb_rational_num(x)) && \
-			      FIX2LONG(rb_rational_num(x)) == 0)
-#endif
-
-#ifndef RRATIONAL_NEGATIVE_P
-# define RRATIONAL_NEGATIVE_P(x) RTEST(rb_funcall((x), '<', 1, INT2FIX(0)))
-#endif
-
-#ifndef DECIMAL_SIZE_OF_BITS
-#define DECIMAL_SIZE_OF_BITS(n) (((n) * 3010 + 9998) / 9999)
-/* an approximation of ceil(n * log10(2)), upto 65536 at least */
-#endif
-
-#ifdef PRIsVALUE
-# define RB_OBJ_CLASSNAME(obj) rb_obj_class(obj)
-# define RB_OBJ_STRING(obj) (obj)
-#else
-# define PRIsVALUE "s"
-# define RB_OBJ_CLASSNAME(obj) rb_obj_classname(obj)
-# define RB_OBJ_STRING(obj) StringValueCStr(obj)
-#endif
-
-#ifndef MAYBE_UNUSED
-# define MAYBE_UNUSED(x) x
-#endif
-
-#define BIGDECIMAL_POSITIVE_P(bd) ((bd)->sign > 0)
-#define BIGDECIMAL_NEGATIVE_P(bd) ((bd)->sign < 0)
-
-/*
- * ================== Memory allocation ============================
- */
-
-#ifdef BIGDECIMAL_DEBUG
-static size_t rbd_allocation_count = 0;   /* Memory allocation counter */
-static inline void
-atomic_allocation_count_inc(void)
-{
-    RUBY_ATOMIC_SIZE_INC(rbd_allocation_count);
-}
-static inline void
-atomic_allocation_count_dec_nounderflow(void)
-{
-    if (rbd_allocation_count == 0) return;
-    RUBY_ATOMIC_SIZE_DEC(rbd_allocation_count);
-}
-static void
-check_allocation_count_nonzero(void)
-{
-    if (rbd_allocation_count != 0) return;
-    rb_bug("[bigdecimal][rbd_free_struct] Too many memory free calls");
-}
-#else
-#   define atomic_allocation_count_inc() /* nothing */
-#   define atomic_allocation_count_dec_nounderflow() /* nothing */
-#   define check_allocation_count_nonzero() /* nothing */
-#endif /* BIGDECIMAL_DEBUG */
-
-PUREFUNC(static inline size_t rbd_struct_size(size_t const));
-
-static inline size_t
-rbd_struct_size(size_t const internal_digits)
-{
-    size_t const frac_len = (internal_digits == 0) ? 1 : internal_digits;
-    return offsetof(Real, frac) + frac_len * sizeof(DECDIG);
-}
-
-static inline Real *
-rbd_allocate_struct(size_t const internal_digits)
-{
-    size_t const size = rbd_struct_size(internal_digits);
-    Real *real = ruby_xcalloc(1, size);
-    atomic_allocation_count_inc();
-    real->MaxPrec = internal_digits;
-    return real;
-}
-
-static size_t
-rbd_calculate_internal_digits(size_t const digits, bool limit_precision)
-{
-    size_t const len = roomof(digits, BASE_FIG);
-    if (limit_precision) {
-        size_t const prec_limit = VpGetPrecLimit();
-        if (prec_limit > 0) {
-            /* NOTE: 2 more digits for rounding and division */
-            size_t const max_len = roomof(prec_limit, BASE_FIG) + 2;
-            if (len > max_len)
-                return max_len;
-        }
-    }
-
-    return len;
-}
-
-static inline Real *
-rbd_allocate_struct_decimal_digits(size_t const decimal_digits, bool limit_precision)
-{
-    size_t const internal_digits = rbd_calculate_internal_digits(decimal_digits, limit_precision);
-    return rbd_allocate_struct(internal_digits);
-}
-
-static VALUE BigDecimal_wrap_struct(VALUE obj, Real *vp);
-
-static Real *
-rbd_reallocate_struct(Real *real, size_t const internal_digits)
-{
-    size_t const size = rbd_struct_size(internal_digits);
-    VALUE obj = real ? real->obj : 0;
-    Real *new_real = (Real *)ruby_xrealloc(real, size);
-    new_real->MaxPrec = internal_digits;
-    if (obj) {
-        new_real->obj = 0;
-        BigDecimal_wrap_struct(obj, new_real);
-    }
-    return new_real;
-}
-
-static void
-rbd_free_struct(Real *real)
-{
-    if (real != NULL) {
-        check_allocation_count_nonzero();
-        ruby_xfree(real);
-        atomic_allocation_count_dec_nounderflow();
-    }
-}
-
-#define NewZero rbd_allocate_struct_zero
-static Real *
-rbd_allocate_struct_zero(int sign, size_t const digits, bool limit_precision)
-{
-    Real *real = rbd_allocate_struct_decimal_digits(digits, limit_precision);
-    VpSetZero(real, sign);
-    return real;
-}
-
-MAYBE_UNUSED(static inline Real * rbd_allocate_struct_zero_limited(int sign, size_t const digits));
-#define NewZeroLimited rbd_allocate_struct_zero_limited
-static inline Real *
-rbd_allocate_struct_zero_limited(int sign, size_t const digits)
-{
-    return rbd_allocate_struct_zero(sign, digits, true);
-}
-
-MAYBE_UNUSED(static inline Real * rbd_allocate_struct_zero_nolimit(int sign, size_t const digits));
-#define NewZeroNolimit rbd_allocate_struct_zero_nolimit
-static inline Real *
-rbd_allocate_struct_zero_nolimit(int sign, size_t const digits)
-{
-    return rbd_allocate_struct_zero(sign, digits, false);
-}
-
-#define NewOne rbd_allocate_struct_one
-static Real *
-rbd_allocate_struct_one(int sign, size_t const digits, bool limit_precision)
-{
-    Real *real = rbd_allocate_struct_decimal_digits(digits, limit_precision);
-    VpSetOne(real);
-    if (sign < 0)
-        VpSetSign(real, VP_SIGN_NEGATIVE_FINITE);
-    return real;
-}
-
-MAYBE_UNUSED(static inline Real * rbd_allocate_struct_one_limited(int sign, size_t const digits));
-#define NewOneLimited rbd_allocate_struct_one_limited
-static inline Real *
-rbd_allocate_struct_one_limited(int sign, size_t const digits)
-{
-    return rbd_allocate_struct_one(sign, digits, true);
-}
-
-MAYBE_UNUSED(static inline Real * rbd_allocate_struct_one_nolimit(int sign, size_t const digits));
-#define NewOneNolimit rbd_allocate_struct_one_nolimit
-static inline Real *
-rbd_allocate_struct_one_nolimit(int sign, size_t const digits)
-{
-    return rbd_allocate_struct_one(sign, digits, false);
-}
-
-/*
- * ================== Ruby Interface part ==========================
- */
-#define DoSomeOne(x,y,f) rb_num_coerce_bin(x,y,f)
-
-/*
- *   VP routines used in BigDecimal part
- */
-static unsigned short VpGetException(void);
-static void  VpSetException(unsigned short f);
-static void VpCheckException(Real *p, bool always);
-static VALUE VpCheckGetValue(Real *p);
-static void  VpInternalRound(Real *c, size_t ixDigit, DECDIG vPrev, DECDIG v);
-static int   VpLimitRound(Real *c, size_t ixDigit);
-static Real *VpCopy(Real *pv, Real const* const x);
-static int VPrint(FILE *fp,const char *cntl_chr,Real *a);
-
-/*
- *  **** BigDecimal part ****
- */
-
-static VALUE BigDecimal_nan(void);
-static VALUE BigDecimal_positive_infinity(void);
-static VALUE BigDecimal_negative_infinity(void);
-static VALUE BigDecimal_positive_zero(void);
-static VALUE BigDecimal_negative_zero(void);
-
-static void
-BigDecimal_delete(void *pv)
-{
-    rbd_free_struct(pv);
-}
-
-static size_t
-BigDecimal_memsize(const void *ptr)
-{
-    const Real *pv = ptr;
-    return (sizeof(*pv) + pv->MaxPrec * sizeof(DECDIG));
-}
-
-#ifndef HAVE_RB_EXT_RACTOR_SAFE
-#   undef RUBY_TYPED_FROZEN_SHAREABLE
-#   define RUBY_TYPED_FROZEN_SHAREABLE 0
-#endif
-
-static const rb_data_type_t BigDecimal_data_type = {
-    "BigDecimal",
-    { 0, BigDecimal_delete, BigDecimal_memsize, },
-#ifdef RUBY_TYPED_FREE_IMMEDIATELY
-    0, 0, RUBY_TYPED_FREE_IMMEDIATELY | RUBY_TYPED_FROZEN_SHAREABLE | RUBY_TYPED_WB_PROTECTED
-#endif
-};
-
-static Real *
-rbd_allocate_struct_zero_wrap_klass(VALUE klass, int sign, size_t const digits, bool limit_precision)
-{
-    Real *real = rbd_allocate_struct_zero(sign, digits, limit_precision);
-    if (real != NULL) {
-        VALUE obj = TypedData_Wrap_Struct(klass, &BigDecimal_data_type, 0);
-        BigDecimal_wrap_struct(obj, real);
-    }
-    return real;
-}
-
-MAYBE_UNUSED(static inline Real * rbd_allocate_struct_zero_limited_wrap(int sign, size_t const digits));
-#define NewZeroWrapLimited rbd_allocate_struct_zero_limited_wrap
-static inline Real *
-rbd_allocate_struct_zero_limited_wrap(int sign, size_t const digits)
-{
-    return rbd_allocate_struct_zero_wrap_klass(rb_cBigDecimal, sign, digits, true);
-}
-
-MAYBE_UNUSED(static inline Real * rbd_allocate_struct_zero_nolimit_wrap(int sign, size_t const digits));
-#define NewZeroWrapNolimit rbd_allocate_struct_zero_nolimit_wrap
-static inline Real *
-rbd_allocate_struct_zero_nolimit_wrap(int sign, size_t const digits)
-{
-    return rbd_allocate_struct_zero_wrap_klass(rb_cBigDecimal, sign, digits, false);
-}
-
-static Real *
-rbd_allocate_struct_one_wrap_klass(VALUE klass, int sign, size_t const digits, bool limit_precision)
-{
-    Real *real = rbd_allocate_struct_one(sign, digits, limit_precision);
-    if (real != NULL) {
-        VALUE obj = TypedData_Wrap_Struct(klass, &BigDecimal_data_type, 0);
-        BigDecimal_wrap_struct(obj, real);
-    }
-    return real;
-}
-
-MAYBE_UNUSED(static inline Real * rbd_allocate_struct_one_limited_wrap(int sign, size_t const digits));
-#define NewOneWrapLimited rbd_allocate_struct_one_limited_wrap
-static inline Real *
-rbd_allocate_struct_one_limited_wrap(int sign, size_t const digits)
-{
-    return rbd_allocate_struct_one_wrap_klass(rb_cBigDecimal, sign, digits, true);
-}
-
-MAYBE_UNUSED(static inline Real * rbd_allocate_struct_one_nolimit_wrap(int sign, size_t const digits));
-#define NewOneWrapNolimit rbd_allocate_struct_one_nolimit_wrap
-static inline Real *
-rbd_allocate_struct_one_nolimit_wrap(int sign, size_t const digits)
-{
-    return rbd_allocate_struct_one_wrap_klass(rb_cBigDecimal, sign, digits, false);
-}
-
-static inline int
-is_kind_of_BigDecimal(VALUE const v)
-{
-    return rb_typeddata_is_kind_of(v, &BigDecimal_data_type);
-}
-
-NORETURN(static void cannot_be_coerced_into_BigDecimal(VALUE, VALUE));
-
-static void
-cannot_be_coerced_into_BigDecimal(VALUE exc_class, VALUE v)
-{
-    VALUE str;
-
-    if (rb_special_const_p(v)) {
-	str = rb_inspect(v);
-    }
-    else {
-	str = rb_class_name(rb_obj_class(v));
-    }
-
-    str = rb_str_cat2(rb_str_dup(str), " can't be coerced into BigDecimal");
-    rb_exc_raise(rb_exc_new3(exc_class, str));
-}
-
-static inline VALUE BigDecimal_div2(VALUE, VALUE, VALUE);
-static VALUE rb_inum_convert_to_BigDecimal(VALUE val, size_t digs, int raise_exception);
-static VALUE rb_float_convert_to_BigDecimal(VALUE val, size_t digs, int raise_exception);
-static VALUE rb_rational_convert_to_BigDecimal(VALUE val, size_t digs, int raise_exception);
-static VALUE rb_cstr_convert_to_BigDecimal(const char *c_str, size_t digs, int raise_exception);
-static VALUE rb_convert_to_BigDecimal(VALUE val, size_t digs, int raise_exception);
-
-static Real*
-GetVpValueWithPrec(VALUE v, long prec, int must)
-{
-    const size_t digs = prec < 0 ? SIZE_MAX : (size_t)prec;
-
-    switch(TYPE(v)) {
-      case T_FLOAT:
-        v = rb_float_convert_to_BigDecimal(v, digs, must);
-        break;
-
-      case T_RATIONAL:
-        v = rb_rational_convert_to_BigDecimal(v, digs, must);
-        break;
-
-      case T_DATA:
-        if (!is_kind_of_BigDecimal(v)) {
-            goto SomeOneMayDoIt;
-        }
-        break;
-
-      case T_FIXNUM: {
-        char szD[128];
-        snprintf(szD, 128, "%ld", FIX2LONG(v));
-        v = rb_cstr_convert_to_BigDecimal(szD, VpBaseFig() * 2 + 1, must);
-        break;
-      }
-
-#ifdef ENABLE_NUMERIC_STRING
-      case T_STRING: {
-        const char *c_str = StringValueCStr(v);
-        v = rb_cstr_convert_to_BigDecimal(c_str, RSTRING_LEN(v) + VpBaseFig() + 1, must);
-        break;
-      }
-#endif /* ENABLE_NUMERIC_STRING */
-
-      case T_BIGNUM: {
-	VALUE bg = rb_big2str(v, 10);
-        v = rb_cstr_convert_to_BigDecimal(RSTRING_PTR(bg), RSTRING_LEN(bg) + VpBaseFig() + 1, must);
-        RB_GC_GUARD(bg);
-        break;
-      }
-
-      default:
-	goto SomeOneMayDoIt;
-    }
-
-    Real *vp;
-    TypedData_Get_Struct(v, Real, &BigDecimal_data_type, vp);
-    return vp;
-
-SomeOneMayDoIt:
-    if (must) {
-	cannot_be_coerced_into_BigDecimal(rb_eTypeError, v);
-    }
-    return NULL; /* NULL means to coerce */
-}
-
-static inline Real*
-GetVpValue(VALUE v, int must)
-{
-    return GetVpValueWithPrec(v, -1, must);
-}
-
-/* call-seq:
- *   BigDecimal.double_fig -> integer
- *
- *  Returns the number of digits a Float object is allowed to have;
- *  the result is system-dependent:
- *
- *    BigDecimal.double_fig # => 16
- *
- */
-static inline VALUE
-BigDecimal_double_fig(VALUE self)
-{
-    return INT2FIX(VpDblFig());
-}
-
-/*  call-seq:
- *    precs -> array
- *
- *  Returns an Array of two Integer values that represent platform-dependent
- *  internal storage properties.
- *
- *  This method is deprecated and will be removed in the future.
- *  Instead, use BigDecimal#n_significant_digits for obtaining the number of
- *  significant digits in scientific notation, and BigDecimal#precision for
- *  obtaining the number of digits in decimal notation.
- *
- */
-
-static VALUE
-BigDecimal_prec(VALUE self)
-{
-    ENTER(1);
-    Real *p;
-    VALUE obj;
-
-    rb_category_warn(RB_WARN_CATEGORY_DEPRECATED,
-                     "BigDecimal#precs is deprecated and will be removed in the future; "
-                     "use BigDecimal#precision instead.");
-
-    GUARD_OBJ(p, GetVpValue(self, 1));
-    obj = rb_assoc_new(SIZET2NUM(p->Prec*VpBaseFig()),
-		       SIZET2NUM(p->MaxPrec*VpBaseFig()));
-    return obj;
-}
-
-static void
-BigDecimal_count_precision_and_scale(VALUE self, ssize_t *out_precision, ssize_t *out_scale)
-{
-    ENTER(1);
-
-    if (out_precision == NULL && out_scale == NULL)
-        return;
-
-    Real *p;
-    GUARD_OBJ(p, GetVpValue(self, 1));
-    if (VpIsZero(p) || !VpIsDef(p)) {
-      zero:
-        if (out_precision) *out_precision = 0;
-        if (out_scale) *out_scale = 0;
-        return;
-    }
-
-    DECDIG x;
-
-    ssize_t n = p->Prec; /* The length of frac without zeros. */
-    while (n > 0 && p->frac[n-1] == 0) --n;
-    if (n == 0) goto zero;
-
-    int nlz = BASE_FIG;
-    for (x = p->frac[0]; x > 0; x /= 10) --nlz;
-
-    int ntz = 0;
-    for (x = p->frac[n-1]; x > 0 && x % 10 == 0; x /= 10) ++ntz;
-
-    /*
-     * Calculate the precision and the scale
-     * -------------------------------------
-     *
-     * The most significant digit is frac[0], and the least significant digit
-     * is frac[Prec-1].  When the exponent is zero, the decimal point is
-     * located just before frac[0].
-     *
-     * When the exponent is negative, the decimal point moves to leftward.
-     * In this case, the precision can be calculated by
-     *
-     *   precision = BASE_FIG * (-exponent + n) - ntz,
-     *
-     * and the scale is the same as precision.
-     *
-     *       0 . 0000 0000 | frac[0] ... frac[n-1] |
-     *         |<----------| exponent == -2        |
-     *         |---------------------------------->| precision
-     *         |---------------------------------->| scale
-     *
-     *
-     * Conversely, when the exponent is positive, the decimal point moves to
-     * rightward.  In this case, the scale equals to
-     *
-     *   BASE_FIG * (n - exponent) - ntz.
-     *
-     * the precision equals to
-     *
-     *   scale + BASE_FIG * exponent - nlz.
-     *
-     *       | frac[0] frac[1] . frac[2] ... frac[n-1] |
-     *       |---------------->| exponent == 2         |
-     *       |                 |---------------------->| scale
-     *       |---------------------------------------->| precision
-     */
-
-    ssize_t ex = p->exponent;
-
-    /* Count the number of decimal digits before frac[1]. */
-    ssize_t n_digits_head = BASE_FIG;
-    if (ex < 0) {
-      n_digits_head += (-ex) * BASE_FIG;  /* The number of leading zeros before frac[0]. */
-      ex = 0;
-    }
-    else if (ex > 0) {
-      /* Count the number of decimal digits without the leading zeros in
-       * the most significant digit in the integral part.
-       */
-      n_digits_head -= nlz;  /* Make the number of digits */
-    }
-
-    if (out_precision) {
-        ssize_t precision = n_digits_head;
-
-        /* Count the number of decimal digits after frac[0]. */
-        if (ex > (ssize_t)n) {
-          /* In this case the number is an integer with some trailing zeros. */
-          precision += (ex - 1) * BASE_FIG;
-        }
-        else if (n > 0) {
-          precision += (n - 1) * BASE_FIG;
-
-          if (ex < (ssize_t)n) {
-            precision -= ntz;
-          }
-        }
-
-        *out_precision = precision;
-    }
-
-    if (out_scale) {
-        ssize_t scale = 0;
-
-        if (p->exponent < 0) {
-            scale = n_digits_head + (n - 1) * BASE_FIG - ntz;
-        }
-        else if (n > p->exponent) {
-            scale = (n - p->exponent) * BASE_FIG - ntz;
-        }
-
-        *out_scale = scale;
-    }
-}
-
-/*
- *  call-seq:
- *    precision -> integer
- *
- *  Returns the number of decimal digits in +self+:
- *
- *    BigDecimal("0").precision         # => 0
- *    BigDecimal("1").precision         # => 1
- *    BigDecimal("1.1").precision       # => 2
- *    BigDecimal("3.1415").precision    # => 5
- *    BigDecimal("-1e20").precision     # => 21
- *    BigDecimal("1e-20").precision     # => 20
- *    BigDecimal("Infinity").precision  # => 0
- *    BigDecimal("-Infinity").precision # => 0
- *    BigDecimal("NaN").precision       # => 0
- *
- */
-static VALUE
-BigDecimal_precision(VALUE self)
-{
-    ssize_t precision;
-    BigDecimal_count_precision_and_scale(self, &precision, NULL);
-    return SSIZET2NUM(precision);
-}
-
-/*
- *  call-seq:
- *    scale -> integer
- *
- *  Returns the number of decimal digits following the decimal digits in +self+.
- *
- *    BigDecimal("0").scale         # => 0
- *    BigDecimal("1").scale         # => 1
- *    BigDecimal("1.1").scale       # => 1
- *    BigDecimal("3.1415").scale    # => 4
- *    BigDecimal("-1e20").precision # => 0
- *    BigDecimal("1e-20").precision # => 20
- *    BigDecimal("Infinity").scale  # => 0
- *    BigDecimal("-Infinity").scale # => 0
- *    BigDecimal("NaN").scale       # => 0
- */
-static VALUE
-BigDecimal_scale(VALUE self)
-{
-    ssize_t scale;
-    BigDecimal_count_precision_and_scale(self, NULL, &scale);
-    return SSIZET2NUM(scale);
-}
-
-/*
- *  call-seq:
- *    precision_scale -> [integer, integer]
- *
- *  Returns a 2-length array; the first item is the result of
- *  BigDecimal#precision and the second one is of BigDecimal#scale.
- *
- *  See BigDecimal#precision.
- *  See BigDecimal#scale.
- */
-static VALUE
-BigDecimal_precision_scale(VALUE self)
-{
-    ssize_t precision, scale;
-    BigDecimal_count_precision_and_scale(self, &precision, &scale);
-    return rb_assoc_new(SSIZET2NUM(precision), SSIZET2NUM(scale));
-}
-
-/*
- *  call-seq:
- *    n_significant_digits -> integer
- *
- *  Returns the number of decimal significant digits in +self+.
- *
- *    BigDecimal("0").n_significant_digits         # => 0
- *    BigDecimal("1").n_significant_digits         # => 1
- *    BigDecimal("1.1").n_significant_digits       # => 2
- *    BigDecimal("3.1415").n_significant_digits    # => 5
- *    BigDecimal("-1e20").n_significant_digits     # => 1
- *    BigDecimal("1e-20").n_significant_digits     # => 1
- *    BigDecimal("Infinity").n_significant_digits  # => 0
- *    BigDecimal("-Infinity").n_significant_digits # => 0
- *    BigDecimal("NaN").n_significant_digits       # => 0
- */
-static VALUE
-BigDecimal_n_significant_digits(VALUE self)
-{
-    ENTER(1);
-
-    Real *p;
-    GUARD_OBJ(p, GetVpValue(self, 1));
-    if (VpIsZero(p) || !VpIsDef(p)) {
-        return INT2FIX(0);
-    }
-
-    ssize_t n = p->Prec;  /* The length of frac without trailing zeros. */
-    for (n = p->Prec; n > 0 && p->frac[n-1] == 0; --n);
-    if (n == 0) return INT2FIX(0);
-
-    DECDIG x;
-    int nlz = BASE_FIG;
-    for (x = p->frac[0]; x > 0; x /= 10) --nlz;
-
-    int ntz = 0;
-    for (x = p->frac[n-1]; x > 0 && x % 10 == 0; x /= 10) ++ntz;
-
-    ssize_t n_significant_digits = BASE_FIG*n - nlz - ntz;
-    return SSIZET2NUM(n_significant_digits);
-}
-
-/*
- *  call-seq:
- *    hash -> integer
- *
- *  Returns the integer hash value for +self+.
- *
- *  Two instances of \BigDecimal have the same hash value if and only if
- *  they have equal:
- *
- *  - Sign.
- *  - Fractional part.
- *  - Exponent.
- *
- */
-static VALUE
-BigDecimal_hash(VALUE self)
-{
-    ENTER(1);
-    Real *p;
-    st_index_t hash;
-
-    GUARD_OBJ(p, GetVpValue(self, 1));
-    hash = (st_index_t)p->sign;
-    /* hash!=2: the case for 0(1),NaN(0) or +-Infinity(3) is sign itself */
-    if(hash == 2 || hash == (st_index_t)-2) {
-        hash ^= rb_memhash(p->frac, sizeof(DECDIG)*p->Prec);
-        hash += p->exponent;
-    }
-    return ST2FIX(hash);
-}
-
-/*
- *  call-seq:
- *    _dump -> string
- *
- *  Returns a string representing the marshalling of +self+.
- *  See module Marshal.
- *
- *    inf = BigDecimal('Infinity') # => Infinity
- *    dumped = inf._dump           # => "9:Infinity"
- *    BigDecimal._load(dumped)     # => Infinity
- *
- */
-static VALUE
-BigDecimal_dump(int argc, VALUE *argv, VALUE self)
-{
-    ENTER(5);
-    Real *vp;
-    char *psz;
-    VALUE dummy;
-    volatile VALUE dump;
-    size_t len;
-
-    rb_scan_args(argc, argv, "01", &dummy);
-    GUARD_OBJ(vp,GetVpValue(self, 1));
-    dump = rb_str_new(0, VpNumOfChars(vp, "E")+50);
-    psz = RSTRING_PTR(dump);
-    snprintf(psz, RSTRING_LEN(dump), "%"PRIuSIZE":", VpMaxPrec(vp)*VpBaseFig());
-    len = strlen(psz);
-    VpToString(vp, psz+len, RSTRING_LEN(dump)-len, 0, 0);
-    rb_str_resize(dump, strlen(psz));
-    return dump;
-}
-
-/*
- * Internal method used to provide marshalling support. See the Marshal module.
- */
-static VALUE
-BigDecimal_load(VALUE self, VALUE str)
-{
-    ENTER(2);
-    Real *pv;
-    unsigned char *pch;
-    unsigned char ch;
-    unsigned long m=0;
-
-    pch = (unsigned char *)StringValueCStr(str);
-    /* First get max prec */
-    while((*pch) != (unsigned char)'\0' && (ch = *pch++) != (unsigned char)':') {
-        if(!ISDIGIT(ch)) {
-            rb_raise(rb_eTypeError, "load failed: invalid character in the marshaled string");
-        }
-        m = m*10 + (unsigned long)(ch-'0');
-    }
-    if (m > VpBaseFig()) m -= VpBaseFig();
-    GUARD_OBJ(pv, VpNewRbClass(m, (char *)pch, self, true, true));
-    m /= VpBaseFig();
-    if (m && pv->MaxPrec > m) {
-	pv->MaxPrec = m+1;
-    }
-    return VpCheckGetValue(pv);
-}
-
-static unsigned short
-check_rounding_mode_option(VALUE const opts)
-{
-    VALUE mode;
-    char const *s;
-    long l;
-
-    assert(RB_TYPE_P(opts, T_HASH));
-
-    if (NIL_P(opts))
-        goto no_opt;
-
-    mode = rb_hash_lookup2(opts, ID2SYM(id_half), Qundef);
-    if (mode == Qundef || NIL_P(mode))
-        goto no_opt;
-
-    if (SYMBOL_P(mode))
-        mode = rb_sym2str(mode);
-    else if (!RB_TYPE_P(mode, T_STRING)) {
-        VALUE str_mode = rb_check_string_type(mode);
-        if (NIL_P(str_mode))
-            goto invalid;
-        mode = str_mode;
-    }
-    s = RSTRING_PTR(mode);
-    l = RSTRING_LEN(mode);
-    switch (l) {
-      case 2:
-        if (strncasecmp(s, "up", 2) == 0)
-            return VP_ROUND_HALF_UP;
-        break;
-      case 4:
-        if (strncasecmp(s, "even", 4) == 0)
-            return VP_ROUND_HALF_EVEN;
-        else if (strncasecmp(s, "down", 4) == 0)
-            return VP_ROUND_HALF_DOWN;
-        break;
-      default:
-        break;
-    }
-
-  invalid:
-    rb_raise(rb_eArgError, "invalid rounding mode (%"PRIsVALUE")", mode);
-
-  no_opt:
-    return VpGetRoundMode();
-}
-
-static unsigned short
-check_rounding_mode(VALUE const v)
-{
-    unsigned short sw;
-    ID id;
-    if (RB_TYPE_P(v, T_SYMBOL)) {
-        int i;
-        id = SYM2ID(v);
-        for (i = 0; i < RBD_NUM_ROUNDING_MODES; ++i) {
-            if (rbd_rounding_modes[i].id == id) {
-                return rbd_rounding_modes[i].mode;
-            }
-        }
-        rb_raise(rb_eArgError, "invalid rounding mode (%"PRIsVALUE")", v);
-    }
-    else {
-        sw = NUM2USHORT(v);
-        if (!VpIsRoundMode(sw)) {
-            rb_raise(rb_eArgError, "invalid rounding mode (%"PRIsVALUE")", v);
-        }
-        return sw;
-    }
-}
-
-/*  call-seq:
- *    BigDecimal.mode(mode, setting = nil) -> integer
- *
- *  Returns an integer representing the mode settings
- *  for exception handling and rounding.
- *
- *  These modes control exception handling:
- *
- *  - \BigDecimal::EXCEPTION_NaN.
- *  - \BigDecimal::EXCEPTION_INFINITY.
- *  - \BigDecimal::EXCEPTION_UNDERFLOW.
- *  - \BigDecimal::EXCEPTION_OVERFLOW.
- *  - \BigDecimal::EXCEPTION_ZERODIVIDE.
- *  - \BigDecimal::EXCEPTION_ALL.
- *
- *  Values for +setting+ for exception handling:
- *
- *  - +true+: sets the given +mode+ to +true+.
- *  - +false+: sets the given +mode+ to +false+.
- *  - +nil+: does not modify the mode settings.
- *
- *  You can use method BigDecimal.save_exception_mode
- *  to temporarily change, and then automatically restore, exception modes.
- *
- *  For clarity, some examples below begin by setting all
- *  exception modes to +false+.
- *
- *  This mode controls the way rounding is to be performed:
- *
- *  - \BigDecimal::ROUND_MODE
- *
- *  You can use method BigDecimal.save_rounding_mode
- *  to temporarily change, and then automatically restore, the rounding mode.
- *
- *  <b>NaNs</b>
- *
- *  Mode \BigDecimal::EXCEPTION_NaN controls behavior
- *  when a \BigDecimal NaN is created.
- *
- *  Settings:
- *
- *  - +false+ (default): Returns <tt>BigDecimal('NaN')</tt>.
- *  - +true+: Raises FloatDomainError.
- *
- *  Examples:
- *
- *    BigDecimal.mode(BigDecimal::EXCEPTION_ALL, false) # => 0
- *    BigDecimal('NaN')                                 # => NaN
- *    BigDecimal.mode(BigDecimal::EXCEPTION_NaN, true)  # => 2
- *    BigDecimal('NaN') # Raises FloatDomainError
- *
- *  <b>Infinities</b>
- *
- *  Mode \BigDecimal::EXCEPTION_INFINITY controls behavior
- *  when a \BigDecimal Infinity or -Infinity is created.
- *  Settings:
- *
- *  - +false+ (default): Returns <tt>BigDecimal('Infinity')</tt>
- *    or <tt>BigDecimal('-Infinity')</tt>.
- *  - +true+: Raises FloatDomainError.
- *
- *  Examples:
- *
- *    BigDecimal.mode(BigDecimal::EXCEPTION_ALL, false)     # => 0
- *    BigDecimal('Infinity')                                # => Infinity
- *    BigDecimal('-Infinity')                               # => -Infinity
- *    BigDecimal.mode(BigDecimal::EXCEPTION_INFINITY, true) # => 1
- *    BigDecimal('Infinity')  # Raises FloatDomainError
- *    BigDecimal('-Infinity') # Raises FloatDomainError
- *
- *  <b>Underflow</b>
- *
- *  Mode \BigDecimal::EXCEPTION_UNDERFLOW controls behavior
- *  when a \BigDecimal underflow occurs.
- *  Settings:
- *
- *  - +false+ (default): Returns <tt>BigDecimal('0')</tt>
- *    or <tt>BigDecimal('-Infinity')</tt>.
- *  - +true+: Raises FloatDomainError.
- *
- *  Examples:
- *
- *    BigDecimal.mode(BigDecimal::EXCEPTION_ALL, false)      # => 0
- *    def flow_under
- *      x = BigDecimal('0.1')
- *      100.times { x *= x }
- *    end
- *    flow_under                                             # => 100
- *    BigDecimal.mode(BigDecimal::EXCEPTION_UNDERFLOW, true) # => 4
- *    flow_under # Raises FloatDomainError
- *
- *  <b>Overflow</b>
- *
- *  Mode \BigDecimal::EXCEPTION_OVERFLOW controls behavior
- *  when a \BigDecimal overflow occurs.
- *  Settings:
- *
- *  - +false+ (default): Returns <tt>BigDecimal('Infinity')</tt>
- *    or <tt>BigDecimal('-Infinity')</tt>.
- *  - +true+: Raises FloatDomainError.
- *
- *  Examples:
- *
- *    BigDecimal.mode(BigDecimal::EXCEPTION_ALL, false)     # => 0
- *    def flow_over
- *      x = BigDecimal('10')
- *      100.times { x *= x }
- *    end
- *    flow_over                                             # => 100
- *    BigDecimal.mode(BigDecimal::EXCEPTION_OVERFLOW, true) # => 1
- *    flow_over # Raises FloatDomainError
- *
- *  <b>Zero Division</b>
- *
- *  Mode \BigDecimal::EXCEPTION_ZERODIVIDE controls behavior
- *  when a zero-division occurs.
- *  Settings:
- *
- *  - +false+ (default): Returns <tt>BigDecimal('Infinity')</tt>
- *    or <tt>BigDecimal('-Infinity')</tt>.
- *  - +true+: Raises FloatDomainError.
- *
- *  Examples:
- *
- *    BigDecimal.mode(BigDecimal::EXCEPTION_ALL, false)       # => 0
- *    one = BigDecimal('1')
- *    zero = BigDecimal('0')
- *    one / zero                                              # => Infinity
- *    BigDecimal.mode(BigDecimal::EXCEPTION_ZERODIVIDE, true) # => 16
- *    one / zero # Raises FloatDomainError
- *
- *  <b>All Exceptions</b>
- *
- *  Mode \BigDecimal::EXCEPTION_ALL controls all of the above:
- *
- *    BigDecimal.mode(BigDecimal::EXCEPTION_ALL, false) # => 0
- *    BigDecimal.mode(BigDecimal::EXCEPTION_ALL, true)  # => 23
- *
- *  <b>Rounding</b>
- *
- *  Mode \BigDecimal::ROUND_MODE controls the way rounding is to be performed;
- *  its +setting+ values are:
- *
- *  - +ROUND_UP+: Round away from zero.
- *    Aliased as +:up+.
- *  - +ROUND_DOWN+: Round toward zero.
- *    Aliased as +:down+ and +:truncate+.
- *  - +ROUND_HALF_UP+: Round toward the nearest neighbor;
- *    if the neighbors are equidistant, round away from zero.
- *    Aliased as +:half_up+ and +:default+.
- *  - +ROUND_HALF_DOWN+: Round toward the nearest neighbor;
- *    if the neighbors are equidistant, round toward zero.
- *    Aliased as +:half_down+.
- *  - +ROUND_HALF_EVEN+ (Banker's rounding): Round toward the nearest neighbor;
- *    if the neighbors are equidistant, round toward the even neighbor.
- *    Aliased as +:half_even+ and +:banker+.
- *  - +ROUND_CEILING+: Round toward positive infinity.
- *    Aliased as +:ceiling+ and +:ceil+.
- *  - +ROUND_FLOOR+: Round toward negative infinity.
- *    Aliased as +:floor:+.
- *
- */
-static VALUE
-BigDecimal_mode(int argc, VALUE *argv, VALUE self)
-{
-    VALUE which;
-    VALUE val;
-    unsigned long f,fo;
-
-    rb_scan_args(argc, argv, "11", &which, &val);
-    f = (unsigned long)NUM2INT(which);
-
-    if (f & VP_EXCEPTION_ALL) {
-	/* Exception mode setting */
-	fo = VpGetException();
-	if (val == Qnil) return INT2FIX(fo);
-	if (val != Qfalse && val!=Qtrue) {
-	    rb_raise(rb_eArgError, "second argument must be true or false");
-	    return Qnil; /* Not reached */
-	}
-	if (f & VP_EXCEPTION_INFINITY) {
-	    VpSetException((unsigned short)((val == Qtrue) ? (fo | VP_EXCEPTION_INFINITY) :
-			(fo & (~VP_EXCEPTION_INFINITY))));
-	}
-	fo = VpGetException();
-	if (f & VP_EXCEPTION_NaN) {
-	    VpSetException((unsigned short)((val == Qtrue) ? (fo | VP_EXCEPTION_NaN) :
-			(fo & (~VP_EXCEPTION_NaN))));
-	}
-	fo = VpGetException();
-	if (f & VP_EXCEPTION_UNDERFLOW) {
-	    VpSetException((unsigned short)((val == Qtrue) ? (fo | VP_EXCEPTION_UNDERFLOW) :
-			(fo & (~VP_EXCEPTION_UNDERFLOW))));
-	}
-	fo = VpGetException();
-	if(f & VP_EXCEPTION_ZERODIVIDE) {
-	    VpSetException((unsigned short)((val == Qtrue) ? (fo | VP_EXCEPTION_ZERODIVIDE) :
-			(fo & (~VP_EXCEPTION_ZERODIVIDE))));
-	}
-	fo = VpGetException();
-	return INT2FIX(fo);
-    }
-    if (VP_ROUND_MODE == f) {
-	/* Rounding mode setting */
-	unsigned short sw;
-	fo = VpGetRoundMode();
-	if (NIL_P(val)) return INT2FIX(fo);
-	sw = check_rounding_mode(val);
-	fo = VpSetRoundMode(sw);
-	return INT2FIX(fo);
-    }
-    rb_raise(rb_eTypeError, "first argument for BigDecimal.mode invalid");
-    return Qnil;
-}
-
-static size_t
-GetAddSubPrec(Real *a, Real *b)
-{
-    size_t mxs;
-    size_t mx = a->Prec;
-    SIGNED_VALUE d;
-
-    if (!VpIsDef(a) || !VpIsDef(b)) return (size_t)-1L;
-    if (mx < b->Prec) mx = b->Prec;
-    if (a->exponent != b->exponent) {
-	mxs = mx;
-	d = a->exponent - b->exponent;
-	if (d < 0) d = -d;
-	mx = mx + (size_t)d;
-	if (mx < mxs) {
-	    return VpException(VP_EXCEPTION_INFINITY, "Exponent overflow", 0);
-	}
-    }
-    return mx;
-}
-
-static inline SIGNED_VALUE
-check_int_precision(VALUE v)
-{
-    SIGNED_VALUE n;
-#if SIZEOF_VALUE <= SIZEOF_LONG
-    n = (SIGNED_VALUE)NUM2LONG(v);
-#elif SIZEOF_VALUE <= SIZEOF_LONG_LONG
-    n = (SIGNED_VALUE)NUM2LL(v);
-#else
-#   error SIZEOF_VALUE is too large
-#endif
-    if (n < 0) {
-	rb_raise(rb_eArgError, "negative precision");
-    }
-    return n;
-}
-
-static VALUE
-BigDecimal_wrap_struct(VALUE obj, Real *vp)
-{
-    assert(is_kind_of_BigDecimal(obj));
-    assert(vp != NULL);
-
-    if (vp->obj == obj && RTYPEDDATA_DATA(obj) == vp)
-        return obj;
-
-    assert(RTYPEDDATA_DATA(obj) == NULL);
-    assert(vp->obj == 0);
-
-    RTYPEDDATA_DATA(obj) = vp;
-    vp->obj = obj;
-    RB_OBJ_FREEZE(obj);
-    return obj;
-}
-
-VP_EXPORT Real *
-VpNewRbClass(size_t mx, const char *str, VALUE klass, bool strict_p, bool raise_exception)
-{
-    VALUE obj = TypedData_Wrap_Struct(klass, &BigDecimal_data_type, 0);
-    Real *pv = VpAlloc(mx, str, strict_p, raise_exception);
-    if (!pv)
-        return NULL;
-    BigDecimal_wrap_struct(obj, pv);
-    return pv;
-}
-
-VP_EXPORT Real *
-VpCreateRbObject(size_t mx, const char *str, bool raise_exception)
-{
-    return VpNewRbClass(mx, str, rb_cBigDecimal, true, raise_exception);
-}
-
-static Real *
-VpCopy(Real *pv, Real const* const x)
-{
-    assert(x != NULL);
-
-    pv = rbd_reallocate_struct(pv, x->MaxPrec);
-    pv->MaxPrec = x->MaxPrec;
-    pv->Prec = x->Prec;
-    pv->exponent = x->exponent;
-    pv->sign = x->sign;
-    pv->flag = x->flag;
-    MEMCPY(pv->frac, x->frac, DECDIG, pv->MaxPrec);
-
-    return pv;
-}
-
-/* Returns True if the value is Not a Number. */
-static VALUE
-BigDecimal_IsNaN(VALUE self)
-{
-    Real *p = GetVpValue(self, 1);
-    if (VpIsNaN(p))  return Qtrue;
-    return Qfalse;
-}
-
-/* Returns nil, -1, or +1 depending on whether the value is finite,
- * -Infinity, or +Infinity.
- */
-static VALUE
-BigDecimal_IsInfinite(VALUE self)
-{
-    Real *p = GetVpValue(self, 1);
-    if (VpIsPosInf(p)) return INT2FIX(1);
-    if (VpIsNegInf(p)) return INT2FIX(-1);
-    return Qnil;
-}
-
-/* Returns True if the value is finite (not NaN or infinite). */
-static VALUE
-BigDecimal_IsFinite(VALUE self)
-{
-    Real *p = GetVpValue(self, 1);
-    if (VpIsNaN(p)) return Qfalse;
-    if (VpIsInf(p)) return Qfalse;
-    return Qtrue;
-}
-
-static void
-BigDecimal_check_num(Real *p)
-{
-    VpCheckException(p, true);
-}
-
-static VALUE BigDecimal_split(VALUE self);
-
-/* Returns the value as an Integer.
- *
- * If the BigDecimal is infinity or NaN, raises FloatDomainError.
- */
-static VALUE
-BigDecimal_to_i(VALUE self)
-{
-    ENTER(5);
-    ssize_t e, nf;
-    Real *p;
-
-    GUARD_OBJ(p, GetVpValue(self, 1));
-    BigDecimal_check_num(p);
-
-    e = VpExponent10(p);
-    if (e <= 0) return INT2FIX(0);
-    nf = VpBaseFig();
-    if (e <= nf) {
-        return LONG2NUM((long)(VpGetSign(p) * (DECDIG_DBL_SIGNED)p->frac[0]));
-    }
-    else {
-	VALUE a = BigDecimal_split(self);
-	VALUE digits = RARRAY_AREF(a, 1);
-	VALUE numerator = rb_funcall(digits, rb_intern("to_i"), 0);
-	VALUE ret;
-	ssize_t dpower = e - (ssize_t)RSTRING_LEN(digits);
-
-	if (BIGDECIMAL_NEGATIVE_P(p)) {
-	    numerator = rb_funcall(numerator, '*', 1, INT2FIX(-1));
-	}
-	if (dpower < 0) {
-	    ret = rb_funcall(numerator, rb_intern("div"), 1,
-			      rb_funcall(INT2FIX(10), rb_intern("**"), 1,
-					 INT2FIX(-dpower)));
-	}
-	else {
-	    ret = rb_funcall(numerator, '*', 1,
-			     rb_funcall(INT2FIX(10), rb_intern("**"), 1,
-					INT2FIX(dpower)));
-	}
-	if (RB_TYPE_P(ret, T_FLOAT)) {
-	    rb_raise(rb_eFloatDomainError, "Infinity");
-	}
-	return ret;
-    }
-}
-
-/* Returns a new Float object having approximately the same value as the
- * BigDecimal number. Normal accuracy limits and built-in errors of binary
- * Float arithmetic apply.
- */
-static VALUE
-BigDecimal_to_f(VALUE self)
-{
-    ENTER(1);
-    Real *p;
-    double d;
-    SIGNED_VALUE e;
-    char *buf;
-    volatile VALUE str;
-
-    GUARD_OBJ(p, GetVpValue(self, 1));
-    if (VpVtoD(&d, &e, p) != 1)
-	return rb_float_new(d);
-    if (e > (SIGNED_VALUE)(DBL_MAX_10_EXP+BASE_FIG))
-	goto overflow;
-    if (e < (SIGNED_VALUE)(DBL_MIN_10_EXP-BASE_FIG))
-	goto underflow;
-
-    str = rb_str_new(0, VpNumOfChars(p, "E"));
-    buf = RSTRING_PTR(str);
-    VpToString(p, buf, RSTRING_LEN(str), 0, 0);
-    errno = 0;
-    d = strtod(buf, 0);
-    if (errno == ERANGE) {
-	if (d == 0.0) goto underflow;
-	if (fabs(d) >= HUGE_VAL) goto overflow;
-    }
-    return rb_float_new(d);
-
-overflow:
-    VpException(VP_EXCEPTION_OVERFLOW, "BigDecimal to Float conversion", 0);
-    if (BIGDECIMAL_NEGATIVE_P(p))
-	return rb_float_new(VpGetDoubleNegInf());
-    else
-	return rb_float_new(VpGetDoublePosInf());
-
-underflow:
-    VpException(VP_EXCEPTION_UNDERFLOW, "BigDecimal to Float conversion", 0);
-    if (BIGDECIMAL_NEGATIVE_P(p))
-	return rb_float_new(-0.0);
-    else
-	return rb_float_new(0.0);
-}
-
-
-/* Converts a BigDecimal to a Rational.
- */
-static VALUE
-BigDecimal_to_r(VALUE self)
-{
-    Real *p;
-    ssize_t sign, power, denomi_power;
-    VALUE a, digits, numerator;
-
-    p = GetVpValue(self, 1);
-    BigDecimal_check_num(p);
-
-    sign = VpGetSign(p);
-    power = VpExponent10(p);
-    a = BigDecimal_split(self);
-    digits = RARRAY_AREF(a, 1);
-    denomi_power = power - RSTRING_LEN(digits);
-    numerator = rb_funcall(digits, rb_intern("to_i"), 0);
-
-    if (sign < 0) {
-	numerator = rb_funcall(numerator, '*', 1, INT2FIX(-1));
-    }
-    if (denomi_power < 0) {
-	return rb_Rational(numerator,
-			   rb_funcall(INT2FIX(10), rb_intern("**"), 1,
-				      INT2FIX(-denomi_power)));
-    }
-    else {
-	return rb_Rational1(rb_funcall(numerator, '*', 1,
-				       rb_funcall(INT2FIX(10), rb_intern("**"), 1,
-						  INT2FIX(denomi_power))));
-    }
-}
-
-/* The coerce method provides support for Ruby type coercion. It is not
- * enabled by default.
- *
- * This means that binary operations like + * / or - can often be performed
- * on a BigDecimal and an object of another type, if the other object can
- * be coerced into a BigDecimal value.
- *
- * e.g.
- *   a = BigDecimal("1.0")
- *   b = a / 2.0 #=> 0.5
- *
- * Note that coercing a String to a BigDecimal is not supported by default;
- * it requires a special compile-time option when building Ruby.
- */
-static VALUE
-BigDecimal_coerce(VALUE self, VALUE other)
-{
-    ENTER(2);
-    VALUE obj;
-    Real *b;
-
-    if (RB_TYPE_P(other, T_FLOAT)) {
-	GUARD_OBJ(b, GetVpValueWithPrec(other, 0, 1));
-        obj = rb_assoc_new(VpCheckGetValue(b), self);
-    }
-    else {
-	if (RB_TYPE_P(other, T_RATIONAL)) {
-	    Real* pv = DATA_PTR(self);
-	    GUARD_OBJ(b, GetVpValueWithPrec(other, pv->Prec*VpBaseFig(), 1));
-	}
-	else {
-	    GUARD_OBJ(b, GetVpValue(other, 1));
-	}
-	obj = rb_assoc_new(b->obj, self);
-    }
-
-    return obj;
-}
-
-/*
- *  call-seq:
- *    +big_decimal -> self
- *
- *  Returns +self+:
- *
- *     +BigDecimal(5)  # => 0.5e1
- *     +BigDecimal(-5) # => -0.5e1
- *
- */
-
-static VALUE
-BigDecimal_uplus(VALUE self)
-{
-    return self;
-}
-
- /*
-  *  call-seq:
-  *    self + value -> bigdecimal
-  *
-  *  Returns the \BigDecimal sum of +self+ and +value+:
-  *
-  *    b = BigDecimal('111111.111') # => 0.111111111e6
-  *    b + 2                        # => 0.111113111e6
-  *    b + 2.0                      # => 0.111113111e6
-  *    b + Rational(2, 1)           # => 0.111113111e6
-  *    b + Complex(2, 0)            # => (0.111113111e6+0i)
-  *
-  *  See the {Note About Precision}[BigDecimal.html#class-BigDecimal-label-A+Note+About+Precision].
-  *
-  */
-
-static VALUE
-BigDecimal_add(VALUE self, VALUE r)
-{
-    ENTER(5);
-    Real *c, *a, *b;
-    size_t mx;
-
-    GUARD_OBJ(a, GetVpValue(self, 1));
-    if (RB_TYPE_P(r, T_FLOAT)) {
-	b = GetVpValueWithPrec(r, 0, 1);
-    }
-    else if (RB_TYPE_P(r, T_RATIONAL)) {
-	b = GetVpValueWithPrec(r, a->Prec*VpBaseFig(), 1);
-    }
-    else {
-	b = GetVpValue(r, 0);
-    }
-
-    if (!b) return DoSomeOne(self,r,'+');
-    SAVE(b);
-
-    if (VpIsNaN(b)) return b->obj;
-    if (VpIsNaN(a)) return a->obj;
-
-    mx = GetAddSubPrec(a, b);
-    if (mx == (size_t)-1L) {
-        GUARD_OBJ(c, NewZeroWrapLimited(1, VpBaseFig() + 1));
-        VpAddSub(c, a, b, 1);
-    }
-    else {
-        GUARD_OBJ(c, NewZeroWrapLimited(1, mx * (VpBaseFig() + 1)));
-        if (!mx) {
-            VpSetInf(c, VpGetSign(a));
-        }
-        else {
-            VpAddSub(c, a, b, 1);
-        }
-    }
-    return VpCheckGetValue(c);
-}
-
- /*  call-seq:
-  *    self - value -> bigdecimal
-  *
-  *  Returns the \BigDecimal difference of +self+ and +value+:
-  *
-  *    b = BigDecimal('333333.333') # => 0.333333333e6
-  *    b - 2                        # => 0.333331333e6
-  *    b - 2.0                      # => 0.333331333e6
-  *    b - Rational(2, 1)           # => 0.333331333e6
-  *    b - Complex(2, 0)            # => (0.333331333e6+0i)
-  *
-  *  See the {Note About Precision}[BigDecimal.html#class-BigDecimal-label-A+Note+About+Precision].
-  *
-  */
-static VALUE
-BigDecimal_sub(VALUE self, VALUE r)
-{
-    ENTER(5);
-    Real *c, *a, *b;
-    size_t mx;
-
-    GUARD_OBJ(a, GetVpValue(self,1));
-    if (RB_TYPE_P(r, T_FLOAT)) {
-	b = GetVpValueWithPrec(r, 0, 1);
-    }
-    else if (RB_TYPE_P(r, T_RATIONAL)) {
-	b = GetVpValueWithPrec(r, a->Prec*VpBaseFig(), 1);
-    }
-    else {
-	b = GetVpValue(r,0);
-    }
-
-    if (!b) return DoSomeOne(self,r,'-');
-    SAVE(b);
-
-    if (VpIsNaN(b)) return b->obj;
-    if (VpIsNaN(a)) return a->obj;
-
-    mx = GetAddSubPrec(a,b);
-    if (mx == (size_t)-1L) {
-        GUARD_OBJ(c, NewZeroWrapLimited(1, VpBaseFig() + 1));
-        VpAddSub(c, a, b, -1);
-    }
-    else {
-        GUARD_OBJ(c, NewZeroWrapLimited(1, mx *(VpBaseFig() + 1)));
-        if (!mx) {
-            VpSetInf(c,VpGetSign(a));
-        }
-        else {
-            VpAddSub(c, a, b, -1);
-        }
-    }
-    return VpCheckGetValue(c);
-}
-
-static VALUE
-BigDecimalCmp(VALUE self, VALUE r,char op)
-{
-    ENTER(5);
-    SIGNED_VALUE e;
-    Real *a, *b=0;
-    GUARD_OBJ(a, GetVpValue(self, 1));
-    switch (TYPE(r)) {
-    case T_DATA:
-	if (!is_kind_of_BigDecimal(r)) break;
-	/* fall through */
-    case T_FIXNUM:
-	/* fall through */
-    case T_BIGNUM:
-	GUARD_OBJ(b, GetVpValue(r, 0));
-	break;
-
-    case T_FLOAT:
-	GUARD_OBJ(b, GetVpValueWithPrec(r, 0, 0));
-	break;
-
-    case T_RATIONAL:
-	GUARD_OBJ(b, GetVpValueWithPrec(r, a->Prec*VpBaseFig(), 0));
-	break;
-
-    default:
-	break;
-    }
-    if (b == NULL) {
-	ID f = 0;
-
-	switch (op) {
-	case '*':
-	    return rb_num_coerce_cmp(self, r, rb_intern("<=>"));
-
-	case '=':
-	    return RTEST(rb_num_coerce_cmp(self, r, rb_intern("=="))) ? Qtrue : Qfalse;
-
-	case 'G':
-	    f = rb_intern(">=");
-	    break;
-
-	case 'L':
-	    f = rb_intern("<=");
-	    break;
-
-	case '>':
-	    /* fall through */
-	case '<':
-	    f = (ID)op;
-	    break;
-
-	default:
-	    break;
-	}
-	return rb_num_coerce_relop(self, r, f);
-    }
-    SAVE(b);
-    e = VpComp(a, b);
-    if (e == 999)
-	return (op == '*') ? Qnil : Qfalse;
-    switch (op) {
-    case '*':
-	return   INT2FIX(e); /* any op */
-
-    case '=':
-	if (e == 0) return Qtrue;
-	return Qfalse;
-
-    case 'G':
-	if (e >= 0) return Qtrue;
-	return Qfalse;
-
-    case '>':
-	if (e >  0) return Qtrue;
-	return Qfalse;
-
-    case 'L':
-	if (e <= 0) return Qtrue;
-	return Qfalse;
-
-    case '<':
-	if (e <  0) return Qtrue;
-	return Qfalse;
-
-    default:
-	break;
-    }
-
-    rb_bug("Undefined operation in BigDecimalCmp()");
-
-    UNREACHABLE;
-}
-
-/* Returns True if the value is zero. */
-static VALUE
-BigDecimal_zero(VALUE self)
-{
-    Real *a = GetVpValue(self, 1);
-    return VpIsZero(a) ? Qtrue : Qfalse;
-}
-
-/* Returns self if the value is non-zero, nil otherwise. */
-static VALUE
-BigDecimal_nonzero(VALUE self)
-{
-    Real *a = GetVpValue(self, 1);
-    return VpIsZero(a) ? Qnil : self;
-}
-
-/* The comparison operator.
- * a <=> b is 0 if a == b, 1 if a > b, -1 if a < b.
- */
-static VALUE
-BigDecimal_comp(VALUE self, VALUE r)
-{
-    return BigDecimalCmp(self, r, '*');
-}
-
-/*
- * Tests for value equality; returns true if the values are equal.
- *
- * The == and === operators and the eql? method have the same implementation
- * for BigDecimal.
- *
- * Values may be coerced to perform the comparison:
- *
- *   BigDecimal('1.0') == 1.0  #=> true
- */
-static VALUE
-BigDecimal_eq(VALUE self, VALUE r)
-{
-    return BigDecimalCmp(self, r, '=');
-}
-
-/*  call-seq:
- *    self < other -> true or false
- *
- *  Returns +true+ if +self+ is less than +other+, +false+ otherwise:
- *
- *    b = BigDecimal('1.5') # => 0.15e1
- *    b < 2                 # => true
- *    b < 2.0               # => true
- *    b < Rational(2, 1)    # => true
- *    b < 1.5               # => false
- *
- *  Raises an exception if the comparison cannot be made.
- *
- */
-static VALUE
-BigDecimal_lt(VALUE self, VALUE r)
-{
-    return BigDecimalCmp(self, r, '<');
-}
-
-/*  call-seq:
- *    self <= other -> true or false
- *
- *  Returns +true+ if +self+ is less or equal to than +other+, +false+ otherwise:
- *
- *    b = BigDecimal('1.5') # => 0.15e1
- *    b <= 2                # => true
- *    b <= 2.0              # => true
- *    b <= Rational(2, 1)   # => true
- *    b <= 1.5              # => true
- *    b < 1                 # => false
- *
- *  Raises an exception if the comparison cannot be made.
- *
- */
-static VALUE
-BigDecimal_le(VALUE self, VALUE r)
-{
-    return BigDecimalCmp(self, r, 'L');
-}
-
-/*  call-seq:
- *    self > other -> true or false
- *
- *  Returns +true+ if +self+ is greater than +other+, +false+ otherwise:
- *
- *    b = BigDecimal('1.5')
- *    b > 1              # => true
- *    b > 1.0            # => true
- *    b > Rational(1, 1) # => true
- *    b > 2              # => false
- *
- *  Raises an exception if the comparison cannot be made.
- *
- */
-static VALUE
-BigDecimal_gt(VALUE self, VALUE r)
-{
-    return BigDecimalCmp(self, r, '>');
-}
-
-/*  call-seq:
- *    self >= other -> true or false
- *
- *  Returns +true+ if +self+ is greater than or equal to +other+, +false+ otherwise:
- *
- *    b = BigDecimal('1.5')
- *    b >= 1              # => true
- *    b >= 1.0            # => true
- *    b >= Rational(1, 1) # => true
- *    b >= 1.5            # => true
- *    b > 2               # => false
- *
- *  Raises an exception if the comparison cannot be made.
- *
- */
-static VALUE
-BigDecimal_ge(VALUE self, VALUE r)
-{
-    return BigDecimalCmp(self, r, 'G');
-}
-
-/*
- *  call-seq:
- *    -self -> bigdecimal
- *
- *  Returns the \BigDecimal negation of self:
- *
- *    b0 = BigDecimal('1.5')
- *    b1 = -b0 # => -0.15e1
- *    b2 = -b1 # => 0.15e1
- *
- */
-
-static VALUE
-BigDecimal_neg(VALUE self)
-{
-    ENTER(5);
-    Real *c, *a;
-    GUARD_OBJ(a, GetVpValue(self, 1));
-    GUARD_OBJ(c, NewZeroWrapLimited(1, a->Prec *(VpBaseFig() + 1)));
-    VpAsgn(c, a, -1);
-    return VpCheckGetValue(c);
-}
-
-static VALUE
-BigDecimal_mult(VALUE self, VALUE r)
-{
-    ENTER(5);
-    Real *c, *a, *b;
-    size_t mx;
-
-    GUARD_OBJ(a, GetVpValue(self, 1));
-    if (RB_TYPE_P(r, T_FLOAT)) {
-        b = GetVpValueWithPrec(r, 0, 1);
-    }
-    else if (RB_TYPE_P(r, T_RATIONAL)) {
-	b = GetVpValueWithPrec(r, a->Prec*VpBaseFig(), 1);
-    }
-    else {
-	b = GetVpValue(r,0);
-    }
-
-    if (!b) return DoSomeOne(self, r, '*');
-    SAVE(b);
-
-    mx = a->Prec + b->Prec;
-    GUARD_OBJ(c, NewZeroWrapLimited(1, mx * (VpBaseFig() + 1)));
-    VpMult(c, a, b);
-    return VpCheckGetValue(c);
-}
-
-static VALUE
-BigDecimal_divide(VALUE self, VALUE r, Real **c, Real **res, Real **div)
-/* For c = self.div(r): with round operation */
-{
-    ENTER(5);
-    Real *a, *b;
-    ssize_t a_prec, b_prec;
-    size_t mx;
-
-    TypedData_Get_Struct(self, Real, &BigDecimal_data_type, a);
-    SAVE(a);
-
-    VALUE rr = r;
-    if (is_kind_of_BigDecimal(rr)) {
-        /* do nothing */
-    }
-    else if (RB_INTEGER_TYPE_P(r)) {
-        rr = rb_inum_convert_to_BigDecimal(r, 0, true);
-    }
-    else if (RB_TYPE_P(r, T_FLOAT)) {
-        rr = rb_float_convert_to_BigDecimal(r, 0, true);
-    }
-    else if (RB_TYPE_P(r, T_RATIONAL)) {
-        rr = rb_rational_convert_to_BigDecimal(r, a->Prec*BASE_FIG, true);
-    }
-
-    if (!is_kind_of_BigDecimal(rr)) {
-        return DoSomeOne(self, r, '/');
-    }
-
-    TypedData_Get_Struct(rr, Real, &BigDecimal_data_type, b);
-    SAVE(b);
-    *div = b;
-
-    BigDecimal_count_precision_and_scale(self, &a_prec, NULL);
-    BigDecimal_count_precision_and_scale(rr, &b_prec, NULL);
-    mx = (a_prec > b_prec) ? a_prec : b_prec;
-    mx *= 2;
-
-    if (2*BIGDECIMAL_DOUBLE_FIGURES > mx)
-        mx = 2*BIGDECIMAL_DOUBLE_FIGURES;
-
-    GUARD_OBJ((*c), NewZeroWrapNolimit(1, mx + 2*BASE_FIG));
-    GUARD_OBJ((*res), NewZeroWrapNolimit(1, (mx + 1)*2 + 2*BASE_FIG));
-    VpDivd(*c, *res, a, b);
-
-    return Qnil;
-}
-
-static VALUE BigDecimal_DoDivmod(VALUE self, VALUE r, Real **div, Real **mod);
-
-/* call-seq:
- *   a / b   -> bigdecimal
- *
- * Divide by the specified value.
- *
- * The result precision will be the precision of the larger operand,
- * but its minimum is 2*Float::DIG.
- *
- * See BigDecimal#div.
- * See BigDecimal#quo.
- */
-static VALUE
-BigDecimal_div(VALUE self, VALUE r)
-/* For c = self/r: with round operation */
-{
-    ENTER(5);
-    Real *c=NULL, *res=NULL, *div = NULL;
-    r = BigDecimal_divide(self, r, &c, &res, &div);
-    if (!NIL_P(r)) return r; /* coerced by other */
-    SAVE(c); SAVE(res); SAVE(div);
-    /* a/b = c + r/b */
-    /* c xxxxx
-       r 00000yyyyy  ==> (y/b)*BASE >= HALF_BASE
-     */
-    /* Round */
-    if (VpHasVal(div)) { /* frac[0] must be zero for NaN,INF,Zero */
-        VpInternalRound(c, 0, c->frac[c->Prec-1], (DECDIG)(VpBaseVal() * (DECDIG_DBL)res->frac[0] / div->frac[0]));
-    }
-    return VpCheckGetValue(c);
-}
-
-static VALUE BigDecimal_round(int argc, VALUE *argv, VALUE self);
-
-/* call-seq:
- *   quo(value)  -> bigdecimal
- *   quo(value, digits)  -> bigdecimal
- *
- * Divide by the specified value.
- *
- * digits:: If specified and less than the number of significant digits of
- *          the result, the result is rounded to the given number of digits,
- *          according to the rounding mode indicated by BigDecimal.mode.
- *
- *          If digits is 0 or omitted, the result is the same as for the
- *          / operator.
- *
- * See BigDecimal#/.
- * See BigDecimal#div.
- */
-static VALUE
-BigDecimal_quo(int argc, VALUE *argv, VALUE self)
-{
-    VALUE value, digits, result;
-    SIGNED_VALUE n = -1;
-
-    argc = rb_scan_args(argc, argv, "11", &value, &digits);
-    if (argc > 1) {
-        n = check_int_precision(digits);
-    }
-
-    if (n > 0) {
-        result = BigDecimal_div2(self, value, digits);
-    }
-    else {
-        result = BigDecimal_div(self, value);
-    }
-
-    return result;
-}
-
-/*
- * %: mod = a%b = a - (a.to_f/b).floor * b
- * div = (a.to_f/b).floor
- */
-static VALUE
-BigDecimal_DoDivmod(VALUE self, VALUE r, Real **div, Real **mod)
-{
-    ENTER(8);
-    Real *c=NULL, *d=NULL, *res=NULL;
-    Real *a, *b;
-    ssize_t a_prec, b_prec;
-    size_t mx;
-
-    TypedData_Get_Struct(self, Real, &BigDecimal_data_type, a);
-    SAVE(a);
-
-    VALUE rr = r;
-    if (is_kind_of_BigDecimal(rr)) {
-        /* do nothing */
-    }
-    else if (RB_INTEGER_TYPE_P(r)) {
-        rr = rb_inum_convert_to_BigDecimal(r, 0, true);
-    }
-    else if (RB_TYPE_P(r, T_FLOAT)) {
-        rr = rb_float_convert_to_BigDecimal(r, 0, true);
-    }
-    else if (RB_TYPE_P(r, T_RATIONAL)) {
-        rr = rb_rational_convert_to_BigDecimal(r, a->Prec*BASE_FIG, true);
-    }
-
-    if (!is_kind_of_BigDecimal(rr)) {
-        return Qfalse;
-    }
-
-    TypedData_Get_Struct(rr, Real, &BigDecimal_data_type, b);
-    SAVE(b);
-
-    if (VpIsNaN(a) || VpIsNaN(b)) goto NaN;
-    if (VpIsInf(a) && VpIsInf(b)) goto NaN;
-    if (VpIsZero(b)) {
-        rb_raise(rb_eZeroDivError, "divided by 0");
-    }
-    if (VpIsInf(a)) {
-        if (VpGetSign(a) == VpGetSign(b)) {
-            VALUE inf = BigDecimal_positive_infinity();
-            TypedData_Get_Struct(inf, Real, &BigDecimal_data_type, *div);
-        }
-        else {
-            VALUE inf = BigDecimal_negative_infinity();
-            TypedData_Get_Struct(inf, Real, &BigDecimal_data_type, *div);
-        }
-        VALUE nan = BigDecimal_nan();
-        TypedData_Get_Struct(nan, Real, &BigDecimal_data_type, *mod);
-        return Qtrue;
-    }
-    if (VpIsInf(b)) {
-        VALUE zero = BigDecimal_positive_zero();
-        TypedData_Get_Struct(zero, Real, &BigDecimal_data_type, *div);
-        *mod = a;
-        return Qtrue;
-    }
-    if (VpIsZero(a)) {
-        VALUE zero = BigDecimal_positive_zero();
-        TypedData_Get_Struct(zero, Real, &BigDecimal_data_type, *div);
-        TypedData_Get_Struct(zero, Real, &BigDecimal_data_type, *mod);
-        return Qtrue;
-    }
-
-    BigDecimal_count_precision_and_scale(self, &a_prec, NULL);
-    BigDecimal_count_precision_and_scale(rr, &b_prec, NULL);
-
-    mx = (a_prec > b_prec) ? a_prec : b_prec;
-    mx *= 2;
-
-    if (2*BIGDECIMAL_DOUBLE_FIGURES > mx)
-        mx = 2*BIGDECIMAL_DOUBLE_FIGURES;
-
-    GUARD_OBJ(c, NewZeroWrapLimited(1, mx + 2*BASE_FIG));
-    GUARD_OBJ(res, NewZeroWrapNolimit(1, mx*2 + 2*BASE_FIG));
-    VpDivd(c, res, a, b);
-
-    mx = c->Prec * BASE_FIG;
-    GUARD_OBJ(d, NewZeroWrapLimited(1, mx));
-    VpActiveRound(d, c, VP_ROUND_DOWN, 0);
-
-    VpMult(res, d, b);
-    VpAddSub(c, a, res, -1);
-
-    if (!VpIsZero(c) && (VpGetSign(a) * VpGetSign(b) < 0)) {
-        /* result adjustment for negative case */
-        res = rbd_reallocate_struct(res, d->MaxPrec);
-        res->MaxPrec = d->MaxPrec;
-        VpAddSub(res, d, VpOne(), -1);
-        GUARD_OBJ(d, NewZeroWrapLimited(1, GetAddSubPrec(c, b) * 2*BASE_FIG));
-        VpAddSub(d, c, b, 1);
-        *div = res;
-        *mod = d;
-    }
-    else {
-        *div = d;
-        *mod = c;
-    }
-    return Qtrue;
-
-  NaN:
-    {
-        VALUE nan = BigDecimal_nan();
-        TypedData_Get_Struct(nan, Real, &BigDecimal_data_type, *div);
-        TypedData_Get_Struct(nan, Real, &BigDecimal_data_type, *mod);
-    }
-    return Qtrue;
-}
-
-/* call-seq:
- * a % b
- * a.modulo(b)
- *
- * Returns the modulus from dividing by b.
- *
- * See BigDecimal#divmod.
- */
-static VALUE
-BigDecimal_mod(VALUE self, VALUE r) /* %: a%b = a - (a.to_f/b).floor * b */
-{
-    ENTER(3);
-    Real *div = NULL, *mod = NULL;
-
-    if (BigDecimal_DoDivmod(self, r, &div, &mod)) {
-	SAVE(div); SAVE(mod);
-        return VpCheckGetValue(mod);
-    }
-    return DoSomeOne(self, r, '%');
-}
-
-static VALUE
-BigDecimal_divremain(VALUE self, VALUE r, Real **dv, Real **rv)
-{
-    ENTER(10);
-    size_t mx;
-    Real *a = NULL, *b = NULL, *c = NULL, *res = NULL, *d = NULL, *rr = NULL, *ff = NULL;
-    Real *f = NULL;
-
-    GUARD_OBJ(a, GetVpValue(self, 1));
-    if (RB_TYPE_P(r, T_FLOAT)) {
-	b = GetVpValueWithPrec(r, 0, 1);
-    }
-    else if (RB_TYPE_P(r, T_RATIONAL)) {
-	b = GetVpValueWithPrec(r, a->Prec*VpBaseFig(), 1);
-    }
-    else {
-	b = GetVpValue(r, 0);
-    }
-
-    if (!b) return DoSomeOne(self, r, rb_intern("remainder"));
-    SAVE(b);
-
-    if (VpIsPosInf(b) || VpIsNegInf(b)) {
-       GUARD_OBJ(*dv, NewZeroWrapLimited(1, 1));
-       VpSetZero(*dv, 1);
-       *rv = a;
-       return Qnil;
-    }
-
-    mx = (a->MaxPrec + b->MaxPrec) *VpBaseFig();
-    GUARD_OBJ(c,   NewZeroWrapLimited(1, mx));
-    GUARD_OBJ(res, NewZeroWrapNolimit(1, (mx+1) * 2 + (VpBaseFig() + 1)));
-    GUARD_OBJ(rr,  NewZeroWrapNolimit(1, (mx+1) * 2 + (VpBaseFig() + 1)));
-    GUARD_OBJ(ff,  NewZeroWrapNolimit(1, (mx+1) * 2 + (VpBaseFig() + 1)));
-
-    VpDivd(c, res, a, b);
-
-    mx = c->Prec *(VpBaseFig() + 1);
-
-    GUARD_OBJ(d, NewZeroWrapLimited(1, mx));
-    GUARD_OBJ(f, NewZeroWrapLimited(1, mx));
-
-    VpActiveRound(d, c, VP_ROUND_DOWN, 0); /* 0: round off */
-
-    VpFrac(f, c);
-    VpMult(rr, f, b);
-    VpAddSub(ff, res, rr, 1);
-
-    *dv = d;
-    *rv = ff;
-    return Qnil;
-}
-
-/* call-seq:
- * remainder(value)
- *
- * Returns the remainder from dividing by the value.
- *
- * x.remainder(y) means x-y*(x/y).truncate
- */
-static VALUE
-BigDecimal_remainder(VALUE self, VALUE r) /* remainder */
-{
-    VALUE  f;
-    Real  *d, *rv = 0;
-    f = BigDecimal_divremain(self, r, &d, &rv);
-    if (!NIL_P(f)) return f;
-    return VpCheckGetValue(rv);
-}
-
-/* call-seq:
- * divmod(value)
- *
- * Divides by the specified value, and returns the quotient and modulus
- * as BigDecimal numbers. The quotient is rounded towards negative infinity.
- *
- * For example:
- *
- *   require 'bigdecimal'
- *
- *   a = BigDecimal("42")
- *   b = BigDecimal("9")
- *
- *   q, m = a.divmod(b)
- *
- *   c = q * b + m
- *
- *   a == c  #=> true
- *
- * The quotient q is (a/b).floor, and the modulus is the amount that must be
- * added to q * b to get a.
- */
-static VALUE
-BigDecimal_divmod(VALUE self, VALUE r)
-{
-    ENTER(5);
-    Real *div = NULL, *mod = NULL;
-
-    if (BigDecimal_DoDivmod(self, r, &div, &mod)) {
-	SAVE(div); SAVE(mod);
-        return rb_assoc_new(VpCheckGetValue(div), VpCheckGetValue(mod));
-    }
-    return DoSomeOne(self,r,rb_intern("divmod"));
-}
-
-/*
- * Do the same manner as Float#div when n is nil.
- * Do the same manner as BigDecimal#quo when n is 0.
- */
-static inline VALUE
-BigDecimal_div2(VALUE self, VALUE b, VALUE n)
-{
-    ENTER(5);
-    SIGNED_VALUE ix;
-
-    if (NIL_P(n)) { /* div in Float sense */
-        Real *div = NULL;
-        Real *mod;
-        if (BigDecimal_DoDivmod(self, b, &div, &mod)) {
-            return BigDecimal_to_i(VpCheckGetValue(div));
-        }
-        return DoSomeOne(self, b, rb_intern("div"));
-    }
-
-    /* div in BigDecimal sense */
-    ix = check_int_precision(n);
-    if (ix == 0) {
-        return BigDecimal_div(self, b);
-    }
-    else {
-        Real *res = NULL;
-        Real *av = NULL, *bv = NULL, *cv = NULL;
-        size_t mx = ix + VpBaseFig()*2;
-        size_t b_prec = ix;
-        size_t pl = VpSetPrecLimit(0);
-
-        GUARD_OBJ(cv, NewZeroWrapLimited(1, mx + VpBaseFig()));
-        GUARD_OBJ(av, GetVpValue(self, 1));
-        /* TODO: I want to refactor this precision control for a float value later
-         *       by introducing an implicit conversion function instead of
-         *       GetVpValueWithPrec.  */
-        if (RB_FLOAT_TYPE_P(b) && b_prec > BIGDECIMAL_DOUBLE_FIGURES) {
-            b_prec = BIGDECIMAL_DOUBLE_FIGURES;
-        }
-        GUARD_OBJ(bv, GetVpValueWithPrec(b, b_prec, 1));
-        mx = av->Prec + bv->Prec + 2;
-        if (mx <= cv->MaxPrec) mx = cv->MaxPrec + 1;
-        GUARD_OBJ(res, NewZeroWrapNolimit(1, (mx * 2  + 2)*VpBaseFig()));
-        VpDivd(cv, res, av, bv);
-        VpSetPrecLimit(pl);
-        VpLeftRound(cv, VpGetRoundMode(), ix);
-        return VpCheckGetValue(cv);
-    }
-}
-
- /*
-  * Document-method: BigDecimal#div
-  *
-  * call-seq:
-  *   div(value)  -> integer
-  *   div(value, digits)  -> bigdecimal or integer
-  *
-  * Divide by the specified value.
-  *
-  * digits:: If specified and less than the number of significant digits of the
-  *          result, the result is rounded to that number of digits, according
-  *          to BigDecimal.mode.
-  *
-  *          If digits is 0, the result is the same as for the / operator
-  *          or #quo.
-  *
-  *          If digits is not specified, the result is an integer,
-  *          by analogy with Float#div; see also BigDecimal#divmod.
-  *
-  * See BigDecimal#/.
-  * See BigDecimal#quo.
-  *
-  * Examples:
-  *
-  *   a = BigDecimal("4")
-  *   b = BigDecimal("3")
-  *
-  *   a.div(b, 3)  # => 0.133e1
-  *
-  *   a.div(b, 0)  # => 0.1333333333333333333e1
-  *   a / b        # => 0.1333333333333333333e1
-  *   a.quo(b)     # => 0.1333333333333333333e1
-  *
-  *   a.div(b)     # => 1
-  */
-static VALUE
-BigDecimal_div3(int argc, VALUE *argv, VALUE self)
-{
-    VALUE b,n;
-
-    rb_scan_args(argc, argv, "11", &b, &n);
-
-    return BigDecimal_div2(self, b, n);
-}
-
- /*
-  *  call-seq:
-  *    add(value, ndigits) -> new_bigdecimal
-  *
-  *  Returns the \BigDecimal sum of +self+ and +value+
-  *  with a precision of +ndigits+ decimal digits.
-  *
-  *  When +ndigits+ is less than the number of significant digits
-  *  in the sum, the sum is rounded to that number of digits,
-  *  according to the current rounding mode; see BigDecimal.mode.
-  *
-  *  Examples:
-  *
-  *    # Set the rounding mode.
-  *    BigDecimal.mode(BigDecimal::ROUND_MODE, :half_up)
-  *    b = BigDecimal('111111.111')
-  *    b.add(1, 0)               # => 0.111112111e6
-  *    b.add(1, 3)               # => 0.111e6
-  *    b.add(1, 6)               # => 0.111112e6
-  *    b.add(1, 15)              # => 0.111112111e6
-  *    b.add(1.0, 15)            # => 0.111112111e6
-  *    b.add(Rational(1, 1), 15) # => 0.111112111e6
-  *
-  */
-
-static VALUE
-BigDecimal_add2(VALUE self, VALUE b, VALUE n)
-{
-    ENTER(2);
-    Real *cv;
-    SIGNED_VALUE mx = check_int_precision(n);
-    if (mx == 0) return BigDecimal_add(self, b);
-    else {
-	size_t pl = VpSetPrecLimit(0);
-	VALUE   c = BigDecimal_add(self, b);
-	VpSetPrecLimit(pl);
-	GUARD_OBJ(cv, GetVpValue(c, 1));
-	VpLeftRound(cv, VpGetRoundMode(), mx);
-        return VpCheckGetValue(cv);
-    }
-}
-
-/* call-seq:
- * sub(value, digits)  -> bigdecimal
- *
- * Subtract the specified value.
- *
- * e.g.
- *   c = a.sub(b,n)
- *
- * digits:: If specified and less than the number of significant digits of the
- *          result, the result is rounded to that number of digits, according
- *          to BigDecimal.mode.
- *
- */
-static VALUE
-BigDecimal_sub2(VALUE self, VALUE b, VALUE n)
-{
-    ENTER(2);
-    Real *cv;
-    SIGNED_VALUE mx = check_int_precision(n);
-    if (mx == 0) return BigDecimal_sub(self, b);
-    else {
-	size_t pl = VpSetPrecLimit(0);
-	VALUE   c = BigDecimal_sub(self, b);
-	VpSetPrecLimit(pl);
-	GUARD_OBJ(cv, GetVpValue(c, 1));
-	VpLeftRound(cv, VpGetRoundMode(), mx);
-        return VpCheckGetValue(cv);
-    }
-}
-
- /*
-  *  call-seq:
-  *    mult(other, ndigits) -> bigdecimal
-  *
-  *  Returns the \BigDecimal product of +self+ and +value+
-  *  with a precision of +ndigits+ decimal digits.
-  *
-  *  When +ndigits+ is less than the number of significant digits
-  *  in the sum, the sum is rounded to that number of digits,
-  *  according to the current rounding mode; see BigDecimal.mode.
-  *
-  *  Examples:
-  *
-  *    # Set the rounding mode.
-  *    BigDecimal.mode(BigDecimal::ROUND_MODE, :half_up)
-  *    b = BigDecimal('555555.555')
-  *    b.mult(3, 0)              # => 0.1666666665e7
-  *    b.mult(3, 3)              # => 0.167e7
-  *    b.mult(3, 6)              # => 0.166667e7
-  *    b.mult(3, 15)             # => 0.1666666665e7
-  *    b.mult(3.0, 0)            # => 0.1666666665e7
-  *    b.mult(Rational(3, 1), 0) # => 0.1666666665e7
-  *    b.mult(Complex(3, 0), 0)  # => (0.1666666665e7+0.0i)
-  *
-  */
-
-static VALUE
-BigDecimal_mult2(VALUE self, VALUE b, VALUE n)
-{
-    ENTER(2);
-    Real *cv;
-    SIGNED_VALUE mx = check_int_precision(n);
-    if (mx == 0) return BigDecimal_mult(self, b);
-    else {
-	size_t pl = VpSetPrecLimit(0);
-	VALUE   c = BigDecimal_mult(self, b);
-	VpSetPrecLimit(pl);
-	GUARD_OBJ(cv, GetVpValue(c, 1));
-	VpLeftRound(cv, VpGetRoundMode(), mx);
-        return VpCheckGetValue(cv);
-    }
-}
-
-/*
- *  call-seq:
- *    abs -> bigdecimal
- *
- *  Returns the \BigDecimal absolute value of +self+:
- *
- *    BigDecimal('5').abs  # => 0.5e1
- *    BigDecimal('-3').abs # => 0.3e1
- *
- */
-
-static VALUE
-BigDecimal_abs(VALUE self)
-{
-    ENTER(5);
-    Real *c, *a;
-    size_t mx;
-
-    GUARD_OBJ(a, GetVpValue(self, 1));
-    mx = a->Prec *(VpBaseFig() + 1);
-    GUARD_OBJ(c, NewZeroWrapLimited(1, mx));
-    VpAsgn(c, a, 1);
-    VpChangeSign(c, 1);
-    return VpCheckGetValue(c);
-}
-
-/* call-seq:
- * sqrt(n)
- *
- * Returns the square root of the value.
- *
- * Result has at least n significant digits.
- */
-static VALUE
-BigDecimal_sqrt(VALUE self, VALUE nFig)
-{
-    ENTER(5);
-    Real *c, *a;
-    size_t mx, n;
-
-    GUARD_OBJ(a, GetVpValue(self, 1));
-    mx = a->Prec * (VpBaseFig() + 1);
-
-    n = check_int_precision(nFig);
-    n += VpDblFig() + VpBaseFig();
-    if (mx <= n) mx = n;
-    GUARD_OBJ(c, NewZeroWrapLimited(1, mx));
-    VpSqrt(c, a);
-    return VpCheckGetValue(c);
-}
-
-/* Return the integer part of the number, as a BigDecimal.
- */
-static VALUE
-BigDecimal_fix(VALUE self)
-{
-    ENTER(5);
-    Real *c, *a;
-    size_t mx;
-
-    GUARD_OBJ(a, GetVpValue(self, 1));
-    mx = a->Prec *(VpBaseFig() + 1);
-    GUARD_OBJ(c, NewZeroWrapLimited(1, mx));
-    VpActiveRound(c, a, VP_ROUND_DOWN, 0); /* 0: round off */
-    return VpCheckGetValue(c);
-}
-
-/* call-seq:
- * round(n, mode)
- *
- * Round to the nearest integer (by default), returning the result as a
- * BigDecimal if n is specified, or as an Integer if it isn't.
- *
- *	BigDecimal('3.14159').round #=> 3
- *	BigDecimal('8.7').round #=> 9
- *	BigDecimal('-9.9').round #=> -10
- *
- *	BigDecimal('3.14159').round(2).class.name #=> "BigDecimal"
- *	BigDecimal('3.14159').round.class.name #=> "Integer"
- *
- * If n is specified and positive, the fractional part of the result has no
- * more than that many digits.
- *
- * If n is specified and negative, at least that many digits to the left of the
- * decimal point will be 0 in the result, and return value will be an Integer.
- *
- *	BigDecimal('3.14159').round(3) #=> 3.142
- *	BigDecimal('13345.234').round(-2) #=> 13300
- *
- * The value of the optional mode argument can be used to determine how
- * rounding is performed; see BigDecimal.mode.
- */
-static VALUE
-BigDecimal_round(int argc, VALUE *argv, VALUE self)
-{
-    ENTER(5);
-    Real   *c, *a;
-    int    iLoc = 0;
-    VALUE  vLoc;
-    VALUE  vRound;
-    int    round_to_int = 0;
-    size_t mx, pl;
-
-    unsigned short sw = VpGetRoundMode();
-
-    switch (rb_scan_args(argc, argv, "02", &vLoc, &vRound)) {
-      case 0:
-	iLoc = 0;
-        round_to_int = 1;
-	break;
-      case 1:
-        if (RB_TYPE_P(vLoc, T_HASH)) {
-	    sw = check_rounding_mode_option(vLoc);
-	}
-	else {
-	    iLoc = NUM2INT(vLoc);
-            if (iLoc < 1) round_to_int = 1;
-	}
-	break;
-      case 2:
-	iLoc = NUM2INT(vLoc);
-	if (RB_TYPE_P(vRound, T_HASH)) {
-	    sw = check_rounding_mode_option(vRound);
-	}
-	else {
-	    sw = check_rounding_mode(vRound);
-	}
-	break;
-      default:
-	break;
-    }
-
-    pl = VpSetPrecLimit(0);
-    GUARD_OBJ(a, GetVpValue(self, 1));
-    mx = a->Prec * (VpBaseFig() + 1);
-    GUARD_OBJ(c, NewZeroWrapLimited(1, mx));
-    VpSetPrecLimit(pl);
-    VpActiveRound(c, a, sw, iLoc);
-    if (round_to_int) {
-        return BigDecimal_to_i(VpCheckGetValue(c));
-    }
-    return VpCheckGetValue(c);
-}
-
-/* call-seq:
- * truncate(n)
- *
- * Truncate to the nearest integer (by default), returning the result as a
- * BigDecimal.
- *
- *	BigDecimal('3.14159').truncate #=> 3
- *	BigDecimal('8.7').truncate #=> 8
- *	BigDecimal('-9.9').truncate #=> -9
- *
- * If n is specified and positive, the fractional part of the result has no
- * more than that many digits.
- *
- * If n is specified and negative, at least that many digits to the left of the
- * decimal point will be 0 in the result.
- *
- *	BigDecimal('3.14159').truncate(3) #=> 3.141
- *	BigDecimal('13345.234').truncate(-2) #=> 13300.0
- */
-static VALUE
-BigDecimal_truncate(int argc, VALUE *argv, VALUE self)
-{
-    ENTER(5);
-    Real *c, *a;
-    int iLoc;
-    VALUE vLoc;
-    size_t mx, pl = VpSetPrecLimit(0);
-
-    if (rb_scan_args(argc, argv, "01", &vLoc) == 0) {
-	iLoc = 0;
-    }
-    else {
-	iLoc = NUM2INT(vLoc);
-    }
-
-    GUARD_OBJ(a, GetVpValue(self, 1));
-    mx = a->Prec * (VpBaseFig() + 1);
-    GUARD_OBJ(c, NewZeroWrapLimited(1, mx));
-    VpSetPrecLimit(pl);
-    VpActiveRound(c, a, VP_ROUND_DOWN, iLoc); /* 0: truncate */
-    if (argc == 0) {
-        return BigDecimal_to_i(VpCheckGetValue(c));
-    }
-    return VpCheckGetValue(c);
-}
-
-/* Return the fractional part of the number, as a BigDecimal.
- */
-static VALUE
-BigDecimal_frac(VALUE self)
-{
-    ENTER(5);
-    Real *c, *a;
-    size_t mx;
-
-    GUARD_OBJ(a, GetVpValue(self, 1));
-    mx = a->Prec * (VpBaseFig() + 1);
-    GUARD_OBJ(c, NewZeroWrapLimited(1, mx));
-    VpFrac(c, a);
-    return VpCheckGetValue(c);
-}
-
-/* call-seq:
- * floor(n)
- *
- * Return the largest integer less than or equal to the value, as a BigDecimal.
- *
- *	BigDecimal('3.14159').floor #=> 3
- *	BigDecimal('-9.1').floor #=> -10
- *
- * If n is specified and positive, the fractional part of the result has no
- * more than that many digits.
- *
- * If n is specified and negative, at least that
- * many digits to the left of the decimal point will be 0 in the result.
- *
- *	BigDecimal('3.14159').floor(3) #=> 3.141
- *	BigDecimal('13345.234').floor(-2) #=> 13300.0
- */
-static VALUE
-BigDecimal_floor(int argc, VALUE *argv, VALUE self)
-{
-    ENTER(5);
-    Real *c, *a;
-    int iLoc;
-    VALUE vLoc;
-    size_t mx, pl = VpSetPrecLimit(0);
-
-    if (rb_scan_args(argc, argv, "01", &vLoc)==0) {
-	iLoc = 0;
-    }
-    else {
-	iLoc = NUM2INT(vLoc);
-    }
-
-    GUARD_OBJ(a, GetVpValue(self, 1));
-    mx = a->Prec * (VpBaseFig() + 1);
-    GUARD_OBJ(c, NewZeroWrapLimited(1, mx));
-    VpSetPrecLimit(pl);
-    VpActiveRound(c, a, VP_ROUND_FLOOR, iLoc);
-#ifdef BIGDECIMAL_DEBUG
-    VPrint(stderr, "floor: c=%\n", c);
-#endif
-    if (argc == 0) {
-        return BigDecimal_to_i(VpCheckGetValue(c));
-    }
-    return VpCheckGetValue(c);
-}
-
-/* call-seq:
- * ceil(n)
- *
- * Return the smallest integer greater than or equal to the value, as a BigDecimal.
- *
- *	BigDecimal('3.14159').ceil #=> 4
- *	BigDecimal('-9.1').ceil #=> -9
- *
- * If n is specified and positive, the fractional part of the result has no
- * more than that many digits.
- *
- * If n is specified and negative, at least that
- * many digits to the left of the decimal point will be 0 in the result.
- *
- *	BigDecimal('3.14159').ceil(3) #=> 3.142
- *	BigDecimal('13345.234').ceil(-2) #=> 13400.0
- */
-static VALUE
-BigDecimal_ceil(int argc, VALUE *argv, VALUE self)
-{
-    ENTER(5);
-    Real *c, *a;
-    int iLoc;
-    VALUE vLoc;
-    size_t mx, pl = VpSetPrecLimit(0);
-
-    if (rb_scan_args(argc, argv, "01", &vLoc) == 0) {
-	iLoc = 0;
-    } else {
-	iLoc = NUM2INT(vLoc);
-    }
-
-    GUARD_OBJ(a, GetVpValue(self, 1));
-    mx = a->Prec * (VpBaseFig() + 1);
-    GUARD_OBJ(c, NewZeroWrapLimited(1, mx));
-    VpSetPrecLimit(pl);
-    VpActiveRound(c, a, VP_ROUND_CEIL, iLoc);
-    if (argc == 0) {
-        return BigDecimal_to_i(VpCheckGetValue(c));
-    }
-    return VpCheckGetValue(c);
-}
-
-/* call-seq:
- * to_s(s)
- *
- * Converts the value to a string.
- *
- * The default format looks like  0.xxxxEnn.
- *
- * The optional parameter s consists of either an integer; or an optional '+'
- * or ' ', followed by an optional number, followed by an optional 'E' or 'F'.
- *
- * If there is a '+' at the start of s, positive values are returned with
- * a leading '+'.
- *
- * A space at the start of s returns positive values with a leading space.
- *
- * If s contains a number, a space is inserted after each group of that many
- * digits, starting from '.' and counting outwards.
- *
- * If s ends with an 'E', engineering notation (0.xxxxEnn) is used.
- *
- * If s ends with an 'F', conventional floating point notation is used.
- *
- * Examples:
- *
- *   BigDecimal('-1234567890123.45678901234567890').to_s('5F')
- *     #=> '-123 45678 90123.45678 90123 45678 9'
- *
- *   BigDecimal('1234567890123.45678901234567890').to_s('+8F')
- *     #=> '+12345 67890123.45678901 23456789'
- *
- *   BigDecimal('1234567890123.45678901234567890').to_s(' F')
- *     #=> ' 1234567890123.4567890123456789'
- */
-static VALUE
-BigDecimal_to_s(int argc, VALUE *argv, VALUE self)
-{
-    ENTER(5);
-    int   fmt = 0;   /* 0: E format, 1: F format */
-    int   fPlus = 0; /* 0: default, 1: set ' ' before digits, 2: set '+' before digits. */
-    Real  *vp;
-    volatile VALUE str;
-    char  *psz;
-    char   ch;
-    size_t nc, mc = 0;
-    SIGNED_VALUE m;
-    VALUE  f;
-
-    GUARD_OBJ(vp, GetVpValue(self, 1));
-
-    if (rb_scan_args(argc, argv, "01", &f) == 1) {
-	if (RB_TYPE_P(f, T_STRING)) {
-	    psz = StringValueCStr(f);
-	    if (*psz == ' ') {
-		fPlus = 1;
-		psz++;
-	    }
-	    else if (*psz == '+') {
-		fPlus = 2;
-		psz++;
-	    }
-	    while ((ch = *psz++) != 0) {
-		if (ISSPACE(ch)) {
-		    continue;
-		}
-		if (!ISDIGIT(ch)) {
-		    if (ch == 'F' || ch == 'f') {
-			fmt = 1; /* F format */
-		    }
-		    break;
-		}
-		mc = mc*10 + ch - '0';
-	    }
-	}
-	else {
-	    m = NUM2INT(f);
-	    if (m <= 0) {
-		rb_raise(rb_eArgError, "argument must be positive");
-	    }
-	    mc = (size_t)m;
-	}
-    }
-    if (fmt) {
-	nc = VpNumOfChars(vp, "F");
-    }
-    else {
-	nc = VpNumOfChars(vp, "E");
-    }
-    if (mc > 0) {
-	nc += (nc + mc - 1) / mc + 1;
-    }
-
-    str = rb_usascii_str_new(0, nc);
-    psz = RSTRING_PTR(str);
-
-    if (fmt) {
-	VpToFString(vp, psz, RSTRING_LEN(str), mc, fPlus);
-    }
-    else {
-	VpToString (vp, psz, RSTRING_LEN(str), mc, fPlus);
-    }
-    rb_str_resize(str, strlen(psz));
-    return str;
-}
-
-/* Splits a BigDecimal number into four parts, returned as an array of values.
- *
- * The first value represents the sign of the BigDecimal, and is -1 or 1, or 0
- * if the BigDecimal is Not a Number.
- *
- * The second value is a string representing the significant digits of the
- * BigDecimal, with no leading zeros.
- *
- * The third value is the base used for arithmetic (currently always 10) as an
- * Integer.
- *
- * The fourth value is an Integer exponent.
- *
- * If the BigDecimal can be represented as 0.xxxxxx*10**n, then xxxxxx is the
- * string of significant digits with no leading zeros, and n is the exponent.
- *
- * From these values, you can translate a BigDecimal to a float as follows:
- *
- *   sign, significant_digits, base, exponent = a.split
- *   f = sign * "0.#{significant_digits}".to_f * (base ** exponent)
- *
- * (Note that the to_f method is provided as a more convenient way to translate
- * a BigDecimal to a Float.)
- */
-static VALUE
-BigDecimal_split(VALUE self)
-{
-    ENTER(5);
-    Real *vp;
-    VALUE obj,str;
-    ssize_t e, s;
-    char *psz1;
-
-    GUARD_OBJ(vp, GetVpValue(self, 1));
-    str = rb_str_new(0, VpNumOfChars(vp, "E"));
-    psz1 = RSTRING_PTR(str);
-    VpSzMantissa(vp, psz1, RSTRING_LEN(str));
-    s = 1;
-    if(psz1[0] == '-') {
-	size_t len = strlen(psz1 + 1);
-
-	memmove(psz1, psz1 + 1, len);
-	psz1[len] = '\0';
-        s = -1;
-    }
-    if (psz1[0] == 'N') s = 0; /* NaN */
-    e = VpExponent10(vp);
-    obj = rb_ary_new2(4);
-    rb_ary_push(obj, INT2FIX(s));
-    rb_ary_push(obj, str);
-    rb_str_resize(str, strlen(psz1));
-    rb_ary_push(obj, INT2FIX(10));
-    rb_ary_push(obj, SSIZET2NUM(e));
-    return obj;
-}
-
-/* Returns the exponent of the BigDecimal number, as an Integer.
- *
- * If the number can be represented as 0.xxxxxx*10**n where xxxxxx is a string
- * of digits with no leading zeros, then n is the exponent.
- */
-static VALUE
-BigDecimal_exponent(VALUE self)
-{
-    ssize_t e = VpExponent10(GetVpValue(self, 1));
-    return SSIZET2NUM(e);
-}
-
-/* Returns a string representation of self.
- *
- *   BigDecimal("1234.5678").inspect
- *     #=> "0.12345678e4"
- */
-static VALUE
-BigDecimal_inspect(VALUE self)
-{
-    ENTER(5);
-    Real *vp;
-    volatile VALUE str;
-    size_t nc;
-
-    GUARD_OBJ(vp, GetVpValue(self, 1));
-    nc = VpNumOfChars(vp, "E");
-
-    str = rb_str_new(0, nc);
-    VpToString(vp, RSTRING_PTR(str), RSTRING_LEN(str), 0, 0);
-    rb_str_resize(str, strlen(RSTRING_PTR(str)));
-    return str;
-}
-
-static VALUE BigMath_s_exp(VALUE, VALUE, VALUE);
-static VALUE BigMath_s_log(VALUE, VALUE, VALUE);
-
-#define BigMath_exp(x, n) BigMath_s_exp(rb_mBigMath, (x), (n))
-#define BigMath_log(x, n) BigMath_s_log(rb_mBigMath, (x), (n))
-
-inline static int
-is_integer(VALUE x)
-{
-    return (RB_TYPE_P(x, T_FIXNUM) || RB_TYPE_P(x, T_BIGNUM));
-}
-
-inline static int
-is_negative(VALUE x)
-{
-    if (FIXNUM_P(x)) {
-	return FIX2LONG(x) < 0;
-    }
-    else if (RB_TYPE_P(x, T_BIGNUM)) {
-	return FIX2INT(rb_big_cmp(x, INT2FIX(0))) < 0;
-    }
-    else if (RB_TYPE_P(x, T_FLOAT)) {
-	return RFLOAT_VALUE(x) < 0.0;
-    }
-    return RTEST(rb_funcall(x, '<', 1, INT2FIX(0)));
-}
-
-#define is_positive(x) (!is_negative(x))
-
-inline static int
-is_zero(VALUE x)
-{
-    VALUE num;
-
-    switch (TYPE(x)) {
-      case T_FIXNUM:
-	return FIX2LONG(x) == 0;
-
-      case T_BIGNUM:
-	return Qfalse;
-
-      case T_RATIONAL:
-	num = rb_rational_num(x);
-	return FIXNUM_P(num) && FIX2LONG(num) == 0;
-
-      default:
-	break;
-    }
-
-    return RTEST(rb_funcall(x, id_eq, 1, INT2FIX(0)));
-}
-
-inline static int
-is_one(VALUE x)
-{
-    VALUE num, den;
-
-    switch (TYPE(x)) {
-      case T_FIXNUM:
-	return FIX2LONG(x) == 1;
-
-      case T_BIGNUM:
-	return Qfalse;
-
-      case T_RATIONAL:
-	num = rb_rational_num(x);
-	den = rb_rational_den(x);
-	return FIXNUM_P(den) && FIX2LONG(den) == 1 &&
-	       FIXNUM_P(num) && FIX2LONG(num) == 1;
-
-      default:
-	break;
-    }
-
-    return RTEST(rb_funcall(x, id_eq, 1, INT2FIX(1)));
-}
-
-inline static int
-is_even(VALUE x)
-{
-    switch (TYPE(x)) {
-      case T_FIXNUM:
-	return (FIX2LONG(x) % 2) == 0;
-
-      case T_BIGNUM:
-        {
-            unsigned long l;
-            rb_big_pack(x, &l, 1);
-            return l % 2 == 0;
-        }
-
-      default:
-	break;
-    }
-
-    return 0;
-}
-
-static VALUE
-bigdecimal_power_by_bigdecimal(Real const* x, Real const* exp, ssize_t const n)
-{
-    VALUE log_x, multiplied, y;
-    volatile VALUE obj = exp->obj;
-
-    if (VpIsZero(exp)) {
-        return VpCheckGetValue(NewOneWrapLimited(1, n));
-    }
-
-    log_x = BigMath_log(x->obj, SSIZET2NUM(n+1));
-    multiplied = BigDecimal_mult2(exp->obj, log_x, SSIZET2NUM(n+1));
-    y = BigMath_exp(multiplied, SSIZET2NUM(n));
-    RB_GC_GUARD(obj);
-
-    return y;
-}
-
-/* call-seq:
- * power(n)
- * power(n, prec)
- *
- * Returns the value raised to the power of n.
- *
- * Note that n must be an Integer.
- *
- * Also available as the operator **.
- */
-static VALUE
-BigDecimal_power(int argc, VALUE*argv, VALUE self)
-{
-    ENTER(5);
-    VALUE vexp, prec;
-    Real* exp = NULL;
-    Real *x, *y;
-    ssize_t mp, ma, n;
-    SIGNED_VALUE int_exp;
-    double d;
-
-    rb_scan_args(argc, argv, "11", &vexp, &prec);
-
-    GUARD_OBJ(x, GetVpValue(self, 1));
-    n = NIL_P(prec) ? (ssize_t)(x->Prec*VpBaseFig()) : NUM2SSIZET(prec);
-
-    if (VpIsNaN(x)) {
-        y = NewZeroWrapLimited(1, n);
-        VpSetNaN(y);
-        RB_GC_GUARD(y->obj);
-        return VpCheckGetValue(y);
-    }
-
-  retry:
-    switch (TYPE(vexp)) {
-      case T_FIXNUM:
-	break;
-
-      case T_BIGNUM:
-	break;
-
-      case T_FLOAT:
-	d = RFLOAT_VALUE(vexp);
-	if (d == round(d)) {
-	    if (FIXABLE(d)) {
-		vexp = LONG2FIX((long)d);
-	    }
-	    else {
-		vexp = rb_dbl2big(d);
-	    }
-	    goto retry;
-	}
-        if (NIL_P(prec)) {
-            n += BIGDECIMAL_DOUBLE_FIGURES;
-        }
-        exp = GetVpValueWithPrec(vexp, 0, 1);
-	break;
-
-      case T_RATIONAL:
-	if (is_zero(rb_rational_num(vexp))) {
-	    if (is_positive(vexp)) {
-		vexp = INT2FIX(0);
-		goto retry;
-	    }
-	}
-	else if (is_one(rb_rational_den(vexp))) {
-	    vexp = rb_rational_num(vexp);
-	    goto retry;
-	}
-	exp = GetVpValueWithPrec(vexp, n, 1);
-        if (NIL_P(prec)) {
-            n += n;
-        }
-	break;
-
-      case T_DATA:
-	if (is_kind_of_BigDecimal(vexp)) {
-	    VALUE zero = INT2FIX(0);
-	    VALUE rounded = BigDecimal_round(1, &zero, vexp);
-	    if (RTEST(BigDecimal_eq(vexp, rounded))) {
-		vexp = BigDecimal_to_i(vexp);
-		goto retry;
-	    }
-            if (NIL_P(prec)) {
-                GUARD_OBJ(y, GetVpValue(vexp, 1));
-                n += y->Prec*VpBaseFig();
-            }
-	    exp = DATA_PTR(vexp);
-	    break;
-	}
-	/* fall through */
-      default:
-	rb_raise(rb_eTypeError,
-		 "wrong argument type %"PRIsVALUE" (expected scalar Numeric)",
-		 RB_OBJ_CLASSNAME(vexp));
-    }
-
-    if (VpIsZero(x)) {
-        if (is_negative(vexp)) {
-            y = NewZeroWrapNolimit(1, n);
-            if (BIGDECIMAL_NEGATIVE_P(x)) {
-                if (is_integer(vexp)) {
-                    if (is_even(vexp)) {
-                        /* (-0) ** (-even_integer)  -> Infinity */
-                        VpSetPosInf(y);
-                    }
-                    else {
-                        /* (-0) ** (-odd_integer)  -> -Infinity */
-                        VpSetNegInf(y);
-                    }
-                }
-                else {
-                    /* (-0) ** (-non_integer)  -> Infinity */
-                    VpSetPosInf(y);
-                }
-            }
-            else {
-                /* (+0) ** (-num)  -> Infinity */
-                VpSetPosInf(y);
-            }
-            RB_GC_GUARD(y->obj);
-            return VpCheckGetValue(y);
-        }
-        else if (is_zero(vexp)) {
-            return VpCheckGetValue(NewOneWrapLimited(1, n));
-        }
-        else {
-            return VpCheckGetValue(NewZeroWrapLimited(1, n));
-        }
-    }
-
-    if (is_zero(vexp)) {
-        return VpCheckGetValue(NewOneWrapLimited(1, n));
-    }
-    else if (is_one(vexp)) {
-        return self;
-    }
-
-    if (VpIsInf(x)) {
-        if (is_negative(vexp)) {
-            if (BIGDECIMAL_NEGATIVE_P(x)) {
-                if (is_integer(vexp)) {
-                    if (is_even(vexp)) {
-                        /* (-Infinity) ** (-even_integer) -> +0 */
-                        return VpCheckGetValue(NewZeroWrapLimited(1, n));
-                    }
-                    else {
-                        /* (-Infinity) ** (-odd_integer) -> -0 */
-                        return VpCheckGetValue(NewZeroWrapLimited(-1, n));
-                    }
-                }
-                else {
-                    /* (-Infinity) ** (-non_integer) -> -0 */
-                    return VpCheckGetValue(NewZeroWrapLimited(-1, n));
-                }
-            }
-            else {
-                return VpCheckGetValue(NewZeroWrapLimited(1, n));
-            }
-        }
-        else {
-            y = NewZeroWrapLimited(1, n);
-            if (BIGDECIMAL_NEGATIVE_P(x)) {
-                if (is_integer(vexp)) {
-                    if (is_even(vexp)) {
-                        VpSetPosInf(y);
-                    }
-                    else {
-                        VpSetNegInf(y);
-                    }
-                }
-                else {
-                    /* TODO: support complex */
-                    rb_raise(rb_eMathDomainError,
-                            "a non-integral exponent for a negative base");
-                }
-            }
-            else {
-                VpSetPosInf(y);
-            }
-            return VpCheckGetValue(y);
-        }
-    }
-
-    if (exp != NULL) {
-        return bigdecimal_power_by_bigdecimal(x, exp, n);
-    }
-    else if (RB_TYPE_P(vexp, T_BIGNUM)) {
-        VALUE abs_value = BigDecimal_abs(self);
-        if (is_one(abs_value)) {
-            return VpCheckGetValue(NewOneWrapLimited(1, n));
-        }
-        else if (RTEST(rb_funcall(abs_value, '<', 1, INT2FIX(1)))) {
-            if (is_negative(vexp)) {
-                y = NewZeroWrapLimited(1, n);
-                VpSetInf(y, (is_even(vexp) ? 1 : -1) * VpGetSign(x));
-                return VpCheckGetValue(y);
-            }
-            else if (BIGDECIMAL_NEGATIVE_P(x) && is_even(vexp)) {
-                return VpCheckGetValue(NewZeroWrapLimited(-1, n));
-            }
-            else {
-                return VpCheckGetValue(NewZeroWrapLimited(1, n));
-            }
-        }
-        else {
-            if (is_positive(vexp)) {
-                y = NewZeroWrapLimited(1, n);
-                VpSetInf(y, (is_even(vexp) ? 1 : -1) * VpGetSign(x));
-                return VpCheckGetValue(y);
-            }
-            else if (BIGDECIMAL_NEGATIVE_P(x) && is_even(vexp)) {
-                return VpCheckGetValue(NewZeroWrapLimited(-1, n));
-            }
-            else {
-                return VpCheckGetValue(NewZeroWrapLimited(1, n));
-            }
-        }
-    }
-
-    int_exp = FIX2LONG(vexp);
-    ma = int_exp;
-    if (ma <  0) ma = -ma;
-    if (ma == 0) ma = 1;
-
-    if (VpIsDef(x)) {
-        mp = x->Prec * (VpBaseFig() + 1);
-        GUARD_OBJ(y, NewZeroWrapLimited(1, mp * (ma + 1)));
-    }
-    else {
-        GUARD_OBJ(y, NewZeroWrapLimited(1, 1));
-    }
-    VpPowerByInt(y, x, int_exp);
-    if (!NIL_P(prec) && VpIsDef(y)) {
-        VpMidRound(y, VpGetRoundMode(), n);
-    }
-    return VpCheckGetValue(y);
-}
-
-/*  call-seq:
- *    self ** other -> bigdecimal
- *
- *  Returns the \BigDecimal value of +self+ raised to power +other+:
- *
- *    b = BigDecimal('3.14')
- *    b ** 2              # => 0.98596e1
- *    b ** 2.0            # => 0.98596e1
- *    b ** Rational(2, 1) # => 0.98596e1
- *
- *  Related: BigDecimal#power.
- *
- */
-static VALUE
-BigDecimal_power_op(VALUE self, VALUE exp)
-{
-    return BigDecimal_power(1, &exp, self);
-}
-
-/* :nodoc:
- *
- * private method for dup and clone the provided BigDecimal +other+
- */
-static VALUE
-BigDecimal_initialize_copy(VALUE self, VALUE other)
-{
-    Real *pv = rb_check_typeddata(self, &BigDecimal_data_type);
-    Real *x = rb_check_typeddata(other, &BigDecimal_data_type);
-
-    if (self != other) {
-	DATA_PTR(self) = VpCopy(pv, x);
-    }
-    return self;
-}
-
-static VALUE
-BigDecimal_clone(VALUE self)
-{
-  return self;
-}
-
-#ifdef HAVE_RB_OPTS_EXCEPTION_P
-int rb_opts_exception_p(VALUE opts, int default_value);
-#define opts_exception_p(opts) rb_opts_exception_p((opts), 1)
-#else
-static int
-opts_exception_p(VALUE opts)
-{
-    static ID kwds[1];
-    VALUE exception;
-    if (!kwds[0]) {
-        kwds[0] = rb_intern_const("exception");
-    }
-    if (!rb_get_kwargs(opts, kwds, 0, 1, &exception)) return 1;
-    switch (exception) {
-      case Qtrue: case Qfalse:
-        break;
-      default:
-        rb_raise(rb_eArgError, "true or false is expected as exception: %+"PRIsVALUE,
-                 exception);
-    }
-    return exception != Qfalse;
-}
-#endif
-
-static VALUE
-check_exception(VALUE bd)
-{
-    assert(is_kind_of_BigDecimal(bd));
-
-    Real *vp;
-    TypedData_Get_Struct(bd, Real, &BigDecimal_data_type, vp);
-    VpCheckGetValue(vp); /* VpCheckGetValue performs exception check */
-
-    return bd;
-}
-
-static VALUE
-rb_uint64_convert_to_BigDecimal(uint64_t uval, RB_UNUSED_VAR(size_t digs), int raise_exception)
-{
-    VALUE obj = TypedData_Wrap_Struct(rb_cBigDecimal, &BigDecimal_data_type, 0);
-
-    Real *vp;
-    if (uval == 0) {
-        vp = rbd_allocate_struct(1);
-        vp->MaxPrec = 1;
-        vp->Prec = 1;
-        vp->exponent = 1;
-        VpSetZero(vp, 1);
-        vp->frac[0] = 0;
-    }
-    else if (uval < BASE) {
-        vp = rbd_allocate_struct(1);
-        vp->MaxPrec = 1;
-        vp->Prec = 1;
-        vp->exponent = 1;
-        VpSetSign(vp, 1);
-        vp->frac[0] = (DECDIG)uval;
-    }
-    else {
-        DECDIG buf[BIGDECIMAL_INT64_MAX_LENGTH] = {0,};
-        DECDIG r = uval % BASE;
-        size_t len = 0, ntz = 0;
-        if (r == 0) {
-            // Count and skip trailing zeros
-            for (; r == 0 && uval > 0; ++ntz) {
-                uval /= BASE;
-                r = uval % BASE;
-            }
-        }
-        for (; uval > 0; ++len) {
-            // Store digits
-            buf[BIGDECIMAL_INT64_MAX_LENGTH - len - 1] = r;
-            uval /= BASE;
-            r = uval % BASE;
-        }
-
-        const size_t exp = len + ntz;
-        vp = rbd_allocate_struct(len);
-        vp->MaxPrec = len;
-        vp->Prec = len;
-        vp->exponent = exp;
-        VpSetSign(vp, 1);
-        MEMCPY(vp->frac, buf + BIGDECIMAL_INT64_MAX_LENGTH - len, DECDIG, len);
-    }
-
-    return BigDecimal_wrap_struct(obj, vp);
-}
-
-static VALUE
-rb_int64_convert_to_BigDecimal(int64_t ival, size_t digs, int raise_exception)
-{
-    const uint64_t uval = (ival < 0) ? (((uint64_t)-(ival+1))+1) : (uint64_t)ival;
-    VALUE bd = rb_uint64_convert_to_BigDecimal(uval, digs, raise_exception);
-    if (ival < 0) {
-        Real *vp;
-        TypedData_Get_Struct(bd, Real, &BigDecimal_data_type, vp);
-        VpSetSign(vp, -1);
-    }
-    return bd;
-}
-
-static VALUE
-rb_big_convert_to_BigDecimal(VALUE val, RB_UNUSED_VAR(size_t digs), int raise_exception)
-{
-    assert(RB_TYPE_P(val, T_BIGNUM));
-
-    int leading_zeros;
-    size_t size = rb_absint_size(val, &leading_zeros);
-    int sign = FIX2INT(rb_big_cmp(val, INT2FIX(0)));
-    if (sign < 0 && leading_zeros == 0) {
-        size += 1;
-    }
-    if (size <= sizeof(long)) {
-        if (sign < 0) {
-            return rb_int64_convert_to_BigDecimal(NUM2LONG(val), digs, raise_exception);
-        }
-        else {
-            return rb_uint64_convert_to_BigDecimal(NUM2ULONG(val), digs, raise_exception);
-        }
-    }
-#if defined(SIZEOF_LONG_LONG) && SIZEOF_LONG < SIZEOF_LONG_LONG
-    else if (size <= sizeof(LONG_LONG)) {
-        if (sign < 0) {
-            return rb_int64_convert_to_BigDecimal(NUM2LL(val), digs, raise_exception);
-        }
-        else {
-            return rb_uint64_convert_to_BigDecimal(NUM2ULL(val), digs, raise_exception);
-        }
-    }
-#endif
-    else {
-        VALUE str = rb_big2str(val, 10);
-        Real *vp = VpCreateRbObject(RSTRING_LEN(str) + BASE_FIG + 1,
-                                    RSTRING_PTR(str), true);
-        RB_GC_GUARD(str);
-        return check_exception(vp->obj);
-    }
-}
-
-static VALUE
-rb_inum_convert_to_BigDecimal(VALUE val, RB_UNUSED_VAR(size_t digs), int raise_exception)
-{
-    assert(RB_INTEGER_TYPE_P(val));
-    if (FIXNUM_P(val)) {
-        return rb_int64_convert_to_BigDecimal(FIX2LONG(val), digs, raise_exception);
-    }
-    else {
-        return rb_big_convert_to_BigDecimal(val, digs, raise_exception);
-    }
-}
-
-static VALUE
-rb_float_convert_to_BigDecimal(VALUE val, size_t digs, int raise_exception)
-{
-    assert(RB_FLOAT_TYPE_P(val));
-
-    double d = RFLOAT_VALUE(val);
-
-    if (isnan(d)) {
-        VALUE obj = BigDecimal_nan();
-        return check_exception(obj);
-    }
-    else if (isinf(d)) {
-        VALUE obj;
-        if (d > 0) {
-            obj = BigDecimal_positive_infinity();
-        }
-        else {
-            obj = BigDecimal_negative_infinity();
-        }
-        return check_exception(obj);
-    }
-    else if (d == 0.0) {
-        if (1/d < 0.0) {
-            return BigDecimal_negative_zero();
-        }
-        else {
-            return BigDecimal_positive_zero();
-        }
-    }
-
-    if (digs == SIZE_MAX) {
-        if (!raise_exception)
-            return Qnil;
-        rb_raise(rb_eArgError,
-                 "can't omit precision for a %"PRIsVALUE".",
-                 CLASS_OF(val));
-    }
-    else if (digs > BIGDECIMAL_DOUBLE_FIGURES) {
-        if (!raise_exception)
-            return Qnil;
-        rb_raise(rb_eArgError, "precision too large.");
-    }
-
-    /* Use the same logic in flo_to_s to convert a float to a decimal string */
-    char buf[BIGDECIMAL_DOUBLE_FIGURES + BASE_FIG + 2 + 1];  /* sizeof(buf) == 28 in the typical case */
-    int decpt, negative_p;
-    char *e;
-    const int mode = digs == 0 ? 0 : 2;
-    char *p = BigDecimal_dtoa(d, mode, (int)digs, &decpt, &negative_p, &e);
-    int len10 = (int)(e - p);
-    if (len10 > BIGDECIMAL_DOUBLE_FIGURES) {
-        /* TODO: Presumably, rounding should be done here. */
-        len10 = BIGDECIMAL_DOUBLE_FIGURES;
-    }
-    memcpy(buf, p, len10);
-    xfree(p);
-
-    VALUE inum;
-    size_t RB_UNUSED_VAR(prec) = 0;
-    SIGNED_VALUE exp = 0;
-    if (decpt > 0) {
-        if (decpt < len10) {
-            /*
-             *     len10 |---------------|
-             *           :       |-------| frac_len10 = len10 - decpt
-             *     decpt |-------|       |--| ntz10 = BASE_FIG - frac_len10 % BASE_FIG
-             *           :       :       :
-             *         00 dd dddd.dddd dd 00
-             *   prec |-----.----.----.-----| prec = exp + roomof(frac_len, BASE_FIG)
-             *   exp  |-----.----| exp = roomof(decpt, BASE_FIG)
-             */
-            const size_t frac_len10 = len10 - decpt;
-            const size_t ntz10 = BASE_FIG - frac_len10 % BASE_FIG;
-            memset(buf + len10, '0', ntz10);
-            buf[len10 + ntz10] = '\0';
-            inum = rb_cstr_to_inum(buf, 10, false);
-
-            exp = roomof(decpt, BASE_FIG);
-            prec = exp + roomof(frac_len10, BASE_FIG);
-        }
-        else {
-            /*
-             *      decpt |-----------------------|
-             *      len10 |----------|            :
-             *            :          |------------| exp10
-             *            :          :            :
-             *          00 dd dddd dd 00 0000 0000.0
-             *         :             :  :         :
-             *         :             |--| ntz10 = exp10 % BASE_FIG
-             *    prec |-----.----.-----|         :
-             *         :                |----.----| exp10 / BASE_FIG
-             *     exp |-----.----.-----.----.----|
-             */
-            const size_t exp10 = decpt - len10;
-            const size_t ntz10 = exp10 % BASE_FIG;
-
-            memset(buf + len10, '0', ntz10);
-            buf[len10 + ntz10] = '\0';
-            inum = rb_cstr_to_inum(buf, 10, false);
-
-            prec = roomof(len10 + ntz10, BASE_FIG);
-            exp = prec + exp10 / BASE_FIG;
-        }
-    }
-    else if (decpt == 0) {
-        /*
-         *   len10 |------------|
-         *         :            :
-         *        0.dddd dddd dd 00
-         *         :            :  :
-         *         :            |--| ntz10 = prec * BASE_FIG - len10
-         *    prec |----.----.-----| roomof(len10, BASE_FIG)
-         */
-        prec = roomof(len10, BASE_FIG);
-        const size_t ntz10 = prec * BASE_FIG - len10;
-
-        memset(buf + len10, '0', ntz10);
-        buf[len10 + ntz10] = '\0';
-        inum = rb_cstr_to_inum(buf, 10, false);
-    }
-    else {
-        /*
-         *           len10 |---------------|
-         *                 :               :
-         *   decpt |-------|               |--| ntz10 = prec * BASE_FIG - nlz10 - len10
-         *         :       :               :
-         *        0.0000 00 dd dddd dddd dd 00
-         *              :  :                  :
-         *        nlz10 |--|                  : decpt % BASE_FIG
-         *         prec |-----.----.----.-----| roomof(decpt + len10, BASE_FIG) - exp
-         *    exp  |----| decpt / BASE_FIG
-         */
-        decpt = -decpt;
-
-        const size_t nlz10 = decpt % BASE_FIG;
-        exp = decpt / BASE_FIG;
-        prec = roomof(decpt + len10, BASE_FIG) - exp;
-        const size_t ntz10 = prec * BASE_FIG - nlz10 - len10;
-
-        if (nlz10 > 0) {
-            memmove(buf + nlz10, buf, len10);
-            memset(buf, '0', nlz10);
-        }
-        memset(buf + nlz10 + len10, '0', ntz10);
-        buf[nlz10 + len10 + ntz10] = '\0';
-        inum = rb_cstr_to_inum(buf, 10, false);
-
-        exp = -exp;
-    }
-
-    VALUE bd = rb_inum_convert_to_BigDecimal(inum, SIZE_MAX, raise_exception);
-    Real *vp;
-    TypedData_Get_Struct(bd, Real, &BigDecimal_data_type, vp);
-    assert(vp->Prec == prec);
-    vp->exponent = exp;
-
-    if (negative_p) VpSetSign(vp, -1);
-    return bd;
-}
-
-static VALUE
-rb_rational_convert_to_BigDecimal(VALUE val, size_t digs, int raise_exception)
-{
-    assert(RB_TYPE_P(val, T_RATIONAL));
-
-    if (digs == SIZE_MAX) {
-        if (!raise_exception)
-            return Qnil;
-        rb_raise(rb_eArgError,
-                 "can't omit precision for a %"PRIsVALUE".",
-                 CLASS_OF(val));
-    }
-
-    VALUE num = rb_inum_convert_to_BigDecimal(rb_rational_num(val), 0, raise_exception);
-    VALUE d = BigDecimal_div2(num, rb_rational_den(val), SIZET2NUM(digs));
-    return d;
-}
-
-static VALUE
-rb_cstr_convert_to_BigDecimal(const char *c_str, size_t digs, int raise_exception)
-{
-    if (digs == SIZE_MAX)
-        digs = 0;
-
-    Real *vp = VpCreateRbObject(digs, c_str, raise_exception);
-    if (!vp)
-        return Qnil;
-    return VpCheckGetValue(vp);
-}
-
-static inline VALUE
-rb_str_convert_to_BigDecimal(VALUE val, size_t digs, int raise_exception)
-{
-    const char *c_str = StringValueCStr(val);
-    return rb_cstr_convert_to_BigDecimal(c_str, digs, raise_exception);
-}
-
-static VALUE
-rb_convert_to_BigDecimal(VALUE val, size_t digs, int raise_exception)
-{
-    switch (val) {
-      case Qnil:
-      case Qtrue:
-      case Qfalse:
-        if (raise_exception) {
-            const char *cname = NIL_P(val)    ? "nil"   :
-                                val == Qtrue  ? "true"  :
-                                val == Qfalse ? "false" :
-                                NULL;
-            rb_raise(rb_eTypeError,
-                       "can't convert %s into BigDecimal", cname);
-        }
-        return Qnil;
-
-      default:
-        break;
-    }
-
-    if (is_kind_of_BigDecimal(val)) {
-        if (digs == SIZE_MAX)
-            return check_exception(val);
-
-        Real *vp;
-        TypedData_Get_Struct(val, Real, &BigDecimal_data_type, vp);
-
-        VALUE copy = TypedData_Wrap_Struct(rb_cBigDecimal, &BigDecimal_data_type, 0);
-        vp = VpCopy(NULL, vp);
-        /* TODO: rounding */
-        BigDecimal_wrap_struct(copy, vp);
-        return VpCheckGetValue(vp);
-    }
-    else if (RB_INTEGER_TYPE_P(val)) {
-        return rb_inum_convert_to_BigDecimal(val, digs, raise_exception);
-    }
-    else if (RB_FLOAT_TYPE_P(val)) {
-        return rb_float_convert_to_BigDecimal(val, digs, raise_exception);
-    }
-    else if (RB_TYPE_P(val, T_RATIONAL)) {
-        return rb_rational_convert_to_BigDecimal(val, digs, raise_exception);
-    }
-    else if (RB_TYPE_P(val, T_COMPLEX)) {
-        VALUE im = rb_complex_imag(val);
-        if (!is_zero(im)) {
-            /* TODO: handle raise_exception */
-            rb_raise(rb_eArgError,
-                     "Unable to make a BigDecimal from non-zero imaginary number");
-        }
-        return rb_convert_to_BigDecimal(rb_complex_real(val), digs, raise_exception);
-    }
-    else if (RB_TYPE_P(val, T_STRING)) {
-        return rb_str_convert_to_BigDecimal(val, digs, raise_exception);
-    }
-
-    /* TODO: chheck to_d */
-    /* TODO: chheck to_int */
-
-    VALUE str = rb_check_convert_type(val, T_STRING, "String", "to_str");
-    if (!RB_TYPE_P(str, T_STRING)) {
-        if (raise_exception) {
-            rb_raise(rb_eTypeError,
-                     "can't convert %"PRIsVALUE" into BigDecimal", rb_obj_class(val));
-        }
-        return Qnil;
-    }
-    return rb_str_convert_to_BigDecimal(str, digs, raise_exception);
-}
-
-/*  call-seq:
- *    BigDecimal(value, exception: true) -> bigdecimal
- *    BigDecimal(value, ndigits, exception: true) -> bigdecimal
- *
- *  Returns the \BigDecimal converted from +value+
- *  with a precision of +ndigits+ decimal digits.
- *
- *  When +ndigits+ is less than the number of significant digits
- *  in the value, the result is rounded to that number of digits,
- *  according to the current rounding mode; see BigDecimal.mode.
- *
- *  When +ndigits+ is 0, the number of digits to correctly represent a float number
- *  is determined automatically.
- *
- *  Returns +value+ converted to a \BigDecimal, depending on the type of +value+:
- *
- *  - Integer, Float, Rational, Complex, or BigDecimal: converted directly:
- *
- *      # Integer, Complex, or BigDecimal value does not require ndigits; ignored if given.
- *      BigDecimal(2)                     # => 0.2e1
- *      BigDecimal(Complex(2, 0))         # => 0.2e1
- *      BigDecimal(BigDecimal(2))         # => 0.2e1
- *      # Float or Rational value requires ndigits.
- *      BigDecimal(2.0, 0)                # => 0.2e1
- *      BigDecimal(Rational(2, 1), 0)     # => 0.2e1
- *
- *  - String: converted by parsing if it contains an integer or floating-point literal;
- *    leading and trailing whitespace is ignored:
- *
- *      # String does not require ndigits; ignored if given.
- *      BigDecimal('2')     # => 0.2e1
- *      BigDecimal('2.0')   # => 0.2e1
- *      BigDecimal('0.2e1') # => 0.2e1
- *      BigDecimal(' 2.0 ') # => 0.2e1
- *
- *  - Other type that responds to method <tt>:to_str</tt>:
- *    first converted to a string, then converted to a \BigDecimal, as above.
- *
- *  - Other type:
- *
- *    - Raises an exception if keyword argument +exception+ is +true+.
- *    - Returns +nil+ if keyword argument +exception+ is +false+.
- *
- *  Raises an exception if +value+ evaluates to a Float
- *  and +digits+ is larger than Float::DIG + 1.
- *
- */
-static VALUE
-f_BigDecimal(int argc, VALUE *argv, VALUE self)
-{
-    VALUE val, digs_v, opts = Qnil;
-    argc = rb_scan_args(argc, argv, "11:", &val, &digs_v, &opts);
-    int exception = opts_exception_p(opts);
-
-    size_t digs = SIZE_MAX; /* this means digs is omitted */
-    if (argc > 1) {
-        digs_v = rb_to_int(digs_v);
-        if (FIXNUM_P(digs_v)) {
-            long n = FIX2LONG(digs_v);
-            if (n < 0)
-                goto negative_digs;
-            digs = (size_t)n;
-        }
-        else {
-            if (RBIGNUM_NEGATIVE_P(digs_v)) {
-              negative_digs:
-                if (!exception)
-                    return Qnil;
-                rb_raise(rb_eArgError, "negative precision");
-            }
-            digs = NUM2SIZET(digs_v);
-        }
-    }
-
-    return rb_convert_to_BigDecimal(val, digs, exception);
-}
-
-static VALUE
-BigDecimal_s_interpret_loosely(VALUE klass, VALUE str)
-{
-    char const *c_str = StringValueCStr(str);
-    Real *vp = VpNewRbClass(0, c_str, klass, false, true);
-    if (!vp)
-        return Qnil;
-    else
-        return VpCheckGetValue(vp);
-}
-
- /* call-seq:
-  * BigDecimal.limit(digits)
-  *
-  * Limit the number of significant digits in newly created BigDecimal
-  * numbers to the specified value. Rounding is performed as necessary,
-  * as specified by BigDecimal.mode.
-  *
-  * A limit of 0, the default, means no upper limit.
-  *
-  * The limit specified by this method takes less priority over any limit
-  * specified to instance methods such as ceil, floor, truncate, or round.
-  */
-static VALUE
-BigDecimal_limit(int argc, VALUE *argv, VALUE self)
-{
-    VALUE  nFig;
-    VALUE  nCur = SIZET2NUM(VpGetPrecLimit());
-
-    if (rb_scan_args(argc, argv, "01", &nFig) == 1) {
-	int nf;
-	if (NIL_P(nFig)) return nCur;
-	nf = NUM2INT(nFig);
-	if (nf < 0) {
-	    rb_raise(rb_eArgError, "argument must be positive");
-	}
-	VpSetPrecLimit(nf);
-    }
-    return nCur;
-}
-
-/* Returns the sign of the value.
- *
- * Returns a positive value if > 0, a negative value if < 0.
- * It behaves the same with zeros -
- * it returns a positive value for a positive zero (BigDecimal('0')) and
- * a negative value for a negative zero (BigDecimal('-0')).
- *
- * The specific value returned indicates the type and sign of the BigDecimal,
- * as follows:
- *
- * BigDecimal::SIGN_NaN:: value is Not a Number
- * BigDecimal::SIGN_POSITIVE_ZERO:: value is +0
- * BigDecimal::SIGN_NEGATIVE_ZERO:: value is -0
- * BigDecimal::SIGN_POSITIVE_INFINITE:: value is +Infinity
- * BigDecimal::SIGN_NEGATIVE_INFINITE:: value is -Infinity
- * BigDecimal::SIGN_POSITIVE_FINITE:: value is positive
- * BigDecimal::SIGN_NEGATIVE_FINITE:: value is negative
- */
-static VALUE
-BigDecimal_sign(VALUE self)
-{ /* sign */
-    int s = GetVpValue(self, 1)->sign;
-    return INT2FIX(s);
-}
-
-/*
- * call-seq: BigDecimal.save_exception_mode { ... }
- *
- * Execute the provided block, but preserve the exception mode
- *
- *     BigDecimal.save_exception_mode do
- *       BigDecimal.mode(BigDecimal::EXCEPTION_OVERFLOW, false)
- *       BigDecimal.mode(BigDecimal::EXCEPTION_NaN, false)
- *
- *       BigDecimal(BigDecimal('Infinity'))
- *       BigDecimal(BigDecimal('-Infinity'))
- *       BigDecimal(BigDecimal('NaN'))
- *     end
- *
- * For use with the BigDecimal::EXCEPTION_*
- *
- * See BigDecimal.mode
- */
-static VALUE
-BigDecimal_save_exception_mode(VALUE self)
-{
-    unsigned short const exception_mode = VpGetException();
-    int state;
-    VALUE ret = rb_protect(rb_yield, Qnil, &state);
-    VpSetException(exception_mode);
-    if (state) rb_jump_tag(state);
-    return ret;
-}
-
-/*
- * call-seq: BigDecimal.save_rounding_mode { ... }
- *
- * Execute the provided block, but preserve the rounding mode
- *
- *     BigDecimal.save_rounding_mode do
- *       BigDecimal.mode(BigDecimal::ROUND_MODE, :up)
- *       puts BigDecimal.mode(BigDecimal::ROUND_MODE)
- *     end
- *
- * For use with the BigDecimal::ROUND_*
- *
- * See BigDecimal.mode
- */
-static VALUE
-BigDecimal_save_rounding_mode(VALUE self)
-{
-    unsigned short const round_mode = VpGetRoundMode();
-    int state;
-    VALUE ret = rb_protect(rb_yield, Qnil, &state);
-    VpSetRoundMode(round_mode);
-    if (state) rb_jump_tag(state);
-    return ret;
-}
-
-/*
- * call-seq: BigDecimal.save_limit { ... }
- *
- * Execute the provided block, but preserve the precision limit
- *
- *      BigDecimal.limit(100)
- *      puts BigDecimal.limit
- *      BigDecimal.save_limit do
- *          BigDecimal.limit(200)
- *          puts BigDecimal.limit
- *      end
- *      puts BigDecimal.limit
- *
- */
-static VALUE
-BigDecimal_save_limit(VALUE self)
-{
-    size_t const limit = VpGetPrecLimit();
-    int state;
-    VALUE ret = rb_protect(rb_yield, Qnil, &state);
-    VpSetPrecLimit(limit);
-    if (state) rb_jump_tag(state);
-    return ret;
-}
-
-/* call-seq:
- * BigMath.exp(decimal, numeric)    -> BigDecimal
- *
- * Computes the value of e (the base of natural logarithms) raised to the
- * power of +decimal+, to the specified number of digits of precision.
- *
- * If +decimal+ is infinity, returns Infinity.
- *
- * If +decimal+ is NaN, returns NaN.
- */
-static VALUE
-BigMath_s_exp(VALUE klass, VALUE x, VALUE vprec)
-{
-    ssize_t prec, n, i;
-    Real* vx = NULL;
-    VALUE one, d, y;
-    int negative = 0;
-    int infinite = 0;
-    int nan = 0;
-    double flo;
-
-    prec = NUM2SSIZET(vprec);
-    if (prec <= 0) {
-	rb_raise(rb_eArgError, "Zero or negative precision for exp");
-    }
-
-    /* TODO: the following switch statement is almost same as one in the
-     *       BigDecimalCmp function. */
-    switch (TYPE(x)) {
-      case T_DATA:
-	if (!is_kind_of_BigDecimal(x)) break;
-	vx = DATA_PTR(x);
-	negative = BIGDECIMAL_NEGATIVE_P(vx);
-	infinite = VpIsPosInf(vx) || VpIsNegInf(vx);
-	nan = VpIsNaN(vx);
-	break;
-
-      case T_FIXNUM:
-	/* fall through */
-      case T_BIGNUM:
-	vx = GetVpValue(x, 0);
-	break;
-
-      case T_FLOAT:
-	flo = RFLOAT_VALUE(x);
-	negative = flo < 0;
-	infinite = isinf(flo);
-	nan = isnan(flo);
-	if (!infinite && !nan) {
-	    vx = GetVpValueWithPrec(x, 0, 0);
-	}
-	break;
-
-      case T_RATIONAL:
-	vx = GetVpValueWithPrec(x, prec, 0);
-	break;
-
-      default:
-	break;
-    }
-    if (infinite) {
-	if (negative) {
-            return VpCheckGetValue(GetVpValueWithPrec(INT2FIX(0), prec, 1));
-	}
-	else {
-	    Real* vy = NewZeroWrapNolimit(1, prec);
-	    VpSetInf(vy, VP_SIGN_POSITIVE_INFINITE);
-	    RB_GC_GUARD(vy->obj);
-            return VpCheckGetValue(vy);
-	}
-    }
-    else if (nan) {
-        Real* vy = NewZeroWrapNolimit(1, prec);
-        VpSetNaN(vy);
-        RB_GC_GUARD(vy->obj);
-        return VpCheckGetValue(vy);
-    }
-    else if (vx == NULL) {
-	cannot_be_coerced_into_BigDecimal(rb_eArgError, x);
-    }
-    x = vx->obj;
-
-    n = prec + BIGDECIMAL_DOUBLE_FIGURES;
-    negative = BIGDECIMAL_NEGATIVE_P(vx);
-    if (negative) {
-        VALUE x_zero = INT2NUM(1);
-        VALUE x_copy = f_BigDecimal(1, &x_zero, klass);
-        x = BigDecimal_initialize_copy(x_copy, x);
-        vx = DATA_PTR(x);
-	VpSetSign(vx, 1);
-    }
-
-    one = VpCheckGetValue(NewOneWrapLimited(1, 1));
-    y   = one;
-    d   = y;
-    i   = 1;
-
-    while (!VpIsZero((Real*)DATA_PTR(d))) {
-	SIGNED_VALUE const ey = VpExponent10(DATA_PTR(y));
-	SIGNED_VALUE const ed = VpExponent10(DATA_PTR(d));
-	ssize_t m = n - vabs(ey - ed);
-
-	rb_thread_check_ints();
-
-	if (m <= 0) {
-	    break;
-	}
-	else if ((size_t)m < BIGDECIMAL_DOUBLE_FIGURES) {
-	    m = BIGDECIMAL_DOUBLE_FIGURES;
-	}
-
-	d = BigDecimal_mult(d, x);                             /* d <- d * x */
-	d = BigDecimal_div2(d, SSIZET2NUM(i), SSIZET2NUM(m));  /* d <- d / i */
-	y = BigDecimal_add(y, d);                              /* y <- y + d  */
-	++i;                                                   /* i  <- i + 1 */
-    }
-
-    if (negative) {
-	return BigDecimal_div2(one, y, vprec);
-    }
-    else {
-	vprec = SSIZET2NUM(prec - VpExponent10(DATA_PTR(y)));
-	return BigDecimal_round(1, &vprec, y);
-    }
-
-    RB_GC_GUARD(one);
-    RB_GC_GUARD(x);
-    RB_GC_GUARD(y);
-    RB_GC_GUARD(d);
-}
-
-/* call-seq:
- * BigMath.log(decimal, numeric)    -> BigDecimal
- *
- * Computes the natural logarithm of +decimal+ to the specified number of
- * digits of precision, +numeric+.
- *
- * If +decimal+ is zero or negative, raises Math::DomainError.
- *
- * If +decimal+ is positive infinity, returns Infinity.
- *
- * If +decimal+ is NaN, returns NaN.
- */
-static VALUE
-BigMath_s_log(VALUE klass, VALUE x, VALUE vprec)
-{
-    ssize_t prec, n, i;
-    SIGNED_VALUE expo;
-    Real* vx = NULL;
-    VALUE vn, one, two, w, x2, y, d;
-    int zero = 0;
-    int negative = 0;
-    int infinite = 0;
-    int nan = 0;
-    double flo;
-    long fix;
-
-    if (!is_integer(vprec)) {
-	rb_raise(rb_eArgError, "precision must be an Integer");
-    }
-
-    prec = NUM2SSIZET(vprec);
-    if (prec <= 0) {
-	rb_raise(rb_eArgError, "Zero or negative precision for exp");
-    }
-
-    /* TODO: the following switch statement is almost same as one in the
-     *       BigDecimalCmp function. */
-    switch (TYPE(x)) {
-      case T_DATA:
-	  if (!is_kind_of_BigDecimal(x)) break;
-	  vx = DATA_PTR(x);
-	  zero = VpIsZero(vx);
-	  negative = BIGDECIMAL_NEGATIVE_P(vx);
-	  infinite = VpIsPosInf(vx) || VpIsNegInf(vx);
-	  nan = VpIsNaN(vx);
-	  break;
-
-      case T_FIXNUM:
-	fix = FIX2LONG(x);
-	zero = fix == 0;
-	negative = fix < 0;
-	goto get_vp_value;
-
-      case T_BIGNUM:
-        i = FIX2INT(rb_big_cmp(x, INT2FIX(0)));
-	zero = i == 0;
-	negative = i < 0;
-get_vp_value:
-	if (zero || negative) break;
-	vx = GetVpValue(x, 0);
-	break;
-
-      case T_FLOAT:
-	flo = RFLOAT_VALUE(x);
-	zero = flo == 0;
-	negative = flo < 0;
-	infinite = isinf(flo);
-	nan = isnan(flo);
-	if (!zero && !negative && !infinite && !nan) {
-	    vx = GetVpValueWithPrec(x, 0, 1);
-	}
-	break;
-
-      case T_RATIONAL:
-	zero = RRATIONAL_ZERO_P(x);
-	negative = RRATIONAL_NEGATIVE_P(x);
-	if (zero || negative) break;
-	vx = GetVpValueWithPrec(x, prec, 1);
-	break;
-
-      case T_COMPLEX:
-	rb_raise(rb_eMathDomainError,
-		 "Complex argument for BigMath.log");
-
-      default:
-	break;
-    }
-    if (infinite && !negative) {
-        Real *vy = NewZeroWrapNolimit(1, prec);
-	RB_GC_GUARD(vy->obj);
-	VpSetInf(vy, VP_SIGN_POSITIVE_INFINITE);
-        return VpCheckGetValue(vy);
-    }
-    else if (nan) {
-	Real* vy = NewZeroWrapNolimit(1, prec);
-	RB_GC_GUARD(vy->obj);
-	VpSetNaN(vy);
-        return VpCheckGetValue(vy);
-    }
-    else if (zero || negative) {
-	rb_raise(rb_eMathDomainError,
-		 "Zero or negative argument for log");
-    }
-    else if (vx == NULL) {
-	cannot_be_coerced_into_BigDecimal(rb_eArgError, x);
-    }
-    x = VpCheckGetValue(vx);
-
-    one = VpCheckGetValue(NewOneWrapLimited(1, 1));
-    two = VpCheckGetValue(VpCreateRbObject(1, "2", true));
-
-    n = prec + BIGDECIMAL_DOUBLE_FIGURES;
-    vn = SSIZET2NUM(n);
-    expo = VpExponent10(vx);
-    if (expo < 0 || expo >= 3) {
-	char buf[DECIMAL_SIZE_OF_BITS(SIZEOF_VALUE * CHAR_BIT) + 4];
-	snprintf(buf, sizeof(buf), "1E%"PRIdVALUE, -expo);
-        x = BigDecimal_mult2(x, VpCheckGetValue(VpCreateRbObject(1, buf, true)), vn);
-    }
-    else {
-	expo = 0;
-    }
-    w = BigDecimal_sub(x, one);
-    x = BigDecimal_div2(w, BigDecimal_add(x, one), vn);
-    x2 = BigDecimal_mult2(x, x, vn);
-    y = x;
-    d = y;
-    i = 1;
-    while (!VpIsZero((Real*)DATA_PTR(d))) {
-	SIGNED_VALUE const ey = VpExponent10(DATA_PTR(y));
-	SIGNED_VALUE const ed = VpExponent10(DATA_PTR(d));
-	ssize_t m = n - vabs(ey - ed);
-	if (m <= 0) {
-	    break;
-	}
-	else if ((size_t)m < BIGDECIMAL_DOUBLE_FIGURES) {
-	    m = BIGDECIMAL_DOUBLE_FIGURES;
-	}
-
-	x = BigDecimal_mult2(x2, x, vn);
-	i += 2;
-	d = BigDecimal_div2(x, SSIZET2NUM(i), SSIZET2NUM(m));
-	y = BigDecimal_add(y, d);
-    }
-
-    y = BigDecimal_mult(y, two);
-    if (expo != 0) {
-	VALUE log10, vexpo, dy;
-	log10 = BigMath_s_log(klass, INT2FIX(10), vprec);
-        vexpo = VpCheckGetValue(GetVpValue(SSIZET2NUM(expo), 1));
-	dy = BigDecimal_mult(log10, vexpo);
-	y = BigDecimal_add(y, dy);
-    }
-
-    RB_GC_GUARD(one);
-    RB_GC_GUARD(two);
-    RB_GC_GUARD(vn);
-    RB_GC_GUARD(x2);
-    RB_GC_GUARD(y);
-    RB_GC_GUARD(d);
-
-    return y;
-}
-
-static VALUE BIGDECIMAL_NAN = Qnil;
-
-static VALUE
-BigDecimal_nan(void)
-{
-    return BIGDECIMAL_NAN;
-}
-
-static VALUE BIGDECIMAL_POSITIVE_INFINITY = Qnil;
-
-static VALUE
-BigDecimal_positive_infinity(void)
-{
-    return BIGDECIMAL_POSITIVE_INFINITY;
-}
-
-static VALUE BIGDECIMAL_NEGATIVE_INFINITY = Qnil;
-
-static VALUE
-BigDecimal_negative_infinity(void)
-{
-    return BIGDECIMAL_NEGATIVE_INFINITY;
-}
-
-static VALUE BIGDECIMAL_POSITIVE_ZERO = Qnil;
-
-static VALUE
-BigDecimal_positive_zero(void)
-{
-    return BIGDECIMAL_POSITIVE_ZERO;
-}
-
-static VALUE BIGDECIMAL_NEGATIVE_ZERO = Qnil;
-
-static VALUE
-BigDecimal_negative_zero(void)
-{
-    return BIGDECIMAL_NEGATIVE_ZERO;
-}
-
-/* Document-class: BigDecimal
- * BigDecimal provides arbitrary-precision floating point decimal arithmetic.
- *
- * == Introduction
- *
- * Ruby provides built-in support for arbitrary precision integer arithmetic.
- *
- * For example:
- *
- *	42**13  #=>   1265437718438866624512
- *
- * BigDecimal provides similar support for very large or very accurate floating
- * point numbers.
- *
- * Decimal arithmetic is also useful for general calculation, because it
- * provides the correct answers people expect--whereas normal binary floating
- * point arithmetic often introduces subtle errors because of the conversion
- * between base 10 and base 2.
- *
- * For example, try:
- *
- *   sum = 0
- *   10_000.times do
- *     sum = sum + 0.0001
- *   end
- *   print sum #=> 0.9999999999999062
- *
- * and contrast with the output from:
- *
- *   require 'bigdecimal'
- *
- *   sum = BigDecimal("0")
- *   10_000.times do
- *     sum = sum + BigDecimal("0.0001")
- *   end
- *   print sum #=> 0.1E1
- *
- * Similarly:
- *
- *	(BigDecimal("1.2") - BigDecimal("1.0")) == BigDecimal("0.2") #=> true
- *
- *	(1.2 - 1.0) == 0.2 #=> false
- *
- * == A Note About Precision
- *
- * For a calculation using a \BigDecimal and another +value+,
- * the precision of the result depends on the type of +value+:
- *
- * - If +value+ is a \Float,
- *   the precision is Float::DIG + 1.
- * - If +value+ is a \Rational, the precision is larger than Float::DIG + 1.
- * - If +value+ is a \BigDecimal, the precision is +value+'s precision in the
- *   internal representation, which is platform-dependent.
- * - If +value+ is other object, the precision is determined by the result of +BigDecimal(value)+.
- *
- * == Special features of accurate decimal arithmetic
- *
- * Because BigDecimal is more accurate than normal binary floating point
- * arithmetic, it requires some special values.
- *
- * === Infinity
- *
- * BigDecimal sometimes needs to return infinity, for example if you divide
- * a value by zero.
- *
- *	BigDecimal("1.0") / BigDecimal("0.0")  #=> Infinity
- *	BigDecimal("-1.0") / BigDecimal("0.0")  #=> -Infinity
- *
- * You can represent infinite numbers to BigDecimal using the strings
- * <code>'Infinity'</code>, <code>'+Infinity'</code> and
- * <code>'-Infinity'</code> (case-sensitive)
- *
- * === Not a Number
- *
- * When a computation results in an undefined value, the special value +NaN+
- * (for 'not a number') is returned.
- *
- * Example:
- *
- *	BigDecimal("0.0") / BigDecimal("0.0") #=> NaN
- *
- * You can also create undefined values.
- *
- * NaN is never considered to be the same as any other value, even NaN itself:
- *
- *	n = BigDecimal('NaN')
- *	n == 0.0 #=> false
- *	n == n #=> false
- *
- * === Positive and negative zero
- *
- * If a computation results in a value which is too small to be represented as
- * a BigDecimal within the currently specified limits of precision, zero must
- * be returned.
- *
- * If the value which is too small to be represented is negative, a BigDecimal
- * value of negative zero is returned.
- *
- *	BigDecimal("1.0") / BigDecimal("-Infinity") #=> -0.0
- *
- * If the value is positive, a value of positive zero is returned.
- *
- *	BigDecimal("1.0") / BigDecimal("Infinity") #=> 0.0
- *
- * (See BigDecimal.mode for how to specify limits of precision.)
- *
- * Note that +-0.0+ and +0.0+ are considered to be the same for the purposes of
- * comparison.
- *
- * Note also that in mathematics, there is no particular concept of negative
- * or positive zero; true mathematical zero has no sign.
- *
- * == bigdecimal/util
- *
- * When you require +bigdecimal/util+, the #to_d method will be
- * available on BigDecimal and the native Integer, Float, Rational,
- * and String classes:
- *
- *	require 'bigdecimal/util'
- *
- *      42.to_d         # => 0.42e2
- *      0.5.to_d        # => 0.5e0
- *      (2/3r).to_d(3)  # => 0.667e0
- *      "0.5".to_d      # => 0.5e0
- *
- * == License
- *
- * Copyright (C) 2002 by Shigeo Kobayashi <shigeo@tinyforest.gr.jp>.
- *
- * BigDecimal is released under the Ruby and 2-clause BSD licenses.
- * See LICENSE.txt for details.
- *
- * Maintained by mrkn <mrkn@mrkn.jp> and ruby-core members.
- *
- * Documented by zzak <zachary@zacharyscott.net>, mathew <meta@pobox.com>, and
- * many other contributors.
- */
-void
-Init_bigdecimal(void)
-{
-#ifdef HAVE_RB_EXT_RACTOR_SAFE
-    rb_ext_ractor_safe(true);
-#endif
-    VALUE arg;
-
-    id_BigDecimal_exception_mode = rb_intern_const("BigDecimal.exception_mode");
-    id_BigDecimal_rounding_mode = rb_intern_const("BigDecimal.rounding_mode");
-    id_BigDecimal_precision_limit = rb_intern_const("BigDecimal.precision_limit");
-
-    /* Initialize VP routines */
-    VpInit(0UL);
-
-    /* Class and method registration */
-    rb_cBigDecimal = rb_define_class("BigDecimal", rb_cNumeric);
-
-    /* Global function */
-    rb_define_global_function("BigDecimal", f_BigDecimal, -1);
-
-    /* Class methods */
-    rb_undef_alloc_func(rb_cBigDecimal);
-    rb_undef_method(CLASS_OF(rb_cBigDecimal), "new");
-    rb_define_singleton_method(rb_cBigDecimal, "interpret_loosely", BigDecimal_s_interpret_loosely, 1);
-    rb_define_singleton_method(rb_cBigDecimal, "mode", BigDecimal_mode, -1);
-    rb_define_singleton_method(rb_cBigDecimal, "limit", BigDecimal_limit, -1);
-    rb_define_singleton_method(rb_cBigDecimal, "double_fig", BigDecimal_double_fig, 0);
-    rb_define_singleton_method(rb_cBigDecimal, "_load", BigDecimal_load, 1);
-
-    rb_define_singleton_method(rb_cBigDecimal, "save_exception_mode", BigDecimal_save_exception_mode, 0);
-    rb_define_singleton_method(rb_cBigDecimal, "save_rounding_mode", BigDecimal_save_rounding_mode, 0);
-    rb_define_singleton_method(rb_cBigDecimal, "save_limit", BigDecimal_save_limit, 0);
-
-    /* Constants definition */
-
-    /*
-     * The version of bigdecimal library
-     */
-    rb_define_const(rb_cBigDecimal, "VERSION", rb_str_new2(BIGDECIMAL_VERSION));
-
-    /*
-     * Base value used in internal calculations.  On a 32 bit system, BASE
-     * is 10000, indicating that calculation is done in groups of 4 digits.
-     * (If it were larger, BASE**2 wouldn't fit in 32 bits, so you couldn't
-     * guarantee that two groups could always be multiplied together without
-     * overflow.)
-     */
-    rb_define_const(rb_cBigDecimal, "BASE", INT2FIX((SIGNED_VALUE)VpBaseVal()));
-
-    /* Exceptions */
-
-    /*
-     * 0xff: Determines whether overflow, underflow or zero divide result in
-     * an exception being thrown. See BigDecimal.mode.
-     */
-    rb_define_const(rb_cBigDecimal, "EXCEPTION_ALL", INT2FIX(VP_EXCEPTION_ALL));
-
-    /*
-     * 0x02: Determines what happens when the result of a computation is not a
-     * number (NaN). See BigDecimal.mode.
-     */
-    rb_define_const(rb_cBigDecimal, "EXCEPTION_NaN", INT2FIX(VP_EXCEPTION_NaN));
-
-    /*
-     * 0x01: Determines what happens when the result of a computation is
-     * infinity.  See BigDecimal.mode.
-     */
-    rb_define_const(rb_cBigDecimal, "EXCEPTION_INFINITY", INT2FIX(VP_EXCEPTION_INFINITY));
-
-    /*
-     * 0x04: Determines what happens when the result of a computation is an
-     * underflow (a result too small to be represented). See BigDecimal.mode.
-     */
-    rb_define_const(rb_cBigDecimal, "EXCEPTION_UNDERFLOW", INT2FIX(VP_EXCEPTION_UNDERFLOW));
-
-    /*
-     * 0x01: Determines what happens when the result of a computation is an
-     * overflow (a result too large to be represented). See BigDecimal.mode.
-     */
-    rb_define_const(rb_cBigDecimal, "EXCEPTION_OVERFLOW", INT2FIX(VP_EXCEPTION_OVERFLOW));
-
-    /*
-     * 0x10: Determines what happens when a division by zero is performed.
-     * See BigDecimal.mode.
-     */
-    rb_define_const(rb_cBigDecimal, "EXCEPTION_ZERODIVIDE", INT2FIX(VP_EXCEPTION_ZERODIVIDE));
-
-    /*
-     * 0x100: Determines what happens when a result must be rounded in order to
-     * fit in the appropriate number of significant digits. See
-     * BigDecimal.mode.
-     */
-    rb_define_const(rb_cBigDecimal, "ROUND_MODE", INT2FIX(VP_ROUND_MODE));
-
-    /* 1: Indicates that values should be rounded away from zero. See
-     * BigDecimal.mode.
-     */
-    rb_define_const(rb_cBigDecimal, "ROUND_UP", INT2FIX(VP_ROUND_UP));
-
-    /* 2: Indicates that values should be rounded towards zero. See
-     * BigDecimal.mode.
-     */
-    rb_define_const(rb_cBigDecimal, "ROUND_DOWN", INT2FIX(VP_ROUND_DOWN));
-
-    /* 3: Indicates that digits >= 5 should be rounded up, others rounded down.
-     * See BigDecimal.mode. */
-    rb_define_const(rb_cBigDecimal, "ROUND_HALF_UP", INT2FIX(VP_ROUND_HALF_UP));
-
-    /* 4: Indicates that digits >= 6 should be rounded up, others rounded down.
-     * See BigDecimal.mode.
-     */
-    rb_define_const(rb_cBigDecimal, "ROUND_HALF_DOWN", INT2FIX(VP_ROUND_HALF_DOWN));
-    /* 5: Round towards +Infinity. See BigDecimal.mode. */
-    rb_define_const(rb_cBigDecimal, "ROUND_CEILING", INT2FIX(VP_ROUND_CEIL));
-
-    /* 6: Round towards -Infinity. See BigDecimal.mode. */
-    rb_define_const(rb_cBigDecimal, "ROUND_FLOOR", INT2FIX(VP_ROUND_FLOOR));
-
-    /* 7: Round towards the even neighbor. See BigDecimal.mode. */
-    rb_define_const(rb_cBigDecimal, "ROUND_HALF_EVEN", INT2FIX(VP_ROUND_HALF_EVEN));
-
-    /* 0: Indicates that a value is not a number. See BigDecimal.sign. */
-    rb_define_const(rb_cBigDecimal, "SIGN_NaN", INT2FIX(VP_SIGN_NaN));
-
-    /* 1: Indicates that a value is +0. See BigDecimal.sign. */
-    rb_define_const(rb_cBigDecimal, "SIGN_POSITIVE_ZERO", INT2FIX(VP_SIGN_POSITIVE_ZERO));
-
-    /* -1: Indicates that a value is -0. See BigDecimal.sign. */
-    rb_define_const(rb_cBigDecimal, "SIGN_NEGATIVE_ZERO", INT2FIX(VP_SIGN_NEGATIVE_ZERO));
-
-    /* 2: Indicates that a value is positive and finite. See BigDecimal.sign. */
-    rb_define_const(rb_cBigDecimal, "SIGN_POSITIVE_FINITE", INT2FIX(VP_SIGN_POSITIVE_FINITE));
-
-    /* -2: Indicates that a value is negative and finite. See BigDecimal.sign. */
-    rb_define_const(rb_cBigDecimal, "SIGN_NEGATIVE_FINITE", INT2FIX(VP_SIGN_NEGATIVE_FINITE));
-
-    /* 3: Indicates that a value is positive and infinite. See BigDecimal.sign. */
-    rb_define_const(rb_cBigDecimal, "SIGN_POSITIVE_INFINITE", INT2FIX(VP_SIGN_POSITIVE_INFINITE));
-
-    /* -3: Indicates that a value is negative and infinite. See BigDecimal.sign. */
-    rb_define_const(rb_cBigDecimal, "SIGN_NEGATIVE_INFINITE", INT2FIX(VP_SIGN_NEGATIVE_INFINITE));
-
-    /* Positive zero value. */
-    arg = rb_str_new2("+0");
-    BIGDECIMAL_POSITIVE_ZERO = f_BigDecimal(1, &arg, rb_cBigDecimal);
-    rb_gc_register_mark_object(BIGDECIMAL_POSITIVE_ZERO);
-
-    /* Negative zero value. */
-    arg = rb_str_new2("-0");
-    BIGDECIMAL_NEGATIVE_ZERO = f_BigDecimal(1, &arg, rb_cBigDecimal);
-    rb_gc_register_mark_object(BIGDECIMAL_NEGATIVE_ZERO);
-
-    /* Positive infinity value. */
-    arg = rb_str_new2("+Infinity");
-    BIGDECIMAL_POSITIVE_INFINITY = f_BigDecimal(1, &arg, rb_cBigDecimal);
-    rb_gc_register_mark_object(BIGDECIMAL_POSITIVE_INFINITY);
-
-    /* Negative infinity value. */
-    arg = rb_str_new2("-Infinity");
-    BIGDECIMAL_NEGATIVE_INFINITY = f_BigDecimal(1, &arg, rb_cBigDecimal);
-    rb_gc_register_mark_object(BIGDECIMAL_NEGATIVE_INFINITY);
-
-    /* 'Not a Number' value. */
-    arg = rb_str_new2("NaN");
-    BIGDECIMAL_NAN = f_BigDecimal(1, &arg, rb_cBigDecimal);
-    rb_gc_register_mark_object(BIGDECIMAL_NAN);
-
-    /* Special value constants */
-    rb_define_const(rb_cBigDecimal, "INFINITY", BIGDECIMAL_POSITIVE_INFINITY);
-    rb_define_const(rb_cBigDecimal, "NAN", BIGDECIMAL_NAN);
-
-    /* instance methods */
-    rb_define_method(rb_cBigDecimal, "precs", BigDecimal_prec, 0);
-    rb_define_method(rb_cBigDecimal, "precision", BigDecimal_precision, 0);
-    rb_define_method(rb_cBigDecimal, "scale", BigDecimal_scale, 0);
-    rb_define_method(rb_cBigDecimal, "precision_scale", BigDecimal_precision_scale, 0);
-    rb_define_method(rb_cBigDecimal, "n_significant_digits", BigDecimal_n_significant_digits, 0);
-
-    rb_define_method(rb_cBigDecimal, "add", BigDecimal_add2, 2);
-    rb_define_method(rb_cBigDecimal, "sub", BigDecimal_sub2, 2);
-    rb_define_method(rb_cBigDecimal, "mult", BigDecimal_mult2, 2);
-    rb_define_method(rb_cBigDecimal, "div", BigDecimal_div3, -1);
-    rb_define_method(rb_cBigDecimal, "hash", BigDecimal_hash, 0);
-    rb_define_method(rb_cBigDecimal, "to_s", BigDecimal_to_s, -1);
-    rb_define_method(rb_cBigDecimal, "to_i", BigDecimal_to_i, 0);
-    rb_define_method(rb_cBigDecimal, "to_int", BigDecimal_to_i, 0);
-    rb_define_method(rb_cBigDecimal, "to_r", BigDecimal_to_r, 0);
-    rb_define_method(rb_cBigDecimal, "split", BigDecimal_split, 0);
-    rb_define_method(rb_cBigDecimal, "+", BigDecimal_add, 1);
-    rb_define_method(rb_cBigDecimal, "-", BigDecimal_sub, 1);
-    rb_define_method(rb_cBigDecimal, "+@", BigDecimal_uplus, 0);
-    rb_define_method(rb_cBigDecimal, "-@", BigDecimal_neg, 0);
-    rb_define_method(rb_cBigDecimal, "*", BigDecimal_mult, 1);
-    rb_define_method(rb_cBigDecimal, "/", BigDecimal_div, 1);
-    rb_define_method(rb_cBigDecimal, "quo", BigDecimal_quo, -1);
-    rb_define_method(rb_cBigDecimal, "%", BigDecimal_mod, 1);
-    rb_define_method(rb_cBigDecimal, "modulo", BigDecimal_mod, 1);
-    rb_define_method(rb_cBigDecimal, "remainder", BigDecimal_remainder, 1);
-    rb_define_method(rb_cBigDecimal, "divmod", BigDecimal_divmod, 1);
-    rb_define_method(rb_cBigDecimal, "clone", BigDecimal_clone, 0);
-    rb_define_method(rb_cBigDecimal, "dup", BigDecimal_clone, 0);
-    rb_define_method(rb_cBigDecimal, "to_f", BigDecimal_to_f, 0);
-    rb_define_method(rb_cBigDecimal, "abs", BigDecimal_abs, 0);
-    rb_define_method(rb_cBigDecimal, "sqrt", BigDecimal_sqrt, 1);
-    rb_define_method(rb_cBigDecimal, "fix", BigDecimal_fix, 0);
-    rb_define_method(rb_cBigDecimal, "round", BigDecimal_round, -1);
-    rb_define_method(rb_cBigDecimal, "frac", BigDecimal_frac, 0);
-    rb_define_method(rb_cBigDecimal, "floor", BigDecimal_floor, -1);
-    rb_define_method(rb_cBigDecimal, "ceil", BigDecimal_ceil, -1);
-    rb_define_method(rb_cBigDecimal, "power", BigDecimal_power, -1);
-    rb_define_method(rb_cBigDecimal, "**", BigDecimal_power_op, 1);
-    rb_define_method(rb_cBigDecimal, "<=>", BigDecimal_comp, 1);
-    rb_define_method(rb_cBigDecimal, "==", BigDecimal_eq, 1);
-    rb_define_method(rb_cBigDecimal, "===", BigDecimal_eq, 1);
-    rb_define_method(rb_cBigDecimal, "eql?", BigDecimal_eq, 1);
-    rb_define_method(rb_cBigDecimal, "<", BigDecimal_lt, 1);
-    rb_define_method(rb_cBigDecimal, "<=", BigDecimal_le, 1);
-    rb_define_method(rb_cBigDecimal, ">", BigDecimal_gt, 1);
-    rb_define_method(rb_cBigDecimal, ">=", BigDecimal_ge, 1);
-    rb_define_method(rb_cBigDecimal, "zero?", BigDecimal_zero, 0);
-    rb_define_method(rb_cBigDecimal, "nonzero?", BigDecimal_nonzero, 0);
-    rb_define_method(rb_cBigDecimal, "coerce", BigDecimal_coerce, 1);
-    rb_define_method(rb_cBigDecimal, "inspect", BigDecimal_inspect, 0);
-    rb_define_method(rb_cBigDecimal, "exponent", BigDecimal_exponent, 0);
-    rb_define_method(rb_cBigDecimal, "sign", BigDecimal_sign, 0);
-    rb_define_method(rb_cBigDecimal, "nan?",      BigDecimal_IsNaN, 0);
-    rb_define_method(rb_cBigDecimal, "infinite?", BigDecimal_IsInfinite, 0);
-    rb_define_method(rb_cBigDecimal, "finite?",   BigDecimal_IsFinite, 0);
-    rb_define_method(rb_cBigDecimal, "truncate",  BigDecimal_truncate, -1);
-    rb_define_method(rb_cBigDecimal, "_dump", BigDecimal_dump, -1);
-
-    rb_mBigMath = rb_define_module("BigMath");
-    rb_define_singleton_method(rb_mBigMath, "exp", BigMath_s_exp, 2);
-    rb_define_singleton_method(rb_mBigMath, "log", BigMath_s_log, 2);
-
-#define ROUNDING_MODE(i, name, value) \
-    id_##name = rb_intern_const(#name); \
-    rbd_rounding_modes[i].id   = id_##name; \
-    rbd_rounding_modes[i].mode = value;
-
-    ROUNDING_MODE(0, up,        RBD_ROUND_UP);
-    ROUNDING_MODE(1, down,      RBD_ROUND_DOWN);
-    ROUNDING_MODE(2, half_up,   RBD_ROUND_HALF_UP);
-    ROUNDING_MODE(3, half_down, RBD_ROUND_HALF_DOWN);
-    ROUNDING_MODE(4, ceil,      RBD_ROUND_CEIL);
-    ROUNDING_MODE(5, floor,     RBD_ROUND_FLOOR);
-    ROUNDING_MODE(6, half_even, RBD_ROUND_HALF_EVEN);
-
-    ROUNDING_MODE(7,  default,   RBD_ROUND_DEFAULT);
-    ROUNDING_MODE(8,  truncate,  RBD_ROUND_TRUNCATE);
-    ROUNDING_MODE(9,  banker,    RBD_ROUND_BANKER);
-    ROUNDING_MODE(10, ceiling,   RBD_ROUND_CEILING);
-
-#undef ROUNDING_MODE
-
-    id_to_r = rb_intern_const("to_r");
-    id_eq = rb_intern_const("==");
-    id_half = rb_intern_const("half");
-
-    (void)VPrint;  /* suppress unused warning */
-}
-
-/*
- *
- *  ============================================================================
- *
- *  vp_ routines begin from here.
- *
- *  ============================================================================
- *
- */
-#ifdef BIGDECIMAL_DEBUG
-static int gfDebug = 1;         /* Debug switch */
-#if 0
-static int gfCheckVal = 1;      /* Value checking flag in VpNmlz()  */
-#endif
-#endif /* BIGDECIMAL_DEBUG */
-
-static Real *VpConstOne;    /* constant 1.0 */
-static Real *VpConstPt5;    /* constant 0.5 */
-#define maxnr 100UL    /* Maximum iterations for calculating sqrt. */
-                /* used in VpSqrt() */
-
-/* ETC */
-#define MemCmp(x,y,z) memcmp(x,y,z)
-#define StrCmp(x,y)   strcmp(x,y)
-
-enum op_sw {
-    OP_SW_ADD = 1,  /* + */
-    OP_SW_SUB,      /* - */
-    OP_SW_MULT,     /* * */
-    OP_SW_DIV       /* / */
-};
-
-static int VpIsDefOP(Real *c, Real *a, Real *b, enum op_sw sw);
-static int AddExponent(Real *a, SIGNED_VALUE n);
-static DECDIG VpAddAbs(Real *a,Real *b,Real *c);
-static DECDIG VpSubAbs(Real *a,Real *b,Real *c);
-static size_t VpSetPTR(Real *a, Real *b, Real *c, size_t *a_pos, size_t *b_pos, size_t *c_pos, DECDIG *av, DECDIG *bv);
-static int VpNmlz(Real *a);
-static void VpFormatSt(char *psz, size_t fFmt);
-static int VpRdup(Real *m, size_t ind_m);
-
-#ifdef BIGDECIMAL_DEBUG
-# ifdef HAVE_RB_EXT_RACTOR_SAFE
-#  error Need to make rewiting gnAlloc atomic
-# endif
-static int gnAlloc = 0; /* Memory allocation counter */
-#endif /* BIGDECIMAL_DEBUG */
-
-/*
- * EXCEPTION Handling.
- */
-
-#define bigdecimal_set_thread_local_exception_mode(mode) \
-    rb_thread_local_aset( \
-	rb_thread_current(), \
-	id_BigDecimal_exception_mode, \
-	INT2FIX((int)(mode)) \
-    )
-
-static unsigned short
-VpGetException (void)
-{
-    VALUE const vmode = rb_thread_local_aref(
-	rb_thread_current(),
-	id_BigDecimal_exception_mode
-    );
-
-    if (NIL_P(vmode)) {
-	bigdecimal_set_thread_local_exception_mode(BIGDECIMAL_EXCEPTION_MODE_DEFAULT);
-	return BIGDECIMAL_EXCEPTION_MODE_DEFAULT;
-    }
-
-    return NUM2USHORT(vmode);
-}
-
-static void
-VpSetException(unsigned short f)
-{
-    bigdecimal_set_thread_local_exception_mode(f);
-}
-
-static void
-VpCheckException(Real *p, bool always)
-{
-    if (VpIsNaN(p)) {
-        VpException(VP_EXCEPTION_NaN, "Computation results in 'NaN' (Not a Number)", always);
-    }
-    else if (VpIsPosInf(p)) {
-        VpException(VP_EXCEPTION_INFINITY, "Computation results in 'Infinity'", always);
-    }
-    else if (VpIsNegInf(p)) {
-        VpException(VP_EXCEPTION_INFINITY, "Computation results in '-Infinity'", always);
-    }
-}
-
-static VALUE
-VpCheckGetValue(Real *p)
-{
-    VpCheckException(p, false);
-    return p->obj;
-}
-
-/*
- * Precision limit.
- */
-
-#define bigdecimal_set_thread_local_precision_limit(limit) \
-    rb_thread_local_aset( \
-	rb_thread_current(), \
-	id_BigDecimal_precision_limit, \
-	SIZET2NUM(limit) \
-    )
-#define BIGDECIMAL_PRECISION_LIMIT_DEFAULT ((size_t)0)
-
-/* These 2 functions added at v1.1.7 */
-VP_EXPORT size_t
-VpGetPrecLimit(void)
-{
-    VALUE const vlimit = rb_thread_local_aref(
-	rb_thread_current(),
-	id_BigDecimal_precision_limit
-    );
-
-    if (NIL_P(vlimit)) {
-	bigdecimal_set_thread_local_precision_limit(BIGDECIMAL_PRECISION_LIMIT_DEFAULT);
-	return BIGDECIMAL_PRECISION_LIMIT_DEFAULT;
-    }
-
-    return NUM2SIZET(vlimit);
-}
-
-VP_EXPORT size_t
-VpSetPrecLimit(size_t n)
-{
-    size_t const s = VpGetPrecLimit();
-    bigdecimal_set_thread_local_precision_limit(n);
-    return s;
-}
-
-/*
- * Rounding mode.
- */
-
-#define bigdecimal_set_thread_local_rounding_mode(mode) \
-    rb_thread_local_aset( \
-	rb_thread_current(), \
-	id_BigDecimal_rounding_mode, \
-	INT2FIX((int)(mode)) \
-    )
-
-VP_EXPORT unsigned short
-VpGetRoundMode(void)
-{
-    VALUE const vmode = rb_thread_local_aref(
-	rb_thread_current(),
-	id_BigDecimal_rounding_mode
-    );
-
-    if (NIL_P(vmode)) {
-	bigdecimal_set_thread_local_rounding_mode(BIGDECIMAL_ROUNDING_MODE_DEFAULT);
-	return BIGDECIMAL_ROUNDING_MODE_DEFAULT;
-    }
-
-    return NUM2USHORT(vmode);
-}
-
-VP_EXPORT int
-VpIsRoundMode(unsigned short n)
-{
-    switch (n) {
-      case VP_ROUND_UP:
-      case VP_ROUND_DOWN:
-      case VP_ROUND_HALF_UP:
-      case VP_ROUND_HALF_DOWN:
-      case VP_ROUND_CEIL:
-      case VP_ROUND_FLOOR:
-      case VP_ROUND_HALF_EVEN:
-	return 1;
-
-      default:
-	return 0;
-    }
-}
-
-VP_EXPORT unsigned short
-VpSetRoundMode(unsigned short n)
-{
-    if (VpIsRoundMode(n)) {
-	bigdecimal_set_thread_local_rounding_mode(n);
-	return n;
-    }
-
-    return VpGetRoundMode();
-}
-
-/*
- *  0.0 & 1.0 generator
- *    These gZero_..... and gOne_..... can be any name
- *    referenced from nowhere except Zero() and One().
- *    gZero_..... and gOne_..... must have global scope
- *    (to let the compiler know they may be changed in outside
- *    (... but not actually..)).
- */
-volatile const double gOne_ABCED9B4_CE73__00400511F31D  = 1.0;
-
-static double
-One(void)
-{
-    return gOne_ABCED9B4_CE73__00400511F31D;
-}
-
-/*
-  ----------------------------------------------------------------
-  Value of sign in Real structure is reserved for future use.
-  short sign;
-                    ==0 : NaN
-                      1 : Positive zero
-                     -1 : Negative zero
-                      2 : Positive number
-                     -2 : Negative number
-                      3 : Positive infinite number
-                     -3 : Negative infinite number
-  ----------------------------------------------------------------
-*/
-
-VP_EXPORT double
-VpGetDoubleNaN(void) /* Returns the value of NaN */
-{
-    return nan("");
-}
-
-VP_EXPORT double
-VpGetDoublePosInf(void) /* Returns the value of +Infinity */
-{
-    return HUGE_VAL;
-}
-
-VP_EXPORT double
-VpGetDoubleNegInf(void) /* Returns the value of -Infinity */
-{
-    return -HUGE_VAL;
-}
-
-VP_EXPORT double
-VpGetDoubleNegZero(void) /* Returns the value of -0 */
-{
-    static double nzero = 1000.0;
-    if (nzero != 0.0) nzero = (One()/VpGetDoubleNegInf());
-    return nzero;
-}
-
-#if 0  /* unused */
-VP_EXPORT int
-VpIsNegDoubleZero(double v)
-{
-    double z = VpGetDoubleNegZero();
-    return MemCmp(&v,&z,sizeof(v))==0;
-}
-#endif
-
-VP_EXPORT int
-VpException(unsigned short f, const char *str,int always)
-{
-    unsigned short const exception_mode = VpGetException();
-
-    if (f == VP_EXCEPTION_OP) always = 1;
-
-    if (always || (exception_mode & f)) {
-	switch(f) {
-	  /* case VP_EXCEPTION_OVERFLOW: */
-	  case VP_EXCEPTION_ZERODIVIDE:
-	  case VP_EXCEPTION_INFINITY:
-	  case VP_EXCEPTION_NaN:
-	  case VP_EXCEPTION_UNDERFLOW:
-	  case VP_EXCEPTION_OP:
-	    rb_raise(rb_eFloatDomainError, "%s", str);
-	    break;
-	  default:
-	    rb_fatal("%s", str);
-	}
-    }
-    return 0; /* 0 Means VpException() raised no exception */
-}
-
-/* Throw exception or returns 0,when resulting c is Inf or NaN */
-/*  sw=1:+ 2:- 3:* 4:/ */
-static int
-VpIsDefOP(Real *c, Real *a, Real *b, enum op_sw sw)
-{
-    if (VpIsNaN(a) || VpIsNaN(b)) {
-	/* at least a or b is NaN */
-	VpSetNaN(c);
-	goto NaN;
-    }
-
-    if (VpIsInf(a)) {
-	if (VpIsInf(b)) {
-	    switch(sw) {
-	      case OP_SW_ADD: /* + */
-		if (VpGetSign(a) == VpGetSign(b)) {
-		    VpSetInf(c, VpGetSign(a));
-		    goto Inf;
-		}
-		else {
-		    VpSetNaN(c);
-		    goto NaN;
-		}
-	      case OP_SW_SUB: /* - */
-		if (VpGetSign(a) != VpGetSign(b)) {
-		    VpSetInf(c, VpGetSign(a));
-		    goto Inf;
-		}
-		else {
-		    VpSetNaN(c);
-		    goto NaN;
-		}
-	      case OP_SW_MULT: /* * */
-		VpSetInf(c, VpGetSign(a)*VpGetSign(b));
-		goto Inf;
-	      case OP_SW_DIV: /* / */
-		VpSetNaN(c);
-		goto NaN;
-	    }
-	    VpSetNaN(c);
-	    goto NaN;
-	}
-	/* Inf op Finite */
-	switch(sw) {
-	  case OP_SW_ADD: /* + */
-	  case OP_SW_SUB: /* - */
-	    VpSetInf(c, VpGetSign(a));
-	    break;
-	  case OP_SW_MULT: /* * */
-	    if (VpIsZero(b)) {
-		VpSetNaN(c);
-		goto NaN;
-	    }
-	    VpSetInf(c, VpGetSign(a)*VpGetSign(b));
-	    break;
-	  case OP_SW_DIV: /* / */
-	    VpSetInf(c, VpGetSign(a)*VpGetSign(b));
-	}
-	goto Inf;
-    }
-
-    if (VpIsInf(b)) {
-	switch(sw) {
-	  case OP_SW_ADD: /* + */
-	    VpSetInf(c, VpGetSign(b));
-	    break;
-	  case OP_SW_SUB: /* - */
-	    VpSetInf(c, -VpGetSign(b));
-	    break;
-	  case OP_SW_MULT: /* * */
-	    if (VpIsZero(a)) {
-		VpSetNaN(c);
-		goto NaN;
-	    }
-	    VpSetInf(c, VpGetSign(a)*VpGetSign(b));
-	    break;
-	  case OP_SW_DIV: /* / */
-	    VpSetZero(c, VpGetSign(a)*VpGetSign(b));
-	}
-	goto Inf;
-    }
-    return 1; /* Results OK */
-
-Inf:
-    if (VpIsPosInf(c)) {
-	return VpException(VP_EXCEPTION_INFINITY, "Computation results to 'Infinity'", 0);
-    }
-    else {
-	return VpException(VP_EXCEPTION_INFINITY, "Computation results to '-Infinity'", 0);
-    }
-
-NaN:
-    return VpException(VP_EXCEPTION_NaN, "Computation results to 'NaN'", 0);
-}
-
-/*
-  ----------------------------------------------------------------
-*/
-
-/*
- *    returns number of chars needed to represent vp in specified format.
- */
-VP_EXPORT size_t
-VpNumOfChars(Real *vp,const char *pszFmt)
-{
-    SIGNED_VALUE  ex;
-    size_t nc;
-
-    if (vp == NULL)   return BASE_FIG*2+6;
-    if (!VpIsDef(vp)) return 32; /* not sure,may be OK */
-
-    switch(*pszFmt) {
-      case 'F':
-	nc = BASE_FIG*(vp->Prec + 1)+2;
-	ex = vp->exponent;
-	if (ex < 0) {
-	    nc += BASE_FIG*(size_t)(-ex);
-	}
-	else {
-	    if ((size_t)ex > vp->Prec) {
-		nc += BASE_FIG*((size_t)ex - vp->Prec);
-	    }
-	}
-	break;
-      case 'E':
-	/* fall through */
-      default:
-	nc = BASE_FIG*(vp->Prec + 2)+6; /* 3: sign + exponent chars */
-    }
-    return nc;
-}
-
-/*
- * Initializer for Vp routines and constants used.
- * [Input]
- *   BaseVal: Base value(assigned to BASE) for Vp calculation.
- *   It must be the form BaseVal=10**n.(n=1,2,3,...)
- *   If Base <= 0L,then the BASE will be calculated so
- *   that BASE is as large as possible satisfying the
- *   relation MaxVal <= BASE*(BASE+1). Where the value
- *   MaxVal is the largest value which can be represented
- *   by one DECDIG word in the computer used.
- *
- * [Returns]
- *   BIGDECIMAL_DOUBLE_FIGURES  ... OK
- */
-VP_EXPORT size_t
-VpInit(DECDIG BaseVal)
-{
-    /* Setup +/- Inf  NaN -0 */
-    VpGetDoubleNegZero();
-
-    /* Const 1.0 */
-    VpConstOne = NewOneNolimit(1, 1);
-
-    /* Const 0.5 */
-    VpConstPt5 = NewOneNolimit(1, 1);
-    VpConstPt5->exponent = 0;
-    VpConstPt5->frac[0] = 5*BASE1;
-
-#ifdef BIGDECIMAL_DEBUG
-    gnAlloc = 0;
-#endif /* BIGDECIMAL_DEBUG */
-
-#ifdef BIGDECIMAL_DEBUG
-    if (gfDebug) {
-        printf("VpInit: BaseVal = %"PRIuDECDIG"\n", BaseVal);
-        printf("\tBASE      = %"PRIuDECDIG"\n", BASE);
-        printf("\tHALF_BASE = %"PRIuDECDIG"\n", HALF_BASE);
-        printf("\tBASE1     = %"PRIuDECDIG"\n", BASE1);
-        printf("\tBASE_FIG  = %u\n", BASE_FIG);
-        printf("\tBIGDECIMAL_DOUBLE_FIGURES = %d\n", BIGDECIMAL_DOUBLE_FIGURES);
-    }
-#endif /* BIGDECIMAL_DEBUG */
-
-    return BIGDECIMAL_DOUBLE_FIGURES;
-}
-
-VP_EXPORT Real *
-VpOne(void)
-{
-    return VpConstOne;
-}
-
-/* If exponent overflows,then raise exception or returns 0 */
-static int
-AddExponent(Real *a, SIGNED_VALUE n)
-{
-    SIGNED_VALUE e = a->exponent;
-    SIGNED_VALUE m = e+n;
-    SIGNED_VALUE eb, mb;
-    if (e > 0) {
-	if (n > 0) {
-            if (MUL_OVERFLOW_SIGNED_VALUE_P(m, (SIGNED_VALUE)BASE_FIG) ||
-                MUL_OVERFLOW_SIGNED_VALUE_P(e, (SIGNED_VALUE)BASE_FIG))
-                goto overflow;
-	    mb = m*(SIGNED_VALUE)BASE_FIG;
-	    eb = e*(SIGNED_VALUE)BASE_FIG;
-	    if (eb - mb > 0) goto overflow;
-	}
-    }
-    else if (n < 0) {
-        if (MUL_OVERFLOW_SIGNED_VALUE_P(m, (SIGNED_VALUE)BASE_FIG) ||
-            MUL_OVERFLOW_SIGNED_VALUE_P(e, (SIGNED_VALUE)BASE_FIG))
-            goto underflow;
-	mb = m*(SIGNED_VALUE)BASE_FIG;
-	eb = e*(SIGNED_VALUE)BASE_FIG;
-	if (mb - eb > 0) goto underflow;
-    }
-    a->exponent = m;
-    return 1;
-
-/* Overflow/Underflow ==> Raise exception or returns 0 */
-underflow:
-    VpSetZero(a, VpGetSign(a));
-    return VpException(VP_EXCEPTION_UNDERFLOW, "Exponent underflow", 0);
-
-overflow:
-    VpSetInf(a, VpGetSign(a));
-    return VpException(VP_EXCEPTION_OVERFLOW, "Exponent overflow", 0);
-}
-
-Real *
-bigdecimal_parse_special_string(const char *str)
-{
-    static const struct {
-        const char *str;
-        size_t len;
-        int sign;
-    } table[] = {
-        { SZ_INF,  sizeof(SZ_INF)  - 1, VP_SIGN_POSITIVE_INFINITE },
-        { SZ_PINF, sizeof(SZ_PINF) - 1, VP_SIGN_POSITIVE_INFINITE },
-        { SZ_NINF, sizeof(SZ_NINF) - 1, VP_SIGN_NEGATIVE_INFINITE },
-        { SZ_NaN,  sizeof(SZ_NaN)  - 1, VP_SIGN_NaN               }
-    };
-    static const size_t table_length = sizeof(table) / sizeof(table[0]);
-    size_t i;
-
-    for (i = 0; i < table_length; ++i) {
-        const char *p;
-        if (strncmp(str, table[i].str, table[i].len) != 0) {
-            continue;
-        }
-
-        p = str + table[i].len;
-        while (*p && ISSPACE(*p)) ++p;
-        if (*p == '\0') {
-            Real *vp = rbd_allocate_struct(1);
-            vp->MaxPrec = 1;
-            switch (table[i].sign) {
-              default:
-                UNREACHABLE; break;
-              case VP_SIGN_POSITIVE_INFINITE:
-                VpSetPosInf(vp);
-                return vp;
-              case VP_SIGN_NEGATIVE_INFINITE:
-                VpSetNegInf(vp);
-                return vp;
-              case VP_SIGN_NaN:
-                VpSetNaN(vp);
-                return vp;
-            }
-        }
-    }
-
-    return NULL;
-}
-
-/*
- * Allocates variable.
- * [Input]
- *   mx ... The number of decimal digits to be allocated, if zero then mx is determined by szVal.
- *          The mx will be the number of significant digits can to be stored.
- *   szVal ... The value assigned(char). If szVal==NULL, then zero is assumed.
- *             If szVal[0]=='#' then MaxPrec is not affected by the precision limit
- *             so that the full precision specified by szVal is allocated.
- *
- * [Returns]
- *   Pointer to the newly allocated variable, or
- *   NULL be returned if memory allocation is failed,or any error.
- */
-VP_EXPORT Real *
-VpAlloc(size_t mx, const char *szVal, int strict_p, int exc)
-{
-    const char *orig_szVal = szVal;
-    size_t i, j, ni, ipf, nf, ipe, ne, dot_seen, exp_seen, nalloc;
-    size_t len;
-    char v, *psz;
-    int  sign=1;
-    Real *vp = NULL;
-    VALUE buf;
-
-    if (szVal == NULL) {
-      return_zero:
-        /* necessary to be able to store */
-        /* at least mx digits. */
-        /* szVal==NULL ==> allocate zero value. */
-        vp = rbd_allocate_struct(mx);
-        vp->MaxPrec = rbd_calculate_internal_digits(mx, false);  /* Must false */
-        VpSetZero(vp, 1);    /* initialize vp to zero. */
-        return vp;
-    }
-
-    /* Skipping leading spaces */
-    while (ISSPACE(*szVal)) szVal++;
-
-    /* Check on Inf & NaN */
-    if ((vp = bigdecimal_parse_special_string(szVal)) != NULL) {
-        return vp;
-    }
-
-    /* Processing the leading one `#` */
-    if (*szVal != '#') {
-        len = rbd_calculate_internal_digits(mx, true);
-    }
-    else {
-        len = rbd_calculate_internal_digits(mx, false);
-        ++szVal;
-    }
-
-    /* Scanning digits */
-
-    /* A buffer for keeping scanned digits */
-    buf = rb_str_tmp_new(strlen(szVal) + 1);
-    psz = RSTRING_PTR(buf);
-
-    /* cursor: i for psz, and j for szVal */
-    i = j = 0;
-
-    /* Scanning: sign part */
-    v = psz[i] = szVal[j];
-    if ((v == '-') || (v == '+')) {
-        sign = -(v == '-');
-        ++i;
-        ++j;
-    }
-
-    /* Scanning: integer part */
-    ni  = 0; /* number of digits in the integer part */
-    while ((v = psz[i] = szVal[j]) != '\0') {
-        if (!strict_p && ISSPACE(v)) {
-            v = psz[i] = '\0';
-            break;
-        }
-        if (v == '_') {
-            if (ni > 0) {
-                v = szVal[j+1];
-                if (v == '\0' || ISSPACE(v) || ISDIGIT(v)) {
-                    ++j;
-                    continue;
-                }
-                if (!strict_p) {
-                    v = psz[i] = '\0';
-                    break;
-                }
-            }
-            goto invalid_value;
-        }
-        if (!ISDIGIT(v)) {
-            break;
-        }
-        ++ni;
-        ++i;
-        ++j;
-    }
-
-    /* Scanning: fractional part */
-    nf  = 0; /* number of digits in the fractional part */
-    ne  = 0; /* number of digits in the exponential part */
-    ipf = 0; /* index of the beginning of the fractional part */
-    ipe = 0; /* index of the beginning of the exponential part */
-    dot_seen = 0;
-    exp_seen = 0;
-
-    if (v != '\0') {
-        /* Scanning fractional part */
-        if ((psz[i] = szVal[j]) == '.') {
-            dot_seen = 1;
-            ++i;
-            ++j;
-            ipf = i;
-            while ((v = psz[i] = szVal[j]) != '\0') {
-                if (!strict_p && ISSPACE(v)) {
-                    v = psz[i] = '\0';
-                    break;
-                }
-                if (v == '_') {
-                    if (nf > 0 && ISDIGIT(szVal[j+1])) {
-                        ++j;
-                        continue;
-                    }
-                    if (!strict_p) {
-                        v = psz[i] = '\0';
-                        if (nf == 0) {
-                            dot_seen = 0;
-                        }
-                        break;
-                    }
-                    goto invalid_value;
-                }
-                if (!ISDIGIT(v)) break;
-                ++i;
-                ++j;
-                ++nf;
-            }
-        }
-
-        /* Scanning exponential part */
-        if (v != '\0') {
-            switch ((psz[i] = szVal[j])) {
-                case '\0':
-                    break;
-                case 'e': case 'E':
-                case 'd': case 'D':
-                    exp_seen = 1;
-                    ++i;
-                    ++j;
-                    ipe = i;
-                    v = psz[i] = szVal[j];
-                    if ((v == '-') || (v == '+')) {
-                        ++i;
-                        ++j;
-                    }
-                    while ((v = psz[i] = szVal[j]) != '\0') {
-                        if (!strict_p && ISSPACE(v)) {
-                            v = psz[i] = '\0';
-                            break;
-                        }
-                        if (v == '_') {
-                            if (ne > 0 && ISDIGIT(szVal[j+1])) {
-                                ++j;
-                                continue;
-                            }
-                            if (!strict_p) {
-                                v = psz[i] = '\0';
-                                if (ne == 0) {
-                                    exp_seen = 0;
-                                }
-                                break;
-                            }
-                            goto invalid_value;
-                        }
-                        if (!ISDIGIT(v)) break;
-                        ++i;
-                        ++j;
-                        ++ne;
-                    }
-                    break;
-                default:
-                    break;
-            }
-        }
-
-        if (v != '\0') {
-            /* Scanning trailing spaces */
-            while (ISSPACE(szVal[j])) ++j;
-
-            /* Invalid character */
-            if (szVal[j] && strict_p) {
-                goto invalid_value;
-            }
-        }
-    }
-
-    psz[i] = '\0';
-
-    if (strict_p && (((ni == 0 || dot_seen) && nf == 0) || (exp_seen && ne == 0))) {
-        VALUE str;
-      invalid_value:
-        if (!strict_p) {
-            goto return_zero;
-        }
-        if (!exc) {
-            return NULL;
-        }
-        str = rb_str_new2(orig_szVal);
-        rb_raise(rb_eArgError, "invalid value for BigDecimal(): \"%"PRIsVALUE"\"", str);
-    }
-
-    nalloc = (ni + nf + BASE_FIG - 1) / BASE_FIG + 1;    /* set effective allocation  */
-    /* units for szVal[]  */
-    if (len == 0) len = 1;
-    nalloc = Max(nalloc, len);
-    len = nalloc;
-    vp = rbd_allocate_struct(len);
-    vp->MaxPrec = len;        /* set max precision */
-    VpSetZero(vp, sign);
-    VpCtoV(vp, psz, ni, psz + ipf, nf, psz + ipe, ne);
-    rb_str_resize(buf, 0);
-    return vp;
-}
-
-/*
- * Assignment(c=a).
- * [Input]
- *   a   ... RHSV
- *   isw ... switch for assignment.
- *    c = a  when isw > 0
- *    c = -a when isw < 0
- *    if c->MaxPrec < a->Prec,then round operation
- *    will be performed.
- * [Output]
- *  c  ... LHSV
- */
-VP_EXPORT size_t
-VpAsgn(Real *c, Real *a, int isw)
-{
-    size_t n;
-    if (VpIsNaN(a)) {
-	VpSetNaN(c);
-	return 0;
-    }
-    if (VpIsInf(a)) {
-	VpSetInf(c, isw * VpGetSign(a));
-	return 0;
-    }
-
-    /* check if the RHS is zero */
-    if (!VpIsZero(a)) {
-	c->exponent = a->exponent;    /* store  exponent */
-	VpSetSign(c, isw * VpGetSign(a));    /* set sign */
-	n = (a->Prec < c->MaxPrec) ? (a->Prec) : (c->MaxPrec);
-	c->Prec = n;
-        memcpy(c->frac, a->frac, n * sizeof(DECDIG));
-	/* Needs round ? */
-	if (isw != 10) {
-	    /* Not in ActiveRound */
-	    if(c->Prec < a->Prec) {
-		VpInternalRound(c, n, (n>0) ? a->frac[n-1] : 0, a->frac[n]);
-	    }
-	    else {
-		VpLimitRound(c,0);
-	    }
-	}
-    }
-    else {
-	/* The value of 'a' is zero.  */
-	VpSetZero(c, isw * VpGetSign(a));
-	return 1;
-    }
-    return c->Prec * BASE_FIG;
-}
-
-/*
- *   c = a + b  when operation =  1 or 2
- *   c = a - b  when operation = -1 or -2.
- *   Returns number of significant digits of c
- */
-VP_EXPORT size_t
-VpAddSub(Real *c, Real *a, Real *b, int operation)
-{
-    short sw, isw;
-    Real *a_ptr, *b_ptr;
-    size_t n, na, nb, i;
-    DECDIG mrv;
-
-#ifdef BIGDECIMAL_DEBUG
-    if (gfDebug) {
-	VPrint(stdout, "VpAddSub(enter) a=% \n", a);
-	VPrint(stdout, "     b=% \n", b);
-	printf(" operation=%d\n", operation);
-    }
-#endif /* BIGDECIMAL_DEBUG */
-
-    if (!VpIsDefOP(c, a, b, (operation > 0) ? OP_SW_ADD : OP_SW_SUB)) return 0; /* No significant digits */
-
-    /* check if a or b is zero  */
-    if (VpIsZero(a)) {
-	/* a is zero,then assign b to c */
-	if (!VpIsZero(b)) {
-	    VpAsgn(c, b, operation);
-	}
-	else {
-	    /* Both a and b are zero. */
-	    if (VpGetSign(a) < 0 && operation * VpGetSign(b) < 0) {
-		/* -0 -0 */
-		VpSetZero(c, -1);
-	    }
-	    else {
-		VpSetZero(c, 1);
-	    }
-	    return 1; /* 0: 1 significant digits */
-	}
-	return c->Prec * BASE_FIG;
-    }
-    if (VpIsZero(b)) {
-	/* b is zero,then assign a to c. */
-	VpAsgn(c, a, 1);
-	return c->Prec*BASE_FIG;
-    }
-
-    if (operation < 0) sw = -1;
-    else               sw =  1;
-
-    /* compare absolute value. As a result,|a_ptr|>=|b_ptr| */
-    if (a->exponent > b->exponent) {
-	a_ptr = a;
-	b_ptr = b;
-    }         /* |a|>|b| */
-    else if (a->exponent < b->exponent) {
-	a_ptr = b;
-	b_ptr = a;
-    }                /* |a|<|b| */
-    else {
-	/* Exponent part of a and b is the same,then compare fraction */
-	/* part */
-	na = a->Prec;
-	nb = b->Prec;
-	n  = Min(na, nb);
-	for (i=0; i < n; ++i) {
-	    if (a->frac[i] > b->frac[i]) {
-		a_ptr = a;
-		b_ptr = b;
-		goto end_if;
-	    }
-	    else if (a->frac[i] < b->frac[i]) {
-		a_ptr = b;
-		b_ptr = a;
-		goto end_if;
-	    }
-	}
-	if (na > nb) {
-	    a_ptr = a;
-	    b_ptr = b;
-	    goto end_if;
-	}
-	else if (na < nb) {
-	    a_ptr = b;
-	    b_ptr = a;
-	    goto end_if;
-	}
-	/* |a| == |b| */
-	if (VpGetSign(a) + sw *VpGetSign(b) == 0) {
-	    VpSetZero(c, 1);        /* abs(a)=abs(b) and operation = '-'  */
-	    return c->Prec * BASE_FIG;
-	}
-	a_ptr = a;
-	b_ptr = b;
-    }
-
-end_if:
-    isw = VpGetSign(a) + sw *VpGetSign(b);
-    /*
-     *  isw = 0 ...( 1)+(-1),( 1)-( 1),(-1)+(1),(-1)-(-1)
-     *      = 2 ...( 1)+( 1),( 1)-(-1)
-     *      =-2 ...(-1)+(-1),(-1)-( 1)
-     *   If isw==0, then c =(Sign a_ptr)(|a_ptr|-|b_ptr|)
-     *              else c =(Sign ofisw)(|a_ptr|+|b_ptr|)
-     */
-    if (isw) {            /* addition */
-	VpSetSign(c, 1);
-	mrv = VpAddAbs(a_ptr, b_ptr, c);
-	VpSetSign(c, isw / 2);
-    }
-    else {            /* subtraction */
-	VpSetSign(c, 1);
-	mrv = VpSubAbs(a_ptr, b_ptr, c);
-	if (a_ptr == a) {
-	    VpSetSign(c,VpGetSign(a));
-	}
-	else {
-	    VpSetSign(c, VpGetSign(a_ptr) * sw);
-	}
-    }
-    VpInternalRound(c, 0, (c->Prec > 0) ? c->frac[c->Prec-1] : 0, mrv);
-
-#ifdef BIGDECIMAL_DEBUG
-    if (gfDebug) {
-	VPrint(stdout, "VpAddSub(result) c=% \n", c);
-	VPrint(stdout, "     a=% \n", a);
-	VPrint(stdout, "     b=% \n", b);
-	printf(" operation=%d\n", operation);
-    }
-#endif /* BIGDECIMAL_DEBUG */
-    return c->Prec * BASE_FIG;
-}
-
-/*
- * Addition of two values with variable precision
- * a and b assuming abs(a)>abs(b).
- *   c = abs(a) + abs(b) ; where |a|>=|b|
- */
-static DECDIG
-VpAddAbs(Real *a, Real *b, Real *c)
-{
-    size_t word_shift;
-    size_t ap;
-    size_t bp;
-    size_t cp;
-    size_t a_pos;
-    size_t b_pos, b_pos_with_word_shift;
-    size_t c_pos;
-    DECDIG av, bv, carry, mrv;
-
-#ifdef BIGDECIMAL_DEBUG
-    if (gfDebug) {
-	VPrint(stdout, "VpAddAbs called: a = %\n", a);
-	VPrint(stdout, "     b = %\n", b);
-    }
-#endif /* BIGDECIMAL_DEBUG */
-
-    word_shift = VpSetPTR(a, b, c, &ap, &bp, &cp, &av, &bv);
-    a_pos = ap;
-    b_pos = bp;
-    c_pos = cp;
-
-    if (word_shift == (size_t)-1L) return 0; /* Overflow */
-    if (b_pos == (size_t)-1L) goto Assign_a;
-
-    mrv = av + bv; /* Most right val. Used for round. */
-
-    /* Just assign the last few digits of b to c because a has no  */
-    /* corresponding digits to be added. */
-    if (b_pos > 0) {
-	while (b_pos > 0 && b_pos + word_shift > a_pos) {
-	    c->frac[--c_pos] = b->frac[--b_pos];
-	}
-    }
-    if (b_pos == 0 && word_shift > a_pos) {
-	while (word_shift-- > a_pos) {
-	    c->frac[--c_pos] = 0;
-	}
-    }
-
-    /* Just assign the last few digits of a to c because b has no */
-    /* corresponding digits to be added. */
-    b_pos_with_word_shift = b_pos + word_shift;
-    while (a_pos > b_pos_with_word_shift) {
-	c->frac[--c_pos] = a->frac[--a_pos];
-    }
-    carry = 0;    /* set first carry be zero */
-
-    /* Now perform addition until every digits of b will be */
-    /* exhausted. */
-    while (b_pos > 0) {
-	c->frac[--c_pos] = a->frac[--a_pos] + b->frac[--b_pos] + carry;
-	if (c->frac[c_pos] >= BASE) {
-	    c->frac[c_pos] -= BASE;
-	    carry = 1;
-	}
-	else {
-	    carry = 0;
-	}
-    }
-
-    /* Just assign the first few digits of a with considering */
-    /* the carry obtained so far because b has been exhausted. */
-    while (a_pos > 0) {
-	c->frac[--c_pos] = a->frac[--a_pos] + carry;
-	if (c->frac[c_pos] >= BASE) {
-	    c->frac[c_pos] -= BASE;
-	    carry = 1;
-	}
-	else {
-	    carry = 0;
-	}
-    }
-    if (c_pos) c->frac[c_pos - 1] += carry;
-    goto Exit;
-
-Assign_a:
-    VpAsgn(c, a, 1);
-    mrv = 0;
-
-Exit:
-
-#ifdef BIGDECIMAL_DEBUG
-    if (gfDebug) {
-	VPrint(stdout, "VpAddAbs exit: c=% \n", c);
-    }
-#endif /* BIGDECIMAL_DEBUG */
-    return mrv;
-}
-
-/*
- * c = abs(a) - abs(b)
- */
-static DECDIG
-VpSubAbs(Real *a, Real *b, Real *c)
-{
-    size_t word_shift;
-    size_t ap;
-    size_t bp;
-    size_t cp;
-    size_t a_pos;
-    size_t b_pos, b_pos_with_word_shift;
-    size_t c_pos;
-    DECDIG av, bv, borrow, mrv;
-
-#ifdef BIGDECIMAL_DEBUG
-    if (gfDebug) {
-	VPrint(stdout, "VpSubAbs called: a = %\n", a);
-	VPrint(stdout, "     b = %\n", b);
-    }
-#endif /* BIGDECIMAL_DEBUG */
-
-    word_shift = VpSetPTR(a, b, c, &ap, &bp, &cp, &av, &bv);
-    a_pos = ap;
-    b_pos = bp;
-    c_pos = cp;
-    if (word_shift == (size_t)-1L) return 0; /* Overflow */
-    if (b_pos == (size_t)-1L) goto Assign_a;
-
-    if (av >= bv) {
-	mrv = av - bv;
-	borrow = 0;
-    }
-    else {
-	mrv    = 0;
-	borrow = 1;
-    }
-
-    /* Just assign the values which are the BASE subtracted by   */
-    /* each of the last few digits of the b because the a has no */
-    /* corresponding digits to be subtracted. */
-    if (b_pos + word_shift > a_pos) {
-	while (b_pos > 0 && b_pos + word_shift > a_pos) {
-	    c->frac[--c_pos] = BASE - b->frac[--b_pos] - borrow;
-	    borrow = 1;
-	}
-	if (b_pos == 0) {
-	    while (word_shift > a_pos) {
-		--word_shift;
-		c->frac[--c_pos] = BASE - borrow;
-		borrow = 1;
-	    }
-	}
-    }
-    /* Just assign the last few digits of a to c because b has no */
-    /* corresponding digits to subtract. */
-
-    b_pos_with_word_shift = b_pos + word_shift;
-    while (a_pos > b_pos_with_word_shift) {
-	c->frac[--c_pos] = a->frac[--a_pos];
-    }
-
-    /* Now perform subtraction until every digits of b will be */
-    /* exhausted. */
-    while (b_pos > 0) {
-	--c_pos;
-	if (a->frac[--a_pos] < b->frac[--b_pos] + borrow) {
-	    c->frac[c_pos] = BASE + a->frac[a_pos] - b->frac[b_pos] - borrow;
-	    borrow = 1;
-	}
-	else {
-	    c->frac[c_pos] = a->frac[a_pos] - b->frac[b_pos] - borrow;
-	    borrow = 0;
-	}
-    }
-
-    /* Just assign the first few digits of a with considering */
-    /* the borrow obtained so far because b has been exhausted. */
-    while (a_pos > 0) {
-	--c_pos;
-	if (a->frac[--a_pos] < borrow) {
-	    c->frac[c_pos] = BASE + a->frac[a_pos] - borrow;
-	    borrow = 1;
-	}
-	else {
-	    c->frac[c_pos] = a->frac[a_pos] - borrow;
-	    borrow = 0;
-	}
-    }
-    if (c_pos) c->frac[c_pos - 1] -= borrow;
-    goto Exit;
-
-Assign_a:
-    VpAsgn(c, a, 1);
-    mrv = 0;
-
-Exit:
-#ifdef BIGDECIMAL_DEBUG
-    if (gfDebug) {
-	VPrint(stdout, "VpSubAbs exit: c=% \n", c);
-    }
-#endif /* BIGDECIMAL_DEBUG */
-    return mrv;
-}
-
-/*
- * Note: If(av+bv)>= HALF_BASE,then 1 will be added to the least significant
- *    digit of c(In case of addition).
- * ------------------------- figure of output -----------------------------------
- *      a =  xxxxxxxxxxx
- *      b =    xxxxxxxxxx
- *      c =xxxxxxxxxxxxxxx
- *      word_shift =  |   |
- *      right_word =  |    | (Total digits in RHSV)
- *      left_word  = |   |   (Total digits in LHSV)
- *      a_pos      =    |
- *      b_pos      =     |
- *      c_pos      =      |
- */
-static size_t
-VpSetPTR(Real *a, Real *b, Real *c, size_t *a_pos, size_t *b_pos, size_t *c_pos, DECDIG *av, DECDIG *bv)
-{
-    size_t left_word, right_word, word_shift;
-
-    size_t const round_limit = (VpGetPrecLimit() + BASE_FIG - 1) / BASE_FIG;
-
-    assert(a->exponent >= b->exponent);
-
-    c->frac[0] = 0;
-    *av = *bv = 0;
-
-    word_shift = (a->exponent - b->exponent);
-    left_word = b->Prec + word_shift;
-    right_word = Max(a->Prec, left_word);
-    left_word = c->MaxPrec - 1;    /* -1 ... prepare for round up */
-
-    /*
-     * check if 'round' is needed.
-     */
-    if (right_word > left_word) {    /* round ? */
-	/*---------------------------------
-	 *  Actual size of a = xxxxxxAxx
-	 *  Actual size of b = xxxBxxxxx
-	 *  Max. size of   c = xxxxxx
-	 *  Round off        =   |-----|
-	 *  c_pos            =   |
-	 *  right_word       =   |
-	 *  a_pos            =    |
-	 */
-	*c_pos = right_word = left_word + 1;    /* Set resulting precision */
-	/* be equal to that of c */
-	if (a->Prec >= c->MaxPrec) {
-	    /*
-	     *   a =  xxxxxxAxxx
-	     *   c =  xxxxxx
-	     *   a_pos =    |
-	     */
-	    *a_pos = left_word;
-	    if (*a_pos <= round_limit) {
-		*av = a->frac[*a_pos];    /* av is 'A' shown in above. */
-	    }
-	}
-	else {
-	    /*
-	     *   a = xxxxxxx
-	     *   c = xxxxxxxxxx
-	     *  a_pos =     |
-	     */
-	    *a_pos = a->Prec;
-	}
-	if (b->Prec + word_shift >= c->MaxPrec) {
-	    /*
-	     *   a = xxxxxxxxx
-	     *   b =  xxxxxxxBxxx
-	     *   c = xxxxxxxxxxx
-	     *  b_pos =   |
-	     */
-	    if (c->MaxPrec >= word_shift + 1) {
-		*b_pos = c->MaxPrec - word_shift - 1;
-		if (*b_pos + word_shift <= round_limit) {
-		    *bv = b->frac[*b_pos];
-		}
-	    }
-	    else {
-		*b_pos = -1L;
-	    }
-	}
-	else {
-	    /*
-	     *   a = xxxxxxxxxxxxxxxx
-	     *   b =  xxxxxx
-	     *   c = xxxxxxxxxxxxx
-	     *  b_pos =     |
-	     */
-	    *b_pos = b->Prec;
-	}
-    }
-    else {            /* The MaxPrec of c - 1 > The Prec of a + b  */
-	/*
-	 *    a =   xxxxxxx
-	 *    b =   xxxxxx
-	 *    c = xxxxxxxxxxx
-	 *   c_pos =   |
-	 */
-	*b_pos = b->Prec;
-	*a_pos = a->Prec;
-	*c_pos = right_word + 1;
-    }
-    c->Prec = *c_pos;
-    c->exponent = a->exponent;
-    if (!AddExponent(c, 1)) return (size_t)-1L;
-    return word_shift;
-}
-
-/*
- * Return number of significant digits
- *       c = a * b , Where a = a0a1a2 ... an
- *             b = b0b1b2 ... bm
- *             c = c0c1c2 ... cl
- *          a0 a1 ... an   * bm
- *       a0 a1 ... an   * bm-1
- *         .   .    .
- *       .   .   .
- *        a0 a1 .... an    * b0
- *      +_____________________________
- *     c0 c1 c2  ......  cl
- *     nc      <---|
- *     MaxAB |--------------------|
- */
-VP_EXPORT size_t
-VpMult(Real *c, Real *a, Real *b)
-{
-    size_t MxIndA, MxIndB, MxIndAB, MxIndC;
-    size_t ind_c, i, ii, nc;
-    size_t ind_as, ind_ae, ind_bs;
-    DECDIG carry;
-    DECDIG_DBL s;
-    Real *w;
-
-#ifdef BIGDECIMAL_DEBUG
-    if (gfDebug) {
-	VPrint(stdout, "VpMult(Enter): a=% \n", a);
-	VPrint(stdout, "      b=% \n", b);
-    }
-#endif /* BIGDECIMAL_DEBUG */
-
-    if (!VpIsDefOP(c, a, b, OP_SW_MULT)) return 0; /* No significant digit */
-
-    if (VpIsZero(a) || VpIsZero(b)) {
-	/* at least a or b is zero */
-	VpSetZero(c, VpGetSign(a) * VpGetSign(b));
-	return 1; /* 0: 1 significant digit */
-    }
-
-    if (VpIsOne(a)) {
-	VpAsgn(c, b, VpGetSign(a));
-	goto Exit;
-    }
-    if (VpIsOne(b)) {
-	VpAsgn(c, a, VpGetSign(b));
-	goto Exit;
-    }
-    if (b->Prec > a->Prec) {
-	/* Adjust so that digits(a)>digits(b) */
-	w = a;
-	a = b;
-	b = w;
-    }
-    w = NULL;
-    MxIndA = a->Prec - 1;
-    MxIndB = b->Prec - 1;
-    MxIndC = c->MaxPrec - 1;
-    MxIndAB = a->Prec + b->Prec - 1;
-
-    if (MxIndC < MxIndAB) {    /* The Max. prec. of c < Prec(a)+Prec(b) */
-	w = c;
-        c = NewZeroNolimit(1, (size_t)((MxIndAB + 1) * BASE_FIG));
-	MxIndC = MxIndAB;
-    }
-
-    /* set LHSV c info */
-
-    c->exponent = a->exponent;    /* set exponent */
-    if (!AddExponent(c, b->exponent)) {
-        if (w) rbd_free_struct(c);
-        return 0;
-    }
-    VpSetSign(c, VpGetSign(a) * VpGetSign(b));    /* set sign  */
-    carry = 0;
-    nc = ind_c = MxIndAB;
-    memset(c->frac, 0, (nc + 1) * sizeof(DECDIG));        /* Initialize c  */
-    c->Prec = nc + 1;        /* set precision */
-    for (nc = 0; nc < MxIndAB; ++nc, --ind_c) {
-	if (nc < MxIndB) {    /* The left triangle of the Fig. */
-	    ind_as = MxIndA - nc;
-	    ind_ae = MxIndA;
-	    ind_bs = MxIndB;
-	}
-	else if (nc <= MxIndA) {    /* The middle rectangular of the Fig. */
-	    ind_as = MxIndA - nc;
-	    ind_ae = MxIndA - (nc - MxIndB);
-	    ind_bs = MxIndB;
-	}
-	else /* if (nc > MxIndA) */ {    /*  The right triangle of the Fig. */
-	    ind_as = 0;
-	    ind_ae = MxIndAB - nc - 1;
-	    ind_bs = MxIndB - (nc - MxIndA);
-	}
-
-	for (i = ind_as; i <= ind_ae; ++i) {
-            s = (DECDIG_DBL)a->frac[i] * b->frac[ind_bs--];
-            carry = (DECDIG)(s / BASE);
-            s -= (DECDIG_DBL)carry * BASE;
-            c->frac[ind_c] += (DECDIG)s;
-            if (c->frac[ind_c] >= BASE) {
-                s = c->frac[ind_c] / BASE;
-                carry += (DECDIG)s;
-                c->frac[ind_c] -= (DECDIG)(s * BASE);
-            }
-	    if (carry) {
-		ii = ind_c;
-		while (ii-- > 0) {
-		    c->frac[ii] += carry;
-		    if (c->frac[ii] >= BASE) {
-			carry = c->frac[ii] / BASE;
-			c->frac[ii] -= (carry * BASE);
-		    }
-		    else {
-			break;
-		    }
-		}
-	    }
-	}
-    }
-    if (w != NULL) {        /* free work variable */
-        VpNmlz(c);
-        VpAsgn(w, c, 1);
-        rbd_free_struct(c);
-        c = w;
-    }
-    else {
-	VpLimitRound(c,0);
-    }
-
-Exit:
-#ifdef BIGDECIMAL_DEBUG
-    if (gfDebug) {
-	VPrint(stdout, "VpMult(c=a*b): c=% \n", c);
-	VPrint(stdout, "      a=% \n", a);
-	VPrint(stdout, "      b=% \n", b);
-    }
-#endif /*BIGDECIMAL_DEBUG */
-    return c->Prec*BASE_FIG;
-}
-
-/*
- *   c = a / b,  remainder = r
- */
-VP_EXPORT size_t
-VpDivd(Real *c, Real *r, Real *a, Real *b)
-{
-    size_t word_a, word_b, word_c, word_r;
-    size_t i, n, ind_a, ind_b, ind_c, ind_r;
-    size_t nLoop;
-    DECDIG_DBL q, b1, b1p1, b1b2, b1b2p1, r1r2;
-    DECDIG borrow, borrow1, borrow2;
-    DECDIG_DBL qb;
-
-#ifdef BIGDECIMAL_DEBUG
-    if (gfDebug) {
-	VPrint(stdout, " VpDivd(c=a/b)  a=% \n", a);
-	VPrint(stdout, "    b=% \n", b);
-    }
-#endif /*BIGDECIMAL_DEBUG */
-
-    VpSetNaN(r);
-    if (!VpIsDefOP(c, a, b, OP_SW_DIV)) goto Exit;
-    if (VpIsZero(a) && VpIsZero(b)) {
-	VpSetNaN(c);
-	return VpException(VP_EXCEPTION_NaN, "Computation results to 'NaN'", 0);
-    }
-    if (VpIsZero(b)) {
-	VpSetInf(c, VpGetSign(a) * VpGetSign(b));
-	return VpException(VP_EXCEPTION_ZERODIVIDE, "Divide by zero", 0);
-    }
-    if (VpIsZero(a)) {
-	/* numerator a is zero  */
-	VpSetZero(c, VpGetSign(a) * VpGetSign(b));
-	VpSetZero(r, VpGetSign(a) * VpGetSign(b));
-	goto Exit;
-    }
-    if (VpIsOne(b)) {
-	/* divide by one  */
-	VpAsgn(c, a, VpGetSign(b));
-	VpSetZero(r, VpGetSign(a));
-	goto Exit;
-    }
-
-    word_a = a->Prec;
-    word_b = b->Prec;
-    word_c = c->MaxPrec;
-    word_r = r->MaxPrec;
-
-    if (word_a >= word_r) goto space_error;
-
-    ind_r = 1;
-    r->frac[0] = 0;
-    while (ind_r <= word_a) {
-	r->frac[ind_r] = a->frac[ind_r - 1];
-	++ind_r;
-    }
-    while (ind_r < word_r) r->frac[ind_r++] = 0;
-
-    ind_c = 0;
-    while (ind_c < word_c) c->frac[ind_c++] = 0;
-
-    /* initial procedure */
-    b1 = b1p1 = b->frac[0];
-    if (b->Prec <= 1) {
-	b1b2p1 = b1b2 = b1p1 * BASE;
-    }
-    else {
-	b1p1 = b1 + 1;
-	b1b2p1 = b1b2 = b1 * BASE + b->frac[1];
-	if (b->Prec > 2) ++b1b2p1;
-    }
-
-    /* */
-    /* loop start */
-    ind_c = word_r - 1;
-    nLoop = Min(word_c,ind_c);
-    ind_c = 1;
-    while (ind_c < nLoop) {
-	if (r->frac[ind_c] == 0) {
-	    ++ind_c;
-	    continue;
-	}
-        r1r2 = (DECDIG_DBL)r->frac[ind_c] * BASE + r->frac[ind_c + 1];
-	if (r1r2 == b1b2) {
-	    /* The first two word digits is the same */
-	    ind_b = 2;
-	    ind_a = ind_c + 2;
-	    while (ind_b < word_b) {
-		if (r->frac[ind_a] < b->frac[ind_b]) goto div_b1p1;
-		if (r->frac[ind_a] > b->frac[ind_b]) break;
-		++ind_a;
-		++ind_b;
-	    }
-	    /* The first few word digits of r and b is the same and */
-	    /* the first different word digit of w is greater than that */
-	    /* of b, so quotient is 1 and just subtract b from r. */
-	    borrow = 0;        /* quotient=1, then just r-b */
-	    ind_b = b->Prec - 1;
-	    ind_r = ind_c + ind_b;
-	    if (ind_r >= word_r) goto space_error;
-	    n = ind_b;
-	    for (i = 0; i <= n; ++i) {
-		if (r->frac[ind_r] < b->frac[ind_b] + borrow) {
-		    r->frac[ind_r] += (BASE - (b->frac[ind_b] + borrow));
-		    borrow = 1;
-		}
-		else {
-		    r->frac[ind_r] = r->frac[ind_r] - b->frac[ind_b] - borrow;
-		    borrow = 0;
-		}
-		--ind_r;
-		--ind_b;
-	    }
-	    ++c->frac[ind_c];
-	    goto carry;
-	}
-	/* The first two word digits is not the same, */
-	/* then compare magnitude, and divide actually. */
-	if (r1r2 >= b1b2p1) {
-            q = r1r2 / b1b2p1;  /* q == (DECDIG)q  */
-            c->frac[ind_c] += (DECDIG)q;
-            ind_r = b->Prec + ind_c - 1;
-            goto sub_mult;
-	}
-
-div_b1p1:
-        if (ind_c + 1 >= word_c) goto out_side;
-        q = r1r2 / b1p1;  /* q == (DECDIG)q */
-        c->frac[ind_c + 1] += (DECDIG)q;
-        ind_r = b->Prec + ind_c;
-
-sub_mult:
-	borrow1 = borrow2 = 0;
-	ind_b = word_b - 1;
-	if (ind_r >= word_r) goto space_error;
-	n = ind_b;
-	for (i = 0; i <= n; ++i) {
-	    /* now, perform r = r - q * b */
-	    qb = q * b->frac[ind_b];
-	    if (qb < BASE) borrow1 = 0;
-	    else {
-                borrow1 = (DECDIG)(qb / BASE);
-                qb -= (DECDIG_DBL)borrow1 * BASE;	/* get qb < BASE */
-	    }
-	    if(r->frac[ind_r] < qb) {
-                r->frac[ind_r] += (DECDIG)(BASE - qb);
-                borrow2 = borrow2 + borrow1 + 1;
-	    }
-	    else {
-                r->frac[ind_r] -= (DECDIG)qb;
-                borrow2 += borrow1;
-	    }
-	    if (borrow2) {
-		if(r->frac[ind_r - 1] < borrow2) {
-		    r->frac[ind_r - 1] += (BASE - borrow2);
-		    borrow2 = 1;
-		}
-		else {
-		    r->frac[ind_r - 1] -= borrow2;
-		    borrow2 = 0;
-		}
-	    }
-	    --ind_r;
-	    --ind_b;
-	}
-
-	r->frac[ind_r] -= borrow2;
-carry:
-	ind_r = ind_c;
-	while (c->frac[ind_r] >= BASE) {
-	    c->frac[ind_r] -= BASE;
-	    --ind_r;
-	    ++c->frac[ind_r];
-	}
-    }
-    /* End of operation, now final arrangement */
-out_side:
-    c->Prec = word_c;
-    c->exponent = a->exponent;
-    if (!AddExponent(c, 2)) return 0;
-    if (!AddExponent(c, -(b->exponent))) return 0;
-
-    VpSetSign(c, VpGetSign(a) * VpGetSign(b));
-    VpNmlz(c);            /* normalize c */
-    r->Prec = word_r;
-    r->exponent = a->exponent;
-    if (!AddExponent(r, 1)) return 0;
-    VpSetSign(r, VpGetSign(a));
-    VpNmlz(r);            /* normalize r(remainder) */
-    goto Exit;
-
-space_error:
-#ifdef BIGDECIMAL_DEBUG
-    if (gfDebug) {
-	printf("   word_a=%"PRIuSIZE"\n", word_a);
-	printf("   word_b=%"PRIuSIZE"\n", word_b);
-	printf("   word_c=%"PRIuSIZE"\n", word_c);
-	printf("   word_r=%"PRIuSIZE"\n", word_r);
-	printf("   ind_r =%"PRIuSIZE"\n", ind_r);
-    }
-#endif /* BIGDECIMAL_DEBUG */
-    rb_bug("ERROR(VpDivd): space for remainder too small.");
-
-Exit:
-#ifdef BIGDECIMAL_DEBUG
-    if (gfDebug) {
-	VPrint(stdout, " VpDivd(c=a/b), c=% \n", c);
-	VPrint(stdout, "    r=% \n", r);
-    }
-#endif /* BIGDECIMAL_DEBUG */
-    return c->Prec * BASE_FIG;
-}
-
-/*
- *  Input  a = 00000xxxxxxxx En(5 preceding zeros)
- *  Output a = xxxxxxxx En-5
- */
-static int
-VpNmlz(Real *a)
-{
-    size_t ind_a, i;
-
-    if (!VpIsDef(a)) goto NoVal;
-    if (VpIsZero(a)) goto NoVal;
-
-    ind_a = a->Prec;
-    while (ind_a--) {
-	if (a->frac[ind_a]) {
-	    a->Prec = ind_a + 1;
-	    i = 0;
-	    while (a->frac[i] == 0) ++i;        /* skip the first few zeros */
-	    if (i) {
-                a->Prec -= i;
-                if (!AddExponent(a, -(SIGNED_VALUE)i)) return 0;
-                memmove(&a->frac[0], &a->frac[i], a->Prec*sizeof(DECDIG));
-	    }
-	    return 1;
-	}
-    }
-    /* a is zero(no non-zero digit) */
-    VpSetZero(a, VpGetSign(a));
-    return 0;
-
-NoVal:
-    a->frac[0] = 0;
-    a->Prec = 1;
-    return 0;
-}
-
-/*
- *  VpComp = 0  ... if a=b,
- *   Pos  ... a>b,
- *   Neg  ... a<b.
- *   999  ... result undefined(NaN)
- */
-VP_EXPORT int
-VpComp(Real *a, Real *b)
-{
-    int val;
-    size_t mx, ind;
-    int e;
-    val = 0;
-    if (VpIsNaN(a) || VpIsNaN(b)) return 999;
-    if (!VpIsDef(a)) {
-	if (!VpIsDef(b)) e = a->sign - b->sign;
-	else             e = a->sign;
-
-	if (e > 0)      return  1;
-	else if (e < 0) return -1;
-	else            return  0;
-    }
-    if (!VpIsDef(b)) {
-	e = -b->sign;
-	if (e > 0) return  1;
-	else       return -1;
-    }
-    /* Zero check */
-    if (VpIsZero(a)) {
-	if (VpIsZero(b)) return 0; /* both zero */
-	val = -VpGetSign(b);
-	goto Exit;
-    }
-    if (VpIsZero(b)) {
-	val = VpGetSign(a);
-	goto Exit;
-    }
-
-    /* compare sign */
-    if (VpGetSign(a) > VpGetSign(b)) {
-	val = 1;        /* a>b */
-	goto Exit;
-    }
-    if (VpGetSign(a) < VpGetSign(b)) {
-	val = -1;        /* a<b */
-	goto Exit;
-    }
-
-    /* a and b have same sign, && sign!=0,then compare exponent */
-    if (a->exponent > b->exponent) {
-	val = VpGetSign(a);
-	goto Exit;
-    }
-    if (a->exponent < b->exponent) {
-	val = -VpGetSign(b);
-	goto Exit;
-    }
-
-    /* a and b have same exponent, then compare their significand. */
-    mx = (a->Prec < b->Prec) ? a->Prec : b->Prec;
-    ind = 0;
-    while (ind < mx) {
-	if (a->frac[ind] > b->frac[ind]) {
-	    val = VpGetSign(a);
-	    goto Exit;
-	}
-	if (a->frac[ind] < b->frac[ind]) {
-	    val = -VpGetSign(b);
-	    goto Exit;
-	}
-	++ind;
-    }
-    if (a->Prec > b->Prec) {
-	val = VpGetSign(a);
-    }
-    else if (a->Prec < b->Prec) {
-	val = -VpGetSign(b);
-    }
-
-Exit:
-    if      (val >  1) val =  1;
-    else if (val < -1) val = -1;
-
-#ifdef BIGDECIMAL_DEBUG
-    if (gfDebug) {
-	VPrint(stdout, " VpComp a=%\n", a);
-	VPrint(stdout, "  b=%\n", b);
-	printf("  ans=%d\n", val);
-    }
-#endif /* BIGDECIMAL_DEBUG */
-    return (int)val;
-}
-
-/*
- *    cntl_chr ... ASCIIZ Character, print control characters
- *     Available control codes:
- *      %  ... VP variable. To print '%', use '%%'.
- *      \n ... new line
- *      \b ... backspace
- *      \t ... tab
- *     Note: % must not appear more than once
- *    a  ... VP variable to be printed
- */
-static int
-VPrint(FILE *fp, const char *cntl_chr, Real *a)
-{
-    size_t i, j, nc, nd, ZeroSup, sep = 10;
-    DECDIG m, e, nn;
-
-    j = 0;
-    nd = nc = 0;        /*  nd : number of digits in fraction part(every 10 digits, */
-    /*    nd<=10). */
-    /*  nc : number of characters printed  */
-    ZeroSup = 1;        /* Flag not to print the leading zeros as 0.00xxxxEnn */
-    while (*(cntl_chr + j)) {
-        if (*(cntl_chr + j) == '%' && *(cntl_chr + j + 1) != '%') {
-            nc = 0;
-            if (VpIsNaN(a)) {
-                fprintf(fp, SZ_NaN);
-                nc += 8;
-            }
-            else if (VpIsPosInf(a)) {
-                fprintf(fp, SZ_INF);
-                nc += 8;
-            }
-            else if (VpIsNegInf(a)) {
-                fprintf(fp, SZ_NINF);
-                nc += 9;
-            }
-            else if (!VpIsZero(a)) {
-                if (BIGDECIMAL_NEGATIVE_P(a)) {
-                    fprintf(fp, "-");
-                    ++nc;
-                }
-                nc += fprintf(fp, "0.");
-                switch (*(cntl_chr + j + 1)) {
-                  default:
-                    break;
-
-                  case '0': case 'z':
-                    ZeroSup = 0;
-                    ++j;
-                    sep = cntl_chr[j] == 'z' ? BIGDECIMAL_COMPONENT_FIGURES : 10;
-                    break;
-                }
-                for (i = 0; i < a->Prec; ++i) {
-                    m = BASE1;
-                    e = a->frac[i];
-                    while (m) {
-                        nn = e / m;
-                        if (!ZeroSup || nn) {
-                            nc += fprintf(fp, "%lu", (unsigned long)nn);    /* The leading zero(s) */
-                            /* as 0.00xx will not */
-                            /* be printed. */
-                            ++nd;
-                            ZeroSup = 0;    /* Set to print succeeding zeros */
-                        }
-                        if (nd >= sep) {    /* print ' ' after every 10 digits */
-                            nd = 0;
-                            nc += fprintf(fp, " ");
-                        }
-                        e = e - nn * m;
-                        m /= 10;
-                    }
-                }
-                nc += fprintf(fp, "E%"PRIdSIZE, VpExponent10(a));
-                nc += fprintf(fp, " (%"PRIdVALUE", %"PRIuSIZE", %"PRIuSIZE")", a->exponent, a->Prec, a->MaxPrec);
-            }
-            else {
-                nc += fprintf(fp, "0.0");
-            }
-        }
-        else {
-            ++nc;
-            if (*(cntl_chr + j) == '\\') {
-                switch (*(cntl_chr + j + 1)) {
-                  case 'n':
-                    fprintf(fp, "\n");
-                    ++j;
-                    break;
-                  case 't':
-                    fprintf(fp, "\t");
-                    ++j;
-                    break;
-                  case 'b':
-                    fprintf(fp, "\n");
-                    ++j;
-                    break;
-                  default:
-                    fprintf(fp, "%c", *(cntl_chr + j));
-                    break;
-                }
-            }
-            else {
-                fprintf(fp, "%c", *(cntl_chr + j));
-                if (*(cntl_chr + j) == '%') ++j;
-            }
-        }
-        j++;
-    }
-
-    return (int)nc;
-}
-
-static void
-VpFormatSt(char *psz, size_t fFmt)
-{
-    size_t ie, i, nf = 0;
-    char ch;
-
-    if (fFmt == 0) return;
-
-    ie = strlen(psz);
-    for (i = 0; i < ie; ++i) {
-	ch = psz[i];
-	if (!ch) break;
-	if (ISSPACE(ch) || ch=='-' || ch=='+') continue;
-	if (ch == '.') { nf = 0; continue; }
-	if (ch == 'E' || ch == 'e') break;
-
-	if (++nf > fFmt) {
-	    memmove(psz + i + 1, psz + i, ie - i + 1);
-	    ++ie;
-	    nf = 0;
-	    psz[i] = ' ';
-	}
-    }
-}
-
-VP_EXPORT ssize_t
-VpExponent10(Real *a)
-{
-    ssize_t ex;
-    size_t n;
-
-    if (!VpHasVal(a)) return 0;
-
-    ex = a->exponent * (ssize_t)BASE_FIG;
-    n = BASE1;
-    while ((a->frac[0] / n) == 0) {
-	--ex;
-	n /= 10;
-    }
-    return ex;
-}
-
-VP_EXPORT void
-VpSzMantissa(Real *a, char *buf, size_t buflen)
-{
-    size_t i, n, ZeroSup;
-    DECDIG_DBL m, e, nn;
-
-    if (VpIsNaN(a)) {
-        snprintf(buf, buflen, SZ_NaN);
-        return;
-    }
-    if (VpIsPosInf(a)) {
-	snprintf(buf, buflen, SZ_INF);
-	return;
-    }
-    if (VpIsNegInf(a)) {
-	snprintf(buf, buflen, SZ_NINF);
-	return;
-    }
-
-    ZeroSup = 1;        /* Flag not to print the leading zeros as 0.00xxxxEnn */
-    if (!VpIsZero(a)) {
-        if (BIGDECIMAL_NEGATIVE_P(a)) *buf++ = '-';
-        n = a->Prec;
-        for (i = 0; i < n; ++i) {
-            m = BASE1;
-            e = a->frac[i];
-            while (m) {
-                nn = e / m;
-                if (!ZeroSup || nn) {
-                    snprintf(buf, buflen, "%lu", (unsigned long)nn); /* The leading zero(s) */
-                    buf += strlen(buf);
-                    /* as 0.00xx will be ignored. */
-                    ZeroSup = 0; /* Set to print succeeding zeros */
-                }
-                e = e - nn * m;
-                m /= 10;
-            }
-        }
-        *buf = 0;
-        while (buf[-1] == '0') *(--buf) = 0;
-    }
-    else {
-	if (VpIsPosZero(a)) snprintf(buf, buflen, "0");
-	else                snprintf(buf, buflen, "-0");
-    }
-}
-
-VP_EXPORT int
-VpToSpecialString(Real *a, char *buf, size_t buflen, int fPlus)
-/* fPlus = 0: default, 1: set ' ' before digits, 2: set '+' before digits. */
-{
-    if (VpIsNaN(a)) {
-        snprintf(buf, buflen, SZ_NaN);
-        return 1;
-    }
-
-    if (VpIsPosInf(a)) {
-        if (fPlus == 1) {
-            *buf++ = ' ';
-        }
-        else if (fPlus == 2) {
-            *buf++ = '+';
-        }
-        snprintf(buf, buflen, SZ_INF);
-        return 1;
-    }
-    if (VpIsNegInf(a)) {
-        snprintf(buf, buflen, SZ_NINF);
-        return 1;
-    }
-    if (VpIsZero(a)) {
-        if (VpIsPosZero(a)) {
-            if (fPlus == 1)      snprintf(buf, buflen, " 0.0");
-            else if (fPlus == 2) snprintf(buf, buflen, "+0.0");
-            else                 snprintf(buf, buflen,  "0.0");
-        }
-        else                     snprintf(buf, buflen, "-0.0");
-        return 1;
-    }
-    return 0;
-}
-
-VP_EXPORT void
-VpToString(Real *a, char *buf, size_t buflen, size_t fFmt, int fPlus)
-/* fPlus = 0: default, 1: set ' ' before digits, 2: set '+' before digits. */
-{
-    size_t i, n, ZeroSup;
-    DECDIG shift, m, e, nn;
-    char *p = buf;
-    size_t plen = buflen;
-    ssize_t ex;
-
-    if (VpToSpecialString(a, buf, buflen, fPlus)) return;
-
-    ZeroSup = 1;    /* Flag not to print the leading zeros as 0.00xxxxEnn */
-
-#define ADVANCE(n) do { \
-    if (plen < n) goto overflow; \
-    p += n; \
-    plen -= n; \
-} while (0)
-
-    if (BIGDECIMAL_NEGATIVE_P(a)) {
-        *p = '-';
-        ADVANCE(1);
-    }
-    else if (fPlus == 1) {
-        *p = ' ';
-        ADVANCE(1);
-    }
-    else if (fPlus == 2) {
-        *p = '+';
-        ADVANCE(1);
-    }
-
-    *p = '0'; ADVANCE(1);
-    *p = '.'; ADVANCE(1);
-
-    n = a->Prec;
-    for (i = 0; i < n; ++i) {
-        m = BASE1;
-        e = a->frac[i];
-        while (m) {
-            nn = e / m;
-            if (!ZeroSup || nn) {
-                /* The reading zero(s) */
-                size_t n = (size_t)snprintf(p, plen, "%lu", (unsigned long)nn);
-                if (n > plen) goto overflow;
-                ADVANCE(n);
-                /* as 0.00xx will be ignored. */
-                ZeroSup = 0;    /* Set to print succeeding zeros */
-            }
-            e = e - nn * m;
-            m /= 10;
-        }
-    }
-
-    ex = a->exponent * (ssize_t)BASE_FIG;
-    shift = BASE1;
-    while (a->frac[0] / shift == 0) {
-        --ex;
-        shift /= 10;
-    }
-    while (p - 1 > buf && p[-1] == '0') {
-        *(--p) = '\0';
-        ++plen;
-    }
-    snprintf(p, plen, "e%"PRIdSIZE, ex);
-    if (fFmt) VpFormatSt(buf, fFmt);
-
-  overflow:
-    return;
-#undef ADVANCE
-}
-
-VP_EXPORT void
-VpToFString(Real *a, char *buf, size_t buflen, size_t fFmt, int fPlus)
-/* fPlus = 0: default, 1: set ' ' before digits, 2: set '+' before digits. */
-{
-    size_t i, n;
-    DECDIG m, e;
-    char *p = buf;
-    size_t plen = buflen, delim = fFmt;
-    ssize_t ex;
-
-    if (VpToSpecialString(a, buf, buflen, fPlus)) return;
-
-#define APPEND(c, group) do { \
-    if (plen < 1) goto overflow; \
-    if (group && delim == 0) { \
-        *p = ' '; \
-        p += 1; \
-        plen -= 1; \
-    } \
-    if (plen < 1) goto overflow; \
-    *p = c; \
-    p += 1; \
-    plen -= 1; \
-    if (group) delim = (delim + 1) % fFmt; \
-} while (0)
-
-
-    if (BIGDECIMAL_NEGATIVE_P(a)) {
-        APPEND('-', false);
-    }
-    else if (fPlus == 1) {
-        APPEND(' ', false);
-    }
-    else if (fPlus == 2) {
-        APPEND('+', false);
-    }
-
-    n  = a->Prec;
-    ex = a->exponent;
-    if (ex <= 0) {
-        APPEND('0', false);
-        APPEND('.', false);
-    }
-    while (ex < 0) {
-        for (i=0; i < BASE_FIG; ++i) {
-            APPEND('0', fFmt > 0);
-        }
-        ++ex;
-    }
-
-    for (i = 0; i < n; ++i) {
-        m = BASE1;
-        e = a->frac[i];
-        if (i == 0 && ex > 0) {
-            for (delim = 0; e / m == 0; delim++) {
-                m /= 10;
-            }
-            if (fFmt > 0) {
-              delim = 2*fFmt - (ex * BASE_FIG - delim) % fFmt;
-            }
-        }
-        while (m && (e || (i < n - 1) || ex > 0)) {
-            APPEND((char)(e / m + '0'), fFmt > 0);
-            e %= m;
-            m /= 10;
-        }
-        if (--ex == 0) {
-            APPEND('.', false);
-            delim = fFmt;
-        }
-    }
-
-    while (ex > 0) {
-        for (i=0; i < BASE_FIG; ++i) {
-            APPEND('0', fFmt > 0);
-        }
-        if (--ex == 0) {
-            APPEND('.', false);
-        }
-    }
-
-    *p = '\0';
-    if (p - 1 > buf && p[-1] == '.') {
-        snprintf(p, plen, "0");
-    }
-
-  overflow:
-    return;
-#undef APPEND
-}
-
-/*
- *  [Output]
- *   a[]  ... variable to be assigned the value.
- *  [Input]
- *   int_chr[]  ... integer part(may include '+/-').
- *   ni   ... number of characters in int_chr[],not including '+/-'.
- *   frac[]  ... fraction part.
- *   nf   ... number of characters in frac[].
- *   exp_chr[]  ... exponent part(including '+/-').
- *   ne   ... number of characters in exp_chr[],not including '+/-'.
- */
-VP_EXPORT int
-VpCtoV(Real *a, const char *int_chr, size_t ni, const char *frac, size_t nf, const char *exp_chr, size_t ne)
-{
-    size_t i, j, ind_a, ma, mi, me;
-    SIGNED_VALUE e, es, eb, ef;
-    int  sign, signe, exponent_overflow;
-
-    /* get exponent part */
-    e = 0;
-    ma = a->MaxPrec;
-    mi = ni;
-    me = ne;
-    signe = 1;
-    exponent_overflow = 0;
-    memset(a->frac, 0, ma * sizeof(DECDIG));
-    if (ne > 0) {
-	i = 0;
-	if (exp_chr[0] == '-') {
-	    signe = -1;
-	    ++i;
-	    ++me;
-	}
-	else if (exp_chr[0] == '+') {
-	    ++i;
-	    ++me;
-	}
-	while (i < me) {
-            if (MUL_OVERFLOW_SIGNED_VALUE_P(e, (SIGNED_VALUE)BASE_FIG)) {
-                es = e;
-                goto exp_overflow;
-            }
-	    es = e * (SIGNED_VALUE)BASE_FIG;
-            if (MUL_OVERFLOW_SIGNED_VALUE_P(e, 10) ||
-                SIGNED_VALUE_MAX - (exp_chr[i] - '0') < e * 10)
-                goto exp_overflow;
-	    e = e * 10 + exp_chr[i] - '0';
-            if (MUL_OVERFLOW_SIGNED_VALUE_P(e, (SIGNED_VALUE)BASE_FIG))
-                goto exp_overflow;
-	    if (es > (SIGNED_VALUE)(e * BASE_FIG)) {
-              exp_overflow:
-		exponent_overflow = 1;
-		e = es; /* keep sign */
-		break;
-	    }
-	    ++i;
-	}
-    }
-
-    /* get integer part */
-    i = 0;
-    sign = 1;
-    if (1 /*ni >= 0*/) {
-	if (int_chr[0] == '-') {
-	    sign = -1;
-	    ++i;
-	    ++mi;
-	}
-	else if (int_chr[0] == '+') {
-	    ++i;
-	    ++mi;
-	}
-    }
-
-    e = signe * e;        /* e: The value of exponent part. */
-    e = e + ni;        /* set actual exponent size. */
-
-    if (e > 0) signe = 1;
-    else       signe = -1;
-
-    /* Adjust the exponent so that it is the multiple of BASE_FIG. */
-    j = 0;
-    ef = 1;
-    while (ef) {
-	if (e >= 0) eb =  e;
-	else        eb = -e;
-	ef = eb / (SIGNED_VALUE)BASE_FIG;
-	ef = eb - ef * (SIGNED_VALUE)BASE_FIG;
-	if (ef) {
-	    ++j;        /* Means to add one more preceding zero */
-	    ++e;
-	}
-    }
-
-    eb = e / (SIGNED_VALUE)BASE_FIG;
-
-    if (exponent_overflow) {
-	int zero = 1;
-	for (     ; i < mi && zero; i++) zero = int_chr[i] == '0';
-	for (i = 0; i < nf && zero; i++) zero = frac[i] == '0';
-	if (!zero && signe > 0) {
-	    VpSetInf(a, sign);
-	    VpException(VP_EXCEPTION_INFINITY, "exponent overflow",0);
-	}
-	else VpSetZero(a, sign);
-	return 1;
-    }
-
-    ind_a = 0;
-    while (i < mi) {
-	a->frac[ind_a] = 0;
-	while (j < BASE_FIG && i < mi) {
-	    a->frac[ind_a] = a->frac[ind_a] * 10 + int_chr[i] - '0';
-	    ++j;
-	    ++i;
-	}
-	if (i < mi) {
-	    ++ind_a;
-	    if (ind_a >= ma) goto over_flow;
-	    j = 0;
-	}
-    }
-
-    /* get fraction part */
-
-    i = 0;
-    while (i < nf) {
-	while (j < BASE_FIG && i < nf) {
-	    a->frac[ind_a] = a->frac[ind_a] * 10 + frac[i] - '0';
-	    ++j;
-	    ++i;
-	}
-	if (i < nf) {
-	    ++ind_a;
-	    if (ind_a >= ma) goto over_flow;
-	    j = 0;
-	}
-    }
-    goto Final;
-
-over_flow:
-    rb_warn("Conversion from String to BigDecimal overflow (last few digits discarded).");
-
-Final:
-    if (ind_a >= ma) ind_a = ma - 1;
-    while (j < BASE_FIG) {
-	a->frac[ind_a] = a->frac[ind_a] * 10;
-	++j;
-    }
-    a->Prec = ind_a + 1;
-    a->exponent = eb;
-    VpSetSign(a, sign);
-    VpNmlz(a);
-    return 1;
-}
-
-/*
- * [Input]
- *   *m  ... Real
- * [Output]
- *   *d  ... fraction part of m(d = 0.xxxxxxx). where # of 'x's is fig.
- *   *e  ... exponent of m.
- * BIGDECIMAL_DOUBLE_FIGURES ... Number of digits in a double variable.
- *
- *  m -> d*10**e, 0<d<BASE
- * [Returns]
- *   0 ... Zero
- *   1 ... Normal
- *   2 ... Infinity
- *  -1 ... NaN
- */
-VP_EXPORT int
-VpVtoD(double *d, SIGNED_VALUE *e, Real *m)
-{
-    size_t ind_m, mm, fig;
-    double div;
-    int    f = 1;
-
-    if (VpIsNaN(m)) {
-	*d = VpGetDoubleNaN();
-	*e = 0;
-	f = -1; /* NaN */
-	goto Exit;
-    }
-    else if (VpIsPosZero(m)) {
-	*d = 0.0;
-	*e = 0;
-	f  = 0;
-	goto Exit;
-    }
-    else if (VpIsNegZero(m)) {
-	*d = VpGetDoubleNegZero();
-	*e = 0;
-	f  = 0;
-	goto Exit;
-    }
-    else if (VpIsPosInf(m)) {
-	*d = VpGetDoublePosInf();
-	*e = 0;
-	f  = 2;
-	goto Exit;
-    }
-    else if (VpIsNegInf(m)) {
-	*d = VpGetDoubleNegInf();
-	*e = 0;
-	f  = 2;
-	goto Exit;
-    }
-    /* Normal number */
-    fig = roomof(BIGDECIMAL_DOUBLE_FIGURES, BASE_FIG);
-    ind_m = 0;
-    mm = Min(fig, m->Prec);
-    *d = 0.0;
-    div = 1.;
-    while (ind_m < mm) {
-	div /= (double)BASE;
-	*d = *d + (double)m->frac[ind_m++] * div;
-    }
-    *e = m->exponent * (SIGNED_VALUE)BASE_FIG;
-    *d *= VpGetSign(m);
-
-Exit:
-#ifdef BIGDECIMAL_DEBUG
-    if (gfDebug) {
-	VPrint(stdout, " VpVtoD: m=%\n", m);
-	printf("   d=%e * 10 **%ld\n", *d, *e);
-	printf("   BIGDECIMAL_DOUBLE_FIGURES = %d\n", BIGDECIMAL_DOUBLE_FIGURES);
-    }
-#endif /*BIGDECIMAL_DEBUG */
-    return f;
-}
-
-/*
- * m <- d
- */
-VP_EXPORT void
-VpDtoV(Real *m, double d)
-{
-    size_t ind_m, mm;
-    SIGNED_VALUE ne;
-    DECDIG i;
-    double  val, val2;
-
-    if (isnan(d)) {
-	VpSetNaN(m);
-	goto Exit;
-    }
-    if (isinf(d)) {
-	if (d > 0.0) VpSetPosInf(m);
-	else VpSetNegInf(m);
-	goto Exit;
-    }
-
-    if (d == 0.0) {
-	VpSetZero(m, 1);
-	goto Exit;
-    }
-    val = (d > 0.) ? d : -d;
-    ne = 0;
-    if (val >= 1.0) {
-	while (val >= 1.0) {
-	    val /= (double)BASE;
-	    ++ne;
-	}
-    }
-    else {
-	val2 = 1.0 / (double)BASE;
-	while (val < val2) {
-	    val *= (double)BASE;
-	    --ne;
-	}
-    }
-    /* Now val = 0.xxxxx*BASE**ne */
-
-    mm = m->MaxPrec;
-    memset(m->frac, 0, mm * sizeof(DECDIG));
-    for (ind_m = 0; val > 0.0 && ind_m < mm; ind_m++) {
-        val *= (double)BASE;
-        i = (DECDIG)val;
-        val -= (double)i;
-        m->frac[ind_m] = i;
-    }
-    if (ind_m >= mm) ind_m = mm - 1;
-    VpSetSign(m, (d > 0.0) ? 1 : -1);
-    m->Prec = ind_m + 1;
-    m->exponent = ne;
-
-    VpInternalRound(m, 0, (m->Prec > 0) ? m->frac[m->Prec-1] : 0,
-                    (DECDIG)(val*(double)BASE));
-
-Exit:
-#ifdef BIGDECIMAL_DEBUG
-    if (gfDebug) {
-	printf("VpDtoV d=%30.30e\n", d);
-	VPrint(stdout, "  m=%\n", m);
-    }
-#endif /* BIGDECIMAL_DEBUG */
-    return;
-}
-
-/*
- *  m <- ival
- */
-#if 0  /* unused */
-VP_EXPORT void
-VpItoV(Real *m, SIGNED_VALUE ival)
-{
-    size_t mm, ind_m;
-    size_t val, v1, v2, v;
-    int isign;
-    SIGNED_VALUE ne;
-
-    if (ival == 0) {
-	VpSetZero(m, 1);
-	goto Exit;
-    }
-    isign = 1;
-    val = ival;
-    if (ival < 0) {
-	isign = -1;
-	val  =(size_t)(-ival);
-    }
-    ne = 0;
-    ind_m = 0;
-    mm = m->MaxPrec;
-    while (ind_m < mm) {
-	m->frac[ind_m] = 0;
-	++ind_m;
-    }
-    ind_m = 0;
-    while (val > 0) {
-	if (val) {
-	    v1 = val;
-	    v2 = 1;
-	    while (v1 >= BASE) {
-		v1 /= BASE;
-		v2 *= BASE;
-	    }
-	    val = val - v2 * v1;
-	    v = v1;
-	}
-	else {
-	    v = 0;
-	}
-	m->frac[ind_m] = v;
-	++ind_m;
-	++ne;
-    }
-    m->Prec = ind_m - 1;
-    m->exponent = ne;
-    VpSetSign(m, isign);
-    VpNmlz(m);
-
-Exit:
-#ifdef BIGDECIMAL_DEBUG
-    if (gfDebug) {
-	printf(" VpItoV i=%d\n", ival);
-	VPrint(stdout, "  m=%\n", m);
-    }
-#endif /* BIGDECIMAL_DEBUG */
-    return;
-}
-#endif
-
-/*
- * y = SQRT(x),  y*y - x =>0
- */
-VP_EXPORT int
-VpSqrt(Real *y, Real *x)
-{
-    Real *f = NULL;
-    Real *r = NULL;
-    size_t y_prec;
-    SIGNED_VALUE n, e;
-    ssize_t nr;
-    double val;
-
-    /* Zero or +Infinity ? */
-    if (VpIsZero(x) || VpIsPosInf(x)) {
-	VpAsgn(y,x,1);
-	goto Exit;
-    }
-
-    /* Negative ? */
-    if (BIGDECIMAL_NEGATIVE_P(x)) {
-	VpSetNaN(y);
-	return VpException(VP_EXCEPTION_OP, "sqrt of negative value", 0);
-    }
-
-    /* NaN ? */
-    if (VpIsNaN(x)) {
-	VpSetNaN(y);
-	return VpException(VP_EXCEPTION_OP, "sqrt of 'NaN'(Not a Number)", 0);
-    }
-
-    /* One ? */
-    if (VpIsOne(x)) {
-	VpSetOne(y);
-	goto Exit;
-    }
-
-    n = (SIGNED_VALUE)y->MaxPrec;
-    if (x->MaxPrec > (size_t)n) n = (ssize_t)x->MaxPrec;
-
-    /* allocate temporally variables  */
-    /* TODO: reconsider MaxPrec of f and r */
-    f = NewOneNolimit(1, y->MaxPrec * (BASE_FIG + 2));
-    r = NewOneNolimit(1, (n + n) * (BASE_FIG + 2));
-
-    nr = 0;
-    y_prec = y->MaxPrec;
-
-    VpVtoD(&val, &e, x);    /* val <- x  */
-    e /= (SIGNED_VALUE)BASE_FIG;
-    n = e / 2;
-    if (e - n * 2 != 0) {
-	val /= BASE;
-	n = (e + 1) / 2;
-    }
-    VpDtoV(y, sqrt(val));    /* y <- sqrt(val) */
-    y->exponent += n;
-    n = (SIGNED_VALUE)roomof(BIGDECIMAL_DOUBLE_FIGURES, BASE_FIG);
-    y->MaxPrec = Min((size_t)n , y_prec);
-    f->MaxPrec = y->MaxPrec + 1;
-    n = (SIGNED_VALUE)(y_prec * BASE_FIG);
-    if (n < (SIGNED_VALUE)maxnr) n = (SIGNED_VALUE)maxnr;
-
-    /*
-     * Perform: y_{n+1} = (y_n - x/y_n) / 2
-     */
-    do {
-        y->MaxPrec *= 2;
-        if (y->MaxPrec > y_prec) y->MaxPrec = y_prec;
-        f->MaxPrec = y->MaxPrec;
-        VpDivd(f, r, x, y);        /* f = x/y    */
-        VpAddSub(r, f, y, -1);     /* r = f - y  */
-        VpMult(f, VpConstPt5, r);  /* f = 0.5*r  */
-        if (VpIsZero(f))
-            goto converge;
-        VpAddSub(r, f, y, 1);      /* r = y + f  */
-        VpAsgn(y, r, 1);           /* y = r      */
-    } while (++nr < n);
-
-#ifdef BIGDECIMAL_DEBUG
-    if (gfDebug) {
-	printf("ERROR(VpSqrt): did not converge within %ld iterations.\n", nr);
-    }
-#endif /* BIGDECIMAL_DEBUG */
-    y->MaxPrec = y_prec;
-
-converge:
-    VpChangeSign(y, 1);
-#ifdef BIGDECIMAL_DEBUG
-    if (gfDebug) {
-	VpMult(r, y, y);
-	VpAddSub(f, x, r, -1);
-	printf("VpSqrt: iterations = %"PRIdSIZE"\n", nr);
-	VPrint(stdout, "  y =% \n", y);
-	VPrint(stdout, "  x =% \n", x);
-	VPrint(stdout, "  x-y*y = % \n", f);
-    }
-#endif /* BIGDECIMAL_DEBUG */
-    y->MaxPrec = y_prec;
-
-Exit:
-    rbd_free_struct(f);
-    rbd_free_struct(r);
-    return 1;
-}
-
-/*
- * Round relatively from the decimal point.
- *    f: rounding mode
- *   nf: digit location to round from the decimal point.
- */
-VP_EXPORT int
-VpMidRound(Real *y, unsigned short f, ssize_t nf)
-{
-    /* fracf: any positive digit under rounding position? */
-    /* fracf_1further: any positive digits under one further than the rounding position? */
-    /* exptoadd: number of digits needed to compensate negative nf */
-    int fracf, fracf_1further;
-    ssize_t n,i,ix,ioffset, exptoadd;
-    DECDIG v, shifter;
-    DECDIG div;
-
-    nf += y->exponent * (ssize_t)BASE_FIG;
-    exptoadd=0;
-    if (nf < 0) {
-	/* rounding position too left(large). */
-	if (f != VP_ROUND_CEIL && f != VP_ROUND_FLOOR) {
-	    VpSetZero(y, VpGetSign(y)); /* truncate everything */
-	    return 0;
-	}
-	exptoadd = -nf;
-	nf = 0;
-    }
-
-    ix = nf / (ssize_t)BASE_FIG;
-    if ((size_t)ix >= y->Prec) return 0;  /* rounding position too right(small). */
-    v = y->frac[ix];
-
-    ioffset = nf - ix*(ssize_t)BASE_FIG;
-    n = (ssize_t)BASE_FIG - ioffset - 1;
-    for (shifter = 1, i = 0; i < n; ++i) shifter *= 10;
-
-    /* so the representation used (in y->frac) is an array of DECDIG, where
-       each DECDIG contains a value between 0 and BASE-1, consisting of BASE_FIG
-       decimal places.
-
-       (that numbers of decimal places are typed as ssize_t is somewhat confusing)
-
-       nf is now position (in decimal places) of the digit from the start of
-       the array.
-
-       ix is the position (in DECDIGs) of the DECDIG containing the decimal digit,
-       from the start of the array.
-
-       v is the value of this DECDIG
-
-       ioffset is the number of extra decimal places along of this decimal digit
-       within v.
-
-       n is the number of decimal digits remaining within v after this decimal digit
-       shifter is 10**n,
-
-       v % shifter are the remaining digits within v
-       v % (shifter * 10) are the digit together with the remaining digits within v
-       v / shifter are the digit's predecessors together with the digit
-       div = v / shifter / 10 is just the digit's precessors
-       (v / shifter) - div*10 is just the digit, which is what v ends up being reassigned to.
-       */
-
-    fracf = (v % (shifter * 10) > 0);
-    fracf_1further = ((v % shifter) > 0);
-
-    v /= shifter;
-    div = v / 10;
-    v = v - div*10;
-    /* now v is just the digit required.
-       now fracf is whether the digit or any of the remaining digits within v are non-zero
-       now fracf_1further is whether any of the remaining digits within v are non-zero
-       */
-
-    /* now check all the remaining DECDIGs for zero-ness a whole DECDIG at a time.
-       if we spot any non-zeroness, that means that we found a positive digit under
-       rounding position, and we also found a positive digit under one further than
-       the rounding position, so both searches (to see if any such non-zero digit exists)
-       can stop */
-
-    for (i = ix + 1; (size_t)i < y->Prec; i++) {
-	if (y->frac[i] % BASE) {
-	    fracf = fracf_1further = 1;
-	    break;
-	}
-    }
-
-    /* now fracf = does any positive digit exist under the rounding position?
-       now fracf_1further = does any positive digit exist under one further than the
-       rounding position?
-       now v = the first digit under the rounding position */
-
-    /* drop digits after pointed digit */
-    memset(y->frac + ix + 1, 0, (y->Prec - (ix + 1)) * sizeof(DECDIG));
-
-    switch (f) {
-      case VP_ROUND_DOWN: /* Truncate */
-	break;
-      case VP_ROUND_UP:   /* Roundup */
-	if (fracf) ++div;
-	break;
-      case VP_ROUND_HALF_UP:
-	if (v>=5) ++div;
-	break;
-      case VP_ROUND_HALF_DOWN:
-	if (v > 5 || (v == 5 && fracf_1further)) ++div;
-	break;
-      case VP_ROUND_CEIL:
-	if (fracf && BIGDECIMAL_POSITIVE_P(y)) ++div;
-	break;
-      case VP_ROUND_FLOOR:
-	if (fracf && BIGDECIMAL_NEGATIVE_P(y)) ++div;
-	break;
-      case VP_ROUND_HALF_EVEN: /* Banker's rounding */
-	if (v > 5) ++div;
-	else if (v == 5) {
-	    if (fracf_1further) {
-		++div;
-	    }
-	    else {
-		if (ioffset == 0) {
-                    /* v is the first decimal digit of its DECDIG;
-                       need to grab the previous DECDIG if present
-                       to check for evenness of the previous decimal
-                       digit (which is same as that of the DECDIG since
-                       base 10 has a factor of 2) */
-		    if (ix && (y->frac[ix-1] % 2)) ++div;
-		}
-		else {
-		    if (div % 2) ++div;
-		}
-	    }
-	}
-	break;
-    }
-    for (i = 0; i <= n; ++i) div *= 10;
-    if (div >= BASE) {
-	if (ix) {
-	    y->frac[ix] = 0;
-	    VpRdup(y, ix);
-	}
-	else {
-	    short s = VpGetSign(y);
-	    SIGNED_VALUE e = y->exponent;
-	    VpSetOne(y);
-	    VpSetSign(y, s);
-	    y->exponent = e + 1;
-	}
-    }
-    else {
-	y->frac[ix] = div;
-	VpNmlz(y);
-    }
-    if (exptoadd > 0) {
-	y->exponent += (SIGNED_VALUE)(exptoadd / BASE_FIG);
-	exptoadd %= (ssize_t)BASE_FIG;
-	for (i = 0; i < exptoadd; i++) {
-	    y->frac[0] *= 10;
-	    if (y->frac[0] >= BASE) {
-		y->frac[0] /= BASE;
-		y->exponent++;
-	    }
-	}
-    }
-    return 1;
-}
-
-VP_EXPORT int
-VpLeftRound(Real *y, unsigned short f, ssize_t nf)
-/*
- * Round from the left hand side of the digits.
- */
-{
-    DECDIG v;
-    if (!VpHasVal(y)) return 0; /* Unable to round */
-    v = y->frac[0];
-    nf -= VpExponent(y) * (ssize_t)BASE_FIG;
-    while ((v /= 10) != 0) nf--;
-    nf += (ssize_t)BASE_FIG-1;
-    return VpMidRound(y, f, nf);
-}
-
-VP_EXPORT int
-VpActiveRound(Real *y, Real *x, unsigned short f, ssize_t nf)
-{
-    /* First,assign whole value in truncation mode */
-    if (VpAsgn(y, x, 10) <= 1) return 0; /* Zero,NaN,or Infinity */
-    return VpMidRound(y, f, nf);
-}
-
-static int
-VpLimitRound(Real *c, size_t ixDigit)
-{
-    size_t ix = VpGetPrecLimit();
-    if (!VpNmlz(c)) return -1;
-    if (!ix)        return  0;
-    if (!ixDigit) ixDigit = c->Prec-1;
-    if ((ix + BASE_FIG - 1) / BASE_FIG > ixDigit + 1) return 0;
-    return VpLeftRound(c, VpGetRoundMode(), (ssize_t)ix);
-}
-
-/* If I understand correctly, this is only ever used to round off the final decimal
-   digit of precision */
-static void
-VpInternalRound(Real *c, size_t ixDigit, DECDIG vPrev, DECDIG v)
-{
-    int f = 0;
-
-    unsigned short const rounding_mode = VpGetRoundMode();
-
-    if (VpLimitRound(c, ixDigit)) return;
-    if (!v) return;
-
-    v /= BASE1;
-    switch (rounding_mode) {
-      case VP_ROUND_DOWN:
-	break;
-      case VP_ROUND_UP:
-	if (v) f = 1;
-	break;
-      case VP_ROUND_HALF_UP:
-	if (v >= 5) f = 1;
-	break;
-      case VP_ROUND_HALF_DOWN:
-	/* this is ok - because this is the last digit of precision,
-	   the case where v == 5 and some further digits are nonzero
-	   will never occur */
-	if (v >= 6) f = 1;
-	break;
-      case VP_ROUND_CEIL:
-	if (v && BIGDECIMAL_POSITIVE_P(c)) f = 1;
-	break;
-      case VP_ROUND_FLOOR:
-	if (v && BIGDECIMAL_NEGATIVE_P(c)) f = 1;
-	break;
-      case VP_ROUND_HALF_EVEN:  /* Banker's rounding */
-	/* as per VP_ROUND_HALF_DOWN, because this is the last digit of precision,
-	   there is no case to worry about where v == 5 and some further digits are nonzero */
-	if (v > 5) f = 1;
-	else if (v == 5 && vPrev % 2) f = 1;
-	break;
-    }
-    if (f) {
-	VpRdup(c, ixDigit);
-	VpNmlz(c);
-    }
-}
-
-/*
- *  Rounds up m(plus one to final digit of m).
- */
-static int
-VpRdup(Real *m, size_t ind_m)
-{
-    DECDIG carry;
-
-    if (!ind_m) ind_m = m->Prec;
-
-    carry = 1;
-    while (carry > 0 && ind_m--) {
-	m->frac[ind_m] += carry;
-	if (m->frac[ind_m] >= BASE) m->frac[ind_m] -= BASE;
-	else                        carry = 0;
-    }
-    if (carry > 0) { /* Overflow,count exponent and set fraction part be 1  */
-	if (!AddExponent(m, 1)) return 0;
-	m->Prec = m->frac[0] = 1;
-    }
-    else {
-	VpNmlz(m);
-    }
-    return 1;
-}
-
-/*
- *  y = x - fix(x)
- */
-VP_EXPORT void
-VpFrac(Real *y, Real *x)
-{
-    size_t my, ind_y, ind_x;
-
-    if (!VpHasVal(x)) {
-	VpAsgn(y, x, 1);
-	goto Exit;
-    }
-
-    if (x->exponent > 0 && (size_t)x->exponent >= x->Prec) {
-	VpSetZero(y, VpGetSign(x));
-	goto Exit;
-    }
-    else if (x->exponent <= 0) {
-	VpAsgn(y, x, 1);
-	goto Exit;
-    }
-
-    /* satisfy: x->exponent > 0 */
-
-    y->Prec = x->Prec - (size_t)x->exponent;
-    y->Prec = Min(y->Prec, y->MaxPrec);
-    y->exponent = 0;
-    VpSetSign(y, VpGetSign(x));
-    ind_y = 0;
-    my = y->Prec;
-    ind_x = x->exponent;
-    while (ind_y < my) {
-	y->frac[ind_y] = x->frac[ind_x];
-	++ind_y;
-	++ind_x;
-    }
-    VpNmlz(y);
-
-Exit:
-#ifdef BIGDECIMAL_DEBUG
-    if (gfDebug) {
-	VPrint(stdout, "VpFrac y=%\n", y);
-	VPrint(stdout, "    x=%\n", x);
-    }
-#endif /* BIGDECIMAL_DEBUG */
-    return;
-}
-
-/*
- *   y = x ** n
- */
-VP_EXPORT int
-VpPowerByInt(Real *y, Real *x, SIGNED_VALUE n)
-{
-    size_t s, ss;
-    ssize_t sign;
-    Real *w1 = NULL;
-    Real *w2 = NULL;
-
-    if (VpIsZero(x)) {
-	if (n == 0) {
-	    VpSetOne(y);
-	    goto Exit;
-	}
-	sign = VpGetSign(x);
-	if (n < 0) {
-	    n = -n;
-	    if (sign < 0) sign = (n % 2) ? -1 : 1;
-	    VpSetInf(y, sign);
-	}
-	else {
-	    if (sign < 0) sign = (n % 2) ? -1 : 1;
-	    VpSetZero(y,sign);
-	}
-	goto Exit;
-    }
-    if (VpIsNaN(x)) {
-	VpSetNaN(y);
-	goto Exit;
-    }
-    if (VpIsInf(x)) {
-	if (n == 0) {
-	    VpSetOne(y);
-	    goto Exit;
-	}
-	if (n > 0) {
-	    VpSetInf(y, (n % 2 == 0 || VpIsPosInf(x)) ? 1 : -1);
-	    goto Exit;
-	}
-	VpSetZero(y, (n % 2 == 0 || VpIsPosInf(x)) ? 1 : -1);
-	goto Exit;
-    }
-
-    if (x->exponent == 1 && x->Prec == 1 && x->frac[0] == 1) {
-	/* abs(x) = 1 */
-	VpSetOne(y);
-	if (BIGDECIMAL_POSITIVE_P(x)) goto Exit;
-	if ((n % 2) == 0) goto Exit;
-	VpSetSign(y, -1);
-	goto Exit;
-    }
-
-    if (n > 0) sign = 1;
-    else if (n < 0) {
-	sign = -1;
-	n = -n;
-    }
-    else {
-	VpSetOne(y);
-	goto Exit;
-    }
-
-    /* Allocate working variables  */
-    /* TODO: reconsider MaxPrec of w1 and w2 */
-    w1 = NewZeroNolimit(1, (y->MaxPrec + 2) * BASE_FIG);
-    w2 = NewZeroNolimit(1, (w1->MaxPrec * 2 + 1) * BASE_FIG);
-
-    /* calculation start */
-
-    VpAsgn(y, x, 1);
-    --n;
-    while (n > 0) {
-	VpAsgn(w1, x, 1);
-	s = 1;
-	while (ss = s, (s += s) <= (size_t)n) {
-	    VpMult(w2, w1, w1);
-	    VpAsgn(w1, w2, 1);
-	}
-	n -= (SIGNED_VALUE)ss;
-	VpMult(w2, y, w1);
-	VpAsgn(y, w2, 1);
-    }
-    if (sign < 0) {
-	VpDivd(w1, w2, VpConstOne, y);
-	VpAsgn(y, w1, 1);
-    }
-
-Exit:
-#ifdef BIGDECIMAL_DEBUG
-    if (gfDebug) {
-	VPrint(stdout, "VpPowerByInt y=%\n", y);
-	VPrint(stdout, "VpPowerByInt x=%\n", x);
-	printf("  n=%"PRIdVALUE"\n", n);
-    }
-#endif /* BIGDECIMAL_DEBUG */
-    rbd_free_struct(w2);
-    rbd_free_struct(w1);
-    return 1;
-}
-
-#ifdef BIGDECIMAL_DEBUG
-int
-VpVarCheck(Real * v)
-/*
- * Checks the validity of the Real variable v.
- * [Input]
- *   v ... Real *, variable to be checked.
- * [Returns]
- *   0  ... correct v.
- *   other ... error
- */
-{
-    size_t i;
-
-    if (v->MaxPrec == 0) {
-	printf("ERROR(VpVarCheck): Illegal Max. Precision(=%"PRIuSIZE")\n",
-	       v->MaxPrec);
-	return 1;
-    }
-    if (v->Prec == 0 || v->Prec > v->MaxPrec) {
-	printf("ERROR(VpVarCheck): Illegal Precision(=%"PRIuSIZE")\n", v->Prec);
-	printf("       Max. Prec.=%"PRIuSIZE"\n", v->MaxPrec);
-	return 2;
-    }
-    for (i = 0; i < v->Prec; ++i) {
-	if (v->frac[i] >= BASE) {
-            printf("ERROR(VpVarCheck): Illegal fraction\n");
-            printf("       Frac[%"PRIuSIZE"]=%"PRIuDECDIG"\n", i, v->frac[i]);
-            printf("       Prec.   =%"PRIuSIZE"\n", v->Prec);
-            printf("       Exp. =%"PRIdVALUE"\n", v->exponent);
-            printf("       BASE =%"PRIuDECDIG"\n", BASE);
-            return 3;
-	}
-    }
-    return 0;
-}
-#endif /* BIGDECIMAL_DEBUG */
diff --git a/ext/bigdecimal/bigdecimal.gemspec b/ext/bigdecimal/bigdecimal.gemspec
deleted file mode 100644
index f9f3b456168531..00000000000000
--- a/ext/bigdecimal/bigdecimal.gemspec
+++ /dev/null
@@ -1,54 +0,0 @@
-# coding: utf-8
-
-name = File.basename(__FILE__, '.*')
-source_version = ["", "ext/#{name}/"].find do |dir|
-  begin
-    break File.foreach(File.join(__dir__, "#{dir}#{name}.c")) {|line|
-      break $1.sub("-", ".") if /^#define\s+#{name.upcase}_VERSION\s+"(.+)"/o =~ line
-    }
-  rescue Errno::ENOENT
-  end
-end or raise "can't find #{name.upcase}_VERSION"
-
-Gem::Specification.new do |s|
-  s.name          = name
-  s.version       = source_version
-  s.authors       = ["Kenta Murata", "Zachary Scott", "Shigeo Kobayashi"]
-  s.email         = ["mrkn@mrkn.jp"]
-
-  s.summary       = "Arbitrary-precision decimal floating-point number library."
-  s.description   = "This library provides arbitrary-precision decimal floating-point number class."
-  s.homepage      = "https://github.com/ruby/bigdecimal"
-  s.licenses       = ["Ruby", "BSD-2-Clause"]
-
-  s.require_paths = %w[lib]
-  s.files         = %w[
-    bigdecimal.gemspec
-    lib/bigdecimal.rb
-    lib/bigdecimal/jacobian.rb
-    lib/bigdecimal/ludcmp.rb
-    lib/bigdecimal/math.rb
-    lib/bigdecimal/newton.rb
-    lib/bigdecimal/util.rb
-    sample/linear.rb
-    sample/nlsolve.rb
-    sample/pi.rb
-  ]
-  if Gem::Platform === s.platform and s.platform =~ 'java' or RUBY_ENGINE == 'jruby'
-    s.platform      = 'java'
-  else
-    s.extensions    = %w[ext/bigdecimal/extconf.rb]
-    s.files += %w[
-      ext/bigdecimal/bigdecimal.c
-      ext/bigdecimal/bigdecimal.h
-      ext/bigdecimal/bits.h
-      ext/bigdecimal/feature.h
-      ext/bigdecimal/missing.c
-      ext/bigdecimal/missing.h
-      ext/bigdecimal/missing/dtoa.c
-      ext/bigdecimal/static_assert.h
-    ]
-  end
-
-  s.required_ruby_version = Gem::Requirement.new(">= 2.5.0")
-end
diff --git a/ext/bigdecimal/bigdecimal.h b/ext/bigdecimal/bigdecimal.h
deleted file mode 100644
index 54fed811fb6abb..00000000000000
--- a/ext/bigdecimal/bigdecimal.h
+++ /dev/null
@@ -1,313 +0,0 @@
-/*
- *
- * Ruby BigDecimal(Variable decimal precision) extension library.
- *
- * Copyright(C) 2002 by Shigeo Kobayashi(shigeo@tinyforest.gr.jp)
- *
- */
-
-#ifndef  RUBY_BIG_DECIMAL_H
-#define  RUBY_BIG_DECIMAL_H 1
-
-#define RUBY_NO_OLD_COMPATIBILITY
-#include "ruby/ruby.h"
-#include "missing.h"
-
-#ifdef HAVE_FLOAT_H
-# include <float.h>
-#endif
-
-#ifdef HAVE_INT64_T
-# define DECDIG uint32_t
-# define DECDIG_DBL uint64_t
-# define DECDIG_DBL_SIGNED int64_t
-# define SIZEOF_DECDIG 4
-# define PRI_DECDIG_PREFIX ""
-# ifdef PRI_LL_PREFIX
-#  define PRI_DECDIG_DBL_PREFIX PRI_LL_PREFIX
-# else
-#  define PRI_DECDIG_DBL_PREFIX "l"
-# endif
-#else
-# define DECDIG uint16_t
-# define DECDIG_DBL uint32_t
-# define DECDIG_DBL_SIGNED int32_t
-# define SIZEOF_DECDIG 2
-# define PRI_DECDIG_PREFIX "h"
-# define PRI_DECDIG_DBL_PREFIX ""
-#endif
-
-#define PRIdDECDIG PRI_DECDIG_PREFIX"d"
-#define PRIiDECDIG PRI_DECDIG_PREFIX"i"
-#define PRIoDECDIG PRI_DECDIG_PREFIX"o"
-#define PRIuDECDIG PRI_DECDIG_PREFIX"u"
-#define PRIxDECDIG PRI_DECDIG_PREFIX"x"
-#define PRIXDECDIG PRI_DECDIG_PREFIX"X"
-
-#define PRIdDECDIG_DBL PRI_DECDIG_DBL_PREFIX"d"
-#define PRIiDECDIG_DBL PRI_DECDIG_DBL_PREFIX"i"
-#define PRIoDECDIG_DBL PRI_DECDIG_DBL_PREFIX"o"
-#define PRIuDECDIG_DBL PRI_DECDIG_DBL_PREFIX"u"
-#define PRIxDECDIG_DBL PRI_DECDIG_DBL_PREFIX"x"
-#define PRIXDECDIG_DBL PRI_DECDIG_DBL_PREFIX"X"
-
-#if SIZEOF_DECDIG == 4
-# define BIGDECIMAL_BASE ((DECDIG)1000000000U)
-# define BIGDECIMAL_COMPONENT_FIGURES 9
-/*
- * The number of components required for a 64-bit integer.
- *
- *   INT64_MAX:   9_223372036_854775807
- *   UINT64_MAX: 18_446744073_709551615
- */
-# define BIGDECIMAL_INT64_MAX_LENGTH 3
-
-#elif SIZEOF_DECDIG == 2
-# define BIGDECIMAL_BASE ((DECDIG)10000U)
-# define BIGDECIMAL_COMPONENT_FIGURES 4
-/*
- * The number of components required for a 64-bit integer.
- *
- *   INT64_MAX:   922_3372_0368_5477_5807
- *   UINT64_MAX: 1844_6744_0737_0955_1615
- */
-# define BIGDECIMAL_INT64_MAX_LENGTH 5
-
-#else
-# error Unknown size of DECDIG
-#endif
-
-#define BIGDECIMAL_DOUBLE_FIGURES (1+DBL_DIG)
-
-#if defined(__cplusplus)
-extern "C" {
-#if 0
-} /* satisfy cc-mode */
-#endif
-#endif
-
-extern VALUE rb_cBigDecimal;
-
-/*
- *  NaN & Infinity
- */
-#define SZ_NaN  "NaN"
-#define SZ_INF  "Infinity"
-#define SZ_PINF "+Infinity"
-#define SZ_NINF "-Infinity"
-
-/*
- *   #define VP_EXPORT other than static to let VP_ routines
- *   be called from outside of this module.
- */
-#define VP_EXPORT static
-
-/* Exception mode */
-#define VP_EXCEPTION_ALL        ((unsigned short)0x00FF)
-#define VP_EXCEPTION_INFINITY   ((unsigned short)0x0001)
-#define VP_EXCEPTION_NaN        ((unsigned short)0x0002)
-#define VP_EXCEPTION_UNDERFLOW  ((unsigned short)0x0004)
-#define VP_EXCEPTION_OVERFLOW   ((unsigned short)0x0001) /* 0x0008) */
-#define VP_EXCEPTION_ZERODIVIDE ((unsigned short)0x0010)
-
-/* Following 2 exceptions can't controlled by user */
-#define VP_EXCEPTION_OP         ((unsigned short)0x0020)
-
-#define BIGDECIMAL_EXCEPTION_MODE_DEFAULT 0U
-
-/* This is used in BigDecimal#mode */
-#define VP_ROUND_MODE            ((unsigned short)0x0100)
-
-/* Rounding mode */
-#define VP_ROUND_UP         RBD_ROUND_UP
-#define VP_ROUND_DOWN       RBD_ROUND_DOWN
-#define VP_ROUND_HALF_UP    RBD_ROUND_HALF_UP
-#define VP_ROUND_HALF_DOWN  RBD_ROUND_HALF_DOWN
-#define VP_ROUND_CEIL       RBD_ROUND_CEIL
-#define VP_ROUND_FLOOR      RBD_ROUND_FLOOR
-#define VP_ROUND_HALF_EVEN  RBD_ROUND_HALF_EVEN
-
-enum rbd_rounding_mode {
-    RBD_ROUND_UP          = 1,
-    RBD_ROUND_DOWN        = 2,
-    RBD_ROUND_HALF_UP     = 3,
-    RBD_ROUND_HALF_DOWN   = 4,
-    RBD_ROUND_CEIL        = 5,
-    RBD_ROUND_FLOOR       = 6,
-    RBD_ROUND_HALF_EVEN   = 7,
-
-    RBD_ROUND_DEFAULT  = RBD_ROUND_HALF_UP,
-    RBD_ROUND_TRUNCATE = RBD_ROUND_DOWN,
-    RBD_ROUND_BANKER   = RBD_ROUND_HALF_EVEN,
-    RBD_ROUND_CEILING  = RBD_ROUND_CEIL
-};
-
-#define BIGDECIMAL_ROUNDING_MODE_DEFAULT  VP_ROUND_HALF_UP
-
-/* Sign flag */
-#define VP_SIGN_NaN                0 /* NaN                      */
-#define VP_SIGN_POSITIVE_ZERO      1 /* Positive zero            */
-#define VP_SIGN_NEGATIVE_ZERO     -1 /* Negative zero            */
-#define VP_SIGN_POSITIVE_FINITE    2 /* Positive finite number   */
-#define VP_SIGN_NEGATIVE_FINITE   -2 /* Negative finite number   */
-#define VP_SIGN_POSITIVE_INFINITE  3 /* Positive infinite number */
-#define VP_SIGN_NEGATIVE_INFINITE -3 /* Negative infinite number */
-
-/* The size of fraction part array */
-#if defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L)
-#define	FLEXIBLE_ARRAY_SIZE /* */
-#elif defined(__GNUC__) && !defined(__STRICT_ANSI__)
-#define	FLEXIBLE_ARRAY_SIZE 0
-#else
-#define	FLEXIBLE_ARRAY_SIZE 1
-#endif
-
-/*
- * VP representation
- *  r = 0.xxxxxxxxx *BASE**exponent
- */
-typedef struct {
-    VALUE  obj;     /* Back pointer(VALUE) for Ruby object.     */
-    size_t MaxPrec; /* Maximum precision size                   */
-                    /* This is the actual size of frac[]        */
-                    /*(frac[0] to frac[MaxPrec] are available). */
-    size_t Prec;    /* Current precision size.                  */
-                    /* This indicates how much the              */
-                    /* array frac[] is actually used.           */
-    SIGNED_VALUE exponent; /* Exponent part.                    */
-    short  sign;    /* Attributes of the value.                 */
-                    /*
-                     *        ==0 : NaN
-                     *          1 : Positive zero
-                     *         -1 : Negative zero
-                     *          2 : Positive number
-                     *         -2 : Negative number
-                     *          3 : Positive infinite number
-                     *         -3 : Negative infinite number
-                     */
-    short  flag;    /* Not used in vp_routines,space for user.  */
-    DECDIG frac[FLEXIBLE_ARRAY_SIZE]; /* Array of fraction part. */
-} Real;
-
-/*
- *  ------------------
- *   EXPORTables.
- *  ------------------
- */
-
-VP_EXPORT Real *VpNewRbClass(size_t mx, char const *str, VALUE klass, bool strict_p, bool raise_exception);
-
-VP_EXPORT Real *VpCreateRbObject(size_t mx, const char *str, bool raise_exception);
-
-#define VpBaseFig() BIGDECIMAL_COMPONENT_FIGURES
-#define VpDblFig() BIGDECIMAL_DOUBLE_FIGURES
-#define VpBaseVal() BIGDECIMAL_BASE
-
-/* Zero,Inf,NaN (isinf(),isnan() used to check) */
-VP_EXPORT double VpGetDoubleNaN(void);
-VP_EXPORT double VpGetDoublePosInf(void);
-VP_EXPORT double VpGetDoubleNegInf(void);
-VP_EXPORT double VpGetDoubleNegZero(void);
-
-/* These 2 functions added at v1.1.7 */
-VP_EXPORT size_t VpGetPrecLimit(void);
-VP_EXPORT size_t VpSetPrecLimit(size_t n);
-
-/* Round mode */
-VP_EXPORT int            VpIsRoundMode(unsigned short n);
-VP_EXPORT unsigned short VpGetRoundMode(void);
-VP_EXPORT unsigned short VpSetRoundMode(unsigned short n);
-
-VP_EXPORT int VpException(unsigned short f,const char *str,int always);
-#if 0  /* unused */
-VP_EXPORT int VpIsNegDoubleZero(double v);
-#endif
-VP_EXPORT size_t VpNumOfChars(Real *vp,const char *pszFmt);
-VP_EXPORT size_t VpInit(DECDIG BaseVal);
-VP_EXPORT Real *VpAlloc(size_t mx, const char *szVal, int strict_p, int exc);
-VP_EXPORT size_t VpAsgn(Real *c, Real *a, int isw);
-VP_EXPORT size_t VpAddSub(Real *c,Real *a,Real *b,int operation);
-VP_EXPORT size_t VpMult(Real *c,Real *a,Real *b);
-VP_EXPORT size_t VpDivd(Real *c,Real *r,Real *a,Real *b);
-VP_EXPORT int VpComp(Real *a,Real *b);
-VP_EXPORT ssize_t VpExponent10(Real *a);
-VP_EXPORT void VpSzMantissa(Real *a, char *buf, size_t bufsize);
-VP_EXPORT int VpToSpecialString(Real *a, char *buf, size_t bufsize, int fPlus);
-VP_EXPORT void VpToString(Real *a, char *buf, size_t bufsize, size_t fFmt, int fPlus);
-VP_EXPORT void VpToFString(Real *a, char *buf, size_t bufsize, size_t fFmt, int fPlus);
-VP_EXPORT int VpCtoV(Real *a, const char *int_chr, size_t ni, const char *frac, size_t nf, const char *exp_chr, size_t ne);
-VP_EXPORT int VpVtoD(double *d, SIGNED_VALUE *e, Real *m);
-VP_EXPORT void VpDtoV(Real *m,double d);
-#if 0  /* unused */
-VP_EXPORT void VpItoV(Real *m,S_INT ival);
-#endif
-VP_EXPORT int VpSqrt(Real *y,Real *x);
-VP_EXPORT int VpActiveRound(Real *y, Real *x, unsigned short f, ssize_t il);
-VP_EXPORT int VpMidRound(Real *y, unsigned short f, ssize_t nf);
-VP_EXPORT int VpLeftRound(Real *y, unsigned short f, ssize_t nf);
-VP_EXPORT void VpFrac(Real *y, Real *x);
-VP_EXPORT int VpPowerByInt(Real *y, Real *x, SIGNED_VALUE n);
-#define VpPower VpPowerByInt
-
-/* VP constants */
-VP_EXPORT Real *VpOne(void);
-
-/*
- *  ------------------
- *  MACRO definitions.
- *  ------------------
- */
-#define Abs(a)     (((a)>= 0)?(a):(-(a)))
-#define Max(a, b)  (((a)>(b))?(a):(b))
-#define Min(a, b)  (((a)>(b))?(b):(a))
-
-#define VpMaxPrec(a)   ((a)->MaxPrec)
-#define VpPrec(a)      ((a)->Prec)
-#define VpGetFlag(a)   ((a)->flag)
-
-/* Sign */
-
-/* VpGetSign(a) returns 1,-1 if a>0,a<0 respectively */
-#define VpGetSign(a) (((a)->sign>0)?1:(-1))
-/* Change sign of a to a>0,a<0 if s = 1,-1 respectively */
-#define VpChangeSign(a,s) {if((s)>0) (a)->sign=(short)Abs((ssize_t)(a)->sign);else (a)->sign=-(short)Abs((ssize_t)(a)->sign);}
-/* Sets sign of a to a>0,a<0 if s = 1,-1 respectively */
-#define VpSetSign(a,s)    {if((s)>0) (a)->sign=(short)VP_SIGN_POSITIVE_FINITE;else (a)->sign=(short)VP_SIGN_NEGATIVE_FINITE;}
-
-/* 1 */
-#define VpSetOne(a)       {(a)->Prec=(a)->exponent=(a)->frac[0]=1;(a)->sign=VP_SIGN_POSITIVE_FINITE;}
-
-/* ZEROs */
-#define VpIsPosZero(a)  ((a)->sign==VP_SIGN_POSITIVE_ZERO)
-#define VpIsNegZero(a)  ((a)->sign==VP_SIGN_NEGATIVE_ZERO)
-#define VpIsZero(a)     (VpIsPosZero(a) || VpIsNegZero(a))
-#define VpSetPosZero(a) ((a)->frac[0]=0,(a)->Prec=1,(a)->sign=VP_SIGN_POSITIVE_ZERO)
-#define VpSetNegZero(a) ((a)->frac[0]=0,(a)->Prec=1,(a)->sign=VP_SIGN_NEGATIVE_ZERO)
-#define VpSetZero(a,s)  (void)(((s)>0)?VpSetPosZero(a):VpSetNegZero(a))
-
-/* NaN */
-#define VpIsNaN(a)      ((a)->sign==VP_SIGN_NaN)
-#define VpSetNaN(a)     ((a)->frac[0]=0,(a)->Prec=1,(a)->sign=VP_SIGN_NaN)
-
-/* Infinity */
-#define VpIsPosInf(a)   ((a)->sign==VP_SIGN_POSITIVE_INFINITE)
-#define VpIsNegInf(a)   ((a)->sign==VP_SIGN_NEGATIVE_INFINITE)
-#define VpIsInf(a)      (VpIsPosInf(a) || VpIsNegInf(a))
-#define VpIsDef(a)      ( !(VpIsNaN(a)||VpIsInf(a)) )
-#define VpSetPosInf(a)  ((a)->frac[0]=0,(a)->Prec=1,(a)->sign=VP_SIGN_POSITIVE_INFINITE)
-#define VpSetNegInf(a)  ((a)->frac[0]=0,(a)->Prec=1,(a)->sign=VP_SIGN_NEGATIVE_INFINITE)
-#define VpSetInf(a,s)   (void)(((s)>0)?VpSetPosInf(a):VpSetNegInf(a))
-#define VpHasVal(a)     (a->frac[0])
-#define VpIsOne(a)      ((a->Prec==1)&&(a->frac[0]==1)&&(a->exponent==1))
-#define VpExponent(a)   (a->exponent)
-#ifdef BIGDECIMAL_DEBUG
-int VpVarCheck(Real * v);
-#endif /* BIGDECIMAL_DEBUG */
-
-#if defined(__cplusplus)
-#if 0
-{ /* satisfy cc-mode */
-#endif
-}  /* extern "C" { */
-#endif
-#endif /* RUBY_BIG_DECIMAL_H */
diff --git a/ext/bigdecimal/bits.h b/ext/bigdecimal/bits.h
deleted file mode 100644
index 6e1e4776e39599..00000000000000
--- a/ext/bigdecimal/bits.h
+++ /dev/null
@@ -1,141 +0,0 @@
-#ifndef BIGDECIMAL_BITS_H
-#define BIGDECIMAL_BITS_H
-
-#include "feature.h"
-#include "static_assert.h"
-
-#if defined(__x86_64__) && defined(HAVE_X86INTRIN_H)
-# include <x86intrin.h>         /* for _lzcnt_u64, etc. */
-#elif defined(_MSC_VER) && defined(HAVE_INTRIN_H)
-# include <intrin.h>            /* for the following intrinsics */
-#endif
-
-#if defined(_MSC_VER) && defined(__AVX2__)
-# pragma intrinsic(__lzcnt)
-# pragma intrinsic(__lzcnt64)
-#endif
-
-#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))
-
-#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_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
-
-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 int
-nlz_int32(uint32_t x)
-{
-#if defined(_MSC_VER) && defined(__AVX2__) && defined(HAVE___LZCNT)
-    /* Note: It seems there is no such thing 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(HAVE__LZCNT_U32)
-    return (unsigned int)_lzcnt_u32(x);
-
-#elif defined(_MSC_VER) && defined(HAVE__BITSCANREVERSE)
-    unsigned long r;
-    return _BitScanReverse(&r, x) ? (31 - (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
-    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;}
-    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_int64(uint64_t x)
-{
-#if defined(_MSC_VER) && defined(__AVX2__) && defined(HAVE___LZCNT64)
-    return (unsigned int)__lzcnt64(x);
-
-#elif defined(__x86_64__) && defined(__LZCNT__) && defined(HAVE__LZCNT_U64)
-    return (unsigned int)_lzcnt_u64(x);
-
-#elif defined(_WIN64) && defined(_MSC_VER) && defined(HAVE__BITSCANREVERSE64)
-    unsigned long r;
-    return _BitScanReverse64(&r, x) ? (63u - (unsigned int)r) : 64;
-
-#elif __has_builtin(__builtin_clzl) && __has_builtin(__builtin_clzll) && !(defined(__sun) && defined(__sparc))
-    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
-    uint64_t y;
-    unsigned int n = 64;
-    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
-}
-
-#ifdef HAVE_UINT128_T
-static inline unsigned int
-nlz_int128(uint128_t x)
-{
-    uint64_t y = (uint64_t)(x >> 64);
-
-    if (x == 0) {
-        return 128;
-    }
-    else if (y == 0) {
-        return (unsigned int)nlz_int64(x) + 64;
-    }
-    else {
-        return (unsigned int)nlz_int64(y);
-    }
-}
-#endif
-
-#endif /* BIGDECIMAL_BITS_H */
diff --git a/ext/bigdecimal/depend b/ext/bigdecimal/depend
deleted file mode 100644
index a2455ebbda6cba..00000000000000
--- a/ext/bigdecimal/depend
+++ /dev/null
@@ -1,327 +0,0 @@
-Makefile: $(BIGDECIMAL_RB)
-
-# AUTOGENERATED DEPENDENCIES START
-bigdecimal.o: $(RUBY_EXTCONF_H)
-bigdecimal.o: $(arch_hdrdir)/ruby/config.h
-bigdecimal.o: $(hdrdir)/ruby/assert.h
-bigdecimal.o: $(hdrdir)/ruby/backward/2/assume.h
-bigdecimal.o: $(hdrdir)/ruby/backward/2/attributes.h
-bigdecimal.o: $(hdrdir)/ruby/backward/2/bool.h
-bigdecimal.o: $(hdrdir)/ruby/backward/2/inttypes.h
-bigdecimal.o: $(hdrdir)/ruby/backward/2/limits.h
-bigdecimal.o: $(hdrdir)/ruby/backward/2/long_long.h
-bigdecimal.o: $(hdrdir)/ruby/backward/2/stdalign.h
-bigdecimal.o: $(hdrdir)/ruby/backward/2/stdarg.h
-bigdecimal.o: $(hdrdir)/ruby/defines.h
-bigdecimal.o: $(hdrdir)/ruby/intern.h
-bigdecimal.o: $(hdrdir)/ruby/internal/abi.h
-bigdecimal.o: $(hdrdir)/ruby/internal/anyargs.h
-bigdecimal.o: $(hdrdir)/ruby/internal/arithmetic.h
-bigdecimal.o: $(hdrdir)/ruby/internal/arithmetic/char.h
-bigdecimal.o: $(hdrdir)/ruby/internal/arithmetic/double.h
-bigdecimal.o: $(hdrdir)/ruby/internal/arithmetic/fixnum.h
-bigdecimal.o: $(hdrdir)/ruby/internal/arithmetic/gid_t.h
-bigdecimal.o: $(hdrdir)/ruby/internal/arithmetic/int.h
-bigdecimal.o: $(hdrdir)/ruby/internal/arithmetic/intptr_t.h
-bigdecimal.o: $(hdrdir)/ruby/internal/arithmetic/long.h
-bigdecimal.o: $(hdrdir)/ruby/internal/arithmetic/long_long.h
-bigdecimal.o: $(hdrdir)/ruby/internal/arithmetic/mode_t.h
-bigdecimal.o: $(hdrdir)/ruby/internal/arithmetic/off_t.h
-bigdecimal.o: $(hdrdir)/ruby/internal/arithmetic/pid_t.h
-bigdecimal.o: $(hdrdir)/ruby/internal/arithmetic/short.h
-bigdecimal.o: $(hdrdir)/ruby/internal/arithmetic/size_t.h
-bigdecimal.o: $(hdrdir)/ruby/internal/arithmetic/st_data_t.h
-bigdecimal.o: $(hdrdir)/ruby/internal/arithmetic/uid_t.h
-bigdecimal.o: $(hdrdir)/ruby/internal/assume.h
-bigdecimal.o: $(hdrdir)/ruby/internal/attr/alloc_size.h
-bigdecimal.o: $(hdrdir)/ruby/internal/attr/artificial.h
-bigdecimal.o: $(hdrdir)/ruby/internal/attr/cold.h
-bigdecimal.o: $(hdrdir)/ruby/internal/attr/const.h
-bigdecimal.o: $(hdrdir)/ruby/internal/attr/constexpr.h
-bigdecimal.o: $(hdrdir)/ruby/internal/attr/deprecated.h
-bigdecimal.o: $(hdrdir)/ruby/internal/attr/diagnose_if.h
-bigdecimal.o: $(hdrdir)/ruby/internal/attr/enum_extensibility.h
-bigdecimal.o: $(hdrdir)/ruby/internal/attr/error.h
-bigdecimal.o: $(hdrdir)/ruby/internal/attr/flag_enum.h
-bigdecimal.o: $(hdrdir)/ruby/internal/attr/forceinline.h
-bigdecimal.o: $(hdrdir)/ruby/internal/attr/format.h
-bigdecimal.o: $(hdrdir)/ruby/internal/attr/maybe_unused.h
-bigdecimal.o: $(hdrdir)/ruby/internal/attr/noalias.h
-bigdecimal.o: $(hdrdir)/ruby/internal/attr/nodiscard.h
-bigdecimal.o: $(hdrdir)/ruby/internal/attr/noexcept.h
-bigdecimal.o: $(hdrdir)/ruby/internal/attr/noinline.h
-bigdecimal.o: $(hdrdir)/ruby/internal/attr/nonnull.h
-bigdecimal.o: $(hdrdir)/ruby/internal/attr/noreturn.h
-bigdecimal.o: $(hdrdir)/ruby/internal/attr/packed_struct.h
-bigdecimal.o: $(hdrdir)/ruby/internal/attr/pure.h
-bigdecimal.o: $(hdrdir)/ruby/internal/attr/restrict.h
-bigdecimal.o: $(hdrdir)/ruby/internal/attr/returns_nonnull.h
-bigdecimal.o: $(hdrdir)/ruby/internal/attr/warning.h
-bigdecimal.o: $(hdrdir)/ruby/internal/attr/weakref.h
-bigdecimal.o: $(hdrdir)/ruby/internal/cast.h
-bigdecimal.o: $(hdrdir)/ruby/internal/compiler_is.h
-bigdecimal.o: $(hdrdir)/ruby/internal/compiler_is/apple.h
-bigdecimal.o: $(hdrdir)/ruby/internal/compiler_is/clang.h
-bigdecimal.o: $(hdrdir)/ruby/internal/compiler_is/gcc.h
-bigdecimal.o: $(hdrdir)/ruby/internal/compiler_is/intel.h
-bigdecimal.o: $(hdrdir)/ruby/internal/compiler_is/msvc.h
-bigdecimal.o: $(hdrdir)/ruby/internal/compiler_is/sunpro.h
-bigdecimal.o: $(hdrdir)/ruby/internal/compiler_since.h
-bigdecimal.o: $(hdrdir)/ruby/internal/config.h
-bigdecimal.o: $(hdrdir)/ruby/internal/constant_p.h
-bigdecimal.o: $(hdrdir)/ruby/internal/core.h
-bigdecimal.o: $(hdrdir)/ruby/internal/core/rarray.h
-bigdecimal.o: $(hdrdir)/ruby/internal/core/rbasic.h
-bigdecimal.o: $(hdrdir)/ruby/internal/core/rbignum.h
-bigdecimal.o: $(hdrdir)/ruby/internal/core/rclass.h
-bigdecimal.o: $(hdrdir)/ruby/internal/core/rdata.h
-bigdecimal.o: $(hdrdir)/ruby/internal/core/rfile.h
-bigdecimal.o: $(hdrdir)/ruby/internal/core/rhash.h
-bigdecimal.o: $(hdrdir)/ruby/internal/core/robject.h
-bigdecimal.o: $(hdrdir)/ruby/internal/core/rregexp.h
-bigdecimal.o: $(hdrdir)/ruby/internal/core/rstring.h
-bigdecimal.o: $(hdrdir)/ruby/internal/core/rstruct.h
-bigdecimal.o: $(hdrdir)/ruby/internal/core/rtypeddata.h
-bigdecimal.o: $(hdrdir)/ruby/internal/ctype.h
-bigdecimal.o: $(hdrdir)/ruby/internal/dllexport.h
-bigdecimal.o: $(hdrdir)/ruby/internal/dosish.h
-bigdecimal.o: $(hdrdir)/ruby/internal/error.h
-bigdecimal.o: $(hdrdir)/ruby/internal/eval.h
-bigdecimal.o: $(hdrdir)/ruby/internal/event.h
-bigdecimal.o: $(hdrdir)/ruby/internal/fl_type.h
-bigdecimal.o: $(hdrdir)/ruby/internal/gc.h
-bigdecimal.o: $(hdrdir)/ruby/internal/glob.h
-bigdecimal.o: $(hdrdir)/ruby/internal/globals.h
-bigdecimal.o: $(hdrdir)/ruby/internal/has/attribute.h
-bigdecimal.o: $(hdrdir)/ruby/internal/has/builtin.h
-bigdecimal.o: $(hdrdir)/ruby/internal/has/c_attribute.h
-bigdecimal.o: $(hdrdir)/ruby/internal/has/cpp_attribute.h
-bigdecimal.o: $(hdrdir)/ruby/internal/has/declspec_attribute.h
-bigdecimal.o: $(hdrdir)/ruby/internal/has/extension.h
-bigdecimal.o: $(hdrdir)/ruby/internal/has/feature.h
-bigdecimal.o: $(hdrdir)/ruby/internal/has/warning.h
-bigdecimal.o: $(hdrdir)/ruby/internal/intern/array.h
-bigdecimal.o: $(hdrdir)/ruby/internal/intern/bignum.h
-bigdecimal.o: $(hdrdir)/ruby/internal/intern/class.h
-bigdecimal.o: $(hdrdir)/ruby/internal/intern/compar.h
-bigdecimal.o: $(hdrdir)/ruby/internal/intern/complex.h
-bigdecimal.o: $(hdrdir)/ruby/internal/intern/cont.h
-bigdecimal.o: $(hdrdir)/ruby/internal/intern/dir.h
-bigdecimal.o: $(hdrdir)/ruby/internal/intern/enum.h
-bigdecimal.o: $(hdrdir)/ruby/internal/intern/enumerator.h
-bigdecimal.o: $(hdrdir)/ruby/internal/intern/error.h
-bigdecimal.o: $(hdrdir)/ruby/internal/intern/eval.h
-bigdecimal.o: $(hdrdir)/ruby/internal/intern/file.h
-bigdecimal.o: $(hdrdir)/ruby/internal/intern/hash.h
-bigdecimal.o: $(hdrdir)/ruby/internal/intern/io.h
-bigdecimal.o: $(hdrdir)/ruby/internal/intern/load.h
-bigdecimal.o: $(hdrdir)/ruby/internal/intern/marshal.h
-bigdecimal.o: $(hdrdir)/ruby/internal/intern/numeric.h
-bigdecimal.o: $(hdrdir)/ruby/internal/intern/object.h
-bigdecimal.o: $(hdrdir)/ruby/internal/intern/parse.h
-bigdecimal.o: $(hdrdir)/ruby/internal/intern/proc.h
-bigdecimal.o: $(hdrdir)/ruby/internal/intern/process.h
-bigdecimal.o: $(hdrdir)/ruby/internal/intern/random.h
-bigdecimal.o: $(hdrdir)/ruby/internal/intern/range.h
-bigdecimal.o: $(hdrdir)/ruby/internal/intern/rational.h
-bigdecimal.o: $(hdrdir)/ruby/internal/intern/re.h
-bigdecimal.o: $(hdrdir)/ruby/internal/intern/ruby.h
-bigdecimal.o: $(hdrdir)/ruby/internal/intern/select.h
-bigdecimal.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
-bigdecimal.o: $(hdrdir)/ruby/internal/intern/signal.h
-bigdecimal.o: $(hdrdir)/ruby/internal/intern/sprintf.h
-bigdecimal.o: $(hdrdir)/ruby/internal/intern/string.h
-bigdecimal.o: $(hdrdir)/ruby/internal/intern/struct.h
-bigdecimal.o: $(hdrdir)/ruby/internal/intern/thread.h
-bigdecimal.o: $(hdrdir)/ruby/internal/intern/time.h
-bigdecimal.o: $(hdrdir)/ruby/internal/intern/variable.h
-bigdecimal.o: $(hdrdir)/ruby/internal/intern/vm.h
-bigdecimal.o: $(hdrdir)/ruby/internal/interpreter.h
-bigdecimal.o: $(hdrdir)/ruby/internal/iterator.h
-bigdecimal.o: $(hdrdir)/ruby/internal/memory.h
-bigdecimal.o: $(hdrdir)/ruby/internal/method.h
-bigdecimal.o: $(hdrdir)/ruby/internal/module.h
-bigdecimal.o: $(hdrdir)/ruby/internal/newobj.h
-bigdecimal.o: $(hdrdir)/ruby/internal/scan_args.h
-bigdecimal.o: $(hdrdir)/ruby/internal/special_consts.h
-bigdecimal.o: $(hdrdir)/ruby/internal/static_assert.h
-bigdecimal.o: $(hdrdir)/ruby/internal/stdalign.h
-bigdecimal.o: $(hdrdir)/ruby/internal/stdbool.h
-bigdecimal.o: $(hdrdir)/ruby/internal/symbol.h
-bigdecimal.o: $(hdrdir)/ruby/internal/value.h
-bigdecimal.o: $(hdrdir)/ruby/internal/value_type.h
-bigdecimal.o: $(hdrdir)/ruby/internal/variable.h
-bigdecimal.o: $(hdrdir)/ruby/internal/warning_push.h
-bigdecimal.o: $(hdrdir)/ruby/internal/xmalloc.h
-bigdecimal.o: $(hdrdir)/ruby/missing.h
-bigdecimal.o: $(hdrdir)/ruby/ruby.h
-bigdecimal.o: $(hdrdir)/ruby/st.h
-bigdecimal.o: $(hdrdir)/ruby/subst.h
-bigdecimal.o: $(hdrdir)/ruby/util.h
-bigdecimal.o: bigdecimal.c
-bigdecimal.o: bigdecimal.h
-bigdecimal.o: bits.h
-bigdecimal.o: feature.h
-bigdecimal.o: missing.h
-bigdecimal.o: static_assert.h
-missing.o: $(RUBY_EXTCONF_H)
-missing.o: $(arch_hdrdir)/ruby/config.h
-missing.o: $(hdrdir)/ruby/assert.h
-missing.o: $(hdrdir)/ruby/atomic.h
-missing.o: $(hdrdir)/ruby/backward.h
-missing.o: $(hdrdir)/ruby/backward/2/assume.h
-missing.o: $(hdrdir)/ruby/backward/2/attributes.h
-missing.o: $(hdrdir)/ruby/backward/2/bool.h
-missing.o: $(hdrdir)/ruby/backward/2/inttypes.h
-missing.o: $(hdrdir)/ruby/backward/2/limits.h
-missing.o: $(hdrdir)/ruby/backward/2/long_long.h
-missing.o: $(hdrdir)/ruby/backward/2/stdalign.h
-missing.o: $(hdrdir)/ruby/backward/2/stdarg.h
-missing.o: $(hdrdir)/ruby/defines.h
-missing.o: $(hdrdir)/ruby/intern.h
-missing.o: $(hdrdir)/ruby/internal/abi.h
-missing.o: $(hdrdir)/ruby/internal/anyargs.h
-missing.o: $(hdrdir)/ruby/internal/arithmetic.h
-missing.o: $(hdrdir)/ruby/internal/arithmetic/char.h
-missing.o: $(hdrdir)/ruby/internal/arithmetic/double.h
-missing.o: $(hdrdir)/ruby/internal/arithmetic/fixnum.h
-missing.o: $(hdrdir)/ruby/internal/arithmetic/gid_t.h
-missing.o: $(hdrdir)/ruby/internal/arithmetic/int.h
-missing.o: $(hdrdir)/ruby/internal/arithmetic/intptr_t.h
-missing.o: $(hdrdir)/ruby/internal/arithmetic/long.h
-missing.o: $(hdrdir)/ruby/internal/arithmetic/long_long.h
-missing.o: $(hdrdir)/ruby/internal/arithmetic/mode_t.h
-missing.o: $(hdrdir)/ruby/internal/arithmetic/off_t.h
-missing.o: $(hdrdir)/ruby/internal/arithmetic/pid_t.h
-missing.o: $(hdrdir)/ruby/internal/arithmetic/short.h
-missing.o: $(hdrdir)/ruby/internal/arithmetic/size_t.h
-missing.o: $(hdrdir)/ruby/internal/arithmetic/st_data_t.h
-missing.o: $(hdrdir)/ruby/internal/arithmetic/uid_t.h
-missing.o: $(hdrdir)/ruby/internal/assume.h
-missing.o: $(hdrdir)/ruby/internal/attr/alloc_size.h
-missing.o: $(hdrdir)/ruby/internal/attr/artificial.h
-missing.o: $(hdrdir)/ruby/internal/attr/cold.h
-missing.o: $(hdrdir)/ruby/internal/attr/const.h
-missing.o: $(hdrdir)/ruby/internal/attr/constexpr.h
-missing.o: $(hdrdir)/ruby/internal/attr/deprecated.h
-missing.o: $(hdrdir)/ruby/internal/attr/diagnose_if.h
-missing.o: $(hdrdir)/ruby/internal/attr/enum_extensibility.h
-missing.o: $(hdrdir)/ruby/internal/attr/error.h
-missing.o: $(hdrdir)/ruby/internal/attr/flag_enum.h
-missing.o: $(hdrdir)/ruby/internal/attr/forceinline.h
-missing.o: $(hdrdir)/ruby/internal/attr/format.h
-missing.o: $(hdrdir)/ruby/internal/attr/maybe_unused.h
-missing.o: $(hdrdir)/ruby/internal/attr/noalias.h
-missing.o: $(hdrdir)/ruby/internal/attr/nodiscard.h
-missing.o: $(hdrdir)/ruby/internal/attr/noexcept.h
-missing.o: $(hdrdir)/ruby/internal/attr/noinline.h
-missing.o: $(hdrdir)/ruby/internal/attr/nonnull.h
-missing.o: $(hdrdir)/ruby/internal/attr/noreturn.h
-missing.o: $(hdrdir)/ruby/internal/attr/packed_struct.h
-missing.o: $(hdrdir)/ruby/internal/attr/pure.h
-missing.o: $(hdrdir)/ruby/internal/attr/restrict.h
-missing.o: $(hdrdir)/ruby/internal/attr/returns_nonnull.h
-missing.o: $(hdrdir)/ruby/internal/attr/warning.h
-missing.o: $(hdrdir)/ruby/internal/attr/weakref.h
-missing.o: $(hdrdir)/ruby/internal/cast.h
-missing.o: $(hdrdir)/ruby/internal/compiler_is.h
-missing.o: $(hdrdir)/ruby/internal/compiler_is/apple.h
-missing.o: $(hdrdir)/ruby/internal/compiler_is/clang.h
-missing.o: $(hdrdir)/ruby/internal/compiler_is/gcc.h
-missing.o: $(hdrdir)/ruby/internal/compiler_is/intel.h
-missing.o: $(hdrdir)/ruby/internal/compiler_is/msvc.h
-missing.o: $(hdrdir)/ruby/internal/compiler_is/sunpro.h
-missing.o: $(hdrdir)/ruby/internal/compiler_since.h
-missing.o: $(hdrdir)/ruby/internal/config.h
-missing.o: $(hdrdir)/ruby/internal/constant_p.h
-missing.o: $(hdrdir)/ruby/internal/core.h
-missing.o: $(hdrdir)/ruby/internal/core/rarray.h
-missing.o: $(hdrdir)/ruby/internal/core/rbasic.h
-missing.o: $(hdrdir)/ruby/internal/core/rbignum.h
-missing.o: $(hdrdir)/ruby/internal/core/rclass.h
-missing.o: $(hdrdir)/ruby/internal/core/rdata.h
-missing.o: $(hdrdir)/ruby/internal/core/rfile.h
-missing.o: $(hdrdir)/ruby/internal/core/rhash.h
-missing.o: $(hdrdir)/ruby/internal/core/robject.h
-missing.o: $(hdrdir)/ruby/internal/core/rregexp.h
-missing.o: $(hdrdir)/ruby/internal/core/rstring.h
-missing.o: $(hdrdir)/ruby/internal/core/rstruct.h
-missing.o: $(hdrdir)/ruby/internal/core/rtypeddata.h
-missing.o: $(hdrdir)/ruby/internal/ctype.h
-missing.o: $(hdrdir)/ruby/internal/dllexport.h
-missing.o: $(hdrdir)/ruby/internal/dosish.h
-missing.o: $(hdrdir)/ruby/internal/error.h
-missing.o: $(hdrdir)/ruby/internal/eval.h
-missing.o: $(hdrdir)/ruby/internal/event.h
-missing.o: $(hdrdir)/ruby/internal/fl_type.h
-missing.o: $(hdrdir)/ruby/internal/gc.h
-missing.o: $(hdrdir)/ruby/internal/glob.h
-missing.o: $(hdrdir)/ruby/internal/globals.h
-missing.o: $(hdrdir)/ruby/internal/has/attribute.h
-missing.o: $(hdrdir)/ruby/internal/has/builtin.h
-missing.o: $(hdrdir)/ruby/internal/has/c_attribute.h
-missing.o: $(hdrdir)/ruby/internal/has/cpp_attribute.h
-missing.o: $(hdrdir)/ruby/internal/has/declspec_attribute.h
-missing.o: $(hdrdir)/ruby/internal/has/extension.h
-missing.o: $(hdrdir)/ruby/internal/has/feature.h
-missing.o: $(hdrdir)/ruby/internal/has/warning.h
-missing.o: $(hdrdir)/ruby/internal/intern/array.h
-missing.o: $(hdrdir)/ruby/internal/intern/bignum.h
-missing.o: $(hdrdir)/ruby/internal/intern/class.h
-missing.o: $(hdrdir)/ruby/internal/intern/compar.h
-missing.o: $(hdrdir)/ruby/internal/intern/complex.h
-missing.o: $(hdrdir)/ruby/internal/intern/cont.h
-missing.o: $(hdrdir)/ruby/internal/intern/dir.h
-missing.o: $(hdrdir)/ruby/internal/intern/enum.h
-missing.o: $(hdrdir)/ruby/internal/intern/enumerator.h
-missing.o: $(hdrdir)/ruby/internal/intern/error.h
-missing.o: $(hdrdir)/ruby/internal/intern/eval.h
-missing.o: $(hdrdir)/ruby/internal/intern/file.h
-missing.o: $(hdrdir)/ruby/internal/intern/hash.h
-missing.o: $(hdrdir)/ruby/internal/intern/io.h
-missing.o: $(hdrdir)/ruby/internal/intern/load.h
-missing.o: $(hdrdir)/ruby/internal/intern/marshal.h
-missing.o: $(hdrdir)/ruby/internal/intern/numeric.h
-missing.o: $(hdrdir)/ruby/internal/intern/object.h
-missing.o: $(hdrdir)/ruby/internal/intern/parse.h
-missing.o: $(hdrdir)/ruby/internal/intern/proc.h
-missing.o: $(hdrdir)/ruby/internal/intern/process.h
-missing.o: $(hdrdir)/ruby/internal/intern/random.h
-missing.o: $(hdrdir)/ruby/internal/intern/range.h
-missing.o: $(hdrdir)/ruby/internal/intern/rational.h
-missing.o: $(hdrdir)/ruby/internal/intern/re.h
-missing.o: $(hdrdir)/ruby/internal/intern/ruby.h
-missing.o: $(hdrdir)/ruby/internal/intern/select.h
-missing.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
-missing.o: $(hdrdir)/ruby/internal/intern/signal.h
-missing.o: $(hdrdir)/ruby/internal/intern/sprintf.h
-missing.o: $(hdrdir)/ruby/internal/intern/string.h
-missing.o: $(hdrdir)/ruby/internal/intern/struct.h
-missing.o: $(hdrdir)/ruby/internal/intern/thread.h
-missing.o: $(hdrdir)/ruby/internal/intern/time.h
-missing.o: $(hdrdir)/ruby/internal/intern/variable.h
-missing.o: $(hdrdir)/ruby/internal/intern/vm.h
-missing.o: $(hdrdir)/ruby/internal/interpreter.h
-missing.o: $(hdrdir)/ruby/internal/iterator.h
-missing.o: $(hdrdir)/ruby/internal/memory.h
-missing.o: $(hdrdir)/ruby/internal/method.h
-missing.o: $(hdrdir)/ruby/internal/module.h
-missing.o: $(hdrdir)/ruby/internal/newobj.h
-missing.o: $(hdrdir)/ruby/internal/scan_args.h
-missing.o: $(hdrdir)/ruby/internal/special_consts.h
-missing.o: $(hdrdir)/ruby/internal/static_assert.h
-missing.o: $(hdrdir)/ruby/internal/stdalign.h
-missing.o: $(hdrdir)/ruby/internal/stdbool.h
-missing.o: $(hdrdir)/ruby/internal/symbol.h
-missing.o: $(hdrdir)/ruby/internal/value.h
-missing.o: $(hdrdir)/ruby/internal/value_type.h
-missing.o: $(hdrdir)/ruby/internal/variable.h
-missing.o: $(hdrdir)/ruby/internal/warning_push.h
-missing.o: $(hdrdir)/ruby/internal/xmalloc.h
-missing.o: $(hdrdir)/ruby/missing.h
-missing.o: $(hdrdir)/ruby/ruby.h
-missing.o: $(hdrdir)/ruby/st.h
-missing.o: $(hdrdir)/ruby/subst.h
-missing.o: missing.c
-missing.o: missing/dtoa.c
-# AUTOGENERATED DEPENDENCIES END
diff --git a/ext/bigdecimal/extconf.rb b/ext/bigdecimal/extconf.rb
deleted file mode 100644
index 23904ed60e3dd9..00000000000000
--- a/ext/bigdecimal/extconf.rb
+++ /dev/null
@@ -1,62 +0,0 @@
-# frozen_string_literal: false
-require 'mkmf'
-
-def have_builtin_func(name, check_expr, opt = "", &b)
-  checking_for checking_message(name.funcall_style, nil, opt) do
-    if try_compile(<<SRC, opt, &b)
-int foo;
-int main() { #{check_expr}; return 0; }
-SRC
-      $defs.push(format("-DHAVE_BUILTIN_%s", name.tr_cpp))
-      true
-    else
-      false
-    end
-  end
-end
-
-have_builtin_func("__builtin_clz", "__builtin_clz(0)")
-have_builtin_func("__builtin_clzl", "__builtin_clzl(0)")
-have_builtin_func("__builtin_clzll", "__builtin_clzll(0)")
-
-have_header("float.h")
-have_header("math.h")
-have_header("stdbool.h")
-have_header("stdlib.h")
-
-have_header("x86intrin.h")
-have_func("_lzcnt_u32", "x86intrin.h")
-have_func("_lzcnt_u64", "x86intrin.h")
-
-have_header("intrin.h")
-have_func("__lzcnt", "intrin.h")
-have_func("__lzcnt64", "intrin.h")
-have_func("_BitScanReverse", "intrin.h")
-have_func("_BitScanReverse64", "intrin.h")
-
-have_func("labs", "stdlib.h")
-have_func("llabs", "stdlib.h")
-have_func("finite", "math.h")
-have_func("isfinite", "math.h")
-
-have_header("ruby/atomic.h")
-have_header("ruby/internal/has/builtin.h")
-have_header("ruby/internal/static_assert.h")
-
-have_func("rb_rational_num", "ruby.h")
-have_func("rb_rational_den", "ruby.h")
-have_func("rb_complex_real", "ruby.h")
-have_func("rb_complex_imag", "ruby.h")
-have_func("rb_opts_exception_p", "ruby.h")
-have_func("rb_category_warn", "ruby.h")
-have_const("RB_WARN_CATEGORY_DEPRECATED", "ruby.h")
-
-if File.file?(File.expand_path('../lib/bigdecimal.rb', __FILE__))
-  bigdecimal_rb = "$(srcdir)/lib/bigdecimal.rb"
-else
-  bigdecimal_rb = "$(srcdir)/../../lib/bigdecimal.rb"
-end
-
-create_makefile('bigdecimal') {|mf|
-  mf << "BIGDECIMAL_RB = #{bigdecimal_rb}\n"
-}
diff --git a/ext/bigdecimal/feature.h b/ext/bigdecimal/feature.h
deleted file mode 100644
index f628514500fc1f..00000000000000
--- a/ext/bigdecimal/feature.h
+++ /dev/null
@@ -1,68 +0,0 @@
-#ifndef BIGDECIMAL_HAS_FEATURE_H
-#define BIGDECIMAL_HAS_FEATURE_H
-
-/* ======== __has_feature ======== */
-
-#ifndef __has_feature
-# define __has_feature(_) 0
-#endif
-
-/* ======== __has_extension ======== */
-
-#ifndef __has_extension
-# define __has_extension __has_feature
-#endif
-
-/* ======== __has_builtin ======== */
-
-#ifdef HAVE_RUBY_INTERNAL_HAS_BUILTIN_H
-# include <ruby/internal/has/builtin.h>
-#endif
-
-#ifdef RBIMPL_HAS_BUILTIN
-# define BIGDECIMAL_HAS_BUILTIN(...) RBIMPL_HAS_BUILTIN(__VA_ARGS__)
-
-#else
-# /* The following section is copied from CRuby's builtin.h */
-#
-# ifdef __has_builtin
-#  if defined(__INTEL_COMPILER)
-#  /* :TODO: Intel  C Compiler  has __has_builtin (since  19.1 maybe?),  and is
-#   * reportedly  broken.  We  have to  skip them.   However the  situation can
-#   * change.  They might improve someday.  We need to revisit here later. */
-#  elif defined(__GNUC__) && ! __has_builtin(__builtin_alloca)
-#  /* FreeBSD's   <sys/cdefs.h>   defines   its   own   *broken*   version   of
-#   * __has_builtin.   Cygwin  copied  that  content  to be  a  victim  of  the
-#   * broken-ness.  We don't take them into account. */
-#  else
-#   define HAVE___HAS_BUILTIN 1
-#  endif
-# endif
-#
-# if defined(HAVE___HAS_BUILTIN)
-#  define BIGDECIMAL_HAS_BUILTIN(_) __has_builtin(_)
-#
-# elif defined(__GNUC__)
-#  define BIGDECIMAL_HAS_BUILTIN(_) BIGDECIMAL_HAS_BUILTIN_ ## _
-#  if defined(__GNUC__) && (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 6))
-#   define BIGDECIMAL_HAS_BUILTIN___builtin_clz  1
-#   define BIGDECIMAL_HAS_BUILTIN___builtin_clzl 1
-#  else
-#   define BIGDECIMAL_HAS_BUILTIN___builtin_clz  0
-#   define BIGDECIMAL_HAS_BUILTIN___builtin_clzl 0
-#  endif
-# elif defined(_MSC_VER)
-#  define BIGDECIMAL_HAS_BUILTIN(_) 0
-#
-# else
-#  define BIGDECIMAL_HAS_BUILTIN(_) BIGDECIMAL_HAS_BUILTIN_ ## _
-#  define BIGDECIMAL_HAS_BUILTIN___builtin_clz   HAVE_BUILTIN___BUILTIN_CLZ
-#  define BIGDECIMAL_HAS_BUILTIN___builtin_clzl  HAVE_BUILTIN___BUILTIN_CLZL
-# endif
-#endif /* RBIMPL_HAS_BUILTIN */
-
-#ifndef __has_builtin
-# define __has_builtin(...) BIGDECIMAL_HAS_BUILTIN(__VA_ARGS__)
-#endif
-
-#endif /* BIGDECIMAL_HAS_FEATURE_H */
diff --git a/ext/bigdecimal/lib/bigdecimal.rb b/ext/bigdecimal/lib/bigdecimal.rb
deleted file mode 100644
index 82b3e1b7b98808..00000000000000
--- a/ext/bigdecimal/lib/bigdecimal.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-if RUBY_ENGINE == 'jruby'
-  JRuby::Util.load_ext("org.jruby.ext.bigdecimal.BigDecimalLibrary")
-else
-  require 'bigdecimal.so'
-end
diff --git a/ext/bigdecimal/lib/bigdecimal/jacobian.rb b/ext/bigdecimal/lib/bigdecimal/jacobian.rb
deleted file mode 100644
index 4448024c74285f..00000000000000
--- a/ext/bigdecimal/lib/bigdecimal/jacobian.rb
+++ /dev/null
@@ -1,90 +0,0 @@
-# frozen_string_literal: false
-
-require 'bigdecimal'
-
-# require 'bigdecimal/jacobian'
-#
-# Provides methods to compute the Jacobian matrix of a set of equations at a
-# point x. In the methods below:
-#
-# f is an Object which is used to compute the Jacobian matrix of the equations.
-# It must provide the following methods:
-#
-# f.values(x):: returns the values of all functions at x
-#
-# f.zero:: returns 0.0
-# f.one:: returns 1.0
-# f.two:: returns 2.0
-# f.ten:: returns 10.0
-#
-# f.eps:: returns the convergence criterion (epsilon value) used to determine whether two values are considered equal. If |a-b| < epsilon, the two values are considered equal.
-#
-# x is the point at which to compute the Jacobian.
-#
-# fx is f.values(x).
-#
-module Jacobian
-  module_function
-
-  # Determines the equality of two numbers by comparing to zero, or using the epsilon value
-  def isEqual(a,b,zero=0.0,e=1.0e-8)
-    aa = a.abs
-    bb = b.abs
-    if aa == zero &&  bb == zero then
-      true
-    else
-      if ((a-b)/(aa+bb)).abs < e then
-        true
-      else
-        false
-      end
-    end
-  end
-
-
-  # Computes the derivative of +f[i]+ at +x[i]+.
-  # +fx+ is the value of +f+ at +x+.
-  def dfdxi(f,fx,x,i)
-    nRetry = 0
-    n = x.size
-    xSave = x[i]
-    ok = 0
-    ratio = f.ten*f.ten*f.ten
-    dx = x[i].abs/ratio
-    dx = fx[i].abs/ratio if isEqual(dx,f.zero,f.zero,f.eps)
-    dx = f.one/f.ten     if isEqual(dx,f.zero,f.zero,f.eps)
-    until ok>0 do
-      deriv = []
-      nRetry += 1
-      if nRetry > 100
-        raise "Singular Jacobian matrix. No change at x[" + i.to_s + "]"
-      end
-      dx = dx*f.two
-      x[i] += dx
-      fxNew = f.values(x)
-      for j in 0...n do
-        if !isEqual(fxNew[j],fx[j],f.zero,f.eps) then
-          ok += 1
-          deriv <<= (fxNew[j]-fx[j])/dx
-        else
-          deriv <<= f.zero
-        end
-      end
-      x[i] = xSave
-    end
-    deriv
-  end
-
-  # Computes the Jacobian of +f+ at +x+. +fx+ is the value of +f+ at +x+.
-  def jacobian(f,fx,x)
-    n = x.size
-    dfdx = Array.new(n*n)
-    for i in 0...n do
-      df = dfdxi(f,fx,x,i)
-      for j in 0...n do
-        dfdx[j*n+i] = df[j]
-      end
-    end
-    dfdx
-  end
-end
diff --git a/ext/bigdecimal/lib/bigdecimal/ludcmp.rb b/ext/bigdecimal/lib/bigdecimal/ludcmp.rb
deleted file mode 100644
index dd265e482a3178..00000000000000
--- a/ext/bigdecimal/lib/bigdecimal/ludcmp.rb
+++ /dev/null
@@ -1,89 +0,0 @@
-# frozen_string_literal: false
-require 'bigdecimal'
-
-#
-# Solves a*x = b for x, using LU decomposition.
-#
-module LUSolve
-  module_function
-
-  # Performs LU decomposition of the n by n matrix a.
-  def ludecomp(a,n,zero=0,one=1)
-    prec = BigDecimal.limit(nil)
-    ps     = []
-    scales = []
-    for i in 0...n do  # pick up largest(abs. val.) element in each row.
-      ps <<= i
-      nrmrow  = zero
-      ixn = i*n
-      for j in 0...n do
-        biggst = a[ixn+j].abs
-        nrmrow = biggst if biggst>nrmrow
-      end
-      if nrmrow>zero then
-        scales <<= one.div(nrmrow,prec)
-      else
-        raise "Singular matrix"
-      end
-    end
-    n1          = n - 1
-    for k in 0...n1 do # Gaussian elimination with partial pivoting.
-      biggst  = zero;
-      for i in k...n do
-        size = a[ps[i]*n+k].abs*scales[ps[i]]
-        if size>biggst then
-          biggst = size
-          pividx  = i
-        end
-      end
-      raise "Singular matrix" if biggst<=zero
-      if pividx!=k then
-        j = ps[k]
-        ps[k] = ps[pividx]
-        ps[pividx] = j
-      end
-      pivot   = a[ps[k]*n+k]
-      for i in (k+1)...n do
-        psin = ps[i]*n
-        a[psin+k] = mult = a[psin+k].div(pivot,prec)
-        if mult!=zero then
-          pskn = ps[k]*n
-          for j in (k+1)...n do
-            a[psin+j] -= mult.mult(a[pskn+j],prec)
-          end
-        end
-      end
-    end
-    raise "Singular matrix" if a[ps[n1]*n+n1] == zero
-    ps
-  end
-
-  # Solves a*x = b for x, using LU decomposition.
-  #
-  # a is a matrix, b is a constant vector, x is the solution vector.
-  #
-  # ps is the pivot, a vector which indicates the permutation of rows performed
-  # during LU decomposition.
-  def lusolve(a,b,ps,zero=0.0)
-    prec = BigDecimal.limit(nil)
-    n = ps.size
-    x = []
-    for i in 0...n do
-      dot = zero
-      psin = ps[i]*n
-      for j in 0...i do
-        dot = a[psin+j].mult(x[j],prec) + dot
-      end
-      x <<= b[ps[i]] - dot
-    end
-    (n-1).downto(0) do |i|
-      dot = zero
-      psin = ps[i]*n
-      for j in (i+1)...n do
-        dot = a[psin+j].mult(x[j],prec) + dot
-      end
-      x[i]  = (x[i]-dot).div(a[psin+i],prec)
-    end
-    x
-  end
-end
diff --git a/ext/bigdecimal/lib/bigdecimal/math.rb b/ext/bigdecimal/lib/bigdecimal/math.rb
deleted file mode 100644
index 0b9d0648bb3e38..00000000000000
--- a/ext/bigdecimal/lib/bigdecimal/math.rb
+++ /dev/null
@@ -1,232 +0,0 @@
-# frozen_string_literal: false
-require 'bigdecimal'
-
-#
-#--
-# Contents:
-#   sqrt(x, prec)
-#   sin (x, prec)
-#   cos (x, prec)
-#   atan(x, prec)  Note: |x|<1, x=0.9999 may not converge.
-#   PI  (prec)
-#   E   (prec) == exp(1.0,prec)
-#
-# where:
-#   x    ... BigDecimal number to be computed.
-#            |x| must be small enough to get convergence.
-#   prec ... Number of digits to be obtained.
-#++
-#
-# Provides mathematical functions.
-#
-# Example:
-#
-#   require "bigdecimal/math"
-#
-#   include BigMath
-#
-#   a = BigDecimal((PI(100)/2).to_s)
-#   puts sin(a,100) # => 0.99999999999999999999......e0
-#
-module BigMath
-  module_function
-
-  # call-seq:
-  #   sqrt(decimal, numeric) -> BigDecimal
-  #
-  # Computes the square root of +decimal+ to the specified number of digits of
-  # precision, +numeric+.
-  #
-  #   BigMath.sqrt(BigDecimal('2'), 16).to_s
-  #   #=> "0.1414213562373095048801688724e1"
-  #
-  def sqrt(x, prec)
-    x.sqrt(prec)
-  end
-
-  # call-seq:
-  #   sin(decimal, numeric) -> BigDecimal
-  #
-  # Computes the sine of +decimal+ to the specified number of digits of
-  # precision, +numeric+.
-  #
-  # If +decimal+ is Infinity or NaN, returns NaN.
-  #
-  #   BigMath.sin(BigMath.PI(5)/4, 5).to_s
-  #   #=> "0.70710678118654752440082036563292800375e0"
-  #
-  def sin(x, prec)
-    raise ArgumentError, "Zero or negative precision for sin" if prec <= 0
-    return BigDecimal("NaN") if x.infinite? || x.nan?
-    n    = prec + BigDecimal.double_fig
-    one  = BigDecimal("1")
-    two  = BigDecimal("2")
-    x = -x if neg = x < 0
-    if x > (twopi = two * BigMath.PI(prec))
-      if x > 30
-        x %= twopi
-      else
-        x -= twopi while x > twopi
-      end
-    end
-    x1   = x
-    x2   = x.mult(x,n)
-    sign = 1
-    y    = x
-    d    = y
-    i    = one
-    z    = one
-    while d.nonzero? && ((m = n - (y.exponent - d.exponent).abs) > 0)
-      m = BigDecimal.double_fig if m < BigDecimal.double_fig
-      sign = -sign
-      x1  = x2.mult(x1,n)
-      i  += two
-      z  *= (i-one) * i
-      d   = sign * x1.div(z,m)
-      y  += d
-    end
-    neg ? -y : y
-  end
-
-  # call-seq:
-  #   cos(decimal, numeric) -> BigDecimal
-  #
-  # Computes the cosine of +decimal+ to the specified number of digits of
-  # precision, +numeric+.
-  #
-  # If +decimal+ is Infinity or NaN, returns NaN.
-  #
-  #   BigMath.cos(BigMath.PI(4), 16).to_s
-  #   #=> "-0.999999999999999999999999999999856613163740061349e0"
-  #
-  def cos(x, prec)
-    raise ArgumentError, "Zero or negative precision for cos" if prec <= 0
-    return BigDecimal("NaN") if x.infinite? || x.nan?
-    n    = prec + BigDecimal.double_fig
-    one  = BigDecimal("1")
-    two  = BigDecimal("2")
-    x = -x if x < 0
-    if x > (twopi = two * BigMath.PI(prec))
-      if x > 30
-        x %= twopi
-      else
-        x -= twopi while x > twopi
-      end
-    end
-    x1 = one
-    x2 = x.mult(x,n)
-    sign = 1
-    y = one
-    d = y
-    i = BigDecimal("0")
-    z = one
-    while d.nonzero? && ((m = n - (y.exponent - d.exponent).abs) > 0)
-      m = BigDecimal.double_fig if m < BigDecimal.double_fig
-      sign = -sign
-      x1  = x2.mult(x1,n)
-      i  += two
-      z  *= (i-one) * i
-      d   = sign * x1.div(z,m)
-      y  += d
-    end
-    y
-  end
-
-  # call-seq:
-  #   atan(decimal, numeric) -> BigDecimal
-  #
-  # Computes the arctangent of +decimal+ to the specified number of digits of
-  # precision, +numeric+.
-  #
-  # If +decimal+ is NaN, returns NaN.
-  #
-  #   BigMath.atan(BigDecimal('-1'), 16).to_s
-  #   #=> "-0.785398163397448309615660845819878471907514682065e0"
-  #
-  def atan(x, prec)
-    raise ArgumentError, "Zero or negative precision for atan" if prec <= 0
-    return BigDecimal("NaN") if x.nan?
-    pi = PI(prec)
-    x = -x if neg = x < 0
-    return pi.div(neg ? -2 : 2, prec) if x.infinite?
-    return pi / (neg ? -4 : 4) if x.round(prec) == 1
-    x = BigDecimal("1").div(x, prec) if inv = x > 1
-    x = (-1 + sqrt(1 + x**2, prec))/x if dbl = x > 0.5
-    n    = prec + BigDecimal.double_fig
-    y = x
-    d = y
-    t = x
-    r = BigDecimal("3")
-    x2 = x.mult(x,n)
-    while d.nonzero? && ((m = n - (y.exponent - d.exponent).abs) > 0)
-      m = BigDecimal.double_fig if m < BigDecimal.double_fig
-      t = -t.mult(x2,n)
-      d = t.div(r,m)
-      y += d
-      r += 2
-    end
-    y *= 2 if dbl
-    y = pi / 2 - y if inv
-    y = -y if neg
-    y
-  end
-
-  # call-seq:
-  #   PI(numeric) -> BigDecimal
-  #
-  # Computes the value of pi to the specified number of digits of precision,
-  # +numeric+.
-  #
-  #   BigMath.PI(10).to_s
-  #   #=> "0.3141592653589793238462643388813853786957412e1"
-  #
-  def PI(prec)
-    raise ArgumentError, "Zero or negative precision for PI" if prec <= 0
-    n      = prec + BigDecimal.double_fig
-    zero   = BigDecimal("0")
-    one    = BigDecimal("1")
-    two    = BigDecimal("2")
-
-    m25    = BigDecimal("-0.04")
-    m57121 = BigDecimal("-57121")
-
-    pi     = zero
-
-    d = one
-    k = one
-    t = BigDecimal("-80")
-    while d.nonzero? && ((m = n - (pi.exponent - d.exponent).abs) > 0)
-      m = BigDecimal.double_fig if m < BigDecimal.double_fig
-      t   = t*m25
-      d   = t.div(k,m)
-      k   = k+two
-      pi  = pi + d
-    end
-
-    d = one
-    k = one
-    t = BigDecimal("956")
-    while d.nonzero? && ((m = n - (pi.exponent - d.exponent).abs) > 0)
-      m = BigDecimal.double_fig if m < BigDecimal.double_fig
-      t   = t.div(m57121,n)
-      d   = t.div(k,m)
-      pi  = pi + d
-      k   = k+two
-    end
-    pi
-  end
-
-  # call-seq:
-  #   E(numeric) -> BigDecimal
-  #
-  # Computes e (the base of natural logarithms) to the specified number of
-  # digits of precision, +numeric+.
-  #
-  #   BigMath.E(10).to_s
-  #   #=> "0.271828182845904523536028752390026306410273e1"
-  #
-  def E(prec)
-    raise ArgumentError, "Zero or negative precision for E" if prec <= 0
-    BigMath.exp(1, prec)
-  end
-end
diff --git a/ext/bigdecimal/lib/bigdecimal/newton.rb b/ext/bigdecimal/lib/bigdecimal/newton.rb
deleted file mode 100644
index 85bacb7f2efbf0..00000000000000
--- a/ext/bigdecimal/lib/bigdecimal/newton.rb
+++ /dev/null
@@ -1,80 +0,0 @@
-# frozen_string_literal: false
-require "bigdecimal/ludcmp"
-require "bigdecimal/jacobian"
-
-#
-# newton.rb
-#
-# Solves the nonlinear algebraic equation system f = 0 by Newton's method.
-# This program is not dependent on BigDecimal.
-#
-# To call:
-#    n = nlsolve(f,x)
-#  where n is the number of iterations required,
-#        x is the initial value vector
-#        f is an Object which is used to compute the values of the equations to be solved.
-# It must provide the following methods:
-#
-# f.values(x):: returns the values of all functions at x
-#
-# f.zero:: returns 0.0
-# f.one:: returns 1.0
-# f.two:: returns 2.0
-# f.ten:: returns 10.0
-#
-# f.eps:: returns the convergence criterion (epsilon value) used to determine whether two values are considered equal. If |a-b| < epsilon, the two values are considered equal.
-#
-# On exit, x is the solution vector.
-#
-module Newton
-  include LUSolve
-  include Jacobian
-  module_function
-
-  def norm(fv,zero=0.0) # :nodoc:
-    s = zero
-    n = fv.size
-    for i in 0...n do
-      s += fv[i]*fv[i]
-    end
-    s
-  end
-
-  # See also Newton
-  def nlsolve(f,x)
-    nRetry = 0
-    n = x.size
-
-    f0 = f.values(x)
-    zero = f.zero
-    one  = f.one
-    two  = f.two
-    p5 = one/two
-    d  = norm(f0,zero)
-    minfact = f.ten*f.ten*f.ten
-    minfact = one/minfact
-    e = f.eps
-    while d >= e do
-      nRetry += 1
-      # Not yet converged. => Compute Jacobian matrix
-      dfdx = jacobian(f,f0,x)
-      # Solve dfdx*dx = -f0 to estimate dx
-      dx = lusolve(dfdx,f0,ludecomp(dfdx,n,zero,one),zero)
-      fact = two
-      xs = x.dup
-      begin
-        fact *= p5
-        if fact < minfact then
-          raise "Failed to reduce function values."
-        end
-        for i in 0...n do
-          x[i] = xs[i] - dx[i]*fact
-        end
-        f0 = f.values(x)
-        dn = norm(f0,zero)
-      end while(dn>=d)
-      d = dn
-    end
-    nRetry
-  end
-end
diff --git a/ext/bigdecimal/lib/bigdecimal/util.rb b/ext/bigdecimal/lib/bigdecimal/util.rb
deleted file mode 100644
index ad92f7cfe64eef..00000000000000
--- a/ext/bigdecimal/lib/bigdecimal/util.rb
+++ /dev/null
@@ -1,185 +0,0 @@
-# frozen_string_literal: false
-#
-#--
-# bigdecimal/util extends various native classes to provide the #to_d method,
-# and provides BigDecimal#to_d and BigDecimal#to_digits.
-#++
-
-require 'bigdecimal'
-
-class Integer < Numeric
-  # call-seq:
-  #     int.to_d  -> bigdecimal
-  #
-  # Returns the value of +int+ as a BigDecimal.
-  #
-  #     require 'bigdecimal'
-  #     require 'bigdecimal/util'
-  #
-  #     42.to_d   # => 0.42e2
-  #
-  # See also BigDecimal::new.
-  #
-  def to_d
-    BigDecimal(self)
-  end
-end
-
-
-class Float < Numeric
-  # call-seq:
-  #     float.to_d             -> bigdecimal
-  #     float.to_d(precision)  -> bigdecimal
-  #
-  # Returns the value of +float+ as a BigDecimal.
-  # The +precision+ parameter is used to determine the number of
-  # significant digits for the result. When +precision+ is set to +0+,
-  # the number of digits to represent the float being converted is determined
-  # automatically.
-  # The default +precision+ is +0+.
-  #
-  #     require 'bigdecimal'
-  #     require 'bigdecimal/util'
-  #
-  #     0.5.to_d         # => 0.5e0
-  #     1.234.to_d       # => 0.1234e1
-  #     1.234.to_d(2)    # => 0.12e1
-  #
-  # See also BigDecimal::new.
-  #
-  def to_d(precision=0)
-    BigDecimal(self, precision)
-  end
-end
-
-
-class String
-  # call-seq:
-  #     str.to_d  -> bigdecimal
-  #
-  # Returns the result of interpreting leading characters in +str+
-  # as a BigDecimal.
-  #
-  #     require 'bigdecimal'
-  #     require 'bigdecimal/util'
-  #
-  #     "0.5".to_d             # => 0.5e0
-  #     "123.45e1".to_d        # => 0.12345e4
-  #     "45.67 degrees".to_d   # => 0.4567e2
-  #
-  # See also BigDecimal::new.
-  #
-  def to_d
-    BigDecimal.interpret_loosely(self)
-  end
-end
-
-
-class BigDecimal < Numeric
-  # call-seq:
-  #     a.to_digits -> string
-  #
-  # Converts a BigDecimal to a String of the form "nnnnnn.mmm".
-  # This method is deprecated; use BigDecimal#to_s("F") instead.
-  #
-  #     require 'bigdecimal/util'
-  #
-  #     d = BigDecimal("3.14")
-  #     d.to_digits                  # => "3.14"
-  #
-  def to_digits
-    if self.nan? || self.infinite? || self.zero?
-      self.to_s
-    else
-      i       = self.to_i.to_s
-      _,f,_,z = self.frac.split
-      i + "." + ("0"*(-z)) + f
-    end
-  end
-
-  # call-seq:
-  #     a.to_d -> bigdecimal
-  #
-  # Returns self.
-  #
-  #     require 'bigdecimal/util'
-  #
-  #     d = BigDecimal("3.14")
-  #     d.to_d                       # => 0.314e1
-  #
-  def to_d
-    self
-  end
-end
-
-
-class Rational < Numeric
-  # call-seq:
-  #     rat.to_d(precision)  -> bigdecimal
-  #
-  # Returns the value as a BigDecimal.
-  #
-  # The required +precision+ parameter is used to determine the number of
-  # significant digits for the result.
-  #
-  #     require 'bigdecimal'
-  #     require 'bigdecimal/util'
-  #
-  #     Rational(22, 7).to_d(3)   # => 0.314e1
-  #
-  # See also BigDecimal::new.
-  #
-  def to_d(precision)
-    BigDecimal(self, precision)
-  end
-end
-
-
-class Complex < Numeric
-  # call-seq:
-  #     cmp.to_d             -> bigdecimal
-  #     cmp.to_d(precision)  -> bigdecimal
-  #
-  # Returns the value as a BigDecimal.
-  #
-  # The +precision+ parameter is required for a rational complex number.
-  # This parameter is used to determine the number of significant digits
-  # for the result.
-  #
-  #     require 'bigdecimal'
-  #     require 'bigdecimal/util'
-  #
-  #     Complex(0.1234567, 0).to_d(4)   # => 0.1235e0
-  #     Complex(Rational(22, 7), 0).to_d(3)   # => 0.314e1
-  #
-  # See also BigDecimal::new.
-  #
-  def to_d(*args)
-    BigDecimal(self) unless self.imag.zero? # to raise eerror
-
-    if args.length == 0
-      case self.real
-      when Rational
-        BigDecimal(self.real) # to raise error
-      end
-    end
-    self.real.to_d(*args)
-  end
-end
-
-
-class NilClass
-  # call-seq:
-  #     nil.to_d -> bigdecimal
-  #
-  # Returns nil represented as a BigDecimal.
-  #
-  #     require 'bigdecimal'
-  #     require 'bigdecimal/util'
-  #
-  #     nil.to_d   # => 0.0
-  #
-  def to_d
-    BigDecimal(0)
-  end
-end
diff --git a/ext/bigdecimal/missing.c b/ext/bigdecimal/missing.c
deleted file mode 100644
index 703232d92f7716..00000000000000
--- a/ext/bigdecimal/missing.c
+++ /dev/null
@@ -1,27 +0,0 @@
-#include <ruby/ruby.h>
-
-#ifdef HAVE_RUBY_ATOMIC_H
-# include <ruby/atomic.h>
-#endif
-
-#ifdef RUBY_ATOMIC_PTR_CAS
-# define ATOMIC_PTR_CAS(var, old, new) RUBY_ATOMIC_PTR_CAS(var, old, new)
-#endif
-
-#if defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6))
-/* GCC warns about unknown sanitizer, which is annoying. */
-# undef NO_SANITIZE
-# define NO_SANITIZE(x, y) \
-    _Pragma("GCC diagnostic push") \
-    _Pragma("GCC diagnostic ignored \"-Wattributes\"") \
-    __attribute__((__no_sanitize__(x))) y; \
-    _Pragma("GCC diagnostic pop")
-#endif
-
-#undef strtod
-#define strtod BigDecimal_strtod
-#undef dtoa
-#define dtoa BigDecimal_dtoa
-#undef hdtoa
-#define hdtoa BigDecimal_hdtoa
-#include "missing/dtoa.c"
diff --git a/ext/bigdecimal/missing.h b/ext/bigdecimal/missing.h
deleted file mode 100644
index 325554b5f536d3..00000000000000
--- a/ext/bigdecimal/missing.h
+++ /dev/null
@@ -1,196 +0,0 @@
-#ifndef MISSING_H
-#define MISSING_H 1
-
-#if defined(__cplusplus)
-extern "C" {
-#if 0
-} /* satisfy cc-mode */
-#endif
-#endif
-
-#ifdef HAVE_STDLIB_H
-# include <stdlib.h>
-#endif
-
-#ifdef HAVE_MATH_H
-# include <math.h>
-#endif
-
-#ifndef RB_UNUSED_VAR
-# if defined(_MSC_VER) && _MSC_VER >= 1911
-#  define RB_UNUSED_VAR(x) x [[maybe_unused]]
-
-# elif defined(__has_cpp_attribute) && __has_cpp_attribute(maybe_unused)
-#  define RB_UNUSED_VAR(x) x [[maybe_unused]]
-
-# elif defined(__has_c_attribute) && __has_c_attribute(maybe_unused)
-#  define RB_UNUSED_VAR(x) x [[maybe_unused]]
-
-# elif defined(__GNUC__)
-#  define RB_UNUSED_VAR(x) x __attribute__ ((unused))
-
-# else
-#  define RB_UNUSED_VAR(x) x
-# endif
-#endif /* RB_UNUSED_VAR */
-
-#if defined(_MSC_VER) && _MSC_VER >= 1310
-# define HAVE___ASSUME 1
-
-#elif defined(__INTEL_COMPILER) && __INTEL_COMPILER >= 1300
-# define HAVE___ASSUME 1
-#endif
-
-#ifndef UNREACHABLE
-# if __has_builtin(__builtin_unreachable)
-#  define UNREACHABLE __builtin_unreachable()
-
-# elif defined(HAVE___ASSUME)
-#  define UNREACHABLE __assume(0)
-
-# else
-#  define UNREACHABLE		/* unreachable */
-# endif
-#endif /* UNREACHABLE */
-
-/* bool */
-
-#if defined(__bool_true_false_are_defined)
-# /* Take that. */
-
-#elif defined(HAVE_STDBOOL_H)
-# include <stdbool.h>
-
-#else
-typedef unsigned char _Bool;
-# define bool _Bool
-# define true  ((_Bool)+1)
-# define false ((_Bool)-1)
-# define __bool_true_false_are_defined
-#endif
-
-/* abs */
-
-#ifndef HAVE_LABS
-static inline long
-labs(long const x)
-{
-    if (x < 0) return -x;
-    return x;
-}
-#endif
-
-#ifndef HAVE_LLABS
-static inline LONG_LONG
-llabs(LONG_LONG const x)
-{
-    if (x < 0) return -x;
-    return x;
-}
-#endif
-
-#ifdef vabs
-# undef vabs
-#endif
-#if SIZEOF_VALUE <= SIZEOF_INT
-# define vabs abs
-#elif SIZEOF_VALUE <= SIZEOF_LONG
-# define vabs labs
-#elif SIZEOF_VALUE <= SIZEOF_LONG_LONG
-# define vabs llabs
-#endif
-
-/* finite */
-
-#ifndef HAVE_FINITE
-static int
-finite(double)
-{
-    return !isnan(n) && !isinf(n);
-}
-#endif
-
-#ifndef isfinite
-# ifndef HAVE_ISFINITE
-#  define HAVE_ISFINITE 1
-#  define isfinite(x) finite(x)
-# endif
-#endif
-
-/* dtoa */
-char *BigDecimal_dtoa(double d_, int mode, int ndigits, int *decpt, int *sign, char **rve);
-
-/* rational */
-
-#ifndef HAVE_RB_RATIONAL_NUM
-static inline VALUE
-rb_rational_num(VALUE rat)
-{
-#ifdef RRATIONAL
-    return RRATIONAL(rat)->num;
-#else
-    return rb_funcall(rat, rb_intern("numerator"), 0);
-#endif
-}
-#endif
-
-#ifndef HAVE_RB_RATIONAL_DEN
-static inline VALUE
-rb_rational_den(VALUE rat)
-{
-#ifdef RRATIONAL
-    return RRATIONAL(rat)->den;
-#else
-    return rb_funcall(rat, rb_intern("denominator"), 0);
-#endif
-}
-#endif
-
-/* complex */
-
-#ifndef HAVE_RB_COMPLEX_REAL
-static inline VALUE
-rb_complex_real(VALUE cmp)
-{
-#ifdef RCOMPLEX
-  return RCOMPLEX(cmp)->real;
-#else
-  return rb_funcall(cmp, rb_intern("real"), 0);
-#endif
-}
-#endif
-
-#ifndef HAVE_RB_COMPLEX_IMAG
-static inline VALUE
-rb_complex_imag(VALUE cmp)
-{
-# ifdef RCOMPLEX
-  return RCOMPLEX(cmp)->imag;
-# else
-  return rb_funcall(cmp, rb_intern("imag"), 0);
-# endif
-}
-#endif
-
-/* st */
-
-#ifndef ST2FIX
-# undef RB_ST2FIX
-# define RB_ST2FIX(h) LONG2FIX((long)(h))
-# define ST2FIX(h) RB_ST2FIX(h)
-#endif
-
-/* warning */
-
-#if !defined(HAVE_RB_CATEGORY_WARN) || !defined(HAVE_CONST_RB_WARN_CATEGORY_DEPRECATED)
-#   define rb_category_warn(category, ...) rb_warn(__VA_ARGS__)
-#endif
-
-#if defined(__cplusplus)
-#if 0
-{ /* satisfy cc-mode */
-#endif
-}  /* extern "C" { */
-#endif
-
-#endif /* MISSING_H */
diff --git a/ext/bigdecimal/missing/dtoa.c b/ext/bigdecimal/missing/dtoa.c
deleted file mode 100644
index 41b0a221d14f4b..00000000000000
--- a/ext/bigdecimal/missing/dtoa.c
+++ /dev/null
@@ -1,3462 +0,0 @@
-/****************************************************************
- *
- * The author of this software is David M. Gay.
- *
- * Copyright (c) 1991, 2000, 2001 by Lucent Technologies.
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose without fee is hereby granted, provided that this entire notice
- * is included in all copies of any software which is or includes a copy
- * or modification of this software and in all copies of the supporting
- * documentation for such software.
- *
- * THIS SOFTWARE IS BEING PROVIDED "AS IS", WITHOUT ANY EXPRESS OR IMPLIED
- * WARRANTY.  IN PARTICULAR, NEITHER THE AUTHOR NOR LUCENT MAKES ANY
- * REPRESENTATION OR WARRANTY OF ANY KIND CONCERNING THE MERCHANTABILITY
- * OF THIS SOFTWARE OR ITS FITNESS FOR ANY PARTICULAR PURPOSE.
- *
- ***************************************************************/
-
-/* Please send bug reports to David M. Gay (dmg at acm dot org,
- * with " at " changed at "@" and " dot " changed to ".").	*/
-
-/* On a machine with IEEE extended-precision registers, it is
- * necessary to specify double-precision (53-bit) rounding precision
- * before invoking strtod or dtoa.  If the machine uses (the equivalent
- * of) Intel 80x87 arithmetic, the call
- *	_control87(PC_53, MCW_PC);
- * does this with many compilers.  Whether this or another call is
- * appropriate depends on the compiler; for this to work, it may be
- * necessary to #include "float.h" or another system-dependent header
- * file.
- */
-
-/* strtod for IEEE-, VAX-, and IBM-arithmetic machines.
- *
- * This strtod returns a nearest machine number to the input decimal
- * string (or sets errno to ERANGE).  With IEEE arithmetic, ties are
- * broken by the IEEE round-even rule.  Otherwise ties are broken by
- * biased rounding (add half and chop).
- *
- * Inspired loosely by William D. Clinger's paper "How to Read Floating
- * Point Numbers Accurately" [Proc. ACM SIGPLAN '90, pp. 92-101].
- *
- * Modifications:
- *
- *	1. We only require IEEE, IBM, or VAX double-precision
- *		arithmetic (not IEEE double-extended).
- *	2. We get by with floating-point arithmetic in a case that
- *		Clinger missed -- when we're computing d * 10^n
- *		for a small integer d and the integer n is not too
- *		much larger than 22 (the maximum integer k for which
- *		we can represent 10^k exactly), we may be able to
- *		compute (d*10^k) * 10^(e-k) with just one roundoff.
- *	3. Rather than a bit-at-a-time adjustment of the binary
- *		result in the hard case, we use floating-point
- *		arithmetic to determine the adjustment to within
- *		one bit; only in really hard cases do we need to
- *		compute a second residual.
- *	4. Because of 3., we don't need a large table of powers of 10
- *		for ten-to-e (just some small tables, e.g. of 10^k
- *		for 0 <= k <= 22).
- */
-
-/*
- * #define IEEE_LITTLE_ENDIAN for IEEE-arithmetic machines where the least
- *	significant byte has the lowest address.
- * #define IEEE_BIG_ENDIAN for IEEE-arithmetic machines where the most
- *	significant byte has the lowest address.
- * #define Long int on machines with 32-bit ints and 64-bit longs.
- * #define IBM for IBM mainframe-style floating-point arithmetic.
- * #define VAX for VAX-style floating-point arithmetic (D_floating).
- * #define No_leftright to omit left-right logic in fast floating-point
- *	computation of dtoa.
- * #define Honor_FLT_ROUNDS if FLT_ROUNDS can assume the values 2 or 3
- *	and strtod and dtoa should round accordingly.
- * #define Check_FLT_ROUNDS if FLT_ROUNDS can assume the values 2 or 3
- *	and Honor_FLT_ROUNDS is not #defined.
- * #define RND_PRODQUOT to use rnd_prod and rnd_quot (assembly routines
- *	that use extended-precision instructions to compute rounded
- *	products and quotients) with IBM.
- * #define ROUND_BIASED for IEEE-format with biased rounding.
- * #define Inaccurate_Divide for IEEE-format with correctly rounded
- *	products but inaccurate quotients, e.g., for Intel i860.
- * #define NO_LONG_LONG on machines that do not have a "long long"
- *	integer type (of >= 64 bits).  On such machines, you can
- *	#define Just_16 to store 16 bits per 32-bit Long when doing
- *	high-precision integer arithmetic.  Whether this speeds things
- *	up or slows things down depends on the machine and the number
- *	being converted.  If long long is available and the name is
- *	something other than "long long", #define Llong to be the name,
- *	and if "unsigned Llong" does not work as an unsigned version of
- *	Llong, #define #ULLong to be the corresponding unsigned type.
- * #define KR_headers for old-style C function headers.
- * #define Bad_float_h if your system lacks a float.h or if it does not
- *	define some or all of DBL_DIG, DBL_MAX_10_EXP, DBL_MAX_EXP,
- *	FLT_RADIX, FLT_ROUNDS, and DBL_MAX.
- * #define MALLOC your_malloc, where your_malloc(n) acts like malloc(n)
- *	if memory is available and otherwise does something you deem
- *	appropriate.  If MALLOC is undefined, malloc will be invoked
- *	directly -- and assumed always to succeed.
- * #define Omit_Private_Memory to omit logic (added Jan. 1998) for making
- *	memory allocations from a private pool of memory when possible.
- *	When used, the private pool is PRIVATE_MEM bytes long:  2304 bytes,
- *	unless #defined to be a different length.  This default length
- *	suffices to get rid of MALLOC calls except for unusual cases,
- *	such as decimal-to-binary conversion of a very long string of
- *	digits.  The longest string dtoa can return is about 751 bytes
- *	long.  For conversions by strtod of strings of 800 digits and
- *	all dtoa conversions in single-threaded executions with 8-byte
- *	pointers, PRIVATE_MEM >= 7400 appears to suffice; with 4-byte
- *	pointers, PRIVATE_MEM >= 7112 appears adequate.
- * #define INFNAN_CHECK on IEEE systems to cause strtod to check for
- *	Infinity and NaN (case insensitively).  On some systems (e.g.,
- *	some HP systems), it may be necessary to #define NAN_WORD0
- *	appropriately -- to the most significant word of a quiet NaN.
- *	(On HP Series 700/800 machines, -DNAN_WORD0=0x7ff40000 works.)
- *	When INFNAN_CHECK is #defined and No_Hex_NaN is not #defined,
- *	strtod also accepts (case insensitively) strings of the form
- *	NaN(x), where x is a string of hexadecimal digits and spaces;
- *	if there is only one string of hexadecimal digits, it is taken
- *	for the 52 fraction bits of the resulting NaN; if there are two
- *	or more strings of hex digits, the first is for the high 20 bits,
- *	the second and subsequent for the low 32 bits, with intervening
- *	white space ignored; but if this results in none of the 52
- *	fraction bits being on (an IEEE Infinity symbol), then NAN_WORD0
- *	and NAN_WORD1 are used instead.
- * #define MULTIPLE_THREADS if the system offers preemptively scheduled
- *	multiple threads.  In this case, you must provide (or suitably
- *	#define) two locks, acquired by ACQUIRE_DTOA_LOCK(n) and freed
- *	by FREE_DTOA_LOCK(n) for n = 0 or 1.  (The second lock, accessed
- *	in pow5mult, ensures lazy evaluation of only one copy of high
- *	powers of 5; omitting this lock would introduce a small
- *	probability of wasting memory, but would otherwise be harmless.)
- *	You must also invoke freedtoa(s) to free the value s returned by
- *	dtoa.  You may do so whether or not MULTIPLE_THREADS is #defined.
- * #define NO_IEEE_Scale to disable new (Feb. 1997) logic in strtod that
- *	avoids underflows on inputs whose result does not underflow.
- *	If you #define NO_IEEE_Scale on a machine that uses IEEE-format
- *	floating-point numbers and flushes underflows to zero rather
- *	than implementing gradual underflow, then you must also #define
- *	Sudden_Underflow.
- * #define YES_ALIAS to permit aliasing certain double values with
- *	arrays of ULongs.  This leads to slightly better code with
- *	some compilers and was always used prior to 19990916, but it
- *	is not strictly legal and can cause trouble with aggressively
- *	optimizing compilers (e.g., gcc 2.95.1 under -O2).
- * #define USE_LOCALE to use the current locale's decimal_point value.
- * #define SET_INEXACT if IEEE arithmetic is being used and extra
- *	computation should be done to set the inexact flag when the
- *	result is inexact and avoid setting inexact when the result
- *	is exact.  In this case, dtoa.c must be compiled in
- *	an environment, perhaps provided by #include "dtoa.c" in a
- *	suitable wrapper, that defines two functions,
- *		int get_inexact(void);
- *		void clear_inexact(void);
- *	such that get_inexact() returns a nonzero value if the
- *	inexact bit is already set, and clear_inexact() sets the
- *	inexact bit to 0.  When SET_INEXACT is #defined, strtod
- *	also does extra computations to set the underflow and overflow
- *	flags when appropriate (i.e., when the result is tiny and
- *	inexact or when it is a numeric value rounded to +-infinity).
- * #define NO_ERRNO if strtod should not assign errno = ERANGE when
- *	the result overflows to +-Infinity or underflows to 0.
- */
-
-#ifdef WORDS_BIGENDIAN
-#define IEEE_BIG_ENDIAN
-#else
-#define IEEE_LITTLE_ENDIAN
-#endif
-
-#ifdef __vax__
-#define VAX
-#undef IEEE_BIG_ENDIAN
-#undef IEEE_LITTLE_ENDIAN
-#endif
-
-#if defined(__arm__) && !defined(__VFP_FP__)
-#define IEEE_BIG_ENDIAN
-#undef IEEE_LITTLE_ENDIAN
-#endif
-
-#undef Long
-#undef ULong
-
-#include <limits.h>
-
-#if (INT_MAX >> 30) && !(INT_MAX >> 31)
-#define Long int
-#define ULong unsigned int
-#elif (LONG_MAX >> 30) && !(LONG_MAX >> 31)
-#define Long long int
-#define ULong unsigned long int
-#else
-#error No 32bit integer
-#endif
-
-#if HAVE_LONG_LONG
-#define Llong LONG_LONG
-#else
-#define NO_LONG_LONG
-#endif
-
-#ifdef DEBUG
-#include <stdio.h>
-#define Bug(x) {fprintf(stderr, "%s\n", (x)); exit(EXIT_FAILURE);}
-#endif
-
-#ifndef ISDIGIT
-#include <ctype.h>
-#define ISDIGIT(c) isdigit(c)
-#endif
-#include <errno.h>
-#include <stdlib.h>
-#include <string.h>
-
-#ifdef USE_LOCALE
-#include <locale.h>
-#endif
-
-#ifdef MALLOC
-extern void *MALLOC(size_t);
-#else
-#define MALLOC xmalloc
-#endif
-#ifdef FREE
-extern void FREE(void*);
-#else
-#define FREE xfree
-#endif
-#ifndef NO_SANITIZE
-#define NO_SANITIZE(x, y) y
-#endif
-
-#ifndef Omit_Private_Memory
-#ifndef PRIVATE_MEM
-#define PRIVATE_MEM 2304
-#endif
-#define PRIVATE_mem ((PRIVATE_MEM+sizeof(double)-1)/sizeof(double))
-static double private_mem[PRIVATE_mem], *pmem_next = private_mem;
-#endif
-
-#undef IEEE_Arith
-#undef Avoid_Underflow
-#ifdef IEEE_BIG_ENDIAN
-#define IEEE_Arith
-#endif
-#ifdef IEEE_LITTLE_ENDIAN
-#define IEEE_Arith
-#endif
-
-#ifdef Bad_float_h
-
-#ifdef IEEE_Arith
-#define DBL_DIG 15
-#define DBL_MAX_10_EXP 308
-#define DBL_MAX_EXP 1024
-#define FLT_RADIX 2
-#endif /*IEEE_Arith*/
-
-#ifdef IBM
-#define DBL_DIG 16
-#define DBL_MAX_10_EXP 75
-#define DBL_MAX_EXP 63
-#define FLT_RADIX 16
-#define DBL_MAX 7.2370055773322621e+75
-#endif
-
-#ifdef VAX
-#define DBL_DIG 16
-#define DBL_MAX_10_EXP 38
-#define DBL_MAX_EXP 127
-#define FLT_RADIX 2
-#define DBL_MAX 1.7014118346046923e+38
-#endif
-
-#ifndef LONG_MAX
-#define LONG_MAX 2147483647
-#endif
-
-#else /* ifndef Bad_float_h */
-#include <float.h>
-#endif /* Bad_float_h */
-
-#include <math.h>
-
-#ifdef __cplusplus
-extern "C" {
-#if 0
-} /* satisfy cc-mode */
-#endif
-#endif
-
-#ifndef hexdigit
-static const char hexdigit[] = "0123456789abcdef0123456789ABCDEF";
-#endif
-
-#if defined(IEEE_LITTLE_ENDIAN) + defined(IEEE_BIG_ENDIAN) + defined(VAX) + defined(IBM) != 1
-Exactly one of IEEE_LITTLE_ENDIAN, IEEE_BIG_ENDIAN, VAX, or IBM should be defined.
-#endif
-
-typedef union { double d; ULong L[2]; } U;
-
-#ifdef YES_ALIAS
-typedef double double_u;
-#  define dval(x) (x)
-#  ifdef IEEE_LITTLE_ENDIAN
-#    define word0(x) (((ULong *)&(x))[1])
-#    define word1(x) (((ULong *)&(x))[0])
-#  else
-#    define word0(x) (((ULong *)&(x))[0])
-#    define word1(x) (((ULong *)&(x))[1])
-#  endif
-#else
-typedef U double_u;
-#  ifdef IEEE_LITTLE_ENDIAN
-#    define word0(x) ((x).L[1])
-#    define word1(x) ((x).L[0])
-#  else
-#    define word0(x) ((x).L[0])
-#    define word1(x) ((x).L[1])
-#  endif
-#  define dval(x) ((x).d)
-#endif
-
-/* The following definition of Storeinc is appropriate for MIPS processors.
- * An alternative that might be better on some machines is
- * #define Storeinc(a,b,c) (*a++ = b << 16 | c & 0xffff)
- */
-#if defined(IEEE_LITTLE_ENDIAN) + defined(VAX) + defined(__arm__)
-#define Storeinc(a,b,c) (((unsigned short *)(a))[1] = (unsigned short)(b), \
-((unsigned short *)(a))[0] = (unsigned short)(c), (a)++)
-#else
-#define Storeinc(a,b,c) (((unsigned short *)(a))[0] = (unsigned short)(b), \
-((unsigned short *)(a))[1] = (unsigned short)(c), (a)++)
-#endif
-
-/* #define P DBL_MANT_DIG */
-/* Ten_pmax = floor(P*log(2)/log(5)) */
-/* Bletch = (highest power of 2 < DBL_MAX_10_EXP) / 16 */
-/* Quick_max = floor((P-1)*log(FLT_RADIX)/log(10) - 1) */
-/* Int_max = floor(P*log(FLT_RADIX)/log(10) - 1) */
-
-#ifdef IEEE_Arith
-#define Exp_shift  20
-#define Exp_shift1 20
-#define Exp_msk1    0x100000
-#define Exp_msk11   0x100000
-#define Exp_mask  0x7ff00000
-#define P 53
-#define Bias 1023
-#define Emin (-1022)
-#define Exp_1  0x3ff00000
-#define Exp_11 0x3ff00000
-#define Ebits 11
-#define Frac_mask  0xfffff
-#define Frac_mask1 0xfffff
-#define Ten_pmax 22
-#define Bletch 0x10
-#define Bndry_mask  0xfffff
-#define Bndry_mask1 0xfffff
-#define LSB 1
-#define Sign_bit 0x80000000
-#define Log2P 1
-#define Tiny0 0
-#define Tiny1 1
-#define Quick_max 14
-#define Int_max 14
-#ifndef NO_IEEE_Scale
-#define Avoid_Underflow
-#ifdef Flush_Denorm	/* debugging option */
-#undef Sudden_Underflow
-#endif
-#endif
-
-#ifndef Flt_Rounds
-#ifdef FLT_ROUNDS
-#define Flt_Rounds FLT_ROUNDS
-#else
-#define Flt_Rounds 1
-#endif
-#endif /*Flt_Rounds*/
-
-#ifdef Honor_FLT_ROUNDS
-#define Rounding rounding
-#undef Check_FLT_ROUNDS
-#define Check_FLT_ROUNDS
-#else
-#define Rounding Flt_Rounds
-#endif
-
-#else /* ifndef IEEE_Arith */
-#undef Check_FLT_ROUNDS
-#undef Honor_FLT_ROUNDS
-#undef SET_INEXACT
-#undef  Sudden_Underflow
-#define Sudden_Underflow
-#ifdef IBM
-#undef Flt_Rounds
-#define Flt_Rounds 0
-#define Exp_shift  24
-#define Exp_shift1 24
-#define Exp_msk1   0x1000000
-#define Exp_msk11  0x1000000
-#define Exp_mask  0x7f000000
-#define P 14
-#define Bias 65
-#define Exp_1  0x41000000
-#define Exp_11 0x41000000
-#define Ebits 8	/* exponent has 7 bits, but 8 is the right value in b2d */
-#define Frac_mask  0xffffff
-#define Frac_mask1 0xffffff
-#define Bletch 4
-#define Ten_pmax 22
-#define Bndry_mask  0xefffff
-#define Bndry_mask1 0xffffff
-#define LSB 1
-#define Sign_bit 0x80000000
-#define Log2P 4
-#define Tiny0 0x100000
-#define Tiny1 0
-#define Quick_max 14
-#define Int_max 15
-#else /* VAX */
-#undef Flt_Rounds
-#define Flt_Rounds 1
-#define Exp_shift  23
-#define Exp_shift1 7
-#define Exp_msk1    0x80
-#define Exp_msk11   0x800000
-#define Exp_mask  0x7f80
-#define P 56
-#define Bias 129
-#define Exp_1  0x40800000
-#define Exp_11 0x4080
-#define Ebits 8
-#define Frac_mask  0x7fffff
-#define Frac_mask1 0xffff007f
-#define Ten_pmax 24
-#define Bletch 2
-#define Bndry_mask  0xffff007f
-#define Bndry_mask1 0xffff007f
-#define LSB 0x10000
-#define Sign_bit 0x8000
-#define Log2P 1
-#define Tiny0 0x80
-#define Tiny1 0
-#define Quick_max 15
-#define Int_max 15
-#endif /* IBM, VAX */
-#endif /* IEEE_Arith */
-
-#ifndef IEEE_Arith
-#define ROUND_BIASED
-#endif
-
-#ifdef RND_PRODQUOT
-#define rounded_product(a,b) ((a) = rnd_prod((a), (b)))
-#define rounded_quotient(a,b) ((a) = rnd_quot((a), (b)))
-extern double rnd_prod(double, double), rnd_quot(double, double);
-#else
-#define rounded_product(a,b) ((a) *= (b))
-#define rounded_quotient(a,b) ((a) /= (b))
-#endif
-
-#define Big0 (Frac_mask1 | Exp_msk1*(DBL_MAX_EXP+Bias-1))
-#define Big1 0xffffffff
-
-#ifndef Pack_32
-#define Pack_32
-#endif
-
-#define FFFFFFFF 0xffffffffUL
-
-#ifdef NO_LONG_LONG
-#undef ULLong
-#ifdef Just_16
-#undef Pack_32
-/* When Pack_32 is not defined, we store 16 bits per 32-bit Long.
- * This makes some inner loops simpler and sometimes saves work
- * during multiplications, but it often seems to make things slightly
- * slower.  Hence the default is now to store 32 bits per Long.
- */
-#endif
-#else	/* long long available */
-#ifndef Llong
-#define Llong long long
-#endif
-#ifndef ULLong
-#define ULLong unsigned Llong
-#endif
-#endif /* NO_LONG_LONG */
-
-#define MULTIPLE_THREADS 1
-
-#ifndef MULTIPLE_THREADS
-#define ACQUIRE_DTOA_LOCK(n)	/*nothing*/
-#define FREE_DTOA_LOCK(n)	/*nothing*/
-#else
-#define ACQUIRE_DTOA_LOCK(n)	/*unused right now*/
-#define FREE_DTOA_LOCK(n)	/*unused right now*/
-#endif
-
-#ifndef ATOMIC_PTR_CAS
-#define ATOMIC_PTR_CAS(var, old, new) ((var) = (new), (old))
-#endif
-#ifndef LIKELY
-#define LIKELY(x) (x)
-#endif
-#ifndef UNLIKELY
-#define UNLIKELY(x) (x)
-#endif
-#ifndef ASSUME
-#define ASSUME(x) (void)(x)
-#endif
-
-#define Kmax 15
-
-struct Bigint {
-    struct Bigint *next;
-    int k, maxwds, sign, wds;
-    ULong x[1];
-};
-
-typedef struct Bigint Bigint;
-
-static Bigint *freelist[Kmax+1];
-
-static Bigint *
-Balloc(int k)
-{
-    int x;
-    Bigint *rv;
-#ifndef Omit_Private_Memory
-    size_t len;
-#endif
-
-    rv = 0;
-    ACQUIRE_DTOA_LOCK(0);
-    if (k <= Kmax) {
-        rv = freelist[k];
-        while (rv) {
-            Bigint *rvn = rv;
-            rv = ATOMIC_PTR_CAS(freelist[k], rv, rv->next);
-            if (LIKELY(rvn == rv)) {
-                ASSUME(rv);
-                break;
-            }
-        }
-    }
-    if (!rv) {
-        x = 1 << k;
-#ifdef Omit_Private_Memory
-        rv = (Bigint *)MALLOC(sizeof(Bigint) + (x-1)*sizeof(ULong));
-#else
-        len = (sizeof(Bigint) + (x-1)*sizeof(ULong) + sizeof(double) - 1)
-                /sizeof(double);
-        if (k <= Kmax) {
-            double *pnext = pmem_next;
-            while (pnext - private_mem + len <= PRIVATE_mem) {
-                double *p = pnext;
-                pnext = ATOMIC_PTR_CAS(pmem_next, pnext, pnext + len);
-                if (LIKELY(p == pnext)) {
-                    rv = (Bigint*)pnext;
-                    ASSUME(rv);
-                    break;
-                }
-            }
-        }
-        if (!rv)
-            rv = (Bigint*)MALLOC(len*sizeof(double));
-#endif
-        rv->k = k;
-        rv->maxwds = x;
-    }
-    FREE_DTOA_LOCK(0);
-    rv->sign = rv->wds = 0;
-    return rv;
-}
-
-static void
-Bfree(Bigint *v)
-{
-    Bigint *vn;
-    if (v) {
-        if (v->k > Kmax) {
-            FREE(v);
-            return;
-        }
-        ACQUIRE_DTOA_LOCK(0);
-        do {
-            vn = v->next = freelist[v->k];
-        } while (UNLIKELY(ATOMIC_PTR_CAS(freelist[v->k], vn, v) != vn));
-        FREE_DTOA_LOCK(0);
-    }
-}
-
-#define Bcopy(x,y) memcpy((char *)&(x)->sign, (char *)&(y)->sign, \
-(y)->wds*sizeof(Long) + 2*sizeof(int))
-
-static Bigint *
-multadd(Bigint *b, int m, int a)   /* multiply by m and add a */
-{
-    int i, wds;
-    ULong *x;
-#ifdef ULLong
-    ULLong carry, y;
-#else
-    ULong carry, y;
-#ifdef Pack_32
-    ULong xi, z;
-#endif
-#endif
-    Bigint *b1;
-
-    wds = b->wds;
-    x = b->x;
-    i = 0;
-    carry = a;
-    do {
-#ifdef ULLong
-        y = *x * (ULLong)m + carry;
-        carry = y >> 32;
-        *x++ = (ULong)(y & FFFFFFFF);
-#else
-#ifdef Pack_32
-        xi = *x;
-        y = (xi & 0xffff) * m + carry;
-        z = (xi >> 16) * m + (y >> 16);
-        carry = z >> 16;
-        *x++ = (z << 16) + (y & 0xffff);
-#else
-        y = *x * m + carry;
-        carry = y >> 16;
-        *x++ = y & 0xffff;
-#endif
-#endif
-    } while (++i < wds);
-    if (carry) {
-        if (wds >= b->maxwds) {
-            b1 = Balloc(b->k+1);
-            Bcopy(b1, b);
-            Bfree(b);
-            b = b1;
-        }
-        b->x[wds++] = (ULong)carry;
-        b->wds = wds;
-    }
-    return b;
-}
-
-static Bigint *
-s2b(const char *s, int nd0, int nd, ULong y9)
-{
-    Bigint *b;
-    int i, k;
-    Long x, y;
-
-    x = (nd + 8) / 9;
-    for (k = 0, y = 1; x > y; y <<= 1, k++) ;
-#ifdef Pack_32
-    b = Balloc(k);
-    b->x[0] = y9;
-    b->wds = 1;
-#else
-    b = Balloc(k+1);
-    b->x[0] = y9 & 0xffff;
-    b->wds = (b->x[1] = y9 >> 16) ? 2 : 1;
-#endif
-
-    i = 9;
-    if (9 < nd0) {
-        s += 9;
-        do {
-            b = multadd(b, 10, *s++ - '0');
-        } while (++i < nd0);
-        s++;
-    }
-    else
-        s += 10;
-    for (; i < nd; i++)
-        b = multadd(b, 10, *s++ - '0');
-    return b;
-}
-
-static int
-hi0bits(register ULong x)
-{
-    register int k = 0;
-
-    if (!(x & 0xffff0000)) {
-        k = 16;
-        x <<= 16;
-    }
-    if (!(x & 0xff000000)) {
-        k += 8;
-        x <<= 8;
-    }
-    if (!(x & 0xf0000000)) {
-        k += 4;
-        x <<= 4;
-    }
-    if (!(x & 0xc0000000)) {
-        k += 2;
-        x <<= 2;
-    }
-    if (!(x & 0x80000000)) {
-        k++;
-        if (!(x & 0x40000000))
-            return 32;
-    }
-    return k;
-}
-
-static int
-lo0bits(ULong *y)
-{
-    register int k;
-    register ULong x = *y;
-
-    if (x & 7) {
-        if (x & 1)
-            return 0;
-        if (x & 2) {
-            *y = x >> 1;
-            return 1;
-        }
-        *y = x >> 2;
-        return 2;
-    }
-    k = 0;
-    if (!(x & 0xffff)) {
-        k = 16;
-        x >>= 16;
-    }
-    if (!(x & 0xff)) {
-        k += 8;
-        x >>= 8;
-    }
-    if (!(x & 0xf)) {
-        k += 4;
-        x >>= 4;
-    }
-    if (!(x & 0x3)) {
-        k += 2;
-        x >>= 2;
-    }
-    if (!(x & 1)) {
-        k++;
-        x >>= 1;
-        if (!x)
-            return 32;
-    }
-    *y = x;
-    return k;
-}
-
-static Bigint *
-i2b(int i)
-{
-    Bigint *b;
-
-    b = Balloc(1);
-    b->x[0] = i;
-    b->wds = 1;
-    return b;
-}
-
-static Bigint *
-mult(Bigint *a, Bigint *b)
-{
-    Bigint *c;
-    int k, wa, wb, wc;
-    ULong *x, *xa, *xae, *xb, *xbe, *xc, *xc0;
-    ULong y;
-#ifdef ULLong
-    ULLong carry, z;
-#else
-    ULong carry, z;
-#ifdef Pack_32
-    ULong z2;
-#endif
-#endif
-
-    if (a->wds < b->wds) {
-        c = a;
-        a = b;
-        b = c;
-    }
-    k = a->k;
-    wa = a->wds;
-    wb = b->wds;
-    wc = wa + wb;
-    if (wc > a->maxwds)
-        k++;
-    c = Balloc(k);
-    for (x = c->x, xa = x + wc; x < xa; x++)
-        *x = 0;
-    xa = a->x;
-    xae = xa + wa;
-    xb = b->x;
-    xbe = xb + wb;
-    xc0 = c->x;
-#ifdef ULLong
-    for (; xb < xbe; xc0++) {
-        if ((y = *xb++) != 0) {
-            x = xa;
-            xc = xc0;
-            carry = 0;
-            do {
-                z = *x++ * (ULLong)y + *xc + carry;
-                carry = z >> 32;
-                *xc++ = (ULong)(z & FFFFFFFF);
-            } while (x < xae);
-            *xc = (ULong)carry;
-        }
-    }
-#else
-#ifdef Pack_32
-    for (; xb < xbe; xb++, xc0++) {
-        if ((y = *xb & 0xffff) != 0) {
-            x = xa;
-            xc = xc0;
-            carry = 0;
-            do {
-                z = (*x & 0xffff) * y + (*xc & 0xffff) + carry;
-                carry = z >> 16;
-                z2 = (*x++ >> 16) * y + (*xc >> 16) + carry;
-                carry = z2 >> 16;
-                Storeinc(xc, z2, z);
-            } while (x < xae);
-            *xc = (ULong)carry;
-        }
-        if ((y = *xb >> 16) != 0) {
-            x = xa;
-            xc = xc0;
-            carry = 0;
-            z2 = *xc;
-            do {
-                z = (*x & 0xffff) * y + (*xc >> 16) + carry;
-                carry = z >> 16;
-                Storeinc(xc, z, z2);
-                z2 = (*x++ >> 16) * y + (*xc & 0xffff) + carry;
-                carry = z2 >> 16;
-            } while (x < xae);
-            *xc = z2;
-        }
-    }
-#else
-    for (; xb < xbe; xc0++) {
-        if (y = *xb++) {
-            x = xa;
-            xc = xc0;
-            carry = 0;
-            do {
-                z = *x++ * y + *xc + carry;
-                carry = z >> 16;
-                *xc++ = z & 0xffff;
-            } while (x < xae);
-            *xc = (ULong)carry;
-        }
-    }
-#endif
-#endif
-    for (xc0 = c->x, xc = xc0 + wc; wc > 0 && !*--xc; --wc) ;
-    c->wds = wc;
-    return c;
-}
-
-static Bigint *p5s;
-
-static Bigint *
-pow5mult(Bigint *b, int k)
-{
-    Bigint *b1, *p5, *p51;
-    Bigint *p5tmp;
-    int i;
-    static const int p05[3] = { 5, 25, 125 };
-
-    if ((i = k & 3) != 0)
-        b = multadd(b, p05[i-1], 0);
-
-    if (!(k >>= 2))
-        return b;
-    if (!(p5 = p5s)) {
-        /* first time */
-        ACQUIRE_DTOA_LOCK(1);
-        if (!(p5 = p5s)) {
-            p5 = i2b(625);
-            p5->next = 0;
-            p5tmp = ATOMIC_PTR_CAS(p5s, NULL, p5);
-            if (UNLIKELY(p5tmp)) {
-                Bfree(p5);
-                p5 = p5tmp;
-            }
-        }
-        FREE_DTOA_LOCK(1);
-    }
-    for (;;) {
-        if (k & 1) {
-            b1 = mult(b, p5);
-            Bfree(b);
-            b = b1;
-        }
-        if (!(k >>= 1))
-            break;
-        if (!(p51 = p5->next)) {
-            ACQUIRE_DTOA_LOCK(1);
-            if (!(p51 = p5->next)) {
-                p51 = mult(p5,p5);
-                p51->next = 0;
-                p5tmp = ATOMIC_PTR_CAS(p5->next, NULL, p51);
-                if (UNLIKELY(p5tmp)) {
-                    Bfree(p51);
-                    p51 = p5tmp;
-                }
-            }
-            FREE_DTOA_LOCK(1);
-        }
-        p5 = p51;
-    }
-    return b;
-}
-
-static Bigint *
-lshift(Bigint *b, int k)
-{
-    int i, k1, n, n1;
-    Bigint *b1;
-    ULong *x, *x1, *xe, z;
-
-#ifdef Pack_32
-    n = k >> 5;
-#else
-    n = k >> 4;
-#endif
-    k1 = b->k;
-    n1 = n + b->wds + 1;
-    for (i = b->maxwds; n1 > i; i <<= 1)
-        k1++;
-    b1 = Balloc(k1);
-    x1 = b1->x;
-    for (i = 0; i < n; i++)
-        *x1++ = 0;
-    x = b->x;
-    xe = x + b->wds;
-#ifdef Pack_32
-    if (k &= 0x1f) {
-        k1 = 32 - k;
-        z = 0;
-        do {
-            *x1++ = *x << k | z;
-            z = *x++ >> k1;
-        } while (x < xe);
-        if ((*x1 = z) != 0)
-            ++n1;
-    }
-#else
-    if (k &= 0xf) {
-        k1 = 16 - k;
-        z = 0;
-        do {
-            *x1++ = *x << k  & 0xffff | z;
-            z = *x++ >> k1;
-        } while (x < xe);
-        if (*x1 = z)
-            ++n1;
-    }
-#endif
-    else
-        do {
-            *x1++ = *x++;
-        } while (x < xe);
-    b1->wds = n1 - 1;
-    Bfree(b);
-    return b1;
-}
-
-static int
-cmp(Bigint *a, Bigint *b)
-{
-    ULong *xa, *xa0, *xb, *xb0;
-    int i, j;
-
-    i = a->wds;
-    j = b->wds;
-#ifdef DEBUG
-    if (i > 1 && !a->x[i-1])
-        Bug("cmp called with a->x[a->wds-1] == 0");
-    if (j > 1 && !b->x[j-1])
-        Bug("cmp called with b->x[b->wds-1] == 0");
-#endif
-    if (i -= j)
-        return i;
-    xa0 = a->x;
-    xa = xa0 + j;
-    xb0 = b->x;
-    xb = xb0 + j;
-    for (;;) {
-        if (*--xa != *--xb)
-            return *xa < *xb ? -1 : 1;
-        if (xa <= xa0)
-            break;
-    }
-    return 0;
-}
-
-NO_SANITIZE("unsigned-integer-overflow", static Bigint * diff(Bigint *a, Bigint *b));
-static Bigint *
-diff(Bigint *a, Bigint *b)
-{
-    Bigint *c;
-    int i, wa, wb;
-    ULong *xa, *xae, *xb, *xbe, *xc;
-#ifdef ULLong
-    ULLong borrow, y;
-#else
-    ULong borrow, y;
-#ifdef Pack_32
-    ULong z;
-#endif
-#endif
-
-    i = cmp(a,b);
-    if (!i) {
-        c = Balloc(0);
-        c->wds = 1;
-        c->x[0] = 0;
-        return c;
-    }
-    if (i < 0) {
-        c = a;
-        a = b;
-        b = c;
-        i = 1;
-    }
-    else
-        i = 0;
-    c = Balloc(a->k);
-    c->sign = i;
-    wa = a->wds;
-    xa = a->x;
-    xae = xa + wa;
-    wb = b->wds;
-    xb = b->x;
-    xbe = xb + wb;
-    xc = c->x;
-    borrow = 0;
-#ifdef ULLong
-    do {
-        y = (ULLong)*xa++ - *xb++ - borrow;
-        borrow = y >> 32 & (ULong)1;
-        *xc++ = (ULong)(y & FFFFFFFF);
-    } while (xb < xbe);
-    while (xa < xae) {
-        y = *xa++ - borrow;
-        borrow = y >> 32 & (ULong)1;
-        *xc++ = (ULong)(y & FFFFFFFF);
-    }
-#else
-#ifdef Pack_32
-    do {
-        y = (*xa & 0xffff) - (*xb & 0xffff) - borrow;
-        borrow = (y & 0x10000) >> 16;
-        z = (*xa++ >> 16) - (*xb++ >> 16) - borrow;
-        borrow = (z & 0x10000) >> 16;
-        Storeinc(xc, z, y);
-    } while (xb < xbe);
-    while (xa < xae) {
-        y = (*xa & 0xffff) - borrow;
-        borrow = (y & 0x10000) >> 16;
-        z = (*xa++ >> 16) - borrow;
-        borrow = (z & 0x10000) >> 16;
-        Storeinc(xc, z, y);
-    }
-#else
-    do {
-        y = *xa++ - *xb++ - borrow;
-        borrow = (y & 0x10000) >> 16;
-        *xc++ = y & 0xffff;
-    } while (xb < xbe);
-    while (xa < xae) {
-        y = *xa++ - borrow;
-        borrow = (y & 0x10000) >> 16;
-        *xc++ = y & 0xffff;
-    }
-#endif
-#endif
-    while (!*--xc)
-        wa--;
-    c->wds = wa;
-    return c;
-}
-
-static double
-ulp(double x_)
-{
-    register Long L;
-    double_u x, a;
-    dval(x) = x_;
-
-    L = (word0(x) & Exp_mask) - (P-1)*Exp_msk1;
-#ifndef Avoid_Underflow
-#ifndef Sudden_Underflow
-    if (L > 0) {
-#endif
-#endif
-#ifdef IBM
-        L |= Exp_msk1 >> 4;
-#endif
-        word0(a) = L;
-        word1(a) = 0;
-#ifndef Avoid_Underflow
-#ifndef Sudden_Underflow
-    }
-    else {
-        L = -L >> Exp_shift;
-        if (L < Exp_shift) {
-            word0(a) = 0x80000 >> L;
-            word1(a) = 0;
-        }
-        else {
-            word0(a) = 0;
-            L -= Exp_shift;
-            word1(a) = L >= 31 ? 1 : 1 << 31 - L;
-        }
-    }
-#endif
-#endif
-    return dval(a);
-}
-
-static double
-b2d(Bigint *a, int *e)
-{
-    ULong *xa, *xa0, w, y, z;
-    int k;
-    double_u d;
-#ifdef VAX
-    ULong d0, d1;
-#else
-#define d0 word0(d)
-#define d1 word1(d)
-#endif
-
-    xa0 = a->x;
-    xa = xa0 + a->wds;
-    y = *--xa;
-#ifdef DEBUG
-    if (!y) Bug("zero y in b2d");
-#endif
-    k = hi0bits(y);
-    *e = 32 - k;
-#ifdef Pack_32
-    if (k < Ebits) {
-        d0 = Exp_1 | y >> (Ebits - k);
-        w = xa > xa0 ? *--xa : 0;
-        d1 = y << ((32-Ebits) + k) | w >> (Ebits - k);
-        goto ret_d;
-    }
-    z = xa > xa0 ? *--xa : 0;
-    if (k -= Ebits) {
-        d0 = Exp_1 | y << k | z >> (32 - k);
-        y = xa > xa0 ? *--xa : 0;
-        d1 = z << k | y >> (32 - k);
-    }
-    else {
-        d0 = Exp_1 | y;
-        d1 = z;
-    }
-#else
-    if (k < Ebits + 16) {
-        z = xa > xa0 ? *--xa : 0;
-        d0 = Exp_1 | y << k - Ebits | z >> Ebits + 16 - k;
-        w = xa > xa0 ? *--xa : 0;
-        y = xa > xa0 ? *--xa : 0;
-        d1 = z << k + 16 - Ebits | w << k - Ebits | y >> 16 + Ebits - k;
-        goto ret_d;
-    }
-    z = xa > xa0 ? *--xa : 0;
-    w = xa > xa0 ? *--xa : 0;
-    k -= Ebits + 16;
-    d0 = Exp_1 | y << k + 16 | z << k | w >> 16 - k;
-    y = xa > xa0 ? *--xa : 0;
-    d1 = w << k + 16 | y << k;
-#endif
-ret_d:
-#ifdef VAX
-    word0(d) = d0 >> 16 | d0 << 16;
-    word1(d) = d1 >> 16 | d1 << 16;
-#else
-#undef d0
-#undef d1
-#endif
-    return dval(d);
-}
-
-static Bigint *
-d2b(double d_, int *e, int *bits)
-{
-    double_u d;
-    Bigint *b;
-    int de, k;
-    ULong *x, y, z;
-#ifndef Sudden_Underflow
-    int i;
-#endif
-#ifdef VAX
-    ULong d0, d1;
-#endif
-    dval(d) = d_;
-#ifdef VAX
-    d0 = word0(d) >> 16 | word0(d) << 16;
-    d1 = word1(d) >> 16 | word1(d) << 16;
-#else
-#define d0 word0(d)
-#define d1 word1(d)
-#endif
-
-#ifdef Pack_32
-    b = Balloc(1);
-#else
-    b = Balloc(2);
-#endif
-    x = b->x;
-
-    z = d0 & Frac_mask;
-    d0 &= 0x7fffffff;   /* clear sign bit, which we ignore */
-#ifdef Sudden_Underflow
-    de = (int)(d0 >> Exp_shift);
-#ifndef IBM
-    z |= Exp_msk11;
-#endif
-#else
-    if ((de = (int)(d0 >> Exp_shift)) != 0)
-        z |= Exp_msk1;
-#endif
-#ifdef Pack_32
-    if ((y = d1) != 0) {
-        if ((k = lo0bits(&y)) != 0) {
-            x[0] = y | z << (32 - k);
-            z >>= k;
-        }
-        else
-            x[0] = y;
-#ifndef Sudden_Underflow
-        i =
-#endif
-        b->wds = (x[1] = z) ? 2 : 1;
-    }
-    else {
-#ifdef DEBUG
-        if (!z)
-            Bug("Zero passed to d2b");
-#endif
-        k = lo0bits(&z);
-        x[0] = z;
-#ifndef Sudden_Underflow
-        i =
-#endif
-        b->wds = 1;
-        k += 32;
-    }
-#else
-    if (y = d1) {
-        if (k = lo0bits(&y))
-            if (k >= 16) {
-                x[0] = y | z << 32 - k & 0xffff;
-                x[1] = z >> k - 16 & 0xffff;
-                x[2] = z >> k;
-                i = 2;
-            }
-            else {
-                x[0] = y & 0xffff;
-                x[1] = y >> 16 | z << 16 - k & 0xffff;
-                x[2] = z >> k & 0xffff;
-                x[3] = z >> k+16;
-                i = 3;
-            }
-        else {
-            x[0] = y & 0xffff;
-            x[1] = y >> 16;
-            x[2] = z & 0xffff;
-            x[3] = z >> 16;
-            i = 3;
-        }
-    }
-    else {
-#ifdef DEBUG
-        if (!z)
-            Bug("Zero passed to d2b");
-#endif
-        k = lo0bits(&z);
-        if (k >= 16) {
-            x[0] = z;
-            i = 0;
-        }
-        else {
-            x[0] = z & 0xffff;
-            x[1] = z >> 16;
-            i = 1;
-        }
-        k += 32;
-    }
-    while (!x[i])
-        --i;
-    b->wds = i + 1;
-#endif
-#ifndef Sudden_Underflow
-    if (de) {
-#endif
-#ifdef IBM
-        *e = (de - Bias - (P-1) << 2) + k;
-        *bits = 4*P + 8 - k - hi0bits(word0(d) & Frac_mask);
-#else
-        *e = de - Bias - (P-1) + k;
-        *bits = P - k;
-#endif
-#ifndef Sudden_Underflow
-    }
-    else {
-        *e = de - Bias - (P-1) + 1 + k;
-#ifdef Pack_32
-        *bits = 32*i - hi0bits(x[i-1]);
-#else
-        *bits = (i+2)*16 - hi0bits(x[i]);
-#endif
-    }
-#endif
-    return b;
-}
-#undef d0
-#undef d1
-
-static double
-ratio(Bigint *a, Bigint *b)
-{
-    double_u da, db;
-    int k, ka, kb;
-
-    dval(da) = b2d(a, &ka);
-    dval(db) = b2d(b, &kb);
-#ifdef Pack_32
-    k = ka - kb + 32*(a->wds - b->wds);
-#else
-    k = ka - kb + 16*(a->wds - b->wds);
-#endif
-#ifdef IBM
-    if (k > 0) {
-        word0(da) += (k >> 2)*Exp_msk1;
-        if (k &= 3)
-            dval(da) *= 1 << k;
-    }
-    else {
-        k = -k;
-        word0(db) += (k >> 2)*Exp_msk1;
-        if (k &= 3)
-            dval(db) *= 1 << k;
-    }
-#else
-    if (k > 0)
-        word0(da) += k*Exp_msk1;
-    else {
-        k = -k;
-        word0(db) += k*Exp_msk1;
-    }
-#endif
-    return dval(da) / dval(db);
-}
-
-static const double
-tens[] = {
-    1e0, 1e1, 1e2, 1e3, 1e4, 1e5, 1e6, 1e7, 1e8, 1e9,
-    1e10, 1e11, 1e12, 1e13, 1e14, 1e15, 1e16, 1e17, 1e18, 1e19,
-    1e20, 1e21, 1e22
-#ifdef VAX
-    , 1e23, 1e24
-#endif
-};
-
-static const double
-#ifdef IEEE_Arith
-bigtens[] = { 1e16, 1e32, 1e64, 1e128, 1e256 };
-static const double tinytens[] = { 1e-16, 1e-32, 1e-64, 1e-128,
-#ifdef Avoid_Underflow
-    9007199254740992.*9007199254740992.e-256
-    /* = 2^106 * 1e-53 */
-#else
-    1e-256
-#endif
-};
-/* The factor of 2^53 in tinytens[4] helps us avoid setting the underflow */
-/* flag unnecessarily.  It leads to a song and dance at the end of strtod. */
-#define Scale_Bit 0x10
-#define n_bigtens 5
-#else
-#ifdef IBM
-bigtens[] = { 1e16, 1e32, 1e64 };
-static const double tinytens[] = { 1e-16, 1e-32, 1e-64 };
-#define n_bigtens 3
-#else
-bigtens[] = { 1e16, 1e32 };
-static const double tinytens[] = { 1e-16, 1e-32 };
-#define n_bigtens 2
-#endif
-#endif
-
-#ifndef IEEE_Arith
-#undef INFNAN_CHECK
-#endif
-
-#ifdef INFNAN_CHECK
-
-#ifndef NAN_WORD0
-#define NAN_WORD0 0x7ff80000
-#endif
-
-#ifndef NAN_WORD1
-#define NAN_WORD1 0
-#endif
-
-static int
-match(const char **sp, char *t)
-{
-    int c, d;
-    const char *s = *sp;
-
-    while (d = *t++) {
-        if ((c = *++s) >= 'A' && c <= 'Z')
-            c += 'a' - 'A';
-        if (c != d)
-            return 0;
-    }
-    *sp = s + 1;
-    return 1;
-}
-
-#ifndef No_Hex_NaN
-static void
-hexnan(double *rvp, const char **sp)
-{
-    ULong c, x[2];
-    const char *s;
-    int havedig, udx0, xshift;
-
-    x[0] = x[1] = 0;
-    havedig = xshift = 0;
-    udx0 = 1;
-    s = *sp;
-    while (c = *(const unsigned char*)++s) {
-        if (c >= '0' && c <= '9')
-            c -= '0';
-        else if (c >= 'a' && c <= 'f')
-            c += 10 - 'a';
-        else if (c >= 'A' && c <= 'F')
-            c += 10 - 'A';
-        else if (c <= ' ') {
-            if (udx0 && havedig) {
-                udx0 = 0;
-                xshift = 1;
-            }
-            continue;
-        }
-        else if (/*(*/ c == ')' && havedig) {
-            *sp = s + 1;
-            break;
-        }
-        else
-            return; /* invalid form: don't change *sp */
-        havedig = 1;
-        if (xshift) {
-            xshift = 0;
-            x[0] = x[1];
-            x[1] = 0;
-        }
-        if (udx0)
-            x[0] = (x[0] << 4) | (x[1] >> 28);
-        x[1] = (x[1] << 4) | c;
-    }
-    if ((x[0] &= 0xfffff) || x[1]) {
-        word0(*rvp) = Exp_mask | x[0];
-        word1(*rvp) = x[1];
-    }
-}
-#endif /*No_Hex_NaN*/
-#endif /* INFNAN_CHECK */
-
-NO_SANITIZE("unsigned-integer-overflow", double strtod(const char *s00, char **se));
-double
-strtod(const char *s00, char **se)
-{
-#ifdef Avoid_Underflow
-    int scale;
-#endif
-    int bb2, bb5, bbe, bd2, bd5, bbbits, bs2, c, dsign,
-         e, e1, esign, i, j, k, nd, nd0, nf, nz, nz0, sign;
-    const char *s, *s0, *s1;
-    double aadj, adj;
-    double_u aadj1, rv, rv0;
-    Long L;
-    ULong y, z;
-    Bigint *bb, *bb1, *bd, *bd0, *bs, *delta;
-#ifdef SET_INEXACT
-    int inexact, oldinexact;
-#endif
-#ifdef Honor_FLT_ROUNDS
-    int rounding;
-#endif
-#ifdef USE_LOCALE
-    const char *s2;
-#endif
-
-    errno = 0;
-    sign = nz0 = nz = 0;
-    dval(rv) = 0.;
-    for (s = s00;;s++)
-        switch (*s) {
-          case '-':
-            sign = 1;
-            /* no break */
-          case '+':
-            if (*++s)
-                goto break2;
-            /* no break */
-          case 0:
-            goto ret0;
-          case '\t':
-          case '\n':
-          case '\v':
-          case '\f':
-          case '\r':
-          case ' ':
-            continue;
-          default:
-            goto break2;
-        }
-break2:
-    if (*s == '0') {
-	if (s[1] == 'x' || s[1] == 'X') {
-	    s0 = ++s;
-	    adj = 0;
-	    aadj = 1.0;
-	    nd0 = -4;
-
-	    if (!*++s || !(s1 = strchr(hexdigit, *s))) goto ret0;
-	    if (*s == '0') {
-		while (*++s == '0');
-		s1 = strchr(hexdigit, *s);
-	    }
-	    if (s1 != NULL) {
-		do {
-		    adj += aadj * ((s1 - hexdigit) & 15);
-		    nd0 += 4;
-		    aadj /= 16;
-		} while (*++s && (s1 = strchr(hexdigit, *s)));
-	    }
-
-	    if (*s == '.') {
-		dsign = 1;
-		if (!*++s || !(s1 = strchr(hexdigit, *s))) goto ret0;
-		if (nd0 < 0) {
-		    while (*s == '0') {
-			s++;
-			nd0 -= 4;
-		    }
-		}
-		for (; *s && (s1 = strchr(hexdigit, *s)); ++s) {
-		    adj += aadj * ((s1 - hexdigit) & 15);
-		    if ((aadj /= 16) == 0.0) {
-			while (strchr(hexdigit, *++s));
-			break;
-		    }
-		}
-	    }
-	    else {
-		dsign = 0;
-	    }
-
-	    if (*s == 'P' || *s == 'p') {
-		dsign = 0x2C - *++s; /* +: 2B, -: 2D */
-		if (abs(dsign) == 1) s++;
-		else dsign = 1;
-
-		nd = 0;
-		c = *s;
-		if (c < '0' || '9' < c) goto ret0;
-		do {
-		    nd *= 10;
-		    nd += c;
-		    nd -= '0';
-		    c = *++s;
-		    /* Float("0x0."+("0"*267)+"1fp2095") */
-		    if (nd + dsign * nd0 > 2095) {
-			while ('0' <= c && c <= '9') c = *++s;
-			break;
-		    }
-		} while ('0' <= c && c <= '9');
-		nd0 += nd * dsign;
-	    }
-	    else {
-		if (dsign) goto ret0;
-	    }
-	    dval(rv) = ldexp(adj, nd0);
-	    goto ret;
-	}
-        nz0 = 1;
-        while (*++s == '0') ;
-        if (!*s)
-            goto ret;
-    }
-    s0 = s;
-    y = z = 0;
-    for (nd = nf = 0; (c = *s) >= '0' && c <= '9'; nd++, s++)
-        if (nd < 9)
-            y = 10*y + c - '0';
-        else if (nd < DBL_DIG + 2)
-            z = 10*z + c - '0';
-    nd0 = nd;
-#ifdef USE_LOCALE
-    s1 = localeconv()->decimal_point;
-    if (c == *s1) {
-        c = '.';
-        if (*++s1) {
-            s2 = s;
-            for (;;) {
-                if (*++s2 != *s1) {
-                    c = 0;
-                    break;
-                }
-                if (!*++s1) {
-                    s = s2;
-                    break;
-                }
-            }
-        }
-    }
-#endif
-    if (c == '.') {
-        if (!ISDIGIT(s[1]))
-            goto dig_done;
-        c = *++s;
-        if (!nd) {
-            for (; c == '0'; c = *++s)
-                nz++;
-            if (c > '0' && c <= '9') {
-                s0 = s;
-                nf += nz;
-                nz = 0;
-                goto have_dig;
-            }
-            goto dig_done;
-        }
-        for (; c >= '0' && c <= '9'; c = *++s) {
-have_dig:
-            nz++;
-            if (nd > DBL_DIG * 4) {
-		continue;
-	    }
-            if (c -= '0') {
-                nf += nz;
-                for (i = 1; i < nz; i++)
-                    if (nd++ < 9)
-                        y *= 10;
-                    else if (nd <= DBL_DIG + 2)
-                        z *= 10;
-                if (nd++ < 9)
-                    y = 10*y + c;
-                else if (nd <= DBL_DIG + 2)
-                    z = 10*z + c;
-                nz = 0;
-            }
-        }
-    }
-dig_done:
-    e = 0;
-    if (c == 'e' || c == 'E') {
-        if (!nd && !nz && !nz0) {
-            goto ret0;
-        }
-        s00 = s;
-        esign = 0;
-        switch (c = *++s) {
-          case '-':
-            esign = 1;
-          case '+':
-            c = *++s;
-        }
-        if (c >= '0' && c <= '9') {
-            while (c == '0')
-                c = *++s;
-            if (c > '0' && c <= '9') {
-                L = c - '0';
-                s1 = s;
-                while ((c = *++s) >= '0' && c <= '9')
-                    L = 10*L + c - '0';
-                if (s - s1 > 8 || L > 19999)
-                    /* Avoid confusion from exponents
-                     * so large that e might overflow.
-                     */
-                    e = 19999; /* safe for 16 bit ints */
-                else
-                    e = (int)L;
-                if (esign)
-                    e = -e;
-            }
-            else
-                e = 0;
-        }
-        else
-            s = s00;
-    }
-    if (!nd) {
-        if (!nz && !nz0) {
-#ifdef INFNAN_CHECK
-            /* Check for Nan and Infinity */
-            switch (c) {
-              case 'i':
-              case 'I':
-                if (match(&s,"nf")) {
-                    --s;
-                    if (!match(&s,"inity"))
-                        ++s;
-                    word0(rv) = 0x7ff00000;
-                    word1(rv) = 0;
-                    goto ret;
-                }
-                break;
-              case 'n':
-              case 'N':
-                if (match(&s, "an")) {
-                    word0(rv) = NAN_WORD0;
-                    word1(rv) = NAN_WORD1;
-#ifndef No_Hex_NaN
-                    if (*s == '(') /*)*/
-                        hexnan(&rv, &s);
-#endif
-                    goto ret;
-                }
-            }
-#endif /* INFNAN_CHECK */
-ret0:
-            s = s00;
-            sign = 0;
-        }
-        goto ret;
-    }
-    e1 = e -= nf;
-
-    /* Now we have nd0 digits, starting at s0, followed by a
-     * decimal point, followed by nd-nd0 digits.  The number we're
-     * after is the integer represented by those digits times
-     * 10**e */
-
-    if (!nd0)
-        nd0 = nd;
-    k = nd < DBL_DIG + 2 ? nd : DBL_DIG + 2;
-    dval(rv) = y;
-    if (k > 9) {
-#ifdef SET_INEXACT
-        if (k > DBL_DIG)
-            oldinexact = get_inexact();
-#endif
-        dval(rv) = tens[k - 9] * dval(rv) + z;
-    }
-    bd0 = bb = bd = bs = delta = 0;
-    if (nd <= DBL_DIG
-#ifndef RND_PRODQUOT
-#ifndef Honor_FLT_ROUNDS
-        && Flt_Rounds == 1
-#endif
-#endif
-    ) {
-        if (!e)
-            goto ret;
-        if (e > 0) {
-            if (e <= Ten_pmax) {
-#ifdef VAX
-                goto vax_ovfl_check;
-#else
-#ifdef Honor_FLT_ROUNDS
-                /* round correctly FLT_ROUNDS = 2 or 3 */
-                if (sign) {
-                    dval(rv) = -dval(rv);
-                    sign = 0;
-                }
-#endif
-                /* rv = */ rounded_product(dval(rv), tens[e]);
-                goto ret;
-#endif
-            }
-            i = DBL_DIG - nd;
-            if (e <= Ten_pmax + i) {
-                /* A fancier test would sometimes let us do
-                 * this for larger i values.
-                 */
-#ifdef Honor_FLT_ROUNDS
-                /* round correctly FLT_ROUNDS = 2 or 3 */
-                if (sign) {
-                    dval(rv) = -dval(rv);
-                    sign = 0;
-                }
-#endif
-                e -= i;
-                dval(rv) *= tens[i];
-#ifdef VAX
-                /* VAX exponent range is so narrow we must
-                 * worry about overflow here...
-                 */
-vax_ovfl_check:
-                word0(rv) -= P*Exp_msk1;
-                /* rv = */ rounded_product(dval(rv), tens[e]);
-                if ((word0(rv) & Exp_mask)
-                        > Exp_msk1*(DBL_MAX_EXP+Bias-1-P))
-                    goto ovfl;
-                word0(rv) += P*Exp_msk1;
-#else
-                /* rv = */ rounded_product(dval(rv), tens[e]);
-#endif
-                goto ret;
-            }
-        }
-#ifndef Inaccurate_Divide
-        else if (e >= -Ten_pmax) {
-#ifdef Honor_FLT_ROUNDS
-            /* round correctly FLT_ROUNDS = 2 or 3 */
-            if (sign) {
-                dval(rv) = -dval(rv);
-                sign = 0;
-            }
-#endif
-            /* rv = */ rounded_quotient(dval(rv), tens[-e]);
-            goto ret;
-        }
-#endif
-    }
-    e1 += nd - k;
-
-#ifdef IEEE_Arith
-#ifdef SET_INEXACT
-    inexact = 1;
-    if (k <= DBL_DIG)
-        oldinexact = get_inexact();
-#endif
-#ifdef Avoid_Underflow
-    scale = 0;
-#endif
-#ifdef Honor_FLT_ROUNDS
-    if ((rounding = Flt_Rounds) >= 2) {
-        if (sign)
-            rounding = rounding == 2 ? 0 : 2;
-        else
-            if (rounding != 2)
-                rounding = 0;
-    }
-#endif
-#endif /*IEEE_Arith*/
-
-    /* Get starting approximation = rv * 10**e1 */
-
-    if (e1 > 0) {
-        if ((i = e1 & 15) != 0)
-            dval(rv) *= tens[i];
-        if (e1 &= ~15) {
-            if (e1 > DBL_MAX_10_EXP) {
-ovfl:
-#ifndef NO_ERRNO
-                errno = ERANGE;
-#endif
-                /* Can't trust HUGE_VAL */
-#ifdef IEEE_Arith
-#ifdef Honor_FLT_ROUNDS
-                switch (rounding) {
-                  case 0: /* toward 0 */
-                  case 3: /* toward -infinity */
-                    word0(rv) = Big0;
-                    word1(rv) = Big1;
-                    break;
-                  default:
-                    word0(rv) = Exp_mask;
-                    word1(rv) = 0;
-                }
-#else /*Honor_FLT_ROUNDS*/
-                word0(rv) = Exp_mask;
-                word1(rv) = 0;
-#endif /*Honor_FLT_ROUNDS*/
-#ifdef SET_INEXACT
-                /* set overflow bit */
-                dval(rv0) = 1e300;
-                dval(rv0) *= dval(rv0);
-#endif
-#else /*IEEE_Arith*/
-                word0(rv) = Big0;
-                word1(rv) = Big1;
-#endif /*IEEE_Arith*/
-                if (bd0)
-                    goto retfree;
-                goto ret;
-            }
-            e1 >>= 4;
-            for (j = 0; e1 > 1; j++, e1 >>= 1)
-                if (e1 & 1)
-                    dval(rv) *= bigtens[j];
-            /* The last multiplication could overflow. */
-            word0(rv) -= P*Exp_msk1;
-            dval(rv) *= bigtens[j];
-            if ((z = word0(rv) & Exp_mask)
-                    > Exp_msk1*(DBL_MAX_EXP+Bias-P))
-                goto ovfl;
-            if (z > Exp_msk1*(DBL_MAX_EXP+Bias-1-P)) {
-                /* set to largest number */
-                /* (Can't trust DBL_MAX) */
-                word0(rv) = Big0;
-                word1(rv) = Big1;
-            }
-            else
-                word0(rv) += P*Exp_msk1;
-        }
-    }
-    else if (e1 < 0) {
-        e1 = -e1;
-        if ((i = e1 & 15) != 0)
-            dval(rv) /= tens[i];
-        if (e1 >>= 4) {
-            if (e1 >= 1 << n_bigtens)
-                goto undfl;
-#ifdef Avoid_Underflow
-            if (e1 & Scale_Bit)
-                scale = 2*P;
-            for (j = 0; e1 > 0; j++, e1 >>= 1)
-                if (e1 & 1)
-                    dval(rv) *= tinytens[j];
-            if (scale && (j = 2*P + 1 - ((word0(rv) & Exp_mask)
-                    >> Exp_shift)) > 0) {
-                /* scaled rv is denormal; zap j low bits */
-                if (j >= 32) {
-                    word1(rv) = 0;
-                    if (j >= 53)
-                        word0(rv) = (P+2)*Exp_msk1;
-                    else
-                        word0(rv) &= 0xffffffff << (j-32);
-                }
-                else
-                    word1(rv) &= 0xffffffff << j;
-            }
-#else
-            for (j = 0; e1 > 1; j++, e1 >>= 1)
-                if (e1 & 1)
-                    dval(rv) *= tinytens[j];
-            /* The last multiplication could underflow. */
-            dval(rv0) = dval(rv);
-            dval(rv) *= tinytens[j];
-            if (!dval(rv)) {
-                dval(rv) = 2.*dval(rv0);
-                dval(rv) *= tinytens[j];
-#endif
-                if (!dval(rv)) {
-undfl:
-                    dval(rv) = 0.;
-#ifndef NO_ERRNO
-                    errno = ERANGE;
-#endif
-                    if (bd0)
-                        goto retfree;
-                    goto ret;
-                }
-#ifndef Avoid_Underflow
-                word0(rv) = Tiny0;
-                word1(rv) = Tiny1;
-                /* The refinement below will clean
-                 * this approximation up.
-                 */
-            }
-#endif
-        }
-    }
-
-    /* Now the hard part -- adjusting rv to the correct value.*/
-
-    /* Put digits into bd: true value = bd * 10^e */
-
-    bd0 = s2b(s0, nd0, nd, y);
-
-    for (;;) {
-        bd = Balloc(bd0->k);
-        Bcopy(bd, bd0);
-        bb = d2b(dval(rv), &bbe, &bbbits);  /* rv = bb * 2^bbe */
-        bs = i2b(1);
-
-        if (e >= 0) {
-            bb2 = bb5 = 0;
-            bd2 = bd5 = e;
-        }
-        else {
-            bb2 = bb5 = -e;
-            bd2 = bd5 = 0;
-        }
-        if (bbe >= 0)
-            bb2 += bbe;
-        else
-            bd2 -= bbe;
-        bs2 = bb2;
-#ifdef Honor_FLT_ROUNDS
-        if (rounding != 1)
-            bs2++;
-#endif
-#ifdef Avoid_Underflow
-        j = bbe - scale;
-        i = j + bbbits - 1; /* logb(rv) */
-        if (i < Emin)   /* denormal */
-            j += P - Emin;
-        else
-            j = P + 1 - bbbits;
-#else /*Avoid_Underflow*/
-#ifdef Sudden_Underflow
-#ifdef IBM
-        j = 1 + 4*P - 3 - bbbits + ((bbe + bbbits - 1) & 3);
-#else
-        j = P + 1 - bbbits;
-#endif
-#else /*Sudden_Underflow*/
-        j = bbe;
-        i = j + bbbits - 1; /* logb(rv) */
-        if (i < Emin)   /* denormal */
-            j += P - Emin;
-        else
-            j = P + 1 - bbbits;
-#endif /*Sudden_Underflow*/
-#endif /*Avoid_Underflow*/
-        bb2 += j;
-        bd2 += j;
-#ifdef Avoid_Underflow
-        bd2 += scale;
-#endif
-        i = bb2 < bd2 ? bb2 : bd2;
-        if (i > bs2)
-            i = bs2;
-        if (i > 0) {
-            bb2 -= i;
-            bd2 -= i;
-            bs2 -= i;
-        }
-        if (bb5 > 0) {
-            bs = pow5mult(bs, bb5);
-            bb1 = mult(bs, bb);
-            Bfree(bb);
-            bb = bb1;
-        }
-        if (bb2 > 0)
-            bb = lshift(bb, bb2);
-        if (bd5 > 0)
-            bd = pow5mult(bd, bd5);
-        if (bd2 > 0)
-            bd = lshift(bd, bd2);
-        if (bs2 > 0)
-            bs = lshift(bs, bs2);
-        delta = diff(bb, bd);
-        dsign = delta->sign;
-        delta->sign = 0;
-        i = cmp(delta, bs);
-#ifdef Honor_FLT_ROUNDS
-        if (rounding != 1) {
-            if (i < 0) {
-                /* Error is less than an ulp */
-                if (!delta->x[0] && delta->wds <= 1) {
-                    /* exact */
-#ifdef SET_INEXACT
-                    inexact = 0;
-#endif
-                    break;
-                }
-                if (rounding) {
-                    if (dsign) {
-                        adj = 1.;
-                        goto apply_adj;
-                    }
-                }
-                else if (!dsign) {
-                    adj = -1.;
-                    if (!word1(rv)
-                     && !(word0(rv) & Frac_mask)) {
-                        y = word0(rv) & Exp_mask;
-#ifdef Avoid_Underflow
-                        if (!scale || y > 2*P*Exp_msk1)
-#else
-                        if (y)
-#endif
-                        {
-                            delta = lshift(delta,Log2P);
-                            if (cmp(delta, bs) <= 0)
-                                adj = -0.5;
-                        }
-                    }
-apply_adj:
-#ifdef Avoid_Underflow
-                    if (scale && (y = word0(rv) & Exp_mask)
-                            <= 2*P*Exp_msk1)
-                        word0(adj) += (2*P+1)*Exp_msk1 - y;
-#else
-#ifdef Sudden_Underflow
-                    if ((word0(rv) & Exp_mask) <=
-                            P*Exp_msk1) {
-                        word0(rv) += P*Exp_msk1;
-                        dval(rv) += adj*ulp(dval(rv));
-                        word0(rv) -= P*Exp_msk1;
-                    }
-                    else
-#endif /*Sudden_Underflow*/
-#endif /*Avoid_Underflow*/
-                    dval(rv) += adj*ulp(dval(rv));
-                }
-                break;
-            }
-            adj = ratio(delta, bs);
-            if (adj < 1.)
-                adj = 1.;
-            if (adj <= 0x7ffffffe) {
-                /* adj = rounding ? ceil(adj) : floor(adj); */
-                y = adj;
-                if (y != adj) {
-                    if (!((rounding>>1) ^ dsign))
-                        y++;
-                    adj = y;
-                }
-            }
-#ifdef Avoid_Underflow
-            if (scale && (y = word0(rv) & Exp_mask) <= 2*P*Exp_msk1)
-                word0(adj) += (2*P+1)*Exp_msk1 - y;
-#else
-#ifdef Sudden_Underflow
-            if ((word0(rv) & Exp_mask) <= P*Exp_msk1) {
-                word0(rv) += P*Exp_msk1;
-                adj *= ulp(dval(rv));
-                if (dsign)
-                    dval(rv) += adj;
-                else
-                    dval(rv) -= adj;
-                word0(rv) -= P*Exp_msk1;
-                goto cont;
-            }
-#endif /*Sudden_Underflow*/
-#endif /*Avoid_Underflow*/
-            adj *= ulp(dval(rv));
-            if (dsign)
-                dval(rv) += adj;
-            else
-                dval(rv) -= adj;
-            goto cont;
-        }
-#endif /*Honor_FLT_ROUNDS*/
-
-        if (i < 0) {
-            /* Error is less than half an ulp -- check for
-             * special case of mantissa a power of two.
-             */
-            if (dsign || word1(rv) || word0(rv) & Bndry_mask
-#ifdef IEEE_Arith
-#ifdef Avoid_Underflow
-                || (word0(rv) & Exp_mask) <= (2*P+1)*Exp_msk1
-#else
-                || (word0(rv) & Exp_mask) <= Exp_msk1
-#endif
-#endif
-            ) {
-#ifdef SET_INEXACT
-                if (!delta->x[0] && delta->wds <= 1)
-                    inexact = 0;
-#endif
-                break;
-            }
-            if (!delta->x[0] && delta->wds <= 1) {
-                /* exact result */
-#ifdef SET_INEXACT
-                inexact = 0;
-#endif
-                break;
-            }
-            delta = lshift(delta,Log2P);
-            if (cmp(delta, bs) > 0)
-                goto drop_down;
-            break;
-        }
-        if (i == 0) {
-            /* exactly half-way between */
-            if (dsign) {
-                if ((word0(rv) & Bndry_mask1) == Bndry_mask1
-                        &&  word1(rv) == (
-#ifdef Avoid_Underflow
-                        (scale && (y = word0(rv) & Exp_mask) <= 2*P*Exp_msk1)
-                        ? (0xffffffff & (0xffffffff << (2*P+1-(y>>Exp_shift)))) :
-#endif
-                        0xffffffff)) {
-                    /*boundary case -- increment exponent*/
-                    word0(rv) = (word0(rv) & Exp_mask)
-                                + Exp_msk1
-#ifdef IBM
-                                | Exp_msk1 >> 4
-#endif
-                    ;
-                    word1(rv) = 0;
-#ifdef Avoid_Underflow
-                    dsign = 0;
-#endif
-                    break;
-                }
-            }
-            else if (!(word0(rv) & Bndry_mask) && !word1(rv)) {
-drop_down:
-                /* boundary case -- decrement exponent */
-#ifdef Sudden_Underflow /*{{*/
-                L = word0(rv) & Exp_mask;
-#ifdef IBM
-                if (L <  Exp_msk1)
-#else
-#ifdef Avoid_Underflow
-                if (L <= (scale ? (2*P+1)*Exp_msk1 : Exp_msk1))
-#else
-                if (L <= Exp_msk1)
-#endif /*Avoid_Underflow*/
-#endif /*IBM*/
-                    goto undfl;
-                L -= Exp_msk1;
-#else /*Sudden_Underflow}{*/
-#ifdef Avoid_Underflow
-                if (scale) {
-                    L = word0(rv) & Exp_mask;
-                    if (L <= (2*P+1)*Exp_msk1) {
-                        if (L > (P+2)*Exp_msk1)
-                            /* round even ==> */
-                            /* accept rv */
-                            break;
-                        /* rv = smallest denormal */
-                        goto undfl;
-                    }
-                }
-#endif /*Avoid_Underflow*/
-                L = (word0(rv) & Exp_mask) - Exp_msk1;
-#endif /*Sudden_Underflow}}*/
-                word0(rv) = L | Bndry_mask1;
-                word1(rv) = 0xffffffff;
-#ifdef IBM
-                goto cont;
-#else
-                break;
-#endif
-            }
-#ifndef ROUND_BIASED
-            if (!(word1(rv) & LSB))
-                break;
-#endif
-            if (dsign)
-                dval(rv) += ulp(dval(rv));
-#ifndef ROUND_BIASED
-            else {
-                dval(rv) -= ulp(dval(rv));
-#ifndef Sudden_Underflow
-                if (!dval(rv))
-                    goto undfl;
-#endif
-            }
-#ifdef Avoid_Underflow
-            dsign = 1 - dsign;
-#endif
-#endif
-            break;
-        }
-        if ((aadj = ratio(delta, bs)) <= 2.) {
-            if (dsign)
-                aadj = dval(aadj1) = 1.;
-            else if (word1(rv) || word0(rv) & Bndry_mask) {
-#ifndef Sudden_Underflow
-                if (word1(rv) == Tiny1 && !word0(rv))
-                    goto undfl;
-#endif
-                aadj = 1.;
-                dval(aadj1) = -1.;
-            }
-            else {
-                /* special case -- power of FLT_RADIX to be */
-                /* rounded down... */
-
-                if (aadj < 2./FLT_RADIX)
-                    aadj = 1./FLT_RADIX;
-                else
-                    aadj *= 0.5;
-                dval(aadj1) = -aadj;
-            }
-        }
-        else {
-            aadj *= 0.5;
-            dval(aadj1) = dsign ? aadj : -aadj;
-#ifdef Check_FLT_ROUNDS
-            switch (Rounding) {
-              case 2: /* towards +infinity */
-                dval(aadj1) -= 0.5;
-                break;
-              case 0: /* towards 0 */
-              case 3: /* towards -infinity */
-                dval(aadj1) += 0.5;
-            }
-#else
-            if (Flt_Rounds == 0)
-                dval(aadj1) += 0.5;
-#endif /*Check_FLT_ROUNDS*/
-        }
-        y = word0(rv) & Exp_mask;
-
-        /* Check for overflow */
-
-        if (y == Exp_msk1*(DBL_MAX_EXP+Bias-1)) {
-            dval(rv0) = dval(rv);
-            word0(rv) -= P*Exp_msk1;
-            adj = dval(aadj1) * ulp(dval(rv));
-            dval(rv) += adj;
-            if ((word0(rv) & Exp_mask) >=
-                    Exp_msk1*(DBL_MAX_EXP+Bias-P)) {
-                if (word0(rv0) == Big0 && word1(rv0) == Big1)
-                    goto ovfl;
-                word0(rv) = Big0;
-                word1(rv) = Big1;
-                goto cont;
-            }
-            else
-                word0(rv) += P*Exp_msk1;
-        }
-        else {
-#ifdef Avoid_Underflow
-            if (scale && y <= 2*P*Exp_msk1) {
-                if (aadj <= 0x7fffffff) {
-                    if ((z = (int)aadj) <= 0)
-                        z = 1;
-                    aadj = z;
-                    dval(aadj1) = dsign ? aadj : -aadj;
-                }
-                word0(aadj1) += (2*P+1)*Exp_msk1 - y;
-            }
-            adj = dval(aadj1) * ulp(dval(rv));
-            dval(rv) += adj;
-#else
-#ifdef Sudden_Underflow
-            if ((word0(rv) & Exp_mask) <= P*Exp_msk1) {
-                dval(rv0) = dval(rv);
-                word0(rv) += P*Exp_msk1;
-                adj = dval(aadj1) * ulp(dval(rv));
-                dval(rv) += adj;
-#ifdef IBM
-                if ((word0(rv) & Exp_mask) <  P*Exp_msk1)
-#else
-                if ((word0(rv) & Exp_mask) <= P*Exp_msk1)
-#endif
-                {
-                    if (word0(rv0) == Tiny0 && word1(rv0) == Tiny1)
-                        goto undfl;
-                    word0(rv) = Tiny0;
-                    word1(rv) = Tiny1;
-                    goto cont;
-                }
-                else
-                    word0(rv) -= P*Exp_msk1;
-            }
-            else {
-                adj = dval(aadj1) * ulp(dval(rv));
-                dval(rv) += adj;
-            }
-#else /*Sudden_Underflow*/
-            /* Compute adj so that the IEEE rounding rules will
-             * correctly round rv + adj in some half-way cases.
-             * If rv * ulp(rv) is denormalized (i.e.,
-             * y <= (P-1)*Exp_msk1), we must adjust aadj to avoid
-             * trouble from bits lost to denormalization;
-             * example: 1.2e-307 .
-             */
-            if (y <= (P-1)*Exp_msk1 && aadj > 1.) {
-                dval(aadj1) = (double)(int)(aadj + 0.5);
-                if (!dsign)
-                    dval(aadj1) = -dval(aadj1);
-            }
-            adj = dval(aadj1) * ulp(dval(rv));
-            dval(rv) += adj;
-#endif /*Sudden_Underflow*/
-#endif /*Avoid_Underflow*/
-        }
-        z = word0(rv) & Exp_mask;
-#ifndef SET_INEXACT
-#ifdef Avoid_Underflow
-        if (!scale)
-#endif
-        if (y == z) {
-            /* Can we stop now? */
-            L = (Long)aadj;
-            aadj -= L;
-            /* The tolerances below are conservative. */
-            if (dsign || word1(rv) || word0(rv) & Bndry_mask) {
-                if (aadj < .4999999 || aadj > .5000001)
-                    break;
-            }
-            else if (aadj < .4999999/FLT_RADIX)
-                break;
-        }
-#endif
-cont:
-        Bfree(bb);
-        Bfree(bd);
-        Bfree(bs);
-        Bfree(delta);
-    }
-#ifdef SET_INEXACT
-    if (inexact) {
-        if (!oldinexact) {
-            word0(rv0) = Exp_1 + (70 << Exp_shift);
-            word1(rv0) = 0;
-            dval(rv0) += 1.;
-        }
-    }
-    else if (!oldinexact)
-        clear_inexact();
-#endif
-#ifdef Avoid_Underflow
-    if (scale) {
-        word0(rv0) = Exp_1 - 2*P*Exp_msk1;
-        word1(rv0) = 0;
-        dval(rv) *= dval(rv0);
-#ifndef NO_ERRNO
-        /* try to avoid the bug of testing an 8087 register value */
-        if (word0(rv) == 0 && word1(rv) == 0)
-            errno = ERANGE;
-#endif
-    }
-#endif /* Avoid_Underflow */
-#ifdef SET_INEXACT
-    if (inexact && !(word0(rv) & Exp_mask)) {
-        /* set underflow bit */
-        dval(rv0) = 1e-300;
-        dval(rv0) *= dval(rv0);
-    }
-#endif
-retfree:
-    Bfree(bb);
-    Bfree(bd);
-    Bfree(bs);
-    Bfree(bd0);
-    Bfree(delta);
-ret:
-    if (se)
-        *se = (char *)s;
-    return sign ? -dval(rv) : dval(rv);
-}
-
-NO_SANITIZE("unsigned-integer-overflow", static int quorem(Bigint *b, Bigint *S));
-static int
-quorem(Bigint *b, Bigint *S)
-{
-    int n;
-    ULong *bx, *bxe, q, *sx, *sxe;
-#ifdef ULLong
-    ULLong borrow, carry, y, ys;
-#else
-    ULong borrow, carry, y, ys;
-#ifdef Pack_32
-    ULong si, z, zs;
-#endif
-#endif
-
-    n = S->wds;
-#ifdef DEBUG
-    /*debug*/ if (b->wds > n)
-    /*debug*/   Bug("oversize b in quorem");
-#endif
-    if (b->wds < n)
-        return 0;
-    sx = S->x;
-    sxe = sx + --n;
-    bx = b->x;
-    bxe = bx + n;
-    q = *bxe / (*sxe + 1);  /* ensure q <= true quotient */
-#ifdef DEBUG
-    /*debug*/ if (q > 9)
-    /*debug*/   Bug("oversized quotient in quorem");
-#endif
-    if (q) {
-        borrow = 0;
-        carry = 0;
-        do {
-#ifdef ULLong
-            ys = *sx++ * (ULLong)q + carry;
-            carry = ys >> 32;
-            y = *bx - (ys & FFFFFFFF) - borrow;
-            borrow = y >> 32 & (ULong)1;
-            *bx++ = (ULong)(y & FFFFFFFF);
-#else
-#ifdef Pack_32
-            si = *sx++;
-            ys = (si & 0xffff) * q + carry;
-            zs = (si >> 16) * q + (ys >> 16);
-            carry = zs >> 16;
-            y = (*bx & 0xffff) - (ys & 0xffff) - borrow;
-            borrow = (y & 0x10000) >> 16;
-            z = (*bx >> 16) - (zs & 0xffff) - borrow;
-            borrow = (z & 0x10000) >> 16;
-            Storeinc(bx, z, y);
-#else
-            ys = *sx++ * q + carry;
-            carry = ys >> 16;
-            y = *bx - (ys & 0xffff) - borrow;
-            borrow = (y & 0x10000) >> 16;
-            *bx++ = y & 0xffff;
-#endif
-#endif
-        } while (sx <= sxe);
-        if (!*bxe) {
-            bx = b->x;
-            while (--bxe > bx && !*bxe)
-                --n;
-            b->wds = n;
-        }
-    }
-    if (cmp(b, S) >= 0) {
-        q++;
-        borrow = 0;
-        carry = 0;
-        bx = b->x;
-        sx = S->x;
-        do {
-#ifdef ULLong
-            ys = *sx++ + carry;
-            carry = ys >> 32;
-            y = *bx - (ys & FFFFFFFF) - borrow;
-            borrow = y >> 32 & (ULong)1;
-            *bx++ = (ULong)(y & FFFFFFFF);
-#else
-#ifdef Pack_32
-            si = *sx++;
-            ys = (si & 0xffff) + carry;
-            zs = (si >> 16) + (ys >> 16);
-            carry = zs >> 16;
-            y = (*bx & 0xffff) - (ys & 0xffff) - borrow;
-            borrow = (y & 0x10000) >> 16;
-            z = (*bx >> 16) - (zs & 0xffff) - borrow;
-            borrow = (z & 0x10000) >> 16;
-            Storeinc(bx, z, y);
-#else
-            ys = *sx++ + carry;
-            carry = ys >> 16;
-            y = *bx - (ys & 0xffff) - borrow;
-            borrow = (y & 0x10000) >> 16;
-            *bx++ = y & 0xffff;
-#endif
-#endif
-        } while (sx <= sxe);
-        bx = b->x;
-        bxe = bx + n;
-        if (!*bxe) {
-            while (--bxe > bx && !*bxe)
-                --n;
-            b->wds = n;
-        }
-    }
-    return q;
-}
-
-#ifndef MULTIPLE_THREADS
-static char *dtoa_result;
-#endif
-
-#ifndef MULTIPLE_THREADS
-static char *
-rv_alloc(int i)
-{
-    return dtoa_result = MALLOC(i);
-}
-#else
-#define rv_alloc(i) MALLOC(i)
-#endif
-
-static char *
-nrv_alloc(const char *s, char **rve, size_t n)
-{
-    char *rv, *t;
-
-    t = rv = rv_alloc(n);
-    while ((*t = *s++) != 0) t++;
-    if (rve)
-        *rve = t;
-    return rv;
-}
-
-#define rv_strdup(s, rve) nrv_alloc((s), (rve), strlen(s)+1)
-
-#ifndef MULTIPLE_THREADS
-/* freedtoa(s) must be used to free values s returned by dtoa
- * when MULTIPLE_THREADS is #defined.  It should be used in all cases,
- * but for consistency with earlier versions of dtoa, it is optional
- * when MULTIPLE_THREADS is not defined.
- */
-
-static void
-freedtoa(char *s)
-{
-    FREE(s);
-}
-#endif
-
-static const char INFSTR[] = "Infinity";
-static const char NANSTR[] = "NaN";
-static const char ZEROSTR[] = "0";
-
-/* dtoa for IEEE arithmetic (dmg): convert double to ASCII string.
- *
- * Inspired by "How to Print Floating-Point Numbers Accurately" by
- * Guy L. Steele, Jr. and Jon L. White [Proc. ACM SIGPLAN '90, pp. 112-126].
- *
- * Modifications:
- *  1. Rather than iterating, we use a simple numeric overestimate
- *     to determine k = floor(log10(d)).  We scale relevant
- *     quantities using O(log2(k)) rather than O(k) multiplications.
- *  2. For some modes > 2 (corresponding to ecvt and fcvt), we don't
- *     try to generate digits strictly left to right.  Instead, we
- *     compute with fewer bits and propagate the carry if necessary
- *     when rounding the final digit up.  This is often faster.
- *  3. Under the assumption that input will be rounded nearest,
- *     mode 0 renders 1e23 as 1e23 rather than 9.999999999999999e22.
- *     That is, we allow equality in stopping tests when the
- *     round-nearest rule will give the same floating-point value
- *     as would satisfaction of the stopping test with strict
- *     inequality.
- *  4. We remove common factors of powers of 2 from relevant
- *     quantities.
- *  5. When converting floating-point integers less than 1e16,
- *     we use floating-point arithmetic rather than resorting
- *     to multiple-precision integers.
- *  6. When asked to produce fewer than 15 digits, we first try
- *     to get by with floating-point arithmetic; we resort to
- *     multiple-precision integer arithmetic only if we cannot
- *     guarantee that the floating-point calculation has given
- *     the correctly rounded result.  For k requested digits and
- *     "uniformly" distributed input, the probability is
- *     something like 10^(k-15) that we must resort to the Long
- *     calculation.
- */
-
-char *
-dtoa(double d_, int mode, int ndigits, int *decpt, int *sign, char **rve)
-{
- /* Arguments ndigits, decpt, sign are similar to those
-    of ecvt and fcvt; trailing zeros are suppressed from
-    the returned string.  If not null, *rve is set to point
-    to the end of the return value.  If d is +-Infinity or NaN,
-    then *decpt is set to 9999.
-
-    mode:
-        0 ==> shortest string that yields d when read in
-            and rounded to nearest.
-        1 ==> like 0, but with Steele & White stopping rule;
-            e.g. with IEEE P754 arithmetic , mode 0 gives
-            1e23 whereas mode 1 gives 9.999999999999999e22.
-        2 ==> max(1,ndigits) significant digits.  This gives a
-            return value similar to that of ecvt, except
-            that trailing zeros are suppressed.
-        3 ==> through ndigits past the decimal point.  This
-            gives a return value similar to that from fcvt,
-            except that trailing zeros are suppressed, and
-            ndigits can be negative.
-        4,5 ==> similar to 2 and 3, respectively, but (in
-            round-nearest mode) with the tests of mode 0 to
-            possibly return a shorter string that rounds to d.
-            With IEEE arithmetic and compilation with
-            -DHonor_FLT_ROUNDS, modes 4 and 5 behave the same
-            as modes 2 and 3 when FLT_ROUNDS != 1.
-        6-9 ==> Debugging modes similar to mode - 4:  don't try
-            fast floating-point estimate (if applicable).
-
-        Values of mode other than 0-9 are treated as mode 0.
-
-        Sufficient space is allocated to the return value
-        to hold the suppressed trailing zeros.
-    */
-
-    int bbits, b2, b5, be, dig, i, ieps, ilim, ilim0, ilim1,
-        j, j1, k, k0, k_check, leftright, m2, m5, s2, s5,
-        spec_case, try_quick, half = 0;
-    Long L;
-#ifndef Sudden_Underflow
-    int denorm;
-    ULong x;
-#endif
-    Bigint *b, *b1, *delta, *mlo = 0, *mhi = 0, *S;
-    double ds;
-    double_u d, d2, eps;
-    char *s, *s0;
-#ifdef Honor_FLT_ROUNDS
-    int rounding;
-#endif
-#ifdef SET_INEXACT
-    int inexact, oldinexact;
-#endif
-
-    dval(d) = d_;
-
-#ifndef MULTIPLE_THREADS
-    if (dtoa_result) {
-        freedtoa(dtoa_result);
-        dtoa_result = 0;
-    }
-#endif
-
-    if (word0(d) & Sign_bit) {
-        /* set sign for everything, including 0's and NaNs */
-        *sign = 1;
-        word0(d) &= ~Sign_bit;  /* clear sign bit */
-    }
-    else
-        *sign = 0;
-
-#if defined(IEEE_Arith) + defined(VAX)
-#ifdef IEEE_Arith
-    if ((word0(d) & Exp_mask) == Exp_mask)
-#else
-    if (word0(d)  == 0x8000)
-#endif
-    {
-        /* Infinity or NaN */
-        *decpt = 9999;
-#ifdef IEEE_Arith
-        if (!word1(d) && !(word0(d) & 0xfffff))
-            return rv_strdup(INFSTR, rve);
-#endif
-        return rv_strdup(NANSTR, rve);
-    }
-#endif
-#ifdef IBM
-    dval(d) += 0; /* normalize */
-#endif
-    if (!dval(d)) {
-        *decpt = 1;
-        return rv_strdup(ZEROSTR, rve);
-    }
-
-#ifdef SET_INEXACT
-    try_quick = oldinexact = get_inexact();
-    inexact = 1;
-#endif
-#ifdef Honor_FLT_ROUNDS
-    if ((rounding = Flt_Rounds) >= 2) {
-        if (*sign)
-            rounding = rounding == 2 ? 0 : 2;
-        else
-            if (rounding != 2)
-                rounding = 0;
-    }
-#endif
-
-    b = d2b(dval(d), &be, &bbits);
-#ifdef Sudden_Underflow
-    i = (int)(word0(d) >> Exp_shift1 & (Exp_mask>>Exp_shift1));
-#else
-    if ((i = (int)(word0(d) >> Exp_shift1 & (Exp_mask>>Exp_shift1))) != 0) {
-#endif
-        dval(d2) = dval(d);
-        word0(d2) &= Frac_mask1;
-        word0(d2) |= Exp_11;
-#ifdef IBM
-        if (j = 11 - hi0bits(word0(d2) & Frac_mask))
-            dval(d2) /= 1 << j;
-#endif
-
-        /* log(x)   ~=~ log(1.5) + (x-1.5)/1.5
-         * log10(x)  =  log(x) / log(10)
-         *      ~=~ log(1.5)/log(10) + (x-1.5)/(1.5*log(10))
-         * log10(d) = (i-Bias)*log(2)/log(10) + log10(d2)
-         *
-         * This suggests computing an approximation k to log10(d) by
-         *
-         * k = (i - Bias)*0.301029995663981
-         *  + ( (d2-1.5)*0.289529654602168 + 0.176091259055681 );
-         *
-         * We want k to be too large rather than too small.
-         * The error in the first-order Taylor series approximation
-         * is in our favor, so we just round up the constant enough
-         * to compensate for any error in the multiplication of
-         * (i - Bias) by 0.301029995663981; since |i - Bias| <= 1077,
-         * and 1077 * 0.30103 * 2^-52 ~=~ 7.2e-14,
-         * adding 1e-13 to the constant term more than suffices.
-         * Hence we adjust the constant term to 0.1760912590558.
-         * (We could get a more accurate k by invoking log10,
-         *  but this is probably not worthwhile.)
-         */
-
-        i -= Bias;
-#ifdef IBM
-        i <<= 2;
-        i += j;
-#endif
-#ifndef Sudden_Underflow
-        denorm = 0;
-    }
-    else {
-        /* d is denormalized */
-
-        i = bbits + be + (Bias + (P-1) - 1);
-        x = i > 32  ? word0(d) << (64 - i) | word1(d) >> (i - 32)
-	    : word1(d) << (32 - i);
-        dval(d2) = x;
-        word0(d2) -= 31*Exp_msk1; /* adjust exponent */
-        i -= (Bias + (P-1) - 1) + 1;
-        denorm = 1;
-    }
-#endif
-    ds = (dval(d2)-1.5)*0.289529654602168 + 0.1760912590558 + i*0.301029995663981;
-    k = (int)ds;
-    if (ds < 0. && ds != k)
-        k--;    /* want k = floor(ds) */
-    k_check = 1;
-    if (k >= 0 && k <= Ten_pmax) {
-        if (dval(d) < tens[k])
-            k--;
-        k_check = 0;
-    }
-    j = bbits - i - 1;
-    if (j >= 0) {
-        b2 = 0;
-        s2 = j;
-    }
-    else {
-        b2 = -j;
-        s2 = 0;
-    }
-    if (k >= 0) {
-        b5 = 0;
-        s5 = k;
-        s2 += k;
-    }
-    else {
-        b2 -= k;
-        b5 = -k;
-        s5 = 0;
-    }
-    if (mode < 0 || mode > 9)
-        mode = 0;
-
-#ifndef SET_INEXACT
-#ifdef Check_FLT_ROUNDS
-    try_quick = Rounding == 1;
-#else
-    try_quick = 1;
-#endif
-#endif /*SET_INEXACT*/
-
-    if (mode > 5) {
-        mode -= 4;
-        try_quick = 0;
-    }
-    leftright = 1;
-    ilim = ilim1 = -1;
-    switch (mode) {
-      case 0:
-      case 1:
-        i = 18;
-        ndigits = 0;
-        break;
-      case 2:
-        leftright = 0;
-        /* no break */
-      case 4:
-        if (ndigits <= 0)
-            ndigits = 1;
-        ilim = ilim1 = i = ndigits;
-        break;
-      case 3:
-        leftright = 0;
-        /* no break */
-      case 5:
-        i = ndigits + k + 1;
-        ilim = i;
-        ilim1 = i - 1;
-        if (i <= 0)
-            i = 1;
-    }
-    s = s0 = rv_alloc(i+1);
-
-#ifdef Honor_FLT_ROUNDS
-    if (mode > 1 && rounding != 1)
-        leftright = 0;
-#endif
-
-    if (ilim >= 0 && ilim <= Quick_max && try_quick) {
-
-        /* Try to get by with floating-point arithmetic. */
-
-        i = 0;
-        dval(d2) = dval(d);
-        k0 = k;
-        ilim0 = ilim;
-        ieps = 2; /* conservative */
-        if (k > 0) {
-            ds = tens[k&0xf];
-            j = k >> 4;
-            if (j & Bletch) {
-                /* prevent overflows */
-                j &= Bletch - 1;
-                dval(d) /= bigtens[n_bigtens-1];
-                ieps++;
-            }
-            for (; j; j >>= 1, i++)
-                if (j & 1) {
-                    ieps++;
-                    ds *= bigtens[i];
-                }
-            dval(d) /= ds;
-        }
-        else if ((j1 = -k) != 0) {
-            dval(d) *= tens[j1 & 0xf];
-            for (j = j1 >> 4; j; j >>= 1, i++)
-                if (j & 1) {
-                    ieps++;
-                    dval(d) *= bigtens[i];
-                }
-        }
-        if (k_check && dval(d) < 1. && ilim > 0) {
-            if (ilim1 <= 0)
-                goto fast_failed;
-            ilim = ilim1;
-            k--;
-            dval(d) *= 10.;
-            ieps++;
-        }
-        dval(eps) = ieps*dval(d) + 7.;
-        word0(eps) -= (P-1)*Exp_msk1;
-        if (ilim == 0) {
-            S = mhi = 0;
-            dval(d) -= 5.;
-            if (dval(d) > dval(eps))
-                goto one_digit;
-            if (dval(d) < -dval(eps))
-                goto no_digits;
-            goto fast_failed;
-        }
-#ifndef No_leftright
-        if (leftright) {
-            /* Use Steele & White method of only
-             * generating digits needed.
-             */
-            dval(eps) = 0.5/tens[ilim-1] - dval(eps);
-            for (i = 0;;) {
-                L = (int)dval(d);
-                dval(d) -= L;
-                *s++ = '0' + (int)L;
-                if (dval(d) < dval(eps))
-                    goto ret1;
-                if (1. - dval(d) < dval(eps))
-                    goto bump_up;
-                if (++i >= ilim)
-                    break;
-                dval(eps) *= 10.;
-                dval(d) *= 10.;
-            }
-        }
-        else {
-#endif
-            /* Generate ilim digits, then fix them up. */
-            dval(eps) *= tens[ilim-1];
-            for (i = 1;; i++, dval(d) *= 10.) {
-                L = (Long)(dval(d));
-                if (!(dval(d) -= L))
-                    ilim = i;
-                *s++ = '0' + (int)L;
-                if (i == ilim) {
-                    if (dval(d) > 0.5 + dval(eps))
-                        goto bump_up;
-                    else if (dval(d) < 0.5 - dval(eps)) {
-                        while (*--s == '0') ;
-                        s++;
-                        goto ret1;
-                    }
-                    half = 1;
-                    if ((*(s-1) - '0') & 1) {
-                        goto bump_up;
-                    }
-                    break;
-                }
-            }
-#ifndef No_leftright
-        }
-#endif
-fast_failed:
-        s = s0;
-        dval(d) = dval(d2);
-        k = k0;
-        ilim = ilim0;
-    }
-
-    /* Do we have a "small" integer? */
-
-    if (be >= 0 && k <= Int_max) {
-        /* Yes. */
-        ds = tens[k];
-        if (ndigits < 0 && ilim <= 0) {
-            S = mhi = 0;
-            if (ilim < 0 || dval(d) <= 5*ds)
-                goto no_digits;
-            goto one_digit;
-        }
-        for (i = 1;; i++, dval(d) *= 10.) {
-            L = (Long)(dval(d) / ds);
-            dval(d) -= L*ds;
-#ifdef Check_FLT_ROUNDS
-            /* If FLT_ROUNDS == 2, L will usually be high by 1 */
-            if (dval(d) < 0) {
-                L--;
-                dval(d) += ds;
-            }
-#endif
-            *s++ = '0' + (int)L;
-            if (!dval(d)) {
-#ifdef SET_INEXACT
-                inexact = 0;
-#endif
-                break;
-            }
-            if (i == ilim) {
-#ifdef Honor_FLT_ROUNDS
-                if (mode > 1)
-                switch (rounding) {
-                  case 0: goto ret1;
-                  case 2: goto bump_up;
-                }
-#endif
-                dval(d) += dval(d);
-                if (dval(d) > ds || (dval(d) == ds && (L & 1))) {
-bump_up:
-                    while (*--s == '9')
-                        if (s == s0) {
-                            k++;
-                            *s = '0';
-                            break;
-                        }
-                    ++*s++;
-                }
-                break;
-            }
-        }
-        goto ret1;
-    }
-
-    m2 = b2;
-    m5 = b5;
-    if (leftright) {
-        i =
-#ifndef Sudden_Underflow
-            denorm ? be + (Bias + (P-1) - 1 + 1) :
-#endif
-#ifdef IBM
-            1 + 4*P - 3 - bbits + ((bbits + be - 1) & 3);
-#else
-            1 + P - bbits;
-#endif
-        b2 += i;
-        s2 += i;
-        mhi = i2b(1);
-    }
-    if (m2 > 0 && s2 > 0) {
-        i = m2 < s2 ? m2 : s2;
-        b2 -= i;
-        m2 -= i;
-        s2 -= i;
-    }
-    if (b5 > 0) {
-        if (leftright) {
-            if (m5 > 0) {
-                mhi = pow5mult(mhi, m5);
-                b1 = mult(mhi, b);
-                Bfree(b);
-                b = b1;
-            }
-            if ((j = b5 - m5) != 0)
-                b = pow5mult(b, j);
-        }
-        else
-            b = pow5mult(b, b5);
-    }
-    S = i2b(1);
-    if (s5 > 0)
-        S = pow5mult(S, s5);
-
-    /* Check for special case that d is a normalized power of 2. */
-
-    spec_case = 0;
-    if ((mode < 2 || leftright)
-#ifdef Honor_FLT_ROUNDS
-            && rounding == 1
-#endif
-    ) {
-        if (!word1(d) && !(word0(d) & Bndry_mask)
-#ifndef Sudden_Underflow
-            && word0(d) & (Exp_mask & ~Exp_msk1)
-#endif
-        ) {
-            /* The special case */
-            b2 += Log2P;
-            s2 += Log2P;
-            spec_case = 1;
-        }
-    }
-
-    /* Arrange for convenient computation of quotients:
-     * shift left if necessary so divisor has 4 leading 0 bits.
-     *
-     * Perhaps we should just compute leading 28 bits of S once
-     * and for all and pass them and a shift to quorem, so it
-     * can do shifts and ors to compute the numerator for q.
-     */
-#ifdef Pack_32
-    if ((i = ((s5 ? 32 - hi0bits(S->x[S->wds-1]) : 1) + s2) & 0x1f) != 0)
-        i = 32 - i;
-#else
-    if ((i = ((s5 ? 32 - hi0bits(S->x[S->wds-1]) : 1) + s2) & 0xf) != 0)
-        i = 16 - i;
-#endif
-    if (i > 4) {
-        i -= 4;
-        b2 += i;
-        m2 += i;
-        s2 += i;
-    }
-    else if (i < 4) {
-        i += 28;
-        b2 += i;
-        m2 += i;
-        s2 += i;
-    }
-    if (b2 > 0)
-        b = lshift(b, b2);
-    if (s2 > 0)
-        S = lshift(S, s2);
-    if (k_check) {
-        if (cmp(b,S) < 0) {
-            k--;
-            b = multadd(b, 10, 0);  /* we botched the k estimate */
-            if (leftright)
-                mhi = multadd(mhi, 10, 0);
-            ilim = ilim1;
-        }
-    }
-    if (ilim <= 0 && (mode == 3 || mode == 5)) {
-        if (ilim < 0 || cmp(b,S = multadd(S,5,0)) <= 0) {
-            /* no digits, fcvt style */
-no_digits:
-            k = -1 - ndigits;
-            goto ret;
-        }
-one_digit:
-        *s++ = '1';
-        k++;
-        goto ret;
-    }
-    if (leftright) {
-        if (m2 > 0)
-            mhi = lshift(mhi, m2);
-
-        /* Compute mlo -- check for special case
-         * that d is a normalized power of 2.
-         */
-
-        mlo = mhi;
-        if (spec_case) {
-            mhi = Balloc(mhi->k);
-            Bcopy(mhi, mlo);
-            mhi = lshift(mhi, Log2P);
-        }
-
-        for (i = 1;;i++) {
-            dig = quorem(b,S) + '0';
-            /* Do we yet have the shortest decimal string
-             * that will round to d?
-             */
-            j = cmp(b, mlo);
-            delta = diff(S, mhi);
-            j1 = delta->sign ? 1 : cmp(b, delta);
-            Bfree(delta);
-#ifndef ROUND_BIASED
-            if (j1 == 0 && mode != 1 && !(word1(d) & 1)
-#ifdef Honor_FLT_ROUNDS
-                && rounding >= 1
-#endif
-            ) {
-                if (dig == '9')
-                    goto round_9_up;
-                if (j > 0)
-                    dig++;
-#ifdef SET_INEXACT
-                else if (!b->x[0] && b->wds <= 1)
-                    inexact = 0;
-#endif
-                *s++ = dig;
-                goto ret;
-            }
-#endif
-            if (j < 0 || (j == 0 && mode != 1
-#ifndef ROUND_BIASED
-                && !(word1(d) & 1)
-#endif
-            )) {
-                if (!b->x[0] && b->wds <= 1) {
-#ifdef SET_INEXACT
-                    inexact = 0;
-#endif
-                    goto accept_dig;
-                }
-#ifdef Honor_FLT_ROUNDS
-                if (mode > 1)
-                    switch (rounding) {
-                      case 0: goto accept_dig;
-                      case 2: goto keep_dig;
-                    }
-#endif /*Honor_FLT_ROUNDS*/
-                if (j1 > 0) {
-                    b = lshift(b, 1);
-                    j1 = cmp(b, S);
-                    if ((j1 > 0 || (j1 == 0 && (dig & 1))) && dig++ == '9')
-                        goto round_9_up;
-                }
-accept_dig:
-                *s++ = dig;
-                goto ret;
-            }
-            if (j1 > 0) {
-#ifdef Honor_FLT_ROUNDS
-                if (!rounding)
-                    goto accept_dig;
-#endif
-                if (dig == '9') { /* possible if i == 1 */
-round_9_up:
-                    *s++ = '9';
-                    goto roundoff;
-                }
-                *s++ = dig + 1;
-                goto ret;
-            }
-#ifdef Honor_FLT_ROUNDS
-keep_dig:
-#endif
-            *s++ = dig;
-            if (i == ilim)
-                break;
-            b = multadd(b, 10, 0);
-            if (mlo == mhi)
-                mlo = mhi = multadd(mhi, 10, 0);
-            else {
-                mlo = multadd(mlo, 10, 0);
-                mhi = multadd(mhi, 10, 0);
-            }
-        }
-    }
-    else
-        for (i = 1;; i++) {
-            *s++ = dig = quorem(b,S) + '0';
-            if (!b->x[0] && b->wds <= 1) {
-#ifdef SET_INEXACT
-                inexact = 0;
-#endif
-                goto ret;
-            }
-            if (i >= ilim)
-                break;
-            b = multadd(b, 10, 0);
-        }
-
-    /* Round off last digit */
-
-#ifdef Honor_FLT_ROUNDS
-    switch (rounding) {
-      case 0: goto trimzeros;
-      case 2: goto roundoff;
-    }
-#endif
-    b = lshift(b, 1);
-    j = cmp(b, S);
-    if (j > 0 || (j == 0 && (dig & 1))) {
- roundoff:
-        while (*--s == '9')
-            if (s == s0) {
-                k++;
-                *s++ = '1';
-                goto ret;
-            }
-        if (!half || (*s - '0') & 1)
-            ++*s;
-    }
-    else {
-        while (*--s == '0') ;
-    }
-    s++;
-ret:
-    Bfree(S);
-    if (mhi) {
-        if (mlo && mlo != mhi)
-            Bfree(mlo);
-        Bfree(mhi);
-    }
-ret1:
-#ifdef SET_INEXACT
-    if (inexact) {
-        if (!oldinexact) {
-            word0(d) = Exp_1 + (70 << Exp_shift);
-            word1(d) = 0;
-            dval(d) += 1.;
-        }
-    }
-    else if (!oldinexact)
-        clear_inexact();
-#endif
-    Bfree(b);
-    *s = 0;
-    *decpt = k + 1;
-    if (rve)
-        *rve = s;
-    return s0;
-}
-
-/*-
- * Copyright (c) 2004-2008 David Schultz <das@FreeBSD.ORG>
- * All rights reserved.
- *
- * 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.
- * 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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#define	DBL_MANH_SIZE	20
-#define	DBL_MANL_SIZE	32
-#define	DBL_ADJ	(DBL_MAX_EXP - 2)
-#define	SIGFIGS	((DBL_MANT_DIG + 3) / 4 + 1)
-#define dexp_get(u) ((int)(word0(u) >> Exp_shift) & ~Exp_msk1)
-#define dexp_set(u,v) (word0(u) = (((int)(word0(u)) & ~Exp_mask) | ((v) << Exp_shift)))
-#define dmanh_get(u) ((uint32_t)(word0(u) & Frac_mask))
-#define dmanl_get(u) ((uint32_t)word1(u))
-
-
-/*
- * This procedure converts a double-precision number in IEEE format
- * into a string of hexadecimal digits and an exponent of 2.  Its
- * behavior is bug-for-bug compatible with dtoa() in mode 2, with the
- * following exceptions:
- *
- * - An ndigits < 0 causes it to use as many digits as necessary to
- *   represent the number exactly.
- * - The additional xdigs argument should point to either the string
- *   "0123456789ABCDEF" or the string "0123456789abcdef", depending on
- *   which case is desired.
- * - This routine does not repeat dtoa's mistake of setting decpt
- *   to 9999 in the case of an infinity or NaN.  INT_MAX is used
- *   for this purpose instead.
- *
- * Note that the C99 standard does not specify what the leading digit
- * should be for non-zero numbers.  For instance, 0x1.3p3 is the same
- * as 0x2.6p2 is the same as 0x4.cp3.  This implementation always makes
- * the leading digit a 1. This ensures that the exponent printed is the
- * actual base-2 exponent, i.e., ilogb(d).
- *
- * Inputs:	d, xdigs, ndigits
- * Outputs:	decpt, sign, rve
- */
-char *
-hdtoa(double d, const char *xdigs, int ndigits, int *decpt, int *sign, char **rve)
-{
-	U u;
-	char *s, *s0;
-	int bufsize;
-	uint32_t manh, manl;
-
-	u.d = d;
-	if (word0(u) & Sign_bit) {
-	    /* set sign for everything, including 0's and NaNs */
-	    *sign = 1;
-	    word0(u) &= ~Sign_bit;  /* clear sign bit */
-	}
-	else
-	    *sign = 0;
-
-	if (isinf(d)) { /* FP_INFINITE */
-	    *decpt = INT_MAX;
-	    return rv_strdup(INFSTR, rve);
-	}
-	else if (isnan(d)) { /* FP_NAN */
-	    *decpt = INT_MAX;
-	    return rv_strdup(NANSTR, rve);
-	}
-	else if (d == 0.0) { /* FP_ZERO */
-	    *decpt = 1;
-	    return rv_strdup(ZEROSTR, rve);
-	}
-	else if (dexp_get(u)) { /* FP_NORMAL */
-	    *decpt = dexp_get(u) - DBL_ADJ;
-	}
-	else { /* FP_SUBNORMAL */
-	    u.d *= 5.363123171977039e+154 /* 0x1p514 */;
-	    *decpt = dexp_get(u) - (514 + DBL_ADJ);
-	}
-
-	if (ndigits == 0)		/* dtoa() compatibility */
-		ndigits = 1;
-
-	/*
-	 * If ndigits < 0, we are expected to auto-size, so we allocate
-	 * enough space for all the digits.
-	 */
-	bufsize = (ndigits > 0) ? ndigits : SIGFIGS;
-	s0 = rv_alloc(bufsize+1);
-
-	/* Round to the desired number of digits. */
-	if (SIGFIGS > ndigits && ndigits > 0) {
-		float redux = 1.0f;
-		int offset = 4 * ndigits + DBL_MAX_EXP - 4 - DBL_MANT_DIG;
-		dexp_set(u, offset);
-		u.d += redux;
-		u.d -= redux;
-		*decpt += dexp_get(u) - offset;
-	}
-
-	manh = dmanh_get(u);
-	manl = dmanl_get(u);
-	*s0 = '1';
-	for (s = s0 + 1; s < s0 + bufsize; s++) {
-		*s = xdigs[(manh >> (DBL_MANH_SIZE - 4)) & 0xf];
-		manh = (manh << 4) | (manl >> (DBL_MANL_SIZE - 4));
-		manl <<= 4;
-	}
-
-	/* If ndigits < 0, we are expected to auto-size the precision. */
-	if (ndigits < 0) {
-		for (ndigits = SIGFIGS; s0[ndigits - 1] == '0'; ndigits--)
-			;
-	}
-
-	s = s0 + ndigits;
-	*s = '\0';
-	if (rve != NULL)
-		*rve = s;
-	return (s0);
-}
-
-#ifdef __cplusplus
-#if 0
-{ /* satisfy cc-mode */
-#endif
-}
-#endif
diff --git a/ext/bigdecimal/sample/linear.rb b/ext/bigdecimal/sample/linear.rb
deleted file mode 100644
index 516c2473be8fce..00000000000000
--- a/ext/bigdecimal/sample/linear.rb
+++ /dev/null
@@ -1,74 +0,0 @@
-#!/usr/local/bin/ruby
-# frozen_string_literal: false
-
-#
-# linear.rb
-#
-# Solves linear equation system(A*x = b) by LU decomposition method.
-#  where  A is a coefficient matrix,x is an answer vector,b is a constant vector.
-#
-# USAGE:
-#   ruby linear.rb [input file solved]
-#
-
-# :stopdoc:
-require "bigdecimal"
-require "bigdecimal/ludcmp"
-
-#
-# NOTE:
-#   Change following BigDecimal.limit() if needed.
-BigDecimal.limit(100)
-#
-
-include LUSolve
-def rd_order(na)
-   printf("Number of equations ?") if(na <= 0)
-   n = ARGF.gets().to_i
-end
-
-na   = ARGV.size
-zero = BigDecimal("0.0")
-one  = BigDecimal("1.0")
-
-while (n=rd_order(na))>0
-  a = []
-  as= []
-  b = []
-  if na <= 0
-     # Read data from console.
-     printf("\nEnter coefficient matrix element A[i,j]\n")
-     for i in 0...n do
-       for j in 0...n do
-         printf("A[%d,%d]? ",i,j); s = ARGF.gets
-         a  << BigDecimal(s)
-         as << BigDecimal(s)
-       end
-       printf("Contatant vector element b[%d] ? ",i)
-       b << BigDecimal(ARGF.gets)
-     end
-  else
-     # Read data from specified file.
-     printf("Coefficient matrix and constant vector.\n")
-     for i in 0...n do
-       s = ARGF.gets
-       printf("%d) %s",i,s)
-       s = s.split
-       for j in 0...n do
-         a  << BigDecimal(s[j])
-         as << BigDecimal(s[j])
-       end
-       b << BigDecimal(s[n])
-     end
-  end
-  x = lusolve(a,b,ludecomp(a,n,zero,one),zero)
-  printf("Answer(x[i] & (A*x-b)[i]) follows\n")
-  for i in 0...n do
-     printf("x[%d]=%s ",i,x[i].to_s)
-     s = zero
-     for j in 0...n do
-       s = s + as[i*n+j]*x[j]
-     end
-     printf(" & %s\n",(s-b[i]).to_s)
-  end
-end
diff --git a/ext/bigdecimal/sample/nlsolve.rb b/ext/bigdecimal/sample/nlsolve.rb
deleted file mode 100644
index c2227dac739ba7..00000000000000
--- a/ext/bigdecimal/sample/nlsolve.rb
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/usr/local/bin/ruby
-# frozen_string_literal: false
-
-#
-# nlsolve.rb
-# An example for solving nonlinear algebraic equation system.
-#
-
-require "bigdecimal"
-require "bigdecimal/newton"
-include Newton
-
-class Function # :nodoc: all
-  def initialize()
-    @zero = BigDecimal("0.0")
-    @one  = BigDecimal("1.0")
-    @two  = BigDecimal("2.0")
-    @ten  = BigDecimal("10.0")
-    @eps  = BigDecimal("1.0e-16")
-  end
-  def zero;@zero;end
-  def one ;@one ;end
-  def two ;@two ;end
-  def ten ;@ten ;end
-  def eps ;@eps ;end
-  def values(x) # <= defines functions solved
-    f = []
-    f1 = x[0]*x[0] + x[1]*x[1] - @two # f1 = x**2 + y**2 - 2 => 0
-    f2 = x[0] - x[1]                  # f2 = x    - y        => 0
-    f <<= f1
-    f <<= f2
-    f
-  end
-end
-
-f = BigDecimal.limit(100)
-f = Function.new
-x = [f.zero,f.zero]      # Initial values
-n = nlsolve(f,x)
-p x
diff --git a/ext/bigdecimal/sample/pi.rb b/ext/bigdecimal/sample/pi.rb
deleted file mode 100644
index ea9663896c2a21..00000000000000
--- a/ext/bigdecimal/sample/pi.rb
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/usr/local/bin/ruby
-# frozen_string_literal: false
-
-#
-# pi.rb
-#
-# Calculates 3.1415.... (the number of times that a circle's diameter
-# will fit around the circle) using J. Machin's formula.
-#
-
-require "bigdecimal"
-require "bigdecimal/math.rb"
-
-include BigMath
-
-if ARGV.size == 1
-    print "PI("+ARGV[0]+"):\n"
-    p PI(ARGV[0].to_i)
-else
-    print "TRY: ruby pi.rb 1000 \n"
-end
diff --git a/ext/bigdecimal/static_assert.h b/ext/bigdecimal/static_assert.h
deleted file mode 100644
index 9295729bf6a61c..00000000000000
--- a/ext/bigdecimal/static_assert.h
+++ /dev/null
@@ -1,54 +0,0 @@
-#ifndef BIGDECIMAL_STATIC_ASSERT_H
-#define BIGDECIMAL_STATIC_ASSERT_H
-
-#include "feature.h"
-
-#ifdef HAVE_RUBY_INTERNAL_STATIC_ASSERT_H
-# include <ruby/internal/static_assert.h>
-#endif
-
-#ifdef RBIMPL_STATIC_ASSERT
-# define STATIC_ASSERT RBIMPL_STATIC_ASSERT
-#endif
-
-#ifndef STATIC_ASSERT
-# /* The following section is copied from CRuby's static_assert.h */
-
-# if defined(__cplusplus) && defined(__cpp_static_assert)
-#  /* https://isocpp.org/std/standing-documents/sd-6-sg10-feature-test-recommendations */
-#  define BIGDECIMAL_STATIC_ASSERT0 static_assert
-
-# elif defined(__cplusplus) && defined(_MSC_VER) && _MSC_VER >= 1600
-#  define BIGDECIMAL_STATIC_ASSERT0 static_assert
-
-# elif defined(__INTEL_CXX11_MODE__)
-#  define BIGDECIMAL_STATIC_ASSERT0 static_assert
-
-# elif defined(__cplusplus) && __cplusplus >= 201103L
-#  define BIGDECIMAL_STATIC_ASSERT0 static_assert
-
-# elif defined(__cplusplus) && __has_extension(cxx_static_assert)
-#  define BIGDECIMAL_STATIC_ASSERT0 __extension__ static_assert
-
-# elif defined(__STDC_VERSION__) && __has_extension(c_static_assert)
-#  define BIGDECIMAL_STATIC_ASSERT0 __extension__ _Static_assert
-
-# elif defined(__STDC_VERSION__) && defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6))
-#  define BIGDECIMAL_STATIC_ASSERT0 __extension__ _Static_assert
-#endif
-
-# if defined(__DOXYGEN__)
-#  define STATIC_ASSERT static_assert
-
-# elif defined(BIGDECIMAL_STATIC_ASSERT0)
-#  define STATIC_ASSERT(name, expr) \
-    BIGDECIMAL_STATIC_ASSERT0(expr, #name ": " #expr)
-
-# else
-#  define STATIC_ASSERT(name, expr) \
-    typedef int static_assert_ ## name ## _check[1 - 2 * !(expr)]
-# endif
-#endif /* STATIC_ASSERT */
-
-
-#endif /* BIGDECIMAL_STATIC_ASSERT_H */
diff --git a/ext/cgi/escape/depend b/ext/cgi/escape/depend
index 37304a24f4b5bf..05b59bfdea351d 100644
--- a/ext/cgi/escape/depend
+++ b/ext/cgi/escape/depend
@@ -138,6 +138,7 @@ escape.o: $(hdrdir)/ruby/internal/intern/re.h
 escape.o: $(hdrdir)/ruby/internal/intern/ruby.h
 escape.o: $(hdrdir)/ruby/internal/intern/select.h
 escape.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+escape.o: $(hdrdir)/ruby/internal/intern/set.h
 escape.o: $(hdrdir)/ruby/internal/intern/signal.h
 escape.o: $(hdrdir)/ruby/internal/intern/sprintf.h
 escape.o: $(hdrdir)/ruby/internal/intern/string.h
@@ -157,6 +158,7 @@ escape.o: $(hdrdir)/ruby/internal/special_consts.h
 escape.o: $(hdrdir)/ruby/internal/static_assert.h
 escape.o: $(hdrdir)/ruby/internal/stdalign.h
 escape.o: $(hdrdir)/ruby/internal/stdbool.h
+escape.o: $(hdrdir)/ruby/internal/stdckdint.h
 escape.o: $(hdrdir)/ruby/internal/symbol.h
 escape.o: $(hdrdir)/ruby/internal/value.h
 escape.o: $(hdrdir)/ruby/internal/value_type.h
diff --git a/ext/cgi/escape/escape.c b/ext/cgi/escape/escape.c
index c5b76de596efb5..6b00bc37c1753f 100644
--- a/ext/cgi/escape/escape.c
+++ b/ext/cgi/escape/escape.c
@@ -8,7 +8,7 @@ RUBY_EXTERN const signed char ruby_digit36_to_number_table[];
 #define upper_hexdigits (ruby_hexdigits+16)
 #define char_to_number(c) ruby_digit36_to_number_table[(unsigned char)(c)]
 
-static VALUE rb_cCGI, rb_mUtil, rb_mEscape;
+static VALUE rb_cCGI, rb_mEscape, rb_mEscapeExt;
 static ID id_accept_charset;
 
 #define HTML_ESCAPE_MAX_LEN 6
@@ -83,7 +83,7 @@ optimized_unescape_html(VALUE str)
     unsigned long charlimit = (strcasecmp(rb_enc_name(enc), "UTF-8") == 0 ? UNICODE_MAX :
                                strcasecmp(rb_enc_name(enc), "ISO-8859-1") == 0 ? 256 :
                                128);
-    long i, len, beg = 0;
+    long i, j, len, beg = 0;
     size_t clen, plen;
     int overflow;
     const char *cstr;
@@ -100,6 +100,7 @@ optimized_unescape_html(VALUE str)
         plen = i - beg;
         if (++i >= len) break;
         c = (unsigned char)cstr[i];
+        j = i;
 #define MATCH(s) (len - i >= (int)rb_strlen_lit(s) && \
                   memcmp(&cstr[i], s, rb_strlen_lit(s)) == 0 && \
                   (i += rb_strlen_lit(s) - 1, 1))
@@ -112,28 +113,40 @@ optimized_unescape_html(VALUE str)
             else if (MATCH("mp;")) {
                 c = '&';
             }
-            else continue;
+            else {
+                i = j;
+                continue;
+            }
             break;
           case 'q':
             ++i;
             if (MATCH("uot;")) {
                 c = '"';
             }
-            else continue;
+            else {
+                i = j;
+                continue;
+            }
             break;
           case 'g':
             ++i;
             if (MATCH("t;")) {
                 c = '>';
             }
-            else continue;
+            else {
+                i = j;
+                continue;
+            }
             break;
           case 'l':
             ++i;
             if (MATCH("t;")) {
                 c = '<';
             }
-            else continue;
+            else {
+                i = j;
+                continue;
+            }
             break;
           case '#':
             if (len - ++i >= 2 && ISDIGIT(cstr[i])) {
@@ -142,9 +155,15 @@ optimized_unescape_html(VALUE str)
             else if ((cstr[i] == 'x' || cstr[i] == 'X') && len - ++i >= 2 && ISXDIGIT(cstr[i])) {
                 cc = ruby_scan_digits(&cstr[i], len-i, 16, &clen, &overflow);
             }
-            else continue;
+            else {
+                i = j;
+                continue;
+            }
             i += clen;
-            if (overflow || cc >= charlimit || cstr[i] != ';') continue;
+            if (overflow || cc >= charlimit || cstr[i] != ';') {
+                i = j;
+                continue;
+            }
             if (!dest) {
                 dest = rb_str_buf_new(len);
             }
@@ -452,15 +471,17 @@ Init_escape(void)
 void
 InitVM_escape(void)
 {
-    rb_cCGI    = rb_define_class("CGI", rb_cObject);
-    rb_mEscape = rb_define_module_under(rb_cCGI, "Escape");
-    rb_mUtil   = rb_define_module_under(rb_cCGI, "Util");
-    rb_define_method(rb_mEscape, "escapeHTML", cgiesc_escape_html, 1);
-    rb_define_method(rb_mEscape, "unescapeHTML", cgiesc_unescape_html, 1);
-    rb_define_method(rb_mEscape, "escapeURIComponent", cgiesc_escape_uri_component, 1);
-    rb_define_method(rb_mEscape, "unescapeURIComponent", cgiesc_unescape_uri_component, -1);
-    rb_define_method(rb_mEscape, "escape", cgiesc_escape, 1);
-    rb_define_method(rb_mEscape, "unescape", cgiesc_unescape, -1);
-    rb_prepend_module(rb_mUtil, rb_mEscape);
-    rb_extend_object(rb_cCGI, rb_mEscape);
+    rb_cCGI       = rb_define_class("CGI", rb_cObject);
+    rb_mEscapeExt = rb_define_module_under(rb_cCGI, "EscapeExt");
+    rb_mEscape    = rb_define_module_under(rb_cCGI, "Escape");
+    rb_define_method(rb_mEscapeExt, "escapeHTML", cgiesc_escape_html, 1);
+    rb_define_method(rb_mEscapeExt, "unescapeHTML", cgiesc_unescape_html, 1);
+    rb_define_method(rb_mEscapeExt, "escapeURIComponent", cgiesc_escape_uri_component, 1);
+    rb_define_alias(rb_mEscapeExt, "escape_uri_component", "escapeURIComponent");
+    rb_define_method(rb_mEscapeExt, "unescapeURIComponent", cgiesc_unescape_uri_component, -1);
+    rb_define_alias(rb_mEscapeExt, "unescape_uri_component", "unescapeURIComponent");
+    rb_define_method(rb_mEscapeExt, "escape", cgiesc_escape, 1);
+    rb_define_method(rb_mEscapeExt, "unescape", cgiesc_unescape, -1);
+    rb_prepend_module(rb_mEscape, rb_mEscapeExt);
+    rb_extend_object(rb_cCGI, rb_mEscapeExt);
 }
diff --git a/ext/continuation/depend b/ext/continuation/depend
index f0333d7fe6377a..b395d3d4d7a1bb 100644
--- a/ext/continuation/depend
+++ b/ext/continuation/depend
@@ -127,6 +127,7 @@ continuation.o: $(hdrdir)/ruby/internal/intern/re.h
 continuation.o: $(hdrdir)/ruby/internal/intern/ruby.h
 continuation.o: $(hdrdir)/ruby/internal/intern/select.h
 continuation.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+continuation.o: $(hdrdir)/ruby/internal/intern/set.h
 continuation.o: $(hdrdir)/ruby/internal/intern/signal.h
 continuation.o: $(hdrdir)/ruby/internal/intern/sprintf.h
 continuation.o: $(hdrdir)/ruby/internal/intern/string.h
@@ -146,6 +147,7 @@ continuation.o: $(hdrdir)/ruby/internal/special_consts.h
 continuation.o: $(hdrdir)/ruby/internal/static_assert.h
 continuation.o: $(hdrdir)/ruby/internal/stdalign.h
 continuation.o: $(hdrdir)/ruby/internal/stdbool.h
+continuation.o: $(hdrdir)/ruby/internal/stdckdint.h
 continuation.o: $(hdrdir)/ruby/internal/symbol.h
 continuation.o: $(hdrdir)/ruby/internal/value.h
 continuation.o: $(hdrdir)/ruby/internal/value_type.h
diff --git a/ext/coverage/coverage.c b/ext/coverage/coverage.c
index a3381901ee4ad1..1519b559cdafc1 100644
--- a/ext/coverage/coverage.c
+++ b/ext/coverage/coverage.c
@@ -243,8 +243,8 @@ method_coverage_i(void *vstart, void *vend, size_t stride, void *data)
     VALUE ncoverages = *(VALUE*)data, v;
 
     for (v = (VALUE)vstart; v != (VALUE)vend; v += stride) {
-        void *poisoned = asan_poisoned_object_p(v);
-        asan_unpoison_object(v, false);
+        void *poisoned = rb_asan_poisoned_object_p(v);
+        rb_asan_unpoison_object(v, false);
 
         if (RB_TYPE_P(v, T_IMEMO) && imemo_type(v) == imemo_ment) {
             const rb_method_entry_t *me = (rb_method_entry_t *) v;
@@ -287,7 +287,7 @@ method_coverage_i(void *vstart, void *vend, size_t stride, void *data)
         }
 
         if (poisoned) {
-            asan_poison_object(v);
+            rb_asan_poison_object(v);
         }
     }
     return 0;
@@ -353,7 +353,8 @@ rb_coverage_peek_result(VALUE klass)
         rb_raise(rb_eRuntimeError, "coverage measurement is not enabled");
     }
     OBJ_WB_UNPROTECT(coverages);
-    st_foreach(RHASH_TBL_RAW(coverages), coverage_peek_result_i, ncoverages);
+
+    rb_hash_foreach(coverages, coverage_peek_result_i, ncoverages);
 
     if (current_mode & COVERAGE_TARGET_METHODS) {
         rb_objspace_each_objects(method_coverage_i, &ncoverages);
diff --git a/ext/coverage/depend b/ext/coverage/depend
index 0a6c61d5c64658..e042bac7c4dc8b 100644
--- a/ext/coverage/depend
+++ b/ext/coverage/depend
@@ -140,6 +140,7 @@ coverage.o: $(hdrdir)/ruby/internal/intern/re.h
 coverage.o: $(hdrdir)/ruby/internal/intern/ruby.h
 coverage.o: $(hdrdir)/ruby/internal/intern/select.h
 coverage.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+coverage.o: $(hdrdir)/ruby/internal/intern/set.h
 coverage.o: $(hdrdir)/ruby/internal/intern/signal.h
 coverage.o: $(hdrdir)/ruby/internal/intern/sprintf.h
 coverage.o: $(hdrdir)/ruby/internal/intern/string.h
@@ -159,6 +160,7 @@ coverage.o: $(hdrdir)/ruby/internal/special_consts.h
 coverage.o: $(hdrdir)/ruby/internal/static_assert.h
 coverage.o: $(hdrdir)/ruby/internal/stdalign.h
 coverage.o: $(hdrdir)/ruby/internal/stdbool.h
+coverage.o: $(hdrdir)/ruby/internal/stdckdint.h
 coverage.o: $(hdrdir)/ruby/internal/symbol.h
 coverage.o: $(hdrdir)/ruby/internal/value.h
 coverage.o: $(hdrdir)/ruby/internal/value_type.h
@@ -185,8 +187,10 @@ 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/namespace.h
 coverage.o: $(top_srcdir)/internal/sanitizers.h
 coverage.o: $(top_srcdir)/internal/serial.h
+coverage.o: $(top_srcdir)/internal/set_table.h
 coverage.o: $(top_srcdir)/internal/static_assert.h
 coverage.o: $(top_srcdir)/internal/thread.h
 coverage.o: $(top_srcdir)/internal/variable.h
diff --git a/ext/date/date.gemspec b/ext/date/date.gemspec
index 660353ebc5963b..cb439bd0a56e9b 100644
--- a/ext/date/date.gemspec
+++ b/ext/date/date.gemspec
@@ -7,8 +7,8 @@ end
 Gem::Specification.new do |s|
   s.name = "date"
   s.version = version
-  s.summary = "A subclass of Object includes Comparable module for handling dates."
-  s.description = "A subclass of Object includes Comparable module for handling dates."
+  s.summary = "The official date library for Ruby."
+  s.description = "The official date library for Ruby."
 
   if Gem::Platform === s.platform and s.platform =~ 'java' or RUBY_ENGINE == 'jruby'
     s.platform = 'java'
@@ -17,7 +17,7 @@ Gem::Specification.new do |s|
     s.require_path = %w{lib}
 
     s.files = [
-      "README.md",
+      "README.md", "COPYING", "BSDL",
       "lib/date.rb", "ext/date/date_core.c", "ext/date/date_parse.c", "ext/date/date_strftime.c",
       "ext/date/date_strptime.c", "ext/date/date_tmx.h", "ext/date/extconf.rb", "ext/date/prereq.mk",
       "ext/date/zonetab.h", "ext/date/zonetab.list"
@@ -31,4 +31,6 @@ Gem::Specification.new do |s|
   s.email = [nil]
   s.homepage = "https://github.com/ruby/date"
   s.licenses = ["Ruby", "BSD-2-Clause"]
+
+  s.metadata["changelog_uri"] = s.homepage + "/releases"
 end
diff --git a/ext/date/date_core.c b/ext/date/date_core.c
index f2baf4fcea813d..dbee067f6baa8e 100644
--- a/ext/date/date_core.c
+++ b/ext/date/date_core.c
@@ -57,7 +57,7 @@ static VALUE sym_hour, sym_min, sym_sec, sym_sec_fraction, sym_zone;
 #define f_add3(x,y,z) f_add(f_add(x, y), z)
 #define f_sub3(x,y,z) f_sub(f_sub(x, y), z)
 
-#define f_frozen_ary(...) rb_obj_freeze(rb_ary_new3(__VA_ARGS__))
+#define f_frozen_ary(...) rb_ary_freeze(rb_ary_new3(__VA_ARGS__))
 
 static VALUE date_initialize(int argc, VALUE *argv, VALUE self);
 static VALUE datetime_initialize(int argc, VALUE *argv, VALUE self);
@@ -248,6 +248,11 @@ f_negative_p(VALUE x)
 #define date_sg_t double
 #endif
 
+#define JULIAN_EPOCH_DATE "-4712-01-01"
+#define JULIAN_EPOCH_DATETIME JULIAN_EPOCH_DATE "T00:00:00+00:00"
+#define JULIAN_EPOCH_DATETIME_RFC3339 "Mon, 1 Jan -4712 00:00:00 +0000"
+#define JULIAN_EPOCH_DATETIME_HTTPDATE "Mon, 01 Jan -4712 00:00:00 GMT"
+
 /* A set of nth, jd, df and sf denote ajd + 1/2.  Each ajd begin at
  * noon of GMT (assume equal to UTC).  However, this begins at
  * midnight.
@@ -1594,7 +1599,7 @@ m_ajd(union DateData *x)
 
     if (simple_dat_p(x)) {
 	r = m_real_jd(x);
-	if (FIXNUM_P(r) && FIX2LONG(r) <= (FIXNUM_MAX / 2)) {
+	if (FIXNUM_P(r) && FIX2LONG(r) <= (FIXNUM_MAX / 2) && FIX2LONG(r) >= (FIXNUM_MIN + 1) / 2) {
 	    long ir = FIX2LONG(r);
 	    ir = ir * 2 - 1;
 	    return rb_rational_new2(LONG2FIX(ir), INT2FIX(2));
@@ -2493,7 +2498,7 @@ date_s__valid_jd_p(int argc, VALUE *argv, VALUE klass)
  *
  *   Date.valid_jd?(2451944) # => true
  *
- * See argument {start}[rdoc-ref:calendars.rdoc@Argument+start].
+ * See argument {start}[rdoc-ref:date/calendars.rdoc@Argument+start].
  *
  * Related: Date.jd.
  */
@@ -2587,7 +2592,7 @@ date_s__valid_civil_p(int argc, VALUE *argv, VALUE klass)
  *   Date.valid_date?(2001, 2, 29) # => false
  *   Date.valid_date?(2001, 2, -1) # => true
  *
- * See argument {start}[rdoc-ref:calendars.rdoc@Argument+start].
+ * See argument {start}[rdoc-ref:date/calendars.rdoc@Argument+start].
  *
  * Related: Date.jd, Date.new.
  */
@@ -2675,7 +2680,7 @@ date_s__valid_ordinal_p(int argc, VALUE *argv, VALUE klass)
  *   Date.valid_ordinal?(2001, 34)  # => true
  *   Date.valid_ordinal?(2001, 366) # => false
  *
- * See argument {start}[rdoc-ref:calendars.rdoc@Argument+start].
+ * See argument {start}[rdoc-ref:date/calendars.rdoc@Argument+start].
  *
  * Related: Date.jd, Date.ordinal.
  */
@@ -2765,7 +2770,7 @@ date_s__valid_commercial_p(int argc, VALUE *argv, VALUE klass)
  *
  * See Date.commercial.
  *
- * See argument {start}[rdoc-ref:calendars.rdoc@Argument+start].
+ * See argument {start}[rdoc-ref:date/calendars.rdoc@Argument+start].
  *
  * Related: Date.jd, Date.commercial.
  */
@@ -3345,7 +3350,7 @@ static VALUE d_lite_plus(VALUE, VALUE);
  *
  *     Date.jd(Date::ITALY - 1).julian?    # => true
  *
- * See argument {start}[rdoc-ref:calendars.rdoc@Argument+start].
+ * See argument {start}[rdoc-ref:date/calendars.rdoc@Argument+start].
  *
  * Related: Date.new.
  */
@@ -3410,7 +3415,7 @@ date_s_jd(int argc, VALUE *argv, VALUE klass)
  *
  * Raises an exception if +yday+ is zero or out of range.
  *
- * See argument {start}[rdoc-ref:calendars.rdoc@Argument+start].
+ * See argument {start}[rdoc-ref:date/calendars.rdoc@Argument+start].
  *
  * Related: Date.jd, Date.new.
  */
@@ -3487,7 +3492,7 @@ date_s_civil(int argc, VALUE *argv, VALUE klass)
  * where +n+ is the number of days in the month;
  * when the argument is negative, counts backward from the end of the month.
  *
- * See argument {start}[rdoc-ref:calendars.rdoc@Argument+start].
+ * See argument {start}[rdoc-ref:date/calendars.rdoc@Argument+start].
  *
  * Related: Date.jd.
  */
@@ -3593,7 +3598,7 @@ date_initialize(int argc, VALUE *argv, VALUE self)
  *     Date.commercial(2020, 1, 1).to_s # => "2019-12-30"
        Date.commercial(2020, 1, 7).to_s # => "2020-01-05"
  *
- * See argument {start}[rdoc-ref:calendars.rdoc@Argument+start].
+ * See argument {start}[rdoc-ref:date/calendars.rdoc@Argument+start].
  *
  * Related: Date.jd, Date.new, Date.ordinal.
  */
@@ -3778,7 +3783,7 @@ static void set_sg(union DateData *, double);
  *
  *   Date.today.to_s # => "2022-07-06"
  *
- * See argument {start}[rdoc-ref:calendars.rdoc@Argument+start].
+ * See argument {start}[rdoc-ref:date/calendars.rdoc@Argument+start].
  *
  */
 static VALUE
@@ -3873,7 +3878,6 @@ static VALUE
 rt_complete_frags(VALUE klass, VALUE hash)
 {
     static VALUE tab = Qnil;
-    int g;
     long e;
     VALUE k, a, d;
 
@@ -3970,9 +3974,13 @@ rt_complete_frags(VALUE klass, VALUE hash)
 	rb_gc_register_mark_object(tab);
     }
 
+    k = Qnil;
+
     {
-	long i, eno = 0, idx = 0;
+	long i, eno = 0;
+	VALUE t = Qnil;
 
+	e = 0;
 	for (i = 0; i < RARRAY_LEN(tab); i++) {
 	    VALUE x, a;
 
@@ -3987,23 +3995,20 @@ rt_complete_frags(VALUE klass, VALUE hash)
 			n++;
 		if (n > eno) {
 		    eno = n;
-		    idx = i;
+		    t = x;
 		}
 	    }
 	}
-	if (eno == 0)
-	    g = 0;
-	else {
-	    g = 1;
-	    k = RARRAY_AREF(RARRAY_AREF(tab, idx), 0);
-	    a = RARRAY_AREF(RARRAY_AREF(tab, idx), 1);
-	    e =	eno;
+	if (eno > 0) {
+	    k = RARRAY_AREF(t, 0);
+	    a = RARRAY_AREF(t, 1);
 	}
+	e = eno;
     }
 
     d = Qnil;
 
-    if (g && !NIL_P(k) && (RARRAY_LEN(a) - e)) {
+    if (!NIL_P(k) && (RARRAY_LEN(a) > e)) {
 	if (k == sym("ordinal")) {
 	    if (NIL_P(ref_hash("year"))) {
 		if (NIL_P(d))
@@ -4090,7 +4095,7 @@ rt_complete_frags(VALUE klass, VALUE hash)
 	}
     }
 
-    if (g && k == sym("time")) {
+    if (k == sym("time")) {
 	if (f_le_p(klass, cDateTime)) {
 	    if (NIL_P(d))
 		d = date_s_today(0, (VALUE *)0, cDate);
@@ -4410,7 +4415,7 @@ date_s__strptime(int argc, VALUE *argv, VALUE klass)
  * {Formats for Dates and Times}[rdoc-ref:strftime_formatting.rdoc].
  * (Unlike Date.strftime, does not support flags and width.)
  *
- * See argument {start}[rdoc-ref:calendars.rdoc@Argument+start].
+ * See argument {start}[rdoc-ref:date/calendars.rdoc@Argument+start].
  *
  * See also {strptime(3)}[https://man7.org/linux/man-pages/man3/strptime.3.html].
  *
@@ -4425,7 +4430,7 @@ date_s_strptime(int argc, VALUE *argv, VALUE klass)
 
     switch (argc) {
       case 0:
-	str = rb_str_new2("-4712-01-01");
+	str = rb_str_new2(JULIAN_EPOCH_DATE);
       case 1:
 	fmt = rb_str_new2("%F");
       case 2:
@@ -4464,12 +4469,6 @@ check_limit(VALUE str, VALUE opt)
 {
     size_t slen, limit;
     if (NIL_P(str)) return;
-    if (SYMBOL_P(str)) {
-	rb_category_warn(RB_WARN_CATEGORY_DEPRECATED,
-			 "The ability to parse Symbol is an unintentional bug and is deprecated");
-	str = rb_sym2str(str);
-    }
-
     StringValue(str);
     slen = RSTRING_LEN(str);
     limit = get_limit(opt);
@@ -4484,8 +4483,7 @@ date_s__parse_internal(int argc, VALUE *argv, VALUE klass)
 {
     VALUE vstr, vcomp, hash, opt;
 
-    rb_scan_args(argc, argv, "11:", &vstr, &vcomp, &opt);
-    if (!NIL_P(opt)) argc--;
+    argc = rb_scan_args(argc, argv, "11:", &vstr, &vcomp, &opt);
     check_limit(vstr, opt);
     StringValue(vstr);
     if (!rb_enc_str_asciicompat_p(vstr))
@@ -4562,7 +4560,7 @@ date_s__parse(int argc, VALUE *argv, VALUE klass)
  *
  * See:
  *
- * - Argument {start}[rdoc-ref:calendars.rdoc@Argument+start].
+ * - Argument {start}[rdoc-ref:date/calendars.rdoc@Argument+start].
  * - Argument {limit}[rdoc-ref:Date@Argument+limit].
  *
  * Related: Date._parse (returns a hash).
@@ -4572,12 +4570,11 @@ date_s_parse(int argc, VALUE *argv, VALUE klass)
 {
     VALUE str, comp, sg, opt;
 
-    rb_scan_args(argc, argv, "03:", &str, &comp, &sg, &opt);
-    if (!NIL_P(opt)) argc--;
+    argc = rb_scan_args(argc, argv, "03:", &str, &comp, &sg, &opt);
 
     switch (argc) {
       case 0:
-	str = rb_str_new2("-4712-01-01");
+	str = rb_str_new2(JULIAN_EPOCH_DATE);
       case 1:
 	comp = Qtrue;
       case 2:
@@ -4642,7 +4639,7 @@ date_s__iso8601(int argc, VALUE *argv, VALUE klass)
  *
  * See:
  *
- * - Argument {start}[rdoc-ref:calendars.rdoc@Argument+start].
+ * - Argument {start}[rdoc-ref:date/calendars.rdoc@Argument+start].
  * - Argument {limit}[rdoc-ref:Date@Argument+limit].
  *
  * Related: Date._iso8601 (returns a hash).
@@ -4652,12 +4649,11 @@ date_s_iso8601(int argc, VALUE *argv, VALUE klass)
 {
     VALUE str, sg, opt;
 
-    rb_scan_args(argc, argv, "02:", &str, &sg, &opt);
-    if (!NIL_P(opt)) argc--;
+    argc = rb_scan_args(argc, argv, "02:", &str, &sg, &opt);
 
     switch (argc) {
       case 0:
-	str = rb_str_new2("-4712-01-01");
+	str = rb_str_new2(JULIAN_EPOCH_DATE);
       case 1:
 	sg = INT2FIX(DEFAULT_SG);
     }
@@ -4713,7 +4709,7 @@ date_s__rfc3339(int argc, VALUE *argv, VALUE klass)
  *
  * See:
  *
- * - Argument {start}[rdoc-ref:calendars.rdoc@Argument+start].
+ * - Argument {start}[rdoc-ref:date/calendars.rdoc@Argument+start].
  * - Argument {limit}[rdoc-ref:Date@Argument+limit].
  *
  * Related: Date._rfc3339 (returns a hash).
@@ -4723,12 +4719,11 @@ date_s_rfc3339(int argc, VALUE *argv, VALUE klass)
 {
     VALUE str, sg, opt;
 
-    rb_scan_args(argc, argv, "02:", &str, &sg, &opt);
-    if (!NIL_P(opt)) argc--;
+    argc = rb_scan_args(argc, argv, "02:", &str, &sg, &opt);
 
     switch (argc) {
       case 0:
-	str = rb_str_new2("-4712-01-01T00:00:00+00:00");
+	str = rb_str_new2(JULIAN_EPOCH_DATETIME);
       case 1:
 	sg = INT2FIX(DEFAULT_SG);
     }
@@ -4782,7 +4777,7 @@ date_s__xmlschema(int argc, VALUE *argv, VALUE klass)
  *
  * See:
  *
- * - Argument {start}[rdoc-ref:calendars.rdoc@Argument+start].
+ * - Argument {start}[rdoc-ref:date/calendars.rdoc@Argument+start].
  * - Argument {limit}[rdoc-ref:Date@Argument+limit].
  *
  * Related: Date._xmlschema (returns a hash).
@@ -4792,12 +4787,11 @@ date_s_xmlschema(int argc, VALUE *argv, VALUE klass)
 {
     VALUE str, sg, opt;
 
-    rb_scan_args(argc, argv, "02:", &str, &sg, &opt);
-    if (!NIL_P(opt)) argc--;
+    argc = rb_scan_args(argc, argv, "02:", &str, &sg, &opt);
 
     switch (argc) {
       case 0:
-	str = rb_str_new2("-4712-01-01");
+	str = rb_str_new2(JULIAN_EPOCH_DATE);
       case 1:
 	sg = INT2FIX(DEFAULT_SG);
     }
@@ -4853,7 +4847,7 @@ date_s__rfc2822(int argc, VALUE *argv, VALUE klass)
  *
  * See:
  *
- * - Argument {start}[rdoc-ref:calendars.rdoc@Argument+start].
+ * - Argument {start}[rdoc-ref:date/calendars.rdoc@Argument+start].
  * - Argument {limit}[rdoc-ref:Date@Argument+limit].
  *
  * Related: Date._rfc2822 (returns a hash).
@@ -4863,11 +4857,11 @@ date_s_rfc2822(int argc, VALUE *argv, VALUE klass)
 {
     VALUE str, sg, opt;
 
-    rb_scan_args(argc, argv, "02:", &str, &sg, &opt);
+    argc = rb_scan_args(argc, argv, "02:", &str, &sg, &opt);
 
     switch (argc) {
       case 0:
-	str = rb_str_new2("Mon, 1 Jan -4712 00:00:00 +0000");
+	str = rb_str_new2(JULIAN_EPOCH_DATETIME_RFC3339);
       case 1:
 	sg = INT2FIX(DEFAULT_SG);
     }
@@ -4921,7 +4915,7 @@ date_s__httpdate(int argc, VALUE *argv, VALUE klass)
  *
  * See:
  *
- * - Argument {start}[rdoc-ref:calendars.rdoc@Argument+start].
+ * - Argument {start}[rdoc-ref:date/calendars.rdoc@Argument+start].
  * - Argument {limit}[rdoc-ref:Date@Argument+limit].
  *
  * Related: Date._httpdate (returns a hash).
@@ -4931,11 +4925,11 @@ date_s_httpdate(int argc, VALUE *argv, VALUE klass)
 {
     VALUE str, sg, opt;
 
-    rb_scan_args(argc, argv, "02:", &str, &sg, &opt);
+    argc = rb_scan_args(argc, argv, "02:", &str, &sg, &opt);
 
     switch (argc) {
       case 0:
-	str = rb_str_new2("Mon, 01 Jan -4712 00:00:00 GMT");
+	str = rb_str_new2(JULIAN_EPOCH_DATETIME_HTTPDATE);
       case 1:
 	sg = INT2FIX(DEFAULT_SG);
     }
@@ -4993,7 +4987,7 @@ date_s__jisx0301(int argc, VALUE *argv, VALUE klass)
  *
  * See:
  *
- * - Argument {start}[rdoc-ref:calendars.rdoc@Argument+start].
+ * - Argument {start}[rdoc-ref:date/calendars.rdoc@Argument+start].
  * - Argument {limit}[rdoc-ref:Date@Argument+limit].
  *
  * Related: Date._jisx0301 (returns a hash).
@@ -5003,12 +4997,11 @@ date_s_jisx0301(int argc, VALUE *argv, VALUE klass)
 {
     VALUE str, sg, opt;
 
-    rb_scan_args(argc, argv, "02:", &str, &sg, &opt);
-    if (!NIL_P(opt)) argc--;
+    argc = rb_scan_args(argc, argv, "02:", &str, &sg, &opt);
 
     switch (argc) {
       case 0:
-	str = rb_str_new2("-4712-01-01");
+	str = rb_str_new2(JULIAN_EPOCH_DATE);
       case 1:
 	sg = INT2FIX(DEFAULT_SG);
     }
@@ -5752,7 +5745,7 @@ d_lite_leap_p(VALUE self)
  *   Date.new(2001, 2, 3, Date::GREGORIAN).start # => -Infinity
  *   Date.new(2001, 2, 3, Date::JULIAN).start    # => Infinity
  *
- * See argument {start}[rdoc-ref:calendars.rdoc@Argument+start].
+ * See argument {start}[rdoc-ref:date/calendars.rdoc@Argument+start].
  *
  */
 static VALUE
@@ -5827,7 +5820,7 @@ dup_obj_with_new_start(VALUE obj, double sg)
  *   d1 = d0.new_start(Date::JULIAN)
  *   d1.julian? # => true
  *
- * See argument {start}[rdoc-ref:calendars.rdoc@Argument+start].
+ * See argument {start}[rdoc-ref:date/calendars.rdoc@Argument+start].
  *
  */
 static VALUE
@@ -6332,9 +6325,11 @@ minus_dd(VALUE self, VALUE other)
  * call-seq:
  *    d - other  ->  date or rational
  *
- * Returns the difference between the two dates if the other is a date
- * object.  If the other is a numeric value, returns a date object
- * pointing +other+ days before self.  If the other is a fractional number,
+ * If the other is a date object, returns a Rational
+ * whose value is the difference between the two dates in days.
+ * If the other is a numeric value, returns a date object
+ * pointing +other+ days before self.
+ * If the other is a fractional number,
  * assumes its precision is at most nanosecond.
  *
  *     Date.new(2001,2,3) - 1	#=> #<Date: 2001-02-02 ...>
@@ -6941,13 +6936,24 @@ d_lite_eql_p(VALUE self, VALUE other)
 static VALUE
 d_lite_hash(VALUE self)
 {
-    st_index_t v, h[4];
+    st_index_t v, h[5];
+    VALUE nth;
 
     get_d1(self);
-    h[0] = m_nth(dat);
-    h[1] = m_jd(dat);
-    h[2] = m_df(dat);
-    h[3] = m_sf(dat);
+    nth = m_nth(dat);
+
+    if (FIXNUM_P(nth)) {
+        h[0] = 0;
+        h[1] = (st_index_t)nth;
+    } else {
+        h[0] = 1;
+        h[1] = (st_index_t)FIX2LONG(rb_hash(nth));
+    }
+
+    h[2] = m_jd(dat);
+    h[3] = m_df(dat);
+    h[4] = m_sf(dat);
+
     v = rb_memhash(h, sizeof(h));
     return ST2FIX(v);
 }
@@ -7522,10 +7528,7 @@ d_lite_marshal_dump_old(VALUE self)
 		    m_of_in_day(dat),
 		    DBL2NUM(m_sg(dat)));
 
-    if (FL_TEST(self, FL_EXIVAR)) {
-	rb_copy_generic_ivar(a, self);
-	FL_SET(a, FL_EXIVAR);
-    }
+    rb_copy_generic_ivar(a, self);
 
     return a;
 }
@@ -7547,10 +7550,8 @@ d_lite_marshal_dump(VALUE self)
 		    INT2FIX(m_of(dat)),
 		    DBL2NUM(m_sg(dat)));
 
-    if (FL_TEST(self, FL_EXIVAR)) {
-	rb_copy_generic_ivar(a, self);
-	FL_SET(a, FL_EXIVAR);
-    }
+
+    rb_copy_generic_ivar(a, self);
 
     return a;
 }
@@ -7623,10 +7624,7 @@ d_lite_marshal_load(VALUE self, VALUE a)
 		       HAVE_JD | HAVE_DF);
     }
 
-    if (FL_TEST(a, FL_EXIVAR)) {
-	rb_copy_generic_ivar(self, a);
-	FL_SET(self, FL_EXIVAR);
-    }
+    rb_copy_generic_ivar(self, a);
 
     return self;
 }
@@ -8379,7 +8377,7 @@ datetime_s_strptime(int argc, VALUE *argv, VALUE klass)
 
     switch (argc) {
       case 0:
-	str = rb_str_new2("-4712-01-01T00:00:00+00:00");
+	str = rb_str_new2(JULIAN_EPOCH_DATETIME);
       case 1:
 	fmt = rb_str_new2("%FT%T%z");
       case 2:
@@ -8427,12 +8425,11 @@ datetime_s_parse(int argc, VALUE *argv, VALUE klass)
 {
     VALUE str, comp, sg, opt;
 
-    rb_scan_args(argc, argv, "03:", &str, &comp, &sg, &opt);
-    if (!NIL_P(opt)) argc--;
+    argc = rb_scan_args(argc, argv, "03:", &str, &comp, &sg, &opt);
 
     switch (argc) {
       case 0:
-	str = rb_str_new2("-4712-01-01T00:00:00+00:00");
+	str = rb_str_new2(JULIAN_EPOCH_DATETIME);
       case 1:
 	comp = Qtrue;
       case 2:
@@ -8474,12 +8471,11 @@ datetime_s_iso8601(int argc, VALUE *argv, VALUE klass)
 {
     VALUE str, sg, opt;
 
-    rb_scan_args(argc, argv, "02:", &str, &sg, &opt);
-    if (!NIL_P(opt)) argc--;
+    argc = rb_scan_args(argc, argv, "02:", &str, &sg, &opt);
 
     switch (argc) {
       case 0:
-	str = rb_str_new2("-4712-01-01T00:00:00+00:00");
+	str = rb_str_new2(JULIAN_EPOCH_DATETIME);
       case 1:
 	sg = INT2FIX(DEFAULT_SG);
     }
@@ -8489,7 +8485,7 @@ datetime_s_iso8601(int argc, VALUE *argv, VALUE klass)
         VALUE argv2[2], hash;
         argv2[0] = str;
         argv2[1] = opt;
-        if (!NIL_P(opt)) argc2--;
+        if (!NIL_P(opt)) argc2++;
 	hash = date_s__iso8601(argc2, argv2, klass);
 	return dt_new_by_frags(klass, hash, sg);
     }
@@ -8514,12 +8510,11 @@ datetime_s_rfc3339(int argc, VALUE *argv, VALUE klass)
 {
     VALUE str, sg, opt;
 
-    rb_scan_args(argc, argv, "02:", &str, &sg, &opt);
-    if (!NIL_P(opt)) argc--;
+    argc = rb_scan_args(argc, argv, "02:", &str, &sg, &opt);
 
     switch (argc) {
       case 0:
-	str = rb_str_new2("-4712-01-01T00:00:00+00:00");
+	str = rb_str_new2(JULIAN_EPOCH_DATETIME);
       case 1:
 	sg = INT2FIX(DEFAULT_SG);
     }
@@ -8554,12 +8549,11 @@ datetime_s_xmlschema(int argc, VALUE *argv, VALUE klass)
 {
     VALUE str, sg, opt;
 
-    rb_scan_args(argc, argv, "02:", &str, &sg, &opt);
-    if (!NIL_P(opt)) argc--;
+    argc = rb_scan_args(argc, argv, "02:", &str, &sg, &opt);
 
     switch (argc) {
       case 0:
-	str = rb_str_new2("-4712-01-01T00:00:00+00:00");
+	str = rb_str_new2(JULIAN_EPOCH_DATETIME);
       case 1:
 	sg = INT2FIX(DEFAULT_SG);
     }
@@ -8595,12 +8589,11 @@ datetime_s_rfc2822(int argc, VALUE *argv, VALUE klass)
 {
     VALUE str, sg, opt;
 
-    rb_scan_args(argc, argv, "02:", &str, &sg, &opt);
-    if (!NIL_P(opt)) argc--;
+    argc = rb_scan_args(argc, argv, "02:", &str, &sg, &opt);
 
     switch (argc) {
       case 0:
-	str = rb_str_new2("Mon, 1 Jan -4712 00:00:00 +0000");
+	str = rb_str_new2(JULIAN_EPOCH_DATETIME_RFC3339);
       case 1:
 	sg = INT2FIX(DEFAULT_SG);
     }
@@ -8635,12 +8628,11 @@ datetime_s_httpdate(int argc, VALUE *argv, VALUE klass)
 {
     VALUE str, sg, opt;
 
-    rb_scan_args(argc, argv, "02:", &str, &sg, &opt);
-    if (!NIL_P(opt)) argc--;
+    argc = rb_scan_args(argc, argv, "02:", &str, &sg, &opt);
 
     switch (argc) {
       case 0:
-	str = rb_str_new2("Mon, 01 Jan -4712 00:00:00 GMT");
+	str = rb_str_new2(JULIAN_EPOCH_DATETIME_HTTPDATE);
       case 1:
 	sg = INT2FIX(DEFAULT_SG);
     }
@@ -8680,12 +8672,11 @@ datetime_s_jisx0301(int argc, VALUE *argv, VALUE klass)
 {
     VALUE str, sg, opt;
 
-    rb_scan_args(argc, argv, "02:", &str, &sg, &opt);
-    if (!NIL_P(opt)) argc--;
+    argc = rb_scan_args(argc, argv, "02:", &str, &sg, &opt);
 
     switch (argc) {
       case 0:
-	str = rb_str_new2("-4712-01-01T00:00:00+00:00");
+	str = rb_str_new2(JULIAN_EPOCH_DATETIME);
       case 1:
 	sg = INT2FIX(DEFAULT_SG);
     }
@@ -8726,8 +8717,8 @@ dt_lite_to_s(VALUE self)
  *
  *   DateTime.now.strftime # => "2022-07-01T11:03:19-05:00"
  *
- * For other formats, see
- * {Formats for Dates and Times}[doc/strftime_formatting.rdoc].
+ * For other formats,
+ * see {Formats for Dates and Times}[rdoc-ref:strftime_formatting.rdoc]:
  *
  */
 static VALUE
@@ -8961,18 +8952,23 @@ time_to_datetime(VALUE self)
 static VALUE
 date_to_time(VALUE self)
 {
+    VALUE t;
+
     get_d1a(self);
 
     if (m_julian_p(adat)) {
-        VALUE tmp = d_lite_gregorian(self);
-        get_d1b(tmp);
+        VALUE g = d_lite_gregorian(self);
+        get_d1b(g);
         adat = bdat;
+        self = g;
     }
 
-    return f_local3(rb_cTime,
+    t = f_local3(rb_cTime,
         m_real_year(adat),
         INT2FIX(m_mon(adat)),
         INT2FIX(m_mday(adat)));
+    RB_GC_GUARD(self); /* may be the converted gregorian */
+    return t;
 }
 
 /*
@@ -9042,9 +9038,10 @@ datetime_to_time(VALUE self)
     get_d1(self);
 
     if (m_julian_p(dat)) {
-	self = d_lite_gregorian(self);
-	get_d1a(self);
+	VALUE g = d_lite_gregorian(self);
+	get_d1a(g);
 	dat = adat;
+	self = g;
     }
 
     {
@@ -9061,6 +9058,7 @@ datetime_to_time(VALUE self)
 		   f_add(INT2FIX(m_sec(dat)),
 			 m_sf_in_sec(dat)),
 		   INT2FIX(m_of(dat)));
+	RB_GC_GUARD(self); /* may be the converted gregorian */
 	return t;
     }
 }
@@ -9465,7 +9463,7 @@ mk_ary_of_str(long len, const char *a[])
 	}
 	rb_ary_push(o, e);
     }
-    rb_obj_freeze(o);
+    rb_ary_freeze(o);
     return o;
 }
 
@@ -9527,7 +9525,7 @@ Init_date_core(void)
      *
      * - You need both dates and times; \Date handles only dates.
      * - You need only Gregorian dates (and not Julian dates);
-     *   see {Julian and Gregorian Calendars}[rdoc-ref:calendars.rdoc].
+     *   see {Julian and Gregorian Calendars}[rdoc-ref:date/calendars.rdoc].
      *
      * A \Date object, once created, is immutable, and cannot be modified.
      *
diff --git a/ext/date/date_parse.c b/ext/date/date_parse.c
index c6f26ecb91432a..a1600e47085502 100644
--- a/ext/date/date_parse.c
+++ b/ext/date/date_parse.c
@@ -7,6 +7,9 @@
 #include "ruby/re.h"
 #include <ctype.h>
 
+#undef strncasecmp
+#define strncasecmp STRNCASECMP
+
 RUBY_EXTERN VALUE rb_int_positive_pow(long x, unsigned long y);
 RUBY_EXTERN unsigned long ruby_scan_digits(const char *str, ssize_t len, int base, size_t *retlen, int *overflow);
 
diff --git a/ext/date/date_strptime.c b/ext/date/date_strptime.c
index f731629df196a9..f1c8201de8803c 100644
--- a/ext/date/date_strptime.c
+++ b/ext/date/date_strptime.c
@@ -7,6 +7,9 @@
 #include "ruby/re.h"
 #include <ctype.h>
 
+#undef strncasecmp
+#define strncasecmp STRNCASECMP
+
 static const char *day_names[] = {
     "Sunday", "Monday", "Tuesday", "Wednesday",
     "Thursday", "Friday", "Saturday",
@@ -119,8 +122,9 @@ do { \
 do { \
     size_t l; \
     l = read_digits(&str[si], slen - si, &n, w); \
-    if (l == 0) \
+    if (l == 0) { \
 	fail();	\
+    } \
     si += l; \
 } while (0)
 
diff --git a/ext/date/depend b/ext/date/depend
index 82f85f7bf38c34..4fb78149a16509 100644
--- a/ext/date/depend
+++ b/ext/date/depend
@@ -138,6 +138,7 @@ date_core.o: $(hdrdir)/ruby/internal/intern/re.h
 date_core.o: $(hdrdir)/ruby/internal/intern/ruby.h
 date_core.o: $(hdrdir)/ruby/internal/intern/select.h
 date_core.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+date_core.o: $(hdrdir)/ruby/internal/intern/set.h
 date_core.o: $(hdrdir)/ruby/internal/intern/signal.h
 date_core.o: $(hdrdir)/ruby/internal/intern/sprintf.h
 date_core.o: $(hdrdir)/ruby/internal/intern/string.h
@@ -157,6 +158,7 @@ date_core.o: $(hdrdir)/ruby/internal/special_consts.h
 date_core.o: $(hdrdir)/ruby/internal/static_assert.h
 date_core.o: $(hdrdir)/ruby/internal/stdalign.h
 date_core.o: $(hdrdir)/ruby/internal/stdbool.h
+date_core.o: $(hdrdir)/ruby/internal/stdckdint.h
 date_core.o: $(hdrdir)/ruby/internal/symbol.h
 date_core.o: $(hdrdir)/ruby/internal/value.h
 date_core.o: $(hdrdir)/ruby/internal/value_type.h
@@ -312,6 +314,7 @@ date_parse.o: $(hdrdir)/ruby/internal/intern/re.h
 date_parse.o: $(hdrdir)/ruby/internal/intern/ruby.h
 date_parse.o: $(hdrdir)/ruby/internal/intern/select.h
 date_parse.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+date_parse.o: $(hdrdir)/ruby/internal/intern/set.h
 date_parse.o: $(hdrdir)/ruby/internal/intern/signal.h
 date_parse.o: $(hdrdir)/ruby/internal/intern/sprintf.h
 date_parse.o: $(hdrdir)/ruby/internal/intern/string.h
@@ -331,6 +334,7 @@ date_parse.o: $(hdrdir)/ruby/internal/special_consts.h
 date_parse.o: $(hdrdir)/ruby/internal/static_assert.h
 date_parse.o: $(hdrdir)/ruby/internal/stdalign.h
 date_parse.o: $(hdrdir)/ruby/internal/stdbool.h
+date_parse.o: $(hdrdir)/ruby/internal/stdckdint.h
 date_parse.o: $(hdrdir)/ruby/internal/symbol.h
 date_parse.o: $(hdrdir)/ruby/internal/value.h
 date_parse.o: $(hdrdir)/ruby/internal/value_type.h
@@ -476,6 +480,7 @@ date_strftime.o: $(hdrdir)/ruby/internal/intern/re.h
 date_strftime.o: $(hdrdir)/ruby/internal/intern/ruby.h
 date_strftime.o: $(hdrdir)/ruby/internal/intern/select.h
 date_strftime.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+date_strftime.o: $(hdrdir)/ruby/internal/intern/set.h
 date_strftime.o: $(hdrdir)/ruby/internal/intern/signal.h
 date_strftime.o: $(hdrdir)/ruby/internal/intern/sprintf.h
 date_strftime.o: $(hdrdir)/ruby/internal/intern/string.h
@@ -495,6 +500,7 @@ date_strftime.o: $(hdrdir)/ruby/internal/special_consts.h
 date_strftime.o: $(hdrdir)/ruby/internal/static_assert.h
 date_strftime.o: $(hdrdir)/ruby/internal/stdalign.h
 date_strftime.o: $(hdrdir)/ruby/internal/stdbool.h
+date_strftime.o: $(hdrdir)/ruby/internal/stdckdint.h
 date_strftime.o: $(hdrdir)/ruby/internal/symbol.h
 date_strftime.o: $(hdrdir)/ruby/internal/value.h
 date_strftime.o: $(hdrdir)/ruby/internal/value_type.h
@@ -647,6 +653,7 @@ date_strptime.o: $(hdrdir)/ruby/internal/intern/re.h
 date_strptime.o: $(hdrdir)/ruby/internal/intern/ruby.h
 date_strptime.o: $(hdrdir)/ruby/internal/intern/select.h
 date_strptime.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+date_strptime.o: $(hdrdir)/ruby/internal/intern/set.h
 date_strptime.o: $(hdrdir)/ruby/internal/intern/signal.h
 date_strptime.o: $(hdrdir)/ruby/internal/intern/sprintf.h
 date_strptime.o: $(hdrdir)/ruby/internal/intern/string.h
@@ -666,6 +673,7 @@ date_strptime.o: $(hdrdir)/ruby/internal/special_consts.h
 date_strptime.o: $(hdrdir)/ruby/internal/static_assert.h
 date_strptime.o: $(hdrdir)/ruby/internal/stdalign.h
 date_strptime.o: $(hdrdir)/ruby/internal/stdbool.h
+date_strptime.o: $(hdrdir)/ruby/internal/stdckdint.h
 date_strptime.o: $(hdrdir)/ruby/internal/symbol.h
 date_strptime.o: $(hdrdir)/ruby/internal/value.h
 date_strptime.o: $(hdrdir)/ruby/internal/value_type.h
diff --git a/ext/date/extconf.rb b/ext/date/extconf.rb
index 358f64173a588e..8a1467df09e402 100644
--- a/ext/date/extconf.rb
+++ b/ext/date/extconf.rb
@@ -3,6 +3,7 @@
 
 config_string("strict_warnflags") {|w| $warnflags += " #{w}"}
 
+append_cflags("-Wno-compound-token-split-by-macro") if RUBY_VERSION < "2.7."
 have_func("rb_category_warn")
 with_werror("", {:werror => true}) do |opt, |
   have_var("timezone", "time.h", opt)
diff --git a/ext/date/lib/date.rb b/ext/date/lib/date.rb
index a9fe3ce4b0c183..aa630eb6d172b5 100644
--- a/ext/date/lib/date.rb
+++ b/ext/date/lib/date.rb
@@ -4,7 +4,7 @@
 require 'date_core'
 
 class Date
-  VERSION = "3.3.3" # :nodoc:
+  VERSION = "3.4.1" # :nodoc:
 
   # call-seq:
   #   infinite? -> false
diff --git a/ext/date/prereq.mk b/ext/date/prereq.mk
index cee7685975be07..b5d271a32cca15 100644
--- a/ext/date/prereq.mk
+++ b/ext/date/prereq.mk
@@ -1,7 +1,7 @@
 .SUFFIXES: .list
 
 .list.h:
-	gperf --ignore-case -C -c -P -p -j1 -i 1 -g -o -t -N $(*F) $< \
+	gperf --ignore-case -L ANSI-C -C -c -P -p -j1 -i 1 -g -o -t -N $(*F) $< \
 	| sed -f $(top_srcdir)/tool/gperf.sed \
 	> $(@F)
 
diff --git a/ext/date/zonetab.h b/ext/date/zonetab.h
index 7ced9e03087408..2a2e8910c988ef 100644
--- a/ext/date/zonetab.h
+++ b/ext/date/zonetab.h
@@ -1,5 +1,5 @@
 /* ANSI-C code produced by gperf version 3.1 */
-/* Command-line: gperf --ignore-case -C -c -P -p -j1 -i 1 -g -o -t -N zonetab zonetab.list  */
+/* Command-line: gperf --ignore-case -L ANSI-C -C -c -P -p -j1 -i 1 -g -o -t -N zonetab zonetab.list  */
 /* Computed positions: -k'1-4,9' */
 
 #if !((' ' == 32) && ('!' == 33) && ('"' == 34) && ('#' == 35) \
@@ -29,15 +29,17 @@
 #error "gperf generated tables don't work with this execution character set. Please report a bug to <bug-gperf@gnu.org>."
 #endif
 
-#define gperf_offsetof(s, n) (short)offsetof(struct s##_t, s##_str##n)
 #line 1 "zonetab.list"
 
+#define GPERF_DOWNCASE 1
+#define GPERF_CASE_STRNCMP 1
+#define gperf_case_strncmp strncasecmp
 struct zone {
     int name;
     int offset;
 };
 static const struct zone *zonetab(register const char *str, register size_t len);
-#line 9 "zonetab.list"
+#line 12 "zonetab.list"
 struct zone;
 
 #define TOTAL_KEYWORDS 316
@@ -49,7 +51,7 @@ struct zone;
 
 #ifndef GPERF_DOWNCASE
 #define GPERF_DOWNCASE 1
-static const unsigned char gperf_downcase[256] =
+static unsigned char gperf_downcase[256] =
   {
       0,   1,   2,   3,   4,   5,   6,   7,   8,   9,  10,  11,  12,  13,  14,
      15,  16,  17,  18,  19,  20,  21,  22,  23,  24,  25,  26,  27,  28,  29,
@@ -808,736 +810,736 @@ zonetab (register const char *str, register size_t len)
   static const struct zone wordlist[] =
     {
       {-1}, {-1},
-#line 34 "zonetab.list"
-      {gperf_offsetof(stringpool, 2),   -2*3600},
-#line 43 "zonetab.list"
-      {gperf_offsetof(stringpool, 3),  -11*3600},
-#line 45 "zonetab.list"
-      {gperf_offsetof(stringpool, 4),    0*3600},
-#line 36 "zonetab.list"
-      {gperf_offsetof(stringpool, 5),   -4*3600},
-      {-1}, {-1},
-#line 269 "zonetab.list"
-      {gperf_offsetof(stringpool, 8),21600},
-#line 268 "zonetab.list"
-      {gperf_offsetof(stringpool, 9),25200},
-#line 35 "zonetab.list"
-      {gperf_offsetof(stringpool, 10),   -3*3600},
+#line 37 "zonetab.list"
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str2,   -2*3600},
+#line 46 "zonetab.list"
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str3,  -11*3600},
+#line 48 "zonetab.list"
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str4,    0*3600},
+#line 39 "zonetab.list"
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str5,   -4*3600},
       {-1}, {-1},
-#line 21 "zonetab.list"
-      {gperf_offsetof(stringpool, 13),    1*3600},
-#line 25 "zonetab.list"
-      {gperf_offsetof(stringpool, 14),    5*3600},
-#line 271 "zonetab.list"
-      {gperf_offsetof(stringpool, 15),-18000},
-#line 279 "zonetab.list"
-      {gperf_offsetof(stringpool, 16),-10800},
-#line 273 "zonetab.list"
-      {gperf_offsetof(stringpool, 17),43200},
 #line 272 "zonetab.list"
-      {gperf_offsetof(stringpool, 18),43200},
-#line 80 "zonetab.list"
-      {gperf_offsetof(stringpool, 19),  2*3600},
-#line 186 "zonetab.list"
-      {gperf_offsetof(stringpool, 20),36000},
-#line 88 "zonetab.list"
-      {gperf_offsetof(stringpool, 21), 3*3600},
-#line 87 "zonetab.list"
-      {gperf_offsetof(stringpool, 22),  3*3600},
-      {-1},
-#line 101 "zonetab.list"
-      {gperf_offsetof(stringpool, 24),-6*3600},
-#line 217 "zonetab.list"
-      {gperf_offsetof(stringpool, 25),-18000},
-#line 19 "zonetab.list"
-      {gperf_offsetof(stringpool, 26), -8*3600},
-#line 133 "zonetab.list"
-      {gperf_offsetof(stringpool, 27),                -18000},
-#line 32 "zonetab.list"
-      {gperf_offsetof(stringpool, 28),   12*3600},
-#line 56 "zonetab.list"
-      {gperf_offsetof(stringpool, 29), -4*3600},
-#line 13 "zonetab.list"
-      {gperf_offsetof(stringpool, 30), -5*3600},
-#line 23 "zonetab.list"
-      {gperf_offsetof(stringpool, 31),    3*3600},
-#line 256 "zonetab.list"
-      {gperf_offsetof(stringpool, 32),23400},
-#line 73 "zonetab.list"
-      {gperf_offsetof(stringpool, 33),  1*3600},
-      {-1},
-#line 82 "zonetab.list"
-      {gperf_offsetof(stringpool, 35), 2*3600},
-#line 71 "zonetab.list"
-      {gperf_offsetof(stringpool, 36),  1*3600},
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str8,21600},
+#line 271 "zonetab.list"
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str9,25200},
+#line 38 "zonetab.list"
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str10,   -3*3600},
+      {-1}, {-1},
 #line 24 "zonetab.list"
-      {gperf_offsetof(stringpool, 37),    4*3600},
-#line 79 "zonetab.list"
-      {gperf_offsetof(stringpool, 38), 2*3600},
-#line 65 "zonetab.list"
-      {gperf_offsetof(stringpool, 39),2*3600},
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str13,    1*3600},
+#line 28 "zonetab.list"
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str14,    5*3600},
+#line 274 "zonetab.list"
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str15,-18000},
+#line 282 "zonetab.list"
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str16,-10800},
+#line 276 "zonetab.list"
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str17,43200},
+#line 275 "zonetab.list"
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str18,43200},
+#line 83 "zonetab.list"
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str19,  2*3600},
+#line 189 "zonetab.list"
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str20,36000},
+#line 91 "zonetab.list"
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str21, 3*3600},
+#line 90 "zonetab.list"
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str22,  3*3600},
       {-1},
-#line 202 "zonetab.list"
-      {gperf_offsetof(stringpool, 41),28800},
-#line 252 "zonetab.list"
-      {gperf_offsetof(stringpool, 42),39600},
-#line 251 "zonetab.list"
-      {gperf_offsetof(stringpool, 43),43200},
-#line 17 "zonetab.list"
-      {gperf_offsetof(stringpool, 44), -7*3600},
-#line 89 "zonetab.list"
-      {gperf_offsetof(stringpool, 45),  3*3600},
-#line 212 "zonetab.list"
-      {gperf_offsetof(stringpool, 46),-18000},
-#line 15 "zonetab.list"
-      {gperf_offsetof(stringpool, 47), -6*3600},
-#line 192 "zonetab.list"
-      {gperf_offsetof(stringpool, 48),18000},
-#line 26 "zonetab.list"
-      {gperf_offsetof(stringpool, 49),    6*3600},
-      {-1}, {-1},
-#line 51 "zonetab.list"
-      {gperf_offsetof(stringpool, 52), -3*3600},
-#line 226 "zonetab.list"
-      {gperf_offsetof(stringpool, 53),-7200},
-#line 221 "zonetab.list"
-      {gperf_offsetof(stringpool, 54),10800},
+#line 104 "zonetab.list"
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str24,-6*3600},
+#line 220 "zonetab.list"
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str25,-18000},
 #line 22 "zonetab.list"
-      {gperf_offsetof(stringpool, 55),    2*3600},
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str26, -8*3600},
+#line 136 "zonetab.list"
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str27,                -18000},
+#line 35 "zonetab.list"
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str28,   12*3600},
+#line 59 "zonetab.list"
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str29, -4*3600},
+#line 16 "zonetab.list"
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str30, -5*3600},
+#line 26 "zonetab.list"
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str31,    3*3600},
+#line 259 "zonetab.list"
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str32,23400},
+#line 76 "zonetab.list"
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str33,  1*3600},
       {-1},
-#line 190 "zonetab.list"
-      {gperf_offsetof(stringpool, 57),43200},
-#line 189 "zonetab.list"
-      {gperf_offsetof(stringpool, 58),43200},
-#line 199 "zonetab.list"
-      {gperf_offsetof(stringpool, 59),28800},
-#line 29 "zonetab.list"
-      {gperf_offsetof(stringpool, 60),    9*3600},
-#line 276 "zonetab.list"
-      {gperf_offsetof(stringpool, 61),28800},
-#line 48 "zonetab.list"
-      {gperf_offsetof(stringpool, 62),  -2*3600},
-#line 94 "zonetab.list"
-      {gperf_offsetof(stringpool, 63),  6*3600},
+#line 85 "zonetab.list"
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str35, 2*3600},
 #line 74 "zonetab.list"
-      {gperf_offsetof(stringpool, 64), 1*3600},
-#line 81 "zonetab.list"
-      {gperf_offsetof(stringpool, 65),  2*3600},
-#line 64 "zonetab.list"
-      {gperf_offsetof(stringpool, 66),-10*3600},
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str36,  1*3600},
+#line 27 "zonetab.list"
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str37,    4*3600},
+#line 82 "zonetab.list"
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str38, 2*3600},
+#line 68 "zonetab.list"
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str39,2*3600},
+      {-1},
+#line 205 "zonetab.list"
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str41,28800},
+#line 255 "zonetab.list"
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str42,39600},
 #line 254 "zonetab.list"
-      {gperf_offsetof(stringpool, 67),18000},
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str43,43200},
+#line 20 "zonetab.list"
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str44, -7*3600},
 #line 92 "zonetab.list"
-      {gperf_offsetof(stringpool, 68),  5*3600},
-      {-1},
-#line 200 "zonetab.list"
-      {gperf_offsetof(stringpool, 70),-14400},
-#line 70 "zonetab.list"
-      {gperf_offsetof(stringpool, 71),  1*3600},
-#line 281 "zonetab.list"
-      {gperf_offsetof(stringpool, 72),32400},
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str45,  3*3600},
+#line 215 "zonetab.list"
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str46,-18000},
+#line 18 "zonetab.list"
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str47, -6*3600},
+#line 195 "zonetab.list"
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str48,18000},
+#line 29 "zonetab.list"
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str49,    6*3600},
+      {-1}, {-1},
+#line 54 "zonetab.list"
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str52, -3*3600},
+#line 229 "zonetab.list"
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str53,-7200},
+#line 224 "zonetab.list"
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str54,10800},
+#line 25 "zonetab.list"
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str55,    2*3600},
       {-1},
-#line 280 "zonetab.list"
-      {gperf_offsetof(stringpool, 74),39600},
-#line 238 "zonetab.list"
-      {gperf_offsetof(stringpool, 75),21600},
-#line 93 "zonetab.list"
-      {gperf_offsetof(stringpool, 76),  (5*3600+1800)},
-#line 194 "zonetab.list"
-      {gperf_offsetof(stringpool, 77),28800},
+#line 193 "zonetab.list"
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str57,43200},
+#line 192 "zonetab.list"
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str58,43200},
+#line 202 "zonetab.list"
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str59,28800},
+#line 32 "zonetab.list"
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str60,    9*3600},
+#line 279 "zonetab.list"
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str61,28800},
+#line 51 "zonetab.list"
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str62,  -2*3600},
+#line 97 "zonetab.list"
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str63,  6*3600},
+#line 77 "zonetab.list"
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str64, 1*3600},
+#line 84 "zonetab.list"
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str65,  2*3600},
+#line 67 "zonetab.list"
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str66,-10*3600},
+#line 257 "zonetab.list"
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str67,18000},
+#line 95 "zonetab.list"
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str68,  5*3600},
       {-1},
-#line 255 "zonetab.list"
-      {gperf_offsetof(stringpool, 79),43200},
-#line 75 "zonetab.list"
-      {gperf_offsetof(stringpool, 80),  1*3600},
-#line 270 "zonetab.list"
-      {gperf_offsetof(stringpool, 81),18000},
-#line 83 "zonetab.list"
-      {gperf_offsetof(stringpool, 82), 2*3600},
+#line 203 "zonetab.list"
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str70,-14400},
+#line 73 "zonetab.list"
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str71,  1*3600},
+#line 284 "zonetab.list"
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str72,32400},
       {-1},
-#line 207 "zonetab.list"
-      {gperf_offsetof(stringpool, 84),36000},
-#line 278 "zonetab.list"
-      {gperf_offsetof(stringpool, 85),-7200},
-      {-1}, {-1},
-#line 126 "zonetab.list"
-      {gperf_offsetof(stringpool, 88),                -21600},
-#line 185 "zonetab.list"
-      {gperf_offsetof(stringpool, 89),39600},
-#line 183 "zonetab.list"
-      {gperf_offsetof(stringpool, 90),-18000},
-#line 218 "zonetab.list"
-      {gperf_offsetof(stringpool, 91),-18000},
-#line 182 "zonetab.list"
-      {gperf_offsetof(stringpool, 92),34200},
-#line 103 "zonetab.list"
-      {gperf_offsetof(stringpool, 93),11*3600},
-#line 53 "zonetab.list"
-      {gperf_offsetof(stringpool, 94), -3*3600},
-#line 208 "zonetab.list"
-      {gperf_offsetof(stringpool, 95),36000},
-#line 49 "zonetab.list"
-      {gperf_offsetof(stringpool, 96),-2*3600},
-#line 120 "zonetab.list"
-      {gperf_offsetof(stringpool, 97),          34200},
-      {-1}, {-1},
-#line 215 "zonetab.list"
-      {gperf_offsetof(stringpool, 100),25200},
-#line 242 "zonetab.list"
-      {gperf_offsetof(stringpool, 101),12600},
+#line 283 "zonetab.list"
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str74,39600},
 #line 241 "zonetab.list"
-      {gperf_offsetof(stringpool, 102),28800},
-#line 240 "zonetab.list"
-      {gperf_offsetof(stringpool, 103),32400},
-#line 86 "zonetab.list"
-      {gperf_offsetof(stringpool, 104),   3*3600},
-#line 33 "zonetab.list"
-      {gperf_offsetof(stringpool, 105),   -1*3600},
-#line 201 "zonetab.list"
-      {gperf_offsetof(stringpool, 106),21600},
-#line 148 "zonetab.list"
-      {gperf_offsetof(stringpool, 107),               -25200},
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str75,21600},
 #line 96 "zonetab.list"
-      {gperf_offsetof(stringpool, 108),  (6*3600+1800)},
-#line 42 "zonetab.list"
-      {gperf_offsetof(stringpool, 109),  -10*3600},
-#line 31 "zonetab.list"
-      {gperf_offsetof(stringpool, 110),   11*3600},
-#line 72 "zonetab.list"
-      {gperf_offsetof(stringpool, 111),  1*3600},
-      {-1},
-#line 90 "zonetab.list"
-      {gperf_offsetof(stringpool, 113),  4*3600},
-#line 47 "zonetab.list"
-      {gperf_offsetof(stringpool, 114),  0*3600},
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str76,  (5*3600+1800)},
+#line 197 "zonetab.list"
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str77,28800},
       {-1},
+#line 258 "zonetab.list"
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str79,43200},
 #line 78 "zonetab.list"
-      {gperf_offsetof(stringpool, 116), 1*3600},
-#line 77 "zonetab.list"
-      {gperf_offsetof(stringpool, 117),  1*3600},
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str80,  1*3600},
+#line 273 "zonetab.list"
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str81,18000},
+#line 86 "zonetab.list"
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str82, 2*3600},
       {-1},
-#line 95 "zonetab.list"
-      {gperf_offsetof(stringpool, 119), 2*3600},
-#line 313 "zonetab.list"
-      {gperf_offsetof(stringpool, 120),43200},
-#line 55 "zonetab.list"
-      {gperf_offsetof(stringpool, 121), -(2*3600+1800)},
-#line 184 "zonetab.list"
-      {gperf_offsetof(stringpool, 122),31500},
-#line 204 "zonetab.list"
-      {gperf_offsetof(stringpool, 123),45900},
 #line 210 "zonetab.list"
-      {gperf_offsetof(stringpool, 124),-18000},
-#line 198 "zonetab.list"
-      {gperf_offsetof(stringpool, 125),14400},
-#line 57 "zonetab.list"
-      {gperf_offsetof(stringpool, 126), -4*3600},
-#line 197 "zonetab.list"
-      {gperf_offsetof(stringpool, 127),18000},
-#line 54 "zonetab.list"
-      {gperf_offsetof(stringpool, 128),-3*3600},
-#line 253 "zonetab.list"
-      {gperf_offsetof(stringpool, 129),-30600},
-#line 91 "zonetab.list"
-      {gperf_offsetof(stringpool, 130),  4*3600},
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str84,36000},
+#line 281 "zonetab.list"
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str85,-7200},
+      {-1}, {-1},
+#line 129 "zonetab.list"
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str88,                -21600},
+#line 188 "zonetab.list"
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str89,39600},
+#line 186 "zonetab.list"
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str90,-18000},
+#line 221 "zonetab.list"
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str91,-18000},
+#line 185 "zonetab.list"
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str92,34200},
+#line 106 "zonetab.list"
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str93,11*3600},
+#line 56 "zonetab.list"
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str94, -3*3600},
+#line 211 "zonetab.list"
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str95,36000},
+#line 52 "zonetab.list"
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str96,-2*3600},
+#line 123 "zonetab.list"
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str97,          34200},
+      {-1}, {-1},
+#line 218 "zonetab.list"
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str100,25200},
+#line 245 "zonetab.list"
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str101,12600},
+#line 244 "zonetab.list"
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str102,28800},
+#line 243 "zonetab.list"
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str103,32400},
+#line 89 "zonetab.list"
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str104,   3*3600},
+#line 36 "zonetab.list"
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str105,   -1*3600},
+#line 204 "zonetab.list"
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str106,21600},
+#line 151 "zonetab.list"
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str107,               -25200},
 #line 99 "zonetab.list"
-      {gperf_offsetof(stringpool, 131),  9*3600},
-#line 122 "zonetab.list"
-      {gperf_offsetof(stringpool, 132),            21600},
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str108,  (6*3600+1800)},
+#line 45 "zonetab.list"
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str109,  -10*3600},
+#line 34 "zonetab.list"
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str110,   11*3600},
+#line 75 "zonetab.list"
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str111,  1*3600},
+      {-1},
+#line 93 "zonetab.list"
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str113,  4*3600},
+#line 50 "zonetab.list"
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str114,  0*3600},
+      {-1},
+#line 81 "zonetab.list"
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str116, 1*3600},
+#line 80 "zonetab.list"
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str117,  1*3600},
+      {-1},
+#line 98 "zonetab.list"
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str119, 2*3600},
+#line 316 "zonetab.list"
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str120,43200},
+#line 58 "zonetab.list"
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str121, -(2*3600+1800)},
 #line 187 "zonetab.list"
-      {gperf_offsetof(stringpool, 133),16200},
-#line 132 "zonetab.list"
-      {gperf_offsetof(stringpool, 134),       -10800},
-#line 121 "zonetab.list"
-      {gperf_offsetof(stringpool, 135),        -21600},
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str122,31500},
+#line 207 "zonetab.list"
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str123,45900},
+#line 213 "zonetab.list"
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str124,-18000},
+#line 201 "zonetab.list"
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str125,14400},
+#line 60 "zonetab.list"
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str126, -4*3600},
+#line 200 "zonetab.list"
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str127,18000},
+#line 57 "zonetab.list"
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str128,-3*3600},
+#line 256 "zonetab.list"
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str129,-30600},
+#line 94 "zonetab.list"
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str130,  4*3600},
+#line 102 "zonetab.list"
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str131,  9*3600},
+#line 125 "zonetab.list"
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str132,            21600},
+#line 190 "zonetab.list"
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str133,16200},
+#line 135 "zonetab.list"
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str134,       -10800},
+#line 124 "zonetab.list"
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str135,        -21600},
       {-1},
-#line 236 "zonetab.list"
-      {gperf_offsetof(stringpool, 137),25200},
+#line 239 "zonetab.list"
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str137,25200},
       {-1}, {-1}, {-1}, {-1}, {-1},
-#line 274 "zonetab.list"
-      {gperf_offsetof(stringpool, 143),36000},
-#line 266 "zonetab.list"
-      {gperf_offsetof(stringpool, 144),43200},
-#line 146 "zonetab.list"
-      {gperf_offsetof(stringpool, 145),                 -21600},
-#line 193 "zonetab.list"
-      {gperf_offsetof(stringpool, 146),32400},
-#line 220 "zonetab.list"
-      {gperf_offsetof(stringpool, 147),-3600},
-#line 214 "zonetab.list"
-      {gperf_offsetof(stringpool, 148),25200},
-#line 219 "zonetab.list"
-      {gperf_offsetof(stringpool, 149),0},
-#line 275 "zonetab.list"
-      {gperf_offsetof(stringpool, 150),46800},
-#line 109 "zonetab.list"
-      {gperf_offsetof(stringpool, 151),                -32400},
+#line 277 "zonetab.list"
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str143,36000},
+#line 269 "zonetab.list"
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str144,43200},
+#line 149 "zonetab.list"
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str145,                 -21600},
+#line 196 "zonetab.list"
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str146,32400},
+#line 223 "zonetab.list"
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str147,-3600},
+#line 217 "zonetab.list"
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str148,25200},
+#line 222 "zonetab.list"
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str149,0},
+#line 278 "zonetab.list"
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str150,46800},
+#line 112 "zonetab.list"
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str151,                -32400},
       {-1}, {-1},
-#line 68 "zonetab.list"
-      {gperf_offsetof(stringpool, 154),  -11*3600},
+#line 71 "zonetab.list"
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str154,  -11*3600},
       {-1}, {-1}, {-1},
-#line 321 "zonetab.list"
-      {gperf_offsetof(stringpool, 158),0},
+#line 324 "zonetab.list"
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str158,0},
       {-1},
-#line 178 "zonetab.list"
-      {gperf_offsetof(stringpool, 160),               18000},
 #line 181 "zonetab.list"
-      {gperf_offsetof(stringpool, 161),37800},
-#line 265 "zonetab.list"
-      {gperf_offsetof(stringpool, 162),20700},
-#line 249 "zonetab.list"
-      {gperf_offsetof(stringpool, 163),37800},
-#line 108 "zonetab.list"
-      {gperf_offsetof(stringpool, 164),             16200},
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str160,               18000},
+#line 184 "zonetab.list"
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str161,37800},
+#line 268 "zonetab.list"
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str162,20700},
+#line 252 "zonetab.list"
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str163,37800},
+#line 111 "zonetab.list"
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str164,             16200},
       {-1}, {-1},
-#line 30 "zonetab.list"
-      {gperf_offsetof(stringpool, 167),   10*3600},
+#line 33 "zonetab.list"
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str167,   10*3600},
       {-1},
-#line 27 "zonetab.list"
-      {gperf_offsetof(stringpool, 169),    7*3600},
-#line 239 "zonetab.list"
-      {gperf_offsetof(stringpool, 170),16200},
-#line 206 "zonetab.list"
-      {gperf_offsetof(stringpool, 171),28800},
-#line 205 "zonetab.list"
-      {gperf_offsetof(stringpool, 172),32400},
-#line 12 "zonetab.list"
-      {gperf_offsetof(stringpool, 173),  0*3600},
-#line 229 "zonetab.list"
-      {gperf_offsetof(stringpool, 174),14400},
-#line 264 "zonetab.list"
-      {gperf_offsetof(stringpool, 175),25200},
+#line 30 "zonetab.list"
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str169,    7*3600},
+#line 242 "zonetab.list"
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str170,16200},
+#line 209 "zonetab.list"
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str171,28800},
+#line 208 "zonetab.list"
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str172,32400},
+#line 15 "zonetab.list"
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str173,  0*3600},
+#line 232 "zonetab.list"
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str174,14400},
+#line 267 "zonetab.list"
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str175,25200},
+#line 266 "zonetab.list"
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str176,25200},
+#line 226 "zonetab.list"
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str177,43200},
+#line 43 "zonetab.list"
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str178,   -8*3600},
+#line 225 "zonetab.list"
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str179,46800},
+      {-1},
+#line 285 "zonetab.list"
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str181,-10800},
 #line 263 "zonetab.list"
-      {gperf_offsetof(stringpool, 176),25200},
-#line 223 "zonetab.list"
-      {gperf_offsetof(stringpool, 177),43200},
-#line 40 "zonetab.list"
-      {gperf_offsetof(stringpool, 178),   -8*3600},
-#line 222 "zonetab.list"
-      {gperf_offsetof(stringpool, 179),46800},
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str182,39600},
+#line 103 "zonetab.list"
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str183,  9*3600},
+#line 247 "zonetab.list"
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str184,39600},
+#line 105 "zonetab.list"
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str185, 10*3600},
+#line 146 "zonetab.list"
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str186,                    12600},
+#line 132 "zonetab.list"
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str187,               10800},
+#line 101 "zonetab.list"
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str188, 8*3600},
+#line 42 "zonetab.list"
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str189,   -7*3600},
+#line 133 "zonetab.list"
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str190,            36000},
+#line 41 "zonetab.list"
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str191,   -6*3600},
+#line 206 "zonetab.list"
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str192,49500},
+#line 301 "zonetab.list"
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str193,18000},
+#line 212 "zonetab.list"
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str194,-14400},
+#line 194 "zonetab.list"
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str195,-43200},
       {-1},
-#line 282 "zonetab.list"
-      {gperf_offsetof(stringpool, 181),-10800},
+#line 262 "zonetab.list"
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str197,28800},
+#line 182 "zonetab.list"
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str198,            36000},
 #line 260 "zonetab.list"
-      {gperf_offsetof(stringpool, 182),39600},
-#line 100 "zonetab.list"
-      {gperf_offsetof(stringpool, 183),  9*3600},
-#line 244 "zonetab.list"
-      {gperf_offsetof(stringpool, 184),39600},
-#line 102 "zonetab.list"
-      {gperf_offsetof(stringpool, 185), 10*3600},
-#line 143 "zonetab.list"
-      {gperf_offsetof(stringpool, 186),                    12600},
-#line 129 "zonetab.list"
-      {gperf_offsetof(stringpool, 187),               10800},
-#line 98 "zonetab.list"
-      {gperf_offsetof(stringpool, 188), 8*3600},
-#line 39 "zonetab.list"
-      {gperf_offsetof(stringpool, 189),   -7*3600},
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str199,14400},
+#line 322 "zonetab.list"
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str200,32400},
+#line 87 "zonetab.list"
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str201, 2*3600},
+#line 289 "zonetab.list"
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str202,39600},
+#line 155 "zonetab.list"
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str203,             43200},
+#line 303 "zonetab.list"
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str204,46800},
 #line 130 "zonetab.list"
-      {gperf_offsetof(stringpool, 190),            36000},
-#line 38 "zonetab.list"
-      {gperf_offsetof(stringpool, 191),   -6*3600},
-#line 203 "zonetab.list"
-      {gperf_offsetof(stringpool, 192),49500},
-#line 298 "zonetab.list"
-      {gperf_offsetof(stringpool, 193),18000},
-#line 209 "zonetab.list"
-      {gperf_offsetof(stringpool, 194),-14400},
-#line 191 "zonetab.list"
-      {gperf_offsetof(stringpool, 195),-43200},
-      {-1},
-#line 259 "zonetab.list"
-      {gperf_offsetof(stringpool, 197),28800},
-#line 179 "zonetab.list"
-      {gperf_offsetof(stringpool, 198),            36000},
-#line 257 "zonetab.list"
-      {gperf_offsetof(stringpool, 199),14400},
-#line 319 "zonetab.list"
-      {gperf_offsetof(stringpool, 200),32400},
-#line 84 "zonetab.list"
-      {gperf_offsetof(stringpool, 201), 2*3600},
-#line 286 "zonetab.list"
-      {gperf_offsetof(stringpool, 202),39600},
-#line 152 "zonetab.list"
-      {gperf_offsetof(stringpool, 203),             43200},
-#line 300 "zonetab.list"
-      {gperf_offsetof(stringpool, 204),46800},
-#line 127 "zonetab.list"
-      {gperf_offsetof(stringpool, 205),                   28800},
-#line 299 "zonetab.list"
-      {gperf_offsetof(stringpool, 206),50400},
-#line 85 "zonetab.list"
-      {gperf_offsetof(stringpool, 207),  -11*3600},
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str205,                   28800},
+#line 302 "zonetab.list"
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str206,50400},
+#line 88 "zonetab.list"
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str207,  -11*3600},
       {-1},
-#line 142 "zonetab.list"
-      {gperf_offsetof(stringpool, 209),                   19800},
+#line 145 "zonetab.list"
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str209,                   19800},
       {-1},
-#line 314 "zonetab.list"
-      {gperf_offsetof(stringpool, 211),-10800},
-#line 288 "zonetab.list"
-      {gperf_offsetof(stringpool, 212),39600},
+#line 317 "zonetab.list"
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str211,-10800},
+#line 291 "zonetab.list"
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str212,39600},
       {-1},
-#line 196 "zonetab.list"
-      {gperf_offsetof(stringpool, 214),-3600},
-#line 195 "zonetab.list"
-      {gperf_offsetof(stringpool, 215),0},
-#line 293 "zonetab.list"
-      {gperf_offsetof(stringpool, 216),-36000},
-#line 106 "zonetab.list"
-      {gperf_offsetof(stringpool, 217), 12*3600},
+#line 199 "zonetab.list"
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str214,-3600},
+#line 198 "zonetab.list"
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str215,0},
+#line 296 "zonetab.list"
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str216,-36000},
+#line 109 "zonetab.list"
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str217, 12*3600},
+#line 131 "zonetab.list"
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str218,               -43200},
+#line 108 "zonetab.list"
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str219,12*3600},
+#line 173 "zonetab.list"
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str220,                   32400},
 #line 128 "zonetab.list"
-      {gperf_offsetof(stringpool, 218),               -43200},
-#line 105 "zonetab.list"
-      {gperf_offsetof(stringpool, 219),12*3600},
-#line 170 "zonetab.list"
-      {gperf_offsetof(stringpool, 220),                   32400},
-#line 125 "zonetab.list"
-      {gperf_offsetof(stringpool, 221),         39600},
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str221,         39600},
       {-1},
-#line 283 "zonetab.list"
-      {gperf_offsetof(stringpool, 223),21600},
-#line 113 "zonetab.list"
-      {gperf_offsetof(stringpool, 224),               -14400},
-#line 262 "zonetab.list"
-      {gperf_offsetof(stringpool, 225),39600},
-      {-1},
-#line 11 "zonetab.list"
-      {gperf_offsetof(stringpool, 227),   0*3600},
-#line 301 "zonetab.list"
-      {gperf_offsetof(stringpool, 228),10800},
-#line 315 "zonetab.list"
-      {gperf_offsetof(stringpool, 229),43200},
-#line 291 "zonetab.list"
-      {gperf_offsetof(stringpool, 230),-10800},
-#line 20 "zonetab.list"
-      {gperf_offsetof(stringpool, 231), -7*3600},
-#line 248 "zonetab.list"
-      {gperf_offsetof(stringpool, 232),39600},
+#line 286 "zonetab.list"
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str223,21600},
+#line 116 "zonetab.list"
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str224,               -14400},
+#line 265 "zonetab.list"
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str225,39600},
       {-1},
-#line 52 "zonetab.list"
-      {gperf_offsetof(stringpool, 234), -3*3600},
 #line 14 "zonetab.list"
-      {gperf_offsetof(stringpool, 235), -4*3600},
-      {-1}, {-1},
-#line 277 "zonetab.list"
-      {gperf_offsetof(stringpool, 238),18000},
-#line 188 "zonetab.list"
-      {gperf_offsetof(stringpool, 239),21600},
-#line 320 "zonetab.list"
-      {gperf_offsetof(stringpool, 240),28800},
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str227,   0*3600},
+#line 304 "zonetab.list"
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str228,10800},
+#line 318 "zonetab.list"
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str229,43200},
+#line 294 "zonetab.list"
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str230,-10800},
+#line 23 "zonetab.list"
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str231, -7*3600},
+#line 251 "zonetab.list"
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str232,39600},
       {-1},
-#line 317 "zonetab.list"
-      {gperf_offsetof(stringpool, 242),-10800},
-#line 60 "zonetab.list"
-      {gperf_offsetof(stringpool, 243),-9*3600},
-#line 316 "zonetab.list"
-      {gperf_offsetof(stringpool, 244),-7200},
+#line 55 "zonetab.list"
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str234, -3*3600},
+#line 17 "zonetab.list"
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str235, -4*3600},
+      {-1}, {-1},
+#line 280 "zonetab.list"
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str238,18000},
+#line 191 "zonetab.list"
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str239,21600},
+#line 323 "zonetab.list"
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str240,28800},
       {-1},
-#line 246 "zonetab.list"
-      {gperf_offsetof(stringpool, 246),25200},
-#line 245 "zonetab.list"
-      {gperf_offsetof(stringpool, 247),28800},
-#line 147 "zonetab.list"
-      {gperf_offsetof(stringpool, 248),            -7200},
-#line 18 "zonetab.list"
-      {gperf_offsetof(stringpool, 249), -6*3600},
-#line 250 "zonetab.list"
-      {gperf_offsetof(stringpool, 250),50400},
-#line 165 "zonetab.list"
-      {gperf_offsetof(stringpool, 251),         28800},
-#line 16 "zonetab.list"
-      {gperf_offsetof(stringpool, 252), -5*3600},
-#line 76 "zonetab.list"
-      {gperf_offsetof(stringpool, 253),  1*3600},
+#line 320 "zonetab.list"
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str242,-7200},
+#line 63 "zonetab.list"
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str243,-9*3600},
+#line 319 "zonetab.list"
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str244,-3600},
       {-1},
-#line 164 "zonetab.list"
-      {gperf_offsetof(stringpool, 255),                 25200},
-#line 41 "zonetab.list"
-      {gperf_offsetof(stringpool, 256),   -9*3600},
+#line 249 "zonetab.list"
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str246,25200},
+#line 248 "zonetab.list"
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str247,28800},
+#line 150 "zonetab.list"
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str248,            -7200},
+#line 21 "zonetab.list"
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str249, -6*3600},
+#line 253 "zonetab.list"
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str250,50400},
+#line 168 "zonetab.list"
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str251,         28800},
+#line 19 "zonetab.list"
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str252, -5*3600},
+#line 79 "zonetab.list"
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str253,  1*3600},
       {-1},
-#line 171 "zonetab.list"
-      {gperf_offsetof(stringpool, 258),                   46800},
-#line 211 "zonetab.list"
-      {gperf_offsetof(stringpool, 259),-36000},
+#line 167 "zonetab.list"
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str255,                 25200},
+#line 44 "zonetab.list"
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str256,   -9*3600},
       {-1},
-#line 308 "zonetab.list"
-      {gperf_offsetof(stringpool, 261),-14400},
-#line 119 "zonetab.list"
-      {gperf_offsetof(stringpool, 262),                14400},
-#line 123 "zonetab.list"
-      {gperf_offsetof(stringpool, 263),           3600},
-#line 28 "zonetab.list"
-      {gperf_offsetof(stringpool, 264),    8*3600},
-#line 124 "zonetab.list"
-      {gperf_offsetof(stringpool, 265),         3600},
-#line 153 "zonetab.list"
-      {gperf_offsetof(stringpool, 266),           -12600},
-#line 110 "zonetab.list"
-      {gperf_offsetof(stringpool, 267),                    10800},
-#line 289 "zonetab.list"
-      {gperf_offsetof(stringpool, 268),14400},
-#line 112 "zonetab.list"
-      {gperf_offsetof(stringpool, 269),                  10800},
-#line 111 "zonetab.list"
-      {gperf_offsetof(stringpool, 270),                 14400},
-#line 216 "zonetab.list"
-      {gperf_offsetof(stringpool, 271),36000},
+#line 174 "zonetab.list"
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str258,                   46800},
+#line 214 "zonetab.list"
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str259,-36000},
       {-1},
 #line 311 "zonetab.list"
-      {gperf_offsetof(stringpool, 273),21600},
-#line 66 "zonetab.list"
-      {gperf_offsetof(stringpool, 274),-10*3600},
-#line 151 "zonetab.list"
-      {gperf_offsetof(stringpool, 275),                   20700},
-#line 267 "zonetab.list"
-      {gperf_offsetof(stringpool, 276),-39600},
-#line 225 "zonetab.list"
-      {gperf_offsetof(stringpool, 277),-14400},
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str261,-14400},
+#line 122 "zonetab.list"
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str262,                14400},
+#line 126 "zonetab.list"
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str263,           3600},
+#line 31 "zonetab.list"
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str264,    8*3600},
+#line 127 "zonetab.list"
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str265,         3600},
+#line 156 "zonetab.list"
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str266,           -12600},
+#line 113 "zonetab.list"
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str267,                    10800},
+#line 292 "zonetab.list"
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str268,14400},
+#line 115 "zonetab.list"
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str269,                  10800},
+#line 114 "zonetab.list"
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str270,                 14400},
+#line 219 "zonetab.list"
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str271,36000},
       {-1},
-#line 224 "zonetab.list"
-      {gperf_offsetof(stringpool, 279),-10800},
-#line 67 "zonetab.list"
-      {gperf_offsetof(stringpool, 280),-10*3600},
-#line 237 "zonetab.list"
-      {gperf_offsetof(stringpool, 281),10800},
+#line 314 "zonetab.list"
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str273,21600},
+#line 69 "zonetab.list"
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str274,-10*3600},
+#line 154 "zonetab.list"
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str275,                   20700},
+#line 270 "zonetab.list"
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str276,-39600},
+#line 228 "zonetab.list"
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str277,-14400},
+      {-1},
+#line 227 "zonetab.list"
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str279,-10800},
+#line 70 "zonetab.list"
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str280,-10*3600},
+#line 240 "zonetab.list"
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str281,10800},
       {-1}, {-1},
-#line 297 "zonetab.list"
-      {gperf_offsetof(stringpool, 284),32400},
-#line 175 "zonetab.list"
-      {gperf_offsetof(stringpool, 285),            28800},
-#line 134 "zonetab.list"
-      {gperf_offsetof(stringpool, 286),                    7200},
-#line 149 "zonetab.list"
-      {gperf_offsetof(stringpool, 287),                 23400},
-#line 107 "zonetab.list"
-      {gperf_offsetof(stringpool, 288),13*3600},
-#line 230 "zonetab.list"
-      {gperf_offsetof(stringpool, 289),-10800},
-#line 307 "zonetab.list"
-      {gperf_offsetof(stringpool, 290),18000},
+#line 300 "zonetab.list"
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str284,32400},
+#line 178 "zonetab.list"
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str285,            28800},
+#line 137 "zonetab.list"
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str286,                    7200},
+#line 152 "zonetab.list"
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str287,                 23400},
+#line 110 "zonetab.list"
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str288,13*3600},
+#line 233 "zonetab.list"
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str289,-10800},
+#line 310 "zonetab.list"
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str290,18000},
       {-1}, {-1},
-#line 155 "zonetab.list"
-      {gperf_offsetof(stringpool, 293),              25200},
-#line 258 "zonetab.list"
-      {gperf_offsetof(stringpool, 294),18000},
-#line 227 "zonetab.list"
-      {gperf_offsetof(stringpool, 295),-21600},
+#line 158 "zonetab.list"
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str293,              25200},
 #line 261 "zonetab.list"
-      {gperf_offsetof(stringpool, 296),43200},
-#line 213 "zonetab.list"
-      {gperf_offsetof(stringpool, 297),-3600},
-#line 154 "zonetab.list"
-      {gperf_offsetof(stringpool, 298),         28800},
-      {-1},
-#line 243 "zonetab.list"
-      {gperf_offsetof(stringpool, 300),21600},
-#line 114 "zonetab.list"
-      {gperf_offsetof(stringpool, 301),             34200},
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str294,18000},
+#line 230 "zonetab.list"
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str295,-21600},
+#line 264 "zonetab.list"
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str296,43200},
+#line 216 "zonetab.list"
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str297,-3600},
 #line 157 "zonetab.list"
-      {gperf_offsetof(stringpool, 302),                -28800},
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str298,         28800},
       {-1},
+#line 246 "zonetab.list"
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str300,21600},
 #line 117 "zonetab.list"
-      {gperf_offsetof(stringpool, 304),         -21600},
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str301,             34200},
+#line 160 "zonetab.list"
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str302,                -28800},
       {-1},
-#line 156 "zonetab.list"
-      {gperf_offsetof(stringpool, 306),             -14400},
-#line 116 "zonetab.list"
-      {gperf_offsetof(stringpool, 307),                  -3600},
-#line 228 "zonetab.list"
-      {gperf_offsetof(stringpool, 308),-32400},
-#line 294 "zonetab.list"
-      {gperf_offsetof(stringpool, 309),18000},
-#line 37 "zonetab.list"
-      {gperf_offsetof(stringpool, 310),   -5*3600},
-#line 137 "zonetab.list"
-      {gperf_offsetof(stringpool, 311),                      7200},
-#line 58 "zonetab.list"
-      {gperf_offsetof(stringpool, 312),-8*3600},
-#line 304 "zonetab.list"
-      {gperf_offsetof(stringpool, 313),28800},
-#line 303 "zonetab.list"
-      {gperf_offsetof(stringpool, 314),32400},
-#line 284 "zonetab.list"
-      {gperf_offsetof(stringpool, 315),14400},
+#line 120 "zonetab.list"
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str304,         -21600},
       {-1},
-#line 295 "zonetab.list"
-      {gperf_offsetof(stringpool, 317),18000},
+#line 159 "zonetab.list"
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str306,             -14400},
+#line 119 "zonetab.list"
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str307,                  -3600},
+#line 231 "zonetab.list"
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str308,-32400},
+#line 297 "zonetab.list"
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str309,18000},
+#line 40 "zonetab.list"
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str310,   -5*3600},
+#line 140 "zonetab.list"
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str311,                      7200},
+#line 61 "zonetab.list"
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str312,-8*3600},
+#line 307 "zonetab.list"
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str313,28800},
+#line 306 "zonetab.list"
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str314,32400},
+#line 287 "zonetab.list"
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str315,14400},
       {-1},
-#line 166 "zonetab.list"
-      {gperf_offsetof(stringpool, 319),             7200},
+#line 298 "zonetab.list"
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str317,18000},
+      {-1},
+#line 169 "zonetab.list"
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str319,             7200},
       {-1}, {-1}, {-1}, {-1},
-#line 97 "zonetab.list"
-      {gperf_offsetof(stringpool, 324),  8*3600},
+#line 100 "zonetab.list"
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str324,  8*3600},
       {-1},
-#line 50 "zonetab.list"
-      {gperf_offsetof(stringpool, 326), -(1*3600+1800)},
-#line 285 "zonetab.list"
-      {gperf_offsetof(stringpool, 327),-10800},
+#line 53 "zonetab.list"
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str326, -(1*3600+1800)},
+#line 288 "zonetab.list"
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str327,-10800},
       {-1}, {-1},
-#line 287 "zonetab.list"
-      {gperf_offsetof(stringpool, 330),14400},
+#line 290 "zonetab.list"
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str330,14400},
       {-1},
-#line 169 "zonetab.list"
-      {gperf_offsetof(stringpool, 332),                36000},
+#line 172 "zonetab.list"
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str332,                36000},
       {-1},
-#line 235 "zonetab.list"
-      {gperf_offsetof(stringpool, 334),25200},
-#line 234 "zonetab.list"
-      {gperf_offsetof(stringpool, 335),28800},
+#line 238 "zonetab.list"
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str334,25200},
+#line 237 "zonetab.list"
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str335,28800},
       {-1}, {-1},
-#line 232 "zonetab.list"
-      {gperf_offsetof(stringpool, 338),-14400},
+#line 235 "zonetab.list"
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str338,-14400},
       {-1}, {-1}, {-1},
-#line 44 "zonetab.list"
-      {gperf_offsetof(stringpool, 342),  -12*3600},
-#line 61 "zonetab.list"
-      {gperf_offsetof(stringpool, 343),-9*3600},
-#line 162 "zonetab.list"
-      {gperf_offsetof(stringpool, 344),             -14400},
-#line 141 "zonetab.list"
-      {gperf_offsetof(stringpool, 345),               -36000},
+#line 47 "zonetab.list"
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str342,  -12*3600},
+#line 64 "zonetab.list"
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str343,-9*3600},
+#line 165 "zonetab.list"
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str344,             -14400},
+#line 144 "zonetab.list"
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str345,               -36000},
       {-1},
-#line 306 "zonetab.list"
-      {gperf_offsetof(stringpool, 347),-10800},
+#line 309 "zonetab.list"
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str347,-10800},
       {-1},
-#line 305 "zonetab.list"
-      {gperf_offsetof(stringpool, 349),-7200},
+#line 308 "zonetab.list"
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str349,-7200},
+#line 329 "zonetab.list"
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str350,18000},
+#line 328 "zonetab.list"
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str351,21600},
+#line 250 "zonetab.list"
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str352,14400},
 #line 326 "zonetab.list"
-      {gperf_offsetof(stringpool, 350),18000},
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str353,32400},
 #line 325 "zonetab.list"
-      {gperf_offsetof(stringpool, 351),21600},
-#line 247 "zonetab.list"
-      {gperf_offsetof(stringpool, 352),14400},
-#line 323 "zonetab.list"
-      {gperf_offsetof(stringpool, 353),32400},
-#line 322 "zonetab.list"
-      {gperf_offsetof(stringpool, 354),36000},
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str354,36000},
       {-1}, {-1}, {-1},
-#line 63 "zonetab.list"
-      {gperf_offsetof(stringpool, 358), -9*3600},
-#line 144 "zonetab.list"
-      {gperf_offsetof(stringpool, 359),                7200},
+#line 66 "zonetab.list"
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str358, -9*3600},
+#line 147 "zonetab.list"
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str359,                7200},
       {-1}, {-1}, {-1}, {-1}, {-1},
-#line 167 "zonetab.list"
-      {gperf_offsetof(stringpool, 365),               21600},
+#line 170 "zonetab.list"
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str365,               21600},
       {-1},
-#line 180 "zonetab.list"
-      {gperf_offsetof(stringpool, 367),                 32400},
+#line 183 "zonetab.list"
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str367,                 32400},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-#line 318 "zonetab.list"
-      {gperf_offsetof(stringpool, 375),25200},
+#line 321 "zonetab.list"
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str375,25200},
       {-1},
-#line 115 "zonetab.list"
-      {gperf_offsetof(stringpool, 377),             36000},
-#line 231 "zonetab.list"
-      {gperf_offsetof(stringpool, 378),43200},
+#line 118 "zonetab.list"
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str377,             36000},
+#line 234 "zonetab.list"
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str378,43200},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-#line 173 "zonetab.list"
-      {gperf_offsetof(stringpool, 387),            -25200},
+#line 176 "zonetab.list"
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str387,            -25200},
       {-1}, {-1}, {-1},
-#line 310 "zonetab.list"
-      {gperf_offsetof(stringpool, 391),36000},
-#line 309 "zonetab.list"
-      {gperf_offsetof(stringpool, 392),39600},
+#line 313 "zonetab.list"
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str391,36000},
+#line 312 "zonetab.list"
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str392,39600},
       {-1}, {-1},
-#line 140 "zonetab.list"
-      {gperf_offsetof(stringpool, 395),                      7200},
+#line 143 "zonetab.list"
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str395,                      7200},
       {-1}, {-1},
-#line 168 "zonetab.list"
-      {gperf_offsetof(stringpool, 398),                  28800},
-#line 290 "zonetab.list"
-      {gperf_offsetof(stringpool, 399),39600},
+#line 171 "zonetab.list"
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str398,                  28800},
+#line 293 "zonetab.list"
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str399,39600},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-#line 118 "zonetab.list"
-      {gperf_offsetof(stringpool, 408),              -3600},
+#line 121 "zonetab.list"
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str408,              -3600},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-#line 296 "zonetab.list"
-      {gperf_offsetof(stringpool, 417),46800},
-#line 163 "zonetab.list"
-      {gperf_offsetof(stringpool, 418),                  -39600},
+#line 299 "zonetab.list"
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str417,46800},
+#line 166 "zonetab.list"
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str418,                  -39600},
       {-1}, {-1},
-#line 161 "zonetab.list"
-      {gperf_offsetof(stringpool, 421),             -18000},
+#line 164 "zonetab.list"
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str421,             -18000},
       {-1}, {-1}, {-1}, {-1}, {-1},
-#line 312 "zonetab.list"
-      {gperf_offsetof(stringpool, 427),39600},
-#line 69 "zonetab.list"
-      {gperf_offsetof(stringpool, 428),-12*3600},
+#line 315 "zonetab.list"
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str427,39600},
+#line 72 "zonetab.list"
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str428,-12*3600},
       {-1}, {-1}, {-1},
-#line 136 "zonetab.list"
-      {gperf_offsetof(stringpool, 432),                    43200},
+#line 139 "zonetab.list"
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str432,                    43200},
       {-1}, {-1},
-#line 46 "zonetab.list"
-      {gperf_offsetof(stringpool, 435),  0*3600},
+#line 49 "zonetab.list"
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str435,  0*3600},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-#line 145 "zonetab.list"
-      {gperf_offsetof(stringpool, 443),                   32400},
+#line 148 "zonetab.list"
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str443,                   32400},
       {-1},
-#line 131 "zonetab.list"
-      {gperf_offsetof(stringpool, 445),                7200},
+#line 134 "zonetab.list"
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str445,                7200},
       {-1}, {-1}, {-1},
-#line 292 "zonetab.list"
-      {gperf_offsetof(stringpool, 449),10800},
+#line 295 "zonetab.list"
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str449,10800},
       {-1}, {-1},
-#line 150 "zonetab.list"
-      {gperf_offsetof(stringpool, 452),         21600},
+#line 153 "zonetab.list"
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str452,         21600},
       {-1}, {-1},
-#line 302 "zonetab.list"
-      {gperf_offsetof(stringpool, 455),43200},
+#line 305 "zonetab.list"
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str455,43200},
       {-1}, {-1},
-#line 176 "zonetab.list"
-      {gperf_offsetof(stringpool, 458),        3600},
+#line 179 "zonetab.list"
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str458,        3600},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-#line 135 "zonetab.list"
-      {gperf_offsetof(stringpool, 466),            18000},
+#line 138 "zonetab.list"
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str466,            18000},
       {-1},
-#line 174 "zonetab.list"
-      {gperf_offsetof(stringpool, 468),             36000},
+#line 177 "zonetab.list"
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str468,             36000},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-#line 324 "zonetab.list"
-      {gperf_offsetof(stringpool, 476),36000},
-#line 172 "zonetab.list"
-      {gperf_offsetof(stringpool, 477),             -18000},
+#line 327 "zonetab.list"
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str476,36000},
+#line 175 "zonetab.list"
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str477,             -18000},
       {-1}, {-1}, {-1}, {-1},
-#line 160 "zonetab.list"
-      {gperf_offsetof(stringpool, 482),             -10800},
+#line 163 "zonetab.list"
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str482,             -10800},
       {-1}, {-1},
-#line 62 "zonetab.list"
-      {gperf_offsetof(stringpool, 485), -9*3600},
-#line 159 "zonetab.list"
-      {gperf_offsetof(stringpool, 486),                 10800},
+#line 65 "zonetab.list"
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str485, -9*3600},
+#line 162 "zonetab.list"
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str486,                 10800},
       {-1}, {-1}, {-1}, {-1}, {-1},
-#line 233 "zonetab.list"
-      {gperf_offsetof(stringpool, 492),28800},
+#line 236 "zonetab.list"
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str492,28800},
       {-1}, {-1}, {-1}, {-1},
-#line 158 "zonetab.list"
-      {gperf_offsetof(stringpool, 497),                  3600},
+#line 161 "zonetab.list"
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str497,                  3600},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-#line 177 "zonetab.list"
-      {gperf_offsetof(stringpool, 540),                3600},
+#line 180 "zonetab.list"
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str540,                3600},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1},
-#line 59 "zonetab.list"
-      {gperf_offsetof(stringpool, 563), -8*3600},
+#line 62 "zonetab.list"
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str563, -8*3600},
       {-1}, {-1},
-#line 104 "zonetab.list"
-      {gperf_offsetof(stringpool, 566),12*3600},
-#line 139 "zonetab.list"
-      {gperf_offsetof(stringpool, 567),                   0},
+#line 107 "zonetab.list"
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str566,12*3600},
+#line 142 "zonetab.list"
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str567,                   0},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-#line 138 "zonetab.list"
-      {gperf_offsetof(stringpool, 619),              -10800}
+#line 141 "zonetab.list"
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str619,              -10800}
     };
 
   if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
@@ -1558,5 +1560,5 @@ zonetab (register const char *str, register size_t len)
     }
   return 0;
 }
-#line 327 "zonetab.list"
+#line 330 "zonetab.list"
 
diff --git a/ext/date/zonetab.list b/ext/date/zonetab.list
index 748aec1d8a93f0..63b6873447554b 100644
--- a/ext/date/zonetab.list
+++ b/ext/date/zonetab.list
@@ -1,4 +1,7 @@
 %{
+#define GPERF_DOWNCASE 1
+#define GPERF_CASE_STRNCMP 1
+#define gperf_case_strncmp strncasecmp
 struct zone {
     int name;
     int offset;
@@ -313,8 +316,8 @@ vut,39600
 wakt,43200
 warst,-10800
 wft,43200
-wgst,-7200
-wgt,-10800
+wgst,-3600
+wgt,-7200
 wib,25200
 wit,32400
 wita,28800
diff --git a/ext/digest/.document b/ext/digest/.document
new file mode 100644
index 00000000000000..beab275b5a015a
--- /dev/null
+++ b/ext/digest/.document
@@ -0,0 +1,3 @@
+digest.c
+bubblebabble/bubblebabble.c
+*/*init.c
diff --git a/ext/digest/bubblebabble/bubblebabble.c b/ext/digest/bubblebabble/bubblebabble.c
index 358ab416b97b64..dac603c0d7a0e8 100644
--- a/ext/digest/bubblebabble/bubblebabble.c
+++ b/ext/digest/bubblebabble/bubblebabble.c
@@ -129,15 +129,14 @@ Init_bubblebabble(void)
 
     rb_require("digest");
 
-    rb_mDigest = rb_path2class("Digest");
-    rb_mDigest_Instance = rb_path2class("Digest::Instance");
-    rb_cDigest_Class = rb_path2class("Digest::Class");
-
 #if 0
     rb_mDigest = rb_define_module("Digest");
     rb_mDigest_Instance = rb_define_module_under(rb_mDigest, "Instance");
     rb_cDigest_Class = rb_define_class_under(rb_mDigest, "Class", rb_cObject);
 #endif
+    rb_mDigest = rb_digest_namespace();
+    rb_mDigest_Instance = rb_const_get(rb_mDigest, rb_intern_const("Instance"));
+    rb_cDigest_Class = rb_const_get(rb_mDigest, rb_intern_const("Class"));
 
     rb_define_module_function(rb_mDigest, "bubblebabble", rb_digest_s_bubblebabble, 1);
     rb_define_singleton_method(rb_cDigest_Class, "bubblebabble", rb_digest_class_s_bubblebabble, -1);
diff --git a/ext/digest/bubblebabble/depend b/ext/digest/bubblebabble/depend
index 6f0003a66d926a..02d88e960c112a 100644
--- a/ext/digest/bubblebabble/depend
+++ b/ext/digest/bubblebabble/depend
@@ -128,6 +128,7 @@ bubblebabble.o: $(hdrdir)/ruby/internal/intern/re.h
 bubblebabble.o: $(hdrdir)/ruby/internal/intern/ruby.h
 bubblebabble.o: $(hdrdir)/ruby/internal/intern/select.h
 bubblebabble.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+bubblebabble.o: $(hdrdir)/ruby/internal/intern/set.h
 bubblebabble.o: $(hdrdir)/ruby/internal/intern/signal.h
 bubblebabble.o: $(hdrdir)/ruby/internal/intern/sprintf.h
 bubblebabble.o: $(hdrdir)/ruby/internal/intern/string.h
@@ -147,6 +148,7 @@ bubblebabble.o: $(hdrdir)/ruby/internal/special_consts.h
 bubblebabble.o: $(hdrdir)/ruby/internal/static_assert.h
 bubblebabble.o: $(hdrdir)/ruby/internal/stdalign.h
 bubblebabble.o: $(hdrdir)/ruby/internal/stdbool.h
+bubblebabble.o: $(hdrdir)/ruby/internal/stdckdint.h
 bubblebabble.o: $(hdrdir)/ruby/internal/symbol.h
 bubblebabble.o: $(hdrdir)/ruby/internal/value.h
 bubblebabble.o: $(hdrdir)/ruby/internal/value_type.h
diff --git a/ext/digest/defs.h b/ext/digest/defs.h
index 77a134f36449e7..9b11f4eca9a762 100644
--- a/ext/digest/defs.h
+++ b/ext/digest/defs.h
@@ -16,4 +16,26 @@
 # define __END_DECLS
 #endif
 
+#define RB_DIGEST_DIAGNOSTIC(compiler, op, flag) _Pragma(STRINGIZE(compiler diagnostic op flag))
+#ifdef RBIMPL_WARNING_IGNORED
+# define RB_DIGEST_WARNING_IGNORED(flag) RBIMPL_WARNING_IGNORED(flag)
+# define RB_DIGEST_WARNING_PUSH() RBIMPL_WARNING_PUSH()
+# define RB_DIGEST_WARNING_POP() RBIMPL_WARNING_POP()
+#elif defined(__clang__)
+# define RB_DIGEST_WARNING_IGNORED(flag) RB_DIGEST_DIAGNOSTIC(clang, ignored, #flag)
+# define RB_DIGEST_WARNING_PUSH() _Pragma("clang diagnostic push")
+# define RB_DIGEST_WARNING_POP() _Pragma("clang diagnostic pop")
+#else /* __GNUC__ */
+# define RB_DIGEST_WARNING_IGNORED(flag) RB_DIGEST_DIAGNOSTIC(GCC, ignored, #flag)
+# define RB_DIGEST_WARNING_PUSH() _Pragma("GCC diagnostic push")
+# define RB_DIGEST_WARNING_POP() _Pragma("GCC diagnostic pop")
+#endif
+#ifdef RBIMPL_HAS_WARNING
+# define RB_DIGEST_HAS_WARNING(_) RBIMPL_HAS_WARNING(_)
+#elif defined(__has_warning)
+# define RB_DIGEST_HAS_WARNING(_) __has_warning(_)
+#else
+# define RB_DIGEST_HAS_WARNING(_) 0
+#endif
+
 #endif /* DEFS_H */
diff --git a/ext/digest/depend b/ext/digest/depend
index 6df940a67984a1..3eabb1d1d6a570 100644
--- a/ext/digest/depend
+++ b/ext/digest/depend
@@ -128,6 +128,7 @@ digest.o: $(hdrdir)/ruby/internal/intern/re.h
 digest.o: $(hdrdir)/ruby/internal/intern/ruby.h
 digest.o: $(hdrdir)/ruby/internal/intern/select.h
 digest.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+digest.o: $(hdrdir)/ruby/internal/intern/set.h
 digest.o: $(hdrdir)/ruby/internal/intern/signal.h
 digest.o: $(hdrdir)/ruby/internal/intern/sprintf.h
 digest.o: $(hdrdir)/ruby/internal/intern/string.h
@@ -147,6 +148,7 @@ digest.o: $(hdrdir)/ruby/internal/special_consts.h
 digest.o: $(hdrdir)/ruby/internal/static_assert.h
 digest.o: $(hdrdir)/ruby/internal/stdalign.h
 digest.o: $(hdrdir)/ruby/internal/stdbool.h
+digest.o: $(hdrdir)/ruby/internal/stdckdint.h
 digest.o: $(hdrdir)/ruby/internal/symbol.h
 digest.o: $(hdrdir)/ruby/internal/value.h
 digest.o: $(hdrdir)/ruby/internal/value_type.h
diff --git a/ext/digest/digest.c b/ext/digest/digest.c
index 68837a674c7479..bd8d3e815ffe6a 100644
--- a/ext/digest/digest.c
+++ b/ext/digest/digest.c
@@ -534,9 +534,39 @@ rb_digest_class_init(VALUE self)
  *
  *
  *  rb_ivar_set(cDigest_SHA1, rb_intern("metadata"),
- *		Data_Wrap_Struct(0, 0, 0, (void *)&sha1));
+ *		rb_digest_make_metadata(&sha1));
  */
 
+#ifdef DIGEST_USE_RB_EXT_RESOLVE_SYMBOL
+static const rb_data_type_t metadata_type = {
+    "digest/metadata",
+    {0},
+};
+
+RUBY_FUNC_EXPORTED VALUE
+rb_digest_wrap_metadata(const rb_digest_metadata_t *meta)
+{
+    return rb_obj_freeze(TypedData_Wrap_Struct(0, &metadata_type, (void *)meta));
+}
+#endif
+
+static rb_digest_metadata_t *
+get_metadata_ptr(VALUE obj)
+{
+    rb_digest_metadata_t *algo;
+
+#ifdef DIGEST_USE_RB_EXT_RESOLVE_SYMBOL
+    if (!rb_typeddata_is_kind_of(obj, &metadata_type)) return 0;
+    algo = RTYPEDDATA_DATA(obj);
+#else
+# undef RUBY_UNTYPED_DATA_WARNING
+# define RUBY_UNTYPED_DATA_WARNING 0
+    Data_Get_Struct(obj, rb_digest_metadata_t, algo);
+#endif
+
+    return algo;
+}
+
 static rb_digest_metadata_t *
 get_digest_base_metadata(VALUE klass)
 {
@@ -554,8 +584,8 @@ get_digest_base_metadata(VALUE klass)
     if (NIL_P(p))
         rb_raise(rb_eRuntimeError, "Digest::Base cannot be directly inherited in Ruby");
 
-    if (!RB_TYPE_P(obj, T_DATA) || RTYPEDDATA_P(obj)) {
-      wrong:
+    algo = get_metadata_ptr(obj);
+    if (!algo) {
         if (p == klass)
             rb_raise(rb_eTypeError, "%"PRIsVALUE"::metadata is not initialized properly",
                      klass);
@@ -564,12 +594,6 @@ get_digest_base_metadata(VALUE klass)
                      klass, p);
     }
 
-#undef RUBY_UNTYPED_DATA_WARNING
-#define RUBY_UNTYPED_DATA_WARNING 0
-    Data_Get_Struct(obj, rb_digest_metadata_t, algo);
-
-    if (!algo) goto wrong;
-
     switch (algo->api_version) {
       case 3:
         break;
diff --git a/ext/digest/digest.h b/ext/digest/digest.h
index 8a4c5b7e4e5884..c5c37583a6e7c9 100644
--- a/ext/digest/digest.h
+++ b/ext/digest/digest.h
@@ -40,7 +40,8 @@ rb_digest_##name##_update(void *ctx, unsigned char *ptr, size_t size) \
     for (; size > stride; size -= stride, ptr += stride) { \
         name##_Update(ctx, ptr, stride); \
     } \
-    if (size > 0) name##_Update(ctx, ptr, size); \
+    /* Since size <= stride, size should fit into an unsigned int */ \
+    if (size > 0) name##_Update(ctx, ptr, (unsigned int)size); \
 }
 
 #define DEFINE_FINISH_FUNC_FROM_FINAL(name) \
@@ -63,10 +64,43 @@ rb_id_metadata(void)
     return rb_intern_const("metadata");
 }
 
+#if !defined(HAVE_RB_EXT_RESOLVE_SYMBOL)
+#elif !defined(RUBY_UNTYPED_DATA_WARNING)
+# error RUBY_UNTYPED_DATA_WARNING is not defined
+#elif RUBY_UNTYPED_DATA_WARNING
+/* rb_ext_resolve_symbol() has been defined since Ruby 3.3, but digest
+ * bundled with 3.3 didn't use it. */
+# define DIGEST_USE_RB_EXT_RESOLVE_SYMBOL 1
+#endif
+
 static inline VALUE
 rb_digest_make_metadata(const rb_digest_metadata_t *meta)
 {
-#undef RUBY_UNTYPED_DATA_WARNING
-#define RUBY_UNTYPED_DATA_WARNING 0
+#if defined(EXTSTATIC) && EXTSTATIC
+    /* The extension is built as a static library, so safe to refer to
+     * rb_digest_wrap_metadata directly. */
+    extern VALUE rb_digest_wrap_metadata(const rb_digest_metadata_t *meta);
+    return rb_digest_wrap_metadata(meta);
+#else
+    /* The extension is built as a shared library, so we can't refer
+     * to rb_digest_wrap_metadata directly. */
+# ifdef DIGEST_USE_RB_EXT_RESOLVE_SYMBOL
+    /* If rb_ext_resolve_symbol() is available, use it to get the address of
+     * rb_digest_wrap_metadata. */
+    typedef VALUE (*wrapper_func_type)(const rb_digest_metadata_t *meta);
+    static wrapper_func_type wrapper;
+    if (!wrapper) {
+        wrapper = (wrapper_func_type)(uintptr_t)
+            rb_ext_resolve_symbol("digest.so", "rb_digest_wrap_metadata");
+        if (!wrapper) rb_raise(rb_eLoadError, "rb_digest_wrap_metadata not found");
+    }
+    return wrapper(meta);
+# else
+    /* If rb_ext_resolve_symbol() is not available, keep using untyped
+     * data. */
+# undef RUBY_UNTYPED_DATA_WARNING
+# define RUBY_UNTYPED_DATA_WARNING 0
     return rb_obj_freeze(Data_Wrap_Struct(0, 0, 0, (void *)meta));
+# endif
+#endif
 }
diff --git a/ext/digest/digest_conf.rb b/ext/digest/digest_conf.rb
index 36a7d75289d081..099d20fcbe31c3 100644
--- a/ext/digest/digest_conf.rb
+++ b/ext/digest/digest_conf.rb
@@ -2,14 +2,16 @@
 
 def digest_conf(name)
   unless with_config("bundled-#{name}")
-    cc = with_config("common-digest")
-    if cc != false or /\b#{name}\b/ =~ cc
-      if File.exist?("#$srcdir/#{name}cc.h") and
-        have_header("CommonCrypto/CommonDigest.h")
-        $defs << "-D#{name.upcase}_USE_COMMONDIGEST"
-        $headers << "#{name}cc.h"
-        return :commondigest
-      end
+    case cc = with_config("common-digest", true)
+    when true, false
+    else
+      cc = cc.split(/[\s,]++/).any? {|pat| File.fnmatch?(pat, name)}
+    end
+    if cc and File.exist?("#$srcdir/#{name}cc.h") and
+      have_header("CommonCrypto/CommonDigest.h")
+      $defs << "-D#{name.upcase}_USE_COMMONDIGEST"
+      $headers << "#{name}cc.h"
+      return :commondigest
     end
   end
   $objs << "#{name}.#{$OBJEXT}"
diff --git a/ext/digest/lib/digest/version.rb b/ext/digest/lib/digest/version.rb
index 42fd7acf6e4b88..854106165cab52 100644
--- a/ext/digest/lib/digest/version.rb
+++ b/ext/digest/lib/digest/version.rb
@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Digest
-  VERSION = "3.1.1"
+  VERSION = "3.2.0"
 end
diff --git a/ext/digest/md5/depend b/ext/digest/md5/depend
index da1b345999d792..d1c25c28c89aa7 100644
--- a/ext/digest/md5/depend
+++ b/ext/digest/md5/depend
@@ -131,6 +131,7 @@ md5.o: $(hdrdir)/ruby/internal/intern/re.h
 md5.o: $(hdrdir)/ruby/internal/intern/ruby.h
 md5.o: $(hdrdir)/ruby/internal/intern/select.h
 md5.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+md5.o: $(hdrdir)/ruby/internal/intern/set.h
 md5.o: $(hdrdir)/ruby/internal/intern/signal.h
 md5.o: $(hdrdir)/ruby/internal/intern/sprintf.h
 md5.o: $(hdrdir)/ruby/internal/intern/string.h
@@ -150,6 +151,7 @@ md5.o: $(hdrdir)/ruby/internal/special_consts.h
 md5.o: $(hdrdir)/ruby/internal/static_assert.h
 md5.o: $(hdrdir)/ruby/internal/stdalign.h
 md5.o: $(hdrdir)/ruby/internal/stdbool.h
+md5.o: $(hdrdir)/ruby/internal/stdckdint.h
 md5.o: $(hdrdir)/ruby/internal/symbol.h
 md5.o: $(hdrdir)/ruby/internal/value.h
 md5.o: $(hdrdir)/ruby/internal/value_type.h
@@ -292,6 +294,7 @@ md5init.o: $(hdrdir)/ruby/internal/intern/re.h
 md5init.o: $(hdrdir)/ruby/internal/intern/ruby.h
 md5init.o: $(hdrdir)/ruby/internal/intern/select.h
 md5init.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+md5init.o: $(hdrdir)/ruby/internal/intern/set.h
 md5init.o: $(hdrdir)/ruby/internal/intern/signal.h
 md5init.o: $(hdrdir)/ruby/internal/intern/sprintf.h
 md5init.o: $(hdrdir)/ruby/internal/intern/string.h
@@ -311,6 +314,7 @@ md5init.o: $(hdrdir)/ruby/internal/special_consts.h
 md5init.o: $(hdrdir)/ruby/internal/static_assert.h
 md5init.o: $(hdrdir)/ruby/internal/stdalign.h
 md5init.o: $(hdrdir)/ruby/internal/stdbool.h
+md5init.o: $(hdrdir)/ruby/internal/stdckdint.h
 md5init.o: $(hdrdir)/ruby/internal/symbol.h
 md5init.o: $(hdrdir)/ruby/internal/value.h
 md5init.o: $(hdrdir)/ruby/internal/value_type.h
diff --git a/ext/digest/md5/md5cc.h b/ext/digest/md5/md5cc.h
index e34d7d5c115a0c..a002c17604da8b 100644
--- a/ext/digest/md5/md5cc.h
+++ b/ext/digest/md5/md5cc.h
@@ -1,8 +1,8 @@
 #define COMMON_DIGEST_FOR_OPENSSL 1
 #include <CommonCrypto/CommonDigest.h>
 
-#ifdef __clang__
-# pragma clang diagnostic ignored "-Wdeprecated-declarations"
+#ifdef __GNUC__
+RB_DIGEST_WARNING_IGNORED(-Wdeprecated-declarations)
 /* Suppress deprecation warnings of MD5 from Xcode 11.1 */
 /* Although we know MD5 is deprecated too, provide just for backward
  * compatibility, as well as Apple does. */
@@ -17,3 +17,11 @@ static DEFINE_FINISH_FUNC_FROM_FINAL(MD5)
 #undef MD5_Finish
 #define MD5_Update rb_digest_MD5_update
 #define MD5_Finish rb_digest_MD5_finish
+
+/*
+ * Pre-10.6 defines are with args, which don't match the argless use in
+ * the function pointer inits.  Thus, we redefine MD5_Init as well.
+ * This is a NOP on 10.6+.
+ */
+#undef MD5_Init
+#define MD5_Init CC_MD5_Init
diff --git a/ext/digest/md5/md5init.c b/ext/digest/md5/md5init.c
index 52cba78bf1131c..c919060587676c 100644
--- a/ext/digest/md5/md5init.c
+++ b/ext/digest/md5/md5init.c
@@ -3,6 +3,7 @@
 
 #include <ruby/ruby.h>
 #include "../digest.h"
+#include "../defs.h"
 #if defined(MD5_USE_COMMONDIGEST)
 #include "md5cc.h"
 #else
@@ -53,9 +54,8 @@ Init_md5(void)
     mDigest = rb_define_module("Digest"); /* let rdoc know */
 #endif
     mDigest = rb_digest_namespace();
-    cDigest_Base = rb_path2class("Digest::Base");
+    cDigest_Base = rb_const_get(mDigest, rb_intern_const("Base"));
 
     cDigest_MD5 = rb_define_class_under(mDigest, "MD5", cDigest_Base);
-
     rb_iv_set(cDigest_MD5, "metadata", rb_digest_make_metadata(&md5));
 }
diff --git a/ext/digest/rmd160/depend b/ext/digest/rmd160/depend
index abfa08b02350aa..aec484f7b3ee38 100644
--- a/ext/digest/rmd160/depend
+++ b/ext/digest/rmd160/depend
@@ -131,6 +131,7 @@ rmd160.o: $(hdrdir)/ruby/internal/intern/re.h
 rmd160.o: $(hdrdir)/ruby/internal/intern/ruby.h
 rmd160.o: $(hdrdir)/ruby/internal/intern/select.h
 rmd160.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+rmd160.o: $(hdrdir)/ruby/internal/intern/set.h
 rmd160.o: $(hdrdir)/ruby/internal/intern/signal.h
 rmd160.o: $(hdrdir)/ruby/internal/intern/sprintf.h
 rmd160.o: $(hdrdir)/ruby/internal/intern/string.h
@@ -150,6 +151,7 @@ rmd160.o: $(hdrdir)/ruby/internal/special_consts.h
 rmd160.o: $(hdrdir)/ruby/internal/static_assert.h
 rmd160.o: $(hdrdir)/ruby/internal/stdalign.h
 rmd160.o: $(hdrdir)/ruby/internal/stdbool.h
+rmd160.o: $(hdrdir)/ruby/internal/stdckdint.h
 rmd160.o: $(hdrdir)/ruby/internal/symbol.h
 rmd160.o: $(hdrdir)/ruby/internal/value.h
 rmd160.o: $(hdrdir)/ruby/internal/value_type.h
@@ -292,6 +294,7 @@ rmd160init.o: $(hdrdir)/ruby/internal/intern/re.h
 rmd160init.o: $(hdrdir)/ruby/internal/intern/ruby.h
 rmd160init.o: $(hdrdir)/ruby/internal/intern/select.h
 rmd160init.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+rmd160init.o: $(hdrdir)/ruby/internal/intern/set.h
 rmd160init.o: $(hdrdir)/ruby/internal/intern/signal.h
 rmd160init.o: $(hdrdir)/ruby/internal/intern/sprintf.h
 rmd160init.o: $(hdrdir)/ruby/internal/intern/string.h
@@ -311,6 +314,7 @@ rmd160init.o: $(hdrdir)/ruby/internal/special_consts.h
 rmd160init.o: $(hdrdir)/ruby/internal/static_assert.h
 rmd160init.o: $(hdrdir)/ruby/internal/stdalign.h
 rmd160init.o: $(hdrdir)/ruby/internal/stdbool.h
+rmd160init.o: $(hdrdir)/ruby/internal/stdckdint.h
 rmd160init.o: $(hdrdir)/ruby/internal/symbol.h
 rmd160init.o: $(hdrdir)/ruby/internal/value.h
 rmd160init.o: $(hdrdir)/ruby/internal/value_type.h
diff --git a/ext/digest/rmd160/rmd160init.c b/ext/digest/rmd160/rmd160init.c
index 2ae81ec4d60346..e4b707ed9e0dd8 100644
--- a/ext/digest/rmd160/rmd160init.c
+++ b/ext/digest/rmd160/rmd160init.c
@@ -49,9 +49,8 @@ Init_rmd160(void)
     mDigest = rb_define_module("Digest"); /* let rdoc know */
 #endif
     mDigest = rb_digest_namespace();
-    cDigest_Base = rb_path2class("Digest::Base");
+    cDigest_Base = rb_const_get(mDigest, rb_intern_const("Base"));
 
     cDigest_RMD160 = rb_define_class_under(mDigest, "RMD160", cDigest_Base);
-
     rb_iv_set(cDigest_RMD160, "metadata", rb_digest_make_metadata(&rmd160));
 }
diff --git a/ext/digest/sha1/depend b/ext/digest/sha1/depend
index d17338e92b77ec..e6bd9d8f731cd9 100644
--- a/ext/digest/sha1/depend
+++ b/ext/digest/sha1/depend
@@ -131,6 +131,7 @@ sha1.o: $(hdrdir)/ruby/internal/intern/re.h
 sha1.o: $(hdrdir)/ruby/internal/intern/ruby.h
 sha1.o: $(hdrdir)/ruby/internal/intern/select.h
 sha1.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+sha1.o: $(hdrdir)/ruby/internal/intern/set.h
 sha1.o: $(hdrdir)/ruby/internal/intern/signal.h
 sha1.o: $(hdrdir)/ruby/internal/intern/sprintf.h
 sha1.o: $(hdrdir)/ruby/internal/intern/string.h
@@ -150,6 +151,7 @@ sha1.o: $(hdrdir)/ruby/internal/special_consts.h
 sha1.o: $(hdrdir)/ruby/internal/static_assert.h
 sha1.o: $(hdrdir)/ruby/internal/stdalign.h
 sha1.o: $(hdrdir)/ruby/internal/stdbool.h
+sha1.o: $(hdrdir)/ruby/internal/stdckdint.h
 sha1.o: $(hdrdir)/ruby/internal/symbol.h
 sha1.o: $(hdrdir)/ruby/internal/value.h
 sha1.o: $(hdrdir)/ruby/internal/value_type.h
@@ -292,6 +294,7 @@ sha1init.o: $(hdrdir)/ruby/internal/intern/re.h
 sha1init.o: $(hdrdir)/ruby/internal/intern/ruby.h
 sha1init.o: $(hdrdir)/ruby/internal/intern/select.h
 sha1init.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+sha1init.o: $(hdrdir)/ruby/internal/intern/set.h
 sha1init.o: $(hdrdir)/ruby/internal/intern/signal.h
 sha1init.o: $(hdrdir)/ruby/internal/intern/sprintf.h
 sha1init.o: $(hdrdir)/ruby/internal/intern/string.h
@@ -311,6 +314,7 @@ sha1init.o: $(hdrdir)/ruby/internal/special_consts.h
 sha1init.o: $(hdrdir)/ruby/internal/static_assert.h
 sha1init.o: $(hdrdir)/ruby/internal/stdalign.h
 sha1init.o: $(hdrdir)/ruby/internal/stdbool.h
+sha1init.o: $(hdrdir)/ruby/internal/stdckdint.h
 sha1init.o: $(hdrdir)/ruby/internal/symbol.h
 sha1init.o: $(hdrdir)/ruby/internal/value.h
 sha1init.o: $(hdrdir)/ruby/internal/value_type.h
diff --git a/ext/digest/sha1/sha1.c b/ext/digest/sha1/sha1.c
index 53112275498795..ce200270b72ba6 100644
--- a/ext/digest/sha1/sha1.c
+++ b/ext/digest/sha1/sha1.c
@@ -232,8 +232,14 @@ void SHA1_Update(SHA1_CTX *context, const uint8_t *data, size_t len)
     if ((j + len) > 63) {
 	(void)memcpy(&context->buffer[j], data, (i = 64-j));
 	SHA1_Transform(context->state, context->buffer);
-	for ( ; i + 63 < len; i += 64)
+	for ( ; i + 63 < len; i += 64) {
+	    RB_DIGEST_WARNING_PUSH();
+#if defined(__GNUC__) && !defined(__clang__) && __GNUC__ >= 11
+	    RB_DIGEST_WARNING_IGNORED(-Wstringop-overread);
+#endif
 	    SHA1_Transform(context->state, &data[i]);
+	    RB_DIGEST_WARNING_POP();
+	}
 	j = 0;
     } else {
 	i = 0;
diff --git a/ext/digest/sha1/sha1cc.h b/ext/digest/sha1/sha1cc.h
index 2ed8d646ab3fa1..f39ecc623405c3 100644
--- a/ext/digest/sha1/sha1cc.h
+++ b/ext/digest/sha1/sha1cc.h
@@ -12,3 +12,11 @@ static DEFINE_FINISH_FUNC_FROM_FINAL(SHA1)
 #undef SHA1_Finish
 #define SHA1_Update rb_digest_SHA1_update
 #define SHA1_Finish rb_digest_SHA1_finish
+
+/*
+ * Pre-10.6 defines are with args, which don't match the argless use in
+ * the function pointer inits.  Thus, we redefine SHA1_Init as well.
+ * This is a NOP on 10.6+.
+ */
+#undef SHA1_Init
+#define SHA1_Init CC_SHA1_Init
diff --git a/ext/digest/sha1/sha1init.c b/ext/digest/sha1/sha1init.c
index f7047bc6d3c3c1..c39959f428ac04 100644
--- a/ext/digest/sha1/sha1init.c
+++ b/ext/digest/sha1/sha1init.c
@@ -55,9 +55,8 @@ Init_sha1(void)
     mDigest = rb_define_module("Digest"); /* let rdoc know */
 #endif
     mDigest = rb_digest_namespace();
-    cDigest_Base = rb_path2class("Digest::Base");
+    cDigest_Base = rb_const_get(mDigest, rb_intern_const("Base"));
 
     cDigest_SHA1 = rb_define_class_under(mDigest, "SHA1", cDigest_Base);
-
     rb_iv_set(cDigest_SHA1, "metadata", rb_digest_make_metadata(&sha1));
 }
diff --git a/ext/digest/sha2/depend b/ext/digest/sha2/depend
index 7b88b6411f3307..2b74776b3e097c 100644
--- a/ext/digest/sha2/depend
+++ b/ext/digest/sha2/depend
@@ -131,6 +131,7 @@ sha2.o: $(hdrdir)/ruby/internal/intern/re.h
 sha2.o: $(hdrdir)/ruby/internal/intern/ruby.h
 sha2.o: $(hdrdir)/ruby/internal/intern/select.h
 sha2.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+sha2.o: $(hdrdir)/ruby/internal/intern/set.h
 sha2.o: $(hdrdir)/ruby/internal/intern/signal.h
 sha2.o: $(hdrdir)/ruby/internal/intern/sprintf.h
 sha2.o: $(hdrdir)/ruby/internal/intern/string.h
@@ -150,6 +151,7 @@ sha2.o: $(hdrdir)/ruby/internal/special_consts.h
 sha2.o: $(hdrdir)/ruby/internal/static_assert.h
 sha2.o: $(hdrdir)/ruby/internal/stdalign.h
 sha2.o: $(hdrdir)/ruby/internal/stdbool.h
+sha2.o: $(hdrdir)/ruby/internal/stdckdint.h
 sha2.o: $(hdrdir)/ruby/internal/symbol.h
 sha2.o: $(hdrdir)/ruby/internal/value.h
 sha2.o: $(hdrdir)/ruby/internal/value_type.h
@@ -292,6 +294,7 @@ sha2init.o: $(hdrdir)/ruby/internal/intern/re.h
 sha2init.o: $(hdrdir)/ruby/internal/intern/ruby.h
 sha2init.o: $(hdrdir)/ruby/internal/intern/select.h
 sha2init.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+sha2init.o: $(hdrdir)/ruby/internal/intern/set.h
 sha2init.o: $(hdrdir)/ruby/internal/intern/signal.h
 sha2init.o: $(hdrdir)/ruby/internal/intern/sprintf.h
 sha2init.o: $(hdrdir)/ruby/internal/intern/string.h
@@ -311,6 +314,7 @@ sha2init.o: $(hdrdir)/ruby/internal/special_consts.h
 sha2init.o: $(hdrdir)/ruby/internal/static_assert.h
 sha2init.o: $(hdrdir)/ruby/internal/stdalign.h
 sha2init.o: $(hdrdir)/ruby/internal/stdbool.h
+sha2init.o: $(hdrdir)/ruby/internal/stdckdint.h
 sha2init.o: $(hdrdir)/ruby/internal/symbol.h
 sha2init.o: $(hdrdir)/ruby/internal/value.h
 sha2init.o: $(hdrdir)/ruby/internal/value_type.h
diff --git a/ext/digest/sha2/sha2cc.h b/ext/digest/sha2/sha2cc.h
index 3f99604465b6e0..1245a2e2c7d6b4 100644
--- a/ext/digest/sha2/sha2cc.h
+++ b/ext/digest/sha2/sha2cc.h
@@ -1,6 +1,33 @@
 #define COMMON_DIGEST_FOR_OPENSSL 1
 #include <CommonCrypto/CommonDigest.h>
 
+/*
+ * Prior to 10.5, OpenSSL-compatible definitions are missing for
+ * SHA2 macros, though the CC_ versions are present.
+ * Add the missing definitions we actually use here if needed.
+ * Note that the definitions are the argless 10.6+-style.
+ * The weird CTX mismatch is copied from the 10.6 header.
+ */
+#ifndef SHA256_DIGEST_LENGTH
+#define SHA256_DIGEST_LENGTH	CC_SHA256_DIGEST_LENGTH
+#define SHA256_CTX		CC_SHA256_CTX
+#define SHA256_Update		CC_SHA256_Update
+#define SHA256_Final		CC_SHA256_Final
+#endif /* !defined SHA256_DIGEST_LENGTH */
+
+#ifndef SHA384_DIGEST_LENGTH
+#define SHA384_DIGEST_LENGTH	CC_SHA384_DIGEST_LENGTH
+#define SHA512_CTX		CC_SHA512_CTX
+#define SHA384_Update		CC_SHA384_Update
+#define SHA384_Final		CC_SHA384_Final
+#endif /* !defined SHA384_DIGEST_LENGTH */
+
+#ifndef SHA512_DIGEST_LENGTH
+#define SHA512_DIGEST_LENGTH	CC_SHA512_DIGEST_LENGTH
+#define SHA512_Update		CC_SHA512_Update
+#define SHA512_Final		CC_SHA512_Final
+#endif /* !defined SHA512_DIGEST_LENGTH */
+
 #define SHA256_BLOCK_LENGTH	CC_SHA256_BLOCK_BYTES
 #define SHA384_BLOCK_LENGTH	CC_SHA384_BLOCK_BYTES
 #define SHA512_BLOCK_LENGTH	CC_SHA512_BLOCK_BYTES
@@ -29,3 +56,15 @@ static DEFINE_FINISH_FUNC_FROM_FINAL(SHA512)
 #undef SHA512_Finish
 #define SHA512_Update rb_digest_SHA512_update
 #define SHA512_Finish rb_digest_SHA512_finish
+
+/*
+ * Pre-10.6 defines are with args, which don't match the argless use in
+ * the function pointer inits.  Thus, we redefine SHA*_Init as well.
+ * This is a NOP on 10.6+.
+ */
+#undef SHA256_Init
+#define SHA256_Init CC_SHA256_Init
+#undef SHA384_Init
+#define SHA384_Init CC_SHA384_Init
+#undef SHA512_Init
+#define SHA512_Init CC_SHA512_Init
diff --git a/ext/digest/sha2/sha2init.c b/ext/digest/sha2/sha2init.c
index 94cccf3febb936..3923e3724c3eed 100644
--- a/ext/digest/sha2/sha2init.c
+++ b/ext/digest/sha2/sha2init.c
@@ -25,29 +25,50 @@ static const rb_digest_metadata_t sha##bitlen = { \
 FOREACH_BITLEN(DEFINE_ALGO_METADATA)
 
 /*
+ * Document-class: Digest::SHA256 < Digest::Base
+ *
  * Classes for calculating message digests using the SHA-256/384/512
  * Secure Hash Algorithm(s) by NIST (the US' National Institute of
  * Standards and Technology), described in FIPS PUB 180-2.
+ *
+ * See SHA2.
+ */
+/*
+ * Document-class: Digest::SHA384 < Digest::Base
+ *
+ * Classes for calculating message digests using the SHA-256/384/512
+ * Secure Hash Algorithm(s) by NIST (the US' National Institute of
+ * Standards and Technology), described in FIPS PUB 180-2.
+ *
+ * See SHA2.
+ */
+/*
+ * Document-class: Digest::SHA512 < Digest::Base
+ *
+ * Classes for calculating message digests using the SHA-256/384/512
+ * Secure Hash Algorithm(s) by NIST (the US' National Institute of
+ * Standards and Technology), described in FIPS PUB 180-2.
+ *
+ * See SHA2.
  */
 void
 Init_sha2(void)
 {
-    VALUE mDigest, cDigest_Base;
+    VALUE mDigest, cDigest_Base, cDigest_SHA2;
     ID id_metadata = rb_id_metadata();
 
-#define DECLARE_ALGO_CLASS(bitlen) \
-    VALUE cDigest_SHA##bitlen;
-
-    FOREACH_BITLEN(DECLARE_ALGO_CLASS)
-
+#if 0
+    mDigest = rb_define_module("Digest"); /* let rdoc know */
+#endif
     mDigest = rb_digest_namespace();
-    cDigest_Base = rb_path2class("Digest::Base");
+    cDigest_Base = rb_const_get(mDigest, rb_intern_const("Base"));
+
+    cDigest_SHA2 = rb_define_class_under(mDigest, "SHA256", cDigest_Base);
+    rb_ivar_set(cDigest_SHA2, id_metadata, rb_digest_make_metadata(&sha256));
 
-#define DEFINE_ALGO_CLASS(bitlen) \
-    cDigest_SHA##bitlen = rb_define_class_under(mDigest, "SHA" #bitlen, cDigest_Base); \
-\
-    rb_ivar_set(cDigest_SHA##bitlen, id_metadata, \
-                rb_digest_make_metadata(&sha##bitlen));
+    cDigest_SHA2 = rb_define_class_under(mDigest, "SHA384", cDigest_Base);
+    rb_ivar_set(cDigest_SHA2, id_metadata, rb_digest_make_metadata(&sha384));
 
-    FOREACH_BITLEN(DEFINE_ALGO_CLASS)
+    cDigest_SHA2 = rb_define_class_under(mDigest, "SHA512", cDigest_Base);
+    rb_ivar_set(cDigest_SHA2, id_metadata, rb_digest_make_metadata(&sha512));
 }
diff --git a/ext/digest/test.sh b/ext/digest/test.sh
deleted file mode 100644
index 328c7575e64072..00000000000000
--- a/ext/digest/test.sh
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/bin/sh
-#
-# $RoughId: test.sh,v 1.5 2001/07/13 15:38:27 knu Exp $
-# $Id$
-
-RUBY=${RUBY:=ruby}
-MAKE=${MAKE:=make}
-CFLAGS=${CFLAGS:=-Wall}
-
-${RUBY} extconf.rb --with-cflags="${CFLAGS}"
-${MAKE} clean
-${MAKE}
-
-for algo in md5 rmd160 sha1 sha2; do
-    args=--with-cflags="${CFLAGS}"
-
-    if [ $WITH_BUNDLED_ENGINES ]; then
-	args="$args --with-bundled-$algo"
-    fi
-
-    (cd $algo &&
-	${RUBY} extconf.rb $args;
-	${MAKE} clean;
-	${MAKE})
-    ln -sf ../../$algo/$algo.so lib/digest/
-done
-
-${RUBY} -I. -I./lib ../../test/digest/test_digest.rb
-
-rm lib/digest/*.so
diff --git a/ext/erb/escape/escape.c b/ext/erb/escape/escape.c
index 67b2d1ef34d2d7..db2abd97738b0b 100644
--- a/ext/erb/escape/escape.c
+++ b/ext/erb/escape/escape.c
@@ -65,9 +65,12 @@ optimized_escape_html(VALUE str)
     return escaped;
 }
 
-// ERB::Util.html_escape is different from CGI.escapeHTML in the following two parts:
-//   * ERB::Util.html_escape converts an argument with #to_s first (only if it's not T_STRING)
-//   * ERB::Util.html_escape does not allocate a new string when nothing needs to be escaped
+/*
+ * ERB::Util.html_escape is similar to CGI.escapeHTML but different in the following two parts:
+ *
+ * * ERB::Util.html_escape converts an argument with #to_s first (only if it's not T_STRING)
+ * * ERB::Util.html_escape does not allocate a new string when nothing needs to be escaped
+ */
 static VALUE
 erb_escape_html(VALUE self, VALUE str)
 {
diff --git a/ext/erb/escape/extconf.rb b/ext/erb/escape/extconf.rb
index c1002548ad2a53..783e8c1f5562f8 100644
--- a/ext/erb/escape/extconf.rb
+++ b/ext/erb/escape/extconf.rb
@@ -1,6 +1,7 @@
 require 'mkmf'
 
-if RUBY_ENGINE == 'truffleruby'
+case RUBY_ENGINE
+when 'jruby', 'truffleruby'
   File.write('Makefile', dummy_makefile($srcdir).join)
 else
   create_makefile 'erb/escape'
diff --git a/ext/etc/.document b/ext/etc/.document
new file mode 100644
index 00000000000000..9bbea23b9299f1
--- /dev/null
+++ b/ext/etc/.document
@@ -0,0 +1,2 @@
+etc.c
+constdefs.h
diff --git a/ext/etc/depend b/ext/etc/depend
index 00787b6aaf67e9..77fe56a6bf054b 100644
--- a/ext/etc/depend
+++ b/ext/etc/depend
@@ -143,6 +143,7 @@ etc.o: $(hdrdir)/ruby/internal/intern/re.h
 etc.o: $(hdrdir)/ruby/internal/intern/ruby.h
 etc.o: $(hdrdir)/ruby/internal/intern/select.h
 etc.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+etc.o: $(hdrdir)/ruby/internal/intern/set.h
 etc.o: $(hdrdir)/ruby/internal/intern/signal.h
 etc.o: $(hdrdir)/ruby/internal/intern/sprintf.h
 etc.o: $(hdrdir)/ruby/internal/intern/string.h
@@ -162,6 +163,7 @@ etc.o: $(hdrdir)/ruby/internal/special_consts.h
 etc.o: $(hdrdir)/ruby/internal/static_assert.h
 etc.o: $(hdrdir)/ruby/internal/stdalign.h
 etc.o: $(hdrdir)/ruby/internal/stdbool.h
+etc.o: $(hdrdir)/ruby/internal/stdckdint.h
 etc.o: $(hdrdir)/ruby/internal/symbol.h
 etc.o: $(hdrdir)/ruby/internal/value.h
 etc.o: $(hdrdir)/ruby/internal/value_type.h
diff --git a/ext/etc/etc.c b/ext/etc/etc.c
index 78657b43d0f77d..e2d621547e9bef 100644
--- a/ext/etc/etc.c
+++ b/ext/etc/etc.c
@@ -54,9 +54,11 @@ static VALUE sGroup;
 #  include <stdlib.h>
 # endif
 #endif
-char *getlogin(void);
+RUBY_EXTERN char *getlogin(void);
 
-#define RUBY_ETC_VERSION "1.4.2"
+#define RUBY_ETC_VERSION "1.4.5"
+
+#define SYMBOL_LIT(str) ID2SYM(rb_intern_const(str ""))
 
 #ifdef HAVE_RB_DEPRECATE_CONSTANT
 void rb_deprecate_constant(VALUE mod, const char *name);
@@ -203,7 +205,7 @@ setup_passwd(struct passwd *pwd)
 #endif
 
 /* call-seq:
- *	getpwuid(uid)	->  Passwd
+ *	getpwuid(uid)	->  Etc::Passwd
  *
  * Returns the <tt>/etc/passwd</tt> information for the user with the given
  * integer +uid+.
@@ -215,7 +217,7 @@ setup_passwd(struct passwd *pwd)
  *
  * See the unix manpage for <code>getpwuid(3)</code> for more detail.
  *
- * === Example:
+ * *Example:*
  *
  *	Etc.getpwuid(0)
  *	#=> #<struct Etc::Passwd name="root", passwd="x", uid=0, gid=0, gecos="root",dir="/root", shell="/bin/bash">
@@ -243,7 +245,7 @@ etc_getpwuid(int argc, VALUE *argv, VALUE obj)
 }
 
 /* call-seq:
- *	getpwnam(name)	->  Passwd
+ *	getpwnam(name)	->  Etc::Passwd
  *
  * Returns the <tt>/etc/passwd</tt> information for the user with specified
  * login +name+.
@@ -252,7 +254,7 @@ etc_getpwuid(int argc, VALUE *argv, VALUE obj)
  *
  * See the unix manpage for <code>getpwnam(3)</code> for more detail.
  *
- * === Example:
+ * *Example:*
  *
  *	Etc.getpwnam('root')
  *	#=> #<struct Etc::Passwd name="root", passwd="x", uid=0, gid=0, gecos="root",dir="/root", shell="/bin/bash">
@@ -307,8 +309,8 @@ each_passwd(void)
 #endif
 
 /* call-seq:
- *	Etc.passwd { |struct| block }	->  Passwd
- *	Etc.passwd			->  Passwd
+ *	passwd { |struct| block }
+ *	passwd				->  Etc::Passwd
  *
  * Provides a convenient Ruby iterator which executes a block for each entry
  * in the <tt>/etc/passwd</tt> file.
@@ -317,7 +319,7 @@ each_passwd(void)
  *
  * See ::getpwent above for details.
  *
- * Example:
+ * *Example:*
  *
  *     require 'etc'
  *
@@ -343,7 +345,7 @@ etc_passwd(VALUE obj)
 }
 
 /* call-seq:
- *	Etc::Passwd.each { |struct| block }	->  Passwd
+ *	Etc::Passwd.each { |struct| block }	->  Etc::Passwd
  *	Etc::Passwd.each			->  Enumerator
  *
  * Iterates for each entry in the <tt>/etc/passwd</tt> file if a block is
@@ -355,7 +357,7 @@ etc_passwd(VALUE obj)
  *
  * See Etc.getpwent above for details.
  *
- * Example:
+ * *Example:*
  *
  *     require 'etc'
  *
@@ -377,7 +379,10 @@ etc_each_passwd(VALUE obj)
     return obj;
 }
 
-/* Resets the process of reading the <tt>/etc/passwd</tt> file, so that the
+/* call-seq:
+ *	setpwent
+ *
+ * Resets the process of reading the <tt>/etc/passwd</tt> file, so that the
  * next call to ::getpwent will return the first entry again.
  */
 static VALUE
@@ -389,7 +394,10 @@ etc_setpwent(VALUE obj)
     return Qnil;
 }
 
-/* Ends the process of scanning through the <tt>/etc/passwd</tt> file begun
+/* call-seq:
+ *	endpwent
+ *
+ * Ends the process of scanning through the <tt>/etc/passwd</tt> file begun
  * with ::getpwent, and closes the file.
  */
 static VALUE
@@ -401,7 +409,10 @@ etc_endpwent(VALUE obj)
     return Qnil;
 }
 
-/* Returns an entry from the <tt>/etc/passwd</tt> file.
+/* call-seq:
+ *	getpwent	->  Etc::Passwd
+ *
+ * Returns an entry from the <tt>/etc/passwd</tt> file.
  *
  * The first time it is called it opens the file and returns the first entry;
  * each successive call returns the next entry, or +nil+ if the end of the file
@@ -449,7 +460,7 @@ setup_group(struct group *grp)
 #endif
 
 /* call-seq:
- *	getgrgid(group_id)  ->	Group
+ *	getgrgid(group_id)  ->	Etc::Group
  *
  * Returns information about the group with specified integer +group_id+,
  * as found in <tt>/etc/group</tt>.
@@ -458,7 +469,7 @@ setup_group(struct group *grp)
  *
  * See the unix manpage for <code>getgrgid(3)</code> for more detail.
  *
- * === Example:
+ * *Example:*
  *
  *	Etc.getgrgid(100)
  *	#=> #<struct Etc::Group name="users", passwd="x", gid=100, mem=["meta", "root"]>
@@ -487,7 +498,7 @@ etc_getgrgid(int argc, VALUE *argv, VALUE obj)
 }
 
 /* call-seq:
- *	getgrnam(name)	->  Group
+ *	getgrnam(name)	->  Etc::Group
  *
  * Returns information about the group with specified +name+, as found in
  * <tt>/etc/group</tt>.
@@ -496,7 +507,7 @@ etc_getgrgid(int argc, VALUE *argv, VALUE obj)
  *
  * See the unix manpage for <code>getgrnam(3)</code> for more detail.
  *
- * === Example:
+ * *Example:*
  *
  *	Etc.getgrnam('users')
  *	#=> #<struct Etc::Group name="users", passwd="x", gid=100, mem=["meta", "root"]>
@@ -529,7 +540,6 @@ group_ensure(VALUE _)
     return Qnil;
 }
 
-
 static VALUE
 group_iterate(VALUE _)
 {
@@ -552,14 +562,18 @@ each_group(void)
 }
 #endif
 
-/* Provides a convenient Ruby iterator which executes a block for each entry
+/* call-seq:
+ *	group { |struct| block }
+ *	group				->  Etc::Group
+ *
+ * Provides a convenient Ruby iterator which executes a block for each entry
  * in the <tt>/etc/group</tt> file.
  *
  * The code block is passed an Group struct.
  *
  * See ::getgrent above for details.
  *
- * Example:
+ * *Example:*
  *
  *     require 'etc'
  *
@@ -586,7 +600,7 @@ etc_group(VALUE obj)
 
 #ifdef HAVE_GETGRENT
 /* call-seq:
- *	Etc::Group.each { |group| block }   ->	obj
+ *	Etc::Group.each { |group| block }   ->	Etc::Group
  *	Etc::Group.each			    ->	Enumerator
  *
  * Iterates for each entry in the <tt>/etc/group</tt> file if a block is
@@ -596,7 +610,7 @@ etc_group(VALUE obj)
  *
  * The code block is passed a Group struct.
  *
- * Example:
+ * *Example:*
  *
  *     require 'etc'
  *
@@ -617,7 +631,10 @@ etc_each_group(VALUE obj)
 }
 #endif
 
-/* Resets the process of reading the <tt>/etc/group</tt> file, so that the
+/* call-seq:
+ *	setgrent
+ *
+ * Resets the process of reading the <tt>/etc/group</tt> file, so that the
  * next call to ::getgrent will return the first entry again.
  */
 static VALUE
@@ -629,7 +646,10 @@ etc_setgrent(VALUE obj)
     return Qnil;
 }
 
-/* Ends the process of scanning through the <tt>/etc/group</tt> file begun
+/* call-seq:
+ *	endgrent
+ *
+ * Ends the process of scanning through the <tt>/etc/group</tt> file begun
  * by ::getgrent, and closes the file.
  */
 static VALUE
@@ -641,7 +661,10 @@ etc_endgrent(VALUE obj)
     return Qnil;
 }
 
-/* Returns an entry from the <tt>/etc/group</tt> file.
+/* call-seq:
+ *	getgrent	->  Etc::Group
+ *
+ * Returns an entry from the <tt>/etc/group</tt> file.
  *
  * The first time it is called it opens the file and returns the first entry;
  * each successive call returns the next entry, or +nil+ if the end of the file
@@ -670,9 +693,21 @@ etc_getgrent(VALUE obj)
 VALUE rb_w32_special_folder(int type);
 UINT rb_w32_system_tmpdir(WCHAR *path, UINT len);
 VALUE rb_w32_conv_from_wchar(const WCHAR *wstr, rb_encoding *enc);
+#elif defined(LOAD_RELATIVE)
+static inline VALUE
+rbconfig(void)
+{
+    VALUE config;
+    rb_require("rbconfig");
+    config = rb_const_get(rb_path2class("RbConfig"), rb_intern_const("CONFIG"));
+    Check_Type(config, T_HASH);
+    return config;
+}
 #endif
 
-/*
+/* call-seq:
+ *	sysconfdir	->  String
+ *
  * Returns system configuration directory.
  *
  * This is typically <code>"/etc"</code>, but is modified by the prefix used
@@ -687,12 +722,16 @@ etc_sysconfdir(VALUE obj)
 {
 #ifdef _WIN32
     return rb_w32_special_folder(CSIDL_COMMON_APPDATA);
+#elif defined(LOAD_RELATIVE)
+    return rb_hash_aref(rbconfig(), rb_str_new_lit("sysconfdir"));
 #else
     return rb_filesystem_str_new_cstr(SYSCONFDIR);
 #endif
 }
 
-/*
+/* call-seq:
+ *	systmpdir	->  String
+ *
  * Returns system temporary directory; typically "/tmp".
  */
 static VALUE
@@ -736,13 +775,15 @@ etc_systmpdir(VALUE _)
 }
 
 #ifdef HAVE_UNAME
-/*
+/* call-seq:
+ *	uname	-> hash
+ *
  * Returns the system information obtained by uname system call.
  *
  * The return value is a hash which has 5 keys at least:
  *   :sysname, :nodename, :release, :version, :machine
  *
- * Example:
+ * *Example:*
  *
  *   require 'etc'
  *   require 'pp'
@@ -784,12 +825,12 @@ etc_uname(VALUE obj)
 	sysname = "Windows";
 	break;
     }
-    rb_hash_aset(result, ID2SYM(rb_intern("sysname")), rb_str_new_cstr(sysname));
+    rb_hash_aset(result, SYMBOL_LIT("sysname"), rb_str_new_cstr(sysname));
     release = rb_sprintf("%lu.%lu.%lu", v.dwMajorVersion, v.dwMinorVersion, v.dwBuildNumber);
-    rb_hash_aset(result, ID2SYM(rb_intern("release")), release);
+    rb_hash_aset(result, SYMBOL_LIT("release"), release);
     version = rb_sprintf("%s Version %"PRIsVALUE": %"PRIsVALUE, sysname, release,
 			 rb_w32_conv_from_wchar(v.szCSDVersion, rb_utf8_encoding()));
-    rb_hash_aset(result, ID2SYM(rb_intern("version")), version);
+    rb_hash_aset(result, SYMBOL_LIT("version"), version);
 
 # if defined _MSC_VER && _MSC_VER < 1300
 #   define GET_COMPUTER_NAME(ptr, plen) GetComputerNameW(ptr, plen)
@@ -803,7 +844,7 @@ etc_uname(VALUE obj)
     }
     ALLOCV_END(vbuf);
     if (NIL_P(nodename)) nodename = rb_str_new(0, 0);
-    rb_hash_aset(result, ID2SYM(rb_intern("nodename")), nodename);
+    rb_hash_aset(result, SYMBOL_LIT("nodename"), nodename);
 
 # ifndef PROCESSOR_ARCHITECTURE_AMD64
 #   define PROCESSOR_ARCHITECTURE_AMD64 9
@@ -827,7 +868,7 @@ etc_uname(VALUE obj)
 	break;
     }
 
-    rb_hash_aset(result, ID2SYM(rb_intern("machine")), rb_str_new_cstr(mach));
+    rb_hash_aset(result, SYMBOL_LIT("machine"), rb_str_new_cstr(mach));
 #else
     struct utsname u;
     int ret;
@@ -838,11 +879,11 @@ etc_uname(VALUE obj)
         rb_sys_fail("uname");
 
     result = rb_hash_new();
-    rb_hash_aset(result, ID2SYM(rb_intern("sysname")), rb_str_new_cstr(u.sysname));
-    rb_hash_aset(result, ID2SYM(rb_intern("nodename")), rb_str_new_cstr(u.nodename));
-    rb_hash_aset(result, ID2SYM(rb_intern("release")), rb_str_new_cstr(u.release));
-    rb_hash_aset(result, ID2SYM(rb_intern("version")), rb_str_new_cstr(u.version));
-    rb_hash_aset(result, ID2SYM(rb_intern("machine")), rb_str_new_cstr(u.machine));
+    rb_hash_aset(result, SYMBOL_LIT("sysname"), rb_str_new_cstr(u.sysname));
+    rb_hash_aset(result, SYMBOL_LIT("nodename"), rb_str_new_cstr(u.nodename));
+    rb_hash_aset(result, SYMBOL_LIT("release"), rb_str_new_cstr(u.release));
+    rb_hash_aset(result, SYMBOL_LIT("version"), rb_str_new_cstr(u.version));
+    rb_hash_aset(result, SYMBOL_LIT("machine"), rb_str_new_cstr(u.machine));
 #endif
 
     return result;
@@ -852,7 +893,9 @@ etc_uname(VALUE obj)
 #endif
 
 #ifdef HAVE_SYSCONF
-/*
+/* call-seq:
+ *	sysconf(name)	->  Integer
+ *
  * Returns system configuration variable using sysconf().
  *
  * _name_ should be a constant under <code>Etc</code> which begins with <code>SC_</code>.
@@ -886,7 +929,9 @@ etc_sysconf(VALUE obj, VALUE arg)
 #endif
 
 #ifdef HAVE_CONFSTR
-/*
+/* call-seq:
+ *	confstr(name)	->  String
+ *
  * Returns system configuration variable using confstr().
  *
  * _name_ should be a constant under <code>Etc</code> which begins with <code>CS_</code>.
@@ -933,7 +978,9 @@ etc_confstr(VALUE obj, VALUE arg)
 #endif
 
 #ifdef HAVE_FPATHCONF
-/*
+/* call-seq:
+ *	pathconf(name)	->  Integer
+ *
  * Returns pathname configuration variable using fpathconf().
  *
  * _name_ should be a constant under <code>Etc</code> which begins with <code>PC_</code>.
@@ -1025,7 +1072,9 @@ etc_nprocessors_affin(void)
 }
 #endif
 
-/*
+/* call-seq:
+ *	nprocessors	->  Integer
+ *
  * Returns the number of online processors.
  *
  * The result is intended as the number of processes to
@@ -1035,7 +1084,7 @@ etc_nprocessors_affin(void)
  * - sched_getaffinity(): Linux
  * - sysconf(_SC_NPROCESSORS_ONLN): GNU/Linux, NetBSD, FreeBSD, OpenBSD, DragonFly BSD, OpenIndiana, Mac OS X, AIX
  *
- * Example:
+ * *Example:*
  *
  *   require 'etc'
  *   p Etc.nprocessors #=> 4
@@ -1044,7 +1093,7 @@ etc_nprocessors_affin(void)
  * process is bound to specific cpus. This is intended for getting better
  * parallel processing.
  *
- * Example: (Linux)
+ * *Example:* (Linux)
  *
  *   linux$ taskset 0x3 ./ruby -retc -e "p Etc.nprocessors"  #=> 2
  *
@@ -1094,7 +1143,7 @@ etc_nprocessors(VALUE obj)
  * The Etc module provides a more reliable way to access information about
  * the logged in user than environment variables such as +$USER+.
  *
- * == Example:
+ * *Example:*
  *
  *     require 'etc'
  *
@@ -1114,13 +1163,26 @@ Init_etc(void)
 {
     VALUE mEtc;
 
-#ifdef HAVE_RB_EXT_RACTOR_SAFE
-    RB_EXT_RACTOR_SAFE(true);
-#endif
     mEtc = rb_define_module("Etc");
+    /* The version */
     rb_define_const(mEtc, "VERSION", rb_str_new_cstr(RUBY_ETC_VERSION));
     init_constants(mEtc);
 
+    /* Ractor-safe methods */
+#ifdef HAVE_RB_EXT_RACTOR_SAFE
+    RB_EXT_RACTOR_SAFE(true);
+#endif
+    rb_define_module_function(mEtc, "systmpdir", etc_systmpdir, 0);
+    rb_define_module_function(mEtc, "uname", etc_uname, 0);
+    rb_define_module_function(mEtc, "sysconf", etc_sysconf, 1);
+    rb_define_module_function(mEtc, "confstr", etc_confstr, 1);
+    rb_define_method(rb_cIO, "pathconf", io_pathconf, 1);
+    rb_define_module_function(mEtc, "nprocessors", etc_nprocessors, 0);
+
+    /* Non-Ractor-safe methods, see https://bugs.ruby-lang.org/issues/21115 */
+#ifdef HAVE_RB_EXT_RACTOR_SAFE
+    RB_EXT_RACTOR_SAFE(false);
+#endif
     rb_define_module_function(mEtc, "getlogin", etc_getlogin, 0);
 
     rb_define_module_function(mEtc, "getpwuid", etc_getpwuid, -1);
@@ -1136,13 +1198,9 @@ Init_etc(void)
     rb_define_module_function(mEtc, "setgrent", etc_setgrent, 0);
     rb_define_module_function(mEtc, "endgrent", etc_endgrent, 0);
     rb_define_module_function(mEtc, "getgrent", etc_getgrent, 0);
+
+    /* Uses RbConfig::CONFIG so does not work in a Ractor */
     rb_define_module_function(mEtc, "sysconfdir", etc_sysconfdir, 0);
-    rb_define_module_function(mEtc, "systmpdir", etc_systmpdir, 0);
-    rb_define_module_function(mEtc, "uname", etc_uname, 0);
-    rb_define_module_function(mEtc, "sysconf", etc_sysconf, 1);
-    rb_define_module_function(mEtc, "confstr", etc_confstr, 1);
-    rb_define_method(rb_cIO, "pathconf", io_pathconf, 1);
-    rb_define_module_function(mEtc, "nprocessors", etc_nprocessors, 0);
 
     sPasswd =  rb_struct_define_under(mEtc, "Passwd",
 				      "name",
@@ -1253,4 +1311,8 @@ Init_etc(void)
     rb_extend_object(sGroup, rb_mEnumerable);
     rb_define_singleton_method(sGroup, "each", etc_each_group, 0);
 #endif
+
+#if defined(HAVE_GETPWENT) || defined(HAVE_GETGRENT)
+    (void)safe_setup_str;
+#endif
 }
diff --git a/ext/etc/etc.gemspec b/ext/etc/etc.gemspec
index 98c6d66faa8a10..3facc7486669a9 100644
--- a/ext/etc/etc.gemspec
+++ b/ext/etc/etc.gemspec
@@ -24,7 +24,8 @@ Gem::Specification.new do |spec|
 
   changelogs = Dir.glob("logs/ChangeLog-[1-9]*[^~]", base: __dir__)
   spec.files         = %w[
-    LICENSE.txt
+    BSDL
+    COPYING
     README.md
     ChangeLog
     ext/etc/constdefs.h
diff --git a/ext/etc/extconf.rb b/ext/etc/extconf.rb
index 2e28d5803775b5..497303a4fa51f7 100644
--- a/ext/etc/extconf.rb
+++ b/ext/etc/extconf.rb
@@ -10,8 +10,30 @@
 have_library("sun", "getpwnam")	# NIS (== YP) interface for IRIX 4
 have_func("uname((struct utsname *)NULL)", headers)
 have_func("getlogin")
-have_func("getpwent")
-have_func("getgrent")
+if have_func("getpwent")
+  have_struct_member('struct passwd', 'pw_gecos', 'pwd.h')
+  have_struct_member('struct passwd', 'pw_change', 'pwd.h')
+  have_struct_member('struct passwd', 'pw_quota', 'pwd.h')
+  if have_struct_member('struct passwd', 'pw_age', 'pwd.h')
+    case what_type?('struct passwd', 'pw_age', 'pwd.h')
+    when "string"
+      f = "safe_setup_str"
+    when "long long"
+      f = "LL2NUM"
+    else
+      f = "INT2NUM"
+    end
+    $defs.push("-DPW_AGE2VAL="+f)
+  end
+  have_struct_member('struct passwd', 'pw_class', 'pwd.h')
+  have_struct_member('struct passwd', 'pw_comment', 'pwd.h') unless /cygwin/ === RUBY_PLATFORM
+  have_struct_member('struct passwd', 'pw_expire', 'pwd.h')
+  have_struct_member('struct passwd', 'pw_passwd', 'pwd.h')
+end
+if have_func("getgrent")
+  have_struct_member('struct group', 'gr_passwd', 'grp.h')
+end
+
 if (sysconfdir = RbConfig::CONFIG["sysconfdir"] and
     !RbConfig.expand(sysconfdir.dup, "prefix"=>"", "DESTDIR"=>"").empty?)
   $defs.push("-DSYSCONFDIR=#{Shellwords.escape(sysconfdir.dump)}")
@@ -21,26 +43,6 @@
 have_func("confstr")
 have_func("fpathconf")
 
-have_struct_member('struct passwd', 'pw_gecos', 'pwd.h')
-have_struct_member('struct passwd', 'pw_change', 'pwd.h')
-have_struct_member('struct passwd', 'pw_quota', 'pwd.h')
-if have_struct_member('struct passwd', 'pw_age', 'pwd.h')
-  case what_type?('struct passwd', 'pw_age', 'pwd.h')
-  when "string"
-    f = "safe_setup_str"
-  when "long long"
-    f = "LL2NUM"
-  else
-    f = "INT2NUM"
-  end
-  $defs.push("-DPW_AGE2VAL="+f)
-end
-have_struct_member('struct passwd', 'pw_class', 'pwd.h')
-have_struct_member('struct passwd', 'pw_comment', 'pwd.h') unless /cygwin/ === RUBY_PLATFORM
-have_struct_member('struct passwd', 'pw_expire', 'pwd.h')
-have_struct_member('struct passwd', 'pw_passwd', 'pwd.h')
-have_struct_member('struct group', 'gr_passwd', 'grp.h')
-
 # for https://github.com/ruby/etc
 srcdir = File.expand_path("..", __FILE__)
 constdefs = "#{srcdir}/constdefs.h"
@@ -58,7 +60,7 @@
 # TODO: remove when dropping 2.7 support, as exported since 3.0
 have_func('rb_deprecate_constant(Qnil, "None")')
 
-have_func("rb_io_descriptor")
+have_func("rb_io_descriptor", "ruby/io.h")
 
 $distcleanfiles << "constdefs.h"
 
diff --git a/ext/etc/mkconstants.rb b/ext/etc/mkconstants.rb
index a752d64519fca0..a766560a8a051d 100644
--- a/ext/etc/mkconstants.rb
+++ b/ext/etc/mkconstants.rb
@@ -35,6 +35,12 @@ def c_str(str)
 
 opt.parse!
 
+CONST_PREFIXES = {
+  'SC' => 'for Etc.sysconf; See <tt>man sysconf</tt>',
+  'CS' => 'for Etc.confstr; See <tt>man constr</tt>',
+  'PC' => 'for IO#pathconf; See <tt>man fpathconf</tt>',
+}
+
 h = {}
 COMMENTS = {}
 
@@ -49,6 +55,13 @@ def c_str(str)
     next
   end
   h[name] = default_value
+  if additional = CONST_PREFIXES[name[/\A_([A-Z]+)_/, 1]]
+    if comment&.match(/\w\z/)
+      comment << " " << additional
+    else
+      (comment ||= String.new) << " " << additional.sub(/\A\w/) {$&.upcase}
+    end
+  end
   COMMENTS[name] = comment if comment
 }
 DEFS = h.to_a
@@ -66,15 +79,11 @@ def each_name(pat)
   }
 end
 
-erb_new = lambda do |src, safe, trim|
-  if ERB.instance_method(:initialize).parameters.assoc(:key) # Ruby 2.6+
-    ERB.new(src, trim_mode: trim)
-  else
-    ERB.new(src, safe, trim)
-  end
+erb_new = lambda do |src, trim|
+  ERB.new(src, trim_mode: trim)
 end
 
-erb_new.call(<<'EOS', nil, '%').def_method(Object, "gen_const_decls")
+erb_new.call(<<'EOS', '%').def_method(Object, "gen_const_decls")
 % each_const {|name, default_value|
 #if !defined(<%=name%>)
 # if defined(HAVE_CONST_<%=name.upcase%>)
@@ -88,7 +97,7 @@ def each_name(pat)
 % }
 EOS
 
-erb_new.call(<<'EOS', nil, '%').def_method(Object, "gen_const_defs")
+erb_new.call(<<'EOS', '%').def_method(Object, "gen_const_defs")
 % each_const {|name, default_value|
 #if defined(<%=name%>)
 %   if comment = COMMENTS[name]
@@ -99,13 +108,13 @@ def each_name(pat)
 % }
 EOS
 
-header_result = erb_new.call(<<'EOS', nil, '%').result(binding)
+header_result = erb_new.call(<<'EOS', '%').result(binding)
 /* autogenerated file */
 
 <%= gen_const_decls %>
 EOS
 
-result = erb_new.call(<<'EOS', nil, '%').result(binding)
+result = erb_new.call(<<'EOS', '%').result(binding)
 /* autogenerated file */
 
 #ifdef HAVE_LONG_LONG
@@ -123,6 +132,9 @@ def each_name(pat)
 static void
 init_constants(VALUE mod)
 {
+#if 0
+    mod = rb_define_module("Etc");
+#endif
 <%= gen_const_defs %>
 }
 EOS
diff --git a/ext/extmk.rb b/ext/extmk.rb
index 428ffc91a639ad..39cbce1bc9fe68 100755
--- a/ext/extmk.rb
+++ b/ext/extmk.rb
@@ -2,7 +2,13 @@
 # -*- mode: ruby; coding: us-ascii -*-
 # frozen_string_literal: false
 
-module Gem; end # only needs Gem::Platform
+module Gem
+  # Used by Gem::Platform.local
+  def self.target_rbconfig
+    RbConfig::CONFIG
+  end
+end
+# only needs Gem::Platform
 require 'rubygems/platform'
 
 # :stopdoc:
@@ -104,7 +110,7 @@ def extract_makefile(makefile, keep = true)
     end
     return false
   end
-  srcs = Dir[File.join($srcdir, "*.{#{SRC_EXT.join(%q{,})}}")].map {|fn| File.basename(fn)}.sort
+  srcs = Dir[*SRC_EXT.map {|e| "*.#{e}"}, base: $srcdir].map {|fn| File.basename(fn)}.sort
   if !srcs.empty?
     old_srcs = m[/^ORIG_SRCS[ \t]*=[ \t](.*)/, 1] or return false
     (old_srcs.split - srcs).empty? or return false
@@ -132,6 +138,14 @@ def extract_makefile(makefile, keep = true)
   true
 end
 
+def create_makefile(target, srcprefix = nil)
+  if $static and target.include?("/")
+    base = File.basename(target)
+    $defs << "-DInit_#{base}=Init_#{target.tr('/', '_')}"
+  end
+  super
+end
+
 def extmake(target, basedir = 'ext', maybestatic = true)
   FileUtils.mkpath target unless File.directory?(target)
   begin
@@ -159,8 +173,6 @@ def extmake(target, basedir = 'ext', maybestatic = true)
     $mdir = target
     $srcdir = File.join($top_srcdir, basedir, $mdir)
     $preload = nil
-    $objs = []
-    $srcs = []
     $extso = []
     makefile = "./Makefile"
     static = $static
@@ -194,7 +206,7 @@ def extmake(target, basedir = 'ext', maybestatic = true)
       begin
 	$extconf_h = nil
 	ok &&= extract_makefile(makefile)
-	old_objs = $objs
+	old_objs = $objs || []
 	old_cleanfiles = $distcleanfiles | $cleanfiles
 	conf = ["#{$srcdir}/makefile.rb", "#{$srcdir}/extconf.rb"].find {|f| File.exist?(f)}
 	if (!ok || ($extconf_h && !File.exist?($extconf_h)) ||
@@ -257,6 +269,8 @@ def extmake(target, basedir = 'ext', maybestatic = true)
     unless $destdir.to_s.empty? or $mflags.defined?("DESTDIR")
       args += ["DESTDIR=" + relative_from($destdir, "../"+prefix)]
     end
+    $objs ||= []
+    $srcs ||= []
     if $static and ok and !$objs.empty? and !noinstall
       args += ["static"]
       $extlist.push [(maybestatic ? $static : false), target, $target, $preload]
@@ -472,12 +486,13 @@ def $mflags.defined?(var)
   $extension = [exts] if exts
   if ext_prefix.start_with?('.')
     @gemname = exts
-  elsif exts
-    $static_ext.delete_if {|t, *| !File.fnmatch(t, exts)}
+    exts = []
+  else
+    exts &&= $static_ext.select {|t, *| File.fnmatch(t, exts)}
   end
 end
-ext_prefix = "#{$top_srcdir}/#{ext_prefix || 'ext'}"
-exts = $static_ext.sort_by {|t, i| i}.collect {|t, i| t}
+ext_prefix ||= 'ext'
+exts = (exts || $static_ext).sort_by {|t, i| i}.collect {|t, i| t}
 default_exclude_exts =
   case
   when $cygwin
@@ -490,28 +505,30 @@ def $mflags.defined?(var)
 mandatory_exts = {}
 withes, withouts = [["--with", nil], ["--without", default_exclude_exts]].collect {|w, d|
   if !(w = %w[-extensions -ext].collect {|o|arg_config(w+o)}).any?
-    d ? proc {|c1| d.any?(&c1)} : proc {true}
+    d ? proc {|&c1| d.any?(&c1)} : proc {true}
   elsif (w = w.grep(String)).empty?
     proc {true}
   else
     w = w.collect {|o| o.split(/,/)}.flatten
     w.collect! {|o| o == '+' ? d : o}.flatten!
-    proc {|c1| w.any?(&c1)}
+    proc {|&c1| w.any?(&c1)}
   end
 }
 cond = proc {|ext, *|
-  withes.call(proc {|n|
-                !n or (mandatory_exts[ext] = true if File.fnmatch(n, ext))
-              }) and
-    !withouts.call(proc {|n| File.fnmatch(n, ext)})
+  withes.call {|n| !n or (mandatory_exts[ext] = true if File.fnmatch(n, ext))} and
+    !withouts.call {|n| File.fnmatch(n, ext)}
 }
 ($extension || %w[*]).each do |e|
   e = e.sub(/\A(?:\.\/)+/, '')
-  incl, excl = Dir.glob("#{ext_prefix}/#{e}/**/extconf.rb").collect {|d|
-    d = File.dirname(d)
-    d.slice!(0, ext_prefix.length + 1)
-    d
+  incl, excl = Dir.glob("#{e}/**/extconf.rb", base: "#$top_srcdir/#{ext_prefix}").collect {|d|
+    File.dirname(d)
   }.partition {|ext|
+    if @gemname
+      ext = ext[%r[\A[^/]+]] # extract gem name
+      Dir.glob("*.gemspec", base: "#$top_srcdir/#{ext_prefix}/#{ext}") do |g|
+        break ext = g if ext.start_with?("#{g.chomp!(".gemspec")}-")
+      end
+    end
     with_config(ext, &cond)
   }
   incl.sort!
@@ -522,7 +539,7 @@ def $mflags.defined?(var)
     exts.delete_if {|d| File.fnmatch?("-*", d)}
   end
 end
-ext_prefix = ext_prefix[$top_srcdir.size+1..-2]
+ext_prefix.chomp!("/")
 
 @ext_prefix = ext_prefix
 @inplace = inplace
@@ -545,7 +562,13 @@ def configuration(srcdir)
   end
 
   def create_makefile(*args, &block)
-    return super unless @gemname
+    unless @gemname
+      if $static and (target = args.first).include?("/")
+        base = File.basename(target)
+        $defs << "-DInit_#{base}=Init_#{target.tr('/', '_')}"
+      end
+      return super
+    end
     super(*args) do |conf|
       conf.find do |s|
         s.sub!(%r(^(srcdir *= *)\$\(top_srcdir\)/\.bundle/gems/[^/]+(?=/))) {
@@ -561,7 +584,8 @@ def create_makefile(*args, &block)
         }
       end
 
-      gemlib = File.directory?("#{$top_srcdir}/#{@ext_prefix}/#{@gemname}/lib")
+      conf = yield conf if block
+
       if conf.any? {|s| /^TARGET *= *\S/ =~ s}
         conf << %{
 gem_platform = #{Gem::Platform.local}
@@ -594,23 +618,25 @@ def create_makefile(*args, &block)
 
 clean-gemspec:
 	-$(Q)$(RM) $(gemspec)
-}
-
-        if gemlib
-          conf << %{
-install-rb: gemlib
-clean-rb:: clean-gemlib
 
 LN_S = #{config_string('LN_S')}
 CP_R = #{config_string('CP')} -r
-
-gemlib = $(TARGET_TOPDIR)/gems/$(gem)/lib
-gemlib:#{%{ $(gemlib)\n$(gemlib): $(gem_srcdir)/lib} if $nmake}
-	$(Q) #{@inplace ? '$(NULLCMD) ' : ''}$(RUBY) $(top_srcdir)/tool/ln_sr.rb -q -f -T $(gem_srcdir)/lib $(gemlib)
-
-clean-gemlib:
-	$(Q) $(#{@inplace ? 'NULLCMD' : 'RM_RF'}) $(gemlib)
 }
+        unless @inplace
+          %w[bin lib].each do |d|
+            next unless File.directory?("#{$top_srcdir}/#{@ext_prefix}/#{@gemname}/#{d}")
+            conf << %{
+install-rb: gem#{d}
+clean-rb:: clean-gem#{d}
+
+gem#{d} = $(TARGET_TOPDIR)/gems/$(gem)/#{d}
+gem#{d}:#{%{ $(gem#{d})\n$(gem#{d}): $(gem_srcdir)/#{d}} if $nmake}
+	$(Q) $(RUBY) $(top_srcdir)/tool/ln_sr.rb -q -f -T $(gem_srcdir)/#{d} $(gem#{d})
+
+clean-gem#{d}:
+	$(Q) $(RM_RF) $(gem#{d})
+}
+          end
         end
       end
 
@@ -628,7 +654,9 @@ def create_makefile(*args, &block)
 extso = []
 fails = []
 exts.each do |d|
-  $static = $force_static ? true : $static_ext[d]
+  $static = $force_static ? true : $static_ext.fetch(d) do
+    $static_ext.any? {|t, | File.fnmatch?(t, d)}
+  end
 
   if !$nodynamic or $static
     result = extmake(d, ext_prefix, !@gemname) or abort
@@ -754,7 +782,6 @@ def mf.macro(name, values, max = 70)
     end
     submakeopts << 'EXTLDFLAGS="$(EXTLDFLAGS)"'
     submakeopts << 'EXTINITS="$(EXTINITS)"'
-    submakeopts << 'UPDATE_LIBRARIES="$(UPDATE_LIBRARIES)"'
     submakeopts << 'SHOWFLAGS='
     mf.macro "SUBMAKEOPTS", submakeopts
     mf.macro "NOTE_MESG", %w[$(RUBY) $(top_srcdir)/tool/lib/colorize.rb skip]
@@ -793,9 +820,9 @@ def mf.macro(name, values, max = 70)
     if $gnumake == "yes"
       submake = "$(MAKE) -C $(@D)"
     else
-      submake = "cd $(@D) && "
-      config_string("exec") {|str| submake << str << " "}
-      submake << "$(MAKE)"
+      submake = ["cd", (sep ? "$(@D:/=#{sep})" : "$(@D)"), "&&"]
+      config_string("exec") {|str| submake << str}
+      submake = (submake << "$(MAKE)").join(" ")
     end
     targets.each do |tgt|
       exts.each do |d|
@@ -810,7 +837,7 @@ def mf.macro(name, values, max = 70)
         end
         mf.puts "#{t}:#{pd}\n\t$(Q)#{submake} $(MFLAGS) V=$(V) $(@F)"
         if clean and clean.begin(1)
-          mf.puts "\t$(Q)$(RM) $(ext_build_dir)/exts.mk\n\t$(Q)$(RMDIRS) -p $(@D)"
+          mf.puts "\t$(Q)$(RM) $(ext_build_dir)/exts.mk\n\t$(Q)$(RMDIRS) $(@D)"
         end
       end
     end
diff --git a/ext/fcntl/depend b/ext/fcntl/depend
index 9ce9fa30ef0000..57ea0f21068068 100644
--- a/ext/fcntl/depend
+++ b/ext/fcntl/depend
@@ -128,6 +128,7 @@ fcntl.o: $(hdrdir)/ruby/internal/intern/re.h
 fcntl.o: $(hdrdir)/ruby/internal/intern/ruby.h
 fcntl.o: $(hdrdir)/ruby/internal/intern/select.h
 fcntl.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+fcntl.o: $(hdrdir)/ruby/internal/intern/set.h
 fcntl.o: $(hdrdir)/ruby/internal/intern/signal.h
 fcntl.o: $(hdrdir)/ruby/internal/intern/sprintf.h
 fcntl.o: $(hdrdir)/ruby/internal/intern/string.h
@@ -147,6 +148,7 @@ fcntl.o: $(hdrdir)/ruby/internal/special_consts.h
 fcntl.o: $(hdrdir)/ruby/internal/static_assert.h
 fcntl.o: $(hdrdir)/ruby/internal/stdalign.h
 fcntl.o: $(hdrdir)/ruby/internal/stdbool.h
+fcntl.o: $(hdrdir)/ruby/internal/stdckdint.h
 fcntl.o: $(hdrdir)/ruby/internal/symbol.h
 fcntl.o: $(hdrdir)/ruby/internal/value.h
 fcntl.o: $(hdrdir)/ruby/internal/value_type.h
diff --git a/ext/fcntl/fcntl.c b/ext/fcntl/fcntl.c
index 4ea7b29bf54c2e..86bee5fb45b648 100644
--- a/ext/fcntl/fcntl.c
+++ b/ext/fcntl/fcntl.c
@@ -28,7 +28,10 @@ pack up your own arguments to pass as args for locking functions, etc.
 #include "ruby.h"
 #include <fcntl.h>
 
-/* Fcntl loads the constants defined in the system's <fcntl.h> C header
+/*
+ * Document-module: Fcntl
+ *
+ * Fcntl loads the constants defined in the system's <fcntl.h> C header
  * file, and used with both the fcntl(2) and open(2) POSIX system calls.
  *
  * To perform a fcntl(2) operation, use IO::fcntl.
@@ -62,18 +65,18 @@ pack up your own arguments to pass as args for locking functions, etc.
  *
  */
 
-#define FCNTL_VERSION "1.0.2"
+#define FCNTL_VERSION "1.2.0"
 
 void
 Init_fcntl(void)
 {
     VALUE mFcntl = rb_define_module("Fcntl");
 
+    /* The version string. */
     rb_define_const(mFcntl, "VERSION", rb_str_new_cstr(FCNTL_VERSION));
 
 #ifdef F_DUPFD
-    /* Document-const: F_DUPFD
-     *
+    /*
      * Duplicate a file descriptor to the minimum unused file descriptor
      * greater than or equal to the argument.
      *
@@ -84,195 +87,164 @@ Init_fcntl(void)
     rb_define_const(mFcntl, "F_DUPFD", INT2NUM(F_DUPFD));
 #endif
 #ifdef F_GETFD
-    /* Document-const: F_GETFD
-     *
+    /*
      * Read the close-on-exec flag of a file descriptor.
      */
     rb_define_const(mFcntl, "F_GETFD", INT2NUM(F_GETFD));
 #endif
 #ifdef F_GETLK
-    /* Document-const: F_GETLK
-     *
+    /*
      * Determine whether a given region of a file is locked.  This uses one of
      * the F_*LK flags.
      */
     rb_define_const(mFcntl, "F_GETLK", INT2NUM(F_GETLK));
 #endif
 #ifdef F_SETFD
-    /* Document-const: F_SETFD
-     *
+    /*
      * Set the close-on-exec flag of a file descriptor.
      */
     rb_define_const(mFcntl, "F_SETFD", INT2NUM(F_SETFD));
 #endif
 #ifdef F_GETFL
-    /* Document-const: F_GETFL
-     *
+    /*
      * Get the file descriptor flags.  This will be one or more of the O_*
      * flags.
      */
     rb_define_const(mFcntl, "F_GETFL", INT2NUM(F_GETFL));
 #endif
 #ifdef F_SETFL
-    /* Document-const: F_SETFL
-     *
+    /*
      * Set the file descriptor flags.  This will be one or more of the O_*
      * flags.
      */
     rb_define_const(mFcntl, "F_SETFL", INT2NUM(F_SETFL));
 #endif
 #ifdef F_SETLK
-    /* Document-const: F_SETLK
-     *
+    /*
      * Acquire a lock on a region of a file.  This uses one of the F_*LCK
      * flags.
      */
     rb_define_const(mFcntl, "F_SETLK", INT2NUM(F_SETLK));
 #endif
 #ifdef F_SETLKW
-    /* Document-const: F_SETLKW
-     *
+    /*
      * Acquire a lock on a region of a file, waiting if necessary.  This uses
      * one of the F_*LCK flags
      */
     rb_define_const(mFcntl, "F_SETLKW", INT2NUM(F_SETLKW));
 #endif
 #ifdef FD_CLOEXEC
-    /* Document-const: FD_CLOEXEC
-     *
+    /*
      * the value of the close-on-exec flag.
      */
     rb_define_const(mFcntl, "FD_CLOEXEC", INT2NUM(FD_CLOEXEC));
 #endif
 #ifdef F_RDLCK
-    /* Document-const: F_RDLCK
-     *
+    /*
      * Read lock for a region of a file
      */
     rb_define_const(mFcntl, "F_RDLCK", INT2NUM(F_RDLCK));
 #endif
 #ifdef F_UNLCK
-    /* Document-const: F_UNLCK
-     *
+    /*
      * Remove lock for a region of a file
      */
     rb_define_const(mFcntl, "F_UNLCK", INT2NUM(F_UNLCK));
 #endif
 #ifdef F_WRLCK
-    /* Document-const: F_WRLCK
-     *
+    /*
      * Write lock for a region of a file
      */
     rb_define_const(mFcntl, "F_WRLCK", INT2NUM(F_WRLCK));
 #endif
 #ifdef F_SETPIPE_SZ
-    /* Document-const: F_SETPIPE_SZ
-     *
+    /*
      * Change the capacity of the pipe referred to by fd to be at least arg bytes.
      */
     rb_define_const(mFcntl, "F_SETPIPE_SZ", INT2NUM(F_SETPIPE_SZ));
 #endif
 #ifdef F_GETPIPE_SZ
-    /* Document-const: F_GETPIPE_SZ
-     *
+    /*
      * Return (as the function result) the capacity of the pipe referred to by fd.
      */
     rb_define_const(mFcntl, "F_GETPIPE_SZ", INT2NUM(F_GETPIPE_SZ));
 #endif
 #ifdef O_CREAT
-    /* Document-const: O_CREAT
-     *
+    /*
      * Create the file if it doesn't exist
      */
     rb_define_const(mFcntl, "O_CREAT", INT2NUM(O_CREAT));
 #endif
 #ifdef O_EXCL
-    /* Document-const: O_EXCL
-     *
+    /*
      * Used with O_CREAT, fail if the file exists
      */
     rb_define_const(mFcntl, "O_EXCL", INT2NUM(O_EXCL));
 #endif
 #ifdef O_NOCTTY
-    /* Document-const: O_NOCTTY
-     *
+    /*
      * Open TTY without it becoming the controlling TTY
      */
     rb_define_const(mFcntl, "O_NOCTTY", INT2NUM(O_NOCTTY));
 #endif
 #ifdef O_TRUNC
-    /* Document-const: O_TRUNC
-     *
+    /*
      * Truncate the file on open
      */
     rb_define_const(mFcntl, "O_TRUNC", INT2NUM(O_TRUNC));
 #endif
 #ifdef O_APPEND
-    /* Document-const: O_APPEND
-     *
+    /*
      * Open the file in append mode
      */
     rb_define_const(mFcntl, "O_APPEND", INT2NUM(O_APPEND));
 #endif
 #ifdef O_NONBLOCK
-    /* Document-const: O_NONBLOCK
-     *
+    /*
      * Open the file in non-blocking mode
      */
     rb_define_const(mFcntl, "O_NONBLOCK", INT2NUM(O_NONBLOCK));
 #endif
 #ifdef O_NDELAY
-    /* Document-const: O_NDELAY
-     *
+    /*
      * Open the file in non-blocking mode
      */
     rb_define_const(mFcntl, "O_NDELAY", INT2NUM(O_NDELAY));
 #endif
 #ifdef O_RDONLY
-    /* Document-const: O_RDONLY
-     *
+    /*
      * Open the file in read-only mode
      */
     rb_define_const(mFcntl, "O_RDONLY", INT2NUM(O_RDONLY));
 #endif
 #ifdef O_RDWR
-    /* Document-const: O_RDWR
-     *
+    /*
      * Open the file in read-write mode
      */
     rb_define_const(mFcntl, "O_RDWR", INT2NUM(O_RDWR));
 #endif
 #ifdef O_WRONLY
-    /* Document-const: O_WRONLY
-     *
+    /*
      * Open the file in write-only mode.
      */
     rb_define_const(mFcntl, "O_WRONLY", INT2NUM(O_WRONLY));
 #endif
-#ifdef O_ACCMODE
-    /* Document-const: O_ACCMODE
-     *
+#ifndef O_ACCMODE
+    int O_ACCMODE = (O_RDONLY | O_WRONLY | O_RDWR);
+#endif
+    /*
      * Mask to extract the read/write flags
      */
     rb_define_const(mFcntl, "O_ACCMODE", INT2FIX(O_ACCMODE));
-#else
-    /* Document-const: O_ACCMODE
-     *
-     * Mask to extract the read/write flags
-     */
-    rb_define_const(mFcntl, "O_ACCMODE", INT2FIX(O_RDONLY | O_WRONLY | O_RDWR));
-#endif
 #ifdef F_DUP2FD
-    /* Document-const: F_DUP2FD
-     *
+    /*
      * It is a FreeBSD specific constant and equivalent
      * to dup2 call.
      */
     rb_define_const(mFcntl, "F_DUP2FD", INT2NUM(F_DUP2FD));
 #endif
 #ifdef F_DUP2FD_CLOEXEC
-    /* Document-const: F_DUP2FD_CLOEXEC
-     *
+    /*
      * It is a FreeBSD specific constant and acts
      * similarly as F_DUP2FD but set the FD_CLOEXEC
      * flag in addition.
diff --git a/ext/fcntl/fcntl.gemspec b/ext/fcntl/fcntl.gemspec
index 54aadb4b81a789..613a90d1ae551e 100644
--- a/ext/fcntl/fcntl.gemspec
+++ b/ext/fcntl/fcntl.gemspec
@@ -23,9 +23,10 @@ Gem::Specification.new do |spec|
   spec.licenses      = ["Ruby", "BSD-2-Clause"]
 
   spec.files         = ["ext/fcntl/extconf.rb", "ext/fcntl/fcntl.c"]
+  spec.extra_rdoc_files = [".document", ".rdoc_options", "BSDL", "COPYING", "README.md"]
   spec.bindir        = "exe"
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
   spec.extensions    = "ext/fcntl/extconf.rb"
-  spec.required_ruby_version = ">= 2.3.0"
+  spec.required_ruby_version = ">= 2.5.0"
 end
diff --git a/ext/fiddle/closure.c b/ext/fiddle/closure.c
deleted file mode 100644
index 3772dfda353b8f..00000000000000
--- a/ext/fiddle/closure.c
+++ /dev/null
@@ -1,436 +0,0 @@
-#include <fiddle.h>
-#include <ruby/thread.h>
-
-int ruby_thread_has_gvl_p(void); /* from internal.h */
-
-VALUE cFiddleClosure;
-
-typedef struct {
-    void * code;
-    ffi_closure *pcl;
-    ffi_cif cif;
-    int argc;
-    ffi_type **argv;
-} fiddle_closure;
-
-#if defined(__OpenBSD__)
-# define USE_FFI_CLOSURE_ALLOC 0
-#endif
-
-#if defined(USE_FFI_CLOSURE_ALLOC)
-#elif !defined(HAVE_FFI_CLOSURE_ALLOC)
-# define USE_FFI_CLOSURE_ALLOC 0
-#else
-# define USE_FFI_CLOSURE_ALLOC 1
-#endif
-
-static void
-dealloc(void * ptr)
-{
-    fiddle_closure * cls = (fiddle_closure *)ptr;
-#if USE_FFI_CLOSURE_ALLOC
-    ffi_closure_free(cls->pcl);
-#else
-    munmap(cls->pcl, sizeof(*cls->pcl));
-#endif
-    if (cls->argv) xfree(cls->argv);
-    xfree(cls);
-}
-
-static size_t
-closure_memsize(const void * ptr)
-{
-    fiddle_closure * cls = (fiddle_closure *)ptr;
-    size_t size = 0;
-
-    size += sizeof(*cls);
-#if !defined(FFI_NO_RAW_API) || !FFI_NO_RAW_API
-    size += ffi_raw_size(&cls->cif);
-#endif
-    size += sizeof(*cls->argv);
-    size += sizeof(ffi_closure);
-
-    return size;
-}
-
-const rb_data_type_t closure_data_type = {
-    .wrap_struct_name = "fiddle/closure",
-    .function = {
-        .dmark = 0,
-        .dfree = dealloc,
-        .dsize = closure_memsize
-    },
-    .flags = RUBY_TYPED_FREE_IMMEDIATELY | RUBY_TYPED_WB_PROTECTED,
-};
-
-struct callback_args {
-    ffi_cif *cif;
-    void *resp;
-    void **args;
-    void *ctx;
-};
-
-static void *
-with_gvl_callback(void *ptr)
-{
-    struct callback_args *x = ptr;
-
-    VALUE self      = (VALUE)x->ctx;
-    VALUE rbargs    = rb_iv_get(self, "@args");
-    VALUE ctype     = rb_iv_get(self, "@ctype");
-    int argc        = RARRAY_LENINT(rbargs);
-    VALUE params    = rb_ary_tmp_new(argc);
-    VALUE ret;
-    VALUE cPointer;
-    int i, type;
-
-    cPointer = rb_const_get(mFiddle, rb_intern("Pointer"));
-
-    for (i = 0; i < argc; i++) {
-        type = NUM2INT(RARRAY_AREF(rbargs, i));
-        switch (type) {
-	  case TYPE_VOID:
-	    argc = 0;
-	    break;
-	  case TYPE_INT:
-	    rb_ary_push(params, INT2NUM(*(int *)x->args[i]));
-	    break;
-	  case TYPE_UINT:
-	    rb_ary_push(params, UINT2NUM(*(unsigned int *)x->args[i]));
-	    break;
-	  case TYPE_VOIDP:
-	    rb_ary_push(params,
-			rb_funcall(cPointer, rb_intern("[]"), 1,
-				   PTR2NUM(*(void **)x->args[i])));
-	    break;
-	  case TYPE_LONG:
-	    rb_ary_push(params, LONG2NUM(*(long *)x->args[i]));
-	    break;
-	  case TYPE_ULONG:
-	    rb_ary_push(params, ULONG2NUM(*(unsigned long *)x->args[i]));
-	    break;
-	  case TYPE_CHAR:
-	    rb_ary_push(params, INT2NUM(*(signed char *)x->args[i]));
-	    break;
-	  case TYPE_UCHAR:
-	    rb_ary_push(params, UINT2NUM(*(unsigned char *)x->args[i]));
-	    break;
-	  case TYPE_SHORT:
-	    rb_ary_push(params, INT2NUM(*(signed short *)x->args[i]));
-	    break;
-	  case TYPE_USHORT:
-	    rb_ary_push(params, UINT2NUM(*(unsigned short *)x->args[i]));
-	    break;
-	  case TYPE_DOUBLE:
-	    rb_ary_push(params, rb_float_new(*(double *)x->args[i]));
-	    break;
-	  case TYPE_FLOAT:
-	    rb_ary_push(params, rb_float_new(*(float *)x->args[i]));
-	    break;
-#if HAVE_LONG_LONG
-	  case TYPE_LONG_LONG:
-	    rb_ary_push(params, LL2NUM(*(LONG_LONG *)x->args[i]));
-	    break;
-	  case TYPE_ULONG_LONG:
-	    rb_ary_push(params, ULL2NUM(*(unsigned LONG_LONG *)x->args[i]));
-	    break;
-#endif
-	  case TYPE_CONST_STRING:
-	    rb_ary_push(params,
-                        rb_str_new_cstr(*((const char **)(x->args[i]))));
-	    break;
-	  default:
-	    rb_raise(rb_eRuntimeError, "closure args: %d", type);
-        }
-    }
-
-    ret = rb_funcall2(self, rb_intern("call"), argc, RARRAY_CONST_PTR(params));
-    RB_GC_GUARD(params);
-
-    type = NUM2INT(ctype);
-    switch (type) {
-      case TYPE_VOID:
-	break;
-      case TYPE_LONG:
-	*(long *)x->resp = NUM2LONG(ret);
-	break;
-      case TYPE_ULONG:
-	*(unsigned long *)x->resp = NUM2ULONG(ret);
-	break;
-      case TYPE_CHAR:
-      case TYPE_SHORT:
-      case TYPE_INT:
-	*(ffi_sarg *)x->resp = NUM2INT(ret);
-	break;
-      case TYPE_UCHAR:
-      case TYPE_USHORT:
-      case TYPE_UINT:
-	*(ffi_arg *)x->resp = NUM2UINT(ret);
-	break;
-      case TYPE_VOIDP:
-	*(void **)x->resp = NUM2PTR(ret);
-	break;
-      case TYPE_DOUBLE:
-	*(double *)x->resp = NUM2DBL(ret);
-	break;
-      case TYPE_FLOAT:
-	*(float *)x->resp = (float)NUM2DBL(ret);
-	break;
-#if HAVE_LONG_LONG
-      case TYPE_LONG_LONG:
-	*(LONG_LONG *)x->resp = NUM2LL(ret);
-	break;
-      case TYPE_ULONG_LONG:
-	*(unsigned LONG_LONG *)x->resp = NUM2ULL(ret);
-	break;
-#endif
-      case TYPE_CONST_STRING:
-        /* Dangerous. Callback must keep reference of the String. */
-        *((const char **)(x->resp)) = StringValueCStr(ret);
-        break;
-      default:
-	rb_raise(rb_eRuntimeError, "closure retval: %d", type);
-    }
-    return 0;
-}
-
-static void
-callback(ffi_cif *cif, void *resp, void **args, void *ctx)
-{
-    struct callback_args x;
-
-    x.cif = cif;
-    x.resp = resp;
-    x.args = args;
-    x.ctx = ctx;
-
-    if (ruby_thread_has_gvl_p()) {
-	(void)with_gvl_callback(&x);
-    } else {
-	(void)rb_thread_call_with_gvl(with_gvl_callback, &x);
-    }
-}
-
-static VALUE
-allocate(VALUE klass)
-{
-    fiddle_closure * closure;
-
-    VALUE i = TypedData_Make_Struct(klass, fiddle_closure,
-	    &closure_data_type, closure);
-
-#if USE_FFI_CLOSURE_ALLOC
-    closure->pcl = ffi_closure_alloc(sizeof(ffi_closure), &closure->code);
-#else
-    closure->pcl = mmap(NULL, sizeof(ffi_closure), PROT_READ | PROT_WRITE,
-        MAP_ANON | MAP_PRIVATE, -1, 0);
-#endif
-
-    return i;
-}
-
-static fiddle_closure *
-get_raw(VALUE self)
-{
-    fiddle_closure *closure;
-    TypedData_Get_Struct(self, fiddle_closure, &closure_data_type, closure);
-    if (!closure) {
-        rb_raise(rb_eArgError, "already freed: %+"PRIsVALUE, self);
-    }
-    return closure;
-}
-
-typedef struct {
-    VALUE self;
-    int argc;
-    VALUE *argv;
-} initialize_data;
-
-static VALUE
-initialize_body(VALUE user_data)
-{
-    initialize_data *data = (initialize_data *)user_data;
-    VALUE ret;
-    VALUE args;
-    VALUE normalized_args;
-    VALUE abi;
-    fiddle_closure * cl;
-    ffi_cif * cif;
-    ffi_closure *pcl;
-    ffi_status result;
-    int i, argc;
-
-    if (2 == rb_scan_args(data->argc, data->argv, "21", &ret, &args, &abi))
-        abi = INT2NUM(FFI_DEFAULT_ABI);
-
-    Check_Type(args, T_ARRAY);
-
-    argc = RARRAY_LENINT(args);
-
-    TypedData_Get_Struct(data->self, fiddle_closure, &closure_data_type, cl);
-
-    cl->argv = (ffi_type **)xcalloc(argc + 1, sizeof(ffi_type *));
-
-    normalized_args = rb_ary_new_capa(argc);
-    for (i = 0; i < argc; i++) {
-        VALUE arg = rb_fiddle_type_ensure(RARRAY_AREF(args, i));
-        rb_ary_push(normalized_args, arg);
-        cl->argv[i] = rb_fiddle_int_to_ffi_type(NUM2INT(arg));
-    }
-    cl->argv[argc] = NULL;
-
-    ret = rb_fiddle_type_ensure(ret);
-    rb_iv_set(data->self, "@ctype", ret);
-    rb_iv_set(data->self, "@args", normalized_args);
-
-    cif = &cl->cif;
-    pcl = cl->pcl;
-
-    result = ffi_prep_cif(cif,
-                          NUM2INT(abi),
-                          argc,
-                          rb_fiddle_int_to_ffi_type(NUM2INT(ret)),
-                          cl->argv);
-
-    if (FFI_OK != result) {
-        rb_raise(rb_eRuntimeError, "error prepping CIF %d", result);
-    }
-
-#if USE_FFI_CLOSURE_ALLOC
-    result = ffi_prep_closure_loc(pcl, cif, callback,
-                                  (void *)(data->self), cl->code);
-#else
-    result = ffi_prep_closure(pcl, cif, callback, (void *)(data->self));
-    cl->code = (void *)pcl;
-    i = mprotect(pcl, sizeof(*pcl), PROT_READ | PROT_EXEC);
-    if (i) {
-        rb_sys_fail("mprotect");
-    }
-#endif
-
-    if (FFI_OK != result) {
-        rb_raise(rb_eRuntimeError, "error prepping closure %d", result);
-    }
-
-    return data->self;
-}
-
-static VALUE
-initialize_rescue(VALUE user_data, VALUE exception)
-{
-    initialize_data *data = (initialize_data *)user_data;
-    dealloc(RTYPEDDATA_DATA(data->self));
-    RTYPEDDATA_DATA(data->self) = NULL;
-    rb_exc_raise(exception);
-    return data->self;
-}
-
-static VALUE
-initialize(int argc, VALUE *argv, VALUE self)
-{
-    initialize_data data;
-    data.self = self;
-    data.argc = argc;
-    data.argv = argv;
-    return rb_rescue(initialize_body, (VALUE)&data,
-                     initialize_rescue, (VALUE)&data);
-}
-
-static VALUE
-to_i(VALUE self)
-{
-    fiddle_closure *closure = get_raw(self);
-    return PTR2NUM(closure->code);
-}
-
-static VALUE
-closure_free(VALUE self)
-{
-    fiddle_closure *closure;
-    TypedData_Get_Struct(self, fiddle_closure, &closure_data_type, closure);
-    if (closure) {
-        dealloc(closure);
-        RTYPEDDATA_DATA(self) = NULL;
-    }
-    return RUBY_Qnil;
-}
-
-static VALUE
-closure_freed_p(VALUE self)
-{
-    fiddle_closure *closure;
-    TypedData_Get_Struct(self, fiddle_closure, &closure_data_type, closure);
-    return closure ? RUBY_Qfalse : RUBY_Qtrue;
-}
-
-void
-Init_fiddle_closure(void)
-{
-#if 0
-    mFiddle = rb_define_module("Fiddle"); /* let rdoc know about mFiddle */
-#endif
-
-    /*
-     * Document-class: Fiddle::Closure
-     *
-     * == Description
-     *
-     * An FFI closure wrapper, for handling callbacks.
-     *
-     * == Example
-     *
-     *   closure = Class.new(Fiddle::Closure) {
-     *     def call
-     *       10
-     *     end
-     *   }.new(Fiddle::TYPE_INT, [])
-     *	    #=> #<#<Class:0x0000000150d308>:0x0000000150d240>
-     *   func = Fiddle::Function.new(closure, [], Fiddle::TYPE_INT)
-     *	    #=> #<Fiddle::Function:0x00000001516e58>
-     *   func.call
-     *	    #=> 10
-     */
-    cFiddleClosure = rb_define_class_under(mFiddle, "Closure", rb_cObject);
-
-    rb_define_alloc_func(cFiddleClosure, allocate);
-
-    /*
-     * Document-method: new
-     *
-     * call-seq: new(ret, args, abi = Fiddle::DEFAULT)
-     *
-     * Construct a new Closure object.
-     *
-     * * +ret+ is the C type to be returned
-     * * +args+ is an Array of arguments, passed to the callback function
-     * * +abi+ is the abi of the closure
-     *
-     * If there is an error in preparing the ffi_cif or ffi_prep_closure,
-     * then a RuntimeError will be raised.
-     */
-    rb_define_method(cFiddleClosure, "initialize", initialize, -1);
-
-    /*
-     * Document-method: to_i
-     *
-     * Returns the memory address for this closure.
-     */
-    rb_define_method(cFiddleClosure, "to_i", to_i, 0);
-
-    /*
-     * Document-method: free
-     *
-     * Free this closure explicitly. You can't use this closure anymore.
-     *
-     * If this closure is already freed, this does nothing.
-     */
-    rb_define_method(cFiddleClosure, "free", closure_free, 0);
-
-    /*
-     * Document-method: freed?
-     *
-     * Whether this closure was freed explicitly.
-     */
-    rb_define_method(cFiddleClosure, "freed?", closure_freed_p, 0);
-}
-/* vim: set noet sw=4 sts=4 */
diff --git a/ext/fiddle/closure.h b/ext/fiddle/closure.h
deleted file mode 100644
index d0a8be6180746e..00000000000000
--- a/ext/fiddle/closure.h
+++ /dev/null
@@ -1,8 +0,0 @@
-#ifndef FIDDLE_CLOSURE_H
-#define FIDDLE_CLOSURE_H
-
-#include <fiddle.h>
-
-void Init_fiddle_closure(void);
-
-#endif
diff --git a/ext/fiddle/conversions.c b/ext/fiddle/conversions.c
deleted file mode 100644
index 66058d5d12a550..00000000000000
--- a/ext/fiddle/conversions.c
+++ /dev/null
@@ -1,360 +0,0 @@
-#include <stdbool.h>
-
-#include <fiddle.h>
-
-VALUE
-rb_fiddle_type_bool(void)
-{
-    if (sizeof(bool) == sizeof(char)) {
-        return INT2NUM(TYPE_UCHAR);
-    } else if (sizeof(bool) == sizeof(short)) {
-        return INT2NUM(TYPE_USHORT);
-    } else if (sizeof(bool) == sizeof(int)) {
-        return INT2NUM(TYPE_UINT);
-    } else if (sizeof(bool) == sizeof(long)) {
-        return INT2NUM(TYPE_ULONG);
-    } else {
-        rb_raise(rb_eNotImpError,
-                 "bool isn't supported: %u",
-                 (unsigned int)sizeof(bool));
-        return RUBY_Qnil;
-    }
-}
-
-VALUE
-rb_fiddle_type_ensure(VALUE type)
-{
-    VALUE original_type = type;
-
-    if (!RB_SYMBOL_P(type)) {
-        VALUE type_string = rb_check_string_type(type);
-        if (!NIL_P(type_string)) {
-            type = rb_to_symbol(type_string);
-        }
-    }
-
-    if (RB_SYMBOL_P(type)) {
-        ID type_id = rb_sym2id(type);
-        ID void_id;
-        ID voidp_id;
-        ID char_id;
-        ID short_id;
-        ID int_id;
-        ID long_id;
-#ifdef TYPE_LONG_LONG
-        ID long_long_id;
-#endif
-#ifdef TYPE_INT8_T
-        ID int8_t_id;
-#endif
-#ifdef TYPE_INT16_T
-        ID int16_t_id;
-#endif
-#ifdef TYPE_INT32_T
-        ID int32_t_id;
-#endif
-#ifdef TYPE_INT64_T
-        ID int64_t_id;
-#endif
-        ID float_id;
-        ID double_id;
-        ID variadic_id;
-        ID const_string_id;
-        ID size_t_id;
-        ID ssize_t_id;
-        ID ptrdiff_t_id;
-        ID intptr_t_id;
-        ID uintptr_t_id;
-        ID bool_id;
-        RUBY_CONST_ID(void_id, "void");
-        RUBY_CONST_ID(voidp_id, "voidp");
-        RUBY_CONST_ID(char_id, "char");
-        RUBY_CONST_ID(short_id, "short");
-        RUBY_CONST_ID(int_id, "int");
-        RUBY_CONST_ID(long_id, "long");
-#ifdef TYPE_LONG_LONG
-        RUBY_CONST_ID(long_long_id, "long_long");
-#endif
-#ifdef TYPE_INT8_T
-        RUBY_CONST_ID(int8_t_id, "int8_t");
-#endif
-#ifdef TYPE_INT16_T
-        RUBY_CONST_ID(int16_t_id, "int16_t");
-#endif
-#ifdef TYPE_INT32_T
-        RUBY_CONST_ID(int32_t_id, "int32_t");
-#endif
-#ifdef TYPE_INT64_T
-        RUBY_CONST_ID(int64_t_id, "int64_t");
-#endif
-        RUBY_CONST_ID(float_id, "float");
-        RUBY_CONST_ID(double_id, "double");
-        RUBY_CONST_ID(variadic_id, "variadic");
-        RUBY_CONST_ID(const_string_id, "const_string");
-        RUBY_CONST_ID(size_t_id, "size_t");
-        RUBY_CONST_ID(ssize_t_id, "ssize_t");
-        RUBY_CONST_ID(ptrdiff_t_id, "ptrdiff_t");
-        RUBY_CONST_ID(intptr_t_id, "intptr_t");
-        RUBY_CONST_ID(uintptr_t_id, "uintptr_t");
-        RUBY_CONST_ID(bool_id, "bool");
-        if (type_id == void_id) {
-            return INT2NUM(TYPE_VOID);
-        }
-        else if (type_id == voidp_id) {
-            return INT2NUM(TYPE_VOIDP);
-        }
-        else if (type_id == char_id) {
-            return INT2NUM(TYPE_CHAR);
-        }
-        else if (type_id == short_id) {
-            return INT2NUM(TYPE_SHORT);
-        }
-        else if (type_id == int_id) {
-            return INT2NUM(TYPE_INT);
-        }
-        else if (type_id == long_id) {
-            return INT2NUM(TYPE_LONG);
-        }
-#ifdef TYPE_LONG_LONG
-        else if (type_id == long_long_id) {
-            return INT2NUM(TYPE_LONG_LONG);
-        }
-#endif
-#ifdef TYPE_INT8_T
-        else if (type_id == int8_t_id) {
-            return INT2NUM(TYPE_INT8_T);
-        }
-#endif
-#ifdef TYPE_INT16_T
-        else if (type_id == int16_t_id) {
-            return INT2NUM(TYPE_INT16_T);
-        }
-#endif
-#ifdef TYPE_INT32_T
-        else if (type_id == int32_t_id) {
-            return INT2NUM(TYPE_INT32_T);
-        }
-#endif
-#ifdef TYPE_INT64_T
-        else if (type_id == int64_t_id) {
-            return INT2NUM(TYPE_INT64_T);
-        }
-#endif
-        else if (type_id == float_id) {
-            return INT2NUM(TYPE_FLOAT);
-        }
-        else if (type_id == double_id) {
-            return INT2NUM(TYPE_DOUBLE);
-        }
-        else if (type_id == variadic_id) {
-            return INT2NUM(TYPE_VARIADIC);
-        }
-        else if (type_id == const_string_id) {
-            return INT2NUM(TYPE_CONST_STRING);
-        }
-        else if (type_id == size_t_id) {
-            return INT2NUM(TYPE_SIZE_T);
-        }
-        else if (type_id == ssize_t_id) {
-            return INT2NUM(TYPE_SSIZE_T);
-        }
-        else if (type_id == ptrdiff_t_id) {
-            return INT2NUM(TYPE_PTRDIFF_T);
-        }
-        else if (type_id == intptr_t_id) {
-            return INT2NUM(TYPE_INTPTR_T);
-        }
-        else if (type_id == uintptr_t_id) {
-            return INT2NUM(TYPE_UINTPTR_T);
-        }
-        else if (type_id == bool_id) {
-            return rb_fiddle_type_bool();
-        }
-        else {
-            type = original_type;
-        }
-    }
-
-    return rb_to_int(type);
-}
-
-ffi_type *
-rb_fiddle_int_to_ffi_type(int type)
-{
-    int signed_p = 1;
-
-    if (type < 0) {
-	type = -1 * type;
-	signed_p = 0;
-    }
-
-#define rb_ffi_type_of(t) (signed_p ? &ffi_type_s##t : &ffi_type_u##t)
-
-    switch (type) {
-      case TYPE_VOID:
-	return &ffi_type_void;
-      case TYPE_VOIDP:
-	return &ffi_type_pointer;
-      case TYPE_CHAR:
-	return rb_ffi_type_of(char);
-      case TYPE_SHORT:
-	return rb_ffi_type_of(short);
-      case TYPE_INT:
-	return rb_ffi_type_of(int);
-      case TYPE_LONG:
-	return rb_ffi_type_of(long);
-#if HAVE_LONG_LONG
-      case TYPE_LONG_LONG:
-	return rb_ffi_type_of(long_long);
-#endif
-      case TYPE_FLOAT:
-	return &ffi_type_float;
-      case TYPE_DOUBLE:
-	return &ffi_type_double;
-      case TYPE_CONST_STRING:
-	return &ffi_type_pointer;
-      default:
-	rb_raise(rb_eRuntimeError, "unknown type %d", type);
-    }
-    return &ffi_type_pointer;
-}
-
-ffi_type *
-int_to_ffi_type(int type)
-{
-    return rb_fiddle_int_to_ffi_type(type);
-}
-
-void
-rb_fiddle_value_to_generic(int type, VALUE *src, fiddle_generic *dst)
-{
-    switch (type) {
-      case TYPE_VOID:
-	break;
-      case TYPE_VOIDP:
-	dst->pointer = NUM2PTR(rb_Integer(*src));
-	break;
-      case TYPE_CHAR:
-        if (RB_TYPE_P(*src, RUBY_T_STRING) && RSTRING_LEN(*src) == 1) {
-            dst->schar = RSTRING_PTR(*src)[0];
-        } else {
-            dst->schar = (signed char)NUM2INT(*src);
-        }
-	break;
-      case TYPE_UCHAR:
-	dst->uchar = (unsigned char)NUM2UINT(*src);
-	break;
-      case TYPE_SHORT:
-	dst->sshort = (unsigned short)NUM2INT(*src);
-	break;
-      case TYPE_USHORT:
-	dst->sshort = (signed short)NUM2UINT(*src);
-	break;
-      case TYPE_INT:
-	dst->sint = NUM2INT(*src);
-	break;
-      case TYPE_UINT:
-	dst->uint = NUM2UINT(*src);
-	break;
-      case TYPE_LONG:
-	dst->slong = NUM2LONG(*src);
-	break;
-      case TYPE_ULONG:
-	dst->ulong = NUM2ULONG(*src);
-	break;
-#if HAVE_LONG_LONG
-      case TYPE_LONG_LONG:
-	dst->slong_long = NUM2LL(*src);
-	break;
-      case TYPE_ULONG_LONG:
-	dst->ulong_long = NUM2ULL(*src);
-	break;
-#endif
-      case TYPE_FLOAT:
-	dst->ffloat = (float)NUM2DBL(*src);
-	break;
-      case TYPE_DOUBLE:
-	dst->ddouble = NUM2DBL(*src);
-	break;
-      case TYPE_CONST_STRING:
-        if (NIL_P(*src)) {
-            dst->pointer = NULL;
-        }
-        else {
-            dst->pointer = rb_string_value_cstr(src);
-        }
-	break;
-      default:
-	rb_raise(rb_eRuntimeError, "unknown type %d", type);
-    }
-}
-
-void
-value_to_generic(int type, VALUE src, fiddle_generic *dst)
-{
-    /* src isn't safe from GC when type is TYPE_CONST_STRING and src
-     * isn't String. */
-    rb_fiddle_value_to_generic(type, &src, dst);
-}
-
-VALUE
-rb_fiddle_generic_to_value(VALUE rettype, fiddle_generic retval)
-{
-    int type = NUM2INT(rettype);
-    VALUE cPointer;
-
-    cPointer = rb_const_get(mFiddle, rb_intern("Pointer"));
-
-    switch (type) {
-      case TYPE_VOID:
-	return Qnil;
-      case TYPE_VOIDP:
-        return rb_funcall(cPointer, rb_intern("[]"), 1,
-          PTR2NUM((void *)retval.pointer));
-      case TYPE_CHAR:
-	return INT2NUM((signed char)retval.fffi_sarg);
-      case TYPE_UCHAR:
-	return INT2NUM((unsigned char)retval.fffi_arg);
-      case TYPE_SHORT:
-	return INT2NUM((signed short)retval.fffi_sarg);
-      case TYPE_USHORT:
-	return INT2NUM((unsigned short)retval.fffi_arg);
-      case TYPE_INT:
-	return INT2NUM((signed int)retval.fffi_sarg);
-      case TYPE_UINT:
-	return UINT2NUM((unsigned int)retval.fffi_arg);
-      case TYPE_LONG:
-	return LONG2NUM(retval.slong);
-      case TYPE_ULONG:
-	return ULONG2NUM(retval.ulong);
-#if HAVE_LONG_LONG
-      case TYPE_LONG_LONG:
-	return LL2NUM(retval.slong_long);
-      case TYPE_ULONG_LONG:
-	return ULL2NUM(retval.ulong_long);
-#endif
-      case TYPE_FLOAT:
-	return rb_float_new(retval.ffloat);
-      case TYPE_DOUBLE:
-	return rb_float_new(retval.ddouble);
-      case TYPE_CONST_STRING:
-        if (retval.pointer) {
-            return rb_str_new_cstr(retval.pointer);
-        }
-        else {
-            return Qnil;
-        }
-      default:
-	rb_raise(rb_eRuntimeError, "unknown type %d", type);
-    }
-
-    UNREACHABLE;
-}
-
-VALUE
-generic_to_value(VALUE rettype, fiddle_generic retval)
-{
-    return rb_fiddle_generic_to_value(rettype, retval);
-}
-
-/* vim: set noet sw=4 sts=4 */
diff --git a/ext/fiddle/conversions.h b/ext/fiddle/conversions.h
deleted file mode 100644
index 5ea569e3ff9851..00000000000000
--- a/ext/fiddle/conversions.h
+++ /dev/null
@@ -1,54 +0,0 @@
-#ifndef FIDDLE_CONVERSIONS_H
-#define FIDDLE_CONVERSIONS_H
-
-#include <fiddle.h>
-
-typedef union
-{
-    ffi_arg  fffi_arg;     /* rvalue smaller than unsigned long */
-    ffi_sarg fffi_sarg;    /* rvalue smaller than signed long */
-    unsigned char uchar;   /* ffi_type_uchar */
-    signed char   schar;   /* ffi_type_schar */
-    unsigned short ushort; /* ffi_type_sshort */
-    signed short sshort;   /* ffi_type_ushort */
-    unsigned int uint;     /* ffi_type_uint */
-    signed int sint;       /* ffi_type_sint */
-    unsigned long ulong;   /* ffi_type_ulong */
-    signed long slong;     /* ffi_type_slong */
-    float ffloat;          /* ffi_type_float */
-    double ddouble;        /* ffi_type_double */
-#if HAVE_LONG_LONG
-    unsigned LONG_LONG ulong_long; /* ffi_type_ulong_long */
-    signed LONG_LONG slong_long; /* ffi_type_ulong_long */
-#endif
-    void * pointer;        /* ffi_type_pointer */
-} fiddle_generic;
-
-VALUE rb_fiddle_type_bool(void);
-VALUE rb_fiddle_type_ensure(VALUE type);
-ffi_type * rb_fiddle_int_to_ffi_type(int type);
-void rb_fiddle_value_to_generic(int type, VALUE *src, fiddle_generic *dst);
-VALUE rb_fiddle_generic_to_value(VALUE rettype, fiddle_generic retval);
-
-/* Deprecated. Use rb_fiddle_*() version. */
-ffi_type * int_to_ffi_type(int type);
-void value_to_generic(int type, VALUE src, fiddle_generic *dst);
-VALUE generic_to_value(VALUE rettype, fiddle_generic retval);
-
-#define VALUE2GENERIC(_type, _src, _dst)        \
-    rb_fiddle_value_to_generic((_type), &(_src), (_dst))
-#define INT2FFI_TYPE(_type)                     \
-    rb_fiddle_int_to_ffi_type(_type)
-#define GENERIC2VALUE(_type, _retval)           \
-    rb_fiddle_generic_to_value((_type), (_retval))
-
-#if SIZEOF_VOIDP == SIZEOF_LONG
-# define PTR2NUM(x)   (LONG2NUM((long)(x)))
-# define NUM2PTR(x)   ((void*)(NUM2ULONG(x)))
-#else
-/* # error --->> Ruby/DL2 requires sizeof(void*) == sizeof(long) to be compiled. <<--- */
-# define PTR2NUM(x)   (LL2NUM((LONG_LONG)(x)))
-# define NUM2PTR(x)   ((void*)(NUM2ULL(x)))
-#endif
-
-#endif
diff --git a/ext/fiddle/depend b/ext/fiddle/depend
deleted file mode 100644
index 561785275eb577..00000000000000
--- a/ext/fiddle/depend
+++ /dev/null
@@ -1,1388 +0,0 @@
-PWD =
-
-CONFIGURE_LIBFFI = \
-	$(LIBFFI_CONFIGURE) --disable-shared \
-		--host=$(LIBFFI_ARCH) --enable-builddir=$(arch) \
-		CC="$(CC)" CFLAGS="$(LIBFFI_CFLAGS)" \
-		LD="$(LD)" LDFLAGS="$(LIBFFI_LDFLAGS)"
-
-$(STATIC_LIB) $(RUBYARCHDIR)/$(DLLIB) $(DLLIB): $(LIBFFI_A)
-
-$(OBJS): $(FFI_H)
-
-.PHONY: .FORCE hdr
-
-.FORCE:
-
-hdr: $(FFI_H)
-
-configure-libffi build-libffi: .FORCE
-configure-libffi \
-$(LIBFFI_DIR)/include/ffi.h \
-$(LIBFFI_DIR)/include/ffitarget.h \
-$(LIBFFI_DIR)/fficonfig.h \
-$(LIBFFI_DIR)/Makefile:
-	$(Q) $(MAKEDIRS) $(LIBFFI_DIR)
-	$(Q) $(CONFIGURE_LIBFFI)
-
-build-libffi $(LIBFFI_A):
-	$(Q) $(SUBMAKE_PRE) $(MAKE) $(SUBMAKE_ARG)
-
-clean-none:
-clean-libffi:
-	$(Q) $(SUBMAKE_PRE) $(MAKE) $(SUBMAKE_ARG) clean
-
-distclean-none:
-distclean-libffi:
-	$(Q) $(SUBMAKE_PRE) $(MAKE) $(SUBMAKE_ARG) distclean
-	$(Q) $(RM) $(LIBFFI_DIR)/local.exp
-	$(Q) $(RUBY) -rfileutils -e "FileUtils.rmdir(Dir.glob(ARGV[0]+'/**/{,.*/}'), :parents=>true)" $(LIBFFI_DIR)
-
-realclean-none:
-realclean-libffi:
-	$(Q) $(RMALL) $(LIBFFI_DIR)
-
-.PHONY: clean-libffi distclean-libffi realclean-libffi
-.PHONY: clean-none distclean-none realclean-none
-
-clean: clean-$(LIBFFI_CLEAN)
-distclean: distclean-$(LIBFFI_CLEAN)
-realclean: realclean-$(LIBFFI_CLEAN)
-
-.PHONY: configure configure-libffi
-
-# AUTOGENERATED DEPENDENCIES START
-closure.o: $(RUBY_EXTCONF_H)
-closure.o: $(arch_hdrdir)/ruby/config.h
-closure.o: $(hdrdir)/ruby.h
-closure.o: $(hdrdir)/ruby/assert.h
-closure.o: $(hdrdir)/ruby/backward.h
-closure.o: $(hdrdir)/ruby/backward/2/assume.h
-closure.o: $(hdrdir)/ruby/backward/2/attributes.h
-closure.o: $(hdrdir)/ruby/backward/2/bool.h
-closure.o: $(hdrdir)/ruby/backward/2/inttypes.h
-closure.o: $(hdrdir)/ruby/backward/2/limits.h
-closure.o: $(hdrdir)/ruby/backward/2/long_long.h
-closure.o: $(hdrdir)/ruby/backward/2/stdalign.h
-closure.o: $(hdrdir)/ruby/backward/2/stdarg.h
-closure.o: $(hdrdir)/ruby/defines.h
-closure.o: $(hdrdir)/ruby/intern.h
-closure.o: $(hdrdir)/ruby/internal/abi.h
-closure.o: $(hdrdir)/ruby/internal/anyargs.h
-closure.o: $(hdrdir)/ruby/internal/arithmetic.h
-closure.o: $(hdrdir)/ruby/internal/arithmetic/char.h
-closure.o: $(hdrdir)/ruby/internal/arithmetic/double.h
-closure.o: $(hdrdir)/ruby/internal/arithmetic/fixnum.h
-closure.o: $(hdrdir)/ruby/internal/arithmetic/gid_t.h
-closure.o: $(hdrdir)/ruby/internal/arithmetic/int.h
-closure.o: $(hdrdir)/ruby/internal/arithmetic/intptr_t.h
-closure.o: $(hdrdir)/ruby/internal/arithmetic/long.h
-closure.o: $(hdrdir)/ruby/internal/arithmetic/long_long.h
-closure.o: $(hdrdir)/ruby/internal/arithmetic/mode_t.h
-closure.o: $(hdrdir)/ruby/internal/arithmetic/off_t.h
-closure.o: $(hdrdir)/ruby/internal/arithmetic/pid_t.h
-closure.o: $(hdrdir)/ruby/internal/arithmetic/short.h
-closure.o: $(hdrdir)/ruby/internal/arithmetic/size_t.h
-closure.o: $(hdrdir)/ruby/internal/arithmetic/st_data_t.h
-closure.o: $(hdrdir)/ruby/internal/arithmetic/uid_t.h
-closure.o: $(hdrdir)/ruby/internal/assume.h
-closure.o: $(hdrdir)/ruby/internal/attr/alloc_size.h
-closure.o: $(hdrdir)/ruby/internal/attr/artificial.h
-closure.o: $(hdrdir)/ruby/internal/attr/cold.h
-closure.o: $(hdrdir)/ruby/internal/attr/const.h
-closure.o: $(hdrdir)/ruby/internal/attr/constexpr.h
-closure.o: $(hdrdir)/ruby/internal/attr/deprecated.h
-closure.o: $(hdrdir)/ruby/internal/attr/diagnose_if.h
-closure.o: $(hdrdir)/ruby/internal/attr/enum_extensibility.h
-closure.o: $(hdrdir)/ruby/internal/attr/error.h
-closure.o: $(hdrdir)/ruby/internal/attr/flag_enum.h
-closure.o: $(hdrdir)/ruby/internal/attr/forceinline.h
-closure.o: $(hdrdir)/ruby/internal/attr/format.h
-closure.o: $(hdrdir)/ruby/internal/attr/maybe_unused.h
-closure.o: $(hdrdir)/ruby/internal/attr/noalias.h
-closure.o: $(hdrdir)/ruby/internal/attr/nodiscard.h
-closure.o: $(hdrdir)/ruby/internal/attr/noexcept.h
-closure.o: $(hdrdir)/ruby/internal/attr/noinline.h
-closure.o: $(hdrdir)/ruby/internal/attr/nonnull.h
-closure.o: $(hdrdir)/ruby/internal/attr/noreturn.h
-closure.o: $(hdrdir)/ruby/internal/attr/packed_struct.h
-closure.o: $(hdrdir)/ruby/internal/attr/pure.h
-closure.o: $(hdrdir)/ruby/internal/attr/restrict.h
-closure.o: $(hdrdir)/ruby/internal/attr/returns_nonnull.h
-closure.o: $(hdrdir)/ruby/internal/attr/warning.h
-closure.o: $(hdrdir)/ruby/internal/attr/weakref.h
-closure.o: $(hdrdir)/ruby/internal/cast.h
-closure.o: $(hdrdir)/ruby/internal/compiler_is.h
-closure.o: $(hdrdir)/ruby/internal/compiler_is/apple.h
-closure.o: $(hdrdir)/ruby/internal/compiler_is/clang.h
-closure.o: $(hdrdir)/ruby/internal/compiler_is/gcc.h
-closure.o: $(hdrdir)/ruby/internal/compiler_is/intel.h
-closure.o: $(hdrdir)/ruby/internal/compiler_is/msvc.h
-closure.o: $(hdrdir)/ruby/internal/compiler_is/sunpro.h
-closure.o: $(hdrdir)/ruby/internal/compiler_since.h
-closure.o: $(hdrdir)/ruby/internal/config.h
-closure.o: $(hdrdir)/ruby/internal/constant_p.h
-closure.o: $(hdrdir)/ruby/internal/core.h
-closure.o: $(hdrdir)/ruby/internal/core/rarray.h
-closure.o: $(hdrdir)/ruby/internal/core/rbasic.h
-closure.o: $(hdrdir)/ruby/internal/core/rbignum.h
-closure.o: $(hdrdir)/ruby/internal/core/rclass.h
-closure.o: $(hdrdir)/ruby/internal/core/rdata.h
-closure.o: $(hdrdir)/ruby/internal/core/rfile.h
-closure.o: $(hdrdir)/ruby/internal/core/rhash.h
-closure.o: $(hdrdir)/ruby/internal/core/robject.h
-closure.o: $(hdrdir)/ruby/internal/core/rregexp.h
-closure.o: $(hdrdir)/ruby/internal/core/rstring.h
-closure.o: $(hdrdir)/ruby/internal/core/rstruct.h
-closure.o: $(hdrdir)/ruby/internal/core/rtypeddata.h
-closure.o: $(hdrdir)/ruby/internal/ctype.h
-closure.o: $(hdrdir)/ruby/internal/dllexport.h
-closure.o: $(hdrdir)/ruby/internal/dosish.h
-closure.o: $(hdrdir)/ruby/internal/error.h
-closure.o: $(hdrdir)/ruby/internal/eval.h
-closure.o: $(hdrdir)/ruby/internal/event.h
-closure.o: $(hdrdir)/ruby/internal/fl_type.h
-closure.o: $(hdrdir)/ruby/internal/gc.h
-closure.o: $(hdrdir)/ruby/internal/glob.h
-closure.o: $(hdrdir)/ruby/internal/globals.h
-closure.o: $(hdrdir)/ruby/internal/has/attribute.h
-closure.o: $(hdrdir)/ruby/internal/has/builtin.h
-closure.o: $(hdrdir)/ruby/internal/has/c_attribute.h
-closure.o: $(hdrdir)/ruby/internal/has/cpp_attribute.h
-closure.o: $(hdrdir)/ruby/internal/has/declspec_attribute.h
-closure.o: $(hdrdir)/ruby/internal/has/extension.h
-closure.o: $(hdrdir)/ruby/internal/has/feature.h
-closure.o: $(hdrdir)/ruby/internal/has/warning.h
-closure.o: $(hdrdir)/ruby/internal/intern/array.h
-closure.o: $(hdrdir)/ruby/internal/intern/bignum.h
-closure.o: $(hdrdir)/ruby/internal/intern/class.h
-closure.o: $(hdrdir)/ruby/internal/intern/compar.h
-closure.o: $(hdrdir)/ruby/internal/intern/complex.h
-closure.o: $(hdrdir)/ruby/internal/intern/cont.h
-closure.o: $(hdrdir)/ruby/internal/intern/dir.h
-closure.o: $(hdrdir)/ruby/internal/intern/enum.h
-closure.o: $(hdrdir)/ruby/internal/intern/enumerator.h
-closure.o: $(hdrdir)/ruby/internal/intern/error.h
-closure.o: $(hdrdir)/ruby/internal/intern/eval.h
-closure.o: $(hdrdir)/ruby/internal/intern/file.h
-closure.o: $(hdrdir)/ruby/internal/intern/hash.h
-closure.o: $(hdrdir)/ruby/internal/intern/io.h
-closure.o: $(hdrdir)/ruby/internal/intern/load.h
-closure.o: $(hdrdir)/ruby/internal/intern/marshal.h
-closure.o: $(hdrdir)/ruby/internal/intern/numeric.h
-closure.o: $(hdrdir)/ruby/internal/intern/object.h
-closure.o: $(hdrdir)/ruby/internal/intern/parse.h
-closure.o: $(hdrdir)/ruby/internal/intern/proc.h
-closure.o: $(hdrdir)/ruby/internal/intern/process.h
-closure.o: $(hdrdir)/ruby/internal/intern/random.h
-closure.o: $(hdrdir)/ruby/internal/intern/range.h
-closure.o: $(hdrdir)/ruby/internal/intern/rational.h
-closure.o: $(hdrdir)/ruby/internal/intern/re.h
-closure.o: $(hdrdir)/ruby/internal/intern/ruby.h
-closure.o: $(hdrdir)/ruby/internal/intern/select.h
-closure.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
-closure.o: $(hdrdir)/ruby/internal/intern/signal.h
-closure.o: $(hdrdir)/ruby/internal/intern/sprintf.h
-closure.o: $(hdrdir)/ruby/internal/intern/string.h
-closure.o: $(hdrdir)/ruby/internal/intern/struct.h
-closure.o: $(hdrdir)/ruby/internal/intern/thread.h
-closure.o: $(hdrdir)/ruby/internal/intern/time.h
-closure.o: $(hdrdir)/ruby/internal/intern/variable.h
-closure.o: $(hdrdir)/ruby/internal/intern/vm.h
-closure.o: $(hdrdir)/ruby/internal/interpreter.h
-closure.o: $(hdrdir)/ruby/internal/iterator.h
-closure.o: $(hdrdir)/ruby/internal/memory.h
-closure.o: $(hdrdir)/ruby/internal/method.h
-closure.o: $(hdrdir)/ruby/internal/module.h
-closure.o: $(hdrdir)/ruby/internal/newobj.h
-closure.o: $(hdrdir)/ruby/internal/scan_args.h
-closure.o: $(hdrdir)/ruby/internal/special_consts.h
-closure.o: $(hdrdir)/ruby/internal/static_assert.h
-closure.o: $(hdrdir)/ruby/internal/stdalign.h
-closure.o: $(hdrdir)/ruby/internal/stdbool.h
-closure.o: $(hdrdir)/ruby/internal/symbol.h
-closure.o: $(hdrdir)/ruby/internal/value.h
-closure.o: $(hdrdir)/ruby/internal/value_type.h
-closure.o: $(hdrdir)/ruby/internal/variable.h
-closure.o: $(hdrdir)/ruby/internal/warning_push.h
-closure.o: $(hdrdir)/ruby/internal/xmalloc.h
-closure.o: $(hdrdir)/ruby/missing.h
-closure.o: $(hdrdir)/ruby/ruby.h
-closure.o: $(hdrdir)/ruby/st.h
-closure.o: $(hdrdir)/ruby/subst.h
-closure.o: $(hdrdir)/ruby/thread.h
-closure.o: closure.c
-closure.o: closure.h
-closure.o: conversions.h
-closure.o: fiddle.h
-closure.o: function.h
-conversions.o: $(RUBY_EXTCONF_H)
-conversions.o: $(arch_hdrdir)/ruby/config.h
-conversions.o: $(hdrdir)/ruby.h
-conversions.o: $(hdrdir)/ruby/assert.h
-conversions.o: $(hdrdir)/ruby/backward.h
-conversions.o: $(hdrdir)/ruby/backward/2/assume.h
-conversions.o: $(hdrdir)/ruby/backward/2/attributes.h
-conversions.o: $(hdrdir)/ruby/backward/2/bool.h
-conversions.o: $(hdrdir)/ruby/backward/2/inttypes.h
-conversions.o: $(hdrdir)/ruby/backward/2/limits.h
-conversions.o: $(hdrdir)/ruby/backward/2/long_long.h
-conversions.o: $(hdrdir)/ruby/backward/2/stdalign.h
-conversions.o: $(hdrdir)/ruby/backward/2/stdarg.h
-conversions.o: $(hdrdir)/ruby/defines.h
-conversions.o: $(hdrdir)/ruby/intern.h
-conversions.o: $(hdrdir)/ruby/internal/abi.h
-conversions.o: $(hdrdir)/ruby/internal/anyargs.h
-conversions.o: $(hdrdir)/ruby/internal/arithmetic.h
-conversions.o: $(hdrdir)/ruby/internal/arithmetic/char.h
-conversions.o: $(hdrdir)/ruby/internal/arithmetic/double.h
-conversions.o: $(hdrdir)/ruby/internal/arithmetic/fixnum.h
-conversions.o: $(hdrdir)/ruby/internal/arithmetic/gid_t.h
-conversions.o: $(hdrdir)/ruby/internal/arithmetic/int.h
-conversions.o: $(hdrdir)/ruby/internal/arithmetic/intptr_t.h
-conversions.o: $(hdrdir)/ruby/internal/arithmetic/long.h
-conversions.o: $(hdrdir)/ruby/internal/arithmetic/long_long.h
-conversions.o: $(hdrdir)/ruby/internal/arithmetic/mode_t.h
-conversions.o: $(hdrdir)/ruby/internal/arithmetic/off_t.h
-conversions.o: $(hdrdir)/ruby/internal/arithmetic/pid_t.h
-conversions.o: $(hdrdir)/ruby/internal/arithmetic/short.h
-conversions.o: $(hdrdir)/ruby/internal/arithmetic/size_t.h
-conversions.o: $(hdrdir)/ruby/internal/arithmetic/st_data_t.h
-conversions.o: $(hdrdir)/ruby/internal/arithmetic/uid_t.h
-conversions.o: $(hdrdir)/ruby/internal/assume.h
-conversions.o: $(hdrdir)/ruby/internal/attr/alloc_size.h
-conversions.o: $(hdrdir)/ruby/internal/attr/artificial.h
-conversions.o: $(hdrdir)/ruby/internal/attr/cold.h
-conversions.o: $(hdrdir)/ruby/internal/attr/const.h
-conversions.o: $(hdrdir)/ruby/internal/attr/constexpr.h
-conversions.o: $(hdrdir)/ruby/internal/attr/deprecated.h
-conversions.o: $(hdrdir)/ruby/internal/attr/diagnose_if.h
-conversions.o: $(hdrdir)/ruby/internal/attr/enum_extensibility.h
-conversions.o: $(hdrdir)/ruby/internal/attr/error.h
-conversions.o: $(hdrdir)/ruby/internal/attr/flag_enum.h
-conversions.o: $(hdrdir)/ruby/internal/attr/forceinline.h
-conversions.o: $(hdrdir)/ruby/internal/attr/format.h
-conversions.o: $(hdrdir)/ruby/internal/attr/maybe_unused.h
-conversions.o: $(hdrdir)/ruby/internal/attr/noalias.h
-conversions.o: $(hdrdir)/ruby/internal/attr/nodiscard.h
-conversions.o: $(hdrdir)/ruby/internal/attr/noexcept.h
-conversions.o: $(hdrdir)/ruby/internal/attr/noinline.h
-conversions.o: $(hdrdir)/ruby/internal/attr/nonnull.h
-conversions.o: $(hdrdir)/ruby/internal/attr/noreturn.h
-conversions.o: $(hdrdir)/ruby/internal/attr/packed_struct.h
-conversions.o: $(hdrdir)/ruby/internal/attr/pure.h
-conversions.o: $(hdrdir)/ruby/internal/attr/restrict.h
-conversions.o: $(hdrdir)/ruby/internal/attr/returns_nonnull.h
-conversions.o: $(hdrdir)/ruby/internal/attr/warning.h
-conversions.o: $(hdrdir)/ruby/internal/attr/weakref.h
-conversions.o: $(hdrdir)/ruby/internal/cast.h
-conversions.o: $(hdrdir)/ruby/internal/compiler_is.h
-conversions.o: $(hdrdir)/ruby/internal/compiler_is/apple.h
-conversions.o: $(hdrdir)/ruby/internal/compiler_is/clang.h
-conversions.o: $(hdrdir)/ruby/internal/compiler_is/gcc.h
-conversions.o: $(hdrdir)/ruby/internal/compiler_is/intel.h
-conversions.o: $(hdrdir)/ruby/internal/compiler_is/msvc.h
-conversions.o: $(hdrdir)/ruby/internal/compiler_is/sunpro.h
-conversions.o: $(hdrdir)/ruby/internal/compiler_since.h
-conversions.o: $(hdrdir)/ruby/internal/config.h
-conversions.o: $(hdrdir)/ruby/internal/constant_p.h
-conversions.o: $(hdrdir)/ruby/internal/core.h
-conversions.o: $(hdrdir)/ruby/internal/core/rarray.h
-conversions.o: $(hdrdir)/ruby/internal/core/rbasic.h
-conversions.o: $(hdrdir)/ruby/internal/core/rbignum.h
-conversions.o: $(hdrdir)/ruby/internal/core/rclass.h
-conversions.o: $(hdrdir)/ruby/internal/core/rdata.h
-conversions.o: $(hdrdir)/ruby/internal/core/rfile.h
-conversions.o: $(hdrdir)/ruby/internal/core/rhash.h
-conversions.o: $(hdrdir)/ruby/internal/core/robject.h
-conversions.o: $(hdrdir)/ruby/internal/core/rregexp.h
-conversions.o: $(hdrdir)/ruby/internal/core/rstring.h
-conversions.o: $(hdrdir)/ruby/internal/core/rstruct.h
-conversions.o: $(hdrdir)/ruby/internal/core/rtypeddata.h
-conversions.o: $(hdrdir)/ruby/internal/ctype.h
-conversions.o: $(hdrdir)/ruby/internal/dllexport.h
-conversions.o: $(hdrdir)/ruby/internal/dosish.h
-conversions.o: $(hdrdir)/ruby/internal/error.h
-conversions.o: $(hdrdir)/ruby/internal/eval.h
-conversions.o: $(hdrdir)/ruby/internal/event.h
-conversions.o: $(hdrdir)/ruby/internal/fl_type.h
-conversions.o: $(hdrdir)/ruby/internal/gc.h
-conversions.o: $(hdrdir)/ruby/internal/glob.h
-conversions.o: $(hdrdir)/ruby/internal/globals.h
-conversions.o: $(hdrdir)/ruby/internal/has/attribute.h
-conversions.o: $(hdrdir)/ruby/internal/has/builtin.h
-conversions.o: $(hdrdir)/ruby/internal/has/c_attribute.h
-conversions.o: $(hdrdir)/ruby/internal/has/cpp_attribute.h
-conversions.o: $(hdrdir)/ruby/internal/has/declspec_attribute.h
-conversions.o: $(hdrdir)/ruby/internal/has/extension.h
-conversions.o: $(hdrdir)/ruby/internal/has/feature.h
-conversions.o: $(hdrdir)/ruby/internal/has/warning.h
-conversions.o: $(hdrdir)/ruby/internal/intern/array.h
-conversions.o: $(hdrdir)/ruby/internal/intern/bignum.h
-conversions.o: $(hdrdir)/ruby/internal/intern/class.h
-conversions.o: $(hdrdir)/ruby/internal/intern/compar.h
-conversions.o: $(hdrdir)/ruby/internal/intern/complex.h
-conversions.o: $(hdrdir)/ruby/internal/intern/cont.h
-conversions.o: $(hdrdir)/ruby/internal/intern/dir.h
-conversions.o: $(hdrdir)/ruby/internal/intern/enum.h
-conversions.o: $(hdrdir)/ruby/internal/intern/enumerator.h
-conversions.o: $(hdrdir)/ruby/internal/intern/error.h
-conversions.o: $(hdrdir)/ruby/internal/intern/eval.h
-conversions.o: $(hdrdir)/ruby/internal/intern/file.h
-conversions.o: $(hdrdir)/ruby/internal/intern/hash.h
-conversions.o: $(hdrdir)/ruby/internal/intern/io.h
-conversions.o: $(hdrdir)/ruby/internal/intern/load.h
-conversions.o: $(hdrdir)/ruby/internal/intern/marshal.h
-conversions.o: $(hdrdir)/ruby/internal/intern/numeric.h
-conversions.o: $(hdrdir)/ruby/internal/intern/object.h
-conversions.o: $(hdrdir)/ruby/internal/intern/parse.h
-conversions.o: $(hdrdir)/ruby/internal/intern/proc.h
-conversions.o: $(hdrdir)/ruby/internal/intern/process.h
-conversions.o: $(hdrdir)/ruby/internal/intern/random.h
-conversions.o: $(hdrdir)/ruby/internal/intern/range.h
-conversions.o: $(hdrdir)/ruby/internal/intern/rational.h
-conversions.o: $(hdrdir)/ruby/internal/intern/re.h
-conversions.o: $(hdrdir)/ruby/internal/intern/ruby.h
-conversions.o: $(hdrdir)/ruby/internal/intern/select.h
-conversions.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
-conversions.o: $(hdrdir)/ruby/internal/intern/signal.h
-conversions.o: $(hdrdir)/ruby/internal/intern/sprintf.h
-conversions.o: $(hdrdir)/ruby/internal/intern/string.h
-conversions.o: $(hdrdir)/ruby/internal/intern/struct.h
-conversions.o: $(hdrdir)/ruby/internal/intern/thread.h
-conversions.o: $(hdrdir)/ruby/internal/intern/time.h
-conversions.o: $(hdrdir)/ruby/internal/intern/variable.h
-conversions.o: $(hdrdir)/ruby/internal/intern/vm.h
-conversions.o: $(hdrdir)/ruby/internal/interpreter.h
-conversions.o: $(hdrdir)/ruby/internal/iterator.h
-conversions.o: $(hdrdir)/ruby/internal/memory.h
-conversions.o: $(hdrdir)/ruby/internal/method.h
-conversions.o: $(hdrdir)/ruby/internal/module.h
-conversions.o: $(hdrdir)/ruby/internal/newobj.h
-conversions.o: $(hdrdir)/ruby/internal/scan_args.h
-conversions.o: $(hdrdir)/ruby/internal/special_consts.h
-conversions.o: $(hdrdir)/ruby/internal/static_assert.h
-conversions.o: $(hdrdir)/ruby/internal/stdalign.h
-conversions.o: $(hdrdir)/ruby/internal/stdbool.h
-conversions.o: $(hdrdir)/ruby/internal/symbol.h
-conversions.o: $(hdrdir)/ruby/internal/value.h
-conversions.o: $(hdrdir)/ruby/internal/value_type.h
-conversions.o: $(hdrdir)/ruby/internal/variable.h
-conversions.o: $(hdrdir)/ruby/internal/warning_push.h
-conversions.o: $(hdrdir)/ruby/internal/xmalloc.h
-conversions.o: $(hdrdir)/ruby/missing.h
-conversions.o: $(hdrdir)/ruby/ruby.h
-conversions.o: $(hdrdir)/ruby/st.h
-conversions.o: $(hdrdir)/ruby/subst.h
-conversions.o: closure.h
-conversions.o: conversions.c
-conversions.o: conversions.h
-conversions.o: fiddle.h
-conversions.o: function.h
-fiddle.o: $(RUBY_EXTCONF_H)
-fiddle.o: $(arch_hdrdir)/ruby/config.h
-fiddle.o: $(hdrdir)/ruby.h
-fiddle.o: $(hdrdir)/ruby/assert.h
-fiddle.o: $(hdrdir)/ruby/backward.h
-fiddle.o: $(hdrdir)/ruby/backward/2/assume.h
-fiddle.o: $(hdrdir)/ruby/backward/2/attributes.h
-fiddle.o: $(hdrdir)/ruby/backward/2/bool.h
-fiddle.o: $(hdrdir)/ruby/backward/2/inttypes.h
-fiddle.o: $(hdrdir)/ruby/backward/2/limits.h
-fiddle.o: $(hdrdir)/ruby/backward/2/long_long.h
-fiddle.o: $(hdrdir)/ruby/backward/2/stdalign.h
-fiddle.o: $(hdrdir)/ruby/backward/2/stdarg.h
-fiddle.o: $(hdrdir)/ruby/defines.h
-fiddle.o: $(hdrdir)/ruby/intern.h
-fiddle.o: $(hdrdir)/ruby/internal/abi.h
-fiddle.o: $(hdrdir)/ruby/internal/anyargs.h
-fiddle.o: $(hdrdir)/ruby/internal/arithmetic.h
-fiddle.o: $(hdrdir)/ruby/internal/arithmetic/char.h
-fiddle.o: $(hdrdir)/ruby/internal/arithmetic/double.h
-fiddle.o: $(hdrdir)/ruby/internal/arithmetic/fixnum.h
-fiddle.o: $(hdrdir)/ruby/internal/arithmetic/gid_t.h
-fiddle.o: $(hdrdir)/ruby/internal/arithmetic/int.h
-fiddle.o: $(hdrdir)/ruby/internal/arithmetic/intptr_t.h
-fiddle.o: $(hdrdir)/ruby/internal/arithmetic/long.h
-fiddle.o: $(hdrdir)/ruby/internal/arithmetic/long_long.h
-fiddle.o: $(hdrdir)/ruby/internal/arithmetic/mode_t.h
-fiddle.o: $(hdrdir)/ruby/internal/arithmetic/off_t.h
-fiddle.o: $(hdrdir)/ruby/internal/arithmetic/pid_t.h
-fiddle.o: $(hdrdir)/ruby/internal/arithmetic/short.h
-fiddle.o: $(hdrdir)/ruby/internal/arithmetic/size_t.h
-fiddle.o: $(hdrdir)/ruby/internal/arithmetic/st_data_t.h
-fiddle.o: $(hdrdir)/ruby/internal/arithmetic/uid_t.h
-fiddle.o: $(hdrdir)/ruby/internal/assume.h
-fiddle.o: $(hdrdir)/ruby/internal/attr/alloc_size.h
-fiddle.o: $(hdrdir)/ruby/internal/attr/artificial.h
-fiddle.o: $(hdrdir)/ruby/internal/attr/cold.h
-fiddle.o: $(hdrdir)/ruby/internal/attr/const.h
-fiddle.o: $(hdrdir)/ruby/internal/attr/constexpr.h
-fiddle.o: $(hdrdir)/ruby/internal/attr/deprecated.h
-fiddle.o: $(hdrdir)/ruby/internal/attr/diagnose_if.h
-fiddle.o: $(hdrdir)/ruby/internal/attr/enum_extensibility.h
-fiddle.o: $(hdrdir)/ruby/internal/attr/error.h
-fiddle.o: $(hdrdir)/ruby/internal/attr/flag_enum.h
-fiddle.o: $(hdrdir)/ruby/internal/attr/forceinline.h
-fiddle.o: $(hdrdir)/ruby/internal/attr/format.h
-fiddle.o: $(hdrdir)/ruby/internal/attr/maybe_unused.h
-fiddle.o: $(hdrdir)/ruby/internal/attr/noalias.h
-fiddle.o: $(hdrdir)/ruby/internal/attr/nodiscard.h
-fiddle.o: $(hdrdir)/ruby/internal/attr/noexcept.h
-fiddle.o: $(hdrdir)/ruby/internal/attr/noinline.h
-fiddle.o: $(hdrdir)/ruby/internal/attr/nonnull.h
-fiddle.o: $(hdrdir)/ruby/internal/attr/noreturn.h
-fiddle.o: $(hdrdir)/ruby/internal/attr/packed_struct.h
-fiddle.o: $(hdrdir)/ruby/internal/attr/pure.h
-fiddle.o: $(hdrdir)/ruby/internal/attr/restrict.h
-fiddle.o: $(hdrdir)/ruby/internal/attr/returns_nonnull.h
-fiddle.o: $(hdrdir)/ruby/internal/attr/warning.h
-fiddle.o: $(hdrdir)/ruby/internal/attr/weakref.h
-fiddle.o: $(hdrdir)/ruby/internal/cast.h
-fiddle.o: $(hdrdir)/ruby/internal/compiler_is.h
-fiddle.o: $(hdrdir)/ruby/internal/compiler_is/apple.h
-fiddle.o: $(hdrdir)/ruby/internal/compiler_is/clang.h
-fiddle.o: $(hdrdir)/ruby/internal/compiler_is/gcc.h
-fiddle.o: $(hdrdir)/ruby/internal/compiler_is/intel.h
-fiddle.o: $(hdrdir)/ruby/internal/compiler_is/msvc.h
-fiddle.o: $(hdrdir)/ruby/internal/compiler_is/sunpro.h
-fiddle.o: $(hdrdir)/ruby/internal/compiler_since.h
-fiddle.o: $(hdrdir)/ruby/internal/config.h
-fiddle.o: $(hdrdir)/ruby/internal/constant_p.h
-fiddle.o: $(hdrdir)/ruby/internal/core.h
-fiddle.o: $(hdrdir)/ruby/internal/core/rarray.h
-fiddle.o: $(hdrdir)/ruby/internal/core/rbasic.h
-fiddle.o: $(hdrdir)/ruby/internal/core/rbignum.h
-fiddle.o: $(hdrdir)/ruby/internal/core/rclass.h
-fiddle.o: $(hdrdir)/ruby/internal/core/rdata.h
-fiddle.o: $(hdrdir)/ruby/internal/core/rfile.h
-fiddle.o: $(hdrdir)/ruby/internal/core/rhash.h
-fiddle.o: $(hdrdir)/ruby/internal/core/robject.h
-fiddle.o: $(hdrdir)/ruby/internal/core/rregexp.h
-fiddle.o: $(hdrdir)/ruby/internal/core/rstring.h
-fiddle.o: $(hdrdir)/ruby/internal/core/rstruct.h
-fiddle.o: $(hdrdir)/ruby/internal/core/rtypeddata.h
-fiddle.o: $(hdrdir)/ruby/internal/ctype.h
-fiddle.o: $(hdrdir)/ruby/internal/dllexport.h
-fiddle.o: $(hdrdir)/ruby/internal/dosish.h
-fiddle.o: $(hdrdir)/ruby/internal/error.h
-fiddle.o: $(hdrdir)/ruby/internal/eval.h
-fiddle.o: $(hdrdir)/ruby/internal/event.h
-fiddle.o: $(hdrdir)/ruby/internal/fl_type.h
-fiddle.o: $(hdrdir)/ruby/internal/gc.h
-fiddle.o: $(hdrdir)/ruby/internal/glob.h
-fiddle.o: $(hdrdir)/ruby/internal/globals.h
-fiddle.o: $(hdrdir)/ruby/internal/has/attribute.h
-fiddle.o: $(hdrdir)/ruby/internal/has/builtin.h
-fiddle.o: $(hdrdir)/ruby/internal/has/c_attribute.h
-fiddle.o: $(hdrdir)/ruby/internal/has/cpp_attribute.h
-fiddle.o: $(hdrdir)/ruby/internal/has/declspec_attribute.h
-fiddle.o: $(hdrdir)/ruby/internal/has/extension.h
-fiddle.o: $(hdrdir)/ruby/internal/has/feature.h
-fiddle.o: $(hdrdir)/ruby/internal/has/warning.h
-fiddle.o: $(hdrdir)/ruby/internal/intern/array.h
-fiddle.o: $(hdrdir)/ruby/internal/intern/bignum.h
-fiddle.o: $(hdrdir)/ruby/internal/intern/class.h
-fiddle.o: $(hdrdir)/ruby/internal/intern/compar.h
-fiddle.o: $(hdrdir)/ruby/internal/intern/complex.h
-fiddle.o: $(hdrdir)/ruby/internal/intern/cont.h
-fiddle.o: $(hdrdir)/ruby/internal/intern/dir.h
-fiddle.o: $(hdrdir)/ruby/internal/intern/enum.h
-fiddle.o: $(hdrdir)/ruby/internal/intern/enumerator.h
-fiddle.o: $(hdrdir)/ruby/internal/intern/error.h
-fiddle.o: $(hdrdir)/ruby/internal/intern/eval.h
-fiddle.o: $(hdrdir)/ruby/internal/intern/file.h
-fiddle.o: $(hdrdir)/ruby/internal/intern/hash.h
-fiddle.o: $(hdrdir)/ruby/internal/intern/io.h
-fiddle.o: $(hdrdir)/ruby/internal/intern/load.h
-fiddle.o: $(hdrdir)/ruby/internal/intern/marshal.h
-fiddle.o: $(hdrdir)/ruby/internal/intern/numeric.h
-fiddle.o: $(hdrdir)/ruby/internal/intern/object.h
-fiddle.o: $(hdrdir)/ruby/internal/intern/parse.h
-fiddle.o: $(hdrdir)/ruby/internal/intern/proc.h
-fiddle.o: $(hdrdir)/ruby/internal/intern/process.h
-fiddle.o: $(hdrdir)/ruby/internal/intern/random.h
-fiddle.o: $(hdrdir)/ruby/internal/intern/range.h
-fiddle.o: $(hdrdir)/ruby/internal/intern/rational.h
-fiddle.o: $(hdrdir)/ruby/internal/intern/re.h
-fiddle.o: $(hdrdir)/ruby/internal/intern/ruby.h
-fiddle.o: $(hdrdir)/ruby/internal/intern/select.h
-fiddle.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
-fiddle.o: $(hdrdir)/ruby/internal/intern/signal.h
-fiddle.o: $(hdrdir)/ruby/internal/intern/sprintf.h
-fiddle.o: $(hdrdir)/ruby/internal/intern/string.h
-fiddle.o: $(hdrdir)/ruby/internal/intern/struct.h
-fiddle.o: $(hdrdir)/ruby/internal/intern/thread.h
-fiddle.o: $(hdrdir)/ruby/internal/intern/time.h
-fiddle.o: $(hdrdir)/ruby/internal/intern/variable.h
-fiddle.o: $(hdrdir)/ruby/internal/intern/vm.h
-fiddle.o: $(hdrdir)/ruby/internal/interpreter.h
-fiddle.o: $(hdrdir)/ruby/internal/iterator.h
-fiddle.o: $(hdrdir)/ruby/internal/memory.h
-fiddle.o: $(hdrdir)/ruby/internal/method.h
-fiddle.o: $(hdrdir)/ruby/internal/module.h
-fiddle.o: $(hdrdir)/ruby/internal/newobj.h
-fiddle.o: $(hdrdir)/ruby/internal/scan_args.h
-fiddle.o: $(hdrdir)/ruby/internal/special_consts.h
-fiddle.o: $(hdrdir)/ruby/internal/static_assert.h
-fiddle.o: $(hdrdir)/ruby/internal/stdalign.h
-fiddle.o: $(hdrdir)/ruby/internal/stdbool.h
-fiddle.o: $(hdrdir)/ruby/internal/symbol.h
-fiddle.o: $(hdrdir)/ruby/internal/value.h
-fiddle.o: $(hdrdir)/ruby/internal/value_type.h
-fiddle.o: $(hdrdir)/ruby/internal/variable.h
-fiddle.o: $(hdrdir)/ruby/internal/warning_push.h
-fiddle.o: $(hdrdir)/ruby/internal/xmalloc.h
-fiddle.o: $(hdrdir)/ruby/missing.h
-fiddle.o: $(hdrdir)/ruby/ruby.h
-fiddle.o: $(hdrdir)/ruby/st.h
-fiddle.o: $(hdrdir)/ruby/subst.h
-fiddle.o: closure.h
-fiddle.o: conversions.h
-fiddle.o: fiddle.c
-fiddle.o: fiddle.h
-fiddle.o: function.h
-function.o: $(RUBY_EXTCONF_H)
-function.o: $(arch_hdrdir)/ruby/config.h
-function.o: $(hdrdir)/ruby.h
-function.o: $(hdrdir)/ruby/assert.h
-function.o: $(hdrdir)/ruby/backward.h
-function.o: $(hdrdir)/ruby/backward/2/assume.h
-function.o: $(hdrdir)/ruby/backward/2/attributes.h
-function.o: $(hdrdir)/ruby/backward/2/bool.h
-function.o: $(hdrdir)/ruby/backward/2/inttypes.h
-function.o: $(hdrdir)/ruby/backward/2/limits.h
-function.o: $(hdrdir)/ruby/backward/2/long_long.h
-function.o: $(hdrdir)/ruby/backward/2/stdalign.h
-function.o: $(hdrdir)/ruby/backward/2/stdarg.h
-function.o: $(hdrdir)/ruby/defines.h
-function.o: $(hdrdir)/ruby/intern.h
-function.o: $(hdrdir)/ruby/internal/abi.h
-function.o: $(hdrdir)/ruby/internal/anyargs.h
-function.o: $(hdrdir)/ruby/internal/arithmetic.h
-function.o: $(hdrdir)/ruby/internal/arithmetic/char.h
-function.o: $(hdrdir)/ruby/internal/arithmetic/double.h
-function.o: $(hdrdir)/ruby/internal/arithmetic/fixnum.h
-function.o: $(hdrdir)/ruby/internal/arithmetic/gid_t.h
-function.o: $(hdrdir)/ruby/internal/arithmetic/int.h
-function.o: $(hdrdir)/ruby/internal/arithmetic/intptr_t.h
-function.o: $(hdrdir)/ruby/internal/arithmetic/long.h
-function.o: $(hdrdir)/ruby/internal/arithmetic/long_long.h
-function.o: $(hdrdir)/ruby/internal/arithmetic/mode_t.h
-function.o: $(hdrdir)/ruby/internal/arithmetic/off_t.h
-function.o: $(hdrdir)/ruby/internal/arithmetic/pid_t.h
-function.o: $(hdrdir)/ruby/internal/arithmetic/short.h
-function.o: $(hdrdir)/ruby/internal/arithmetic/size_t.h
-function.o: $(hdrdir)/ruby/internal/arithmetic/st_data_t.h
-function.o: $(hdrdir)/ruby/internal/arithmetic/uid_t.h
-function.o: $(hdrdir)/ruby/internal/assume.h
-function.o: $(hdrdir)/ruby/internal/attr/alloc_size.h
-function.o: $(hdrdir)/ruby/internal/attr/artificial.h
-function.o: $(hdrdir)/ruby/internal/attr/cold.h
-function.o: $(hdrdir)/ruby/internal/attr/const.h
-function.o: $(hdrdir)/ruby/internal/attr/constexpr.h
-function.o: $(hdrdir)/ruby/internal/attr/deprecated.h
-function.o: $(hdrdir)/ruby/internal/attr/diagnose_if.h
-function.o: $(hdrdir)/ruby/internal/attr/enum_extensibility.h
-function.o: $(hdrdir)/ruby/internal/attr/error.h
-function.o: $(hdrdir)/ruby/internal/attr/flag_enum.h
-function.o: $(hdrdir)/ruby/internal/attr/forceinline.h
-function.o: $(hdrdir)/ruby/internal/attr/format.h
-function.o: $(hdrdir)/ruby/internal/attr/maybe_unused.h
-function.o: $(hdrdir)/ruby/internal/attr/noalias.h
-function.o: $(hdrdir)/ruby/internal/attr/nodiscard.h
-function.o: $(hdrdir)/ruby/internal/attr/noexcept.h
-function.o: $(hdrdir)/ruby/internal/attr/noinline.h
-function.o: $(hdrdir)/ruby/internal/attr/nonnull.h
-function.o: $(hdrdir)/ruby/internal/attr/noreturn.h
-function.o: $(hdrdir)/ruby/internal/attr/packed_struct.h
-function.o: $(hdrdir)/ruby/internal/attr/pure.h
-function.o: $(hdrdir)/ruby/internal/attr/restrict.h
-function.o: $(hdrdir)/ruby/internal/attr/returns_nonnull.h
-function.o: $(hdrdir)/ruby/internal/attr/warning.h
-function.o: $(hdrdir)/ruby/internal/attr/weakref.h
-function.o: $(hdrdir)/ruby/internal/cast.h
-function.o: $(hdrdir)/ruby/internal/compiler_is.h
-function.o: $(hdrdir)/ruby/internal/compiler_is/apple.h
-function.o: $(hdrdir)/ruby/internal/compiler_is/clang.h
-function.o: $(hdrdir)/ruby/internal/compiler_is/gcc.h
-function.o: $(hdrdir)/ruby/internal/compiler_is/intel.h
-function.o: $(hdrdir)/ruby/internal/compiler_is/msvc.h
-function.o: $(hdrdir)/ruby/internal/compiler_is/sunpro.h
-function.o: $(hdrdir)/ruby/internal/compiler_since.h
-function.o: $(hdrdir)/ruby/internal/config.h
-function.o: $(hdrdir)/ruby/internal/constant_p.h
-function.o: $(hdrdir)/ruby/internal/core.h
-function.o: $(hdrdir)/ruby/internal/core/rarray.h
-function.o: $(hdrdir)/ruby/internal/core/rbasic.h
-function.o: $(hdrdir)/ruby/internal/core/rbignum.h
-function.o: $(hdrdir)/ruby/internal/core/rclass.h
-function.o: $(hdrdir)/ruby/internal/core/rdata.h
-function.o: $(hdrdir)/ruby/internal/core/rfile.h
-function.o: $(hdrdir)/ruby/internal/core/rhash.h
-function.o: $(hdrdir)/ruby/internal/core/robject.h
-function.o: $(hdrdir)/ruby/internal/core/rregexp.h
-function.o: $(hdrdir)/ruby/internal/core/rstring.h
-function.o: $(hdrdir)/ruby/internal/core/rstruct.h
-function.o: $(hdrdir)/ruby/internal/core/rtypeddata.h
-function.o: $(hdrdir)/ruby/internal/ctype.h
-function.o: $(hdrdir)/ruby/internal/dllexport.h
-function.o: $(hdrdir)/ruby/internal/dosish.h
-function.o: $(hdrdir)/ruby/internal/error.h
-function.o: $(hdrdir)/ruby/internal/eval.h
-function.o: $(hdrdir)/ruby/internal/event.h
-function.o: $(hdrdir)/ruby/internal/fl_type.h
-function.o: $(hdrdir)/ruby/internal/gc.h
-function.o: $(hdrdir)/ruby/internal/glob.h
-function.o: $(hdrdir)/ruby/internal/globals.h
-function.o: $(hdrdir)/ruby/internal/has/attribute.h
-function.o: $(hdrdir)/ruby/internal/has/builtin.h
-function.o: $(hdrdir)/ruby/internal/has/c_attribute.h
-function.o: $(hdrdir)/ruby/internal/has/cpp_attribute.h
-function.o: $(hdrdir)/ruby/internal/has/declspec_attribute.h
-function.o: $(hdrdir)/ruby/internal/has/extension.h
-function.o: $(hdrdir)/ruby/internal/has/feature.h
-function.o: $(hdrdir)/ruby/internal/has/warning.h
-function.o: $(hdrdir)/ruby/internal/intern/array.h
-function.o: $(hdrdir)/ruby/internal/intern/bignum.h
-function.o: $(hdrdir)/ruby/internal/intern/class.h
-function.o: $(hdrdir)/ruby/internal/intern/compar.h
-function.o: $(hdrdir)/ruby/internal/intern/complex.h
-function.o: $(hdrdir)/ruby/internal/intern/cont.h
-function.o: $(hdrdir)/ruby/internal/intern/dir.h
-function.o: $(hdrdir)/ruby/internal/intern/enum.h
-function.o: $(hdrdir)/ruby/internal/intern/enumerator.h
-function.o: $(hdrdir)/ruby/internal/intern/error.h
-function.o: $(hdrdir)/ruby/internal/intern/eval.h
-function.o: $(hdrdir)/ruby/internal/intern/file.h
-function.o: $(hdrdir)/ruby/internal/intern/hash.h
-function.o: $(hdrdir)/ruby/internal/intern/io.h
-function.o: $(hdrdir)/ruby/internal/intern/load.h
-function.o: $(hdrdir)/ruby/internal/intern/marshal.h
-function.o: $(hdrdir)/ruby/internal/intern/numeric.h
-function.o: $(hdrdir)/ruby/internal/intern/object.h
-function.o: $(hdrdir)/ruby/internal/intern/parse.h
-function.o: $(hdrdir)/ruby/internal/intern/proc.h
-function.o: $(hdrdir)/ruby/internal/intern/process.h
-function.o: $(hdrdir)/ruby/internal/intern/random.h
-function.o: $(hdrdir)/ruby/internal/intern/range.h
-function.o: $(hdrdir)/ruby/internal/intern/rational.h
-function.o: $(hdrdir)/ruby/internal/intern/re.h
-function.o: $(hdrdir)/ruby/internal/intern/ruby.h
-function.o: $(hdrdir)/ruby/internal/intern/select.h
-function.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
-function.o: $(hdrdir)/ruby/internal/intern/signal.h
-function.o: $(hdrdir)/ruby/internal/intern/sprintf.h
-function.o: $(hdrdir)/ruby/internal/intern/string.h
-function.o: $(hdrdir)/ruby/internal/intern/struct.h
-function.o: $(hdrdir)/ruby/internal/intern/thread.h
-function.o: $(hdrdir)/ruby/internal/intern/time.h
-function.o: $(hdrdir)/ruby/internal/intern/variable.h
-function.o: $(hdrdir)/ruby/internal/intern/vm.h
-function.o: $(hdrdir)/ruby/internal/interpreter.h
-function.o: $(hdrdir)/ruby/internal/iterator.h
-function.o: $(hdrdir)/ruby/internal/memory.h
-function.o: $(hdrdir)/ruby/internal/method.h
-function.o: $(hdrdir)/ruby/internal/module.h
-function.o: $(hdrdir)/ruby/internal/newobj.h
-function.o: $(hdrdir)/ruby/internal/scan_args.h
-function.o: $(hdrdir)/ruby/internal/special_consts.h
-function.o: $(hdrdir)/ruby/internal/static_assert.h
-function.o: $(hdrdir)/ruby/internal/stdalign.h
-function.o: $(hdrdir)/ruby/internal/stdbool.h
-function.o: $(hdrdir)/ruby/internal/symbol.h
-function.o: $(hdrdir)/ruby/internal/value.h
-function.o: $(hdrdir)/ruby/internal/value_type.h
-function.o: $(hdrdir)/ruby/internal/variable.h
-function.o: $(hdrdir)/ruby/internal/warning_push.h
-function.o: $(hdrdir)/ruby/internal/xmalloc.h
-function.o: $(hdrdir)/ruby/missing.h
-function.o: $(hdrdir)/ruby/ruby.h
-function.o: $(hdrdir)/ruby/st.h
-function.o: $(hdrdir)/ruby/subst.h
-function.o: $(hdrdir)/ruby/thread.h
-function.o: closure.h
-function.o: conversions.h
-function.o: fiddle.h
-function.o: function.c
-function.o: function.h
-handle.o: $(RUBY_EXTCONF_H)
-handle.o: $(arch_hdrdir)/ruby/config.h
-handle.o: $(hdrdir)/ruby.h
-handle.o: $(hdrdir)/ruby/assert.h
-handle.o: $(hdrdir)/ruby/backward.h
-handle.o: $(hdrdir)/ruby/backward/2/assume.h
-handle.o: $(hdrdir)/ruby/backward/2/attributes.h
-handle.o: $(hdrdir)/ruby/backward/2/bool.h
-handle.o: $(hdrdir)/ruby/backward/2/inttypes.h
-handle.o: $(hdrdir)/ruby/backward/2/limits.h
-handle.o: $(hdrdir)/ruby/backward/2/long_long.h
-handle.o: $(hdrdir)/ruby/backward/2/stdalign.h
-handle.o: $(hdrdir)/ruby/backward/2/stdarg.h
-handle.o: $(hdrdir)/ruby/defines.h
-handle.o: $(hdrdir)/ruby/intern.h
-handle.o: $(hdrdir)/ruby/internal/abi.h
-handle.o: $(hdrdir)/ruby/internal/anyargs.h
-handle.o: $(hdrdir)/ruby/internal/arithmetic.h
-handle.o: $(hdrdir)/ruby/internal/arithmetic/char.h
-handle.o: $(hdrdir)/ruby/internal/arithmetic/double.h
-handle.o: $(hdrdir)/ruby/internal/arithmetic/fixnum.h
-handle.o: $(hdrdir)/ruby/internal/arithmetic/gid_t.h
-handle.o: $(hdrdir)/ruby/internal/arithmetic/int.h
-handle.o: $(hdrdir)/ruby/internal/arithmetic/intptr_t.h
-handle.o: $(hdrdir)/ruby/internal/arithmetic/long.h
-handle.o: $(hdrdir)/ruby/internal/arithmetic/long_long.h
-handle.o: $(hdrdir)/ruby/internal/arithmetic/mode_t.h
-handle.o: $(hdrdir)/ruby/internal/arithmetic/off_t.h
-handle.o: $(hdrdir)/ruby/internal/arithmetic/pid_t.h
-handle.o: $(hdrdir)/ruby/internal/arithmetic/short.h
-handle.o: $(hdrdir)/ruby/internal/arithmetic/size_t.h
-handle.o: $(hdrdir)/ruby/internal/arithmetic/st_data_t.h
-handle.o: $(hdrdir)/ruby/internal/arithmetic/uid_t.h
-handle.o: $(hdrdir)/ruby/internal/assume.h
-handle.o: $(hdrdir)/ruby/internal/attr/alloc_size.h
-handle.o: $(hdrdir)/ruby/internal/attr/artificial.h
-handle.o: $(hdrdir)/ruby/internal/attr/cold.h
-handle.o: $(hdrdir)/ruby/internal/attr/const.h
-handle.o: $(hdrdir)/ruby/internal/attr/constexpr.h
-handle.o: $(hdrdir)/ruby/internal/attr/deprecated.h
-handle.o: $(hdrdir)/ruby/internal/attr/diagnose_if.h
-handle.o: $(hdrdir)/ruby/internal/attr/enum_extensibility.h
-handle.o: $(hdrdir)/ruby/internal/attr/error.h
-handle.o: $(hdrdir)/ruby/internal/attr/flag_enum.h
-handle.o: $(hdrdir)/ruby/internal/attr/forceinline.h
-handle.o: $(hdrdir)/ruby/internal/attr/format.h
-handle.o: $(hdrdir)/ruby/internal/attr/maybe_unused.h
-handle.o: $(hdrdir)/ruby/internal/attr/noalias.h
-handle.o: $(hdrdir)/ruby/internal/attr/nodiscard.h
-handle.o: $(hdrdir)/ruby/internal/attr/noexcept.h
-handle.o: $(hdrdir)/ruby/internal/attr/noinline.h
-handle.o: $(hdrdir)/ruby/internal/attr/nonnull.h
-handle.o: $(hdrdir)/ruby/internal/attr/noreturn.h
-handle.o: $(hdrdir)/ruby/internal/attr/packed_struct.h
-handle.o: $(hdrdir)/ruby/internal/attr/pure.h
-handle.o: $(hdrdir)/ruby/internal/attr/restrict.h
-handle.o: $(hdrdir)/ruby/internal/attr/returns_nonnull.h
-handle.o: $(hdrdir)/ruby/internal/attr/warning.h
-handle.o: $(hdrdir)/ruby/internal/attr/weakref.h
-handle.o: $(hdrdir)/ruby/internal/cast.h
-handle.o: $(hdrdir)/ruby/internal/compiler_is.h
-handle.o: $(hdrdir)/ruby/internal/compiler_is/apple.h
-handle.o: $(hdrdir)/ruby/internal/compiler_is/clang.h
-handle.o: $(hdrdir)/ruby/internal/compiler_is/gcc.h
-handle.o: $(hdrdir)/ruby/internal/compiler_is/intel.h
-handle.o: $(hdrdir)/ruby/internal/compiler_is/msvc.h
-handle.o: $(hdrdir)/ruby/internal/compiler_is/sunpro.h
-handle.o: $(hdrdir)/ruby/internal/compiler_since.h
-handle.o: $(hdrdir)/ruby/internal/config.h
-handle.o: $(hdrdir)/ruby/internal/constant_p.h
-handle.o: $(hdrdir)/ruby/internal/core.h
-handle.o: $(hdrdir)/ruby/internal/core/rarray.h
-handle.o: $(hdrdir)/ruby/internal/core/rbasic.h
-handle.o: $(hdrdir)/ruby/internal/core/rbignum.h
-handle.o: $(hdrdir)/ruby/internal/core/rclass.h
-handle.o: $(hdrdir)/ruby/internal/core/rdata.h
-handle.o: $(hdrdir)/ruby/internal/core/rfile.h
-handle.o: $(hdrdir)/ruby/internal/core/rhash.h
-handle.o: $(hdrdir)/ruby/internal/core/robject.h
-handle.o: $(hdrdir)/ruby/internal/core/rregexp.h
-handle.o: $(hdrdir)/ruby/internal/core/rstring.h
-handle.o: $(hdrdir)/ruby/internal/core/rstruct.h
-handle.o: $(hdrdir)/ruby/internal/core/rtypeddata.h
-handle.o: $(hdrdir)/ruby/internal/ctype.h
-handle.o: $(hdrdir)/ruby/internal/dllexport.h
-handle.o: $(hdrdir)/ruby/internal/dosish.h
-handle.o: $(hdrdir)/ruby/internal/error.h
-handle.o: $(hdrdir)/ruby/internal/eval.h
-handle.o: $(hdrdir)/ruby/internal/event.h
-handle.o: $(hdrdir)/ruby/internal/fl_type.h
-handle.o: $(hdrdir)/ruby/internal/gc.h
-handle.o: $(hdrdir)/ruby/internal/glob.h
-handle.o: $(hdrdir)/ruby/internal/globals.h
-handle.o: $(hdrdir)/ruby/internal/has/attribute.h
-handle.o: $(hdrdir)/ruby/internal/has/builtin.h
-handle.o: $(hdrdir)/ruby/internal/has/c_attribute.h
-handle.o: $(hdrdir)/ruby/internal/has/cpp_attribute.h
-handle.o: $(hdrdir)/ruby/internal/has/declspec_attribute.h
-handle.o: $(hdrdir)/ruby/internal/has/extension.h
-handle.o: $(hdrdir)/ruby/internal/has/feature.h
-handle.o: $(hdrdir)/ruby/internal/has/warning.h
-handle.o: $(hdrdir)/ruby/internal/intern/array.h
-handle.o: $(hdrdir)/ruby/internal/intern/bignum.h
-handle.o: $(hdrdir)/ruby/internal/intern/class.h
-handle.o: $(hdrdir)/ruby/internal/intern/compar.h
-handle.o: $(hdrdir)/ruby/internal/intern/complex.h
-handle.o: $(hdrdir)/ruby/internal/intern/cont.h
-handle.o: $(hdrdir)/ruby/internal/intern/dir.h
-handle.o: $(hdrdir)/ruby/internal/intern/enum.h
-handle.o: $(hdrdir)/ruby/internal/intern/enumerator.h
-handle.o: $(hdrdir)/ruby/internal/intern/error.h
-handle.o: $(hdrdir)/ruby/internal/intern/eval.h
-handle.o: $(hdrdir)/ruby/internal/intern/file.h
-handle.o: $(hdrdir)/ruby/internal/intern/hash.h
-handle.o: $(hdrdir)/ruby/internal/intern/io.h
-handle.o: $(hdrdir)/ruby/internal/intern/load.h
-handle.o: $(hdrdir)/ruby/internal/intern/marshal.h
-handle.o: $(hdrdir)/ruby/internal/intern/numeric.h
-handle.o: $(hdrdir)/ruby/internal/intern/object.h
-handle.o: $(hdrdir)/ruby/internal/intern/parse.h
-handle.o: $(hdrdir)/ruby/internal/intern/proc.h
-handle.o: $(hdrdir)/ruby/internal/intern/process.h
-handle.o: $(hdrdir)/ruby/internal/intern/random.h
-handle.o: $(hdrdir)/ruby/internal/intern/range.h
-handle.o: $(hdrdir)/ruby/internal/intern/rational.h
-handle.o: $(hdrdir)/ruby/internal/intern/re.h
-handle.o: $(hdrdir)/ruby/internal/intern/ruby.h
-handle.o: $(hdrdir)/ruby/internal/intern/select.h
-handle.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
-handle.o: $(hdrdir)/ruby/internal/intern/signal.h
-handle.o: $(hdrdir)/ruby/internal/intern/sprintf.h
-handle.o: $(hdrdir)/ruby/internal/intern/string.h
-handle.o: $(hdrdir)/ruby/internal/intern/struct.h
-handle.o: $(hdrdir)/ruby/internal/intern/thread.h
-handle.o: $(hdrdir)/ruby/internal/intern/time.h
-handle.o: $(hdrdir)/ruby/internal/intern/variable.h
-handle.o: $(hdrdir)/ruby/internal/intern/vm.h
-handle.o: $(hdrdir)/ruby/internal/interpreter.h
-handle.o: $(hdrdir)/ruby/internal/iterator.h
-handle.o: $(hdrdir)/ruby/internal/memory.h
-handle.o: $(hdrdir)/ruby/internal/method.h
-handle.o: $(hdrdir)/ruby/internal/module.h
-handle.o: $(hdrdir)/ruby/internal/newobj.h
-handle.o: $(hdrdir)/ruby/internal/scan_args.h
-handle.o: $(hdrdir)/ruby/internal/special_consts.h
-handle.o: $(hdrdir)/ruby/internal/static_assert.h
-handle.o: $(hdrdir)/ruby/internal/stdalign.h
-handle.o: $(hdrdir)/ruby/internal/stdbool.h
-handle.o: $(hdrdir)/ruby/internal/symbol.h
-handle.o: $(hdrdir)/ruby/internal/value.h
-handle.o: $(hdrdir)/ruby/internal/value_type.h
-handle.o: $(hdrdir)/ruby/internal/variable.h
-handle.o: $(hdrdir)/ruby/internal/warning_push.h
-handle.o: $(hdrdir)/ruby/internal/xmalloc.h
-handle.o: $(hdrdir)/ruby/missing.h
-handle.o: $(hdrdir)/ruby/ruby.h
-handle.o: $(hdrdir)/ruby/st.h
-handle.o: $(hdrdir)/ruby/subst.h
-handle.o: closure.h
-handle.o: conversions.h
-handle.o: fiddle.h
-handle.o: function.h
-handle.o: handle.c
-memory_view.o: $(RUBY_EXTCONF_H)
-memory_view.o: $(arch_hdrdir)/ruby/config.h
-memory_view.o: $(hdrdir)/ruby.h
-memory_view.o: $(hdrdir)/ruby/assert.h
-memory_view.o: $(hdrdir)/ruby/backward.h
-memory_view.o: $(hdrdir)/ruby/backward/2/assume.h
-memory_view.o: $(hdrdir)/ruby/backward/2/attributes.h
-memory_view.o: $(hdrdir)/ruby/backward/2/bool.h
-memory_view.o: $(hdrdir)/ruby/backward/2/inttypes.h
-memory_view.o: $(hdrdir)/ruby/backward/2/limits.h
-memory_view.o: $(hdrdir)/ruby/backward/2/long_long.h
-memory_view.o: $(hdrdir)/ruby/backward/2/stdalign.h
-memory_view.o: $(hdrdir)/ruby/backward/2/stdarg.h
-memory_view.o: $(hdrdir)/ruby/defines.h
-memory_view.o: $(hdrdir)/ruby/encoding.h
-memory_view.o: $(hdrdir)/ruby/intern.h
-memory_view.o: $(hdrdir)/ruby/internal/abi.h
-memory_view.o: $(hdrdir)/ruby/internal/anyargs.h
-memory_view.o: $(hdrdir)/ruby/internal/arithmetic.h
-memory_view.o: $(hdrdir)/ruby/internal/arithmetic/char.h
-memory_view.o: $(hdrdir)/ruby/internal/arithmetic/double.h
-memory_view.o: $(hdrdir)/ruby/internal/arithmetic/fixnum.h
-memory_view.o: $(hdrdir)/ruby/internal/arithmetic/gid_t.h
-memory_view.o: $(hdrdir)/ruby/internal/arithmetic/int.h
-memory_view.o: $(hdrdir)/ruby/internal/arithmetic/intptr_t.h
-memory_view.o: $(hdrdir)/ruby/internal/arithmetic/long.h
-memory_view.o: $(hdrdir)/ruby/internal/arithmetic/long_long.h
-memory_view.o: $(hdrdir)/ruby/internal/arithmetic/mode_t.h
-memory_view.o: $(hdrdir)/ruby/internal/arithmetic/off_t.h
-memory_view.o: $(hdrdir)/ruby/internal/arithmetic/pid_t.h
-memory_view.o: $(hdrdir)/ruby/internal/arithmetic/short.h
-memory_view.o: $(hdrdir)/ruby/internal/arithmetic/size_t.h
-memory_view.o: $(hdrdir)/ruby/internal/arithmetic/st_data_t.h
-memory_view.o: $(hdrdir)/ruby/internal/arithmetic/uid_t.h
-memory_view.o: $(hdrdir)/ruby/internal/assume.h
-memory_view.o: $(hdrdir)/ruby/internal/attr/alloc_size.h
-memory_view.o: $(hdrdir)/ruby/internal/attr/artificial.h
-memory_view.o: $(hdrdir)/ruby/internal/attr/cold.h
-memory_view.o: $(hdrdir)/ruby/internal/attr/const.h
-memory_view.o: $(hdrdir)/ruby/internal/attr/constexpr.h
-memory_view.o: $(hdrdir)/ruby/internal/attr/deprecated.h
-memory_view.o: $(hdrdir)/ruby/internal/attr/diagnose_if.h
-memory_view.o: $(hdrdir)/ruby/internal/attr/enum_extensibility.h
-memory_view.o: $(hdrdir)/ruby/internal/attr/error.h
-memory_view.o: $(hdrdir)/ruby/internal/attr/flag_enum.h
-memory_view.o: $(hdrdir)/ruby/internal/attr/forceinline.h
-memory_view.o: $(hdrdir)/ruby/internal/attr/format.h
-memory_view.o: $(hdrdir)/ruby/internal/attr/maybe_unused.h
-memory_view.o: $(hdrdir)/ruby/internal/attr/noalias.h
-memory_view.o: $(hdrdir)/ruby/internal/attr/nodiscard.h
-memory_view.o: $(hdrdir)/ruby/internal/attr/noexcept.h
-memory_view.o: $(hdrdir)/ruby/internal/attr/noinline.h
-memory_view.o: $(hdrdir)/ruby/internal/attr/nonnull.h
-memory_view.o: $(hdrdir)/ruby/internal/attr/noreturn.h
-memory_view.o: $(hdrdir)/ruby/internal/attr/packed_struct.h
-memory_view.o: $(hdrdir)/ruby/internal/attr/pure.h
-memory_view.o: $(hdrdir)/ruby/internal/attr/restrict.h
-memory_view.o: $(hdrdir)/ruby/internal/attr/returns_nonnull.h
-memory_view.o: $(hdrdir)/ruby/internal/attr/warning.h
-memory_view.o: $(hdrdir)/ruby/internal/attr/weakref.h
-memory_view.o: $(hdrdir)/ruby/internal/cast.h
-memory_view.o: $(hdrdir)/ruby/internal/compiler_is.h
-memory_view.o: $(hdrdir)/ruby/internal/compiler_is/apple.h
-memory_view.o: $(hdrdir)/ruby/internal/compiler_is/clang.h
-memory_view.o: $(hdrdir)/ruby/internal/compiler_is/gcc.h
-memory_view.o: $(hdrdir)/ruby/internal/compiler_is/intel.h
-memory_view.o: $(hdrdir)/ruby/internal/compiler_is/msvc.h
-memory_view.o: $(hdrdir)/ruby/internal/compiler_is/sunpro.h
-memory_view.o: $(hdrdir)/ruby/internal/compiler_since.h
-memory_view.o: $(hdrdir)/ruby/internal/config.h
-memory_view.o: $(hdrdir)/ruby/internal/constant_p.h
-memory_view.o: $(hdrdir)/ruby/internal/core.h
-memory_view.o: $(hdrdir)/ruby/internal/core/rarray.h
-memory_view.o: $(hdrdir)/ruby/internal/core/rbasic.h
-memory_view.o: $(hdrdir)/ruby/internal/core/rbignum.h
-memory_view.o: $(hdrdir)/ruby/internal/core/rclass.h
-memory_view.o: $(hdrdir)/ruby/internal/core/rdata.h
-memory_view.o: $(hdrdir)/ruby/internal/core/rfile.h
-memory_view.o: $(hdrdir)/ruby/internal/core/rhash.h
-memory_view.o: $(hdrdir)/ruby/internal/core/robject.h
-memory_view.o: $(hdrdir)/ruby/internal/core/rregexp.h
-memory_view.o: $(hdrdir)/ruby/internal/core/rstring.h
-memory_view.o: $(hdrdir)/ruby/internal/core/rstruct.h
-memory_view.o: $(hdrdir)/ruby/internal/core/rtypeddata.h
-memory_view.o: $(hdrdir)/ruby/internal/ctype.h
-memory_view.o: $(hdrdir)/ruby/internal/dllexport.h
-memory_view.o: $(hdrdir)/ruby/internal/dosish.h
-memory_view.o: $(hdrdir)/ruby/internal/encoding/coderange.h
-memory_view.o: $(hdrdir)/ruby/internal/encoding/ctype.h
-memory_view.o: $(hdrdir)/ruby/internal/encoding/encoding.h
-memory_view.o: $(hdrdir)/ruby/internal/encoding/pathname.h
-memory_view.o: $(hdrdir)/ruby/internal/encoding/re.h
-memory_view.o: $(hdrdir)/ruby/internal/encoding/sprintf.h
-memory_view.o: $(hdrdir)/ruby/internal/encoding/string.h
-memory_view.o: $(hdrdir)/ruby/internal/encoding/symbol.h
-memory_view.o: $(hdrdir)/ruby/internal/encoding/transcode.h
-memory_view.o: $(hdrdir)/ruby/internal/error.h
-memory_view.o: $(hdrdir)/ruby/internal/eval.h
-memory_view.o: $(hdrdir)/ruby/internal/event.h
-memory_view.o: $(hdrdir)/ruby/internal/fl_type.h
-memory_view.o: $(hdrdir)/ruby/internal/gc.h
-memory_view.o: $(hdrdir)/ruby/internal/glob.h
-memory_view.o: $(hdrdir)/ruby/internal/globals.h
-memory_view.o: $(hdrdir)/ruby/internal/has/attribute.h
-memory_view.o: $(hdrdir)/ruby/internal/has/builtin.h
-memory_view.o: $(hdrdir)/ruby/internal/has/c_attribute.h
-memory_view.o: $(hdrdir)/ruby/internal/has/cpp_attribute.h
-memory_view.o: $(hdrdir)/ruby/internal/has/declspec_attribute.h
-memory_view.o: $(hdrdir)/ruby/internal/has/extension.h
-memory_view.o: $(hdrdir)/ruby/internal/has/feature.h
-memory_view.o: $(hdrdir)/ruby/internal/has/warning.h
-memory_view.o: $(hdrdir)/ruby/internal/intern/array.h
-memory_view.o: $(hdrdir)/ruby/internal/intern/bignum.h
-memory_view.o: $(hdrdir)/ruby/internal/intern/class.h
-memory_view.o: $(hdrdir)/ruby/internal/intern/compar.h
-memory_view.o: $(hdrdir)/ruby/internal/intern/complex.h
-memory_view.o: $(hdrdir)/ruby/internal/intern/cont.h
-memory_view.o: $(hdrdir)/ruby/internal/intern/dir.h
-memory_view.o: $(hdrdir)/ruby/internal/intern/enum.h
-memory_view.o: $(hdrdir)/ruby/internal/intern/enumerator.h
-memory_view.o: $(hdrdir)/ruby/internal/intern/error.h
-memory_view.o: $(hdrdir)/ruby/internal/intern/eval.h
-memory_view.o: $(hdrdir)/ruby/internal/intern/file.h
-memory_view.o: $(hdrdir)/ruby/internal/intern/hash.h
-memory_view.o: $(hdrdir)/ruby/internal/intern/io.h
-memory_view.o: $(hdrdir)/ruby/internal/intern/load.h
-memory_view.o: $(hdrdir)/ruby/internal/intern/marshal.h
-memory_view.o: $(hdrdir)/ruby/internal/intern/numeric.h
-memory_view.o: $(hdrdir)/ruby/internal/intern/object.h
-memory_view.o: $(hdrdir)/ruby/internal/intern/parse.h
-memory_view.o: $(hdrdir)/ruby/internal/intern/proc.h
-memory_view.o: $(hdrdir)/ruby/internal/intern/process.h
-memory_view.o: $(hdrdir)/ruby/internal/intern/random.h
-memory_view.o: $(hdrdir)/ruby/internal/intern/range.h
-memory_view.o: $(hdrdir)/ruby/internal/intern/rational.h
-memory_view.o: $(hdrdir)/ruby/internal/intern/re.h
-memory_view.o: $(hdrdir)/ruby/internal/intern/ruby.h
-memory_view.o: $(hdrdir)/ruby/internal/intern/select.h
-memory_view.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
-memory_view.o: $(hdrdir)/ruby/internal/intern/signal.h
-memory_view.o: $(hdrdir)/ruby/internal/intern/sprintf.h
-memory_view.o: $(hdrdir)/ruby/internal/intern/string.h
-memory_view.o: $(hdrdir)/ruby/internal/intern/struct.h
-memory_view.o: $(hdrdir)/ruby/internal/intern/thread.h
-memory_view.o: $(hdrdir)/ruby/internal/intern/time.h
-memory_view.o: $(hdrdir)/ruby/internal/intern/variable.h
-memory_view.o: $(hdrdir)/ruby/internal/intern/vm.h
-memory_view.o: $(hdrdir)/ruby/internal/interpreter.h
-memory_view.o: $(hdrdir)/ruby/internal/iterator.h
-memory_view.o: $(hdrdir)/ruby/internal/memory.h
-memory_view.o: $(hdrdir)/ruby/internal/method.h
-memory_view.o: $(hdrdir)/ruby/internal/module.h
-memory_view.o: $(hdrdir)/ruby/internal/newobj.h
-memory_view.o: $(hdrdir)/ruby/internal/scan_args.h
-memory_view.o: $(hdrdir)/ruby/internal/special_consts.h
-memory_view.o: $(hdrdir)/ruby/internal/static_assert.h
-memory_view.o: $(hdrdir)/ruby/internal/stdalign.h
-memory_view.o: $(hdrdir)/ruby/internal/stdbool.h
-memory_view.o: $(hdrdir)/ruby/internal/symbol.h
-memory_view.o: $(hdrdir)/ruby/internal/value.h
-memory_view.o: $(hdrdir)/ruby/internal/value_type.h
-memory_view.o: $(hdrdir)/ruby/internal/variable.h
-memory_view.o: $(hdrdir)/ruby/internal/warning_push.h
-memory_view.o: $(hdrdir)/ruby/internal/xmalloc.h
-memory_view.o: $(hdrdir)/ruby/memory_view.h
-memory_view.o: $(hdrdir)/ruby/missing.h
-memory_view.o: $(hdrdir)/ruby/onigmo.h
-memory_view.o: $(hdrdir)/ruby/oniguruma.h
-memory_view.o: $(hdrdir)/ruby/ruby.h
-memory_view.o: $(hdrdir)/ruby/st.h
-memory_view.o: $(hdrdir)/ruby/subst.h
-memory_view.o: closure.h
-memory_view.o: conversions.h
-memory_view.o: fiddle.h
-memory_view.o: function.h
-memory_view.o: memory_view.c
-pinned.o: $(RUBY_EXTCONF_H)
-pinned.o: $(arch_hdrdir)/ruby/config.h
-pinned.o: $(hdrdir)/ruby.h
-pinned.o: $(hdrdir)/ruby/assert.h
-pinned.o: $(hdrdir)/ruby/backward.h
-pinned.o: $(hdrdir)/ruby/backward/2/assume.h
-pinned.o: $(hdrdir)/ruby/backward/2/attributes.h
-pinned.o: $(hdrdir)/ruby/backward/2/bool.h
-pinned.o: $(hdrdir)/ruby/backward/2/inttypes.h
-pinned.o: $(hdrdir)/ruby/backward/2/limits.h
-pinned.o: $(hdrdir)/ruby/backward/2/long_long.h
-pinned.o: $(hdrdir)/ruby/backward/2/stdalign.h
-pinned.o: $(hdrdir)/ruby/backward/2/stdarg.h
-pinned.o: $(hdrdir)/ruby/defines.h
-pinned.o: $(hdrdir)/ruby/intern.h
-pinned.o: $(hdrdir)/ruby/internal/abi.h
-pinned.o: $(hdrdir)/ruby/internal/anyargs.h
-pinned.o: $(hdrdir)/ruby/internal/arithmetic.h
-pinned.o: $(hdrdir)/ruby/internal/arithmetic/char.h
-pinned.o: $(hdrdir)/ruby/internal/arithmetic/double.h
-pinned.o: $(hdrdir)/ruby/internal/arithmetic/fixnum.h
-pinned.o: $(hdrdir)/ruby/internal/arithmetic/gid_t.h
-pinned.o: $(hdrdir)/ruby/internal/arithmetic/int.h
-pinned.o: $(hdrdir)/ruby/internal/arithmetic/intptr_t.h
-pinned.o: $(hdrdir)/ruby/internal/arithmetic/long.h
-pinned.o: $(hdrdir)/ruby/internal/arithmetic/long_long.h
-pinned.o: $(hdrdir)/ruby/internal/arithmetic/mode_t.h
-pinned.o: $(hdrdir)/ruby/internal/arithmetic/off_t.h
-pinned.o: $(hdrdir)/ruby/internal/arithmetic/pid_t.h
-pinned.o: $(hdrdir)/ruby/internal/arithmetic/short.h
-pinned.o: $(hdrdir)/ruby/internal/arithmetic/size_t.h
-pinned.o: $(hdrdir)/ruby/internal/arithmetic/st_data_t.h
-pinned.o: $(hdrdir)/ruby/internal/arithmetic/uid_t.h
-pinned.o: $(hdrdir)/ruby/internal/assume.h
-pinned.o: $(hdrdir)/ruby/internal/attr/alloc_size.h
-pinned.o: $(hdrdir)/ruby/internal/attr/artificial.h
-pinned.o: $(hdrdir)/ruby/internal/attr/cold.h
-pinned.o: $(hdrdir)/ruby/internal/attr/const.h
-pinned.o: $(hdrdir)/ruby/internal/attr/constexpr.h
-pinned.o: $(hdrdir)/ruby/internal/attr/deprecated.h
-pinned.o: $(hdrdir)/ruby/internal/attr/diagnose_if.h
-pinned.o: $(hdrdir)/ruby/internal/attr/enum_extensibility.h
-pinned.o: $(hdrdir)/ruby/internal/attr/error.h
-pinned.o: $(hdrdir)/ruby/internal/attr/flag_enum.h
-pinned.o: $(hdrdir)/ruby/internal/attr/forceinline.h
-pinned.o: $(hdrdir)/ruby/internal/attr/format.h
-pinned.o: $(hdrdir)/ruby/internal/attr/maybe_unused.h
-pinned.o: $(hdrdir)/ruby/internal/attr/noalias.h
-pinned.o: $(hdrdir)/ruby/internal/attr/nodiscard.h
-pinned.o: $(hdrdir)/ruby/internal/attr/noexcept.h
-pinned.o: $(hdrdir)/ruby/internal/attr/noinline.h
-pinned.o: $(hdrdir)/ruby/internal/attr/nonnull.h
-pinned.o: $(hdrdir)/ruby/internal/attr/noreturn.h
-pinned.o: $(hdrdir)/ruby/internal/attr/packed_struct.h
-pinned.o: $(hdrdir)/ruby/internal/attr/pure.h
-pinned.o: $(hdrdir)/ruby/internal/attr/restrict.h
-pinned.o: $(hdrdir)/ruby/internal/attr/returns_nonnull.h
-pinned.o: $(hdrdir)/ruby/internal/attr/warning.h
-pinned.o: $(hdrdir)/ruby/internal/attr/weakref.h
-pinned.o: $(hdrdir)/ruby/internal/cast.h
-pinned.o: $(hdrdir)/ruby/internal/compiler_is.h
-pinned.o: $(hdrdir)/ruby/internal/compiler_is/apple.h
-pinned.o: $(hdrdir)/ruby/internal/compiler_is/clang.h
-pinned.o: $(hdrdir)/ruby/internal/compiler_is/gcc.h
-pinned.o: $(hdrdir)/ruby/internal/compiler_is/intel.h
-pinned.o: $(hdrdir)/ruby/internal/compiler_is/msvc.h
-pinned.o: $(hdrdir)/ruby/internal/compiler_is/sunpro.h
-pinned.o: $(hdrdir)/ruby/internal/compiler_since.h
-pinned.o: $(hdrdir)/ruby/internal/config.h
-pinned.o: $(hdrdir)/ruby/internal/constant_p.h
-pinned.o: $(hdrdir)/ruby/internal/core.h
-pinned.o: $(hdrdir)/ruby/internal/core/rarray.h
-pinned.o: $(hdrdir)/ruby/internal/core/rbasic.h
-pinned.o: $(hdrdir)/ruby/internal/core/rbignum.h
-pinned.o: $(hdrdir)/ruby/internal/core/rclass.h
-pinned.o: $(hdrdir)/ruby/internal/core/rdata.h
-pinned.o: $(hdrdir)/ruby/internal/core/rfile.h
-pinned.o: $(hdrdir)/ruby/internal/core/rhash.h
-pinned.o: $(hdrdir)/ruby/internal/core/robject.h
-pinned.o: $(hdrdir)/ruby/internal/core/rregexp.h
-pinned.o: $(hdrdir)/ruby/internal/core/rstring.h
-pinned.o: $(hdrdir)/ruby/internal/core/rstruct.h
-pinned.o: $(hdrdir)/ruby/internal/core/rtypeddata.h
-pinned.o: $(hdrdir)/ruby/internal/ctype.h
-pinned.o: $(hdrdir)/ruby/internal/dllexport.h
-pinned.o: $(hdrdir)/ruby/internal/dosish.h
-pinned.o: $(hdrdir)/ruby/internal/error.h
-pinned.o: $(hdrdir)/ruby/internal/eval.h
-pinned.o: $(hdrdir)/ruby/internal/event.h
-pinned.o: $(hdrdir)/ruby/internal/fl_type.h
-pinned.o: $(hdrdir)/ruby/internal/gc.h
-pinned.o: $(hdrdir)/ruby/internal/glob.h
-pinned.o: $(hdrdir)/ruby/internal/globals.h
-pinned.o: $(hdrdir)/ruby/internal/has/attribute.h
-pinned.o: $(hdrdir)/ruby/internal/has/builtin.h
-pinned.o: $(hdrdir)/ruby/internal/has/c_attribute.h
-pinned.o: $(hdrdir)/ruby/internal/has/cpp_attribute.h
-pinned.o: $(hdrdir)/ruby/internal/has/declspec_attribute.h
-pinned.o: $(hdrdir)/ruby/internal/has/extension.h
-pinned.o: $(hdrdir)/ruby/internal/has/feature.h
-pinned.o: $(hdrdir)/ruby/internal/has/warning.h
-pinned.o: $(hdrdir)/ruby/internal/intern/array.h
-pinned.o: $(hdrdir)/ruby/internal/intern/bignum.h
-pinned.o: $(hdrdir)/ruby/internal/intern/class.h
-pinned.o: $(hdrdir)/ruby/internal/intern/compar.h
-pinned.o: $(hdrdir)/ruby/internal/intern/complex.h
-pinned.o: $(hdrdir)/ruby/internal/intern/cont.h
-pinned.o: $(hdrdir)/ruby/internal/intern/dir.h
-pinned.o: $(hdrdir)/ruby/internal/intern/enum.h
-pinned.o: $(hdrdir)/ruby/internal/intern/enumerator.h
-pinned.o: $(hdrdir)/ruby/internal/intern/error.h
-pinned.o: $(hdrdir)/ruby/internal/intern/eval.h
-pinned.o: $(hdrdir)/ruby/internal/intern/file.h
-pinned.o: $(hdrdir)/ruby/internal/intern/hash.h
-pinned.o: $(hdrdir)/ruby/internal/intern/io.h
-pinned.o: $(hdrdir)/ruby/internal/intern/load.h
-pinned.o: $(hdrdir)/ruby/internal/intern/marshal.h
-pinned.o: $(hdrdir)/ruby/internal/intern/numeric.h
-pinned.o: $(hdrdir)/ruby/internal/intern/object.h
-pinned.o: $(hdrdir)/ruby/internal/intern/parse.h
-pinned.o: $(hdrdir)/ruby/internal/intern/proc.h
-pinned.o: $(hdrdir)/ruby/internal/intern/process.h
-pinned.o: $(hdrdir)/ruby/internal/intern/random.h
-pinned.o: $(hdrdir)/ruby/internal/intern/range.h
-pinned.o: $(hdrdir)/ruby/internal/intern/rational.h
-pinned.o: $(hdrdir)/ruby/internal/intern/re.h
-pinned.o: $(hdrdir)/ruby/internal/intern/ruby.h
-pinned.o: $(hdrdir)/ruby/internal/intern/select.h
-pinned.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
-pinned.o: $(hdrdir)/ruby/internal/intern/signal.h
-pinned.o: $(hdrdir)/ruby/internal/intern/sprintf.h
-pinned.o: $(hdrdir)/ruby/internal/intern/string.h
-pinned.o: $(hdrdir)/ruby/internal/intern/struct.h
-pinned.o: $(hdrdir)/ruby/internal/intern/thread.h
-pinned.o: $(hdrdir)/ruby/internal/intern/time.h
-pinned.o: $(hdrdir)/ruby/internal/intern/variable.h
-pinned.o: $(hdrdir)/ruby/internal/intern/vm.h
-pinned.o: $(hdrdir)/ruby/internal/interpreter.h
-pinned.o: $(hdrdir)/ruby/internal/iterator.h
-pinned.o: $(hdrdir)/ruby/internal/memory.h
-pinned.o: $(hdrdir)/ruby/internal/method.h
-pinned.o: $(hdrdir)/ruby/internal/module.h
-pinned.o: $(hdrdir)/ruby/internal/newobj.h
-pinned.o: $(hdrdir)/ruby/internal/scan_args.h
-pinned.o: $(hdrdir)/ruby/internal/special_consts.h
-pinned.o: $(hdrdir)/ruby/internal/static_assert.h
-pinned.o: $(hdrdir)/ruby/internal/stdalign.h
-pinned.o: $(hdrdir)/ruby/internal/stdbool.h
-pinned.o: $(hdrdir)/ruby/internal/symbol.h
-pinned.o: $(hdrdir)/ruby/internal/value.h
-pinned.o: $(hdrdir)/ruby/internal/value_type.h
-pinned.o: $(hdrdir)/ruby/internal/variable.h
-pinned.o: $(hdrdir)/ruby/internal/warning_push.h
-pinned.o: $(hdrdir)/ruby/internal/xmalloc.h
-pinned.o: $(hdrdir)/ruby/missing.h
-pinned.o: $(hdrdir)/ruby/ruby.h
-pinned.o: $(hdrdir)/ruby/st.h
-pinned.o: $(hdrdir)/ruby/subst.h
-pinned.o: closure.h
-pinned.o: conversions.h
-pinned.o: fiddle.h
-pinned.o: function.h
-pinned.o: pinned.c
-pointer.o: $(RUBY_EXTCONF_H)
-pointer.o: $(arch_hdrdir)/ruby/config.h
-pointer.o: $(hdrdir)/ruby.h
-pointer.o: $(hdrdir)/ruby/assert.h
-pointer.o: $(hdrdir)/ruby/backward.h
-pointer.o: $(hdrdir)/ruby/backward/2/assume.h
-pointer.o: $(hdrdir)/ruby/backward/2/attributes.h
-pointer.o: $(hdrdir)/ruby/backward/2/bool.h
-pointer.o: $(hdrdir)/ruby/backward/2/inttypes.h
-pointer.o: $(hdrdir)/ruby/backward/2/limits.h
-pointer.o: $(hdrdir)/ruby/backward/2/long_long.h
-pointer.o: $(hdrdir)/ruby/backward/2/stdalign.h
-pointer.o: $(hdrdir)/ruby/backward/2/stdarg.h
-pointer.o: $(hdrdir)/ruby/defines.h
-pointer.o: $(hdrdir)/ruby/encoding.h
-pointer.o: $(hdrdir)/ruby/intern.h
-pointer.o: $(hdrdir)/ruby/internal/abi.h
-pointer.o: $(hdrdir)/ruby/internal/anyargs.h
-pointer.o: $(hdrdir)/ruby/internal/arithmetic.h
-pointer.o: $(hdrdir)/ruby/internal/arithmetic/char.h
-pointer.o: $(hdrdir)/ruby/internal/arithmetic/double.h
-pointer.o: $(hdrdir)/ruby/internal/arithmetic/fixnum.h
-pointer.o: $(hdrdir)/ruby/internal/arithmetic/gid_t.h
-pointer.o: $(hdrdir)/ruby/internal/arithmetic/int.h
-pointer.o: $(hdrdir)/ruby/internal/arithmetic/intptr_t.h
-pointer.o: $(hdrdir)/ruby/internal/arithmetic/long.h
-pointer.o: $(hdrdir)/ruby/internal/arithmetic/long_long.h
-pointer.o: $(hdrdir)/ruby/internal/arithmetic/mode_t.h
-pointer.o: $(hdrdir)/ruby/internal/arithmetic/off_t.h
-pointer.o: $(hdrdir)/ruby/internal/arithmetic/pid_t.h
-pointer.o: $(hdrdir)/ruby/internal/arithmetic/short.h
-pointer.o: $(hdrdir)/ruby/internal/arithmetic/size_t.h
-pointer.o: $(hdrdir)/ruby/internal/arithmetic/st_data_t.h
-pointer.o: $(hdrdir)/ruby/internal/arithmetic/uid_t.h
-pointer.o: $(hdrdir)/ruby/internal/assume.h
-pointer.o: $(hdrdir)/ruby/internal/attr/alloc_size.h
-pointer.o: $(hdrdir)/ruby/internal/attr/artificial.h
-pointer.o: $(hdrdir)/ruby/internal/attr/cold.h
-pointer.o: $(hdrdir)/ruby/internal/attr/const.h
-pointer.o: $(hdrdir)/ruby/internal/attr/constexpr.h
-pointer.o: $(hdrdir)/ruby/internal/attr/deprecated.h
-pointer.o: $(hdrdir)/ruby/internal/attr/diagnose_if.h
-pointer.o: $(hdrdir)/ruby/internal/attr/enum_extensibility.h
-pointer.o: $(hdrdir)/ruby/internal/attr/error.h
-pointer.o: $(hdrdir)/ruby/internal/attr/flag_enum.h
-pointer.o: $(hdrdir)/ruby/internal/attr/forceinline.h
-pointer.o: $(hdrdir)/ruby/internal/attr/format.h
-pointer.o: $(hdrdir)/ruby/internal/attr/maybe_unused.h
-pointer.o: $(hdrdir)/ruby/internal/attr/noalias.h
-pointer.o: $(hdrdir)/ruby/internal/attr/nodiscard.h
-pointer.o: $(hdrdir)/ruby/internal/attr/noexcept.h
-pointer.o: $(hdrdir)/ruby/internal/attr/noinline.h
-pointer.o: $(hdrdir)/ruby/internal/attr/nonnull.h
-pointer.o: $(hdrdir)/ruby/internal/attr/noreturn.h
-pointer.o: $(hdrdir)/ruby/internal/attr/packed_struct.h
-pointer.o: $(hdrdir)/ruby/internal/attr/pure.h
-pointer.o: $(hdrdir)/ruby/internal/attr/restrict.h
-pointer.o: $(hdrdir)/ruby/internal/attr/returns_nonnull.h
-pointer.o: $(hdrdir)/ruby/internal/attr/warning.h
-pointer.o: $(hdrdir)/ruby/internal/attr/weakref.h
-pointer.o: $(hdrdir)/ruby/internal/cast.h
-pointer.o: $(hdrdir)/ruby/internal/compiler_is.h
-pointer.o: $(hdrdir)/ruby/internal/compiler_is/apple.h
-pointer.o: $(hdrdir)/ruby/internal/compiler_is/clang.h
-pointer.o: $(hdrdir)/ruby/internal/compiler_is/gcc.h
-pointer.o: $(hdrdir)/ruby/internal/compiler_is/intel.h
-pointer.o: $(hdrdir)/ruby/internal/compiler_is/msvc.h
-pointer.o: $(hdrdir)/ruby/internal/compiler_is/sunpro.h
-pointer.o: $(hdrdir)/ruby/internal/compiler_since.h
-pointer.o: $(hdrdir)/ruby/internal/config.h
-pointer.o: $(hdrdir)/ruby/internal/constant_p.h
-pointer.o: $(hdrdir)/ruby/internal/core.h
-pointer.o: $(hdrdir)/ruby/internal/core/rarray.h
-pointer.o: $(hdrdir)/ruby/internal/core/rbasic.h
-pointer.o: $(hdrdir)/ruby/internal/core/rbignum.h
-pointer.o: $(hdrdir)/ruby/internal/core/rclass.h
-pointer.o: $(hdrdir)/ruby/internal/core/rdata.h
-pointer.o: $(hdrdir)/ruby/internal/core/rfile.h
-pointer.o: $(hdrdir)/ruby/internal/core/rhash.h
-pointer.o: $(hdrdir)/ruby/internal/core/robject.h
-pointer.o: $(hdrdir)/ruby/internal/core/rregexp.h
-pointer.o: $(hdrdir)/ruby/internal/core/rstring.h
-pointer.o: $(hdrdir)/ruby/internal/core/rstruct.h
-pointer.o: $(hdrdir)/ruby/internal/core/rtypeddata.h
-pointer.o: $(hdrdir)/ruby/internal/ctype.h
-pointer.o: $(hdrdir)/ruby/internal/dllexport.h
-pointer.o: $(hdrdir)/ruby/internal/dosish.h
-pointer.o: $(hdrdir)/ruby/internal/encoding/coderange.h
-pointer.o: $(hdrdir)/ruby/internal/encoding/ctype.h
-pointer.o: $(hdrdir)/ruby/internal/encoding/encoding.h
-pointer.o: $(hdrdir)/ruby/internal/encoding/pathname.h
-pointer.o: $(hdrdir)/ruby/internal/encoding/re.h
-pointer.o: $(hdrdir)/ruby/internal/encoding/sprintf.h
-pointer.o: $(hdrdir)/ruby/internal/encoding/string.h
-pointer.o: $(hdrdir)/ruby/internal/encoding/symbol.h
-pointer.o: $(hdrdir)/ruby/internal/encoding/transcode.h
-pointer.o: $(hdrdir)/ruby/internal/error.h
-pointer.o: $(hdrdir)/ruby/internal/eval.h
-pointer.o: $(hdrdir)/ruby/internal/event.h
-pointer.o: $(hdrdir)/ruby/internal/fl_type.h
-pointer.o: $(hdrdir)/ruby/internal/gc.h
-pointer.o: $(hdrdir)/ruby/internal/glob.h
-pointer.o: $(hdrdir)/ruby/internal/globals.h
-pointer.o: $(hdrdir)/ruby/internal/has/attribute.h
-pointer.o: $(hdrdir)/ruby/internal/has/builtin.h
-pointer.o: $(hdrdir)/ruby/internal/has/c_attribute.h
-pointer.o: $(hdrdir)/ruby/internal/has/cpp_attribute.h
-pointer.o: $(hdrdir)/ruby/internal/has/declspec_attribute.h
-pointer.o: $(hdrdir)/ruby/internal/has/extension.h
-pointer.o: $(hdrdir)/ruby/internal/has/feature.h
-pointer.o: $(hdrdir)/ruby/internal/has/warning.h
-pointer.o: $(hdrdir)/ruby/internal/intern/array.h
-pointer.o: $(hdrdir)/ruby/internal/intern/bignum.h
-pointer.o: $(hdrdir)/ruby/internal/intern/class.h
-pointer.o: $(hdrdir)/ruby/internal/intern/compar.h
-pointer.o: $(hdrdir)/ruby/internal/intern/complex.h
-pointer.o: $(hdrdir)/ruby/internal/intern/cont.h
-pointer.o: $(hdrdir)/ruby/internal/intern/dir.h
-pointer.o: $(hdrdir)/ruby/internal/intern/enum.h
-pointer.o: $(hdrdir)/ruby/internal/intern/enumerator.h
-pointer.o: $(hdrdir)/ruby/internal/intern/error.h
-pointer.o: $(hdrdir)/ruby/internal/intern/eval.h
-pointer.o: $(hdrdir)/ruby/internal/intern/file.h
-pointer.o: $(hdrdir)/ruby/internal/intern/hash.h
-pointer.o: $(hdrdir)/ruby/internal/intern/io.h
-pointer.o: $(hdrdir)/ruby/internal/intern/load.h
-pointer.o: $(hdrdir)/ruby/internal/intern/marshal.h
-pointer.o: $(hdrdir)/ruby/internal/intern/numeric.h
-pointer.o: $(hdrdir)/ruby/internal/intern/object.h
-pointer.o: $(hdrdir)/ruby/internal/intern/parse.h
-pointer.o: $(hdrdir)/ruby/internal/intern/proc.h
-pointer.o: $(hdrdir)/ruby/internal/intern/process.h
-pointer.o: $(hdrdir)/ruby/internal/intern/random.h
-pointer.o: $(hdrdir)/ruby/internal/intern/range.h
-pointer.o: $(hdrdir)/ruby/internal/intern/rational.h
-pointer.o: $(hdrdir)/ruby/internal/intern/re.h
-pointer.o: $(hdrdir)/ruby/internal/intern/ruby.h
-pointer.o: $(hdrdir)/ruby/internal/intern/select.h
-pointer.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
-pointer.o: $(hdrdir)/ruby/internal/intern/signal.h
-pointer.o: $(hdrdir)/ruby/internal/intern/sprintf.h
-pointer.o: $(hdrdir)/ruby/internal/intern/string.h
-pointer.o: $(hdrdir)/ruby/internal/intern/struct.h
-pointer.o: $(hdrdir)/ruby/internal/intern/thread.h
-pointer.o: $(hdrdir)/ruby/internal/intern/time.h
-pointer.o: $(hdrdir)/ruby/internal/intern/variable.h
-pointer.o: $(hdrdir)/ruby/internal/intern/vm.h
-pointer.o: $(hdrdir)/ruby/internal/interpreter.h
-pointer.o: $(hdrdir)/ruby/internal/iterator.h
-pointer.o: $(hdrdir)/ruby/internal/memory.h
-pointer.o: $(hdrdir)/ruby/internal/method.h
-pointer.o: $(hdrdir)/ruby/internal/module.h
-pointer.o: $(hdrdir)/ruby/internal/newobj.h
-pointer.o: $(hdrdir)/ruby/internal/scan_args.h
-pointer.o: $(hdrdir)/ruby/internal/special_consts.h
-pointer.o: $(hdrdir)/ruby/internal/static_assert.h
-pointer.o: $(hdrdir)/ruby/internal/stdalign.h
-pointer.o: $(hdrdir)/ruby/internal/stdbool.h
-pointer.o: $(hdrdir)/ruby/internal/symbol.h
-pointer.o: $(hdrdir)/ruby/internal/value.h
-pointer.o: $(hdrdir)/ruby/internal/value_type.h
-pointer.o: $(hdrdir)/ruby/internal/variable.h
-pointer.o: $(hdrdir)/ruby/internal/warning_push.h
-pointer.o: $(hdrdir)/ruby/internal/xmalloc.h
-pointer.o: $(hdrdir)/ruby/io.h
-pointer.o: $(hdrdir)/ruby/memory_view.h
-pointer.o: $(hdrdir)/ruby/missing.h
-pointer.o: $(hdrdir)/ruby/onigmo.h
-pointer.o: $(hdrdir)/ruby/oniguruma.h
-pointer.o: $(hdrdir)/ruby/ruby.h
-pointer.o: $(hdrdir)/ruby/st.h
-pointer.o: $(hdrdir)/ruby/subst.h
-pointer.o: closure.h
-pointer.o: conversions.h
-pointer.o: fiddle.h
-pointer.o: function.h
-pointer.o: pointer.c
-# AUTOGENERATED DEPENDENCIES END
diff --git a/ext/fiddle/extconf.rb b/ext/fiddle/extconf.rb
deleted file mode 100644
index cf8b5223bb85d5..00000000000000
--- a/ext/fiddle/extconf.rb
+++ /dev/null
@@ -1,251 +0,0 @@
-# frozen_string_literal: true
-require 'mkmf'
-
-# :stopdoc:
-
-def gcc?
-  RbConfig::CONFIG["GCC"] == "yes"
-end
-
-def disable_optimization_build_flag(flags)
-  if gcc?
-    expanded_flags = RbConfig.expand(flags.dup)
-    optimization_option_pattern = /(^|\s)?-O\d(\s|$)?/
-    if optimization_option_pattern.match?(expanded_flags)
-      expanded_flags.gsub(optimization_option_pattern, '\\1-Og\\2')
-    else
-      flags + " -Og"
-    end
-  else
-    flags
-  end
-end
-
-def enable_debug_build_flag(flags)
-  if gcc?
-    expanded_flags = RbConfig.expand(flags.dup)
-    debug_option_pattern = /(^|\s)-g(?:gdb)?\d?(\s|$)/
-    if debug_option_pattern.match?(expanded_flags)
-      expanded_flags.gsub(debug_option_pattern, '\\1-ggdb3\\2')
-    else
-      flags + " -ggdb3"
-    end
-  else
-    flags
-  end
-end
-
-checking_for(checking_message("--enable-debug-build option")) do
-  enable_debug_build = enable_config("debug-build", false)
-  if enable_debug_build
-    $CFLAGS = disable_optimization_build_flag($CFLAGS)
-    $CFLAGS = enable_debug_build_flag($CFLAGS)
-  end
-  enable_debug_build
-end
-
-libffi_version = nil
-have_libffi = false
-bundle = with_config("libffi-source-dir")
-unless bundle
-  dir_config 'libffi'
-
-  if pkg_config("libffi")
-    libffi_version = pkg_config("libffi", "modversion")
-  end
-
-  have_ffi_header = false
-  if have_header(ffi_header = 'ffi.h')
-    have_ffi_header = true
-  elsif have_header(ffi_header = 'ffi/ffi.h')
-    $defs.push('-DUSE_HEADER_HACKS')
-    have_ffi_header = true
-  end
-  if have_ffi_header && (have_library('ffi') || have_library('libffi'))
-    have_libffi = true
-  end
-end
-
-unless have_libffi
-  if bundle
-    libffi_srcdir = libffi_package_name = bundle
-  else
-    raise "missing libffi. Please install libffi or use --with-libffi-source-dir with libffi source location."
-  end
-  ffi_header = 'ffi.h'
-  libffi = Struct.new(*%I[dir srcdir builddir include lib a cflags ldflags opt arch]).new
-  libffi.dir = libffi_package_name
-  if $srcdir == "."
-    libffi.builddir = libffi_package_name
-    libffi.srcdir = "."
-  else
-    libffi.builddir = libffi.dir
-    libffi.srcdir = relative_from(libffi_srcdir, "..")
-  end
-  libffi.include = "#{libffi.builddir}/include"
-  libffi.lib = "#{libffi.builddir}/.libs"
-  libffi.a = "#{libffi.lib}/libffi_convenience.#{$LIBEXT}"
-  nowarn = CONFIG.merge("warnflags"=>"")
-  libffi.cflags = RbConfig.expand("$(CFLAGS)".dup, nowarn)
-  libffi_version = libffi_package_name[/libffi-(.*)/, 1]
-
-  FileUtils.mkdir_p(libffi.dir)
-  libffi.opt = CONFIG['configure_args'][/'(-C)'/, 1]
-  libffi.ldflags = RbConfig.expand("$(LDFLAGS) #{libpathflag([relative_from($topdir, "..")])} #{$LIBRUBYARG}".dup)
-  libffi.arch = RbConfig::CONFIG['host']
-  if $mswin
-    unless find_executable(as = /x64/ =~ libffi.arch ? "ml64" : "ml")
-      raise "missing #{as} command."
-    end
-    $defs << "-DFFI_BUILDING"
-    libffi_config = "#{relative_from($srcdir, '..')}/win32/libffi-config.rb"
-    config = CONFIG.merge("top_srcdir" => $top_srcdir)
-    args = $ruby.gsub(/:\/=\\/, '')
-    args.gsub!(/\)\\/, ')/')
-    args = args.shellsplit
-    args.map! {|s| RbConfig.expand(s, config)}
-    args << '-C' << libffi.dir << libffi_config
-    opts = {}
-  else
-    args = %W[sh #{libffi.srcdir}/configure ]
-    opts = {chdir: libffi.dir}
-  end
-  cc = RbConfig::CONFIG['CC']
-  cxx = RbConfig::CONFIG['CXX']
-  ld = RbConfig::CONFIG['LD']
-  args.concat %W[
-    --srcdir=#{libffi.srcdir}
-    --host=#{libffi.arch}
-  ]
-  args << ($enable_shared || !$static ? '--enable-shared' : '--enable-static')
-  args << libffi.opt if libffi.opt
-  args.concat %W[
-      CC=#{cc} CFLAGS=#{libffi.cflags}
-      CXX=#{cxx} CXXFLAGS=#{RbConfig.expand("$(CXXFLAGS)".dup, nowarn)}
-      LD=#{ld} LDFLAGS=#{libffi.ldflags}
-  ]
-
-  FileUtils.rm_f("#{libffi.include}/ffitarget.h")
-  Logging::open do
-    Logging.message("%p in %p\n", args, opts)
-    unless system(*args, **opts)
-      begin
-        IO.copy_stream(libffi.dir + "/config.log", Logging.instance_variable_get(:@logfile))
-      rescue SystemCallError => e
-        Logging.message("%s\n", e.message)
-      end
-      raise "failed to configure libffi. Please install libffi."
-    end
-  end
-  if $mswin && File.file?("#{libffi.include}/ffitarget.h")
-    FileUtils.rm_f("#{libffi.include}/ffitarget.h")
-  end
-  unless File.file?("#{libffi.include}/ffitarget.h")
-    FileUtils.cp("#{libffi_srcdir}/src/x86/ffitarget.h", libffi.include, preserve: true)
-  end
-  $INCFLAGS << " -I" << libffi.include
-end
-
-if libffi_version
-  # If libffi_version contains rc version, just ignored.
-  libffi_version = libffi_version.gsub(/-rc\d+/, '')
-  libffi_version = (libffi_version.split('.').map(&:to_i) + [0,0])[0,3]
-  $defs.push(%{-DRUBY_LIBFFI_MODVERSION=#{ '%d%03d%03d' % libffi_version }})
-  warn "libffi_version: #{libffi_version.join('.')}"
-end
-
-case
-when $mswin, $mingw, (libffi_version && (libffi_version <=> [3, 2]) >= 0)
-  $defs << "-DUSE_FFI_CLOSURE_ALLOC=1"
-when (libffi_version && (libffi_version <=> [3, 2]) < 0)
-else
-  have_func('ffi_closure_alloc', ffi_header)
-end
-
-if libffi_version
-  if (libffi_version <=> [3, 0, 11]) >= 0
-    $defs << "-DHAVE_FFI_PREP_CIF_VAR"
-  end
-else
-  have_func('ffi_prep_cif_var', ffi_header)
-end
-
-have_header 'sys/mman.h'
-have_header 'link.h'
-
-if have_header "dlfcn.h"
-  have_library "dl"
-
-  %w{ dlopen dlclose dlsym }.each do |func|
-    abort "missing function #{func}" unless have_func(func)
-  end
-
-  have_func "dlerror"
-  have_func "dlinfo"
-  have_const("RTLD_DI_LINKMAP", "dlfcn.h")
-elsif have_header "windows.h"
-  %w{ LoadLibrary FreeLibrary GetProcAddress GetModuleFileName }.each do |func|
-    abort "missing function #{func}" unless have_func(func)
-  end
-
-  have_library "ws2_32"
-end
-
-have_const('FFI_STDCALL', ffi_header)
-
-config = File.read(RbConfig.expand(File.join($arch_hdrdir, "ruby/config.h")))
-types = {"SIZE_T"=>"SSIZE_T", "PTRDIFF_T"=>nil, "INTPTR_T"=>nil}
-types.each do |type, signed|
-  if /^\#define\s+SIZEOF_#{type}\s+(SIZEOF_(.+)|\d+)/ =~ config
-    if size = $2 and size != 'VOIDP'
-      size = types.fetch(size) {size}
-      $defs << "-DTYPE_#{signed||type}=TYPE_#{size}"
-    end
-    if signed
-      check_signedness(type.downcase, "stddef.h")
-    end
-  else
-    check_signedness(type.downcase, "stddef.h")
-  end
-end
-
-if libffi
-  $LOCAL_LIBS.prepend("#{libffi.a} ").strip! # to exts.mk
-  $INCFLAGS.gsub!(/-I#{libffi.dir}/, '-I$(LIBFFI_DIR)')
-end
-create_makefile 'fiddle' do |conf|
-  if !libffi
-    next conf << "LIBFFI_CLEAN = none\n"
-  elsif $gnumake && !$nmake
-    submake_arg = "-C $(LIBFFI_DIR)\n"
-  else
-    submake_pre = "cd $(LIBFFI_DIR) && #{config_string("exec")}".strip
-  end
-  if $nmake
-    cmd = "$(RUBY) -C $(LIBFFI_DIR) #{libffi_config} --srcdir=$(LIBFFI_SRCDIR)"
-  else
-    cmd = "cd $(LIBFFI_DIR) && #$exec $(LIBFFI_SRCDIR)/configure #{libffi.opt}"
-  end
-  sep = "/"
-  seprpl = config_string('BUILD_FILE_SEPARATOR') {|s| sep = s; ":/=#{s}" if s != "/"} || ""
-  conf << <<-MK.gsub(/^ +| +$/, '')
-   PWD =
-   LIBFFI_CONFIGURE = #{cmd}
-   LIBFFI_ARCH = #{libffi.arch}
-   LIBFFI_SRCDIR = #{libffi.srcdir.sub(libffi.dir, '$(LIBFFI_DIR)')}
-   LIBFFI_DIR = #{libffi.dir}
-   LIBFFI_A = #{libffi.a.sub(libffi.dir, '$(LIBFFI_DIR)')}
-   LIBFFI_CFLAGS = #{libffi.cflags}
-   LIBFFI_LDFLAGS = #{libffi.ldflags}
-   FFI_H = $(LIBFFI_DIR)/include/ffi.h
-   SUBMAKE_PRE = #{submake_pre}
-   SUBMAKE_ARG = #{submake_arg}
-   LIBFFI_CLEAN = libffi
-  MK
-end
-
-if libffi
-  $LIBPATH.pop
-end
-
-# :startdoc:
diff --git a/ext/fiddle/fiddle.c b/ext/fiddle/fiddle.c
deleted file mode 100644
index 49120704aba184..00000000000000
--- a/ext/fiddle/fiddle.c
+++ /dev/null
@@ -1,706 +0,0 @@
-#include <stdbool.h>
-
-#include <fiddle.h>
-
-VALUE mFiddle;
-VALUE rb_eFiddleDLError;
-VALUE rb_eFiddleError;
-
-void Init_fiddle_pointer(void);
-void Init_fiddle_pinned(void);
-
-#ifdef HAVE_RUBY_MEMORY_VIEW_H
-void Init_fiddle_memory_view(void);
-#endif
-
-/*
- * call-seq: Fiddle.malloc(size)
- *
- * Allocate +size+ bytes of memory and return the integer memory address
- * for the allocated memory.
- */
-static VALUE
-rb_fiddle_malloc(VALUE self, VALUE size)
-{
-    void *ptr;
-    ptr = (void*)ruby_xcalloc(1, NUM2SIZET(size));
-    return PTR2NUM(ptr);
-}
-
-/*
- * call-seq: Fiddle.realloc(addr, size)
- *
- * Change the size of the memory allocated at the memory location +addr+ to
- * +size+ bytes.  Returns the memory address of the reallocated memory, which
- * may be different than the address passed in.
- */
-static VALUE
-rb_fiddle_realloc(VALUE self, VALUE addr, VALUE size)
-{
-    void *ptr = NUM2PTR(addr);
-
-    ptr = (void*)ruby_xrealloc(ptr, NUM2SIZET(size));
-    return PTR2NUM(ptr);
-}
-
-/*
- * call-seq: Fiddle.free(addr)
- *
- * Free the memory at address +addr+
- */
-VALUE
-rb_fiddle_free(VALUE self, VALUE addr)
-{
-    void *ptr = NUM2PTR(addr);
-
-    ruby_xfree(ptr);
-    return Qnil;
-}
-
-/*
- * call-seq: Fiddle.dlunwrap(addr)
- *
- * Returns the Ruby object stored at the memory address +addr+
- *
- * Example:
- *
- *    x = Object.new
- *    # => #<Object:0x0000000107c7d870>
- *    Fiddle.dlwrap(x)
- *    # => 4425504880
- *    Fiddle.dlunwrap(_)
- *    # => #<Object:0x0000000107c7d870>
- */
-VALUE
-rb_fiddle_ptr2value(VALUE self, VALUE addr)
-{
-    return (VALUE)NUM2PTR(addr);
-}
-
-/*
- * call-seq: Fiddle.dlwrap(val)
- *
- * Returns the memory address of the Ruby object stored at +val+
- *
- * Example:
- *
- *    x = Object.new
- *    # => #<Object:0x0000000107c7d870>
- *    Fiddle.dlwrap(x)
- *    # => 4425504880
- *
- * In the case +val+ is not a heap allocated object, this method will return
- * the tagged pointer value.
- *
- * Example:
- *
- *    Fiddle.dlwrap(123)
- *    # => 247
- */
-static VALUE
-rb_fiddle_value2ptr(VALUE self, VALUE val)
-{
-    return PTR2NUM((void*)val);
-}
-
-void Init_fiddle_handle(void);
-
-void
-Init_fiddle(void)
-{
-    /*
-     * Document-module: Fiddle
-     *
-     * A libffi wrapper for Ruby.
-     *
-     * == Description
-     *
-     * Fiddle is an extension to translate a foreign function interface (FFI)
-     * with ruby.
-     *
-     * It wraps {libffi}[http://sourceware.org/libffi/], a popular C library
-     * which provides a portable interface that allows code written in one
-     * language to call code written in another language.
-     *
-     * == Example
-     *
-     * Here we will use Fiddle::Function to wrap {floor(3) from
-     * libm}[http://linux.die.net/man/3/floor]
-     *
-     *	    require 'fiddle'
-     *
-     *	    libm = Fiddle.dlopen('/lib/libm.so.6')
-     *
-     *	    floor = Fiddle::Function.new(
-     *	      libm['floor'],
-     *	      [Fiddle::TYPE_DOUBLE],
-     *	      Fiddle::TYPE_DOUBLE
-     *	    )
-     *
-     *	    puts floor.call(3.14159) #=> 3.0
-     *
-     *
-     */
-    mFiddle = rb_define_module("Fiddle");
-
-    /*
-     * Document-class: Fiddle::Error
-     *
-     * Generic error class for Fiddle
-     */
-    rb_eFiddleError = rb_define_class_under(mFiddle, "Error", rb_eStandardError);
-
-    /*
-     * Ruby installed by RubyInstaller for Windows always require
-     * bundled Fiddle because ruby_installer/runtime/dll_directory.rb
-     * requires Fiddle. It's used by
-     * rubygems/defaults/operating_system.rb. It means that the
-     * bundled Fiddle is always required on initialization.
-     *
-     * We just remove existing Fiddle::DLError here to override
-     * the bundled Fiddle.
-     */
-    if (rb_const_defined(mFiddle, rb_intern("DLError"))) {
-        rb_const_remove(mFiddle, rb_intern("DLError"));
-    }
-
-    /*
-     * Document-class: Fiddle::DLError
-     *
-     * standard dynamic load exception
-     */
-    rb_eFiddleDLError = rb_define_class_under(mFiddle, "DLError", rb_eFiddleError);
-
-    VALUE mFiddleTypes = rb_define_module_under(mFiddle, "Types");
-
-    /* Document-const: Fiddle::Types::VOID
-     *
-     * C type - void
-     */
-    rb_define_const(mFiddleTypes, "VOID",      INT2NUM(TYPE_VOID));
-
-    /* Document-const: Fiddle::Types::VOIDP
-     *
-     * C type - void*
-     */
-    rb_define_const(mFiddleTypes, "VOIDP",     INT2NUM(TYPE_VOIDP));
-
-    /* Document-const: Fiddle::Types::CHAR
-     *
-     * C type - char
-     */
-    rb_define_const(mFiddleTypes, "CHAR",      INT2NUM(TYPE_CHAR));
-
-    /* Document-const: Fiddle::Types::UCHAR
-     *
-     * C type - unsigned char
-     */
-    rb_define_const(mFiddleTypes, "UCHAR",      INT2NUM(TYPE_UCHAR));
-
-    /* Document-const: Fiddle::Types::SHORT
-     *
-     * C type - short
-     */
-    rb_define_const(mFiddleTypes, "SHORT",     INT2NUM(TYPE_SHORT));
-
-    /* Document-const: Fiddle::Types::USHORT
-     *
-     * C type - unsigned short
-     */
-    rb_define_const(mFiddleTypes, "USHORT",     INT2NUM(TYPE_USHORT));
-
-    /* Document-const: Fiddle::Types::INT
-     *
-     * C type - int
-     */
-    rb_define_const(mFiddleTypes, "INT",       INT2NUM(TYPE_INT));
-
-    /* Document-const: Fiddle::Types::UINT
-     *
-     * C type - unsigned int
-     */
-    rb_define_const(mFiddleTypes, "UINT",       INT2NUM(TYPE_UINT));
-
-    /* Document-const: Fiddle::Types::LONG
-     *
-     * C type - long
-     */
-    rb_define_const(mFiddleTypes, "LONG",      INT2NUM(TYPE_LONG));
-
-    /* Document-const: Fiddle::Types::ULONG
-     *
-     * C type - long
-     */
-    rb_define_const(mFiddleTypes, "ULONG",      INT2NUM(TYPE_ULONG));
-
-#if HAVE_LONG_LONG
-    /* Document-const: Fiddle::Types::LONG_LONG
-     *
-     * C type - long long
-     */
-    rb_define_const(mFiddleTypes, "LONG_LONG", INT2NUM(TYPE_LONG_LONG));
-
-    /* Document-const: Fiddle::Types::ULONG_LONG
-     *
-     * C type - long long
-     */
-    rb_define_const(mFiddleTypes, "ULONG_LONG", INT2NUM(TYPE_ULONG_LONG));
-#endif
-
-#ifdef TYPE_INT8_T
-    /* Document-const: Fiddle::Types::INT8_T
-     *
-     * C type - int8_t
-     */
-    rb_define_const(mFiddleTypes, "INT8_T",    INT2NUM(TYPE_INT8_T));
-
-    /* Document-const: Fiddle::Types::UINT8_T
-     *
-     * C type - uint8_t
-     */
-    rb_define_const(mFiddleTypes, "UINT8_T",    INT2NUM(TYPE_UINT8_T));
-#endif
-
-#ifdef TYPE_INT16_T
-    /* Document-const: Fiddle::Types::INT16_T
-     *
-     * C type - int16_t
-     */
-    rb_define_const(mFiddleTypes, "INT16_T",   INT2NUM(TYPE_INT16_T));
-
-    /* Document-const: Fiddle::Types::UINT16_T
-     *
-     * C type - uint16_t
-     */
-    rb_define_const(mFiddleTypes, "UINT16_T",   INT2NUM(TYPE_UINT16_T));
-#endif
-
-#ifdef TYPE_INT32_T
-    /* Document-const: Fiddle::Types::INT32_T
-     *
-     * C type - int32_t
-     */
-    rb_define_const(mFiddleTypes, "INT32_T",   INT2NUM(TYPE_INT32_T));
-
-    /* Document-const: Fiddle::Types::UINT32_T
-     *
-     * C type - uint32_t
-     */
-    rb_define_const(mFiddleTypes, "UINT32_T",   INT2NUM(TYPE_UINT32_T));
-#endif
-
-#ifdef TYPE_INT64_T
-    /* Document-const: Fiddle::Types::INT64_T
-     *
-     * C type - int64_t
-     */
-    rb_define_const(mFiddleTypes, "INT64_T",   INT2NUM(TYPE_INT64_T));
-
-    /* Document-const: Fiddle::Types::UINT64_T
-     *
-     * C type - uint64_t
-     */
-    rb_define_const(mFiddleTypes, "UINT64_T",   INT2NUM(TYPE_UINT64_T));
-#endif
-
-    /* Document-const: Fiddle::Types::FLOAT
-     *
-     * C type - float
-     */
-    rb_define_const(mFiddleTypes, "FLOAT",     INT2NUM(TYPE_FLOAT));
-
-    /* Document-const: Fiddle::Types::DOUBLE
-     *
-     * C type - double
-     */
-    rb_define_const(mFiddleTypes, "DOUBLE",    INT2NUM(TYPE_DOUBLE));
-
-#ifdef HAVE_FFI_PREP_CIF_VAR
-    /* Document-const: Fiddle::Types::VARIADIC
-     *
-     * C type - ...
-     */
-    rb_define_const(mFiddleTypes, "VARIADIC",  INT2NUM(TYPE_VARIADIC));
-#endif
-
-    /* Document-const: Fiddle::Types::CONST_STRING
-     *
-     * C type - const char* ('\0' terminated const char*)
-     */
-    rb_define_const(mFiddleTypes, "CONST_STRING",  INT2NUM(TYPE_CONST_STRING));
-
-    /* Document-const: Fiddle::Types::SIZE_T
-     *
-     * C type - size_t
-     */
-    rb_define_const(mFiddleTypes, "SIZE_T",   INT2NUM(TYPE_SIZE_T));
-
-    /* Document-const: Fiddle::Types::SSIZE_T
-     *
-     * C type - ssize_t
-     */
-    rb_define_const(mFiddleTypes, "SSIZE_T",   INT2NUM(TYPE_SSIZE_T));
-
-    /* Document-const: Fiddle::Types::PTRDIFF_T
-     *
-     * C type - ptrdiff_t
-     */
-    rb_define_const(mFiddleTypes, "PTRDIFF_T", INT2NUM(TYPE_PTRDIFF_T));
-
-    /* Document-const: Fiddle::Types::INTPTR_T
-     *
-     * C type - intptr_t
-     */
-    rb_define_const(mFiddleTypes, "INTPTR_T",  INT2NUM(TYPE_INTPTR_T));
-
-    /* Document-const: Fiddle::Types::UINTPTR_T
-     *
-     * C type - uintptr_t
-     */
-    rb_define_const(mFiddleTypes, "UINTPTR_T",  INT2NUM(TYPE_UINTPTR_T));
-
-    /* Document-const: Fiddle::Types::BOOL
-     *
-     * C type - bool
-     */
-    rb_define_const(mFiddleTypes, "BOOL" ,      rb_fiddle_type_bool());
-
-    /* Document-const: ALIGN_VOIDP
-     *
-     * The alignment size of a void*
-     */
-    rb_define_const(mFiddle, "ALIGN_VOIDP", INT2NUM(ALIGN_VOIDP));
-
-    /* Document-const: ALIGN_CHAR
-     *
-     * The alignment size of a char
-     */
-    rb_define_const(mFiddle, "ALIGN_CHAR",  INT2NUM(ALIGN_CHAR));
-
-    /* Document-const: ALIGN_SHORT
-     *
-     * The alignment size of a short
-     */
-    rb_define_const(mFiddle, "ALIGN_SHORT", INT2NUM(ALIGN_SHORT));
-
-    /* Document-const: ALIGN_INT
-     *
-     * The alignment size of an int
-     */
-    rb_define_const(mFiddle, "ALIGN_INT",   INT2NUM(ALIGN_INT));
-
-    /* Document-const: ALIGN_LONG
-     *
-     * The alignment size of a long
-     */
-    rb_define_const(mFiddle, "ALIGN_LONG",  INT2NUM(ALIGN_LONG));
-
-#if HAVE_LONG_LONG
-    /* Document-const: ALIGN_LONG_LONG
-     *
-     * The alignment size of a long long
-     */
-    rb_define_const(mFiddle, "ALIGN_LONG_LONG",  INT2NUM(ALIGN_LONG_LONG));
-#endif
-
-    /* Document-const: ALIGN_INT8_T
-     *
-     * The alignment size of a int8_t
-     */
-    rb_define_const(mFiddle, "ALIGN_INT8_T",  INT2NUM(ALIGN_INT8_T));
-
-    /* Document-const: ALIGN_INT16_T
-     *
-     * The alignment size of a int16_t
-     */
-    rb_define_const(mFiddle, "ALIGN_INT16_T", INT2NUM(ALIGN_INT16_T));
-
-    /* Document-const: ALIGN_INT32_T
-     *
-     * The alignment size of a int32_t
-     */
-    rb_define_const(mFiddle, "ALIGN_INT32_T", INT2NUM(ALIGN_INT32_T));
-
-    /* Document-const: ALIGN_INT64_T
-     *
-     * The alignment size of a int64_t
-     */
-    rb_define_const(mFiddle, "ALIGN_INT64_T", INT2NUM(ALIGN_INT64_T));
-
-    /* Document-const: ALIGN_FLOAT
-     *
-     * The alignment size of a float
-     */
-    rb_define_const(mFiddle, "ALIGN_FLOAT", INT2NUM(ALIGN_FLOAT));
-
-    /* Document-const: ALIGN_DOUBLE
-     *
-     * The alignment size of a double
-     */
-    rb_define_const(mFiddle, "ALIGN_DOUBLE",INT2NUM(ALIGN_DOUBLE));
-
-    /* Document-const: ALIGN_SIZE_T
-     *
-     * The alignment size of a size_t
-     */
-    rb_define_const(mFiddle, "ALIGN_SIZE_T", INT2NUM(ALIGN_OF(size_t)));
-
-    /* Document-const: ALIGN_SSIZE_T
-     *
-     * The alignment size of a ssize_t
-     */
-    rb_define_const(mFiddle, "ALIGN_SSIZE_T", INT2NUM(ALIGN_OF(size_t))); /* same as size_t */
-
-    /* Document-const: ALIGN_PTRDIFF_T
-     *
-     * The alignment size of a ptrdiff_t
-     */
-    rb_define_const(mFiddle, "ALIGN_PTRDIFF_T", INT2NUM(ALIGN_OF(ptrdiff_t)));
-
-    /* Document-const: ALIGN_INTPTR_T
-     *
-     * The alignment size of a intptr_t
-     */
-    rb_define_const(mFiddle, "ALIGN_INTPTR_T", INT2NUM(ALIGN_OF(intptr_t)));
-
-    /* Document-const: ALIGN_UINTPTR_T
-     *
-     * The alignment size of a uintptr_t
-     */
-    rb_define_const(mFiddle, "ALIGN_UINTPTR_T", INT2NUM(ALIGN_OF(uintptr_t)));
-
-    /* Document-const: WINDOWS
-     *
-     * Returns a boolean regarding whether the host is WIN32
-     */
-#if defined(_WIN32)
-    rb_define_const(mFiddle, "WINDOWS", Qtrue);
-#else
-    rb_define_const(mFiddle, "WINDOWS", Qfalse);
-#endif
-
-    /* Document-const: SIZEOF_VOIDP
-     *
-     * size of a void*
-     */
-    rb_define_const(mFiddle, "SIZEOF_VOIDP", INT2NUM(sizeof(void*)));
-
-    /* Document-const: SIZEOF_CHAR
-     *
-     * size of a char
-     */
-    rb_define_const(mFiddle, "SIZEOF_CHAR",  INT2NUM(sizeof(char)));
-
-    /* Document-const: SIZEOF_UCHAR
-     *
-     * size of a unsigned char
-     */
-    rb_define_const(mFiddle, "SIZEOF_UCHAR",  INT2NUM(sizeof(unsigned char)));
-
-    /* Document-const: SIZEOF_SHORT
-     *
-     * size of a short
-     */
-    rb_define_const(mFiddle, "SIZEOF_SHORT", INT2NUM(sizeof(short)));
-
-    /* Document-const: SIZEOF_USHORT
-     *
-     * size of a unsigned short
-     */
-    rb_define_const(mFiddle, "SIZEOF_USHORT", INT2NUM(sizeof(unsigned short)));
-
-    /* Document-const: SIZEOF_INT
-     *
-     * size of an int
-     */
-    rb_define_const(mFiddle, "SIZEOF_INT",   INT2NUM(sizeof(int)));
-
-    /* Document-const: SIZEOF_UINT
-     *
-     * size of an unsigned int
-     */
-    rb_define_const(mFiddle, "SIZEOF_UINT",   INT2NUM(sizeof(unsigned int)));
-
-    /* Document-const: SIZEOF_LONG
-     *
-     * size of a long
-     */
-    rb_define_const(mFiddle, "SIZEOF_LONG",  INT2NUM(sizeof(long)));
-
-    /* Document-const: SIZEOF_ULONG
-     *
-     * size of a unsigned long
-     */
-    rb_define_const(mFiddle, "SIZEOF_ULONG",  INT2NUM(sizeof(unsigned long)));
-
-#if HAVE_LONG_LONG
-    /* Document-const: SIZEOF_LONG_LONG
-     *
-     * size of a long long
-     */
-    rb_define_const(mFiddle, "SIZEOF_LONG_LONG",  INT2NUM(sizeof(LONG_LONG)));
-
-    /* Document-const: SIZEOF_ULONG_LONG
-     *
-     * size of a unsigned long long
-     */
-    rb_define_const(mFiddle, "SIZEOF_ULONG_LONG",  INT2NUM(sizeof(unsigned LONG_LONG)));
-#endif
-
-    /* Document-const: SIZEOF_INT8_T
-     *
-     * size of a int8_t
-     */
-    rb_define_const(mFiddle, "SIZEOF_INT8_T",  INT2NUM(sizeof(int8_t)));
-
-    /* Document-const: SIZEOF_UINT8_T
-     *
-     * size of a uint8_t
-     */
-    rb_define_const(mFiddle, "SIZEOF_UINT8_T",  INT2NUM(sizeof(uint8_t)));
-
-    /* Document-const: SIZEOF_INT16_T
-     *
-     * size of a int16_t
-     */
-    rb_define_const(mFiddle, "SIZEOF_INT16_T", INT2NUM(sizeof(int16_t)));
-
-    /* Document-const: SIZEOF_UINT16_T
-     *
-     * size of a uint16_t
-     */
-    rb_define_const(mFiddle, "SIZEOF_UINT16_T", INT2NUM(sizeof(uint16_t)));
-
-    /* Document-const: SIZEOF_INT32_T
-     *
-     * size of a int32_t
-     */
-    rb_define_const(mFiddle, "SIZEOF_INT32_T", INT2NUM(sizeof(int32_t)));
-
-    /* Document-const: SIZEOF_UINT32_T
-     *
-     * size of a uint32_t
-     */
-    rb_define_const(mFiddle, "SIZEOF_UINT32_T", INT2NUM(sizeof(uint32_t)));
-
-    /* Document-const: SIZEOF_INT64_T
-     *
-     * size of a int64_t
-     */
-    rb_define_const(mFiddle, "SIZEOF_INT64_T", INT2NUM(sizeof(int64_t)));
-
-    /* Document-const: SIZEOF_UINT64_T
-     *
-     * size of a uint64_t
-     */
-    rb_define_const(mFiddle, "SIZEOF_UINT64_T", INT2NUM(sizeof(uint64_t)));
-
-    /* Document-const: SIZEOF_FLOAT
-     *
-     * size of a float
-     */
-    rb_define_const(mFiddle, "SIZEOF_FLOAT", INT2NUM(sizeof(float)));
-
-    /* Document-const: SIZEOF_DOUBLE
-     *
-     * size of a double
-     */
-    rb_define_const(mFiddle, "SIZEOF_DOUBLE",INT2NUM(sizeof(double)));
-
-    /* Document-const: SIZEOF_SIZE_T
-     *
-     * size of a size_t
-     */
-    rb_define_const(mFiddle, "SIZEOF_SIZE_T",  INT2NUM(sizeof(size_t)));
-
-    /* Document-const: SIZEOF_SSIZE_T
-     *
-     * size of a ssize_t
-     */
-    rb_define_const(mFiddle, "SIZEOF_SSIZE_T",  INT2NUM(sizeof(size_t))); /* same as size_t */
-
-    /* Document-const: SIZEOF_PTRDIFF_T
-     *
-     * size of a ptrdiff_t
-     */
-    rb_define_const(mFiddle, "SIZEOF_PTRDIFF_T",  INT2NUM(sizeof(ptrdiff_t)));
-
-    /* Document-const: SIZEOF_INTPTR_T
-     *
-     * size of a intptr_t
-     */
-    rb_define_const(mFiddle, "SIZEOF_INTPTR_T",  INT2NUM(sizeof(intptr_t)));
-
-    /* Document-const: SIZEOF_UINTPTR_T
-     *
-     * size of a uintptr_t
-     */
-    rb_define_const(mFiddle, "SIZEOF_UINTPTR_T",  INT2NUM(sizeof(uintptr_t)));
-
-    /* Document-const: SIZEOF_CONST_STRING
-     *
-     * size of a const char*
-     */
-    rb_define_const(mFiddle, "SIZEOF_CONST_STRING", INT2NUM(sizeof(const char*)));
-
-    /* Document-const: SIZEOF_BOOL
-     *
-     * size of a bool
-     */
-    rb_define_const(mFiddle, "SIZEOF_BOOL", INT2NUM(sizeof(bool)));
-
-    /* Document-const: RUBY_FREE
-     *
-     * Address of the ruby_xfree() function
-     */
-    rb_define_const(mFiddle, "RUBY_FREE", PTR2NUM(ruby_xfree));
-
-    /* Document-const: BUILD_RUBY_PLATFORM
-     *
-     * Platform built against (i.e. "x86_64-linux", etc.)
-     *
-     * See also RUBY_PLATFORM
-     */
-    rb_define_const(mFiddle, "BUILD_RUBY_PLATFORM", rb_str_new2(RUBY_PLATFORM));
-
-    rb_define_module_function(mFiddle, "dlwrap", rb_fiddle_value2ptr, 1);
-    rb_define_module_function(mFiddle, "dlunwrap", rb_fiddle_ptr2value, 1);
-    rb_define_module_function(mFiddle, "malloc", rb_fiddle_malloc, 1);
-    rb_define_module_function(mFiddle, "realloc", rb_fiddle_realloc, 2);
-    rb_define_module_function(mFiddle, "free", rb_fiddle_free, 1);
-
-    /* Document-const: Qtrue
-     *
-     * The value of Qtrue
-     */
-    rb_define_const(mFiddle, "Qtrue", INT2NUM(Qtrue));
-
-    /* Document-const: Qfalse
-     *
-     * The value of Qfalse
-     */
-    rb_define_const(mFiddle, "Qfalse", INT2NUM(Qfalse));
-
-    /* Document-const: Qnil
-     *
-     * The value of Qnil
-     */
-    rb_define_const(mFiddle, "Qnil", INT2NUM(Qnil));
-
-    /* Document-const: Qundef
-     *
-     * The value of Qundef
-     */
-    rb_define_const(mFiddle, "Qundef", INT2NUM(Qundef));
-
-    Init_fiddle_function();
-    Init_fiddle_closure();
-    Init_fiddle_handle();
-    Init_fiddle_pointer();
-    Init_fiddle_pinned();
-
-#ifdef HAVE_RUBY_MEMORY_VIEW_H
-    Init_fiddle_memory_view();
-#endif
-}
-/* vim: set noet sws=4 sw=4: */
diff --git a/ext/fiddle/fiddle.gemspec b/ext/fiddle/fiddle.gemspec
deleted file mode 100644
index 878109395bf77c..00000000000000
--- a/ext/fiddle/fiddle.gemspec
+++ /dev/null
@@ -1,59 +0,0 @@
-# frozen_string_literal: true
-
-version_module = Module.new do
-  version_rb = File.join(__dir__, "lib/fiddle/version.rb")
-  module_eval(File.read(version_rb), version_rb, __LINE__)
-end
-
-Gem::Specification.new do |spec|
-  spec.name          = "fiddle"
-  spec.version       = version_module::Fiddle::VERSION
-  spec.authors       = ["Aaron Patterson", "SHIBATA Hiroshi"]
-  spec.email         = ["aaron@tenderlovemaking.com", "hsbt@ruby-lang.org"]
-
-  spec.summary       = %q{A libffi wrapper for Ruby.}
-  spec.description   = %q{A libffi wrapper for Ruby.}
-  spec.homepage      = "https://github.com/ruby/fiddle"
-  spec.licenses      = ["Ruby", "BSD-2-Clause"]
-
-  spec.files         = [
-    "LICENSE.txt",
-    "README.md",
-    "Rakefile",
-    "ext/fiddle/closure.c",
-    "ext/fiddle/closure.h",
-    "ext/fiddle/conversions.c",
-    "ext/fiddle/conversions.h",
-    "ext/fiddle/depend",
-    "ext/fiddle/extconf.rb",
-    "ext/fiddle/fiddle.c",
-    "ext/fiddle/fiddle.h",
-    "ext/fiddle/function.c",
-    "ext/fiddle/function.h",
-    "ext/fiddle/handle.c",
-    "ext/fiddle/memory_view.c",
-    "ext/fiddle/pinned.c",
-    "ext/fiddle/pointer.c",
-    "ext/fiddle/win32/fficonfig.h",
-    "ext/fiddle/win32/libffi-3.2.1-mswin.patch",
-    "ext/fiddle/win32/libffi-config.rb",
-    "ext/fiddle/win32/libffi.mk.tmpl",
-    "fiddle.gemspec",
-    "lib/fiddle.rb",
-    "lib/fiddle/closure.rb",
-    "lib/fiddle/cparser.rb",
-    "lib/fiddle/function.rb",
-    "lib/fiddle/import.rb",
-    "lib/fiddle/pack.rb",
-    "lib/fiddle/struct.rb",
-    "lib/fiddle/types.rb",
-    "lib/fiddle/value.rb",
-    "lib/fiddle/version.rb",
-  ]
-  spec.require_paths = ["lib"]
-  spec.extensions = ["ext/fiddle/extconf.rb"]
-
-  spec.required_ruby_version = ">= 2.5.0"
-
-  spec.metadata["msys2_mingw_dependencies"] = "libffi"
-end
diff --git a/ext/fiddle/fiddle.h b/ext/fiddle/fiddle.h
deleted file mode 100644
index 53db0588079a55..00000000000000
--- a/ext/fiddle/fiddle.h
+++ /dev/null
@@ -1,239 +0,0 @@
-#ifndef FIDDLE_H
-#define FIDDLE_H
-
-#include <ruby.h>
-#include <errno.h>
-
-#if defined(_WIN32)
-#include <windows.h>
-#endif
-
-#ifdef HAVE_SYS_MMAN_H
-#include <sys/mman.h>
-#endif
-
-#if defined(HAVE_LINK_H)
-# include <link.h>
-#endif
-
-#if defined(HAVE_DLFCN_H)
-# include <dlfcn.h>
-# /* some stranger systems may not define all of these */
-#ifndef RTLD_LAZY
-#define RTLD_LAZY 0
-#endif
-#ifndef RTLD_GLOBAL
-#define RTLD_GLOBAL 0
-#endif
-#ifndef RTLD_NOW
-#define RTLD_NOW 0
-#endif
-#else
-# if defined(_WIN32)
-#   include <windows.h>
-#   define dlopen(name,flag) ((void*)LoadLibrary(name))
-#   define dlerror() strerror(rb_w32_map_errno(GetLastError()))
-#   define dlsym(handle,name) ((void*)GetProcAddress((handle),(name)))
-#   define RTLD_LAZY -1
-#   define RTLD_NOW  -1
-#   define RTLD_GLOBAL -1
-# endif
-#endif
-
-#ifdef USE_HEADER_HACKS
-#include <ffi/ffi.h>
-#else
-#include <ffi.h>
-#endif
-
-#undef ffi_type_uchar
-#undef ffi_type_schar
-#undef ffi_type_ushort
-#undef ffi_type_sshort
-#undef ffi_type_uint
-#undef ffi_type_sint
-#undef ffi_type_ulong
-#undef ffi_type_slong
-
-#if CHAR_BIT == 8
-# define ffi_type_uchar ffi_type_uint8
-# define ffi_type_schar ffi_type_sint8
-#else
-# error "CHAR_BIT not supported"
-#endif
-
-#if SIZEOF_SHORT == 2
-# define ffi_type_ushort ffi_type_uint16
-# define ffi_type_sshort ffi_type_sint16
-#elif SIZEOF_SHORT == 4
-# define ffi_type_ushort ffi_type_uint32
-# define ffi_type_sshort ffi_type_sint32
-#else
-# error "short size not supported"
-#endif
-
-#if SIZEOF_INT == 2
-# define ffi_type_uint	ffi_type_uint16
-# define ffi_type_sint	ffi_type_sint16
-#elif SIZEOF_INT == 4
-# define ffi_type_uint	ffi_type_uint32
-# define ffi_type_sint	ffi_type_sint32
-#elif SIZEOF_INT == 8
-# define ffi_type_uint	ffi_type_uint64
-# define ffi_type_sint	ffi_type_sint64
-#else
-# error "int size not supported"
-#endif
-
-#if SIZEOF_LONG == 4
-# define ffi_type_ulong ffi_type_uint32
-# define ffi_type_slong ffi_type_sint32
-#elif SIZEOF_LONG == 8
-# define ffi_type_ulong ffi_type_uint64
-# define ffi_type_slong ffi_type_sint64
-#else
-# error "long size not supported"
-#endif
-
-#if HAVE_LONG_LONG
-# if SIZEOF_LONG_LONG == 8
-#   define ffi_type_slong_long ffi_type_sint64
-#   define ffi_type_ulong_long ffi_type_uint64
-# else
-#  error "long long size not supported"
-# endif
-#endif
-
-#include <closure.h>
-#include <conversions.h>
-#include <function.h>
-
-#define TYPE_VOID  0
-#define TYPE_VOIDP 1
-#define TYPE_CHAR  2
-#define TYPE_UCHAR  -TYPE_CHAR
-#define TYPE_SHORT 3
-#define TYPE_USHORT -TYPE_SHORT
-#define TYPE_INT   4
-#define TYPE_UINT   -TYPE_INT
-#define TYPE_LONG  5
-#define TYPE_ULONG  -TYPE_LONG
-#ifdef HAVE_LONG_LONG
-#define TYPE_LONG_LONG 6
-#define TYPE_ULONG_LONG -TYPE_LONG_LONG
-#endif
-#define TYPE_FLOAT 7
-#define TYPE_DOUBLE 8
-#define TYPE_VARIADIC 9
-#define TYPE_CONST_STRING 10
-
-#define TYPE_INT8_T TYPE_CHAR
-#define TYPE_UINT8_T -TYPE_INT8_T
-
-#if SIZEOF_SHORT == 2
-# define TYPE_INT16_T TYPE_SHORT
-#elif SIZEOF_INT == 2
-# define TYPE_INT16_T TYPE_INT
-#endif
-
-#ifdef TYPE_INT16_T
-# define TYPE_UINT16_T -TYPE_INT16_T
-#endif
-
-#if SIZEOF_SHORT == 4
-# define TYPE_INT32_T TYPE_SHORT
-#elif SIZEOF_INT == 4
-# define TYPE_INT32_T TYPE_INT
-#elif SIZEOF_LONG == 4
-# define TYPE_INT32_T TYPE_LONG
-#endif
-
-#ifdef TYPE_INT32_T
-#define TYPE_UINT32_T -TYPE_INT32_T
-#endif
-
-#if SIZEOF_INT == 8
-# define TYPE_INT64_T TYPE_INT
-#elif SIZEOF_LONG == 8
-# define TYPE_INT64_T TYPE_LONG
-#elif defined(TYPE_LONG_LONG)
-# define TYPE_INT64_T TYPE_LONG_LONG
-#endif
-
-#ifdef TYPE_INT64_T
-#define TYPE_UINT64_T -TYPE_INT64_T
-#endif
-
-#ifndef TYPE_SSIZE_T
-# if SIZEOF_SIZE_T == SIZEOF_INT
-#   define TYPE_SSIZE_T TYPE_INT
-# elif SIZEOF_SIZE_T == SIZEOF_LONG
-#   define TYPE_SSIZE_T TYPE_LONG
-# elif defined HAVE_LONG_LONG && SIZEOF_SIZE_T == SIZEOF_LONG_LONG
-#   define TYPE_SSIZE_T TYPE_LONG_LONG
-# endif
-#endif
-#define TYPE_SIZE_T (-1*SIGNEDNESS_OF_SIZE_T*TYPE_SSIZE_T)
-
-#ifndef TYPE_PTRDIFF_T
-# if SIZEOF_PTRDIFF_T == SIZEOF_INT
-#   define TYPE_PTRDIFF_T TYPE_INT
-# elif SIZEOF_PTRDIFF_T == SIZEOF_LONG
-#   define TYPE_PTRDIFF_T TYPE_LONG
-# elif defined HAVE_LONG_LONG && SIZEOF_PTRDIFF_T == SIZEOF_LONG_LONG
-#   define TYPE_PTRDIFF_T TYPE_LONG_LONG
-# endif
-#endif
-
-#ifndef TYPE_INTPTR_T
-# if SIZEOF_INTPTR_T == SIZEOF_INT
-#   define TYPE_INTPTR_T TYPE_INT
-# elif SIZEOF_INTPTR_T == SIZEOF_LONG
-#   define TYPE_INTPTR_T TYPE_LONG
-# elif defined HAVE_LONG_LONG && SIZEOF_INTPTR_T == SIZEOF_LONG_LONG
-#   define TYPE_INTPTR_T TYPE_LONG_LONG
-# endif
-#endif
-#define TYPE_UINTPTR_T (-TYPE_INTPTR_T)
-
-/* GCC releases before GCC 4.9 had a bug in _Alignof.  See GCC bug 52023
-   <https://gcc.gnu.org/bugzilla/show_bug.cgi?id=52023>.
-   clang versions < 8.0.0 have the same bug.  */
-#if defined(HAVE__ALIGNOF)
-# /* Autoconf detected availability of a sane `_Alignof()`. */
-# define ALIGN_OF(type) RB_GNUC_EXTENSION(_Alignof(type))
-#elif (!defined(__STDC_VERSION__) || __STDC_VERSION__ < 201112 \
-     || (defined(__GNUC__) && __GNUC__ < 4 + (__GNUC_MINOR__ < 9) \
-         && !defined(__clang__)) \
-     || (defined(__clang__) && __clang_major__ < 8))
-# define ALIGN_OF(type) offsetof(struct {char align_c; type align_x;}, align_x)
-#else
-# define ALIGN_OF(type) _Alignof(type)
-#endif
-
-#define ALIGN_VOIDP  ALIGN_OF(void*)
-#define ALIGN_CHAR   ALIGN_OF(char)
-#define ALIGN_SHORT  ALIGN_OF(short)
-#define ALIGN_INT    ALIGN_OF(int)
-#define ALIGN_LONG   ALIGN_OF(long)
-#if HAVE_LONG_LONG
-#define ALIGN_LONG_LONG ALIGN_OF(LONG_LONG)
-#endif
-#define ALIGN_FLOAT  ALIGN_OF(float)
-#define ALIGN_DOUBLE ALIGN_OF(double)
-
-#define ALIGN_INT8_T  ALIGN_OF(int8_t)
-#define ALIGN_INT16_T ALIGN_OF(int16_t)
-#define ALIGN_INT32_T ALIGN_OF(int32_t)
-#define ALIGN_INT64_T ALIGN_OF(int64_t)
-
-extern VALUE mFiddle;
-extern VALUE rb_eFiddleDLError;
-
-VALUE rb_fiddle_new_function(VALUE address, VALUE arg_types, VALUE ret_type);
-
-typedef void (*rb_fiddle_freefunc_t)(void*);
-VALUE rb_fiddle_ptr_new_wrap(void *ptr, long size, rb_fiddle_freefunc_t func, VALUE wrap0, VALUE wrap1);
-
-#endif
-/* vim: set noet sws=4 sw=4: */
diff --git a/ext/fiddle/function.c b/ext/fiddle/function.c
deleted file mode 100644
index 5469e09e371644..00000000000000
--- a/ext/fiddle/function.c
+++ /dev/null
@@ -1,496 +0,0 @@
-#include <fiddle.h>
-#include <ruby/thread.h>
-
-#include <stdbool.h>
-
-#ifdef PRIsVALUE
-# define RB_OBJ_CLASSNAME(obj) rb_obj_class(obj)
-# define RB_OBJ_STRING(obj) (obj)
-#else
-# define PRIsVALUE "s"
-# define RB_OBJ_CLASSNAME(obj) rb_obj_classname(obj)
-# define RB_OBJ_STRING(obj) StringValueCStr(obj)
-#endif
-
-VALUE cFiddleFunction;
-
-#define MAX_ARGS (SIZE_MAX / (sizeof(void *) + sizeof(fiddle_generic)) - 1)
-
-#define Check_Max_Args(name, len) \
-    Check_Max_Args_(name, len, "")
-#define Check_Max_Args_Long(name, len) \
-    Check_Max_Args_(name, len, "l")
-#define Check_Max_Args_(name, len, fmt) \
-    do { \
-        if ((size_t)(len) >= MAX_ARGS) { \
-            rb_raise(rb_eTypeError, \
-                     "%s is so large " \
-                     "that it can cause integer overflow (%"fmt"d)", \
-                     (name), (len)); \
-        } \
-    } while (0)
-
-static void
-deallocate(void *p)
-{
-    ffi_cif *cif = p;
-    if (cif->arg_types) xfree(cif->arg_types);
-    xfree(cif);
-}
-
-static size_t
-function_memsize(const void *p)
-{
-    /* const */ffi_cif *ptr = (ffi_cif *)p;
-    size_t size = 0;
-
-    size += sizeof(*ptr);
-#if !defined(FFI_NO_RAW_API) || !FFI_NO_RAW_API
-    size += ffi_raw_size(ptr);
-#endif
-
-    return size;
-}
-
-const rb_data_type_t function_data_type = {
-    .wrap_struct_name = "fiddle/function",
-    .function = {
-        .dmark = 0,
-        .dfree = deallocate,
-        .dsize = function_memsize
-    },
-    .flags = RUBY_TYPED_FREE_IMMEDIATELY | RUBY_TYPED_WB_PROTECTED,
-};
-
-static VALUE
-allocate(VALUE klass)
-{
-    ffi_cif * cif;
-
-    return TypedData_Make_Struct(klass, ffi_cif, &function_data_type, cif);
-}
-
-VALUE
-rb_fiddle_new_function(VALUE address, VALUE arg_types, VALUE ret_type)
-{
-    VALUE argv[3];
-
-    argv[0] = address;
-    argv[1] = arg_types;
-    argv[2] = ret_type;
-
-    return rb_class_new_instance(3, argv, cFiddleFunction);
-}
-
-static VALUE
-normalize_argument_types(const char *name,
-                         VALUE arg_types,
-                         bool *is_variadic)
-{
-    VALUE normalized_arg_types;
-    int i;
-    int n_arg_types;
-    *is_variadic = false;
-
-    Check_Type(arg_types, T_ARRAY);
-    n_arg_types = RARRAY_LENINT(arg_types);
-    Check_Max_Args(name, n_arg_types);
-
-    normalized_arg_types = rb_ary_new_capa(n_arg_types);
-    for (i = 0; i < n_arg_types; i++) {
-        VALUE arg_type = RARRAY_AREF(arg_types, i);
-        int c_arg_type;
-        arg_type = rb_fiddle_type_ensure(arg_type);
-        c_arg_type = NUM2INT(arg_type);
-        if (c_arg_type == TYPE_VARIADIC) {
-            if (i != n_arg_types - 1) {
-                rb_raise(rb_eArgError,
-                         "Fiddle::TYPE_VARIADIC must be the last argument type: "
-                         "%"PRIsVALUE,
-                         arg_types);
-            }
-            *is_variadic = true;
-            break;
-        }
-        else {
-            (void)INT2FFI_TYPE(c_arg_type); /* raise */
-        }
-        rb_ary_push(normalized_arg_types, INT2FIX(c_arg_type));
-    }
-
-    /* freeze to prevent inconsistency at calling #to_int later */
-    OBJ_FREEZE(normalized_arg_types);
-    return normalized_arg_types;
-}
-
-static VALUE
-initialize(int argc, VALUE argv[], VALUE self)
-{
-    ffi_cif * cif;
-    VALUE ptr, arg_types, ret_type, abi, kwargs;
-    VALUE name = Qnil;
-    VALUE need_gvl = Qfalse;
-    int c_ret_type;
-    bool is_variadic = false;
-    ffi_abi c_ffi_abi;
-    void *cfunc;
-
-    rb_scan_args(argc, argv, "31:", &ptr, &arg_types, &ret_type, &abi, &kwargs);
-    rb_iv_set(self, "@closure", ptr);
-
-    if (!NIL_P(kwargs)) {
-        enum {
-            kw_name,
-            kw_need_gvl,
-            kw_max_,
-        };
-        static ID kw[kw_max_];
-        VALUE args[kw_max_];
-        if (!kw[0]) {
-            kw[kw_name] = rb_intern_const("name");
-            kw[kw_need_gvl] = rb_intern_const("need_gvl");
-        }
-        rb_get_kwargs(kwargs, kw, 0, kw_max_, args);
-        if (args[kw_name] != Qundef) {
-            name = args[kw_name];
-        }
-        if (args[kw_need_gvl] != Qundef) {
-            need_gvl = args[kw_need_gvl];
-        }
-    }
-    rb_iv_set(self, "@name", name);
-    rb_iv_set(self, "@need_gvl", need_gvl);
-
-    ptr = rb_Integer(ptr);
-    cfunc = NUM2PTR(ptr);
-    PTR2NUM(cfunc);
-    c_ffi_abi = NIL_P(abi) ? FFI_DEFAULT_ABI : NUM2INT(abi);
-    abi = INT2FIX(c_ffi_abi);
-    ret_type = rb_fiddle_type_ensure(ret_type);
-    c_ret_type = NUM2INT(ret_type);
-    (void)INT2FFI_TYPE(c_ret_type); /* raise */
-    ret_type = INT2FIX(c_ret_type);
-
-    arg_types = normalize_argument_types("argument types",
-                                         arg_types,
-                                         &is_variadic);
-#ifndef HAVE_FFI_PREP_CIF_VAR
-    if (is_variadic) {
-        rb_raise(rb_eNotImpError,
-                 "ffi_prep_cif_var() is required in libffi "
-                 "for variadic arguments");
-    }
-#endif
-
-    rb_iv_set(self, "@ptr", ptr);
-    rb_iv_set(self, "@argument_types", arg_types);
-    rb_iv_set(self, "@return_type", ret_type);
-    rb_iv_set(self, "@abi", abi);
-    rb_iv_set(self, "@is_variadic", is_variadic ? Qtrue : Qfalse);
-
-    TypedData_Get_Struct(self, ffi_cif, &function_data_type, cif);
-    cif->arg_types = NULL;
-
-    return self;
-}
-
-struct nogvl_ffi_call_args {
-    ffi_cif *cif;
-    void (*fn)(void);
-    void **values;
-    fiddle_generic retval;
-};
-
-static void *
-nogvl_ffi_call(void *ptr)
-{
-    struct nogvl_ffi_call_args *args = ptr;
-
-    ffi_call(args->cif, args->fn, &args->retval, args->values);
-
-    return NULL;
-}
-
-static VALUE
-function_call(int argc, VALUE argv[], VALUE self)
-{
-    struct nogvl_ffi_call_args args = { 0 };
-    fiddle_generic *generic_args;
-    VALUE cfunc;
-    VALUE abi;
-    VALUE arg_types;
-    VALUE cPointer;
-    VALUE is_variadic;
-    VALUE need_gvl;
-    int n_arg_types;
-    int n_fixed_args = 0;
-    int n_call_args = 0;
-    int i;
-    int i_call;
-    VALUE converted_args = Qnil;
-    VALUE alloc_buffer = 0;
-
-    cfunc    = rb_iv_get(self, "@ptr");
-    abi      = rb_iv_get(self, "@abi");
-    arg_types = rb_iv_get(self, "@argument_types");
-    cPointer = rb_const_get(mFiddle, rb_intern("Pointer"));
-    is_variadic = rb_iv_get(self, "@is_variadic");
-    need_gvl = rb_iv_get(self, "@need_gvl");
-
-    n_arg_types = RARRAY_LENINT(arg_types);
-    n_fixed_args = n_arg_types;
-    if (RTEST(is_variadic)) {
-        if (argc < n_arg_types) {
-            rb_error_arity(argc, n_arg_types, UNLIMITED_ARGUMENTS);
-        }
-        if (((argc - n_arg_types) % 2) != 0) {
-            rb_raise(rb_eArgError,
-                     "variadic arguments must be type and value pairs: "
-                     "%"PRIsVALUE,
-                     rb_ary_new_from_values(argc, argv));
-        }
-        n_call_args = n_arg_types + ((argc - n_arg_types) / 2);
-    }
-    else {
-        if (argc != n_arg_types) {
-            rb_error_arity(argc, n_arg_types, n_arg_types);
-        }
-        n_call_args = n_arg_types;
-    }
-    Check_Max_Args("the number of arguments", n_call_args);
-
-    TypedData_Get_Struct(self, ffi_cif, &function_data_type, args.cif);
-
-    if (is_variadic && args.cif->arg_types) {
-        xfree(args.cif->arg_types);
-        args.cif->arg_types = NULL;
-    }
-
-    if (!args.cif->arg_types) {
-        VALUE fixed_arg_types = arg_types;
-        VALUE return_type;
-        int c_return_type;
-        ffi_type *ffi_return_type;
-        ffi_type **ffi_arg_types;
-        ffi_status result;
-
-        arg_types = rb_ary_dup(fixed_arg_types);
-        for (i = n_fixed_args; i < argc; i += 2) {
-          VALUE arg_type = argv[i];
-          int c_arg_type;
-          arg_type = rb_fiddle_type_ensure(arg_type);
-          c_arg_type = NUM2INT(arg_type);
-          (void)INT2FFI_TYPE(c_arg_type); /* raise */
-          rb_ary_push(arg_types, INT2FIX(c_arg_type));
-        }
-
-        return_type = rb_iv_get(self, "@return_type");
-        c_return_type = FIX2INT(return_type);
-        ffi_return_type = INT2FFI_TYPE(c_return_type);
-
-        ffi_arg_types = xcalloc(n_call_args + 1, sizeof(ffi_type *));
-        for (i_call = 0; i_call < n_call_args; i_call++) {
-            VALUE arg_type;
-            int c_arg_type;
-            arg_type = RARRAY_AREF(arg_types, i_call);
-            c_arg_type = FIX2INT(arg_type);
-            ffi_arg_types[i_call] = INT2FFI_TYPE(c_arg_type);
-        }
-        ffi_arg_types[i_call] = NULL;
-
-        if (is_variadic) {
-#ifdef HAVE_FFI_PREP_CIF_VAR
-            result = ffi_prep_cif_var(args.cif,
-                                      FIX2INT(abi),
-                                      n_fixed_args,
-                                      n_call_args,
-                                      ffi_return_type,
-                                      ffi_arg_types);
-#else
-            /* This code is never used because ffi_prep_cif_var()
-             * availability check is done in #initialize. */
-            result = FFI_BAD_TYPEDEF;
-#endif
-        }
-        else {
-            result = ffi_prep_cif(args.cif,
-                                  FIX2INT(abi),
-                                  n_call_args,
-                                  ffi_return_type,
-                                  ffi_arg_types);
-        }
-        if (result != FFI_OK) {
-            xfree(ffi_arg_types);
-            args.cif->arg_types = NULL;
-            rb_raise(rb_eRuntimeError, "error creating CIF %d", result);
-        }
-    }
-
-    generic_args = ALLOCV(alloc_buffer,
-                          sizeof(fiddle_generic) * n_call_args +
-                          sizeof(void *) * (n_call_args + 1));
-    args.values = (void **)((char *)generic_args +
-                            sizeof(fiddle_generic) * n_call_args);
-
-    for (i = 0, i_call = 0;
-         i < argc && i_call < n_call_args;
-         i++, i_call++) {
-        VALUE arg_type;
-        int c_arg_type;
-        VALUE original_src;
-        VALUE src;
-        arg_type = RARRAY_AREF(arg_types, i_call);
-        c_arg_type = FIX2INT(arg_type);
-        if (i >= n_fixed_args) {
-            i++;
-        }
-        src = argv[i];
-
-        if (c_arg_type == TYPE_VOIDP) {
-            if (NIL_P(src)) {
-                src = INT2FIX(0);
-            }
-            else if (cPointer != CLASS_OF(src)) {
-                src = rb_funcall(cPointer, rb_intern("[]"), 1, src);
-                if (NIL_P(converted_args)) {
-                    converted_args = rb_ary_new();
-                }
-                rb_ary_push(converted_args, src);
-            }
-            src = rb_Integer(src);
-        }
-
-        original_src = src;
-        VALUE2GENERIC(c_arg_type, src, &generic_args[i_call]);
-        if (src != original_src) {
-            if (NIL_P(converted_args)) {
-                converted_args = rb_ary_new();
-            }
-            rb_ary_push(converted_args, src);
-        }
-        args.values[i_call] = (void *)&generic_args[i_call];
-    }
-    args.values[i_call] = NULL;
-    args.fn = (void(*)(void))NUM2PTR(cfunc);
-
-    if (RTEST(need_gvl)) {
-        ffi_call(args.cif, args.fn, &(args.retval), args.values);
-    }
-    else {
-        (void)rb_thread_call_without_gvl(nogvl_ffi_call, &args, 0, 0);
-    }
-
-    {
-        int errno_keep = errno;
-#if defined(_WIN32)
-        DWORD error = WSAGetLastError();
-        int socket_error = WSAGetLastError();
-        rb_funcall(mFiddle, rb_intern("win32_last_error="), 1,
-                   ULONG2NUM(error));
-        rb_funcall(mFiddle, rb_intern("win32_last_socket_error="), 1,
-                   INT2NUM(socket_error));
-#endif
-        rb_funcall(mFiddle, rb_intern("last_error="), 1, INT2NUM(errno_keep));
-    }
-
-    ALLOCV_END(alloc_buffer);
-
-    return GENERIC2VALUE(rb_iv_get(self, "@return_type"), args.retval);
-}
-
-void
-Init_fiddle_function(void)
-{
-    /*
-     * Document-class: Fiddle::Function
-     *
-     * == Description
-     *
-     * A representation of a C function
-     *
-     * == Examples
-     *
-     * === 'strcpy'
-     *
-     *   @libc = Fiddle.dlopen "/lib/libc.so.6"
-     *	    #=> #<Fiddle::Handle:0x00000001d7a8d8>
-     *   f = Fiddle::Function.new(
-     *     @libc['strcpy'],
-     *     [Fiddle::TYPE_VOIDP, Fiddle::TYPE_VOIDP],
-     *     Fiddle::TYPE_VOIDP)
-     *	    #=> #<Fiddle::Function:0x00000001d8ee00>
-     *   buff = "000"
-     *	    #=> "000"
-     *   str = f.call(buff, "123")
-     *	    #=> #<Fiddle::Pointer:0x00000001d0c380 ptr=0x000000018a21b8 size=0 free=0x00000000000000>
-     *   str.to_s
-     *   => "123"
-     *
-     * === ABI check
-     *
-     *   @libc = Fiddle.dlopen "/lib/libc.so.6"
-     *	    #=> #<Fiddle::Handle:0x00000001d7a8d8>
-     *   f = Fiddle::Function.new(@libc['strcpy'], [TYPE_VOIDP, TYPE_VOIDP], TYPE_VOIDP)
-     *	    #=> #<Fiddle::Function:0x00000001d8ee00>
-     *   f.abi == Fiddle::Function::DEFAULT
-     *	    #=> true
-     */
-    cFiddleFunction = rb_define_class_under(mFiddle, "Function", rb_cObject);
-
-    /*
-     * Document-const: DEFAULT
-     *
-     * Default ABI
-     *
-     */
-    rb_define_const(cFiddleFunction, "DEFAULT", INT2NUM(FFI_DEFAULT_ABI));
-
-#ifdef HAVE_CONST_FFI_STDCALL
-    /*
-     * Document-const: STDCALL
-     *
-     * FFI implementation of WIN32 stdcall convention
-     *
-     */
-    rb_define_const(cFiddleFunction, "STDCALL", INT2NUM(FFI_STDCALL));
-#endif
-
-    rb_define_alloc_func(cFiddleFunction, allocate);
-
-    /*
-     * Document-method: call
-     *
-     * Calls the constructed Function, with +args+.
-     * Caller must ensure the underlying function is called in a
-     * thread-safe manner if running in a multi-threaded process.
-     *
-     * Note that it is not thread-safe to use this method to
-     * directly or indirectly call many Ruby C-extension APIs unless
-     * you don't pass +need_gvl: true+ to Fiddle::Function#new.
-     *
-     * For an example see Fiddle::Function
-     *
-     */
-    rb_define_method(cFiddleFunction, "call", function_call, -1);
-
-    /*
-     * Document-method: new
-     * call-seq: new(ptr,
-     *               args,
-     *               ret_type,
-     *               abi = DEFAULT,
-     *               name: nil,
-     *               need_gvl: false)
-     *
-     * Constructs a Function object.
-     * * +ptr+ is a referenced function, of a Fiddle::Handle
-     * * +args+ is an Array of arguments, passed to the +ptr+ function
-     * * +ret_type+ is the return type of the function
-     * * +abi+ is the ABI of the function
-     * * +name+ is the name of the function
-     * * +need_gvl+ is whether GVL is needed to call the function
-     *
-     */
-    rb_define_method(cFiddleFunction, "initialize", initialize, -1);
-}
-/* vim: set noet sws=4 sw=4: */
diff --git a/ext/fiddle/function.h b/ext/fiddle/function.h
deleted file mode 100644
index 829e592c8ad37a..00000000000000
--- a/ext/fiddle/function.h
+++ /dev/null
@@ -1,8 +0,0 @@
-#ifndef FIDDLE_FUNCTION_H
-#define FIDDLE_FUNCTION_H
-
-#include <fiddle.h>
-
-void Init_fiddle_function(void);
-
-#endif
diff --git a/ext/fiddle/handle.c b/ext/fiddle/handle.c
deleted file mode 100644
index 8ba416952a3fa2..00000000000000
--- a/ext/fiddle/handle.c
+++ /dev/null
@@ -1,591 +0,0 @@
-#include <ruby.h>
-#include <fiddle.h>
-
-VALUE rb_cHandle;
-
-struct dl_handle {
-    void *ptr;
-    int  open;
-    int  enable_close;
-};
-
-#ifdef _WIN32
-# ifndef _WIN32_WCE
-static void *
-w32_coredll(void)
-{
-    MEMORY_BASIC_INFORMATION m;
-    memset(&m, 0, sizeof(m));
-    if( !VirtualQuery(_errno, &m, sizeof(m)) ) return NULL;
-    return m.AllocationBase;
-}
-# endif
-
-static int
-w32_dlclose(void *ptr)
-{
-# ifndef _WIN32_WCE
-    if( ptr == w32_coredll() ) return 0;
-# endif
-    if( FreeLibrary((HMODULE)ptr) ) return 0;
-    return errno = rb_w32_map_errno(GetLastError());
-}
-#define dlclose(ptr) w32_dlclose(ptr)
-#endif
-
-static void
-fiddle_handle_free(void *ptr)
-{
-    struct dl_handle *fiddle_handle = ptr;
-    if( fiddle_handle->ptr && fiddle_handle->open && fiddle_handle->enable_close ){
-	dlclose(fiddle_handle->ptr);
-    }
-    xfree(ptr);
-}
-
-static size_t
-fiddle_handle_memsize(const void *ptr)
-{
-    return sizeof(struct dl_handle);
-}
-
-static const rb_data_type_t fiddle_handle_data_type = {
-    .wrap_struct_name = "fiddle/handle",
-    .function = {
-        .dmark = 0,
-        .dfree = fiddle_handle_free,
-        .dsize = fiddle_handle_memsize
-    },
-    .flags = RUBY_TYPED_WB_PROTECTED,
-};
-
-/*
- * call-seq: close
- *
- * Close this handle.
- *
- * Calling close more than once will raise a Fiddle::DLError exception.
- */
-static VALUE
-rb_fiddle_handle_close(VALUE self)
-{
-    struct dl_handle *fiddle_handle;
-
-    TypedData_Get_Struct(self, struct dl_handle, &fiddle_handle_data_type, fiddle_handle);
-    if(fiddle_handle->open) {
-	int ret = dlclose(fiddle_handle->ptr);
-	fiddle_handle->open = 0;
-
-	/* Check dlclose for successful return value */
-	if(ret) {
-#if defined(HAVE_DLERROR)
-	    rb_raise(rb_eFiddleDLError, "%s", dlerror());
-#else
-	    rb_raise(rb_eFiddleDLError, "could not close handle");
-#endif
-	}
-	return INT2NUM(ret);
-    }
-    rb_raise(rb_eFiddleDLError, "dlclose() called too many times");
-
-    UNREACHABLE;
-}
-
-static VALUE
-rb_fiddle_handle_s_allocate(VALUE klass)
-{
-    VALUE obj;
-    struct dl_handle *fiddle_handle;
-
-    obj = TypedData_Make_Struct(rb_cHandle, struct dl_handle, &fiddle_handle_data_type, fiddle_handle);
-    fiddle_handle->ptr  = 0;
-    fiddle_handle->open = 0;
-    fiddle_handle->enable_close = 0;
-
-    return obj;
-}
-
-static VALUE
-predefined_fiddle_handle(void *handle)
-{
-    VALUE obj = rb_fiddle_handle_s_allocate(rb_cHandle);
-    struct dl_handle *fiddle_handle = DATA_PTR(obj);
-
-    fiddle_handle->ptr = handle;
-    fiddle_handle->open = 1;
-    OBJ_FREEZE(obj);
-    return obj;
-}
-
-/*
- * call-seq:
- *    new(library = nil, flags = Fiddle::RTLD_LAZY | Fiddle::RTLD_GLOBAL)
- *
- * Create a new handler that opens +library+ with +flags+.
- *
- * If no +library+ is specified or +nil+ is given, DEFAULT is used, which is
- * the equivalent to RTLD_DEFAULT. See <code>man 3 dlopen</code> for more.
- *
- *	lib = Fiddle::Handle.new
- *
- * The default is dependent on OS, and provide a handle for all libraries
- * already loaded. For example, in most cases you can use this to access +libc+
- * functions, or ruby functions like +rb_str_new+.
- */
-static VALUE
-rb_fiddle_handle_initialize(int argc, VALUE argv[], VALUE self)
-{
-    void *ptr;
-    struct dl_handle *fiddle_handle;
-    VALUE lib, flag;
-    char  *clib;
-    int   cflag;
-    const char *err;
-
-    switch( rb_scan_args(argc, argv, "02", &lib, &flag) ){
-      case 0:
-	clib = NULL;
-	cflag = RTLD_LAZY | RTLD_GLOBAL;
-	break;
-      case 1:
-	clib = NIL_P(lib) ? NULL : StringValueCStr(lib);
-	cflag = RTLD_LAZY | RTLD_GLOBAL;
-	break;
-      case 2:
-	clib = NIL_P(lib) ? NULL : StringValueCStr(lib);
-	cflag = NUM2INT(flag);
-	break;
-      default:
-	rb_bug("rb_fiddle_handle_new");
-    }
-
-#if defined(_WIN32)
-    if( !clib ){
-	HANDLE rb_libruby_handle(void);
-	ptr = rb_libruby_handle();
-    }
-    else if( STRCASECMP(clib, "libc") == 0
-# ifdef RUBY_COREDLL
-	     || STRCASECMP(clib, RUBY_COREDLL) == 0
-	     || STRCASECMP(clib, RUBY_COREDLL".dll") == 0
-# endif
-	){
-# ifdef _WIN32_WCE
-	ptr = dlopen("coredll.dll", cflag);
-# else
-	(void)cflag;
-	ptr = w32_coredll();
-# endif
-    }
-    else
-#endif
-	ptr = dlopen(clib, cflag);
-#if defined(HAVE_DLERROR)
-    if( !ptr && (err = dlerror()) ){
-	rb_raise(rb_eFiddleDLError, "%s", err);
-    }
-#else
-    if( !ptr ){
-	err = dlerror();
-	rb_raise(rb_eFiddleDLError, "%s", err);
-    }
-#endif
-    TypedData_Get_Struct(self, struct dl_handle, &fiddle_handle_data_type, fiddle_handle);
-    if( fiddle_handle->ptr && fiddle_handle->open && fiddle_handle->enable_close ){
-	dlclose(fiddle_handle->ptr);
-    }
-    fiddle_handle->ptr = ptr;
-    fiddle_handle->open = 1;
-    fiddle_handle->enable_close = 0;
-
-    if( rb_block_given_p() ){
-	rb_ensure(rb_yield, self, rb_fiddle_handle_close, self);
-    }
-
-    return Qnil;
-}
-
-/*
- * call-seq: enable_close
- *
- * Enable a call to dlclose() when this handle is garbage collected.
- */
-static VALUE
-rb_fiddle_handle_enable_close(VALUE self)
-{
-    struct dl_handle *fiddle_handle;
-
-    TypedData_Get_Struct(self, struct dl_handle, &fiddle_handle_data_type, fiddle_handle);
-    fiddle_handle->enable_close = 1;
-    return Qnil;
-}
-
-/*
- * call-seq: disable_close
- *
- * Disable a call to dlclose() when this handle is garbage collected.
- */
-static VALUE
-rb_fiddle_handle_disable_close(VALUE self)
-{
-    struct dl_handle *fiddle_handle;
-
-    TypedData_Get_Struct(self, struct dl_handle, &fiddle_handle_data_type, fiddle_handle);
-    fiddle_handle->enable_close = 0;
-    return Qnil;
-}
-
-/*
- * call-seq: close_enabled?
- *
- * Returns +true+ if dlclose() will be called when this handle is garbage collected.
- *
- * See man(3) dlclose() for more info.
- */
-static VALUE
-rb_fiddle_handle_close_enabled_p(VALUE self)
-{
-    struct dl_handle *fiddle_handle;
-
-    TypedData_Get_Struct(self, struct dl_handle, &fiddle_handle_data_type, fiddle_handle);
-
-    if(fiddle_handle->enable_close) return Qtrue;
-    return Qfalse;
-}
-
-/*
- * call-seq: to_i
- *
- * Returns the memory address for this handle.
- */
-static VALUE
-rb_fiddle_handle_to_i(VALUE self)
-{
-    struct dl_handle *fiddle_handle;
-
-    TypedData_Get_Struct(self, struct dl_handle, &fiddle_handle_data_type, fiddle_handle);
-    return PTR2NUM(fiddle_handle->ptr);
-}
-
-/*
- * call-seq: to_ptr
- *
- * Returns the Fiddle::Pointer of this handle.
- */
-static VALUE
-rb_fiddle_handle_to_ptr(VALUE self)
-{
-    struct dl_handle *fiddle_handle;
-
-    TypedData_Get_Struct(self, struct dl_handle, &fiddle_handle_data_type, fiddle_handle);
-    return rb_fiddle_ptr_new_wrap(fiddle_handle->ptr, 0, 0, self, 0);
-}
-
-static VALUE fiddle_handle_sym(void *handle, VALUE symbol);
-
-/*
- * Document-method: sym
- *
- * call-seq: sym(name)
- *
- * Get the address as an Integer for the function named +name+.
- */
-static VALUE
-rb_fiddle_handle_sym(VALUE self, VALUE sym)
-{
-    struct dl_handle *fiddle_handle;
-
-    TypedData_Get_Struct(self, struct dl_handle, &fiddle_handle_data_type, fiddle_handle);
-    if( ! fiddle_handle->open ){
-	rb_raise(rb_eFiddleDLError, "closed handle");
-    }
-
-    return fiddle_handle_sym(fiddle_handle->ptr, sym);
-}
-
-#ifndef RTLD_NEXT
-#define RTLD_NEXT NULL
-#endif
-#ifndef RTLD_DEFAULT
-#define RTLD_DEFAULT NULL
-#endif
-
-/*
- * Document-method: sym
- *
- * call-seq: sym(name)
- *
- * Get the address as an Integer for the function named +name+.  The function
- * is searched via dlsym on RTLD_NEXT.
- *
- * See man(3) dlsym() for more info.
- */
-static VALUE
-rb_fiddle_handle_s_sym(VALUE self, VALUE sym)
-{
-    return fiddle_handle_sym(RTLD_NEXT, sym);
-}
-
-typedef void (*fiddle_void_func)(void);
-
-static fiddle_void_func
-fiddle_handle_find_func(void *handle, VALUE symbol)
-{
-#if defined(HAVE_DLERROR)
-    const char *err;
-# define CHECK_DLERROR if ((err = dlerror()) != 0) { func = 0; }
-#else
-# define CHECK_DLERROR
-#endif
-    fiddle_void_func func;
-    const char *name = StringValueCStr(symbol);
-
-#ifdef HAVE_DLERROR
-    dlerror();
-#endif
-    func = (fiddle_void_func)(VALUE)dlsym(handle, name);
-    CHECK_DLERROR;
-#if defined(FUNC_STDCALL)
-    if( !func ){
-	int  i;
-	int  len = (int)strlen(name);
-	char *name_n;
-#if defined(__CYGWIN__) || defined(_WIN32) || defined(__MINGW32__)
-	{
-	    char *name_a = (char*)xmalloc(len+2);
-	    strcpy(name_a, name);
-	    name_n = name_a;
-	    name_a[len]   = 'A';
-	    name_a[len+1] = '\0';
-	    func = dlsym(handle, name_a);
-	    CHECK_DLERROR;
-	    if( func ) goto found;
-	    name_n = xrealloc(name_a, len+6);
-	}
-#else
-	name_n = (char*)xmalloc(len+6);
-#endif
-	memcpy(name_n, name, len);
-	name_n[len++] = '@';
-	for( i = 0; i < 256; i += 4 ){
-	    sprintf(name_n + len, "%d", i);
-	    func = dlsym(handle, name_n);
-	    CHECK_DLERROR;
-	    if( func ) break;
-	}
-	if( func ) goto found;
-	name_n[len-1] = 'A';
-	name_n[len++] = '@';
-	for( i = 0; i < 256; i += 4 ){
-	    sprintf(name_n + len, "%d", i);
-	    func = dlsym(handle, name_n);
-	    CHECK_DLERROR;
-	    if( func ) break;
-	}
-      found:
-	xfree(name_n);
-    }
-#endif
-
-    return func;
-}
-
-static VALUE
-rb_fiddle_handle_s_sym_defined(VALUE self, VALUE sym)
-{
-    fiddle_void_func func;
-
-    func = fiddle_handle_find_func(RTLD_NEXT, sym);
-
-    if( func ) {
-	return PTR2NUM(func);
-    }
-    else {
-	return Qnil;
-    }
-}
-
-static VALUE
-rb_fiddle_handle_sym_defined(VALUE self, VALUE sym)
-{
-    struct dl_handle *fiddle_handle;
-    fiddle_void_func func;
-
-    TypedData_Get_Struct(self, struct dl_handle, &fiddle_handle_data_type, fiddle_handle);
-    if( ! fiddle_handle->open ){
-	rb_raise(rb_eFiddleDLError, "closed handle");
-    }
-
-    func = fiddle_handle_find_func(fiddle_handle->ptr, sym);
-
-    if( func ) {
-	return PTR2NUM(func);
-    }
-    else {
-	return Qnil;
-    }
-}
-
-static VALUE
-fiddle_handle_sym(void *handle, VALUE symbol)
-{
-    fiddle_void_func func;
-
-    func = fiddle_handle_find_func(handle, symbol);
-
-    if( !func ){
-	rb_raise(rb_eFiddleDLError, "unknown symbol \"%"PRIsVALUE"\"", symbol);
-    }
-
-    return PTR2NUM(func);
-}
-
-/*
- * call-seq: file_name
- *
- * Returns the file name of this handle.
- */
-static VALUE
-rb_fiddle_handle_file_name(VALUE self)
-{
-    struct dl_handle *fiddle_handle;
-
-    TypedData_Get_Struct(self, struct dl_handle, &fiddle_handle_data_type, fiddle_handle);
-
-#if defined(HAVE_DLINFO) && defined(HAVE_CONST_RTLD_DI_LINKMAP)
-    {
-	struct link_map *lm = NULL;
-	int res = dlinfo(fiddle_handle->ptr, RTLD_DI_LINKMAP, &lm);
-	if (res == 0 && lm != NULL) {
-	    return rb_str_new_cstr(lm->l_name);
-	}
-	else {
-#if defined(HAVE_DLERROR)
-	    rb_raise(rb_eFiddleDLError, "could not get handle file name: %s", dlerror());
-#else
-	    rb_raise(rb_eFiddleDLError, "could not get handle file name");
-#endif
-	}
-    }
-#elif defined(HAVE_GETMODULEFILENAME)
-    {
-	char filename[MAX_PATH];
-	DWORD res = GetModuleFileName(fiddle_handle->ptr, filename, MAX_PATH);
-	if (res == 0) {
-	    rb_raise(rb_eFiddleDLError, "could not get handle file name: %s", dlerror());
-	}
-	return rb_str_new_cstr(filename);
-    }
-#else
-    (void)fiddle_handle;
-    return Qnil;
-#endif
-}
-
-void
-Init_fiddle_handle(void)
-{
-    /*
-     * Document-class: Fiddle::Handle
-     *
-     * The Fiddle::Handle is the manner to access the dynamic library
-     *
-     * == Example
-     *
-     * === Setup
-     *
-     *   libc_so = "/lib64/libc.so.6"
-     *   => "/lib64/libc.so.6"
-     *   @handle = Fiddle::Handle.new(libc_so)
-     *   => #<Fiddle::Handle:0x00000000d69ef8>
-     *
-     * === Setup, with flags
-     *
-     *   libc_so = "/lib64/libc.so.6"
-     *   => "/lib64/libc.so.6"
-     *   @handle = Fiddle::Handle.new(libc_so, Fiddle::RTLD_LAZY | Fiddle::RTLD_GLOBAL)
-     *   => #<Fiddle::Handle:0x00000000d69ef8>
-     *
-     * See RTLD_LAZY and RTLD_GLOBAL
-     *
-     * === Addresses to symbols
-     *
-     *   strcpy_addr = @handle['strcpy']
-     *   => 140062278451968
-     *
-     * or
-     *
-     *   strcpy_addr = @handle.sym('strcpy')
-     *   => 140062278451968
-     *
-     */
-    rb_cHandle = rb_define_class_under(mFiddle, "Handle", rb_cObject);
-    rb_define_alloc_func(rb_cHandle, rb_fiddle_handle_s_allocate);
-    rb_define_singleton_method(rb_cHandle, "sym", rb_fiddle_handle_s_sym, 1);
-    rb_define_singleton_method(rb_cHandle, "sym_defined?", rb_fiddle_handle_s_sym_defined, 1);
-    rb_define_singleton_method(rb_cHandle, "[]", rb_fiddle_handle_s_sym,  1);
-
-    /* Document-const: NEXT
-     *
-     * A predefined pseudo-handle of RTLD_NEXT
-     *
-     * Which will find the next occurrence of a function in the search order
-     * after the current library.
-     */
-    rb_define_const(rb_cHandle, "NEXT", predefined_fiddle_handle(RTLD_NEXT));
-
-    /* Document-const: DEFAULT
-     *
-     * A predefined pseudo-handle of RTLD_DEFAULT
-     *
-     * Which will find the first occurrence of the desired symbol using the
-     * default library search order
-     */
-    rb_define_const(rb_cHandle, "DEFAULT", predefined_fiddle_handle(RTLD_DEFAULT));
-
-    /* Document-const: RTLD_GLOBAL
-     *
-     * rtld Fiddle::Handle flag.
-     *
-     * The symbols defined by this library will be made available for symbol
-     * resolution of subsequently loaded libraries.
-     */
-    rb_define_const(rb_cHandle, "RTLD_GLOBAL", INT2NUM(RTLD_GLOBAL));
-
-    /* Document-const: RTLD_LAZY
-     *
-     * rtld Fiddle::Handle flag.
-     *
-     * Perform lazy binding.  Only resolve symbols as the code that references
-     * them is executed.  If the  symbol is never referenced, then it is never
-     * resolved.  (Lazy binding is only performed for function references;
-     * references to variables are always immediately bound when the library
-     * is loaded.)
-     */
-    rb_define_const(rb_cHandle, "RTLD_LAZY",   INT2NUM(RTLD_LAZY));
-
-    /* Document-const: RTLD_NOW
-     *
-     * rtld Fiddle::Handle flag.
-     *
-     * If this value is specified or the environment variable LD_BIND_NOW is
-     * set to a nonempty string, all undefined symbols in the library are
-     * resolved before Fiddle.dlopen returns.  If this cannot be done an error
-     * is returned.
-     */
-    rb_define_const(rb_cHandle, "RTLD_NOW",    INT2NUM(RTLD_NOW));
-
-    rb_define_method(rb_cHandle, "initialize", rb_fiddle_handle_initialize, -1);
-    rb_define_method(rb_cHandle, "to_i", rb_fiddle_handle_to_i, 0);
-    rb_define_method(rb_cHandle, "to_ptr", rb_fiddle_handle_to_ptr, 0);
-    rb_define_method(rb_cHandle, "close", rb_fiddle_handle_close, 0);
-    rb_define_method(rb_cHandle, "sym",  rb_fiddle_handle_sym, 1);
-    rb_define_method(rb_cHandle, "[]",  rb_fiddle_handle_sym,  1);
-    rb_define_method(rb_cHandle, "sym_defined?", rb_fiddle_handle_sym_defined, 1);
-    rb_define_method(rb_cHandle, "file_name", rb_fiddle_handle_file_name, 0);
-    rb_define_method(rb_cHandle, "disable_close", rb_fiddle_handle_disable_close, 0);
-    rb_define_method(rb_cHandle, "enable_close", rb_fiddle_handle_enable_close, 0);
-    rb_define_method(rb_cHandle, "close_enabled?", rb_fiddle_handle_close_enabled_p, 0);
-}
-
-/* vim: set noet sws=4 sw=4: */
diff --git a/ext/fiddle/lib/fiddle.rb b/ext/fiddle/lib/fiddle.rb
deleted file mode 100644
index 6137c487c67887..00000000000000
--- a/ext/fiddle/lib/fiddle.rb
+++ /dev/null
@@ -1,103 +0,0 @@
-# frozen_string_literal: true
-
-require 'fiddle.so'
-require 'fiddle/closure'
-require 'fiddle/function'
-require 'fiddle/version'
-
-module Fiddle
-  if WINDOWS
-    # Returns the last win32 +Error+ of the current executing +Thread+ or nil
-    # if none
-    def self.win32_last_error
-      Thread.current[:__FIDDLE_WIN32_LAST_ERROR__]
-    end
-
-    # Sets the last win32 +Error+ of the current executing +Thread+ to +error+
-    def self.win32_last_error= error
-      Thread.current[:__FIDDLE_WIN32_LAST_ERROR__] = error
-    end
-
-    # Returns the last win32 socket +Error+ of the current executing
-    # +Thread+ or nil if none
-    def self.win32_last_socket_error
-      Thread.current[:__FIDDLE_WIN32_LAST_SOCKET_ERROR__]
-    end
-
-    # Sets the last win32 socket +Error+ of the current executing
-    # +Thread+ to +error+
-    def self.win32_last_socket_error= error
-      Thread.current[:__FIDDLE_WIN32_LAST_SOCKET_ERROR__] = error
-    end
-  end
-
-  # Returns the last +Error+ of the current executing +Thread+ or nil if none
-  def self.last_error
-    Thread.current[:__FIDDLE_LAST_ERROR__]
-  end
-
-  # Sets the last +Error+ of the current executing +Thread+ to +error+
-  def self.last_error= error
-    Thread.current[:__DL2_LAST_ERROR__] = error
-    Thread.current[:__FIDDLE_LAST_ERROR__] = error
-  end
-
-  # call-seq: dlopen(library) => Fiddle::Handle
-  #
-  # Creates a new handler that opens +library+, and returns an instance of
-  # Fiddle::Handle.
-  #
-  # If +nil+ is given for the +library+, Fiddle::Handle::DEFAULT is used, which
-  # is the equivalent to RTLD_DEFAULT. See <code>man 3 dlopen</code> for more.
-  #
-  #   lib = Fiddle.dlopen(nil)
-  #
-  # The default is dependent on OS, and provide a handle for all libraries
-  # already loaded. For example, in most cases you can use this to access
-  # +libc+ functions, or ruby functions like +rb_str_new+.
-  #
-  # See Fiddle::Handle.new for more.
-  def dlopen library
-    begin
-      Fiddle::Handle.new(library)
-    rescue DLError => error
-      case RUBY_PLATFORM
-      when /linux/
-        case error.message
-        when /\A(\/.+?): (?:invalid ELF header|file too short)/
-          # This may be a linker script:
-          # https://sourceware.org/binutils/docs/ld.html#Scripts
-          path = $1
-        else
-          raise
-        end
-      else
-        raise
-      end
-
-      File.open(path) do |input|
-        input.each_line do |line|
-          case line
-          when /\A\s*(?:INPUT|GROUP)\s*\(\s*([^\s,\)]+)/
-            # TODO: Should we support multiple files?
-            return dlopen($1)
-          end
-        end
-      end
-
-      # Not found
-      raise
-    end
-  end
-  module_function :dlopen
-
-  # Add constants for backwards compat
-
-  RTLD_GLOBAL = Handle::RTLD_GLOBAL # :nodoc:
-  RTLD_LAZY   = Handle::RTLD_LAZY   # :nodoc:
-  RTLD_NOW    = Handle::RTLD_NOW    # :nodoc:
-
-  Fiddle::Types.constants.each do |type|
-    const_set "TYPE_#{type}", Fiddle::Types.const_get(type)
-  end
-end
diff --git a/ext/fiddle/lib/fiddle/closure.rb b/ext/fiddle/lib/fiddle/closure.rb
deleted file mode 100644
index 7e0077ea5222ec..00000000000000
--- a/ext/fiddle/lib/fiddle/closure.rb
+++ /dev/null
@@ -1,74 +0,0 @@
-# frozen_string_literal: true
-module Fiddle
-  class Closure
-    class << self
-      # Create a new closure. If a block is given, the created closure
-      # is automatically freed after the given block is executed.
-      #
-      # The all given arguments are passed to Fiddle::Closure.new. So
-      # using this method without block equals to Fiddle::Closure.new.
-      #
-      # == Example
-      #
-      #   Fiddle::Closure.create(TYPE_INT, [TYPE_INT]) do |closure|
-      #     # closure is freed automatically when this block is finished.
-      #   end
-      def create(*args)
-        if block_given?
-          closure = new(*args)
-          begin
-            yield(closure)
-          ensure
-            closure.free
-          end
-        else
-          new(*args)
-        end
-      end
-    end
-
-    # the C type of the return of the FFI closure
-    attr_reader :ctype
-
-    # arguments of the FFI closure
-    attr_reader :args
-
-    # Extends Fiddle::Closure to allow for building the closure in a block
-    class BlockCaller < Fiddle::Closure
-
-      # == Description
-      #
-      # Construct a new BlockCaller object.
-      #
-      # * +ctype+ is the C type to be returned
-      # * +args+ are passed the callback
-      # * +abi+ is the abi of the closure
-      #
-      # If there is an error in preparing the +ffi_cif+ or +ffi_prep_closure+,
-      # then a RuntimeError will be raised.
-      #
-      # == Example
-      #
-      #   include Fiddle
-      #
-      #   cb = Closure::BlockCaller.new(TYPE_INT, [TYPE_INT]) do |one|
-      #     one
-      #   end
-      #
-      #   func = Function.new(cb, [TYPE_INT], TYPE_INT)
-      #
-      def initialize ctype, args, abi = Fiddle::Function::DEFAULT, &block
-        super(ctype, args, abi)
-        @block = block
-      end
-
-      # Calls the constructed BlockCaller, with +args+
-      #
-      # For an example see Fiddle::Closure::BlockCaller.new
-      #
-      def call *args
-        @block.call(*args)
-      end
-    end
-  end
-end
diff --git a/ext/fiddle/lib/fiddle/cparser.rb b/ext/fiddle/lib/fiddle/cparser.rb
deleted file mode 100644
index 264ca166dddb7a..00000000000000
--- a/ext/fiddle/lib/fiddle/cparser.rb
+++ /dev/null
@@ -1,278 +0,0 @@
-# frozen_string_literal: true
-module Fiddle
-  # A mixin that provides methods for parsing C struct and prototype signatures.
-  #
-  # == Example
-  #   require 'fiddle/import'
-  #
-  #   include Fiddle::CParser
-  #     #=> Object
-  #
-  #   parse_ctype('int')
-  #     #=> Fiddle::TYPE_INT
-  #
-  #   parse_struct_signature(['int i', 'char c'])
-  #     #=> [[Fiddle::TYPE_INT, Fiddle::TYPE_CHAR], ["i", "c"]]
-  #
-  #   parse_signature('double sum(double, double)')
-  #     #=> ["sum", Fiddle::TYPE_DOUBLE, [Fiddle::TYPE_DOUBLE, Fiddle::TYPE_DOUBLE]]
-  #
-  module CParser
-    # Parses a C struct's members
-    #
-    # Example:
-    #   require 'fiddle/import'
-    #
-    #   include Fiddle::CParser
-    #     #=> Object
-    #
-    #   parse_struct_signature(['int i', 'char c'])
-    #     #=> [[Fiddle::TYPE_INT, Fiddle::TYPE_CHAR], ["i", "c"]]
-    #
-    #   parse_struct_signature(['char buffer[80]'])
-    #     #=> [[[Fiddle::TYPE_CHAR, 80]], ["buffer"]]
-    #
-    def parse_struct_signature(signature, tymap=nil)
-      if signature.is_a?(String)
-        signature = split_arguments(signature, /[,;]/)
-      elsif signature.is_a?(Hash)
-        signature = [signature]
-      end
-      mems = []
-      tys  = []
-      signature.each{|msig|
-        msig = compact(msig) if msig.is_a?(String)
-        case msig
-        when Hash
-          msig.each do |struct_name, struct_signature|
-            struct_name = struct_name.to_s if struct_name.is_a?(Symbol)
-            struct_name = compact(struct_name)
-            struct_count = nil
-            if struct_name =~ /^([\w\*\s]+)\[(\d+)\]$/
-              struct_count = $2.to_i
-              struct_name = $1
-            end
-            if struct_signature.respond_to?(:entity_class)
-              struct_type = struct_signature
-            else
-              parsed_struct = parse_struct_signature(struct_signature, tymap)
-              struct_type = CStructBuilder.create(CStruct, *parsed_struct)
-            end
-            if struct_count
-              ty = [struct_type, struct_count]
-            else
-              ty = struct_type
-            end
-            mems.push([struct_name, struct_type.members])
-            tys.push(ty)
-          end
-        when /^[\w\*\s]+[\*\s](\w+)$/
-          mems.push($1)
-          tys.push(parse_ctype(msig, tymap))
-        when /^[\w\*\s]+\(\*(\w+)\)\(.*?\)$/
-          mems.push($1)
-          tys.push(parse_ctype(msig, tymap))
-        when /^([\w\*\s]+[\*\s])(\w+)\[(\d+)\]$/
-          mems.push($2)
-          tys.push([parse_ctype($1.strip, tymap), $3.to_i])
-        when /^([\w\*\s]+)\[(\d+)\](\w+)$/
-          mems.push($3)
-          tys.push([parse_ctype($1.strip, tymap), $2.to_i])
-        else
-          raise(RuntimeError,"can't parse the struct member: #{msig}")
-        end
-      }
-      return tys, mems
-    end
-
-    # Parses a C prototype signature
-    #
-    # If Hash +tymap+ is provided, the return value and the arguments from the
-    # +signature+ are expected to be keys, and the value will be the C type to
-    # be looked up.
-    #
-    # Example:
-    #   require 'fiddle/import'
-    #
-    #   include Fiddle::CParser
-    #     #=> Object
-    #
-    #   parse_signature('double sum(double, double)')
-    #     #=> ["sum", Fiddle::TYPE_DOUBLE, [Fiddle::TYPE_DOUBLE, Fiddle::TYPE_DOUBLE]]
-    #
-    #   parse_signature('void update(void (*cb)(int code))')
-    #     #=> ["update", Fiddle::TYPE_VOID, [Fiddle::TYPE_VOIDP]]
-    #
-    #   parse_signature('char (*getbuffer(void))[80]')
-    #     #=> ["getbuffer", Fiddle::TYPE_VOIDP, []]
-    #
-    def parse_signature(signature, tymap=nil)
-      tymap ||= {}
-      case compact(signature)
-      when /^(?:[\w\*\s]+)\(\*(\w+)\((.*?)\)\)(?:\[\w*\]|\(.*?\));?$/
-        func, args = $1, $2
-        return [func, TYPE_VOIDP, split_arguments(args).collect {|arg| parse_ctype(arg, tymap)}]
-      when /^([\w\*\s]+[\*\s])(\w+)\((.*?)\);?$/
-        ret, func, args = $1.strip, $2, $3
-        return [func, parse_ctype(ret, tymap), split_arguments(args).collect {|arg| parse_ctype(arg, tymap)}]
-      else
-        raise(RuntimeError,"can't parse the function prototype: #{signature}")
-      end
-    end
-
-    # Given a String of C type +ty+, returns the corresponding Fiddle constant.
-    #
-    # +ty+ can also accept an Array of C type Strings, and will be returned in
-    # a corresponding Array.
-    #
-    # If Hash +tymap+ is provided, +ty+ is expected to be the key, and the
-    # value will be the C type to be looked up.
-    #
-    # Example:
-    #   require 'fiddle/import'
-    #
-    #   include Fiddle::CParser
-    #     #=> Object
-    #
-    #   parse_ctype('int')
-    #     #=> Fiddle::TYPE_INT
-    #
-    #   parse_ctype('double diff')
-    #     #=> Fiddle::TYPE_DOUBLE
-    #
-    #   parse_ctype('unsigned char byte')
-    #     #=> -Fiddle::TYPE_CHAR
-    #
-    #   parse_ctype('const char* const argv[]')
-    #     #=> -Fiddle::TYPE_VOIDP
-    #
-    def parse_ctype(ty, tymap=nil)
-      tymap ||= {}
-      if ty.is_a?(Array)
-        return [parse_ctype(ty[0], tymap), ty[1]]
-      end
-      ty = ty.gsub(/\Aconst\s+/, "")
-      case ty
-      when 'void'
-        return TYPE_VOID
-      when /\A(?:(?:signed\s+)?long\s+long(?:\s+int\s+)?|int64_t)(?:\s+\w+)?\z/
-        unless Fiddle.const_defined?(:TYPE_LONG_LONG)
-          raise(RuntimeError, "unsupported type: #{ty}")
-        end
-        return TYPE_LONG_LONG
-      when /\A(?:unsigned\s+long\s+long(?:\s+int\s+)?|uint64_t)(?:\s+\w+)?\z/
-        unless Fiddle.const_defined?(:TYPE_LONG_LONG)
-          raise(RuntimeError, "unsupported type: #{ty}")
-        end
-        return TYPE_ULONG_LONG
-      when /\Aunsigned\s+long(?:\s+int\s+)?(?:\s+\w+)?\z/,
-           /\Aunsigned\s+int\s+long(?:\s+\w+)?\z/,
-           /\Along(?:\s+int)?\s+unsigned(?:\s+\w+)?\z/,
-           /\Aint\s+unsigned\s+long(?:\s+\w+)?\z/,
-           /\A(?:int\s+)?long\s+unsigned(?:\s+\w+)?\z/
-        return TYPE_ULONG
-      when /\A(?:signed\s+)?long(?:\s+int\s+)?(?:\s+\w+)?\z/,
-           /\A(?:signed\s+)?int\s+long(?:\s+\w+)?\z/,
-           /\Along(?:\s+int)?\s+signed(?:\s+\w+)?\z/
-        return TYPE_LONG
-      when /\Aunsigned\s+short(?:\s+int\s+)?(?:\s+\w+)?\z/,
-           /\Aunsigned\s+int\s+short(?:\s+\w+)?\z/,
-           /\Ashort(?:\s+int)?\s+unsigned(?:\s+\w+)?\z/,
-           /\Aint\s+unsigned\s+short(?:\s+\w+)?\z/,
-           /\A(?:int\s+)?short\s+unsigned(?:\s+\w+)?\z/
-        return TYPE_USHORT
-      when /\A(?:signed\s+)?short(?:\s+int\s+)?(?:\s+\w+)?\z/,
-           /\A(?:signed\s+)?int\s+short(?:\s+\w+)?\z/,
-           /\Aint\s+(?:signed\s+)?short(?:\s+\w+)?\z/
-        return TYPE_SHORT
-      when /\A(?:signed\s+)?int(?:\s+\w+)?\z/
-        return TYPE_INT
-      when /\A(?:unsigned\s+int|uint)(?:\s+\w+)?\z/
-        return TYPE_UINT
-      when /\A(?:signed\s+)?char(?:\s+\w+)?\z/
-        return TYPE_CHAR
-      when /\Aunsigned\s+char(?:\s+\w+)?\z/
-        return  TYPE_UCHAR
-      when /\Aint8_t(?:\s+\w+)?\z/
-        unless Fiddle.const_defined?(:TYPE_INT8_T)
-          raise(RuntimeError, "unsupported type: #{ty}")
-        end
-        return TYPE_INT8_T
-      when /\Auint8_t(?:\s+\w+)?\z/
-        unless Fiddle.const_defined?(:TYPE_INT8_T)
-          raise(RuntimeError, "unsupported type: #{ty}")
-        end
-        return TYPE_UINT8_T
-      when /\Aint16_t(?:\s+\w+)?\z/
-        unless Fiddle.const_defined?(:TYPE_INT16_T)
-          raise(RuntimeError, "unsupported type: #{ty}")
-        end
-        return TYPE_INT16_T
-      when /\Auint16_t(?:\s+\w+)?\z/
-        unless Fiddle.const_defined?(:TYPE_INT16_T)
-          raise(RuntimeError, "unsupported type: #{ty}")
-        end
-        return TYPE_UINT16_T
-      when /\Aint32_t(?:\s+\w+)?\z/
-        unless Fiddle.const_defined?(:TYPE_INT32_T)
-          raise(RuntimeError, "unsupported type: #{ty}")
-        end
-        return TYPE_INT32_T
-      when /\Auint32_t(?:\s+\w+)?\z/
-        unless Fiddle.const_defined?(:TYPE_INT32_T)
-          raise(RuntimeError, "unsupported type: #{ty}")
-        end
-        return TYPE_UINT32_T
-      when /\Aint64_t(?:\s+\w+)?\z/
-        unless Fiddle.const_defined?(:TYPE_INT64_T)
-          raise(RuntimeError, "unsupported type: #{ty}")
-        end
-        return TYPE_INT64_T
-      when /\Auint64_t(?:\s+\w+)?\z/
-        unless Fiddle.const_defined?(:TYPE_INT64_T)
-          raise(RuntimeError, "unsupported type: #{ty}")
-        end
-        return TYPE_UINT64_T
-      when /\Afloat(?:\s+\w+)?\z/
-        return TYPE_FLOAT
-      when /\Adouble(?:\s+\w+)?\z/
-        return TYPE_DOUBLE
-      when /\Asize_t(?:\s+\w+)?\z/
-        return TYPE_SIZE_T
-      when /\Assize_t(?:\s+\w+)?\z/
-        return TYPE_SSIZE_T
-      when /\Aptrdiff_t(?:\s+\w+)?\z/
-        return TYPE_PTRDIFF_T
-      when /\Aintptr_t(?:\s+\w+)?\z/
-        return TYPE_INTPTR_T
-      when /\Auintptr_t(?:\s+\w+)?\z/
-        return TYPE_UINTPTR_T
-      when "bool"
-        return TYPE_BOOL
-      when /\*/, /\[[\s\d]*\]/
-        return TYPE_VOIDP
-      when "..."
-        return TYPE_VARIADIC
-      else
-        ty = ty.split(' ', 2)[0]
-        if( tymap[ty] )
-          return parse_ctype(tymap[ty], tymap)
-        else
-          raise(DLError, "unknown type: #{ty}")
-        end
-      end
-    end
-
-    private
-
-    def split_arguments(arguments, sep=',')
-      return [] if arguments.strip == 'void'
-      arguments.scan(/([\w\*\s]+\(\*\w*\)\(.*?\)|[\w\*\s\[\]]+|\.\.\.)(?:#{sep}\s*|\z)/).collect {|m| m[0]}
-    end
-
-    def compact(signature)
-      signature.gsub(/\s+/, ' ').gsub(/\s*([\(\)\[\]\*,;])\s*/, '\1').strip
-    end
-
-  end
-end
diff --git a/ext/fiddle/lib/fiddle/function.rb b/ext/fiddle/lib/fiddle/function.rb
deleted file mode 100644
index dc2e3e6bf57689..00000000000000
--- a/ext/fiddle/lib/fiddle/function.rb
+++ /dev/null
@@ -1,29 +0,0 @@
-# frozen_string_literal: true
-module Fiddle
-  class Function
-    # The ABI of the Function.
-    attr_reader :abi
-
-    # The address of this function
-    attr_reader :ptr
-
-    # The name of this function
-    attr_reader :name
-
-    # Whether GVL is needed to call this function
-    def need_gvl?
-      @need_gvl
-    end
-
-    # The integer memory location of this function
-    def to_i
-      ptr.to_i
-    end
-
-    # Turn this function in to a proc
-    def to_proc
-      this = self
-      lambda { |*args| this.call(*args) }
-    end
-  end
-end
diff --git a/ext/fiddle/lib/fiddle/import.rb b/ext/fiddle/lib/fiddle/import.rb
deleted file mode 100644
index 09ffcef544c709..00000000000000
--- a/ext/fiddle/lib/fiddle/import.rb
+++ /dev/null
@@ -1,320 +0,0 @@
-# frozen_string_literal: true
-require 'fiddle'
-require 'fiddle/struct'
-require 'fiddle/cparser'
-
-module Fiddle
-
-  # Used internally by Fiddle::Importer
-  class CompositeHandler
-    # Create a new handler with the open +handlers+
-    #
-    # Used internally by Fiddle::Importer.dlload
-    def initialize(handlers)
-      @handlers = handlers
-    end
-
-    # Array of the currently loaded libraries.
-    def handlers()
-      @handlers
-    end
-
-    # Returns the address as an Integer from any handlers with the function
-    # named +symbol+.
-    #
-    # Raises a DLError if the handle is closed.
-    def sym(symbol)
-      @handlers.each{|handle|
-        if( handle )
-          begin
-            addr = handle.sym(symbol)
-            return addr
-          rescue DLError
-          end
-        end
-      }
-      return nil
-    end
-
-    # See Fiddle::CompositeHandler.sym
-    def [](symbol)
-      sym(symbol)
-    end
-  end
-
-  # A DSL that provides the means to dynamically load libraries and build
-  # modules around them including calling extern functions within the C
-  # library that has been loaded.
-  #
-  # == Example
-  #
-  #   require 'fiddle'
-  #   require 'fiddle/import'
-  #
-  #   module LibSum
-  #   	extend Fiddle::Importer
-  #   	dlload './libsum.so'
-  #   	extern 'double sum(double*, int)'
-  #   	extern 'double split(double)'
-  #   end
-  #
-  module Importer
-    include Fiddle
-    include CParser
-    extend Importer
-
-    attr_reader :type_alias
-    private :type_alias
-
-    # Creates an array of handlers for the given +libs+, can be an instance of
-    # Fiddle::Handle, Fiddle::Importer, or will create a new instance of
-    # Fiddle::Handle using Fiddle.dlopen
-    #
-    # Raises a DLError if the library cannot be loaded.
-    #
-    # See Fiddle.dlopen
-    def dlload(*libs)
-      handles = libs.collect{|lib|
-        case lib
-        when nil
-          nil
-        when Handle
-          lib
-        when Importer
-          lib.handlers
-        else
-          Fiddle.dlopen(lib)
-        end
-      }.flatten()
-      @handler = CompositeHandler.new(handles)
-      @func_map = {}
-      @type_alias = {}
-    end
-
-    # Sets the type alias for +alias_type+ as +orig_type+
-    def typealias(alias_type, orig_type)
-      @type_alias[alias_type] = orig_type
-    end
-
-    # Returns the sizeof +ty+, using Fiddle::Importer.parse_ctype to determine
-    # the C type and the appropriate Fiddle constant.
-    def sizeof(ty)
-      case ty
-      when String
-        ty = parse_ctype(ty, type_alias).abs()
-        case ty
-        when TYPE_CHAR
-          return SIZEOF_CHAR
-        when TYPE_SHORT
-          return SIZEOF_SHORT
-        when TYPE_INT
-          return SIZEOF_INT
-        when TYPE_LONG
-          return SIZEOF_LONG
-        when TYPE_FLOAT
-          return SIZEOF_FLOAT
-        when TYPE_DOUBLE
-          return SIZEOF_DOUBLE
-        when TYPE_VOIDP
-          return SIZEOF_VOIDP
-        when TYPE_CONST_STRING
-          return SIZEOF_CONST_STRING
-        else
-          if defined?(TYPE_LONG_LONG) and
-            ty == TYPE_LONG_LONG
-            return SIZEOF_LONG_LONG
-          else
-            raise(DLError, "unknown type: #{ty}")
-          end
-        end
-      when Class
-        if( ty.instance_methods().include?(:to_ptr) )
-          return ty.size()
-        end
-      end
-      return Pointer[ty].size()
-    end
-
-    def parse_bind_options(opts)
-      h = {}
-      while( opt = opts.shift() )
-        case opt
-        when :stdcall, :cdecl
-          h[:call_type] = opt
-        when :carried, :temp, :temporal, :bind
-          h[:callback_type] = opt
-          h[:carrier] = opts.shift()
-        else
-          h[opt] = true
-        end
-      end
-      h
-    end
-    private :parse_bind_options
-
-    # :stopdoc:
-    CALL_TYPE_TO_ABI = Hash.new { |h, k|
-      raise RuntimeError, "unsupported call type: #{k}"
-    }.merge({ :stdcall => Function.const_defined?(:STDCALL) ? Function::STDCALL :
-                          Function::DEFAULT,
-              :cdecl   => Function::DEFAULT,
-              nil      => Function::DEFAULT
-            }).freeze
-    private_constant :CALL_TYPE_TO_ABI
-    # :startdoc:
-
-    # Creates a global method from the given C +signature+.
-    def extern(signature, *opts)
-      symname, ctype, argtype = parse_signature(signature, type_alias)
-      opt = parse_bind_options(opts)
-      f = import_function(symname, ctype, argtype, opt[:call_type])
-      name = symname.gsub(/@.+/,'')
-      @func_map[name] = f
-      # define_method(name){|*args,&block| f.call(*args,&block)}
-      begin
-        /^(.+?):(\d+)/ =~ caller.first
-        file, line = $1, $2.to_i
-      rescue
-        file, line = __FILE__, __LINE__+3
-      end
-      module_eval(<<-EOS, file, line)
-        def #{name}(*args, &block)
-          @func_map['#{name}'].call(*args,&block)
-        end
-      EOS
-      module_function(name)
-      f
-    end
-
-    # Creates a global method from the given C +signature+ using the given
-    # +opts+ as bind parameters with the given block.
-    def bind(signature, *opts, &blk)
-      name, ctype, argtype = parse_signature(signature, type_alias)
-      h = parse_bind_options(opts)
-      case h[:callback_type]
-      when :bind, nil
-        f = bind_function(name, ctype, argtype, h[:call_type], &blk)
-      else
-        raise(RuntimeError, "unknown callback type: #{h[:callback_type]}")
-      end
-      @func_map[name] = f
-      #define_method(name){|*args,&block| f.call(*args,&block)}
-      begin
-        /^(.+?):(\d+)/ =~ caller.first
-        file, line = $1, $2.to_i
-      rescue
-        file, line = __FILE__, __LINE__+3
-      end
-      module_eval(<<-EOS, file, line)
-        def #{name}(*args,&block)
-          @func_map['#{name}'].call(*args,&block)
-        end
-      EOS
-      module_function(name)
-      f
-    end
-
-    # Creates a class to wrap the C struct described by +signature+.
-    #
-    #   MyStruct = struct ['int i', 'char c']
-    def struct(signature)
-      tys, mems = parse_struct_signature(signature, type_alias)
-      Fiddle::CStructBuilder.create(CStruct, tys, mems)
-    end
-
-    # Creates a class to wrap the C union described by +signature+.
-    #
-    #   MyUnion = union ['int i', 'char c']
-    def union(signature)
-      tys, mems = parse_struct_signature(signature, type_alias)
-      Fiddle::CStructBuilder.create(CUnion, tys, mems)
-    end
-
-    # Returns the function mapped to +name+, that was created by either
-    # Fiddle::Importer.extern or Fiddle::Importer.bind
-    def [](name)
-      @func_map[name]
-    end
-
-    # Creates a class to wrap the C struct with the value +ty+
-    #
-    # See also Fiddle::Importer.struct
-    def create_value(ty, val=nil)
-      s = struct([ty + " value"])
-      ptr = s.malloc()
-      if( val )
-        ptr.value = val
-      end
-      return ptr
-    end
-    alias value create_value
-
-    # Returns a new instance of the C struct with the value +ty+ at the +addr+
-    # address.
-    def import_value(ty, addr)
-      s = struct([ty + " value"])
-      ptr = s.new(addr)
-      return ptr
-    end
-
-
-    # The Fiddle::CompositeHandler instance
-    #
-    # Will raise an error if no handlers are open.
-    def handler
-      (@handler ||= nil) or raise "call dlload before importing symbols and functions"
-    end
-
-    # Returns a new Fiddle::Pointer instance at the memory address of the given
-    # +name+ symbol.
-    #
-    # Raises a DLError if the +name+ doesn't exist.
-    #
-    # See Fiddle::CompositeHandler.sym and Fiddle::Handle.sym
-    def import_symbol(name)
-      addr = handler.sym(name)
-      if( !addr )
-        raise(DLError, "cannot find the symbol: #{name}")
-      end
-      Pointer.new(addr)
-    end
-
-    # Returns a new Fiddle::Function instance at the memory address of the given
-    # +name+ function.
-    #
-    # Raises a DLError if the +name+ doesn't exist.
-    #
-    # * +argtype+ is an Array of arguments, passed to the +name+ function.
-    # * +ctype+ is the return type of the function
-    # * +call_type+ is the ABI of the function
-    #
-    # See also Fiddle:Function.new
-    #
-    # See Fiddle::CompositeHandler.sym and Fiddle::Handler.sym
-    def import_function(name, ctype, argtype, call_type = nil)
-      addr = handler.sym(name)
-      if( !addr )
-        raise(DLError, "cannot find the function: #{name}()")
-      end
-      Function.new(addr, argtype, ctype, CALL_TYPE_TO_ABI[call_type],
-                   name: name)
-    end
-
-    # Returns a new closure wrapper for the +name+ function.
-    #
-    # * +ctype+ is the return type of the function
-    # * +argtype+ is an Array of arguments, passed to the callback function
-    # * +call_type+ is the abi of the closure
-    # * +block+ is passed to the callback
-    #
-    # See Fiddle::Closure
-    def bind_function(name, ctype, argtype, call_type = nil, &block)
-      abi = CALL_TYPE_TO_ABI[call_type]
-      closure = Class.new(Fiddle::Closure) {
-        define_method(:call, block)
-      }.new(ctype, argtype, abi)
-
-      Function.new(closure, argtype, ctype, abi, name: name)
-    end
-  end
-end
diff --git a/ext/fiddle/lib/fiddle/pack.rb b/ext/fiddle/lib/fiddle/pack.rb
deleted file mode 100644
index 545b985d503308..00000000000000
--- a/ext/fiddle/lib/fiddle/pack.rb
+++ /dev/null
@@ -1,137 +0,0 @@
-# frozen_string_literal: true
-require 'fiddle'
-
-module Fiddle
-  module PackInfo # :nodoc: all
-    ALIGN_MAP = {
-      TYPE_VOIDP => ALIGN_VOIDP,
-      TYPE_CHAR  => ALIGN_CHAR,
-      TYPE_SHORT => ALIGN_SHORT,
-      TYPE_INT   => ALIGN_INT,
-      TYPE_LONG  => ALIGN_LONG,
-      TYPE_FLOAT => ALIGN_FLOAT,
-      TYPE_DOUBLE => ALIGN_DOUBLE,
-      TYPE_UCHAR  => ALIGN_CHAR,
-      TYPE_USHORT => ALIGN_SHORT,
-      TYPE_UINT   => ALIGN_INT,
-      TYPE_ULONG  => ALIGN_LONG,
-    }
-
-    PACK_MAP = {
-      TYPE_VOIDP => "L!",
-      TYPE_CHAR  => "c",
-      TYPE_SHORT => "s!",
-      TYPE_INT   => "i!",
-      TYPE_LONG  => "l!",
-      TYPE_FLOAT => "f",
-      TYPE_DOUBLE => "d",
-      TYPE_UCHAR  => "C",
-      TYPE_USHORT => "S!",
-      TYPE_UINT   => "I!",
-      TYPE_ULONG  => "L!",
-    }
-
-    SIZE_MAP = {
-      TYPE_VOIDP => SIZEOF_VOIDP,
-      TYPE_CHAR  => SIZEOF_CHAR,
-      TYPE_SHORT => SIZEOF_SHORT,
-      TYPE_INT   => SIZEOF_INT,
-      TYPE_LONG  => SIZEOF_LONG,
-      TYPE_FLOAT => SIZEOF_FLOAT,
-      TYPE_DOUBLE => SIZEOF_DOUBLE,
-      TYPE_UCHAR  => SIZEOF_CHAR,
-      TYPE_USHORT => SIZEOF_SHORT,
-      TYPE_UINT   => SIZEOF_INT,
-      TYPE_ULONG  => SIZEOF_LONG,
-    }
-    if defined?(TYPE_LONG_LONG)
-      ALIGN_MAP[TYPE_LONG_LONG] = ALIGN_MAP[TYPE_ULONG_LONG] = ALIGN_LONG_LONG
-      PACK_MAP[TYPE_LONG_LONG] = "q"
-      PACK_MAP[TYPE_ULONG_LONG] = "Q"
-      SIZE_MAP[TYPE_LONG_LONG] = SIZE_MAP[TYPE_ULONG_LONG] = SIZEOF_LONG_LONG
-      PACK_MAP[TYPE_VOIDP] = "Q" if SIZEOF_LONG_LONG == SIZEOF_VOIDP
-    end
-
-    def align(addr, align)
-      d = addr % align
-      if( d == 0 )
-        addr
-      else
-        addr + (align - d)
-      end
-    end
-    module_function :align
-  end
-
-  class Packer # :nodoc: all
-    include PackInfo
-
-    def self.[](*types)
-      new(types)
-    end
-
-    def initialize(types)
-      parse_types(types)
-    end
-
-    def size()
-      @size
-    end
-
-    def pack(ary)
-      case SIZEOF_VOIDP
-      when SIZEOF_LONG
-        ary.pack(@template)
-      else
-        if defined?(TYPE_LONG_LONG) and
-          SIZEOF_VOIDP == SIZEOF_LONG_LONG
-          ary.pack(@template)
-        else
-          raise(RuntimeError, "sizeof(void*)?")
-        end
-      end
-    end
-
-    def unpack(ary)
-      case SIZEOF_VOIDP
-      when SIZEOF_LONG
-        ary.join().unpack(@template)
-      else
-        if defined?(TYPE_LONG_LONG) and
-          SIZEOF_VOIDP == SIZEOF_LONG_LONG
-          ary.join().unpack(@template)
-        else
-          raise(RuntimeError, "sizeof(void*)?")
-        end
-      end
-    end
-
-    private
-
-    def parse_types(types)
-      @template = "".dup
-      addr     = 0
-      types.each{|t|
-        orig_addr = addr
-        if( t.is_a?(Array) )
-          addr = align(orig_addr, ALIGN_MAP[TYPE_VOIDP])
-        else
-          addr = align(orig_addr, ALIGN_MAP[t])
-        end
-        d = addr - orig_addr
-        if( d > 0 )
-          @template << "x#{d}"
-        end
-        if( t.is_a?(Array) )
-          @template << (PACK_MAP[t[0]] * t[1])
-          addr += (SIZE_MAP[t[0]] * t[1])
-        else
-          @template << PACK_MAP[t]
-          addr += SIZE_MAP[t]
-        end
-      }
-      addr = align(addr, ALIGN_MAP[TYPE_VOIDP])
-      @size = addr
-    end
-  end
-end
diff --git a/ext/fiddle/lib/fiddle/struct.rb b/ext/fiddle/lib/fiddle/struct.rb
deleted file mode 100644
index 6d05bbd7421c24..00000000000000
--- a/ext/fiddle/lib/fiddle/struct.rb
+++ /dev/null
@@ -1,539 +0,0 @@
-# frozen_string_literal: true
-require 'fiddle'
-require 'fiddle/value'
-require 'fiddle/pack'
-
-module Fiddle
-  # A base class for objects representing a C structure
-  class CStruct
-    include Enumerable
-
-    # accessor to Fiddle::CStructEntity
-    def CStruct.entity_class
-      CStructEntity
-    end
-
-    def self.offsetof(name, members, types) # :nodoc:
-      offset = 0
-      worklist = name.split('.')
-      this_type = self
-      while search_name = worklist.shift
-        index = 0
-        member_index = members.index(search_name)
-
-        unless member_index
-          # Possibly a sub-structure
-          member_index = members.index { |member_name, _|
-            member_name == search_name
-          }
-          return unless member_index
-        end
-
-        types.each { |type, count = 1|
-          orig_offset = offset
-          if type.respond_to?(:entity_class)
-            align = type.alignment
-            type_size = type.size
-          else
-            align = PackInfo::ALIGN_MAP[type]
-            type_size = PackInfo::SIZE_MAP[type]
-          end
-
-          # Unions shouldn't advance the offset
-          if this_type.entity_class == CUnionEntity
-            type_size = 0
-          end
-
-          offset = PackInfo.align(orig_offset, align)
-
-          if worklist.empty?
-            return offset if index == member_index
-          else
-            if index == member_index
-              subtype = types[member_index]
-              members = subtype.members
-              types = subtype.types
-              this_type = subtype
-              break
-            end
-          end
-
-          offset += (type_size * count)
-          index += 1
-        }
-      end
-      nil
-    end
-
-    def each
-      return enum_for(__function__) unless block_given?
-
-      self.class.members.each do |name,|
-        yield(self[name])
-      end
-    end
-
-    def each_pair
-      return enum_for(__function__) unless block_given?
-
-      self.class.members.each do |name,|
-        yield(name, self[name])
-      end
-    end
-
-    def to_h
-      hash = {}
-      each_pair do |name, value|
-        hash[name] = unstruct(value)
-      end
-      hash
-    end
-
-    def replace(another)
-      if another.nil?
-        self.class.members.each do |name,|
-          self[name] = nil
-        end
-      elsif another.respond_to?(:each_pair)
-        another.each_pair do |name, value|
-          self[name] = value
-        end
-      else
-        another.each do |name, value|
-          self[name] = value
-        end
-      end
-      self
-    end
-
-    private
-    def unstruct(value)
-      case value
-      when CStruct
-        value.to_h
-      when Array
-        value.collect do |v|
-          unstruct(v)
-        end
-      else
-        value
-      end
-    end
-  end
-
-  # A base class for objects representing a C union
-  class CUnion
-    # accessor to Fiddle::CUnionEntity
-    def CUnion.entity_class
-      CUnionEntity
-    end
-
-    def self.offsetof(name, members, types) # :nodoc:
-      0
-    end
-  end
-
-  # Wrapper for arrays within a struct
-  class StructArray < Array
-    include ValueUtil
-
-    def initialize(ptr, type, initial_values)
-      @ptr = ptr
-      @type = type
-      @is_struct = @type.respond_to?(:entity_class)
-      if @is_struct
-        super(initial_values)
-      else
-        @size = Fiddle::PackInfo::SIZE_MAP[type]
-        @pack_format = Fiddle::PackInfo::PACK_MAP[type]
-        super(initial_values.collect { |v| unsigned_value(v, type) })
-      end
-    end
-
-    def to_ptr
-      @ptr
-    end
-
-    def []=(index, value)
-      if index < 0 || index >= size
-        raise IndexError, 'index %d outside of array bounds 0...%d' % [index, size]
-      end
-
-      if @is_struct
-        self[index].replace(value)
-      else
-        to_ptr[index * @size, @size] = [value].pack(@pack_format)
-        super(index, value)
-      end
-    end
-  end
-
-  # Used to construct C classes (CUnion, CStruct, etc)
-  #
-  # Fiddle::Importer#struct and Fiddle::Importer#union wrap this functionality in an
-  # easy-to-use manner.
-  module CStructBuilder
-    # Construct a new class given a C:
-    # * class +klass+ (CUnion, CStruct, or other that provide an
-    #   #entity_class)
-    # * +types+ (Fiddle::TYPE_INT, Fiddle::TYPE_SIZE_T, etc., see the C types
-    #   constants)
-    # * corresponding +members+
-    #
-    # Fiddle::Importer#struct and Fiddle::Importer#union wrap this functionality in an
-    # easy-to-use manner.
-    #
-    # Examples:
-    #
-    #   require 'fiddle/struct'
-    #   require 'fiddle/cparser'
-    #
-    #   include Fiddle::CParser
-    #
-    #   types, members = parse_struct_signature(['int i','char c'])
-    #
-    #   MyStruct = Fiddle::CStructBuilder.create(Fiddle::CUnion, types, members)
-    #
-    #   MyStruct.malloc(Fiddle::RUBY_FREE) do |obj|
-    #     ...
-    #   end
-    #
-    #   obj = MyStruct.malloc(Fiddle::RUBY_FREE)
-    #   begin
-    #     ...
-    #   ensure
-    #     obj.call_free
-    #   end
-    #
-    #   obj = MyStruct.malloc
-    #   begin
-    #     ...
-    #   ensure
-    #     Fiddle.free obj.to_ptr
-    #   end
-    #
-    def create(klass, types, members)
-      new_class = Class.new(klass){
-        define_method(:initialize){|addr, func = nil|
-          if addr.is_a?(self.class.entity_class)
-            @entity = addr
-          else
-            @entity = self.class.entity_class.new(addr, types, func)
-          end
-          @entity.assign_names(members)
-        }
-        define_method(:[]) { |*args| @entity.send(:[], *args) }
-        define_method(:[]=) { |*args| @entity.send(:[]=, *args) }
-        define_method(:to_ptr){ @entity }
-        define_method(:to_i){ @entity.to_i }
-        define_singleton_method(:types) { types }
-        define_singleton_method(:members) { members }
-
-        # Return the offset of a struct member given its name.
-        # For example:
-        #
-        #     MyStruct = struct [
-        #       "int64_t i",
-        #       "char c",
-        #     ]
-        #
-        #     MyStruct.offsetof("i") # => 0
-        #     MyStruct.offsetof("c") # => 8
-        #
-        define_singleton_method(:offsetof) { |name|
-          klass.offsetof(name, members, types)
-        }
-        members.each{|name|
-          name = name[0] if name.is_a?(Array) # name is a nested struct
-          next if method_defined?(name)
-          define_method(name){ @entity[name] }
-          define_method(name + "="){|val| @entity[name] = val }
-        }
-        entity_class = klass.entity_class
-        alignment = entity_class.alignment(types)
-        size = entity_class.size(types)
-        define_singleton_method(:alignment) { alignment }
-        define_singleton_method(:size) { size }
-        define_singleton_method(:malloc) do |func=nil, &block|
-          if block
-            entity_class.malloc(types, func, size) do |entity|
-              block.call(new(entity))
-            end
-          else
-            new(entity_class.malloc(types, func, size))
-          end
-        end
-      }
-      return new_class
-    end
-    module_function :create
-  end
-
-  # A pointer to a C structure
-  class CStructEntity < Fiddle::Pointer
-    include PackInfo
-    include ValueUtil
-
-    def CStructEntity.alignment(types)
-      max = 1
-      types.each do |type, count = 1|
-        if type.respond_to?(:entity_class)
-          n = type.alignment
-        else
-          n = ALIGN_MAP[type]
-        end
-        max = n if n > max
-      end
-      max
-    end
-
-    # Allocates a C struct with the +types+ provided.
-    #
-    # See Fiddle::Pointer.malloc for memory management issues.
-    def CStructEntity.malloc(types, func = nil, size = size(types), &block)
-      if block_given?
-        super(size, func) do |struct|
-          struct.set_ctypes types
-          yield struct
-        end
-      else
-        struct = super(size, func)
-        struct.set_ctypes types
-        struct
-      end
-    end
-
-    # Returns the offset for the packed sizes for the given +types+.
-    #
-    #   Fiddle::CStructEntity.size(
-    #     [ Fiddle::TYPE_DOUBLE,
-    #       Fiddle::TYPE_INT,
-    #       Fiddle::TYPE_CHAR,
-    #       Fiddle::TYPE_VOIDP ]) #=> 24
-    def CStructEntity.size(types)
-      offset = 0
-
-      max_align = types.map { |type, count = 1|
-        last_offset = offset
-
-        if type.respond_to?(:entity_class)
-          align = type.alignment
-          type_size = type.size
-        else
-          align = PackInfo::ALIGN_MAP[type]
-          type_size = PackInfo::SIZE_MAP[type]
-        end
-        offset = PackInfo.align(last_offset, align) +
-                 (type_size * count)
-
-        align
-      }.max
-
-      PackInfo.align(offset, max_align)
-    end
-
-    # Wraps the C pointer +addr+ as a C struct with the given +types+.
-    #
-    # When the instance is garbage collected, the C function +func+ is called.
-    #
-    # See also Fiddle::Pointer.new
-    def initialize(addr, types, func = nil)
-      if func && addr.is_a?(Pointer) && addr.free
-        raise ArgumentError, 'free function specified on both underlying struct Pointer and when creating a CStructEntity - who do you want to free this?'
-      end
-      set_ctypes(types)
-      super(addr, @size, func)
-    end
-
-    # Set the names of the +members+ in this C struct
-    def assign_names(members)
-      @members = []
-      @nested_structs = {}
-      members.each_with_index do |member, index|
-        if member.is_a?(Array) # nested struct
-          member_name = member[0]
-          struct_type, struct_count = @ctypes[index]
-          if struct_count.nil?
-            struct = struct_type.new(to_i + @offset[index])
-          else
-            structs = struct_count.times.map do |i|
-              struct_type.new(to_i + @offset[index] + i * struct_type.size)
-            end
-            struct = StructArray.new(to_i + @offset[index],
-                                     struct_type,
-                                     structs)
-          end
-          @nested_structs[member_name] = struct
-        else
-          member_name = member
-        end
-        @members << member_name
-      end
-    end
-
-    # Calculates the offsets and sizes for the given +types+ in the struct.
-    def set_ctypes(types)
-      @ctypes = types
-      @offset = []
-      offset = 0
-
-      max_align = types.map { |type, count = 1|
-        orig_offset = offset
-        if type.respond_to?(:entity_class)
-          align = type.alignment
-          type_size = type.size
-        else
-          align = ALIGN_MAP[type]
-          type_size = SIZE_MAP[type]
-        end
-        offset = PackInfo.align(orig_offset, align)
-
-        @offset << offset
-
-        offset += (type_size * count)
-
-        align
-      }.max
-
-      @size = PackInfo.align(offset, max_align)
-    end
-
-    # Fetch struct member +name+ if only one argument is specified. If two
-    # arguments are specified, the first is an offset and the second is a
-    # length and this method returns the string of +length+ bytes beginning at
-    # +offset+.
-    #
-    # Examples:
-    #
-    #     my_struct = struct(['int id']).malloc
-    #     my_struct.id = 1
-    #     my_struct['id'] # => 1
-    #     my_struct[0, 4] # => "\x01\x00\x00\x00".b
-    #
-    def [](*args)
-      return super(*args) if args.size > 1
-      name = args[0]
-      idx = @members.index(name)
-      if( idx.nil? )
-        raise(ArgumentError, "no such member: #{name}")
-      end
-      ty = @ctypes[idx]
-      if( ty.is_a?(Array) )
-        if ty.first.respond_to?(:entity_class)
-          return @nested_structs[name]
-        else
-          r = super(@offset[idx], SIZE_MAP[ty[0]] * ty[1])
-        end
-      elsif ty.respond_to?(:entity_class)
-        return @nested_structs[name]
-      else
-        r = super(@offset[idx], SIZE_MAP[ty.abs])
-      end
-      packer = Packer.new([ty])
-      val = packer.unpack([r])
-      case ty
-      when Array
-        case ty[0]
-        when TYPE_VOIDP
-          val = val.collect{|v| Pointer.new(v)}
-        end
-      when TYPE_VOIDP
-        val = Pointer.new(val[0])
-      else
-        val = val[0]
-      end
-      if( ty.is_a?(Integer) && (ty < 0) )
-        return unsigned_value(val, ty)
-      elsif( ty.is_a?(Array) && (ty[0] < 0) )
-        return StructArray.new(self + @offset[idx], ty[0], val)
-      else
-        return val
-      end
-    end
-
-    # Set struct member +name+, to value +val+. If more arguments are
-    # specified, writes the string of bytes to the memory at the given
-    # +offset+ and +length+.
-    #
-    # Examples:
-    #
-    #     my_struct = struct(['int id']).malloc
-    #     my_struct['id'] = 1
-    #     my_struct[0, 4] = "\x01\x00\x00\x00".b
-    #     my_struct.id # => 1
-    #
-    def []=(*args)
-      return super(*args) if args.size > 2
-      name, val = *args
-      name = name.to_s if name.is_a?(Symbol)
-      nested_struct = @nested_structs[name]
-      if nested_struct
-        if nested_struct.is_a?(StructArray)
-          if val.nil?
-            nested_struct.each do |s|
-              s.replace(nil)
-            end
-          else
-            val.each_with_index do |v, i|
-              nested_struct[i] = v
-            end
-          end
-        else
-          nested_struct.replace(val)
-        end
-        return val
-      end
-      idx = @members.index(name)
-      if( idx.nil? )
-        raise(ArgumentError, "no such member: #{name}")
-      end
-      ty  = @ctypes[idx]
-      packer = Packer.new([ty])
-      val = wrap_arg(val, ty, [])
-      buff = packer.pack([val].flatten())
-      super(@offset[idx], buff.size, buff)
-      if( ty.is_a?(Integer) && (ty < 0) )
-        return unsigned_value(val, ty)
-      elsif( ty.is_a?(Array) && (ty[0] < 0) )
-        return val.collect{|v| unsigned_value(v,ty[0])}
-      else
-        return val
-      end
-    end
-
-    undef_method :size=
-    def to_s() # :nodoc:
-      super(@size)
-    end
-  end
-
-  # A pointer to a C union
-  class CUnionEntity < CStructEntity
-    include PackInfo
-
-    # Returns the size needed for the union with the given +types+.
-    #
-    #   Fiddle::CUnionEntity.size(
-    #     [ Fiddle::TYPE_DOUBLE,
-    #       Fiddle::TYPE_INT,
-    #       Fiddle::TYPE_CHAR,
-    #       Fiddle::TYPE_VOIDP ]) #=> 8
-    def CUnionEntity.size(types)
-      types.map { |type, count = 1|
-        if type.respond_to?(:entity_class)
-          type.size * count
-        else
-          PackInfo::SIZE_MAP[type] * count
-        end
-      }.max
-    end
-
-    # Calculate the necessary offset and for each union member with the given
-    # +types+
-    def set_ctypes(types)
-      @ctypes = types
-      @offset = Array.new(types.length, 0)
-      @size   = self.class.size types
-    end
-  end
-end
diff --git a/ext/fiddle/lib/fiddle/types.rb b/ext/fiddle/lib/fiddle/types.rb
deleted file mode 100644
index 7baf31ec9ecb61..00000000000000
--- a/ext/fiddle/lib/fiddle/types.rb
+++ /dev/null
@@ -1,73 +0,0 @@
-# frozen_string_literal: true
-module Fiddle
-  # Adds Windows type aliases to the including class for use with
-  # Fiddle::Importer.
-  #
-  # The aliases added are:
-  # * ATOM
-  # * BOOL
-  # * BYTE
-  # * DWORD
-  # * DWORD32
-  # * DWORD64
-  # * HANDLE
-  # * HDC
-  # * HINSTANCE
-  # * HWND
-  # * LPCSTR
-  # * LPSTR
-  # * PBYTE
-  # * PDWORD
-  # * PHANDLE
-  # * PVOID
-  # * PWORD
-  # * UCHAR
-  # * UINT
-  # * ULONG
-  # * WORD
-  module Win32Types
-    def included(m) # :nodoc:
-      # https://docs.microsoft.com/en-us/windows/win32/winprog/windows-data-types
-      m.module_eval{
-        typealias "ATOM", "WORD"
-        typealias "BOOL", "int"
-        typealias "BYTE", "unsigned char"
-        typealias "DWORD", "unsigned long"
-        typealias "DWORD32", "uint32_t"
-        typealias "DWORD64", "uint64_t"
-        typealias "HANDLE", "PVOID"
-        typealias "HDC", "HANDLE"
-        typealias "HINSTANCE", "HANDLE"
-        typealias "HWND", "HANDLE"
-        typealias "LPCSTR", "const char *"
-        typealias "LPSTR", "char *"
-        typealias "PBYTE", "BYTE *"
-        typealias "PDWORD", "DWORD *"
-        typealias "PHANDLE", "HANDLE *"
-        typealias "PVOID", "void *"
-        typealias "PWORD", "WORD *"
-        typealias "UCHAR", "unsigned char"
-        typealias "UINT", "unsigned int"
-        typealias "ULONG", "unsigned long"
-        typealias "WORD", "unsigned short"
-      }
-    end
-    module_function :included
-  end
-
-  # Adds basic type aliases to the including class for use with Fiddle::Importer.
-  #
-  # The aliases added are +uint+ and +u_int+ (<tt>unsigned int</tt>) and
-  # +ulong+ and +u_long+ (<tt>unsigned long</tt>)
-  module BasicTypes
-    def included(m) # :nodoc:
-      m.module_eval{
-        typealias "uint", "unsigned int"
-        typealias "u_int", "unsigned int"
-        typealias "ulong", "unsigned long"
-        typealias "u_long", "unsigned long"
-      }
-    end
-    module_function :included
-  end
-end
diff --git a/ext/fiddle/lib/fiddle/value.rb b/ext/fiddle/lib/fiddle/value.rb
deleted file mode 100644
index 5f0b2e951e7a76..00000000000000
--- a/ext/fiddle/lib/fiddle/value.rb
+++ /dev/null
@@ -1,120 +0,0 @@
-# frozen_string_literal: true
-require 'fiddle'
-
-module Fiddle
-  module ValueUtil #:nodoc: all
-    def unsigned_value(val, ty)
-      case ty.abs
-      when TYPE_CHAR
-        [val].pack("c").unpack1("C")
-      when TYPE_SHORT
-        [val].pack("s!").unpack1("S!")
-      when TYPE_INT
-        [val].pack("i!").unpack1("I!")
-      when TYPE_LONG
-        [val].pack("l!").unpack1("L!")
-      else
-        if defined?(TYPE_LONG_LONG) and
-          ty.abs == TYPE_LONG_LONG
-          [val].pack("q").unpack1("Q")
-        else
-          val
-        end
-      end
-    end
-
-    def signed_value(val, ty)
-      case ty.abs
-      when TYPE_CHAR
-        [val].pack("C").unpack1("c")
-      when TYPE_SHORT
-        [val].pack("S!").unpack1("s!")
-      when TYPE_INT
-        [val].pack("I!").unpack1("i!")
-      when TYPE_LONG
-        [val].pack("L!").unpack1("l!")
-      else
-        if defined?(TYPE_LONG_LONG) and
-          ty.abs == TYPE_LONG_LONG
-          [val].pack("Q").unpack1("q")
-        else
-          val
-        end
-      end
-    end
-
-    def wrap_args(args, tys, funcs, &block)
-      result = []
-      tys ||= []
-      args.each_with_index{|arg, idx|
-        result.push(wrap_arg(arg, tys[idx], funcs, &block))
-      }
-      result
-    end
-
-    def wrap_arg(arg, ty, funcs = [], &block)
-      funcs ||= []
-      case arg
-      when nil
-        return 0
-      when Pointer
-        return arg.to_i
-      when IO
-        case ty
-        when TYPE_VOIDP
-          return Pointer[arg].to_i
-        else
-          return arg.to_i
-        end
-      when Function
-        if( block )
-          arg.bind_at_call(&block)
-          funcs.push(arg)
-        elsif !arg.bound?
-          raise(RuntimeError, "block must be given.")
-        end
-        return arg.to_i
-      when String
-        if( ty.is_a?(Array) )
-          return arg.unpack('C*')
-        else
-          case SIZEOF_VOIDP
-          when SIZEOF_LONG
-            return [arg].pack("p").unpack1("l!")
-          else
-            if defined?(SIZEOF_LONG_LONG) and
-              SIZEOF_VOIDP == SIZEOF_LONG_LONG
-              return [arg].pack("p").unpack1("q")
-            else
-              raise(RuntimeError, "sizeof(void*)?")
-            end
-          end
-        end
-      when Float, Integer
-        return arg
-      when Array
-        if( ty.is_a?(Array) ) # used only by struct
-          case ty[0]
-          when TYPE_VOIDP
-            return arg.collect{|v| Integer(v)}
-          when TYPE_CHAR
-            if( arg.is_a?(String) )
-              return val.unpack('C*')
-            end
-          end
-        end
-        return arg
-      else
-        if( arg.respond_to?(:to_ptr) )
-          return arg.to_ptr.to_i
-        else
-          begin
-            return Integer(arg)
-          rescue
-            raise(ArgumentError, "unknown argument type: #{arg.class}")
-          end
-        end
-      end
-    end
-  end
-end
diff --git a/ext/fiddle/lib/fiddle/version.rb b/ext/fiddle/lib/fiddle/version.rb
deleted file mode 100644
index 706d98a7b5a7b0..00000000000000
--- a/ext/fiddle/lib/fiddle/version.rb
+++ /dev/null
@@ -1,3 +0,0 @@
-module Fiddle
-  VERSION = "1.1.2"
-end
diff --git a/ext/fiddle/memory_view.c b/ext/fiddle/memory_view.c
deleted file mode 100644
index fa66fc2c7b26d1..00000000000000
--- a/ext/fiddle/memory_view.c
+++ /dev/null
@@ -1,321 +0,0 @@
-#include <fiddle.h>
-
-#ifdef HAVE_RUBY_MEMORY_VIEW_H
-
-#include <stdbool.h>
-#include <ruby/ruby.h>
-#include <ruby/encoding.h>
-#include <ruby/memory_view.h>
-
-#if SIZEOF_INTPTR_T == SIZEOF_LONG_LONG
-#   define INTPTR2NUM LL2NUM
-#   define UINTPTR2NUM ULL2NUM
-#elif SIZEOF_INTPTR_T == SIZEOF_LONG
-#   define INTPTR2NUM LONG2NUM
-#   define UINTPTR2NUM ULONG2NUM
-#else
-#   define INTPTR2NUM INT2NUM
-#   define UINTPTR2NUM UINT2NUM
-#endif
-
-VALUE rb_cMemoryView = Qnil;
-
-struct memview_data {
-    rb_memory_view_t view;
-    rb_memory_view_item_component_t *members;
-    size_t n_members;
-};
-
-static void
-fiddle_memview_mark(void *ptr)
-{
-    const struct memview_data *data = ptr;
-    rb_gc_mark(data->view.obj);
-}
-
-static void
-fiddle_memview_release(struct memview_data *data)
-{
-    if (NIL_P(data->view.obj)) return;
-
-    rb_memory_view_release(&data->view);
-    data->view.obj = Qnil;
-    data->view.byte_size = 0;
-    if (data->members) {
-        xfree(data->members);
-        data->members = NULL;
-        data->n_members = 0;
-    }
-}
-
-static void
-fiddle_memview_free(void *ptr)
-{
-    struct memview_data *data = ptr;
-    fiddle_memview_release(data);
-    xfree(ptr);
-}
-
-static size_t
-fiddle_memview_memsize(const void *ptr)
-{
-    const struct memview_data *data = ptr;
-    return sizeof(*data) + sizeof(rb_memory_view_item_component_t)*data->n_members + (size_t)data->view.byte_size;
-}
-
-static const rb_data_type_t fiddle_memview_data_type = {
-    "fiddle/memory_view",
-    {fiddle_memview_mark, fiddle_memview_free, fiddle_memview_memsize,},
-};
-
-static VALUE
-rb_fiddle_memview_s_allocate(VALUE klass)
-{
-    struct memview_data *data;
-    VALUE obj = TypedData_Make_Struct(klass, struct memview_data, &fiddle_memview_data_type, data);
-    data->view.obj = Qnil;
-    data->view.byte_size = 0;
-    data->members = NULL;
-    data->n_members = 0;
-    return obj;
-}
-
-static VALUE
-rb_fiddle_memview_release(VALUE obj)
-{
-    struct memview_data *data;
-    TypedData_Get_Struct(obj, struct memview_data, &fiddle_memview_data_type, data);
-
-    if (NIL_P(data->view.obj)) return Qnil;
-    fiddle_memview_release(data);
-    return Qnil;
-}
-
-static VALUE
-rb_fiddle_memview_s_export(VALUE klass, VALUE target)
-{
-    ID id_new;
-    CONST_ID(id_new, "new");
-    VALUE memview = rb_funcall(klass, id_new, 1, target);
-    return rb_ensure(rb_yield, memview, rb_fiddle_memview_release, memview);
-}
-
-static VALUE
-rb_fiddle_memview_initialize(VALUE obj, VALUE target)
-{
-    struct memview_data *data;
-    TypedData_Get_Struct(obj, struct memview_data, &fiddle_memview_data_type, data);
-
-    if (!rb_memory_view_get(target, &data->view, 0)) {
-        data->view.obj = Qnil;
-        rb_raise(rb_eArgError, "Unable to get a memory view from %+"PRIsVALUE, target);
-    }
-
-    return Qnil;
-}
-
-static VALUE
-rb_fiddle_memview_get_obj(VALUE obj)
-{
-    struct memview_data *data;
-    TypedData_Get_Struct(obj, struct memview_data, &fiddle_memview_data_type, data);
-
-    return data->view.obj;
-}
-
-static VALUE
-rb_fiddle_memview_get_byte_size(VALUE obj)
-{
-    struct memview_data *data;
-    TypedData_Get_Struct(obj, struct memview_data, &fiddle_memview_data_type, data);
-
-    if (NIL_P(data->view.obj)) return Qnil;
-    return SSIZET2NUM(data->view.byte_size);
-}
-
-static VALUE
-rb_fiddle_memview_get_readonly(VALUE obj)
-{
-    struct memview_data *data;
-    TypedData_Get_Struct(obj, struct memview_data, &fiddle_memview_data_type, data);
-
-    if (NIL_P(data->view.obj)) return Qnil;
-    return data->view.readonly ? Qtrue : Qfalse;
-}
-
-static VALUE
-rb_fiddle_memview_get_format(VALUE obj)
-{
-    struct memview_data *data;
-    TypedData_Get_Struct(obj, struct memview_data, &fiddle_memview_data_type, data);
-
-    if (NIL_P(data->view.obj)) return Qnil;
-    return data->view.format == NULL ? Qnil : rb_str_new_cstr(data->view.format);
-}
-
-static VALUE
-rb_fiddle_memview_get_item_size(VALUE obj)
-{
-    struct memview_data *data;
-    TypedData_Get_Struct(obj, struct memview_data, &fiddle_memview_data_type, data);
-
-    if (NIL_P(data->view.obj)) return Qnil;
-    return SSIZET2NUM(data->view.item_size);
-}
-
-static VALUE
-rb_fiddle_memview_get_ndim(VALUE obj)
-{
-    struct memview_data *data;
-    TypedData_Get_Struct(obj, struct memview_data, &fiddle_memview_data_type, data);
-
-    if (NIL_P(data->view.obj)) return Qnil;
-    return SSIZET2NUM(data->view.ndim);
-}
-
-static VALUE
-rb_fiddle_memview_get_shape(VALUE obj)
-{
-    struct memview_data *data;
-    TypedData_Get_Struct(obj, struct memview_data, &fiddle_memview_data_type, data);
-
-    if (NIL_P(data->view.obj)) return Qnil;
-    if (data->view.shape == NULL) return Qnil;
-
-    const ssize_t ndim = data->view.ndim;
-    VALUE shape = rb_ary_new_capa(ndim);
-    ssize_t i;
-    for (i = 0; i < ndim; ++i) {
-        rb_ary_push(shape, SSIZET2NUM(data->view.shape[i]));
-    }
-    return shape;
-}
-
-static VALUE
-rb_fiddle_memview_get_strides(VALUE obj)
-{
-    struct memview_data *data;
-    TypedData_Get_Struct(obj, struct memview_data, &fiddle_memview_data_type, data);
-
-    if (NIL_P(data->view.obj)) return Qnil;
-    if (data->view.strides == NULL) return Qnil;
-
-    const ssize_t ndim = data->view.ndim;
-    VALUE strides = rb_ary_new_capa(ndim);
-    ssize_t i;
-    for (i = 0; i < ndim; ++i) {
-        rb_ary_push(strides, SSIZET2NUM(data->view.strides[i]));
-    }
-    return strides;
-}
-
-static VALUE
-rb_fiddle_memview_get_sub_offsets(VALUE obj)
-{
-    struct memview_data *data;
-    TypedData_Get_Struct(obj, struct memview_data, &fiddle_memview_data_type, data);
-
-    if (NIL_P(data->view.obj)) return Qnil;
-    if (data->view.sub_offsets == NULL) return Qnil;
-
-    const ssize_t ndim = data->view.ndim;
-    VALUE sub_offsets = rb_ary_new_capa(ndim);
-    ssize_t i;
-    for (i = 0; i < ndim; ++i) {
-        rb_ary_push(sub_offsets, SSIZET2NUM(data->view.sub_offsets[i]));
-    }
-    return sub_offsets;
-}
-
-static VALUE
-rb_fiddle_memview_aref(int argc, VALUE *argv, VALUE obj)
-{
-    struct memview_data *data;
-    TypedData_Get_Struct(obj, struct memview_data, &fiddle_memview_data_type, data);
-
-    if (NIL_P(data->view.obj)) return Qnil;
-
-    const ssize_t ndim = data->view.ndim;
-    if (argc != ndim) {
-        rb_raise(rb_eIndexError, "wrong number of index (%d for %"PRIdSIZE")", argc, ndim);
-    }
-
-    VALUE indices_v = 0;
-    ssize_t *indices = ALLOCV_N(ssize_t, indices_v, ndim);
-
-    ssize_t i;
-    for (i = 0; i < ndim; ++i) {
-        ssize_t x = NUM2SSIZET(argv[i]);
-        indices[i] = x;
-    }
-
-    uint8_t *ptr = rb_memory_view_get_item_pointer(&data->view, indices);
-    ALLOCV_END(indices_v);
-
-    if (data->view.format == NULL) {
-        return INT2FIX(*ptr);
-    }
-
-    if (!data->members) {
-        const char *err;
-        if (rb_memory_view_parse_item_format(data->view.format, &data->members, &data->n_members, &err) < 0) {
-            rb_raise(rb_eRuntimeError, "Unable to recognize item format at %"PRIdSIZE" in \"%s\"",
-                     err - data->view.format, data->view.format);
-        }
-    }
-
-    return rb_memory_view_extract_item_members(ptr, data->members, data->n_members);
-}
-
-static VALUE
-rb_fiddle_memview_to_s(VALUE self)
-{
-    struct memview_data *data;
-    const char *raw_data;
-    long byte_size;
-    VALUE string;
-
-    TypedData_Get_Struct(self,
-                         struct memview_data,
-                         &fiddle_memview_data_type,
-                         data);
-
-    if (NIL_P(data->view.obj)) {
-        raw_data = NULL;
-        byte_size = 0;
-    } else {
-        raw_data = data->view.data;
-        byte_size = data->view.byte_size;
-    }
-
-    string = rb_enc_str_new_static(raw_data, byte_size, rb_ascii8bit_encoding());
-    {
-        ID id_memory_view;
-        CONST_ID(id_memory_view, "memory_view");
-        rb_ivar_set(string, id_memory_view, self);
-    }
-    return rb_obj_freeze(string);
-}
-
-void
-Init_fiddle_memory_view(void)
-{
-    rb_cMemoryView = rb_define_class_under(mFiddle, "MemoryView", rb_cObject);
-    rb_define_alloc_func(rb_cMemoryView, rb_fiddle_memview_s_allocate);
-    rb_define_singleton_method(rb_cMemoryView, "export", rb_fiddle_memview_s_export, 1);
-    rb_define_method(rb_cMemoryView, "initialize", rb_fiddle_memview_initialize, 1);
-    rb_define_method(rb_cMemoryView, "release", rb_fiddle_memview_release, 0);
-    rb_define_method(rb_cMemoryView, "obj", rb_fiddle_memview_get_obj, 0);
-    rb_define_method(rb_cMemoryView, "byte_size", rb_fiddle_memview_get_byte_size, 0);
-    rb_define_method(rb_cMemoryView, "readonly?", rb_fiddle_memview_get_readonly, 0);
-    rb_define_method(rb_cMemoryView, "format", rb_fiddle_memview_get_format, 0);
-    rb_define_method(rb_cMemoryView, "item_size", rb_fiddle_memview_get_item_size, 0);
-    rb_define_method(rb_cMemoryView, "ndim", rb_fiddle_memview_get_ndim, 0);
-    rb_define_method(rb_cMemoryView, "shape", rb_fiddle_memview_get_shape, 0);
-    rb_define_method(rb_cMemoryView, "strides", rb_fiddle_memview_get_strides, 0);
-    rb_define_method(rb_cMemoryView, "sub_offsets", rb_fiddle_memview_get_sub_offsets, 0);
-    rb_define_method(rb_cMemoryView, "[]", rb_fiddle_memview_aref, -1);
-    rb_define_method(rb_cMemoryView, "to_s", rb_fiddle_memview_to_s, 0);
-}
-
-#endif /* HAVE_RUBY_MEMORY_VIEW_H */
diff --git a/ext/fiddle/pinned.c b/ext/fiddle/pinned.c
deleted file mode 100644
index 019a3020e2647e..00000000000000
--- a/ext/fiddle/pinned.c
+++ /dev/null
@@ -1,123 +0,0 @@
-#include <fiddle.h>
-
-VALUE rb_cPinned;
-VALUE rb_eFiddleClearedReferenceError;
-
-struct pinned_data {
-    VALUE ptr;
-};
-
-static void
-pinned_mark(void *ptr)
-{
-    struct pinned_data *data = (struct pinned_data*)ptr;
-    /* Ensure reference is pinned */
-    if (data->ptr) {
-        rb_gc_mark(data->ptr);
-    }
-}
-
-static size_t
-pinned_memsize(const void *ptr)
-{
-    return sizeof(struct pinned_data);
-}
-
-static const rb_data_type_t pinned_data_type = {
-    "fiddle/pinned",
-    {pinned_mark, xfree, pinned_memsize, },
-    0, 0, RUBY_TYPED_FREE_IMMEDIATELY | RUBY_TYPED_WB_PROTECTED
-};
-
-static VALUE
-allocate(VALUE klass)
-{
-    struct pinned_data *data;
-    VALUE obj = TypedData_Make_Struct(klass, struct pinned_data, &pinned_data_type, data);
-    data->ptr = 0;
-    return obj;
-}
-
-/*
- * call-seq:
- *    Fiddle::Pinned.new(object)      => pinned_object
- *
- * Create a new pinned object reference.  The Fiddle::Pinned instance will
- * prevent the GC from moving +object+.
- */
-static VALUE
-initialize(VALUE self, VALUE ref)
-{
-    struct pinned_data *data;
-    TypedData_Get_Struct(self, struct pinned_data, &pinned_data_type, data);
-    RB_OBJ_WRITE(self, &data->ptr, ref);
-    return self;
-}
-
-/*
- * call-seq: ref
- *
- * Return the object that this pinned instance references.
- */
-static VALUE
-ref(VALUE self)
-{
-    struct pinned_data *data;
-    TypedData_Get_Struct(self, struct pinned_data, &pinned_data_type, data);
-    if (data->ptr) {
-      return data->ptr;
-    } else {
-      rb_raise(rb_eFiddleClearedReferenceError, "`ref` called on a cleared object");
-    }
-}
-
-/*
- * call-seq: clear
- *
- * Clear the reference to the object this is pinning.
- */
-static VALUE
-clear(VALUE self)
-{
-    struct pinned_data *data;
-    TypedData_Get_Struct(self, struct pinned_data, &pinned_data_type, data);
-    data->ptr = 0;
-    return self;
-}
-
-/*
- * call-seq: cleared?
- *
- * Returns true if the reference has been cleared, otherwise returns false.
- */
-static VALUE
-cleared_p(VALUE self)
-{
-    struct pinned_data *data;
-    TypedData_Get_Struct(self, struct pinned_data, &pinned_data_type, data);
-    if (data->ptr) {
-        return Qfalse;
-    } else {
-        return Qtrue;
-    }
-}
-
-extern VALUE rb_eFiddleError;
-
-void
-Init_fiddle_pinned(void)
-{
-    rb_cPinned = rb_define_class_under(mFiddle, "Pinned", rb_cObject);
-    rb_define_alloc_func(rb_cPinned, allocate);
-    rb_define_method(rb_cPinned, "initialize", initialize, 1);
-    rb_define_method(rb_cPinned, "ref", ref, 0);
-    rb_define_method(rb_cPinned, "clear", clear, 0);
-    rb_define_method(rb_cPinned, "cleared?", cleared_p, 0);
-
-    /*
-     * Document-class: Fiddle::ClearedReferenceError
-     *
-     * Cleared reference exception
-     */
-    rb_eFiddleClearedReferenceError = rb_define_class_under(mFiddle, "ClearedReferenceError", rb_eFiddleError);
-}
diff --git a/ext/fiddle/pointer.c b/ext/fiddle/pointer.c
deleted file mode 100644
index 1b7d7a69f6a4c3..00000000000000
--- a/ext/fiddle/pointer.c
+++ /dev/null
@@ -1,887 +0,0 @@
-/* -*- C -*-
- * $Id$
- */
-
-#include <stdbool.h>
-#include <ruby/ruby.h>
-#include <ruby/io.h>
-
-#include <ctype.h>
-#include <fiddle.h>
-
-#ifdef HAVE_RUBY_MEMORY_VIEW_H
-# include <ruby/memory_view.h>
-#endif
-
-#ifdef PRIsVALUE
-# define RB_OBJ_CLASSNAME(obj) rb_obj_class(obj)
-# define RB_OBJ_STRING(obj) (obj)
-#else
-# define PRIsVALUE "s"
-# define RB_OBJ_CLASSNAME(obj) rb_obj_classname(obj)
-# define RB_OBJ_STRING(obj) StringValueCStr(obj)
-#endif
-
-VALUE rb_cPointer;
-
-typedef rb_fiddle_freefunc_t freefunc_t;
-
-struct ptr_data {
-    void *ptr;
-    long size;
-    freefunc_t free;
-    bool freed;
-    VALUE wrap[2];
-};
-
-#define RPTR_DATA(obj) ((struct ptr_data *)(DATA_PTR(obj)))
-
-static inline freefunc_t
-get_freefunc(VALUE func, volatile VALUE *wrap)
-{
-    VALUE addrnum;
-    if (NIL_P(func)) {
-	*wrap = 0;
-	return NULL;
-    }
-    addrnum = rb_Integer(func);
-    *wrap = (addrnum != func) ? func : 0;
-    return (freefunc_t)(VALUE)NUM2PTR(addrnum);
-}
-
-static ID id_to_ptr;
-
-static void
-fiddle_ptr_mark(void *ptr)
-{
-    struct ptr_data *data = ptr;
-    if (data->wrap[0]) {
-	rb_gc_mark(data->wrap[0]);
-    }
-    if (data->wrap[1]) {
-	rb_gc_mark(data->wrap[1]);
-    }
-}
-
-static void
-fiddle_ptr_free_ptr(void *ptr)
-{
-    struct ptr_data *data = ptr;
-    if (data->ptr && data->free && !data->freed) {
-	data->freed = true;
-	(*(data->free))(data->ptr);
-    }
-}
-
-static void
-fiddle_ptr_free(void *ptr)
-{
-    fiddle_ptr_free_ptr(ptr);
-    xfree(ptr);
-}
-
-static size_t
-fiddle_ptr_memsize(const void *ptr)
-{
-    const struct ptr_data *data = ptr;
-    return sizeof(*data) + data->size;
-}
-
-static const rb_data_type_t fiddle_ptr_data_type = {
-    .wrap_struct_name = "fiddle/pointer",
-    .function = {
-        .dmark = fiddle_ptr_mark,
-        .dfree = fiddle_ptr_free,
-        .dsize = fiddle_ptr_memsize,
-    },
-    .flags = RUBY_TYPED_FREE_IMMEDIATELY | RUBY_TYPED_WB_PROTECTED
-};
-
-#ifdef HAVE_RUBY_MEMORY_VIEW_H
-static struct ptr_data *
-fiddle_ptr_check_memory_view(VALUE obj)
-{
-    struct ptr_data *data;
-    TypedData_Get_Struct(obj, struct ptr_data, &fiddle_ptr_data_type, data);
-    if (data->ptr == NULL || data->size == 0) return NULL;
-    return data;
-}
-
-static bool
-fiddle_ptr_memory_view_available_p(VALUE obj)
-{
-    return fiddle_ptr_check_memory_view(obj) != NULL;
-}
-
-static bool
-fiddle_ptr_get_memory_view(VALUE obj, rb_memory_view_t *view, int flags)
-{
-    struct ptr_data *data = fiddle_ptr_check_memory_view(obj);
-    rb_memory_view_init_as_byte_array(view, obj, data->ptr, data->size, true);
-
-    return true;
-}
-
-static const rb_memory_view_entry_t fiddle_ptr_memory_view_entry = {
-    fiddle_ptr_get_memory_view,
-    NULL,
-    fiddle_ptr_memory_view_available_p
-};
-#endif
-
-static VALUE
-rb_fiddle_ptr_new2(VALUE klass, void *ptr, long size, freefunc_t func, VALUE wrap0, VALUE wrap1)
-{
-    struct ptr_data *data;
-    VALUE val;
-
-    val = TypedData_Make_Struct(klass, struct ptr_data, &fiddle_ptr_data_type, data);
-    data->ptr = ptr;
-    data->free = func;
-    data->freed = false;
-    data->size = size;
-    RB_OBJ_WRITE(val, &data->wrap[0], wrap0);
-    RB_OBJ_WRITE(val, &data->wrap[1], wrap1);
-
-    return val;
-}
-
-VALUE
-rb_fiddle_ptr_new_wrap(void *ptr, long size, freefunc_t func, VALUE wrap0, VALUE wrap1)
-{
-    return rb_fiddle_ptr_new2(rb_cPointer, ptr, size, func, wrap0, wrap1);
-}
-
-static VALUE
-rb_fiddle_ptr_new(void *ptr, long size, freefunc_t func)
-{
-    return rb_fiddle_ptr_new2(rb_cPointer, ptr, size, func, 0, 0);
-}
-
-static VALUE
-rb_fiddle_ptr_malloc(VALUE klass, long size, freefunc_t func)
-{
-    void *ptr;
-
-    ptr = ruby_xmalloc((size_t)size);
-    memset(ptr,0,(size_t)size);
-    return rb_fiddle_ptr_new2(klass, ptr, size, func, 0, 0);
-}
-
-static void *
-rb_fiddle_ptr2cptr(VALUE val)
-{
-    struct ptr_data *data;
-    void *ptr;
-
-    if (rb_obj_is_kind_of(val, rb_cPointer)) {
-	TypedData_Get_Struct(val, struct ptr_data, &fiddle_ptr_data_type, data);
-	ptr = data->ptr;
-    }
-    else if (val == Qnil) {
-	ptr = NULL;
-    }
-    else{
-	rb_raise(rb_eTypeError, "Fiddle::Pointer was expected");
-    }
-
-    return ptr;
-}
-
-static VALUE
-rb_fiddle_ptr_s_allocate(VALUE klass)
-{
-    VALUE obj;
-    struct ptr_data *data;
-
-    obj = TypedData_Make_Struct(klass, struct ptr_data, &fiddle_ptr_data_type, data);
-    data->ptr = 0;
-    data->size = 0;
-    data->free = 0;
-    data->freed = false;
-
-    return obj;
-}
-
-/*
- * call-seq:
- *    Fiddle::Pointer.new(address)      => fiddle_cptr
- *    new(address, size)		=> fiddle_cptr
- *    new(address, size, freefunc)	=> fiddle_cptr
- *
- * Create a new pointer to +address+ with an optional +size+ and +freefunc+.
- *
- * +freefunc+ will be called when the instance is garbage collected.
- */
-static VALUE
-rb_fiddle_ptr_initialize(int argc, VALUE argv[], VALUE self)
-{
-    VALUE ptr, sym, size, wrap = 0, funcwrap = 0;
-    struct ptr_data *data;
-    void *p = NULL;
-    freefunc_t f = NULL;
-    long s = 0;
-
-    if (rb_scan_args(argc, argv, "12", &ptr, &size, &sym) >= 1) {
-	VALUE addrnum = rb_Integer(ptr);
-	if (addrnum != ptr) wrap = ptr;
-	p = NUM2PTR(addrnum);
-    }
-    if (argc >= 2) {
-	s = NUM2LONG(size);
-    }
-    if (argc >= 3) {
-	f = get_freefunc(sym, &funcwrap);
-    }
-
-    if (p) {
-	TypedData_Get_Struct(self, struct ptr_data, &fiddle_ptr_data_type, data);
-	if (data->ptr && data->free) {
-	    /* Free previous memory. Use of inappropriate initialize may cause SEGV. */
-	    (*(data->free))(data->ptr);
-	}
-	RB_OBJ_WRITE(self, &data->wrap[0], wrap);
-	RB_OBJ_WRITE(self, &data->wrap[1], funcwrap);
-	data->ptr  = p;
-	data->size = s;
-	data->free = f;
-    }
-
-    return Qnil;
-}
-
-static VALUE
-rb_fiddle_ptr_call_free(VALUE self);
-
-/*
- * call-seq:
- *    Fiddle::Pointer.malloc(size, freefunc = nil)  => fiddle pointer instance
- *    Fiddle::Pointer.malloc(size, freefunc) { |pointer| ... } => ...
- *
- * == Examples
- *
- *    # Automatically freeing the pointer when the block is exited - recommended
- *    Fiddle::Pointer.malloc(size, Fiddle::RUBY_FREE) do |pointer|
- *      ...
- *    end
- *
- *    # Manually freeing but relying on the garbage collector otherwise
- *    pointer = Fiddle::Pointer.malloc(size, Fiddle::RUBY_FREE)
- *    ...
- *    pointer.call_free
- *
- *    # Relying on the garbage collector - may lead to unlimited memory allocated before freeing any, but safe
- *    pointer = Fiddle::Pointer.malloc(size, Fiddle::RUBY_FREE)
- *    ...
- *
- *    # Only manually freeing
- *    pointer = Fiddle::Pointer.malloc(size)
- *    begin
- *      ...
- *    ensure
- *      Fiddle.free pointer
- *    end
- *
- *    # No free function and no call to free - the native memory will leak if the pointer is garbage collected
- *    pointer = Fiddle::Pointer.malloc(size)
- *    ...
- *
- * Allocate +size+ bytes of memory and associate it with an optional
- * +freefunc+.
- *
- * If a block is supplied, the pointer will be yielded to the block instead of
- * being returned, and the return value of the block will be returned. A
- * +freefunc+ must be supplied if a block is.
- *
- * If a +freefunc+ is supplied it will be called once, when the pointer is
- * garbage collected or when the block is left if a block is supplied or
- * when the user calls +call_free+, whichever happens first. +freefunc+ must be
- * an address pointing to a function or an instance of +Fiddle::Function+.
- */
-static VALUE
-rb_fiddle_ptr_s_malloc(int argc, VALUE argv[], VALUE klass)
-{
-    VALUE size, sym, obj, wrap = 0;
-    long s;
-    freefunc_t f;
-
-    switch (rb_scan_args(argc, argv, "11", &size, &sym)) {
-      case 1:
-	s = NUM2LONG(size);
-	f = NULL;
-	break;
-      case 2:
-	s = NUM2LONG(size);
-	f = get_freefunc(sym, &wrap);
-	break;
-      default:
-	rb_bug("rb_fiddle_ptr_s_malloc");
-    }
-
-    obj = rb_fiddle_ptr_malloc(klass, s,f);
-    if (wrap) RB_OBJ_WRITE(obj, &RPTR_DATA(obj)->wrap[1], wrap);
-
-    if (rb_block_given_p()) {
-        if (!f) {
-            rb_raise(rb_eArgError, "a free function must be supplied to Fiddle::Pointer.malloc when it is called with a block");
-        }
-        return rb_ensure(rb_yield, obj, rb_fiddle_ptr_call_free, obj);
-    } else {
-        return obj;
-    }
-}
-
-/*
- * call-seq: to_i
- *
- * Returns the integer memory location of this pointer.
- */
-static VALUE
-rb_fiddle_ptr_to_i(VALUE self)
-{
-    struct ptr_data *data;
-
-    TypedData_Get_Struct(self, struct ptr_data, &fiddle_ptr_data_type, data);
-    return PTR2NUM(data->ptr);
-}
-
-/*
- * call-seq: to_value
- *
- * Cast this pointer to a ruby object.
- */
-static VALUE
-rb_fiddle_ptr_to_value(VALUE self)
-{
-    struct ptr_data *data;
-    TypedData_Get_Struct(self, struct ptr_data, &fiddle_ptr_data_type, data);
-    return (VALUE)(data->ptr);
-}
-
-/*
- * call-seq: ptr
- *
- * Returns a new Fiddle::Pointer instance that is a dereferenced pointer for
- * this pointer.
- *
- * Analogous to the star operator in C.
- */
-static VALUE
-rb_fiddle_ptr_ptr(VALUE self)
-{
-    struct ptr_data *data;
-
-    TypedData_Get_Struct(self, struct ptr_data, &fiddle_ptr_data_type, data);
-    return rb_fiddle_ptr_new(*((void**)(data->ptr)),0,0);
-}
-
-/*
- * call-seq: ref
- *
- * Returns a new Fiddle::Pointer instance that is a reference pointer for this
- * pointer.
- *
- * Analogous to the ampersand operator in C.
- */
-static VALUE
-rb_fiddle_ptr_ref(VALUE self)
-{
-    struct ptr_data *data;
-
-    TypedData_Get_Struct(self, struct ptr_data, &fiddle_ptr_data_type, data);
-    return rb_fiddle_ptr_new(&(data->ptr),0,0);
-}
-
-/*
- * call-seq: null?
- *
- * Returns +true+ if this is a null pointer.
- */
-static VALUE
-rb_fiddle_ptr_null_p(VALUE self)
-{
-    struct ptr_data *data;
-
-    TypedData_Get_Struct(self, struct ptr_data, &fiddle_ptr_data_type, data);
-    return data->ptr ? Qfalse : Qtrue;
-}
-
-/*
- * call-seq: free=(function)
- *
- * Set the free function for this pointer to +function+ in the given
- * Fiddle::Function.
- */
-static VALUE
-rb_fiddle_ptr_free_set(VALUE self, VALUE val)
-{
-    struct ptr_data *data;
-
-    TypedData_Get_Struct(self, struct ptr_data, &fiddle_ptr_data_type, data);
-    data->free = get_freefunc(val, &data->wrap[1]);
-
-    return Qnil;
-}
-
-/*
- * call-seq: free => Fiddle::Function
- *
- * Get the free function for this pointer.
- *
- * Returns a new instance of Fiddle::Function.
- *
- * See Fiddle::Function.new
- */
-static VALUE
-rb_fiddle_ptr_free_get(VALUE self)
-{
-    struct ptr_data *pdata;
-    VALUE address;
-    VALUE arg_types;
-    VALUE ret_type;
-
-    TypedData_Get_Struct(self, struct ptr_data, &fiddle_ptr_data_type, pdata);
-
-    if (!pdata->free)
-	return Qnil;
-
-    address = PTR2NUM(pdata->free);
-    ret_type = INT2NUM(TYPE_VOID);
-    arg_types = rb_ary_new();
-    rb_ary_push(arg_types, INT2NUM(TYPE_VOIDP));
-
-    return rb_fiddle_new_function(address, arg_types, ret_type);
-}
-
-/*
- * call-seq: call_free => nil
- *
- * Call the free function for this pointer. Calling more than once will do
- * nothing. Does nothing if there is no free function attached.
- */
-static VALUE
-rb_fiddle_ptr_call_free(VALUE self)
-{
-    struct ptr_data *pdata;
-    TypedData_Get_Struct(self, struct ptr_data, &fiddle_ptr_data_type, pdata);
-    fiddle_ptr_free_ptr(pdata);
-    return Qnil;
-}
-
-/*
- * call-seq: freed? => bool
- *
- * Returns if the free function for this pointer has been called.
- */
-static VALUE
-rb_fiddle_ptr_freed_p(VALUE self)
-{
-    struct ptr_data *pdata;
-    TypedData_Get_Struct(self, struct ptr_data, &fiddle_ptr_data_type, pdata);
-    return pdata->freed ? Qtrue : Qfalse;
-}
-
-/*
- * call-seq:
- *
- *    ptr.to_s        => string
- *    ptr.to_s(len)   => string
- *
- * Returns the pointer contents as a string.
- *
- * When called with no arguments, this method will return the contents until
- * the first NULL byte.
- *
- * When called with +len+, a string of +len+ bytes will be returned.
- *
- * See to_str
- */
-static VALUE
-rb_fiddle_ptr_to_s(int argc, VALUE argv[], VALUE self)
-{
-    struct ptr_data *data;
-    VALUE arg1, val;
-    int len;
-
-    TypedData_Get_Struct(self, struct ptr_data, &fiddle_ptr_data_type, data);
-    switch (rb_scan_args(argc, argv, "01", &arg1)) {
-      case 0:
-	val = rb_str_new2((char*)(data->ptr));
-	break;
-      case 1:
-	len = NUM2INT(arg1);
-	val = rb_str_new((char*)(data->ptr), len);
-	break;
-      default:
-	rb_bug("rb_fiddle_ptr_to_s");
-    }
-
-    return val;
-}
-
-/*
- * call-seq:
- *
- *    ptr.to_str        => string
- *    ptr.to_str(len)   => string
- *
- * Returns the pointer contents as a string.
- *
- * When called with no arguments, this method will return the contents with the
- * length of this pointer's +size+.
- *
- * When called with +len+, a string of +len+ bytes will be returned.
- *
- * See to_s
- */
-static VALUE
-rb_fiddle_ptr_to_str(int argc, VALUE argv[], VALUE self)
-{
-    struct ptr_data *data;
-    VALUE arg1, val;
-    int len;
-
-    TypedData_Get_Struct(self, struct ptr_data, &fiddle_ptr_data_type, data);
-    switch (rb_scan_args(argc, argv, "01", &arg1)) {
-      case 0:
-	val = rb_str_new((char*)(data->ptr),data->size);
-	break;
-      case 1:
-	len = NUM2INT(arg1);
-	val = rb_str_new((char*)(data->ptr), len);
-	break;
-      default:
-	rb_bug("rb_fiddle_ptr_to_str");
-    }
-
-    return val;
-}
-
-/*
- * call-seq: inspect
- *
- * Returns a string formatted with an easily readable representation of the
- * internal state of the pointer.
- */
-static VALUE
-rb_fiddle_ptr_inspect(VALUE self)
-{
-    struct ptr_data *data;
-
-    TypedData_Get_Struct(self, struct ptr_data, &fiddle_ptr_data_type, data);
-    return rb_sprintf("#<%"PRIsVALUE":%p ptr=%p size=%ld free=%p>",
-		      RB_OBJ_CLASSNAME(self), (void *)data, data->ptr, data->size, (void *)data->free);
-}
-
-/*
- *  call-seq:
- *    ptr == other    => true or false
- *    ptr.eql?(other) => true or false
- *
- * Returns true if +other+ wraps the same pointer, otherwise returns
- * false.
- */
-static VALUE
-rb_fiddle_ptr_eql(VALUE self, VALUE other)
-{
-    void *ptr1, *ptr2;
-
-    if(!rb_obj_is_kind_of(other, rb_cPointer)) return Qfalse;
-
-    ptr1 = rb_fiddle_ptr2cptr(self);
-    ptr2 = rb_fiddle_ptr2cptr(other);
-
-    return ptr1 == ptr2 ? Qtrue : Qfalse;
-}
-
-/*
- *  call-seq:
- *    ptr <=> other   => -1, 0, 1, or nil
- *
- * Returns -1 if less than, 0 if equal to, 1 if greater than +other+.
- *
- * Returns nil if +ptr+ cannot be compared to +other+.
- */
-static VALUE
-rb_fiddle_ptr_cmp(VALUE self, VALUE other)
-{
-    void *ptr1, *ptr2;
-    SIGNED_VALUE diff;
-
-    if(!rb_obj_is_kind_of(other, rb_cPointer)) return Qnil;
-
-    ptr1 = rb_fiddle_ptr2cptr(self);
-    ptr2 = rb_fiddle_ptr2cptr(other);
-    diff = (SIGNED_VALUE)ptr1 - (SIGNED_VALUE)ptr2;
-    if (!diff) return INT2FIX(0);
-    return diff > 0 ? INT2NUM(1) : INT2NUM(-1);
-}
-
-/*
- * call-seq:
- *    ptr + n   => new cptr
- *
- * Returns a new pointer instance that has been advanced +n+ bytes.
- */
-static VALUE
-rb_fiddle_ptr_plus(VALUE self, VALUE other)
-{
-    void *ptr;
-    long num, size;
-
-    ptr = rb_fiddle_ptr2cptr(self);
-    size = RPTR_DATA(self)->size;
-    num = NUM2LONG(other);
-    return rb_fiddle_ptr_new((char *)ptr + num, size - num, 0);
-}
-
-/*
- * call-seq:
- *    ptr - n   => new cptr
- *
- * Returns a new pointer instance that has been moved back +n+ bytes.
- */
-static VALUE
-rb_fiddle_ptr_minus(VALUE self, VALUE other)
-{
-    void *ptr;
-    long num, size;
-
-    ptr = rb_fiddle_ptr2cptr(self);
-    size = RPTR_DATA(self)->size;
-    num = NUM2LONG(other);
-    return rb_fiddle_ptr_new((char *)ptr - num, size + num, 0);
-}
-
-/*
- *  call-seq:
- *     ptr[index]                -> an_integer
- *     ptr[start, length]        -> a_string
- *
- * Returns integer stored at _index_.
- *
- * If _start_ and _length_ are given, a string containing the bytes from
- * _start_ of _length_ will be returned.
- */
-static VALUE
-rb_fiddle_ptr_aref(int argc, VALUE argv[], VALUE self)
-{
-    VALUE arg0, arg1;
-    VALUE retval = Qnil;
-    size_t offset, len;
-    struct ptr_data *data;
-
-    TypedData_Get_Struct(self, struct ptr_data, &fiddle_ptr_data_type, data);
-    if (!data->ptr) rb_raise(rb_eFiddleDLError, "NULL pointer dereference");
-    switch( rb_scan_args(argc, argv, "11", &arg0, &arg1) ){
-      case 1:
-	offset = NUM2ULONG(arg0);
-	retval = INT2NUM(*((char *)data->ptr + offset));
-	break;
-      case 2:
-	offset = NUM2ULONG(arg0);
-	len    = NUM2ULONG(arg1);
-	retval = rb_str_new((char *)data->ptr + offset, len);
-	break;
-      default:
-	rb_bug("rb_fiddle_ptr_aref()");
-    }
-    return retval;
-}
-
-/*
- *  call-seq:
- *     ptr[index]         = int                    ->  int
- *     ptr[start, length] = string or cptr or addr ->  string or dl_cptr or addr
- *
- * Set the value at +index+ to +int+.
- *
- * Or, set the memory at +start+ until +length+ with the contents of +string+,
- * the memory from +dl_cptr+, or the memory pointed at by the memory address
- * +addr+.
- */
-static VALUE
-rb_fiddle_ptr_aset(int argc, VALUE argv[], VALUE self)
-{
-    VALUE arg0, arg1, arg2;
-    VALUE retval = Qnil;
-    size_t offset, len;
-    void *mem;
-    struct ptr_data *data;
-
-    TypedData_Get_Struct(self, struct ptr_data, &fiddle_ptr_data_type, data);
-    if (!data->ptr) rb_raise(rb_eFiddleDLError, "NULL pointer dereference");
-    switch( rb_scan_args(argc, argv, "21", &arg0, &arg1, &arg2) ){
-      case 2:
-	offset = NUM2ULONG(arg0);
-	((char*)data->ptr)[offset] = NUM2UINT(arg1);
-	retval = arg1;
-	break;
-      case 3:
-	offset = NUM2ULONG(arg0);
-	len    = NUM2ULONG(arg1);
-	if (RB_TYPE_P(arg2, T_STRING)) {
-	    mem = StringValuePtr(arg2);
-	}
-	else if( rb_obj_is_kind_of(arg2, rb_cPointer) ){
-	    mem = rb_fiddle_ptr2cptr(arg2);
-	}
-	else{
-	    mem    = NUM2PTR(arg2);
-	}
-	memcpy((char *)data->ptr + offset, mem, len);
-	retval = arg2;
-	break;
-      default:
-	rb_bug("rb_fiddle_ptr_aset()");
-    }
-    return retval;
-}
-
-/*
- * call-seq: size=(size)
- *
- * Set the size of this pointer to +size+
- */
-static VALUE
-rb_fiddle_ptr_size_set(VALUE self, VALUE size)
-{
-    RPTR_DATA(self)->size = NUM2LONG(size);
-    return size;
-}
-
-/*
- * call-seq: size
- *
- * Get the size of this pointer.
- */
-static VALUE
-rb_fiddle_ptr_size_get(VALUE self)
-{
-    return LONG2NUM(RPTR_DATA(self)->size);
-}
-
-/*
- * call-seq:
- *    Fiddle::Pointer[val]         => cptr
- *    to_ptr(val)  => cptr
- *
- * Get the underlying pointer for ruby object +val+ and return it as a
- * Fiddle::Pointer object.
- */
-static VALUE
-rb_fiddle_ptr_s_to_ptr(VALUE self, VALUE val)
-{
-    VALUE ptr, wrap = val, vptr;
-
-    if (RTEST(rb_obj_is_kind_of(val, rb_cIO))){
-	rb_io_t *fptr;
-	FILE *fp;
-	GetOpenFile(val, fptr);
-	fp = rb_io_stdio_file(fptr);
-	ptr = rb_fiddle_ptr_new(fp, 0, NULL);
-    }
-    else if (RTEST(rb_obj_is_kind_of(val, rb_cString))){
-	char *str = StringValuePtr(val);
-        wrap = val;
-	ptr = rb_fiddle_ptr_new(str, RSTRING_LEN(val), NULL);
-    }
-    else if ((vptr = rb_check_funcall(val, id_to_ptr, 0, 0)) != Qundef){
-	if (rb_obj_is_kind_of(vptr, rb_cPointer)){
-	    ptr = vptr;
-	    wrap = 0;
-	}
-	else{
-	    rb_raise(rb_eFiddleDLError, "to_ptr should return a Fiddle::Pointer object");
-	}
-    }
-    else{
-	VALUE num = rb_Integer(val);
-	if (num == val) wrap = 0;
-	ptr = rb_fiddle_ptr_new(NUM2PTR(num), 0, NULL);
-    }
-    if (wrap) RB_OBJ_WRITE(ptr, &RPTR_DATA(ptr)->wrap[0], wrap);
-    return ptr;
-}
-
-/*
- * call-seq:
- *    Fiddle::Pointer.read(address, len)     => string
- *
- * Or read the memory at address +address+ with length +len+ and return a
- * string with that memory
- */
-
-static VALUE
-rb_fiddle_ptr_read_mem(VALUE klass, VALUE address, VALUE len)
-{
-    return rb_str_new((char *)NUM2PTR(address), NUM2ULONG(len));
-}
-
-/*
- * call-seq:
- *    Fiddle::Pointer.write(address, str)
- *
- * Write bytes in +str+ to the location pointed to by +address+.
- */
-static VALUE
-rb_fiddle_ptr_write_mem(VALUE klass, VALUE addr, VALUE str)
-{
-    memcpy(NUM2PTR(addr), StringValuePtr(str), RSTRING_LEN(str));
-    return str;
-}
-
-void
-Init_fiddle_pointer(void)
-{
-#undef rb_intern
-    id_to_ptr = rb_intern("to_ptr");
-
-    /* Document-class: Fiddle::Pointer
-     *
-     * Fiddle::Pointer is a class to handle C pointers
-     *
-     */
-    rb_cPointer = rb_define_class_under(mFiddle, "Pointer", rb_cObject);
-    rb_define_alloc_func(rb_cPointer, rb_fiddle_ptr_s_allocate);
-    rb_define_singleton_method(rb_cPointer, "malloc", rb_fiddle_ptr_s_malloc, -1);
-    rb_define_singleton_method(rb_cPointer, "to_ptr", rb_fiddle_ptr_s_to_ptr, 1);
-    rb_define_singleton_method(rb_cPointer, "[]", rb_fiddle_ptr_s_to_ptr, 1);
-    rb_define_singleton_method(rb_cPointer, "read", rb_fiddle_ptr_read_mem, 2);
-    rb_define_singleton_method(rb_cPointer, "write", rb_fiddle_ptr_write_mem, 2);
-    rb_define_method(rb_cPointer, "initialize", rb_fiddle_ptr_initialize, -1);
-    rb_define_method(rb_cPointer, "free=", rb_fiddle_ptr_free_set, 1);
-    rb_define_method(rb_cPointer, "free",  rb_fiddle_ptr_free_get, 0);
-    rb_define_method(rb_cPointer, "call_free",  rb_fiddle_ptr_call_free, 0);
-    rb_define_method(rb_cPointer, "freed?",  rb_fiddle_ptr_freed_p, 0);
-    rb_define_method(rb_cPointer, "to_i",  rb_fiddle_ptr_to_i, 0);
-    rb_define_method(rb_cPointer, "to_int",  rb_fiddle_ptr_to_i, 0);
-    rb_define_method(rb_cPointer, "to_value",  rb_fiddle_ptr_to_value, 0);
-    rb_define_method(rb_cPointer, "ptr",   rb_fiddle_ptr_ptr, 0);
-    rb_define_method(rb_cPointer, "+@", rb_fiddle_ptr_ptr, 0);
-    rb_define_method(rb_cPointer, "ref",   rb_fiddle_ptr_ref, 0);
-    rb_define_method(rb_cPointer, "-@", rb_fiddle_ptr_ref, 0);
-    rb_define_method(rb_cPointer, "null?", rb_fiddle_ptr_null_p, 0);
-    rb_define_method(rb_cPointer, "to_s", rb_fiddle_ptr_to_s, -1);
-    rb_define_method(rb_cPointer, "to_str", rb_fiddle_ptr_to_str, -1);
-    rb_define_method(rb_cPointer, "inspect", rb_fiddle_ptr_inspect, 0);
-    rb_define_method(rb_cPointer, "<=>", rb_fiddle_ptr_cmp, 1);
-    rb_define_method(rb_cPointer, "==", rb_fiddle_ptr_eql, 1);
-    rb_define_method(rb_cPointer, "eql?", rb_fiddle_ptr_eql, 1);
-    rb_define_method(rb_cPointer, "+", rb_fiddle_ptr_plus, 1);
-    rb_define_method(rb_cPointer, "-", rb_fiddle_ptr_minus, 1);
-    rb_define_method(rb_cPointer, "[]", rb_fiddle_ptr_aref, -1);
-    rb_define_method(rb_cPointer, "[]=", rb_fiddle_ptr_aset, -1);
-    rb_define_method(rb_cPointer, "size", rb_fiddle_ptr_size_get, 0);
-    rb_define_method(rb_cPointer, "size=", rb_fiddle_ptr_size_set, 1);
-
-#ifdef HAVE_RUBY_MEMORY_VIEW_H
-    rb_memory_view_register(rb_cPointer, &fiddle_ptr_memory_view_entry);
-#endif
-
-    /*  Document-const: NULL
-     *
-     * A NULL pointer
-     */
-    rb_define_const(mFiddle, "NULL", rb_fiddle_ptr_new(0, 0, 0));
-}
diff --git a/ext/fiddle/win32/fficonfig.h b/ext/fiddle/win32/fficonfig.h
deleted file mode 100644
index 776808159c9dee..00000000000000
--- a/ext/fiddle/win32/fficonfig.h
+++ /dev/null
@@ -1,29 +0,0 @@
-#define HAVE_ALLOCA 1
-#define HAVE_MEMCPY 1
-#define HAVE_MEMORY_H 1
-#define HAVE_STDLIB_H 1
-#define HAVE_STRING_H 1
-#define HAVE_SYS_STAT_H 1
-#define HAVE_SYS_TYPES_H 1
-#if _MSC_VER >= 1600
-#define HAVE_INTTYPES_H 1
-#define HAVE_STDINT_H 1
-#endif
-
-#define SIZEOF_DOUBLE 8
-#if defined(X86_WIN64)
-#define SIZEOF_SIZE_T 8
-#else
-#define SIZEOF_SIZE_T 4
-#endif
-
-#define STACK_DIRECTION -1
-
-#define STDC_HEADERS 1
-
-#ifdef LIBFFI_ASM
-#define FFI_HIDDEN(name)
-#else
-#define FFI_HIDDEN
-#endif
-
diff --git a/ext/fiddle/win32/libffi-3.2.1-mswin.patch b/ext/fiddle/win32/libffi-3.2.1-mswin.patch
deleted file mode 100644
index f9100e703db581..00000000000000
--- a/ext/fiddle/win32/libffi-3.2.1-mswin.patch
+++ /dev/null
@@ -1,191 +0,0 @@
-diff -ru libffi-3.2.1/src/x86/ffi.c libffi-3.2.1/src/x86/ffi.c
---- libffi-3.2.1/src/x86/ffi.c	2014-11-08 21:47:24.000000000 +0900
-+++ libffi-3.2.1/src/x86/ffi.c	2014-12-25 18:46:14.806761900 +0900
-@@ -99,11 +99,13 @@
-        i != 0;
-        i--, p_arg += dir, p_argv += dir)
-     {
-+      size_t z;
-+
-       /* Align if necessary */
-       if ((sizeof(void*) - 1) & (size_t) argp)
-         argp = (char *) ALIGN(argp, sizeof(void*));
- 
--      size_t z = (*p_arg)->size;
-+      z = (*p_arg)->size;
- 
- #ifdef X86_WIN64
-       if (z > FFI_SIZEOF_ARG
-@@ -202,6 +204,7 @@
-      on top of stack, so that those can be moved to registers by call-handler.  */
-   if (stack_args_count > 0)
-     {
-+      int i;
-       if (dir < 0 && stack_args_count > 1)
-         {
-           /* Reverse order if iterating arguments backwards */
-@@ -210,7 +213,6 @@
-           *(ffi_arg*) p_stack_data[stack_args_count - 1] = tmp;
-         }
-       
--      int i;
-       for (i = 0; i < stack_args_count; i++)
-         {
-           if (p_stack_data[i] != argp2)
-@@ -569,11 +571,12 @@
-        i < cif->nargs && passed_regs < max_stack_count;
-        i++, p_arg++)
-     {
-+      size_t sz;
-       if ((*p_arg)->type == FFI_TYPE_FLOAT
-          || (*p_arg)->type == FFI_TYPE_STRUCT)
-         continue;
- 
--      size_t sz = (*p_arg)->size;
-+      sz = (*p_arg)->size;
-       if(sz == 0 || sz > FFI_SIZEOF_ARG)
-         continue;
- 
-@@ -599,11 +602,13 @@
-        i != 0;
-        i--, p_arg += dir, p_argv += dir)
-     {
-+      size_t z;
-+
-       /* Align if necessary */
-       if ((sizeof(void*) - 1) & (size_t) argp)
-         argp = (char *) ALIGN(argp, sizeof(void*));
- 
--      size_t z = (*p_arg)->size;
-+      z = (*p_arg)->size;
- 
- #ifdef X86_WIN64
-       if (z > FFI_SIZEOF_ARG
-@@ -642,7 +647,7 @@
- #endif
-     }
- 
--  return (size_t)argp - (size_t)stack;
-+  return (int)((size_t)argp - (size_t)stack);
- }
- 
- #define FFI_INIT_TRAMPOLINE_WIN64(TRAMP,FUN,CTX,MASK) \
-@@ -855,11 +860,12 @@
-   
-   for (i = 0; i < cif->nargs && passed_regs <= max_regs; i++)
-     {
-+      size_t sz;
-       if (cif->arg_types[i]->type == FFI_TYPE_FLOAT
-          || cif->arg_types[i]->type == FFI_TYPE_STRUCT)
-         continue;
- 
--      size_t sz = cif->arg_types[i]->size;
-+      sz = cif->arg_types[i]->size;
-       if (sz == 0 || sz > FFI_SIZEOF_ARG)
-         continue;
- 
-diff -ru libffi-3.2.1/src/x86/ffitarget.h libffi-3.2.1/src/x86/ffitarget.h
---- libffi-3.2.1/src/x86/ffitarget.h	2014-11-08 21:47:24.000000000 +0900
-+++ libffi-3.2.1/src/x86/ffitarget.h	2014-12-22 15:45:54.000000000 +0900
-@@ -50,7 +50,9 @@
- #endif
- 
- #define FFI_TARGET_SPECIFIC_STACK_SPACE_ALLOCATION
-+#ifndef _MSC_VER
- #define FFI_TARGET_HAS_COMPLEX_TYPE
-+#endif
- 
- /* ---- Generic type definitions ----------------------------------------- */
- 
-diff -ru libffi-3.2.1/src/x86/win64.S libffi-3.2.1/src/x86/win64.S
---- libffi-3.2.1/src/x86/win64.S	2014-11-08 21:47:24.000000000 +0900
-+++ libffi-3.2.1/src/x86/win64.S	2014-12-22 16:14:40.000000000 +0900
-@@ -127,7 +127,7 @@
- 
- 	mov	rcx, QWORD PTR RVALUE[rbp]
- 	mov	DWORD PTR [rcx], eax
--	jmp	ret_void$
-+	jmp	SHORT ret_void$
- 
- ret_struct2b$:
-  	cmp	DWORD PTR CIF_FLAGS[rbp], FFI_TYPE_SMALL_STRUCT_2B
-@@ -135,7 +135,7 @@
- 
- 	mov	rcx, QWORD PTR RVALUE[rbp]
- 	mov	WORD PTR [rcx], ax
--	jmp	ret_void$
-+	jmp	SHORT ret_void$
- 
- ret_struct1b$:
-  	cmp	DWORD PTR CIF_FLAGS[rbp], FFI_TYPE_SMALL_STRUCT_1B
-@@ -143,7 +143,7 @@
- 
- 	mov	rcx, QWORD PTR RVALUE[rbp]
- 	mov	BYTE PTR [rcx], al
--	jmp	ret_void$
-+	jmp	SHORT ret_void$
- 
- ret_uint8$:
-  	cmp	DWORD PTR CIF_FLAGS[rbp], FFI_TYPE_UINT8
-@@ -152,7 +152,7 @@
- 	mov	rcx, QWORD PTR RVALUE[rbp]
- 	movzx   rax, al
- 	mov	QWORD PTR [rcx], rax
--	jmp	ret_void$
-+	jmp	SHORT ret_void$
- 
- ret_sint8$:
-  	cmp	DWORD PTR CIF_FLAGS[rbp], FFI_TYPE_SINT8
-@@ -161,7 +161,7 @@
- 	mov	rcx, QWORD PTR RVALUE[rbp]
- 	movsx   rax, al
- 	mov	QWORD PTR [rcx], rax
--	jmp	ret_void$
-+	jmp	SHORT ret_void$
- 
- ret_uint16$:
-  	cmp	DWORD PTR CIF_FLAGS[rbp], FFI_TYPE_UINT16
-@@ -188,7 +188,13 @@
- 	mov	rcx, QWORD PTR RVALUE[rbp]
- 	mov     eax, eax
- 	mov	QWORD PTR [rcx], rax
--	jmp	SHORT ret_void$
-+
-+ret_void$:
-+	xor	rax, rax
-+
-+	lea	rsp, QWORD PTR [rbp+16]
-+	pop	rbp
-+	ret	0
- 
- ret_sint32$:
-  	cmp	DWORD PTR CIF_FLAGS[rbp], FFI_TYPE_SINT32
-@@ -247,13 +253,6 @@
- 	cdqe
- 	mov	QWORD PTR [rcx], rax
-  	jmp	SHORT ret_void$
--
--ret_void$:
--	xor	rax, rax
--
--	lea	rsp, QWORD PTR [rbp+16]
--	pop	rbp
--	ret	0
- ffi_call_win64 ENDP
- _TEXT	ENDS
- END
-diff -ru libffi-3.2.1/include/ffi.h.in libffi-3.2.1/include/ffi.h.in
---- libffi-3.2.1/include/ffi.h.in	2014-11-08 21:47:24.000000000 +0900
-+++ libffi-3.2.1/include/ffi.h.in	2015-01-11 12:35:30.000000000 +0900
-@@ -103,6 +103,11 @@
- #   undef  FFI_64_BIT_MAX
- #   define FFI_64_BIT_MAX 9223372036854775807LL
- #  endif
-+#  ifdef _MSC_VER
-+#   define FFI_LONG_LONG_MAX _I64_MAX
-+#   undef  FFI_64_BIT_MAX
-+#   define FFI_64_BIT_MAX 9223372036854775807I64
-+#  endif
- # endif
- #endif
- 
diff --git a/ext/fiddle/win32/libffi-config.rb b/ext/fiddle/win32/libffi-config.rb
deleted file mode 100755
index 8e8069a943a518..00000000000000
--- a/ext/fiddle/win32/libffi-config.rb
+++ /dev/null
@@ -1,48 +0,0 @@
-#!/usr/bin/ruby
-# frozen_string_literal: true
-require 'fileutils'
-
-basedir = File.dirname(__FILE__)
-conf = {}
-enable = {}
-until ARGV.empty?
-  arg = ARGV.shift
-  case arg
-  when '-C'
-    # ignore
-  when /\A--srcdir=(.*)/
-    conf['SRCDIR'] = srcdir = $1
-  when /\A(CC|CFLAGS|CXX|CXXFLAGS|LD|LDFLAGS)=(.*)/
-    conf[$1] = $2
-  when /\A--host=(.*)/
-    host = $1
-  when /\A--enable-([^=]+)(?:=(.*))?/
-    enable[$1] = $2 || true
-  when /\A--disable-([^=]+)/
-    enable[$1] = false
-  end
-end
-
-File.foreach("#{srcdir}/configure.ac") do |line|
-  if /^AC_INIT\((.*)\)/ =~ line
-    version = $1.split(/,\s*/)[1]
-    version.gsub!(/\A\[|\]\z/, '')
-    conf['VERSION'] = version
-    break
-  end
-end
-
-builddir = srcdir == "." ? (enable['builddir'] || ".") : "."
-conf['TARGET'] = /^x64/ =~ host ? "X86_WIN64" : "X86_WIN32"
-
-FileUtils.mkdir_p([builddir, "#{builddir}/include", "#{builddir}/src/x86"])
-FileUtils.cp("#{basedir}/fficonfig.h", ".", preserve: true)
-
-hdr = File.binread("#{srcdir}/include/ffi.h.in")
-hdr.gsub!(/@(\w+)@/) {conf[$1] || $&}
-hdr.gsub!(/^(#if\s+)@\w+@/, '\10')
-File.binwrite("#{builddir}/include/ffi.h", hdr)
-
-mk = File.binread("#{basedir}/libffi.mk.tmpl")
-mk.gsub!(/@(\w+)@/) {conf[$1] || $&}
-File.binwrite("Makefile", mk)
diff --git a/ext/fiddle/win32/libffi.mk.tmpl b/ext/fiddle/win32/libffi.mk.tmpl
deleted file mode 100644
index 2a16e8efec6ab8..00000000000000
--- a/ext/fiddle/win32/libffi.mk.tmpl
+++ /dev/null
@@ -1,96 +0,0 @@
-# -*- makefile -*-
-# ====================================================================
-#
-# libffi Windows Makefile
-#
-#
-# ====================================================================
-#
-NAME	= ffi
-TARGET	= @TARGET@
-CC	= cl
-!if "$(TARGET)" == "X86_WIN64"
-AS	= ml64
-!else
-AS	= ml
-!endif
-AR	= link
-DLEXT	= dll
-OBJEXT	= obj
-LIBEXT	= lib
-TOPDIR	= @SRCDIR@
-CPP	= $(CC) -EP
-CFLAGS	= @CFLAGS@
-ARFLAGS	= -lib
-ASFLAGS	= -coff -W3 -Cx
-INCLUDES= -I. -I./include -I./src/x86 \
-	  -I$(TOPDIR)/include -I$(TOPDIR)/include/src/x86
-
-SRCDIR	= $(TOPDIR)/src
-WORKDIR	= ./.libs
-BUILDDIR= ./src
-LIBNAME	= lib$(NAME)
-STATICLIB= $(WORKDIR)/$(LIBNAME)_convenience.$(LIBEXT)
-
-HEADERS = \
-	./fficonfig.h
-FFI_HEADERS = \
-	./include/ffi.h \
-	./include/ffitarget.h
-
-!if "$(TARGET)" == "X86_WIN32"
-OSSRC	= win32
-!else if "$(TARGET)" == "X86_WIN64"
-OSSRC	= win64
-!else
-! error unknown target: $(TARGET)
-!endif
-
-OBJECTS = \
-	$(BUILDDIR)/closures.$(OBJEXT) \
-	$(BUILDDIR)/debug.$(OBJEXT) \
-	$(BUILDDIR)/java_raw_api.$(OBJEXT) \
-	$(BUILDDIR)/prep_cif.$(OBJEXT) \
-	$(BUILDDIR)/raw_api.$(OBJEXT) \
-	$(BUILDDIR)/types.$(OBJEXT) \
-	$(BUILDDIR)/x86/ffi.$(OBJEXT) \
-	$(BUILDDIR)/x86/$(OSSRC).$(OBJEXT)
-ASMSRCS = \
-	$(BUILDDIR)/x86/$(OSSRC).asm
-
-.SUFFIXES : .S .asm
-
-all: $(WORKDIR) $(STATICLIB)
-
-{$(SRCDIR)}.c{$(BUILDDIR)}.$(OBJEXT):
-	$(CC) -c $(CFLAGS) $(INCLUDES) -Fo$(@:\=/) -Fd$(WORKDIR)/$(NAME)-src $(<:\=/)
-
-{$(SRCDIR)/x86}.c{$(BUILDDIR)/x86}.$(OBJEXT):
-	$(CC) -c $(CFLAGS) $(INCLUDES) -Fo$(@:\=/) -Fd$(WORKDIR)/$(NAME)-src $(<:\=/)
-
-{$(SRCDIR)/x86}.S{$(BUILDDIR)/x86}.asm:
-	$(CPP) $(CFLAGS) $(INCLUDES) $(<:\=/) >$(@:\=/)
-
-{$(BUILDDIR)/x86}.asm{$(BUILDDIR)/x86}.$(OBJEXT):
-	cd $(@D) && $(AS) -c $(ASFLAGS) -Fo $(@F) $(<F)
-
-$(BUILDDIR)/x86/$(OSSRC).asm: $(SRCDIR)/x86/$(OSSRC).S
-
-$(OBJECTS): $(FFI_HEADERS) $(HEADERS)
-
-$(WORKDIR):
-	-@if not exist "$(WORKDIR:/=\)\$(NULL)" mkdir $(WORKDIR:/=\)
-
-$(STATICLIB): $(WORKDIR) $(OBJECTS)
-	$(AR) $(ARFLAGS) -out:$(STATICLIB) @<<
-	$(OBJECTS)
-<<
-
-clean:
-	-@del /Q $(OBJECTS:/=\) 2>NUL
-	-@del /Q $(ASMSRCS:/=\) 2>NUL
-	-@del /Q /S $(WORKDIR:/=\) 2>NUL
-
-distclean: clean
-	-@del /Q $(HEADERS:/=\) $(FFI_HEADERS:/=\) 2>NUL
-	-@del /Q Makefile 2>NUL
diff --git a/ext/io/console/.document b/ext/io/console/.document
new file mode 100644
index 00000000000000..945a377256e996
--- /dev/null
+++ b/ext/io/console/.document
@@ -0,0 +1,2 @@
+console.c
+lib/size.rb
diff --git a/ext/io/console/console.c b/ext/io/console/console.c
index e852d68eedf93b..80c1cddd5a609a 100644
--- a/ext/io/console/console.c
+++ b/ext/io/console/console.c
@@ -2,6 +2,10 @@
 /*
  * console IO module
  */
+
+static const char *const
+IO_CONSOLE_VERSION = "0.8.0";
+
 #include "ruby.h"
 #include "ruby/io.h"
 #include "ruby/thread.h"
@@ -75,9 +79,16 @@ getattr(int fd, conmode *t)
 #define SET_LAST_ERROR (0)
 #endif
 
-static ID id_getc, id_console, id_close;
+#define CSI "\x1b\x5b"
+
+static ID id_getc, id_close;
 static ID id_gets, id_flush, id_chomp_bang;
 
+#ifndef HAVE_RB_INTERNED_STR_CSTR
+# define rb_str_to_interned_str(str) rb_str_freeze(str)
+# define rb_interned_str_cstr(str) rb_str_freeze(rb_usascii_str_new_cstr(str))
+#endif
+
 #if defined HAVE_RUBY_FIBER_SCHEDULER_H
 # include "ruby/fiber/scheduler.h"
 #elif defined HAVE_RB_SCHEDULER_TIMEOUT
@@ -119,7 +130,14 @@ io_get_write_io_fallback(VALUE io)
 #define rb_io_get_write_io io_get_write_io_fallback
 #endif
 
-#define sys_fail(io) rb_sys_fail_str(rb_io_path(io))
+#ifndef DHAVE_RB_SYSERR_FAIL_STR
+# define rb_syserr_fail_str(e, mesg) rb_exc_raise(rb_syserr_new_str(e, mesg))
+#endif
+
+#define sys_fail(io) do { \
+    int err = errno; \
+    rb_syserr_fail_str(err, rb_io_path(io)); \
+} while (0)
 
 #ifndef HAVE_RB_F_SEND
 #ifndef RB_PASS_CALLED_KEYWORDS
@@ -896,6 +914,16 @@ console_set_winsize(VALUE io, VALUE size)
 #endif
 
 #ifdef _WIN32
+/*
+ * call-seq:
+ *   io.check_winsize_changed { ... }   -> io
+ *
+ * Yields while console input events are queued.
+ *
+ * This method is Windows only.
+ *
+ * You must require 'io/console' to use this method.
+ */
 static VALUE
 console_check_winsize_changed(VALUE io)
 {
@@ -982,6 +1010,14 @@ console_ioflush(VALUE io)
     return io;
 }
 
+/*
+ * call-seq:
+ *   io.beep
+ *
+ * Beeps on the output console.
+ *
+ * You must require 'io/console' to use this method.
+ */
 static VALUE
 console_beep(VALUE io)
 {
@@ -1010,67 +1046,6 @@ mode_in_range(VALUE val, int high, const char *modename)
 }
 
 #if defined _WIN32
-static VALUE
-console_goto(VALUE io, VALUE y, VALUE x)
-{
-    COORD pos;
-    int fd = GetWriteFD(io);
-    pos.X = NUM2UINT(x);
-    pos.Y = NUM2UINT(y);
-    if (!SetConsoleCursorPosition((HANDLE)rb_w32_get_osfhandle(fd), pos)) {
-	rb_syserr_fail(LAST_ERROR, 0);
-    }
-    return io;
-}
-
-static VALUE
-console_cursor_pos(VALUE io)
-{
-    rb_console_size_t ws;
-    int fd = GetWriteFD(io);
-    if (!GetConsoleScreenBufferInfo((HANDLE)rb_w32_get_osfhandle(fd), &ws)) {
-	rb_syserr_fail(LAST_ERROR, 0);
-    }
-    return rb_assoc_new(UINT2NUM(ws.dwCursorPosition.Y), UINT2NUM(ws.dwCursorPosition.X));
-}
-
-static VALUE
-console_move(VALUE io, int y, int x)
-{
-    HANDLE h;
-    rb_console_size_t ws;
-    COORD *pos = &ws.dwCursorPosition;
-
-    h = (HANDLE)rb_w32_get_osfhandle(GetWriteFD(io));
-    if (!GetConsoleScreenBufferInfo(h, &ws)) {
-	rb_syserr_fail(LAST_ERROR, 0);
-    }
-    pos->X += x;
-    pos->Y += y;
-    if (!SetConsoleCursorPosition(h, *pos)) {
-	rb_syserr_fail(LAST_ERROR, 0);
-    }
-    return io;
-}
-
-static VALUE
-console_goto_column(VALUE io, VALUE val)
-{
-    HANDLE h;
-    rb_console_size_t ws;
-    COORD *pos = &ws.dwCursorPosition;
-
-    h = (HANDLE)rb_w32_get_osfhandle(GetWriteFD(io));
-    if (!GetConsoleScreenBufferInfo(h, &ws)) {
-	rb_syserr_fail(LAST_ERROR, 0);
-    }
-    pos->X = NUM2INT(val);
-    if (!SetConsoleCursorPosition(h, *pos)) {
-	rb_syserr_fail(LAST_ERROR, 0);
-    }
-    return io;
-}
-
 static void
 constat_clear(HANDLE handle, WORD attr, DWORD len, COORD pos)
 {
@@ -1080,74 +1055,6 @@ constat_clear(HANDLE handle, WORD attr, DWORD len, COORD pos)
     FillConsoleOutputCharacterW(handle, L' ', len, pos, &written);
 }
 
-static VALUE
-console_erase_line(VALUE io, VALUE val)
-{
-    HANDLE h;
-    rb_console_size_t ws;
-    COORD *pos = &ws.dwCursorPosition;
-    DWORD w;
-    int mode = mode_in_range(val, 2, "line erase");
-
-    h = (HANDLE)rb_w32_get_osfhandle(GetWriteFD(io));
-    if (!GetConsoleScreenBufferInfo(h, &ws)) {
-	rb_syserr_fail(LAST_ERROR, 0);
-    }
-    w = winsize_col(&ws);
-    switch (mode) {
-      case 0:			/* after cursor */
-	w -= pos->X;
-	break;
-      case 1:			/* before *and* cursor */
-	w = pos->X + 1;
-	pos->X = 0;
-	break;
-      case 2:			/* entire line */
-	pos->X = 0;
-	break;
-    }
-    constat_clear(h, ws.wAttributes, w, *pos);
-    return io;
-}
-
-static VALUE
-console_erase_screen(VALUE io, VALUE val)
-{
-    HANDLE h;
-    rb_console_size_t ws;
-    COORD *pos = &ws.dwCursorPosition;
-    DWORD w;
-    int mode = mode_in_range(val, 3, "screen erase");
-
-    h = (HANDLE)rb_w32_get_osfhandle(GetWriteFD(io));
-    if (!GetConsoleScreenBufferInfo(h, &ws)) {
-	rb_syserr_fail(LAST_ERROR, 0);
-    }
-    w = winsize_col(&ws);
-    switch (mode) {
-      case 0:	/* erase after cursor */
-	w = (w * (ws.srWindow.Bottom - pos->Y + 1) - pos->X);
-	break;
-      case 1:	/* erase before *and* cursor */
-	w = (w * (pos->Y - ws.srWindow.Top) + pos->X + 1);
-	pos->X = 0;
-	pos->Y = ws.srWindow.Top;
-	break;
-      case 2:	/* erase entire screen */
-	w = (w * winsize_row(&ws));
-	pos->X = 0;
-	pos->Y = ws.srWindow.Top;
-	break;
-      case 3:	/* erase entire screen */
-	w = (w * ws.dwSize.Y);
-	pos->X = 0;
-	pos->Y = 0;
-	break;
-    }
-    constat_clear(h, ws.wAttributes, w, *pos);
-    return io;
-}
-
 static VALUE
 console_scroll(VALUE io, int line)
 {
@@ -1176,8 +1083,22 @@ console_scroll(VALUE io, int line)
     return io;
 }
 
+#define GPERF_DOWNCASE 1
+#define GPERF_CASE_STRCMP 1
+#define gperf_case_strcmp STRCASECMP
 #include "win32_vk.inc"
 
+/*
+ * call-seq:
+ *   io.pressed?(key)   -> bool
+ *
+ * Returns +true+ if +key+ is pressed.  +key+ may be a virtual key
+ * code or its name (String or Symbol) with out "VK_" prefix.
+ *
+ * This method is Windows only.
+ *
+ * You must require 'io/console' to use this method.
+ */
 static VALUE
 console_key_pressed_p(VALUE io, VALUE k)
 {
@@ -1267,9 +1188,41 @@ console_vt_response(int argc, VALUE *argv, VALUE io, const struct query_args *qa
     return ret;
 }
 
+static VALUE
+console_scroll(VALUE io, int line)
+{
+    if (line) {
+	VALUE s = rb_sprintf(CSI "%d%c", line < 0 ? -line : line,
+			     line < 0 ? 'T' : 'S');
+	rb_io_write(io, s);
+    }
+    return io;
+}
+
+# define console_key_pressed_p rb_f_notimplement
+#endif
+
+/*
+ * call-seq:
+ *   io.cursor -> [row, column]
+ *
+ * Returns the current cursor position as a two-element array of integers (row, column)
+ *
+ *   io.cursor # => [3, 5]
+ *
+ * You must require 'io/console' to use this method.
+ */
 static VALUE
 console_cursor_pos(VALUE io)
 {
+#ifdef _WIN32
+    rb_console_size_t ws;
+    int fd = GetWriteFD(io);
+    if (!GetConsoleScreenBufferInfo((HANDLE)rb_w32_get_osfhandle(fd), &ws)) {
+	rb_syserr_fail(LAST_ERROR, 0);
+    }
+    return rb_assoc_new(UINT2NUM(ws.dwCursorPosition.Y), UINT2NUM(ws.dwCursorPosition.X));
+#else
     static const struct query_args query = {"\033[6n", 0};
     VALUE resp = console_vt_response(0, 0, io, &query);
     VALUE row, column, term;
@@ -1286,64 +1239,205 @@ console_cursor_pos(VALUE io)
     RARRAY_ASET(resp, 0, INT2NUM(r));
     RARRAY_ASET(resp, 1, INT2NUM(c));
     return resp;
+#endif
 }
 
+/*
+ * call-seq:
+ *   io.goto(line, column)      -> io
+ *
+ * Set the cursor position at +line+ and +column+.
+ *
+ * You must require 'io/console' to use this method.
+ */
 static VALUE
 console_goto(VALUE io, VALUE y, VALUE x)
 {
-    rb_io_write(io, rb_sprintf("\x1b[%d;%dH", NUM2UINT(y)+1, NUM2UINT(x)+1));
+#ifdef _WIN32
+    COORD pos;
+    int fd = GetWriteFD(io);
+    pos.X = NUM2UINT(x);
+    pos.Y = NUM2UINT(y);
+    if (!SetConsoleCursorPosition((HANDLE)rb_w32_get_osfhandle(fd), pos)) {
+	rb_syserr_fail(LAST_ERROR, 0);
+    }
+#else
+    rb_io_write(io, rb_sprintf(CSI "%d;%dH", NUM2UINT(y)+1, NUM2UINT(x)+1));
+#endif
     return io;
 }
 
 static VALUE
 console_move(VALUE io, int y, int x)
 {
+#ifdef _WIN32
+    HANDLE h;
+    rb_console_size_t ws;
+    COORD *pos = &ws.dwCursorPosition;
+
+    h = (HANDLE)rb_w32_get_osfhandle(GetWriteFD(io));
+    if (!GetConsoleScreenBufferInfo(h, &ws)) {
+	rb_syserr_fail(LAST_ERROR, 0);
+    }
+    pos->X += x;
+    pos->Y += y;
+    if (!SetConsoleCursorPosition(h, *pos)) {
+	rb_syserr_fail(LAST_ERROR, 0);
+    }
+#else
     if (x || y) {
 	VALUE s = rb_str_new_cstr("");
-	if (y) rb_str_catf(s, "\x1b[%d%c", y < 0 ? -y : y, y < 0 ? 'A' : 'B');
-	if (x) rb_str_catf(s, "\x1b[%d%c", x < 0 ? -x : x, x < 0 ? 'D' : 'C');
+	if (y) rb_str_catf(s, CSI "%d%c", y < 0 ? -y : y, y < 0 ? 'A' : 'B');
+	if (x) rb_str_catf(s, CSI "%d%c", x < 0 ? -x : x, x < 0 ? 'D' : 'C');
 	rb_io_write(io, s);
 	rb_io_flush(io);
     }
+#endif
     return io;
 }
 
+/*
+ * call-seq:
+ *   io.goto_column(column)     -> io
+ *
+ * Set the cursor position at +column+ in the same line of the current
+ * position.
+ *
+ * You must require 'io/console' to use this method.
+ */
 static VALUE
 console_goto_column(VALUE io, VALUE val)
 {
-    rb_io_write(io, rb_sprintf("\x1b[%dG", NUM2UINT(val)+1));
+#ifdef _WIN32
+    HANDLE h;
+    rb_console_size_t ws;
+    COORD *pos = &ws.dwCursorPosition;
+
+    h = (HANDLE)rb_w32_get_osfhandle(GetWriteFD(io));
+    if (!GetConsoleScreenBufferInfo(h, &ws)) {
+	rb_syserr_fail(LAST_ERROR, 0);
+    }
+    pos->X = NUM2INT(val);
+    if (!SetConsoleCursorPosition(h, *pos)) {
+	rb_syserr_fail(LAST_ERROR, 0);
+    }
+#else
+    rb_io_write(io, rb_sprintf(CSI "%dG", NUM2UINT(val)+1));
+#endif
     return io;
 }
 
+/*
+ * call-seq:
+ *   io.erase_line(mode)        -> io
+ *
+ * Erases the line at the cursor corresponding to +mode+.
+ * +mode+ may be either:
+ * 0: after cursor
+ * 1: before and cursor
+ * 2: entire line
+ *
+ * You must require 'io/console' to use this method.
+ */
 static VALUE
 console_erase_line(VALUE io, VALUE val)
 {
     int mode = mode_in_range(val, 2, "line erase");
-    rb_io_write(io, rb_sprintf("\x1b[%dK", mode));
+#ifdef _WIN32
+    HANDLE h;
+    rb_console_size_t ws;
+    COORD *pos = &ws.dwCursorPosition;
+    DWORD w;
+
+    h = (HANDLE)rb_w32_get_osfhandle(GetWriteFD(io));
+    if (!GetConsoleScreenBufferInfo(h, &ws)) {
+	rb_syserr_fail(LAST_ERROR, 0);
+    }
+    w = winsize_col(&ws);
+    switch (mode) {
+      case 0:			/* after cursor */
+	w -= pos->X;
+	break;
+      case 1:			/* before *and* cursor */
+	w = pos->X + 1;
+	pos->X = 0;
+	break;
+      case 2:			/* entire line */
+	pos->X = 0;
+	break;
+    }
+    constat_clear(h, ws.wAttributes, w, *pos);
+    return io;
+#else
+    rb_io_write(io, rb_sprintf(CSI "%dK", mode));
+#endif
     return io;
 }
 
+/*
+ * call-seq:
+ *   io.erase_screen(mode)      -> io
+ *
+ * Erases the screen at the cursor corresponding to +mode+.
+ * +mode+ may be either:
+ * 0: after cursor
+ * 1: before and cursor
+ * 2: entire screen
+ *
+ * You must require 'io/console' to use this method.
+ */
 static VALUE
 console_erase_screen(VALUE io, VALUE val)
 {
     int mode = mode_in_range(val, 3, "screen erase");
-    rb_io_write(io, rb_sprintf("\x1b[%dJ", mode));
-    return io;
-}
+#ifdef _WIN32
+    HANDLE h;
+    rb_console_size_t ws;
+    COORD *pos = &ws.dwCursorPosition;
+    DWORD w;
 
-static VALUE
-console_scroll(VALUE io, int line)
-{
-    if (line) {
-	VALUE s = rb_sprintf("\x1b[%d%c", line < 0 ? -line : line,
-			     line < 0 ? 'T' : 'S');
-	rb_io_write(io, s);
+    h = (HANDLE)rb_w32_get_osfhandle(GetWriteFD(io));
+    if (!GetConsoleScreenBufferInfo(h, &ws)) {
+	rb_syserr_fail(LAST_ERROR, 0);
+    }
+    w = winsize_col(&ws);
+    switch (mode) {
+      case 0:	/* erase after cursor */
+	w = (w * (ws.srWindow.Bottom - pos->Y + 1) - pos->X);
+	break;
+      case 1:	/* erase before *and* cursor */
+	w = (w * (pos->Y - ws.srWindow.Top) + pos->X + 1);
+	pos->X = 0;
+	pos->Y = ws.srWindow.Top;
+	break;
+      case 2:	/* erase entire screen */
+	w = (w * winsize_row(&ws));
+	pos->X = 0;
+	pos->Y = ws.srWindow.Top;
+	break;
+      case 3:	/* erase entire screen */
+	w = (w * ws.dwSize.Y);
+	pos->X = 0;
+	pos->Y = 0;
+	break;
     }
+    constat_clear(h, ws.wAttributes, w, *pos);
+#else
+    rb_io_write(io, rb_sprintf(CSI "%dJ", mode));
+#endif
     return io;
 }
-# define console_key_pressed_p rb_f_notimplement
-#endif
 
+/*
+ * call-seq:
+ *   io.cursor = [line, column]         -> io
+ *
+ * Same as <tt>io.goto(line, column)</tt>
+ *
+ * See IO#goto.
+ *
+ * You must require 'io/console' to use this method.
+ */
 static VALUE
 console_cursor_set(VALUE io, VALUE cpos)
 {
@@ -1352,42 +1446,98 @@ console_cursor_set(VALUE io, VALUE cpos)
     return console_goto(io, RARRAY_AREF(cpos, 0), RARRAY_AREF(cpos, 1));
 }
 
+/*
+ * call-seq:
+ *   io.cursor_up(n)            -> io
+ *
+ * Moves the cursor up +n+ lines.
+ *
+ * You must require 'io/console' to use this method.
+ */
 static VALUE
 console_cursor_up(VALUE io, VALUE val)
 {
     return console_move(io, -NUM2INT(val), 0);
 }
 
+/*
+ * call-seq:
+ *   io.cursor_down(n)          -> io
+ *
+ * Moves the cursor down +n+ lines.
+ *
+ * You must require 'io/console' to use this method.
+ */
 static VALUE
 console_cursor_down(VALUE io, VALUE val)
 {
     return console_move(io, +NUM2INT(val), 0);
 }
 
+/*
+ * call-seq:
+ *   io.cursor_left(n)          -> io
+ *
+ * Moves the cursor left +n+ columns.
+ *
+ * You must require 'io/console' to use this method.
+ */
 static VALUE
 console_cursor_left(VALUE io, VALUE val)
 {
     return console_move(io, 0, -NUM2INT(val));
 }
 
+/*
+ * call-seq:
+ *   io.cursor_right(n)         -> io
+ *
+ * Moves the cursor right +n+ columns.
+ *
+ * You must require 'io/console' to use this method.
+ */
 static VALUE
 console_cursor_right(VALUE io, VALUE val)
 {
     return console_move(io, 0, +NUM2INT(val));
 }
 
+/*
+ * call-seq:
+ *   io.scroll_forward(n)       -> io
+ *
+ * Scrolls the entire scrolls forward +n+ lines.
+ *
+ * You must require 'io/console' to use this method.
+ */
 static VALUE
 console_scroll_forward(VALUE io, VALUE val)
 {
     return console_scroll(io, +NUM2INT(val));
 }
 
+/*
+ * call-seq:
+ *   io.scroll_backward(n)      -> io
+ *
+ * Scrolls the entire scrolls backward +n+ lines.
+ *
+ * You must require 'io/console' to use this method.
+ */
 static VALUE
 console_scroll_backward(VALUE io, VALUE val)
 {
     return console_scroll(io, -NUM2INT(val));
 }
 
+/*
+ * call-seq:
+ *   io.clear_screen            -> io
+ *
+ * Clears the entire screen and moves the cursor top-left corner.
+ *
+ * You must require 'io/console' to use this method.
+ */
 static VALUE
 console_clear_screen(VALUE io)
 {
@@ -1400,10 +1550,8 @@ console_clear_screen(VALUE io)
 static VALUE
 io_open_descriptor_fallback(VALUE klass, int descriptor, int mode, VALUE path, VALUE timeout, void *encoding)
 {
-    rb_update_max_fd(descriptor);
-
     VALUE arguments[2] = {
-        INT2NUM(descriptor),
+        (rb_update_max_fd(descriptor), INT2NUM(descriptor)),
         INT2FIX(mode),
     };
 
@@ -1428,6 +1576,62 @@ rb_io_closed_p(VALUE io)
 }
 #endif
 
+#if defined(RB_EXT_RACTOR_SAFE) && defined(HAVE_RB_RACTOR_LOCAL_STORAGE_VALUE_NEWKEY)
+# define USE_RACTOR_STORAGE 1
+#else
+# define USE_RACTOR_STORAGE 0
+#endif
+
+#if USE_RACTOR_STORAGE
+#include "ruby/ractor.h"
+static rb_ractor_local_key_t key_console_dev;
+
+static bool
+console_dev_get(VALUE klass, VALUE *dev)
+{
+    return rb_ractor_local_storage_value_lookup(key_console_dev, dev);
+}
+
+static void
+console_dev_set(VALUE klass, VALUE value)
+{
+    rb_ractor_local_storage_value_set(key_console_dev, value);
+}
+
+static void
+console_dev_remove(VALUE klass)
+{
+    console_dev_set(klass, Qnil);
+}
+
+#else
+
+static ID id_console;
+
+static int
+console_dev_get(VALUE klass, VALUE *dev)
+{
+    if (rb_const_defined(klass, id_console)) {
+	*dev = rb_const_get(klass, id_console);
+	return 1;
+    }
+    return 0;
+}
+
+static void
+console_dev_set(VALUE klass, VALUE value)
+{
+    rb_const_set(klass, id_console, value);
+}
+
+static void
+console_dev_remove(VALUE klass)
+{
+    rb_const_remove(klass, id_console);
+}
+
+#endif
+
 /*
  * call-seq:
  *   IO.console      -> #<File:/dev/tty>
@@ -1456,10 +1660,9 @@ console_dev(int argc, VALUE *argv, VALUE klass)
     // Force the class to be File.
     if (klass == rb_cIO) klass = rb_cFile;
 
-    if (rb_const_defined(klass, id_console)) {
-        con = rb_const_get(klass, id_console);
+    if (console_dev_get(klass, &con)) {
         if (!RB_TYPE_P(con, T_FILE) || RTEST(rb_io_closed_p(con))) {
-            rb_const_remove(klass, id_console);
+	    console_dev_remove(klass);
             con = 0;
         }
     }
@@ -1468,7 +1671,7 @@ console_dev(int argc, VALUE *argv, VALUE klass)
         if (sym == ID2SYM(id_close) && argc == 1) {
             if (con) {
                 rb_io_close(con);
-                rb_const_remove(klass, id_console);
+                console_dev_remove(klass);
                 con = 0;
             }
             return Qnil;
@@ -1488,7 +1691,6 @@ console_dev(int argc, VALUE *argv, VALUE klass)
 #endif
 #ifdef CONSOLE_DEVICE_FOR_WRITING
         VALUE out;
-        rb_io_t *ofptr;
 #endif
         int fd;
         VALUE path = rb_obj_freeze(rb_str_new2(CONSOLE_DEVICE));
@@ -1510,7 +1712,7 @@ console_dev(int argc, VALUE *argv, VALUE klass)
 #ifdef CONSOLE_DEVICE_FOR_WRITING
         rb_io_set_write_io(con, out);
 #endif
-        rb_const_set(klass, id_console, con);
+        console_dev_set(klass, con);
     }
 
     if (sym) {
@@ -1621,18 +1823,81 @@ io_getpass(int argc, VALUE *argv, VALUE io)
     return str_chomp(str);
 }
 
+#if defined(_WIN32) || defined(HAVE_TTYNAME_R) || defined(HAVE_TTYNAME)
+/*
+ * call-seq:
+ *   io.ttyname       -> string or nil
+ *
+ * Returns name of associated terminal (tty) if +io+ is not a tty.
+ * Returns +nil+ otherwise.
+ */
+static VALUE
+console_ttyname(VALUE io)
+{
+    int fd = rb_io_descriptor(io);
+    if (!isatty(fd)) return Qnil;
+# if defined _WIN32
+    return rb_usascii_str_new_lit("con");
+# elif defined HAVE_TTYNAME_R
+    {
+	char termname[1024], *tn = termname;
+	size_t size = sizeof(termname);
+	int e;
+	if (ttyname_r(fd, tn, size) == 0)
+	    return rb_interned_str_cstr(tn);
+	if ((e = errno) == ERANGE) {
+	    VALUE s = rb_str_new(0, size);
+	    while (1) {
+		tn = RSTRING_PTR(s);
+		size = rb_str_capacity(s);
+		if (ttyname_r(fd, tn, size) == 0) {
+		    return rb_str_to_interned_str(rb_str_resize(s, strlen(tn)));
+		}
+		if ((e = errno) != ERANGE) break;
+		if ((size *= 2) >= INT_MAX/2) break;
+		rb_str_resize(s, size);
+	    }
+	}
+	rb_syserr_fail_str(e, rb_sprintf("ttyname_r(%d)", fd));
+	UNREACHABLE_RETURN(Qnil);
+    }
+# elif defined HAVE_TTYNAME
+    {
+	const char *tn = ttyname(fd);
+	if (!tn) {
+	    int e = errno;
+	    rb_syserr_fail_str(e, rb_sprintf("ttyname(%d)", fd));
+	}
+	return rb_interned_str_cstr(tn);
+    }
+# else
+#   error No ttyname function
+# endif
+}
+#else
+# define console_ttyname rb_f_notimplement
+#endif
+
 /*
  * IO console methods
  */
 void
 Init_console(void)
 {
+#if USE_RACTOR_STORAGE
+    RB_EXT_RACTOR_SAFE(true);
+#endif
+
 #undef rb_intern
+#if USE_RACTOR_STORAGE
+    key_console_dev = rb_ractor_local_storage_value_newkey();
+#else
+    id_console = rb_intern("console");
+#endif
     id_getc = rb_intern("getc");
     id_gets = rb_intern("gets");
     id_flush = rb_intern("flush");
     id_chomp_bang = rb_intern("chomp!");
-    id_console = rb_intern("console");
     id_close = rb_intern("close");
 #define init_rawmode_opt_id(name) \
     rawmode_opt_ids[kwd_##name] = rb_intern(#name)
@@ -1680,15 +1945,19 @@ InitVM_console(void)
     rb_define_method(rb_cIO, "pressed?", console_key_pressed_p, 1);
     rb_define_method(rb_cIO, "check_winsize_changed", console_check_winsize_changed, 0);
     rb_define_method(rb_cIO, "getpass", console_getpass, -1);
+    rb_define_method(rb_cIO, "ttyname", console_ttyname, 0);
     rb_define_singleton_method(rb_cIO, "console", console_dev, -1);
     {
+	/* :stopdoc: */
 	VALUE mReadable = rb_define_module_under(rb_cIO, "generic_readable");
+	/* :startdoc: */
 	rb_define_method(mReadable, "getch", io_getch, -1);
 	rb_define_method(mReadable, "getpass", io_getpass, -1);
     }
     {
 	/* :stopdoc: */
         cConmode = rb_define_class_under(rb_cIO, "ConsoleMode", rb_cObject);
+        rb_define_const(cConmode, "VERSION", rb_obj_freeze(rb_str_new_cstr(IO_CONSOLE_VERSION)));
         rb_define_alloc_func(cConmode, conmode_alloc);
         rb_undef_method(cConmode, "initialize");
         rb_define_method(cConmode, "initialize_copy", conmode_init_copy, 1);
diff --git a/ext/io/console/depend b/ext/io/console/depend
index 59ca3442c2c5c2..150a138d4dff55 100644
--- a/ext/io/console/depend
+++ b/ext/io/console/depend
@@ -139,6 +139,7 @@ console.o: $(hdrdir)/ruby/internal/intern/re.h
 console.o: $(hdrdir)/ruby/internal/intern/ruby.h
 console.o: $(hdrdir)/ruby/internal/intern/select.h
 console.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+console.o: $(hdrdir)/ruby/internal/intern/set.h
 console.o: $(hdrdir)/ruby/internal/intern/signal.h
 console.o: $(hdrdir)/ruby/internal/intern/sprintf.h
 console.o: $(hdrdir)/ruby/internal/intern/string.h
@@ -158,6 +159,7 @@ console.o: $(hdrdir)/ruby/internal/special_consts.h
 console.o: $(hdrdir)/ruby/internal/static_assert.h
 console.o: $(hdrdir)/ruby/internal/stdalign.h
 console.o: $(hdrdir)/ruby/internal/stdbool.h
+console.o: $(hdrdir)/ruby/internal/stdckdint.h
 console.o: $(hdrdir)/ruby/internal/symbol.h
 console.o: $(hdrdir)/ruby/internal/value.h
 console.o: $(hdrdir)/ruby/internal/value_type.h
@@ -168,6 +170,7 @@ console.o: $(hdrdir)/ruby/io.h
 console.o: $(hdrdir)/ruby/missing.h
 console.o: $(hdrdir)/ruby/onigmo.h
 console.o: $(hdrdir)/ruby/oniguruma.h
+console.o: $(hdrdir)/ruby/ractor.h
 console.o: $(hdrdir)/ruby/ruby.h
 console.o: $(hdrdir)/ruby/st.h
 console.o: $(hdrdir)/ruby/subst.h
@@ -184,7 +187,7 @@ win32_vk.inc: win32_vk.list
 	-e 'n=$$F[1] and (n.strip!; /\AVK_/=~n) and' \
 	-e   'puts(%[#ifndef #{n}\n# define #{n} UNDEFINED_VK\n#endif])' \
 	$< && \
-	gperf --ignore-case -E -C -P -p -j1 -i 1 -g -o -t -K ofs -N console_win32_vk -k* $< \
+	gperf --ignore-case -L ANSI-C -E -C -P -p -j1 -i 1 -g -o -t -K ofs -N console_win32_vk -k* $< \
 	| sed -f $(top_srcdir)/tool/gperf.sed \
 	) > $(@F)
 
diff --git a/ext/io/console/extconf.rb b/ext/io/console/extconf.rb
index a72403c7f90fa4..dd3d221ae51df3 100644
--- a/ext/io/console/extconf.rb
+++ b/ext/io/console/extconf.rb
@@ -1,13 +1,30 @@
 # frozen_string_literal: false
 require 'mkmf'
 
-have_func("rb_io_path")
-have_func("rb_io_descriptor")
-have_func("rb_io_get_write_io")
-have_func("rb_io_closed_p")
-have_func("rb_io_open_descriptor")
+# `--target-rbconfig` compatibility for Ruby 3.3 or earlier
+# See https://bugs.ruby-lang.org/issues/20345
+MakeMakefile::RbConfig ||= ::RbConfig
 
-ok = true if RUBY_ENGINE == "ruby" || RUBY_ENGINE == "truffleruby"
+have_func("rb_syserr_fail_str(0, Qnil)") or
+have_func("rb_syserr_new_str(0, Qnil)") or
+  abort
+
+have_func("rb_interned_str_cstr")
+have_func("rb_io_path", "ruby/io.h")
+have_func("rb_io_descriptor", "ruby/io.h")
+have_func("rb_io_get_write_io", "ruby/io.h")
+have_func("rb_io_closed_p", "ruby/io.h")
+have_func("rb_io_open_descriptor", "ruby/io.h")
+have_func("rb_ractor_local_storage_value_newkey")
+
+is_wasi = /wasi/ =~ MakeMakefile::RbConfig::CONFIG["platform"]
+# `ok` can be `true`, `false`, or `nil`:
+#   * `true` : Required headers and functions available, proceed regular build.
+#   * `false`: Required headers or functions not available, abort build.
+#   * `nil`  : Unsupported compilation target, generate dummy Makefile.
+#
+# Skip building io/console on WASI, as it does not support termios.h.
+ok = true if (RUBY_ENGINE == "ruby" && !is_wasi) || RUBY_ENGINE == "truffleruby"
 hdr = nil
 case
 when macro_defined?("_WIN32", "")
@@ -35,6 +52,7 @@
   elsif have_func("rb_scheduler_timeout") # 3.0
     have_func("rb_io_wait")
   end
+  have_func("ttyname_r") or have_func("ttyname")
   create_makefile("io/console") {|conf|
     conf << "\n""VK_HEADER = #{vk_header}\n"
   }
diff --git a/ext/io/console/io-console.gemspec b/ext/io/console/io-console.gemspec
index d26a757b010421..0a199927345be6 100644
--- a/ext/io/console/io-console.gemspec
+++ b/ext/io/console/io-console.gemspec
@@ -1,5 +1,13 @@
 # -*- ruby -*-
-_VERSION = "0.6.0"
+_VERSION = ["", "ext/io/console/"].find do |dir|
+  begin
+    break File.open(File.join(__dir__, "#{dir}console.c")) {|f|
+      f.gets("\nIO_CONSOLE_VERSION ")
+      f.gets[/"(.+)"/, 1]
+    }
+  rescue Errno::ENOENT
+  end
+end
 
 Gem::Specification.new do |s|
   s.name = "io-console"
@@ -10,10 +18,13 @@ Gem::Specification.new do |s|
   s.required_ruby_version = ">= 2.6.0"
   s.homepage = "https://github.com/ruby/io-console"
   s.metadata["source_code_url"] = s.homepage
+  s.metadata["changelog_uri"] = s.homepage + "/releases"
   s.authors = ["Nobu Nakada"]
   s.require_path = %[lib]
   s.files = %w[
-    LICENSE.txt
+    .document
+    BSDL
+    COPYING
     README.md
     ext/io/console/console.c
     ext/io/console/extconf.rb
@@ -25,15 +36,16 @@ Gem::Specification.new do |s|
   if Gem::Platform === s.platform and s.platform =~ 'java'
     s.files.delete_if {|f| f.start_with?("ext/")}
     s.extensions.clear
+    s.require_paths.unshift('lib/ffi')
     s.files.concat(%w[
-      lib/io/console.rb
-      lib/io/console/ffi/bsd_console.rb
-      lib/io/console/ffi/common.rb
-      lib/io/console/ffi/console.rb
-      lib/io/console/ffi/linux_console.rb
-      lib/io/console/ffi/native_console.rb
-      lib/io/console/ffi/stty_console.rb
-      lib/io/console/ffi/stub_console.rb
+      lib/ffi/io/console.rb
+      lib/ffi/io/console/bsd_console.rb
+      lib/ffi/io/console/common.rb
+      lib/ffi/io/console/linux_console.rb
+      lib/ffi/io/console/native_console.rb
+      lib/ffi/io/console/stty_console.rb
+      lib/ffi/io/console/stub_console.rb
+      lib/ffi/io/console/version.rb
     ])
   end
 
diff --git a/ext/io/console/win32_vk.inc b/ext/io/console/win32_vk.inc
index cbec7bef150e26..348e6be5edf1fe 100644
--- a/ext/io/console/win32_vk.inc
+++ b/ext/io/console/win32_vk.inc
@@ -480,7 +480,7 @@
 # define VK_OEM_CLEAR UNDEFINED_VK
 #endif
 /* ANSI-C code produced by gperf version 3.1 */
-/* Command-line: gperf --ignore-case -E -C -P -p -j1 -i 1 -g -o -t -K ofs -N console_win32_vk -k'*' win32_vk.list  */
+/* Command-line: gperf --ignore-case -L ANSI-C -E -C -P -p -j1 -i 1 -g -o -t -K ofs -N console_win32_vk -k'*' win32_vk.list  */
 
 #if !((' ' == 32) && ('!' == 33) && ('"' == 34) && ('#' == 35) \
       && ('%' == 37) && ('&' == 38) && ('\'' == 39) && ('(' == 40) \
@@ -509,11 +509,10 @@
 #error "gperf generated tables don't work with this execution character set. Please report a bug to <bug-gperf@gnu.org>."
 #endif
 
-#define gperf_offsetof(s, n) (short)offsetof(struct s##_t, s##_str##n)
 #line 1 "win32_vk.list"
 
 struct vktable {short ofs; unsigned short vk;};
-static const struct vktable *console_win32_vk(/*const char *, unsigned int*/);
+static const struct vktable *console_win32_vk(const char *, size_t);
 #line 5 "win32_vk.list"
 struct vktable;
 /* maximum key range = 245, duplicates = 0 */
@@ -1007,368 +1006,368 @@ console_win32_vk (register const char *str, register size_t len)
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1},
 #line 40 "win32_vk.list"
-      {gperf_offsetof(stringpool, 12), VK_UP},
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str12, VK_UP},
 #line 52 "win32_vk.list"
-      {gperf_offsetof(stringpool, 13), VK_APPS},
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str13, VK_APPS},
 #line 159 "win32_vk.list"
-      {gperf_offsetof(stringpool, 14), VK_CRSEL},
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str14, VK_CRSEL},
 #line 34 "win32_vk.list"
-      {gperf_offsetof(stringpool, 15), VK_SPACE},
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str15, VK_SPACE},
 #line 95 "win32_vk.list"
-      {gperf_offsetof(stringpool, 16), VK_SCROLL},
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str16, VK_SCROLL},
 #line 29 "win32_vk.list"
-      {gperf_offsetof(stringpool, 17), VK_ESCAPE},
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str17, VK_ESCAPE},
 #line 9 "win32_vk.list"
-      {gperf_offsetof(stringpool, 18), VK_CANCEL},
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str18, VK_CANCEL},
 #line 32 "win32_vk.list"
-      {gperf_offsetof(stringpool, 19), VK_ACCEPT},
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str19, VK_ACCEPT},
 #line 66 "win32_vk.list"
-      {gperf_offsetof(stringpool, 20), VK_SEPARATOR},
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str20, VK_SEPARATOR},
 #line 43 "win32_vk.list"
-      {gperf_offsetof(stringpool, 21), VK_SELECT},
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str21, VK_SELECT},
 #line 18 "win32_vk.list"
-      {gperf_offsetof(stringpool, 22), VK_CONTROL},
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str22, VK_CONTROL},
 #line 166 "win32_vk.list"
-      {gperf_offsetof(stringpool, 23), VK_OEM_CLEAR},
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str23, VK_OEM_CLEAR},
 #line 145 "win32_vk.list"
-      {gperf_offsetof(stringpool, 24), VK_OEM_RESET},
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str24, VK_OEM_RESET},
 #line 155 "win32_vk.list"
-      {gperf_offsetof(stringpool, 25), VK_OEM_AUTO},
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str25, VK_OEM_AUTO},
 #line 151 "win32_vk.list"
-      {gperf_offsetof(stringpool, 26), VK_OEM_CUSEL},
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str26, VK_OEM_CUSEL},
       {-1},
 #line 22 "win32_vk.list"
-      {gperf_offsetof(stringpool, 28), VK_KANA},
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str28, VK_KANA},
 #line 127 "win32_vk.list"
-      {gperf_offsetof(stringpool, 29), VK_OEM_PLUS},
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str29, VK_OEM_PLUS},
 #line 35 "win32_vk.list"
-      {gperf_offsetof(stringpool, 30), VK_PRIOR},
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str30, VK_PRIOR},
 #line 152 "win32_vk.list"
-      {gperf_offsetof(stringpool, 31), VK_OEM_ATTN},
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str31, VK_OEM_ATTN},
 #line 20 "win32_vk.list"
-      {gperf_offsetof(stringpool, 32), VK_PAUSE},
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str32, VK_PAUSE},
 #line 13 "win32_vk.list"
-      {gperf_offsetof(stringpool, 33), VK_BACK},
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str33, VK_BACK},
 #line 144 "win32_vk.list"
-      {gperf_offsetof(stringpool, 34), VK_PACKET},
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str34, VK_PACKET},
 #line 105 "win32_vk.list"
-      {gperf_offsetof(stringpool, 35), VK_RCONTROL},
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str35, VK_RCONTROL},
 #line 104 "win32_vk.list"
-      {gperf_offsetof(stringpool, 36), VK_LCONTROL},
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str36, VK_LCONTROL},
 #line 37 "win32_vk.list"
-      {gperf_offsetof(stringpool, 37), VK_END},
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str37, VK_END},
 #line 38 "win32_vk.list"
-      {gperf_offsetof(stringpool, 38), VK_HOME},
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str38, VK_HOME},
 #line 44 "win32_vk.list"
-      {gperf_offsetof(stringpool, 39), VK_PRINT},
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str39, VK_PRINT},
 #line 94 "win32_vk.list"
-      {gperf_offsetof(stringpool, 40), VK_NUMLOCK},
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str40, VK_NUMLOCK},
 #line 39 "win32_vk.list"
-      {gperf_offsetof(stringpool, 41), VK_LEFT},
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str41, VK_LEFT},
 #line 25 "win32_vk.list"
-      {gperf_offsetof(stringpool, 42), VK_JUNJA},
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str42, VK_JUNJA},
 #line 19 "win32_vk.list"
-      {gperf_offsetof(stringpool, 43), VK_MENU},
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str43, VK_MENU},
 #line 150 "win32_vk.list"
-      {gperf_offsetof(stringpool, 44), VK_OEM_WSCTRL},
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str44, VK_OEM_WSCTRL},
 #line 156 "win32_vk.list"
-      {gperf_offsetof(stringpool, 45), VK_OEM_ENLW},
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str45, VK_OEM_ENLW},
 #line 36 "win32_vk.list"
-      {gperf_offsetof(stringpool, 46), VK_NEXT},
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str46, VK_NEXT},
 #line 51 "win32_vk.list"
-      {gperf_offsetof(stringpool, 47), VK_RWIN},
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str47, VK_RWIN},
 #line 50 "win32_vk.list"
-      {gperf_offsetof(stringpool, 48), VK_LWIN},
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str48, VK_LWIN},
 #line 21 "win32_vk.list"
-      {gperf_offsetof(stringpool, 49), VK_CAPITAL},
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str49, VK_CAPITAL},
 #line 49 "win32_vk.list"
-      {gperf_offsetof(stringpool, 50), VK_HELP},
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str50, VK_HELP},
 #line 164 "win32_vk.list"
-      {gperf_offsetof(stringpool, 51), VK_NONAME},
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str51, VK_NONAME},
 #line 8 "win32_vk.list"
-      {gperf_offsetof(stringpool, 52), VK_RBUTTON},
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str52, VK_RBUTTON},
 #line 7 "win32_vk.list"
-      {gperf_offsetof(stringpool, 53), VK_LBUTTON},
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str53, VK_LBUTTON},
 #line 96 "win32_vk.list"
-      {gperf_offsetof(stringpool, 54), VK_OEM_NEC_EQUAL},
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str54, VK_OEM_NEC_EQUAL},
       {-1},
 #line 47 "win32_vk.list"
-      {gperf_offsetof(stringpool, 56), VK_INSERT},
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str56, VK_INSERT},
 #line 27 "win32_vk.list"
-      {gperf_offsetof(stringpool, 57), VK_HANJA},
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str57, VK_HANJA},
       {-1}, {-1},
 #line 46 "win32_vk.list"
-      {gperf_offsetof(stringpool, 60), VK_SNAPSHOT},
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str60, VK_SNAPSHOT},
 #line 158 "win32_vk.list"
-      {gperf_offsetof(stringpool, 61), VK_ATTN},
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str61, VK_ATTN},
 #line 14 "win32_vk.list"
-      {gperf_offsetof(stringpool, 62), VK_TAB},
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str62, VK_TAB},
 #line 157 "win32_vk.list"
-      {gperf_offsetof(stringpool, 63), VK_OEM_BACKTAB},
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str63, VK_OEM_BACKTAB},
 #line 143 "win32_vk.list"
-      {gperf_offsetof(stringpool, 64), VK_ICO_CLEAR},
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str64, VK_ICO_CLEAR},
 #line 30 "win32_vk.list"
-      {gperf_offsetof(stringpool, 65), VK_CONVERT},
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str65, VK_CONVERT},
 #line 16 "win32_vk.list"
-      {gperf_offsetof(stringpool, 66), VK_RETURN},
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str66, VK_RETURN},
 #line 146 "win32_vk.list"
-      {gperf_offsetof(stringpool, 67), VK_OEM_JUMP},
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str67, VK_OEM_JUMP},
       {-1}, {-1}, {-1},
 #line 111 "win32_vk.list"
-      {gperf_offsetof(stringpool, 71), VK_BROWSER_STOP},
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str71, VK_BROWSER_STOP},
 #line 26 "win32_vk.list"
-      {gperf_offsetof(stringpool, 72), VK_FINAL},
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str72, VK_FINAL},
 #line 163 "win32_vk.list"
-      {gperf_offsetof(stringpool, 73), VK_ZOOM},
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str73, VK_ZOOM},
 #line 28 "win32_vk.list"
-      {gperf_offsetof(stringpool, 74), VK_KANJI},
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str74, VK_KANJI},
 #line 48 "win32_vk.list"
-      {gperf_offsetof(stringpool, 75), VK_DELETE},
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str75, VK_DELETE},
 #line 128 "win32_vk.list"
-      {gperf_offsetof(stringpool, 76), VK_OEM_COMMA},
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str76, VK_OEM_COMMA},
 #line 67 "win32_vk.list"
-      {gperf_offsetof(stringpool, 77), VK_SUBTRACT},
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str77, VK_SUBTRACT},
       {-1},
 #line 10 "win32_vk.list"
-      {gperf_offsetof(stringpool, 79), VK_MBUTTON},
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str79, VK_MBUTTON},
 #line 78 "win32_vk.list"
-      {gperf_offsetof(stringpool, 80), VK_F9},
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str80, VK_F9},
 #line 17 "win32_vk.list"
-      {gperf_offsetof(stringpool, 81), VK_SHIFT},
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str81, VK_SHIFT},
 #line 103 "win32_vk.list"
-      {gperf_offsetof(stringpool, 82), VK_RSHIFT},
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str82, VK_RSHIFT},
 #line 102 "win32_vk.list"
-      {gperf_offsetof(stringpool, 83), VK_LSHIFT},
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str83, VK_LSHIFT},
 #line 65 "win32_vk.list"
-      {gperf_offsetof(stringpool, 84), VK_ADD},
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str84, VK_ADD},
 #line 31 "win32_vk.list"
-      {gperf_offsetof(stringpool, 85), VK_NONCONVERT},
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str85, VK_NONCONVERT},
 #line 160 "win32_vk.list"
-      {gperf_offsetof(stringpool, 86), VK_EXSEL},
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str86, VK_EXSEL},
 #line 126 "win32_vk.list"
-      {gperf_offsetof(stringpool, 87), VK_OEM_1},
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str87, VK_OEM_1},
 #line 138 "win32_vk.list"
-      {gperf_offsetof(stringpool, 88), VK_OEM_AX},
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str88, VK_OEM_AX},
 #line 108 "win32_vk.list"
-      {gperf_offsetof(stringpool, 89), VK_BROWSER_BACK},
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str89, VK_BROWSER_BACK},
 #line 137 "win32_vk.list"
-      {gperf_offsetof(stringpool, 90), VK_OEM_8},
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str90, VK_OEM_8},
 #line 129 "win32_vk.list"
-      {gperf_offsetof(stringpool, 91), VK_OEM_MINUS},
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str91, VK_OEM_MINUS},
 #line 162 "win32_vk.list"
-      {gperf_offsetof(stringpool, 92), VK_PLAY},
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str92, VK_PLAY},
 #line 131 "win32_vk.list"
-      {gperf_offsetof(stringpool, 93), VK_OEM_2},
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str93, VK_OEM_2},
 #line 15 "win32_vk.list"
-      {gperf_offsetof(stringpool, 94), VK_CLEAR},
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str94, VK_CLEAR},
 #line 99 "win32_vk.list"
-      {gperf_offsetof(stringpool, 95), VK_OEM_FJ_TOUROKU},
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str95, VK_OEM_FJ_TOUROKU},
 #line 147 "win32_vk.list"
-      {gperf_offsetof(stringpool, 96), VK_OEM_PA1},
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str96, VK_OEM_PA1},
 #line 140 "win32_vk.list"
-      {gperf_offsetof(stringpool, 97), VK_ICO_HELP},
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str97, VK_ICO_HELP},
 #line 112 "win32_vk.list"
-      {gperf_offsetof(stringpool, 98), VK_BROWSER_SEARCH},
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str98, VK_BROWSER_SEARCH},
 #line 53 "win32_vk.list"
-      {gperf_offsetof(stringpool, 99), VK_SLEEP},
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str99, VK_SLEEP},
       {-1},
 #line 70 "win32_vk.list"
-      {gperf_offsetof(stringpool, 101), VK_F1},
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str101, VK_F1},
 #line 148 "win32_vk.list"
-      {gperf_offsetof(stringpool, 102), VK_OEM_PA2},
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str102, VK_OEM_PA2},
 #line 154 "win32_vk.list"
-      {gperf_offsetof(stringpool, 103), VK_OEM_COPY},
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str103, VK_OEM_COPY},
 #line 77 "win32_vk.list"
-      {gperf_offsetof(stringpool, 104), VK_F8},
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str104, VK_F8},
 #line 88 "win32_vk.list"
-      {gperf_offsetof(stringpool, 105), VK_F19},
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str105, VK_F19},
 #line 41 "win32_vk.list"
-      {gperf_offsetof(stringpool, 106), VK_RIGHT},
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str106, VK_RIGHT},
 #line 71 "win32_vk.list"
-      {gperf_offsetof(stringpool, 107), VK_F2},
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str107, VK_F2},
 #line 135 "win32_vk.list"
-      {gperf_offsetof(stringpool, 108), VK_OEM_6},
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str108, VK_OEM_6},
 #line 87 "win32_vk.list"
-      {gperf_offsetof(stringpool, 109), VK_F18},
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str109, VK_F18},
       {-1},
 #line 117 "win32_vk.list"
-      {gperf_offsetof(stringpool, 111), VK_VOLUME_UP},
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str111, VK_VOLUME_UP},
       {-1}, {-1},
 #line 120 "win32_vk.list"
-      {gperf_offsetof(stringpool, 114), VK_MEDIA_STOP},
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str114, VK_MEDIA_STOP},
 #line 130 "win32_vk.list"
-      {gperf_offsetof(stringpool, 115), VK_OEM_PERIOD},
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str115, VK_OEM_PERIOD},
       {-1},
 #line 161 "win32_vk.list"
-      {gperf_offsetof(stringpool, 117), VK_EREOF},
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str117, VK_EREOF},
       {-1}, {-1}, {-1},
 #line 114 "win32_vk.list"
-      {gperf_offsetof(stringpool, 121), VK_BROWSER_HOME},
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str121, VK_BROWSER_HOME},
 #line 75 "win32_vk.list"
-      {gperf_offsetof(stringpool, 122), VK_F6},
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str122, VK_F6},
       {-1},
 #line 110 "win32_vk.list"
-      {gperf_offsetof(stringpool, 124), VK_BROWSER_REFRESH},
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str124, VK_BROWSER_REFRESH},
       {-1},
 #line 165 "win32_vk.list"
-      {gperf_offsetof(stringpool, 126), VK_PA1},
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str126, VK_PA1},
 #line 142 "win32_vk.list"
-      {gperf_offsetof(stringpool, 127), VK_PROCESSKEY},
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str127, VK_PROCESSKEY},
 #line 68 "win32_vk.list"
-      {gperf_offsetof(stringpool, 128), VK_DECIMAL},
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str128, VK_DECIMAL},
 #line 132 "win32_vk.list"
-      {gperf_offsetof(stringpool, 129), VK_OEM_3},
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str129, VK_OEM_3},
 #line 107 "win32_vk.list"
-      {gperf_offsetof(stringpool, 130), VK_RMENU},
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str130, VK_RMENU},
 #line 106 "win32_vk.list"
-      {gperf_offsetof(stringpool, 131), VK_LMENU},
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str131, VK_LMENU},
 #line 98 "win32_vk.list"
-      {gperf_offsetof(stringpool, 132), VK_OEM_FJ_MASSHOU},
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str132, VK_OEM_FJ_MASSHOU},
 #line 54 "win32_vk.list"
-      {gperf_offsetof(stringpool, 133), VK_NUMPAD0},
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str133, VK_NUMPAD0},
 #line 24 "win32_vk.list"
-      {gperf_offsetof(stringpool, 134), VK_HANGUL},
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str134, VK_HANGUL},
 #line 63 "win32_vk.list"
-      {gperf_offsetof(stringpool, 135), VK_NUMPAD9},
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str135, VK_NUMPAD9},
 #line 23 "win32_vk.list"
-      {gperf_offsetof(stringpool, 136), VK_HANGEUL},
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str136, VK_HANGEUL},
 #line 134 "win32_vk.list"
-      {gperf_offsetof(stringpool, 137), VK_OEM_5},
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str137, VK_OEM_5},
 #line 149 "win32_vk.list"
-      {gperf_offsetof(stringpool, 138), VK_OEM_PA3},
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str138, VK_OEM_PA3},
 #line 115 "win32_vk.list"
-      {gperf_offsetof(stringpool, 139), VK_VOLUME_MUTE},
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str139, VK_VOLUME_MUTE},
 #line 133 "win32_vk.list"
-      {gperf_offsetof(stringpool, 140), VK_OEM_4},
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str140, VK_OEM_4},
 #line 122 "win32_vk.list"
-      {gperf_offsetof(stringpool, 141), VK_LAUNCH_MAIL},
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str141, VK_LAUNCH_MAIL},
 #line 97 "win32_vk.list"
-      {gperf_offsetof(stringpool, 142), VK_OEM_FJ_JISHO},
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str142, VK_OEM_FJ_JISHO},
 #line 72 "win32_vk.list"
-      {gperf_offsetof(stringpool, 143), VK_F3},
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str143, VK_F3},
 #line 101 "win32_vk.list"
-      {gperf_offsetof(stringpool, 144), VK_OEM_FJ_ROYA},
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str144, VK_OEM_FJ_ROYA},
 #line 100 "win32_vk.list"
-      {gperf_offsetof(stringpool, 145), VK_OEM_FJ_LOYA},
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str145, VK_OEM_FJ_LOYA},
       {-1},
 #line 42 "win32_vk.list"
-      {gperf_offsetof(stringpool, 147), VK_DOWN},
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str147, VK_DOWN},
       {-1},
 #line 153 "win32_vk.list"
-      {gperf_offsetof(stringpool, 149), VK_OEM_FINISH},
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str149, VK_OEM_FINISH},
       {-1},
 #line 74 "win32_vk.list"
-      {gperf_offsetof(stringpool, 151), VK_F5},
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str151, VK_F5},
       {-1},
 #line 136 "win32_vk.list"
-      {gperf_offsetof(stringpool, 153), VK_OEM_7},
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str153, VK_OEM_7},
 #line 73 "win32_vk.list"
-      {gperf_offsetof(stringpool, 154), VK_F4},
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str154, VK_F4},
 #line 86 "win32_vk.list"
-      {gperf_offsetof(stringpool, 155), VK_F17},
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str155, VK_F17},
 #line 55 "win32_vk.list"
-      {gperf_offsetof(stringpool, 156), VK_NUMPAD1},
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str156, VK_NUMPAD1},
 #line 141 "win32_vk.list"
-      {gperf_offsetof(stringpool, 157), VK_ICO_00},
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str157, VK_ICO_00},
       {-1},
 #line 62 "win32_vk.list"
-      {gperf_offsetof(stringpool, 159), VK_NUMPAD8},
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str159, VK_NUMPAD8},
       {-1}, {-1},
 #line 56 "win32_vk.list"
-      {gperf_offsetof(stringpool, 162), VK_NUMPAD2},
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str162, VK_NUMPAD2},
       {-1},
 #line 124 "win32_vk.list"
-      {gperf_offsetof(stringpool, 164), VK_LAUNCH_APP1},
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str164, VK_LAUNCH_APP1},
 #line 109 "win32_vk.list"
-      {gperf_offsetof(stringpool, 165), VK_BROWSER_FORWARD},
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str165, VK_BROWSER_FORWARD},
       {-1},
 #line 76 "win32_vk.list"
-      {gperf_offsetof(stringpool, 167), VK_F7},
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str167, VK_F7},
       {-1}, {-1},
 #line 125 "win32_vk.list"
-      {gperf_offsetof(stringpool, 170), VK_LAUNCH_APP2},
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str170, VK_LAUNCH_APP2},
 #line 64 "win32_vk.list"
-      {gperf_offsetof(stringpool, 171), VK_MULTIPLY},
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str171, VK_MULTIPLY},
       {-1}, {-1},
 #line 45 "win32_vk.list"
-      {gperf_offsetof(stringpool, 174), VK_EXECUTE},
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str174, VK_EXECUTE},
       {-1},
 #line 113 "win32_vk.list"
-      {gperf_offsetof(stringpool, 176), VK_BROWSER_FAVORITES},
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str176, VK_BROWSER_FAVORITES},
 #line 60 "win32_vk.list"
-      {gperf_offsetof(stringpool, 177), VK_NUMPAD6},
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str177, VK_NUMPAD6},
       {-1},
 #line 85 "win32_vk.list"
-      {gperf_offsetof(stringpool, 179), VK_F16},
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str179, VK_F16},
       {-1}, {-1},
 #line 79 "win32_vk.list"
-      {gperf_offsetof(stringpool, 182), VK_F10},
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str182, VK_F10},
       {-1}, {-1},
 #line 116 "win32_vk.list"
-      {gperf_offsetof(stringpool, 185), VK_VOLUME_DOWN},
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str185, VK_VOLUME_DOWN},
       {-1}, {-1},
 #line 89 "win32_vk.list"
-      {gperf_offsetof(stringpool, 188), VK_F20},
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str188, VK_F20},
 #line 119 "win32_vk.list"
-      {gperf_offsetof(stringpool, 189), VK_MEDIA_PREV_TRACK},
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str189, VK_MEDIA_PREV_TRACK},
       {-1},
 #line 33 "win32_vk.list"
-      {gperf_offsetof(stringpool, 191), VK_MODECHANGE},
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str191, VK_MODECHANGE},
       {-1}, {-1}, {-1}, {-1}, {-1},
 #line 83 "win32_vk.list"
-      {gperf_offsetof(stringpool, 197), VK_F14},
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str197, VK_F14},
 #line 57 "win32_vk.list"
-      {gperf_offsetof(stringpool, 198), VK_NUMPAD3},
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str198, VK_NUMPAD3},
 #line 11 "win32_vk.list"
-      {gperf_offsetof(stringpool, 199), VK_XBUTTON1},
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str199, VK_XBUTTON1},
       {-1}, {-1}, {-1},
 #line 93 "win32_vk.list"
-      {gperf_offsetof(stringpool, 203), VK_F24},
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str203, VK_F24},
       {-1},
 #line 12 "win32_vk.list"
-      {gperf_offsetof(stringpool, 205), VK_XBUTTON2},
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str205, VK_XBUTTON2},
 #line 59 "win32_vk.list"
-      {gperf_offsetof(stringpool, 206), VK_NUMPAD5},
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str206, VK_NUMPAD5},
       {-1}, {-1},
 #line 58 "win32_vk.list"
-      {gperf_offsetof(stringpool, 209), VK_NUMPAD4},
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str209, VK_NUMPAD4},
       {-1}, {-1}, {-1}, {-1}, {-1},
 #line 121 "win32_vk.list"
-      {gperf_offsetof(stringpool, 215), VK_MEDIA_PLAY_PAUSE},
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str215, VK_MEDIA_PLAY_PAUSE},
       {-1},
 #line 123 "win32_vk.list"
-      {gperf_offsetof(stringpool, 217), VK_LAUNCH_MEDIA_SELECT},
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str217, VK_LAUNCH_MEDIA_SELECT},
 #line 80 "win32_vk.list"
-      {gperf_offsetof(stringpool, 218), VK_F11},
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str218, VK_F11},
       {-1},
 #line 139 "win32_vk.list"
-      {gperf_offsetof(stringpool, 220), VK_OEM_102},
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str220, VK_OEM_102},
 #line 118 "win32_vk.list"
-      {gperf_offsetof(stringpool, 221), VK_MEDIA_NEXT_TRACK},
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str221, VK_MEDIA_NEXT_TRACK},
 #line 61 "win32_vk.list"
-      {gperf_offsetof(stringpool, 222), VK_NUMPAD7},
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str222, VK_NUMPAD7},
       {-1},
 #line 90 "win32_vk.list"
-      {gperf_offsetof(stringpool, 224), VK_F21},
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str224, VK_F21},
       {-1},
 #line 82 "win32_vk.list"
-      {gperf_offsetof(stringpool, 226), VK_F13},
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str226, VK_F13},
       {-1}, {-1},
 #line 81 "win32_vk.list"
-      {gperf_offsetof(stringpool, 229), VK_F12},
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str229, VK_F12},
       {-1}, {-1},
 #line 92 "win32_vk.list"
-      {gperf_offsetof(stringpool, 232), VK_F23},
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str232, VK_F23},
       {-1}, {-1},
 #line 91 "win32_vk.list"
-      {gperf_offsetof(stringpool, 235), VK_F22},
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str235, VK_F22},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
 #line 84 "win32_vk.list"
-      {gperf_offsetof(stringpool, 242), VK_F15},
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str242, VK_F15},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1},
 #line 69 "win32_vk.list"
-      {gperf_offsetof(stringpool, 256), VK_DIVIDE}
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str256, VK_DIVIDE}
     };
 
   if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
diff --git a/ext/io/console/win32_vk.list b/ext/io/console/win32_vk.list
index 7909a4d1f0a6e9..5df3d6da57a71a 100644
--- a/ext/io/console/win32_vk.list
+++ b/ext/io/console/win32_vk.list
@@ -1,6 +1,6 @@
 %{
 struct vktable {short ofs; unsigned short vk;};
-static const struct vktable *console_win32_vk(/*!ANSI{*/const char *, unsigned int/*}!ANSI*/);
+static const struct vktable *console_win32_vk(const char *, size_t);
 %}
 struct vktable
 %%
diff --git a/ext/io/nonblock/depend b/ext/io/nonblock/depend
index 48384fca62822d..e78a05c31609d0 100644
--- a/ext/io/nonblock/depend
+++ b/ext/io/nonblock/depend
@@ -138,6 +138,7 @@ nonblock.o: $(hdrdir)/ruby/internal/intern/re.h
 nonblock.o: $(hdrdir)/ruby/internal/intern/ruby.h
 nonblock.o: $(hdrdir)/ruby/internal/intern/select.h
 nonblock.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+nonblock.o: $(hdrdir)/ruby/internal/intern/set.h
 nonblock.o: $(hdrdir)/ruby/internal/intern/signal.h
 nonblock.o: $(hdrdir)/ruby/internal/intern/sprintf.h
 nonblock.o: $(hdrdir)/ruby/internal/intern/string.h
@@ -157,6 +158,7 @@ nonblock.o: $(hdrdir)/ruby/internal/special_consts.h
 nonblock.o: $(hdrdir)/ruby/internal/static_assert.h
 nonblock.o: $(hdrdir)/ruby/internal/stdalign.h
 nonblock.o: $(hdrdir)/ruby/internal/stdbool.h
+nonblock.o: $(hdrdir)/ruby/internal/stdckdint.h
 nonblock.o: $(hdrdir)/ruby/internal/symbol.h
 nonblock.o: $(hdrdir)/ruby/internal/value.h
 nonblock.o: $(hdrdir)/ruby/internal/value_type.h
diff --git a/ext/io/nonblock/extconf.rb b/ext/io/nonblock/extconf.rb
index a1e6075c9b5052..505c9e6252fb99 100644
--- a/ext/io/nonblock/extconf.rb
+++ b/ext/io/nonblock/extconf.rb
@@ -7,7 +7,7 @@
   return
 end
 
-have_func("rb_io_descriptor")
+have_func("rb_io_descriptor", "ruby/io.h")
 
 hdr = %w"fcntl.h"
 if have_macro("O_NONBLOCK", hdr) and
diff --git a/ext/io/nonblock/io-nonblock.gemspec b/ext/io/nonblock/io-nonblock.gemspec
index d6df21a84d985c..b0fc662fac9fc2 100644
--- a/ext/io/nonblock/io-nonblock.gemspec
+++ b/ext/io/nonblock/io-nonblock.gemspec
@@ -1,6 +1,6 @@
 Gem::Specification.new do |spec|
   spec.name          = "io-nonblock"
-  spec.version       = "0.2.0"
+  spec.version       = "0.3.1"
   spec.authors       = ["Nobu Nakada"]
   spec.email         = ["nobu@ruby-lang.org"]
 
@@ -8,7 +8,7 @@ Gem::Specification.new do |spec|
   spec.description   = %q{Enables non-blocking mode with IO class}
   spec.homepage      = "https://github.com/ruby/io-nonblock"
   spec.licenses      = ["Ruby", "BSD-2-Clause"]
-  spec.required_ruby_version = Gem::Requirement.new(">= 2.3.0")
+  spec.required_ruby_version = Gem::Requirement.new(">= 3.0")
 
   spec.metadata["homepage_uri"] = spec.homepage
   spec.metadata["source_code_uri"] = spec.homepage
diff --git a/ext/io/nonblock/nonblock.c b/ext/io/nonblock/nonblock.c
index 4c729a760c4c38..cd40ea3335ca09 100644
--- a/ext/io/nonblock/nonblock.c
+++ b/ext/io/nonblock/nonblock.c
@@ -66,6 +66,8 @@ set_fcntl_flags(int fd, int f)
 	rb_sys_fail(0);
 }
 
+#ifndef RUBY_IO_NONBLOCK_METHODS
+
 static int
 io_nonblock_set(int fd, int f, int nb)
 {
@@ -146,6 +148,8 @@ rb_io_nonblock_set(VALUE self, VALUE value)
     return self;
 }
 
+#endif /* RUBY_IO_NONBLOCK_METHODS */
+
 static VALUE
 io_nonblock_restore(VALUE arg)
 {
@@ -193,7 +197,14 @@ rb_io_nonblock_block(int argc, VALUE *argv, VALUE self)
 void
 Init_nonblock(void)
 {
+#ifdef HAVE_RB_EXT_RACTOR_SAFE
+    rb_ext_ractor_safe(true);
+#endif
+
+#ifndef RUBY_IO_NONBLOCK_METHODS
     rb_define_method(rb_cIO, "nonblock?", rb_io_nonblock_p, 0);
     rb_define_method(rb_cIO, "nonblock=", rb_io_nonblock_set, 1);
+#endif
+
     rb_define_method(rb_cIO, "nonblock", rb_io_nonblock_block, -1);
 }
diff --git a/ext/io/wait/depend b/ext/io/wait/depend
index 83cf8f94c8a879..41d53c14000951 100644
--- a/ext/io/wait/depend
+++ b/ext/io/wait/depend
@@ -1,5 +1,4 @@
 # AUTOGENERATED DEPENDENCIES START
-# wait.o: $(hdrdir)/ruby/assert.h # not in 2.6
 wait.o: $(RUBY_EXTCONF_H)
 wait.o: $(arch_hdrdir)/ruby/config.h
 wait.o: $(hdrdir)/ruby.h
@@ -139,6 +138,7 @@ wait.o: $(hdrdir)/ruby/internal/intern/re.h
 wait.o: $(hdrdir)/ruby/internal/intern/ruby.h
 wait.o: $(hdrdir)/ruby/internal/intern/select.h
 wait.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+wait.o: $(hdrdir)/ruby/internal/intern/set.h
 wait.o: $(hdrdir)/ruby/internal/intern/signal.h
 wait.o: $(hdrdir)/ruby/internal/intern/sprintf.h
 wait.o: $(hdrdir)/ruby/internal/intern/string.h
@@ -158,6 +158,7 @@ wait.o: $(hdrdir)/ruby/internal/special_consts.h
 wait.o: $(hdrdir)/ruby/internal/static_assert.h
 wait.o: $(hdrdir)/ruby/internal/stdalign.h
 wait.o: $(hdrdir)/ruby/internal/stdbool.h
+wait.o: $(hdrdir)/ruby/internal/stdckdint.h
 wait.o: $(hdrdir)/ruby/internal/symbol.h
 wait.o: $(hdrdir)/ruby/internal/value.h
 wait.o: $(hdrdir)/ruby/internal/value_type.h
diff --git a/ext/io/wait/extconf.rb b/ext/io/wait/extconf.rb
index e63c0461873187..e97efa179d29c7 100644
--- a/ext/io/wait/extconf.rb
+++ b/ext/io/wait/extconf.rb
@@ -1,25 +1,21 @@
 # frozen_string_literal: false
 require 'mkmf'
 
-if RUBY_VERSION < "2.6"
-  File.write("Makefile", dummy_makefile($srcdir).join(""))
+target = "io/wait"
+have_func("rb_io_wait", "ruby/io.h")
+have_func("rb_io_descriptor", "ruby/io.h")
+unless macro_defined?("DOSISH", "#include <ruby.h>")
+  have_header(ioctl_h = "sys/ioctl.h") or ioctl_h = nil
+  fionread = %w[sys/ioctl.h sys/filio.h sys/socket.h].find do |h|
+    have_macro("FIONREAD", [h, ioctl_h].compact)
+  end
+  if fionread
+    $defs << "-DFIONREAD_HEADER=\"<#{fionread}>\""
+    create_makefile(target)
+  end
 else
-  target = "io/wait"
-  have_func("rb_io_wait")
-  have_func("rb_io_descriptor")
-  unless macro_defined?("DOSISH", "#include <ruby.h>")
-    have_header(ioctl_h = "sys/ioctl.h") or ioctl_h = nil
-    fionread = %w[sys/ioctl.h sys/filio.h sys/socket.h].find do |h|
-      have_macro("FIONREAD", [h, ioctl_h].compact)
-    end
-    if fionread
-      $defs << "-DFIONREAD_HEADER=\"<#{fionread}>\""
-      create_makefile(target)
-    end
-  else
-    if have_func("rb_w32_ioctlsocket", "ruby.h")
-      have_func("rb_w32_is_socket", "ruby.h")
-      create_makefile(target)
-    end
+  if have_func("rb_w32_ioctlsocket", "ruby.h")
+    have_func("rb_w32_is_socket", "ruby.h")
+    create_makefile(target)
   end
 end
diff --git a/ext/io/wait/io-wait.gemspec b/ext/io/wait/io-wait.gemspec
index ebc1f6f5c767a9..016b43100ef6bc 100644
--- a/ext/io/wait/io-wait.gemspec
+++ b/ext/io/wait/io-wait.gemspec
@@ -1,4 +1,4 @@
-_VERSION = "0.3.0"
+_VERSION = "0.3.1"
 
 Gem::Specification.new do |spec|
   spec.name          = "io-wait"
@@ -10,6 +10,7 @@ Gem::Specification.new do |spec|
   spec.description   = %q{Waits until IO is readable or writable without blocking.}
   spec.homepage      = "https://github.com/ruby/io-wait"
   spec.licenses      = ["Ruby", "BSD-2-Clause"]
+  spec.required_ruby_version = Gem::Requirement.new(">= 3.0")
 
   spec.metadata["homepage_uri"] = spec.homepage
   spec.metadata["source_code_uri"] = spec.homepage
diff --git a/ext/io/wait/wait.c b/ext/io/wait/wait.c
index 8835670e59e2c8..88e6dd2af1fb58 100644
--- a/ext/io/wait/wait.c
+++ b/ext/io/wait/wait.c
@@ -312,7 +312,7 @@ io_event_from_value(VALUE value)
 /*
  * call-seq:
  *   io.wait(events, timeout) -> event mask, false or nil
- *   io.wait(timeout = nil, mode = :read) -> self, true, or false
+ *   io.wait(*event_symbols[, timeout]) -> self, true, or false
  *
  * Waits until the IO becomes ready for the specified events and returns the
  * subset of events that become ready, or a falsy value when times out.
@@ -320,10 +320,14 @@ io_event_from_value(VALUE value)
  * The events can be a bit mask of +IO::READABLE+, +IO::WRITABLE+ or
  * +IO::PRIORITY+.
  *
- * Returns a truthy value immediately when buffered data is available.
+ * Returns an event mask (truthy value) immediately when buffered data is
+ * available.
  *
- * Optional parameter +mode+ is one of +:read+, +:write+, or
- * +:read_write+.
+ * The second form: if one or more event symbols (+:read+, +:write+, or
+ * +:read_write+) are passed, the event mask is the bit OR of the bitmask
+ * corresponding to those symbols.  In this form, +timeout+ is optional, the
+ * order of the arguments is arbitrary, and returns +io+ if any of the
+ * events is ready.
  *
  * You must require 'io/wait' to use this method.
  */
@@ -360,10 +364,6 @@ io_wait(int argc, VALUE *argv, VALUE io)
     rb_io_event_t events = 0;
     int i, return_io = 0;
 
-    /* The documented signature for this method is actually incorrect.
-     * A single timeout is allowed in any position, and multiple symbols can be given.
-     * Whether this is intentional or not, I don't know, and as such I consider this to
-     * be a legacy/slow path. */
     if (argc != 2 || (RB_SYMBOL_P(argv[0]) || RB_SYMBOL_P(argv[1]))) {
         /* We'd prefer to return the actual mask, but this form would return the io itself: */
         return_io = 1;
diff --git a/ext/json/VERSION b/ext/json/VERSION
deleted file mode 100644
index ec1cf33c3f6e22..00000000000000
--- a/ext/json/VERSION
+++ /dev/null
@@ -1 +0,0 @@
-2.6.3
diff --git a/ext/json/fbuffer/fbuffer.h b/ext/json/fbuffer/fbuffer.h
index dc8f406b5b8594..d32371476c85a2 100644
--- a/ext/json/fbuffer/fbuffer.h
+++ b/ext/json/fbuffer/fbuffer.h
@@ -1,89 +1,109 @@
-
 #ifndef _FBUFFER_H_
 #define _FBUFFER_H_
 
 #include "ruby.h"
-
-#ifndef RHASH_SIZE
-#define RHASH_SIZE(hsh) (RHASH(hsh)->tbl->num_entries)
+#include "ruby/encoding.h"
+#include "../vendor/jeaiii-ltoa.h"
+
+/* shims */
+/* This is the fallback definition from Ruby 3.4 */
+
+#ifndef RBIMPL_STDBOOL_H
+#if defined(__cplusplus)
+# if defined(HAVE_STDBOOL_H) && (__cplusplus >= 201103L)
+#  include <cstdbool>
+# endif
+#elif defined(HAVE_STDBOOL_H)
+# include <stdbool.h>
+#elif !defined(HAVE__BOOL)
+typedef unsigned char _Bool;
+# define bool  _Bool
+# define true  ((_Bool)+1)
+# define false ((_Bool)+0)
+# define __bool_true_false_are_defined
 #endif
-
-#ifndef RFLOAT_VALUE
-#define RFLOAT_VALUE(val) (RFLOAT(val)->value)
 #endif
 
-#ifndef RARRAY_LEN
-#define RARRAY_LEN(ARRAY) RARRAY(ARRAY)->len
-#endif
-#ifndef RSTRING_PTR
-#define RSTRING_PTR(string) RSTRING(string)->ptr
-#endif
-#ifndef RSTRING_LEN
-#define RSTRING_LEN(string) RSTRING(string)->len
+#ifndef RB_UNLIKELY
+#define RB_UNLIKELY(expr) expr
 #endif
 
-#ifdef PRIsVALUE
-# define RB_OBJ_CLASSNAME(obj) rb_obj_class(obj)
-# define RB_OBJ_STRING(obj) (obj)
-#else
-# define PRIsVALUE "s"
-# define RB_OBJ_CLASSNAME(obj) rb_obj_classname(obj)
-# define RB_OBJ_STRING(obj) StringValueCStr(obj)
+#ifndef RB_LIKELY
+#define RB_LIKELY(expr) expr
 #endif
 
-#ifdef HAVE_RUBY_ENCODING_H
-#include "ruby/encoding.h"
-#define FORCE_UTF8(obj) rb_enc_associate((obj), rb_utf8_encoding())
-#else
-#define FORCE_UTF8(obj)
+#ifndef MAYBE_UNUSED
+# define MAYBE_UNUSED(x) x
 #endif
 
-/* We don't need to guard objects for rbx, so let's do nothing at all. */
-#ifndef RB_GC_GUARD
-#define RB_GC_GUARD(object)
+#ifdef RUBY_DEBUG
+#ifndef JSON_DEBUG
+#define JSON_DEBUG RUBY_DEBUG
+#endif
 #endif
 
+enum fbuffer_type {
+    FBUFFER_HEAP_ALLOCATED = 0,
+    FBUFFER_STACK_ALLOCATED = 1,
+};
+
 typedef struct FBufferStruct {
+    enum fbuffer_type type;
     unsigned long initial_length;
-    char *ptr;
     unsigned long len;
     unsigned long capa;
+#ifdef JSON_DEBUG
+    unsigned long requested;
+#endif
+    char *ptr;
+    VALUE io;
 } FBuffer;
 
+#define FBUFFER_STACK_SIZE 512
+#define FBUFFER_IO_BUFFER_SIZE (16384 - 1)
 #define FBUFFER_INITIAL_LENGTH_DEFAULT 1024
 
-#define FBUFFER_PTR(fb) (fb->ptr)
-#define FBUFFER_LEN(fb) (fb->len)
-#define FBUFFER_CAPA(fb) (fb->capa)
+#define FBUFFER_PTR(fb) ((fb)->ptr)
+#define FBUFFER_LEN(fb) ((fb)->len)
+#define FBUFFER_CAPA(fb) ((fb)->capa)
 #define FBUFFER_PAIR(fb) FBUFFER_PTR(fb), FBUFFER_LEN(fb)
 
-static FBuffer *fbuffer_alloc(unsigned long initial_length);
 static void fbuffer_free(FBuffer *fb);
 static void fbuffer_clear(FBuffer *fb);
 static void fbuffer_append(FBuffer *fb, const char *newstr, unsigned long len);
-#ifdef JSON_GENERATOR
 static void fbuffer_append_long(FBuffer *fb, long number);
+static inline void fbuffer_append_char(FBuffer *fb, char newchr);
+static VALUE fbuffer_finalize(FBuffer *fb);
+
+static void fbuffer_stack_init(FBuffer *fb, unsigned long initial_length, char *stack_buffer, long stack_buffer_size)
+{
+    fb->initial_length = (initial_length > 0) ? initial_length : FBUFFER_INITIAL_LENGTH_DEFAULT;
+    if (stack_buffer) {
+        fb->type = FBUFFER_STACK_ALLOCATED;
+        fb->ptr = stack_buffer;
+        fb->capa = stack_buffer_size;
+    }
+#ifdef JSON_DEBUG
+    fb->requested = 0;
 #endif
-static void fbuffer_append_char(FBuffer *fb, char newchr);
-#ifdef JSON_GENERATOR
-static FBuffer *fbuffer_dup(FBuffer *fb);
-static VALUE fbuffer_to_s(FBuffer *fb);
-#endif
+}
 
-static FBuffer *fbuffer_alloc(unsigned long initial_length)
+static inline void fbuffer_consumed(FBuffer *fb, unsigned long consumed)
 {
-    FBuffer *fb;
-    if (initial_length <= 0) initial_length = FBUFFER_INITIAL_LENGTH_DEFAULT;
-    fb = ALLOC(FBuffer);
-    memset((void *) fb, 0, sizeof(FBuffer));
-    fb->initial_length = initial_length;
-    return fb;
+#ifdef JSON_DEBUG
+    if (consumed > fb->requested) {
+        rb_bug("fbuffer: Out of bound write");
+    }
+    fb->requested = 0;
+#endif
+    fb->len += consumed;
 }
 
 static void fbuffer_free(FBuffer *fb)
 {
-    if (fb->ptr) ruby_xfree(fb->ptr);
-    ruby_xfree(fb);
+    if (fb->ptr && fb->type == FBUFFER_HEAP_ALLOCATED) {
+        ruby_xfree(fb->ptr);
+    }
 }
 
 static void fbuffer_clear(FBuffer *fb)
@@ -91,20 +111,61 @@ static void fbuffer_clear(FBuffer *fb)
     fb->len = 0;
 }
 
-static void fbuffer_inc_capa(FBuffer *fb, unsigned long requested)
+static void fbuffer_flush(FBuffer *fb)
+{
+    rb_io_write(fb->io, rb_utf8_str_new(fb->ptr, fb->len));
+    fbuffer_clear(fb);
+}
+
+static void fbuffer_realloc(FBuffer *fb, unsigned long required)
+{
+    if (required > fb->capa) {
+        if (fb->type == FBUFFER_STACK_ALLOCATED) {
+            const char *old_buffer = fb->ptr;
+            fb->ptr = ALLOC_N(char, required);
+            fb->type = FBUFFER_HEAP_ALLOCATED;
+            MEMCPY(fb->ptr, old_buffer, char, fb->len);
+        } else {
+            REALLOC_N(fb->ptr, char, required);
+        }
+        fb->capa = required;
+    }
+}
+
+static void fbuffer_do_inc_capa(FBuffer *fb, unsigned long requested)
 {
+    if (RB_UNLIKELY(fb->io)) {
+        if (fb->capa < FBUFFER_IO_BUFFER_SIZE) {
+            fbuffer_realloc(fb, FBUFFER_IO_BUFFER_SIZE);
+        } else {
+            fbuffer_flush(fb);
+        }
+
+        if (RB_LIKELY(requested < fb->capa)) {
+            return;
+        }
+    }
+
     unsigned long required;
 
-    if (!fb->ptr) {
+    if (RB_UNLIKELY(!fb->ptr)) {
         fb->ptr = ALLOC_N(char, fb->initial_length);
         fb->capa = fb->initial_length;
     }
 
     for (required = fb->capa; requested > required - fb->len; required <<= 1);
 
-    if (required > fb->capa) {
-        REALLOC_N(fb->ptr, char, required);
-        fb->capa = required;
+    fbuffer_realloc(fb, required);
+}
+
+static inline void fbuffer_inc_capa(FBuffer *fb, unsigned long requested)
+{
+#ifdef JSON_DEBUG
+    fb->requested = requested;
+#endif
+
+    if (RB_UNLIKELY(requested > fb->capa - fb->len)) {
+        fbuffer_do_inc_capa(fb, requested);
     }
 }
 
@@ -113,11 +174,24 @@ static void fbuffer_append(FBuffer *fb, const char *newstr, unsigned long len)
     if (len > 0) {
         fbuffer_inc_capa(fb, len);
         MEMCPY(fb->ptr + fb->len, newstr, char, len);
-        fb->len += len;
+        fbuffer_consumed(fb, len);
     }
 }
 
-#ifdef JSON_GENERATOR
+/* Appends a character into a buffer. The buffer needs to have sufficient capacity, via fbuffer_inc_capa(...). */
+static inline void fbuffer_append_reserved_char(FBuffer *fb, char chr)
+{
+#ifdef JSON_DEBUG
+    if (fb->requested < 1) {
+        rb_bug("fbuffer: unreserved write");
+    }
+    fb->requested--;
+#endif
+
+    fb->ptr[fb->len] = chr;
+    fb->len++;
+}
+
 static void fbuffer_append_str(FBuffer *fb, VALUE str)
 {
     const char *newstr = StringValuePtr(str);
@@ -127,61 +201,70 @@ static void fbuffer_append_str(FBuffer *fb, VALUE str)
 
     fbuffer_append(fb, newstr, len);
 }
-#endif
 
-static void fbuffer_append_char(FBuffer *fb, char newchr)
+static inline void fbuffer_append_char(FBuffer *fb, char newchr)
 {
     fbuffer_inc_capa(fb, 1);
     *(fb->ptr + fb->len) = newchr;
-    fb->len++;
+    fbuffer_consumed(fb, 1);
 }
 
-#ifdef JSON_GENERATOR
-static void freverse(char *start, char *end)
+static inline char *fbuffer_cursor(FBuffer *fb)
 {
-    char c;
-
-    while (end > start) {
-        c = *end, *end-- = *start, *start++ = c;
-    }
+    return fb->ptr + fb->len;
 }
 
-static long fltoa(long number, char *buf)
+static inline void fbuffer_advance_to(FBuffer *fb, char *end)
 {
-    static char digits[] = "0123456789";
-    long sign = number;
-    char* tmp = buf;
-
-    if (sign < 0) number = -number;
-    do *tmp++ = digits[number % 10]; while (number /= 10);
-    if (sign < 0) *tmp++ = '-';
-    freverse(buf, tmp - 1);
-    return tmp - buf;
+    fbuffer_consumed(fb, (end - fb->ptr) - fb->len);
 }
 
+/*
+ * Appends the decimal string representation of \a number into the buffer.
+ */
 static void fbuffer_append_long(FBuffer *fb, long number)
 {
-    char buf[20];
-    unsigned long len = fltoa(number, buf);
-    fbuffer_append(fb, buf, len);
-}
-
-static FBuffer *fbuffer_dup(FBuffer *fb)
-{
-    unsigned long len = fb->len;
-    FBuffer *result;
+    /*
+     * The jeaiii_ultoa() function produces digits left-to-right,
+     * allowing us to write directly into the buffer, but we don't know
+     * the number of resulting characters.
+     *
+     * We do know, however, that the `number` argument is always in the
+     * range 0xc000000000000000 to 0x3fffffffffffffff, or, in decimal,
+     * -4611686018427387904 to 4611686018427387903. The max number of chars
+     * generated is therefore 20 (including a potential sign character).
+     */
+
+    static const int MAX_CHARS_FOR_LONG = 20;
+
+    fbuffer_inc_capa(fb, MAX_CHARS_FOR_LONG);
+
+    if (number < 0) {
+        fbuffer_append_reserved_char(fb, '-');
+
+        /*
+         * Since number is always > LONG_MIN, `-number` will not overflow
+         * and is always the positive abs() value.
+         */
+        number = -number;
+    }
 
-    result = fbuffer_alloc(len);
-    fbuffer_append(result, FBUFFER_PAIR(fb));
-    return result;
+    char *end = jeaiii_ultoa(fbuffer_cursor(fb), number);
+    fbuffer_advance_to(fb, end);
 }
 
-static VALUE fbuffer_to_s(FBuffer *fb)
+static VALUE fbuffer_finalize(FBuffer *fb)
 {
-    VALUE result = rb_str_new(FBUFFER_PTR(fb), FBUFFER_LEN(fb));
-    fbuffer_free(fb);
-    FORCE_UTF8(result);
-    return result;
+    if (fb->io) {
+        fbuffer_flush(fb);
+        fbuffer_free(fb);
+        rb_io_flush(fb->io);
+        return fb->io;
+    } else {
+        VALUE result = rb_utf8_str_new(FBUFFER_PTR(fb), FBUFFER_LEN(fb));
+        fbuffer_free(fb);
+        return result;
+    }
 }
-#endif
+
 #endif
diff --git a/ext/json/generator/depend b/ext/json/generator/depend
index 42752d1a35eefb..aee4ab94ebcce8 100644
--- a/ext/json/generator/depend
+++ b/ext/json/generator/depend
@@ -1,5 +1,5 @@
 $(OBJS): $(ruby_headers)
-generator.o: generator.c generator.h $(srcdir)/../fbuffer/fbuffer.h
+generator.o: generator.c $(srcdir)/../fbuffer/fbuffer.h
 
 # AUTOGENERATED DEPENDENCIES START
 generator.o: $(RUBY_EXTCONF_H)
@@ -142,6 +142,7 @@ generator.o: $(hdrdir)/ruby/internal/intern/re.h
 generator.o: $(hdrdir)/ruby/internal/intern/ruby.h
 generator.o: $(hdrdir)/ruby/internal/intern/select.h
 generator.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+generator.o: $(hdrdir)/ruby/internal/intern/set.h
 generator.o: $(hdrdir)/ruby/internal/intern/signal.h
 generator.o: $(hdrdir)/ruby/internal/intern/sprintf.h
 generator.o: $(hdrdir)/ruby/internal/intern/string.h
@@ -161,6 +162,7 @@ generator.o: $(hdrdir)/ruby/internal/special_consts.h
 generator.o: $(hdrdir)/ruby/internal/static_assert.h
 generator.o: $(hdrdir)/ruby/internal/stdalign.h
 generator.o: $(hdrdir)/ruby/internal/stdbool.h
+generator.o: $(hdrdir)/ruby/internal/stdckdint.h
 generator.o: $(hdrdir)/ruby/internal/symbol.h
 generator.o: $(hdrdir)/ruby/internal/value.h
 generator.o: $(hdrdir)/ruby/internal/value_type.h
@@ -176,6 +178,8 @@ generator.o: $(hdrdir)/ruby/ruby.h
 generator.o: $(hdrdir)/ruby/st.h
 generator.o: $(hdrdir)/ruby/subst.h
 generator.o: $(srcdir)/../fbuffer/fbuffer.h
+generator.o: $(srcdir)/../simd/simd.h
+generator.o: $(srcdir)/../vendor/fpconv.c
+generator.o: $(srcdir)/../vendor/jeaiii-ltoa.h
 generator.o: generator.c
-generator.o: generator.h
 # AUTOGENERATED DEPENDENCIES END
diff --git a/ext/json/generator/extconf.rb b/ext/json/generator/extconf.rb
index 8627c5f4bdd5c6..fb9afd07f7bfee 100644
--- a/ext/json/generator/extconf.rb
+++ b/ext/json/generator/extconf.rb
@@ -1,4 +1,16 @@
 require 'mkmf'
 
-$defs << "-DJSON_GENERATOR"
-create_makefile 'json/ext/generator'
+if RUBY_ENGINE == 'truffleruby'
+  # The pure-Ruby generator is faster on TruffleRuby, so skip compiling the generator extension
+  File.write('Makefile', dummy_makefile("").join)
+else
+  append_cflags("-std=c99")
+  $defs << "-DJSON_GENERATOR"
+  $defs << "-DJSON_DEBUG" if ENV["JSON_DEBUG"]
+
+  if enable_config('generator-use-simd', default=!ENV["JSON_DISABLE_SIMD"])
+    load __dir__ + "/../simd/conf.rb"
+  end
+
+  create_makefile 'json/ext/generator'
+end
diff --git a/ext/json/generator/generator.c b/ext/json/generator/generator.c
index 8f7c57e042034d..33b1bf349d29c8 100644
--- a/ext/json/generator/generator.c
+++ b/ext/json/generator/generator.c
@@ -1,324 +1,675 @@
+#include "ruby.h"
 #include "../fbuffer/fbuffer.h"
-#include "generator.h"
+#include "../vendor/fpconv.c"
 
-static VALUE mJSON, mExt, mGenerator, cState, mGeneratorMethods, mObject,
-             mHash, mArray,
+#include <math.h>
+#include <ctype.h>
+
+#include "../simd/simd.h"
+
+/* ruby api and some helpers */
+
+typedef struct JSON_Generator_StateStruct {
+    VALUE indent;
+    VALUE space;
+    VALUE space_before;
+    VALUE object_nl;
+    VALUE array_nl;
+    VALUE as_json;
+
+    long max_nesting;
+    long depth;
+    long buffer_initial_length;
+
+    bool allow_nan;
+    bool ascii_only;
+    bool script_safe;
+    bool strict;
+} JSON_Generator_State;
+
+#ifndef RB_UNLIKELY
+#define RB_UNLIKELY(cond) (cond)
+#endif
+
+static VALUE mJSON, cState, cFragment, mString_Extend, eGeneratorError, eNestingError, Encoding_UTF_8;
+
+static ID i_to_s, i_to_json, i_new, i_pack, i_unpack, i_create_id, i_extend, i_encode;
+static VALUE sym_indent, sym_space, sym_space_before, sym_object_nl, sym_array_nl, sym_max_nesting, sym_allow_nan,
+             sym_ascii_only, sym_depth, sym_buffer_initial_length, sym_script_safe, sym_escape_slash, sym_strict, sym_as_json;
+
+
+#define GET_STATE_TO(self, state) \
+    TypedData_Get_Struct(self, JSON_Generator_State, &JSON_Generator_State_type, state)
+
+#define GET_STATE(self)                       \
+    JSON_Generator_State *state;              \
+    GET_STATE_TO(self, state)
+
+struct generate_json_data;
+
+typedef void (*generator_func)(FBuffer *buffer, struct generate_json_data *data, VALUE obj);
+
+struct generate_json_data {
+    FBuffer *buffer;
+    VALUE vstate;
+    JSON_Generator_State *state;
+    VALUE obj;
+    generator_func func;
+};
+
+static VALUE cState_from_state_s(VALUE self, VALUE opts);
+static VALUE cState_partial_generate(VALUE self, VALUE obj, generator_func, VALUE io);
+static void generate_json(FBuffer *buffer, struct generate_json_data *data, VALUE obj);
+static void generate_json_object(FBuffer *buffer, struct generate_json_data *data, VALUE obj);
+static void generate_json_array(FBuffer *buffer, struct generate_json_data *data, VALUE obj);
+static void generate_json_string(FBuffer *buffer, struct generate_json_data *data, VALUE obj);
+static void generate_json_null(FBuffer *buffer, struct generate_json_data *data, VALUE obj);
+static void generate_json_false(FBuffer *buffer, struct generate_json_data *data, VALUE obj);
+static void generate_json_true(FBuffer *buffer, struct generate_json_data *data, VALUE obj);
 #ifdef RUBY_INTEGER_UNIFICATION
-             mInteger,
+static void generate_json_integer(FBuffer *buffer, struct generate_json_data *data, VALUE obj);
+#endif
+static void generate_json_fixnum(FBuffer *buffer, struct generate_json_data *data, VALUE obj);
+static void generate_json_bignum(FBuffer *buffer, struct generate_json_data *data, VALUE obj);
+static void generate_json_float(FBuffer *buffer, struct generate_json_data *data, VALUE obj);
+static void generate_json_fragment(FBuffer *buffer, struct generate_json_data *data, VALUE obj);
+
+static int usascii_encindex, utf8_encindex, binary_encindex;
+
+#ifdef RBIMPL_ATTR_NORETURN
+RBIMPL_ATTR_NORETURN()
+#endif
+static void raise_generator_error_str(VALUE invalid_object, VALUE str)
+{
+    VALUE exc = rb_exc_new_str(eGeneratorError, str);
+    rb_ivar_set(exc, rb_intern("@invalid_object"), invalid_object);
+    rb_exc_raise(exc);
+}
+
+#ifdef RBIMPL_ATTR_NORETURN
+RBIMPL_ATTR_NORETURN()
+#endif
+#ifdef RBIMPL_ATTR_FORMAT
+RBIMPL_ATTR_FORMAT(RBIMPL_PRINTF_FORMAT, 2, 3)
+#endif
+static void raise_generator_error(VALUE invalid_object, const char *fmt, ...)
+{
+    va_list args;
+    va_start(args, fmt);
+    VALUE str = rb_vsprintf(fmt, args);
+    va_end(args);
+    raise_generator_error_str(invalid_object, str);
+}
+
+// 0 - single byte char that don't need to be escaped.
+// (x | 8) - char that needs to be escaped.
+static const unsigned char CHAR_LENGTH_MASK = 7;
+static const unsigned char ESCAPE_MASK = 8;
+
+typedef struct _search_state {
+    const char *ptr;
+    const char *end;
+    const char *cursor;
+    FBuffer *buffer;
+
+#ifdef HAVE_SIMD
+    const char *chunk_base;
+    const char *chunk_end;
+    bool has_matches;
+
+#if defined(HAVE_SIMD_NEON)
+    uint64_t matches_mask;
+#elif defined(HAVE_SIMD_SSE2)
+    int matches_mask;
+#else
+#error "Unknown SIMD Implementation."
+#endif /* HAVE_SIMD_NEON */
+#endif /* HAVE_SIMD */
+} search_state;
+
+#if (defined(__GNUC__ ) || defined(__clang__))
+#define FORCE_INLINE __attribute__((always_inline))
 #else
-             mFixnum, mBignum,
+#define FORCE_INLINE
 #endif
-             mFloat, mString, mString_Extend,
-             mTrueClass, mFalseClass, mNilClass, eGeneratorError,
-             eNestingError;
 
-static ID i_to_s, i_to_json, i_new, i_indent, i_space, i_space_before,
-          i_object_nl, i_array_nl, i_max_nesting, i_allow_nan, i_ascii_only,
-          i_pack, i_unpack, i_create_id, i_extend, i_key_p,
-          i_aref, i_send, i_respond_to_p, i_match, i_keys, i_depth,
-          i_buffer_initial_length, i_dup, i_escape_slash;
+static inline FORCE_INLINE void search_flush(search_state *search)
+{
+    // Do not remove this conditional without profiling, specifically escape-heavy text.
+    // escape_UTF8_char_basic will advance search->ptr and search->cursor (effectively a search_flush).
+    // For back-to-back characters that need to be escaped, specifcally for the SIMD code paths, this method
+    // will be called just before calling escape_UTF8_char_basic. There will be no characers to append for the
+    // consecutive characters that need to be escaped. While the fbuffer_append is a no-op if
+    // nothing needs to be flushed, we can save a few memory references with this conditional.
+    if (search->ptr > search->cursor) {
+        fbuffer_append(search->buffer, search->cursor, search->ptr - search->cursor);
+        search->cursor = search->ptr;
+    }
+}
 
-/*
- * Copyright 2001-2004 Unicode, Inc.
+static const unsigned char escape_table_basic[256] = {
+    // ASCII Control Characters
+     9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+     9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+    // ASCII Characters
+     0, 0, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // '"'
+     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 0, 0, 0, // '\\'
+     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+};
+
+static unsigned char (*search_escape_basic_impl)(search_state *);
+
+static inline unsigned char search_escape_basic(search_state *search)
+{
+    while (search->ptr < search->end) {
+        if (RB_UNLIKELY(escape_table_basic[(const unsigned char)*search->ptr])) {
+            search_flush(search);
+            return 1;
+        } else {
+            search->ptr++;
+        }
+    }
+    search_flush(search);
+    return 0;
+}
+
+static inline FORCE_INLINE void escape_UTF8_char_basic(search_state *search)
+{
+    const unsigned char ch = (unsigned char)*search->ptr;
+    switch (ch) {
+        case '"':  fbuffer_append(search->buffer, "\\\"", 2); break;
+        case '\\': fbuffer_append(search->buffer, "\\\\", 2); break;
+        case '/':  fbuffer_append(search->buffer, "\\/", 2);  break;
+        case '\b': fbuffer_append(search->buffer, "\\b", 2);  break;
+        case '\f': fbuffer_append(search->buffer, "\\f", 2);  break;
+        case '\n': fbuffer_append(search->buffer, "\\n", 2);  break;
+        case '\r': fbuffer_append(search->buffer, "\\r", 2);  break;
+        case '\t': fbuffer_append(search->buffer, "\\t", 2);  break;
+        default: {
+            const char *hexdig = "0123456789abcdef";
+            char scratch[6] = { '\\', 'u', '0', '0', 0, 0 };
+            scratch[4] = hexdig[(ch >> 4) & 0xf];
+            scratch[5] = hexdig[ch & 0xf];
+            fbuffer_append(search->buffer, scratch, 6);
+            break;
+        }
+    }
+    search->ptr++;
+    search->cursor = search->ptr;
+}
+
+/* Converts in_string to a JSON string (without the wrapping '"'
+ * characters) in FBuffer out_buffer.
  *
- * Disclaimer
+ * Character are JSON-escaped according to:
  *
- * This source code is provided as is by Unicode, Inc. No claims are
- * made as to fitness for any particular purpose. No warranties of any
- * kind are expressed or implied. The recipient agrees to determine
- * applicability of information provided. If this file has been
- * purchased on magnetic or optical media from Unicode, Inc., the
- * sole remedy for any claim will be exchange of defective media
- * within 90 days of receipt.
+ * - Always: ASCII control characters (0x00-0x1F), dquote, and
+ *   backslash.
  *
- * Limitations on Rights to Redistribute This Code
+ * - If out_ascii_only: non-ASCII characters (>0x7F)
  *
- * Unicode, Inc. hereby grants the right to freely use the information
- * supplied in this file in the creation of products supporting the
- * Unicode Standard, and to make copies of this file in any form
- * for internal or external distribution as long as this notice
- * remains attached.
+ * - If script_safe: forwardslash (/), line separator (U+2028), and
+ *   paragraph separator (U+2029)
+ *
+ * Everything else (should be UTF-8) is just passed through and
+ * appended to the result.
  */
+static inline void convert_UTF8_to_JSON(search_state *search)
+{
+    while (search_escape_basic_impl(search)) {
+        escape_UTF8_char_basic(search);
+    }
+}
 
-/*
- * Index into the table below with the first byte of a UTF-8 sequence to
- * get the number of trailing bytes that are supposed to follow it.
- * Note that *legal* UTF-8 values can't have 4 or 5-bytes. The table is
- * left as-is for anyone who may want to do such conversion, which was
- * allowed in earlier algorithms.
- */
-static const char trailingBytesForUTF8[256] = {
-    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-    1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
-    2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2, 3,3,3,3,3,3,3,3,4,4,4,4,5,5,5,5
-};
+static inline void escape_UTF8_char(search_state *search, unsigned char ch_len)
+{
+    const unsigned char ch = (unsigned char)*search->ptr;
+    switch (ch_len) {
+        case 1: {
+            switch (ch) {
+                case '"':  fbuffer_append(search->buffer, "\\\"", 2); break;
+                case '\\': fbuffer_append(search->buffer, "\\\\", 2); break;
+                case '/':  fbuffer_append(search->buffer, "\\/", 2);  break;
+                case '\b': fbuffer_append(search->buffer, "\\b", 2);  break;
+                case '\f': fbuffer_append(search->buffer, "\\f", 2);  break;
+                case '\n': fbuffer_append(search->buffer, "\\n", 2);  break;
+                case '\r': fbuffer_append(search->buffer, "\\r", 2);  break;
+                case '\t': fbuffer_append(search->buffer, "\\t", 2);  break;
+                default: {
+                    const char *hexdig = "0123456789abcdef";
+                    char scratch[6] = { '\\', 'u', '0', '0', 0, 0 };
+                    scratch[4] = hexdig[(ch >> 4) & 0xf];
+                    scratch[5] = hexdig[ch & 0xf];
+                    fbuffer_append(search->buffer, scratch, 6);
+                    break;
+                }
+            }
+            break;
+        }
+        case 3: {
+            if (search->ptr[2] & 1) {
+                fbuffer_append(search->buffer, "\\u2029", 6);
+            } else {
+                fbuffer_append(search->buffer, "\\u2028", 6);
+            }
+            break;
+        }
+    }
+    search->cursor = (search->ptr += ch_len);
+}
 
-/*
- * Magic values subtracted from a buffer value during UTF8 conversion.
- * This table contains as many values as there might be trailing bytes
- * in a UTF-8 sequence.
- */
-static const UTF32 offsetsFromUTF8[6] = { 0x00000000UL, 0x00003080UL, 0x000E2080UL,
-    0x03C82080UL, 0xFA082080UL, 0x82082080UL };
+#ifdef HAVE_SIMD
 
-/*
- * Utility routine to tell whether a sequence of bytes is legal UTF-8.
- * This must be called with the length pre-determined by the first byte.
- * If not calling this from ConvertUTF8to*, then the length can be set by:
- *  length = trailingBytesForUTF8[*source]+1;
- * and the sequence is illegal right away if there aren't that many bytes
- * available.
- * If presented with a length > 4, this returns 0.  The Unicode
- * definition of UTF-8 goes up to 4-byte sequences.
- */
-static unsigned char isLegalUTF8(const UTF8 *source, unsigned long length)
-{
-    UTF8 a;
-    const UTF8 *srcptr = source+length;
-    switch (length) {
-        default: return 0;
-                 /* Everything else falls through when "1"... */
-        case 4: if ((a = (*--srcptr)) < 0x80 || a > 0xBF) return 0;
-        case 3: if ((a = (*--srcptr)) < 0x80 || a > 0xBF) return 0;
-        case 2: if ((a = (*--srcptr)) > 0xBF) return 0;
-
-                    switch (*source) {
-                        /* no fall-through in this inner switch */
-                        case 0xE0: if (a < 0xA0) return 0; break;
-                        case 0xED: if (a > 0x9F) return 0; break;
-                        case 0xF0: if (a < 0x90) return 0; break;
-                        case 0xF4: if (a > 0x8F) return 0; break;
-                        default:   if (a < 0x80) return 0;
-                    }
+static inline FORCE_INLINE char *copy_remaining_bytes(search_state *search, unsigned long vec_len, unsigned long len)
+{
+    // Flush the buffer so everything up until the last 'len' characters are unflushed.
+    search_flush(search);
 
-        case 1: if (*source >= 0x80 && *source < 0xC2) return 0;
-    }
-    if (*source > 0xF4) return 0;
-    return 1;
+    FBuffer *buf = search->buffer;
+    fbuffer_inc_capa(buf, vec_len);
+
+    char *s = (buf->ptr + buf->len);
+
+    // Pad the buffer with dummy characters that won't need escaping.
+    // This seem wateful at first sight, but memset of vector length is very fast.
+    memset(s, 'X', vec_len);
+
+    // Optimistically copy the remaining 'len' characters to the output FBuffer. If there are no characters
+    // to escape, then everything ends up in the correct spot. Otherwise it was convenient temporary storage.
+    MEMCPY(s, search->ptr, char, len);
+
+    return s;
 }
 
-/* Escapes the UTF16 character and stores the result in the buffer buf. */
-static void unicode_escape(char *buf, UTF16 character)
+#ifdef HAVE_SIMD_NEON
+
+static inline FORCE_INLINE unsigned char neon_next_match(search_state *search)
 {
-    const char *digits = "0123456789abcdef";
+    uint64_t mask = search->matches_mask;
+    uint32_t index = trailing_zeros64(mask) >> 2;
 
-    buf[2] = digits[character >> 12];
-    buf[3] = digits[(character >> 8) & 0xf];
-    buf[4] = digits[(character >> 4) & 0xf];
-    buf[5] = digits[character & 0xf];
+    // It is assumed escape_UTF8_char_basic will only ever increase search->ptr by at most one character.
+    // If we want to use a similar approach for full escaping we'll need to ensure:
+    //     search->chunk_base + index >= search->ptr
+    // However, since we know escape_UTF8_char_basic only increases search->ptr by one, if the next match
+    // is one byte after the previous match then:
+    //     search->chunk_base + index == search->ptr
+    search->ptr = search->chunk_base + index;
+    mask &= mask - 1;
+    search->matches_mask = mask;
+    search_flush(search);
+    return 1;
 }
 
-/* Escapes the UTF16 character and stores the result in the buffer buf, then
- * the buffer buf is appended to the FBuffer buffer. */
-static void unicode_escape_to_buffer(FBuffer *buffer, char buf[6], UTF16
-        character)
+static inline unsigned char search_escape_basic_neon(search_state *search)
 {
-    unicode_escape(buf, character);
-    fbuffer_append(buffer, buf, 6);
+    if (RB_UNLIKELY(search->has_matches)) {
+        // There are more matches if search->matches_mask > 0.
+        if (search->matches_mask > 0) {
+            return neon_next_match(search);
+        } else {
+            // neon_next_match will only advance search->ptr up to the last matching character.
+            // Skip over any characters in the last chunk that occur after the last match.
+            search->has_matches = false;
+            search->ptr = search->chunk_end;
+        }
+    }
+
+    /*
+    * The code below implements an SIMD-based algorithm to determine if N bytes at a time
+    * need to be escaped.
+    *
+    * Assume the ptr = "Te\sting!" (the double quotes are included in the string)
+    *
+    * The explanation will be limited to the first 8 bytes of the string for simplicity. However
+    * the vector insructions may work on larger vectors.
+    *
+    * First, we load three constants 'lower_bound', 'backslash' and 'dblquote" in vector registers.
+    *
+    * lower_bound: [20 20 20 20 20 20 20 20]
+    * backslash:   [5C 5C 5C 5C 5C 5C 5C 5C]
+    * dblquote:    [22 22 22 22 22 22 22 22]
+    *
+    * Next we load the first chunk of the ptr:
+    * [22 54 65 5C 73 74 69 6E] ("  T  e  \  s  t  i  n)
+    *
+    * First we check if any byte in chunk is less than 32 (0x20). This returns the following vector
+    * as no bytes are less than 32 (0x20):
+    * [0 0 0 0 0 0 0 0]
+    *
+    * Next, we check if any byte in chunk is equal to a backslash:
+    * [0 0 0 FF 0 0 0 0]
+    *
+    * Finally we check if any byte in chunk is equal to a double quote:
+    * [FF 0 0 0 0 0 0 0]
+    *
+    * Now we have three vectors where each byte indicates if the corresponding byte in chunk
+    * needs to be escaped. We combine these vectors with a series of logical OR instructions.
+    * This is the needs_escape vector and it is equal to:
+    * [FF 0 0 FF 0 0 0 0]
+    *
+    * Next we compute the bitwise AND between each byte and 0x1 and compute the horizontal sum of
+    * the values in the vector. This computes how many bytes need to be escaped within this chunk.
+    *
+    * Finally we compute a mask that indicates which bytes need to be escaped. If the mask is 0 then,
+    * no bytes need to be escaped and we can continue to the next chunk. If the mask is not 0 then we
+    * have at least one byte that needs to be escaped.
+    */
+
+    if (string_scan_simd_neon(&search->ptr, search->end, &search->matches_mask)) {
+        search->has_matches = true;
+        search->chunk_base = search->ptr;
+        search->chunk_end = search->ptr + sizeof(uint8x16_t);
+        return neon_next_match(search);
+    }
+
+    // There are fewer than 16 bytes left.
+    unsigned long remaining = (search->end - search->ptr);
+    if (remaining >= SIMD_MINIMUM_THRESHOLD) {
+        char *s = copy_remaining_bytes(search, sizeof(uint8x16_t), remaining);
+
+        uint64_t mask = compute_chunk_mask_neon(s);
+
+        if (!mask) {
+            // Nothing to escape, ensure search_flush doesn't do anything by setting
+            // search->cursor to search->ptr.
+            fbuffer_consumed(search->buffer, remaining);
+            search->ptr = search->end;
+            search->cursor = search->end;
+            return 0;
+        }
+
+        search->matches_mask = mask;
+        search->has_matches = true;
+        search->chunk_end = search->end;
+        search->chunk_base = search->ptr;
+        return neon_next_match(search);
+    }
+
+    if (search->ptr < search->end) {
+        return search_escape_basic(search);
+    }
+
+    search_flush(search);
+    return 0;
 }
+#endif /* HAVE_SIMD_NEON */
+
+#ifdef HAVE_SIMD_SSE2
 
-/* Converts string to a JSON string in FBuffer buffer, where all but the ASCII
- * and control characters are JSON escaped. */
-static void convert_UTF8_to_JSON_ASCII(FBuffer *buffer, VALUE string, char escape_slash)
+static inline FORCE_INLINE unsigned char sse2_next_match(search_state *search)
 {
-    const UTF8 *source = (UTF8 *) RSTRING_PTR(string);
-    const UTF8 *sourceEnd = source + RSTRING_LEN(string);
-    char buf[6] = { '\\', 'u' };
+    int mask = search->matches_mask;
+    int index = trailing_zeros(mask);
 
-    while (source < sourceEnd) {
-        UTF32 ch = 0;
-        unsigned short extraBytesToRead = trailingBytesForUTF8[*source];
-        if (source + extraBytesToRead >= sourceEnd) {
-            rb_raise(rb_path2class("JSON::GeneratorError"),
-                    "partial character in source, but hit end");
-        }
-        if (!isLegalUTF8(source, extraBytesToRead+1)) {
-            rb_raise(rb_path2class("JSON::GeneratorError"),
-                    "source sequence is illegal/malformed utf-8");
-        }
-        /*
-         * The cases all fall through. See "Note A" below.
-         */
-        switch (extraBytesToRead) {
-            case 5: ch += *source++; ch <<= 6; /* remember, illegal UTF-8 */
-            case 4: ch += *source++; ch <<= 6; /* remember, illegal UTF-8 */
-            case 3: ch += *source++; ch <<= 6;
-            case 2: ch += *source++; ch <<= 6;
-            case 1: ch += *source++; ch <<= 6;
-            case 0: ch += *source++;
-        }
-        ch -= offsetsFromUTF8[extraBytesToRead];
-
-        if (ch <= UNI_MAX_BMP) { /* Target is a character <= 0xFFFF */
-            /* UTF-16 surrogate values are illegal in UTF-32 */
-            if (ch >= UNI_SUR_HIGH_START && ch <= UNI_SUR_LOW_END) {
-#if UNI_STRICT_CONVERSION
-                source -= (extraBytesToRead+1); /* return to the illegal value itself */
-                rb_raise(rb_path2class("JSON::GeneratorError"),
-                        "source sequence is illegal/malformed utf-8");
+    // It is assumed escape_UTF8_char_basic will only ever increase search->ptr by at most one character.
+    // If we want to use a similar approach for full escaping we'll need to ensure:
+    //     search->chunk_base + index >= search->ptr
+    // However, since we know escape_UTF8_char_basic only increases search->ptr by one, if the next match
+    // is one byte after the previous match then:
+    //     search->chunk_base + index == search->ptr
+    search->ptr = search->chunk_base + index;
+    mask &= mask - 1;
+    search->matches_mask = mask;
+    search_flush(search);
+    return 1;
+}
+
+#if defined(__clang__) || defined(__GNUC__)
+#define TARGET_SSE2 __attribute__((target("sse2")))
 #else
-                unicode_escape_to_buffer(buffer, buf, UNI_REPLACEMENT_CHAR);
+#define TARGET_SSE2
 #endif
+
+static inline TARGET_SSE2 FORCE_INLINE unsigned char search_escape_basic_sse2(search_state *search)
+{
+    if (RB_UNLIKELY(search->has_matches)) {
+        // There are more matches if search->matches_mask > 0.
+        if (search->matches_mask > 0) {
+            return sse2_next_match(search);
+        } else {
+            // sse2_next_match will only advance search->ptr up to the last matching character.
+            // Skip over any characters in the last chunk that occur after the last match.
+            search->has_matches = false;
+            if (RB_UNLIKELY(search->chunk_base + sizeof(__m128i) >= search->end)) {
+                search->ptr = search->end;
             } else {
-                /* normal case */
-                if (ch >= 0x20 && ch <= 0x7f) {
-                    switch (ch) {
-                        case '\\':
-                            fbuffer_append(buffer, "\\\\", 2);
-                            break;
-                        case '"':
-                            fbuffer_append(buffer, "\\\"", 2);
-                            break;
-                        case '/':
-                            if(escape_slash) {
-                                fbuffer_append(buffer, "\\/", 2);
-                                break;
-                            }
-                        default:
-                            fbuffer_append_char(buffer, (char)ch);
-                            break;
-                    }
-                } else {
-                    switch (ch) {
-                        case '\n':
-                            fbuffer_append(buffer, "\\n", 2);
-                            break;
-                        case '\r':
-                            fbuffer_append(buffer, "\\r", 2);
-                            break;
-                        case '\t':
-                            fbuffer_append(buffer, "\\t", 2);
-                            break;
-                        case '\f':
-                            fbuffer_append(buffer, "\\f", 2);
-                            break;
-                        case '\b':
-                            fbuffer_append(buffer, "\\b", 2);
-                            break;
-                        default:
-                            unicode_escape_to_buffer(buffer, buf, (UTF16) ch);
-                            break;
+                search->ptr = search->chunk_base + sizeof(__m128i);
+            }
+        }
+    }
+
+    if (string_scan_simd_sse2(&search->ptr, search->end, &search->matches_mask)) {
+        search->has_matches = true;
+        search->chunk_base = search->ptr;
+        search->chunk_end = search->ptr + sizeof(__m128i);
+        return sse2_next_match(search);
+    }
+
+    // There are fewer than 16 bytes left.
+    unsigned long remaining = (search->end - search->ptr);
+    if (remaining >= SIMD_MINIMUM_THRESHOLD) {
+        char *s = copy_remaining_bytes(search, sizeof(__m128i), remaining);
+
+        int needs_escape_mask = compute_chunk_mask_sse2(s);
+
+        if (needs_escape_mask == 0) {
+            // Nothing to escape, ensure search_flush doesn't do anything by setting
+            // search->cursor to search->ptr.
+            fbuffer_consumed(search->buffer, remaining);
+            search->ptr = search->end;
+            search->cursor = search->end;
+            return 0;
+        }
+
+        search->has_matches = true;
+        search->matches_mask = needs_escape_mask;
+        search->chunk_base = search->ptr;
+        return sse2_next_match(search);
+    }
+
+    if (search->ptr < search->end) {
+        return search_escape_basic(search);
+    }
+
+    search_flush(search);
+    return 0;
+}
+
+#endif /* HAVE_SIMD_SSE2 */
+
+#endif /* HAVE_SIMD */
+
+static const unsigned char script_safe_escape_table[256] = {
+    // ASCII Control Characters
+     9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+     9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+    // ASCII Characters
+     0, 0, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, // '"' and '/'
+     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 0, 0, 0, // '\\'
+     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    // Continuation byte
+     1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+     1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+     1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+     1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+    // First byte of a 2-byte code point
+     2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+     2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+    // First byte of a 3-byte code point
+     3, 3,11, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, // 0xE2 is the start of \u2028 and \u2029
+    //First byte of a 4+ byte code point
+     4, 4, 4, 4, 4, 4, 4, 4, 5, 5, 5, 5, 6, 6, 9, 9,
+};
+
+static inline unsigned char search_script_safe_escape(search_state *search)
+{
+    while (search->ptr < search->end) {
+        unsigned char ch = (unsigned char)*search->ptr;
+        unsigned char ch_len = script_safe_escape_table[ch];
+
+        if (RB_UNLIKELY(ch_len)) {
+            if (ch_len & ESCAPE_MASK) {
+                if (RB_UNLIKELY(ch_len == 11)) {
+                    const unsigned char *uptr = (const unsigned char *)search->ptr;
+                    if (!(uptr[1] == 0x80 && (uptr[2] >> 1) == 0x54)) {
+                        search->ptr += 3;
+                        continue;
                     }
                 }
+                search_flush(search);
+                return ch_len & CHAR_LENGTH_MASK;
+            } else {
+                search->ptr += ch_len;
             }
-        } else if (ch > UNI_MAX_UTF16) {
-#if UNI_STRICT_CONVERSION
-            source -= (extraBytesToRead+1); /* return to the start */
-            rb_raise(rb_path2class("JSON::GeneratorError"),
-                    "source sequence is illegal/malformed utf8");
-#else
-            unicode_escape_to_buffer(buffer, buf, UNI_REPLACEMENT_CHAR);
-#endif
         } else {
-            /* target is a character in range 0xFFFF - 0x10FFFF. */
-            ch -= halfBase;
-            unicode_escape_to_buffer(buffer, buf, (UTF16)((ch >> halfShift) + UNI_SUR_HIGH_START));
-            unicode_escape_to_buffer(buffer, buf, (UTF16)((ch & halfMask) + UNI_SUR_LOW_START));
+            search->ptr++;
         }
     }
-    RB_GC_GUARD(string);
-}
-
-/* Converts string to a JSON string in FBuffer buffer, where only the
- * characters required by the JSON standard are JSON escaped. The remaining
- * characters (should be UTF8) are just passed through and appended to the
- * result. */
-static void convert_UTF8_to_JSON(FBuffer *buffer, VALUE string, char escape_slash)
-{
-    const char *ptr = RSTRING_PTR(string), *p;
-    unsigned long len = RSTRING_LEN(string), start = 0, end = 0;
-    const char *escape = NULL;
-    int escape_len;
-    unsigned char c;
-    char buf[6] = { '\\', 'u' };
-    int ascii_only = rb_enc_str_asciionly_p(string);
-
-    for (start = 0, end = 0; end < len;) {
-        p = ptr + end;
-        c = (unsigned char) *p;
-        if (c < 0x20) {
-            switch (c) {
-                case '\n':
-                    escape = "\\n";
-                    escape_len = 2;
-                    break;
-                case '\r':
-                    escape = "\\r";
-                    escape_len = 2;
-                    break;
-                case '\t':
-                    escape = "\\t";
-                    escape_len = 2;
-                    break;
-                case '\f':
-                    escape = "\\f";
-                    escape_len = 2;
-                    break;
-                case '\b':
-                    escape = "\\b";
-                    escape_len = 2;
-                    break;
-                default:
-                    unicode_escape(buf, (UTF16) *p);
-                    escape = buf;
-                    escape_len = 6;
+    search_flush(search);
+    return 0;
+}
+
+static void convert_UTF8_to_script_safe_JSON(search_state *search)
+{
+    unsigned char ch_len;
+    while ((ch_len = search_script_safe_escape(search))) {
+        escape_UTF8_char(search, ch_len);
+    }
+}
+
+static const unsigned char ascii_only_escape_table[256] = {
+    // ASCII Control Characters
+     9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+     9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+    // ASCII Characters
+     0, 0, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // '"'
+     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 0, 0, 0, // '\\'
+     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    // Continuation byte
+     1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+     1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+     1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+     1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+    // First byte of a  2-byte code point
+     2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+     2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+    // First byte of a 3-byte code point
+     3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
+    //First byte of a 4+ byte code point
+     4, 4, 4, 4, 4, 4, 4, 4, 5, 5, 5, 5, 6, 6, 9, 9,
+};
+
+static inline unsigned char search_ascii_only_escape(search_state *search, const unsigned char escape_table[256])
+{
+    while (search->ptr < search->end) {
+        unsigned char ch = (unsigned char)*search->ptr;
+        unsigned char ch_len = escape_table[ch];
+
+        if (RB_UNLIKELY(ch_len)) {
+            search_flush(search);
+            return ch_len & CHAR_LENGTH_MASK;
+        } else {
+            search->ptr++;
+        }
+    }
+    search_flush(search);
+    return 0;
+}
+
+static inline void full_escape_UTF8_char(search_state *search, unsigned char ch_len)
+{
+    const unsigned char ch = (unsigned char)*search->ptr;
+    switch (ch_len) {
+        case 1: {
+            switch (ch) {
+                case '"':  fbuffer_append(search->buffer, "\\\"", 2); break;
+                case '\\': fbuffer_append(search->buffer, "\\\\", 2); break;
+                case '/':  fbuffer_append(search->buffer, "\\/", 2);  break;
+                case '\b': fbuffer_append(search->buffer, "\\b", 2);  break;
+                case '\f': fbuffer_append(search->buffer, "\\f", 2);  break;
+                case '\n': fbuffer_append(search->buffer, "\\n", 2);  break;
+                case '\r': fbuffer_append(search->buffer, "\\r", 2);  break;
+                case '\t': fbuffer_append(search->buffer, "\\t", 2);  break;
+                default: {
+                    const char *hexdig = "0123456789abcdef";
+                    char scratch[6] = { '\\', 'u', '0', '0', 0, 0 };
+                    scratch[4] = hexdig[(ch >> 4) & 0xf];
+                    scratch[5] = hexdig[ch & 0xf];
+                    fbuffer_append(search->buffer, scratch, 6);
                     break;
+                }
             }
-        } else {
-            switch (c) {
-                case '\\':
-                    escape = "\\\\";
-                    escape_len = 2;
+            break;
+        }
+        default: {
+            const char *hexdig = "0123456789abcdef";
+            char scratch[12] = { '\\', 'u', 0, 0, 0, 0, '\\', 'u' };
+
+            uint32_t wchar = 0;
+
+            switch (ch_len) {
+                case 2:
+                    wchar = ch & 0x1F;
                     break;
-                case '"':
-                    escape =  "\\\"";
-                    escape_len = 2;
+                case 3:
+                    wchar = ch & 0x0F;
                     break;
-                case '/':
-                    if(escape_slash) {
-                        escape = "\\/";
-                        escape_len = 2;
-                        break;
-                    }
-                default:
-                    {
-                        unsigned short clen = 1;
-                        if (!ascii_only) {
-                            clen += trailingBytesForUTF8[c];
-                            if (end + clen > len) {
-                                rb_raise(rb_path2class("JSON::GeneratorError"),
-                                        "partial character in source, but hit end");
-                            }
-                            if (!isLegalUTF8((UTF8 *) p, clen)) {
-                                rb_raise(rb_path2class("JSON::GeneratorError"),
-                                        "source sequence is illegal/malformed utf-8");
-                            }
-                        }
-                        end += clen;
-                    }
-                    continue;
+                case 4:
+                    wchar = ch & 0x07;
                     break;
             }
+
+            for (short i = 1; i < ch_len; i++) {
+                wchar = (wchar << 6) | (search->ptr[i] & 0x3F);
+            }
+
+            if (wchar <= 0xFFFF) {
+                scratch[2] = hexdig[wchar >> 12];
+                scratch[3] = hexdig[(wchar >> 8) & 0xf];
+                scratch[4] = hexdig[(wchar >> 4) & 0xf];
+                scratch[5] = hexdig[wchar & 0xf];
+                fbuffer_append(search->buffer, scratch, 6);
+            } else {
+                uint16_t hi, lo;
+                wchar -= 0x10000;
+                hi = 0xD800 + (uint16_t)(wchar >> 10);
+                lo = 0xDC00 + (uint16_t)(wchar & 0x3FF);
+
+                scratch[2] = hexdig[hi >> 12];
+                scratch[3] = hexdig[(hi >> 8) & 0xf];
+                scratch[4] = hexdig[(hi >> 4) & 0xf];
+                scratch[5] = hexdig[hi & 0xf];
+
+                scratch[8] = hexdig[lo >> 12];
+                scratch[9] = hexdig[(lo >> 8) & 0xf];
+                scratch[10] = hexdig[(lo >> 4) & 0xf];
+                scratch[11] = hexdig[lo & 0xf];
+
+                fbuffer_append(search->buffer, scratch, 12);
+            }
+
+            break;
         }
-        fbuffer_append(buffer, ptr + start, end - start);
-        fbuffer_append(buffer, escape, escape_len);
-        start = ++end;
-        escape = NULL;
     }
-    fbuffer_append(buffer, ptr + start, end - start);
+    search->cursor = (search->ptr += ch_len);
 }
 
-static char *fstrndup(const char *ptr, unsigned long len) {
-  char *result;
-  if (len <= 0) return NULL;
-  result = ALLOC_N(char, len);
-  memcpy(result, ptr, len);
-  return result;
+static void convert_UTF8_to_ASCII_only_JSON(search_state *search, const unsigned char escape_table[256])
+{
+    unsigned char ch_len;
+    while ((ch_len = search_ascii_only_escape(search, escape_table))) {
+        full_escape_UTF8_char(search, ch_len);
+    }
 }
 
 /*
@@ -413,7 +764,9 @@ static char *fstrndup(const char *ptr, unsigned long len) {
  */
 static VALUE mHash_to_json(int argc, VALUE *argv, VALUE self)
 {
-    GENERATE_JSON(object);
+    rb_check_arity(argc, 0, 1);
+    VALUE Vstate = cState_from_state_s(cState, argc == 1 ? argv[0] : Qnil);
+    return cState_partial_generate(Vstate, self, generate_json_object, Qfalse);
 }
 
 /*
@@ -424,8 +777,11 @@ static VALUE mHash_to_json(int argc, VALUE *argv, VALUE self)
  * _state_ is a JSON::State object, that can also be used to configure the
  * produced JSON string output further.
  */
-static VALUE mArray_to_json(int argc, VALUE *argv, VALUE self) {
-    GENERATE_JSON(array);
+static VALUE mArray_to_json(int argc, VALUE *argv, VALUE self)
+{
+    rb_check_arity(argc, 0, 1);
+    VALUE Vstate = cState_from_state_s(cState, argc == 1 ? argv[0] : Qnil);
+    return cState_partial_generate(Vstate, self, generate_json_array, Qfalse);
 }
 
 #ifdef RUBY_INTEGER_UNIFICATION
@@ -436,7 +792,9 @@ static VALUE mArray_to_json(int argc, VALUE *argv, VALUE self) {
  */
 static VALUE mInteger_to_json(int argc, VALUE *argv, VALUE self)
 {
-    GENERATE_JSON(integer);
+    rb_check_arity(argc, 0, 1);
+    VALUE Vstate = cState_from_state_s(cState, argc == 1 ? argv[0] : Qnil);
+    return cState_partial_generate(Vstate, self, generate_json_integer, Qfalse);
 }
 
 #else
@@ -447,7 +805,9 @@ static VALUE mInteger_to_json(int argc, VALUE *argv, VALUE self)
  */
 static VALUE mFixnum_to_json(int argc, VALUE *argv, VALUE self)
 {
-    GENERATE_JSON(fixnum);
+    rb_check_arity(argc, 0, 1);
+    VALUE Vstate = cState_from_state_s(cState, argc == 1 ? argv[0] : Qnil);
+    return cState_partial_generate(Vstate, self, generate_json_fixnum, Qfalse);
 }
 
 /*
@@ -457,7 +817,9 @@ static VALUE mFixnum_to_json(int argc, VALUE *argv, VALUE self)
  */
 static VALUE mBignum_to_json(int argc, VALUE *argv, VALUE self)
 {
-    GENERATE_JSON(bignum);
+    rb_check_arity(argc, 0, 1);
+    VALUE Vstate = cState_from_state_s(cState, argc == 1 ? argv[0] : Qnil);
+    return cState_partial_generate(Vstate, self, generate_json_bignum, Qfalse);
 }
 #endif
 
@@ -468,7 +830,9 @@ static VALUE mBignum_to_json(int argc, VALUE *argv, VALUE self)
  */
 static VALUE mFloat_to_json(int argc, VALUE *argv, VALUE self)
 {
-    GENERATE_JSON(float);
+    rb_check_arity(argc, 0, 1);
+    VALUE Vstate = cState_from_state_s(cState, argc == 1 ? argv[0] : Qnil);
+    return cState_partial_generate(Vstate, self, generate_json_float, Qfalse);
 }
 
 /*
@@ -476,7 +840,8 @@ static VALUE mFloat_to_json(int argc, VALUE *argv, VALUE self)
  *
  * Extends _modul_ with the String::Extend module.
  */
-static VALUE mString_included_s(VALUE self, VALUE modul) {
+static VALUE mString_included_s(VALUE self, VALUE modul)
+{
     VALUE result = rb_funcall(modul, i_extend, 1, mString_Extend);
     rb_call_super(1, &modul);
     return result;
@@ -491,7 +856,9 @@ static VALUE mString_included_s(VALUE self, VALUE modul) {
  */
 static VALUE mString_to_json(int argc, VALUE *argv, VALUE self)
 {
-    GENERATE_JSON(string);
+    rb_check_arity(argc, 0, 1);
+    VALUE Vstate = cState_from_state_s(cState, argc == 1 ? argv[0] : Qnil);
+    return cState_partial_generate(Vstate, self, generate_json_string, Qfalse);
 }
 
 /*
@@ -508,7 +875,7 @@ static VALUE mString_to_json_raw_object(VALUE self)
     VALUE result = rb_hash_new();
     rb_hash_aset(result, rb_funcall(mJSON, i_create_id, 0), rb_class_name(rb_obj_class(self)));
     ary = rb_funcall(self, i_unpack, 1, rb_str_new2("C*"));
-    rb_hash_aset(result, rb_str_new2("raw"), ary);
+    rb_hash_aset(result, rb_utf8_str_new_lit("raw"), ary);
     return result;
 }
 
@@ -546,7 +913,8 @@ static VALUE mString_Extend_json_create(VALUE self, VALUE o)
  */
 static VALUE mTrueClass_to_json(int argc, VALUE *argv, VALUE self)
 {
-    GENERATE_JSON(true);
+    rb_check_arity(argc, 0, 1);
+    return rb_utf8_str_new("true", 4);
 }
 
 /*
@@ -556,7 +924,8 @@ static VALUE mTrueClass_to_json(int argc, VALUE *argv, VALUE self)
  */
 static VALUE mFalseClass_to_json(int argc, VALUE *argv, VALUE self)
 {
-    GENERATE_JSON(false);
+    rb_check_arity(argc, 0, 1);
+    return rb_utf8_str_new("false", 5);
 }
 
 /*
@@ -566,7 +935,8 @@ static VALUE mFalseClass_to_json(int argc, VALUE *argv, VALUE self)
  */
 static VALUE mNilClass_to_json(int argc, VALUE *argv, VALUE self)
 {
-    GENERATE_JSON(null);
+    rb_check_arity(argc, 0, 1);
+    return rb_utf8_str_new("null", 4);
 }
 
 /*
@@ -583,36 +953,40 @@ static VALUE mObject_to_json(int argc, VALUE *argv, VALUE self)
     rb_scan_args(argc, argv, "01", &state);
     Check_Type(string, T_STRING);
     state = cState_from_state_s(cState, state);
-    return cState_partial_generate(state, string);
+    return cState_partial_generate(state, string, generate_json_string, Qfalse);
+}
+
+static void State_mark(void *ptr)
+{
+    JSON_Generator_State *state = ptr;
+    rb_gc_mark_movable(state->indent);
+    rb_gc_mark_movable(state->space);
+    rb_gc_mark_movable(state->space_before);
+    rb_gc_mark_movable(state->object_nl);
+    rb_gc_mark_movable(state->array_nl);
+    rb_gc_mark_movable(state->as_json);
+}
+
+static void State_compact(void *ptr)
+{
+    JSON_Generator_State *state = ptr;
+    state->indent = rb_gc_location(state->indent);
+    state->space = rb_gc_location(state->space);
+    state->space_before = rb_gc_location(state->space_before);
+    state->object_nl = rb_gc_location(state->object_nl);
+    state->array_nl = rb_gc_location(state->array_nl);
+    state->as_json = rb_gc_location(state->as_json);
 }
 
 static void State_free(void *ptr)
 {
     JSON_Generator_State *state = ptr;
-    if (state->indent) ruby_xfree(state->indent);
-    if (state->space) ruby_xfree(state->space);
-    if (state->space_before) ruby_xfree(state->space_before);
-    if (state->object_nl) ruby_xfree(state->object_nl);
-    if (state->array_nl) ruby_xfree(state->array_nl);
-    if (state->array_delim) fbuffer_free(state->array_delim);
-    if (state->object_delim) fbuffer_free(state->object_delim);
-    if (state->object_delim2) fbuffer_free(state->object_delim2);
     ruby_xfree(state);
 }
 
 static size_t State_memsize(const void *ptr)
 {
-    const JSON_Generator_State *state = ptr;
-    size_t size = sizeof(*state);
-    if (state->indent) size += state->indent_len + 1;
-    if (state->space) size += state->space_len + 1;
-    if (state->space_before) size += state->space_before_len + 1;
-    if (state->object_nl) size += state->object_nl_len + 1;
-    if (state->array_nl) size += state->array_nl_len + 1;
-    if (state->array_delim) size += FBUFFER_CAPA(state->array_delim);
-    if (state->object_delim) size += FBUFFER_CAPA(state->object_delim);
-    if (state->object_delim2) size += FBUFFER_CAPA(state->object_delim2);
-    return size;
+    return sizeof(JSON_Generator_State);
 }
 
 #ifndef HAVE_RB_EXT_RACTOR_SAFE
@@ -620,508 +994,517 @@ static size_t State_memsize(const void *ptr)
 #   define RUBY_TYPED_FROZEN_SHAREABLE 0
 #endif
 
-#ifdef NEW_TYPEDDATA_WRAPPER
 static const rb_data_type_t JSON_Generator_State_type = {
     "JSON/Generator/State",
-    {NULL, State_free, State_memsize,},
-#ifdef RUBY_TYPED_FREE_IMMEDIATELY
+    {
+        .dmark = State_mark,
+        .dfree = State_free,
+        .dsize = State_memsize,
+        .dcompact = State_compact,
+    },
     0, 0,
-    RUBY_TYPED_FREE_IMMEDIATELY | RUBY_TYPED_FROZEN_SHAREABLE,
-#endif
+    RUBY_TYPED_WB_PROTECTED | RUBY_TYPED_FREE_IMMEDIATELY | RUBY_TYPED_FROZEN_SHAREABLE,
 };
-#endif
 
-static VALUE cState_s_allocate(VALUE klass)
+static void state_init(JSON_Generator_State *state)
 {
-    JSON_Generator_State *state;
-    return TypedData_Make_Struct(klass, JSON_Generator_State,
-				 &JSON_Generator_State_type, state);
-}
-
-/*
- * call-seq: configure(opts)
- *
- * Configure this State instance with the Hash _opts_, and return
- * itself.
- */
-static VALUE cState_configure(VALUE self, VALUE opts)
-{
-    VALUE tmp;
-    GET_STATE(self);
-    tmp = rb_check_convert_type(opts, T_HASH, "Hash", "to_hash");
-    if (NIL_P(tmp)) tmp = rb_convert_type(opts, T_HASH, "Hash", "to_h");
-    opts = tmp;
-    tmp = rb_hash_aref(opts, ID2SYM(i_indent));
-    if (RTEST(tmp)) {
-        unsigned long len;
-        Check_Type(tmp, T_STRING);
-        len = RSTRING_LEN(tmp);
-        state->indent = fstrndup(RSTRING_PTR(tmp), len + 1);
-        state->indent_len = len;
-    }
-    tmp = rb_hash_aref(opts, ID2SYM(i_space));
-    if (RTEST(tmp)) {
-        unsigned long len;
-        Check_Type(tmp, T_STRING);
-        len = RSTRING_LEN(tmp);
-        state->space = fstrndup(RSTRING_PTR(tmp), len + 1);
-        state->space_len = len;
-    }
-    tmp = rb_hash_aref(opts, ID2SYM(i_space_before));
-    if (RTEST(tmp)) {
-        unsigned long len;
-        Check_Type(tmp, T_STRING);
-        len = RSTRING_LEN(tmp);
-        state->space_before = fstrndup(RSTRING_PTR(tmp), len + 1);
-        state->space_before_len = len;
-    }
-    tmp = rb_hash_aref(opts, ID2SYM(i_array_nl));
-    if (RTEST(tmp)) {
-        unsigned long len;
-        Check_Type(tmp, T_STRING);
-        len = RSTRING_LEN(tmp);
-        state->array_nl = fstrndup(RSTRING_PTR(tmp), len + 1);
-        state->array_nl_len = len;
-    }
-    tmp = rb_hash_aref(opts, ID2SYM(i_object_nl));
-    if (RTEST(tmp)) {
-        unsigned long len;
-        Check_Type(tmp, T_STRING);
-        len = RSTRING_LEN(tmp);
-        state->object_nl = fstrndup(RSTRING_PTR(tmp), len + 1);
-        state->object_nl_len = len;
-    }
-    tmp = ID2SYM(i_max_nesting);
     state->max_nesting = 100;
-    if (option_given_p(opts, tmp)) {
-        VALUE max_nesting = rb_hash_aref(opts, tmp);
-        if (RTEST(max_nesting)) {
-            Check_Type(max_nesting, T_FIXNUM);
-            state->max_nesting = FIX2LONG(max_nesting);
-        } else {
-            state->max_nesting = 0;
-        }
-    }
-    tmp = ID2SYM(i_depth);
-    state->depth = 0;
-    if (option_given_p(opts, tmp)) {
-        VALUE depth = rb_hash_aref(opts, tmp);
-        if (RTEST(depth)) {
-            Check_Type(depth, T_FIXNUM);
-            state->depth = FIX2LONG(depth);
-        } else {
-            state->depth = 0;
-        }
-    }
-    tmp = ID2SYM(i_buffer_initial_length);
-    if (option_given_p(opts, tmp)) {
-        VALUE buffer_initial_length = rb_hash_aref(opts, tmp);
-        if (RTEST(buffer_initial_length)) {
-            long initial_length;
-            Check_Type(buffer_initial_length, T_FIXNUM);
-            initial_length = FIX2LONG(buffer_initial_length);
-            if (initial_length > 0) state->buffer_initial_length = initial_length;
-        }
-    }
-    tmp = rb_hash_aref(opts, ID2SYM(i_allow_nan));
-    state->allow_nan = RTEST(tmp);
-    tmp = rb_hash_aref(opts, ID2SYM(i_ascii_only));
-    state->ascii_only = RTEST(tmp);
-    tmp = rb_hash_aref(opts, ID2SYM(i_escape_slash));
-    state->escape_slash = RTEST(tmp);
-    return self;
+    state->buffer_initial_length = FBUFFER_INITIAL_LENGTH_DEFAULT;
 }
 
-static void set_state_ivars(VALUE hash, VALUE state)
+static VALUE cState_s_allocate(VALUE klass)
 {
-    VALUE ivars = rb_obj_instance_variables(state);
-    int i = 0;
-    for (i = 0; i < RARRAY_LEN(ivars); i++) {
-        VALUE key = rb_funcall(rb_ary_entry(ivars, i), i_to_s, 0);
-        long key_len = RSTRING_LEN(key);
-        VALUE value = rb_iv_get(state, StringValueCStr(key));
-        rb_hash_aset(hash, rb_str_intern(rb_str_substr(key, 1, key_len - 1)), value);
-    }
+    JSON_Generator_State *state;
+    VALUE obj = TypedData_Make_Struct(klass, JSON_Generator_State, &JSON_Generator_State_type, state);
+    state_init(state);
+    return obj;
 }
 
-/*
- * call-seq: to_h
- *
- * Returns the configuration instance variables as a hash, that can be
- * passed to the configure method.
- */
-static VALUE cState_to_h(VALUE self)
+static void vstate_spill(struct generate_json_data *data)
 {
-    VALUE result = rb_hash_new();
-    GET_STATE(self);
-    set_state_ivars(result, self);
-    rb_hash_aset(result, ID2SYM(i_indent), rb_str_new(state->indent, state->indent_len));
-    rb_hash_aset(result, ID2SYM(i_space), rb_str_new(state->space, state->space_len));
-    rb_hash_aset(result, ID2SYM(i_space_before), rb_str_new(state->space_before, state->space_before_len));
-    rb_hash_aset(result, ID2SYM(i_object_nl), rb_str_new(state->object_nl, state->object_nl_len));
-    rb_hash_aset(result, ID2SYM(i_array_nl), rb_str_new(state->array_nl, state->array_nl_len));
-    rb_hash_aset(result, ID2SYM(i_allow_nan), state->allow_nan ? Qtrue : Qfalse);
-    rb_hash_aset(result, ID2SYM(i_ascii_only), state->ascii_only ? Qtrue : Qfalse);
-    rb_hash_aset(result, ID2SYM(i_max_nesting), LONG2FIX(state->max_nesting));
-    rb_hash_aset(result, ID2SYM(i_escape_slash), state->escape_slash ? Qtrue : Qfalse);
-    rb_hash_aset(result, ID2SYM(i_depth), LONG2FIX(state->depth));
-    rb_hash_aset(result, ID2SYM(i_buffer_initial_length), LONG2FIX(state->buffer_initial_length));
-    return result;
+    VALUE vstate = cState_s_allocate(cState);
+    GET_STATE(vstate);
+    MEMCPY(state, data->state, JSON_Generator_State, 1);
+    data->state = state;
+    data->vstate = vstate;
+    RB_OBJ_WRITTEN(vstate, Qundef, state->indent);
+    RB_OBJ_WRITTEN(vstate, Qundef, state->space);
+    RB_OBJ_WRITTEN(vstate, Qundef, state->space_before);
+    RB_OBJ_WRITTEN(vstate, Qundef, state->object_nl);
+    RB_OBJ_WRITTEN(vstate, Qundef, state->array_nl);
+    RB_OBJ_WRITTEN(vstate, Qundef, state->as_json);
 }
 
-/*
-* call-seq: [](name)
-*
-* Returns the value returned by method +name+.
-*/
-static VALUE cState_aref(VALUE self, VALUE name)
+static inline VALUE vstate_get(struct generate_json_data *data)
 {
-    name = rb_funcall(name, i_to_s, 0);
-    if (RTEST(rb_funcall(self, i_respond_to_p, 1, name))) {
-        return rb_funcall(self, i_send, 1, name);
-    } else {
-        return rb_attr_get(self, rb_intern_str(rb_str_concat(rb_str_new2("@"), name)));
+    if (RB_UNLIKELY(!data->vstate)) {
+        vstate_spill(data);
     }
+    return data->vstate;
 }
 
-/*
-* call-seq: []=(name, value)
-*
-* Sets the attribute name to value.
-*/
-static VALUE cState_aset(VALUE self, VALUE name, VALUE value)
+struct hash_foreach_arg {
+    struct generate_json_data *data;
+    int iter;
+};
+
+static VALUE
+convert_string_subclass(VALUE key)
 {
-    VALUE name_writer;
+    VALUE key_to_s = rb_funcall(key, i_to_s, 0);
 
-    name = rb_funcall(name, i_to_s, 0);
-    name_writer = rb_str_cat2(rb_str_dup(name), "=");
-    if (RTEST(rb_funcall(self, i_respond_to_p, 1, name_writer))) {
-        return rb_funcall(self, i_send, 2, name_writer, value);
-    } else {
-        rb_ivar_set(self, rb_intern_str(rb_str_concat(rb_str_new2("@"), name)), value);
+    if (RB_UNLIKELY(!RB_TYPE_P(key_to_s, T_STRING))) {
+        VALUE cname = rb_obj_class(key);
+        rb_raise(rb_eTypeError,
+                 "can't convert %"PRIsVALUE" to %s (%"PRIsVALUE"#%s gives %"PRIsVALUE")",
+                 cname, "String", cname, "to_s", rb_obj_class(key_to_s));
     }
-    return Qnil;
-}
 
-struct hash_foreach_arg {
-    FBuffer *buffer;
-    JSON_Generator_State *state;
-    VALUE Vstate;
-    int iter;
-};
+    return key_to_s;
+}
 
 static int
 json_object_i(VALUE key, VALUE val, VALUE _arg)
 {
     struct hash_foreach_arg *arg = (struct hash_foreach_arg *)_arg;
-    FBuffer *buffer = arg->buffer;
-    JSON_Generator_State *state = arg->state;
-    VALUE Vstate = arg->Vstate;
-
-    char *object_nl = state->object_nl;
-    long object_nl_len = state->object_nl_len;
-    char *indent = state->indent;
-    long indent_len = state->indent_len;
-    char *delim = FBUFFER_PTR(state->object_delim);
-    long delim_len = FBUFFER_LEN(state->object_delim);
-    char *delim2 = FBUFFER_PTR(state->object_delim2);
-    long delim2_len = FBUFFER_LEN(state->object_delim2);
+    struct generate_json_data *data = arg->data;
+
+    FBuffer *buffer = data->buffer;
+    JSON_Generator_State *state = data->state;
+
     long depth = state->depth;
     int j;
-    VALUE klass, key_to_s;
 
-    if (arg->iter > 0) fbuffer_append(buffer, delim, delim_len);
-    if (object_nl) {
-        fbuffer_append(buffer, object_nl, object_nl_len);
+    if (arg->iter > 0) fbuffer_append_char(buffer, ',');
+    if (RB_UNLIKELY(data->state->object_nl)) {
+        fbuffer_append_str(buffer, data->state->object_nl);
     }
-    if (indent) {
+    if (RB_UNLIKELY(data->state->indent)) {
         for (j = 0; j < depth; j++) {
-            fbuffer_append(buffer, indent, indent_len);
+            fbuffer_append_str(buffer, data->state->indent);
         }
     }
 
-    klass = CLASS_OF(key);
-    if (klass == rb_cString) {
-        key_to_s = key;
-    } else if (klass == rb_cSymbol) {
-        key_to_s = rb_id2str(SYM2ID(key));
+    VALUE key_to_s;
+    switch (rb_type(key)) {
+        case T_STRING:
+            if (RB_LIKELY(RBASIC_CLASS(key) == rb_cString)) {
+                key_to_s = key;
+            } else {
+                key_to_s = convert_string_subclass(key);
+            }
+            break;
+        case T_SYMBOL:
+            key_to_s = rb_sym2str(key);
+            break;
+        default:
+            key_to_s = rb_convert_type(key, T_STRING, "String", "to_s");
+            break;
+    }
+
+    if (RB_LIKELY(RBASIC_CLASS(key_to_s) == rb_cString)) {
+        generate_json_string(buffer, data, key_to_s);
     } else {
-        key_to_s = rb_funcall(key, i_to_s, 0);
+        generate_json(buffer, data, key_to_s);
     }
-    Check_Type(key_to_s, T_STRING);
-    generate_json(buffer, Vstate, state, key_to_s);
-    fbuffer_append(buffer, delim2, delim2_len);
-    generate_json(buffer, Vstate, state, val);
+    if (RB_UNLIKELY(state->space_before)) fbuffer_append_str(buffer, data->state->space_before);
+    fbuffer_append_char(buffer, ':');
+    if (RB_UNLIKELY(state->space)) fbuffer_append_str(buffer, data->state->space);
+    generate_json(buffer, data, val);
 
     arg->iter++;
     return ST_CONTINUE;
 }
 
-static void generate_json_object(FBuffer *buffer, VALUE Vstate, JSON_Generator_State *state, VALUE obj)
+static inline long increase_depth(struct generate_json_data *data)
 {
-    char *object_nl = state->object_nl;
-    long object_nl_len = state->object_nl_len;
-    char *indent = state->indent;
-    long indent_len = state->indent_len;
-    long max_nesting = state->max_nesting;
+    JSON_Generator_State *state = data->state;
     long depth = ++state->depth;
+    if (RB_UNLIKELY(depth > state->max_nesting && state->max_nesting)) {
+        rb_raise(eNestingError, "nesting of %ld is too deep", --state->depth);
+    }
+    return depth;
+}
+
+static void generate_json_object(FBuffer *buffer, struct generate_json_data *data, VALUE obj)
+{
     int j;
-    struct hash_foreach_arg arg;
+    long depth = increase_depth(data);
 
-    if (max_nesting != 0 && depth > max_nesting) {
-        fbuffer_free(buffer);
-        rb_raise(eNestingError, "nesting of %ld is too deep", --state->depth);
+    if (RHASH_SIZE(obj) == 0) {
+        fbuffer_append(buffer, "{}", 2);
+        --data->state->depth;
+        return;
     }
+
     fbuffer_append_char(buffer, '{');
 
-    arg.buffer = buffer;
-    arg.state = state;
-    arg.Vstate = Vstate;
-    arg.iter = 0;
+    struct hash_foreach_arg arg = {
+        .data = data,
+        .iter = 0,
+    };
     rb_hash_foreach(obj, json_object_i, (VALUE)&arg);
 
-    depth = --state->depth;
-    if (object_nl) {
-        fbuffer_append(buffer, object_nl, object_nl_len);
-        if (indent) {
+    depth = --data->state->depth;
+    if (RB_UNLIKELY(data->state->object_nl)) {
+        fbuffer_append_str(buffer, data->state->object_nl);
+        if (RB_UNLIKELY(data->state->indent)) {
             for (j = 0; j < depth; j++) {
-                fbuffer_append(buffer, indent, indent_len);
+                fbuffer_append_str(buffer, data->state->indent);
             }
         }
     }
     fbuffer_append_char(buffer, '}');
 }
 
-static void generate_json_array(FBuffer *buffer, VALUE Vstate, JSON_Generator_State *state, VALUE obj)
+static void generate_json_array(FBuffer *buffer, struct generate_json_data *data, VALUE obj)
 {
-    char *array_nl = state->array_nl;
-    long array_nl_len = state->array_nl_len;
-    char *indent = state->indent;
-    long indent_len = state->indent_len;
-    long max_nesting = state->max_nesting;
-    char *delim = FBUFFER_PTR(state->array_delim);
-    long delim_len = FBUFFER_LEN(state->array_delim);
-    long depth = ++state->depth;
     int i, j;
-    if (max_nesting != 0 && depth > max_nesting) {
-        fbuffer_free(buffer);
-        rb_raise(eNestingError, "nesting of %ld is too deep", --state->depth);
+    long depth = increase_depth(data);
+
+    if (RARRAY_LEN(obj) == 0) {
+        fbuffer_append(buffer, "[]", 2);
+        --data->state->depth;
+        return;
     }
+
     fbuffer_append_char(buffer, '[');
-    if (array_nl) fbuffer_append(buffer, array_nl, array_nl_len);
-    for(i = 0; i < RARRAY_LEN(obj); i++) {
-        if (i > 0) fbuffer_append(buffer, delim, delim_len);
-        if (indent) {
+    if (RB_UNLIKELY(data->state->array_nl)) fbuffer_append_str(buffer, data->state->array_nl);
+    for (i = 0; i < RARRAY_LEN(obj); i++) {
+        if (i > 0) {
+            fbuffer_append_char(buffer, ',');
+            if (RB_UNLIKELY(data->state->array_nl)) fbuffer_append_str(buffer, data->state->array_nl);
+        }
+        if (RB_UNLIKELY(data->state->indent)) {
             for (j = 0; j < depth; j++) {
-                fbuffer_append(buffer, indent, indent_len);
+                fbuffer_append_str(buffer, data->state->indent);
             }
         }
-        generate_json(buffer, Vstate, state, rb_ary_entry(obj, i));
+        generate_json(buffer, data, RARRAY_AREF(obj, i));
     }
-    state->depth = --depth;
-    if (array_nl) {
-        fbuffer_append(buffer, array_nl, array_nl_len);
-        if (indent) {
+    data->state->depth = --depth;
+    if (RB_UNLIKELY(data->state->array_nl)) {
+        fbuffer_append_str(buffer, data->state->array_nl);
+        if (RB_UNLIKELY(data->state->indent)) {
             for (j = 0; j < depth; j++) {
-                fbuffer_append(buffer, indent, indent_len);
+                fbuffer_append_str(buffer, data->state->indent);
             }
         }
     }
     fbuffer_append_char(buffer, ']');
 }
 
-#ifdef HAVE_RUBY_ENCODING_H
-static int enc_utf8_compatible_p(rb_encoding *enc)
+static inline int enc_utf8_compatible_p(int enc_idx)
 {
-    if (enc == rb_usascii_encoding()) return 1;
-    if (enc == rb_utf8_encoding()) return 1;
+    if (enc_idx == usascii_encindex) return 1;
+    if (enc_idx == utf8_encindex) return 1;
     return 0;
 }
-#endif
 
-static void generate_json_string(FBuffer *buffer, VALUE Vstate, JSON_Generator_State *state, VALUE obj)
+static VALUE encode_json_string_try(VALUE str)
 {
+    return rb_funcall(str, i_encode, 1, Encoding_UTF_8);
+}
+
+static VALUE encode_json_string_rescue(VALUE str, VALUE exception)
+{
+    raise_generator_error_str(str, rb_funcall(exception, rb_intern("message"), 0));
+    return Qundef;
+}
+
+static inline VALUE ensure_valid_encoding(VALUE str)
+{
+    int encindex = RB_ENCODING_GET(str);
+    VALUE utf8_string;
+    if (RB_UNLIKELY(!enc_utf8_compatible_p(encindex))) {
+        if (encindex == binary_encindex) {
+            utf8_string = rb_enc_associate_index(rb_str_dup(str), utf8_encindex);
+            switch (rb_enc_str_coderange(utf8_string)) {
+                case ENC_CODERANGE_7BIT:
+                    return utf8_string;
+                case ENC_CODERANGE_VALID:
+                    // For historical reason, we silently reinterpret binary strings as UTF-8 if it would work.
+                    // TODO: Raise in 3.0.0
+                    rb_warn("JSON.generate: UTF-8 string passed as BINARY, this will raise an encoding error in json 3.0");
+                    return utf8_string;
+                    break;
+            }
+        }
+
+        str = rb_rescue(encode_json_string_try, str, encode_json_string_rescue, str);
+    }
+    return str;
+}
+
+static void generate_json_string(FBuffer *buffer, struct generate_json_data *data, VALUE obj)
+{
+    obj = ensure_valid_encoding(obj);
+
     fbuffer_append_char(buffer, '"');
-#ifdef HAVE_RUBY_ENCODING_H
-    if (!enc_utf8_compatible_p(rb_enc_get(obj))) {
-        obj = rb_str_export_to_enc(obj, rb_utf8_encoding());
+
+    long len;
+    search_state search;
+    search.buffer = buffer;
+    RSTRING_GETMEM(obj, search.ptr, len);
+    search.cursor = search.ptr;
+    search.end = search.ptr + len;
+
+#ifdef HAVE_SIMD
+    search.matches_mask = 0;
+    search.has_matches = false;
+    search.chunk_base = NULL;
+#endif /* HAVE_SIMD */
+
+    switch (rb_enc_str_coderange(obj)) {
+        case ENC_CODERANGE_7BIT:
+        case ENC_CODERANGE_VALID:
+            if (RB_UNLIKELY(data->state->ascii_only)) {
+                convert_UTF8_to_ASCII_only_JSON(&search, data->state->script_safe ? script_safe_escape_table : ascii_only_escape_table);
+            } else if (RB_UNLIKELY(data->state->script_safe)) {
+                convert_UTF8_to_script_safe_JSON(&search);
+            } else {
+                convert_UTF8_to_JSON(&search);
+            }
+            break;
+        default:
+            raise_generator_error(obj, "source sequence is illegal/malformed utf-8");
+            break;
     }
-#endif
-    if (state->ascii_only) {
-        convert_UTF8_to_JSON_ASCII(buffer, obj, state->escape_slash);
+    fbuffer_append_char(buffer, '"');
+}
+
+static void generate_json_fallback(FBuffer *buffer, struct generate_json_data *data, VALUE obj)
+{
+    VALUE tmp;
+    if (rb_respond_to(obj, i_to_json)) {
+        tmp = rb_funcall(obj, i_to_json, 1, vstate_get(data));
+        Check_Type(tmp, T_STRING);
+        fbuffer_append_str(buffer, tmp);
     } else {
-        convert_UTF8_to_JSON(buffer, obj, state->escape_slash);
+        tmp = rb_funcall(obj, i_to_s, 0);
+        Check_Type(tmp, T_STRING);
+        generate_json_string(buffer, data, tmp);
     }
-    fbuffer_append_char(buffer, '"');
 }
 
-static void generate_json_null(FBuffer *buffer, VALUE Vstate, JSON_Generator_State *state, VALUE obj)
+static inline void generate_json_symbol(FBuffer *buffer, struct generate_json_data *data, VALUE obj)
+{
+    if (data->state->strict) {
+        generate_json_string(buffer, data, rb_sym2str(obj));
+    } else {
+        generate_json_fallback(buffer, data, obj);
+    }
+}
+
+static void generate_json_null(FBuffer *buffer, struct generate_json_data *data, VALUE obj)
 {
     fbuffer_append(buffer, "null", 4);
 }
 
-static void generate_json_false(FBuffer *buffer, VALUE Vstate, JSON_Generator_State *state, VALUE obj)
+static void generate_json_false(FBuffer *buffer, struct generate_json_data *data, VALUE obj)
 {
     fbuffer_append(buffer, "false", 5);
 }
 
-static void generate_json_true(FBuffer *buffer, VALUE Vstate, JSON_Generator_State *state, VALUE obj)
+static void generate_json_true(FBuffer *buffer, struct generate_json_data *data, VALUE obj)
 {
     fbuffer_append(buffer, "true", 4);
 }
 
-static void generate_json_fixnum(FBuffer *buffer, VALUE Vstate, JSON_Generator_State *state, VALUE obj)
+static void generate_json_fixnum(FBuffer *buffer, struct generate_json_data *data, VALUE obj)
 {
     fbuffer_append_long(buffer, FIX2LONG(obj));
 }
 
-static void generate_json_bignum(FBuffer *buffer, VALUE Vstate, JSON_Generator_State *state, VALUE obj)
+static void generate_json_bignum(FBuffer *buffer, struct generate_json_data *data, VALUE obj)
 {
     VALUE tmp = rb_funcall(obj, i_to_s, 0);
     fbuffer_append_str(buffer, tmp);
 }
 
 #ifdef RUBY_INTEGER_UNIFICATION
-static void generate_json_integer(FBuffer *buffer, VALUE Vstate, JSON_Generator_State *state, VALUE obj)
+static void generate_json_integer(FBuffer *buffer, struct generate_json_data *data, VALUE obj)
 {
     if (FIXNUM_P(obj))
-        generate_json_fixnum(buffer, Vstate, state, obj);
+        generate_json_fixnum(buffer, data, obj);
     else
-        generate_json_bignum(buffer, Vstate, state, obj);
+        generate_json_bignum(buffer, data, obj);
 }
 #endif
-static void generate_json_float(FBuffer *buffer, VALUE Vstate, JSON_Generator_State *state, VALUE obj)
+
+static void generate_json_float(FBuffer *buffer, struct generate_json_data *data, VALUE obj)
 {
     double value = RFLOAT_VALUE(obj);
-    char allow_nan = state->allow_nan;
-    VALUE tmp = rb_funcall(obj, i_to_s, 0);
-    if (!allow_nan) {
-        if (isinf(value)) {
-            fbuffer_free(buffer);
-            rb_raise(eGeneratorError, "%"PRIsVALUE" not allowed in JSON", RB_OBJ_STRING(tmp));
-        } else if (isnan(value)) {
-            fbuffer_free(buffer);
-            rb_raise(eGeneratorError, "%"PRIsVALUE" not allowed in JSON", RB_OBJ_STRING(tmp));
+    char allow_nan = data->state->allow_nan;
+    if (isinf(value) || isnan(value)) {
+        /* for NaN and Infinity values we either raise an error or rely on Float#to_s. */
+        if (!allow_nan) {
+            if (data->state->strict && data->state->as_json) {
+                VALUE casted_obj = rb_proc_call_with_block(data->state->as_json, 1, &obj, Qnil);
+                if (casted_obj != obj) {
+                    increase_depth(data);
+                    generate_json(buffer, data, casted_obj);
+                    data->state->depth--;
+                    return;
+                }
+            }
+            raise_generator_error(obj, "%"PRIsVALUE" not allowed in JSON", rb_funcall(obj, i_to_s, 0));
         }
+
+        VALUE tmp = rb_funcall(obj, i_to_s, 0);
+        fbuffer_append_str(buffer, tmp);
+        return;
     }
-    fbuffer_append_str(buffer, tmp);
+
+    /* This implementation writes directly into the buffer. We reserve
+     * the 28 characters that fpconv_dtoa states as its maximum.
+     */
+    fbuffer_inc_capa(buffer, 28);
+    char* d = buffer->ptr + buffer->len;
+    int len = fpconv_dtoa(value, d);
+
+    /* fpconv_dtoa converts a float to its shortest string representation,
+     * but it adds a ".0" if this is a plain integer.
+     */
+    fbuffer_consumed(buffer, len);
 }
 
-static void generate_json(FBuffer *buffer, VALUE Vstate, JSON_Generator_State *state, VALUE obj)
+static void generate_json_fragment(FBuffer *buffer, struct generate_json_data *data, VALUE obj)
 {
-    VALUE tmp;
-    VALUE klass = CLASS_OF(obj);
-    if (klass == rb_cHash) {
-        generate_json_object(buffer, Vstate, state, obj);
-    } else if (klass == rb_cArray) {
-        generate_json_array(buffer, Vstate, state, obj);
-    } else if (klass == rb_cString) {
-        generate_json_string(buffer, Vstate, state, obj);
-    } else if (obj == Qnil) {
-        generate_json_null(buffer, Vstate, state, obj);
+    VALUE fragment = RSTRUCT_GET(obj, 0);
+    Check_Type(fragment, T_STRING);
+    fbuffer_append_str(buffer, fragment);
+}
+
+static void generate_json(FBuffer *buffer, struct generate_json_data *data, VALUE obj)
+{
+    bool as_json_called = false;
+start:
+    if (obj == Qnil) {
+        generate_json_null(buffer, data, obj);
     } else if (obj == Qfalse) {
-        generate_json_false(buffer, Vstate, state, obj);
+        generate_json_false(buffer, data, obj);
     } else if (obj == Qtrue) {
-        generate_json_true(buffer, Vstate, state, obj);
-    } else if (FIXNUM_P(obj)) {
-        generate_json_fixnum(buffer, Vstate, state, obj);
-    } else if (RB_TYPE_P(obj, T_BIGNUM)) {
-        generate_json_bignum(buffer, Vstate, state, obj);
-    } else if (klass == rb_cFloat) {
-        generate_json_float(buffer, Vstate, state, obj);
-    } else if (rb_respond_to(obj, i_to_json)) {
-        tmp = rb_funcall(obj, i_to_json, 1, Vstate);
-        Check_Type(tmp, T_STRING);
-        fbuffer_append_str(buffer, tmp);
+        generate_json_true(buffer, data, obj);
+    } else if (RB_SPECIAL_CONST_P(obj)) {
+        if (RB_FIXNUM_P(obj)) {
+            generate_json_fixnum(buffer, data, obj);
+        } else if (RB_FLONUM_P(obj)) {
+            generate_json_float(buffer, data, obj);
+        } else if (RB_STATIC_SYM_P(obj)) {
+            generate_json_symbol(buffer, data, obj);
+        } else {
+            goto general;
+        }
     } else {
-        tmp = rb_funcall(obj, i_to_s, 0);
-        Check_Type(tmp, T_STRING);
-        generate_json_string(buffer, Vstate, state, tmp);
+        VALUE klass = RBASIC_CLASS(obj);
+        switch (RB_BUILTIN_TYPE(obj)) {
+            case T_BIGNUM:
+                generate_json_bignum(buffer, data, obj);
+                break;
+            case T_HASH:
+                if (klass != rb_cHash) goto general;
+                generate_json_object(buffer, data, obj);
+                break;
+            case T_ARRAY:
+                if (klass != rb_cArray) goto general;
+                generate_json_array(buffer, data, obj);
+                break;
+            case T_STRING:
+                if (klass != rb_cString) goto general;
+                generate_json_string(buffer, data, obj);
+                break;
+            case T_SYMBOL:
+                generate_json_symbol(buffer, data, obj);
+                break;
+            case T_FLOAT:
+                if (klass != rb_cFloat) goto general;
+                generate_json_float(buffer, data, obj);
+                break;
+            case T_STRUCT:
+                if (klass != cFragment) goto general;
+                generate_json_fragment(buffer, data, obj);
+                break;
+            default:
+            general:
+                if (data->state->strict) {
+                    if (RTEST(data->state->as_json) && !as_json_called) {
+                        obj = rb_proc_call_with_block(data->state->as_json, 1, &obj, Qnil);
+                        as_json_called = true;
+                        goto start;
+                    } else {
+                        raise_generator_error(obj, "%"PRIsVALUE" not allowed in JSON", CLASS_OF(obj));
+                    }
+                } else {
+                    generate_json_fallback(buffer, data, obj);
+                }
+        }
     }
 }
 
-static FBuffer *cState_prepare_buffer(VALUE self)
+static VALUE generate_json_try(VALUE d)
 {
-    FBuffer *buffer;
-    GET_STATE(self);
-    buffer = fbuffer_alloc(state->buffer_initial_length);
+    struct generate_json_data *data = (struct generate_json_data *)d;
 
-    if (state->object_delim) {
-        fbuffer_clear(state->object_delim);
-    } else {
-        state->object_delim = fbuffer_alloc(16);
-    }
-    fbuffer_append_char(state->object_delim, ',');
-    if (state->object_delim2) {
-        fbuffer_clear(state->object_delim2);
-    } else {
-        state->object_delim2 = fbuffer_alloc(16);
-    }
-    if (state->space_before) fbuffer_append(state->object_delim2, state->space_before, state->space_before_len);
-    fbuffer_append_char(state->object_delim2, ':');
-    if (state->space) fbuffer_append(state->object_delim2, state->space, state->space_len);
+    data->func(data->buffer, data, data->obj);
 
-    if (state->array_delim) {
-        fbuffer_clear(state->array_delim);
-    } else {
-        state->array_delim = fbuffer_alloc(16);
-    }
-    fbuffer_append_char(state->array_delim, ',');
-    if (state->array_nl) fbuffer_append(state->array_delim, state->array_nl, state->array_nl_len);
-    return buffer;
+    return Qnil;
 }
 
-static VALUE cState_partial_generate(VALUE self, VALUE obj)
+static VALUE generate_json_rescue(VALUE d, VALUE exc)
+{
+    struct generate_json_data *data = (struct generate_json_data *)d;
+    fbuffer_free(data->buffer);
+
+    rb_exc_raise(exc);
+
+    return Qundef;
+}
+
+static VALUE cState_partial_generate(VALUE self, VALUE obj, generator_func func, VALUE io)
 {
-    FBuffer *buffer = cState_prepare_buffer(self);
     GET_STATE(self);
-    generate_json(buffer, self, state, obj);
-    return fbuffer_to_s(buffer);
+
+    char stack_buffer[FBUFFER_STACK_SIZE];
+    FBuffer buffer = {
+        .io = RTEST(io) ? io : Qfalse,
+    };
+    fbuffer_stack_init(&buffer, state->buffer_initial_length, stack_buffer, FBUFFER_STACK_SIZE);
+
+    struct generate_json_data data = {
+        .buffer = &buffer,
+        .vstate = self,
+        .state = state,
+        .obj = obj,
+        .func = func
+    };
+    rb_rescue(generate_json_try, (VALUE)&data, generate_json_rescue, (VALUE)&data);
+
+    return fbuffer_finalize(&buffer);
 }
 
-/*
- * call-seq: generate(obj)
+/* call-seq:
+ *   generate(obj) -> String
+ *   generate(obj, anIO) -> anIO
  *
  * Generates a valid JSON document from object +obj+ and returns the
  * result. If no valid JSON document can be created this method raises a
  * GeneratorError exception.
  */
-static VALUE cState_generate(VALUE self, VALUE obj)
+static VALUE cState_generate(int argc, VALUE *argv, VALUE self)
 {
-    VALUE result = cState_partial_generate(self, obj);
+    rb_check_arity(argc, 1, 2);
+    VALUE obj = argv[0];
+    VALUE io = argc > 1 ? argv[1] : Qnil;
+    VALUE result = cState_partial_generate(self, obj, generate_json, io);
     GET_STATE(self);
     (void)state;
     return result;
 }
 
-/*
- * call-seq: new(opts = {})
- *
- * Instantiates a new State object, configured by _opts_.
- *
- * _opts_ 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: ''),
- * * *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.
- * * *ascii_only*: true if only ASCII characters should be generated. This
- *   option defaults to false.
- * * *buffer_initial_length*: sets the initial length of the generator's
- *   internal buffer.
- */
 static VALUE cState_initialize(int argc, VALUE *argv, VALUE self)
 {
-    VALUE opts;
-    GET_STATE(self);
-    state->max_nesting = 100;
-    state->buffer_initial_length = FBUFFER_INITIAL_LENGTH_DEFAULT;
-    rb_scan_args(argc, argv, "01", &opts);
-    if (!NIL_P(opts)) cState_configure(self, opts);
+    rb_warn("The json gem extension was loaded with the stdlib ruby code. You should upgrade rubygems with `gem update --system`");
     return self;
 }
 
@@ -1141,14 +1524,12 @@ static VALUE cState_init_copy(VALUE obj, VALUE orig)
     if (!objState) rb_raise(rb_eArgError, "unallocated JSON::State");
 
     MEMCPY(objState, origState, JSON_Generator_State, 1);
-    objState->indent = fstrndup(origState->indent, origState->indent_len);
-    objState->space = fstrndup(origState->space, origState->space_len);
-    objState->space_before = fstrndup(origState->space_before, origState->space_before_len);
-    objState->object_nl = fstrndup(origState->object_nl, origState->object_nl_len);
-    objState->array_nl = fstrndup(origState->array_nl, origState->array_nl_len);
-    if (origState->array_delim) objState->array_delim = fbuffer_dup(origState->array_delim);
-    if (origState->object_delim) objState->object_delim = fbuffer_dup(origState->object_delim);
-    if (origState->object_delim2) objState->object_delim2 = fbuffer_dup(origState->object_delim2);
+    objState->indent = origState->indent;
+    objState->space = origState->space;
+    objState->space_before = origState->space_before;
+    objState->object_nl = origState->object_nl;
+    objState->array_nl = origState->array_nl;
+    objState->as_json = origState->as_json;
     return obj;
 }
 
@@ -1178,7 +1559,18 @@ static VALUE cState_from_state_s(VALUE self, VALUE opts)
 static VALUE cState_indent(VALUE self)
 {
     GET_STATE(self);
-    return state->indent ? rb_str_new(state->indent, state->indent_len) : rb_str_new2("");
+    return state->indent ? state->indent : rb_str_freeze(rb_utf8_str_new("", 0));
+}
+
+static VALUE string_config(VALUE config)
+{
+    if (RTEST(config)) {
+        Check_Type(config, T_STRING);
+        if (RSTRING_LEN(config)) {
+            return rb_str_new_frozen(config);
+        }
+    }
+    return Qfalse;
 }
 
 /*
@@ -1188,21 +1580,8 @@ static VALUE cState_indent(VALUE self)
  */
 static VALUE cState_indent_set(VALUE self, VALUE indent)
 {
-    unsigned long len;
     GET_STATE(self);
-    Check_Type(indent, T_STRING);
-    len = RSTRING_LEN(indent);
-    if (len == 0) {
-        if (state->indent) {
-            ruby_xfree(state->indent);
-            state->indent = NULL;
-            state->indent_len = 0;
-        }
-    } else {
-        if (state->indent) ruby_xfree(state->indent);
-        state->indent = fstrndup(RSTRING_PTR(indent), len);
-        state->indent_len = len;
-    }
+    RB_OBJ_WRITE(self, &state->indent, string_config(indent));
     return Qnil;
 }
 
@@ -1215,7 +1594,7 @@ static VALUE cState_indent_set(VALUE self, VALUE indent)
 static VALUE cState_space(VALUE self)
 {
     GET_STATE(self);
-    return state->space ? rb_str_new(state->space, state->space_len) : rb_str_new2("");
+    return state->space ? state->space : rb_str_freeze(rb_utf8_str_new("", 0));
 }
 
 /*
@@ -1226,21 +1605,8 @@ static VALUE cState_space(VALUE self)
  */
 static VALUE cState_space_set(VALUE self, VALUE space)
 {
-    unsigned long len;
     GET_STATE(self);
-    Check_Type(space, T_STRING);
-    len = RSTRING_LEN(space);
-    if (len == 0) {
-        if (state->space) {
-            ruby_xfree(state->space);
-            state->space = NULL;
-            state->space_len = 0;
-        }
-    } else {
-        if (state->space) ruby_xfree(state->space);
-        state->space = fstrndup(RSTRING_PTR(space), len);
-        state->space_len = len;
-    }
+    RB_OBJ_WRITE(self, &state->space, string_config(space));
     return Qnil;
 }
 
@@ -1252,7 +1618,7 @@ static VALUE cState_space_set(VALUE self, VALUE space)
 static VALUE cState_space_before(VALUE self)
 {
     GET_STATE(self);
-    return state->space_before ? rb_str_new(state->space_before, state->space_before_len) : rb_str_new2("");
+    return state->space_before ? state->space_before : rb_str_freeze(rb_utf8_str_new("", 0));
 }
 
 /*
@@ -1262,21 +1628,8 @@ static VALUE cState_space_before(VALUE self)
  */
 static VALUE cState_space_before_set(VALUE self, VALUE space_before)
 {
-    unsigned long len;
     GET_STATE(self);
-    Check_Type(space_before, T_STRING);
-    len = RSTRING_LEN(space_before);
-    if (len == 0) {
-        if (state->space_before) {
-            ruby_xfree(state->space_before);
-            state->space_before = NULL;
-            state->space_before_len = 0;
-        }
-    } else {
-        if (state->space_before) ruby_xfree(state->space_before);
-        state->space_before = fstrndup(RSTRING_PTR(space_before), len);
-        state->space_before_len = len;
-    }
+    RB_OBJ_WRITE(self, &state->space_before, string_config(space_before));
     return Qnil;
 }
 
@@ -1289,7 +1642,7 @@ static VALUE cState_space_before_set(VALUE self, VALUE space_before)
 static VALUE cState_object_nl(VALUE self)
 {
     GET_STATE(self);
-    return state->object_nl ? rb_str_new(state->object_nl, state->object_nl_len) : rb_str_new2("");
+    return state->object_nl ? state->object_nl : rb_str_freeze(rb_utf8_str_new("", 0));
 }
 
 /*
@@ -1300,20 +1653,8 @@ static VALUE cState_object_nl(VALUE self)
  */
 static VALUE cState_object_nl_set(VALUE self, VALUE object_nl)
 {
-    unsigned long len;
     GET_STATE(self);
-    Check_Type(object_nl, T_STRING);
-    len = RSTRING_LEN(object_nl);
-    if (len == 0) {
-        if (state->object_nl) {
-            ruby_xfree(state->object_nl);
-            state->object_nl = NULL;
-        }
-    } else {
-        if (state->object_nl) ruby_xfree(state->object_nl);
-        state->object_nl = fstrndup(RSTRING_PTR(object_nl), len);
-        state->object_nl_len = len;
-    }
+    RB_OBJ_WRITE(self, &state->object_nl, string_config(object_nl));
     return Qnil;
 }
 
@@ -1325,7 +1666,7 @@ static VALUE cState_object_nl_set(VALUE self, VALUE object_nl)
 static VALUE cState_array_nl(VALUE self)
 {
     GET_STATE(self);
-    return state->array_nl ? rb_str_new(state->array_nl, state->array_nl_len) : rb_str_new2("");
+    return state->array_nl ? state->array_nl : rb_str_freeze(rb_utf8_str_new("", 0));
 }
 
 /*
@@ -1335,23 +1676,33 @@ static VALUE cState_array_nl(VALUE self)
  */
 static VALUE cState_array_nl_set(VALUE self, VALUE array_nl)
 {
-    unsigned long len;
     GET_STATE(self);
-    Check_Type(array_nl, T_STRING);
-    len = RSTRING_LEN(array_nl);
-    if (len == 0) {
-        if (state->array_nl) {
-            ruby_xfree(state->array_nl);
-            state->array_nl = NULL;
-        }
-    } else {
-        if (state->array_nl) ruby_xfree(state->array_nl);
-        state->array_nl = fstrndup(RSTRING_PTR(array_nl), len);
-        state->array_nl_len = len;
-    }
+    RB_OBJ_WRITE(self, &state->array_nl, string_config(array_nl));
     return Qnil;
 }
 
+/*
+ * call-seq: as_json()
+ *
+ * This string is put at the end of a line that holds a JSON array.
+ */
+static VALUE cState_as_json(VALUE self)
+{
+    GET_STATE(self);
+    return state->as_json;
+}
+
+/*
+ * call-seq: as_json=(as_json)
+ *
+ * This string is put at the end of a line that holds a JSON array.
+ */
+static VALUE cState_as_json_set(VALUE self, VALUE as_json)
+{
+    GET_STATE(self);
+    RB_OBJ_WRITE(self, &state->as_json, rb_convert_type(as_json, T_DATA, "Proc", "to_proc"));
+    return Qnil;
+}
 
 /*
 * call-seq: check_circular?
@@ -1377,6 +1728,11 @@ static VALUE cState_max_nesting(VALUE self)
     return LONG2FIX(state->max_nesting);
 }
 
+static long long_config(VALUE num)
+{
+    return RTEST(num) ? FIX2LONG(num) : 0;
+}
+
 /*
  * call-seq: max_nesting=(depth)
  *
@@ -1386,32 +1742,63 @@ static VALUE cState_max_nesting(VALUE self)
 static VALUE cState_max_nesting_set(VALUE self, VALUE depth)
 {
     GET_STATE(self);
-    Check_Type(depth, T_FIXNUM);
-    return state->max_nesting = FIX2LONG(depth);
+    state->max_nesting = long_config(depth);
+    return Qnil;
 }
 
 /*
- * call-seq: escape_slash
+ * call-seq: script_safe
  *
  * If this boolean is true, the forward slashes will be escaped in
  * the json output.
  */
-static VALUE cState_escape_slash(VALUE self)
+static VALUE cState_script_safe(VALUE self)
 {
     GET_STATE(self);
-    return state->escape_slash ? Qtrue : Qfalse;
+    return state->script_safe ? Qtrue : Qfalse;
 }
 
 /*
- * call-seq: escape_slash=(depth)
+ * call-seq: script_safe=(enable)
  *
  * This sets whether or not the forward slashes will be escaped in
  * the json output.
  */
-static VALUE cState_escape_slash_set(VALUE self, VALUE enable)
+static VALUE cState_script_safe_set(VALUE self, VALUE enable)
 {
     GET_STATE(self);
-    state->escape_slash = RTEST(enable);
+    state->script_safe = RTEST(enable);
+    return Qnil;
+}
+
+/*
+ * call-seq: strict
+ *
+ * If this boolean is false, types unsupported by the JSON format will
+ * be serialized as strings.
+ * If this boolean is true, types unsupported by the JSON format will
+ * raise a JSON::GeneratorError.
+ */
+static VALUE cState_strict(VALUE self)
+{
+    GET_STATE(self);
+    return state->strict ? Qtrue : Qfalse;
+}
+
+/*
+ * call-seq: strict=(enable)
+ *
+ * This sets whether or not to serialize types unsupported by the
+ * JSON format as strings.
+ * If this boolean is false, types unsupported by the JSON format will
+ * be serialized as strings.
+ * If this boolean is true, types unsupported by the JSON format will
+ * raise a JSON::GeneratorError.
+ */
+static VALUE cState_strict_set(VALUE self, VALUE enable)
+{
+    GET_STATE(self);
+    state->strict = RTEST(enable);
     return Qnil;
 }
 
@@ -1427,6 +1814,18 @@ static VALUE cState_allow_nan_p(VALUE self)
     return state->allow_nan ? Qtrue : Qfalse;
 }
 
+/*
+ * call-seq: allow_nan=(enable)
+ *
+ * This sets whether or not to serialize NaN, Infinity, and -Infinity
+ */
+static VALUE cState_allow_nan_set(VALUE self, VALUE enable)
+{
+    GET_STATE(self);
+    state->allow_nan = RTEST(enable);
+    return Qnil;
+}
+
 /*
  * call-seq: ascii_only?
  *
@@ -1439,6 +1838,18 @@ static VALUE cState_ascii_only_p(VALUE self)
     return state->ascii_only ? Qtrue : Qfalse;
 }
 
+/*
+ * call-seq: ascii_only=(enable)
+ *
+ * This sets whether only ASCII characters should be generated.
+ */
+static VALUE cState_ascii_only_set(VALUE self, VALUE enable)
+{
+    GET_STATE(self);
+    state->ascii_only = RTEST(enable);
+    return Qnil;
+}
+
 /*
  * call-seq: depth
  *
@@ -1459,8 +1870,7 @@ static VALUE cState_depth(VALUE self)
 static VALUE cState_depth_set(VALUE self, VALUE depth)
 {
     GET_STATE(self);
-    Check_Type(depth, T_FIXNUM);
-    state->depth = FIX2LONG(depth);
+    state->depth = long_config(depth);
     return Qnil;
 }
 
@@ -1475,6 +1885,15 @@ static VALUE cState_buffer_initial_length(VALUE self)
     return LONG2FIX(state->buffer_initial_length);
 }
 
+static void buffer_initial_length_set(JSON_Generator_State *state, VALUE buffer_initial_length)
+{
+    Check_Type(buffer_initial_length, T_FIXNUM);
+    long initial_length = FIX2LONG(buffer_initial_length);
+    if (initial_length > 0) {
+        state->buffer_initial_length = initial_length;
+    }
+}
+
 /*
  * call-seq: buffer_initial_length=(length)
  *
@@ -1483,16 +1902,76 @@ static VALUE cState_buffer_initial_length(VALUE self)
  */
 static VALUE cState_buffer_initial_length_set(VALUE self, VALUE buffer_initial_length)
 {
-    long initial_length;
     GET_STATE(self);
-    Check_Type(buffer_initial_length, T_FIXNUM);
-    initial_length = FIX2LONG(buffer_initial_length);
-    if (initial_length > 0) {
-        state->buffer_initial_length = initial_length;
-    }
+    buffer_initial_length_set(state, buffer_initial_length);
     return Qnil;
 }
 
+static int configure_state_i(VALUE key, VALUE val, VALUE _arg)
+{
+    JSON_Generator_State *state = (JSON_Generator_State *)_arg;
+
+         if (key == sym_indent)                { state->indent = string_config(val); }
+    else if (key == sym_space)                 { state->space = string_config(val); }
+    else if (key == sym_space_before)          { state->space_before = string_config(val); }
+    else if (key == sym_object_nl)             { state->object_nl = string_config(val); }
+    else if (key == sym_array_nl)              { state->array_nl = string_config(val); }
+    else if (key == sym_max_nesting)           { state->max_nesting = long_config(val); }
+    else if (key == sym_allow_nan)             { state->allow_nan = RTEST(val); }
+    else if (key == sym_ascii_only)            { state->ascii_only = RTEST(val); }
+    else if (key == sym_depth)                 { state->depth = long_config(val); }
+    else if (key == sym_buffer_initial_length) { buffer_initial_length_set(state, val); }
+    else if (key == sym_script_safe)           { state->script_safe = RTEST(val); }
+    else if (key == sym_escape_slash)          { state->script_safe = RTEST(val); }
+    else if (key == sym_strict)                { state->strict = RTEST(val); }
+    else if (key == sym_as_json)               { state->as_json = RTEST(val) ? rb_convert_type(val, T_DATA, "Proc", "to_proc") : Qfalse; }
+    return ST_CONTINUE;
+}
+
+static void configure_state(JSON_Generator_State *state, VALUE config)
+{
+    if (!RTEST(config)) return;
+
+    Check_Type(config, T_HASH);
+
+    if (!RHASH_SIZE(config)) return;
+
+    // We assume in most cases few keys are set so it's faster to go over
+    // the provided keys than to check all possible keys.
+    rb_hash_foreach(config, configure_state_i, (VALUE)state);
+}
+
+static VALUE cState_configure(VALUE self, VALUE opts)
+{
+    GET_STATE(self);
+    configure_state(state, opts);
+    return self;
+}
+
+static VALUE cState_m_generate(VALUE klass, VALUE obj, VALUE opts, VALUE io)
+{
+    JSON_Generator_State state = {0};
+    state_init(&state);
+    configure_state(&state, opts);
+
+    char stack_buffer[FBUFFER_STACK_SIZE];
+    FBuffer buffer = {
+        .io = RTEST(io) ? io : Qfalse,
+    };
+    fbuffer_stack_init(&buffer, state.buffer_initial_length, stack_buffer, FBUFFER_STACK_SIZE);
+
+    struct generate_json_data data = {
+        .buffer = &buffer,
+        .vstate = Qfalse,
+        .state = &state,
+        .obj = obj,
+        .func = generate_json,
+    };
+    rb_rescue(generate_json_try, (VALUE)&data, generate_json_rescue, (VALUE)&data);
+
+    return fbuffer_finalize(&buffer);
+}
+
 /*
  *
  */
@@ -1506,18 +1985,26 @@ void Init_generator(void)
     rb_require("json/common");
 
     mJSON = rb_define_module("JSON");
-    mExt = rb_define_module_under(mJSON, "Ext");
-    mGenerator = rb_define_module_under(mExt, "Generator");
 
+    rb_global_variable(&cFragment);
+    cFragment = rb_const_get(mJSON, rb_intern("Fragment"));
+
+    VALUE mExt = rb_define_module_under(mJSON, "Ext");
+    VALUE mGenerator = rb_define_module_under(mExt, "Generator");
+
+    rb_global_variable(&eGeneratorError);
     eGeneratorError = rb_path2class("JSON::GeneratorError");
+
+    rb_global_variable(&eNestingError);
     eNestingError = rb_path2class("JSON::NestingError");
-    rb_gc_register_mark_object(eGeneratorError);
-    rb_gc_register_mark_object(eNestingError);
 
     cState = rb_define_class_under(mGenerator, "State", rb_cObject);
     rb_define_alloc_func(cState, cState_s_allocate);
     rb_define_singleton_method(cState, "from_state", cState_from_state_s, 1);
     rb_define_method(cState, "initialize", cState_initialize, -1);
+    rb_define_alias(cState, "initialize", "initialize"); // avoid method redefinition warnings
+    rb_define_private_method(cState, "_configure", cState_configure, 1);
+
     rb_define_method(cState, "initialize_copy", cState_init_copy, 1);
     rb_define_method(cState, "indent", cState_indent, 0);
     rb_define_method(cState, "indent=", cState_indent_set, 1);
@@ -1529,81 +2016,124 @@ void Init_generator(void)
     rb_define_method(cState, "object_nl=", cState_object_nl_set, 1);
     rb_define_method(cState, "array_nl", cState_array_nl, 0);
     rb_define_method(cState, "array_nl=", cState_array_nl_set, 1);
+    rb_define_method(cState, "as_json", cState_as_json, 0);
+    rb_define_method(cState, "as_json=", cState_as_json_set, 1);
     rb_define_method(cState, "max_nesting", cState_max_nesting, 0);
     rb_define_method(cState, "max_nesting=", cState_max_nesting_set, 1);
-    rb_define_method(cState, "escape_slash", cState_escape_slash, 0);
-    rb_define_method(cState, "escape_slash?", cState_escape_slash, 0);
-    rb_define_method(cState, "escape_slash=", cState_escape_slash_set, 1);
+    rb_define_method(cState, "script_safe", cState_script_safe, 0);
+    rb_define_method(cState, "script_safe?", cState_script_safe, 0);
+    rb_define_method(cState, "script_safe=", cState_script_safe_set, 1);
+    rb_define_alias(cState, "escape_slash", "script_safe");
+    rb_define_alias(cState, "escape_slash?", "script_safe?");
+    rb_define_alias(cState, "escape_slash=", "script_safe=");
+    rb_define_method(cState, "strict", cState_strict, 0);
+    rb_define_method(cState, "strict?", cState_strict, 0);
+    rb_define_method(cState, "strict=", cState_strict_set, 1);
     rb_define_method(cState, "check_circular?", cState_check_circular_p, 0);
     rb_define_method(cState, "allow_nan?", cState_allow_nan_p, 0);
+    rb_define_method(cState, "allow_nan=", cState_allow_nan_set, 1);
     rb_define_method(cState, "ascii_only?", cState_ascii_only_p, 0);
+    rb_define_method(cState, "ascii_only=", cState_ascii_only_set, 1);
     rb_define_method(cState, "depth", cState_depth, 0);
     rb_define_method(cState, "depth=", cState_depth_set, 1);
     rb_define_method(cState, "buffer_initial_length", cState_buffer_initial_length, 0);
     rb_define_method(cState, "buffer_initial_length=", cState_buffer_initial_length_set, 1);
-    rb_define_method(cState, "configure", cState_configure, 1);
-    rb_define_alias(cState, "merge", "configure");
-    rb_define_method(cState, "to_h", cState_to_h, 0);
-    rb_define_alias(cState, "to_hash", "to_h");
-    rb_define_method(cState, "[]", cState_aref, 1);
-    rb_define_method(cState, "[]=", cState_aset, 2);
-    rb_define_method(cState, "generate", cState_generate, 1);
-
-    mGeneratorMethods = rb_define_module_under(mGenerator, "GeneratorMethods");
-    mObject = rb_define_module_under(mGeneratorMethods, "Object");
+    rb_define_method(cState, "generate", cState_generate, -1);
+    rb_define_alias(cState, "generate_new", "generate"); // :nodoc:
+
+    rb_define_singleton_method(cState, "generate", cState_m_generate, 3);
+
+    VALUE mGeneratorMethods = rb_define_module_under(mGenerator, "GeneratorMethods");
+
+    VALUE mObject = rb_define_module_under(mGeneratorMethods, "Object");
     rb_define_method(mObject, "to_json", mObject_to_json, -1);
-    mHash = rb_define_module_under(mGeneratorMethods, "Hash");
+
+    VALUE mHash = rb_define_module_under(mGeneratorMethods, "Hash");
     rb_define_method(mHash, "to_json", mHash_to_json, -1);
-    mArray = rb_define_module_under(mGeneratorMethods, "Array");
+
+    VALUE mArray = rb_define_module_under(mGeneratorMethods, "Array");
     rb_define_method(mArray, "to_json", mArray_to_json, -1);
+
 #ifdef RUBY_INTEGER_UNIFICATION
-    mInteger = rb_define_module_under(mGeneratorMethods, "Integer");
+    VALUE mInteger = rb_define_module_under(mGeneratorMethods, "Integer");
     rb_define_method(mInteger, "to_json", mInteger_to_json, -1);
 #else
-    mFixnum = rb_define_module_under(mGeneratorMethods, "Fixnum");
+    VALUE mFixnum = rb_define_module_under(mGeneratorMethods, "Fixnum");
     rb_define_method(mFixnum, "to_json", mFixnum_to_json, -1);
-    mBignum = rb_define_module_under(mGeneratorMethods, "Bignum");
+
+    VALUE mBignum = rb_define_module_under(mGeneratorMethods, "Bignum");
     rb_define_method(mBignum, "to_json", mBignum_to_json, -1);
 #endif
-    mFloat = rb_define_module_under(mGeneratorMethods, "Float");
+    VALUE mFloat = rb_define_module_under(mGeneratorMethods, "Float");
     rb_define_method(mFloat, "to_json", mFloat_to_json, -1);
-    mString = rb_define_module_under(mGeneratorMethods, "String");
+
+    VALUE mString = rb_define_module_under(mGeneratorMethods, "String");
     rb_define_singleton_method(mString, "included", mString_included_s, 1);
     rb_define_method(mString, "to_json", mString_to_json, -1);
     rb_define_method(mString, "to_json_raw", mString_to_json_raw, -1);
     rb_define_method(mString, "to_json_raw_object", mString_to_json_raw_object, 0);
+
     mString_Extend = rb_define_module_under(mString, "Extend");
     rb_define_method(mString_Extend, "json_create", mString_Extend_json_create, 1);
-    mTrueClass = rb_define_module_under(mGeneratorMethods, "TrueClass");
+
+    VALUE mTrueClass = rb_define_module_under(mGeneratorMethods, "TrueClass");
     rb_define_method(mTrueClass, "to_json", mTrueClass_to_json, -1);
-    mFalseClass = rb_define_module_under(mGeneratorMethods, "FalseClass");
+
+    VALUE mFalseClass = rb_define_module_under(mGeneratorMethods, "FalseClass");
     rb_define_method(mFalseClass, "to_json", mFalseClass_to_json, -1);
-    mNilClass = rb_define_module_under(mGeneratorMethods, "NilClass");
+
+    VALUE mNilClass = rb_define_module_under(mGeneratorMethods, "NilClass");
     rb_define_method(mNilClass, "to_json", mNilClass_to_json, -1);
 
+    rb_global_variable(&Encoding_UTF_8);
+    Encoding_UTF_8 = rb_const_get(rb_path2class("Encoding"), rb_intern("UTF_8"));
+
     i_to_s = rb_intern("to_s");
     i_to_json = rb_intern("to_json");
     i_new = rb_intern("new");
-    i_indent = rb_intern("indent");
-    i_space = rb_intern("space");
-    i_space_before = rb_intern("space_before");
-    i_object_nl = rb_intern("object_nl");
-    i_array_nl = rb_intern("array_nl");
-    i_max_nesting = rb_intern("max_nesting");
-    i_escape_slash = rb_intern("escape_slash");
-    i_allow_nan = rb_intern("allow_nan");
-    i_ascii_only = rb_intern("ascii_only");
-    i_depth = rb_intern("depth");
-    i_buffer_initial_length = rb_intern("buffer_initial_length");
     i_pack = rb_intern("pack");
     i_unpack = rb_intern("unpack");
     i_create_id = rb_intern("create_id");
     i_extend = rb_intern("extend");
-    i_key_p = rb_intern("key?");
-    i_aref = rb_intern("[]");
-    i_send = rb_intern("__send__");
-    i_respond_to_p = rb_intern("respond_to?");
-    i_match = rb_intern("match");
-    i_keys = rb_intern("keys");
-    i_dup = rb_intern("dup");
+    i_encode = rb_intern("encode");
+
+    sym_indent = ID2SYM(rb_intern("indent"));
+    sym_space = ID2SYM(rb_intern("space"));
+    sym_space_before = ID2SYM(rb_intern("space_before"));
+    sym_object_nl = ID2SYM(rb_intern("object_nl"));
+    sym_array_nl = ID2SYM(rb_intern("array_nl"));
+    sym_max_nesting = ID2SYM(rb_intern("max_nesting"));
+    sym_allow_nan = ID2SYM(rb_intern("allow_nan"));
+    sym_ascii_only = ID2SYM(rb_intern("ascii_only"));
+    sym_depth = ID2SYM(rb_intern("depth"));
+    sym_buffer_initial_length = ID2SYM(rb_intern("buffer_initial_length"));
+    sym_script_safe = ID2SYM(rb_intern("script_safe"));
+    sym_escape_slash = ID2SYM(rb_intern("escape_slash"));
+    sym_strict = ID2SYM(rb_intern("strict"));
+    sym_as_json = ID2SYM(rb_intern("as_json"));
+
+    usascii_encindex = rb_usascii_encindex();
+    utf8_encindex = rb_utf8_encindex();
+    binary_encindex = rb_ascii8bit_encindex();
+
+    rb_require("json/ext/generator/state");
+
+
+    switch (find_simd_implementation()) {
+#ifdef HAVE_SIMD
+#ifdef HAVE_SIMD_NEON
+        case SIMD_NEON:
+            search_escape_basic_impl = search_escape_basic_neon;
+            break;
+#endif /* HAVE_SIMD_NEON */
+#ifdef HAVE_SIMD_SSE2
+        case SIMD_SSE2:
+            search_escape_basic_impl = search_escape_basic_sse2;
+            break;
+#endif /* HAVE_SIMD_SSE2 */
+#endif /* HAVE_SIMD */
+        default:
+            search_escape_basic_impl = search_escape_basic;
+            break;
+    }
 }
diff --git a/ext/json/generator/generator.h b/ext/json/generator/generator.h
deleted file mode 100644
index 3ebd622554e69a..00000000000000
--- a/ext/json/generator/generator.h
+++ /dev/null
@@ -1,174 +0,0 @@
-#ifndef _GENERATOR_H_
-#define _GENERATOR_H_
-
-#include <math.h>
-#include <ctype.h>
-
-#include "ruby.h"
-
-#ifdef HAVE_RUBY_RE_H
-#include "ruby/re.h"
-#else
-#include "re.h"
-#endif
-
-#ifndef rb_intern_str
-#define rb_intern_str(string) SYM2ID(rb_str_intern(string))
-#endif
-
-#ifndef rb_obj_instance_variables
-#define rb_obj_instance_variables(object) rb_funcall(object, rb_intern("instance_variables"), 0)
-#endif
-
-#define option_given_p(opts, key) RTEST(rb_funcall(opts, i_key_p, 1, key))
-
-/* unicode definitions */
-
-#define UNI_STRICT_CONVERSION 1
-
-typedef unsigned long  UTF32; /* at least 32 bits */
-typedef unsigned short UTF16; /* at least 16 bits */
-typedef unsigned char  UTF8;  /* typically 8 bits */
-
-#define UNI_REPLACEMENT_CHAR (UTF32)0x0000FFFD
-#define UNI_MAX_BMP (UTF32)0x0000FFFF
-#define UNI_MAX_UTF16 (UTF32)0x0010FFFF
-#define UNI_MAX_UTF32 (UTF32)0x7FFFFFFF
-#define UNI_MAX_LEGAL_UTF32 (UTF32)0x0010FFFF
-
-#define UNI_SUR_HIGH_START  (UTF32)0xD800
-#define UNI_SUR_HIGH_END    (UTF32)0xDBFF
-#define UNI_SUR_LOW_START   (UTF32)0xDC00
-#define UNI_SUR_LOW_END     (UTF32)0xDFFF
-
-static const int halfShift  = 10; /* used for shifting by 10 bits */
-
-static const UTF32 halfBase = 0x0010000UL;
-static const UTF32 halfMask = 0x3FFUL;
-
-static unsigned char isLegalUTF8(const UTF8 *source, unsigned long length);
-static void unicode_escape(char *buf, UTF16 character);
-static void unicode_escape_to_buffer(FBuffer *buffer, char buf[6], UTF16 character);
-static void convert_UTF8_to_JSON_ASCII(FBuffer *buffer, VALUE string, char escape_slash);
-static void convert_UTF8_to_JSON(FBuffer *buffer, VALUE string, char escape_slash);
-static char *fstrndup(const char *ptr, unsigned long len);
-
-/* ruby api and some helpers */
-
-typedef struct JSON_Generator_StateStruct {
-    char *indent;
-    long indent_len;
-    char *space;
-    long space_len;
-    char *space_before;
-    long space_before_len;
-    char *object_nl;
-    long object_nl_len;
-    char *array_nl;
-    long array_nl_len;
-    FBuffer *array_delim;
-    FBuffer *object_delim;
-    FBuffer *object_delim2;
-    long max_nesting;
-    char allow_nan;
-    char ascii_only;
-    char escape_slash;
-    long depth;
-    long buffer_initial_length;
-} JSON_Generator_State;
-
-#define GET_STATE_TO(self, state) \
-    TypedData_Get_Struct(self, JSON_Generator_State, &JSON_Generator_State_type, state)
-
-#define GET_STATE(self)                       \
-    JSON_Generator_State *state;              \
-    GET_STATE_TO(self, state)
-
-#define GENERATE_JSON(type)                                                                     \
-    FBuffer *buffer;                                                                            \
-    VALUE Vstate;                                                                               \
-    JSON_Generator_State *state;                                                                \
-                                                                                                \
-    rb_scan_args(argc, argv, "01", &Vstate);                                                    \
-    Vstate = cState_from_state_s(cState, Vstate);                                               \
-    TypedData_Get_Struct(Vstate, JSON_Generator_State, &JSON_Generator_State_type, state);	\
-    buffer = cState_prepare_buffer(Vstate);                                                     \
-    generate_json_##type(buffer, Vstate, state, self);                                          \
-    return fbuffer_to_s(buffer)
-
-static VALUE mHash_to_json(int argc, VALUE *argv, VALUE self);
-static VALUE mArray_to_json(int argc, VALUE *argv, VALUE self);
-#ifdef RUBY_INTEGER_UNIFICATION
-static VALUE mInteger_to_json(int argc, VALUE *argv, VALUE self);
-#else
-static VALUE mFixnum_to_json(int argc, VALUE *argv, VALUE self);
-static VALUE mBignum_to_json(int argc, VALUE *argv, VALUE self);
-#endif
-static VALUE mFloat_to_json(int argc, VALUE *argv, VALUE self);
-static VALUE mString_included_s(VALUE self, VALUE modul);
-static VALUE mString_to_json(int argc, VALUE *argv, VALUE self);
-static VALUE mString_to_json_raw_object(VALUE self);
-static VALUE mString_to_json_raw(int argc, VALUE *argv, VALUE self);
-static VALUE mString_Extend_json_create(VALUE self, VALUE o);
-static VALUE mTrueClass_to_json(int argc, VALUE *argv, VALUE self);
-static VALUE mFalseClass_to_json(int argc, VALUE *argv, VALUE self);
-static VALUE mNilClass_to_json(int argc, VALUE *argv, VALUE self);
-static VALUE mObject_to_json(int argc, VALUE *argv, VALUE self);
-static void State_free(void *state);
-static VALUE cState_s_allocate(VALUE klass);
-static VALUE cState_configure(VALUE self, VALUE opts);
-static VALUE cState_to_h(VALUE self);
-static void generate_json(FBuffer *buffer, VALUE Vstate, JSON_Generator_State *state, VALUE obj);
-static void generate_json_object(FBuffer *buffer, VALUE Vstate, JSON_Generator_State *state, VALUE obj);
-static void generate_json_array(FBuffer *buffer, VALUE Vstate, JSON_Generator_State *state, VALUE obj);
-static void generate_json_string(FBuffer *buffer, VALUE Vstate, JSON_Generator_State *state, VALUE obj);
-static void generate_json_null(FBuffer *buffer, VALUE Vstate, JSON_Generator_State *state, VALUE obj);
-static void generate_json_false(FBuffer *buffer, VALUE Vstate, JSON_Generator_State *state, VALUE obj);
-static void generate_json_true(FBuffer *buffer, VALUE Vstate, JSON_Generator_State *state, VALUE obj);
-#ifdef RUBY_INTEGER_UNIFICATION
-static void generate_json_integer(FBuffer *buffer, VALUE Vstate, JSON_Generator_State *state, VALUE obj);
-#endif
-static void generate_json_fixnum(FBuffer *buffer, VALUE Vstate, JSON_Generator_State *state, VALUE obj);
-static void generate_json_bignum(FBuffer *buffer, VALUE Vstate, JSON_Generator_State *state, VALUE obj);
-static void generate_json_float(FBuffer *buffer, VALUE Vstate, JSON_Generator_State *state, VALUE obj);
-static VALUE cState_partial_generate(VALUE self, VALUE obj);
-static VALUE cState_generate(VALUE self, VALUE obj);
-static VALUE cState_initialize(int argc, VALUE *argv, VALUE self);
-static VALUE cState_from_state_s(VALUE self, VALUE opts);
-static VALUE cState_indent(VALUE self);
-static VALUE cState_indent_set(VALUE self, VALUE indent);
-static VALUE cState_space(VALUE self);
-static VALUE cState_space_set(VALUE self, VALUE space);
-static VALUE cState_space_before(VALUE self);
-static VALUE cState_space_before_set(VALUE self, VALUE space_before);
-static VALUE cState_object_nl(VALUE self);
-static VALUE cState_object_nl_set(VALUE self, VALUE object_nl);
-static VALUE cState_array_nl(VALUE self);
-static VALUE cState_array_nl_set(VALUE self, VALUE array_nl);
-static VALUE cState_max_nesting(VALUE self);
-static VALUE cState_max_nesting_set(VALUE self, VALUE depth);
-static VALUE cState_allow_nan_p(VALUE self);
-static VALUE cState_ascii_only_p(VALUE self);
-static VALUE cState_depth(VALUE self);
-static VALUE cState_depth_set(VALUE self, VALUE depth);
-static VALUE cState_escape_slash(VALUE self);
-static VALUE cState_escape_slash_set(VALUE self, VALUE depth);
-static FBuffer *cState_prepare_buffer(VALUE self);
-#ifndef ZALLOC
-#define ZALLOC(type) ((type *)ruby_zalloc(sizeof(type)))
-static inline void *ruby_zalloc(size_t n)
-{
-    void *p = ruby_xmalloc(n);
-    memset(p, 0, n);
-    return p;
-}
-#endif
-#ifdef TypedData_Make_Struct
-static const rb_data_type_t JSON_Generator_State_type;
-#define NEW_TYPEDDATA_WRAPPER 1
-#else
-#define TypedData_Make_Struct(klass, type, ignore, json) Data_Make_Struct(klass, type, NULL, State_free, json)
-#define TypedData_Get_Struct(self, JSON_Generator_State, ignore, json) Data_Get_Struct(self, JSON_Generator_State, json)
-#endif
-
-#endif
diff --git a/ext/json/json.gemspec b/ext/json/json.gemspec
index f4b2ae791dabbe..55757310250dae 100644
--- a/ext/json/json.gemspec
+++ b/ext/json/json.gemspec
@@ -1,67 +1,62 @@
-# -*- encoding: utf-8 -*-
+# frozen_string_literal: true
+
+version = File.foreach(File.join(__dir__, "lib/json/version.rb")) do |line|
+  /^\s*VERSION\s*=\s*'(.*)'/ =~ line and break $1
+end rescue nil
+
+spec = Gem::Specification.new do |s|
+  java_ext = Gem::Platform === s.platform && s.platform =~ 'java' || RUBY_ENGINE == 'jruby'
 
-Gem::Specification.new do |s|
   s.name = "json"
-  s.version = File.read(File.expand_path('../VERSION', __FILE__)).chomp
+  s.version = version
 
   s.summary = "JSON Implementation for Ruby"
-  s.description = "This is a JSON implementation as a Ruby extension in C."
+  s.homepage = "https://github.com/ruby/json"
+  s.metadata = {
+    'bug_tracker_uri'   => 'https://github.com/ruby/json/issues',
+    'changelog_uri'     => 'https://github.com/ruby/json/blob/master/CHANGES.md',
+    'documentation_uri' => 'https://docs.ruby-lang.org/en/master/JSON.html',
+    'homepage_uri'      => s.homepage,
+    'source_code_uri'   => 'https://github.com/ruby/json',
+  }
+
+  s.required_ruby_version = Gem::Requirement.new(">= 2.7")
+
+  if java_ext
+    s.description = "A JSON implementation as a JRuby extension."
+    s.author = "Daniel Luz"
+    s.email = "dev+ruby@mernen.com"
+  else
+    s.description = "This is a JSON implementation as a Ruby extension in C."
+    s.authors = ["Florian Frank"]
+    s.email = "flori@ping.de"
+  end
+
   s.licenses = ["Ruby"]
-  s.authors = ["Florian Frank"]
-  s.email = "flori@ping.de"
 
-  s.extensions = ["ext/json/ext/generator/extconf.rb", "ext/json/ext/parser/extconf.rb", "ext/json/extconf.rb"]
   s.extra_rdoc_files = ["README.md"]
   s.rdoc_options = ["--title", "JSON implementation for Ruby", "--main", "README.md"]
+
   s.files = [
     "CHANGES.md",
-    "LICENSE",
+    "COPYING",
+    "BSDL",
+    "LEGAL",
     "README.md",
-    "VERSION",
-    "ext/json/ext/fbuffer/fbuffer.h",
-    "ext/json/ext/generator/depend",
-    "ext/json/ext/generator/extconf.rb",
-    "ext/json/ext/generator/generator.c",
-    "ext/json/ext/generator/generator.h",
-    "ext/json/ext/parser/depend",
-    "ext/json/ext/parser/extconf.rb",
-    "ext/json/ext/parser/parser.c",
-    "ext/json/ext/parser/parser.h",
-    "ext/json/ext/parser/parser.rl",
-    "ext/json/extconf.rb",
     "json.gemspec",
-    "lib/json.rb",
-    "lib/json/add/bigdecimal.rb",
-    "lib/json/add/complex.rb",
-    "lib/json/add/core.rb",
-    "lib/json/add/date.rb",
-    "lib/json/add/date_time.rb",
-    "lib/json/add/exception.rb",
-    "lib/json/add/ostruct.rb",
-    "lib/json/add/range.rb",
-    "lib/json/add/rational.rb",
-    "lib/json/add/regexp.rb",
-    "lib/json/add/set.rb",
-    "lib/json/add/struct.rb",
-    "lib/json/add/symbol.rb",
-    "lib/json/add/time.rb",
-    "lib/json/common.rb",
-    "lib/json/ext.rb",
-    "lib/json/generic_object.rb",
-    "lib/json/pure.rb",
-    "lib/json/pure/generator.rb",
-    "lib/json/pure/parser.rb",
-    "lib/json/version.rb",
-  ]
-  s.homepage = "https://flori.github.io/json"
-  s.metadata = {
-    'bug_tracker_uri'   => 'https://github.com/flori/json/issues',
-    'changelog_uri'     => 'https://github.com/flori/json/blob/master/CHANGES.md',
-    'documentation_uri' => 'https://flori.github.io/json/doc/index.html',
-    'homepage_uri'      => s.homepage,
-    'source_code_uri'   => 'https://github.com/flori/json',
-    'wiki_uri'          => 'https://github.com/flori/json/wiki'
-  }
+  ] + Dir.glob("lib/**/*.rb", base: File.expand_path("..", __FILE__))
+
+  if java_ext
+    s.platform = 'java'
+    s.files += Dir["lib/json/ext/**/*.jar"]
+  else
+    s.extensions = Dir["ext/json/**/extconf.rb"]
+    s.files += Dir["ext/json/**/*.{c,h,rb}"]
+  end
+end
 
-  s.required_ruby_version = Gem::Requirement.new(">= 2.3")
+if RUBY_ENGINE == 'jruby' && $0 == __FILE__
+  Gem::Builder.new(spec).build
+else
+  spec
 end
diff --git a/ext/json/lib/json.rb b/ext/json/lib/json.rb
index 1e64bfcb1ac824..735f2380667daa 100644
--- a/ext/json/lib/json.rb
+++ b/ext/json/lib/json.rb
@@ -1,4 +1,4 @@
-#frozen_string_literal: false
+# frozen_string_literal: true
 require 'json/common'
 
 ##
@@ -127,6 +127,24 @@
 #
 # ---
 #
+# Option +allow_duplicate_key+ specifies whether duplicate keys in objects
+# should be ignored or cause an error to be raised:
+#
+# When not specified:
+#   # The last value is used and a deprecation warning emitted.
+#   JSON.parse('{"a": 1, "a":2}') => {"a" => 2}
+#   # waring: detected duplicate keys in JSON object.
+#   # This will raise an error in json 3.0 unless enabled via `allow_duplicate_key: true`
+#
+# When set to `+true+`
+#   # The last value is used.
+#   JSON.parse('{"a": 1, "a":2}') => {"a" => 2}
+#
+# When set to `+false+`, the future default:
+#   JSON.parse('{"a": 1, "a":2}') => duplicate key at line 1 column 1 (JSON::ParserError)
+#
+# ---
+#
 # Option +allow_nan+ (boolean) specifies whether to allow
 # NaN, Infinity, and MinusInfinity in +source+;
 # defaults to +false+.
@@ -143,8 +161,23 @@
 #   ruby = JSON.parse(source, {allow_nan: true})
 #   ruby # => [NaN, Infinity, -Infinity]
 #
+# ---
+#
+# Option +allow_trailing_comma+ (boolean) specifies whether to allow
+# trailing commas in objects and arrays;
+# defaults to +false+.
+#
+# With the default, +false+:
+#   JSON.parse('[1,]') # unexpected character: ']' at line 1 column 4 (JSON::ParserError)
+#
+# When enabled:
+#   JSON.parse('[1,]', allow_trailing_comma: true) # => [1]
+#
 # ====== Output Options
 #
+# Option +freeze+ (boolean) specifies whether the returned objects will be frozen;
+# defaults to +false+.
+#
 # Option +symbolize_names+ (boolean) specifies whether returned \Hash keys
 # should be Symbols;
 # defaults to +false+ (use Strings).
@@ -285,6 +318,15 @@
 #   # Raises JSON::NestingError (nesting of 2 is too deep):
 #   JSON.generate(obj, max_nesting: 2)
 #
+# ====== Escaping Options
+#
+# Options +script_safe+ (boolean) specifies wether <tt>'\u2028'</tt>, <tt>'\u2029'</tt>
+# and <tt>'/'</tt> should be escaped as to make the JSON object safe to interpolate in script
+# tags.
+#
+# Options +ascii_only+ (boolean) specifies wether all characters outside the ASCII range
+# should be escaped.
+#
 # ====== Output Options
 #
 # The default formatting options generate the most compact
@@ -369,13 +411,13 @@
 #   json1 = JSON.generate(ruby)
 #   ruby1 = JSON.parse(json1, create_additions: true)
 #   # Make a nice display.
-#   display = <<EOT
-#   Generated JSON:
-#     Without addition:  #{json0} (#{json0.class})
-#     With addition:     #{json1} (#{json1.class})
-#   Parsed JSON:
-#     Without addition:  #{ruby0.inspect} (#{ruby0.class})
-#     With addition:     #{ruby1.inspect} (#{ruby1.class})
+#   display = <<~EOT
+#     Generated JSON:
+#       Without addition:  #{json0} (#{json0.class})
+#       With addition:     #{json1} (#{json1.class})
+#     Parsed JSON:
+#       Without addition:  #{ruby0.inspect} (#{ruby0.class})
+#       With addition:     #{ruby1.inspect} (#{ruby1.class})
 #   EOT
 #   puts display
 #
@@ -553,13 +595,13 @@
 #   json1 = JSON.generate(foo1)
 #   obj1 = JSON.parse(json1, create_additions: true)
 #   #   Make a nice display.
-#   display = <<EOT
-#   Generated JSON:
-#     Without custom addition:  #{json0} (#{json0.class})
-#     With custom addition:     #{json1} (#{json1.class})
-#   Parsed JSON:
-#     Without custom addition:  #{obj0.inspect} (#{obj0.class})
-#     With custom addition:     #{obj1.inspect} (#{obj1.class})
+#   display = <<~EOT
+#     Generated JSON:
+#       Without custom addition:  #{json0} (#{json0.class})
+#       With custom addition:     #{json1} (#{json1.class})
+#     Parsed JSON:
+#       Without custom addition:  #{obj0.inspect} (#{obj0.class})
+#       With custom addition:     #{obj1.inspect} (#{obj1.class})
 #   EOT
 #   puts display
 #
@@ -574,10 +616,5 @@
 #
 module JSON
   require 'json/version'
-
-  begin
-    require 'json/ext'
-  rescue LoadError
-    require 'json/pure'
-  end
+  require 'json/ext'
 end
diff --git a/ext/json/lib/json/add/bigdecimal.rb b/ext/json/lib/json/add/bigdecimal.rb
index 25383f28ed2802..dc84572f312a6b 100644
--- a/ext/json/lib/json/add/bigdecimal.rb
+++ b/ext/json/lib/json/add/bigdecimal.rb
@@ -1,4 +1,4 @@
-#frozen_string_literal: false
+# frozen_string_literal: true
 unless defined?(::JSON::JSON_LOADED) and ::JSON::JSON_LOADED
   require 'json'
 end
@@ -8,24 +8,50 @@
 end
 
 class BigDecimal
-  # Import a JSON Marshalled object.
-  #
-  # method used for JSON marshalling support.
+
+  # See #as_json.
   def self.json_create(object)
     BigDecimal._load object['b']
   end
 
-  # Marshal the object to JSON.
+  # Methods <tt>BigDecimal#as_json</tt> and +BigDecimal.json_create+ may be used
+  # to serialize and deserialize a \BigDecimal object;
+  # see Marshal[rdoc-ref:Marshal].
+  #
+  # \Method <tt>BigDecimal#as_json</tt> serializes +self+,
+  # returning a 2-element hash representing +self+:
+  #
+  #   require 'json/add/bigdecimal'
+  #   x = BigDecimal(2).as_json             # => {"json_class"=>"BigDecimal", "b"=>"27:0.2e1"}
+  #   y = BigDecimal(2.0, 4).as_json        # => {"json_class"=>"BigDecimal", "b"=>"36:0.2e1"}
+  #   z = BigDecimal(Complex(2, 0)).as_json # => {"json_class"=>"BigDecimal", "b"=>"27:0.2e1"}
+  #
+  # \Method +JSON.create+ deserializes such a hash, returning a \BigDecimal object:
+  #
+  #   BigDecimal.json_create(x) # => 0.2e1
+  #   BigDecimal.json_create(y) # => 0.2e1
+  #   BigDecimal.json_create(z) # => 0.2e1
   #
-  # method used for JSON marshalling support.
   def as_json(*)
     {
       JSON.create_id => self.class.name,
-      'b'            => _dump,
+      'b'            => _dump.force_encoding(Encoding::UTF_8),
     }
   end
 
-  # return the JSON value
+  # Returns a JSON string representing +self+:
+  #
+  #   require 'json/add/bigdecimal'
+  #   puts BigDecimal(2).to_json
+  #   puts BigDecimal(2.0, 4).to_json
+  #   puts BigDecimal(Complex(2, 0)).to_json
+  #
+  # Output:
+  #
+  #   {"json_class":"BigDecimal","b":"27:0.2e1"}
+  #   {"json_class":"BigDecimal","b":"36:0.2e1"}
+  #   {"json_class":"BigDecimal","b":"27:0.2e1"}
+  #
   def to_json(*args)
     as_json.to_json(*args)
   end
diff --git a/ext/json/lib/json/add/complex.rb b/ext/json/lib/json/add/complex.rb
index e63e29fd22663d..9e3c6f2d0aa85b 100644
--- a/ext/json/lib/json/add/complex.rb
+++ b/ext/json/lib/json/add/complex.rb
@@ -1,18 +1,31 @@
-#frozen_string_literal: false
+# frozen_string_literal: true
 unless defined?(::JSON::JSON_LOADED) and ::JSON::JSON_LOADED
   require 'json'
 end
 
 class Complex
 
-  # Deserializes JSON string by converting Real value <tt>r</tt>, imaginary
-  # value <tt>i</tt>, to a Complex object.
+  # See #as_json.
   def self.json_create(object)
     Complex(object['r'], object['i'])
   end
 
-  # Returns a hash, that will be turned into a JSON object and represent this
-  # object.
+  # Methods <tt>Complex#as_json</tt> and +Complex.json_create+ may be used
+  # to serialize and deserialize a \Complex object;
+  # see Marshal[rdoc-ref:Marshal].
+  #
+  # \Method <tt>Complex#as_json</tt> serializes +self+,
+  # returning a 2-element hash representing +self+:
+  #
+  #   require 'json/add/complex'
+  #   x = Complex(2).as_json      # => {"json_class"=>"Complex", "r"=>2, "i"=>0}
+  #   y = Complex(2.0, 4).as_json # => {"json_class"=>"Complex", "r"=>2.0, "i"=>4}
+  #
+  # \Method +JSON.create+ deserializes such a hash, returning a \Complex object:
+  #
+  #   Complex.json_create(x) # => (2+0i)
+  #   Complex.json_create(y) # => (2.0+4i)
+  #
   def as_json(*)
     {
       JSON.create_id => self.class.name,
@@ -21,7 +34,17 @@ def as_json(*)
     }
   end
 
-  # Stores class name (Complex) along with real value <tt>r</tt> and imaginary value <tt>i</tt> as JSON string
+  # Returns a JSON string representing +self+:
+  #
+  #   require 'json/add/complex'
+  #   puts Complex(2).to_json
+  #   puts Complex(2.0, 4).to_json
+  #
+  # Output:
+  #
+  #   {"json_class":"Complex","r":2,"i":0}
+  #   {"json_class":"Complex","r":2.0,"i":4}
+  #
   def to_json(*args)
     as_json.to_json(*args)
   end
diff --git a/ext/json/lib/json/add/core.rb b/ext/json/lib/json/add/core.rb
index bfb017c46082bd..485f097fff4317 100644
--- a/ext/json/lib/json/add/core.rb
+++ b/ext/json/lib/json/add/core.rb
@@ -1,4 +1,4 @@
-#frozen_string_literal: false
+# frozen_string_literal: true
 # This file requires the implementations of ruby core's custom objects for
 # serialisation/deserialisation.
 
diff --git a/ext/json/lib/json/add/date.rb b/ext/json/lib/json/add/date.rb
index 25523561a52a11..88a098b6379775 100644
--- a/ext/json/lib/json/add/date.rb
+++ b/ext/json/lib/json/add/date.rb
@@ -1,4 +1,4 @@
-#frozen_string_literal: false
+# frozen_string_literal: true
 unless defined?(::JSON::JSON_LOADED) and ::JSON::JSON_LOADED
   require 'json'
 end
@@ -6,16 +6,29 @@
 
 class Date
 
-  # Deserializes JSON string by converting Julian year <tt>y</tt>, month
-  # <tt>m</tt>, day <tt>d</tt> and Day of Calendar Reform <tt>sg</tt> to Date.
+  # See #as_json.
   def self.json_create(object)
     civil(*object.values_at('y', 'm', 'd', 'sg'))
   end
 
   alias start sg unless method_defined?(:start)
 
-  # Returns a hash, that will be turned into a JSON object and represent this
-  # object.
+  # Methods <tt>Date#as_json</tt> and +Date.json_create+ may be used
+  # to serialize and deserialize a \Date object;
+  # see Marshal[rdoc-ref:Marshal].
+  #
+  # \Method <tt>Date#as_json</tt> serializes +self+,
+  # returning a 2-element hash representing +self+:
+  #
+  #   require 'json/add/date'
+  #   x = Date.today.as_json
+  #   # => {"json_class"=>"Date", "y"=>2023, "m"=>11, "d"=>21, "sg"=>2299161.0}
+  #
+  # \Method +JSON.create+ deserializes such a hash, returning a \Date object:
+  #
+  #   Date.json_create(x)
+  #   # => #<Date: 2023-11-21 ((2460270j,0s,0n),+0s,2299161j)>
+  #
   def as_json(*)
     {
       JSON.create_id => self.class.name,
@@ -26,8 +39,15 @@ def as_json(*)
     }
   end
 
-  # Stores class name (Date) with Julian year <tt>y</tt>, month <tt>m</tt>, day
-  # <tt>d</tt> and Day of Calendar Reform <tt>sg</tt> as JSON string
+  # Returns a JSON string representing +self+:
+  #
+  #   require 'json/add/date'
+  #   puts Date.today.to_json
+  #
+  # Output:
+  #
+  #   {"json_class":"Date","y":2023,"m":11,"d":21,"sg":2299161.0}
+  #
   def to_json(*args)
     as_json.to_json(*args)
   end
diff --git a/ext/json/lib/json/add/date_time.rb b/ext/json/lib/json/add/date_time.rb
index 38b0e86ab8fa13..8b0bb5d181d0c8 100644
--- a/ext/json/lib/json/add/date_time.rb
+++ b/ext/json/lib/json/add/date_time.rb
@@ -1,4 +1,4 @@
-#frozen_string_literal: false
+# frozen_string_literal: true
 unless defined?(::JSON::JSON_LOADED) and ::JSON::JSON_LOADED
   require 'json'
 end
@@ -6,9 +6,7 @@
 
 class DateTime
 
-  # Deserializes JSON string by converting year <tt>y</tt>, month <tt>m</tt>,
-  # day <tt>d</tt>, hour <tt>H</tt>, minute <tt>M</tt>, second <tt>S</tt>,
-  # offset <tt>of</tt> and Day of Calendar Reform <tt>sg</tt> to DateTime.
+  # See #as_json.
   def self.json_create(object)
     args = object.values_at('y', 'm', 'd', 'H', 'M', 'S')
     of_a, of_b = object['of'].split('/')
@@ -23,8 +21,21 @@ def self.json_create(object)
 
   alias start sg unless method_defined?(:start)
 
-  # Returns a hash, that will be turned into a JSON object and represent this
-  # object.
+  # Methods <tt>DateTime#as_json</tt> and +DateTime.json_create+ may be used
+  # to serialize and deserialize a \DateTime object;
+  # see Marshal[rdoc-ref:Marshal].
+  #
+  # \Method <tt>DateTime#as_json</tt> serializes +self+,
+  # returning a 2-element hash representing +self+:
+  #
+  #   require 'json/add/datetime'
+  #   x = DateTime.now.as_json
+  #   # => {"json_class"=>"DateTime", "y"=>2023, "m"=>11, "d"=>21, "sg"=>2299161.0}
+  #
+  # \Method +JSON.create+ deserializes such a hash, returning a \DateTime object:
+  #
+  #   DateTime.json_create(x) # BUG? Raises Date::Error "invalid date"
+  #
   def as_json(*)
     {
       JSON.create_id => self.class.name,
@@ -39,9 +50,15 @@ def as_json(*)
     }
   end
 
-  # Stores class name (DateTime) with Julian year <tt>y</tt>, month <tt>m</tt>,
-  # day <tt>d</tt>, hour <tt>H</tt>, minute <tt>M</tt>, second <tt>S</tt>,
-  # offset <tt>of</tt> and Day of Calendar Reform <tt>sg</tt> as JSON string
+  # Returns a JSON string representing +self+:
+  #
+  #   require 'json/add/datetime'
+  #   puts DateTime.now.to_json
+  #
+  # Output:
+  #
+  #   {"json_class":"DateTime","y":2023,"m":11,"d":21,"sg":2299161.0}
+  #
   def to_json(*args)
     as_json.to_json(*args)
   end
diff --git a/ext/json/lib/json/add/exception.rb b/ext/json/lib/json/add/exception.rb
index a107e5b3c4789c..e85d404982f2a8 100644
--- a/ext/json/lib/json/add/exception.rb
+++ b/ext/json/lib/json/add/exception.rb
@@ -1,20 +1,31 @@
-#frozen_string_literal: false
+# frozen_string_literal: true
 unless defined?(::JSON::JSON_LOADED) and ::JSON::JSON_LOADED
   require 'json'
 end
 
 class Exception
 
-  # Deserializes JSON string by constructing new Exception object with message
-  # <tt>m</tt> and backtrace <tt>b</tt> serialized with <tt>to_json</tt>
+  # See #as_json.
   def self.json_create(object)
     result = new(object['m'])
     result.set_backtrace object['b']
     result
   end
 
-  # Returns a hash, that will be turned into a JSON object and represent this
-  # object.
+  # Methods <tt>Exception#as_json</tt> and +Exception.json_create+ may be used
+  # to serialize and deserialize a \Exception object;
+  # see Marshal[rdoc-ref:Marshal].
+  #
+  # \Method <tt>Exception#as_json</tt> serializes +self+,
+  # returning a 2-element hash representing +self+:
+  #
+  #   require 'json/add/exception'
+  #   x = Exception.new('Foo').as_json # => {"json_class"=>"Exception", "m"=>"Foo", "b"=>nil}
+  #
+  # \Method +JSON.create+ deserializes such a hash, returning a \Exception object:
+  #
+  #   Exception.json_create(x) # => #<Exception: Foo>
+  #
   def as_json(*)
     {
       JSON.create_id => self.class.name,
@@ -23,8 +34,15 @@ def as_json(*)
     }
   end
 
-  # Stores class name (Exception) with message <tt>m</tt> and backtrace array
-  # <tt>b</tt> as JSON string
+  # Returns a JSON string representing +self+:
+  #
+  #   require 'json/add/exception'
+  #   puts Exception.new('Foo').to_json
+  #
+  # Output:
+  #
+  #   {"json_class":"Exception","m":"Foo","b":null}
+  #
   def to_json(*args)
     as_json.to_json(*args)
   end
diff --git a/ext/json/lib/json/add/ostruct.rb b/ext/json/lib/json/add/ostruct.rb
index 686cf0025d4616..7750498144d75c 100644
--- a/ext/json/lib/json/add/ostruct.rb
+++ b/ext/json/lib/json/add/ostruct.rb
@@ -1,19 +1,35 @@
-#frozen_string_literal: false
+# frozen_string_literal: true
 unless defined?(::JSON::JSON_LOADED) and ::JSON::JSON_LOADED
   require 'json'
 end
-require 'ostruct'
+begin
+  require 'ostruct'
+rescue LoadError
+end
 
 class OpenStruct
 
-  # Deserializes JSON string by constructing new Struct object with values
-  # <tt>t</tt> serialized by <tt>to_json</tt>.
+  # See #as_json.
   def self.json_create(object)
     new(object['t'] || object[:t])
   end
 
-  # Returns a hash, that will be turned into a JSON object and represent this
-  # object.
+  # Methods <tt>OpenStruct#as_json</tt> and +OpenStruct.json_create+ may be used
+  # to serialize and deserialize a \OpenStruct object;
+  # see Marshal[rdoc-ref:Marshal].
+  #
+  # \Method <tt>OpenStruct#as_json</tt> serializes +self+,
+  # returning a 2-element hash representing +self+:
+  #
+  #   require 'json/add/ostruct'
+  #   x = OpenStruct.new('name' => 'Rowdy', :age => nil).as_json
+  #   # => {"json_class"=>"OpenStruct", "t"=>{:name=>'Rowdy', :age=>nil}}
+  #
+  # \Method +JSON.create+ deserializes such a hash, returning a \OpenStruct object:
+  #
+  #   OpenStruct.json_create(x)
+  #   # => #<OpenStruct name='Rowdy', age=nil>
+  #
   def as_json(*)
     klass = self.class.name
     klass.to_s.empty? and raise JSON::JSONError, "Only named structs are supported!"
@@ -23,9 +39,16 @@ def as_json(*)
     }
   end
 
-  # Stores class name (OpenStruct) with this struct's values <tt>t</tt> as a
-  # JSON string.
+  # Returns a JSON string representing +self+:
+  #
+  #   require 'json/add/ostruct'
+  #   puts OpenStruct.new('name' => 'Rowdy', :age => nil).to_json
+  #
+  # Output:
+  #
+  #   {"json_class":"OpenStruct","t":{'name':'Rowdy',"age":null}}
+  #
   def to_json(*args)
     as_json.to_json(*args)
   end
-end
+end if defined?(::OpenStruct)
diff --git a/ext/json/lib/json/add/range.rb b/ext/json/lib/json/add/range.rb
index 93529fb1c4eb95..408d2c32f6fb66 100644
--- a/ext/json/lib/json/add/range.rb
+++ b/ext/json/lib/json/add/range.rb
@@ -1,18 +1,33 @@
-#frozen_string_literal: false
+# frozen_string_literal: true
 unless defined?(::JSON::JSON_LOADED) and ::JSON::JSON_LOADED
   require 'json'
 end
 
 class Range
 
-  # Deserializes JSON string by constructing new Range object with arguments
-  # <tt>a</tt> serialized by <tt>to_json</tt>.
+  # See #as_json.
   def self.json_create(object)
     new(*object['a'])
   end
 
-  # Returns a hash, that will be turned into a JSON object and represent this
-  # object.
+  # Methods <tt>Range#as_json</tt> and +Range.json_create+ may be used
+  # to serialize and deserialize a \Range object;
+  # see Marshal[rdoc-ref:Marshal].
+  #
+  # \Method <tt>Range#as_json</tt> serializes +self+,
+  # returning a 2-element hash representing +self+:
+  #
+  #   require 'json/add/range'
+  #   x = (1..4).as_json     # => {"json_class"=>"Range", "a"=>[1, 4, false]}
+  #   y = (1...4).as_json    # => {"json_class"=>"Range", "a"=>[1, 4, true]}
+  #   z = ('a'..'d').as_json # => {"json_class"=>"Range", "a"=>["a", "d", false]}
+  #
+  # \Method +JSON.create+ deserializes such a hash, returning a \Range object:
+  #
+  #   Range.json_create(x) # => 1..4
+  #   Range.json_create(y) # => 1...4
+  #   Range.json_create(z) # => "a".."d"
+  #
   def as_json(*)
     {
       JSON.create_id  => self.class.name,
@@ -20,9 +35,19 @@ def as_json(*)
     }
   end
 
-  # Stores class name (Range) with JSON array of arguments <tt>a</tt> which
-  # include <tt>first</tt> (integer), <tt>last</tt> (integer), and
-  # <tt>exclude_end?</tt> (boolean) as JSON string.
+  # Returns a JSON string representing +self+:
+  #
+  #   require 'json/add/range'
+  #   puts (1..4).to_json
+  #   puts (1...4).to_json
+  #   puts ('a'..'d').to_json
+  #
+  # Output:
+  #
+  #   {"json_class":"Range","a":[1,4,false]}
+  #   {"json_class":"Range","a":[1,4,true]}
+  #   {"json_class":"Range","a":["a","d",false]}
+  #
   def to_json(*args)
     as_json.to_json(*args)
   end
diff --git a/ext/json/lib/json/add/rational.rb b/ext/json/lib/json/add/rational.rb
index f77622604678e3..c95812ea8eea01 100644
--- a/ext/json/lib/json/add/rational.rb
+++ b/ext/json/lib/json/add/rational.rb
@@ -1,17 +1,31 @@
-#frozen_string_literal: false
+# frozen_string_literal: true
 unless defined?(::JSON::JSON_LOADED) and ::JSON::JSON_LOADED
   require 'json'
 end
 
 class Rational
-  # Deserializes JSON string by converting numerator value <tt>n</tt>,
-  # denominator value <tt>d</tt>, to a Rational object.
+
+  # See #as_json.
   def self.json_create(object)
     Rational(object['n'], object['d'])
   end
 
-  # Returns a hash, that will be turned into a JSON object and represent this
-  # object.
+  # Methods <tt>Rational#as_json</tt> and +Rational.json_create+ may be used
+  # to serialize and deserialize a \Rational object;
+  # see Marshal[rdoc-ref:Marshal].
+  #
+  # \Method <tt>Rational#as_json</tt> serializes +self+,
+  # returning a 2-element hash representing +self+:
+  #
+  #   require 'json/add/rational'
+  #   x = Rational(2, 3).as_json
+  #   # => {"json_class"=>"Rational", "n"=>2, "d"=>3}
+  #
+  # \Method +JSON.create+ deserializes such a hash, returning a \Rational object:
+  #
+  #   Rational.json_create(x)
+  #   # => (2/3)
+  #
   def as_json(*)
     {
       JSON.create_id => self.class.name,
@@ -20,7 +34,15 @@ def as_json(*)
     }
   end
 
-  # Stores class name (Rational) along with numerator value <tt>n</tt> and denominator value <tt>d</tt> as JSON string
+  # Returns a JSON string representing +self+:
+  #
+  #   require 'json/add/rational'
+  #   puts Rational(2, 3).to_json
+  #
+  # Output:
+  #
+  #   {"json_class":"Rational","n":2,"d":3}
+  #
   def to_json(*args)
     as_json.to_json(*args)
   end
diff --git a/ext/json/lib/json/add/regexp.rb b/ext/json/lib/json/add/regexp.rb
index 39d69fede7b070..aebfb2db5cb807 100644
--- a/ext/json/lib/json/add/regexp.rb
+++ b/ext/json/lib/json/add/regexp.rb
@@ -1,19 +1,30 @@
-#frozen_string_literal: false
+# frozen_string_literal: true
 unless defined?(::JSON::JSON_LOADED) and ::JSON::JSON_LOADED
   require 'json'
 end
 
 class Regexp
 
-  # Deserializes JSON string by constructing new Regexp object with source
-  # <tt>s</tt> (Regexp or String) and options <tt>o</tt> serialized by
-  # <tt>to_json</tt>
+  # See #as_json.
   def self.json_create(object)
     new(object['s'], object['o'])
   end
 
-  # Returns a hash, that will be turned into a JSON object and represent this
-  # object.
+  # Methods <tt>Regexp#as_json</tt> and +Regexp.json_create+ may be used
+  # to serialize and deserialize a \Regexp object;
+  # see Marshal[rdoc-ref:Marshal].
+  #
+  # \Method <tt>Regexp#as_json</tt> serializes +self+,
+  # returning a 2-element hash representing +self+:
+  #
+  #   require 'json/add/regexp'
+  #   x = /foo/.as_json
+  #   # => {"json_class"=>"Regexp", "o"=>0, "s"=>"foo"}
+  #
+  # \Method +JSON.create+ deserializes such a hash, returning a \Regexp object:
+  #
+  #   Regexp.json_create(x) # => /foo/
+  #
   def as_json(*)
     {
       JSON.create_id => self.class.name,
@@ -22,8 +33,15 @@ def as_json(*)
     }
   end
 
-  # Stores class name (Regexp) with options <tt>o</tt> and source <tt>s</tt>
-  # (Regexp or String) as JSON string
+  # Returns a JSON string representing +self+:
+  #
+  #   require 'json/add/regexp'
+  #   puts /foo/.to_json
+  #
+  # Output:
+  #
+  #    {"json_class":"Regexp","o":0,"s":"foo"}
+  #
   def to_json(*args)
     as_json.to_json(*args)
   end
diff --git a/ext/json/lib/json/add/set.rb b/ext/json/lib/json/add/set.rb
index 71e2a0ac8b75fe..19183531874015 100644
--- a/ext/json/lib/json/add/set.rb
+++ b/ext/json/lib/json/add/set.rb
@@ -4,16 +4,27 @@
 defined?(::Set) or require 'set'
 
 class Set
-  # Import a JSON Marshalled object.
-  #
-  # method used for JSON marshalling support.
+
+  # See #as_json.
   def self.json_create(object)
     new object['a']
   end
 
-  # Marshal the object to JSON.
+  # Methods <tt>Set#as_json</tt> and +Set.json_create+ may be used
+  # to serialize and deserialize a \Set object;
+  # see Marshal[rdoc-ref:Marshal].
+  #
+  # \Method <tt>Set#as_json</tt> serializes +self+,
+  # returning a 2-element hash representing +self+:
+  #
+  #   require 'json/add/set'
+  #   x = Set.new(%w/foo bar baz/).as_json
+  #   # => {"json_class"=>"Set", "a"=>["foo", "bar", "baz"]}
+  #
+  # \Method +JSON.create+ deserializes such a hash, returning a \Set object:
+  #
+  #   Set.json_create(x) # => #<Set: {"foo", "bar", "baz"}>
   #
-  # method used for JSON marshalling support.
   def as_json(*)
     {
       JSON.create_id => self.class.name,
@@ -21,7 +32,15 @@ def as_json(*)
     }
   end
 
-  # return the JSON value
+  # Returns a JSON string representing +self+:
+  #
+  #   require 'json/add/set'
+  #   puts Set.new(%w/foo bar baz/).to_json
+  #
+  # Output:
+  #
+  #   {"json_class":"Set","a":["foo","bar","baz"]}
+  #
   def to_json(*args)
     as_json.to_json(*args)
   end
diff --git a/ext/json/lib/json/add/struct.rb b/ext/json/lib/json/add/struct.rb
index e8395ed42f0361..6760c3d86c0b6b 100644
--- a/ext/json/lib/json/add/struct.rb
+++ b/ext/json/lib/json/add/struct.rb
@@ -1,18 +1,32 @@
-#frozen_string_literal: false
+# frozen_string_literal: true
 unless defined?(::JSON::JSON_LOADED) and ::JSON::JSON_LOADED
   require 'json'
 end
 
 class Struct
 
-  # Deserializes JSON string by constructing new Struct object with values
-  # <tt>v</tt> serialized by <tt>to_json</tt>.
+  # See #as_json.
   def self.json_create(object)
     new(*object['v'])
   end
 
-  # Returns a hash, that will be turned into a JSON object and represent this
-  # object.
+  # Methods <tt>Struct#as_json</tt> and +Struct.json_create+ may be used
+  # to serialize and deserialize a \Struct object;
+  # see Marshal[rdoc-ref:Marshal].
+  #
+  # \Method <tt>Struct#as_json</tt> serializes +self+,
+  # returning a 2-element hash representing +self+:
+  #
+  #   require 'json/add/struct'
+  #   Customer = Struct.new('Customer', :name, :address, :zip)
+  #   x = Struct::Customer.new.as_json
+  #   # => {"json_class"=>"Struct::Customer", "v"=>[nil, nil, nil]}
+  #
+  # \Method +JSON.create+ deserializes such a hash, returning a \Struct object:
+  #
+  #   Struct::Customer.json_create(x)
+  #   # => #<struct Struct::Customer name=nil, address=nil, zip=nil>
+  #
   def as_json(*)
     klass = self.class.name
     klass.to_s.empty? and raise JSON::JSONError, "Only named structs are supported!"
@@ -22,8 +36,16 @@ def as_json(*)
     }
   end
 
-  # Stores class name (Struct) with Struct values <tt>v</tt> as a JSON string.
-  # Only named structs are supported.
+  # Returns a JSON string representing +self+:
+  #
+  #   require 'json/add/struct'
+  #   Customer = Struct.new('Customer', :name, :address, :zip)
+  #   puts Struct::Customer.new.to_json
+  #
+  # Output:
+  #
+  #   {"json_class":"Struct","t":{'name':'Rowdy',"age":null}}
+  #
   def to_json(*args)
     as_json.to_json(*args)
   end
diff --git a/ext/json/lib/json/add/symbol.rb b/ext/json/lib/json/add/symbol.rb
index 74b13a423f3c09..806be4f025f0fd 100644
--- a/ext/json/lib/json/add/symbol.rb
+++ b/ext/json/lib/json/add/symbol.rb
@@ -1,11 +1,25 @@
-#frozen_string_literal: false
+# frozen_string_literal: true
 unless defined?(::JSON::JSON_LOADED) and ::JSON::JSON_LOADED
   require 'json'
 end
 
 class Symbol
-  # Returns a hash, that will be turned into a JSON object and represent this
-  # object.
+
+  # Methods <tt>Symbol#as_json</tt> and +Symbol.json_create+ may be used
+  # to serialize and deserialize a \Symbol object;
+  # see Marshal[rdoc-ref:Marshal].
+  #
+  # \Method <tt>Symbol#as_json</tt> serializes +self+,
+  # returning a 2-element hash representing +self+:
+  #
+  #   require 'json/add/symbol'
+  #   x = :foo.as_json
+  #   # => {"json_class"=>"Symbol", "s"=>"foo"}
+  #
+  # \Method +JSON.create+ deserializes such a hash, returning a \Symbol object:
+  #
+  #   Symbol.json_create(x) # => :foo
+  #
   def as_json(*)
     {
       JSON.create_id => self.class.name,
@@ -13,12 +27,25 @@ def as_json(*)
     }
   end
 
-  # Stores class name (Symbol) with String representation of Symbol as a JSON string.
-  def to_json(*a)
-    as_json.to_json(*a)
+  # Returns a JSON string representing +self+:
+  #
+  #   require 'json/add/symbol'
+  #   puts :foo.to_json
+  #
+  # Output:
+  #
+  #   # {"json_class":"Symbol","s":"foo"}
+  #
+  def to_json(state = nil, *a)
+    state = ::JSON::State.from_state(state)
+    if state.strict?
+      super
+    else
+      as_json.to_json(state, *a)
+    end
   end
 
-  # Deserializes JSON string by converting the <tt>string</tt> value stored in the object to a Symbol
+  # See #as_json.
   def self.json_create(o)
     o['s'].to_sym
   end
diff --git a/ext/json/lib/json/add/time.rb b/ext/json/lib/json/add/time.rb
index b73acc4086c32b..b03d4ff2516ffa 100644
--- a/ext/json/lib/json/add/time.rb
+++ b/ext/json/lib/json/add/time.rb
@@ -1,37 +1,51 @@
-#frozen_string_literal: false
+# frozen_string_literal: true
 unless defined?(::JSON::JSON_LOADED) and ::JSON::JSON_LOADED
   require 'json'
 end
 
 class Time
 
-  # Deserializes JSON string by converting time since epoch to Time
+  # See #as_json.
   def self.json_create(object)
     if usec = object.delete('u') # used to be tv_usec -> tv_nsec
       object['n'] = usec * 1000
     end
-    if method_defined?(:tv_nsec)
-      at(object['s'], Rational(object['n'], 1000))
-    else
-      at(object['s'], object['n'] / 1000)
-    end
+    at(object['s'], Rational(object['n'], 1000))
   end
 
-  # Returns a hash, that will be turned into a JSON object and represent this
-  # object.
+  # Methods <tt>Time#as_json</tt> and +Time.json_create+ may be used
+  # to serialize and deserialize a \Time object;
+  # see Marshal[rdoc-ref:Marshal].
+  #
+  # \Method <tt>Time#as_json</tt> serializes +self+,
+  # returning a 2-element hash representing +self+:
+  #
+  #   require 'json/add/time'
+  #   x = Time.now.as_json
+  #   # => {"json_class"=>"Time", "s"=>1700931656, "n"=>472846644}
+  #
+  # \Method +JSON.create+ deserializes such a hash, returning a \Time object:
+  #
+  #    Time.json_create(x)
+  #    # => 2023-11-25 11:00:56.472846644 -0600
+  #
   def as_json(*)
-    nanoseconds = [ tv_usec * 1000 ]
-    respond_to?(:tv_nsec) and nanoseconds << tv_nsec
-    nanoseconds = nanoseconds.max
     {
       JSON.create_id => self.class.name,
       's'            => tv_sec,
-      'n'            => nanoseconds,
+      'n'            => tv_nsec,
     }
   end
 
-  # Stores class name (Time) with number of seconds since epoch and number of
-  # microseconds for Time as JSON string
+  # Returns a JSON string representing +self+:
+  #
+  #   require 'json/add/time'
+  #   puts Time.now.to_json
+  #
+  # Output:
+  #
+  #   {"json_class":"Time","s":1700931678,"n":980650786}
+  #
   def to_json(*args)
     as_json.to_json(*args)
   end
diff --git a/ext/json/lib/json/common.rb b/ext/json/lib/json/common.rb
index 173af04be038ed..486ec62a582450 100644
--- a/ext/json/lib/json/common.rb
+++ b/ext/json/lib/json/common.rb
@@ -1,8 +1,116 @@
-#frozen_string_literal: false
+# frozen_string_literal: true
+
 require 'json/version'
-require 'json/generic_object'
 
 module JSON
+  autoload :GenericObject, 'json/generic_object'
+
+  module ParserOptions # :nodoc:
+    class << self
+      def prepare(opts)
+        if opts[:object_class] || opts[:array_class]
+          opts = opts.dup
+          on_load = opts[:on_load]
+
+          on_load = object_class_proc(opts[:object_class], on_load) if opts[:object_class]
+          on_load = array_class_proc(opts[:array_class], on_load) if opts[:array_class]
+          opts[:on_load] = on_load
+        end
+
+        if opts.fetch(:create_additions, false) != false
+          opts = create_additions_proc(opts)
+        end
+
+        opts
+      end
+
+      private
+
+      def object_class_proc(object_class, on_load)
+        ->(obj) do
+          if Hash === obj
+            object = object_class.new
+            obj.each { |k, v| object[k] = v }
+            obj = object
+          end
+          on_load.nil? ? obj : on_load.call(obj)
+        end
+      end
+
+      def array_class_proc(array_class, on_load)
+        ->(obj) do
+          if Array === obj
+            array = array_class.new
+            obj.each { |v| array << v }
+            obj = array
+          end
+          on_load.nil? ? obj : on_load.call(obj)
+        end
+      end
+
+      # TODO: exctract :create_additions support to another gem for version 3.0
+      def create_additions_proc(opts)
+        if opts[:symbolize_names]
+          raise ArgumentError, "options :symbolize_names and :create_additions cannot be  used in conjunction"
+        end
+
+        opts = opts.dup
+        create_additions = opts.fetch(:create_additions, false)
+        on_load = opts[:on_load]
+        object_class = opts[:object_class] || Hash
+
+        opts[:on_load] = ->(object) do
+          case object
+          when String
+            opts[:match_string]&.each do |pattern, klass|
+              if match = pattern.match(object)
+                create_additions_warning if create_additions.nil?
+                object = klass.json_create(object)
+                break
+              end
+            end
+          when object_class
+            if opts[:create_additions] != false
+              if class_name = object[JSON.create_id]
+                klass = JSON.deep_const_get(class_name)
+                if (klass.respond_to?(:json_creatable?) && klass.json_creatable?) || klass.respond_to?(:json_create)
+                  create_additions_warning if create_additions.nil?
+                  object = klass.json_create(object)
+                end
+              end
+            end
+          end
+
+          on_load.nil? ? object : on_load.call(object)
+        end
+
+        opts
+      end
+
+      GEM_ROOT = File.expand_path("../../../", __FILE__) + "/"
+      def create_additions_warning
+        message = "JSON.load implicit support for `create_additions: true` is deprecated " \
+          "and will be removed in 3.0, use JSON.unsafe_load or explicitly " \
+          "pass `create_additions: true`"
+
+        uplevel = 4
+        caller_locations(uplevel, 10).each do |frame|
+          if frame.path.nil? || frame.path.start_with?(GEM_ROOT) || frame.path.end_with?("/truffle/cext_ruby.rb", ".c")
+            uplevel += 1
+          else
+            break
+          end
+        end
+
+        if RUBY_VERSION >= "3.0"
+          warn(message, uplevel: uplevel - 1, category: :deprecated)
+        else
+          warn(message, uplevel: uplevel - 1)
+        end
+      end
+    end
+  end
+
   class << self
     # :call-seq:
     #   JSON[object] -> new_array or new_string
@@ -15,17 +123,20 @@ class << self
     # Otherwise, calls JSON.generate with +object+ and +opts+ (see method #generate):
     #   ruby = [0, 1, nil]
     #   JSON[ruby] # => '[0,1,null]'
-    def [](object, opts = {})
-      if object.respond_to? :to_str
-        JSON.parse(object.to_str, opts)
-      else
-        JSON.generate(object, opts)
+    def [](object, opts = nil)
+      if object.is_a?(String)
+        return JSON.parse(object, opts)
+      elsif object.respond_to?(:to_str)
+        str = object.to_str
+        if str.is_a?(String)
+          return JSON.parse(str, opts)
+        end
       end
+
+      JSON.generate(object, opts)
     end
 
-    # Returns the JSON parser class that is used by JSON. This is either
-    # JSON::Ext::Parser or JSON::Pure::Parser:
-    #   JSON.parser # => JSON::Ext::Parser
+    # Returns the JSON parser class that is used by JSON.
     attr_reader :parser
 
     # Set the JSON parser class _parser_ to be used by JSON.
@@ -40,18 +151,9 @@ def parser=(parser) # :nodoc:
     # level (absolute namespace path?). If there doesn't exist a constant at
     # the given path, an ArgumentError is raised.
     def deep_const_get(path) # :nodoc:
-      path.to_s.split(/::/).inject(Object) do |p, c|
-        case
-        when c.empty?                  then p
-        when p.const_defined?(c, true) then p.const_get(c)
-        else
-          begin
-            p.const_missing(c)
-          rescue NameError => e
-            raise ArgumentError, "can't get const #{path}: #{e}"
-          end
-        end
-      end
+      Object.const_get(path)
+    rescue NameError => e
+      raise ArgumentError, "can't get const #{path}: #{e}"
     end
 
     # Set the module _generator_ to be used by JSON.
@@ -60,7 +162,7 @@ def generator=(generator) # :nodoc:
       @generator = generator
       generator_methods = generator::GeneratorMethods
       for const in generator_methods.constants
-        klass = deep_const_get(const)
+        klass = const_get(const)
         modul = generator_methods.const_get(const)
         klass.class_eval do
           instance_methods(false).each do |m|
@@ -70,97 +172,116 @@ def generator=(generator) # :nodoc:
         end
       end
       self.state = generator::State
-      const_set :State, self.state
-      const_set :SAFE_STATE_PROTOTYPE, State.new # for JRuby
-      const_set :FAST_STATE_PROTOTYPE, create_fast_state
-      const_set :PRETTY_STATE_PROTOTYPE, create_pretty_state
+      const_set :State, state
     ensure
       $VERBOSE = old
     end
 
-    def create_fast_state
-      State.new(
-        :indent         => '',
-        :space          => '',
-        :object_nl      => "",
-        :array_nl       => "",
-        :max_nesting    => false
-      )
-    end
-
-    def create_pretty_state
-      State.new(
-        :indent         => '  ',
-        :space          => ' ',
-        :object_nl      => "\n",
-        :array_nl       => "\n"
-      )
-    end
-
-    # Returns the JSON generator module that is used by JSON. This is
-    # either JSON::Ext::Generator or JSON::Pure::Generator:
-    #   JSON.generator # => JSON::Ext::Generator
+    # Returns the JSON generator module that is used by JSON.
     attr_reader :generator
 
-    # Sets or Returns the JSON generator state class that is used by JSON. This is
-    # either JSON::Ext::Generator::State or JSON::Pure::Generator::State:
-    #   JSON.state # => JSON::Ext::Generator::State
+    # Sets or Returns the JSON generator state class that is used by JSON.
     attr_accessor :state
-  end
 
-  DEFAULT_CREATE_ID = 'json_class'.freeze
-  private_constant :DEFAULT_CREATE_ID
+    private
+
+    def deprecated_singleton_attr_accessor(*attrs)
+      args = RUBY_VERSION >= "3.0" ? ", category: :deprecated" : ""
+      attrs.each do |attr|
+        singleton_class.class_eval <<~RUBY
+          def #{attr}
+            warn "JSON.#{attr} is deprecated and will be removed in json 3.0.0", uplevel: 1 #{args}
+            @#{attr}
+          end
+
+          def #{attr}=(val)
+            warn "JSON.#{attr}= is deprecated and will be removed in json 3.0.0", uplevel: 1 #{args}
+            @#{attr} = val
+          end
 
-  CREATE_ID_TLS_KEY = "JSON.create_id".freeze
-  private_constant :CREATE_ID_TLS_KEY
+          def _#{attr}
+            @#{attr}
+          end
+        RUBY
+      end
+    end
+  end
 
   # Sets create identifier, which is used to decide if the _json_create_
   # hook of a class should be called; initial value is +json_class+:
   #   JSON.create_id # => 'json_class'
   def self.create_id=(new_value)
-    Thread.current[CREATE_ID_TLS_KEY] = new_value.dup.freeze
+    Thread.current[:"JSON.create_id"] = new_value.dup.freeze
   end
 
   # Returns the current create identifier.
   # See also JSON.create_id=.
   def self.create_id
-    Thread.current[CREATE_ID_TLS_KEY] || DEFAULT_CREATE_ID
+    Thread.current[:"JSON.create_id"] || 'json_class'
   end
 
-  NaN           = 0.0/0
+  NaN           = Float::NAN
 
-  Infinity      = 1.0/0
+  Infinity      = Float::INFINITY
 
   MinusInfinity = -Infinity
 
   # The base exception for JSON errors.
-  class JSONError < StandardError
-    def self.wrap(exception)
-      obj = new("Wrapped(#{exception.class}): #{exception.message.inspect}")
-      obj.set_backtrace exception.backtrace
-      obj
-    end
-  end
+  class JSONError < StandardError; end
 
   # This exception is raised if a parser error occurs.
-  class ParserError < JSONError; end
+  class ParserError < JSONError
+    attr_reader :line, :column
+  end
 
   # This exception is raised if the nesting of parsed data structures is too
   # deep.
   class NestingError < ParserError; end
 
-  # :stopdoc:
-  class CircularDatastructure < NestingError; end
-  # :startdoc:
-
   # This exception is raised if a generator or unparser error occurs.
-  class GeneratorError < JSONError; end
-  # For backwards compatibility
-  UnparserError = GeneratorError # :nodoc:
+  class GeneratorError < JSONError
+    attr_reader :invalid_object
+
+    def initialize(message, invalid_object = nil)
+      super(message)
+      @invalid_object = invalid_object
+    end
+
+    def detailed_message(...)
+      # Exception#detailed_message doesn't exist until Ruby 3.2
+      super_message = defined?(super) ? super : message
+
+      if @invalid_object.nil?
+        super_message
+      else
+        "#{super_message}\nInvalid object: #{@invalid_object.inspect}"
+      end
+    end
+  end
 
-  # This exception is raised if the required unicode support is missing on the
-  # system. Usually this means that the iconv library is not installed.
-  class MissingUnicodeSupport < JSONError; end
+  # Fragment of JSON document that is to be included as is:
+  #   fragment = JSON::Fragment.new("[1, 2, 3]")
+  #   JSON.generate({ count: 3, items: fragments })
+  #
+  # This allows to easily assemble multiple JSON fragments that have
+  # been persisted somewhere without having to parse them nor resorting
+  # to string interpolation.
+  #
+  # Note: no validation is performed on the provided string. It is the
+  # responsibility of the caller to ensure the string contains valid JSON.
+  Fragment = Struct.new(:json) do
+    def initialize(json)
+      unless string = String.try_convert(json)
+        raise TypeError, " no implicit conversion of #{json.class} into String"
+      end
+
+      super(string)
+    end
+
+    def to_json(state = nil, *)
+      json
+    end
+  end
 
   module_function
 
@@ -192,17 +313,17 @@ class MissingUnicodeSupport < JSONError; end
   # {Parsing \JSON}[#module-JSON-label-Parsing+JSON].
   #
   # Parses nested JSON objects:
-  #   source = <<-EOT
-  #   {
-  #   "name": "Dave",
-  #     "age" :40,
-  #     "hats": [
-  #       "Cattleman's",
-  #       "Panama",
-  #       "Tophat"
-  #     ]
-  #   }
-  #   EOT
+  #   source = <<~JSON
+  #     {
+  #     "name": "Dave",
+  #       "age" :40,
+  #       "hats": [
+  #         "Cattleman's",
+  #         "Panama",
+  #         "Tophat"
+  #       ]
+  #     }
+  #   JSON
   #   ruby = JSON.parse(source)
   #   ruby # => {"name"=>"Dave", "age"=>40, "hats"=>["Cattleman's", "Panama", "Tophat"]}
   #
@@ -212,10 +333,17 @@ class MissingUnicodeSupport < JSONError; end
   #   # Raises JSON::ParserError (783: unexpected token at ''):
   #   JSON.parse('')
   #
-  def parse(source, opts = {})
-    Parser.new(source, **(opts||{})).parse
+  def parse(source, opts = nil)
+    opts = ParserOptions.prepare(opts) unless opts.nil?
+    Parser.parse(source, opts)
   end
 
+  PARSE_L_OPTIONS = {
+    max_nesting: false,
+    allow_nan: true,
+  }.freeze
+  private_constant :PARSE_L_OPTIONS
+
   # :call-seq:
   #   JSON.parse!(source, opts) -> object
   #
@@ -227,12 +355,12 @@ def parse(source, opts = {})
   # - Option +max_nesting+, if not provided, defaults to +false+,
   #   which disables checking for nesting depth.
   # - Option +allow_nan+, if not provided, defaults to +true+.
-  def parse!(source, opts = {})
-    opts = {
-      :max_nesting  => false,
-      :allow_nan    => true
-    }.merge(opts)
-    Parser.new(source, **(opts||{})).parse
+  def parse!(source, opts = nil)
+    if opts.nil?
+      parse(source, PARSE_L_OPTIONS)
+    else
+      parse(source, PARSE_L_OPTIONS.merge(opts))
+    end
   end
 
   # :call-seq:
@@ -242,8 +370,8 @@ def parse!(source, opts = {})
   #   parse(File.read(path), opts)
   #
   # See method #parse.
-  def load_file(filespec, opts = {})
-    parse(File.read(filespec), opts)
+  def load_file(filespec, opts = nil)
+    parse(File.read(filespec, encoding: Encoding::UTF_8), opts)
   end
 
   # :call-seq:
@@ -253,8 +381,8 @@ def load_file(filespec, opts = {})
   #   JSON.parse!(File.read(path, opts))
   #
   # See method #parse!
-  def load_file!(filespec, opts = {})
-    parse!(File.read(filespec), opts)
+  def load_file!(filespec, opts = nil)
+    parse!(File.read(filespec, encoding: Encoding::UTF_8), opts)
   end
 
   # :call-seq:
@@ -295,20 +423,12 @@ def load_file!(filespec, opts = {})
   #
   def generate(obj, opts = nil)
     if State === opts
-      state = opts
+      opts.generate(obj)
     else
-      state = State.new(opts)
+      State.generate(obj, opts, nil)
     end
-    state.generate(obj)
   end
 
-  # :stopdoc:
-  # I want to deprecate these later, so I'll first be silent about them, and
-  # later delete them.
-  alias unparse generate
-  module_function :unparse
-  # :startdoc:
-
   # :call-seq:
   #   JSON.fast_generate(obj, opts) -> new_string
   #
@@ -323,19 +443,21 @@ def generate(obj, opts = nil)
   #   # Raises SystemStackError (stack level too deep):
   #   JSON.fast_generate(a)
   def fast_generate(obj, opts = nil)
-    if State === opts
-      state = opts
+    if RUBY_VERSION >= "3.0"
+      warn "JSON.fast_generate is deprecated and will be removed in json 3.0.0, just use JSON.generate", uplevel: 1, category: :deprecated
     else
-      state = JSON.create_fast_state.configure(opts)
+      warn "JSON.fast_generate is deprecated and will be removed in json 3.0.0, just use JSON.generate", uplevel: 1
     end
-    state.generate(obj)
+    generate(obj, opts)
   end
 
-  # :stopdoc:
-  # I want to deprecate these later, so I'll first be silent about them, and later delete them.
-  alias fast_unparse fast_generate
-  module_function :fast_unparse
-  # :startdoc:
+  PRETTY_GENERATE_OPTIONS = {
+    indent: '  ',
+    space: ' ',
+    object_nl: "\n",
+    array_nl: "\n",
+  }.freeze
+  private_constant :PRETTY_GENERATE_OPTIONS
 
   # :call-seq:
   #   JSON.pretty_generate(obj, opts = nil) -> new_string
@@ -368,49 +490,59 @@ def fast_generate(obj, opts = nil)
   #   }
   #
   def pretty_generate(obj, opts = nil)
-    if State === opts
-      state, opts = opts, nil
-    else
-      state = JSON.create_pretty_state
-    end
+    return opts.generate(obj) if State === opts
+
+    options = PRETTY_GENERATE_OPTIONS
+
     if opts
-      if opts.respond_to? :to_hash
-        opts = opts.to_hash
-      elsif opts.respond_to? :to_h
-        opts = opts.to_h
-      else
-        raise TypeError, "can't convert #{opts.class} into Hash"
+      unless opts.is_a?(Hash)
+        if opts.respond_to? :to_hash
+          opts = opts.to_hash
+        elsif opts.respond_to? :to_h
+          opts = opts.to_h
+        else
+          raise TypeError, "can't convert #{opts.class} into Hash"
+        end
       end
-      state.configure(opts)
+      options = options.merge(opts)
     end
-    state.generate(obj)
+
+    State.generate(obj, options, nil)
   end
 
-  # :stopdoc:
-  # I want to deprecate these later, so I'll first be silent about them, and later delete them.
-  alias pretty_unparse pretty_generate
-  module_function :pretty_unparse
-  # :startdoc:
+  # Sets or returns default options for the JSON.unsafe_load method.
+  # Initially:
+  #   opts = JSON.load_default_options
+  #   opts # => {:max_nesting=>false, :allow_nan=>true, :allow_blank=>true, :create_additions=>true}
+  deprecated_singleton_attr_accessor :unsafe_load_default_options
 
-  class << self
-    # Sets or returns default options for the JSON.load method.
-    # Initially:
-    #   opts = JSON.load_default_options
-    #   opts # => {:max_nesting=>false, :allow_nan=>true, :allow_blank=>true, :create_additions=>true}
-    attr_accessor :load_default_options
-  end
-  self.load_default_options = {
+  @unsafe_load_default_options = {
     :max_nesting      => false,
     :allow_nan        => true,
-    :allow_blank       => true,
+    :allow_blank      => true,
     :create_additions => true,
   }
 
+  # Sets or returns default options for the JSON.load method.
+  # Initially:
+  #   opts = JSON.load_default_options
+  #   opts # => {:max_nesting=>false, :allow_nan=>true, :allow_blank=>true, :create_additions=>true}
+  deprecated_singleton_attr_accessor :load_default_options
+
+  @load_default_options = {
+    :allow_nan        => true,
+    :allow_blank      => true,
+    :create_additions => nil,
+  }
   # :call-seq:
-  #   JSON.load(source, proc = nil, options = {}) -> object
+  #   JSON.unsafe_load(source, proc = nil, options = {}) -> object
   #
   # Returns the Ruby objects created by parsing the given +source+.
   #
+  # BEWARE: This method is meant to serialise data from trusted user input,
+  # like from your own database server or clients under your control, it could
+  # be dangerous to allow untrusted users to pass JSON sources into it.
+  #
   # - Argument +source+ must be, or be convertible to, a \String:
   #   - If +source+ responds to instance method +to_str+,
   #     <tt>source.to_str</tt> becomes the source.
@@ -425,12 +557,9 @@ class << self
   # - Argument +proc+, if given, must be a \Proc that accepts one argument.
   #   It will be called recursively with each result (depth-first order).
   #   See details below.
-  #   BEWARE: This method is meant to serialise data from trusted user input,
-  #   like from your own database server or clients under your control, it could
-  #   be dangerous to allow untrusted users to pass JSON sources into it.
   # - Argument +opts+, if given, contains a \Hash of options for the parsing.
   #   See {Parsing Options}[#module-JSON-label-Parsing+Options].
-  #   The default options can be changed via method JSON.load_default_options=.
+  #   The default options can be changed via method JSON.unsafe_load_default_options=.
   #
   # ---
   #
@@ -438,17 +567,177 @@ class << self
   # <tt>parse(source, opts)</tt>;  see #parse.
   #
   # Source for following examples:
-  #   source = <<-EOT
+  #   source = <<~JSON
+  #     {
+  #       "name": "Dave",
+  #       "age" :40,
+  #       "hats": [
+  #         "Cattleman's",
+  #         "Panama",
+  #         "Tophat"
+  #       ]
+  #     }
+  #   JSON
+  #
+  # Load a \String:
+  #   ruby = JSON.unsafe_load(source)
+  #   ruby # => {"name"=>"Dave", "age"=>40, "hats"=>["Cattleman's", "Panama", "Tophat"]}
+  #
+  # Load an \IO object:
+  #   require 'stringio'
+  #   object = JSON.unsafe_load(StringIO.new(source))
+  #   object # => {"name"=>"Dave", "age"=>40, "hats"=>["Cattleman's", "Panama", "Tophat"]}
+  #
+  # Load a \File object:
+  #   path = 't.json'
+  #   File.write(path, source)
+  #   File.open(path) do |file|
+  #     JSON.unsafe_load(file)
+  #   end # => {"name"=>"Dave", "age"=>40, "hats"=>["Cattleman's", "Panama", "Tophat"]}
+  #
+  # ---
+  #
+  # When +proc+ is given:
+  # - Modifies +source+ as above.
+  # - Gets the +result+ from calling <tt>parse(source, opts)</tt>.
+  # - Recursively calls <tt>proc(result)</tt>.
+  # - Returns the final result.
+  #
+  # Example:
+  #   require 'json'
+  #
+  #   # Some classes for the example.
+  #   class Base
+  #     def initialize(attributes)
+  #       @attributes = attributes
+  #     end
+  #   end
+  #   class User    < Base; end
+  #   class Account < Base; end
+  #   class Admin   < Base; end
+  #   # The JSON source.
+  #   json = <<-EOF
   #   {
-  #   "name": "Dave",
-  #     "age" :40,
-  #     "hats": [
-  #       "Cattleman's",
-  #       "Panama",
-  #       "Tophat"
-  #     ]
+  #     "users": [
+  #         {"type": "User", "username": "jane", "email": "jane@example.com"},
+  #         {"type": "User", "username": "john", "email": "john@example.com"}
+  #     ],
+  #     "accounts": [
+  #         {"account": {"type": "Account", "paid": true, "account_id": "1234"}},
+  #         {"account": {"type": "Account", "paid": false, "account_id": "1235"}}
+  #     ],
+  #     "admins": {"type": "Admin", "password": "0wn3d"}
   #   }
-  #   EOT
+  #   EOF
+  #   # Deserializer method.
+  #   def deserialize_obj(obj, safe_types = %w(User Account Admin))
+  #     type = obj.is_a?(Hash) && obj["type"]
+  #     safe_types.include?(type) ? Object.const_get(type).new(obj) : obj
+  #   end
+  #   # Call to JSON.unsafe_load
+  #   ruby = JSON.unsafe_load(json, proc {|obj|
+  #     case obj
+  #     when Hash
+  #       obj.each {|k, v| obj[k] = deserialize_obj v }
+  #     when Array
+  #       obj.map! {|v| deserialize_obj v }
+  #     end
+  #   })
+  #   pp ruby
+  # Output:
+  #   {"users"=>
+  #      [#<User:0x00000000064c4c98
+  #        @attributes=
+  #          {"type"=>"User", "username"=>"jane", "email"=>"jane@example.com"}>,
+  #        #<User:0x00000000064c4bd0
+  #        @attributes=
+  #          {"type"=>"User", "username"=>"john", "email"=>"john@example.com"}>],
+  #    "accounts"=>
+  #      [{"account"=>
+  #          #<Account:0x00000000064c4928
+  #          @attributes={"type"=>"Account", "paid"=>true, "account_id"=>"1234"}>},
+  #       {"account"=>
+  #          #<Account:0x00000000064c4680
+  #          @attributes={"type"=>"Account", "paid"=>false, "account_id"=>"1235"}>}],
+  #    "admins"=>
+  #      #<Admin:0x00000000064c41f8
+  #      @attributes={"type"=>"Admin", "password"=>"0wn3d"}>}
+  #
+  def unsafe_load(source, proc = nil, options = nil)
+    opts = if options.nil?
+      _unsafe_load_default_options
+    else
+      _unsafe_load_default_options.merge(options)
+    end
+
+    unless source.is_a?(String)
+      if source.respond_to? :to_str
+        source = source.to_str
+      elsif source.respond_to? :to_io
+        source = source.to_io.read
+      elsif source.respond_to?(:read)
+        source = source.read
+      end
+    end
+
+    if opts[:allow_blank] && (source.nil? || source.empty?)
+      source = 'null'
+    end
+    result = parse(source, opts)
+    recurse_proc(result, &proc) if proc
+    result
+  end
+
+  # :call-seq:
+  #   JSON.load(source, proc = nil, options = {}) -> object
+  #
+  # Returns the Ruby objects created by parsing the given +source+.
+  #
+  # BEWARE: This method is meant to serialise data from trusted user input,
+  # like from your own database server or clients under your control, it could
+  # be dangerous to allow untrusted users to pass JSON sources into it.
+  # If you must use it, use JSON.unsafe_load instead to make it clear.
+  #
+  # Since JSON version 2.8.0, `load` emits a deprecation warning when a
+  # non native type is deserialized, without `create_additions` being explicitly
+  # enabled, and in JSON version 3.0, `load` will have `create_additions` disabled
+  # by default.
+  #
+  # - Argument +source+ must be, or be convertible to, a \String:
+  #   - If +source+ responds to instance method +to_str+,
+  #     <tt>source.to_str</tt> becomes the source.
+  #   - If +source+ responds to instance method +to_io+,
+  #     <tt>source.to_io.read</tt> becomes the source.
+  #   - If +source+ responds to instance method +read+,
+  #     <tt>source.read</tt> becomes the source.
+  #   - If both of the following are true, source becomes the \String <tt>'null'</tt>:
+  #     - Option +allow_blank+ specifies a truthy value.
+  #     - The source, as defined above, is +nil+ or the empty \String <tt>''</tt>.
+  #   - Otherwise, +source+ remains the source.
+  # - Argument +proc+, if given, must be a \Proc that accepts one argument.
+  #   It will be called recursively with each result (depth-first order).
+  #   See details below.
+  # - Argument +opts+, if given, contains a \Hash of options for the parsing.
+  #   See {Parsing Options}[#module-JSON-label-Parsing+Options].
+  #   The default options can be changed via method JSON.load_default_options=.
+  #
+  # ---
+  #
+  # When no +proc+ is given, modifies +source+ as above and returns the result of
+  # <tt>parse(source, opts)</tt>;  see #parse.
+  #
+  # Source for following examples:
+  #   source = <<~JSON
+  #     {
+  #       "name": "Dave",
+  #       "age" :40,
+  #       "hats": [
+  #         "Cattleman's",
+  #         "Panama",
+  #         "Tophat"
+  #       ]
+  #     }
+  #   JSON
   #
   # Load a \String:
   #   ruby = JSON.load(source)
@@ -534,51 +823,43 @@ class << self
   #      #<Admin:0x00000000064c41f8
   #      @attributes={"type"=>"Admin", "password"=>"0wn3d"}>}
   #
-  def load(source, proc = nil, options = {})
-    opts = load_default_options.merge options
-    if source.respond_to? :to_str
-      source = source.to_str
-    elsif source.respond_to? :to_io
-      source = source.to_io.read
-    elsif source.respond_to?(:read)
-      source = source.read
+  def load(source, proc = nil, options = nil)
+    opts = if options.nil?
+      _load_default_options
+    else
+      _load_default_options.merge(options)
     end
+
+    unless source.is_a?(String)
+      if source.respond_to? :to_str
+        source = source.to_str
+      elsif source.respond_to? :to_io
+        source = source.to_io.read
+      elsif source.respond_to?(:read)
+        source = source.read
+      end
+    end
+
     if opts[:allow_blank] && (source.nil? || source.empty?)
       source = 'null'
     end
-    result = parse(source, opts)
-    recurse_proc(result, &proc) if proc
-    result
-  end
 
-  # Recursively calls passed _Proc_ if the parsed data structure is an _Array_ or _Hash_
-  def recurse_proc(result, &proc) # :nodoc:
-    case result
-    when Array
-      result.each { |x| recurse_proc x, &proc }
-      proc.call result
-    when Hash
-      result.each { |x, y| recurse_proc x, &proc; recurse_proc y, &proc }
-      proc.call result
-    else
-      proc.call result
+    if proc
+      opts = opts.dup
+      opts[:on_load] = proc.to_proc
     end
-  end
-
-  alias restore load
-  module_function :restore
 
-  class << self
-    # Sets or returns the default options for the JSON.dump method.
-    # Initially:
-    #   opts = JSON.dump_default_options
-    #   opts # => {:max_nesting=>false, :allow_nan=>true, :escape_slash=>false}
-    attr_accessor :dump_default_options
+    parse(source, opts)
   end
-  self.dump_default_options = {
+
+  # Sets or returns the default options for the JSON.dump method.
+  # Initially:
+  #   opts = JSON.dump_default_options
+  #   opts # => {:max_nesting=>false, :allow_nan=>true}
+  deprecated_singleton_attr_accessor :dump_default_options
+  @dump_default_options = {
     :max_nesting => false,
     :allow_nan   => true,
-    :escape_slash => false,
   }
 
   # :call-seq:
@@ -608,30 +889,173 @@ class << self
   #   puts File.read(path)
   # Output:
   #   {"foo":[0,1],"bar":{"baz":2,"bat":3},"bam":"bad"}
-  def dump(obj, anIO = nil, limit = nil)
-    if anIO and limit.nil?
-      anIO = anIO.to_io if anIO.respond_to?(:to_io)
-      unless anIO.respond_to?(:write)
-        limit = anIO
-        anIO = nil
+  def dump(obj, anIO = nil, limit = nil, kwargs = nil)
+    if kwargs.nil?
+      if limit.nil?
+        if anIO.is_a?(Hash)
+          kwargs = anIO
+          anIO = nil
+        end
+      elsif limit.is_a?(Hash)
+        kwargs = limit
+        limit = nil
       end
     end
-    opts = JSON.dump_default_options
+
+    unless anIO.nil?
+      if anIO.respond_to?(:to_io)
+        anIO = anIO.to_io
+      elsif limit.nil? && !anIO.respond_to?(:write)
+        anIO, limit = nil, anIO
+      end
+    end
+
+    opts = JSON._dump_default_options
     opts = opts.merge(:max_nesting => limit) if limit
-    result = generate(obj, opts)
-    if anIO
-      anIO.write result
-      anIO
+    opts = opts.merge(kwargs) if kwargs
+
+    begin
+      State.generate(obj, opts, anIO)
+    rescue JSON::NestingError
+      raise ArgumentError, "exceed depth limit"
+    end
+  end
+
+  # :stopdoc:
+  # All these were meant to be deprecated circa 2009, but were just set as undocumented
+  # so usage still exist in the wild.
+  def unparse(...)
+    if RUBY_VERSION >= "3.0"
+      warn "JSON.unparse is deprecated and will be removed in json 3.0.0, just use JSON.generate", uplevel: 1, category: :deprecated
     else
-      result
+      warn "JSON.unparse is deprecated and will be removed in json 3.0.0, just use JSON.generate", uplevel: 1
+    end
+    generate(...)
+  end
+  module_function :unparse
+
+  def fast_unparse(...)
+    if RUBY_VERSION >= "3.0"
+      warn "JSON.fast_unparse is deprecated and will be removed in json 3.0.0, just use JSON.generate", uplevel: 1, category: :deprecated
+    else
+      warn "JSON.fast_unparse is deprecated and will be removed in json 3.0.0, just use JSON.generate", uplevel: 1
+    end
+    generate(...)
+  end
+  module_function :fast_unparse
+
+  def pretty_unparse(...)
+    if RUBY_VERSION >= "3.0"
+      warn "JSON.pretty_unparse is deprecated and will be removed in json 3.0.0, just use JSON.pretty_generate", uplevel: 1, category: :deprecated
+    else
+      warn "JSON.pretty_unparse is deprecated and will be removed in json 3.0.0, just use JSON.pretty_generate", uplevel: 1
+    end
+    pretty_generate(...)
+  end
+  module_function :fast_unparse
+
+  def restore(...)
+    if RUBY_VERSION >= "3.0"
+      warn "JSON.restore is deprecated and will be removed in json 3.0.0, just use JSON.load", uplevel: 1, category: :deprecated
+    else
+      warn "JSON.restore is deprecated and will be removed in json 3.0.0, just use JSON.load", uplevel: 1
+    end
+    load(...)
+  end
+  module_function :restore
+
+  class << self
+    private
+
+    def const_missing(const_name)
+      case const_name
+      when :PRETTY_STATE_PROTOTYPE
+        if RUBY_VERSION >= "3.0"
+          warn "JSON::PRETTY_STATE_PROTOTYPE is deprecated and will be removed in json 3.0.0, just use JSON.pretty_generate", uplevel: 1, category: :deprecated
+        else
+          warn "JSON::PRETTY_STATE_PROTOTYPE is deprecated and will be removed in json 3.0.0, just use JSON.pretty_generate", uplevel: 1
+        end
+        state.new(PRETTY_GENERATE_OPTIONS)
+      else
+        super
+      end
     end
-  rescue JSON::NestingError
-    raise ArgumentError, "exceed depth limit"
   end
+  # :startdoc:
+
+  # JSON::Coder holds a parser and generator configuration.
+  #
+  #   module MyApp
+  #     JSONC_CODER = JSON::Coder.new(
+  #       allow_trailing_comma: true
+  #     )
+  #   end
+  #
+  #   MyApp::JSONC_CODER.load(document)
+  #
+  class Coder
+    # :call-seq:
+    #   JSON.new(options = nil, &block)
+    #
+    # Argument +options+, if given, contains a \Hash of options for both parsing and generating.
+    # See {Parsing Options}[#module-JSON-label-Parsing+Options], and {Generating Options}[#module-JSON-label-Generating+Options].
+    #
+    # For generation, the <tt>strict: true</tt> option is always set. When a Ruby object with no native \JSON counterpart is
+    # encoutered, the block provided to the initialize method is invoked, and must return a Ruby object that has a native
+    # \JSON counterpart:
+    #
+    #  module MyApp
+    #    API_JSON_CODER = JSON::Coder.new do |object|
+    #      case object
+    #      when Time
+    #        object.iso8601(3)
+    #      else
+    #        object # Unknown type, will raise
+    #      end
+    #    end
+    #  end
+    #
+    #  puts MyApp::API_JSON_CODER.dump(Time.now.utc) # => "2025-01-21T08:41:44.286Z"
+    #
+    def initialize(options = nil, &as_json)
+      if options.nil?
+        options = { strict: true }
+      else
+        options = options.dup
+        options[:strict] = true
+      end
+      options[:as_json] = as_json if as_json
+
+      @state = State.new(options).freeze
+      @parser_config = Ext::Parser::Config.new(ParserOptions.prepare(options))
+    end
+
+    # call-seq:
+    #   dump(object) -> String
+    #   dump(object, io) -> io
+    #
+    # Serialize the given object into a \JSON document.
+    def dump(object, io = nil)
+      @state.generate_new(object, io)
+    end
+    alias_method :generate, :dump
+
+    # call-seq:
+    #   load(string) -> Object
+    #
+    # Parse the given \JSON document and return an equivalent Ruby object.
+    def load(source)
+      @parser_config.parse(source)
+    end
+    alias_method :parse, :load
 
-  # Encodes string using String.encode.
-  def self.iconv(to, from, string)
-    string.encode(to, from)
+    # call-seq:
+    #   load(path) -> Object
+    #
+    # Parse the given \JSON document and return an equivalent Ruby object.
+    def load_file(path)
+      load(File.read(path, encoding: Encoding::UTF_8))
+    end
   end
 end
 
@@ -641,8 +1065,14 @@ module ::Kernel
   # Outputs _objs_ to STDOUT as JSON strings in the shortest form, that is in
   # one line.
   def j(*objs)
+    if RUBY_VERSION >= "3.0"
+      warn "Kernel#j is deprecated and will be removed in json 3.0.0", uplevel: 1, category: :deprecated
+    else
+      warn "Kernel#j is deprecated and will be removed in json 3.0.0", uplevel: 1
+    end
+
     objs.each do |obj|
-      puts JSON::generate(obj, :allow_nan => true, :max_nesting => false)
+      puts JSON.generate(obj, :allow_nan => true, :max_nesting => false)
     end
     nil
   end
@@ -650,8 +1080,14 @@ def j(*objs)
   # Outputs _objs_ to STDOUT as JSON strings in a pretty format, with
   # indentation and over many lines.
   def jj(*objs)
+    if RUBY_VERSION >= "3.0"
+      warn "Kernel#jj is deprecated and will be removed in json 3.0.0", uplevel: 1, category: :deprecated
+    else
+      warn "Kernel#jj is deprecated and will be removed in json 3.0.0", uplevel: 1
+    end
+
     objs.each do |obj|
-      puts JSON::pretty_generate(obj, :allow_nan => true, :max_nesting => false)
+      puts JSON.pretty_generate(obj, :allow_nan => true, :max_nesting => false)
     end
     nil
   end
@@ -662,22 +1098,7 @@ def jj(*objs)
   #
   # The _opts_ argument is passed through to generate/parse respectively. See
   # generate and parse for their documentation.
-  def JSON(object, *args)
-    if object.respond_to? :to_str
-      JSON.parse(object.to_str, args.first)
-    else
-      JSON.generate(object, args.first)
-    end
-  end
-end
-
-# Extends any Class to include _json_creatable?_ method.
-class ::Class
-  # Returns true if this class can be used to create an instance
-  # from a serialised JSON string. The class has to implement a class
-  # method _json_create_ that expects a hash as first parameter. The hash
-  # should include the required data.
-  def json_creatable?
-    respond_to?(:json_create)
+  def JSON(object, opts = nil)
+    JSON[object, opts]
   end
 end
diff --git a/ext/json/lib/json/ext.rb b/ext/json/lib/json/ext.rb
index 7264a857fa0653..5bacc5e371212f 100644
--- a/ext/json/lib/json/ext.rb
+++ b/ext/json/lib/json/ext.rb
@@ -1,15 +1,45 @@
+# frozen_string_literal: true
+
 require 'json/common'
 
 module JSON
   # This module holds all the modules/classes that implement JSON's
   # functionality as C extensions.
   module Ext
+    class Parser
+      class << self
+        def parse(...)
+          new(...).parse
+        end
+        alias_method :parse, :parse # Allow redefinition by extensions
+      end
+
+      def initialize(source, opts = nil)
+        @source = source
+        @config = Config.new(opts)
+      end
+
+      def source
+        @source.dup
+      end
+
+      def parse
+        @config.parse(@source)
+      end
+    end
+
     require 'json/ext/parser'
-    require 'json/ext/generator'
-    $DEBUG and warn "Using Ext extension for JSON."
-    JSON.parser = Parser
-    JSON.generator = Generator
+    Ext::Parser::Config = Ext::ParserConfig
+    JSON.parser = Ext::Parser
+
+    if RUBY_ENGINE == 'truffleruby'
+      require 'json/truffle_ruby/generator'
+      JSON.generator = JSON::TruffleRuby::Generator
+    else
+      require 'json/ext/generator'
+      JSON.generator = Generator
+    end
   end
 
-  JSON_LOADED = true unless defined?(::JSON::JSON_LOADED)
+  JSON_LOADED = true unless defined?(JSON::JSON_LOADED)
 end
diff --git a/ext/json/lib/json/ext/generator/state.rb b/ext/json/lib/json/ext/generator/state.rb
new file mode 100644
index 00000000000000..d40c3b5ec35a30
--- /dev/null
+++ b/ext/json/lib/json/ext/generator/state.rb
@@ -0,0 +1,106 @@
+# frozen_string_literal: true
+
+module JSON
+  module Ext
+    module Generator
+      class State
+        # call-seq: new(opts = {})
+        #
+        # Instantiates a new State object, configured by _opts_.
+        #
+        # _opts_ 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: ''),
+        # * *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.
+        # * *ascii_only*: true if only ASCII characters should be generated. This
+        #   option defaults to false.
+        # * *buffer_initial_length*: sets the initial length of the generator's
+        #   internal buffer.
+        def initialize(opts = nil)
+          if opts && !opts.empty?
+            configure(opts)
+          end
+        end
+
+        # call-seq: configure(opts)
+        #
+        # Configure this State instance with the Hash _opts_, and return
+        # itself.
+        def configure(opts)
+          unless opts.is_a?(Hash)
+            if opts.respond_to?(:to_hash)
+              opts = opts.to_hash
+            elsif opts.respond_to?(:to_h)
+              opts = opts.to_h
+            else
+              raise TypeError, "can't convert #{opts.class} into Hash"
+            end
+          end
+          _configure(opts)
+        end
+
+        alias_method :merge, :configure
+
+        # call-seq: to_h
+        #
+        # Returns the configuration instance variables as a hash, that can be
+        # passed to the configure method.
+        def to_h
+          result = {
+            indent: indent,
+            space: space,
+            space_before: space_before,
+            object_nl: object_nl,
+            array_nl: array_nl,
+            as_json: as_json,
+            allow_nan: allow_nan?,
+            ascii_only: ascii_only?,
+            max_nesting: max_nesting,
+            script_safe: script_safe?,
+            strict: strict?,
+            depth: depth,
+            buffer_initial_length: buffer_initial_length,
+          }
+
+          instance_variables.each do |iv|
+            iv = iv.to_s[1..-1]
+            result[iv.to_sym] = self[iv]
+          end
+
+          result
+        end
+
+        alias_method :to_hash, :to_h
+
+        # call-seq: [](name)
+        #
+        # Returns the value returned by method +name+.
+        def [](name)
+          if respond_to?(name)
+            __send__(name)
+          else
+            instance_variable_get("@#{name}") if
+              instance_variables.include?("@#{name}".to_sym) # avoid warning
+          end
+        end
+
+        # call-seq: []=(name, value)
+        #
+        # Sets the attribute name to value.
+        def []=(name, value)
+          if respond_to?(name_writer = "#{name}=")
+            __send__ name_writer, value
+          else
+            instance_variable_set "@#{name}", value
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/ext/json/lib/json/generic_object.rb b/ext/json/lib/json/generic_object.rb
index 108309db265fca..ec5aa9dcb2977e 100644
--- a/ext/json/lib/json/generic_object.rb
+++ b/ext/json/lib/json/generic_object.rb
@@ -1,5 +1,9 @@
-#frozen_string_literal: false
-require 'ostruct'
+# frozen_string_literal: true
+begin
+  require 'ostruct'
+rescue LoadError
+  warn "JSON::GenericObject requires 'ostruct'. Please install it with `gem install ostruct`."
+end
 
 module JSON
   class GenericObject < OpenStruct
@@ -67,5 +71,5 @@ def as_json(*)
     def to_json(*a)
       as_json.to_json(*a)
     end
-  end
+  end if defined?(::OpenStruct)
 end
diff --git a/ext/json/lib/json/version.rb b/ext/json/lib/json/version.rb
index 3d4326d836c66d..15ebd12f5158ac 100644
--- a/ext/json/lib/json/version.rb
+++ b/ext/json/lib/json/version.rb
@@ -1,9 +1,5 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
+
 module JSON
-  # JSON version
-  VERSION         = '2.6.3'
-  VERSION_ARRAY   = VERSION.split(/\./).map { |x| x.to_i } # :nodoc:
-  VERSION_MAJOR   = VERSION_ARRAY[0] # :nodoc:
-  VERSION_MINOR   = VERSION_ARRAY[1] # :nodoc:
-  VERSION_BUILD   = VERSION_ARRAY[2] # :nodoc:
+  VERSION = '2.12.2'
 end
diff --git a/ext/json/parser/depend b/ext/json/parser/depend
index cb6e547d2968d7..1bb03d3517590e 100644
--- a/ext/json/parser/depend
+++ b/ext/json/parser/depend
@@ -1,5 +1,5 @@
 $(OBJS): $(ruby_headers)
-parser.o: parser.c parser.h $(srcdir)/../fbuffer/fbuffer.h
+parser.o: parser.c $(srcdir)/../fbuffer/fbuffer.h
 
 # AUTOGENERATED DEPENDENCIES START
 parser.o: $(RUBY_EXTCONF_H)
@@ -141,6 +141,7 @@ parser.o: $(hdrdir)/ruby/internal/intern/re.h
 parser.o: $(hdrdir)/ruby/internal/intern/ruby.h
 parser.o: $(hdrdir)/ruby/internal/intern/select.h
 parser.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+parser.o: $(hdrdir)/ruby/internal/intern/set.h
 parser.o: $(hdrdir)/ruby/internal/intern/signal.h
 parser.o: $(hdrdir)/ruby/internal/intern/sprintf.h
 parser.o: $(hdrdir)/ruby/internal/intern/string.h
@@ -160,6 +161,7 @@ parser.o: $(hdrdir)/ruby/internal/special_consts.h
 parser.o: $(hdrdir)/ruby/internal/static_assert.h
 parser.o: $(hdrdir)/ruby/internal/stdalign.h
 parser.o: $(hdrdir)/ruby/internal/stdbool.h
+parser.o: $(hdrdir)/ruby/internal/stdckdint.h
 parser.o: $(hdrdir)/ruby/internal/symbol.h
 parser.o: $(hdrdir)/ruby/internal/value.h
 parser.o: $(hdrdir)/ruby/internal/value_type.h
@@ -173,7 +175,6 @@ parser.o: $(hdrdir)/ruby/ruby.h
 parser.o: $(hdrdir)/ruby/st.h
 parser.o: $(hdrdir)/ruby/subst.h
 parser.o: $(srcdir)/../fbuffer/fbuffer.h
+parser.o: $(srcdir)/../simd/simd.h
 parser.o: parser.c
-parser.o: parser.h
-parser.o: parser.rl
 # AUTOGENERATED DEPENDENCIES END
diff --git a/ext/json/parser/extconf.rb b/ext/json/parser/extconf.rb
index feb586e1b4d687..de5d5758b46c42 100644
--- a/ext/json/parser/extconf.rb
+++ b/ext/json/parser/extconf.rb
@@ -1,32 +1,15 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 require 'mkmf'
 
-have_func("rb_enc_raise", "ruby.h")
-have_func("rb_enc_interned_str", "ruby.h")
+have_func("rb_enc_interned_str", "ruby/encoding.h") # RUBY_VERSION >= 3.0
+have_func("rb_hash_new_capa", "ruby.h") # RUBY_VERSION >= 3.2
+have_func("rb_hash_bulk_insert", "ruby.h") # Missing on TruffleRuby
+have_func("strnlen", "string.h") # Missing on Solaris 10
 
-# checking if String#-@ (str_uminus) dedupes... '
-begin
-  a = -(%w(t e s t).join)
-  b = -(%w(t e s t).join)
-  if a.equal?(b)
-    $CFLAGS << ' -DSTR_UMINUS_DEDUPE=1 '
-  else
-    $CFLAGS << ' -DSTR_UMINUS_DEDUPE=0 '
-  end
-rescue NoMethodError
-  $CFLAGS << ' -DSTR_UMINUS_DEDUPE=0 '
-end
+append_cflags("-std=c99")
 
-# checking if String#-@ (str_uminus) directly interns frozen strings... '
-begin
-  s = rand.to_s.freeze
-  if (-s).equal?(s) && (-s.dup).equal?(s)
-    $CFLAGS << ' -DSTR_UMINUS_DEDUPE_FROZEN=1 '
-  else
-    $CFLAGS << ' -DSTR_UMINUS_DEDUPE_FROZEN=0 '
-  end
-rescue NoMethodError
-  $CFLAGS << ' -DSTR_UMINUS_DEDUPE_FROZEN=0 '
+if enable_config('parser-use-simd', default=!ENV["JSON_DISABLE_SIMD"])
+  load __dir__ + "/../simd/conf.rb"
 end
 
 create_makefile 'json/ext/parser'
diff --git a/ext/json/parser/parser.c b/ext/json/parser/parser.c
index 876bec5769e27f..01b6e6293b7aaf 100644
--- a/ext/json/parser/parser.c
+++ b/ext/json/parser/parser.c
@@ -1,69 +1,345 @@
-/* This file is automatically generated from parser.rl by using ragel */
-#line 1 "parser.rl"
-#include "../fbuffer/fbuffer.h"
-#include "parser.h"
-
-#if defined HAVE_RUBY_ENCODING_H
-# define EXC_ENCODING rb_utf8_encoding(),
-# ifndef HAVE_RB_ENC_RAISE
-static void
-enc_raise(rb_encoding *enc, VALUE exc, const char *fmt, ...)
-{
-    va_list args;
-    VALUE mesg;
+#include "ruby.h"
+#include "ruby/encoding.h"
 
-    va_start(args, fmt);
-    mesg = rb_enc_vsprintf(enc, fmt, args);
-    va_end(args);
+/* shims */
+/* This is the fallback definition from Ruby 3.4 */
 
-    rb_exc_raise(rb_exc_new3(exc, mesg));
-}
-#   define rb_enc_raise enc_raise
+#ifndef RBIMPL_STDBOOL_H
+#if defined(__cplusplus)
+# if defined(HAVE_STDBOOL_H) && (__cplusplus >= 201103L)
+#  include <cstdbool>
 # endif
-#else
-# define EXC_ENCODING /* nothing */
-# define rb_enc_raise rb_raise
+#elif defined(HAVE_STDBOOL_H)
+# include <stdbool.h>
+#elif !defined(HAVE__BOOL)
+typedef unsigned char _Bool;
+# define bool  _Bool
+# define true  ((_Bool)+1)
+# define false ((_Bool)+0)
+# define __bool_true_false_are_defined
+#endif
 #endif
 
-/* unicode */
+#include "../simd/simd.h"
 
-static const signed char digit_values[256] = {
-    -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-    -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-    -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, -1,
-    -1, -1, -1, -1, -1, -1, 10, 11, 12, 13, 14, 15, -1, -1, -1, -1, -1, -1, -1,
-    -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-    10, 11, 12, 13, 14, 15, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-    -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-    -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-    -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-    -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-    -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-    -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-    -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-    -1, -1, -1, -1, -1, -1, -1
+#ifndef RB_UNLIKELY
+#define RB_UNLIKELY(expr) expr
+#endif
+
+#ifndef RB_LIKELY
+#define RB_LIKELY(expr) expr
+#endif
+
+static VALUE mJSON, eNestingError, Encoding_UTF_8;
+static VALUE CNaN, CInfinity, CMinusInfinity;
+
+static ID i_chr, i_aset, i_aref,
+          i_leftshift, i_new, i_try_convert, i_uminus, i_encode;
+
+static VALUE sym_max_nesting, sym_allow_nan, sym_allow_trailing_comma, sym_symbolize_names, sym_freeze,
+             sym_decimal_class, sym_on_load, sym_allow_duplicate_key;
+
+static int binary_encindex;
+static int utf8_encindex;
+
+#ifndef HAVE_RB_HASH_BULK_INSERT
+// For TruffleRuby
+void
+rb_hash_bulk_insert(long count, const VALUE *pairs, VALUE hash)
+{
+    long index = 0;
+    while (index < count) {
+        VALUE name = pairs[index++];
+        VALUE value = pairs[index++];
+        rb_hash_aset(hash, name, value);
+    }
+    RB_GC_GUARD(hash);
+}
+#endif
+
+#ifndef HAVE_RB_HASH_NEW_CAPA
+#define rb_hash_new_capa(n) rb_hash_new()
+#endif
+
+
+/* name cache */
+
+#include <string.h>
+#include <ctype.h>
+
+// Object names are likely to be repeated, and are frozen.
+// As such we can re-use them if we keep a cache of the ones we've seen so far,
+// and save much more expensive lookups into the global fstring table.
+// This cache implementation is deliberately simple, as we're optimizing for compactness,
+// to be able to fit safely on the stack.
+// As such, binary search into a sorted array gives a good tradeoff between compactness and
+// performance.
+#define JSON_RVALUE_CACHE_CAPA 63
+typedef struct rvalue_cache_struct {
+    int length;
+    VALUE entries[JSON_RVALUE_CACHE_CAPA];
+} rvalue_cache;
+
+static rb_encoding *enc_utf8;
+
+#define JSON_RVALUE_CACHE_MAX_ENTRY_LENGTH 55
+
+static inline VALUE build_interned_string(const char *str, const long length)
+{
+# ifdef HAVE_RB_ENC_INTERNED_STR
+    return rb_enc_interned_str(str, length, enc_utf8);
+# else
+    VALUE rstring = rb_utf8_str_new(str, length);
+    return rb_funcall(rb_str_freeze(rstring), i_uminus, 0);
+# endif
+}
+
+static inline VALUE build_symbol(const char *str, const long length)
+{
+    return rb_str_intern(build_interned_string(str, length));
+}
+
+static void rvalue_cache_insert_at(rvalue_cache *cache, int index, VALUE rstring)
+{
+    MEMMOVE(&cache->entries[index + 1], &cache->entries[index], VALUE, cache->length - index);
+    cache->length++;
+    cache->entries[index] = rstring;
+}
+
+static inline int rstring_cache_cmp(const char *str, const long length, VALUE rstring)
+{
+    long rstring_length = RSTRING_LEN(rstring);
+    if (length == rstring_length) {
+        return memcmp(str, RSTRING_PTR(rstring), length);
+    } else {
+        return (int)(length - rstring_length);
+    }
+}
+
+static VALUE rstring_cache_fetch(rvalue_cache *cache, const char *str, const long length)
+{
+    if (RB_UNLIKELY(length > JSON_RVALUE_CACHE_MAX_ENTRY_LENGTH)) {
+        // Common names aren't likely to be very long. So we just don't
+        // cache names above an arbitrary threshold.
+        return Qfalse;
+    }
+
+    if (RB_UNLIKELY(!isalpha((unsigned char)str[0]))) {
+        // Simple heuristic, if the first character isn't a letter,
+        // we're much less likely to see this string again.
+        // We mostly want to cache strings that are likely to be repeated.
+        return Qfalse;
+    }
+
+    int low = 0;
+    int high = cache->length - 1;
+    int mid = 0;
+    int last_cmp = 0;
+
+    while (low <= high) {
+        mid = (high + low) >> 1;
+        VALUE entry = cache->entries[mid];
+        last_cmp = rstring_cache_cmp(str, length, entry);
+
+        if (last_cmp == 0) {
+            return entry;
+        } else if (last_cmp > 0) {
+            low = mid + 1;
+        } else {
+            high = mid - 1;
+        }
+    }
+
+    if (RB_UNLIKELY(memchr(str, '\\', length))) {
+        // We assume the overwhelming majority of names don't need to be escaped.
+        // But if they do, we have to fallback to the slow path.
+        return Qfalse;
+    }
+
+    VALUE rstring = build_interned_string(str, length);
+
+    if (cache->length < JSON_RVALUE_CACHE_CAPA) {
+        if (last_cmp > 0) {
+            mid += 1;
+        }
+
+        rvalue_cache_insert_at(cache, mid, rstring);
+    }
+    return rstring;
+}
+
+static VALUE rsymbol_cache_fetch(rvalue_cache *cache, const char *str, const long length)
+{
+    if (RB_UNLIKELY(length > JSON_RVALUE_CACHE_MAX_ENTRY_LENGTH)) {
+        // Common names aren't likely to be very long. So we just don't
+        // cache names above an arbitrary threshold.
+        return Qfalse;
+    }
+
+    if (RB_UNLIKELY(!isalpha((unsigned char)str[0]))) {
+        // Simple heuristic, if the first character isn't a letter,
+        // we're much less likely to see this string again.
+        // We mostly want to cache strings that are likely to be repeated.
+        return Qfalse;
+    }
+
+    int low = 0;
+    int high = cache->length - 1;
+    int mid = 0;
+    int last_cmp = 0;
+
+    while (low <= high) {
+        mid = (high + low) >> 1;
+        VALUE entry = cache->entries[mid];
+        last_cmp = rstring_cache_cmp(str, length, rb_sym2str(entry));
+
+        if (last_cmp == 0) {
+            return entry;
+        } else if (last_cmp > 0) {
+            low = mid + 1;
+        } else {
+            high = mid - 1;
+        }
+    }
+
+    if (RB_UNLIKELY(memchr(str, '\\', length))) {
+        // We assume the overwhelming majority of names don't need to be escaped.
+        // But if they do, we have to fallback to the slow path.
+        return Qfalse;
+    }
+
+    VALUE rsymbol = build_symbol(str, length);
+
+    if (cache->length < JSON_RVALUE_CACHE_CAPA) {
+        if (last_cmp > 0) {
+            mid += 1;
+        }
+
+        rvalue_cache_insert_at(cache, mid, rsymbol);
+    }
+    return rsymbol;
+}
+
+/* rvalue stack */
+
+#define RVALUE_STACK_INITIAL_CAPA 128
+
+enum rvalue_stack_type {
+    RVALUE_STACK_HEAP_ALLOCATED = 0,
+    RVALUE_STACK_STACK_ALLOCATED = 1,
 };
 
-static UTF32 unescape_unicode(const unsigned char *p)
+typedef struct rvalue_stack_struct {
+    enum rvalue_stack_type type;
+    long capa;
+    long head;
+    VALUE *ptr;
+} rvalue_stack;
+
+static rvalue_stack *rvalue_stack_spill(rvalue_stack *old_stack, VALUE *handle, rvalue_stack **stack_ref);
+
+static rvalue_stack *rvalue_stack_grow(rvalue_stack *stack, VALUE *handle, rvalue_stack **stack_ref)
 {
-    signed char b;
-    UTF32 result = 0;
-    b = digit_values[p[0]];
-    if (b < 0) return UNI_REPLACEMENT_CHAR;
-    result = (result << 4) | (unsigned char)b;
-    b = digit_values[p[1]];
-    if (b < 0) return UNI_REPLACEMENT_CHAR;
-    result = (result << 4) | (unsigned char)b;
-    b = digit_values[p[2]];
-    if (b < 0) return UNI_REPLACEMENT_CHAR;
-    result = (result << 4) | (unsigned char)b;
-    b = digit_values[p[3]];
-    if (b < 0) return UNI_REPLACEMENT_CHAR;
-    result = (result << 4) | (unsigned char)b;
-    return result;
+    long required = stack->capa * 2;
+
+    if (stack->type == RVALUE_STACK_STACK_ALLOCATED) {
+        stack = rvalue_stack_spill(stack, handle, stack_ref);
+    } else {
+        REALLOC_N(stack->ptr, VALUE, required);
+        stack->capa = required;
+    }
+    return stack;
+}
+
+static VALUE rvalue_stack_push(rvalue_stack *stack, VALUE value, VALUE *handle, rvalue_stack **stack_ref)
+{
+    if (RB_UNLIKELY(stack->head >= stack->capa)) {
+        stack = rvalue_stack_grow(stack, handle, stack_ref);
+    }
+    stack->ptr[stack->head] = value;
+    stack->head++;
+    return value;
+}
+
+static inline VALUE *rvalue_stack_peek(rvalue_stack *stack, long count)
+{
+    return stack->ptr + (stack->head - count);
 }
 
-static int convert_UTF32_to_UTF8(char *buf, UTF32 ch)
+static inline void rvalue_stack_pop(rvalue_stack *stack, long count)
+{
+    stack->head -= count;
+}
+
+static void rvalue_stack_mark(void *ptr)
+{
+    rvalue_stack *stack = (rvalue_stack *)ptr;
+    long index;
+    for (index = 0; index < stack->head; index++) {
+        rb_gc_mark(stack->ptr[index]);
+    }
+}
+
+static void rvalue_stack_free(void *ptr)
+{
+    rvalue_stack *stack = (rvalue_stack *)ptr;
+    if (stack) {
+        ruby_xfree(stack->ptr);
+        ruby_xfree(stack);
+    }
+}
+
+static size_t rvalue_stack_memsize(const void *ptr)
+{
+    const rvalue_stack *stack = (const rvalue_stack *)ptr;
+    return sizeof(rvalue_stack) + sizeof(VALUE) * stack->capa;
+}
+
+static const rb_data_type_t JSON_Parser_rvalue_stack_type = {
+    "JSON::Ext::Parser/rvalue_stack",
+    {
+        .dmark = rvalue_stack_mark,
+        .dfree = rvalue_stack_free,
+        .dsize = rvalue_stack_memsize,
+    },
+    0, 0,
+    RUBY_TYPED_FREE_IMMEDIATELY,
+};
+
+static rvalue_stack *rvalue_stack_spill(rvalue_stack *old_stack, VALUE *handle, rvalue_stack **stack_ref)
+{
+    rvalue_stack *stack;
+    *handle = TypedData_Make_Struct(0, rvalue_stack, &JSON_Parser_rvalue_stack_type, stack);
+    *stack_ref = stack;
+    MEMCPY(stack, old_stack, rvalue_stack, 1);
+
+    stack->capa = old_stack->capa << 1;
+    stack->ptr = ALLOC_N(VALUE, stack->capa);
+    stack->type = RVALUE_STACK_HEAP_ALLOCATED;
+    MEMCPY(stack->ptr, old_stack->ptr, VALUE, old_stack->head);
+    return stack;
+}
+
+static void rvalue_stack_eagerly_release(VALUE handle)
+{
+    if (handle) {
+        rvalue_stack *stack;
+        TypedData_Get_Struct(handle, rvalue_stack, &JSON_Parser_rvalue_stack_type, stack);
+        RTYPEDDATA_DATA(handle) = NULL;
+        rvalue_stack_free(stack);
+    }
+}
+
+
+#ifndef HAVE_STRNLEN
+static size_t strnlen(const char *s, size_t maxlen)
+{
+    char *p;
+    return ((p = memchr(s, '\0', maxlen)) ? p - s : maxlen);
+}
+#endif
+
+static int convert_UTF32_to_UTF8(char *buf, uint32_t ch)
 {
     int len = 1;
     if (ch <= 0x7F) {
@@ -89,1677 +365,869 @@ static int convert_UTF32_to_UTF8(char *buf, UTF32 ch)
     return len;
 }
 
-static VALUE mJSON, mExt, cParser, eParserError, eNestingError;
-static VALUE CNaN, CInfinity, CMinusInfinity;
+enum duplicate_key_action {
+    JSON_DEPRECATED = 0,
+    JSON_IGNORE,
+    JSON_RAISE,
+};
 
-static ID i_json_creatable_p, i_json_create, i_create_id, i_create_additions,
-          i_chr, i_max_nesting, i_allow_nan, i_symbolize_names,
-          i_object_class, i_array_class, i_decimal_class, i_key_p,
-          i_deep_const_get, i_match, i_match_string, i_aset, i_aref,
-          i_leftshift, i_new, i_try_convert, i_freeze, i_uminus;
+typedef struct JSON_ParserStruct {
+    VALUE on_load_proc;
+    VALUE decimal_class;
+    ID decimal_method_id;
+    enum duplicate_key_action on_duplicate_key;
+    int max_nesting;
+    bool allow_nan;
+    bool allow_trailing_comma;
+    bool parsing_name;
+    bool symbolize_names;
+    bool freeze;
+} JSON_ParserConfig;
+
+typedef struct JSON_ParserStateStruct {
+    VALUE stack_handle;
+    const char *start;
+    const char *cursor;
+    const char *end;
+    rvalue_stack *stack;
+    rvalue_cache name_cache;
+    int in_array;
+    int current_nesting;
+} JSON_ParserState;
+
+static void cursor_position(JSON_ParserState *state, long *line_out, long *column_out)
+{
+    const char *cursor = state->cursor;
+    long column = 0;
+    long line = 1;
 
+    while (cursor >= state->start) {
+        if (*cursor-- == '\n') {
+            break;
+        }
+        column++;
+    }
 
-#line 125 "parser.rl"
+    while (cursor >= state->start) {
+        if (*cursor-- == '\n') {
+            line++;
+        }
+    }
+    *line_out = line;
+    *column_out = column;
+}
 
+static void emit_parse_warning(const char *message, JSON_ParserState *state)
+{
+    long line, column;
+    cursor_position(state, &line, &column);
+
+    rb_warn("%s at line %ld column %ld", message, line, column);
+}
+
+#define PARSE_ERROR_FRAGMENT_LEN 32
+#ifdef RBIMPL_ATTR_NORETURN
+RBIMPL_ATTR_NORETURN()
+#endif
+static void raise_parse_error(const char *format, JSON_ParserState *state)
+{
+    unsigned char buffer[PARSE_ERROR_FRAGMENT_LEN + 3];
+    long line, column;
+    cursor_position(state, &line, &column);
+
+    const char *ptr = "EOF";
+    if (state->cursor && state->cursor < state->end) {
+        ptr = state->cursor;
+        size_t len = 0;
+        while (len < PARSE_ERROR_FRAGMENT_LEN) {
+            char ch = ptr[len];
+            if (!ch || ch == '\n' || ch == ' ' || ch == '\t' || ch == '\r') {
+                break;
+            }
+            len++;
+        }
 
+        if (len) {
+            buffer[0] = '\'';
+            MEMCPY(buffer + 1, ptr, char, len);
 
-#line 107 "parser.c"
-enum {JSON_object_start = 1};
-enum {JSON_object_first_final = 27};
-enum {JSON_object_error = 0};
+            while (buffer[len] >= 0x80 && buffer[len] < 0xC0) { // Is continuation byte
+                len--;
+            }
 
-enum {JSON_object_en_main = 1};
+            if (buffer[len] >= 0xC0) { // multibyte character start
+                len--;
+            }
 
+            buffer[len + 1] = '\'';
+            buffer[len + 2] = '\0';
+            ptr = (const char *)buffer;
+        }
+    }
 
-#line 167 "parser.rl"
+    VALUE msg = rb_sprintf(format, ptr);
+    VALUE message = rb_enc_sprintf(enc_utf8, "%s at line %ld column %ld", RSTRING_PTR(msg), line, column);
+    RB_GC_GUARD(msg);
 
+    VALUE exc = rb_exc_new_str(rb_path2class("JSON::ParserError"), message);
+    rb_ivar_set(exc, rb_intern("@line"), LONG2NUM(line));
+    rb_ivar_set(exc, rb_intern("@column"), LONG2NUM(column));
+    rb_exc_raise(exc);
+}
 
-static char *JSON_parse_object(JSON_Parser *json, char *p, char *pe, VALUE *result, int current_nesting)
+#ifdef RBIMPL_ATTR_NORETURN
+RBIMPL_ATTR_NORETURN()
+#endif
+static void raise_parse_error_at(const char *format, JSON_ParserState *state, const char *at)
 {
-    int cs = EVIL;
-    VALUE last_name = Qnil;
-    VALUE object_class = json->object_class;
+    state->cursor = at;
+    raise_parse_error(format, state);
+}
 
-    if (json->max_nesting && current_nesting > json->max_nesting) {
-        rb_raise(eNestingError, "nesting of %d is too deep", current_nesting);
-    }
+/* unicode */
 
-    *result = NIL_P(object_class) ? rb_hash_new() : rb_class_new_instance(0, 0, object_class);
-
-
-#line 131 "parser.c"
-	{
-	cs = JSON_object_start;
-	}
-
-#line 182 "parser.rl"
-
-#line 138 "parser.c"
-	{
-	if ( p == pe )
-		goto _test_eof;
-	switch ( cs )
-	{
-case 1:
-	if ( (*p) == 123 )
-		goto st2;
-	goto st0;
-st0:
-cs = 0;
-	goto _out;
-st2:
-	if ( ++p == pe )
-		goto _test_eof2;
-case 2:
-	switch( (*p) ) {
-		case 13: goto st2;
-		case 32: goto st2;
-		case 34: goto tr2;
-		case 47: goto st23;
-		case 125: goto tr4;
-	}
-	if ( 9 <= (*p) && (*p) <= 10 )
-		goto st2;
-	goto st0;
-tr2:
-#line 149 "parser.rl"
-	{
-        char *np;
-        json->parsing_name = 1;
-        np = JSON_parse_string(json, p, pe, &last_name);
-        json->parsing_name = 0;
-        if (np == NULL) { p--; {p++; cs = 3; goto _out;} } else {p = (( np))-1;}
-    }
-	goto st3;
-st3:
-	if ( ++p == pe )
-		goto _test_eof3;
-case 3:
-#line 179 "parser.c"
-	switch( (*p) ) {
-		case 13: goto st3;
-		case 32: goto st3;
-		case 47: goto st4;
-		case 58: goto st8;
-	}
-	if ( 9 <= (*p) && (*p) <= 10 )
-		goto st3;
-	goto st0;
-st4:
-	if ( ++p == pe )
-		goto _test_eof4;
-case 4:
-	switch( (*p) ) {
-		case 42: goto st5;
-		case 47: goto st7;
-	}
-	goto st0;
-st5:
-	if ( ++p == pe )
-		goto _test_eof5;
-case 5:
-	if ( (*p) == 42 )
-		goto st6;
-	goto st5;
-st6:
-	if ( ++p == pe )
-		goto _test_eof6;
-case 6:
-	switch( (*p) ) {
-		case 42: goto st6;
-		case 47: goto st3;
-	}
-	goto st5;
-st7:
-	if ( ++p == pe )
-		goto _test_eof7;
-case 7:
-	if ( (*p) == 10 )
-		goto st3;
-	goto st7;
-st8:
-	if ( ++p == pe )
-		goto _test_eof8;
-case 8:
-	switch( (*p) ) {
-		case 13: goto st8;
-		case 32: goto st8;
-		case 34: goto tr11;
-		case 45: goto tr11;
-		case 47: goto st19;
-		case 73: goto tr11;
-		case 78: goto tr11;
-		case 91: goto tr11;
-		case 102: goto tr11;
-		case 110: goto tr11;
-		case 116: goto tr11;
-		case 123: goto tr11;
-	}
-	if ( (*p) > 10 ) {
-		if ( 48 <= (*p) && (*p) <= 57 )
-			goto tr11;
-	} else if ( (*p) >= 9 )
-		goto st8;
-	goto st0;
-tr11:
-#line 133 "parser.rl"
-	{
-        VALUE v = Qnil;
-        char *np = JSON_parse_value(json, p, pe, &v, current_nesting);
-        if (np == NULL) {
-            p--; {p++; cs = 9; goto _out;}
-        } else {
-            if (NIL_P(json->object_class)) {
-                OBJ_FREEZE(last_name);
-                rb_hash_aset(*result, last_name, v);
-            } else {
-                rb_funcall(*result, i_aset, 2, last_name, v);
-            }
-            {p = (( np))-1;}
-        }
-    }
-	goto st9;
-st9:
-	if ( ++p == pe )
-		goto _test_eof9;
-case 9:
-#line 267 "parser.c"
-	switch( (*p) ) {
-		case 13: goto st9;
-		case 32: goto st9;
-		case 44: goto st10;
-		case 47: goto st15;
-		case 125: goto tr4;
-	}
-	if ( 9 <= (*p) && (*p) <= 10 )
-		goto st9;
-	goto st0;
-st10:
-	if ( ++p == pe )
-		goto _test_eof10;
-case 10:
-	switch( (*p) ) {
-		case 13: goto st10;
-		case 32: goto st10;
-		case 34: goto tr2;
-		case 47: goto st11;
-	}
-	if ( 9 <= (*p) && (*p) <= 10 )
-		goto st10;
-	goto st0;
-st11:
-	if ( ++p == pe )
-		goto _test_eof11;
-case 11:
-	switch( (*p) ) {
-		case 42: goto st12;
-		case 47: goto st14;
-	}
-	goto st0;
-st12:
-	if ( ++p == pe )
-		goto _test_eof12;
-case 12:
-	if ( (*p) == 42 )
-		goto st13;
-	goto st12;
-st13:
-	if ( ++p == pe )
-		goto _test_eof13;
-case 13:
-	switch( (*p) ) {
-		case 42: goto st13;
-		case 47: goto st10;
-	}
-	goto st12;
-st14:
-	if ( ++p == pe )
-		goto _test_eof14;
-case 14:
-	if ( (*p) == 10 )
-		goto st10;
-	goto st14;
-st15:
-	if ( ++p == pe )
-		goto _test_eof15;
-case 15:
-	switch( (*p) ) {
-		case 42: goto st16;
-		case 47: goto st18;
-	}
-	goto st0;
-st16:
-	if ( ++p == pe )
-		goto _test_eof16;
-case 16:
-	if ( (*p) == 42 )
-		goto st17;
-	goto st16;
-st17:
-	if ( ++p == pe )
-		goto _test_eof17;
-case 17:
-	switch( (*p) ) {
-		case 42: goto st17;
-		case 47: goto st9;
-	}
-	goto st16;
-st18:
-	if ( ++p == pe )
-		goto _test_eof18;
-case 18:
-	if ( (*p) == 10 )
-		goto st9;
-	goto st18;
-tr4:
-#line 157 "parser.rl"
-	{ p--; {p++; cs = 27; goto _out;} }
-	goto st27;
-st27:
-	if ( ++p == pe )
-		goto _test_eof27;
-case 27:
-#line 363 "parser.c"
-	goto st0;
-st19:
-	if ( ++p == pe )
-		goto _test_eof19;
-case 19:
-	switch( (*p) ) {
-		case 42: goto st20;
-		case 47: goto st22;
-	}
-	goto st0;
-st20:
-	if ( ++p == pe )
-		goto _test_eof20;
-case 20:
-	if ( (*p) == 42 )
-		goto st21;
-	goto st20;
-st21:
-	if ( ++p == pe )
-		goto _test_eof21;
-case 21:
-	switch( (*p) ) {
-		case 42: goto st21;
-		case 47: goto st8;
-	}
-	goto st20;
-st22:
-	if ( ++p == pe )
-		goto _test_eof22;
-case 22:
-	if ( (*p) == 10 )
-		goto st8;
-	goto st22;
-st23:
-	if ( ++p == pe )
-		goto _test_eof23;
-case 23:
-	switch( (*p) ) {
-		case 42: goto st24;
-		case 47: goto st26;
-	}
-	goto st0;
-st24:
-	if ( ++p == pe )
-		goto _test_eof24;
-case 24:
-	if ( (*p) == 42 )
-		goto st25;
-	goto st24;
-st25:
-	if ( ++p == pe )
-		goto _test_eof25;
-case 25:
-	switch( (*p) ) {
-		case 42: goto st25;
-		case 47: goto st2;
-	}
-	goto st24;
-st26:
-	if ( ++p == pe )
-		goto _test_eof26;
-case 26:
-	if ( (*p) == 10 )
-		goto st2;
-	goto st26;
-	}
-	_test_eof2: cs = 2; goto _test_eof;
-	_test_eof3: cs = 3; goto _test_eof;
-	_test_eof4: cs = 4; goto _test_eof;
-	_test_eof5: cs = 5; goto _test_eof;
-	_test_eof6: cs = 6; goto _test_eof;
-	_test_eof7: cs = 7; goto _test_eof;
-	_test_eof8: cs = 8; goto _test_eof;
-	_test_eof9: cs = 9; goto _test_eof;
-	_test_eof10: cs = 10; goto _test_eof;
-	_test_eof11: cs = 11; goto _test_eof;
-	_test_eof12: cs = 12; goto _test_eof;
-	_test_eof13: cs = 13; goto _test_eof;
-	_test_eof14: cs = 14; goto _test_eof;
-	_test_eof15: cs = 15; goto _test_eof;
-	_test_eof16: cs = 16; goto _test_eof;
-	_test_eof17: cs = 17; goto _test_eof;
-	_test_eof18: cs = 18; goto _test_eof;
-	_test_eof27: cs = 27; goto _test_eof;
-	_test_eof19: cs = 19; goto _test_eof;
-	_test_eof20: cs = 20; goto _test_eof;
-	_test_eof21: cs = 21; goto _test_eof;
-	_test_eof22: cs = 22; goto _test_eof;
-	_test_eof23: cs = 23; goto _test_eof;
-	_test_eof24: cs = 24; goto _test_eof;
-	_test_eof25: cs = 25; goto _test_eof;
-	_test_eof26: cs = 26; goto _test_eof;
-
-	_test_eof: {}
-	_out: {}
-	}
-
-#line 183 "parser.rl"
-
-    if (cs >= JSON_object_first_final) {
-        if (json->create_additions) {
-            VALUE klassname;
-            if (NIL_P(json->object_class)) {
-              klassname = rb_hash_aref(*result, json->create_id);
-            } else {
-              klassname = rb_funcall(*result, i_aref, 1, json->create_id);
+static const signed char digit_values[256] = {
+    -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+    -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+    -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, -1,
+    -1, -1, -1, -1, -1, -1, 10, 11, 12, 13, 14, 15, -1, -1, -1, -1, -1, -1, -1,
+    -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+    10, 11, 12, 13, 14, 15, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+    -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+    -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+    -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+    -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+    -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+    -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+    -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+    -1, -1, -1, -1, -1, -1, -1
+};
+
+static uint32_t unescape_unicode(JSON_ParserState *state, const unsigned char *p)
+{
+    signed char b;
+    uint32_t result = 0;
+    b = digit_values[p[0]];
+    if (b < 0) raise_parse_error_at("incomplete unicode character escape sequence at %s", state, (char *)p - 2);
+    result = (result << 4) | (unsigned char)b;
+    b = digit_values[p[1]];
+    if (b < 0) raise_parse_error_at("incomplete unicode character escape sequence at %s", state, (char *)p - 2);
+    result = (result << 4) | (unsigned char)b;
+    b = digit_values[p[2]];
+    if (b < 0) raise_parse_error_at("incomplete unicode character escape sequence at %s", state, (char *)p - 2);
+    result = (result << 4) | (unsigned char)b;
+    b = digit_values[p[3]];
+    if (b < 0) raise_parse_error_at("incomplete unicode character escape sequence at %s", state, (char *)p - 2);
+    result = (result << 4) | (unsigned char)b;
+    return result;
+}
+
+#define GET_PARSER_CONFIG                          \
+    JSON_ParserConfig *config;                      \
+    TypedData_Get_Struct(self, JSON_ParserConfig, &JSON_ParserConfig_type, config)
+
+static const rb_data_type_t JSON_ParserConfig_type;
+
+static const bool whitespace[256] = {
+    [' '] = 1,
+    ['\t'] = 1,
+    ['\n'] = 1,
+    ['\r'] = 1,
+    ['/'] = 1,
+};
+
+static void
+json_eat_comments(JSON_ParserState *state)
+{
+    if (state->cursor + 1 < state->end) {
+        switch (state->cursor[1]) {
+            case '/': {
+                state->cursor = memchr(state->cursor, '\n', state->end - state->cursor);
+                if (!state->cursor) {
+                    state->cursor = state->end;
+                } else {
+                    state->cursor++;
+                }
+                break;
             }
-            if (!NIL_P(klassname)) {
-                VALUE klass = rb_funcall(mJSON, i_deep_const_get, 1, klassname);
-                if (RTEST(rb_funcall(klass, i_json_creatable_p, 0))) {
-                    *result = rb_funcall(klass, i_json_create, 1, *result);
+            case '*': {
+                state->cursor += 2;
+                while (true) {
+                    state->cursor = memchr(state->cursor, '*', state->end - state->cursor);
+                    if (!state->cursor) {
+                        raise_parse_error_at("unexpected end of input, expected closing '*/'", state, state->end);
+                    } else {
+                        state->cursor++;
+                        if (state->cursor < state->end && *state->cursor == '/') {
+                            state->cursor++;
+                            break;
+                        }
+                    }
                 }
+                break;
             }
+            default:
+                raise_parse_error("unexpected token %s", state);
+                break;
         }
-        return p + 1;
     } else {
-        return NULL;
+        raise_parse_error("unexpected token %s", state);
     }
 }
 
+static inline void
+json_eat_whitespace(JSON_ParserState *state)
+{
+    while (state->cursor < state->end && RB_UNLIKELY(whitespace[(unsigned char)*state->cursor])) {
+        if (RB_LIKELY(*state->cursor != '/')) {
+            state->cursor++;
+        } else {
+            json_eat_comments(state);
+        }
+    }
+}
 
+static inline VALUE build_string(const char *start, const char *end, bool intern, bool symbolize)
+{
+    if (symbolize) {
+        intern = true;
+    }
+    VALUE result;
+# ifdef HAVE_RB_ENC_INTERNED_STR
+    if (intern) {
+      result = rb_enc_interned_str(start, (long)(end - start), enc_utf8);
+    } else {
+      result = rb_utf8_str_new(start, (long)(end - start));
+    }
+# else
+    result = rb_utf8_str_new(start, (long)(end - start));
+    if (intern) {
+        result = rb_funcall(rb_str_freeze(result), i_uminus, 0);
+    }
+# endif
 
-#line 486 "parser.c"
-enum {JSON_value_start = 1};
-enum {JSON_value_first_final = 29};
-enum {JSON_value_error = 0};
-
-enum {JSON_value_en_main = 1};
+    if (symbolize) {
+      result = rb_str_intern(result);
+    }
 
+    return result;
+}
 
-#line 283 "parser.rl"
+static inline VALUE json_string_fastpath(JSON_ParserState *state, const char *string, const char *stringEnd, bool is_name, bool intern, bool symbolize)
+{
+    size_t bufferSize = stringEnd - string;
 
+    if (is_name && state->in_array) {
+        VALUE cached_key;
+        if (RB_UNLIKELY(symbolize)) {
+            cached_key = rsymbol_cache_fetch(&state->name_cache, string, bufferSize);
+        } else {
+            cached_key = rstring_cache_fetch(&state->name_cache, string, bufferSize);
+        }
 
-static char *JSON_parse_value(JSON_Parser *json, char *p, char *pe, VALUE *result, int current_nesting)
-{
-    int cs = EVIL;
-
-
-#line 502 "parser.c"
-	{
-	cs = JSON_value_start;
-	}
-
-#line 290 "parser.rl"
-
-#line 509 "parser.c"
-	{
-	if ( p == pe )
-		goto _test_eof;
-	switch ( cs )
-	{
-st1:
-	if ( ++p == pe )
-		goto _test_eof1;
-case 1:
-	switch( (*p) ) {
-		case 13: goto st1;
-		case 32: goto st1;
-		case 34: goto tr2;
-		case 45: goto tr3;
-		case 47: goto st6;
-		case 73: goto st10;
-		case 78: goto st17;
-		case 91: goto tr7;
-		case 102: goto st19;
-		case 110: goto st23;
-		case 116: goto st26;
-		case 123: goto tr11;
-	}
-	if ( (*p) > 10 ) {
-		if ( 48 <= (*p) && (*p) <= 57 )
-			goto tr3;
-	} else if ( (*p) >= 9 )
-		goto st1;
-	goto st0;
-st0:
-cs = 0;
-	goto _out;
-tr2:
-#line 235 "parser.rl"
-	{
-        char *np = JSON_parse_string(json, p, pe, result);
-        if (np == NULL) { p--; {p++; cs = 29; goto _out;} } else {p = (( np))-1;}
-    }
-	goto st29;
-tr3:
-#line 240 "parser.rl"
-	{
-        char *np;
-        if(pe > p + 8 && !strncmp(MinusInfinity, p, 9)) {
-            if (json->allow_nan) {
-                *result = CMinusInfinity;
-                {p = (( p + 10))-1;}
-                p--; {p++; cs = 29; goto _out;}
-            } else {
-                rb_enc_raise(EXC_ENCODING eParserError, "unexpected token at '%s'", p);
-            }
+        if (RB_LIKELY(cached_key)) {
+            return cached_key;
         }
-        np = JSON_parse_float(json, p, pe, result);
-        if (np != NULL) {p = (( np))-1;}
-        np = JSON_parse_integer(json, p, pe, result);
-        if (np != NULL) {p = (( np))-1;}
-        p--; {p++; cs = 29; goto _out;}
-    }
-	goto st29;
-tr7:
-#line 258 "parser.rl"
-	{
-        char *np;
-        np = JSON_parse_array(json, p, pe, result, current_nesting + 1);
-        if (np == NULL) { p--; {p++; cs = 29; goto _out;} } else {p = (( np))-1;}
-    }
-	goto st29;
-tr11:
-#line 264 "parser.rl"
-	{
-        char *np;
-        np =  JSON_parse_object(json, p, pe, result, current_nesting + 1);
-        if (np == NULL) { p--; {p++; cs = 29; goto _out;} } else {p = (( np))-1;}
     }
-	goto st29;
-tr25:
-#line 228 "parser.rl"
-	{
-        if (json->allow_nan) {
-            *result = CInfinity;
+
+    return build_string(string, stringEnd, intern, symbolize);
+}
+
+static VALUE json_string_unescape(JSON_ParserState *state, const char *string, const char *stringEnd, bool is_name, bool intern, bool symbolize)
+{
+    size_t bufferSize = stringEnd - string;
+    const char *p = string, *pe = string, *unescape, *bufferStart;
+    char *buffer;
+    int unescape_len;
+    char buf[4];
+
+    if (is_name && state->in_array) {
+        VALUE cached_key;
+        if (RB_UNLIKELY(symbolize)) {
+            cached_key = rsymbol_cache_fetch(&state->name_cache, string, bufferSize);
         } else {
-            rb_enc_raise(EXC_ENCODING eParserError, "unexpected token at '%s'", p - 8);
+            cached_key = rstring_cache_fetch(&state->name_cache, string, bufferSize);
+        }
+
+        if (RB_LIKELY(cached_key)) {
+            return cached_key;
         }
     }
-	goto st29;
-tr27:
-#line 221 "parser.rl"
-	{
-        if (json->allow_nan) {
-            *result = CNaN;
-        } else {
-            rb_enc_raise(EXC_ENCODING eParserError, "unexpected token at '%s'", p - 2);
+
+    VALUE result = rb_str_buf_new(bufferSize);
+    rb_enc_associate_index(result, utf8_encindex);
+    buffer = RSTRING_PTR(result);
+    bufferStart = buffer;
+
+    while (pe < stringEnd && (pe = memchr(pe, '\\', stringEnd - pe))) {
+        unescape = (char *) "?";
+        unescape_len = 1;
+        if (pe > p) {
+          MEMCPY(buffer, p, char, pe - p);
+          buffer += pe - p;
         }
+        switch (*++pe) {
+            case 'n':
+                unescape = (char *) "\n";
+                break;
+            case 'r':
+                unescape = (char *) "\r";
+                break;
+            case 't':
+                unescape = (char *) "\t";
+                break;
+            case '"':
+                unescape = (char *) "\"";
+                break;
+            case '\\':
+                unescape = (char *) "\\";
+                break;
+            case 'b':
+                unescape = (char *) "\b";
+                break;
+            case 'f':
+                unescape = (char *) "\f";
+                break;
+            case 'u':
+                if (pe > stringEnd - 5) {
+                    raise_parse_error_at("incomplete unicode character escape sequence at %s", state, p);
+                } else {
+                    uint32_t ch = unescape_unicode(state, (unsigned char *) ++pe);
+                    pe += 3;
+                    /* To handle values above U+FFFF, we take a sequence of
+                     * \uXXXX escapes in the U+D800..U+DBFF then
+                     * U+DC00..U+DFFF ranges, take the low 10 bits from each
+                     * to make a 20-bit number, then add 0x10000 to get the
+                     * final codepoint.
+                     *
+                     * See Unicode 15: 3.8 "Surrogates", 5.3 "Handling
+                     * Surrogate Pairs in UTF-16", and 23.6 "Surrogates
+                     * Area".
+                     */
+                    if ((ch & 0xFC00) == 0xD800) {
+                        pe++;
+                        if (pe > stringEnd - 6) {
+                            raise_parse_error_at("incomplete surrogate pair at %s", state, p);
+                        }
+                        if (pe[0] == '\\' && pe[1] == 'u') {
+                            uint32_t sur = unescape_unicode(state, (unsigned char *) pe + 2);
+                            ch = (((ch & 0x3F) << 10) | ((((ch >> 6) & 0xF) + 1) << 16)
+                                    | (sur & 0x3FF));
+                            pe += 5;
+                        } else {
+                            unescape = (char *) "?";
+                            break;
+                        }
+                    }
+                    unescape_len = convert_UTF32_to_UTF8(buf, ch);
+                    unescape = buf;
+                }
+                break;
+            default:
+                p = pe;
+                continue;
+        }
+        MEMCPY(buffer, unescape, char, unescape_len);
+        buffer += unescape_len;
+        p = ++pe;
     }
-	goto st29;
-tr31:
-#line 215 "parser.rl"
-	{
-        *result = Qfalse;
+
+    if (stringEnd > p) {
+      MEMCPY(buffer, p, char, stringEnd - p);
+      buffer += stringEnd - p;
     }
-	goto st29;
-tr34:
-#line 212 "parser.rl"
-	{
-        *result = Qnil;
+    rb_str_set_len(result, buffer - bufferStart);
+
+    if (symbolize) {
+        result = rb_str_intern(result);
+    } else if (intern) {
+        result = rb_funcall(rb_str_freeze(result), i_uminus, 0);
     }
-	goto st29;
-tr37:
-#line 218 "parser.rl"
-	{
-        *result = Qtrue;
+
+    return result;
+}
+
+#define MAX_FAST_INTEGER_SIZE 18
+static inline VALUE fast_decode_integer(const char *p, const char *pe)
+{
+    bool negative = false;
+    if (*p == '-') {
+        negative = true;
+        p++;
     }
-	goto st29;
-st29:
-	if ( ++p == pe )
-		goto _test_eof29;
-case 29:
-#line 270 "parser.rl"
-	{ p--; {p++; cs = 29; goto _out;} }
-#line 629 "parser.c"
-	switch( (*p) ) {
-		case 13: goto st29;
-		case 32: goto st29;
-		case 47: goto st2;
-	}
-	if ( 9 <= (*p) && (*p) <= 10 )
-		goto st29;
-	goto st0;
-st2:
-	if ( ++p == pe )
-		goto _test_eof2;
-case 2:
-	switch( (*p) ) {
-		case 42: goto st3;
-		case 47: goto st5;
-	}
-	goto st0;
-st3:
-	if ( ++p == pe )
-		goto _test_eof3;
-case 3:
-	if ( (*p) == 42 )
-		goto st4;
-	goto st3;
-st4:
-	if ( ++p == pe )
-		goto _test_eof4;
-case 4:
-	switch( (*p) ) {
-		case 42: goto st4;
-		case 47: goto st29;
-	}
-	goto st3;
-st5:
-	if ( ++p == pe )
-		goto _test_eof5;
-case 5:
-	if ( (*p) == 10 )
-		goto st29;
-	goto st5;
-st6:
-	if ( ++p == pe )
-		goto _test_eof6;
-case 6:
-	switch( (*p) ) {
-		case 42: goto st7;
-		case 47: goto st9;
-	}
-	goto st0;
-st7:
-	if ( ++p == pe )
-		goto _test_eof7;
-case 7:
-	if ( (*p) == 42 )
-		goto st8;
-	goto st7;
-st8:
-	if ( ++p == pe )
-		goto _test_eof8;
-case 8:
-	switch( (*p) ) {
-		case 42: goto st8;
-		case 47: goto st1;
-	}
-	goto st7;
-st9:
-	if ( ++p == pe )
-		goto _test_eof9;
-case 9:
-	if ( (*p) == 10 )
-		goto st1;
-	goto st9;
-st10:
-	if ( ++p == pe )
-		goto _test_eof10;
-case 10:
-	if ( (*p) == 110 )
-		goto st11;
-	goto st0;
-st11:
-	if ( ++p == pe )
-		goto _test_eof11;
-case 11:
-	if ( (*p) == 102 )
-		goto st12;
-	goto st0;
-st12:
-	if ( ++p == pe )
-		goto _test_eof12;
-case 12:
-	if ( (*p) == 105 )
-		goto st13;
-	goto st0;
-st13:
-	if ( ++p == pe )
-		goto _test_eof13;
-case 13:
-	if ( (*p) == 110 )
-		goto st14;
-	goto st0;
-st14:
-	if ( ++p == pe )
-		goto _test_eof14;
-case 14:
-	if ( (*p) == 105 )
-		goto st15;
-	goto st0;
-st15:
-	if ( ++p == pe )
-		goto _test_eof15;
-case 15:
-	if ( (*p) == 116 )
-		goto st16;
-	goto st0;
-st16:
-	if ( ++p == pe )
-		goto _test_eof16;
-case 16:
-	if ( (*p) == 121 )
-		goto tr25;
-	goto st0;
-st17:
-	if ( ++p == pe )
-		goto _test_eof17;
-case 17:
-	if ( (*p) == 97 )
-		goto st18;
-	goto st0;
-st18:
-	if ( ++p == pe )
-		goto _test_eof18;
-case 18:
-	if ( (*p) == 78 )
-		goto tr27;
-	goto st0;
-st19:
-	if ( ++p == pe )
-		goto _test_eof19;
-case 19:
-	if ( (*p) == 97 )
-		goto st20;
-	goto st0;
-st20:
-	if ( ++p == pe )
-		goto _test_eof20;
-case 20:
-	if ( (*p) == 108 )
-		goto st21;
-	goto st0;
-st21:
-	if ( ++p == pe )
-		goto _test_eof21;
-case 21:
-	if ( (*p) == 115 )
-		goto st22;
-	goto st0;
-st22:
-	if ( ++p == pe )
-		goto _test_eof22;
-case 22:
-	if ( (*p) == 101 )
-		goto tr31;
-	goto st0;
-st23:
-	if ( ++p == pe )
-		goto _test_eof23;
-case 23:
-	if ( (*p) == 117 )
-		goto st24;
-	goto st0;
-st24:
-	if ( ++p == pe )
-		goto _test_eof24;
-case 24:
-	if ( (*p) == 108 )
-		goto st25;
-	goto st0;
-st25:
-	if ( ++p == pe )
-		goto _test_eof25;
-case 25:
-	if ( (*p) == 108 )
-		goto tr34;
-	goto st0;
-st26:
-	if ( ++p == pe )
-		goto _test_eof26;
-case 26:
-	if ( (*p) == 114 )
-		goto st27;
-	goto st0;
-st27:
-	if ( ++p == pe )
-		goto _test_eof27;
-case 27:
-	if ( (*p) == 117 )
-		goto st28;
-	goto st0;
-st28:
-	if ( ++p == pe )
-		goto _test_eof28;
-case 28:
-	if ( (*p) == 101 )
-		goto tr37;
-	goto st0;
-	}
-	_test_eof1: cs = 1; goto _test_eof;
-	_test_eof29: cs = 29; goto _test_eof;
-	_test_eof2: cs = 2; goto _test_eof;
-	_test_eof3: cs = 3; goto _test_eof;
-	_test_eof4: cs = 4; goto _test_eof;
-	_test_eof5: cs = 5; goto _test_eof;
-	_test_eof6: cs = 6; goto _test_eof;
-	_test_eof7: cs = 7; goto _test_eof;
-	_test_eof8: cs = 8; goto _test_eof;
-	_test_eof9: cs = 9; goto _test_eof;
-	_test_eof10: cs = 10; goto _test_eof;
-	_test_eof11: cs = 11; goto _test_eof;
-	_test_eof12: cs = 12; goto _test_eof;
-	_test_eof13: cs = 13; goto _test_eof;
-	_test_eof14: cs = 14; goto _test_eof;
-	_test_eof15: cs = 15; goto _test_eof;
-	_test_eof16: cs = 16; goto _test_eof;
-	_test_eof17: cs = 17; goto _test_eof;
-	_test_eof18: cs = 18; goto _test_eof;
-	_test_eof19: cs = 19; goto _test_eof;
-	_test_eof20: cs = 20; goto _test_eof;
-	_test_eof21: cs = 21; goto _test_eof;
-	_test_eof22: cs = 22; goto _test_eof;
-	_test_eof23: cs = 23; goto _test_eof;
-	_test_eof24: cs = 24; goto _test_eof;
-	_test_eof25: cs = 25; goto _test_eof;
-	_test_eof26: cs = 26; goto _test_eof;
-	_test_eof27: cs = 27; goto _test_eof;
-	_test_eof28: cs = 28; goto _test_eof;
-
-	_test_eof: {}
-	_out: {}
-	}
-
-#line 291 "parser.rl"
-
-    if (json->freeze) {
-        OBJ_FREEZE(*result);
+
+    long long memo = 0;
+    while (p < pe) {
+        memo *= 10;
+        memo += *p - '0';
+        p++;
     }
 
-    if (cs >= JSON_value_first_final) {
-        return p;
+    if (negative) {
+        memo = -memo;
+    }
+    return LL2NUM(memo);
+}
+
+static VALUE json_decode_large_integer(const char *start, long len)
+{
+    VALUE buffer_v;
+    char *buffer = RB_ALLOCV_N(char, buffer_v, len + 1);
+    MEMCPY(buffer, start, char, len);
+    buffer[len] = '\0';
+    VALUE number = rb_cstr2inum(buffer, 10);
+    RB_ALLOCV_END(buffer_v);
+    return number;
+}
+
+static inline VALUE
+json_decode_integer(const char *start, const char *end)
+{
+        long len = end - start;
+        if (RB_LIKELY(len < MAX_FAST_INTEGER_SIZE)) {
+            return fast_decode_integer(start, end);
+        }
+        return json_decode_large_integer(start, len);
+}
+
+static VALUE json_decode_large_float(const char *start, long len)
+{
+    VALUE buffer_v;
+    char *buffer = RB_ALLOCV_N(char, buffer_v, len + 1);
+    MEMCPY(buffer, start, char, len);
+    buffer[len] = '\0';
+    VALUE number = DBL2NUM(rb_cstr_to_dbl(buffer, 1));
+    RB_ALLOCV_END(buffer_v);
+    return number;
+}
+
+static VALUE json_decode_float(JSON_ParserConfig *config, const char *start, const char *end)
+{
+    long len = end - start;
+
+    if (RB_UNLIKELY(config->decimal_class)) {
+        VALUE text = rb_str_new(start, len);
+        return rb_funcallv(config->decimal_class, config->decimal_method_id, 1, &text);
+    } else if (RB_LIKELY(len < 64)) {
+        char buffer[64];
+        MEMCPY(buffer, start, char, len);
+        buffer[len] = '\0';
+        return DBL2NUM(rb_cstr_to_dbl(buffer, 1));
     } else {
-        return NULL;
+        return json_decode_large_float(start, len);
     }
 }
 
+static inline VALUE json_decode_array(JSON_ParserState *state, JSON_ParserConfig *config, long count)
+{
+    VALUE array = rb_ary_new_from_values(count, rvalue_stack_peek(state->stack, count));
+    rvalue_stack_pop(state->stack, count);
 
-#line 884 "parser.c"
-enum {JSON_integer_start = 1};
-enum {JSON_integer_first_final = 3};
-enum {JSON_integer_error = 0};
+    if (config->freeze) {
+        RB_OBJ_FREEZE(array);
+    }
 
-enum {JSON_integer_en_main = 1};
+    return array;
+}
 
+static inline VALUE json_decode_object(JSON_ParserState *state, JSON_ParserConfig *config, size_t count)
+{
+    size_t entries_count = count / 2;
+    VALUE object = rb_hash_new_capa(entries_count);
+    rb_hash_bulk_insert(count, rvalue_stack_peek(state->stack, count), object);
+
+    if (RB_UNLIKELY(RHASH_SIZE(object) < entries_count)) {
+        switch (config->on_duplicate_key) {
+            case JSON_IGNORE:
+                break;
+            case JSON_DEPRECATED:
+                emit_parse_warning("detected duplicate keys in JSON object. This will raise an error in json 3.0 unless enabled via `allow_duplicate_key: true`", state);
+                break;
+            case JSON_RAISE:
+                raise_parse_error("duplicate key", state);
+                break;
+        }
+    }
+
+    rvalue_stack_pop(state->stack, count);
 
-#line 311 "parser.rl"
+    if (config->freeze) {
+        RB_OBJ_FREEZE(object);
+    }
 
+    return object;
+}
 
-static char *JSON_parse_integer(JSON_Parser *json, char *p, char *pe, VALUE *result)
+static inline VALUE json_decode_string(JSON_ParserState *state, JSON_ParserConfig *config, const char *start, const char *end, bool escaped, bool is_name)
 {
-    int cs = EVIL;
-
-
-#line 900 "parser.c"
-	{
-	cs = JSON_integer_start;
-	}
-
-#line 318 "parser.rl"
-    json->memo = p;
-
-#line 908 "parser.c"
-	{
-	if ( p == pe )
-		goto _test_eof;
-	switch ( cs )
-	{
-case 1:
-	switch( (*p) ) {
-		case 45: goto st2;
-		case 48: goto st3;
-	}
-	if ( 49 <= (*p) && (*p) <= 57 )
-		goto st5;
-	goto st0;
-st0:
-cs = 0;
-	goto _out;
-st2:
-	if ( ++p == pe )
-		goto _test_eof2;
-case 2:
-	if ( (*p) == 48 )
-		goto st3;
-	if ( 49 <= (*p) && (*p) <= 57 )
-		goto st5;
-	goto st0;
-st3:
-	if ( ++p == pe )
-		goto _test_eof3;
-case 3:
-	if ( 48 <= (*p) && (*p) <= 57 )
-		goto st0;
-	goto tr4;
-tr4:
-#line 308 "parser.rl"
-	{ p--; {p++; cs = 4; goto _out;} }
-	goto st4;
-st4:
-	if ( ++p == pe )
-		goto _test_eof4;
-case 4:
-#line 949 "parser.c"
-	goto st0;
-st5:
-	if ( ++p == pe )
-		goto _test_eof5;
-case 5:
-	if ( 48 <= (*p) && (*p) <= 57 )
-		goto st5;
-	goto tr4;
-	}
-	_test_eof2: cs = 2; goto _test_eof;
-	_test_eof3: cs = 3; goto _test_eof;
-	_test_eof4: cs = 4; goto _test_eof;
-	_test_eof5: cs = 5; goto _test_eof;
-
-	_test_eof: {}
-	_out: {}
-	}
-
-#line 320 "parser.rl"
-
-    if (cs >= JSON_integer_first_final) {
-        long len = p - json->memo;
-        fbuffer_clear(json->fbuffer);
-        fbuffer_append(json->fbuffer, json->memo, len);
-        fbuffer_append_char(json->fbuffer, '\0');
-        *result = rb_cstr2inum(FBUFFER_PTR(json->fbuffer), 10);
-        return p + 1;
+    VALUE string;
+    bool intern = is_name || config->freeze;
+    bool symbolize = is_name && config->symbolize_names;
+    if (escaped) {
+        string = json_string_unescape(state, start, end, is_name, intern, symbolize);
     } else {
-        return NULL;
+        string = json_string_fastpath(state, start, end, is_name, intern, symbolize);
     }
+
+    return string;
 }
 
+static inline VALUE json_push_value(JSON_ParserState *state, JSON_ParserConfig *config, VALUE value)
+{
+    if (RB_UNLIKELY(config->on_load_proc)) {
+        value = rb_proc_call_with_block(config->on_load_proc, 1, &value, Qnil);
+    }
+    rvalue_stack_push(state->stack, value, &state->stack_handle, &state->stack);
+    return value;
+}
 
-#line 983 "parser.c"
-enum {JSON_float_start = 1};
-enum {JSON_float_first_final = 8};
-enum {JSON_float_error = 0};
+static const bool string_scan_table[256] = {
+    // ASCII Control Characters
+     1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+     1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+    // ASCII Characters
+     0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // '"'
+     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, // '\\'
+     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+};
 
-enum {JSON_float_en_main = 1};
+#if (defined(__GNUC__ ) || defined(__clang__))
+#define FORCE_INLINE __attribute__((always_inline))
+#else
+#define FORCE_INLINE
+#endif
 
+#ifdef HAVE_SIMD
+static SIMD_Implementation simd_impl = SIMD_NONE;
+#endif /* HAVE_SIMD */
 
-#line 345 "parser.rl"
+static inline bool FORCE_INLINE string_scan(JSON_ParserState *state)
+{
+#ifdef HAVE_SIMD
+#if defined(HAVE_SIMD_NEON)
 
+    uint64_t mask = 0;
+    if (string_scan_simd_neon(&state->cursor, state->end, &mask)) {
+        state->cursor += trailing_zeros64(mask) >> 2;
+        return 1;
+    }
 
-static char *JSON_parse_float(JSON_Parser *json, char *p, char *pe, VALUE *result)
-{
-    int cs = EVIL;
-
-
-#line 999 "parser.c"
-	{
-	cs = JSON_float_start;
-	}
-
-#line 352 "parser.rl"
-    json->memo = p;
-
-#line 1007 "parser.c"
-	{
-	if ( p == pe )
-		goto _test_eof;
-	switch ( cs )
-	{
-case 1:
-	switch( (*p) ) {
-		case 45: goto st2;
-		case 48: goto st3;
-	}
-	if ( 49 <= (*p) && (*p) <= 57 )
-		goto st7;
-	goto st0;
-st0:
-cs = 0;
-	goto _out;
-st2:
-	if ( ++p == pe )
-		goto _test_eof2;
-case 2:
-	if ( (*p) == 48 )
-		goto st3;
-	if ( 49 <= (*p) && (*p) <= 57 )
-		goto st7;
-	goto st0;
-st3:
-	if ( ++p == pe )
-		goto _test_eof3;
-case 3:
-	switch( (*p) ) {
-		case 46: goto st4;
-		case 69: goto st5;
-		case 101: goto st5;
-	}
-	goto st0;
-st4:
-	if ( ++p == pe )
-		goto _test_eof4;
-case 4:
-	if ( 48 <= (*p) && (*p) <= 57 )
-		goto st8;
-	goto st0;
-st8:
-	if ( ++p == pe )
-		goto _test_eof8;
-case 8:
-	switch( (*p) ) {
-		case 69: goto st5;
-		case 101: goto st5;
-	}
-	if ( (*p) > 46 ) {
-		if ( 48 <= (*p) && (*p) <= 57 )
-			goto st8;
-	} else if ( (*p) >= 45 )
-		goto st0;
-	goto tr9;
-tr9:
-#line 339 "parser.rl"
-	{ p--; {p++; cs = 9; goto _out;} }
-	goto st9;
-st9:
-	if ( ++p == pe )
-		goto _test_eof9;
-case 9:
-#line 1072 "parser.c"
-	goto st0;
-st5:
-	if ( ++p == pe )
-		goto _test_eof5;
-case 5:
-	switch( (*p) ) {
-		case 43: goto st6;
-		case 45: goto st6;
-	}
-	if ( 48 <= (*p) && (*p) <= 57 )
-		goto st10;
-	goto st0;
-st6:
-	if ( ++p == pe )
-		goto _test_eof6;
-case 6:
-	if ( 48 <= (*p) && (*p) <= 57 )
-		goto st10;
-	goto st0;
-st10:
-	if ( ++p == pe )
-		goto _test_eof10;
-case 10:
-	switch( (*p) ) {
-		case 69: goto st0;
-		case 101: goto st0;
-	}
-	if ( (*p) > 46 ) {
-		if ( 48 <= (*p) && (*p) <= 57 )
-			goto st10;
-	} else if ( (*p) >= 45 )
-		goto st0;
-	goto tr9;
-st7:
-	if ( ++p == pe )
-		goto _test_eof7;
-case 7:
-	switch( (*p) ) {
-		case 46: goto st4;
-		case 69: goto st5;
-		case 101: goto st5;
-	}
-	if ( 48 <= (*p) && (*p) <= 57 )
-		goto st7;
-	goto st0;
-	}
-	_test_eof2: cs = 2; goto _test_eof;
-	_test_eof3: cs = 3; goto _test_eof;
-	_test_eof4: cs = 4; goto _test_eof;
-	_test_eof8: cs = 8; goto _test_eof;
-	_test_eof9: cs = 9; goto _test_eof;
-	_test_eof5: cs = 5; goto _test_eof;
-	_test_eof6: cs = 6; goto _test_eof;
-	_test_eof10: cs = 10; goto _test_eof;
-	_test_eof7: cs = 7; goto _test_eof;
-
-	_test_eof: {}
-	_out: {}
-	}
-
-#line 354 "parser.rl"
-
-    if (cs >= JSON_float_first_final) {
-        VALUE mod = Qnil;
-        ID method_id = 0;
-        if (rb_respond_to(json->decimal_class, i_try_convert)) {
-            mod = json->decimal_class;
-            method_id = i_try_convert;
-        } else if (rb_respond_to(json->decimal_class, i_new)) {
-            mod = json->decimal_class;
-            method_id = i_new;
-        } else if (RB_TYPE_P(json->decimal_class, T_CLASS)) {
-            VALUE name = rb_class_name(json->decimal_class);
-            const char *name_cstr = RSTRING_PTR(name);
-            const char *last_colon = strrchr(name_cstr, ':');
-            if (last_colon) {
-                const char *mod_path_end = last_colon - 1;
-                VALUE mod_path = rb_str_substr(name, 0, mod_path_end - name_cstr);
-                mod = rb_path_to_class(mod_path);
-
-                const char *method_name_beg = last_colon + 1;
-                long before_len = method_name_beg - name_cstr;
-                long len = RSTRING_LEN(name) - before_len;
-                VALUE method_name = rb_str_substr(name, before_len, len);
-                method_id = SYM2ID(rb_str_intern(method_name));
-            } else {
-                mod = rb_mKernel;
-                method_id = SYM2ID(rb_str_intern(name));
-            }
+#elif defined(HAVE_SIMD_SSE2)
+    if (simd_impl == SIMD_SSE2) {
+        int mask = 0;
+        if (string_scan_simd_sse2(&state->cursor, state->end, &mask)) {
+            state->cursor += trailing_zeros(mask);
+            return 1;
         }
+    }
+#endif /* HAVE_SIMD_NEON or HAVE_SIMD_SSE2 */
+#endif /* HAVE_SIMD */
 
-        long len = p - json->memo;
-        fbuffer_clear(json->fbuffer);
-        fbuffer_append(json->fbuffer, json->memo, len);
-        fbuffer_append_char(json->fbuffer, '\0');
+    while (state->cursor < state->end) {
+        if (RB_UNLIKELY(string_scan_table[(unsigned char)*state->cursor])) {
+            return 1;
+        }
+        *state->cursor++;
+    }
+    return 0;
+}
 
-        if (method_id) {
-            VALUE text = rb_str_new2(FBUFFER_PTR(json->fbuffer));
-            *result = rb_funcallv(mod, method_id, 1, &text);
-        } else {
-            *result = DBL2NUM(rb_cstr_to_dbl(FBUFFER_PTR(json->fbuffer), 1));
+static inline VALUE json_parse_string(JSON_ParserState *state, JSON_ParserConfig *config, bool is_name)
+{
+    state->cursor++;
+    const char *start = state->cursor;
+    bool escaped = false;
+
+    while (RB_UNLIKELY(string_scan(state))) {
+        switch (*state->cursor) {
+            case '"': {
+                VALUE string = json_decode_string(state, config, start, state->cursor, escaped, is_name);
+                state->cursor++;
+                return json_push_value(state, config, string);
+            }
+            case '\\': {
+                state->cursor++;
+                escaped = true;
+                if ((unsigned char)*state->cursor < 0x20) {
+                    raise_parse_error("invalid ASCII control character in string: %s", state);
+                }
+                break;
+            }
+            default:
+                raise_parse_error("invalid ASCII control character in string: %s", state);
+                break;
         }
 
-        return p + 1;
-    } else {
-        return NULL;
+        state->cursor++;
     }
+
+    raise_parse_error("unexpected end of input, expected closing \"", state);
+    return Qfalse;
 }
 
+static VALUE json_parse_any(JSON_ParserState *state, JSON_ParserConfig *config)
+{
+    json_eat_whitespace(state);
+    if (state->cursor >= state->end) {
+        raise_parse_error("unexpected end of input", state);
+    }
 
+    switch (*state->cursor) {
+        case 'n':
+            if ((state->end - state->cursor >= 4) && (memcmp(state->cursor, "null", 4) == 0)) {
+                state->cursor += 4;
+                return json_push_value(state, config, Qnil);
+            }
 
-#line 1184 "parser.c"
-enum {JSON_array_start = 1};
-enum {JSON_array_first_final = 17};
-enum {JSON_array_error = 0};
+            raise_parse_error("unexpected token %s", state);
+            break;
+        case 't':
+            if ((state->end - state->cursor >= 4) && (memcmp(state->cursor, "true", 4) == 0)) {
+                state->cursor += 4;
+                return json_push_value(state, config, Qtrue);
+            }
 
-enum {JSON_array_en_main = 1};
+            raise_parse_error("unexpected token %s", state);
+            break;
+        case 'f':
+            // Note: memcmp with a small power of two compile to an integer comparison
+            if ((state->end - state->cursor >= 5) && (memcmp(state->cursor + 1, "alse", 4) == 0)) {
+                state->cursor += 5;
+                return json_push_value(state, config, Qfalse);
+            }
 
+            raise_parse_error("unexpected token %s", state);
+            break;
+        case 'N':
+            // Note: memcmp with a small power of two compile to an integer comparison
+            if (config->allow_nan && (state->end - state->cursor >= 3) && (memcmp(state->cursor + 1, "aN", 2) == 0)) {
+                state->cursor += 3;
+                return json_push_value(state, config, CNaN);
+            }
 
-#line 432 "parser.rl"
+            raise_parse_error("unexpected token %s", state);
+            break;
+        case 'I':
+            if (config->allow_nan && (state->end - state->cursor >= 8) && (memcmp(state->cursor, "Infinity", 8) == 0)) {
+                state->cursor += 8;
+                return json_push_value(state, config, CInfinity);
+            }
 
+            raise_parse_error("unexpected token %s", state);
+            break;
+        case '-':
+            // Note: memcmp with a small power of two compile to an integer comparison
+            if ((state->end - state->cursor >= 9) && (memcmp(state->cursor + 1, "Infinity", 8) == 0)) {
+                if (config->allow_nan) {
+                    state->cursor += 9;
+                    return json_push_value(state, config, CMinusInfinity);
+                } else {
+                    raise_parse_error("unexpected token %s", state);
+                }
+            }
+            // Fallthrough
+        case '0': case '1': case '2': case '3': case '4': case '5': case '6': case '7': case '8': case '9': {
+            bool integer = true;
 
-static char *JSON_parse_array(JSON_Parser *json, char *p, char *pe, VALUE *result, int current_nesting)
-{
-    int cs = EVIL;
-    VALUE array_class = json->array_class;
+            // /\A-?(0|[1-9]\d*)(\.\d+)?([Ee][-+]?\d+)?/
+            const char *start = state->cursor;
+            state->cursor++;
 
-    if (json->max_nesting && current_nesting > json->max_nesting) {
-        rb_raise(eNestingError, "nesting of %d is too deep", current_nesting);
-    }
-    *result = NIL_P(array_class) ? rb_ary_new() : rb_class_new_instance(0, 0, array_class);
-
-
-#line 1206 "parser.c"
-	{
-	cs = JSON_array_start;
-	}
-
-#line 445 "parser.rl"
-
-#line 1213 "parser.c"
-	{
-	if ( p == pe )
-		goto _test_eof;
-	switch ( cs )
-	{
-case 1:
-	if ( (*p) == 91 )
-		goto st2;
-	goto st0;
-st0:
-cs = 0;
-	goto _out;
-st2:
-	if ( ++p == pe )
-		goto _test_eof2;
-case 2:
-	switch( (*p) ) {
-		case 13: goto st2;
-		case 32: goto st2;
-		case 34: goto tr2;
-		case 45: goto tr2;
-		case 47: goto st13;
-		case 73: goto tr2;
-		case 78: goto tr2;
-		case 91: goto tr2;
-		case 93: goto tr4;
-		case 102: goto tr2;
-		case 110: goto tr2;
-		case 116: goto tr2;
-		case 123: goto tr2;
-	}
-	if ( (*p) > 10 ) {
-		if ( 48 <= (*p) && (*p) <= 57 )
-			goto tr2;
-	} else if ( (*p) >= 9 )
-		goto st2;
-	goto st0;
-tr2:
-#line 409 "parser.rl"
-	{
-        VALUE v = Qnil;
-        char *np = JSON_parse_value(json, p, pe, &v, current_nesting);
-        if (np == NULL) {
-            p--; {p++; cs = 3; goto _out;}
-        } else {
-            if (NIL_P(json->array_class)) {
-                rb_ary_push(*result, v);
-            } else {
-                rb_funcall(*result, i_leftshift, 1, v);
+            while ((state->cursor < state->end) && (*state->cursor >= '0') && (*state->cursor <= '9')) {
+                state->cursor++;
             }
-            {p = (( np))-1;}
-        }
-    }
-	goto st3;
-st3:
-	if ( ++p == pe )
-		goto _test_eof3;
-case 3:
-#line 1272 "parser.c"
-	switch( (*p) ) {
-		case 13: goto st3;
-		case 32: goto st3;
-		case 44: goto st4;
-		case 47: goto st9;
-		case 93: goto tr4;
-	}
-	if ( 9 <= (*p) && (*p) <= 10 )
-		goto st3;
-	goto st0;
-st4:
-	if ( ++p == pe )
-		goto _test_eof4;
-case 4:
-	switch( (*p) ) {
-		case 13: goto st4;
-		case 32: goto st4;
-		case 34: goto tr2;
-		case 45: goto tr2;
-		case 47: goto st5;
-		case 73: goto tr2;
-		case 78: goto tr2;
-		case 91: goto tr2;
-		case 102: goto tr2;
-		case 110: goto tr2;
-		case 116: goto tr2;
-		case 123: goto tr2;
-	}
-	if ( (*p) > 10 ) {
-		if ( 48 <= (*p) && (*p) <= 57 )
-			goto tr2;
-	} else if ( (*p) >= 9 )
-		goto st4;
-	goto st0;
-st5:
-	if ( ++p == pe )
-		goto _test_eof5;
-case 5:
-	switch( (*p) ) {
-		case 42: goto st6;
-		case 47: goto st8;
-	}
-	goto st0;
-st6:
-	if ( ++p == pe )
-		goto _test_eof6;
-case 6:
-	if ( (*p) == 42 )
-		goto st7;
-	goto st6;
-st7:
-	if ( ++p == pe )
-		goto _test_eof7;
-case 7:
-	switch( (*p) ) {
-		case 42: goto st7;
-		case 47: goto st4;
-	}
-	goto st6;
-st8:
-	if ( ++p == pe )
-		goto _test_eof8;
-case 8:
-	if ( (*p) == 10 )
-		goto st4;
-	goto st8;
-st9:
-	if ( ++p == pe )
-		goto _test_eof9;
-case 9:
-	switch( (*p) ) {
-		case 42: goto st10;
-		case 47: goto st12;
-	}
-	goto st0;
-st10:
-	if ( ++p == pe )
-		goto _test_eof10;
-case 10:
-	if ( (*p) == 42 )
-		goto st11;
-	goto st10;
-st11:
-	if ( ++p == pe )
-		goto _test_eof11;
-case 11:
-	switch( (*p) ) {
-		case 42: goto st11;
-		case 47: goto st3;
-	}
-	goto st10;
-st12:
-	if ( ++p == pe )
-		goto _test_eof12;
-case 12:
-	if ( (*p) == 10 )
-		goto st3;
-	goto st12;
-tr4:
-#line 424 "parser.rl"
-	{ p--; {p++; cs = 17; goto _out;} }
-	goto st17;
-st17:
-	if ( ++p == pe )
-		goto _test_eof17;
-case 17:
-#line 1379 "parser.c"
-	goto st0;
-st13:
-	if ( ++p == pe )
-		goto _test_eof13;
-case 13:
-	switch( (*p) ) {
-		case 42: goto st14;
-		case 47: goto st16;
-	}
-	goto st0;
-st14:
-	if ( ++p == pe )
-		goto _test_eof14;
-case 14:
-	if ( (*p) == 42 )
-		goto st15;
-	goto st14;
-st15:
-	if ( ++p == pe )
-		goto _test_eof15;
-case 15:
-	switch( (*p) ) {
-		case 42: goto st15;
-		case 47: goto st2;
-	}
-	goto st14;
-st16:
-	if ( ++p == pe )
-		goto _test_eof16;
-case 16:
-	if ( (*p) == 10 )
-		goto st2;
-	goto st16;
-	}
-	_test_eof2: cs = 2; goto _test_eof;
-	_test_eof3: cs = 3; goto _test_eof;
-	_test_eof4: cs = 4; goto _test_eof;
-	_test_eof5: cs = 5; goto _test_eof;
-	_test_eof6: cs = 6; goto _test_eof;
-	_test_eof7: cs = 7; goto _test_eof;
-	_test_eof8: cs = 8; goto _test_eof;
-	_test_eof9: cs = 9; goto _test_eof;
-	_test_eof10: cs = 10; goto _test_eof;
-	_test_eof11: cs = 11; goto _test_eof;
-	_test_eof12: cs = 12; goto _test_eof;
-	_test_eof17: cs = 17; goto _test_eof;
-	_test_eof13: cs = 13; goto _test_eof;
-	_test_eof14: cs = 14; goto _test_eof;
-	_test_eof15: cs = 15; goto _test_eof;
-	_test_eof16: cs = 16; goto _test_eof;
-
-	_test_eof: {}
-	_out: {}
-	}
-
-#line 446 "parser.rl"
-
-    if(cs >= JSON_array_first_final) {
-        return p + 1;
-    } else {
-        rb_enc_raise(EXC_ENCODING eParserError, "unexpected token at '%s'", p);
-        return NULL;
-    }
-}
 
-static const size_t MAX_STACK_BUFFER_SIZE = 128;
-static VALUE json_string_unescape(char *string, char *stringEnd, int intern, int symbolize)
-{
-    VALUE result = Qnil;
-    size_t bufferSize = stringEnd - string;
-    char *p = string, *pe = string, *unescape, *bufferStart, *buffer;
-    int unescape_len;
-    char buf[4];
+            long integer_length = state->cursor - start;
 
-    if (bufferSize > MAX_STACK_BUFFER_SIZE) {
-# ifdef HAVE_RB_ENC_INTERNED_STR
-      bufferStart = buffer = ALLOC_N(char, bufferSize ? bufferSize : 1);
-# else
-      bufferStart = buffer = ALLOC_N(char, bufferSize);
-# endif
-    } else {
-# ifdef HAVE_RB_ENC_INTERNED_STR
-      bufferStart = buffer = ALLOCA_N(char, bufferSize ? bufferSize : 1);
-# else
-      bufferStart = buffer = ALLOCA_N(char, bufferSize);
-# endif
-    }
+            if (RB_UNLIKELY(start[0] == '0' && integer_length > 1)) {
+                raise_parse_error_at("invalid number: %s", state, start);
+            } else if (RB_UNLIKELY(integer_length > 2 && start[0] == '-' && start[1] == '0')) {
+                raise_parse_error_at("invalid number: %s", state, start);
+            } else if (RB_UNLIKELY(integer_length == 1 && start[0] == '-')) {
+                raise_parse_error_at("invalid number: %s", state, start);
+            }
+
+            if ((state->cursor < state->end) && (*state->cursor == '.')) {
+                integer = false;
+                state->cursor++;
+
+                if (state->cursor == state->end || *state->cursor < '0' || *state->cursor > '9') {
+                    raise_parse_error("invalid number: %s", state);
+                }
 
-    while (pe < stringEnd) {
-        if (*pe == '\\') {
-            unescape = (char *) "?";
-            unescape_len = 1;
-            if (pe > p) {
-              MEMCPY(buffer, p, char, pe - p);
-              buffer += pe - p;
+                while ((state->cursor < state->end) && (*state->cursor >= '0') && (*state->cursor <= '9')) {
+                    state->cursor++;
+                }
             }
-            switch (*++pe) {
-                case 'n':
-                    unescape = (char *) "\n";
-                    break;
-                case 'r':
-                    unescape = (char *) "\r";
-                    break;
-                case 't':
-                    unescape = (char *) "\t";
-                    break;
-                case '"':
-                    unescape = (char *) "\"";
-                    break;
-                case '\\':
-                    unescape = (char *) "\\";
-                    break;
-                case 'b':
-                    unescape = (char *) "\b";
-                    break;
-                case 'f':
-                    unescape = (char *) "\f";
-                    break;
-                case 'u':
-                    if (pe > stringEnd - 4) {
-                      if (bufferSize > MAX_STACK_BUFFER_SIZE) {
-                        free(bufferStart);
-                      }
-                      rb_enc_raise(
-                        EXC_ENCODING eParserError,
-                        "incomplete unicode character escape sequence at '%s'", p
-                      );
-                    } else {
-                        UTF32 ch = unescape_unicode((unsigned char *) ++pe);
-                        pe += 3;
-                        if (UNI_SUR_HIGH_START == (ch & 0xFC00)) {
-                            pe++;
-                            if (pe > stringEnd - 6) {
-                              if (bufferSize > MAX_STACK_BUFFER_SIZE) {
-                                free(bufferStart);
-                              }
-                              rb_enc_raise(
-                                EXC_ENCODING eParserError,
-                                "incomplete surrogate pair at '%s'", p
-                                );
-                            }
-                            if (pe[0] == '\\' && pe[1] == 'u') {
-                                UTF32 sur = unescape_unicode((unsigned char *) pe + 2);
-                                ch = (((ch & 0x3F) << 10) | ((((ch >> 6) & 0xF) + 1) << 16)
-                                        | (sur & 0x3FF));
-                                pe += 5;
-                            } else {
-                                unescape = (char *) "?";
-                                break;
+
+            if ((state->cursor < state->end) && ((*state->cursor == 'e') || (*state->cursor == 'E'))) {
+                integer = false;
+                state->cursor++;
+                if ((state->cursor < state->end) && ((*state->cursor == '+') || (*state->cursor == '-'))) {
+                    state->cursor++;
+                }
+
+                if (state->cursor == state->end || *state->cursor < '0' || *state->cursor > '9') {
+                    raise_parse_error("invalid number: %s", state);
+                }
+
+                while ((state->cursor < state->end) && (*state->cursor >= '0') && (*state->cursor <= '9')) {
+                    state->cursor++;
+                }
+            }
+
+            if (integer) {
+                return json_push_value(state, config, json_decode_integer(start, state->cursor));
+            }
+            return json_push_value(state, config, json_decode_float(config, start, state->cursor));
+        }
+        case '"': {
+            // %r{\A"[^"\\\t\n\x00]*(?:\\[bfnrtu\\/"][^"\\]*)*"}
+            return json_parse_string(state, config, false);
+            break;
+        }
+        case '[': {
+            state->cursor++;
+            json_eat_whitespace(state);
+            long stack_head = state->stack->head;
+
+            if ((state->cursor < state->end) && (*state->cursor == ']')) {
+                state->cursor++;
+                return json_push_value(state, config, json_decode_array(state, config, 0));
+            } else {
+                state->current_nesting++;
+                if (RB_UNLIKELY(config->max_nesting && (config->max_nesting < state->current_nesting))) {
+                    rb_raise(eNestingError, "nesting of %d is too deep", state->current_nesting);
+                }
+                state->in_array++;
+                json_parse_any(state, config);
+            }
+
+            while (true) {
+                json_eat_whitespace(state);
+
+                if (state->cursor < state->end) {
+                    if (*state->cursor == ']') {
+                        state->cursor++;
+                        long count = state->stack->head - stack_head;
+                        state->current_nesting--;
+                        state->in_array--;
+                        return json_push_value(state, config, json_decode_array(state, config, count));
+                    }
+
+                    if (*state->cursor == ',') {
+                        state->cursor++;
+                        if (config->allow_trailing_comma) {
+                            json_eat_whitespace(state);
+                            if ((state->cursor < state->end) && (*state->cursor == ']')) {
+                                continue;
                             }
                         }
-                        unescape_len = convert_UTF32_to_UTF8(buf, ch);
-                        unescape = buf;
+                        json_parse_any(state, config);
+                        continue;
                     }
-                    break;
-                default:
-                    p = pe;
-                    continue;
+                }
+
+                raise_parse_error("expected ',' or ']' after array value", state);
             }
-            MEMCPY(buffer, unescape, char, unescape_len);
-            buffer += unescape_len;
-            p = ++pe;
-        } else {
-            pe++;
+            break;
         }
-    }
+        case '{': {
+            const char *object_start_cursor = state->cursor;
 
-    if (pe > p) {
-      MEMCPY(buffer, p, char, pe - p);
-      buffer += pe - p;
-    }
+            state->cursor++;
+            json_eat_whitespace(state);
+            long stack_head = state->stack->head;
 
-# ifdef HAVE_RB_ENC_INTERNED_STR
-      if (intern) {
-        result = rb_enc_interned_str(bufferStart, (long)(buffer - bufferStart), rb_utf8_encoding());
-      } else {
-        result = rb_utf8_str_new(bufferStart, (long)(buffer - bufferStart));
-      }
-      if (bufferSize > MAX_STACK_BUFFER_SIZE) {
-        free(bufferStart);
-      }
-# else
-      result = rb_utf8_str_new(bufferStart, (long)(buffer - bufferStart));
+            if ((state->cursor < state->end) && (*state->cursor == '}')) {
+                state->cursor++;
+                return json_push_value(state, config, json_decode_object(state, config, 0));
+            } else {
+                state->current_nesting++;
+                if (RB_UNLIKELY(config->max_nesting && (config->max_nesting < state->current_nesting))) {
+                    rb_raise(eNestingError, "nesting of %d is too deep", state->current_nesting);
+                }
 
-      if (bufferSize > MAX_STACK_BUFFER_SIZE) {
-        free(bufferStart);
-      }
+                if (*state->cursor != '"') {
+                    raise_parse_error("expected object key, got %s", state);
+                }
+                json_parse_string(state, config, true);
 
-      if (intern) {
-  # if STR_UMINUS_DEDUPE_FROZEN
-        // Starting from MRI 2.8 it is preferable to freeze the string
-        // before deduplication so that it can be interned directly
-        // otherwise it would be duplicated first which is wasteful.
-        result = rb_funcall(rb_str_freeze(result), i_uminus, 0);
-  # elif STR_UMINUS_DEDUPE
-        // MRI 2.5 and older do not deduplicate strings that are already
-        // frozen.
-        result = rb_funcall(result, i_uminus, 0);
-  # else
-        result = rb_str_freeze(result);
-  # endif
-      }
-# endif
+                json_eat_whitespace(state);
+                if ((state->cursor >= state->end) || (*state->cursor != ':')) {
+                    raise_parse_error("expected ':' after object key", state);
+                }
+                state->cursor++;
 
-    if (symbolize) {
-      result = rb_str_intern(result);
-    }
+                json_parse_any(state, config);
+            }
 
-    return result;
-}
+            while (true) {
+                json_eat_whitespace(state);
 
+                if (state->cursor < state->end) {
+                    if (*state->cursor == '}') {
+                        state->cursor++;
+                        state->current_nesting--;
+                        size_t count = state->stack->head - stack_head;
 
-#line 1592 "parser.c"
-enum {JSON_string_start = 1};
-enum {JSON_string_first_final = 8};
-enum {JSON_string_error = 0};
+                        // Temporary rewind cursor in case an error is raised
+                        const char *final_cursor = state->cursor;
+                        state->cursor = object_start_cursor;
+                        VALUE object = json_decode_object(state, config, count);
+                        state->cursor = final_cursor;
 
-enum {JSON_string_en_main = 1};
+                        return json_push_value(state, config, object);
+                    }
 
+                    if (*state->cursor == ',') {
+                        state->cursor++;
+                        json_eat_whitespace(state);
 
-#line 620 "parser.rl"
+                        if (config->allow_trailing_comma) {
+                            if ((state->cursor < state->end) && (*state->cursor == '}')) {
+                                continue;
+                            }
+                        }
 
+                        if (*state->cursor != '"') {
+                            raise_parse_error("expected object key, got: %s", state);
+                        }
+                        json_parse_string(state, config, true);
 
-static int
-match_i(VALUE regexp, VALUE klass, VALUE memo)
-{
-    if (regexp == Qundef) return ST_STOP;
-    if (RTEST(rb_funcall(klass, i_json_creatable_p, 0)) &&
-      RTEST(rb_funcall(regexp, i_match, 1, rb_ary_entry(memo, 0)))) {
-        rb_ary_push(memo, klass);
-        return ST_STOP;
-    }
-    return ST_CONTINUE;
-}
+                        json_eat_whitespace(state);
+                        if ((state->cursor >= state->end) || (*state->cursor != ':')) {
+                            raise_parse_error("expected ':' after object key, got: %s", state);
+                        }
+                        state->cursor++;
 
-static char *JSON_parse_string(JSON_Parser *json, char *p, char *pe, VALUE *result)
-{
-    int cs = EVIL;
-    VALUE match_string;
-
-
-#line 1621 "parser.c"
-	{
-	cs = JSON_string_start;
-	}
-
-#line 640 "parser.rl"
-    json->memo = p;
-
-#line 1629 "parser.c"
-	{
-	if ( p == pe )
-		goto _test_eof;
-	switch ( cs )
-	{
-case 1:
-	if ( (*p) == 34 )
-		goto st2;
-	goto st0;
-st0:
-cs = 0;
-	goto _out;
-st2:
-	if ( ++p == pe )
-		goto _test_eof2;
-case 2:
-	switch( (*p) ) {
-		case 34: goto tr2;
-		case 92: goto st3;
-	}
-	if ( 0 <= (signed char)(*(p)) && (*(p)) <= 31 )
-		goto st0;
-	goto st2;
-tr2:
-#line 607 "parser.rl"
-	{
-        *result = json_string_unescape(json->memo + 1, p, json->parsing_name || json-> freeze, json->parsing_name && json->symbolize_names);
-        if (NIL_P(*result)) {
-            p--;
-            {p++; cs = 8; goto _out;}
-        } else {
-            {p = (( p + 1))-1;}
+                        json_parse_any(state, config);
+
+                        continue;
+                    }
+                }
+
+                raise_parse_error("expected ',' or '}' after object value, got: %s", state);
+            }
+            break;
         }
-    }
-#line 617 "parser.rl"
-	{ p--; {p++; cs = 8; goto _out;} }
-	goto st8;
-st8:
-	if ( ++p == pe )
-		goto _test_eof8;
-case 8:
-#line 1671 "parser.c"
-	goto st0;
-st3:
-	if ( ++p == pe )
-		goto _test_eof3;
-case 3:
-	if ( (*p) == 117 )
-		goto st4;
-	if ( 0 <= (signed char)(*(p)) && (*(p)) <= 31 )
-		goto st0;
-	goto st2;
-st4:
-	if ( ++p == pe )
-		goto _test_eof4;
-case 4:
-	if ( (*p) < 65 ) {
-		if ( 48 <= (*p) && (*p) <= 57 )
-			goto st5;
-	} else if ( (*p) > 70 ) {
-		if ( 97 <= (*p) && (*p) <= 102 )
-			goto st5;
-	} else
-		goto st5;
-	goto st0;
-st5:
-	if ( ++p == pe )
-		goto _test_eof5;
-case 5:
-	if ( (*p) < 65 ) {
-		if ( 48 <= (*p) && (*p) <= 57 )
-			goto st6;
-	} else if ( (*p) > 70 ) {
-		if ( 97 <= (*p) && (*p) <= 102 )
-			goto st6;
-	} else
-		goto st6;
-	goto st0;
-st6:
-	if ( ++p == pe )
-		goto _test_eof6;
-case 6:
-	if ( (*p) < 65 ) {
-		if ( 48 <= (*p) && (*p) <= 57 )
-			goto st7;
-	} else if ( (*p) > 70 ) {
-		if ( 97 <= (*p) && (*p) <= 102 )
-			goto st7;
-	} else
-		goto st7;
-	goto st0;
-st7:
-	if ( ++p == pe )
-		goto _test_eof7;
-case 7:
-	if ( (*p) < 65 ) {
-		if ( 48 <= (*p) && (*p) <= 57 )
-			goto st2;
-	} else if ( (*p) > 70 ) {
-		if ( 97 <= (*p) && (*p) <= 102 )
-			goto st2;
-	} else
-		goto st2;
-	goto st0;
-	}
-	_test_eof2: cs = 2; goto _test_eof;
-	_test_eof8: cs = 8; goto _test_eof;
-	_test_eof3: cs = 3; goto _test_eof;
-	_test_eof4: cs = 4; goto _test_eof;
-	_test_eof5: cs = 5; goto _test_eof;
-	_test_eof6: cs = 6; goto _test_eof;
-	_test_eof7: cs = 7; goto _test_eof;
-
-	_test_eof: {}
-	_out: {}
-	}
-
-#line 642 "parser.rl"
-
-    if (json->create_additions && RTEST(match_string = json->match_string)) {
-          VALUE klass;
-          VALUE memo = rb_ary_new2(2);
-          rb_ary_push(memo, *result);
-          rb_hash_foreach(match_string, match_i, memo);
-          klass = rb_ary_entry(memo, 1);
-          if (RTEST(klass)) {
-              *result = rb_funcall(klass, i_json_create, 1, *result);
-          }
+
+        default:
+            raise_parse_error("unexpected character: %s", state);
+            break;
     }
 
-    if (cs >= JSON_string_first_final) {
-        return p + 1;
-    } else {
-        return NULL;
+    raise_parse_error("unreacheable: %s", state);
+}
+
+static void json_ensure_eof(JSON_ParserState *state)
+{
+    json_eat_whitespace(state);
+    if (state->cursor != state->end) {
+        raise_parse_error("unexpected token at end of stream %s", state);
     }
 }
 
@@ -1777,24 +1245,83 @@ case 7:
 
 static VALUE convert_encoding(VALUE source)
 {
-#ifdef HAVE_RUBY_ENCODING_H
-  rb_encoding *enc = rb_enc_get(source);
-  if (enc == rb_ascii8bit_encoding()) {
-    if (OBJ_FROZEN(source)) {
-      source = rb_str_dup(source);
-    }
-    FORCE_UTF8(source);
-  } else {
-    source = rb_str_conv_enc(source, rb_enc_get(source), rb_utf8_encoding());
-  }
-#endif
+  int encindex = RB_ENCODING_GET(source);
+
+  if (RB_LIKELY(encindex == utf8_encindex)) {
     return source;
+  }
+
+ if (encindex == binary_encindex) {
+    // For historical reason, we silently reinterpret binary strings as UTF-8
+    return rb_enc_associate_index(rb_str_dup(source), utf8_encindex);
+  }
+
+  return rb_funcall(source, i_encode, 1, Encoding_UTF_8);
+}
+
+static int parser_config_init_i(VALUE key, VALUE val, VALUE data)
+{
+    JSON_ParserConfig *config = (JSON_ParserConfig *)data;
+
+         if (key == sym_max_nesting)          { config->max_nesting = RTEST(val) ? FIX2INT(val) : 0; }
+    else if (key == sym_allow_nan)            { config->allow_nan = RTEST(val); }
+    else if (key == sym_allow_trailing_comma) { config->allow_trailing_comma = RTEST(val); }
+    else if (key == sym_symbolize_names)      { config->symbolize_names = RTEST(val); }
+    else if (key == sym_freeze)               { config->freeze = RTEST(val); }
+    else if (key == sym_on_load)              { config->on_load_proc = RTEST(val) ? val : Qfalse; }
+    else if (key == sym_allow_duplicate_key) { config->on_duplicate_key = RTEST(val) ? JSON_IGNORE : JSON_RAISE; }
+    else if (key == sym_decimal_class)        {
+        if (RTEST(val)) {
+            if (rb_respond_to(val, i_try_convert)) {
+                config->decimal_class = val;
+                config->decimal_method_id = i_try_convert;
+            } else if (rb_respond_to(val, i_new)) {
+                config->decimal_class = val;
+                config->decimal_method_id = i_new;
+            } else if (RB_TYPE_P(val, T_CLASS)) {
+                VALUE name = rb_class_name(val);
+                const char *name_cstr = RSTRING_PTR(name);
+                const char *last_colon = strrchr(name_cstr, ':');
+                if (last_colon) {
+                    const char *mod_path_end = last_colon - 1;
+                    VALUE mod_path = rb_str_substr(name, 0, mod_path_end - name_cstr);
+                    config->decimal_class = rb_path_to_class(mod_path);
+
+                    const char *method_name_beg = last_colon + 1;
+                    long before_len = method_name_beg - name_cstr;
+                    long len = RSTRING_LEN(name) - before_len;
+                    VALUE method_name = rb_str_substr(name, before_len, len);
+                    config->decimal_method_id = SYM2ID(rb_str_intern(method_name));
+                } else {
+                    config->decimal_class = rb_mKernel;
+                    config->decimal_method_id = SYM2ID(rb_str_intern(name));
+                }
+            }
+        }
+    }
+
+    return ST_CONTINUE;
+}
+
+static void parser_config_init(JSON_ParserConfig *config, VALUE opts)
+{
+    config->max_nesting = 100;
+
+    if (!NIL_P(opts)) {
+        Check_Type(opts, T_HASH);
+        if (RHASH_SIZE(opts) > 0) {
+            // We assume in most cases few keys are set so it's faster to go over
+            // the provided keys than to check all possible keys.
+            rb_hash_foreach(opts, parser_config_init_i, (VALUE)config);
+        }
+
+    }
 }
 
 /*
- * call-seq: new(source, opts => {})
+ * call-seq: new(opts => {})
  *
- * Creates a new JSON::Ext::Parser instance for the string _source_.
+ * Creates a new JSON::Ext::ParserConfig instance.
  *
  * It will be configured by the _opts_ hash. _opts_ can have the following
  * keys:
@@ -1810,343 +1337,114 @@ static VALUE convert_encoding(VALUE source)
  *   (keys) in a JSON object. Otherwise strings are returned, which is
  *   also the default. It's not possible to use this option in
  *   conjunction with the *create_additions* option.
- * * *create_additions*: If set to false, the Parser doesn't create
- *   additions even if a matching class and create_id was found. This option
- *   defaults to false.
- * * *object_class*: Defaults to Hash
- * * *array_class*: Defaults to Array
+ * * *decimal_class*: Specifies which class to use instead of the default
+ *    (Float) when parsing decimal numbers. This class must accept a single
+ *    string argument in its constructor.
  */
-static VALUE cParser_initialize(int argc, VALUE *argv, VALUE self)
+static VALUE cParserConfig_initialize(VALUE self, VALUE opts)
 {
-    VALUE source, opts;
-    GET_PARSER_INIT;
+    GET_PARSER_CONFIG;
+
+    parser_config_init(config, opts);
+
+    RB_OBJ_WRITTEN(self, Qundef, config->decimal_class);
 
-    if (json->Vsource) {
-        rb_raise(rb_eTypeError, "already initialized instance");
-    }
-    rb_scan_args(argc, argv, "1:", &source, &opts);
-    if (!NIL_P(opts)) {
-	VALUE tmp = ID2SYM(i_max_nesting);
-	if (option_given_p(opts, tmp)) {
-	    VALUE max_nesting = rb_hash_aref(opts, tmp);
-	    if (RTEST(max_nesting)) {
-		Check_Type(max_nesting, T_FIXNUM);
-		json->max_nesting = FIX2INT(max_nesting);
-	    } else {
-		json->max_nesting = 0;
-	    }
-	} else {
-	    json->max_nesting = 100;
-	}
-	tmp = ID2SYM(i_allow_nan);
-	if (option_given_p(opts, tmp)) {
-	    json->allow_nan = RTEST(rb_hash_aref(opts, tmp)) ? 1 : 0;
-	} else {
-	    json->allow_nan = 0;
-	}
-	tmp = ID2SYM(i_symbolize_names);
-	if (option_given_p(opts, tmp)) {
-	    json->symbolize_names = RTEST(rb_hash_aref(opts, tmp)) ? 1 : 0;
-	} else {
-	    json->symbolize_names = 0;
-	}
-	tmp = ID2SYM(i_freeze);
-	if (option_given_p(opts, tmp)) {
-	    json->freeze = RTEST(rb_hash_aref(opts, tmp)) ? 1 : 0;
-	} else {
-	    json->freeze = 0;
-	}
-	tmp = ID2SYM(i_create_additions);
-	if (option_given_p(opts, tmp)) {
-	    json->create_additions = RTEST(rb_hash_aref(opts, tmp));
-	} else {
-	    json->create_additions = 0;
-	}
-	if (json->symbolize_names && json->create_additions) {
-	    rb_raise(rb_eArgError,
-		     "options :symbolize_names and :create_additions cannot be "
-		     " used in conjunction");
-	}
-	tmp = ID2SYM(i_create_id);
-	if (option_given_p(opts, tmp)) {
-	    json->create_id = rb_hash_aref(opts, tmp);
-	} else {
-	    json->create_id = rb_funcall(mJSON, i_create_id, 0);
-	}
-	tmp = ID2SYM(i_object_class);
-	if (option_given_p(opts, tmp)) {
-	    json->object_class = rb_hash_aref(opts, tmp);
-	} else {
-	    json->object_class = Qnil;
-	}
-	tmp = ID2SYM(i_array_class);
-	if (option_given_p(opts, tmp)) {
-	    json->array_class = rb_hash_aref(opts, tmp);
-	} else {
-	    json->array_class = Qnil;
-	}
-	tmp = ID2SYM(i_decimal_class);
-	if (option_given_p(opts, tmp)) {
-	    json->decimal_class = rb_hash_aref(opts, tmp);
-	} else {
-	    json->decimal_class = Qnil;
-	}
-	tmp = ID2SYM(i_match_string);
-	if (option_given_p(opts, tmp)) {
-	    VALUE match_string = rb_hash_aref(opts, tmp);
-	    json->match_string = RTEST(match_string) ? match_string : Qnil;
-	} else {
-	    json->match_string = Qnil;
-	}
-    } else {
-        json->max_nesting = 100;
-        json->allow_nan = 0;
-        json->create_additions = 0;
-        json->create_id = rb_funcall(mJSON, i_create_id, 0);
-        json->object_class = Qnil;
-        json->array_class = Qnil;
-        json->decimal_class = Qnil;
-    }
-    source = convert_encoding(StringValue(source));
-    StringValue(source);
-    json->len = RSTRING_LEN(source);
-    json->source = RSTRING_PTR(source);;
-    json->Vsource = source;
     return self;
 }
 
+static VALUE cParser_parse(JSON_ParserConfig *config, VALUE Vsource)
+{
+    Vsource = convert_encoding(StringValue(Vsource));
+    StringValue(Vsource);
+
+    VALUE rvalue_stack_buffer[RVALUE_STACK_INITIAL_CAPA];
+    rvalue_stack stack = {
+        .type = RVALUE_STACK_STACK_ALLOCATED,
+        .ptr = rvalue_stack_buffer,
+        .capa = RVALUE_STACK_INITIAL_CAPA,
+    };
+
+    long len;
+    const char *start;
+    RSTRING_GETMEM(Vsource, start, len);
 
-#line 1920 "parser.c"
-enum {JSON_start = 1};
-enum {JSON_first_final = 10};
-enum {JSON_error = 0};
+    JSON_ParserState _state = {
+        .start = start,
+        .cursor = start,
+        .end = start + len,
+        .stack = &stack,
+    };
+    JSON_ParserState *state = &_state;
 
-enum {JSON_en_main = 1};
+    VALUE result = json_parse_any(state, config);
 
+    // This may be skipped in case of exception, but
+    // it won't cause a leak.
+    rvalue_stack_eagerly_release(state->stack_handle);
 
-#line 828 "parser.rl"
+    json_ensure_eof(state);
 
+    return result;
+}
 
 /*
- * call-seq: parse()
+ * call-seq: parse(source)
  *
  *  Parses the current JSON text _source_ and returns the complete data
  *  structure as a result.
  *  It raises JSON::ParserError if fail to parse.
  */
-static VALUE cParser_parse(VALUE self)
+static VALUE cParserConfig_parse(VALUE self, VALUE Vsource)
 {
-  char *p, *pe;
-  int cs = EVIL;
-  VALUE result = Qnil;
-  GET_PARSER;
-
-
-#line 1946 "parser.c"
-	{
-	cs = JSON_start;
-	}
-
-#line 845 "parser.rl"
-  p = json->source;
-  pe = p + json->len;
-
-#line 1955 "parser.c"
-	{
-	if ( p == pe )
-		goto _test_eof;
-	switch ( cs )
-	{
-st1:
-	if ( ++p == pe )
-		goto _test_eof1;
-case 1:
-	switch( (*p) ) {
-		case 13: goto st1;
-		case 32: goto st1;
-		case 34: goto tr2;
-		case 45: goto tr2;
-		case 47: goto st6;
-		case 73: goto tr2;
-		case 78: goto tr2;
-		case 91: goto tr2;
-		case 102: goto tr2;
-		case 110: goto tr2;
-		case 116: goto tr2;
-		case 123: goto tr2;
-	}
-	if ( (*p) > 10 ) {
-		if ( 48 <= (*p) && (*p) <= 57 )
-			goto tr2;
-	} else if ( (*p) >= 9 )
-		goto st1;
-	goto st0;
-st0:
-cs = 0;
-	goto _out;
-tr2:
-#line 820 "parser.rl"
-	{
-        char *np = JSON_parse_value(json, p, pe, &result, 0);
-        if (np == NULL) { p--; {p++; cs = 10; goto _out;} } else {p = (( np))-1;}
-    }
-	goto st10;
-st10:
-	if ( ++p == pe )
-		goto _test_eof10;
-case 10:
-#line 1999 "parser.c"
-	switch( (*p) ) {
-		case 13: goto st10;
-		case 32: goto st10;
-		case 47: goto st2;
-	}
-	if ( 9 <= (*p) && (*p) <= 10 )
-		goto st10;
-	goto st0;
-st2:
-	if ( ++p == pe )
-		goto _test_eof2;
-case 2:
-	switch( (*p) ) {
-		case 42: goto st3;
-		case 47: goto st5;
-	}
-	goto st0;
-st3:
-	if ( ++p == pe )
-		goto _test_eof3;
-case 3:
-	if ( (*p) == 42 )
-		goto st4;
-	goto st3;
-st4:
-	if ( ++p == pe )
-		goto _test_eof4;
-case 4:
-	switch( (*p) ) {
-		case 42: goto st4;
-		case 47: goto st10;
-	}
-	goto st3;
-st5:
-	if ( ++p == pe )
-		goto _test_eof5;
-case 5:
-	if ( (*p) == 10 )
-		goto st10;
-	goto st5;
-st6:
-	if ( ++p == pe )
-		goto _test_eof6;
-case 6:
-	switch( (*p) ) {
-		case 42: goto st7;
-		case 47: goto st9;
-	}
-	goto st0;
-st7:
-	if ( ++p == pe )
-		goto _test_eof7;
-case 7:
-	if ( (*p) == 42 )
-		goto st8;
-	goto st7;
-st8:
-	if ( ++p == pe )
-		goto _test_eof8;
-case 8:
-	switch( (*p) ) {
-		case 42: goto st8;
-		case 47: goto st1;
-	}
-	goto st7;
-st9:
-	if ( ++p == pe )
-		goto _test_eof9;
-case 9:
-	if ( (*p) == 10 )
-		goto st1;
-	goto st9;
-	}
-	_test_eof1: cs = 1; goto _test_eof;
-	_test_eof10: cs = 10; goto _test_eof;
-	_test_eof2: cs = 2; goto _test_eof;
-	_test_eof3: cs = 3; goto _test_eof;
-	_test_eof4: cs = 4; goto _test_eof;
-	_test_eof5: cs = 5; goto _test_eof;
-	_test_eof6: cs = 6; goto _test_eof;
-	_test_eof7: cs = 7; goto _test_eof;
-	_test_eof8: cs = 8; goto _test_eof;
-	_test_eof9: cs = 9; goto _test_eof;
-
-	_test_eof: {}
-	_out: {}
-	}
-
-#line 848 "parser.rl"
-
-  if (cs >= JSON_first_final && p == pe) {
-    return result;
-  } else {
-    rb_enc_raise(EXC_ENCODING eParserError, "unexpected token at '%s'", p);
-    return Qnil;
-  }
+    GET_PARSER_CONFIG;
+    return cParser_parse(config, Vsource);
 }
 
-static void JSON_mark(void *ptr)
+static VALUE cParser_m_parse(VALUE klass, VALUE Vsource, VALUE opts)
 {
-    JSON_Parser *json = ptr;
-    rb_gc_mark_maybe(json->Vsource);
-    rb_gc_mark_maybe(json->create_id);
-    rb_gc_mark_maybe(json->object_class);
-    rb_gc_mark_maybe(json->array_class);
-    rb_gc_mark_maybe(json->decimal_class);
-    rb_gc_mark_maybe(json->match_string);
+    Vsource = convert_encoding(StringValue(Vsource));
+    StringValue(Vsource);
+
+    JSON_ParserConfig _config = {0};
+    JSON_ParserConfig *config = &_config;
+    parser_config_init(config, opts);
+
+    return cParser_parse(config, Vsource);
+}
+
+static void JSON_ParserConfig_mark(void *ptr)
+{
+    JSON_ParserConfig *config = ptr;
+    rb_gc_mark(config->on_load_proc);
+    rb_gc_mark(config->decimal_class);
 }
 
-static void JSON_free(void *ptr)
+static void JSON_ParserConfig_free(void *ptr)
 {
-    JSON_Parser *json = ptr;
-    fbuffer_free(json->fbuffer);
-    ruby_xfree(json);
+    JSON_ParserConfig *config = ptr;
+    ruby_xfree(config);
 }
 
-static size_t JSON_memsize(const void *ptr)
+static size_t JSON_ParserConfig_memsize(const void *ptr)
 {
-    const JSON_Parser *json = ptr;
-    return sizeof(*json) + FBUFFER_CAPA(json->fbuffer);
+    return sizeof(JSON_ParserConfig);
 }
 
-#ifdef NEW_TYPEDDATA_WRAPPER
-static const rb_data_type_t JSON_Parser_type = {
-    "JSON/Parser",
-    {JSON_mark, JSON_free, JSON_memsize,},
-#ifdef RUBY_TYPED_FREE_IMMEDIATELY
+static const rb_data_type_t JSON_ParserConfig_type = {
+    "JSON::Ext::Parser/ParserConfig",
+    {
+        JSON_ParserConfig_mark,
+        JSON_ParserConfig_free,
+        JSON_ParserConfig_memsize,
+    },
     0, 0,
-    RUBY_TYPED_FREE_IMMEDIATELY,
-#endif
+    RUBY_TYPED_FREE_IMMEDIATELY | RUBY_TYPED_WB_PROTECTED,
 };
-#endif
 
 static VALUE cJSON_parser_s_allocate(VALUE klass)
 {
-    JSON_Parser *json;
-    VALUE obj = TypedData_Make_Struct(klass, JSON_Parser, &JSON_Parser_type, json);
-    json->fbuffer = fbuffer_alloc(0);
-    return obj;
-}
-
-/*
- * call-seq: source()
- *
- * Returns a copy of the current _source_ string, that was used to construct
- * this Parser.
- */
-static VALUE cParser_source(VALUE self)
-{
-    GET_PARSER;
-    return rb_str_dup(json->Vsource);
+    JSON_ParserConfig *config;
+    return TypedData_Make_Struct(klass, JSON_ParserConfig, &JSON_ParserConfig_type, config);
 }
 
 void Init_parser(void)
@@ -2158,16 +1456,16 @@ void Init_parser(void)
 #undef rb_intern
     rb_require("json/common");
     mJSON = rb_define_module("JSON");
-    mExt = rb_define_module_under(mJSON, "Ext");
-    cParser = rb_define_class_under(mExt, "Parser", rb_cObject);
-    eParserError = rb_path2class("JSON::ParserError");
+    VALUE mExt = rb_define_module_under(mJSON, "Ext");
+    VALUE cParserConfig = rb_define_class_under(mExt, "ParserConfig", rb_cObject);
     eNestingError = rb_path2class("JSON::NestingError");
-    rb_gc_register_mark_object(eParserError);
     rb_gc_register_mark_object(eNestingError);
-    rb_define_alloc_func(cParser, cJSON_parser_s_allocate);
-    rb_define_method(cParser, "initialize", cParser_initialize, -1);
-    rb_define_method(cParser, "parse", cParser_parse, 0);
-    rb_define_method(cParser, "source", cParser_source, 0);
+    rb_define_alloc_func(cParserConfig, cJSON_parser_s_allocate);
+    rb_define_method(cParserConfig, "initialize", cParserConfig_initialize, 1);
+    rb_define_method(cParserConfig, "parse", cParserConfig_parse, 1);
+
+    VALUE cParser = rb_define_class_under(mExt, "Parser", rb_cObject);
+    rb_define_singleton_method(cParser, "parse", cParser_m_parse, 2);
 
     CNaN = rb_const_get(mJSON, rb_intern("NaN"));
     rb_gc_register_mark_object(CNaN);
@@ -2178,34 +1476,32 @@ void Init_parser(void)
     CMinusInfinity = rb_const_get(mJSON, rb_intern("MinusInfinity"));
     rb_gc_register_mark_object(CMinusInfinity);
 
-    i_json_creatable_p = rb_intern("json_creatable?");
-    i_json_create = rb_intern("json_create");
-    i_create_id = rb_intern("create_id");
-    i_create_additions = rb_intern("create_additions");
+    rb_global_variable(&Encoding_UTF_8);
+    Encoding_UTF_8 = rb_const_get(rb_path2class("Encoding"), rb_intern("UTF_8"));
+
+    sym_max_nesting = ID2SYM(rb_intern("max_nesting"));
+    sym_allow_nan = ID2SYM(rb_intern("allow_nan"));
+    sym_allow_trailing_comma = ID2SYM(rb_intern("allow_trailing_comma"));
+    sym_symbolize_names = ID2SYM(rb_intern("symbolize_names"));
+    sym_freeze = ID2SYM(rb_intern("freeze"));
+    sym_on_load = ID2SYM(rb_intern("on_load"));
+    sym_decimal_class = ID2SYM(rb_intern("decimal_class"));
+    sym_allow_duplicate_key = ID2SYM(rb_intern("allow_duplicate_key"));
+
     i_chr = rb_intern("chr");
-    i_max_nesting = rb_intern("max_nesting");
-    i_allow_nan = rb_intern("allow_nan");
-    i_symbolize_names = rb_intern("symbolize_names");
-    i_object_class = rb_intern("object_class");
-    i_array_class = rb_intern("array_class");
-    i_decimal_class = rb_intern("decimal_class");
-    i_match = rb_intern("match");
-    i_match_string = rb_intern("match_string");
-    i_key_p = rb_intern("key?");
-    i_deep_const_get = rb_intern("deep_const_get");
     i_aset = rb_intern("[]=");
     i_aref = rb_intern("[]");
     i_leftshift = rb_intern("<<");
     i_new = rb_intern("new");
     i_try_convert = rb_intern("try_convert");
-    i_freeze = rb_intern("freeze");
     i_uminus = rb_intern("-@");
-}
+    i_encode = rb_intern("encode");
 
-/*
- * Local variables:
- * mode: c
- * c-file-style: ruby
- * indent-tabs-mode: nil
- * End:
- */
+    binary_encindex = rb_ascii8bit_encindex();
+    utf8_encindex = rb_utf8_encindex();
+    enc_utf8 = rb_utf8_encoding();
+
+#ifdef HAVE_SIMD
+    simd_impl = find_simd_implementation();
+#endif
+}
diff --git a/ext/json/parser/parser.h b/ext/json/parser/parser.h
deleted file mode 100644
index 92ed3fdc5dad3c..00000000000000
--- a/ext/json/parser/parser.h
+++ /dev/null
@@ -1,96 +0,0 @@
-#ifndef _PARSER_H_
-#define _PARSER_H_
-
-#include "ruby.h"
-
-#ifndef HAVE_RUBY_RE_H
-#include "re.h"
-#endif
-
-#ifdef HAVE_RUBY_ST_H
-#include "ruby/st.h"
-#else
-#include "st.h"
-#endif
-
-#ifndef MAYBE_UNUSED
-# define MAYBE_UNUSED(x) x
-#endif
-
-#define option_given_p(opts, key) RTEST(rb_funcall(opts, i_key_p, 1, key))
-
-/* unicode */
-
-typedef unsigned long UTF32;  /* at least 32 bits */
-typedef unsigned short UTF16; /* at least 16 bits */
-typedef unsigned char UTF8;   /* typically 8 bits */
-
-#define UNI_REPLACEMENT_CHAR (UTF32)0x0000FFFD
-#define UNI_SUR_HIGH_START  (UTF32)0xD800
-#define UNI_SUR_HIGH_END    (UTF32)0xDBFF
-#define UNI_SUR_LOW_START   (UTF32)0xDC00
-#define UNI_SUR_LOW_END     (UTF32)0xDFFF
-
-typedef struct JSON_ParserStruct {
-    VALUE Vsource;
-    char *source;
-    long len;
-    char *memo;
-    VALUE create_id;
-    int max_nesting;
-    int allow_nan;
-    int parsing_name;
-    int symbolize_names;
-    int freeze;
-    VALUE object_class;
-    VALUE array_class;
-    VALUE decimal_class;
-    int create_additions;
-    VALUE match_string;
-    FBuffer *fbuffer;
-} JSON_Parser;
-
-#define GET_PARSER                          \
-    GET_PARSER_INIT;                        \
-    if (!json->Vsource) rb_raise(rb_eTypeError, "uninitialized instance")
-#define GET_PARSER_INIT                     \
-    JSON_Parser *json;                      \
-    TypedData_Get_Struct(self, JSON_Parser, &JSON_Parser_type, json)
-
-#define MinusInfinity "-Infinity"
-#define EVIL 0x666
-
-static UTF32 unescape_unicode(const unsigned char *p);
-static int convert_UTF32_to_UTF8(char *buf, UTF32 ch);
-static char *JSON_parse_object(JSON_Parser *json, char *p, char *pe, VALUE *result, int current_nesting);
-static char *JSON_parse_value(JSON_Parser *json, char *p, char *pe, VALUE *result, int current_nesting);
-static char *JSON_parse_integer(JSON_Parser *json, char *p, char *pe, VALUE *result);
-static char *JSON_parse_float(JSON_Parser *json, char *p, char *pe, VALUE *result);
-static char *JSON_parse_array(JSON_Parser *json, char *p, char *pe, VALUE *result, int current_nesting);
-static VALUE json_string_unescape(char *string, char *stringEnd, int intern, int symbolize);
-static char *JSON_parse_string(JSON_Parser *json, char *p, char *pe, VALUE *result);
-static VALUE convert_encoding(VALUE source);
-static VALUE cParser_initialize(int argc, VALUE *argv, VALUE self);
-static VALUE cParser_parse(VALUE self);
-static void JSON_mark(void *json);
-static void JSON_free(void *json);
-static VALUE cJSON_parser_s_allocate(VALUE klass);
-static VALUE cParser_source(VALUE self);
-#ifndef ZALLOC
-#define ZALLOC(type) ((type *)ruby_zalloc(sizeof(type)))
-static inline void *ruby_zalloc(size_t n)
-{
-    void *p = ruby_xmalloc(n);
-    memset(p, 0, n);
-    return p;
-}
-#endif
-#ifdef TypedData_Make_Struct
-static const rb_data_type_t JSON_Parser_type;
-#define NEW_TYPEDDATA_WRAPPER 1
-#else
-#define TypedData_Make_Struct(klass, type, ignore, json) Data_Make_Struct(klass, type, NULL, JSON_free, json)
-#define TypedData_Get_Struct(self, JSON_Parser, ignore, json) Data_Get_Struct(self, JSON_Parser, json)
-#endif
-
-#endif
diff --git a/ext/json/parser/parser.rl b/ext/json/parser/parser.rl
deleted file mode 100644
index 1ecf3317c79bb7..00000000000000
--- a/ext/json/parser/parser.rl
+++ /dev/null
@@ -1,971 +0,0 @@
-#include "../fbuffer/fbuffer.h"
-#include "parser.h"
-
-#if defined HAVE_RUBY_ENCODING_H
-# define EXC_ENCODING rb_utf8_encoding(),
-# ifndef HAVE_RB_ENC_RAISE
-static void
-enc_raise(rb_encoding *enc, VALUE exc, const char *fmt, ...)
-{
-    va_list args;
-    VALUE mesg;
-
-    va_start(args, fmt);
-    mesg = rb_enc_vsprintf(enc, fmt, args);
-    va_end(args);
-
-    rb_exc_raise(rb_exc_new3(exc, mesg));
-}
-#   define rb_enc_raise enc_raise
-# endif
-#else
-# define EXC_ENCODING /* nothing */
-# define rb_enc_raise rb_raise
-#endif
-
-/* unicode */
-
-static const signed char digit_values[256] = {
-    -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-    -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-    -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, -1,
-    -1, -1, -1, -1, -1, -1, 10, 11, 12, 13, 14, 15, -1, -1, -1, -1, -1, -1, -1,
-    -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-    10, 11, 12, 13, 14, 15, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-    -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-    -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-    -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-    -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-    -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-    -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-    -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-    -1, -1, -1, -1, -1, -1, -1
-};
-
-static UTF32 unescape_unicode(const unsigned char *p)
-{
-    signed char b;
-    UTF32 result = 0;
-    b = digit_values[p[0]];
-    if (b < 0) return UNI_REPLACEMENT_CHAR;
-    result = (result << 4) | (unsigned char)b;
-    b = digit_values[p[1]];
-    if (b < 0) return UNI_REPLACEMENT_CHAR;
-    result = (result << 4) | (unsigned char)b;
-    b = digit_values[p[2]];
-    if (b < 0) return UNI_REPLACEMENT_CHAR;
-    result = (result << 4) | (unsigned char)b;
-    b = digit_values[p[3]];
-    if (b < 0) return UNI_REPLACEMENT_CHAR;
-    result = (result << 4) | (unsigned char)b;
-    return result;
-}
-
-static int convert_UTF32_to_UTF8(char *buf, UTF32 ch)
-{
-    int len = 1;
-    if (ch <= 0x7F) {
-        buf[0] = (char) ch;
-    } else if (ch <= 0x07FF) {
-        buf[0] = (char) ((ch >> 6) | 0xC0);
-        buf[1] = (char) ((ch & 0x3F) | 0x80);
-        len++;
-    } else if (ch <= 0xFFFF) {
-        buf[0] = (char) ((ch >> 12) | 0xE0);
-        buf[1] = (char) (((ch >> 6) & 0x3F) | 0x80);
-        buf[2] = (char) ((ch & 0x3F) | 0x80);
-        len += 2;
-    } else if (ch <= 0x1fffff) {
-        buf[0] =(char) ((ch >> 18) | 0xF0);
-        buf[1] =(char) (((ch >> 12) & 0x3F) | 0x80);
-        buf[2] =(char) (((ch >> 6) & 0x3F) | 0x80);
-        buf[3] =(char) ((ch & 0x3F) | 0x80);
-        len += 3;
-    } else {
-        buf[0] = '?';
-    }
-    return len;
-}
-
-static VALUE mJSON, mExt, cParser, eParserError, eNestingError;
-static VALUE CNaN, CInfinity, CMinusInfinity;
-
-static ID i_json_creatable_p, i_json_create, i_create_id, i_create_additions,
-          i_chr, i_max_nesting, i_allow_nan, i_symbolize_names,
-          i_object_class, i_array_class, i_decimal_class, i_key_p,
-          i_deep_const_get, i_match, i_match_string, i_aset, i_aref,
-          i_leftshift, i_new, i_try_convert, i_freeze, i_uminus;
-
-%%{
-    machine JSON_common;
-
-    cr                  = '\n';
-    cr_neg              = [^\n];
-    ws                  = [ \t\r\n];
-    c_comment           = '/*' ( any* - (any* '*/' any* ) ) '*/';
-    cpp_comment         = '//' cr_neg* cr;
-    comment             = c_comment | cpp_comment;
-    ignore              = ws | comment;
-    name_separator      = ':';
-    value_separator     = ',';
-    Vnull               = 'null';
-    Vfalse              = 'false';
-    Vtrue               = 'true';
-    VNaN                = 'NaN';
-    VInfinity           = 'Infinity';
-    VMinusInfinity      = '-Infinity';
-    begin_value         = [nft\"\-\[\{NI] | digit;
-    begin_object        = '{';
-    end_object          = '}';
-    begin_array         = '[';
-    end_array           = ']';
-    begin_string        = '"';
-    begin_name          = begin_string;
-    begin_number        = digit | '-';
-}%%
-
-%%{
-    machine JSON_object;
-    include JSON_common;
-
-    write data;
-
-    action parse_value {
-        VALUE v = Qnil;
-        char *np = JSON_parse_value(json, fpc, pe, &v, current_nesting);
-        if (np == NULL) {
-            fhold; fbreak;
-        } else {
-            if (NIL_P(json->object_class)) {
-                OBJ_FREEZE(last_name);
-                rb_hash_aset(*result, last_name, v);
-            } else {
-                rb_funcall(*result, i_aset, 2, last_name, v);
-            }
-            fexec np;
-        }
-    }
-
-    action parse_name {
-        char *np;
-        json->parsing_name = 1;
-        np = JSON_parse_string(json, fpc, pe, &last_name);
-        json->parsing_name = 0;
-        if (np == NULL) { fhold; fbreak; } else fexec np;
-    }
-
-    action exit { fhold; fbreak; }
-
-    pair  = ignore* begin_name >parse_name ignore* name_separator ignore* begin_value >parse_value;
-    next_pair   = ignore* value_separator pair;
-
-    main := (
-      begin_object
-      (pair (next_pair)*)? ignore*
-      end_object
-    ) @exit;
-}%%
-
-static char *JSON_parse_object(JSON_Parser *json, char *p, char *pe, VALUE *result, int current_nesting)
-{
-    int cs = EVIL;
-    VALUE last_name = Qnil;
-    VALUE object_class = json->object_class;
-
-    if (json->max_nesting && current_nesting > json->max_nesting) {
-        rb_raise(eNestingError, "nesting of %d is too deep", current_nesting);
-    }
-
-    *result = NIL_P(object_class) ? rb_hash_new() : rb_class_new_instance(0, 0, object_class);
-
-    %% write init;
-    %% write exec;
-
-    if (cs >= JSON_object_first_final) {
-        if (json->create_additions) {
-            VALUE klassname;
-            if (NIL_P(json->object_class)) {
-              klassname = rb_hash_aref(*result, json->create_id);
-            } else {
-              klassname = rb_funcall(*result, i_aref, 1, json->create_id);
-            }
-            if (!NIL_P(klassname)) {
-                VALUE klass = rb_funcall(mJSON, i_deep_const_get, 1, klassname);
-                if (RTEST(rb_funcall(klass, i_json_creatable_p, 0))) {
-                    *result = rb_funcall(klass, i_json_create, 1, *result);
-                }
-            }
-        }
-        return p + 1;
-    } else {
-        return NULL;
-    }
-}
-
-
-%%{
-    machine JSON_value;
-    include JSON_common;
-
-    write data;
-
-    action parse_null {
-        *result = Qnil;
-    }
-    action parse_false {
-        *result = Qfalse;
-    }
-    action parse_true {
-        *result = Qtrue;
-    }
-    action parse_nan {
-        if (json->allow_nan) {
-            *result = CNaN;
-        } else {
-            rb_enc_raise(EXC_ENCODING eParserError, "unexpected token at '%s'", p - 2);
-        }
-    }
-    action parse_infinity {
-        if (json->allow_nan) {
-            *result = CInfinity;
-        } else {
-            rb_enc_raise(EXC_ENCODING eParserError, "unexpected token at '%s'", p - 8);
-        }
-    }
-    action parse_string {
-        char *np = JSON_parse_string(json, fpc, pe, result);
-        if (np == NULL) { fhold; fbreak; } else fexec np;
-    }
-
-    action parse_number {
-        char *np;
-        if(pe > fpc + 8 && !strncmp(MinusInfinity, fpc, 9)) {
-            if (json->allow_nan) {
-                *result = CMinusInfinity;
-                fexec p + 10;
-                fhold; fbreak;
-            } else {
-                rb_enc_raise(EXC_ENCODING eParserError, "unexpected token at '%s'", p);
-            }
-        }
-        np = JSON_parse_float(json, fpc, pe, result);
-        if (np != NULL) fexec np;
-        np = JSON_parse_integer(json, fpc, pe, result);
-        if (np != NULL) fexec np;
-        fhold; fbreak;
-    }
-
-    action parse_array {
-        char *np;
-        np = JSON_parse_array(json, fpc, pe, result, current_nesting + 1);
-        if (np == NULL) { fhold; fbreak; } else fexec np;
-    }
-
-    action parse_object {
-        char *np;
-        np =  JSON_parse_object(json, fpc, pe, result, current_nesting + 1);
-        if (np == NULL) { fhold; fbreak; } else fexec np;
-    }
-
-    action exit { fhold; fbreak; }
-
-main := ignore* (
-              Vnull @parse_null |
-              Vfalse @parse_false |
-              Vtrue @parse_true |
-              VNaN @parse_nan |
-              VInfinity @parse_infinity |
-              begin_number >parse_number |
-              begin_string >parse_string |
-              begin_array >parse_array |
-              begin_object >parse_object
-        ) ignore* %*exit;
-}%%
-
-static char *JSON_parse_value(JSON_Parser *json, char *p, char *pe, VALUE *result, int current_nesting)
-{
-    int cs = EVIL;
-
-    %% write init;
-    %% write exec;
-
-    if (json->freeze) {
-        OBJ_FREEZE(*result);
-    }
-
-    if (cs >= JSON_value_first_final) {
-        return p;
-    } else {
-        return NULL;
-    }
-}
-
-%%{
-    machine JSON_integer;
-
-    write data;
-
-    action exit { fhold; fbreak; }
-
-    main := '-'? ('0' | [1-9][0-9]*) (^[0-9]? @exit);
-}%%
-
-static char *JSON_parse_integer(JSON_Parser *json, char *p, char *pe, VALUE *result)
-{
-    int cs = EVIL;
-
-    %% write init;
-    json->memo = p;
-    %% write exec;
-
-    if (cs >= JSON_integer_first_final) {
-        long len = p - json->memo;
-        fbuffer_clear(json->fbuffer);
-        fbuffer_append(json->fbuffer, json->memo, len);
-        fbuffer_append_char(json->fbuffer, '\0');
-        *result = rb_cstr2inum(FBUFFER_PTR(json->fbuffer), 10);
-        return p + 1;
-    } else {
-        return NULL;
-    }
-}
-
-%%{
-    machine JSON_float;
-    include JSON_common;
-
-    write data;
-
-    action exit { fhold; fbreak; }
-
-    main := '-'? (
-              (('0' | [1-9][0-9]*) '.' [0-9]+ ([Ee] [+\-]?[0-9]+)?)
-              | (('0' | [1-9][0-9]*) ([Ee] [+\-]?[0-9]+))
-             )  (^[0-9Ee.\-]? @exit );
-}%%
-
-static char *JSON_parse_float(JSON_Parser *json, char *p, char *pe, VALUE *result)
-{
-    int cs = EVIL;
-
-    %% write init;
-    json->memo = p;
-    %% write exec;
-
-    if (cs >= JSON_float_first_final) {
-        VALUE mod = Qnil;
-        ID method_id = 0;
-        if (rb_respond_to(json->decimal_class, i_try_convert)) {
-            mod = json->decimal_class;
-            method_id = i_try_convert;
-        } else if (rb_respond_to(json->decimal_class, i_new)) {
-            mod = json->decimal_class;
-            method_id = i_new;
-        } else if (RB_TYPE_P(json->decimal_class, T_CLASS)) {
-            VALUE name = rb_class_name(json->decimal_class);
-            const char *name_cstr = RSTRING_PTR(name);
-            const char *last_colon = strrchr(name_cstr, ':');
-            if (last_colon) {
-                const char *mod_path_end = last_colon - 1;
-                VALUE mod_path = rb_str_substr(name, 0, mod_path_end - name_cstr);
-                mod = rb_path_to_class(mod_path);
-
-                const char *method_name_beg = last_colon + 1;
-                long before_len = method_name_beg - name_cstr;
-                long len = RSTRING_LEN(name) - before_len;
-                VALUE method_name = rb_str_substr(name, before_len, len);
-                method_id = SYM2ID(rb_str_intern(method_name));
-            } else {
-                mod = rb_mKernel;
-                method_id = SYM2ID(rb_str_intern(name));
-            }
-        }
-
-        long len = p - json->memo;
-        fbuffer_clear(json->fbuffer);
-        fbuffer_append(json->fbuffer, json->memo, len);
-        fbuffer_append_char(json->fbuffer, '\0');
-
-        if (method_id) {
-            VALUE text = rb_str_new2(FBUFFER_PTR(json->fbuffer));
-            *result = rb_funcallv(mod, method_id, 1, &text);
-        } else {
-            *result = DBL2NUM(rb_cstr_to_dbl(FBUFFER_PTR(json->fbuffer), 1));
-        }
-
-        return p + 1;
-    } else {
-        return NULL;
-    }
-}
-
-
-%%{
-    machine JSON_array;
-    include JSON_common;
-
-    write data;
-
-    action parse_value {
-        VALUE v = Qnil;
-        char *np = JSON_parse_value(json, fpc, pe, &v, current_nesting);
-        if (np == NULL) {
-            fhold; fbreak;
-        } else {
-            if (NIL_P(json->array_class)) {
-                rb_ary_push(*result, v);
-            } else {
-                rb_funcall(*result, i_leftshift, 1, v);
-            }
-            fexec np;
-        }
-    }
-
-    action exit { fhold; fbreak; }
-
-    next_element  = value_separator ignore* begin_value >parse_value;
-
-    main := begin_array ignore*
-          ((begin_value >parse_value ignore*)
-           (ignore* next_element ignore*)*)?
-          end_array @exit;
-}%%
-
-static char *JSON_parse_array(JSON_Parser *json, char *p, char *pe, VALUE *result, int current_nesting)
-{
-    int cs = EVIL;
-    VALUE array_class = json->array_class;
-
-    if (json->max_nesting && current_nesting > json->max_nesting) {
-        rb_raise(eNestingError, "nesting of %d is too deep", current_nesting);
-    }
-    *result = NIL_P(array_class) ? rb_ary_new() : rb_class_new_instance(0, 0, array_class);
-
-    %% write init;
-    %% write exec;
-
-    if(cs >= JSON_array_first_final) {
-        return p + 1;
-    } else {
-        rb_enc_raise(EXC_ENCODING eParserError, "unexpected token at '%s'", p);
-        return NULL;
-    }
-}
-
-static const size_t MAX_STACK_BUFFER_SIZE = 128;
-static VALUE json_string_unescape(char *string, char *stringEnd, int intern, int symbolize)
-{
-    VALUE result = Qnil;
-    size_t bufferSize = stringEnd - string;
-    char *p = string, *pe = string, *unescape, *bufferStart, *buffer;
-    int unescape_len;
-    char buf[4];
-
-    if (bufferSize > MAX_STACK_BUFFER_SIZE) {
-# ifdef HAVE_RB_ENC_INTERNED_STR
-      bufferStart = buffer = ALLOC_N(char, bufferSize ? bufferSize : 1);
-# else
-      bufferStart = buffer = ALLOC_N(char, bufferSize);
-# endif
-    } else {
-# ifdef HAVE_RB_ENC_INTERNED_STR
-      bufferStart = buffer = ALLOCA_N(char, bufferSize ? bufferSize : 1);
-# else
-      bufferStart = buffer = ALLOCA_N(char, bufferSize);
-# endif
-    }
-
-    while (pe < stringEnd) {
-        if (*pe == '\\') {
-            unescape = (char *) "?";
-            unescape_len = 1;
-            if (pe > p) {
-              MEMCPY(buffer, p, char, pe - p);
-              buffer += pe - p;
-            }
-            switch (*++pe) {
-                case 'n':
-                    unescape = (char *) "\n";
-                    break;
-                case 'r':
-                    unescape = (char *) "\r";
-                    break;
-                case 't':
-                    unescape = (char *) "\t";
-                    break;
-                case '"':
-                    unescape = (char *) "\"";
-                    break;
-                case '\\':
-                    unescape = (char *) "\\";
-                    break;
-                case 'b':
-                    unescape = (char *) "\b";
-                    break;
-                case 'f':
-                    unescape = (char *) "\f";
-                    break;
-                case 'u':
-                    if (pe > stringEnd - 4) {
-                      if (bufferSize > MAX_STACK_BUFFER_SIZE) {
-                        free(bufferStart);
-                      }
-                      rb_enc_raise(
-                        EXC_ENCODING eParserError,
-                        "incomplete unicode character escape sequence at '%s'", p
-                      );
-                    } else {
-                        UTF32 ch = unescape_unicode((unsigned char *) ++pe);
-                        pe += 3;
-                        if (UNI_SUR_HIGH_START == (ch & 0xFC00)) {
-                            pe++;
-                            if (pe > stringEnd - 6) {
-                              if (bufferSize > MAX_STACK_BUFFER_SIZE) {
-                                free(bufferStart);
-                              }
-                              rb_enc_raise(
-                                EXC_ENCODING eParserError,
-                                "incomplete surrogate pair at '%s'", p
-                                );
-                            }
-                            if (pe[0] == '\\' && pe[1] == 'u') {
-                                UTF32 sur = unescape_unicode((unsigned char *) pe + 2);
-                                ch = (((ch & 0x3F) << 10) | ((((ch >> 6) & 0xF) + 1) << 16)
-                                        | (sur & 0x3FF));
-                                pe += 5;
-                            } else {
-                                unescape = (char *) "?";
-                                break;
-                            }
-                        }
-                        unescape_len = convert_UTF32_to_UTF8(buf, ch);
-                        unescape = buf;
-                    }
-                    break;
-                default:
-                    p = pe;
-                    continue;
-            }
-            MEMCPY(buffer, unescape, char, unescape_len);
-            buffer += unescape_len;
-            p = ++pe;
-        } else {
-            pe++;
-        }
-    }
-
-    if (pe > p) {
-      MEMCPY(buffer, p, char, pe - p);
-      buffer += pe - p;
-    }
-
-# ifdef HAVE_RB_ENC_INTERNED_STR
-      if (intern) {
-        result = rb_enc_interned_str(bufferStart, (long)(buffer - bufferStart), rb_utf8_encoding());
-      } else {
-        result = rb_utf8_str_new(bufferStart, (long)(buffer - bufferStart));
-      }
-      if (bufferSize > MAX_STACK_BUFFER_SIZE) {
-        free(bufferStart);
-      }
-# else
-      result = rb_utf8_str_new(bufferStart, (long)(buffer - bufferStart));
-
-      if (bufferSize > MAX_STACK_BUFFER_SIZE) {
-        free(bufferStart);
-      }
-
-      if (intern) {
-  # if STR_UMINUS_DEDUPE_FROZEN
-        // Starting from MRI 2.8 it is preferable to freeze the string
-        // before deduplication so that it can be interned directly
-        // otherwise it would be duplicated first which is wasteful.
-        result = rb_funcall(rb_str_freeze(result), i_uminus, 0);
-  # elif STR_UMINUS_DEDUPE
-        // MRI 2.5 and older do not deduplicate strings that are already
-        // frozen.
-        result = rb_funcall(result, i_uminus, 0);
-  # else
-        result = rb_str_freeze(result);
-  # endif
-      }
-# endif
-
-    if (symbolize) {
-      result = rb_str_intern(result);
-    }
-
-    return result;
-}
-
-%%{
-    machine JSON_string;
-    include JSON_common;
-
-    write data;
-
-    action parse_string {
-        *result = json_string_unescape(json->memo + 1, p, json->parsing_name || json-> freeze, json->parsing_name && json->symbolize_names);
-        if (NIL_P(*result)) {
-            fhold;
-            fbreak;
-        } else {
-            fexec p + 1;
-        }
-    }
-
-    action exit { fhold; fbreak; }
-
-    main := '"' ((^([\"\\] | 0..0x1f) | '\\'[\"\\/bfnrt] | '\\u'[0-9a-fA-F]{4} | '\\'^([\"\\/bfnrtu]|0..0x1f))* %parse_string) '"' @exit;
-}%%
-
-static int
-match_i(VALUE regexp, VALUE klass, VALUE memo)
-{
-    if (regexp == Qundef) return ST_STOP;
-    if (RTEST(rb_funcall(klass, i_json_creatable_p, 0)) &&
-      RTEST(rb_funcall(regexp, i_match, 1, rb_ary_entry(memo, 0)))) {
-        rb_ary_push(memo, klass);
-        return ST_STOP;
-    }
-    return ST_CONTINUE;
-}
-
-static char *JSON_parse_string(JSON_Parser *json, char *p, char *pe, VALUE *result)
-{
-    int cs = EVIL;
-    VALUE match_string;
-
-    %% write init;
-    json->memo = p;
-    %% write exec;
-
-    if (json->create_additions && RTEST(match_string = json->match_string)) {
-          VALUE klass;
-          VALUE memo = rb_ary_new2(2);
-          rb_ary_push(memo, *result);
-          rb_hash_foreach(match_string, match_i, memo);
-          klass = rb_ary_entry(memo, 1);
-          if (RTEST(klass)) {
-              *result = rb_funcall(klass, i_json_create, 1, *result);
-          }
-    }
-
-    if (cs >= JSON_string_first_final) {
-        return p + 1;
-    } else {
-        return NULL;
-    }
-}
-
-/*
- * Document-class: JSON::Ext::Parser
- *
- * This is the JSON parser implemented as a C extension. It can be configured
- * to be used by setting
- *
- *  JSON.parser = JSON::Ext::Parser
- *
- * with the method parser= in JSON.
- *
- */
-
-static VALUE convert_encoding(VALUE source)
-{
-#ifdef HAVE_RUBY_ENCODING_H
-  rb_encoding *enc = rb_enc_get(source);
-  if (enc == rb_ascii8bit_encoding()) {
-    if (OBJ_FROZEN(source)) {
-      source = rb_str_dup(source);
-    }
-    FORCE_UTF8(source);
-  } else {
-    source = rb_str_conv_enc(source, rb_enc_get(source), rb_utf8_encoding());
-  }
-#endif
-    return source;
-}
-
-/*
- * call-seq: new(source, opts => {})
- *
- * Creates a new JSON::Ext::Parser instance for the string _source_.
- *
- * It will be configured by the _opts_ hash. _opts_ can have the following
- * keys:
- *
- * _opts_ can have the following keys:
- * * *max_nesting*: The maximum depth of nesting allowed in the parsed data
- *   structures. Disable depth checking with :max_nesting => false|nil|0, it
- *   defaults to 100.
- * * *allow_nan*: If set to true, allow NaN, Infinity and -Infinity in
- *   defiance of RFC 4627 to be parsed by the Parser. This option defaults to
- *   false.
- * * *symbolize_names*: If set to true, returns symbols for the names
- *   (keys) in a JSON object. Otherwise strings are returned, which is
- *   also the default. It's not possible to use this option in
- *   conjunction with the *create_additions* option.
- * * *create_additions*: If set to false, the Parser doesn't create
- *   additions even if a matching class and create_id was found. This option
- *   defaults to false.
- * * *object_class*: Defaults to Hash
- * * *array_class*: Defaults to Array
- */
-static VALUE cParser_initialize(int argc, VALUE *argv, VALUE self)
-{
-    VALUE source, opts;
-    GET_PARSER_INIT;
-
-    if (json->Vsource) {
-        rb_raise(rb_eTypeError, "already initialized instance");
-    }
-    rb_scan_args(argc, argv, "1:", &source, &opts);
-    if (!NIL_P(opts)) {
-	VALUE tmp = ID2SYM(i_max_nesting);
-	if (option_given_p(opts, tmp)) {
-	    VALUE max_nesting = rb_hash_aref(opts, tmp);
-	    if (RTEST(max_nesting)) {
-		Check_Type(max_nesting, T_FIXNUM);
-		json->max_nesting = FIX2INT(max_nesting);
-	    } else {
-		json->max_nesting = 0;
-	    }
-	} else {
-	    json->max_nesting = 100;
-	}
-	tmp = ID2SYM(i_allow_nan);
-	if (option_given_p(opts, tmp)) {
-	    json->allow_nan = RTEST(rb_hash_aref(opts, tmp)) ? 1 : 0;
-	} else {
-	    json->allow_nan = 0;
-	}
-	tmp = ID2SYM(i_symbolize_names);
-	if (option_given_p(opts, tmp)) {
-	    json->symbolize_names = RTEST(rb_hash_aref(opts, tmp)) ? 1 : 0;
-	} else {
-	    json->symbolize_names = 0;
-	}
-	tmp = ID2SYM(i_freeze);
-	if (option_given_p(opts, tmp)) {
-	    json->freeze = RTEST(rb_hash_aref(opts, tmp)) ? 1 : 0;
-	} else {
-	    json->freeze = 0;
-	}
-	tmp = ID2SYM(i_create_additions);
-	if (option_given_p(opts, tmp)) {
-	    json->create_additions = RTEST(rb_hash_aref(opts, tmp));
-	} else {
-	    json->create_additions = 0;
-	}
-	if (json->symbolize_names && json->create_additions) {
-	    rb_raise(rb_eArgError,
-		     "options :symbolize_names and :create_additions cannot be "
-		     " used in conjunction");
-	}
-	tmp = ID2SYM(i_create_id);
-	if (option_given_p(opts, tmp)) {
-	    json->create_id = rb_hash_aref(opts, tmp);
-	} else {
-	    json->create_id = rb_funcall(mJSON, i_create_id, 0);
-	}
-	tmp = ID2SYM(i_object_class);
-	if (option_given_p(opts, tmp)) {
-	    json->object_class = rb_hash_aref(opts, tmp);
-	} else {
-	    json->object_class = Qnil;
-	}
-	tmp = ID2SYM(i_array_class);
-	if (option_given_p(opts, tmp)) {
-	    json->array_class = rb_hash_aref(opts, tmp);
-	} else {
-	    json->array_class = Qnil;
-	}
-	tmp = ID2SYM(i_decimal_class);
-	if (option_given_p(opts, tmp)) {
-	    json->decimal_class = rb_hash_aref(opts, tmp);
-	} else {
-	    json->decimal_class = Qnil;
-	}
-	tmp = ID2SYM(i_match_string);
-	if (option_given_p(opts, tmp)) {
-	    VALUE match_string = rb_hash_aref(opts, tmp);
-	    json->match_string = RTEST(match_string) ? match_string : Qnil;
-	} else {
-	    json->match_string = Qnil;
-	}
-    } else {
-        json->max_nesting = 100;
-        json->allow_nan = 0;
-        json->create_additions = 0;
-        json->create_id = rb_funcall(mJSON, i_create_id, 0);
-        json->object_class = Qnil;
-        json->array_class = Qnil;
-        json->decimal_class = Qnil;
-    }
-    source = convert_encoding(StringValue(source));
-    StringValue(source);
-    json->len = RSTRING_LEN(source);
-    json->source = RSTRING_PTR(source);;
-    json->Vsource = source;
-    return self;
-}
-
-%%{
-    machine JSON;
-
-    write data;
-
-    include JSON_common;
-
-    action parse_value {
-        char *np = JSON_parse_value(json, fpc, pe, &result, 0);
-        if (np == NULL) { fhold; fbreak; } else fexec np;
-    }
-
-    main := ignore* (
-            begin_value >parse_value
-            ) ignore*;
-}%%
-
-/*
- * call-seq: parse()
- *
- *  Parses the current JSON text _source_ and returns the complete data
- *  structure as a result.
- *  It raises JSON::ParserError if fail to parse.
- */
-static VALUE cParser_parse(VALUE self)
-{
-  char *p, *pe;
-  int cs = EVIL;
-  VALUE result = Qnil;
-  GET_PARSER;
-
-  %% write init;
-  p = json->source;
-  pe = p + json->len;
-  %% write exec;
-
-  if (cs >= JSON_first_final && p == pe) {
-    return result;
-  } else {
-    rb_enc_raise(EXC_ENCODING eParserError, "unexpected token at '%s'", p);
-    return Qnil;
-  }
-}
-
-static void JSON_mark(void *ptr)
-{
-    JSON_Parser *json = ptr;
-    rb_gc_mark_maybe(json->Vsource);
-    rb_gc_mark_maybe(json->create_id);
-    rb_gc_mark_maybe(json->object_class);
-    rb_gc_mark_maybe(json->array_class);
-    rb_gc_mark_maybe(json->decimal_class);
-    rb_gc_mark_maybe(json->match_string);
-}
-
-static void JSON_free(void *ptr)
-{
-    JSON_Parser *json = ptr;
-    fbuffer_free(json->fbuffer);
-    ruby_xfree(json);
-}
-
-static size_t JSON_memsize(const void *ptr)
-{
-    const JSON_Parser *json = ptr;
-    return sizeof(*json) + FBUFFER_CAPA(json->fbuffer);
-}
-
-#ifdef NEW_TYPEDDATA_WRAPPER
-static const rb_data_type_t JSON_Parser_type = {
-    "JSON/Parser",
-    {JSON_mark, JSON_free, JSON_memsize,},
-#ifdef RUBY_TYPED_FREE_IMMEDIATELY
-    0, 0,
-    RUBY_TYPED_FREE_IMMEDIATELY,
-#endif
-};
-#endif
-
-static VALUE cJSON_parser_s_allocate(VALUE klass)
-{
-    JSON_Parser *json;
-    VALUE obj = TypedData_Make_Struct(klass, JSON_Parser, &JSON_Parser_type, json);
-    json->fbuffer = fbuffer_alloc(0);
-    return obj;
-}
-
-/*
- * call-seq: source()
- *
- * Returns a copy of the current _source_ string, that was used to construct
- * this Parser.
- */
-static VALUE cParser_source(VALUE self)
-{
-    GET_PARSER;
-    return rb_str_dup(json->Vsource);
-}
-
-void Init_parser(void)
-{
-#ifdef HAVE_RB_EXT_RACTOR_SAFE
-    rb_ext_ractor_safe(true);
-#endif
-
-#undef rb_intern
-    rb_require("json/common");
-    mJSON = rb_define_module("JSON");
-    mExt = rb_define_module_under(mJSON, "Ext");
-    cParser = rb_define_class_under(mExt, "Parser", rb_cObject);
-    eParserError = rb_path2class("JSON::ParserError");
-    eNestingError = rb_path2class("JSON::NestingError");
-    rb_gc_register_mark_object(eParserError);
-    rb_gc_register_mark_object(eNestingError);
-    rb_define_alloc_func(cParser, cJSON_parser_s_allocate);
-    rb_define_method(cParser, "initialize", cParser_initialize, -1);
-    rb_define_method(cParser, "parse", cParser_parse, 0);
-    rb_define_method(cParser, "source", cParser_source, 0);
-
-    CNaN = rb_const_get(mJSON, rb_intern("NaN"));
-    rb_gc_register_mark_object(CNaN);
-
-    CInfinity = rb_const_get(mJSON, rb_intern("Infinity"));
-    rb_gc_register_mark_object(CInfinity);
-
-    CMinusInfinity = rb_const_get(mJSON, rb_intern("MinusInfinity"));
-    rb_gc_register_mark_object(CMinusInfinity);
-
-    i_json_creatable_p = rb_intern("json_creatable?");
-    i_json_create = rb_intern("json_create");
-    i_create_id = rb_intern("create_id");
-    i_create_additions = rb_intern("create_additions");
-    i_chr = rb_intern("chr");
-    i_max_nesting = rb_intern("max_nesting");
-    i_allow_nan = rb_intern("allow_nan");
-    i_symbolize_names = rb_intern("symbolize_names");
-    i_object_class = rb_intern("object_class");
-    i_array_class = rb_intern("array_class");
-    i_decimal_class = rb_intern("decimal_class");
-    i_match = rb_intern("match");
-    i_match_string = rb_intern("match_string");
-    i_key_p = rb_intern("key?");
-    i_deep_const_get = rb_intern("deep_const_get");
-    i_aset = rb_intern("[]=");
-    i_aref = rb_intern("[]");
-    i_leftshift = rb_intern("<<");
-    i_new = rb_intern("new");
-    i_try_convert = rb_intern("try_convert");
-    i_freeze = rb_intern("freeze");
-    i_uminus = rb_intern("-@");
-}
-
-/*
- * Local variables:
- * mode: c
- * c-file-style: ruby
- * indent-tabs-mode: nil
- * End:
- */
diff --git a/ext/json/parser/prereq.mk b/ext/json/parser/prereq.mk
deleted file mode 100644
index fc591690568874..00000000000000
--- a/ext/json/parser/prereq.mk
+++ /dev/null
@@ -1,13 +0,0 @@
-RAGEL = ragel
-
-.SUFFIXES: .rl
-
-.rl.c:
-	$(RAGEL) -G2 $<
-	$(BASERUBY) -pli -e '$$_.sub!(/[ \t]+$$/, "")' \
-	-e '$$_.sub!(/^static const int (JSON_.*=.*);$$/, "enum {\\1};")' \
-	-e '$$_.sub!(/^(static const char) (_JSON(?:_\w+)?_nfa_\w+)(?=\[\] =)/, "\\1 MAYBE_UNUSED(\\2)")' \
-	-e '$$_.sub!(/0 <= ([\( ]+\*[\( ]*p\)+) && \1 <= 31/, "0 <= (signed char)(*(p)) && (*(p)) <= 31")' \
-	-e '$$_ = "/* This file is automatically generated from parser.rl by using ragel */\n" + $$_ if $$. == 1' $@
-
-parser.c:
diff --git a/ext/json/simd/conf.rb b/ext/json/simd/conf.rb
new file mode 100644
index 00000000000000..8e7d8ee26133d1
--- /dev/null
+++ b/ext/json/simd/conf.rb
@@ -0,0 +1,20 @@
+case RbConfig::CONFIG['host_cpu']
+when /^(arm|aarch64)/
+  # Try to compile a small program using NEON instructions
+  header, type, init = 'arm_neon.h', 'uint8x16_t', 'vdupq_n_u8(32)'
+when /^(x86_64|x64)/
+  header, type, init = 'x86intrin.h', '__m128i', '_mm_set1_epi8(32)'
+end
+if header
+  have_header(header) && try_compile(<<~SRC)
+    #{cpp_include(header)}
+    int main(int argc, char **argv) {
+      #{type} test = #{init};
+      if (argc > 100000) printf("%p", &test);
+      return 0;
+    }
+  SRC
+  $defs.push("-DJSON_ENABLE_SIMD")
+end
+
+have_header('cpuid.h')
diff --git a/ext/json/simd/simd.h b/ext/json/simd/simd.h
new file mode 100644
index 00000000000000..f8503d1395c271
--- /dev/null
+++ b/ext/json/simd/simd.h
@@ -0,0 +1,187 @@
+typedef enum {
+    SIMD_NONE,
+    SIMD_NEON,
+    SIMD_SSE2
+} SIMD_Implementation;
+
+#ifdef JSON_ENABLE_SIMD
+
+#ifdef __clang__
+  #if __has_builtin(__builtin_ctzll)
+    #define HAVE_BUILTIN_CTZLL 1
+  #else
+    #define HAVE_BUILTIN_CTZLL 0
+  #endif
+#elif defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 3))
+  #define HAVE_BUILTIN_CTZLL 1
+#else
+  #define HAVE_BUILTIN_CTZLL 0
+#endif
+
+static inline uint32_t trailing_zeros64(uint64_t input)
+{
+#if HAVE_BUILTIN_CTZLL
+  return __builtin_ctzll(input);
+#else
+  uint32_t trailing_zeros = 0;
+  uint64_t temp = input;
+  while ((temp & 1) == 0 && temp > 0) {
+    trailing_zeros++;
+    temp >>= 1;
+  }
+  return trailing_zeros;
+#endif
+}
+
+static inline int trailing_zeros(int input)
+{
+  #if HAVE_BUILTIN_CTZLL
+    return __builtin_ctz(input);
+  #else
+    int trailing_zeros = 0;
+    int temp = input;
+    while ((temp & 1) == 0 && temp > 0) {
+      trailing_zeros++;
+      temp >>= 1;
+    }
+    return trailing_zeros;
+  #endif
+}
+
+#if (defined(__GNUC__ ) || defined(__clang__))
+#define FORCE_INLINE __attribute__((always_inline))
+#else
+#define FORCE_INLINE
+#endif
+
+
+#define SIMD_MINIMUM_THRESHOLD 6
+
+#if defined(__ARM_NEON) || defined(__ARM_NEON__) || defined(__aarch64__) || defined(_M_ARM64)
+#include <arm_neon.h>
+
+#define FIND_SIMD_IMPLEMENTATION_DEFINED 1
+static inline SIMD_Implementation find_simd_implementation(void)
+{
+    return SIMD_NEON;
+}
+
+#define HAVE_SIMD 1
+#define HAVE_SIMD_NEON 1
+
+// See: https://community.arm.com/arm-community-blogs/b/servers-and-cloud-computing-blog/posts/porting-x86-vector-bitmask-optimizations-to-arm-neon
+static inline FORCE_INLINE uint64_t neon_match_mask(uint8x16_t matches)
+{
+    const uint8x8_t res = vshrn_n_u16(vreinterpretq_u16_u8(matches), 4);
+    const uint64_t mask = vget_lane_u64(vreinterpret_u64_u8(res), 0);
+    return mask & 0x8888888888888888ull;
+}
+
+static inline FORCE_INLINE uint64_t compute_chunk_mask_neon(const char *ptr)
+{
+  uint8x16_t chunk = vld1q_u8((const unsigned char *)ptr);
+
+  // Trick: c < 32 || c == 34 can be factored as c ^ 2 < 33
+  // https://lemire.me/blog/2025/04/13/detect-control-characters-quotes-and-backslashes-efficiently-using-swar/
+  const uint8x16_t too_low_or_dbl_quote = vcltq_u8(veorq_u8(chunk, vdupq_n_u8(2)), vdupq_n_u8(33));
+
+  uint8x16_t has_backslash = vceqq_u8(chunk, vdupq_n_u8('\\'));
+  uint8x16_t needs_escape  = vorrq_u8(too_low_or_dbl_quote, has_backslash);
+  return neon_match_mask(needs_escape);
+}
+
+static inline FORCE_INLINE int string_scan_simd_neon(const char **ptr, const char *end, uint64_t *mask)
+{
+    while (*ptr + sizeof(uint8x16_t) <= end) {
+      uint64_t chunk_mask = compute_chunk_mask_neon(*ptr);
+      if (chunk_mask) {
+          *mask = chunk_mask;
+          return 1;
+      }
+      *ptr += sizeof(uint8x16_t);
+    }
+    return 0;
+}
+
+uint8x16x4_t load_uint8x16_4(const unsigned char *table) {
+  uint8x16x4_t tab;
+  tab.val[0] = vld1q_u8(table);
+  tab.val[1] = vld1q_u8(table+16);
+  tab.val[2] = vld1q_u8(table+32);
+  tab.val[3] = vld1q_u8(table+48);
+  return tab;
+}
+
+#endif /* ARM Neon Support.*/
+
+#if defined(__amd64__) || defined(__amd64) || defined(__x86_64__) || defined(__x86_64) || defined(_M_X64) || defined(_M_AMD64)
+
+#ifdef HAVE_X86INTRIN_H
+#include <x86intrin.h>
+
+#define HAVE_SIMD 1
+#define HAVE_SIMD_SSE2 1
+
+#ifdef HAVE_CPUID_H
+#define FIND_SIMD_IMPLEMENTATION_DEFINED 1
+
+#if defined(__clang__) || defined(__GNUC__)
+#define TARGET_SSE2 __attribute__((target("sse2")))
+#else
+#define TARGET_SSE2
+#endif
+
+#define _mm_cmpge_epu8(a, b) _mm_cmpeq_epi8(_mm_max_epu8(a, b), a)
+#define _mm_cmple_epu8(a, b) _mm_cmpge_epu8(b, a)
+#define _mm_cmpgt_epu8(a, b) _mm_xor_si128(_mm_cmple_epu8(a, b), _mm_set1_epi8(-1))
+#define _mm_cmplt_epu8(a, b) _mm_cmpgt_epu8(b, a)
+
+static inline TARGET_SSE2 FORCE_INLINE int compute_chunk_mask_sse2(const char *ptr)
+{
+    __m128i chunk         = _mm_loadu_si128((__m128i const*)ptr);
+    // Trick: c < 32 || c == 34 can be factored as c ^ 2 < 33
+    // https://lemire.me/blog/2025/04/13/detect-control-characters-quotes-and-backslashes-efficiently-using-swar/
+    __m128i too_low_or_dbl_quote = _mm_cmplt_epu8(_mm_xor_si128(chunk, _mm_set1_epi8(2)), _mm_set1_epi8(33));
+    __m128i has_backslash = _mm_cmpeq_epi8(chunk, _mm_set1_epi8('\\'));
+    __m128i needs_escape  = _mm_or_si128(too_low_or_dbl_quote, has_backslash);
+    return _mm_movemask_epi8(needs_escape);
+}
+
+static inline TARGET_SSE2 FORCE_INLINE int string_scan_simd_sse2(const char **ptr, const char *end, int *mask)
+{
+    while (*ptr + sizeof(__m128i) <= end) {
+      int chunk_mask = compute_chunk_mask_sse2(*ptr);
+      if (chunk_mask) {
+          *mask = chunk_mask;
+          return 1;
+      }
+      *ptr += sizeof(__m128i);
+    }
+
+    return 0;
+}
+
+#include <cpuid.h>
+#endif /* HAVE_CPUID_H */
+
+static inline SIMD_Implementation find_simd_implementation(void)
+{
+    // TODO Revisit. I think the SSE version now only uses SSE2 instructions.
+    if (__builtin_cpu_supports("sse2")) {
+        return SIMD_SSE2;
+    }
+
+    return SIMD_NONE;
+}
+
+#endif /* HAVE_X86INTRIN_H */
+#endif /* X86_64 Support */
+
+#endif /* JSON_ENABLE_SIMD */
+
+#ifndef FIND_SIMD_IMPLEMENTATION_DEFINED
+static inline SIMD_Implementation find_simd_implementation(void)
+{
+    return SIMD_NONE;
+}
+#endif
diff --git a/ext/json/vendor/fpconv.c b/ext/json/vendor/fpconv.c
new file mode 100644
index 00000000000000..75efd46f11e624
--- /dev/null
+++ b/ext/json/vendor/fpconv.c
@@ -0,0 +1,479 @@
+// Boost Software License - Version 1.0 - August 17th, 2003
+//
+// Permission is hereby granted, free of charge, to any person or organization
+// obtaining a copy of the software and accompanying documentation covered by
+// this license (the "Software") to use, reproduce, display, distribute,
+// execute, and transmit the Software, and to prepare derivative works of the
+// Software, and to permit third-parties to whom the Software is furnished to
+// do so, all subject to the following:
+//
+// The copyright notices in the Software and this entire statement, including
+// the above license grant, this restriction and the following disclaimer,
+// must be included in all copies of the Software, in whole or in part, and
+// all derivative works of the Software, unless such copies or derivative
+// works are solely in the form of machine-executable object code generated by
+// a source language processor.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
+// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
+// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
+// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+
+// The contents of this file is extracted from https://github.com/night-shift/fpconv
+// It was slightly modified to append ".0" to plain floats, for use with the https://github.com/ruby/json package.
+
+#include <stdbool.h>
+#include <string.h>
+#include <stdint.h>
+
+#define npowers     87
+#define steppowers  8
+#define firstpower -348 /* 10 ^ -348 */
+
+#define expmax     -32
+#define expmin     -60
+
+typedef struct Fp {
+    uint64_t frac;
+    int exp;
+} Fp;
+
+static const Fp powers_ten[] = {
+    { 18054884314459144840U, -1220 }, { 13451937075301367670U, -1193 },
+    { 10022474136428063862U, -1166 }, { 14934650266808366570U, -1140 },
+    { 11127181549972568877U, -1113 }, { 16580792590934885855U, -1087 },
+    { 12353653155963782858U, -1060 }, { 18408377700990114895U, -1034 },
+    { 13715310171984221708U, -1007 }, { 10218702384817765436U, -980 },
+    { 15227053142812498563U, -954 },  { 11345038669416679861U, -927 },
+    { 16905424996341287883U, -901 },  { 12595523146049147757U, -874 },
+    { 9384396036005875287U,  -847 },  { 13983839803942852151U, -821 },
+    { 10418772551374772303U, -794 },  { 15525180923007089351U, -768 },
+    { 11567161174868858868U, -741 },  { 17236413322193710309U, -715 },
+    { 12842128665889583758U, -688 },  { 9568131466127621947U,  -661 },
+    { 14257626930069360058U, -635 },  { 10622759856335341974U, -608 },
+    { 15829145694278690180U, -582 },  { 11793632577567316726U, -555 },
+    { 17573882009934360870U, -529 },  { 13093562431584567480U, -502 },
+    { 9755464219737475723U,  -475 },  { 14536774485912137811U, -449 },
+    { 10830740992659433045U, -422 },  { 16139061738043178685U, -396 },
+    { 12024538023802026127U, -369 },  { 17917957937422433684U, -343 },
+    { 13349918974505688015U, -316 },  { 9946464728195732843U,  -289 },
+    { 14821387422376473014U, -263 },  { 11042794154864902060U, -236 },
+    { 16455045573212060422U, -210 },  { 12259964326927110867U, -183 },
+    { 18268770466636286478U, -157 },  { 13611294676837538539U, -130 },
+    { 10141204801825835212U, -103 },  { 15111572745182864684U, -77 },
+    { 11258999068426240000U, -50 },   { 16777216000000000000U, -24 },
+    { 12500000000000000000U,   3 },   { 9313225746154785156U,   30 },
+    { 13877787807814456755U,  56 },   { 10339757656912845936U,  83 },
+    { 15407439555097886824U, 109 },   { 11479437019748901445U, 136 },
+    { 17105694144590052135U, 162 },   { 12744735289059618216U, 189 },
+    { 9495567745759798747U,  216 },   { 14149498560666738074U, 242 },
+    { 10542197943230523224U, 269 },   { 15709099088952724970U, 295 },
+    { 11704190886730495818U, 322 },   { 17440603504673385349U, 348 },
+    { 12994262207056124023U, 375 },   { 9681479787123295682U,  402 },
+    { 14426529090290212157U, 428 },   { 10748601772107342003U, 455 },
+    { 16016664761464807395U, 481 },   { 11933345169920330789U, 508 },
+    { 17782069995880619868U, 534 },   { 13248674568444952270U, 561 },
+    { 9871031767461413346U,  588 },   { 14708983551653345445U, 614 },
+    { 10959046745042015199U, 641 },   { 16330252207878254650U, 667 },
+    { 12166986024289022870U, 694 },   { 18130221999122236476U, 720 },
+    { 13508068024458167312U, 747 },   { 10064294952495520794U, 774 },
+    { 14996968138956309548U, 800 },   { 11173611982879273257U, 827 },
+    { 16649979327439178909U, 853 },   { 12405201291620119593U, 880 },
+    { 9242595204427927429U,  907 },   { 13772540099066387757U, 933 },
+    { 10261342003245940623U, 960 },   { 15290591125556738113U, 986 },
+    { 11392378155556871081U, 1013 },  { 16975966327722178521U, 1039 },
+    { 12648080533535911531U, 1066 }
+};
+
+static Fp find_cachedpow10(int exp, int* k)
+{
+    const double one_log_ten = 0.30102999566398114;
+
+    int approx = (int)(-(exp + npowers) * one_log_ten);
+    int idx = (approx - firstpower) / steppowers;
+
+    while(1) {
+        int current = exp + powers_ten[idx].exp + 64;
+
+        if(current < expmin) {
+            idx++;
+            continue;
+        }
+
+        if(current > expmax) {
+            idx--;
+            continue;
+        }
+
+        *k = (firstpower + idx * steppowers);
+
+        return powers_ten[idx];
+    }
+}
+
+#define fracmask  0x000FFFFFFFFFFFFFU
+#define expmask   0x7FF0000000000000U
+#define hiddenbit 0x0010000000000000U
+#define signmask  0x8000000000000000U
+#define expbias   (1023 + 52)
+
+#define absv(n) ((n) < 0 ? -(n) : (n))
+#define minv(a, b) ((a) < (b) ? (a) : (b))
+
+static const uint64_t tens[] = {
+    10000000000000000000U, 1000000000000000000U, 100000000000000000U,
+    10000000000000000U, 1000000000000000U, 100000000000000U,
+    10000000000000U, 1000000000000U, 100000000000U,
+    10000000000U, 1000000000U, 100000000U,
+    10000000U, 1000000U, 100000U,
+    10000U, 1000U, 100U,
+    10U, 1U
+};
+
+static inline uint64_t get_dbits(double d)
+{
+    union {
+        double   dbl;
+        uint64_t i;
+    } dbl_bits = { d };
+
+    return dbl_bits.i;
+}
+
+static Fp build_fp(double d)
+{
+    uint64_t bits = get_dbits(d);
+
+    Fp fp;
+    fp.frac = bits & fracmask;
+    fp.exp = (bits & expmask) >> 52;
+
+    if(fp.exp) {
+        fp.frac += hiddenbit;
+        fp.exp -= expbias;
+
+    } else {
+        fp.exp = -expbias + 1;
+    }
+
+    return fp;
+}
+
+static void normalize(Fp* fp)
+{
+    while ((fp->frac & hiddenbit) == 0) {
+        fp->frac <<= 1;
+        fp->exp--;
+    }
+
+    int shift = 64 - 52 - 1;
+    fp->frac <<= shift;
+    fp->exp -= shift;
+}
+
+static void get_normalized_boundaries(Fp* fp, Fp* lower, Fp* upper)
+{
+    upper->frac = (fp->frac << 1) + 1;
+    upper->exp  = fp->exp - 1;
+
+    while ((upper->frac & (hiddenbit << 1)) == 0) {
+        upper->frac <<= 1;
+        upper->exp--;
+    }
+
+    int u_shift = 64 - 52 - 2;
+
+    upper->frac <<= u_shift;
+    upper->exp = upper->exp - u_shift;
+
+
+    int l_shift = fp->frac == hiddenbit ? 2 : 1;
+
+    lower->frac = (fp->frac << l_shift) - 1;
+    lower->exp = fp->exp - l_shift;
+
+
+    lower->frac <<= lower->exp - upper->exp;
+    lower->exp = upper->exp;
+}
+
+static Fp multiply(Fp* a, Fp* b)
+{
+    const uint64_t lomask = 0x00000000FFFFFFFF;
+
+    uint64_t ah_bl = (a->frac >> 32)    * (b->frac & lomask);
+    uint64_t al_bh = (a->frac & lomask) * (b->frac >> 32);
+    uint64_t al_bl = (a->frac & lomask) * (b->frac & lomask);
+    uint64_t ah_bh = (a->frac >> 32)    * (b->frac >> 32);
+
+    uint64_t tmp = (ah_bl & lomask) + (al_bh & lomask) + (al_bl >> 32);
+    /* round up */
+    tmp += 1U << 31;
+
+    Fp fp = {
+        ah_bh + (ah_bl >> 32) + (al_bh >> 32) + (tmp >> 32),
+        a->exp + b->exp + 64
+    };
+
+    return fp;
+}
+
+static void round_digit(char* digits, int ndigits, uint64_t delta, uint64_t rem, uint64_t kappa, uint64_t frac)
+{
+    while (rem < frac && delta - rem >= kappa &&
+           (rem + kappa < frac || frac - rem > rem + kappa - frac)) {
+
+        digits[ndigits - 1]--;
+        rem += kappa;
+    }
+}
+
+static int generate_digits(Fp* fp, Fp* upper, Fp* lower, char* digits, int* K)
+{
+    uint64_t wfrac = upper->frac - fp->frac;
+    uint64_t delta = upper->frac - lower->frac;
+
+    Fp one;
+    one.frac = 1ULL << -upper->exp;
+    one.exp  = upper->exp;
+
+    uint64_t part1 = upper->frac >> -one.exp;
+    uint64_t part2 = upper->frac & (one.frac - 1);
+
+    int idx = 0, kappa = 10;
+    const uint64_t* divp;
+    /* 1000000000 */
+    for(divp = tens + 10; kappa > 0; divp++) {
+
+        uint64_t div = *divp;
+        unsigned digit = (unsigned) (part1 / div);
+
+        if (digit || idx) {
+            digits[idx++] = digit + '0';
+        }
+
+        part1 -= digit * div;
+        kappa--;
+
+        uint64_t tmp = (part1 <<-one.exp) + part2;
+        if (tmp <= delta) {
+            *K += kappa;
+            round_digit(digits, idx, delta, tmp, div << -one.exp, wfrac);
+
+            return idx;
+        }
+    }
+
+    /* 10 */
+    const uint64_t* unit = tens + 18;
+
+    while(true) {
+        part2 *= 10;
+        delta *= 10;
+        kappa--;
+
+        unsigned digit = (unsigned) (part2 >> -one.exp);
+        if (digit || idx) {
+            digits[idx++] = digit + '0';
+        }
+
+        part2 &= one.frac - 1;
+        if (part2 < delta) {
+            *K += kappa;
+            round_digit(digits, idx, delta, part2, one.frac, wfrac * *unit);
+
+            return idx;
+        }
+
+        unit--;
+    }
+}
+
+static int grisu2(double d, char* digits, int* K)
+{
+    Fp w = build_fp(d);
+
+    Fp lower, upper;
+    get_normalized_boundaries(&w, &lower, &upper);
+
+    normalize(&w);
+
+    int k;
+    Fp cp = find_cachedpow10(upper.exp, &k);
+
+    w     = multiply(&w,     &cp);
+    upper = multiply(&upper, &cp);
+    lower = multiply(&lower, &cp);
+
+    lower.frac++;
+    upper.frac--;
+
+    *K = -k;
+
+    return generate_digits(&w, &upper, &lower, digits, K);
+}
+
+static int emit_digits(char* digits, int ndigits, char* dest, int K, bool neg)
+{
+    int exp = absv(K + ndigits - 1);
+
+    int max_trailing_zeros = 7;
+
+    if(neg) {
+        max_trailing_zeros -= 1;
+    }
+
+    /* write plain integer */
+    if(K >= 0 && (exp < (ndigits + max_trailing_zeros))) {
+
+        memcpy(dest, digits, ndigits);
+        memset(dest + ndigits, '0', K);
+
+        /* add a .0 to mark this as a float. */
+        dest[ndigits + K] = '.';
+        dest[ndigits + K + 1] = '0';
+
+        return ndigits + K + 2;
+    }
+
+    /* write decimal w/o scientific notation */
+    if(K < 0 && (K > -7 || exp < 10)) {
+        int offset = ndigits - absv(K);
+        /* fp < 1.0 -> write leading zero */
+        if(offset <= 0) {
+            offset = -offset;
+            dest[0] = '0';
+            dest[1] = '.';
+            memset(dest + 2, '0', offset);
+            memcpy(dest + offset + 2, digits, ndigits);
+
+            return ndigits + 2 + offset;
+
+        /* fp > 1.0 */
+        } else {
+            memcpy(dest, digits, offset);
+            dest[offset] = '.';
+            memcpy(dest + offset + 1, digits + offset, ndigits - offset);
+
+            return ndigits + 1;
+        }
+    }
+
+    /* write decimal w/ scientific notation */
+    ndigits = minv(ndigits, 18 - neg);
+
+    int idx = 0;
+    dest[idx++] = digits[0];
+
+    if(ndigits > 1) {
+        dest[idx++] = '.';
+        memcpy(dest + idx, digits + 1, ndigits - 1);
+        idx += ndigits - 1;
+    }
+
+    dest[idx++] = 'e';
+
+    char sign = K + ndigits - 1 < 0 ? '-' : '+';
+    dest[idx++] = sign;
+
+    int cent = 0;
+
+    if(exp > 99) {
+        cent = exp / 100;
+        dest[idx++] = cent + '0';
+        exp -= cent * 100;
+    }
+    if(exp > 9) {
+        int dec = exp / 10;
+        dest[idx++] = dec + '0';
+        exp -= dec * 10;
+
+    } else if(cent) {
+        dest[idx++] = '0';
+    }
+
+    dest[idx++] = exp % 10 + '0';
+
+    return idx;
+}
+
+static int filter_special(double fp, char* dest)
+{
+    if(fp == 0.0) {
+        dest[0] = '0';
+        dest[1] = '.';
+        dest[2] = '0';
+        return 3;
+    }
+
+    uint64_t bits = get_dbits(fp);
+
+    bool nan = (bits & expmask) == expmask;
+
+    if(!nan) {
+        return 0;
+    }
+
+    if(bits & fracmask) {
+        dest[0] = 'n'; dest[1] = 'a'; dest[2] = 'n';
+
+    } else {
+        dest[0] = 'i'; dest[1] = 'n'; dest[2] = 'f';
+    }
+
+    return 3;
+}
+
+/* Fast and accurate double to string conversion based on Florian Loitsch's
+ * Grisu-algorithm[1].
+ *
+ * Input:
+ * fp -> the double to convert, dest -> destination buffer.
+ * The generated string will never be longer than 28 characters.
+ * Make sure to pass a pointer to at least 28 bytes of memory.
+ * The emitted string will not be null terminated.
+ *
+ * Output:
+ * The number of written characters.
+ *
+ * Exemplary usage:
+ *
+ * void print(double d)
+ * {
+ *      char buf[28 + 1] // plus null terminator
+ *      int str_len = fpconv_dtoa(d, buf);
+ *
+ *      buf[str_len] = '\0';
+ *      printf("%s", buf);
+ * }
+ *
+ */
+static int fpconv_dtoa(double d, char dest[28])
+{
+    char digits[18];
+
+    int str_len = 0;
+    bool neg = false;
+
+    if(get_dbits(d) & signmask) {
+        dest[0] = '-';
+        str_len++;
+        neg = true;
+    }
+
+    int spec = filter_special(d, dest + str_len);
+
+    if(spec) {
+        return str_len + spec;
+    }
+
+    int K = 0;
+    int ndigits = grisu2(d, digits, &K);
+
+    str_len += emit_digits(digits, ndigits, dest + str_len, K, neg);
+
+    return str_len;
+}
diff --git a/ext/json/vendor/jeaiii-ltoa.h b/ext/json/vendor/jeaiii-ltoa.h
new file mode 100644
index 00000000000000..ba4f497fc8b22b
--- /dev/null
+++ b/ext/json/vendor/jeaiii-ltoa.h
@@ -0,0 +1,267 @@
+/*
+
+This file is released under the terms of the MIT License. It is based on the
+work of James Edward Anhalt III, with the original license listed below.
+
+MIT License
+
+Copyright (c) 2024,2025 Enrico Thierbach - https://github.com/radiospiel
+Copyright (c) 2022 James Edward Anhalt III - https://github.com/jeaiii/itoa
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+*/
+
+#ifndef JEAIII_TO_TEXT_H_
+#define JEAIII_TO_TEXT_H_
+
+#include <stdint.h>
+
+typedef uint_fast32_t u32_t;
+typedef uint_fast64_t u64_t;
+
+#define u32(x) ((u32_t)(x))
+#define u64(x) ((u64_t)(x))
+
+struct digit_pair
+{
+    char dd[2];
+};
+
+static const struct digit_pair *digits_dd = (struct digit_pair *)(
+    "00" "01" "02" "03" "04" "05" "06" "07" "08" "09"
+    "10" "11" "12" "13" "14" "15" "16" "17" "18" "19"
+    "20" "21" "22" "23" "24" "25" "26" "27" "28" "29"
+    "30" "31" "32" "33" "34" "35" "36" "37" "38" "39"
+    "40" "41" "42" "43" "44" "45" "46" "47" "48" "49"
+    "50" "51" "52" "53" "54" "55" "56" "57" "58" "59"
+    "60" "61" "62" "63" "64" "65" "66" "67" "68" "69"
+    "70" "71" "72" "73" "74" "75" "76" "77" "78" "79"
+    "80" "81" "82" "83" "84" "85" "86" "87" "88" "89"
+    "90" "91" "92" "93" "94" "95" "96" "97" "98" "99"
+);
+
+static const struct digit_pair *digits_fd = (struct digit_pair *)(
+    "0_" "1_" "2_" "3_" "4_" "5_" "6_" "7_" "8_" "9_"
+    "10" "11" "12" "13" "14" "15" "16" "17" "18" "19"
+    "20" "21" "22" "23" "24" "25" "26" "27" "28" "29"
+    "30" "31" "32" "33" "34" "35" "36" "37" "38" "39"
+    "40" "41" "42" "43" "44" "45" "46" "47" "48" "49"
+    "50" "51" "52" "53" "54" "55" "56" "57" "58" "59"
+    "60" "61" "62" "63" "64" "65" "66" "67" "68" "69"
+    "70" "71" "72" "73" "74" "75" "76" "77" "78" "79"
+    "80" "81" "82" "83" "84" "85" "86" "87" "88" "89"
+    "90" "91" "92" "93" "94" "95" "96" "97" "98" "99"
+);
+
+static const u64_t mask24 = (u64(1) << 24) - 1;
+static const u64_t mask32 = (u64(1) << 32) - 1;
+static const u64_t mask57 = (u64(1) << 57) - 1;
+
+#define COPY(buffer, digits) memcpy(buffer, &(digits), sizeof(struct digit_pair))
+
+static char *
+jeaiii_ultoa(char *b, u64_t n)
+{
+    if (n < u32(1e2)) {
+        COPY(b, digits_fd[n]);
+        return n < 10 ? b + 1 : b + 2;
+    }
+
+    if (n < u32(1e6)) {
+        if (n < u32(1e4)) {
+            u32_t f0 = u32((10 * (1 << 24) / 1e3 + 1) * n);
+            COPY(b, digits_fd[f0 >> 24]);
+
+            b -= n < u32(1e3);
+            u32_t f2 = (f0 & mask24) * 100;
+            COPY(b + 2, digits_dd[f2 >> 24]);
+
+            return b + 4;
+        }
+
+        u64_t f0 = u64(10 * (1ull << 32ull)/ 1e5 + 1) * n;
+        COPY(b, digits_fd[f0 >> 32]);
+
+        b -= n < u32(1e5);
+        u64_t f2 = (f0 & mask32) * 100;
+        COPY(b + 2, digits_dd[f2 >> 32]);
+
+        u64_t f4 = (f2 & mask32) * 100;
+        COPY(b + 4, digits_dd[f4 >> 32]);
+        return b + 6;
+    }
+
+    if (n < u64(1ull << 32ull)) {
+        if (n < u32(1e8)) {
+            u64_t f0 = u64(10 * (1ull << 48ull) / 1e7 + 1) * n >> 16;
+            COPY(b, digits_fd[f0 >> 32]);
+
+            b -= n < u32(1e7);
+            u64_t f2 = (f0 & mask32) * 100;
+            COPY(b + 2, digits_dd[f2 >> 32]);
+
+            u64_t f4 = (f2 & mask32) * 100;
+            COPY(b + 4, digits_dd[f4 >> 32]);
+
+            u64_t f6 = (f4 & mask32) * 100;
+            COPY(b + 6, digits_dd[f6 >> 32]);
+
+            return b + 8;
+        }
+
+        u64_t f0 = u64(10 * (1ull << 57ull) / 1e9 + 1) * n;
+        COPY(b, digits_fd[f0 >> 57]);
+
+        b -= n < u32(1e9);
+        u64_t f2 = (f0 & mask57) * 100;
+        COPY(b + 2, digits_dd[f2 >> 57]);
+
+        u64_t f4 = (f2 & mask57) * 100;
+        COPY(b + 4, digits_dd[f4 >> 57]);
+
+        u64_t f6 = (f4 & mask57) * 100;
+        COPY(b + 6, digits_dd[f6 >> 57]);
+
+        u64_t f8 = (f6 & mask57) * 100;
+        COPY(b + 8, digits_dd[f8 >> 57]);
+
+        return b + 10;
+    }
+
+    // if we get here U must be u64 but some compilers don't know that, so reassign n to a u64 to avoid warnings
+    u32_t z = n % u32(1e8);
+    u64_t u = n / u32(1e8);
+
+    if (u < u32(1e2)) {
+        // u can't be 1 digit (if u < 10 it would have been handled above as a 9 digit 32bit number)
+        COPY(b, digits_dd[u]);
+        b += 2;
+    }
+    else if (u < u32(1e6)) {
+        if (u < u32(1e4)) {
+            u32_t f0 = u32((10 * (1 << 24) / 1e3 + 1) * u);
+            COPY(b, digits_fd[f0 >> 24]);
+
+            b -= u < u32(1e3);
+            u32_t f2 = (f0 & mask24) * 100;
+            COPY(b + 2, digits_dd[f2 >> 24]);
+            b += 4;
+        }
+        else {
+            u64_t f0 = u64(10 * (1ull << 32ull) / 1e5 + 1) * u;
+            COPY(b, digits_fd[f0 >> 32]);
+
+            b -= u < u32(1e5);
+            u64_t f2 = (f0 & mask32) * 100;
+            COPY(b + 2, digits_dd[f2 >> 32]);
+
+            u64_t f4 = (f2 & mask32) * 100;
+            COPY(b + 4, digits_dd[f4 >> 32]);
+            b += 6;
+        }
+    }
+    else if (u < u32(1e8)) {
+        u64_t f0 = u64(10 * (1ull << 48ull) / 1e7 + 1) * u >> 16;
+        COPY(b, digits_fd[f0 >> 32]);
+
+        b -= u < u32(1e7);
+        u64_t f2 = (f0 & mask32) * 100;
+        COPY(b + 2, digits_dd[f2 >> 32]);
+
+        u64_t f4 = (f2 & mask32) * 100;
+        COPY(b + 4, digits_dd[f4 >> 32]);
+
+        u64_t f6 = (f4 & mask32) * 100;
+        COPY(b + 6, digits_dd[f6 >> 32]);
+
+        b += 8;
+    }
+    else if (u < u64(1ull << 32ull)) {
+        u64_t f0 = u64(10 * (1ull << 57ull) / 1e9 + 1) * u;
+        COPY(b, digits_fd[f0 >> 57]);
+
+        b -= u < u32(1e9);
+        u64_t f2 = (f0 & mask57) * 100;
+        COPY(b + 2, digits_dd[f2 >> 57]);
+
+        u64_t f4 = (f2 & mask57) * 100;
+        COPY(b + 4, digits_dd[f4 >> 57]);
+
+        u64_t f6 = (f4 & mask57) * 100;
+        COPY(b + 6, digits_dd[f6 >> 57]);
+
+        u64_t f8 = (f6 & mask57) * 100;
+        COPY(b + 8, digits_dd[f8 >> 57]);
+        b += 10;
+    }
+    else {
+        u32_t y = u % u32(1e8);
+        u /= u32(1e8);
+
+        // u is 2, 3, or 4 digits (if u < 10 it would have been handled above)
+        if (u < u32(1e2)) {
+            COPY(b, digits_dd[u]);
+            b += 2;
+        }
+        else {
+            u32_t f0 = u32((10 * (1 << 24) / 1e3 + 1) * u);
+            COPY(b, digits_fd[f0 >> 24]);
+
+            b -= u < u32(1e3);
+            u32_t f2 = (f0 & mask24) * 100;
+            COPY(b + 2, digits_dd[f2 >> 24]);
+
+            b += 4;
+        }
+        // do 8 digits
+        u64_t f0 = (u64((1ull << 48ull) / 1e6 + 1) * y >> 16) + 1;
+        COPY(b, digits_dd[f0 >> 32]);
+
+        u64_t f2 = (f0 & mask32) * 100;
+        COPY(b + 2, digits_dd[f2 >> 32]);
+
+        u64_t f4 = (f2 & mask32) * 100;
+        COPY(b + 4, digits_dd[f4 >> 32]);
+
+        u64_t f6 = (f4 & mask32) * 100;
+        COPY(b + 6, digits_dd[f6 >> 32]);
+        b += 8;
+    }
+
+    // do 8 digits
+    u64_t f0 = (u64((1ull << 48ull) / 1e6 + 1) * z >> 16) + 1;
+    COPY(b, digits_dd[f0 >> 32]);
+
+    u64_t f2 = (f0 & mask32) * 100;
+    COPY(b + 2, digits_dd[f2 >> 32]);
+
+    u64_t f4 = (f2 & mask32) * 100;
+    COPY(b + 4, digits_dd[f4 >> 32]);
+
+    u64_t f6 = (f4 & mask32) * 100;
+    COPY(b + 6, digits_dd[f6 >> 32]);
+
+    return b + 8;
+}
+
+#undef u32
+#undef u64
+#undef COPY
+
+#endif // JEAIII_TO_TEXT_H_
diff --git a/ext/monitor/depend b/ext/monitor/depend
index 38e21b3f669f97..0c7d54afc8dc57 100644
--- a/ext/monitor/depend
+++ b/ext/monitor/depend
@@ -127,6 +127,7 @@ monitor.o: $(hdrdir)/ruby/internal/intern/re.h
 monitor.o: $(hdrdir)/ruby/internal/intern/ruby.h
 monitor.o: $(hdrdir)/ruby/internal/intern/select.h
 monitor.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+monitor.o: $(hdrdir)/ruby/internal/intern/set.h
 monitor.o: $(hdrdir)/ruby/internal/intern/signal.h
 monitor.o: $(hdrdir)/ruby/internal/intern/sprintf.h
 monitor.o: $(hdrdir)/ruby/internal/intern/string.h
@@ -146,6 +147,7 @@ monitor.o: $(hdrdir)/ruby/internal/special_consts.h
 monitor.o: $(hdrdir)/ruby/internal/static_assert.h
 monitor.o: $(hdrdir)/ruby/internal/stdalign.h
 monitor.o: $(hdrdir)/ruby/internal/stdbool.h
+monitor.o: $(hdrdir)/ruby/internal/stdckdint.h
 monitor.o: $(hdrdir)/ruby/internal/symbol.h
 monitor.o: $(hdrdir)/ruby/internal/value.h
 monitor.o: $(hdrdir)/ruby/internal/value_type.h
diff --git a/ext/monitor/lib/monitor.rb b/ext/monitor/lib/monitor.rb
index 31d6d2b3c4a1b6..82d0a75c5665f4 100644
--- a/ext/monitor/lib/monitor.rb
+++ b/ext/monitor/lib/monitor.rb
@@ -143,13 +143,13 @@ def broadcast
 
     private
 
-    def initialize(monitor)
+    def initialize(monitor) # :nodoc:
       @monitor = monitor
       @cond = Thread::ConditionVariable.new
     end
   end
 
-  def self.extend_object(obj)
+  def self.extend_object(obj) # :nodoc:
     super(obj)
     obj.__send__(:mon_initialize)
   end
@@ -238,6 +238,8 @@ def mon_initialize
     @mon_data_owner_object_id = self.object_id
   end
 
+  # Ensures that the MonitorMixin is owned by the current thread,
+  # otherwise raises an exception.
   def mon_check_owner
     @mon_data.mon_check_owner
   end
@@ -254,6 +256,10 @@ def mon_check_owner
 #   end
 #
 class Monitor
+  #
+  # Creates a new MonitorMixin::ConditionVariable associated with the
+  # Monitor object.
+  #
   def new_cond
     ::MonitorMixin::ConditionVariable.new(self)
   end
diff --git a/ext/monitor/monitor.c b/ext/monitor/monitor.c
index 86613f6adecf9e..819c6e76996f61 100644
--- a/ext/monitor/monitor.c
+++ b/ext/monitor/monitor.c
@@ -56,6 +56,12 @@ mc_owner_p(struct rb_monitor *mc)
     return mc->owner == rb_fiber_current();
 }
 
+/*
+ * call-seq:
+ *   try_enter -> true or false
+ *
+ * Attempts to enter exclusive section.  Returns +false+ if lock fails.
+ */
 static VALUE
 monitor_try_enter(VALUE monitor)
 {
@@ -72,6 +78,12 @@ monitor_try_enter(VALUE monitor)
     return Qtrue;
 }
 
+/*
+ * call-seq:
+ *   enter -> nil
+ *
+ * Enters exclusive section.
+ */
 static VALUE
 monitor_enter(VALUE monitor)
 {
@@ -85,6 +97,7 @@ monitor_enter(VALUE monitor)
     return Qnil;
 }
 
+/* :nodoc: */
 static VALUE
 monitor_check_owner(VALUE monitor)
 {
@@ -95,6 +108,12 @@ monitor_check_owner(VALUE monitor)
     return Qnil;
 }
 
+/*
+ * call-seq:
+ *   exit -> nil
+ *
+ * Leaves exclusive section.
+ */
 static VALUE
 monitor_exit(VALUE monitor)
 {
@@ -112,6 +131,7 @@ monitor_exit(VALUE monitor)
     return Qnil;
 }
 
+/* :nodoc: */
 static VALUE
 monitor_locked_p(VALUE monitor)
 {
@@ -119,6 +139,7 @@ monitor_locked_p(VALUE monitor)
     return rb_mutex_locked_p(mc->mutex);
 }
 
+/* :nodoc: */
 static VALUE
 monitor_owned_p(VALUE monitor)
 {
@@ -166,6 +187,7 @@ monitor_enter_for_cond(VALUE v)
     return Qnil;
 }
 
+/* :nodoc: */
 static VALUE
 monitor_wait_for_cond(VALUE monitor, VALUE cond, VALUE timeout)
 {
@@ -193,6 +215,14 @@ monitor_sync_ensure(VALUE monitor)
     return monitor_exit(monitor);
 }
 
+/*
+ * call-seq:
+ *   synchronize { } -> result of the block
+ *
+ * Enters exclusive section and executes the block.  Leaves the exclusive
+ * section automatically when the block exits.  See example under
+ * +MonitorMixin+.
+ */
 static VALUE
 monitor_synchronize(VALUE monitor)
 {
diff --git a/ext/nkf/depend b/ext/nkf/depend
deleted file mode 100644
index 98afc5f201fcc8..00000000000000
--- a/ext/nkf/depend
+++ /dev/null
@@ -1,181 +0,0 @@
-# BSD make needs "nkf.o: nkf.c" dependency BEFORE "nkf.o: nkf-utf8/nkf.c".
-# It seems BSD make searches the target for implicit rule in dependencies at first.
-nkf.o: nkf.c
-
-# AUTOGENERATED DEPENDENCIES START
-nkf.o: $(RUBY_EXTCONF_H)
-nkf.o: $(arch_hdrdir)/ruby/config.h
-nkf.o: $(hdrdir)/ruby/assert.h
-nkf.o: $(hdrdir)/ruby/backward.h
-nkf.o: $(hdrdir)/ruby/backward/2/assume.h
-nkf.o: $(hdrdir)/ruby/backward/2/attributes.h
-nkf.o: $(hdrdir)/ruby/backward/2/bool.h
-nkf.o: $(hdrdir)/ruby/backward/2/inttypes.h
-nkf.o: $(hdrdir)/ruby/backward/2/limits.h
-nkf.o: $(hdrdir)/ruby/backward/2/long_long.h
-nkf.o: $(hdrdir)/ruby/backward/2/stdalign.h
-nkf.o: $(hdrdir)/ruby/backward/2/stdarg.h
-nkf.o: $(hdrdir)/ruby/defines.h
-nkf.o: $(hdrdir)/ruby/encoding.h
-nkf.o: $(hdrdir)/ruby/intern.h
-nkf.o: $(hdrdir)/ruby/internal/abi.h
-nkf.o: $(hdrdir)/ruby/internal/anyargs.h
-nkf.o: $(hdrdir)/ruby/internal/arithmetic.h
-nkf.o: $(hdrdir)/ruby/internal/arithmetic/char.h
-nkf.o: $(hdrdir)/ruby/internal/arithmetic/double.h
-nkf.o: $(hdrdir)/ruby/internal/arithmetic/fixnum.h
-nkf.o: $(hdrdir)/ruby/internal/arithmetic/gid_t.h
-nkf.o: $(hdrdir)/ruby/internal/arithmetic/int.h
-nkf.o: $(hdrdir)/ruby/internal/arithmetic/intptr_t.h
-nkf.o: $(hdrdir)/ruby/internal/arithmetic/long.h
-nkf.o: $(hdrdir)/ruby/internal/arithmetic/long_long.h
-nkf.o: $(hdrdir)/ruby/internal/arithmetic/mode_t.h
-nkf.o: $(hdrdir)/ruby/internal/arithmetic/off_t.h
-nkf.o: $(hdrdir)/ruby/internal/arithmetic/pid_t.h
-nkf.o: $(hdrdir)/ruby/internal/arithmetic/short.h
-nkf.o: $(hdrdir)/ruby/internal/arithmetic/size_t.h
-nkf.o: $(hdrdir)/ruby/internal/arithmetic/st_data_t.h
-nkf.o: $(hdrdir)/ruby/internal/arithmetic/uid_t.h
-nkf.o: $(hdrdir)/ruby/internal/assume.h
-nkf.o: $(hdrdir)/ruby/internal/attr/alloc_size.h
-nkf.o: $(hdrdir)/ruby/internal/attr/artificial.h
-nkf.o: $(hdrdir)/ruby/internal/attr/cold.h
-nkf.o: $(hdrdir)/ruby/internal/attr/const.h
-nkf.o: $(hdrdir)/ruby/internal/attr/constexpr.h
-nkf.o: $(hdrdir)/ruby/internal/attr/deprecated.h
-nkf.o: $(hdrdir)/ruby/internal/attr/diagnose_if.h
-nkf.o: $(hdrdir)/ruby/internal/attr/enum_extensibility.h
-nkf.o: $(hdrdir)/ruby/internal/attr/error.h
-nkf.o: $(hdrdir)/ruby/internal/attr/flag_enum.h
-nkf.o: $(hdrdir)/ruby/internal/attr/forceinline.h
-nkf.o: $(hdrdir)/ruby/internal/attr/format.h
-nkf.o: $(hdrdir)/ruby/internal/attr/maybe_unused.h
-nkf.o: $(hdrdir)/ruby/internal/attr/noalias.h
-nkf.o: $(hdrdir)/ruby/internal/attr/nodiscard.h
-nkf.o: $(hdrdir)/ruby/internal/attr/noexcept.h
-nkf.o: $(hdrdir)/ruby/internal/attr/noinline.h
-nkf.o: $(hdrdir)/ruby/internal/attr/nonnull.h
-nkf.o: $(hdrdir)/ruby/internal/attr/noreturn.h
-nkf.o: $(hdrdir)/ruby/internal/attr/packed_struct.h
-nkf.o: $(hdrdir)/ruby/internal/attr/pure.h
-nkf.o: $(hdrdir)/ruby/internal/attr/restrict.h
-nkf.o: $(hdrdir)/ruby/internal/attr/returns_nonnull.h
-nkf.o: $(hdrdir)/ruby/internal/attr/warning.h
-nkf.o: $(hdrdir)/ruby/internal/attr/weakref.h
-nkf.o: $(hdrdir)/ruby/internal/cast.h
-nkf.o: $(hdrdir)/ruby/internal/compiler_is.h
-nkf.o: $(hdrdir)/ruby/internal/compiler_is/apple.h
-nkf.o: $(hdrdir)/ruby/internal/compiler_is/clang.h
-nkf.o: $(hdrdir)/ruby/internal/compiler_is/gcc.h
-nkf.o: $(hdrdir)/ruby/internal/compiler_is/intel.h
-nkf.o: $(hdrdir)/ruby/internal/compiler_is/msvc.h
-nkf.o: $(hdrdir)/ruby/internal/compiler_is/sunpro.h
-nkf.o: $(hdrdir)/ruby/internal/compiler_since.h
-nkf.o: $(hdrdir)/ruby/internal/config.h
-nkf.o: $(hdrdir)/ruby/internal/constant_p.h
-nkf.o: $(hdrdir)/ruby/internal/core.h
-nkf.o: $(hdrdir)/ruby/internal/core/rarray.h
-nkf.o: $(hdrdir)/ruby/internal/core/rbasic.h
-nkf.o: $(hdrdir)/ruby/internal/core/rbignum.h
-nkf.o: $(hdrdir)/ruby/internal/core/rclass.h
-nkf.o: $(hdrdir)/ruby/internal/core/rdata.h
-nkf.o: $(hdrdir)/ruby/internal/core/rfile.h
-nkf.o: $(hdrdir)/ruby/internal/core/rhash.h
-nkf.o: $(hdrdir)/ruby/internal/core/robject.h
-nkf.o: $(hdrdir)/ruby/internal/core/rregexp.h
-nkf.o: $(hdrdir)/ruby/internal/core/rstring.h
-nkf.o: $(hdrdir)/ruby/internal/core/rstruct.h
-nkf.o: $(hdrdir)/ruby/internal/core/rtypeddata.h
-nkf.o: $(hdrdir)/ruby/internal/ctype.h
-nkf.o: $(hdrdir)/ruby/internal/dllexport.h
-nkf.o: $(hdrdir)/ruby/internal/dosish.h
-nkf.o: $(hdrdir)/ruby/internal/encoding/coderange.h
-nkf.o: $(hdrdir)/ruby/internal/encoding/ctype.h
-nkf.o: $(hdrdir)/ruby/internal/encoding/encoding.h
-nkf.o: $(hdrdir)/ruby/internal/encoding/pathname.h
-nkf.o: $(hdrdir)/ruby/internal/encoding/re.h
-nkf.o: $(hdrdir)/ruby/internal/encoding/sprintf.h
-nkf.o: $(hdrdir)/ruby/internal/encoding/string.h
-nkf.o: $(hdrdir)/ruby/internal/encoding/symbol.h
-nkf.o: $(hdrdir)/ruby/internal/encoding/transcode.h
-nkf.o: $(hdrdir)/ruby/internal/error.h
-nkf.o: $(hdrdir)/ruby/internal/eval.h
-nkf.o: $(hdrdir)/ruby/internal/event.h
-nkf.o: $(hdrdir)/ruby/internal/fl_type.h
-nkf.o: $(hdrdir)/ruby/internal/gc.h
-nkf.o: $(hdrdir)/ruby/internal/glob.h
-nkf.o: $(hdrdir)/ruby/internal/globals.h
-nkf.o: $(hdrdir)/ruby/internal/has/attribute.h
-nkf.o: $(hdrdir)/ruby/internal/has/builtin.h
-nkf.o: $(hdrdir)/ruby/internal/has/c_attribute.h
-nkf.o: $(hdrdir)/ruby/internal/has/cpp_attribute.h
-nkf.o: $(hdrdir)/ruby/internal/has/declspec_attribute.h
-nkf.o: $(hdrdir)/ruby/internal/has/extension.h
-nkf.o: $(hdrdir)/ruby/internal/has/feature.h
-nkf.o: $(hdrdir)/ruby/internal/has/warning.h
-nkf.o: $(hdrdir)/ruby/internal/intern/array.h
-nkf.o: $(hdrdir)/ruby/internal/intern/bignum.h
-nkf.o: $(hdrdir)/ruby/internal/intern/class.h
-nkf.o: $(hdrdir)/ruby/internal/intern/compar.h
-nkf.o: $(hdrdir)/ruby/internal/intern/complex.h
-nkf.o: $(hdrdir)/ruby/internal/intern/cont.h
-nkf.o: $(hdrdir)/ruby/internal/intern/dir.h
-nkf.o: $(hdrdir)/ruby/internal/intern/enum.h
-nkf.o: $(hdrdir)/ruby/internal/intern/enumerator.h
-nkf.o: $(hdrdir)/ruby/internal/intern/error.h
-nkf.o: $(hdrdir)/ruby/internal/intern/eval.h
-nkf.o: $(hdrdir)/ruby/internal/intern/file.h
-nkf.o: $(hdrdir)/ruby/internal/intern/hash.h
-nkf.o: $(hdrdir)/ruby/internal/intern/io.h
-nkf.o: $(hdrdir)/ruby/internal/intern/load.h
-nkf.o: $(hdrdir)/ruby/internal/intern/marshal.h
-nkf.o: $(hdrdir)/ruby/internal/intern/numeric.h
-nkf.o: $(hdrdir)/ruby/internal/intern/object.h
-nkf.o: $(hdrdir)/ruby/internal/intern/parse.h
-nkf.o: $(hdrdir)/ruby/internal/intern/proc.h
-nkf.o: $(hdrdir)/ruby/internal/intern/process.h
-nkf.o: $(hdrdir)/ruby/internal/intern/random.h
-nkf.o: $(hdrdir)/ruby/internal/intern/range.h
-nkf.o: $(hdrdir)/ruby/internal/intern/rational.h
-nkf.o: $(hdrdir)/ruby/internal/intern/re.h
-nkf.o: $(hdrdir)/ruby/internal/intern/ruby.h
-nkf.o: $(hdrdir)/ruby/internal/intern/select.h
-nkf.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
-nkf.o: $(hdrdir)/ruby/internal/intern/signal.h
-nkf.o: $(hdrdir)/ruby/internal/intern/sprintf.h
-nkf.o: $(hdrdir)/ruby/internal/intern/string.h
-nkf.o: $(hdrdir)/ruby/internal/intern/struct.h
-nkf.o: $(hdrdir)/ruby/internal/intern/thread.h
-nkf.o: $(hdrdir)/ruby/internal/intern/time.h
-nkf.o: $(hdrdir)/ruby/internal/intern/variable.h
-nkf.o: $(hdrdir)/ruby/internal/intern/vm.h
-nkf.o: $(hdrdir)/ruby/internal/interpreter.h
-nkf.o: $(hdrdir)/ruby/internal/iterator.h
-nkf.o: $(hdrdir)/ruby/internal/memory.h
-nkf.o: $(hdrdir)/ruby/internal/method.h
-nkf.o: $(hdrdir)/ruby/internal/module.h
-nkf.o: $(hdrdir)/ruby/internal/newobj.h
-nkf.o: $(hdrdir)/ruby/internal/scan_args.h
-nkf.o: $(hdrdir)/ruby/internal/special_consts.h
-nkf.o: $(hdrdir)/ruby/internal/static_assert.h
-nkf.o: $(hdrdir)/ruby/internal/stdalign.h
-nkf.o: $(hdrdir)/ruby/internal/stdbool.h
-nkf.o: $(hdrdir)/ruby/internal/symbol.h
-nkf.o: $(hdrdir)/ruby/internal/value.h
-nkf.o: $(hdrdir)/ruby/internal/value_type.h
-nkf.o: $(hdrdir)/ruby/internal/variable.h
-nkf.o: $(hdrdir)/ruby/internal/warning_push.h
-nkf.o: $(hdrdir)/ruby/internal/xmalloc.h
-nkf.o: $(hdrdir)/ruby/missing.h
-nkf.o: $(hdrdir)/ruby/onigmo.h
-nkf.o: $(hdrdir)/ruby/oniguruma.h
-nkf.o: $(hdrdir)/ruby/ruby.h
-nkf.o: $(hdrdir)/ruby/st.h
-nkf.o: $(hdrdir)/ruby/subst.h
-nkf.o: nkf-utf8/config.h
-nkf.o: nkf-utf8/nkf.c
-nkf.o: nkf-utf8/nkf.h
-nkf.o: nkf-utf8/utf8tbl.c
-nkf.o: nkf-utf8/utf8tbl.h
-nkf.o: nkf.c
-# AUTOGENERATED DEPENDENCIES END
diff --git a/ext/nkf/extconf.rb b/ext/nkf/extconf.rb
deleted file mode 100644
index f41f6b11dc8fbf..00000000000000
--- a/ext/nkf/extconf.rb
+++ /dev/null
@@ -1,3 +0,0 @@
-# frozen_string_literal: false
-require 'mkmf'
-create_makefile('nkf')
diff --git a/ext/nkf/lib/kconv.rb b/ext/nkf/lib/kconv.rb
deleted file mode 100644
index f52b755288b78b..00000000000000
--- a/ext/nkf/lib/kconv.rb
+++ /dev/null
@@ -1,283 +0,0 @@
-# frozen_string_literal: false
-#
-# kconv.rb - Kanji Converter.
-#
-# $Id$
-#
-# ----
-#
-# kconv.rb implements the Kconv class for Kanji Converter.  Additionally,
-# some methods in String classes are added to allow easy conversion.
-#
-
-require 'nkf'
-
-#
-# Kanji Converter for Ruby.
-#
-module Kconv
-  #
-  # Public Constants
-  #
-
-  #Constant of Encoding
-
-  # Auto-Detect
-  AUTO = NKF::AUTO
-  # ISO-2022-JP
-  JIS = NKF::JIS
-  # EUC-JP
-  EUC = NKF::EUC
-  # Shift_JIS
-  SJIS = NKF::SJIS
-  # BINARY
-  BINARY = NKF::BINARY
-  # NOCONV
-  NOCONV = NKF::NOCONV
-  # ASCII
-  ASCII = NKF::ASCII
-  # UTF-8
-  UTF8 = NKF::UTF8
-  # UTF-16
-  UTF16 = NKF::UTF16
-  # UTF-32
-  UTF32 = NKF::UTF32
-  # UNKNOWN
-  UNKNOWN = NKF::UNKNOWN
-
-  #
-  # Public Methods
-  #
-
-  # call-seq:
-  #    Kconv.kconv(str, to_enc, from_enc=nil)
-  #
-  # Convert <code>str</code> to <code>to_enc</code>.
-  # <code>to_enc</code> and <code>from_enc</code> are given as constants of Kconv or Encoding objects.
-  def kconv(str, to_enc, from_enc=nil)
-    opt = ''
-    opt += ' --ic=' + from_enc.to_s if from_enc
-    opt += ' --oc=' + to_enc.to_s if to_enc
-
-    ::NKF::nkf(opt, str)
-  end
-  module_function :kconv
-
-  #
-  # Encode to
-  #
-
-  # call-seq:
-  #    Kconv.tojis(str)   => string
-  #
-  # Convert <code>str</code> to ISO-2022-JP
-  def tojis(str)
-    kconv(str, JIS)
-  end
-  module_function :tojis
-
-  # call-seq:
-  #    Kconv.toeuc(str)   => string
-  #
-  # Convert <code>str</code> to EUC-JP
-  def toeuc(str)
-    kconv(str, EUC)
-  end
-  module_function :toeuc
-
-  # call-seq:
-  #    Kconv.tosjis(str)   => string
-  #
-  # Convert <code>str</code> to Shift_JIS
-  def tosjis(str)
-    kconv(str, SJIS)
-  end
-  module_function :tosjis
-
-  # call-seq:
-  #    Kconv.toutf8(str)   => string
-  #
-  # Convert <code>str</code> to UTF-8
-  def toutf8(str)
-    kconv(str, UTF8)
-  end
-  module_function :toutf8
-
-  # call-seq:
-  #    Kconv.toutf16(str)   => string
-  #
-  # Convert <code>str</code> to UTF-16
-  def toutf16(str)
-    kconv(str, UTF16)
-  end
-  module_function :toutf16
-
-  # call-seq:
-  #    Kconv.toutf32(str)   => string
-  #
-  # Convert <code>str</code> to UTF-32
-  def toutf32(str)
-    kconv(str, UTF32)
-  end
-  module_function :toutf32
-
-  # call-seq:
-  #    Kconv.tolocale   => string
-  #
-  # Convert <code>self</code> to locale encoding
-  def tolocale(str)
-    kconv(str, Encoding.locale_charmap)
-  end
-  module_function :tolocale
-
-  #
-  # guess
-  #
-
-  # call-seq:
-  #    Kconv.guess(str)   => encoding
-  #
-  # Guess input encoding by NKF.guess
-  def guess(str)
-    ::NKF::guess(str)
-  end
-  module_function :guess
-
-  #
-  # isEncoding
-  #
-
-  # call-seq:
-  #    Kconv.iseuc(str)   => true or false
-  #
-  # Returns whether input encoding is EUC-JP or not.
-  #
-  # *Note* don't expect this return value is MatchData.
-  def iseuc(str)
-    str.dup.force_encoding(EUC).valid_encoding?
-  end
-  module_function :iseuc
-
-  # call-seq:
-  #    Kconv.issjis(str)   => true or false
-  #
-  # Returns whether input encoding is Shift_JIS or not.
-  def issjis(str)
-    str.dup.force_encoding(SJIS).valid_encoding?
-  end
-  module_function :issjis
-
-  # call-seq:
-  #    Kconv.isjis(str)   => true or false
-  #
-  # Returns whether input encoding is ISO-2022-JP or not.
-  def isjis(str)
-    /\A [\t\n\r\x20-\x7E]*
-      (?:
-        (?:\x1b \x28 I      [\x21-\x7E]*
-          |\x1b \x28 J      [\x21-\x7E]*
-          |\x1b \x24 @      (?:[\x21-\x7E]{2})*
-          |\x1b \x24 B      (?:[\x21-\x7E]{2})*
-          |\x1b \x24 \x28 D (?:[\x21-\x7E]{2})*
-        )*
-        \x1b \x28 B [\t\n\r\x20-\x7E]*
-      )*
-     \z/nox =~ str.dup.force_encoding('BINARY') ? true : false
-  end
-  module_function :isjis
-
-  # call-seq:
-  #    Kconv.isutf8(str)   => true or false
-  #
-  # Returns whether input encoding is UTF-8 or not.
-  def isutf8(str)
-    str.dup.force_encoding(UTF8).valid_encoding?
-  end
-  module_function :isutf8
-end
-
-class String
-  # call-seq:
-  #    String#kconv(to_enc, from_enc)
-  #
-  # Convert <code>self</code> to <code>to_enc</code>.
-  # <code>to_enc</code> and <code>from_enc</code> are given as constants of Kconv or Encoding objects.
-  def kconv(to_enc, from_enc=nil)
-    from_enc = self.encoding if !from_enc && self.encoding != Encoding.list[0]
-    Kconv::kconv(self, to_enc, from_enc)
-  end
-
-  #
-  # to Encoding
-  #
-
-  # call-seq:
-  #    String#tojis   => string
-  #
-  # Convert <code>self</code> to ISO-2022-JP
-  def tojis; Kconv.tojis(self) end
-
-  # call-seq:
-  #    String#toeuc   => string
-  #
-  # Convert <code>self</code> to EUC-JP
-  def toeuc; Kconv.toeuc(self) end
-
-  # call-seq:
-  #    String#tosjis   => string
-  #
-  # Convert <code>self</code> to Shift_JIS
-  def tosjis; Kconv.tosjis(self) end
-
-  # call-seq:
-  #    String#toutf8   => string
-  #
-  # Convert <code>self</code> to UTF-8
-  def toutf8; Kconv.toutf8(self) end
-
-  # call-seq:
-  #    String#toutf16   => string
-  #
-  # Convert <code>self</code> to UTF-16
-  def toutf16; Kconv.toutf16(self) end
-
-  # call-seq:
-  #    String#toutf32   => string
-  #
-  # Convert <code>self</code> to UTF-32
-  def toutf32; Kconv.toutf32(self) end
-
-  # call-seq:
-  #    String#tolocale   => string
-  #
-  # Convert <code>self</code> to locale encoding
-  def tolocale; Kconv.tolocale(self) end
-
-  #
-  # is Encoding
-  #
-
-  # call-seq:
-  #    String#iseuc   => true or false
-  #
-  # Returns whether <code>self</code>'s encoding is EUC-JP or not.
-  def iseuc;	Kconv.iseuc(self) end
-
-  # call-seq:
-  #    String#issjis   => true or false
-  #
-  # Returns whether <code>self</code>'s encoding is Shift_JIS or not.
-  def issjis;	Kconv.issjis(self) end
-
-  # call-seq:
-  #    String#isjis   => true or false
-  #
-  # Returns whether <code>self</code>'s encoding is ISO-2022-JP or not.
-  def isjis;	Kconv.isjis(self) end
-
-  # call-seq:
-  #    String#isutf8   => true or false
-  #
-  # Returns whether <code>self</code>'s encoding is UTF-8 or not.
-  def isutf8;	Kconv.isutf8(self) end
-end
diff --git a/ext/nkf/nkf-utf8/config.h b/ext/nkf/nkf-utf8/config.h
deleted file mode 100644
index 36898c0b4b1d98..00000000000000
--- a/ext/nkf/nkf-utf8/config.h
+++ /dev/null
@@ -1,51 +0,0 @@
-#ifndef _CONFIG_H_
-#define _CONFIG_H_
-
-/* UTF8 input and output */
-#define UTF8_INPUT_ENABLE
-#define UTF8_OUTPUT_ENABLE
-
-/* invert characters invalid in Shift_JIS to CP932 */
-#define SHIFTJIS_CP932
-
-/* fix input encoding when given by option */
-#define INPUT_CODE_FIX
-
-/* --overwrite option */
-/* by Satoru Takabayashi <ccsatoru@vega.aichi-u.ac.jp> */
-#define OVERWRITE
-
-/* --cap-input, --url-input option */
-#define INPUT_OPTION
-
-/* --numchar-input option */
-#define NUMCHAR_OPTION
-
-/* --debug, --no-output option */
-#define CHECK_OPTION
-
-/* JIS X0212 */
-#define X0212_ENABLE
-
-/* --exec-in, --exec-out option
- * require pipe, fork, execvp and so on.
- * please undef this on MS-DOS, MinGW
- * this is still buggy around child process
- */
-/* #define EXEC_IO */
-
-/* Unicode Normalization */
-#define UNICODE_NORMALIZATION
-
-/*
- * Select Default Output Encoding
- *
- */
-
-/* #define DEFAULT_CODE_JIS    */
-/* #define DEFAULT_CODE_SJIS   */
-/* #define DEFAULT_CODE_WINDOWS_31J */
-/* #define DEFAULT_CODE_EUC    */
-/* #define DEFAULT_CODE_UTF8   */
-
-#endif /* _CONFIG_H_ */
diff --git a/ext/nkf/nkf-utf8/nkf.c b/ext/nkf/nkf-utf8/nkf.c
deleted file mode 100644
index 6888a439183c67..00000000000000
--- a/ext/nkf/nkf-utf8/nkf.c
+++ /dev/null
@@ -1,7205 +0,0 @@
-/*
- * Copyright (c) 1987, Fujitsu LTD. (Itaru ICHIKAWA).
- * Copyright (c) 1996-2018, The nkf Project.
- *
- * This software is provided 'as-is', without any express or implied
- * warranty. In no event will the authors be held liable for any damages
- * arising from the use of this software.
- *
- * Permission is granted to anyone to use this software for any purpose,
- * including commercial applications, and to alter it and redistribute it
- * freely, subject to the following restrictions:
- *
- * 1. The origin of this software must not be misrepresented; you must not
- * claim that you wrote the original software. If you use this software
- * in a product, an acknowledgment in the product documentation would be
- * appreciated but is not required.
- *
- * 2. Altered source versions must be plainly marked as such, and must not be
- * misrepresented as being the original software.
- *
- * 3. This notice may not be removed or altered from any source distribution.
- */
-#define NKF_VERSION "2.1.5"
-#define NKF_RELEASE_DATE "2018-12-15"
-#define COPY_RIGHT \
-    "Copyright (C) 1987, FUJITSU LTD. (I.Ichikawa).\n" \
-    "Copyright (C) 1996-2018, The nkf Project."
-
-#include "config.h"
-#include "nkf.h"
-#include "utf8tbl.h"
-#ifdef __WIN32__
-#include <windows.h>
-#include <locale.h>
-#endif
-#if defined(__OS2__)
-# define INCL_DOS
-# define INCL_DOSERRORS
-# include <os2.h>
-#endif
-#include <assert.h>
-
-
-/* state of output_mode and input_mode
-
-   c2           0 means ASCII
-   JIS_X_0201_1976_K
-   ISO_8859_1
-   JIS_X_0208
-   EOF      all termination
-   c1           32bit data
-
- */
-
-/* MIME ENCODE */
-
-#define         FIXED_MIME      7
-#define         STRICT_MIME     8
-
-/* byte order */
-enum byte_order {
-    ENDIAN_BIG    = 1,
-    ENDIAN_LITTLE = 2,
-    ENDIAN_2143   = 3,
-    ENDIAN_3412   = 4
-};
-
-/* ASCII CODE */
-
-#define         BS      0x08
-#define         TAB     0x09
-#define         LF      0x0a
-#define         CR      0x0d
-#define         ESC     0x1b
-#define         SP      0x20
-#define         DEL     0x7f
-#define         SI      0x0f
-#define         SO      0x0e
-#define         SS2     0x8e
-#define         SS3     0x8f
-#define         CRLF    0x0D0A
-
-
-/* encodings */
-
-enum nkf_encodings {
-    ASCII,
-    ISO_8859_1,
-    ISO_2022_JP,
-    CP50220,
-    CP50221,
-    CP50222,
-    ISO_2022_JP_1,
-    ISO_2022_JP_3,
-    ISO_2022_JP_2004,
-    SHIFT_JIS,
-    WINDOWS_31J,
-    CP10001,
-    EUC_JP,
-    EUCJP_NKF,
-    CP51932,
-    EUCJP_MS,
-    EUCJP_ASCII,
-    SHIFT_JISX0213,
-    SHIFT_JIS_2004,
-    EUC_JISX0213,
-    EUC_JIS_2004,
-    UTF_8,
-    UTF_8N,
-    UTF_8_BOM,
-    UTF8_MAC,
-    UTF_16,
-    UTF_16BE,
-    UTF_16BE_BOM,
-    UTF_16LE,
-    UTF_16LE_BOM,
-    UTF_32,
-    UTF_32BE,
-    UTF_32BE_BOM,
-    UTF_32LE,
-    UTF_32LE_BOM,
-    BINARY,
-    NKF_ENCODING_TABLE_SIZE,
-    JIS_X_0201_1976_K = 0x1013, /* I */ /* JIS C 6220-1969 */
-    /* JIS_X_0201_1976_R = 0x1014, */ /* J */ /* JIS C 6220-1969 */
-    /* JIS_X_0208_1978   = 0x1040, */ /* @ */ /* JIS C 6226-1978 */
-    /* JIS_X_0208_1983   = 0x1087, */ /* B */ /* JIS C 6226-1983 */
-    JIS_X_0208        = 0x1168, /* @B */
-    JIS_X_0212        = 0x1159, /* D */
-    /* JIS_X_0213_2000_1 = 0x1228, */ /* O */
-    JIS_X_0213_2 = 0x1229, /* P */
-    JIS_X_0213_1 = 0x1233 /* Q */
-};
-
-static nkf_char s_iconv(nkf_char c2, nkf_char c1, nkf_char c0);
-static nkf_char e_iconv(nkf_char c2, nkf_char c1, nkf_char c0);
-static nkf_char w_iconv(nkf_char c2, nkf_char c1, nkf_char c0);
-static nkf_char w_iconv16(nkf_char c2, nkf_char c1, nkf_char c0);
-static nkf_char w_iconv32(nkf_char c2, nkf_char c1, nkf_char c0);
-static void j_oconv(nkf_char c2, nkf_char c1);
-static void s_oconv(nkf_char c2, nkf_char c1);
-static void e_oconv(nkf_char c2, nkf_char c1);
-static void w_oconv(nkf_char c2, nkf_char c1);
-static void w_oconv16(nkf_char c2, nkf_char c1);
-static void w_oconv32(nkf_char c2, nkf_char c1);
-
-typedef const struct {
-    const char *name;
-    nkf_char (*iconv)(nkf_char c2, nkf_char c1, nkf_char c0);
-    void (*oconv)(nkf_char c2, nkf_char c1);
-} nkf_native_encoding;
-
-nkf_native_encoding NkfEncodingASCII =		{ "ASCII", e_iconv, e_oconv };
-nkf_native_encoding NkfEncodingISO_2022_JP =	{ "ISO-2022-JP", e_iconv, j_oconv };
-nkf_native_encoding NkfEncodingShift_JIS =	{ "Shift_JIS", s_iconv, s_oconv };
-nkf_native_encoding NkfEncodingEUC_JP =		{ "EUC-JP", e_iconv, e_oconv };
-nkf_native_encoding NkfEncodingUTF_8 =		{ "UTF-8", w_iconv, w_oconv };
-nkf_native_encoding NkfEncodingUTF_16 =		{ "UTF-16", w_iconv16, w_oconv16 };
-nkf_native_encoding NkfEncodingUTF_32 =		{ "UTF-32", w_iconv32, w_oconv32 };
-
-typedef const struct {
-    int id;
-    const char *name;
-    nkf_native_encoding *base_encoding;
-} nkf_encoding;
-
-nkf_encoding nkf_encoding_table[] = {
-    {ASCII,		"US-ASCII",		&NkfEncodingASCII},
-    {ISO_8859_1,	"ISO-8859-1",		&NkfEncodingASCII},
-    {ISO_2022_JP,	"ISO-2022-JP",		&NkfEncodingISO_2022_JP},
-    {CP50220,		"CP50220",		&NkfEncodingISO_2022_JP},
-    {CP50221,		"CP50221",		&NkfEncodingISO_2022_JP},
-    {CP50222,		"CP50222",		&NkfEncodingISO_2022_JP},
-    {ISO_2022_JP_1,	"ISO-2022-JP-1",	&NkfEncodingISO_2022_JP},
-    {ISO_2022_JP_3,	"ISO-2022-JP-3",	&NkfEncodingISO_2022_JP},
-    {ISO_2022_JP_2004,	"ISO-2022-JP-2004",	&NkfEncodingISO_2022_JP},
-    {SHIFT_JIS,		"Shift_JIS",		&NkfEncodingShift_JIS},
-    {WINDOWS_31J,	"Windows-31J",		&NkfEncodingShift_JIS},
-    {CP10001,		"CP10001",		&NkfEncodingShift_JIS},
-    {EUC_JP,		"EUC-JP",		&NkfEncodingEUC_JP},
-    {EUCJP_NKF,		"eucJP-nkf",		&NkfEncodingEUC_JP},
-    {CP51932,		"CP51932",		&NkfEncodingEUC_JP},
-    {EUCJP_MS,		"eucJP-MS",		&NkfEncodingEUC_JP},
-    {EUCJP_ASCII,	"eucJP-ASCII",		&NkfEncodingEUC_JP},
-    {SHIFT_JISX0213,	"Shift_JISX0213",	&NkfEncodingShift_JIS},
-    {SHIFT_JIS_2004,	"Shift_JIS-2004",	&NkfEncodingShift_JIS},
-    {EUC_JISX0213,	"EUC-JISX0213",		&NkfEncodingEUC_JP},
-    {EUC_JIS_2004,	"EUC-JIS-2004",		&NkfEncodingEUC_JP},
-    {UTF_8,		"UTF-8",		&NkfEncodingUTF_8},
-    {UTF_8N,		"UTF-8N",		&NkfEncodingUTF_8},
-    {UTF_8_BOM,		"UTF-8-BOM",		&NkfEncodingUTF_8},
-    {UTF8_MAC,		"UTF8-MAC",		&NkfEncodingUTF_8},
-    {UTF_16,		"UTF-16",		&NkfEncodingUTF_16},
-    {UTF_16BE,		"UTF-16BE",		&NkfEncodingUTF_16},
-    {UTF_16BE_BOM,	"UTF-16BE-BOM",		&NkfEncodingUTF_16},
-    {UTF_16LE,		"UTF-16LE",		&NkfEncodingUTF_16},
-    {UTF_16LE_BOM,	"UTF-16LE-BOM",		&NkfEncodingUTF_16},
-    {UTF_32,		"UTF-32",		&NkfEncodingUTF_32},
-    {UTF_32BE,		"UTF-32BE",		&NkfEncodingUTF_32},
-    {UTF_32BE_BOM,	"UTF-32BE-BOM",		&NkfEncodingUTF_32},
-    {UTF_32LE,		"UTF-32LE",		&NkfEncodingUTF_32},
-    {UTF_32LE_BOM,	"UTF-32LE-BOM",		&NkfEncodingUTF_32},
-    {BINARY,		"BINARY",		&NkfEncodingASCII},
-    {-1,		NULL,			NULL}
-};
-
-static const struct {
-    const char *name;
-    int id;
-} encoding_name_to_id_table[] = {
-    {"US-ASCII",		ASCII},
-    {"ASCII",			ASCII},
-    {"646",			ASCII},
-    {"ROMAN8",			ASCII},
-    {"ISO-2022-JP",		ISO_2022_JP},
-    {"ISO2022JP-CP932",		CP50220},
-    {"CP50220",			CP50220},
-    {"CP50221",			CP50221},
-    {"CSISO2022JP",		CP50221},
-    {"CP50222",			CP50222},
-    {"ISO-2022-JP-1",		ISO_2022_JP_1},
-    {"ISO-2022-JP-3",		ISO_2022_JP_3},
-    {"ISO-2022-JP-2004",	ISO_2022_JP_2004},
-    {"SHIFT_JIS",		SHIFT_JIS},
-    {"SJIS",			SHIFT_JIS},
-    {"MS_Kanji",		SHIFT_JIS},
-    {"PCK",			SHIFT_JIS},
-    {"WINDOWS-31J",		WINDOWS_31J},
-    {"CSWINDOWS31J",		WINDOWS_31J},
-    {"CP932",			WINDOWS_31J},
-    {"MS932",			WINDOWS_31J},
-    {"CP10001",			CP10001},
-    {"EUCJP",			EUC_JP},
-    {"EUC-JP",			EUC_JP},
-    {"EUCJP-NKF",		EUCJP_NKF},
-    {"CP51932",			CP51932},
-    {"EUC-JP-MS",		EUCJP_MS},
-    {"EUCJP-MS",		EUCJP_MS},
-    {"EUCJPMS",			EUCJP_MS},
-    {"EUC-JP-ASCII",		EUCJP_ASCII},
-    {"EUCJP-ASCII",		EUCJP_ASCII},
-    {"SHIFT_JISX0213",		SHIFT_JISX0213},
-    {"SHIFT_JIS-2004",		SHIFT_JIS_2004},
-    {"EUC-JISX0213",		EUC_JISX0213},
-    {"EUC-JIS-2004",		EUC_JIS_2004},
-    {"UTF-8",			UTF_8},
-    {"UTF-8N",			UTF_8N},
-    {"UTF-8-BOM",		UTF_8_BOM},
-    {"UTF8-MAC",		UTF8_MAC},
-    {"UTF-8-MAC",		UTF8_MAC},
-    {"UTF-16",			UTF_16},
-    {"UTF-16BE",		UTF_16BE},
-    {"UTF-16BE-BOM",		UTF_16BE_BOM},
-    {"UTF-16LE",		UTF_16LE},
-    {"UTF-16LE-BOM",		UTF_16LE_BOM},
-    {"UTF-32",			UTF_32},
-    {"UTF-32BE",		UTF_32BE},
-    {"UTF-32BE-BOM",		UTF_32BE_BOM},
-    {"UTF-32LE",		UTF_32LE},
-    {"UTF-32LE-BOM",		UTF_32LE_BOM},
-    {"BINARY",			BINARY},
-    {NULL,			-1}
-};
-
-#if defined(DEFAULT_CODE_JIS)
-#define	    DEFAULT_ENCIDX ISO_2022_JP
-#elif defined(DEFAULT_CODE_SJIS)
-#define	    DEFAULT_ENCIDX SHIFT_JIS
-#elif defined(DEFAULT_CODE_WINDOWS_31J)
-#define	    DEFAULT_ENCIDX WINDOWS_31J
-#elif defined(DEFAULT_CODE_EUC)
-#define	    DEFAULT_ENCIDX EUC_JP
-#elif defined(DEFAULT_CODE_UTF8)
-#define	    DEFAULT_ENCIDX UTF_8
-#endif
-
-
-#define		is_alnum(c)  \
-    (('a'<=c && c<='z')||('A'<= c && c<='Z')||('0'<=c && c<='9'))
-
-/* I don't trust portablity of toupper */
-#define nkf_toupper(c)  (('a'<=c && c<='z')?(c-('a'-'A')):c)
-#define nkf_isoctal(c)  ('0'<=c && c<='7')
-#define nkf_isdigit(c)  ('0'<=c && c<='9')
-#define nkf_isxdigit(c)  (nkf_isdigit(c) || ('a'<=c && c<='f') || ('A'<=c && c <= 'F'))
-#define nkf_isblank(c) (c == SP || c == TAB)
-#define nkf_isspace(c) (nkf_isblank(c) || c == CR || c == LF)
-#define nkf_isalpha(c) (('a' <= c && c <= 'z') || ('A' <= c && c <= 'Z'))
-#define nkf_isalnum(c) (nkf_isdigit(c) || nkf_isalpha(c))
-#define nkf_isprint(c) (SP<=c && c<='~')
-#define nkf_isgraph(c) ('!'<=c && c<='~')
-#define hex2bin(c) (('0'<=c&&c<='9') ? (c-'0') : \
-		    ('A'<=c&&c<='F') ? (c-'A'+10) : \
-		    ('a'<=c&&c<='f') ? (c-'a'+10) : 0)
-#define bin2hex(c) ("0123456789ABCDEF"[c&15])
-#define is_eucg3(c2) (((unsigned short)c2 >> 8) == SS3)
-#define nkf_noescape_mime(c) ((c == CR) || (c == LF) || \
-			      ((c > SP) && (c < DEL) && (c != '?') && (c != '=') && (c != '_') \
-			       && (c != '(') && (c != ')') && (c != '.') && (c != 0x22)))
-
-#define is_ibmext_in_sjis(c2) (CP932_TABLE_BEGIN <= c2 && c2 <= CP932_TABLE_END)
-#define nkf_byte_jisx0201_katakana_p(c) (SP <= c && c <= 0x5F)
-
-#define         HOLD_SIZE       1024
-#if defined(INT_IS_SHORT)
-#define         IOBUF_SIZE      2048
-#else
-#define         IOBUF_SIZE      16384
-#endif
-
-#define         DEFAULT_J       'B'
-#define         DEFAULT_R       'B'
-
-
-#define         GETA1   0x22
-#define         GETA2   0x2e
-
-
-/* MIME preprocessor */
-
-#ifdef EASYWIN /*Easy Win */
-extern POINT _BufferSize;
-#endif
-
-struct input_code{
-    const char *name;
-    nkf_char stat;
-    nkf_char score;
-    nkf_char index;
-    nkf_char buf[3];
-    void (*status_func)(struct input_code *, nkf_char);
-    nkf_char (*iconv_func)(nkf_char c2, nkf_char c1, nkf_char c0);
-    int _file_stat;
-};
-
-static const char *input_codename = NULL; /* NULL: unestablished, "": BINARY */
-static nkf_encoding *input_encoding = NULL;
-static nkf_encoding *output_encoding = NULL;
-
-#if defined(UTF8_INPUT_ENABLE) || defined(UTF8_OUTPUT_ENABLE)
-/* UCS Mapping
- * 0: Shift_JIS, eucJP-ascii
- * 1: eucJP-ms
- * 2: CP932, CP51932
- * 3: CP10001
- */
-#define UCS_MAP_ASCII   0
-#define UCS_MAP_MS      1
-#define UCS_MAP_CP932   2
-#define UCS_MAP_CP10001 3
-static int ms_ucs_map_f = UCS_MAP_ASCII;
-#endif
-#ifdef UTF8_INPUT_ENABLE
-/* no NEC special, NEC-selected IBM extended and IBM extended characters */
-static  int     no_cp932ext_f = FALSE;
-/* ignore ZERO WIDTH NO-BREAK SPACE */
-static  int     no_best_fit_chars_f = FALSE;
-static  int     input_endian = ENDIAN_BIG;
-static  int     input_bom_f = FALSE;
-static  nkf_char     unicode_subchar = '?'; /* the regular substitution character */
-static  void    (*encode_fallback)(nkf_char c) = NULL;
-static  void    w_status(struct input_code *, nkf_char);
-#endif
-#ifdef UTF8_OUTPUT_ENABLE
-static  int     output_bom_f = FALSE;
-static  int     output_endian = ENDIAN_BIG;
-#endif
-
-static  void    std_putc(nkf_char c);
-static  nkf_char     std_getc(FILE *f);
-static  nkf_char     std_ungetc(nkf_char c,FILE *f);
-
-static  nkf_char     broken_getc(FILE *f);
-static  nkf_char     broken_ungetc(nkf_char c,FILE *f);
-
-static  nkf_char     mime_getc(FILE *f);
-
-static void mime_putc(nkf_char c);
-
-/* buffers */
-
-#if !defined(PERL_XS) && !defined(WIN32DLL)
-static unsigned char   stdibuf[IOBUF_SIZE];
-static unsigned char   stdobuf[IOBUF_SIZE];
-#endif
-
-#define NKF_UNSPECIFIED (-TRUE)
-
-/* flags */
-static int             unbuf_f = FALSE;
-static int             estab_f = FALSE;
-static int             nop_f = FALSE;
-static int             binmode_f = TRUE;       /* binary mode */
-static int             rot_f = FALSE;          /* rot14/43 mode */
-static int             hira_f = FALSE;          /* hira/kata henkan */
-static int             alpha_f = FALSE;        /* convert JIx0208 alphbet to ASCII */
-static int             mime_f = MIME_DECODE_DEFAULT;   /* convert MIME B base64 or Q */
-static int             mime_decode_f = FALSE;  /* mime decode is explicitly on */
-static int             mimebuf_f = FALSE;      /* MIME buffered input */
-static int             broken_f = FALSE;       /* convert ESC-less broken JIS */
-static int             iso8859_f = FALSE;      /* ISO8859 through */
-static int             mimeout_f = FALSE;       /* base64 mode */
-static int             x0201_f = NKF_UNSPECIFIED;   /* convert JIS X 0201 */
-static int             iso2022jp_f = FALSE;    /* replace non ISO-2022-JP with GETA */
-
-#ifdef UNICODE_NORMALIZATION
-static int nfc_f = FALSE;
-static nkf_char (*i_nfc_getc)(FILE *) = std_getc; /* input of ugetc */
-static nkf_char (*i_nfc_ungetc)(nkf_char c ,FILE *f) = std_ungetc;
-#endif
-
-#ifdef INPUT_OPTION
-static int cap_f = FALSE;
-static nkf_char (*i_cgetc)(FILE *) = std_getc; /* input of cgetc */
-static nkf_char (*i_cungetc)(nkf_char c ,FILE *f) = std_ungetc;
-
-static int url_f = FALSE;
-static nkf_char (*i_ugetc)(FILE *) = std_getc; /* input of ugetc */
-static nkf_char (*i_uungetc)(nkf_char c ,FILE *f) = std_ungetc;
-#endif
-
-#define PREFIX_EUCG3    NKF_INT32_C(0x8F00)
-#define CLASS_MASK      NKF_INT32_C(0xFF000000)
-#define CLASS_UNICODE   NKF_INT32_C(0x01000000)
-#define VALUE_MASK      NKF_INT32_C(0x00FFFFFF)
-#define UNICODE_BMP_MAX NKF_INT32_C(0x0000FFFF)
-#define UNICODE_MAX     NKF_INT32_C(0x0010FFFF)
-#define nkf_char_euc3_new(c) ((c) | PREFIX_EUCG3)
-#define nkf_char_unicode_new(c) ((c) | CLASS_UNICODE)
-#define nkf_char_unicode_p(c) ((c & CLASS_MASK) == CLASS_UNICODE)
-#define nkf_char_unicode_bmp_p(c) ((c & VALUE_MASK) <= UNICODE_BMP_MAX)
-#define nkf_char_unicode_value_p(c) ((c & VALUE_MASK) <= UNICODE_MAX)
-
-#define UTF16_TO_UTF32(lead, trail) (((lead) << 10) + (trail) - NKF_INT32_C(0x35FDC00))
-
-#ifdef NUMCHAR_OPTION
-static int numchar_f = FALSE;
-static nkf_char (*i_ngetc)(FILE *) = std_getc; /* input of ugetc */
-static nkf_char (*i_nungetc)(nkf_char c ,FILE *f) = std_ungetc;
-#endif
-
-#ifdef CHECK_OPTION
-static int noout_f = FALSE;
-static void no_putc(nkf_char c);
-static int debug_f = FALSE;
-static void debug(const char *str);
-static nkf_char (*iconv_for_check)(nkf_char c2,nkf_char c1,nkf_char c0) = 0;
-#endif
-
-static int guess_f = 0; /* 0: OFF, 1: ON, 2: VERBOSE */
-static  void    set_input_codename(const char *codename);
-
-#ifdef EXEC_IO
-static int exec_f = 0;
-#endif
-
-#ifdef SHIFTJIS_CP932
-/* invert IBM extended characters to others */
-static int cp51932_f = FALSE;
-
-/* invert NEC-selected IBM extended characters to IBM extended characters */
-static int cp932inv_f = TRUE;
-
-/* static nkf_char cp932_conv(nkf_char c2, nkf_char c1); */
-#endif /* SHIFTJIS_CP932 */
-
-static int x0212_f = FALSE;
-static int x0213_f = FALSE;
-
-static unsigned char prefix_table[256];
-
-static void e_status(struct input_code *, nkf_char);
-static void s_status(struct input_code *, nkf_char);
-
-struct input_code input_code_list[] = {
-    {"EUC-JP",    0, 0, 0, {0, 0, 0}, e_status, e_iconv, 0},
-    {"Shift_JIS", 0, 0, 0, {0, 0, 0}, s_status, s_iconv, 0},
-#ifdef UTF8_INPUT_ENABLE
-    {"UTF-8",     0, 0, 0, {0, 0, 0}, w_status, w_iconv, 0},
-    {"UTF-16",     0, 0, 0, {0, 0, 0}, NULL, w_iconv16, 0},
-    {"UTF-32",     0, 0, 0, {0, 0, 0}, NULL, w_iconv32, 0},
-#endif
-    {NULL,        0, 0, 0, {0, 0, 0}, NULL, NULL, 0}
-};
-
-static int              mimeout_mode = 0; /* 0, -1, 'Q', 'B', 1, 2 */
-static int              base64_count = 0;
-
-/* X0208 -> ASCII converter */
-
-/* fold parameter */
-static int             f_line = 0;    /* chars in line */
-static int             f_prev = 0;
-static int             fold_preserve_f = FALSE; /* preserve new lines */
-static int             fold_f  = FALSE;
-static int             fold_len  = 0;
-
-/* options */
-static unsigned char   kanji_intro = DEFAULT_J;
-static unsigned char   ascii_intro = DEFAULT_R;
-
-/* Folding */
-
-#define FOLD_MARGIN  10
-#define DEFAULT_FOLD 60
-
-static int             fold_margin  = FOLD_MARGIN;
-
-/* process default */
-
-static nkf_char
-no_connection2(ARG_UNUSED nkf_char c2, ARG_UNUSED nkf_char c1, ARG_UNUSED nkf_char c0)
-{
-    fprintf(stderr,"nkf internal module connection failure.\n");
-    exit(EXIT_FAILURE);
-    return 0; /* LINT */
-}
-
-static void
-no_connection(nkf_char c2, nkf_char c1)
-{
-    no_connection2(c2,c1,0);
-}
-
-static nkf_char (*iconv)(nkf_char c2,nkf_char c1,nkf_char c0) = no_connection2;
-static void (*oconv)(nkf_char c2,nkf_char c1) = no_connection;
-
-static void (*o_zconv)(nkf_char c2,nkf_char c1) = no_connection;
-static void (*o_fconv)(nkf_char c2,nkf_char c1) = no_connection;
-static void (*o_eol_conv)(nkf_char c2,nkf_char c1) = no_connection;
-static void (*o_rot_conv)(nkf_char c2,nkf_char c1) = no_connection;
-static void (*o_hira_conv)(nkf_char c2,nkf_char c1) = no_connection;
-static void (*o_base64conv)(nkf_char c2,nkf_char c1) = no_connection;
-static void (*o_iso2022jp_check_conv)(nkf_char c2,nkf_char c1) = no_connection;
-
-/* static redirections */
-
-static  void   (*o_putc)(nkf_char c) = std_putc;
-
-static  nkf_char    (*i_getc)(FILE *f) = std_getc; /* general input */
-static  nkf_char    (*i_ungetc)(nkf_char c,FILE *f) =std_ungetc;
-
-static  nkf_char    (*i_bgetc)(FILE *) = std_getc; /* input of mgetc */
-static  nkf_char    (*i_bungetc)(nkf_char c ,FILE *f) = std_ungetc;
-
-static  void   (*o_mputc)(nkf_char c) = std_putc ; /* output of mputc */
-
-static  nkf_char    (*i_mgetc)(FILE *) = std_getc; /* input of mgetc */
-static  nkf_char    (*i_mungetc)(nkf_char c ,FILE *f) = std_ungetc;
-
-/* for strict mime */
-static  nkf_char    (*i_mgetc_buf)(FILE *) = std_getc; /* input of mgetc_buf */
-static  nkf_char    (*i_mungetc_buf)(nkf_char c,FILE *f) = std_ungetc;
-
-/* Global states */
-static int output_mode = ASCII;    /* output kanji mode */
-static int input_mode =  ASCII;    /* input kanji mode */
-static int mime_decode_mode =   FALSE;    /* MIME mode B base64, Q hex */
-
-/* X0201 / X0208 conversion tables */
-
-/* X0201 kana conversion table */
-/* 90-9F A0-DF */
-static const unsigned char cv[]= {
-    0x21,0x21,0x21,0x23,0x21,0x56,0x21,0x57,
-    0x21,0x22,0x21,0x26,0x25,0x72,0x25,0x21,
-    0x25,0x23,0x25,0x25,0x25,0x27,0x25,0x29,
-    0x25,0x63,0x25,0x65,0x25,0x67,0x25,0x43,
-    0x21,0x3c,0x25,0x22,0x25,0x24,0x25,0x26,
-    0x25,0x28,0x25,0x2a,0x25,0x2b,0x25,0x2d,
-    0x25,0x2f,0x25,0x31,0x25,0x33,0x25,0x35,
-    0x25,0x37,0x25,0x39,0x25,0x3b,0x25,0x3d,
-    0x25,0x3f,0x25,0x41,0x25,0x44,0x25,0x46,
-    0x25,0x48,0x25,0x4a,0x25,0x4b,0x25,0x4c,
-    0x25,0x4d,0x25,0x4e,0x25,0x4f,0x25,0x52,
-    0x25,0x55,0x25,0x58,0x25,0x5b,0x25,0x5e,
-    0x25,0x5f,0x25,0x60,0x25,0x61,0x25,0x62,
-    0x25,0x64,0x25,0x66,0x25,0x68,0x25,0x69,
-    0x25,0x6a,0x25,0x6b,0x25,0x6c,0x25,0x6d,
-    0x25,0x6f,0x25,0x73,0x21,0x2b,0x21,0x2c,
-    0x00,0x00};
-
-
-/* X0201 kana conversion table for dakuten */
-/* 90-9F A0-DF */
-static const unsigned char dv[]= {
-    0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-    0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-    0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-    0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-    0x00,0x00,0x00,0x00,0x00,0x00,0x25,0x74,
-    0x00,0x00,0x00,0x00,0x25,0x2c,0x25,0x2e,
-    0x25,0x30,0x25,0x32,0x25,0x34,0x25,0x36,
-    0x25,0x38,0x25,0x3a,0x25,0x3c,0x25,0x3e,
-    0x25,0x40,0x25,0x42,0x25,0x45,0x25,0x47,
-    0x25,0x49,0x00,0x00,0x00,0x00,0x00,0x00,
-    0x00,0x00,0x00,0x00,0x25,0x50,0x25,0x53,
-    0x25,0x56,0x25,0x59,0x25,0x5c,0x00,0x00,
-    0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-    0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-    0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-    0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-    0x00,0x00};
-
-/* X0201 kana conversion table for han-dakuten */
-/* 90-9F A0-DF */
-static const unsigned char ev[]= {
-    0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-    0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-    0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-    0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-    0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-    0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-    0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-    0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-    0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-    0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-    0x00,0x00,0x00,0x00,0x25,0x51,0x25,0x54,
-    0x25,0x57,0x25,0x5a,0x25,0x5d,0x00,0x00,
-    0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-    0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-    0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-    0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-    0x00,0x00};
-
-/* X0201 kana to X0213 conversion table for han-dakuten */
-/* 90-9F A0-DF */
-static const unsigned char ev_x0213[]= {
-    0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-    0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-    0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-    0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-    0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-    0x00,0x00,0x00,0x00,0x25,0x77,0x25,0x78,
-    0x25,0x79,0x25,0x7a,0x25,0x7b,0x00,0x00,
-    0x00,0x00,0x00,0x00,0x25,0x7c,0x00,0x00,
-    0x00,0x00,0x00,0x00,0x25,0x7d,0x00,0x00,
-    0x25,0x7e,0x00,0x00,0x00,0x00,0x00,0x00,
-    0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-    0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-    0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-    0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-    0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-    0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-    0x00,0x00};
-
-
-/* X0208 kigou conversion table */
-/* 0x8140 - 0x819e */
-static const unsigned char fv[] = {
-
-    0x00,0x00,0x00,0x00,0x2c,0x2e,0x00,0x3a,
-    0x3b,0x3f,0x21,0x00,0x00,0x27,0x60,0x00,
-    0x5e,0x00,0x5f,0x00,0x00,0x00,0x00,0x00,
-    0x00,0x00,0x00,0x00,0x00,0x2d,0x00,0x2f,
-    0x5c,0x00,0x00,0x7c,0x00,0x00,0x60,0x27,
-    0x22,0x22,0x28,0x29,0x00,0x00,0x5b,0x5d,
-    0x7b,0x7d,0x3c,0x3e,0x00,0x00,0x00,0x00,
-    0x00,0x00,0x00,0x00,0x2b,0x2d,0x00,0x00,
-    0x00,0x3d,0x00,0x3c,0x3e,0x00,0x00,0x00,
-    0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-    0x24,0x00,0x00,0x25,0x23,0x26,0x2a,0x40,
-    0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00
-} ;
-
-
-
-static int option_mode = 0;
-static int             file_out_f = FALSE;
-#ifdef OVERWRITE
-static int             overwrite_f = FALSE;
-static int             preserve_time_f = FALSE;
-static int             backup_f = FALSE;
-static char            *backup_suffix = "";
-#endif
-
-static int eolmode_f = 0;   /* CR, LF, CRLF */
-static int input_eol = 0; /* 0: unestablished, EOF: MIXED */
-static nkf_char prev_cr = 0; /* CR or 0 */
-#ifdef EASYWIN /*Easy Win */
-static int             end_check;
-#endif /*Easy Win */
-
-static void *
-nkf_xmalloc(size_t size)
-{
-    void *ptr;
-
-    if (size == 0) size = 1;
-
-    ptr = malloc(size);
-    if (ptr == NULL) {
-	perror("can't malloc");
-	exit(EXIT_FAILURE);
-    }
-
-    return ptr;
-}
-
-static void *
-nkf_xrealloc(void *ptr, size_t size)
-{
-    if (size == 0) size = 1;
-
-    ptr = realloc(ptr, size);
-    if (ptr == NULL) {
-	perror("can't realloc");
-	exit(EXIT_FAILURE);
-    }
-
-    return ptr;
-}
-
-#define nkf_xfree(ptr) free(ptr)
-
-static int
-nkf_str_caseeql(const char *src, const char *target)
-{
-    int i;
-    for (i = 0; src[i] && target[i]; i++) {
-	if (nkf_toupper(src[i]) != nkf_toupper(target[i])) return FALSE;
-    }
-    if (src[i] || target[i]) return FALSE;
-    else return TRUE;
-}
-
-static nkf_encoding*
-nkf_enc_from_index(int idx)
-{
-    if (idx < 0 || NKF_ENCODING_TABLE_SIZE <= idx) {
-	return 0;
-    }
-    return &nkf_encoding_table[idx];
-}
-
-static int
-nkf_enc_find_index(const char *name)
-{
-    int i;
-    if (name[0] == 'X' && *(name+1) == '-') name += 2;
-    for (i = 0; encoding_name_to_id_table[i].id >= 0; i++) {
-	if (nkf_str_caseeql(encoding_name_to_id_table[i].name, name)) {
-	    return encoding_name_to_id_table[i].id;
-	}
-    }
-    return -1;
-}
-
-static nkf_encoding*
-nkf_enc_find(const char *name)
-{
-    int idx = -1;
-    idx = nkf_enc_find_index(name);
-    if (idx < 0) return 0;
-    return nkf_enc_from_index(idx);
-}
-
-#define nkf_enc_name(enc) (enc)->name
-#define nkf_enc_to_index(enc) (enc)->id
-#define nkf_enc_to_base_encoding(enc) (enc)->base_encoding
-#define nkf_enc_to_iconv(enc) nkf_enc_to_base_encoding(enc)->iconv
-#define nkf_enc_to_oconv(enc) nkf_enc_to_base_encoding(enc)->oconv
-#define nkf_enc_asciicompat(enc) (\
-				  nkf_enc_to_base_encoding(enc) == &NkfEncodingASCII ||\
-				  nkf_enc_to_base_encoding(enc) == &NkfEncodingISO_2022_JP)
-#define nkf_enc_unicode_p(enc) (\
-				nkf_enc_to_base_encoding(enc) == &NkfEncodingUTF_8 ||\
-				nkf_enc_to_base_encoding(enc) == &NkfEncodingUTF_16 ||\
-				nkf_enc_to_base_encoding(enc) == &NkfEncodingUTF_32)
-#define nkf_enc_cp5022x_p(enc) (\
-				nkf_enc_to_index(enc) == CP50220 ||\
-				nkf_enc_to_index(enc) == CP50221 ||\
-				nkf_enc_to_index(enc) == CP50222)
-
-#ifdef DEFAULT_CODE_LOCALE
-static const char*
-nkf_locale_charmap(void)
-{
-#ifdef HAVE_LANGINFO_H
-    return nl_langinfo(CODESET);
-#elif defined(__WIN32__)
-    static char buf[16];
-    sprintf(buf, "CP%d", GetACP());
-    return buf;
-#elif defined(__OS2__)
-# if defined(INT_IS_SHORT)
-    /* OS/2 1.x */
-    return NULL;
-# else
-    /* OS/2 32bit */
-    static char buf[16];
-    ULONG ulCP[1], ulncp;
-    DosQueryCp(sizeof(ulCP), ulCP, &ulncp);
-    if (ulCP[0] == 932 || ulCP[0] == 943)
-        strcpy(buf, "Shift_JIS");
-    else
-        sprintf(buf, "CP%lu", ulCP[0]);
-    return buf;
-# endif
-#endif
-    return NULL;
-}
-
-static nkf_encoding*
-nkf_locale_encoding(void)
-{
-    nkf_encoding *enc = 0;
-    const char *encname = nkf_locale_charmap();
-    if (encname)
-	enc = nkf_enc_find(encname);
-    return enc;
-}
-#endif /* DEFAULT_CODE_LOCALE */
-
-static nkf_encoding*
-nkf_utf8_encoding(void)
-{
-    return &nkf_encoding_table[UTF_8];
-}
-
-static nkf_encoding*
-nkf_default_encoding(void)
-{
-    nkf_encoding *enc = 0;
-#ifdef DEFAULT_CODE_LOCALE
-    enc = nkf_locale_encoding();
-#elif defined(DEFAULT_ENCIDX)
-    enc = nkf_enc_from_index(DEFAULT_ENCIDX);
-#endif
-    if (!enc) enc = nkf_utf8_encoding();
-    return enc;
-}
-
-typedef struct {
-    long capa;
-    long len;
-    nkf_char *ptr;
-} nkf_buf_t;
-
-static nkf_buf_t *
-nkf_buf_new(int length)
-{
-    nkf_buf_t *buf = nkf_xmalloc(sizeof(nkf_buf_t));
-    buf->ptr = nkf_xmalloc(sizeof(nkf_char) * length);
-    buf->capa = length;
-    buf->len = 0;
-    return buf;
-}
-
-#if 0
-static void
-nkf_buf_dispose(nkf_buf_t *buf)
-{
-    nkf_xfree(buf->ptr);
-    nkf_xfree(buf);
-}
-#endif
-
-#define nkf_buf_length(buf) ((buf)->len)
-#define nkf_buf_empty_p(buf) ((buf)->len == 0)
-
-static nkf_char
-nkf_buf_at(nkf_buf_t *buf, int index)
-{
-    assert(index <= buf->len);
-    return buf->ptr[index];
-}
-
-static void
-nkf_buf_clear(nkf_buf_t *buf)
-{
-    buf->len = 0;
-}
-
-static void
-nkf_buf_push(nkf_buf_t *buf, nkf_char c)
-{
-    if (buf->capa <= buf->len) {
-	exit(EXIT_FAILURE);
-    }
-    buf->ptr[buf->len++] = c;
-}
-
-static nkf_char
-nkf_buf_pop(nkf_buf_t *buf)
-{
-    assert(!nkf_buf_empty_p(buf));
-    return buf->ptr[--buf->len];
-}
-
-/* Normalization Form C */
-#ifndef PERL_XS
-#ifdef WIN32DLL
-#define fprintf dllprintf
-#endif
-
-static void
-version(void)
-{
-    fprintf(HELP_OUTPUT,"Network Kanji Filter Version " NKF_VERSION " (" NKF_RELEASE_DATE ") \n" COPY_RIGHT "\n");
-}
-
-static void
-usage(void)
-{
-    fprintf(HELP_OUTPUT,
-	    "Usage:  nkf -[flags] [--] [in file] .. [out file for -O flag]\n"
-#ifdef UTF8_OUTPUT_ENABLE
-	    " j/s/e/w  Specify output encoding ISO-2022-JP, Shift_JIS, EUC-JP\n"
-	    "          UTF options is -w[8[0],{16,32}[{B,L}[0]]]\n"
-#else
-#endif
-#ifdef UTF8_INPUT_ENABLE
-	    " J/S/E/W  Specify input encoding ISO-2022-JP, Shift_JIS, EUC-JP\n"
-	    "          UTF option is -W[8,[16,32][B,L]]\n"
-#else
-	    " J/S/E    Specify output encoding ISO-2022-JP, Shift_JIS, EUC-JP\n"
-#endif
-	    );
-    fprintf(HELP_OUTPUT,
-	    " m[BQSN0] MIME decode [B:base64,Q:quoted,S:strict,N:nonstrict,0:no decode]\n"
-	    " M[BQ]    MIME encode [B:base64 Q:quoted]\n"
-	    " f/F      Folding: -f60 or -f or -f60-10 (fold margin 10) F preserve nl\n"
-	    );
-    fprintf(HELP_OUTPUT,
-	    " Z[0-4]   Default/0: Convert JISX0208 Alphabet to ASCII\n"
-	    "          1: Kankaku to one space  2: to two spaces  3: HTML Entity\n"
-	    "          4: JISX0208 Katakana to JISX0201 Katakana\n"
-	    " X,x      Convert Halfwidth Katakana to Fullwidth or preserve it\n"
-	    );
-    fprintf(HELP_OUTPUT,
-	    " O        Output to File (DEFAULT 'nkf.out')\n"
-	    " L[uwm]   Line mode u:LF w:CRLF m:CR (DEFAULT noconversion)\n"
-	    );
-    fprintf(HELP_OUTPUT,
-	    " --ic=<encoding>        Specify the input encoding\n"
-	    " --oc=<encoding>        Specify the output encoding\n"
-	    " --hiragana --katakana  Hiragana/Katakana Conversion\n"
-	    " --katakana-hiragana    Converts each other\n"
-	    );
-    fprintf(HELP_OUTPUT,
-#ifdef INPUT_OPTION
-	    " --{cap, url}-input     Convert hex after ':' or '%%'\n"
-#endif
-#ifdef NUMCHAR_OPTION
-	    " --numchar-input        Convert Unicode Character Reference\n"
-#endif
-#ifdef UTF8_INPUT_ENABLE
-	    " --fb-{skip, html, xml, perl, java, subchar}\n"
-	    "                        Specify unassigned character's replacement\n"
-#endif
-	    );
-    fprintf(HELP_OUTPUT,
-#ifdef OVERWRITE
-	    " --in-place[=SUF]       Overwrite original files\n"
-	    " --overwrite[=SUF]      Preserve timestamp of original files\n"
-#endif
-	    " -g --guess             Guess the input code\n"
-	    " -v --version           Print the version\n"
-	    " --help/-V              Print this help / configuration\n"
-	    );
-    version();
-}
-
-static void
-show_configuration(void)
-{
-    fprintf(HELP_OUTPUT,
-	    "Summary of my nkf " NKF_VERSION " (" NKF_RELEASE_DATE ") configuration:\n"
-	    "  Compile-time options:\n"
-	    "    Compiled at:                 " __DATE__ " " __TIME__ "\n"
-	   );
-    fprintf(HELP_OUTPUT,
-	    "    Default output encoding:     "
-#ifdef DEFAULT_CODE_LOCALE
-	    "LOCALE (%s)\n", nkf_enc_name(nkf_default_encoding())
-#elif defined(DEFAULT_ENCIDX)
-	    "CONFIG (%s)\n", nkf_enc_name(nkf_default_encoding())
-#else
-	    "NONE\n"
-#endif
-	   );
-    fprintf(HELP_OUTPUT,
-	    "    Default output end of line:  "
-#if DEFAULT_NEWLINE == CR
-	    "CR"
-#elif DEFAULT_NEWLINE == CRLF
-	    "CRLF"
-#else
-	    "LF"
-#endif
-	    "\n"
-	    "    Decode MIME encoded string:  "
-#if MIME_DECODE_DEFAULT
-	    "ON"
-#else
-	    "OFF"
-#endif
-	    "\n"
-	    "    Convert JIS X 0201 Katakana: "
-#if X0201_DEFAULT
-	    "ON"
-#else
-	    "OFF"
-#endif
-	    "\n"
-	    "    --help, --version output:    "
-#if HELP_OUTPUT_HELP_OUTPUT
-	    "HELP_OUTPUT"
-#else
-	    "STDOUT"
-#endif
-	    "\n");
-}
-#endif /*PERL_XS*/
-
-#ifdef OVERWRITE
-static char*
-get_backup_filename(const char *suffix, const char *filename)
-{
-    char *backup_filename;
-    int asterisk_count = 0;
-    int i, j;
-    int filename_length = strlen(filename);
-
-    for(i = 0; suffix[i]; i++){
-	if(suffix[i] == '*') asterisk_count++;
-    }
-
-    if(asterisk_count){
-	backup_filename = nkf_xmalloc(strlen(suffix) + (asterisk_count * (filename_length - 1)) + 1);
-	for(i = 0, j = 0; suffix[i];){
-	    if(suffix[i] == '*'){
-		backup_filename[j] = '\0';
-		strncat(backup_filename, filename, filename_length);
-		i++;
-		j += filename_length;
-	    }else{
-		backup_filename[j++] = suffix[i++];
-	    }
-	}
-	backup_filename[j] = '\0';
-    }else{
-	j = filename_length + strlen(suffix);
-	backup_filename = nkf_xmalloc(j + 1);
-	strcpy(backup_filename, filename);
-	strcat(backup_filename, suffix);
-	backup_filename[j] = '\0';
-    }
-    return backup_filename;
-}
-#endif
-
-#ifdef UTF8_INPUT_ENABLE
-static void
-nkf_each_char_to_hex(void (*f)(nkf_char c2,nkf_char c1), nkf_char c)
-{
-    int shift = 20;
-    c &= VALUE_MASK;
-    while(shift >= 0){
-	if(c >= NKF_INT32_C(1)<<shift){
-	    while(shift >= 0){
-		(*f)(0, bin2hex(c>>shift));
-		shift -= 4;
-	    }
-	}else{
-	    shift -= 4;
-	}
-    }
-    return;
-}
-
-static void
-encode_fallback_html(nkf_char c)
-{
-    (*oconv)(0, '&');
-    (*oconv)(0, '#');
-    c &= VALUE_MASK;
-    if(c >= NKF_INT32_C(1000000))
-	(*oconv)(0, 0x30+(c/NKF_INT32_C(1000000))%10);
-    if(c >= NKF_INT32_C(100000))
-	(*oconv)(0, 0x30+(c/NKF_INT32_C(100000) )%10);
-    if(c >= 10000)
-	(*oconv)(0, 0x30+(c/10000  )%10);
-    if(c >= 1000)
-	(*oconv)(0, 0x30+(c/1000   )%10);
-    if(c >= 100)
-	(*oconv)(0, 0x30+(c/100    )%10);
-    if(c >= 10)
-	(*oconv)(0, 0x30+(c/10     )%10);
-    if(c >= 0)
-	(*oconv)(0, 0x30+ c         %10);
-    (*oconv)(0, ';');
-    return;
-}
-
-static void
-encode_fallback_xml(nkf_char c)
-{
-    (*oconv)(0, '&');
-    (*oconv)(0, '#');
-    (*oconv)(0, 'x');
-    nkf_each_char_to_hex(oconv, c);
-    (*oconv)(0, ';');
-    return;
-}
-
-static void
-encode_fallback_java(nkf_char c)
-{
-    (*oconv)(0, '\\');
-    c &= VALUE_MASK;
-    if(!nkf_char_unicode_bmp_p(c)){
-        int high = (c >> 10) + NKF_INT32_C(0xD7C0);   /* high surrogate */
-        int low = (c & 0x3FF) + NKF_INT32_C(0xDC00); /* low surrogate */
-	(*oconv)(0, 'u');
-	(*oconv)(0, bin2hex(high>>12));
-	(*oconv)(0, bin2hex(high>> 8));
-	(*oconv)(0, bin2hex(high>> 4));
-	(*oconv)(0, bin2hex(high    ));
-	(*oconv)(0, '\\');
-	(*oconv)(0, 'u');
-	(*oconv)(0, bin2hex(low>>12));
-	(*oconv)(0, bin2hex(low>> 8));
-	(*oconv)(0, bin2hex(low>> 4));
-	(*oconv)(0, bin2hex(low    ));
-    }else{
-	(*oconv)(0, 'u');
-	(*oconv)(0, bin2hex(c>>12));
-	(*oconv)(0, bin2hex(c>> 8));
-	(*oconv)(0, bin2hex(c>> 4));
-	(*oconv)(0, bin2hex(c    ));
-    }
-    return;
-}
-
-static void
-encode_fallback_perl(nkf_char c)
-{
-    (*oconv)(0, '\\');
-    (*oconv)(0, 'x');
-    (*oconv)(0, '{');
-    nkf_each_char_to_hex(oconv, c);
-    (*oconv)(0, '}');
-    return;
-}
-
-static void
-encode_fallback_subchar(nkf_char c)
-{
-    c = unicode_subchar;
-    (*oconv)((c>>8)&0xFF, c&0xFF);
-    return;
-}
-#endif
-
-static const struct {
-    const char *name;
-    const char *alias;
-} long_option[] = {
-    {"ic=", ""},
-    {"oc=", ""},
-    {"base64","jMB"},
-    {"euc","e"},
-    {"euc-input","E"},
-    {"fj","jm"},
-    {"help",""},
-    {"jis","j"},
-    {"jis-input","J"},
-    {"mac","sLm"},
-    {"mime","jM"},
-    {"mime-input","m"},
-    {"msdos","sLw"},
-    {"sjis","s"},
-    {"sjis-input","S"},
-    {"unix","eLu"},
-    {"version","v"},
-    {"windows","sLw"},
-    {"hiragana","h1"},
-    {"katakana","h2"},
-    {"katakana-hiragana","h3"},
-    {"guess=", ""},
-    {"guess", "g2"},
-    {"cp932", ""},
-    {"no-cp932", ""},
-#ifdef X0212_ENABLE
-    {"x0212", ""},
-#endif
-#ifdef UTF8_OUTPUT_ENABLE
-    {"utf8", "w"},
-    {"utf16", "w16"},
-    {"ms-ucs-map", ""},
-    {"fb-skip", ""},
-    {"fb-html", ""},
-    {"fb-xml", ""},
-    {"fb-perl", ""},
-    {"fb-java", ""},
-    {"fb-subchar", ""},
-    {"fb-subchar=", ""},
-#endif
-#ifdef UTF8_INPUT_ENABLE
-    {"utf8-input", "W"},
-    {"utf16-input", "W16"},
-    {"no-cp932ext", ""},
-    {"no-best-fit-chars",""},
-#endif
-#ifdef UNICODE_NORMALIZATION
-    {"utf8mac-input", ""},
-#endif
-#ifdef OVERWRITE
-    {"overwrite", ""},
-    {"overwrite=", ""},
-    {"in-place", ""},
-    {"in-place=", ""},
-#endif
-#ifdef INPUT_OPTION
-    {"cap-input", ""},
-    {"url-input", ""},
-#endif
-#ifdef NUMCHAR_OPTION
-    {"numchar-input", ""},
-#endif
-#ifdef CHECK_OPTION
-    {"no-output", ""},
-    {"debug", ""},
-#endif
-#ifdef SHIFTJIS_CP932
-    {"cp932inv", ""},
-#endif
-#ifdef EXEC_IO
-    {"exec-in", ""},
-    {"exec-out", ""},
-#endif
-    {"prefix=", ""},
-};
-
-static void
-set_input_encoding(nkf_encoding *enc)
-{
-    switch (nkf_enc_to_index(enc)) {
-    case ISO_8859_1:
-	iso8859_f = TRUE;
-	break;
-    case CP50221:
-    case CP50222:
-	if (x0201_f == NKF_UNSPECIFIED) x0201_f = FALSE;	/* -x specified implicitly */
-    case CP50220:
-#ifdef SHIFTJIS_CP932
-	cp51932_f = TRUE;
-#endif
-#ifdef UTF8_OUTPUT_ENABLE
-	ms_ucs_map_f = UCS_MAP_CP932;
-#endif
-	break;
-    case ISO_2022_JP_1:
-	x0212_f = TRUE;
-	break;
-    case ISO_2022_JP_3:
-	x0212_f = TRUE;
-	x0213_f = TRUE;
-	break;
-    case ISO_2022_JP_2004:
-	x0212_f = TRUE;
-	x0213_f = TRUE;
-	break;
-    case SHIFT_JIS:
-	break;
-    case WINDOWS_31J:
-	if (x0201_f == NKF_UNSPECIFIED) x0201_f = FALSE;	/* -x specified implicitly */
-#ifdef SHIFTJIS_CP932
-	cp51932_f = TRUE;
-#endif
-#ifdef UTF8_OUTPUT_ENABLE
-	ms_ucs_map_f = UCS_MAP_CP932;
-#endif
-	break;
-	break;
-    case CP10001:
-#ifdef SHIFTJIS_CP932
-	cp51932_f = TRUE;
-#endif
-#ifdef UTF8_OUTPUT_ENABLE
-	ms_ucs_map_f = UCS_MAP_CP10001;
-#endif
-	break;
-    case EUC_JP:
-	break;
-    case EUCJP_NKF:
-	break;
-    case CP51932:
-	if (x0201_f == NKF_UNSPECIFIED) x0201_f = FALSE;	/* -x specified implicitly */
-#ifdef SHIFTJIS_CP932
-	cp51932_f = TRUE;
-#endif
-#ifdef UTF8_OUTPUT_ENABLE
-	ms_ucs_map_f = UCS_MAP_CP932;
-#endif
-	break;
-    case EUCJP_MS:
-	if (x0201_f == NKF_UNSPECIFIED) x0201_f = FALSE;	/* -x specified implicitly */
-#ifdef SHIFTJIS_CP932
-	cp51932_f = FALSE;
-#endif
-#ifdef UTF8_OUTPUT_ENABLE
-	ms_ucs_map_f = UCS_MAP_MS;
-#endif
-	break;
-    case EUCJP_ASCII:
-	if (x0201_f == NKF_UNSPECIFIED) x0201_f = FALSE;	/* -x specified implicitly */
-#ifdef SHIFTJIS_CP932
-	cp51932_f = FALSE;
-#endif
-#ifdef UTF8_OUTPUT_ENABLE
-	ms_ucs_map_f = UCS_MAP_ASCII;
-#endif
-	break;
-    case SHIFT_JISX0213:
-    case SHIFT_JIS_2004:
-	x0213_f = TRUE;
-#ifdef SHIFTJIS_CP932
-	cp51932_f = FALSE;
-	if (cp932inv_f == TRUE) cp932inv_f = FALSE;
-#endif
-	break;
-    case EUC_JISX0213:
-    case EUC_JIS_2004:
-	x0213_f = TRUE;
-#ifdef SHIFTJIS_CP932
-	cp51932_f = FALSE;
-#endif
-	break;
-#ifdef UTF8_INPUT_ENABLE
-#ifdef UNICODE_NORMALIZATION
-    case UTF8_MAC:
-	nfc_f = TRUE;
-	break;
-#endif
-    case UTF_16:
-    case UTF_16BE:
-    case UTF_16BE_BOM:
-	input_endian = ENDIAN_BIG;
-	break;
-    case UTF_16LE:
-    case UTF_16LE_BOM:
-	input_endian = ENDIAN_LITTLE;
-	break;
-    case UTF_32:
-    case UTF_32BE:
-    case UTF_32BE_BOM:
-	input_endian = ENDIAN_BIG;
-	break;
-    case UTF_32LE:
-    case UTF_32LE_BOM:
-	input_endian = ENDIAN_LITTLE;
-	break;
-#endif
-    }
-}
-
-static void
-set_output_encoding(nkf_encoding *enc)
-{
-    switch (nkf_enc_to_index(enc)) {
-    case CP50220:
-#ifdef SHIFTJIS_CP932
-	if (cp932inv_f == TRUE) cp932inv_f = FALSE;
-#endif
-#ifdef UTF8_OUTPUT_ENABLE
-	ms_ucs_map_f = UCS_MAP_CP932;
-#endif
-	break;
-    case CP50221:
-	if (x0201_f == NKF_UNSPECIFIED) x0201_f = FALSE;	/* -x specified implicitly */
-#ifdef SHIFTJIS_CP932
-	if (cp932inv_f == TRUE) cp932inv_f = FALSE;
-#endif
-#ifdef UTF8_OUTPUT_ENABLE
-	ms_ucs_map_f = UCS_MAP_CP932;
-#endif
-	break;
-    case ISO_2022_JP:
-#ifdef SHIFTJIS_CP932
-	if (cp932inv_f == TRUE) cp932inv_f = FALSE;
-#endif
-	break;
-    case ISO_2022_JP_1:
-	x0212_f = TRUE;
-#ifdef SHIFTJIS_CP932
-	if (cp932inv_f == TRUE) cp932inv_f = FALSE;
-#endif
-	break;
-    case ISO_2022_JP_3:
-    case ISO_2022_JP_2004:
-	x0212_f = TRUE;
-	x0213_f = TRUE;
-#ifdef SHIFTJIS_CP932
-	if (cp932inv_f == TRUE) cp932inv_f = FALSE;
-#endif
-	break;
-    case SHIFT_JIS:
-	break;
-    case WINDOWS_31J:
-	if (x0201_f == NKF_UNSPECIFIED) x0201_f = FALSE;	/* -x specified implicitly */
-#ifdef UTF8_OUTPUT_ENABLE
-	ms_ucs_map_f = UCS_MAP_CP932;
-#endif
-	break;
-    case CP10001:
-#ifdef UTF8_OUTPUT_ENABLE
-	ms_ucs_map_f = UCS_MAP_CP10001;
-#endif
-	break;
-    case EUC_JP:
-	x0212_f = TRUE;
-#ifdef SHIFTJIS_CP932
-	if (cp932inv_f == TRUE) cp932inv_f = FALSE;
-#endif
-#ifdef UTF8_OUTPUT_ENABLE
-	ms_ucs_map_f = UCS_MAP_ASCII;
-#endif
-	break;
-    case EUCJP_NKF:
-	x0212_f = FALSE;
-#ifdef SHIFTJIS_CP932
-	if (cp932inv_f == TRUE) cp932inv_f = FALSE;
-#endif
-#ifdef UTF8_OUTPUT_ENABLE
-	ms_ucs_map_f = UCS_MAP_ASCII;
-#endif
-	break;
-    case CP51932:
-	if (x0201_f == NKF_UNSPECIFIED) x0201_f = FALSE;	/* -x specified implicitly */
-#ifdef SHIFTJIS_CP932
-	if (cp932inv_f == TRUE) cp932inv_f = FALSE;
-#endif
-#ifdef UTF8_OUTPUT_ENABLE
-	ms_ucs_map_f = UCS_MAP_CP932;
-#endif
-	break;
-    case EUCJP_MS:
-	if (x0201_f == NKF_UNSPECIFIED) x0201_f = FALSE;	/* -x specified implicitly */
-	x0212_f = TRUE;
-#ifdef UTF8_OUTPUT_ENABLE
-	ms_ucs_map_f = UCS_MAP_MS;
-#endif
-	break;
-    case EUCJP_ASCII:
-	if (x0201_f == NKF_UNSPECIFIED) x0201_f = FALSE;	/* -x specified implicitly */
-	x0212_f = TRUE;
-#ifdef UTF8_OUTPUT_ENABLE
-	ms_ucs_map_f = UCS_MAP_ASCII;
-#endif
-	break;
-    case SHIFT_JISX0213:
-    case SHIFT_JIS_2004:
-	x0213_f = TRUE;
-#ifdef SHIFTJIS_CP932
-	if (cp932inv_f == TRUE) cp932inv_f = FALSE;
-#endif
-	break;
-    case EUC_JISX0213:
-    case EUC_JIS_2004:
-	x0212_f = TRUE;
-	x0213_f = TRUE;
-#ifdef SHIFTJIS_CP932
-	if (cp932inv_f == TRUE) cp932inv_f = FALSE;
-#endif
-	break;
-#ifdef UTF8_OUTPUT_ENABLE
-    case UTF_8_BOM:
-	output_bom_f = TRUE;
-	break;
-    case UTF_16:
-    case UTF_16BE_BOM:
-	output_bom_f = TRUE;
-	break;
-    case UTF_16LE:
-	output_endian = ENDIAN_LITTLE;
-	output_bom_f = FALSE;
-	break;
-    case UTF_16LE_BOM:
-	output_endian = ENDIAN_LITTLE;
-	output_bom_f = TRUE;
-	break;
-    case UTF_32:
-    case UTF_32BE_BOM:
-	output_bom_f = TRUE;
-	break;
-    case UTF_32LE:
-	output_endian = ENDIAN_LITTLE;
-	output_bom_f = FALSE;
-	break;
-    case UTF_32LE_BOM:
-	output_endian = ENDIAN_LITTLE;
-	output_bom_f = TRUE;
-	break;
-#endif
-    }
-}
-
-static struct input_code*
-find_inputcode_byfunc(nkf_char (*iconv_func)(nkf_char c2,nkf_char c1,nkf_char c0))
-{
-    if (iconv_func){
-	struct input_code *p = input_code_list;
-	while (p->name){
-	    if (iconv_func == p->iconv_func){
-		return p;
-	    }
-	    p++;
-	}
-    }
-    return 0;
-}
-
-static void
-set_iconv(nkf_char f, nkf_char (*iconv_func)(nkf_char c2,nkf_char c1,nkf_char c0))
-{
-#ifdef INPUT_CODE_FIX
-    if (f || !input_encoding)
-#endif
-	if (estab_f != f){
-	    estab_f = f;
-	}
-
-    if (iconv_func
-#ifdef INPUT_CODE_FIX
-	&& (f == -TRUE || !input_encoding) /* -TRUE means "FORCE" */
-#endif
-       ){
-	iconv = iconv_func;
-    }
-#ifdef CHECK_OPTION
-    if (estab_f && iconv_for_check != iconv){
-	struct input_code *p = find_inputcode_byfunc(iconv);
-	if (p){
-	    set_input_codename(p->name);
-	    debug(p->name);
-	}
-	iconv_for_check = iconv;
-    }
-#endif
-}
-
-#ifdef X0212_ENABLE
-static nkf_char
-x0212_shift(nkf_char c)
-{
-    nkf_char ret = c;
-    c &= 0x7f;
-    if (is_eucg3(ret)){
-	if (0x75 <= c && c <= 0x7f){
-	    ret = c + (0x109 - 0x75);
-	}
-    }else{
-	if (0x75 <= c && c <= 0x7f){
-	    ret = c + (0x113 - 0x75);
-	}
-    }
-    return ret;
-}
-
-
-static nkf_char
-x0212_unshift(nkf_char c)
-{
-    nkf_char ret = c;
-    if (0x7f <= c && c <= 0x88){
-	ret = c + (0x75 - 0x7f);
-    }else if (0x89 <= c && c <= 0x92){
-	ret = PREFIX_EUCG3 | 0x80 | (c + (0x75 - 0x89));
-    }
-    return ret;
-}
-#endif /* X0212_ENABLE */
-
-static int
-is_x0213_2_in_x0212(nkf_char c1)
-{
-    static const char x0213_2_table[] =
-	{0, 1, 0, 1, 1, 1, 0, 0, 1, 0, 0, 0, 1, 1, 1, 1};
-    int ku = c1 - 0x20;
-    if (ku <= 15)
-	return x0213_2_table[ku]; /* 1, 3-5, 8, 12-15 */
-    if (78 <= ku && ku <= 94)
-	return 1;
-    return 0;
-}
-
-static nkf_char
-e2s_conv(nkf_char c2, nkf_char c1, nkf_char *p2, nkf_char *p1)
-{
-    nkf_char ndx;
-    if (is_eucg3(c2)){
-	ndx = c2 & 0x7f;
-	if (x0213_f && is_x0213_2_in_x0212(ndx)){
-	    if((0x21 <= ndx && ndx <= 0x2F)){
-		if (p2) *p2 = ((ndx - 1) >> 1) + 0xec - ndx / 8 * 3;
-		if (p1) *p1 = c1 + ((ndx & 1) ? ((c1 < 0x60) ? 0x1f : 0x20) : 0x7e);
-		return 0;
-	    }else if(0x6E <= ndx && ndx <= 0x7E){
-		if (p2) *p2 = ((ndx - 1) >> 1) + 0xbe;
-		if (p1) *p1 = c1 + ((ndx & 1) ? ((c1 < 0x60) ? 0x1f : 0x20) : 0x7e);
-		return 0;
-	    }
-	    return 1;
-	}
-#ifdef X0212_ENABLE
-	else if(nkf_isgraph(ndx)){
-	    nkf_char val = 0;
-	    const unsigned short *ptr;
-	    ptr = x0212_shiftjis[ndx - 0x21];
-	    if (ptr){
-		val = ptr[(c1 & 0x7f) - 0x21];
-	    }
-	    if (val){
-		c2 = val >> 8;
-		c1 = val & 0xff;
-		if (p2) *p2 = c2;
-		if (p1) *p1 = c1;
-		return 0;
-	    }
-	    c2 = x0212_shift(c2);
-	}
-#endif /* X0212_ENABLE */
-    }
-    if(0x7F < c2) return 1;
-    if (p2) *p2 = ((c2 - 1) >> 1) + ((c2 <= 0x5e) ? 0x71 : 0xb1);
-    if (p1) *p1 = c1 + ((c2 & 1) ? ((c1 < 0x60) ? 0x1f : 0x20) : 0x7e);
-    return 0;
-}
-
-static nkf_char
-s2e_conv(nkf_char c2, nkf_char c1, nkf_char *p2, nkf_char *p1)
-{
-#if defined(SHIFTJIS_CP932) || defined(X0212_ENABLE)
-    nkf_char val;
-#endif
-    static const char shift_jisx0213_s1a3_table[5][2] ={ { 1, 8}, { 3, 4}, { 5,12}, {13,14}, {15, 0} };
-    if (0xFC < c1) return 1;
-#ifdef SHIFTJIS_CP932
-    if (!cp932inv_f && !x0213_f && is_ibmext_in_sjis(c2)){
-	val = shiftjis_cp932[c2 - CP932_TABLE_BEGIN][c1 - 0x40];
-	if (val){
-	    c2 = val >> 8;
-	    c1 = val & 0xff;
-	}
-    }
-    if (cp932inv_f
-	&& CP932INV_TABLE_BEGIN <= c2 && c2 <= CP932INV_TABLE_END){
-	val = cp932inv[c2 - CP932INV_TABLE_BEGIN][c1 - 0x40];
-	if (val){
-	    c2 = val >> 8;
-	    c1 = val & 0xff;
-	}
-    }
-#endif /* SHIFTJIS_CP932 */
-#ifdef X0212_ENABLE
-    if (!x0213_f && is_ibmext_in_sjis(c2)){
-	val = shiftjis_x0212[c2 - 0xfa][c1 - 0x40];
-	if (val){
-	    if (val > 0x7FFF){
-		c2 = PREFIX_EUCG3 | ((val >> 8) & 0x7f);
-		c1 = val & 0xff;
-	    }else{
-		c2 = val >> 8;
-		c1 = val & 0xff;
-	    }
-	    if (p2) *p2 = c2;
-	    if (p1) *p1 = c1;
-	    return 0;
-	}
-    }
-#endif
-    if(c2 >= 0x80){
-	if(x0213_f && c2 >= 0xF0){
-	    if(c2 <= 0xF3 || (c2 == 0xF4 && c1 < 0x9F)){ /* k=1, 3<=k<=5, k=8, 12<=k<=15 */
-		c2 = PREFIX_EUCG3 | 0x20 | shift_jisx0213_s1a3_table[c2 - 0xF0][0x9E < c1];
-	    }else{ /* 78<=k<=94 */
-		c2 = PREFIX_EUCG3 | (c2 * 2 - 0x17B);
-		if (0x9E < c1) c2++;
-	    }
-	}else{
-#define         SJ0162  0x00e1          /* 01 - 62 ku offset */
-#define         SJ6394  0x0161          /* 63 - 94 ku offset */
-	    c2 = c2 + c2 - ((c2 <= 0x9F) ? SJ0162 : SJ6394);
-	    if (0x9E < c1) c2++;
-	}
-	if (c1 < 0x9F)
-	    c1 = c1 - ((c1 > DEL) ? SP : 0x1F);
-	else {
-	    c1 = c1 - 0x7E;
-	}
-    }
-
-#ifdef X0212_ENABLE
-    c2 = x0212_unshift(c2);
-#endif
-    if (p2) *p2 = c2;
-    if (p1) *p1 = c1;
-    return 0;
-}
-
-#if defined(UTF8_INPUT_ENABLE) || defined(UTF8_OUTPUT_ENABLE)
-static void
-nkf_unicode_to_utf8(nkf_char val, nkf_char *p1, nkf_char *p2, nkf_char *p3, nkf_char *p4)
-{
-    val &= VALUE_MASK;
-    if (val < 0x80){
-	*p1 = val;
-	*p2 = 0;
-	*p3 = 0;
-	*p4 = 0;
-    }else if (val < 0x800){
-	*p1 = 0xc0 | (val >> 6);
-	*p2 = 0x80 | (val & 0x3f);
-	*p3 = 0;
-	*p4 = 0;
-    } else if (nkf_char_unicode_bmp_p(val)) {
-	*p1 = 0xe0 |  (val >> 12);
-	*p2 = 0x80 | ((val >>  6) & 0x3f);
-	*p3 = 0x80 | ( val        & 0x3f);
-	*p4 = 0;
-    } else if (nkf_char_unicode_value_p(val)) {
-	*p1 = 0xf0 |  (val >> 18);
-	*p2 = 0x80 | ((val >> 12) & 0x3f);
-	*p3 = 0x80 | ((val >>  6) & 0x3f);
-	*p4 = 0x80 | ( val        & 0x3f);
-    } else {
-	*p1 = 0;
-	*p2 = 0;
-	*p3 = 0;
-	*p4 = 0;
-    }
-}
-
-static nkf_char
-nkf_utf8_to_unicode(nkf_char c1, nkf_char c2, nkf_char c3, nkf_char c4)
-{
-    nkf_char wc;
-    if (c1 <= 0x7F) {
-	/* single byte */
-	wc = c1;
-    }
-    else if (c1 <= 0xC1) {
-	/* trail byte or invalid */
-	return -1;
-    }
-    else if (c1 <= 0xDF) {
-	/* 2 bytes */
-	wc  = (c1 & 0x1F) << 6;
-	wc |= (c2 & 0x3F);
-    }
-    else if (c1 <= 0xEF) {
-	/* 3 bytes */
-	wc  = (c1 & 0x0F) << 12;
-	wc |= (c2 & 0x3F) << 6;
-	wc |= (c3 & 0x3F);
-    }
-    else if (c2 <= 0xF4) {
-	/* 4 bytes */
-	wc  = (c1 & 0x0F) << 18;
-	wc |= (c2 & 0x3F) << 12;
-	wc |= (c3 & 0x3F) << 6;
-	wc |= (c4 & 0x3F);
-    }
-    else {
-	return -1;
-    }
-    return wc;
-}
-#endif
-
-#ifdef UTF8_INPUT_ENABLE
-static int
-unicode_to_jis_common2(nkf_char c1, nkf_char c0,
-		       const unsigned short *const *pp, nkf_char psize,
-		       nkf_char *p2, nkf_char *p1)
-{
-    nkf_char c2;
-    const unsigned short *p;
-    unsigned short val;
-
-    if (pp == 0) return 1;
-
-    c1 -= 0x80;
-    if (c1 < 0 || psize <= c1) return 1;
-    p = pp[c1];
-    if (p == 0)  return 1;
-
-    c0 -= 0x80;
-    if (c0 < 0 || sizeof_utf8_to_euc_C2 <= c0) return 1;
-    val = p[c0];
-    if (val == 0) return 1;
-    if (no_cp932ext_f && (
-			  (val>>8) == 0x2D || /* NEC special characters */
-			  val > NKF_INT32_C(0xF300) /* IBM extended characters */
-			 )) return 1;
-
-    c2 = val >> 8;
-    if (val > 0x7FFF){
-	c2 &= 0x7f;
-	c2 |= PREFIX_EUCG3;
-    }
-    if (c2 == SO) c2 = JIS_X_0201_1976_K;
-    c1 = val & 0xFF;
-    if (p2) *p2 = c2;
-    if (p1) *p1 = c1;
-    return 0;
-}
-
-static int
-unicode_to_jis_common(nkf_char c2, nkf_char c1, nkf_char c0, nkf_char *p2, nkf_char *p1)
-{
-    const unsigned short *const *pp;
-    const unsigned short *const *const *ppp;
-    static const char no_best_fit_chars_table_C2[] =
-    {1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-	1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-	1, 1, 0, 0, 1, 0, 0, 0, 0, 1, 1, 1, 2, 1, 1, 2,
-	0, 0, 1, 1, 0, 1, 0, 1, 2, 1, 1, 1, 1, 1, 1, 1};
-    static const char no_best_fit_chars_table_C2_ms[] =
-    {1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-	1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-	1, 0, 1, 1, 0, 1, 1, 0, 0, 0, 0, 1, 1, 1, 0, 0,
-	0, 0, 1, 1, 0, 1, 0, 1, 0, 1, 0, 1, 1, 1, 1, 0};
-    static const char no_best_fit_chars_table_932_C2[] =
-    {1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-	1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-	1, 1, 1, 1, 0, 1, 1, 0, 0, 1, 1, 1, 1, 1, 1, 1,
-	0, 0, 1, 1, 0, 1, 0, 1, 1, 1, 1, 1, 0, 0, 0, 0};
-    static const char no_best_fit_chars_table_932_C3[] =
-    {1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-	1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1,
-	1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-	1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1};
-    nkf_char ret = 0;
-
-    if(c2 < 0x80){
-	*p2 = 0;
-	*p1 = c2;
-    }else if(c2 < 0xe0){
-	if(no_best_fit_chars_f){
-	    if(ms_ucs_map_f == UCS_MAP_CP932){
-		switch(c2){
-		case 0xC2:
-		    if(no_best_fit_chars_table_932_C2[c1&0x3F]) return 1;
-		    break;
-		case 0xC3:
-		    if(no_best_fit_chars_table_932_C3[c1&0x3F]) return 1;
-		    break;
-		}
-	    }else if(!cp932inv_f){
-		switch(c2){
-		case 0xC2:
-		    if(no_best_fit_chars_table_C2[c1&0x3F]) return 1;
-		    break;
-		case 0xC3:
-		    if(no_best_fit_chars_table_932_C3[c1&0x3F]) return 1;
-		    break;
-		}
-	    }else if(ms_ucs_map_f == UCS_MAP_MS){
-		if(c2 == 0xC2 && no_best_fit_chars_table_C2_ms[c1&0x3F]) return 1;
-	    }else if(ms_ucs_map_f == UCS_MAP_CP10001){
-		switch(c2){
-		case 0xC2:
-		    switch(c1){
-		    case 0xA2:
-		    case 0xA3:
-		    case 0xA5:
-		    case 0xA6:
-		    case 0xAC:
-		    case 0xAF:
-		    case 0xB8:
-			return 1;
-		    }
-		    break;
-		}
-	    }
-	}
-	pp =
-	    ms_ucs_map_f == UCS_MAP_CP932 ? utf8_to_euc_2bytes_932 :
-	    ms_ucs_map_f == UCS_MAP_MS ? utf8_to_euc_2bytes_ms :
-	    ms_ucs_map_f == UCS_MAP_CP10001 ? utf8_to_euc_2bytes_mac :
-	    x0213_f ? utf8_to_euc_2bytes_x0213 :
-	    utf8_to_euc_2bytes;
-	ret =  unicode_to_jis_common2(c2, c1, pp, sizeof_utf8_to_euc_2bytes, p2, p1);
-    }else if(c0 < 0xF0){
-	if(no_best_fit_chars_f){
-	    if(ms_ucs_map_f == UCS_MAP_CP932){
-		if(c2 == 0xE3 && c1 == 0x82 && c0 == 0x94) return 1;
-	    }else if(ms_ucs_map_f == UCS_MAP_MS){
-		switch(c2){
-		case 0xE2:
-		    switch(c1){
-		    case 0x80:
-			if(c0 == 0x94 || c0 == 0x96 || c0 == 0xBE) return 1;
-			break;
-		    case 0x88:
-			if(c0 == 0x92) return 1;
-			break;
-		    }
-		    break;
-		case 0xE3:
-		    if(c1 == 0x80 || c0 == 0x9C) return 1;
-		    break;
-		}
-	    }else if(ms_ucs_map_f == UCS_MAP_CP10001){
-		switch(c2){
-		case 0xE3:
-		    switch(c1){
-		    case 0x82:
-			if(c0 == 0x94) return 1;
-			break;
-		    case 0x83:
-			if(c0 == 0xBB) return 1;
-			break;
-		    }
-		    break;
-		}
-	    }else{
-		switch(c2){
-		case 0xE2:
-		    switch(c1){
-		    case 0x80:
-			if(c0 == 0x95) return 1;
-			break;
-		    case 0x88:
-			if(c0 == 0xA5) return 1;
-			break;
-		    }
-		    break;
-		case 0xEF:
-		    switch(c1){
-		    case 0xBC:
-			if(c0 == 0x8D) return 1;
-			break;
-		    case 0xBD:
-			if(c0 == 0x9E && !cp932inv_f) return 1;
-			break;
-		    case 0xBF:
-			if(0xA0 <= c0 && c0 <= 0xA5) return 1;
-			break;
-		    }
-		    break;
-		}
-	    }
-	}
-	ppp =
-	    ms_ucs_map_f == UCS_MAP_CP932 ? utf8_to_euc_3bytes_932 :
-	    ms_ucs_map_f == UCS_MAP_MS ? utf8_to_euc_3bytes_ms :
-	    ms_ucs_map_f == UCS_MAP_CP10001 ? utf8_to_euc_3bytes_mac :
-	    x0213_f ? utf8_to_euc_3bytes_x0213 :
-	    utf8_to_euc_3bytes;
-	ret = unicode_to_jis_common2(c1, c0, ppp[c2 - 0xE0], sizeof_utf8_to_euc_C2, p2, p1);
-    }else return -1;
-#ifdef SHIFTJIS_CP932
-    if (!ret&& is_eucg3(*p2)) {
-	if (cp932inv_f) {
-	    if (encode_fallback) ret = 1;
-	}
-	else {
-	    nkf_char s2, s1;
-	    if (e2s_conv(*p2, *p1, &s2, &s1) == 0) {
-		s2e_conv(s2, s1, p2, p1);
-	    }else{
-		ret = 1;
-	    }
-	}
-    }
-#endif
-    return ret;
-}
-
-#ifdef UTF8_OUTPUT_ENABLE
-#define X0213_SURROGATE_FIND(tbl, size, euc) do { \
-	int i; \
-	for (i = 0; i < size; i++) \
-	    if (tbl[i][0] == euc) { \
-		low = tbl[i][2]; \
-		break; \
-	    } \
-    } while (0)
-
-static nkf_char
-e2w_conv(nkf_char c2, nkf_char c1)
-{
-    const unsigned short *p;
-
-    if (c2 == JIS_X_0201_1976_K) {
-	if (ms_ucs_map_f == UCS_MAP_CP10001) {
-	    switch (c1) {
-	    case 0x20:
-		return 0xA0;
-	    case 0x7D:
-		return 0xA9;
-	    }
-	}
-	p = euc_to_utf8_1byte;
-#ifdef X0212_ENABLE
-    } else if (is_eucg3(c2)){
-	if(ms_ucs_map_f == UCS_MAP_ASCII&& c2 == NKF_INT32_C(0x8F22) && c1 == 0x43){
-	    return 0xA6;
-	}
-	c2 = (c2&0x7f) - 0x21;
-	if (0<=c2 && c2<sizeof_euc_to_utf8_2bytes)
-	    p =
-		x0213_f ? x0212_to_utf8_2bytes_x0213[c2] :
-		x0212_to_utf8_2bytes[c2];
-	else
-	    return 0;
-#endif
-    } else {
-	c2 &= 0x7f;
-	c2 = (c2&0x7f) - 0x21;
-	if (0<=c2 && c2<sizeof_euc_to_utf8_2bytes)
-	    p =
-		x0213_f ? euc_to_utf8_2bytes_x0213[c2] :
-		ms_ucs_map_f == UCS_MAP_ASCII ? euc_to_utf8_2bytes[c2] :
-		ms_ucs_map_f == UCS_MAP_CP10001 ? euc_to_utf8_2bytes_mac[c2] :
-		euc_to_utf8_2bytes_ms[c2];
-	else
-	    return 0;
-    }
-    if (!p) return 0;
-    c1 = (c1 & 0x7f) - 0x21;
-    if (0<=c1 && c1<sizeof_euc_to_utf8_1byte) {
-	nkf_char val = p[c1];
-	if (x0213_f && 0xD800<=val && val<=0xDBFF) {
-	    nkf_char euc = (c2+0x21)<<8 | (c1+0x21);
-	    nkf_char low = 0;
-	    if (p==x0212_to_utf8_2bytes_x0213[c2]) {
-		X0213_SURROGATE_FIND(x0213_2_surrogate_table, sizeof_x0213_2_surrogate_table, euc);
-	    } else {
-		X0213_SURROGATE_FIND(x0213_1_surrogate_table, sizeof_x0213_1_surrogate_table, euc);
-	    }
-	    if (!low) return 0;
-	    return UTF16_TO_UTF32(val, low);
-	} else {
-	    return val;
-	}
-    }
-    return 0;
-}
-
-static nkf_char
-e2w_combining(nkf_char comb, nkf_char c2, nkf_char c1)
-{
-    nkf_char euc;
-    int i;
-    for (i = 0; i < sizeof_x0213_combining_chars; i++)
-	if (x0213_combining_chars[i] == comb)
-	    break;
-    if (i >= sizeof_x0213_combining_chars)
-	return 0;
-    euc = (c2&0x7f)<<8 | (c1&0x7f);
-    for (i = 0; i < sizeof_x0213_combining_table; i++)
-	if (x0213_combining_table[i][0] == euc)
-	    return x0213_combining_table[i][1];
-    return 0;
-}
-#endif
-
-static nkf_char
-w2e_conv(nkf_char c2, nkf_char c1, nkf_char c0, nkf_char *p2, nkf_char *p1)
-{
-    nkf_char ret = 0;
-
-    if (!c1){
-	*p2 = 0;
-	*p1 = c2;
-    }else if (0xc0 <= c2 && c2 <= 0xef) {
-	ret =  unicode_to_jis_common(c2, c1, c0, p2, p1);
-#ifdef NUMCHAR_OPTION
-	if (ret > 0){
-	    if (p2) *p2 = 0;
-	    if (p1) *p1 = nkf_char_unicode_new(nkf_utf8_to_unicode(c2, c1, c0, 0));
-	    ret = 0;
-	}
-#endif
-    }
-    return ret;
-}
-
-#ifdef UTF8_INPUT_ENABLE
-static nkf_char
-w16e_conv(nkf_char val, nkf_char *p2, nkf_char *p1)
-{
-    nkf_char c1, c2, c3, c4;
-    nkf_char ret = 0;
-    val &= VALUE_MASK;
-    if (val < 0x80) {
-	*p2 = 0;
-	*p1 = val;
-    }
-    else if (nkf_char_unicode_bmp_p(val)){
-	nkf_unicode_to_utf8(val, &c1, &c2, &c3, &c4);
-	ret =  unicode_to_jis_common(c1, c2, c3, p2, p1);
-	if (ret > 0){
-	    *p2 = 0;
-	    *p1 = nkf_char_unicode_new(val);
-	    ret = 0;
-	}
-    }
-    else {
-	int i;
-	if (x0213_f) {
-	    c1 = (val >> 10) + NKF_INT32_C(0xD7C0);   /* high surrogate */
-	    c2 = (val & 0x3FF) + NKF_INT32_C(0xDC00); /* low surrogate */
-	    for (i = 0; i < sizeof_x0213_1_surrogate_table; i++)
-		if (x0213_1_surrogate_table[i][1] == c1 && x0213_1_surrogate_table[i][2] == c2) {
-		    val = x0213_1_surrogate_table[i][0];
-		    *p2 = val >> 8;
-		    *p1 = val & 0xFF;
-		    return 0;
-		}
-	    for (i = 0; i < sizeof_x0213_2_surrogate_table; i++)
-		if (x0213_2_surrogate_table[i][1] == c1 && x0213_2_surrogate_table[i][2] == c2) {
-		    val = x0213_2_surrogate_table[i][0];
-		    *p2 = PREFIX_EUCG3 | (val >> 8);
-		    *p1 = val & 0xFF;
-		    return 0;
-		}
-	}
-	*p2 = 0;
-	*p1 = nkf_char_unicode_new(val);
-    }
-    return ret;
-}
-#endif
-
-static nkf_char
-e_iconv(nkf_char c2, nkf_char c1, nkf_char c0)
-{
-    if (c2 == JIS_X_0201_1976_K || c2 == SS2){
-	if (iso2022jp_f && !x0201_f) {
-	    c2 = GETA1; c1 = GETA2;
-	} else {
-	    c2 = JIS_X_0201_1976_K;
-	    c1 &= 0x7f;
-	}
-#ifdef X0212_ENABLE
-    }else if (c2 == 0x8f){
-	if (c0 == 0){
-	    return -1;
-	}
-	if (!cp51932_f && !x0213_f && 0xF5 <= c1 && c1 <= 0xFE && 0xA1 <= c0 && c0 <= 0xFE) {
-	    /* encoding is eucJP-ms, so invert to Unicode Private User Area */
-	    c1 = nkf_char_unicode_new((c1 - 0xF5) * 94 + c0 - 0xA1 + 0xE3AC);
-	    c2 = 0;
-	} else {
-	    c2 = (c2 << 8) | (c1 & 0x7f);
-	    c1 = c0 & 0x7f;
-#ifdef SHIFTJIS_CP932
-	    if (cp51932_f){
-		nkf_char s2, s1;
-		if (e2s_conv(c2, c1, &s2, &s1) == 0){
-		    s2e_conv(s2, s1, &c2, &c1);
-		    if (c2 < 0x100){
-			c1 &= 0x7f;
-			c2 &= 0x7f;
-		    }
-		}
-	    }
-#endif /* SHIFTJIS_CP932 */
-	}
-#endif /* X0212_ENABLE */
-    } else if ((c2 == EOF) || (c2 == 0) || c2 < SP || c2 == ISO_8859_1) {
-	/* NOP */
-    } else {
-	if (!cp51932_f && ms_ucs_map_f && 0xF5 <= c2 && c2 <= 0xFE && 0xA1 <= c1 && c1 <= 0xFE) {
-	    /* encoding is eucJP-ms, so invert to Unicode Private User Area */
-	    c1 = nkf_char_unicode_new((c2 - 0xF5) * 94 + c1 - 0xA1 + 0xE000);
-	    c2 = 0;
-	} else {
-	    c1 &= 0x7f;
-	    c2 &= 0x7f;
-#ifdef SHIFTJIS_CP932
-	    if (cp51932_f && 0x79 <= c2 && c2 <= 0x7c){
-		nkf_char s2, s1;
-		if (e2s_conv(c2, c1, &s2, &s1) == 0){
-		    s2e_conv(s2, s1, &c2, &c1);
-		    if (c2 < 0x100){
-			c1 &= 0x7f;
-			c2 &= 0x7f;
-		    }
-		}
-	    }
-#endif /* SHIFTJIS_CP932 */
-	}
-    }
-    (*oconv)(c2, c1);
-    return 0;
-}
-
-static nkf_char
-s_iconv(ARG_UNUSED nkf_char c2, nkf_char c1, ARG_UNUSED nkf_char c0)
-{
-    if (c2 == JIS_X_0201_1976_K || (0xA1 <= c2 && c2 <= 0xDF)) {
-	if (iso2022jp_f && !x0201_f) {
-	    c2 = GETA1; c1 = GETA2;
-	} else {
-	    c1 &= 0x7f;
-	}
-    } else if ((c2 == EOF) || (c2 == 0) || c2 < SP) {
-	/* NOP */
-    } else if (!x0213_f && 0xF0 <= c2 && c2 <= 0xF9 && 0x40 <= c1 && c1 <= 0xFC) {
-	/* CP932 UDC */
-	if(c1 == 0x7F) return 0;
-	c1 = nkf_char_unicode_new((c2 - 0xF0) * 188 + (c1 - 0x40 - (0x7E < c1)) + 0xE000);
-	c2 = 0;
-    } else {
-	nkf_char ret = s2e_conv(c2, c1, &c2, &c1);
-	if (ret) return ret;
-    }
-    (*oconv)(c2, c1);
-    return 0;
-}
-
-static int
-x0213_wait_combining_p(nkf_char wc)
-{
-    int i;
-    for (i = 0; i < sizeof_x0213_combining_table; i++) {
-	if (x0213_combining_table[i][1] == wc) {
-	    return TRUE;
-	}
-    }
-    return FALSE;
-}
-
-static int
-x0213_combining_p(nkf_char wc)
-{
-    int i;
-    for (i = 0; i < sizeof_x0213_combining_chars; i++) {
-	if (x0213_combining_chars[i] == wc) {
-	    return TRUE;
-	}
-    }
-    return FALSE;
-}
-
-static nkf_char
-w_iconv(nkf_char c1, nkf_char c2, nkf_char c3)
-{
-    nkf_char ret = 0, c4 = 0;
-    static const char w_iconv_utf8_1st_byte[] =
-    { /* 0xC0 - 0xFF */
-	20, 20, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
-	21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
-	30, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 32, 33, 33,
-	40, 41, 41, 41, 42, 43, 43, 43, 50, 50, 50, 50, 60, 60, 70, 70};
-
-    if (c3 > 0xFF) {
-	c4 = c3 & 0xFF;
-	c3 >>= 8;
-    }
-
-    if (c1 < 0 || 0xff < c1) {
-    }else if (c1 == 0) { /* 0 : 1 byte*/
-	c3 = 0;
-    } else if ((c1 & 0xC0) == 0x80) { /* 0x80-0xbf : trail byte */
-	return 0;
-    } else{
-	switch (w_iconv_utf8_1st_byte[c1 - 0xC0]) {
-	case 21:
-	    if (c2 < 0x80 || 0xBF < c2) return 0;
-	    break;
-	case 30:
-	    if (c3 == 0) return -1;
-	    if (c2 < 0xA0 || 0xBF < c2 || (c3 & 0xC0) != 0x80)
-		return 0;
-	    break;
-	case 31:
-	case 33:
-	    if (c3 == 0) return -1;
-	    if ((c2 & 0xC0) != 0x80 || (c3 & 0xC0) != 0x80)
-		return 0;
-	    break;
-	case 32:
-	    if (c3 == 0) return -1;
-	    if (c2 < 0x80 || 0x9F < c2 || (c3 & 0xC0) != 0x80)
-		return 0;
-	    break;
-	case 40:
-	    if (c3 == 0) return -2;
-	    if (c2 < 0x90 || 0xBF < c2 || (c3 & 0xC0) != 0x80 || (c4 & 0xC0) != 0x80)
-		return 0;
-	    break;
-	case 41:
-	    if (c3 == 0) return -2;
-	    if (c2 < 0x80 || 0xBF < c2 || (c3 & 0xC0) != 0x80 || (c4 & 0xC0) != 0x80)
-		return 0;
-	    break;
-	case 42:
-	    if (c3 == 0) return -2;
-	    if (c2 < 0x80 || 0x8F < c2 || (c3 & 0xC0) != 0x80 || (c4 & 0xC0) != 0x80)
-		return 0;
-	    break;
-	default:
-	    return 0;
-	    break;
-	}
-    }
-    if (c1 == 0 || c1 == EOF){
-    } else if ((c1 & 0xf8) == 0xf0) { /* 4 bytes */
-	c2 = nkf_char_unicode_new(nkf_utf8_to_unicode(c1, c2, c3, c4));
-	c1 = 0;
-    } else {
-	if (x0213_f && x0213_wait_combining_p(nkf_utf8_to_unicode(c1, c2, c3, c4)))
-	    return -3;
-	ret = w2e_conv(c1, c2, c3, &c1, &c2);
-    }
-    if (ret == 0){
-	(*oconv)(c1, c2);
-    }
-    return ret;
-}
-
-static nkf_char
-w_iconv_nocombine(nkf_char c1, nkf_char c2, nkf_char c3)
-{
-    /* continue from the line below 'return -3;' in w_iconv() */
-    nkf_char ret = w2e_conv(c1, c2, c3, &c1, &c2);
-    if (ret == 0){
-	(*oconv)(c1, c2);
-    }
-    return ret;
-}
-
-#define NKF_ICONV_INVALID_CODE_RANGE -13
-#define NKF_ICONV_WAIT_COMBINING_CHAR -14
-#define NKF_ICONV_NOT_COMBINED -15
-static size_t
-unicode_iconv(nkf_char wc, int nocombine)
-{
-    nkf_char c1, c2;
-    int ret = 0;
-
-    if (wc < 0x80) {
-	c2 = 0;
-	c1 = wc;
-    }else if ((wc>>11) == 27) {
-	/* unpaired surrogate */
-	return NKF_ICONV_INVALID_CODE_RANGE;
-    }else if (wc < 0xFFFF) {
-	if (!nocombine && x0213_f && x0213_wait_combining_p(wc))
-	    return NKF_ICONV_WAIT_COMBINING_CHAR;
-	ret = w16e_conv(wc, &c2, &c1);
-	if (ret) return ret;
-    }else if (wc < 0x10FFFF) {
-	c2 = 0;
-	c1 = nkf_char_unicode_new(wc);
-    } else {
-	return NKF_ICONV_INVALID_CODE_RANGE;
-    }
-    (*oconv)(c2, c1);
-    return 0;
-}
-
-static nkf_char
-unicode_iconv_combine(nkf_char wc, nkf_char wc2)
-{
-    nkf_char c1, c2;
-    int i;
-
-    if (wc2 < 0x80) {
-	return NKF_ICONV_NOT_COMBINED;
-    }else if ((wc2>>11) == 27) {
-	/* unpaired surrogate */
-	return NKF_ICONV_INVALID_CODE_RANGE;
-    }else if (wc2 < 0xFFFF) {
-	if (!x0213_combining_p(wc2))
-	    return NKF_ICONV_NOT_COMBINED;
-	for (i = 0; i < sizeof_x0213_combining_table; i++) {
-	    if (x0213_combining_table[i][1] == wc &&
-		x0213_combining_table[i][2] == wc2) {
-		c2 = x0213_combining_table[i][0] >> 8;
-		c1 = x0213_combining_table[i][0] & 0x7f;
-		(*oconv)(c2, c1);
-		return 0;
-	    }
-	}
-    }else if (wc2 < 0x10FFFF) {
-	return NKF_ICONV_NOT_COMBINED;
-    } else {
-	return NKF_ICONV_INVALID_CODE_RANGE;
-    }
-    return NKF_ICONV_NOT_COMBINED;
-}
-
-static nkf_char
-w_iconv_combine(nkf_char c1, nkf_char c2, nkf_char c3, nkf_char c4, nkf_char c5, nkf_char c6)
-{
-    nkf_char wc, wc2;
-    wc = nkf_utf8_to_unicode(c1, c2, c3, 0);
-    wc2 = nkf_utf8_to_unicode(c4, c5, c6, 0);
-    if (wc2 < 0)
-	return wc2;
-    return unicode_iconv_combine(wc, wc2);
-}
-
-#define NKF_ICONV_NEED_ONE_MORE_BYTE (size_t)-1
-#define NKF_ICONV_NEED_TWO_MORE_BYTES (size_t)-2
-static size_t
-nkf_iconv_utf_16(nkf_char c1, nkf_char c2, nkf_char c3, nkf_char c4)
-{
-    nkf_char wc;
-
-    if (c1 == EOF) {
-	(*oconv)(EOF, 0);
-	return 0;
-    }
-
-    if (input_endian == ENDIAN_BIG) {
-	if (0xD8 <= c1 && c1 <= 0xDB) {
-	    if (0xDC <= c3 && c3 <= 0xDF) {
-		wc = UTF16_TO_UTF32(c1 << 8 | c2, c3 << 8 | c4);
-	    } else return NKF_ICONV_NEED_TWO_MORE_BYTES;
-	} else {
-	    wc = c1 << 8 | c2;
-	}
-    } else {
-	if (0xD8 <= c2 && c2 <= 0xDB) {
-	    if (0xDC <= c4 && c4 <= 0xDF) {
-		wc = UTF16_TO_UTF32(c2 << 8 | c1, c4 << 8 | c3);
-	    } else return NKF_ICONV_NEED_TWO_MORE_BYTES;
-	} else {
-	    wc = c2 << 8 | c1;
-	}
-    }
-
-    return (*unicode_iconv)(wc, FALSE);
-}
-
-static size_t
-nkf_iconv_utf_16_combine(nkf_char c1, nkf_char c2, nkf_char c3, nkf_char c4)
-{
-    nkf_char wc, wc2;
-
-    if (input_endian == ENDIAN_BIG) {
-	if (0xD8 <= c3 && c3 <= 0xDB) {
-	    return NKF_ICONV_NOT_COMBINED;
-	} else {
-	    wc = c1 << 8 | c2;
-	    wc2 = c3 << 8 | c4;
-	}
-    } else {
-	if (0xD8 <= c2 && c2 <= 0xDB) {
-	    return NKF_ICONV_NOT_COMBINED;
-	} else {
-	    wc = c2 << 8 | c1;
-	    wc2 = c4 << 8 | c3;
-	}
-    }
-
-    return unicode_iconv_combine(wc, wc2);
-}
-
-static size_t
-nkf_iconv_utf_16_nocombine(nkf_char c1, nkf_char c2)
-{
-    nkf_char wc;
-    if (input_endian == ENDIAN_BIG)
-	wc = c1 << 8 | c2;
-    else
-	wc = c2 << 8 | c1;
-    return (*unicode_iconv)(wc, TRUE);
-}
-
-static nkf_char
-w_iconv16(nkf_char c2, nkf_char c1, ARG_UNUSED nkf_char c0)
-{
-    (*oconv)(c2, c1);
-    return 16; /* different from w_iconv32 */
-}
-
-static nkf_char
-w_iconv32(nkf_char c2, nkf_char c1, ARG_UNUSED nkf_char c0)
-{
-    (*oconv)(c2, c1);
-    return 32; /* different from w_iconv16 */
-}
-
-static nkf_char
-utf32_to_nkf_char(nkf_char c1, nkf_char c2, nkf_char c3, nkf_char c4)
-{
-    nkf_char wc;
-
-    switch(input_endian){
-    case ENDIAN_BIG:
-	wc = c2 << 16 | c3 << 8 | c4;
-	break;
-    case ENDIAN_LITTLE:
-	wc = c3 << 16 | c2 << 8 | c1;
-	break;
-    case ENDIAN_2143:
-	wc = c1 << 16 | c4 << 8 | c3;
-	break;
-    case ENDIAN_3412:
-	wc = c4 << 16 | c1 << 8 | c2;
-	break;
-    default:
-	return NKF_ICONV_INVALID_CODE_RANGE;
-    }
-    return wc;
-}
-
-static size_t
-nkf_iconv_utf_32(nkf_char c1, nkf_char c2, nkf_char c3, nkf_char c4)
-{
-    nkf_char wc;
-
-    if (c1 == EOF) {
-	(*oconv)(EOF, 0);
-	return 0;
-    }
-
-    wc = utf32_to_nkf_char(c1, c2, c3, c4);
-    if (wc < 0)
-	return wc;
-
-    return (*unicode_iconv)(wc, FALSE);
-}
-
-static nkf_char
-nkf_iconv_utf_32_combine(nkf_char c1, nkf_char c2, nkf_char c3, nkf_char c4, nkf_char c5, nkf_char c6, nkf_char c7, nkf_char c8)
-{
-    nkf_char wc, wc2;
-
-    wc = utf32_to_nkf_char(c1, c2, c3, c4);
-    if (wc < 0)
-	return wc;
-    wc2 = utf32_to_nkf_char(c5, c6, c7, c8);
-    if (wc2 < 0)
-	return wc2;
-
-    return unicode_iconv_combine(wc, wc2);
-}
-
-static size_t
-nkf_iconv_utf_32_nocombine(nkf_char c1, nkf_char c2, nkf_char c3, nkf_char c4)
-{
-    nkf_char wc;
-
-    wc = utf32_to_nkf_char(c1, c2, c3, c4);
-    return (*unicode_iconv)(wc, TRUE);
-}
-#endif
-
-#define output_ascii_escape_sequence(mode) do { \
-	    if (output_mode != ASCII && output_mode != ISO_8859_1) { \
-		    (*o_putc)(ESC); \
-		    (*o_putc)('('); \
-		    (*o_putc)(ascii_intro); \
-		    output_mode = mode; \
-	    } \
-    } while (0)
-
-static void
-output_escape_sequence(int mode)
-{
-    if (output_mode == mode)
-	return;
-    switch(mode) {
-    case ISO_8859_1:
-	(*o_putc)(ESC);
-	(*o_putc)('.');
-	(*o_putc)('A');
-	break;
-    case JIS_X_0201_1976_K:
-	(*o_putc)(ESC);
-	(*o_putc)('(');
-	(*o_putc)('I');
-	break;
-    case JIS_X_0208:
-	(*o_putc)(ESC);
-	(*o_putc)('$');
-	(*o_putc)(kanji_intro);
-	break;
-    case JIS_X_0212:
-	(*o_putc)(ESC);
-	(*o_putc)('$');
-	(*o_putc)('(');
-	(*o_putc)('D');
-	break;
-    case JIS_X_0213_1:
-	(*o_putc)(ESC);
-	(*o_putc)('$');
-	(*o_putc)('(');
-	(*o_putc)('Q');
-	break;
-    case JIS_X_0213_2:
-	(*o_putc)(ESC);
-	(*o_putc)('$');
-	(*o_putc)('(');
-	(*o_putc)('P');
-	break;
-    }
-    output_mode = mode;
-}
-
-static void
-j_oconv(nkf_char c2, nkf_char c1)
-{
-#ifdef NUMCHAR_OPTION
-    if (c2 == 0 && nkf_char_unicode_p(c1)){
-	w16e_conv(c1, &c2, &c1);
-	if (c2 == 0 && nkf_char_unicode_p(c1)){
-	    c2 = c1 & VALUE_MASK;
-	    if (ms_ucs_map_f && 0xE000 <= c2 && c2 <= 0xE757) {
-		/* CP5022x UDC */
-		c1 &= 0xFFF;
-		c2 = 0x7F + c1 / 94;
-		c1 = 0x21 + c1 % 94;
-	    } else {
-		if (encode_fallback) (*encode_fallback)(c1);
-		return;
-	    }
-	}
-    }
-#endif
-    if (c2 == 0) {
-	output_ascii_escape_sequence(ASCII);
-	(*o_putc)(c1);
-    }
-    else if (c2 == EOF) {
-	output_ascii_escape_sequence(ASCII);
-	(*o_putc)(EOF);
-    }
-    else if (c2 == ISO_8859_1) {
-	output_ascii_escape_sequence(ISO_8859_1);
-	(*o_putc)(c1|0x80);
-    }
-    else if (c2 == JIS_X_0201_1976_K) {
-	output_escape_sequence(JIS_X_0201_1976_K);
-	(*o_putc)(c1);
-#ifdef X0212_ENABLE
-    } else if (is_eucg3(c2)){
-	output_escape_sequence(x0213_f ? JIS_X_0213_2 : JIS_X_0212);
-	(*o_putc)(c2 & 0x7f);
-	(*o_putc)(c1);
-#endif
-    } else {
-	if(ms_ucs_map_f
-	   ? c2<0x20 || 0x92<c2 || c1<0x20 || 0x7e<c1
-	   : c2<0x20 || 0x7e<c2 || c1<0x20 || 0x7e<c1) return;
-	output_escape_sequence(x0213_f ? JIS_X_0213_1 : JIS_X_0208);
-	(*o_putc)(c2);
-	(*o_putc)(c1);
-    }
-}
-
-static void
-e_oconv(nkf_char c2, nkf_char c1)
-{
-    if (c2 == 0 && nkf_char_unicode_p(c1)){
-	w16e_conv(c1, &c2, &c1);
-	if (c2 == 0 && nkf_char_unicode_p(c1)){
-	    c2 = c1 & VALUE_MASK;
-	    if (x0212_f && 0xE000 <= c2 && c2 <= 0xE757) {
-		/* eucJP-ms UDC */
-		c1 &= 0xFFF;
-		c2 = c1 / 94;
-		c2 += c2 < 10 ? 0x75 : 0x8FEB;
-		c1 = 0x21 + c1 % 94;
-		if (is_eucg3(c2)){
-		    (*o_putc)(0x8f);
-		    (*o_putc)((c2 & 0x7f) | 0x080);
-		    (*o_putc)(c1 | 0x080);
-		}else{
-		    (*o_putc)((c2 & 0x7f) | 0x080);
-		    (*o_putc)(c1 | 0x080);
-		}
-		return;
-	    } else {
-		if (encode_fallback) (*encode_fallback)(c1);
-		return;
-	    }
-	}
-    }
-
-    if (c2 == EOF) {
-	(*o_putc)(EOF);
-    } else if (c2 == 0) {
-	output_mode = ASCII;
-	(*o_putc)(c1);
-    } else if (c2 == JIS_X_0201_1976_K) {
-	output_mode = EUC_JP;
-	(*o_putc)(SS2); (*o_putc)(c1|0x80);
-    } else if (c2 == ISO_8859_1) {
-	output_mode = ISO_8859_1;
-	(*o_putc)(c1 | 0x080);
-#ifdef X0212_ENABLE
-    } else if (is_eucg3(c2)){
-	output_mode = EUC_JP;
-#ifdef SHIFTJIS_CP932
-	if (!cp932inv_f){
-	    nkf_char s2, s1;
-	    if (e2s_conv(c2, c1, &s2, &s1) == 0){
-		s2e_conv(s2, s1, &c2, &c1);
-	    }
-	}
-#endif
-	if (c2 == 0) {
-	    output_mode = ASCII;
-	    (*o_putc)(c1);
-	}else if (is_eucg3(c2)){
-	    if (x0212_f){
-		(*o_putc)(0x8f);
-		(*o_putc)((c2 & 0x7f) | 0x080);
-		(*o_putc)(c1 | 0x080);
-	    }
-	}else{
-	    (*o_putc)((c2 & 0x7f) | 0x080);
-	    (*o_putc)(c1 | 0x080);
-	}
-#endif
-    } else {
-	if (!nkf_isgraph(c1) || !nkf_isgraph(c2)) {
-	    set_iconv(FALSE, 0);
-	    return; /* too late to rescue this char */
-	}
-	output_mode = EUC_JP;
-	(*o_putc)(c2 | 0x080);
-	(*o_putc)(c1 | 0x080);
-    }
-}
-
-static void
-s_oconv(nkf_char c2, nkf_char c1)
-{
-#ifdef NUMCHAR_OPTION
-    if (c2 == 0 && nkf_char_unicode_p(c1)){
-	w16e_conv(c1, &c2, &c1);
-	if (c2 == 0 && nkf_char_unicode_p(c1)){
-	    c2 = c1 & VALUE_MASK;
-	    if (!x0213_f && 0xE000 <= c2 && c2 <= 0xE757) {
-		/* CP932 UDC */
-		c1 &= 0xFFF;
-		c2 = c1 / 188 + (cp932inv_f ? 0xF0 : 0xEB);
-		c1 = c1 % 188;
-		c1 += 0x40 + (c1 > 0x3e);
-		(*o_putc)(c2);
-		(*o_putc)(c1);
-		return;
-	    } else {
-		if(encode_fallback)(*encode_fallback)(c1);
-		return;
-	    }
-	}
-    }
-#endif
-    if (c2 == EOF) {
-	(*o_putc)(EOF);
-	return;
-    } else if (c2 == 0) {
-	output_mode = ASCII;
-	(*o_putc)(c1);
-    } else if (c2 == JIS_X_0201_1976_K) {
-	output_mode = SHIFT_JIS;
-	(*o_putc)(c1|0x80);
-    } else if (c2 == ISO_8859_1) {
-	output_mode = ISO_8859_1;
-	(*o_putc)(c1 | 0x080);
-#ifdef X0212_ENABLE
-    } else if (is_eucg3(c2)){
-	output_mode = SHIFT_JIS;
-	if (e2s_conv(c2, c1, &c2, &c1) == 0){
-	    (*o_putc)(c2);
-	    (*o_putc)(c1);
-	}
-#endif
-    } else {
-	if (!nkf_isprint(c1) || !nkf_isprint(c2)) {
-	    set_iconv(FALSE, 0);
-	    return; /* too late to rescue this char */
-	}
-	output_mode = SHIFT_JIS;
-	e2s_conv(c2, c1, &c2, &c1);
-
-#ifdef SHIFTJIS_CP932
-	if (cp932inv_f
-	    && CP932INV_TABLE_BEGIN <= c2 && c2 <= CP932INV_TABLE_END){
-	    nkf_char c = cp932inv[c2 - CP932INV_TABLE_BEGIN][c1 - 0x40];
-	    if (c){
-		c2 = c >> 8;
-		c1 = c & 0xff;
-	    }
-	}
-#endif /* SHIFTJIS_CP932 */
-
-	(*o_putc)(c2);
-	if (prefix_table[(unsigned char)c1]){
-	    (*o_putc)(prefix_table[(unsigned char)c1]);
-	}
-	(*o_putc)(c1);
-    }
-}
-
-#ifdef UTF8_OUTPUT_ENABLE
-#define OUTPUT_UTF8(val) do { \
-	nkf_unicode_to_utf8(val, &c1, &c2, &c3, &c4); \
-	(*o_putc)(c1); \
-	if (c2) (*o_putc)(c2); \
-	if (c3) (*o_putc)(c3); \
-	if (c4) (*o_putc)(c4); \
-    } while (0)
-
-static void
-w_oconv(nkf_char c2, nkf_char c1)
-{
-    nkf_char c3, c4;
-    nkf_char val, val2;
-
-    if (output_bom_f) {
-	output_bom_f = FALSE;
-	(*o_putc)('\357');
-	(*o_putc)('\273');
-	(*o_putc)('\277');
-    }
-
-    if (c2 == EOF) {
-	(*o_putc)(EOF);
-	return;
-    }
-
-    if (c2 == 0 && nkf_char_unicode_p(c1)){
-	val = c1 & VALUE_MASK;
-	OUTPUT_UTF8(val);
-	return;
-    }
-
-    if (c2 == 0) {
-	(*o_putc)(c1);
-    } else {
-	val = e2w_conv(c2, c1);
-	if (val){
-	    val2 = e2w_combining(val, c2, c1);
-	    if (val2)
-		OUTPUT_UTF8(val2);
-	    OUTPUT_UTF8(val);
-	}
-    }
-}
-
-#define OUTPUT_UTF16_BYTES(c1, c2) do { \
-	if (output_endian == ENDIAN_LITTLE){ \
-	    (*o_putc)(c1); \
-	    (*o_putc)(c2); \
-	}else{ \
-	    (*o_putc)(c2); \
-	    (*o_putc)(c1); \
-	} \
-    } while (0)
-
-#define OUTPUT_UTF16(val) do { \
-	if (nkf_char_unicode_bmp_p(val)) { \
-	    c2 = (val >> 8) & 0xff; \
-	    c1 = val & 0xff; \
-	    OUTPUT_UTF16_BYTES(c1, c2); \
-	} else { \
-	    val &= VALUE_MASK; \
-	    if (val <= UNICODE_MAX) { \
-		c2 = (val >> 10) + NKF_INT32_C(0xD7C0);   /* high surrogate */ \
-		c1 = (val & 0x3FF) + NKF_INT32_C(0xDC00); /* low surrogate */ \
-		OUTPUT_UTF16_BYTES(c2 & 0xff, (c2 >> 8) & 0xff); \
-		OUTPUT_UTF16_BYTES(c1 & 0xff, (c1 >> 8) & 0xff); \
-	    } \
-	} \
-    } while (0)
-
-static void
-w_oconv16(nkf_char c2, nkf_char c1)
-{
-    if (output_bom_f) {
-	output_bom_f = FALSE;
-	OUTPUT_UTF16_BYTES(0xFF, 0xFE);
-    }
-
-    if (c2 == EOF) {
-	(*o_putc)(EOF);
-	return;
-    }
-
-    if (c2 == 0 && nkf_char_unicode_p(c1)) {
-	OUTPUT_UTF16(c1);
-    } else if (c2) {
-	nkf_char val, val2;
-	val = e2w_conv(c2, c1);
-	if (!val) return;
-	val2 = e2w_combining(val, c2, c1);
-	if (val2)
-	    OUTPUT_UTF16(val2);
-	OUTPUT_UTF16(val);
-    } else {
-	OUTPUT_UTF16_BYTES(c1, c2);
-    }
-}
-
-#define OUTPUT_UTF32(c) do { \
-	if (output_endian == ENDIAN_LITTLE){ \
-	    (*o_putc)( (c)        & 0xFF); \
-	    (*o_putc)(((c) >>  8) & 0xFF); \
-	    (*o_putc)(((c) >> 16) & 0xFF); \
-	    (*o_putc)(0); \
-	}else{ \
-	    (*o_putc)(0); \
-	    (*o_putc)(((c) >> 16) & 0xFF); \
-	    (*o_putc)(((c) >>  8) & 0xFF); \
-	    (*o_putc)( (c)        & 0xFF); \
-	} \
-    } while (0)
-
-static void
-w_oconv32(nkf_char c2, nkf_char c1)
-{
-    if (output_bom_f) {
-	output_bom_f = FALSE;
-	if (output_endian == ENDIAN_LITTLE){
-	    (*o_putc)(0xFF);
-	    (*o_putc)(0xFE);
-	    (*o_putc)(0);
-	    (*o_putc)(0);
-	}else{
-	    (*o_putc)(0);
-	    (*o_putc)(0);
-	    (*o_putc)(0xFE);
-	    (*o_putc)(0xFF);
-	}
-    }
-
-    if (c2 == EOF) {
-	(*o_putc)(EOF);
-	return;
-    }
-
-    if (c2 == ISO_8859_1) {
-	c1 |= 0x80;
-    } else if (c2 == 0 && nkf_char_unicode_p(c1)) {
-	c1 &= VALUE_MASK;
-    } else if (c2) {
-	nkf_char val, val2;
-	val = e2w_conv(c2, c1);
-	if (!val) return;
-	val2 = e2w_combining(val, c2, c1);
-	if (val2)
-	    OUTPUT_UTF32(val2);
-	c1 = val;
-    }
-    OUTPUT_UTF32(c1);
-}
-#endif
-
-#define SCORE_L2       (1)                   /* Kanji Level 2 */
-#define SCORE_KANA     (SCORE_L2 << 1)       /* Halfwidth Katakana */
-#define SCORE_DEPEND   (SCORE_KANA << 1)     /* MD Characters */
-#define SCORE_CP932    (SCORE_DEPEND << 1)   /* IBM extended characters */
-#define SCORE_X0212    (SCORE_CP932 << 1)    /* JIS X 0212 */
-#define SCORE_X0213    (SCORE_X0212 << 1)    /* JIS X 0213 */
-#define SCORE_NO_EXIST (SCORE_X0213 << 1)    /* Undefined Characters */
-#define SCORE_iMIME    (SCORE_NO_EXIST << 1) /* MIME selected */
-#define SCORE_ERROR    (SCORE_iMIME << 1) /* Error */
-
-#define SCORE_INIT (SCORE_iMIME)
-
-static const nkf_char score_table_A0[] = {
-    0, 0, 0, 0,
-    0, 0, 0, 0,
-    0, SCORE_DEPEND, SCORE_DEPEND, SCORE_DEPEND,
-    SCORE_DEPEND, SCORE_DEPEND, SCORE_DEPEND, SCORE_X0213,
-};
-
-static const nkf_char score_table_F0[] = {
-    SCORE_L2, SCORE_L2, SCORE_L2, SCORE_L2,
-    SCORE_L2, SCORE_DEPEND, SCORE_X0213, SCORE_X0213,
-    SCORE_DEPEND, SCORE_DEPEND, SCORE_CP932, SCORE_CP932,
-    SCORE_CP932, SCORE_X0213, SCORE_X0213, SCORE_ERROR,
-};
-
-static const nkf_char score_table_8FA0[] = {
-    0, SCORE_X0213, SCORE_X0212, SCORE_X0213,
-    SCORE_X0213, SCORE_X0213, SCORE_X0212, SCORE_X0212,
-    SCORE_X0213, SCORE_X0212, SCORE_X0212, SCORE_X0212,
-    SCORE_X0213, SCORE_X0213, SCORE_X0213, SCORE_X0213,
-};
-
-static const nkf_char score_table_8FE0[] = {
-    SCORE_X0212, SCORE_X0212, SCORE_X0212, SCORE_X0212,
-    SCORE_X0212, SCORE_X0212, SCORE_X0212, SCORE_X0212,
-    SCORE_X0212, SCORE_X0212, SCORE_X0212, SCORE_X0212,
-    SCORE_X0212, SCORE_X0212, SCORE_X0213, SCORE_X0213,
-};
-
-static const nkf_char score_table_8FF0[] = {
-    SCORE_X0213, SCORE_X0213, SCORE_X0213, SCORE_X0212,
-    SCORE_X0212, SCORE_X0213, SCORE_X0213, SCORE_X0213,
-    SCORE_X0213, SCORE_X0213, SCORE_X0213, SCORE_X0213,
-    SCORE_X0213, SCORE_X0213, SCORE_X0213, SCORE_X0213,
-};
-
-static void
-set_code_score(struct input_code *ptr, nkf_char score)
-{
-    if (ptr){
-	ptr->score |= score;
-    }
-}
-
-static void
-clr_code_score(struct input_code *ptr, nkf_char score)
-{
-    if (ptr){
-	ptr->score &= ~score;
-    }
-}
-
-static void
-code_score(struct input_code *ptr)
-{
-    nkf_char c2 = ptr->buf[0];
-    nkf_char c1 = ptr->buf[1];
-    if (c2 < 0){
-	set_code_score(ptr, SCORE_ERROR);
-    }else if (c2 == SS2){
-	set_code_score(ptr, SCORE_KANA);
-    }else if (c2 == 0x8f){
-	if ((c1 & 0x70) == 0x20){
-	    set_code_score(ptr, score_table_8FA0[c1 & 0x0f]);
-	}else if ((c1 & 0x70) == 0x60){
-	    set_code_score(ptr, score_table_8FE0[c1 & 0x0f]);
-	}else if ((c1 & 0x70) == 0x70){
-	    set_code_score(ptr, score_table_8FF0[c1 & 0x0f]);
-	}else{
-	    set_code_score(ptr, SCORE_X0212);
-	}
-#ifdef UTF8_OUTPUT_ENABLE
-    }else if (!e2w_conv(c2, c1)){
-	set_code_score(ptr, SCORE_NO_EXIST);
-#endif
-    }else if ((c2 & 0x70) == 0x20){
-	set_code_score(ptr, score_table_A0[c2 & 0x0f]);
-    }else if ((c2 & 0x70) == 0x70){
-	set_code_score(ptr, score_table_F0[c2 & 0x0f]);
-    }else if ((c2 & 0x70) >= 0x50){
-	set_code_score(ptr, SCORE_L2);
-    }
-}
-
-static void
-status_disable(struct input_code *ptr)
-{
-    ptr->stat = -1;
-    ptr->buf[0] = -1;
-    code_score(ptr);
-    if (iconv == ptr->iconv_func) set_iconv(FALSE, 0);
-}
-
-static void
-status_push_ch(struct input_code *ptr, nkf_char c)
-{
-    ptr->buf[ptr->index++] = c;
-}
-
-static void
-status_clear(struct input_code *ptr)
-{
-    ptr->stat = 0;
-    ptr->index = 0;
-}
-
-static void
-status_reset(struct input_code *ptr)
-{
-    status_clear(ptr);
-    ptr->score = SCORE_INIT;
-}
-
-static void
-status_reinit(struct input_code *ptr)
-{
-    status_reset(ptr);
-    ptr->_file_stat = 0;
-}
-
-static void
-status_check(struct input_code *ptr, nkf_char c)
-{
-    if (c <= DEL && estab_f){
-	status_reset(ptr);
-    }
-}
-
-static void
-s_status(struct input_code *ptr, nkf_char c)
-{
-    switch(ptr->stat){
-    case -1:
-	status_check(ptr, c);
-	break;
-    case 0:
-	if (c <= DEL){
-	    break;
-	}else if (nkf_char_unicode_p(c)){
-	    break;
-	}else if (0xa1 <= c && c <= 0xdf){
-	    status_push_ch(ptr, SS2);
-	    status_push_ch(ptr, c);
-	    code_score(ptr);
-	    status_clear(ptr);
-	}else if ((0x81 <= c && c < 0xa0) || (0xe0 <= c && c <= 0xea)){
-	    ptr->stat = 1;
-	    status_push_ch(ptr, c);
-	}else if (0xed <= c && c <= 0xee){
-	    ptr->stat = 3;
-	    status_push_ch(ptr, c);
-#ifdef SHIFTJIS_CP932
-	}else if (is_ibmext_in_sjis(c)){
-	    ptr->stat = 2;
-	    status_push_ch(ptr, c);
-#endif /* SHIFTJIS_CP932 */
-#ifdef X0212_ENABLE
-	}else if (0xf0 <= c && c <= 0xfc){
-	    ptr->stat = 1;
-	    status_push_ch(ptr, c);
-#endif /* X0212_ENABLE */
-	}else{
-	    status_disable(ptr);
-	}
-	break;
-    case 1:
-	if ((0x40 <= c && c <= 0x7e) || (0x80 <= c && c <= 0xfc)){
-	    status_push_ch(ptr, c);
-	    s2e_conv(ptr->buf[0], ptr->buf[1], &ptr->buf[0], &ptr->buf[1]);
-	    code_score(ptr);
-	    status_clear(ptr);
-	}else{
-	    status_disable(ptr);
-	}
-	break;
-    case 2:
-#ifdef SHIFTJIS_CP932
-	if ((0x40 <= c && c <= 0x7e) || (0x80 <= c && c <= 0xfc)) {
-	    status_push_ch(ptr, c);
-	    if (s2e_conv(ptr->buf[0], ptr->buf[1], &ptr->buf[0], &ptr->buf[1]) == 0) {
-		set_code_score(ptr, SCORE_CP932);
-		status_clear(ptr);
-		break;
-	    }
-	}
-#endif /* SHIFTJIS_CP932 */
-	status_disable(ptr);
-	break;
-    case 3:
-	if ((0x40 <= c && c <= 0x7e) || (0x80 <= c && c <= 0xfc)){
-	    status_push_ch(ptr, c);
-	    s2e_conv(ptr->buf[0], ptr->buf[1], &ptr->buf[0], &ptr->buf[1]);
-	    set_code_score(ptr, SCORE_CP932);
-	    status_clear(ptr);
-	}else{
-	    status_disable(ptr);
-	}
-	break;
-    }
-}
-
-static void
-e_status(struct input_code *ptr, nkf_char c)
-{
-    switch (ptr->stat){
-    case -1:
-	status_check(ptr, c);
-	break;
-    case 0:
-	if (c <= DEL){
-	    break;
-	}else if (nkf_char_unicode_p(c)){
-	    break;
-	}else if (SS2 == c || (0xa1 <= c && c <= 0xfe)){
-	    ptr->stat = 1;
-	    status_push_ch(ptr, c);
-#ifdef X0212_ENABLE
-	}else if (0x8f == c){
-	    ptr->stat = 2;
-	    status_push_ch(ptr, c);
-#endif /* X0212_ENABLE */
-	}else{
-	    status_disable(ptr);
-	}
-	break;
-    case 1:
-	if (0xa1 <= c && c <= 0xfe){
-	    status_push_ch(ptr, c);
-	    code_score(ptr);
-	    status_clear(ptr);
-	}else{
-	    status_disable(ptr);
-	}
-	break;
-#ifdef X0212_ENABLE
-    case 2:
-	if (0xa1 <= c && c <= 0xfe){
-	    ptr->stat = 1;
-	    status_push_ch(ptr, c);
-	}else{
-	    status_disable(ptr);
-	}
-#endif /* X0212_ENABLE */
-    }
-}
-
-#ifdef UTF8_INPUT_ENABLE
-static void
-w_status(struct input_code *ptr, nkf_char c)
-{
-    switch (ptr->stat){
-    case -1:
-	status_check(ptr, c);
-	break;
-    case 0:
-	if (c <= DEL){
-	    break;
-	}else if (nkf_char_unicode_p(c)){
-	    break;
-	}else if (0xc0 <= c && c <= 0xdf){
-	    ptr->stat = 1;
-	    status_push_ch(ptr, c);
-	}else if (0xe0 <= c && c <= 0xef){
-	    ptr->stat = 2;
-	    status_push_ch(ptr, c);
-	}else if (0xf0 <= c && c <= 0xf4){
-	    ptr->stat = 3;
-	    status_push_ch(ptr, c);
-	}else{
-	    status_disable(ptr);
-	}
-	break;
-    case 1:
-    case 2:
-	if (0x80 <= c && c <= 0xbf){
-	    status_push_ch(ptr, c);
-	    if (ptr->index > ptr->stat){
-		int bom = (ptr->buf[0] == 0xef && ptr->buf[1] == 0xbb
-			   && ptr->buf[2] == 0xbf);
-		w2e_conv(ptr->buf[0], ptr->buf[1], ptr->buf[2],
-			 &ptr->buf[0], &ptr->buf[1]);
-		if (!bom){
-		    code_score(ptr);
-		}
-		status_clear(ptr);
-	    }
-	}else{
-	    status_disable(ptr);
-	}
-	break;
-    case 3:
-	if (0x80 <= c && c <= 0xbf){
-	    if (ptr->index < ptr->stat){
-		status_push_ch(ptr, c);
-	    } else {
-		status_clear(ptr);
-	    }
-	}else{
-	    status_disable(ptr);
-	}
-	break;
-    }
-}
-#endif
-
-static void
-code_status(nkf_char c)
-{
-    int action_flag = 1;
-    struct input_code *result = 0;
-    struct input_code *p = input_code_list;
-    while (p->name){
-	if (!p->status_func) {
-	    ++p;
-	    continue;
-	}
-	if (!p->status_func)
-	    continue;
-	(p->status_func)(p, c);
-	if (p->stat > 0){
-	    action_flag = 0;
-	}else if(p->stat == 0){
-	    if (result){
-		action_flag = 0;
-	    }else{
-		result = p;
-	    }
-	}
-	++p;
-    }
-
-    if (action_flag){
-	if (result && !estab_f){
-	    set_iconv(TRUE, result->iconv_func);
-	}else if (c <= DEL){
-	    struct input_code *ptr = input_code_list;
-	    while (ptr->name){
-		status_reset(ptr);
-		++ptr;
-	    }
-	}
-    }
-}
-
-typedef struct {
-    nkf_buf_t *std_gc_buf;
-    nkf_char broken_state;
-    nkf_buf_t *broken_buf;
-    nkf_char mimeout_state;
-    nkf_buf_t *nfc_buf;
-} nkf_state_t;
-
-static nkf_state_t *nkf_state = NULL;
-
-#define STD_GC_BUFSIZE (256)
-
-static void
-nkf_state_init(void)
-{
-    if (nkf_state) {
-	nkf_buf_clear(nkf_state->std_gc_buf);
-	nkf_buf_clear(nkf_state->broken_buf);
-	nkf_buf_clear(nkf_state->nfc_buf);
-    }
-    else {
-	nkf_state = nkf_xmalloc(sizeof(nkf_state_t));
-	nkf_state->std_gc_buf = nkf_buf_new(STD_GC_BUFSIZE);
-	nkf_state->broken_buf = nkf_buf_new(3);
-	nkf_state->nfc_buf = nkf_buf_new(9);
-    }
-    nkf_state->broken_state = 0;
-    nkf_state->mimeout_state = 0;
-}
-
-#ifndef WIN32DLL
-static nkf_char
-std_getc(FILE *f)
-{
-    if (!nkf_buf_empty_p(nkf_state->std_gc_buf)){
-	return nkf_buf_pop(nkf_state->std_gc_buf);
-    }
-    return getc(f);
-}
-#endif /*WIN32DLL*/
-
-static nkf_char
-std_ungetc(nkf_char c, ARG_UNUSED FILE *f)
-{
-    nkf_buf_push(nkf_state->std_gc_buf, c);
-    return c;
-}
-
-#ifndef WIN32DLL
-static void
-std_putc(nkf_char c)
-{
-    if(c!=EOF)
-	putchar(c);
-}
-#endif /*WIN32DLL*/
-
-static nkf_char   hold_buf[HOLD_SIZE*2];
-static int             hold_count = 0;
-static nkf_char
-push_hold_buf(nkf_char c2)
-{
-    if (hold_count >= HOLD_SIZE*2)
-	return (EOF);
-    hold_buf[hold_count++] = c2;
-    return ((hold_count >= HOLD_SIZE*2) ? EOF : hold_count);
-}
-
-static int
-h_conv(FILE *f, nkf_char c1, nkf_char c2)
-{
-    int ret;
-    int hold_index;
-    int fromhold_count;
-    nkf_char c3, c4;
-
-    /** it must NOT be in the kanji shifte sequence      */
-    /** it must NOT be written in JIS7                   */
-    /** and it must be after 2 byte 8bit code            */
-
-    hold_count = 0;
-    push_hold_buf(c1);
-    push_hold_buf(c2);
-
-    while ((c2 = (*i_getc)(f)) != EOF) {
-	if (c2 == ESC){
-	    (*i_ungetc)(c2,f);
-	    break;
-	}
-	code_status(c2);
-	if (push_hold_buf(c2) == EOF || estab_f) {
-	    break;
-	}
-    }
-
-    if (!estab_f) {
-	struct input_code *p = input_code_list;
-	struct input_code *result = p;
-	if (c2 == EOF) {
-	    code_status(c2);
-	}
-	while (p->name) {
-	    if (p->status_func && p->score < result->score) {
-		result = p;
-	    }
-	    p++;
-	}
-	set_iconv(TRUE, result->iconv_func);
-    }
-
-
-    /** now,
-     ** 1) EOF is detected, or
-     ** 2) Code is established, or
-     ** 3) Buffer is FULL (but last word is pushed)
-     **
-     ** in 1) and 3) cases, we continue to use
-     ** Kanji codes by oconv and leave estab_f unchanged.
-     **/
-
-    ret = c2;
-    hold_index = 0;
-    while (hold_index < hold_count){
-	c1 = hold_buf[hold_index++];
-	if (nkf_char_unicode_p(c1)) {
-	    (*oconv)(0, c1);
-	    continue;
-	}
-	else if (c1 <= DEL){
-	    (*iconv)(0, c1, 0);
-	    continue;
-	}else if (iconv == s_iconv && 0xa1 <= c1 && c1 <= 0xdf){
-	    (*iconv)(JIS_X_0201_1976_K, c1, 0);
-	    continue;
-	}
-	fromhold_count = 1;
-	if (hold_index < hold_count){
-	    c2 = hold_buf[hold_index++];
-	    fromhold_count++;
-	}else{
-	    c2 = (*i_getc)(f);
-	    if (c2 == EOF){
-		c4 = EOF;
-		break;
-	    }
-	    code_status(c2);
-	}
-	c3 = 0;
-	switch ((*iconv)(c1, c2, 0)) {  /* can be EUC/SJIS/UTF-8 */
-	case -2:
-	    /* 4 bytes UTF-8 */
-	    if (hold_index < hold_count){
-		c3 = hold_buf[hold_index++];
-	    } else if ((c3 = (*i_getc)(f)) == EOF) {
-		ret = EOF;
-		break;
-	    }
-	    code_status(c3);
-	    if (hold_index < hold_count){
-		c4 = hold_buf[hold_index++];
-	    } else if ((c4 = (*i_getc)(f)) == EOF) {
-		c3 = ret = EOF;
-		break;
-	    }
-	    code_status(c4);
-	    (*iconv)(c1, c2, (c3<<8)|c4);
-	    break;
-	case -3:
-	    /* 4 bytes UTF-8 (check combining character) */
-	    if (hold_index < hold_count){
-		c3 = hold_buf[hold_index++];
-		fromhold_count++;
-	    } else if ((c3 = (*i_getc)(f)) == EOF) {
-		w_iconv_nocombine(c1, c2, 0);
-		break;
-	    }
-	    if (hold_index < hold_count){
-		c4 = hold_buf[hold_index++];
-		fromhold_count++;
-	    } else if ((c4 = (*i_getc)(f)) == EOF) {
-		w_iconv_nocombine(c1, c2, 0);
-		if (fromhold_count <= 2)
-		    (*i_ungetc)(c3,f);
-		else
-		    hold_index--;
-		continue;
-	    }
-	    if (w_iconv_combine(c1, c2, 0, c3, c4, 0)) {
-		w_iconv_nocombine(c1, c2, 0);
-		if (fromhold_count <= 2) {
-		    (*i_ungetc)(c4,f);
-		    (*i_ungetc)(c3,f);
-		} else if (fromhold_count == 3) {
-		    (*i_ungetc)(c4,f);
-		    hold_index--;
-		} else {
-		    hold_index -= 2;
-		}
-	    }
-	    break;
-	case -1:
-	    /* 3 bytes EUC or UTF-8 */
-	    if (hold_index < hold_count){
-		c3 = hold_buf[hold_index++];
-		fromhold_count++;
-	    } else if ((c3 = (*i_getc)(f)) == EOF) {
-		ret = EOF;
-		break;
-	    } else {
-		code_status(c3);
-	    }
-	    if ((*iconv)(c1, c2, c3) == -3) {
-		/* 6 bytes UTF-8 (check combining character) */
-		nkf_char c5, c6;
-		if (hold_index < hold_count){
-		    c4 = hold_buf[hold_index++];
-		    fromhold_count++;
-		} else if ((c4 = (*i_getc)(f)) == EOF) {
-		    w_iconv_nocombine(c1, c2, c3);
-		    continue;
-		}
-		if (hold_index < hold_count){
-		    c5 = hold_buf[hold_index++];
-		    fromhold_count++;
-		} else if ((c5 = (*i_getc)(f)) == EOF) {
-		    w_iconv_nocombine(c1, c2, c3);
-		    if (fromhold_count == 4)
-			hold_index--;
-		    else
-			(*i_ungetc)(c4,f);
-		    continue;
-		}
-		if (hold_index < hold_count){
-		    c6 = hold_buf[hold_index++];
-		    fromhold_count++;
-		} else if ((c6 = (*i_getc)(f)) == EOF) {
-		    w_iconv_nocombine(c1, c2, c3);
-		    if (fromhold_count == 5) {
-			hold_index -= 2;
-		    } else if (fromhold_count == 4) {
-			hold_index--;
-			(*i_ungetc)(c5,f);
-		    } else {
-			(*i_ungetc)(c5,f);
-			(*i_ungetc)(c4,f);
-		    }
-		    continue;
-		}
-		if (w_iconv_combine(c1, c2, c3, c4, c5, c6)) {
-		    w_iconv_nocombine(c1, c2, c3);
-		    if (fromhold_count == 6) {
-			hold_index -= 3;
-		    } else if (fromhold_count == 5) {
-			hold_index -= 2;
-			(*i_ungetc)(c6,f);
-		    } else if (fromhold_count == 4) {
-			hold_index--;
-			(*i_ungetc)(c6,f);
-			(*i_ungetc)(c5,f);
-		    } else {
-			(*i_ungetc)(c6,f);
-			(*i_ungetc)(c5,f);
-			(*i_ungetc)(c4,f);
-		    }
-		}
-	    }
-	    break;
-	}
-	if (c3 == EOF) break;
-    }
-    return ret;
-}
-
-/*
- * Check and Ignore BOM
- */
-static void
-check_bom(FILE *f)
-{
-    int c2;
-    input_bom_f = FALSE;
-    switch(c2 = (*i_getc)(f)){
-    case 0x00:
-	if((c2 = (*i_getc)(f)) == 0x00){
-	    if((c2 = (*i_getc)(f)) == 0xFE){
-		if((c2 = (*i_getc)(f)) == 0xFF){
-		    if(!input_encoding){
-			set_iconv(TRUE, w_iconv32);
-		    }
-		    if (iconv == w_iconv32) {
-			input_bom_f = TRUE;
-			input_endian = ENDIAN_BIG;
-			return;
-		    }
-		    (*i_ungetc)(0xFF,f);
-		}else (*i_ungetc)(c2,f);
-		(*i_ungetc)(0xFE,f);
-	    }else if(c2 == 0xFF){
-		if((c2 = (*i_getc)(f)) == 0xFE){
-		    if(!input_encoding){
-			set_iconv(TRUE, w_iconv32);
-		    }
-		    if (iconv == w_iconv32) {
-			input_endian = ENDIAN_2143;
-			return;
-		    }
-		    (*i_ungetc)(0xFF,f);
-		}else (*i_ungetc)(c2,f);
-		(*i_ungetc)(0xFF,f);
-	    }else (*i_ungetc)(c2,f);
-	    (*i_ungetc)(0x00,f);
-	}else (*i_ungetc)(c2,f);
-	(*i_ungetc)(0x00,f);
-	break;
-    case 0xEF:
-	if((c2 = (*i_getc)(f)) == 0xBB){
-	    if((c2 = (*i_getc)(f)) == 0xBF){
-		if(!input_encoding){
-		    set_iconv(TRUE, w_iconv);
-		}
-		if (iconv == w_iconv) {
-		    input_bom_f = TRUE;
-		    return;
-		}
-		(*i_ungetc)(0xBF,f);
-	    }else (*i_ungetc)(c2,f);
-	    (*i_ungetc)(0xBB,f);
-	}else (*i_ungetc)(c2,f);
-	(*i_ungetc)(0xEF,f);
-	break;
-    case 0xFE:
-	if((c2 = (*i_getc)(f)) == 0xFF){
-	    if((c2 = (*i_getc)(f)) == 0x00){
-		if((c2 = (*i_getc)(f)) == 0x00){
-		    if(!input_encoding){
-			set_iconv(TRUE, w_iconv32);
-		    }
-		    if (iconv == w_iconv32) {
-			input_endian = ENDIAN_3412;
-			return;
-		    }
-		    (*i_ungetc)(0x00,f);
-		}else (*i_ungetc)(c2,f);
-		(*i_ungetc)(0x00,f);
-	    }else (*i_ungetc)(c2,f);
-	    if(!input_encoding){
-		set_iconv(TRUE, w_iconv16);
-	    }
-	    if (iconv == w_iconv16) {
-		input_endian = ENDIAN_BIG;
-		input_bom_f = TRUE;
-		return;
-	    }
-	    (*i_ungetc)(0xFF,f);
-	}else (*i_ungetc)(c2,f);
-	(*i_ungetc)(0xFE,f);
-	break;
-    case 0xFF:
-	if((c2 = (*i_getc)(f)) == 0xFE){
-	    if((c2 = (*i_getc)(f)) == 0x00){
-		if((c2 = (*i_getc)(f)) == 0x00){
-		    if(!input_encoding){
-			set_iconv(TRUE, w_iconv32);
-		    }
-		    if (iconv == w_iconv32) {
-			input_endian = ENDIAN_LITTLE;
-			input_bom_f = TRUE;
-			return;
-		    }
-		    (*i_ungetc)(0x00,f);
-		}else (*i_ungetc)(c2,f);
-		(*i_ungetc)(0x00,f);
-	    }else (*i_ungetc)(c2,f);
-	    if(!input_encoding){
-		set_iconv(TRUE, w_iconv16);
-	    }
-	    if (iconv == w_iconv16) {
-		input_endian = ENDIAN_LITTLE;
-		input_bom_f = TRUE;
-		return;
-	    }
-	    (*i_ungetc)(0xFE,f);
-	}else (*i_ungetc)(c2,f);
-	(*i_ungetc)(0xFF,f);
-	break;
-    default:
-	(*i_ungetc)(c2,f);
-	break;
-    }
-}
-
-static nkf_char
-broken_getc(FILE *f)
-{
-    nkf_char c, c1;
-
-    if (!nkf_buf_empty_p(nkf_state->broken_buf)) {
-	return nkf_buf_pop(nkf_state->broken_buf);
-    }
-    c = (*i_bgetc)(f);
-    if (c=='$' && nkf_state->broken_state != ESC
-	&& (input_mode == ASCII || input_mode == JIS_X_0201_1976_K)) {
-	c1= (*i_bgetc)(f);
-	nkf_state->broken_state = 0;
-	if (c1=='@'|| c1=='B') {
-	    nkf_buf_push(nkf_state->broken_buf, c1);
-	    nkf_buf_push(nkf_state->broken_buf, c);
-	    return ESC;
-	} else {
-	    (*i_bungetc)(c1,f);
-	    return c;
-	}
-    } else if (c=='(' && nkf_state->broken_state != ESC
-	       && (input_mode == JIS_X_0208 || input_mode == JIS_X_0201_1976_K)) {
-	c1= (*i_bgetc)(f);
-	nkf_state->broken_state = 0;
-	if (c1=='J'|| c1=='B') {
-	    nkf_buf_push(nkf_state->broken_buf, c1);
-	    nkf_buf_push(nkf_state->broken_buf, c);
-	    return ESC;
-	} else {
-	    (*i_bungetc)(c1,f);
-	    return c;
-	}
-    } else {
-	nkf_state->broken_state = c;
-	return c;
-    }
-}
-
-static nkf_char
-broken_ungetc(nkf_char c, ARG_UNUSED FILE *f)
-{
-    if (nkf_buf_length(nkf_state->broken_buf) < 2)
-	nkf_buf_push(nkf_state->broken_buf, c);
-    return c;
-}
-
-static void
-eol_conv(nkf_char c2, nkf_char c1)
-{
-    if (guess_f && input_eol != EOF) {
-	if (c2 == 0 && c1 == LF) {
-	    if (!input_eol) input_eol = prev_cr ? CRLF : LF;
-	    else if (input_eol != (prev_cr ? CRLF : LF)) input_eol = EOF;
-	} else if (c2 == 0 && c1 == CR && input_eol == LF) input_eol = EOF;
-	else if (!prev_cr);
-	else if (!input_eol) input_eol = CR;
-	else if (input_eol != CR) input_eol = EOF;
-    }
-    if (prev_cr || (c2 == 0 && c1 == LF)) {
-	prev_cr = 0;
-	if (eolmode_f != LF) (*o_eol_conv)(0, CR);
-	if (eolmode_f != CR) (*o_eol_conv)(0, LF);
-    }
-    if (c2 == 0 && c1 == CR) prev_cr = CR;
-    else if (c2 != 0 || c1 != LF) (*o_eol_conv)(c2, c1);
-}
-
-static void
-put_newline(void (*func)(nkf_char))
-{
-    switch (eolmode_f ? eolmode_f : DEFAULT_NEWLINE) {
-      case CRLF:
-	(*func)(0x0D);
-	(*func)(0x0A);
-	break;
-      case CR:
-	(*func)(0x0D);
-	break;
-      case LF:
-	(*func)(0x0A);
-	break;
-    }
-}
-
-static void
-oconv_newline(void (*func)(nkf_char, nkf_char))
-{
-    switch (eolmode_f ? eolmode_f : DEFAULT_NEWLINE) {
-      case CRLF:
-	(*func)(0, 0x0D);
-	(*func)(0, 0x0A);
-	break;
-      case CR:
-	(*func)(0, 0x0D);
-	break;
-      case LF:
-	(*func)(0, 0x0A);
-	break;
-    }
-}
-
-/*
-   Return value of fold_conv()
-
-   LF  add newline  and output char
-   CR  add newline  and output nothing
-   SP  space
-   0   skip
-   1   (or else) normal output
-
-   fold state in prev (previous character)
-
-   >0x80 Japanese (X0208/X0201)
-   <0x80 ASCII
-   LF    new line
-   SP    space
-
-   This fold algorithm does not preserve heading space in a line.
-   This is the main difference from fmt.
- */
-
-#define char_size(c2,c1) (c2?2:1)
-
-static void
-fold_conv(nkf_char c2, nkf_char c1)
-{
-    nkf_char prev0;
-    nkf_char fold_state;
-
-    if (c1== CR && !fold_preserve_f) {
-	fold_state=0;  /* ignore cr */
-    }else if (c1== LF&&f_prev==CR && fold_preserve_f) {
-	f_prev = LF;
-	fold_state=0;  /* ignore cr */
-    } else if (c1== BS) {
-	if (f_line>0) f_line--;
-	fold_state =  1;
-    } else if (c2==EOF && f_line != 0) {    /* close open last line */
-	fold_state = LF;
-    } else if ((c1==LF && !fold_preserve_f)
-	       || ((c1==CR||(c1==LF&&f_prev!=CR))
-		   && fold_preserve_f)) {
-	/* new line */
-	if (fold_preserve_f) {
-	    f_prev = c1;
-	    f_line = 0;
-	    fold_state =  CR;
-	} else if ((f_prev == c1)
-		   || (f_prev == LF)
-		  ) {        /* duplicate newline */
-	    if (f_line) {
-		f_line = 0;
-		fold_state =  LF;    /* output two newline */
-	    } else {
-		f_line = 0;
-		fold_state =  1;
-	    }
-	} else  {
-	    if (f_prev&0x80) {     /* Japanese? */
-		f_prev = c1;
-		fold_state =  0;       /* ignore given single newline */
-	    } else if (f_prev==SP) {
-		fold_state =  0;
-	    } else {
-		f_prev = c1;
-		if (++f_line<=fold_len)
-		    fold_state =  SP;
-		else {
-		    f_line = 0;
-		    fold_state =  CR;        /* fold and output nothing */
-		}
-	    }
-	}
-    } else if (c1=='\f') {
-	f_prev = LF;
-	f_line = 0;
-	fold_state =  LF;            /* output newline and clear */
-    } else if ((c2==0 && nkf_isblank(c1)) || (c2 == '!' && c1 == '!')) {
-	/* X0208 kankaku or ascii space */
-	if (f_prev == SP) {
-	    fold_state = 0;         /* remove duplicate spaces */
-	} else {
-	    f_prev = SP;
-	    if (++f_line<=fold_len)
-		fold_state = SP;         /* output ASCII space only */
-	    else {
-		f_prev = SP; f_line = 0;
-		fold_state = CR;        /* fold and output nothing */
-	    }
-	}
-    } else {
-	prev0 = f_prev; /* we still need this one... , but almost done */
-	f_prev = c1;
-	if (c2 || c2 == JIS_X_0201_1976_K)
-	    f_prev |= 0x80;  /* this is Japanese */
-	f_line += c2 == JIS_X_0201_1976_K ? 1: char_size(c2,c1);
-	if (f_line<=fold_len) {   /* normal case */
-	    fold_state = 1;
-	} else {
-	    if (f_line>fold_len+fold_margin) { /* too many kinsoku suspension */
-		f_line = char_size(c2,c1);
-		fold_state =  LF;       /* We can't wait, do fold now */
-	    } else if (c2 == JIS_X_0201_1976_K) {
-		/* simple kinsoku rules  return 1 means no folding  */
-		if (c1==(0xde&0x7f)) fold_state = 1; /* $B!+(B*/
-		else if (c1==(0xdf&0x7f)) fold_state = 1; /* $B!,(B*/
-		else if (c1==(0xa4&0x7f)) fold_state = 1; /* $B!#(B*/
-		else if (c1==(0xa3&0x7f)) fold_state = 1; /* $B!$(B*/
-		else if (c1==(0xa1&0x7f)) fold_state = 1; /* $B!W(B*/
-		else if (c1==(0xb0&0x7f)) fold_state = 1; /* - */
-		else if (SP<=c1 && c1<=(0xdf&0x7f)) {      /* X0201 */
-		    f_line = 1;
-		    fold_state = LF;/* add one new f_line before this character */
-		} else {
-		    f_line = 1;
-		    fold_state = LF;/* add one new f_line before this character */
-		}
-	    } else if (c2==0) {
-		/* kinsoku point in ASCII */
-		if (  c1==')'||    /* { [ ( */
-		    c1==']'||
-		    c1=='}'||
-		    c1=='.'||
-		    c1==','||
-		    c1=='!'||
-		    c1=='?'||
-		    c1=='/'||
-		    c1==':'||
-		    c1==';') {
-		    fold_state = 1;
-		    /* just after special */
-		} else if (!is_alnum(prev0)) {
-		    f_line = char_size(c2,c1);
-		    fold_state = LF;
-		} else if ((prev0==SP) ||   /* ignored new f_line */
-			   (prev0==LF)||        /* ignored new f_line */
-			   (prev0&0x80)) {        /* X0208 - ASCII */
-		    f_line = char_size(c2,c1);
-		    fold_state = LF;/* add one new f_line before this character */
-		} else {
-		    fold_state = 1;  /* default no fold in ASCII */
-		}
-	    } else {
-		if (c2=='!') {
-		    if (c1=='"')  fold_state = 1; /* $B!"(B */
-		    else if (c1=='#')  fold_state = 1; /* $B!#(B */
-		    else if (c1=='W')  fold_state = 1; /* $B!W(B */
-		    else if (c1=='K')  fold_state = 1; /* $B!K(B */
-		    else if (c1=='$')  fold_state = 1; /* $B!$(B */
-		    else if (c1=='%')  fold_state = 1; /* $B!%(B */
-		    else if (c1=='\'') fold_state = 1; /* $B!\(B */
-		    else if (c1=='(')  fold_state = 1; /* $B!((B */
-		    else if (c1==')')  fold_state = 1; /* $B!)(B */
-		    else if (c1=='*')  fold_state = 1; /* $B!*(B */
-		    else if (c1=='+')  fold_state = 1; /* $B!+(B */
-		    else if (c1==',')  fold_state = 1; /* $B!,(B */
-		    /* default no fold in kinsoku */
-		    else {
-			fold_state = LF;
-			f_line = char_size(c2,c1);
-			/* add one new f_line before this character */
-		    }
-		} else {
-		    f_line = char_size(c2,c1);
-		    fold_state = LF;
-		    /* add one new f_line before this character */
-		}
-	    }
-	}
-    }
-    /* terminator process */
-    switch(fold_state) {
-    case LF:
-	oconv_newline(o_fconv);
-	(*o_fconv)(c2,c1);
-	break;
-    case 0:
-	return;
-    case CR:
-	oconv_newline(o_fconv);
-	break;
-    case TAB:
-    case SP:
-	(*o_fconv)(0,SP);
-	break;
-    default:
-	(*o_fconv)(c2,c1);
-    }
-}
-
-static nkf_char z_prev2=0,z_prev1=0;
-
-static void
-z_conv(nkf_char c2, nkf_char c1)
-{
-
-    /* if (c2) c1 &= 0x7f; assertion */
-
-    if (c2 == JIS_X_0201_1976_K && (c1 == 0x20 || c1 == 0x7D || c1 == 0x7E)) {
-	(*o_zconv)(c2,c1);
-	return;
-    }
-
-    if (x0201_f) {
-	if (z_prev2 == JIS_X_0201_1976_K) {
-	    if (c2 == JIS_X_0201_1976_K) {
-		if (c1 == (0xde&0x7f)) { /* $BByE@(B */
-		    z_prev2 = 0;
-		    (*o_zconv)(dv[(z_prev1-SP)*2], dv[(z_prev1-SP)*2+1]);
-		    return;
-		} else if (c1 == (0xdf&0x7f) && ev[(z_prev1-SP)*2]) {  /* $BH>ByE@(B */
-		    z_prev2 = 0;
-		    (*o_zconv)(ev[(z_prev1-SP)*2], ev[(z_prev1-SP)*2+1]);
-		    return;
-		} else if (x0213_f && c1 == (0xdf&0x7f) && ev_x0213[(z_prev1-SP)*2]) {  /* $BH>ByE@(B */
-		    z_prev2 = 0;
-		    (*o_zconv)(ev_x0213[(z_prev1-SP)*2], ev_x0213[(z_prev1-SP)*2+1]);
-		    return;
-		}
-	    }
-	    z_prev2 = 0;
-	    (*o_zconv)(cv[(z_prev1-SP)*2], cv[(z_prev1-SP)*2+1]);
-	}
-	if (c2 == JIS_X_0201_1976_K) {
-	    if (dv[(c1-SP)*2] || ev[(c1-SP)*2] || (x0213_f && ev_x0213[(c1-SP)*2])) {
-		/* wait for $BByE@(B or $BH>ByE@(B */
-		z_prev1 = c1;
-		z_prev2 = c2;
-		return;
-	    } else {
-		(*o_zconv)(cv[(c1-SP)*2], cv[(c1-SP)*2+1]);
-		return;
-	    }
-	}
-    }
-
-    if (c2 == EOF) {
-	(*o_zconv)(c2, c1);
-	return;
-    }
-
-    if (alpha_f&1 && c2 == 0x23) {
-	/* JISX0208 Alphabet */
-	c2 = 0;
-    } else if (c2 == 0x21) {
-	/* JISX0208 Kigou */
-	if (0x21==c1) {
-	    if (alpha_f&2) {
-		c2 = 0;
-		c1 = SP;
-	    } else if (alpha_f&4) {
-		(*o_zconv)(0, SP);
-		(*o_zconv)(0, SP);
-		return;
-	    }
-	} else if (alpha_f&1 && 0x20<c1 && c1<0x7f && fv[c1-0x20]) {
-	    c2 =  0;
-	    c1 = fv[c1-0x20];
-	}
-    }
-
-    if (alpha_f&8 && c2 == 0) {
-	/* HTML Entity */
-	const char *entity = 0;
-	switch (c1){
-	case '>': entity = "&gt;"; break;
-	case '<': entity = "&lt;"; break;
-	case '\"': entity = "&quot;"; break;
-	case '&': entity = "&amp;"; break;
-	}
-	if (entity){
-	    while (*entity) (*o_zconv)(0, *entity++);
-	    return;
-	}
-    }
-
-    if (alpha_f & 16) {
-	/* JIS X 0208 Katakana to JIS X 0201 Katakana */
-	if (c2 == 0x21) {
-	    nkf_char c = 0;
-	    switch (c1) {
-	    case 0x23:
-		/* U+3002 (0x8142) Ideographic Full Stop -> U+FF61 (0xA1) Halfwidth Ideographic Full Stop */
-		c = 0xA1;
-		break;
-	    case 0x56:
-		/* U+300C (0x8175) Left Corner Bracket -> U+FF62 (0xA2) Halfwidth Left Corner Bracket */
-		c = 0xA2;
-		break;
-	    case 0x57:
-		/* U+300D (0x8176) Right Corner Bracket -> U+FF63 (0xA3) Halfwidth Right Corner Bracket */
-		c = 0xA3;
-		break;
-	    case 0x22:
-		/* U+3001 (0x8141) Ideographic Comma -> U+FF64 (0xA4) Halfwidth Ideographic Comma */
-		c = 0xA4;
-		break;
-	    case 0x26:
-		/* U+30FB (0x8145) Katakana Middle Dot -> U+FF65 (0xA5) Halfwidth Katakana Middle Dot */
-		c = 0xA5;
-		break;
-	    case 0x3C:
-		/* U+30FC (0x815B) Katakana-Hiragana Prolonged Sound Mark -> U+FF70 (0xB0) Halfwidth Katakana-Hiragana Prolonged Sound Mark */
-		c = 0xB0;
-		break;
-	    case 0x2B:
-		/* U+309B (0x814A) Katakana-Hiragana Voiced Sound Mark -> U+FF9E (0xDE) Halfwidth Katakana Voiced Sound Mark */
-		c = 0xDE;
-		break;
-	    case 0x2C:
-		/* U+309C (0x814B) Katakana-Hiragana Semi-Voiced Sound Mark -> U+FF9F (0xDF) Halfwidth Katakana Semi-Voiced Sound Mark */
-		c = 0xDF;
-		break;
-	    }
-	    if (c) {
-		(*o_zconv)(JIS_X_0201_1976_K, c);
-		return;
-	    }
-	} else if (c2 == 0x25) {
-	    /* JISX0208 Katakana */
-	    static const int fullwidth_to_halfwidth[] =
-	    {
-		0x0000, 0x2700, 0x3100, 0x2800, 0x3200, 0x2900, 0x3300, 0x2A00,
-		0x3400, 0x2B00, 0x3500, 0x3600, 0x365E, 0x3700, 0x375E, 0x3800,
-		0x385E, 0x3900, 0x395E, 0x3A00, 0x3A5E, 0x3B00, 0x3B5E, 0x3C00,
-		0x3C5E, 0x3D00, 0x3D5E, 0x3E00, 0x3E5E, 0x3F00, 0x3F5E, 0x4000,
-		0x405E, 0x4100, 0x415E, 0x2F00, 0x4200, 0x425E, 0x4300, 0x435E,
-		0x4400, 0x445E, 0x4500, 0x4600, 0x4700, 0x4800, 0x4900, 0x4A00,
-		0x4A5E, 0x4A5F, 0x4B00, 0x4B5E, 0x4B5F, 0x4C00, 0x4C5E, 0x4C5F,
-		0x4D00, 0x4D5E, 0x4D5F, 0x4E00, 0x4E5E, 0x4E5F, 0x4F00, 0x5000,
-		0x5100, 0x5200, 0x5300, 0x2C00, 0x5400, 0x2D00, 0x5500, 0x2E00,
-		0x5600, 0x5700, 0x5800, 0x5900, 0x5A00, 0x5B00, 0x0000, 0x5C00,
-		0x0000, 0x0000, 0x2600, 0x5D00, 0x335E, 0x0000, 0x0000, 0x365F,
-		0x375F, 0x385F, 0x395F, 0x3A5F, 0x3E5F, 0x425F, 0x445F, 0x0000
-	    };
-	    if (fullwidth_to_halfwidth[c1-0x20]){
-		c2 = fullwidth_to_halfwidth[c1-0x20];
-		(*o_zconv)(JIS_X_0201_1976_K, c2>>8);
-		if (c2 & 0xFF) {
-		    (*o_zconv)(JIS_X_0201_1976_K, c2&0xFF);
-		}
-		return;
-	    }
-	} else if (c2 == 0 && nkf_char_unicode_p(c1) &&
-	    ((c1&VALUE_MASK) == 0x3099 || (c1&VALUE_MASK) == 0x309A)) { /* $B9g@.MQByE@!&H>ByE@(B */
-	    (*o_zconv)(JIS_X_0201_1976_K, 0x5E + (c1&VALUE_MASK) - 0x3099);
-	    return;
-	}
-    }
-    (*o_zconv)(c2,c1);
-}
-
-
-#define rot13(c)  ( \
-		   ( c < 'A') ? c: \
-		   (c <= 'M')  ? (c + 13): \
-		   (c <= 'Z')  ? (c - 13): \
-		   (c < 'a')   ? (c): \
-		   (c <= 'm')  ? (c + 13): \
-		   (c <= 'z')  ? (c - 13): \
-		   (c) \
-		  )
-
-#define  rot47(c) ( \
-		   ( c < '!') ? c: \
-		   ( c <= 'O') ? (c + 47) : \
-		   ( c <= '~') ?  (c - 47) : \
-		   c \
-		  )
-
-static void
-rot_conv(nkf_char c2, nkf_char c1)
-{
-    if (c2 == 0 || c2 == JIS_X_0201_1976_K || c2 == ISO_8859_1) {
-	c1 = rot13(c1);
-    } else if (c2) {
-	c1 = rot47(c1);
-	c2 = rot47(c2);
-    }
-    (*o_rot_conv)(c2,c1);
-}
-
-static void
-hira_conv(nkf_char c2, nkf_char c1)
-{
-    if (hira_f & 1) {
-	if (c2 == 0x25) {
-	    if (0x20 < c1 && c1 < 0x74) {
-		c2 = 0x24;
-		(*o_hira_conv)(c2,c1);
-		return;
-	    } else if (c1 == 0x74 && nkf_enc_unicode_p(output_encoding)) {
-		c2 = 0;
-		c1 = nkf_char_unicode_new(0x3094);
-		(*o_hira_conv)(c2,c1);
-		return;
-	    }
-	} else if (c2 == 0x21 && (c1 == 0x33 || c1 == 0x34)) {
-	    c1 += 2;
-	    (*o_hira_conv)(c2,c1);
-	    return;
-	}
-    }
-    if (hira_f & 2) {
-	if (c2 == 0 && c1 == nkf_char_unicode_new(0x3094)) {
-	    c2 = 0x25;
-	    c1 = 0x74;
-	} else if (c2 == 0x24 && 0x20 < c1 && c1 < 0x74) {
-	    c2 = 0x25;
-	} else if (c2 == 0x21 && (c1 == 0x35 || c1 == 0x36)) {
-	    c1 -= 2;
-	}
-    }
-    (*o_hira_conv)(c2,c1);
-}
-
-
-static void
-iso2022jp_check_conv(nkf_char c2, nkf_char c1)
-{
-#define RANGE_NUM_MAX 18
-    static const nkf_char range[RANGE_NUM_MAX][2] = {
-	{0x222f, 0x2239,},
-	{0x2242, 0x2249,},
-	{0x2251, 0x225b,},
-	{0x226b, 0x2271,},
-	{0x227a, 0x227d,},
-	{0x2321, 0x232f,},
-	{0x233a, 0x2340,},
-	{0x235b, 0x2360,},
-	{0x237b, 0x237e,},
-	{0x2474, 0x247e,},
-	{0x2577, 0x257e,},
-	{0x2639, 0x2640,},
-	{0x2659, 0x267e,},
-	{0x2742, 0x2750,},
-	{0x2772, 0x277e,},
-	{0x2841, 0x287e,},
-	{0x4f54, 0x4f7e,},
-	{0x7425, 0x747e},
-    };
-    nkf_char i;
-    nkf_char start, end, c;
-
-    if(c2 >= 0x00 && c2 <= 0x20 && c1 >= 0x7f && c1 <= 0xff) {
-	c2 = GETA1;
-	c1 = GETA2;
-    }
-    if((c2 >= 0x29 && c2 <= 0x2f) || (c2 >= 0x75 && c2 <= 0x7e)) {
-	c2 = GETA1;
-	c1 = GETA2;
-    }
-
-    for (i = 0; i < RANGE_NUM_MAX; i++) {
-	start = range[i][0];
-	end   = range[i][1];
-	c     = (c2 << 8) + c1;
-	if (c >= start && c <= end) {
-	    c2 = GETA1;
-	    c1 = GETA2;
-	}
-    }
-    (*o_iso2022jp_check_conv)(c2,c1);
-}
-
-
-/* This converts  =?ISO-2022-JP?B?HOGE HOGE?= */
-
-static const unsigned char *mime_pattern[] = {
-    (const unsigned char *)"\075?EUC-JP?B?",
-    (const unsigned char *)"\075?SHIFT_JIS?B?",
-    (const unsigned char *)"\075?ISO-8859-1?Q?",
-    (const unsigned char *)"\075?ISO-8859-1?B?",
-    (const unsigned char *)"\075?ISO-2022-JP?B?",
-    (const unsigned char *)"\075?ISO-2022-JP?B?",
-    (const unsigned char *)"\075?ISO-2022-JP?Q?",
-#if defined(UTF8_INPUT_ENABLE)
-    (const unsigned char *)"\075?UTF-8?B?",
-    (const unsigned char *)"\075?UTF-8?Q?",
-#endif
-    (const unsigned char *)"\075?US-ASCII?Q?",
-    NULL
-};
-
-
-/* $B3:Ev$9$k%3!<%I$NM%@hEY$r>e$2$k$?$a$NL\0u(B */
-static nkf_char (*const mime_priority_func[])(nkf_char c2, nkf_char c1, nkf_char c0) = {
-    e_iconv, s_iconv, 0, 0, 0, 0, 0,
-#if defined(UTF8_INPUT_ENABLE)
-    w_iconv, w_iconv,
-#endif
-    0,
-};
-
-static const nkf_char mime_encode[] = {
-    EUC_JP, SHIFT_JIS, ISO_8859_1, ISO_8859_1, JIS_X_0208, JIS_X_0201_1976_K, JIS_X_0201_1976_K,
-#if defined(UTF8_INPUT_ENABLE)
-    UTF_8, UTF_8,
-#endif
-    ASCII,
-    0
-};
-
-static const nkf_char mime_encode_method[] = {
-    'B', 'B','Q', 'B', 'B', 'B', 'Q',
-#if defined(UTF8_INPUT_ENABLE)
-    'B', 'Q',
-#endif
-    'Q',
-    0
-};
-
-
-/* MIME preprocessor fifo */
-
-#define MIME_BUF_SIZE   (1024)    /* 2^n ring buffer */
-#define MIME_BUF_MASK   (MIME_BUF_SIZE-1)
-#define mime_input_buf(n)        mime_input_state.buf[(n)&MIME_BUF_MASK]
-static struct {
-    unsigned char buf[MIME_BUF_SIZE];
-    unsigned int  top;
-    unsigned int  last;  /* decoded */
-    unsigned int  input; /* undecoded */
-} mime_input_state;
-static nkf_char (*mime_iconv_back)(nkf_char c2,nkf_char c1,nkf_char c0) = NULL;
-
-#define MAXRECOVER 20
-
-static void
-mime_input_buf_unshift(nkf_char c)
-{
-    mime_input_buf(--mime_input_state.top) = (unsigned char)c;
-}
-
-static nkf_char
-mime_ungetc(nkf_char c, ARG_UNUSED FILE *f)
-{
-    mime_input_buf_unshift(c);
-    return c;
-}
-
-static nkf_char
-mime_ungetc_buf(nkf_char c, FILE *f)
-{
-    if (mimebuf_f)
-	(*i_mungetc_buf)(c,f);
-    else
-	mime_input_buf(--mime_input_state.input) = (unsigned char)c;
-    return c;
-}
-
-static nkf_char
-mime_getc_buf(FILE *f)
-{
-    /* we don't keep eof of mime_input_buf, because it contains ?= as
-       a terminator. It was checked in mime_integrity. */
-    return ((mimebuf_f)?
-	    (*i_mgetc_buf)(f):mime_input_buf(mime_input_state.input++));
-}
-
-static void
-switch_mime_getc(void)
-{
-    if (i_getc!=mime_getc) {
-	i_mgetc = i_getc; i_getc = mime_getc;
-	i_mungetc = i_ungetc; i_ungetc = mime_ungetc;
-	if(mime_f==STRICT_MIME) {
-	    i_mgetc_buf = i_mgetc; i_mgetc = mime_getc_buf;
-	    i_mungetc_buf = i_mungetc; i_mungetc = mime_ungetc_buf;
-	}
-    }
-}
-
-static void
-unswitch_mime_getc(void)
-{
-    if(mime_f==STRICT_MIME) {
-	i_mgetc = i_mgetc_buf;
-	i_mungetc = i_mungetc_buf;
-    }
-    i_getc = i_mgetc;
-    i_ungetc = i_mungetc;
-    if(mime_iconv_back)set_iconv(FALSE, mime_iconv_back);
-    mime_iconv_back = NULL;
-}
-
-static nkf_char
-mime_integrity(FILE *f, const unsigned char *p)
-{
-    nkf_char c,d;
-    unsigned int q;
-    /* In buffered mode, read until =? or NL or buffer full
-     */
-    mime_input_state.input = mime_input_state.top;
-    mime_input_state.last = mime_input_state.top;
-
-    while(*p) mime_input_buf(mime_input_state.input++) = *p++;
-    d = 0;
-    q = mime_input_state.input;
-    while((c=(*i_getc)(f))!=EOF) {
-	if (((mime_input_state.input-mime_input_state.top)&MIME_BUF_MASK)==0) {
-	    break;   /* buffer full */
-	}
-	if (c=='=' && d=='?') {
-	    /* checked. skip header, start decode */
-	    mime_input_buf(mime_input_state.input++) = (unsigned char)c;
-	    /* mime_last_input = mime_input_state.input; */
-	    mime_input_state.input = q;
-	    switch_mime_getc();
-	    return 1;
-	}
-	if (!( (c=='+'||c=='/'|| c=='=' || c=='?' || is_alnum(c))))
-	    break;
-	/* Should we check length mod 4? */
-	mime_input_buf(mime_input_state.input++) = (unsigned char)c;
-	d=c;
-    }
-    /* In case of Incomplete MIME, no MIME decode  */
-    mime_input_buf(mime_input_state.input++) = (unsigned char)c;
-    mime_input_state.last = mime_input_state.input;     /* point undecoded buffer */
-    mime_decode_mode = 1;              /* no decode on mime_input_buf last in mime_getc */
-    switch_mime_getc();         /* anyway we need buffered getc */
-    return 1;
-}
-
-static nkf_char
-mime_begin_strict(FILE *f)
-{
-    nkf_char c1 = 0;
-    int i,j,k;
-    const unsigned char *p,*q;
-    nkf_char r[MAXRECOVER];    /* recovery buffer, max mime pattern length */
-
-    mime_decode_mode = FALSE;
-    /* =? has been checked */
-    j = 0;
-    p = mime_pattern[j];
-    r[0]='='; r[1]='?';
-
-    for(i=2;p[i]>SP;i++) {                   /* start at =? */
-	if (((r[i] = c1 = (*i_getc)(f))==EOF) || nkf_toupper(c1) != p[i]) {
-	    /* pattern fails, try next one */
-	    q = p;
-	    while (mime_pattern[++j]) {
-		p = mime_pattern[j];
-		for(k=2;k<i;k++)              /* assume length(p) > i */
-		    if (p[k]!=q[k]) break;
-		if (k==i && nkf_toupper(c1)==p[k]) break;
-	    }
-	    p = mime_pattern[j];
-	    if (p) continue;  /* found next one, continue */
-	    /* all fails, output from recovery buffer */
-	    (*i_ungetc)(c1,f);
-	    for(j=0;j<i;j++) {
-		(*oconv)(0,r[j]);
-	    }
-	    return c1;
-	}
-    }
-    mime_decode_mode = p[i-2];
-
-    mime_iconv_back = iconv;
-    set_iconv(FALSE, mime_priority_func[j]);
-    clr_code_score(find_inputcode_byfunc(mime_priority_func[j]), SCORE_iMIME);
-
-    if (mime_decode_mode=='B') {
-	mimebuf_f = unbuf_f;
-	if (!unbuf_f) {
-	    /* do MIME integrity check */
-	    return mime_integrity(f,mime_pattern[j]);
-	}
-    }
-    switch_mime_getc();
-    mimebuf_f = TRUE;
-    return c1;
-}
-
-static nkf_char
-mime_begin(FILE *f)
-{
-    nkf_char c1 = 0;
-    int i,k;
-
-    /* In NONSTRICT mode, only =? is checked. In case of failure, we  */
-    /* re-read and convert again from mime_buffer.  */
-
-    /* =? has been checked */
-    k = mime_input_state.last;
-    mime_input_buf(mime_input_state.last++)='='; mime_input_buf(mime_input_state.last++)='?';
-    for(i=2;i<MAXRECOVER;i++) {                   /* start at =? */
-	/* We accept any character type even if it is breaked by new lines */
-	c1 = (*i_getc)(f); mime_input_buf(mime_input_state.last++) = (unsigned char)c1;
-	if (c1==LF||c1==SP||c1==CR||
-	    c1=='-'||c1=='_'||is_alnum(c1)) continue;
-	if (c1=='=') {
-	    /* Failed. But this could be another MIME preemble */
-	    (*i_ungetc)(c1,f);
-	    mime_input_state.last--;
-	    break;
-	}
-	if (c1!='?') break;
-	else {
-	    /* c1=='?' */
-	    c1 = (*i_getc)(f); mime_input_buf(mime_input_state.last++) = (unsigned char)c1;
-	    if (!(++i<MAXRECOVER) || c1==EOF) break;
-	    if (c1=='b'||c1=='B') {
-		mime_decode_mode = 'B';
-	    } else if (c1=='q'||c1=='Q') {
-		mime_decode_mode = 'Q';
-	    } else {
-		break;
-	    }
-	    c1 = (*i_getc)(f); mime_input_buf(mime_input_state.last++) = (unsigned char)c1;
-	    if (!(++i<MAXRECOVER) || c1==EOF) break;
-	    if (c1!='?') {
-		mime_decode_mode = FALSE;
-	    }
-	    break;
-	}
-    }
-    switch_mime_getc();
-    if (!mime_decode_mode) {
-	/* false MIME premble, restart from mime_buffer */
-	mime_decode_mode = 1;  /* no decode, but read from the mime_buffer */
-	/* Since we are in MIME mode until buffer becomes empty,    */
-	/* we never go into mime_begin again for a while.           */
-	return c1;
-    }
-    /* discard mime preemble, and goto MIME mode */
-    mime_input_state.last = k;
-    /* do no MIME integrity check */
-    return c1;   /* used only for checking EOF */
-}
-
-#ifdef CHECK_OPTION
-static void
-no_putc(ARG_UNUSED nkf_char c)
-{
-    ;
-}
-
-static void
-debug(const char *str)
-{
-    if (debug_f){
-	fprintf(stderr, "%s\n", str ? str : "NULL");
-    }
-}
-#endif
-
-static void
-set_input_codename(const char *codename)
-{
-    if (!input_codename) {
-	input_codename = codename;
-    } else if (strcmp(codename, input_codename) != 0) {
-	input_codename = "";
-    }
-}
-
-static const char*
-get_guessed_code(void)
-{
-    if (input_codename && !*input_codename) {
-	input_codename = "BINARY";
-    } else {
-	struct input_code *p = find_inputcode_byfunc(iconv);
-	if (!input_codename) {
-	    input_codename = "ASCII";
-	} else if (strcmp(input_codename, "Shift_JIS") == 0) {
-	    if (p->score & (SCORE_DEPEND|SCORE_CP932))
-		input_codename = "CP932";
-	} else if (strcmp(input_codename, "EUC-JP") == 0) {
-	    if (p->score & SCORE_X0213)
-		input_codename = "EUC-JIS-2004";
-	    else if (p->score & (SCORE_X0212))
-		input_codename = "EUCJP-MS";
-	    else if (p->score & (SCORE_DEPEND|SCORE_CP932))
-		input_codename = "CP51932";
-	} else if (strcmp(input_codename, "ISO-2022-JP") == 0) {
-	    if (p->score & (SCORE_KANA))
-		input_codename = "CP50221";
-	    else if (p->score & (SCORE_DEPEND|SCORE_CP932))
-		input_codename = "CP50220";
-	}
-    }
-    return input_codename;
-}
-
-#if !defined(PERL_XS) && !defined(WIN32DLL)
-static void
-print_guessed_code(char *filename)
-{
-    if (filename != NULL) printf("%s: ", filename);
-    if (input_codename && !*input_codename) {
-	printf("BINARY\n");
-    } else {
-	input_codename = get_guessed_code();
-	if (guess_f == 1) {
-	    printf("%s\n", input_codename);
-	} else {
-	    printf("%s%s%s%s\n",
-		   input_codename,
-		   iconv != w_iconv16 && iconv != w_iconv32 ? "" :
-		   input_endian == ENDIAN_LITTLE ? " LE" :
-		   input_endian == ENDIAN_BIG ? " BE" :
-		   "[BUG]",
-		   input_bom_f ? " (BOM)" : "",
-		   input_eol == CR   ? " (CR)" :
-		   input_eol == LF   ? " (LF)" :
-		   input_eol == CRLF ? " (CRLF)" :
-		   input_eol == EOF  ? " (MIXED NL)" :
-		   "");
-	}
-    }
-}
-#endif /*WIN32DLL*/
-
-#ifdef INPUT_OPTION
-
-static nkf_char
-hex_getc(nkf_char ch, FILE *f, nkf_char (*g)(FILE *f), nkf_char (*u)(nkf_char c, FILE *f))
-{
-    nkf_char c1, c2, c3;
-    c1 = (*g)(f);
-    if (c1 != ch){
-	return c1;
-    }
-    c2 = (*g)(f);
-    if (!nkf_isxdigit(c2)){
-	(*u)(c2, f);
-	return c1;
-    }
-    c3 = (*g)(f);
-    if (!nkf_isxdigit(c3)){
-	(*u)(c2, f);
-	(*u)(c3, f);
-	return c1;
-    }
-    return (hex2bin(c2) << 4) | hex2bin(c3);
-}
-
-static nkf_char
-cap_getc(FILE *f)
-{
-    return hex_getc(':', f, i_cgetc, i_cungetc);
-}
-
-static nkf_char
-cap_ungetc(nkf_char c, FILE *f)
-{
-    return (*i_cungetc)(c, f);
-}
-
-static nkf_char
-url_getc(FILE *f)
-{
-    return hex_getc('%', f, i_ugetc, i_uungetc);
-}
-
-static nkf_char
-url_ungetc(nkf_char c, FILE *f)
-{
-    return (*i_uungetc)(c, f);
-}
-#endif
-
-#ifdef NUMCHAR_OPTION
-static nkf_char
-numchar_getc(FILE *f)
-{
-    nkf_char (*g)(FILE *) = i_ngetc;
-    nkf_char (*u)(nkf_char c ,FILE *f) = i_nungetc;
-    int i = 0, j;
-    nkf_char buf[12];
-    nkf_char c = -1;
-
-    buf[i] = (*g)(f);
-    if (buf[i] == '&'){
-	buf[++i] = (*g)(f);
-	if (buf[i] == '#'){
-	    c = 0;
-	    buf[++i] = (*g)(f);
-	    if (buf[i] == 'x' || buf[i] == 'X'){
-		for (j = 0; j < 7; j++){
-		    buf[++i] = (*g)(f);
-		    if (!nkf_isxdigit(buf[i])){
-			if (buf[i] != ';'){
-			    c = -1;
-			}
-			break;
-		    }
-		    c <<= 4;
-		    c |= hex2bin(buf[i]);
-		}
-	    }else{
-		for (j = 0; j < 8; j++){
-		    if (j){
-			buf[++i] = (*g)(f);
-		    }
-		    if (!nkf_isdigit(buf[i])){
-			if (buf[i] != ';'){
-			    c = -1;
-			}
-			break;
-		    }
-		    c *= 10;
-		    c += hex2bin(buf[i]);
-		}
-	    }
-	}
-    }
-    if (c != -1){
-	return nkf_char_unicode_new(c);
-    }
-    while (i > 0){
-	(*u)(buf[i], f);
-	--i;
-    }
-    return buf[0];
-}
-
-static nkf_char
-numchar_ungetc(nkf_char c, FILE *f)
-{
-    return (*i_nungetc)(c, f);
-}
-#endif
-
-#ifdef UNICODE_NORMALIZATION
-
-static nkf_char
-nfc_getc(FILE *f)
-{
-    nkf_char (*g)(FILE *f) = i_nfc_getc;
-    nkf_char (*u)(nkf_char c ,FILE *f) = i_nfc_ungetc;
-    nkf_buf_t *buf = nkf_state->nfc_buf;
-    const unsigned char *array;
-    int lower=0, upper=NORMALIZATION_TABLE_LENGTH-1;
-    nkf_char c = (*g)(f);
-
-    if (c == EOF || c > 0xFF || (c & 0xc0) == 0x80) return c;
-
-    nkf_buf_push(buf, c);
-    do {
-	while (lower <= upper) {
-	    int mid = (lower+upper) / 2;
-	    int len;
-	    array = normalization_table[mid].nfd;
-	    for (len=0; len < NORMALIZATION_TABLE_NFD_LENGTH && array[len]; len++) {
-		if (len >= nkf_buf_length(buf)) {
-		    c = (*g)(f);
-		    if (c == EOF) {
-			len = 0;
-			lower = 1, upper = 0;
-			break;
-		    }
-		    nkf_buf_push(buf, c);
-		}
-		if (array[len] != nkf_buf_at(buf, len)) {
-		    if (array[len] < nkf_buf_at(buf, len)) lower = mid + 1;
-		    else  upper = mid - 1;
-		    len = 0;
-		    break;
-		}
-	    }
-	    if (len > 0) {
-		int i;
-		array = normalization_table[mid].nfc;
-		nkf_buf_clear(buf);
-		for (i=0; i < NORMALIZATION_TABLE_NFC_LENGTH && array[i]; i++)
-		    nkf_buf_push(buf, array[i]);
-		break;
-	    }
-	}
-    } while (lower <= upper);
-
-    while (nkf_buf_length(buf) > 1) (*u)(nkf_buf_pop(buf), f);
-    c = nkf_buf_pop(buf);
-
-    return c;
-}
-
-static nkf_char
-nfc_ungetc(nkf_char c, FILE *f)
-{
-    return (*i_nfc_ungetc)(c, f);
-}
-#endif /* UNICODE_NORMALIZATION */
-
-
-static nkf_char
-base64decode(nkf_char c)
-{
-    int             i;
-    if (c > '@') {
-	if (c < '[') {
-	    i = c - 'A';                        /* A..Z 0-25 */
-	} else if (c == '_') {
-	    i = '?'         /* 63 */ ;          /* _  63 */
-	} else {
-	    i = c - 'G'     /* - 'a' + 26 */ ;  /* a..z 26-51 */
-	}
-    } else if (c > '/') {
-	i = c - '0' + '4'   /* - '0' + 52 */ ;  /* 0..9 52-61 */
-    } else if (c == '+' || c == '-') {
-	i = '>'             /* 62 */ ;          /* + and -  62 */
-    } else {
-	i = '?'             /* 63 */ ;          /* / 63 */
-    }
-    return (i);
-}
-
-static nkf_char
-mime_getc(FILE *f)
-{
-    nkf_char c1, c2, c3, c4, cc;
-    nkf_char t1, t2, t3, t4, mode, exit_mode;
-    nkf_char lwsp_count;
-    char *lwsp_buf;
-    char *lwsp_buf_new;
-    nkf_char lwsp_size = 128;
-
-    if (mime_input_state.top != mime_input_state.last) {  /* Something is in FIFO */
-	return  mime_input_buf(mime_input_state.top++);
-    }
-    if (mime_decode_mode==1 ||mime_decode_mode==FALSE) {
-	mime_decode_mode=FALSE;
-	unswitch_mime_getc();
-	return (*i_getc)(f);
-    }
-
-    if (mimebuf_f == FIXED_MIME)
-	exit_mode = mime_decode_mode;
-    else
-	exit_mode = FALSE;
-    if (mime_decode_mode == 'Q') {
-	if ((c1 = (*i_mgetc)(f)) == EOF) return (EOF);
-      restart_mime_q:
-	if (c1=='_' && mimebuf_f != FIXED_MIME) return SP;
-	if (c1<=SP || DEL<=c1) {
-	    mime_decode_mode = exit_mode; /* prepare for quit */
-	    return c1;
-	}
-	if (c1!='=' && (c1!='?' || mimebuf_f == FIXED_MIME)) {
-	    return c1;
-	}
-
-	mime_decode_mode = exit_mode; /* prepare for quit */
-	if ((c2 = (*i_mgetc)(f)) == EOF) return (EOF);
-	if (c1=='?'&&c2=='=' && mimebuf_f != FIXED_MIME) {
-	    /* end Q encoding */
-	    input_mode = exit_mode;
-	    lwsp_count = 0;
-	    lwsp_buf = nkf_xmalloc((lwsp_size+5)*sizeof(char));
-	    while ((c1=(*i_getc)(f))!=EOF) {
-		switch (c1) {
-		case LF:
-		case CR:
-		    if (c1==LF) {
-			if ((c1=(*i_getc)(f))!=EOF && nkf_isblank(c1)) {
-			    i_ungetc(SP,f);
-			    continue;
-			} else {
-			    i_ungetc(c1,f);
-			}
-			c1 = LF;
-		    } else {
-			if ((c1=(*i_getc)(f))!=EOF && c1 == LF) {
-			    if ((c1=(*i_getc)(f))!=EOF && nkf_isblank(c1)) {
-				i_ungetc(SP,f);
-				continue;
-			    } else {
-				i_ungetc(c1,f);
-			    }
-			    i_ungetc(LF,f);
-			} else {
-			    i_ungetc(c1,f);
-			}
-			c1 = CR;
-		    }
-		    break;
-		case SP:
-		case TAB:
-		    lwsp_buf[lwsp_count] = (unsigned char)c1;
-		    if (lwsp_count++>lwsp_size){
-			lwsp_size <<= 1;
-			lwsp_buf_new = nkf_xrealloc(lwsp_buf, (lwsp_size+5)*sizeof(char));
-			lwsp_buf = lwsp_buf_new;
-		    }
-		    continue;
-		}
-		break;
-	    }
-	    if (lwsp_count > 0 && (c1 != '=' || (lwsp_buf[lwsp_count-1] != SP && lwsp_buf[lwsp_count-1] != TAB))) {
-		i_ungetc(c1,f);
-		for(lwsp_count--;lwsp_count>0;lwsp_count--)
-		    i_ungetc(lwsp_buf[lwsp_count],f);
-		c1 = lwsp_buf[0];
-	    }
-	    nkf_xfree(lwsp_buf);
-	    return c1;
-	}
-	if (c1=='='&&c2<SP) { /* this is soft wrap */
-	    while((c1 =  (*i_mgetc)(f)) <=SP) {
-		if (c1 == EOF) return (EOF);
-	    }
-	    mime_decode_mode = 'Q'; /* still in MIME */
-	    goto restart_mime_q;
-	}
-	if (c1=='?') {
-	    mime_decode_mode = 'Q'; /* still in MIME */
-	    (*i_mungetc)(c2,f);
-	    return c1;
-	}
-	if ((c3 = (*i_mgetc)(f)) == EOF) return (EOF);
-	if (c2<=SP) return c2;
-	mime_decode_mode = 'Q'; /* still in MIME */
-	return ((hex2bin(c2)<<4) + hex2bin(c3));
-    }
-
-    if (mime_decode_mode != 'B') {
-	mime_decode_mode = FALSE;
-	return (*i_mgetc)(f);
-    }
-
-
-    /* Base64 encoding */
-    /*
-       MIME allows line break in the middle of
-       Base64, but we are very pessimistic in decoding
-       in unbuf mode because MIME encoded code may broken by
-       less or editor's control sequence (such as ESC-[-K in unbuffered
-       mode. ignore incomplete MIME.
-     */
-    mode = mime_decode_mode;
-    mime_decode_mode = exit_mode;  /* prepare for quit */
-
-    while ((c1 = (*i_mgetc)(f))<=SP) {
-	if (c1==EOF)
-	    return (EOF);
-    }
-  mime_c2_retry:
-    if ((c2 = (*i_mgetc)(f))<=SP) {
-	if (c2==EOF)
-	    return (EOF);
-	if (mime_f != STRICT_MIME) goto mime_c2_retry;
-	if (mimebuf_f!=FIXED_MIME) input_mode = ASCII;
-	return c2;
-    }
-    if ((c1 == '?') && (c2 == '=')) {
-	input_mode = ASCII;
-	lwsp_count = 0;
-	lwsp_buf = nkf_xmalloc((lwsp_size+5)*sizeof(char));
-	while ((c1=(*i_getc)(f))!=EOF) {
-	    switch (c1) {
-	    case LF:
-	    case CR:
-		if (c1==LF) {
-		    if ((c1=(*i_getc)(f))!=EOF && nkf_isblank(c1)) {
-			i_ungetc(SP,f);
-			continue;
-		    } else {
-			i_ungetc(c1,f);
-		    }
-		    c1 = LF;
-		} else {
-		    if ((c1=(*i_getc)(f))!=EOF) {
-			if (c1==SP) {
-			    i_ungetc(SP,f);
-			    continue;
-			} else if ((c1=(*i_getc)(f))!=EOF && nkf_isblank(c1)) {
-			    i_ungetc(SP,f);
-			    continue;
-			} else {
-			    i_ungetc(c1,f);
-			}
-			i_ungetc(LF,f);
-		    } else {
-			i_ungetc(c1,f);
-		    }
-		    c1 = CR;
-		}
-		break;
-	    case SP:
-	    case TAB:
-		lwsp_buf[lwsp_count] = (unsigned char)c1;
-		if (lwsp_count++>lwsp_size){
-		    lwsp_size <<= 1;
-		    lwsp_buf_new = nkf_xrealloc(lwsp_buf, (lwsp_size+5)*sizeof(char));
-		    lwsp_buf = lwsp_buf_new;
-		}
-		continue;
-	    }
-	    break;
-	}
-	if (lwsp_count > 0 && (c1 != '=' || (lwsp_buf[lwsp_count-1] != SP && lwsp_buf[lwsp_count-1] != TAB))) {
-	    i_ungetc(c1,f);
-	    for(lwsp_count--;lwsp_count>0;lwsp_count--)
-		i_ungetc(lwsp_buf[lwsp_count],f);
-	    c1 = lwsp_buf[0];
-	}
-	nkf_xfree(lwsp_buf);
-	return c1;
-    }
-  mime_c3_retry:
-    if ((c3 = (*i_mgetc)(f))<=SP) {
-	if (c3==EOF)
-	    return (EOF);
-	if (mime_f != STRICT_MIME) goto mime_c3_retry;
-	if (mimebuf_f!=FIXED_MIME) input_mode = ASCII;
-	return c3;
-    }
-  mime_c4_retry:
-    if ((c4 = (*i_mgetc)(f))<=SP) {
-	if (c4==EOF)
-	    return (EOF);
-	if (mime_f != STRICT_MIME) goto mime_c4_retry;
-	if (mimebuf_f!=FIXED_MIME) input_mode = ASCII;
-	return c4;
-    }
-
-    mime_decode_mode = mode; /* still in MIME sigh... */
-
-    /* BASE 64 decoding */
-
-    t1 = 0x3f & base64decode(c1);
-    t2 = 0x3f & base64decode(c2);
-    t3 = 0x3f & base64decode(c3);
-    t4 = 0x3f & base64decode(c4);
-    cc = ((t1 << 2) & 0x0fc) | ((t2 >> 4) & 0x03);
-    if (c2 != '=') {
-	mime_input_buf(mime_input_state.last++) = (unsigned char)cc;
-	cc = ((t2 << 4) & 0x0f0) | ((t3 >> 2) & 0x0f);
-	if (c3 != '=') {
-	    mime_input_buf(mime_input_state.last++) = (unsigned char)cc;
-	    cc = ((t3 << 6) & 0x0c0) | (t4 & 0x3f);
-	    if (c4 != '=')
-		mime_input_buf(mime_input_state.last++) = (unsigned char)cc;
-	}
-    } else {
-	return c1;
-    }
-    return  mime_input_buf(mime_input_state.top++);
-}
-
-static const char basis_64[] =
-    "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
-
-#define MIMEOUT_BUF_LENGTH 74
-static struct {
-    unsigned char buf[MIMEOUT_BUF_LENGTH+1];
-    int count;
-} mimeout_state;
-
-/*nkf_char mime_lastchar2, mime_lastchar1;*/
-
-static void
-open_mime(nkf_char mode)
-{
-    const unsigned char *p;
-    int i;
-    int j;
-    p  = mime_pattern[0];
-    for(i=0;mime_pattern[i];i++) {
-	if (mode == mime_encode[i]) {
-	    p = mime_pattern[i];
-	    break;
-	}
-    }
-    mimeout_mode = mime_encode_method[i];
-    i = 0;
-    if (base64_count>45) {
-	if (mimeout_state.count>0 && nkf_isblank(mimeout_state.buf[i])){
-	    (*o_mputc)(mimeout_state.buf[i]);
-	    i++;
-	}
-	put_newline(o_mputc);
-	(*o_mputc)(SP);
-	base64_count = 1;
-	if (mimeout_state.count>0 && nkf_isspace(mimeout_state.buf[i])) {
-	    i++;
-	}
-    }
-    for (;i<mimeout_state.count;i++) {
-	if (nkf_isspace(mimeout_state.buf[i])) {
-	    (*o_mputc)(mimeout_state.buf[i]);
-	    base64_count ++;
-	} else {
-	    break;
-	}
-    }
-    while(*p) {
-	(*o_mputc)(*p++);
-	base64_count ++;
-    }
-    j = mimeout_state.count;
-    mimeout_state.count = 0;
-    for (;i<j;i++) {
-	mime_putc(mimeout_state.buf[i]);
-    }
-}
-
-static void
-mime_prechar(nkf_char c2, nkf_char c1)
-{
-    if (mimeout_mode > 0){
-	if (c2 == EOF){
-	    if (base64_count + mimeout_state.count/3*4> 73){
-		(*o_base64conv)(EOF,0);
-		oconv_newline(o_base64conv);
-		(*o_base64conv)(0,SP);
-		base64_count = 1;
-	    }
-	} else {
-	    if ((c2 != 0 || c1 > DEL) && base64_count + mimeout_state.count/3*4> 66) {
-		(*o_base64conv)(EOF,0);
-		oconv_newline(o_base64conv);
-		(*o_base64conv)(0,SP);
-		base64_count = 1;
-		mimeout_mode = -1;
-	    }
-	}
-    } else if (c2) {
-	if (c2 != EOF && base64_count + mimeout_state.count/3*4> 60) {
-	    mimeout_mode =  (output_mode==ASCII ||output_mode == ISO_8859_1) ? 'Q' : 'B';
-	    open_mime(output_mode);
-	    (*o_base64conv)(EOF,0);
-	    oconv_newline(o_base64conv);
-	    (*o_base64conv)(0,SP);
-	    base64_count = 1;
-	    mimeout_mode = -1;
-	}
-    }
-}
-
-static void
-close_mime(void)
-{
-    (*o_mputc)('?');
-    (*o_mputc)('=');
-    base64_count += 2;
-    mimeout_mode = 0;
-}
-
-static void
-eof_mime(void)
-{
-    switch(mimeout_mode) {
-    case 'Q':
-    case 'B':
-	break;
-    case 2:
-	(*o_mputc)(basis_64[((nkf_state->mimeout_state & 0x3)<< 4)]);
-	(*o_mputc)('=');
-	(*o_mputc)('=');
-	base64_count += 3;
-	break;
-    case 1:
-	(*o_mputc)(basis_64[((nkf_state->mimeout_state & 0xF) << 2)]);
-	(*o_mputc)('=');
-	base64_count += 2;
-	break;
-    }
-    if (mimeout_mode > 0) {
-	if (mimeout_f!=FIXED_MIME) {
-	    close_mime();
-	} else if (mimeout_mode != 'Q')
-	    mimeout_mode = 'B';
-    }
-}
-
-static void
-mimeout_addchar(nkf_char c)
-{
-    switch(mimeout_mode) {
-    case 'Q':
-	if (c==CR||c==LF) {
-	    (*o_mputc)(c);
-	    base64_count = 0;
-	} else if(!nkf_isalnum(c)) {
-	    (*o_mputc)('=');
-	    (*o_mputc)(bin2hex(((c>>4)&0xf)));
-	    (*o_mputc)(bin2hex((c&0xf)));
-	    base64_count += 3;
-	} else {
-	    (*o_mputc)(c);
-	    base64_count++;
-	}
-	break;
-    case 'B':
-	nkf_state->mimeout_state=c;
-	(*o_mputc)(basis_64[c>>2]);
-	mimeout_mode=2;
-	base64_count ++;
-	break;
-    case 2:
-	(*o_mputc)(basis_64[((nkf_state->mimeout_state & 0x3)<< 4) | ((c & 0xF0) >> 4)]);
-	nkf_state->mimeout_state=c;
-	mimeout_mode=1;
-	base64_count ++;
-	break;
-    case 1:
-	(*o_mputc)(basis_64[((nkf_state->mimeout_state & 0xF) << 2) | ((c & 0xC0) >>6)]);
-	(*o_mputc)(basis_64[c & 0x3F]);
-	mimeout_mode='B';
-	base64_count += 2;
-	break;
-    default:
-	(*o_mputc)(c);
-	base64_count++;
-	break;
-    }
-}
-
-static void
-mime_putc(nkf_char c)
-{
-    int i, j;
-    nkf_char lastchar;
-
-    if (mimeout_f == FIXED_MIME){
-	if (mimeout_mode == 'Q'){
-	    if (base64_count > 71){
-		if (c!=CR && c!=LF) {
-		    (*o_mputc)('=');
-		    put_newline(o_mputc);
-		}
-		base64_count = 0;
-	    }
-	}else{
-	    if (base64_count > 71){
-		eof_mime();
-		put_newline(o_mputc);
-		base64_count = 0;
-	    }
-	    if (c == EOF) { /* c==EOF */
-		eof_mime();
-	    }
-	}
-	if (c != EOF) { /* c==EOF */
-	    mimeout_addchar(c);
-	}
-	return;
-    }
-
-    /* mimeout_f != FIXED_MIME */
-
-    if (c == EOF) { /* c==EOF */
-	if (mimeout_mode == -1 && mimeout_state.count > 1) open_mime(output_mode);
-	j = mimeout_state.count;
-	mimeout_state.count = 0;
-	i = 0;
-	if (mimeout_mode > 0) {
-	    if (!nkf_isblank(mimeout_state.buf[j-1])) {
-		for (;i<j;i++) {
-		    if (nkf_isspace(mimeout_state.buf[i]) && base64_count < 71){
-			break;
-		    }
-		    mimeout_addchar(mimeout_state.buf[i]);
-		}
-		eof_mime();
-		for (;i<j;i++) {
-		    mimeout_addchar(mimeout_state.buf[i]);
-		}
-	    } else {
-		for (;i<j;i++) {
-		    mimeout_addchar(mimeout_state.buf[i]);
-		}
-		eof_mime();
-	    }
-	} else {
-	    for (;i<j;i++) {
-		mimeout_addchar(mimeout_state.buf[i]);
-	    }
-	}
-	return;
-    }
-
-    if (mimeout_state.count > 0){
-	lastchar = mimeout_state.buf[mimeout_state.count - 1];
-    }else{
-	lastchar = -1;
-    }
-
-    if (mimeout_mode=='Q') {
-	if (c <= DEL && (output_mode==ASCII ||output_mode == ISO_8859_1)) {
-	    if (c == CR || c == LF) {
-		close_mime();
-		(*o_mputc)(c);
-		base64_count = 0;
-		return;
-	    } else if (c <= SP) {
-		close_mime();
-		if (base64_count > 70) {
-		    put_newline(o_mputc);
-		    base64_count = 0;
-		}
-		if (!nkf_isblank(c)) {
-		    (*o_mputc)(SP);
-		    base64_count++;
-		}
-	    } else {
-		if (base64_count > 70) {
-		    close_mime();
-		    put_newline(o_mputc);
-		    (*o_mputc)(SP);
-		    base64_count = 1;
-		    open_mime(output_mode);
-		}
-		if (!nkf_noescape_mime(c)) {
-		    mimeout_addchar(c);
-		    return;
-		}
-	    }
-	    if (c != 0x1B) {
-		(*o_mputc)(c);
-		base64_count++;
-		return;
-	    }
-	}
-    }
-
-    if (mimeout_mode <= 0) {
-	if (c <= DEL && (output_mode==ASCII || output_mode == ISO_8859_1 ||
-		    output_mode == UTF_8)) {
-	    if (nkf_isspace(c)) {
-		int flag = 0;
-		if (mimeout_mode == -1) {
-		    flag = 1;
-		}
-		if (c==CR || c==LF) {
-		    if (flag) {
-			open_mime(output_mode);
-			output_mode = 0;
-		    } else {
-			base64_count = 0;
-		    }
-		}
-		for (i=0;i<mimeout_state.count;i++) {
-		    (*o_mputc)(mimeout_state.buf[i]);
-		    if (mimeout_state.buf[i] == CR || mimeout_state.buf[i] == LF){
-			base64_count = 0;
-		    }else{
-			base64_count++;
-		    }
-		}
-		if (flag) {
-		    eof_mime();
-		    base64_count = 0;
-		    mimeout_mode = 0;
-		}
-		mimeout_state.buf[0] = (char)c;
-		mimeout_state.count = 1;
-	    }else{
-		if (base64_count > 1
-		    && base64_count + mimeout_state.count > 76
-		    && mimeout_state.buf[0] != CR && mimeout_state.buf[0] != LF){
-		    static const char *str = "boundary=\"";
-		    static int len = 10;
-		    i = 0;
-
-		    for (; i < mimeout_state.count - len; ++i) {
-			if (!strncmp((char *)(mimeout_state.buf+i), str, len)) {
-			    i += len - 2;
-			    break;
-			}
-		    }
-
-		    if (i == 0 || i == mimeout_state.count - len) {
-			put_newline(o_mputc);
-			base64_count = 0;
-			if (!nkf_isspace(mimeout_state.buf[0])){
-			    (*o_mputc)(SP);
-			    base64_count++;
-			}
-		    }
-		    else {
-			int j;
-			for (j = 0; j <= i; ++j) {
-			    (*o_mputc)(mimeout_state.buf[j]);
-			}
-			put_newline(o_mputc);
-			base64_count = 1;
-			for (; j <= mimeout_state.count; ++j) {
-			    mimeout_state.buf[j - i] = mimeout_state.buf[j];
-			}
-			mimeout_state.count -= i;
-		    }
-		}
-		mimeout_state.buf[mimeout_state.count++] = (char)c;
-		if (mimeout_state.count>MIMEOUT_BUF_LENGTH) {
-		    open_mime(output_mode);
-		}
-	    }
-	    return;
-	}else{
-	    if (lastchar==CR || lastchar == LF){
-		for (i=0;i<mimeout_state.count;i++) {
-		    (*o_mputc)(mimeout_state.buf[i]);
-		}
-		base64_count = 0;
-		mimeout_state.count = 0;
-	    }
-	    if (lastchar==SP) {
-		for (i=0;i<mimeout_state.count-1;i++) {
-		    (*o_mputc)(mimeout_state.buf[i]);
-		    base64_count++;
-		}
-		mimeout_state.buf[0] = SP;
-		mimeout_state.count = 1;
-	    }
-	    open_mime(output_mode);
-	}
-    }else{
-	/* mimeout_mode == 'B', 1, 2 */
-	if (c <= DEL && (output_mode==ASCII || output_mode == ISO_8859_1 ||
-		    output_mode == UTF_8)) {
-	    if (lastchar == CR || lastchar == LF){
-		if (nkf_isblank(c)) {
-		    for (i=0;i<mimeout_state.count;i++) {
-			mimeout_addchar(mimeout_state.buf[i]);
-		    }
-		    mimeout_state.count = 0;
-		} else {
-		    eof_mime();
-		    for (i=0;i<mimeout_state.count;i++) {
-			(*o_mputc)(mimeout_state.buf[i]);
-		    }
-		    base64_count = 0;
-		    mimeout_state.count = 0;
-		}
-		mimeout_state.buf[mimeout_state.count++] = (char)c;
-		return;
-	    }
-	    if (nkf_isspace(c)) {
-		for (i=0;i<mimeout_state.count;i++) {
-		    if (SP<mimeout_state.buf[i] && mimeout_state.buf[i]<DEL) {
-			eof_mime();
-			for (i=0;i<mimeout_state.count;i++) {
-			    (*o_mputc)(mimeout_state.buf[i]);
-			    base64_count++;
-			}
-			mimeout_state.count = 0;
-		    }
-		}
-		mimeout_state.buf[mimeout_state.count++] = (char)c;
-		if (mimeout_state.count>MIMEOUT_BUF_LENGTH) {
-		    eof_mime();
-		    for (j=0;j<mimeout_state.count;j++) {
-			(*o_mputc)(mimeout_state.buf[j]);
-			base64_count++;
-		    }
-		    mimeout_state.count = 0;
-		}
-		return;
-	    }
-	    if (mimeout_state.count>0 && SP<c && c!='=') {
-		mimeout_state.buf[mimeout_state.count++] = (char)c;
-		if (mimeout_state.count>MIMEOUT_BUF_LENGTH) {
-		    j = mimeout_state.count;
-		    mimeout_state.count = 0;
-		    for (i=0;i<j;i++) {
-			mimeout_addchar(mimeout_state.buf[i]);
-		    }
-		}
-		return;
-	    }
-	}
-    }
-    if (mimeout_state.count>0) {
-	j = mimeout_state.count;
-	mimeout_state.count = 0;
-	for (i=0;i<j;i++) {
-	    if (mimeout_state.buf[i]==CR || mimeout_state.buf[i]==LF)
-		break;
-	    mimeout_addchar(mimeout_state.buf[i]);
-	}
-	if (i<j) {
-	    eof_mime();
-	    base64_count=0;
-	    for (;i<j;i++) {
-		(*o_mputc)(mimeout_state.buf[i]);
-	    }
-	    open_mime(output_mode);
-	}
-    }
-    mimeout_addchar(c);
-}
-
-static void
-base64_conv(nkf_char c2, nkf_char c1)
-{
-    mime_prechar(c2, c1);
-    (*o_base64conv)(c2,c1);
-}
-
-#ifdef HAVE_ICONV_H
-typedef struct nkf_iconv_t {
-    iconv_t cd;
-    char *input_buffer;
-    size_t input_buffer_size;
-    char *output_buffer;
-    size_t output_buffer_size;
-};
-
-static nkf_iconv_t
-nkf_iconv_new(char *tocode, char *fromcode)
-{
-    nkf_iconv_t converter;
-
-    converter->input_buffer_size = IOBUF_SIZE;
-    converter->input_buffer = nkf_xmalloc(converter->input_buffer_size);
-    converter->output_buffer_size = IOBUF_SIZE * 2;
-    converter->output_buffer = nkf_xmalloc(converter->output_buffer_size);
-    converter->cd = iconv_open(tocode, fromcode);
-    if (converter->cd == (iconv_t)-1)
-    {
-	switch (errno) {
-	case EINVAL:
-	    perror(fprintf("iconv doesn't support %s to %s conversion.", fromcode, tocode));
-	    return -1;
-	default:
-	    perror("can't iconv_open");
-	}
-    }
-}
-
-static size_t
-nkf_iconv_convert(nkf_iconv_t *converter, FILE *input)
-{
-    size_t invalid = (size_t)0;
-    char *input_buffer = converter->input_buffer;
-    size_t input_length = (size_t)0;
-    char *output_buffer = converter->output_buffer;
-    size_t output_length = converter->output_buffer_size;
-    int c;
-
-    do {
-	if (c != EOF) {
-	    while ((c = (*i_getc)(f)) != EOF) {
-		input_buffer[input_length++] = c;
-		if (input_length < converter->input_buffer_size) break;
-	    }
-	}
-
-	size_t ret = iconv(converter->cd, &input_buffer, &input_length, &output_buffer, &output_length);
-	while (output_length-- > 0) {
-	    (*o_putc)(output_buffer[converter->output_buffer_size-output_length]);
-	}
-	if (ret == (size_t) - 1) {
-	    switch (errno) {
-	    case EINVAL:
-		if (input_buffer != converter->input_buffer)
-		    memmove(converter->input_buffer, input_buffer, input_length);
-		break;
-	    case E2BIG:
-		converter->output_buffer_size *= 2;
-		output_buffer = realloc(converter->outbuf, converter->output_buffer_size);
-		if (output_buffer == NULL) {
-		    perror("can't realloc");
-		    return -1;
-		}
-		converter->output_buffer = output_buffer;
-		break;
-	    default:
-		perror("can't iconv");
-		return -1;
-	    }
-	} else {
-	    invalid += ret;
-	}
-    } while (1);
-
-    return invalid;
-}
-
-
-static void
-nkf_iconv_close(nkf_iconv_t *convert)
-{
-    nkf_xfree(converter->inbuf);
-    nkf_xfree(converter->outbuf);
-    iconv_close(converter->cd);
-}
-#endif
-
-
-static void
-reinit(void)
-{
-    {
-	struct input_code *p = input_code_list;
-	while (p->name){
-	    status_reinit(p++);
-	}
-    }
-    unbuf_f = FALSE;
-    estab_f = FALSE;
-    nop_f = FALSE;
-    binmode_f = TRUE;
-    rot_f = FALSE;
-    hira_f = FALSE;
-    alpha_f = FALSE;
-    mime_f = MIME_DECODE_DEFAULT;
-    mime_decode_f = FALSE;
-    mimebuf_f = FALSE;
-    broken_f = FALSE;
-    iso8859_f = FALSE;
-    mimeout_f = FALSE;
-    x0201_f = NKF_UNSPECIFIED;
-    iso2022jp_f = FALSE;
-#if defined(UTF8_INPUT_ENABLE) || defined(UTF8_OUTPUT_ENABLE)
-    ms_ucs_map_f = UCS_MAP_ASCII;
-#endif
-#ifdef UTF8_INPUT_ENABLE
-    no_cp932ext_f = FALSE;
-    no_best_fit_chars_f = FALSE;
-    encode_fallback = NULL;
-    unicode_subchar  = '?';
-    input_endian = ENDIAN_BIG;
-#endif
-#ifdef UTF8_OUTPUT_ENABLE
-    output_bom_f = FALSE;
-    output_endian = ENDIAN_BIG;
-#endif
-#ifdef UNICODE_NORMALIZATION
-    nfc_f = FALSE;
-#endif
-#ifdef INPUT_OPTION
-    cap_f = FALSE;
-    url_f = FALSE;
-    numchar_f = FALSE;
-#endif
-#ifdef CHECK_OPTION
-    noout_f = FALSE;
-    debug_f = FALSE;
-#endif
-    guess_f = 0;
-#ifdef EXEC_IO
-    exec_f = 0;
-#endif
-#ifdef SHIFTJIS_CP932
-    cp51932_f = TRUE;
-    cp932inv_f = TRUE;
-#endif
-#ifdef X0212_ENABLE
-    x0212_f = FALSE;
-    x0213_f = FALSE;
-#endif
-    {
-	int i;
-	for (i = 0; i < 256; i++){
-	    prefix_table[i] = 0;
-	}
-    }
-    hold_count = 0;
-    mimeout_state.count = 0;
-    mimeout_mode = 0;
-    base64_count = 0;
-    f_line = 0;
-    f_prev = 0;
-    fold_preserve_f = FALSE;
-    fold_f = FALSE;
-    fold_len = 0;
-    kanji_intro = DEFAULT_J;
-    ascii_intro = DEFAULT_R;
-    fold_margin  = FOLD_MARGIN;
-    o_zconv = no_connection;
-    o_fconv = no_connection;
-    o_eol_conv = no_connection;
-    o_rot_conv = no_connection;
-    o_hira_conv = no_connection;
-    o_base64conv = no_connection;
-    o_iso2022jp_check_conv = no_connection;
-    o_putc = std_putc;
-    i_getc = std_getc;
-    i_ungetc = std_ungetc;
-    i_bgetc = std_getc;
-    i_bungetc = std_ungetc;
-    o_mputc = std_putc;
-    i_mgetc = std_getc;
-    i_mungetc  = std_ungetc;
-    i_mgetc_buf = std_getc;
-    i_mungetc_buf = std_ungetc;
-    output_mode = ASCII;
-    input_mode =  ASCII;
-    mime_decode_mode = FALSE;
-    file_out_f = FALSE;
-    eolmode_f = 0;
-    input_eol = 0;
-    prev_cr = 0;
-    option_mode = 0;
-    z_prev2=0,z_prev1=0;
-#ifdef CHECK_OPTION
-    iconv_for_check = 0;
-#endif
-    input_codename = NULL;
-    input_encoding = NULL;
-    output_encoding = NULL;
-    nkf_state_init();
-#ifdef WIN32DLL
-    reinitdll();
-#endif /*WIN32DLL*/
-}
-
-static int
-module_connection(void)
-{
-    if (input_encoding) set_input_encoding(input_encoding);
-    if (!output_encoding) {
-	output_encoding = nkf_default_encoding();
-    }
-    if (!output_encoding) {
-	if (noout_f || guess_f) output_encoding = nkf_enc_from_index(ISO_2022_JP);
-	else return -1;
-    }
-    set_output_encoding(output_encoding);
-    oconv = nkf_enc_to_oconv(output_encoding);
-    o_putc = std_putc;
-    if (nkf_enc_unicode_p(output_encoding))
-	output_mode = UTF_8;
-
-    if (x0201_f == NKF_UNSPECIFIED) {
-	x0201_f = X0201_DEFAULT;
-    }
-
-    /* replace continuation module, from output side */
-
-    /* output redirection */
-#ifdef CHECK_OPTION
-    if (noout_f || guess_f){
-	o_putc = no_putc;
-    }
-#endif
-    if (mimeout_f) {
-	o_mputc = o_putc;
-	o_putc = mime_putc;
-	if (mimeout_f == TRUE) {
-	    o_base64conv = oconv; oconv = base64_conv;
-	}
-	/* base64_count = 0; */
-    }
-
-    if (eolmode_f || guess_f) {
-	o_eol_conv = oconv; oconv = eol_conv;
-    }
-    if (rot_f) {
-	o_rot_conv = oconv; oconv = rot_conv;
-    }
-    if (iso2022jp_f) {
-	o_iso2022jp_check_conv = oconv; oconv = iso2022jp_check_conv;
-    }
-    if (hira_f) {
-	o_hira_conv = oconv; oconv = hira_conv;
-    }
-    if (fold_f) {
-	o_fconv = oconv; oconv = fold_conv;
-	f_line = 0;
-    }
-    if (alpha_f || x0201_f) {
-	o_zconv = oconv; oconv = z_conv;
-    }
-
-    i_getc = std_getc;
-    i_ungetc = std_ungetc;
-    /* input redirection */
-#ifdef INPUT_OPTION
-    if (cap_f){
-	i_cgetc = i_getc; i_getc = cap_getc;
-	i_cungetc = i_ungetc; i_ungetc= cap_ungetc;
-    }
-    if (url_f){
-	i_ugetc = i_getc; i_getc = url_getc;
-	i_uungetc = i_ungetc; i_ungetc= url_ungetc;
-    }
-#endif
-#ifdef NUMCHAR_OPTION
-    if (numchar_f){
-	i_ngetc = i_getc; i_getc = numchar_getc;
-	i_nungetc = i_ungetc; i_ungetc= numchar_ungetc;
-    }
-#endif
-#ifdef UNICODE_NORMALIZATION
-    if (nfc_f){
-	i_nfc_getc = i_getc; i_getc = nfc_getc;
-	i_nfc_ungetc = i_ungetc; i_ungetc= nfc_ungetc;
-    }
-#endif
-    if (mime_f && mimebuf_f==FIXED_MIME) {
-	i_mgetc = i_getc; i_getc = mime_getc;
-	i_mungetc = i_ungetc; i_ungetc = mime_ungetc;
-    }
-    if (broken_f & 1) {
-	i_bgetc = i_getc; i_getc = broken_getc;
-	i_bungetc = i_ungetc; i_ungetc = broken_ungetc;
-    }
-    if (input_encoding) {
-	set_iconv(-TRUE, nkf_enc_to_iconv(input_encoding));
-    } else {
-	set_iconv(FALSE, e_iconv);
-    }
-
-    {
-	struct input_code *p = input_code_list;
-	while (p->name){
-	    status_reinit(p++);
-	}
-    }
-    return 0;
-}
-
-/*
-   Conversion main loop. Code detection only.
- */
-
-#if !defined(PERL_XS) && !defined(WIN32DLL)
-static nkf_char
-noconvert(FILE *f)
-{
-    nkf_char    c;
-
-    if (nop_f == 2)
-	module_connection();
-    while ((c = (*i_getc)(f)) != EOF)
-	(*o_putc)(c);
-    (*o_putc)(EOF);
-    return 1;
-}
-#endif
-
-#define NEXT continue        /* no output, get next */
-#define SKIP c2=0;continue        /* no output, get next */
-#define MORE c2=c1;continue  /* need one more byte */
-#define SEND (void)0         /* output c1 and c2, get next */
-#define LAST break           /* end of loop, go closing  */
-#define set_input_mode(mode) do { \
-    input_mode = mode; \
-    shift_mode = 0; \
-    set_input_codename("ISO-2022-JP"); \
-    debug("ISO-2022-JP"); \
-} while (0)
-
-static int
-kanji_convert(FILE *f)
-{
-    nkf_char c1=0, c2=0, c3=0, c4=0;
-    int shift_mode = 0; /* 0, 1, 2, 3 */
-    int g2 = 0;
-    int is_8bit = FALSE;
-
-    if (input_encoding && !nkf_enc_asciicompat(input_encoding)) {
-	is_8bit = TRUE;
-    }
-
-    input_mode = ASCII;
-    output_mode = ASCII;
-
-    if (module_connection() < 0) {
-#if !defined(PERL_XS) && !defined(WIN32DLL)
-	fprintf(stderr, "no output encoding given\n");
-#endif
-	return -1;
-    }
-    check_bom(f);
-
-#ifdef UTF8_INPUT_ENABLE
-    if(iconv == w_iconv32){
-	while ((c1 = (*i_getc)(f)) != EOF &&
-	       (c2 = (*i_getc)(f)) != EOF &&
-	       (c3 = (*i_getc)(f)) != EOF &&
-	       (c4 = (*i_getc)(f)) != EOF) {
-	    nkf_char c5, c6, c7, c8;
-	    if (nkf_iconv_utf_32(c1, c2, c3, c4) == (size_t)NKF_ICONV_WAIT_COMBINING_CHAR) {
-		if ((c5 = (*i_getc)(f)) != EOF &&
-		    (c6 = (*i_getc)(f)) != EOF &&
-		    (c7 = (*i_getc)(f)) != EOF &&
-		    (c8 = (*i_getc)(f)) != EOF) {
-		    if (nkf_iconv_utf_32_combine(c1, c2, c3, c4, c5, c6, c7, c8)) {
-			(*i_ungetc)(c8, f);
-			(*i_ungetc)(c7, f);
-			(*i_ungetc)(c6, f);
-			(*i_ungetc)(c5, f);
-			nkf_iconv_utf_32_nocombine(c1, c2, c3, c4);
-		    }
-		} else {
-		    nkf_iconv_utf_32_nocombine(c1, c2, c3, c4);
-		}
-	    }
-	}
-	goto finished;
-    }
-    else if (iconv == w_iconv16) {
-	while ((c1 = (*i_getc)(f)) != EOF &&
-	       (c2 = (*i_getc)(f)) != EOF) {
-	    size_t ret = nkf_iconv_utf_16(c1, c2, 0, 0);
-	    if (ret == NKF_ICONV_NEED_TWO_MORE_BYTES &&
-		(c3 = (*i_getc)(f)) != EOF &&
-		(c4 = (*i_getc)(f)) != EOF) {
-		nkf_iconv_utf_16(c1, c2, c3, c4);
-	    } else if (ret == (size_t)NKF_ICONV_WAIT_COMBINING_CHAR) {
-		if ((c3 = (*i_getc)(f)) != EOF &&
-		    (c4 = (*i_getc)(f)) != EOF) {
-		    if (nkf_iconv_utf_16_combine(c1, c2, c3, c4)) {
-			(*i_ungetc)(c4, f);
-			(*i_ungetc)(c3, f);
-			nkf_iconv_utf_16_nocombine(c1, c2);
-		    }
-		} else {
-		    nkf_iconv_utf_16_nocombine(c1, c2);
-		}
-	    }
-	}
-	goto finished;
-    }
-#endif
-
-    while ((c1 = (*i_getc)(f)) != EOF) {
-#ifdef INPUT_CODE_FIX
-	if (!input_encoding)
-#endif
-	    code_status(c1);
-	if (c2) {
-	    /* second byte */
-	    if (c2 > ((input_encoding && nkf_enc_cp5022x_p(input_encoding)) ? 0x92 : DEL)) {
-		/* in case of 8th bit is on */
-		if (!estab_f&&!mime_decode_mode) {
-		    /* in case of not established yet */
-		    /* It is still ambiguous */
-		    if (h_conv(f, c2, c1)==EOF) {
-			LAST;
-		    }
-		    else {
-			SKIP;
-		    }
-		}
-		else {
-		    /* in case of already established */
-		    if (c1 < 0x40) {
-			/* ignore bogus code */
-			SKIP;
-		    } else {
-			SEND;
-		    }
-		}
-	    }
-	    else {
-		/* 2nd byte of 7 bit code or SJIS */
-		SEND;
-	    }
-	}
-	else if (nkf_char_unicode_p(c1)) {
-	    (*oconv)(0, c1);
-	    NEXT;
-	}
-	else {
-	    /* first byte */
-	    if (input_mode == JIS_X_0208 && DEL <= c1 && c1 < 0x92) {
-		/* CP5022x */
-		MORE;
-	    }else if (input_codename && input_codename[0] == 'I' &&
-		    0xA1 <= c1 && c1 <= 0xDF) {
-		/* JIS X 0201 Katakana in 8bit JIS */
-		c2 = JIS_X_0201_1976_K;
-		c1 &= 0x7f;
-		SEND;
-	    } else if (c1 > DEL) {
-		/* 8 bit code */
-		if (!estab_f && !iso8859_f) {
-		    /* not established yet */
-		    MORE;
-		} else { /* estab_f==TRUE */
-		    if (iso8859_f) {
-			c2 = ISO_8859_1;
-			c1 &= 0x7f;
-			SEND;
-		    }
-		    else if ((iconv == s_iconv && 0xA0 <= c1 && c1 <= 0xDF) ||
-			     (ms_ucs_map_f == UCS_MAP_CP10001 && (c1 == 0xFD || c1 == 0xFE))) {
-			/* JIS X 0201 */
-			c2 = JIS_X_0201_1976_K;
-			c1 &= 0x7f;
-			SEND;
-		    }
-		    else {
-			/* already established */
-			MORE;
-		    }
-		}
-	    } else if (SP < c1 && c1 < DEL) {
-		/* in case of Roman characters */
-		if (shift_mode) {
-		    /* output 1 shifted byte */
-		    if (iso8859_f) {
-			c2 = ISO_8859_1;
-			SEND;
-		    } else if (nkf_byte_jisx0201_katakana_p(c1)){
-			/* output 1 shifted byte */
-			c2 = JIS_X_0201_1976_K;
-			SEND;
-		    } else {
-			/* look like bogus code */
-			SKIP;
-		    }
-		} else if (input_mode == JIS_X_0208 || input_mode == JIS_X_0212 ||
-			   input_mode == JIS_X_0213_1 || input_mode == JIS_X_0213_2) {
-		    /* in case of Kanji shifted */
-		    MORE;
-		} else if (c1 == '=' && mime_f && !mime_decode_mode) {
-		    /* Check MIME code */
-		    if ((c1 = (*i_getc)(f)) == EOF) {
-			(*oconv)(0, '=');
-			LAST;
-		    } else if (c1 == '?') {
-			/* =? is mime conversion start sequence */
-			if(mime_f == STRICT_MIME) {
-			    /* check in real detail */
-			    if (mime_begin_strict(f) == EOF)
-				LAST;
-			    SKIP;
-			} else if (mime_begin(f) == EOF)
-			    LAST;
-			SKIP;
-		    } else {
-			(*oconv)(0, '=');
-			(*i_ungetc)(c1,f);
-			SKIP;
-		    }
-		} else {
-		    /* normal ASCII code */
-		    SEND;
-		}
-	    } else if (c1 == SI && (!is_8bit || mime_decode_mode)) {
-		shift_mode = 0;
-		SKIP;
-	    } else if (c1 == SO && (!is_8bit || mime_decode_mode)) {
-		shift_mode = 1;
-		SKIP;
-	    } else if (c1 == ESC && (!is_8bit || mime_decode_mode)) {
-		if ((c1 = (*i_getc)(f)) == EOF) {
-		    (*oconv)(0, ESC);
-		    LAST;
-		}
-		else if (c1 == '&') {
-		    /* IRR */
-		    if ((c1 = (*i_getc)(f)) == EOF) {
-			LAST;
-		    } else {
-			SKIP;
-		    }
-		}
-		else if (c1 == '$') {
-		    /* GZDMx */
-		    if ((c1 = (*i_getc)(f)) == EOF) {
-			/* don't send bogus code
-			   (*oconv)(0, ESC);
-			   (*oconv)(0, '$'); */
-			LAST;
-		    } else if (c1 == '@' || c1 == 'B') {
-			/* JIS X 0208 */
-			set_input_mode(JIS_X_0208);
-			SKIP;
-		    } else if (c1 == '(') {
-			/* GZDM4 */
-			if ((c1 = (*i_getc)(f)) == EOF) {
-			    /* don't send bogus code
-			       (*oconv)(0, ESC);
-			       (*oconv)(0, '$');
-			       (*oconv)(0, '(');
-			     */
-			    LAST;
-			} else if (c1 == '@'|| c1 == 'B') {
-			    /* JIS X 0208 */
-			    set_input_mode(JIS_X_0208);
-			    SKIP;
-#ifdef X0212_ENABLE
-			} else if (c1 == 'D'){
-			    set_input_mode(JIS_X_0212);
-			    SKIP;
-#endif /* X0212_ENABLE */
-			} else if (c1 == 'O' || c1 == 'Q'){
-			    set_input_mode(JIS_X_0213_1);
-			    SKIP;
-			} else if (c1 == 'P'){
-			    set_input_mode(JIS_X_0213_2);
-			    SKIP;
-			} else {
-			    /* could be some special code */
-			    (*oconv)(0, ESC);
-			    (*oconv)(0, '$');
-			    (*oconv)(0, '(');
-			    (*oconv)(0, c1);
-			    SKIP;
-			}
-		    } else if (broken_f&0x2) {
-			/* accept any ESC-(-x as broken code ... */
-			input_mode = JIS_X_0208;
-			shift_mode = 0;
-			SKIP;
-		    } else {
-			(*oconv)(0, ESC);
-			(*oconv)(0, '$');
-			(*oconv)(0, c1);
-			SKIP;
-		    }
-		} else if (c1 == '(') {
-		    /* GZD4 */
-		    if ((c1 = (*i_getc)(f)) == EOF) {
-			/* don't send bogus code
-			   (*oconv)(0, ESC);
-			   (*oconv)(0, '('); */
-			LAST;
-		    }
-		    else if (c1 == 'I') {
-			/* JIS X 0201 Katakana */
-			set_input_mode(JIS_X_0201_1976_K);
-			shift_mode = 1;
-			SKIP;
-		    }
-		    else if (c1 == 'B' || c1 == 'J' || c1 == 'H') {
-			/* ISO-646IRV:1983 or JIS X 0201 Roman or JUNET */
-			set_input_mode(ASCII);
-			SKIP;
-		    }
-		    else if (broken_f&0x2) {
-			set_input_mode(ASCII);
-			SKIP;
-		    }
-		    else {
-			(*oconv)(0, ESC);
-			(*oconv)(0, '(');
-			SEND;
-		    }
-		}
-		else if (c1 == '.') {
-		    /* G2D6 */
-		    if ((c1 = (*i_getc)(f)) == EOF) {
-			LAST;
-		    }
-		    else if (c1 == 'A') {
-			/* ISO-8859-1 */
-			g2 = ISO_8859_1;
-			SKIP;
-		    }
-		    else {
-			(*oconv)(0, ESC);
-			(*oconv)(0, '.');
-			SEND;
-		    }
-		}
-		else if (c1 == 'N') {
-		    /* SS2 */
-		    c1 = (*i_getc)(f);
-		    if (g2 == ISO_8859_1) {
-			c2 = ISO_8859_1;
-			SEND;
-		    }else{
-			(*i_ungetc)(c1, f);
-			/* lonely ESC  */
-			(*oconv)(0, ESC);
-			SEND;
-		    }
-		}
-		else {
-		    i_ungetc(c1,f);
-		    /* lonely ESC  */
-		    (*oconv)(0, ESC);
-		    SKIP;
-		}
-	    } else if (c1 == ESC && iconv == s_iconv) {
-		/* ESC in Shift_JIS */
-		if ((c1 = (*i_getc)(f)) == EOF) {
-		    (*oconv)(0, ESC);
-		    LAST;
-		} else if (c1 == '$') {
-		    /* J-PHONE emoji */
-		    if ((c1 = (*i_getc)(f)) == EOF) {
-			LAST;
-		    } else if (('E' <= c1 && c1 <= 'G') ||
-			       ('O' <= c1 && c1 <= 'Q')) {
-			/*
-			   NUM : 0 1 2 3 4 5
-			   BYTE: G E F O P Q
-			   C%7 : 1 6 0 2 3 4
-			   C%7 : 0 1 2 3 4 5 6
-			   NUM : 2 0 3 4 5 X 1
-			 */
-			static const nkf_char jphone_emoji_first_table[7] =
-			{0xE1E0, 0xDFE0, 0xE2E0, 0xE3E0, 0xE4E0, 0xDFE0, 0xE0E0};
-			c3 = nkf_char_unicode_new(jphone_emoji_first_table[c1 % 7]);
-			if ((c1 = (*i_getc)(f)) == EOF) LAST;
-			while (SP <= c1 && c1 <= 'z') {
-			    (*oconv)(0, c1 + c3);
-			    if ((c1 = (*i_getc)(f)) == EOF) LAST;
-			}
-			SKIP;
-		    }
-		    else {
-			(*oconv)(0, ESC);
-			(*oconv)(0, '$');
-			SEND;
-		    }
-		}
-		else {
-		    i_ungetc(c1,f);
-		    /* lonely ESC  */
-		    (*oconv)(0, ESC);
-		    SKIP;
-		}
-	    } else if (c1 == LF || c1 == CR) {
-		if (broken_f&4) {
-		    input_mode = ASCII; set_iconv(FALSE, 0);
-		    SEND;
-		} else if (mime_decode_f && !mime_decode_mode){
-		    if (c1 == LF) {
-			if ((c1=(*i_getc)(f))!=EOF && c1 == SP) {
-			    i_ungetc(SP,f);
-			    continue;
-			} else {
-			    i_ungetc(c1,f);
-			}
-			c1 = LF;
-			SEND;
-		    } else  { /* if (c1 == CR)*/
-			if ((c1=(*i_getc)(f))!=EOF) {
-			    if (c1==SP) {
-				i_ungetc(SP,f);
-				continue;
-			    } else if (c1 == LF && (c1=(*i_getc)(f))!=EOF && c1 == SP) {
-				i_ungetc(SP,f);
-				continue;
-			    } else {
-				i_ungetc(c1,f);
-			    }
-			    i_ungetc(LF,f);
-			} else {
-			    i_ungetc(c1,f);
-			}
-			c1 = CR;
-			SEND;
-		    }
-		}
-	    } else
-		SEND;
-	}
-	/* send: */
-	switch(input_mode){
-	case ASCII:
-	    switch ((*iconv)(c2, c1, 0)) {  /* can be EUC / SJIS / UTF-8 */
-	    case -2:
-		/* 4 bytes UTF-8 */
-		if ((c3 = (*i_getc)(f)) != EOF) {
-		    code_status(c3);
-		    c3 <<= 8;
-		    if ((c4 = (*i_getc)(f)) != EOF) {
-			code_status(c4);
-			(*iconv)(c2, c1, c3|c4);
-		    }
-		}
-		break;
-	    case -3:
-		/* 4 bytes UTF-8 (check combining character) */
-		if ((c3 = (*i_getc)(f)) != EOF) {
-		    if ((c4 = (*i_getc)(f)) != EOF) {
-			if (w_iconv_combine(c2, c1, 0, c3, c4, 0)) {
-			    (*i_ungetc)(c4, f);
-			    (*i_ungetc)(c3, f);
-			    w_iconv_nocombine(c2, c1, 0);
-			}
-		    } else {
-			(*i_ungetc)(c3, f);
-			w_iconv_nocombine(c2, c1, 0);
-		    }
-		} else {
-		    w_iconv_nocombine(c2, c1, 0);
-		}
-		break;
-	    case -1:
-		/* 3 bytes EUC or UTF-8 */
-		if ((c3 = (*i_getc)(f)) != EOF) {
-		    code_status(c3);
-		    if ((*iconv)(c2, c1, c3) == -3) {
-			/* 6 bytes UTF-8 (check combining character) */
-			nkf_char c5, c6;
-			if ((c4 = (*i_getc)(f)) != EOF) {
-			    if ((c5 = (*i_getc)(f)) != EOF) {
-				if ((c6 = (*i_getc)(f)) != EOF) {
-				    if (w_iconv_combine(c2, c1, c3, c4, c5, c6)) {
-					(*i_ungetc)(c6, f);
-					(*i_ungetc)(c5, f);
-					(*i_ungetc)(c4, f);
-					w_iconv_nocombine(c2, c1, c3);
-				    }
-				} else {
-				    (*i_ungetc)(c5, f);
-				    (*i_ungetc)(c4, f);
-				    w_iconv_nocombine(c2, c1, c3);
-				}
-			    } else {
-				(*i_ungetc)(c4, f);
-				w_iconv_nocombine(c2, c1, c3);
-			    }
-			} else {
-			    w_iconv_nocombine(c2, c1, c3);
-			}
-		    }
-		}
-		break;
-	    }
-	    break;
-	case JIS_X_0208:
-	case JIS_X_0213_1:
-	    if (ms_ucs_map_f &&
-		0x7F <= c2 && c2 <= 0x92 &&
-		0x21 <= c1 && c1 <= 0x7E) {
-		/* CP932 UDC */
-		c1 = nkf_char_unicode_new((c2 - 0x7F) * 94 + c1 - 0x21 + 0xE000);
-		c2 = 0;
-	    }
-	    (*oconv)(c2, c1); /* this is JIS, not SJIS/EUC case */
-	    break;
-#ifdef X0212_ENABLE
-	case JIS_X_0212:
-	    (*oconv)(PREFIX_EUCG3 | c2, c1);
-	    break;
-#endif /* X0212_ENABLE */
-	case JIS_X_0213_2:
-	    (*oconv)(PREFIX_EUCG3 | c2, c1);
-	    break;
-	default:
-	    (*oconv)(input_mode, c1);  /* other special case */
-	}
-
-	c2 = 0;
-	c3 = 0;
-	continue;
-	/* goto next_word */
-    }
-
-finished:
-    /* epilogue */
-    (*iconv)(EOF, 0, 0);
-    if (!input_codename)
-    {
-	if (is_8bit) {
-	    struct input_code *p = input_code_list;
-	    struct input_code *result = p;
-	    while (p->name){
-		if (p->score < result->score) result = p;
-		++p;
-	    }
-	    set_input_codename(result->name);
-#ifdef CHECK_OPTION
-	    debug(result->name);
-#endif
-	}
-    }
-    return 0;
-}
-
-/*
- * int options(unsigned char *cp)
- *
- * return values:
- *    0: success
- *   -1: ArgumentError
- */
-static int
-options(unsigned char *cp)
-{
-    nkf_char i, j;
-    unsigned char *p;
-    unsigned char *cp_back = NULL;
-    nkf_encoding *enc;
-
-    if (option_mode==1)
-	return 0;
-    while(*cp && *cp++!='-');
-    while (*cp || cp_back) {
-	if(!*cp){
-	    cp = cp_back;
-	    cp_back = NULL;
-	    continue;
-	}
-	p = 0;
-	switch (*cp++) {
-	case '-':  /* literal options */
-	    if (!*cp || *cp == SP) {        /* ignore the rest of arguments */
-		option_mode = 1;
-		return 0;
-	    }
-	    for (i=0;i<(int)(sizeof(long_option)/sizeof(long_option[0]));i++) {
-		p = (unsigned char *)long_option[i].name;
-		for (j=0;*p && *p != '=' && *p == cp[j];p++, j++);
-		if (*p == cp[j] || cp[j] == SP){
-		    p = &cp[j] + 1;
-		    break;
-		}
-		p = 0;
-	    }
-	    if (p == 0) {
-#if !defined(PERL_XS) && !defined(WIN32DLL)
-		fprintf(stderr, "unknown long option: --%s\n", cp);
-#endif
-		return -1;
-	    }
-	    while(*cp && *cp != SP && cp++);
-	    if (long_option[i].alias[0]){
-		cp_back = cp;
-		cp = (unsigned char *)long_option[i].alias;
-	    }else{
-#ifndef PERL_XS
-		if (strcmp(long_option[i].name, "help") == 0){
-		    usage();
-		    exit(EXIT_SUCCESS);
-		}
-#endif
-		if (strcmp(long_option[i].name, "ic=") == 0){
-		    enc = nkf_enc_find((char *)p);
-		    if (!enc) continue;
-		    input_encoding = enc;
-		    continue;
-		}
-		if (strcmp(long_option[i].name, "oc=") == 0){
-		    enc = nkf_enc_find((char *)p);
-		    /* if (enc <= 0) continue; */
-		    if (!enc) continue;
-		    output_encoding = enc;
-		    continue;
-		}
-		if (strcmp(long_option[i].name, "guess=") == 0){
-		    if (p[0] == '0' || p[0] == '1') {
-			guess_f = 1;
-		    } else {
-			guess_f = 2;
-		    }
-		    continue;
-		}
-#ifdef OVERWRITE
-		if (strcmp(long_option[i].name, "overwrite") == 0){
-		    file_out_f = TRUE;
-		    overwrite_f = TRUE;
-		    preserve_time_f = TRUE;
-		    continue;
-		}
-		if (strcmp(long_option[i].name, "overwrite=") == 0){
-		    file_out_f = TRUE;
-		    overwrite_f = TRUE;
-		    preserve_time_f = TRUE;
-		    backup_f = TRUE;
-		    backup_suffix = (char *)p;
-		    continue;
-		}
-		if (strcmp(long_option[i].name, "in-place") == 0){
-		    file_out_f = TRUE;
-		    overwrite_f = TRUE;
-		    preserve_time_f = FALSE;
-		    continue;
-		}
-		if (strcmp(long_option[i].name, "in-place=") == 0){
-		    file_out_f = TRUE;
-		    overwrite_f = TRUE;
-		    preserve_time_f = FALSE;
-		    backup_f = TRUE;
-		    backup_suffix = (char *)p;
-		    continue;
-		}
-#endif
-#ifdef INPUT_OPTION
-		if (strcmp(long_option[i].name, "cap-input") == 0){
-		    cap_f = TRUE;
-		    continue;
-		}
-		if (strcmp(long_option[i].name, "url-input") == 0){
-		    url_f = TRUE;
-		    continue;
-		}
-#endif
-#ifdef NUMCHAR_OPTION
-		if (strcmp(long_option[i].name, "numchar-input") == 0){
-		    numchar_f = TRUE;
-		    continue;
-		}
-#endif
-#ifdef CHECK_OPTION
-		if (strcmp(long_option[i].name, "no-output") == 0){
-		    noout_f = TRUE;
-		    continue;
-		}
-		if (strcmp(long_option[i].name, "debug") == 0){
-		    debug_f = TRUE;
-		    continue;
-		}
-#endif
-		if (strcmp(long_option[i].name, "cp932") == 0){
-#ifdef SHIFTJIS_CP932
-		    cp51932_f = TRUE;
-		    cp932inv_f = -TRUE;
-#endif
-#ifdef UTF8_OUTPUT_ENABLE
-		    ms_ucs_map_f = UCS_MAP_CP932;
-#endif
-		    continue;
-		}
-		if (strcmp(long_option[i].name, "no-cp932") == 0){
-#ifdef SHIFTJIS_CP932
-		    cp51932_f = FALSE;
-		    cp932inv_f = FALSE;
-#endif
-#ifdef UTF8_OUTPUT_ENABLE
-		    ms_ucs_map_f = UCS_MAP_ASCII;
-#endif
-		    continue;
-		}
-#ifdef SHIFTJIS_CP932
-		if (strcmp(long_option[i].name, "cp932inv") == 0){
-		    cp932inv_f = -TRUE;
-		    continue;
-		}
-#endif
-
-#ifdef X0212_ENABLE
-		if (strcmp(long_option[i].name, "x0212") == 0){
-		    x0212_f = TRUE;
-		    continue;
-		}
-#endif
-
-#ifdef EXEC_IO
-		if (strcmp(long_option[i].name, "exec-in") == 0){
-		    exec_f = 1;
-		    return 0;
-		}
-		if (strcmp(long_option[i].name, "exec-out") == 0){
-		    exec_f = -1;
-		    return 0;
-		}
-#endif
-#if defined(UTF8_OUTPUT_ENABLE) && defined(UTF8_INPUT_ENABLE)
-		if (strcmp(long_option[i].name, "no-cp932ext") == 0){
-		    no_cp932ext_f = TRUE;
-		    continue;
-		}
-		if (strcmp(long_option[i].name, "no-best-fit-chars") == 0){
-		    no_best_fit_chars_f = TRUE;
-		    continue;
-		}
-		if (strcmp(long_option[i].name, "fb-skip") == 0){
-		    encode_fallback = NULL;
-		    continue;
-		}
-		if (strcmp(long_option[i].name, "fb-html") == 0){
-		    encode_fallback = encode_fallback_html;
-		    continue;
-		}
-		if (strcmp(long_option[i].name, "fb-xml") == 0){
-		    encode_fallback = encode_fallback_xml;
-		    continue;
-		}
-		if (strcmp(long_option[i].name, "fb-java") == 0){
-		    encode_fallback = encode_fallback_java;
-		    continue;
-		}
-		if (strcmp(long_option[i].name, "fb-perl") == 0){
-		    encode_fallback = encode_fallback_perl;
-		    continue;
-		}
-		if (strcmp(long_option[i].name, "fb-subchar") == 0){
-		    encode_fallback = encode_fallback_subchar;
-		    continue;
-		}
-		if (strcmp(long_option[i].name, "fb-subchar=") == 0){
-		    encode_fallback = encode_fallback_subchar;
-		    unicode_subchar = 0;
-		    if (p[0] != '0'){
-			/* decimal number */
-			for (i = 0; i < 7 && nkf_isdigit(p[i]); i++){
-			    unicode_subchar *= 10;
-			    unicode_subchar += hex2bin(p[i]);
-			}
-		    }else if(p[1] == 'x' || p[1] == 'X'){
-			/* hexadecimal number */
-			for (i = 2; i < 8 && nkf_isxdigit(p[i]); i++){
-			    unicode_subchar <<= 4;
-			    unicode_subchar |= hex2bin(p[i]);
-			}
-		    }else{
-			/* octal number */
-			for (i = 1; i < 8 && nkf_isoctal(p[i]); i++){
-			    unicode_subchar *= 8;
-			    unicode_subchar += hex2bin(p[i]);
-			}
-		    }
-		    w16e_conv(unicode_subchar, &i, &j);
-		    unicode_subchar = i<<8 | j;
-		    continue;
-		}
-#endif
-#ifdef UTF8_OUTPUT_ENABLE
-		if (strcmp(long_option[i].name, "ms-ucs-map") == 0){
-		    ms_ucs_map_f = UCS_MAP_MS;
-		    continue;
-		}
-#endif
-#ifdef UNICODE_NORMALIZATION
-		if (strcmp(long_option[i].name, "utf8mac-input") == 0){
-		    nfc_f = TRUE;
-		    continue;
-		}
-#endif
-		if (strcmp(long_option[i].name, "prefix=") == 0){
-		    if (nkf_isgraph(p[0])){
-			for (i = 1; nkf_isgraph(p[i]); i++){
-			    prefix_table[p[i]] = p[0];
-			}
-		    }
-		    continue;
-		}
-#if !defined(PERL_XS) && !defined(WIN32DLL)
-		fprintf(stderr, "unsupported long option: --%s\n", long_option[i].name);
-#endif
-		return -1;
-	    }
-	    continue;
-	case 'b':           /* buffered mode */
-	    unbuf_f = FALSE;
-	    continue;
-	case 'u':           /* non bufferd mode */
-	    unbuf_f = TRUE;
-	    continue;
-	case 't':           /* transparent mode */
-	    if (*cp=='1') {
-		/* alias of -t */
-		cp++;
-		nop_f = TRUE;
-	    } else if (*cp=='2') {
-		/*
-		 * -t with put/get
-		 *
-		 * nkf -t2MB hoge.bin | nkf -t2mB | diff -s - hoge.bin
-		 *
-		 */
-		cp++;
-		nop_f = 2;
-	    } else
-		nop_f = TRUE;
-	    continue;
-	case 'j':           /* JIS output */
-	case 'n':
-	    output_encoding = nkf_enc_from_index(ISO_2022_JP);
-	    continue;
-	case 'e':           /* AT&T EUC output */
-	    output_encoding = nkf_enc_from_index(EUCJP_NKF);
-	    continue;
-	case 's':           /* SJIS output */
-	    output_encoding = nkf_enc_from_index(SHIFT_JIS);
-	    continue;
-	case 'l':           /* ISO8859 Latin-1 support, no conversion */
-	    iso8859_f = TRUE;  /* Only compatible with ISO-2022-JP */
-	    input_encoding = nkf_enc_from_index(ISO_8859_1);
-	    continue;
-	case 'i':           /* Kanji IN ESC-$-@/B */
-	    if (*cp=='@'||*cp=='B')
-		kanji_intro = *cp++;
-	    continue;
-	case 'o':           /* ASCII IN ESC-(-J/B/H */
-	    /* ESC ( H was used in initial JUNET messages */
-	    if (*cp=='J'||*cp=='B'||*cp=='H')
-		ascii_intro = *cp++;
-	    continue;
-	case 'h':
-	    /*
-	       bit:1   katakana->hiragana
-	       bit:2   hiragana->katakana
-	     */
-	    if ('9'>= *cp && *cp>='0')
-		hira_f |= (*cp++ -'0');
-	    else
-		hira_f |= 1;
-	    continue;
-	case 'r':
-	    rot_f = TRUE;
-	    continue;
-#if defined(MSDOS) || defined(__OS2__)
-	case 'T':
-	    binmode_f = FALSE;
-	    continue;
-#endif
-#ifndef PERL_XS
-	case 'V':
-	    show_configuration();
-	    exit(EXIT_SUCCESS);
-	    break;
-	case 'v':
-	    version();
-	    exit(EXIT_SUCCESS);
-	    break;
-#endif
-#ifdef UTF8_OUTPUT_ENABLE
-	case 'w':           /* UTF-{8,16,32} output */
-	    if (cp[0] == '8') {
-		cp++;
-		if (cp[0] == '0'){
-		    cp++;
-		    output_encoding = nkf_enc_from_index(UTF_8N);
-		} else {
-		    output_bom_f = TRUE;
-		    output_encoding = nkf_enc_from_index(UTF_8_BOM);
-		}
-	    } else {
-		int enc_idx;
-		if ('1'== cp[0] && '6'==cp[1]) {
-		    cp += 2;
-		    enc_idx = UTF_16;
-		} else if ('3'== cp[0] && '2'==cp[1]) {
-		    cp += 2;
-		    enc_idx = UTF_32;
-		} else {
-		    output_encoding = nkf_enc_from_index(UTF_8);
-		    continue;
-		}
-		if (cp[0]=='L') {
-		    cp++;
-		    output_endian = ENDIAN_LITTLE;
-		    output_bom_f = TRUE;
-		} else if (cp[0] == 'B') {
-		    cp++;
-		    output_bom_f = TRUE;
-		}
-		if (cp[0] == '0'){
-		    output_bom_f = FALSE;
-		    cp++;
-		    enc_idx = enc_idx == UTF_16
-			? (output_endian == ENDIAN_LITTLE ? UTF_16LE : UTF_16BE)
-			: (output_endian == ENDIAN_LITTLE ? UTF_32LE : UTF_32BE);
-		} else {
-		    enc_idx = enc_idx == UTF_16
-			? (output_endian == ENDIAN_LITTLE ? UTF_16LE_BOM : UTF_16BE_BOM)
-			: (output_endian == ENDIAN_LITTLE ? UTF_32LE_BOM : UTF_32BE_BOM);
-		}
-		output_encoding = nkf_enc_from_index(enc_idx);
-	    }
-	    continue;
-#endif
-#ifdef UTF8_INPUT_ENABLE
-	case 'W':           /* UTF input */
-	    if (cp[0] == '8') {
-		cp++;
-		input_encoding = nkf_enc_from_index(UTF_8);
-	    }else{
-		int enc_idx;
-		if ('1'== cp[0] && '6'==cp[1]) {
-		    cp += 2;
-		    input_endian = ENDIAN_BIG;
-		    enc_idx = UTF_16;
-		} else if ('3'== cp[0] && '2'==cp[1]) {
-		    cp += 2;
-		    input_endian = ENDIAN_BIG;
-		    enc_idx = UTF_32;
-		} else {
-		    input_encoding = nkf_enc_from_index(UTF_8);
-		    continue;
-		}
-		if (cp[0]=='L') {
-		    cp++;
-		    input_endian = ENDIAN_LITTLE;
-		} else if (cp[0] == 'B') {
-		    cp++;
-		    input_endian = ENDIAN_BIG;
-		}
-		enc_idx = (enc_idx == UTF_16
-		    ? (input_endian == ENDIAN_LITTLE ? UTF_16LE : UTF_16BE)
-		    : (input_endian == ENDIAN_LITTLE ? UTF_32LE : UTF_32BE));
-		input_encoding = nkf_enc_from_index(enc_idx);
-	    }
-	    continue;
-#endif
-	    /* Input code assumption */
-	case 'J':   /* ISO-2022-JP input */
-	    input_encoding = nkf_enc_from_index(ISO_2022_JP);
-	    continue;
-	case 'E':   /* EUC-JP input */
-	    input_encoding = nkf_enc_from_index(EUCJP_NKF);
-	    continue;
-	case 'S':   /* Shift_JIS input */
-	    input_encoding = nkf_enc_from_index(SHIFT_JIS);
-	    continue;
-	case 'Z':   /* Convert X0208 alphabet to ascii */
-	    /* alpha_f
-	       bit:0   Convert JIS X 0208 Alphabet to ASCII
-	       bit:1   Convert Kankaku to one space
-	       bit:2   Convert Kankaku to two spaces
-	       bit:3   Convert HTML Entity
-	       bit:4   Convert JIS X 0208 Katakana to JIS X 0201 Katakana
-	     */
-	    while ('0'<= *cp && *cp <='4') {
-		alpha_f |= 1 << (*cp++ - '0');
-	    }
-	    alpha_f |= 1;
-	    continue;
-	case 'x':   /* Convert X0201 kana to X0208 or X0201 Conversion */
-	    x0201_f = FALSE;    /* No X0201->X0208 conversion */
-	    /* accept  X0201
-	       ESC-(-I     in JIS, EUC, MS Kanji
-	       SI/SO       in JIS, EUC, MS Kanji
-	       SS2         in EUC, JIS, not in MS Kanji
-	       MS Kanji (0xa0-0xdf)
-	       output  X0201
-	       ESC-(-I     in JIS (0x20-0x5f)
-	       SS2         in EUC (0xa0-0xdf)
-	       0xa0-0xd    in MS Kanji (0xa0-0xdf)
-	     */
-	    continue;
-	case 'X':   /* Convert X0201 kana to X0208 */
-	    x0201_f = TRUE;
-	    continue;
-	case 'F':   /* prserve new lines */
-	    fold_preserve_f = TRUE;
-	case 'f':   /* folding -f60 or -f */
-	    fold_f = TRUE;
-	    fold_len = 0;
-	    while('0'<= *cp && *cp <='9') { /* we don't use atoi here */
-		fold_len *= 10;
-		fold_len += *cp++ - '0';
-	    }
-	    if (!(0<fold_len && fold_len<BUFSIZ))
-		fold_len = DEFAULT_FOLD;
-	    if (*cp=='-') {
-		fold_margin = 0;
-		cp++;
-		while('0'<= *cp && *cp <='9') { /* we don't use atoi here */
-		    fold_margin *= 10;
-		    fold_margin += *cp++ - '0';
-		}
-	    }
-	    continue;
-	case 'm':   /* MIME support */
-	    /* mime_decode_f = TRUE; */ /* this has too large side effects... */
-	    if (*cp=='B'||*cp=='Q') {
-		mime_decode_mode = *cp++;
-		mimebuf_f = FIXED_MIME;
-	    } else if (*cp=='N') {
-		mime_f = TRUE; cp++;
-	    } else if (*cp=='S') {
-		mime_f = STRICT_MIME; cp++;
-	    } else if (*cp=='0') {
-		mime_decode_f = FALSE;
-		mime_f = FALSE; cp++;
-	    } else {
-		mime_f = STRICT_MIME;
-	    }
-	    continue;
-	case 'M':   /* MIME output */
-	    if (*cp=='B') {
-		mimeout_mode = 'B';
-		mimeout_f = FIXED_MIME; cp++;
-	    } else if (*cp=='Q') {
-		mimeout_mode = 'Q';
-		mimeout_f = FIXED_MIME; cp++;
-	    } else {
-		mimeout_f = TRUE;
-	    }
-	    continue;
-	case 'B':   /* Broken JIS support */
-	    /*  bit:0   no ESC JIS
-	       bit:1   allow any x on ESC-(-x or ESC-$-x
-	       bit:2   reset to ascii on NL
-	     */
-	    if ('9'>= *cp && *cp>='0')
-		broken_f |= 1<<(*cp++ -'0');
-	    else
-		broken_f |= TRUE;
-	    continue;
-#ifndef PERL_XS
-	case 'O':/* for Output file */
-	    file_out_f = TRUE;
-	    continue;
-#endif
-	case 'c':/* add cr code */
-	    eolmode_f = CRLF;
-	    continue;
-	case 'd':/* delete cr code */
-	    eolmode_f = LF;
-	    continue;
-	case 'I':   /* ISO-2022-JP output */
-	    iso2022jp_f = TRUE;
-	    continue;
-	case 'L':  /* line mode */
-	    if (*cp=='u') {         /* unix */
-		eolmode_f = LF; cp++;
-	    } else if (*cp=='m') { /* mac */
-		eolmode_f = CR; cp++;
-	    } else if (*cp=='w') { /* windows */
-		eolmode_f = CRLF; cp++;
-	    } else if (*cp=='0') { /* no conversion  */
-		eolmode_f = 0; cp++;
-	    }
-	    continue;
-#ifndef PERL_XS
-	case 'g':
-	    if ('2' <= *cp && *cp <= '9') {
-		guess_f = 2;
-		cp++;
-	    } else if (*cp == '0' || *cp == '1') {
-		guess_f = 1;
-		cp++;
-	    } else {
-		guess_f = 1;
-	    }
-	    continue;
-#endif
-	case SP:
-	    /* module multiple options in a string are allowed for Perl module  */
-	    while(*cp && *cp++!='-');
-	    continue;
-	default:
-#if !defined(PERL_XS) && !defined(WIN32DLL)
-	    fprintf(stderr, "unknown option: -%c\n", *(cp-1));
-#endif
-	    /* bogus option but ignored */
-	    return -1;
-	}
-    }
-    return 0;
-}
-
-#ifdef WIN32DLL
-#include "nkf32dll.c"
-#elif defined(PERL_XS)
-#else /* WIN32DLL */
-int
-main(int argc, char **argv)
-{
-    FILE  *fin;
-    unsigned char  *cp;
-
-    char *outfname = NULL;
-    char *origfname;
-
-#ifdef EASYWIN /*Easy Win */
-    _BufferSize.y = 400;/*Set Scroll Buffer Size*/
-#endif
-#ifdef DEFAULT_CODE_LOCALE
-    setlocale(LC_CTYPE, "");
-#endif
-    nkf_state_init();
-
-    for (argc--,argv++; (argc > 0) && **argv == '-'; argc--, argv++) {
-	cp = (unsigned char *)*argv;
-	options(cp);
-#ifdef EXEC_IO
-	if (exec_f){
-	    int fds[2], pid;
-	    if (pipe(fds) < 0 || (pid = fork()) < 0){
-		abort();
-	    }
-	    if (pid == 0){
-		if (exec_f > 0){
-		    close(fds[0]);
-		    dup2(fds[1], 1);
-		}else{
-		    close(fds[1]);
-		    dup2(fds[0], 0);
-		}
-		execvp(argv[1], &argv[1]);
-	    }
-	    if (exec_f > 0){
-		close(fds[1]);
-		dup2(fds[0], 0);
-	    }else{
-		close(fds[0]);
-		dup2(fds[1], 1);
-	    }
-	    argc = 0;
-	    break;
-	}
-#endif
-    }
-
-    if (guess_f) {
-#ifdef CHECK_OPTION
-	int debug_f_back = debug_f;
-#endif
-#ifdef EXEC_IO
-	int exec_f_back = exec_f;
-#endif
-#ifdef X0212_ENABLE
-	int x0212_f_back = x0212_f;
-#endif
-	int x0213_f_back = x0213_f;
-	int guess_f_back = guess_f;
-	reinit();
-	guess_f = guess_f_back;
-	mime_f = FALSE;
-#ifdef CHECK_OPTION
-	debug_f = debug_f_back;
-#endif
-#ifdef EXEC_IO
-	exec_f = exec_f_back;
-#endif
-	x0212_f = x0212_f_back;
-	x0213_f = x0213_f_back;
-    }
-
-    if (binmode_f == TRUE)
-#if defined(__OS2__) && (defined(__IBMC__) || defined(__IBMCPP__))
-	if (freopen("","wb",stdout) == NULL)
-	    return (-1);
-#else
-    setbinmode(stdout);
-#endif
-
-    if (unbuf_f)
-	setbuf(stdout, (char *) NULL);
-    else
-	setvbuffer(stdout, (char *) stdobuf, IOBUF_SIZE);
-
-    if (argc == 0) {
-	if (binmode_f == TRUE)
-#if defined(__OS2__) && (defined(__IBMC__) || defined(__IBMCPP__))
-	    if (freopen("","rb",stdin) == NULL) return (-1);
-#else
-	setbinmode(stdin);
-#endif
-	setvbuffer(stdin, (char *) stdibuf, IOBUF_SIZE);
-	if (nop_f)
-	    noconvert(stdin);
-	else {
-	    kanji_convert(stdin);
-	    if (guess_f) print_guessed_code(NULL);
-	}
-    } else {
-	int nfiles = argc;
-	int is_argument_error = FALSE;
-	while (argc--) {
-	    input_codename = NULL;
-	    input_eol = 0;
-#ifdef CHECK_OPTION
-	    iconv_for_check = 0;
-#endif
-	    if ((fin = fopen((origfname = *argv++), "r")) == NULL) {
-		perror(*(argv-1));
-		is_argument_error = TRUE;
-		continue;
-	    } else {
-#ifdef OVERWRITE
-		int fd = 0;
-		int fd_backup = 0;
-#endif
-
-		/* reopen file for stdout */
-		if (file_out_f == TRUE) {
-#ifdef OVERWRITE
-		    if (overwrite_f){
-			outfname = nkf_xmalloc(strlen(origfname)
-					  + strlen(".nkftmpXXXXXX")
-					  + 1);
-			strcpy(outfname, origfname);
-#ifdef MSDOS
-			{
-			    int i;
-			    for (i = strlen(outfname); i; --i){
-				if (outfname[i - 1] == '/'
-				    || outfname[i - 1] == '\\'){
-				    break;
-				}
-			    }
-			    outfname[i] = '\0';
-			}
-			strcat(outfname, "ntXXXXXX");
-			mktemp(outfname);
-			fd = open(outfname, O_WRONLY | O_CREAT | O_TRUNC | O_EXCL,
-				  S_IREAD | S_IWRITE);
-#else
-			strcat(outfname, ".nkftmpXXXXXX");
-			fd = mkstemp(outfname);
-#endif
-			if (fd < 0
-			    || (fd_backup = dup(fileno(stdout))) < 0
-			    || dup2(fd, fileno(stdout)) < 0
-			   ){
-			    perror(origfname);
-			    return -1;
-			}
-		    }else
-#endif
-		    if(argc == 1) {
-			outfname = *argv++;
-			argc--;
-		    } else {
-			outfname = "nkf.out";
-		    }
-
-		    if(freopen(outfname, "w", stdout) == NULL) {
-			perror (outfname);
-			return (-1);
-		    }
-		    if (binmode_f == TRUE) {
-#if defined(__OS2__) && (defined(__IBMC__) || defined(__IBMCPP__))
-			if (freopen("","wb",stdout) == NULL)
-			    return (-1);
-#else
-			setbinmode(stdout);
-#endif
-		    }
-		}
-		if (binmode_f == TRUE)
-#if defined(__OS2__) && (defined(__IBMC__) || defined(__IBMCPP__))
-		    if (freopen("","rb",fin) == NULL)
-			return (-1);
-#else
-		setbinmode(fin);
-#endif
-		setvbuffer(fin, (char *) stdibuf, IOBUF_SIZE);
-		if (nop_f)
-		    noconvert(fin);
-		else {
-		    char *filename = NULL;
-		    kanji_convert(fin);
-		    if (nfiles > 1) filename = origfname;
-		    if (guess_f) print_guessed_code(filename);
-		}
-		fclose(fin);
-#ifdef OVERWRITE
-		if (overwrite_f) {
-		    struct stat     sb;
-#if defined(MSDOS) && !defined(__MINGW32__) && !defined(__WIN32__) && !defined(__WATCOMC__) && !defined(__EMX__) && !defined(__OS2__) && !defined(__DJGPP__)
-		    time_t tb[2];
-#else
-		    struct utimbuf  tb;
-#endif
-
-		    fflush(stdout);
-		    close(fd);
-		    if (dup2(fd_backup, fileno(stdout)) < 0){
-			perror("dup2");
-		    }
-		    if (stat(origfname, &sb)) {
-			fprintf(stderr, "Can't stat %s\n", origfname);
-		    }
-		    /* $B%Q!<%_%C%7%g%s$rI|85(B */
-		    if (chmod(outfname, sb.st_mode)) {
-			fprintf(stderr, "Can't set permission %s\n", outfname);
-		    }
-
-		    /* $B%?%$%`%9%?%s%W$rI|85(B */
-		    if(preserve_time_f){
-#if defined(MSDOS) && !defined(__MINGW32__) && !defined(__WIN32__) && !defined(__WATCOMC__) && !defined(__EMX__) && !defined(__OS2__) && !defined(__DJGPP__)
-			tb[0] = tb[1] = sb.st_mtime;
-			if (utime(outfname, tb)) {
-			    fprintf(stderr, "Can't set timestamp %s\n", outfname);
-			}
-#else
-			tb.actime  = sb.st_atime;
-			tb.modtime = sb.st_mtime;
-			if (utime(outfname, &tb)) {
-			    fprintf(stderr, "Can't set timestamp %s\n", outfname);
-			}
-#endif
-		    }
-		    if(backup_f){
-			char *backup_filename = get_backup_filename(backup_suffix, origfname);
-#ifdef MSDOS
-			unlink(backup_filename);
-#endif
-			if (rename(origfname, backup_filename)) {
-			    perror(backup_filename);
-			    fprintf(stderr, "Can't rename %s to %s\n",
-				    origfname, backup_filename);
-			}
-			nkf_xfree(backup_filename);
-		    }else{
-#ifdef MSDOS
-			if (unlink(origfname)){
-			    perror(origfname);
-			}
-#endif
-		    }
-		    if (rename(outfname, origfname)) {
-			perror(origfname);
-			fprintf(stderr, "Can't rename %s to %s\n",
-				outfname, origfname);
-		    }
-		    nkf_xfree(outfname);
-		}
-#endif
-	    }
-	}
-	if (is_argument_error)
-	    return(-1);
-    }
-#ifdef EASYWIN /*Easy Win */
-    if (file_out_f == FALSE)
-	scanf("%d",&end_check);
-    else
-	fclose(stdout);
-#else /* for Other OS */
-    if (file_out_f == TRUE)
-	fclose(stdout);
-#endif /*Easy Win */
-    return (0);
-}
-#endif /* WIN32DLL */
diff --git a/ext/nkf/nkf-utf8/nkf.h b/ext/nkf/nkf-utf8/nkf.h
deleted file mode 100644
index b3a520da54edff..00000000000000
--- a/ext/nkf/nkf-utf8/nkf.h
+++ /dev/null
@@ -1,189 +0,0 @@
-/*
- *
- * nkf.h - Header file for nkf
- *
- */
-
-#ifndef NKF_H
-#define NKF_H
-
-/* Wrapper of configurations */
-
-#ifndef MIME_DECODE_DEFAULT
-#define MIME_DECODE_DEFAULT STRICT_MIME
-#endif
-#ifndef X0201_DEFAULT
-#define X0201_DEFAULT TRUE
-#endif
-
-#if defined(DEFAULT_NEWLINE) && DEFAULT_NEWLINE == 0x0D0A
-#elif defined(DEFAULT_NEWLINE) && DEFAULT_NEWLINE == 0x0D
-#else
-#define DEFAULT_NEWLINE 0x0A
-#endif
-#ifdef HELP_OUTPUT_STDERR
-#define HELP_OUTPUT stderr
-#else
-#define HELP_OUTPUT stdout
-#endif
-
-
-/* Compatibility definitions */
-
-#ifdef nkf_char
-#elif defined(INT_IS_SHORT)
-typedef long nkf_char;
-#define NKF_INT32_C(n)   (n##L)
-#else
-typedef int nkf_char;
-#define NKF_INT32_C(n)   (n)
-#endif
-
-#if (defined(__TURBOC__) || defined(_MSC_VER) || defined(LSI_C) || (defined(__WATCOMC__) && defined(__386__) && !defined(__LINUX__)) || defined(__MINGW32__) || defined(__EMX__) || defined(__MSDOS__) || defined(__WINDOWS__) || defined(__DOS__) || defined(__OS2__)) && !defined(MSDOS)
-#define MSDOS
-#if (defined(__Win32__) || defined(_WIN32)) && !defined(__WIN32__)
-#define __WIN32__
-#endif
-#endif
-
-#ifdef PERL_XS
-#undef OVERWRITE
-#endif
-
-#ifndef PERL_XS
-#include <stdio.h>
-#endif
-
-#include <stdlib.h>
-#include <string.h>
-
-#if defined(MSDOS) || defined(__OS2__)
-#include <fcntl.h>
-#include <io.h>
-#if defined(_MSC_VER) || defined(__WATCOMC__)
-#define mktemp _mktemp
-#endif
-#endif
-
-#ifdef MSDOS
-#ifdef LSI_C
-#define setbinmode(fp) fsetbin(fp)
-#elif defined(__DJGPP__)
-#include <libc/dosio.h>
-void  setbinmode(FILE *fp)
-{
-    /* we do not use libc's setmode(), which changes COOKED/RAW mode in device. */
-    int fd, m;
-    fd = fileno(fp);
-    m = (__file_handle_modes[fd] & (~O_TEXT)) | O_BINARY;
-    __file_handle_set(fd, m);
-}
-#else /* Microsoft C, Turbo C */
-#define setbinmode(fp) setmode(fileno(fp), O_BINARY)
-#endif
-#else /* UNIX */
-#define setbinmode(fp) (void)(fp)
-#endif
-
-#ifdef _IOFBF /* SysV and MSDOS, Windows */
-#define       setvbuffer(fp, buf, size)       setvbuf(fp, buf, _IOFBF, size)
-#else /* BSD */
-#define       setvbuffer(fp, buf, size)       setbuffer(fp, buf, size)
-#endif
-
-/*Borland C++ 4.5 EasyWin*/
-#if defined(__TURBOC__) && defined(_Windows) && !defined(__WIN32__) /*Easy Win */
-#define         EASYWIN
-#ifndef __WIN16__
-#define __WIN16__
-#endif
-#include <windows.h>
-#endif
-
-#ifdef OVERWRITE
-/* added by satoru@isoternet.org */
-#if defined(__EMX__)
-#include <sys/types.h>
-#endif
-#include <sys/stat.h>
-#if !defined(MSDOS) || defined(__DJGPP__) /* UNIX, djgpp */
-#include <unistd.h>
-#if defined(__WATCOMC__)
-#include <sys/utime.h>
-#else
-#include <utime.h>
-#endif
-#else /* defined(MSDOS) */
-#ifdef __WIN32__
-#ifdef __BORLANDC__ /* BCC32 */
-#include <utime.h>
-#else /* !defined(__BORLANDC__) */
-#include <sys/utime.h>
-#endif /* (__BORLANDC__) */
-#else /* !defined(__WIN32__) */
-#if defined(_MSC_VER) || defined(__MINGW32__) || defined(__WATCOMC__) || defined(__OS2__) || defined(__EMX__) || defined(__IBMC__) || defined(__IBMCPP__)  /* VC++, MinGW, Watcom, emx+gcc, IBM VAC++ */
-#include <sys/utime.h>
-#elif defined(__TURBOC__) /* BCC */
-#include <utime.h>
-#elif defined(LSI_C) /* LSI C */
-#endif /* (__WIN32__) */
-#endif
-#endif
-#endif
-
-#if !defined(DEFAULT_CODE_JIS) && !defined(DEFAULT_CODE_SJIS) && \
-	!defined(DEFAULT_CODE_WINDOWS_31J) && !defined(DEFAULT_CODE_EUC) && \
-	!defined(DEFAULT_CODE_UTF8) && !defined(DEFAULT_CODE_LOCALE)
-#define DEFAULT_CODE_LOCALE
-#endif
-
-#ifdef DEFAULT_CODE_LOCALE
-
-#if defined(__WIN32__) /* not win32 should be posix */
-# ifndef HAVE_LOCALE_H
-#  define HAVE_LOCALE_H
-# endif
-#elif defined(__OS2__)
-# undef HAVE_LANGINFO_H /* We do not use kLIBC's langinfo. */
-# ifndef HAVE_LOCALE_H
-#  define HAVE_LOCALE_H
-# endif
-#elif defined(MSDOS)
-# ifndef HAVE_LOCALE_H
-#  define HAVE_LOCALE_H
-# endif
-#elif defined(__BIONIC__) /* bionic doesn't have locale */
-#else
-# ifndef HAVE_LANGINFO_H
-#  define HAVE_LANGINFO_H
-# endif
-# ifndef HAVE_LOCALE_H
-#  define HAVE_LOCALE_H
-# endif
-#endif
-
-#ifdef HAVE_LANGINFO_H
-#include <langinfo.h>
-#endif
-#ifdef HAVE_LOCALE_H
-#include <locale.h>
-#endif
-
-#endif /* DEFAULT_CODE_LOCALE */
-
-#define         FALSE   0
-#define         TRUE    1
-
-#ifndef ARG_UNUSED
-#if defined(__GNUC__)
-#  define ARG_UNUSED  __attribute__ ((unused))
-#else
-#  define ARG_UNUSED
-#endif
-#endif
-
-#ifdef WIN32DLL
-#include "nkf32.h"
-#endif
-
-#endif /* NKF_H */
diff --git a/ext/nkf/nkf-utf8/utf8tbl.c b/ext/nkf/nkf-utf8/utf8tbl.c
deleted file mode 100644
index a31e4e7805dec0..00000000000000
--- a/ext/nkf/nkf-utf8/utf8tbl.c
+++ /dev/null
@@ -1,14638 +0,0 @@
-/*
- * utf8tbl.c - Conversion Table for nkf
- *
- */
-
-#include "config.h"
-#include "utf8tbl.h"
-
-#ifdef UTF8_OUTPUT_ENABLE
-static const unsigned short euc_to_utf8_A1[] = {
-         0x3000, 0x3001, 0x3002, 0xFF0C, 0xFF0E, 0x30FB, 0xFF1A,
- 0xFF1B, 0xFF1F, 0xFF01, 0x309B, 0x309C, 0x00B4, 0xFF40, 0x00A8,
- 0xFF3E, 0x203E, 0xFF3F, 0x30FD, 0x30FE, 0x309D, 0x309E, 0x3003,
- 0x4EDD, 0x3005, 0x3006, 0x3007, 0x30FC, 0x2014, 0x2010, 0xFF0F,
- 0xFF3C, 0x301C, 0x2016, 0xFF5C, 0x2026, 0x2025, 0x2018, 0x2019,
- 0x201C, 0x201D, 0xFF08, 0xFF09, 0x3014, 0x3015, 0xFF3B, 0xFF3D,
- 0xFF5B, 0xFF5D, 0x3008, 0x3009, 0x300A, 0x300B, 0x300C, 0x300D,
- 0x300E, 0x300F, 0x3010, 0x3011, 0xFF0B, 0x2212, 0x00B1, 0x00D7,
- 0x00F7, 0xFF1D, 0x2260, 0xFF1C, 0xFF1E, 0x2266, 0x2267, 0x221E,
- 0x2234, 0x2642, 0x2640, 0x00B0, 0x2032, 0x2033, 0x2103, 0x00A5,
- 0xFF04, 0x00A2, 0x00A3, 0xFF05, 0xFF03, 0xFF06, 0xFF0A, 0xFF20,
- 0x00A7, 0x2606, 0x2605, 0x25CB, 0x25CF, 0x25CE, 0x25C7,
-};
-
-/* Microsoft UCS Mapping Compatible */
-static const unsigned short euc_to_utf8_A1_ms[] = {
-         0x3000, 0x3001, 0x3002, 0xFF0C, 0xFF0E, 0x30FB, 0xFF1A,
- 0xFF1B, 0xFF1F, 0xFF01, 0x309B, 0x309C, 0x00B4, 0xFF40, 0x00A8,
- 0xFF3E, 0xFFE3, 0xFF3F, 0x30FD, 0x30FE, 0x309D, 0x309E, 0x3003,
- 0x4EDD, 0x3005, 0x3006, 0x3007, 0x30FC, 0x2015, 0x2010, 0xFF0F,
- 0xFF3C, 0xFF5E, 0x2225, 0xFF5C, 0x2026, 0x2025, 0x2018, 0x2019,
- 0x201C, 0x201D, 0xFF08, 0xFF09, 0x3014, 0x3015, 0xFF3B, 0xFF3D,
- 0xFF5B, 0xFF5D, 0x3008, 0x3009, 0x300A, 0x300B, 0x300C, 0x300D,
- 0x300E, 0x300F, 0x3010, 0x3011, 0xFF0B, 0xFF0D, 0x00B1, 0x00D7,
- 0x00F7, 0xFF1D, 0x2260, 0xFF1C, 0xFF1E, 0x2266, 0x2267, 0x221E,
- 0x2234, 0x2642, 0x2640, 0x00B0, 0x2032, 0x2033, 0x2103, 0xFFE5,
- 0xFF04, 0xFFE0, 0xFFE1, 0xFF05, 0xFF03, 0xFF06, 0xFF0A, 0xFF20,
- 0x00A7, 0x2606, 0x2605, 0x25CB, 0x25CF, 0x25CE, 0x25C7,
-};
-static const unsigned short euc_to_utf8_A2[] = {
-         0x25C6, 0x25A1, 0x25A0, 0x25B3, 0x25B2, 0x25BD, 0x25BC,
- 0x203B, 0x3012, 0x2192, 0x2190, 0x2191, 0x2193, 0x3013,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0, 0x2208, 0x220B, 0x2286, 0x2287, 0x2282, 0x2283,
- 0x222A, 0x2229,      0,      0,      0,      0,      0,      0,
-      0,      0, 0x2227, 0x2228, 0x00AC, 0x21D2, 0x21D4, 0x2200,
- 0x2203,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0, 0x2220, 0x22A5, 0x2312, 0x2202,
- 0x2207, 0x2261, 0x2252, 0x226A, 0x226B, 0x221A, 0x223D, 0x221D,
- 0x2235, 0x222B, 0x222C,      0,      0,      0,      0,      0,
-      0,      0, 0x212B, 0x2030, 0x266F, 0x266D, 0x266A, 0x2020,
- 0x2021, 0x00B6,      0,      0,      0,      0, 0x25EF,
-};
-
-/* Microsoft UCS Mapping Compatible */
-static const unsigned short euc_to_utf8_A2_ms[] = {
-         0x25C6, 0x25A1, 0x25A0, 0x25B3, 0x25B2, 0x25BD, 0x25BC,
- 0x203B, 0x3012, 0x2192, 0x2190, 0x2191, 0x2193, 0x3013,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0, 0x2208, 0x220B, 0x2286, 0x2287, 0x2282, 0x2283,
- 0x222A, 0x2229,      0,      0,      0,      0,      0,      0,
-      0,      0, 0x2227, 0x2228, 0xFFE2, 0x21D2, 0x21D4, 0x2200,
- 0x2203,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0, 0x2220, 0x22A5, 0x2312, 0x2202,
- 0x2207, 0x2261, 0x2252, 0x226A, 0x226B, 0x221A, 0x223D, 0x221D,
- 0x2235, 0x222B, 0x222C,      0,      0,      0,      0,      0,
-      0,      0, 0x212B, 0x2030, 0x266F, 0x266D, 0x266A, 0x2020,
- 0x2021, 0x00B6,      0,      0,      0,      0, 0x25EF,
-};
-static const unsigned short euc_to_utf8_A2_x0213[] = {
-         0x25C6, 0x25A1, 0x25A0, 0x25B3, 0x25B2, 0x25BD, 0x25BC,
- 0x203B, 0x3012, 0x2192, 0x2190, 0x2191, 0x2193, 0x3013, 0xFF07,
- 0xFF02, 0xFF0D, 0xFF5E, 0x3033, 0x3034, 0x3035, 0x303B, 0x303C,
- 0x30FF, 0x309F, 0x2208, 0x220B, 0x2286, 0x2287, 0x2282, 0x2283,
- 0x222A, 0x2229, 0x2284, 0x2285, 0x228A, 0x228B, 0x2209, 0x2205,
- 0x2305, 0x2306, 0x2227, 0x2228, 0x00AC, 0x21D2, 0x21D4, 0x2200,
- 0x2203, 0x2295, 0x2296, 0x2297, 0x2225, 0x2226, 0xFF5F, 0xFF60,
- 0x3018, 0x3019, 0x3016, 0x3017, 0x2220, 0x22A5, 0x2312, 0x2202,
- 0x2207, 0x2261, 0x2252, 0x226A, 0x226B, 0x221A, 0x223D, 0x221D,
- 0x2235, 0x222B, 0x222C, 0x2262, 0x2243, 0x2245, 0x2248, 0x2276,
- 0x2277, 0x2194, 0x212B, 0x2030, 0x266F, 0x266D, 0x266A, 0x2020,
- 0x2021, 0x00B6, 0x266E, 0x266B, 0x266C, 0x2669, 0x25EF,
-};
-static const unsigned short euc_to_utf8_A3[] = {
-              0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
- 0xFF10, 0xFF11, 0xFF12, 0xFF13, 0xFF14, 0xFF15, 0xFF16, 0xFF17,
- 0xFF18, 0xFF19,      0,      0,      0,      0,      0,      0,
-      0, 0xFF21, 0xFF22, 0xFF23, 0xFF24, 0xFF25, 0xFF26, 0xFF27,
- 0xFF28, 0xFF29, 0xFF2A, 0xFF2B, 0xFF2C, 0xFF2D, 0xFF2E, 0xFF2F,
- 0xFF30, 0xFF31, 0xFF32, 0xFF33, 0xFF34, 0xFF35, 0xFF36, 0xFF37,
- 0xFF38, 0xFF39, 0xFF3A,      0,      0,      0,      0,      0,
-      0, 0xFF41, 0xFF42, 0xFF43, 0xFF44, 0xFF45, 0xFF46, 0xFF47,
- 0xFF48, 0xFF49, 0xFF4A, 0xFF4B, 0xFF4C, 0xFF4D, 0xFF4E, 0xFF4F,
- 0xFF50, 0xFF51, 0xFF52, 0xFF53, 0xFF54, 0xFF55, 0xFF56, 0xFF57,
- 0xFF58, 0xFF59, 0xFF5A,      0,      0,      0,      0,
-};
-static const unsigned short euc_to_utf8_A3_x0213[] = {
-         0x25B7, 0x25B6, 0x25C1, 0x25C0, 0x2197, 0x2198, 0x2196,
- 0x2199, 0x21C4, 0x21E8, 0x21E6, 0x21E7, 0x21E9, 0x2934, 0x2935,
- 0xFF10, 0xFF11, 0xFF12, 0xFF13, 0xFF14, 0xFF15, 0xFF16, 0xFF17,
- 0xFF18, 0xFF19, 0x29BF, 0x25C9, 0x303D, 0xFE46, 0xFE45, 0x25E6,
- 0x2022, 0xFF21, 0xFF22, 0xFF23, 0xFF24, 0xFF25, 0xFF26, 0xFF27,
- 0xFF28, 0xFF29, 0xFF2A, 0xFF2B, 0xFF2C, 0xFF2D, 0xFF2E, 0xFF2F,
- 0xFF30, 0xFF31, 0xFF32, 0xFF33, 0xFF34, 0xFF35, 0xFF36, 0xFF37,
- 0xFF38, 0xFF39, 0xFF3A, 0x2213, 0x2135, 0x210F, 0x33CB, 0x2113,
- 0x2127, 0xFF41, 0xFF42, 0xFF43, 0xFF44, 0xFF45, 0xFF46, 0xFF47,
- 0xFF48, 0xFF49, 0xFF4A, 0xFF4B, 0xFF4C, 0xFF4D, 0xFF4E, 0xFF4F,
- 0xFF50, 0xFF51, 0xFF52, 0xFF53, 0xFF54, 0xFF55, 0xFF56, 0xFF57,
- 0xFF58, 0xFF59, 0xFF5A, 0x30A0, 0x2013, 0x29FA, 0x29FB,
-};
-static const unsigned short euc_to_utf8_A4[] = {
-         0x3041, 0x3042, 0x3043, 0x3044, 0x3045, 0x3046, 0x3047,
- 0x3048, 0x3049, 0x304A, 0x304B, 0x304C, 0x304D, 0x304E, 0x304F,
- 0x3050, 0x3051, 0x3052, 0x3053, 0x3054, 0x3055, 0x3056, 0x3057,
- 0x3058, 0x3059, 0x305A, 0x305B, 0x305C, 0x305D, 0x305E, 0x305F,
- 0x3060, 0x3061, 0x3062, 0x3063, 0x3064, 0x3065, 0x3066, 0x3067,
- 0x3068, 0x3069, 0x306A, 0x306B, 0x306C, 0x306D, 0x306E, 0x306F,
- 0x3070, 0x3071, 0x3072, 0x3073, 0x3074, 0x3075, 0x3076, 0x3077,
- 0x3078, 0x3079, 0x307A, 0x307B, 0x307C, 0x307D, 0x307E, 0x307F,
- 0x3080, 0x3081, 0x3082, 0x3083, 0x3084, 0x3085, 0x3086, 0x3087,
- 0x3088, 0x3089, 0x308A, 0x308B, 0x308C, 0x308D, 0x308E, 0x308F,
- 0x3090, 0x3091, 0x3092, 0x3093,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,
-};
-static const unsigned short euc_to_utf8_A4_x0213[] = {
-         0x3041, 0x3042, 0x3043, 0x3044, 0x3045, 0x3046, 0x3047,
- 0x3048, 0x3049, 0x304A, 0x304B, 0x304C, 0x304D, 0x304E, 0x304F,
- 0x3050, 0x3051, 0x3052, 0x3053, 0x3054, 0x3055, 0x3056, 0x3057,
- 0x3058, 0x3059, 0x305A, 0x305B, 0x305C, 0x305D, 0x305E, 0x305F,
- 0x3060, 0x3061, 0x3062, 0x3063, 0x3064, 0x3065, 0x3066, 0x3067,
- 0x3068, 0x3069, 0x306A, 0x306B, 0x306C, 0x306D, 0x306E, 0x306F,
- 0x3070, 0x3071, 0x3072, 0x3073, 0x3074, 0x3075, 0x3076, 0x3077,
- 0x3078, 0x3079, 0x307A, 0x307B, 0x307C, 0x307D, 0x307E, 0x307F,
- 0x3080, 0x3081, 0x3082, 0x3083, 0x3084, 0x3085, 0x3086, 0x3087,
- 0x3088, 0x3089, 0x308A, 0x308B, 0x308C, 0x308D, 0x308E, 0x308F,
- 0x3090, 0x3091, 0x3092, 0x3093, 0x3094, 0x3095, 0x3096, /*0x304B*/ 0x309A,
- /*0x304D*/ 0x309A, /*0x304F*/ 0x309A, /*0x3051*/ 0x309A, /*0x3053*/ 0x309A, 0, 0, 0,
-};
-static const unsigned short euc_to_utf8_A5[] = {
-         0x30A1, 0x30A2, 0x30A3, 0x30A4, 0x30A5, 0x30A6, 0x30A7,
- 0x30A8, 0x30A9, 0x30AA, 0x30AB, 0x30AC, 0x30AD, 0x30AE, 0x30AF,
- 0x30B0, 0x30B1, 0x30B2, 0x30B3, 0x30B4, 0x30B5, 0x30B6, 0x30B7,
- 0x30B8, 0x30B9, 0x30BA, 0x30BB, 0x30BC, 0x30BD, 0x30BE, 0x30BF,
- 0x30C0, 0x30C1, 0x30C2, 0x30C3, 0x30C4, 0x30C5, 0x30C6, 0x30C7,
- 0x30C8, 0x30C9, 0x30CA, 0x30CB, 0x30CC, 0x30CD, 0x30CE, 0x30CF,
- 0x30D0, 0x30D1, 0x30D2, 0x30D3, 0x30D4, 0x30D5, 0x30D6, 0x30D7,
- 0x30D8, 0x30D9, 0x30DA, 0x30DB, 0x30DC, 0x30DD, 0x30DE, 0x30DF,
- 0x30E0, 0x30E1, 0x30E2, 0x30E3, 0x30E4, 0x30E5, 0x30E6, 0x30E7,
- 0x30E8, 0x30E9, 0x30EA, 0x30EB, 0x30EC, 0x30ED, 0x30EE, 0x30EF,
- 0x30F0, 0x30F1, 0x30F2, 0x30F3, 0x30F4, 0x30F5, 0x30F6,      0,
-      0,      0,      0,      0,      0,      0,      0,
-};
-static const unsigned short euc_to_utf8_A5_x0213[] = {
-         0x30A1, 0x30A2, 0x30A3, 0x30A4, 0x30A5, 0x30A6, 0x30A7,
- 0x30A8, 0x30A9, 0x30AA, 0x30AB, 0x30AC, 0x30AD, 0x30AE, 0x30AF,
- 0x30B0, 0x30B1, 0x30B2, 0x30B3, 0x30B4, 0x30B5, 0x30B6, 0x30B7,
- 0x30B8, 0x30B9, 0x30BA, 0x30BB, 0x30BC, 0x30BD, 0x30BE, 0x30BF,
- 0x30C0, 0x30C1, 0x30C2, 0x30C3, 0x30C4, 0x30C5, 0x30C6, 0x30C7,
- 0x30C8, 0x30C9, 0x30CA, 0x30CB, 0x30CC, 0x30CD, 0x30CE, 0x30CF,
- 0x30D0, 0x30D1, 0x30D2, 0x30D3, 0x30D4, 0x30D5, 0x30D6, 0x30D7,
- 0x30D8, 0x30D9, 0x30DA, 0x30DB, 0x30DC, 0x30DD, 0x30DE, 0x30DF,
- 0x30E0, 0x30E1, 0x30E2, 0x30E3, 0x30E4, 0x30E5, 0x30E6, 0x30E7,
- 0x30E8, 0x30E9, 0x30EA, 0x30EB, 0x30EC, 0x30ED, 0x30EE, 0x30EF,
- 0x30F0, 0x30F1, 0x30F2, 0x30F3, 0x30F4, 0x30F5, 0x30F6, /*0x30AB*/ 0x309A,
- /*0x30AD*/ 0x309A, /*0x30AF*/ 0x309A, /*0x30B1*/ 0x309A, /*0x30B3*/ 0x309A, /*0x30BB*/ 0x309A, /*0x30C4*/ 0x309A, /*0x30C8*/ 0x309A,
-};
-static const unsigned short euc_to_utf8_A6[] = {
-         0x0391, 0x0392, 0x0393, 0x0394, 0x0395, 0x0396, 0x0397,
- 0x0398, 0x0399, 0x039A, 0x039B, 0x039C, 0x039D, 0x039E, 0x039F,
- 0x03A0, 0x03A1, 0x03A3, 0x03A4, 0x03A5, 0x03A6, 0x03A7, 0x03A8,
- 0x03A9,      0,      0,      0,      0,      0,      0,      0,
-      0, 0x03B1, 0x03B2, 0x03B3, 0x03B4, 0x03B5, 0x03B6, 0x03B7,
- 0x03B8, 0x03B9, 0x03BA, 0x03BB, 0x03BC, 0x03BD, 0x03BE, 0x03BF,
- 0x03C0, 0x03C1, 0x03C3, 0x03C4, 0x03C5, 0x03C6, 0x03C7, 0x03C8,
- 0x03C9,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,
-};
-static const unsigned short euc_to_utf8_A6_x0213[] = {
-         0x0391, 0x0392, 0x0393, 0x0394, 0x0395, 0x0396, 0x0397,
- 0x0398, 0x0399, 0x039A, 0x039B, 0x039C, 0x039D, 0x039E, 0x039F,
- 0x03A0, 0x03A1, 0x03A3, 0x03A4, 0x03A5, 0x03A6, 0x03A7, 0x03A8,
- 0x03A9, 0x2664, 0x2660, 0x2662, 0x2666, 0x2661, 0x2665, 0x2667,
- 0x2663, 0x03B1, 0x03B2, 0x03B3, 0x03B4, 0x03B5, 0x03B6, 0x03B7,
- 0x03B8, 0x03B9, 0x03BA, 0x03BB, 0x03BC, 0x03BD, 0x03BE, 0x03BF,
- 0x03C0, 0x03C1, 0x03C3, 0x03C4, 0x03C5, 0x03C6, 0x03C7, 0x03C8,
- 0x03C9, 0x03C2, 0x24F5, 0x24F6, 0x24F7, 0x24F8, 0x24F9, 0x24FA,
- 0x24FB, 0x24FC, 0x24FD, 0x24FE, 0x2616, 0x2617, 0x3020, 0x260E,
- 0x2600, 0x2601, 0x2602, 0x2603, 0x2668, 0x25B1, 0x31F0, 0x31F1,
- 0x31F2, 0x31F3, 0x31F4, 0x31F5, 0x31F6, 0x31F7, 0x31F8, 0x31F9,
- /*0x31F7*/ 0x309A, 0x31FA, 0x31FB, 0x31FC, 0x31FD, 0x31FE, 0x31FF,
-};
-static const unsigned short euc_to_utf8_A7[] = {
-         0x0410, 0x0411, 0x0412, 0x0413, 0x0414, 0x0415, 0x0401,
- 0x0416, 0x0417, 0x0418, 0x0419, 0x041A, 0x041B, 0x041C, 0x041D,
- 0x041E, 0x041F, 0x0420, 0x0421, 0x0422, 0x0423, 0x0424, 0x0425,
- 0x0426, 0x0427, 0x0428, 0x0429, 0x042A, 0x042B, 0x042C, 0x042D,
- 0x042E, 0x042F,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0, 0x0430, 0x0431, 0x0432, 0x0433, 0x0434, 0x0435, 0x0451,
- 0x0436, 0x0437, 0x0438, 0x0439, 0x043A, 0x043B, 0x043C, 0x043D,
- 0x043E, 0x043F, 0x0440, 0x0441, 0x0442, 0x0443, 0x0444, 0x0445,
- 0x0446, 0x0447, 0x0448, 0x0449, 0x044A, 0x044B, 0x044C, 0x044D,
- 0x044E, 0x044F,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,
-};
-static const unsigned short euc_to_utf8_A7_x0213[] = {
-         0x0410, 0x0411, 0x0412, 0x0413, 0x0414, 0x0415, 0x0401,
- 0x0416, 0x0417, 0x0418, 0x0419, 0x041A, 0x041B, 0x041C, 0x041D,
- 0x041E, 0x041F, 0x0420, 0x0421, 0x0422, 0x0423, 0x0424, 0x0425,
- 0x0426, 0x0427, 0x0428, 0x0429, 0x042A, 0x042B, 0x042C, 0x042D,
- 0x042E, 0x042F, 0x23BE, 0x23BF, 0x23C0, 0x23C1, 0x23C2, 0x23C3,
- 0x23C4, 0x23C5, 0x23C6, 0x23C7, 0x23C8, 0x23C9, 0x23CA, 0x23CB,
- 0x23CC, 0x0430, 0x0431, 0x0432, 0x0433, 0x0434, 0x0435, 0x0451,
- 0x0436, 0x0437, 0x0438, 0x0439, 0x043A, 0x043B, 0x043C, 0x043D,
- 0x043E, 0x043F, 0x0440, 0x0441, 0x0442, 0x0443, 0x0444, 0x0445,
- 0x0446, 0x0447, 0x0448, 0x0449, 0x044A, 0x044B, 0x044C, 0x044D,
- 0x044E, 0x044F, 0x30F7, 0x30F8, 0x30F9, 0x30FA, 0x22DA, 0x22DB,
- 0x2153, 0x2154, 0x2155, 0x2713, 0x2318, 0x2423, 0x23CE,
-};
-static const unsigned short euc_to_utf8_A8[] = {
-         0x2500, 0x2502, 0x250C, 0x2510, 0x2518, 0x2514, 0x251C,
- 0x252C, 0x2524, 0x2534, 0x253C, 0x2501, 0x2503, 0x250F, 0x2513,
- 0x251B, 0x2517, 0x2523, 0x2533, 0x252B, 0x253B, 0x254B, 0x2520,
- 0x252F, 0x2528, 0x2537, 0x253F, 0x251D, 0x2530, 0x2525, 0x2538,
- 0x2542,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,
-};
-static const unsigned short euc_to_utf8_A8_x0213[] = {
-         0x2500, 0x2502, 0x250C, 0x2510, 0x2518, 0x2514, 0x251C,
- 0x252C, 0x2524, 0x2534, 0x253C, 0x2501, 0x2503, 0x250F, 0x2513,
- 0x251B, 0x2517, 0x2523, 0x2533, 0x252B, 0x253B, 0x254B, 0x2520,
- 0x252F, 0x2528, 0x2537, 0x253F, 0x251D, 0x2530, 0x2525, 0x2538,
- 0x2542, 0x3251, 0x3252, 0x3253, 0x3254, 0x3255, 0x3256, 0x3257,
- 0x3258, 0x3259, 0x325A, 0x325B, 0x325C, 0x325D, 0x325E, 0x325F,
- 0x32B1, 0x32B2, 0x32B3, 0x32B4, 0x32B5, 0x32B6, 0x32B7, 0x32B8,
- 0x32B9, 0x32BA, 0x32BB, 0x32BC, 0x32BD, 0x32BE, 0x32BF,      0,
-      0,      0,      0,      0,      0,      0,      0, 0x25D0,
- 0x25D1, 0x25D2, 0x25D3, 0x203C, 0x2047, 0x2048, 0x2049, 0x01CD,
- 0x01CE, 0x01D0, 0x1E3E, 0x1E3F, 0x01F8, 0x01F9, 0x01D1, 0x01D2,
- 0x01D4, 0x01D6, 0x01D8, 0x01DA, 0x01DC,      0,      0,
-};
-static const unsigned short euc_to_utf8_A9[] = {
-         0x2460, 0x2461, 0x2462, 0x2463, 0x2464, 0x2465, 0x2466,
- 0x2467, 0x2468, 0x2469, 0x246A, 0x246B, 0x246C, 0x246D, 0x246E,
- 0x246F, 0x2470, 0x2471, 0x2472, 0x2473,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0, 0x2474,
- 0x2475, 0x2476, 0x2477, 0x2478, 0x2479, 0x247A, 0x247B, 0x247C,
- 0x247D, 0x247E, 0x247F, 0x2480, 0x2481, 0x2482, 0x2483, 0x2484,
- 0x2485, 0x2486, 0x2487,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0, 0x2776, 0x2777, 0x2778,
- 0x2779, 0x277A, 0x277B, 0x277C, 0x277D, 0x277E,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0, 0x2488, 0x2489, 0x248A, 0x248B, 0x248C, 0x248D,
- 0x248E, 0x248F, 0x2490,      0,      0,      0,      0,
-};
-static const unsigned short euc_to_utf8_A9_x0213[] = {
-         0x20AC, 0x00A0, 0x00A1, 0x00A4, 0x00A6, 0x00A9, 0x00AA,
- 0x00AB, 0x00AD, 0x00AE, 0x00AF, 0x00B2, 0x00B3, 0x00B7, 0x00B8,
- 0x00B9, 0x00BA, 0x00BB, 0x00BC, 0x00BD, 0x00BE, 0x00BF, 0x00C0,
- 0x00C1, 0x00C2, 0x00C3, 0x00C4, 0x00C5, 0x00C6, 0x00C7, 0x00C8,
- 0x00C9, 0x00CA, 0x00CB, 0x00CC, 0x00CD, 0x00CE, 0x00CF, 0x00D0,
- 0x00D1, 0x00D2, 0x00D3, 0x00D4, 0x00D5, 0x00D6, 0x00D8, 0x00D9,
- 0x00DA, 0x00DB, 0x00DC, 0x00DD, 0x00DE, 0x00DF, 0x00E0, 0x00E1,
- 0x00E2, 0x00E3, 0x00E4, 0x00E5, 0x00E6, 0x00E7, 0x00E8, 0x00E9,
- 0x00EA, 0x00EB, 0x00EC, 0x00ED, 0x00EE, 0x00EF, 0x00F0, 0x00F1,
- 0x00F2, 0x00F3, 0x00F4, 0x00F5, 0x00F6, 0x00F8, 0x00F9, 0x00FA,
- 0x00FB, 0x00FC, 0x00FD, 0x00FE, 0x00FF, 0x0100, 0x012A, 0x016A,
- 0x0112, 0x014C, 0x0101, 0x012B, 0x016B, 0x0113, 0x014D,
-};
-static const unsigned short euc_to_utf8_AA[] = {
-         0x2160, 0x2161, 0x2162, 0x2163, 0x2164, 0x2165, 0x2166,
- 0x2167, 0x2168, 0x2169, 0x216A, 0x216B,      0,      0,      0,
-      0,      0,      0,      0,      0, 0x2170, 0x2171, 0x2172,
- 0x2173, 0x2174, 0x2175, 0x2176, 0x2177, 0x2178, 0x2179, 0x217A,
- 0x217B,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0, 0x249C, 0x249D, 0x249E,
- 0x249F, 0x24A0, 0x24A1, 0x24A2, 0x24A3, 0x24A4, 0x24A5, 0x24A6,
- 0x24A7, 0x24A8, 0x24A9, 0x24AA, 0x24AB, 0x24AC, 0x24AD, 0x24AE,
- 0x24AF, 0x24B0, 0x24B1, 0x24B2, 0x24B3, 0x24B4, 0x24B5,      0,
-      0,      0,      0,      0,      0,      0,      0,
-};
-static const unsigned short euc_to_utf8_AA_x0213[] = {
-         0x0104, 0x02D8, 0x0141, 0x013D, 0x015A, 0x0160, 0x015E,
- 0x0164, 0x0179, 0x017D, 0x017B, 0x0105, 0x02DB, 0x0142, 0x013E,
- 0x015B, 0x02C7, 0x0161, 0x015F, 0x0165, 0x017A, 0x02DD, 0x017E,
- 0x017C, 0x0154, 0x0102, 0x0139, 0x0106, 0x010C, 0x0118, 0x011A,
- 0x010E, 0x0143, 0x0147, 0x0150, 0x0158, 0x016E, 0x0170, 0x0162,
- 0x0155, 0x0103, 0x013A, 0x0107, 0x010D, 0x0119, 0x011B, 0x010F,
- 0x0111, 0x0144, 0x0148, 0x0151, 0x0159, 0x016F, 0x0171, 0x0163,
- 0x02D9, 0x0108, 0x011C, 0x0124, 0x0134, 0x015C, 0x016C, 0x0109,
- 0x011D, 0x0125, 0x0135, 0x015D, 0x016D, 0x0271, 0x028B, 0x027E,
- 0x0283, 0x0292, 0x026C, 0x026E, 0x0279, 0x0288, 0x0256, 0x0273,
- 0x027D, 0x0282, 0x0290, 0x027B, 0x026D, 0x025F, 0x0272, 0x029D,
- 0x028E, 0x0261, 0x014B, 0x0270, 0x0281, 0x0127, 0x0295,
-};
-static const unsigned short euc_to_utf8_AB[] = {
-         0x339C, 0x339F, 0x339D, 0x33A0, 0x33A4,      0, 0x33A1,
- 0x33A5, 0x339E, 0x33A2, 0x338E,      0, 0x338F, 0x33C4, 0x3396,
- 0x3397, 0x2113, 0x3398, 0x33B3, 0x33B2, 0x33B1, 0x33B0, 0x2109,
- 0x33D4, 0x33CB, 0x3390, 0x3385, 0x3386, 0x3387,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0, 0x2116, 0x33CD, 0x2121,      0,
-};
-static const unsigned short euc_to_utf8_AB_x0213[] = {
-         0x0294, 0x0266, 0x0298, 0x01C2, 0x0253, 0x0257, 0x0284,
- 0x0260, 0x0193, 0x0153, 0x0152, 0x0268, 0x0289, 0x0258, 0x0275,
- 0x0259, 0x025C, 0x025E, 0x0250, 0x026F, 0x028A, 0x0264, 0x028C,
- 0x0254, 0x0251, 0x0252, 0x028D, 0x0265, 0x02A2, 0x02A1, 0x0255,
- 0x0291, 0x027A, 0x0267, 0x025A, /*0x00E6*/ 0x0300, 0x01FD, 0x1F70, 0x1F71,
- /*0x0254*/ 0x0300, /*0x0254*/ 0x0301, /*0x028C*/ 0x0300, /*0x028C*/ 0x0301, /*0x0259*/ 0x0300, /*0x0259*/ 0x0301, /*0x025A*/ 0x0300, /*0x025A*/ 0x0301,
- 0x1F72, 0x1F73, 0x0361, 0x02C8, 0x02CC, 0x02D0, 0x02D1, 0x0306,
- 0x203F, 0x030B, /*0*/ 0x0301, 0x0304, /*0*/ 0x0300, 0x030F, 0x030C, 0x0302,
- /*0*/ 0x02E5, 0x02E6, 0x02E7, 0x02E8, /*0*/ 0x02E9, /*0x02E9*/ 0x02E5, /*0x02E5*/ 0x02E9, 0x0325,
- 0x032C, 0x0339, 0x031C, 0x031F, 0x0320, 0x0308, 0x033D, 0x0329,
- 0x032F, 0x02DE, 0x0324, 0x0330, 0x033C, 0x0334, 0x031D, 0x031E,
- 0x0318, 0x0319, 0x032A, 0x033A, 0x033B, 0x0303, 0x031A,
-};
-static const unsigned short euc_to_utf8_AC[] = {
-         0x2664, 0x2667, 0x2661, 0x2662, 0x2660, 0x2663, 0x2665,
- 0x2666,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0, 0x3020, 0x260E, 0x3004,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0, 0x261E, 0x261C, 0x261D, 0x261F, 0x21C6, 0x21C4, 0x21C5,
-      0, 0x21E8, 0x21E6, 0x21E7, 0x21E9,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,
-};
-static const unsigned short euc_to_utf8_AC_mac[] = {
-         0x2664, 0x2667, 0x2661, 0x2662, 0x2660, 0x2663, 0x2665,
- 0x2666,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0, 0x3020, 0x260E, 0x3004,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0, 0x261E, 0x261C, 0x261D, 0x261F, 0x21C6, 0x21C4, 0x21C5,
-      0, 0x21E8, 0x21E6, 0x21E7, 0x21E9, 0x2192, 0x2190, 0x2191,
- 0x2193,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,
-};
-static const unsigned short euc_to_utf8_AC_x0213[] = {
-         0x2776, 0x2777, 0x2778, 0x2779, 0x277A, 0x277B, 0x277C,
- 0x277D, 0x277E, 0x277F, 0x24EB, 0x24EC, 0x24ED, 0x24EE, 0x24EF,
- 0x24F0, 0x24F1, 0x24F2, 0x24F3, 0x24F4, 0x2170, 0x2171, 0x2172,
- 0x2173, 0x2174, 0x2175, 0x2176, 0x2177, 0x2178, 0x2179, 0x217A,
- 0x217B, 0x24D0, 0x24D1, 0x24D2, 0x24D3, 0x24D4, 0x24D5, 0x24D6,
- 0x24D7, 0x24D8, 0x24D9, 0x24DA, 0x24DB, 0x24DC, 0x24DD, 0x24DE,
- 0x24DF, 0x24E0, 0x24E1, 0x24E2, 0x24E3, 0x24E4, 0x24E5, 0x24E6,
- 0x24E7, 0x24E8, 0x24E9, 0x32D0, 0x32D1, 0x32D2, 0x32D3, 0x32D4,
- 0x32D5, 0x32D6, 0x32D7, 0x32D8, 0x32D9, 0x32DA, 0x32DB, 0x32DC,
- 0x32DD, 0x32DE, 0x32DF, 0x32E0, 0x32E1, 0x32E2, 0x32E3, 0x32FA,
- 0x32E9, 0x32E5, 0x32ED, 0x32EC,      0,      0,      0,      0,
-      0,      0,      0,      0,      0, 0x2051, 0x2042,
-};
-static const unsigned short euc_to_utf8_AD[] = {
-         0x2460, 0x2461, 0x2462, 0x2463, 0x2464, 0x2465, 0x2466,
- 0x2467, 0x2468, 0x2469, 0x246A, 0x246B, 0x246C, 0x246D, 0x246E,
- 0x246F, 0x2470, 0x2471, 0x2472, 0x2473, 0x2160, 0x2161, 0x2162,
- 0x2163, 0x2164, 0x2165, 0x2166, 0x2167, 0x2168, 0x2169,      0,
- 0x3349, 0x3314, 0x3322, 0x334D, 0x3318, 0x3327, 0x3303, 0x3336,
- 0x3351, 0x3357, 0x330D, 0x3326, 0x3323, 0x332B, 0x334A, 0x333B,
- 0x339C, 0x339D, 0x339E, 0x338E, 0x338F, 0x33C4, 0x33A1,      0,
-      0,      0,      0,      0,      0,      0,      0, 0x337B,
- 0x301D, 0x301F, 0x2116, 0x33CD, 0x2121, 0x32A4, 0x32A5, 0x32A6,
- 0x32A7, 0x32A8, 0x3231, 0x3232, 0x3239, 0x337E, 0x337D, 0x337C,
- 0x2252, 0x2261, 0x222B, 0x222E, 0x2211, 0x221A, 0x22A5, 0x2220,
- 0x221F, 0x22BF, 0x2235, 0x2229, 0x222A,      0, 0x3299,
-};
-static const unsigned short euc_to_utf8_AD_mac[] = {
-         0x65E5, 0x6708, 0x706B, 0x6C34, 0x6728, 0x91D1, 0x571F,
- 0x796D, 0x795D, 0x81EA, 0x81F3, 0x3239, 0x547C, 0x3231, 0x8CC7,
- 0x540D, 0x3232, 0x5B66, 0x8CA1, 0x793E, 0x7279, 0x76E3, 0x4F01,
- 0x5354, 0x52B4, 0x2165, 0x2166, 0x2167, 0x2168, 0x2169,      0,
- 0x3349, 0x3314, 0x3322, 0x334D, 0x3318, 0x3327, 0x3303, 0x3336,
- 0x3351, 0x3357, 0x330D, 0x3326, 0x3323, 0x332B, 0x334A, 0x333B,
- 0x339C, 0x339D, 0x339E, 0x338E, 0x338F, 0x33C4, 0x33A1,      0,
-      0,      0,      0,      0,      0,      0,      0, 0x337B,
- 0x301D, 0x301F, 0x2116, 0x33CD, 0x2121, 0x32A4, 0x32A5, 0x32A6,
- 0x32A7, 0x32A8, 0x3231, 0x3232, 0x3239, 0x337E, 0x337D, 0x337C,
- 0x2252, 0x5927, 0x5C0F, 0x32A4, 0x32A5, 0x32A6, 0x32A7, 0x32A8,
- 0x533B, 0x8CA1, 0x512A, 0x52B4, 0x5370, 0x63A7, 0x79D8,
-};
-static const unsigned short euc_to_utf8_AD_x0213[] = {
-         0x2460, 0x2461, 0x2462, 0x2463, 0x2464, 0x2465, 0x2466,
- 0x2467, 0x2468, 0x2469, 0x246A, 0x246B, 0x246C, 0x246D, 0x246E,
- 0x246F, 0x2470, 0x2471, 0x2472, 0x2473, 0x2160, 0x2161, 0x2162,
- 0x2163, 0x2164, 0x2165, 0x2166, 0x2167, 0x2168, 0x2169, 0x216A,
- 0x3349, 0x3314, 0x3322, 0x334D, 0x3318, 0x3327, 0x3303, 0x3336,
- 0x3351, 0x3357, 0x330D, 0x3326, 0x3323, 0x332B, 0x334A, 0x333B,
- 0x339C, 0x339D, 0x339E, 0x338E, 0x338F, 0x33C4, 0x33A1, 0x216B,
-      0,      0,      0,      0,      0,      0,      0, 0x337B,
- 0x301D, 0x301F, 0x2116, 0x33CD, 0x2121, 0x32A4, 0x32A5, 0x32A6,
- 0x32A7, 0x32A8, 0x3231, 0x3232, 0x3239, 0x337E, 0x337D, 0x337C,
- 0x2252, 0x2261, 0x222B, 0x222E, 0x2211, 0x221A, 0x22A5, 0x2220,
- 0x221F, 0x22BF, 0x2235, 0x2229, 0x222A, 0x2756, 0x261E,
-};
-static const unsigned short euc_to_utf8_AE[] = {
-         0x3349, 0x3322, 0x334D, 0x3314, 0x3316, 0x3305, 0x3333,
- 0x334E, 0x3303, 0x3336, 0x3318, 0x3315, 0x3327, 0x3351, 0x334A,
- 0x3339, 0x3357, 0x330D, 0x3342, 0x3323, 0x3326, 0x333B, 0x332B,
-      0,      0,      0,      0,      0,      0,      0, 0x3300,
- 0x331E, 0x332A, 0x3331, 0x3347,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0, 0x337E,
- 0x337D, 0x337C, 0x337B,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0, 0x337F,      0,      0,
-};
-static const unsigned short euc_to_utf8_AE_x0213[] = {
-         0x4FF1, 0xD840 /*0xDC0B*/, 0x3402, 0x4E28, 0x4E2F, 0x4E30, 0x4E8D,
- 0x4EE1, 0x4EFD, 0x4EFF, 0x4F03, 0x4F0B, 0x4F60, 0x4F48, 0x4F49,
- 0x4F56, 0x4F5F, 0x4F6A, 0x4F6C, 0x4F7E, 0x4F8A, 0x4F94, 0x4F97,
- 0xFA30, 0x4FC9, 0x4FE0, 0x5001, 0x5002, 0x500E, 0x5018, 0x5027,
- 0x502E, 0x5040, 0x503B, 0x5041, 0x5094, 0x50CC, 0x50F2, 0x50D0,
- 0x50E6, 0xFA31, 0x5106, 0x5103, 0x510B, 0x511E, 0x5135, 0x514A,
- 0xFA32, 0x5155, 0x5157, 0x34B5, 0x519D, 0x51C3, 0x51CA, 0x51DE,
- 0x51E2, 0x51EE, 0x5201, 0x34DB, 0x5213, 0x5215, 0x5249, 0x5257,
- 0x5261, 0x5293, 0x52C8, 0xFA33, 0x52CC, 0x52D0, 0x52D6, 0x52DB,
- 0xFA34, 0x52F0, 0x52FB, 0x5300, 0x5307, 0x531C, 0xFA35, 0x5361,
- 0x5363, 0x537D, 0x5393, 0x539D, 0x53B2, 0x5412, 0x5427, 0x544D,
- 0x549C, 0x546B, 0x5474, 0x547F, 0x5488, 0x5496, 0x54A1,
-};
-static const unsigned short euc_to_utf8_AF[] = {
-         0x222E, 0x221F, 0x22BF,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0, 0x301D, 0x301F,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0, 0x3094,      0, 0x30F7, 0x30F8, 0x30F9, 0x30FA,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,
-};
-static const unsigned short euc_to_utf8_AF_x0213[] = {
-         0x54A9, 0x54C6, 0x54FF, 0x550E, 0x552B, 0x5535, 0x5550,
- 0x555E, 0x5581, 0x5586, 0x558E, 0xFA36, 0x55AD, 0x55CE, 0xFA37,
- 0x5608, 0x560E, 0x563B, 0x5649, 0x5676, 0x5666, 0xFA38, 0x566F,
- 0x5671, 0x5672, 0x5699, 0x569E, 0x56A9, 0x56AC, 0x56B3, 0x56C9,
- 0x56CA, 0x570A, 0xD844 /*0xDE3D*/, 0x5721, 0x572F, 0x5733, 0x5734, 0x5770,
- 0x5777, 0x577C, 0x579C, 0xFA0F, 0xD844 /*0xDF1B*/, 0x57B8, 0x57C7, 0x57C8,
- 0x57CF, 0x57E4, 0x57ED, 0x57F5, 0x57F6, 0x57FF, 0x5809, 0xFA10,
- 0x5861, 0x5864, 0xFA39, 0x587C, 0x5889, 0x589E, 0xFA3A, 0x58A9,
- 0xD845 /*0xDC6E*/, 0x58D2, 0x58CE, 0x58D4, 0x58DA, 0x58E0, 0x58E9, 0x590C,
- 0x8641, 0x595D, 0x596D, 0x598B, 0x5992, 0x59A4, 0x59C3, 0x59D2,
- 0x59DD, 0x5A13, 0x5A23, 0x5A67, 0x5A6D, 0x5A77, 0x5A7E, 0x5A84,
- 0x5A9E, 0x5AA7, 0x5AC4, 0xD846 /*0xDCBD*/, 0x5B19, 0x5B25, 0x525D,
-};
-static const unsigned short euc_to_utf8_B0[] = {
-         0x4E9C, 0x5516, 0x5A03, 0x963F, 0x54C0, 0x611B, 0x6328,
- 0x59F6, 0x9022, 0x8475, 0x831C, 0x7A50, 0x60AA, 0x63E1, 0x6E25,
- 0x65ED, 0x8466, 0x82A6, 0x9BF5, 0x6893, 0x5727, 0x65A1, 0x6271,
- 0x5B9B, 0x59D0, 0x867B, 0x98F4, 0x7D62, 0x7DBE, 0x9B8E, 0x6216,
- 0x7C9F, 0x88B7, 0x5B89, 0x5EB5, 0x6309, 0x6697, 0x6848, 0x95C7,
- 0x978D, 0x674F, 0x4EE5, 0x4F0A, 0x4F4D, 0x4F9D, 0x5049, 0x56F2,
- 0x5937, 0x59D4, 0x5A01, 0x5C09, 0x60DF, 0x610F, 0x6170, 0x6613,
- 0x6905, 0x70BA, 0x754F, 0x7570, 0x79FB, 0x7DAD, 0x7DEF, 0x80C3,
- 0x840E, 0x8863, 0x8B02, 0x9055, 0x907A, 0x533B, 0x4E95, 0x4EA5,
- 0x57DF, 0x80B2, 0x90C1, 0x78EF, 0x4E00, 0x58F1, 0x6EA2, 0x9038,
- 0x7A32, 0x8328, 0x828B, 0x9C2F, 0x5141, 0x5370, 0x54BD, 0x54E1,
- 0x56E0, 0x59FB, 0x5F15, 0x98F2, 0x6DEB, 0x80E4, 0x852D,
-};
-static const unsigned short euc_to_utf8_B1[] = {
-         0x9662, 0x9670, 0x96A0, 0x97FB, 0x540B, 0x53F3, 0x5B87,
- 0x70CF, 0x7FBD, 0x8FC2, 0x96E8, 0x536F, 0x9D5C, 0x7ABA, 0x4E11,
- 0x7893, 0x81FC, 0x6E26, 0x5618, 0x5504, 0x6B1D, 0x851A, 0x9C3B,
- 0x59E5, 0x53A9, 0x6D66, 0x74DC, 0x958F, 0x5642, 0x4E91, 0x904B,
- 0x96F2, 0x834F, 0x990C, 0x53E1, 0x55B6, 0x5B30, 0x5F71, 0x6620,
- 0x66F3, 0x6804, 0x6C38, 0x6CF3, 0x6D29, 0x745B, 0x76C8, 0x7A4E,
- 0x9834, 0x82F1, 0x885B, 0x8A60, 0x92ED, 0x6DB2, 0x75AB, 0x76CA,
- 0x99C5, 0x60A6, 0x8B01, 0x8D8A, 0x95B2, 0x698E, 0x53AD, 0x5186,
- 0x5712, 0x5830, 0x5944, 0x5BB4, 0x5EF6, 0x6028, 0x63A9, 0x63F4,
- 0x6CBF, 0x6F14, 0x708E, 0x7114, 0x7159, 0x71D5, 0x733F, 0x7E01,
- 0x8276, 0x82D1, 0x8597, 0x9060, 0x925B, 0x9D1B, 0x5869, 0x65BC,
- 0x6C5A, 0x7525, 0x51F9, 0x592E, 0x5965, 0x5F80, 0x5FDC,
-};
-static const unsigned short euc_to_utf8_B2[] = {
-         0x62BC, 0x65FA, 0x6A2A, 0x6B27, 0x6BB4, 0x738B, 0x7FC1,
- 0x8956, 0x9D2C, 0x9D0E, 0x9EC4, 0x5CA1, 0x6C96, 0x837B, 0x5104,
- 0x5C4B, 0x61B6, 0x81C6, 0x6876, 0x7261, 0x4E59, 0x4FFA, 0x5378,
- 0x6069, 0x6E29, 0x7A4F, 0x97F3, 0x4E0B, 0x5316, 0x4EEE, 0x4F55,
- 0x4F3D, 0x4FA1, 0x4F73, 0x52A0, 0x53EF, 0x5609, 0x590F, 0x5AC1,
- 0x5BB6, 0x5BE1, 0x79D1, 0x6687, 0x679C, 0x67B6, 0x6B4C, 0x6CB3,
- 0x706B, 0x73C2, 0x798D, 0x79BE, 0x7A3C, 0x7B87, 0x82B1, 0x82DB,
- 0x8304, 0x8377, 0x83EF, 0x83D3, 0x8766, 0x8AB2, 0x5629, 0x8CA8,
- 0x8FE6, 0x904E, 0x971E, 0x868A, 0x4FC4, 0x5CE8, 0x6211, 0x7259,
- 0x753B, 0x81E5, 0x82BD, 0x86FE, 0x8CC0, 0x96C5, 0x9913, 0x99D5,
- 0x4ECB, 0x4F1A, 0x89E3, 0x56DE, 0x584A, 0x58CA, 0x5EFB, 0x5FEB,
- 0x602A, 0x6094, 0x6062, 0x61D0, 0x6212, 0x62D0, 0x6539,
-};
-static const unsigned short euc_to_utf8_B3[] = {
-         0x9B41, 0x6666, 0x68B0, 0x6D77, 0x7070, 0x754C, 0x7686,
- 0x7D75, 0x82A5, 0x87F9, 0x958B, 0x968E, 0x8C9D, 0x51F1, 0x52BE,
- 0x5916, 0x54B3, 0x5BB3, 0x5D16, 0x6168, 0x6982, 0x6DAF, 0x788D,
- 0x84CB, 0x8857, 0x8A72, 0x93A7, 0x9AB8, 0x6D6C, 0x99A8, 0x86D9,
- 0x57A3, 0x67FF, 0x86CE, 0x920E, 0x5283, 0x5687, 0x5404, 0x5ED3,
- 0x62E1, 0x64B9, 0x683C, 0x6838, 0x6BBB, 0x7372, 0x78BA, 0x7A6B,
- 0x899A, 0x89D2, 0x8D6B, 0x8F03, 0x90ED, 0x95A3, 0x9694, 0x9769,
- 0x5B66, 0x5CB3, 0x697D, 0x984D, 0x984E, 0x639B, 0x7B20, 0x6A2B,
- 0x6A7F, 0x68B6, 0x9C0D, 0x6F5F, 0x5272, 0x559D, 0x6070, 0x62EC,
- 0x6D3B, 0x6E07, 0x6ED1, 0x845B, 0x8910, 0x8F44, 0x4E14, 0x9C39,
- 0x53F6, 0x691B, 0x6A3A, 0x9784, 0x682A, 0x515C, 0x7AC3, 0x84B2,
- 0x91DC, 0x938C, 0x565B, 0x9D28, 0x6822, 0x8305, 0x8431,
-};
-static const unsigned short euc_to_utf8_B4[] = {
-         0x7CA5, 0x5208, 0x82C5, 0x74E6, 0x4E7E, 0x4F83, 0x51A0,
- 0x5BD2, 0x520A, 0x52D8, 0x52E7, 0x5DFB, 0x559A, 0x582A, 0x59E6,
- 0x5B8C, 0x5B98, 0x5BDB, 0x5E72, 0x5E79, 0x60A3, 0x611F, 0x6163,
- 0x61BE, 0x63DB, 0x6562, 0x67D1, 0x6853, 0x68FA, 0x6B3E, 0x6B53,
- 0x6C57, 0x6F22, 0x6F97, 0x6F45, 0x74B0, 0x7518, 0x76E3, 0x770B,
- 0x7AFF, 0x7BA1, 0x7C21, 0x7DE9, 0x7F36, 0x7FF0, 0x809D, 0x8266,
- 0x839E, 0x89B3, 0x8ACC, 0x8CAB, 0x9084, 0x9451, 0x9593, 0x9591,
- 0x95A2, 0x9665, 0x97D3, 0x9928, 0x8218, 0x4E38, 0x542B, 0x5CB8,
- 0x5DCC, 0x73A9, 0x764C, 0x773C, 0x5CA9, 0x7FEB, 0x8D0B, 0x96C1,
- 0x9811, 0x9854, 0x9858, 0x4F01, 0x4F0E, 0x5371, 0x559C, 0x5668,
- 0x57FA, 0x5947, 0x5B09, 0x5BC4, 0x5C90, 0x5E0C, 0x5E7E, 0x5FCC,
- 0x63EE, 0x673A, 0x65D7, 0x65E2, 0x671F, 0x68CB, 0x68C4,
-};
-static const unsigned short euc_to_utf8_B5[] = {
-         0x6A5F, 0x5E30, 0x6BC5, 0x6C17, 0x6C7D, 0x757F, 0x7948,
- 0x5B63, 0x7A00, 0x7D00, 0x5FBD, 0x898F, 0x8A18, 0x8CB4, 0x8D77,
- 0x8ECC, 0x8F1D, 0x98E2, 0x9A0E, 0x9B3C, 0x4E80, 0x507D, 0x5100,
- 0x5993, 0x5B9C, 0x622F, 0x6280, 0x64EC, 0x6B3A, 0x72A0, 0x7591,
- 0x7947, 0x7FA9, 0x87FB, 0x8ABC, 0x8B70, 0x63AC, 0x83CA, 0x97A0,
- 0x5409, 0x5403, 0x55AB, 0x6854, 0x6A58, 0x8A70, 0x7827, 0x6775,
- 0x9ECD, 0x5374, 0x5BA2, 0x811A, 0x8650, 0x9006, 0x4E18, 0x4E45,
- 0x4EC7, 0x4F11, 0x53CA, 0x5438, 0x5BAE, 0x5F13, 0x6025, 0x6551,
- 0x673D, 0x6C42, 0x6C72, 0x6CE3, 0x7078, 0x7403, 0x7A76, 0x7AAE,
- 0x7B08, 0x7D1A, 0x7CFE, 0x7D66, 0x65E7, 0x725B, 0x53BB, 0x5C45,
- 0x5DE8, 0x62D2, 0x62E0, 0x6319, 0x6E20, 0x865A, 0x8A31, 0x8DDD,
- 0x92F8, 0x6F01, 0x79A6, 0x9B5A, 0x4EA8, 0x4EAB, 0x4EAC,
-};
-static const unsigned short euc_to_utf8_B6[] = {
-         0x4F9B, 0x4FA0, 0x50D1, 0x5147, 0x7AF6, 0x5171, 0x51F6,
- 0x5354, 0x5321, 0x537F, 0x53EB, 0x55AC, 0x5883, 0x5CE1, 0x5F37,
- 0x5F4A, 0x602F, 0x6050, 0x606D, 0x631F, 0x6559, 0x6A4B, 0x6CC1,
- 0x72C2, 0x72ED, 0x77EF, 0x80F8, 0x8105, 0x8208, 0x854E, 0x90F7,
- 0x93E1, 0x97FF, 0x9957, 0x9A5A, 0x4EF0, 0x51DD, 0x5C2D, 0x6681,
- 0x696D, 0x5C40, 0x66F2, 0x6975, 0x7389, 0x6850, 0x7C81, 0x50C5,
- 0x52E4, 0x5747, 0x5DFE, 0x9326, 0x65A4, 0x6B23, 0x6B3D, 0x7434,
- 0x7981, 0x79BD, 0x7B4B, 0x7DCA, 0x82B9, 0x83CC, 0x887F, 0x895F,
- 0x8B39, 0x8FD1, 0x91D1, 0x541F, 0x9280, 0x4E5D, 0x5036, 0x53E5,
- 0x533A, 0x72D7, 0x7396, 0x77E9, 0x82E6, 0x8EAF, 0x99C6, 0x99C8,
- 0x99D2, 0x5177, 0x611A, 0x865E, 0x55B0, 0x7A7A, 0x5076, 0x5BD3,
- 0x9047, 0x9685, 0x4E32, 0x6ADB, 0x91E7, 0x5C51, 0x5C48,
-};
-static const unsigned short euc_to_utf8_B7[] = {
-         0x6398, 0x7A9F, 0x6C93, 0x9774, 0x8F61, 0x7AAA, 0x718A,
- 0x9688, 0x7C82, 0x6817, 0x7E70, 0x6851, 0x936C, 0x52F2, 0x541B,
- 0x85AB, 0x8A13, 0x7FA4, 0x8ECD, 0x90E1, 0x5366, 0x8888, 0x7941,
- 0x4FC2, 0x50BE, 0x5211, 0x5144, 0x5553, 0x572D, 0x73EA, 0x578B,
- 0x5951, 0x5F62, 0x5F84, 0x6075, 0x6176, 0x6167, 0x61A9, 0x63B2,
- 0x643A, 0x656C, 0x666F, 0x6842, 0x6E13, 0x7566, 0x7A3D, 0x7CFB,
- 0x7D4C, 0x7D99, 0x7E4B, 0x7F6B, 0x830E, 0x834A, 0x86CD, 0x8A08,
- 0x8A63, 0x8B66, 0x8EFD, 0x981A, 0x9D8F, 0x82B8, 0x8FCE, 0x9BE8,
- 0x5287, 0x621F, 0x6483, 0x6FC0, 0x9699, 0x6841, 0x5091, 0x6B20,
- 0x6C7A, 0x6F54, 0x7A74, 0x7D50, 0x8840, 0x8A23, 0x6708, 0x4EF6,
- 0x5039, 0x5026, 0x5065, 0x517C, 0x5238, 0x5263, 0x55A7, 0x570F,
- 0x5805, 0x5ACC, 0x5EFA, 0x61B2, 0x61F8, 0x62F3, 0x6372,
-};
-static const unsigned short euc_to_utf8_B8[] = {
-         0x691C, 0x6A29, 0x727D, 0x72AC, 0x732E, 0x7814, 0x786F,
- 0x7D79, 0x770C, 0x80A9, 0x898B, 0x8B19, 0x8CE2, 0x8ED2, 0x9063,
- 0x9375, 0x967A, 0x9855, 0x9A13, 0x9E78, 0x5143, 0x539F, 0x53B3,
- 0x5E7B, 0x5F26, 0x6E1B, 0x6E90, 0x7384, 0x73FE, 0x7D43, 0x8237,
- 0x8A00, 0x8AFA, 0x9650, 0x4E4E, 0x500B, 0x53E4, 0x547C, 0x56FA,
- 0x59D1, 0x5B64, 0x5DF1, 0x5EAB, 0x5F27, 0x6238, 0x6545, 0x67AF,
- 0x6E56, 0x72D0, 0x7CCA, 0x88B4, 0x80A1, 0x80E1, 0x83F0, 0x864E,
- 0x8A87, 0x8DE8, 0x9237, 0x96C7, 0x9867, 0x9F13, 0x4E94, 0x4E92,
- 0x4F0D, 0x5348, 0x5449, 0x543E, 0x5A2F, 0x5F8C, 0x5FA1, 0x609F,
- 0x68A7, 0x6A8E, 0x745A, 0x7881, 0x8A9E, 0x8AA4, 0x8B77, 0x9190,
- 0x4E5E, 0x9BC9, 0x4EA4, 0x4F7C, 0x4FAF, 0x5019, 0x5016, 0x5149,
- 0x516C, 0x529F, 0x52B9, 0x52FE, 0x539A, 0x53E3, 0x5411,
-};
-static const unsigned short euc_to_utf8_B9[] = {
-         0x540E, 0x5589, 0x5751, 0x57A2, 0x597D, 0x5B54, 0x5B5D,
- 0x5B8F, 0x5DE5, 0x5DE7, 0x5DF7, 0x5E78, 0x5E83, 0x5E9A, 0x5EB7,
- 0x5F18, 0x6052, 0x614C, 0x6297, 0x62D8, 0x63A7, 0x653B, 0x6602,
- 0x6643, 0x66F4, 0x676D, 0x6821, 0x6897, 0x69CB, 0x6C5F, 0x6D2A,
- 0x6D69, 0x6E2F, 0x6E9D, 0x7532, 0x7687, 0x786C, 0x7A3F, 0x7CE0,
- 0x7D05, 0x7D18, 0x7D5E, 0x7DB1, 0x8015, 0x8003, 0x80AF, 0x80B1,
- 0x8154, 0x818F, 0x822A, 0x8352, 0x884C, 0x8861, 0x8B1B, 0x8CA2,
- 0x8CFC, 0x90CA, 0x9175, 0x9271, 0x783F, 0x92FC, 0x95A4, 0x964D,
- 0x9805, 0x9999, 0x9AD8, 0x9D3B, 0x525B, 0x52AB, 0x53F7, 0x5408,
- 0x58D5, 0x62F7, 0x6FE0, 0x8C6A, 0x8F5F, 0x9EB9, 0x514B, 0x523B,
- 0x544A, 0x56FD, 0x7A40, 0x9177, 0x9D60, 0x9ED2, 0x7344, 0x6F09,
- 0x8170, 0x7511, 0x5FFD, 0x60DA, 0x9AA8, 0x72DB, 0x8FBC,
-};
-static const unsigned short euc_to_utf8_BA[] = {
-         0x6B64, 0x9803, 0x4ECA, 0x56F0, 0x5764, 0x58BE, 0x5A5A,
- 0x6068, 0x61C7, 0x660F, 0x6606, 0x6839, 0x68B1, 0x6DF7, 0x75D5,
- 0x7D3A, 0x826E, 0x9B42, 0x4E9B, 0x4F50, 0x53C9, 0x5506, 0x5D6F,
- 0x5DE6, 0x5DEE, 0x67FB, 0x6C99, 0x7473, 0x7802, 0x8A50, 0x9396,
- 0x88DF, 0x5750, 0x5EA7, 0x632B, 0x50B5, 0x50AC, 0x518D, 0x6700,
- 0x54C9, 0x585E, 0x59BB, 0x5BB0, 0x5F69, 0x624D, 0x63A1, 0x683D,
- 0x6B73, 0x6E08, 0x707D, 0x91C7, 0x7280, 0x7815, 0x7826, 0x796D,
- 0x658E, 0x7D30, 0x83DC, 0x88C1, 0x8F09, 0x969B, 0x5264, 0x5728,
- 0x6750, 0x7F6A, 0x8CA1, 0x51B4, 0x5742, 0x962A, 0x583A, 0x698A,
- 0x80B4, 0x54B2, 0x5D0E, 0x57FC, 0x7895, 0x9DFA, 0x4F5C, 0x524A,
- 0x548B, 0x643E, 0x6628, 0x6714, 0x67F5, 0x7A84, 0x7B56, 0x7D22,
- 0x932F, 0x685C, 0x9BAD, 0x7B39, 0x5319, 0x518A, 0x5237,
-};
-static const unsigned short euc_to_utf8_BB[] = {
-         0x5BDF, 0x62F6, 0x64AE, 0x64E6, 0x672D, 0x6BBA, 0x85A9,
- 0x96D1, 0x7690, 0x9BD6, 0x634C, 0x9306, 0x9BAB, 0x76BF, 0x6652,
- 0x4E09, 0x5098, 0x53C2, 0x5C71, 0x60E8, 0x6492, 0x6563, 0x685F,
- 0x71E6, 0x73CA, 0x7523, 0x7B97, 0x7E82, 0x8695, 0x8B83, 0x8CDB,
- 0x9178, 0x9910, 0x65AC, 0x66AB, 0x6B8B, 0x4ED5, 0x4ED4, 0x4F3A,
- 0x4F7F, 0x523A, 0x53F8, 0x53F2, 0x55E3, 0x56DB, 0x58EB, 0x59CB,
- 0x59C9, 0x59FF, 0x5B50, 0x5C4D, 0x5E02, 0x5E2B, 0x5FD7, 0x601D,
- 0x6307, 0x652F, 0x5B5C, 0x65AF, 0x65BD, 0x65E8, 0x679D, 0x6B62,
- 0x6B7B, 0x6C0F, 0x7345, 0x7949, 0x79C1, 0x7CF8, 0x7D19, 0x7D2B,
- 0x80A2, 0x8102, 0x81F3, 0x8996, 0x8A5E, 0x8A69, 0x8A66, 0x8A8C,
- 0x8AEE, 0x8CC7, 0x8CDC, 0x96CC, 0x98FC, 0x6B6F, 0x4E8B, 0x4F3C,
- 0x4F8D, 0x5150, 0x5B57, 0x5BFA, 0x6148, 0x6301, 0x6642,
-};
-static const unsigned short euc_to_utf8_BC[] = {
-         0x6B21, 0x6ECB, 0x6CBB, 0x723E, 0x74BD, 0x75D4, 0x78C1,
- 0x793A, 0x800C, 0x8033, 0x81EA, 0x8494, 0x8F9E, 0x6C50, 0x9E7F,
- 0x5F0F, 0x8B58, 0x9D2B, 0x7AFA, 0x8EF8, 0x5B8D, 0x96EB, 0x4E03,
- 0x53F1, 0x57F7, 0x5931, 0x5AC9, 0x5BA4, 0x6089, 0x6E7F, 0x6F06,
- 0x75BE, 0x8CEA, 0x5B9F, 0x8500, 0x7BE0, 0x5072, 0x67F4, 0x829D,
- 0x5C61, 0x854A, 0x7E1E, 0x820E, 0x5199, 0x5C04, 0x6368, 0x8D66,
- 0x659C, 0x716E, 0x793E, 0x7D17, 0x8005, 0x8B1D, 0x8ECA, 0x906E,
- 0x86C7, 0x90AA, 0x501F, 0x52FA, 0x5C3A, 0x6753, 0x707C, 0x7235,
- 0x914C, 0x91C8, 0x932B, 0x82E5, 0x5BC2, 0x5F31, 0x60F9, 0x4E3B,
- 0x53D6, 0x5B88, 0x624B, 0x6731, 0x6B8A, 0x72E9, 0x73E0, 0x7A2E,
- 0x816B, 0x8DA3, 0x9152, 0x9996, 0x5112, 0x53D7, 0x546A, 0x5BFF,
- 0x6388, 0x6A39, 0x7DAC, 0x9700, 0x56DA, 0x53CE, 0x5468,
-};
-static const unsigned short euc_to_utf8_BD[] = {
-         0x5B97, 0x5C31, 0x5DDE, 0x4FEE, 0x6101, 0x62FE, 0x6D32,
- 0x79C0, 0x79CB, 0x7D42, 0x7E4D, 0x7FD2, 0x81ED, 0x821F, 0x8490,
- 0x8846, 0x8972, 0x8B90, 0x8E74, 0x8F2F, 0x9031, 0x914B, 0x916C,
- 0x96C6, 0x919C, 0x4EC0, 0x4F4F, 0x5145, 0x5341, 0x5F93, 0x620E,
- 0x67D4, 0x6C41, 0x6E0B, 0x7363, 0x7E26, 0x91CD, 0x9283, 0x53D4,
- 0x5919, 0x5BBF, 0x6DD1, 0x795D, 0x7E2E, 0x7C9B, 0x587E, 0x719F,
- 0x51FA, 0x8853, 0x8FF0, 0x4FCA, 0x5CFB, 0x6625, 0x77AC, 0x7AE3,
- 0x821C, 0x99FF, 0x51C6, 0x5FAA, 0x65EC, 0x696F, 0x6B89, 0x6DF3,
- 0x6E96, 0x6F64, 0x76FE, 0x7D14, 0x5DE1, 0x9075, 0x9187, 0x9806,
- 0x51E6, 0x521D, 0x6240, 0x6691, 0x66D9, 0x6E1A, 0x5EB6, 0x7DD2,
- 0x7F72, 0x66F8, 0x85AF, 0x85F7, 0x8AF8, 0x52A9, 0x53D9, 0x5973,
- 0x5E8F, 0x5F90, 0x6055, 0x92E4, 0x9664, 0x50B7, 0x511F,
-};
-static const unsigned short euc_to_utf8_BE[] = {
-         0x52DD, 0x5320, 0x5347, 0x53EC, 0x54E8, 0x5546, 0x5531,
- 0x5617, 0x5968, 0x59BE, 0x5A3C, 0x5BB5, 0x5C06, 0x5C0F, 0x5C11,
- 0x5C1A, 0x5E84, 0x5E8A, 0x5EE0, 0x5F70, 0x627F, 0x6284, 0x62DB,
- 0x638C, 0x6377, 0x6607, 0x660C, 0x662D, 0x6676, 0x677E, 0x68A2,
- 0x6A1F, 0x6A35, 0x6CBC, 0x6D88, 0x6E09, 0x6E58, 0x713C, 0x7126,
- 0x7167, 0x75C7, 0x7701, 0x785D, 0x7901, 0x7965, 0x79F0, 0x7AE0,
- 0x7B11, 0x7CA7, 0x7D39, 0x8096, 0x83D6, 0x848B, 0x8549, 0x885D,
- 0x88F3, 0x8A1F, 0x8A3C, 0x8A54, 0x8A73, 0x8C61, 0x8CDE, 0x91A4,
- 0x9266, 0x937E, 0x9418, 0x969C, 0x9798, 0x4E0A, 0x4E08, 0x4E1E,
- 0x4E57, 0x5197, 0x5270, 0x57CE, 0x5834, 0x58CC, 0x5B22, 0x5E38,
- 0x60C5, 0x64FE, 0x6761, 0x6756, 0x6D44, 0x72B6, 0x7573, 0x7A63,
- 0x84B8, 0x8B72, 0x91B8, 0x9320, 0x5631, 0x57F4, 0x98FE,
-};
-static const unsigned short euc_to_utf8_BF[] = {
-         0x62ED, 0x690D, 0x6B96, 0x71ED, 0x7E54, 0x8077, 0x8272,
- 0x89E6, 0x98DF, 0x8755, 0x8FB1, 0x5C3B, 0x4F38, 0x4FE1, 0x4FB5,
- 0x5507, 0x5A20, 0x5BDD, 0x5BE9, 0x5FC3, 0x614E, 0x632F, 0x65B0,
- 0x664B, 0x68EE, 0x699B, 0x6D78, 0x6DF1, 0x7533, 0x75B9, 0x771F,
- 0x795E, 0x79E6, 0x7D33, 0x81E3, 0x82AF, 0x85AA, 0x89AA, 0x8A3A,
- 0x8EAB, 0x8F9B, 0x9032, 0x91DD, 0x9707, 0x4EBA, 0x4EC1, 0x5203,
- 0x5875, 0x58EC, 0x5C0B, 0x751A, 0x5C3D, 0x814E, 0x8A0A, 0x8FC5,
- 0x9663, 0x976D, 0x7B25, 0x8ACF, 0x9808, 0x9162, 0x56F3, 0x53A8,
- 0x9017, 0x5439, 0x5782, 0x5E25, 0x63A8, 0x6C34, 0x708A, 0x7761,
- 0x7C8B, 0x7FE0, 0x8870, 0x9042, 0x9154, 0x9310, 0x9318, 0x968F,
- 0x745E, 0x9AC4, 0x5D07, 0x5D69, 0x6570, 0x67A2, 0x8DA8, 0x96DB,
- 0x636E, 0x6749, 0x6919, 0x83C5, 0x9817, 0x96C0, 0x88FE,
-};
-static const unsigned short euc_to_utf8_C0[] = {
-         0x6F84, 0x647A, 0x5BF8, 0x4E16, 0x702C, 0x755D, 0x662F,
- 0x51C4, 0x5236, 0x52E2, 0x59D3, 0x5F81, 0x6027, 0x6210, 0x653F,
- 0x6574, 0x661F, 0x6674, 0x68F2, 0x6816, 0x6B63, 0x6E05, 0x7272,
- 0x751F, 0x76DB, 0x7CBE, 0x8056, 0x58F0, 0x88FD, 0x897F, 0x8AA0,
- 0x8A93, 0x8ACB, 0x901D, 0x9192, 0x9752, 0x9759, 0x6589, 0x7A0E,
- 0x8106, 0x96BB, 0x5E2D, 0x60DC, 0x621A, 0x65A5, 0x6614, 0x6790,
- 0x77F3, 0x7A4D, 0x7C4D, 0x7E3E, 0x810A, 0x8CAC, 0x8D64, 0x8DE1,
- 0x8E5F, 0x78A9, 0x5207, 0x62D9, 0x63A5, 0x6442, 0x6298, 0x8A2D,
- 0x7A83, 0x7BC0, 0x8AAC, 0x96EA, 0x7D76, 0x820C, 0x8749, 0x4ED9,
- 0x5148, 0x5343, 0x5360, 0x5BA3, 0x5C02, 0x5C16, 0x5DDD, 0x6226,
- 0x6247, 0x64B0, 0x6813, 0x6834, 0x6CC9, 0x6D45, 0x6D17, 0x67D3,
- 0x6F5C, 0x714E, 0x717D, 0x65CB, 0x7A7F, 0x7BAD, 0x7DDA,
-};
-static const unsigned short euc_to_utf8_C1[] = {
-         0x7E4A, 0x7FA8, 0x817A, 0x821B, 0x8239, 0x85A6, 0x8A6E,
- 0x8CCE, 0x8DF5, 0x9078, 0x9077, 0x92AD, 0x9291, 0x9583, 0x9BAE,
- 0x524D, 0x5584, 0x6F38, 0x7136, 0x5168, 0x7985, 0x7E55, 0x81B3,
- 0x7CCE, 0x564C, 0x5851, 0x5CA8, 0x63AA, 0x66FE, 0x66FD, 0x695A,
- 0x72D9, 0x758F, 0x758E, 0x790E, 0x7956, 0x79DF, 0x7C97, 0x7D20,
- 0x7D44, 0x8607, 0x8A34, 0x963B, 0x9061, 0x9F20, 0x50E7, 0x5275,
- 0x53CC, 0x53E2, 0x5009, 0x55AA, 0x58EE, 0x594F, 0x723D, 0x5B8B,
- 0x5C64, 0x531D, 0x60E3, 0x60F3, 0x635C, 0x6383, 0x633F, 0x63BB,
- 0x64CD, 0x65E9, 0x66F9, 0x5DE3, 0x69CD, 0x69FD, 0x6F15, 0x71E5,
- 0x4E89, 0x75E9, 0x76F8, 0x7A93, 0x7CDF, 0x7DCF, 0x7D9C, 0x8061,
- 0x8349, 0x8358, 0x846C, 0x84BC, 0x85FB, 0x88C5, 0x8D70, 0x9001,
- 0x906D, 0x9397, 0x971C, 0x9A12, 0x50CF, 0x5897, 0x618E,
-};
-static const unsigned short euc_to_utf8_C2[] = {
-         0x81D3, 0x8535, 0x8D08, 0x9020, 0x4FC3, 0x5074, 0x5247,
- 0x5373, 0x606F, 0x6349, 0x675F, 0x6E2C, 0x8DB3, 0x901F, 0x4FD7,
- 0x5C5E, 0x8CCA, 0x65CF, 0x7D9A, 0x5352, 0x8896, 0x5176, 0x63C3,
- 0x5B58, 0x5B6B, 0x5C0A, 0x640D, 0x6751, 0x905C, 0x4ED6, 0x591A,
- 0x592A, 0x6C70, 0x8A51, 0x553E, 0x5815, 0x59A5, 0x60F0, 0x6253,
- 0x67C1, 0x8235, 0x6955, 0x9640, 0x99C4, 0x9A28, 0x4F53, 0x5806,
- 0x5BFE, 0x8010, 0x5CB1, 0x5E2F, 0x5F85, 0x6020, 0x614B, 0x6234,
- 0x66FF, 0x6CF0, 0x6EDE, 0x80CE, 0x817F, 0x82D4, 0x888B, 0x8CB8,
- 0x9000, 0x902E, 0x968A, 0x9EDB, 0x9BDB, 0x4EE3, 0x53F0, 0x5927,
- 0x7B2C, 0x918D, 0x984C, 0x9DF9, 0x6EDD, 0x7027, 0x5353, 0x5544,
- 0x5B85, 0x6258, 0x629E, 0x62D3, 0x6CA2, 0x6FEF, 0x7422, 0x8A17,
- 0x9438, 0x6FC1, 0x8AFE, 0x8338, 0x51E7, 0x86F8, 0x53EA,
-};
-static const unsigned short euc_to_utf8_C3[] = {
-         0x53E9, 0x4F46, 0x9054, 0x8FB0, 0x596A, 0x8131, 0x5DFD,
- 0x7AEA, 0x8FBF, 0x68DA, 0x8C37, 0x72F8, 0x9C48, 0x6A3D, 0x8AB0,
- 0x4E39, 0x5358, 0x5606, 0x5766, 0x62C5, 0x63A2, 0x65E6, 0x6B4E,
- 0x6DE1, 0x6E5B, 0x70AD, 0x77ED, 0x7AEF, 0x7BAA, 0x7DBB, 0x803D,
- 0x80C6, 0x86CB, 0x8A95, 0x935B, 0x56E3, 0x58C7, 0x5F3E, 0x65AD,
- 0x6696, 0x6A80, 0x6BB5, 0x7537, 0x8AC7, 0x5024, 0x77E5, 0x5730,
- 0x5F1B, 0x6065, 0x667A, 0x6C60, 0x75F4, 0x7A1A, 0x7F6E, 0x81F4,
- 0x8718, 0x9045, 0x99B3, 0x7BC9, 0x755C, 0x7AF9, 0x7B51, 0x84C4,
- 0x9010, 0x79E9, 0x7A92, 0x8336, 0x5AE1, 0x7740, 0x4E2D, 0x4EF2,
- 0x5B99, 0x5FE0, 0x62BD, 0x663C, 0x67F1, 0x6CE8, 0x866B, 0x8877,
- 0x8A3B, 0x914E, 0x92F3, 0x99D0, 0x6A17, 0x7026, 0x732A, 0x82E7,
- 0x8457, 0x8CAF, 0x4E01, 0x5146, 0x51CB, 0x558B, 0x5BF5,
-};
-static const unsigned short euc_to_utf8_C4[] = {
-         0x5E16, 0x5E33, 0x5E81, 0x5F14, 0x5F35, 0x5F6B, 0x5FB4,
- 0x61F2, 0x6311, 0x66A2, 0x671D, 0x6F6E, 0x7252, 0x753A, 0x773A,
- 0x8074, 0x8139, 0x8178, 0x8776, 0x8ABF, 0x8ADC, 0x8D85, 0x8DF3,
- 0x929A, 0x9577, 0x9802, 0x9CE5, 0x52C5, 0x6357, 0x76F4, 0x6715,
- 0x6C88, 0x73CD, 0x8CC3, 0x93AE, 0x9673, 0x6D25, 0x589C, 0x690E,
- 0x69CC, 0x8FFD, 0x939A, 0x75DB, 0x901A, 0x585A, 0x6802, 0x63B4,
- 0x69FB, 0x4F43, 0x6F2C, 0x67D8, 0x8FBB, 0x8526, 0x7DB4, 0x9354,
- 0x693F, 0x6F70, 0x576A, 0x58F7, 0x5B2C, 0x7D2C, 0x722A, 0x540A,
- 0x91E3, 0x9DB4, 0x4EAD, 0x4F4E, 0x505C, 0x5075, 0x5243, 0x8C9E,
- 0x5448, 0x5824, 0x5B9A, 0x5E1D, 0x5E95, 0x5EAD, 0x5EF7, 0x5F1F,
- 0x608C, 0x62B5, 0x633A, 0x63D0, 0x68AF, 0x6C40, 0x7887, 0x798E,
- 0x7A0B, 0x7DE0, 0x8247, 0x8A02, 0x8AE6, 0x8E44, 0x9013,
-};
-static const unsigned short euc_to_utf8_C5[] = {
-         0x90B8, 0x912D, 0x91D8, 0x9F0E, 0x6CE5, 0x6458, 0x64E2,
- 0x6575, 0x6EF4, 0x7684, 0x7B1B, 0x9069, 0x93D1, 0x6EBA, 0x54F2,
- 0x5FB9, 0x64A4, 0x8F4D, 0x8FED, 0x9244, 0x5178, 0x586B, 0x5929,
- 0x5C55, 0x5E97, 0x6DFB, 0x7E8F, 0x751C, 0x8CBC, 0x8EE2, 0x985B,
- 0x70B9, 0x4F1D, 0x6BBF, 0x6FB1, 0x7530, 0x96FB, 0x514E, 0x5410,
- 0x5835, 0x5857, 0x59AC, 0x5C60, 0x5F92, 0x6597, 0x675C, 0x6E21,
- 0x767B, 0x83DF, 0x8CED, 0x9014, 0x90FD, 0x934D, 0x7825, 0x783A,
- 0x52AA, 0x5EA6, 0x571F, 0x5974, 0x6012, 0x5012, 0x515A, 0x51AC,
- 0x51CD, 0x5200, 0x5510, 0x5854, 0x5858, 0x5957, 0x5B95, 0x5CF6,
- 0x5D8B, 0x60BC, 0x6295, 0x642D, 0x6771, 0x6843, 0x68BC, 0x68DF,
- 0x76D7, 0x6DD8, 0x6E6F, 0x6D9B, 0x706F, 0x71C8, 0x5F53, 0x75D8,
- 0x7977, 0x7B49, 0x7B54, 0x7B52, 0x7CD6, 0x7D71, 0x5230,
-};
-static const unsigned short euc_to_utf8_C6[] = {
-         0x8463, 0x8569, 0x85E4, 0x8A0E, 0x8B04, 0x8C46, 0x8E0F,
- 0x9003, 0x900F, 0x9419, 0x9676, 0x982D, 0x9A30, 0x95D8, 0x50CD,
- 0x52D5, 0x540C, 0x5802, 0x5C0E, 0x61A7, 0x649E, 0x6D1E, 0x77B3,
- 0x7AE5, 0x80F4, 0x8404, 0x9053, 0x9285, 0x5CE0, 0x9D07, 0x533F,
- 0x5F97, 0x5FB3, 0x6D9C, 0x7279, 0x7763, 0x79BF, 0x7BE4, 0x6BD2,
- 0x72EC, 0x8AAD, 0x6803, 0x6A61, 0x51F8, 0x7A81, 0x6934, 0x5C4A,
- 0x9CF6, 0x82EB, 0x5BC5, 0x9149, 0x701E, 0x5678, 0x5C6F, 0x60C7,
- 0x6566, 0x6C8C, 0x8C5A, 0x9041, 0x9813, 0x5451, 0x66C7, 0x920D,
- 0x5948, 0x90A3, 0x5185, 0x4E4D, 0x51EA, 0x8599, 0x8B0E, 0x7058,
- 0x637A, 0x934B, 0x6962, 0x99B4, 0x7E04, 0x7577, 0x5357, 0x6960,
- 0x8EDF, 0x96E3, 0x6C5D, 0x4E8C, 0x5C3C, 0x5F10, 0x8FE9, 0x5302,
- 0x8CD1, 0x8089, 0x8679, 0x5EFF, 0x65E5, 0x4E73, 0x5165,
-};
-static const unsigned short euc_to_utf8_C7[] = {
-         0x5982, 0x5C3F, 0x97EE, 0x4EFB, 0x598A, 0x5FCD, 0x8A8D,
- 0x6FE1, 0x79B0, 0x7962, 0x5BE7, 0x8471, 0x732B, 0x71B1, 0x5E74,
- 0x5FF5, 0x637B, 0x649A, 0x71C3, 0x7C98, 0x4E43, 0x5EFC, 0x4E4B,
- 0x57DC, 0x56A2, 0x60A9, 0x6FC3, 0x7D0D, 0x80FD, 0x8133, 0x81BF,
- 0x8FB2, 0x8997, 0x86A4, 0x5DF4, 0x628A, 0x64AD, 0x8987, 0x6777,
- 0x6CE2, 0x6D3E, 0x7436, 0x7834, 0x5A46, 0x7F75, 0x82AD, 0x99AC,
- 0x4FF3, 0x5EC3, 0x62DD, 0x6392, 0x6557, 0x676F, 0x76C3, 0x724C,
- 0x80CC, 0x80BA, 0x8F29, 0x914D, 0x500D, 0x57F9, 0x5A92, 0x6885,
- 0x6973, 0x7164, 0x72FD, 0x8CB7, 0x58F2, 0x8CE0, 0x966A, 0x9019,
- 0x877F, 0x79E4, 0x77E7, 0x8429, 0x4F2F, 0x5265, 0x535A, 0x62CD,
- 0x67CF, 0x6CCA, 0x767D, 0x7B94, 0x7C95, 0x8236, 0x8584, 0x8FEB,
- 0x66DD, 0x6F20, 0x7206, 0x7E1B, 0x83AB, 0x99C1, 0x9EA6,
-};
-static const unsigned short euc_to_utf8_C8[] = {
-         0x51FD, 0x7BB1, 0x7872, 0x7BB8, 0x8087, 0x7B48, 0x6AE8,
- 0x5E61, 0x808C, 0x7551, 0x7560, 0x516B, 0x9262, 0x6E8C, 0x767A,
- 0x9197, 0x9AEA, 0x4F10, 0x7F70, 0x629C, 0x7B4F, 0x95A5, 0x9CE9,
- 0x567A, 0x5859, 0x86E4, 0x96BC, 0x4F34, 0x5224, 0x534A, 0x53CD,
- 0x53DB, 0x5E06, 0x642C, 0x6591, 0x677F, 0x6C3E, 0x6C4E, 0x7248,
- 0x72AF, 0x73ED, 0x7554, 0x7E41, 0x822C, 0x85E9, 0x8CA9, 0x7BC4,
- 0x91C6, 0x7169, 0x9812, 0x98EF, 0x633D, 0x6669, 0x756A, 0x76E4,
- 0x78D0, 0x8543, 0x86EE, 0x532A, 0x5351, 0x5426, 0x5983, 0x5E87,
- 0x5F7C, 0x60B2, 0x6249, 0x6279, 0x62AB, 0x6590, 0x6BD4, 0x6CCC,
- 0x75B2, 0x76AE, 0x7891, 0x79D8, 0x7DCB, 0x7F77, 0x80A5, 0x88AB,
- 0x8AB9, 0x8CBB, 0x907F, 0x975E, 0x98DB, 0x6A0B, 0x7C38, 0x5099,
- 0x5C3E, 0x5FAE, 0x6787, 0x6BD8, 0x7435, 0x7709, 0x7F8E,
-};
-static const unsigned short euc_to_utf8_C9[] = {
-         0x9F3B, 0x67CA, 0x7A17, 0x5339, 0x758B, 0x9AED, 0x5F66,
- 0x819D, 0x83F1, 0x8098, 0x5F3C, 0x5FC5, 0x7562, 0x7B46, 0x903C,
- 0x6867, 0x59EB, 0x5A9B, 0x7D10, 0x767E, 0x8B2C, 0x4FF5, 0x5F6A,
- 0x6A19, 0x6C37, 0x6F02, 0x74E2, 0x7968, 0x8868, 0x8A55, 0x8C79,
- 0x5EDF, 0x63CF, 0x75C5, 0x79D2, 0x82D7, 0x9328, 0x92F2, 0x849C,
- 0x86ED, 0x9C2D, 0x54C1, 0x5F6C, 0x658C, 0x6D5C, 0x7015, 0x8CA7,
- 0x8CD3, 0x983B, 0x654F, 0x74F6, 0x4E0D, 0x4ED8, 0x57E0, 0x592B,
- 0x5A66, 0x5BCC, 0x51A8, 0x5E03, 0x5E9C, 0x6016, 0x6276, 0x6577,
- 0x65A7, 0x666E, 0x6D6E, 0x7236, 0x7B26, 0x8150, 0x819A, 0x8299,
- 0x8B5C, 0x8CA0, 0x8CE6, 0x8D74, 0x961C, 0x9644, 0x4FAE, 0x64AB,
- 0x6B66, 0x821E, 0x8461, 0x856A, 0x90E8, 0x5C01, 0x6953, 0x98A8,
- 0x847A, 0x8557, 0x4F0F, 0x526F, 0x5FA9, 0x5E45, 0x670D,
-};
-static const unsigned short euc_to_utf8_CA[] = {
-         0x798F, 0x8179, 0x8907, 0x8986, 0x6DF5, 0x5F17, 0x6255,
- 0x6CB8, 0x4ECF, 0x7269, 0x9B92, 0x5206, 0x543B, 0x5674, 0x58B3,
- 0x61A4, 0x626E, 0x711A, 0x596E, 0x7C89, 0x7CDE, 0x7D1B, 0x96F0,
- 0x6587, 0x805E, 0x4E19, 0x4F75, 0x5175, 0x5840, 0x5E63, 0x5E73,
- 0x5F0A, 0x67C4, 0x4E26, 0x853D, 0x9589, 0x965B, 0x7C73, 0x9801,
- 0x50FB, 0x58C1, 0x7656, 0x78A7, 0x5225, 0x77A5, 0x8511, 0x7B86,
- 0x504F, 0x5909, 0x7247, 0x7BC7, 0x7DE8, 0x8FBA, 0x8FD4, 0x904D,
- 0x4FBF, 0x52C9, 0x5A29, 0x5F01, 0x97AD, 0x4FDD, 0x8217, 0x92EA,
- 0x5703, 0x6355, 0x6B69, 0x752B, 0x88DC, 0x8F14, 0x7A42, 0x52DF,
- 0x5893, 0x6155, 0x620A, 0x66AE, 0x6BCD, 0x7C3F, 0x83E9, 0x5023,
- 0x4FF8, 0x5305, 0x5446, 0x5831, 0x5949, 0x5B9D, 0x5CF0, 0x5CEF,
- 0x5D29, 0x5E96, 0x62B1, 0x6367, 0x653E, 0x65B9, 0x670B,
-};
-static const unsigned short euc_to_utf8_CB[] = {
-         0x6CD5, 0x6CE1, 0x70F9, 0x7832, 0x7E2B, 0x80DE, 0x82B3,
- 0x840C, 0x84EC, 0x8702, 0x8912, 0x8A2A, 0x8C4A, 0x90A6, 0x92D2,
- 0x98FD, 0x9CF3, 0x9D6C, 0x4E4F, 0x4EA1, 0x508D, 0x5256, 0x574A,
- 0x59A8, 0x5E3D, 0x5FD8, 0x5FD9, 0x623F, 0x66B4, 0x671B, 0x67D0,
- 0x68D2, 0x5192, 0x7D21, 0x80AA, 0x81A8, 0x8B00, 0x8C8C, 0x8CBF,
- 0x927E, 0x9632, 0x5420, 0x982C, 0x5317, 0x50D5, 0x535C, 0x58A8,
- 0x64B2, 0x6734, 0x7267, 0x7766, 0x7A46, 0x91E6, 0x52C3, 0x6CA1,
- 0x6B86, 0x5800, 0x5E4C, 0x5954, 0x672C, 0x7FFB, 0x51E1, 0x76C6,
- 0x6469, 0x78E8, 0x9B54, 0x9EBB, 0x57CB, 0x59B9, 0x6627, 0x679A,
- 0x6BCE, 0x54E9, 0x69D9, 0x5E55, 0x819C, 0x6795, 0x9BAA, 0x67FE,
- 0x9C52, 0x685D, 0x4EA6, 0x4FE3, 0x53C8, 0x62B9, 0x672B, 0x6CAB,
- 0x8FC4, 0x4FAD, 0x7E6D, 0x9EBF, 0x4E07, 0x6162, 0x6E80,
-};
-static const unsigned short euc_to_utf8_CC[] = {
-         0x6F2B, 0x8513, 0x5473, 0x672A, 0x9B45, 0x5DF3, 0x7B95,
- 0x5CAC, 0x5BC6, 0x871C, 0x6E4A, 0x84D1, 0x7A14, 0x8108, 0x5999,
- 0x7C8D, 0x6C11, 0x7720, 0x52D9, 0x5922, 0x7121, 0x725F, 0x77DB,
- 0x9727, 0x9D61, 0x690B, 0x5A7F, 0x5A18, 0x51A5, 0x540D, 0x547D,
- 0x660E, 0x76DF, 0x8FF7, 0x9298, 0x9CF4, 0x59EA, 0x725D, 0x6EC5,
- 0x514D, 0x68C9, 0x7DBF, 0x7DEC, 0x9762, 0x9EBA, 0x6478, 0x6A21,
- 0x8302, 0x5984, 0x5B5F, 0x6BDB, 0x731B, 0x76F2, 0x7DB2, 0x8017,
- 0x8499, 0x5132, 0x6728, 0x9ED9, 0x76EE, 0x6762, 0x52FF, 0x9905,
- 0x5C24, 0x623B, 0x7C7E, 0x8CB0, 0x554F, 0x60B6, 0x7D0B, 0x9580,
- 0x5301, 0x4E5F, 0x51B6, 0x591C, 0x723A, 0x8036, 0x91CE, 0x5F25,
- 0x77E2, 0x5384, 0x5F79, 0x7D04, 0x85AC, 0x8A33, 0x8E8D, 0x9756,
- 0x67F3, 0x85AE, 0x9453, 0x6109, 0x6108, 0x6CB9, 0x7652,
-};
-static const unsigned short euc_to_utf8_CD[] = {
-         0x8AED, 0x8F38, 0x552F, 0x4F51, 0x512A, 0x52C7, 0x53CB,
- 0x5BA5, 0x5E7D, 0x60A0, 0x6182, 0x63D6, 0x6709, 0x67DA, 0x6E67,
- 0x6D8C, 0x7336, 0x7337, 0x7531, 0x7950, 0x88D5, 0x8A98, 0x904A,
- 0x9091, 0x90F5, 0x96C4, 0x878D, 0x5915, 0x4E88, 0x4F59, 0x4E0E,
- 0x8A89, 0x8F3F, 0x9810, 0x50AD, 0x5E7C, 0x5996, 0x5BB9, 0x5EB8,
- 0x63DA, 0x63FA, 0x64C1, 0x66DC, 0x694A, 0x69D8, 0x6D0B, 0x6EB6,
- 0x7194, 0x7528, 0x7AAF, 0x7F8A, 0x8000, 0x8449, 0x84C9, 0x8981,
- 0x8B21, 0x8E0A, 0x9065, 0x967D, 0x990A, 0x617E, 0x6291, 0x6B32,
- 0x6C83, 0x6D74, 0x7FCC, 0x7FFC, 0x6DC0, 0x7F85, 0x87BA, 0x88F8,
- 0x6765, 0x83B1, 0x983C, 0x96F7, 0x6D1B, 0x7D61, 0x843D, 0x916A,
- 0x4E71, 0x5375, 0x5D50, 0x6B04, 0x6FEB, 0x85CD, 0x862D, 0x89A7,
- 0x5229, 0x540F, 0x5C65, 0x674E, 0x68A8, 0x7406, 0x7483,
-};
-static const unsigned short euc_to_utf8_CE[] = {
-         0x75E2, 0x88CF, 0x88E1, 0x91CC, 0x96E2, 0x9678, 0x5F8B,
- 0x7387, 0x7ACB, 0x844E, 0x63A0, 0x7565, 0x5289, 0x6D41, 0x6E9C,
- 0x7409, 0x7559, 0x786B, 0x7C92, 0x9686, 0x7ADC, 0x9F8D, 0x4FB6,
- 0x616E, 0x65C5, 0x865C, 0x4E86, 0x4EAE, 0x50DA, 0x4E21, 0x51CC,
- 0x5BEE, 0x6599, 0x6881, 0x6DBC, 0x731F, 0x7642, 0x77AD, 0x7A1C,
- 0x7CE7, 0x826F, 0x8AD2, 0x907C, 0x91CF, 0x9675, 0x9818, 0x529B,
- 0x7DD1, 0x502B, 0x5398, 0x6797, 0x6DCB, 0x71D0, 0x7433, 0x81E8,
- 0x8F2A, 0x96A3, 0x9C57, 0x9E9F, 0x7460, 0x5841, 0x6D99, 0x7D2F,
- 0x985E, 0x4EE4, 0x4F36, 0x4F8B, 0x51B7, 0x52B1, 0x5DBA, 0x601C,
- 0x73B2, 0x793C, 0x82D3, 0x9234, 0x96B7, 0x96F6, 0x970A, 0x9E97,
- 0x9F62, 0x66A6, 0x6B74, 0x5217, 0x52A3, 0x70C8, 0x88C2, 0x5EC9,
- 0x604B, 0x6190, 0x6F23, 0x7149, 0x7C3E, 0x7DF4, 0x806F,
-};
-static const unsigned short euc_to_utf8_CF[] = {
-         0x84EE, 0x9023, 0x932C, 0x5442, 0x9B6F, 0x6AD3, 0x7089,
- 0x8CC2, 0x8DEF, 0x9732, 0x52B4, 0x5A41, 0x5ECA, 0x5F04, 0x6717,
- 0x697C, 0x6994, 0x6D6A, 0x6F0F, 0x7262, 0x72FC, 0x7BED, 0x8001,
- 0x807E, 0x874B, 0x90CE, 0x516D, 0x9E93, 0x7984, 0x808B, 0x9332,
- 0x8AD6, 0x502D, 0x548C, 0x8A71, 0x6B6A, 0x8CC4, 0x8107, 0x60D1,
- 0x67A0, 0x9DF2, 0x4E99, 0x4E98, 0x9C10, 0x8A6B, 0x85C1, 0x8568,
- 0x6900, 0x6E7E, 0x7897, 0x8155,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,
-};
-static const unsigned short euc_to_utf8_CF_x0213[] = {
-         0x84EE, 0x9023, 0x932C, 0x5442, 0x9B6F, 0x6AD3, 0x7089,
- 0x8CC2, 0x8DEF, 0x9732, 0x52B4, 0x5A41, 0x5ECA, 0x5F04, 0x6717,
- 0x697C, 0x6994, 0x6D6A, 0x6F0F, 0x7262, 0x72FC, 0x7BED, 0x8001,
- 0x807E, 0x874B, 0x90CE, 0x516D, 0x9E93, 0x7984, 0x808B, 0x9332,
- 0x8AD6, 0x502D, 0x548C, 0x8A71, 0x6B6A, 0x8CC4, 0x8107, 0x60D1,
- 0x67A0, 0x9DF2, 0x4E99, 0x4E98, 0x9C10, 0x8A6B, 0x85C1, 0x8568,
- 0x6900, 0x6E7E, 0x7897, 0x8155, 0xD842 /*0xDF9F*/, 0x5B41, 0x5B56, 0x5B7D,
- 0x5B93, 0x5BD8, 0x5BEC, 0x5C12, 0x5C1E, 0x5C23, 0x5C2B, 0x378D,
- 0x5C62, 0xFA3B, 0xFA3C, 0xD845 /*0xDEB4*/, 0x5C7A, 0x5C8F, 0x5C9F, 0x5CA3,
- 0x5CAA, 0x5CBA, 0x5CCB, 0x5CD0, 0x5CD2, 0x5CF4, 0xD847 /*0xDE34*/, 0x37E2,
- 0x5D0D, 0x5D27, 0xFA11, 0x5D46, 0x5D47, 0x5D53, 0x5D4A, 0x5D6D,
- 0x5D81, 0x5DA0, 0x5DA4, 0x5DA7, 0x5DB8, 0x5DCB, 0x541E,
-};
-static const unsigned short euc_to_utf8_D0[] = {
-         0x5F0C, 0x4E10, 0x4E15, 0x4E2A, 0x4E31, 0x4E36, 0x4E3C,
- 0x4E3F, 0x4E42, 0x4E56, 0x4E58, 0x4E82, 0x4E85, 0x8C6B, 0x4E8A,
- 0x8212, 0x5F0D, 0x4E8E, 0x4E9E, 0x4E9F, 0x4EA0, 0x4EA2, 0x4EB0,
- 0x4EB3, 0x4EB6, 0x4ECE, 0x4ECD, 0x4EC4, 0x4EC6, 0x4EC2, 0x4ED7,
- 0x4EDE, 0x4EED, 0x4EDF, 0x4EF7, 0x4F09, 0x4F5A, 0x4F30, 0x4F5B,
- 0x4F5D, 0x4F57, 0x4F47, 0x4F76, 0x4F88, 0x4F8F, 0x4F98, 0x4F7B,
- 0x4F69, 0x4F70, 0x4F91, 0x4F6F, 0x4F86, 0x4F96, 0x5118, 0x4FD4,
- 0x4FDF, 0x4FCE, 0x4FD8, 0x4FDB, 0x4FD1, 0x4FDA, 0x4FD0, 0x4FE4,
- 0x4FE5, 0x501A, 0x5028, 0x5014, 0x502A, 0x5025, 0x5005, 0x4F1C,
- 0x4FF6, 0x5021, 0x5029, 0x502C, 0x4FFE, 0x4FEF, 0x5011, 0x5006,
- 0x5043, 0x5047, 0x6703, 0x5055, 0x5050, 0x5048, 0x505A, 0x5056,
- 0x506C, 0x5078, 0x5080, 0x509A, 0x5085, 0x50B4, 0x50B2,
-};
-static const unsigned short euc_to_utf8_D1[] = {
-         0x50C9, 0x50CA, 0x50B3, 0x50C2, 0x50D6, 0x50DE, 0x50E5,
- 0x50ED, 0x50E3, 0x50EE, 0x50F9, 0x50F5, 0x5109, 0x5101, 0x5102,
- 0x5116, 0x5115, 0x5114, 0x511A, 0x5121, 0x513A, 0x5137, 0x513C,
- 0x513B, 0x513F, 0x5140, 0x5152, 0x514C, 0x5154, 0x5162, 0x7AF8,
- 0x5169, 0x516A, 0x516E, 0x5180, 0x5182, 0x56D8, 0x518C, 0x5189,
- 0x518F, 0x5191, 0x5193, 0x5195, 0x5196, 0x51A4, 0x51A6, 0x51A2,
- 0x51A9, 0x51AA, 0x51AB, 0x51B3, 0x51B1, 0x51B2, 0x51B0, 0x51B5,
- 0x51BD, 0x51C5, 0x51C9, 0x51DB, 0x51E0, 0x8655, 0x51E9, 0x51ED,
- 0x51F0, 0x51F5, 0x51FE, 0x5204, 0x520B, 0x5214, 0x520E, 0x5227,
- 0x522A, 0x522E, 0x5233, 0x5239, 0x524F, 0x5244, 0x524B, 0x524C,
- 0x525E, 0x5254, 0x526A, 0x5274, 0x5269, 0x5273, 0x527F, 0x527D,
- 0x528D, 0x5294, 0x5292, 0x5271, 0x5288, 0x5291, 0x8FA8,
-};
-static const unsigned short euc_to_utf8_D2[] = {
-         0x8FA7, 0x52AC, 0x52AD, 0x52BC, 0x52B5, 0x52C1, 0x52CD,
- 0x52D7, 0x52DE, 0x52E3, 0x52E6, 0x98ED, 0x52E0, 0x52F3, 0x52F5,
- 0x52F8, 0x52F9, 0x5306, 0x5308, 0x7538, 0x530D, 0x5310, 0x530F,
- 0x5315, 0x531A, 0x5323, 0x532F, 0x5331, 0x5333, 0x5338, 0x5340,
- 0x5346, 0x5345, 0x4E17, 0x5349, 0x534D, 0x51D6, 0x535E, 0x5369,
- 0x536E, 0x5918, 0x537B, 0x5377, 0x5382, 0x5396, 0x53A0, 0x53A6,
- 0x53A5, 0x53AE, 0x53B0, 0x53B6, 0x53C3, 0x7C12, 0x96D9, 0x53DF,
- 0x66FC, 0x71EE, 0x53EE, 0x53E8, 0x53ED, 0x53FA, 0x5401, 0x543D,
- 0x5440, 0x542C, 0x542D, 0x543C, 0x542E, 0x5436, 0x5429, 0x541D,
- 0x544E, 0x548F, 0x5475, 0x548E, 0x545F, 0x5471, 0x5477, 0x5470,
- 0x5492, 0x547B, 0x5480, 0x5476, 0x5484, 0x5490, 0x5486, 0x54C7,
- 0x54A2, 0x54B8, 0x54A5, 0x54AC, 0x54C4, 0x54C8, 0x54A8,
-};
-static const unsigned short euc_to_utf8_D3[] = {
-         0x54AB, 0x54C2, 0x54A4, 0x54BE, 0x54BC, 0x54D8, 0x54E5,
- 0x54E6, 0x550F, 0x5514, 0x54FD, 0x54EE, 0x54ED, 0x54FA, 0x54E2,
- 0x5539, 0x5540, 0x5563, 0x554C, 0x552E, 0x555C, 0x5545, 0x5556,
- 0x5557, 0x5538, 0x5533, 0x555D, 0x5599, 0x5580, 0x54AF, 0x558A,
- 0x559F, 0x557B, 0x557E, 0x5598, 0x559E, 0x55AE, 0x557C, 0x5583,
- 0x55A9, 0x5587, 0x55A8, 0x55DA, 0x55C5, 0x55DF, 0x55C4, 0x55DC,
- 0x55E4, 0x55D4, 0x5614, 0x55F7, 0x5616, 0x55FE, 0x55FD, 0x561B,
- 0x55F9, 0x564E, 0x5650, 0x71DF, 0x5634, 0x5636, 0x5632, 0x5638,
- 0x566B, 0x5664, 0x562F, 0x566C, 0x566A, 0x5686, 0x5680, 0x568A,
- 0x56A0, 0x5694, 0x568F, 0x56A5, 0x56AE, 0x56B6, 0x56B4, 0x56C2,
- 0x56BC, 0x56C1, 0x56C3, 0x56C0, 0x56C8, 0x56CE, 0x56D1, 0x56D3,
- 0x56D7, 0x56EE, 0x56F9, 0x5700, 0x56FF, 0x5704, 0x5709,
-};
-static const unsigned short euc_to_utf8_D4[] = {
-         0x5708, 0x570B, 0x570D, 0x5713, 0x5718, 0x5716, 0x55C7,
- 0x571C, 0x5726, 0x5737, 0x5738, 0x574E, 0x573B, 0x5740, 0x574F,
- 0x5769, 0x57C0, 0x5788, 0x5761, 0x577F, 0x5789, 0x5793, 0x57A0,
- 0x57B3, 0x57A4, 0x57AA, 0x57B0, 0x57C3, 0x57C6, 0x57D4, 0x57D2,
- 0x57D3, 0x580A, 0x57D6, 0x57E3, 0x580B, 0x5819, 0x581D, 0x5872,
- 0x5821, 0x5862, 0x584B, 0x5870, 0x6BC0, 0x5852, 0x583D, 0x5879,
- 0x5885, 0x58B9, 0x589F, 0x58AB, 0x58BA, 0x58DE, 0x58BB, 0x58B8,
- 0x58AE, 0x58C5, 0x58D3, 0x58D1, 0x58D7, 0x58D9, 0x58D8, 0x58E5,
- 0x58DC, 0x58E4, 0x58DF, 0x58EF, 0x58FA, 0x58F9, 0x58FB, 0x58FC,
- 0x58FD, 0x5902, 0x590A, 0x5910, 0x591B, 0x68A6, 0x5925, 0x592C,
- 0x592D, 0x5932, 0x5938, 0x593E, 0x7AD2, 0x5955, 0x5950, 0x594E,
- 0x595A, 0x5958, 0x5962, 0x5960, 0x5967, 0x596C, 0x5969,
-};
-static const unsigned short euc_to_utf8_D5[] = {
-         0x5978, 0x5981, 0x599D, 0x4F5E, 0x4FAB, 0x59A3, 0x59B2,
- 0x59C6, 0x59E8, 0x59DC, 0x598D, 0x59D9, 0x59DA, 0x5A25, 0x5A1F,
- 0x5A11, 0x5A1C, 0x5A09, 0x5A1A, 0x5A40, 0x5A6C, 0x5A49, 0x5A35,
- 0x5A36, 0x5A62, 0x5A6A, 0x5A9A, 0x5ABC, 0x5ABE, 0x5ACB, 0x5AC2,
- 0x5ABD, 0x5AE3, 0x5AD7, 0x5AE6, 0x5AE9, 0x5AD6, 0x5AFA, 0x5AFB,
- 0x5B0C, 0x5B0B, 0x5B16, 0x5B32, 0x5AD0, 0x5B2A, 0x5B36, 0x5B3E,
- 0x5B43, 0x5B45, 0x5B40, 0x5B51, 0x5B55, 0x5B5A, 0x5B5B, 0x5B65,
- 0x5B69, 0x5B70, 0x5B73, 0x5B75, 0x5B78, 0x6588, 0x5B7A, 0x5B80,
- 0x5B83, 0x5BA6, 0x5BB8, 0x5BC3, 0x5BC7, 0x5BC9, 0x5BD4, 0x5BD0,
- 0x5BE4, 0x5BE6, 0x5BE2, 0x5BDE, 0x5BE5, 0x5BEB, 0x5BF0, 0x5BF6,
- 0x5BF3, 0x5C05, 0x5C07, 0x5C08, 0x5C0D, 0x5C13, 0x5C20, 0x5C22,
- 0x5C28, 0x5C38, 0x5C39, 0x5C41, 0x5C46, 0x5C4E, 0x5C53,
-};
-static const unsigned short euc_to_utf8_D6[] = {
-         0x5C50, 0x5C4F, 0x5B71, 0x5C6C, 0x5C6E, 0x4E62, 0x5C76,
- 0x5C79, 0x5C8C, 0x5C91, 0x5C94, 0x599B, 0x5CAB, 0x5CBB, 0x5CB6,
- 0x5CBC, 0x5CB7, 0x5CC5, 0x5CBE, 0x5CC7, 0x5CD9, 0x5CE9, 0x5CFD,
- 0x5CFA, 0x5CED, 0x5D8C, 0x5CEA, 0x5D0B, 0x5D15, 0x5D17, 0x5D5C,
- 0x5D1F, 0x5D1B, 0x5D11, 0x5D14, 0x5D22, 0x5D1A, 0x5D19, 0x5D18,
- 0x5D4C, 0x5D52, 0x5D4E, 0x5D4B, 0x5D6C, 0x5D73, 0x5D76, 0x5D87,
- 0x5D84, 0x5D82, 0x5DA2, 0x5D9D, 0x5DAC, 0x5DAE, 0x5DBD, 0x5D90,
- 0x5DB7, 0x5DBC, 0x5DC9, 0x5DCD, 0x5DD3, 0x5DD2, 0x5DD6, 0x5DDB,
- 0x5DEB, 0x5DF2, 0x5DF5, 0x5E0B, 0x5E1A, 0x5E19, 0x5E11, 0x5E1B,
- 0x5E36, 0x5E37, 0x5E44, 0x5E43, 0x5E40, 0x5E4E, 0x5E57, 0x5E54,
- 0x5E5F, 0x5E62, 0x5E64, 0x5E47, 0x5E75, 0x5E76, 0x5E7A, 0x9EBC,
- 0x5E7F, 0x5EA0, 0x5EC1, 0x5EC2, 0x5EC8, 0x5ED0, 0x5ECF,
-};
-static const unsigned short euc_to_utf8_D7[] = {
-         0x5ED6, 0x5EE3, 0x5EDD, 0x5EDA, 0x5EDB, 0x5EE2, 0x5EE1,
- 0x5EE8, 0x5EE9, 0x5EEC, 0x5EF1, 0x5EF3, 0x5EF0, 0x5EF4, 0x5EF8,
- 0x5EFE, 0x5F03, 0x5F09, 0x5F5D, 0x5F5C, 0x5F0B, 0x5F11, 0x5F16,
- 0x5F29, 0x5F2D, 0x5F38, 0x5F41, 0x5F48, 0x5F4C, 0x5F4E, 0x5F2F,
- 0x5F51, 0x5F56, 0x5F57, 0x5F59, 0x5F61, 0x5F6D, 0x5F73, 0x5F77,
- 0x5F83, 0x5F82, 0x5F7F, 0x5F8A, 0x5F88, 0x5F91, 0x5F87, 0x5F9E,
- 0x5F99, 0x5F98, 0x5FA0, 0x5FA8, 0x5FAD, 0x5FBC, 0x5FD6, 0x5FFB,
- 0x5FE4, 0x5FF8, 0x5FF1, 0x5FDD, 0x60B3, 0x5FFF, 0x6021, 0x6060,
- 0x6019, 0x6010, 0x6029, 0x600E, 0x6031, 0x601B, 0x6015, 0x602B,
- 0x6026, 0x600F, 0x603A, 0x605A, 0x6041, 0x606A, 0x6077, 0x605F,
- 0x604A, 0x6046, 0x604D, 0x6063, 0x6043, 0x6064, 0x6042, 0x606C,
- 0x606B, 0x6059, 0x6081, 0x608D, 0x60E7, 0x6083, 0x609A,
-};
-static const unsigned short euc_to_utf8_D8[] = {
-         0x6084, 0x609B, 0x6096, 0x6097, 0x6092, 0x60A7, 0x608B,
- 0x60E1, 0x60B8, 0x60E0, 0x60D3, 0x60B4, 0x5FF0, 0x60BD, 0x60C6,
- 0x60B5, 0x60D8, 0x614D, 0x6115, 0x6106, 0x60F6, 0x60F7, 0x6100,
- 0x60F4, 0x60FA, 0x6103, 0x6121, 0x60FB, 0x60F1, 0x610D, 0x610E,
- 0x6147, 0x613E, 0x6128, 0x6127, 0x614A, 0x613F, 0x613C, 0x612C,
- 0x6134, 0x613D, 0x6142, 0x6144, 0x6173, 0x6177, 0x6158, 0x6159,
- 0x615A, 0x616B, 0x6174, 0x616F, 0x6165, 0x6171, 0x615F, 0x615D,
- 0x6153, 0x6175, 0x6199, 0x6196, 0x6187, 0x61AC, 0x6194, 0x619A,
- 0x618A, 0x6191, 0x61AB, 0x61AE, 0x61CC, 0x61CA, 0x61C9, 0x61F7,
- 0x61C8, 0x61C3, 0x61C6, 0x61BA, 0x61CB, 0x7F79, 0x61CD, 0x61E6,
- 0x61E3, 0x61F6, 0x61FA, 0x61F4, 0x61FF, 0x61FD, 0x61FC, 0x61FE,
- 0x6200, 0x6208, 0x6209, 0x620D, 0x620C, 0x6214, 0x621B,
-};
-static const unsigned short euc_to_utf8_D9[] = {
-         0x621E, 0x6221, 0x622A, 0x622E, 0x6230, 0x6232, 0x6233,
- 0x6241, 0x624E, 0x625E, 0x6263, 0x625B, 0x6260, 0x6268, 0x627C,
- 0x6282, 0x6289, 0x627E, 0x6292, 0x6293, 0x6296, 0x62D4, 0x6283,
- 0x6294, 0x62D7, 0x62D1, 0x62BB, 0x62CF, 0x62FF, 0x62C6, 0x64D4,
- 0x62C8, 0x62DC, 0x62CC, 0x62CA, 0x62C2, 0x62C7, 0x629B, 0x62C9,
- 0x630C, 0x62EE, 0x62F1, 0x6327, 0x6302, 0x6308, 0x62EF, 0x62F5,
- 0x6350, 0x633E, 0x634D, 0x641C, 0x634F, 0x6396, 0x638E, 0x6380,
- 0x63AB, 0x6376, 0x63A3, 0x638F, 0x6389, 0x639F, 0x63B5, 0x636B,
- 0x6369, 0x63BE, 0x63E9, 0x63C0, 0x63C6, 0x63E3, 0x63C9, 0x63D2,
- 0x63F6, 0x63C4, 0x6416, 0x6434, 0x6406, 0x6413, 0x6426, 0x6436,
- 0x651D, 0x6417, 0x6428, 0x640F, 0x6467, 0x646F, 0x6476, 0x644E,
- 0x652A, 0x6495, 0x6493, 0x64A5, 0x64A9, 0x6488, 0x64BC,
-};
-static const unsigned short euc_to_utf8_DA[] = {
-         0x64DA, 0x64D2, 0x64C5, 0x64C7, 0x64BB, 0x64D8, 0x64C2,
- 0x64F1, 0x64E7, 0x8209, 0x64E0, 0x64E1, 0x62AC, 0x64E3, 0x64EF,
- 0x652C, 0x64F6, 0x64F4, 0x64F2, 0x64FA, 0x6500, 0x64FD, 0x6518,
- 0x651C, 0x6505, 0x6524, 0x6523, 0x652B, 0x6534, 0x6535, 0x6537,
- 0x6536, 0x6538, 0x754B, 0x6548, 0x6556, 0x6555, 0x654D, 0x6558,
- 0x655E, 0x655D, 0x6572, 0x6578, 0x6582, 0x6583, 0x8B8A, 0x659B,
- 0x659F, 0x65AB, 0x65B7, 0x65C3, 0x65C6, 0x65C1, 0x65C4, 0x65CC,
- 0x65D2, 0x65DB, 0x65D9, 0x65E0, 0x65E1, 0x65F1, 0x6772, 0x660A,
- 0x6603, 0x65FB, 0x6773, 0x6635, 0x6636, 0x6634, 0x661C, 0x664F,
- 0x6644, 0x6649, 0x6641, 0x665E, 0x665D, 0x6664, 0x6667, 0x6668,
- 0x665F, 0x6662, 0x6670, 0x6683, 0x6688, 0x668E, 0x6689, 0x6684,
- 0x6698, 0x669D, 0x66C1, 0x66B9, 0x66C9, 0x66BE, 0x66BC,
-};
-static const unsigned short euc_to_utf8_DB[] = {
-         0x66C4, 0x66B8, 0x66D6, 0x66DA, 0x66E0, 0x663F, 0x66E6,
- 0x66E9, 0x66F0, 0x66F5, 0x66F7, 0x670F, 0x6716, 0x671E, 0x6726,
- 0x6727, 0x9738, 0x672E, 0x673F, 0x6736, 0x6741, 0x6738, 0x6737,
- 0x6746, 0x675E, 0x6760, 0x6759, 0x6763, 0x6764, 0x6789, 0x6770,
- 0x67A9, 0x677C, 0x676A, 0x678C, 0x678B, 0x67A6, 0x67A1, 0x6785,
- 0x67B7, 0x67EF, 0x67B4, 0x67EC, 0x67B3, 0x67E9, 0x67B8, 0x67E4,
- 0x67DE, 0x67DD, 0x67E2, 0x67EE, 0x67B9, 0x67CE, 0x67C6, 0x67E7,
- 0x6A9C, 0x681E, 0x6846, 0x6829, 0x6840, 0x684D, 0x6832, 0x684E,
- 0x68B3, 0x682B, 0x6859, 0x6863, 0x6877, 0x687F, 0x689F, 0x688F,
- 0x68AD, 0x6894, 0x689D, 0x689B, 0x6883, 0x6AAE, 0x68B9, 0x6874,
- 0x68B5, 0x68A0, 0x68BA, 0x690F, 0x688D, 0x687E, 0x6901, 0x68CA,
- 0x6908, 0x68D8, 0x6922, 0x6926, 0x68E1, 0x690C, 0x68CD,
-};
-static const unsigned short euc_to_utf8_DC[] = {
-         0x68D4, 0x68E7, 0x68D5, 0x6936, 0x6912, 0x6904, 0x68D7,
- 0x68E3, 0x6925, 0x68F9, 0x68E0, 0x68EF, 0x6928, 0x692A, 0x691A,
- 0x6923, 0x6921, 0x68C6, 0x6979, 0x6977, 0x695C, 0x6978, 0x696B,
- 0x6954, 0x697E, 0x696E, 0x6939, 0x6974, 0x693D, 0x6959, 0x6930,
- 0x6961, 0x695E, 0x695D, 0x6981, 0x696A, 0x69B2, 0x69AE, 0x69D0,
- 0x69BF, 0x69C1, 0x69D3, 0x69BE, 0x69CE, 0x5BE8, 0x69CA, 0x69DD,
- 0x69BB, 0x69C3, 0x69A7, 0x6A2E, 0x6991, 0x69A0, 0x699C, 0x6995,
- 0x69B4, 0x69DE, 0x69E8, 0x6A02, 0x6A1B, 0x69FF, 0x6B0A, 0x69F9,
- 0x69F2, 0x69E7, 0x6A05, 0x69B1, 0x6A1E, 0x69ED, 0x6A14, 0x69EB,
- 0x6A0A, 0x6A12, 0x6AC1, 0x6A23, 0x6A13, 0x6A44, 0x6A0C, 0x6A72,
- 0x6A36, 0x6A78, 0x6A47, 0x6A62, 0x6A59, 0x6A66, 0x6A48, 0x6A38,
- 0x6A22, 0x6A90, 0x6A8D, 0x6AA0, 0x6A84, 0x6AA2, 0x6AA3,
-};
-static const unsigned short euc_to_utf8_DD[] = {
-         0x6A97, 0x8617, 0x6ABB, 0x6AC3, 0x6AC2, 0x6AB8, 0x6AB3,
- 0x6AAC, 0x6ADE, 0x6AD1, 0x6ADF, 0x6AAA, 0x6ADA, 0x6AEA, 0x6AFB,
- 0x6B05, 0x8616, 0x6AFA, 0x6B12, 0x6B16, 0x9B31, 0x6B1F, 0x6B38,
- 0x6B37, 0x76DC, 0x6B39, 0x98EE, 0x6B47, 0x6B43, 0x6B49, 0x6B50,
- 0x6B59, 0x6B54, 0x6B5B, 0x6B5F, 0x6B61, 0x6B78, 0x6B79, 0x6B7F,
- 0x6B80, 0x6B84, 0x6B83, 0x6B8D, 0x6B98, 0x6B95, 0x6B9E, 0x6BA4,
- 0x6BAA, 0x6BAB, 0x6BAF, 0x6BB2, 0x6BB1, 0x6BB3, 0x6BB7, 0x6BBC,
- 0x6BC6, 0x6BCB, 0x6BD3, 0x6BDF, 0x6BEC, 0x6BEB, 0x6BF3, 0x6BEF,
- 0x9EBE, 0x6C08, 0x6C13, 0x6C14, 0x6C1B, 0x6C24, 0x6C23, 0x6C5E,
- 0x6C55, 0x6C62, 0x6C6A, 0x6C82, 0x6C8D, 0x6C9A, 0x6C81, 0x6C9B,
- 0x6C7E, 0x6C68, 0x6C73, 0x6C92, 0x6C90, 0x6CC4, 0x6CF1, 0x6CD3,
- 0x6CBD, 0x6CD7, 0x6CC5, 0x6CDD, 0x6CAE, 0x6CB1, 0x6CBE,
-};
-static const unsigned short euc_to_utf8_DE[] = {
-         0x6CBA, 0x6CDB, 0x6CEF, 0x6CD9, 0x6CEA, 0x6D1F, 0x884D,
- 0x6D36, 0x6D2B, 0x6D3D, 0x6D38, 0x6D19, 0x6D35, 0x6D33, 0x6D12,
- 0x6D0C, 0x6D63, 0x6D93, 0x6D64, 0x6D5A, 0x6D79, 0x6D59, 0x6D8E,
- 0x6D95, 0x6FE4, 0x6D85, 0x6DF9, 0x6E15, 0x6E0A, 0x6DB5, 0x6DC7,
- 0x6DE6, 0x6DB8, 0x6DC6, 0x6DEC, 0x6DDE, 0x6DCC, 0x6DE8, 0x6DD2,
- 0x6DC5, 0x6DFA, 0x6DD9, 0x6DE4, 0x6DD5, 0x6DEA, 0x6DEE, 0x6E2D,
- 0x6E6E, 0x6E2E, 0x6E19, 0x6E72, 0x6E5F, 0x6E3E, 0x6E23, 0x6E6B,
- 0x6E2B, 0x6E76, 0x6E4D, 0x6E1F, 0x6E43, 0x6E3A, 0x6E4E, 0x6E24,
- 0x6EFF, 0x6E1D, 0x6E38, 0x6E82, 0x6EAA, 0x6E98, 0x6EC9, 0x6EB7,
- 0x6ED3, 0x6EBD, 0x6EAF, 0x6EC4, 0x6EB2, 0x6ED4, 0x6ED5, 0x6E8F,
- 0x6EA5, 0x6EC2, 0x6E9F, 0x6F41, 0x6F11, 0x704C, 0x6EEC, 0x6EF8,
- 0x6EFE, 0x6F3F, 0x6EF2, 0x6F31, 0x6EEF, 0x6F32, 0x6ECC,
-};
-static const unsigned short euc_to_utf8_DF[] = {
-         0x6F3E, 0x6F13, 0x6EF7, 0x6F86, 0x6F7A, 0x6F78, 0x6F81,
- 0x6F80, 0x6F6F, 0x6F5B, 0x6FF3, 0x6F6D, 0x6F82, 0x6F7C, 0x6F58,
- 0x6F8E, 0x6F91, 0x6FC2, 0x6F66, 0x6FB3, 0x6FA3, 0x6FA1, 0x6FA4,
- 0x6FB9, 0x6FC6, 0x6FAA, 0x6FDF, 0x6FD5, 0x6FEC, 0x6FD4, 0x6FD8,
- 0x6FF1, 0x6FEE, 0x6FDB, 0x7009, 0x700B, 0x6FFA, 0x7011, 0x7001,
- 0x700F, 0x6FFE, 0x701B, 0x701A, 0x6F74, 0x701D, 0x7018, 0x701F,
- 0x7030, 0x703E, 0x7032, 0x7051, 0x7063, 0x7099, 0x7092, 0x70AF,
- 0x70F1, 0x70AC, 0x70B8, 0x70B3, 0x70AE, 0x70DF, 0x70CB, 0x70DD,
- 0x70D9, 0x7109, 0x70FD, 0x711C, 0x7119, 0x7165, 0x7155, 0x7188,
- 0x7166, 0x7162, 0x714C, 0x7156, 0x716C, 0x718F, 0x71FB, 0x7184,
- 0x7195, 0x71A8, 0x71AC, 0x71D7, 0x71B9, 0x71BE, 0x71D2, 0x71C9,
- 0x71D4, 0x71CE, 0x71E0, 0x71EC, 0x71E7, 0x71F5, 0x71FC,
-};
-static const unsigned short euc_to_utf8_E0[] = {
-         0x71F9, 0x71FF, 0x720D, 0x7210, 0x721B, 0x7228, 0x722D,
- 0x722C, 0x7230, 0x7232, 0x723B, 0x723C, 0x723F, 0x7240, 0x7246,
- 0x724B, 0x7258, 0x7274, 0x727E, 0x7282, 0x7281, 0x7287, 0x7292,
- 0x7296, 0x72A2, 0x72A7, 0x72B9, 0x72B2, 0x72C3, 0x72C6, 0x72C4,
- 0x72CE, 0x72D2, 0x72E2, 0x72E0, 0x72E1, 0x72F9, 0x72F7, 0x500F,
- 0x7317, 0x730A, 0x731C, 0x7316, 0x731D, 0x7334, 0x732F, 0x7329,
- 0x7325, 0x733E, 0x734E, 0x734F, 0x9ED8, 0x7357, 0x736A, 0x7368,
- 0x7370, 0x7378, 0x7375, 0x737B, 0x737A, 0x73C8, 0x73B3, 0x73CE,
- 0x73BB, 0x73C0, 0x73E5, 0x73EE, 0x73DE, 0x74A2, 0x7405, 0x746F,
- 0x7425, 0x73F8, 0x7432, 0x743A, 0x7455, 0x743F, 0x745F, 0x7459,
- 0x7441, 0x745C, 0x7469, 0x7470, 0x7463, 0x746A, 0x7476, 0x747E,
- 0x748B, 0x749E, 0x74A7, 0x74CA, 0x74CF, 0x74D4, 0x73F1,
-};
-static const unsigned short euc_to_utf8_E1[] = {
-         0x74E0, 0x74E3, 0x74E7, 0x74E9, 0x74EE, 0x74F2, 0x74F0,
- 0x74F1, 0x74F8, 0x74F7, 0x7504, 0x7503, 0x7505, 0x750C, 0x750E,
- 0x750D, 0x7515, 0x7513, 0x751E, 0x7526, 0x752C, 0x753C, 0x7544,
- 0x754D, 0x754A, 0x7549, 0x755B, 0x7546, 0x755A, 0x7569, 0x7564,
- 0x7567, 0x756B, 0x756D, 0x7578, 0x7576, 0x7586, 0x7587, 0x7574,
- 0x758A, 0x7589, 0x7582, 0x7594, 0x759A, 0x759D, 0x75A5, 0x75A3,
- 0x75C2, 0x75B3, 0x75C3, 0x75B5, 0x75BD, 0x75B8, 0x75BC, 0x75B1,
- 0x75CD, 0x75CA, 0x75D2, 0x75D9, 0x75E3, 0x75DE, 0x75FE, 0x75FF,
- 0x75FC, 0x7601, 0x75F0, 0x75FA, 0x75F2, 0x75F3, 0x760B, 0x760D,
- 0x7609, 0x761F, 0x7627, 0x7620, 0x7621, 0x7622, 0x7624, 0x7634,
- 0x7630, 0x763B, 0x7647, 0x7648, 0x7646, 0x765C, 0x7658, 0x7661,
- 0x7662, 0x7668, 0x7669, 0x766A, 0x7667, 0x766C, 0x7670,
-};
-static const unsigned short euc_to_utf8_E2[] = {
-         0x7672, 0x7676, 0x7678, 0x767C, 0x7680, 0x7683, 0x7688,
- 0x768B, 0x768E, 0x7696, 0x7693, 0x7699, 0x769A, 0x76B0, 0x76B4,
- 0x76B8, 0x76B9, 0x76BA, 0x76C2, 0x76CD, 0x76D6, 0x76D2, 0x76DE,
- 0x76E1, 0x76E5, 0x76E7, 0x76EA, 0x862F, 0x76FB, 0x7708, 0x7707,
- 0x7704, 0x7729, 0x7724, 0x771E, 0x7725, 0x7726, 0x771B, 0x7737,
- 0x7738, 0x7747, 0x775A, 0x7768, 0x776B, 0x775B, 0x7765, 0x777F,
- 0x777E, 0x7779, 0x778E, 0x778B, 0x7791, 0x77A0, 0x779E, 0x77B0,
- 0x77B6, 0x77B9, 0x77BF, 0x77BC, 0x77BD, 0x77BB, 0x77C7, 0x77CD,
- 0x77D7, 0x77DA, 0x77DC, 0x77E3, 0x77EE, 0x77FC, 0x780C, 0x7812,
- 0x7926, 0x7820, 0x792A, 0x7845, 0x788E, 0x7874, 0x7886, 0x787C,
- 0x789A, 0x788C, 0x78A3, 0x78B5, 0x78AA, 0x78AF, 0x78D1, 0x78C6,
- 0x78CB, 0x78D4, 0x78BE, 0x78BC, 0x78C5, 0x78CA, 0x78EC,
-};
-static const unsigned short euc_to_utf8_E3[] = {
-         0x78E7, 0x78DA, 0x78FD, 0x78F4, 0x7907, 0x7912, 0x7911,
- 0x7919, 0x792C, 0x792B, 0x7940, 0x7960, 0x7957, 0x795F, 0x795A,
- 0x7955, 0x7953, 0x797A, 0x797F, 0x798A, 0x799D, 0x79A7, 0x9F4B,
- 0x79AA, 0x79AE, 0x79B3, 0x79B9, 0x79BA, 0x79C9, 0x79D5, 0x79E7,
- 0x79EC, 0x79E1, 0x79E3, 0x7A08, 0x7A0D, 0x7A18, 0x7A19, 0x7A20,
- 0x7A1F, 0x7980, 0x7A31, 0x7A3B, 0x7A3E, 0x7A37, 0x7A43, 0x7A57,
- 0x7A49, 0x7A61, 0x7A62, 0x7A69, 0x9F9D, 0x7A70, 0x7A79, 0x7A7D,
- 0x7A88, 0x7A97, 0x7A95, 0x7A98, 0x7A96, 0x7AA9, 0x7AC8, 0x7AB0,
- 0x7AB6, 0x7AC5, 0x7AC4, 0x7ABF, 0x9083, 0x7AC7, 0x7ACA, 0x7ACD,
- 0x7ACF, 0x7AD5, 0x7AD3, 0x7AD9, 0x7ADA, 0x7ADD, 0x7AE1, 0x7AE2,
- 0x7AE6, 0x7AED, 0x7AF0, 0x7B02, 0x7B0F, 0x7B0A, 0x7B06, 0x7B33,
- 0x7B18, 0x7B19, 0x7B1E, 0x7B35, 0x7B28, 0x7B36, 0x7B50,
-};
-static const unsigned short euc_to_utf8_E4[] = {
-         0x7B7A, 0x7B04, 0x7B4D, 0x7B0B, 0x7B4C, 0x7B45, 0x7B75,
- 0x7B65, 0x7B74, 0x7B67, 0x7B70, 0x7B71, 0x7B6C, 0x7B6E, 0x7B9D,
- 0x7B98, 0x7B9F, 0x7B8D, 0x7B9C, 0x7B9A, 0x7B8B, 0x7B92, 0x7B8F,
- 0x7B5D, 0x7B99, 0x7BCB, 0x7BC1, 0x7BCC, 0x7BCF, 0x7BB4, 0x7BC6,
- 0x7BDD, 0x7BE9, 0x7C11, 0x7C14, 0x7BE6, 0x7BE5, 0x7C60, 0x7C00,
- 0x7C07, 0x7C13, 0x7BF3, 0x7BF7, 0x7C17, 0x7C0D, 0x7BF6, 0x7C23,
- 0x7C27, 0x7C2A, 0x7C1F, 0x7C37, 0x7C2B, 0x7C3D, 0x7C4C, 0x7C43,
- 0x7C54, 0x7C4F, 0x7C40, 0x7C50, 0x7C58, 0x7C5F, 0x7C64, 0x7C56,
- 0x7C65, 0x7C6C, 0x7C75, 0x7C83, 0x7C90, 0x7CA4, 0x7CAD, 0x7CA2,
- 0x7CAB, 0x7CA1, 0x7CA8, 0x7CB3, 0x7CB2, 0x7CB1, 0x7CAE, 0x7CB9,
- 0x7CBD, 0x7CC0, 0x7CC5, 0x7CC2, 0x7CD8, 0x7CD2, 0x7CDC, 0x7CE2,
- 0x9B3B, 0x7CEF, 0x7CF2, 0x7CF4, 0x7CF6, 0x7CFA, 0x7D06,
-};
-static const unsigned short euc_to_utf8_E5[] = {
-         0x7D02, 0x7D1C, 0x7D15, 0x7D0A, 0x7D45, 0x7D4B, 0x7D2E,
- 0x7D32, 0x7D3F, 0x7D35, 0x7D46, 0x7D73, 0x7D56, 0x7D4E, 0x7D72,
- 0x7D68, 0x7D6E, 0x7D4F, 0x7D63, 0x7D93, 0x7D89, 0x7D5B, 0x7D8F,
- 0x7D7D, 0x7D9B, 0x7DBA, 0x7DAE, 0x7DA3, 0x7DB5, 0x7DC7, 0x7DBD,
- 0x7DAB, 0x7E3D, 0x7DA2, 0x7DAF, 0x7DDC, 0x7DB8, 0x7D9F, 0x7DB0,
- 0x7DD8, 0x7DDD, 0x7DE4, 0x7DDE, 0x7DFB, 0x7DF2, 0x7DE1, 0x7E05,
- 0x7E0A, 0x7E23, 0x7E21, 0x7E12, 0x7E31, 0x7E1F, 0x7E09, 0x7E0B,
- 0x7E22, 0x7E46, 0x7E66, 0x7E3B, 0x7E35, 0x7E39, 0x7E43, 0x7E37,
- 0x7E32, 0x7E3A, 0x7E67, 0x7E5D, 0x7E56, 0x7E5E, 0x7E59, 0x7E5A,
- 0x7E79, 0x7E6A, 0x7E69, 0x7E7C, 0x7E7B, 0x7E83, 0x7DD5, 0x7E7D,
- 0x8FAE, 0x7E7F, 0x7E88, 0x7E89, 0x7E8C, 0x7E92, 0x7E90, 0x7E93,
- 0x7E94, 0x7E96, 0x7E8E, 0x7E9B, 0x7E9C, 0x7F38, 0x7F3A,
-};
-static const unsigned short euc_to_utf8_E6[] = {
-         0x7F45, 0x7F4C, 0x7F4D, 0x7F4E, 0x7F50, 0x7F51, 0x7F55,
- 0x7F54, 0x7F58, 0x7F5F, 0x7F60, 0x7F68, 0x7F69, 0x7F67, 0x7F78,
- 0x7F82, 0x7F86, 0x7F83, 0x7F88, 0x7F87, 0x7F8C, 0x7F94, 0x7F9E,
- 0x7F9D, 0x7F9A, 0x7FA3, 0x7FAF, 0x7FB2, 0x7FB9, 0x7FAE, 0x7FB6,
- 0x7FB8, 0x8B71, 0x7FC5, 0x7FC6, 0x7FCA, 0x7FD5, 0x7FD4, 0x7FE1,
- 0x7FE6, 0x7FE9, 0x7FF3, 0x7FF9, 0x98DC, 0x8006, 0x8004, 0x800B,
- 0x8012, 0x8018, 0x8019, 0x801C, 0x8021, 0x8028, 0x803F, 0x803B,
- 0x804A, 0x8046, 0x8052, 0x8058, 0x805A, 0x805F, 0x8062, 0x8068,
- 0x8073, 0x8072, 0x8070, 0x8076, 0x8079, 0x807D, 0x807F, 0x8084,
- 0x8086, 0x8085, 0x809B, 0x8093, 0x809A, 0x80AD, 0x5190, 0x80AC,
- 0x80DB, 0x80E5, 0x80D9, 0x80DD, 0x80C4, 0x80DA, 0x80D6, 0x8109,
- 0x80EF, 0x80F1, 0x811B, 0x8129, 0x8123, 0x812F, 0x814B,
-};
-static const unsigned short euc_to_utf8_E7[] = {
-         0x968B, 0x8146, 0x813E, 0x8153, 0x8151, 0x80FC, 0x8171,
- 0x816E, 0x8165, 0x8166, 0x8174, 0x8183, 0x8188, 0x818A, 0x8180,
- 0x8182, 0x81A0, 0x8195, 0x81A4, 0x81A3, 0x815F, 0x8193, 0x81A9,
- 0x81B0, 0x81B5, 0x81BE, 0x81B8, 0x81BD, 0x81C0, 0x81C2, 0x81BA,
- 0x81C9, 0x81CD, 0x81D1, 0x81D9, 0x81D8, 0x81C8, 0x81DA, 0x81DF,
- 0x81E0, 0x81E7, 0x81FA, 0x81FB, 0x81FE, 0x8201, 0x8202, 0x8205,
- 0x8207, 0x820A, 0x820D, 0x8210, 0x8216, 0x8229, 0x822B, 0x8238,
- 0x8233, 0x8240, 0x8259, 0x8258, 0x825D, 0x825A, 0x825F, 0x8264,
- 0x8262, 0x8268, 0x826A, 0x826B, 0x822E, 0x8271, 0x8277, 0x8278,
- 0x827E, 0x828D, 0x8292, 0x82AB, 0x829F, 0x82BB, 0x82AC, 0x82E1,
- 0x82E3, 0x82DF, 0x82D2, 0x82F4, 0x82F3, 0x82FA, 0x8393, 0x8303,
- 0x82FB, 0x82F9, 0x82DE, 0x8306, 0x82DC, 0x8309, 0x82D9,
-};
-static const unsigned short euc_to_utf8_E8[] = {
-         0x8335, 0x8334, 0x8316, 0x8332, 0x8331, 0x8340, 0x8339,
- 0x8350, 0x8345, 0x832F, 0x832B, 0x8317, 0x8318, 0x8385, 0x839A,
- 0x83AA, 0x839F, 0x83A2, 0x8396, 0x8323, 0x838E, 0x8387, 0x838A,
- 0x837C, 0x83B5, 0x8373, 0x8375, 0x83A0, 0x8389, 0x83A8, 0x83F4,
- 0x8413, 0x83EB, 0x83CE, 0x83FD, 0x8403, 0x83D8, 0x840B, 0x83C1,
- 0x83F7, 0x8407, 0x83E0, 0x83F2, 0x840D, 0x8422, 0x8420, 0x83BD,
- 0x8438, 0x8506, 0x83FB, 0x846D, 0x842A, 0x843C, 0x855A, 0x8484,
- 0x8477, 0x846B, 0x84AD, 0x846E, 0x8482, 0x8469, 0x8446, 0x842C,
- 0x846F, 0x8479, 0x8435, 0x84CA, 0x8462, 0x84B9, 0x84BF, 0x849F,
- 0x84D9, 0x84CD, 0x84BB, 0x84DA, 0x84D0, 0x84C1, 0x84C6, 0x84D6,
- 0x84A1, 0x8521, 0x84FF, 0x84F4, 0x8517, 0x8518, 0x852C, 0x851F,
- 0x8515, 0x8514, 0x84FC, 0x8540, 0x8563, 0x8558, 0x8548,
-};
-static const unsigned short euc_to_utf8_E9[] = {
-         0x8541, 0x8602, 0x854B, 0x8555, 0x8580, 0x85A4, 0x8588,
- 0x8591, 0x858A, 0x85A8, 0x856D, 0x8594, 0x859B, 0x85EA, 0x8587,
- 0x859C, 0x8577, 0x857E, 0x8590, 0x85C9, 0x85BA, 0x85CF, 0x85B9,
- 0x85D0, 0x85D5, 0x85DD, 0x85E5, 0x85DC, 0x85F9, 0x860A, 0x8613,
- 0x860B, 0x85FE, 0x85FA, 0x8606, 0x8622, 0x861A, 0x8630, 0x863F,
- 0x864D, 0x4E55, 0x8654, 0x865F, 0x8667, 0x8671, 0x8693, 0x86A3,
- 0x86A9, 0x86AA, 0x868B, 0x868C, 0x86B6, 0x86AF, 0x86C4, 0x86C6,
- 0x86B0, 0x86C9, 0x8823, 0x86AB, 0x86D4, 0x86DE, 0x86E9, 0x86EC,
- 0x86DF, 0x86DB, 0x86EF, 0x8712, 0x8706, 0x8708, 0x8700, 0x8703,
- 0x86FB, 0x8711, 0x8709, 0x870D, 0x86F9, 0x870A, 0x8734, 0x873F,
- 0x8737, 0x873B, 0x8725, 0x8729, 0x871A, 0x8760, 0x875F, 0x8778,
- 0x874C, 0x874E, 0x8774, 0x8757, 0x8768, 0x876E, 0x8759,
-};
-static const unsigned short euc_to_utf8_EA[] = {
-         0x8753, 0x8763, 0x876A, 0x8805, 0x87A2, 0x879F, 0x8782,
- 0x87AF, 0x87CB, 0x87BD, 0x87C0, 0x87D0, 0x96D6, 0x87AB, 0x87C4,
- 0x87B3, 0x87C7, 0x87C6, 0x87BB, 0x87EF, 0x87F2, 0x87E0, 0x880F,
- 0x880D, 0x87FE, 0x87F6, 0x87F7, 0x880E, 0x87D2, 0x8811, 0x8816,
- 0x8815, 0x8822, 0x8821, 0x8831, 0x8836, 0x8839, 0x8827, 0x883B,
- 0x8844, 0x8842, 0x8852, 0x8859, 0x885E, 0x8862, 0x886B, 0x8881,
- 0x887E, 0x889E, 0x8875, 0x887D, 0x88B5, 0x8872, 0x8882, 0x8897,
- 0x8892, 0x88AE, 0x8899, 0x88A2, 0x888D, 0x88A4, 0x88B0, 0x88BF,
- 0x88B1, 0x88C3, 0x88C4, 0x88D4, 0x88D8, 0x88D9, 0x88DD, 0x88F9,
- 0x8902, 0x88FC, 0x88F4, 0x88E8, 0x88F2, 0x8904, 0x890C, 0x890A,
- 0x8913, 0x8943, 0x891E, 0x8925, 0x892A, 0x892B, 0x8941, 0x8944,
- 0x893B, 0x8936, 0x8938, 0x894C, 0x891D, 0x8960, 0x895E,
-};
-static const unsigned short euc_to_utf8_EB[] = {
-         0x8966, 0x8964, 0x896D, 0x896A, 0x896F, 0x8974, 0x8977,
- 0x897E, 0x8983, 0x8988, 0x898A, 0x8993, 0x8998, 0x89A1, 0x89A9,
- 0x89A6, 0x89AC, 0x89AF, 0x89B2, 0x89BA, 0x89BD, 0x89BF, 0x89C0,
- 0x89DA, 0x89DC, 0x89DD, 0x89E7, 0x89F4, 0x89F8, 0x8A03, 0x8A16,
- 0x8A10, 0x8A0C, 0x8A1B, 0x8A1D, 0x8A25, 0x8A36, 0x8A41, 0x8A5B,
- 0x8A52, 0x8A46, 0x8A48, 0x8A7C, 0x8A6D, 0x8A6C, 0x8A62, 0x8A85,
- 0x8A82, 0x8A84, 0x8AA8, 0x8AA1, 0x8A91, 0x8AA5, 0x8AA6, 0x8A9A,
- 0x8AA3, 0x8AC4, 0x8ACD, 0x8AC2, 0x8ADA, 0x8AEB, 0x8AF3, 0x8AE7,
- 0x8AE4, 0x8AF1, 0x8B14, 0x8AE0, 0x8AE2, 0x8AF7, 0x8ADE, 0x8ADB,
- 0x8B0C, 0x8B07, 0x8B1A, 0x8AE1, 0x8B16, 0x8B10, 0x8B17, 0x8B20,
- 0x8B33, 0x97AB, 0x8B26, 0x8B2B, 0x8B3E, 0x8B28, 0x8B41, 0x8B4C,
- 0x8B4F, 0x8B4E, 0x8B49, 0x8B56, 0x8B5B, 0x8B5A, 0x8B6B,
-};
-static const unsigned short euc_to_utf8_EC[] = {
-         0x8B5F, 0x8B6C, 0x8B6F, 0x8B74, 0x8B7D, 0x8B80, 0x8B8C,
- 0x8B8E, 0x8B92, 0x8B93, 0x8B96, 0x8B99, 0x8B9A, 0x8C3A, 0x8C41,
- 0x8C3F, 0x8C48, 0x8C4C, 0x8C4E, 0x8C50, 0x8C55, 0x8C62, 0x8C6C,
- 0x8C78, 0x8C7A, 0x8C82, 0x8C89, 0x8C85, 0x8C8A, 0x8C8D, 0x8C8E,
- 0x8C94, 0x8C7C, 0x8C98, 0x621D, 0x8CAD, 0x8CAA, 0x8CBD, 0x8CB2,
- 0x8CB3, 0x8CAE, 0x8CB6, 0x8CC8, 0x8CC1, 0x8CE4, 0x8CE3, 0x8CDA,
- 0x8CFD, 0x8CFA, 0x8CFB, 0x8D04, 0x8D05, 0x8D0A, 0x8D07, 0x8D0F,
- 0x8D0D, 0x8D10, 0x9F4E, 0x8D13, 0x8CCD, 0x8D14, 0x8D16, 0x8D67,
- 0x8D6D, 0x8D71, 0x8D73, 0x8D81, 0x8D99, 0x8DC2, 0x8DBE, 0x8DBA,
- 0x8DCF, 0x8DDA, 0x8DD6, 0x8DCC, 0x8DDB, 0x8DCB, 0x8DEA, 0x8DEB,
- 0x8DDF, 0x8DE3, 0x8DFC, 0x8E08, 0x8E09, 0x8DFF, 0x8E1D, 0x8E1E,
- 0x8E10, 0x8E1F, 0x8E42, 0x8E35, 0x8E30, 0x8E34, 0x8E4A,
-};
-static const unsigned short euc_to_utf8_ED[] = {
-         0x8E47, 0x8E49, 0x8E4C, 0x8E50, 0x8E48, 0x8E59, 0x8E64,
- 0x8E60, 0x8E2A, 0x8E63, 0x8E55, 0x8E76, 0x8E72, 0x8E7C, 0x8E81,
- 0x8E87, 0x8E85, 0x8E84, 0x8E8B, 0x8E8A, 0x8E93, 0x8E91, 0x8E94,
- 0x8E99, 0x8EAA, 0x8EA1, 0x8EAC, 0x8EB0, 0x8EC6, 0x8EB1, 0x8EBE,
- 0x8EC5, 0x8EC8, 0x8ECB, 0x8EDB, 0x8EE3, 0x8EFC, 0x8EFB, 0x8EEB,
- 0x8EFE, 0x8F0A, 0x8F05, 0x8F15, 0x8F12, 0x8F19, 0x8F13, 0x8F1C,
- 0x8F1F, 0x8F1B, 0x8F0C, 0x8F26, 0x8F33, 0x8F3B, 0x8F39, 0x8F45,
- 0x8F42, 0x8F3E, 0x8F4C, 0x8F49, 0x8F46, 0x8F4E, 0x8F57, 0x8F5C,
- 0x8F62, 0x8F63, 0x8F64, 0x8F9C, 0x8F9F, 0x8FA3, 0x8FAD, 0x8FAF,
- 0x8FB7, 0x8FDA, 0x8FE5, 0x8FE2, 0x8FEA, 0x8FEF, 0x9087, 0x8FF4,
- 0x9005, 0x8FF9, 0x8FFA, 0x9011, 0x9015, 0x9021, 0x900D, 0x901E,
- 0x9016, 0x900B, 0x9027, 0x9036, 0x9035, 0x9039, 0x8FF8,
-};
-static const unsigned short euc_to_utf8_EE[] = {
-         0x904F, 0x9050, 0x9051, 0x9052, 0x900E, 0x9049, 0x903E,
- 0x9056, 0x9058, 0x905E, 0x9068, 0x906F, 0x9076, 0x96A8, 0x9072,
- 0x9082, 0x907D, 0x9081, 0x9080, 0x908A, 0x9089, 0x908F, 0x90A8,
- 0x90AF, 0x90B1, 0x90B5, 0x90E2, 0x90E4, 0x6248, 0x90DB, 0x9102,
- 0x9112, 0x9119, 0x9132, 0x9130, 0x914A, 0x9156, 0x9158, 0x9163,
- 0x9165, 0x9169, 0x9173, 0x9172, 0x918B, 0x9189, 0x9182, 0x91A2,
- 0x91AB, 0x91AF, 0x91AA, 0x91B5, 0x91B4, 0x91BA, 0x91C0, 0x91C1,
- 0x91C9, 0x91CB, 0x91D0, 0x91D6, 0x91DF, 0x91E1, 0x91DB, 0x91FC,
- 0x91F5, 0x91F6, 0x921E, 0x91FF, 0x9214, 0x922C, 0x9215, 0x9211,
- 0x925E, 0x9257, 0x9245, 0x9249, 0x9264, 0x9248, 0x9295, 0x923F,
- 0x924B, 0x9250, 0x929C, 0x9296, 0x9293, 0x929B, 0x925A, 0x92CF,
- 0x92B9, 0x92B7, 0x92E9, 0x930F, 0x92FA, 0x9344, 0x932E,
-};
-static const unsigned short euc_to_utf8_EF[] = {
-         0x9319, 0x9322, 0x931A, 0x9323, 0x933A, 0x9335, 0x933B,
- 0x935C, 0x9360, 0x937C, 0x936E, 0x9356, 0x93B0, 0x93AC, 0x93AD,
- 0x9394, 0x93B9, 0x93D6, 0x93D7, 0x93E8, 0x93E5, 0x93D8, 0x93C3,
- 0x93DD, 0x93D0, 0x93C8, 0x93E4, 0x941A, 0x9414, 0x9413, 0x9403,
- 0x9407, 0x9410, 0x9436, 0x942B, 0x9435, 0x9421, 0x943A, 0x9441,
- 0x9452, 0x9444, 0x945B, 0x9460, 0x9462, 0x945E, 0x946A, 0x9229,
- 0x9470, 0x9475, 0x9477, 0x947D, 0x945A, 0x947C, 0x947E, 0x9481,
- 0x947F, 0x9582, 0x9587, 0x958A, 0x9594, 0x9596, 0x9598, 0x9599,
- 0x95A0, 0x95A8, 0x95A7, 0x95AD, 0x95BC, 0x95BB, 0x95B9, 0x95BE,
- 0x95CA, 0x6FF6, 0x95C3, 0x95CD, 0x95CC, 0x95D5, 0x95D4, 0x95D6,
- 0x95DC, 0x95E1, 0x95E5, 0x95E2, 0x9621, 0x9628, 0x962E, 0x962F,
- 0x9642, 0x964C, 0x964F, 0x964B, 0x9677, 0x965C, 0x965E,
-};
-static const unsigned short euc_to_utf8_F0[] = {
-         0x965D, 0x965F, 0x9666, 0x9672, 0x966C, 0x968D, 0x9698,
- 0x9695, 0x9697, 0x96AA, 0x96A7, 0x96B1, 0x96B2, 0x96B0, 0x96B4,
- 0x96B6, 0x96B8, 0x96B9, 0x96CE, 0x96CB, 0x96C9, 0x96CD, 0x894D,
- 0x96DC, 0x970D, 0x96D5, 0x96F9, 0x9704, 0x9706, 0x9708, 0x9713,
- 0x970E, 0x9711, 0x970F, 0x9716, 0x9719, 0x9724, 0x972A, 0x9730,
- 0x9739, 0x973D, 0x973E, 0x9744, 0x9746, 0x9748, 0x9742, 0x9749,
- 0x975C, 0x9760, 0x9764, 0x9766, 0x9768, 0x52D2, 0x976B, 0x9771,
- 0x9779, 0x9785, 0x977C, 0x9781, 0x977A, 0x9786, 0x978B, 0x978F,
- 0x9790, 0x979C, 0x97A8, 0x97A6, 0x97A3, 0x97B3, 0x97B4, 0x97C3,
- 0x97C6, 0x97C8, 0x97CB, 0x97DC, 0x97ED, 0x9F4F, 0x97F2, 0x7ADF,
- 0x97F6, 0x97F5, 0x980F, 0x980C, 0x9838, 0x9824, 0x9821, 0x9837,
- 0x983D, 0x9846, 0x984F, 0x984B, 0x986B, 0x986F, 0x9870,
-};
-static const unsigned short euc_to_utf8_F1[] = {
-         0x9871, 0x9874, 0x9873, 0x98AA, 0x98AF, 0x98B1, 0x98B6,
- 0x98C4, 0x98C3, 0x98C6, 0x98E9, 0x98EB, 0x9903, 0x9909, 0x9912,
- 0x9914, 0x9918, 0x9921, 0x991D, 0x991E, 0x9924, 0x9920, 0x992C,
- 0x992E, 0x993D, 0x993E, 0x9942, 0x9949, 0x9945, 0x9950, 0x994B,
- 0x9951, 0x9952, 0x994C, 0x9955, 0x9997, 0x9998, 0x99A5, 0x99AD,
- 0x99AE, 0x99BC, 0x99DF, 0x99DB, 0x99DD, 0x99D8, 0x99D1, 0x99ED,
- 0x99EE, 0x99F1, 0x99F2, 0x99FB, 0x99F8, 0x9A01, 0x9A0F, 0x9A05,
- 0x99E2, 0x9A19, 0x9A2B, 0x9A37, 0x9A45, 0x9A42, 0x9A40, 0x9A43,
- 0x9A3E, 0x9A55, 0x9A4D, 0x9A5B, 0x9A57, 0x9A5F, 0x9A62, 0x9A65,
- 0x9A64, 0x9A69, 0x9A6B, 0x9A6A, 0x9AAD, 0x9AB0, 0x9ABC, 0x9AC0,
- 0x9ACF, 0x9AD1, 0x9AD3, 0x9AD4, 0x9ADE, 0x9ADF, 0x9AE2, 0x9AE3,
- 0x9AE6, 0x9AEF, 0x9AEB, 0x9AEE, 0x9AF4, 0x9AF1, 0x9AF7,
-};
-static const unsigned short euc_to_utf8_F2[] = {
-         0x9AFB, 0x9B06, 0x9B18, 0x9B1A, 0x9B1F, 0x9B22, 0x9B23,
- 0x9B25, 0x9B27, 0x9B28, 0x9B29, 0x9B2A, 0x9B2E, 0x9B2F, 0x9B32,
- 0x9B44, 0x9B43, 0x9B4F, 0x9B4D, 0x9B4E, 0x9B51, 0x9B58, 0x9B74,
- 0x9B93, 0x9B83, 0x9B91, 0x9B96, 0x9B97, 0x9B9F, 0x9BA0, 0x9BA8,
- 0x9BB4, 0x9BC0, 0x9BCA, 0x9BB9, 0x9BC6, 0x9BCF, 0x9BD1, 0x9BD2,
- 0x9BE3, 0x9BE2, 0x9BE4, 0x9BD4, 0x9BE1, 0x9C3A, 0x9BF2, 0x9BF1,
- 0x9BF0, 0x9C15, 0x9C14, 0x9C09, 0x9C13, 0x9C0C, 0x9C06, 0x9C08,
- 0x9C12, 0x9C0A, 0x9C04, 0x9C2E, 0x9C1B, 0x9C25, 0x9C24, 0x9C21,
- 0x9C30, 0x9C47, 0x9C32, 0x9C46, 0x9C3E, 0x9C5A, 0x9C60, 0x9C67,
- 0x9C76, 0x9C78, 0x9CE7, 0x9CEC, 0x9CF0, 0x9D09, 0x9D08, 0x9CEB,
- 0x9D03, 0x9D06, 0x9D2A, 0x9D26, 0x9DAF, 0x9D23, 0x9D1F, 0x9D44,
- 0x9D15, 0x9D12, 0x9D41, 0x9D3F, 0x9D3E, 0x9D46, 0x9D48,
-};
-static const unsigned short euc_to_utf8_F3[] = {
-         0x9D5D, 0x9D5E, 0x9D64, 0x9D51, 0x9D50, 0x9D59, 0x9D72,
- 0x9D89, 0x9D87, 0x9DAB, 0x9D6F, 0x9D7A, 0x9D9A, 0x9DA4, 0x9DA9,
- 0x9DB2, 0x9DC4, 0x9DC1, 0x9DBB, 0x9DB8, 0x9DBA, 0x9DC6, 0x9DCF,
- 0x9DC2, 0x9DD9, 0x9DD3, 0x9DF8, 0x9DE6, 0x9DED, 0x9DEF, 0x9DFD,
- 0x9E1A, 0x9E1B, 0x9E1E, 0x9E75, 0x9E79, 0x9E7D, 0x9E81, 0x9E88,
- 0x9E8B, 0x9E8C, 0x9E92, 0x9E95, 0x9E91, 0x9E9D, 0x9EA5, 0x9EA9,
- 0x9EB8, 0x9EAA, 0x9EAD, 0x9761, 0x9ECC, 0x9ECE, 0x9ECF, 0x9ED0,
- 0x9ED4, 0x9EDC, 0x9EDE, 0x9EDD, 0x9EE0, 0x9EE5, 0x9EE8, 0x9EEF,
- 0x9EF4, 0x9EF6, 0x9EF7, 0x9EF9, 0x9EFB, 0x9EFC, 0x9EFD, 0x9F07,
- 0x9F08, 0x76B7, 0x9F15, 0x9F21, 0x9F2C, 0x9F3E, 0x9F4A, 0x9F52,
- 0x9F54, 0x9F63, 0x9F5F, 0x9F60, 0x9F61, 0x9F66, 0x9F67, 0x9F6C,
- 0x9F6A, 0x9F77, 0x9F72, 0x9F76, 0x9F95, 0x9F9C, 0x9FA0,
-};
-static const unsigned short euc_to_utf8_F4[] = {
-         0x582F, 0x69C7, 0x9059, 0x7464, 0x51DC, 0x7199,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,
-};
-static const unsigned short euc_to_utf8_F4_x0213[] = {
-         0x582F, 0x69C7, 0x9059, 0x7464, 0x51DC, 0x7199, 0x5653,
- 0x5DE2, 0x5E14, 0x5E18, 0x5E58, 0x5E5E, 0x5EBE, 0xF928, 0x5ECB,
- 0x5EF9, 0x5F00, 0x5F02, 0x5F07, 0x5F1D, 0x5F23, 0x5F34, 0x5F36,
- 0x5F3D, 0x5F40, 0x5F45, 0x5F54, 0x5F58, 0x5F64, 0x5F67, 0x5F7D,
- 0x5F89, 0x5F9C, 0x5FA7, 0x5FAF, 0x5FB5, 0x5FB7, 0x5FC9, 0x5FDE,
- 0x5FE1, 0x5FE9, 0x600D, 0x6014, 0x6018, 0x6033, 0x6035, 0x6047,
- 0xFA3D, 0x609D, 0x609E, 0x60CB, 0x60D4, 0x60D5, 0x60DD, 0x60F8,
- 0x611C, 0x612B, 0x6130, 0x6137, 0xFA3E, 0x618D, 0xFA3F, 0x61BC,
- 0x61B9, 0xFA40, 0x6222, 0x623E, 0x6243, 0x6256, 0x625A, 0x626F,
- 0x6285, 0x62C4, 0x62D6, 0x62FC, 0x630A, 0x6318, 0x6339, 0x6343,
- 0x6365, 0x637C, 0x63E5, 0x63ED, 0x63F5, 0x6410, 0x6414, 0x6422,
- 0x6479, 0x6451, 0x6460, 0x646D, 0x64CE, 0x64BE, 0x64BF,
-};
-static const unsigned short euc_to_utf8_F5[] = {
-              0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0, 0xFE33,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0, 0xFE31,      0,      0,
-      0,      0,      0,      0,      0, 0xFE30,      0,      0,
-      0,      0, 0xFE35, 0xFE36, 0xFE39, 0xFE3A,      0,      0,
- 0xFE37, 0xFE38, 0xFE3F, 0xFE40, 0xFE3D, 0xFE3E, 0xFE41, 0xFE42,
- 0xFE43, 0xFE44, 0xFE3B, 0xFE3C,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,
-};
-static const unsigned short euc_to_utf8_F5_x0213[] = {
-         0x64C4, 0x64CA, 0x64D0, 0x64F7, 0x64FB, 0x6522, 0x6529,
- 0xFA41, 0x6567, 0x659D, 0xFA42, 0x6600, 0x6609, 0x6615, 0x661E,
- 0x663A, 0x6622, 0x6624, 0x662B, 0x6630, 0x6631, 0x6633, 0x66FB,
- 0x6648, 0x664C, 0xD84C /*0xDDC4*/, 0x6659, 0x665A, 0x6661, 0x6665, 0x6673,
- 0x6677, 0x6678, 0x668D, 0xFA43, 0x66A0, 0x66B2, 0x66BB, 0x66C6,
- 0x66C8, 0x3B22, 0x66DB, 0x66E8, 0x66FA, 0x6713, 0xF929, 0x6733,
- 0x6766, 0x6747, 0x6748, 0x677B, 0x6781, 0x6793, 0x6798, 0x679B,
- 0x67BB, 0x67F9, 0x67C0, 0x67D7, 0x67FC, 0x6801, 0x6852, 0x681D,
- 0x682C, 0x6831, 0x685B, 0x6872, 0x6875, 0xFA44, 0x68A3, 0x68A5,
- 0x68B2, 0x68C8, 0x68D0, 0x68E8, 0x68ED, 0x68F0, 0x68F1, 0x68FC,
- 0x690A, 0x6949, 0xD84D /*0xDDC4*/, 0x6935, 0x6942, 0x6957, 0x6963, 0x6964,
- 0x6968, 0x6980, 0xFA14, 0x69A5, 0x69AD, 0x69CF, 0x3BB6,
-};
-static const unsigned short euc_to_utf8_F6_x0213[] = {
-         0x3BC3, 0x69E2, 0x69E9, 0x69EA, 0x69F5, 0x69F6, 0x6A0F,
- 0x6A15, 0xD84D /*0xDF3F*/, 0x6A3B, 0x6A3E, 0x6A45, 0x6A50, 0x6A56, 0x6A5B,
- 0x6A6B, 0x6A73, 0xD84D /*0xDF63*/, 0x6A89, 0x6A94, 0x6A9D, 0x6A9E, 0x6AA5,
- 0x6AE4, 0x6AE7, 0x3C0F, 0xF91D, 0x6B1B, 0x6B1E, 0x6B2C, 0x6B35,
- 0x6B46, 0x6B56, 0x6B60, 0x6B65, 0x6B67, 0x6B77, 0x6B82, 0x6BA9,
- 0x6BAD, 0xF970, 0x6BCF, 0x6BD6, 0x6BD7, 0x6BFF, 0x6C05, 0x6C10,
- 0x6C33, 0x6C59, 0x6C5C, 0x6CAA, 0x6C74, 0x6C76, 0x6C85, 0x6C86,
- 0x6C98, 0x6C9C, 0x6CFB, 0x6CC6, 0x6CD4, 0x6CE0, 0x6CEB, 0x6CEE,
- 0xD84F /*0xDCFE*/, 0x6D04, 0x6D0E, 0x6D2E, 0x6D31, 0x6D39, 0x6D3F, 0x6D58,
- 0x6D65, 0xFA45, 0x6D82, 0x6D87, 0x6D89, 0x6D94, 0x6DAA, 0x6DAC,
- 0x6DBF, 0x6DC4, 0x6DD6, 0x6DDA, 0x6DDB, 0x6DDD, 0x6DFC, 0xFA46,
- 0x6E34, 0x6E44, 0x6E5C, 0x6E5E, 0x6EAB, 0x6EB1, 0x6EC1,
-};
-static const unsigned short euc_to_utf8_F7_x0213[] = {
-         0x6EC7, 0x6ECE, 0x6F10, 0x6F1A, 0xFA47, 0x6F2A, 0x6F2F,
- 0x6F33, 0x6F51, 0x6F59, 0x6F5E, 0x6F61, 0x6F62, 0x6F7E, 0x6F88,
- 0x6F8C, 0x6F8D, 0x6F94, 0x6FA0, 0x6FA7, 0x6FB6, 0x6FBC, 0x6FC7,
- 0x6FCA, 0x6FF9, 0x6FF0, 0x6FF5, 0x7005, 0x7006, 0x7028, 0x704A,
- 0x705D, 0x705E, 0x704E, 0x7064, 0x7075, 0x7085, 0x70A4, 0x70AB,
- 0x70B7, 0x70D4, 0x70D8, 0x70E4, 0x710F, 0x712B, 0x711E, 0x7120,
- 0x712E, 0x7130, 0x7146, 0x7147, 0x7151, 0xFA48, 0x7152, 0x715C,
- 0x7160, 0x7168, 0xFA15, 0x7185, 0x7187, 0x7192, 0x71C1, 0x71BA,
- 0x71C4, 0x71FE, 0x7200, 0x7215, 0x7255, 0x7256, 0x3E3F, 0x728D,
- 0x729B, 0x72BE, 0x72C0, 0x72FB, 0xD851 /*0xDFF1*/, 0x7327, 0x7328, 0xFA16,
- 0x7350, 0x7366, 0x737C, 0x7395, 0x739F, 0x73A0, 0x73A2, 0x73A6,
- 0x73AB, 0x73C9, 0x73CF, 0x73D6, 0x73D9, 0x73E3, 0x73E9,
-};
-static const unsigned short euc_to_utf8_F8_x0213[] = {
-         0x7407, 0x740A, 0x741A, 0x741B, 0xFA4A, 0x7426, 0x7428,
- 0x742A, 0x742B, 0x742C, 0x742E, 0x742F, 0x7430, 0x7444, 0x7446,
- 0x7447, 0x744B, 0x7457, 0x7462, 0x746B, 0x746D, 0x7486, 0x7487,
- 0x7489, 0x7498, 0x749C, 0x749F, 0x74A3, 0x7490, 0x74A6, 0x74A8,
- 0x74A9, 0x74B5, 0x74BF, 0x74C8, 0x74C9, 0x74DA, 0x74FF, 0x7501,
- 0x7517, 0x752F, 0x756F, 0x7579, 0x7592, 0x3F72, 0x75CE, 0x75E4,
- 0x7600, 0x7602, 0x7608, 0x7615, 0x7616, 0x7619, 0x761E, 0x762D,
- 0x7635, 0x7643, 0x764B, 0x7664, 0x7665, 0x766D, 0x766F, 0x7671,
- 0x7681, 0x769B, 0x769D, 0x769E, 0x76A6, 0x76AA, 0x76B6, 0x76C5,
- 0x76CC, 0x76CE, 0x76D4, 0x76E6, 0x76F1, 0x76FC, 0x770A, 0x7719,
- 0x7734, 0x7736, 0x7746, 0x774D, 0x774E, 0x775C, 0x775F, 0x7762,
- 0x777A, 0x7780, 0x7794, 0x77AA, 0x77E0, 0x782D, 0xD855 /*0xDC8E*/,
-};
-static const unsigned short euc_to_utf8_F9[] = {
-         0x7E8A, 0x891C, 0x9348, 0x9288, 0x84DC, 0x4FC9, 0x70BB,
- 0x6631, 0x68C8, 0x92F9, 0x66FB, 0x5F45, 0x4E28, 0x4EE1, 0x4EFC,
- 0x4F00, 0x4F03, 0x4F39, 0x4F56, 0x4F92, 0x4F8A, 0x4F9A, 0x4F94,
- 0x4FCD, 0x5040, 0x5022, 0x4FFF, 0x501E, 0x5046, 0x5070, 0x5042,
- 0x5094, 0x50F4, 0x50D8, 0x514A, 0x5164, 0x519D, 0x51BE, 0x51EC,
- 0x5215, 0x529C, 0x52A6, 0x52C0, 0x52DB, 0x5300, 0x5307, 0x5324,
- 0x5372, 0x5393, 0x53B2, 0x53DD, 0xFA0E, 0x549C, 0x548A, 0x54A9,
- 0x54FF, 0x5586, 0x5759, 0x5765, 0x57AC, 0x57C8, 0x57C7, 0xFA0F,
- 0xFA10, 0x589E, 0x58B2, 0x590B, 0x5953, 0x595B, 0x595D, 0x5963,
- 0x59A4, 0x59BA, 0x5B56, 0x5BC0, 0x752F, 0x5BD8, 0x5BEC, 0x5C1E,
- 0x5CA6, 0x5CBA, 0x5CF5, 0x5D27, 0x5D53, 0xFA11, 0x5D42, 0x5D6D,
- 0x5DB8, 0x5DB9, 0x5DD0, 0x5F21, 0x5F34, 0x5F67, 0x5FB7,
-};
-static const unsigned short euc_to_utf8_F9_x0213[] = {
-         0x7843, 0x784E, 0x784F, 0x7851, 0x7868, 0x786E, 0xFA4B,
- 0x78B0, 0xD855 /*0xDD0E*/, 0x78AD, 0x78E4, 0x78F2, 0x7900, 0x78F7, 0x791C,
- 0x792E, 0x7931, 0x7934, 0xFA4C, 0xFA4D, 0x7945, 0x7946, 0xFA4E,
- 0xFA4F, 0xFA50, 0x795C, 0xFA51, 0xFA19, 0xFA1A, 0x7979, 0xFA52,
- 0xFA53, 0xFA1B, 0x7998, 0x79B1, 0x79B8, 0x79C8, 0x79CA, 0xD855 /*0xDF71*/,
- 0x79D4, 0x79DE, 0x79EB, 0x79ED, 0x7A03, 0xFA54, 0x7A39, 0x7A5D,
- 0x7A6D, 0xFA55, 0x7A85, 0x7AA0, 0xD856 /*0xDDC4*/, 0x7AB3, 0x7ABB, 0x7ACE,
- 0x7AEB, 0x7AFD, 0x7B12, 0x7B2D, 0x7B3B, 0x7B47, 0x7B4E, 0x7B60,
- 0x7B6D, 0x7B6F, 0x7B72, 0x7B9E, 0xFA56, 0x7BD7, 0x7BD9, 0x7C01,
- 0x7C31, 0x7C1E, 0x7C20, 0x7C33, 0x7C36, 0x4264, 0xD857 /*0xDDA1*/, 0x7C59,
- 0x7C6D, 0x7C79, 0x7C8F, 0x7C94, 0x7CA0, 0x7CBC, 0x7CD5, 0x7CD9,
- 0x7CDD, 0x7D07, 0x7D08, 0x7D13, 0x7D1D, 0x7D23, 0x7D31,
-};
-static const unsigned short euc_to_utf8_FA[] = {
-         0x5FDE, 0x605D, 0x6085, 0x608A, 0x60DE, 0x60D5, 0x6120,
- 0x60F2, 0x6111, 0x6137, 0x6130, 0x6198, 0x6213, 0x62A6, 0x63F5,
- 0x6460, 0x649D, 0x64CE, 0x654E, 0x6600, 0x6615, 0x663B, 0x6609,
- 0x662E, 0x661E, 0x6624, 0x6665, 0x6657, 0x6659, 0xFA12, 0x6673,
- 0x6699, 0x66A0, 0x66B2, 0x66BF, 0x66FA, 0x670E, 0xF929, 0x6766,
- 0x67BB, 0x6852, 0x67C0, 0x6801, 0x6844, 0x68CF, 0xFA13, 0x6968,
- 0xFA14, 0x6998, 0x69E2, 0x6A30, 0x6A6B, 0x6A46, 0x6A73, 0x6A7E,
- 0x6AE2, 0x6AE4, 0x6BD6, 0x6C3F, 0x6C5C, 0x6C86, 0x6C6F, 0x6CDA,
- 0x6D04, 0x6D87, 0x6D6F, 0x6D96, 0x6DAC, 0x6DCF, 0x6DF8, 0x6DF2,
- 0x6DFC, 0x6E39, 0x6E5C, 0x6E27, 0x6E3C, 0x6EBF, 0x6F88, 0x6FB5,
- 0x6FF5, 0x7005, 0x7007, 0x7028, 0x7085, 0x70AB, 0x710F, 0x7104,
- 0x715C, 0x7146, 0x7147, 0xFA15, 0x71C1, 0x71FE, 0x72B1,
-};
-static const unsigned short euc_to_utf8_FA_x0213[] = {
-         0x7D41, 0x7D48, 0x7D53, 0x7D5C, 0x7D7A, 0x7D83, 0x7D8B,
- 0x7DA0, 0x7DA6, 0x7DC2, 0x7DCC, 0x7DD6, 0x7DE3, 0xFA57, 0x7E28,
- 0x7E08, 0x7E11, 0x7E15, 0xFA59, 0x7E47, 0x7E52, 0x7E61, 0x7E8A,
- 0x7E8D, 0x7F47, 0xFA5A, 0x7F91, 0x7F97, 0x7FBF, 0x7FCE, 0x7FDB,
- 0x7FDF, 0x7FEC, 0x7FEE, 0x7FFA, 0xFA5B, 0x8014, 0x8026, 0x8035,
- 0x8037, 0x803C, 0x80CA, 0x80D7, 0x80E0, 0x80F3, 0x8118, 0x814A,
- 0x8160, 0x8167, 0x8168, 0x816D, 0x81BB, 0x81CA, 0x81CF, 0x81D7,
- 0xFA5C, 0x4453, 0x445B, 0x8260, 0x8274, 0xD85A /*0xDEFF*/, 0x828E, 0x82A1,
- 0x82A3, 0x82A4, 0x82A9, 0x82AE, 0x82B7, 0x82BE, 0x82BF, 0x82C6,
- 0x82D5, 0x82FD, 0x82FE, 0x8300, 0x8301, 0x8362, 0x8322, 0x832D,
- 0x833A, 0x8343, 0x8347, 0x8351, 0x8355, 0x837D, 0x8386, 0x8392,
- 0x8398, 0x83A7, 0x83A9, 0x83BF, 0x83C0, 0x83C7, 0x83CF,
-};
-static const unsigned short euc_to_utf8_FB[] = {
-         0x72BE, 0x7324, 0xFA16, 0x7377, 0x73BD, 0x73C9, 0x73D6,
- 0x73E3, 0x73D2, 0x7407, 0x73F5, 0x7426, 0x742A, 0x7429, 0x742E,
- 0x7462, 0x7489, 0x749F, 0x7501, 0x756F, 0x7682, 0x769C, 0x769E,
- 0x769B, 0x76A6, 0xFA17, 0x7746, 0x52AF, 0x7821, 0x784E, 0x7864,
- 0x787A, 0x7930, 0xFA18, 0xFA19, 0xFA1A, 0x7994, 0xFA1B, 0x799B,
- 0x7AD1, 0x7AE7, 0xFA1C, 0x7AEB, 0x7B9E, 0xFA1D, 0x7D48, 0x7D5C,
- 0x7DB7, 0x7DA0, 0x7DD6, 0x7E52, 0x7F47, 0x7FA1, 0xFA1E, 0x8301,
- 0x8362, 0x837F, 0x83C7, 0x83F6, 0x8448, 0x84B4, 0x8553, 0x8559,
- 0x856B, 0xFA1F, 0x85B0, 0xFA20, 0xFA21, 0x8807, 0x88F5, 0x8A12,
- 0x8A37, 0x8A79, 0x8AA7, 0x8ABE, 0x8ADF, 0xFA22, 0x8AF6, 0x8B53,
- 0x8B7F, 0x8CF0, 0x8CF4, 0x8D12, 0x8D76, 0xFA23, 0x8ECF, 0xFA24,
- 0xFA25, 0x9067, 0x90DE, 0xFA26, 0x9115, 0x9127, 0x91DA,
-};
-static const unsigned short euc_to_utf8_FB_x0213[] = {
-         0x83D1, 0x83E1, 0x83EA, 0x8401, 0x8406, 0x840A, 0xFA5F,
- 0x8448, 0x845F, 0x8470, 0x8473, 0x8485, 0x849E, 0x84AF, 0x84B4,
- 0x84BA, 0x84C0, 0x84C2, 0xD85B /*0xDE40*/, 0x8532, 0x851E, 0x8523, 0x852F,
- 0x8559, 0x8564, 0xFA1F, 0x85AD, 0x857A, 0x858C, 0x858F, 0x85A2,
- 0x85B0, 0x85CB, 0x85CE, 0x85ED, 0x8612, 0x85FF, 0x8604, 0x8605,
- 0x8610, 0xD85C /*0xDCF4*/, 0x8618, 0x8629, 0x8638, 0x8657, 0x865B, 0xF936,
- 0x8662, 0x459D, 0x866C, 0x8675, 0x8698, 0x86B8, 0x86FA, 0x86FC,
- 0x86FD, 0x870B, 0x8771, 0x8787, 0x8788, 0x87AC, 0x87AD, 0x87B5,
- 0x45EA, 0x87D6, 0x87EC, 0x8806, 0x880A, 0x8810, 0x8814, 0x881F,
- 0x8898, 0x88AA, 0x88CA, 0x88CE, 0xD85D /*0xDE84*/, 0x88F5, 0x891C, 0xFA60,
- 0x8918, 0x8919, 0x891A, 0x8927, 0x8930, 0x8932, 0x8939, 0x8940,
- 0x8994, 0xFA61, 0x89D4, 0x89E5, 0x89F6, 0x8A12, 0x8A15,
-};
-static const unsigned short euc_to_utf8_FC[] = {
-         0x91D7, 0x91DE, 0x91ED, 0x91EE, 0x91E4, 0x91E5, 0x9206,
- 0x9210, 0x920A, 0x923A, 0x9240, 0x923C, 0x924E, 0x9259, 0x9251,
- 0x9239, 0x9267, 0x92A7, 0x9277, 0x9278, 0x92E7, 0x92D7, 0x92D9,
- 0x92D0, 0xFA27, 0x92D5, 0x92E0, 0x92D3, 0x9325, 0x9321, 0x92FB,
- 0xFA28, 0x931E, 0x92FF, 0x931D, 0x9302, 0x9370, 0x9357, 0x93A4,
- 0x93C6, 0x93DE, 0x93F8, 0x9431, 0x9445, 0x9448, 0x9592, 0xF9DC,
- 0xFA29, 0x969D, 0x96AF, 0x9733, 0x973B, 0x9743, 0x974D, 0x974F,
- 0x9751, 0x9755, 0x9857, 0x9865, 0xFA2A, 0xFA2B, 0x9927, 0xFA2C,
- 0x999E, 0x9A4E, 0x9AD9, 0x9ADC, 0x9B75, 0x9B72, 0x9B8F, 0x9BB1,
- 0x9BBB, 0x9C00, 0x9D70, 0x9D6B, 0xFA2D, 0x9E19, 0x9ED1,      0,
-      0, 0x2170, 0x2171, 0x2172, 0x2173, 0x2174, 0x2175, 0x2176,
- 0x2177, 0x2178, 0x2179, 0xFFE2, 0x00A6, 0xFF07, 0xFF02,
-};
-
-/* Microsoft UCS Mapping Compatible */
-static const unsigned short euc_to_utf8_FC_ms[] = {
-         0x91D7, 0x91DE, 0x91ED, 0x91EE, 0x91E4, 0x91E5, 0x9206,
- 0x9210, 0x920A, 0x923A, 0x9240, 0x923C, 0x924E, 0x9259, 0x9251,
- 0x9239, 0x9267, 0x92A7, 0x9277, 0x9278, 0x92E7, 0x92D7, 0x92D9,
- 0x92D0, 0xFA27, 0x92D5, 0x92E0, 0x92D3, 0x9325, 0x9321, 0x92FB,
- 0xFA28, 0x931E, 0x92FF, 0x931D, 0x9302, 0x9370, 0x9357, 0x93A4,
- 0x93C6, 0x93DE, 0x93F8, 0x9431, 0x9445, 0x9448, 0x9592, 0xF9DC,
- 0xFA29, 0x969D, 0x96AF, 0x9733, 0x973B, 0x9743, 0x974D, 0x974F,
- 0x9751, 0x9755, 0x9857, 0x9865, 0xFA2A, 0xFA2B, 0x9927, 0xFA2C,
- 0x999E, 0x9A4E, 0x9AD9, 0x9ADC, 0x9B75, 0x9B72, 0x9B8F, 0x9BB1,
- 0x9BBB, 0x9C00, 0x9D70, 0x9D6B, 0xFA2D, 0x9E19, 0x9ED1,      0,
-      0, 0x2170, 0x2171, 0x2172, 0x2173, 0x2174, 0x2175, 0x2176,
- 0x2177, 0x2178, 0x2179, 0xFFE2, 0xFFE4, 0xFF07, 0xFF02,
-};
-static const unsigned short euc_to_utf8_FC_x0213[] = {
-         0x8A22, 0x8A37, 0x8A47, 0x8A4E, 0x8A5D, 0x8A61, 0x8A75,
- 0x8A79, 0x8AA7, 0x8AD0, 0x8ADF, 0x8AF4, 0x8AF6, 0xFA22, 0xFA62,
- 0xFA63, 0x8B46, 0x8B54, 0x8B59, 0x8B69, 0x8B9D, 0x8C49, 0x8C68,
- 0xFA64, 0x8CE1, 0x8CF4, 0x8CF8, 0x8CFE, 0xFA65, 0x8D12, 0x8D1B,
- 0x8DAF, 0x8DCE, 0x8DD1, 0x8DD7, 0x8E20, 0x8E23, 0x8E3D, 0x8E70,
- 0x8E7B, 0xD860 /*0xDE77*/, 0x8EC0, 0x4844, 0x8EFA, 0x8F1E, 0x8F2D, 0x8F36,
- 0x8F54, 0xD860 /*0xDFCD*/, 0x8FA6, 0x8FB5, 0x8FE4, 0x8FE8, 0x8FEE, 0x9008,
- 0x902D, 0xFA67, 0x9088, 0x9095, 0x9097, 0x9099, 0x909B, 0x90A2,
- 0x90B3, 0x90BE, 0x90C4, 0x90C5, 0x90C7, 0x90D7, 0x90DD, 0x90DE,
- 0x90EF, 0x90F4, 0xFA26, 0x9114, 0x9115, 0x9116, 0x9122, 0x9123,
- 0x9127, 0x912F, 0x9131, 0x9134, 0x913D, 0x9148, 0x915B, 0x9183,
- 0x919E, 0x91AC, 0x91B1, 0x91BC, 0x91D7, 0x91FB, 0x91E4,
-};
-static const unsigned short euc_to_utf8_FD_x0213[] = {
-         0x91E5, 0x91ED, 0x91F1, 0x9207, 0x9210, 0x9238, 0x9239,
- 0x923A, 0x923C, 0x9240, 0x9243, 0x924F, 0x9278, 0x9288, 0x92C2,
- 0x92CB, 0x92CC, 0x92D3, 0x92E0, 0x92FF, 0x9304, 0x931F, 0x9321,
- 0x9325, 0x9348, 0x9349, 0x934A, 0x9364, 0x9365, 0x936A, 0x9370,
- 0x939B, 0x93A3, 0x93BA, 0x93C6, 0x93DE, 0x93DF, 0x9404, 0x93FD,
- 0x9433, 0x944A, 0x9463, 0x946B, 0x9471, 0x9472, 0x958E, 0x959F,
- 0x95A6, 0x95A9, 0x95AC, 0x95B6, 0x95BD, 0x95CB, 0x95D0, 0x95D3,
- 0x49B0, 0x95DA, 0x95DE, 0x9658, 0x9684, 0xF9DC, 0x969D, 0x96A4,
- 0x96A5, 0x96D2, 0x96DE, 0xFA68, 0x96E9, 0x96EF, 0x9733, 0x973B,
- 0x974D, 0x974E, 0x974F, 0x975A, 0x976E, 0x9773, 0x9795, 0x97AE,
- 0x97BA, 0x97C1, 0x97C9, 0x97DE, 0x97DB, 0x97F4, 0xFA69, 0x980A,
- 0x981E, 0x982B, 0x9830, 0xFA6A, 0x9852, 0x9853, 0x9856,
-};
-static const unsigned short euc_to_utf8_FE_x0213[] = {
-         0x9857, 0x9859, 0x985A, 0xF9D0, 0x9865, 0x986C, 0x98BA,
- 0x98C8, 0x98E7, 0x9958, 0x999E, 0x9A02, 0x9A03, 0x9A24, 0x9A2D,
- 0x9A2E, 0x9A38, 0x9A4A, 0x9A4E, 0x9A52, 0x9AB6, 0x9AC1, 0x9AC3,
- 0x9ACE, 0x9AD6, 0x9AF9, 0x9B02, 0x9B08, 0x9B20, 0x4C17, 0x9B2D,
- 0x9B5E, 0x9B79, 0x9B66, 0x9B72, 0x9B75, 0x9B84, 0x9B8A, 0x9B8F,
- 0x9B9E, 0x9BA7, 0x9BC1, 0x9BCE, 0x9BE5, 0x9BF8, 0x9BFD, 0x9C00,
- 0x9C23, 0x9C41, 0x9C4F, 0x9C50, 0x9C53, 0x9C63, 0x9C65, 0x9C77,
- 0x9D1D, 0x9D1E, 0x9D43, 0x9D47, 0x9D52, 0x9D63, 0x9D70, 0x9D7C,
- 0x9D8A, 0x9D96, 0x9DC0, 0x9DAC, 0x9DBC, 0x9DD7, 0xD868 /*0xDD90*/, 0x9DE7,
- 0x9E07, 0x9E15, 0x9E7C, 0x9E9E, 0x9EA4, 0x9EAC, 0x9EAF, 0x9EB4,
- 0x9EB5, 0x9EC3, 0x9ED1, 0x9F10, 0x9F39, 0x9F57, 0x9F90, 0x9F94,
- 0x9F97, 0x9FA2, 0x59F8, 0x5C5B, 0x5E77, 0x7626, 0x7E6B,
-};
-
-static const unsigned short euc_to_utf8_8FA1_x0213[] = {
-         0xD840 /*0xDC89*/, 0x4E02, 0x4E0F, 0x4E12, 0x4E29, 0x4E2B, 0x4E2E,
- 0x4E40, 0x4E47, 0x4E48, 0xD840 /*0xDCA2*/, 0x4E51, 0x3406, 0xD840 /*0xDCA4*/, 0x4E5A,
- 0x4E69, 0x4E9D, 0x342C, 0x342E, 0x4EB9, 0x4EBB, 0xD840 /*0xDDA2*/, 0x4EBC,
- 0x4EC3, 0x4EC8, 0x4ED0, 0x4EEB, 0x4EDA, 0x4EF1, 0x4EF5, 0x4F00,
- 0x4F16, 0x4F64, 0x4F37, 0x4F3E, 0x4F54, 0x4F58, 0xD840 /*0xDE13*/, 0x4F77,
- 0x4F78, 0x4F7A, 0x4F7D, 0x4F82, 0x4F85, 0x4F92, 0x4F9A, 0x4FE6,
- 0x4FB2, 0x4FBE, 0x4FC5, 0x4FCB, 0x4FCF, 0x4FD2, 0x346A, 0x4FF2,
- 0x5000, 0x5010, 0x5013, 0x501C, 0x501E, 0x5022, 0x3468, 0x5042,
- 0x5046, 0x504E, 0x5053, 0x5057, 0x5063, 0x5066, 0x506A, 0x5070,
- 0x50A3, 0x5088, 0x5092, 0x5093, 0x5095, 0x5096, 0x509C, 0x50AA,
- 0xD840 /*0xDF2B*/, 0x50B1, 0x50BA, 0x50BB, 0x50C4, 0x50C7, 0x50F3, 0xD840 /*0xDF81*/,
- 0x50CE, 0xD840 /*0xDF71*/, 0x50D4, 0x50D9, 0x50E1, 0x50E9, 0x3492,
-};
-static const unsigned short euc_to_utf8_8FA3_x0213[] = {
-         0x5108, 0xD840 /*0xDFF9*/, 0x5117, 0x511B, 0xD841 /*0xDC4A*/, 0x5160, 0xD841 /*0xDD09*/,
- 0x5173, 0x5183, 0x518B, 0x34BC, 0x5198, 0x51A3, 0x51AD, 0x34C7,
- 0x51BC, 0xD841 /*0xDDD6*/, 0xD841 /*0xDE28*/, 0x51F3, 0x51F4, 0x5202, 0x5212, 0x5216,
- 0xD841 /*0xDF4F*/, 0x5255, 0x525C, 0x526C, 0x5277, 0x5284, 0x5282, 0xD842 /*0xDC07*/,
- 0x5298, 0xD842 /*0xDC3A*/, 0x52A4, 0x52A6, 0x52AF, 0x52BA, 0x52BB, 0x52CA,
- 0x351F, 0x52D1, 0xD842 /*0xDCB9*/, 0x52F7, 0x530A, 0x530B, 0x5324, 0x5335,
- 0x533E, 0x5342, 0xD842 /*0xDD7C*/, 0xD842 /*0xDD9D*/, 0x5367, 0x536C, 0x537A, 0x53A4,
- 0x53B4, 0xD842 /*0xDED3*/, 0x53B7, 0x53C0, 0xD842 /*0xDF1D*/, 0x355D, 0x355E, 0x53D5,
- 0x53DA, 0x3563, 0x53F4, 0x53F5, 0x5455, 0x5424, 0x5428, 0x356E,
- 0x5443, 0x5462, 0x5466, 0x546C, 0x548A, 0x548D, 0x5495, 0x54A0,
- 0x54A6, 0x54AD, 0x54AE, 0x54B7, 0x54BA, 0x54BF, 0x54C3, 0xD843 /*0xDD45*/,
- 0x54EC, 0x54EF, 0x54F1, 0x54F3, 0x5500, 0x5501, 0x5509,
-};
-static const unsigned short euc_to_utf8_8FA4_x0213[] = {
-         0x553C, 0x5541, 0x35A6, 0x5547, 0x554A, 0x35A8, 0x5560,
- 0x5561, 0x5564, 0xD843 /*0xDDE1*/, 0x557D, 0x5582, 0x5588, 0x5591, 0x35C5,
- 0x55D2, 0xD843 /*0xDE95*/, 0xD843 /*0xDE6D*/, 0x55BF, 0x55C9, 0x55CC, 0x55D1, 0x55DD,
- 0x35DA, 0x55E2, 0xD843 /*0xDE64*/, 0x55E9, 0x5628, 0xD843 /*0xDF5F*/, 0x5607, 0x5610,
- 0x5630, 0x5637, 0x35F4, 0x563D, 0x563F, 0x5640, 0x5647, 0x565E,
- 0x5660, 0x566D, 0x3605, 0x5688, 0x568C, 0x5695, 0x569A, 0x569D,
- 0x56A8, 0x56AD, 0x56B2, 0x56C5, 0x56CD, 0x56DF, 0x56E8, 0x56F6,
- 0x56F7, 0xD844 /*0xDE01*/, 0x5715, 0x5723, 0xD844 /*0xDE55*/, 0x5729, 0xD844 /*0xDE7B*/, 0x5745,
- 0x5746, 0x574C, 0x574D, 0xD844 /*0xDE74*/, 0x5768, 0x576F, 0x5773, 0x5774,
- 0x5775, 0x577B, 0xD844 /*0xDEE4*/, 0xD844 /*0xDED7*/, 0x57AC, 0x579A, 0x579D, 0x579E,
- 0x57A8, 0x57D7, 0xD844 /*0xDEFD*/, 0x57CC, 0xD844 /*0xDF36*/, 0xD844 /*0xDF44*/, 0x57DE, 0x57E6,
- 0x57F0, 0x364A, 0x57F8, 0x57FB, 0x57FD, 0x5804, 0x581E,
-};
-static const unsigned short euc_to_utf8_8FA5_x0213[] = {
-         0x5820, 0x5827, 0x5832, 0x5839, 0xD844 /*0xDFC4*/, 0x5849, 0x584C,
- 0x5867, 0x588A, 0x588B, 0x588D, 0x588F, 0x5890, 0x5894, 0x589D,
- 0x58AA, 0x58B1, 0xD845 /*0xDC6D*/, 0x58C3, 0x58CD, 0x58E2, 0x58F3, 0x58F4,
- 0x5905, 0x5906, 0x590B, 0x590D, 0x5914, 0x5924, 0xD845 /*0xDDD7*/, 0x3691,
- 0x593D, 0x3699, 0x5946, 0x3696, 0xD85B /*0xDC29*/, 0x595B, 0x595F, 0xD845 /*0xDE47*/,
- 0x5975, 0x5976, 0x597C, 0x599F, 0x59AE, 0x59BC, 0x59C8, 0x59CD,
- 0x59DE, 0x59E3, 0x59E4, 0x59E7, 0x59EE, 0xD845 /*0xDF06*/, 0xD845 /*0xDF42*/, 0x36CF,
- 0x5A0C, 0x5A0D, 0x5A17, 0x5A27, 0x5A2D, 0x5A55, 0x5A65, 0x5A7A,
- 0x5A8B, 0x5A9C, 0x5A9F, 0x5AA0, 0x5AA2, 0x5AB1, 0x5AB3, 0x5AB5,
- 0x5ABA, 0x5ABF, 0x5ADA, 0x5ADC, 0x5AE0, 0x5AE5, 0x5AF0, 0x5AEE,
- 0x5AF5, 0x5B00, 0x5B08, 0x5B17, 0x5B34, 0x5B2D, 0x5B4C, 0x5B52,
- 0x5B68, 0x5B6F, 0x5B7C, 0x5B7F, 0x5B81, 0x5B84, 0xD846 /*0xDDC3*/,
-};
-static const unsigned short euc_to_utf8_8FA8_x0213[] = {
-         0x5B96, 0x5BAC, 0x3761, 0x5BC0, 0x3762, 0x5BCE, 0x5BD6,
- 0x376C, 0x376B, 0x5BF1, 0x5BFD, 0x3775, 0x5C03, 0x5C29, 0x5C30,
- 0xD847 /*0xDC56*/, 0x5C5F, 0x5C63, 0x5C67, 0x5C68, 0x5C69, 0x5C70, 0xD847 /*0xDD2D*/,
- 0xD847 /*0xDD45*/, 0x5C7C, 0xD847 /*0xDD78*/, 0xD847 /*0xDD62*/, 0x5C88, 0x5C8A, 0x37C1, 0xD847 /*0xDDA1*/,
- 0xD847 /*0xDD9C*/, 0x5CA0, 0x5CA2, 0x5CA6, 0x5CA7, 0xD847 /*0xDD92*/, 0x5CAD, 0x5CB5,
- 0xD847 /*0xDDB7*/, 0x5CC9, 0xD847 /*0xDDE0*/, 0xD847 /*0xDE33*/, 0x5D06, 0x5D10, 0x5D2B, 0x5D1D,
- 0x5D20, 0x5D24, 0x5D26, 0x5D31, 0x5D39, 0x5D42, 0x37E8, 0x5D61,
- 0x5D6A, 0x37F4, 0x5D70, 0xD847 /*0xDF1E*/, 0x37FD, 0x5D88, 0x3800, 0x5D92,
- 0x5D94, 0x5D97, 0x5D99, 0x5DB0, 0x5DB2, 0x5DB4, 0xD847 /*0xDF76*/, 0x5DB9,
- 0x5DD1, 0x5DD7, 0x5DD8, 0x5DE0, 0xD847 /*0xDFFA*/, 0x5DE4, 0x5DE9, 0x382F,
- 0x5E00, 0x3836, 0x5E12, 0x5E15, 0x3840, 0x5E1F, 0x5E2E, 0x5E3E,
- 0x5E49, 0x385C, 0x5E56, 0x3861, 0x5E6B, 0x5E6C, 0x5E6D,
-};
-static const unsigned short euc_to_utf8_8FAC_x0213[] = {
-         0x5E6E, 0xD848 /*0xDD7B*/, 0x5EA5, 0x5EAA, 0x5EAC, 0x5EB9, 0x5EBF,
- 0x5EC6, 0x5ED2, 0x5ED9, 0xD848 /*0xDF1E*/, 0x5EFD, 0x5F08, 0x5F0E, 0x5F1C,
- 0xD848 /*0xDFAD*/, 0x5F1E, 0x5F47, 0x5F63, 0x5F72, 0x5F7E, 0x5F8F, 0x5FA2,
- 0x5FA4, 0x5FB8, 0x5FC4, 0x38FA, 0x5FC7, 0x5FCB, 0x5FD2, 0x5FD3,
- 0x5FD4, 0x5FE2, 0x5FEE, 0x5FEF, 0x5FF3, 0x5FFC, 0x3917, 0x6017,
- 0x6022, 0x6024, 0x391A, 0x604C, 0x607F, 0x608A, 0x6095, 0x60A8,
- 0xD849 /*0xDEF3*/, 0x60B0, 0x60B1, 0x60BE, 0x60C8, 0x60D9, 0x60DB, 0x60EE,
- 0x60F2, 0x60F5, 0x6110, 0x6112, 0x6113, 0x6119, 0x611E, 0x613A,
- 0x396F, 0x6141, 0x6146, 0x6160, 0x617C, 0xD84A /*0xDC5B*/, 0x6192, 0x6193,
- 0x6197, 0x6198, 0x61A5, 0x61A8, 0x61AD, 0xD84A /*0xDCAB*/, 0x61D5, 0x61DD,
- 0x61DF, 0x61F5, 0xD84A /*0xDD8F*/, 0x6215, 0x6223, 0x6229, 0x6246, 0x624C,
- 0x6251, 0x6252, 0x6261, 0x6264, 0x627B, 0x626D, 0x6273,
-};
-static const unsigned short euc_to_utf8_8FAD_x0213[] = {
-         0x6299, 0x62A6, 0x62D5, 0xD84A /*0xDEB8*/, 0x62FD, 0x6303, 0x630D,
- 0x6310, 0xD84A /*0xDF4F*/, 0xD84A /*0xDF50*/, 0x6332, 0x6335, 0x633B, 0x633C, 0x6341,
- 0x6344, 0x634E, 0xD84A /*0xDF46*/, 0x6359, 0xD84B /*0xDC1D*/, 0xD84A /*0xDFA6*/, 0x636C, 0x6384,
- 0x6399, 0xD84B /*0xDC24*/, 0x6394, 0x63BD, 0x63F7, 0x63D4, 0x63D5, 0x63DC,
- 0x63E0, 0x63EB, 0x63EC, 0x63F2, 0x6409, 0x641E, 0x6425, 0x6429,
- 0x642F, 0x645A, 0x645B, 0x645D, 0x6473, 0x647D, 0x6487, 0x6491,
- 0x649D, 0x649F, 0x64CB, 0x64CC, 0x64D5, 0x64D7, 0xD84B /*0xDDE1*/, 0x64E4,
- 0x64E5, 0x64FF, 0x6504, 0x3A6E, 0x650F, 0x6514, 0x6516, 0x3A73,
- 0x651E, 0x6532, 0x6544, 0x6554, 0x656B, 0x657A, 0x6581, 0x6584,
- 0x6585, 0x658A, 0x65B2, 0x65B5, 0x65B8, 0x65BF, 0x65C2, 0x65C9,
- 0x65D4, 0x3AD6, 0x65F2, 0x65F9, 0x65FC, 0x6604, 0x6608, 0x6621,
- 0x662A, 0x6645, 0x6651, 0x664E, 0x3AEA, 0xD84C /*0xDDC3*/, 0x6657,
-};
-static const unsigned short euc_to_utf8_8FAE_x0213[] = {
-         0x665B, 0x6663, 0xD84C /*0xDDF5*/, 0xD84C /*0xDDB6*/, 0x666A, 0x666B, 0x666C,
- 0x666D, 0x667B, 0x6680, 0x6690, 0x6692, 0x6699, 0x3B0E, 0x66AD,
- 0x66B1, 0x66B5, 0x3B1A, 0x66BF, 0x3B1C, 0x66EC, 0x3AD7, 0x6701,
- 0x6705, 0x6712, 0xD84C /*0xDF72*/, 0x6719, 0xD84C /*0xDFD3*/, 0xD84C /*0xDFD2*/, 0x674C, 0x674D,
- 0x6754, 0x675D, 0xD84C /*0xDFD0*/, 0xD84C /*0xDFE4*/, 0xD84C /*0xDFD5*/, 0x6774, 0x6776, 0xD84C /*0xDFDA*/,
- 0x6792, 0xD84C /*0xDFDF*/, 0x8363, 0x6810, 0x67B0, 0x67B2, 0x67C3, 0x67C8,
- 0x67D2, 0x67D9, 0x67DB, 0x67F0, 0x67F7, 0xD84D /*0xDC4A*/, 0xD84D /*0xDC51*/, 0xD84D /*0xDC4B*/,
- 0x6818, 0x681F, 0x682D, 0xD84D /*0xDC65*/, 0x6833, 0x683B, 0x683E, 0x6844,
- 0x6845, 0x6849, 0x684C, 0x6855, 0x6857, 0x3B77, 0x686B, 0x686E,
- 0x687A, 0x687C, 0x6882, 0x6890, 0x6896, 0x3B6D, 0x6898, 0x6899,
- 0x689A, 0x689C, 0x68AA, 0x68AB, 0x68B4, 0x68BB, 0x68FB, 0xD84D /*0xDCE4*/,
- 0xD84D /*0xDD5A*/, 0xFA13, 0x68C3, 0x68C5, 0x68CC, 0x68CF, 0x68D6,
-};
-static const unsigned short euc_to_utf8_8FAF_x0213[] = {
-         0x68D9, 0x68E4, 0x68E5, 0x68EC, 0x68F7, 0x6903, 0x6907,
- 0x3B87, 0x3B88, 0xD84D /*0xDD94*/, 0x693B, 0x3B8D, 0x6946, 0x6969, 0x696C,
- 0x6972, 0x697A, 0x697F, 0x6992, 0x3BA4, 0x6996, 0x6998, 0x69A6,
- 0x69B0, 0x69B7, 0x69BA, 0x69BC, 0x69C0, 0x69D1, 0x69D6, 0xD84D /*0xDE39*/,
- 0xD84D /*0xDE47*/, 0x6A30, 0xD84D /*0xDE38*/, 0xD84D /*0xDE3A*/, 0x69E3, 0x69EE, 0x69EF, 0x69F3,
- 0x3BCD, 0x69F4, 0x69FE, 0x6A11, 0x6A1A, 0x6A1D, 0xD84D /*0xDF1C*/, 0x6A32,
- 0x6A33, 0x6A34, 0x6A3F, 0x6A46, 0x6A49, 0x6A7A, 0x6A4E, 0x6A52,
- 0x6A64, 0xD84D /*0xDF0C*/, 0x6A7E, 0x6A83, 0x6A8B, 0x3BF0, 0x6A91, 0x6A9F,
- 0x6AA1, 0xD84D /*0xDF64*/, 0x6AAB, 0x6ABD, 0x6AC6, 0x6AD4, 0x6AD0, 0x6ADC,
- 0x6ADD, 0xD84D /*0xDFFF*/, 0xD84D /*0xDFE7*/, 0x6AEC, 0x6AF1, 0x6AF2, 0x6AF3, 0x6AFD,
- 0xD84E /*0xDC24*/, 0x6B0B, 0x6B0F, 0x6B10, 0x6B11, 0xD84E /*0xDC3D*/, 0x6B17, 0x3C26,
- 0x6B2F, 0x6B4A, 0x6B58, 0x6B6C, 0x6B75, 0x6B7A, 0x6B81,
-};
-static const unsigned short euc_to_utf8_8FEE_x0213[] = {
-         0x6B9B, 0x6BAE, 0xD84E /*0xDE98*/, 0x6BBD, 0x6BBE, 0x6BC7, 0x6BC8,
- 0x6BC9, 0x6BDA, 0x6BE6, 0x6BE7, 0x6BEE, 0x6BF1, 0x6C02, 0x6C0A,
- 0x6C0E, 0x6C35, 0x6C36, 0x6C3A, 0xD84F /*0xDC7F*/, 0x6C3F, 0x6C4D, 0x6C5B,
- 0x6C6D, 0x6C84, 0x6C89, 0x3CC3, 0x6C94, 0x6C95, 0x6C97, 0x6CAD,
- 0x6CC2, 0x6CD0, 0x3CD2, 0x6CD6, 0x6CDA, 0x6CDC, 0x6CE9, 0x6CEC,
- 0x6CED, 0xD84F /*0xDD00*/, 0x6D00, 0x6D0A, 0x6D24, 0x6D26, 0x6D27, 0x6C67,
- 0x6D2F, 0x6D3C, 0x6D5B, 0x6D5E, 0x6D60, 0x6D70, 0x6D80, 0x6D81,
- 0x6D8A, 0x6D8D, 0x6D91, 0x6D98, 0xD84F /*0xDD40*/, 0x6E17, 0xD84F /*0xDDFA*/, 0xD84F /*0xDDF9*/,
- 0xD84F /*0xDDD3*/, 0x6DAB, 0x6DAE, 0x6DB4, 0x6DC2, 0x6D34, 0x6DC8, 0x6DCE,
- 0x6DCF, 0x6DD0, 0x6DDF, 0x6DE9, 0x6DF6, 0x6E36, 0x6E1E, 0x6E22,
- 0x6E27, 0x3D11, 0x6E32, 0x6E3C, 0x6E48, 0x6E49, 0x6E4B, 0x6E4C,
- 0x6E4F, 0x6E51, 0x6E53, 0x6E54, 0x6E57, 0x6E63, 0x3D1E,
-};
-static const unsigned short euc_to_utf8_8FEF_x0213[] = {
-         0x6E93, 0x6EA7, 0x6EB4, 0x6EBF, 0x6EC3, 0x6ECA, 0x6ED9,
- 0x6F35, 0x6EEB, 0x6EF9, 0x6EFB, 0x6F0A, 0x6F0C, 0x6F18, 0x6F25,
- 0x6F36, 0x6F3C, 0xD84F /*0xDF7E*/, 0x6F52, 0x6F57, 0x6F5A, 0x6F60, 0x6F68,
- 0x6F98, 0x6F7D, 0x6F90, 0x6F96, 0x6FBE, 0x6F9F, 0x6FA5, 0x6FAF,
- 0x3D64, 0x6FB5, 0x6FC8, 0x6FC9, 0x6FDA, 0x6FDE, 0x6FE9, 0xD850 /*0xDC96*/,
- 0x6FFC, 0x7000, 0x7007, 0x700A, 0x7023, 0xD850 /*0xDD03*/, 0x7039, 0x703A,
- 0x703C, 0x7043, 0x7047, 0x704B, 0x3D9A, 0x7054, 0x7065, 0x7069,
- 0x706C, 0x706E, 0x7076, 0x707E, 0x7081, 0x7086, 0x7095, 0x7097,
- 0x70BB, 0xD850 /*0xDDC6*/, 0x709F, 0x70B1, 0xD850 /*0xDDFE*/, 0x70EC, 0x70CA, 0x70D1,
- 0x70D3, 0x70DC, 0x7103, 0x7104, 0x7106, 0x7107, 0x7108, 0x710C,
- 0x3DC0, 0x712F, 0x7131, 0x7150, 0x714A, 0x7153, 0x715E, 0x3DD4,
- 0x7196, 0x7180, 0x719B, 0x71A0, 0x71A2, 0x71AE, 0x71AF,
-};
-static const unsigned short euc_to_utf8_8FF0_x0213[] = {
-         0x71B3, 0xD850 /*0xDFBC*/, 0x71CB, 0x71D3, 0x71D9, 0x71DC, 0x7207,
- 0x3E05, 0xFA49, 0x722B, 0x7234, 0x7238, 0x7239, 0x4E2C, 0x7242,
- 0x7253, 0x7257, 0x7263, 0xD851 /*0xDE29*/, 0x726E, 0x726F, 0x7278, 0x727F,
- 0x728E, 0xD851 /*0xDEA5*/, 0x72AD, 0x72AE, 0x72B0, 0x72B1, 0x72C1, 0x3E60,
- 0x72CC, 0x3E66, 0x3E68, 0x72F3, 0x72FA, 0x7307, 0x7312, 0x7318,
- 0x7319, 0x3E83, 0x7339, 0x732C, 0x7331, 0x7333, 0x733D, 0x7352,
- 0x3E94, 0x736B, 0x736C, 0xD852 /*0xDC96*/, 0x736E, 0x736F, 0x7371, 0x7377,
- 0x7381, 0x7385, 0x738A, 0x7394, 0x7398, 0x739C, 0x739E, 0x73A5,
- 0x73A8, 0x73B5, 0x73B7, 0x73B9, 0x73BC, 0x73BF, 0x73C5, 0x73CB,
- 0x73E1, 0x73E7, 0x73F9, 0x7413, 0x73FA, 0x7401, 0x7424, 0x7431,
- 0x7439, 0x7453, 0x7440, 0x7443, 0x744D, 0x7452, 0x745D, 0x7471,
- 0x7481, 0x7485, 0x7488, 0xD852 /*0xDE4D*/, 0x7492, 0x7497, 0x7499,
-};
-static const unsigned short euc_to_utf8_8FF1_x0213[] = {
-         0x74A0, 0x74A1, 0x74A5, 0x74AA, 0x74AB, 0x74B9, 0x74BB,
- 0x74BA, 0x74D6, 0x74D8, 0x74DE, 0x74EF, 0x74EB, 0xD852 /*0xDF56*/, 0x74FA,
- 0xD852 /*0xDF6F*/, 0x7520, 0x7524, 0x752A, 0x3F57, 0xD853 /*0xDC16*/, 0x753D, 0x753E,
- 0x7540, 0x7548, 0x754E, 0x7550, 0x7552, 0x756C, 0x7572, 0x7571,
- 0x757A, 0x757D, 0x757E, 0x7581, 0xD853 /*0xDD14*/, 0x758C, 0x3F75, 0x75A2,
- 0x3F77, 0x75B0, 0x75B7, 0x75BF, 0x75C0, 0x75C6, 0x75CF, 0x75D3,
- 0x75DD, 0x75DF, 0x75E0, 0x75E7, 0x75EC, 0x75EE, 0x75F1, 0x75F9,
- 0x7603, 0x7618, 0x7607, 0x760F, 0x3FAE, 0xD853 /*0xDE0E*/, 0x7613, 0x761B,
- 0x761C, 0xD853 /*0xDE37*/, 0x7625, 0x7628, 0x763C, 0x7633, 0xD853 /*0xDE6A*/, 0x3FC9,
- 0x7641, 0xD853 /*0xDE8B*/, 0x7649, 0x7655, 0x3FD7, 0x766E, 0x7695, 0x769C,
- 0x76A1, 0x76A0, 0x76A7, 0x76A8, 0x76AF, 0xD854 /*0xDC4A*/, 0x76C9, 0xD854 /*0xDC55*/,
- 0x76E8, 0x76EC, 0xD854 /*0xDD22*/, 0x7717, 0x771A, 0x772D, 0x7735,
-};
-static const unsigned short euc_to_utf8_8FF2_x0213[] = {
-         0xD854 /*0xDDA9*/, 0x4039, 0xD854 /*0xDDE5*/, 0xD854 /*0xDDCD*/, 0x7758, 0x7760, 0x776A,
- 0xD854 /*0xDE1E*/, 0x7772, 0x777C, 0x777D, 0xD854 /*0xDE4C*/, 0x4058, 0x779A, 0x779F,
- 0x77A2, 0x77A4, 0x77A9, 0x77DE, 0x77DF, 0x77E4, 0x77E6, 0x77EA,
- 0x77EC, 0x4093, 0x77F0, 0x77F4, 0x77FB, 0xD855 /*0xDC2E*/, 0x7805, 0x7806,
- 0x7809, 0x780D, 0x7819, 0x7821, 0x782C, 0x7847, 0x7864, 0x786A,
- 0xD855 /*0xDCD9*/, 0x788A, 0x7894, 0x78A4, 0x789D, 0x789E, 0x789F, 0x78BB,
- 0x78C8, 0x78CC, 0x78CE, 0x78D5, 0x78E0, 0x78E1, 0x78E6, 0x78F9,
- 0x78FA, 0x78FB, 0x78FE, 0xD855 /*0xDDA7*/, 0x7910, 0x791B, 0x7930, 0x7925,
- 0x793B, 0x794A, 0x7958, 0x795B, 0x4105, 0x7967, 0x7972, 0x7994,
- 0x7995, 0x7996, 0x799B, 0x79A1, 0x79A9, 0x79B4, 0x79BB, 0x79C2,
- 0x79C7, 0x79CC, 0x79CD, 0x79D6, 0x4148, 0xD855 /*0xDFA9*/, 0xD855 /*0xDFB4*/, 0x414F,
- 0x7A0A, 0x7A11, 0x7A15, 0x7A1B, 0x7A1E, 0x4163, 0x7A2D,
-};
-static const unsigned short euc_to_utf8_8FF3_x0213[] = {
-         0x7A38, 0x7A47, 0x7A4C, 0x7A56, 0x7A59, 0x7A5C, 0x7A5F,
- 0x7A60, 0x7A67, 0x7A6A, 0x7A75, 0x7A78, 0x7A82, 0x7A8A, 0x7A90,
- 0x7AA3, 0x7AAC, 0xD856 /*0xDDD4*/, 0x41B4, 0x7AB9, 0x7ABC, 0x7ABE, 0x41BF,
- 0x7ACC, 0x7AD1, 0x7AE7, 0x7AE8, 0x7AF4, 0xD856 /*0xDEE4*/, 0xD856 /*0xDEE3*/, 0x7B07,
- 0xD856 /*0xDEF1*/, 0x7B3D, 0x7B27, 0x7B2A, 0x7B2E, 0x7B2F, 0x7B31, 0x41E6,
- 0x41F3, 0x7B7F, 0x7B41, 0x41EE, 0x7B55, 0x7B79, 0x7B64, 0x7B66,
- 0x7B69, 0x7B73, 0xD856 /*0xDFB2*/, 0x4207, 0x7B90, 0x7B91, 0x7B9B, 0x420E,
- 0x7BAF, 0x7BB5, 0x7BBC, 0x7BC5, 0x7BCA, 0xD857 /*0xDC4B*/, 0xD857 /*0xDC64*/, 0x7BD4,
- 0x7BD6, 0x7BDA, 0x7BEA, 0x7BF0, 0x7C03, 0x7C0B, 0x7C0E, 0x7C0F,
- 0x7C26, 0x7C45, 0x7C4A, 0x7C51, 0x7C57, 0x7C5E, 0x7C61, 0x7C69,
- 0x7C6E, 0x7C6F, 0x7C70, 0xD857 /*0xDE2E*/, 0xD857 /*0xDE56*/, 0xD857 /*0xDE65*/, 0x7CA6, 0xD857 /*0xDE62*/,
- 0x7CB6, 0x7CB7, 0x7CBF, 0xD857 /*0xDED8*/, 0x7CC4, 0xD857 /*0xDEC2*/, 0x7CC8,
-};
-static const unsigned short euc_to_utf8_8FF4_x0213[] = {
-         0x7CCD, 0xD857 /*0xDEE8*/, 0x7CD7, 0xD857 /*0xDF23*/, 0x7CE6, 0x7CEB, 0xD857 /*0xDF5C*/,
- 0x7CF5, 0x7D03, 0x7D09, 0x42C6, 0x7D12, 0x7D1E, 0xD857 /*0xDFE0*/, 0xD857 /*0xDFD4*/,
- 0x7D3D, 0x7D3E, 0x7D40, 0x7D47, 0xD858 /*0xDC0C*/, 0xD857 /*0xDFFB*/, 0x42D6, 0x7D59,
- 0x7D5A, 0x7D6A, 0x7D70, 0x42DD, 0x7D7F, 0xD858 /*0xDC17*/, 0x7D86, 0x7D88,
- 0x7D8C, 0x7D97, 0xD858 /*0xDC60*/, 0x7D9D, 0x7DA7, 0x7DAA, 0x7DB6, 0x7DB7,
- 0x7DC0, 0x7DD7, 0x7DD9, 0x7DE6, 0x7DF1, 0x7DF9, 0x4302, 0xD858 /*0xDCED*/,
- 0xFA58, 0x7E10, 0x7E17, 0x7E1D, 0x7E20, 0x7E27, 0x7E2C, 0x7E45,
- 0x7E73, 0x7E75, 0x7E7E, 0x7E86, 0x7E87, 0x432B, 0x7E91, 0x7E98,
- 0x7E9A, 0x4343, 0x7F3C, 0x7F3B, 0x7F3E, 0x7F43, 0x7F44, 0x7F4F,
- 0x34C1, 0xD858 /*0xDE70*/, 0x7F52, 0xD858 /*0xDE86*/, 0x7F61, 0x7F63, 0x7F64, 0x7F6D,
- 0x7F7D, 0x7F7E, 0xD858 /*0xDF4C*/, 0x7F90, 0x517B, 0xD84F /*0xDD0E*/, 0x7F96, 0x7F9C,
- 0x7FAD, 0xD859 /*0xDC02*/, 0x7FC3, 0x7FCF, 0x7FE3, 0x7FE5, 0x7FEF,
-};
-static const unsigned short euc_to_utf8_8FF5_x0213[] = {
-         0x7FF2, 0x8002, 0x800A, 0x8008, 0x800E, 0x8011, 0x8016,
- 0x8024, 0x802C, 0x8030, 0x8043, 0x8066, 0x8071, 0x8075, 0x807B,
- 0x8099, 0x809C, 0x80A4, 0x80A7, 0x80B8, 0xD859 /*0xDE7E*/, 0x80C5, 0x80D5,
- 0x80D8, 0x80E6, 0xD859 /*0xDEB0*/, 0x810D, 0x80F5, 0x80FB, 0x43EE, 0x8135,
- 0x8116, 0x811E, 0x43F0, 0x8124, 0x8127, 0x812C, 0xD859 /*0xDF1D*/, 0x813D,
- 0x4408, 0x8169, 0x4417, 0x8181, 0x441C, 0x8184, 0x8185, 0x4422,
- 0x8198, 0x81B2, 0x81C1, 0x81C3, 0x81D6, 0x81DB, 0xD85A /*0xDCDD*/, 0x81E4,
- 0xD85A /*0xDCEA*/, 0x81EC, 0xD85A /*0xDD51*/, 0x81FD, 0x81FF, 0xD85A /*0xDD6F*/, 0x8204, 0xD85A /*0xDDDD*/,
- 0x8219, 0x8221, 0x8222, 0xD85A /*0xDE1E*/, 0x8232, 0x8234, 0x823C, 0x8246,
- 0x8249, 0x8245, 0xD85A /*0xDE58*/, 0x824B, 0x4476, 0x824F, 0x447A, 0x8257,
- 0xD85A /*0xDE8C*/, 0x825C, 0x8263, 0xD85A /*0xDEB7*/, 0xFA5D, 0xFA5E, 0x8279, 0x4491,
- 0x827D, 0x827F, 0x8283, 0x828A, 0x8293, 0x82A7, 0x82A8,
-};
-static const unsigned short euc_to_utf8_8FF6_x0213[] = {
-         0x82B2, 0x82B4, 0x82BA, 0x82BC, 0x82E2, 0x82E8, 0x82F7,
- 0x8307, 0x8308, 0x830C, 0x8354, 0x831B, 0x831D, 0x8330, 0x833C,
- 0x8344, 0x8357, 0x44BE, 0x837F, 0x44D4, 0x44B3, 0x838D, 0x8394,
- 0x8395, 0x839B, 0x839D, 0x83C9, 0x83D0, 0x83D4, 0x83DD, 0x83E5,
- 0x83F9, 0x840F, 0x8411, 0x8415, 0xD85B /*0xDC73*/, 0x8417, 0x8439, 0x844A,
- 0x844F, 0x8451, 0x8452, 0x8459, 0x845A, 0x845C, 0xD85B /*0xDCDD*/, 0x8465,
- 0x8476, 0x8478, 0x847C, 0x8481, 0x450D, 0x84DC, 0x8497, 0x84A6,
- 0x84BE, 0x4508, 0x84CE, 0x84CF, 0x84D3, 0xD85B /*0xDE65*/, 0x84E7, 0x84EA,
- 0x84EF, 0x84F0, 0x84F1, 0x84FA, 0x84FD, 0x850C, 0x851B, 0x8524,
- 0x8525, 0x852B, 0x8534, 0x854F, 0x856F, 0x4525, 0x4543, 0x853E,
- 0x8551, 0x8553, 0x855E, 0x8561, 0x8562, 0xD85B /*0xDF94*/, 0x857B, 0x857D,
- 0x857F, 0x8581, 0x8586, 0x8593, 0x859D, 0x859F, 0xD85B /*0xDFF8*/,
-};
-static const unsigned short euc_to_utf8_8FF7_x0213[] = {
-         0xD85B /*0xDFF6*/, 0xD85B /*0xDFF7*/, 0x85B7, 0x85BC, 0x85C7, 0x85CA, 0x85D8,
- 0x85D9, 0x85DF, 0x85E1, 0x85E6, 0x85F6, 0x8600, 0x8611, 0x861E,
- 0x8621, 0x8624, 0x8627, 0xD85C /*0xDD0D*/, 0x8639, 0x863C, 0xD85C /*0xDD39*/, 0x8640,
- 0xFA20, 0x8653, 0x8656, 0x866F, 0x8677, 0x867A, 0x8687, 0x8689,
- 0x868D, 0x8691, 0x869C, 0x869D, 0x86A8, 0xFA21, 0x86B1, 0x86B3,
- 0x86C1, 0x86C3, 0x86D1, 0x86D5, 0x86D7, 0x86E3, 0x86E6, 0x45B8,
- 0x8705, 0x8707, 0x870E, 0x8710, 0x8713, 0x8719, 0x871F, 0x8721,
- 0x8723, 0x8731, 0x873A, 0x873E, 0x8740, 0x8743, 0x8751, 0x8758,
- 0x8764, 0x8765, 0x8772, 0x877C, 0xD85C /*0xDFDB*/, 0xD85C /*0xDFDA*/, 0x87A7, 0x8789,
- 0x878B, 0x8793, 0x87A0, 0xD85C /*0xDFFE*/, 0x45E5, 0x87BE, 0xD85D /*0xDC10*/, 0x87C1,
- 0x87CE, 0x87F5, 0x87DF, 0xD85D /*0xDC49*/, 0x87E3, 0x87E5, 0x87E6, 0x87EA,
- 0x87EB, 0x87ED, 0x8801, 0x8803, 0x880B, 0x8813, 0x8828,
-};
-static const unsigned short euc_to_utf8_8FF8_x0213[] = {
-         0x882E, 0x8832, 0x883C, 0x460F, 0x884A, 0x8858, 0x885F,
- 0x8864, 0xD85D /*0xDE15*/, 0xD85D /*0xDE14*/, 0x8869, 0xD85D /*0xDE31*/, 0x886F, 0x88A0, 0x88BC,
- 0x88BD, 0x88BE, 0x88C0, 0x88D2, 0xD85D /*0xDE93*/, 0x88D1, 0x88D3, 0x88DB,
- 0x88F0, 0x88F1, 0x4641, 0x8901, 0xD85D /*0xDF0E*/, 0x8937, 0xD85D /*0xDF23*/, 0x8942,
- 0x8945, 0x8949, 0xD85D /*0xDF52*/, 0x4665, 0x8962, 0x8980, 0x8989, 0x8990,
- 0x899F, 0x89B0, 0x89B7, 0x89D6, 0x89D8, 0x89EB, 0x46A1, 0x89F1,
- 0x89F3, 0x89FD, 0x89FF, 0x46AF, 0x8A11, 0x8A14, 0xD85E /*0xDD85*/, 0x8A21,
- 0x8A35, 0x8A3E, 0x8A45, 0x8A4D, 0x8A58, 0x8AAE, 0x8A90, 0x8AB7,
- 0x8ABE, 0x8AD7, 0x8AFC, 0xD85E /*0xDE84*/, 0x8B0A, 0x8B05, 0x8B0D, 0x8B1C,
- 0x8B1F, 0x8B2D, 0x8B43, 0x470C, 0x8B51, 0x8B5E, 0x8B76, 0x8B7F,
- 0x8B81, 0x8B8B, 0x8B94, 0x8B95, 0x8B9C, 0x8B9E, 0x8C39, 0xD85E /*0xDFB3*/,
- 0x8C3D, 0xD85E /*0xDFBE*/, 0xD85E /*0xDFC7*/, 0x8C45, 0x8C47, 0x8C4F, 0x8C54,
-};
-static const unsigned short euc_to_utf8_8FF9_x0213[] = {
-         0x8C57, 0x8C69, 0x8C6D, 0x8C73, 0xD85F /*0xDCB8*/, 0x8C93, 0x8C92,
- 0x8C99, 0x4764, 0x8C9B, 0x8CA4, 0x8CD6, 0x8CD5, 0x8CD9, 0xD85F /*0xDDA0*/,
- 0x8CF0, 0x8CF1, 0xD85F /*0xDE10*/, 0x8D09, 0x8D0E, 0x8D6C, 0x8D84, 0x8D95,
- 0x8DA6, 0xD85F /*0xDFB7*/, 0x8DC6, 0x8DC8, 0x8DD9, 0x8DEC, 0x8E0C, 0x47FD,
- 0x8DFD, 0x8E06, 0xD860 /*0xDC8A*/, 0x8E14, 0x8E16, 0x8E21, 0x8E22, 0x8E27,
- 0xD860 /*0xDCBB*/, 0x4816, 0x8E36, 0x8E39, 0x8E4B, 0x8E54, 0x8E62, 0x8E6C,
- 0x8E6D, 0x8E6F, 0x8E98, 0x8E9E, 0x8EAE, 0x8EB3, 0x8EB5, 0x8EB6,
- 0x8EBB, 0xD860 /*0xDE82*/, 0x8ED1, 0x8ED4, 0x484E, 0x8EF9, 0xD860 /*0xDEF3*/, 0x8F00,
- 0x8F08, 0x8F17, 0x8F2B, 0x8F40, 0x8F4A, 0x8F58, 0xD861 /*0xDC0C*/, 0x8FA4,
- 0x8FB4, 0xFA66, 0x8FB6, 0xD861 /*0xDC55*/, 0x8FC1, 0x8FC6, 0xFA24, 0x8FCA,
- 0x8FCD, 0x8FD3, 0x8FD5, 0x8FE0, 0x8FF1, 0x8FF5, 0x8FFB, 0x9002,
- 0x900C, 0x9037, 0xD861 /*0xDD6B*/, 0x9043, 0x9044, 0x905D, 0xD861 /*0xDDC8*/,
-};
-static const unsigned short euc_to_utf8_8FFA_x0213[] = {
-         0xD861 /*0xDDC9*/, 0x9085, 0x908C, 0x9090, 0x961D, 0x90A1, 0x48B5,
- 0x90B0, 0x90B6, 0x90C3, 0x90C8, 0xD861 /*0xDED7*/, 0x90DC, 0x90DF, 0xD861 /*0xDEFA*/,
- 0x90F6, 0x90F2, 0x9100, 0x90EB, 0x90FE, 0x90FF, 0x9104, 0x9106,
- 0x9118, 0x911C, 0x911E, 0x9137, 0x9139, 0x913A, 0x9146, 0x9147,
- 0x9157, 0x9159, 0x9161, 0x9164, 0x9174, 0x9179, 0x9185, 0x918E,
- 0x91A8, 0x91AE, 0x91B3, 0x91B6, 0x91C3, 0x91C4, 0x91DA, 0xD862 /*0xDD49*/,
- 0xD862 /*0xDD46*/, 0x91EC, 0x91EE, 0x9201, 0x920A, 0x9216, 0x9217, 0xD862 /*0xDD6B*/,
- 0x9233, 0x9242, 0x9247, 0x924A, 0x924E, 0x9251, 0x9256, 0x9259,
- 0x9260, 0x9261, 0x9265, 0x9267, 0x9268, 0xD862 /*0xDD87*/, 0xD862 /*0xDD88*/, 0x927C,
- 0x927D, 0x927F, 0x9289, 0x928D, 0x9297, 0x9299, 0x929F, 0x92A7,
- 0x92AB, 0xD862 /*0xDDBA*/, 0xD862 /*0xDDBB*/, 0x92B2, 0x92BF, 0x92C0, 0x92C6, 0x92CE,
- 0x92D0, 0x92D7, 0x92D9, 0x92E5, 0x92E7, 0x9311, 0xD862 /*0xDE1E*/,
-};
-static const unsigned short euc_to_utf8_8FFB_x0213[] = {
-         0xD862 /*0xDE29*/, 0x92F7, 0x92F9, 0x92FB, 0x9302, 0x930D, 0x9315,
- 0x931D, 0x931E, 0x9327, 0x9329, 0xD862 /*0xDE71*/, 0xD862 /*0xDE43*/, 0x9347, 0x9351,
- 0x9357, 0x935A, 0x936B, 0x9371, 0x9373, 0x93A1, 0xD862 /*0xDE99*/, 0xD862 /*0xDECD*/,
- 0x9388, 0x938B, 0x938F, 0x939E, 0x93F5, 0xD862 /*0xDEE4*/, 0xD862 /*0xDEDD*/, 0x93F1,
- 0x93C1, 0x93C7, 0x93DC, 0x93E2, 0x93E7, 0x9409, 0x940F, 0x9416,
- 0x9417, 0x93FB, 0x9432, 0x9434, 0x943B, 0x9445, 0xD862 /*0xDFC1*/, 0xD862 /*0xDFEF*/,
- 0x946D, 0x946F, 0x9578, 0x9579, 0x9586, 0x958C, 0x958D, 0xD863 /*0xDD10*/,
- 0x95AB, 0x95B4, 0xD863 /*0xDD71*/, 0x95C8, 0xD863 /*0xDDFB*/, 0xD863 /*0xDE1F*/, 0x962C, 0x9633,
- 0x9634, 0xD863 /*0xDE36*/, 0x963C, 0x9641, 0x9661, 0xD863 /*0xDE89*/, 0x9682, 0xD863 /*0xDEEB*/,
- 0x969A, 0xD863 /*0xDF32*/, 0x49E7, 0x96A9, 0x96AF, 0x96B3, 0x96BA, 0x96BD,
- 0x49FA, 0xD863 /*0xDFF8*/, 0x96D8, 0x96DA, 0x96DD, 0x4A04, 0x9714, 0x9723,
- 0x4A29, 0x9736, 0x9741, 0x9747, 0x9755, 0x9757, 0x975B,
-};
-static const unsigned short euc_to_utf8_8FFC_x0213[] = {
-         0x976A, 0xD864 /*0xDEA0*/, 0xD864 /*0xDEB1*/, 0x9796, 0x979A, 0x979E, 0x97A2,
- 0x97B1, 0x97B2, 0x97BE, 0x97CC, 0x97D1, 0x97D4, 0x97D8, 0x97D9,
- 0x97E1, 0x97F1, 0x9804, 0x980D, 0x980E, 0x9814, 0x9816, 0x4ABC,
- 0xD865 /*0xDC90*/, 0x9823, 0x9832, 0x9833, 0x9825, 0x9847, 0x9866, 0x98AB,
- 0x98AD, 0x98B0, 0xD865 /*0xDDCF*/, 0x98B7, 0x98B8, 0x98BB, 0x98BC, 0x98BF,
- 0x98C2, 0x98C7, 0x98CB, 0x98E0, 0xD865 /*0xDE7F*/, 0x98E1, 0x98E3, 0x98E5,
- 0x98EA, 0x98F0, 0x98F1, 0x98F3, 0x9908, 0x4B3B, 0xD865 /*0xDEF0*/, 0x9916,
- 0x9917, 0xD865 /*0xDF19*/, 0x991A, 0x991B, 0x991C, 0xD865 /*0xDF50*/, 0x9931, 0x9932,
- 0x9933, 0x993A, 0x993B, 0x993C, 0x9940, 0x9941, 0x9946, 0x994D,
- 0x994E, 0x995C, 0x995F, 0x9960, 0x99A3, 0x99A6, 0x99B9, 0x99BD,
- 0x99BF, 0x99C3, 0x99C9, 0x99D4, 0x99D9, 0x99DE, 0xD866 /*0xDCC6*/, 0x99F0,
- 0x99F9, 0x99FC, 0x9A0A, 0x9A11, 0x9A16, 0x9A1A, 0x9A20,
-};
-static const unsigned short euc_to_utf8_8FFD_x0213[] = {
-         0x9A31, 0x9A36, 0x9A44, 0x9A4C, 0x9A58, 0x4BC2, 0x9AAF,
- 0x4BCA, 0x9AB7, 0x4BD2, 0x9AB9, 0xD866 /*0xDE72*/, 0x9AC6, 0x9AD0, 0x9AD2,
- 0x9AD5, 0x4BE8, 0x9ADC, 0x9AE0, 0x9AE5, 0x9AE9, 0x9B03, 0x9B0C,
- 0x9B10, 0x9B12, 0x9B16, 0x9B1C, 0x9B2B, 0x9B33, 0x9B3D, 0x4C20,
- 0x9B4B, 0x9B63, 0x9B65, 0x9B6B, 0x9B6C, 0x9B73, 0x9B76, 0x9B77,
- 0x9BA6, 0x9BAC, 0x9BB1, 0xD867 /*0xDDDB*/, 0xD867 /*0xDE3D*/, 0x9BB2, 0x9BB8, 0x9BBE,
- 0x9BC7, 0x9BF3, 0x9BD8, 0x9BDD, 0x9BE7, 0x9BEA, 0x9BEB, 0x9BEF,
- 0x9BEE, 0xD867 /*0xDE15*/, 0x9BFA, 0xD867 /*0xDE8A*/, 0x9BF7, 0xD867 /*0xDE49*/, 0x9C16, 0x9C18,
- 0x9C19, 0x9C1A, 0x9C1D, 0x9C22, 0x9C27, 0x9C29, 0x9C2A, 0xD867 /*0xDEC4*/,
- 0x9C31, 0x9C36, 0x9C37, 0x9C45, 0x9C5C, 0xD867 /*0xDEE9*/, 0x9C49, 0x9C4A,
- 0xD867 /*0xDEDB*/, 0x9C54, 0x9C58, 0x9C5B, 0x9C5D, 0x9C5F, 0x9C69, 0x9C6A,
- 0x9C6B, 0x9C6D, 0x9C6E, 0x9C70, 0x9C72, 0x9C75, 0x9C7A,
-};
-static const unsigned short euc_to_utf8_8FFE_x0213[] = {
-         0x9CE6, 0x9CF2, 0x9D0B, 0x9D02, 0xD867 /*0xDFCE*/, 0x9D11, 0x9D17,
- 0x9D18, 0xD868 /*0xDC2F*/, 0x4CC4, 0xD868 /*0xDC1A*/, 0x9D32, 0x4CD1, 0x9D42, 0x9D4A,
- 0x9D5F, 0x9D62, 0xD868 /*0xDCF9*/, 0x9D69, 0x9D6B, 0xD868 /*0xDC82*/, 0x9D73, 0x9D76,
- 0x9D77, 0x9D7E, 0x9D84, 0x9D8D, 0x9D99, 0x9DA1, 0x9DBF, 0x9DB5,
- 0x9DB9, 0x9DBD, 0x9DC3, 0x9DC7, 0x9DC9, 0x9DD6, 0x9DDA, 0x9DDF,
- 0x9DE0, 0x9DE3, 0x9DF4, 0x4D07, 0x9E0A, 0x9E02, 0x9E0D, 0x9E19,
- 0x9E1C, 0x9E1D, 0x9E7B, 0xD848 /*0xDE18*/, 0x9E80, 0x9E85, 0x9E9B, 0x9EA8,
- 0xD868 /*0xDF8C*/, 0x9EBD, 0xD869 /*0xDC37*/, 0x9EDF, 0x9EE7, 0x9EEE, 0x9EFF, 0x9F02,
- 0x4D77, 0x9F03, 0x9F17, 0x9F19, 0x9F2F, 0x9F37, 0x9F3A, 0x9F3D,
- 0x9F41, 0x9F45, 0x9F46, 0x9F53, 0x9F55, 0x9F58, 0xD869 /*0xDDF1*/, 0x9F5D,
- 0xD869 /*0xDE02*/, 0x9F69, 0xD869 /*0xDE1A*/, 0x9F6D, 0x9F70, 0x9F75, 0xD869 /*0xDEB2*/, 0,
-      0,      0,      0,      0,      0,      0,      0,
-};
-
-#ifdef X0212_ENABLE
-static const unsigned short euc_to_utf8_8FA2[] = {
-              0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0, 0x02D8,
- 0x02C7, 0x00B8, 0x02D9, 0x02DD, 0x00AF, 0x02DB, 0x02DA, 0xFF5E,
- 0x0384, 0x0385,      0,      0,      0,      0,      0,      0,
-      0,      0, 0x00A1, 0xFFE4, 0x00BF,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0, 0x00BA, 0x00AA, 0x00A9, 0x00AE, 0x2122,
- 0x00A4, 0x2116,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,
-};
-static const unsigned short euc_to_utf8_8FA6[] = {
-              0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0, 0x0386, 0x0388, 0x0389, 0x038A, 0x03AA,      0, 0x038C,
-      0, 0x038E, 0x03AB,      0, 0x038F,      0,      0,      0,
-      0, 0x03AC, 0x03AD, 0x03AE, 0x03AF, 0x03CA, 0x0390, 0x03CC,
- 0x03C2, 0x03CD, 0x03CB, 0x03B0, 0x03CE,      0,      0,
-};
-static const unsigned short euc_to_utf8_8FA7[] = {
-              0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0, 0x0402, 0x0403, 0x0404, 0x0405, 0x0406, 0x0407,
- 0x0408, 0x0409, 0x040A, 0x040B, 0x040C, 0x040E, 0x040F,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0, 0x0452, 0x0453, 0x0454, 0x0455, 0x0456, 0x0457,
- 0x0458, 0x0459, 0x045A, 0x045B, 0x045C, 0x045E, 0x045F,
-};
-static const unsigned short euc_to_utf8_8FA9[] = {
-         0x00C6, 0x0110,      0, 0x0126,      0, 0x0132,      0,
- 0x0141, 0x013F,      0, 0x014A, 0x00D8, 0x0152,      0, 0x0166,
- 0x00DE,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0, 0x00E6, 0x0111, 0x00F0, 0x0127, 0x0131, 0x0133, 0x0138,
- 0x0142, 0x0140, 0x0149, 0x014B, 0x00F8, 0x0153, 0x00DF, 0x0167,
- 0x00FE,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,
-};
-static const unsigned short euc_to_utf8_8FAA[] = {
-         0x00C1, 0x00C0, 0x00C4, 0x00C2, 0x0102, 0x01CD, 0x0100,
- 0x0104, 0x00C5, 0x00C3, 0x0106, 0x0108, 0x010C, 0x00C7, 0x010A,
- 0x010E, 0x00C9, 0x00C8, 0x00CB, 0x00CA, 0x011A, 0x0116, 0x0112,
- 0x0118,      0, 0x011C, 0x011E, 0x0122, 0x0120, 0x0124, 0x00CD,
- 0x00CC, 0x00CF, 0x00CE, 0x01CF, 0x0130, 0x012A, 0x012E, 0x0128,
- 0x0134, 0x0136, 0x0139, 0x013D, 0x013B, 0x0143, 0x0147, 0x0145,
- 0x00D1, 0x00D3, 0x00D2, 0x00D6, 0x00D4, 0x01D1, 0x0150, 0x014C,
- 0x00D5, 0x0154, 0x0158, 0x0156, 0x015A, 0x015C, 0x0160, 0x015E,
- 0x0164, 0x0162, 0x00DA, 0x00D9, 0x00DC, 0x00DB, 0x016C, 0x01D3,
- 0x0170, 0x016A, 0x0172, 0x016E, 0x0168, 0x01D7, 0x01DB, 0x01D9,
- 0x01D5, 0x0174, 0x00DD, 0x0178, 0x0176, 0x0179, 0x017D, 0x017B,
-      0,      0,      0,      0,      0,      0,      0,
-};
-static const unsigned short euc_to_utf8_8FAB[] = {
-         0x00E1, 0x00E0, 0x00E4, 0x00E2, 0x0103, 0x01CE, 0x0101,
- 0x0105, 0x00E5, 0x00E3, 0x0107, 0x0109, 0x010D, 0x00E7, 0x010B,
- 0x010F, 0x00E9, 0x00E8, 0x00EB, 0x00EA, 0x011B, 0x0117, 0x0113,
- 0x0119, 0x01F5, 0x011D, 0x011F,      0, 0x0121, 0x0125, 0x00ED,
- 0x00EC, 0x00EF, 0x00EE, 0x01D0,      0, 0x012B, 0x012F, 0x0129,
- 0x0135, 0x0137, 0x013A, 0x013E, 0x013C, 0x0144, 0x0148, 0x0146,
- 0x00F1, 0x00F3, 0x00F2, 0x00F6, 0x00F4, 0x01D2, 0x0151, 0x014D,
- 0x00F5, 0x0155, 0x0159, 0x0157, 0x015B, 0x015D, 0x0161, 0x015F,
- 0x0165, 0x0163, 0x00FA, 0x00F9, 0x00FC, 0x00FB, 0x016D, 0x01D4,
- 0x0171, 0x016B, 0x0173, 0x016F, 0x0169, 0x01D8, 0x01DC, 0x01DA,
- 0x01D6, 0x0175, 0x00FD, 0x00FF, 0x0177, 0x017A, 0x017E, 0x017C,
-      0,      0,      0,      0,      0,      0,      0,
-};
-static const unsigned short euc_to_utf8_8FB0[] = {
-         0x4E02, 0x4E04, 0x4E05, 0x4E0C, 0x4E12, 0x4E1F, 0x4E23,
- 0x4E24, 0x4E28, 0x4E2B, 0x4E2E, 0x4E2F, 0x4E30, 0x4E35, 0x4E40,
- 0x4E41, 0x4E44, 0x4E47, 0x4E51, 0x4E5A, 0x4E5C, 0x4E63, 0x4E68,
- 0x4E69, 0x4E74, 0x4E75, 0x4E79, 0x4E7F, 0x4E8D, 0x4E96, 0x4E97,
- 0x4E9D, 0x4EAF, 0x4EB9, 0x4EC3, 0x4ED0, 0x4EDA, 0x4EDB, 0x4EE0,
- 0x4EE1, 0x4EE2, 0x4EE8, 0x4EEF, 0x4EF1, 0x4EF3, 0x4EF5, 0x4EFD,
- 0x4EFE, 0x4EFF, 0x4F00, 0x4F02, 0x4F03, 0x4F08, 0x4F0B, 0x4F0C,
- 0x4F12, 0x4F15, 0x4F16, 0x4F17, 0x4F19, 0x4F2E, 0x4F31, 0x4F60,
- 0x4F33, 0x4F35, 0x4F37, 0x4F39, 0x4F3B, 0x4F3E, 0x4F40, 0x4F42,
- 0x4F48, 0x4F49, 0x4F4B, 0x4F4C, 0x4F52, 0x4F54, 0x4F56, 0x4F58,
- 0x4F5F, 0x4F63, 0x4F6A, 0x4F6C, 0x4F6E, 0x4F71, 0x4F77, 0x4F78,
- 0x4F79, 0x4F7A, 0x4F7D, 0x4F7E, 0x4F81, 0x4F82, 0x4F84,
-};
-static const unsigned short euc_to_utf8_8FB1[] = {
-         0x4F85, 0x4F89, 0x4F8A, 0x4F8C, 0x4F8E, 0x4F90, 0x4F92,
- 0x4F93, 0x4F94, 0x4F97, 0x4F99, 0x4F9A, 0x4F9E, 0x4F9F, 0x4FB2,
- 0x4FB7, 0x4FB9, 0x4FBB, 0x4FBC, 0x4FBD, 0x4FBE, 0x4FC0, 0x4FC1,
- 0x4FC5, 0x4FC6, 0x4FC8, 0x4FC9, 0x4FCB, 0x4FCC, 0x4FCD, 0x4FCF,
- 0x4FD2, 0x4FDC, 0x4FE0, 0x4FE2, 0x4FF0, 0x4FF2, 0x4FFC, 0x4FFD,
- 0x4FFF, 0x5000, 0x5001, 0x5004, 0x5007, 0x500A, 0x500C, 0x500E,
- 0x5010, 0x5013, 0x5017, 0x5018, 0x501B, 0x501C, 0x501D, 0x501E,
- 0x5022, 0x5027, 0x502E, 0x5030, 0x5032, 0x5033, 0x5035, 0x5040,
- 0x5041, 0x5042, 0x5045, 0x5046, 0x504A, 0x504C, 0x504E, 0x5051,
- 0x5052, 0x5053, 0x5057, 0x5059, 0x505F, 0x5060, 0x5062, 0x5063,
- 0x5066, 0x5067, 0x506A, 0x506D, 0x5070, 0x5071, 0x503B, 0x5081,
- 0x5083, 0x5084, 0x5086, 0x508A, 0x508E, 0x508F, 0x5090,
-};
-static const unsigned short euc_to_utf8_8FB2[] = {
-         0x5092, 0x5093, 0x5094, 0x5096, 0x509B, 0x509C, 0x509E,
- 0x509F, 0x50A0, 0x50A1, 0x50A2, 0x50AA, 0x50AF, 0x50B0, 0x50B9,
- 0x50BA, 0x50BD, 0x50C0, 0x50C3, 0x50C4, 0x50C7, 0x50CC, 0x50CE,
- 0x50D0, 0x50D3, 0x50D4, 0x50D8, 0x50DC, 0x50DD, 0x50DF, 0x50E2,
- 0x50E4, 0x50E6, 0x50E8, 0x50E9, 0x50EF, 0x50F1, 0x50F6, 0x50FA,
- 0x50FE, 0x5103, 0x5106, 0x5107, 0x5108, 0x510B, 0x510C, 0x510D,
- 0x510E, 0x50F2, 0x5110, 0x5117, 0x5119, 0x511B, 0x511C, 0x511D,
- 0x511E, 0x5123, 0x5127, 0x5128, 0x512C, 0x512D, 0x512F, 0x5131,
- 0x5133, 0x5134, 0x5135, 0x5138, 0x5139, 0x5142, 0x514A, 0x514F,
- 0x5153, 0x5155, 0x5157, 0x5158, 0x515F, 0x5164, 0x5166, 0x517E,
- 0x5183, 0x5184, 0x518B, 0x518E, 0x5198, 0x519D, 0x51A1, 0x51A3,
- 0x51AD, 0x51B8, 0x51BA, 0x51BC, 0x51BE, 0x51BF, 0x51C2,
-};
-static const unsigned short euc_to_utf8_8FB3[] = {
-         0x51C8, 0x51CF, 0x51D1, 0x51D2, 0x51D3, 0x51D5, 0x51D8,
- 0x51DE, 0x51E2, 0x51E5, 0x51EE, 0x51F2, 0x51F3, 0x51F4, 0x51F7,
- 0x5201, 0x5202, 0x5205, 0x5212, 0x5213, 0x5215, 0x5216, 0x5218,
- 0x5222, 0x5228, 0x5231, 0x5232, 0x5235, 0x523C, 0x5245, 0x5249,
- 0x5255, 0x5257, 0x5258, 0x525A, 0x525C, 0x525F, 0x5260, 0x5261,
- 0x5266, 0x526E, 0x5277, 0x5278, 0x5279, 0x5280, 0x5282, 0x5285,
- 0x528A, 0x528C, 0x5293, 0x5295, 0x5296, 0x5297, 0x5298, 0x529A,
- 0x529C, 0x52A4, 0x52A5, 0x52A6, 0x52A7, 0x52AF, 0x52B0, 0x52B6,
- 0x52B7, 0x52B8, 0x52BA, 0x52BB, 0x52BD, 0x52C0, 0x52C4, 0x52C6,
- 0x52C8, 0x52CC, 0x52CF, 0x52D1, 0x52D4, 0x52D6, 0x52DB, 0x52DC,
- 0x52E1, 0x52E5, 0x52E8, 0x52E9, 0x52EA, 0x52EC, 0x52F0, 0x52F1,
- 0x52F4, 0x52F6, 0x52F7, 0x5300, 0x5303, 0x530A, 0x530B,
-};
-static const unsigned short euc_to_utf8_8FB4[] = {
-         0x530C, 0x5311, 0x5313, 0x5318, 0x531B, 0x531C, 0x531E,
- 0x531F, 0x5325, 0x5327, 0x5328, 0x5329, 0x532B, 0x532C, 0x532D,
- 0x5330, 0x5332, 0x5335, 0x533C, 0x533D, 0x533E, 0x5342, 0x534C,
- 0x534B, 0x5359, 0x535B, 0x5361, 0x5363, 0x5365, 0x536C, 0x536D,
- 0x5372, 0x5379, 0x537E, 0x5383, 0x5387, 0x5388, 0x538E, 0x5393,
- 0x5394, 0x5399, 0x539D, 0x53A1, 0x53A4, 0x53AA, 0x53AB, 0x53AF,
- 0x53B2, 0x53B4, 0x53B5, 0x53B7, 0x53B8, 0x53BA, 0x53BD, 0x53C0,
- 0x53C5, 0x53CF, 0x53D2, 0x53D3, 0x53D5, 0x53DA, 0x53DD, 0x53DE,
- 0x53E0, 0x53E6, 0x53E7, 0x53F5, 0x5402, 0x5413, 0x541A, 0x5421,
- 0x5427, 0x5428, 0x542A, 0x542F, 0x5431, 0x5434, 0x5435, 0x5443,
- 0x5444, 0x5447, 0x544D, 0x544F, 0x545E, 0x5462, 0x5464, 0x5466,
- 0x5467, 0x5469, 0x546B, 0x546D, 0x546E, 0x5474, 0x547F,
-};
-static const unsigned short euc_to_utf8_8FB5[] = {
-         0x5481, 0x5483, 0x5485, 0x5488, 0x5489, 0x548D, 0x5491,
- 0x5495, 0x5496, 0x549C, 0x549F, 0x54A1, 0x54A6, 0x54A7, 0x54A9,
- 0x54AA, 0x54AD, 0x54AE, 0x54B1, 0x54B7, 0x54B9, 0x54BA, 0x54BB,
- 0x54BF, 0x54C6, 0x54CA, 0x54CD, 0x54CE, 0x54E0, 0x54EA, 0x54EC,
- 0x54EF, 0x54F6, 0x54FC, 0x54FE, 0x54FF, 0x5500, 0x5501, 0x5505,
- 0x5508, 0x5509, 0x550C, 0x550D, 0x550E, 0x5515, 0x552A, 0x552B,
- 0x5532, 0x5535, 0x5536, 0x553B, 0x553C, 0x553D, 0x5541, 0x5547,
- 0x5549, 0x554A, 0x554D, 0x5550, 0x5551, 0x5558, 0x555A, 0x555B,
- 0x555E, 0x5560, 0x5561, 0x5564, 0x5566, 0x557F, 0x5581, 0x5582,
- 0x5586, 0x5588, 0x558E, 0x558F, 0x5591, 0x5592, 0x5593, 0x5594,
- 0x5597, 0x55A3, 0x55A4, 0x55AD, 0x55B2, 0x55BF, 0x55C1, 0x55C3,
- 0x55C6, 0x55C9, 0x55CB, 0x55CC, 0x55CE, 0x55D1, 0x55D2,
-};
-static const unsigned short euc_to_utf8_8FB6[] = {
-         0x55D3, 0x55D7, 0x55D8, 0x55DB, 0x55DE, 0x55E2, 0x55E9,
- 0x55F6, 0x55FF, 0x5605, 0x5608, 0x560A, 0x560D, 0x560E, 0x560F,
- 0x5610, 0x5611, 0x5612, 0x5619, 0x562C, 0x5630, 0x5633, 0x5635,
- 0x5637, 0x5639, 0x563B, 0x563C, 0x563D, 0x563F, 0x5640, 0x5641,
- 0x5643, 0x5644, 0x5646, 0x5649, 0x564B, 0x564D, 0x564F, 0x5654,
- 0x565E, 0x5660, 0x5661, 0x5662, 0x5663, 0x5666, 0x5669, 0x566D,
- 0x566F, 0x5671, 0x5672, 0x5675, 0x5684, 0x5685, 0x5688, 0x568B,
- 0x568C, 0x5695, 0x5699, 0x569A, 0x569D, 0x569E, 0x569F, 0x56A6,
- 0x56A7, 0x56A8, 0x56A9, 0x56AB, 0x56AC, 0x56AD, 0x56B1, 0x56B3,
- 0x56B7, 0x56BE, 0x56C5, 0x56C9, 0x56CA, 0x56CB, 0x56CF, 0x56D0,
- 0x56CC, 0x56CD, 0x56D9, 0x56DC, 0x56DD, 0x56DF, 0x56E1, 0x56E4,
- 0x56E5, 0x56E6, 0x56E7, 0x56E8, 0x56F1, 0x56EB, 0x56ED,
-};
-static const unsigned short euc_to_utf8_8FB7[] = {
-         0x56F6, 0x56F7, 0x5701, 0x5702, 0x5707, 0x570A, 0x570C,
- 0x5711, 0x5715, 0x571A, 0x571B, 0x571D, 0x5720, 0x5722, 0x5723,
- 0x5724, 0x5725, 0x5729, 0x572A, 0x572C, 0x572E, 0x572F, 0x5733,
- 0x5734, 0x573D, 0x573E, 0x573F, 0x5745, 0x5746, 0x574C, 0x574D,
- 0x5752, 0x5762, 0x5765, 0x5767, 0x5768, 0x576B, 0x576D, 0x576E,
- 0x576F, 0x5770, 0x5771, 0x5773, 0x5774, 0x5775, 0x5777, 0x5779,
- 0x577A, 0x577B, 0x577C, 0x577E, 0x5781, 0x5783, 0x578C, 0x5794,
- 0x5797, 0x5799, 0x579A, 0x579C, 0x579D, 0x579E, 0x579F, 0x57A1,
- 0x5795, 0x57A7, 0x57A8, 0x57A9, 0x57AC, 0x57B8, 0x57BD, 0x57C7,
- 0x57C8, 0x57CC, 0x57CF, 0x57D5, 0x57DD, 0x57DE, 0x57E4, 0x57E6,
- 0x57E7, 0x57E9, 0x57ED, 0x57F0, 0x57F5, 0x57F6, 0x57F8, 0x57FD,
- 0x57FE, 0x57FF, 0x5803, 0x5804, 0x5808, 0x5809, 0x57E1,
-};
-static const unsigned short euc_to_utf8_8FB8[] = {
-         0x580C, 0x580D, 0x581B, 0x581E, 0x581F, 0x5820, 0x5826,
- 0x5827, 0x582D, 0x5832, 0x5839, 0x583F, 0x5849, 0x584C, 0x584D,
- 0x584F, 0x5850, 0x5855, 0x585F, 0x5861, 0x5864, 0x5867, 0x5868,
- 0x5878, 0x587C, 0x587F, 0x5880, 0x5881, 0x5887, 0x5888, 0x5889,
- 0x588A, 0x588C, 0x588D, 0x588F, 0x5890, 0x5894, 0x5896, 0x589D,
- 0x58A0, 0x58A1, 0x58A2, 0x58A6, 0x58A9, 0x58B1, 0x58B2, 0x58C4,
- 0x58BC, 0x58C2, 0x58C8, 0x58CD, 0x58CE, 0x58D0, 0x58D2, 0x58D4,
- 0x58D6, 0x58DA, 0x58DD, 0x58E1, 0x58E2, 0x58E9, 0x58F3, 0x5905,
- 0x5906, 0x590B, 0x590C, 0x5912, 0x5913, 0x5914, 0x8641, 0x591D,
- 0x5921, 0x5923, 0x5924, 0x5928, 0x592F, 0x5930, 0x5933, 0x5935,
- 0x5936, 0x593F, 0x5943, 0x5946, 0x5952, 0x5953, 0x5959, 0x595B,
- 0x595D, 0x595E, 0x595F, 0x5961, 0x5963, 0x596B, 0x596D,
-};
-static const unsigned short euc_to_utf8_8FB9[] = {
-         0x596F, 0x5972, 0x5975, 0x5976, 0x5979, 0x597B, 0x597C,
- 0x598B, 0x598C, 0x598E, 0x5992, 0x5995, 0x5997, 0x599F, 0x59A4,
- 0x59A7, 0x59AD, 0x59AE, 0x59AF, 0x59B0, 0x59B3, 0x59B7, 0x59BA,
- 0x59BC, 0x59C1, 0x59C3, 0x59C4, 0x59C8, 0x59CA, 0x59CD, 0x59D2,
- 0x59DD, 0x59DE, 0x59DF, 0x59E3, 0x59E4, 0x59E7, 0x59EE, 0x59EF,
- 0x59F1, 0x59F2, 0x59F4, 0x59F7, 0x5A00, 0x5A04, 0x5A0C, 0x5A0D,
- 0x5A0E, 0x5A12, 0x5A13, 0x5A1E, 0x5A23, 0x5A24, 0x5A27, 0x5A28,
- 0x5A2A, 0x5A2D, 0x5A30, 0x5A44, 0x5A45, 0x5A47, 0x5A48, 0x5A4C,
- 0x5A50, 0x5A55, 0x5A5E, 0x5A63, 0x5A65, 0x5A67, 0x5A6D, 0x5A77,
- 0x5A7A, 0x5A7B, 0x5A7E, 0x5A8B, 0x5A90, 0x5A93, 0x5A96, 0x5A99,
- 0x5A9C, 0x5A9E, 0x5A9F, 0x5AA0, 0x5AA2, 0x5AA7, 0x5AAC, 0x5AB1,
- 0x5AB2, 0x5AB3, 0x5AB5, 0x5AB8, 0x5ABA, 0x5ABB, 0x5ABF,
-};
-static const unsigned short euc_to_utf8_8FBA[] = {
-         0x5AC4, 0x5AC6, 0x5AC8, 0x5ACF, 0x5ADA, 0x5ADC, 0x5AE0,
- 0x5AE5, 0x5AEA, 0x5AEE, 0x5AF5, 0x5AF6, 0x5AFD, 0x5B00, 0x5B01,
- 0x5B08, 0x5B17, 0x5B34, 0x5B19, 0x5B1B, 0x5B1D, 0x5B21, 0x5B25,
- 0x5B2D, 0x5B38, 0x5B41, 0x5B4B, 0x5B4C, 0x5B52, 0x5B56, 0x5B5E,
- 0x5B68, 0x5B6E, 0x5B6F, 0x5B7C, 0x5B7D, 0x5B7E, 0x5B7F, 0x5B81,
- 0x5B84, 0x5B86, 0x5B8A, 0x5B8E, 0x5B90, 0x5B91, 0x5B93, 0x5B94,
- 0x5B96, 0x5BA8, 0x5BA9, 0x5BAC, 0x5BAD, 0x5BAF, 0x5BB1, 0x5BB2,
- 0x5BB7, 0x5BBA, 0x5BBC, 0x5BC0, 0x5BC1, 0x5BCD, 0x5BCF, 0x5BD6,
- 0x5BD7, 0x5BD8, 0x5BD9, 0x5BDA, 0x5BE0, 0x5BEF, 0x5BF1, 0x5BF4,
- 0x5BFD, 0x5C0C, 0x5C17, 0x5C1E, 0x5C1F, 0x5C23, 0x5C26, 0x5C29,
- 0x5C2B, 0x5C2C, 0x5C2E, 0x5C30, 0x5C32, 0x5C35, 0x5C36, 0x5C59,
- 0x5C5A, 0x5C5C, 0x5C62, 0x5C63, 0x5C67, 0x5C68, 0x5C69,
-};
-static const unsigned short euc_to_utf8_8FBB[] = {
-         0x5C6D, 0x5C70, 0x5C74, 0x5C75, 0x5C7A, 0x5C7B, 0x5C7C,
- 0x5C7D, 0x5C87, 0x5C88, 0x5C8A, 0x5C8F, 0x5C92, 0x5C9D, 0x5C9F,
- 0x5CA0, 0x5CA2, 0x5CA3, 0x5CA6, 0x5CAA, 0x5CB2, 0x5CB4, 0x5CB5,
- 0x5CBA, 0x5CC9, 0x5CCB, 0x5CD2, 0x5CDD, 0x5CD7, 0x5CEE, 0x5CF1,
- 0x5CF2, 0x5CF4, 0x5D01, 0x5D06, 0x5D0D, 0x5D12, 0x5D2B, 0x5D23,
- 0x5D24, 0x5D26, 0x5D27, 0x5D31, 0x5D34, 0x5D39, 0x5D3D, 0x5D3F,
- 0x5D42, 0x5D43, 0x5D46, 0x5D48, 0x5D55, 0x5D51, 0x5D59, 0x5D4A,
- 0x5D5F, 0x5D60, 0x5D61, 0x5D62, 0x5D64, 0x5D6A, 0x5D6D, 0x5D70,
- 0x5D79, 0x5D7A, 0x5D7E, 0x5D7F, 0x5D81, 0x5D83, 0x5D88, 0x5D8A,
- 0x5D92, 0x5D93, 0x5D94, 0x5D95, 0x5D99, 0x5D9B, 0x5D9F, 0x5DA0,
- 0x5DA7, 0x5DAB, 0x5DB0, 0x5DB4, 0x5DB8, 0x5DB9, 0x5DC3, 0x5DC7,
- 0x5DCB, 0x5DD0, 0x5DCE, 0x5DD8, 0x5DD9, 0x5DE0, 0x5DE4,
-};
-static const unsigned short euc_to_utf8_8FBC[] = {
-         0x5DE9, 0x5DF8, 0x5DF9, 0x5E00, 0x5E07, 0x5E0D, 0x5E12,
- 0x5E14, 0x5E15, 0x5E18, 0x5E1F, 0x5E20, 0x5E2E, 0x5E28, 0x5E32,
- 0x5E35, 0x5E3E, 0x5E4B, 0x5E50, 0x5E49, 0x5E51, 0x5E56, 0x5E58,
- 0x5E5B, 0x5E5C, 0x5E5E, 0x5E68, 0x5E6A, 0x5E6B, 0x5E6C, 0x5E6D,
- 0x5E6E, 0x5E70, 0x5E80, 0x5E8B, 0x5E8E, 0x5EA2, 0x5EA4, 0x5EA5,
- 0x5EA8, 0x5EAA, 0x5EAC, 0x5EB1, 0x5EB3, 0x5EBD, 0x5EBE, 0x5EBF,
- 0x5EC6, 0x5ECC, 0x5ECB, 0x5ECE, 0x5ED1, 0x5ED2, 0x5ED4, 0x5ED5,
- 0x5EDC, 0x5EDE, 0x5EE5, 0x5EEB, 0x5F02, 0x5F06, 0x5F07, 0x5F08,
- 0x5F0E, 0x5F19, 0x5F1C, 0x5F1D, 0x5F21, 0x5F22, 0x5F23, 0x5F24,
- 0x5F28, 0x5F2B, 0x5F2C, 0x5F2E, 0x5F30, 0x5F34, 0x5F36, 0x5F3B,
- 0x5F3D, 0x5F3F, 0x5F40, 0x5F44, 0x5F45, 0x5F47, 0x5F4D, 0x5F50,
- 0x5F54, 0x5F58, 0x5F5B, 0x5F60, 0x5F63, 0x5F64, 0x5F67,
-};
-static const unsigned short euc_to_utf8_8FBD[] = {
-         0x5F6F, 0x5F72, 0x5F74, 0x5F75, 0x5F78, 0x5F7A, 0x5F7D,
- 0x5F7E, 0x5F89, 0x5F8D, 0x5F8F, 0x5F96, 0x5F9C, 0x5F9D, 0x5FA2,
- 0x5FA7, 0x5FAB, 0x5FA4, 0x5FAC, 0x5FAF, 0x5FB0, 0x5FB1, 0x5FB8,
- 0x5FC4, 0x5FC7, 0x5FC8, 0x5FC9, 0x5FCB, 0x5FD0, 0x5FD1, 0x5FD2,
- 0x5FD3, 0x5FD4, 0x5FDE, 0x5FE1, 0x5FE2, 0x5FE8, 0x5FE9, 0x5FEA,
- 0x5FEC, 0x5FED, 0x5FEE, 0x5FEF, 0x5FF2, 0x5FF3, 0x5FF6, 0x5FFA,
- 0x5FFC, 0x6007, 0x600A, 0x600D, 0x6013, 0x6014, 0x6017, 0x6018,
- 0x601A, 0x601F, 0x6024, 0x602D, 0x6033, 0x6035, 0x6040, 0x6047,
- 0x6048, 0x6049, 0x604C, 0x6051, 0x6054, 0x6056, 0x6057, 0x605D,
- 0x6061, 0x6067, 0x6071, 0x607E, 0x607F, 0x6082, 0x6086, 0x6088,
- 0x608A, 0x608E, 0x6091, 0x6093, 0x6095, 0x6098, 0x609D, 0x609E,
- 0x60A2, 0x60A4, 0x60A5, 0x60A8, 0x60B0, 0x60B1, 0x60B7,
-};
-static const unsigned short euc_to_utf8_8FBE[] = {
-         0x60BB, 0x60BE, 0x60C2, 0x60C4, 0x60C8, 0x60C9, 0x60CA,
- 0x60CB, 0x60CE, 0x60CF, 0x60D4, 0x60D5, 0x60D9, 0x60DB, 0x60DD,
- 0x60DE, 0x60E2, 0x60E5, 0x60F2, 0x60F5, 0x60F8, 0x60FC, 0x60FD,
- 0x6102, 0x6107, 0x610A, 0x610C, 0x6110, 0x6111, 0x6112, 0x6113,
- 0x6114, 0x6116, 0x6117, 0x6119, 0x611C, 0x611E, 0x6122, 0x612A,
- 0x612B, 0x6130, 0x6131, 0x6135, 0x6136, 0x6137, 0x6139, 0x6141,
- 0x6145, 0x6146, 0x6149, 0x615E, 0x6160, 0x616C, 0x6172, 0x6178,
- 0x617B, 0x617C, 0x617F, 0x6180, 0x6181, 0x6183, 0x6184, 0x618B,
- 0x618D, 0x6192, 0x6193, 0x6197, 0x6198, 0x619C, 0x619D, 0x619F,
- 0x61A0, 0x61A5, 0x61A8, 0x61AA, 0x61AD, 0x61B8, 0x61B9, 0x61BC,
- 0x61C0, 0x61C1, 0x61C2, 0x61CE, 0x61CF, 0x61D5, 0x61DC, 0x61DD,
- 0x61DE, 0x61DF, 0x61E1, 0x61E2, 0x61E7, 0x61E9, 0x61E5,
-};
-static const unsigned short euc_to_utf8_8FBF[] = {
-         0x61EC, 0x61ED, 0x61EF, 0x6201, 0x6203, 0x6204, 0x6207,
- 0x6213, 0x6215, 0x621C, 0x6220, 0x6222, 0x6223, 0x6227, 0x6229,
- 0x622B, 0x6239, 0x623D, 0x6242, 0x6243, 0x6244, 0x6246, 0x624C,
- 0x6250, 0x6251, 0x6252, 0x6254, 0x6256, 0x625A, 0x625C, 0x6264,
- 0x626D, 0x626F, 0x6273, 0x627A, 0x627D, 0x628D, 0x628E, 0x628F,
- 0x6290, 0x62A6, 0x62A8, 0x62B3, 0x62B6, 0x62B7, 0x62BA, 0x62BE,
- 0x62BF, 0x62C4, 0x62CE, 0x62D5, 0x62D6, 0x62DA, 0x62EA, 0x62F2,
- 0x62F4, 0x62FC, 0x62FD, 0x6303, 0x6304, 0x630A, 0x630B, 0x630D,
- 0x6310, 0x6313, 0x6316, 0x6318, 0x6329, 0x632A, 0x632D, 0x6335,
- 0x6336, 0x6339, 0x633C, 0x6341, 0x6342, 0x6343, 0x6344, 0x6346,
- 0x634A, 0x634B, 0x634E, 0x6352, 0x6353, 0x6354, 0x6358, 0x635B,
- 0x6365, 0x6366, 0x636C, 0x636D, 0x6371, 0x6374, 0x6375,
-};
-static const unsigned short euc_to_utf8_8FC0[] = {
-         0x6378, 0x637C, 0x637D, 0x637F, 0x6382, 0x6384, 0x6387,
- 0x638A, 0x6390, 0x6394, 0x6395, 0x6399, 0x639A, 0x639E, 0x63A4,
- 0x63A6, 0x63AD, 0x63AE, 0x63AF, 0x63BD, 0x63C1, 0x63C5, 0x63C8,
- 0x63CE, 0x63D1, 0x63D3, 0x63D4, 0x63D5, 0x63DC, 0x63E0, 0x63E5,
- 0x63EA, 0x63EC, 0x63F2, 0x63F3, 0x63F5, 0x63F8, 0x63F9, 0x6409,
- 0x640A, 0x6410, 0x6412, 0x6414, 0x6418, 0x641E, 0x6420, 0x6422,
- 0x6424, 0x6425, 0x6429, 0x642A, 0x642F, 0x6430, 0x6435, 0x643D,
- 0x643F, 0x644B, 0x644F, 0x6451, 0x6452, 0x6453, 0x6454, 0x645A,
- 0x645B, 0x645C, 0x645D, 0x645F, 0x6460, 0x6461, 0x6463, 0x646D,
- 0x6473, 0x6474, 0x647B, 0x647D, 0x6485, 0x6487, 0x648F, 0x6490,
- 0x6491, 0x6498, 0x6499, 0x649B, 0x649D, 0x649F, 0x64A1, 0x64A3,
- 0x64A6, 0x64A8, 0x64AC, 0x64B3, 0x64BD, 0x64BE, 0x64BF,
-};
-static const unsigned short euc_to_utf8_8FC1[] = {
-         0x64C4, 0x64C9, 0x64CA, 0x64CB, 0x64CC, 0x64CE, 0x64D0,
- 0x64D1, 0x64D5, 0x64D7, 0x64E4, 0x64E5, 0x64E9, 0x64EA, 0x64ED,
- 0x64F0, 0x64F5, 0x64F7, 0x64FB, 0x64FF, 0x6501, 0x6504, 0x6508,
- 0x6509, 0x650A, 0x650F, 0x6513, 0x6514, 0x6516, 0x6519, 0x651B,
- 0x651E, 0x651F, 0x6522, 0x6526, 0x6529, 0x652E, 0x6531, 0x653A,
- 0x653C, 0x653D, 0x6543, 0x6547, 0x6549, 0x6550, 0x6552, 0x6554,
- 0x655F, 0x6560, 0x6567, 0x656B, 0x657A, 0x657D, 0x6581, 0x6585,
- 0x658A, 0x6592, 0x6595, 0x6598, 0x659D, 0x65A0, 0x65A3, 0x65A6,
- 0x65AE, 0x65B2, 0x65B3, 0x65B4, 0x65BF, 0x65C2, 0x65C8, 0x65C9,
- 0x65CE, 0x65D0, 0x65D4, 0x65D6, 0x65D8, 0x65DF, 0x65F0, 0x65F2,
- 0x65F4, 0x65F5, 0x65F9, 0x65FE, 0x65FF, 0x6600, 0x6604, 0x6608,
- 0x6609, 0x660D, 0x6611, 0x6612, 0x6615, 0x6616, 0x661D,
-};
-static const unsigned short euc_to_utf8_8FC2[] = {
-         0x661E, 0x6621, 0x6622, 0x6623, 0x6624, 0x6626, 0x6629,
- 0x662A, 0x662B, 0x662C, 0x662E, 0x6630, 0x6631, 0x6633, 0x6639,
- 0x6637, 0x6640, 0x6645, 0x6646, 0x664A, 0x664C, 0x6651, 0x664E,
- 0x6657, 0x6658, 0x6659, 0x665B, 0x665C, 0x6660, 0x6661, 0x66FB,
- 0x666A, 0x666B, 0x666C, 0x667E, 0x6673, 0x6675, 0x667F, 0x6677,
- 0x6678, 0x6679, 0x667B, 0x6680, 0x667C, 0x668B, 0x668C, 0x668D,
- 0x6690, 0x6692, 0x6699, 0x669A, 0x669B, 0x669C, 0x669F, 0x66A0,
- 0x66A4, 0x66AD, 0x66B1, 0x66B2, 0x66B5, 0x66BB, 0x66BF, 0x66C0,
- 0x66C2, 0x66C3, 0x66C8, 0x66CC, 0x66CE, 0x66CF, 0x66D4, 0x66DB,
- 0x66DF, 0x66E8, 0x66EB, 0x66EC, 0x66EE, 0x66FA, 0x6705, 0x6707,
- 0x670E, 0x6713, 0x6719, 0x671C, 0x6720, 0x6722, 0x6733, 0x673E,
- 0x6745, 0x6747, 0x6748, 0x674C, 0x6754, 0x6755, 0x675D,
-};
-static const unsigned short euc_to_utf8_8FC3[] = {
-         0x6766, 0x676C, 0x676E, 0x6774, 0x6776, 0x677B, 0x6781,
- 0x6784, 0x678E, 0x678F, 0x6791, 0x6793, 0x6796, 0x6798, 0x6799,
- 0x679B, 0x67B0, 0x67B1, 0x67B2, 0x67B5, 0x67BB, 0x67BC, 0x67BD,
- 0x67F9, 0x67C0, 0x67C2, 0x67C3, 0x67C5, 0x67C8, 0x67C9, 0x67D2,
- 0x67D7, 0x67D9, 0x67DC, 0x67E1, 0x67E6, 0x67F0, 0x67F2, 0x67F6,
- 0x67F7, 0x6852, 0x6814, 0x6819, 0x681D, 0x681F, 0x6828, 0x6827,
- 0x682C, 0x682D, 0x682F, 0x6830, 0x6831, 0x6833, 0x683B, 0x683F,
- 0x6844, 0x6845, 0x684A, 0x684C, 0x6855, 0x6857, 0x6858, 0x685B,
- 0x686B, 0x686E, 0x686F, 0x6870, 0x6871, 0x6872, 0x6875, 0x6879,
- 0x687A, 0x687B, 0x687C, 0x6882, 0x6884, 0x6886, 0x6888, 0x6896,
- 0x6898, 0x689A, 0x689C, 0x68A1, 0x68A3, 0x68A5, 0x68A9, 0x68AA,
- 0x68AE, 0x68B2, 0x68BB, 0x68C5, 0x68C8, 0x68CC, 0x68CF,
-};
-static const unsigned short euc_to_utf8_8FC4[] = {
-         0x68D0, 0x68D1, 0x68D3, 0x68D6, 0x68D9, 0x68DC, 0x68DD,
- 0x68E5, 0x68E8, 0x68EA, 0x68EB, 0x68EC, 0x68ED, 0x68F0, 0x68F1,
- 0x68F5, 0x68F6, 0x68FB, 0x68FC, 0x68FD, 0x6906, 0x6909, 0x690A,
- 0x6910, 0x6911, 0x6913, 0x6916, 0x6917, 0x6931, 0x6933, 0x6935,
- 0x6938, 0x693B, 0x6942, 0x6945, 0x6949, 0x694E, 0x6957, 0x695B,
- 0x6963, 0x6964, 0x6965, 0x6966, 0x6968, 0x6969, 0x696C, 0x6970,
- 0x6971, 0x6972, 0x697A, 0x697B, 0x697F, 0x6980, 0x698D, 0x6992,
- 0x6996, 0x6998, 0x69A1, 0x69A5, 0x69A6, 0x69A8, 0x69AB, 0x69AD,
- 0x69AF, 0x69B7, 0x69B8, 0x69BA, 0x69BC, 0x69C5, 0x69C8, 0x69D1,
- 0x69D6, 0x69D7, 0x69E2, 0x69E5, 0x69EE, 0x69EF, 0x69F1, 0x69F3,
- 0x69F5, 0x69FE, 0x6A00, 0x6A01, 0x6A03, 0x6A0F, 0x6A11, 0x6A15,
- 0x6A1A, 0x6A1D, 0x6A20, 0x6A24, 0x6A28, 0x6A30, 0x6A32,
-};
-static const unsigned short euc_to_utf8_8FC5[] = {
-         0x6A34, 0x6A37, 0x6A3B, 0x6A3E, 0x6A3F, 0x6A45, 0x6A46,
- 0x6A49, 0x6A4A, 0x6A4E, 0x6A50, 0x6A51, 0x6A52, 0x6A55, 0x6A56,
- 0x6A5B, 0x6A64, 0x6A67, 0x6A6A, 0x6A71, 0x6A73, 0x6A7E, 0x6A81,
- 0x6A83, 0x6A86, 0x6A87, 0x6A89, 0x6A8B, 0x6A91, 0x6A9B, 0x6A9D,
- 0x6A9E, 0x6A9F, 0x6AA5, 0x6AAB, 0x6AAF, 0x6AB0, 0x6AB1, 0x6AB4,
- 0x6ABD, 0x6ABE, 0x6ABF, 0x6AC6, 0x6AC9, 0x6AC8, 0x6ACC, 0x6AD0,
- 0x6AD4, 0x6AD5, 0x6AD6, 0x6ADC, 0x6ADD, 0x6AE4, 0x6AE7, 0x6AEC,
- 0x6AF0, 0x6AF1, 0x6AF2, 0x6AFC, 0x6AFD, 0x6B02, 0x6B03, 0x6B06,
- 0x6B07, 0x6B09, 0x6B0F, 0x6B10, 0x6B11, 0x6B17, 0x6B1B, 0x6B1E,
- 0x6B24, 0x6B28, 0x6B2B, 0x6B2C, 0x6B2F, 0x6B35, 0x6B36, 0x6B3B,
- 0x6B3F, 0x6B46, 0x6B4A, 0x6B4D, 0x6B52, 0x6B56, 0x6B58, 0x6B5D,
- 0x6B60, 0x6B67, 0x6B6B, 0x6B6E, 0x6B70, 0x6B75, 0x6B7D,
-};
-static const unsigned short euc_to_utf8_8FC6[] = {
-         0x6B7E, 0x6B82, 0x6B85, 0x6B97, 0x6B9B, 0x6B9F, 0x6BA0,
- 0x6BA2, 0x6BA3, 0x6BA8, 0x6BA9, 0x6BAC, 0x6BAD, 0x6BAE, 0x6BB0,
- 0x6BB8, 0x6BB9, 0x6BBD, 0x6BBE, 0x6BC3, 0x6BC4, 0x6BC9, 0x6BCC,
- 0x6BD6, 0x6BDA, 0x6BE1, 0x6BE3, 0x6BE6, 0x6BE7, 0x6BEE, 0x6BF1,
- 0x6BF7, 0x6BF9, 0x6BFF, 0x6C02, 0x6C04, 0x6C05, 0x6C09, 0x6C0D,
- 0x6C0E, 0x6C10, 0x6C12, 0x6C19, 0x6C1F, 0x6C26, 0x6C27, 0x6C28,
- 0x6C2C, 0x6C2E, 0x6C33, 0x6C35, 0x6C36, 0x6C3A, 0x6C3B, 0x6C3F,
- 0x6C4A, 0x6C4B, 0x6C4D, 0x6C4F, 0x6C52, 0x6C54, 0x6C59, 0x6C5B,
- 0x6C5C, 0x6C6B, 0x6C6D, 0x6C6F, 0x6C74, 0x6C76, 0x6C78, 0x6C79,
- 0x6C7B, 0x6C85, 0x6C86, 0x6C87, 0x6C89, 0x6C94, 0x6C95, 0x6C97,
- 0x6C98, 0x6C9C, 0x6C9F, 0x6CB0, 0x6CB2, 0x6CB4, 0x6CC2, 0x6CC6,
- 0x6CCD, 0x6CCF, 0x6CD0, 0x6CD1, 0x6CD2, 0x6CD4, 0x6CD6,
-};
-static const unsigned short euc_to_utf8_8FC7[] = {
-         0x6CDA, 0x6CDC, 0x6CE0, 0x6CE7, 0x6CE9, 0x6CEB, 0x6CEC,
- 0x6CEE, 0x6CF2, 0x6CF4, 0x6D04, 0x6D07, 0x6D0A, 0x6D0E, 0x6D0F,
- 0x6D11, 0x6D13, 0x6D1A, 0x6D26, 0x6D27, 0x6D28, 0x6C67, 0x6D2E,
- 0x6D2F, 0x6D31, 0x6D39, 0x6D3C, 0x6D3F, 0x6D57, 0x6D5E, 0x6D5F,
- 0x6D61, 0x6D65, 0x6D67, 0x6D6F, 0x6D70, 0x6D7C, 0x6D82, 0x6D87,
- 0x6D91, 0x6D92, 0x6D94, 0x6D96, 0x6D97, 0x6D98, 0x6DAA, 0x6DAC,
- 0x6DB4, 0x6DB7, 0x6DB9, 0x6DBD, 0x6DBF, 0x6DC4, 0x6DC8, 0x6DCA,
- 0x6DCE, 0x6DCF, 0x6DD6, 0x6DDB, 0x6DDD, 0x6DDF, 0x6DE0, 0x6DE2,
- 0x6DE5, 0x6DE9, 0x6DEF, 0x6DF0, 0x6DF4, 0x6DF6, 0x6DFC, 0x6E00,
- 0x6E04, 0x6E1E, 0x6E22, 0x6E27, 0x6E32, 0x6E36, 0x6E39, 0x6E3B,
- 0x6E3C, 0x6E44, 0x6E45, 0x6E48, 0x6E49, 0x6E4B, 0x6E4F, 0x6E51,
- 0x6E52, 0x6E53, 0x6E54, 0x6E57, 0x6E5C, 0x6E5D, 0x6E5E,
-};
-static const unsigned short euc_to_utf8_8FC8[] = {
-         0x6E62, 0x6E63, 0x6E68, 0x6E73, 0x6E7B, 0x6E7D, 0x6E8D,
- 0x6E93, 0x6E99, 0x6EA0, 0x6EA7, 0x6EAD, 0x6EAE, 0x6EB1, 0x6EB3,
- 0x6EBB, 0x6EBF, 0x6EC0, 0x6EC1, 0x6EC3, 0x6EC7, 0x6EC8, 0x6ECA,
- 0x6ECD, 0x6ECE, 0x6ECF, 0x6EEB, 0x6EED, 0x6EEE, 0x6EF9, 0x6EFB,
- 0x6EFD, 0x6F04, 0x6F08, 0x6F0A, 0x6F0C, 0x6F0D, 0x6F16, 0x6F18,
- 0x6F1A, 0x6F1B, 0x6F26, 0x6F29, 0x6F2A, 0x6F2F, 0x6F30, 0x6F33,
- 0x6F36, 0x6F3B, 0x6F3C, 0x6F2D, 0x6F4F, 0x6F51, 0x6F52, 0x6F53,
- 0x6F57, 0x6F59, 0x6F5A, 0x6F5D, 0x6F5E, 0x6F61, 0x6F62, 0x6F68,
- 0x6F6C, 0x6F7D, 0x6F7E, 0x6F83, 0x6F87, 0x6F88, 0x6F8B, 0x6F8C,
- 0x6F8D, 0x6F90, 0x6F92, 0x6F93, 0x6F94, 0x6F96, 0x6F9A, 0x6F9F,
- 0x6FA0, 0x6FA5, 0x6FA6, 0x6FA7, 0x6FA8, 0x6FAE, 0x6FAF, 0x6FB0,
- 0x6FB5, 0x6FB6, 0x6FBC, 0x6FC5, 0x6FC7, 0x6FC8, 0x6FCA,
-};
-static const unsigned short euc_to_utf8_8FC9[] = {
-         0x6FDA, 0x6FDE, 0x6FE8, 0x6FE9, 0x6FF0, 0x6FF5, 0x6FF9,
- 0x6FFC, 0x6FFD, 0x7000, 0x7005, 0x7006, 0x7007, 0x700D, 0x7017,
- 0x7020, 0x7023, 0x702F, 0x7034, 0x7037, 0x7039, 0x703C, 0x7043,
- 0x7044, 0x7048, 0x7049, 0x704A, 0x704B, 0x7054, 0x7055, 0x705D,
- 0x705E, 0x704E, 0x7064, 0x7065, 0x706C, 0x706E, 0x7075, 0x7076,
- 0x707E, 0x7081, 0x7085, 0x7086, 0x7094, 0x7095, 0x7096, 0x7097,
- 0x7098, 0x709B, 0x70A4, 0x70AB, 0x70B0, 0x70B1, 0x70B4, 0x70B7,
- 0x70CA, 0x70D1, 0x70D3, 0x70D4, 0x70D5, 0x70D6, 0x70D8, 0x70DC,
- 0x70E4, 0x70FA, 0x7103, 0x7104, 0x7105, 0x7106, 0x7107, 0x710B,
- 0x710C, 0x710F, 0x711E, 0x7120, 0x712B, 0x712D, 0x712F, 0x7130,
- 0x7131, 0x7138, 0x7141, 0x7145, 0x7146, 0x7147, 0x714A, 0x714B,
- 0x7150, 0x7152, 0x7157, 0x715A, 0x715C, 0x715E, 0x7160,
-};
-static const unsigned short euc_to_utf8_8FCA[] = {
-         0x7168, 0x7179, 0x7180, 0x7185, 0x7187, 0x718C, 0x7192,
- 0x719A, 0x719B, 0x71A0, 0x71A2, 0x71AF, 0x71B0, 0x71B2, 0x71B3,
- 0x71BA, 0x71BF, 0x71C0, 0x71C1, 0x71C4, 0x71CB, 0x71CC, 0x71D3,
- 0x71D6, 0x71D9, 0x71DA, 0x71DC, 0x71F8, 0x71FE, 0x7200, 0x7207,
- 0x7208, 0x7209, 0x7213, 0x7217, 0x721A, 0x721D, 0x721F, 0x7224,
- 0x722B, 0x722F, 0x7234, 0x7238, 0x7239, 0x7241, 0x7242, 0x7243,
- 0x7245, 0x724E, 0x724F, 0x7250, 0x7253, 0x7255, 0x7256, 0x725A,
- 0x725C, 0x725E, 0x7260, 0x7263, 0x7268, 0x726B, 0x726E, 0x726F,
- 0x7271, 0x7277, 0x7278, 0x727B, 0x727C, 0x727F, 0x7284, 0x7289,
- 0x728D, 0x728E, 0x7293, 0x729B, 0x72A8, 0x72AD, 0x72AE, 0x72B1,
- 0x72B4, 0x72BE, 0x72C1, 0x72C7, 0x72C9, 0x72CC, 0x72D5, 0x72D6,
- 0x72D8, 0x72DF, 0x72E5, 0x72F3, 0x72F4, 0x72FA, 0x72FB,
-};
-static const unsigned short euc_to_utf8_8FCB[] = {
-         0x72FE, 0x7302, 0x7304, 0x7305, 0x7307, 0x730B, 0x730D,
- 0x7312, 0x7313, 0x7318, 0x7319, 0x731E, 0x7322, 0x7324, 0x7327,
- 0x7328, 0x732C, 0x7331, 0x7332, 0x7335, 0x733A, 0x733B, 0x733D,
- 0x7343, 0x734D, 0x7350, 0x7352, 0x7356, 0x7358, 0x735D, 0x735E,
- 0x735F, 0x7360, 0x7366, 0x7367, 0x7369, 0x736B, 0x736C, 0x736E,
- 0x736F, 0x7371, 0x7377, 0x7379, 0x737C, 0x7380, 0x7381, 0x7383,
- 0x7385, 0x7386, 0x738E, 0x7390, 0x7393, 0x7395, 0x7397, 0x7398,
- 0x739C, 0x739E, 0x739F, 0x73A0, 0x73A2, 0x73A5, 0x73A6, 0x73AA,
- 0x73AB, 0x73AD, 0x73B5, 0x73B7, 0x73B9, 0x73BC, 0x73BD, 0x73BF,
- 0x73C5, 0x73C6, 0x73C9, 0x73CB, 0x73CC, 0x73CF, 0x73D2, 0x73D3,
- 0x73D6, 0x73D9, 0x73DD, 0x73E1, 0x73E3, 0x73E6, 0x73E7, 0x73E9,
- 0x73F4, 0x73F5, 0x73F7, 0x73F9, 0x73FA, 0x73FB, 0x73FD,
-};
-static const unsigned short euc_to_utf8_8FCC[] = {
-         0x73FF, 0x7400, 0x7401, 0x7404, 0x7407, 0x740A, 0x7411,
- 0x741A, 0x741B, 0x7424, 0x7426, 0x7428, 0x7429, 0x742A, 0x742B,
- 0x742C, 0x742D, 0x742E, 0x742F, 0x7430, 0x7431, 0x7439, 0x7440,
- 0x7443, 0x7444, 0x7446, 0x7447, 0x744B, 0x744D, 0x7451, 0x7452,
- 0x7457, 0x745D, 0x7462, 0x7466, 0x7467, 0x7468, 0x746B, 0x746D,
- 0x746E, 0x7471, 0x7472, 0x7480, 0x7481, 0x7485, 0x7486, 0x7487,
- 0x7489, 0x748F, 0x7490, 0x7491, 0x7492, 0x7498, 0x7499, 0x749A,
- 0x749C, 0x749F, 0x74A0, 0x74A1, 0x74A3, 0x74A6, 0x74A8, 0x74A9,
- 0x74AA, 0x74AB, 0x74AE, 0x74AF, 0x74B1, 0x74B2, 0x74B5, 0x74B9,
- 0x74BB, 0x74BF, 0x74C8, 0x74C9, 0x74CC, 0x74D0, 0x74D3, 0x74D8,
- 0x74DA, 0x74DB, 0x74DE, 0x74DF, 0x74E4, 0x74E8, 0x74EA, 0x74EB,
- 0x74EF, 0x74F4, 0x74FA, 0x74FB, 0x74FC, 0x74FF, 0x7506,
-};
-static const unsigned short euc_to_utf8_8FCD[] = {
-         0x7512, 0x7516, 0x7517, 0x7520, 0x7521, 0x7524, 0x7527,
- 0x7529, 0x752A, 0x752F, 0x7536, 0x7539, 0x753D, 0x753E, 0x753F,
- 0x7540, 0x7543, 0x7547, 0x7548, 0x754E, 0x7550, 0x7552, 0x7557,
- 0x755E, 0x755F, 0x7561, 0x756F, 0x7571, 0x7579, 0x757A, 0x757B,
- 0x757C, 0x757D, 0x757E, 0x7581, 0x7585, 0x7590, 0x7592, 0x7593,
- 0x7595, 0x7599, 0x759C, 0x75A2, 0x75A4, 0x75B4, 0x75BA, 0x75BF,
- 0x75C0, 0x75C1, 0x75C4, 0x75C6, 0x75CC, 0x75CE, 0x75CF, 0x75D7,
- 0x75DC, 0x75DF, 0x75E0, 0x75E1, 0x75E4, 0x75E7, 0x75EC, 0x75EE,
- 0x75EF, 0x75F1, 0x75F9, 0x7600, 0x7602, 0x7603, 0x7604, 0x7607,
- 0x7608, 0x760A, 0x760C, 0x760F, 0x7612, 0x7613, 0x7615, 0x7616,
- 0x7619, 0x761B, 0x761C, 0x761D, 0x761E, 0x7623, 0x7625, 0x7626,
- 0x7629, 0x762D, 0x7632, 0x7633, 0x7635, 0x7638, 0x7639,
-};
-static const unsigned short euc_to_utf8_8FCE[] = {
-         0x763A, 0x763C, 0x764A, 0x7640, 0x7641, 0x7643, 0x7644,
- 0x7645, 0x7649, 0x764B, 0x7655, 0x7659, 0x765F, 0x7664, 0x7665,
- 0x766D, 0x766E, 0x766F, 0x7671, 0x7674, 0x7681, 0x7685, 0x768C,
- 0x768D, 0x7695, 0x769B, 0x769C, 0x769D, 0x769F, 0x76A0, 0x76A2,
- 0x76A3, 0x76A4, 0x76A5, 0x76A6, 0x76A7, 0x76A8, 0x76AA, 0x76AD,
- 0x76BD, 0x76C1, 0x76C5, 0x76C9, 0x76CB, 0x76CC, 0x76CE, 0x76D4,
- 0x76D9, 0x76E0, 0x76E6, 0x76E8, 0x76EC, 0x76F0, 0x76F1, 0x76F6,
- 0x76F9, 0x76FC, 0x7700, 0x7706, 0x770A, 0x770E, 0x7712, 0x7714,
- 0x7715, 0x7717, 0x7719, 0x771A, 0x771C, 0x7722, 0x7728, 0x772D,
- 0x772E, 0x772F, 0x7734, 0x7735, 0x7736, 0x7739, 0x773D, 0x773E,
- 0x7742, 0x7745, 0x7746, 0x774A, 0x774D, 0x774E, 0x774F, 0x7752,
- 0x7756, 0x7757, 0x775C, 0x775E, 0x775F, 0x7760, 0x7762,
-};
-static const unsigned short euc_to_utf8_8FCF[] = {
-         0x7764, 0x7767, 0x776A, 0x776C, 0x7770, 0x7772, 0x7773,
- 0x7774, 0x777A, 0x777D, 0x7780, 0x7784, 0x778C, 0x778D, 0x7794,
- 0x7795, 0x7796, 0x779A, 0x779F, 0x77A2, 0x77A7, 0x77AA, 0x77AE,
- 0x77AF, 0x77B1, 0x77B5, 0x77BE, 0x77C3, 0x77C9, 0x77D1, 0x77D2,
- 0x77D5, 0x77D9, 0x77DE, 0x77DF, 0x77E0, 0x77E4, 0x77E6, 0x77EA,
- 0x77EC, 0x77F0, 0x77F1, 0x77F4, 0x77F8, 0x77FB, 0x7805, 0x7806,
- 0x7809, 0x780D, 0x780E, 0x7811, 0x781D, 0x7821, 0x7822, 0x7823,
- 0x782D, 0x782E, 0x7830, 0x7835, 0x7837, 0x7843, 0x7844, 0x7847,
- 0x7848, 0x784C, 0x784E, 0x7852, 0x785C, 0x785E, 0x7860, 0x7861,
- 0x7863, 0x7864, 0x7868, 0x786A, 0x786E, 0x787A, 0x787E, 0x788A,
- 0x788F, 0x7894, 0x7898, 0x78A1, 0x789D, 0x789E, 0x789F, 0x78A4,
- 0x78A8, 0x78AC, 0x78AD, 0x78B0, 0x78B1, 0x78B2, 0x78B3,
-};
-static const unsigned short euc_to_utf8_8FD0[] = {
-         0x78BB, 0x78BD, 0x78BF, 0x78C7, 0x78C8, 0x78C9, 0x78CC,
- 0x78CE, 0x78D2, 0x78D3, 0x78D5, 0x78D6, 0x78E4, 0x78DB, 0x78DF,
- 0x78E0, 0x78E1, 0x78E6, 0x78EA, 0x78F2, 0x78F3, 0x7900, 0x78F6,
- 0x78F7, 0x78FA, 0x78FB, 0x78FF, 0x7906, 0x790C, 0x7910, 0x791A,
- 0x791C, 0x791E, 0x791F, 0x7920, 0x7925, 0x7927, 0x7929, 0x792D,
- 0x7931, 0x7934, 0x7935, 0x793B, 0x793D, 0x793F, 0x7944, 0x7945,
- 0x7946, 0x794A, 0x794B, 0x794F, 0x7951, 0x7954, 0x7958, 0x795B,
- 0x795C, 0x7967, 0x7969, 0x796B, 0x7972, 0x7979, 0x797B, 0x797C,
- 0x797E, 0x798B, 0x798C, 0x7991, 0x7993, 0x7994, 0x7995, 0x7996,
- 0x7998, 0x799B, 0x799C, 0x79A1, 0x79A8, 0x79A9, 0x79AB, 0x79AF,
- 0x79B1, 0x79B4, 0x79B8, 0x79BB, 0x79C2, 0x79C4, 0x79C7, 0x79C8,
- 0x79CA, 0x79CF, 0x79D4, 0x79D6, 0x79DA, 0x79DD, 0x79DE,
-};
-static const unsigned short euc_to_utf8_8FD1[] = {
-         0x79E0, 0x79E2, 0x79E5, 0x79EA, 0x79EB, 0x79ED, 0x79F1,
- 0x79F8, 0x79FC, 0x7A02, 0x7A03, 0x7A07, 0x7A09, 0x7A0A, 0x7A0C,
- 0x7A11, 0x7A15, 0x7A1B, 0x7A1E, 0x7A21, 0x7A27, 0x7A2B, 0x7A2D,
- 0x7A2F, 0x7A30, 0x7A34, 0x7A35, 0x7A38, 0x7A39, 0x7A3A, 0x7A44,
- 0x7A45, 0x7A47, 0x7A48, 0x7A4C, 0x7A55, 0x7A56, 0x7A59, 0x7A5C,
- 0x7A5D, 0x7A5F, 0x7A60, 0x7A65, 0x7A67, 0x7A6A, 0x7A6D, 0x7A75,
- 0x7A78, 0x7A7E, 0x7A80, 0x7A82, 0x7A85, 0x7A86, 0x7A8A, 0x7A8B,
- 0x7A90, 0x7A91, 0x7A94, 0x7A9E, 0x7AA0, 0x7AA3, 0x7AAC, 0x7AB3,
- 0x7AB5, 0x7AB9, 0x7ABB, 0x7ABC, 0x7AC6, 0x7AC9, 0x7ACC, 0x7ACE,
- 0x7AD1, 0x7ADB, 0x7AE8, 0x7AE9, 0x7AEB, 0x7AEC, 0x7AF1, 0x7AF4,
- 0x7AFB, 0x7AFD, 0x7AFE, 0x7B07, 0x7B14, 0x7B1F, 0x7B23, 0x7B27,
- 0x7B29, 0x7B2A, 0x7B2B, 0x7B2D, 0x7B2E, 0x7B2F, 0x7B30,
-};
-static const unsigned short euc_to_utf8_8FD2[] = {
-         0x7B31, 0x7B34, 0x7B3D, 0x7B3F, 0x7B40, 0x7B41, 0x7B47,
- 0x7B4E, 0x7B55, 0x7B60, 0x7B64, 0x7B66, 0x7B69, 0x7B6A, 0x7B6D,
- 0x7B6F, 0x7B72, 0x7B73, 0x7B77, 0x7B84, 0x7B89, 0x7B8E, 0x7B90,
- 0x7B91, 0x7B96, 0x7B9B, 0x7B9E, 0x7BA0, 0x7BA5, 0x7BAC, 0x7BAF,
- 0x7BB0, 0x7BB2, 0x7BB5, 0x7BB6, 0x7BBA, 0x7BBB, 0x7BBC, 0x7BBD,
- 0x7BC2, 0x7BC5, 0x7BC8, 0x7BCA, 0x7BD4, 0x7BD6, 0x7BD7, 0x7BD9,
- 0x7BDA, 0x7BDB, 0x7BE8, 0x7BEA, 0x7BF2, 0x7BF4, 0x7BF5, 0x7BF8,
- 0x7BF9, 0x7BFA, 0x7BFC, 0x7BFE, 0x7C01, 0x7C02, 0x7C03, 0x7C04,
- 0x7C06, 0x7C09, 0x7C0B, 0x7C0C, 0x7C0E, 0x7C0F, 0x7C19, 0x7C1B,
- 0x7C20, 0x7C25, 0x7C26, 0x7C28, 0x7C2C, 0x7C31, 0x7C33, 0x7C34,
- 0x7C36, 0x7C39, 0x7C3A, 0x7C46, 0x7C4A, 0x7C55, 0x7C51, 0x7C52,
- 0x7C53, 0x7C59, 0x7C5A, 0x7C5B, 0x7C5C, 0x7C5D, 0x7C5E,
-};
-static const unsigned short euc_to_utf8_8FD3[] = {
-         0x7C61, 0x7C63, 0x7C67, 0x7C69, 0x7C6D, 0x7C6E, 0x7C70,
- 0x7C72, 0x7C79, 0x7C7C, 0x7C7D, 0x7C86, 0x7C87, 0x7C8F, 0x7C94,
- 0x7C9E, 0x7CA0, 0x7CA6, 0x7CB0, 0x7CB6, 0x7CB7, 0x7CBA, 0x7CBB,
- 0x7CBC, 0x7CBF, 0x7CC4, 0x7CC7, 0x7CC8, 0x7CC9, 0x7CCD, 0x7CCF,
- 0x7CD3, 0x7CD4, 0x7CD5, 0x7CD7, 0x7CD9, 0x7CDA, 0x7CDD, 0x7CE6,
- 0x7CE9, 0x7CEB, 0x7CF5, 0x7D03, 0x7D07, 0x7D08, 0x7D09, 0x7D0F,
- 0x7D11, 0x7D12, 0x7D13, 0x7D16, 0x7D1D, 0x7D1E, 0x7D23, 0x7D26,
- 0x7D2A, 0x7D2D, 0x7D31, 0x7D3C, 0x7D3D, 0x7D3E, 0x7D40, 0x7D41,
- 0x7D47, 0x7D48, 0x7D4D, 0x7D51, 0x7D53, 0x7D57, 0x7D59, 0x7D5A,
- 0x7D5C, 0x7D5D, 0x7D65, 0x7D67, 0x7D6A, 0x7D70, 0x7D78, 0x7D7A,
- 0x7D7B, 0x7D7F, 0x7D81, 0x7D82, 0x7D83, 0x7D85, 0x7D86, 0x7D88,
- 0x7D8B, 0x7D8C, 0x7D8D, 0x7D91, 0x7D96, 0x7D97, 0x7D9D,
-};
-static const unsigned short euc_to_utf8_8FD4[] = {
-         0x7D9E, 0x7DA6, 0x7DA7, 0x7DAA, 0x7DB3, 0x7DB6, 0x7DB7,
- 0x7DB9, 0x7DC2, 0x7DC3, 0x7DC4, 0x7DC5, 0x7DC6, 0x7DCC, 0x7DCD,
- 0x7DCE, 0x7DD7, 0x7DD9, 0x7E00, 0x7DE2, 0x7DE5, 0x7DE6, 0x7DEA,
- 0x7DEB, 0x7DED, 0x7DF1, 0x7DF5, 0x7DF6, 0x7DF9, 0x7DFA, 0x7E08,
- 0x7E10, 0x7E11, 0x7E15, 0x7E17, 0x7E1C, 0x7E1D, 0x7E20, 0x7E27,
- 0x7E28, 0x7E2C, 0x7E2D, 0x7E2F, 0x7E33, 0x7E36, 0x7E3F, 0x7E44,
- 0x7E45, 0x7E47, 0x7E4E, 0x7E50, 0x7E52, 0x7E58, 0x7E5F, 0x7E61,
- 0x7E62, 0x7E65, 0x7E6B, 0x7E6E, 0x7E6F, 0x7E73, 0x7E78, 0x7E7E,
- 0x7E81, 0x7E86, 0x7E87, 0x7E8A, 0x7E8D, 0x7E91, 0x7E95, 0x7E98,
- 0x7E9A, 0x7E9D, 0x7E9E, 0x7F3C, 0x7F3B, 0x7F3D, 0x7F3E, 0x7F3F,
- 0x7F43, 0x7F44, 0x7F47, 0x7F4F, 0x7F52, 0x7F53, 0x7F5B, 0x7F5C,
- 0x7F5D, 0x7F61, 0x7F63, 0x7F64, 0x7F65, 0x7F66, 0x7F6D,
-};
-static const unsigned short euc_to_utf8_8FD5[] = {
-         0x7F71, 0x7F7D, 0x7F7E, 0x7F7F, 0x7F80, 0x7F8B, 0x7F8D,
- 0x7F8F, 0x7F90, 0x7F91, 0x7F96, 0x7F97, 0x7F9C, 0x7FA1, 0x7FA2,
- 0x7FA6, 0x7FAA, 0x7FAD, 0x7FB4, 0x7FBC, 0x7FBF, 0x7FC0, 0x7FC3,
- 0x7FC8, 0x7FCE, 0x7FCF, 0x7FDB, 0x7FDF, 0x7FE3, 0x7FE5, 0x7FE8,
- 0x7FEC, 0x7FEE, 0x7FEF, 0x7FF2, 0x7FFA, 0x7FFD, 0x7FFE, 0x7FFF,
- 0x8007, 0x8008, 0x800A, 0x800D, 0x800E, 0x800F, 0x8011, 0x8013,
- 0x8014, 0x8016, 0x801D, 0x801E, 0x801F, 0x8020, 0x8024, 0x8026,
- 0x802C, 0x802E, 0x8030, 0x8034, 0x8035, 0x8037, 0x8039, 0x803A,
- 0x803C, 0x803E, 0x8040, 0x8044, 0x8060, 0x8064, 0x8066, 0x806D,
- 0x8071, 0x8075, 0x8081, 0x8088, 0x808E, 0x809C, 0x809E, 0x80A6,
- 0x80A7, 0x80AB, 0x80B8, 0x80B9, 0x80C8, 0x80CD, 0x80CF, 0x80D2,
- 0x80D4, 0x80D5, 0x80D7, 0x80D8, 0x80E0, 0x80ED, 0x80EE,
-};
-static const unsigned short euc_to_utf8_8FD6[] = {
-         0x80F0, 0x80F2, 0x80F3, 0x80F6, 0x80F9, 0x80FA, 0x80FE,
- 0x8103, 0x810B, 0x8116, 0x8117, 0x8118, 0x811C, 0x811E, 0x8120,
- 0x8124, 0x8127, 0x812C, 0x8130, 0x8135, 0x813A, 0x813C, 0x8145,
- 0x8147, 0x814A, 0x814C, 0x8152, 0x8157, 0x8160, 0x8161, 0x8167,
- 0x8168, 0x8169, 0x816D, 0x816F, 0x8177, 0x8181, 0x8190, 0x8184,
- 0x8185, 0x8186, 0x818B, 0x818E, 0x8196, 0x8198, 0x819B, 0x819E,
- 0x81A2, 0x81AE, 0x81B2, 0x81B4, 0x81BB, 0x81CB, 0x81C3, 0x81C5,
- 0x81CA, 0x81CE, 0x81CF, 0x81D5, 0x81D7, 0x81DB, 0x81DD, 0x81DE,
- 0x81E1, 0x81E4, 0x81EB, 0x81EC, 0x81F0, 0x81F1, 0x81F2, 0x81F5,
- 0x81F6, 0x81F8, 0x81F9, 0x81FD, 0x81FF, 0x8200, 0x8203, 0x820F,
- 0x8213, 0x8214, 0x8219, 0x821A, 0x821D, 0x8221, 0x8222, 0x8228,
- 0x8232, 0x8234, 0x823A, 0x8243, 0x8244, 0x8245, 0x8246,
-};
-static const unsigned short euc_to_utf8_8FD7[] = {
-         0x824B, 0x824E, 0x824F, 0x8251, 0x8256, 0x825C, 0x8260,
- 0x8263, 0x8267, 0x826D, 0x8274, 0x827B, 0x827D, 0x827F, 0x8280,
- 0x8281, 0x8283, 0x8284, 0x8287, 0x8289, 0x828A, 0x828E, 0x8291,
- 0x8294, 0x8296, 0x8298, 0x829A, 0x829B, 0x82A0, 0x82A1, 0x82A3,
- 0x82A4, 0x82A7, 0x82A8, 0x82A9, 0x82AA, 0x82AE, 0x82B0, 0x82B2,
- 0x82B4, 0x82B7, 0x82BA, 0x82BC, 0x82BE, 0x82BF, 0x82C6, 0x82D0,
- 0x82D5, 0x82DA, 0x82E0, 0x82E2, 0x82E4, 0x82E8, 0x82EA, 0x82ED,
- 0x82EF, 0x82F6, 0x82F7, 0x82FD, 0x82FE, 0x8300, 0x8301, 0x8307,
- 0x8308, 0x830A, 0x830B, 0x8354, 0x831B, 0x831D, 0x831E, 0x831F,
- 0x8321, 0x8322, 0x832C, 0x832D, 0x832E, 0x8330, 0x8333, 0x8337,
- 0x833A, 0x833C, 0x833D, 0x8342, 0x8343, 0x8344, 0x8347, 0x834D,
- 0x834E, 0x8351, 0x8355, 0x8356, 0x8357, 0x8370, 0x8378,
-};
-static const unsigned short euc_to_utf8_8FD8[] = {
-         0x837D, 0x837F, 0x8380, 0x8382, 0x8384, 0x8386, 0x838D,
- 0x8392, 0x8394, 0x8395, 0x8398, 0x8399, 0x839B, 0x839C, 0x839D,
- 0x83A6, 0x83A7, 0x83A9, 0x83AC, 0x83BE, 0x83BF, 0x83C0, 0x83C7,
- 0x83C9, 0x83CF, 0x83D0, 0x83D1, 0x83D4, 0x83DD, 0x8353, 0x83E8,
- 0x83EA, 0x83F6, 0x83F8, 0x83F9, 0x83FC, 0x8401, 0x8406, 0x840A,
- 0x840F, 0x8411, 0x8415, 0x8419, 0x83AD, 0x842F, 0x8439, 0x8445,
- 0x8447, 0x8448, 0x844A, 0x844D, 0x844F, 0x8451, 0x8452, 0x8456,
- 0x8458, 0x8459, 0x845A, 0x845C, 0x8460, 0x8464, 0x8465, 0x8467,
- 0x846A, 0x8470, 0x8473, 0x8474, 0x8476, 0x8478, 0x847C, 0x847D,
- 0x8481, 0x8485, 0x8492, 0x8493, 0x8495, 0x849E, 0x84A6, 0x84A8,
- 0x84A9, 0x84AA, 0x84AF, 0x84B1, 0x84B4, 0x84BA, 0x84BD, 0x84BE,
- 0x84C0, 0x84C2, 0x84C7, 0x84C8, 0x84CC, 0x84CF, 0x84D3,
-};
-static const unsigned short euc_to_utf8_8FD9[] = {
-         0x84DC, 0x84E7, 0x84EA, 0x84EF, 0x84F0, 0x84F1, 0x84F2,
- 0x84F7, 0x8532, 0x84FA, 0x84FB, 0x84FD, 0x8502, 0x8503, 0x8507,
- 0x850C, 0x850E, 0x8510, 0x851C, 0x851E, 0x8522, 0x8523, 0x8524,
- 0x8525, 0x8527, 0x852A, 0x852B, 0x852F, 0x8533, 0x8534, 0x8536,
- 0x853F, 0x8546, 0x854F, 0x8550, 0x8551, 0x8552, 0x8553, 0x8556,
- 0x8559, 0x855C, 0x855D, 0x855E, 0x855F, 0x8560, 0x8561, 0x8562,
- 0x8564, 0x856B, 0x856F, 0x8579, 0x857A, 0x857B, 0x857D, 0x857F,
- 0x8581, 0x8585, 0x8586, 0x8589, 0x858B, 0x858C, 0x858F, 0x8593,
- 0x8598, 0x859D, 0x859F, 0x85A0, 0x85A2, 0x85A5, 0x85A7, 0x85B4,
- 0x85B6, 0x85B7, 0x85B8, 0x85BC, 0x85BD, 0x85BE, 0x85BF, 0x85C2,
- 0x85C7, 0x85CA, 0x85CB, 0x85CE, 0x85AD, 0x85D8, 0x85DA, 0x85DF,
- 0x85E0, 0x85E6, 0x85E8, 0x85ED, 0x85F3, 0x85F6, 0x85FC,
-};
-static const unsigned short euc_to_utf8_8FDA[] = {
-         0x85FF, 0x8600, 0x8604, 0x8605, 0x860D, 0x860E, 0x8610,
- 0x8611, 0x8612, 0x8618, 0x8619, 0x861B, 0x861E, 0x8621, 0x8627,
- 0x8629, 0x8636, 0x8638, 0x863A, 0x863C, 0x863D, 0x8640, 0x8642,
- 0x8646, 0x8652, 0x8653, 0x8656, 0x8657, 0x8658, 0x8659, 0x865D,
- 0x8660, 0x8661, 0x8662, 0x8663, 0x8664, 0x8669, 0x866C, 0x866F,
- 0x8675, 0x8676, 0x8677, 0x867A, 0x868D, 0x8691, 0x8696, 0x8698,
- 0x869A, 0x869C, 0x86A1, 0x86A6, 0x86A7, 0x86A8, 0x86AD, 0x86B1,
- 0x86B3, 0x86B4, 0x86B5, 0x86B7, 0x86B8, 0x86B9, 0x86BF, 0x86C0,
- 0x86C1, 0x86C3, 0x86C5, 0x86D1, 0x86D2, 0x86D5, 0x86D7, 0x86DA,
- 0x86DC, 0x86E0, 0x86E3, 0x86E5, 0x86E7, 0x8688, 0x86FA, 0x86FC,
- 0x86FD, 0x8704, 0x8705, 0x8707, 0x870B, 0x870E, 0x870F, 0x8710,
- 0x8713, 0x8714, 0x8719, 0x871E, 0x871F, 0x8721, 0x8723,
-};
-static const unsigned short euc_to_utf8_8FDB[] = {
-         0x8728, 0x872E, 0x872F, 0x8731, 0x8732, 0x8739, 0x873A,
- 0x873C, 0x873D, 0x873E, 0x8740, 0x8743, 0x8745, 0x874D, 0x8758,
- 0x875D, 0x8761, 0x8764, 0x8765, 0x876F, 0x8771, 0x8772, 0x877B,
- 0x8783, 0x8784, 0x8785, 0x8786, 0x8787, 0x8788, 0x8789, 0x878B,
- 0x878C, 0x8790, 0x8793, 0x8795, 0x8797, 0x8798, 0x8799, 0x879E,
- 0x87A0, 0x87A3, 0x87A7, 0x87AC, 0x87AD, 0x87AE, 0x87B1, 0x87B5,
- 0x87BE, 0x87BF, 0x87C1, 0x87C8, 0x87C9, 0x87CA, 0x87CE, 0x87D5,
- 0x87D6, 0x87D9, 0x87DA, 0x87DC, 0x87DF, 0x87E2, 0x87E3, 0x87E4,
- 0x87EA, 0x87EB, 0x87ED, 0x87F1, 0x87F3, 0x87F8, 0x87FA, 0x87FF,
- 0x8801, 0x8803, 0x8806, 0x8809, 0x880A, 0x880B, 0x8810, 0x8819,
- 0x8812, 0x8813, 0x8814, 0x8818, 0x881A, 0x881B, 0x881C, 0x881E,
- 0x881F, 0x8828, 0x882D, 0x882E, 0x8830, 0x8832, 0x8835,
-};
-static const unsigned short euc_to_utf8_8FDC[] = {
-         0x883A, 0x883C, 0x8841, 0x8843, 0x8845, 0x8848, 0x8849,
- 0x884A, 0x884B, 0x884E, 0x8851, 0x8855, 0x8856, 0x8858, 0x885A,
- 0x885C, 0x885F, 0x8860, 0x8864, 0x8869, 0x8871, 0x8879, 0x887B,
- 0x8880, 0x8898, 0x889A, 0x889B, 0x889C, 0x889F, 0x88A0, 0x88A8,
- 0x88AA, 0x88BA, 0x88BD, 0x88BE, 0x88C0, 0x88CA, 0x88CB, 0x88CC,
- 0x88CD, 0x88CE, 0x88D1, 0x88D2, 0x88D3, 0x88DB, 0x88DE, 0x88E7,
- 0x88EF, 0x88F0, 0x88F1, 0x88F5, 0x88F7, 0x8901, 0x8906, 0x890D,
- 0x890E, 0x890F, 0x8915, 0x8916, 0x8918, 0x8919, 0x891A, 0x891C,
- 0x8920, 0x8926, 0x8927, 0x8928, 0x8930, 0x8931, 0x8932, 0x8935,
- 0x8939, 0x893A, 0x893E, 0x8940, 0x8942, 0x8945, 0x8946, 0x8949,
- 0x894F, 0x8952, 0x8957, 0x895A, 0x895B, 0x895C, 0x8961, 0x8962,
- 0x8963, 0x896B, 0x896E, 0x8970, 0x8973, 0x8975, 0x897A,
-};
-static const unsigned short euc_to_utf8_8FDD[] = {
-         0x897B, 0x897C, 0x897D, 0x8989, 0x898D, 0x8990, 0x8994,
- 0x8995, 0x899B, 0x899C, 0x899F, 0x89A0, 0x89A5, 0x89B0, 0x89B4,
- 0x89B5, 0x89B6, 0x89B7, 0x89BC, 0x89D4, 0x89D5, 0x89D6, 0x89D7,
- 0x89D8, 0x89E5, 0x89E9, 0x89EB, 0x89ED, 0x89F1, 0x89F3, 0x89F6,
- 0x89F9, 0x89FD, 0x89FF, 0x8A04, 0x8A05, 0x8A07, 0x8A0F, 0x8A11,
- 0x8A12, 0x8A14, 0x8A15, 0x8A1E, 0x8A20, 0x8A22, 0x8A24, 0x8A26,
- 0x8A2B, 0x8A2C, 0x8A2F, 0x8A35, 0x8A37, 0x8A3D, 0x8A3E, 0x8A40,
- 0x8A43, 0x8A45, 0x8A47, 0x8A49, 0x8A4D, 0x8A4E, 0x8A53, 0x8A56,
- 0x8A57, 0x8A58, 0x8A5C, 0x8A5D, 0x8A61, 0x8A65, 0x8A67, 0x8A75,
- 0x8A76, 0x8A77, 0x8A79, 0x8A7A, 0x8A7B, 0x8A7E, 0x8A7F, 0x8A80,
- 0x8A83, 0x8A86, 0x8A8B, 0x8A8F, 0x8A90, 0x8A92, 0x8A96, 0x8A97,
- 0x8A99, 0x8A9F, 0x8AA7, 0x8AA9, 0x8AAE, 0x8AAF, 0x8AB3,
-};
-static const unsigned short euc_to_utf8_8FDE[] = {
-         0x8AB6, 0x8AB7, 0x8ABB, 0x8ABE, 0x8AC3, 0x8AC6, 0x8AC8,
- 0x8AC9, 0x8ACA, 0x8AD1, 0x8AD3, 0x8AD4, 0x8AD5, 0x8AD7, 0x8ADD,
- 0x8ADF, 0x8AEC, 0x8AF0, 0x8AF4, 0x8AF5, 0x8AF6, 0x8AFC, 0x8AFF,
- 0x8B05, 0x8B06, 0x8B0B, 0x8B11, 0x8B1C, 0x8B1E, 0x8B1F, 0x8B0A,
- 0x8B2D, 0x8B30, 0x8B37, 0x8B3C, 0x8B42, 0x8B43, 0x8B44, 0x8B45,
- 0x8B46, 0x8B48, 0x8B52, 0x8B53, 0x8B54, 0x8B59, 0x8B4D, 0x8B5E,
- 0x8B63, 0x8B6D, 0x8B76, 0x8B78, 0x8B79, 0x8B7C, 0x8B7E, 0x8B81,
- 0x8B84, 0x8B85, 0x8B8B, 0x8B8D, 0x8B8F, 0x8B94, 0x8B95, 0x8B9C,
- 0x8B9E, 0x8B9F, 0x8C38, 0x8C39, 0x8C3D, 0x8C3E, 0x8C45, 0x8C47,
- 0x8C49, 0x8C4B, 0x8C4F, 0x8C51, 0x8C53, 0x8C54, 0x8C57, 0x8C58,
- 0x8C5B, 0x8C5D, 0x8C59, 0x8C63, 0x8C64, 0x8C66, 0x8C68, 0x8C69,
- 0x8C6D, 0x8C73, 0x8C75, 0x8C76, 0x8C7B, 0x8C7E, 0x8C86,
-};
-static const unsigned short euc_to_utf8_8FDF[] = {
-         0x8C87, 0x8C8B, 0x8C90, 0x8C92, 0x8C93, 0x8C99, 0x8C9B,
- 0x8C9C, 0x8CA4, 0x8CB9, 0x8CBA, 0x8CC5, 0x8CC6, 0x8CC9, 0x8CCB,
- 0x8CCF, 0x8CD6, 0x8CD5, 0x8CD9, 0x8CDD, 0x8CE1, 0x8CE8, 0x8CEC,
- 0x8CEF, 0x8CF0, 0x8CF2, 0x8CF5, 0x8CF7, 0x8CF8, 0x8CFE, 0x8CFF,
- 0x8D01, 0x8D03, 0x8D09, 0x8D12, 0x8D17, 0x8D1B, 0x8D65, 0x8D69,
- 0x8D6C, 0x8D6E, 0x8D7F, 0x8D82, 0x8D84, 0x8D88, 0x8D8D, 0x8D90,
- 0x8D91, 0x8D95, 0x8D9E, 0x8D9F, 0x8DA0, 0x8DA6, 0x8DAB, 0x8DAC,
- 0x8DAF, 0x8DB2, 0x8DB5, 0x8DB7, 0x8DB9, 0x8DBB, 0x8DC0, 0x8DC5,
- 0x8DC6, 0x8DC7, 0x8DC8, 0x8DCA, 0x8DCE, 0x8DD1, 0x8DD4, 0x8DD5,
- 0x8DD7, 0x8DD9, 0x8DE4, 0x8DE5, 0x8DE7, 0x8DEC, 0x8DF0, 0x8DBC,
- 0x8DF1, 0x8DF2, 0x8DF4, 0x8DFD, 0x8E01, 0x8E04, 0x8E05, 0x8E06,
- 0x8E0B, 0x8E11, 0x8E14, 0x8E16, 0x8E20, 0x8E21, 0x8E22,
-};
-static const unsigned short euc_to_utf8_8FE0[] = {
-         0x8E23, 0x8E26, 0x8E27, 0x8E31, 0x8E33, 0x8E36, 0x8E37,
- 0x8E38, 0x8E39, 0x8E3D, 0x8E40, 0x8E41, 0x8E4B, 0x8E4D, 0x8E4E,
- 0x8E4F, 0x8E54, 0x8E5B, 0x8E5C, 0x8E5D, 0x8E5E, 0x8E61, 0x8E62,
- 0x8E69, 0x8E6C, 0x8E6D, 0x8E6F, 0x8E70, 0x8E71, 0x8E79, 0x8E7A,
- 0x8E7B, 0x8E82, 0x8E83, 0x8E89, 0x8E90, 0x8E92, 0x8E95, 0x8E9A,
- 0x8E9B, 0x8E9D, 0x8E9E, 0x8EA2, 0x8EA7, 0x8EA9, 0x8EAD, 0x8EAE,
- 0x8EB3, 0x8EB5, 0x8EBA, 0x8EBB, 0x8EC0, 0x8EC1, 0x8EC3, 0x8EC4,
- 0x8EC7, 0x8ECF, 0x8ED1, 0x8ED4, 0x8EDC, 0x8EE8, 0x8EEE, 0x8EF0,
- 0x8EF1, 0x8EF7, 0x8EF9, 0x8EFA, 0x8EED, 0x8F00, 0x8F02, 0x8F07,
- 0x8F08, 0x8F0F, 0x8F10, 0x8F16, 0x8F17, 0x8F18, 0x8F1E, 0x8F20,
- 0x8F21, 0x8F23, 0x8F25, 0x8F27, 0x8F28, 0x8F2C, 0x8F2D, 0x8F2E,
- 0x8F34, 0x8F35, 0x8F36, 0x8F37, 0x8F3A, 0x8F40, 0x8F41,
-};
-static const unsigned short euc_to_utf8_8FE1[] = {
-         0x8F43, 0x8F47, 0x8F4F, 0x8F51, 0x8F52, 0x8F53, 0x8F54,
- 0x8F55, 0x8F58, 0x8F5D, 0x8F5E, 0x8F65, 0x8F9D, 0x8FA0, 0x8FA1,
- 0x8FA4, 0x8FA5, 0x8FA6, 0x8FB5, 0x8FB6, 0x8FB8, 0x8FBE, 0x8FC0,
- 0x8FC1, 0x8FC6, 0x8FCA, 0x8FCB, 0x8FCD, 0x8FD0, 0x8FD2, 0x8FD3,
- 0x8FD5, 0x8FE0, 0x8FE3, 0x8FE4, 0x8FE8, 0x8FEE, 0x8FF1, 0x8FF5,
- 0x8FF6, 0x8FFB, 0x8FFE, 0x9002, 0x9004, 0x9008, 0x900C, 0x9018,
- 0x901B, 0x9028, 0x9029, 0x902F, 0x902A, 0x902C, 0x902D, 0x9033,
- 0x9034, 0x9037, 0x903F, 0x9043, 0x9044, 0x904C, 0x905B, 0x905D,
- 0x9062, 0x9066, 0x9067, 0x906C, 0x9070, 0x9074, 0x9079, 0x9085,
- 0x9088, 0x908B, 0x908C, 0x908E, 0x9090, 0x9095, 0x9097, 0x9098,
- 0x9099, 0x909B, 0x90A0, 0x90A1, 0x90A2, 0x90A5, 0x90B0, 0x90B2,
- 0x90B3, 0x90B4, 0x90B6, 0x90BD, 0x90CC, 0x90BE, 0x90C3,
-};
-static const unsigned short euc_to_utf8_8FE2[] = {
-         0x90C4, 0x90C5, 0x90C7, 0x90C8, 0x90D5, 0x90D7, 0x90D8,
- 0x90D9, 0x90DC, 0x90DD, 0x90DF, 0x90E5, 0x90D2, 0x90F6, 0x90EB,
- 0x90EF, 0x90F0, 0x90F4, 0x90FE, 0x90FF, 0x9100, 0x9104, 0x9105,
- 0x9106, 0x9108, 0x910D, 0x9110, 0x9114, 0x9116, 0x9117, 0x9118,
- 0x911A, 0x911C, 0x911E, 0x9120, 0x9125, 0x9122, 0x9123, 0x9127,
- 0x9129, 0x912E, 0x912F, 0x9131, 0x9134, 0x9136, 0x9137, 0x9139,
- 0x913A, 0x913C, 0x913D, 0x9143, 0x9147, 0x9148, 0x914F, 0x9153,
- 0x9157, 0x9159, 0x915A, 0x915B, 0x9161, 0x9164, 0x9167, 0x916D,
- 0x9174, 0x9179, 0x917A, 0x917B, 0x9181, 0x9183, 0x9185, 0x9186,
- 0x918A, 0x918E, 0x9191, 0x9193, 0x9194, 0x9195, 0x9198, 0x919E,
- 0x91A1, 0x91A6, 0x91A8, 0x91AC, 0x91AD, 0x91AE, 0x91B0, 0x91B1,
- 0x91B2, 0x91B3, 0x91B6, 0x91BB, 0x91BC, 0x91BD, 0x91BF,
-};
-static const unsigned short euc_to_utf8_8FE3[] = {
-         0x91C2, 0x91C3, 0x91C5, 0x91D3, 0x91D4, 0x91D7, 0x91D9,
- 0x91DA, 0x91DE, 0x91E4, 0x91E5, 0x91E9, 0x91EA, 0x91EC, 0x91ED,
- 0x91EE, 0x91EF, 0x91F0, 0x91F1, 0x91F7, 0x91F9, 0x91FB, 0x91FD,
- 0x9200, 0x9201, 0x9204, 0x9205, 0x9206, 0x9207, 0x9209, 0x920A,
- 0x920C, 0x9210, 0x9212, 0x9213, 0x9216, 0x9218, 0x921C, 0x921D,
- 0x9223, 0x9224, 0x9225, 0x9226, 0x9228, 0x922E, 0x922F, 0x9230,
- 0x9233, 0x9235, 0x9236, 0x9238, 0x9239, 0x923A, 0x923C, 0x923E,
- 0x9240, 0x9242, 0x9243, 0x9246, 0x9247, 0x924A, 0x924D, 0x924E,
- 0x924F, 0x9251, 0x9258, 0x9259, 0x925C, 0x925D, 0x9260, 0x9261,
- 0x9265, 0x9267, 0x9268, 0x9269, 0x926E, 0x926F, 0x9270, 0x9275,
- 0x9276, 0x9277, 0x9278, 0x9279, 0x927B, 0x927C, 0x927D, 0x927F,
- 0x9288, 0x9289, 0x928A, 0x928D, 0x928E, 0x9292, 0x9297,
-};
-static const unsigned short euc_to_utf8_8FE4[] = {
-         0x9299, 0x929F, 0x92A0, 0x92A4, 0x92A5, 0x92A7, 0x92A8,
- 0x92AB, 0x92AF, 0x92B2, 0x92B6, 0x92B8, 0x92BA, 0x92BB, 0x92BC,
- 0x92BD, 0x92BF, 0x92C0, 0x92C1, 0x92C2, 0x92C3, 0x92C5, 0x92C6,
- 0x92C7, 0x92C8, 0x92CB, 0x92CC, 0x92CD, 0x92CE, 0x92D0, 0x92D3,
- 0x92D5, 0x92D7, 0x92D8, 0x92D9, 0x92DC, 0x92DD, 0x92DF, 0x92E0,
- 0x92E1, 0x92E3, 0x92E5, 0x92E7, 0x92E8, 0x92EC, 0x92EE, 0x92F0,
- 0x92F9, 0x92FB, 0x92FF, 0x9300, 0x9302, 0x9308, 0x930D, 0x9311,
- 0x9314, 0x9315, 0x931C, 0x931D, 0x931E, 0x931F, 0x9321, 0x9324,
- 0x9325, 0x9327, 0x9329, 0x932A, 0x9333, 0x9334, 0x9336, 0x9337,
- 0x9347, 0x9348, 0x9349, 0x9350, 0x9351, 0x9352, 0x9355, 0x9357,
- 0x9358, 0x935A, 0x935E, 0x9364, 0x9365, 0x9367, 0x9369, 0x936A,
- 0x936D, 0x936F, 0x9370, 0x9371, 0x9373, 0x9374, 0x9376,
-};
-static const unsigned short euc_to_utf8_8FE5[] = {
-         0x937A, 0x937D, 0x937F, 0x9380, 0x9381, 0x9382, 0x9388,
- 0x938A, 0x938B, 0x938D, 0x938F, 0x9392, 0x9395, 0x9398, 0x939B,
- 0x939E, 0x93A1, 0x93A3, 0x93A4, 0x93A6, 0x93A8, 0x93AB, 0x93B4,
- 0x93B5, 0x93B6, 0x93BA, 0x93A9, 0x93C1, 0x93C4, 0x93C5, 0x93C6,
- 0x93C7, 0x93C9, 0x93CA, 0x93CB, 0x93CC, 0x93CD, 0x93D3, 0x93D9,
- 0x93DC, 0x93DE, 0x93DF, 0x93E2, 0x93E6, 0x93E7, 0x93F9, 0x93F7,
- 0x93F8, 0x93FA, 0x93FB, 0x93FD, 0x9401, 0x9402, 0x9404, 0x9408,
- 0x9409, 0x940D, 0x940E, 0x940F, 0x9415, 0x9416, 0x9417, 0x941F,
- 0x942E, 0x942F, 0x9431, 0x9432, 0x9433, 0x9434, 0x943B, 0x943F,
- 0x943D, 0x9443, 0x9445, 0x9448, 0x944A, 0x944C, 0x9455, 0x9459,
- 0x945C, 0x945F, 0x9461, 0x9463, 0x9468, 0x946B, 0x946D, 0x946E,
- 0x946F, 0x9471, 0x9472, 0x9484, 0x9483, 0x9578, 0x9579,
-};
-static const unsigned short euc_to_utf8_8FE6[] = {
-         0x957E, 0x9584, 0x9588, 0x958C, 0x958D, 0x958E, 0x959D,
- 0x959E, 0x959F, 0x95A1, 0x95A6, 0x95A9, 0x95AB, 0x95AC, 0x95B4,
- 0x95B6, 0x95BA, 0x95BD, 0x95BF, 0x95C6, 0x95C8, 0x95C9, 0x95CB,
- 0x95D0, 0x95D1, 0x95D2, 0x95D3, 0x95D9, 0x95DA, 0x95DD, 0x95DE,
- 0x95DF, 0x95E0, 0x95E4, 0x95E6, 0x961D, 0x961E, 0x9622, 0x9624,
- 0x9625, 0x9626, 0x962C, 0x9631, 0x9633, 0x9637, 0x9638, 0x9639,
- 0x963A, 0x963C, 0x963D, 0x9641, 0x9652, 0x9654, 0x9656, 0x9657,
- 0x9658, 0x9661, 0x966E, 0x9674, 0x967B, 0x967C, 0x967E, 0x967F,
- 0x9681, 0x9682, 0x9683, 0x9684, 0x9689, 0x9691, 0x9696, 0x969A,
- 0x969D, 0x969F, 0x96A4, 0x96A5, 0x96A6, 0x96A9, 0x96AE, 0x96AF,
- 0x96B3, 0x96BA, 0x96CA, 0x96D2, 0x5DB2, 0x96D8, 0x96DA, 0x96DD,
- 0x96DE, 0x96DF, 0x96E9, 0x96EF, 0x96F1, 0x96FA, 0x9702,
-};
-static const unsigned short euc_to_utf8_8FE7[] = {
-         0x9703, 0x9705, 0x9709, 0x971A, 0x971B, 0x971D, 0x9721,
- 0x9722, 0x9723, 0x9728, 0x9731, 0x9733, 0x9741, 0x9743, 0x974A,
- 0x974E, 0x974F, 0x9755, 0x9757, 0x9758, 0x975A, 0x975B, 0x9763,
- 0x9767, 0x976A, 0x976E, 0x9773, 0x9776, 0x9777, 0x9778, 0x977B,
- 0x977D, 0x977F, 0x9780, 0x9789, 0x9795, 0x9796, 0x9797, 0x9799,
- 0x979A, 0x979E, 0x979F, 0x97A2, 0x97AC, 0x97AE, 0x97B1, 0x97B2,
- 0x97B5, 0x97B6, 0x97B8, 0x97B9, 0x97BA, 0x97BC, 0x97BE, 0x97BF,
- 0x97C1, 0x97C4, 0x97C5, 0x97C7, 0x97C9, 0x97CA, 0x97CC, 0x97CD,
- 0x97CE, 0x97D0, 0x97D1, 0x97D4, 0x97D7, 0x97D8, 0x97D9, 0x97DD,
- 0x97DE, 0x97E0, 0x97DB, 0x97E1, 0x97E4, 0x97EF, 0x97F1, 0x97F4,
- 0x97F7, 0x97F8, 0x97FA, 0x9807, 0x980A, 0x9819, 0x980D, 0x980E,
- 0x9814, 0x9816, 0x981C, 0x981E, 0x9820, 0x9823, 0x9826,
-};
-static const unsigned short euc_to_utf8_8FE8[] = {
-         0x982B, 0x982E, 0x982F, 0x9830, 0x9832, 0x9833, 0x9835,
- 0x9825, 0x983E, 0x9844, 0x9847, 0x984A, 0x9851, 0x9852, 0x9853,
- 0x9856, 0x9857, 0x9859, 0x985A, 0x9862, 0x9863, 0x9865, 0x9866,
- 0x986A, 0x986C, 0x98AB, 0x98AD, 0x98AE, 0x98B0, 0x98B4, 0x98B7,
- 0x98B8, 0x98BA, 0x98BB, 0x98BF, 0x98C2, 0x98C5, 0x98C8, 0x98CC,
- 0x98E1, 0x98E3, 0x98E5, 0x98E6, 0x98E7, 0x98EA, 0x98F3, 0x98F6,
- 0x9902, 0x9907, 0x9908, 0x9911, 0x9915, 0x9916, 0x9917, 0x991A,
- 0x991B, 0x991C, 0x991F, 0x9922, 0x9926, 0x9927, 0x992B, 0x9931,
- 0x9932, 0x9933, 0x9934, 0x9935, 0x9939, 0x993A, 0x993B, 0x993C,
- 0x9940, 0x9941, 0x9946, 0x9947, 0x9948, 0x994D, 0x994E, 0x9954,
- 0x9958, 0x9959, 0x995B, 0x995C, 0x995E, 0x995F, 0x9960, 0x999B,
- 0x999D, 0x999F, 0x99A6, 0x99B0, 0x99B1, 0x99B2, 0x99B5,
-};
-static const unsigned short euc_to_utf8_8FE9[] = {
-         0x99B9, 0x99BA, 0x99BD, 0x99BF, 0x99C3, 0x99C9, 0x99D3,
- 0x99D4, 0x99D9, 0x99DA, 0x99DC, 0x99DE, 0x99E7, 0x99EA, 0x99EB,
- 0x99EC, 0x99F0, 0x99F4, 0x99F5, 0x99F9, 0x99FD, 0x99FE, 0x9A02,
- 0x9A03, 0x9A04, 0x9A0B, 0x9A0C, 0x9A10, 0x9A11, 0x9A16, 0x9A1E,
- 0x9A20, 0x9A22, 0x9A23, 0x9A24, 0x9A27, 0x9A2D, 0x9A2E, 0x9A33,
- 0x9A35, 0x9A36, 0x9A38, 0x9A47, 0x9A41, 0x9A44, 0x9A4A, 0x9A4B,
- 0x9A4C, 0x9A4E, 0x9A51, 0x9A54, 0x9A56, 0x9A5D, 0x9AAA, 0x9AAC,
- 0x9AAE, 0x9AAF, 0x9AB2, 0x9AB4, 0x9AB5, 0x9AB6, 0x9AB9, 0x9ABB,
- 0x9ABE, 0x9ABF, 0x9AC1, 0x9AC3, 0x9AC6, 0x9AC8, 0x9ACE, 0x9AD0,
- 0x9AD2, 0x9AD5, 0x9AD6, 0x9AD7, 0x9ADB, 0x9ADC, 0x9AE0, 0x9AE4,
- 0x9AE5, 0x9AE7, 0x9AE9, 0x9AEC, 0x9AF2, 0x9AF3, 0x9AF5, 0x9AF9,
- 0x9AFA, 0x9AFD, 0x9AFF, 0x9B00, 0x9B01, 0x9B02, 0x9B03,
-};
-static const unsigned short euc_to_utf8_8FEA[] = {
-         0x9B04, 0x9B05, 0x9B08, 0x9B09, 0x9B0B, 0x9B0C, 0x9B0D,
- 0x9B0E, 0x9B10, 0x9B12, 0x9B16, 0x9B19, 0x9B1B, 0x9B1C, 0x9B20,
- 0x9B26, 0x9B2B, 0x9B2D, 0x9B33, 0x9B34, 0x9B35, 0x9B37, 0x9B39,
- 0x9B3A, 0x9B3D, 0x9B48, 0x9B4B, 0x9B4C, 0x9B55, 0x9B56, 0x9B57,
- 0x9B5B, 0x9B5E, 0x9B61, 0x9B63, 0x9B65, 0x9B66, 0x9B68, 0x9B6A,
- 0x9B6B, 0x9B6C, 0x9B6D, 0x9B6E, 0x9B73, 0x9B75, 0x9B77, 0x9B78,
- 0x9B79, 0x9B7F, 0x9B80, 0x9B84, 0x9B85, 0x9B86, 0x9B87, 0x9B89,
- 0x9B8A, 0x9B8B, 0x9B8D, 0x9B8F, 0x9B90, 0x9B94, 0x9B9A, 0x9B9D,
- 0x9B9E, 0x9BA6, 0x9BA7, 0x9BA9, 0x9BAC, 0x9BB0, 0x9BB1, 0x9BB2,
- 0x9BB7, 0x9BB8, 0x9BBB, 0x9BBC, 0x9BBE, 0x9BBF, 0x9BC1, 0x9BC7,
- 0x9BC8, 0x9BCE, 0x9BD0, 0x9BD7, 0x9BD8, 0x9BDD, 0x9BDF, 0x9BE5,
- 0x9BE7, 0x9BEA, 0x9BEB, 0x9BEF, 0x9BF3, 0x9BF7, 0x9BF8,
-};
-static const unsigned short euc_to_utf8_8FEB[] = {
-         0x9BF9, 0x9BFA, 0x9BFD, 0x9BFF, 0x9C00, 0x9C02, 0x9C0B,
- 0x9C0F, 0x9C11, 0x9C16, 0x9C18, 0x9C19, 0x9C1A, 0x9C1C, 0x9C1E,
- 0x9C22, 0x9C23, 0x9C26, 0x9C27, 0x9C28, 0x9C29, 0x9C2A, 0x9C31,
- 0x9C35, 0x9C36, 0x9C37, 0x9C3D, 0x9C41, 0x9C43, 0x9C44, 0x9C45,
- 0x9C49, 0x9C4A, 0x9C4E, 0x9C4F, 0x9C50, 0x9C53, 0x9C54, 0x9C56,
- 0x9C58, 0x9C5B, 0x9C5D, 0x9C5E, 0x9C5F, 0x9C63, 0x9C69, 0x9C6A,
- 0x9C5C, 0x9C6B, 0x9C68, 0x9C6E, 0x9C70, 0x9C72, 0x9C75, 0x9C77,
- 0x9C7B, 0x9CE6, 0x9CF2, 0x9CF7, 0x9CF9, 0x9D0B, 0x9D02, 0x9D11,
- 0x9D17, 0x9D18, 0x9D1C, 0x9D1D, 0x9D1E, 0x9D2F, 0x9D30, 0x9D32,
- 0x9D33, 0x9D34, 0x9D3A, 0x9D3C, 0x9D45, 0x9D3D, 0x9D42, 0x9D43,
- 0x9D47, 0x9D4A, 0x9D53, 0x9D54, 0x9D5F, 0x9D63, 0x9D62, 0x9D65,
- 0x9D69, 0x9D6A, 0x9D6B, 0x9D70, 0x9D76, 0x9D77, 0x9D7B,
-};
-static const unsigned short euc_to_utf8_8FEC[] = {
-         0x9D7C, 0x9D7E, 0x9D83, 0x9D84, 0x9D86, 0x9D8A, 0x9D8D,
- 0x9D8E, 0x9D92, 0x9D93, 0x9D95, 0x9D96, 0x9D97, 0x9D98, 0x9DA1,
- 0x9DAA, 0x9DAC, 0x9DAE, 0x9DB1, 0x9DB5, 0x9DB9, 0x9DBC, 0x9DBF,
- 0x9DC3, 0x9DC7, 0x9DC9, 0x9DCA, 0x9DD4, 0x9DD5, 0x9DD6, 0x9DD7,
- 0x9DDA, 0x9DDE, 0x9DDF, 0x9DE0, 0x9DE5, 0x9DE7, 0x9DE9, 0x9DEB,
- 0x9DEE, 0x9DF0, 0x9DF3, 0x9DF4, 0x9DFE, 0x9E0A, 0x9E02, 0x9E07,
- 0x9E0E, 0x9E10, 0x9E11, 0x9E12, 0x9E15, 0x9E16, 0x9E19, 0x9E1C,
- 0x9E1D, 0x9E7A, 0x9E7B, 0x9E7C, 0x9E80, 0x9E82, 0x9E83, 0x9E84,
- 0x9E85, 0x9E87, 0x9E8E, 0x9E8F, 0x9E96, 0x9E98, 0x9E9B, 0x9E9E,
- 0x9EA4, 0x9EA8, 0x9EAC, 0x9EAE, 0x9EAF, 0x9EB0, 0x9EB3, 0x9EB4,
- 0x9EB5, 0x9EC6, 0x9EC8, 0x9ECB, 0x9ED5, 0x9EDF, 0x9EE4, 0x9EE7,
- 0x9EEC, 0x9EED, 0x9EEE, 0x9EF0, 0x9EF1, 0x9EF2, 0x9EF5,
-};
-static const unsigned short euc_to_utf8_8FED[] = {
-         0x9EF8, 0x9EFF, 0x9F02, 0x9F03, 0x9F09, 0x9F0F, 0x9F10,
- 0x9F11, 0x9F12, 0x9F14, 0x9F16, 0x9F17, 0x9F19, 0x9F1A, 0x9F1B,
- 0x9F1F, 0x9F22, 0x9F26, 0x9F2A, 0x9F2B, 0x9F2F, 0x9F31, 0x9F32,
- 0x9F34, 0x9F37, 0x9F39, 0x9F3A, 0x9F3C, 0x9F3D, 0x9F3F, 0x9F41,
- 0x9F43, 0x9F44, 0x9F45, 0x9F46, 0x9F47, 0x9F53, 0x9F55, 0x9F56,
- 0x9F57, 0x9F58, 0x9F5A, 0x9F5D, 0x9F5E, 0x9F68, 0x9F69, 0x9F6D,
- 0x9F6E, 0x9F6F, 0x9F70, 0x9F71, 0x9F73, 0x9F75, 0x9F7A, 0x9F7D,
- 0x9F8F, 0x9F90, 0x9F91, 0x9F92, 0x9F94, 0x9F96, 0x9F97, 0x9F9E,
- 0x9FA1, 0x9FA2, 0x9FA3, 0x9FA5,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,
-};
-static const unsigned short euc_to_utf8_8FF3[] = {
-              0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0, 0x2170, 0x2171, 0x2172, 0x2173, 0x2174,
- 0x2175, 0x2176, 0x2177, 0x2178, 0x2179, 0x2160, 0x2161,
-};
-static const unsigned short euc_to_utf8_8FF4[] = {
-            0x2162, 0x2163, 0x2164, 0x2165, 0x2166, 0x2167, 0x2168,
-    0x2169, 0xff07, 0xff02, 0x3231, 0x2116, 0x2121, 0x70bb, 0x4efc,
-    0x50f4, 0x51ec, 0x5307, 0x5324, 0xfa0e, 0x548a, 0x5759, 0xfa0f,
-    0xfa10, 0x589e, 0x5bec, 0x5cf5, 0x5d53, 0xfa11, 0x5fb7, 0x6085,
-    0x6120, 0x654e, 0x663b, 0x6665, 0xfa12, 0xf929, 0x6801, 0xfa13,
-    0xfa14, 0x6a6b, 0x6ae2, 0x6df8, 0x6df2, 0x7028, 0xfa15, 0xfa16,
-    0x7501, 0x7682, 0x769e, 0xfa17, 0x7930, 0xfa18, 0xfa19, 0xfa1a,
-    0xfa1b, 0x7ae7, 0xfa1c, 0xfa1d, 0x7da0, 0x7dd6, 0xfa1e, 0x8362,
-    0xfa1f, 0x85b0, 0xfa20, 0xfa21, 0x8807, 0xfa22, 0x8b7f, 0x8cf4,
-    0x8d76, 0xfa23, 0xfa24, 0xfa25, 0x90de, 0xfa26, 0x9115, 0xfa27,
-    0xfa28, 0x9592, 0xf9dc, 0xfa29, 0x973b, 0x974d, 0x9751, 0xfa2a,
-    0xfa2b, 0xfa2c, 0x999e, 0x9ad9, 0x9b72, 0xfa2d, 0x9ed1,
-};
-#endif /* X0212_ENABLE */
-
-const unsigned short euc_to_utf8_1byte[] = {
-         0xFF61, 0xFF62, 0xFF63, 0xFF64, 0xFF65, 0xFF66, 0xFF67,
- 0xFF68, 0xFF69, 0xFF6A, 0xFF6B, 0xFF6C, 0xFF6D, 0xFF6E, 0xFF6F,
- 0xFF70, 0xFF71, 0xFF72, 0xFF73, 0xFF74, 0xFF75, 0xFF76, 0xFF77,
- 0xFF78, 0xFF79, 0xFF7A, 0xFF7B, 0xFF7C, 0xFF7D, 0xFF7E, 0xFF7F,
- 0xFF80, 0xFF81, 0xFF82, 0xFF83, 0xFF84, 0xFF85, 0xFF86, 0xFF87,
- 0xFF88, 0xFF89, 0xFF8A, 0xFF8B, 0xFF8C, 0xFF8D, 0xFF8E, 0xFF8F,
- 0xFF90, 0xFF91, 0xFF92, 0xFF93, 0xFF94, 0xFF95, 0xFF96, 0xFF97,
- 0xFF98, 0xFF99, 0xFF9A, 0xFF9B, 0xFF9C, 0xFF9D, 0xFF9E, 0xFF9F,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0, 0x00A9, 0x2122,
-};
-const unsigned short *const euc_to_utf8_2bytes[] = {
-                 euc_to_utf8_A1, euc_to_utf8_A2, euc_to_utf8_A3,
- euc_to_utf8_A4, euc_to_utf8_A5, euc_to_utf8_A6, euc_to_utf8_A7,
- euc_to_utf8_A8, euc_to_utf8_A9, euc_to_utf8_AA, euc_to_utf8_AB,
- euc_to_utf8_AC, euc_to_utf8_AD, euc_to_utf8_AE, euc_to_utf8_AF,
- euc_to_utf8_B0, euc_to_utf8_B1, euc_to_utf8_B2, euc_to_utf8_B3,
- euc_to_utf8_B4, euc_to_utf8_B5, euc_to_utf8_B6, euc_to_utf8_B7,
- euc_to_utf8_B8, euc_to_utf8_B9, euc_to_utf8_BA, euc_to_utf8_BB,
- euc_to_utf8_BC, euc_to_utf8_BD, euc_to_utf8_BE, euc_to_utf8_BF,
- euc_to_utf8_C0, euc_to_utf8_C1, euc_to_utf8_C2, euc_to_utf8_C3,
- euc_to_utf8_C4, euc_to_utf8_C5, euc_to_utf8_C6, euc_to_utf8_C7,
- euc_to_utf8_C8, euc_to_utf8_C9, euc_to_utf8_CA, euc_to_utf8_CB,
- euc_to_utf8_CC, euc_to_utf8_CD, euc_to_utf8_CE, euc_to_utf8_CF,
- euc_to_utf8_D0, euc_to_utf8_D1, euc_to_utf8_D2, euc_to_utf8_D3,
- euc_to_utf8_D4, euc_to_utf8_D5, euc_to_utf8_D6, euc_to_utf8_D7,
- euc_to_utf8_D8, euc_to_utf8_D9, euc_to_utf8_DA, euc_to_utf8_DB,
- euc_to_utf8_DC, euc_to_utf8_DD, euc_to_utf8_DE, euc_to_utf8_DF,
- euc_to_utf8_E0, euc_to_utf8_E1, euc_to_utf8_E2, euc_to_utf8_E3,
- euc_to_utf8_E4, euc_to_utf8_E5, euc_to_utf8_E6, euc_to_utf8_E7,
- euc_to_utf8_E8, euc_to_utf8_E9, euc_to_utf8_EA, euc_to_utf8_EB,
- euc_to_utf8_EC, euc_to_utf8_ED, euc_to_utf8_EE, euc_to_utf8_EF,
- euc_to_utf8_F0, euc_to_utf8_F1, euc_to_utf8_F2, euc_to_utf8_F3,
- euc_to_utf8_F4, euc_to_utf8_F5,              0,              0,
-              0, euc_to_utf8_F9, euc_to_utf8_FA, euc_to_utf8_FB,
- euc_to_utf8_FC,              0,              0,
-};
-/* Microsoft UCS Mapping Compatible */
-const unsigned short *const euc_to_utf8_2bytes_ms[] = {
-                 euc_to_utf8_A1_ms, euc_to_utf8_A2_ms, euc_to_utf8_A3,
- euc_to_utf8_A4, euc_to_utf8_A5, euc_to_utf8_A6, euc_to_utf8_A7,
- euc_to_utf8_A8, euc_to_utf8_A9, euc_to_utf8_AA, euc_to_utf8_AB,
- euc_to_utf8_AC, euc_to_utf8_AD, euc_to_utf8_AE, euc_to_utf8_AF,
- euc_to_utf8_B0, euc_to_utf8_B1, euc_to_utf8_B2, euc_to_utf8_B3,
- euc_to_utf8_B4, euc_to_utf8_B5, euc_to_utf8_B6, euc_to_utf8_B7,
- euc_to_utf8_B8, euc_to_utf8_B9, euc_to_utf8_BA, euc_to_utf8_BB,
- euc_to_utf8_BC, euc_to_utf8_BD, euc_to_utf8_BE, euc_to_utf8_BF,
- euc_to_utf8_C0, euc_to_utf8_C1, euc_to_utf8_C2, euc_to_utf8_C3,
- euc_to_utf8_C4, euc_to_utf8_C5, euc_to_utf8_C6, euc_to_utf8_C7,
- euc_to_utf8_C8, euc_to_utf8_C9, euc_to_utf8_CA, euc_to_utf8_CB,
- euc_to_utf8_CC, euc_to_utf8_CD, euc_to_utf8_CE, euc_to_utf8_CF,
- euc_to_utf8_D0, euc_to_utf8_D1, euc_to_utf8_D2, euc_to_utf8_D3,
- euc_to_utf8_D4, euc_to_utf8_D5, euc_to_utf8_D6, euc_to_utf8_D7,
- euc_to_utf8_D8, euc_to_utf8_D9, euc_to_utf8_DA, euc_to_utf8_DB,
- euc_to_utf8_DC, euc_to_utf8_DD, euc_to_utf8_DE, euc_to_utf8_DF,
- euc_to_utf8_E0, euc_to_utf8_E1, euc_to_utf8_E2, euc_to_utf8_E3,
- euc_to_utf8_E4, euc_to_utf8_E5, euc_to_utf8_E6, euc_to_utf8_E7,
- euc_to_utf8_E8, euc_to_utf8_E9, euc_to_utf8_EA, euc_to_utf8_EB,
- euc_to_utf8_EC, euc_to_utf8_ED, euc_to_utf8_EE, euc_to_utf8_EF,
- euc_to_utf8_F0, euc_to_utf8_F1, euc_to_utf8_F2, euc_to_utf8_F3,
- euc_to_utf8_F4, euc_to_utf8_F5,              0,              0,
-              0, euc_to_utf8_F9, euc_to_utf8_FA, euc_to_utf8_FB,
- euc_to_utf8_FC_ms,              0,              0,
-};
-/* CP10001 */
-const unsigned short *const euc_to_utf8_2bytes_mac[] = {
-                 euc_to_utf8_A1_ms, euc_to_utf8_A2_ms, euc_to_utf8_A3,
- euc_to_utf8_A4, euc_to_utf8_A5, euc_to_utf8_A6, euc_to_utf8_A7,
- euc_to_utf8_A8, euc_to_utf8_A9, euc_to_utf8_AA, euc_to_utf8_AB,
- euc_to_utf8_AC_mac, euc_to_utf8_AD_mac, euc_to_utf8_AE, euc_to_utf8_AF,
- euc_to_utf8_B0, euc_to_utf8_B1, euc_to_utf8_B2, euc_to_utf8_B3,
- euc_to_utf8_B4, euc_to_utf8_B5, euc_to_utf8_B6, euc_to_utf8_B7,
- euc_to_utf8_B8, euc_to_utf8_B9, euc_to_utf8_BA, euc_to_utf8_BB,
- euc_to_utf8_BC, euc_to_utf8_BD, euc_to_utf8_BE, euc_to_utf8_BF,
- euc_to_utf8_C0, euc_to_utf8_C1, euc_to_utf8_C2, euc_to_utf8_C3,
- euc_to_utf8_C4, euc_to_utf8_C5, euc_to_utf8_C6, euc_to_utf8_C7,
- euc_to_utf8_C8, euc_to_utf8_C9, euc_to_utf8_CA, euc_to_utf8_CB,
- euc_to_utf8_CC, euc_to_utf8_CD, euc_to_utf8_CE, euc_to_utf8_CF,
- euc_to_utf8_D0, euc_to_utf8_D1, euc_to_utf8_D2, euc_to_utf8_D3,
- euc_to_utf8_D4, euc_to_utf8_D5, euc_to_utf8_D6, euc_to_utf8_D7,
- euc_to_utf8_D8, euc_to_utf8_D9, euc_to_utf8_DA, euc_to_utf8_DB,
- euc_to_utf8_DC, euc_to_utf8_DD, euc_to_utf8_DE, euc_to_utf8_DF,
- euc_to_utf8_E0, euc_to_utf8_E1, euc_to_utf8_E2, euc_to_utf8_E3,
- euc_to_utf8_E4, euc_to_utf8_E5, euc_to_utf8_E6, euc_to_utf8_E7,
- euc_to_utf8_E8, euc_to_utf8_E9, euc_to_utf8_EA, euc_to_utf8_EB,
- euc_to_utf8_EC, euc_to_utf8_ED, euc_to_utf8_EE, euc_to_utf8_EF,
- euc_to_utf8_F0, euc_to_utf8_F1, euc_to_utf8_F2, euc_to_utf8_F3,
- euc_to_utf8_F4, euc_to_utf8_F5,              0,              0,
-              0, euc_to_utf8_F9, euc_to_utf8_FA, euc_to_utf8_FB,
- euc_to_utf8_FC_ms,              0,              0,
-};
-const unsigned short *const euc_to_utf8_2bytes_x0213[] = {
-                 euc_to_utf8_A1, euc_to_utf8_A2_x0213, euc_to_utf8_A3_x0213,
- euc_to_utf8_A4_x0213, euc_to_utf8_A5_x0213, euc_to_utf8_A6_x0213, euc_to_utf8_A7_x0213,
- euc_to_utf8_A8_x0213, euc_to_utf8_A9_x0213, euc_to_utf8_AA_x0213, euc_to_utf8_AB_x0213,
- euc_to_utf8_AC_x0213, euc_to_utf8_AD_x0213, euc_to_utf8_AE_x0213, euc_to_utf8_AF_x0213,
- euc_to_utf8_B0, euc_to_utf8_B1, euc_to_utf8_B2, euc_to_utf8_B3,
- euc_to_utf8_B4, euc_to_utf8_B5, euc_to_utf8_B6, euc_to_utf8_B7,
- euc_to_utf8_B8, euc_to_utf8_B9, euc_to_utf8_BA, euc_to_utf8_BB,
- euc_to_utf8_BC, euc_to_utf8_BD, euc_to_utf8_BE, euc_to_utf8_BF,
- euc_to_utf8_C0, euc_to_utf8_C1, euc_to_utf8_C2, euc_to_utf8_C3,
- euc_to_utf8_C4, euc_to_utf8_C5, euc_to_utf8_C6, euc_to_utf8_C7,
- euc_to_utf8_C8, euc_to_utf8_C9, euc_to_utf8_CA, euc_to_utf8_CB,
- euc_to_utf8_CC, euc_to_utf8_CD, euc_to_utf8_CE, euc_to_utf8_CF_x0213,
- euc_to_utf8_D0, euc_to_utf8_D1, euc_to_utf8_D2, euc_to_utf8_D3,
- euc_to_utf8_D4, euc_to_utf8_D5, euc_to_utf8_D6, euc_to_utf8_D7,
- euc_to_utf8_D8, euc_to_utf8_D9, euc_to_utf8_DA, euc_to_utf8_DB,
- euc_to_utf8_DC, euc_to_utf8_DD, euc_to_utf8_DE, euc_to_utf8_DF,
- euc_to_utf8_E0, euc_to_utf8_E1, euc_to_utf8_E2, euc_to_utf8_E3,
- euc_to_utf8_E4, euc_to_utf8_E5, euc_to_utf8_E6, euc_to_utf8_E7,
- euc_to_utf8_E8, euc_to_utf8_E9, euc_to_utf8_EA, euc_to_utf8_EB,
- euc_to_utf8_EC, euc_to_utf8_ED, euc_to_utf8_EE, euc_to_utf8_EF,
- euc_to_utf8_F0, euc_to_utf8_F1, euc_to_utf8_F2, euc_to_utf8_F3,
- euc_to_utf8_F4_x0213, euc_to_utf8_F5_x0213, euc_to_utf8_F6_x0213, euc_to_utf8_F7_x0213,
- euc_to_utf8_F8_x0213, euc_to_utf8_F9_x0213, euc_to_utf8_FA_x0213, euc_to_utf8_FB_x0213,
- euc_to_utf8_FC_x0213, euc_to_utf8_FD_x0213, euc_to_utf8_FE_x0213,
-};
-
-#ifdef X0212_ENABLE
-const unsigned short *const x0212_to_utf8_2bytes[] = {
-                              0, euc_to_utf8_8FA2,              0,
-              0,              0, euc_to_utf8_8FA6, euc_to_utf8_8FA7,
-              0, euc_to_utf8_8FA9, euc_to_utf8_8FAA, euc_to_utf8_8FAB,
-              0,              0,              0,              0,
- euc_to_utf8_8FB0, euc_to_utf8_8FB1, euc_to_utf8_8FB2, euc_to_utf8_8FB3,
- euc_to_utf8_8FB4, euc_to_utf8_8FB5, euc_to_utf8_8FB6, euc_to_utf8_8FB7,
- euc_to_utf8_8FB8, euc_to_utf8_8FB9, euc_to_utf8_8FBA, euc_to_utf8_8FBB,
- euc_to_utf8_8FBC, euc_to_utf8_8FBD, euc_to_utf8_8FBE, euc_to_utf8_8FBF,
- euc_to_utf8_8FC0, euc_to_utf8_8FC1, euc_to_utf8_8FC2, euc_to_utf8_8FC3,
- euc_to_utf8_8FC4, euc_to_utf8_8FC5, euc_to_utf8_8FC6, euc_to_utf8_8FC7,
- euc_to_utf8_8FC8, euc_to_utf8_8FC9, euc_to_utf8_8FCA, euc_to_utf8_8FCB,
- euc_to_utf8_8FCC, euc_to_utf8_8FCD, euc_to_utf8_8FCE, euc_to_utf8_8FCF,
- euc_to_utf8_8FD0, euc_to_utf8_8FD1, euc_to_utf8_8FD2, euc_to_utf8_8FD3,
- euc_to_utf8_8FD4, euc_to_utf8_8FD5, euc_to_utf8_8FD6, euc_to_utf8_8FD7,
- euc_to_utf8_8FD8, euc_to_utf8_8FD9, euc_to_utf8_8FDA, euc_to_utf8_8FDB,
- euc_to_utf8_8FDC, euc_to_utf8_8FDD, euc_to_utf8_8FDE, euc_to_utf8_8FDF,
- euc_to_utf8_8FE0, euc_to_utf8_8FE1, euc_to_utf8_8FE2, euc_to_utf8_8FE3,
- euc_to_utf8_8FE4, euc_to_utf8_8FE5, euc_to_utf8_8FE6, euc_to_utf8_8FE7,
- euc_to_utf8_8FE8, euc_to_utf8_8FE9, euc_to_utf8_8FEA, euc_to_utf8_8FEB,
- euc_to_utf8_8FEC, euc_to_utf8_8FED,              0,              0,
-              0,              0,              0,       euc_to_utf8_8FF3,
- euc_to_utf8_8FF4,            0,              0,              0,
-              0,              0,              0,              0,
-              0,              0,              0,};
-
-const unsigned short *const x0212_to_utf8_2bytes_x0213[] = {
-                   euc_to_utf8_8FA1_x0213, euc_to_utf8_8FA2, euc_to_utf8_8FA3_x0213,
- euc_to_utf8_8FA4_x0213, euc_to_utf8_8FA5_x0213, euc_to_utf8_8FA6, euc_to_utf8_8FA7,
- euc_to_utf8_8FA8_x0213, euc_to_utf8_8FA9, euc_to_utf8_8FAA, euc_to_utf8_8FAB,
- euc_to_utf8_8FAC_x0213, euc_to_utf8_8FAD_x0213, euc_to_utf8_8FAE_x0213, euc_to_utf8_8FAF_x0213,
- euc_to_utf8_8FB0, euc_to_utf8_8FB1, euc_to_utf8_8FB2, euc_to_utf8_8FB3,
- euc_to_utf8_8FB4, euc_to_utf8_8FB5, euc_to_utf8_8FB6, euc_to_utf8_8FB7,
- euc_to_utf8_8FB8, euc_to_utf8_8FB9, euc_to_utf8_8FBA, euc_to_utf8_8FBB,
- euc_to_utf8_8FBC, euc_to_utf8_8FBD, euc_to_utf8_8FBE, euc_to_utf8_8FBF,
- euc_to_utf8_8FC0, euc_to_utf8_8FC1, euc_to_utf8_8FC2, euc_to_utf8_8FC3,
- euc_to_utf8_8FC4, euc_to_utf8_8FC5, euc_to_utf8_8FC6, euc_to_utf8_8FC7,
- euc_to_utf8_8FC8, euc_to_utf8_8FC9, euc_to_utf8_8FCA, euc_to_utf8_8FCB,
- euc_to_utf8_8FCC, euc_to_utf8_8FCD, euc_to_utf8_8FCE, euc_to_utf8_8FCF,
- euc_to_utf8_8FD0, euc_to_utf8_8FD1, euc_to_utf8_8FD2, euc_to_utf8_8FD3,
- euc_to_utf8_8FD4, euc_to_utf8_8FD5, euc_to_utf8_8FD6, euc_to_utf8_8FD7,
- euc_to_utf8_8FD8, euc_to_utf8_8FD9, euc_to_utf8_8FDA, euc_to_utf8_8FDB,
- euc_to_utf8_8FDC, euc_to_utf8_8FDD, euc_to_utf8_8FDE, euc_to_utf8_8FDF,
- euc_to_utf8_8FE0, euc_to_utf8_8FE1, euc_to_utf8_8FE2, euc_to_utf8_8FE3,
- euc_to_utf8_8FE4, euc_to_utf8_8FE5, euc_to_utf8_8FE6, euc_to_utf8_8FE7,
- euc_to_utf8_8FE8, euc_to_utf8_8FE9, euc_to_utf8_8FEA, euc_to_utf8_8FEB,
- euc_to_utf8_8FEC, euc_to_utf8_8FED, euc_to_utf8_8FEE_x0213, euc_to_utf8_8FEF_x0213,
- euc_to_utf8_8FF0_x0213, euc_to_utf8_8FF1_x0213, euc_to_utf8_8FF2_x0213, euc_to_utf8_8FF3_x0213,
- euc_to_utf8_8FF4_x0213, euc_to_utf8_8FF5_x0213, euc_to_utf8_8FF6_x0213, euc_to_utf8_8FF7_x0213,
- euc_to_utf8_8FF8_x0213, euc_to_utf8_8FF9_x0213, euc_to_utf8_8FFA_x0213, euc_to_utf8_8FFB_x0213,
- euc_to_utf8_8FFC_x0213, euc_to_utf8_8FFD_x0213, euc_to_utf8_8FFE_x0213,};
-#endif /* X0212_ENABLE */
-
-const unsigned short x0213_combining_chars[sizeof_x0213_combining_chars] = {
-    0x309A, 0x0300, 0x0301, 0x02E5, 0x02E9,
-};
-const unsigned short x0213_combining_table[sizeof_x0213_combining_table][3] = {
-    {0x2477, 0x304B, 0x309A},
-    {0x2478, 0x304D, 0x309A},
-    {0x2479, 0x304F, 0x309A},
-    {0x247A, 0x3051, 0x309A},
-    {0x247B, 0x3053, 0x309A},
-    {0x2577, 0x30AB, 0x309A},
-    {0x2578, 0x30AD, 0x309A},
-    {0x2579, 0x30AF, 0x309A},
-    {0x257A, 0x30B1, 0x309A},
-    {0x257B, 0x30B3, 0x309A},
-    {0x257C, 0x30BB, 0x309A},
-    {0x257D, 0x30C4, 0x309A},
-    {0x257E, 0x30C8, 0x309A},
-    {0x2678, 0x31F7, 0x309A},
-    {0x2B44, 0x00E6, 0x0300},
-    {0x2B48, 0x0254, 0x0300},
-    {0x2B49, 0x0254, 0x0301},
-    {0x2B4A, 0x028C, 0x0300},
-    {0x2B4B, 0x028C, 0x0301},
-    {0x2B4C, 0x0259, 0x0300},
-    {0x2B4D, 0x0259, 0x0301},
-    {0x2B4E, 0x025A, 0x0300},
-    {0x2B4F, 0x025A, 0x0301},
-    {0x2B65, 0x02E9, 0x02E5},
-    {0x2B66, 0x02E5, 0x02E9},
-};
-const unsigned short x0213_1_surrogate_table[sizeof_x0213_1_surrogate_table][3] = {
-    {0x2E22, 0xD840, 0xDC0B},
-    {0x2F42, 0xD844, 0xDE3D},
-    {0x2F4C, 0xD844, 0xDF1B},
-    {0x2F60, 0xD845, 0xDC6E},
-    {0x2F7B, 0xD846, 0xDCBD},
-    {0x4F54, 0xD842, 0xDF9F},
-    {0x4F63, 0xD845, 0xDEB4},
-    {0x4F6E, 0xD847, 0xDE34},
-    {0x753A, 0xD84C, 0xDDC4},
-    {0x7572, 0xD84D, 0xDDC4},
-    {0x7629, 0xD84D, 0xDF3F},
-    {0x7632, 0xD84D, 0xDF63},
-    {0x7660, 0xD84F, 0xDCFE},
-    {0x776C, 0xD851, 0xDFF1},
-    {0x787E, 0xD855, 0xDC8E},
-    {0x7929, 0xD855, 0xDD0E},
-    {0x7947, 0xD855, 0xDF71},
-    {0x7954, 0xD856, 0xDDC4},
-    {0x796E, 0xD857, 0xDDA1},
-    {0x7A5D, 0xD85A, 0xDEFF},
-    {0x7B33, 0xD85B, 0xDE40},
-    {0x7B49, 0xD85C, 0xDCF4},
-    {0x7B6C, 0xD85D, 0xDE84},
-    {0x7C49, 0xD860, 0xDE77},
-    {0x7C51, 0xD860, 0xDFCD},
-    {0x7E66, 0xD868, 0xDD90},
-};
-const unsigned short x0213_2_surrogate_table[sizeof_x0213_2_surrogate_table][3] = {
-    {0x2121, 0xD840, 0xDC89},
-    {0x212B, 0xD840, 0xDCA2},
-    {0x212E, 0xD840, 0xDCA4},
-    {0x2136, 0xD840, 0xDDA2},
-    {0x2146, 0xD840, 0xDE13},
-    {0x2170, 0xD840, 0xDF2B},
-    {0x2177, 0xD840, 0xDF81},
-    {0x2179, 0xD840, 0xDF71},
-    {0x2322, 0xD840, 0xDFF9},
-    {0x2325, 0xD841, 0xDC4A},
-    {0x2327, 0xD841, 0xDD09},
-    {0x2331, 0xD841, 0xDDD6},
-    {0x2332, 0xD841, 0xDE28},
-    {0x2338, 0xD841, 0xDF4F},
-    {0x233F, 0xD842, 0xDC07},
-    {0x2341, 0xD842, 0xDC3A},
-    {0x234A, 0xD842, 0xDCB9},
-    {0x2352, 0xD842, 0xDD7C},
-    {0x2353, 0xD842, 0xDD9D},
-    {0x2359, 0xD842, 0xDED3},
-    {0x235C, 0xD842, 0xDF1D},
-    {0x2377, 0xD843, 0xDD45},
-    {0x242A, 0xD843, 0xDDE1},
-    {0x2431, 0xD843, 0xDE95},
-    {0x2432, 0xD843, 0xDE6D},
-    {0x243A, 0xD843, 0xDE64},
-    {0x243D, 0xD843, 0xDF5F},
-    {0x2459, 0xD844, 0xDE01},
-    {0x245C, 0xD844, 0xDE55},
-    {0x245E, 0xD844, 0xDE7B},
-    {0x2463, 0xD844, 0xDE74},
-    {0x246A, 0xD844, 0xDEE4},
-    {0x246B, 0xD844, 0xDED7},
-    {0x2472, 0xD844, 0xDEFD},
-    {0x2474, 0xD844, 0xDF36},
-    {0x2475, 0xD844, 0xDF44},
-    {0x2525, 0xD844, 0xDFC4},
-    {0x2532, 0xD845, 0xDC6D},
-    {0x253E, 0xD845, 0xDDD7},
-    {0x2544, 0xD85B, 0xDC29},
-    {0x2547, 0xD845, 0xDE47},
-    {0x2555, 0xD845, 0xDF06},
-    {0x2556, 0xD845, 0xDF42},
-    {0x257E, 0xD846, 0xDDC3},
-    {0x2830, 0xD847, 0xDC56},
-    {0x2837, 0xD847, 0xDD2D},
-    {0x2838, 0xD847, 0xDD45},
-    {0x283A, 0xD847, 0xDD78},
-    {0x283B, 0xD847, 0xDD62},
-    {0x283F, 0xD847, 0xDDA1},
-    {0x2840, 0xD847, 0xDD9C},
-    {0x2845, 0xD847, 0xDD92},
-    {0x2848, 0xD847, 0xDDB7},
-    {0x284A, 0xD847, 0xDDE0},
-    {0x284B, 0xD847, 0xDE33},
-    {0x285B, 0xD847, 0xDF1E},
-    {0x2866, 0xD847, 0xDF76},
-    {0x286C, 0xD847, 0xDFFA},
-    {0x2C22, 0xD848, 0xDD7B},
-    {0x2C2B, 0xD848, 0xDF1E},
-    {0x2C30, 0xD848, 0xDFAD},
-    {0x2C50, 0xD849, 0xDEF3},
-    {0x2C65, 0xD84A, 0xDC5B},
-    {0x2C6D, 0xD84A, 0xDCAB},
-    {0x2C72, 0xD84A, 0xDD8F},
-    {0x2D24, 0xD84A, 0xDEB8},
-    {0x2D29, 0xD84A, 0xDF4F},
-    {0x2D2A, 0xD84A, 0xDF50},
-    {0x2D32, 0xD84A, 0xDF46},
-    {0x2D34, 0xD84B, 0xDC1D},
-    {0x2D35, 0xD84A, 0xDFA6},
-    {0x2D39, 0xD84B, 0xDC24},
-    {0x2D56, 0xD84B, 0xDDE1},
-    {0x2D7D, 0xD84C, 0xDDC3},
-    {0x2E23, 0xD84C, 0xDDF5},
-    {0x2E24, 0xD84C, 0xDDB6},
-    {0x2E3A, 0xD84C, 0xDF72},
-    {0x2E3C, 0xD84C, 0xDFD3},
-    {0x2E3D, 0xD84C, 0xDFD2},
-    {0x2E42, 0xD84C, 0xDFD0},
-    {0x2E43, 0xD84C, 0xDFE4},
-    {0x2E44, 0xD84C, 0xDFD5},
-    {0x2E47, 0xD84C, 0xDFDA},
-    {0x2E49, 0xD84C, 0xDFDF},
-    {0x2E55, 0xD84D, 0xDC4A},
-    {0x2E56, 0xD84D, 0xDC51},
-    {0x2E57, 0xD84D, 0xDC4B},
-    {0x2E5B, 0xD84D, 0xDC65},
-    {0x2E77, 0xD84D, 0xDCE4},
-    {0x2E78, 0xD84D, 0xDD5A},
-    {0x2F2A, 0xD84D, 0xDD94},
-    {0x2F3F, 0xD84D, 0xDE39},
-    {0x2F40, 0xD84D, 0xDE47},
-    {0x2F42, 0xD84D, 0xDE38},
-    {0x2F43, 0xD84D, 0xDE3A},
-    {0x2F4E, 0xD84D, 0xDF1C},
-    {0x2F59, 0xD84D, 0xDF0C},
-    {0x2F61, 0xD84D, 0xDF64},
-    {0x2F69, 0xD84D, 0xDFFF},
-    {0x2F6A, 0xD84D, 0xDFE7},
-    {0x2F70, 0xD84E, 0xDC24},
-    {0x2F75, 0xD84E, 0xDC3D},
-    {0x6E23, 0xD84E, 0xDE98},
-    {0x6E34, 0xD84F, 0xDC7F},
-    {0x6E49, 0xD84F, 0xDD00},
-    {0x6E5C, 0xD84F, 0xDD40},
-    {0x6E5E, 0xD84F, 0xDDFA},
-    {0x6E5F, 0xD84F, 0xDDF9},
-    {0x6E60, 0xD84F, 0xDDD3},
-    {0x6F32, 0xD84F, 0xDF7E},
-    {0x6F47, 0xD850, 0xDC96},
-    {0x6F4D, 0xD850, 0xDD03},
-    {0x6F61, 0xD850, 0xDDC6},
-    {0x6F64, 0xD850, 0xDDFE},
-    {0x7022, 0xD850, 0xDFBC},
-    {0x7033, 0xD851, 0xDE29},
-    {0x7039, 0xD851, 0xDEA5},
-    {0x7053, 0xD852, 0xDC96},
-    {0x707B, 0xD852, 0xDE4D},
-    {0x712E, 0xD852, 0xDF56},
-    {0x7130, 0xD852, 0xDF6F},
-    {0x7135, 0xD853, 0xDC16},
-    {0x7144, 0xD853, 0xDD14},
-    {0x715D, 0xD853, 0xDE0E},
-    {0x7161, 0xD853, 0xDE37},
-    {0x7166, 0xD853, 0xDE6A},
-    {0x7169, 0xD853, 0xDE8B},
-    {0x7175, 0xD854, 0xDC4A},
-    {0x7177, 0xD854, 0xDC55},
-    {0x717A, 0xD854, 0xDD22},
-    {0x7221, 0xD854, 0xDDA9},
-    {0x7223, 0xD854, 0xDDE5},
-    {0x7224, 0xD854, 0xDDCD},
-    {0x7228, 0xD854, 0xDE1E},
-    {0x722C, 0xD854, 0xDE4C},
-    {0x723D, 0xD855, 0xDC2E},
-    {0x7248, 0xD855, 0xDCD9},
-    {0x725B, 0xD855, 0xDDA7},
-    {0x7275, 0xD855, 0xDFA9},
-    {0x7276, 0xD855, 0xDFB4},
-    {0x7332, 0xD856, 0xDDD4},
-    {0x733D, 0xD856, 0xDEE4},
-    {0x733E, 0xD856, 0xDEE3},
-    {0x7340, 0xD856, 0xDEF1},
-    {0x7352, 0xD856, 0xDFB2},
-    {0x735D, 0xD857, 0xDC4B},
-    {0x735E, 0xD857, 0xDC64},
-    {0x7373, 0xD857, 0xDE2E},
-    {0x7374, 0xD857, 0xDE56},
-    {0x7375, 0xD857, 0xDE65},
-    {0x7377, 0xD857, 0xDE62},
-    {0x737B, 0xD857, 0xDED8},
-    {0x737D, 0xD857, 0xDEC2},
-    {0x7422, 0xD857, 0xDEE8},
-    {0x7424, 0xD857, 0xDF23},
-    {0x7427, 0xD857, 0xDF5C},
-    {0x742E, 0xD857, 0xDFE0},
-    {0x742F, 0xD857, 0xDFD4},
-    {0x7434, 0xD858, 0xDC0C},
-    {0x7435, 0xD857, 0xDFFB},
-    {0x743D, 0xD858, 0xDC17},
-    {0x7442, 0xD858, 0xDC60},
-    {0x744F, 0xD858, 0xDCED},
-    {0x7469, 0xD858, 0xDE70},
-    {0x746B, 0xD858, 0xDE86},
-    {0x7472, 0xD858, 0xDF4C},
-    {0x7475, 0xD84F, 0xDD0E},
-    {0x7479, 0xD859, 0xDC02},
-    {0x7535, 0xD859, 0xDE7E},
-    {0x753A, 0xD859, 0xDEB0},
-    {0x7546, 0xD859, 0xDF1D},
-    {0x7556, 0xD85A, 0xDCDD},
-    {0x7558, 0xD85A, 0xDCEA},
-    {0x755A, 0xD85A, 0xDD51},
-    {0x755D, 0xD85A, 0xDD6F},
-    {0x755F, 0xD85A, 0xDDDD},
-    {0x7563, 0xD85A, 0xDE1E},
-    {0x756A, 0xD85A, 0xDE58},
-    {0x7570, 0xD85A, 0xDE8C},
-    {0x7573, 0xD85A, 0xDEB7},
-    {0x7644, 0xD85B, 0xDC73},
-    {0x764E, 0xD85B, 0xDCDD},
-    {0x765D, 0xD85B, 0xDE65},
-    {0x7675, 0xD85B, 0xDF94},
-    {0x767E, 0xD85B, 0xDFF8},
-    {0x7721, 0xD85B, 0xDFF6},
-    {0x7722, 0xD85B, 0xDFF7},
-    {0x7733, 0xD85C, 0xDD0D},
-    {0x7736, 0xD85C, 0xDD39},
-    {0x7764, 0xD85C, 0xDFDB},
-    {0x7765, 0xD85C, 0xDFDA},
-    {0x776B, 0xD85C, 0xDFFE},
-    {0x776E, 0xD85D, 0xDC10},
-    {0x7773, 0xD85D, 0xDC49},
-    {0x7829, 0xD85D, 0xDE15},
-    {0x782A, 0xD85D, 0xDE14},
-    {0x782C, 0xD85D, 0xDE31},
-    {0x7834, 0xD85D, 0xDE93},
-    {0x783C, 0xD85D, 0xDF0E},
-    {0x783E, 0xD85D, 0xDF23},
-    {0x7842, 0xD85D, 0xDF52},
-    {0x7856, 0xD85E, 0xDD85},
-    {0x7863, 0xD85E, 0xDE84},
-    {0x7877, 0xD85E, 0xDFB3},
-    {0x7879, 0xD85E, 0xDFBE},
-    {0x787A, 0xD85E, 0xDFC7},
-    {0x7925, 0xD85F, 0xDCB8},
-    {0x792F, 0xD85F, 0xDDA0},
-    {0x7932, 0xD85F, 0xDE10},
-    {0x7939, 0xD85F, 0xDFB7},
-    {0x7942, 0xD860, 0xDC8A},
-    {0x7948, 0xD860, 0xDCBB},
-    {0x7959, 0xD860, 0xDE82},
-    {0x795E, 0xD860, 0xDEF3},
-    {0x7966, 0xD861, 0xDC0C},
-    {0x796B, 0xD861, 0xDC55},
-    {0x797A, 0xD861, 0xDD6B},
-    {0x797E, 0xD861, 0xDDC8},
-    {0x7A21, 0xD861, 0xDDC9},
-    {0x7A2C, 0xD861, 0xDED7},
-    {0x7A2F, 0xD861, 0xDEFA},
-    {0x7A4F, 0xD862, 0xDD49},
-    {0x7A50, 0xD862, 0xDD46},
-    {0x7A57, 0xD862, 0xDD6B},
-    {0x7A65, 0xD862, 0xDD87},
-    {0x7A66, 0xD862, 0xDD88},
-    {0x7A71, 0xD862, 0xDDBA},
-    {0x7A72, 0xD862, 0xDDBB},
-    {0x7A7E, 0xD862, 0xDE1E},
-    {0x7B21, 0xD862, 0xDE29},
-    {0x7B2C, 0xD862, 0xDE71},
-    {0x7B2D, 0xD862, 0xDE43},
-    {0x7B36, 0xD862, 0xDE99},
-    {0x7B37, 0xD862, 0xDECD},
-    {0x7B3D, 0xD862, 0xDEE4},
-    {0x7B3E, 0xD862, 0xDEDD},
-    {0x7B4E, 0xD862, 0xDFC1},
-    {0x7B4F, 0xD862, 0xDFEF},
-    {0x7B57, 0xD863, 0xDD10},
-    {0x7B5A, 0xD863, 0xDD71},
-    {0x7B5C, 0xD863, 0xDDFB},
-    {0x7B5D, 0xD863, 0xDE1F},
-    {0x7B61, 0xD863, 0xDE36},
-    {0x7B65, 0xD863, 0xDE89},
-    {0x7B67, 0xD863, 0xDEEB},
-    {0x7B69, 0xD863, 0xDF32},
-    {0x7B71, 0xD863, 0xDFF8},
-    {0x7C22, 0xD864, 0xDEA0},
-    {0x7C23, 0xD864, 0xDEB1},
-    {0x7C38, 0xD865, 0xDC90},
-    {0x7C42, 0xD865, 0xDDCF},
-    {0x7C4C, 0xD865, 0xDE7F},
-    {0x7C56, 0xD865, 0xDEF0},
-    {0x7C59, 0xD865, 0xDF19},
-    {0x7C5D, 0xD865, 0xDF50},
-    {0x7C76, 0xD866, 0xDCC6},
-    {0x7D2C, 0xD866, 0xDE72},
-    {0x7D4B, 0xD867, 0xDDDB},
-    {0x7D4C, 0xD867, 0xDE3D},
-    {0x7D59, 0xD867, 0xDE15},
-    {0x7D5B, 0xD867, 0xDE8A},
-    {0x7D5D, 0xD867, 0xDE49},
-    {0x7D67, 0xD867, 0xDEC4},
-    {0x7D6D, 0xD867, 0xDEE9},
-    {0x7D70, 0xD867, 0xDEDB},
-    {0x7E25, 0xD867, 0xDFCE},
-    {0x7E29, 0xD868, 0xDC2F},
-    {0x7E2B, 0xD868, 0xDC1A},
-    {0x7E32, 0xD868, 0xDCF9},
-    {0x7E35, 0xD868, 0xDC82},
-    {0x7E53, 0xD848, 0xDE18},
-    {0x7E58, 0xD868, 0xDF8C},
-    {0x7E5A, 0xD869, 0xDC37},
-    {0x7E6E, 0xD869, 0xDDF1},
-    {0x7E70, 0xD869, 0xDE02},
-    {0x7E72, 0xD869, 0xDE1A},
-    {0x7E76, 0xD869, 0xDEB2},
-};
-#endif /* UTF8_OUTPUT_ENABLE */
-
-#ifdef UTF8_INPUT_ENABLE
-static const unsigned short utf8_to_euc_C2[] = {
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0, 0xA242, 0x2171, 0x2172, 0xA270, 0x216F, 0xA243, 0x2178,
- 0x212F, 0xA26D, 0xA26C,      0, 0x224C,      0, 0xA26E, 0xA234,
- 0x216B, 0x215E,      0,      0, 0x212D,      0, 0x2279,      0,
- 0xA231,      0, 0xA26B,      0,      0,      0,      0, 0xA244,
-};
-static const unsigned short utf8_to_euc_C2_ms[] = {
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0, 0xA242, 0x2171, 0x2172, 0xA270,   0x5C, 0xA243, 0x2178,
- 0x212F, 0xA26D, 0xA26C,      0, 0x224C,      0, 0xA26E, 0xA234,
- 0x216B, 0x215E,      0,      0, 0x212D,      0, 0x2279,      0,
- 0xA231,      0, 0xA26B,      0,      0,      0,      0, 0xA244,
-};
-static const unsigned short utf8_to_euc_C2_mac[] = {
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
- 0x00A0, 0xA242, 0x2171, 0x2172, 0xA270,   0x5C, 0xA243, 0x2178,
- 0x212F, 0x00FD, 0xA26C,      0, 0x224C,      0, 0xA26E, 0xA234,
- 0x216B, 0x215E,      0,      0, 0x212D,      0, 0x2279,      0,
- 0xA231,      0, 0xA26B,      0,      0,      0,      0, 0xA244,
-};
-static const unsigned short utf8_to_euc_C2_932[] = {
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,   0x21, 0x2171, 0x2172,      0,   0x5C,   0x7C, 0x2178,
- 0x212F,   0x63,   0x61, 0x2263, 0x224C,   0x2D,   0x52, 0x2131,
- 0x216B, 0x215E,   0x32,   0x33, 0x212D, 0x264C, 0x2279, 0x2126,
- 0x2124,   0x31,   0x6F, 0x2264,      0,      0,      0,      0,
-};
-static const unsigned short utf8_to_euc_C2_x0213[] = {
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
- 0x2922, 0x2923, 0x2171, 0x2172, 0x2924, 0x216F, 0x2925, 0x2178,
- 0x212F, 0x2926, 0x2927, 0x2928, 0x224C, 0x2929, 0x292A, 0x292B,
- 0x216B, 0x215E, 0x292C, 0x292D, 0x212D,      0, 0x2279, 0x292E,
- 0x292F, 0x2930, 0x2931, 0x2932, 0x2933, 0x2934, 0x2935, 0x2936,
-};
-static const unsigned short utf8_to_euc_C3[] = {
- 0xAA22, 0xAA21, 0xAA24, 0xAA2A, 0xAA23, 0xAA29, 0xA921, 0xAA2E,
- 0xAA32, 0xAA31, 0xAA34, 0xAA33, 0xAA40, 0xAA3F, 0xAA42, 0xAA41,
-      0, 0xAA50, 0xAA52, 0xAA51, 0xAA54, 0xAA58, 0xAA53, 0x215F,
- 0xA92C, 0xAA63, 0xAA62, 0xAA65, 0xAA64, 0xAA72, 0xA930, 0xA94E,
- 0xAB22, 0xAB21, 0xAB24, 0xAB2A, 0xAB23, 0xAB29, 0xA941, 0xAB2E,
- 0xAB32, 0xAB31, 0xAB34, 0xAB33, 0xAB40, 0xAB3F, 0xAB42, 0xAB41,
- 0xA943, 0xAB50, 0xAB52, 0xAB51, 0xAB54, 0xAB58, 0xAB53, 0x2160,
- 0xA94C, 0xAB63, 0xAB62, 0xAB65, 0xAB64, 0xAB72, 0xA950, 0xAB73,
-};
-static const unsigned short utf8_to_euc_C3_932[] = {
-   0x41,   0x41,   0x41,   0x41,   0x41,   0x41,   0x41,   0x43,
-   0x45,   0x45,   0x45,   0x45,   0x49,   0x49,   0x49,   0x49,
-   0x44,   0x4E,   0x4F,   0x4F,   0x4F,   0x4F,   0x4F, 0x215F,
-   0x4F,   0x55,   0x55,   0x55,   0x55,   0x59,   0x54,   0x73,
-   0x61,   0x61,   0x61,   0x61,   0x61,   0x61,   0x61,   0x63,
-   0x65,   0x65,   0x65,   0x65,   0x69,   0x69,   0x69,   0x69,
-   0x64,   0x6E,   0x6F,   0x6F,   0x6F,   0x6F,   0x6F, 0x2160,
-   0x6F,   0x75,   0x75,   0x75,   0x75,   0x79,   0x74,   0x79,
-};
-static const unsigned short utf8_to_euc_C3_x0213[] = {
- 0x2937, 0x2938, 0x2939, 0x293A, 0x293B, 0x293C, 0x293D, 0x293E,
- 0x293F, 0x2940, 0x2941, 0x2942, 0x2943, 0x2944, 0x2945, 0x2946,
- 0x2947, 0x2948, 0x2949, 0x294A, 0x294B, 0x294C, 0x294D, 0x215F,
- 0x294E, 0x294F, 0x2950, 0x2951, 0x2952, 0x2953, 0x2954, 0x2955,
- 0x2956, 0x2957, 0x2958, 0x2959, 0x295A, 0x295B, 0x295C, 0x295D,
- 0x295E, 0x295F, 0x2960, 0x2961, 0x2962, 0x2963, 0x2964, 0x2965,
- 0x2966, 0x2967, 0x2968, 0x2969, 0x296A, 0x296B, 0x296C, 0x2160,
- 0x296D, 0x296E, 0x296F, 0x2970, 0x2971, 0x2972, 0x2973, 0x2974,
-};
-static const unsigned short utf8_to_euc_C4[] = {
- 0xAA27, 0xAB27, 0xAA25, 0xAB25, 0xAA28, 0xAB28, 0xAA2B, 0xAB2B,
- 0xAA2C, 0xAB2C, 0xAA2F, 0xAB2F, 0xAA2D, 0xAB2D, 0xAA30, 0xAB30,
- 0xA922, 0xA942, 0xAA37, 0xAB37,      0,      0, 0xAA36, 0xAB36,
- 0xAA38, 0xAB38, 0xAA35, 0xAB35, 0xAA3A, 0xAB3A, 0xAA3B, 0xAB3B,
- 0xAA3D, 0xAB3D, 0xAA3C,      0, 0xAA3E, 0xAB3E, 0xA924, 0xA944,
- 0xAA47, 0xAB47, 0xAA45, 0xAB45,      0,      0, 0xAA46, 0xAB46,
- 0xAA44, 0xA945, 0xA926, 0xA946, 0xAA48, 0xAB48, 0xAA49, 0xAB49,
- 0xA947, 0xAA4A, 0xAB4A, 0xAA4C, 0xAB4C, 0xAA4B, 0xAB4B, 0xA929,
-};
-static const unsigned short utf8_to_euc_C4_x0213[] = {
- 0x2975, 0x297A, 0x2A3A, 0x2A49, 0x2A21, 0x2A2C, 0x2A3C, 0x2A4B,
- 0x2A59, 0x2A5F, 0xAA2F, 0xAB2F, 0x2A3D, 0x2A4C, 0x2A40, 0x2A4F,
- 0xA922, 0x2A50, 0x2978, 0x297D,      0,      0, 0xAA36, 0xAB36,
- 0x2A3E, 0x2A4D, 0x2A3F, 0x2A4E, 0x2A5A, 0x2A60, 0xAA3B, 0xAB3B,
- 0xAA3D, 0xAB3D, 0xAA3C,      0, 0x2A5B, 0x2A61, 0xA924, 0x2A7D,
- 0xAA47, 0xAB47, 0x2976, 0x297B,      0,      0, 0xAA46, 0xAB46,
- 0xAA44, 0xA945, 0xA926, 0xA946, 0x2A5C, 0x2A62, 0xAA49, 0xAB49,
- 0xA947, 0x2A3B, 0x2A4A, 0xAA4C, 0xAB4C, 0x2A24, 0x2A2F, 0xA929,
-};
-static const unsigned short utf8_to_euc_C5[] = {
- 0xA949, 0xA928, 0xA948, 0xAA4D, 0xAB4D, 0xAA4F, 0xAB4F, 0xAA4E,
- 0xAB4E, 0xA94A, 0xA92B, 0xA94B, 0xAA57, 0xAB57,      0,      0,
- 0xAA56, 0xAB56, 0xA92D, 0xA94D, 0xAA59, 0xAB59, 0xAA5B, 0xAB5B,
- 0xAA5A, 0xAB5A, 0xAA5C, 0xAB5C, 0xAA5D, 0xAB5D, 0xAA5F, 0xAB5F,
- 0xAA5E, 0xAB5E, 0xAA61, 0xAB61, 0xAA60, 0xAB60, 0xA92F, 0xA94F,
- 0xAA6C, 0xAB6C, 0xAA69, 0xAB69, 0xAA66, 0xAB66, 0xAA6B, 0xAB6B,
- 0xAA68, 0xAB68, 0xAA6A, 0xAB6A, 0xAA71, 0xAB71, 0xAA74, 0xAB74,
- 0xAA73, 0xAA75, 0xAB75, 0xAA77, 0xAB77, 0xAA76, 0xAB76,      0,
-};
-static const unsigned short utf8_to_euc_C5_x0213[] = {
- 0xA949, 0x2A23, 0x2A2E, 0x2A41, 0x2A51, 0xAA4F, 0xAB4F, 0x2A42,
- 0x2A52, 0xA94A, 0xA92B, 0x2A7A, 0x2979, 0x297E,      0,      0,
- 0x2A43, 0x2A53, 0x2B2B, 0x2B2A, 0x2A39, 0x2A48, 0xAA5B, 0xAB5B,
- 0x2A44, 0x2A54, 0x2A25, 0x2A30, 0x2A5D, 0x2A63, 0x2A27, 0x2A33,
- 0x2A26, 0x2A32, 0x2A47, 0x2A57, 0x2A28, 0x2A34, 0xA92F, 0xA94F,
- 0xAA6C, 0xAB6C, 0x2977, 0x297C, 0x2A5E, 0x2A64, 0x2A45, 0x2A55,
- 0x2A46, 0x2A56, 0xAA6A, 0xAB6A, 0xAA71, 0xAB71, 0xAA74, 0xAB74,
- 0xAA73, 0x2A29, 0x2A35, 0x2A2B, 0x2A38, 0x2A2A, 0x2A37,      0,
-};
-static const unsigned short utf8_to_euc_C6_x0213[] = {
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0, 0x2B29,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-};
-static const unsigned short utf8_to_euc_C7[] = {
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0, 0xAA26, 0xAB26, 0xAA43,
- 0xAB43, 0xAA55, 0xAB55, 0xAA67, 0xAB67, 0xAA70, 0xAB70, 0xAA6D,
- 0xAB6D, 0xAA6F, 0xAB6F, 0xAA6E, 0xAB6E,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0, 0xAB39,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-};
-static const unsigned short utf8_to_euc_C7_x0213[] = {
-      0,      0, 0x2B24,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0, 0x286F, 0x2870, 0xAA43,
- 0x2871, 0x2876, 0x2877, 0xAA67, 0x2878, 0xAA70, 0x2879, 0xAA6D,
- 0x287A, 0xAA6F, 0x287B, 0xAA6E, 0x287C,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0, 0xAB39,      0,      0,
- 0x2874, 0x2875,      0,      0,      0, 0x2B45,      0,      0,
-};
-static const unsigned short utf8_to_euc_C9_x0213[] = {
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
- 0x2B33, 0x2B39, 0x2B3A, 0x2B25, 0x2B38, 0x2B3F, 0x2A6E, 0x2B26,
- 0x2B2E, 0x2B30, 0x2B43,      0, 0x2B31,      0, 0x2B32, 0x2A75,
- 0x2B28, 0x2A79,      0,      0, 0x2B36, 0x2B3C, 0x2B22, 0x2B42,
- 0x2B2C,      0,      0,      0, 0x2A6A, 0x2A74, 0x2A6B, 0x2B34,
- 0x2A7B, 0x2A65, 0x2A76, 0x2A6F,      0, 0x2B2F,      0,      0,
-      0, 0x2A6C, 0x2B41, 0x2A73,      0, 0x2A70, 0x2A67,      0,
-};
-static const unsigned short utf8_to_euc_CA_x0213[] = {
-      0, 0x2A7C, 0x2A71, 0x2A68, 0x2B27,      0,      0,      0,
- 0x2A6D, 0x2B2D, 0x2B35, 0x2A66, 0x2B37, 0x2B3B, 0x2A78,      0,
- 0x2A72, 0x2B40, 0x2A69,      0, 0x2B21, 0x2A7E,      0,      0,
- 0x2B23,      0,      0,      0,      0, 0x2A77,      0,      0,
-      0, 0x2B3E, 0x2B3D,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-};
-static const unsigned short utf8_to_euc_CB[] = {
-      0,      0,      0,      0,      0,      0,      0, 0xA230,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
- 0xA22F, 0xA232, 0xA236, 0xA235,      0, 0xA233,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-};
-static const unsigned short utf8_to_euc_CB_x0213[] = {
-      0,      0,      0,      0,      0,      0,      0, 0x2A31,
- 0x2B53,      0,      0,      0, 0x2B54,      0,      0,      0,
- 0x2B55, 0x2B56,      0,      0,      0,      0,      0,      0,
- 0x2A22, 0x2A58, 0xA236, 0x2A2D,      0, 0x2A36, 0x2B71,      0,
-      0,      0,      0,      0,      0, 0x2B60, 0x2B61, 0x2B62,
- 0x2B63, 0x2B64,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-};
-static const unsigned short utf8_to_euc_CC_x0213[] = {
- 0x2B5C, 0x2B5A, 0x2B5F, 0x2B7D, 0x2B5B,      0, 0x2B57,      0,
- 0x2B6D,      0,      0, 0x2B59, 0x2B5E,      0,      0, 0x2B5D,
-      0,      0,      0,      0,      0,      0,      0,      0,
- 0x2B78, 0x2B79, 0x2B7E,      0, 0x2B6A, 0x2B76, 0x2B77, 0x2B6B,
- 0x2B6C,      0,      0,      0, 0x2B72, 0x2B67,      0,      0,
-      0, 0x2B6F, 0x2B7A,      0, 0x2B68,      0,      0, 0x2B70,
- 0x2B73,      0,      0,      0, 0x2B75,      0,      0,      0,
-      0, 0x2B69, 0x2B7B, 0x2B7C, 0x2B74, 0x2B6E,      0,      0,
-};
-static const unsigned short utf8_to_euc_CD_x0213[] = {
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0, 0x2B52,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-};
-static const unsigned short utf8_to_euc_CE[] = {
-      0,      0,      0,      0, 0xA238, 0xA239, 0xA661,      0,
- 0xA662, 0xA663, 0xA664,      0, 0xA667,      0, 0xA669, 0xA66C,
- 0xA676, 0x2621, 0x2622, 0x2623, 0x2624, 0x2625, 0x2626, 0x2627,
- 0x2628, 0x2629, 0x262A, 0x262B, 0x262C, 0x262D, 0x262E, 0x262F,
- 0x2630, 0x2631,      0, 0x2632, 0x2633, 0x2634, 0x2635, 0x2636,
- 0x2637, 0x2638, 0xA665, 0xA66A, 0xA671, 0xA672, 0xA673, 0xA674,
- 0xA67B, 0x2641, 0x2642, 0x2643, 0x2644, 0x2645, 0x2646, 0x2647,
- 0x2648, 0x2649, 0x264A, 0x264B, 0x264C, 0x264D, 0x264E, 0x264F,
-};
-static const unsigned short utf8_to_euc_CF[] = {
- 0x2650, 0x2651, 0xA678, 0x2652, 0x2653, 0x2654, 0x2655, 0x2656,
- 0x2657, 0x2658, 0xA675, 0xA67A, 0xA677, 0xA679, 0xA67C,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-};
-static const unsigned short utf8_to_euc_CF_x0213[] = {
- 0x2650, 0x2651, 0x2659, 0x2652, 0x2653, 0x2654, 0x2655, 0x2656,
- 0x2657, 0x2658, 0xA675, 0xA67A, 0xA677, 0xA679, 0xA67C,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-};
-static const unsigned short utf8_to_euc_D0[] = {
-      0, 0x2727, 0xA742, 0xA743, 0xA744, 0xA745, 0xA746, 0xA747,
- 0xA748, 0xA749, 0xA74A, 0xA74B, 0xA74C,      0, 0xA74D, 0xA74E,
- 0x2721, 0x2722, 0x2723, 0x2724, 0x2725, 0x2726, 0x2728, 0x2729,
- 0x272A, 0x272B, 0x272C, 0x272D, 0x272E, 0x272F, 0x2730, 0x2731,
- 0x2732, 0x2733, 0x2734, 0x2735, 0x2736, 0x2737, 0x2738, 0x2739,
- 0x273A, 0x273B, 0x273C, 0x273D, 0x273E, 0x273F, 0x2740, 0x2741,
- 0x2751, 0x2752, 0x2753, 0x2754, 0x2755, 0x2756, 0x2758, 0x2759,
- 0x275A, 0x275B, 0x275C, 0x275D, 0x275E, 0x275F, 0x2760, 0x2761,
-};
-static const unsigned short utf8_to_euc_D1[] = {
- 0x2762, 0x2763, 0x2764, 0x2765, 0x2766, 0x2767, 0x2768, 0x2769,
- 0x276A, 0x276B, 0x276C, 0x276D, 0x276E, 0x276F, 0x2770, 0x2771,
-      0, 0x2757, 0xA772, 0xA773, 0xA774, 0xA775, 0xA776, 0xA777,
- 0xA778, 0xA779, 0xA77A, 0xA77B, 0xA77C,      0, 0xA77D, 0xA77E,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-};
-static const unsigned short utf8_to_euc_E1B8_x0213[] = {
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0, 0x2872, 0x2873,
-};
-static const unsigned short utf8_to_euc_E1BD_x0213[] = {
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
- 0x2B46, 0x2B47, 0x2B50, 0x2B51,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-};
-static const unsigned short utf8_to_euc_E280[] = {
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
- 0x213E,      0,      0,      0, 0x213D, 0x213D, 0x2142,      0,
- 0x2146, 0x2147,      0,      0, 0x2148, 0x2149,      0,      0,
- 0x2277, 0x2278,      0,      0,      0, 0x2145, 0x2144,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
- 0x2273,      0, 0x216C, 0x216D,      0,      0,      0,      0,
-      0,      0,      0, 0x2228,      0,      0, 0x2131,      0,
-};
-static const unsigned short utf8_to_euc_E280_ms[] = {
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
- 0x213E,      0,      0,      0, 0x213D, 0x213D, 0x2142,      0,
- 0x2146, 0x2147,      0,      0, 0x2148, 0x2149,      0,      0,
- 0x2277, 0x2278,      0,      0,      0, 0x2145, 0x2144,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
- 0x2273,      0, 0x216C, 0x216D,      0,      0,      0,      0,
-      0,      0,      0, 0x2228,      0,      0,   0x7E,      0,
-};
-static const unsigned short utf8_to_euc_E280_932[] = {
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
- 0x213E,      0,      0,      0,      0, 0x213D,      0,      0,
- 0x2146, 0x2147,      0,      0, 0x2148, 0x2149,      0,      0,
- 0x2277, 0x2278,      0,      0,      0, 0x2145, 0x2144,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
- 0x2273,      0, 0x216C, 0x216D,      0,      0,      0,      0,
-      0,      0,      0, 0x2228,      0,      0,      0,      0,
-};
-static const unsigned short utf8_to_euc_E280_x0213[] = {
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
- 0x213E,      0,      0, 0x237C, 0x213D, 0x213D, 0x2142,      0,
- 0x2146, 0x2147,      0,      0, 0x2148, 0x2149,      0,      0,
- 0x2277, 0x2278, 0x2340,      0,      0, 0x2145, 0x2144,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
- 0x2273,      0, 0x216C, 0x216D,      0,      0,      0,      0,
-      0,      0,      0, 0x2228, 0x286B,      0, 0x2131, 0x2B58,
-};
-static const unsigned short utf8_to_euc_E281_x0213[] = {
-      0,      0, 0x2C7E,      0,      0,      0,      0, 0x286C,
- 0x286D, 0x286E,      0,      0,      0,      0,      0,      0,
-      0, 0x2C7D,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-};
-static const unsigned short utf8_to_euc_E282_x0213[] = {
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0, 0x2921,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-};
-static const unsigned short utf8_to_euc_E284[] = {
-      0,      0,      0, 0x216E,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0, 0x2D62,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0, 0x2D64, 0xA26F,      0,      0,      0,      0,      0,
-      0,      0,      0, 0x2272,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-};
-static const unsigned short utf8_to_euc_E284_mac[] = {
-      0,      0,      0, 0x216E,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0, 0x2B7B,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0, 0x2B7D, 0x00FE,      0,      0,      0,      0,      0,
-      0,      0,      0, 0x2272,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-};
-static const unsigned short utf8_to_euc_E284_x0213[] = {
-      0,      0,      0, 0x216E,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0, 0x235D,
-      0,      0,      0, 0x235F,      0,      0, 0x2D62,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0, 0x2D64, 0xA26F,      0,      0,      0,      0, 0x2360,
-      0,      0,      0, 0x2272,      0,      0,      0,      0,
-      0,      0,      0,      0,      0, 0x235C,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-};
-static const unsigned short utf8_to_euc_E285[] = {
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
- 0x2D35, 0x2D36, 0x2D37, 0x2D38, 0x2D39, 0x2D3A, 0x2D3B, 0x2D3C,
- 0x2D3D, 0x2D3E,      0,      0,      0,      0,      0,      0,
- 0xF373, 0xF374, 0xF375, 0xF376, 0xF377, 0xF378, 0xF379, 0xF37A,
- 0xF37B, 0xF37C,      0,      0,      0,      0,      0,      0,
-};
-static const unsigned short utf8_to_euc_E285_mac[] = {
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
- 0x2A21, 0x2A22, 0x2A23, 0x2A24, 0x2A25, 0x2A26, 0x2A27, 0x2A28,
- 0x2A29, 0x2A2A,      0,      0,      0,      0,      0,      0,
- 0x2A35, 0x2A36, 0x2A37, 0x2A38, 0x2A39, 0x2A3A, 0x2A3B, 0x2A3C,
- 0x2A3D, 0x2A3E,      0,      0,      0,      0,      0,      0,
-};
-static const unsigned short utf8_to_euc_E285_x0213[] = {
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0, 0x2778, 0x2779, 0x277A,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
- 0x2D35, 0x2D36, 0x2D37, 0x2D38, 0x2D39, 0x2D3A, 0x2D3B, 0x2D3C,
- 0x2D3D, 0x2D3E, 0x2D3F, 0x2D57,      0,      0,      0,      0,
- 0x2C35, 0x2C36, 0x2C37, 0x2C38, 0x2C39, 0x2C3A, 0x2C3B, 0x2C3C,
- 0x2C3D, 0x2C3E, 0x2C3F, 0x2C40,      0,      0,      0,      0,
-};
-static const unsigned short utf8_to_euc_E286[] = {
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
- 0x222B, 0x222C, 0x222A, 0x222D,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-};
-static const unsigned short utf8_to_euc_E286_x0213[] = {
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
- 0x222B, 0x222C, 0x222A, 0x222D, 0x2271,      0, 0x2327, 0x2325,
- 0x2326, 0x2328,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-};
-static const unsigned short utf8_to_euc_E287[] = {
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0, 0x224D,      0, 0x224E,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-};
-static const unsigned short utf8_to_euc_E287_x0213[] = {
-      0,      0,      0,      0, 0x2329,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0, 0x224D,      0, 0x224E,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0, 0x232B, 0x232C,
- 0x232A, 0x232D,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-};
-static const unsigned short utf8_to_euc_E288[] = {
- 0x224F,      0, 0x225F, 0x2250,      0,      0,      0, 0x2260,
- 0x223A,      0,      0, 0x223B,      0,      0,      0,      0,
-      0, 0x2D74, 0x215D,      0,      0,      0,      0,      0,
-      0,      0, 0x2265,      0,      0, 0x2267, 0x2167, 0x2D78,
- 0x225C,      0,      0,      0,      0, 0x2142,      0, 0x224A,
- 0x224B, 0x2241, 0x2240, 0x2269, 0x226A,      0, 0x2D73,      0,
-      0,      0,      0,      0, 0x2168, 0x2268,      0,      0,
-      0,      0,      0,      0,      0, 0x2266,      0,      0,
-};
-static const unsigned short utf8_to_euc_E288_932[] = {
- 0x224F,      0, 0x225F, 0x2250,      0,      0,      0, 0x2260,
- 0x223A,      0,      0, 0x223B,      0,      0,      0,      0,
-      0, 0x2D74,      0,      0,      0,      0,      0,      0,
-      0,      0, 0x2265,      0,      0, 0x2267, 0x2167, 0x2D78,
- 0x225C,      0,      0,      0,      0, 0x2142,      0, 0x224A,
- 0x224B, 0x2241, 0x2240, 0x2269, 0x226A,      0, 0x2D73,      0,
-      0,      0,      0,      0, 0x2168, 0x2268,      0,      0,
-      0,      0,      0,      0,      0, 0x2266,      0,      0,
-};
-static const unsigned short utf8_to_euc_E288_mac[] = {
- 0x224F,      0, 0x225F, 0x2250,      0,      0,      0, 0x2260,
- 0x223A,      0,      0, 0x223B,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0, 0x2265,      0,      0, 0x2267, 0x2167, 0x2F22,
- 0x225C,      0,      0,      0,      0, 0x2142,      0, 0x224A,
- 0x224B, 0x2241, 0x2240, 0x2269, 0x226A,      0, 0x2F21,      0,
-      0,      0,      0,      0, 0x2168, 0x2268,      0,      0,
-      0,      0,      0,      0,      0, 0x2266,      0,      0,
-};
-static const unsigned short utf8_to_euc_E288_x0213[] = {
- 0x224F,      0, 0x225F, 0x2250,      0, 0x2247,      0, 0x2260,
- 0x223A, 0x2246,      0, 0x223B,      0,      0,      0,      0,
-      0, 0x2D74, 0x215D, 0x235B,      0,      0,      0,      0,
-      0,      0, 0x2265,      0,      0, 0x2267, 0x2167, 0x2D78,
- 0x225C,      0,      0,      0,      0, 0x2254, 0x2255, 0x224A,
- 0x224B, 0x2241, 0x2240, 0x2269, 0x226A,      0, 0x2D73,      0,
-      0,      0,      0,      0, 0x2168, 0x2268,      0,      0,
-      0,      0,      0,      0,      0, 0x2266,      0,      0,
-};
-static const unsigned short utf8_to_euc_E289[] = {
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0, 0x2262,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
- 0x2162, 0x2261,      0,      0,      0,      0, 0x2165, 0x2166,
-      0,      0, 0x2263, 0x2264,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-};
-static const unsigned short utf8_to_euc_E289_x0213[] = {
-      0,      0,      0, 0x226C,      0, 0x226D,      0,      0,
- 0x226E,      0,      0,      0,      0,      0,      0,      0,
-      0,      0, 0x2262,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
- 0x2162, 0x2261, 0x226B,      0,      0,      0, 0x2165, 0x2166,
-      0,      0, 0x2263, 0x2264,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0, 0x226F, 0x2270,
-      0,      0,      0,      0,      0,      0,      0,      0,
-};
-static const unsigned short utf8_to_euc_E28A[] = {
-      0,      0, 0x223E, 0x223F,      0,      0, 0x223C, 0x223D,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0, 0x225D,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0, 0x2D79,
-};
-static const unsigned short utf8_to_euc_E28A_mac[] = {
-      0,      0, 0x223E, 0x223F,      0,      0, 0x223C, 0x223D,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0, 0x225D,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0, 0x2F23,
-};
-static const unsigned short utf8_to_euc_E28A_x0213[] = {
-      0,      0, 0x223E, 0x223F, 0x2242, 0x2243, 0x223C, 0x223D,
-      0,      0, 0x2244, 0x2245,      0,      0,      0,      0,
-      0,      0,      0,      0,      0, 0x2251, 0x2252, 0x2253,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0, 0x225D,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0, 0x2D79,
-};
-static const unsigned short utf8_to_euc_E28B_x0213[] = {
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0, 0x2776, 0x2777,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-};
-static const unsigned short utf8_to_euc_E28C[] = {
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0, 0x225E,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-};
-static const unsigned short utf8_to_euc_E28C_x0213[] = {
-      0,      0,      0,      0,      0, 0x2248, 0x2249,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0, 0x225E,      0,      0,      0,      0,      0,
- 0x277C,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-};
-static const unsigned short utf8_to_euc_E28E_x0213[] = {
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0, 0x2742, 0x2743,
-};
-static const unsigned short utf8_to_euc_E28F_x0213[] = {
- 0x2744, 0x2745, 0x2746, 0x2747, 0x2748, 0x2749, 0x274A, 0x274B,
- 0x274C, 0x274D, 0x274E, 0x274F, 0x2750,      0, 0x277E,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-};
-static const unsigned short utf8_to_euc_E290_x0213[] = {
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0, 0x277D,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-};
-static const unsigned short utf8_to_euc_E291[] = {
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
- 0x2D21, 0x2D22, 0x2D23, 0x2D24, 0x2D25, 0x2D26, 0x2D27, 0x2D28,
- 0x2D29, 0x2D2A, 0x2D2B, 0x2D2C, 0x2D2D, 0x2D2E, 0x2D2F, 0x2D30,
- 0x2D31, 0x2D32, 0x2D33, 0x2D34,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-};
-static const unsigned short utf8_to_euc_E291_mac[] = {
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
- 0x2921, 0x2922, 0x2923, 0x2924, 0x2925, 0x2926, 0x2927, 0x2928,
- 0x2929, 0x292A, 0x292B, 0x292C, 0x292D, 0x292E, 0x292F, 0x2930,
- 0x2931, 0x2932, 0x2933, 0x2934,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-};
-static const unsigned short utf8_to_euc_E293_x0213[] = {
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
- 0x2C41, 0x2C42, 0x2C43, 0x2C44, 0x2C45, 0x2C46, 0x2C47, 0x2C48,
- 0x2C49, 0x2C4A, 0x2C4B, 0x2C4C, 0x2C4D, 0x2C4E, 0x2C4F, 0x2C50,
- 0x2C51, 0x2C52, 0x2C53, 0x2C54, 0x2C55, 0x2C56, 0x2C57, 0x2C58,
- 0x2C59, 0x2C5A,      0, 0x2C2B, 0x2C2C, 0x2C2D, 0x2C2E, 0x2C2F,
- 0x2C30, 0x2C31, 0x2C32, 0x2C33, 0x2C34, 0x265A, 0x265B, 0x265C,
- 0x265D, 0x265E, 0x265F, 0x2660, 0x2661, 0x2662, 0x2663,      0,
-};
-static const unsigned short utf8_to_euc_E294[] = {
- 0x2821, 0x282C, 0x2822, 0x282D,      0,      0,      0,      0,
-      0,      0,      0,      0, 0x2823,      0,      0, 0x282E,
- 0x2824,      0,      0, 0x282F, 0x2826,      0,      0, 0x2831,
- 0x2825,      0,      0, 0x2830, 0x2827, 0x283C,      0,      0,
- 0x2837,      0,      0, 0x2832, 0x2829, 0x283E,      0,      0,
- 0x2839,      0,      0, 0x2834, 0x2828,      0,      0, 0x2838,
- 0x283D,      0,      0, 0x2833, 0x282A,      0,      0, 0x283A,
- 0x283F,      0,      0, 0x2835, 0x282B,      0,      0, 0x283B,
-};
-static const unsigned short utf8_to_euc_E295[] = {
-      0,      0, 0x2840,      0,      0,      0,      0,      0,
-      0,      0,      0, 0x2836,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-};
-static const unsigned short utf8_to_euc_E296[] = {
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
- 0x2223, 0x2222,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0, 0x2225, 0x2224,      0,      0,      0,      0,
-      0,      0,      0,      0, 0x2227, 0x2226,      0,      0,
-};
-static const unsigned short utf8_to_euc_E296_x0213[] = {
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
- 0x2223, 0x2222,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0, 0x266D, 0x2225, 0x2224,      0,      0, 0x2322, 0x2321,
-      0,      0,      0,      0, 0x2227, 0x2226,      0,      0,
-};
-static const unsigned short utf8_to_euc_E297[] = {
-      0,      0,      0,      0,      0,      0, 0x2221, 0x217E,
-      0,      0,      0, 0x217B,      0,      0, 0x217D, 0x217C,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0, 0x227E,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-};
-static const unsigned short utf8_to_euc_E297_x0213[] = {
- 0x2324, 0x2323,      0,      0,      0,      0, 0x2221, 0x217E,
-      0, 0x233B,      0, 0x217B,      0,      0, 0x217D, 0x217C,
- 0x2867, 0x2868, 0x2869, 0x286A,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0, 0x233F,      0,
-      0,      0,      0,      0,      0,      0,      0, 0x227E,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-};
-static const unsigned short utf8_to_euc_E298[] = {
-      0,      0,      0,      0,      0, 0x217A, 0x2179,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-};
-static const unsigned short utf8_to_euc_E298_x0213[] = {
- 0x2668, 0x2669, 0x266A, 0x266B,      0, 0x217A, 0x2179,      0,
-      0,      0,      0,      0,      0,      0, 0x2667,      0,
-      0,      0,      0,      0,      0,      0, 0x2664, 0x2665,
-      0,      0,      0,      0,      0,      0, 0x2D7E,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-};
-static const unsigned short utf8_to_euc_E299[] = {
- 0x216A,      0, 0x2169,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0, 0x2276,      0,      0, 0x2275,      0, 0x2274,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-};
-static const unsigned short utf8_to_euc_E299_x0213[] = {
- 0x216A,      0, 0x2169,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
- 0x263A, 0x263D, 0x263B, 0x2640, 0x2639, 0x263E, 0x263C, 0x263F,
- 0x266C, 0x227D, 0x2276, 0x227B, 0x227C, 0x2275, 0x227A, 0x2274,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-};
-static const unsigned short utf8_to_euc_E29C_x0213[] = {
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0, 0x277B,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-};
-static const unsigned short utf8_to_euc_E29D_x0213[] = {
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0, 0x2D7D,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0, 0x2C21, 0x2C22,
- 0x2C23, 0x2C24, 0x2C25, 0x2C26, 0x2C27, 0x2C28, 0x2C29, 0x2C2A,
-};
-static const unsigned short utf8_to_euc_E2A4_x0213[] = {
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0, 0x232E, 0x232F,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-};
-static const unsigned short utf8_to_euc_E2A6_x0213[] = {
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0, 0x233A,
-};
-static const unsigned short utf8_to_euc_E2A7_x0213[] = {
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0, 0x237D, 0x237E,      0,      0,      0,      0,
-};
-static const unsigned short utf8_to_euc_E380[] = {
- 0x2121, 0x2122, 0x2123, 0x2137,      0, 0x2139, 0x213A, 0x213B,
- 0x2152, 0x2153, 0x2154, 0x2155, 0x2156, 0x2157, 0x2158, 0x2159,
- 0x215A, 0x215B, 0x2229, 0x222E, 0x214C, 0x214D,      0,      0,
-      0,      0,      0,      0, 0x2141, 0x2D60,      0, 0x2D61,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-};
-static const unsigned short utf8_to_euc_E380_932[] = {
- 0x2121, 0x2122, 0x2123, 0x2137,      0, 0x2139, 0x213A, 0x213B,
- 0x2152, 0x2153, 0x2154, 0x2155, 0x2156, 0x2157, 0x2158, 0x2159,
- 0x215A, 0x215B, 0x2229, 0x222E, 0x214C, 0x214D,      0,      0,
-      0,      0,      0,      0,      0, 0x2D60,      0, 0x2D61,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-};
-static const unsigned short utf8_to_euc_E380_x0213[] = {
- 0x2121, 0x2122, 0x2123, 0x2137,      0, 0x2139, 0x213A, 0x213B,
- 0x2152, 0x2153, 0x2154, 0x2155, 0x2156, 0x2157, 0x2158, 0x2159,
- 0x215A, 0x215B, 0x2229, 0x222E, 0x214C, 0x214D, 0x225A, 0x225B,
- 0x2258, 0x2259,      0,      0, 0x2141, 0x2D60,      0, 0x2D61,
- 0x2666,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0, 0x2233, 0x2234, 0x2235,      0,      0,
-      0,      0,      0, 0x2236, 0x2237, 0x233C,      0,      0,
-};
-static const unsigned short utf8_to_euc_E381[] = {
-      0, 0x2421, 0x2422, 0x2423, 0x2424, 0x2425, 0x2426, 0x2427,
- 0x2428, 0x2429, 0x242A, 0x242B, 0x242C, 0x242D, 0x242E, 0x242F,
- 0x2430, 0x2431, 0x2432, 0x2433, 0x2434, 0x2435, 0x2436, 0x2437,
- 0x2438, 0x2439, 0x243A, 0x243B, 0x243C, 0x243D, 0x243E, 0x243F,
- 0x2440, 0x2441, 0x2442, 0x2443, 0x2444, 0x2445, 0x2446, 0x2447,
- 0x2448, 0x2449, 0x244A, 0x244B, 0x244C, 0x244D, 0x244E, 0x244F,
- 0x2450, 0x2451, 0x2452, 0x2453, 0x2454, 0x2455, 0x2456, 0x2457,
- 0x2458, 0x2459, 0x245A, 0x245B, 0x245C, 0x245D, 0x245E, 0x245F,
-};
-static const unsigned short utf8_to_euc_E382[] = {
- 0x2460, 0x2461, 0x2462, 0x2463, 0x2464, 0x2465, 0x2466, 0x2467,
- 0x2468, 0x2469, 0x246A, 0x246B, 0x246C, 0x246D, 0x246E, 0x246F,
- 0x2470, 0x2471, 0x2472, 0x2473,      0,      0,      0,      0,
-      0,      0,      0, 0x212B, 0x212C, 0x2135, 0x2136,      0,
-      0, 0x2521, 0x2522, 0x2523, 0x2524, 0x2525, 0x2526, 0x2527,
- 0x2528, 0x2529, 0x252A, 0x252B, 0x252C, 0x252D, 0x252E, 0x252F,
- 0x2530, 0x2531, 0x2532, 0x2533, 0x2534, 0x2535, 0x2536, 0x2537,
- 0x2538, 0x2539, 0x253A, 0x253B, 0x253C, 0x253D, 0x253E, 0x253F,
-};
-static const unsigned short utf8_to_euc_E382_932[] = {
- 0x2460, 0x2461, 0x2462, 0x2463, 0x2464, 0x2465, 0x2466, 0x2467,
- 0x2468, 0x2469, 0x246A, 0x246B, 0x246C, 0x246D, 0x246E, 0x246F,
- 0x2470, 0x2471, 0x2472, 0x2473, 0x2574,      0,      0,      0,
-      0,      0,      0, 0x212B, 0x212C, 0x2135, 0x2136,      0,
-      0, 0x2521, 0x2522, 0x2523, 0x2524, 0x2525, 0x2526, 0x2527,
- 0x2528, 0x2529, 0x252A, 0x252B, 0x252C, 0x252D, 0x252E, 0x252F,
- 0x2530, 0x2531, 0x2532, 0x2533, 0x2534, 0x2535, 0x2536, 0x2537,
- 0x2538, 0x2539, 0x253A, 0x253B, 0x253C, 0x253D, 0x253E, 0x253F,
-};
-static const unsigned short utf8_to_euc_E382_x0213[] = {
- 0x2460, 0x2461, 0x2462, 0x2463, 0x2464, 0x2465, 0x2466, 0x2467,
- 0x2468, 0x2469, 0x246A, 0x246B, 0x246C, 0x246D, 0x246E, 0x246F,
- 0x2470, 0x2471, 0x2472, 0x2473, 0x2474, 0x2475, 0x2476,      0,
-      0,      0,      0, 0x212B, 0x212C, 0x2135, 0x2136, 0x2239,
- 0x237B, 0x2521, 0x2522, 0x2523, 0x2524, 0x2525, 0x2526, 0x2527,
- 0x2528, 0x2529, 0x252A, 0x252B, 0x252C, 0x252D, 0x252E, 0x252F,
- 0x2530, 0x2531, 0x2532, 0x2533, 0x2534, 0x2535, 0x2536, 0x2537,
- 0x2538, 0x2539, 0x253A, 0x253B, 0x253C, 0x253D, 0x253E, 0x253F,
-};
-static const unsigned short utf8_to_euc_E383[] = {
- 0x2540, 0x2541, 0x2542, 0x2543, 0x2544, 0x2545, 0x2546, 0x2547,
- 0x2548, 0x2549, 0x254A, 0x254B, 0x254C, 0x254D, 0x254E, 0x254F,
- 0x2550, 0x2551, 0x2552, 0x2553, 0x2554, 0x2555, 0x2556, 0x2557,
- 0x2558, 0x2559, 0x255A, 0x255B, 0x255C, 0x255D, 0x255E, 0x255F,
- 0x2560, 0x2561, 0x2562, 0x2563, 0x2564, 0x2565, 0x2566, 0x2567,
- 0x2568, 0x2569, 0x256A, 0x256B, 0x256C, 0x256D, 0x256E, 0x256F,
- 0x2570, 0x2571, 0x2572, 0x2573, 0x2574, 0x2575, 0x2576,      0,
-      0,      0,      0, 0x2126, 0x213C, 0x2133, 0x2134,      0,
-};
-static const unsigned short utf8_to_euc_E383_x0213[] = {
- 0x2540, 0x2541, 0x2542, 0x2543, 0x2544, 0x2545, 0x2546, 0x2547,
- 0x2548, 0x2549, 0x254A, 0x254B, 0x254C, 0x254D, 0x254E, 0x254F,
- 0x2550, 0x2551, 0x2552, 0x2553, 0x2554, 0x2555, 0x2556, 0x2557,
- 0x2558, 0x2559, 0x255A, 0x255B, 0x255C, 0x255D, 0x255E, 0x255F,
- 0x2560, 0x2561, 0x2562, 0x2563, 0x2564, 0x2565, 0x2566, 0x2567,
- 0x2568, 0x2569, 0x256A, 0x256B, 0x256C, 0x256D, 0x256E, 0x256F,
- 0x2570, 0x2571, 0x2572, 0x2573, 0x2574, 0x2575, 0x2576, 0x2772,
- 0x2773, 0x2774, 0x2775, 0x2126, 0x213C, 0x2133, 0x2134, 0x2238,
-};
-static const unsigned short utf8_to_euc_E387_x0213[] = {
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
- 0x266E, 0x266F, 0x2670, 0x2671, 0x2672, 0x2673, 0x2674, 0x2675,
- 0x2676, 0x2677, 0x2679, 0x267A, 0x267B, 0x267C, 0x267D, 0x267E,
-};
-static const unsigned short utf8_to_euc_E388[] = {
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0, 0x2D6A, 0x2D6B,      0,      0,      0,      0,      0,
-      0, 0x2D6C,      0,      0,      0,      0,      0,      0,
-};
-static const unsigned short utf8_to_euc_E388_mac[] = {
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0, 0x2D2E, 0x2D31,      0,      0,      0,      0,      0,
-      0, 0x2D2C,      0,      0,      0,      0,      0,      0,
-};
-static const unsigned short utf8_to_euc_E389_x0213[] = {
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0, 0x2841, 0x2842, 0x2843, 0x2844, 0x2845, 0x2846, 0x2847,
- 0x2848, 0x2849, 0x284A, 0x284B, 0x284C, 0x284D, 0x284E, 0x284F,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-};
-static const unsigned short utf8_to_euc_E38A[] = {
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0, 0x2D65, 0x2D66, 0x2D67, 0x2D68,
- 0x2D69,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-};
-static const unsigned short utf8_to_euc_E38A_mac[] = {
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0, 0x2D73, 0x2D74, 0x2D75, 0x2D76,
- 0x2D77,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-};
-static const unsigned short utf8_to_euc_E38A_x0213[] = {
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0, 0x2D65, 0x2D66, 0x2D67, 0x2D68,
- 0x2D69,      0,      0,      0,      0,      0,      0,      0,
-      0, 0x2850, 0x2851, 0x2852, 0x2853, 0x2854, 0x2855, 0x2856,
- 0x2857, 0x2858, 0x2859, 0x285A, 0x285B, 0x285C, 0x285D, 0x285E,
-};
-static const unsigned short utf8_to_euc_E38B_x0213[] = {
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
- 0x2C5B, 0x2C5C, 0x2C5D, 0x2C5E, 0x2C5F, 0x2C60, 0x2C61, 0x2C62,
- 0x2C63, 0x2C64, 0x2C65, 0x2C66, 0x2C67, 0x2C68, 0x2C69, 0x2C6A,
- 0x2C6B, 0x2C6C, 0x2C6D, 0x2C6E,      0, 0x2C71,      0,      0,
-      0, 0x2C70,      0,      0, 0x2C73, 0x2C72,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0, 0x2C6F,      0,      0,      0,      0,      0,
-};
-static const unsigned short utf8_to_euc_E38C[] = {
-      0,      0,      0, 0x2D46,      0,      0,      0,      0,
-      0,      0,      0,      0,      0, 0x2D4A,      0,      0,
-      0,      0,      0,      0, 0x2D41,      0,      0,      0,
- 0x2D44,      0,      0,      0,      0,      0,      0,      0,
-      0,      0, 0x2D42, 0x2D4C,      0,      0, 0x2D4B, 0x2D45,
-      0,      0,      0, 0x2D4D,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0, 0x2D47,      0,
-      0,      0,      0, 0x2D4F,      0,      0,      0,      0,
-};
-static const unsigned short utf8_to_euc_E38C_mac[] = {
-      0,      0,      0, 0x2E29,      0,      0,      0,      0,
-      0,      0,      0,      0,      0, 0x2E32,      0,      0,
-      0,      0,      0,      0, 0x2E24,      0,      0,      0,
- 0x2E2B,      0,      0,      0,      0,      0,      0,      0,
-      0,      0, 0x2E22, 0x2E34,      0,      0, 0x2E35, 0x2E2D,
-      0,      0,      0, 0x2E37,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0, 0x2E2A,      0,
-      0,      0,      0, 0x2E36,      0,      0,      0,      0,
-};
-static const unsigned short utf8_to_euc_E38D[] = {
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0, 0x2D40, 0x2D4E,      0,      0, 0x2D43,      0,      0,
-      0, 0x2D48,      0,      0,      0,      0,      0, 0x2D49,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0, 0x2D5F, 0x2D6F, 0x2D6E, 0x2D6D,      0,
-};
-static const unsigned short utf8_to_euc_E38D_mac[] = {
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0, 0x2E21, 0x2E2F,      0,      0, 0x2E23,      0,      0,
-      0, 0x2E2E,      0,      0,      0,      0,      0, 0x2E31,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0, 0x2E6A, 0x2E69, 0x2E68, 0x2E67,      0,
-};
-static const unsigned short utf8_to_euc_E38E[] = {
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0, 0x2D53, 0x2D54,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0, 0x2D50, 0x2D51, 0x2D52,      0,
-      0, 0x2D56,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-};
-static const unsigned short utf8_to_euc_E38E_mac[] = {
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0, 0x2B2B, 0x2B2D,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0, 0x2B21, 0x2B23, 0x2B29,      0,
-      0, 0x2B27,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-};
-static const unsigned short utf8_to_euc_E38F[] = {
-      0,      0,      0,      0, 0x2D55,      0,      0,      0,
-      0,      0,      0,      0,      0, 0x2D63,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-};
-static const unsigned short utf8_to_euc_E38F_mac[] = {
-      0,      0,      0,      0, 0x2B2E,      0,      0,      0,
-      0,      0,      0,      0,      0, 0x2B7C,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-};
-static const unsigned short utf8_to_euc_E38F_x0213[] = {
-      0,      0,      0,      0, 0x2D55,      0,      0,      0,
-      0,      0,      0, 0x235E,      0, 0x2D63,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-};
-static const unsigned short utf8_to_euc_E390_x0213[] = {
-      0,      0, 0x2E23,      0,      0,      0, 0xA12D,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0, 0xA132,      0, 0xA133,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-};
-static const unsigned short utf8_to_euc_E391_x0213[] = {
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
- 0xA15E,      0, 0xA156,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-};
-static const unsigned short utf8_to_euc_E392_x0213[] = {
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0, 0xA17E,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0, 0x2E53,      0,      0,
-      0,      0,      0,      0, 0xA32B,      0,      0,      0,
-};
-static const unsigned short utf8_to_euc_E393_x0213[] = {
-      0, 0xF468,      0,      0,      0,      0,      0, 0xA32F,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0, 0x2E5B,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-};
-static const unsigned short utf8_to_euc_E394_x0213[] = {
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0, 0xA348,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-};
-static const unsigned short utf8_to_euc_E395_x0213[] = {
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0, 0xA35D, 0xA35E,      0,
-      0,      0,      0, 0xA361,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0, 0xA367,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-};
-static const unsigned short utf8_to_euc_E396_x0213[] = {
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0, 0xA423,      0,
- 0xA426,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-};
-static const unsigned short utf8_to_euc_E397_x0213[] = {
-      0,      0,      0,      0,      0, 0xA42F,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0, 0xA438,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0, 0xA442,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-};
-static const unsigned short utf8_to_euc_E398_x0213[] = {
-      0,      0,      0,      0,      0, 0xA44A,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-};
-static const unsigned short utf8_to_euc_E399_x0213[] = {
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0, 0xA479,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-};
-static const unsigned short utf8_to_euc_E39A_x0213[] = {
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0, 0xA53F,      0,      0,      0,      0, 0xA543,      0,
-      0, 0xA541,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-};
-static const unsigned short utf8_to_euc_E39B_x0213[] = {
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0, 0xA557,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-};
-static const unsigned short utf8_to_euc_E39D_x0213[] = {
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0, 0xA823, 0xA825,      0,      0,      0,      0,      0,
-      0,      0,      0, 0xA829, 0xA828,      0,      0,      0,
-      0,      0,      0,      0,      0, 0xA82C,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-};
-static const unsigned short utf8_to_euc_E39E_x0213[] = {
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0, 0x4F5F,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-};
-static const unsigned short utf8_to_euc_E39F_x0213[] = {
-      0, 0xA83E,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0, 0x4F6F,      0,      0,      0,      0,      0,
- 0xA856,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0, 0xA859,      0,      0,      0,
-      0,      0,      0,      0,      0, 0xA85C,      0,      0,
-};
-static const unsigned short utf8_to_euc_E3A0_x0213[] = {
- 0xA85E,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0, 0xA86F,
-      0,      0,      0,      0,      0,      0, 0xA871,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-};
-static const unsigned short utf8_to_euc_E3A1_x0213[] = {
- 0xA874,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0, 0xA879,      0,      0,      0,
-      0, 0xA87B,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-};
-static const unsigned short utf8_to_euc_E3A3_x0213[] = {
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0, 0xAC3B,      0,      0,      0,      0,      0,
-};
-static const unsigned short utf8_to_euc_E3A4_x0213[] = {
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0, 0xAC46,
-      0,      0, 0xAC4A,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-};
-static const unsigned short utf8_to_euc_E3A5_x0213[] = {
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0, 0xAC60,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-};
-static const unsigned short utf8_to_euc_E3A9_x0213[] = {
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0, 0xAD5B,      0,
-      0,      0,      0, 0xAD5F,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-};
-static const unsigned short utf8_to_euc_E3AB_x0213[] = {
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0, 0xAD71, 0xAE36,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0, 0xAD7C,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-};
-static const unsigned short utf8_to_euc_E3AC_x0213[] = {
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0, 0xAE2E,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0, 0xAE32,      0, 0xAE34,      0,      0,      0,
-      0,      0, 0x7549,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-};
-static const unsigned short utf8_to_euc_E3AD_x0213[] = {
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0, 0xAE6D,      0,      0,
-      0,      0,      0,      0,      0,      0,      0, 0xAE65,
-      0,      0,      0,      0,      0,      0,      0,      0,
-};
-static const unsigned short utf8_to_euc_E3AE_x0213[] = {
-      0,      0,      0,      0,      0,      0,      0, 0xAF28,
- 0xAF29,      0,      0,      0,      0, 0xAF2C,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0, 0xAF34,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0, 0x757E,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-};
-static const unsigned short utf8_to_euc_E3AF_x0213[] = {
-      0,      0,      0, 0x7621,      0,      0,      0,      0,
-      0,      0,      0,      0,      0, 0xAF48,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
- 0xAF5D,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-};
-static const unsigned short utf8_to_euc_E3B0_x0213[] = {
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0, 0x763A,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0, 0xAF77,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-};
-static const unsigned short utf8_to_euc_E3B3_x0213[] = {
-      0,      0,      0, 0xEE3B,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0, 0xEE42,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-};
-static const unsigned short utf8_to_euc_E3B4_x0213[] = {
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0, 0xEE71,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0, 0xEE7E,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-};
-static const unsigned short utf8_to_euc_E3B5_x0213[] = {
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0, 0xEF40,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-};
-static const unsigned short utf8_to_euc_E3B6_x0213[] = {
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0, 0xEF54,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-};
-static const unsigned short utf8_to_euc_E3B7_x0213[] = {
- 0xEF70,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0, 0xEF77,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-};
-static const unsigned short utf8_to_euc_E3B8_x0213[] = {
-      0,      0,      0,      0,      0, 0xF028,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0, 0x7766,
-};
-static const unsigned short utf8_to_euc_E3B9_x0213[] = {
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
- 0xF03F,      0,      0,      0,      0,      0, 0xF041,      0,
- 0xF042,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-};
-static const unsigned short utf8_to_euc_E3BA_x0213[] = {
-      0,      0,      0, 0xF049,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0, 0xF050,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-};
-static const unsigned short utf8_to_euc_E3BD_x0213[] = {
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0, 0xF134,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0, 0x784D,      0,      0, 0xF146,      0, 0xF148,
-      0,      0,      0,      0,      0,      0,      0,      0,
-};
-static const unsigned short utf8_to_euc_E3BE_x0213[] = {
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0, 0xF15C,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-};
-static const unsigned short utf8_to_euc_E3BF_x0213[] = {
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0, 0xF167,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0, 0xF16C,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-};
-static const unsigned short utf8_to_euc_E480_x0213[] = {
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0, 0xF222,      0,      0,      0,      0,      0,      0,
-};
-static const unsigned short utf8_to_euc_E481_x0213[] = {
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
- 0xF22D,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-};
-static const unsigned short utf8_to_euc_E482_x0213[] = {
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0, 0xF239,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-};
-static const unsigned short utf8_to_euc_E484_x0213[] = {
-      0,      0,      0,      0,      0, 0xF264,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-};
-static const unsigned short utf8_to_euc_E485_x0213[] = {
-      0,      0,      0,      0,      0,      0,      0,      0,
- 0xF274,      0,      0,      0,      0,      0,      0, 0xF277,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0, 0xF27D,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-};
-static const unsigned short utf8_to_euc_E486_x0213[] = {
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0, 0xF333,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0, 0xF337,
-};
-static const unsigned short utf8_to_euc_E487_x0213[] = {
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0, 0xF347,      0,
-      0,      0,      0,      0,      0,      0, 0xF34B,      0,
-      0,      0,      0, 0xF348,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-};
-static const unsigned short utf8_to_euc_E488_x0213[] = {
-      0,      0,      0,      0,      0,      0,      0, 0xF353,
-      0,      0,      0,      0,      0,      0, 0xF357,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-};
-static const unsigned short utf8_to_euc_E489_x0213[] = {
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0, 0x796D,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-};
-static const unsigned short utf8_to_euc_E48B_x0213[] = {
-      0,      0,      0,      0,      0,      0, 0xF42B,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0, 0xF436,      0,
-      0,      0,      0,      0,      0, 0xF43B,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-};
-static const unsigned short utf8_to_euc_E48C_x0213[] = {
-      0,      0, 0xF44E,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0, 0xF45D,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-};
-static const unsigned short utf8_to_euc_E48D_x0213[] = {
-      0,      0,      0, 0xF461,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-};
-static const unsigned short utf8_to_euc_E48F_x0213[] = {
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0, 0xF53E,      0,
- 0xF542,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-};
-static const unsigned short utf8_to_euc_E490_x0213[] = {
-      0,      0,      0,      0,      0,      0,      0,      0,
- 0xF548,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0, 0xF54A,
-      0,      0,      0,      0, 0xF54C,      0,      0,      0,
-      0,      0, 0xF54F,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-};
-static const unsigned short utf8_to_euc_E491_x0213[] = {
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0, 0x7A59,      0,      0,      0,      0,
-      0,      0,      0, 0x7A5A,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0, 0xF56C,      0,
-      0,      0, 0xF56E,      0,      0,      0,      0,      0,
-};
-static const unsigned short utf8_to_euc_E492_x0213[] = {
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0, 0xF577,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0, 0xF635,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0, 0xF632,      0,
-};
-static const unsigned short utf8_to_euc_E493_x0213[] = {
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0, 0xF634,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-};
-static const unsigned short utf8_to_euc_E494_x0213[] = {
-      0,      0,      0,      0,      0,      0,      0,      0,
- 0xF659,      0,      0,      0,      0, 0xF654,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0, 0xF66D,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-};
-static const unsigned short utf8_to_euc_E495_x0213[] = {
-      0,      0,      0, 0xF66E,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-};
-static const unsigned short utf8_to_euc_E496_x0213[] = {
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0, 0x7B51,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
- 0xF74F,      0,      0,      0,      0,      0,      0,      0,
-};
-static const unsigned short utf8_to_euc_E497_x0213[] = {
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0, 0xF76C,      0,      0,
-      0,      0, 0x7B60,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-};
-static const unsigned short utf8_to_euc_E498_x0213[] = {
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0, 0xF824,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-};
-static const unsigned short utf8_to_euc_E499_x0213[] = {
-      0, 0xF83A,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0, 0xF843,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-};
-static const unsigned short utf8_to_euc_E49A_x0213[] = {
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0, 0xF84E,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0, 0xF853,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-};
-static const unsigned short utf8_to_euc_E49C_x0213[] = {
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0, 0xF86B,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-};
-static const unsigned short utf8_to_euc_E49D_x0213[] = {
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0, 0xF929,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-};
-static const unsigned short utf8_to_euc_E49F_x0213[] = {
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0, 0xF93F,      0,      0,
-};
-static const unsigned short utf8_to_euc_E4A0_x0213[] = {
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0, 0xF949,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-};
-static const unsigned short utf8_to_euc_E4A1_x0213[] = {
-      0,      0,      0,      0, 0x7C4B,      0,      0,      0,
-      0,      0,      0,      0,      0,      0, 0xF95C,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-};
-static const unsigned short utf8_to_euc_E4A2_x0213[] = {
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0, 0xFA27,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-};
-static const unsigned short utf8_to_euc_E4A6_x0213[] = {
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
- 0x7D58,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-};
-static const unsigned short utf8_to_euc_E4A7_x0213[] = {
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0, 0xFB6A,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0, 0xFB70,      0,      0,      0,      0,      0,
-};
-static const unsigned short utf8_to_euc_E4A8_x0213[] = {
-      0,      0,      0,      0, 0xFB75,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0, 0xFB78,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-};
-static const unsigned short utf8_to_euc_E4AA_x0213[] = {
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0, 0xFC37,      0,      0,      0,
-};
-static const unsigned short utf8_to_euc_E4AC_x0213[] = {
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0, 0xFC55,      0,      0,      0,      0,
-};
-static const unsigned short utf8_to_euc_E4AF_x0213[] = {
-      0,      0, 0xFD26,      0,      0,      0,      0,      0,
-      0,      0, 0xFD28,      0,      0,      0,      0,      0,
-      0,      0, 0xFD2A,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
- 0xFD31,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-};
-static const unsigned short utf8_to_euc_E4B0_x0213[] = {
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0, 0x7E3E,
-      0,      0,      0,      0,      0,      0,      0,      0,
- 0xFD3F,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-};
-static const unsigned short utf8_to_euc_E4B3_x0213[] = {
-      0,      0,      0,      0, 0xFE2A,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0, 0xFE2D,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-};
-static const unsigned short utf8_to_euc_E4B4_x0213[] = {
-      0,      0,      0,      0,      0,      0,      0, 0xFE4B,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-};
-static const unsigned short utf8_to_euc_E4B5_x0213[] = {
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0, 0xFE60,
-      0,      0,      0,      0,      0,      0,      0,      0,
-};
-static const unsigned short utf8_to_euc_E4B8[] = {
- 0x306C, 0x437A, 0xB021, 0x3C37, 0xB022, 0xB023,      0, 0x4B7C,
- 0x3E66, 0x3B30, 0x3E65, 0x323C, 0xB024, 0x4954, 0x4D3F,      0,
- 0x5022, 0x312F, 0xB025,      0, 0x336E, 0x5023, 0x4024, 0x5242,
- 0x3556, 0x4A3A,      0,      0,      0,      0, 0x3E67, 0xB026,
-      0, 0x4E3E,      0, 0xB027, 0xB028,      0, 0x4A42,      0,
- 0xB029,      0, 0x5024, 0xB02A,      0, 0x4366, 0xB02B, 0xB02C,
- 0xB02D, 0x5025, 0x367A,      0,      0, 0xB02E, 0x5026,      0,
- 0x345D, 0x4330,      0, 0x3C67, 0x5027,      0,      0, 0x5028,
-};
-static const unsigned short utf8_to_euc_E4B8_x0213[] = {
- 0x306C, 0x437A, 0xA122, 0x3C37, 0xB022, 0xB023,      0, 0x4B7C,
- 0x3E66, 0x3B30, 0x3E65, 0x323C, 0xB024, 0x4954, 0x4D3F, 0xA123,
- 0x5022, 0x312F, 0xA124,      0, 0x336E, 0x5023, 0x4024, 0x5242,
- 0x3556, 0x4A3A,      0,      0,      0,      0, 0x3E67, 0xB026,
-      0, 0x4E3E,      0, 0xB027, 0xB028,      0, 0x4A42,      0,
- 0x2E24, 0xA125, 0x5024, 0xA126, 0xF02E, 0x4366, 0xA127, 0x2E25,
- 0x2E26, 0x5025, 0x367A,      0,      0, 0xB02E, 0x5026,      0,
- 0x345D, 0x4330,      0, 0x3C67, 0x5027,      0,      0, 0x5028,
-};
-static const unsigned short utf8_to_euc_E4B9[] = {
- 0xB02F, 0xB030, 0x5029, 0x4735, 0xB031, 0x3557,      0, 0xB032,
-      0,      0,      0, 0x4737,      0, 0x4663, 0x3843, 0x4B33,
-      0, 0xB033,      0,      0,      0, 0x6949, 0x502A, 0x3E68,
- 0x502B, 0x3235, 0xB034,      0, 0xB035, 0x3665, 0x3870, 0x4C69,
-      0,      0, 0x5626, 0xB036,      0,      0,      0,      0,
- 0xB037, 0xB038,      0,      0,      0,      0,      0,      0,
-      0, 0x4D70,      0, 0x467D, 0xB039, 0xB03A,      0,      0,
-      0, 0xB03B,      0,      0,      0,      0, 0x3425, 0xB03C,
-};
-static const unsigned short utf8_to_euc_E4B9_x0213[] = {
- 0xA128, 0xB030, 0x5029, 0x4735, 0xB031, 0x3557,      0, 0xA129,
- 0xA12A,      0,      0, 0x4737,      0, 0x4663, 0x3843, 0x4B33,
-      0, 0xA12C,      0,      0,      0, 0x6949, 0x502A, 0x3E68,
- 0x502B, 0x3235, 0xA12F,      0, 0xB035, 0x3665, 0x3870, 0x4C69,
-      0,      0, 0x5626, 0xB036,      0,      0,      0,      0,
- 0xB037, 0xA130,      0,      0,      0,      0,      0,      0,
-      0, 0x4D70,      0, 0x467D, 0xB039, 0xB03A,      0,      0,
-      0, 0xB03B,      0,      0,      0,      0, 0x3425, 0xB03C,
-};
-static const unsigned short utf8_to_euc_E4BA[] = {
- 0x3535,      0, 0x502C,      0,      0, 0x502D, 0x4E3B,      0,
- 0x4D3D, 0x4168, 0x502F, 0x3B76, 0x4673, 0xB03D, 0x5032,      0,
-      0, 0x313E, 0x385F,      0, 0x385E, 0x3066, 0xB03E, 0xB03F,
- 0x4F4B, 0x4F4A,      0, 0x3A33, 0x3021, 0xB040, 0x5033, 0x5034,
- 0x5035, 0x4B34, 0x5036,      0, 0x3872, 0x3067, 0x4B72,      0,
- 0x357C,      0,      0, 0x357D, 0x357E, 0x4462, 0x4E3C, 0xB041,
- 0x5037,      0,      0, 0x5038,      0,      0, 0x5039,      0,
-      0, 0xB042, 0x3F4D,      0,      0,      0,      0,      0,
-};
-static const unsigned short utf8_to_euc_E4BA_x0213[] = {
- 0x3535,      0, 0x502C,      0,      0, 0x502D, 0x4E3B,      0,
- 0x4D3D, 0x4168, 0x502F, 0x3B76, 0x4673, 0x2E27, 0x5032,      0,
-      0, 0x313E, 0x385F,      0, 0x385E, 0x3066, 0xB03E, 0xB03F,
- 0x4F4B, 0x4F4A,      0, 0x3A33, 0x3021, 0xA131, 0x5033, 0x5034,
- 0x5035, 0x4B34, 0x5036,      0, 0x3872, 0x3067, 0x4B72,      0,
- 0x357C,      0,      0, 0x357D, 0x357E, 0x4462, 0x4E3C, 0xB041,
- 0x5037,      0,      0, 0x5038,      0,      0, 0x5039,      0,
-      0, 0xA134, 0x3F4D, 0xA135, 0xA137,      0,      0,      0,
-};
-static const unsigned short utf8_to_euc_E4BB[] = {
- 0x3D3A, 0x3F4E, 0x503E, 0xB043, 0x503C,      0, 0x503D, 0x3558,
-      0,      0, 0x3A23, 0x3270,      0, 0x503B, 0x503A, 0x4A29,
- 0xB044,      0,      0,      0, 0x3B46, 0x3B45, 0x423E, 0x503F,
- 0x4955, 0x4067, 0xB045, 0xB046,      0, 0x2138, 0x5040, 0x5042,
- 0xB047, 0xB048, 0xB049, 0x4265, 0x4E61, 0x304A,      0,      0,
- 0xB04A,      0,      0,      0,      0, 0x5041, 0x323E, 0xB04B,
- 0x3644, 0xB04C, 0x4367, 0xB04D,      0, 0xB04E, 0x376F, 0x5043,
-      0,      0,      0, 0x4724, 0xF42F, 0xB04F, 0xB050, 0xB051,
-};
-static const unsigned short utf8_to_euc_E4BB_x0213[] = {
- 0x3D3A, 0x3F4E, 0x503E, 0xA138, 0x503C,      0, 0x503D, 0x3558,
- 0xA139,      0, 0x3A23, 0x3270,      0, 0x503B, 0x503A, 0x4A29,
- 0xA13A,      0,      0,      0, 0x3B46, 0x3B45, 0x423E, 0x503F,
- 0x4955, 0x4067, 0xA13C, 0xB046,      0, 0x2138, 0x5040, 0x5042,
- 0xB047, 0x2E28, 0xB049, 0x4265, 0x4E61, 0x304A,      0,      0,
- 0xB04A,      0,      0, 0xA13B,      0, 0x5041, 0x323E, 0xB04B,
- 0x3644, 0xA13D, 0x4367, 0xB04D,      0, 0xA13E, 0x376F, 0x5043,
-      0,      0,      0, 0x4724,      0, 0x2E29, 0xB050, 0x2E2A,
-};
-static const unsigned short utf8_to_euc_E4BC[] = {
- 0xB052, 0x346B, 0xB053, 0xB054,      0,      0,      0,      0,
- 0xB055, 0x5044, 0x304B, 0xB056, 0xB057, 0x3860, 0x346C, 0x497A,
- 0x4832, 0x3559, 0xB058,      0,      0, 0xB059, 0xB05A, 0xB05B,
-      0, 0xB05C, 0x3271,      0, 0x5067, 0x4541,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0, 0xB05D, 0x476C,
- 0x5046, 0xB05E,      0, 0xB060, 0x483C, 0xB061, 0x4E62, 0xB062,
- 0x3F2D, 0xB063, 0x3B47, 0xB064, 0x3B77, 0x3240, 0xB065,      0,
-};
-static const unsigned short utf8_to_euc_E4BC_x0213[] = {
- 0xA13F, 0x346B, 0xB053, 0x2E2B,      0,      0,      0,      0,
- 0xB055, 0x5044, 0x304B, 0x2E2C, 0xB057, 0x3860, 0x346C, 0x497A,
- 0x4832, 0x3559, 0xB058,      0,      0, 0xB059, 0xA140, 0xB05B,
-      0, 0xB05C, 0x3271,      0, 0x5067, 0x4541,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0, 0xB05D, 0x476C,
- 0x5046, 0xB05E,      0, 0xB060, 0x483C, 0xB061, 0x4E62, 0xA142,
- 0x3F2D,      0, 0x3B47, 0xB064, 0x3B77, 0x3240, 0xA143,      0,
-};
-static const unsigned short utf8_to_euc_E4BD[] = {
- 0xB066,      0, 0xB067, 0x4451,      0,      0, 0x4322, 0x504A,
- 0xB068, 0xB069,      0, 0xB06A, 0xB06B, 0x304C, 0x4463, 0x3D3B,
- 0x3A34, 0x4D24, 0xB06C, 0x424E, 0xB06D, 0x323F, 0xB06E, 0x5049,
- 0xB06F, 0x4D3E, 0x5045, 0x5047, 0x3A6E, 0x5048, 0x5524, 0xB070,
- 0xB05F,      0,      0, 0xB071,      0,      0,      0,      0,
-      0, 0x5050, 0xB072,      0, 0xB073,      0, 0xB074, 0x5053,
- 0x5051, 0xB075,      0, 0x3242,      0, 0x4A3B, 0x504B, 0xB076,
- 0xB077, 0xB078, 0xB079, 0x504F, 0x3873, 0xB07A, 0xB07B, 0x3B48,
-};
-static const unsigned short utf8_to_euc_E4BD_x0213[] = {
- 0xB066,      0, 0xB067, 0x4451,      0,      0, 0x4322, 0x504A,
- 0x2E2E, 0x2E2F,      0, 0xB06A, 0xB06B, 0x304C, 0x4463, 0x3D3B,
- 0x3A34, 0x4D24, 0xB06C, 0x424E, 0xA144, 0x323F, 0x2E30, 0x5049,
- 0xA145, 0x4D3E, 0x5045, 0x5047, 0x3A6E, 0x5048, 0x5524, 0x2E31,
- 0x2E2D,      0,      0, 0xB071, 0xA141,      0,      0,      0,
-      0, 0x5050, 0x2E32,      0, 0x2E33,      0, 0xB074, 0x5053,
- 0x5051, 0xB075,      0, 0x3242,      0, 0x4A3B, 0x504B, 0xA147,
- 0xA148, 0xB078, 0xA149, 0x504F, 0x3873, 0xA14A, 0x2E34, 0x3B48,
-};
-static const unsigned short utf8_to_euc_E4BE[] = {
-      0, 0xB07C, 0xB07D, 0x3426, 0xB07E, 0xB121, 0x5054,      0,
- 0x504C, 0xB122, 0xB123, 0x4E63, 0xB124, 0x3B78, 0xB125, 0x504D,
- 0xB126, 0x5052, 0xB127, 0xB128, 0xB129,      0, 0x5055, 0xB12A,
- 0x504E, 0xB12B, 0xB12C, 0x3621,      0, 0x304D, 0xB12D, 0xB12E,
- 0x3622, 0x3241,      0,      0,      0,      0,      0,      0,
-      0,      0,      0, 0x5525,      0, 0x4B79, 0x496E, 0x3874,
-      0,      0, 0xB12F,      0,      0, 0x3F2F, 0x4E37, 0xB130,
-      0, 0xB131,      0, 0xB132, 0xB133, 0xB134, 0xB135, 0x4A58,
-};
-static const unsigned short utf8_to_euc_E4BE_x0213[] = {
-      0, 0xB07C, 0xA14B, 0x3426, 0xB07E, 0xA14C, 0x5054,      0,
- 0x504C, 0xB122, 0x2E35, 0x4E63, 0xB124, 0x3B78, 0xB125, 0x504D,
- 0xB126, 0x5052, 0xA14D, 0xB128, 0x2E36,      0, 0x5055, 0x2E37,
- 0x504E, 0xB12B, 0xA14E, 0x3621,      0, 0x304D, 0xB12D, 0xB12E,
- 0x3622, 0x3241,      0,      0,      0,      0,      0,      0,
-      0,      0,      0, 0x5525,      0, 0x4B79, 0x496E, 0x3874,
-      0,      0, 0xA150,      0,      0, 0x3F2F, 0x4E37, 0xB130,
-      0, 0xB131,      0, 0xB132, 0xB133, 0xB134, 0xA151, 0x4A58,
-};
-static const unsigned short utf8_to_euc_E4BF[] = {
- 0xB136, 0xB137, 0x3738, 0x4225, 0x3264, 0xB138, 0xB139,      0,
- 0xB13A, 0xB13B, 0x3D53, 0xB13C, 0xB13D, 0xB13E, 0x5059, 0xB13F,
- 0x505E, 0x505C, 0xB140,      0, 0x5057,      0,      0, 0x422F,
- 0x505A,      0, 0x505D, 0x505B, 0xB141, 0x4A5D,      0, 0x5058,
- 0xB142, 0x3F2E, 0xB143, 0x4B73, 0x505F, 0x5060,      0,      0,
-      0,      0,      0,      0,      0,      0, 0x3D24, 0x506D,
- 0xB144,      0, 0xB145, 0x4750,      0, 0x4936, 0x5068,      0,
- 0x4A70,      0, 0x3236,      0, 0xB146, 0xB147, 0x506C, 0xB148,
-};
-static const unsigned short utf8_to_euc_E4BF_x0213[] = {
- 0xB136, 0xB137, 0x3738, 0x4225, 0x3264, 0xA152, 0xB139,      0,
- 0xB13A, 0x2E39, 0x3D53, 0xA153, 0xB13D,      0, 0x5059, 0xA154,
- 0x505E, 0x505C, 0xA155,      0, 0x5057,      0,      0, 0x422F,
- 0x505A,      0, 0x505D, 0x505B, 0xB141, 0x4A5D,      0, 0x5058,
- 0x2E3A, 0x3F2E, 0xB143, 0x4B73, 0x505F, 0x5060, 0xA14F,      0,
-      0,      0,      0,      0,      0,      0, 0x3D24, 0x506D,
- 0xB144, 0x2E21, 0xA157, 0x4750,      0, 0x4936, 0x5068,      0,
- 0x4A70,      0, 0x3236,      0, 0xB146, 0xB147, 0x506C,      0,
-};
-static const unsigned short utf8_to_euc_E580[] = {
- 0xB149, 0xB14A,      0,      0, 0xB14B, 0x5066, 0x506F, 0xB14C,
-      0, 0x4152, 0xB14D, 0x3844, 0xB14E, 0x475C, 0xB14F, 0x6047,
- 0xB150, 0x506E, 0x455D, 0xB151, 0x5063,      0, 0x3876, 0xB152,
- 0xB153, 0x3875, 0x5061, 0xB154, 0xB155, 0xB156, 0xB157, 0x3C5A,
-      0, 0x5069, 0xB158, 0x4A6F, 0x434D, 0x5065, 0x3771, 0xB159,
- 0x5062, 0x506A, 0x5064, 0x4E51, 0x506B, 0x4F41, 0xB15A,      0,
- 0xB15B,      0, 0xB15C, 0xB15D,      0, 0xB15E, 0x3666,      0,
-      0, 0x3770,      0, 0xB176,      0,      0,      0,      0,
-};
-static const unsigned short utf8_to_euc_E580_x0213[] = {
- 0xA158, 0x2E3B, 0x2E3C,      0, 0xB14B, 0x5066, 0x506F, 0xB14C,
-      0, 0x4152, 0xB14D, 0x3844, 0xB14E, 0x475C, 0x2E3D, 0x6047,
- 0xA159, 0x506E, 0x455D, 0xA15A, 0x5063,      0, 0x3876, 0xB152,
- 0x2E3E, 0x3875, 0x5061, 0xB154, 0xA15B, 0xB156, 0xA15C, 0x3C5A,
-      0, 0x5069, 0xA15D, 0x4A6F, 0x434D, 0x5065, 0x3771, 0x2E3F,
- 0x5062, 0x506A, 0x5064, 0x4E51, 0x506B, 0x4F41, 0x2E40,      0,
- 0xB15B,      0, 0xB15C, 0xB15D,      0, 0xB15E, 0x3666,      0,
-      0, 0x3770,      0, 0x2E42,      0,      0,      0,      0,
-};
-static const unsigned short utf8_to_euc_E581[] = {
- 0xB15F, 0xB160, 0xB161, 0x5070,      0, 0xB162, 0xB163, 0x5071,
- 0x5075, 0x304E, 0xB164,      0, 0xB165,      0, 0xB166, 0x4A50,
- 0x5074, 0xB167, 0xB168, 0xB169,      0, 0x5073, 0x5077, 0xB16A,
-      0, 0xB16B, 0x5076,      0, 0x4464,      0,      0, 0xB16C,
- 0xB16D,      0, 0xB16E, 0xB16F,      0, 0x3772, 0xB170, 0xB171,
-      0,      0, 0xB172,      0, 0x5078, 0xB173,      0,      0,
- 0xB174, 0xB175, 0x3C45,      0, 0x4226, 0x4465, 0x3676,      0,
- 0x5079,      0,      0,      0,      0, 0x3536,      0,      0,
-};
-static const unsigned short utf8_to_euc_E581_x0213[] = {
- 0x2E41, 0x2E43, 0xA15F, 0x5070,      0, 0xB162, 0xA160, 0x5071,
- 0x5075, 0x304E, 0xB164,      0, 0xB165,      0, 0xA161, 0x4A50,
- 0x5074, 0xB167, 0xB168, 0xA162,      0, 0x5073, 0x5077, 0xA163,
-      0, 0xB16B, 0x5076,      0, 0x4464,      0,      0, 0xB16C,
- 0xB16D,      0, 0xB16E, 0xA164,      0, 0x3772, 0xA165, 0xB171,
-      0,      0, 0xA166,      0, 0x5078, 0xB173,      0,      0,
- 0xA167, 0xB175, 0x3C45,      0, 0x4226, 0x4465, 0x3676,      0,
- 0x5079,      0,      0,      0,      0, 0x3536,      0,      0,
-};
-static const unsigned short utf8_to_euc_E582[] = {
- 0x507A, 0xB177,      0, 0xB178, 0xB179, 0x507C, 0xB17A,      0,
-      0,      0, 0xB17B,      0,      0, 0x4B35, 0xB17C, 0xB17D,
- 0xB17E, 0x3766, 0xB221, 0xB222, 0xB223,      0, 0xB224,      0,
- 0x3B31, 0x4877, 0x507B, 0xB225, 0xB226,      0, 0xB227, 0xB228,
- 0xB229, 0xB22A, 0xB22B,      0,      0,      0,      0,      0,
-      0,      0, 0xB22C,      0, 0x3A45, 0x4D43,      0, 0xB22D,
- 0xB22E,      0, 0x507E, 0x5123, 0x507D, 0x3A44,      0, 0x3D7D,
-      0, 0xB22F, 0xB230,      0,      0, 0xB231, 0x3739,      0,
-};
-static const unsigned short utf8_to_euc_E582_x0213[] = {
- 0x507A, 0xB177,      0, 0xB178, 0xB179, 0x507C, 0xB17A,      0,
- 0xA169,      0, 0xB17B,      0,      0, 0x4B35, 0xB17C, 0xB17D,
- 0xB17E, 0x3766, 0xA16A, 0xA16B, 0x2E44, 0xA16C, 0xA16D,      0,
- 0x3B31, 0x4877, 0x507B, 0xB225, 0xA16E,      0, 0xB227, 0xB228,
- 0xB229, 0xB22A, 0xB22B, 0xA168,      0,      0,      0,      0,
-      0,      0, 0xA16F,      0, 0x3A45, 0x4D43,      0, 0xB22D,
- 0xB22E, 0xA171, 0x507E, 0x5123, 0x507D, 0x3A44,      0, 0x3D7D,
-      0, 0xB22F, 0xA172, 0xA173,      0, 0xB231, 0x3739,      0,
-};
-static const unsigned short utf8_to_euc_E583[] = {
- 0xB232,      0, 0x5124, 0xB233, 0xB234, 0x364F,      0, 0xB235,
-      0, 0x5121, 0x5122,      0, 0xB236, 0x462F, 0xB237, 0x417C,
- 0xB238, 0x3623,      0, 0xB239, 0xB23A, 0x4B4D, 0x5125,      0,
- 0xB23B,      0, 0x4E3D,      0, 0xB23C, 0xB23D, 0x5126, 0xB23E,
-      0,      0, 0xB23F, 0x5129, 0xB240, 0x5127, 0xB241, 0x414E,
- 0xB242, 0xB243,      0,      0,      0, 0x5128, 0x512A, 0xB244,
-      0, 0xB245, 0xB251,      0, 0xF430, 0x512C, 0xB246,      0,
-      0, 0x512B, 0xB247, 0x4A48,      0,      0, 0xB248,      0,
-};
-static const unsigned short utf8_to_euc_E583_x0213[] = {
- 0xB232,      0, 0x5124, 0xB233, 0xA174, 0x364F,      0, 0xA175,
-      0, 0x5121, 0x5122,      0, 0x2E45, 0x462F, 0xA178, 0x417C,
- 0x2E47, 0x3623,      0, 0xB239, 0xA17A, 0x4B4D, 0x5125,      0,
-      0, 0xA17B, 0x4E3D,      0, 0xB23C, 0xB23D, 0x5126, 0xB23E,
-      0, 0xA17C, 0xB23F, 0x5129, 0xB240, 0x5127, 0x2E48, 0x414E,
- 0xB242, 0xA17D,      0,      0,      0, 0x5128, 0x512A, 0xB244,
-      0, 0xB245, 0x2E46, 0xA176,      0, 0x512C, 0xB246,      0,
-      0, 0x512B, 0xB247, 0x4A48,      0,      0, 0xB248,      0,
-};
-static const unsigned short utf8_to_euc_E584[] = {
- 0x3537, 0x512E, 0x512F, 0xB249, 0x322F,      0, 0xB24A, 0xB24B,
- 0xB24C, 0x512D,      0, 0xB24D, 0xB24E, 0xB24F, 0xB250,      0,
- 0xB252,      0, 0x3C74,      0, 0x5132, 0x5131, 0x5130, 0xB253,
- 0x5056, 0xB254, 0x5133, 0xB255, 0xB256, 0xB257, 0xB258, 0x3D7E,
-      0, 0x5134,      0, 0xB259,      0,      0,      0, 0xB25A,
- 0xB25B,      0, 0x4D25,      0, 0xB25C, 0xB25D,      0, 0xB25E,
-      0, 0xB25F, 0x4C59, 0xB260, 0xB261, 0xB262,      0, 0x5136,
- 0xB263, 0xB264, 0x5135, 0x5138, 0x5137,      0,      0, 0x5139,
-};
-static const unsigned short utf8_to_euc_E584_x0213[] = {
- 0x3537, 0x512E, 0x512F, 0x2E4B, 0x322F,      0, 0x2E4A, 0xB24B,
- 0xA321, 0x512D,      0, 0x2E4C, 0xB24E, 0xB24F, 0xB250,      0,
- 0xB252,      0, 0x3C74,      0, 0x5132, 0x5131, 0x5130, 0xA323,
- 0x5056, 0xB254, 0x5133, 0xA324, 0xB256, 0xB257, 0x2E4D, 0x3D7E,
-      0, 0x5134,      0, 0xB259,      0,      0,      0, 0xB25A,
- 0xB25B,      0, 0x4D25,      0, 0xB25C, 0xB25D,      0, 0xB25E,
-      0, 0xB25F, 0x4C59, 0xB260, 0xB261, 0x2E4E,      0, 0x5136,
- 0xB263, 0xB264, 0x5135, 0x5138, 0x5137,      0,      0, 0x5139,
-};
-static const unsigned short utf8_to_euc_E585[] = {
- 0x513A, 0x3074, 0xB265, 0x3835, 0x373B, 0x3D3C, 0x437B, 0x3624,
- 0x4068, 0x3877, 0xB266, 0x396E, 0x513C, 0x4C48, 0x4546, 0xB267,
- 0x3B79,      0, 0x513B, 0xB268, 0x513D, 0xB269,      0, 0xB26A,
- 0xB26B,      0, 0x455E,      0, 0x3375,      0,      0, 0xB26C,
-      0,      0, 0x513E,      0, 0xB26D, 0x467E, 0xB26E,      0,
- 0x4134, 0x5140, 0x5141, 0x482C, 0x3878, 0x4F3B, 0x5142,      0,
-      0, 0x3626,      0,      0,      0, 0x4A3C, 0x4236, 0x3671,
- 0x4535,      0,      0,      0, 0x3773,      0, 0xB26F,      0,
-};
-static const unsigned short utf8_to_euc_E585_x0213[] = {
- 0x513A, 0x3074, 0xB265, 0x3835, 0x373B, 0x3D3C, 0x437B, 0x3624,
- 0x4068, 0x3877, 0x2E4F, 0x396E, 0x513C, 0x4C48, 0x4546, 0xB267,
- 0x3B79,      0, 0x513B, 0xB268, 0x513D, 0x2E51,      0, 0x2E52,
- 0xB26B,      0, 0x455E,      0, 0x3375,      0,      0, 0xB26C,
- 0xA326,      0, 0x513E,      0,      0, 0x467E, 0xB26E,      0,
- 0x4134, 0x5140, 0x5141, 0x482C, 0x3878, 0x4F3B, 0x5142,      0,
-      0, 0x3626,      0, 0xA328,      0, 0x4A3C, 0x4236, 0x3671,
- 0x4535,      0,      0, 0xF474, 0x3773,      0, 0xB26F,      0,
-};
-static const unsigned short utf8_to_euc_E586[] = {
- 0x5143,      0, 0x5144, 0xB270, 0xB271, 0x4662, 0x315F,      0,
-      0, 0x5147, 0x3A7D, 0xB272, 0x5146, 0x3A46, 0xB273, 0x5148,
- 0x666E, 0x5149, 0x4B41, 0x514A,      0, 0x514B, 0x514C, 0x3E69,
- 0xB274, 0x3C4C,      0,      0,      0, 0xB275,      0,      0,
- 0x3427, 0xB276, 0x514F, 0xB277, 0x514D, 0x4C3D, 0x514E,      0,
- 0x495A, 0x5150, 0x5151, 0x5152, 0x455F, 0xB278,      0,      0,
- 0x5156, 0x5154, 0x5155, 0x5153, 0x3A63, 0x5157, 0x4C6A, 0x4E64,
- 0xB279,      0, 0xB27A,      0, 0xB27B, 0x5158, 0xB27C, 0xB27D,
-};
-static const unsigned short utf8_to_euc_E586_x0213[] = {
- 0x5143,      0, 0x5144, 0xA329, 0xB271, 0x4662, 0x315F,      0,
-      0, 0x5147, 0x3A7D, 0xA32A, 0x5146, 0x3A46, 0xB273, 0x5148,
- 0x666E, 0x5149, 0x4B41, 0x514A,      0, 0x514B, 0x514C, 0x3E69,
- 0xA32C, 0x3C4C,      0,      0,      0, 0x2E54,      0,      0,
- 0x3427, 0xB276, 0x514F, 0xA32D, 0x514D, 0x4C3D, 0x514E,      0,
- 0x495A, 0x5150, 0x5151, 0x5152, 0x455F, 0xA32E,      0,      0,
- 0x5156, 0x5154, 0x5155, 0x5153, 0x3A63, 0x5157, 0x4C6A, 0x4E64,
- 0xB279,      0, 0xB27A,      0, 0xA330, 0x5158,      0, 0xB27D,
-};
-static const unsigned short utf8_to_euc_E587[] = {
-      0,      0, 0xB27E,      0, 0x4028, 0x5159, 0x3D5A,      0,
- 0xB321, 0x515A,      0, 0x437C, 0x4E3F, 0x4560,      0, 0xB322,
-      0, 0xB323, 0xB324, 0xB325,      0, 0xB326, 0x5245,      0,
- 0xB327,      0,      0, 0x515B, 0x7425, 0x3645, 0xB328,      0,
- 0x515C, 0x4B5E, 0xB329,      0,      0, 0xB32A, 0x3D68, 0x427C,
-      0, 0x515E, 0x4664,      0, 0xF431, 0x515F, 0xB32B,      0,
- 0x5160, 0x332E, 0xB32C, 0xB32D, 0xB32E, 0x5161, 0x3627, 0xB32F,
- 0x464C, 0x317A, 0x3D50,      0,      0, 0x4821, 0x5162,      0,
-};
-static const unsigned short utf8_to_euc_E587_x0213[] = {
-      0,      0, 0xB27E, 0x2E55, 0x4028, 0x5159, 0x3D5A,      0,
- 0xB321, 0x515A, 0x2E56, 0x437C, 0x4E3F, 0x4560,      0, 0xB322,
-      0, 0xB323, 0xB324, 0xB325,      0, 0xB326, 0x5245,      0,
- 0xB327,      0,      0, 0x515B, 0x7425, 0x3645, 0x2E57,      0,
- 0x515C, 0x4B5E, 0x2E58,      0,      0, 0xB32A, 0x3D68, 0x427C,
-      0, 0x515E, 0x4664,      0,      0, 0x515F, 0x2E59,      0,
- 0x5160, 0x332E, 0xB32C, 0xA333, 0xA334, 0x5161, 0x3627, 0xB32F,
- 0x464C, 0x317A, 0x3D50,      0,      0, 0x4821, 0x5162,      0,
-};
-static const unsigned short utf8_to_euc_E588[] = {
- 0x4561, 0xB330, 0xB331, 0x3F4F, 0x5163, 0xB332, 0x4A2C, 0x405A,
- 0x3422,      0, 0x3429, 0x5164,      0,      0, 0x5166,      0,
-      0, 0x373A, 0xB333, 0xB334, 0x5165, 0xB335, 0xB336, 0x4E73,
- 0xB337,      0,      0,      0,      0, 0x3D69,      0,      0,
-      0,      0, 0xB338,      0, 0x483D, 0x4A4C,      0, 0x5167,
- 0xB339, 0x4D78, 0x5168,      0,      0,      0, 0x5169,      0,
- 0x457E, 0xB33A, 0xB33B, 0x516A,      0, 0xB33C, 0x4029, 0x3A7E,
- 0x3774, 0x516B, 0x3B49, 0x396F, 0xB33D,      0,      0,      0,
-};
-static const unsigned short utf8_to_euc_E588_x0213[] = {
- 0x4561, 0x2E5A, 0xA335, 0x3F4F, 0x5163, 0xB332, 0x4A2C, 0x405A,
- 0x3422,      0, 0x3429, 0x5164,      0,      0, 0x5166,      0,
-      0, 0x373A, 0xA336, 0x2E5C, 0x5165, 0x2E5D, 0xA337, 0x4E73,
- 0xB337,      0,      0,      0,      0, 0x3D69,      0,      0,
-      0,      0, 0xB338,      0, 0x483D, 0x4A4C,      0, 0x5167,
- 0xB339, 0x4D78, 0x5168,      0,      0,      0, 0x5169,      0,
- 0x457E, 0xB33A, 0xB33B, 0x516A,      0, 0xB33C, 0x4029, 0x3A7E,
- 0x3774, 0x516B, 0x3B49, 0x396F, 0xB33D,      0,      0,      0,
-};
-static const unsigned short utf8_to_euc_E589[] = {
-      0,      0,      0, 0x4466, 0x516D, 0xB33E,      0, 0x4227,
-      0, 0xB33F, 0x3A6F, 0x516E, 0x516F, 0x4130,      0, 0x516C,
-      0,      0,      0,      0, 0x5171, 0xB340, 0x4B36, 0xB341,
- 0xB342,      0, 0xB343, 0x3964, 0xB344,      0, 0x5170, 0xB345,
- 0xB346, 0xB347,      0, 0x3775, 0x3A5E, 0x476D, 0xB348,      0,
-      0, 0x5174, 0x5172,      0,      0,      0, 0xB349, 0x497B,
- 0x3E6A, 0x517B, 0x3364, 0x5175, 0x5173, 0x414F,      0, 0xB34A,
- 0xB34B, 0xB34C,      0,      0,      0, 0x5177,      0, 0x5176,
-};
-static const unsigned short utf8_to_euc_E589_x0213[] = {
-      0,      0,      0, 0x4466, 0x516D, 0xB33E,      0, 0x4227,
-      0, 0x2E5E, 0x3A6F, 0x516E, 0x516F, 0x4130,      0, 0x516C,
-      0,      0,      0,      0, 0x5171, 0xA339, 0x4B36, 0x2E5F,
- 0xB342,      0, 0xB343, 0x3964, 0xA33A, 0x2F7E, 0x5170, 0xB345,
- 0xB346, 0x2E60,      0, 0x3775, 0x3A5E, 0x476D, 0xB348,      0,
-      0, 0x5174, 0x5172,      0, 0xA33B,      0, 0xB349, 0x497B,
- 0x3E6A, 0x517B, 0x3364, 0x5175, 0x5173, 0x414F,      0, 0xA33C,
- 0xB34B, 0xB34C,      0,      0,      0, 0x5177,      0, 0x5176,
-};
-static const unsigned short utf8_to_euc_E58A[] = {
- 0xB34D,      0, 0xB34E, 0x3344,      0, 0xB34F,      0, 0x3760,
- 0x517C, 0x4E2D, 0xB350,      0, 0xB351, 0x5178,      0,      0,
-      0, 0x517D, 0x517A, 0xB352, 0x5179, 0xB353, 0xB354, 0xB355,
- 0xB356,      0, 0xB357, 0x4E4F, 0xB358,      0,      0, 0x3879,
- 0x3243,      0,      0, 0x4E74, 0xB359, 0xB35A, 0xB35B, 0xB35C,
-      0, 0x3D75, 0x4558, 0x3965, 0x5222, 0x5223,      0, 0xB35D,
- 0xB35E, 0x4E65,      0,      0, 0x4F2B, 0x5225, 0xB35F, 0xB360,
- 0xB361, 0x387A, 0xB362, 0xB363, 0x5224, 0xB364, 0x332F,      0,
-};
-static const unsigned short utf8_to_euc_E58A_x0213[] = {
- 0xB34D,      0, 0xA33E, 0x3344, 0xA33D, 0xB34F,      0, 0x3760,
- 0x517C, 0x4E2D, 0xB350,      0, 0xB351, 0x5178,      0,      0,
-      0, 0x517D, 0x517A, 0x2E61, 0x5179, 0xB353, 0xB354, 0xB355,
- 0xA340,      0, 0xB357, 0x4E4F,      0,      0,      0, 0x3879,
- 0x3243,      0,      0, 0x4E74, 0xA342, 0xB35A, 0xA343, 0xB35C,
-      0, 0x3D75, 0x4558, 0x3965, 0x5222, 0x5223,      0, 0xA344,
- 0xB35E, 0x4E65,      0,      0, 0x4F2B, 0x5225, 0xB35F, 0xB360,
- 0xB361, 0x387A, 0xA345, 0xA346, 0x5224, 0xB364, 0x332F,      0,
-};
-static const unsigned short utf8_to_euc_E58B[] = {
- 0xB365, 0x5226,      0, 0x4B56, 0xB366, 0x443C, 0xB367, 0x4D26,
- 0xB368, 0x4A59,      0,      0, 0xB369, 0x5227,      0, 0xB36A,
-      0, 0xB36B, 0x7055,      0, 0xB36C, 0x4630, 0xB36D, 0x5228,
- 0x342A, 0x4C33,      0, 0xB36E, 0xB36F, 0x3E21, 0x5229, 0x4A67,
- 0x522D, 0xB370, 0x402A, 0x522A, 0x3650, 0xB371, 0x522B, 0x342B,
- 0xB372, 0xB373, 0xB374,      0, 0xB375,      0,      0,      0,
- 0xB376, 0xB377, 0x372E, 0x522E, 0xB378, 0x522F, 0xB379, 0xB37A,
- 0x5230, 0x5231, 0x3C5B,      0,      0,      0, 0x387B, 0x4C5E,
-};
-static const unsigned short utf8_to_euc_E58B_x0213[] = {
-      0, 0x5226,      0, 0x4B56, 0xB366, 0x443C, 0xB367, 0x4D26,
- 0x2E62, 0x4A59, 0xA347,      0, 0x2E64, 0x5227,      0, 0xB36A,
- 0x2E65, 0xA349, 0x7055,      0, 0xB36C, 0x4630, 0x2E66, 0x5228,
- 0x342A, 0x4C33,      0, 0x2E67, 0xB36F, 0x3E21, 0x5229, 0x4A67,
- 0x522D, 0xB370, 0x402A, 0x522A, 0x3650, 0xB371, 0x522B, 0x342B,
- 0xB372, 0xB373, 0xB374,      0, 0xB375,      0,      0,      0,
- 0x2E69, 0xB377, 0x372E, 0x522E, 0xB378, 0x522F, 0xB379, 0xA34B,
- 0x5230, 0x5231, 0x3C5B, 0x2E6A,      0,      0, 0x387B, 0x4C5E,
-};
-static const unsigned short utf8_to_euc_E58C[] = {
- 0xB37B, 0x4C68, 0x4677, 0xB37C,      0, 0x4A71, 0x5232, 0xF432,
- 0x5233,      0, 0xB37D, 0xB37E, 0xB421, 0x5235,      0, 0x5237,
- 0x5236, 0xB422,      0, 0xB423,      0, 0x5238, 0x323D, 0x4B4C,
- 0xB424, 0x3A7C, 0x5239, 0xB425, 0xB426, 0x4159, 0xB427, 0xB428,
- 0x3E22, 0x3629,      0, 0x523A, 0xF433, 0xB429,      0, 0xB42A,
- 0xB42B, 0xB42C, 0x485B, 0xB42D, 0xB42E, 0xB42F,      0, 0x523B,
- 0xB430, 0x523C, 0xB431, 0x523D,      0, 0xB432,      0,      0,
- 0x523E, 0x4924, 0x3668, 0x3065, 0xB433, 0xB434, 0xB435, 0x463F,
-};
-static const unsigned short utf8_to_euc_E58C_x0213[] = {
- 0x2E6B, 0x4C68, 0x4677, 0xB37C,      0, 0x4A71, 0x5232, 0x2E6C,
- 0x5233,      0, 0xA34C, 0xA34D, 0xB421, 0x5235,      0, 0x5237,
- 0x5236, 0xB422,      0, 0xB423,      0, 0x5238, 0x323D, 0x4B4C,
- 0xB424, 0x3A7C, 0x5239, 0xB425, 0x2E6D, 0x4159, 0xB427, 0xB428,
- 0x3E22, 0x3629,      0, 0x523A, 0xA34E, 0xB429,      0, 0xB42A,
- 0xB42B, 0xB42C, 0x485B, 0xB42D, 0xB42E, 0xB42F,      0, 0x523B,
- 0xB430, 0x523C, 0xB431, 0x523D,      0, 0xA34F,      0,      0,
- 0x523E, 0x4924, 0x3668, 0x3065, 0xB433, 0xB434, 0xA350, 0x463F,
-};
-static const unsigned short utf8_to_euc_E58D[] = {
- 0x523F, 0x3D3D, 0xB436, 0x4069,      0, 0x5241, 0x5240, 0x3E23,
- 0x3861, 0x5243, 0x483E, 0xB438, 0xB437, 0x5244,      0,      0,
-      0, 0x485C, 0x4234, 0x426E, 0x3628,      0,      0, 0x466E,
- 0x4331, 0xB439, 0x476E, 0xB43A, 0x4B4E,      0, 0x5246,      0,
- 0x406A, 0xB43B,      0, 0xB43C,      0, 0xB43D, 0x3735,      0,
-      0, 0x5247,      0,      0, 0xB43E, 0xB43F, 0x5248, 0x312C,
- 0x3075, 0x346D, 0xB440, 0x4228, 0x3551, 0x4D71,      0, 0x524B,
- 0x3237, 0xB441,      0, 0x524A,      0,      0, 0xB442, 0x362A,
-};
-static const unsigned short utf8_to_euc_E58D_x0213[] = {
- 0x523F, 0x3D3D, 0xA351, 0x4069,      0, 0x5241, 0x5240, 0x3E23,
- 0x3861, 0x5243, 0x483E, 0xB438, 0xB437, 0x5244,      0,      0,
-      0, 0x485C, 0x4234, 0x426E, 0x3628,      0,      0, 0x466E,
- 0x4331, 0xB439, 0x476E, 0xB43A, 0x4B4E,      0, 0x5246,      0,
- 0x406A, 0x2E6F,      0, 0x2E70,      0, 0xB43D, 0x3735, 0xA354,
-      0, 0x5247,      0,      0, 0xA355, 0xB43F, 0x5248, 0x312C,
- 0x3075, 0x346D,      0, 0x4228, 0x3551, 0x4D71,      0, 0x524B,
- 0x3237, 0xB441, 0xA356, 0x524A,      0, 0x2E71, 0xB442, 0x362A,
-};
-static const unsigned short utf8_to_euc_E58E[] = {
-      0,      0, 0x524C, 0xB443, 0x4C71,      0,      0, 0xB444,
- 0xB445,      0,      0,      0,      0,      0, 0xB446,      0,
-      0,      0,      0, 0xB447, 0xB448,      0, 0x524D,      0,
- 0x4E52, 0xB449, 0x387C,      0,      0, 0xB44A,      0, 0x3836,
- 0x524E, 0xB44B,      0,      0, 0xB44C, 0x5250, 0x524F,      0,
- 0x3F5F, 0x3139, 0xB44D, 0xB44E,      0, 0x315E, 0x5251, 0xB44F,
- 0x5252,      0, 0xB450, 0x3837, 0xB451, 0xB452, 0x5253, 0xB453,
- 0xB454,      0, 0xB455, 0x356E,      0, 0xB456,      0,      0,
-};
-static const unsigned short utf8_to_euc_E58E_x0213[] = {
-      0,      0, 0x524C, 0xB443, 0x4C71,      0,      0, 0xB444,
- 0xB445,      0,      0,      0,      0,      0, 0xB446,      0,
-      0,      0,      0, 0x2E72, 0xB448,      0, 0x524D,      0,
- 0x4E52, 0xB449, 0x387C,      0,      0, 0x2E73,      0, 0x3836,
- 0x524E, 0xB44B,      0,      0, 0xA357, 0x5250, 0x524F,      0,
- 0x3F5F, 0x3139, 0xB44D, 0xB44E,      0, 0x315E, 0x5251, 0xB44F,
- 0x5252,      0, 0x2E74, 0x3837, 0xA358, 0xB452, 0x5253, 0xA35A,
- 0xB454,      0, 0xB455, 0x356E,      0, 0xB456,      0,      0,
-};
-static const unsigned short utf8_to_euc_E58F[] = {
- 0xB457,      0, 0x3B32, 0x5254,      0, 0xB458,      0,      0,
- 0x4B74, 0x3A35, 0x355A, 0x4D27, 0x4150, 0x483F, 0x3C7D, 0xB459,
-      0,      0, 0xB45A, 0xB45B, 0x3D47, 0xB45C, 0x3C68, 0x3C75,
-      0, 0x3D76, 0xB45D, 0x4840,      0, 0xB45E, 0xB45F, 0x5257,
- 0xB460, 0x3143, 0x4151, 0x387D, 0x3845, 0x3667, 0xB461, 0xB462,
- 0x525B, 0x4321, 0x427E, 0x362B, 0x3E24, 0x525C, 0x525A, 0x3244,
- 0x4266, 0x3C38, 0x3B4B, 0x3126,      0, 0xB463, 0x3370, 0x3966,
- 0x3B4A,      0, 0x525D,      0,      0,      0,      0,      0,
-};
-static const unsigned short utf8_to_euc_E58F_x0213[] = {
- 0xA35B,      0, 0x3B32, 0x5254,      0, 0xB458,      0,      0,
- 0x4B74, 0x3A35, 0x355A, 0x4D27, 0x4150, 0x483F, 0x3C7D, 0xB459,
-      0,      0, 0xB45A, 0xB45B, 0x3D47, 0xA35F, 0x3C68, 0x3C75,
-      0, 0x3D76, 0xA360, 0x4840,      0,      0, 0xB45F, 0x5257,
- 0xB460, 0x3143, 0x4151, 0x387D, 0x3845, 0x3667, 0xB461, 0xB462,
- 0x525B, 0x4321, 0x427E, 0x362B, 0x3E24, 0x525C, 0x525A, 0x3244,
- 0x4266, 0x3C38, 0x3B4B, 0x3126, 0xA362, 0xA363, 0x3370, 0x3966,
- 0x3B4A,      0, 0x525D,      0,      0,      0,      0,      0,
-};
-static const unsigned short utf8_to_euc_E590[] = {
-      0, 0x525E, 0xB464, 0x3549, 0x3346,      0,      0,      0,
- 0x3967, 0x3548, 0x445F, 0x3125, 0x4631, 0x4C3E, 0x3921, 0x4D79,
- 0x4547, 0x387E,      0, 0xB465,      0,      0,      0,      0,
-      0,      0, 0xB466, 0x372F,      0, 0x5267,      0, 0x3663,
- 0x4B4A, 0xB467,      0,      0,      0,      0, 0x485D, 0xB468,
- 0xB469, 0x5266, 0xB46A, 0x345E, 0x5261, 0x5262, 0x5264, 0xB46B,
-      0, 0xB46C,      0,      0, 0xB46D, 0xB46E, 0x5265,      0,
- 0x355B, 0x3F61,      0, 0x4A2D, 0x5263, 0x525F, 0x3863,      0,
-};
-static const unsigned short utf8_to_euc_E590_x0213[] = {
-      0, 0x525E, 0xB464, 0x3549, 0x3346,      0,      0,      0,
- 0x3967, 0x3548, 0x445F, 0x3125, 0x4631, 0x4C3E, 0x3921, 0x4D79,
- 0x4547, 0x387E, 0x2E75, 0xB465,      0,      0,      0,      0,
-      0,      0, 0xB466, 0x372F,      0, 0x5267, 0x4F7E, 0x3663,
- 0x4B4A, 0xB467,      0,      0, 0xA365,      0, 0x485D, 0x2E76,
- 0xA366, 0x5266, 0xB46A, 0x345E, 0x5261, 0x5262, 0x5264, 0xB46B,
-      0, 0xB46C,      0,      0, 0xB46D, 0xB46E, 0x5265,      0,
- 0x355B, 0x3F61,      0, 0x4A2D, 0x5263, 0x525F, 0x3863,      0,
-};
-static const unsigned short utf8_to_euc_E591[] = {
- 0x5260,      0, 0x4F24, 0xB46F, 0xB470,      0, 0x4A72, 0xB471,
- 0x4468, 0x3862, 0x3970,      0,      0, 0xB472, 0x5268, 0xB473,
-      0, 0x465D,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0, 0xB474, 0x526C,
-      0,      0, 0xB475,      0, 0xB476,      0, 0xB477, 0xB478,
- 0x3C7E, 0xB479, 0x3C76, 0xB47A,      0, 0xB47B, 0xB47C,      0,
- 0x526F, 0x526D,      0, 0x4C23, 0xB47D, 0x526A, 0x5273, 0x526E,
-      0,      0,      0, 0x5271, 0x3846, 0x4C3F,      0, 0xB47E,
-};
-static const unsigned short utf8_to_euc_E591_x0213[] = {
- 0x5260,      0, 0x4F24, 0xA368, 0xB470,      0, 0x4A72, 0xB471,
- 0x4468, 0x3862, 0x3970,      0,      0, 0x2E77, 0x5268, 0xB473,
-      0, 0x465D,      0,      0,      0, 0xA364,      0,      0,
-      0,      0,      0,      0,      0,      0, 0xB474, 0x526C,
-      0,      0, 0xA369,      0, 0xB476,      0, 0xA36A, 0xB478,
- 0x3C7E, 0xB479, 0x3C76, 0x2E79, 0xA36B, 0xB47B, 0xB47C,      0,
- 0x526F, 0x526D,      0, 0x4C23, 0x2E7A, 0x526A, 0x5273, 0x526E,
-      0,      0,      0, 0x5271, 0x3846, 0x4C3F,      0, 0x2E7B,
-};
-static const unsigned short utf8_to_euc_E592[] = {
- 0x5272, 0xB521,      0, 0xB522, 0x5274, 0xB523, 0x5276,      0,
- 0xB524, 0xB525, 0xF435, 0x3A70, 0x4F42, 0xB526, 0x526B, 0x5269,
- 0x5275, 0xB527, 0x5270,      0,      0, 0xB528, 0xB529,      0,
-      0,      0,      0,      0, 0xB52A,      0,      0, 0xB52B,
-      0, 0xB52C, 0x5278,      0, 0x5323, 0x527A, 0xB52D, 0xB52E,
- 0x527E, 0xB52F, 0xB530, 0x5321, 0x527B, 0xB531, 0xB532, 0x533E,
-      0, 0xB533, 0x3A69, 0x3331,      0,      0,      0, 0xB534,
- 0x5279, 0xB535, 0xB536, 0xB537, 0x5325, 0x3076, 0x5324, 0xB538,
-};
-static const unsigned short utf8_to_euc_E592_x0213[] = {
- 0x5272, 0xB521,      0, 0xB522, 0x5274, 0xB523, 0x5276,      0,
- 0x2E7C, 0xB525, 0xA36C, 0x3A70, 0x4F42, 0xA36D, 0x526B, 0x5269,
- 0x5275, 0xB527, 0x5270,      0,      0, 0xA36E, 0x2E7D,      0,
-      0,      0,      0,      0, 0x2E78,      0,      0, 0xB52B,
- 0xA36F, 0x2E7E, 0x5278,      0, 0x5323, 0x527A, 0xA370, 0xB52E,
- 0x527E, 0x2F21, 0xB530, 0x5321, 0x527B, 0xA371, 0xA372, 0x533E,
-      0, 0xB533, 0x3A69, 0x3331,      0,      0,      0, 0xA373,
- 0x5279, 0xB535, 0xA374, 0xB537, 0x5325, 0x3076, 0x5324, 0xA375,
-};
-static const unsigned short utf8_to_euc_E593[] = {
- 0x3025, 0x494A, 0x5322,      0, 0x527C,      0, 0xB539, 0x5277,
- 0x527D, 0x3A48, 0xB53A,      0,      0, 0xB53B, 0xB53C,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
- 0x5326,      0,      0,      0,      0,      0,      0,      0,
- 0xB53D, 0x3077, 0x532F,      0,      0, 0x5327, 0x5328,      0,
- 0x3E25, 0x4B69, 0xB53E,      0, 0xB53F, 0x532D, 0x532C, 0xB540,
-      0,      0, 0x452F,      0,      0,      0, 0xB541,      0,
-      0,      0, 0x532E,      0, 0xB542, 0x532B, 0xB543, 0xB544,
-};
-static const unsigned short utf8_to_euc_E593_x0213[] = {
- 0x3025, 0x494A, 0x5322, 0xA376, 0x527C,      0, 0x2F22, 0x5277,
- 0x527D, 0x3A48, 0xB53A,      0,      0, 0xB53B, 0xB53C,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
- 0x5326,      0,      0,      0,      0,      0,      0,      0,
- 0xB53D, 0x3077, 0x532F,      0,      0, 0x5327, 0x5328,      0,
- 0x3E25, 0x4B69, 0xB53E,      0, 0xA378, 0x532D, 0x532C, 0xA379,
-      0, 0xA37A, 0x452F, 0xA37B,      0,      0, 0xB541,      0,
-      0,      0, 0x532E,      0, 0xB542, 0x532B, 0xB543, 0x2F23,
-};
-static const unsigned short utf8_to_euc_E594[] = {
- 0xB545, 0xB546,      0,      0, 0x3134, 0xB547, 0x3A36, 0x3F30,
- 0xB548, 0xB549,      0,      0, 0xB54A, 0xB54B, 0xB54C, 0x5329,
- 0x4562,      0,      0,      0, 0x532A, 0xB54D, 0x3022,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0, 0xB54E, 0xB54F,      0,      0, 0x5334, 0x4D23,
-      0, 0x3E27, 0xB550, 0x533A,      0, 0xB551, 0xB552,      0,
- 0x5339, 0x5330,      0, 0xB553, 0xB554, 0xB555, 0x4243,      0,
-};
-static const unsigned short utf8_to_euc_E594_x0213[] = {
- 0xA37C, 0xA37D,      0,      0, 0x3134, 0xB547, 0x3A36, 0x3F30,
- 0xB548, 0xA37E,      0,      0, 0xB54A, 0xB54B, 0x2F24, 0x5329,
- 0x4562,      0,      0,      0, 0x532A, 0xB54D, 0x3022,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0, 0xB54E, 0x2F25,      0,      0, 0x5334, 0x4D23,
-      0, 0x3E27, 0xB550, 0x533A,      0, 0x2F26, 0xB552,      0,
- 0x5339, 0x5330,      0, 0xB553, 0xA421, 0xB555, 0x4243,      0,
-};
-static const unsigned short utf8_to_euc_E595[] = {
- 0x5331, 0xB556,      0,      0, 0x426F, 0x5336, 0x3E26, 0xB557,
-      0, 0xB558, 0xB559,      0, 0x5333, 0xB55A,      0, 0x4C64,
- 0xB55B, 0xB55C,      0, 0x373C,      0,      0, 0x5337, 0x5338,
- 0xB55D,      0, 0xB55E, 0xB55F, 0x5335, 0x533B, 0xB560,      0,
- 0xB561, 0xB562,      0, 0x5332, 0xB563,      0, 0xB564,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0, 0x5341, 0x5346,      0, 0x5342, 0xB565,
-};
-static const unsigned short utf8_to_euc_E595_x0213[] = {
- 0x5331, 0xA422,      0,      0, 0x426F, 0x5336, 0x3E26, 0xA424,
-      0, 0xB558, 0xA425,      0, 0x5333, 0xB55A,      0, 0x4C64,
- 0x2F27, 0xB55C,      0, 0x373C,      0,      0, 0x5337, 0x5338,
- 0xB55D,      0, 0xB55E, 0xB55F, 0x5335, 0x533B, 0x2F28,      0,
- 0xA427, 0xA428,      0, 0x5332, 0xA429,      0, 0xB564,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0, 0x5341, 0x5346, 0xA42B, 0x5342, 0xB565,
-};
-static const unsigned short utf8_to_euc_E596[] = {
- 0x533D, 0xB566, 0xB567, 0x5347, 0x4131,      0, 0xB568, 0x5349,
- 0xB569, 0x3922, 0x533F, 0x437D,      0,      0, 0xB56A, 0xB56B,
-      0, 0xB56C, 0xB56D, 0xB56E, 0xB56F,      0,      0, 0xB570,
- 0x5343, 0x533C, 0x342D,      0, 0x346E, 0x3365, 0x5344, 0x5340,
-      0,      0,      0, 0xB571, 0xB572,      0,      0, 0x3776,
- 0x534A, 0x5348, 0x4153, 0x354A, 0x362C, 0xB573, 0x5345,      0,
- 0x3674,      0, 0xB574,      0,      0,      0, 0x3144,      0,
-      0,      0,      0,      0,      0,      0,      0, 0xB575,
-};
-static const unsigned short utf8_to_euc_E596_x0213[] = {
- 0x533D, 0x2F29, 0xA42C, 0x5347, 0x4131,      0, 0x2F2A, 0x5349,
- 0xA42D, 0x3922, 0x533F, 0x437D,      0,      0, 0x2F2B, 0xB56B,
-      0, 0xA42E, 0xB56D, 0xB56E, 0xB56F,      0,      0, 0xB570,
- 0x5343, 0x533C, 0x342D,      0, 0x346E, 0x3365, 0x5344, 0x5340,
-      0,      0,      0, 0xB571, 0xB572,      0,      0, 0x3776,
- 0x534A, 0x5348, 0x4153, 0x354A, 0x362C, 0x2F2D, 0x5345,      0,
- 0x3674,      0, 0xB574,      0,      0,      0, 0x3144,      0,
-      0,      0,      0,      0,      0,      0,      0, 0xA433,
-};
-static const unsigned short utf8_to_euc_E597[] = {
-      0, 0xB576,      0, 0xB577, 0x534E, 0x534C, 0xB578, 0x5427,
-      0, 0xB579,      0, 0xB57A, 0xB57B,      0, 0xB57C,      0,
-      0, 0xB57D, 0xB57E, 0xB621, 0x5351,      0,      0, 0xB622,
- 0xB623,      0, 0x534B, 0xB624, 0x534F,      0, 0xB625, 0x534D,
-      0,      0, 0xB626, 0x3B4C, 0x5350,      0,      0,      0,
-      0, 0xB627,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0, 0xB628, 0x5353,
-      0, 0x5358,      0,      0,      0, 0x5356, 0x5355, 0xB629,
-};
-static const unsigned short utf8_to_euc_E597_x0213[] = {
-      0, 0xB576,      0, 0xB577, 0x534E, 0x534C, 0xB578, 0x5427,
-      0, 0xA434,      0, 0xB57A, 0xA435,      0, 0x2F2E,      0,
-      0, 0xA436, 0xA430, 0xB621, 0x5351,      0,      0, 0xB622,
- 0xB623,      0, 0x534B, 0xB624, 0x534F, 0xA437, 0xB625, 0x534D,
-      0,      0, 0xA439, 0x3B4C, 0x5350,      0,      0,      0,
-      0, 0xA43B,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0, 0xB628, 0x5353,
-      0, 0x5358,      0,      0,      0, 0x5356, 0x5355, 0xB629,
-};
-static const unsigned short utf8_to_euc_E598[] = {
-      0,      0,      0,      0,      0, 0xB62A, 0x4332,      0,
- 0xB62B, 0x3245, 0xB62C,      0,      0, 0xB62D, 0xB62E, 0xB62F,
- 0xB630, 0xB631, 0xB632,      0, 0x5352,      0, 0x5354, 0x3E28,
- 0x3133, 0xB633,      0, 0x5357,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0, 0x325E,      0,      0, 0xB634,      0,      0, 0x5362,
- 0xB635, 0x3E7C, 0x535E, 0xB636, 0x535C, 0xB637, 0x535D, 0xB638,
- 0x535F, 0xB639,      0, 0xB63A, 0xB63B, 0xB63C,      0, 0xB63D,
-};
-static const unsigned short utf8_to_euc_E598_x0213[] = {
-      0,      0,      0,      0,      0, 0xB62A, 0x4332, 0xA43E,
- 0x2F30, 0x3245, 0xB62C,      0,      0, 0xB62D, 0x2F31, 0xB62F,
- 0xA43F, 0xB631, 0xB632,      0, 0x5352,      0, 0x5354, 0x3E28,
- 0x3133, 0xB633,      0, 0x5357,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
- 0xA43C, 0x325E,      0,      0, 0xB634,      0,      0, 0x5362,
- 0xA440, 0x3E7C, 0x535E, 0xB636, 0x535C, 0xB637, 0x535D, 0xA441,
- 0x535F, 0xB639,      0, 0x2F32, 0xB63B, 0xA443,      0, 0xA444,
-};
-static const unsigned short utf8_to_euc_E599[] = {
- 0xB63E, 0xB63F, 0x313D, 0xB640, 0xB641,      0, 0xB642,      0,
-      0, 0xB643,      0, 0xB644, 0x4139, 0xB645, 0x5359, 0xB646,
- 0x535A,      0,      0,      0, 0xB647,      0,      0,      0,
-      0,      0,      0, 0x337A,      0,      0, 0xB648,      0,
- 0xB649, 0xB64A, 0xB64B, 0xB64C, 0x5361,      0, 0xB64D,      0,
- 0x346F, 0xB64E, 0x5364, 0x5360, 0x5363, 0xB64F,      0, 0xB650,
-      0, 0xB651, 0xB652,      0, 0x4A2E, 0xB653,      0,      0,
- 0x4655,      0, 0x4838,      0,      0,      0,      0,      0,
-};
-static const unsigned short utf8_to_euc_E599_x0213[] = {
- 0xA445, 0xB63F, 0x313D, 0xB640, 0xB641,      0, 0xB642, 0xA446,
-      0, 0x2F33,      0, 0xB644, 0x4139, 0xB645, 0x5359, 0xB646,
- 0x535A,      0,      0, 0x7427, 0xB647,      0,      0,      0,
-      0,      0,      0, 0x337A,      0,      0, 0xA447,      0,
- 0xA448, 0xB64A, 0xB64B, 0xB64C, 0x5361,      0, 0x2F35,      0,
- 0x346F, 0xB64E, 0x5364, 0x5360, 0x5363, 0xA449,      0, 0x2F37,
-      0, 0x2F38, 0x2F39,      0, 0x4A2E, 0xB653, 0x2F34,      0,
- 0x4655,      0, 0x4838,      0,      0,      0,      0,      0,
-};
-static const unsigned short utf8_to_euc_E59A[] = {
- 0x5366,      0,      0,      0, 0xB654, 0xB655, 0x5365, 0x3345,
- 0xB656,      0, 0x5367, 0xB657, 0xB658,      0,      0, 0x536A,
-      0,      0,      0,      0, 0x5369, 0xB659,      0,      0,
-      0, 0xB65A, 0xB65B,      0,      0, 0xB65C, 0xB65D, 0xB65E,
- 0x5368,      0, 0x4739,      0,      0, 0x536B, 0xB65F, 0xB660,
- 0xB661, 0xB662,      0, 0xB663, 0xB664, 0xB665, 0x536C,      0,
-      0, 0xB666,      0, 0xB667, 0x536E,      0, 0x536D, 0xB668,
-      0,      0,      0,      0, 0x5370,      0, 0xB669,      0,
-};
-static const unsigned short utf8_to_euc_E59A_x0213[] = {
- 0x5366,      0,      0,      0, 0xB654, 0xB655, 0x5365, 0x3345,
- 0xA44B,      0, 0x5367, 0xB657, 0xA44C,      0,      0, 0x536A,
-      0,      0,      0,      0, 0x5369, 0xA44D,      0,      0,
-      0, 0x2F3A, 0xA44E,      0,      0, 0xA44F, 0x2F3B, 0xB65E,
- 0x5368,      0, 0x4739,      0,      0, 0x536B, 0xB65F, 0xB660,
- 0xA450, 0x2F3C,      0, 0xB663, 0x2F3D, 0xA451, 0x536C,      0,
-      0, 0xB666, 0xA452, 0x2F3E, 0x536E,      0, 0x536D, 0xB668,
-      0,      0,      0,      0, 0x5370,      0, 0xB669,      0,
-};
-static const unsigned short utf8_to_euc_E59B[] = {
- 0x5373, 0x5371, 0x536F, 0x5372,      0, 0xB66A,      0,      0,
- 0x5374, 0xB66B, 0xB66C, 0xB66D, 0xB670, 0xB671, 0x5375, 0xB66E,
- 0xB66F, 0x5376,      0, 0x5377,      0,      0,      0, 0x5378,
- 0x5145, 0xB672, 0x3C7C, 0x3B4D, 0xB673, 0xB674, 0x3273, 0xB675,
- 0x3078, 0xB676,      0, 0x4344, 0xB677, 0xB678, 0xB679, 0xB67A,
- 0xB67B,      0,      0, 0xB67D,      0, 0xB67E, 0x5379,      0,
- 0x3A24, 0xB67C, 0x304F, 0x3F5E,      0,      0, 0xB721, 0xB722,
-      0, 0x537A, 0x3847,      0,      0, 0x3971,      0, 0x537C,
-};
-static const unsigned short utf8_to_euc_E59B_x0213[] = {
- 0x5373, 0x5371, 0x536F, 0x5372,      0, 0xA453,      0,      0,
- 0x5374, 0x2F3F, 0x2F40, 0xB66D, 0xB670, 0xA454, 0x5375, 0xB66E,
- 0xB66F, 0x5376,      0, 0x5377,      0,      0,      0, 0x5378,
- 0x5145, 0xB672, 0x3C7C, 0x3B4D, 0xB673, 0xB674, 0x3273, 0xA455,
- 0x3078, 0xB676,      0, 0x4344, 0xB677, 0xB678, 0xB679, 0xB67A,
- 0xA456,      0,      0, 0xB67D,      0, 0xB67E, 0x5379,      0,
- 0x3A24, 0xB67C, 0x304F, 0x3F5E,      0,      0, 0xA457, 0xA458,
-      0, 0x537A, 0x3847,      0,      0, 0x3971,      0, 0x537C,
-};
-static const unsigned short utf8_to_euc_E59C[] = {
- 0x537B, 0xB723, 0xB724, 0x4A60, 0x537D,      0,      0, 0xB725,
- 0x5421, 0x537E, 0xB726, 0x5422, 0xB727, 0x5423,      0, 0x3777,
-      0, 0xB728, 0x3160, 0x5424,      0, 0xB729, 0x5426,      0,
- 0x5425,      0, 0xB72A, 0xB72B, 0x5428, 0xB72C,      0, 0x455A,
- 0xB72D,      0, 0xB72E, 0xB72F, 0xB730, 0xB731, 0x5429, 0x3035,
- 0x3A5F, 0xB732, 0xB733,      0, 0xB734, 0x373D, 0xB735, 0xB736,
- 0x434F,      0,      0, 0xB737, 0xB738,      0,      0, 0x542A,
- 0x542B,      0,      0, 0x542D,      0, 0xB739, 0xB73A, 0xB73B,
-};
-static const unsigned short utf8_to_euc_E59C_x0213[] = {
- 0x537B, 0xB723, 0xB724, 0x4A60, 0x537D,      0,      0, 0xB725,
- 0x5421, 0x537E, 0x2F41, 0x5422, 0xB727, 0x5423,      0, 0x3777,
-      0, 0xB728, 0x3160, 0x5424,      0, 0xA45A, 0x5426,      0,
- 0x5425,      0, 0xB72A, 0xB72B, 0x5428, 0xB72C,      0, 0x455A,
- 0xB72D, 0x2F43, 0xB72E, 0xA45B, 0xB730, 0xB731, 0x5429, 0x3035,
- 0x3A5F, 0xA45D, 0xB733,      0, 0xB734, 0x373D, 0xB735, 0x2F44,
- 0x434F,      0,      0, 0x2F45, 0x2F46,      0,      0, 0x542A,
- 0x542B,      0,      0, 0x542D,      0, 0xB739, 0xB73A, 0xB73B,
-};
-static const unsigned short utf8_to_euc_E59D[] = {
- 0x542E,      0, 0x3A64,      0,      0, 0xB73C, 0xB73D, 0x3651,
-      0,      0, 0x4B37,      0, 0xB73E, 0xB73F, 0x542C, 0x542F,
- 0x3A41, 0x3923, 0xB740,      0,      0,      0,      0,      0,
-      0, 0xF436,      0,      0,      0,      0,      0,      0,
-      0, 0x5433, 0xB741,      0, 0x3A25, 0xB742, 0x4333, 0xB743,
- 0xB744, 0x5430, 0x445A, 0xB745,      0, 0xB746, 0xB747, 0xB748,
- 0xB749, 0xB74A,      0, 0xB74B, 0xB74C, 0xB74D,      0, 0xB74E,
-      0, 0xB74F, 0xB750, 0xB751, 0xB752,      0, 0xB753, 0x5434,
-};
-static const unsigned short utf8_to_euc_E59D_x0213[] = {
- 0x542E,      0, 0x3A64,      0,      0, 0xA45F, 0xA460, 0x3651,
-      0,      0, 0x4B37,      0, 0xA461, 0xA462, 0x542C, 0x542F,
- 0x3A41, 0x3923, 0xB740,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0, 0x5433, 0xB741,      0, 0x3A25,      0, 0x4333, 0xB743,
- 0xA464, 0x5430, 0x445A, 0xB745,      0, 0xB746, 0xB747, 0xA465,
- 0x2F47, 0xB74A,      0, 0xA466, 0xA467, 0xA468,      0, 0x2F48,
-      0, 0xB74F, 0xB750, 0xA469, 0x2F49,      0, 0xB753, 0x5434,
-};
-static const unsigned short utf8_to_euc_E59E[] = {
-      0, 0xB754, 0x3F62, 0xB755,      0,      0,      0,      0,
- 0x5432, 0x5435,      0, 0x373F, 0xB756,      0,      0,      0,
-      0,      0,      0, 0x5436, 0xB757, 0xB760,      0, 0xB758,
-      0, 0xB759, 0xB75A,      0, 0xB75B, 0xB75C, 0xB75D, 0xB75E,
- 0x5437, 0xB75F, 0x3924, 0x3340, 0x5439,      0,      0, 0xB761,
- 0xB762, 0xB763, 0x543A,      0, 0xB764,      0,      0,      0,
- 0x543B,      0,      0, 0x5438,      0,      0,      0,      0,
- 0xB765,      0,      0,      0,      0, 0xB766,      0,      0,
-};
-static const unsigned short utf8_to_euc_E59E_x0213[] = {
-      0, 0xB754, 0x3F62, 0xB755,      0,      0,      0,      0,
- 0x5432, 0x5435,      0, 0x373F, 0xB756,      0,      0,      0,
-      0,      0,      0, 0x5436, 0xB757, 0xB760,      0, 0xB758,
-      0, 0xB759, 0xA46D,      0, 0x2F4A, 0xA46E, 0xA46F, 0xB75E,
- 0x5437, 0xB75F, 0x3924, 0x3340, 0x5439,      0,      0, 0xB761,
- 0xA470, 0xB763, 0x543A,      0, 0xA46C,      0,      0,      0,
- 0x543B,      0,      0, 0x5438,      0,      0,      0,      0,
- 0x2F4D,      0,      0,      0,      0, 0xB766,      0,      0,
-};
-static const unsigned short utf8_to_euc_E59F[] = {
- 0x5431,      0,      0, 0x543C,      0,      0, 0x543D, 0xB767,
- 0xB768,      0,      0, 0x4B64, 0xB769,      0, 0x3E6B, 0xB76A,
-      0,      0, 0x543F, 0x5440, 0x543E, 0xB76B, 0x5442,      0,
-      0,      0,      0,      0, 0x4738, 0xB76C, 0xB76D, 0x3068,
- 0x4956, 0xB77E,      0, 0x5443, 0xB76E,      0, 0xB76F, 0xB770,
-      0, 0xB771,      0,      0,      0, 0xB772,      0,      0,
- 0xB773,      0,      0,      0, 0x3E7D, 0xB774, 0xB775, 0x3C39,
- 0xB776, 0x475D, 0x3470,      0, 0x3A6B, 0xB777, 0xB778, 0xB779,
-};
-static const unsigned short utf8_to_euc_E59F_x0213[] = {
- 0x5431,      0,      0, 0x543C,      0,      0, 0x543D, 0x2F4E,
- 0x2F4F,      0,      0, 0x4B64, 0xA473,      0, 0x3E6B, 0x2F50,
-      0,      0, 0x543F, 0x5440, 0x543E, 0xB76B, 0x5442, 0xA471,
-      0,      0,      0,      0, 0x4738, 0xB76C, 0xA476, 0x3068,
- 0x4956, 0xB77E,      0, 0x5443, 0x2F51,      0, 0xA477, 0xB770,
-      0, 0xB771,      0,      0,      0, 0x2F52,      0,      0,
- 0xA478,      0,      0,      0, 0x3E7D, 0x2F53, 0x2F54, 0x3C39,
- 0xA47A, 0x475D, 0x3470, 0xA47B, 0x3A6B, 0xA47C, 0xB778, 0x2F55,
-};
-static const unsigned short utf8_to_euc_E5A0[] = {
- 0x4B59,      0, 0x4632, 0xB77A, 0xB77B, 0x3778, 0x424F,      0,
- 0xB77C, 0xB77D, 0x5441, 0x5444, 0xB821, 0xB822,      0,      0,
-      0,      0,      0,      0,      0, 0x4244,      0,      0,
-      0, 0x5445,      0, 0xB823,      0, 0x5446, 0xB824, 0xB825,
- 0xB826, 0x5448,      0,      0, 0x4469,      0, 0xB827, 0xB828,
-      0,      0, 0x342E,      0,      0, 0xB829,      0, 0x7421,
- 0x3161, 0x4A73, 0xB82A,      0, 0x3E6C, 0x4548,      0,      0,
-      0, 0xB82B, 0x3A66,      0,      0, 0x544E,      0, 0xB82C,
-};
-static const unsigned short utf8_to_euc_E5A0_x0213[] = {
- 0x4B59,      0, 0x4632, 0xB77A, 0xA47D, 0x3778, 0x424F,      0,
- 0xB77C, 0x2F56, 0x5441, 0x5444, 0xB821, 0xB822,      0,      0,
-      0,      0,      0,      0,      0, 0x4244,      0,      0,
-      0, 0x5445,      0, 0xB823,      0, 0x5446, 0xA47E, 0xB825,
- 0xA521, 0x5448,      0,      0, 0x4469,      0, 0xB827, 0xA522,
-      0,      0, 0x342E,      0,      0, 0xB829,      0, 0x7421,
- 0x3161, 0x4A73, 0xA523,      0, 0x3E6C, 0x4548,      0,      0,
-      0, 0xA524, 0x3A66,      0,      0, 0x544E,      0, 0xB82C,
-};
-static const unsigned short utf8_to_euc_E5A1[] = {
- 0x4A3D, 0x4E5D,      0,      0,      0,      0,      0,      0,
-      0, 0xB82D, 0x3274, 0x544A, 0xB82E, 0xB82F,      0, 0xB830,
- 0xB831, 0x413A, 0x544D,      0, 0x4563, 0xB832,      0, 0x4549,
- 0x4564, 0x4839, 0x444D,      0,      0,      0, 0x3A49, 0xB833,
-      0, 0xB834, 0x5449,      0, 0xB835,      0,      0, 0xB836,
- 0xB837, 0x3176,      0, 0x4536,      0,      0,      0,      0,
- 0x544B,      0, 0x5447,      0,      0, 0x3F50,      0,      0,
- 0xB838, 0x544F,      0,      0, 0xB839,      0, 0x3D4E, 0xB83A,
-};
-static const unsigned short utf8_to_euc_E5A1_x0213[] = {
- 0x4A3D, 0x4E5D,      0,      0,      0,      0,      0,      0,
-      0, 0xA526, 0x3274, 0x544A, 0xA527, 0xB82F,      0, 0xB830,
- 0xB831, 0x413A, 0x544D,      0, 0x4563, 0xB832,      0, 0x4549,
- 0x4564, 0x4839, 0x444D,      0,      0,      0, 0x3A49, 0xB833,
-      0, 0x2F58, 0x5449,      0, 0x2F59,      0,      0, 0xA528,
- 0xB837, 0x3176,      0, 0x4536,      0,      0,      0,      0,
- 0x544B,      0, 0x5447,      0,      0, 0x3F50,      0,      0,
- 0xB838, 0x544F,      0,      0, 0x2F5B,      0, 0x3D4E, 0xB83A,
-};
-static const unsigned short utf8_to_euc_E5A2[] = {
- 0xB83B, 0xB83C,      0, 0x362D,      0, 0x5450,      0, 0xB83D,
- 0xB83E, 0xB83F, 0xB840,      0, 0xB841, 0xB842,      0, 0xB843,
- 0xB844,      0,      0, 0x4A68, 0xB845,      0, 0xB846, 0x417D,
-      0,      0,      0,      0, 0x4446, 0xB847, 0xF439, 0x5452,
- 0xB848, 0xB849, 0xB84A,      0,      0,      0, 0xB84B,      0,
- 0x4B4F, 0xB84C,      0, 0x5453,      0,      0, 0x5458,      0,
-      0, 0xB84D, 0xB84E, 0x4A2F,      0,      0,      0,      0,
- 0x5457, 0x5451, 0x5454, 0x5456, 0xB850,      0, 0x3A26,      0,
-};
-static const unsigned short utf8_to_euc_E5A2_x0213[] = {
- 0xB83B, 0xB83C,      0, 0x362D,      0, 0x5450,      0, 0xB83D,
- 0xB83E, 0x2F5C, 0xA529, 0xA52A, 0xB841, 0xA52B,      0, 0xA52C,
- 0xA52D,      0,      0, 0x4A68, 0xA52E,      0, 0xB846, 0x417D,
-      0,      0,      0,      0, 0x4446, 0xA52F, 0x2F5D, 0x5452,
- 0xB848, 0xB849, 0xB84A,      0,      0,      0, 0xB84B,      0,
- 0x4B4F, 0x2F5F, 0xA530, 0x5453,      0,      0, 0x5458,      0,
-      0, 0xA531,      0, 0x4A2F,      0,      0,      0,      0,
- 0x5457, 0x5451, 0x5454, 0x5456, 0xB850,      0, 0x3A26,      0,
-};
-static const unsigned short utf8_to_euc_E5A3[] = {
-      0, 0x4A49, 0xB851,      0, 0xB84F, 0x5459,      0, 0x4345,
- 0xB852,      0, 0x3275,      0, 0x3E6D, 0xB853, 0xB854,      0,
- 0xB855, 0x545B, 0xB856, 0x545A, 0xB857, 0x3968, 0xB858, 0x545C,
- 0x545E, 0x545D, 0xB859,      0, 0x5460, 0xB85A, 0x5455, 0x5462,
-      0, 0xB85B, 0xB85C,      0, 0x5461, 0x545F,      0,      0,
-      0, 0xB85D,      0, 0x3B4E, 0x3F51,      0, 0x4154, 0x5463,
- 0x403C, 0x306D, 0x4764, 0xB85E,      0,      0,      0, 0x445B,
-      0, 0x5465, 0x5464, 0x5466, 0x5467, 0x5468,      0,      0,
-};
-static const unsigned short utf8_to_euc_E5A3_x0213[] = {
-      0, 0x4A49, 0xB851, 0xA533, 0xB84F, 0x5459,      0, 0x4345,
- 0xB852,      0, 0x3275,      0, 0x3E6D, 0xA534, 0x2F62,      0,
- 0xB855, 0x545B, 0x2F61, 0x545A, 0x2F63, 0x3968, 0xB858, 0x545C,
- 0x545E, 0x545D, 0x2F64,      0, 0x5460, 0xB85A, 0x5455, 0x5462,
- 0x2F65, 0xB85B, 0xA535,      0, 0x5461, 0x545F,      0,      0,
-      0, 0x2F66,      0, 0x3B4E, 0x3F51,      0, 0x4154, 0x5463,
- 0x403C, 0x306D, 0x4764, 0xA536, 0xA537,      0,      0, 0x445B,
-      0, 0x5465, 0x5464, 0x5466, 0x5467, 0x5468,      0,      0,
-};
-static const unsigned short utf8_to_euc_E5A4[] = {
-      0,      0, 0x5469,      0,      0, 0xB85F, 0xB860,      0,
-      0, 0x4A51, 0x546A, 0xB861, 0xB862,      0,      0, 0x3246,
- 0x546B,      0, 0xB863, 0xB864, 0xB865, 0x4D3C, 0x3330,      0,
- 0x5249, 0x3D48, 0x423F, 0x546C, 0x4C6B, 0xB867,      0,      0,
-      0, 0xB868, 0x4C34, 0xB869, 0xB86A, 0x546E,      0, 0x4267,
- 0xB86B, 0x4537, 0x4240, 0x4957, 0x546F, 0x5470, 0x317B, 0xB86C,
- 0xB86D, 0x3C3A, 0x5471, 0xB86E,      0, 0xB86F, 0xB870, 0x3050,
- 0x5472,      0,      0,      0,      0,      0, 0x5473, 0xB871,
-};
-static const unsigned short utf8_to_euc_E5A4_x0213[] = {
-      0,      0, 0x5469,      0,      0, 0xA538, 0xA539,      0,
-      0, 0x4A51, 0x546A, 0xA53A, 0x2F67, 0xA53B,      0, 0x3246,
- 0x546B,      0, 0xB863, 0xB864, 0xA53C, 0x4D3C, 0x3330,      0,
- 0x5249, 0x3D48, 0x423F, 0x546C, 0x4C6B, 0xB867,      0,      0,
-      0, 0xB868, 0x4C34, 0xB869, 0xA53D, 0x546E,      0, 0x4267,
- 0xB86B, 0x4537, 0x4240, 0x4957, 0x546F, 0x5470, 0x317B, 0xB86C,
- 0xB86D, 0x3C3A, 0x5471, 0xB86E,      0, 0xB86F, 0xB870, 0x3050,
- 0x5472,      0,      0,      0,      0, 0xA540, 0x5473, 0xB871,
-};
-static const unsigned short utf8_to_euc_E5A5[] = {
-      0,      0,      0, 0xB872, 0x3162,      0, 0xB873, 0x3471,
- 0x4660, 0x4A74,      0,      0,      0,      0, 0x5477, 0x4155,
- 0x5476, 0x3740, 0xB874, 0xB875, 0x4B5B, 0x5475,      0, 0x4565,
- 0x5479, 0xB876, 0x5478, 0xB877,      0, 0xB878, 0xB879, 0xB87A,
- 0x547B, 0xB87B, 0x547A, 0xB87C,      0, 0x317C,      0, 0x547C,
- 0x3E29, 0x547E, 0x4325, 0xB87D, 0x547D, 0xB87E, 0x4A33, 0xB921,
-      0,      0, 0xB922, 0x3D77, 0x455B, 0xB923, 0xB924,      0,
- 0x5521, 0xB925,      0, 0xB926, 0xB927, 0x3925,      0,      0,
-};
-static const unsigned short utf8_to_euc_E5A5_x0213[] = {
-      0,      0,      0, 0xB872, 0x3162,      0, 0xA542, 0x3471,
- 0x4660, 0x4A74,      0,      0,      0,      0, 0x5477, 0x4155,
- 0x5476, 0x3740, 0xB874,      0, 0x4B5B, 0x5475,      0, 0x4565,
- 0x5479, 0xB876, 0x5478, 0xA545,      0, 0x2F69, 0xB879, 0xA546,
- 0x547B, 0xB87B, 0x547A,      0,      0, 0x317C,      0, 0x547C,
- 0x3E29, 0x547E, 0x4325, 0xB87D, 0x547D, 0x2F6A, 0x4A33, 0xB921,
-      0,      0, 0xB922, 0x3D77, 0x455B, 0xA548, 0xA549,      0,
- 0x5521, 0xB925,      0, 0xB926, 0xA54A, 0x3925,      0,      0,
-};
-static const unsigned short utf8_to_euc_E5A6[] = {
-      0, 0x5522, 0x4721, 0x485E, 0x4C51,      0,      0,      0,
-      0,      0, 0x4725, 0xB928, 0xB929, 0x552B, 0xB92A,      0,
-      0,      0, 0xB92B, 0x3538,      0, 0xB92C, 0x4D45, 0xB92D,
-      0, 0x4C2F,      0, 0x562C,      0, 0x5523,      0, 0xB92E,
-      0,      0,      0, 0x5526, 0xB92F, 0x4245,      0, 0xB930,
- 0x4B38,      0,      0,      0, 0x454A, 0xB931, 0xB932, 0xB933,
- 0xB934,      0, 0x5527, 0xB935,      0,      0,      0, 0xB936,
-      0, 0x4B65, 0xB937, 0x3A4A, 0xB938,      0, 0x3E2A,      0,
-};
-static const unsigned short utf8_to_euc_E5A6_x0213[] = {
-      0, 0x5522, 0x4721, 0x485E, 0x4C51,      0,      0,      0,
-      0,      0, 0x4725, 0x2F6B, 0xB929, 0x552B, 0xB92A,      0,
-      0,      0, 0x2F6C, 0x3538,      0, 0xB92C, 0x4D45, 0xB92D,
-      0, 0x4C2F,      0, 0x562C,      0, 0x5523,      0, 0xA54B,
-      0,      0,      0, 0x5526, 0x2F6D, 0x4245,      0, 0xB930,
- 0x4B38,      0,      0,      0, 0x454A, 0xB931, 0xA54C, 0xB933,
- 0xB934,      0, 0x5527, 0xB935,      0,      0,      0, 0xB936,
-      0, 0x4B65,      0, 0x3A4A, 0xA54D,      0, 0x3E2A,      0,
-};
-static const unsigned short utf8_to_euc_E5A7[] = {
-      0, 0xB939,      0, 0xB93A, 0xB93B,      0, 0x5528,      0,
- 0xB93C, 0x3B50, 0xB93D, 0x3B4F,      0, 0xB93E,      0,      0,
- 0x3039, 0x3848, 0xB93F, 0x402B, 0x3051,      0,      0,      0,
-      0, 0x552C, 0x552D,      0, 0x552A, 0xB940, 0xB941, 0xB942,
-      0,      0,      0, 0xB943, 0xB944, 0x3138, 0x342F, 0xB945,
- 0x5529,      0, 0x4C45, 0x4931,      0,      0, 0xB946, 0xB947,
-      0, 0xB948, 0xB949,      0, 0xB94A,      0, 0x3028, 0xB94B,
-      0,      0,      0, 0x3079,      0,      0,      0, 0x3B51,
-};
-static const unsigned short utf8_to_euc_E5A7_x0213[] = {
-      0, 0xB939,      0, 0x2F6E, 0xB93B,      0, 0x5528,      0,
- 0xA54E, 0x3B50, 0xB93D, 0x3B4F,      0, 0xA54F,      0,      0,
- 0x3039, 0x3848, 0x2F6F, 0x402B, 0x3051,      0,      0,      0,
-      0, 0x552C, 0x552D,      0, 0x552A, 0x2F70, 0xA550, 0xB942,
-      0,      0,      0, 0xA551, 0xA552, 0x3138, 0x342F, 0xA553,
- 0x5529,      0, 0x4C45, 0x4931,      0,      0, 0xA554, 0xB947,
-      0, 0xB948, 0xB949,      0, 0xB94A,      0, 0x3028, 0xB94B,
- 0x7E7A,      0,      0, 0x3079,      0,      0,      0, 0x3B51,
-};
-static const unsigned short utf8_to_euc_E5A8[] = {
- 0xB94C, 0x3052,      0, 0x3023, 0xB94D,      0,      0,      0,
-      0, 0x5532,      0,      0, 0xB94E, 0xB94F, 0xB950,      0,
-      0, 0x5530, 0xB951, 0xB952,      0,      0,      0,      0,
- 0x4C3C,      0, 0x5533,      0, 0x5531,      0, 0xB953, 0x552F,
- 0x3F31,      0,      0, 0xB954, 0xB955, 0x552E,      0, 0xB956,
- 0xB957, 0x4A5A, 0xB958,      0,      0, 0xB959,      0, 0x3864,
- 0xB95A,      0,      0,      0,      0, 0x5537, 0x5538,      0,
-      0,      0,      0,      0, 0x3E2B,      0,      0,      0,
-};
-static const unsigned short utf8_to_euc_E5A8_x0213[] = {
- 0xB94C, 0x3052,      0, 0x3023, 0xB94D,      0,      0,      0,
-      0, 0x5532,      0,      0, 0xA558, 0xA559, 0xB950,      0,
-      0, 0x5530, 0xB951, 0x2F71,      0,      0,      0, 0xA55A,
- 0x4C3C,      0, 0x5533,      0, 0x5531,      0, 0xB953, 0x552F,
- 0x3F31,      0,      0, 0x2F72, 0xB955, 0x552E,      0, 0xA55B,
- 0xB957, 0x4A5A, 0xB958,      0,      0, 0xA55C,      0, 0x3864,
- 0xB95A,      0,      0,      0,      0, 0x5537, 0x5538,      0,
-      0,      0,      0,      0, 0x3E2B,      0,      0,      0,
-};
-static const unsigned short utf8_to_euc_E5A9[] = {
- 0x5534, 0x4F2C,      0,      0, 0xB95B, 0xB95C, 0x474C, 0xB95D,
- 0xB95E, 0x5536,      0,      0, 0xB95F,      0,      0,      0,
- 0xB960,      0,      0,      0,      0, 0xB961,      0,      0,
-      0,      0, 0x3A27,      0,      0,      0, 0xB962,      0,
-      0,      0, 0x5539, 0xB963,      0, 0xB964, 0x4958, 0xB965,
-      0,      0, 0x553A,      0, 0x5535, 0xB966,      0,      0,
-      0,      0,      0,      0,      0,      0,      0, 0xB967,
-      0,      0, 0xB968, 0xB969,      0,      0, 0xB96A, 0x4C3B,
-};
-static const unsigned short utf8_to_euc_E5A9_x0213[] = {
- 0x5534, 0x4F2C,      0,      0, 0xB95B, 0xB95C, 0x474C, 0xB95D,
- 0xB95E, 0x5536,      0,      0, 0xB95F,      0,      0,      0,
- 0xB960,      0,      0,      0,      0, 0xA55D,      0,      0,
-      0,      0, 0x3A27,      0,      0,      0, 0xB962,      0,
-      0,      0, 0x5539, 0xB963,      0, 0xA55E, 0x4958, 0x2F73,
-      0,      0, 0x553A,      0, 0x5535, 0x2F74,      0,      0,
-      0,      0,      0,      0,      0,      0,      0, 0x2F75,
-      0,      0, 0xA55F, 0xB969,      0,      0, 0x2F76, 0x4C3B,
-};
-static const unsigned short utf8_to_euc_E5AA[] = {
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0, 0xB96B,      0,      0,      0,      0,
- 0xB96C,      0, 0x475E, 0xB96D,      0,      0, 0xB96E,      0,
-      0, 0xB96F, 0x553B, 0x4932, 0xB970,      0, 0xB971, 0xB972,
- 0xB973,      0, 0xB974,      0,      0,      0,      0, 0xB975,
-      0,      0,      0,      0, 0xB976,      0,      0,      0,
-      0, 0xB977, 0xB978, 0xB979,      0, 0xB97A,      0,      0,
- 0xB97B,      0, 0xB97C, 0xB97D, 0x553C, 0x5540, 0x553D, 0xB97E,
-};
-static const unsigned short utf8_to_euc_E5AA_x0213[] = {
-      0,      0,      0,      0, 0x2F77,      0,      0,      0,
-      0,      0,      0, 0xA560,      0,      0,      0,      0,
- 0xB96C,      0, 0x475E, 0xB96D,      0,      0, 0xB96E,      0,
-      0, 0xB96F, 0x553B, 0x4932, 0xA561,      0, 0x2F78, 0xA562,
- 0xA563,      0, 0xA564,      0,      0,      0,      0, 0x2F79,
-      0,      0,      0,      0, 0xB976,      0,      0,      0,
-      0, 0xA565, 0xB978, 0xA566,      0, 0xA567,      0,      0,
- 0xB97B,      0, 0xA568, 0xB97D, 0x553C, 0x5540, 0x553D, 0xA569,
-};
-static const unsigned short utf8_to_euc_E5AB[] = {
-      0, 0x3247, 0x553F,      0, 0xBA21,      0, 0xBA22,      0,
- 0xBA23, 0x3C3B,      0, 0x553E, 0x3779,      0,      0, 0xBA24,
- 0x554C,      0,      0,      0,      0,      0, 0x5545, 0x5542,
-      0,      0, 0xBA25,      0, 0xBA26,      0,      0,      0,
- 0xBA27, 0x4364,      0, 0x5541,      0, 0xBA28, 0x5543,      0,
-      0, 0x5544, 0xBA29,      0,      0,      0, 0xBA2A,      0,
-      0,      0,      0,      0,      0, 0xBA2B, 0xBA2C,      0,
-      0,      0, 0x5546, 0x5547,      0, 0xBA2D,      0,      0,
-};
-static const unsigned short utf8_to_euc_E5AB_x0213[] = {
-      0, 0x3247, 0x553F,      0, 0x2F7A,      0, 0xBA22,      0,
- 0xBA23, 0x3C3B,      0, 0x553E, 0x3779,      0,      0, 0xBA24,
- 0x554C,      0,      0,      0,      0,      0, 0x5545, 0x5542,
-      0,      0, 0xA56A,      0, 0xA56B,      0,      0,      0,
- 0xA56C, 0x4364,      0, 0x5541,      0, 0xA56D, 0x5543,      0,
-      0, 0x5544, 0xBA29,      0,      0,      0, 0xA56F,      0,
- 0xA56E,      0,      0,      0,      0, 0xA570, 0xBA2C,      0,
-      0,      0, 0x5546, 0x5547,      0, 0xBA2D,      0,      0,
-};
-static const unsigned short utf8_to_euc_E5AC[] = {
- 0xBA2E, 0xBA2F,      0,      0,      0,      0,      0,      0,
- 0xBA30, 0x3472,      0, 0x5549, 0x5548,      0,      0,      0,
-      0,      0,      0,      0,      0,      0, 0x554A, 0xBA31,
-      0, 0xBA33,      0, 0xBA34,      0, 0xBA35,      0,      0,
-      0, 0xBA36, 0x3E6E,      0,      0, 0xBA37,      0,      0,
-      0,      0, 0x554D,      0, 0x445C, 0xBA38,      0,      0,
- 0x3145,      0, 0x554B,      0, 0xBA32,      0, 0x554E,      0,
- 0xBA39,      0,      0,      0,      0,      0, 0x554F,      0,
-};
-static const unsigned short utf8_to_euc_E5AC_x0213[] = {
- 0xA571, 0xBA2F,      0,      0,      0,      0,      0,      0,
- 0xA572, 0x3472,      0, 0x5549, 0x5548,      0,      0,      0,
-      0,      0,      0,      0,      0,      0, 0x554A, 0xA573,
-      0, 0x2F7C,      0, 0xBA34,      0, 0xBA35,      0,      0,
-      0, 0xBA36, 0x3E6E,      0,      0, 0x2F7D,      0,      0,
-      0,      0, 0x554D,      0, 0x445C, 0xA575,      0,      0,
- 0x3145,      0, 0x554B,      0, 0xA574,      0, 0x554E,      0,
- 0xBA39,      0,      0,      0,      0,      0, 0x554F,      0,
-};
-static const unsigned short utf8_to_euc_E5AD[] = {
- 0x5552, 0xBA3A,      0, 0x5550,      0, 0x5551,      0,      0,
-      0,      0,      0, 0xBA3B, 0xBA3C,      0,      0,      0,
- 0x3B52, 0x5553, 0xBA3D,      0, 0x3926, 0x5554, 0xBA3E, 0x3B7A,
- 0x4238,      0, 0x5555, 0x5556, 0x3B5A, 0x3927, 0xBA3F, 0x4C52,
-      0,      0,      0, 0x3528, 0x3849, 0x5557, 0x3358,      0,
- 0xBA40, 0x5558,      0, 0x4239,      0,      0, 0xBA41, 0xBA42,
- 0x5559, 0x5623,      0, 0x555A,      0, 0x555B,      0,      0,
- 0x555C,      0, 0x555E,      0, 0xBA43, 0xBA44, 0xBA45, 0xBA46,
-};
-static const unsigned short utf8_to_euc_E5AD_x0213[] = {
- 0x5552, 0x4F55,      0, 0x5550,      0, 0x5551,      0,      0,
-      0,      0,      0, 0xBA3B, 0xA576,      0,      0,      0,
- 0x3B52, 0x5553, 0xA577,      0, 0x3926, 0x5554, 0x4F56, 0x3B7A,
- 0x4238,      0, 0x5555, 0x5556, 0x3B5A, 0x3927, 0xBA3F, 0x4C52,
-      0,      0,      0, 0x3528, 0x3849, 0x5557, 0x3358,      0,
- 0xA578, 0x5558,      0, 0x4239,      0,      0, 0xBA41, 0xA579,
- 0x5559, 0x5623,      0, 0x555A,      0, 0x555B,      0,      0,
- 0x555C,      0, 0x555E,      0, 0xA57A, 0x4F57, 0xBA45, 0xA57B,
-};
-static const unsigned short utf8_to_euc_E5AE[] = {
- 0x555F, 0xBA47,      0, 0x5560, 0xBA48, 0x4270, 0xBA49, 0x3127,
- 0x3C69, 0x3042, 0xBA4A, 0x4157, 0x3430, 0x3C35, 0xBA4B, 0x3928,
- 0xBA4C, 0xBA4D,      0, 0xBA4E, 0xBA4F, 0x4566, 0xBA50, 0x3D21,
- 0x3431, 0x4368, 0x446A, 0x3038, 0x3539, 0x4A75,      0, 0x3C42,
-      0,      0, 0x3552, 0x406B, 0x3C3C, 0x4D28, 0x5561,      0,
- 0xBA51, 0xBA52,      0,      0, 0xBA53, 0xBA54, 0x355C, 0xBA55,
- 0x3A4B, 0xBA56, 0xBA57, 0x3332, 0x3163, 0x3E2C, 0x3248, 0xBA58,
- 0x5562, 0x4D46, 0xBA59,      0, 0xBA5A,      0,      0, 0x3D49,
-};
-static const unsigned short utf8_to_euc_E5AE_x0213[] = {
- 0x555F, 0xA57C,      0, 0x5560, 0xA57D, 0x4270, 0xBA49, 0x3127,
- 0x3C69, 0x3042, 0xBA4A, 0x4157, 0x3430, 0x3C35, 0xBA4B, 0x3928,
- 0xBA4C, 0xBA4D,      0, 0x4F58, 0xBA4F, 0x4566, 0xA821, 0x3D21,
- 0x3431, 0x4368, 0x446A, 0x3038, 0x3539, 0x4A75,      0, 0x3C42,
-      0,      0, 0x3552, 0x406B, 0x3C3C, 0x4D28, 0x5561,      0,
- 0xBA51, 0xBA52,      0,      0, 0xA822, 0xBA54, 0x355C, 0xBA55,
- 0x3A4B, 0xBA56, 0xBA57, 0x3332, 0x3163, 0x3E2C, 0x3248, 0xBA58,
- 0x5562, 0x4D46, 0xBA59,      0, 0xBA5A,      0,      0, 0x3D49,
-};
-static const unsigned short utf8_to_euc_E5AF[] = {
- 0xBA5B, 0xBA5C, 0x3C64, 0x5563, 0x3473, 0x4652, 0x4C29, 0x5564,
-      0, 0x5565,      0,      0, 0x4959, 0xBA5D,      0, 0xBA5E,
- 0x5567,      0, 0x3428, 0x3677, 0x5566,      0, 0xBA5F, 0xBA60,
- 0xBA61, 0xBA62, 0xBA63, 0x3432,      0, 0x3F32, 0x556B, 0x3B21,
- 0xBA64, 0x3249, 0x556A,      0, 0x5568, 0x556C, 0x5569, 0x472B,
- 0x5C4D, 0x3F33,      0, 0x556D, 0xF43A,      0, 0x4E40, 0xBA65,
- 0x556E, 0xBA66,      0, 0x5570, 0xBA67, 0x437E, 0x556F,      0,
- 0x4023,      0, 0x3B7B,      0,      0, 0xBA68, 0x4250, 0x3C77,
-};
-static const unsigned short utf8_to_euc_E5AF_x0213[] = {
- 0xA824, 0xBA5C, 0x3C64, 0x5563, 0x3473, 0x4652, 0x4C29, 0x5564,
-      0, 0x5565,      0,      0, 0x4959, 0xBA5D, 0xA826, 0xBA5E,
- 0x5567,      0, 0x3428, 0x3677, 0x5566,      0, 0xA827, 0xBA60,
- 0x4F59, 0xBA62, 0xBA63, 0x3432,      0, 0x3F32, 0x556B, 0x3B21,
- 0xBA64, 0x3249, 0x556A,      0, 0x5568, 0x556C, 0x5569, 0x472B,
- 0x5C4D, 0x3F33,      0, 0x556D, 0x4F5A,      0, 0x4E40, 0xBA65,
- 0x556E, 0xA82A,      0, 0x5570, 0xBA67, 0x437E, 0x556F,      0,
- 0x4023,      0, 0x3B7B,      0,      0, 0xA82B, 0x4250, 0x3C77,
-};
-static const unsigned short utf8_to_euc_E5B0[] = {
-      0, 0x4975, 0x406C,      0, 0x3C4D, 0x5571, 0x3E2D, 0x5572,
- 0x5573, 0x3053, 0x423A, 0x3F52, 0xBA69, 0x5574, 0x4633, 0x3E2E,
-      0, 0x3E2F,      0, 0x5575,      0,      0, 0x406D, 0xBA6A,
-      0,      0, 0x3E30,      0,      0,      0, 0xBA6B, 0xBA6C,
- 0x5576,      0, 0x5577, 0xBA6D, 0x4C60,      0, 0xBA6E,      0,
- 0x5578, 0xBA6F,      0, 0xBA70, 0xBA71, 0x3646, 0xBA72,      0,
- 0xBA73, 0x3D22, 0xBA74,      0,      0, 0xBA75, 0xBA76,      0,
- 0x5579, 0x557A, 0x3C5C, 0x3F2C, 0x4674, 0x3F54, 0x4878, 0x4722,
-};
-static const unsigned short utf8_to_euc_E5B0_x0213[] = {
-      0, 0x4975, 0x406C, 0xA82D, 0x3C4D, 0x5571, 0x3E2D, 0x5572,
- 0x5573, 0x3053, 0x423A, 0x3F52, 0xBA69, 0x5574, 0x4633, 0x3E2E,
-      0, 0x3E2F, 0x4F5B, 0x5575,      0,      0, 0x406D, 0xBA6A,
-      0,      0, 0x3E30,      0,      0,      0, 0x4F5C, 0xBA6C,
- 0x5576,      0, 0x5577, 0x4F5D, 0x4C60,      0, 0xBA6E,      0,
- 0x5578, 0xA82E,      0, 0x4F5E, 0xBA71, 0x3646, 0xBA72,      0,
- 0xA82F, 0x3D22, 0xBA74,      0,      0, 0xBA75, 0xBA76,      0,
- 0x5579, 0x557A, 0x3C5C, 0x3F2C, 0x4674, 0x3F54, 0x4878, 0x4722,
-};
-static const unsigned short utf8_to_euc_E5B1[] = {
- 0x3649, 0x557B,      0,      0,      0, 0x356F, 0x557C,      0,
- 0x367E,      0, 0x464F, 0x3230,      0, 0x3B53, 0x557D, 0x5622,
- 0x5621, 0x367D,      0, 0x557E,      0, 0x4538,      0,      0,
-      0, 0xBA77, 0xBA78,      0, 0xBA79,      0, 0x4230,      0,
- 0x454B, 0x3C48, 0xBA7A, 0xBA7B, 0x4158, 0x4D7A,      0, 0xBA7C,
- 0xBA7D, 0xBA7E,      0,      0, 0x5624, 0xBB21, 0x5625, 0x4656,
- 0xBB22, 0x3B33,      0,      0, 0xBB23, 0xBB24, 0x5627,      0,
-      0, 0x5628, 0xBB25, 0xBB26, 0xBB27, 0xBB28,      0,      0,
-};
-static const unsigned short utf8_to_euc_E5B1_x0213[] = {
- 0x3649, 0x557B,      0,      0,      0, 0x356F, 0x557C,      0,
- 0x367E,      0, 0x464F, 0x3230,      0, 0x3B53, 0x557D, 0x5622,
- 0x5621, 0x367D,      0, 0x557E,      0, 0x4538,      0,      0,
-      0, 0xBA77, 0xBA78, 0x7E7B, 0xBA79,      0, 0x4230, 0xA831,
- 0x454B, 0x3C48, 0x4F60, 0xA832, 0x4158, 0x4D7A,      0, 0xA833,
- 0xA834, 0xA835,      0,      0, 0x5624, 0xBB21, 0x5625, 0x4656,
- 0xA836, 0x3B33,      0,      0, 0xBB23, 0xBB24, 0x5627,      0,
-      0, 0x5628, 0x4F64, 0xBB26, 0xA839, 0xBB28,      0,      0,
-};
-static const unsigned short utf8_to_euc_E5B2[] = {
-      0,      0,      0,      0,      0,      0,      0, 0xBB29,
- 0xBB2A,      0, 0xBB2B,      0, 0x5629,      0,      0, 0xBB2C,
- 0x3474, 0x562A, 0xBB2D,      0, 0x562B,      0,      0,      0,
-      0,      0,      0,      0,      0, 0xBB2E,      0, 0xBB2F,
- 0xBB30, 0x322C, 0xBB31, 0xBB32,      0,      0, 0xBB33,      0,
- 0x413B, 0x3464, 0xBB34, 0x562D, 0x4C28,      0,      0,      0,
-      0, 0x4252, 0xBB35, 0x3359, 0xBB36, 0xBB37, 0x562F, 0x5631,
- 0x345F,      0, 0xBB38, 0x562E, 0x5630,      0, 0x5633,      0,
-};
-static const unsigned short utf8_to_euc_E5B2_x0213[] = {
-      0,      0,      0,      0,      0,      0,      0, 0xBB29,
- 0xA83C,      0, 0xA83D,      0, 0x5629,      0,      0, 0x4F65,
- 0x3474, 0x562A, 0xBB2D,      0, 0x562B,      0,      0,      0,
-      0,      0,      0,      0,      0, 0xBB2E,      0, 0x4F66,
- 0xA841, 0x322C, 0xA842, 0x4F67,      0,      0, 0xA843, 0xA844,
- 0x413B, 0x3464, 0x4F68, 0x562D, 0x4C28, 0xA846,      0,      0,
-      0, 0x4252, 0xBB35, 0x3359, 0xBB36, 0xA847, 0x562F, 0x5631,
- 0x345F,      0, 0x4F69, 0x562E, 0x5630,      0, 0x5633,      0,
-};
-static const unsigned short utf8_to_euc_E5B3[] = {
-      0,      0,      0,      0,      0, 0x5632,      0, 0x5634,
-      0, 0xBB39,      0, 0xBB3A,      0,      0,      0,      0,
-      0,      0, 0xBB3B,      0,      0,      0,      0, 0xBB3D,
-      0, 0x5635,      0,      0,      0, 0xBB3C,      0,      0,
- 0x463D, 0x362E,      0,      0,      0,      0,      0,      0,
- 0x3265, 0x5636, 0x563B,      0,      0, 0x5639, 0xBB3E, 0x4A77,
- 0x4A76, 0xBB3F, 0xBB40,      0, 0xBB41, 0xF43B, 0x4567,      0,
-      0,      0, 0x5638, 0x3D54,      0, 0x5637,      0,      0,
-};
-static const unsigned short utf8_to_euc_E5B3_x0213[] = {
-      0,      0,      0,      0,      0, 0x5632,      0, 0x5634,
-      0, 0xA849,      0, 0x4F6A,      0,      0,      0,      0,
- 0x4F6B,      0, 0x4F6C,      0,      0,      0,      0, 0xBB3D,
-      0, 0x5635,      0,      0,      0, 0xBB3C,      0,      0,
- 0x463D, 0x362E,      0,      0,      0,      0,      0,      0,
- 0x3265, 0x5636, 0x563B,      0,      0, 0x5639, 0xBB3E, 0x4A77,
- 0x4A76, 0xBB3F, 0xBB40,      0, 0x4F6D,      0, 0x4567,      0,
-      0,      0, 0x5638, 0x3D54,      0, 0x5637,      0,      0,
-};
-static const unsigned short utf8_to_euc_E5B4[] = {
-      0, 0xBB42,      0,      0,      0,      0, 0xBB43, 0x3F72,
-      0,      0,      0, 0x563C,      0, 0xBB44, 0x3A6A,      0,
-      0, 0x5642, 0xBB45,      0, 0x5643, 0x563D, 0x3333, 0x563E,
- 0x5647, 0x5646, 0x5645, 0x5641,      0,      0,      0, 0x5640,
-      0,      0, 0x5644, 0xBB47, 0xBB48,      0, 0xBB49, 0xBB4A,
-      0, 0x4A78,      0, 0xBB46,      0,      0,      0,      0,
-      0, 0xBB4B,      0,      0, 0xBB4C,      0,      0,      0,
-      0, 0xBB4D,      0,      0,      0, 0xBB4E,      0, 0xBB4F,
-};
-static const unsigned short utf8_to_euc_E5B4_x0213[] = {
-      0, 0xBB42,      0,      0,      0,      0, 0xA84C, 0x3F72,
-      0,      0,      0, 0x563C,      0, 0x4F70, 0x3A6A,      0,
- 0xA84D, 0x5642, 0xBB45,      0, 0x5643, 0x563D, 0x3333, 0x563E,
- 0x5647, 0x5646, 0x5645, 0x5641,      0, 0xA84F,      0, 0x5640,
- 0xA850,      0, 0x5644, 0xBB47, 0xA851,      0, 0xA852, 0x4F71,
-      0, 0x4A78,      0, 0xA84E,      0,      0,      0,      0,
-      0, 0xA853,      0,      0, 0xBB4C,      0,      0,      0,
-      0, 0xA854,      0,      0,      0, 0xBB4E,      0, 0xBB4F,
-};
-static const unsigned short utf8_to_euc_E5B5[] = {
-      0,      0, 0xBB50, 0xBB51,      0,      0, 0xBB52,      0,
- 0xBB53,      0, 0xBB57, 0x564B, 0x5648,      0, 0x564A,      0,
- 0x4D72, 0xBB55, 0x5649, 0xF43C,      0, 0xBB54,      0,      0,
-      0, 0xBB56,      0,      0, 0x563F,      0,      0, 0xBB58,
- 0xBB59, 0xBB5A, 0xBB5B,      0, 0xBB5C,      0,      0,      0,
-      0, 0x3F73, 0xBB5D,      0, 0x564C, 0xBB5E,      0, 0x3A37,
- 0xBB5F,      0,      0, 0x564D,      0,      0, 0x564E,      0,
-      0, 0xBB60, 0xBB61,      0,      0,      0, 0xBB62, 0xBB63,
-};
-static const unsigned short utf8_to_euc_E5B5_x0213[] = {
-      0,      0, 0xA855, 0xBB51,      0,      0, 0x4F73, 0x4F74,
- 0xBB53,      0, 0x4F76, 0x564B, 0x5648,      0, 0x564A,      0,
- 0x4D72, 0xBB55, 0x5649, 0x4F75,      0, 0xBB54,      0,      0,
-      0, 0xBB56,      0,      0, 0x563F,      0,      0, 0xBB58,
- 0xBB59, 0xA857, 0xBB5B,      0, 0xBB5C,      0,      0,      0,
-      0, 0x3F73, 0xA858,      0, 0x564C, 0x4F77,      0, 0x3A37,
- 0xA85A,      0,      0, 0x564D,      0,      0, 0x564E,      0,
-      0, 0xBB60, 0xBB61,      0,      0,      0, 0xBB62, 0xBB63,
-};
-static const unsigned short utf8_to_euc_E5B6[] = {
-      0, 0xBB64, 0x5651, 0xBB65, 0x5650,      0,      0, 0x564F,
- 0xBB66,      0, 0xBB67, 0x4568, 0x563A,      0,      0,      0,
- 0x5657,      0, 0xBB68, 0xBB69, 0xBB6A, 0xBB6B,      0,      0,
-      0, 0xBB6C,      0, 0xBB6D,      0, 0x5653,      0, 0xBB6E,
- 0xBB6F,      0, 0x5652,      0,      0,      0,      0, 0xBB70,
-      0,      0,      0, 0xBB71, 0x5654,      0, 0x5655,      0,
- 0xBB72,      0, 0xE674,      0, 0xBB73,      0,      0, 0x5658,
- 0xBB74, 0xBB75, 0x4E66,      0, 0x5659, 0x5656,      0,      0,
-};
-static const unsigned short utf8_to_euc_E5B6_x0213[] = {
-      0, 0x4F78, 0x5651, 0xBB65, 0x5650,      0,      0, 0x564F,
- 0xA85D,      0, 0xBB67, 0x4568, 0x563A,      0,      0,      0,
- 0x5657,      0, 0xA85F, 0xBB69, 0xA860, 0xBB6B,      0, 0xA861,
-      0, 0xA862,      0, 0xBB6D,      0, 0x5653,      0, 0xBB6E,
- 0x4F79,      0, 0x5652,      0, 0x4F7A,      0,      0, 0x4F7B,
-      0,      0,      0, 0xBB71, 0x5654,      0, 0x5655,      0,
- 0xA863,      0, 0xA864,      0, 0xA865,      0,      0, 0x5658,
- 0x4F7C, 0xA867, 0x4E66,      0, 0x5659, 0x5656,      0,      0,
-};
-static const unsigned short utf8_to_euc_E5B7[] = {
-      0,      0,      0, 0xBB76,      0,      0,      0, 0xBB77,
-      0, 0x565A,      0, 0xBB78, 0x3460, 0x565B, 0xBB7A,      0,
- 0xBB79,      0, 0x565D, 0x565C,      0,      0, 0x565E,      0,
- 0xBB7B, 0xBB7C,      0, 0x565F,      0, 0x406E, 0x3D23,      0,
- 0xBB7D, 0x3D64,      0, 0x4163, 0xBB7E, 0x3929, 0x3A38, 0x392A,
- 0x3570, 0xBC21,      0, 0x5660,      0,      0, 0x3A39,      0,
-      0, 0x384A, 0x5661, 0x4C26, 0x4743, 0x5662,      0, 0x392B,
- 0xBC22, 0xBC23,      0, 0x342C,      0, 0x4327, 0x3652,      0,
-};
-static const unsigned short utf8_to_euc_E5B7_x0213[] = {
-      0,      0,      0, 0xBB76,      0,      0,      0, 0xBB77,
-      0, 0x565A,      0, 0x4F7D, 0x3460, 0x565B, 0xBB7A,      0,
-      0, 0xA868, 0x565D, 0x565C,      0,      0, 0x565E, 0xA869,
- 0xA86A, 0xBB7C,      0, 0x565F,      0, 0x406E, 0x3D23,      0,
- 0xA86B, 0x3D64, 0x7428, 0x4163, 0xA86D, 0x3929, 0x3A38, 0x392A,
- 0x3570, 0xA86E,      0, 0x5660,      0,      0, 0x3A39,      0,
-      0, 0x384A, 0x5661, 0x4C26, 0x4743, 0x5662,      0, 0x392B,
- 0xBC22, 0xBC23,      0, 0x342C,      0, 0x4327, 0x3652,      0,
-};
-static const unsigned short utf8_to_euc_E5B8[] = {
- 0xBC24,      0, 0x3B54, 0x495B,      0,      0, 0x4841, 0xBC25,
-      0,      0,      0, 0x5663, 0x3475, 0xBC26,      0,      0,
-      0, 0x5666, 0xBC27,      0, 0xBC28, 0xBC29, 0x4421,      0,
- 0xBC2A, 0x5665, 0x5664, 0x5667,      0, 0x446B,      0, 0xBC2B,
- 0xBC2C,      0,      0,      0,      0, 0x3F63,      0,      0,
- 0xBC2E,      0,      0, 0x3B55,      0, 0x404A, 0xBC2D, 0x4253,
- 0x3522,      0, 0xBC2F, 0x4422,      0, 0xBC30, 0x5668, 0x5669,
- 0x3E6F,      0,      0,      0,      0, 0x4B39, 0xBC31,      0,
-};
-static const unsigned short utf8_to_euc_E5B8_x0213[] = {
- 0xA870,      0, 0x3B54, 0x495B,      0,      0, 0x4841, 0xBC25,
-      0,      0,      0, 0x5663, 0x3475, 0xBC26,      0,      0,
-      0, 0x5666, 0xA872,      0, 0x7429, 0xA873, 0x4421,      0,
- 0x742A, 0x5665, 0x5664, 0x5667,      0, 0x446B,      0, 0xA875,
- 0xBC2C,      0,      0,      0,      0, 0x3F63,      0,      0,
- 0xBC2E,      0,      0, 0x3B55,      0, 0x404A, 0xA876, 0x4253,
- 0x3522,      0, 0xBC2F, 0x4422,      0, 0xBC30, 0x5668, 0x5669,
- 0x3E6F,      0,      0,      0,      0, 0x4B39, 0xA877,      0,
-};
-static const unsigned short utf8_to_euc_E5B9[] = {
- 0x566C,      0,      0, 0x566B, 0x566A, 0x497D,      0, 0x5673,
-      0, 0xBC34,      0, 0xBC32, 0x4B5A,      0, 0x566D,      0,
- 0xBC33, 0xBC35,      0,      0, 0x566F, 0x4B6B, 0xBC36, 0x566E,
- 0xBC37,      0,      0, 0xBC38, 0xBC39,      0, 0xBC3A, 0x5670,
-      0, 0x4828, 0x5671, 0x4A3E, 0x5672,      0,      0,      0,
- 0xBC3B,      0, 0xBC3C, 0xBC3D, 0xBC3E, 0xBC3F, 0xBC40,      0,
- 0xBC41,      0, 0x3433, 0x4A3F, 0x472F, 0x5674, 0x5675,      0,
- 0x392C, 0x3434, 0x5676, 0x3838, 0x4D44, 0x4D29, 0x3476, 0x5678,
-};
-static const unsigned short utf8_to_euc_E5B9_x0213[] = {
- 0x566C,      0,      0, 0x566B, 0x566A, 0x497D,      0, 0x5673,
-      0, 0xA878,      0, 0xBC32, 0x4B5A,      0, 0x566D,      0,
- 0xBC33, 0xBC35,      0,      0, 0x566F, 0x4B6B, 0xA87A, 0x566E,
- 0x742B,      0,      0, 0xBC38, 0xBC39,      0, 0x742C, 0x5670,
-      0, 0x4828, 0x5671, 0x4A3E, 0x5672,      0,      0,      0,
- 0xBC3B,      0, 0xBC3C, 0xA87C, 0xA87D, 0xA87E, 0xAC21,      0,
- 0xBC41,      0, 0x3433, 0x4A3F, 0x472F, 0x5674, 0x5675, 0x7E7C,
- 0x392C, 0x3434, 0x5676, 0x3838, 0x4D44, 0x4D29, 0x3476, 0x5678,
-};
-static const unsigned short utf8_to_euc_E5BA[] = {
- 0xBC42, 0x4423,      0, 0x392D, 0x3E31,      0,      0, 0x485F,
-      0,      0, 0x3E32, 0xBC43,      0,      0, 0xBC44, 0x3D78,
-      0,      0,      0,      0,      0, 0x446C, 0x4A79, 0x4539,
-      0,      0, 0x392E,      0, 0x495C,      0,      0,      0,
- 0x5679,      0, 0xBC45,      0, 0xBC46, 0xBC47, 0x4559, 0x3A42,
- 0xBC48,      0, 0xBC49, 0x384B, 0xBC4A, 0x446D,      0,      0,
-      0, 0xBC4B,      0, 0xBC4C,      0, 0x3043, 0x3D6E, 0x392F,
- 0x4D47,      0,      0,      0,      0, 0xBC4D, 0xBC4E, 0xBC4F,
-};
-static const unsigned short utf8_to_euc_E5BA_x0213[] = {
- 0xBC42, 0x4423,      0, 0x392D, 0x3E31,      0,      0, 0x485F,
-      0,      0, 0x3E32, 0xBC43,      0,      0, 0xBC44, 0x3D78,
-      0,      0,      0,      0,      0, 0x446C, 0x4A79, 0x4539,
-      0,      0, 0x392E,      0, 0x495C,      0,      0,      0,
- 0x5679,      0, 0xBC45,      0, 0xBC46, 0xAC23, 0x4559, 0x3A42,
- 0xBC48,      0, 0xAC24, 0x384B, 0xAC25, 0x446D,      0,      0,
-      0, 0xBC4B,      0, 0xBC4C,      0, 0x3043, 0x3D6E, 0x392F,
- 0x4D47, 0xAC26,      0,      0,      0, 0xBC4D, 0x742D, 0xAC27,
-};
-static const unsigned short utf8_to_euc_E5BB[] = {
-      0, 0x567A, 0x567B, 0x4751,      0,      0, 0xBC50,      0,
- 0x567C, 0x4E77, 0x4F2D, 0xBC52, 0xBC51,      0, 0xBC53, 0x567E,
- 0x567D, 0xBC54, 0xBC55, 0x3347, 0xBC56, 0xBC57, 0x5721,      0,
-      0,      0, 0x5724, 0x5725, 0xBC58, 0x5723, 0xBC59, 0x4940,
- 0x3E33, 0x5727, 0x5726, 0x5722,      0, 0xBC5A,      0,      0,
- 0x5728, 0x5729,      0, 0xBC5B, 0x572A,      0,      0,      0,
- 0x572D, 0x572B,      0, 0x572C, 0x572E,      0, 0x3164, 0x446E,
- 0x572F,      0, 0x377A, 0x3276, 0x4736,      0, 0x5730, 0x467B,
-};
-static const unsigned short utf8_to_euc_E5BB_x0213[] = {
-      0, 0x567A, 0x567B, 0x4751,      0,      0, 0xAC28,      0,
- 0x567C, 0x4E77, 0x4F2D, 0x742F, 0xBC51,      0, 0xBC53, 0x567E,
- 0x567D, 0xBC54, 0xAC29, 0x3347, 0xBC56, 0xBC57, 0x5721,      0,
-      0, 0xAC2A, 0x5724, 0x5725, 0xBC58, 0x5723, 0xBC59, 0x4940,
- 0x3E33, 0x5727, 0x5726, 0x5722,      0, 0xBC5A,      0,      0,
- 0x5728, 0x5729,      0, 0xBC5B, 0x572A,      0,      0,      0,
- 0x572D, 0x572B,      0, 0x572C, 0x572E,      0, 0x3164, 0x446E,
- 0x572F, 0x7430, 0x377A, 0x3276, 0x4736, 0xAC2C, 0x5730, 0x467B,
-};
-static const unsigned short utf8_to_euc_E5BC[] = {
-      0, 0x4A5B, 0xBC5C, 0x5731, 0x4F2E,      0, 0xBC5D, 0xBC5E,
- 0xBC5F, 0x5732, 0x4A40, 0x5735, 0x5021, 0x5031, 0xBC60, 0x3C30,
- 0x4675, 0x5736,      0, 0x355D, 0x4424, 0x307A, 0x5737, 0x4A26,
- 0x3930, 0xBC61,      0, 0x4350, 0xBC62, 0xBC63,      0, 0x446F,
-      0, 0xBC64, 0xBC65, 0xBC66, 0xBC67, 0x4C6F, 0x3839, 0x384C,
- 0xBC68, 0x5738,      0, 0xBC69, 0xBC6A, 0x5739, 0xBC6B, 0x573F,
- 0xBC6C, 0x3C65,      0,      0, 0xBC6D, 0x4425, 0xBC6E, 0x362F,
- 0x573A,      0,      0, 0xBC6F, 0x492B, 0xBC70, 0x4346, 0xBC71,
-};
-static const unsigned short utf8_to_euc_E5BC_x0213[] = {
- 0x7431, 0x4A5B, 0x7432, 0x5731, 0x4F2E,      0, 0xBC5D, 0x7433,
- 0xAC2D, 0x5732, 0x4A40, 0x5735, 0x5021, 0x5031, 0xAC2E, 0x3C30,
- 0x4675, 0x5736,      0, 0x355D, 0x4424, 0x307A, 0x5737, 0x4A26,
- 0x3930, 0xBC61,      0, 0x4350, 0xAC2F, 0x7434, 0xAC31, 0x446F,
-      0,      0, 0xBC65, 0x7435, 0xBC67, 0x4C6F, 0x3839, 0x384C,
- 0xBC68, 0x5738,      0, 0xBC69, 0xBC6A, 0x5739, 0xBC6B, 0x573F,
- 0xBC6C, 0x3C65,      0,      0, 0x7436, 0x4425, 0x7437, 0x362F,
- 0x573A,      0,      0, 0xBC6F, 0x492B, 0x7438, 0x4346, 0xBC71,
-};
-static const unsigned short utf8_to_euc_E5BD[] = {
- 0xBC72, 0x573B,      0,      0, 0xBC73, 0xBC74,      0, 0xBC75,
- 0x573C,      0, 0x3630,      0, 0x573D, 0xBC76, 0x573E,      0,
- 0xBC77, 0x5740,      0, 0x4576, 0xBC78,      0, 0x5741, 0x5742,
- 0xBC79, 0x5743,      0, 0xBC7A, 0x5734, 0x5733,      0,      0,
- 0xBC7B, 0x5744, 0x3741, 0xBC7C, 0xBC7D,      0, 0x4927, 0xBC7E,
-      0, 0x3A4C, 0x4937, 0x4426, 0x494B, 0x5745,      0, 0xBD21,
- 0x3E34, 0x3146, 0xBD22, 0x5746, 0xBD23, 0xBD24,      0, 0x5747,
- 0xBD25, 0x4C72, 0xBD26,      0, 0x4860, 0xBD27, 0xBD28, 0x574A,
-};
-static const unsigned short utf8_to_euc_E5BD_x0213[] = {
- 0x7439, 0x573B,      0,      0, 0xBC73, 0x743A,      0, 0xAC32,
- 0x573C,      0, 0x3630,      0, 0x573D, 0xBC76, 0x573E,      0,
- 0xBC77, 0x5740,      0, 0x4576, 0x743B,      0, 0x5741, 0x5742,
- 0x743C, 0x5743,      0, 0xBC7A, 0x5734, 0x5733,      0,      0,
- 0xBC7B, 0x5744, 0x3741, 0xAC33, 0x743D,      0, 0x4927, 0x743E,
-      0, 0x3A4C, 0x4937, 0x4426, 0x494B, 0x5745,      0, 0xBD21,
- 0x3E34, 0x3146, 0xAC34, 0x5746, 0xBD23, 0xBD24,      0, 0x5747,
- 0xBD25, 0x4C72, 0xBD26,      0, 0x4860, 0x743F, 0xAC35, 0x574A,
-};
-static const unsigned short utf8_to_euc_E5BE[] = {
- 0x317D, 0x402C, 0x5749, 0x5748, 0x3742, 0x4254,      0, 0x574E,
- 0x574C, 0xBD29, 0x574B, 0x4E27, 0x3865, 0xBD2A,      0, 0xBD2B,
- 0x3D79, 0x574D, 0x454C, 0x3D3E,      0,      0, 0xBD2C, 0x4640,
- 0x5751, 0x5750,      0,      0, 0xBD2D, 0xBD2E, 0x574F,      0,
- 0x5752, 0x3866, 0xBD2F,      0, 0xBD32,      0,      0, 0xBD30,
- 0x5753, 0x497C, 0x3D5B, 0xBD31, 0xBD33, 0x5754, 0x4879, 0xBD34,
- 0xBD35, 0xBD36,      0, 0x4641, 0x4427,      0,      0, 0xF43E,
- 0xBD37, 0x4530,      0,      0, 0x5755, 0x352B,      0,      0,
-};
-static const unsigned short utf8_to_euc_E5BE_x0213[] = {
- 0x317D, 0x402C, 0x5749, 0x5748, 0x3742, 0x4254,      0, 0x574E,
- 0x574C, 0x7440, 0x574B, 0x4E27, 0x3865, 0xBD2A,      0, 0xAC36,
- 0x3D79, 0x574D, 0x454C, 0x3D3E,      0,      0, 0xBD2C, 0x4640,
- 0x5751, 0x5750,      0,      0, 0x7441, 0xBD2E, 0x574F,      0,
- 0x5752, 0x3866, 0xAC37,      0, 0xAC38,      0,      0, 0x7442,
- 0x5753, 0x497C, 0x3D5B, 0xBD31, 0xBD33, 0x5754, 0x4879, 0x7443,
- 0xBD35, 0xBD36,      0, 0x4641, 0x4427, 0x7444,      0, 0x7445,
- 0xAC39, 0x4530,      0,      0, 0x5755, 0x352B,      0,      0,
-};
-static const unsigned short utf8_to_euc_E5BF[] = {
-      0,      0,      0, 0x3F34, 0xBD38, 0x492C,      0, 0xBD39,
- 0xBD3A, 0xBD3B,      0, 0xBD3C, 0x3477, 0x4726,      0,      0,
- 0xBD3D, 0xBD3E, 0xBD3F, 0xBD40, 0xBD41,      0, 0x5756, 0x3B56,
- 0x4B3A, 0x4B3B,      0,      0, 0x317E, 0x575B, 0xBD42,      0,
- 0x4369, 0xBD43, 0xBD44,      0, 0x5758,      0,      0,      0,
- 0xBD45, 0xBD46, 0xBD47, 0x3277, 0xBD48, 0xBD49, 0xBD4A, 0xBD4B,
- 0x582D, 0x575A, 0xBD4C, 0xBD4D,      0, 0x4730, 0xBD4E,      0,
- 0x5759,      0, 0xBD4F, 0x5757, 0xBD50, 0x397A,      0, 0x575D,
-};
-static const unsigned short utf8_to_euc_E5BF_x0213[] = {
-      0,      0,      0, 0x3F34, 0xAC3A, 0x492C,      0, 0xAC3C,
- 0xBD3A, 0x7446,      0, 0xAC3D, 0x3477, 0x4726,      0,      0,
- 0xBD3D, 0xBD3E, 0xAC3E, 0xAC3F, 0xAC40,      0, 0x5756, 0x3B56,
- 0x4B3A, 0x4B3B,      0,      0, 0x317E, 0x575B, 0x7447,      0,
- 0x4369, 0x7448, 0xAC41,      0, 0x5758,      0,      0,      0,
- 0xBD45, 0x7449, 0xBD47, 0x3277, 0xBD48, 0xBD49, 0xAC42, 0xAC43,
- 0x582D, 0x575A, 0xBD4C, 0xAC44,      0, 0x4730, 0xBD4E,      0,
- 0x5759,      0, 0xBD4F, 0x5757, 0xAC45, 0x397A,      0, 0x575D,
-};
-static const unsigned short utf8_to_euc_E680[] = {
-      0,      0,      0,      0,      0,      0,      0, 0xBD51,
-      0,      0, 0xBD52,      0,      0, 0xBD53, 0x5763, 0x5769,
- 0x5761,      0, 0x455C, 0xBD54, 0xBD55, 0x5766, 0x495D, 0xBD56,
- 0xBD57, 0x5760, 0xBD58, 0x5765, 0x4E67, 0x3B57,      0, 0xBD59,
- 0x4255, 0x575E,      0,      0, 0xBD5A, 0x355E, 0x5768, 0x402D,
- 0x3165, 0x5762, 0x3278, 0x5767,      0, 0xBD5B,      0, 0x3631,
-      0, 0x5764,      0, 0xBD5C,      0, 0xBD5D,      0,      0,
-      0,      0, 0x576A,      0,      0,      0,      0,      0,
-};
-static const unsigned short utf8_to_euc_E680_x0213[] = {
-      0,      0,      0,      0,      0,      0,      0, 0xBD51,
-      0,      0, 0xBD52,      0,      0, 0x744A, 0x5763, 0x5769,
- 0x5761,      0, 0x455C, 0xBD54, 0x744B, 0x5766, 0x495D, 0xAC47,
- 0x744C, 0x5760, 0xBD58, 0x5765, 0x4E67, 0x3B57,      0, 0xBD59,
- 0x4255, 0x575E, 0xAC48,      0, 0xAC49, 0x355E, 0x5768, 0x402D,
- 0x3165, 0x5762, 0x3278, 0x5767,      0, 0xBD5B,      0, 0x3631,
-      0, 0x5764,      0, 0x744D,      0, 0x744E,      0,      0,
-      0,      0, 0x576A,      0,      0,      0,      0,      0,
-};
-static const unsigned short utf8_to_euc_E681[] = {
- 0xBD5E, 0x576C, 0x5776, 0x5774,      0,      0, 0x5771, 0xBD5F,
- 0xBD60, 0xBD61, 0x5770, 0x4E78, 0xBD62, 0x5772,      0,      0,
- 0x3632, 0xBD63, 0x3931,      0, 0xBD64, 0x3D7A, 0xBD65, 0xBD66,
-      0, 0x5779, 0x576B,      0,      0, 0xBD67,      0, 0x576F,
- 0x575F, 0xBD68, 0x327A, 0x5773, 0x5775, 0x4351,      0, 0xBD69,
- 0x3A28, 0x3238, 0x576D, 0x5778, 0x5777, 0x3633,      0, 0x4229,
- 0x3366, 0xBD6A,      0,      0,      0, 0x3743,      0, 0x576E,
-      0,      0,      0,      0,      0,      0, 0xBD6B, 0xBD6C,
-};
-static const unsigned short utf8_to_euc_E681_x0213[] = {
- 0xBD5E, 0x576C, 0x5776, 0x5774,      0,      0, 0x5771, 0x744F,
- 0xBD60, 0xBD61, 0x5770, 0x4E78, 0xAC4B, 0x5772,      0,      0,
- 0x3632, 0xBD63, 0x3931,      0, 0xBD64, 0x3D7A, 0xBD65, 0xBD66,
-      0, 0x5779, 0x576B,      0,      0,      0,      0, 0x576F,
- 0x575F, 0xBD68, 0x327A, 0x5773, 0x5775, 0x4351,      0, 0xBD69,
- 0x3A28, 0x3238, 0x576D, 0x5778, 0x5777, 0x3633,      0, 0x4229,
- 0x3366, 0xBD6A,      0,      0,      0, 0x3743,      0, 0x576E,
-      0,      0,      0,      0,      0,      0, 0xBD6B, 0xAC4C,
-};
-static const unsigned short utf8_to_euc_E682[] = {
-      0, 0x577A, 0xBD6D, 0x577D, 0x5821, 0xF43F, 0xBD6E,      0,
- 0xBD6F, 0x3C3D, 0xBD70, 0x5827, 0x4470, 0x577B, 0xBD71,      0,
-      0, 0xBD72, 0x5825, 0xBD73, 0x3279, 0xBD74, 0x5823, 0x5824,
- 0xBD75,      0, 0x577E, 0x5822,      0, 0xBD76, 0xBD77, 0x3867,
- 0x4D2A,      0, 0xBD78, 0x3435, 0xBD79, 0xBD7A, 0x3159, 0x5826,
- 0xBD7B, 0x473A, 0x302D,      0,      0,      0,      0,      0,
- 0xBD7C, 0xBD7D, 0x4861, 0x575C, 0x582C, 0x5830, 0x4C65, 0xBD7E,
- 0x5829,      0,      0, 0xBE21, 0x4569, 0x582E, 0xBE22,      0,
-};
-static const unsigned short utf8_to_euc_E682_x0213[] = {
-      0, 0x577A, 0xBD6D, 0x577D, 0x5821,      0, 0xBD6E,      0,
- 0xBD6F, 0x3C3D, 0xAC4D, 0x5827, 0x4470, 0x577B, 0xBD71,      0,
-      0, 0xBD72, 0x5825, 0xBD73, 0x3279, 0xAC4E, 0x5823, 0x5824,
- 0xBD75,      0, 0x577E, 0x5822,      0, 0x7451, 0x7452, 0x3867,
- 0x4D2A,      0, 0xBD78, 0x3435, 0xBD79, 0xBD7A, 0x3159, 0x5826,
- 0xAC4F, 0x473A, 0x302D,      0,      0,      0,      0,      0,
- 0xAC51, 0xAC52, 0x4861, 0x575C, 0x582C, 0x5830, 0x4C65, 0xBD7E,
- 0x5829,      0,      0, 0xBE21, 0x4569, 0x582E, 0xAC53,      0,
-};
-static const unsigned short utf8_to_euc_E683[] = {
-      0,      0, 0xBE23,      0, 0xBE24, 0x3E70, 0x582F, 0x4657,
- 0xBE25, 0xBE26, 0xBE27, 0xBE28,      0,      0, 0xBE29, 0xBE2A,
-      0, 0x4F47,      0, 0x582B, 0xBE2B, 0xBE2C,      0,      0,
- 0x5831, 0xBE2D, 0x397B, 0xBE2E, 0x404B, 0xBE2F, 0xBE30, 0x3054,
- 0x582A, 0x5828, 0xBE31, 0x415A,      0, 0xBE32,      0, 0x577C,
- 0x3B34,      0,      0,      0,      0,      0,      0,      0,
- 0x4246, 0x583D, 0xBE33, 0x415B, 0x5838, 0xBE34, 0x5835, 0x5836,
- 0xBE35, 0x3C66, 0x5839, 0x583C, 0xBE36, 0xBE37,      0,      0,
-};
-static const unsigned short utf8_to_euc_E683_x0213[] = {
-      0,      0, 0xBE23,      0, 0xBE24, 0x3E70, 0x582F, 0x4657,
- 0xAC54, 0xBE26, 0xBE27, 0x7453,      0,      0, 0xBE29, 0xBE2A,
-      0, 0x4F47,      0, 0x582B, 0x7454, 0x7455,      0,      0,
- 0x5831, 0xAC55, 0x397B, 0xAC56, 0x404B, 0x7456,      0, 0x3054,
- 0x582A, 0x5828, 0xBE31, 0x415A,      0, 0xBE32,      0, 0x577C,
- 0x3B34,      0,      0,      0,      0,      0, 0xAC57,      0,
- 0x4246, 0x583D, 0xAC58, 0x415B, 0x5838, 0xAC59, 0x5835, 0x5836,
- 0x7457, 0x3C66, 0x5839, 0x583C, 0xBE36, 0xBE37,      0,      0,
-};
-static const unsigned short utf8_to_euc_E684[] = {
- 0x5837, 0x3D25, 0xBE38, 0x583A,      0,      0, 0x5834, 0xBE39,
- 0x4C7C, 0x4C7B, 0xBE3A,      0, 0xBE3B, 0x583E, 0x583F, 0x3055,
- 0xBE3C, 0xBE3D, 0xBE3E, 0xBE3F, 0xBE40, 0x5833, 0xBE41, 0xBE42,
-      0, 0xBE43, 0x3672, 0x3026, 0xBE44,      0, 0xBE45, 0x3436,
- 0xF440, 0x583B, 0xBE46,      0,      0,      0,      0, 0x5843,
- 0x5842,      0, 0xBE47, 0xBE48, 0x5847,      0,      0,      0,
- 0xBE49, 0xBE4A,      0,      0, 0x5848, 0xBE4B, 0xBE4C, 0xBE4D,
-      0, 0xBE4E,      0,      0, 0x5846, 0x5849, 0x5841, 0x5845,
-};
-static const unsigned short utf8_to_euc_E684_x0213[] = {
- 0x5837, 0x3D25, 0xBE38, 0x583A,      0,      0, 0x5834, 0xBE39,
- 0x4C7C, 0x4C7B, 0xBE3A,      0, 0xBE3B, 0x583E, 0x583F, 0x3055,
- 0xAC5A,      0, 0xAC5B, 0xAC5C, 0xBE40, 0x5833, 0xBE41, 0xBE42,
-      0, 0xAC5D, 0x3672, 0x3026, 0x7458,      0, 0xAC5E, 0x3436,
-      0, 0x583B, 0xBE46,      0,      0,      0,      0, 0x5843,
- 0x5842,      0, 0xBE47, 0x7459, 0x5847,      0,      0,      0,
- 0x745A, 0xBE4A,      0,      0, 0x5848, 0xBE4B, 0xBE4C, 0x745B,
-      0, 0xBE4E, 0xAC5F,      0, 0x5846, 0x5849, 0x5841, 0x5845,
-};
-static const unsigned short utf8_to_euc_E685[] = {
-      0, 0xBE4F, 0x584A,      0, 0x584B, 0xBE50, 0xBE51, 0x5840,
- 0x3B7C, 0xBE52, 0x5844, 0x4256, 0x3932, 0x5832, 0x3F35,      0,
-      0,      0,      0, 0x5858,      0, 0x4A69,      0,      0,
- 0x584E, 0x584F, 0x5850,      0,      0, 0x5857, 0xBE53, 0x5856,
- 0xBE54,      0, 0x4B7D, 0x3437,      0, 0x5854,      0, 0x3745,
- 0x3334,      0,      0, 0x5851, 0xBE55,      0, 0x4E38, 0x5853,
- 0x3056, 0x5855, 0xBE56, 0x584C, 0x5852, 0x5859, 0x3744, 0x584D,
- 0xBE57,      0,      0, 0xBE58, 0xBE59,      0, 0x4D5D, 0xBE5A,
-};
-static const unsigned short utf8_to_euc_E685_x0213[] = {
-      0, 0xAC61, 0x584A,      0, 0x584B, 0xBE50, 0xAC62, 0x5840,
- 0x3B7C, 0xBE52, 0x5844, 0x4256, 0x3932, 0x5832, 0x3F35,      0,
-      0,      0,      0, 0x5858,      0, 0x4A69,      0,      0,
- 0x584E, 0x584F, 0x5850,      0,      0, 0x5857, 0xBE53, 0x5856,
- 0xAC63,      0, 0x4B7D, 0x3437,      0, 0x5854,      0, 0x3745,
- 0x3334,      0,      0, 0x5851, 0xBE55,      0, 0x4E38, 0x5853,
- 0x3056, 0x5855, 0xBE56, 0x584C, 0x5852, 0x5859, 0x3744, 0x584D,
- 0xBE57,      0,      0, 0xBE58, 0xAC64,      0, 0x4D5D, 0xBE5A,
-};
-static const unsigned short utf8_to_euc_E686[] = {
- 0xBE5B, 0xBE5C, 0x4D2B, 0xBE5D, 0xBE5E,      0,      0, 0x585C,
-      0,      0, 0x5860, 0xBE5F,      0, 0xBE60, 0x417E,      0,
- 0x4E79, 0x5861, 0xBE61, 0xBE62, 0x585E,      0, 0x585B, 0xBE63,
- 0xBE64, 0x585A, 0x585F,      0, 0xBE65, 0xBE66,      0, 0xBE67,
- 0xBE68,      0,      0,      0, 0x4A30, 0xBE69,      0, 0x4634,
- 0xBE6A, 0x3746, 0xBE6B, 0x5862, 0x585D, 0xBE6C, 0x5863,      0,
-      0,      0, 0x377B,      0,      0,      0, 0x3231,      0,
- 0xBE6D, 0xBE6E, 0x586B,      0, 0xBE6F,      0, 0x3438,      0,
-};
-static const unsigned short utf8_to_euc_E686_x0213[] = {
- 0xBE5B, 0xBE5C, 0x4D2B, 0xBE5D, 0xBE5E,      0,      0, 0x585C,
-      0,      0, 0x5860, 0xBE5F,      0, 0x745D, 0x417E,      0,
- 0x4E79, 0x5861, 0xAC66, 0xAC67, 0x585E,      0, 0x585B, 0xAC68,
- 0xAC69, 0x585A, 0x585F,      0, 0xBE65, 0xBE66,      0, 0xBE67,
- 0xBE68,      0,      0,      0, 0x4A30, 0xAC6A,      0, 0x4634,
- 0xAC6B, 0x3746, 0xBE6B, 0x5862, 0x585D, 0xAC6C, 0x5863,      0,
-      0,      0, 0x377B,      0,      0,      0, 0x3231,      0,
- 0xBE6D, 0x7460, 0x586B,      0, 0x745F,      0, 0x3438,      0,
-};
-static const unsigned short utf8_to_euc_E687[] = {
- 0xBE70, 0xBE71, 0xBE72, 0x5869,      0,      0, 0x586A, 0x3A29,
- 0x5868, 0x5866, 0x5865, 0x586C, 0x5864, 0x586E, 0xBE73, 0xBE74,
- 0x327B,      0,      0,      0,      0, 0xBE75,      0,      0,
-      0,      0,      0,      0, 0xBE76, 0xBE77, 0xBE78, 0xBE79,
-      0, 0xBE7A, 0xBE7B, 0x5870,      0, 0xBE7E, 0x586F, 0xBE7C,
-      0, 0xBE7D,      0,      0, 0xBF21, 0xBF22,      0, 0xBF23,
-      0,      0, 0x4428,      0, 0x5873,      0, 0x5871, 0x5867,
- 0x377C,      0, 0x5872,      0, 0x5876, 0x5875, 0x5877, 0x5874,
-};
-static const unsigned short utf8_to_euc_E687_x0213[] = {
- 0xBE70, 0xBE71, 0xBE72, 0x5869,      0,      0, 0x586A, 0x3A29,
- 0x5868, 0x5866, 0x5865, 0x586C, 0x5864, 0x586E, 0xBE73, 0xBE74,
- 0x327B,      0,      0,      0,      0, 0xAC6E,      0,      0,
-      0,      0,      0,      0, 0xBE76, 0xAC6F, 0xBE78, 0xAC70,
-      0, 0xBE7A, 0xBE7B, 0x5870,      0, 0xBE7E, 0x586F, 0xBE7C,
-      0, 0xBE7D,      0,      0, 0xBF21, 0xBF22,      0, 0xBF23,
-      0,      0, 0x4428,      0, 0x5873, 0xAC71, 0x5871, 0x5867,
- 0x377C,      0, 0x5872,      0, 0x5876, 0x5875, 0x5877, 0x5874,
-};
-static const unsigned short utf8_to_euc_E688[] = {
- 0x5878, 0xBF24,      0, 0xBF25, 0xBF26,      0,      0, 0xBF27,
- 0x5879, 0x587A, 0x4A6A,      0, 0x587C, 0x587B, 0x3D3F,      0,
- 0x402E, 0x3266, 0x327C, 0xBF28, 0x587D, 0xBF29, 0x303F,      0,
-      0,      0, 0x404C, 0x587E, 0xBF2A, 0x6C43, 0x5921, 0x3761,
- 0xBF2B, 0x5922, 0xBF2C, 0xBF2D,      0,      0, 0x406F, 0xBF2E,
-      0, 0xBF2F, 0x5923, 0xBF30,      0,      0, 0x5924, 0x353A,
- 0x5925,      0, 0x5926, 0x5927, 0x4257,      0,      0,      0,
- 0x384D, 0xBF31,      0, 0x4C61,      0, 0xBF32,      0, 0x4B3C,
-};
-static const unsigned short utf8_to_euc_E688_x0213[] = {
- 0x5878, 0xBF24,      0, 0xBF25, 0xBF26,      0,      0, 0xBF27,
- 0x5879, 0x587A, 0x4A6A,      0, 0x587C, 0x587B, 0x3D3F,      0,
- 0x402E, 0x3266, 0x327C,      0, 0x587D, 0xAC73, 0x303F,      0,
-      0,      0, 0x404C, 0x587E, 0xBF2A, 0x6C43, 0x5921, 0x3761,
- 0xBF2B, 0x5922, 0x7462, 0xAC74,      0,      0, 0x406F, 0xBF2E,
-      0, 0xAC75, 0x5923, 0xBF30,      0,      0, 0x5924, 0x353A,
- 0x5925,      0, 0x5926, 0x5927, 0x4257,      0,      0,      0,
- 0x384D, 0xBF31,      0, 0x4C61,      0, 0xBF32, 0x7463, 0x4B3C,
-};
-static const unsigned short utf8_to_euc_E689[] = {
- 0x3D6A, 0x5928, 0xBF33, 0xBF34, 0xBF35,      0, 0xBF36, 0x4070,
- 0x6E3D, 0x4862,      0, 0x3C6A, 0xBF37, 0x3A4D, 0x5929,      0,
- 0xBF38, 0xBF39, 0xBF3A, 0x4247, 0xBF3B, 0x4A27, 0xBF3C,      0,
- 0x4271,      0, 0xBF3D, 0x592C, 0xBF3E,      0, 0x592A,      0,
- 0x592D,      0,      0, 0x592B, 0xBF3F,      0,      0,      0,
- 0x592E,      0,      0,      0,      0, 0xBF40, 0x4A31, 0xBF41,
-      0, 0x3037,      0, 0xBF42,      0,      0, 0x495E,      0,
-      0, 0x4863, 0xBF43,      0, 0x592F, 0xBF44, 0x5932, 0x3E35,
-};
-static const unsigned short utf8_to_euc_E689_x0213[] = {
- 0x3D6A, 0x5928, 0xBF33, 0x7464, 0xBF35,      0, 0xAC76, 0x4070,
- 0x6E3D, 0x4862,      0, 0x3C6A, 0xAC77, 0x3A4D, 0x5929,      0,
- 0xBF38, 0xAC78, 0xAC79, 0x4247, 0xBF3B, 0x4A27, 0x7465,      0,
- 0x4271,      0, 0x7466, 0x592C, 0xBF3E,      0, 0x592A,      0,
- 0x592D, 0xAC7A,      0, 0x592B, 0xAC7B,      0,      0,      0,
- 0x592E,      0,      0,      0,      0, 0xAC7D, 0x4A31, 0x7467,
-      0, 0x3037,      0, 0xAC7E,      0,      0, 0x495E,      0,
-      0, 0x4863, 0xBF43, 0xAC7C, 0x592F, 0xBF44, 0x5932, 0x3E35,
-};
-static const unsigned short utf8_to_euc_E68A[] = {
- 0x353B,      0, 0x5930, 0x5937, 0x3E36,      0,      0,      0,
-      0, 0x5931, 0x4744,      0,      0, 0xBF45, 0xBF46, 0xBF47,
- 0xBF48, 0x4D5E, 0x5933, 0x5934, 0x5938, 0x456A, 0x5935, 0x3933,
- 0x405E,      0,      0, 0x5946, 0x4834,      0, 0x4272,      0,
-      0,      0,      0,      0,      0,      0, 0xBF49,      0,
- 0xBF4A,      0,      0, 0x4864, 0x5A2D,      0,      0,      0,
-      0, 0x4A7A,      0, 0xBF4B,      0, 0x4471, 0xBF4C, 0xBF4D,
-      0, 0x4B75, 0xBF4E, 0x593B, 0x3221, 0x436A, 0xBF4F, 0xBF50,
-};
-static const unsigned short utf8_to_euc_E68A_x0213[] = {
- 0x353B,      0, 0x5930, 0x5937, 0x3E36, 0x7468,      0,      0,
-      0, 0x5931, 0x4744,      0,      0, 0xBF45, 0xBF46, 0xBF47,
- 0xBF48, 0x4D5E, 0x5933, 0x5934, 0x5938, 0x456A, 0x5935, 0x3933,
- 0x405E, 0xAD21,      0, 0x5946, 0x4834,      0, 0x4272,      0,
-      0,      0,      0,      0,      0,      0, 0xAD22,      0,
- 0xBF4A,      0,      0, 0x4864, 0x5A2D,      0,      0,      0,
-      0, 0x4A7A,      0, 0xBF4B,      0, 0x4471, 0xBF4C, 0xBF4D,
-      0, 0x4B75, 0xBF4E, 0x593B, 0x3221, 0x436A, 0xBF4F, 0xBF50,
-};
-static const unsigned short utf8_to_euc_E68B[] = {
-      0,      0, 0x5944,      0, 0xBF51, 0x4334, 0x593E, 0x5945,
- 0x5940, 0x5947, 0x5943,      0, 0x5942, 0x476F, 0xBF52, 0x593C,
- 0x327D, 0x593A, 0x3571, 0x4273, 0x5936, 0xBF53, 0xBF54, 0x5939,
- 0x3934, 0x405B, 0xBF55, 0x3E37, 0x5941, 0x4752,      0,      0,
- 0x3572, 0x3348,      0,      0,      0,      0,      0,      0,
-      0,      0, 0xBF56,      0, 0x3367, 0x3F21, 0x5949, 0x594E,
-      0, 0x594A, 0xBF57, 0x377D, 0xBF58, 0x594F, 0x3B22, 0x3969,
-      0,      0,      0,      0, 0xBF59, 0xBF5A, 0x3D26, 0x593D,
-};
-static const unsigned short utf8_to_euc_E68B_x0213[] = {
-      0,      0, 0x5944,      0, 0x7469, 0x4334, 0x593E, 0x5945,
- 0x5940, 0x5947, 0x5943,      0, 0x5942, 0x476F, 0xBF52, 0x593C,
- 0x327D, 0x593A, 0x3571, 0x4273, 0x5936, 0xAD23, 0x746A, 0x5939,
- 0x3934, 0x405B, 0xBF55, 0x3E37, 0x5941, 0x4752,      0,      0,
- 0x3572, 0x3348,      0,      0,      0,      0,      0,      0,
-      0,      0, 0xBF56,      0, 0x3367, 0x3F21, 0x5949, 0x594E,
-      0, 0x594A, 0xBF57, 0x377D, 0xBF58, 0x594F, 0x3B22, 0x3969,
-      0,      0,      0,      0, 0x746B, 0xAD25, 0x3D26, 0x593D,
-};
-static const unsigned short utf8_to_euc_E68C[] = {
-      0, 0x3B7D, 0x594C, 0xBF5B, 0xBF5C,      0,      0, 0x3B58,
- 0x594D, 0x3044, 0xBF5D, 0xBF5E, 0x5948, 0xBF5F,      0,      0,
- 0xBF60, 0x4429,      0, 0xBF61,      0,      0, 0xBF62,      0,
- 0xBF63, 0x3573,      0,      0,      0,      0,      0, 0x3634,
-      0,      0,      0,      0,      0,      0,      0, 0x594B,
- 0x3027, 0xBF64, 0xBF65, 0x3A43,      0, 0xBF66,      0, 0x3F36,
-      0,      0,      0,      0,      0, 0xBF67, 0xBF68,      0,
-      0, 0xBF69, 0x4472,      0, 0xBF6A, 0x4854, 0x5951, 0x415E,
-};
-static const unsigned short utf8_to_euc_E68C_x0213[] = {
-      0, 0x3B7D, 0x594C, 0xAD26, 0xBF5C,      0,      0, 0x3B58,
- 0x594D, 0x3044, 0x746C, 0xBF5E, 0x5948, 0xAD27,      0,      0,
- 0xAD28, 0x4429,      0, 0xBF61,      0,      0, 0xBF62,      0,
- 0x746D, 0x3573,      0,      0,      0,      0,      0, 0x3634,
-      0,      0,      0,      0,      0,      0,      0, 0x594B,
- 0x3027, 0xBF64, 0xBF65, 0x3A43,      0, 0xBF66,      0, 0x3F36,
-      0,      0, 0xAD2B,      0,      0, 0xAD2C, 0xBF68,      0,
-      0, 0x746E, 0x4472, 0xAD2D, 0xAD2E, 0x4854, 0x5951, 0x415E,
-};
-static const unsigned short utf8_to_euc_E68D[] = {
-      0, 0xBF6B, 0xBF6C, 0xBF6D, 0xBF6E,      0, 0xBF6F,      0,
-      0, 0x422A, 0xBF70, 0xBF71, 0x3B2B, 0x5952, 0xBF72, 0x5954,
- 0x5950,      0, 0xBF73, 0xBF74, 0xBF75, 0x4A61,      0, 0x443D,
- 0xBF76,      0,      0, 0xBF77, 0x415C,      0,      0,      0,
-      0,      0,      0,      0,      0, 0xBF78, 0xBF79, 0x4A7B,
- 0x3C4E, 0x5960,      0, 0x595F, 0xBF7A, 0xBF7B, 0x3F78,      0,
-      0, 0xBF7C, 0x377E,      0, 0xBF7D, 0xBF7E, 0x5959, 0x3E39,
- 0xC021,      0, 0x4668, 0x4731, 0xC022, 0xC023,      0, 0xC024,
-};
-static const unsigned short utf8_to_euc_E68D_x0213[] = {
-      0, 0xAD2F, 0xBF6C, 0x746F, 0xAD30,      0, 0xBF6F,      0,
-      0, 0x422A, 0xBF70, 0xBF71, 0x3B2B, 0x5952, 0xAD31, 0x5954,
- 0x5950,      0, 0xBF73, 0xBF74, 0xBF75, 0x4A61,      0, 0x443D,
- 0xBF76, 0xAD33,      0, 0xBF77, 0x415C,      0,      0,      0,
-      0,      0,      0,      0,      0, 0x7470, 0xBF79, 0x4A7B,
- 0x3C4E, 0x5960,      0, 0x595F, 0xAD36, 0xBF7B, 0x3F78,      0,
-      0, 0xBF7C, 0x377E,      0, 0xBF7D, 0xBF7E, 0x5959, 0x3E39,
- 0xC021,      0, 0x4668, 0x4731, 0x7471, 0xC023,      0, 0xC024,
-};
-static const unsigned short utf8_to_euc_E68E[] = {
- 0x5957,      0, 0xC025, 0x415D, 0xC026,      0,      0, 0xC027,
- 0x3C78, 0x595C, 0xC028,      0, 0x3E38,      0, 0x5956, 0x595B,
- 0xC029,      0, 0x4753,      0, 0xC02A, 0xC02B, 0x5955,      0,
- 0x3721, 0xC02C, 0xC02D, 0x335D,      0,      0, 0xC02E, 0x595D,
- 0x4E2B, 0x3A4E, 0x4335, 0x595A, 0xC02F, 0x405C, 0xC030, 0x3935,
- 0x3F64, 0x3166, 0x413C, 0x5958, 0x3545, 0xC031, 0xC032, 0xC033,
-      0,      0, 0x3747,      0, 0x444F, 0x595E,      0,      0,
-      0,      0,      0, 0x415F,      0, 0xC034, 0x5961,      0,
-};
-static const unsigned short utf8_to_euc_E68E_x0213[] = {
- 0x5957,      0, 0xC025, 0x415D, 0xAD37,      0,      0, 0xC027,
- 0x3C78, 0x595C, 0xC028,      0, 0x3E38,      0, 0x5956, 0x595B,
- 0xC029,      0, 0x4753,      0, 0xAD3A, 0xC02B, 0x5955,      0,
- 0x3721, 0xAD38, 0xC02D, 0x335D,      0,      0, 0xC02E, 0x595D,
- 0x4E2B, 0x3A4E, 0x4335, 0x595A, 0xC02F, 0x405C, 0xC030, 0x3935,
- 0x3F64, 0x3166, 0x413C, 0x5958, 0x3545, 0xC031, 0xC032, 0xC033,
-      0,      0, 0x3747,      0, 0x444F, 0x595E,      0,      0,
-      0,      0,      0, 0x415F,      0, 0xAD3B, 0x5961,      0,
-};
-static const unsigned short utf8_to_euc_E68F[] = {
- 0x5963, 0xC035,      0, 0x4237, 0x5969, 0xC036, 0x5964,      0,
- 0xC037, 0x5966,      0,      0,      0,      0, 0xC038, 0x4941,
- 0x4473, 0xC039, 0x5967, 0xC03A, 0xC03B, 0xC03C, 0x4D2C,      0,
-      0,      0, 0x4D48, 0x3439, 0xC03D,      0,      0,      0,
- 0xC03E, 0x302E,      0, 0x5965,      0, 0xC03F,      0,      0,
-      0, 0x5962, 0xC040,      0, 0xC041,      0, 0x3478,      0,
-      0,      0, 0xC042, 0xC043, 0x3167, 0xC044, 0x5968,      0,
- 0xC045, 0xC046, 0x4D49,      0,      0,      0,      0,      0,
-};
-static const unsigned short utf8_to_euc_E68F_x0213[] = {
- 0x5963, 0xC035,      0, 0x4237, 0x5969, 0xC036, 0x5964,      0,
- 0xC037, 0x5966,      0,      0,      0,      0, 0xC038, 0x4941,
- 0x4473, 0xC039, 0x5967, 0xC03A, 0xAD3D, 0xAD3E, 0x4D2C,      0,
-      0,      0, 0x4D48, 0x3439, 0xAD3F,      0,      0,      0,
- 0xAD40, 0x302E,      0, 0x5965,      0, 0x7472,      0,      0,
-      0, 0x5962, 0xC040, 0xAD41, 0xAD42, 0x7473, 0x3478,      0,
-      0,      0, 0xAD43, 0xC043, 0x3167, 0x7474, 0x5968, 0xAD3C,
- 0xC045, 0xC046, 0x4D49,      0,      0,      0,      0,      0,
-};
-static const unsigned short utf8_to_euc_E690[] = {
-      0,      0,      0,      0,      0,      0, 0x596C,      0,
-      0, 0xC047, 0xC048,      0,      0, 0x423B,      0, 0x5973,
- 0xC049,      0, 0xC04A, 0x596D, 0xC04B,      0, 0x596A, 0x5971,
- 0xC04C,      0,      0,      0, 0x5953,      0, 0xC04D,      0,
- 0xC04E,      0, 0xC04F,      0, 0xC050, 0xC051, 0x596E,      0,
- 0x5972, 0xC052, 0xC053,      0, 0x4842, 0x456B,      0, 0xC054,
- 0xC055,      0,      0,      0, 0x596B, 0xC056, 0x596F,      0,
-      0,      0, 0x3748,      0,      0, 0xC057, 0x3A71, 0xC058,
-};
-static const unsigned short utf8_to_euc_E690_x0213[] = {
-      0,      0,      0,      0,      0,      0, 0x596C,      0,
-      0, 0xAD44, 0xC048,      0,      0, 0x423B,      0, 0x5973,
- 0x7475,      0, 0xC04A, 0x596D, 0x7476,      0, 0x596A, 0x5971,
- 0xC04C,      0,      0,      0, 0x5953,      0, 0xAD45,      0,
- 0xC04E,      0, 0x7477,      0, 0xC050, 0xAD46, 0x596E,      0,
- 0x5972, 0xAD47, 0xC053,      0, 0x4842, 0x456B,      0, 0xAD48,
- 0xC055,      0,      0,      0, 0x596B, 0xC056, 0x596F,      0,
-      0,      0, 0x3748,      0,      0, 0xC057, 0x3A71, 0xC058,
-};
-static const unsigned short utf8_to_euc_E691[] = {
-      0,      0, 0x405D,      0,      0,      0,      0,      0,
-      0,      0,      0, 0xC059,      0,      0, 0x5977, 0xC05A,
-      0, 0xC05B, 0xC05C, 0xC05D, 0xC05E,      0,      0,      0,
- 0x4526,      0, 0xC05F, 0xC060, 0xC061, 0xC062,      0, 0xC063,
- 0xC064, 0xC065,      0, 0xC066,      0,      0,      0, 0x5974,
-      0, 0x4B60,      0,      0,      0, 0xC067,      0, 0x5975,
-      0,      0,      0, 0xC068, 0xC069,      0, 0x5976,      0,
- 0x4C4E,      0, 0x4022, 0xC06A,      0, 0xC06B,      0,      0,
-};
-static const unsigned short utf8_to_euc_E691_x0213[] = {
-      0,      0, 0x405D,      0,      0,      0,      0,      0,
-      0,      0,      0, 0xC059,      0,      0, 0x5977, 0xC05A,
-      0, 0x7479, 0xC05C, 0xC05D, 0xC05E,      0,      0,      0,
- 0x4526,      0, 0xAD49, 0xAD4A, 0xC061, 0xAD4B,      0, 0xC063,
- 0x747A, 0xC065,      0, 0xC066,      0,      0,      0, 0x5974,
-      0, 0x4B60,      0,      0,      0, 0x747B,      0, 0x5975,
-      0,      0,      0, 0xAD4C, 0xC069,      0, 0x5976,      0,
- 0x4C4E, 0x7478, 0x4022, 0xC06A,      0, 0xAD4D,      0,      0,
-};
-static const unsigned short utf8_to_euc_E692[] = {
-      0,      0,      0, 0x3762,      0, 0xC06C,      0, 0xC06D,
- 0x597D,      0,      0,      0,      0,      0,      0, 0xC06E,
- 0xC06F, 0xC070, 0x3B35, 0x597A,      0, 0x5979,      0,      0,
- 0xC071, 0xC072, 0x4732, 0xC073,      0, 0xC074, 0x4635, 0xC075,
-      0, 0xC076,      0, 0xC077, 0x4531, 0x597B, 0xC078,      0,
- 0xC079, 0x597C,      0, 0x496F, 0xC07A, 0x4745, 0x3B23,      0,
- 0x4071,      0, 0x4B50, 0xC07B,      0,      0,      0,      0,
-      0, 0x3349,      0, 0x5A25, 0x597E, 0xC07C, 0xC07D, 0xC07E,
-};
-static const unsigned short utf8_to_euc_E692_x0213[] = {
-      0,      0,      0, 0x3762,      0, 0xC06C,      0, 0xAD4E,
- 0x597D,      0,      0,      0,      0,      0,      0, 0xC06E,
- 0xC06F, 0xAD4F, 0x3B35, 0x597A,      0, 0x5979,      0,      0,
- 0xC071, 0xC072, 0x4732, 0xC073,      0, 0xAD50, 0x4635, 0xAD51,
-      0, 0xC076,      0, 0xC077, 0x4531, 0x597B, 0xC078,      0,
- 0xC079, 0x597C,      0, 0x496F, 0xC07A, 0x4745, 0x3B23,      0,
- 0x4071,      0, 0x4B50, 0xC07B,      0,      0,      0,      0,
-      0, 0x3349,      0, 0x5A25, 0x597E, 0xC07C, 0x747D, 0x747E,
-};
-static const unsigned short utf8_to_euc_E693[] = {
-      0, 0x4D4A, 0x5A27,      0, 0xC121, 0x5A23,      0, 0x5A24,
-      0, 0xC122, 0xC123, 0xC124, 0xC125, 0x4160, 0xC126,      0,
- 0xC127, 0xC128, 0x5A22,      0, 0x593F, 0xC129,      0, 0xC12A,
- 0x5A26,      0, 0x5A21,      0,      0,      0,      0,      0,
- 0x5A2B, 0x5A2C, 0x4527, 0x5A2E, 0xC12B, 0xC12C, 0x3B24, 0x5A29,
-      0, 0xC12D, 0xC12E,      0, 0x353C, 0xC12F,      0, 0x5A2F,
- 0xC130, 0x5A28, 0x5A33,      0, 0x5A32, 0xC131, 0x5A31, 0xC132,
-      0,      0, 0x5A34, 0xC133,      0, 0x5A36, 0x3E71, 0xC134,
-};
-static const unsigned short utf8_to_euc_E693_x0213[] = {
-      0, 0x4D4A, 0x5A27,      0, 0x7521, 0x5A23,      0, 0x5A24,
-      0, 0xC122, 0x7522, 0xAD52, 0xAD53, 0x4160, 0x747C,      0,
- 0x7523, 0xC128, 0x5A22,      0, 0x593F, 0xAD54,      0, 0xAD55,
- 0x5A26,      0, 0x5A21,      0,      0,      0,      0,      0,
- 0x5A2B, 0x5A2C, 0x4527, 0x5A2E, 0xAD57, 0xAD58, 0x3B24, 0x5A29,
-      0, 0xC12D, 0xC12E,      0, 0x353C, 0xC12F,      0, 0x5A2F,
- 0xC130, 0x5A28, 0x5A33,      0, 0x5A32, 0xC131, 0x5A31, 0x7524,
-      0,      0, 0x5A34, 0x7525,      0, 0x5A36, 0x3E71, 0xAD59,
-};
-static const unsigned short utf8_to_euc_E694[] = {
- 0x5A35, 0xC135,      0,      0, 0xC136, 0x5A39,      0,      0,
- 0xC137, 0xC138, 0xC139,      0,      0,      0,      0, 0xC13A,
-      0,      0,      0, 0xC13B, 0xC13C,      0, 0xC13D,      0,
- 0x5A37, 0xC13E,      0, 0xC13F, 0x5A38, 0x5970, 0xC140, 0xC141,
-      0,      0, 0xC142, 0x5A3B, 0x5A3A,      0, 0xC143,      0,
-      0, 0xC144, 0x5978, 0x5A3C, 0x5A30,      0, 0xC145, 0x3B59,
-      0, 0xC146,      0,      0, 0x5A3D, 0x5A3E, 0x5A40, 0x5A3F,
- 0x5A41, 0x327E, 0xC147, 0x3936, 0xC148, 0xC149, 0x4A7C, 0x402F,
-};
-static const unsigned short utf8_to_euc_E694_x0213[] = {
- 0x5A35, 0xC135,      0,      0, 0xAD5A, 0x5A39,      0,      0,
- 0xC137, 0xC138, 0xC139,      0,      0,      0,      0, 0xAD5C,
-      0,      0,      0, 0xC13B, 0xAD5D,      0, 0xAD5E,      0,
- 0x5A37, 0xC13E,      0, 0xC13F, 0x5A38, 0x5970, 0xAD60, 0xC141,
-      0,      0, 0x7526, 0x5A3B, 0x5A3A,      0, 0xC143,      0,
-      0, 0x7527, 0x5978, 0x5A3C, 0x5A30,      0, 0xC145, 0x3B59,
-      0, 0xC146, 0xAD61,      0, 0x5A3D, 0x5A3E, 0x5A40, 0x5A3F,
- 0x5A41, 0x327E, 0xC147, 0x3936, 0xC148, 0xC149, 0x4A7C, 0x402F,
-};
-static const unsigned short utf8_to_euc_E695[] = {
-      0,      0,      0, 0xC14A,      0, 0x384E,      0, 0xC14B,
- 0x5A43, 0xC14C,      0,      0,      0, 0x5A46, 0xF441, 0x4952,
- 0xC14D, 0x355F, 0xC14E,      0, 0xC14F, 0x5A45, 0x5A44, 0x4754,
- 0x5A47, 0x3635,      0,      0,      0, 0x5A49, 0x5A48, 0xC150,
- 0xC151,      0, 0x343A, 0x3B36,      0,      0, 0x4658, 0xC152,
-      0,      0,      0, 0xC153, 0x3749,      0,      0,      0,
- 0x3F74,      0, 0x5A4A,      0, 0x4030, 0x4528,      0, 0x495F,
- 0x5A4B,      0, 0xC154,      0,      0, 0xC155,      0,      0,
-};
-static const unsigned short utf8_to_euc_E695_x0213[] = {
-      0,      0,      0, 0xC14A, 0xAD62, 0x384E,      0, 0xC14B,
- 0x5A43, 0xC14C,      0,      0,      0, 0x5A46,      0, 0x4952,
- 0xC14D, 0x355F, 0xC14E,      0, 0xAD63, 0x5A45, 0x5A44, 0x4754,
- 0x5A47, 0x3635,      0,      0,      0, 0x5A49, 0x5A48, 0xC150,
- 0xC151,      0, 0x343A, 0x3B36,      0,      0, 0x4658, 0x7529,
-      0,      0,      0, 0xAD64, 0x3749,      0,      0,      0,
- 0x3F74,      0, 0x5A4A,      0, 0x4030, 0x4528,      0, 0x495F,
- 0x5A4B,      0, 0xAD65,      0,      0, 0xC155,      0,      0,
-};
-static const unsigned short utf8_to_euc_E696[] = {
-      0, 0xC156, 0x5A4C, 0x5A4D,      0, 0xC157,      0, 0x4A38,
- 0x555D, 0x4046, 0xC158,      0, 0x494C,      0, 0x3A58,      0,
- 0x4865, 0x4843, 0xC159,      0,      0, 0xC15A,      0, 0x454D,
- 0xC15B, 0x4E41,      0, 0x5A4F, 0x3C50, 0xC15C,      0, 0x5A50,
- 0xC15D, 0x3036,      0, 0xC15E, 0x3654, 0x404D, 0xC15F, 0x4960,
-      0,      0,      0, 0x5A51, 0x3B42, 0x4347, 0xC160, 0x3B5B,
- 0x3F37,      0, 0xC161, 0xC162, 0xC163,      0,      0, 0x5A52,
-      0, 0x4A7D,      0,      0, 0x3177, 0x3B5C,      0, 0xC164,
-};
-static const unsigned short utf8_to_euc_E696_x0213[] = {
-      0, 0xAD66, 0x5A4C, 0x5A4D, 0xAD67, 0xAD68,      0, 0x4A38,
- 0x555D, 0x4046, 0xAD69,      0, 0x494C,      0, 0x3A58,      0,
- 0x4865, 0x4843, 0xC159,      0,      0, 0xC15A,      0, 0x454D,
- 0xC15B, 0x4E41,      0, 0x5A4F, 0x3C50, 0x752A,      0, 0x5A50,
- 0xC15D, 0x3036,      0, 0xC15E, 0x3654, 0x404D, 0xC15F, 0x4960,
-      0,      0,      0, 0x5A51, 0x3B42, 0x4347, 0xC160, 0x3B5B,
- 0x3F37,      0, 0xAD6A, 0xC162, 0xC163, 0xAD6B,      0, 0x5A52,
- 0xAD6C, 0x4A7D,      0,      0, 0x3177, 0x3B5C,      0, 0xAD6D,
-};
-static const unsigned short utf8_to_euc_E697[] = {
-      0, 0x5A55, 0xC165, 0x5A53, 0x5A56, 0x4E39, 0x5A54,      0,
- 0xC166, 0xC167,      0, 0x407B, 0x5A57,      0, 0xC168, 0x4232,
- 0xC169,      0, 0x5A58,      0, 0xC16A,      0, 0xC16B, 0x347A,
- 0xC16C, 0x5A5A,      0, 0x5A59,      0,      0,      0, 0xC16D,
- 0x5A5B, 0x5A5C, 0x347B,      0,      0, 0x467C, 0x4336, 0x356C,
- 0x3B5D, 0x4161,      0,      0, 0x3D5C, 0x3030,      0,      0,
- 0xC16E, 0x5A5D, 0xC16F,      0, 0xC170, 0xC171,      0,      0,
-      0, 0xC172, 0x3222, 0x5A61,      0,      0, 0xC173, 0xC174,
-};
-static const unsigned short utf8_to_euc_E697_x0213[] = {
-      0, 0x5A55, 0xAD6E, 0x5A53, 0x5A56, 0x4E39, 0x5A54,      0,
- 0xC166, 0xAD6F,      0, 0x407B, 0x5A57,      0, 0xC168, 0x4232,
- 0xC169,      0, 0x5A58,      0, 0xAD70,      0, 0xC16B, 0x347A,
- 0xC16C, 0x5A5A,      0, 0x5A59,      0,      0,      0, 0xC16D,
- 0x5A5B, 0x5A5C, 0x347B,      0,      0, 0x467C, 0x4336, 0x356C,
- 0x3B5D, 0x4161,      0,      0, 0x3D5C, 0x3030,      0,      0,
- 0xC16E, 0x5A5D, 0xAD72,      0, 0xC170, 0xC171,      0,      0,
-      0, 0xAD73, 0x3222, 0x5A61, 0xAD74,      0, 0xC173, 0xC174,
-};
-static const unsigned short utf8_to_euc_E698[] = {
- 0xC175,      0, 0x3937, 0x5A60, 0xC176,      0, 0x3A2B, 0x3E3A,
- 0xC177, 0xC178, 0x5A5F,      0, 0x3E3B, 0xC179, 0x4C40, 0x3A2A,
-      0, 0xC17A, 0xC17B, 0x3057, 0x404E, 0xC17C, 0xC17D,      0,
-      0,      0,      0,      0, 0x5A66, 0xC17E, 0xC221, 0x4031,
- 0x3147, 0xC222, 0xC223, 0xC224, 0xC225, 0x3D55, 0xC226, 0x4B66,
- 0x3A72, 0xC227, 0xC228, 0xC229, 0xC22A, 0x3E3C, 0xC22B, 0x4027,
- 0xC22C, 0xC22D,      0, 0xC22E, 0x5A65, 0x5A63, 0x5A64, 0xC230,
-      0, 0xC22F,      0, 0xF442, 0x436B,      0,      0, 0x5B26,
-};
-static const unsigned short utf8_to_euc_E698_x0213[] = {
- 0x752C,      0, 0x3937, 0x5A60, 0xAD75,      0, 0x3A2B, 0x3E3A,
- 0xAD76, 0x752D, 0x5A5F,      0, 0x3E3B, 0xC179, 0x4C40, 0x3A2A,
-      0, 0xC17A, 0xC17B, 0x3057, 0x404E, 0x752E, 0xC17D,      0,
-      0,      0,      0,      0, 0x5A66, 0xC17E, 0x752F, 0x4031,
- 0x3147, 0xAD77, 0x7531, 0xC224, 0x7532, 0x3D55, 0xC226, 0x4B66,
- 0x3A72, 0xC227, 0xAD78, 0x7533, 0xC22A, 0x3E3C,      0, 0x4027,
- 0x7534, 0x7535,      0, 0x7536, 0x5A65, 0x5A63, 0x5A64, 0xC230,
-      0, 0xC22F, 0x7530,      0, 0x436B,      0,      0, 0x5B26,
-};
-static const unsigned short utf8_to_euc_E699[] = {
- 0xC231, 0x5A6A, 0x3B7E, 0x3938, 0x5A68, 0xC232, 0xC233,      0,
-      0, 0x5A69, 0xC234, 0x3F38, 0xC235,      0, 0xC237, 0x5A67,
-      0, 0xC236, 0x3B2F,      0,      0,      0,      0, 0xC238,
- 0xC239, 0xC23A,      0, 0xC23B, 0xC23C, 0x5A6C, 0x5A6B, 0x5A70,
- 0xC23D, 0xC23E, 0x5A71,      0, 0x5A6D, 0xF443, 0x3322, 0x5A6E,
- 0x5A6F, 0x4855, 0xC240, 0xC241, 0xC242,      0, 0x4961, 0x374A,
- 0x5A72,      0,      0, 0xC244, 0x4032, 0xC245, 0x3E3D, 0xC247,
- 0xC248, 0xC249, 0x4352, 0xC24A, 0xC24C,      0, 0xC243, 0xC246,
-};
-static const unsigned short utf8_to_euc_E699_x0213[] = {
- 0xC231, 0x5A6A, 0x3B7E, 0x3938, 0x5A68, 0xAD79, 0xC233,      0,
- 0x7538, 0x5A69, 0xC234, 0x3F38, 0x7539,      0, 0xAD7B, 0x5A67,
-      0, 0xAD7A, 0x3B2F,      0,      0,      0,      0, 0xAD7E,
- 0xC239, 0x753B, 0x753C, 0xAE21, 0xC23C, 0x5A6C, 0x5A6B, 0x5A70,
- 0xC23D, 0x753D, 0x5A71, 0xAE22, 0x5A6D, 0x753E, 0x3322, 0x5A6E,
- 0x5A6F, 0x4855, 0xAE25, 0xAE26, 0xAE27, 0xAE28, 0x4961, 0x374A,
- 0x5A72,      0,      0, 0x753F, 0x4032, 0xC245, 0x3E3D, 0x7540,
- 0x7541, 0xC249, 0x4352, 0xAE29, 0xC24C,      0, 0xC243, 0xC246,
-};
-static const unsigned short utf8_to_euc_E69A[] = {
- 0xC24B, 0x3647,      0, 0x5A73, 0x5A77,      0,      0, 0x324B,
- 0x5A74, 0x5A76,      0, 0xC24D, 0xC24E, 0xC24F, 0x5A75,      0,
- 0xC250, 0x3D6B, 0xC251,      0,      0,      0, 0x4348, 0x3045,
- 0x5A78, 0xC252, 0xC253, 0xC254, 0xC255, 0x5A79,      0, 0xC256,
- 0xC257,      0, 0x442A,      0, 0xC258,      0, 0x4E71,      0,
-      0,      0,      0, 0x3B43,      0, 0xC259, 0x4A6B,      0,
-      0, 0xC25A, 0xC25B,      0, 0x4B3D, 0xC25C,      0,      0,
- 0x5B22, 0x5A7B,      0, 0xC25D, 0x5A7E,      0, 0x5A7D, 0xC25E,
-};
-static const unsigned short utf8_to_euc_E69A_x0213[] = {
- 0xAE2A, 0x3647,      0, 0x5A73, 0x5A77,      0,      0, 0x324B,
- 0x5A74, 0x5A76,      0, 0xC24D, 0xC24E, 0x7542, 0x5A75,      0,
- 0xAE2B, 0x3D6B, 0xAE2C,      0,      0,      0, 0x4348, 0x3045,
- 0x5A78, 0xAE2D, 0xC253, 0xC254, 0xC255, 0x5A79,      0, 0xC256,
- 0x7544,      0, 0x442A,      0, 0xC258,      0, 0x4E71,      0,
-      0,      0,      0, 0x3B43,      0, 0xAE2F, 0x4A6B,      0,
-      0, 0xAE30, 0x7545,      0, 0x4B3D, 0xAE31,      0,      0,
- 0x5B22, 0x5A7B,      0, 0x7546, 0x5A7E,      0, 0x5A7D, 0xAE33,
-};
-static const unsigned short utf8_to_euc_E69B[] = {
- 0xC25F, 0x5A7A, 0xC260, 0xC261, 0x5B21,      0,      0, 0x465E,
- 0xC262, 0x5A7C,      0,      0, 0xC263,      0, 0xC264, 0xC265,
-      0,      0,      0,      0, 0xC266,      0, 0x5B23,      0,
-      0, 0x3D6C, 0x5B24, 0xC267, 0x4D4B, 0x4778,      0, 0xC268,
- 0x5B25,      0,      0,      0,      0,      0, 0x5B27,      0,
- 0xC269, 0x5B28,      0, 0xC26A, 0xC26B,      0, 0xC26C,      0,
- 0x5B29,      0, 0x364A, 0x3148, 0x3939, 0x5B2A,      0, 0x5B2B,
- 0x3D71, 0x4162, 0xC26D, 0xC23F, 0x5258, 0x413E, 0x413D, 0x4258,
-};
-static const unsigned short utf8_to_euc_E69B_x0213[] = {
- 0xC25F, 0x5A7A, 0xC260, 0xC261, 0x5B21,      0, 0x7547, 0x465E,
- 0x7548, 0x5A7C,      0,      0, 0xC263,      0, 0xC264, 0xC265,
-      0,      0,      0,      0, 0xC266,      0, 0x5B23,      0,
-      0, 0x3D6C, 0x5B24, 0x754A, 0x4D4B, 0x4778,      0, 0xC268,
- 0x5B25,      0,      0,      0,      0,      0, 0x5B27,      0,
- 0x754B, 0x5B28,      0, 0xC26A, 0xAE35,      0, 0xC26C,      0,
- 0x5B29,      0, 0x364A, 0x3148, 0x3939, 0x5B2A,      0, 0x5B2B,
- 0x3D71, 0x4162, 0x754C, 0x7537, 0x5258, 0x413E, 0x413D, 0x4258,
-};
-static const unsigned short utf8_to_euc_E69C[] = {
- 0x3A47,      0,      0, 0x5072,      0, 0xC26E,      0, 0xC26F,
- 0x376E, 0x4D2D,      0, 0x4A7E,      0, 0x497E, 0xC270, 0x5B2C,
-      0,      0,      0, 0xC271, 0x3A73, 0x443F, 0x5B2D, 0x4F2F,
-      0, 0xC272,      0, 0x4B3E, 0xC273, 0x442B, 0x5B2E, 0x347C,
- 0xC274,      0, 0xC275,      0,      0,      0, 0x5B2F, 0x5B30,
- 0x4C5A,      0, 0x4C24, 0x4B76, 0x4B5C, 0x3B25, 0x5B32,      0,
-      0, 0x3C6B,      0, 0xC276, 0x4B51,      0, 0x5B34, 0x5B37,
- 0x5B36,      0, 0x3479,      0,      0, 0x3560, 0xC277, 0x5B33,
-};
-static const unsigned short utf8_to_euc_E69C_x0213[] = {
- 0x3A47, 0xAE37,      0, 0x5072,      0, 0xAE38,      0, 0xC26F,
- 0x376E, 0x4D2D,      0, 0x4A7E,      0, 0x497E,      0, 0x5B2C,
-      0,      0, 0xAE39, 0x754D, 0x3A73, 0x443F, 0x5B2D, 0x4F2F,
-      0, 0xAE3B,      0, 0x4B3E, 0xC273, 0x442B, 0x5B2E, 0x347C,
- 0xC274,      0, 0xC275,      0,      0,      0, 0x5B2F, 0x5B30,
- 0x4C5A,      0, 0x4C24, 0x4B76, 0x4B5C, 0x3B25, 0x5B32,      0,
-      0, 0x3C6B,      0, 0x754F, 0x4B51,      0, 0x5B34, 0x5B37,
- 0x5B36,      0, 0x3479,      0,      0, 0x3560, 0xC277, 0x5B33,
-};
-static const unsigned short utf8_to_euc_E69D[] = {
-      0, 0x5B35,      0,      0,      0, 0xC278, 0x5B38, 0xC279,
- 0xC27A, 0x3F79,      0,      0, 0xC27B,      0, 0x4D7B, 0x3049,
- 0x3A60, 0x423C,      0, 0x3C5D, 0xC27C, 0xC27D, 0x3E73,      0,
-      0, 0x5B3B,      0,      0, 0x454E, 0xC27E, 0x5B39, 0x422B,
- 0x5B3A, 0x3E72, 0x4C5D, 0x5B3C, 0x5B3D, 0x4D68, 0xC321,      0,
-      0,      0, 0x5B42,      0, 0xC322, 0x393A, 0xC323, 0x4755,
- 0x5B3F, 0x456C, 0x5A5E, 0x5A62, 0xC324, 0x354F, 0xC325, 0x4747,
-      0,      0,      0, 0xC326, 0x5B41,      0, 0x3E3E, 0x4844,
-};
-static const unsigned short utf8_to_euc_E69D_x0213[] = {
-      0, 0x5B35,      0,      0,      0, 0xC278, 0x5B38, 0x7551,
- 0x7552, 0x3F79,      0,      0, 0xAE3E, 0xAE3F, 0x4D7B, 0x3049,
- 0x3A60, 0x423C,      0, 0x3C5D, 0xAE40, 0xC27D, 0x3E73,      0,
-      0, 0x5B3B,      0,      0, 0x454E, 0xAE41, 0x5B39, 0x422B,
- 0x5B3A, 0x3E72, 0x4C5D, 0x5B3C, 0x5B3D, 0x4D68, 0x7550,      0,
-      0,      0, 0x5B42,      0, 0xC322, 0x393A, 0xC323, 0x4755,
- 0x5B3F, 0x456C, 0x5A5E, 0x5A62, 0xAE45, 0x354F, 0xAE46, 0x4747,
-      0,      0,      0, 0x7553, 0x5B41,      0, 0x3E3E, 0x4844,
-};
-static const unsigned short utf8_to_euc_E69E[] = {
-      0, 0xC327,      0,      0, 0xC328, 0x5B47,      0, 0x487A,
-      0, 0x5B3E,      0, 0x5B44, 0x5B43,      0, 0xC329, 0xC32A,
- 0x404F, 0xC32B,      0, 0xC32C,      0, 0x4B6D, 0xC32D, 0x4E53,
- 0xC32E, 0xC32F, 0x4B67, 0xC330, 0x324C, 0x3B5E,      0,      0,
- 0x4F48, 0x5B46, 0x3F75,      0,      0,      0, 0x5B45,      0,
-      0, 0x5B40,      0,      0,      0,      0,      0, 0x384F,
- 0xC331, 0xC332, 0xC333, 0x5B4C, 0x5B4A, 0xC334, 0x324D, 0x5B48,
- 0x5B4E, 0x5B54,      0, 0xC335, 0xC336, 0xC337,      0,      0,
-};
-static const unsigned short utf8_to_euc_E69E_x0213[] = {
-      0, 0x7554,      0,      0, 0xC328, 0x5B47,      0, 0x487A,
-      0, 0x5B3E,      0, 0x5B44, 0x5B43,      0, 0xC329, 0xC32A,
- 0x404F, 0xC32B, 0xAE48, 0x7555,      0, 0x4B6D, 0xC32D, 0x4E53,
- 0x7556, 0xC32F, 0x4B67, 0x7557, 0x324C, 0x3B5E,      0,      0,
- 0x4F48, 0x5B46, 0x3F75,      0,      0,      0, 0x5B45,      0,
-      0, 0x5B40,      0,      0,      0,      0,      0, 0x384F,
- 0xAE4C, 0xC332, 0xAE4D, 0x5B4C, 0x5B4A, 0xC334, 0x324D, 0x5B48,
- 0x5B4E, 0x5B54,      0, 0x7558, 0xC336, 0xC337,      0,      0,
-};
-static const unsigned short utf8_to_euc_E69F[] = {
- 0xC339, 0x4248, 0xC33A, 0xC33B, 0x4A41, 0xC33C, 0x5B56,      0,
- 0xC33D, 0xC33E, 0x4922,      0,      0,      0, 0x5B55, 0x4770,
- 0x4B3F, 0x343B, 0xC33F, 0x4077, 0x3D40,      0,      0, 0xC340,
- 0x4453, 0xC341, 0x4D2E,      0, 0xC342, 0x5B51, 0x5B50,      0,
-      0, 0xC343, 0x5B52,      0, 0x5B4F,      0, 0xC344, 0x5B57,
-      0, 0x5B4D,      0,      0, 0x5B4B,      0, 0x5B53, 0x5B49,
- 0xC345, 0x436C, 0xC346, 0x4C78, 0x3C46, 0x3A74, 0xC347, 0xC348,
-      0, 0xC338,      0, 0x3A3A,      0,      0, 0x4B6F, 0x3341,
-};
-static const unsigned short utf8_to_euc_E69F_x0213[] = {
- 0x755A, 0x4248, 0xC33A, 0xAE4E, 0x4A41, 0xC33C, 0x5B56,      0,
- 0xAE4F, 0xC33E, 0x4922,      0,      0,      0, 0x5B55, 0x4770,
- 0x4B3F, 0x343B, 0xAE50, 0x4077, 0x3D40,      0,      0, 0x755B,
- 0x4453, 0xAE51, 0x4D2E, 0xAE52, 0xC342, 0x5B51, 0x5B50,      0,
-      0, 0xC343, 0x5B52,      0, 0x5B4F,      0, 0xC344, 0x5B57,
-      0, 0x5B4D,      0,      0, 0x5B4B,      0, 0x5B53, 0x5B49,
- 0xAE53, 0x436C, 0xC346, 0x4C78, 0x3C46, 0x3A74, 0xC347, 0xAE54,
-      0, 0x7559,      0, 0x3A3A, 0x755C,      0, 0x4B6F, 0x3341,
-};
-static const unsigned short utf8_to_euc_E6A0[] = {
-      0, 0xF446, 0x444E, 0x464A, 0x3149,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0, 0x4072, 0xC34A,      0, 0x4034, 0x372A,
-      0, 0xC34B,      0,      0,      0, 0xC34C, 0x5B59, 0xC34D,
-      0, 0x393B, 0x337C,      0,      0,      0,      0, 0xC34F,
- 0xC34E, 0x5B5B, 0x3374, 0x5B61, 0xC350, 0xC351,      0, 0xC352,
- 0xC353, 0xC354, 0x5B5E, 0xC355, 0x4073,      0,      0,      0,
- 0x334B, 0x3A2C,      0, 0xC356, 0x334A, 0x3A4F,      0, 0xC357,
-};
-static const unsigned short utf8_to_euc_E6A0_x0213[] = {
-      0, 0x755D, 0x444E, 0x464A, 0x3149,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
- 0xAE4B,      0,      0, 0x4072, 0xC34A,      0, 0x4034, 0x372A,
- 0xAE58, 0xC34B,      0,      0,      0, 0x755F, 0x5B59, 0xAE59,
-      0, 0x393B, 0x337C,      0,      0,      0,      0, 0xC34F,
- 0xC34E, 0x5B5B, 0x3374, 0x5B61, 0x7560, 0xAE5A,      0, 0xC352,
- 0xC353, 0x7561, 0x5B5E, 0xAE5C, 0x4073,      0,      0,      0,
- 0x334B, 0x3A2C,      0, 0xAE5D, 0x334A, 0x3A4F, 0xAE5E, 0xC357,
-};
-static const unsigned short utf8_to_euc_E6A1[] = {
- 0x5B5C, 0x3765, 0x374B, 0x456D, 0xC358, 0xC359, 0x5B5A,      0,
- 0x3046,      0, 0xC35A,      0, 0xC35B, 0x5B5D, 0x5B5F,      0,
- 0x364D, 0x372C, 0xC349, 0x343C, 0x354B, 0xC35C,      0, 0xC35D,
- 0xC35E, 0x5B62,      0, 0xC35F, 0x3A79, 0x4B71,      0, 0x3B37,
-      0,      0,      0, 0x5B63,      0,      0,      0, 0x4930,
-      0,      0,      0, 0xC360,      0,      0, 0xC361, 0xC362,
- 0xC363, 0xC364, 0xC365,      0, 0x5B6F, 0xC366, 0x3233, 0x5B64,
-      0, 0xC367, 0xC368, 0xC369, 0xC36A,      0, 0x5B75, 0x5B65,
-};
-static const unsigned short utf8_to_euc_E6A1_x0213[] = {
- 0x5B5C, 0x3765, 0x374B, 0x456D, 0xAE5F, 0xAE60, 0x5B5A,      0,
- 0x3046, 0xAE61, 0xC35A,      0, 0xAE62, 0x5B5D, 0x5B5F,      0,
- 0x364D, 0x372C, 0x755E, 0x343C, 0x354B, 0xAE63,      0, 0xAE64,
- 0xC35E, 0x5B62,      0, 0x7562, 0x3A79, 0x4B71,      0, 0x3B37,
-      0,      0,      0, 0x5B63,      0,      0,      0, 0x4930,
-      0,      0,      0, 0xAE66,      0,      0, 0xAE67, 0xC362,
- 0xC363, 0xC364, 0x7563,      0, 0x5B6F, 0x7564, 0x3233, 0x5B64,
-      0, 0xC367, 0xAE68, 0xC369, 0xAE69,      0, 0x5B75, 0x5B65,
-};
-static const unsigned short utf8_to_euc_E6A2[] = {
-      0, 0x4E42, 0xC36B, 0x5B6C, 0xC36C, 0x475F, 0xC36D,      0,
- 0xC36E,      0,      0,      0,      0, 0x5B74,      0, 0x5B67,
-      0,      0,      0, 0x3034, 0x5B69,      0, 0xC36F, 0x393C,
- 0xC370,      0, 0xC371, 0x5B6B, 0xC372, 0x5B6A,      0, 0x5B66,
- 0x5B71, 0xC373, 0x3E3F, 0xC374,      0, 0xC375, 0x546D, 0x3868,
- 0x4D7C, 0xC376, 0xC377,      0,      0, 0x5B68, 0xC378, 0x4474,
- 0x3323, 0x3A2D, 0xC379, 0x5B60,      0, 0x5B70, 0x3361,      0,
-      0, 0x5B6E, 0x5B72, 0xC37A, 0x456E,      0,      0,      0,
-};
-static const unsigned short utf8_to_euc_E6A2_x0213[] = {
-      0, 0x4E42, 0xAE6A, 0x5B6C, 0xC36C, 0x475F, 0xC36D,      0,
- 0xC36E,      0,      0,      0,      0, 0x5B74,      0, 0x5B67,
- 0xAE6B,      0,      0, 0x3034, 0x5B69,      0, 0xAE6C, 0x393C,
- 0xAE6E, 0xAE6F, 0xAE70, 0x5B6B, 0xAE71, 0x5B6A,      0, 0x5B66,
- 0x5B71, 0xC373, 0x3E3F, 0x7566,      0, 0x7567, 0x546D, 0x3868,
- 0x4D7C, 0xC376, 0xAE72, 0xAE73,      0, 0x5B68, 0xC378, 0x4474,
- 0x3323, 0x3A2D, 0x7568, 0x5B60, 0xAE74, 0x5B70, 0x3361,      0,
-      0, 0x5B6E, 0x5B72, 0xAE75, 0x456E,      0,      0,      0,
-};
-static const unsigned short utf8_to_euc_E6A3[] = {
-      0,      0,      0,      0, 0x347E, 0xC37B, 0x5C32,      0,
- 0xC37C, 0x4C49, 0x5B77, 0x347D, 0xC37D, 0x5B7E,      0, 0xC37E,
- 0xC421, 0xC422, 0x4B40, 0xC423, 0x5C21, 0x5C23, 0xC424, 0x5C27,
- 0x5B79, 0xC425, 0x432A,      0, 0xC426, 0xC427,      0, 0x456F,
- 0x5C2B, 0x5B7C,      0, 0x5C28,      0, 0xC428,      0, 0x5C22,
- 0xC429,      0, 0xC42A, 0xC42B, 0xC42C, 0xC42D, 0x3F39, 0x5C2C,
- 0xC42E, 0xC42F, 0x4033,      0,      0, 0xC430, 0xC431,      0,
-      0, 0x5C2A, 0x343D, 0xC432, 0xC433, 0xC434,      0,      0,
-};
-static const unsigned short utf8_to_euc_E6A3_x0213[] = {
-      0,      0,      0, 0xAE7A, 0x347E, 0xAE7B, 0x5C32,      0,
- 0x7569, 0x4C49, 0x5B77, 0x347D, 0xAE7C, 0x5B7E,      0, 0xAE7D,
- 0x756A, 0xC422, 0x4B40, 0xC423, 0x5C21, 0x5C23, 0xAE7E, 0x5C27,
- 0x5B79, 0xAF21, 0x432A,      0, 0xC426, 0xC427,      0, 0x456F,
- 0x5C2B, 0x5B7C,      0, 0x5C28, 0xAF22, 0xAF23,      0, 0x5C22,
- 0x756B,      0, 0xC42A, 0xC42B, 0xAF24, 0x756C, 0x3F39, 0x5C2C,
- 0x756D, 0x756E, 0x4033,      0,      0, 0xC430, 0xC431, 0xAF25,
-      0, 0x5C2A, 0x343D, 0xAE76, 0x756F, 0xC434,      0,      0,
-};
-static const unsigned short utf8_to_euc_E6A4[] = {
- 0x4F50, 0x5B76,      0,      0, 0x5C26, 0x3058, 0xC435,      0,
- 0x5B78, 0xC436, 0xC437, 0x4C3A, 0x5B7D, 0x3F22, 0x4447, 0x5B73,
- 0xC438, 0xC439, 0x5C25, 0xC43A,      0,      0, 0xC43B, 0xC43C,
-      0, 0x3F7A, 0x5C2F, 0x3371, 0x3821,      0,      0,      0,
-      0, 0x5C31, 0x5B7A, 0x5C30,      0, 0x5C29, 0x5B7B,      0,
- 0x5C2D,      0, 0x5C2E,      0,      0,      0,      0,      0,
- 0x5C3F, 0xC43D,      0, 0xC43E, 0x464E, 0xC43F, 0x5C24,      0,
- 0xC440, 0x5C3B,      0, 0xC441,      0, 0x5C3D,      0, 0x4458,
-};
-static const unsigned short utf8_to_euc_E6A4_x0213[] = {
- 0x4F50, 0x5B76,      0, 0xAF26, 0x5C26, 0x3058, 0xC435, 0xAF27,
- 0x5B78, 0xC436, 0x7570, 0x4C3A, 0x5B7D, 0x3F22, 0x4447, 0x5B73,
- 0xC438, 0xC439, 0x5C25, 0xC43A,      0,      0, 0xC43B, 0xC43C,
-      0, 0x3F7A, 0x5C2F, 0x3371, 0x3821,      0,      0,      0,
-      0, 0x5C31, 0x5B7A, 0x5C30,      0, 0x5C29, 0x5B7B,      0,
- 0x5C2D,      0, 0x5C2E,      0,      0,      0,      0,      0,
- 0x5C3F, 0xC43D,      0, 0xC43E, 0x464E, 0x7573, 0x5C24,      0,
- 0xC440, 0x5C3B,      0, 0xAF2B,      0, 0x5C3D,      0, 0x4458,
-};
-static const unsigned short utf8_to_euc_E6A5[] = {
-      0,      0, 0xC442,      0,      0, 0xC443,      0,      0,
-      0, 0xC444, 0x4D4C,      0,      0,      0, 0xC445,      0,
-      0,      0,      0, 0x4976, 0x5C38, 0x424A,      0, 0xC446,
-      0, 0x5C3E, 0x413F, 0xC447, 0x5C35, 0x5C42, 0x5C41,      0,
- 0x466F, 0x5C40, 0x466A, 0xC448, 0xC449, 0xC44A, 0xC44B,      0,
- 0xC44C, 0xC44D, 0x5C44, 0x5C37, 0xC44E, 0x3648, 0x5C3A, 0x3D5D,
- 0xC44F, 0xC450, 0xC451, 0x4760, 0x5C3C, 0x364B,      0, 0x5C34,
- 0x5C36, 0x5C33, 0xC452, 0xC453, 0x4F30, 0x335A, 0x5C39, 0xC454,
-};
-static const unsigned short utf8_to_euc_E6A5_x0213[] = {
-      0,      0, 0x7574,      0,      0, 0xC443, 0xAF2D,      0,
-      0, 0x7571, 0x4D4C,      0,      0,      0, 0xC445,      0,
-      0,      0,      0, 0x4976, 0x5C38, 0x424A,      0, 0x7575,
-      0, 0x5C3E, 0x413F, 0xC447, 0x5C35, 0x5C42, 0x5C41,      0,
- 0x466F, 0x5C40, 0x466A, 0x7576, 0x7577, 0xC44A, 0xC44B,      0,
- 0x7578, 0xAF2E, 0x5C44, 0x5C37, 0xAF2F, 0x3648, 0x5C3A, 0x3D5D,
- 0xC44F, 0xC450, 0xAF30, 0x4760, 0x5C3C, 0x364B,      0, 0x5C34,
- 0x5C36, 0x5C33, 0xAF31, 0xC453, 0x4F30, 0x335A, 0x5C39, 0xAF32,
-};
-static const unsigned short utf8_to_euc_E6A6[] = {
- 0xC455, 0x5C43, 0x3335,      0,      0,      0,      0,      0,
-      0,      0, 0x3A67,      0,      0, 0xC456, 0x315D,      0,
-      0, 0x5C54, 0xC457,      0, 0x4F31, 0x5C57, 0xC458,      0,
- 0xC459,      0,      0, 0x3F3A, 0x5C56,      0,      0,      0,
- 0x5C55, 0xC45A,      0,      0,      0, 0xC45B, 0xC45C, 0x5C52,
- 0xC45D,      0,      0, 0xC45E,      0, 0xC45F, 0x5C46, 0xC460,
-      0, 0x5C63, 0x5C45,      0, 0x5C58,      0,      0, 0xC461,
- 0xC462,      0, 0xC463, 0x5C50, 0xC464,      0, 0x5C4B, 0x5C48,
-};
-static const unsigned short utf8_to_euc_E6A6_x0213[] = {
- 0x7579, 0x5C43, 0x3335,      0,      0,      0,      0,      0,
-      0,      0, 0x3A67,      0,      0, 0xC456, 0x315D,      0,
-      0, 0x5C54, 0xAF33,      0, 0x4F31, 0x5C57, 0xAF35,      0,
- 0xAF36,      0,      0, 0x3F3A, 0x5C56,      0,      0,      0,
- 0x5C55, 0xC45A,      0,      0,      0, 0x757B, 0xAF37, 0x5C52,
- 0xC45D,      0,      0, 0xC45E,      0, 0x757C, 0x5C46, 0xC460,
- 0xAF38, 0x5C63, 0x5C45,      0, 0x5C58,      0,      0, 0xAF39,
- 0xC462,      0, 0xAF3A, 0x5C50, 0xAF3B,      0, 0x5C4B, 0x5C48,
-};
-static const unsigned short utf8_to_euc_E6A7[] = {
-      0, 0x5C49,      0, 0x5C51,      0, 0xC465,      0, 0x7422,
- 0xC466,      0, 0x5C4E, 0x393D, 0x4448, 0x4164, 0x5C4C,      0,
- 0x5C47, 0xC467,      0, 0x5C4A,      0,      0, 0xC468, 0xC469,
- 0x4D4D, 0x4B6A,      0,      0,      0, 0x5C4F, 0x5C59,      0,
-      0,      0, 0xC46A,      0,      0, 0xC46B,      0, 0x5C61,
- 0x5C5A,      0,      0, 0x5C67,      0, 0x5C65, 0xC46C, 0xC46D,
-      0, 0xC46E, 0x5C60, 0xC46F,      0, 0xC470,      0,      0,
-      0, 0x5C5F,      0, 0x4450,      0, 0x4165, 0xC471, 0x5C5D,
-};
-static const unsigned short utf8_to_euc_E6A7_x0213[] = {
- 0xAF3C, 0x5C49,      0, 0x5C51,      0, 0xC465,      0, 0x7422,
- 0xC466,      0, 0x5C4E, 0x393D, 0x4448, 0x4164, 0x5C4C, 0x757D,
- 0x5C47, 0xAF3D,      0, 0x5C4A,      0,      0, 0xAF3E, 0xC469,
- 0x4D4D, 0x4B6A,      0,      0,      0, 0x5C4F, 0x5C59,      0,
-      0,      0, 0x7622, 0xAF44,      0, 0xC46B,      0, 0x5C61,
- 0x5C5A, 0x7623, 0x7624, 0x5C67,      0, 0x5C65, 0xAF45, 0xAF46,
-      0, 0xC46E, 0x5C60, 0xAF47, 0xAF49, 0x7625, 0x7626,      0,
-      0, 0x5C5F,      0, 0x4450,      0, 0x4165, 0xAF4A, 0x5C5D,
-};
-static const unsigned short utf8_to_euc_E6A8[] = {
- 0xC472, 0xC473, 0x5C5B, 0xC474,      0, 0x5C62,      0,      0,
-      0,      0, 0x5C68, 0x4875, 0x5C6E,      0,      0, 0xC475,
-      0, 0xC476, 0x5C69, 0x5C6C, 0x5C66, 0xC477,      0, 0x4374,
-      0, 0x4938, 0xC478, 0x5C5C,      0, 0xC479, 0x5C64, 0x3E40,
- 0xC47A, 0x4C4F, 0x5C78, 0x5C6B, 0xC47B,      0,      0,      0,
- 0xC47C, 0x3822, 0x3223, 0x335F,      0,      0, 0x5C53,      0,
- 0xC47D,      0, 0xC47E,      0, 0xC521, 0x3E41, 0x5C70, 0xC522,
- 0x5C77, 0x3C79, 0x3372, 0xC523,      0, 0x432E, 0xC524, 0xC525,
-};
-static const unsigned short utf8_to_euc_E6A8_x0213[] = {
- 0xC472, 0xC473, 0x5C5B, 0xC474,      0, 0x5C62,      0,      0,
-      0,      0, 0x5C68, 0x4875, 0x5C6E,      0,      0, 0x7627,
-      0, 0xAF4B, 0x5C69, 0x5C6C, 0x5C66, 0x7628,      0, 0x4374,
-      0, 0x4938, 0xAF4C, 0x5C5C,      0, 0xAF4D, 0x5C64, 0x3E40,
- 0xC47A, 0x4C4F, 0x5C78, 0x5C6B, 0xC47B,      0,      0,      0,
- 0xC47C, 0x3822, 0x3223, 0x335F,      0,      0, 0x5C53,      0,
- 0xAF41,      0, 0xAF4F, 0xAF50, 0xAF51, 0x3E41, 0x5C70, 0xC522,
- 0x5C77, 0x3C79, 0x3372, 0x762A,      0, 0x432E, 0x762B, 0xAF52,
-};
-static const unsigned short utf8_to_euc_E6A9[] = {
-      0,      0,      0,      0, 0x5C6D, 0xC526, 0xC527, 0x5C72,
- 0x5C76, 0xC528, 0xC529, 0x3636,      0,      0, 0xC52A,      0,
- 0xC52B, 0xC52C, 0xC52D,      0,      0, 0xC52E, 0xC52F,      0,
- 0x354C, 0x5C74,      0, 0xC530,      0,      0,      0, 0x3521,
-      0, 0x464B, 0x5C73,      0, 0xC531,      0, 0x5C75, 0xC532,
-      0,      0, 0xC533, 0xF449,      0,      0,      0,      0,
-      0, 0xC534, 0x5C6F, 0xC535,      0,      0,      0,      0,
- 0x5C71,      0,      0,      0,      0,      0, 0xC536, 0x3360,
-};
-static const unsigned short utf8_to_euc_E6A9_x0213[] = {
-      0,      0,      0,      0, 0x5C6D, 0x762C, 0xAF53, 0x5C72,
- 0x5C76, 0xAF54, 0xC529, 0x3636,      0,      0, 0xAF56,      0,
- 0x762D, 0xC52C, 0xAF57,      0,      0, 0xC52E, 0x762E,      0,
- 0x354C, 0x5C74,      0, 0x762F,      0,      0,      0, 0x3521,
-      0, 0x464B, 0x5C73,      0, 0xAF58,      0, 0x5C75, 0xC532,
-      0,      0, 0xC533, 0x7630,      0,      0,      0,      0,
-      0, 0xC534, 0x5C6F, 0x7631,      0,      0,      0,      0,
- 0x5C71,      0, 0xAF55,      0,      0,      0, 0xAF5A, 0x3360,
-};
-static const unsigned short utf8_to_euc_E6AA[] = {
- 0x4349, 0xC537,      0, 0xC538, 0x5C7C,      0, 0xC539, 0xC53A,
-      0, 0xC53B,      0, 0xC53C,      0, 0x5C7A, 0x3869,      0,
- 0x5C79, 0xC53D,      0,      0,      0,      0,      0, 0x5D21,
-      0,      0,      0, 0xC53E, 0x5B58, 0xC53F, 0xC540, 0xC541,
- 0x5C7B,      0, 0x5C7D, 0x5C7E,      0, 0xC542,      0,      0,
-      0,      0, 0x5D2C, 0xC543, 0x5D28,      0, 0x5B6D, 0xC544,
- 0xC545, 0xC546,      0, 0x5D27, 0xC547,      0,      0,      0,
- 0x5D26,      0,      0, 0x5D23,      0, 0xC548, 0xC549, 0xC54A,
-};
-static const unsigned short utf8_to_euc_E6AA_x0213[] = {
- 0x4349, 0xC537,      0, 0xAF5B, 0x5C7C,      0, 0xC539, 0xC53A,
-      0, 0x7633,      0, 0xAF5C,      0, 0x5C7A, 0x3869,      0,
- 0x5C79, 0xAF5E,      0,      0, 0x7634,      0,      0, 0x5D21,
-      0,      0,      0, 0xC53E, 0x5B58, 0x7635, 0x7636, 0xAF5F,
- 0x5C7B, 0xAF60, 0x5C7D, 0x5C7E,      0, 0x7637,      0,      0,
-      0,      0, 0x5D2C, 0xAF62, 0x5D28,      0, 0x5B6D, 0xC544,
- 0xC545, 0xC546,      0, 0x5D27, 0xC547,      0,      0,      0,
- 0x5D26,      0,      0, 0x5D23,      0, 0xAF63, 0xC549, 0xC54A,
-};
-static const unsigned short utf8_to_euc_E6AB[] = {
-      0, 0x5C6A, 0x5D25, 0x5D24,      0,      0, 0xC54B,      0,
- 0xC54D, 0xC54C,      0,      0, 0xC54E,      0,      0,      0,
- 0xC54F, 0x5D2A,      0, 0x4F26, 0xC550, 0xC551, 0xC552,      0,
-      0,      0, 0x5D2D, 0x367B, 0xC553, 0xC554, 0x5D29, 0x5D2B,
-      0,      0, 0xF44A,      0, 0xC555,      0,      0, 0xC556,
- 0x4827,      0, 0x5D2E,      0, 0xC557,      0,      0,      0,
- 0xC558, 0xC559, 0xC55A,      0,      0,      0,      0,      0,
-      0,      0, 0x5D32, 0x5D2F, 0xC55B, 0xC55C,      0,      0,
-};
-static const unsigned short utf8_to_euc_E6AB_x0213[] = {
-      0, 0x5C6A, 0x5D25, 0x5D24,      0,      0, 0xAF64,      0,
- 0xC54D, 0xC54C,      0,      0, 0xC54E,      0,      0,      0,
- 0xAF66, 0x5D2A,      0, 0x4F26, 0xAF65, 0xC551, 0xC552,      0,
-      0,      0, 0x5D2D, 0x367B, 0xAF67, 0xAF68, 0x5D29, 0x5D2B,
-      0,      0,      0,      0, 0x7638,      0,      0, 0x7639,
- 0x4827,      0, 0x5D2E,      0, 0xAF6B,      0,      0,      0,
- 0xC558, 0xAF6C, 0xAF6D, 0xAF6E,      0,      0,      0,      0,
-      0,      0, 0x5D32, 0x5D2F, 0xC55B, 0xAF6F,      0,      0,
-};
-static const unsigned short utf8_to_euc_E6AC[] = {
-      0,      0, 0xC55D, 0xC55E, 0x4D73, 0x5D30, 0xC55F, 0xC560,
-      0, 0xC561, 0x5C5E,      0,      0,      0,      0, 0xC562,
- 0xC563, 0xC564, 0x5D33,      0,      0,      0, 0x5D34, 0xC565,
-      0,      0,      0, 0xC566,      0, 0x3135, 0xC567, 0x5D36,
- 0x3767, 0x3C21,      0, 0x3655, 0xC568,      0,      0, 0x3224,
- 0xC569,      0,      0, 0xC56A, 0xC56B,      0,      0, 0xC56C,
-      0,      0, 0x4D5F,      0,      0, 0xC56D, 0xC56E, 0x5D38,
- 0x5D37, 0x5D3A, 0x353D, 0xC56F,      0, 0x3656, 0x343E, 0xC570,
-};
-static const unsigned short utf8_to_euc_E6AC_x0213[] = {
-      0,      0, 0xC55D, 0xC55E, 0x4D73, 0x5D30, 0xC55F, 0xC560,
-      0, 0xC561, 0x5C5E, 0xAF71,      0,      0,      0, 0xAF72,
- 0xAF73, 0xAF74, 0x5D33,      0,      0,      0, 0x5D34, 0xAF76,
-      0,      0,      0, 0x763C,      0, 0x3135, 0x763D, 0x5D36,
- 0x3767, 0x3C21,      0, 0x3655, 0xC568,      0,      0, 0x3224,
- 0xC569,      0,      0, 0xC56A, 0x763E,      0,      0, 0xAF78,
-      0,      0, 0x4D5F,      0,      0, 0x763F, 0xC56E, 0x5D38,
- 0x5D37, 0x5D3A, 0x353D, 0xC56F,      0, 0x3656, 0x343E, 0xC570,
-};
-static const unsigned short utf8_to_euc_E6AD[] = {
-      0,      0,      0, 0x5D3D,      0,      0, 0xC571, 0x5D3C,
-      0, 0x5D3E, 0xC572,      0, 0x324E, 0xC573, 0x4337,      0,
- 0x5D3F,      0, 0xC574, 0x343F, 0x5D41,      0, 0xC575,      0,
- 0xC576, 0x5D40,      0, 0x5D42,      0, 0xC577,      0, 0x5D43,
- 0xC578, 0x5D44, 0x3B5F, 0x4035, 0x3A21,      0, 0x4970, 0xC579,
-      0, 0x4A62, 0x4F44, 0xC57A,      0,      0, 0xC57B, 0x3B75,
- 0xC57C,      0,      0, 0x3A50, 0x4E72, 0xC57D,      0,      0,
- 0x5D45, 0x5D46,      0, 0x3B60,      0, 0xC57E, 0xC621, 0x5D47,
-};
-static const unsigned short utf8_to_euc_E6AD_x0213[] = {
-      0,      0,      0, 0x5D3D,      0,      0, 0x7640, 0x5D3C,
-      0, 0x5D3E, 0xAF79,      0, 0x324E, 0xC573, 0x4337,      0,
- 0x5D3F,      0, 0xC574, 0x343F, 0x5D41,      0, 0x7641,      0,
- 0xAF7A, 0x5D40,      0, 0x5D42,      0, 0xC577,      0, 0x5D43,
- 0x7642, 0x5D44, 0x3B5F, 0x4035, 0x3A21, 0x7643, 0x4970, 0x7644,
-      0, 0x4A62, 0x4F44, 0xC57A, 0xAF7B,      0, 0xC57B, 0x3B75,
- 0xC57C,      0,      0, 0x3A50, 0x4E72, 0xAF7C,      0, 0x7645,
- 0x5D45, 0x5D46, 0xAF7D, 0x3B60,      0, 0xC57E, 0xC621, 0x5D47,
-};
-static const unsigned short utf8_to_euc_E6AE[] = {
- 0x5D48,      0, 0xC622, 0x5D4A, 0x5D49, 0xC623, 0x4B58,      0,
-      0, 0x3D5E, 0x3C6C, 0x3B44,      0, 0x5D4B,      0,      0,
-      0,      0,      0,      0,      0, 0x5D4D, 0x3F23, 0xC624,
- 0x5D4C,      0,      0, 0xC625,      0,      0, 0x5D4E, 0xC626,
- 0xC627,      0, 0xC628, 0xC629, 0x5D4F,      0,      0,      0,
- 0xC62A, 0xC62B, 0x5D50, 0x5D51, 0xC62C, 0xC62D, 0xC62E, 0x5D52,
- 0xC62F, 0x5D54, 0x5D53, 0x5D55, 0x3225, 0x434A,      0, 0x5D56,
- 0xC630, 0xC631, 0x3B26, 0x334C, 0x5D57, 0xC632, 0xC633, 0x4542,
-};
-static const unsigned short utf8_to_euc_E6AE_x0213[] = {
- 0x5D48, 0xAF7E, 0x7646, 0x5D4A, 0x5D49, 0xC623, 0x4B58,      0,
-      0, 0x3D5E, 0x3C6C, 0x3B44,      0, 0x5D4B,      0,      0,
-      0,      0,      0,      0,      0, 0x5D4D, 0x3F23, 0xC624,
- 0x5D4C,      0,      0, 0xEE21,      0,      0, 0x5D4E, 0xC626,
- 0xC627,      0, 0xC628, 0xC629, 0x5D4F,      0,      0,      0,
- 0xC62A, 0x7647, 0x5D50, 0x5D51, 0xC62C, 0x7648, 0xEE22, 0x5D52,
- 0xC62F, 0x5D54, 0x5D53, 0x5D55, 0x3225, 0x434A,      0, 0x5D56,
- 0xC630, 0xC631, 0x3B26, 0x334C, 0x5D57, 0xEE24, 0xEE25, 0x4542,
-};
-static const unsigned short utf8_to_euc_E6AF[] = {
- 0x544C,      0,      0, 0xC634, 0xC635, 0x3523, 0x5D58,      0,
-      0, 0xC636,      0, 0x5D59, 0xC637, 0x4A6C, 0x4B68,      0,
-      0,      0, 0x4647, 0x5D5A, 0x4866,      0, 0xC638,      0,
- 0x487B,      0, 0xC639, 0x4C53,      0,      0,      0, 0x5D5B,
-      0, 0xC63A,      0, 0xC63B,      0,      0, 0xC63C, 0xC63D,
-      0,      0,      0, 0x5D5D, 0x5D5C,      0, 0xC63E, 0x5D5F,
-      0, 0xC63F,      0, 0x5D5E,      0,      0,      0, 0xC640,
-      0, 0xC641,      0,      0,      0,      0,      0, 0xC642,
-};
-static const unsigned short utf8_to_euc_E6AF_x0213[] = {
- 0x544C,      0,      0, 0xC634, 0xC635, 0x3523, 0x5D58, 0xEE26,
- 0xEE27, 0xEE28,      0, 0x5D59, 0xC637, 0x4A6C, 0x4B68, 0x764A,
-      0,      0, 0x4647, 0x5D5A, 0x4866,      0, 0x764B, 0x764C,
- 0x487B,      0, 0xEE29, 0x4C53,      0,      0,      0, 0x5D5B,
-      0, 0xC63A,      0, 0xC63B,      0,      0, 0xEE2A, 0xEE2B,
-      0,      0,      0, 0x5D5D, 0x5D5C,      0, 0xEE2C, 0x5D5F,
-      0, 0xEE2D,      0, 0x5D5E,      0,      0,      0, 0xC640,
-      0, 0xC641,      0,      0,      0,      0,      0, 0x764D,
-};
-static const unsigned short utf8_to_euc_E6B0[] = {
-      0,      0, 0xC643,      0, 0xC644, 0xC645,      0,      0,
- 0x5D61, 0xC646,      0,      0,      0, 0xC647, 0xC648, 0x3B61,
- 0xC649, 0x4C31, 0xC64A, 0x5D62, 0x5D63,      0,      0, 0x3524,
-      0, 0xC64B,      0, 0x5D64,      0,      0,      0, 0xC64C,
-      0,      0,      0, 0x5D66, 0x5D65,      0, 0xC64D, 0xC64E,
- 0xC64F,      0,      0,      0, 0xC650,      0, 0xC651,      0,
-      0,      0,      0, 0xC652, 0x3F65, 0xC653, 0xC654, 0x4939,
- 0x314A,      0, 0xC655, 0xC656,      0,      0, 0x4845, 0xC657,
-};
-static const unsigned short utf8_to_euc_E6B0_x0213[] = {
-      0,      0, 0xEE2E,      0, 0xC644, 0x764E,      0,      0,
- 0x5D61, 0xC646, 0xEE2F,      0,      0, 0xC647, 0xEE30, 0x3B61,
- 0x764F, 0x4C31, 0xC64A, 0x5D62, 0x5D63,      0,      0, 0x3524,
-      0, 0xC64B,      0, 0x5D64,      0,      0,      0, 0xC64C,
-      0,      0,      0, 0x5D66, 0x5D65,      0, 0xC64D, 0xC64E,
- 0xC64F,      0,      0,      0, 0xC650,      0, 0xC651,      0,
-      0,      0,      0, 0x7650, 0x3F65, 0xEE31, 0xEE32, 0x4939,
- 0x314A,      0, 0xEE33, 0xC656,      0,      0, 0x4845, 0xEE35,
-};
-static const unsigned short utf8_to_euc_E6B1[] = {
- 0x4475, 0x3D41, 0x3561,      0,      0,      0,      0,      0,
-      0,      0, 0xC658, 0xC659,      0, 0xC65A, 0x4846, 0xC65B,
- 0x3C2E,      0, 0xC65C,      0, 0xC65D, 0x5D68,      0, 0x3440,
-      0, 0xC65E, 0x3178, 0xC65F, 0xC660, 0x4672, 0x5D67, 0x393E,
- 0x4353,      0, 0x5D69,      0,      0,      0,      0, 0xC736,
- 0x5D71,      0, 0x5D6A, 0xC661,      0, 0xC662,      0, 0xC663,
- 0x4241,      0, 0x3562, 0x5D72, 0xC664,      0, 0xC665,      0,
- 0xC666, 0xC667, 0x3768, 0xC668,      0, 0x3525, 0x5D70,      0,
-};
-static const unsigned short utf8_to_euc_E6B1_x0213[] = {
- 0x4475, 0x3D41, 0x3561,      0,      0,      0,      0,      0,
-      0,      0, 0xC658, 0xC659,      0, 0xEE36, 0x4846, 0xC65B,
- 0x3C2E,      0, 0xC65C,      0, 0xC65D, 0x5D68,      0, 0x3440,
-      0, 0x7651, 0x3178, 0xEE37, 0x7652, 0x4672, 0x5D67, 0x393E,
- 0x4353,      0, 0x5D69,      0,      0,      0,      0, 0xEE4F,
- 0x5D71,      0, 0x5D6A, 0xC661,      0, 0xEE38,      0,      0,
- 0x4241,      0, 0x3562, 0x5D72, 0x7654,      0, 0x7655,      0,
- 0xC666, 0xC667, 0x3768, 0xC668,      0, 0x3525, 0x5D70,      0,
-};
-static const unsigned short utf8_to_euc_E6B2[] = {
-      0, 0x5D6E, 0x5D6B, 0x4D60,      0, 0xC669, 0xC66A, 0xC66B,
- 0x4440, 0xC66C,      0,      0, 0x4659, 0x5D6C,      0,      0,
- 0x5D74,      0, 0x5D73, 0x3723, 0xC66D, 0xC66E, 0x322D, 0xC66F,
- 0xC670, 0x3A3B, 0x5D6D, 0x5D6F, 0xC671,      0,      0, 0xC672,
-      0, 0x4B57, 0x4274,      0,      0,      0,      0,      0,
-      0,      0,      0, 0x4B77,      0,      0, 0x5D7C,      0,
- 0xC673, 0x5D7D, 0xC674, 0x324F, 0xC675,      0,      0,      0,
- 0x4A28, 0x4C7D, 0x5E21, 0x3C23, 0x3E42, 0x5D78, 0x5D7E, 0x3168,
-};
-static const unsigned short utf8_to_euc_E6B2_x0213[] = {
-      0, 0x5D6E, 0x5D6B, 0x4D60, 0xEE39, 0x7656, 0x7657, 0xC66B,
- 0x4440, 0xEE3A,      0,      0, 0x4659, 0x5D6C,      0,      0,
- 0x5D74,      0, 0x5D73, 0x3723, 0xEE3C, 0xEE3D, 0x322D, 0xEE3E,
- 0x7658, 0x3A3B, 0x5D6D, 0x5D6F, 0x7659,      0,      0, 0xC672,
-      0, 0x4B57, 0x4274,      0,      0,      0,      0,      0,
-      0,      0, 0x7653, 0x4B77,      0, 0xEE3F, 0x5D7C,      0,
- 0xC673, 0x5D7D, 0xC674, 0x324F, 0xC675,      0,      0,      0,
- 0x4A28, 0x4C7D, 0x5E21, 0x3C23, 0x3E42, 0x5D78, 0x5D7E, 0x3168,
-};
-static const unsigned short utf8_to_euc_E6B3[] = {
-      0, 0x3637, 0xC676,      0, 0x5D75, 0x5D7A, 0xC677,      0,
-      0, 0x4074, 0x4771,      0, 0x4867, 0xC678,      0, 0xC679,
- 0xC67A, 0xC67B, 0xC67C, 0x5D77, 0xC67D, 0x4B21, 0xC67E, 0x5D79,
-      0, 0x5E24, 0xC721, 0x5E22, 0xC722, 0x5D7B,      0,      0,
- 0xC723, 0x4B22, 0x4748, 0x3563,      0, 0x4525,      0, 0xC724,
- 0x436D, 0xC725, 0x5E25, 0xC726, 0xC727,      0, 0xC728, 0x5E23,
- 0x4259, 0x5D76, 0xC729, 0x314B, 0xC72A,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-};
-static const unsigned short utf8_to_euc_E6B3_x0213[] = {
-      0, 0x3637, 0xEE40,      0, 0x5D75, 0x5D7A, 0x765B,      0,
-      0, 0x4074, 0x4771,      0, 0x4867, 0xC678,      0, 0xC679,
- 0xEE41, 0xC67B, 0xC67C, 0x5D77, 0x765C, 0x4B21, 0xEE43, 0x5D79,
-      0, 0x5E24, 0xEE44, 0x5E22, 0xEE45, 0x5D7B,      0,      0,
- 0x765D, 0x4B22, 0x4748, 0x3563,      0, 0x4525,      0, 0xC724,
- 0x436D, 0xEE46, 0x5E25, 0x765E, 0xEE47, 0xEE48, 0x765F, 0x5E23,
- 0x4259, 0x5D76, 0xC729, 0x314B, 0xC72A,      0,      0,      0,
-      0,      0,      0, 0x765A,      0,      0,      0,      0,
-};
-static const unsigned short utf8_to_euc_E6B4[] = {
-      0,      0,      0,      0, 0xC72B,      0,      0, 0xC72C,
-      0,      0, 0xC72D, 0x4D4E, 0x5E30,      0, 0xC72E, 0xC72F,
-      0, 0xC730, 0x5E2F, 0xC731,      0,      0,      0, 0x4076,
-      0, 0x5E2C, 0xC732, 0x4D6C,      0,      0, 0x4636, 0x5E26,
-      0,      0,      0,      0,      0, 0x4445, 0xC733, 0xC734,
- 0xC735, 0x314C, 0x393F, 0x5E29,      0,      0, 0xC737, 0xC738,
-      0, 0xC739, 0x3D27, 0x5E2E,      0, 0x5E2D, 0x5E28,      0,
- 0x5E2B, 0xC73A,      0, 0x3368, 0xC73B, 0x5E2A, 0x4749, 0xC73C,
-};
-static const unsigned short utf8_to_euc_E6B4_x0213[] = {
- 0xEE4A,      0,      0,      0, 0x7661,      0,      0, 0xC72C,
-      0,      0, 0xEE4B, 0x4D4E, 0x5E30,      0, 0x7662, 0xC72F,
-      0, 0xC730, 0x5E2F, 0xC731,      0,      0,      0, 0x4076,
-      0, 0x5E2C, 0xC732, 0x4D6C,      0,      0, 0x4636, 0x5E26,
-      0,      0,      0,      0, 0xEE4C, 0x4445, 0xEE4D, 0xEE4E,
- 0xC735, 0x314C, 0x393F, 0x5E29,      0,      0, 0x7663, 0xEE50,
-      0, 0x7664, 0x3D27, 0x5E2E, 0xEE65, 0x5E2D, 0x5E28,      0,
- 0x5E2B, 0x7665,      0, 0x3368, 0xEE51, 0x5E2A, 0x4749, 0x7666,
-};
-static const unsigned short utf8_to_euc_E6B5[] = {
-      0, 0x4E2E,      0,      0, 0x3E74, 0x4075,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0, 0xC73D,
-      0, 0x5E36, 0x5E34,      0, 0x494D,      0, 0xC73E, 0xC73F,
-      0, 0xC740,      0, 0x5E31, 0x5E33, 0xC741, 0x313A, 0xC742,
-      0, 0x3940, 0x4F32,      0, 0x333D,      0, 0x4962, 0xC743,
- 0xC744,      0,      0,      0, 0x4D61,      0,      0, 0x3324,
- 0x3F3B, 0x5E35,      0,      0, 0xC745,      0,      0,      0,
-};
-static const unsigned short utf8_to_euc_E6B5_x0213[] = {
-      0, 0x4E2E,      0,      0, 0x3E74, 0x4075,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0, 0xC73D,
- 0x7667, 0x5E36, 0x5E34, 0xEE52, 0x494D,      0, 0xEE53, 0xC73F,
- 0xEE54, 0xC740,      0, 0x5E31, 0x5E33, 0x7668, 0x313A, 0xC742,
-      0, 0x3940, 0x4F32,      0, 0x333D,      0, 0x4962,      0,
- 0xEE55,      0,      0,      0, 0x4D61,      0,      0, 0x3324,
- 0x3F3B, 0x5E35,      0,      0, 0xC745,      0,      0,      0,
-};
-static const unsigned short utf8_to_euc_E6B6[] = {
-      0,      0, 0xC746,      0,      0, 0x5E3A,      0, 0xC747,
- 0x3E43,      0,      0,      0, 0x4D30,      0, 0x5E37,      0,
-      0, 0xC748, 0xC749, 0x5E32, 0xC74A, 0x5E38, 0xC74B, 0xC74C,
- 0xC74D, 0x4E5E,      0, 0x4573, 0x4642,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0, 0xC74E,      0, 0xC74F,      0,      0, 0x3336,
-      0,      0, 0x3155,      0, 0xC750, 0x5E3E,      0, 0xC751,
- 0x5E41, 0xC752,      0,      0, 0x4E43, 0xC753,      0, 0xC754,
-};
-static const unsigned short utf8_to_euc_E6B6_x0213[] = {
- 0xEE56, 0xEE57, 0x766A,      0,      0, 0x5E3A,      0, 0x766B,
- 0x3E43, 0x766C, 0xEE58,      0, 0x4D30, 0xEE59, 0x5E37,      0,
-      0, 0xEE5A, 0xC749, 0x5E32, 0x766D, 0x5E38,      0, 0xC74C,
- 0xEE5B, 0x4E5E,      0, 0x4573, 0x4642,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0, 0x766E, 0xEE61, 0x766F,      0, 0xEE62, 0x3336,
-      0,      0, 0x3155,      0, 0xEE63, 0x5E3E,      0, 0xC751,
- 0x5E41, 0xC752,      0,      0, 0x4E43, 0xC753,      0, 0x7670,
-};
-static const unsigned short utf8_to_euc_E6B7[] = {
- 0x4D64,      0,      0,      0, 0xC755, 0x5E48, 0x5E42, 0x5E3F,
- 0xC756,      0, 0xC757, 0x4E54, 0x5E45,      0, 0xC758, 0xC759,
-      0, 0x3D4A, 0x5E47,      0,      0, 0x5E4C, 0xC75A,      0,
- 0x4571, 0x5E4A,      0, 0xC75B,      0, 0xC75C, 0x5E44, 0xC75D,
- 0xC75E, 0x4338, 0xC75F,      0, 0x5E4B, 0xC760, 0x5E40,      0,
- 0x5E46, 0xC761, 0x5E4D, 0x307C, 0x5E43,      0, 0x5E4E, 0xC762,
- 0xC763, 0x3F3C, 0xF44C, 0x3D5F, 0xC764, 0x4A25, 0xC765, 0x3A2E,
- 0xF44B, 0x5E3B, 0x5E49, 0x453A, 0xC766,      0,      0,      0,
-};
-static const unsigned short utf8_to_euc_E6B7_x0213[] = {
- 0x4D64,      0, 0xEE64,      0, 0x7671, 0x5E48, 0x5E42, 0x5E3F,
- 0xEE66,      0, 0xC757, 0x4E54, 0x5E45,      0, 0xEE67, 0xEE68,
- 0xEE69, 0x3D4A, 0x5E47,      0,      0, 0x5E4C, 0x7672,      0,
- 0x4571, 0x5E4A, 0x7673, 0x7674,      0, 0x7675, 0x5E44, 0xEE6A,
- 0xC75E, 0x4338, 0xC75F,      0, 0x5E4B, 0xC760, 0x5E40,      0,
- 0x5E46, 0xEE6B, 0x5E4D, 0x307C, 0x5E43,      0, 0x5E4E, 0xC762,
- 0xC763, 0x3F3C,      0, 0x3D5F, 0xC764, 0x4A25, 0xEE6C, 0x3A2E,
-      0, 0x5E3B, 0x5E49, 0x453A, 0x7676,      0,      0,      0,
-};
-static const unsigned short utf8_to_euc_E6B8[] = {
- 0xC767,      0,      0,      0, 0xC768, 0x4036,      0, 0x3369,
- 0x3A51, 0x3E44, 0x5E3D, 0x3D42,      0,      0,      0,      0,
-      0,      0,      0, 0x374C,      0, 0x5E3C,      0,      0,
-      0, 0x5E52, 0x3D6D, 0x383A,      0, 0x5E61, 0xC769, 0x5E5B,
- 0x3574, 0x454F, 0xC76A, 0x5E56, 0x5E5F, 0x302F, 0x3132, 0xC76B,
-      0, 0x3239,      0, 0x5E58, 0x422C, 0x5E4F, 0x5E51, 0x3941,
-      0,      0, 0xC76C,      0,      0,      0, 0xC76D,      0,
- 0x5E62, 0xC76E, 0x5E5D, 0xC76F, 0xC770,      0, 0x5E55,      0,
-};
-static const unsigned short utf8_to_euc_E6B8_x0213[] = {
- 0xC767,      0,      0,      0, 0xC768, 0x4036,      0, 0x3369,
- 0x3A51, 0x3E44, 0x5E3D, 0x3D42,      0,      0,      0,      0,
-      0,      0,      0, 0x374C,      0, 0x5E3C,      0, 0xEE5D,
-      0, 0x5E52, 0x3D6D, 0x383A,      0, 0x5E61, 0xEE6E, 0x5E5B,
- 0x3574, 0x454F, 0xEE6F, 0x5E56, 0x5E5F, 0x302F, 0x3132, 0xEE70,
-      0, 0x3239,      0, 0x5E58, 0x422C, 0x5E4F, 0x5E51, 0x3941,
-      0,      0, 0xEE72,      0, 0x7678,      0, 0xEE6D,      0,
- 0x5E62,      0, 0x5E5D, 0xC76F, 0xEE73,      0, 0x5E55,      0,
-};
-static const unsigned short utf8_to_euc_E6B9[] = {
-      0,      0,      0, 0x5E5C, 0xC771, 0xC772,      0,      0,
- 0xC773, 0xC774, 0x4C2B, 0xC775,      0, 0x5E5A, 0x5E5E, 0xC776,
-      0, 0xC777, 0xC778, 0xC779, 0xC77A,      0, 0x3850, 0xC77B,
- 0x3E45,      0,      0, 0x4339, 0xC77C, 0xC77D, 0xC77E, 0x5E54,
-      0,      0, 0xC821, 0xC822,      0,      0,      0, 0x4D2F,
- 0xC823,      0,      0, 0x5E57,      0,      0, 0x5E50, 0x4572,
-      0,      0, 0x5E53, 0xC824,      0,      0, 0x5E59,      0,
-      0,      0,      0, 0xC825,      0, 0xC826, 0x4F51, 0x3C3E,
-};
-static const unsigned short utf8_to_euc_E6B9_x0213[] = {
-      0,      0,      0, 0x5E5C, 0x7679, 0xC772,      0,      0,
- 0xEE74, 0xEE75, 0x4C2B, 0xEE76, 0xEE77, 0x5E5A, 0x5E5E, 0xEE78,
-      0, 0xEE79, 0xC778, 0xEE7A, 0xEE7B,      0, 0x3850, 0xEE7C,
- 0x3E45,      0,      0, 0x4339, 0x767A, 0xC77D, 0x767B, 0x5E54,
-      0,      0, 0xC821, 0xEE7D,      0,      0,      0, 0x4D2F,
- 0xC823,      0,      0, 0x5E57,      0,      0, 0x5E50, 0x4572,
-      0,      0, 0x5E53, 0xC824,      0,      0, 0x5E59,      0,
-      0,      0,      0, 0xC825,      0, 0xC826, 0x4F51, 0x3C3E,
-};
-static const unsigned short utf8_to_euc_E6BA[] = {
- 0x4B7E,      0, 0x5E63,      0,      0,      0,      0,      0,
-      0,      0,      0,      0, 0x482E, 0xC827,      0, 0x5E6F,
- 0x383B,      0,      0, 0xC828,      0,      0, 0x3D60,      0,
- 0x5E65, 0xC829,      0,      0, 0x4E2F, 0x3942,      0, 0x5E72,
- 0xC82A,      0, 0x306E,      0,      0, 0x5E70,      0, 0xC82B,
-      0,      0, 0x5E64,      0,      0, 0xC82C, 0xC82D, 0x5E6A,
-      0, 0xC82E, 0x5E6C, 0xC82F,      0,      0, 0x4D4F, 0x5E67,
-      0,      0, 0x452E, 0xC830,      0, 0x5E69,      0, 0xC831,
-};
-static const unsigned short utf8_to_euc_E6BA_x0213[] = {
- 0x4B7E,      0, 0x5E63,      0,      0,      0,      0,      0,
-      0,      0,      0,      0, 0x482E, 0xC827,      0, 0x5E6F,
- 0x383B,      0,      0, 0xEF21,      0,      0, 0x3D60,      0,
- 0x5E65, 0xC829,      0,      0, 0x4E2F, 0x3942,      0, 0x5E72,
- 0xC82A,      0, 0x306E,      0,      0, 0x5E70,      0, 0xEF22,
-      0,      0, 0x5E64, 0x767C,      0, 0xC82C, 0xC82D, 0x5E6A,
-      0, 0x767D, 0x5E6C, 0xC82F, 0xEF23,      0, 0x4D4F, 0x5E67,
-      0,      0, 0x452E, 0xC830,      0, 0x5E69,      0, 0xEF24,
-};
-static const unsigned short utf8_to_euc_E6BB[] = {
- 0xC832, 0xC833, 0x5E71, 0xC834, 0x5E6B, 0x4C47,      0, 0xC835,
- 0xC836, 0x5E66, 0xC837, 0x3C22, 0x5E7E, 0xC838, 0xC839, 0xC83A,
-      0, 0x336A,      0, 0x5E68, 0x5E6D, 0x5E6E,      0,      0,
-      0,      0,      0,      0,      0, 0x426C, 0x425A,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0, 0xC83B, 0x5E76, 0xC83C, 0xC83D, 0x5E7C,
-      0,      0, 0x5E7A,      0, 0x4529,      0,      0, 0x5F23,
- 0x5E77, 0xC83E,      0, 0xC83F,      0, 0xC840, 0x5E78, 0x5E60,
-};
-static const unsigned short utf8_to_euc_E6BB_x0213[] = {
- 0xC832, 0x767E, 0x5E71, 0xEF25, 0x5E6B, 0x4C47,      0, 0x7721,
- 0xC836, 0x5E66, 0xEF26, 0x3C22, 0x5E7E, 0xC838, 0x7722, 0xC83A,
-      0, 0x336A,      0, 0x5E68, 0x5E6D, 0x5E6E,      0,      0,
-      0, 0xEF27,      0,      0,      0, 0x426C, 0x425A,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0, 0xEF29, 0x5E76, 0xC83C, 0xC83D, 0x5E7C,
-      0,      0, 0x5E7A,      0, 0x4529,      0,      0, 0x5F23,
- 0x5E77, 0xEF2A,      0, 0xEF2B,      0, 0xC840, 0x5E78, 0x5E60,
-};
-static const unsigned short utf8_to_euc_E6BC[] = {
-      0, 0x3579, 0x493A,      0, 0xC841,      0, 0x3C3F,      0,
- 0xC842, 0x3977, 0xC843,      0, 0xC844, 0xC845,      0, 0x4F33,
-      0, 0x5E74,      0, 0x5F22, 0x3169, 0x4166, 0xC846,      0,
- 0xC847,      0, 0xC848, 0xC849,      0,      0,      0,      0,
- 0x4779,      0, 0x3441, 0x4E7A,      0,      0, 0xC84A,      0,
-      0, 0xC84B, 0xC84C, 0x4C21, 0x4452, 0xC853,      0, 0xC84D,
- 0xC84E, 0x5E7B, 0x5E7D, 0xC84F,      0,      0, 0xC850,      0,
- 0x4132,      0,      0, 0xC851, 0xC852,      0, 0x5F21, 0x5E79,
-};
-static const unsigned short utf8_to_euc_E6BC_x0213[] = {
-      0, 0x3579, 0x493A,      0, 0xC841,      0, 0x3C3F,      0,
- 0xC842, 0x3977, 0xEF2C,      0, 0xEF2D, 0xC845,      0, 0x4F33,
- 0x7723, 0x5E74,      0, 0x5F22, 0x3169, 0x4166, 0xC846,      0,
- 0xEF2E,      0, 0x7724, 0xC849,      0,      0,      0,      0,
- 0x4779,      0, 0x3441, 0x4E7A,      0, 0xEF2F, 0xC84A,      0,
-      0, 0xC84B, 0x7726, 0x4C21, 0x4452, 0xC853,      0, 0x7727,
- 0xC84E, 0x5E7B, 0x5E7D, 0x7728,      0, 0xEF28, 0xEF30,      0,
- 0x4132,      0,      0, 0xC851, 0xEF31,      0, 0x5F21, 0x5E79,
-};
-static const unsigned short utf8_to_euc_E6BD[] = {
-      0, 0x5E73,      0,      0,      0, 0x3443,      0,      0,
-      0,      0,      0,      0,      0,      0,      0, 0xC854,
-      0, 0xC855, 0xC856, 0xC857, 0x3769,      0,      0, 0xC858,
- 0x5F2F, 0xC859, 0xC85A, 0x5F2A, 0x4078, 0xC85B, 0xC85C, 0x3363,
-      0, 0xC85D, 0xC85E,      0, 0x3D61,      0, 0x5F33,      0,
- 0xC85F,      0,      0,      0, 0xC860, 0x5F2C, 0x442C, 0x5F29,
- 0x4459,      0,      0,      0, 0x5F4C,      0,      0,      0,
- 0x5F26,      0, 0x5F25,      0, 0x5F2E, 0xC861, 0xC862,      0,
-};
-static const unsigned short utf8_to_euc_E6BD_x0213[] = {
-      0, 0x5E73,      0,      0,      0, 0x3443,      0,      0,
-      0,      0,      0,      0,      0,      0,      0, 0xC854,
-      0, 0x7729, 0xEF33, 0xC857, 0x3769,      0,      0, 0xEF34,
- 0x5F2F, 0x772A, 0xEF35, 0x5F2A, 0x4078, 0xC85B, 0x772B, 0x3363,
- 0xEF36, 0x772C, 0x772D,      0, 0x3D61,      0, 0x5F33,      0,
- 0xEF37,      0,      0,      0, 0xC860, 0x5F2C, 0x442C, 0x5F29,
- 0x4459,      0,      0,      0, 0x5F4C,      0,      0,      0,
- 0x5F26,      0, 0x5F25,      0, 0x5F2E, 0xEF39, 0x772E,      0,
-};
-static const unsigned short utf8_to_euc_E6BE[] = {
- 0x5F28, 0x5F27, 0x5F2D, 0xC863, 0x4021,      0, 0x5F24, 0xC864,
- 0xC865,      0,      0, 0xC866, 0xC867, 0xC868, 0x5F30,      0,
- 0xC869, 0x5F31, 0xC86A, 0xC86B, 0xC86C,      0, 0xC86D, 0x3442,
-      0,      0, 0xC86E,      0,      0,      0,      0, 0xC86F,
- 0xC870, 0x5F36,      0, 0x5F35, 0x5F37, 0xC871, 0xC872, 0xC873,
- 0xC874,      0, 0x5F3A,      0,      0,      0, 0xC875, 0xC876,
- 0xC877, 0x4543,      0, 0x5F34,      0, 0xC878, 0xC879,      0,
-      0, 0x5F38,      0,      0, 0xC87A,      0,      0,      0,
-};
-static const unsigned short utf8_to_euc_E6BE_x0213[] = {
- 0x5F28, 0x5F27, 0x5F2D, 0xC863, 0x4021,      0, 0x5F24, 0xC864,
- 0x772F,      0,      0, 0xC866, 0x7730, 0x7731, 0x5F30,      0,
- 0xEF3A, 0x5F31, 0xC86A, 0xC86B, 0x7732,      0, 0xEF3B, 0x3442,
- 0xEF38,      0, 0xC86E,      0,      0,      0,      0, 0xEF3D,
- 0x7733, 0x5F36,      0, 0x5F35, 0x5F37, 0xEF3E, 0xC872, 0x7734,
- 0xC874,      0, 0x5F3A,      0,      0,      0, 0xC875, 0xEF3F,
- 0xC877, 0x4543,      0, 0x5F34,      0, 0xEF41, 0x7735,      0,
-      0, 0x5F38,      0,      0, 0x7736,      0, 0xEF3C,      0,
-};
-static const unsigned short utf8_to_euc_E6BF[] = {
- 0x3763, 0x4279, 0x5F32, 0x473B,      0, 0xC87B, 0x5F39, 0xC87C,
- 0xC87D,      0, 0xC87E,      0,      0,      0,      0,      0,
-      0,      0,      0,      0, 0x5F3E, 0x5F3C,      0,      0,
- 0x5F3F,      0, 0xC921, 0x5F42,      0,      0, 0xC922, 0x5F3B,
- 0x396A, 0x4728,      0,      0, 0x5E39,      0,      0,      0,
- 0xC923, 0xC924,      0, 0x4D74, 0x5F3D,      0, 0x5F41, 0x4275,
- 0xC925, 0x5F40,      0, 0x5F2B,      0, 0xC926, 0x6F69,      0,
-      0, 0xC927, 0x5F45,      0, 0xC928, 0xC929, 0x5F49,      0,
-};
-static const unsigned short utf8_to_euc_E6BF_x0213[] = {
- 0x3763, 0x4279, 0x5F32, 0x473B,      0, 0xC87B, 0x5F39, 0x7737,
- 0xEF42, 0xEF43, 0x7738,      0,      0,      0,      0,      0,
-      0,      0,      0,      0, 0x5F3E, 0x5F3C,      0,      0,
- 0x5F3F,      0, 0xEF44, 0x5F42,      0,      0, 0xEF45, 0x5F3B,
- 0x396A, 0x4728,      0,      0, 0x5E39,      0,      0,      0,
- 0xC923, 0xEF46,      0, 0x4D74, 0x5F3D,      0, 0x5F41, 0x4275,
- 0x773A, 0x5F40,      0, 0x5F2B,      0, 0x773B, 0x6F69,      0,
-      0, 0x7739, 0x5F45,      0, 0xEF48, 0xC929, 0x5F49,      0,
-};
-static const unsigned short utf8_to_euc_E780[] = {
- 0xC92A, 0x5F47,      0,      0,      0, 0xC92B, 0xC92C, 0xC92D,
-      0, 0x5F43,      0, 0x5F44,      0, 0xC92E,      0, 0x5F48,
-      0, 0x5F46,      0,      0,      0, 0x494E,      0, 0xC92F,
- 0x5F4E,      0, 0x5F4B, 0x5F4A,      0, 0x5F4D, 0x4654, 0x5F4F,
- 0xC930,      0,      0, 0xC931,      0,      0, 0x4375, 0x426D,
- 0xF44D,      0,      0,      0, 0x4025,      0,      0, 0xC932,
- 0x5F50,      0, 0x5F52,      0, 0xC933,      0,      0, 0xC934,
-      0, 0xC935,      0,      0, 0xC936,      0, 0x5F51,      0,
-};
-static const unsigned short utf8_to_euc_E780_x0213[] = {
- 0xEF49, 0x5F47,      0,      0,      0, 0x773C, 0x773D, 0xEF4A,
-      0, 0x5F43, 0xEF4B, 0x5F44,      0, 0xC92E,      0, 0x5F48,
-      0, 0x5F46,      0,      0,      0, 0x494E,      0, 0xC92F,
- 0x5F4E,      0, 0x5F4B, 0x5F4A,      0, 0x5F4D, 0x4654, 0x5F4F,
- 0xC930,      0,      0, 0xEF4C,      0,      0, 0x4375, 0x426D,
- 0x773E,      0,      0,      0, 0x4025,      0,      0, 0xC932,
- 0x5F50,      0, 0x5F52,      0, 0xC933,      0,      0, 0xC934,
-      0, 0xEF4E, 0xEF4F,      0, 0xEF50,      0, 0x5F51,      0,
-};
-static const unsigned short utf8_to_euc_E781[] = {
-      0,      0,      0, 0xC937, 0xC938,      0,      0,      0,
- 0xC939, 0xC93A, 0xC93B, 0xC93C, 0x5E75,      0, 0xC941,      0,
-      0, 0x5F53,      0,      0, 0xC93D, 0xC93E,      0,      0,
- 0x4667,      0,      0,      0,      0, 0xC93F, 0xC940,      0,
-      0,      0,      0, 0x5F54, 0xC942, 0xC943,      0,      0,
-      0,      0,      0, 0x3250, 0xC944,      0, 0xC945, 0x4574,
- 0x3325,      0,      0,      0,      0, 0xC946, 0xC947,      0,
- 0x3564,      0,      0,      0, 0x3C5E, 0x3A52, 0xC948,      0,
-};
-static const unsigned short utf8_to_euc_E781_x0213[] = {
-      0,      0,      0, 0xEF51, 0xC938,      0,      0, 0xEF52,
- 0xC939, 0xC93A, 0x773F, 0xEF53, 0x5E75,      0, 0x7742,      0,
-      0, 0x5F53,      0,      0, 0xEF55, 0xC93E,      0,      0,
- 0x4667,      0,      0,      0,      0, 0x7740, 0x7741,      0,
-      0,      0,      0, 0x5F54, 0x7743, 0xEF56,      0,      0,
-      0, 0xEF57,      0, 0x3250, 0xEF58,      0, 0xEF59, 0x4574,
- 0x3325,      0,      0,      0,      0, 0x7744, 0xEF5A,      0,
- 0x3564,      0,      0,      0, 0x3C5E, 0x3A52, 0xEF5B,      0,
-};
-static const unsigned short utf8_to_euc_E782[] = {
-      0, 0xC949,      0,      0,      0, 0xC94A, 0xC94B,      0,
-      0, 0x4F27, 0x3F66,      0,      0,      0, 0x316A,      0,
-      0,      0, 0x5F56,      0, 0xC94C, 0xC94D, 0xC94E, 0xC94F,
- 0xC950, 0x5F55,      0, 0xC951,      0,      0,      0,      0,
-      0,      0,      0,      0, 0xC952,      0,      0,      0,
-      0,      0,      0, 0xC953, 0x5F59, 0x433A, 0x5F5C, 0x5F57,
- 0xC954, 0xC955,      0, 0x5F5B, 0xC956,      0,      0, 0xC957,
- 0x5F5A, 0x4540, 0x3059, 0xF42E,      0,      0,      0,      0,
-};
-static const unsigned short utf8_to_euc_E782_x0213[] = {
-      0, 0xEF5C,      0,      0,      0, 0x7745, 0xEF5D,      0,
-      0, 0x4F27, 0x3F66,      0,      0,      0, 0x316A,      0,
-      0,      0, 0x5F56,      0, 0xC94C, 0xEF5E, 0xC94E, 0xEF5F,
- 0xC950, 0x5F55,      0, 0xC951,      0,      0,      0, 0xEF62,
-      0,      0,      0,      0, 0x7746,      0,      0,      0,
-      0,      0,      0, 0x7747, 0x5F59, 0x433A, 0x5F5C, 0x5F57,
- 0xC954, 0xEF63,      0, 0x5F5B, 0xC956,      0,      0, 0x7748,
- 0x5F5A, 0x4540, 0x3059, 0xEF60,      0,      0,      0,      0,
-};
-static const unsigned short utf8_to_euc_E783[] = {
-      0,      0,      0,      0,      0,      0,      0,      0,
- 0x4E75,      0, 0xC958, 0x5F5E,      0,      0,      0, 0x3128,
-      0, 0xC959,      0, 0xC95A, 0xC95B, 0xC95C, 0xC95D,      0,
- 0xC95E, 0x5F60,      0,      0, 0xC95F, 0x5F5F,      0, 0x5F5D,
-      0,      0,      0,      0, 0xC960,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0, 0x5F58,      0,      0,      0,      0,      0,      0,
-      0, 0x4B23, 0xC961,      0,      0, 0x5F62,      0,      0,
-};
-static const unsigned short utf8_to_euc_E783_x0213[] = {
-      0,      0,      0,      0,      0,      0,      0,      0,
- 0x4E75,      0, 0xEF66, 0x5F5E,      0,      0,      0, 0x3128,
-      0, 0xEF67,      0, 0xEF68, 0x7749, 0xC95C, 0xC95D,      0,
- 0x774A, 0x5F60,      0,      0, 0xEF69, 0x5F5F,      0, 0x5F5D,
-      0,      0,      0,      0, 0x774B,      0,      0,      0,
-      0,      0,      0,      0, 0xEF65,      0,      0,      0,
-      0, 0x5F58,      0,      0,      0,      0,      0,      0,
-      0, 0x4B23, 0xC961,      0,      0, 0x5F62,      0,      0,
-};
-static const unsigned short utf8_to_euc_E784[] = {
-      0,      0,      0, 0xC962, 0xC963, 0xC964, 0xC965, 0xC966,
-      0, 0x5F61,      0, 0xC967, 0xC968,      0,      0, 0xC969,
-      0,      0,      0,      0, 0x316B,      0,      0,      0,
-      0, 0x5F64, 0x4A32,      0, 0x5F63,      0, 0xC96A,      0,
- 0xC96B, 0x4C35,      0,      0,      0,      0, 0x3E47,      0,
-      0,      0,      0, 0xC96C,      0, 0xC96D,      0, 0xC96E,
- 0xC96F, 0xC970,      0,      0,      0,      0, 0x4133,      0,
- 0xC971,      0,      0,      0, 0x3E46,      0,      0,      0,
-};
-static const unsigned short utf8_to_euc_E784_x0213[] = {
-      0,      0,      0, 0xEF6A, 0xEF6B, 0xC964, 0xEF6C, 0xEF6D,
- 0xEF6E, 0x5F61,      0, 0xC967, 0xEF6F,      0,      0, 0x774C,
-      0,      0,      0,      0, 0x316B,      0,      0,      0,
-      0, 0x5F64, 0x4A32,      0, 0x5F63,      0, 0x774E,      0,
- 0x774F, 0x4C35,      0,      0,      0,      0, 0x3E47,      0,
-      0,      0,      0, 0x774D,      0, 0xC96D, 0x7750, 0xEF71,
- 0x7751, 0xEF72,      0,      0,      0,      0, 0x4133,      0,
- 0xC971,      0,      0,      0, 0x3E46,      0,      0,      0,
-};
-static const unsigned short utf8_to_euc_E785[] = {
-      0, 0xC972,      0,      0,      0, 0xC973, 0xC974, 0xC975,
-      0, 0x4E7B, 0xC976, 0xC977, 0x5F6A,      0, 0x4079,      0,
- 0xC978,      0, 0xC979,      0,      0, 0x5F66, 0x5F6B, 0xC97A,
-      0, 0x316C, 0xC97B,      0, 0xC97C,      0, 0xC97D,      0,
- 0xC97E,      0, 0x5F69,      0, 0x4761, 0x5F65, 0x5F68, 0x3E48,
- 0xCA21, 0x4851,      0,      0, 0x5F6C,      0, 0x3C51,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0, 0xCA22,      0,      0,      0, 0x407A,      0,      0,
-};
-static const unsigned short utf8_to_euc_E785_x0213[] = {
-      0, 0xC972,      0,      0,      0, 0xC973, 0x7752, 0x7753,
-      0, 0x4E7B, 0xEF74, 0xC977, 0x5F6A,      0, 0x4079,      0,
- 0xEF73, 0x7754, 0x7756, 0xEF75,      0, 0x5F66, 0x5F6B, 0xC97A,
-      0, 0x316C, 0xC97B,      0, 0x7757,      0, 0xEF76,      0,
- 0x7758,      0, 0x5F69,      0, 0x4761, 0x5F65, 0x5F68, 0x3E48,
- 0x7759, 0x4851,      0,      0, 0x5F6C,      0, 0x3C51,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0, 0xCA22,      0,      0,      0, 0x407A,      0,      0,
-};
-static const unsigned short utf8_to_euc_E786[] = {
- 0xCA23,      0,      0,      0, 0x5F6F, 0xCA24,      0, 0xCA25,
- 0x5F67,      0, 0x3727,      0, 0xCA26,      0,      0, 0x5F6D,
-      0,      0, 0xCA27,      0, 0x4D50, 0x5F70,      0,      0,
-      0, 0x7426, 0xCA28, 0xCA29,      0,      0,      0, 0x3D4F,
- 0xCA2A,      0, 0xCA2B,      0,      0,      0,      0,      0,
- 0x5F71,      0,      0,      0, 0x5F72,      0,      0, 0xCA2C,
- 0xCA2D, 0x472E, 0xCA2E, 0xCA2F,      0,      0,      0,      0,
-      0, 0x5F74, 0xCA30,      0,      0,      0, 0x5F75, 0xCA31,
-};
-static const unsigned short utf8_to_euc_E786_x0213[] = {
- 0xEF79,      0,      0,      0, 0x5F6F, 0x775B,      0, 0x775C,
- 0x5F67,      0, 0x3727,      0, 0xCA26,      0,      0, 0x5F6D,
-      0,      0, 0x775D,      0, 0x4D50, 0x5F70, 0xEF78,      0,
-      0, 0x7426, 0xCA28, 0xEF7A,      0,      0,      0, 0x3D4F,
- 0xEF7B,      0, 0xEF7C,      0,      0,      0,      0,      0,
- 0x5F71,      0,      0,      0, 0x5F72,      0, 0xEF7D, 0xEF7E,
- 0xCA2D, 0x472E, 0xCA2E, 0xF021,      0,      0,      0,      0,
-      0, 0x5F74, 0x775F,      0,      0,      0, 0x5F75, 0xCA31,
-};
-static const unsigned short utf8_to_euc_E787[] = {
- 0xCA32, 0xCA33,      0, 0x4733, 0xCA34,      0,      0,      0,
- 0x4575, 0x5F77,      0, 0xCA35, 0xCA36,      0, 0x5F79,      0,
- 0x4E55,      0, 0x5F76, 0xCA37, 0x5F78, 0x316D, 0xCA38, 0x5F73,
-      0, 0xCA39, 0xCA3A,      0, 0xCA3B,      0,      0, 0x535B,
- 0x5F7A,      0,      0,      0,      0, 0x4167, 0x3B38, 0x5F7C,
-      0,      0,      0,      0, 0x5F7B, 0x3F24, 0x5259,      0,
-      0,      0,      0,      0,      0, 0x5F7D,      0,      0,
- 0xCA3C, 0x6021,      0, 0x5F6E, 0x5F7E,      0, 0xCA3D, 0x6022,
-};
-static const unsigned short utf8_to_euc_E787_x0213[] = {
- 0xCA32, 0x775E,      0, 0x4733, 0x7760,      0,      0,      0,
- 0x4575, 0x5F77,      0, 0xF023, 0xCA36,      0, 0x5F79,      0,
- 0x4E55,      0, 0x5F76, 0xF024, 0x5F78, 0x316D, 0xCA38, 0x5F73,
-      0, 0xF025, 0xCA3A,      0, 0xF026,      0,      0, 0x535B,
- 0x5F7A,      0,      0,      0,      0, 0x4167, 0x3B38, 0x5F7C,
-      0,      0,      0,      0, 0x5F7B, 0x3F24, 0x5259,      0,
-      0,      0,      0,      0,      0, 0x5F7D,      0,      0,
- 0xCA3C, 0x6021,      0, 0x5F6E, 0x5F7E,      0, 0x7761, 0x6022,
-};
-static const unsigned short utf8_to_euc_E788[] = {
- 0xCA3E,      0,      0,      0,      0,      0, 0x477A, 0xCA3F,
- 0xCA40, 0xCA41,      0,      0,      0, 0x6023,      0,      0,
- 0x6024,      0,      0, 0xCA42,      0,      0,      0, 0xCA43,
-      0,      0, 0xCA44, 0x6025,      0, 0xCA45,      0, 0xCA46,
-      0,      0,      0,      0, 0xCA47,      0,      0,      0,
- 0x6026,      0, 0x445E, 0xCA48, 0x6028, 0x6027,      0, 0xCA49,
- 0x6029,      0, 0x602A,      0, 0xCA4A, 0x3C5F, 0x4963,      0,
- 0xCA4B, 0xCA4C, 0x4C6C, 0x602B, 0x602C, 0x4156, 0x3C24, 0x602D,
-};
-static const unsigned short utf8_to_euc_E788_x0213[] = {
- 0x7762,      0,      0,      0,      0,      0, 0x477A, 0xF027,
- 0xCA40, 0xCA41,      0,      0,      0, 0x6023,      0,      0,
- 0x6024,      0,      0, 0xCA42,      0, 0x7763,      0, 0xCA43,
-      0,      0, 0xCA44, 0x6025,      0, 0xCA45,      0, 0xCA46,
-      0,      0,      0,      0, 0xCA47,      0,      0,      0,
- 0x6026,      0, 0x445E, 0xF02A, 0x6028, 0x6027,      0, 0xCA49,
- 0x6029,      0, 0x602A,      0, 0xF02B, 0x3C5F, 0x4963,      0,
- 0xF02C, 0xF02D, 0x4C6C, 0x602B, 0x602C, 0x4156, 0x3C24, 0x602D,
-};
-static const unsigned short utf8_to_euc_E789[] = {
- 0x602E, 0xCA4D, 0xCA4E, 0xCA4F,      0, 0xCA50, 0x602F, 0x4A52,
- 0x4847,      0,      0, 0x6030, 0x4757,      0, 0xCA51, 0xCA52,
- 0xCA53,      0, 0x442D, 0xCA54,      0, 0xCA55, 0xCA56,      0,
- 0x6031, 0x3267, 0xCA57, 0x356D, 0xCA58, 0x4C46, 0xCA59, 0x4C36,
- 0xCA5A, 0x3234, 0x4F34, 0xCA5B,      0,      0,      0, 0x4B52,
- 0xCA5C, 0x4A2A,      0, 0xCA5D,      0,      0, 0xCA5E, 0xCA5F,
-      0, 0xCA60, 0x4037,      0, 0x6032,      0,      0, 0xCA61,
- 0xCA62, 0x4643,      0, 0xCA63, 0xCA64, 0x3823, 0x6033, 0xCA65,
-};
-static const unsigned short utf8_to_euc_E789_x0213[] = {
- 0x602E, 0xCA4D, 0xF02F, 0xCA4F,      0, 0xCA50, 0x602F, 0x4A52,
- 0x4847,      0,      0, 0x6030, 0x4757,      0, 0xCA51, 0xCA52,
- 0xCA53,      0, 0x442D, 0xF030,      0, 0x7764, 0x7765, 0xF031,
- 0x6031, 0x3267, 0xCA57, 0x356D, 0xCA58, 0x4C46, 0xCA59, 0x4C36,
- 0xCA5A, 0x3234, 0x4F34, 0xF032,      0,      0,      0, 0x4B52,
- 0xCA5C, 0x4A2A,      0, 0xCA5D,      0,      0, 0xF034, 0xF035,
-      0, 0xCA60, 0x4037,      0, 0x6032,      0,      0, 0xCA61,
- 0xF036, 0x4643,      0, 0xCA63, 0xCA64, 0x3823, 0x6033, 0xF037,
-};
-static const unsigned short utf8_to_euc_E78A[] = {
- 0x3A54, 0x6035, 0x6034,      0, 0xCA66,      0,      0, 0x6036,
-      0, 0xCA67,      0,      0,      0, 0xCA68, 0xCA69,      0,
-      0,      0, 0x6037, 0xCA6A,      0,      0, 0x6038,      0,
-      0,      0,      0, 0xCA6B,      0,      0,      0,      0,
- 0x353E,      0, 0x6039,      0,      0,      0,      0, 0x603A,
- 0xCA6C,      0,      0,      0, 0x3824, 0xCA6D, 0xCA6E, 0x4848,
-      0, 0xCA6F, 0x603C,      0, 0xCA70,      0, 0x3E75,      0,
-      0, 0x603B,      0,      0,      0,      0, 0xCA71,      0,
-};
-static const unsigned short utf8_to_euc_E78A_x0213[] = {
- 0x3A54, 0x6035, 0x6034,      0, 0xCA66,      0,      0, 0x6036,
-      0, 0xCA67,      0,      0,      0, 0x7767, 0xF038,      0,
-      0,      0, 0x6037, 0xCA6A,      0,      0, 0x6038,      0,
-      0,      0,      0, 0x7768,      0,      0,      0,      0,
- 0x353E,      0, 0x6039,      0,      0,      0,      0, 0x603A,
- 0xCA6C,      0,      0,      0, 0x3824, 0xF03A, 0xF03B, 0x4848,
- 0xF03C, 0xF03D, 0x603C,      0, 0xCA70,      0, 0x3E75,      0,
-      0, 0x603B,      0,      0,      0,      0, 0x7769,      0,
-};
-static const unsigned short utf8_to_euc_E78B[] = {
-      0, 0xCA72, 0x3638, 0x603D, 0x603F,      0, 0x603E, 0xCA73,
-      0, 0xCA74,      0,      0, 0xCA75,      0, 0x6040,      0,
- 0x3851,      0, 0x6041,      0,      0, 0xCA76, 0xCA77, 0x3669,
- 0xCA78, 0x4140,      0, 0x397D,      0,      0,      0, 0xCA79,
- 0x6043, 0x6044, 0x6042,      0,      0, 0xCA7A,      0,      0,
-      0, 0x3C6D,      0,      0, 0x4648, 0x3639,      0,      0,
-      0,      0,      0, 0xCA7B, 0xCA7C,      0,      0, 0x6046,
- 0x432C, 0x6045, 0xCA7D, 0xCA7E, 0x4F35, 0x4762, 0xCB21,      0,
-};
-static const unsigned short utf8_to_euc_E78B_x0213[] = {
- 0x776A, 0xF03E, 0x3638, 0x603D, 0x603F,      0, 0x603E, 0xCA73,
-      0, 0xCA74,      0,      0, 0xF040,      0, 0x6040,      0,
- 0x3851,      0, 0x6041,      0,      0, 0xCA76, 0xCA77, 0x3669,
- 0xCA78, 0x4140,      0, 0x397D,      0,      0,      0, 0xCA79,
- 0x6043, 0x6044, 0x6042,      0,      0, 0xCA7A,      0,      0,
-      0, 0x3C6D,      0,      0, 0x4648, 0x3639,      0,      0,
-      0,      0,      0, 0xF043, 0xCA7C,      0,      0, 0x6046,
- 0x432C, 0x6045, 0xF044, 0x776B, 0x4F35, 0x4762, 0xCB21,      0,
-};
-static const unsigned short utf8_to_euc_E78C[] = {
-      0,      0, 0xCB22,      0, 0xCB23, 0xCB24,      0, 0xCB25,
-      0,      0, 0x6049, 0xCB26,      0, 0xCB27,      0,      0,
-      0,      0, 0xCB28, 0xCB29,      0,      0, 0x604B, 0x6048,
- 0xCB2A, 0xCB2B,      0, 0x4C54, 0x604A, 0x604C, 0xCB2C, 0x4E44,
-      0,      0, 0xCB2D,      0, 0xCB2E, 0x6050,      0, 0xCB2F,
- 0xCB30, 0x604F, 0x4376, 0x472D, 0xCB31,      0, 0x3825, 0x604E,
-      0, 0xCB32, 0xCB33,      0, 0x604D, 0xCB34, 0x4D31, 0x4D32,
-      0,      0, 0xCB35, 0xCB36,      0, 0xCB37, 0x6051, 0x316E,
-};
-static const unsigned short utf8_to_euc_E78C_x0213[] = {
-      0,      0, 0xCB22,      0, 0xCB23, 0xCB24,      0, 0xF045,
-      0,      0, 0x6049, 0xCB26,      0, 0xCB27,      0,      0,
-      0,      0, 0xF046, 0xCB29,      0,      0, 0x604B, 0x6048,
- 0xF047, 0xF048,      0, 0x4C54, 0x604A, 0x604C, 0xCB2C, 0x4E44,
-      0,      0, 0xCB2D,      0,      0, 0x6050,      0, 0x776D,
- 0x776E, 0x604F, 0x4376, 0x472D, 0xF04B,      0, 0x3825, 0x604E,
-      0, 0xF04C, 0xCB33, 0xF04D, 0x604D, 0xCB34, 0x4D31, 0x4D32,
-      0, 0xF04A, 0xCB35, 0xCB36,      0, 0xF04E, 0x6051, 0x316E,
-};
-static const unsigned short utf8_to_euc_E78D[] = {
-      0,      0,      0, 0xCB38, 0x3976, 0x3B62,      0,      0,
-      0,      0,      0,      0,      0, 0xCB39, 0x6052, 0x6053,
- 0xCB3A,      0, 0xCB3B,      0,      0,      0, 0xCB3C, 0x6055,
- 0xCB3D,      0,      0,      0,      0, 0xCB3E, 0xCB3F, 0xCB40,
- 0xCB41,      0,      0, 0x3D43,      0,      0, 0xCB42, 0xCB43,
- 0x6057, 0xCB44, 0x6056, 0xCB45, 0xCB46,      0, 0xCB47, 0xCB48,
- 0x6058, 0xCB49, 0x334D,      0,      0, 0x605A,      0, 0xCB4A,
- 0x6059, 0xCB4B, 0x605C, 0x605B, 0xCB4C,      0,      0,      0,
-};
-static const unsigned short utf8_to_euc_E78D_x0213[] = {
-      0,      0,      0, 0xCB38, 0x3976, 0x3B62,      0,      0,
-      0,      0,      0,      0,      0, 0xCB39, 0x6052, 0x6053,
- 0x7770,      0, 0xF04F,      0,      0,      0, 0xCB3C, 0x6055,
- 0xCB3D,      0,      0,      0,      0, 0xCB3E, 0xCB3F, 0xCB40,
- 0xCB41,      0,      0, 0x3D43,      0,      0, 0x7771, 0xCB43,
- 0x6057, 0xCB44, 0x6056, 0xF051, 0xF052,      0, 0xF054, 0xF055,
- 0x6058, 0xF056, 0x334D,      0,      0, 0x605A,      0, 0xF057,
- 0x6059, 0xCB4B, 0x605C, 0x605B, 0x7772,      0,      0,      0,
-};
-static const unsigned short utf8_to_euc_E78E[] = {
- 0xCB4D, 0xCB4E,      0, 0xCB4F, 0x383C, 0xCB50, 0xCB51, 0x4E28,
-      0, 0x364C,      0, 0x3226,      0,      0, 0xCB52,      0,
- 0xCB53,      0,      0, 0xCB54,      0, 0xCB55, 0x366A, 0xCB56,
- 0xCB57,      0,      0,      0, 0xCB58,      0, 0xCB59, 0xCB5A,
- 0xCB5B,      0, 0xCB5C,      0,      0, 0xCB5D, 0xCB5E,      0,
-      0, 0x3461, 0xCB5F, 0xCB60,      0, 0xCB61,      0,      0,
-      0,      0, 0x4E68, 0x605E,      0, 0xCB62,      0, 0xCB63,
-      0, 0xCB64,      0, 0x6060, 0xCB65, 0xCB66,      0, 0xCB67,
-};
-static const unsigned short utf8_to_euc_E78E_x0213[] = {
- 0xCB4D, 0xF058,      0, 0xCB4F, 0x383C, 0xF059, 0xCB51, 0x4E28,
-      0, 0x364C, 0xF05A, 0x3226,      0,      0, 0xCB52,      0,
- 0xCB53,      0,      0, 0xCB54, 0xF05B, 0x7773, 0x366A, 0xCB56,
- 0xF05C,      0,      0,      0, 0xF05D,      0, 0xF05E, 0x7774,
- 0x7775,      0, 0x7776,      0,      0, 0xF05F, 0x7777,      0,
- 0xF060, 0x3461, 0xCB5F, 0x7778,      0, 0xCB61,      0,      0,
-      0,      0, 0x4E68, 0x605E,      0, 0xF061,      0, 0xF062,
-      0, 0xF063,      0, 0x6060, 0xF064,      0,      0, 0xF065,
-};
-static const unsigned short utf8_to_euc_E78F[] = {
- 0x6061,      0, 0x3251,      0,      0, 0xCB68, 0xCB69,      0,
- 0x605D, 0xCB6A, 0x3B39, 0xCB6B, 0xCB6C, 0x4441, 0x605F, 0xCB6D,
-      0,      0, 0xCB6E, 0xCB6F,      0,      0, 0xCB70,      0,
-      0, 0xCB71,      0,      0,      0, 0xCB72, 0x6064,      0,
- 0x3C6E, 0xCB73,      0, 0xCB74,      0, 0x6062, 0xCB75, 0xCB76,
-      0, 0xCB77, 0x373E,      0,      0, 0x4849, 0x6063,      0,
-      0, 0x607E,      0,      0, 0xCB78, 0xCB79,      0, 0xCB7A,
- 0x6069, 0xCB7B, 0xCB7C, 0xCB7D,      0, 0xCB7E, 0x383D, 0xCC21,
-};
-static const unsigned short utf8_to_euc_E78F_x0213[] = {
- 0x6061,      0, 0x3251,      0,      0, 0xF066, 0xCB69,      0,
- 0x605D, 0x7779, 0x3B39, 0xF067, 0xCB6C, 0x4441, 0x605F, 0x777A,
-      0,      0,      0, 0xCB6F,      0,      0, 0x777B,      0,
-      0, 0x777C,      0,      0,      0, 0xCB72, 0x6064,      0,
- 0x3C6E, 0xF068,      0, 0x777D,      0, 0x6062, 0xCB75, 0xF069,
-      0, 0x777E, 0x373E,      0,      0, 0x4849, 0x6063,      0,
-      0, 0x607E,      0,      0, 0xCB78,      0,      0, 0xCB7A,
- 0x6069, 0xF06A, 0xF06C, 0xCB7D,      0, 0xCB7E, 0x383D, 0xCC21,
-};
-static const unsigned short utf8_to_euc_E790[] = {
- 0xCC22, 0xCC23,      0, 0x3565, 0xCC24, 0x6066, 0x4D7D, 0xCC25,
-      0, 0x4E30, 0xCC26,      0,      0,      0,      0,      0,
-      0, 0xCC27,      0,      0,      0,      0,      0,      0,
-      0,      0, 0xCC28, 0xCC29,      0,      0,      0,      0,
-      0,      0, 0x4276,      0, 0xCC2A, 0x6068, 0xCC2B,      0,
- 0xCC2C, 0xCC2D, 0xCC2E, 0xCC2F, 0xCC30, 0xCC31, 0xCC32, 0xCC33,
- 0xCC34, 0xCC35, 0x606A, 0x4E56, 0x3657, 0x487C, 0x474A,      0,
-      0, 0xCC36, 0x606B,      0,      0,      0,      0, 0x606D,
-};
-static const unsigned short utf8_to_euc_E790_x0213[] = {
- 0xCC22, 0xF06D,      0, 0x3565, 0xCC24, 0x6066, 0x4D7D, 0x7821,
-      0, 0x4E30, 0x7822,      0,      0,      0,      0,      0,
-      0, 0xCC27,      0, 0xF06B,      0,      0,      0,      0,
-      0,      0, 0x7823, 0x7824,      0,      0,      0,      0,
-      0,      0, 0x4276,      0, 0xF06E, 0x6068, 0x7826,      0,
- 0x7827,      0, 0x7828, 0x7829, 0x782A, 0xCC31, 0x782B, 0x782C,
- 0x782D, 0xF06F, 0x606A, 0x4E56, 0x3657, 0x487C, 0x474A,      0,
-      0, 0xF070, 0x606B,      0,      0,      0,      0, 0x606D,
-};
-static const unsigned short utf8_to_euc_E791[] = {
- 0xCC37, 0x6070,      0, 0xCC38, 0xCC39,      0, 0xCC3A, 0xCC3B,
-      0,      0,      0, 0xCC3C,      0, 0xCC3D,      0,      0,
-      0, 0xCC3E, 0xCC3F,      0,      0, 0x606C,      0, 0xCC40,
-      0, 0x606F, 0x386A, 0x314D, 0x6071, 0xCC41, 0x3F70, 0x606E,
- 0x4E5C,      0, 0xCC42, 0x6074, 0x7424,      0, 0xCC43, 0xCC44,
- 0xCC45, 0x6072, 0x6075, 0xCC46,      0, 0xCC47, 0xCC48, 0x6067,
- 0x6073, 0xCC49, 0xCC4A, 0x3A3C,      0,      0, 0x6076,      0,
-      0,      0,      0,      0,      0,      0, 0x6077,      0,
-};
-static const unsigned short utf8_to_euc_E791_x0213[] = {
- 0xF072, 0x6070,      0, 0xF073, 0x782E,      0, 0x782F, 0x7830,
-      0,      0,      0, 0x7831,      0, 0xF074,      0,      0,
-      0, 0xCC3E, 0xF075, 0xF071,      0, 0x606C,      0, 0x7832,
-      0, 0x606F, 0x386A, 0x314D, 0x6071, 0xF076, 0x3F70, 0x606E,
- 0x4E5C,      0, 0x7833, 0x6074, 0x7424,      0, 0xCC43, 0xCC44,
- 0xCC45, 0x6072, 0x6075, 0x7834,      0, 0x7835, 0xCC48, 0x6067,
- 0x6073, 0xF077, 0xCC4A, 0x3A3C,      0,      0, 0x6076,      0,
-      0,      0,      0,      0,      0,      0, 0x6077,      0,
-};
-static const unsigned short utf8_to_euc_E792[] = {
- 0xCC4B, 0xCC4C,      0, 0x4D7E,      0, 0xCC4D, 0xCC4E, 0xCC4F,
-      0, 0xCC50,      0, 0x6078,      0,      0,      0, 0xCC51,
- 0xCC52, 0xCC53, 0xCC54,      0,      0,      0,      0,      0,
- 0xCC55, 0xCC56, 0xCC57,      0, 0xCC58,      0, 0x6079, 0xCC59,
- 0xCC5A, 0xCC5B, 0x6065, 0xCC5C,      0,      0, 0xCC5D, 0x607A,
- 0xCC5E, 0xCC5F, 0xCC60, 0xCC61,      0,      0, 0xCC62, 0xCC63,
- 0x3444, 0xCC64, 0xCC65,      0,      0, 0xCC66,      0,      0,
-      0, 0xCC67,      0, 0xCC68,      0, 0x3C25,      0, 0xCC69,
-};
-static const unsigned short utf8_to_euc_E792_x0213[] = {
- 0xCC4B, 0xF078,      0, 0x4D7E,      0, 0xF079, 0x7836, 0x7837,
- 0xF07A, 0x7838,      0, 0x6078,      0,      0,      0, 0xCC51,
- 0x783D, 0xCC53, 0xF07C,      0,      0,      0,      0, 0xF07D,
- 0x7839, 0xF07E, 0xCC57,      0, 0x783A,      0, 0x6079, 0x783B,
- 0xF121, 0xF122, 0x6065, 0x783C,      0, 0xF123, 0x783E, 0x607A,
- 0x783F, 0x7840, 0xF124, 0xF125,      0,      0, 0xCC62, 0xCC63,
- 0x3444, 0xCC64, 0xCC65,      0,      0, 0x7841,      0,      0,
-      0, 0xF126, 0xF128, 0xF127,      0, 0x3C25,      0, 0x7842,
-};
-static const unsigned short utf8_to_euc_E793[] = {
-      0,      0,      0,      0,      0,      0,      0,      0,
- 0xCC6A, 0xCC6B, 0x607B,      0, 0xCC6C,      0,      0, 0x607C,
- 0xCC6D,      0,      0, 0xCC6E, 0x607D,      0,      0,      0,
- 0xCC6F,      0, 0xCC70, 0xCC71, 0x313B,      0, 0xCC72, 0xCC73,
- 0x6121,      0, 0x493B, 0x6122, 0xCC74,      0, 0x3424, 0x6123,
- 0xCC75, 0x6124, 0xCC76, 0xCC77,      0,      0, 0x6125, 0xCC78,
- 0x6127, 0x6128, 0x6126,      0, 0xCC79,      0, 0x4953, 0x612A,
- 0x6129,      0, 0xCC7A, 0xCC7B, 0xCC7C,      0,      0, 0xCC7D,
-};
-static const unsigned short utf8_to_euc_E793_x0213[] = {
-      0,      0,      0,      0,      0,      0,      0,      0,
- 0x7843, 0x7844, 0x607B,      0, 0xCC6C,      0,      0, 0x607C,
- 0xCC6D,      0,      0, 0xCC6E, 0x607D,      0, 0xF129,      0,
- 0xF12A,      0, 0x7845, 0xCC71, 0x313B,      0, 0xF12B, 0xCC73,
- 0x6121,      0, 0x493B, 0x6122, 0xCC74,      0, 0x3424, 0x6123,
- 0xCC75, 0x6124, 0xCC76, 0xF12D,      0,      0, 0x6125, 0xF12C,
- 0x6127, 0x6128, 0x6126,      0, 0xCC79,      0, 0x4953, 0x612A,
- 0x6129,      0, 0xF12F, 0xCC7B, 0xCC7C,      0,      0, 0x7846,
-};
-static const unsigned short utf8_to_euc_E794[] = {
-      0, 0xF450,      0, 0x612C, 0x612B, 0x612D, 0xCC7E,      0,
-      0,      0,      0,      0, 0x612E, 0x6130, 0x612F,      0,
-      0, 0x3979, 0xCD21, 0x6132,      0, 0x6131, 0xCD22, 0xCD23,
- 0x3445,      0, 0x3F53,      0, 0x453C,      0, 0x6133, 0x4038,
- 0xCD24, 0xCD25,      0, 0x3B3A, 0xCD26, 0x3179, 0x6134, 0xCD27,
- 0x4D51, 0xCD28, 0xCD29, 0x4A63, 0x6135,      0,      0, 0xCD2A,
- 0x4544, 0x4D33, 0x3943, 0x3F3D,      0,      0, 0xCD2B, 0x434B,
- 0x5234, 0xCD2C, 0x442E, 0x3268, 0x6136, 0xCD2D, 0xCD2E, 0xCD2F,
-};
-static const unsigned short utf8_to_euc_E794_x0213[] = {
-      0, 0x7847,      0, 0x612C, 0x612B, 0x612D, 0xCC7E,      0,
-      0,      0,      0,      0, 0x612E, 0x6130, 0x612F,      0,
-      0, 0x3979, 0xCD21, 0x6132,      0, 0x6131, 0xCD22, 0x7848,
- 0x3445,      0, 0x3F53,      0, 0x453C,      0, 0x6133, 0x4038,
- 0xF131, 0xCD25,      0, 0x3B3A, 0xF132, 0x3179, 0x6134, 0xCD27,
- 0x4D51, 0xCD28, 0xF133, 0x4A63, 0x6135,      0,      0, 0x7849,
- 0x4544, 0x4D33, 0x3943, 0x3F3D,      0,      0, 0xCD2B, 0x434B,
- 0x5234, 0xCD2C, 0x442E, 0x3268, 0x6136, 0xF136, 0xF137, 0xCD2F,
-};
-static const unsigned short utf8_to_euc_E795[] = {
- 0xCD30,      0,      0, 0xCD31, 0x6137,      0, 0x613C, 0xCD32,
- 0xCD33, 0x613A, 0x6139, 0x5A42, 0x3326, 0x6138, 0xCD34, 0x305A,
- 0xCD35, 0x482A, 0xCD36,      0, 0x484A,      0,      0, 0xCD37,
-      0, 0x4E31, 0x613D, 0x613B, 0x435C, 0x4026, 0xCD38, 0xCD39,
- 0x482B, 0xCD3A, 0x492D,      0, 0x613F, 0x4E2C, 0x374D, 0x6140,
-      0, 0x613E, 0x4856, 0x6141,      0, 0x6142,      0, 0xCD3B,
- 0x305B, 0xCD3C,      0, 0x3E76, 0x6147,      0, 0x6144, 0x466D,
- 0x6143, 0xCD3D, 0xCD3E, 0xCD3F, 0xCD40, 0xCD41, 0xCD42, 0x3526,
-};
-static const unsigned short utf8_to_euc_E795_x0213[] = {
- 0xF138,      0,      0, 0xCD31, 0x6137,      0, 0x613C, 0xCD32,
- 0xF139, 0x613A, 0x6139, 0x5A42, 0x3326, 0x6138, 0xF13A, 0x305A,
- 0xF13B, 0x482A, 0xF13C,      0, 0x484A,      0,      0, 0xCD37,
-      0, 0x4E31, 0x613D, 0x613B, 0x435C, 0x4026, 0xCD38, 0xCD39,
- 0x482B, 0xCD3A, 0x492D,      0, 0x613F, 0x4E2C, 0x374D, 0x6140,
-      0, 0x613E, 0x4856, 0x6141, 0xF13D, 0x6142,      0, 0x784A,
- 0x305B, 0xF13F, 0xF13E, 0x3E76, 0x6147,      0, 0x6144, 0x466D,
- 0x6143, 0x784B, 0xF140, 0xCD3F, 0xCD40, 0xF141, 0xF142, 0x3526,
-};
-static const unsigned short utf8_to_euc_E796[] = {
-      0, 0xCD43, 0x614A,      0,      0, 0xCD44, 0x6145, 0x6146,
-      0, 0x6149, 0x6148, 0x4925,      0,      0, 0x4142, 0x4141,
- 0xCD45, 0x353F, 0xCD46, 0xCD47, 0x614B, 0xCD48,      0,      0,
-      0, 0xCD49, 0x614C,      0, 0xCD4A, 0x614D,      0,      0,
-      0,      0, 0xCD4B, 0x614F, 0xCD4C, 0x614E,      0,      0,
-      0,      0,      0, 0x3156,      0,      0,      0,      0,
-      0, 0x6157, 0x4868, 0x6151, 0xCD4D, 0x6153,      0,      0,
- 0x6155, 0x3F3E, 0xCD4E,      0, 0x6156, 0x6154, 0x3C40, 0xCD4F,
-};
-static const unsigned short utf8_to_euc_E796_x0213[] = {
-      0, 0xF143, 0x614A,      0,      0, 0xCD44, 0x6145, 0x6146,
-      0, 0x6149, 0x6148, 0x4925, 0xF145,      0, 0x4142, 0x4141,
- 0xCD45, 0x353F, 0x784C, 0xCD47, 0x614B, 0xCD48,      0,      0,
-      0, 0xCD49, 0x614C,      0, 0xCD4A, 0x614D,      0,      0,
-      0,      0, 0xF147, 0x614F, 0xCD4C, 0x614E,      0,      0,
-      0,      0,      0, 0x3156,      0,      0,      0,      0,
- 0xF149, 0x6157, 0x4868, 0x6151, 0xCD4D, 0x6153,      0, 0xF14A,
- 0x6155, 0x3F3E, 0xCD4E,      0, 0x6156, 0x6154, 0x3C40, 0xF14B,
-};
-static const unsigned short utf8_to_euc_E797[] = {
- 0xCD50, 0xCD51, 0x6150, 0x6152, 0xCD52, 0x4942, 0xCD53, 0x3E49,
-      0,      0, 0x6159,      0, 0xCD54, 0x6158, 0xCD55, 0xCD56,
-      0,      0, 0x615A,      0, 0x3C26, 0x3A2F,      0, 0xCD57,
- 0x4577, 0x615B,      0, 0x444B, 0xCD58,      0, 0x615D, 0xCD59,
- 0xCD5A, 0xCD5B, 0x4E21, 0x615C, 0xCD5C,      0,      0, 0xCD5D,
-      0, 0x4169,      0,      0, 0xCD5E,      0, 0xCD5F, 0xCD60,
- 0x6162, 0xCD61, 0x6164, 0x6165, 0x4354,      0,      0,      0,
-      0, 0xCD62, 0x6163,      0, 0x6160,      0, 0x615E, 0x615F,
-};
-static const unsigned short utf8_to_euc_E797_x0213[] = {
- 0xF14C, 0xCD51, 0x6150, 0x6152, 0xCD52, 0x4942, 0xF14D, 0x3E49,
-      0,      0, 0x6159,      0, 0xCD54, 0x6158, 0x784E, 0xF14E,
-      0,      0, 0x615A, 0xF14F, 0x3C26, 0x3A2F,      0, 0xCD57,
- 0x4577, 0x615B,      0, 0x444B, 0xCD58, 0xF150, 0x615D, 0xF151,
- 0xF152, 0xCD5B, 0x4E21, 0x615C, 0x784F,      0,      0, 0xF153,
-      0, 0x4169,      0,      0, 0xF154,      0, 0xF155, 0xCD60,
- 0x6162, 0xF156, 0x6164, 0x6165, 0x4354,      0,      0,      0,
-      0, 0xF157, 0x6163,      0, 0x6160,      0, 0x615E, 0x615F,
-};
-static const unsigned short utf8_to_euc_E798[] = {
- 0xCD63, 0x6161, 0xCD64, 0xCD65, 0xCD66,      0,      0, 0xCD67,
- 0xCD68, 0x6168, 0xCD69, 0x6166, 0xCD6A, 0x6167,      0, 0xCD6B,
-      0,      0, 0xCD6C, 0xCD6D,      0, 0xCD6E, 0xCD6F,      0,
-      0, 0xCD70,      0, 0xCD71, 0xCD72, 0xCD73, 0xCD74, 0x6169,
- 0x616B, 0x616C, 0x616D, 0xCD75, 0x616E, 0xCD76, 0xCD77, 0x616A,
-      0, 0xCD78,      0,      0,      0, 0xCD79,      0,      0,
- 0x6170,      0, 0xCD7A, 0xCD7B, 0x616F, 0xCD7C,      0,      0,
- 0xCD7D, 0xCD7E, 0xCE21, 0x6171, 0xCE22,      0,      0,      0,
-};
-static const unsigned short utf8_to_euc_E798_x0213[] = {
- 0x7850, 0x6161, 0x7851, 0xF158, 0xCD66,      0,      0, 0xF15A,
- 0x7852, 0x6168, 0xCD69, 0x6166, 0xCD6A, 0x6167,      0, 0xF15B,
-      0,      0, 0xCD6C, 0xF15E,      0, 0x7853, 0x7854,      0,
- 0xF159, 0x7855,      0, 0xF15F, 0xF160, 0xCD73, 0x7856, 0x6169,
- 0x616B, 0x616C, 0x616D, 0xCD75, 0x616E, 0xF162, 0x7E7D, 0x616A,
- 0xF163, 0xCD78,      0,      0,      0, 0x7857,      0,      0,
- 0x6170,      0, 0xCD7A, 0xF165, 0x616F, 0x7858,      0,      0,
- 0xCD7D, 0xCD7E, 0xCE21, 0x6171, 0xF164,      0,      0,      0,
-};
-static const unsigned short utf8_to_euc_E799[] = {
- 0xCE24, 0xCE25, 0x4E45, 0xCE26, 0xCE27, 0xCE28, 0x6174, 0x6172,
- 0x6173, 0xCE29, 0xCE23, 0xCE2A, 0x3462,      0,      0,      0,
-      0,      0, 0x4C7E,      0,      0, 0xCE2B, 0x4A4A,      0,
- 0x6176, 0xCE2C,      0,      0, 0x6175,      0,      0, 0xCE2D,
-      0, 0x6177, 0x6178,      0, 0xCE2E, 0xCE2F,      0, 0x617C,
- 0x6179, 0x617A, 0x617B,      0, 0x617D, 0xCE30, 0xCE31, 0xCE32,
- 0x617E, 0xCE33, 0x6221,      0, 0xCE34,      0, 0x6222,      0,
- 0x6223,      0, 0x482F, 0x4550, 0x6224, 0x4772, 0x4934,      0,
-};
-static const unsigned short utf8_to_euc_E799_x0213[] = {
- 0xCE24, 0xF168, 0x4E45, 0x7859, 0xCE27, 0xCE28, 0x6174, 0x6172,
- 0x6173, 0xF16A, 0xCE23, 0x785A, 0x3462,      0,      0,      0,
-      0,      0, 0x4C7E,      0,      0, 0xF16B, 0x4A4A,      0,
- 0x6176, 0xCE2C,      0,      0, 0x6175,      0,      0, 0xCE2D,
-      0, 0x6177, 0x6178,      0, 0x785B, 0x785C,      0, 0x617C,
- 0x6179, 0x617A, 0x617B,      0, 0x617D, 0x785D, 0xF16D, 0x785E,
- 0x617E, 0x785F, 0x6221,      0, 0xCE34,      0, 0x6222,      0,
- 0x6223,      0, 0x482F, 0x4550, 0x6224, 0x4772, 0x4934,      0,
-};
-static const unsigned short utf8_to_euc_E79A[] = {
- 0x6225, 0xCE35, 0xF451, 0x6226, 0x452A, 0xCE36, 0x3327, 0x3944,
- 0x6227,      0,      0, 0x6228, 0xCE37, 0xCE38, 0x6229,      0,
- 0x3B29,      0,      0, 0x622B,      0, 0xCE39, 0x622A,      0,
-      0, 0x622C, 0x622D, 0xCE3A, 0xCE3B, 0xCE3C, 0xF452, 0xCE3D,
- 0xCE3E,      0, 0xCE3F, 0xCE40, 0xCE41, 0xCE42, 0xCE43, 0xCE44,
- 0xCE45,      0, 0xCE46,      0,      0, 0xCE47, 0x4869,      0,
- 0x622E,      0,      0,      0, 0x622F,      0,      0, 0x7369,
- 0x6230, 0x6231, 0x6232,      0,      0, 0xCE48,      0, 0x3B2E,
-};
-static const unsigned short utf8_to_euc_E79A_x0213[] = {
- 0x6225, 0x7860,      0, 0x6226, 0x452A, 0xCE36, 0x3327, 0x3944,
- 0x6227,      0,      0, 0x6228, 0xCE37, 0xCE38, 0x6229,      0,
- 0x3B29,      0,      0, 0x622B,      0, 0xF16E, 0x622A,      0,
-      0, 0x622C, 0x622D, 0x7861, 0xF16F, 0x7862, 0x7863, 0xCE3D,
- 0xF171, 0xF170, 0xCE3F, 0xCE40, 0xCE41, 0xCE42, 0x7864, 0xF172,
- 0xF173,      0, 0x7865,      0,      0, 0xCE47, 0x4869, 0xF174,
- 0x622E,      0,      0,      0, 0x622F,      0, 0x7866, 0x7369,
- 0x6230, 0x6231, 0x6232,      0,      0, 0xCE48,      0, 0x3B2E,
-};
-static const unsigned short utf8_to_euc_E79B[] = {
-      0, 0xCE49, 0x6233, 0x4756,      0, 0xCE4A, 0x4B5F,      0,
- 0x314E, 0xCE4B, 0x3157, 0xCE4C, 0xCE4D, 0x6234, 0xCE4E,      0,
-      0,      0, 0x6236,      0, 0xCE4F,      0, 0x6235, 0x4570,
-      0, 0xCE50,      0, 0x4039, 0x5D39,      0, 0x6237, 0x4C41,
- 0xCE51, 0x6238,      0, 0x3446, 0x4857, 0x6239, 0xCE52, 0x623A,
- 0xCE53,      0, 0x623B,      0, 0xCE54,      0, 0x4C5C,      0,
- 0xCE55, 0xCE56, 0x4C55,      0, 0x443E,      0, 0xCE57,      0,
- 0x416A, 0xCE58,      0, 0x623D, 0xCE59,      0, 0x3D62,      0,
-};
-static const unsigned short utf8_to_euc_E79B_x0213[] = {
-      0, 0xCE49, 0x6233, 0x4756,      0, 0x7867, 0x4B5F,      0,
- 0x314E, 0xF176, 0x3157, 0xCE4C, 0x7868, 0x6234, 0x7869,      0,
-      0,      0, 0x6236,      0, 0x786A,      0, 0x6235, 0x4570,
-      0, 0xCE50,      0, 0x4039, 0x5D39,      0, 0x6237, 0x4C41,
- 0xCE51, 0x6238,      0, 0x3446, 0x4857, 0x6239, 0x786B, 0x623A,
- 0xF178,      0, 0x623B,      0, 0xF179,      0, 0x4C5C,      0,
- 0xCE55, 0x786C, 0x4C55,      0, 0x443E,      0, 0xCE57,      0,
- 0x416A, 0xCE58,      0, 0x623D, 0x786D,      0, 0x3D62,      0,
-};
-static const unsigned short utf8_to_euc_E79C[] = {
- 0xCE5A, 0x3E4A,      0,      0, 0x6240,      0, 0xCE5B, 0x623F,
- 0x623E, 0x487D, 0xCE5C, 0x3447, 0x3829,      0, 0xCE5D,      0,
-      0,      0, 0xCE5E,      0, 0xCE5F, 0xCE60,      0, 0xCE61,
-      0, 0xCE62, 0xCE63, 0x6246, 0xCE64,      0, 0x6243, 0x3F3F,
- 0x4C32,      0, 0xCE65,      0, 0x6242, 0x6244, 0x6245,      0,
- 0xCE66, 0x6241,      0,      0,      0, 0xCE67, 0xCE68, 0xCE69,
-      0,      0,      0,      0, 0xCE6A, 0xCE6B, 0xCE6C, 0x6247,
- 0x6248, 0xCE6D, 0x442F,      0, 0x3463, 0xCE6E, 0xCE6F,      0,
-};
-static const unsigned short utf8_to_euc_E79C_x0213[] = {
- 0xCE5A, 0x3E4A,      0,      0, 0x6240,      0, 0xCE5B, 0x623F,
- 0x623E, 0x487D, 0x786E, 0x3447, 0x3829,      0, 0xCE5D,      0,
-      0,      0, 0xCE5E,      0, 0xCE5F, 0xCE60,      0, 0xF17B,
-      0, 0x786F, 0xF17C, 0x6246, 0xCE64,      0, 0x6243, 0x3F3F,
- 0x4C32,      0, 0xCE65,      0, 0x6242, 0x6244, 0x6245,      0,
- 0xCE66, 0x6241,      0,      0,      0, 0xF17D, 0xCE68, 0xCE69,
-      0,      0,      0,      0, 0x7870, 0xF17E, 0x7871, 0x6247,
- 0x6248, 0xCE6D, 0x442F,      0, 0x3463, 0xCE6E, 0xCE6F,      0,
-};
-static const unsigned short utf8_to_euc_E79D[] = {
- 0x4365,      0, 0xCE70,      0,      0, 0xCE71, 0xCE72, 0x6249,
-      0,      0, 0xCE73,      0,      0, 0xCE74, 0xCE75, 0xCE76,
-      0,      0, 0xCE77,      0,      0,      0, 0xCE78, 0xCE79,
-      0,      0, 0x624A, 0x624D, 0xCE7A,      0, 0xCE7B, 0xCE7C,
- 0xCE7D, 0x3F67, 0xCE7E, 0x4644, 0xCF21, 0x624E, 0x4B53, 0xCF22,
- 0x624B,      0, 0xCF23, 0x624C, 0xCF24,      0,      0,      0,
- 0xCF25,      0, 0xCF26, 0xCF27, 0xCF28,      0,      0,      0,
-      0, 0x6251, 0xCF29,      0,      0, 0xCF2A, 0x6250, 0x624F,
-};
-static const unsigned short utf8_to_euc_E79D_x0213[] = {
- 0x4365,      0, 0xCE70,      0,      0, 0xCE71, 0x7872, 0x6249,
-      0,      0, 0xCE73,      0,      0, 0x7873, 0x7874, 0xCE76,
-      0,      0, 0xCE77,      0,      0,      0, 0xCE78, 0xCE79,
- 0xF225,      0, 0x624A, 0x624D, 0x7875,      0, 0xCE7B, 0x7876,
- 0xF226, 0x3F67, 0x7877, 0x4644, 0xCF21, 0x624E, 0x4B53, 0xCF22,
- 0x624B,      0, 0xF227, 0x624C, 0xCF24,      0,      0,      0,
- 0xCF25,      0, 0xF229, 0xCF27, 0xCF28,      0,      0,      0,
-      0, 0x6251, 0x7878,      0, 0xF22A, 0xF22B, 0x6250, 0x624F,
-};
-static const unsigned short utf8_to_euc_E79E[] = {
- 0xCF2B,      0,      0,      0, 0xCF2C,      0,      0,      0,
-      0,      0,      0, 0x6253, 0xCF2D, 0xCF2E, 0x6252,      0,
-      0, 0x6254,      0,      0, 0xCF2F, 0xCF30, 0xCF31,      0,
-      0,      0, 0xCF32,      0,      0,      0, 0x6256, 0xCF33,
- 0x6255,      0, 0xCF34,      0,      0, 0x4A4D,      0, 0xCF35,
-      0,      0, 0xCF36,      0, 0x3D56, 0x4E46, 0xCF37, 0xCF38,
- 0x6257, 0xCF39,      0, 0x4637,      0, 0xCF3A, 0x6258,      0,
-      0, 0x6259,      0, 0x625D, 0x625B, 0x625C, 0xCF3B, 0x625A,
-};
-static const unsigned short utf8_to_euc_E79E_x0213[] = {
- 0x7879,      0,      0,      0, 0xCF2C,      0,      0,      0,
-      0,      0,      0, 0x6253, 0xCF2D, 0xCF2E, 0x6252,      0,
-      0, 0x6254,      0,      0, 0x787A, 0xCF30, 0xCF31,      0,
-      0,      0, 0xF22E,      0,      0,      0, 0x6256, 0xF22F,
- 0x6255,      0, 0xF230,      0, 0xF231, 0x4A4D,      0, 0xCF35,
-      0, 0xF232, 0x787B,      0, 0x3D56, 0x4E46, 0xCF37, 0xCF38,
- 0x6257, 0xCF39,      0, 0x4637,      0, 0xCF3A, 0x6258,      0,
-      0, 0x6259,      0, 0x625D, 0x625B, 0x625C, 0xCF3B, 0x625A,
-};
-static const unsigned short utf8_to_euc_E79F[] = {
-      0,      0,      0, 0xCF3C,      0,      0,      0, 0x625E,
-      0, 0xCF3D,      0,      0,      0, 0x625F,      0,      0,
-      0, 0xCF3E, 0xCF3F,      0,      0, 0xCF40,      0, 0x6260,
-      0, 0xCF41, 0x6261, 0x4C37, 0x6262,      0, 0xCF42, 0xCF43,
- 0xCF44,      0, 0x4C70, 0x6263, 0xCF45, 0x434E, 0xCF46, 0x476A,
-      0, 0x366B, 0xCF47,      0, 0xCF48, 0x433B, 0x6264, 0x363A,
- 0xCF49, 0xCF4A,      0, 0x4050, 0xCF4B,      0,      0,      0,
- 0xCF4C,      0,      0, 0xCF4D, 0x6265,      0,      0,      0,
-};
-static const unsigned short utf8_to_euc_E79F_x0213[] = {
-      0,      0,      0, 0xCF3C,      0,      0,      0, 0x625E,
-      0, 0xCF3D,      0,      0,      0, 0x625F,      0,      0,
-      0, 0xCF3E, 0xCF3F,      0,      0, 0xCF40,      0, 0x6260,
-      0, 0xCF41, 0x6261, 0x4C37, 0x6262,      0, 0xF233, 0xF234,
- 0x787C,      0, 0x4C70, 0x6263, 0xF235, 0x434E, 0xF236, 0x476A,
-      0, 0x366B, 0xF237,      0, 0xF238, 0x433B, 0x6264, 0x363A,
- 0xF23A, 0xCF4A,      0, 0x4050, 0xF23B,      0,      0,      0,
- 0xCF4C,      0,      0, 0xF23C, 0x6265,      0,      0,      0,
-};
-static const unsigned short utf8_to_euc_E7A0[] = {
-      0,      0, 0x3A3D,      0,      0, 0xCF4E, 0xCF4F,      0,
-      0, 0xCF50,      0,      0, 0x6266, 0xCF51, 0xCF52,      0,
-      0, 0xCF53, 0x6267,      0, 0x3826, 0x3A55,      0,      0,
-      0,      0,      0,      0,      0, 0xCF54,      0,      0,
- 0x6269, 0xCF55, 0xCF56, 0xCF57,      0, 0x4556, 0x3A56, 0x354E,
-      0,      0,      0,      0,      0, 0xCF58, 0xCF59,      0,
- 0xCF5A,      0, 0x4B24,      0, 0x474B, 0xCF5B,      0, 0xCF5C,
-      0,      0, 0x4557,      0,      0,      0,      0, 0x395C,
-};
-static const unsigned short utf8_to_euc_E7A0_x0213[] = {
-      0,      0, 0x3A3D,      0,      0, 0xF23E, 0xF23F,      0,
-      0, 0xF240,      0,      0, 0x6266, 0xF241, 0xCF52,      0,
-      0, 0xCF53, 0x6267,      0, 0x3826, 0x3A55,      0,      0,
-      0, 0xF242,      0,      0,      0, 0xCF54,      0,      0,
- 0x6269, 0xF243, 0xCF56, 0xCF57,      0, 0x4556, 0x3A56, 0x354E,
-      0,      0,      0,      0, 0xF244, 0x787D, 0xCF59,      0,
- 0xCF5A,      0, 0x4B24,      0, 0x474B, 0xCF5B,      0, 0xCF5C,
-      0,      0, 0x4557,      0,      0,      0,      0, 0x395C,
-};
-static const unsigned short utf8_to_euc_E7A1[] = {
-      0,      0,      0, 0xCF5D, 0xCF5E, 0x626B,      0, 0xCF5F,
- 0xCF60,      0,      0,      0, 0xCF61,      0, 0xCF62,      0,
-      0,      0, 0xCF63,      0,      0,      0,      0,      0,
-      0,      0,      0,      0, 0xCF64, 0x3E4B, 0xCF65,      0,
- 0xCF66, 0xCF67,      0, 0xCF68, 0xCF69,      0,      0,      0,
- 0xCF6A,      0, 0xCF6B, 0x4E32, 0x3945,      0, 0xCF6C, 0x3827,
-      0,      0, 0x4823,      0, 0x626D,      0,      0,      0,
-      0,      0, 0xCF6D,      0, 0x626F,      0, 0xCF6E,      0,
-};
-static const unsigned short utf8_to_euc_E7A1_x0213[] = {
-      0,      0,      0, 0x7921, 0xCF5E, 0x626B,      0, 0xF245,
- 0xCF60,      0,      0,      0, 0xCF61,      0, 0x7922, 0x7923,
-      0, 0x7924, 0xCF63,      0,      0,      0,      0,      0,
-      0,      0,      0,      0, 0xCF64, 0x3E4B, 0xCF65,      0,
- 0xCF66, 0xCF67,      0, 0xCF68, 0xF246,      0,      0,      0,
- 0x7925,      0, 0xF247, 0x4E32, 0x3945,      0, 0x7926, 0x3827,
-      0,      0, 0x4823,      0, 0x626D,      0,      0,      0,
-      0,      0,      0,      0, 0x626F,      0, 0xCF6E,      0,
-};
-static const unsigned short utf8_to_euc_E7A2[] = {
-      0, 0x386B,      0,      0,      0,      0, 0x626E, 0x4476,
-      0,      0, 0xCF6F,      0, 0x6271, 0x3337, 0x626C, 0xCF70,
-      0, 0x486A,      0, 0x3130, 0xCF71, 0x3A6C,      0, 0x4F52,
- 0xCF72,      0, 0x6270,      0,      0, 0xCF74, 0xCF75, 0xCF76,
-      0, 0xCF73,      0, 0x6272, 0xCF77,      0,      0, 0x4A4B,
- 0xCF78, 0x4059, 0x6274,      0, 0xCF79, 0xCF7A,      0, 0x6275,
- 0xCF7B, 0xCF7C, 0xCF7D, 0xCF7E,      0, 0x6273,      0,      0,
-      0,      0, 0x334E, 0xD021, 0x627B, 0xD022, 0x627A, 0xD023,
-};
-static const unsigned short utf8_to_euc_E7A2_x0213[] = {
-      0, 0x386B,      0,      0,      0,      0, 0x626E, 0x4476,
-      0,      0, 0xF249,      0, 0x6271, 0x3337, 0x626C, 0xCF70,
-      0, 0x486A,      0, 0x3130, 0xF24A, 0x3A6C,      0, 0x4F52,
- 0xCF72,      0, 0x6270,      0,      0, 0xF24C, 0xF24D, 0xF24E,
-      0, 0xCF73,      0, 0x6272, 0xF24B,      0,      0, 0x4A4B,
- 0xCF78, 0x4059, 0x6274,      0, 0xCF79, 0x792A,      0, 0x6275,
- 0x7928, 0xCF7C, 0xCF7D, 0xCF7E,      0, 0x6273,      0,      0,
-      0,      0, 0x334E, 0xF24F, 0x627B, 0xD022, 0x627A, 0xD023,
-};
-static const unsigned short utf8_to_euc_E7A3[] = {
-      0, 0x3C27,      0,      0,      0, 0x627C, 0x6277, 0xD024,
- 0xD025, 0xD026, 0x627D, 0x6278, 0xD027,      0, 0xD028,      0,
- 0x4858, 0x6276, 0xD029, 0xD02A, 0x6279, 0xD02B, 0xD02C,      0,
-      0,      0, 0x6322, 0xD02E,      0,      0,      0, 0xD02F,
- 0xD030, 0xD031,      0,      0, 0xD02D,      0, 0xD032, 0x6321,
- 0x4B61,      0, 0xD033,      0, 0x627E,      0,      0, 0x306B,
-      0,      0, 0xD034, 0xD035, 0x6324,      0, 0xD037, 0xD038,
-      0,      0, 0xD039, 0xD03A,      0, 0x6323,      0, 0xD03B,
-};
-static const unsigned short utf8_to_euc_E7A3_x0213[] = {
-      0, 0x3C27,      0,      0,      0, 0x627C, 0x6277, 0xD024,
- 0xF250, 0xD026, 0x627D, 0x6278, 0xF251,      0, 0xF252,      0,
- 0x4858, 0x6276, 0xD029, 0xD02A, 0x6279, 0xF253, 0xD02C,      0,
-      0,      0, 0x6322, 0xD02E,      0,      0,      0, 0xD02F,
- 0xF254, 0xF255,      0,      0, 0x792B,      0, 0xF256, 0x6321,
- 0x4B61,      0, 0xD033,      0, 0x627E,      0,      0, 0x306B,
-      0,      0, 0x792C, 0xD035, 0x6324,      0, 0xD037, 0x792E,
-      0, 0xF257, 0xF258, 0xF259,      0, 0x6323, 0xF25A, 0xD03B,
-};
-static const unsigned short utf8_to_euc_E7A4[] = {
- 0xD036, 0x3E4C,      0,      0,      0,      0, 0xD03C, 0x6325,
-      0,      0,      0,      0, 0xD03D,      0, 0x4143,      0,
- 0xD03E, 0x6327, 0x6326,      0,      0,      0,      0,      0,
-      0, 0x6328, 0xD03F,      0, 0xD040,      0, 0xD041, 0xD042,
- 0xD043,      0,      0,      0,      0, 0xD044, 0x6268, 0xD045,
-      0, 0xD046, 0x626A, 0x632A, 0x6329, 0xD047,      0,      0,
- 0xF454, 0xD048,      0,      0, 0xD049, 0xD04A,      0,      0,
-      0,      0, 0x3C28, 0xD04B, 0x4E69, 0xD04C, 0x3C52, 0xD04D,
-};
-static const unsigned short utf8_to_euc_E7A4_x0213[] = {
- 0x792D, 0x3E4C,      0,      0,      0,      0, 0xD03C, 0x6325,
-      0,      0,      0,      0, 0xD03D,      0, 0x4143,      0,
- 0xF25C, 0x6327, 0x6326,      0,      0,      0,      0,      0,
-      0, 0x6328, 0xD03F, 0xF25D, 0x792F,      0, 0xD041, 0xD042,
- 0xD043,      0,      0,      0,      0, 0xF25F, 0x6268, 0xD045,
-      0, 0xD046, 0x626A, 0x632A, 0x6329, 0xD047, 0x7930,      0,
- 0xF25E, 0x7931,      0,      0, 0x7932, 0xD04A,      0,      0,
-      0,      0, 0x3C28, 0xF260, 0x4E69, 0xD04C, 0x3C52, 0xD04D,
-};
-static const unsigned short utf8_to_euc_E7A5[] = {
- 0x632B, 0x3737,      0,      0, 0xD04E, 0xD04F, 0xD050, 0x3540,
- 0x3527, 0x3B63, 0xD051, 0xD052,      0,      0,      0, 0xD053,
- 0x4D34, 0xD054,      0, 0x6331, 0xD055, 0x6330, 0x4144, 0x632D,
- 0xD056,      0, 0x632F, 0xD057, 0xD058, 0x3D4B, 0x3F40, 0x632E,
- 0x632C,      0, 0x472A,      0,      0, 0x3E4D,      0, 0xD059,
- 0x493C, 0xD05A,      0, 0xD05B,      0, 0x3A57,      0,      0,
-      0,      0, 0xD05C,      0,      0,      0,      0, 0x4578,
-      0, 0xD05D, 0x6332, 0xD05E, 0xD05F,      0, 0xD060, 0x6333,
-};
-static const unsigned short utf8_to_euc_E7A5_x0213[] = {
- 0x632B, 0x3737,      0,      0, 0xD04E, 0x7935, 0x7936, 0x3540,
- 0x3527, 0x3B63, 0xF261, 0xD052,      0,      0,      0, 0xD053,
- 0x4D34, 0xD054,      0, 0x6331, 0xD055, 0x6330, 0x4144, 0x632D,
- 0xF262,      0, 0x632F, 0xF263, 0x793A, 0x3D4B, 0x3F40, 0x632E,
- 0x632C,      0, 0x472A,      0,      0, 0x3E4D,      0, 0xF265,
- 0x493C, 0xD05A,      0, 0xD05B,      0, 0x3A57,      0,      0,
-      0,      0, 0xF266,      0,      0,      0,      0, 0x4578,
-      0, 0x793E, 0x6332, 0xD05E, 0xD05F,      0, 0xD060, 0x6333,
-};
-static const unsigned short utf8_to_euc_E7A6[] = {
- 0x6349, 0x3658,      0,      0, 0x4F3D, 0x4135,      0,      0,
-      0,      0, 0x6334, 0xD061, 0xD062, 0x3252, 0x4477, 0x4A21,
-      0, 0xD063,      0, 0xD064, 0xD065, 0xD066, 0xD067,      0,
- 0xD068,      0,      0, 0xD069, 0xD06A, 0x6335,      0,      0,
-      0, 0xD06B,      0,      0,      0,      0, 0x357A, 0x6336,
- 0xD06C, 0xD06D, 0x6338, 0xD06E,      0,      0, 0x6339, 0xD06F,
- 0x4729, 0xD070,      0, 0x633A, 0xD071,      0,      0,      0,
- 0xD072, 0x633B, 0x633C, 0xD073,      0, 0x3659, 0x3253, 0x4645,
-};
-static const unsigned short utf8_to_euc_E7A6_x0213[] = {
- 0x6349, 0x3658,      0,      0, 0x4F3D, 0x4135,      0,      0,
-      0,      0, 0x6334, 0xD061, 0xD062, 0x3252, 0x4477, 0x4A21,
-      0, 0xD063,      0, 0xD064, 0xF267, 0xF268, 0xF269,      0,
- 0x7942,      0,      0, 0xF26A, 0xD06A, 0x6335,      0,      0,
-      0, 0xF26B,      0,      0,      0,      0, 0x357A, 0x6336,
- 0xD06C, 0xF26C, 0x6338, 0xD06E,      0,      0, 0x6339, 0xD06F,
- 0x4729, 0x7943,      0, 0x633A, 0xF26D,      0,      0,      0,
- 0x7944, 0x633B, 0x633C, 0xF26E,      0, 0x3659, 0x3253, 0x4645,
-};
-static const unsigned short utf8_to_euc_E7A7[] = {
- 0x3D28, 0x3B64, 0xD074,      0, 0xD075,      0,      0, 0xD076,
- 0xD077, 0x633D, 0xD078, 0x3D29,      0,      0,      0, 0xD079,
-      0, 0x324A, 0x4943,      0, 0xD07A, 0x633E, 0xD07B,      0,
- 0x486B,      0, 0xD07C,      0,      0, 0xD07D, 0xD07E, 0x4145,
- 0xD121, 0x6341, 0xD122, 0x6342, 0x4769, 0xD123, 0x3F41, 0x633F,
-      0, 0x4361, 0xD124, 0xD125, 0x6340, 0xD126,      0,      0,
- 0x3E4E, 0xD127,      0,      0,      0,      0,      0,      0,
- 0xD128,      0,      0, 0x305C, 0xD129,      0,      0,      0,
-};
-static const unsigned short utf8_to_euc_E7A7_x0213[] = {
- 0x3D28, 0x3B64, 0xF26F,      0, 0xD075,      0,      0, 0xF270,
- 0x7945, 0x633D, 0x7946, 0x3D29, 0xF271, 0xF272,      0, 0xD079,
-      0, 0x324A, 0x4943,      0, 0x7948, 0x633E, 0xF273,      0,
- 0x486B,      0, 0xD07C,      0,      0, 0xD07D, 0x7949, 0x4145,
- 0xD121, 0x6341, 0xD122, 0x6342, 0x4769, 0xD123, 0x3F41, 0x633F,
-      0, 0x4361, 0xD124, 0x794A, 0x6340, 0x794B,      0,      0,
- 0x3E4E, 0xD127,      0,      0,      0,      0,      0,      0,
- 0xD128,      0,      0, 0x305C, 0xD129,      0,      0,      0,
-};
-static const unsigned short utf8_to_euc_E7A8[] = {
- 0x3529,      0, 0xD12A, 0xD12B,      0,      0,      0, 0xD12C,
- 0x6343, 0xD12D, 0xD12E, 0x4478, 0xD12F, 0x6344, 0x4047,      0,
-      0, 0xD130,      0,      0, 0x4C2D, 0xD131,      0, 0x4923,
- 0x6345, 0x6346, 0x4355, 0xD132, 0x4E47,      0, 0xD133, 0x6348,
- 0x6347, 0xD134,      0,      0,      0,      0,      0, 0xD135,
-      0,      0,      0, 0xD136,      0, 0xD137, 0x3C6F, 0xD138,
- 0xD139, 0x634A, 0x3070,      0, 0xD13A, 0xD13B,      0, 0x634D,
- 0xD13C, 0xD13D, 0xD13E, 0x634B, 0x3254, 0x374E, 0x634C, 0x3946,
-};
-static const unsigned short utf8_to_euc_E7A8_x0213[] = {
- 0x3529,      0, 0xD12A, 0x794C,      0,      0,      0, 0xD12C,
- 0x6343, 0xD12D, 0xF278, 0x4478, 0xD12F, 0x6344, 0x4047,      0,
-      0, 0xF279,      0,      0, 0x4C2D, 0xF27A,      0, 0x4923,
- 0x6345, 0x6346, 0x4355, 0xF27B, 0x4E47,      0, 0xF27C, 0x6348,
- 0x6347, 0xD134,      0,      0,      0,      0,      0, 0xD135,
-      0,      0,      0, 0xD136,      0, 0xF27E, 0x3C6F, 0xD138,
- 0xD139, 0x634A, 0x3070,      0, 0xD13A, 0xD13B,      0, 0x634D,
- 0xF321, 0x794E, 0xD13E, 0x634B, 0x3254, 0x374E, 0x634C, 0x3946,
-};
-static const unsigned short utf8_to_euc_E7A9[] = {
- 0x3972,      0, 0x4A66, 0x634E, 0xD13F, 0xD140, 0x4B54, 0xD141,
- 0xD142, 0x6350,      0,      0, 0xD143, 0x4051, 0x314F, 0x323A,
- 0x302C,      0,      0,      0,      0, 0xD144, 0xD145, 0x634F,
-      0, 0xD146,      0,      0, 0xD147, 0xD148,      0, 0xD149,
- 0xD14A, 0x6351, 0x6352, 0x3E77,      0, 0xD14B,      0, 0xD14C,
-      0, 0x6353, 0xD14D, 0x334F,      0, 0xD14E,      0,      0,
- 0x6355,      0,      0,      0, 0x376A, 0xD14F, 0x3566,      0,
- 0xD150, 0x6356, 0x3675,      0,      0, 0x6357, 0xD151, 0x407C,
-};
-static const unsigned short utf8_to_euc_E7A9_x0213[] = {
- 0x3972,      0, 0x4A66, 0x634E, 0xD13F, 0xD140, 0x4B54, 0xF322,
- 0xD142, 0x6350,      0,      0, 0xF323, 0x4051, 0x314F, 0x323A,
- 0x302C,      0,      0,      0,      0, 0xD144, 0xF324, 0x634F,
-      0, 0xF325,      0,      0, 0xF326, 0x794F,      0, 0xF327,
- 0xF328, 0x6351, 0x6352, 0x3E77,      0, 0xD14B,      0, 0xF329,
-      0, 0x6353, 0xF32A, 0x334F,      0, 0x7950,      0,      0,
- 0x6355,      0,      0,      0, 0x376A, 0xF32B, 0x3566,      0,
- 0xF32C, 0x6356, 0x3675,      0,      0, 0x6357, 0xD151, 0x407C,
-};
-static const unsigned short utf8_to_euc_E7AA[] = {
- 0xD152, 0x464D, 0xD153, 0x4060, 0x3A75, 0xD154, 0xD155,      0,
- 0x6358,      0, 0xD156, 0xD157,      0,      0,      0,      0,
- 0xD158, 0xD159, 0x4362, 0x416B, 0xD15A, 0x635A, 0x635C, 0x6359,
- 0x635B,      0,      0,      0,      0,      0, 0xD15B, 0x3722,
- 0xD15C,      0,      0, 0xD15D,      0,      0,      0,      0,
-      0, 0x635D, 0x3726,      0, 0xD15E,      0, 0x3567, 0x4D52,
- 0x635F,      0,      0, 0xD15F,      0, 0xD160, 0x6360,      0,
-      0, 0xD161, 0x312E, 0xD162, 0xD163,      0,      0, 0x6363,
-};
-static const unsigned short utf8_to_euc_E7AA_x0213[] = {
- 0xD152, 0x464D, 0xF32D, 0x4060, 0x3A75, 0x7952, 0xD155,      0,
- 0x6358,      0, 0xF32E, 0xD157,      0,      0,      0,      0,
- 0xF32F, 0xD159, 0x4362, 0x416B, 0xD15A, 0x635A, 0x635C, 0x6359,
- 0x635B,      0,      0,      0,      0,      0, 0xD15B, 0x3722,
- 0x7953,      0,      0, 0xF330,      0,      0,      0,      0,
-      0, 0x635D, 0x3726,      0, 0xF331,      0, 0x3567, 0x4D52,
- 0x635F,      0,      0, 0x7955,      0, 0xD160, 0x6360,      0,
-      0, 0xF334, 0x312E, 0x7956, 0xF335,      0, 0xF336, 0x6363,
-};
-static const unsigned short utf8_to_euc_E7AB[] = {
-      0,      0,      0, 0x3376, 0x6362, 0x6361, 0xD164, 0x6365,
- 0x635E, 0xD165, 0x6366, 0x4E29, 0xD166, 0x6367, 0xD167, 0x6368,
-      0, 0xD168, 0x5474, 0x636A,      0, 0x6369,      0,      0,
-      0, 0x636B, 0x636C, 0xD169, 0x4E35, 0x636D,      0, 0x706F,
- 0x3E4F, 0x636E, 0x636F, 0x3D57,      0, 0x4638, 0x6370, 0xF459,
- 0xD16A, 0xD16B, 0x4328, 0xD16C, 0xD16D, 0x6371,      0, 0x433C,
- 0x6372, 0xD16E,      0,      0, 0xD16F,      0, 0x3625,      0,
- 0x513F, 0x435D, 0x3C33, 0xD170,      0, 0xD171, 0xD172, 0x3448,
-};
-static const unsigned short utf8_to_euc_E7AB_x0213[] = {
-      0,      0,      0, 0x3376, 0x6362, 0x6361, 0xD164, 0x6365,
- 0x635E, 0xD165, 0x6366, 0x4E29, 0xF338, 0x6367, 0x7957, 0x6368,
-      0, 0xF339, 0x5474, 0x636A,      0, 0x6369,      0,      0,
-      0, 0x636B, 0x636C, 0xD169, 0x4E35, 0x636D,      0, 0x706F,
- 0x3E4F, 0x636E, 0x636F, 0x3D57,      0, 0x4638, 0x6370, 0xF33A,
- 0xF33B, 0xD16B, 0x4328, 0x7958, 0xD16D, 0x6371,      0, 0x433C,
- 0x6372, 0xD16E,      0,      0, 0xF33C,      0, 0x3625,      0,
- 0x513F, 0x435D, 0x3C33, 0xD170,      0, 0x7959, 0xD172, 0x3448,
-};
-static const unsigned short utf8_to_euc_E7AC[] = {
-      0,      0, 0x6373,      0, 0x6422,      0, 0x6376, 0xD173,
- 0x3568,      0, 0x6375, 0x6424,      0,      0,      0, 0x6374,
-      0, 0x3E50,      0,      0, 0xD174,      0,      0,      0,
- 0x6378, 0x6379,      0, 0x452B,      0,      0, 0x637A, 0xD175,
- 0x335E,      0,      0, 0xD176,      0, 0x3F5A, 0x4964, 0xD177,
- 0x637C, 0xD178, 0xD179, 0xD17A, 0x4268, 0xD17B, 0xD17C, 0xD17D,
- 0xD17E, 0xD221,      0, 0x6377, 0xD222, 0x637B, 0x637D,      0,
-      0, 0x3A7B,      0,      0,      0, 0xD223,      0, 0xD224,
-};
-static const unsigned short utf8_to_euc_E7AC_x0213[] = {
-      0,      0, 0x6373,      0, 0x6422,      0, 0x6376, 0xF33F,
- 0x3568,      0, 0x6375, 0x6424,      0,      0,      0, 0x6374,
-      0, 0x3E50, 0x795A,      0, 0xD174,      0,      0,      0,
- 0x6378, 0x6379,      0, 0x452B,      0,      0, 0x637A, 0xD175,
- 0x335E,      0,      0, 0xD176,      0, 0x3F5A, 0x4964, 0xF342,
- 0x637C, 0xD178, 0xF343, 0xD17A, 0x4268, 0x795B, 0xF344, 0xF345,
- 0xD17E, 0xF346,      0, 0x6377, 0xD222, 0x637B, 0x637D,      0,
-      0, 0x3A7B,      0, 0x795C,      0, 0xF341,      0, 0xD224,
-};
-static const unsigned short utf8_to_euc_E7AD[] = {
- 0xD225, 0xD226,      0,      0,      0, 0x6426, 0x492E, 0xD227,
- 0x4826, 0x4579,      0, 0x365A, 0x6425, 0x6423, 0xD228, 0x4835,
- 0x637E, 0x435E, 0x457B,      0, 0x457A, 0xD229, 0x3A76,      0,
-      0,      0,      0,      0,      0, 0x6438,      0,      0,
- 0xD22A,      0,      0,      0, 0xD22B, 0x6428, 0xD22C, 0x642A,
-      0, 0xD22D, 0xD22E,      0, 0x642D, 0xD22F, 0x642E, 0xD230,
- 0x642B, 0x642C, 0xD231, 0xD232, 0x6429, 0x6427,      0, 0xD233,
-      0,      0, 0x6421,      0,      0,      0,      0,      0,
-};
-static const unsigned short utf8_to_euc_E7AD_x0213[] = {
- 0xD225, 0xF34A,      0,      0,      0, 0x6426, 0x492E, 0x795D,
- 0x4826, 0x4579,      0, 0x365A, 0x6425, 0x6423, 0x795E, 0x4835,
- 0x637E, 0x435E, 0x457B,      0, 0x457A, 0xF34C, 0x3A76,      0,
-      0,      0,      0,      0,      0, 0x6438,      0,      0,
- 0x795F,      0,      0,      0, 0xF34E, 0x6428, 0xF34F, 0x642A,
-      0, 0xF350, 0xD22E,      0, 0x642D, 0x7960, 0x642E, 0x7961,
- 0x642B, 0x642C, 0x7962, 0xF351, 0x6429, 0x6427,      0, 0xD233,
-      0, 0xF34D, 0x6421,      0,      0,      0,      0, 0xF349,
-};
-static const unsigned short utf8_to_euc_E7AE[] = {
-      0,      0,      0,      0, 0xD234,      0, 0x4A4F, 0x3255,
-      0, 0xD235,      0, 0x6435,      0, 0x6432, 0xD236, 0x6437,
- 0xD237, 0xD238, 0x6436,      0, 0x4773, 0x4C27, 0xD239, 0x3B3B,
- 0x6430, 0x6439, 0x6434, 0xD23A, 0x6433, 0x642F, 0xD23B, 0x6431,
- 0xD23C, 0x3449,      0,      0,      0, 0xD23D,      0,      0,
-      0,      0, 0x433D,      0, 0xD23E, 0x407D,      0, 0xD23F,
- 0xD240, 0x4822, 0xD241,      0, 0x643E, 0xD242, 0xD243,      0,
- 0x4824,      0, 0xD244, 0xD245, 0xD246, 0xD247,      0,      0,
-};
-static const unsigned short utf8_to_euc_E7AE_x0213[] = {
-      0,      0,      0,      0, 0xD234,      0, 0x4A4F, 0x3255,
-      0, 0xD235,      0, 0x6435,      0, 0x6432, 0xD236, 0x6437,
- 0xF354, 0xF355, 0x6436,      0, 0x4773, 0x4C27, 0xD239, 0x3B3B,
- 0x6430, 0x6439, 0x6434, 0xF356, 0x6433, 0x642F, 0x7963, 0x6431,
- 0xD23C, 0x3449,      0,      0,      0, 0xD23D,      0,      0,
-      0,      0, 0x433D,      0, 0xD23E, 0x407D,      0, 0xF358,
- 0xD240, 0x4822, 0xD241,      0, 0x643E, 0xF359, 0xD243,      0,
- 0x4824,      0, 0xD244, 0xD245, 0xF35A, 0xD247,      0,      0,
-};
-static const unsigned short utf8_to_euc_E7AF[] = {
- 0x4061, 0x643B, 0xD248,      0, 0x484F, 0xD249, 0x643F, 0x4A53,
- 0xD24A, 0x435B, 0xD24B, 0x643A, 0x643C,      0,      0, 0x643D,
-      0,      0,      0,      0, 0xD24C,      0, 0xD24D, 0xD24E,
-      0, 0xD24F, 0xD250, 0xD251,      0, 0x6440,      0,      0,
- 0x3C44,      0,      0,      0, 0x4646, 0x6445, 0x6444,      0,
- 0xD252, 0x6441, 0xD253,      0,      0, 0x4F36,      0,      0,
-      0,      0, 0xD254, 0x644A, 0xD255, 0xD256, 0x644E, 0x644B,
- 0xD257, 0xD258, 0xD259,      0, 0xD25A,      0, 0xD25B,      0,
-};
-static const unsigned short utf8_to_euc_E7AF_x0213[] = {
- 0x4061, 0x643B, 0xD248,      0, 0x484F, 0xF35B, 0x643F, 0x4A53,
- 0xD24A, 0x435B, 0xF35C, 0x643A, 0x643C,      0,      0, 0x643D,
-      0,      0,      0,      0, 0xF35F,      0, 0xF360, 0x7965,
-      0, 0x7966, 0xF361, 0xD251,      0, 0x6440,      0,      0,
- 0x3C44,      0,      0,      0, 0x4646, 0x6445, 0x6444,      0,
- 0xD252, 0x6441, 0xF362,      0,      0, 0x4F36,      0,      0,
- 0xF363,      0, 0xD254, 0x644A, 0xD255, 0xD256, 0x644E, 0x644B,
- 0xD257, 0xD258, 0xD259,      0, 0xD25A,      0, 0xD25B,      0,
-};
-static const unsigned short utf8_to_euc_E7B0[] = {
- 0x6447, 0xD25C, 0xD25D, 0xD25E, 0xD25F,      0, 0xD260, 0x6448,
-      0, 0xD261,      0, 0xD262, 0xD263, 0x644D, 0xD264, 0xD265,
-      0, 0x6442, 0x5255, 0x6449, 0x6443,      0,      0, 0x644C,
-      0, 0xD266,      0, 0xD267,      0,      0,      0, 0x6452,
- 0xD268, 0x344A,      0, 0x644F,      0, 0xD269, 0xD26A, 0x6450,
- 0xD26B,      0, 0x6451, 0x6454, 0xD26C,      0,      0,      0,
-      0, 0xD26D,      0, 0xD26E, 0xD26F,      0, 0xD270, 0x6453,
- 0x4876, 0xD271, 0xD272,      0,      0, 0x6455, 0x4E7C, 0x4A6D,
-};
-static const unsigned short utf8_to_euc_E7B0_x0213[] = {
- 0x6447, 0x7967, 0xD25D, 0xF364, 0xD25F,      0, 0xD260, 0x6448,
-      0, 0xD261,      0, 0xF365, 0xD263, 0x644D, 0xF366, 0xF367,
-      0, 0x6442, 0x5255, 0x6449, 0x6443,      0,      0, 0x644C,
-      0, 0xD266,      0, 0xD267,      0,      0, 0x7969, 0x6452,
- 0x796A, 0x344A,      0, 0x644F,      0, 0xD269, 0xF368, 0x6450,
- 0xD26B,      0, 0x6451, 0x6454, 0xD26C,      0,      0,      0,
-      0, 0x7968,      0, 0x796B, 0xD26F,      0, 0x796C, 0x6453,
- 0x4876, 0xD271, 0xD272,      0,      0, 0x6455, 0x4E7C, 0x4A6D,
-};
-static const unsigned short utf8_to_euc_E7B1[] = {
- 0x645A,      0,      0, 0x6457,      0,      0, 0xD273,      0,
-      0,      0, 0xD274,      0, 0x6456, 0x4052,      0, 0x6459,
- 0x645B, 0xD276, 0xD277, 0xD278, 0x6458, 0xD275, 0x645F,      0,
- 0x645C, 0xD279, 0xD27A, 0xD27B, 0xD27C, 0xD27D, 0xD27E, 0x645D,
- 0x6446, 0xD321,      0, 0xD322, 0x645E, 0x6460,      0, 0xD323,
-      0, 0xD324,      0,      0, 0x6461, 0xD325, 0xD326,      0,
- 0xD327,      0, 0xD328, 0x4A46,      0, 0x6462,      0,      0,
-      0, 0xD329,      0,      0, 0xD32A, 0xD32B, 0x4C62,      0,
-};
-static const unsigned short utf8_to_euc_E7B1_x0213[] = {
- 0x645A,      0,      0, 0x6457,      0, 0xF369, 0xD273,      0,
-      0,      0, 0xF36A,      0, 0x6456, 0x4052,      0, 0x6459,
- 0x645B, 0xF36B, 0xD277, 0xD278, 0x6458, 0xD275, 0x645F, 0xF36C,
- 0x645C, 0x796F, 0xD27A, 0xD27B, 0xD27C, 0xD27D, 0xF36D, 0x645D,
- 0x6446, 0xF36E,      0, 0xD322, 0x645E, 0x6460,      0, 0xD323,
-      0, 0xF36F,      0,      0, 0x6461, 0x7970, 0xF370, 0xF371,
- 0xF372,      0, 0xD328, 0x4A46,      0, 0x6462,      0,      0,
-      0, 0x7971,      0,      0, 0xD32A, 0xD32B, 0x4C62,      0,
-};
-static const unsigned short utf8_to_euc_E7B2[] = {
-      0, 0x364E, 0x3729, 0x6463,      0,      0, 0xD32C, 0xD32D,
-      0, 0x4A34,      0, 0x3F68,      0, 0x4C30,      0, 0xD32E,
- 0x6464,      0, 0x4E33,      0, 0xD32F, 0x4774,      0, 0x4146,
- 0x4734,      0,      0, 0x3D4D,      0,      0, 0xD330, 0x3040,
- 0xD331, 0x6469, 0x6467,      0, 0x6465, 0x3421, 0xD332, 0x3E51,
- 0x646A,      0,      0, 0x6468,      0, 0x6466, 0x646E,      0,
- 0xD333, 0x646D, 0x646C, 0x646B,      0,      0, 0xD334, 0xD335,
-      0, 0x646F, 0xD336, 0xD337, 0xD338, 0x6470, 0x403A, 0xD339,
-};
-static const unsigned short utf8_to_euc_E7B2_x0213[] = {
-      0, 0x364E, 0x3729, 0x6463,      0,      0, 0xD32C, 0xD32D,
-      0, 0x4A34,      0, 0x3F68,      0, 0x4C30,      0, 0x7972,
- 0x6464,      0, 0x4E33,      0, 0x7973, 0x4774,      0, 0x4146,
- 0x4734,      0,      0, 0x3D4D,      0,      0, 0xD330, 0x3040,
- 0x7974, 0x6469, 0x6467,      0, 0x6465, 0x3421, 0xF376, 0x3E51,
- 0x646A,      0,      0, 0x6468,      0, 0x6466, 0x646E,      0,
- 0xD333, 0x646D, 0x646C, 0x646B,      0,      0, 0xF378, 0xF379,
-      0, 0x646F, 0xD336, 0xD337, 0x7975, 0x6470, 0x403A, 0xF37A,
-};
-static const unsigned short utf8_to_euc_E7B3[] = {
- 0x6471,      0, 0x6473,      0, 0xD33A, 0x6472,      0, 0xD33B,
- 0xD33C, 0xD33D, 0x3852,      0,      0, 0xD33E, 0x4138, 0xD33F,
-      0,      0, 0x6475, 0xD340, 0xD341, 0xD342, 0x457C, 0xD343,
- 0x6474, 0xD344, 0xD345,      0, 0x6476, 0xD346, 0x4A35, 0x416C,
- 0x3947,      0, 0x6477,      0,      0,      0, 0xD347, 0x4E48,
-      0, 0xD348,      0, 0xD349,      0,      0,      0, 0x6479,
-      0,      0, 0x647A,      0, 0x647B, 0xD34A, 0x647C,      0,
- 0x3B65,      0, 0x647D, 0x374F,      0,      0, 0x356A,      0,
-};
-static const unsigned short utf8_to_euc_E7B3_x0213[] = {
- 0x6471,      0, 0x6473,      0, 0xF37C, 0x6472,      0, 0xD33B,
- 0xF37E, 0xD33D, 0x3852,      0,      0, 0xF421, 0x4138, 0xD33F,
-      0,      0, 0x6475, 0xD340, 0xD341, 0x7976, 0x457C, 0xF423,
- 0x6474, 0x7977, 0xD345,      0, 0x6476, 0x7978, 0x4A35, 0x416C,
- 0x3947,      0, 0x6477,      0,      0,      0, 0xF425, 0x4E48,
-      0, 0xD348,      0, 0xF426,      0,      0,      0, 0x6479,
-      0,      0, 0x647A,      0, 0x647B, 0xF428, 0x647C,      0,
- 0x3B65,      0, 0x647D, 0x374F,      0,      0, 0x356A,      0,
-};
-static const unsigned short utf8_to_euc_E7B4[] = {
- 0x352A,      0, 0x6521, 0xD34B, 0x4C73, 0x3948, 0x647E, 0xD34C,
- 0xD34D, 0xD34E, 0x6524, 0x4C66,      0, 0x473C,      0, 0xD34F,
- 0x4933, 0xD350, 0xD351, 0xD352, 0x3D63, 0x6523, 0xD353, 0x3C53,
- 0x3949, 0x3B66, 0x3569, 0x4A36, 0x6522, 0xD354, 0xD355,      0,
- 0x4147, 0x4B42, 0x3A77, 0xD356,      0,      0, 0xD357,      0,
-      0,      0, 0xD358, 0x3B67, 0x445D, 0xD359, 0x6527, 0x4E5F,
- 0x3A59, 0xD35A, 0x6528, 0x3F42,      0, 0x652A,      0,      0,
-      0, 0x3E52, 0x3A30,      0, 0xD35B, 0xD35C, 0xD35D, 0x6529,
-};
-static const unsigned short utf8_to_euc_E7B4_x0213[] = {
- 0x352A,      0, 0x6521, 0xF429, 0x4C73, 0x3948, 0x647E, 0x7979,
- 0x797A, 0xF42A, 0x6524, 0x4C66,      0, 0x473C,      0, 0xD34F,
- 0x4933, 0xD350, 0xF42C, 0x797B, 0x3D63, 0x6523, 0xD353, 0x3C53,
- 0x3949, 0x3B66, 0x3569, 0x4A36, 0x6522, 0x797C, 0xF42D,      0,
- 0x4147, 0x4B42, 0x3A77, 0x797D,      0,      0, 0xD357,      0,
-      0,      0, 0xD358, 0x3B67, 0x445D, 0xD359, 0x6527, 0x4E5F,
- 0x3A59, 0x797E, 0x6528, 0x3F42,      0, 0x652A,      0,      0,
-      0, 0x3E52, 0x3A30,      0, 0xD35B, 0xF430, 0xF431, 0x6529,
-};
-static const unsigned short utf8_to_euc_E7B5[] = {
- 0xD35E, 0xD35F, 0x3D2A, 0x383E, 0x4148, 0x6525, 0x652B, 0xD360,
- 0xD361,      0,      0, 0x6526, 0x3750, 0xD362, 0x652E, 0x6532,
- 0x376B, 0xD363,      0, 0xD364,      0,      0, 0x652D, 0xD365,
-      0, 0xD366, 0xD367, 0x6536, 0xD368, 0xD369, 0x394A,      0,
-      0, 0x4D6D, 0x303C, 0x6533,      0, 0xD36A, 0x356B, 0xD36B,
- 0x6530,      0, 0xD36C,      0,      0,      0, 0x6531,      0,
- 0xD36D, 0x457D, 0x652F, 0x652C,      0, 0x3328, 0x4064,      0,
- 0xD36E, 0x3828, 0xD36F, 0xD370,      0, 0x6538,      0, 0xD371,
-};
-static const unsigned short utf8_to_euc_E7B5_x0213[] = {
- 0xF432, 0x7A21, 0x3D2A, 0x383E, 0x4148, 0x6525, 0x652B, 0xF433,
- 0x7A22,      0,      0, 0x6526, 0x3750, 0xD362, 0x652E, 0x6532,
- 0x376B, 0xD363,      0, 0x7A23,      0,      0, 0x652D, 0xD365,
-      0, 0xF437, 0xF438, 0x6536, 0x7A24, 0xD369, 0x394A,      0,
-      0, 0x4D6D, 0x303C, 0x6533,      0, 0xD36A, 0x356B, 0xD36B,
- 0x6530,      0, 0xF439,      0,      0,      0, 0x6531,      0,
- 0xF43A, 0x457D, 0x652F, 0x652C,      0, 0x3328, 0x4064,      0,
- 0xD36E, 0x3828, 0x7A25, 0xD370,      0, 0x6538,      0, 0xF43C,
-};
-static const unsigned short utf8_to_euc_E7B6[] = {
-      0, 0xD372, 0xD373, 0xD374,      0, 0xD375, 0xD376,      0,
- 0xD377, 0x6535,      0, 0xD378, 0xD379, 0xD37A,      0, 0x6537,
-      0, 0xD37B,      0, 0x6534,      0,      0, 0xD37C, 0xD37D,
-      0, 0x3751, 0x4233, 0x6539, 0x416E, 0xD37E, 0xD421, 0x6546,
- 0xF45C,      0, 0x6542, 0x653C,      0,      0, 0xD422, 0xD423,
-      0,      0, 0xD424, 0x6540, 0x3C7A, 0x305D, 0x653B, 0x6543,
- 0x6547, 0x394B, 0x4C56, 0xD425, 0x4456, 0x653D, 0xD426, 0xD427,
- 0x6545, 0xD428, 0x653A, 0x433E,      0, 0x653F, 0x303D, 0x4C4A,
-};
-static const unsigned short utf8_to_euc_E7B6_x0213[] = {
-      0, 0xD372, 0xD373, 0x7A26,      0, 0xD375, 0xF43E,      0,
- 0xF43F, 0x6535,      0, 0x7A27, 0xF440, 0xD37A,      0, 0x6537,
-      0, 0xD37B,      0, 0x6534,      0,      0, 0xD37C, 0xF441,
-      0, 0x3751, 0x4233, 0x6539, 0x416E, 0xF443, 0xD421, 0x6546,
- 0x7A28,      0, 0x6542, 0x653C,      0,      0, 0x7A29, 0xF444,
-      0,      0, 0xF445, 0x6540, 0x3C7A, 0x305D, 0x653B, 0x6543,
- 0x6547, 0x394B, 0x4C56, 0xD425, 0x4456, 0x653D, 0xF446, 0xF447,
- 0x6545, 0xD428, 0x653A, 0x433E,      0, 0x653F, 0x303D, 0x4C4A,
-};
-static const unsigned short utf8_to_euc_E7B7[] = {
-      0,      0, 0xD429, 0xD42A, 0xD42B, 0xD42C, 0xD42D, 0x653E,
-      0,      0, 0x365B, 0x486C, 0xD42E, 0xD42F, 0xD430, 0x416D,
-      0, 0x4E50, 0x3D6F,      0,      0, 0x656E, 0xF45D, 0xD431,
- 0x6548, 0xD432, 0x407E,      0, 0x6544, 0x6549, 0x654B,      0,
- 0x4479, 0x654E, 0xD434,      0, 0x654A, 0xD435, 0xD436,      0,
- 0x4A54, 0x344B, 0xD437, 0xD438, 0x4C4B, 0xD439,      0, 0x305E,
-      0, 0xD43A, 0x654D,      0, 0x4E7D, 0xD43B, 0xD43C,      0,
-      0, 0xD43D, 0xD43E, 0x654C,      0,      0,      0,      0,
-};
-static const unsigned short utf8_to_euc_E7B7_x0213[] = {
- 0xF448,      0, 0x7A2A, 0xD42A, 0xD42B, 0xD42C, 0xD42D, 0x653E,
-      0,      0, 0x365B, 0x486C, 0x7A2B, 0xD42F, 0xD430, 0x416D,
-      0, 0x4E50, 0x3D6F,      0,      0, 0x656E, 0x7A2C, 0xF449,
- 0x6548, 0xF44A, 0x407E,      0, 0x6544, 0x6549, 0x654B,      0,
- 0x4479, 0x654E, 0xD434, 0x7A2D, 0x654A, 0xD435, 0xF44B,      0,
- 0x4A54, 0x344B, 0xD437, 0xD438, 0x4C4B, 0xD439,      0, 0x305E,
-      0, 0xF44C, 0x654D,      0, 0x4E7D, 0xD43B, 0xD43C,      0,
-      0, 0xF44D, 0xD43E, 0x654C,      0,      0,      0,      0,
-};
-static const unsigned short utf8_to_euc_E7B8[] = {
- 0xD433, 0x316F,      0,      0, 0x466C, 0x654F,      0,      0,
- 0xD43F, 0x6556, 0x6550, 0x6557,      0,      0,      0,      0,
- 0xD440, 0xD441, 0x6553,      0,      0, 0xD442,      0, 0xD443,
-      0,      0,      0, 0x477B, 0xD444, 0xD445, 0x3C4A, 0x6555,
- 0xD446, 0x6552, 0x6558, 0x6551,      0,      0, 0x3D44, 0xD447,
- 0xD448,      0,      0, 0x4B25, 0xD449, 0xD44A, 0x3D4C, 0xD44B,
-      0, 0x6554, 0x6560, 0xD44C,      0, 0x655C, 0xD44D, 0x655F,
-      0, 0x655D, 0x6561, 0x655B,      0, 0x6541, 0x4053, 0xD44E,
-};
-static const unsigned short utf8_to_euc_E7B8_x0213[] = {
- 0xD433, 0x316F,      0,      0, 0x466C, 0x654F,      0,      0,
- 0x7A30, 0x6556, 0x6550, 0x6557,      0,      0,      0,      0,
- 0xF451, 0x7A31, 0x6553,      0,      0, 0x7A32,      0, 0xF452,
-      0,      0,      0, 0x477B, 0xD444, 0xF453, 0x3C4A, 0x6555,
- 0xF454, 0x6552, 0x6558, 0x6551,      0,      0, 0x3D44, 0xF455,
- 0x7A2F,      0,      0, 0x4B25, 0xF456, 0xD44A, 0x3D4C, 0xD44B,
-      0, 0x6554, 0x6560, 0xD44C,      0, 0x655C, 0xD44D, 0x655F,
-      0, 0x655D, 0x6561, 0x655B,      0, 0x6541, 0x4053, 0xD44E,
-};
-static const unsigned short utf8_to_euc_E7B9[] = {
-      0, 0x484B,      0, 0x655E, 0xD44F, 0xD450, 0x6559, 0xD451,
-      0,      0, 0x4121, 0x3752,      0, 0x3D2B, 0xD452,      0,
- 0xD453,      0, 0xD454,      0, 0x3F25, 0x4136, 0x6564,      0,
- 0xD455, 0x6566, 0x6567,      0,      0, 0x6563, 0x6565, 0xD456,
-      0, 0xD457, 0xD458,      0,      0, 0xD459, 0x655A, 0x6562,
-      0, 0x656A, 0x6569, 0xD45A,      0, 0x4B7A, 0xD45B, 0xD45C,
- 0x372B,      0,      0, 0xD45D,      0,      0,      0,      0,
- 0xD45E, 0x6568,      0, 0x656C, 0x656B, 0x656F, 0xD45F, 0x6571,
-};
-static const unsigned short utf8_to_euc_E7B9_x0213[] = {
-      0, 0x484B,      0, 0x655E, 0xD44F, 0xF457, 0x6559, 0x7A34,
-      0,      0, 0x4121, 0x3752,      0, 0x3D2B, 0xD452,      0,
- 0xD453,      0, 0x7A35,      0, 0x3F25, 0x4136, 0x6564,      0,
- 0xD455, 0x6566, 0x6567,      0,      0, 0x6563, 0x6565, 0xD456,
-      0, 0x7A36, 0xD458,      0,      0, 0xD459, 0x655A, 0x6562,
-      0, 0x656A, 0x6569, 0x7E7E,      0, 0x4B7A, 0xD45B, 0xD45C,
- 0x372B,      0,      0, 0xF458,      0, 0xF459,      0,      0,
- 0xD45E, 0x6568,      0, 0x656C, 0x656B, 0x656F, 0xF45A, 0x6571,
-};
-static const unsigned short utf8_to_euc_E7BA[] = {
-      0, 0xD460, 0x3B3C, 0x656D,      0,      0, 0xD461, 0xD462,
- 0x6572, 0x6573, 0xD463,      0, 0x6574, 0xD464, 0x657A, 0x453B,
- 0x6576, 0xD465, 0x6575, 0x6577, 0x6578, 0xD466, 0x6579,      0,
- 0xD467,      0, 0xD468, 0x657B, 0x657C, 0xD469, 0xD46A,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-};
-static const unsigned short utf8_to_euc_E7BA_x0213[] = {
-      0, 0xD460, 0x3B3C, 0x656D,      0,      0, 0xF45B, 0xF45C,
- 0x6572, 0x6573, 0x7A37,      0, 0x6574, 0x7A38, 0x657A, 0x453B,
- 0x6576, 0xF45E, 0x6575, 0x6577, 0x6578, 0xD466, 0x6579,      0,
- 0xF45F,      0, 0xF460, 0x657B, 0x657C, 0xD469, 0xD46A,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-};
-static const unsigned short utf8_to_euc_E7BC[] = {
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0, 0x344C,      0,
- 0x657D,      0, 0x657E, 0xD46C, 0xD46B, 0xD46D, 0xD46E, 0xD46F,
-};
-static const unsigned short utf8_to_euc_E7BC_x0213[] = {
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0, 0x344C,      0,
- 0x657D,      0, 0x657E, 0xF463, 0xF462, 0xD46D, 0xF464, 0xD46F,
-};
-static const unsigned short utf8_to_euc_E7BD[] = {
-      0,      0,      0, 0xD470, 0xD471, 0x6621,      0, 0xD472,
-      0,      0,      0,      0, 0x6622, 0x6623, 0x6624, 0xD473,
- 0x6625, 0x6626, 0xD474, 0xD475, 0x6628, 0x6627,      0,      0,
- 0x6629,      0,      0, 0xD476, 0xD477, 0xD478,      0, 0x662A,
- 0x662B, 0xD479,      0, 0xD47A, 0xD47B, 0xD47C, 0xD47D, 0x662E,
- 0x662C, 0x662D, 0x3A61, 0x3753,      0, 0xD47E, 0x4356,      0,
- 0x4833, 0xD521, 0x3D70,      0,      0, 0x474D,      0, 0x486D,
- 0x662F, 0x586D,      0,      0,      0, 0xD522, 0xD523, 0xD524,
-};
-static const unsigned short utf8_to_euc_E7BD_x0213[] = {
-      0,      0,      0, 0xF465, 0xF466, 0x6621,      0, 0x7A39,
-      0,      0,      0,      0, 0x6622, 0x6623, 0x6624, 0xF467,
- 0x6625, 0x6626, 0xF46A, 0xD475, 0x6628, 0x6627,      0,      0,
- 0x6629,      0,      0, 0xD476, 0xD477, 0xD478,      0, 0x662A,
- 0x662B, 0xF46C,      0, 0xF46D, 0xF46E, 0xD47C, 0xD47D, 0x662E,
- 0x662C, 0x662D, 0x3A61, 0x3753,      0, 0xF46F, 0x4356,      0,
- 0x4833, 0xD521, 0x3D70,      0,      0, 0x474D,      0, 0x486D,
- 0x662F, 0x586D,      0,      0,      0, 0xF470, 0xF471, 0xD524,
-};
-static const unsigned short utf8_to_euc_E7BE[] = {
- 0xD525,      0, 0x6630, 0x6632,      0, 0x4D65, 0x6631, 0x6634,
- 0x6633,      0, 0x4D53, 0xD526, 0x6635, 0xD527, 0x487E, 0xD528,
- 0xD529, 0xD52A,      0,      0, 0x6636,      0, 0xD52B, 0xD52C,
-      0,      0, 0x6639,      0, 0xD52D, 0x6638, 0x6637,      0,
-      0, 0xD52E, 0xD52F, 0x663A, 0x3732,      0, 0xD530,      0,
- 0x4122, 0x3541, 0xD531,      0,      0, 0xD532, 0x663E, 0x663B,
-      0,      0, 0x663C,      0, 0xD533,      0, 0x663F,      0,
- 0x6640, 0x663D,      0,      0, 0xD534, 0x3129,      0, 0xD535,
-};
-static const unsigned short utf8_to_euc_E7BE_x0213[] = {
- 0xD525,      0, 0x6630, 0x6632,      0, 0x4D65, 0x6631, 0x6634,
- 0x6633,      0, 0x4D53, 0xD526, 0x6635, 0xD527, 0x487E, 0xD528,
- 0xF473, 0x7A3B,      0,      0, 0x6636,      0, 0xF476, 0x7A3C,
-      0,      0, 0x6639,      0, 0xF477, 0x6638, 0x6637,      0,
-      0,      0, 0xD52F, 0x663A, 0x3732,      0, 0xD530,      0,
- 0x4122, 0x3541, 0xD531,      0,      0, 0xF478, 0x663E, 0x663B,
-      0,      0, 0x663C,      0, 0xD533,      0, 0x663F,      0,
- 0x6640, 0x663D,      0,      0, 0xD534, 0x3129,      0, 0x7A3D,
-};
-static const unsigned short utf8_to_euc_E7BF[] = {
- 0xD536, 0x3227,      0, 0xD537,      0, 0x6642, 0x6643,      0,
- 0xD538,      0, 0x6644,      0, 0x4D62,      0, 0xD539, 0xD53A,
-      0,      0, 0x3D2C,      0, 0x6646, 0x6645,      0,      0,
-      0,      0,      0, 0xD53B,      0,      0,      0, 0xD53C,
- 0x3F69, 0x6647,      0, 0xD53D,      0, 0xD53E, 0x6648,      0,
- 0xD53F, 0x6649,      0, 0x3465, 0xD540,      0, 0xD541, 0xD542,
- 0x344D,      0, 0xD543, 0x664A,      0,      0,      0,      0,
-      0, 0x664B, 0xD544, 0x4B5D, 0x4D63, 0xD545, 0xD546, 0xD547,
-};
-static const unsigned short utf8_to_euc_E7BF_x0213[] = {
- 0xD536, 0x3227,      0, 0xF47A,      0, 0x6642, 0x6643,      0,
- 0xD538,      0, 0x6644,      0, 0x4D62,      0, 0x7A3E, 0xF47B,
-      0,      0, 0x3D2C,      0, 0x6646, 0x6645,      0,      0,
-      0,      0,      0, 0x7A3F,      0,      0,      0, 0x7A40,
- 0x3F69, 0x6647,      0, 0xF47C,      0, 0xF47D, 0x6648,      0,
- 0xD53F, 0x6649,      0, 0x3465, 0x7A41,      0, 0x7A42, 0xF47E,
- 0x344D,      0, 0xF521, 0x664A,      0,      0,      0,      0,
-      0, 0x664B, 0x7A43, 0x4B5D, 0x4D63, 0xD545, 0xD546, 0xD547,
-};
-static const unsigned short utf8_to_euc_E880[] = {
- 0x4D54, 0x4F37,      0, 0x394D, 0x664E, 0x3C54, 0x664D, 0xD548,
- 0xD549,      0, 0xD54A, 0x664F, 0x3C29, 0xD54B, 0xD54C, 0xD54D,
- 0x4251, 0xD54E, 0x6650, 0xD54F, 0xD550, 0x394C, 0xD551, 0x4C57,
- 0x6651, 0x6652,      0,      0, 0x6653, 0xD552, 0xD553, 0xD554,
- 0xD555, 0x6654,      0,      0, 0xD556,      0, 0xD557,      0,
- 0x6655,      0,      0,      0, 0xD558,      0, 0xD559,      0,
- 0xD55A,      0,      0, 0x3C2A, 0xD55B, 0xD55C, 0x4C6D, 0xD55D,
-      0, 0xD55E, 0xD55F, 0x6657, 0xD560, 0x433F, 0xD561, 0x6656,
-};
-static const unsigned short utf8_to_euc_E880_x0213[] = {
- 0x4D54, 0x4F37, 0xF522, 0x394D, 0x664E, 0x3C54, 0x664D, 0xD548,
- 0xF524,      0, 0xF523, 0x664F, 0x3C29, 0xD54B, 0xF525, 0xD54D,
- 0x4251, 0xF526, 0x6650, 0xD54F, 0x7A45, 0x394C, 0xF527, 0x4C57,
- 0x6651, 0x6652,      0,      0, 0x6653, 0xD552, 0xD553, 0xD554,
- 0xD555, 0x6654,      0,      0, 0xF528,      0, 0x7A46,      0,
- 0x6655,      0,      0,      0, 0xF529,      0, 0xD559,      0,
- 0xF52A,      0,      0, 0x3C2A, 0xD55B, 0x7A47, 0x4C6D, 0x7A48,
-      0, 0xD55E, 0xD55F, 0x6657, 0x7A49, 0x433F, 0xD561, 0x6656,
-};
-static const unsigned short utf8_to_euc_E881[] = {
- 0xD562,      0,      0,      0, 0xD563,      0, 0x6659,      0,
-      0,      0, 0x6658,      0,      0,      0,      0,      0,
-      0,      0, 0x665A,      0,      0,      0, 0x403B,      0,
- 0x665B,      0, 0x665C,      0,      0,      0, 0x4A39, 0x665D,
- 0xD564, 0x416F, 0x665E,      0, 0xD565,      0, 0xD566,      0,
- 0x665F,      0,      0,      0,      0, 0xD567,      0, 0x4E7E,
- 0x6662, 0xD568, 0x6661, 0x6660, 0x4430, 0xD569, 0x6663, 0x3F26,
-      0, 0x6664,      0,      0,      0, 0x6665, 0x4F38, 0x6666,
-};
-static const unsigned short utf8_to_euc_E881_x0213[] = {
- 0xD562,      0,      0, 0xF52B, 0xD563,      0, 0x6659,      0,
-      0,      0, 0x6658,      0,      0,      0,      0,      0,
-      0,      0, 0x665A,      0,      0,      0, 0x403B,      0,
- 0x665B,      0, 0x665C,      0,      0,      0, 0x4A39, 0x665D,
- 0xD564, 0x416F, 0x665E,      0, 0xD565,      0, 0xF52C,      0,
- 0x665F,      0,      0,      0,      0, 0xD567,      0, 0x4E7E,
- 0x6662, 0xF52D, 0x6661, 0x6660, 0x4430, 0xF52E, 0x6663, 0x3F26,
-      0, 0x6664,      0, 0xF52F,      0, 0x6665, 0x4F38, 0x6666,
-};
-static const unsigned short utf8_to_euc_E882[] = {
-      0, 0xD56A,      0,      0, 0x6667, 0x6669, 0x6668, 0x4825,
- 0xD56B, 0x4679,      0, 0x4F3E, 0x4829,      0, 0xD56C,      0,
-      0,      0,      0, 0x666B,      0,      0, 0x3E53,      0,
- 0x492A,      0, 0x666C, 0x666A, 0xD56D, 0x344E, 0xD56E,      0,
-      0, 0x3854, 0x3B68,      0,      0, 0x486E, 0xD56F, 0xD570,
-      0, 0x382A, 0x4B43, 0xD571, 0x666F, 0x666D,      0, 0x394E,
-      0, 0x394F, 0x3069,      0, 0x3A68,      0,      0,      0,
- 0xD572, 0xD573, 0x4759,      0,      0,      0,      0,      0,
-};
-static const unsigned short utf8_to_euc_E882_x0213[] = {
-      0, 0xD56A,      0,      0, 0x6667, 0x6669, 0x6668, 0x4825,
- 0xD56B, 0x4679,      0, 0x4F3E, 0x4829,      0, 0xD56C,      0,
-      0,      0,      0, 0x666B,      0,      0, 0x3E53,      0,
- 0x492A, 0xF530, 0x666C, 0x666A, 0xF531, 0x344E, 0xD56E,      0,
-      0, 0x3854, 0x3B68,      0, 0xF532, 0x486E, 0xD56F, 0xF533,
-      0, 0x382A, 0x4B43, 0xD571, 0x666F, 0x666D,      0, 0x394E,
-      0, 0x394F, 0x3069,      0, 0x3A68,      0,      0,      0,
- 0xF534, 0xD573, 0x4759,      0,      0,      0,      0,      0,
-};
-static const unsigned short utf8_to_euc_E883[] = {
-      0,      0,      0, 0x305F, 0x6674,      0, 0x4340,      0,
- 0xD574,      0,      0,      0, 0x4758, 0xD575, 0x425B, 0xD576,
-      0,      0, 0xD577,      0, 0xD578, 0xD579, 0x6676, 0xD57A,
- 0xD57B, 0x6672, 0x6675, 0x6670,      0, 0x6673, 0x4B26,      0,
- 0xD57C, 0x3855,      0,      0, 0x307D, 0x6671,      0,      0,
-      0,      0,      0,      0,      0, 0xD57D, 0xD57E, 0x6678,
- 0xD621, 0x6679, 0xD622, 0xD623, 0x4639,      0, 0xD624,      0,
- 0x363B, 0xD625, 0xD626,      0, 0x6726, 0x473D, 0xD627,      0,
-};
-static const unsigned short utf8_to_euc_E883_x0213[] = {
-      0,      0,      0, 0x305F, 0x6674, 0xF536, 0x4340,      0,
- 0xD574,      0, 0x7A4A,      0, 0x4758, 0xD575, 0x425B, 0xD576,
-      0,      0, 0xD577,      0, 0xD578, 0xF537, 0x6676, 0x7A4B,
- 0xF538, 0x6672, 0x6675, 0x6670,      0, 0x6673, 0x4B26,      0,
- 0x7A4C, 0x3855,      0,      0, 0x307D, 0x6671, 0xF539,      0,
-      0,      0,      0,      0,      0, 0xD57D, 0xD57E, 0x6678,
- 0xD621, 0x6679, 0xD622, 0x7A4D, 0x4639, 0xF53C, 0xD624,      0,
- 0x363B, 0xD625, 0xD626, 0xF53D, 0x6726, 0x473D, 0xD627,      0,
-};
-static const unsigned short utf8_to_euc_E884[] = {
-      0,      0, 0x3B69, 0xD628,      0, 0x363C, 0x4048, 0x4F46,
- 0x4C2E, 0x6677, 0x4054, 0xD629,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0, 0xD62A, 0xD62B,
- 0xD62C,      0, 0x3553, 0x667A, 0xD62D,      0, 0xD62E,      0,
- 0xD62F,      0,      0, 0x667C, 0xD630,      0,      0, 0xD631,
-      0, 0x667B,      0,      0, 0xD632,      0,      0, 0x667D,
- 0xD633, 0x4326,      0, 0x473E,      0, 0xD634,      0,      0,
-      0, 0x4431, 0xD635,      0, 0xD636,      0, 0x6723,      0,
-};
-static const unsigned short utf8_to_euc_E884_x0213[] = {
-      0,      0, 0x3B69, 0xD628,      0, 0x363C, 0x4048, 0x4F46,
- 0x4C2E, 0x6677, 0x4054, 0xD629,      0, 0xF53B,      0,      0,
-      0,      0,      0,      0,      0,      0, 0xF540, 0xD62B,
- 0x7A4E,      0, 0x3553, 0x667A, 0xD62D,      0, 0xF541,      0,
- 0xD62F,      0,      0, 0x667C, 0xF543,      0,      0, 0xF544,
-      0, 0x667B,      0,      0, 0xF545,      0,      0, 0x667D,
- 0xD633, 0x4326,      0, 0x473E,      0, 0xF53F,      0,      0,
-      0, 0x4431, 0xD635,      0, 0xD636, 0xF547, 0x6723,      0,
-};
-static const unsigned short utf8_to_euc_E885[] = {
-      0,      0,      0,      0,      0, 0xD637, 0x6722, 0xD638,
-      0,      0, 0xD639, 0x667E, 0xD63A,      0, 0x3F55,      0,
- 0x4965, 0x6725, 0xD63B, 0x6724, 0x3950, 0x4F53,      0, 0xD63C,
-      0,      0,      0,      0,      0,      0,      0, 0x6735,
- 0xD63D, 0xD63E,      0,      0,      0, 0x6729, 0x672A, 0xD63F,
- 0xD640, 0xD641,      0, 0x3C70,      0, 0xD642, 0x6728, 0xD643,
- 0x3978, 0x6727,      0,      0, 0x672B,      0,      0, 0xD644,
- 0x4432, 0x4A22, 0x4123,      0,      0,      0,      0, 0x425C,
-};
-static const unsigned short utf8_to_euc_E885_x0213[] = {
-      0,      0,      0,      0,      0, 0xD637, 0x6722, 0xD638,
-      0,      0, 0x7A4F, 0x667E, 0xD63A,      0, 0x3F55,      0,
- 0x4965, 0x6725, 0xD63B, 0x6724, 0x3950, 0x4F53,      0, 0xD63C,
-      0,      0,      0,      0,      0,      0,      0, 0x6735,
- 0x7A50, 0xD63E,      0,      0,      0, 0x6729, 0x672A, 0x7A51,
- 0x7A52, 0xF549,      0, 0x3C70,      0, 0x7A53, 0x6728, 0xD643,
- 0x3978, 0x6727,      0,      0, 0x672B,      0,      0, 0xD644,
- 0x4432, 0x4A22, 0x4123,      0,      0,      0,      0, 0x425C,
-};
-static const unsigned short utf8_to_euc_E886[] = {
- 0x672F, 0xD645, 0x6730, 0x672C, 0xD647, 0xD648, 0xD649,      0,
- 0x672D,      0, 0x672E, 0xD64A,      0,      0, 0xD64B, 0x3951,
- 0xD646,      0,      0, 0x6736,      0, 0x6732, 0xD64C,      0,
- 0xD64D,      0, 0x4966, 0xD64E, 0x4B6C, 0x4928, 0xD64F,      0,
- 0x6731,      0, 0xD650, 0x6734, 0x6733,      0,      0,      0,
- 0x4B44, 0x6737,      0,      0,      0,      0, 0xD651,      0,
- 0x6738,      0, 0xD652, 0x4137, 0xD653, 0x6739,      0,      0,
- 0x673B,      0, 0x673F, 0xD654,      0, 0x673C, 0x673A, 0x473F,
-};
-static const unsigned short utf8_to_euc_E886_x0213[] = {
- 0x672F, 0xF54B, 0x6730, 0x672C, 0xF54D, 0xF54E, 0xD649,      0,
- 0x672D,      0, 0x672E, 0xD64A,      0,      0, 0xD64B, 0x3951,
- 0xD646,      0,      0, 0x6736,      0, 0x6732, 0xD64C,      0,
- 0xF550,      0, 0x4966, 0xD64E, 0x4B6C, 0x4928, 0xD64F,      0,
- 0x6731,      0, 0xD650, 0x6734, 0x6733,      0,      0,      0,
- 0x4B44, 0x6737,      0,      0,      0,      0, 0xD651,      0,
- 0x6738,      0, 0xF551, 0x4137, 0xD653, 0x6739,      0,      0,
- 0x673B,      0, 0x673F, 0x7A54,      0, 0x673C, 0x673A, 0x473F,
-};
-static const unsigned short utf8_to_euc_E887[] = {
- 0x673D,      0, 0x673E, 0xD656,      0, 0xD657, 0x3232,      0,
- 0x6745, 0x6740, 0xD658, 0xD655,      0, 0x6741, 0xD659, 0xD65A,
-      0, 0x6742,      0, 0x4221,      0, 0xD65B,      0, 0xD65C,
- 0x6744, 0x6743, 0x6746, 0xD65D,      0, 0xD65E, 0xD65F, 0x6747,
- 0x6748, 0xD660,      0, 0x3F43, 0xD661, 0x3269,      0, 0x6749,
- 0x4E57,      0, 0x3C2B, 0xD662, 0xD663, 0x3D2D,      0,      0,
- 0xD664, 0xD665, 0xD666, 0x3B6A, 0x4357, 0xD667, 0xD668,      0,
- 0xD669, 0xD66A, 0x674A, 0x674B, 0x3131, 0xD66B, 0x674C, 0xD66C,
-};
-static const unsigned short utf8_to_euc_E887_x0213[] = {
- 0x673D, 0xF552, 0x673E, 0xF553,      0, 0xD657, 0x3232,      0,
- 0x6745, 0x6740, 0x7A55, 0xD655,      0, 0x6741, 0xD659, 0x7A56,
-      0, 0x6742,      0, 0x4221,      0, 0xD65B, 0xF554, 0x7A57,
- 0x6744, 0x6743, 0x6746, 0xF555,      0, 0xD65E, 0xD65F, 0x6747,
- 0x6748, 0xD660,      0, 0x3F43, 0xF557, 0x3269,      0, 0x6749,
- 0x4E57,      0, 0x3C2B, 0xD662, 0xF559, 0x3D2D,      0,      0,
- 0xD664, 0xD665, 0xD666, 0x3B6A, 0x4357, 0xD667, 0xD668,      0,
- 0xD669, 0xD66A, 0x674A, 0x674B, 0x3131, 0xF55B, 0x674C, 0xF55C,
-};
-static const unsigned short utf8_to_euc_E888[] = {
- 0xD66D, 0x674D, 0x674E, 0xD66E,      0, 0x674F,      0, 0x6750,
- 0x363D, 0x5A2A, 0x6751,      0, 0x4065, 0x6752, 0x3C4B, 0xD66F,
- 0x6753,      0, 0x5030, 0xD670, 0xD671,      0, 0x6754, 0x4A5E,
- 0x345C, 0xD672, 0xD673, 0x4124, 0x3D58, 0xD674, 0x4971, 0x3D2E,
-      0, 0xD675, 0xD676,      0,      0,      0,      0,      0,
- 0xD677, 0x6755, 0x3952, 0x6756, 0x484C,      0, 0x6764,      0,
-      0,      0, 0xD678, 0x6758, 0xD679, 0x4249, 0x4775, 0x383F,
- 0x6757, 0x4125, 0xD67A,      0,      0,      0,      0,      0,
-};
-static const unsigned short utf8_to_euc_E888_x0213[] = {
- 0xD66D, 0x674D, 0x674E, 0xD66E, 0xF55E, 0x674F,      0, 0x6750,
- 0x363D, 0x5A2A, 0x6751,      0, 0x4065, 0x6752, 0x3C4B, 0xD66F,
- 0x6753,      0, 0x5030, 0xD670, 0xD671,      0, 0x6754, 0x4A5E,
- 0x345C, 0xF560, 0xD673, 0x4124, 0x3D58, 0xD674, 0x4971, 0x3D2E,
-      0, 0xF561, 0xF562,      0,      0,      0,      0,      0,
- 0xD677, 0x6755, 0x3952, 0x6756, 0x484C,      0, 0x6764,      0,
-      0,      0, 0xF564, 0x6758, 0xF565, 0x4249, 0x4775, 0x383F,
- 0x6757, 0x4125, 0xD67A,      0, 0xF566,      0,      0,      0,
-};
-static const unsigned short utf8_to_euc_E889[] = {
- 0x6759,      0,      0, 0xD67B, 0xD67C, 0xD67D, 0xD67E, 0x447A,
-      0,      0,      0, 0xD721,      0,      0, 0xD722, 0xD723,
-      0, 0xD724,      0,      0,      0,      0, 0xD725,      0,
- 0x675B, 0x675A, 0x675D,      0, 0xD726, 0x675C,      0, 0x675E,
- 0xD727,      0, 0x6760, 0xD728, 0x675F,      0, 0x344F, 0xD729,
- 0x6761,      0, 0x6762, 0x6763,      0, 0xD72A, 0x3A31, 0x4E49,
-      0, 0x6765, 0x3F27,      0, 0xD72B,      0, 0x3170, 0x6766,
- 0x6767,      0,      0, 0xD72C,      0, 0xD72D, 0x6768, 0xD72E,
-};
-static const unsigned short utf8_to_euc_E889_x0213[] = {
- 0x6759,      0,      0, 0xD67B, 0xD67C, 0xF569, 0xF567, 0x447A,
-      0, 0xF568,      0, 0xF56B,      0,      0, 0xD722, 0xF56D,
-      0, 0xD724,      0,      0,      0,      0, 0xD725, 0xF56F,
- 0x675B, 0x675A, 0x675D,      0, 0xF571, 0x675C,      0, 0x675E,
- 0x7A5B,      0, 0x6760, 0xF572, 0x675F,      0, 0x344F, 0xD729,
- 0x6761,      0, 0x6762, 0x6763,      0, 0xD72A, 0x3A31, 0x4E49,
-      0, 0x6765, 0x3F27,      0, 0x7A5C,      0, 0x3170, 0x6766,
- 0x6767, 0xF576,      0, 0xD72C,      0, 0xF578, 0x6768, 0xF579,
-};
-static const unsigned short utf8_to_euc_E88A[] = {
- 0xD72F, 0xD730,      0, 0xD731, 0xD732,      0,      0, 0xD733,
-      0, 0xD734, 0xD735, 0x3072,      0, 0x6769, 0xD736,      0,
-      0, 0xD737, 0x676A,      0, 0xD738,      0, 0xD739,      0,
- 0xD73A, 0x4967, 0xD73B, 0xD73C,      0, 0x3C47,      0, 0x676C,
- 0xD73D, 0xD73E,      0, 0xD73F, 0xD740, 0x3329, 0x3032, 0xD741,
- 0xD742, 0xD743, 0xD744, 0x676B, 0x676E, 0x474E, 0xD745, 0x3F44,
- 0xD746, 0x3256, 0xD747, 0x4B27, 0xD748,      0,      0, 0xD749,
- 0x375D, 0x365C, 0xD74A, 0x676D, 0xD74B, 0x326A, 0xD74C, 0xD74D,
-};
-static const unsigned short utf8_to_euc_E88A_x0213[] = {
- 0xD72F, 0xD730,      0, 0xF57A, 0xD732,      0,      0, 0xD733,
-      0, 0xD734, 0xF57B, 0x3072,      0, 0x6769, 0x7A5E,      0,
-      0, 0xD737, 0x676A, 0xF57C, 0xD738,      0, 0xD739,      0,
- 0xD73A, 0x4967, 0xD73B, 0xD73C,      0, 0x3C47,      0, 0x676C,
- 0xD73D, 0x7A5F,      0, 0x7A60, 0x7A61, 0x3329, 0x3032, 0xF57D,
- 0xF57E, 0x7A62, 0xD744, 0x676B, 0x676E, 0x474E, 0x7A63, 0x3F44,
- 0xD746, 0x3256, 0xF621, 0x4B27, 0xF622,      0,      0, 0x7A64,
- 0x375D, 0x365C, 0xF623, 0x676D, 0xF624, 0x326A, 0x7A65, 0x7A66,
-};
-static const unsigned short utf8_to_euc_E88B[] = {
-      0,      0,      0,      0,      0, 0x3423, 0xD74E,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
- 0xD74F, 0x3171, 0x6772, 0x4E6A, 0x425D, 0xD750,      0, 0x4944,
-      0, 0x677E, 0xD751, 0x3257, 0x677C,      0, 0x677A, 0x6771,
- 0xD752, 0x676F, 0xD753, 0x6770, 0xD754, 0x3C63, 0x366C, 0x4377,
- 0xD755,      0, 0xD756, 0x4651,      0, 0xD757,      0, 0xD758,
-      0, 0x3151,      0, 0x6774, 0x6773,      0, 0xD759, 0xD75A,
-      0, 0x6779, 0x6775, 0x6778,      0, 0xD75B, 0xD75C,      0,
-};
-static const unsigned short utf8_to_euc_E88B_x0213[] = {
-      0,      0,      0,      0,      0, 0x3423, 0x7A67,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
- 0xD74F, 0x3171, 0x6772, 0x4E6A, 0x425D, 0x7A68,      0, 0x4944,
-      0, 0x677E, 0xD751, 0x3257, 0x677C,      0, 0x677A, 0x6771,
- 0xD752, 0x676F, 0xF625, 0x6770, 0xD754, 0x3C63, 0x366C, 0x4377,
- 0xF626,      0, 0xD756, 0x4651,      0, 0xD757,      0, 0xD758,
-      0, 0x3151,      0, 0x6774, 0x6773,      0, 0xD759, 0xF627,
-      0, 0x6779, 0x6775, 0x6778,      0, 0x7A69, 0x7A6A,      0,
-};
-static const unsigned short utf8_to_euc_E88C[] = {
- 0xD75D, 0xD75E, 0x4C50, 0x6777, 0x3258, 0x337D, 0x677B, 0xD75F,
- 0xD760, 0x677D, 0xD761, 0xD762,      0,      0, 0x3754,      0,
-      0,      0,      0,      0,      0,      0, 0x6823, 0x682C,
- 0x682D,      0,      0, 0xD764, 0x302B, 0xD765, 0xD766, 0xD767,
-      0, 0xD768, 0xD769, 0x6834,      0,      0,      0,      0,
- 0x3071,      0,      0, 0x682B, 0xD76A, 0xD76B, 0xD76C, 0x682A,
- 0xD76D, 0x6825, 0x6824, 0xD76E, 0x6822, 0x6821, 0x4363, 0xD76F,
- 0x427B, 0x6827, 0xD770,      0, 0xD771, 0xD772,      0,      0,
-};
-static const unsigned short utf8_to_euc_E88C_x0213[] = {
- 0x7A6B, 0x7A6C, 0x4C50, 0x6777, 0x3258, 0x337D, 0x677B, 0xF628,
- 0xF629, 0x677D, 0xD761, 0xD762, 0xF62A,      0, 0x3754,      0,
-      0,      0,      0,      0,      0,      0, 0x6823, 0x682C,
- 0x682D,      0,      0, 0xF62C, 0x302B, 0xF62D, 0xD766, 0xD767,
-      0, 0xD768, 0x7A6E, 0x6834,      0,      0,      0,      0,
- 0x3071,      0,      0, 0x682B, 0xD76A, 0x7A6F, 0xD76C, 0x682A,
- 0xF62E, 0x6825, 0x6824, 0xD76E, 0x6822, 0x6821, 0x4363, 0xD76F,
- 0x427B, 0x6827, 0x7A70,      0, 0xF62F, 0xD772,      0,      0,
-};
-static const unsigned short utf8_to_euc_E88D[] = {
- 0x6826,      0, 0xD773, 0xD774, 0xD775, 0x6829,      0, 0xD776,
-      0, 0x4170, 0x3755,      0,      0, 0xD777, 0xD778, 0x3141,
- 0x6828, 0xD779, 0x3953, 0xD83E, 0xD763, 0xD77A, 0xD77B, 0xD77C,
- 0x4171,      0,      0,      0,      0,      0,      0,      0,
-      0,      0, 0xF45F,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
- 0xD77D,      0,      0, 0x683A,      0, 0x683B,      0, 0x3259,
- 0xD77E,      0,      0, 0x322E, 0x6838, 0xD821,      0, 0xD822,
-};
-static const unsigned short utf8_to_euc_E88D_x0213[] = {
- 0x6826,      0, 0xD773, 0x7A71, 0xF630, 0x6829,      0, 0x7A72,
-      0, 0x4170, 0x3755,      0,      0, 0xD777, 0xD778, 0x3141,
- 0x6828, 0x7A73, 0x3953, 0xD83E, 0xF62B, 0x7A74, 0xD77B, 0xF631,
- 0x4171,      0,      0,      0,      0,      0,      0,      0,
-      0,      0, 0x7A6D, 0xAE4A,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
- 0xD77D,      0,      0, 0x683A,      0, 0x683B,      0, 0x3259,
- 0xD77E,      0,      0, 0x322E, 0x6838, 0x7A75,      0, 0xF633,
-};
-static const unsigned short utf8_to_euc_E88E[] = {
- 0xD823,      0, 0xD824,      0, 0xD825, 0x682E, 0xD826, 0x6836,
-      0, 0x683D, 0x6837,      0,      0, 0xD827, 0x6835,      0,
-      0,      0, 0xD828, 0x6776, 0xD829, 0xD82A, 0x6833,      0,
- 0xD82B, 0xD82C, 0x682F, 0xD82D, 0xD82E, 0xD82F, 0x3450, 0x6831,
- 0x683C,      0, 0x6832,      0,      0,      0, 0xD830, 0xD831,
- 0x683E, 0xD832, 0x6830, 0x477C, 0xD833, 0xD84C,      0,      0,
-      0, 0x4D69,      0,      0,      0, 0x6839,      0,      0,
-      0,      0,      0,      0,      0, 0x684F, 0xD834, 0xD835,
-};
-static const unsigned short utf8_to_euc_E88E_x0213[] = {
- 0xD823,      0, 0xD824,      0, 0xD825, 0x682E, 0x7A76, 0x6836,
-      0, 0x683D, 0x6837,      0,      0, 0xF636, 0x6835,      0,
-      0,      0, 0x7A77, 0x6776, 0xF637, 0xF638, 0x6833,      0,
- 0x7A78, 0xD82C, 0x682F, 0xF639, 0xD82E, 0xF63A, 0x3450, 0x6831,
- 0x683C,      0, 0x6832,      0,      0,      0, 0xD830, 0x7A79,
- 0x683E, 0x7A7A, 0x6830, 0x477C, 0xD833, 0xD84C,      0,      0,
-      0, 0x4D69,      0,      0,      0, 0x6839,      0,      0,
-      0,      0,      0,      0,      0, 0x684F, 0xD834, 0x7A7B,
-};
-static const unsigned short utf8_to_euc_E88F[] = {
- 0xD836, 0x6847,      0,      0,      0, 0x3F7B,      0, 0xD837,
-      0, 0xD838, 0x3546,      0, 0x365D,      0, 0x6842, 0xD839,
- 0xD83A, 0xD83B,      0, 0x325B, 0xD83C,      0, 0x3E54,      0,
- 0x6845,      0,      0,      0, 0x3A5A, 0xD83D,      0, 0x4551,
- 0x684A,      0,      0,      0,      0,      0,      0,      0,
- 0xD83F, 0x4A6E, 0xD840, 0x6841,      0,      0,      0, 0x325A,
- 0x3856, 0x4929, 0x684B,      0, 0x683F,      0, 0xD841, 0x6848,
- 0xD842, 0xD843,      0, 0x6852, 0xD844, 0x6843,      0,      0,
-};
-static const unsigned short utf8_to_euc_E88F_x0213[] = {
- 0x7A7C, 0x6847,      0,      0,      0, 0x3F7B,      0, 0x7A7D,
-      0, 0xF63B, 0x3546,      0, 0x365D,      0, 0x6842, 0x7A7E,
- 0xF63C, 0x7B21,      0, 0x325B, 0xF63D,      0, 0x3E54,      0,
- 0x6845,      0,      0,      0, 0x3A5A, 0xF63E,      0, 0x4551,
- 0x684A, 0x7B22,      0,      0,      0, 0xF63F,      0,      0,
- 0xD83F, 0x4A6E, 0x7B23, 0x6841,      0,      0,      0, 0x325A,
- 0x3856, 0x4929, 0x684B,      0, 0x683F,      0,      0, 0x6848,
- 0xD842, 0xF640,      0, 0x6852, 0xD844, 0x6843,      0,      0,
-};
-static const unsigned short utf8_to_euc_E890[] = {
-      0, 0xD845,      0, 0x6844, 0x463A,      0, 0xD846, 0x6849,
-      0,      0, 0xD847, 0x6846, 0x4B28, 0x684C, 0x3060, 0xD848,
-      0, 0xD849,      0, 0x6840,      0, 0xD84A,      0,      0,
-      0, 0xD84B,      0,      0,      0,      0,      0,      0,
- 0x684E,      0, 0x684D,      0,      0,      0,      0,      0,
-      0, 0x476B, 0x6854,      0, 0x685F,      0,      0, 0xD84D,
-      0, 0x337E,      0,      0,      0, 0x6862,      0,      0,
- 0x6850, 0xD84E,      0,      0, 0x6855, 0x4D6E,      0,      0,
-};
-static const unsigned short utf8_to_euc_E890_x0213[] = {
-      0, 0x7B24,      0, 0x6844, 0x463A,      0, 0x7B25, 0x6849,
-      0,      0, 0x7B26, 0x6846, 0x4B28, 0x684C, 0x3060, 0xF641,
-      0, 0xF642,      0, 0x6840,      0, 0xF643,      0, 0xF645,
-      0, 0xD84B,      0,      0,      0,      0,      0,      0,
- 0x684E,      0, 0x684D,      0,      0,      0,      0,      0,
-      0, 0x476B, 0x6854,      0, 0x685F,      0,      0, 0xD84D,
-      0, 0x337E,      0,      0,      0, 0x6862,      0,      0,
- 0x6850, 0xF646,      0,      0, 0x6855, 0x4D6E,      0,      0,
-};
-static const unsigned short utf8_to_euc_E891[] = {
-      0,      0,      0,      0,      0, 0xD84F, 0x685E, 0xD850,
- 0xD851, 0x4D55, 0xD852,      0,      0, 0xD853, 0x4E2A, 0xD854,
-      0, 0xD855, 0xD856,      0,      0,      0, 0xD857, 0x4378,
- 0xD858, 0xD859, 0xD85A, 0x336B, 0xD85B,      0,      0,      0,
- 0xD85C, 0x4972, 0x6864, 0x4621, 0xD85D, 0xD85E, 0x3031, 0xD85F,
-      0, 0x685D, 0xD860, 0x6859, 0x4172, 0x6853, 0x685B, 0x6860,
- 0xD861, 0x472C,      0, 0xD862, 0xD863, 0x302A, 0xD864, 0x6858,
- 0xD865, 0x6861, 0x4978,      0, 0xD866, 0xD867,      0,      0,
-};
-static const unsigned short utf8_to_euc_E891_x0213[] = {
-      0,      0,      0,      0,      0, 0xD84F, 0x685E, 0xD850,
- 0x7B28, 0x4D55, 0xF647,      0,      0, 0xD853, 0x4E2A, 0xF648,
-      0, 0xF649, 0xF64A,      0,      0,      0, 0xD857, 0x4378,
- 0xD858, 0xF64B, 0xF64C, 0x336B, 0xF64D,      0,      0, 0x7B29,
- 0xD85C, 0x4972, 0x6864, 0x4621, 0xD85D, 0xF64F, 0x3031, 0xD85F,
-      0, 0x685D, 0xD860, 0x6859, 0x4172, 0x6853, 0x685B, 0x6860,
- 0x7B2A, 0x472C,      0, 0x7B2B, 0xD863, 0x302A, 0xF650, 0x6858,
- 0xF651, 0x6861, 0x4978,      0, 0xF652, 0xD867,      0,      0,
-};
-static const unsigned short utf8_to_euc_E892[] = {
-      0, 0xD868, 0x685C,      0, 0x6857, 0xD869,      0,      0,
-      0,      0,      0, 0x3E55,      0,      0,      0,      0,
- 0x3D2F,      0, 0xD86A, 0xD86B, 0x3C2C, 0xD86C,      0,      0,
-      0, 0x4C58,      0,      0, 0x4947,      0, 0xD86D, 0x6867,
-      0, 0x6870,      0,      0,      0,      0, 0xD86E,      0,
- 0xD86F, 0xD870, 0xD871,      0,      0, 0x685A,      0, 0xD872,
-      0, 0xD873, 0x3377,      0, 0xD874,      0,      0,      0,
- 0x3E78, 0x6865, 0xD875, 0x686A, 0x4173, 0xD876, 0xD877, 0x6866,
-};
-static const unsigned short utf8_to_euc_E892_x0213[] = {
-      0, 0xF653, 0x685C,      0, 0x6857, 0x7B2C,      0,      0,
-      0,      0,      0, 0x3E55,      0,      0,      0,      0,
- 0x3D2F,      0, 0xD86A, 0xD86B, 0x3C2C, 0xD86C,      0, 0xF656,
-      0, 0x4C58,      0,      0, 0x4947,      0, 0x7B2D, 0x6867,
-      0, 0x6870,      0,      0,      0,      0, 0xF657,      0,
- 0xD86F, 0xD870, 0xD871,      0,      0, 0x685A,      0, 0x7B2E,
-      0, 0xD873, 0x3377,      0, 0x7B2F,      0,      0,      0,
- 0x3E78, 0x6865, 0x7B30, 0x686A, 0x4173, 0xD876, 0xF658, 0x6866,
-};
-static const unsigned short utf8_to_euc_E893[] = {
- 0xD878, 0x686D, 0xD879,      0, 0x435F,      0, 0x686E, 0xD87A,
- 0xD87B, 0x4D56, 0x6863, 0x3338, 0xD87C, 0x6869,      0, 0xD87D,
- 0x686C, 0x4C2C,      0, 0xD87E,      0,      0, 0x686F,      0,
-      0, 0x6868, 0x686B,      0, 0xD921,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0, 0xD922,
-      0,      0, 0xD923,      0, 0x4B29,      0, 0x4F21, 0xD924,
- 0xD925, 0xD926, 0xD927,      0, 0x6873,      0,      0, 0xD928,
-      0,      0, 0xD92A, 0xD92B, 0x687A, 0xD92C,      0, 0x6872,
-};
-static const unsigned short utf8_to_euc_E893_x0213[] = {
- 0x7B31, 0x686D, 0x7B32,      0, 0x435F,      0, 0x686E, 0xD87A,
- 0xD87B, 0x4D56, 0x6863, 0x3338, 0xD87C, 0x6869, 0xF65A, 0xF65B,
- 0x686C, 0x4C2C,      0, 0xF65C,      0,      0, 0x686F,      0,
-      0, 0x6868, 0x686B,      0, 0xF655,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0, 0xF65E,
-      0,      0, 0xF65F,      0, 0x4B29,      0, 0x4F21, 0xF660,
- 0xF661, 0xF662, 0xD927,      0, 0x6873,      0,      0, 0xD928,
-      0,      0, 0xF663, 0xD92B, 0x687A, 0xF664,      0, 0x6872,
-};
-static const unsigned short utf8_to_euc_E894[] = {
- 0x3C43,      0, 0xD92D, 0xD92E,      0,      0, 0x6851, 0xD92F,
-      0,      0,      0,      0, 0xD930,      0, 0xD931,      0,
- 0xD932, 0x4A4E,      0, 0x4C22, 0x6879, 0x6878,      0, 0x6874,
- 0x6875,      0, 0x3136,      0, 0xD933,      0, 0xD934, 0x6877,
-      0, 0x6871, 0xD935, 0xD936, 0xD937, 0xD938, 0x4455, 0xD939,
-      0,      0, 0xD93A, 0xD93B, 0x6876, 0x307E,      0, 0xD93C,
-      0,      0, 0xD929, 0xD93D, 0xD93E, 0x4222, 0xD93F,      0,
-      0,      0,      0,      0,      0, 0x4A43,      0, 0xD940,
-};
-static const unsigned short utf8_to_euc_E894_x0213[] = {
- 0x3C43,      0, 0xD92D, 0xD92E,      0,      0, 0x6851, 0xD92F,
-      0,      0,      0,      0, 0xF665,      0, 0xD931,      0,
- 0xD932, 0x4A4E,      0, 0x4C22, 0x6879, 0x6878,      0, 0x6874,
- 0x6875,      0, 0x3136, 0xF666, 0xD933,      0, 0x7B35, 0x6877,
-      0, 0x6871, 0xD935, 0x7B36, 0xF667, 0xF668, 0x4455, 0xD939,
-      0,      0, 0xD93A, 0xF669, 0x6876, 0x307E,      0, 0x7B37,
-      0,      0, 0x7B34, 0xD93D, 0xF66A, 0x4222, 0xD93F,      0,
-      0,      0,      0,      0,      0, 0x4A43, 0xF66F, 0xD940,
-};
-static const unsigned short utf8_to_euc_E895[] = {
- 0x687B, 0x6921,      0, 0x4859,      0,      0, 0xD941,      0,
- 0x687E, 0x3E56, 0x3C49, 0x6923,      0,      0, 0x363E, 0xD942,
- 0xD943, 0xD944, 0xD945, 0xD946,      0, 0x6924, 0xD947, 0x4979,
- 0x687D, 0xD948, 0x6856,      0, 0xD949, 0xD94A, 0xD94B, 0xD94C,
- 0xD94D, 0xD94E, 0xD94F, 0x687C, 0xD950,      0,      0,      0,
- 0x4F4F, 0x4622, 0x4973, 0xD951,      0, 0x692B,      0, 0xD952,
-      0,      0,      0,      0,      0,      0,      0, 0x6931,
-      0, 0xD953, 0xD954, 0xD955,      0, 0xD956, 0x6932, 0xD957,
-};
-static const unsigned short utf8_to_euc_E895_x0213[] = {
- 0x687B, 0x6921,      0, 0x4859,      0,      0, 0xD941,      0,
- 0x687E, 0x3E56, 0x3C49, 0x6923,      0,      0, 0x363E, 0xF66B,
- 0xD943, 0xF670, 0xD945, 0xF671,      0, 0x6924, 0xD947, 0x4979,
- 0x687D, 0x7B38, 0x6856,      0, 0xD949, 0xD94A, 0xF672, 0xD94C,
- 0xD94D, 0xF673, 0xF674, 0x687C, 0x7B39,      0,      0,      0,
- 0x4F4F, 0x4622, 0x4973,      0,      0, 0x692B,      0, 0xF66C,
-      0,      0,      0,      0,      0,      0,      0, 0x6931,
-      0, 0xD953, 0x7B3C, 0xF676,      0, 0xF677, 0x6932, 0xF678,
-};
-static const unsigned short utf8_to_euc_E896[] = {
- 0x6925, 0xD958,      0,      0, 0x4776, 0xD959, 0xD95A, 0x692F,
- 0x6927, 0xD95B, 0x6929, 0xD95C, 0xD95D,      0,      0, 0xD95E,
- 0x6933, 0x6928,      0, 0xD95F, 0x692C,      0,      0, 0x3172,
- 0xD960, 0x4665,      0, 0x692D, 0x6930, 0xD961,      0, 0xD962,
- 0xD963,      0, 0xD964,      0, 0x6926, 0xD965, 0x4126, 0xD966,
- 0x692A, 0x3B27, 0x3F45, 0x3730, 0x4C74, 0xD974, 0x4C79, 0x3D72,
- 0xF461,      0,      0,      0, 0xD967,      0, 0xD968, 0xD969,
- 0xD96A, 0x6937, 0x6935,      0, 0xD96B, 0xD96C, 0xD96D, 0xD96E,
-};
-static const unsigned short utf8_to_euc_E896_x0213[] = {
- 0x6925, 0xF679,      0,      0, 0x4776, 0xD959, 0xF67A, 0x692F,
- 0x6927, 0xD95B, 0x6929, 0xD95C, 0x7B3D,      0,      0, 0x7B3E,
- 0x6933, 0x6928,      0, 0xF67B, 0x692C,      0,      0, 0x3172,
- 0xD960, 0x4665,      0, 0x692D, 0x6930, 0xF67C,      0, 0xF67D,
- 0xD963,      0, 0x7B3F,      0, 0x6926, 0xD965, 0x4126, 0xD966,
- 0x692A, 0x3B27, 0x3F45, 0x3730, 0x4C74, 0x7B3B, 0x4C79, 0x3D72,
- 0x7B40,      0,      0,      0, 0xD967,      0, 0xD968, 0xF723,
- 0xD96A, 0x6937, 0x6935,      0, 0xF724, 0xD96C, 0xD96D, 0xD96E,
-};
-static const unsigned short utf8_to_euc_E897[] = {
-      0, 0x4F4E, 0xD96F,      0,      0,      0,      0, 0xD970,
-      0, 0x6934, 0xD971, 0xD972,      0, 0x4D75, 0xD973, 0x6936,
- 0x6938,      0,      0,      0,      0, 0x6939,      0,      0,
- 0xD975,      0, 0xD976,      0, 0x693C, 0x693A,      0, 0xD977,
- 0xD978,      0,      0,      0, 0x4623, 0x693B, 0xD979,      0,
- 0xD97A, 0x484D, 0x692E,      0,      0, 0xD97B,      0,      0,
-      0,      0,      0, 0xD97C,      0,      0, 0xD97D, 0x3D73,
-      0, 0x693D, 0x6942, 0x4174, 0xD97E,      0, 0x6941, 0xDA21,
-};
-static const unsigned short utf8_to_euc_E897_x0213[] = {
-      0, 0x4F4E, 0xD96F,      0,      0,      0,      0, 0xF725,
-      0, 0x6934, 0xF726, 0x7B41,      0, 0x4D75, 0x7B42, 0x6936,
- 0x6938,      0,      0,      0,      0, 0x6939,      0,      0,
- 0xF727, 0xF728, 0xD976,      0, 0x693C, 0x693A,      0, 0xF729,
- 0xD978, 0xF72A,      0,      0, 0x4623, 0x693B, 0xF72B,      0,
- 0xD97A, 0x484D, 0x692E,      0,      0, 0x7B43,      0,      0,
-      0,      0,      0, 0xD97C,      0,      0, 0xF72C, 0x3D73,
-      0, 0x693D, 0x6942, 0x4174, 0xD97E,      0, 0x6941, 0x7B45,
-};
-static const unsigned short utf8_to_euc_E898[] = {
- 0xDA22,      0, 0x6922,      0, 0xDA23, 0xDA24, 0x6943, 0x4149,
-      0,      0, 0x693E, 0x6940,      0, 0xDA25, 0xDA26,      0,
- 0xDA27, 0xDA28, 0xDA29, 0x693F,      0,      0, 0x5D31, 0x5D22,
- 0xDA2A, 0xDA2B, 0x6945, 0xDA2C,      0,      0, 0xDA2D,      0,
-      0, 0xDA2E, 0x6944,      0,      0,      0,      0, 0xDA2F,
-      0, 0xDA30,      0,      0,      0, 0x4D76,      0, 0x623C,
- 0x6946,      0,      0,      0,      0,      0, 0xDA31,      0,
- 0xDA32,      0, 0xDA33,      0, 0xDA34, 0xDA35,      0, 0x6947,
-};
-static const unsigned short utf8_to_euc_E898_x0213[] = {
- 0xF72D,      0, 0x6922,      0, 0x7B46, 0x7B47, 0x6943, 0x4149,
-      0,      0, 0x693E, 0x6940,      0, 0xDA25, 0xDA26,      0,
- 0x7B48, 0xF72E, 0x7B44, 0x693F,      0,      0, 0x5D31, 0x5D22,
- 0x7B4A, 0xDA2B, 0x6945, 0xDA2C,      0,      0, 0xF72F,      0,
-      0, 0xF730, 0x6944,      0, 0xF731,      0,      0, 0xF732,
-      0, 0x7B4B,      0,      0,      0, 0x4D76,      0, 0x623C,
- 0x6946,      0,      0,      0,      0,      0, 0xDA31,      0,
- 0x7B4C, 0xF734, 0xDA33,      0, 0xF735, 0xDA35,      0, 0x6947,
-};
-static const unsigned short utf8_to_euc_E899[] = {
- 0xDA36, 0xB866, 0xDA37,      0,      0,      0, 0xDA38,      0,
-      0,      0,      0,      0,      0, 0x6948, 0x3857,      0,
- 0x3554,      0, 0xDA39, 0xDA3A, 0x694A, 0x515D, 0xDA3B, 0xDA3C,
- 0xDA3D, 0xDA3E, 0x3575,      0, 0x4E3A, 0xDA3F, 0x3673, 0x694B,
- 0xDA40, 0xDA41, 0xDA42, 0xDA43, 0xDA44,      0,      0, 0x694C,
-      0, 0xDA45,      0, 0x436E, 0xDA46,      0,      0, 0xDA47,
-      0, 0x694D,      0,      0,      0, 0xDA48, 0xDA49, 0xDA4A,
-      0, 0x467A, 0xDA4B, 0x303A,      0,      0,      0,      0,
-};
-static const unsigned short utf8_to_euc_E899_x0213[] = {
- 0xF737, 0x2F68, 0xDA37,      0,      0,      0, 0xDA38,      0,
-      0,      0,      0,      0,      0, 0x6948, 0x3857,      0,
- 0x3554,      0, 0xDA39, 0xF739, 0x694A, 0x515D, 0xF73A, 0x7B4D,
- 0xDA3D, 0xDA3E, 0x3575, 0x7B4E, 0x4E3A, 0xDA3F, 0x3673, 0x694B,
- 0xDA40, 0xDA41, 0x7B50, 0xDA43, 0xDA44,      0,      0, 0x694C,
-      0, 0xDA45,      0, 0x436E, 0x7B52,      0,      0, 0xF73B,
-      0, 0x694D,      0,      0,      0, 0x7B53, 0xDA49, 0xF73C,
-      0, 0x467A, 0xF73D, 0x303A,      0,      0,      0,      0,
-};
-static const unsigned short utf8_to_euc_E89A[] = {
-      0,      0,      0,      0,      0,      0,      0,      0,
- 0xDA6D,      0, 0x3263, 0x6952, 0x6953, 0xDA4C,      0,      0,
-      0, 0xDA4D,      0, 0x694E,      0, 0x3B3D, 0xDA4E,      0,
- 0xDA4F,      0, 0xDA50,      0, 0xDA51,      0,      0,      0,
-      0, 0xDA52,      0, 0x694F, 0x4742,      0, 0xDA53, 0xDA54,
- 0xDA55, 0x6950, 0x6951, 0x695B,      0, 0xDA56,      0, 0x6955,
- 0x6958, 0xDA57,      0, 0xDA58, 0xDA59, 0xDA5A, 0x6954, 0xDA5B,
- 0xDA5C, 0xDA5D,      0,      0,      0,      0,      0, 0xDA5E,
-};
-static const unsigned short utf8_to_euc_E89A_x0213[] = {
-      0,      0,      0,      0,      0,      0,      0, 0xF73E,
- 0xDA6D, 0xF73F, 0x3263, 0x6952, 0x6953, 0xF740,      0,      0,
-      0, 0xF741,      0, 0x694E,      0, 0x3B3D, 0xDA4E,      0,
- 0x7B54,      0, 0xDA50,      0, 0xF742, 0xF743,      0,      0,
-      0, 0xDA52,      0, 0x694F, 0x4742,      0, 0xDA53, 0xDA54,
- 0xF744, 0x6950, 0x6951, 0x695B,      0, 0xDA56,      0, 0x6955,
- 0x6958, 0xF746,      0, 0xF747, 0xDA59, 0xDA5A, 0x6954, 0xDA5B,
- 0x7B55, 0xDA5D,      0,      0,      0,      0,      0, 0xDA5E,
-};
-static const unsigned short utf8_to_euc_E89B[] = {
- 0xDA5F, 0xDA60,      0, 0xDA61, 0x6956, 0xDA62, 0x6957, 0x3C58,
-      0, 0x6959,      0, 0x4341,      0, 0x3756, 0x3342,      0,
-      0, 0xDA63, 0xDA64,      0, 0x695C, 0xDA65,      0, 0xDA66,
-      0, 0x333F, 0xDA67, 0x6961, 0xDA68,      0, 0x695D, 0x6960,
- 0xDA69,      0,      0, 0xDA6A, 0x483A, 0xDA6B,      0, 0xDA6C,
-      0, 0x695E,      0,      0, 0x695F, 0x4948, 0x485A, 0x6962,
-      0,      0,      0,      0,      0,      0,      0,      0,
- 0x427D, 0x696C, 0xDA6E, 0x6968, 0xDA6F, 0xDA70, 0x326B,      0,
-};
-static const unsigned short utf8_to_euc_E89B_x0213[] = {
- 0xDA5F, 0xF748,      0, 0xF749, 0x6956, 0xDA62, 0x6957, 0x3C58,
-      0, 0x6959,      0, 0x4341,      0, 0x3756, 0x3342,      0,
-      0, 0xF74A, 0xDA64,      0, 0x695C, 0xF74B,      0, 0xF74C,
-      0, 0x333F, 0xDA67, 0x6961, 0xDA68,      0, 0x695D, 0x6960,
- 0xDA69,      0,      0, 0xF74D, 0x483A, 0xDA6B, 0xF74E, 0xDA6C,
-      0, 0x695E,      0,      0, 0x695F, 0x4948, 0x485A, 0x6962,
-      0,      0,      0,      0,      0,      0,      0,      0,
- 0x427D, 0x696C, 0x7B56, 0x6968, 0x7B57, 0x7B58, 0x326B,      0,
-};
-static const unsigned short utf8_to_euc_E89C[] = {
- 0x6966,      0, 0x4B2A, 0x6967, 0xDA71, 0xDA72, 0x6964, 0xDA73,
- 0x6965, 0x696A, 0x696D, 0xDA74,      0, 0x696B, 0xDA75, 0xDA76,
- 0xDA77, 0x6969, 0x6963, 0xDA78, 0xDA79,      0,      0,      0,
- 0x4358, 0xDA7A, 0x6974,      0, 0x4C2A,      0, 0xDA7B, 0xDA7C,
-      0, 0xDA7D,      0, 0xDA7E,      0, 0x6972,      0,      0,
- 0xDB21, 0x6973,      0,      0,      0,      0, 0xDB22, 0xDB23,
-      0, 0xDB24, 0xDB25,      0, 0x696E,      0,      0, 0x6970,
-      0, 0xDB26, 0xDB27, 0x6971, 0xDB28, 0xDB29, 0xDB2A, 0x696F,
-};
-static const unsigned short utf8_to_euc_E89C_x0213[] = {
- 0x6966,      0, 0x4B2A, 0x6967, 0xDA71, 0xF750, 0x6964, 0xF751,
- 0x6965, 0x696A, 0x696D, 0x7B59,      0, 0x696B, 0xF752, 0xDA76,
- 0xF753, 0x6969, 0x6963, 0xF754, 0xDA79,      0,      0,      0,
- 0x4358, 0xF755, 0x6974,      0, 0x4C2A,      0, 0xDA7B, 0xF756,
-      0, 0xF757,      0, 0xF758,      0, 0x6972,      0,      0,
- 0xDB21, 0x6973,      0,      0,      0,      0, 0xDB22, 0xDB23,
-      0, 0xF759, 0xDB25,      0, 0x696E,      0,      0, 0x6970,
-      0, 0xDB26, 0xF75A, 0x6971, 0xDB28, 0xDB29, 0xF75B, 0x696F,
-};
-static const unsigned short utf8_to_euc_E89D[] = {
- 0xDB2B,      0,      0, 0xDB2C,      0, 0xDB2D,      0,      0,
-      0, 0x4066,      0, 0x4F39, 0x6978, 0xDB2E, 0x6979,      0,
-      0,      0,      0, 0x6A21,      0, 0x3F2A,      0, 0x697B,
- 0xDB2F, 0x697E,      0,      0,      0, 0xDB30,      0, 0x6976,
- 0x6975, 0xDB31,      0, 0x6A22, 0xDB32, 0xDB33, 0x325C,      0,
- 0x697C,      0, 0x6A23,      0,      0,      0, 0x697D, 0xDB34,
-      0, 0xDB35, 0xDB36,      0, 0x697A,      0, 0x4433,      0,
- 0x6977,      0,      0, 0xDB37,      0,      0,      0, 0x4768,
-};
-static const unsigned short utf8_to_euc_E89D_x0213[] = {
- 0xF75C,      0,      0, 0xF75D,      0, 0xDB2D,      0,      0,
-      0, 0x4066,      0, 0x4F39, 0x6978, 0xDB2E, 0x6979,      0,
-      0, 0xF75E,      0, 0x6A21,      0, 0x3F2A,      0, 0x697B,
- 0xF75F, 0x697E,      0,      0,      0, 0xDB30,      0, 0x6976,
- 0x6975, 0xDB31,      0, 0x6A22, 0xF760, 0xF761, 0x325C,      0,
- 0x697C,      0, 0x6A23,      0,      0,      0, 0x697D, 0xDB34,
-      0, 0x7B5A, 0xF762,      0, 0x697A,      0, 0x4433,      0,
- 0x6977,      0,      0, 0xDB37, 0xF763,      0,      0, 0x4768,
-};
-static const unsigned short utf8_to_euc_E89E[] = {
-      0,      0, 0x6A27, 0xDB38, 0xDB39, 0xDB3A, 0xDB3B, 0xDB3C,
- 0xDB3D, 0xDB3E,      0, 0xDB3F, 0xDB40, 0x4D3B,      0,      0,
- 0xDB41,      0,      0, 0xDB42,      0, 0xDB43,      0, 0xDB44,
- 0xDB45, 0xDB46,      0,      0,      0,      0, 0xDB47, 0x6A26,
- 0xDB48,      0, 0x6A25, 0xDB49,      0,      0,      0, 0xDB4A,
-      0,      0,      0, 0x6A2E, 0xDB4B, 0xDB4C, 0xDB4D, 0x6A28,
-      0, 0xDB4E,      0, 0x6A30,      0, 0xDB4F,      0,      0,
-      0,      0, 0x4D66, 0x6A33,      0, 0x6A2A, 0xDB50, 0xDB51,
-};
-static const unsigned short utf8_to_euc_E89E_x0213[] = {
-      0,      0, 0x6A27, 0xDB38, 0xDB39, 0xDB3A, 0xDB3B, 0x7B5B,
- 0x7B5C, 0xF767,      0, 0xF768, 0xDB40, 0x4D3B,      0,      0,
- 0xDB41,      0,      0, 0xF769,      0, 0xDB43,      0, 0xDB44,
- 0xDB45, 0xDB46,      0,      0,      0,      0, 0xDB47, 0x6A26,
- 0xF76A,      0, 0x6A25, 0xDB49,      0,      0,      0, 0xF766,
-      0,      0,      0, 0x6A2E, 0x7B5D, 0x7B5E, 0xDB4D, 0x6A28,
-      0, 0xDB4E,      0, 0x6A30,      0, 0x7B5F,      0,      0,
-      0,      0, 0x4D66, 0x6A33,      0, 0x6A2A, 0xF76D, 0xDB51,
-};
-static const unsigned short utf8_to_euc_E89F[] = {
- 0x6A2B, 0xDB52,      0,      0, 0x6A2F,      0, 0x6A32, 0x6A31,
- 0xDB53, 0xDB54, 0xDB55, 0x6A29,      0,      0, 0xDB56,      0,
- 0x6A2C,      0, 0x6A3D,      0,      0, 0xDB57, 0xDB58,      0,
-      0, 0xDB59, 0xDB5A,      0, 0xDB5B,      0,      0, 0xDB5C,
- 0x6A36,      0, 0xDB5D, 0xDB5E, 0xDB5F,      0,      0,      0,
-      0,      0, 0xDB60, 0xDB61,      0, 0xDB62,      0, 0x6A34,
-      0, 0xDB63, 0x6A35, 0xDB64,      0,      0, 0x6A3A, 0x6A3B,
- 0xDB65, 0x332A, 0xDB66, 0x3542,      0,      0, 0x6A39, 0xDB67,
-};
-static const unsigned short utf8_to_euc_E89F_x0213[] = {
- 0x6A2B, 0xF76F,      0,      0, 0x6A2F,      0, 0x6A32, 0x6A31,
- 0xDB53, 0xDB54, 0xDB55, 0x6A29,      0,      0, 0xF770,      0,
- 0x6A2C,      0, 0x6A3D,      0,      0, 0xDB57, 0x7B61,      0,
-      0, 0xDB59, 0xDB5A,      0, 0xDB5B,      0,      0, 0xF772,
- 0x6A36,      0, 0xDB5D, 0xF774, 0xDB5F, 0xF775, 0xF776,      0,
-      0,      0, 0xF777, 0xF778, 0x7B62, 0xF779,      0, 0x6A34,
-      0, 0xDB63, 0x6A35, 0xDB64,      0, 0xF771, 0x6A3A, 0x6A3B,
- 0xDB65, 0x332A, 0xDB66, 0x3542,      0,      0, 0x6A39, 0xDB67,
-};
-static const unsigned short utf8_to_euc_E8A0[] = {
-      0, 0xDB68,      0, 0xDB69,      0, 0x6A24, 0xDB6A, 0xF464,
-      0, 0xDB6B, 0xDB6C, 0xDB6D,      0, 0x6A38, 0x6A3C, 0x6A37,
- 0xDB6E, 0x6A3E, 0xDB70, 0xDB71, 0xDB72, 0x6A40, 0x6A3F,      0,
- 0xDB73, 0xDB6F, 0xDB74, 0xDB75, 0xDB76,      0, 0xDB77, 0xDB78,
-      0, 0x6A42, 0x6A41, 0x695A,      0,      0,      0, 0x6A46,
- 0xDB79,      0,      0,      0,      0, 0xDB7A, 0xDB7B,      0,
- 0xDB7C, 0x6A43, 0xDB7D,      0,      0, 0xDB7E, 0x6A44,      0,
-      0, 0x6A45, 0xDC21, 0x6A47, 0xDC22,      0,      0,      0,
-};
-static const unsigned short utf8_to_euc_E8A0_x0213[] = {
-      0, 0xF77A,      0, 0xF77B,      0, 0x6A24, 0x7B63,      0,
-      0, 0xDB6B, 0x7B64, 0xF77C,      0, 0x6A38, 0x6A3C, 0x6A37,
- 0x7B65, 0x6A3E, 0xDB70, 0xF77D, 0x7B66, 0x6A40, 0x6A3F,      0,
- 0xDB73, 0xDB6F, 0xDB74, 0xDB75, 0xDB76,      0, 0xDB77, 0x7B67,
-      0, 0x6A42, 0x6A41, 0x695A,      0,      0,      0, 0x6A46,
- 0xF77E,      0,      0,      0,      0, 0xDB7A, 0xF821,      0,
- 0xDB7C, 0x6A43, 0xF822,      0,      0, 0xDB7E, 0x6A44,      0,
-      0, 0x6A45, 0xDC21, 0x6A47, 0xF823,      0,      0,      0,
-};
-static const unsigned short utf8_to_euc_E8A1[] = {
- 0x376C, 0xDC23, 0x6A49, 0xDC24, 0x6A48, 0xDC25, 0x3D30,      0,
- 0xDC26, 0xDC27, 0xDC28, 0xDC29, 0x3954, 0x5E27, 0xDC2A,      0,
-      0, 0xDC2B, 0x6A4A, 0x3D51,      0, 0xDC2C, 0xDC2D, 0x3339,
- 0xDC2E, 0x6A4B, 0xDC2F, 0x3152, 0xDC30, 0x3E57, 0x6A4C, 0xDC31,
- 0xDC32, 0x3955, 0x6A4D, 0x3061, 0xDC33,      0,      0,      0,
- 0x493D, 0xDC34,      0, 0x6A4E,      0,      0,      0,      0,
- 0x3F6A, 0xDC35, 0x6A55,      0,      0, 0x6A52,      0, 0x436F,
-      0, 0xDC36,      0, 0xDC37,      0, 0x6A53, 0x6A50, 0x365E,
-};
-static const unsigned short utf8_to_euc_E8A1_x0213[] = {
- 0x376C, 0xDC23, 0x6A49, 0xDC24, 0x6A48, 0xDC25, 0x3D30,      0,
- 0xDC26, 0xDC27, 0xF825, 0xDC29, 0x3954, 0x5E27, 0xDC2A,      0,
-      0, 0xDC2B, 0x6A4A, 0x3D51,      0, 0xDC2C, 0xDC2D, 0x3339,
- 0xF826, 0x6A4B, 0xDC2F, 0x3152, 0xDC30, 0x3E57, 0x6A4C, 0xF827,
- 0xDC32, 0x3955, 0x6A4D, 0x3061, 0xF828,      0,      0,      0,
- 0x493D, 0xF82B,      0, 0x6A4E,      0,      0,      0, 0xF82D,
- 0x3F6A, 0xDC35, 0x6A55,      0,      0, 0x6A52,      0, 0x436F,
-      0, 0xDC36,      0, 0xDC37,      0, 0x6A53, 0x6A50, 0x365E,
-};
-static const unsigned short utf8_to_euc_E8A2[] = {
- 0xDC38, 0x6A4F, 0x6A56,      0,      0,      0,      0,      0,
- 0x3736,      0,      0, 0x425E,      0, 0x6A5C,      0,      0,
-      0,      0, 0x6A58,      0,      0,      0, 0x4235, 0x6A57,
- 0xDC39, 0x6A5A, 0xDC3A, 0xDC3B, 0xDC3C,      0, 0x6A51, 0xDC3D,
- 0xDC3E,      0, 0x6A5B,      0, 0x6A5D,      0,      0,      0,
- 0xDC3F,      0, 0xDC40, 0x486F,      0,      0, 0x6A59,      0,
- 0x6A5E, 0x6A60,      0,      0, 0x3853, 0x6A54,      0, 0x3041,
-      0,      0, 0xDC41,      0,      0, 0xDC42, 0xDC43, 0x6A5F,
-};
-static const unsigned short utf8_to_euc_E8A2_x0213[] = {
- 0xDC38, 0x6A4F, 0x6A56,      0,      0,      0,      0,      0,
- 0x3736,      0,      0, 0x425E,      0, 0x6A5C,      0,      0,
-      0,      0, 0x6A58,      0,      0,      0, 0x4235, 0x6A57,
- 0x7B68, 0x6A5A, 0xDC3A, 0xDC3B, 0xDC3C,      0, 0x6A51, 0xDC3D,
- 0xF82E,      0, 0x6A5B,      0, 0x6A5D,      0,      0,      0,
- 0xDC3F,      0, 0x7B69, 0x486F,      0,      0, 0x6A59,      0,
- 0x6A5E, 0x6A60,      0,      0, 0x3853, 0x6A54,      0, 0x3041,
-      0,      0, 0xDC41,      0, 0xF82F, 0xF830, 0xF831, 0x6A5F,
-};
-static const unsigned short utf8_to_euc_E8A3[] = {
- 0xDC44, 0x3A5B, 0x4E76, 0x6A61, 0x6A62, 0x4175,      0,      0,
-      0,      0, 0xDC45, 0xDC46, 0xDC47, 0xDC48, 0xDC49, 0x4E22,
-      0, 0xDC4A, 0xDC4B, 0xDC4C, 0x6A63, 0x4D35,      0,      0,
- 0x6A64, 0x6A65,      0, 0xDC4D, 0x4A64, 0x6A66, 0xDC4E, 0x3A40,
-      0, 0x4E23,      0,      0,      0,      0,      0, 0xDC4F,
- 0x6A6B,      0,      0,      0,      0,      0,      0, 0xDC50,
- 0xDC51, 0xDC52, 0x6A6C, 0x3E58, 0x6A6A, 0xDC53,      0, 0xDC54,
- 0x4D67, 0x6A67,      0,      0, 0x6A69, 0x403D, 0x3F7E,      0,
-};
-static const unsigned short utf8_to_euc_E8A3_x0213[] = {
- 0xF832, 0x3A5B, 0x4E76, 0x6A61, 0x6A62, 0x4175,      0,      0,
-      0,      0, 0x7B6A, 0xDC46, 0xDC47, 0xDC48, 0x7B6B, 0x4E22,
-      0, 0xF835, 0xF833, 0xF836, 0x6A63, 0x4D35,      0,      0,
- 0x6A64, 0x6A65,      0, 0xF837, 0x4A64, 0x6A66, 0xDC4E, 0x3A40,
-      0, 0x4E23,      0,      0,      0,      0,      0, 0xDC4F,
- 0x6A6B,      0,      0,      0,      0,      0,      0, 0xDC50,
- 0xF838, 0xF839, 0x6A6C, 0x3E58, 0x6A6A, 0x7B6D,      0, 0xDC54,
- 0x4D67, 0x6A67,      0,      0, 0x6A69, 0x403D, 0x3F7E,      0,
-};
-static const unsigned short utf8_to_euc_E8A4[] = {
-      0, 0xDC55, 0x6A68,      0, 0x6A6D,      0, 0xDC56, 0x4A23,
-      0,      0, 0x6A6F,      0, 0x6A6E, 0xDC57, 0xDC58, 0xDC59,
- 0x336C,      0, 0x4B2B, 0x6A70,      0, 0xDC5A, 0xDC5B,      0,
- 0xDC5C, 0xDC5D, 0xDC5E,      0, 0xDC5F, 0x6A7C, 0x6A72,      0,
- 0xDC60,      0,      0,      0,      0, 0x6A73, 0xDC61, 0xDC62,
- 0xDC63,      0, 0x6A74, 0x6A75,      0,      0,      0,      0,
- 0xDC64, 0xDC65, 0xDC66,      0,      0, 0xDC67, 0x6A79,      0,
- 0x6A7A, 0xDC68, 0xDC69, 0x6A78,      0,      0, 0xDC6A,      0,
-};
-static const unsigned short utf8_to_euc_E8A4_x0213[] = {
-      0, 0xF83B, 0x6A68,      0, 0x6A6D,      0, 0xDC56, 0x4A23,
-      0,      0, 0x6A6F,      0, 0x6A6E, 0xDC57, 0xDC58, 0xDC59,
- 0x336C,      0, 0x4B2B, 0x6A70,      0, 0xDC5A, 0xDC5B,      0,
- 0x7B70, 0x7B71, 0x7B72,      0, 0x7B6E, 0x6A7C, 0x6A72,      0,
- 0xDC60,      0,      0,      0,      0, 0x6A73, 0xDC61, 0x7B73,
- 0xDC63,      0, 0x6A74, 0x6A75,      0,      0,      0,      0,
- 0x7B74, 0xDC65, 0x7B75,      0,      0, 0xDC67, 0x6A79, 0xF83D,
- 0x6A7A, 0x7B76, 0xDC69, 0x6A78,      0,      0, 0xDC6A,      0,
-};
-static const unsigned short utf8_to_euc_E8A5[] = {
- 0xDC6B, 0x6A76, 0xDC6C, 0x6A71, 0x6A77, 0xDC6D, 0xDC6E,      0,
-      0, 0xDC6F,      0,      0, 0x6A7B, 0x7037,      0, 0xDC70,
-      0,      0, 0xDC71,      0,      0,      0, 0x3228, 0xDC72,
-      0,      0, 0xDC73, 0xDC74, 0xDC75,      0, 0x6A7E, 0x365F,
- 0x6A7D, 0xDC76, 0xDC77, 0xDC78, 0x6B22,      0, 0x6B21,      0,
-      0,      0, 0x6B24, 0xDC79,      0, 0x6B23, 0xDC7A, 0x6B25,
- 0xDC7B,      0, 0x3D31, 0xDC7C, 0x6B26, 0xDC7D,      0, 0x6B27,
-      0,      0, 0xDC7E, 0xDD21, 0xDD22, 0xDD23, 0x6B28, 0x403E,
-};
-static const unsigned short utf8_to_euc_E8A5_x0213[] = {
- 0x7B77, 0x6A76, 0xF83F, 0x6A71, 0x6A77, 0xF840, 0xDC6E,      0,
-      0, 0xF841,      0,      0, 0x6A7B, 0x7037,      0, 0xDC70,
-      0,      0, 0xDC71,      0,      0,      0, 0x3228, 0xDC72,
-      0,      0, 0xDC73, 0xDC74, 0xDC75,      0, 0x6A7E, 0x365F,
- 0x6A7D, 0xDC76, 0xF844, 0xDC78, 0x6B22,      0, 0x6B21,      0,
-      0,      0, 0x6B24, 0xDC79,      0, 0x6B23, 0xDC7A, 0x6B25,
- 0xDC7B,      0, 0x3D31, 0xDC7C, 0x6B26, 0xDC7D,      0, 0x6B27,
-      0,      0, 0xDC7E, 0xDD21, 0xDD22, 0xDD23, 0x6B28, 0x403E,
-};
-static const unsigned short utf8_to_euc_E8A6[] = {
-      0, 0x4D57,      0, 0x6B29,      0,      0, 0x4A24, 0x4746,
- 0x6B2A, 0xDD24, 0x6B2B, 0x382B,      0, 0xDD25,      0, 0x352C,
- 0xDD26,      0,      0, 0x6B2C, 0xDD27, 0xDD28, 0x3B6B, 0x4741,
- 0x6B2D,      0, 0x3350, 0xDD29, 0xDD2A,      0,      0, 0xDD2B,
- 0xDD2C, 0x6B2E,      0,      0,      0, 0xDD2D, 0x6B30, 0x4D77,
-      0, 0x6B2F, 0x3F46,      0, 0x6B31,      0,      0, 0x6B32,
- 0xDD2E,      0, 0x6B33, 0x3451, 0xDD2F, 0xDD30, 0xDD31, 0xDD32,
-      0,      0, 0x6B34,      0, 0xDD33, 0x6B35,      0, 0x6B36,
-};
-static const unsigned short utf8_to_euc_E8A6_x0213[] = {
- 0xF845, 0x4D57,      0, 0x6B29,      0,      0, 0x4A24, 0x4746,
- 0x6B2A, 0xF846, 0x6B2B, 0x382B,      0, 0xDD25,      0, 0x352C,
- 0xF847,      0,      0, 0x6B2C, 0x7B78, 0xDD28, 0x3B6B, 0x4741,
- 0x6B2D,      0, 0x3350, 0xDD29, 0xDD2A,      0,      0, 0xF848,
- 0xDD2C, 0x6B2E,      0,      0,      0, 0xDD2D, 0x6B30, 0x4D77,
-      0, 0x6B2F, 0x3F46,      0, 0x6B31,      0,      0, 0x6B32,
- 0xF849,      0, 0x6B33, 0x3451, 0xDD2F, 0xDD30, 0xDD31, 0xF84A,
-      0,      0, 0x6B34,      0, 0xDD33, 0x6B35,      0, 0x6B36,
-};
-static const unsigned short utf8_to_euc_E8A7[] = {
- 0x6B37,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0, 0x3351,      0, 0xDD34, 0xDD35, 0xDD36, 0xDD37,
- 0xDD38,      0, 0x6B38,      0, 0x6B39, 0x6B3A,      0,      0,
-      0,      0,      0, 0x3272,      0, 0xDD39, 0x3F28, 0x6B3B,
-      0, 0xDD3A,      0, 0xDD3B,      0, 0xDD3C,      0,      0,
-      0, 0xDD3D,      0, 0xDD3E, 0x6B3C,      0, 0xDD3F,      0,
- 0x6B3D, 0xDD40,      0,      0,      0, 0xDD41,      0, 0xDD42,
-};
-static const unsigned short utf8_to_euc_E8A7_x0213[] = {
- 0x6B37,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0, 0x3351,      0, 0x7B7A, 0xDD35, 0xF84B, 0xDD37,
- 0xF84C,      0, 0x6B38,      0, 0x6B39, 0x6B3A,      0,      0,
-      0,      0,      0, 0x3272,      0, 0x7B7B, 0x3F28, 0x6B3B,
-      0, 0xDD3A,      0, 0xF84D,      0, 0xDD3C,      0,      0,
-      0, 0xF84F,      0, 0xF850, 0x6B3C,      0, 0x7B7C,      0,
- 0x6B3D, 0xDD40,      0,      0,      0, 0xF851,      0, 0xF852,
-};
-static const unsigned short utf8_to_euc_E8A8[] = {
- 0x3840,      0, 0x447B, 0x6B3E, 0xDD43, 0xDD44,      0, 0xDD45,
- 0x3757,      0, 0x3F56,      0, 0x6B41,      0, 0x4624, 0xDD46,
- 0x6B40, 0xDD47, 0xDD48, 0x3731, 0xDD49, 0xDD4A, 0x6B3F, 0x4277,
- 0x352D,      0,      0, 0x6B42,      0, 0x6B43, 0xDD4B, 0x3E59,
- 0xDD4C,      0, 0xDD4D, 0x376D, 0xDD4E, 0x6B44, 0xDD4F,      0,
-      0,      0, 0x4B2C, 0xDD50, 0xDD51, 0x405F,      0, 0xDD52,
-      0, 0x3576,      0, 0x4C75, 0x414A, 0xDD53, 0x6B45, 0xDD54,
-      0,      0, 0x3F47, 0x4370, 0x3E5A, 0xDD55, 0xDD56,      0,
-};
-static const unsigned short utf8_to_euc_E8A8_x0213[] = {
- 0x3840,      0, 0x447B, 0x6B3E, 0xDD43, 0xDD44,      0, 0xDD45,
- 0x3757,      0, 0x3F56,      0, 0x6B41,      0, 0x4624, 0xDD46,
- 0x6B40, 0xF854, 0x7B7D, 0x3731, 0xF855, 0x7B7E, 0x6B3F, 0x4277,
- 0x352D,      0,      0, 0x6B42,      0, 0x6B43, 0xDD4B, 0x3E59,
- 0xDD4C, 0xF857, 0x7C21, 0x376D, 0xDD4E, 0x6B44, 0xDD4F,      0,
-      0,      0, 0x4B2C, 0xDD50, 0xDD51, 0x405F,      0, 0xDD52,
-      0, 0x3576,      0, 0x4C75, 0x414A, 0xF858, 0x6B45, 0x7C22,
-      0,      0, 0x3F47, 0x4370, 0x3E5A, 0xDD55, 0xF859,      0,
-};
-static const unsigned short utf8_to_euc_E8A9[] = {
- 0xDD57, 0x6B46,      0, 0xDD58,      0, 0xDD59, 0x6B49, 0xDD5A,
- 0x6B4A, 0xDD5B,      0,      0,      0, 0xDD5C, 0xDD5D,      0,
- 0x3A3E, 0x4242, 0x6B48, 0xDD5E, 0x3E5B, 0x493E, 0xDD5F, 0xDD60,
- 0xDD61,      0,      0, 0x6B47, 0xDD62, 0xDD63, 0x3B6C,      0,
- 0x3153, 0xDD64, 0x6B4E, 0x3758,      0, 0xDD65, 0x3B6E, 0xDD66,
-      0, 0x3B6D,      0, 0x4F4D, 0x6B4D, 0x6B4C, 0x4127,      0,
- 0x354D, 0x4F43, 0x333A, 0x3E5C,      0, 0xDD67, 0xDD68, 0xDD69,
-      0, 0xDD6A, 0xDD6B, 0xDD6C, 0x6B4B,      0, 0xDD6D, 0xDD6E,
-};
-static const unsigned short utf8_to_euc_E8A9_x0213[] = {
- 0xDD57, 0x6B46,      0, 0xDD58,      0, 0xF85A, 0x6B49, 0x7C23,
- 0x6B4A, 0xDD5B,      0,      0,      0, 0xF85B, 0x7C24,      0,
- 0x3A3E, 0x4242, 0x6B48, 0xDD5E, 0x3E5B, 0x493E, 0xDD5F, 0xDD60,
- 0xF85C,      0,      0, 0x6B47, 0xDD62, 0x7C25, 0x3B6C,      0,
- 0x3153, 0x7C26, 0x6B4E, 0x3758,      0, 0xDD65, 0x3B6E, 0xDD66,
-      0, 0x3B6D,      0, 0x4F4D, 0x6B4D, 0x6B4C, 0x4127,      0,
- 0x354D, 0x4F43, 0x333A, 0x3E5C,      0, 0x7C27, 0xDD68, 0xDD69,
-      0, 0x7C28, 0xDD6B, 0xDD6C, 0x6B4B,      0, 0xDD6D, 0xDD6E,
-};
-static const unsigned short utf8_to_euc_E8AA[] = {
- 0xDD6F,      0, 0x6B50, 0xDD70, 0x6B51, 0x6B4F, 0xDD71, 0x3858,
-      0, 0x4D40,      0, 0xDD72, 0x3B6F, 0x4727,      0, 0xDD73,
- 0xDD74, 0x6B54, 0xDD75, 0x4040,      0, 0x4342, 0xDD76, 0xDD77,
- 0x4D36, 0xDD78, 0x6B57,      0,      0,      0, 0x386C, 0xDD79,
- 0x403F, 0x6B53,      0, 0x6B58, 0x386D, 0x6B55, 0x6B56, 0xDD7A,
- 0x6B52, 0xDD7B,      0,      0, 0x4062, 0x4649, 0xDD7C, 0xDD7D,
- 0x432F,      0, 0x325D, 0xDD7E,      0,      0, 0xDE21, 0xDE22,
-      0, 0x4870,      0, 0xDE23, 0x3543,      0, 0xDE24, 0x4434,
-};
-static const unsigned short utf8_to_euc_E8AA_x0213[] = {
- 0xDD6F,      0, 0x6B50, 0xDD70, 0x6B51, 0x6B4F, 0xDD71, 0x3858,
-      0, 0x4D40,      0, 0xDD72, 0x3B6F, 0x4727,      0, 0xDD73,
- 0xF85E, 0x6B54, 0xDD75, 0x4040,      0, 0x4342, 0xDD76, 0xDD77,
- 0x4D36, 0xDD78, 0x6B57,      0,      0,      0, 0x386C, 0xDD79,
- 0x403F, 0x6B53,      0, 0x6B58, 0x386D, 0x6B55, 0x6B56, 0x7C29,
- 0x6B52, 0xDD7B,      0,      0, 0x4062, 0x4649, 0xF85D, 0xDD7D,
- 0x432F,      0, 0x325D, 0xDD7E,      0,      0, 0xDE21, 0xF85F,
-      0, 0x4870,      0, 0xDE23, 0x3543,      0, 0xF860, 0x4434,
-};
-static const unsigned short utf8_to_euc_E8AB[] = {
-      0,      0, 0x6B5B, 0xDE25, 0x6B59,      0, 0xDE26, 0x434C,
- 0xDE27, 0xDE28, 0xDE29, 0x4041, 0x3452, 0x6B5A,      0, 0x3F5B,
-      0, 0xDE2A, 0x4E4A, 0xDE2B, 0xDE2C, 0xDE2D, 0x4F40, 0xDE2E,
-      0,      0, 0x6B5C, 0x6B67, 0x4435, 0xDE2F, 0x6B66, 0xDE30,
- 0x6B63, 0x6B6B, 0x6B64,      0, 0x6B60,      0, 0x447C, 0x6B5F,
-      0,      0,      0, 0x6B5D, 0xDE31, 0x4D21, 0x3B70,      0,
- 0xDE32, 0x6B61,      0, 0x6B5E, 0xDE33, 0xDE34, 0xDE35, 0x6B65,
- 0x3D74,      0, 0x3841,      0, 0xDE36,      0, 0x427A, 0xDE37,
-};
-static const unsigned short utf8_to_euc_E8AB_x0213[] = {
-      0,      0, 0x6B5B, 0xDE25, 0x6B59,      0, 0xDE26, 0x434C,
- 0xDE27, 0xDE28, 0xDE29, 0x4041, 0x3452, 0x6B5A,      0, 0x3F5B,
- 0x7C2A, 0xDE2A, 0x4E4A, 0xDE2B, 0xDE2C, 0xDE2D, 0x4F40, 0xF861,
-      0,      0, 0x6B5C, 0x6B67, 0x4435, 0xDE2F, 0x6B66, 0x7C2B,
- 0x6B63, 0x6B6B, 0x6B64,      0, 0x6B60,      0, 0x447C, 0x6B5F,
-      0,      0,      0, 0x6B5D, 0xDE31, 0x4D21, 0x3B70,      0,
- 0xDE32, 0x6B61,      0, 0x6B5E, 0x7C2C, 0xDE34, 0x7C2D, 0x6B65,
- 0x3D74,      0, 0x3841,      0, 0xF862,      0, 0x427A, 0xDE37,
-};
-static const unsigned short utf8_to_euc_E8AC[] = {
- 0x4B45, 0x315A, 0x3062,      0, 0x4625, 0xDE38, 0xDE39, 0x6B69,
-      0,      0, 0xDE3F, 0xDE3A, 0x6B68,      0, 0x4666,      0,
- 0x6B6D, 0xDE3B,      0,      0, 0x6B62,      0, 0x6B6C, 0x6B6E,
-      0, 0x382C, 0x6B6A, 0x3956, 0xDE3C, 0x3C55, 0xDE3D, 0xDE3E,
- 0x6B6F, 0x4D58,      0,      0,      0,      0, 0x6B72,      0,
- 0x6B75,      0,      0, 0x6B73, 0x4935, 0xDE40,      0,      0,
- 0xDE41,      0,      0, 0x6B70,      0,      0,      0, 0xDE42,
-      0, 0x3660,      0,      0, 0xDE43,      0, 0x6B74,      0,
-};
-static const unsigned short utf8_to_euc_E8AC_x0213[] = {
- 0x4B45, 0x315A, 0x3062,      0, 0x4625, 0xF865, 0xDE39, 0x6B69,
-      0,      0, 0xF864, 0xDE3A, 0x6B68, 0xF866, 0x4666,      0,
- 0x6B6D, 0xDE3B,      0,      0, 0x6B62,      0, 0x6B6C, 0x6B6E,
-      0, 0x382C, 0x6B6A, 0x3956, 0xF867, 0x3C55, 0xDE3D, 0xF868,
- 0x6B6F, 0x4D58,      0,      0,      0,      0, 0x6B72,      0,
- 0x6B75,      0,      0, 0x6B73, 0x4935, 0xF869,      0,      0,
- 0xDE41,      0,      0, 0x6B70,      0,      0,      0, 0xDE42,
-      0, 0x3660,      0,      0, 0xDE43,      0, 0x6B74,      0,
-};
-static const unsigned short utf8_to_euc_E8AD[] = {
-      0, 0x6B76, 0xDE44, 0xDE45, 0xDE46, 0xDE47, 0xDE48,      0,
- 0xDE49, 0x6B7A,      0,      0, 0x6B77, 0xDE4E, 0x6B79, 0x6B78,
-      0,      0, 0xDE4A, 0xDE4B, 0xDE4C,      0, 0x6B7B,      0,
- 0x3C31, 0xDE4D, 0x6B7D, 0x6B7C, 0x4968,      0, 0xDE4F, 0x6C21,
-      0,      0,      0, 0xDE50,      0,      0, 0x3759,      0,
-      0,      0,      0, 0x6B7E, 0x6C22, 0xDE51,      0, 0x6C23,
- 0x3544, 0x6641, 0x3E79,      0, 0x6C24,      0, 0xDE52, 0x386E,
- 0xDE53, 0xDE54,      0,      0, 0xDE55, 0x6C25, 0xDE56, 0xF466,
-};
-static const unsigned short utf8_to_euc_E8AD_x0213[] = {
-      0, 0x6B76, 0xDE44, 0xF86A, 0xDE46, 0xDE47, 0x7C31,      0,
- 0xDE49, 0x6B7A,      0,      0, 0x6B77, 0xDE4E, 0x6B79, 0x6B78,
-      0, 0xF86C, 0xDE4A,      0, 0x7C32,      0, 0x6B7B,      0,
- 0x3C31, 0x7C33, 0x6B7D, 0x6B7C, 0x4968,      0, 0xF86D, 0x6C21,
-      0,      0,      0, 0xDE50,      0,      0, 0x3759,      0,
-      0, 0x7C34,      0, 0x6B7E, 0x6C22, 0xDE51,      0, 0x6C23,
- 0x3544, 0x6641, 0x3E79,      0, 0x6C24,      0, 0xF86E, 0x386E,
- 0xDE53, 0xDE54,      0,      0, 0xDE55, 0x6C25, 0xDE56, 0xF86F,
-};
-static const unsigned short utf8_to_euc_E8AE[] = {
- 0x6C26, 0xDE57,      0, 0x3B3E, 0xDE58, 0xDE59,      0,      0,
-      0,      0, 0x5A4E, 0xDE5A, 0x6C27, 0xDE5B, 0x6C28, 0xDE5C,
- 0x3D32,      0, 0x6C29, 0x6C2A, 0xDE5D, 0xDE5E, 0x6C2B,      0,
-      0, 0x6C2C, 0x6C2D,      0, 0xDE5F,      0, 0xDE60, 0xDE61,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-};
-static const unsigned short utf8_to_euc_E8AE_x0213[] = {
- 0x6C26, 0xF870,      0, 0x3B3E, 0xDE58, 0xDE59,      0,      0,
-      0,      0, 0x5A4E, 0xF871, 0x6C27, 0xDE5B, 0x6C28, 0xDE5C,
- 0x3D32,      0, 0x6C29, 0x6C2A, 0xF872, 0xF873, 0x6C2B,      0,
-      0, 0x6C2C, 0x6C2D,      0, 0xF874, 0x7C35, 0xF875, 0xDE61,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-};
-static const unsigned short utf8_to_euc_E8B0[] = {
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0, 0x432B,
- 0xDE62, 0xDE63, 0x6C2E,      0,      0, 0xDE64, 0xDE65, 0x6C30,
-};
-static const unsigned short utf8_to_euc_E8B0_x0213[] = {
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0, 0x432B,
- 0xDE62, 0xF876, 0x6C2E,      0,      0, 0xF878, 0xDE65, 0x6C30,
-};
-static const unsigned short utf8_to_euc_E8B1[] = {
-      0, 0x6C2F,      0,      0,      0, 0xDE66, 0x4626, 0xDE67,
- 0x6C31, 0xDE68, 0x4B2D, 0xDE69, 0x6C32,      0, 0x6C33, 0xDE6A,
- 0x6C34, 0xDE6B,      0, 0xDE6C, 0xDE6D, 0x6C35,      0, 0xDE6E,
- 0xDE6F, 0xDE72, 0x465A, 0xDE70,      0, 0xDE71,      0,      0,
-      0, 0x3E5D, 0x6C36, 0xDE73, 0xDE74,      0, 0xDE75,      0,
- 0xDE76, 0xDE77, 0x396B, 0x502E, 0x6C37, 0xDE78,      0,      0,
-      0,      0,      0, 0xDE79,      0, 0xDE7A, 0xDE7B,      0,
- 0x6C38, 0x493F, 0x6C39, 0xDE7C, 0x6C41,      0, 0xDE7D,      0,
-};
-static const unsigned short utf8_to_euc_E8B1_x0213[] = {
-      0, 0x6C2F,      0,      0,      0, 0xF87B, 0x4626, 0xF87C,
- 0x6C31, 0x7C36, 0x4B2D, 0xDE69, 0x6C32,      0, 0x6C33, 0xF87D,
- 0x6C34, 0xDE6B,      0, 0xDE6C, 0xF87E, 0x6C35,      0, 0xF921,
- 0xDE6F, 0xDE72, 0x465A, 0xDE70,      0, 0xDE71,      0,      0,
-      0, 0x3E5D, 0x6C36, 0xDE73, 0xDE74,      0, 0xDE75,      0,
- 0x7C37, 0xF922, 0x396B, 0x502E, 0x6C37, 0xF923,      0,      0,
-      0,      0,      0, 0xF924,      0, 0xDE7A, 0xDE7B,      0,
- 0x6C38, 0x493F, 0x6C39, 0xDE7C, 0x6C41,      0, 0xDE7D,      0,
-};
-static const unsigned short utf8_to_euc_E8B2[] = {
-      0,      0, 0x6C3A,      0,      0, 0x6C3C, 0xDE7E, 0xDF21,
-      0, 0x6C3B, 0x6C3D, 0xDF22, 0x4B46, 0x6C3E, 0x6C3F,      0,
- 0xDF23,      0, 0xDF24, 0xDF25, 0x6C40,      0,      0,      0,
- 0x6C42, 0xDF26,      0, 0xDF27, 0xDF28, 0x332D, 0x4467,      0,
- 0x4969, 0x3A62, 0x3957,      0, 0xDF29,      0,      0, 0x494F,
- 0x325F, 0x484E, 0x6C45, 0x3453, 0x4055, 0x6C44, 0x6C49, 0x4379,
- 0x4C63,      0, 0x6C47, 0x6C48, 0x352E,      0, 0x6C4A, 0x4763,
- 0x425F, 0xDF2A, 0xDF2B, 0x4871, 0x453D, 0x6C46,      0, 0x4B47,
-};
-static const unsigned short utf8_to_euc_E8B2_x0213[] = {
-      0,      0, 0x6C3A,      0,      0, 0x6C3C, 0xDE7E, 0xDF21,
-      0, 0x6C3B, 0x6C3D, 0xDF22, 0x4B46, 0x6C3E, 0x6C3F,      0,
- 0xDF23,      0, 0xF927, 0xF926, 0x6C40,      0,      0,      0,
- 0x6C42, 0xF928,      0, 0xF92A, 0xDF28, 0x332D, 0x4467,      0,
- 0x4969, 0x3A62, 0x3957,      0, 0xF92B,      0,      0, 0x494F,
- 0x325F, 0x484E, 0x6C45, 0x3453, 0x4055, 0x6C44, 0x6C49, 0x4379,
- 0x4C63,      0, 0x6C47, 0x6C48, 0x352E,      0, 0x6C4A, 0x4763,
- 0x425F, 0xDF2A, 0xDF2B, 0x4871, 0x453D, 0x6C46,      0, 0x4B47,
-};
-static const unsigned short utf8_to_euc_E8B3[] = {
- 0x326C, 0x6C4C, 0x4F28, 0x4442, 0x4F45, 0xDF2C, 0xDF2D, 0x3B71,
- 0x6C4B, 0xDF2E, 0x4231, 0xDF2F,      0, 0x6C5C, 0x4128, 0xDF30,
-      0, 0x4678,      0, 0x4950,      0, 0xDF32, 0xDF31,      0,
-      0, 0xDF33, 0x6C4F, 0x3B3F, 0x3B72, 0xDF34, 0x3E5E,      0,
- 0x4765, 0xDF35, 0x382D, 0x6C4E, 0x6C4D,      0, 0x496A,      0,
- 0xDF36,      0, 0x3C41,      0, 0xDF37, 0x4552,      0, 0xDF38,
- 0xDF39,      0, 0xDF3A,      0, 0xF467, 0xDF3B,      0, 0xDF3C,
- 0xDF3D,      0, 0x6C51, 0x6C52, 0x3958, 0x6C50, 0xDF3E, 0xDF3F,
-};
-static const unsigned short utf8_to_euc_E8B3_x0213[] = {
- 0x326C, 0x6C4C, 0x4F28, 0x4442, 0x4F45, 0xDF2C, 0xDF2D, 0x3B71,
- 0x6C4B, 0xDF2E, 0x4231, 0xDF2F,      0, 0x6C5C, 0x4128, 0xDF30,
-      0, 0x4678,      0, 0x4950,      0, 0xF92D, 0xF92C,      0,
-      0, 0xF92E, 0x6C4F, 0x3B3F, 0x3B72, 0xDF34, 0x3E5E,      0,
- 0x4765, 0x7C39, 0x382D, 0x6C4E, 0x6C4D,      0, 0x496A,      0,
- 0xDF36,      0, 0x3C41,      0, 0xDF37, 0x4552,      0, 0xDF38,
- 0xF930, 0xF931, 0xDF3A,      0, 0x7C3A, 0xDF3B,      0, 0xDF3C,
- 0x7C3B,      0, 0x6C51, 0x6C52, 0x3958, 0x6C50, 0x7C3C, 0xDF3F,
-};
-static const unsigned short utf8_to_euc_E8B4[] = {
-      0, 0xDF40,      0, 0xDF41, 0x6C53, 0x6C54,      0, 0x6C56,
- 0x4223, 0xDF42, 0x6C55, 0x3466,      0, 0x6C58,      0, 0x6C57,
- 0x6C59,      0, 0xDF43, 0x6C5B, 0x6C5D,      0, 0x6C5E, 0xDF44,
-      0,      0,      0, 0xDF45,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-};
-static const unsigned short utf8_to_euc_E8B4_x0213[] = {
-      0, 0xDF40,      0, 0xDF41, 0x6C53, 0x6C54,      0, 0x6C56,
- 0x4223, 0xF933, 0x6C55, 0x3466,      0, 0x6C58, 0xF934, 0x6C57,
- 0x6C59,      0, 0x7C3E, 0x6C5B, 0x6C5D,      0, 0x6C5E, 0xDF44,
-      0,      0,      0, 0x7C3F,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-};
-static const unsigned short utf8_to_euc_E8B5[] = {
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0, 0x4056, 0xDF46, 0x3C4F, 0x6C5F,
-      0, 0xDF47,      0, 0x3352, 0xDF48, 0x6C60, 0xDF49,      0,
- 0x4176, 0x6C61,      0, 0x6C62, 0x496B,      0, 0xF468, 0x352F,
-      0,      0,      0,      0,      0,      0,      0, 0xDF4A,
-};
-static const unsigned short utf8_to_euc_E8B5_x0213[] = {
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0, 0x4056, 0xDF46, 0x3C4F, 0x6C5F,
-      0, 0xDF47,      0, 0x3352, 0xF935, 0x6C60, 0xDF49,      0,
- 0x4176, 0x6C61,      0, 0x6C62, 0x496B,      0,      0, 0x352F,
-      0,      0,      0,      0,      0,      0,      0, 0xDF4A,
-};
-static const unsigned short utf8_to_euc_E8B6[] = {
-      0, 0x6C63, 0xDF4B,      0, 0xDF4C, 0x4436,      0,      0,
- 0xDF4D,      0, 0x315B,      0,      0, 0xDF4E,      0,      0,
- 0xDF4F, 0xDF50,      0,      0,      0, 0xDF51,      0,      0,
-      0, 0x6C64,      0,      0,      0,      0, 0xDF52, 0xDF53,
- 0xDF54,      0,      0, 0x3C71,      0,      0, 0xDF55,      0,
- 0x3F76,      0,      0, 0xDF56, 0xDF57,      0,      0, 0xDF58,
-      0,      0, 0xDF59, 0x422D,      0, 0xDF5A,      0, 0xDF5B,
-      0, 0xDF5C, 0x6C67, 0xDF5D, 0xDF6F,      0, 0x6C66,      0,
-};
-static const unsigned short utf8_to_euc_E8B6_x0213[] = {
-      0, 0x6C63, 0xDF4B,      0, 0xF936, 0x4436,      0,      0,
- 0xDF4D,      0, 0x315B,      0,      0, 0xDF4E,      0,      0,
- 0xDF4F, 0xDF50,      0,      0,      0, 0xF937,      0,      0,
-      0, 0x6C64,      0,      0,      0,      0, 0xDF52, 0xDF53,
- 0xDF54,      0,      0, 0x3C71,      0,      0, 0xF938,      0,
- 0x3F76,      0,      0, 0xDF56, 0xDF57,      0,      0, 0x7C40,
-      0,      0, 0xDF59, 0x422D,      0, 0xDF5A,      0, 0xDF5B,
-      0, 0xDF5C, 0x6C67, 0xDF5D, 0xDF6F,      0, 0x6C66,      0,
-};
-static const unsigned short utf8_to_euc_E8B7[] = {
- 0xDF5E,      0, 0x6C65,      0,      0, 0xDF5F, 0xDF60, 0xDF61,
- 0xDF62,      0, 0xDF63, 0x6C6D, 0x6C6B,      0, 0xDF64, 0x6C68,
-      0, 0xDF65,      0,      0, 0xDF66, 0xDF67, 0x6C6A, 0xDF68,
-      0, 0xDF69, 0x6C69, 0x6C6C,      0, 0x3577,      0, 0x6C70,
-      0, 0x4057,      0, 0x6C71, 0xDF6A, 0xDF6B,      0, 0xDF6C,
- 0x3859,      0, 0x6C6E, 0x6C6F, 0xDF6D,      0,      0, 0x4F29,
- 0xDF6E, 0xDF70, 0xDF71, 0x4437, 0xDF72, 0x4129,      0,      0,
-      0,      0,      0,      0, 0x6C72, 0xDF73,      0, 0x6C75,
-};
-static const unsigned short utf8_to_euc_E8B7_x0213[] = {
- 0xDF5E,      0, 0x6C65,      0,      0, 0xDF5F, 0xF93A, 0xDF61,
- 0xF93B,      0, 0xDF63, 0x6C6D, 0x6C6B,      0, 0x7C41, 0x6C68,
-      0, 0x7C42,      0,      0, 0xDF66, 0xDF67, 0x6C6A, 0x7C43,
-      0, 0xF93C, 0x6C69, 0x6C6C,      0, 0x3577,      0, 0x6C70,
-      0, 0x4057,      0, 0x6C71, 0xDF6A, 0xDF6B,      0, 0xDF6C,
- 0x3859,      0, 0x6C6E, 0x6C6F, 0xF93D,      0,      0, 0x4F29,
- 0xDF6E, 0xDF70, 0xDF71, 0x4437, 0xDF72, 0x4129,      0,      0,
-      0,      0,      0,      0, 0x6C72, 0xF940,      0, 0x6C75,
-};
-static const unsigned short utf8_to_euc_E8B8[] = {
-      0, 0xDF74,      0,      0, 0xDF75, 0xDF76, 0xDF77,      0,
- 0x6C73, 0x6C74, 0x4D59, 0xDF78,      0,      0,      0, 0x4627,
- 0x6C78, 0xDF79,      0,      0, 0xDF7A,      0, 0xDF7B,      0,
-      0,      0,      0,      0,      0, 0x6C76, 0x6C77, 0x6C79,
- 0xDF7C, 0xDF7D, 0xDF7E, 0xE021,      0,      0, 0xE022, 0xE023,
-      0,      0, 0x6D29,      0,      0,      0,      0,      0,
- 0x6C7C, 0xE024,      0, 0xE025, 0x6C7D, 0x6C7B, 0xE026, 0xE027,
- 0xE028, 0xE029,      0,      0,      0, 0xE02A,      0,      0,
-};
-static const unsigned short utf8_to_euc_E8B8_x0213[] = {
-      0, 0xDF74,      0,      0, 0xDF75, 0xDF76, 0xF941,      0,
- 0x6C73, 0x6C74, 0x4D59, 0xDF78, 0xF93E,      0,      0, 0x4627,
- 0x6C78, 0xDF79,      0,      0, 0xF943,      0, 0xF944,      0,
-      0,      0,      0,      0,      0, 0x6C76, 0x6C77, 0x6C79,
- 0x7C44, 0xF945, 0xF946, 0x7C45,      0,      0, 0xE022, 0xF947,
-      0,      0, 0x6D29,      0,      0,      0,      0,      0,
- 0x6C7C, 0xE024,      0, 0xE025, 0x6C7D, 0x6C7B, 0xF94A, 0xE027,
- 0xE028, 0xF94B,      0,      0,      0, 0x7C46,      0,      0,
-};
-static const unsigned short utf8_to_euc_E8B9[] = {
- 0xE02B, 0xE02C, 0x6C7A,      0, 0x447D,      0,      0, 0x6D21,
- 0x6D25, 0x6D22, 0x6C7E, 0xE02D, 0x6D23, 0xE02E, 0xE02F, 0xE030,
- 0x6D24,      0,      0,      0, 0xE031, 0x6D2B,      0,      0,
-      0, 0x6D26,      0, 0xE032, 0xE033, 0xE034, 0xE035, 0x4058,
- 0x6D28, 0xE036, 0xE037, 0x6D2A, 0x6D27,      0,      0,      0,
-      0, 0xE038,      0,      0, 0xE039, 0xE03A,      0, 0xE03B,
- 0xE03C, 0xE03D, 0x6D2D,      0, 0x3D33,      0, 0x6D2C,      0,
-      0, 0xE03E, 0xE03F, 0xE040, 0x6D2E,      0,      0,      0,
-};
-static const unsigned short utf8_to_euc_E8B9_x0213[] = {
- 0xE02B, 0xE02C, 0x6C7A,      0, 0x447D,      0,      0, 0x6D21,
- 0x6D25, 0x6D22, 0x6C7E, 0xF94C, 0x6D23, 0xE02E, 0xE02F, 0xE030,
- 0x6D24,      0,      0,      0, 0xF94D, 0x6D2B,      0,      0,
-      0, 0x6D26,      0, 0xE032, 0xE033, 0xE034, 0xE035, 0x4058,
- 0x6D28, 0xE036, 0xF94E, 0x6D2A, 0x6D27,      0,      0,      0,
-      0, 0xE038,      0,      0, 0xF94F, 0xF950,      0, 0xF951,
- 0x7C47, 0xE03D, 0x6D2D,      0, 0x3D33,      0, 0x6D2C,      0,
-      0, 0xE03E, 0xE03F, 0x7C48, 0x6D2E,      0,      0,      0,
-};
-static const unsigned short utf8_to_euc_E8BA[] = {
-      0, 0x6D2F, 0xE041, 0xE042, 0x6D32, 0x6D31,      0, 0x6D30,
-      0, 0xE043, 0x6D34, 0x6D33,      0, 0x4C76,      0,      0,
- 0xE044, 0x6D36, 0xE045, 0x6D35, 0x6D37, 0xE046,      0,      0,
-      0, 0x6D38, 0xE047, 0xE048,      0, 0xE049, 0xE04A,      0,
-      0, 0x6D3A, 0xE04B,      0,      0,      0,      0, 0xE04C,
-      0, 0xE04D, 0x6D39, 0x3F48, 0x6D3B, 0xE04E, 0xE04F, 0x366D,
- 0x6D3C, 0x6D3E,      0, 0xE050,      0, 0xE051,      0,      0,
-      0,      0, 0xE052, 0xE053,      0,      0, 0x6D3F,      0,
-};
-static const unsigned short utf8_to_euc_E8BA_x0213[] = {
-      0, 0x6D2F, 0xE041, 0xE042, 0x6D32, 0x6D31,      0, 0x6D30,
-      0, 0xE043, 0x6D34, 0x6D33,      0, 0x4C76,      0,      0,
- 0xE044, 0x6D36, 0xE045, 0x6D35, 0x6D37, 0xE046,      0,      0,
- 0xF952, 0x6D38, 0xE047, 0xE048,      0, 0xE049, 0xF953,      0,
-      0, 0x6D3A, 0xE04B,      0,      0,      0,      0, 0xE04C,
-      0, 0xE04D, 0x6D39, 0x3F48, 0x6D3B, 0xE04E, 0xF954, 0x366D,
- 0x6D3C, 0x6D3E,      0, 0xF955,      0, 0xF956, 0xF957,      0,
-      0,      0, 0xE052, 0xF958,      0,      0, 0x6D3F,      0,
-};
-static const unsigned short utf8_to_euc_E8BB[] = {
- 0xE054, 0xE055,      0, 0xE056, 0xE057, 0x6D40, 0x6D3D, 0xE058,
- 0x6D41,      0, 0x3C56, 0x6D42, 0x3530, 0x3733,      0, 0xE059,
-      0, 0xE05A, 0x382E,      0, 0xE05B,      0,      0,      0,
-      0,      0,      0, 0x6D43, 0xE05C,      0,      0, 0x4670,
-      0,      0, 0x453E, 0x6D44,      0,      0,      0,      0,
- 0xE05D,      0,      0, 0x6D47,      0, 0xE064, 0xE05E,      0,
- 0xE05F, 0xE060,      0,      0,      0,      0,      0, 0xE061,
- 0x3C34, 0xE062, 0xE063, 0x6D46, 0x6D45, 0x375A, 0x6D48,      0,
-};
-static const unsigned short utf8_to_euc_E8BB_x0213[] = {
- 0x7C4A, 0xE055,      0, 0xE056, 0xE057, 0x6D40, 0x6D3D, 0xE058,
- 0x6D41,      0, 0x3C56, 0x6D42, 0x3530, 0x3733,      0,      0,
-      0, 0xF95A, 0x382E,      0, 0xF95B,      0,      0,      0,
-      0,      0,      0, 0x6D43, 0xE05C,      0,      0, 0x4670,
-      0,      0, 0x453E, 0x6D44,      0,      0,      0,      0,
- 0xE05D,      0,      0, 0x6D47,      0, 0xE064, 0xE05E,      0,
- 0xE05F, 0xE060,      0,      0,      0,      0,      0, 0xE061,
- 0x3C34, 0xF95D, 0x7C4C, 0x6D46, 0x6D45, 0x375A, 0x6D48,      0,
-};
-static const unsigned short utf8_to_euc_E8BC[] = {
- 0xE065,      0, 0xE066, 0x3353,      0, 0x6D4A,      0, 0xE067,
- 0xE068, 0x3A5C, 0x6D49,      0, 0x6D52,      0,      0, 0xE069,
- 0xE06A,      0, 0x6D4C, 0x6D4E, 0x4A65, 0x6D4B, 0xE06B, 0xE06C,
- 0xE06D, 0x6D4D,      0, 0x6D51, 0x6D4F, 0x3531, 0xE06E, 0x6D50,
- 0xE06F, 0xE070,      0, 0xE071,      0, 0xE072, 0x6D53, 0xE073,
- 0xE074, 0x475A, 0x4E58,      0, 0xE075, 0xE076, 0xE077, 0x3D34,
-      0,      0,      0, 0x6D54, 0xE078, 0xE079, 0xE07A, 0xE07B,
- 0x4D22, 0x6D56, 0xE07C, 0x6D55,      0,      0, 0x6D59, 0x4D41,
-};
-static const unsigned short utf8_to_euc_E8BC_x0213[] = {
- 0xF95F,      0, 0xE066, 0x3353,      0, 0x6D4A,      0, 0xE067,
- 0xF960, 0x3A5C, 0x6D49,      0, 0x6D52,      0,      0, 0xE069,
- 0xE06A,      0, 0x6D4C, 0x6D4E, 0x4A65, 0x6D4B, 0xE06B, 0xF961,
- 0xE06D, 0x6D4D,      0, 0x6D51, 0x6D4F, 0x3531, 0x7C4D, 0x6D50,
- 0xE06F, 0xE070,      0, 0xE071,      0, 0xE072, 0x6D53, 0xE073,
- 0xE074, 0x475A, 0x4E58, 0xF962, 0xE075, 0x7C4E, 0xE077, 0x3D34,
-      0,      0,      0, 0x6D54, 0xE078, 0xE079, 0x7C4F, 0xE07B,
- 0x4D22, 0x6D56, 0xE07C, 0x6D55,      0,      0, 0x6D59, 0x4D41,
-};
-static const unsigned short utf8_to_euc_E8BD[] = {
- 0xE07D, 0xE07E, 0x6D58, 0xE121, 0x336D, 0x6D57, 0x6D5C, 0xE122,
-      0, 0x6D5B,      0,      0, 0x6D5A, 0x4532, 0x6D5D, 0xE123,
-      0, 0xE124, 0xE125, 0xE126, 0xE127, 0xE128,      0, 0x6D5E,
- 0xE129,      0,      0,      0, 0x6D5F, 0xE12A, 0xE12B, 0x396C,
-      0, 0x3725, 0x6D60, 0x6D61, 0x6D62, 0xE12C,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-};
-static const unsigned short utf8_to_euc_E8BD_x0213[] = {
- 0xF963, 0xE07E, 0x6D58, 0xE121, 0x336D, 0x6D57, 0x6D5C, 0xE122,
-      0, 0x6D5B, 0xF964,      0, 0x6D5A, 0x4532, 0x6D5D, 0xE123,
-      0, 0xE124, 0xE125, 0xE126, 0x7C50, 0xE128,      0, 0x6D5E,
- 0xF965,      0,      0,      0, 0x6D5F, 0xE12A, 0xE12B, 0x396C,
-      0, 0x3725, 0x6D60, 0x6D61, 0x6D62, 0xE12C,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-};
-static const unsigned short utf8_to_euc_E8BE[] = {
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0, 0x3F49, 0x6D63, 0xE12D, 0x3C2D, 0x6D64,
- 0xE12E, 0xE12F,      0, 0x6D65, 0xE130, 0xE131, 0xE132, 0x5221,
- 0x517E,      0,      0,      0,      0, 0x6D66, 0x6570, 0x6D67,
- 0x4324, 0x3F2B, 0x4740,      0,      0, 0xE133, 0xE134, 0x6D68,
- 0xE135,      0, 0x4A55, 0x4454, 0x397E,      0, 0xE136, 0x4329,
-};
-static const unsigned short utf8_to_euc_E8BE_x0213[] = {
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0, 0x3F49, 0x6D63, 0xE12D, 0x3C2D, 0x6D64,
- 0xE12E, 0xE12F,      0, 0x6D65, 0xF967, 0xE131, 0x7C52, 0x5221,
- 0x517E,      0,      0,      0,      0, 0x6D66, 0x6570, 0x6D67,
- 0x4324, 0x3F2B, 0x4740,      0, 0xF968, 0x7C53, 0xF96A, 0x6D68,
- 0xE135,      0, 0x4A55, 0x4454, 0x397E,      0, 0xE136, 0x4329,
-};
-static const unsigned short utf8_to_euc_E8BF[] = {
- 0xE137, 0xE138, 0x312A,      0, 0x4B78, 0x3F57, 0xE139,      0,
-      0,      0, 0xE13A, 0xE13B,      0, 0xE13C, 0x375E,      0,
- 0xE13D, 0x3661, 0xE13E, 0xE13F, 0x4A56, 0xE140,      0,      0,
-      0,      0, 0x6D69,      0,      0,      0,      0,      0,
- 0xE141,      0, 0x6D6B, 0xE142, 0xE143, 0x6D6A, 0x3260,      0,
- 0xE144, 0x4676, 0x6D6C, 0x4777,      0, 0x4533, 0xE145, 0x6D6D,
- 0x3D52, 0xE146,      0,      0, 0x6D6F, 0xE147, 0xE148, 0x4C42,
- 0x6D7E, 0x6D71, 0x6D72, 0xE149,      0, 0x4449, 0xE14A,      0,
-};
-static const unsigned short utf8_to_euc_E8BF_x0213[] = {
- 0xE137, 0xF96C, 0x312A,      0, 0x4B78, 0x3F57, 0xF96D,      0,
-      0,      0, 0xF96F, 0xE13B,      0, 0xF970, 0x375E,      0,
- 0xE13D, 0x3661, 0xE13E, 0xF971, 0x4A56, 0xF972,      0,      0,
-      0,      0, 0x6D69,      0,      0,      0,      0,      0,
- 0xF973,      0, 0x6D6B, 0xE142, 0x7C54, 0x6D6A, 0x3260,      0,
- 0x7C55, 0x4676, 0x6D6C, 0x4777,      0, 0x4533, 0x7C56, 0x6D6D,
- 0x3D52, 0xF974,      0,      0, 0x6D6F, 0xF975, 0xE148, 0x4C42,
- 0x6D7E, 0x6D71, 0x6D72, 0xF976,      0, 0x4449, 0xE14A,      0,
-};
-static const unsigned short utf8_to_euc_E980[] = {
- 0x4260, 0x4177, 0xE14B, 0x4628, 0xE14C, 0x6D70, 0x3555,      0,
- 0xE14D,      0,      0, 0x6D79, 0xE14E, 0x6D76, 0x6E25, 0x4629,
- 0x4360, 0x6D73,      0, 0x447E, 0x4553, 0x6D74, 0x6D78, 0x3F60,
- 0xE14F, 0x4767, 0x444C, 0xE150,      0, 0x4042, 0x6D77, 0x422E,
- 0x4224, 0x6D75, 0x3029, 0x4F22,      0,      0,      0, 0x6D7A,
- 0xE151, 0xE152, 0xE154,      0, 0xE155, 0xE156, 0x4261, 0xE153,
-      0, 0x3D35, 0x3F4A, 0xE157, 0xE158, 0x6D7C, 0x6D7B, 0xE159,
- 0x306F, 0x6D7D,      0,      0, 0x492F,      0, 0x6E27, 0xE15A,
-};
-static const unsigned short utf8_to_euc_E980_x0213[] = {
- 0x4260, 0x4177, 0xF977, 0x4628, 0xE14C, 0x6D70, 0x3555,      0,
- 0x7C57,      0,      0, 0x6D79, 0xF978, 0x6D76, 0x6E25, 0x4629,
- 0x4360, 0x6D73,      0, 0x447E, 0x4553, 0x6D74, 0x6D78, 0x3F60,
- 0xE14F, 0x4767, 0x444C, 0xE150,      0, 0x4042, 0x6D77, 0x422E,
- 0x4224, 0x6D75, 0x3029, 0x4F22,      0,      0,      0, 0x6D7A,
- 0xE151, 0xE152, 0xE154,      0, 0xE155, 0x7C58, 0x4261, 0xE153,
-      0, 0x3D35, 0x3F4A, 0xE157, 0xE158, 0x6D7C, 0x6D7B, 0xF979,
- 0x306F, 0x6D7D,      0,      0, 0x492F,      0, 0x6E27, 0xE15A,
-};
-static const unsigned short utf8_to_euc_E981[] = {
-      0, 0x465B, 0x3F6B, 0xE15B, 0xE15C, 0x4359,      0, 0x3678,
-      0, 0x6E26, 0x4D37, 0x313F, 0xE15D, 0x4A57, 0x3261, 0x6E21,
- 0x6E22, 0x6E23, 0x6E24, 0x463B, 0x4323, 0x3063, 0x6E28,      0,
- 0x6E29, 0x7423,      0, 0xE15E, 0x423D, 0xE15F, 0x6E2A,      0,
- 0x3173, 0x414C, 0xE160, 0x382F,      0, 0x4D5A, 0xE161, 0xE162,
- 0x6E2B, 0x452C,      0,      0, 0xE163, 0x4178, 0x3C57, 0x6E2C,
- 0xE164,      0, 0x6E2F,      0, 0xE165, 0x3D65, 0x6E2D, 0x412B,
- 0x412A, 0xE166, 0x3064,      0, 0x4E4B, 0x6E31,      0, 0x4872,
-};
-static const unsigned short utf8_to_euc_E981_x0213[] = {
-      0, 0x465B, 0x3F6B, 0xF97B, 0xF97C, 0x4359,      0, 0x3678,
-      0, 0x6E26, 0x4D37, 0x313F, 0xE15D, 0x4A57, 0x3261, 0x6E21,
- 0x6E22, 0x6E23, 0x6E24, 0x463B, 0x4323, 0x3063, 0x6E28,      0,
- 0x6E29, 0x7423,      0, 0xE15E, 0x423D, 0xF97D, 0x6E2A,      0,
- 0x3173, 0x414C, 0xE160, 0x382F,      0, 0x4D5A, 0xE161,      0,
- 0x6E2B, 0x452C,      0,      0, 0xE163, 0x4178, 0x3C57, 0x6E2C,
- 0xE164,      0, 0x6E2F,      0, 0xE165, 0x3D65, 0x6E2D, 0x412B,
- 0x412A, 0xE166, 0x3064,      0, 0x4E4B, 0x6E31,      0, 0x4872,
-};
-static const unsigned short utf8_to_euc_E982[] = {
- 0x6E33, 0x6E32, 0x6E30, 0x6364, 0x3454, 0xE167,      0, 0x6D6E,
- 0xE168, 0x6E35, 0x6E34, 0xE169, 0xE16A,      0, 0xE16B, 0x6E36,
- 0xE16C, 0x4D38,      0,      0,      0, 0xE16D,      0, 0xE16E,
- 0xE16F, 0xE170,      0, 0xE171,      0,      0,      0,      0,
- 0xE172, 0xE173, 0xE174, 0x4661,      0, 0xE175, 0x4B2E,      0,
- 0x6E37,      0, 0x3C59,      0,      0,      0,      0, 0x6E38,
- 0xE176, 0x6E39, 0xE177, 0xE178, 0xE179, 0x6E3A, 0xE17A,      0,
- 0x4521,      0,      0,      0,      0, 0xE17B, 0xE17D,      0,
-};
-static const unsigned short utf8_to_euc_E982_x0213[] = {
- 0x6E33, 0x6E32, 0x6E30, 0x6364, 0x3454, 0xFA22,      0, 0x6D6E,
- 0x7C5A, 0x6E35, 0x6E34, 0xE169, 0xFA23,      0, 0xE16B, 0x6E36,
- 0xFA24, 0x4D38,      0,      0,      0, 0x7C5B,      0, 0x7C5C,
- 0xE16F, 0x7C5D,      0, 0x7C5E,      0,      0,      0,      0,
- 0xE172, 0xFA26, 0x7C5F, 0x4661,      0, 0xE175, 0x4B2E,      0,
- 0x6E37,      0, 0x3C59,      0,      0,      0,      0, 0x6E38,
- 0xFA28, 0x6E39, 0xE177, 0x7C60, 0xE179, 0x6E3A, 0xFA29,      0,
- 0x4521,      0,      0,      0,      0, 0xE17B, 0x7C61,      0,
-};
-static const unsigned short utf8_to_euc_E983[] = {
-      0, 0x306A,      0, 0xE17E, 0xE221, 0xE222,      0, 0xE223,
- 0xE224,      0, 0x3959,      0, 0xE17C,      0, 0x4F3A,      0,
-      0,      0, 0xE22D,      0,      0, 0xE225,      0, 0xE226,
- 0xE227, 0xE228,      0, 0x6E3E, 0xE229, 0xE22A, 0xF46C, 0xE22B,
-      0, 0x3734, 0x6E3B,      0, 0x6E3C, 0xE22C,      0,      0,
- 0x4974,      0,      0, 0xE22F,      0, 0x3354,      0, 0xE230,
- 0xE231,      0,      0,      0, 0xE232, 0x4D39, 0xE22E, 0x363F,
-      0,      0,      0,      0,      0, 0x4554, 0xE233, 0xE234,
-};
-static const unsigned short utf8_to_euc_E983_x0213[] = {
-      0, 0x306A,      0, 0xFA2A, 0x7C62, 0x7C63,      0, 0x7C64,
- 0xFA2B,      0, 0x3959,      0, 0xE17C,      0, 0x4F3A,      0,
-      0,      0, 0xE22D,      0,      0, 0xE225,      0, 0x7C65,
- 0xE227, 0xE228,      0, 0x6E3E, 0xFA2D, 0x7C66, 0x7C67, 0xFA2E,
-      0, 0x3734, 0x6E3B,      0, 0x6E3C, 0xE22C,      0,      0,
- 0x4974,      0,      0, 0xFA33,      0, 0x3354,      0, 0x7C68,
- 0xE231,      0, 0xFA31,      0, 0x7C69, 0x4D39, 0xFA30, 0x363F,
-      0,      0,      0,      0,      0, 0x4554, 0xFA34, 0xFA35,
-};
-static const unsigned short utf8_to_euc_E984[] = {
- 0xE235,      0, 0x6E3F,      0, 0xE236, 0xE237, 0xE238,      0,
- 0xE239,      0,      0,      0,      0, 0xE23A,      0,      0,
- 0xE23B,      0, 0x6E40,      0, 0xE23C, 0xF46E, 0xE23D, 0xE23E,
- 0xE23F, 0x6E41, 0xE240,      0, 0xE241,      0, 0xE242,      0,
- 0xE243,      0, 0xE245, 0xE246,      0, 0xE244,      0, 0xE247,
-      0, 0xE248,      0,      0,      0, 0x4522, 0xE249, 0xE24A,
- 0x6E43, 0xE24B, 0x6E42,      0, 0xE24C,      0, 0xE24D, 0xE24E,
-      0, 0xE24F, 0xE250,      0, 0xE251, 0xE252,      0,      0,
-};
-static const unsigned short utf8_to_euc_E984_x0213[] = {
- 0xFA32,      0, 0x6E3F,      0, 0xFA36, 0xE237, 0xFA37,      0,
- 0xE239,      0,      0,      0,      0, 0xE23A,      0,      0,
- 0xE23B,      0, 0x6E40,      0, 0x7C6B, 0x7C6C, 0x7C6D, 0xE23E,
- 0xFA38, 0x6E41, 0xE240,      0, 0xFA39,      0, 0xFA3A,      0,
- 0xE243,      0, 0x7C6E, 0x7C6F,      0, 0xE244,      0, 0x7C70,
-      0, 0xE248,      0,      0,      0, 0x4522, 0xE249, 0x7C71,
- 0x6E43, 0x7C72, 0x6E42,      0, 0x7C73,      0, 0xE24D, 0xFA3B,
-      0, 0xFA3C, 0xFA3D,      0, 0xE251, 0x7C74,      0,      0,
-};
-static const unsigned short utf8_to_euc_E985[] = {
-      0,      0,      0, 0xE253,      0,      0,      0, 0xE254,
- 0xE255, 0x4653, 0x6E44, 0x3D36, 0x3C60, 0x475B, 0x4371, 0xE256,
-      0,      0, 0x3C72, 0xE257, 0x3F6C,      0, 0x6E45, 0xE258,
- 0x6E46, 0xE259, 0xE25A, 0xE25B,      0,      0,      0,      0,
-      0, 0xE25C, 0x3F5D, 0x6E47, 0xE25D, 0x6E48,      0, 0xE25E,
-      0, 0x6E49, 0x4D6F,      0, 0x3D37, 0xE25F,      0,      0,
-      0,      0, 0x6E4B, 0x6E4A, 0xE260, 0x395A,      0, 0x3973,
- 0x3B40, 0xE261, 0xE262, 0xE263,      0,      0,      0,      0,
-};
-static const unsigned short utf8_to_euc_E985_x0213[] = {
-      0,      0,      0, 0xE253,      0,      0, 0xFA3E, 0xFA3F,
- 0x7C75, 0x4653, 0x6E44, 0x3D36, 0x3C60, 0x475B, 0x4371, 0xE256,
-      0,      0, 0x3C72, 0xE257, 0x3F6C,      0, 0x6E45, 0xFA40,
- 0x6E46, 0xFA41, 0xE25A, 0x7C76,      0,      0,      0,      0,
-      0, 0xFA42, 0x3F5D, 0x6E47, 0xFA43, 0x6E48,      0, 0xE25E,
-      0, 0x6E49, 0x4D6F,      0, 0x3D37, 0xE25F,      0,      0,
-      0,      0, 0x6E4B, 0x6E4A, 0xFA44, 0x395A,      0, 0x3973,
- 0x3B40, 0xFA45, 0xE262, 0xE263,      0,      0,      0,      0,
-};
-static const unsigned short utf8_to_euc_E986[] = {
-      0, 0xE264, 0x6E4E, 0xE265,      0, 0xE266, 0xE267, 0x3D66,
-      0, 0x6E4D, 0xE268, 0x6E4C,      0, 0x4269, 0xE269,      0,
- 0x386F, 0xE26A, 0x4043, 0xE26B, 0xE26C, 0xE26D,      0, 0x4830,
- 0xE26E,      0,      0,      0, 0x3D39,      0, 0xE26F,      0,
-      0, 0xE270, 0x6E4F,      0, 0x3E5F,      0, 0xE271,      0,
- 0xE272,      0, 0x6E52, 0x6E50, 0xE273, 0xE274, 0xE275, 0x6E51,
- 0xE276, 0xE277, 0xE278, 0xE279, 0x6E54, 0x6E53, 0xE27A,      0,
- 0x3E7A,      0, 0x6E55, 0xE27B, 0xE27C, 0xE27D,      0, 0xE27E,
-};
-static const unsigned short utf8_to_euc_E986_x0213[] = {
-      0, 0xE264, 0x6E4E, 0x7C77,      0, 0xFA46, 0xE267, 0x3D66,
-      0, 0x6E4D, 0xE268, 0x6E4C,      0, 0x4269, 0xFA47,      0,
- 0x386F, 0xE26A, 0x4043, 0xE26B, 0xE26C, 0xE26D,      0, 0x4830,
- 0xE26E,      0,      0,      0, 0x3D39,      0, 0x7C78,      0,
-      0, 0xE270, 0x6E4F,      0, 0x3E5F,      0, 0xE271,      0,
- 0xFA48,      0, 0x6E52, 0x6E50, 0x7C79, 0xE274, 0xFA49, 0x6E51,
- 0xE276, 0x7C7A, 0xE278, 0xFA4A, 0x6E54, 0x6E53, 0xFA4B,      0,
- 0x3E7A,      0, 0x6E55, 0xE27B, 0x7C7B, 0xE27D,      0, 0xE27E,
-};
-static const unsigned short utf8_to_euc_E987[] = {
- 0x6E56, 0x6E57, 0xE321, 0xE322,      0, 0xE323, 0x4850, 0x3A53,
- 0x3C61, 0x6E58,      0, 0x6E59, 0x4E24, 0x3D45, 0x4C6E, 0x4E4C,
- 0x6E5A, 0x3662,      0, 0xE324, 0xE325,      0, 0x6E5B, 0xE326,
- 0x4523, 0xE327, 0xE328, 0x6E5E, 0x3378, 0x3F4B, 0xE329, 0x6E5C,
-      0, 0x6E5D,      0, 0x4460, 0xE32A, 0xE32B, 0x4B55, 0x367C,
-      0, 0xE32C, 0xE32D,      0, 0xE32E, 0xE32F, 0xE330, 0xE331,
- 0xE332, 0xE333,      0,      0,      0, 0x6E60, 0x6E61, 0xE334,
-      0, 0xE335,      0, 0xE336, 0x6E5F, 0xE337,      0, 0x6E63,
-};
-static const unsigned short utf8_to_euc_E987_x0213[] = {
- 0x6E56, 0x6E57, 0xE321, 0xFA4C, 0xFA4D, 0xE323, 0x4850, 0x3A53,
- 0x3C61, 0x6E58,      0, 0x6E59, 0x4E24, 0x3D45, 0x4C6E, 0x4E4C,
- 0x6E5A, 0x3662,      0, 0xE324, 0xE325,      0, 0x6E5B, 0x7C7C,
- 0x4523, 0xE327, 0xFA4E, 0x6E5E, 0x3378, 0x3F4B,      0, 0x6E5C,
-      0, 0x6E5D,      0, 0x4460, 0x7C7E, 0x7D21, 0x4B55, 0x367C,
-      0, 0xE32C, 0xE32D,      0, 0xFA51, 0x7D22, 0xFA52, 0xE331,
- 0xE332, 0x7D23,      0,      0,      0, 0x6E60, 0x6E61, 0xE334,
-      0, 0xE335,      0, 0x7C7D, 0x6E5F, 0xE337,      0, 0x6E63,
-};
-static const unsigned short utf8_to_euc_E988[] = {
- 0xE338, 0xE339,      0,      0, 0xE33A, 0xE33B, 0xE33C, 0xE33D,
-      0, 0xE33E, 0xE33F,      0, 0xE340, 0x465F, 0x3343,      0,
- 0xE341, 0x6E67, 0xE342, 0xE343, 0x6E64, 0x6E66, 0xE344,      0,
- 0xE345,      0,      0,      0, 0xE346, 0xE347, 0x6E62,      0,
-      0,      0,      0, 0xE348, 0xE349, 0xE34A, 0xE34B,      0,
- 0xE34C, 0x6F4F,      0,      0, 0x6E65,      0, 0xE34D, 0xE34E,
- 0xE34F,      0,      0, 0xE350, 0x4E6B, 0xE351, 0xE352, 0x385A,
- 0xE353, 0xE354, 0xE355,      0, 0xE356,      0, 0xE357, 0x6E6F,
-};
-static const unsigned short utf8_to_euc_E988_x0213[] = {
- 0xE338, 0xFA53,      0,      0, 0xE33A, 0xE33B,      0, 0x7D24,
-      0, 0xE33E, 0xFA54,      0, 0xE340, 0x465F, 0x3343,      0,
- 0x7D25, 0x6E67, 0xE342, 0xE343, 0x6E64, 0x6E66, 0xFA55, 0xFA56,
- 0xE345,      0,      0,      0, 0xE346, 0xE347, 0x6E62,      0,
-      0,      0,      0, 0xE348, 0xE349, 0xE34A, 0xE34B,      0,
- 0xE34C, 0x6F4F,      0,      0, 0x6E65,      0, 0xE34D, 0xE34E,
- 0xE34F,      0,      0, 0xFA58, 0x4E6B, 0xE351, 0xE352, 0x385A,
- 0x7D26, 0x7D27, 0x7D28,      0, 0x7D29,      0, 0xE357, 0x6E6F,
-};
-static const unsigned short utf8_to_euc_E989[] = {
- 0xE358,      0, 0xE359, 0xE35A, 0x4534, 0x6E6A, 0xE35B, 0xE35C,
- 0x6E6D, 0x6E6B, 0xE35D, 0x6E70,      0, 0xE35E, 0xE35F, 0xE360,
- 0x6E71, 0xE361,      0,      0,      0,      0,      0, 0x6E69,
- 0xE362, 0xE363, 0x6E76, 0x3174, 0xE364, 0xE365, 0x6E68,      0,
- 0xE366, 0xE367, 0x482D,      0, 0x6E6C, 0xE368, 0x3E60, 0xE369,
- 0xE36A, 0xE36B,      0,      0,      0,      0, 0xE36C, 0xE36D,
- 0xE36E, 0x395B,      0,      0,      0, 0xE36F, 0xE370, 0xE371,
- 0xE372, 0xE373,      0, 0xE374, 0xE375, 0xE376, 0x4B48, 0xE377,
-};
-static const unsigned short utf8_to_euc_E989_x0213[] = {
- 0x7D2A,      0, 0xFA59, 0x7D2B, 0x4534, 0x6E6A, 0xE35B, 0xFA5A,
- 0x6E6D, 0x6E6B, 0xFA5B, 0x6E70,      0, 0xE35E, 0xFA5C, 0x7D2C,
- 0x6E71, 0xFA5D,      0,      0,      0,      0, 0xFA5E, 0x6E69,
- 0xE362, 0xFA5F, 0x6E76, 0x3174, 0xE364, 0xE365, 0x6E68,      0,
- 0xFA60, 0xFA61, 0x482D,      0, 0x6E6C, 0xFA62, 0x3E60, 0xFA63,
- 0xFA64, 0xE36B,      0,      0,      0,      0, 0xE36C, 0xE36D,
- 0xE36E, 0x395B,      0,      0,      0, 0xE36F, 0xE370,      0,
- 0x7D2D, 0xE373,      0, 0xE374, 0xFA67, 0xFA68, 0x4B48, 0xFA69,
-};
-static const unsigned short utf8_to_euc_E98A[] = {
- 0x3664,      0,      0, 0x3D46,      0, 0x463C,      0,      0,
- 0xE378, 0xE379, 0xE37A,      0,      0, 0xE37B, 0xE37C,      0,
-      0, 0x412D, 0xE37D, 0x6E74,      0, 0x6E6E, 0x6E73, 0xE37E,
- 0x4C43, 0xE421, 0x4438, 0x6E75, 0x6E72,      0,      0, 0xE422,
- 0xE423,      0,      0,      0, 0xE424, 0xE425,      0, 0xE426,
- 0xE427,      0,      0, 0xE428,      0, 0x412C,      0, 0xE429,
-      0,      0, 0xE42A,      0,      0,      0, 0xE42B, 0x6E79,
- 0xE42C, 0x6E78, 0xE42D, 0xE42E, 0xE42F, 0xE430,      0, 0xE431,
-};
-static const unsigned short utf8_to_euc_E98A_x0213[] = {
- 0x3664,      0,      0, 0x3D46,      0, 0x463C,      0,      0,
- 0x7D2E, 0xFA6A, 0xE37A,      0,      0, 0xFA6B, 0xE37C,      0,
-      0, 0x412D, 0xE37D, 0x6E74,      0, 0x6E6E, 0x6E73, 0xFA6C,
- 0x4C43, 0xFA6D, 0x4438, 0x6E75, 0x6E72,      0,      0, 0xFA6E,
- 0xE423,      0,      0,      0, 0xE424, 0xE425,      0, 0xFA6F,
- 0xE427,      0,      0, 0xFA70,      0, 0x412C,      0, 0xE429,
-      0,      0, 0xFA73,      0,      0,      0, 0xE42B, 0x6E79,
- 0xE42C, 0x6E78, 0xE42D, 0xE42E, 0xE42F, 0xE430,      0, 0xFA74,
-};
-static const unsigned short utf8_to_euc_E98B[] = {
- 0xE432, 0xE433, 0xE434, 0xE435,      0, 0xE436, 0xE437, 0xE438,
- 0xE439,      0,      0, 0xE43A, 0xE43B, 0xE43C, 0xE43D, 0x6E77,
- 0xE43E,      0, 0x4B2F, 0xE43F,      0, 0xE440,      0, 0xE441,
- 0xE442, 0xE443,      0,      0, 0xE444, 0xE445,      0, 0xE446,
- 0xE447, 0xE448,      0, 0xE449, 0x3D7B, 0xE44A,      0, 0xE44B,
- 0xE44C, 0x6E7A, 0x4A5F,      0, 0xE44D, 0x3154, 0xE44E,      0,
- 0xE44F,      0, 0x4946, 0x4372,      0,      0,      0,      0,
- 0x3578, 0xE450, 0x6E7C, 0xE451, 0x395D,      0,      0, 0xE452,
-};
-static const unsigned short utf8_to_euc_E98B_x0213[] = {
- 0xFA75, 0xE433, 0x7D2F, 0xE435,      0, 0xE436, 0xFA76, 0xE438,
- 0xE439,      0,      0, 0x7D30, 0x7D31, 0xE43C, 0xFA77, 0x6E77,
- 0xFA78,      0, 0x4B2F, 0x7D32,      0,      0,      0, 0xFA79,
- 0xE442, 0xFA7A,      0,      0, 0xE444, 0xE445,      0, 0xE446,
- 0x7D33, 0xE448,      0, 0xE449, 0x3D7B, 0xFA7B,      0, 0xFA7C,
- 0xE44C, 0x6E7A, 0x4A5F,      0, 0xE44D, 0x3154, 0xE44E,      0,
- 0xE44F,      0, 0x4946, 0x4372,      0,      0,      0, 0xFB22,
- 0x3578, 0xFB23, 0x6E7C, 0xFB24, 0x395D,      0,      0, 0x7D34,
-};
-static const unsigned short utf8_to_euc_E98C[] = {
- 0xE453,      0, 0xE454,      0,      0,      0, 0x3B2C,      0,
- 0xE455,      0,      0,      0,      0, 0xE456,      0, 0x6E7B,
- 0x3F6D, 0xE457,      0,      0, 0xE458, 0xE459,      0,      0,
- 0x3F6E, 0x6F21, 0x6F23,      0, 0xE45A, 0xE45B, 0xE45C, 0xE45D,
- 0x3E7B, 0xE45E, 0x6F22, 0x6F24, 0xE45F, 0xE460, 0x3653, 0xE461,
- 0x4945, 0xE462, 0xE463, 0x3C62, 0x4F23,      0, 0x6E7E, 0x3A78,
-      0,      0, 0x4F3F, 0xE464, 0xE465, 0x6F26, 0xE466, 0xE467,
-      0,      0, 0x6F25, 0x6F27,      0,      0,      0,      0,
-};
-static const unsigned short utf8_to_euc_E98C_x0213[] = {
- 0xE453,      0, 0xFB25,      0, 0x7D35,      0, 0x3B2C,      0,
- 0xE455,      0,      0,      0,      0, 0xFB26,      0, 0x6E7B,
- 0x3F6D, 0xFA7D,      0,      0, 0xE458, 0xFB27,      0,      0,
- 0x3F6E, 0x6F21, 0x6F23,      0, 0xE45A, 0xFB28, 0xFB29, 0x7D36,
- 0x3E7B, 0x7D37, 0x6F22, 0x6F24, 0xE45F, 0x7D38, 0x3653, 0xFB2A,
- 0x4945, 0xFB2B, 0xE463, 0x3C62, 0x4F23,      0, 0x6E7E, 0x3A78,
-      0,      0, 0x4F3F, 0xE464, 0xE465, 0x6F26, 0xE466, 0xE467,
-      0,      0, 0x6F25, 0x6F27,      0,      0,      0,      0,
-};
-static const unsigned short utf8_to_euc_E98D[] = {
-      0,      0,      0,      0, 0x6E7D,      0,      0, 0xE468,
- 0xE469, 0xE46A,      0, 0x4669,      0, 0x4555,      0,      0,
- 0xE46B, 0xE46C, 0xE46D,      0, 0x4457, 0xE46E, 0x6F2C, 0xE46F,
- 0xE470,      0, 0xE471, 0x4343, 0x6F28,      0, 0xE472,      0,
- 0x6F29,      0,      0,      0, 0xE473, 0xE474,      0, 0xE475,
-      0, 0xE476, 0xE477,      0, 0x372D, 0xE478, 0x6F2B, 0xE479,
- 0xE47A, 0xE47B,      0, 0xE47C, 0xE47D, 0x3830, 0xE47E,      0,
-      0,      0, 0xE521,      0, 0x6F2A, 0xE522, 0x3E61, 0xE523,
-};
-static const unsigned short utf8_to_euc_E98D_x0213[] = {
-      0,      0,      0,      0, 0x6E7D,      0,      0, 0xFB2E,
- 0x7D39, 0x7D3A, 0x7D3B, 0x4669,      0, 0x4555,      0,      0,
- 0xE46B, 0xFB2F, 0xE46D,      0, 0x4457, 0xE46E, 0x6F2C, 0xFB30,
- 0xE470,      0, 0xFB31, 0x4343, 0x6F28,      0, 0xE472,      0,
- 0x6F29,      0,      0,      0, 0x7D3C, 0x7D3D,      0, 0xE475,
-      0, 0xE476, 0x7D3E, 0xFB32, 0x372D, 0xE478, 0x6F2B, 0xE479,
- 0x7D3F, 0xFB33,      0, 0xFB34, 0xE47D, 0x3830, 0xE47E,      0,
-      0,      0, 0xE521,      0, 0x6F2A, 0xE522, 0x3E61, 0xE523,
-};
-static const unsigned short utf8_to_euc_E98E[] = {
- 0xE524, 0xE525, 0xE526,      0,      0,      0,      0,      0,
- 0xE527,      0, 0xE528, 0xE529, 0x3379, 0xE52A,      0, 0xE52B,
-      0,      0, 0xE52C,      0, 0x6F30, 0xE52D, 0x3A3F, 0x4179,
- 0xE52E,      0, 0x444A, 0xE52F,      0,      0, 0xE530,      0,
-      0, 0xE531,      0, 0xE532, 0xE533,      0, 0xE534, 0x333B,
- 0xE535, 0xE53B,      0, 0xE536, 0x6F2E, 0x6F2F, 0x4443,      0,
- 0x6F2D,      0,      0,      0, 0xE537, 0xE538, 0xE539,      0,
-      0, 0x6F31, 0xE53A,      0,      0,      0,      0,      0,
-};
-static const unsigned short utf8_to_euc_E98E_x0213[] = {
- 0xE524, 0xE525, 0xE526,      0,      0,      0,      0,      0,
- 0xFB38,      0, 0xE528, 0xFB39, 0x3379, 0xE52A,      0, 0xFB3A,
-      0,      0, 0xE52C,      0, 0x6F30, 0xE52D, 0x3A3F, 0x4179,
- 0xE52E,      0, 0x444A, 0x7D40,      0,      0, 0xFB3B,      0,
-      0, 0xFB35,      0, 0x7D41,      0,      0, 0xE534, 0x333B,
- 0xE535, 0xE53B,      0, 0xE536, 0x6F2E, 0x6F2F, 0x4443,      0,
- 0x6F2D,      0,      0,      0, 0xE537, 0xE538, 0xE539,      0,
-      0, 0x6F31, 0x7D42,      0,      0,      0,      0,      0,
-};
-static const unsigned short utf8_to_euc_E98F[] = {
-      0, 0xE53C,      0, 0x6F37, 0xE53D, 0xE53E, 0xE53F, 0xE540,
- 0x6F3A, 0xE541, 0xE542, 0xE543, 0xE544, 0xE545,      0,      0,
- 0x6F39, 0x452D,      0, 0xE546,      0,      0, 0x6F32, 0x6F33,
- 0x6F36, 0xE547,      0,      0, 0xE548, 0x6F38, 0xE549, 0xE54A,
-      0, 0x3640, 0xE54B,      0, 0x6F3B, 0x6F35, 0xE54C, 0xE54D,
- 0x6F34,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0, 0xE54F,
- 0xE550, 0xE54E, 0xE551, 0xE552,      0, 0xE553,      0,      0,
-};
-static const unsigned short utf8_to_euc_E98F_x0213[] = {
-      0, 0xFB40,      0, 0x6F37, 0xE53D, 0xE53E, 0x7D43, 0xFB41,
- 0x6F3A, 0xE541, 0xE542, 0xE543, 0xE544, 0xE545,      0,      0,
- 0x6F39, 0x452D,      0, 0xE546,      0,      0, 0x6F32, 0x6F33,
- 0x6F36, 0xE547,      0,      0, 0xFB42, 0x6F38, 0x7D44, 0x7D45,
-      0, 0x3640, 0xFB43,      0, 0x6F3B, 0x6F35, 0xE54C, 0xFB44,
- 0x6F34,      0,      0,      0,      0,      0,      0,      0,
-      0, 0xFB3F,      0,      0,      0, 0xFB3C,      0, 0xE54F,
-      0, 0xE54E, 0xE551, 0xFB49,      0, 0x7D47,      0,      0,
-};
-static const unsigned short utf8_to_euc_E990[] = {
-      0, 0xE554, 0xE555, 0x6F3F, 0xE556,      0,      0, 0x6F40,
- 0xE557, 0xE558,      0,      0,      0, 0xE559, 0xE55A, 0xE55B,
- 0x6F41,      0,      0, 0x6F3E, 0x6F3D, 0xE55C, 0xE55D, 0xE55E,
- 0x3E62, 0x462A, 0x6F3C,      0,      0,      0,      0, 0xE55F,
-      0, 0x6F45,      0,      0,      0,      0,      0,      0,
-      0,      0,      0, 0x6F43,      0,      0, 0xE560, 0xE561,
-      0, 0xE562, 0xE563, 0xE564, 0xE565, 0x6F44, 0x6F42,      0,
- 0x4278,      0, 0x6F46, 0xE566,      0, 0xE568,      0, 0xE567,
-};
-static const unsigned short utf8_to_euc_E990_x0213[] = {
-      0, 0xE554, 0xE555, 0x6F3F, 0x7D46,      0,      0, 0x6F40,
- 0xE557, 0xFB45,      0,      0,      0, 0xE559, 0xE55A, 0xFB46,
- 0x6F41,      0,      0, 0x6F3E, 0x6F3D, 0xE55C, 0xFB47, 0xFB48,
- 0x3E62, 0x462A, 0x6F3C,      0,      0,      0,      0, 0xE55F,
-      0, 0x6F45,      0,      0,      0,      0,      0,      0,
-      0,      0,      0, 0x6F43,      0,      0, 0xE560, 0xE561,
-      0,      0, 0xFB4A, 0x7D48, 0xFB4B, 0x6F44, 0x6F42,      0,
- 0x4278,      0, 0x6F46, 0xFB4C,      0, 0xE568,      0, 0xE567,
-};
-static const unsigned short utf8_to_euc_E991[] = {
-      0, 0x6F47,      0, 0xE569, 0x6F49, 0xE56A,      0,      0,
- 0xE56B,      0, 0xE56C,      0, 0xE56D,      0,      0,      0,
-      0, 0x3455, 0x6F48, 0x4C7A,      0, 0xE56E,      0,      0,
-      0, 0xE56F, 0x6F54, 0x6F4A, 0xE570,      0, 0x6F4D, 0xE571,
- 0x6F4B, 0xE572, 0x6F4C, 0xE573,      0,      0,      0,      0,
- 0xE574,      0, 0x6F4E, 0xE575,      0, 0xE576, 0xE577, 0xE578,
- 0x6F50, 0xE579, 0xE57A,      0,      0, 0x6F51,      0, 0x6F52,
-      0,      0,      0,      0, 0x6F55, 0x6F53, 0x6F56, 0x6F58,
-};
-static const unsigned short utf8_to_euc_E991_x0213[] = {
-      0, 0x6F47,      0, 0xE569, 0x6F49, 0xFB4D,      0,      0,
-      0,      0, 0x7D49,      0, 0xE56D,      0,      0,      0,
-      0, 0x3455, 0x6F48, 0x4C7A,      0, 0xE56E,      0,      0,
-      0, 0xE56F, 0x6F54, 0x6F4A, 0xE570,      0, 0x6F4D, 0xE571,
- 0x6F4B, 0xE572, 0x6F4C, 0x7D4A,      0,      0,      0,      0,
- 0xE574,      0, 0x6F4E, 0x7D4B,      0, 0xFB50, 0xE577, 0xFB51,
- 0x6F50, 0x7D4C, 0x7D4D,      0,      0, 0x6F51,      0, 0x6F52,
-      0,      0,      0,      0, 0x6F55, 0x6F53, 0x6F56, 0x6F58,
-};
-static const unsigned short utf8_to_euc_E992[] = {
-      0, 0x6F57,      0, 0xE57C, 0xE57B,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-};
-static const unsigned short utf8_to_euc_E995[] = {
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0, 0x4439,
- 0xE57D, 0xE57E,      0,      0,      0,      0, 0xE621,      0,
-};
-static const unsigned short utf8_to_euc_E995_x0213[] = {
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0, 0x4439,
- 0xFB52, 0xFB53,      0,      0,      0,      0, 0xE621,      0,
-};
-static const unsigned short utf8_to_euc_E996[] = {
- 0x4C67,      0, 0x6F59, 0x412E, 0xE622,      0,      0, 0x6F5A,
- 0xE623, 0x4A44, 0x6F5B, 0x332B, 0xE624, 0xE625, 0xE626, 0x313C,
-      0, 0x3457, 0xF471, 0x3456, 0x6F5C,      0, 0x6F5D,      0,
- 0x6F5E, 0x6F5F,      0,      0,      0, 0xE627, 0xE628, 0xE629,
- 0x6F60, 0xE62A, 0x3458, 0x3355, 0x395E, 0x4836, 0xE62B, 0x6F62,
- 0x6F61, 0xE62C,      0, 0xE62D, 0xE62E, 0x6F63,      0,      0,
-      0,      0, 0x315C,      0, 0xE62F,      0, 0xE630,      0,
-      0, 0x6F66, 0xE631, 0x6F65, 0x6F64, 0xE632, 0x6F67, 0xE633,
-};
-static const unsigned short utf8_to_euc_E996_x0213[] = {
- 0x4C67,      0, 0x6F59, 0x412E, 0xE622,      0, 0xFB54, 0x6F5A,
- 0xE623, 0x4A44, 0x6F5B, 0x332B, 0xFB55, 0xFB56, 0x7D4E, 0x313C,
-      0, 0x3457,      0, 0x3456, 0x6F5C,      0, 0x6F5D,      0,
- 0x6F5E, 0x6F5F,      0,      0,      0, 0xE627, 0xE628, 0x7D4F,
- 0x6F60, 0xE62A, 0x3458, 0x3355, 0x395E, 0x4836, 0x7D50, 0x6F62,
- 0x6F61, 0x7D51,      0, 0xFB58, 0x7D52, 0x6F63,      0,      0,
-      0,      0, 0x315C,      0, 0xFB59,      0, 0x7D53,      0,
-      0, 0x6F66, 0xE631, 0x6F65, 0x6F64, 0x7D54, 0x6F67, 0xE633,
-};
-static const unsigned short utf8_to_euc_E997[] = {
-      0,      0,      0, 0x6F6A,      0,      0, 0xE634, 0x3047,
- 0xE635, 0xE636, 0x6F68, 0xE637, 0x6F6C, 0x6F6B,      0,      0,
- 0xE638, 0xE639, 0xE63A, 0xE63B, 0x6F6E, 0x6F6D, 0x6F6F,      0,
- 0x462E, 0xE63C, 0xE63D,      0, 0x6F70, 0xE63E, 0xE63F, 0xE640,
- 0xE641, 0x6F71, 0x6F73,      0, 0xE642, 0x6F72, 0xE643,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-};
-static const unsigned short utf8_to_euc_E997_x0213[] = {
-      0,      0,      0, 0x6F6A,      0,      0, 0xE634, 0x3047,
- 0xFB5B, 0xE636, 0x6F68, 0x7D55, 0x6F6C, 0x6F6B,      0,      0,
- 0x7D56, 0xE639, 0xE63A, 0x7D57, 0x6F6E, 0x6F6D, 0x6F6F,      0,
- 0x462E, 0xE63C, 0x7D59,      0, 0x6F70, 0xE63E, 0x7D5A, 0xE640,
- 0xE641, 0x6F71, 0x6F73,      0, 0xE642, 0x6F72, 0xE643,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-};
-static const unsigned short utf8_to_euc_E998[] = {
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0, 0x496C, 0xE644, 0xE645,      0,
-      0, 0x6F74, 0xE646,      0, 0xE647, 0xE648, 0xE649,      0,
- 0x6F75,      0, 0x3A65,      0, 0xE64A,      0, 0x6F76, 0x6F77,
-      0, 0xE64B, 0x4B49, 0xE64C,      0,      0,      0, 0xE64D,
- 0xE64E, 0xE64F, 0xE650, 0x414B, 0xE651, 0xE652,      0, 0x3024,
-};
-static const unsigned short utf8_to_euc_E998_x0213[] = {
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0, 0x496C, 0xFA25, 0xE645,      0,
-      0, 0x6F74, 0xE646,      0, 0xE647, 0xE648, 0xE649,      0,
- 0x6F75,      0, 0x3A65,      0, 0xFB5E,      0, 0x6F76, 0x6F77,
-      0, 0xE64B, 0x4B49, 0xFB5F, 0xFB60,      0,      0, 0xE64D,
- 0xE64E, 0xE64F, 0xE650, 0x414B, 0xFB62, 0xE652,      0, 0x3024,
-};
-static const unsigned short utf8_to_euc_E999[] = {
- 0x424B, 0xE653, 0x6F78,      0, 0x496D,      0,      0,      0,
-      0,      0,      0, 0x6F7B, 0x6F79, 0x395F,      0, 0x6F7A,
- 0x3842,      0, 0xE654,      0, 0xE655,      0, 0xE656, 0xE657,
- 0xE658,      0,      0, 0x4A45, 0x6F7D, 0x7021, 0x6F7E, 0x7022,
-      0, 0xE659, 0x3121, 0x3F58, 0x3D7C, 0x3459, 0x7023,      0,
-      0,      0, 0x4766,      0, 0x7025,      0, 0xE65A,      0,
- 0x3122,      0, 0x7024, 0x4444, 0xE65B, 0x4E4D, 0x462B, 0x6F7C,
- 0x4E26,      0, 0x3831, 0xE65C, 0xE65D, 0x4D5B, 0xE65E, 0xE65F,
-};
-static const unsigned short utf8_to_euc_E999_x0213[] = {
- 0x424B, 0xFB63, 0x6F78,      0, 0x496D,      0,      0,      0,
-      0,      0,      0, 0x6F7B, 0x6F79, 0x395F,      0, 0x6F7A,
- 0x3842,      0, 0xE654,      0, 0xE655,      0, 0xE656, 0xE657,
- 0x7D5B,      0,      0, 0x4A45, 0x6F7D, 0x7021, 0x6F7E, 0x7022,
-      0, 0xFB64, 0x3121, 0x3F58, 0x3D7C, 0x3459, 0x7023,      0,
-      0,      0, 0x4766,      0, 0x7025,      0, 0xE65A,      0,
- 0x3122,      0, 0x7024, 0x4444, 0xE65B, 0x4E4D, 0x462B, 0x6F7C,
- 0x4E26,      0, 0x3831, 0xE65C, 0xE65D, 0x4D5B, 0xE65E, 0xE65F,
-};
-static const unsigned short utf8_to_euc_E99A[] = {
-      0, 0xE660, 0xE661, 0xE662, 0xE663, 0x3679, 0x4E34,      0,
- 0x3728, 0xE664, 0x4262, 0x6721,      0, 0x7026, 0x332C, 0x3F6F,
-      0, 0xE665,      0,      0, 0x3356, 0x7028, 0xE666, 0x7029,
- 0x7027, 0x3764, 0xE667, 0x3A5D, 0x3E63, 0xE668,      0, 0xE669,
- 0x3123,      0,      0, 0x4E59, 0xE66A, 0xE66B, 0xE66C, 0x702B,
- 0x6E2E, 0xE66D, 0x702A,      0,      0,      0, 0xE66E, 0xE66F,
- 0x702E, 0x702C, 0x702D, 0xE670, 0x702F,      0, 0x7030, 0x4E6C,
- 0x7031, 0x7032, 0xE671, 0x4049, 0x483B,      0,      0,      0,
-};
-static const unsigned short utf8_to_euc_E99A_x0213[] = {
-      0, 0xE660, 0xFB66, 0xE662, 0x7D5C, 0x3679, 0x4E34,      0,
- 0x3728, 0xE664, 0x4262, 0x6721,      0, 0x7026, 0x332C, 0x3F6F,
-      0, 0xE665,      0,      0, 0x3356, 0x7028, 0xE666, 0x7029,
- 0x7027, 0x3764, 0xFB68, 0x3A5D, 0x3E63, 0x7D5E,      0, 0xE669,
- 0x3123,      0,      0, 0x4E59, 0x7D5F, 0x7D60, 0xE66C, 0x702B,
- 0x6E2E, 0xFB6B, 0x702A,      0,      0,      0, 0xE66E, 0xFB6C,
- 0x702E, 0x702C, 0x702D, 0xFB6D, 0x702F,      0, 0x7030, 0x4E6C,
- 0x7031, 0x7032, 0xFB6E, 0x4049, 0x483B, 0xFB6F,      0,      0,
-};
-static const unsigned short utf8_to_euc_E99B[] = {
- 0x3F7D, 0x3467,      0,      0, 0x4D3A, 0x326D, 0x3D38, 0x385B,
-      0, 0x7035, 0xE672, 0x7034, 0x3B73, 0x7036, 0x7033,      0,
-      0, 0x3B28, 0xE673,      0,      0, 0x703A, 0x6A2D,      0,
- 0xE675, 0x5256, 0xE676, 0x3F77, 0x7038, 0xE677, 0xE678, 0xE679,
-      0,      0, 0x4E25, 0x4671,      0,      0,      0,      0,
- 0x312B, 0xE67A, 0x4063, 0x3C36,      0,      0,      0, 0xE67B,
- 0x4A37, 0xE67C, 0x3140,      0,      0,      0, 0x4E6D, 0x4D6B,
-      0, 0x703B, 0xE67D, 0x4545,      0,      0,      0,      0,
-};
-static const unsigned short utf8_to_euc_E99B_x0213[] = {
- 0x3F7D, 0x3467,      0,      0, 0x4D3A, 0x326D, 0x3D38, 0x385B,
-      0, 0x7035, 0xE672, 0x7034, 0x3B73, 0x7036, 0x7033,      0,
-      0, 0x3B28, 0x7D61,      0,      0, 0x703A, 0x6A2D,      0,
- 0xFB72, 0x5256, 0xFB73, 0x3F77, 0x7038, 0xFB74, 0x7D62, 0xE679,
-      0,      0, 0x4E25, 0x4671,      0,      0,      0,      0,
- 0x312B, 0x7D64, 0x4063, 0x3C36,      0,      0,      0, 0x7D65,
- 0x4A37, 0xE67C, 0x3140,      0,      0,      0, 0x4E6D, 0x4D6B,
-      0, 0x703B, 0xE67D, 0x4545,      0,      0,      0,      0,
-};
-static const unsigned short utf8_to_euc_E99C[] = {
- 0x3C7B,      0, 0xE67E, 0xE721, 0x703C, 0xE722, 0x703D, 0x3F4C,
- 0x703E, 0xE723, 0x4E6E,      0,      0, 0x7039, 0x7040, 0x7042,
-      0, 0x7041,      0, 0x703F,      0,      0, 0x7043,      0,
-      0, 0x7044, 0xE724, 0xE725, 0x417A, 0xE726, 0x3262,      0,
-      0, 0xE727, 0xE728, 0xE729, 0x7045,      0,      0, 0x4C38,
- 0xE72A,      0, 0x7046,      0,      0,      0,      0,      0,
- 0x7047, 0xE72B, 0x4F2A, 0xE72C,      0,      0,      0,      0,
- 0x5B31, 0x7048,      0, 0xF474,      0, 0x7049, 0x704A,      0,
-};
-static const unsigned short utf8_to_euc_E99C_x0213[] = {
- 0x3C7B,      0, 0xE67E, 0xE721, 0x703C, 0xE722, 0x703D, 0x3F4C,
- 0x703E, 0xE723, 0x4E6E,      0,      0, 0x7039, 0x7040, 0x7042,
-      0, 0x7041,      0, 0x703F, 0xFB76,      0, 0x7043,      0,
-      0, 0x7044, 0xE724, 0xE725, 0x417A, 0xE726, 0x3262,      0,
-      0, 0xE727, 0xE728, 0xFB77, 0x7045,      0,      0, 0x4C38,
- 0xE72A,      0, 0x7046,      0,      0,      0,      0,      0,
- 0x7047, 0xE72B, 0x4F2A, 0x7D66,      0,      0, 0xFB79,      0,
- 0x5B31, 0x7048,      0, 0x7D67,      0, 0x7049, 0x704A,      0,
-};
-static const unsigned short utf8_to_euc_E99D[] = {
-      0, 0xE72D, 0x704E, 0xE72E, 0x704B,      0, 0x704C,      0,
- 0x704D, 0x704F, 0xE72F,      0,      0, 0xF475, 0xE730, 0xE731,
-      0, 0xF476, 0x4044,      0,      0, 0xE732, 0x4C77, 0xE733,
- 0xE734, 0x4045, 0xE735, 0xE736, 0x7050,      0, 0x4873,      0,
- 0x7051, 0x7353, 0x4C4C, 0xE737, 0x7052,      0, 0x7053, 0xE738,
- 0x7054, 0x3357, 0xE739, 0x7056,      0, 0x3F59, 0xE73A,      0,
-      0, 0x7057,      0, 0xE73B, 0x3724,      0, 0xE73C, 0xE73D,
- 0xE73E, 0x7058, 0x705C, 0xE73F, 0x705A, 0xE740,      0, 0xE741,
-};
-static const unsigned short utf8_to_euc_E99D_x0213[] = {
-      0, 0xFB7A, 0x704E,      0, 0x704B,      0, 0x704C, 0xFB7B,
- 0x704D, 0x704F, 0xE72F,      0,      0, 0x7D68, 0x7D69, 0x7D6A,
-      0,      0, 0x4044,      0,      0, 0xFB7C, 0x4C77, 0xFB7D,
- 0xE734, 0x4045, 0x7D6B, 0xFB7E, 0x7050,      0, 0x4873,      0,
- 0x7051, 0x7353, 0x4C4C, 0xE737, 0x7052,      0, 0x7053, 0xE738,
- 0x7054, 0x3357, 0xFC21, 0x7056,      0, 0x3F59, 0x7D6C,      0,
-      0, 0x7057,      0, 0x7D6D, 0x3724,      0, 0xE73C, 0xE73D,
- 0xE73E, 0x7058, 0x705C, 0xE73F, 0x705A, 0xE740,      0, 0xE741,
-};
-static const unsigned short utf8_to_euc_E99E[] = {
- 0xE742, 0x705B,      0,      0, 0x3373, 0x7059, 0x705D,      0,
-      0, 0xE743,      0, 0x705E,      0, 0x3048,      0, 0x705F,
- 0x7060,      0,      0,      0,      0, 0xE744, 0xE745, 0xE746,
- 0x3E64, 0xE747, 0xE748,      0, 0x7061,      0, 0xE749, 0xE74A,
- 0x3547,      0, 0xE74B, 0x7064,      0,      0, 0x7063,      0,
- 0x7062,      0,      0, 0x6B71, 0xE74C, 0x4A5C, 0xE74D,      0,
-      0, 0xE74E, 0xE74F, 0x7065, 0x7066, 0xE750, 0xE751,      0,
- 0xE752, 0xE753, 0xE754,      0, 0xE755,      0, 0xE756, 0xE757,
-};
-static const unsigned short utf8_to_euc_E99E_x0213[] = {
- 0xE742, 0x705B,      0,      0, 0x3373, 0x7059, 0x705D,      0,
-      0, 0xE743,      0, 0x705E,      0, 0x3048,      0, 0x705F,
- 0x7060,      0,      0,      0,      0, 0x7D6E, 0xFC24, 0xE746,
- 0x3E64, 0xE747, 0xFC25,      0, 0x7061,      0, 0xFC26, 0xE74A,
- 0x3547,      0, 0xFC27, 0x7064,      0,      0, 0x7063,      0,
- 0x7062,      0,      0, 0x6B71, 0xE74C, 0x4A5C, 0x7D6F,      0,
-      0, 0xFC28, 0xFC29, 0x7065, 0x7066, 0xE750, 0xE751,      0,
- 0xE752, 0xE753, 0x7D70,      0, 0xE755,      0, 0xFC2A, 0xE757,
-};
-static const unsigned short utf8_to_euc_E99F[] = {
-      0, 0xE758,      0, 0x7067, 0xE759, 0xE75A, 0x7068, 0xE75B,
- 0x7069, 0xE75C, 0xE75D, 0x706A, 0xE75E, 0xE75F, 0xE760,      0,
- 0xE761, 0xE762,      0, 0x345A, 0xE763,      0,      0, 0xE764,
- 0xE765, 0xE766,      0, 0xE76A, 0x706B, 0xE767, 0xE768,      0,
- 0xE769, 0xE76B,      0,      0, 0xE76C,      0,      0,      0,
-      0,      0,      0,      0,      0, 0x706C, 0x4723, 0xE76D,
-      0, 0xE76E, 0x706E, 0x323B, 0xE76F, 0x7071, 0x7070, 0xE770,
- 0xE771,      0, 0xE772, 0x3124,      0,      0,      0, 0x3641,
-};
-static const unsigned short utf8_to_euc_E99F_x0213[] = {
-      0, 0x7D71,      0, 0x7067, 0xE759, 0xE75A, 0x7068, 0xE75B,
- 0x7069, 0x7D72, 0xE75D, 0x706A, 0xFC2B, 0xE75F, 0xE760,      0,
- 0xE761, 0xFC2C,      0, 0x345A, 0xFC2D,      0,      0, 0xE764,
- 0xFC2E, 0xFC2F,      0, 0x7D74, 0x706B, 0xE767, 0x7D73,      0,
- 0xE769, 0xFC30,      0,      0, 0xE76C,      0,      0,      0,
-      0,      0,      0,      0,      0, 0x706C, 0x4723, 0xE76D,
-      0, 0xFC31, 0x706E, 0x323B, 0x7D75, 0x7071, 0x7070, 0xE770,
- 0xE771,      0, 0xE772, 0x3124,      0,      0,      0, 0x3641,
-};
-static const unsigned short utf8_to_euc_E9A0[] = {
-      0, 0x4A47, 0x443A, 0x3A22,      0, 0x3960, 0x3D67, 0xE773,
- 0x3F5C,      0, 0xE774,      0, 0x7073, 0xE776, 0xE777, 0x7072,
- 0x4D42, 0x3468, 0x4852, 0x465C, 0xE778,      0, 0xE779, 0x3F7C,
- 0x4E4E, 0xE775, 0x375B,      0, 0xE77A,      0, 0xE77B,      0,
- 0xE77C, 0x7076,      0, 0xE77D, 0x7075, 0xE828, 0xE77E,      0,
-      0,      0,      0, 0xE821, 0x4B4B, 0x462C, 0xE822, 0xE823,
- 0xE824,      0, 0xE825, 0xE826, 0x3150, 0xE827,      0, 0x7077,
- 0x7074,      0,      0, 0x4951, 0x4D6A, 0x7078, 0xE829,      0,
-};
-static const unsigned short utf8_to_euc_E9A0_x0213[] = {
-      0, 0x4A47, 0x443A, 0x3A22, 0xFC32, 0x3960, 0x3D67, 0xE773,
- 0x3F5C,      0, 0x7D77,      0, 0x7073, 0xFC33, 0xFC34, 0x7072,
- 0x4D42, 0x3468, 0x4852, 0x465C, 0xFC35,      0, 0xFC36, 0x3F7C,
- 0x4E4E, 0xE775, 0x375B,      0, 0xE77A,      0, 0x7D78,      0,
- 0xE77C, 0x7076,      0, 0xFC39, 0x7075, 0xFC3C, 0xE77E,      0,
-      0,      0,      0, 0x7D79, 0x4B4B, 0x462C, 0xE822, 0xE823,
- 0x7D7A,      0, 0xFC3A, 0xFC3B, 0x3150, 0xE827,      0, 0x7077,
- 0x7074,      0,      0, 0x4951, 0x4D6A, 0x7078, 0xE829,      0,
-};
-static const unsigned short utf8_to_euc_E9A1[] = {
-      0,      0,      0,      0, 0xE82A,      0, 0x7079, 0xE82B,
-      0,      0, 0xE82C, 0x707B, 0x426A, 0x335B, 0x335C, 0x707A,
-      0, 0xE82D, 0xE82E, 0xE82F, 0x3469, 0x3832, 0xE830, 0xE831,
- 0x346A, 0xE832, 0xE833, 0x453F,      0,      0, 0x4E60,      0,
-      0,      0, 0xE834, 0xE835,      0, 0xE836, 0xE837, 0x385C,
-      0,      0, 0xE838, 0x707C, 0xE839,      0,      0, 0x707D,
- 0x707E, 0x7121,      0, 0x7123, 0x7122,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-};
-static const unsigned short utf8_to_euc_E9A1_x0213[] = {
-      0,      0,      0,      0, 0xE82A,      0, 0x7079, 0xFC3D,
-      0,      0, 0xE82C, 0x707B, 0x426A, 0x335B, 0x335C, 0x707A,
-      0, 0xE82D, 0x7D7C, 0x7D7D, 0x3469, 0x3832, 0x7D7E, 0x7E21,
- 0x346A, 0x7E22, 0x7E23, 0x453F,      0,      0, 0x4E60,      0,
-      0,      0, 0xE834, 0xE835,      0, 0x7E25, 0xFC3E, 0x385C,
-      0,      0, 0xE838, 0x707C, 0x7E26,      0,      0, 0x707D,
- 0x707E, 0x7121,      0, 0x7123, 0x7122,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-};
-static const unsigned short utf8_to_euc_E9A2[] = {
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
- 0x4977,      0, 0x7124, 0xE83A,      0, 0xE83B, 0xE83C, 0x7125,
- 0xE83D, 0x7126,      0,      0, 0xE83E,      0, 0x7127, 0xE83F,
- 0xE840,      0, 0xE841, 0xE842,      0,      0,      0, 0xE843,
-};
-static const unsigned short utf8_to_euc_E9A2_x0213[] = {
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
- 0x4977,      0, 0x7124, 0xFC3F,      0, 0xFC40, 0xE83C, 0x7125,
- 0xFC41, 0x7126,      0,      0, 0xE83E,      0, 0x7127, 0xFC43,
- 0xFC44,      0, 0x7E27, 0xFC45, 0xFC46,      0,      0, 0xFC47,
-};
-static const unsigned short utf8_to_euc_E9A3[] = {
-      0,      0, 0xE844, 0x7129, 0x7128, 0xE845, 0x712A,      0,
- 0xE846,      0,      0,      0, 0xE847,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0, 0x4874, 0x664C,      0,      0, 0x3F29,
-      0, 0xE848, 0x3532, 0xE849,      0, 0xE84A, 0xE84B, 0xE84C,
-      0, 0x712B, 0xE84D, 0x712C,      0, 0x522C, 0x5D3B, 0x4853,
-      0,      0, 0x307B, 0xE84E, 0x303B,      0, 0xE84F,      0,
-      0,      0,      0,      0, 0x3B74, 0x4B30, 0x3E7E,      0,
-};
-static const unsigned short utf8_to_euc_E9A3_x0213[] = {
-      0,      0, 0xFC48, 0x7129, 0x7128, 0xE845, 0x712A, 0xFC49,
- 0x7E28,      0,      0, 0xFC4A, 0xE847,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0, 0x4874, 0x664C,      0,      0, 0x3F29,
- 0xFC4B, 0xFC4D, 0x3532, 0xFC4E,      0, 0xFC4F, 0xE84B, 0x7E29,
-      0, 0x712B, 0xFC50, 0x712C,      0, 0x522C, 0x5D3B, 0x4853,
- 0xFC51, 0xFC52, 0x307B, 0xFC53, 0x303B,      0, 0xE84F,      0,
-      0,      0,      0,      0, 0x3B74, 0x4B30, 0x3E7E,      0,
-};
-static const unsigned short utf8_to_euc_E9A4[] = {
-      0,      0, 0xE850, 0x712D,      0, 0x4C5F,      0, 0xE851,
- 0xE852, 0x712E, 0x4D5C,      0, 0x3142,      0,      0,      0,
- 0x3B41, 0xE853, 0x712F, 0x326E, 0x7130, 0xE854, 0xE855, 0xE856,
- 0x7131,      0, 0xE857, 0xE858, 0xE859, 0x7133, 0x7134, 0xE85A,
- 0x7136, 0x7132, 0xE85B,      0, 0x7135,      0, 0xE85C, 0xE85D,
- 0x345B,      0,      0, 0xE85E, 0x7137,      0, 0x7138,      0,
-      0, 0xE85F, 0xE860, 0xE861, 0xE862, 0xE863,      0,      0,
-      0, 0xE864, 0xE865, 0xE866, 0xE867, 0x7139, 0x713A,      0,
-};
-static const unsigned short utf8_to_euc_E9A4_x0213[] = {
-      0,      0, 0xE850, 0x712D,      0, 0x4C5F,      0, 0xE851,
- 0xFC54, 0x712E, 0x4D5C,      0, 0x3142,      0,      0,      0,
- 0x3B41, 0xE853, 0x712F, 0x326E, 0x7130, 0xE854, 0xFC57, 0xFC58,
- 0x7131,      0, 0xFC5A, 0xFC5B, 0xFC5C, 0x7133, 0x7134, 0xE85A,
- 0x7136, 0x7132, 0xE85B,      0, 0x7135,      0, 0xE85C,      0,
- 0x345B,      0,      0, 0xE85E, 0x7137,      0, 0x7138,      0,
-      0, 0xFC5E, 0xFC5F, 0xFC60, 0xE862, 0xE863,      0,      0,
-      0, 0xE864, 0xFC61, 0xFC62, 0xFC63, 0x7139, 0x713A,      0,
-};
-static const unsigned short utf8_to_euc_E9A5[] = {
- 0xE868, 0xE869, 0x713B,      0,      0, 0x713D, 0xE86A, 0xE86B,
- 0xE86C, 0x713C,      0, 0x713F, 0x7142, 0xE86D, 0xE86E,      0,
- 0x713E, 0x7140, 0x7141,      0, 0xE86F, 0x7143,      0, 0x3642,
- 0xE870, 0xE871,      0, 0xE872, 0xE873,      0, 0xE874, 0xE875,
- 0xE876,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-};
-static const unsigned short utf8_to_euc_E9A5_x0213[] = {
- 0xFC64, 0xFC65, 0x713B,      0,      0, 0x713D, 0xFC66, 0xE86B,
- 0xE86C, 0x713C,      0, 0x713F, 0x7142, 0xFC67, 0xFC68,      0,
- 0x713E, 0x7140, 0x7141,      0, 0xE86F, 0x7143,      0, 0x3642,
- 0x7E2A, 0xE871,      0, 0xE872, 0xFC69,      0, 0xE874, 0xFC6A,
- 0xFC6B,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-};
-static const unsigned short utf8_to_euc_E9A6[] = {
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0, 0x3C73, 0x7144,
- 0x7145, 0x3961,      0, 0xE877,      0, 0xE878, 0xF47A, 0xE879,
-      0,      0,      0,      0,      0, 0x7146, 0xE87A,      0,
- 0x333E,      0,      0,      0, 0x474F, 0x7147, 0x7148,      0,
- 0xE87B, 0xE87C, 0xE87D, 0x435A, 0x466B, 0xE87E,      0,      0,
-      0, 0xE921, 0xE922,      0, 0x7149, 0xE923,      0, 0xE924,
-};
-static const unsigned short utf8_to_euc_E9A6_x0213[] = {
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0, 0x3C73, 0x7144,
- 0x7145, 0x3961,      0, 0xE877,      0, 0xE878, 0x7E2B, 0xE879,
-      0,      0,      0, 0xFC6C,      0, 0x7146, 0xFC6D,      0,
- 0x333E,      0,      0,      0, 0x474F, 0x7147, 0x7148,      0,
- 0xE87B, 0xE87C, 0xE87D, 0x435A, 0x466B, 0xE87E,      0,      0,
-      0, 0xFC6E, 0xE922,      0, 0x7149, 0xFC6F,      0, 0xFC70,
-};
-static const unsigned short utf8_to_euc_E9A7[] = {
-      0, 0x477D,      0, 0xE925, 0x424C, 0x3158, 0x366E,      0,
- 0x366F, 0xE926,      0,      0,      0,      0,      0,      0,
- 0x4373, 0x714E, 0x3670, 0xE927, 0xE928, 0x326F,      0,      0,
- 0x714D, 0xE929, 0xE92A, 0x714B, 0xE92B, 0x714C, 0xE92C, 0x714A,
-      0,      0, 0x7158,      0,      0,      0,      0, 0xE92D,
-      0,      0, 0xE92E, 0xE92F, 0xE930, 0x714F, 0x7150,      0,
- 0xE931, 0x7151, 0x7152,      0, 0xE932, 0xE933,      0,      0,
- 0x7154, 0xE934,      0, 0x7153,      0, 0xE935, 0xE936, 0x3D59,
-};
-static const unsigned short utf8_to_euc_E9A7_x0213[] = {
-      0, 0x477D,      0, 0xFC71, 0x424C, 0x3158, 0x366E,      0,
- 0x366F, 0xFC72,      0,      0,      0,      0,      0,      0,
- 0x4373, 0x714E, 0x3670, 0xE927, 0xFC73, 0x326F,      0,      0,
- 0x714D, 0xFC74, 0xE92A, 0x714B, 0xE92B, 0x714C, 0xFC75, 0x714A,
-      0,      0, 0x7158,      0,      0,      0,      0, 0xE92D,
-      0,      0, 0xE92E, 0xE92F, 0xE930, 0x714F, 0x7150,      0,
- 0xFC77, 0x7151, 0x7152,      0, 0xE932, 0xE933,      0,      0,
- 0x7154, 0xFC78,      0, 0x7153, 0xFC79, 0xE935, 0xE936, 0x3D59,
-};
-static const unsigned short utf8_to_euc_E9A8[] = {
-      0, 0x7155, 0xE937, 0xE938, 0xE939, 0x7157,      0,      0,
-      0,      0,      0, 0xE93A, 0xE93B,      0, 0x3533, 0x7156,
- 0xE93C, 0xE93D, 0x417B, 0x3833,      0,      0, 0xE93E,      0,
-      0, 0x7159,      0,      0,      0,      0, 0xE93F,      0,
- 0xE940,      0, 0xE941, 0xE942, 0xE943,      0,      0, 0xE944,
- 0x424D,      0,      0, 0x715A,      0, 0xE945, 0xE946,      0,
- 0x462D,      0,      0, 0xE947,      0, 0xE948, 0xE949, 0x715B,
- 0xE94A,      0,      0,      0,      0,      0, 0x7160,      0,
-};
-static const unsigned short utf8_to_euc_E9A8_x0213[] = {
-      0, 0x7155, 0x7E2C, 0x7E2D, 0xE939, 0x7157,      0,      0,
-      0,      0, 0xFC7A, 0xE93A, 0xE93B,      0, 0x3533, 0x7156,
- 0xE93C, 0xFC7B, 0x417B, 0x3833,      0,      0, 0xFC7C,      0,
-      0, 0x7159, 0xFC7D,      0,      0,      0, 0xE93F,      0,
- 0xFC7E,      0, 0xE941, 0xE942, 0x7E2E,      0,      0, 0xE944,
- 0x424D,      0,      0, 0x715A,      0, 0x7E2F, 0x7E30,      0,
- 0x462D, 0xFD21,      0, 0xE947,      0, 0xE948, 0xFD22, 0x715B,
- 0x7E31,      0,      0,      0,      0,      0, 0x7160,      0,
-};
-static const unsigned short utf8_to_euc_E9A9[] = {
- 0x715E, 0xE94C, 0x715D, 0x715F, 0xE94D, 0x715C,      0, 0xE94B,
-      0,      0, 0xE94E, 0xE94F, 0xE950, 0x7162, 0xE951,      0,
-      0, 0xE952,      0,      0, 0xE953, 0x7161, 0xE954, 0x7164,
-      0,      0, 0x3643, 0x7163,      0, 0xE955,      0, 0x7165,
-      0,      0, 0x7166,      0, 0x7168, 0x7167,      0,      0,
-      0, 0x7169, 0x716B, 0x716A,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-};
-static const unsigned short utf8_to_euc_E9A9_x0213[] = {
- 0x715E, 0xE94C, 0x715D, 0x715F, 0xFD23, 0x715C,      0, 0xE94B,
-      0,      0, 0x7E32, 0xE94F, 0xFD24, 0x7162, 0x7E33,      0,
-      0, 0xE952, 0x7E34,      0, 0xE953, 0x7161, 0xE954, 0x7164,
- 0xFD25,      0, 0x3643, 0x7163,      0, 0xE955,      0, 0x7165,
-      0,      0, 0x7166,      0, 0x7168, 0x7167,      0,      0,
-      0, 0x7169, 0x716B, 0x716A,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-};
-static const unsigned short utf8_to_euc_E9AA[] = {
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
- 0x397C,      0, 0xE956,      0, 0xE957, 0x716C, 0xE958, 0xE959,
- 0x716D,      0, 0xE95A,      0, 0xE95B, 0xE95C, 0xE95D,      0,
- 0x333C, 0xE95E,      0, 0xE95F, 0x716E,      0, 0xE960, 0xE961,
-};
-static const unsigned short utf8_to_euc_E9AA_x0213[] = {
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
- 0x397C,      0, 0xE956,      0, 0xE957, 0x716C, 0xE958, 0xFD27,
- 0x716D,      0, 0xE95A,      0, 0xE95B, 0xE95C, 0x7E35, 0xFD29,
- 0x333C, 0xFD2B,      0, 0xE95F, 0x716E,      0, 0xE960, 0xE961,
-};
-static const unsigned short utf8_to_euc_E9AB[] = {
- 0x716F, 0xE962,      0, 0xE963, 0x3F71,      0, 0xE964,      0,
- 0xE965,      0,      0,      0,      0,      0, 0xE966, 0x7170,
- 0xE967, 0x7171, 0xE968, 0x7172, 0x7173, 0xE969, 0xE96A, 0xE96B,
- 0x3962, 0xF47B,      0, 0xE96C, 0xE96D,      0, 0x7174, 0x7175,
- 0xE96E,      0, 0x7176, 0x7177, 0xE96F, 0xE970, 0x7178, 0xE971,
-      0, 0xE972, 0x4831, 0x717A, 0xE973, 0x4926, 0x717B, 0x7179,
-      0, 0x717D, 0xE974, 0xE975, 0x717C, 0xE976,      0, 0x717E,
-      0, 0xE977, 0xE978, 0x7221,      0, 0xE979,      0, 0xE97A,
-};
-static const unsigned short utf8_to_euc_E9AB_x0213[] = {
- 0x716F, 0x7E36,      0, 0x7E37, 0x3F71,      0, 0xFD2D,      0,
- 0xE965,      0,      0,      0,      0,      0, 0x7E38, 0x7170,
- 0xFD2E, 0x7171, 0xFD2F, 0x7172, 0x7173, 0xFD30, 0x7E39, 0xE96B,
- 0x3962,      0,      0, 0xE96C, 0xFD32,      0, 0x7174, 0x7175,
- 0xFD33,      0, 0x7176, 0x7177, 0xE96F, 0xFD34, 0x7178, 0xE971,
-      0, 0xFD35, 0x4831, 0x717A, 0xE973, 0x4926, 0x717B, 0x7179,
-      0, 0x717D, 0xE974, 0xE975, 0x717C, 0xE976,      0, 0x717E,
-      0, 0x7E3A, 0xE978, 0x7221,      0, 0xE979,      0, 0xE97A,
-};
-static const unsigned short utf8_to_euc_E9AC[] = {
- 0xE97B, 0xE97C, 0xE97D, 0xE97E, 0xEA21, 0xEA22, 0x7222,      0,
- 0xEA23, 0xEA24,      0, 0xEA25, 0xEA26, 0xEA27, 0xEA28,      0,
- 0xEA29,      0, 0xEA2A,      0,      0,      0, 0xEA2B,      0,
- 0x7223, 0xEA2C, 0x7224, 0xEA2D, 0xEA2E,      0,      0, 0x7225,
- 0xEA2F,      0, 0x7226, 0x7227,      0, 0x7228, 0xEA30, 0x7229,
- 0x722A, 0x722B, 0x722C, 0xEA31,      0, 0xEA32, 0x722D, 0x722E,
-      0, 0x5D35, 0x722F, 0xEA33, 0xEA34, 0xEA35,      0, 0xEA36,
-      0, 0xEA37, 0xEA38, 0x6478, 0x3534, 0xEA39,      0,      0,
-};
-static const unsigned short utf8_to_euc_E9AC_x0213[] = {
- 0xE97B, 0xE97C, 0x7E3B, 0xFD36, 0xEA21, 0xEA22, 0x7222,      0,
- 0x7E3C, 0xEA24,      0, 0xEA25, 0xFD37, 0xEA27, 0xEA28,      0,
- 0xFD38,      0, 0xFD39,      0,      0,      0, 0xFD3A,      0,
- 0x7223, 0xEA2C, 0x7224, 0xEA2D, 0xFD3B,      0,      0, 0x7225,
- 0x7E3D,      0, 0x7226, 0x7227,      0, 0x7228, 0xEA30, 0x7229,
- 0x722A, 0x722B, 0x722C, 0xFD3C,      0, 0x7E3F, 0x722D, 0x722E,
-      0, 0x5D35, 0x722F, 0xFD3D, 0xEA34, 0xEA35,      0, 0xEA36,
-      0, 0xEA37, 0xEA38, 0x6478, 0x3534, 0xFD3E,      0,      0,
-};
-static const unsigned short utf8_to_euc_E9AD[] = {
-      0, 0x3321, 0x3A32, 0x7231, 0x7230, 0x4C25,      0,      0,
- 0xEA3A,      0,      0, 0xEA3B, 0xEA3C, 0x7233, 0x7234, 0x7232,
-      0, 0x7235,      0,      0, 0x4B62, 0xEA3D, 0xEA3E, 0xEA3F,
- 0x7236,      0, 0x357B, 0xEA40,      0,      0, 0xEA41,      0,
-      0, 0xEA42,      0, 0xEA43,      0, 0xEA44, 0xEA45,      0,
- 0xEA46,      0, 0xEA47, 0xEA48, 0xEA49, 0xEA4A, 0xEA4B, 0x4F25,
-      0,      0, 0xF47C, 0xEA4C, 0x7237, 0xEA4D,      0, 0xEA4E,
- 0xEA4F, 0xEA50,      0,      0,      0,      0,      0, 0xEA51,
-};
-static const unsigned short utf8_to_euc_E9AD_x0213[] = {
-      0, 0x3321, 0x3A32, 0x7231, 0x7230, 0x4C25,      0,      0,
- 0xEA3A,      0,      0, 0xFD40, 0xEA3C, 0x7233, 0x7234, 0x7232,
-      0, 0x7235,      0,      0, 0x4B62, 0xEA3D, 0xEA3E, 0xEA3F,
- 0x7236,      0, 0x357B, 0xEA40,      0,      0, 0x7E40,      0,
-      0, 0xEA42,      0, 0xFD41,      0, 0xFD42, 0x7E42,      0,
- 0xEA46,      0, 0xEA47, 0xFD43, 0xFD44, 0xEA4A, 0xEA4B, 0x4F25,
-      0,      0, 0x7E43, 0xFD45, 0x7237, 0x7E44, 0xFD46, 0xFD47,
- 0xEA4F, 0x7E41,      0,      0,      0,      0,      0, 0xEA51,
-};
-static const unsigned short utf8_to_euc_E9AE[] = {
- 0xEA52,      0,      0, 0x7239, 0xEA53, 0xEA54, 0xEA55, 0xEA56,
-      0, 0xEA57, 0xEA58, 0xEA59,      0, 0xEA5A, 0x303E, 0xEA5B,
- 0xEA5C, 0x723A, 0x4A2B, 0x7238, 0xEA5D,      0, 0x723B, 0x723C,
-      0,      0, 0xEA5E,      0,      0, 0xEA5F, 0xEA60, 0x723D,
- 0x723E,      0,      0,      0,      0,      0, 0xEA61, 0xEA62,
- 0x723F, 0xEA63, 0x4B6E, 0x3B2D, 0xEA64, 0x3A7A, 0x412F,      0,
- 0xEA65, 0xEA66, 0xEA67,      0, 0x7240,      0,      0, 0xEA68,
- 0xEA69, 0x7243,      0, 0xEA6A, 0xEA6B,      0, 0xEA6C, 0xEA6D,
-};
-static const unsigned short utf8_to_euc_E9AE_x0213[] = {
- 0xEA52,      0,      0, 0x7239, 0x7E45, 0xEA54, 0xEA55, 0xEA56,
-      0, 0xEA57, 0x7E46, 0xEA59,      0, 0xEA5A, 0x303E, 0x7E47,
- 0xEA5C, 0x723A, 0x4A2B, 0x7238, 0xEA5D,      0, 0x723B, 0x723C,
-      0,      0, 0xEA5E,      0,      0, 0xEA5F, 0x7E48, 0x723D,
- 0x723E,      0,      0,      0,      0,      0, 0xFD48, 0x7E49,
- 0x723F, 0xEA63, 0x4B6E, 0x3B2D, 0xFD49, 0x3A7A, 0x412F,      0,
- 0xEA65, 0xFD4A, 0xFD4D,      0, 0x7240,      0,      0, 0xEA68,
- 0xFD4E, 0x7243,      0,      0, 0xEA6B,      0, 0xFD4F, 0xEA6D,
-};
-static const unsigned short utf8_to_euc_E9AF[] = {
- 0x7241, 0xEA6E,      0,      0,      0,      0, 0x7244, 0xEA6F,
- 0xEA70, 0x3871, 0x7242,      0,      0,      0, 0xEA71, 0x7245,
- 0xEA72, 0x7246, 0x7247,      0, 0x724B,      0, 0x3B2A, 0xEA73,
- 0xEA74,      0,      0, 0x4264,      0, 0xEA75,      0, 0xEA76,
-      0, 0x724C, 0x7249, 0x7248, 0x724A, 0xEA77,      0, 0xEA78,
- 0x375F,      0, 0xEA79, 0xEA7A,      0,      0,      0, 0xEA7B,
- 0x7250, 0x724F, 0x724E, 0xEA7C,      0, 0x3033,      0, 0xEA7D,
- 0xEA7E, 0xEB21, 0xEB22,      0,      0, 0xEB23,      0, 0xEB24,
-};
-static const unsigned short utf8_to_euc_E9AF_x0213[] = {
- 0x7241, 0x7E4A,      0,      0,      0,      0, 0x7244, 0xFD50,
- 0xEA70, 0x3871, 0x7242,      0,      0,      0, 0x7E4B, 0x7245,
- 0xEA72, 0x7246, 0x7247,      0, 0x724B,      0, 0x3B2A, 0xEA73,
- 0xFD52,      0,      0, 0x4264,      0, 0xFD53,      0, 0xEA76,
-      0, 0x724C, 0x7249, 0x7248, 0x724A, 0x7E4C,      0, 0xFD54,
- 0x375F,      0, 0xFD55, 0xFD56,      0,      0, 0xFD58, 0xFD57,
- 0x7250, 0x724F, 0x724E, 0xFD51,      0, 0x3033,      0, 0xFD5C,
- 0x7E4D, 0xEB21, 0xFD5A,      0,      0, 0x7E4E,      0, 0xEB24,
-};
-static const unsigned short utf8_to_euc_E9B0[] = {
- 0xEB25,      0, 0xEB26,      0, 0x725A,      0, 0x7256,      0,
- 0x7257, 0x7253, 0x7259, 0xEB27, 0x7255, 0x3362,      0, 0xEB28,
- 0x4F4C, 0xEB29, 0x7258, 0x7254, 0x7252, 0x7251, 0xEB2A,      0,
- 0xEB2B, 0xEB2C, 0xEB2D, 0x725C, 0xEB2E,      0, 0xEB2F,      0,
-      0, 0x725F, 0xEB30, 0xEB31, 0x725E, 0x725D, 0xEB32, 0xEB33,
- 0xEB34, 0xEB35, 0xEB36,      0,      0, 0x4949, 0x725B, 0x3073,
- 0x7260, 0xEB37, 0x7262,      0,      0, 0xEB38, 0xEB39, 0xEB3A,
-      0, 0x336F, 0x724D, 0x3137,      0, 0xEB3B, 0x7264,      0,
-};
-static const unsigned short utf8_to_euc_E9B0_x0213[] = {
- 0x7E4F,      0, 0xEB26,      0, 0x725A,      0, 0x7256,      0,
- 0x7257, 0x7253, 0x7259, 0xEB27, 0x7255, 0x3362,      0, 0xEB28,
- 0x4F4C, 0xEB29, 0x7258, 0x7254, 0x7252, 0x7251, 0xFD5E,      0,
- 0xFD5F, 0xFD60, 0xFD61, 0x725C, 0xEB2E, 0xFD62, 0xEB2F,      0,
-      0, 0x725F, 0xFD63, 0x7E50, 0x725E, 0x725D, 0xEB32, 0xFD64,
- 0xEB34, 0xFD65, 0xFD66,      0,      0, 0x4949, 0x725B, 0x3073,
- 0x7260, 0xFD68, 0x7262,      0,      0, 0xEB38, 0xFD69, 0xFD6A,
-      0, 0x336F, 0x724D, 0x3137,      0, 0xEB3B, 0x7264,      0,
-};
-static const unsigned short utf8_to_euc_E9B1[] = {
-      0, 0xEB3C,      0, 0xEB3D, 0xEB3E, 0xEB3F, 0x7263, 0x7261,
- 0x432D, 0xEB40, 0xEB41,      0,      0,      0, 0xEB42, 0xEB43,
- 0xEB44,      0, 0x4B70, 0xEB45, 0xEB46,      0, 0xEB47, 0x4E5A,
- 0xEB48,      0, 0x7265, 0xEB49, 0xEB50, 0xEB4A, 0xEB4B, 0xEB4C,
- 0x7266,      0,      0, 0xEB4D,      0,      0,      0, 0x7267,
- 0xEB52, 0xEB4E, 0xEB4F, 0xEB51,      0,      0, 0xEB53,      0,
- 0xEB54,      0, 0xEB55,      0,      0, 0xEB56, 0x7268, 0xEB57,
- 0x7269,      0,      0, 0xEB58,      0,      0,      0,      0,
-};
-static const unsigned short utf8_to_euc_E9B1_x0213[] = {
-      0, 0x7E51,      0, 0xEB3D, 0xEB3E, 0xFD6B, 0x7263, 0x7261,
- 0x432D, 0xFD6E, 0xFD6F,      0,      0,      0, 0xEB42, 0x7E52,
- 0x7E53,      0, 0x4B70, 0x7E54, 0xFD71,      0, 0xEB47, 0x4E5A,
- 0xFD72,      0, 0x7265, 0xFD73, 0xFD6C, 0xFD74, 0xEB4B, 0xFD75,
- 0x7266,      0,      0, 0x7E55,      0, 0x7E56,      0, 0x7267,
- 0xEB52, 0xFD76, 0xFD77, 0xFD78,      0, 0xFD79, 0xFD7A,      0,
- 0xFD7B,      0, 0xFD7C,      0,      0, 0xFD7D, 0x7268, 0x7E57,
- 0x7269,      0, 0xFD7E, 0xEB58,      0,      0,      0,      0,
-};
-static const unsigned short utf8_to_euc_E9B3[] = {
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0, 0x443B, 0xEB59, 0x726A,
-      0, 0x4837,      0, 0x726F, 0x726B,      0,      0,      0,
- 0x726C,      0, 0xEB5A, 0x4B31, 0x4C44,      0, 0x4650, 0xEB5B,
-      0, 0xEB5C,      0,      0,      0,      0,      0,      0,
-};
-static const unsigned short utf8_to_euc_E9B3_x0213[] = {
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0, 0x443B, 0xFE21, 0x726A,
-      0, 0x4837,      0, 0x726F, 0x726B,      0,      0,      0,
- 0x726C,      0, 0xFE22, 0x4B31, 0x4C44,      0, 0x4650, 0xEB5B,
-      0, 0xEB5C,      0,      0,      0,      0,      0,      0,
-};
-static const unsigned short utf8_to_euc_E9B4[] = {
-      0,      0, 0xEB5E, 0x7270,      0,      0, 0x7271, 0x463E,
- 0x726E, 0x726D,      0, 0xEB5D,      0,      0, 0x322A,      0,
-      0, 0xEB5F, 0x7279,      0,      0, 0x7278,      0, 0xEB60,
- 0xEB61,      0,      0, 0x3175, 0xEB62, 0xEB63, 0xEB64, 0x7276,
-      0,      0,      0, 0x7275,      0,      0, 0x7273,      0,
- 0x337B,      0, 0x7272, 0x3C32, 0x3229,      0,      0, 0xEB65,
- 0xEB66,      0, 0xEB67, 0xEB68, 0xEB69,      0,      0,      0,
-      0,      0, 0xEB6A, 0x3963, 0xEB6B, 0xEB6D, 0x727C, 0x727B,
-};
-static const unsigned short utf8_to_euc_E9B4_x0213[] = {
-      0,      0, 0xFE24, 0x7270,      0,      0, 0x7271, 0x463E,
- 0x726E, 0x726D,      0, 0xFE23,      0,      0, 0x322A,      0,
-      0, 0xFE26, 0x7279,      0,      0, 0x7278,      0, 0xFE27,
- 0xFE28,      0,      0, 0x3175, 0xEB62, 0x7E58, 0x7E59, 0x7276,
-      0,      0,      0, 0x7275,      0,      0, 0x7273,      0,
- 0x337B,      0, 0x7272, 0x3C32, 0x3229,      0,      0, 0xEB65,
- 0xEB66,      0, 0xFE2C, 0xEB68, 0xEB69,      0,      0,      0,
-      0,      0, 0xEB6A, 0x3963, 0xEB6B, 0xEB6D, 0x727C, 0x727B,
-};
-static const unsigned short utf8_to_euc_E9B5[] = {
-      0, 0x727A, 0xEB6E, 0xEB6F, 0x7277, 0xEB6C, 0x727D, 0xEB70,
- 0x727E,      0, 0xEB71,      0,      0,      0,      0,      0,
- 0x7325, 0x7324,      0, 0xEB72, 0xEB73,      0,      0,      0,
-      0, 0x7326,      0,      0, 0x312D, 0x7321, 0x7322, 0xEB74,
- 0x3974, 0x4C39, 0xEB76, 0xEB75, 0x7323, 0xEB77,      0,      0,
-      0, 0xEB78, 0xEB79, 0xEB7A, 0x4B32,      0,      0, 0x732B,
- 0xEB7B,      0, 0x7327,      0,      0,      0, 0xEB7C, 0xEB7D,
-      0,      0, 0x732C, 0xEB7E, 0xEC21,      0, 0xEC22,      0,
-};
-static const unsigned short utf8_to_euc_E9B5_x0213[] = {
-      0, 0x727A, 0xFE2E, 0x7E5A, 0x7277, 0xEB6C, 0x727D, 0x7E5B,
- 0x727E,      0, 0xFE2F,      0,      0,      0,      0,      0,
- 0x7325, 0x7324, 0x7E5C, 0xEB72, 0xEB73,      0,      0,      0,
-      0, 0x7326,      0,      0, 0x312D, 0x7321, 0x7322, 0xFE30,
- 0x3974, 0x4C39, 0xFE31, 0x7E5D, 0x7323, 0xEB77,      0,      0,
-      0, 0xFE33, 0xEB79, 0xFE34, 0x4B32,      0,      0, 0x732B,
- 0x7E5E,      0, 0x7327, 0xFE36,      0,      0, 0xFE37, 0xFE38,
-      0,      0, 0x732C, 0xEB7E, 0x7E5F,      0, 0xFE39,      0,
-};
-static const unsigned short utf8_to_euc_E9B6[] = {
-      0,      0,      0, 0xEC23, 0xEC24,      0, 0xEC25, 0x7329,
-      0, 0x7328, 0xEC26,      0,      0, 0xEC27, 0xEC28, 0x375C,
-      0,      0, 0xEC29, 0xEC2A,      0, 0xEC2B, 0xEC2C, 0xEC2D,
- 0xEC2E,      0, 0x732D,      0,      0,      0,      0,      0,
-      0, 0xEC2F,      0,      0, 0x732E,      0,      0,      0,
-      0, 0x732F, 0xEC30, 0x732A, 0xEC31,      0, 0xEC32, 0x7274,
-      0, 0xEC33, 0x7330,      0, 0x4461, 0xEC34,      0,      0,
- 0x7334, 0xEC35, 0x7335, 0x7333, 0xEC36,      0,      0, 0xEC37,
-};
-static const unsigned short utf8_to_euc_E9B6_x0213[] = {
-      0,      0,      0, 0xEC23, 0xFE3A,      0, 0xEC25, 0x7329,
-      0, 0x7328, 0x7E60,      0,      0, 0xFE3B, 0xEC28, 0x375C,
-      0,      0, 0xEC29, 0xEC2A,      0, 0xEC2B, 0x7E61, 0xEC2D,
- 0xEC2E, 0xFE3C, 0x732D,      0,      0,      0,      0,      0,
-      0, 0xFE3D,      0,      0, 0x732E,      0,      0,      0,
-      0, 0x732F, 0xEC30, 0x732A, 0x7E63,      0, 0xEC32, 0x7274,
-      0, 0xEC33, 0x7330,      0, 0x4461, 0xFE3F,      0,      0,
- 0x7334, 0xFE40, 0x7335, 0x7333, 0x7E64, 0xFE41,      0, 0xFE3E,
-};
-static const unsigned short utf8_to_euc_E9B7[] = {
-      0, 0x7332, 0x7338, 0xEC38, 0x7331,      0, 0x7336, 0xEC39,
-      0, 0xEC3A, 0xEC3B,      0,      0,      0,      0, 0x7337,
-      0,      0,      0, 0x733A, 0xEC3C, 0xEC3D, 0xEC3E, 0xEC3F,
-      0, 0x7339, 0xEC40,      0,      0,      0, 0xEC41, 0xEC42,
- 0xEC43,      0,      0,      0,      0, 0xEC44, 0x733C, 0xEC45,
-      0, 0xEC46,      0, 0xEC47,      0, 0x733D, 0xEC48, 0x733E,
- 0xEC49,      0, 0x4F49, 0xEC4A, 0xEC4B,      0,      0,      0,
- 0x733B, 0x426B, 0x3A6D,      0,      0, 0x733F, 0xEC4C,      0,
-};
-static const unsigned short utf8_to_euc_E9B7_x0213[] = {
- 0x7E62, 0x7332, 0x7338, 0xFE42, 0x7331,      0, 0x7336, 0xFE43,
-      0, 0xFE44, 0xEC3B,      0,      0,      0,      0, 0x7337,
-      0,      0,      0, 0x733A, 0xEC3C, 0xEC3D, 0xFE45, 0x7E65,
-      0, 0x7339, 0xFE46,      0,      0,      0, 0xEC41, 0xFE47,
- 0xFE48,      0,      0, 0xFE49,      0, 0xEC44, 0x733C, 0x7E67,
-      0, 0xEC46,      0, 0xEC47,      0, 0x733D, 0xEC48, 0x733E,
- 0xEC49,      0, 0x4F49, 0xEC4A, 0xFE4A,      0,      0,      0,
- 0x733B, 0x426B, 0x3A6D,      0,      0, 0x733F, 0xEC4C,      0,
-};
-static const unsigned short utf8_to_euc_E9B8[] = {
-      0,      0, 0xEC4E,      0,      0,      0,      0, 0xEC4F,
-      0,      0, 0xEC4D,      0,      0,      0, 0xEC50,      0,
- 0xEC51, 0xEC52, 0xEC53,      0,      0, 0xEC54, 0xEC55,      0,
-      0, 0xEC56, 0x7340, 0x7341, 0xEC57, 0xEC58, 0x7342,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-};
-static const unsigned short utf8_to_euc_E9B8_x0213[] = {
-      0,      0, 0xFE4D,      0,      0,      0,      0, 0x7E68,
-      0,      0, 0xFE4C,      0,      0, 0xFE4E, 0xEC50,      0,
- 0xEC51, 0xEC52, 0xEC53,      0,      0, 0x7E69, 0xEC55,      0,
-      0, 0xFE4F, 0x7340, 0x7341, 0xFE50, 0xFE51, 0x7342,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-};
-static const unsigned short utf8_to_euc_E9B9[] = {
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0, 0x7343,      0,      0,
- 0x3834, 0x7344, 0xEC59, 0xEC5A, 0xEC5B, 0x7345,      0, 0x3C2F,
-};
-static const unsigned short utf8_to_euc_E9B9_x0213[] = {
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0, 0x7343,      0,      0,
- 0x3834, 0x7344, 0xEC59, 0xFE52, 0x7E6A, 0x7345,      0, 0x3C2F,
-};
-static const unsigned short utf8_to_euc_E9BA[] = {
- 0xEC5C, 0x7346, 0xEC5D, 0xEC5E, 0xEC5F, 0xEC60,      0, 0xEC61,
- 0x7347,      0,      0, 0x7348, 0x7349,      0, 0xEC62, 0xEC63,
-      0, 0x734C, 0x734A, 0x4F3C,      0, 0x734B, 0xEC64, 0x4E6F,
- 0xEC65,      0,      0, 0xEC66,      0, 0x734D, 0xEC67, 0x4E5B,
-      0,      0,      0,      0, 0xEC68, 0x734E, 0x477E,      0,
- 0xEC69, 0x734F, 0x7351,      0, 0xEC6A, 0x7352, 0xEC6B, 0xEC6C,
- 0xEC6D,      0,      0, 0xEC6E, 0xEC6F, 0xEC70,      0,      0,
- 0x7350, 0x396D, 0x4C4D, 0x4B63, 0x5677,      0, 0x5D60, 0x4B7B,
-};
-static const unsigned short utf8_to_euc_E9BA_x0213[] = {
- 0xFE54, 0x7346, 0xEC5D, 0xEC5E, 0xEC5F, 0xFE55,      0, 0xEC61,
- 0x7347,      0,      0, 0x7348, 0x7349,      0, 0xEC62, 0xEC63,
-      0, 0x734C, 0x734A, 0x4F3C,      0, 0x734B, 0xEC64, 0x4E6F,
- 0xEC65,      0,      0, 0xFE56,      0, 0x734D, 0x7E6B, 0x4E5B,
-      0,      0,      0,      0, 0x7E6C, 0x734E, 0x477E,      0,
- 0xFE57, 0x734F, 0x7351,      0, 0x7E6D, 0x7352, 0xEC6B, 0x7E6E,
- 0xEC6D,      0,      0, 0xEC6E, 0x7E6F, 0x7E70,      0,      0,
- 0x7350, 0x396D, 0x4C4D, 0x4B63, 0x5677, 0xFE59, 0x5D60, 0x4B7B,
-};
-static const unsigned short utf8_to_euc_E9BB[] = {
-      0,      0,      0,      0, 0x322B,      0, 0xEC71,      0,
- 0xEC72,      0,      0, 0xEC73, 0x7354, 0x3550, 0x7355, 0x7356,
- 0x7357, 0xF47E, 0x3975,      0, 0x7358, 0xEC74,      0,      0,
- 0x6054, 0x4C5B,      0, 0x4263, 0x7359, 0x735B, 0x735A, 0xEC75,
- 0x735C,      0,      0,      0, 0xEC76, 0x735D,      0, 0xEC77,
- 0x735E,      0,      0,      0, 0xEC78, 0xEC79, 0xEC7A, 0x735F,
- 0xEC7B, 0xEC7C, 0xEC7D,      0, 0x7360, 0xEC7E, 0x7361, 0x7362,
- 0xED21, 0x7363,      0, 0x7364, 0x7365, 0x7366,      0, 0xED22,
-};
-static const unsigned short utf8_to_euc_E9BB_x0213[] = {
-      0,      0,      0, 0x7E71, 0x322B,      0, 0xEC71,      0,
- 0xEC72,      0,      0, 0xEC73, 0x7354, 0x3550, 0x7355, 0x7356,
- 0x7357, 0x7E72, 0x3975,      0, 0x7358, 0xEC74,      0,      0,
- 0x6054, 0x4C5B,      0, 0x4263, 0x7359, 0x735B, 0x735A, 0xFE5B,
- 0x735C,      0,      0,      0, 0xEC76, 0x735D,      0, 0xFE5C,
- 0x735E,      0,      0,      0, 0xEC78, 0xEC79, 0xFE5D, 0x735F,
- 0xEC7B, 0xEC7C, 0xEC7D,      0, 0x7360, 0xEC7E, 0x7361, 0x7362,
- 0xED21, 0x7363,      0, 0x7364, 0x7365, 0x7366,      0, 0xFE5E,
-};
-static const unsigned short utf8_to_euc_E9BC[] = {
-      0,      0, 0xED23, 0xED24,      0,      0,      0, 0x7367,
- 0x7368, 0xED25,      0,      0,      0,      0, 0x4524, 0xED26,
- 0xED27, 0xED28, 0xED29, 0x385D, 0xED2A, 0x736A, 0xED2B, 0xED2C,
-      0, 0xED2D, 0xED2E, 0xED2F,      0,      0,      0, 0xED30,
- 0x414D, 0x736B, 0xED31,      0,      0,      0, 0xED32,      0,
-      0,      0, 0xED33, 0xED34, 0x736C,      0,      0, 0xED35,
-      0, 0xED36, 0xED37,      0, 0xED38,      0,      0, 0xED39,
-      0, 0xED3A, 0xED3B, 0x4921, 0xED3C, 0xED3D, 0x736D, 0xED3E,
-};
-static const unsigned short utf8_to_euc_E9BC_x0213[] = {
-      0,      0, 0xFE5F, 0xFE61,      0,      0,      0, 0x7367,
- 0x7368, 0xED25,      0,      0,      0,      0, 0x4524, 0xED26,
- 0x7E73, 0xED28, 0xED29, 0x385D, 0xED2A, 0x736A, 0xED2B, 0xFE62,
-      0, 0xFE63, 0xED2E, 0xED2F,      0,      0,      0, 0xED30,
- 0x414D, 0x736B, 0xED31,      0,      0,      0, 0xED32,      0,
-      0,      0, 0xED33, 0xED34, 0x736C,      0,      0, 0xFE64,
-      0, 0xED36, 0xED37,      0, 0xED38,      0,      0, 0xFE65,
-      0, 0x7E74, 0xFE66, 0x4921, 0xED3C, 0xFE67, 0x736D, 0xED3E,
-};
-static const unsigned short utf8_to_euc_E9BD[] = {
-      0, 0xED3F,      0, 0xED40, 0xED41, 0xED42, 0xED43, 0xED44,
-      0,      0, 0x736E, 0x6337,      0,      0, 0x6C5A, 0x706D,
-      0,      0, 0x736F, 0xED45, 0x7370, 0xED46, 0xED47, 0xED48,
- 0xED49,      0, 0xED4A,      0,      0, 0xED4B, 0xED4C, 0x7372,
- 0x7373, 0x7374, 0x4E70, 0x7371,      0,      0, 0x7375, 0x7376,
- 0xED4D, 0xED4E, 0x7378,      0, 0x7377, 0xED4F, 0xED50, 0xED51,
- 0xED52, 0xED53, 0x737A, 0xED54,      0, 0xED55, 0x737B, 0x7379,
-      0,      0, 0xED56,      0,      0, 0xED57,      0,      0,
-};
-static const unsigned short utf8_to_euc_E9BD_x0213[] = {
-      0, 0xFE68,      0, 0xED40, 0xED41, 0xFE69, 0xFE6A, 0xED44,
-      0,      0, 0x736E, 0x6337,      0,      0, 0x6C5A, 0x706D,
-      0,      0, 0x736F, 0xFE6B, 0x7370, 0xFE6C, 0xED47, 0x7E75,
- 0xFE6D,      0, 0xED4A,      0,      0, 0xFE6F, 0xED4C, 0x7372,
- 0x7373, 0x7374, 0x4E70, 0x7371,      0,      0, 0x7375, 0x7376,
- 0xED4D, 0xFE71, 0x7378,      0, 0x7377, 0xFE73, 0xED50, 0xED51,
- 0xFE74, 0xED53, 0x737A, 0xED54,      0, 0xFE75, 0x737B, 0x7379,
-      0,      0, 0xED56,      0,      0, 0xED57,      0,      0,
-};
-static const unsigned short utf8_to_euc_E9BE[] = {
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0, 0x4E36,      0, 0xED58,
- 0xED59, 0xED5A, 0xED5B,      0, 0xED5C, 0x737C, 0xED5D, 0xED5E,
-      0,      0,      0,      0, 0x737D, 0x6354, 0xED5F,      0,
- 0x737E, 0xED60, 0xED61, 0xED62,      0, 0xED63,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-};
-static const unsigned short utf8_to_euc_E9BE_x0213[] = {
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0, 0x4E36,      0, 0xED58,
- 0x7E76, 0xED5A, 0xED5B,      0, 0x7E77, 0x737C, 0xED5D, 0x7E78,
-      0,      0,      0,      0, 0x737D, 0x6354, 0xED5F,      0,
- 0x737E, 0xED60, 0x7E79, 0xED62,      0, 0xED63,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-};
-static const unsigned short utf8_to_euc_EFA4[] = {
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0, 0xF445,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-};
-static const unsigned short utf8_to_euc_EFA4_x0213[] = {
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0, 0x763B,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
- 0x742E, 0x754E,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0, 0x7B4F,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-};
-static const unsigned short utf8_to_euc_EFA5_x0213[] = {
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
- 0x7649,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-};
-static const unsigned short utf8_to_euc_EFA7[] = {
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0, 0xF472,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-};
-static const unsigned short utf8_to_euc_EFA7_x0213[] = {
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
- 0x7E24,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0, 0x7D5D,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-};
-static const unsigned short utf8_to_euc_EFA8[] = {
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0, 0xF434, 0xF437,
- 0xF438, 0xF43D, 0xF444, 0xF447, 0xF448, 0xF44E, 0xF44F, 0xF453,
- 0xF455, 0xF456, 0xF457, 0xF458, 0xF45A, 0xF45B, 0xF45E, 0xF460,
- 0xF462, 0xF463, 0xF465, 0xF469, 0xF46A, 0xF46B, 0xF46D, 0xF46F,
- 0xF470, 0xF473, 0xF477, 0xF478, 0xF479, 0xF47D,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-};
-static const unsigned short utf8_to_euc_EFA8_x0213[] = {
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0, 0x2F4B,
- 0x2F57, 0x4F72,      0, 0xAE79, 0x757A, 0x775A, 0x776F,      0,
-      0, 0x793C, 0x793D, 0x7941,      0,      0,      0, 0x7B3A,
- 0xF738, 0xF745, 0x7C2E,      0, 0xF96E,      0, 0x7C6A,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
- 0x2E38, 0x2E49, 0x2E50, 0x2E63, 0x2E68, 0x2E6E, 0x2F2C, 0x2F2F,
- 0x2F36, 0x2F5A, 0x2F5E, 0x4F61, 0x4F62, 0x7450, 0x745C, 0x745E,
-};
-static const unsigned short utf8_to_euc_EFA9_x0213[] = {
- 0x7461, 0x7528, 0x752B, 0x7543, 0x7565, 0x7669, 0x7677, 0x7725,
- 0x7755, 0xF029, 0x7825, 0x7927, 0x7933, 0x7934, 0x7937, 0x7938,
- 0x7939, 0x793B, 0x793F, 0x7940, 0x794D, 0x7951, 0x7964, 0x7A2E,
- 0xF450, 0x7A33, 0x7A3A, 0x7A44, 0x7A58, 0xF574, 0xF575, 0x7B27,
- 0x7B6F, 0x7B79, 0x7C2F, 0x7C30, 0x7C38, 0x7C3D, 0xF969, 0x7C59,
- 0x7D63, 0x7D76, 0x7D7B,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-};
-static const unsigned short utf8_to_euc_EFB9_x0213[] = {
-      0,      0,      0,      0,      0, 0x233E, 0x233D,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-};
-static const unsigned short utf8_to_euc_EFBC[] = {
-      0, 0x212A, 0xF42A, 0x2174, 0x2170, 0x2173, 0x2175, 0xF429,
- 0x214A, 0x214B, 0x2176, 0x215C, 0x2124, 0x215D, 0x2125, 0x213F,
- 0x2330, 0x2331, 0x2332, 0x2333, 0x2334, 0x2335, 0x2336, 0x2337,
- 0x2338, 0x2339, 0x2127, 0x2128, 0x2163, 0x2161, 0x2164, 0x2129,
- 0x2177, 0x2341, 0x2342, 0x2343, 0x2344, 0x2345, 0x2346, 0x2347,
- 0x2348, 0x2349, 0x234A, 0x234B, 0x234C, 0x234D, 0x234E, 0x234F,
- 0x2350, 0x2351, 0x2352, 0x2353, 0x2354, 0x2355, 0x2356, 0x2357,
- 0x2358, 0x2359, 0x235A, 0x214E, 0x2140, 0x214F, 0x2130, 0x2132,
-};
-static const unsigned short utf8_to_euc_EFBC_x0213[] = {
-      0, 0x212A, 0x2230, 0x2174, 0x2170, 0x2173, 0x2175, 0x222F,
- 0x214A, 0x214B, 0x2176, 0x215C, 0x2124, 0x2231, 0x2125, 0x213F,
- 0x2330, 0x2331, 0x2332, 0x2333, 0x2334, 0x2335, 0x2336, 0x2337,
- 0x2338, 0x2339, 0x2127, 0x2128, 0x2163, 0x2161, 0x2164, 0x2129,
- 0x2177, 0x2341, 0x2342, 0x2343, 0x2344, 0x2345, 0x2346, 0x2347,
- 0x2348, 0x2349, 0x234A, 0x234B, 0x234C, 0x234D, 0x234E, 0x234F,
- 0x2350, 0x2351, 0x2352, 0x2353, 0x2354, 0x2355, 0x2356, 0x2357,
- 0x2358, 0x2359, 0x235A, 0x214E, 0x2140, 0x214F, 0x2130, 0x2132,
-};
-static const unsigned short utf8_to_euc_EFBD[] = {
- 0x212E, 0x2361, 0x2362, 0x2363, 0x2364, 0x2365, 0x2366, 0x2367,
- 0x2368, 0x2369, 0x236A, 0x236B, 0x236C, 0x236D, 0x236E, 0x236F,
- 0x2370, 0x2371, 0x2372, 0x2373, 0x2374, 0x2375, 0x2376, 0x2377,
- 0x2378, 0x2379, 0x237A, 0x2150, 0x2143, 0x2151, 0xA237,      0,
-      0, 0x0E21, 0x0E22, 0x0E23, 0x0E24, 0x0E25, 0x0E26, 0x0E27,
- 0x0E28, 0x0E29, 0x0E2A, 0x0E2B, 0x0E2C, 0x0E2D, 0x0E2E, 0x0E2F,
- 0x0E30, 0x0E31, 0x0E32, 0x0E33, 0x0E34, 0x0E35, 0x0E36, 0x0E37,
- 0x0E38, 0x0E39, 0x0E3A, 0x0E3B, 0x0E3C, 0x0E3D, 0x0E3E, 0x0E3F,
-};
-static const unsigned short utf8_to_euc_EFBD_ms[] = {
- 0x212E, 0x2361, 0x2362, 0x2363, 0x2364, 0x2365, 0x2366, 0x2367,
- 0x2368, 0x2369, 0x236A, 0x236B, 0x236C, 0x236D, 0x236E, 0x236F,
- 0x2370, 0x2371, 0x2372, 0x2373, 0x2374, 0x2375, 0x2376, 0x2377,
- 0x2378, 0x2379, 0x237A, 0x2150, 0x2143, 0x2151, 0x2141,      0,
-      0, 0x0E21, 0x0E22, 0x0E23, 0x0E24, 0x0E25, 0x0E26, 0x0E27,
- 0x0E28, 0x0E29, 0x0E2A, 0x0E2B, 0x0E2C, 0x0E2D, 0x0E2E, 0x0E2F,
- 0x0E30, 0x0E31, 0x0E32, 0x0E33, 0x0E34, 0x0E35, 0x0E36, 0x0E37,
- 0x0E38, 0x0E39, 0x0E3A, 0x0E3B, 0x0E3C, 0x0E3D, 0x0E3E, 0x0E3F,
-};
-static const unsigned short utf8_to_euc_EFBD_x0213[] = {
- 0x212E, 0x2361, 0x2362, 0x2363, 0x2364, 0x2365, 0x2366, 0x2367,
- 0x2368, 0x2369, 0x236A, 0x236B, 0x236C, 0x236D, 0x236E, 0x236F,
- 0x2370, 0x2371, 0x2372, 0x2373, 0x2374, 0x2375, 0x2376, 0x2377,
- 0x2378, 0x2379, 0x237A, 0x2150, 0x2143, 0x2151, 0x2232, 0x2256,
- 0x2257, 0x0E21, 0x0E22, 0x0E23, 0x0E24, 0x0E25, 0x0E26, 0x0E27,
- 0x0E28, 0x0E29, 0x0E2A, 0x0E2B, 0x0E2C, 0x0E2D, 0x0E2E, 0x0E2F,
- 0x0E30, 0x0E31, 0x0E32, 0x0E33, 0x0E34, 0x0E35, 0x0E36, 0x0E37,
- 0x0E38, 0x0E39, 0x0E3A, 0x0E3B, 0x0E3C, 0x0E3D, 0x0E3E, 0x0E3F,
-};
-static const unsigned short utf8_to_euc_EFBE[] = {
- 0x0E40, 0x0E41, 0x0E42, 0x0E43, 0x0E44, 0x0E45, 0x0E46, 0x0E47,
- 0x0E48, 0x0E49, 0x0E4A, 0x0E4B, 0x0E4C, 0x0E4D, 0x0E4E, 0x0E4F,
- 0x0E50, 0x0E51, 0x0E52, 0x0E53, 0x0E54, 0x0E55, 0x0E56, 0x0E57,
- 0x0E58, 0x0E59, 0x0E5A, 0x0E5B, 0x0E5C, 0x0E5D, 0x0E5E, 0x0E5F,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-};
-static const unsigned short utf8_to_euc_EFBF[] = {
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
- 0x2171, 0x2172, 0x224C, 0x2131, 0xA243, 0x216F,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-};
-static const unsigned short utf8_to_euc_EFBF_x0213[] = {
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0, 0x2131,      0, 0x216F,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-};
-static const unsigned short *const utf8_to_euc_E1_x0213[] = {
-                0,                0,                0,                0,
-                0,                0,                0,                0,
-                0,                0,                0,                0,
-                0,                0,                0,                0,
-                0,                0,                0,                0,
-                0,                0,                0,                0,
-                0,                0,                0,                0,
-                0,                0,                0,                0,
-                0,                0,                0,                0,
-                0,                0,                0,                0,
-                0,                0,                0,                0,
-                0,                0,                0,                0,
-                0,                0,                0,                0,
-                0,                0,                0,                0,
- utf8_to_euc_E1B8_x0213,                0,                0,                0,
-                0, utf8_to_euc_E1BD_x0213,                0,                0,
-};
-static const unsigned short *const utf8_to_euc_E2[] = {
- utf8_to_euc_E280,                0,                0,                0,
- utf8_to_euc_E284, utf8_to_euc_E285, utf8_to_euc_E286, utf8_to_euc_E287,
- utf8_to_euc_E288, utf8_to_euc_E289, utf8_to_euc_E28A,                0,
- utf8_to_euc_E28C,                0,                0,                0,
-                0, utf8_to_euc_E291,                0,                0,
- utf8_to_euc_E294, utf8_to_euc_E295, utf8_to_euc_E296, utf8_to_euc_E297,
- utf8_to_euc_E298, utf8_to_euc_E299,                0,                0,
-                0,                0,                0,                0,
-                0,                0,                0,                0,
-                0,                0,                0,                0,
-                0,                0,                0,                0,
-                0,                0,                0,                0,
-                0,                0,                0,                0,
-                0,                0,                0,                0,
-                0,                0,                0,                0,
-                0,                0,                0,                0,
-};
-static const unsigned short *const utf8_to_euc_E2_ms[] = {
- utf8_to_euc_E280_ms,                0,                0,                0,
- utf8_to_euc_E284, utf8_to_euc_E285, utf8_to_euc_E286, utf8_to_euc_E287,
- utf8_to_euc_E288, utf8_to_euc_E289, utf8_to_euc_E28A,                0,
- utf8_to_euc_E28C,                0,                0,                0,
-                0, utf8_to_euc_E291,                0,                0,
- utf8_to_euc_E294, utf8_to_euc_E295, utf8_to_euc_E296, utf8_to_euc_E297,
- utf8_to_euc_E298, utf8_to_euc_E299,                0,                0,
-                0,                0,                0,                0,
-                0,                0,                0,                0,
-                0,                0,                0,                0,
-                0,                0,                0,                0,
-                0,                0,                0,                0,
-                0,                0,                0,                0,
-                0,                0,                0,                0,
-                0,                0,                0,                0,
-                0,                0,                0,                0,
-};
-static const unsigned short *const utf8_to_euc_E2_932[] = {
- utf8_to_euc_E280_932,                0,                0,                0,
- utf8_to_euc_E284, utf8_to_euc_E285, utf8_to_euc_E286, utf8_to_euc_E287,
- utf8_to_euc_E288_932, utf8_to_euc_E289, utf8_to_euc_E28A,                0,
- utf8_to_euc_E28C,                0,                0,                0,
-                0, utf8_to_euc_E291,                0,                0,
- utf8_to_euc_E294, utf8_to_euc_E295, utf8_to_euc_E296, utf8_to_euc_E297,
- utf8_to_euc_E298, utf8_to_euc_E299,                0,                0,
-                0,                0,                0,                0,
-                0,                0,                0,                0,
-                0,                0,                0,                0,
-                0,                0,                0,                0,
-                0,                0,                0,                0,
-                0,                0,                0,                0,
-                0,                0,                0,                0,
-                0,                0,                0,                0,
-                0,                0,                0,                0,
-};
-static const unsigned short *const utf8_to_euc_E2_mac[] = {
- utf8_to_euc_E280_932,                0,                0,                0,
- utf8_to_euc_E284_mac, utf8_to_euc_E285_mac, utf8_to_euc_E286, utf8_to_euc_E287,
- utf8_to_euc_E288_mac, utf8_to_euc_E289, utf8_to_euc_E28A_mac,                0,
- utf8_to_euc_E28C,                0,                0,                0,
-                0, utf8_to_euc_E291_mac,                0,                0,
- utf8_to_euc_E294, utf8_to_euc_E295, utf8_to_euc_E296, utf8_to_euc_E297,
- utf8_to_euc_E298, utf8_to_euc_E299,                0,                0,
-                0,                0,                0,                0,
-                0,                0,                0,                0,
-                0,                0,                0,                0,
-                0,                0,                0,                0,
-                0,                0,                0,                0,
-                0,                0,                0,                0,
-                0,                0,                0,                0,
-                0,                0,                0,                0,
-                0,                0,                0,                0,
-};
-static const unsigned short *const utf8_to_euc_E2_x0213[] = {
- utf8_to_euc_E280_x0213, utf8_to_euc_E281_x0213, utf8_to_euc_E282_x0213,                0,
- utf8_to_euc_E284_x0213, utf8_to_euc_E285_x0213, utf8_to_euc_E286_x0213, utf8_to_euc_E287_x0213,
- utf8_to_euc_E288_x0213, utf8_to_euc_E289_x0213, utf8_to_euc_E28A_x0213, utf8_to_euc_E28B_x0213,
- utf8_to_euc_E28C_x0213,                0, utf8_to_euc_E28E_x0213, utf8_to_euc_E28F_x0213,
- utf8_to_euc_E290_x0213, utf8_to_euc_E291,                0, utf8_to_euc_E293_x0213,
- utf8_to_euc_E294, utf8_to_euc_E295, utf8_to_euc_E296_x0213, utf8_to_euc_E297_x0213,
- utf8_to_euc_E298_x0213, utf8_to_euc_E299_x0213,                0,                0,
- utf8_to_euc_E29C_x0213, utf8_to_euc_E29D_x0213,                0,                0,
-                0,                0,                0,                0,
- utf8_to_euc_E2A4_x0213,                0, utf8_to_euc_E2A6_x0213, utf8_to_euc_E2A7_x0213,
-                0,                0,                0,                0,
-                0,                0,                0,                0,
-                0,                0,                0,                0,
-                0,                0,                0,                0,
-                0,                0,                0,                0,
-                0,                0,                0,                0,
-};
-static const unsigned short *const utf8_to_euc_E3[] = {
- utf8_to_euc_E380, utf8_to_euc_E381, utf8_to_euc_E382, utf8_to_euc_E383,
-                0,                0,                0,                0,
- utf8_to_euc_E388,                0, utf8_to_euc_E38A,                0,
- utf8_to_euc_E38C, utf8_to_euc_E38D, utf8_to_euc_E38E, utf8_to_euc_E38F,
-                0,                0,                0,                0,
-                0,                0,                0,                0,
-                0,                0,                0,                0,
-                0,                0,                0,                0,
-                0,                0,                0,                0,
-                0,                0,                0,                0,
-                0,                0,                0,                0,
-                0,                0,                0,                0,
-                0,                0,                0,                0,
-                0,                0,                0,                0,
-                0,                0,                0,                0,
-                0,                0,                0,                0,
-};
-static const unsigned short *const utf8_to_euc_E3_932[] = {
- utf8_to_euc_E380_932, utf8_to_euc_E381, utf8_to_euc_E382_932, utf8_to_euc_E383,
-                0,                0,                0,                0,
- utf8_to_euc_E388,                0, utf8_to_euc_E38A,                0,
- utf8_to_euc_E38C, utf8_to_euc_E38D, utf8_to_euc_E38E, utf8_to_euc_E38F,
-                0,                0,                0,                0,
-                0,                0,                0,                0,
-                0,                0,                0,                0,
-                0,                0,                0,                0,
-                0,                0,                0,                0,
-                0,                0,                0,                0,
-                0,                0,                0,                0,
-                0,                0,                0,                0,
-                0,                0,                0,                0,
-                0,                0,                0,                0,
-                0,                0,                0,                0,
-                0,                0,                0,                0,
-};
-static const unsigned short *const utf8_to_euc_E3_mac[] = {
- utf8_to_euc_E380_932, utf8_to_euc_E381, utf8_to_euc_E382_932, utf8_to_euc_E383,
-                0,                0,                0,                0,
- utf8_to_euc_E388_mac,                0, utf8_to_euc_E38A_mac,                0,
- utf8_to_euc_E38C_mac, utf8_to_euc_E38D_mac, utf8_to_euc_E38E_mac, utf8_to_euc_E38F_mac,
-                0,                0,                0,                0,
-                0,                0,                0,                0,
-                0,                0,                0,                0,
-                0,                0,                0,                0,
-                0,                0,                0,                0,
-                0,                0,                0,                0,
-                0,                0,                0,                0,
-                0,                0,                0,                0,
-                0,                0,                0,                0,
-                0,                0,                0,                0,
-                0,                0,                0,                0,
-                0,                0,                0,                0,
-};
-static const unsigned short *const utf8_to_euc_E3_x0213[] = {
- utf8_to_euc_E380_x0213, utf8_to_euc_E381, utf8_to_euc_E382_x0213, utf8_to_euc_E383_x0213,
-                0,                0,                0, utf8_to_euc_E387_x0213,
- utf8_to_euc_E388, utf8_to_euc_E389_x0213, utf8_to_euc_E38A_x0213, utf8_to_euc_E38B_x0213,
- utf8_to_euc_E38C, utf8_to_euc_E38D, utf8_to_euc_E38E, utf8_to_euc_E38F_x0213,
- utf8_to_euc_E390_x0213, utf8_to_euc_E391_x0213, utf8_to_euc_E392_x0213, utf8_to_euc_E393_x0213,
- utf8_to_euc_E394_x0213, utf8_to_euc_E395_x0213, utf8_to_euc_E396_x0213, utf8_to_euc_E397_x0213,
- utf8_to_euc_E398_x0213, utf8_to_euc_E399_x0213, utf8_to_euc_E39A_x0213, utf8_to_euc_E39B_x0213,
-                0, utf8_to_euc_E39D_x0213, utf8_to_euc_E39E_x0213, utf8_to_euc_E39F_x0213,
- utf8_to_euc_E3A0_x0213, utf8_to_euc_E3A1_x0213,                0, utf8_to_euc_E3A3_x0213,
- utf8_to_euc_E3A4_x0213, utf8_to_euc_E3A5_x0213,                0,                0,
-                0, utf8_to_euc_E3A9_x0213,                0, utf8_to_euc_E3AB_x0213,
- utf8_to_euc_E3AC_x0213, utf8_to_euc_E3AD_x0213, utf8_to_euc_E3AE_x0213, utf8_to_euc_E3AF_x0213,
- utf8_to_euc_E3B0_x0213,                0,                0, utf8_to_euc_E3B3_x0213,
- utf8_to_euc_E3B4_x0213, utf8_to_euc_E3B5_x0213, utf8_to_euc_E3B6_x0213, utf8_to_euc_E3B7_x0213,
- utf8_to_euc_E3B8_x0213, utf8_to_euc_E3B9_x0213, utf8_to_euc_E3BA_x0213,                0,
-                0, utf8_to_euc_E3BD_x0213, utf8_to_euc_E3BE_x0213, utf8_to_euc_E3BF_x0213,
-};
-static const unsigned short *const utf8_to_euc_E4[] = {
-                0,                0,                0,                0,
-                0,                0,                0,                0,
-                0,                0,                0,                0,
-                0,                0,                0,                0,
-                0,                0,                0,                0,
-                0,                0,                0,                0,
-                0,                0,                0,                0,
-                0,                0,                0,                0,
-                0,                0,                0,                0,
-                0,                0,                0,                0,
-                0,                0,                0,                0,
-                0,                0,                0,                0,
-                0,                0,                0,                0,
-                0,                0,                0,                0,
- utf8_to_euc_E4B8, utf8_to_euc_E4B9, utf8_to_euc_E4BA, utf8_to_euc_E4BB,
- utf8_to_euc_E4BC, utf8_to_euc_E4BD, utf8_to_euc_E4BE, utf8_to_euc_E4BF,
-};
-static const unsigned short *const utf8_to_euc_E4_x0213[] = {
- utf8_to_euc_E480_x0213, utf8_to_euc_E481_x0213, utf8_to_euc_E482_x0213,                0,
- utf8_to_euc_E484_x0213, utf8_to_euc_E485_x0213, utf8_to_euc_E486_x0213, utf8_to_euc_E487_x0213,
- utf8_to_euc_E488_x0213, utf8_to_euc_E489_x0213,                0, utf8_to_euc_E48B_x0213,
- utf8_to_euc_E48C_x0213, utf8_to_euc_E48D_x0213,                0, utf8_to_euc_E48F_x0213,
- utf8_to_euc_E490_x0213, utf8_to_euc_E491_x0213, utf8_to_euc_E492_x0213, utf8_to_euc_E493_x0213,
- utf8_to_euc_E494_x0213, utf8_to_euc_E495_x0213, utf8_to_euc_E496_x0213, utf8_to_euc_E497_x0213,
- utf8_to_euc_E498_x0213, utf8_to_euc_E499_x0213, utf8_to_euc_E49A_x0213,                0,
- utf8_to_euc_E49C_x0213, utf8_to_euc_E49D_x0213,                0, utf8_to_euc_E49F_x0213,
- utf8_to_euc_E4A0_x0213, utf8_to_euc_E4A1_x0213, utf8_to_euc_E4A2_x0213,                0,
-                0,                0, utf8_to_euc_E4A6_x0213, utf8_to_euc_E4A7_x0213,
- utf8_to_euc_E4A8_x0213,                0, utf8_to_euc_E4AA_x0213,                0,
- utf8_to_euc_E4AC_x0213,                0,                0, utf8_to_euc_E4AF_x0213,
- utf8_to_euc_E4B0_x0213,                0,                0, utf8_to_euc_E4B3_x0213,
- utf8_to_euc_E4B4_x0213, utf8_to_euc_E4B5_x0213,                0,                0,
- utf8_to_euc_E4B8_x0213, utf8_to_euc_E4B9_x0213, utf8_to_euc_E4BA_x0213, utf8_to_euc_E4BB_x0213,
- utf8_to_euc_E4BC_x0213, utf8_to_euc_E4BD_x0213, utf8_to_euc_E4BE_x0213, utf8_to_euc_E4BF_x0213,
-};
-static const unsigned short *const utf8_to_euc_E5[] = {
- utf8_to_euc_E580, utf8_to_euc_E581, utf8_to_euc_E582, utf8_to_euc_E583,
- utf8_to_euc_E584, utf8_to_euc_E585, utf8_to_euc_E586, utf8_to_euc_E587,
- utf8_to_euc_E588, utf8_to_euc_E589, utf8_to_euc_E58A, utf8_to_euc_E58B,
- utf8_to_euc_E58C, utf8_to_euc_E58D, utf8_to_euc_E58E, utf8_to_euc_E58F,
- utf8_to_euc_E590, utf8_to_euc_E591, utf8_to_euc_E592, utf8_to_euc_E593,
- utf8_to_euc_E594, utf8_to_euc_E595, utf8_to_euc_E596, utf8_to_euc_E597,
- utf8_to_euc_E598, utf8_to_euc_E599, utf8_to_euc_E59A, utf8_to_euc_E59B,
- utf8_to_euc_E59C, utf8_to_euc_E59D, utf8_to_euc_E59E, utf8_to_euc_E59F,
- utf8_to_euc_E5A0, utf8_to_euc_E5A1, utf8_to_euc_E5A2, utf8_to_euc_E5A3,
- utf8_to_euc_E5A4, utf8_to_euc_E5A5, utf8_to_euc_E5A6, utf8_to_euc_E5A7,
- utf8_to_euc_E5A8, utf8_to_euc_E5A9, utf8_to_euc_E5AA, utf8_to_euc_E5AB,
- utf8_to_euc_E5AC, utf8_to_euc_E5AD, utf8_to_euc_E5AE, utf8_to_euc_E5AF,
- utf8_to_euc_E5B0, utf8_to_euc_E5B1, utf8_to_euc_E5B2, utf8_to_euc_E5B3,
- utf8_to_euc_E5B4, utf8_to_euc_E5B5, utf8_to_euc_E5B6, utf8_to_euc_E5B7,
- utf8_to_euc_E5B8, utf8_to_euc_E5B9, utf8_to_euc_E5BA, utf8_to_euc_E5BB,
- utf8_to_euc_E5BC, utf8_to_euc_E5BD, utf8_to_euc_E5BE, utf8_to_euc_E5BF,
-};
-static const unsigned short *const utf8_to_euc_E5_x0213[] = {
- utf8_to_euc_E580_x0213, utf8_to_euc_E581_x0213, utf8_to_euc_E582_x0213, utf8_to_euc_E583_x0213,
- utf8_to_euc_E584_x0213, utf8_to_euc_E585_x0213, utf8_to_euc_E586_x0213, utf8_to_euc_E587_x0213,
- utf8_to_euc_E588_x0213, utf8_to_euc_E589_x0213, utf8_to_euc_E58A_x0213, utf8_to_euc_E58B_x0213,
- utf8_to_euc_E58C_x0213, utf8_to_euc_E58D_x0213, utf8_to_euc_E58E_x0213, utf8_to_euc_E58F_x0213,
- utf8_to_euc_E590_x0213, utf8_to_euc_E591_x0213, utf8_to_euc_E592_x0213, utf8_to_euc_E593_x0213,
- utf8_to_euc_E594_x0213, utf8_to_euc_E595_x0213, utf8_to_euc_E596_x0213, utf8_to_euc_E597_x0213,
- utf8_to_euc_E598_x0213, utf8_to_euc_E599_x0213, utf8_to_euc_E59A_x0213, utf8_to_euc_E59B_x0213,
- utf8_to_euc_E59C_x0213, utf8_to_euc_E59D_x0213, utf8_to_euc_E59E_x0213, utf8_to_euc_E59F_x0213,
- utf8_to_euc_E5A0_x0213, utf8_to_euc_E5A1_x0213, utf8_to_euc_E5A2_x0213, utf8_to_euc_E5A3_x0213,
- utf8_to_euc_E5A4_x0213, utf8_to_euc_E5A5_x0213, utf8_to_euc_E5A6_x0213, utf8_to_euc_E5A7_x0213,
- utf8_to_euc_E5A8_x0213, utf8_to_euc_E5A9_x0213, utf8_to_euc_E5AA_x0213, utf8_to_euc_E5AB_x0213,
- utf8_to_euc_E5AC_x0213, utf8_to_euc_E5AD_x0213, utf8_to_euc_E5AE_x0213, utf8_to_euc_E5AF_x0213,
- utf8_to_euc_E5B0_x0213, utf8_to_euc_E5B1_x0213, utf8_to_euc_E5B2_x0213, utf8_to_euc_E5B3_x0213,
- utf8_to_euc_E5B4_x0213, utf8_to_euc_E5B5_x0213, utf8_to_euc_E5B6_x0213, utf8_to_euc_E5B7_x0213,
- utf8_to_euc_E5B8_x0213, utf8_to_euc_E5B9_x0213, utf8_to_euc_E5BA_x0213, utf8_to_euc_E5BB_x0213,
- utf8_to_euc_E5BC_x0213, utf8_to_euc_E5BD_x0213, utf8_to_euc_E5BE_x0213, utf8_to_euc_E5BF_x0213,
-};
-static const unsigned short *const utf8_to_euc_E6[] = {
- utf8_to_euc_E680, utf8_to_euc_E681, utf8_to_euc_E682, utf8_to_euc_E683,
- utf8_to_euc_E684, utf8_to_euc_E685, utf8_to_euc_E686, utf8_to_euc_E687,
- utf8_to_euc_E688, utf8_to_euc_E689, utf8_to_euc_E68A, utf8_to_euc_E68B,
- utf8_to_euc_E68C, utf8_to_euc_E68D, utf8_to_euc_E68E, utf8_to_euc_E68F,
- utf8_to_euc_E690, utf8_to_euc_E691, utf8_to_euc_E692, utf8_to_euc_E693,
- utf8_to_euc_E694, utf8_to_euc_E695, utf8_to_euc_E696, utf8_to_euc_E697,
- utf8_to_euc_E698, utf8_to_euc_E699, utf8_to_euc_E69A, utf8_to_euc_E69B,
- utf8_to_euc_E69C, utf8_to_euc_E69D, utf8_to_euc_E69E, utf8_to_euc_E69F,
- utf8_to_euc_E6A0, utf8_to_euc_E6A1, utf8_to_euc_E6A2, utf8_to_euc_E6A3,
- utf8_to_euc_E6A4, utf8_to_euc_E6A5, utf8_to_euc_E6A6, utf8_to_euc_E6A7,
- utf8_to_euc_E6A8, utf8_to_euc_E6A9, utf8_to_euc_E6AA, utf8_to_euc_E6AB,
- utf8_to_euc_E6AC, utf8_to_euc_E6AD, utf8_to_euc_E6AE, utf8_to_euc_E6AF,
- utf8_to_euc_E6B0, utf8_to_euc_E6B1, utf8_to_euc_E6B2, utf8_to_euc_E6B3,
- utf8_to_euc_E6B4, utf8_to_euc_E6B5, utf8_to_euc_E6B6, utf8_to_euc_E6B7,
- utf8_to_euc_E6B8, utf8_to_euc_E6B9, utf8_to_euc_E6BA, utf8_to_euc_E6BB,
- utf8_to_euc_E6BC, utf8_to_euc_E6BD, utf8_to_euc_E6BE, utf8_to_euc_E6BF,
-};
-static const unsigned short *const utf8_to_euc_E6_x0213[] = {
- utf8_to_euc_E680_x0213, utf8_to_euc_E681_x0213, utf8_to_euc_E682_x0213, utf8_to_euc_E683_x0213,
- utf8_to_euc_E684_x0213, utf8_to_euc_E685_x0213, utf8_to_euc_E686_x0213, utf8_to_euc_E687_x0213,
- utf8_to_euc_E688_x0213, utf8_to_euc_E689_x0213, utf8_to_euc_E68A_x0213, utf8_to_euc_E68B_x0213,
- utf8_to_euc_E68C_x0213, utf8_to_euc_E68D_x0213, utf8_to_euc_E68E_x0213, utf8_to_euc_E68F_x0213,
- utf8_to_euc_E690_x0213, utf8_to_euc_E691_x0213, utf8_to_euc_E692_x0213, utf8_to_euc_E693_x0213,
- utf8_to_euc_E694_x0213, utf8_to_euc_E695_x0213, utf8_to_euc_E696_x0213, utf8_to_euc_E697_x0213,
- utf8_to_euc_E698_x0213, utf8_to_euc_E699_x0213, utf8_to_euc_E69A_x0213, utf8_to_euc_E69B_x0213,
- utf8_to_euc_E69C_x0213, utf8_to_euc_E69D_x0213, utf8_to_euc_E69E_x0213, utf8_to_euc_E69F_x0213,
- utf8_to_euc_E6A0_x0213, utf8_to_euc_E6A1_x0213, utf8_to_euc_E6A2_x0213, utf8_to_euc_E6A3_x0213,
- utf8_to_euc_E6A4_x0213, utf8_to_euc_E6A5_x0213, utf8_to_euc_E6A6_x0213, utf8_to_euc_E6A7_x0213,
- utf8_to_euc_E6A8_x0213, utf8_to_euc_E6A9_x0213, utf8_to_euc_E6AA_x0213, utf8_to_euc_E6AB_x0213,
- utf8_to_euc_E6AC_x0213, utf8_to_euc_E6AD_x0213, utf8_to_euc_E6AE_x0213, utf8_to_euc_E6AF_x0213,
- utf8_to_euc_E6B0_x0213, utf8_to_euc_E6B1_x0213, utf8_to_euc_E6B2_x0213, utf8_to_euc_E6B3_x0213,
- utf8_to_euc_E6B4_x0213, utf8_to_euc_E6B5_x0213, utf8_to_euc_E6B6_x0213, utf8_to_euc_E6B7_x0213,
- utf8_to_euc_E6B8_x0213, utf8_to_euc_E6B9_x0213, utf8_to_euc_E6BA_x0213, utf8_to_euc_E6BB_x0213,
- utf8_to_euc_E6BC_x0213, utf8_to_euc_E6BD_x0213, utf8_to_euc_E6BE_x0213, utf8_to_euc_E6BF_x0213,
-};
-static const unsigned short *const utf8_to_euc_E7[] = {
- utf8_to_euc_E780, utf8_to_euc_E781, utf8_to_euc_E782, utf8_to_euc_E783,
- utf8_to_euc_E784, utf8_to_euc_E785, utf8_to_euc_E786, utf8_to_euc_E787,
- utf8_to_euc_E788, utf8_to_euc_E789, utf8_to_euc_E78A, utf8_to_euc_E78B,
- utf8_to_euc_E78C, utf8_to_euc_E78D, utf8_to_euc_E78E, utf8_to_euc_E78F,
- utf8_to_euc_E790, utf8_to_euc_E791, utf8_to_euc_E792, utf8_to_euc_E793,
- utf8_to_euc_E794, utf8_to_euc_E795, utf8_to_euc_E796, utf8_to_euc_E797,
- utf8_to_euc_E798, utf8_to_euc_E799, utf8_to_euc_E79A, utf8_to_euc_E79B,
- utf8_to_euc_E79C, utf8_to_euc_E79D, utf8_to_euc_E79E, utf8_to_euc_E79F,
- utf8_to_euc_E7A0, utf8_to_euc_E7A1, utf8_to_euc_E7A2, utf8_to_euc_E7A3,
- utf8_to_euc_E7A4, utf8_to_euc_E7A5, utf8_to_euc_E7A6, utf8_to_euc_E7A7,
- utf8_to_euc_E7A8, utf8_to_euc_E7A9, utf8_to_euc_E7AA, utf8_to_euc_E7AB,
- utf8_to_euc_E7AC, utf8_to_euc_E7AD, utf8_to_euc_E7AE, utf8_to_euc_E7AF,
- utf8_to_euc_E7B0, utf8_to_euc_E7B1, utf8_to_euc_E7B2, utf8_to_euc_E7B3,
- utf8_to_euc_E7B4, utf8_to_euc_E7B5, utf8_to_euc_E7B6, utf8_to_euc_E7B7,
- utf8_to_euc_E7B8, utf8_to_euc_E7B9, utf8_to_euc_E7BA,                0,
- utf8_to_euc_E7BC, utf8_to_euc_E7BD, utf8_to_euc_E7BE, utf8_to_euc_E7BF,
-};
-static const unsigned short *const utf8_to_euc_E7_x0213[] = {
- utf8_to_euc_E780_x0213, utf8_to_euc_E781_x0213, utf8_to_euc_E782_x0213, utf8_to_euc_E783_x0213,
- utf8_to_euc_E784_x0213, utf8_to_euc_E785_x0213, utf8_to_euc_E786_x0213, utf8_to_euc_E787_x0213,
- utf8_to_euc_E788_x0213, utf8_to_euc_E789_x0213, utf8_to_euc_E78A_x0213, utf8_to_euc_E78B_x0213,
- utf8_to_euc_E78C_x0213, utf8_to_euc_E78D_x0213, utf8_to_euc_E78E_x0213, utf8_to_euc_E78F_x0213,
- utf8_to_euc_E790_x0213, utf8_to_euc_E791_x0213, utf8_to_euc_E792_x0213, utf8_to_euc_E793_x0213,
- utf8_to_euc_E794_x0213, utf8_to_euc_E795_x0213, utf8_to_euc_E796_x0213, utf8_to_euc_E797_x0213,
- utf8_to_euc_E798_x0213, utf8_to_euc_E799_x0213, utf8_to_euc_E79A_x0213, utf8_to_euc_E79B_x0213,
- utf8_to_euc_E79C_x0213, utf8_to_euc_E79D_x0213, utf8_to_euc_E79E_x0213, utf8_to_euc_E79F_x0213,
- utf8_to_euc_E7A0_x0213, utf8_to_euc_E7A1_x0213, utf8_to_euc_E7A2_x0213, utf8_to_euc_E7A3_x0213,
- utf8_to_euc_E7A4_x0213, utf8_to_euc_E7A5_x0213, utf8_to_euc_E7A6_x0213, utf8_to_euc_E7A7_x0213,
- utf8_to_euc_E7A8_x0213, utf8_to_euc_E7A9_x0213, utf8_to_euc_E7AA_x0213, utf8_to_euc_E7AB_x0213,
- utf8_to_euc_E7AC_x0213, utf8_to_euc_E7AD_x0213, utf8_to_euc_E7AE_x0213, utf8_to_euc_E7AF_x0213,
- utf8_to_euc_E7B0_x0213, utf8_to_euc_E7B1_x0213, utf8_to_euc_E7B2_x0213, utf8_to_euc_E7B3_x0213,
- utf8_to_euc_E7B4_x0213, utf8_to_euc_E7B5_x0213, utf8_to_euc_E7B6_x0213, utf8_to_euc_E7B7_x0213,
- utf8_to_euc_E7B8_x0213, utf8_to_euc_E7B9_x0213, utf8_to_euc_E7BA_x0213,                0,
- utf8_to_euc_E7BC_x0213, utf8_to_euc_E7BD_x0213, utf8_to_euc_E7BE_x0213, utf8_to_euc_E7BF_x0213,
-};
-static const unsigned short *const utf8_to_euc_E8[] = {
- utf8_to_euc_E880, utf8_to_euc_E881, utf8_to_euc_E882, utf8_to_euc_E883,
- utf8_to_euc_E884, utf8_to_euc_E885, utf8_to_euc_E886, utf8_to_euc_E887,
- utf8_to_euc_E888, utf8_to_euc_E889, utf8_to_euc_E88A, utf8_to_euc_E88B,
- utf8_to_euc_E88C, utf8_to_euc_E88D, utf8_to_euc_E88E, utf8_to_euc_E88F,
- utf8_to_euc_E890, utf8_to_euc_E891, utf8_to_euc_E892, utf8_to_euc_E893,
- utf8_to_euc_E894, utf8_to_euc_E895, utf8_to_euc_E896, utf8_to_euc_E897,
- utf8_to_euc_E898, utf8_to_euc_E899, utf8_to_euc_E89A, utf8_to_euc_E89B,
- utf8_to_euc_E89C, utf8_to_euc_E89D, utf8_to_euc_E89E, utf8_to_euc_E89F,
- utf8_to_euc_E8A0, utf8_to_euc_E8A1, utf8_to_euc_E8A2, utf8_to_euc_E8A3,
- utf8_to_euc_E8A4, utf8_to_euc_E8A5, utf8_to_euc_E8A6, utf8_to_euc_E8A7,
- utf8_to_euc_E8A8, utf8_to_euc_E8A9, utf8_to_euc_E8AA, utf8_to_euc_E8AB,
- utf8_to_euc_E8AC, utf8_to_euc_E8AD, utf8_to_euc_E8AE,                0,
- utf8_to_euc_E8B0, utf8_to_euc_E8B1, utf8_to_euc_E8B2, utf8_to_euc_E8B3,
- utf8_to_euc_E8B4, utf8_to_euc_E8B5, utf8_to_euc_E8B6, utf8_to_euc_E8B7,
- utf8_to_euc_E8B8, utf8_to_euc_E8B9, utf8_to_euc_E8BA, utf8_to_euc_E8BB,
- utf8_to_euc_E8BC, utf8_to_euc_E8BD, utf8_to_euc_E8BE, utf8_to_euc_E8BF,
-};
-static const unsigned short *const utf8_to_euc_E8_x0213[] = {
- utf8_to_euc_E880_x0213, utf8_to_euc_E881_x0213, utf8_to_euc_E882_x0213, utf8_to_euc_E883_x0213,
- utf8_to_euc_E884_x0213, utf8_to_euc_E885_x0213, utf8_to_euc_E886_x0213, utf8_to_euc_E887_x0213,
- utf8_to_euc_E888_x0213, utf8_to_euc_E889_x0213, utf8_to_euc_E88A_x0213, utf8_to_euc_E88B_x0213,
- utf8_to_euc_E88C_x0213, utf8_to_euc_E88D_x0213, utf8_to_euc_E88E_x0213, utf8_to_euc_E88F_x0213,
- utf8_to_euc_E890_x0213, utf8_to_euc_E891_x0213, utf8_to_euc_E892_x0213, utf8_to_euc_E893_x0213,
- utf8_to_euc_E894_x0213, utf8_to_euc_E895_x0213, utf8_to_euc_E896_x0213, utf8_to_euc_E897_x0213,
- utf8_to_euc_E898_x0213, utf8_to_euc_E899_x0213, utf8_to_euc_E89A_x0213, utf8_to_euc_E89B_x0213,
- utf8_to_euc_E89C_x0213, utf8_to_euc_E89D_x0213, utf8_to_euc_E89E_x0213, utf8_to_euc_E89F_x0213,
- utf8_to_euc_E8A0_x0213, utf8_to_euc_E8A1_x0213, utf8_to_euc_E8A2_x0213, utf8_to_euc_E8A3_x0213,
- utf8_to_euc_E8A4_x0213, utf8_to_euc_E8A5_x0213, utf8_to_euc_E8A6_x0213, utf8_to_euc_E8A7_x0213,
- utf8_to_euc_E8A8_x0213, utf8_to_euc_E8A9_x0213, utf8_to_euc_E8AA_x0213, utf8_to_euc_E8AB_x0213,
- utf8_to_euc_E8AC_x0213, utf8_to_euc_E8AD_x0213, utf8_to_euc_E8AE_x0213,                0,
- utf8_to_euc_E8B0_x0213, utf8_to_euc_E8B1_x0213, utf8_to_euc_E8B2_x0213, utf8_to_euc_E8B3_x0213,
- utf8_to_euc_E8B4_x0213, utf8_to_euc_E8B5_x0213, utf8_to_euc_E8B6_x0213, utf8_to_euc_E8B7_x0213,
- utf8_to_euc_E8B8_x0213, utf8_to_euc_E8B9_x0213, utf8_to_euc_E8BA_x0213, utf8_to_euc_E8BB_x0213,
- utf8_to_euc_E8BC_x0213, utf8_to_euc_E8BD_x0213, utf8_to_euc_E8BE_x0213, utf8_to_euc_E8BF_x0213,
-};
-static const unsigned short *const utf8_to_euc_E9[] = {
- utf8_to_euc_E980, utf8_to_euc_E981, utf8_to_euc_E982, utf8_to_euc_E983,
- utf8_to_euc_E984, utf8_to_euc_E985, utf8_to_euc_E986, utf8_to_euc_E987,
- utf8_to_euc_E988, utf8_to_euc_E989, utf8_to_euc_E98A, utf8_to_euc_E98B,
- utf8_to_euc_E98C, utf8_to_euc_E98D, utf8_to_euc_E98E, utf8_to_euc_E98F,
- utf8_to_euc_E990, utf8_to_euc_E991, utf8_to_euc_E992,                0,
-                0, utf8_to_euc_E995, utf8_to_euc_E996, utf8_to_euc_E997,
- utf8_to_euc_E998, utf8_to_euc_E999, utf8_to_euc_E99A, utf8_to_euc_E99B,
- utf8_to_euc_E99C, utf8_to_euc_E99D, utf8_to_euc_E99E, utf8_to_euc_E99F,
- utf8_to_euc_E9A0, utf8_to_euc_E9A1, utf8_to_euc_E9A2, utf8_to_euc_E9A3,
- utf8_to_euc_E9A4, utf8_to_euc_E9A5, utf8_to_euc_E9A6, utf8_to_euc_E9A7,
- utf8_to_euc_E9A8, utf8_to_euc_E9A9, utf8_to_euc_E9AA, utf8_to_euc_E9AB,
- utf8_to_euc_E9AC, utf8_to_euc_E9AD, utf8_to_euc_E9AE, utf8_to_euc_E9AF,
- utf8_to_euc_E9B0, utf8_to_euc_E9B1,                0, utf8_to_euc_E9B3,
- utf8_to_euc_E9B4, utf8_to_euc_E9B5, utf8_to_euc_E9B6, utf8_to_euc_E9B7,
- utf8_to_euc_E9B8, utf8_to_euc_E9B9, utf8_to_euc_E9BA, utf8_to_euc_E9BB,
- utf8_to_euc_E9BC, utf8_to_euc_E9BD, utf8_to_euc_E9BE,                0,
-};
-static const unsigned short *const utf8_to_euc_E9_x0213[] = {
- utf8_to_euc_E980_x0213, utf8_to_euc_E981_x0213, utf8_to_euc_E982_x0213, utf8_to_euc_E983_x0213,
- utf8_to_euc_E984_x0213, utf8_to_euc_E985_x0213, utf8_to_euc_E986_x0213, utf8_to_euc_E987_x0213,
- utf8_to_euc_E988_x0213, utf8_to_euc_E989_x0213, utf8_to_euc_E98A_x0213, utf8_to_euc_E98B_x0213,
- utf8_to_euc_E98C_x0213, utf8_to_euc_E98D_x0213, utf8_to_euc_E98E_x0213, utf8_to_euc_E98F_x0213,
- utf8_to_euc_E990_x0213, utf8_to_euc_E991_x0213, utf8_to_euc_E992,                0,
-                0, utf8_to_euc_E995_x0213, utf8_to_euc_E996_x0213, utf8_to_euc_E997_x0213,
- utf8_to_euc_E998_x0213, utf8_to_euc_E999_x0213, utf8_to_euc_E99A_x0213, utf8_to_euc_E99B_x0213,
- utf8_to_euc_E99C_x0213, utf8_to_euc_E99D_x0213, utf8_to_euc_E99E_x0213, utf8_to_euc_E99F_x0213,
- utf8_to_euc_E9A0_x0213, utf8_to_euc_E9A1_x0213, utf8_to_euc_E9A2_x0213, utf8_to_euc_E9A3_x0213,
- utf8_to_euc_E9A4_x0213, utf8_to_euc_E9A5_x0213, utf8_to_euc_E9A6_x0213, utf8_to_euc_E9A7_x0213,
- utf8_to_euc_E9A8_x0213, utf8_to_euc_E9A9_x0213, utf8_to_euc_E9AA_x0213, utf8_to_euc_E9AB_x0213,
- utf8_to_euc_E9AC_x0213, utf8_to_euc_E9AD_x0213, utf8_to_euc_E9AE_x0213, utf8_to_euc_E9AF_x0213,
- utf8_to_euc_E9B0_x0213, utf8_to_euc_E9B1_x0213,                0, utf8_to_euc_E9B3_x0213,
- utf8_to_euc_E9B4_x0213, utf8_to_euc_E9B5_x0213, utf8_to_euc_E9B6_x0213, utf8_to_euc_E9B7_x0213,
- utf8_to_euc_E9B8_x0213, utf8_to_euc_E9B9_x0213, utf8_to_euc_E9BA_x0213, utf8_to_euc_E9BB_x0213,
- utf8_to_euc_E9BC_x0213, utf8_to_euc_E9BD_x0213, utf8_to_euc_E9BE_x0213,                0,
-};
-static const unsigned short *const utf8_to_euc_EF[] = {
-                0,                0,                0,                0,
-                0,                0,                0,                0,
-                0,                0,                0,                0,
-                0,                0,                0,                0,
-                0,                0,                0,                0,
-                0,                0,                0,                0,
-                0,                0,                0,                0,
-                0,                0,                0,                0,
-                0,                0,                0,                0,
- utf8_to_euc_EFA4,                0,                0, utf8_to_euc_EFA7,
- utf8_to_euc_EFA8,                0,                0,                0,
-                0,                0,                0,                0,
-                0,                0,                0,                0,
-                0,                0,                0,                0,
-                0,                0,                0,                0,
- utf8_to_euc_EFBC, utf8_to_euc_EFBD, utf8_to_euc_EFBE, utf8_to_euc_EFBF,
-};
-static const unsigned short *const utf8_to_euc_EF_ms[] = {
-                0,                0,                0,                0,
-                0,                0,                0,                0,
-                0,                0,                0,                0,
-                0,                0,                0,                0,
-                0,                0,                0,                0,
-                0,                0,                0,                0,
-                0,                0,                0,                0,
-                0,                0,                0,                0,
-                0,                0,                0,                0,
- utf8_to_euc_EFA4,                0,                0, utf8_to_euc_EFA7,
- utf8_to_euc_EFA8,                0,                0,                0,
-                0,                0,                0,                0,
-                0,                0,                0,                0,
-                0,                0,                0,                0,
-                0,                0,                0,                0,
- utf8_to_euc_EFBC, utf8_to_euc_EFBD_ms, utf8_to_euc_EFBE, utf8_to_euc_EFBF,
-};
-static const unsigned short *const utf8_to_euc_EF_x0213[] = {
-                0,                0,                0,                0,
-                0,                0,                0,                0,
-                0,                0,                0,                0,
-                0,                0,                0,                0,
-                0,                0,                0,                0,
-                0,                0,                0,                0,
-                0,                0,                0,                0,
-                0,                0,                0,                0,
-                0,                0,                0,                0,
- utf8_to_euc_EFA4_x0213, utf8_to_euc_EFA5_x0213,                0, utf8_to_euc_EFA7_x0213,
- utf8_to_euc_EFA8_x0213, utf8_to_euc_EFA9_x0213,                0,                0,
-                0,                0,                0,                0,
-                0,                0,                0,                0,
-                0,                0,                0,                0,
-                0, utf8_to_euc_EFB9_x0213,                0,                0,
- utf8_to_euc_EFBC_x0213, utf8_to_euc_EFBD_x0213, utf8_to_euc_EFBE, utf8_to_euc_EFBF_x0213,
-};
-const unsigned short *const utf8_to_euc_2bytes[] = {
-              0,              0,              0,              0,
-              0,              0,              0,              0,
-              0,              0,              0,              0,
-              0,              0,              0,              0,
-              0,              0,              0,              0,
-              0,              0,              0,              0,
-              0,              0,              0,              0,
-              0,              0,              0,              0,
-              0,              0,              0,              0,
-              0,              0,              0,              0,
-              0,              0,              0,              0,
-              0,              0,              0,              0,
-              0,              0,              0,              0,
-              0,              0,              0,              0,
-              0,              0,              0,              0,
-              0,              0,              0,              0,
-              0,              0, utf8_to_euc_C2, utf8_to_euc_C3,
- utf8_to_euc_C4, utf8_to_euc_C5,              0, utf8_to_euc_C7,
-              0,              0,              0, utf8_to_euc_CB,
-              0,              0, utf8_to_euc_CE, utf8_to_euc_CF,
- utf8_to_euc_D0, utf8_to_euc_D1,              0,              0,
-              0,              0,              0,              0,
-              0,              0,              0,              0,
-              0,              0,              0,              0,
-              0,              0,              0,              0,
-              0,              0,              0,              0,
-              0,              0,              0,              0,
-              0,              0,              0,              0,
-};
-const unsigned short *const utf8_to_euc_2bytes_ms[] = {
-              0,              0,              0,              0,
-              0,              0,              0,              0,
-              0,              0,              0,              0,
-              0,              0,              0,              0,
-              0,              0,              0,              0,
-              0,              0,              0,              0,
-              0,              0,              0,              0,
-              0,              0,              0,              0,
-              0,              0,              0,              0,
-              0,              0,              0,              0,
-              0,              0,              0,              0,
-              0,              0,              0,              0,
-              0,              0,              0,              0,
-              0,              0,              0,              0,
-              0,              0,              0,              0,
-              0,              0,              0,              0,
-              0,              0, utf8_to_euc_C2_ms, utf8_to_euc_C3,
- utf8_to_euc_C4, utf8_to_euc_C5,              0, utf8_to_euc_C7,
-              0,              0,              0, utf8_to_euc_CB,
-              0,              0, utf8_to_euc_CE, utf8_to_euc_CF,
- utf8_to_euc_D0, utf8_to_euc_D1,              0,              0,
-              0,              0,              0,              0,
-              0,              0,              0,              0,
-              0,              0,              0,              0,
-              0,              0,              0,              0,
-              0,              0,              0,              0,
-              0,              0,              0,              0,
-              0,              0,              0,              0,
-};
-const unsigned short *const utf8_to_euc_2bytes_932[] = {
-              0,              0,              0,              0,
-              0,              0,              0,              0,
-              0,              0,              0,              0,
-              0,              0,              0,              0,
-              0,              0,              0,              0,
-              0,              0,              0,              0,
-              0,              0,              0,              0,
-              0,              0,              0,              0,
-              0,              0,              0,              0,
-              0,              0,              0,              0,
-              0,              0,              0,              0,
-              0,              0,              0,              0,
-              0,              0,              0,              0,
-              0,              0,              0,              0,
-              0,              0,              0,              0,
-              0,              0,              0,              0,
-              0,              0, utf8_to_euc_C2_932, utf8_to_euc_C3_932,
- utf8_to_euc_C4, utf8_to_euc_C5,              0, utf8_to_euc_C7,
-              0,              0,              0, utf8_to_euc_CB,
-              0,              0, utf8_to_euc_CE, utf8_to_euc_CF,
- utf8_to_euc_D0, utf8_to_euc_D1,              0,              0,
-              0,              0,              0,              0,
-              0,              0,              0,              0,
-              0,              0,              0,              0,
-              0,              0,              0,              0,
-              0,              0,              0,              0,
-              0,              0,              0,              0,
-              0,              0,              0,              0,
-};
-const unsigned short *const utf8_to_euc_2bytes_mac[] = {
-              0,              0,              0,              0,
-              0,              0,              0,              0,
-              0,              0,              0,              0,
-              0,              0,              0,              0,
-              0,              0,              0,              0,
-              0,              0,              0,              0,
-              0,              0,              0,              0,
-              0,              0,              0,              0,
-              0,              0,              0,              0,
-              0,              0,              0,              0,
-              0,              0,              0,              0,
-              0,              0,              0,              0,
-              0,              0,              0,              0,
-              0,              0,              0,              0,
-              0,              0,              0,              0,
-              0,              0,              0,              0,
-              0,              0, utf8_to_euc_C2_mac, utf8_to_euc_C3,
- utf8_to_euc_C4, utf8_to_euc_C5,              0, utf8_to_euc_C7,
-              0,              0,              0, utf8_to_euc_CB,
-              0,              0, utf8_to_euc_CE, utf8_to_euc_CF,
- utf8_to_euc_D0, utf8_to_euc_D1,              0,              0,
-              0,              0,              0,              0,
-              0,              0,              0,              0,
-              0,              0,              0,              0,
-              0,              0,              0,              0,
-              0,              0,              0,              0,
-              0,              0,              0,              0,
-              0,              0,              0,              0,
-};
-const unsigned short *const utf8_to_euc_2bytes_x0213[] = {
-              0,              0,              0,              0,
-              0,              0,              0,              0,
-              0,              0,              0,              0,
-              0,              0,              0,              0,
-              0,              0,              0,              0,
-              0,              0,              0,              0,
-              0,              0,              0,              0,
-              0,              0,              0,              0,
-              0,              0,              0,              0,
-              0,              0,              0,              0,
-              0,              0,              0,              0,
-              0,              0,              0,              0,
-              0,              0,              0,              0,
-              0,              0,              0,              0,
-              0,              0,              0,              0,
-              0,              0,              0,              0,
-              0,              0, utf8_to_euc_C2_x0213, utf8_to_euc_C3_x0213,
- utf8_to_euc_C4_x0213, utf8_to_euc_C5_x0213, utf8_to_euc_C6_x0213, utf8_to_euc_C7_x0213,
-              0, utf8_to_euc_C9_x0213, utf8_to_euc_CA_x0213, utf8_to_euc_CB_x0213,
- utf8_to_euc_CC_x0213, utf8_to_euc_CD_x0213, utf8_to_euc_CE, utf8_to_euc_CF_x0213,
- utf8_to_euc_D0, utf8_to_euc_D1,              0,              0,
-              0,              0,              0,              0,
-              0,              0,              0,              0,
-              0,              0,              0,              0,
-              0,              0,              0,              0,
-              0,              0,              0,              0,
-              0,              0,              0,              0,
-              0,              0,              0,              0,
-};
-const unsigned short *const *const utf8_to_euc_3bytes[] = {
-              0,              0, utf8_to_euc_E2, utf8_to_euc_E3,
- utf8_to_euc_E4, utf8_to_euc_E5, utf8_to_euc_E6, utf8_to_euc_E7,
- utf8_to_euc_E8, utf8_to_euc_E9,              0,              0,
-              0,              0,              0, utf8_to_euc_EF,
-};
-const unsigned short *const *const utf8_to_euc_3bytes_ms[] = {
-              0,              0, utf8_to_euc_E2_ms, utf8_to_euc_E3,
- utf8_to_euc_E4, utf8_to_euc_E5, utf8_to_euc_E6, utf8_to_euc_E7,
- utf8_to_euc_E8, utf8_to_euc_E9,              0,              0,
-              0,              0,              0, utf8_to_euc_EF_ms,
-};
-const unsigned short *const *const utf8_to_euc_3bytes_932[] = {
-              0,              0, utf8_to_euc_E2_932, utf8_to_euc_E3_932,
- utf8_to_euc_E4, utf8_to_euc_E5, utf8_to_euc_E6, utf8_to_euc_E7,
- utf8_to_euc_E8, utf8_to_euc_E9,              0,              0,
-              0,              0,              0, utf8_to_euc_EF_ms,
-};
-const unsigned short *const *const utf8_to_euc_3bytes_mac[] = {
-              0,              0, utf8_to_euc_E2_mac, utf8_to_euc_E3_mac,
- utf8_to_euc_E4, utf8_to_euc_E5, utf8_to_euc_E6, utf8_to_euc_E7,
- utf8_to_euc_E8, utf8_to_euc_E9,              0,              0,
-              0,              0,              0, utf8_to_euc_EF_ms,
-};
-const unsigned short *const *const utf8_to_euc_3bytes_x0213[] = {
-              0, utf8_to_euc_E1_x0213, utf8_to_euc_E2_x0213, utf8_to_euc_E3_x0213,
- utf8_to_euc_E4_x0213, utf8_to_euc_E5_x0213, utf8_to_euc_E6_x0213, utf8_to_euc_E7_x0213,
- utf8_to_euc_E8_x0213, utf8_to_euc_E9_x0213,              0,              0,
-              0,              0,              0, utf8_to_euc_EF_x0213,
-};
-
-#ifdef UNICODE_NORMALIZATION
-
-/* Normalization Table by Apple */
-/* http://developer.apple.com/technotes/tn/tn1150table.html */
-
-const struct normalization_pair normalization_table[] = {
-    {{0xcd,0xbe},	{0x3b}},
-    {{0xc3,0x80},	{0x41,0xcc,0x80,0x00}},
-    {{0xc3,0x81},	{0x41,0xcc,0x81}},
-    {{0xc3,0x82},	{0x41,0xcc,0x82}},
-    {{0xe1,0xba,0xa6},	{0x41,0xcc,0x82,0xcc,0x80}},
-    {{0xe1,0xba,0xa4},	{0x41,0xcc,0x82,0xcc,0x81}},
-    {{0xe1,0xba,0xaa},	{0x41,0xcc,0x82,0xcc,0x83}},
-    {{0xe1,0xba,0xa8},	{0x41,0xcc,0x82,0xcc,0x89}},
-    {{0xc3,0x83},	{0x41,0xcc,0x83}},
-    {{0xc4,0x80},	{0x41,0xcc,0x84}},
-    {{0xc4,0x82},	{0x41,0xcc,0x86}},
-    {{0xe1,0xba,0xb0},	{0x41,0xcc,0x86,0xcc,0x80}},
-    {{0xe1,0xba,0xae},	{0x41,0xcc,0x86,0xcc,0x81}},
-    {{0xe1,0xba,0xb4},	{0x41,0xcc,0x86,0xcc,0x83}},
-    {{0xe1,0xba,0xb2},	{0x41,0xcc,0x86,0xcc,0x89}},
-    {{0xc7,0xa0},	{0x41,0xcc,0x87,0xcc,0x84}},
-    {{0xc3,0x84},	{0x41,0xcc,0x88}},
-    {{0xc7,0x9e},	{0x41,0xcc,0x88,0xcc,0x84}},
-    {{0xe1,0xba,0xa2},	{0x41,0xcc,0x89}},
-    {{0xc3,0x85},	{0x41,0xcc,0x8a}},
-    {{0xc7,0xba},	{0x41,0xcc,0x8a,0xcc,0x81}},
-    {{0xc7,0x8d},	{0x41,0xcc,0x8c}},
-    {{0xc8,0x80},	{0x41,0xcc,0x8f}},
-    {{0xc8,0x82},	{0x41,0xcc,0x91}},
-    {{0xe1,0xba,0xa0},	{0x41,0xcc,0xa3}},
-    {{0xe1,0xba,0xac},	{0x41,0xcc,0xa3,0xcc,0x82}},
-    {{0xe1,0xba,0xb6},	{0x41,0xcc,0xa3,0xcc,0x86}},
-    {{0xe1,0xb8,0x80},	{0x41,0xcc,0xa5}},
-    {{0xc4,0x84},	{0x41,0xcc,0xa8}},
-    {{0xe1,0xb8,0x82},	{0x42,0xcc,0x87}},
-    {{0xe1,0xb8,0x84},	{0x42,0xcc,0xa3}},
-    {{0xe1,0xb8,0x86},	{0x42,0xcc,0xb1}},
-    {{0xc4,0x86},	{0x43,0xcc,0x81}},
-    {{0xc4,0x88},	{0x43,0xcc,0x82}},
-    {{0xc4,0x8a},	{0x43,0xcc,0x87}},
-    {{0xc4,0x8c},	{0x43,0xcc,0x8c}},
-    {{0xc3,0x87},	{0x43,0xcc,0xa7}},
-    {{0xe1,0xb8,0x88},	{0x43,0xcc,0xa7,0xcc,0x81}},
-    {{0xe1,0xb8,0x8a},	{0x44,0xcc,0x87}},
-    {{0xc4,0x8e},	{0x44,0xcc,0x8c}},
-    {{0xe1,0xb8,0x8c},	{0x44,0xcc,0xa3}},
-    {{0xe1,0xb8,0x90},	{0x44,0xcc,0xa7}},
-    {{0xe1,0xb8,0x92},	{0x44,0xcc,0xad}},
-    {{0xe1,0xb8,0x8e},	{0x44,0xcc,0xb1}},
-    {{0xc3,0x88},	{0x45,0xcc,0x80}},
-    {{0xc3,0x89},	{0x45,0xcc,0x81}},
-    {{0xc3,0x8a},	{0x45,0xcc,0x82}},
-    {{0xe1,0xbb,0x80},	{0x45,0xcc,0x82,0xcc,0x80}},
-    {{0xe1,0xba,0xbe},	{0x45,0xcc,0x82,0xcc,0x81}},
-    {{0xe1,0xbb,0x84},	{0x45,0xcc,0x82,0xcc,0x83}},
-    {{0xe1,0xbb,0x82},	{0x45,0xcc,0x82,0xcc,0x89}},
-    {{0xe1,0xba,0xbc},	{0x45,0xcc,0x83}},
-    {{0xc4,0x92},	{0x45,0xcc,0x84}},
-    {{0xe1,0xb8,0x94},	{0x45,0xcc,0x84,0xcc,0x80}},
-    {{0xe1,0xb8,0x96},	{0x45,0xcc,0x84,0xcc,0x81}},
-    {{0xc4,0x94},	{0x45,0xcc,0x86}},
-    {{0xc4,0x96},	{0x45,0xcc,0x87}},
-    {{0xc3,0x8b},	{0x45,0xcc,0x88}},
-    {{0xe1,0xba,0xba},	{0x45,0xcc,0x89}},
-    {{0xc4,0x9a},	{0x45,0xcc,0x8c}},
-    {{0xc8,0x84},	{0x45,0xcc,0x8f}},
-    {{0xc8,0x86},	{0x45,0xcc,0x91}},
-    {{0xe1,0xba,0xb8},	{0x45,0xcc,0xa3}},
-    {{0xe1,0xbb,0x86},	{0x45,0xcc,0xa3,0xcc,0x82}},
-    {{0xe1,0xb8,0x9c},	{0x45,0xcc,0xa7,0xcc,0x86}},
-    {{0xc4,0x98},	{0x45,0xcc,0xa8}},
-    {{0xe1,0xb8,0x98},	{0x45,0xcc,0xad}},
-    {{0xe1,0xb8,0x9a},	{0x45,0xcc,0xb0}},
-    {{0xe1,0xb8,0x9e},	{0x46,0xcc,0x87}},
-    {{0xc7,0xb4},	{0x47,0xcc,0x81}},
-    {{0xc4,0x9c},	{0x47,0xcc,0x82}},
-    {{0xe1,0xb8,0xa0},	{0x47,0xcc,0x84}},
-    {{0xc4,0x9e},	{0x47,0xcc,0x86}},
-    {{0xc4,0xa0},	{0x47,0xcc,0x87}},
-    {{0xc7,0xa6},	{0x47,0xcc,0x8c}},
-    {{0xc4,0xa2},	{0x47,0xcc,0xa7}},
-    {{0xc4,0xa4},	{0x48,0xcc,0x82}},
-    {{0xe1,0xb8,0xa2},	{0x48,0xcc,0x87}},
-    {{0xe1,0xb8,0xa6},	{0x48,0xcc,0x88}},
-    {{0xe1,0xb8,0xa4},	{0x48,0xcc,0xa3}},
-    {{0xe1,0xb8,0xa8},	{0x48,0xcc,0xa7}},
-    {{0xe1,0xb8,0xaa},	{0x48,0xcc,0xae}},
-    {{0xc3,0x8c},	{0x49,0xcc,0x80}},
-    {{0xc3,0x8d},	{0x49,0xcc,0x81}},
-    {{0xc3,0x8e},	{0x49,0xcc,0x82}},
-    {{0xc4,0xa8},	{0x49,0xcc,0x83}},
-    {{0xc4,0xaa},	{0x49,0xcc,0x84}},
-    {{0xc4,0xac},	{0x49,0xcc,0x86}},
-    {{0xc4,0xb0},	{0x49,0xcc,0x87}},
-    {{0xc3,0x8f},	{0x49,0xcc,0x88}},
-    {{0xe1,0xb8,0xae},	{0x49,0xcc,0x88,0xcc,0x81}},
-    {{0xe1,0xbb,0x88},	{0x49,0xcc,0x89}},
-    {{0xc7,0x8f},	{0x49,0xcc,0x8c}},
-    {{0xc8,0x88},	{0x49,0xcc,0x8f}},
-    {{0xc8,0x8a},	{0x49,0xcc,0x91}},
-    {{0xe1,0xbb,0x8a},	{0x49,0xcc,0xa3}},
-    {{0xc4,0xae},	{0x49,0xcc,0xa8}},
-    {{0xe1,0xb8,0xac},	{0x49,0xcc,0xb0}},
-    {{0xc4,0xb4},	{0x4a,0xcc,0x82}},
-    {{0xe1,0xb8,0xb0},	{0x4b,0xcc,0x81}},
-    {{0xc7,0xa8},	{0x4b,0xcc,0x8c}},
-    {{0xe1,0xb8,0xb2},	{0x4b,0xcc,0xa3}},
-    {{0xc4,0xb6},	{0x4b,0xcc,0xa7}},
-    {{0xe1,0xb8,0xb4},	{0x4b,0xcc,0xb1}},
-    {{0xc4,0xb9},	{0x4c,0xcc,0x81}},
-    {{0xc4,0xbd},	{0x4c,0xcc,0x8c}},
-    {{0xe1,0xb8,0xb6},	{0x4c,0xcc,0xa3}},
-    {{0xe1,0xb8,0xb8},	{0x4c,0xcc,0xa3,0xcc,0x84}},
-    {{0xc4,0xbb},	{0x4c,0xcc,0xa7}},
-    {{0xe1,0xb8,0xbc},	{0x4c,0xcc,0xad}},
-    {{0xe1,0xb8,0xba},	{0x4c,0xcc,0xb1}},
-    {{0xe1,0xb8,0xbe},	{0x4d,0xcc,0x81}},
-    {{0xe1,0xb9,0x80},	{0x4d,0xcc,0x87}},
-    {{0xe1,0xb9,0x82},	{0x4d,0xcc,0xa3}},
-    {{0xc5,0x83},	{0x4e,0xcc,0x81}},
-    {{0xc3,0x91},	{0x4e,0xcc,0x83}},
-    {{0xe1,0xb9,0x84},	{0x4e,0xcc,0x87}},
-    {{0xc5,0x87},	{0x4e,0xcc,0x8c}},
-    {{0xe1,0xb9,0x86},	{0x4e,0xcc,0xa3}},
-    {{0xc5,0x85},	{0x4e,0xcc,0xa7}},
-    {{0xe1,0xb9,0x8a},	{0x4e,0xcc,0xad}},
-    {{0xe1,0xb9,0x88},	{0x4e,0xcc,0xb1}},
-    {{0xc3,0x92},	{0x4f,0xcc,0x80}},
-    {{0xc3,0x93},	{0x4f,0xcc,0x81}},
-    {{0xc3,0x94},	{0x4f,0xcc,0x82}},
-    {{0xe1,0xbb,0x92},	{0x4f,0xcc,0x82,0xcc,0x80}},
-    {{0xe1,0xbb,0x90},	{0x4f,0xcc,0x82,0xcc,0x81}},
-    {{0xe1,0xbb,0x96},	{0x4f,0xcc,0x82,0xcc,0x83}},
-    {{0xe1,0xbb,0x94},	{0x4f,0xcc,0x82,0xcc,0x89}},
-    {{0xc3,0x95},	{0x4f,0xcc,0x83}},
-    {{0xe1,0xb9,0x8c},	{0x4f,0xcc,0x83,0xcc,0x81}},
-    {{0xe1,0xb9,0x8e},	{0x4f,0xcc,0x83,0xcc,0x88}},
-    {{0xc5,0x8c},	{0x4f,0xcc,0x84}},
-    {{0xe1,0xb9,0x90},	{0x4f,0xcc,0x84,0xcc,0x80}},
-    {{0xe1,0xb9,0x92},	{0x4f,0xcc,0x84,0xcc,0x81}},
-    {{0xc5,0x8e},	{0x4f,0xcc,0x86}},
-    {{0xc3,0x96},	{0x4f,0xcc,0x88}},
-    {{0xe1,0xbb,0x8e},	{0x4f,0xcc,0x89}},
-    {{0xc5,0x90},	{0x4f,0xcc,0x8b}},
-    {{0xc7,0x91},	{0x4f,0xcc,0x8c}},
-    {{0xc8,0x8c},	{0x4f,0xcc,0x8f}},
-    {{0xc8,0x8e},	{0x4f,0xcc,0x91}},
-    {{0xc6,0xa0},	{0x4f,0xcc,0x9b}},
-    {{0xe1,0xbb,0x9c},	{0x4f,0xcc,0x9b,0xcc,0x80}},
-    {{0xe1,0xbb,0x9a},	{0x4f,0xcc,0x9b,0xcc,0x81}},
-    {{0xe1,0xbb,0xa0},	{0x4f,0xcc,0x9b,0xcc,0x83}},
-    {{0xe1,0xbb,0x9e},	{0x4f,0xcc,0x9b,0xcc,0x89}},
-    {{0xe1,0xbb,0xa2},	{0x4f,0xcc,0x9b,0xcc,0xa3}},
-    {{0xe1,0xbb,0x8c},	{0x4f,0xcc,0xa3}},
-    {{0xe1,0xbb,0x98},	{0x4f,0xcc,0xa3,0xcc,0x82}},
-    {{0xc7,0xaa},	{0x4f,0xcc,0xa8}},
-    {{0xc7,0xac},	{0x4f,0xcc,0xa8,0xcc,0x84}},
-    {{0xe1,0xb9,0x94},	{0x50,0xcc,0x81}},
-    {{0xe1,0xb9,0x96},	{0x50,0xcc,0x87}},
-    {{0xc5,0x94},	{0x52,0xcc,0x81}},
-    {{0xe1,0xb9,0x98},	{0x52,0xcc,0x87}},
-    {{0xc5,0x98},	{0x52,0xcc,0x8c}},
-    {{0xc8,0x90},	{0x52,0xcc,0x8f}},
-    {{0xc8,0x92},	{0x52,0xcc,0x91}},
-    {{0xe1,0xb9,0x9a},	{0x52,0xcc,0xa3}},
-    {{0xe1,0xb9,0x9c},	{0x52,0xcc,0xa3,0xcc,0x84}},
-    {{0xc5,0x96},	{0x52,0xcc,0xa7}},
-    {{0xe1,0xb9,0x9e},	{0x52,0xcc,0xb1}},
-    {{0xc5,0x9a},	{0x53,0xcc,0x81}},
-    {{0xe1,0xb9,0xa4},	{0x53,0xcc,0x81,0xcc,0x87}},
-    {{0xc5,0x9c},	{0x53,0xcc,0x82}},
-    {{0xe1,0xb9,0xa0},	{0x53,0xcc,0x87}},
-    {{0xc5,0xa0},	{0x53,0xcc,0x8c}},
-    {{0xe1,0xb9,0xa6},	{0x53,0xcc,0x8c,0xcc,0x87}},
-    {{0xe1,0xb9,0xa2},	{0x53,0xcc,0xa3}},
-    {{0xe1,0xb9,0xa8},	{0x53,0xcc,0xa3,0xcc,0x87}},
-    {{0xc5,0x9e},	{0x53,0xcc,0xa7}},
-    {{0xe1,0xb9,0xaa},	{0x54,0xcc,0x87}},
-    {{0xc5,0xa4},	{0x54,0xcc,0x8c}},
-    {{0xe1,0xb9,0xac},	{0x54,0xcc,0xa3}},
-    {{0xc5,0xa2},	{0x54,0xcc,0xa7}},
-    {{0xe1,0xb9,0xb0},	{0x54,0xcc,0xad}},
-    {{0xe1,0xb9,0xae},	{0x54,0xcc,0xb1}},
-    {{0xc3,0x99},	{0x55,0xcc,0x80}},
-    {{0xc3,0x9a},	{0x55,0xcc,0x81}},
-    {{0xc3,0x9b},	{0x55,0xcc,0x82}},
-    {{0xc5,0xa8},	{0x55,0xcc,0x83}},
-    {{0xe1,0xb9,0xb8},	{0x55,0xcc,0x83,0xcc,0x81}},
-    {{0xc5,0xaa},	{0x55,0xcc,0x84}},
-    {{0xe1,0xb9,0xba},	{0x55,0xcc,0x84,0xcc,0x88}},
-    {{0xc5,0xac},	{0x55,0xcc,0x86}},
-    {{0xc3,0x9c},	{0x55,0xcc,0x88}},
-    {{0xc7,0x9b},	{0x55,0xcc,0x88,0xcc,0x80}},
-    {{0xc7,0x97},	{0x55,0xcc,0x88,0xcc,0x81}},
-    {{0xc7,0x95},	{0x55,0xcc,0x88,0xcc,0x84}},
-    {{0xc7,0x99},	{0x55,0xcc,0x88,0xcc,0x8c}},
-    {{0xe1,0xbb,0xa6},	{0x55,0xcc,0x89}},
-    {{0xc5,0xae},	{0x55,0xcc,0x8a}},
-    {{0xc5,0xb0},	{0x55,0xcc,0x8b}},
-    {{0xc7,0x93},	{0x55,0xcc,0x8c}},
-    {{0xc8,0x94},	{0x55,0xcc,0x8f}},
-    {{0xc8,0x96},	{0x55,0xcc,0x91}},
-    {{0xc6,0xaf},	{0x55,0xcc,0x9b}},
-    {{0xe1,0xbb,0xaa},	{0x55,0xcc,0x9b,0xcc,0x80}},
-    {{0xe1,0xbb,0xa8},	{0x55,0xcc,0x9b,0xcc,0x81}},
-    {{0xe1,0xbb,0xae},	{0x55,0xcc,0x9b,0xcc,0x83}},
-    {{0xe1,0xbb,0xac},	{0x55,0xcc,0x9b,0xcc,0x89}},
-    {{0xe1,0xbb,0xb0},	{0x55,0xcc,0x9b,0xcc,0xa3}},
-    {{0xe1,0xbb,0xa4},	{0x55,0xcc,0xa3}},
-    {{0xe1,0xb9,0xb2},	{0x55,0xcc,0xa4}},
-    {{0xc5,0xb2},	{0x55,0xcc,0xa8}},
-    {{0xe1,0xb9,0xb6},	{0x55,0xcc,0xad}},
-    {{0xe1,0xb9,0xb4},	{0x55,0xcc,0xb0}},
-    {{0xe1,0xb9,0xbc},	{0x56,0xcc,0x83}},
-    {{0xe1,0xb9,0xbe},	{0x56,0xcc,0xa3}},
-    {{0xe1,0xba,0x80},	{0x57,0xcc,0x80}},
-    {{0xe1,0xba,0x82},	{0x57,0xcc,0x81}},
-    {{0xc5,0xb4},	{0x57,0xcc,0x82}},
-    {{0xe1,0xba,0x86},	{0x57,0xcc,0x87}},
-    {{0xe1,0xba,0x84},	{0x57,0xcc,0x88}},
-    {{0xe1,0xba,0x88},	{0x57,0xcc,0xa3}},
-    {{0xe1,0xba,0x8a},	{0x58,0xcc,0x87}},
-    {{0xe1,0xba,0x8c},	{0x58,0xcc,0x88}},
-    {{0xe1,0xbb,0xb2},	{0x59,0xcc,0x80}},
-    {{0xc3,0x9d},	{0x59,0xcc,0x81}},
-    {{0xc5,0xb6},	{0x59,0xcc,0x82}},
-    {{0xe1,0xbb,0xb8},	{0x59,0xcc,0x83}},
-    {{0xe1,0xba,0x8e},	{0x59,0xcc,0x87}},
-    {{0xc5,0xb8},	{0x59,0xcc,0x88}},
-    {{0xe1,0xbb,0xb6},	{0x59,0xcc,0x89}},
-    {{0xe1,0xbb,0xb4},	{0x59,0xcc,0xa3}},
-    {{0xc5,0xb9},	{0x5a,0xcc,0x81}},
-    {{0xe1,0xba,0x90},	{0x5a,0xcc,0x82}},
-    {{0xc5,0xbb},	{0x5a,0xcc,0x87}},
-    {{0xc5,0xbd},	{0x5a,0xcc,0x8c}},
-    {{0xe1,0xba,0x92},	{0x5a,0xcc,0xa3}},
-    {{0xe1,0xba,0x94},	{0x5a,0xcc,0xb1}},
-    {{0xe1,0xbf,0xaf},	{0x60}},
-    {{0xc3,0xa0},	{0x61,0xcc,0x80}},
-    {{0xc3,0xa1},	{0x61,0xcc,0x81}},
-    {{0xc3,0xa2},	{0x61,0xcc,0x82}},
-    {{0xe1,0xba,0xa7},	{0x61,0xcc,0x82,0xcc,0x80}},
-    {{0xe1,0xba,0xa5},	{0x61,0xcc,0x82,0xcc,0x81}},
-    {{0xe1,0xba,0xab},	{0x61,0xcc,0x82,0xcc,0x83}},
-    {{0xe1,0xba,0xa9},	{0x61,0xcc,0x82,0xcc,0x89}},
-    {{0xc3,0xa3},	{0x61,0xcc,0x83}},
-    {{0xc4,0x81},	{0x61,0xcc,0x84}},
-    {{0xc4,0x83},	{0x61,0xcc,0x86}},
-    {{0xe1,0xba,0xb1},	{0x61,0xcc,0x86,0xcc,0x80}},
-    {{0xe1,0xba,0xaf},	{0x61,0xcc,0x86,0xcc,0x81}},
-    {{0xe1,0xba,0xb5},	{0x61,0xcc,0x86,0xcc,0x83}},
-    {{0xe1,0xba,0xb3},	{0x61,0xcc,0x86,0xcc,0x89}},
-    {{0xc7,0xa1},	{0x61,0xcc,0x87,0xcc,0x84}},
-    {{0xc3,0xa4},	{0x61,0xcc,0x88}},
-    {{0xc7,0x9f},	{0x61,0xcc,0x88,0xcc,0x84}},
-    {{0xe1,0xba,0xa3},	{0x61,0xcc,0x89}},
-    {{0xc3,0xa5},	{0x61,0xcc,0x8a}},
-    {{0xc7,0xbb},	{0x61,0xcc,0x8a,0xcc,0x81}},
-    {{0xc7,0x8e},	{0x61,0xcc,0x8c}},
-    {{0xc8,0x81},	{0x61,0xcc,0x8f}},
-    {{0xc8,0x83},	{0x61,0xcc,0x91}},
-    {{0xe1,0xba,0xa1},	{0x61,0xcc,0xa3}},
-    {{0xe1,0xba,0xad},	{0x61,0xcc,0xa3,0xcc,0x82}},
-    {{0xe1,0xba,0xb7},	{0x61,0xcc,0xa3,0xcc,0x86}},
-    {{0xe1,0xb8,0x81},	{0x61,0xcc,0xa5}},
-    {{0xc4,0x85},	{0x61,0xcc,0xa8}},
-    {{0xe1,0xb8,0x83},	{0x62,0xcc,0x87}},
-    {{0xe1,0xb8,0x85},	{0x62,0xcc,0xa3}},
-    {{0xe1,0xb8,0x87},	{0x62,0xcc,0xb1}},
-    {{0xc4,0x87},	{0x63,0xcc,0x81}},
-    {{0xc4,0x89},	{0x63,0xcc,0x82}},
-    {{0xc4,0x8b},	{0x63,0xcc,0x87}},
-    {{0xc4,0x8d},	{0x63,0xcc,0x8c}},
-    {{0xc3,0xa7},	{0x63,0xcc,0xa7}},
-    {{0xe1,0xb8,0x89},	{0x63,0xcc,0xa7,0xcc,0x81}},
-    {{0xe1,0xb8,0x8b},	{0x64,0xcc,0x87}},
-    {{0xc4,0x8f},	{0x64,0xcc,0x8c}},
-    {{0xe1,0xb8,0x8d},	{0x64,0xcc,0xa3}},
-    {{0xe1,0xb8,0x91},	{0x64,0xcc,0xa7}},
-    {{0xe1,0xb8,0x93},	{0x64,0xcc,0xad}},
-    {{0xe1,0xb8,0x8f},	{0x64,0xcc,0xb1}},
-    {{0xc3,0xa8},	{0x65,0xcc,0x80}},
-    {{0xc3,0xa9},	{0x65,0xcc,0x81}},
-    {{0xc3,0xaa},	{0x65,0xcc,0x82}},
-    {{0xe1,0xbb,0x81},	{0x65,0xcc,0x82,0xcc,0x80}},
-    {{0xe1,0xba,0xbf},	{0x65,0xcc,0x82,0xcc,0x81}},
-    {{0xe1,0xbb,0x85},	{0x65,0xcc,0x82,0xcc,0x83}},
-    {{0xe1,0xbb,0x83},	{0x65,0xcc,0x82,0xcc,0x89}},
-    {{0xe1,0xba,0xbd},	{0x65,0xcc,0x83}},
-    {{0xc4,0x93},	{0x65,0xcc,0x84}},
-    {{0xe1,0xb8,0x95},	{0x65,0xcc,0x84,0xcc,0x80}},
-    {{0xe1,0xb8,0x97},	{0x65,0xcc,0x84,0xcc,0x81}},
-    {{0xc4,0x95},	{0x65,0xcc,0x86}},
-    {{0xc4,0x97},	{0x65,0xcc,0x87}},
-    {{0xc3,0xab},	{0x65,0xcc,0x88}},
-    {{0xe1,0xba,0xbb},	{0x65,0xcc,0x89}},
-    {{0xc4,0x9b},	{0x65,0xcc,0x8c}},
-    {{0xc8,0x85},	{0x65,0xcc,0x8f}},
-    {{0xc8,0x87},	{0x65,0xcc,0x91}},
-    {{0xe1,0xba,0xb9},	{0x65,0xcc,0xa3}},
-    {{0xe1,0xbb,0x87},	{0x65,0xcc,0xa3,0xcc,0x82}},
-    {{0xe1,0xb8,0x9d},	{0x65,0xcc,0xa7,0xcc,0x86}},
-    {{0xc4,0x99},	{0x65,0xcc,0xa8}},
-    {{0xe1,0xb8,0x99},	{0x65,0xcc,0xad}},
-    {{0xe1,0xb8,0x9b},	{0x65,0xcc,0xb0}},
-    {{0xe1,0xb8,0x9f},	{0x66,0xcc,0x87}},
-    {{0xc7,0xb5},	{0x67,0xcc,0x81}},
-    {{0xc4,0x9d},	{0x67,0xcc,0x82}},
-    {{0xe1,0xb8,0xa1},	{0x67,0xcc,0x84}},
-    {{0xc4,0x9f},	{0x67,0xcc,0x86}},
-    {{0xc4,0xa1},	{0x67,0xcc,0x87}},
-    {{0xc7,0xa7},	{0x67,0xcc,0x8c}},
-    {{0xc4,0xa3},	{0x67,0xcc,0xa7}},
-    {{0xc4,0xa5},	{0x68,0xcc,0x82}},
-    {{0xe1,0xb8,0xa3},	{0x68,0xcc,0x87}},
-    {{0xe1,0xb8,0xa7},	{0x68,0xcc,0x88}},
-    {{0xe1,0xb8,0xa5},	{0x68,0xcc,0xa3}},
-    {{0xe1,0xb8,0xa9},	{0x68,0xcc,0xa7}},
-    {{0xe1,0xb8,0xab},	{0x68,0xcc,0xae}},
-    {{0xe1,0xba,0x96},	{0x68,0xcc,0xb1}},
-    {{0xc3,0xac},	{0x69,0xcc,0x80}},
-    {{0xc3,0xad},	{0x69,0xcc,0x81}},
-    {{0xc3,0xae},	{0x69,0xcc,0x82}},
-    {{0xc4,0xa9},	{0x69,0xcc,0x83}},
-    {{0xc4,0xab},	{0x69,0xcc,0x84}},
-    {{0xc4,0xad},	{0x69,0xcc,0x86}},
-    {{0xc3,0xaf},	{0x69,0xcc,0x88}},
-    {{0xe1,0xb8,0xaf},	{0x69,0xcc,0x88,0xcc,0x81}},
-    {{0xe1,0xbb,0x89},	{0x69,0xcc,0x89}},
-    {{0xc7,0x90},	{0x69,0xcc,0x8c}},
-    {{0xc8,0x89},	{0x69,0xcc,0x8f}},
-    {{0xc8,0x8b},	{0x69,0xcc,0x91}},
-    {{0xe1,0xbb,0x8b},	{0x69,0xcc,0xa3}},
-    {{0xc4,0xaf},	{0x69,0xcc,0xa8}},
-    {{0xe1,0xb8,0xad},	{0x69,0xcc,0xb0}},
-    {{0xc4,0xb5},	{0x6a,0xcc,0x82}},
-    {{0xc7,0xb0},	{0x6a,0xcc,0x8c}},
-    {{0xe1,0xb8,0xb1},	{0x6b,0xcc,0x81}},
-    {{0xc7,0xa9},	{0x6b,0xcc,0x8c}},
-    {{0xe1,0xb8,0xb3},	{0x6b,0xcc,0xa3}},
-    {{0xc4,0xb7},	{0x6b,0xcc,0xa7}},
-    {{0xe1,0xb8,0xb5},	{0x6b,0xcc,0xb1}},
-    {{0xc4,0xba},	{0x6c,0xcc,0x81}},
-    {{0xc4,0xbe},	{0x6c,0xcc,0x8c}},
-    {{0xe1,0xb8,0xb7},	{0x6c,0xcc,0xa3}},
-    {{0xe1,0xb8,0xb9},	{0x6c,0xcc,0xa3,0xcc,0x84}},
-    {{0xc4,0xbc},	{0x6c,0xcc,0xa7}},
-    {{0xe1,0xb8,0xbd},	{0x6c,0xcc,0xad}},
-    {{0xe1,0xb8,0xbb},	{0x6c,0xcc,0xb1}},
-    {{0xe1,0xb8,0xbf},	{0x6d,0xcc,0x81}},
-    {{0xe1,0xb9,0x81},	{0x6d,0xcc,0x87}},
-    {{0xe1,0xb9,0x83},	{0x6d,0xcc,0xa3}},
-    {{0xc5,0x84},	{0x6e,0xcc,0x81}},
-    {{0xc3,0xb1},	{0x6e,0xcc,0x83}},
-    {{0xe1,0xb9,0x85},	{0x6e,0xcc,0x87}},
-    {{0xc5,0x88},	{0x6e,0xcc,0x8c}},
-    {{0xe1,0xb9,0x87},	{0x6e,0xcc,0xa3}},
-    {{0xc5,0x86},	{0x6e,0xcc,0xa7}},
-    {{0xe1,0xb9,0x8b},	{0x6e,0xcc,0xad}},
-    {{0xe1,0xb9,0x89},	{0x6e,0xcc,0xb1}},
-    {{0xc3,0xb2},	{0x6f,0xcc,0x80}},
-    {{0xc3,0xb3},	{0x6f,0xcc,0x81}},
-    {{0xc3,0xb4},	{0x6f,0xcc,0x82}},
-    {{0xe1,0xbb,0x93},	{0x6f,0xcc,0x82,0xcc,0x80}},
-    {{0xe1,0xbb,0x91},	{0x6f,0xcc,0x82,0xcc,0x81}},
-    {{0xe1,0xbb,0x97},	{0x6f,0xcc,0x82,0xcc,0x83}},
-    {{0xe1,0xbb,0x95},	{0x6f,0xcc,0x82,0xcc,0x89}},
-    {{0xc3,0xb5},	{0x6f,0xcc,0x83}},
-    {{0xe1,0xb9,0x8d},	{0x6f,0xcc,0x83,0xcc,0x81}},
-    {{0xe1,0xb9,0x8f},	{0x6f,0xcc,0x83,0xcc,0x88}},
-    {{0xc5,0x8d},	{0x6f,0xcc,0x84}},
-    {{0xe1,0xb9,0x91},	{0x6f,0xcc,0x84,0xcc,0x80}},
-    {{0xe1,0xb9,0x93},	{0x6f,0xcc,0x84,0xcc,0x81}},
-    {{0xc5,0x8f},	{0x6f,0xcc,0x86}},
-    {{0xc3,0xb6},	{0x6f,0xcc,0x88}},
-    {{0xe1,0xbb,0x8f},	{0x6f,0xcc,0x89}},
-    {{0xc5,0x91},	{0x6f,0xcc,0x8b}},
-    {{0xc7,0x92},	{0x6f,0xcc,0x8c}},
-    {{0xc8,0x8d},	{0x6f,0xcc,0x8f}},
-    {{0xc8,0x8f},	{0x6f,0xcc,0x91}},
-    {{0xc6,0xa1},	{0x6f,0xcc,0x9b}},
-    {{0xe1,0xbb,0x9d},	{0x6f,0xcc,0x9b,0xcc,0x80}},
-    {{0xe1,0xbb,0x9b},	{0x6f,0xcc,0x9b,0xcc,0x81}},
-    {{0xe1,0xbb,0xa1},	{0x6f,0xcc,0x9b,0xcc,0x83}},
-    {{0xe1,0xbb,0x9f},	{0x6f,0xcc,0x9b,0xcc,0x89}},
-    {{0xe1,0xbb,0xa3},	{0x6f,0xcc,0x9b,0xcc,0xa3}},
-    {{0xe1,0xbb,0x8d},	{0x6f,0xcc,0xa3}},
-    {{0xe1,0xbb,0x99},	{0x6f,0xcc,0xa3,0xcc,0x82}},
-    {{0xc7,0xab},	{0x6f,0xcc,0xa8}},
-    {{0xc7,0xad},	{0x6f,0xcc,0xa8,0xcc,0x84}},
-    {{0xe1,0xb9,0x95},	{0x70,0xcc,0x81}},
-    {{0xe1,0xb9,0x97},	{0x70,0xcc,0x87}},
-    {{0xc5,0x95},	{0x72,0xcc,0x81}},
-    {{0xe1,0xb9,0x99},	{0x72,0xcc,0x87}},
-    {{0xc5,0x99},	{0x72,0xcc,0x8c}},
-    {{0xc8,0x91},	{0x72,0xcc,0x8f}},
-    {{0xc8,0x93},	{0x72,0xcc,0x91}},
-    {{0xe1,0xb9,0x9b},	{0x72,0xcc,0xa3}},
-    {{0xe1,0xb9,0x9d},	{0x72,0xcc,0xa3,0xcc,0x84}},
-    {{0xc5,0x97},	{0x72,0xcc,0xa7}},
-    {{0xe1,0xb9,0x9f},	{0x72,0xcc,0xb1}},
-    {{0xc5,0x9b},	{0x73,0xcc,0x81}},
-    {{0xe1,0xb9,0xa5},	{0x73,0xcc,0x81,0xcc,0x87}},
-    {{0xc5,0x9d},	{0x73,0xcc,0x82}},
-    {{0xe1,0xb9,0xa1},	{0x73,0xcc,0x87}},
-    {{0xc5,0xa1},	{0x73,0xcc,0x8c}},
-    {{0xe1,0xb9,0xa7},	{0x73,0xcc,0x8c,0xcc,0x87}},
-    {{0xe1,0xb9,0xa3},	{0x73,0xcc,0xa3}},
-    {{0xe1,0xb9,0xa9},	{0x73,0xcc,0xa3,0xcc,0x87}},
-    {{0xc5,0x9f},	{0x73,0xcc,0xa7}},
-    {{0xe1,0xb9,0xab},	{0x74,0xcc,0x87}},
-    {{0xe1,0xba,0x97},	{0x74,0xcc,0x88}},
-    {{0xc5,0xa5},	{0x74,0xcc,0x8c}},
-    {{0xe1,0xb9,0xad},	{0x74,0xcc,0xa3}},
-    {{0xc5,0xa3},	{0x74,0xcc,0xa7}},
-    {{0xe1,0xb9,0xb1},	{0x74,0xcc,0xad}},
-    {{0xe1,0xb9,0xaf},	{0x74,0xcc,0xb1}},
-    {{0xc3,0xb9},	{0x75,0xcc,0x80}},
-    {{0xc3,0xba},	{0x75,0xcc,0x81}},
-    {{0xc3,0xbb},	{0x75,0xcc,0x82}},
-    {{0xc5,0xa9},	{0x75,0xcc,0x83}},
-    {{0xe1,0xb9,0xb9},	{0x75,0xcc,0x83,0xcc,0x81}},
-    {{0xc5,0xab},	{0x75,0xcc,0x84}},
-    {{0xe1,0xb9,0xbb},	{0x75,0xcc,0x84,0xcc,0x88}},
-    {{0xc5,0xad},	{0x75,0xcc,0x86}},
-    {{0xc3,0xbc},	{0x75,0xcc,0x88}},
-    {{0xc7,0x9c},	{0x75,0xcc,0x88,0xcc,0x80}},
-    {{0xc7,0x98},	{0x75,0xcc,0x88,0xcc,0x81}},
-    {{0xc7,0x96},	{0x75,0xcc,0x88,0xcc,0x84}},
-    {{0xc7,0x9a},	{0x75,0xcc,0x88,0xcc,0x8c}},
-    {{0xe1,0xbb,0xa7},	{0x75,0xcc,0x89}},
-    {{0xc5,0xaf},	{0x75,0xcc,0x8a}},
-    {{0xc5,0xb1},	{0x75,0xcc,0x8b}},
-    {{0xc7,0x94},	{0x75,0xcc,0x8c}},
-    {{0xc8,0x95},	{0x75,0xcc,0x8f}},
-    {{0xc8,0x97},	{0x75,0xcc,0x91}},
-    {{0xc6,0xb0},	{0x75,0xcc,0x9b}},
-    {{0xe1,0xbb,0xab},	{0x75,0xcc,0x9b,0xcc,0x80}},
-    {{0xe1,0xbb,0xa9},	{0x75,0xcc,0x9b,0xcc,0x81}},
-    {{0xe1,0xbb,0xaf},	{0x75,0xcc,0x9b,0xcc,0x83}},
-    {{0xe1,0xbb,0xad},	{0x75,0xcc,0x9b,0xcc,0x89}},
-    {{0xe1,0xbb,0xb1},	{0x75,0xcc,0x9b,0xcc,0xa3}},
-    {{0xe1,0xbb,0xa5},	{0x75,0xcc,0xa3}},
-    {{0xe1,0xb9,0xb3},	{0x75,0xcc,0xa4}},
-    {{0xc5,0xb3},	{0x75,0xcc,0xa8}},
-    {{0xe1,0xb9,0xb7},	{0x75,0xcc,0xad}},
-    {{0xe1,0xb9,0xb5},	{0x75,0xcc,0xb0}},
-    {{0xe1,0xb9,0xbd},	{0x76,0xcc,0x83}},
-    {{0xe1,0xb9,0xbf},	{0x76,0xcc,0xa3}},
-    {{0xe1,0xba,0x81},	{0x77,0xcc,0x80}},
-    {{0xe1,0xba,0x83},	{0x77,0xcc,0x81}},
-    {{0xc5,0xb5},	{0x77,0xcc,0x82}},
-    {{0xe1,0xba,0x87},	{0x77,0xcc,0x87}},
-    {{0xe1,0xba,0x85},	{0x77,0xcc,0x88}},
-    {{0xe1,0xba,0x98},	{0x77,0xcc,0x8a}},
-    {{0xe1,0xba,0x89},	{0x77,0xcc,0xa3}},
-    {{0xe1,0xba,0x8b},	{0x78,0xcc,0x87}},
-    {{0xe1,0xba,0x8d},	{0x78,0xcc,0x88}},
-    {{0xe1,0xbb,0xb3},	{0x79,0xcc,0x80}},
-    {{0xc3,0xbd},	{0x79,0xcc,0x81}},
-    {{0xc5,0xb7},	{0x79,0xcc,0x82}},
-    {{0xe1,0xbb,0xb9},	{0x79,0xcc,0x83}},
-    {{0xe1,0xba,0x8f},	{0x79,0xcc,0x87}},
-    {{0xc3,0xbf},	{0x79,0xcc,0x88}},
-    {{0xe1,0xbb,0xb7},	{0x79,0xcc,0x89}},
-    {{0xe1,0xba,0x99},	{0x79,0xcc,0x8a}},
-    {{0xe1,0xbb,0xb5},	{0x79,0xcc,0xa3}},
-    {{0xc5,0xba},	{0x7a,0xcc,0x81}},
-    {{0xe1,0xba,0x91},	{0x7a,0xcc,0x82}},
-    {{0xc5,0xbc},	{0x7a,0xcc,0x87}},
-    {{0xc5,0xbe},	{0x7a,0xcc,0x8c}},
-    {{0xe1,0xba,0x93},	{0x7a,0xcc,0xa3}},
-    {{0xe1,0xba,0x95},	{0x7a,0xcc,0xb1}},
-    {{0xe1,0xbf,0xad},	{0xc2,0xa8,0xcc,0x80}},
-    {{0xe1,0xbf,0xae},	{0xc2,0xa8,0xcc,0x81}},
-    {{0xce,0x85},	{0xc2,0xa8,0xcc,0x8d}},
-    {{0xe1,0xbf,0x81},	{0xc2,0xa8,0xcd,0x82}},
-    {{0xe1,0xbf,0xbd},	{0xc2,0xb4}},
-    {{0xce,0x87},	{0xc2,0xb7}},
-    {{0xd3,0x94},	{0xc3,0x86}},
-    {{0xc7,0xbc},	{0xc3,0x86,0xcc,0x81}},
-    {{0xc7,0xa2},	{0xc3,0x86,0xcc,0x84}},
-    {{0xc7,0xbe},	{0xc3,0x98,0xcc,0x81}},
-    {{0xd3,0x95},	{0xc3,0xa6}},
-    {{0xc7,0xbd},	{0xc3,0xa6,0xcc,0x81}},
-    {{0xc7,0xa3},	{0xc3,0xa6,0xcc,0x84}},
-    {{0xc7,0xbf},	{0xc3,0xb8,0xcc,0x81}},
-    {{0xe1,0xba,0x9b},	{0xc5,0xbf,0xcc,0x87}},
-    {{0xd3,0x98},	{0xc6,0x8f}},
-    {{0xd3,0x9a},	{0xc6,0x8f,0xcc,0x88}},
-    {{0xd3,0xa8},	{0xc6,0x9f}},
-    {{0xd3,0xaa},	{0xc6,0x9f,0xcc,0x88}},
-    {{0xd3,0xa0},	{0xc6,0xb7}},
-    {{0xc7,0xae},	{0xc6,0xb7,0xcc,0x8c}},
-    {{0xd3,0x99},	{0xc9,0x99}},
-    {{0xd3,0x9b},	{0xc9,0x99,0xcc,0x88}},
-    {{0xd3,0xa9},	{0xc9,0xb5}},
-    {{0xd3,0xab},	{0xc9,0xb5,0xcc,0x88}},
-    {{0xd3,0xa1},	{0xca,0x92}},
-    {{0xc7,0xaf},	{0xca,0x92,0xcc,0x8c}},
-    {{0xcd,0xb4},	{0xca,0xb9}},
-    {{0xcd,0x80},	{0xcc,0x80}},
-    {{0xcd,0x81},	{0xcc,0x81}},
-    {{0xcc,0x90},	{0xcc,0x86,0xcc,0x87}},
-    {{0xcd,0x84},	{0xcc,0x88,0xcc,0x8d}},
-    {{0xcd,0x83},	{0xcc,0x93}},
-    {{0xe1,0xbe,0xba},	{0xce,0x91,0xcc,0x80}},
-    {{0xe1,0xbe,0xbb},	{0xce,0x91,0xcc,0x81}},
-    {{0xe1,0xbe,0xb9},	{0xce,0x91,0xcc,0x84}},
-    {{0xe1,0xbe,0xb8},	{0xce,0x91,0xcc,0x86}},
-    {{0xce,0x86},	{0xce,0x91,0xcc,0x8d}},
-    {{0xe1,0xbc,0x88},	{0xce,0x91,0xcc,0x93}},
-    {{0xe1,0xbc,0x8a},	{0xce,0x91,0xcc,0x93,0xcc,0x80}},
-    {{0xe1,0xbc,0x8c},	{0xce,0x91,0xcc,0x93,0xcc,0x81}},
-    {{0xe1,0xbc,0x8e},	{0xce,0x91,0xcc,0x93,0xcd,0x82}},
-    {{0xe1,0xbc,0x89},	{0xce,0x91,0xcc,0x94}},
-    {{0xe1,0xbc,0x8b},	{0xce,0x91,0xcc,0x94,0xcc,0x80}},
-    {{0xe1,0xbc,0x8d},	{0xce,0x91,0xcc,0x94,0xcc,0x81}},
-    {{0xe1,0xbc,0x8f},	{0xce,0x91,0xcc,0x94,0xcd,0x82}},
-    {{0xe1,0xbe,0xbc},	{0xce,0x91,0xcd,0x85}},
-    {{0xe1,0xbe,0x88},	{0xce,0x91,0xcd,0x85,0xcc,0x93}},
-    {{0xe1,0xbe,0x8a},	{0xce,0x91,0xcd,0x85,0xcc,0x93,0xcc,0x80}},
-    {{0xe1,0xbe,0x8c},	{0xce,0x91,0xcd,0x85,0xcc,0x93,0xcc,0x81}},
-    {{0xe1,0xbe,0x8e},	{0xce,0x91,0xcd,0x85,0xcc,0x93,0xcd,0x82}},
-    {{0xe1,0xbe,0x89},	{0xce,0x91,0xcd,0x85,0xcc,0x94}},
-    {{0xe1,0xbe,0x8b},	{0xce,0x91,0xcd,0x85,0xcc,0x94,0xcc,0x80}},
-    {{0xe1,0xbe,0x8d},	{0xce,0x91,0xcd,0x85,0xcc,0x94,0xcc,0x81}},
-    {{0xe1,0xbe,0x8f},	{0xce,0x91,0xcd,0x85,0xcc,0x94,0xcd,0x82}},
-    {{0xe1,0xbf,0x88},	{0xce,0x95,0xcc,0x80}},
-    {{0xe1,0xbf,0x89},	{0xce,0x95,0xcc,0x81}},
-    {{0xce,0x88},	{0xce,0x95,0xcc,0x8d}},
-    {{0xe1,0xbc,0x98},	{0xce,0x95,0xcc,0x93}},
-    {{0xe1,0xbc,0x9a},	{0xce,0x95,0xcc,0x93,0xcc,0x80}},
-    {{0xe1,0xbc,0x9c},	{0xce,0x95,0xcc,0x93,0xcc,0x81}},
-    {{0xe1,0xbc,0x99},	{0xce,0x95,0xcc,0x94}},
-    {{0xe1,0xbc,0x9b},	{0xce,0x95,0xcc,0x94,0xcc,0x80}},
-    {{0xe1,0xbc,0x9d},	{0xce,0x95,0xcc,0x94,0xcc,0x81}},
-    {{0xe1,0xbf,0x8a},	{0xce,0x97,0xcc,0x80}},
-    {{0xe1,0xbf,0x8b},	{0xce,0x97,0xcc,0x81}},
-    {{0xce,0x89},	{0xce,0x97,0xcc,0x8d}},
-    {{0xe1,0xbc,0xa8},	{0xce,0x97,0xcc,0x93}},
-    {{0xe1,0xbc,0xaa},	{0xce,0x97,0xcc,0x93,0xcc,0x80}},
-    {{0xe1,0xbc,0xac},	{0xce,0x97,0xcc,0x93,0xcc,0x81}},
-    {{0xe1,0xbc,0xae},	{0xce,0x97,0xcc,0x93,0xcd,0x82}},
-    {{0xe1,0xbc,0xa9},	{0xce,0x97,0xcc,0x94}},
-    {{0xe1,0xbc,0xab},	{0xce,0x97,0xcc,0x94,0xcc,0x80}},
-    {{0xe1,0xbc,0xad},	{0xce,0x97,0xcc,0x94,0xcc,0x81}},
-    {{0xe1,0xbc,0xaf},	{0xce,0x97,0xcc,0x94,0xcd,0x82}},
-    {{0xe1,0xbf,0x8c},	{0xce,0x97,0xcd,0x85}},
-    {{0xe1,0xbe,0x98},	{0xce,0x97,0xcd,0x85,0xcc,0x93}},
-    {{0xe1,0xbe,0x9a},	{0xce,0x97,0xcd,0x85,0xcc,0x93,0xcc,0x80}},
-    {{0xe1,0xbe,0x9c},	{0xce,0x97,0xcd,0x85,0xcc,0x93,0xcc,0x81}},
-    {{0xe1,0xbe,0x9e},	{0xce,0x97,0xcd,0x85,0xcc,0x93,0xcd,0x82}},
-    {{0xe1,0xbe,0x99},	{0xce,0x97,0xcd,0x85,0xcc,0x94}},
-    {{0xe1,0xbe,0x9b},	{0xce,0x97,0xcd,0x85,0xcc,0x94,0xcc,0x80}},
-    {{0xe1,0xbe,0x9d},	{0xce,0x97,0xcd,0x85,0xcc,0x94,0xcc,0x81}},
-    {{0xe1,0xbe,0x9f},	{0xce,0x97,0xcd,0x85,0xcc,0x94,0xcd,0x82}},
-    {{0xe1,0xbf,0x9a},	{0xce,0x99,0xcc,0x80}},
-    {{0xe1,0xbf,0x9b},	{0xce,0x99,0xcc,0x81}},
-    {{0xe1,0xbf,0x99},	{0xce,0x99,0xcc,0x84}},
-    {{0xe1,0xbf,0x98},	{0xce,0x99,0xcc,0x86}},
-    {{0xce,0xaa},	{0xce,0x99,0xcc,0x88}},
-    {{0xce,0x8a},	{0xce,0x99,0xcc,0x8d}},
-    {{0xe1,0xbc,0xb8},	{0xce,0x99,0xcc,0x93}},
-    {{0xe1,0xbc,0xba},	{0xce,0x99,0xcc,0x93,0xcc,0x80}},
-    {{0xe1,0xbc,0xbc},	{0xce,0x99,0xcc,0x93,0xcc,0x81}},
-    {{0xe1,0xbc,0xbe},	{0xce,0x99,0xcc,0x93,0xcd,0x82}},
-    {{0xe1,0xbc,0xb9},	{0xce,0x99,0xcc,0x94}},
-    {{0xe1,0xbc,0xbb},	{0xce,0x99,0xcc,0x94,0xcc,0x80}},
-    {{0xe1,0xbc,0xbd},	{0xce,0x99,0xcc,0x94,0xcc,0x81}},
-    {{0xe1,0xbc,0xbf},	{0xce,0x99,0xcc,0x94,0xcd,0x82}},
-    {{0xe1,0xbf,0xb8},	{0xce,0x9f,0xcc,0x80}},
-    {{0xe1,0xbf,0xb9},	{0xce,0x9f,0xcc,0x81}},
-    {{0xce,0x8c},	{0xce,0x9f,0xcc,0x8d}},
-    {{0xe1,0xbd,0x88},	{0xce,0x9f,0xcc,0x93}},
-    {{0xe1,0xbd,0x8a},	{0xce,0x9f,0xcc,0x93,0xcc,0x80}},
-    {{0xe1,0xbd,0x8c},	{0xce,0x9f,0xcc,0x93,0xcc,0x81}},
-    {{0xe1,0xbd,0x89},	{0xce,0x9f,0xcc,0x94}},
-    {{0xe1,0xbd,0x8b},	{0xce,0x9f,0xcc,0x94,0xcc,0x80}},
-    {{0xe1,0xbd,0x8d},	{0xce,0x9f,0xcc,0x94,0xcc,0x81}},
-    {{0xe1,0xbf,0xac},	{0xce,0xa1,0xcc,0x94}},
-    {{0xe1,0xbf,0xaa},	{0xce,0xa5,0xcc,0x80}},
-    {{0xe1,0xbf,0xab},	{0xce,0xa5,0xcc,0x81}},
-    {{0xe1,0xbf,0xa9},	{0xce,0xa5,0xcc,0x84}},
-    {{0xe1,0xbf,0xa8},	{0xce,0xa5,0xcc,0x86}},
-    {{0xce,0xab},	{0xce,0xa5,0xcc,0x88}},
-    {{0xce,0x8e},	{0xce,0xa5,0xcc,0x8d}},
-    {{0xe1,0xbd,0x99},	{0xce,0xa5,0xcc,0x94}},
-    {{0xe1,0xbd,0x9b},	{0xce,0xa5,0xcc,0x94,0xcc,0x80}},
-    {{0xe1,0xbd,0x9d},	{0xce,0xa5,0xcc,0x94,0xcc,0x81}},
-    {{0xe1,0xbd,0x9f},	{0xce,0xa5,0xcc,0x94,0xcd,0x82}},
-    {{0xe1,0xbf,0xba},	{0xce,0xa9,0xcc,0x80}},
-    {{0xe1,0xbf,0xbb},	{0xce,0xa9,0xcc,0x81}},
-    {{0xce,0x8f},	{0xce,0xa9,0xcc,0x8d}},
-    {{0xe1,0xbd,0xa8},	{0xce,0xa9,0xcc,0x93}},
-    {{0xe1,0xbd,0xaa},	{0xce,0xa9,0xcc,0x93,0xcc,0x80}},
-    {{0xe1,0xbd,0xac},	{0xce,0xa9,0xcc,0x93,0xcc,0x81}},
-    {{0xe1,0xbd,0xae},	{0xce,0xa9,0xcc,0x93,0xcd,0x82}},
-    {{0xe1,0xbd,0xa9},	{0xce,0xa9,0xcc,0x94}},
-    {{0xe1,0xbd,0xab},	{0xce,0xa9,0xcc,0x94,0xcc,0x80}},
-    {{0xe1,0xbd,0xad},	{0xce,0xa9,0xcc,0x94,0xcc,0x81}},
-    {{0xe1,0xbd,0xaf},	{0xce,0xa9,0xcc,0x94,0xcd,0x82}},
-    {{0xe1,0xbf,0xbc},	{0xce,0xa9,0xcd,0x85}},
-    {{0xe1,0xbe,0xa8},	{0xce,0xa9,0xcd,0x85,0xcc,0x93}},
-    {{0xe1,0xbe,0xaa},	{0xce,0xa9,0xcd,0x85,0xcc,0x93,0xcc,0x80}},
-    {{0xe1,0xbe,0xac},	{0xce,0xa9,0xcd,0x85,0xcc,0x93,0xcc,0x81}},
-    {{0xe1,0xbe,0xae},	{0xce,0xa9,0xcd,0x85,0xcc,0x93,0xcd,0x82}},
-    {{0xe1,0xbe,0xa9},	{0xce,0xa9,0xcd,0x85,0xcc,0x94}},
-    {{0xe1,0xbe,0xab},	{0xce,0xa9,0xcd,0x85,0xcc,0x94,0xcc,0x80}},
-    {{0xe1,0xbe,0xad},	{0xce,0xa9,0xcd,0x85,0xcc,0x94,0xcc,0x81}},
-    {{0xe1,0xbe,0xaf},	{0xce,0xa9,0xcd,0x85,0xcc,0x94,0xcd,0x82}},
-    {{0xe1,0xbd,0xb0},	{0xce,0xb1,0xcc,0x80}},
-    {{0xe1,0xbd,0xb1},	{0xce,0xb1,0xcc,0x81}},
-    {{0xe1,0xbe,0xb1},	{0xce,0xb1,0xcc,0x84}},
-    {{0xe1,0xbe,0xb0},	{0xce,0xb1,0xcc,0x86}},
-    {{0xce,0xac},	{0xce,0xb1,0xcc,0x8d}},
-    {{0xe1,0xbc,0x80},	{0xce,0xb1,0xcc,0x93}},
-    {{0xe1,0xbc,0x82},	{0xce,0xb1,0xcc,0x93,0xcc,0x80}},
-    {{0xe1,0xbc,0x84},	{0xce,0xb1,0xcc,0x93,0xcc,0x81}},
-    {{0xe1,0xbc,0x86},	{0xce,0xb1,0xcc,0x93,0xcd,0x82}},
-    {{0xe1,0xbc,0x81},	{0xce,0xb1,0xcc,0x94}},
-    {{0xe1,0xbc,0x83},	{0xce,0xb1,0xcc,0x94,0xcc,0x80}},
-    {{0xe1,0xbc,0x85},	{0xce,0xb1,0xcc,0x94,0xcc,0x81}},
-    {{0xe1,0xbc,0x87},	{0xce,0xb1,0xcc,0x94,0xcd,0x82}},
-    {{0xe1,0xbe,0xb6},	{0xce,0xb1,0xcd,0x82}},
-    {{0xe1,0xbe,0xb3},	{0xce,0xb1,0xcd,0x85}},
-    {{0xe1,0xbe,0xb2},	{0xce,0xb1,0xcd,0x85,0xcc,0x80}},
-    {{0xe1,0xbe,0xb4},	{0xce,0xb1,0xcd,0x85,0xcc,0x81}},
-    {{0xe1,0xbe,0x80},	{0xce,0xb1,0xcd,0x85,0xcc,0x93}},
-    {{0xe1,0xbe,0x82},	{0xce,0xb1,0xcd,0x85,0xcc,0x93,0xcc,0x80}},
-    {{0xe1,0xbe,0x84},	{0xce,0xb1,0xcd,0x85,0xcc,0x93,0xcc,0x81}},
-    {{0xe1,0xbe,0x86},	{0xce,0xb1,0xcd,0x85,0xcc,0x93,0xcd,0x82}},
-    {{0xe1,0xbe,0x81},	{0xce,0xb1,0xcd,0x85,0xcc,0x94}},
-    {{0xe1,0xbe,0x83},	{0xce,0xb1,0xcd,0x85,0xcc,0x94,0xcc,0x80}},
-    {{0xe1,0xbe,0x85},	{0xce,0xb1,0xcd,0x85,0xcc,0x94,0xcc,0x81}},
-    {{0xe1,0xbe,0x87},	{0xce,0xb1,0xcd,0x85,0xcc,0x94,0xcd,0x82}},
-    {{0xe1,0xbe,0xb7},	{0xce,0xb1,0xcd,0x85,0xcd,0x82}},
-    {{0xe1,0xbd,0xb2},	{0xce,0xb5,0xcc,0x80}},
-    {{0xe1,0xbd,0xb3},	{0xce,0xb5,0xcc,0x81}},
-    {{0xce,0xad},	{0xce,0xb5,0xcc,0x8d}},
-    {{0xe1,0xbc,0x90},	{0xce,0xb5,0xcc,0x93}},
-    {{0xe1,0xbc,0x92},	{0xce,0xb5,0xcc,0x93,0xcc,0x80}},
-    {{0xe1,0xbc,0x94},	{0xce,0xb5,0xcc,0x93,0xcc,0x81}},
-    {{0xe1,0xbc,0x91},	{0xce,0xb5,0xcc,0x94}},
-    {{0xe1,0xbc,0x93},	{0xce,0xb5,0xcc,0x94,0xcc,0x80}},
-    {{0xe1,0xbc,0x95},	{0xce,0xb5,0xcc,0x94,0xcc,0x81}},
-    {{0xe1,0xbd,0xb4},	{0xce,0xb7,0xcc,0x80}},
-    {{0xe1,0xbd,0xb5},	{0xce,0xb7,0xcc,0x81}},
-    {{0xce,0xae},	{0xce,0xb7,0xcc,0x8d}},
-    {{0xe1,0xbc,0xa0},	{0xce,0xb7,0xcc,0x93}},
-    {{0xe1,0xbc,0xa2},	{0xce,0xb7,0xcc,0x93,0xcc,0x80}},
-    {{0xe1,0xbc,0xa4},	{0xce,0xb7,0xcc,0x93,0xcc,0x81}},
-    {{0xe1,0xbc,0xa6},	{0xce,0xb7,0xcc,0x93,0xcd,0x82}},
-    {{0xe1,0xbc,0xa1},	{0xce,0xb7,0xcc,0x94}},
-    {{0xe1,0xbc,0xa3},	{0xce,0xb7,0xcc,0x94,0xcc,0x80}},
-    {{0xe1,0xbc,0xa5},	{0xce,0xb7,0xcc,0x94,0xcc,0x81}},
-    {{0xe1,0xbc,0xa7},	{0xce,0xb7,0xcc,0x94,0xcd,0x82}},
-    {{0xe1,0xbf,0x86},	{0xce,0xb7,0xcd,0x82}},
-    {{0xe1,0xbf,0x83},	{0xce,0xb7,0xcd,0x85}},
-    {{0xe1,0xbf,0x82},	{0xce,0xb7,0xcd,0x85,0xcc,0x80}},
-    {{0xe1,0xbf,0x84},	{0xce,0xb7,0xcd,0x85,0xcc,0x81}},
-    {{0xe1,0xbe,0x90},	{0xce,0xb7,0xcd,0x85,0xcc,0x93}},
-    {{0xe1,0xbe,0x92},	{0xce,0xb7,0xcd,0x85,0xcc,0x93,0xcc,0x80}},
-    {{0xe1,0xbe,0x94},	{0xce,0xb7,0xcd,0x85,0xcc,0x93,0xcc,0x81}},
-    {{0xe1,0xbe,0x96},	{0xce,0xb7,0xcd,0x85,0xcc,0x93,0xcd,0x82}},
-    {{0xe1,0xbe,0x91},	{0xce,0xb7,0xcd,0x85,0xcc,0x94}},
-    {{0xe1,0xbe,0x93},	{0xce,0xb7,0xcd,0x85,0xcc,0x94,0xcc,0x80}},
-    {{0xe1,0xbe,0x95},	{0xce,0xb7,0xcd,0x85,0xcc,0x94,0xcc,0x81}},
-    {{0xe1,0xbe,0x97},	{0xce,0xb7,0xcd,0x85,0xcc,0x94,0xcd,0x82}},
-    {{0xe1,0xbf,0x87},	{0xce,0xb7,0xcd,0x85,0xcd,0x82}},
-    {{0xe1,0xbe,0xbe},	{0xce,0xb9}},
-    {{0xe1,0xbd,0xb6},	{0xce,0xb9,0xcc,0x80}},
-    {{0xe1,0xbd,0xb7},	{0xce,0xb9,0xcc,0x81}},
-    {{0xe1,0xbf,0x91},	{0xce,0xb9,0xcc,0x84}},
-    {{0xe1,0xbf,0x90},	{0xce,0xb9,0xcc,0x86}},
-    {{0xcf,0x8a},	{0xce,0xb9,0xcc,0x88}},
-    {{0xe1,0xbf,0x92},	{0xce,0xb9,0xcc,0x88,0xcc,0x80}},
-    {{0xe1,0xbf,0x93},	{0xce,0xb9,0xcc,0x88,0xcc,0x81}},
-    {{0xce,0x90},	{0xce,0xb9,0xcc,0x88,0xcc,0x8d}},
-    {{0xe1,0xbf,0x97},	{0xce,0xb9,0xcc,0x88,0xcd,0x82}},
-    {{0xce,0xaf},	{0xce,0xb9,0xcc,0x8d}},
-    {{0xe1,0xbc,0xb0},	{0xce,0xb9,0xcc,0x93}},
-    {{0xe1,0xbc,0xb2},	{0xce,0xb9,0xcc,0x93,0xcc,0x80}},
-    {{0xe1,0xbc,0xb4},	{0xce,0xb9,0xcc,0x93,0xcc,0x81}},
-    {{0xe1,0xbc,0xb6},	{0xce,0xb9,0xcc,0x93,0xcd,0x82}},
-    {{0xe1,0xbc,0xb1},	{0xce,0xb9,0xcc,0x94}},
-    {{0xe1,0xbc,0xb3},	{0xce,0xb9,0xcc,0x94,0xcc,0x80}},
-    {{0xe1,0xbc,0xb5},	{0xce,0xb9,0xcc,0x94,0xcc,0x81}},
-    {{0xe1,0xbc,0xb7},	{0xce,0xb9,0xcc,0x94,0xcd,0x82}},
-    {{0xe1,0xbf,0x96},	{0xce,0xb9,0xcd,0x82}},
-    {{0xe1,0xbd,0xb8},	{0xce,0xbf,0xcc,0x80}},
-    {{0xe1,0xbd,0xb9},	{0xce,0xbf,0xcc,0x81}},
-    {{0xcf,0x8c},	{0xce,0xbf,0xcc,0x8d}},
-    {{0xe1,0xbd,0x80},	{0xce,0xbf,0xcc,0x93}},
-    {{0xe1,0xbd,0x82},	{0xce,0xbf,0xcc,0x93,0xcc,0x80}},
-    {{0xe1,0xbd,0x84},	{0xce,0xbf,0xcc,0x93,0xcc,0x81}},
-    {{0xe1,0xbd,0x81},	{0xce,0xbf,0xcc,0x94}},
-    {{0xe1,0xbd,0x83},	{0xce,0xbf,0xcc,0x94,0xcc,0x80}},
-    {{0xe1,0xbd,0x85},	{0xce,0xbf,0xcc,0x94,0xcc,0x81}},
-    {{0xe1,0xbf,0xb4},	{0xce,0xbf,0xcd,0x85,0xcc,0x81}},
-    {{0xe1,0xbf,0xa4},	{0xcf,0x81,0xcc,0x93}},
-    {{0xe1,0xbf,0xa5},	{0xcf,0x81,0xcc,0x94}},
-    {{0xe1,0xbd,0xba},	{0xcf,0x85,0xcc,0x80}},
-    {{0xe1,0xbd,0xbb},	{0xcf,0x85,0xcc,0x81}},
-    {{0xe1,0xbf,0xa1},	{0xcf,0x85,0xcc,0x84}},
-    {{0xe1,0xbf,0xa0},	{0xcf,0x85,0xcc,0x86}},
-    {{0xcf,0x8b},	{0xcf,0x85,0xcc,0x88}},
-    {{0xe1,0xbf,0xa2},	{0xcf,0x85,0xcc,0x88,0xcc,0x80}},
-    {{0xe1,0xbf,0xa3},	{0xcf,0x85,0xcc,0x88,0xcc,0x81}},
-    {{0xce,0xb0},	{0xcf,0x85,0xcc,0x88,0xcc,0x8d}},
-    {{0xe1,0xbf,0xa7},	{0xcf,0x85,0xcc,0x88,0xcd,0x82}},
-    {{0xcf,0x8d},	{0xcf,0x85,0xcc,0x8d}},
-    {{0xe1,0xbd,0x90},	{0xcf,0x85,0xcc,0x93}},
-    {{0xe1,0xbd,0x92},	{0xcf,0x85,0xcc,0x93,0xcc,0x80}},
-    {{0xe1,0xbd,0x94},	{0xcf,0x85,0xcc,0x93,0xcc,0x81}},
-    {{0xe1,0xbd,0x96},	{0xcf,0x85,0xcc,0x93,0xcd,0x82}},
-    {{0xe1,0xbd,0x91},	{0xcf,0x85,0xcc,0x94}},
-    {{0xe1,0xbd,0x93},	{0xcf,0x85,0xcc,0x94,0xcc,0x80}},
-    {{0xe1,0xbd,0x95},	{0xcf,0x85,0xcc,0x94,0xcc,0x81}},
-    {{0xe1,0xbd,0x97},	{0xcf,0x85,0xcc,0x94,0xcd,0x82}},
-    {{0xe1,0xbf,0xa6},	{0xcf,0x85,0xcd,0x82}},
-    {{0xe1,0xbd,0xbc},	{0xcf,0x89,0xcc,0x80}},
-    {{0xe1,0xbd,0xbd},	{0xcf,0x89,0xcc,0x81}},
-    {{0xcf,0x8e},	{0xcf,0x89,0xcc,0x8d}},
-    {{0xe1,0xbd,0xa0},	{0xcf,0x89,0xcc,0x93}},
-    {{0xe1,0xbd,0xa2},	{0xcf,0x89,0xcc,0x93,0xcc,0x80}},
-    {{0xe1,0xbd,0xa4},	{0xcf,0x89,0xcc,0x93,0xcc,0x81}},
-    {{0xe1,0xbd,0xa6},	{0xcf,0x89,0xcc,0x93,0xcd,0x82}},
-    {{0xe1,0xbd,0xa1},	{0xcf,0x89,0xcc,0x94}},
-    {{0xe1,0xbd,0xa3},	{0xcf,0x89,0xcc,0x94,0xcc,0x80}},
-    {{0xe1,0xbd,0xa5},	{0xcf,0x89,0xcc,0x94,0xcc,0x81}},
-    {{0xe1,0xbd,0xa7},	{0xcf,0x89,0xcc,0x94,0xcd,0x82}},
-    {{0xe1,0xbf,0xb6},	{0xcf,0x89,0xcd,0x82}},
-    {{0xe1,0xbf,0xb3},	{0xcf,0x89,0xcd,0x85}},
-    {{0xe1,0xbf,0xb2},	{0xcf,0x89,0xcd,0x85,0xcc,0x80}},
-    {{0xe1,0xbe,0xa0},	{0xcf,0x89,0xcd,0x85,0xcc,0x93}},
-    {{0xe1,0xbe,0xa2},	{0xcf,0x89,0xcd,0x85,0xcc,0x93,0xcc,0x80}},
-    {{0xe1,0xbe,0xa4},	{0xcf,0x89,0xcd,0x85,0xcc,0x93,0xcc,0x81}},
-    {{0xe1,0xbe,0xa6},	{0xcf,0x89,0xcd,0x85,0xcc,0x93,0xcd,0x82}},
-    {{0xe1,0xbe,0xa1},	{0xcf,0x89,0xcd,0x85,0xcc,0x94}},
-    {{0xe1,0xbe,0xa3},	{0xcf,0x89,0xcd,0x85,0xcc,0x94,0xcc,0x80}},
-    {{0xe1,0xbe,0xa5},	{0xcf,0x89,0xcd,0x85,0xcc,0x94,0xcc,0x81}},
-    {{0xe1,0xbe,0xa7},	{0xcf,0x89,0xcd,0x85,0xcc,0x94,0xcd,0x82}},
-    {{0xe1,0xbf,0xb7},	{0xcf,0x89,0xcd,0x85,0xcd,0x82}},
-    {{0xcf,0x94},	{0xcf,0x92,0xcc,0x88}},
-    {{0xcf,0x93},	{0xcf,0x92,0xcc,0x8d}},
-    {{0xd0,0x87},	{0xd0,0x86,0xcc,0x88}},
-    {{0xd3,0x90},	{0xd0,0x90,0xcc,0x86}},
-    {{0xd3,0x92},	{0xd0,0x90,0xcc,0x88}},
-    {{0xd0,0x83},	{0xd0,0x93,0xcc,0x81}},
-    {{0xd3,0x96},	{0xd0,0x95,0xcc,0x86}},
-    {{0xd0,0x81},	{0xd0,0x95,0xcc,0x88}},
-    {{0xd3,0x81},	{0xd0,0x96,0xcc,0x86}},
-    {{0xd3,0x9c},	{0xd0,0x96,0xcc,0x88}},
-    {{0xd3,0x9e},	{0xd0,0x97,0xcc,0x88}},
-    {{0xd3,0xa2},	{0xd0,0x98,0xcc,0x84}},
-    {{0xd0,0x99},	{0xd0,0x98,0xcc,0x86}},
-    {{0xd3,0xa4},	{0xd0,0x98,0xcc,0x88}},
-    {{0xd0,0x8c},	{0xd0,0x9a,0xcc,0x81}},
-    {{0xd3,0xa6},	{0xd0,0x9e,0xcc,0x88}},
-    {{0xd3,0xae},	{0xd0,0xa3,0xcc,0x84}},
-    {{0xd0,0x8e},	{0xd0,0xa3,0xcc,0x86}},
-    {{0xd3,0xb0},	{0xd0,0xa3,0xcc,0x88}},
-    {{0xd3,0xb2},	{0xd0,0xa3,0xcc,0x8b}},
-    {{0xd3,0xb4},	{0xd0,0xa7,0xcc,0x88}},
-    {{0xd3,0xb8},	{0xd0,0xab,0xcc,0x88}},
-    {{0xd3,0x91},	{0xd0,0xb0,0xcc,0x86}},
-    {{0xd3,0x93},	{0xd0,0xb0,0xcc,0x88}},
-    {{0xd1,0x93},	{0xd0,0xb3,0xcc,0x81}},
-    {{0xd3,0x97},	{0xd0,0xb5,0xcc,0x86}},
-    {{0xd1,0x91},	{0xd0,0xb5,0xcc,0x88}},
-    {{0xd3,0x82},	{0xd0,0xb6,0xcc,0x86}},
-    {{0xd3,0x9d},	{0xd0,0xb6,0xcc,0x88}},
-    {{0xd3,0x9f},	{0xd0,0xb7,0xcc,0x88}},
-    {{0xd3,0xa3},	{0xd0,0xb8,0xcc,0x84}},
-    {{0xd0,0xb9},	{0xd0,0xb8,0xcc,0x86}},
-    {{0xd3,0xa5},	{0xd0,0xb8,0xcc,0x88}},
-    {{0xd1,0x9c},	{0xd0,0xba,0xcc,0x81}},
-    {{0xd3,0xa7},	{0xd0,0xbe,0xcc,0x88}},
-    {{0xd3,0xaf},	{0xd1,0x83,0xcc,0x84}},
-    {{0xd1,0x9e},	{0xd1,0x83,0xcc,0x86}},
-    {{0xd3,0xb1},	{0xd1,0x83,0xcc,0x88}},
-    {{0xd3,0xb3},	{0xd1,0x83,0xcc,0x8b}},
-    {{0xd3,0xb5},	{0xd1,0x87,0xcc,0x88}},
-    {{0xd3,0xb9},	{0xd1,0x8b,0xcc,0x88}},
-    {{0xd1,0x97},	{0xd1,0x96,0xcc,0x88}},
-    {{0xd1,0xb6},	{0xd1,0xb4,0xcc,0x8f}},
-    {{0xd1,0xb7},	{0xd1,0xb5,0xcc,0x8f}},
-    {{0xef,0xac,0xae},	{0xd7,0x90,0xd6,0xb7}},
-    {{0xef,0xac,0xaf},	{0xd7,0x90,0xd6,0xb8}},
-    {{0xef,0xac,0xb0},	{0xd7,0x90,0xd6,0xbc}},
-    {{0xef,0xac,0xb1},	{0xd7,0x91,0xd6,0xbc}},
-    {{0xef,0xad,0x8c},	{0xd7,0x91,0xd6,0xbf}},
-    {{0xef,0xac,0xb2},	{0xd7,0x92,0xd6,0xbc}},
-    {{0xef,0xac,0xb3},	{0xd7,0x93,0xd6,0xbc}},
-    {{0xef,0xac,0xb4},	{0xd7,0x94,0xd6,0xbc}},
-    {{0xef,0xad,0x8b},	{0xd7,0x95,0xd6,0xb9}},
-    {{0xef,0xac,0xb5},	{0xd7,0x95,0xd6,0xbc}},
-    {{0xef,0xac,0xb6},	{0xd7,0x96,0xd6,0xbc}},
-    {{0xef,0xac,0xb8},	{0xd7,0x98,0xd6,0xbc}},
-    {{0xef,0xac,0xb9},	{0xd7,0x99,0xd6,0xbc}},
-    {{0xef,0xac,0xba},	{0xd7,0x9a,0xd6,0xbc}},
-    {{0xef,0xac,0xbb},	{0xd7,0x9b,0xd6,0xbc}},
-    {{0xef,0xad,0x8d},	{0xd7,0x9b,0xd6,0xbf}},
-    {{0xef,0xac,0xbc},	{0xd7,0x9c,0xd6,0xbc}},
-    {{0xef,0xac,0xbe},	{0xd7,0x9e,0xd6,0xbc}},
-    {{0xef,0xad,0x80},	{0xd7,0xa0,0xd6,0xbc}},
-    {{0xef,0xad,0x81},	{0xd7,0xa1,0xd6,0xbc}},
-    {{0xef,0xad,0x83},	{0xd7,0xa3,0xd6,0xbc}},
-    {{0xef,0xad,0x84},	{0xd7,0xa4,0xd6,0xbc}},
-    {{0xef,0xad,0x8e},	{0xd7,0xa4,0xd6,0xbf}},
-    {{0xef,0xad,0x86},	{0xd7,0xa6,0xd6,0xbc}},
-    {{0xef,0xad,0x87},	{0xd7,0xa7,0xd6,0xbc}},
-    {{0xef,0xad,0x88},	{0xd7,0xa8,0xd6,0xbc}},
-    {{0xef,0xad,0x89},	{0xd7,0xa9,0xd6,0xbc}},
-    {{0xef,0xac,0xac},	{0xd7,0xa9,0xd6,0xbc,0xd7,0x81}},
-    {{0xef,0xac,0xad},	{0xd7,0xa9,0xd6,0xbc,0xd7,0x82}},
-    {{0xef,0xac,0xaa},	{0xd7,0xa9,0xd7,0x81}},
-    {{0xef,0xac,0xab},	{0xd7,0xa9,0xd7,0x82}},
-    {{0xef,0xad,0x8a},	{0xd7,0xaa,0xd6,0xbc}},
-    {{0xef,0xac,0x9f},	{0xd7,0xb2,0xd6,0xb7}},
-    {{0xe0,0xa5,0x98},	{0xe0,0xa4,0x95,0xe0,0xa4,0xbc}},
-    {{0xe0,0xa5,0x99},	{0xe0,0xa4,0x96,0xe0,0xa4,0xbc}},
-    {{0xe0,0xa5,0x9a},	{0xe0,0xa4,0x97,0xe0,0xa4,0xbc}},
-    {{0xe0,0xa5,0x9b},	{0xe0,0xa4,0x9c,0xe0,0xa4,0xbc}},
-    {{0xe0,0xa5,0x9c},	{0xe0,0xa4,0xa1,0xe0,0xa4,0xbc}},
-    {{0xe0,0xa5,0x9d},	{0xe0,0xa4,0xa2,0xe0,0xa4,0xbc}},
-    {{0xe0,0xa4,0xa9},	{0xe0,0xa4,0xa8,0xe0,0xa4,0xbc}},
-    {{0xe0,0xa5,0x9e},	{0xe0,0xa4,0xab,0xe0,0xa4,0xbc}},
-    {{0xe0,0xa5,0x9f},	{0xe0,0xa4,0xaf,0xe0,0xa4,0xbc}},
-    {{0xe0,0xa4,0xb1},	{0xe0,0xa4,0xb0,0xe0,0xa4,0xbc}},
-    {{0xe0,0xa4,0xb4},	{0xe0,0xa4,0xb3,0xe0,0xa4,0xbc}},
-    {{0xe0,0xa7,0x9c},	{0xe0,0xa6,0xa1,0xe0,0xa6,0xbc}},
-    {{0xe0,0xa7,0x9d},	{0xe0,0xa6,0xa2,0xe0,0xa6,0xbc}},
-    {{0xe0,0xa6,0xb0},	{0xe0,0xa6,0xac,0xe0,0xa6,0xbc}},
-    {{0xe0,0xa7,0x9f},	{0xe0,0xa6,0xaf,0xe0,0xa6,0xbc}},
-    {{0xe0,0xa7,0x8b},	{0xe0,0xa7,0x87,0xe0,0xa6,0xbe}},
-    {{0xe0,0xa7,0x8c},	{0xe0,0xa7,0x87,0xe0,0xa7,0x97}},
-    {{0xe0,0xa9,0x99},	{0xe0,0xa8,0x96,0xe0,0xa8,0xbc}},
-    {{0xe0,0xa9,0x9a},	{0xe0,0xa8,0x97,0xe0,0xa8,0xbc}},
-    {{0xe0,0xa9,0x9b},	{0xe0,0xa8,0x9c,0xe0,0xa8,0xbc}},
-    {{0xe0,0xa9,0x9c},	{0xe0,0xa8,0xa1,0xe0,0xa8,0xbc}},
-    {{0xe0,0xa9,0x9e},	{0xe0,0xa8,0xab,0xe0,0xa8,0xbc}},
-    {{0xe0,0xad,0x9c},	{0xe0,0xac,0xa1,0xe0,0xac,0xbc}},
-    {{0xe0,0xad,0x9d},	{0xe0,0xac,0xa2,0xe0,0xac,0xbc}},
-    {{0xe0,0xad,0x9f},	{0xe0,0xac,0xaf,0xe0,0xac,0xbc}},
-    {{0xe0,0xad,0x8b},	{0xe0,0xad,0x87,0xe0,0xac,0xbe}},
-    {{0xe0,0xad,0x88},	{0xe0,0xad,0x87,0xe0,0xad,0x96}},
-    {{0xe0,0xad,0x8c},	{0xe0,0xad,0x87,0xe0,0xad,0x97}},
-    {{0xe0,0xae,0x94},	{0xe0,0xae,0x92,0xe0,0xaf,0x97}},
-    {{0xe0,0xaf,0x8a},	{0xe0,0xaf,0x86,0xe0,0xae,0xbe}},
-    {{0xe0,0xaf,0x8c},	{0xe0,0xaf,0x86,0xe0,0xaf,0x97}},
-    {{0xe0,0xaf,0x8b},	{0xe0,0xaf,0x87,0xe0,0xae,0xbe}},
-    {{0xe0,0xb1,0x88},	{0xe0,0xb1,0x86,0xe0,0xb1,0x96}},
-    {{0xe0,0xb3,0x80},	{0xe0,0xb2,0xbf,0xe0,0xb3,0x95}},
-    {{0xe0,0xb3,0x8a},	{0xe0,0xb3,0x86,0xe0,0xb3,0x82}},
-    {{0xe0,0xb3,0x8b},	{0xe0,0xb3,0x86,0xe0,0xb3,0x82,0xe0,0xb3,0x95}},
-    {{0xe0,0xb3,0x87},	{0xe0,0xb3,0x86,0xe0,0xb3,0x95}},
-    {{0xe0,0xb3,0x88},	{0xe0,0xb3,0x86,0xe0,0xb3,0x96}},
-    {{0xe0,0xb5,0x8a},	{0xe0,0xb5,0x86,0xe0,0xb4,0xbe}},
-    {{0xe0,0xb5,0x8c},	{0xe0,0xb5,0x86,0xe0,0xb5,0x97}},
-    {{0xe0,0xb5,0x8b},	{0xe0,0xb5,0x87,0xe0,0xb4,0xbe}},
-    {{0xe0,0xb8,0xb3},	{0xe0,0xb9,0x8d,0xe0,0xb8,0xb2}},
-    {{0xe0,0xba,0xb3},	{0xe0,0xbb,0x8d,0xe0,0xba,0xb2}},
-    {{0xe0,0xbd,0xa9},	{0xe0,0xbd,0x80,0xe0,0xbe,0xb5}},
-    {{0xe0,0xbd,0x83},	{0xe0,0xbd,0x82,0xe0,0xbe,0xb7}},
-    {{0xe0,0xbd,0x8d},	{0xe0,0xbd,0x8c,0xe0,0xbe,0xb7}},
-    {{0xe0,0xbd,0x92},	{0xe0,0xbd,0x91,0xe0,0xbe,0xb7}},
-    {{0xe0,0xbd,0x97},	{0xe0,0xbd,0x96,0xe0,0xbe,0xb7}},
-    {{0xe0,0xbd,0x9c},	{0xe0,0xbd,0x9b,0xe0,0xbe,0xb7}},
-    {{0xe0,0xbd,0xb3},	{0xe0,0xbd,0xb2,0xe0,0xbd,0xb1}},
-    {{0xe0,0xbd,0xb5},	{0xe0,0xbd,0xb4,0xe0,0xbd,0xb1}},
-    {{0xe0,0xbe,0x81},	{0xe0,0xbe,0x80,0xe0,0xbd,0xb1}},
-    {{0xe0,0xbe,0xb9},	{0xe0,0xbe,0x90,0xe0,0xbe,0xb5}},
-    {{0xe0,0xbe,0x93},	{0xe0,0xbe,0x92,0xe0,0xbe,0xb7}},
-    {{0xe0,0xbe,0x9d},	{0xe0,0xbe,0x9c,0xe0,0xbe,0xb7}},
-    {{0xe0,0xbe,0xa2},	{0xe0,0xbe,0xa1,0xe0,0xbe,0xb7}},
-    {{0xe0,0xbe,0xa7},	{0xe0,0xbe,0xa6,0xe0,0xbe,0xb7}},
-    {{0xe0,0xbe,0xac},	{0xe0,0xbe,0xab,0xe0,0xbe,0xb7}},
-    {{0xe0,0xbd,0xb6},	{0xe0,0xbe,0xb2,0xe0,0xbe,0x80}},
-    {{0xe0,0xbd,0xb7},	{0xe0,0xbe,0xb2,0xe0,0xbe,0x80,0xe0,0xbd,0xb1}},
-    {{0xe0,0xbd,0xb8},	{0xe0,0xbe,0xb3,0xe0,0xbe,0x80}},
-    {{0xe0,0xbd,0xb9},	{0xe0,0xbe,0xb3,0xe0,0xbe,0x80,0xe0,0xbd,0xb1}},
-    {{0xe1,0xbf,0x8d},	{0xe1,0xbe,0xbf,0xcc,0x80}},
-    {{0xe1,0xbf,0x8e},	{0xe1,0xbe,0xbf,0xcc,0x81}},
-    {{0xe1,0xbf,0x8f},	{0xe1,0xbe,0xbf,0xcd,0x82}},
-    {{0xe1,0xbf,0x9d},	{0xe1,0xbf,0xbe,0xcc,0x80}},
-    {{0xe1,0xbf,0x9e},	{0xe1,0xbf,0xbe,0xcc,0x81}},
-    {{0xe1,0xbf,0x9f},	{0xe1,0xbf,0xbe,0xcd,0x82}},
-    {{0xe3,0x82,0x94},	{0xe3,0x81,0x86,0xe3,0x82,0x99}},
-    {{0xe3,0x81,0x8c},	{0xe3,0x81,0x8b,0xe3,0x82,0x99}},
-    {{0xe3,0x81,0x8e},	{0xe3,0x81,0x8d,0xe3,0x82,0x99}},
-    {{0xe3,0x81,0x90},	{0xe3,0x81,0x8f,0xe3,0x82,0x99}},
-    {{0xe3,0x81,0x92},	{0xe3,0x81,0x91,0xe3,0x82,0x99}},
-    {{0xe3,0x81,0x94},	{0xe3,0x81,0x93,0xe3,0x82,0x99}},
-    {{0xe3,0x81,0x96},	{0xe3,0x81,0x95,0xe3,0x82,0x99}},
-    {{0xe3,0x81,0x98},	{0xe3,0x81,0x97,0xe3,0x82,0x99}},
-    {{0xe3,0x81,0x9a},	{0xe3,0x81,0x99,0xe3,0x82,0x99}},
-    {{0xe3,0x81,0x9c},	{0xe3,0x81,0x9b,0xe3,0x82,0x99}},
-    {{0xe3,0x81,0x9e},	{0xe3,0x81,0x9d,0xe3,0x82,0x99}},
-    {{0xe3,0x81,0xa0},	{0xe3,0x81,0x9f,0xe3,0x82,0x99}},
-    {{0xe3,0x81,0xa2},	{0xe3,0x81,0xa1,0xe3,0x82,0x99}},
-    {{0xe3,0x81,0xa5},	{0xe3,0x81,0xa4,0xe3,0x82,0x99}},
-    {{0xe3,0x81,0xa7},	{0xe3,0x81,0xa6,0xe3,0x82,0x99}},
-    {{0xe3,0x81,0xa9},	{0xe3,0x81,0xa8,0xe3,0x82,0x99}},
-    {{0xe3,0x81,0xb0},	{0xe3,0x81,0xaf,0xe3,0x82,0x99}},
-    {{0xe3,0x81,0xb1},	{0xe3,0x81,0xaf,0xe3,0x82,0x9a}},
-    {{0xe3,0x81,0xb3},	{0xe3,0x81,0xb2,0xe3,0x82,0x99}},
-    {{0xe3,0x81,0xb4},	{0xe3,0x81,0xb2,0xe3,0x82,0x9a}},
-    {{0xe3,0x81,0xb6},	{0xe3,0x81,0xb5,0xe3,0x82,0x99}},
-    {{0xe3,0x81,0xb7},	{0xe3,0x81,0xb5,0xe3,0x82,0x9a}},
-    {{0xe3,0x81,0xb9},	{0xe3,0x81,0xb8,0xe3,0x82,0x99}},
-    {{0xe3,0x81,0xba},	{0xe3,0x81,0xb8,0xe3,0x82,0x9a}},
-    {{0xe3,0x81,0xbc},	{0xe3,0x81,0xbb,0xe3,0x82,0x99}},
-    {{0xe3,0x81,0xbd},	{0xe3,0x81,0xbb,0xe3,0x82,0x9a}},
-    {{0xe3,0x82,0x9e},	{0xe3,0x82,0x9d,0xe3,0x82,0x99}},
-    {{0xe3,0x83,0xb4},	{0xe3,0x82,0xa6,0xe3,0x82,0x99}},
-    {{0xe3,0x82,0xac},	{0xe3,0x82,0xab,0xe3,0x82,0x99}},
-    {{0xe3,0x82,0xae},	{0xe3,0x82,0xad,0xe3,0x82,0x99}},
-    {{0xe3,0x82,0xb0},	{0xe3,0x82,0xaf,0xe3,0x82,0x99}},
-    {{0xe3,0x82,0xb2},	{0xe3,0x82,0xb1,0xe3,0x82,0x99}},
-    {{0xe3,0x82,0xb4},	{0xe3,0x82,0xb3,0xe3,0x82,0x99}},
-    {{0xe3,0x82,0xb6},	{0xe3,0x82,0xb5,0xe3,0x82,0x99}},
-    {{0xe3,0x82,0xb8},	{0xe3,0x82,0xb7,0xe3,0x82,0x99}},
-    {{0xe3,0x82,0xba},	{0xe3,0x82,0xb9,0xe3,0x82,0x99}},
-    {{0xe3,0x82,0xbc},	{0xe3,0x82,0xbb,0xe3,0x82,0x99}},
-    {{0xe3,0x82,0xbe},	{0xe3,0x82,0xbd,0xe3,0x82,0x99}},
-    {{0xe3,0x83,0x80},	{0xe3,0x82,0xbf,0xe3,0x82,0x99}},
-    {{0xe3,0x83,0x82},	{0xe3,0x83,0x81,0xe3,0x82,0x99}},
-    {{0xe3,0x83,0x85},	{0xe3,0x83,0x84,0xe3,0x82,0x99}},
-    {{0xe3,0x83,0x87},	{0xe3,0x83,0x86,0xe3,0x82,0x99}},
-    {{0xe3,0x83,0x89},	{0xe3,0x83,0x88,0xe3,0x82,0x99}},
-    {{0xe3,0x83,0x90},	{0xe3,0x83,0x8f,0xe3,0x82,0x99}},
-    {{0xe3,0x83,0x91},	{0xe3,0x83,0x8f,0xe3,0x82,0x9a}},
-    {{0xe3,0x83,0x93},	{0xe3,0x83,0x92,0xe3,0x82,0x99}},
-    {{0xe3,0x83,0x94},	{0xe3,0x83,0x92,0xe3,0x82,0x9a}},
-    {{0xe3,0x83,0x96},	{0xe3,0x83,0x95,0xe3,0x82,0x99}},
-    {{0xe3,0x83,0x97},	{0xe3,0x83,0x95,0xe3,0x82,0x9a}},
-    {{0xe3,0x83,0x99},	{0xe3,0x83,0x98,0xe3,0x82,0x99}},
-    {{0xe3,0x83,0x9a},	{0xe3,0x83,0x98,0xe3,0x82,0x9a}},
-    {{0xe3,0x83,0x9c},	{0xe3,0x83,0x9b,0xe3,0x82,0x99}},
-    {{0xe3,0x83,0x9d},	{0xe3,0x83,0x9b,0xe3,0x82,0x9a}},
-    {{0xe3,0x83,0xb7},	{0xe3,0x83,0xaf,0xe3,0x82,0x99}},
-    {{0xe3,0x83,0xb8},	{0xe3,0x83,0xb0,0xe3,0x82,0x99}},
-    {{0xe3,0x83,0xb9},	{0xe3,0x83,0xb1,0xe3,0x82,0x99}},
-    {{0xe3,0x83,0xba},	{0xe3,0x83,0xb2,0xe3,0x82,0x99}},
-    {{0xe3,0x83,0xbe},	{0xe3,0x83,0xbd,0xe3,0x82,0x99}},
-};
-#endif /* UNICODE_NORMALIZATION */
-#endif /* UTF8_INPUT_ENABLE */
-
-#ifdef SHIFTJIS_CP932
-const unsigned short shiftjis_cp932[3][189] = {
- {
-  0xEEEF, 0xEEF0, 0xEEF1, 0xEEF2, 0xEEF3, 0xEEF4, 0xEEF5, 0xEEF6,
-  0xEEF7, 0xEEF8, 0x8754, 0x8755, 0x8756, 0x8757, 0x8758, 0x8759,
-  0x875A, 0x875B, 0x875C, 0x875D, 0x81CA, 0xEEFA, 0xEEFB, 0xEEFC,
-  0x878A, 0x8782, 0x8784, 0x81E6, 0xED40, 0xED41, 0xED42, 0xED43,
-  0xED44, 0xED45, 0xED46, 0xED47, 0xED48, 0xED49, 0xED4A, 0xED4B,
-  0xED4C, 0xED4D, 0xED4E, 0xED4F, 0xED50, 0xED51, 0xED52, 0xED53,
-  0xED54, 0xED55, 0xED56, 0xED57, 0xED58, 0xED59, 0xED5A, 0xED5B,
-  0xED5C, 0xED5D, 0xED5E, 0xED5F, 0xED60, 0xED61, 0xED62,      0,
-  0xED63, 0xED64, 0xED65, 0xED66, 0xED67, 0xED68, 0xED69, 0xED6A,
-  0xED6B, 0xED6C, 0xED6D, 0xED6E, 0xED6F, 0xED70, 0xED71, 0xED72,
-  0xED73, 0xED74, 0xED75, 0xED76, 0xED77, 0xED78, 0xED79, 0xED7A,
-  0xED7B, 0xED7C, 0xED7D, 0xED7E, 0xED80, 0xED81, 0xED82, 0xED83,
-  0xED84, 0xED85, 0xED86, 0xED87, 0xED88, 0xED89, 0xED8A, 0xED8B,
-  0xED8C, 0xED8D, 0xED8E, 0xED8F, 0xED90, 0xED91, 0xED92, 0xED93,
-  0xED94, 0xED95, 0xED96, 0xED97, 0xED98, 0xED99, 0xED9A, 0xED9B,
-  0xED9C, 0xED9D, 0xED9E, 0xED9F, 0xEDA0, 0xEDA1, 0xEDA2, 0xEDA3,
-  0xEDA4, 0xEDA5, 0xEDA6, 0xEDA7, 0xEDA8, 0xEDA9, 0xEDAA, 0xEDAB,
-  0xEDAC, 0xEDAD, 0xEDAE, 0xEDAF, 0xEDB0, 0xEDB1, 0xEDB2, 0xEDB3,
-  0xEDB4, 0xEDB5, 0xEDB6, 0xEDB7, 0xEDB8, 0xEDB9, 0xEDBA, 0xEDBB,
-  0xEDBC, 0xEDBD, 0xEDBE, 0xEDBF, 0xEDC0, 0xEDC1, 0xEDC2, 0xEDC3,
-  0xEDC4, 0xEDC5, 0xEDC6, 0xEDC7, 0xEDC8, 0xEDC9, 0xEDCA, 0xEDCB,
-  0xEDCC, 0xEDCD, 0xEDCE, 0xEDCF, 0xEDD0, 0xEDD1, 0xEDD2, 0xEDD3,
-  0xEDD4, 0xEDD5, 0xEDD6, 0xEDD7, 0xEDD8, 0xEDD9, 0xEDDA, 0xEDDB,
-  0xEDDC, 0xEDDD, 0xEDDE, 0xEDDF, 0xEDE0,
- },
- {
-  0xEDE1, 0xEDE2, 0xEDE3, 0xEDE4, 0xEDE5, 0xEDE6, 0xEDE7, 0xEDE8,
-  0xEDE9, 0xEDEA, 0xEDEB, 0xEDEC, 0xEDED, 0xEDEE, 0xEDEF, 0xEDF0,
-  0xEDF1, 0xEDF2, 0xEDF3, 0xEDF4, 0xEDF5, 0xEDF6, 0xEDF7, 0xEDF8,
-  0xEDF9, 0xEDFA, 0xEDFB, 0xEDFC, 0xEE40, 0xEE41, 0xEE42, 0xEE43,
-  0xEE44, 0xEE45, 0xEE46, 0xEE47, 0xEE48, 0xEE49, 0xEE4A, 0xEE4B,
-  0xEE4C, 0xEE4D, 0xEE4E, 0xEE4F, 0xEE50, 0xEE51, 0xEE52, 0xEE53,
-  0xEE54, 0xEE55, 0xEE56, 0xEE57, 0xEE58, 0xEE59, 0xEE5A, 0xEE5B,
-  0xEE5C, 0xEE5D, 0xEE5E, 0xEE5F, 0xEE60, 0xEE61, 0xEE62,      0,
-  0xEE63, 0xEE64, 0xEE65, 0xEE66, 0xEE67, 0xEE68, 0xEE69, 0xEE6A,
-  0xEE6B, 0xEE6C, 0xEE6D, 0xEE6E, 0xEE6F, 0xEE70, 0xEE71, 0xEE72,
-  0xEE73, 0xEE74, 0xEE75, 0xEE76, 0xEE77, 0xEE78, 0xEE79, 0xEE7A,
-  0xEE7B, 0xEE7C, 0xEE7D, 0xEE7E, 0xEE80, 0xEE81, 0xEE82, 0xEE83,
-  0xEE84, 0xEE85, 0xEE86, 0xEE87, 0xEE88, 0xEE89, 0xEE8A, 0xEE8B,
-  0xEE8C, 0xEE8D, 0xEE8E, 0xEE8F, 0xEE90, 0xEE91, 0xEE92, 0xEE93,
-  0xEE94, 0xEE95, 0xEE96, 0xEE97, 0xEE98, 0xEE99, 0xEE9A, 0xEE9B,
-  0xEE9C, 0xEE9D, 0xEE9E, 0xEE9F, 0xEEA0, 0xEEA1, 0xEEA2, 0xEEA3,
-  0xEEA4, 0xEEA5, 0xEEA6, 0xEEA7, 0xEEA8, 0xEEA9, 0xEEAA, 0xEEAB,
-  0xEEAC, 0xEEAD, 0xEEAE, 0xEEAF, 0xEEB0, 0xEEB1, 0xEEB2, 0xEEB3,
-  0xEEB4, 0xEEB5, 0xEEB6, 0xEEB7, 0xEEB8, 0xEEB9, 0xEEBA, 0xEEBB,
-  0xEEBC, 0xEEBD, 0xEEBE, 0xEEBF, 0xEEC0, 0xEEC1, 0xEEC2, 0xEEC3,
-  0xEEC4, 0xEEC5, 0xEEC6, 0xEEC7, 0xEEC8, 0xEEC9, 0xEECA, 0xEECB,
-  0xEECC, 0xEECD, 0xEECE, 0xEECF, 0xEED0, 0xEED1, 0xEED2, 0xEED3,
-  0xEED4, 0xEED5, 0xEED6, 0xEED7, 0xEED8, 0xEED9, 0xEEDA, 0xEEDB,
-  0xEEDC, 0xEEDD, 0xEEDE, 0xEEDF, 0xEEE0,
- },
- {
-  0xEEE1, 0xEEE2, 0xEEE3, 0xEEE4, 0xEEE5, 0xEEE6, 0xEEE7, 0xEEE8,
-  0xEEE9, 0xEEEA, 0xEEEB, 0xEEEC,      0,      0,      0,      0,
-       0,      0,      0,      0,      0,      0,      0,      0,
-       0,      0,      0,      0,      0,      0,      0,      0,
-       0,      0,      0,      0,      0,      0,      0,      0,
-       0,      0,      0,      0,      0,      0,      0,      0,
-       0,      0,      0,      0,      0,      0,      0,      0,
-       0,      0,      0,      0,      0,      0,      0,      0,
-       0,      0,      0,      0,      0,      0,      0,      0,
-       0,      0,      0,      0,      0,      0,      0,      0,
-       0,      0,      0,      0,      0,      0,      0,      0,
-       0,      0,      0,      0,      0,      0,      0,      0,
-       0,      0,      0,      0,      0,      0,      0,      0,
-       0,      0,      0,      0,      0,      0,      0,      0,
-       0,      0,      0,      0,      0,      0,      0,      0,
-       0,      0,      0,      0,      0,      0,      0,      0,
-       0,      0,      0,      0,      0,      0,      0,      0,
-       0,      0,      0,      0,      0,      0,      0,      0,
-       0,      0,      0,      0,      0,      0,      0,      0,
-       0,      0,      0,      0,      0,      0,      0,      0,
-       0,      0,      0,      0,      0,      0,      0,      0,
-       0,      0,      0,      0,      0,      0,      0,      0,
-       0,      0,      0,      0,      0,      0,      0,      0,
-       0,      0,      0,      0,      0,
- },
-};
-const unsigned short cp932inv[2][189] = {
- {
-  0xFA5C, 0xFA5D, 0xFA5E, 0xFA5F, 0xFA60, 0xFA61, 0xFA62, 0xFA63,
-  0xFA64, 0xFA65, 0xFA66, 0xFA67, 0xFA68, 0xFA69, 0xFA6A, 0xFA6B,
-  0xFA6C, 0xFA6D, 0xFA6E, 0xFA6F, 0xFA70, 0xFA71, 0xFA72, 0xFA73,
-  0xFA74, 0xFA75, 0xFA76, 0xFA77, 0xFA78, 0xFA79, 0xFA7A, 0xFA7B,
-  0xFA7C, 0xFA7D, 0xFA7E, 0xFA80, 0xFA81, 0xFA82, 0xFA83, 0xFA84,
-  0xFA85, 0xFA86, 0xFA87, 0xFA88, 0xFA89, 0xFA8A, 0xFA8B, 0xFA8C,
-  0xFA8D, 0xFA8E, 0xFA8F, 0xFA90, 0xFA91, 0xFA92, 0xFA93, 0xFA94,
-  0xFA95, 0xFA96, 0xFA97, 0xFA98, 0xFA99, 0xFA9A, 0xFA9B,      0,
-  0xFA9C, 0xFA9D, 0xFA9E, 0xFA9F, 0xFAA0, 0xFAA1, 0xFAA2, 0xFAA3,
-  0xFAA4, 0xFAA5, 0xFAA6, 0xFAA7, 0xFAA8, 0xFAA9, 0xFAAA, 0xFAAB,
-  0xFAAC, 0xFAAD, 0xFAAE, 0xFAAF, 0xFAB0, 0xFAB1, 0xFAB2, 0xFAB3,
-  0xFAB4, 0xFAB5, 0xFAB6, 0xFAB7, 0xFAB8, 0xFAB9, 0xFABA, 0xFABB,
-  0xFABC, 0xFABD, 0xFABE, 0xFABF, 0xFAC0, 0xFAC1, 0xFAC2, 0xFAC3,
-  0xFAC4, 0xFAC5, 0xFAC6, 0xFAC7, 0xFAC8, 0xFAC9, 0xFACA, 0xFACB,
-  0xFACC, 0xFACD, 0xFACE, 0xFACF, 0xFAD0, 0xFAD1, 0xFAD2, 0xFAD3,
-  0xFAD4, 0xFAD5, 0xFAD6, 0xFAD7, 0xFAD8, 0xFAD9, 0xFADA, 0xFADB,
-  0xFADC, 0xFADD, 0xFADE, 0xFADF, 0xFAE0, 0xFAE1, 0xFAE2, 0xFAE3,
-  0xFAE4, 0xFAE5, 0xFAE6, 0xFAE7, 0xFAE8, 0xFAE9, 0xFAEA, 0xFAEB,
-  0xFAEC, 0xFAED, 0xFAEE, 0xFAEF, 0xFAF0, 0xFAF1, 0xFAF2, 0xFAF3,
-  0xFAF4, 0xFAF5, 0xFAF6, 0xFAF7, 0xFAF8, 0xFAF9, 0xFAFA, 0xFAFB,
-  0xFAFC, 0xFB40, 0xFB41, 0xFB42, 0xFB43, 0xFB44, 0xFB45, 0xFB46,
-  0xFB47, 0xFB48, 0xFB49, 0xFB4A, 0xFB4B, 0xFB4C, 0xFB4D, 0xFB4E,
-  0xFB4F, 0xFB50, 0xFB51, 0xFB52, 0xFB53, 0xFB54, 0xFB55, 0xFB56,
-  0xFB57, 0xFB58, 0xFB59, 0xFB5A, 0xFB5B,
- },
- {
-  0xFB5C, 0xFB5D, 0xFB5E, 0xFB5F, 0xFB60, 0xFB61, 0xFB62, 0xFB63,
-  0xFB64, 0xFB65, 0xFB66, 0xFB67, 0xFB68, 0xFB69, 0xFB6A, 0xFB6B,
-  0xFB6C, 0xFB6D, 0xFB6E, 0xFB6F, 0xFB70, 0xFB71, 0xFB72, 0xFB73,
-  0xFB74, 0xFB75, 0xFB76, 0xFB77, 0xFB78, 0xFB79, 0xFB7A, 0xFB7B,
-  0xFB7C, 0xFB7D, 0xFB7E, 0xFB80, 0xFB81, 0xFB82, 0xFB83, 0xFB84,
-  0xFB85, 0xFB86, 0xFB87, 0xFB88, 0xFB89, 0xFB8A, 0xFB8B, 0xFB8C,
-  0xFB8D, 0xFB8E, 0xFB8F, 0xFB90, 0xFB91, 0xFB92, 0xFB93, 0xFB94,
-  0xFB95, 0xFB96, 0xFB97, 0xFB98, 0xFB99, 0xFB9A, 0xFB9B,      0,
-  0xFB9C, 0xFB9D, 0xFB9E, 0xFB9F, 0xFBA0, 0xFBA1, 0xFBA2, 0xFBA3,
-  0xFBA4, 0xFBA5, 0xFBA6, 0xFBA7, 0xFBA8, 0xFBA9, 0xFBAA, 0xFBAB,
-  0xFBAC, 0xFBAD, 0xFBAE, 0xFBAF, 0xFBB0, 0xFBB1, 0xFBB2, 0xFBB3,
-  0xFBB4, 0xFBB5, 0xFBB6, 0xFBB7, 0xFBB8, 0xFBB9, 0xFBBA, 0xFBBB,
-  0xFBBC, 0xFBBD, 0xFBBE, 0xFBBF, 0xFBC0, 0xFBC1, 0xFBC2, 0xFBC3,
-  0xFBC4, 0xFBC5, 0xFBC6, 0xFBC7, 0xFBC8, 0xFBC9, 0xFBCA, 0xFBCB,
-  0xFBCC, 0xFBCD, 0xFBCE, 0xFBCF, 0xFBD0, 0xFBD1, 0xFBD2, 0xFBD3,
-  0xFBD4, 0xFBD5, 0xFBD6, 0xFBD7, 0xFBD8, 0xFBD9, 0xFBDA, 0xFBDB,
-  0xFBDC, 0xFBDD, 0xFBDE, 0xFBDF, 0xFBE0, 0xFBE1, 0xFBE2, 0xFBE3,
-  0xFBE4, 0xFBE5, 0xFBE6, 0xFBE7, 0xFBE8, 0xFBE9, 0xFBEA, 0xFBEB,
-  0xFBEC, 0xFBED, 0xFBEE, 0xFBEF, 0xFBF0, 0xFBF1, 0xFBF2, 0xFBF3,
-  0xFBF4, 0xFBF5, 0xFBF6, 0xFBF7, 0xFBF8, 0xFBF9, 0xFBFA, 0xFBFB,
-  0xFBFC, 0xFC40, 0xFC41, 0xFC42, 0xFC43, 0xFC44, 0xFC45, 0xFC46,
-  0xFC47, 0xFC48, 0xFC49, 0xFC4A, 0xFC4B,      0,      0, 0xFA40,
-  0xFA41, 0xFA42, 0xFA43, 0xFA44, 0xFA45, 0xFA46, 0xFA47, 0xFA48,
-  0xFA49, 0x81CA, 0xFA55, 0xFA56, 0xFA57,
- },
-};
-#endif /* SHIFTJIS_CP932 */
-
-#ifdef X0212_ENABLE
-const unsigned short shiftjis_x0212[3][189] = {
- {
-  0xF373, 0xF374, 0xF375, 0xF376, 0xF377, 0xF378, 0xF379, 0xF37A,
-  0xF37B, 0xF37C, 0xF37D, 0xF37E, 0xF421, 0xF422, 0xF423, 0xF424,
-  0xF425, 0xF426, 0xF427, 0xF428, 0x224C, 0xA243, 0xF429, 0xF42A,
-  0xF42B, 0xF42C, 0xF42D, 0x2268, 0xD463, 0xDC5F, 0xE469, 0xE378,
-  0xD921, 0xB13B, 0xF42E, 0xC22D, 0xC37C, 0xE450, 0xC23F, 0xBC74,
-  0xB029, 0xB048, 0xF42F, 0xB052, 0xB054, 0xB063, 0xB06E, 0xB127,
-  0xB123, 0xB12C, 0xB129, 0xB13E, 0xB15F, 0xB158, 0xB148, 0xB157,
-  0xB163, 0xB174, 0xB161, 0xB223, 0xF430, 0xB23B, 0xB266,      0,
-  0xB26D, 0xB275, 0xB27C, 0xF431, 0xB335, 0xB358, 0xB35B, 0xB365,
-  0xB36E, 0xB37B, 0xF432, 0xF433, 0xB440, 0xB447, 0xB450, 0xB45E,
-  0xF434, 0xB52A, 0xF435, 0xB52F, 0xB544, 0xB568, 0xF436, 0xB742,
-  0xB764, 0xB768, 0xB767, 0xF437, 0xF438, 0xF439, 0xB84E, 0xB861,
-  0xB875, 0xB877, 0xB878, 0xB87C, 0xB92F, 0xB937, 0xBA3E, 0xBA5B,
-  0xCD2A, 0xBA61, 0xF43A, 0xBA6B, 0xBB33, 0xBB38, 0xF43B, 0xBB4A,
-  0xF43C, 0xF43D, 0xBB50, 0xBB5E, 0xBB74, 0xBB75, 0xBB79, 0xBC64,
-  0xBC6D, 0xBC7E, 0xF43E, 0xBD42, 0xBD67, 0xF43F, 0xBD70, 0xBE30,
-  0xBE2C, 0xF440, 0xBE33, 0xBE3D, 0xBE4D, 0xBE49, 0xBE64, 0xBF28,
-  0xBF49, 0xC044, 0xC064, 0xC074, 0xC126, 0xF441, 0xC175, 0xC17C,
-  0xF442, 0xC178, 0xC22B, 0xC221, 0xC225, 0xF443, 0xC238, 0xC23A,
-  0xF444, 0xC244, 0xC252, 0xC257, 0xC25B, 0xC25E, 0xC26D, 0xC270,
-  0xF445, 0xC321, 0xC335, 0xC349, 0xC339, 0xF446, 0xC358, 0xC37E,
-  0xF447, 0xC44C, 0xF448, 0xC459, 0xC46A, 0xC47D, 0xF449, 0xC527,
-  0xC535, 0xC536, 0xF44A, 0xC555, 0xC638, 0xC657, 0xC660, 0xC66A,
-  0xC663, 0xC721, 0xC72B, 0xC747, 0xC743,
- },
- {
-  0xC74B, 0xC74F, 0xC759, 0xF44B, 0xF44C, 0xC766, 0xC76E, 0xC77C,
-  0xC76B, 0xC770, 0xC831, 0xC865, 0xC878, 0xC926, 0xC92B, 0xC92D,
-  0xF44D, 0xC94A, 0xC953, 0xC969, 0xC963, 0xC97C, 0xC974, 0xC975,
-  0xF44E, 0xCA33, 0xCA3D, 0xCA6F, 0xCA71, 0xCB2E, 0xF44F, 0xCB4A,
-  0xCB66, 0xCB6A, 0xCB70, 0xCB74, 0xCB6E, 0xCC25, 0xCB79, 0xCC2B,
-  0xCC2E, 0xCC2D, 0xCC32, 0xCC42, 0xCC50, 0xCC59, 0xF450, 0xCD3B,
-  0xF451, 0xCE3B, 0xF452, 0xCE3A, 0xCE43, 0xF453, 0xCE72, 0xB35D,
-  0xCF55, 0xCF62, 0xCF69, 0xCF6D, 0xF454, 0xF455, 0xF456,      0,
-  0xF457, 0xD065, 0xF458, 0xD069, 0xD168, 0xF459, 0xF45A, 0xD16C,
-  0xD23B, 0xF45B, 0xD361, 0xD368, 0xD427, 0xF45C, 0xF45D, 0xD454,
-  0xD472, 0xD52E, 0xF45E, 0xD75E, 0xF45F, 0xD822, 0xD837, 0xD841,
-  0xD851, 0xD874, 0xD946, 0xD948, 0xD951, 0xF460, 0xF461, 0xF462,
-  0xF463, 0xF464, 0xDC53, 0xDD48, 0xDD54, 0xDD6A, 0xDD7A, 0xDE24,
-  0xDE30, 0xF465, 0xDE35, 0xDE4B, 0xF466, 0xDF39, 0xF467, 0xDF43,
-  0xF468, 0xF469, 0xE059, 0xF46A, 0xF46B, 0xE162, 0xF46C, 0xF46D,
-  0xF46E, 0xE247, 0xE328, 0xE326, 0xE329, 0xE32F, 0xE330, 0xE32A,
-  0xE32B, 0xE33C, 0xE341, 0xE33F, 0xE355, 0xE358, 0xE356, 0xE35F,
-  0xE363, 0xE361, 0xE354, 0xE369, 0xE426, 0xE371, 0xE372, 0xE44B,
-  0xE441, 0xE443, 0xE43E, 0xF46F, 0xE440, 0xE447, 0xE43F, 0xE460,
-  0xE45E, 0xE451, 0xF470, 0xE45C, 0xE452, 0xE45B, 0xE454, 0xE47A,
-  0xE46F, 0xE533, 0xE53F, 0xE549, 0xE550, 0xE562, 0xE56A, 0xE56B,
-  0xF471, 0xF472, 0xF473, 0xE668, 0xE66F, 0xE72C, 0xF474, 0xE72E,
-  0xF475, 0xE731, 0xF476, 0xE732, 0xE831, 0xE836, 0xF477, 0xF478,
-  0xE85D, 0xF479, 0xF47A, 0xE951, 0xF47B,
- },
- {
-  0xE96D, 0xEA4D, 0xF47C, 0xEA5B, 0xEA66, 0xEA6A, 0xEB25, 0xEB7B,
-  0xEB7A, 0xF47D, 0xEC56, 0xF47E,      0,      0,      0,      0,
-       0,      0,      0,      0,      0,      0,      0,      0,
-       0,      0,      0,      0,      0,      0,      0,      0,
-       0,      0,      0,      0,      0,      0,      0,      0,
-       0,      0,      0,      0,      0,      0,      0,      0,
-       0,      0,      0,      0,      0,      0,      0,      0,
-       0,      0,      0,      0,      0,      0,      0,      0,
-       0,      0,      0,      0,      0,      0,      0,      0,
-       0,      0,      0,      0,      0,      0,      0,      0,
-       0,      0,      0,      0,      0,      0,      0,      0,
-       0,      0,      0,      0,      0,      0,      0,      0,
-       0,      0,      0,      0,      0,      0,      0,      0,
-       0,      0,      0,      0,      0,      0,      0,      0,
-       0,      0,      0,      0,      0,      0,      0,      0,
-       0,      0,      0,      0,      0,      0,      0,      0,
-       0,      0,      0,      0,      0,      0,      0,      0,
-       0,      0,      0,      0,      0,      0,      0,      0,
-       0,      0,      0,      0,      0,      0,      0,      0,
-       0,      0,      0,      0,      0,      0,      0,      0,
-       0,      0,      0,      0,      0,      0,      0,      0,
-       0,      0,      0,      0,      0,      0,      0,      0,
-       0,      0,      0,      0,      0,      0,      0,      0,
-       0,      0,      0,      0,      0,
- },
-};
-
-static const unsigned short x0212_shiftjis_A2[] = {
-         0x819F,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0, 0x8143,      0,      0, 0x8150,      0,      0, 0x8160,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0, 0xFA55,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,
-};
-static const unsigned short x0212_shiftjis_B0[] = {
-              0,      0,      0,      0,      0,      0,      0,
-      0, 0xFA68,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
- 0xFA69,      0,      0,      0,      0,      0,      0,      0,
-      0,      0, 0xFA6B,      0, 0xFA6C,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0, 0xFA6D,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0, 0xFA6E,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,
-};
-static const unsigned short x0212_shiftjis_B1[] = {
-              0,      0, 0xFA70,      0,      0,      0, 0xFA6F,
-      0, 0xFA72,      0,      0, 0xFA71,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0, 0xFA61,      0,      0, 0xFA73,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
- 0xFA76,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0, 0xFA77,
- 0xFA75,      0,      0,      0,      0,      0,      0, 0xFA74,
-      0, 0xFA7A,      0, 0xFA78,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0, 0xFA79,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,
-};
-static const unsigned short x0212_shiftjis_B2[] = {
-              0,      0, 0xFA7B,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0, 0xFA7D,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0, 0xFA7E,      0,
-      0,      0,      0,      0,      0, 0xFA80,      0,      0,
-      0,      0,      0,      0,      0, 0xFA81,      0,      0,
-      0,      0,      0,      0, 0xFA82,      0,      0,
-};
-static const unsigned short x0212_shiftjis_B3[] = {
-              0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0, 0xFA84,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
- 0xFA85,      0,      0, 0xFA86,      0, 0xFB77,      0,      0,
-      0,      0,      0,      0,      0, 0xFA87,      0,      0,
-      0,      0,      0,      0,      0,      0, 0xFA88,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0, 0xFA89,      0,      0,      0,
-};
-static const unsigned short x0212_shiftjis_B4[] = {
-              0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
- 0xFA8C,      0,      0,      0,      0,      0,      0, 0xFA8D,
-      0,      0,      0,      0,      0,      0,      0,      0,
- 0xFA8E,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0, 0xFA8F,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,
-};
-static const unsigned short x0212_shiftjis_B5[] = {
-              0,      0,      0,      0,      0,      0,      0,
-      0,      0, 0xFA91,      0,      0,      0,      0, 0xFA93,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0, 0xFA94,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
- 0xFA95,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,
-};
-static const unsigned short x0212_shiftjis_B7[] = {
-              0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0, 0xFA97,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0, 0xFA98,      0,      0, 0xFA9A,
- 0xFA99,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,
-};
-static const unsigned short x0212_shiftjis_B8[] = {
-              0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0, 0xFA9E,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0, 0xFA9F,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0, 0xFAA0,      0, 0xFAA1,
- 0xFAA2,      0,      0,      0, 0xFAA3,      0,      0,
-};
-static const unsigned short x0212_shiftjis_B9[] = {
-              0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0, 0xFAA4,
-      0,      0,      0,      0,      0,      0,      0, 0xFAA5,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,
-};
-static const unsigned short x0212_shiftjis_BA[] = {
-              0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0, 0xFAA6,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0, 0xFAA7,      0,      0,      0,      0,
-      0, 0xFAA9,      0,      0,      0,      0,      0,      0,
-      0,      0,      0, 0xFAAB,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,
-};
-static const unsigned short x0212_shiftjis_BB[] = {
-              0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0, 0xFAAC,      0,      0,      0,      0,
- 0xFAAD,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0, 0xFAAF,      0,      0,      0,      0,      0,
- 0xFAB2,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0, 0xFAB3,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0, 0xFAB4, 0xFAB5,      0,      0,
-      0, 0xFAB6,      0,      0,      0,      0,      0,
-};
-static const unsigned short x0212_shiftjis_BC[] = {
-              0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0, 0xFAB7,      0,      0,      0,
-      0,      0,      0,      0,      0, 0xFAB8,      0,      0,
-      0,      0,      0,      0, 0xFA67,      0,      0,      0,
-      0,      0,      0,      0,      0,      0, 0xFAB9,
-};
-static const unsigned short x0212_shiftjis_BD[] = {
-              0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0, 0xFABB,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0, 0xFABC,
-      0,      0,      0,      0,      0,      0,      0,      0,
- 0xFABE,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,
-};
-static const unsigned short x0212_shiftjis_BE[] = {
-              0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0, 0xFAC0,      0,      0,      0,
- 0xFABF,      0,      0, 0xFAC2,      0,      0,      0,      0,
-      0,      0,      0,      0,      0, 0xFAC3,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0, 0xFAC5,      0,      0,      0, 0xFAC4,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0, 0xFAC6,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,
-};
-static const unsigned short x0212_shiftjis_BF[] = {
-              0,      0,      0,      0,      0,      0,      0,
- 0xFAC7,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0, 0xFAC8,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,
-};
-static const unsigned short x0212_shiftjis_C0[] = {
-              0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0, 0xFAC9,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0, 0xFACA,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0, 0xFACB,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,
-};
-static const unsigned short x0212_shiftjis_C1[] = {
-              0,      0,      0,      0,      0, 0xFACC,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0, 0xFACE,      0,      0,
- 0xFAD1,      0,      0,      0, 0xFACF,      0,      0,
-};
-static const unsigned short x0212_shiftjis_C2[] = {
-         0xFAD3,      0,      0,      0, 0xFAD4,      0,      0,
-      0,      0,      0, 0xFAD2,      0, 0xFA63,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
- 0xFAD6,      0, 0xFAD7,      0,      0,      0,      0, 0xFA66,
-      0,      0,      0,      0, 0xFAD9,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0, 0xFADA,      0,      0,      0,      0, 0xFADB,
-      0,      0,      0, 0xFADC,      0,      0, 0xFADD,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0, 0xFADE,      0,      0,
- 0xFADF,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,
-};
-static const unsigned short x0212_shiftjis_C3[] = {
-         0xFAE1,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0, 0xFAE2,      0,      0,
-      0, 0xFAE4,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0, 0xFAE3,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
- 0xFAE6,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0, 0xFA64,      0, 0xFAE7,
-};
-static const unsigned short x0212_shiftjis_C4[] = {
-              0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0, 0xFAE9,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0, 0xFAEB,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0, 0xFAEC,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0, 0xFAED,      0,
-};
-static const unsigned short x0212_shiftjis_C5[] = {
-              0,      0,      0,      0,      0,      0, 0xFAEF,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0, 0xFAF0, 0xFAF1,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0, 0xFAF3,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,
-};
-static const unsigned short x0212_shiftjis_C6[] = {
-              0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
- 0xFAF4,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0, 0xFAF5,
-      0,      0,      0,      0,      0,      0,      0,      0,
- 0xFAF6,      0,      0, 0xFAF8,      0,      0,      0,      0,
-      0,      0, 0xFAF7,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,
-};
-static const unsigned short x0212_shiftjis_C7[] = {
-         0xFAF9,      0,      0,      0,      0,      0,      0,
-      0,      0,      0, 0xFAFA,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0, 0xFAFC,      0,      0,      0, 0xFAFB,
-      0,      0,      0, 0xFB40,      0,      0,      0, 0xFB41,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0, 0xFB42,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0, 0xFB45,      0,
-      0,      0,      0, 0xFB48,      0,      0, 0xFB46,      0,
- 0xFB49,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0, 0xFB47,      0,      0,
-};
-static const unsigned short x0212_shiftjis_C8[] = {
-              0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0, 0xFB4A,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0, 0xFB4B,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
- 0xFB4C,      0,      0,      0,      0,      0,      0,
-};
-static const unsigned short x0212_shiftjis_C9[] = {
-              0,      0,      0,      0,      0, 0xFB4D,      0,
-      0,      0,      0, 0xFB4E,      0, 0xFB4F,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0, 0xFB51,      0,      0,      0,      0,      0,
-      0,      0,      0, 0xFB52,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0, 0xFB54,      0,      0,      0,      0,
-      0, 0xFB53,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0, 0xFB56, 0xFB57,      0,      0,
-      0,      0,      0,      0, 0xFB55,      0,      0,
-};
-static const unsigned short x0212_shiftjis_CA[] = {
-              0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0, 0xFB59,      0,      0,      0,      0,
-      0,      0,      0,      0,      0, 0xFB5A,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0, 0xFB5B,
-      0, 0xFB5C,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,
-};
-static const unsigned short x0212_shiftjis_CB[] = {
-              0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0, 0xFB5D,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0, 0xFB5F,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0, 0xFB60,      0,
-      0,      0, 0xFB61,      0,      0,      0, 0xFB64,      0,
- 0xFB62,      0,      0,      0, 0xFB63,      0,      0,      0,
-      0, 0xFB66,      0,      0,      0,      0,      0,
-};
-static const unsigned short x0212_shiftjis_CC[] = {
-              0,      0,      0,      0, 0xFB65,      0,      0,
-      0,      0,      0, 0xFB67,      0, 0xFB69, 0xFB68,      0,
-      0,      0, 0xFB6A,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0, 0xFB6B,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
- 0xFB6C,      0,      0,      0,      0,      0,      0,      0,
-      0, 0xFB6D,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,
-};
-static const unsigned short x0212_shiftjis_CD[] = {
-              0,      0,      0,      0,      0,      0,      0,
-      0,      0, 0xFAA8,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0, 0xFB6F,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,
-};
-static const unsigned short x0212_shiftjis_CE[] = {
-              0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0, 0xFB73, 0xFB71,      0,      0,      0,      0,
-      0,      0,      0, 0xFB74,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0, 0xFB76,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,
-};
-static const unsigned short x0212_shiftjis_CF[] = {
-              0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0, 0xFB78,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0, 0xFB79,      0,      0,      0,      0,      0,
-      0, 0xFB7A,      0,      0,      0, 0xFB7B,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,
-};
-static const unsigned short x0212_shiftjis_D0[] = {
-              0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0, 0xFB81,      0,      0,
-      0, 0xFB83,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,
-};
-static const unsigned short x0212_shiftjis_D1[] = {
-              0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
- 0xFB84,      0,      0,      0, 0xFB87,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,
-};
-static const unsigned short x0212_shiftjis_D2[] = {
-              0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0, 0xFB88,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,
-};
-static const unsigned short x0212_shiftjis_D3[] = {
-              0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0, 0xFB8A,      0,      0,      0,      0,      0,      0,
- 0xFB8B,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,
-};
-static const unsigned short x0212_shiftjis_D4[] = {
-              0,      0,      0,      0,      0,      0, 0xFB8C,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0, 0xFB8F,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0, 0xFA5C,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0, 0xFB90,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,
-};
-static const unsigned short x0212_shiftjis_D5[] = {
-              0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0, 0xFB91,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,
-};
-static const unsigned short x0212_shiftjis_D7[] = {
-              0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0, 0xFB93,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,
-};
-static const unsigned short x0212_shiftjis_D8[] = {
-              0, 0xFB95,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0, 0xFB96,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0, 0xFB97,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0, 0xFB98,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0, 0xFB99,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,
-};
-static const unsigned short x0212_shiftjis_D9[] = {
-         0xFA60,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0, 0xFB9A,      0,
- 0xFB9B,      0,      0,      0,      0,      0,      0,      0,
-      0, 0xFB9C,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,
-};
-static const unsigned short x0212_shiftjis_DC[] = {
-              0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0, 0xFBA2,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0, 0xFA5D,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,
-};
-static const unsigned short x0212_shiftjis_DD[] = {
-              0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
- 0xFBA3,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0, 0xFBA4,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0, 0xFBA5,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0, 0xFBA6,      0,      0,      0,      0,
-};
-static const unsigned short x0212_shiftjis_DE[] = {
-              0,      0,      0, 0xFBA7,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
- 0xFBA8,      0,      0,      0,      0, 0xFBAA,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0, 0xFBAB,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,
-};
-static const unsigned short x0212_shiftjis_DF[] = {
-              0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0, 0xFBAD,      0,      0,      0,      0,      0,      0,
-      0,      0,      0, 0xFBAF,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,
-};
-static const unsigned short x0212_shiftjis_E0[] = {
-              0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0, 0xFBB2,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,
-};
-static const unsigned short x0212_shiftjis_E1[] = {
-              0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0, 0xFBB5,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,
-};
-static const unsigned short x0212_shiftjis_E2[] = {
-              0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0, 0xFBB9,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,
-};
-static const unsigned short x0212_shiftjis_E3[] = {
-              0,      0,      0,      0,      0, 0xFBBB,      0,
- 0xFBBA, 0xFBBC, 0xFBBF, 0xFBC0,      0,      0,      0, 0xFBBD,
- 0xFBBE,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0, 0xFBC1,      0,      0, 0xFBC3,
-      0, 0xFBC2,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0, 0xFBCA, 0xFBC4, 0xFBC6,      0,
- 0xFBC5,      0,      0,      0,      0,      0,      0, 0xFBC7,
-      0, 0xFBC9,      0, 0xFBC8,      0,      0,      0,      0,
-      0, 0xFBCB,      0,      0,      0,      0,      0,      0,
-      0, 0xFBCD, 0xFBCE,      0,      0,      0,      0,      0,
- 0xFA5F,      0,      0,      0,      0,      0,      0,
-};
-static const unsigned short x0212_shiftjis_E4[] = {
-              0,      0,      0,      0,      0, 0xFBCC,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0, 0xFBD2, 0xFBD6,
- 0xFBD4, 0xFBD0,      0, 0xFBD1,      0,      0,      0, 0xFBD5,
-      0,      0,      0, 0xFBCF,      0,      0,      0,      0,
- 0xFA65, 0xFBD9, 0xFBDC,      0, 0xFBDE,      0,      0,      0,
-      0,      0,      0, 0xFBDD, 0xFBDB,      0, 0xFBD8,      0,
- 0xFBD7,      0,      0,      0,      0,      0,      0,      0,
-      0, 0xFA5E,      0,      0,      0,      0,      0, 0xFBE0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0, 0xFBDF,      0,      0,      0,      0,
-};
-static const unsigned short x0212_shiftjis_E5[] = {
-              0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0, 0xFBE1,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0, 0xFBE2,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0, 0xFBE3,      0,      0,      0,      0,      0,      0,
- 0xFBE4,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0, 0xFBE5,      0,      0,      0,      0,      0,
-      0,      0, 0xFBE6, 0xFBE7,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,
-};
-static const unsigned short x0212_shiftjis_E6[] = {
-              0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
- 0xFBEB,      0,      0,      0,      0,      0,      0, 0xFBEC,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,
-};
-static const unsigned short x0212_shiftjis_E7[] = {
-              0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0, 0xFBED,      0, 0xFBEF,      0,
-      0, 0xFBF1, 0xFBF3,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,
-};
-static const unsigned short x0212_shiftjis_E8[] = {
-              0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0, 0xFBF4,      0,      0,      0,      0, 0xFBF5,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0, 0xFBF8,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,
-};
-static const unsigned short x0212_shiftjis_E9[] = {
-              0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0, 0xFBFB,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0, 0xFC40,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,
-};
-static const unsigned short x0212_shiftjis_EA[] = {
-              0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0, 0xFC41,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0, 0xFC43,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0, 0xFC44,      0,
-      0,      0, 0xFC45,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,
-};
-static const unsigned short x0212_shiftjis_EB[] = {
-              0,      0,      0,      0, 0xFC46,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0, 0xFC48, 0xFC47,      0,      0,      0,
-};
-static const unsigned short x0212_shiftjis_EC[] = {
-              0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0, 0xFC4A,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,
-};
-static const unsigned short x0212_shiftjis_F3[] = {
-              0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0, 0xFA40, 0xFA41, 0xFA42, 0xFA43, 0xFA44,
- 0xFA45, 0xFA46, 0xFA47, 0xFA48, 0xFA49, 0xFA4A, 0xFA4B,
-};
-static const unsigned short x0212_shiftjis_F4[] = {
-         0xFA4C, 0xFA4D, 0xFA4E, 0xFA4F, 0xFA50, 0xFA51, 0xFA52,
- 0xFA53, 0xFA56, 0xFA57, 0xFA58, 0xFA59, 0xFA5A, 0xFA62, 0xFA6A,
- 0xFA7C, 0xFA83, 0xFA8A, 0xFA8B, 0xFA90, 0xFA92, 0xFA96, 0xFA9B,
- 0xFA9C, 0xFA9D, 0xFAAA, 0xFAAE, 0xFAB0, 0xFAB1, 0xFABA, 0xFABD,
- 0xFAC1, 0xFACD, 0xFAD0, 0xFAD5, 0xFAD8, 0xFAE0, 0xFAE5, 0xFAE8,
- 0xFAEA, 0xFAEE, 0xFAF2, 0xFB43, 0xFB44, 0xFB50, 0xFB58, 0xFB5E,
- 0xFB6E, 0xFB70, 0xFB72, 0xFB75, 0xFB7C, 0xFB7D, 0xFB7E, 0xFB80,
- 0xFB82, 0xFB85, 0xFB86, 0xFB89, 0xFB8D, 0xFB8E, 0xFB92, 0xFB94,
- 0xFB9D, 0xFB9E, 0xFB9F, 0xFBA0, 0xFBA1, 0xFBA9, 0xFBAC, 0xFBAE,
- 0xFBB0, 0xFBB1, 0xFBB3, 0xFBB4, 0xFBB6, 0xFBB7, 0xFBB8, 0xFBD3,
- 0xFBDA, 0xFBE8, 0xFBE9, 0xFBEA, 0xFBEE, 0xFBF0, 0xFBF2, 0xFBF6,
- 0xFBF7, 0xFBF9, 0xFBFA, 0xFBFC, 0xFC42, 0xFC49, 0xFC4B,
-};
-const unsigned short *const x0212_shiftjis[] = {
-                                    0, x0212_shiftjis_A2,                 0,
-                 0,                 0,                 0,                 0,
-                 0,                 0,                 0,                 0,
-                 0,                 0,                 0,                 0,
- x0212_shiftjis_B0, x0212_shiftjis_B1, x0212_shiftjis_B2, x0212_shiftjis_B3,
- x0212_shiftjis_B4, x0212_shiftjis_B5,                 0, x0212_shiftjis_B7,
- x0212_shiftjis_B8, x0212_shiftjis_B9, x0212_shiftjis_BA, x0212_shiftjis_BB,
- x0212_shiftjis_BC, x0212_shiftjis_BD, x0212_shiftjis_BE, x0212_shiftjis_BF,
- x0212_shiftjis_C0, x0212_shiftjis_C1, x0212_shiftjis_C2, x0212_shiftjis_C3,
- x0212_shiftjis_C4, x0212_shiftjis_C5, x0212_shiftjis_C6, x0212_shiftjis_C7,
- x0212_shiftjis_C8, x0212_shiftjis_C9, x0212_shiftjis_CA, x0212_shiftjis_CB,
- x0212_shiftjis_CC, x0212_shiftjis_CD, x0212_shiftjis_CE, x0212_shiftjis_CF,
- x0212_shiftjis_D0, x0212_shiftjis_D1, x0212_shiftjis_D2, x0212_shiftjis_D3,
- x0212_shiftjis_D4, x0212_shiftjis_D5,                 0, x0212_shiftjis_D7,
- x0212_shiftjis_D8, x0212_shiftjis_D9,                 0,                 0,
- x0212_shiftjis_DC, x0212_shiftjis_DD, x0212_shiftjis_DE, x0212_shiftjis_DF,
- x0212_shiftjis_E0, x0212_shiftjis_E1, x0212_shiftjis_E2, x0212_shiftjis_E3,
- x0212_shiftjis_E4, x0212_shiftjis_E5, x0212_shiftjis_E6, x0212_shiftjis_E7,
- x0212_shiftjis_E8, x0212_shiftjis_E9, x0212_shiftjis_EA, x0212_shiftjis_EB,
- x0212_shiftjis_EC,                 0,                 0,                 0,
-                 0,                 0,                 0, x0212_shiftjis_F3,
- x0212_shiftjis_F4,                 0,                 0,                 0,
-                 0,                 0,                 0,                 0,
-                 0,                 0,                 0,
-};
-#endif /* X0212_ENABLE */
diff --git a/ext/nkf/nkf-utf8/utf8tbl.h b/ext/nkf/nkf-utf8/utf8tbl.h
deleted file mode 100644
index 54a34271ddc02c..00000000000000
--- a/ext/nkf/nkf-utf8/utf8tbl.h
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * utf8tbl.h - Header file for Conversion Table
- *
- */
-
-#ifndef _UTF8TBL_H_
-#define _UTF8TBL_H_
-
-#ifdef UTF8_OUTPUT_ENABLE
-#define sizeof_euc_to_utf8_1byte 94
-#define sizeof_euc_to_utf8_2bytes 94
-extern const unsigned short euc_to_utf8_1byte[];
-extern const unsigned short *const euc_to_utf8_2bytes[];
-extern const unsigned short *const euc_to_utf8_2bytes_ms[];
-extern const unsigned short *const euc_to_utf8_2bytes_mac[];
-extern const unsigned short *const euc_to_utf8_2bytes_x0213[];
-extern const unsigned short *const x0212_to_utf8_2bytes[];
-extern const unsigned short *const x0212_to_utf8_2bytes_x0213[];
-#define sizeof_x0213_combining_chars 5
-#define sizeof_x0213_combining_table 25
-#define sizeof_x0213_1_surrogate_table 26
-#define sizeof_x0213_2_surrogate_table 277
-extern const unsigned short x0213_combining_chars[sizeof_x0213_combining_chars];
-extern const unsigned short x0213_combining_table[sizeof_x0213_combining_table][3];
-extern const unsigned short x0213_1_surrogate_table[sizeof_x0213_1_surrogate_table][3];
-extern const unsigned short x0213_2_surrogate_table[sizeof_x0213_2_surrogate_table][3];
-#endif /* UTF8_OUTPUT_ENABLE */
-
-#ifdef UTF8_INPUT_ENABLE
-#define sizeof_utf8_to_euc_C2 64
-#define sizeof_utf8_to_euc_E5B8 64
-#define sizeof_utf8_to_euc_2bytes 112
-#define sizeof_utf8_to_euc_3bytes 16
-extern const unsigned short *const utf8_to_euc_2bytes[];
-extern const unsigned short *const utf8_to_euc_2bytes_ms[];
-extern const unsigned short *const utf8_to_euc_2bytes_932[];
-extern const unsigned short *const utf8_to_euc_2bytes_mac[];
-extern const unsigned short *const utf8_to_euc_2bytes_x0213[];
-extern const unsigned short *const *const utf8_to_euc_3bytes[];
-extern const unsigned short *const *const utf8_to_euc_3bytes_ms[];
-extern const unsigned short *const *const utf8_to_euc_3bytes_932[];
-extern const unsigned short *const *const utf8_to_euc_3bytes_mac[];
-extern const unsigned short *const *const utf8_to_euc_3bytes_x0213[];
-#endif /* UTF8_INPUT_ENABLE */
-
-#ifdef UNICODE_NORMALIZATION
-
-#define NORMALIZATION_TABLE_LENGTH 942
-#define NORMALIZATION_TABLE_NFC_LENGTH 3
-#define NORMALIZATION_TABLE_NFD_LENGTH 9
-struct normalization_pair {
-    const unsigned char nfc[NORMALIZATION_TABLE_NFC_LENGTH];
-    const unsigned char nfd[NORMALIZATION_TABLE_NFD_LENGTH];
-};
-extern const struct normalization_pair normalization_table[];
-#endif
-
-#ifdef SHIFTJIS_CP932
-#define CP932_TABLE_BEGIN 0xFA
-#define CP932_TABLE_END   0xFC
-extern const unsigned short shiftjis_cp932[3][189];
-#define CP932INV_TABLE_BEGIN 0xED
-#define CP932INV_TABLE_END   0xEE
-extern const unsigned short cp932inv[2][189];
-#endif /* SHIFTJIS_CP932 */
-
-#ifdef X0212_ENABLE
-extern const unsigned short shiftjis_x0212[3][189];
-extern const unsigned short *const x0212_shiftjis[];
-#endif /* X0212_ENABLE */
-
-#endif
diff --git a/ext/nkf/nkf.c b/ext/nkf/nkf.c
deleted file mode 100644
index 73b616a54fd0bb..00000000000000
--- a/ext/nkf/nkf.c
+++ /dev/null
@@ -1,506 +0,0 @@
-/*
- *  NKF - Ruby extension for Network Kanji Filter
- *
- *  original nkf2.x is maintained at http://sourceforge.jp/projects/nkf/
- *
- *  $Id$
- *
- */
-
-#define RUBY_NKF_REVISION "$Revision$"
-#define RUBY_NKF_VERSION NKF_VERSION " (" NKF_RELEASE_DATE ")"
-#define NKF_GEM_VERSION "0.1.3"
-
-#include "ruby/ruby.h"
-#include "ruby/encoding.h"
-
-/* Replace nkf's getchar/putchar for variable modification */
-/* we never use getc, ungetc */
-
-#undef getc
-#undef ungetc
-#define getc(f)         (input_ctr>=i_len?-1:input[input_ctr++])
-#define ungetc(c,f)     input_ctr--
-
-#define INCSIZE         32
-#undef putchar
-#undef TRUE
-#undef FALSE
-#define putchar(c)      rb_nkf_putchar(c)
-
-/* Input/Output pointers */
-
-static unsigned char *output;
-static unsigned char *input;
-static int input_ctr;
-static int i_len;
-static int output_ctr;
-static int o_len;
-static int incsize;
-
-static VALUE result;
-
-static int
-rb_nkf_putchar(unsigned int c)
-{
-  if (output_ctr >= o_len) {
-    o_len += incsize;
-    rb_str_resize(result, o_len);
-    incsize *= 2;
-    output = (unsigned char *)RSTRING_PTR(result);
-  }
-  output[output_ctr++] = c;
-
-  return c;
-}
-
-/* Include kanji filter main part */
-/* getchar and putchar will be replaced during inclusion */
-
-#define PERL_XS 1
-#include "nkf-utf8/config.h"
-#include "nkf-utf8/utf8tbl.c"
-#include "nkf-utf8/nkf.c"
-
-rb_encoding* rb_nkf_enc_get(const char *name)
-{
-    int idx = rb_enc_find_index(name);
-    if (idx < 0) {
-        nkf_encoding *nkf_enc = nkf_enc_find(name);
-        idx = rb_enc_find_index(nkf_enc_name(nkf_enc_to_base_encoding(nkf_enc)));
-        if (idx < 0) {
-            idx = rb_define_dummy_encoding(name);
-        }
-    }
-    return rb_enc_from_index(idx);
-}
-
-int nkf_split_options(const char *arg)
-{
-    int count = 0;
-    unsigned char option[256];
-    int i = 0, j = 0;
-    int is_escaped = FALSE;
-    int is_single_quoted = FALSE;
-    int is_double_quoted = FALSE;
-    for(i = 0; arg[i]; i++){
-        if(j == 255){
-            return -1;
-        }else if(is_single_quoted){
-            if(arg[i] == '\''){
-                is_single_quoted = FALSE;
-            }else{
-                option[j++] = arg[i];
-            }
-        }else if(is_escaped){
-            is_escaped = FALSE;
-            option[j++] = arg[i];
-        }else if(arg[i] == '\\'){
-            is_escaped = TRUE;
-        }else if(is_double_quoted){
-            if(arg[i] == '"'){
-                is_double_quoted = FALSE;
-            }else{
-                option[j++] = arg[i];
-            }
-        }else if(arg[i] == '\''){
-            is_single_quoted = TRUE;
-        }else if(arg[i] == '"'){
-            is_double_quoted = TRUE;
-        }else if(arg[i] == ' '){
-            option[j] = '\0';
-            options(option);
-            j = 0;
-        }else{
-            option[j++] = arg[i];
-        }
-    }
-    if(j){
-        option[j] = '\0';
-        options(option);
-    }
-    return count;
-}
-
-/*
- *  call-seq:
- *     NKF.nkf(opt, str)   => string
- *
- *  Convert _str_ and return converted result.
- *  Conversion details are specified by _opt_ as String.
- *
- *     require 'nkf'
- *     output = NKF.nkf("-s", input)
- */
-
-static VALUE
-rb_nkf_convert(VALUE obj, VALUE opt, VALUE src)
-{
-    VALUE tmp;
-    reinit();
-    nkf_split_options(StringValueCStr(opt));
-    if (!output_encoding) rb_raise(rb_eArgError, "no output encoding given");
-
-    switch (nkf_enc_to_index(output_encoding)) {
-    case UTF_8_BOM:    output_encoding = nkf_enc_from_index(UTF_8); break;
-    case UTF_16BE_BOM: output_encoding = nkf_enc_from_index(UTF_16BE); break;
-    case UTF_16LE_BOM: output_encoding = nkf_enc_from_index(UTF_16LE); break;
-    case UTF_32BE_BOM: output_encoding = nkf_enc_from_index(UTF_32BE); break;
-    case UTF_32LE_BOM: output_encoding = nkf_enc_from_index(UTF_32LE); break;
-    }
-    output_bom_f = FALSE;
-
-    incsize = INCSIZE;
-
-    input_ctr = 0;
-    input = (unsigned char *)StringValuePtr(src);
-    i_len = RSTRING_LENINT(src);
-    tmp = rb_str_new(0, i_len*3 + 10);
-
-    output_ctr = 0;
-    output     = (unsigned char *)RSTRING_PTR(tmp);
-    o_len      = RSTRING_LENINT(tmp);
-    *output    = '\0';
-
-    /* use _result_ begin*/
-    result = tmp;
-    kanji_convert(NULL);
-    result = Qnil;
-    /* use _result_ end */
-
-    rb_str_set_len(tmp, output_ctr);
-
-    if (mimeout_f)
-        rb_enc_associate(tmp, rb_usascii_encoding());
-    else
-        rb_enc_associate(tmp, rb_nkf_enc_get(nkf_enc_name(output_encoding)));
-
-    return tmp;
-}
-
-
-/*
- *  call-seq:
- *     NKF.guess(str)  => encoding
- *
- *  Returns guessed encoding of _str_ by nkf routine.
- *
- */
-
-static VALUE
-rb_nkf_guess(VALUE obj, VALUE src)
-{
-    reinit();
-
-    input_ctr = 0;
-    input = (unsigned char *)StringValuePtr(src);
-    i_len = RSTRING_LENINT(src);
-
-    guess_f = TRUE;
-    kanji_convert( NULL );
-    guess_f = FALSE;
-
-    return rb_enc_from_encoding(rb_nkf_enc_get(get_guessed_code()));
-}
-
-
-/*
- *  NKF - Ruby extension for Network Kanji Filter
- *
- *  == Description
- *
- *  This is a Ruby Extension version of nkf (Network Kanji Filter).
- *  It converts the first argument and returns converted result. Conversion
- *  details are specified by flags as the first argument.
- *
- *  *Nkf* is a yet another kanji code converter among networks, hosts and terminals.
- *  It converts input kanji code to designated kanji code
- *  such as ISO-2022-JP, Shift_JIS, EUC-JP, UTF-8 or UTF-16.
- *
- *  One of the most unique faculty of *nkf* is the guess of the input kanji encodings.
- *  It currently recognizes ISO-2022-JP, Shift_JIS, EUC-JP, UTF-8 and UTF-16.
- *  So users needn't set the input kanji code explicitly.
- *
- *  By default, X0201 kana is converted into X0208 kana.
- *  For X0201 kana, SO/SI, SSO and ESC-(-I methods are supported.
- *  For automatic code detection, nkf assumes no X0201 kana in Shift_JIS.
- *  To accept X0201 in Shift_JIS, use <b>-X</b>, <b>-x</b> or <b>-S</b>.
- *
- *  == Flags
- *
- *  === -b -u
- *
- *  Output is buffered (DEFAULT), Output is unbuffered.
- *
- *  === -j -s -e -w -w16 -w32
- *
- *  Output code is ISO-2022-JP (7bit JIS), Shift_JIS, EUC-JP,
- *  UTF-8N, UTF-16BE, UTF-32BE.
- *  Without this option and compile option, ISO-2022-JP is assumed.
- *
- *  === -J -S -E -W -W16 -W32
- *
- *  Input assumption is JIS 7 bit, Shift_JIS, EUC-JP,
- *  UTF-8, UTF-16, UTF-32.
- *
- *  ==== -J
- *
- *  Assume  JIS input. It also accepts EUC-JP.
- *  This is the default. This flag does not exclude Shift_JIS.
- *
- *  ==== -S
- *
- *  Assume Shift_JIS and X0201 kana input. It also accepts JIS.
- *  EUC-JP is recognized as X0201 kana. Without <b>-x</b> flag,
- *  X0201 kana (halfwidth kana) is converted into X0208.
- *
- *  ==== -E
- *
- *  Assume EUC-JP input. It also accepts JIS.
- *  Same as -J.
- *
- *  === -t
- *
- *  No conversion.
- *
- *  === -i_
- *
- *  Output sequence to designate JIS-kanji. (DEFAULT B)
- *
- *  === -o_
- *
- *  Output sequence to designate ASCII. (DEFAULT B)
- *
- *  === -r
- *
- *  {de/en}crypt ROT13/47
- *
- *  === \-h[123] --hiragana --katakana --katakana-hiragana
- *
- *  [-h1 --hiragana] Katakana to Hiragana conversion.
- *
- *  [-h2 --katakana] Hiragana to Katakana conversion.
- *
- *  [-h3 --katakana-hiragana] Katakana to Hiragana and Hiragana to Katakana conversion.
- *
- *  === -T
- *
- *  Text mode output (MS-DOS)
- *
- *  === -l
- *
- *  ISO8859-1 (Latin-1) support
- *
- *  === -f[<code>m</code> [- <code>n</code>]]
- *
- *  Folding on <code>m</code> length with <code>n</code> margin in a line.
- *  Without this option, fold length is 60 and fold margin is 10.
- *
- *  === -F
- *
- *  New line preserving line folding.
- *
- *  === \-Z[0-3]
- *
- *  Convert X0208 alphabet (Fullwidth Alphabets) to ASCII.
- *
- *  [-Z -Z0] Convert X0208 alphabet to ASCII.
- *
- *  [-Z1] Converts X0208 kankaku to single ASCII space.
- *
- *  [-Z2] Converts X0208 kankaku to double ASCII spaces.
- *
- *  [-Z3] Replacing Fullwidth >, <, ", & into '&gt;', '&lt;', '&quot;', '&amp;' as in HTML.
- *
- *  === -X -x
- *
- *  Assume X0201 kana in MS-Kanji.
- *  With <b>-X</b> or without this option, X0201 is converted into X0208 Kana.
- *  With <b>-x</b>, try to preserve X0208 kana and do not convert X0201 kana to X0208.
- *  In JIS output, ESC-(-I is used. In EUC output, SSO is used.
- *
- *  === \-B[0-2]
- *
- *  Assume broken JIS-Kanji input, which lost ESC.
- *  Useful when your site is using old B-News Nihongo patch.
- *
- *  [-B1] allows any char after ESC-( or ESC-$.
- *
- *  [-B2] forces ASCII after NL.
- *
- *  === -I
- *
- *  Replacing non iso-2022-jp char into a geta character
- *  (substitute character in Japanese).
- *
- *  === -d -c
- *
- *  Delete \r in line feed, Add \r in line feed.
- *
- *  === \-m[BQN0]
- *
- *  MIME ISO-2022-JP/ISO8859-1 decode. (DEFAULT)
- *  To see ISO8859-1 (Latin-1) -l is necessary.
- *
- *  [-mB] Decode MIME base64 encoded stream. Remove header or other part before
- *  conversion.
- *
- *  [-mQ] Decode MIME quoted stream. '_' in quoted stream is converted to space.
- *
- *  [-mN] Non-strict decoding.
- *  It allows line break in the middle of the base64 encoding.
- *
- *  [-m0] No MIME decode.
- *
- *  === -M
- *
- *  MIME encode. Header style. All ASCII code and control characters are intact.
- *  Kanji conversion is performed before encoding, so this cannot be used as a picture encoder.
- *
- *  [-MB] MIME encode Base64 stream.
- *
- *  [-MQ] Perform quoted encoding.
- *
- *  === -l
- *
- *  Input and output code is ISO8859-1 (Latin-1) and ISO-2022-JP.
- *  <b>-s</b>, <b>-e</b> and <b>-x</b> are not compatible with this option.
- *
- *  === \-L[uwm]
- *
- *  new line mode
- *  Without this option, nkf doesn't convert line breaks.
- *
- *  [-Lu] unix (LF)
- *
- *  [-Lw] windows (CRLF)
- *
- *  [-Lm] mac (CR)
- *
- *  === --fj --unix --mac --msdos --windows
- *
- *  convert for these system
- *
- *  === --jis --euc --sjis --mime --base64
- *
- *  convert for named code
- *
- *  === --jis-input --euc-input --sjis-input --mime-input --base64-input
- *
- *  assume input system
- *
- *  === --ic=<code>input codeset</code> --oc=<code>output codeset</code>
- *
- *  Set the input or output codeset.
- *  NKF supports following codesets and those codeset name are case insensitive.
- *
- *  [ISO-2022-JP] a.k.a. RFC1468, 7bit JIS, JUNET
- *
- *  [EUC-JP (eucJP-nkf)] a.k.a. AT&T JIS, Japanese EUC, UJIS
- *
- *  [eucJP-ascii] a.k.a. x-eucjp-open-19970715-ascii
- *
- *  [eucJP-ms] a.k.a. x-eucjp-open-19970715-ms
- *
- *  [CP51932] Microsoft Version of EUC-JP.
- *
- *  [Shift_JIS] SJIS, MS-Kanji
- *
- *  [Windows-31J] a.k.a. CP932
- *
- *  [UTF-8] same as UTF-8N
- *
- *  [UTF-8N] UTF-8 without BOM
- *
- *  [UTF-8-BOM] UTF-8 with BOM
- *
- *  [UTF-16] same as UTF-16BE
- *
- *  [UTF-16BE] UTF-16 Big Endian without BOM
- *
- *  [UTF-16BE-BOM] UTF-16 Big Endian with BOM
- *
- *  [UTF-16LE] UTF-16 Little Endian without BOM
- *
- *  [UTF-16LE-BOM] UTF-16 Little Endian with BOM
- *
- *  [UTF-32] same as UTF-32BE
- *
- *  [UTF-32BE] UTF-32 Big Endian without BOM
- *
- *  [UTF-32BE-BOM] UTF-32 Big Endian with BOM
- *
- *  [UTF-32LE] UTF-32 Little Endian without BOM
- *
- *  [UTF-32LE-BOM] UTF-32 Little Endian with BOM
- *
- *  [UTF8-MAC] NKDed UTF-8, a.k.a. UTF8-NFD (input only)
- *
- *  === --fb-{skip, html, xml, perl, java, subchar}
- *
- *  Specify the way that nkf handles unassigned characters.
- *  Without this option, --fb-skip is assumed.
- *
- *  === --prefix= <code>escape character</code> <code>target character</code> ..
- *
- *  When nkf converts to Shift_JIS,
- *  nkf adds a specified escape character to specified 2nd byte of Shift_JIS characters.
- *  1st byte of argument is the escape character and following bytes are target characters.
- *
- *  === --no-cp932ext
- *
- *  Handle the characters extended in CP932 as unassigned characters.
- *
- *  == --no-best-fit-chars
- *
- *  When Unicode to Encoded byte conversion,
- *  don't convert characters which is not round trip safe.
- *  When Unicode to Unicode conversion,
- *  with this and -x option, nkf can be used as UTF converter.
- *  (In other words, without this and -x option, nkf doesn't save some characters)
- *
- *  When nkf convert string which related to path, you should use this option.
- *
- *  === --cap-input
- *
- *  Decode hex encoded characters.
- *
- *  === --url-input
- *
- *  Unescape percent escaped characters.
- *
- *  === --
- *
- *  Ignore rest of -option.
- */
-
-void
-Init_nkf(void)
-{
-    VALUE mNKF = rb_define_module("NKF");
-
-    rb_define_module_function(mNKF, "nkf", rb_nkf_convert, 2);
-    rb_define_module_function(mNKF, "guess", rb_nkf_guess, 1);
-    rb_define_alias(rb_singleton_class(mNKF), "guess", "guess");
-
-    rb_define_const(mNKF, "AUTO",	Qnil);
-    rb_define_const(mNKF, "NOCONV",	Qnil);
-    rb_define_const(mNKF, "UNKNOWN",	Qnil);
-    rb_define_const(mNKF, "BINARY",	rb_enc_from_encoding(rb_nkf_enc_get("BINARY")));
-    rb_define_const(mNKF, "ASCII",	rb_enc_from_encoding(rb_nkf_enc_get("US-ASCII")));
-    rb_define_const(mNKF, "JIS",	rb_enc_from_encoding(rb_nkf_enc_get("ISO-2022-JP")));
-    rb_define_const(mNKF, "EUC",	rb_enc_from_encoding(rb_nkf_enc_get("EUC-JP")));
-    rb_define_const(mNKF, "SJIS",	rb_enc_from_encoding(rb_nkf_enc_get("Shift_JIS")));
-    rb_define_const(mNKF, "UTF8",	rb_enc_from_encoding(rb_utf8_encoding()));
-    rb_define_const(mNKF, "UTF16",	rb_enc_from_encoding(rb_nkf_enc_get("UTF-16BE")));
-    rb_define_const(mNKF, "UTF32",	rb_enc_from_encoding(rb_nkf_enc_get("UTF-32BE")));
-
-    /* Full version string of nkf */
-    rb_define_const(mNKF, "VERSION", rb_str_new2(RUBY_NKF_VERSION));
-    /* Version of nkf */
-    rb_define_const(mNKF, "NKF_VERSION", rb_str_new2(NKF_VERSION));
-    /* Release date of nkf */
-    rb_define_const(mNKF, "NKF_RELEASE_DATE", rb_str_new2(NKF_RELEASE_DATE));
-    /* Version of nkf library */
-    rb_define_const(mNKF, "GEM_VERSION", rb_str_new_cstr(NKF_GEM_VERSION));
-}
diff --git a/ext/nkf/nkf.gemspec b/ext/nkf/nkf.gemspec
deleted file mode 100644
index 097a9485ed7a6d..00000000000000
--- a/ext/nkf/nkf.gemspec
+++ /dev/null
@@ -1,35 +0,0 @@
-source_version = ["", "ext/nkf/"].find do |dir|
-  begin
-    break File.open(File.join(__dir__, "#{dir}nkf.c")) {|f|
-      f.gets("\n#define NKF_GEM_VERSION ")
-      f.gets[/\s*"(.+)"/, 1]
-    }
-  rescue Errno::ENOENT
-  end
-end
-
-Gem::Specification.new do |spec|
-  spec.name          = "nkf"
-  spec.version       = source_version
-  spec.authors       = ["NARUSE Yui"]
-  spec.email         = ["naruse@airemix.jp"]
-
-  spec.summary       = %q{Ruby extension for Network Kanji Filter}
-  spec.description   = %q{Ruby extension for Network Kanji Filter}
-  spec.homepage      = "https://github.com/ruby/nkf"
-  spec.required_ruby_version = Gem::Requirement.new(">= 2.3.0")
-  spec.licenses      = ["Ruby", "BSD-2-Clause"]
-
-  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"]
-  spec.extensions    = ["ext/nkf/extconf.rb"]
-end
diff --git a/ext/objspace/depend b/ext/objspace/depend
index 9e9cce0fc2c163..3c11511575ff52 100644
--- a/ext/objspace/depend
+++ b/ext/objspace/depend
@@ -140,6 +140,7 @@ object_tracing.o: $(hdrdir)/ruby/internal/intern/re.h
 object_tracing.o: $(hdrdir)/ruby/internal/intern/ruby.h
 object_tracing.o: $(hdrdir)/ruby/internal/intern/select.h
 object_tracing.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+object_tracing.o: $(hdrdir)/ruby/internal/intern/set.h
 object_tracing.o: $(hdrdir)/ruby/internal/intern/signal.h
 object_tracing.o: $(hdrdir)/ruby/internal/intern/sprintf.h
 object_tracing.o: $(hdrdir)/ruby/internal/intern/string.h
@@ -159,6 +160,7 @@ object_tracing.o: $(hdrdir)/ruby/internal/special_consts.h
 object_tracing.o: $(hdrdir)/ruby/internal/static_assert.h
 object_tracing.o: $(hdrdir)/ruby/internal/stdalign.h
 object_tracing.o: $(hdrdir)/ruby/internal/stdbool.h
+object_tracing.o: $(hdrdir)/ruby/internal/stdckdint.h
 object_tracing.o: $(hdrdir)/ruby/internal/symbol.h
 object_tracing.o: $(hdrdir)/ruby/internal/value.h
 object_tracing.o: $(hdrdir)/ruby/internal/value_type.h
@@ -176,13 +178,17 @@ object_tracing.o: $(top_srcdir)/ccan/check_type/check_type.h
 object_tracing.o: $(top_srcdir)/ccan/container_of/container_of.h
 object_tracing.o: $(top_srcdir)/ccan/list/list.h
 object_tracing.o: $(top_srcdir)/ccan/str/str.h
+object_tracing.o: $(top_srcdir)/id_table.h
 object_tracing.o: $(top_srcdir)/internal.h
 object_tracing.o: $(top_srcdir)/internal/array.h
 object_tracing.o: $(top_srcdir)/internal/basic_operators.h
 object_tracing.o: $(top_srcdir)/internal/compilers.h
 object_tracing.o: $(top_srcdir)/internal/gc.h
 object_tracing.o: $(top_srcdir)/internal/imemo.h
+object_tracing.o: $(top_srcdir)/internal/namespace.h
+object_tracing.o: $(top_srcdir)/internal/sanitizers.h
 object_tracing.o: $(top_srcdir)/internal/serial.h
+object_tracing.o: $(top_srcdir)/internal/set_table.h
 object_tracing.o: $(top_srcdir)/internal/static_assert.h
 object_tracing.o: $(top_srcdir)/internal/vm.h
 object_tracing.o: $(top_srcdir)/internal/warnings.h
@@ -338,6 +344,7 @@ objspace.o: $(hdrdir)/ruby/internal/intern/re.h
 objspace.o: $(hdrdir)/ruby/internal/intern/ruby.h
 objspace.o: $(hdrdir)/ruby/internal/intern/select.h
 objspace.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+objspace.o: $(hdrdir)/ruby/internal/intern/set.h
 objspace.o: $(hdrdir)/ruby/internal/intern/signal.h
 objspace.o: $(hdrdir)/ruby/internal/intern/sprintf.h
 objspace.o: $(hdrdir)/ruby/internal/intern/string.h
@@ -357,6 +364,7 @@ objspace.o: $(hdrdir)/ruby/internal/special_consts.h
 objspace.o: $(hdrdir)/ruby/internal/static_assert.h
 objspace.o: $(hdrdir)/ruby/internal/stdalign.h
 objspace.o: $(hdrdir)/ruby/internal/stdbool.h
+objspace.o: $(hdrdir)/ruby/internal/stdckdint.h
 objspace.o: $(hdrdir)/ruby/internal/symbol.h
 objspace.o: $(hdrdir)/ruby/internal/value.h
 objspace.o: $(hdrdir)/ruby/internal/value_type.h
@@ -378,6 +386,7 @@ objspace.o: $(top_srcdir)/ccan/container_of/container_of.h
 objspace.o: $(top_srcdir)/ccan/list/list.h
 objspace.o: $(top_srcdir)/ccan/str/str.h
 objspace.o: $(top_srcdir)/constant.h
+objspace.o: $(top_srcdir)/debug_counter.h
 objspace.o: $(top_srcdir)/id_table.h
 objspace.o: $(top_srcdir)/internal.h
 objspace.o: $(top_srcdir)/internal/array.h
@@ -387,8 +396,10 @@ 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/namespace.h
 objspace.o: $(top_srcdir)/internal/sanitizers.h
 objspace.o: $(top_srcdir)/internal/serial.h
+objspace.o: $(top_srcdir)/internal/set_table.h
 objspace.o: $(top_srcdir)/internal/static_assert.h
 objspace.o: $(top_srcdir)/internal/variable.h
 objspace.o: $(top_srcdir)/internal/vm.h
@@ -402,7 +413,9 @@ objspace.o: $(top_srcdir)/shape.h
 objspace.o: $(top_srcdir)/symbol.h
 objspace.o: $(top_srcdir)/thread_pthread.h
 objspace.o: $(top_srcdir)/vm_core.h
+objspace.o: $(top_srcdir)/vm_debug.h
 objspace.o: $(top_srcdir)/vm_opts.h
+objspace.o: $(top_srcdir)/vm_sync.h
 objspace.o: objspace.c
 objspace.o: {$(VPATH)}id.h
 objspace_dump.o: $(RUBY_EXTCONF_H)
@@ -546,6 +559,7 @@ objspace_dump.o: $(hdrdir)/ruby/internal/intern/re.h
 objspace_dump.o: $(hdrdir)/ruby/internal/intern/ruby.h
 objspace_dump.o: $(hdrdir)/ruby/internal/intern/select.h
 objspace_dump.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+objspace_dump.o: $(hdrdir)/ruby/internal/intern/set.h
 objspace_dump.o: $(hdrdir)/ruby/internal/intern/signal.h
 objspace_dump.o: $(hdrdir)/ruby/internal/intern/sprintf.h
 objspace_dump.o: $(hdrdir)/ruby/internal/intern/string.h
@@ -565,6 +579,7 @@ objspace_dump.o: $(hdrdir)/ruby/internal/special_consts.h
 objspace_dump.o: $(hdrdir)/ruby/internal/static_assert.h
 objspace_dump.o: $(hdrdir)/ruby/internal/stdalign.h
 objspace_dump.o: $(hdrdir)/ruby/internal/stdbool.h
+objspace_dump.o: $(hdrdir)/ruby/internal/stdckdint.h
 objspace_dump.o: $(hdrdir)/ruby/internal/symbol.h
 objspace_dump.o: $(hdrdir)/ruby/internal/value.h
 objspace_dump.o: $(hdrdir)/ruby/internal/value_type.h
@@ -585,6 +600,7 @@ objspace_dump.o: $(top_srcdir)/ccan/container_of/container_of.h
 objspace_dump.o: $(top_srcdir)/ccan/list/list.h
 objspace_dump.o: $(top_srcdir)/ccan/str/str.h
 objspace_dump.o: $(top_srcdir)/constant.h
+objspace_dump.o: $(top_srcdir)/debug_counter.h
 objspace_dump.o: $(top_srcdir)/id_table.h
 objspace_dump.o: $(top_srcdir)/internal.h
 objspace_dump.o: $(top_srcdir)/internal/array.h
@@ -595,8 +611,10 @@ 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/io.h
+objspace_dump.o: $(top_srcdir)/internal/namespace.h
 objspace_dump.o: $(top_srcdir)/internal/sanitizers.h
 objspace_dump.o: $(top_srcdir)/internal/serial.h
+objspace_dump.o: $(top_srcdir)/internal/set_table.h
 objspace_dump.o: $(top_srcdir)/internal/static_assert.h
 objspace_dump.o: $(top_srcdir)/internal/string.h
 objspace_dump.o: $(top_srcdir)/internal/variable.h
@@ -610,8 +628,11 @@ objspace_dump.o: $(top_srcdir)/rubyparser.h
 objspace_dump.o: $(top_srcdir)/shape.h
 objspace_dump.o: $(top_srcdir)/symbol.h
 objspace_dump.o: $(top_srcdir)/thread_pthread.h
+objspace_dump.o: $(top_srcdir)/vm_callinfo.h
 objspace_dump.o: $(top_srcdir)/vm_core.h
+objspace_dump.o: $(top_srcdir)/vm_debug.h
 objspace_dump.o: $(top_srcdir)/vm_opts.h
+objspace_dump.o: $(top_srcdir)/vm_sync.h
 objspace_dump.o: objspace.h
 objspace_dump.o: objspace_dump.c
 objspace_dump.o: {$(VPATH)}id.h
diff --git a/ext/objspace/object_tracing.c b/ext/objspace/object_tracing.c
index c1c93c51f5fe9c..0156642ef25897 100644
--- a/ext/objspace/object_tracing.c
+++ b/ext/objspace/object_tracing.c
@@ -53,6 +53,14 @@ make_unique_str(st_table *tbl, const char *str, long len)
     }
 }
 
+static int
+delete_unique_str_dec(st_data_t *key, st_data_t *value, st_data_t arg, int existing)
+{
+    assert(existing);
+    *value = arg;
+    return ST_CONTINUE;
+}
+
 static void
 delete_unique_str(st_table *tbl, const char *str)
 {
@@ -66,7 +74,7 @@ delete_unique_str(st_table *tbl, const char *str)
             ruby_xfree((char *)n);
         }
         else {
-            st_insert(tbl, (st_data_t)str, n-1);
+            st_update(tbl, (st_data_t)str, delete_unique_str_dec, (st_data_t)(n-1));
         }
     }
 }
@@ -190,22 +198,23 @@ allocation_info_tracer_memsize(const void *ptr)
 }
 
 static int
-hash_foreach_should_replace_key(st_data_t key, st_data_t value, st_data_t argp, int error)
+allocation_info_tracer_compact_update_object_table_i(st_data_t key, st_data_t value, st_data_t data)
 {
-    VALUE allocated_object;
+    st_table *table = (st_table *)data;
 
-    allocated_object = (VALUE)value;
-    if (allocated_object != rb_gc_location(allocated_object)) {
-        return ST_REPLACE;
+    if (!rb_gc_pointer_to_heap_p(key)) {
+        return ST_DELETE;
     }
 
-    return ST_CONTINUE;
-}
+    if (key != rb_gc_location(key)) {
+        DURING_GC_COULD_MALLOC_REGION_START();
+        {
+            st_insert(table, rb_gc_location(key), value);
+        }
+        DURING_GC_COULD_MALLOC_REGION_END();
 
-static int
-hash_replace_key(st_data_t *key, st_data_t *value, st_data_t argp, int existing)
-{
-    *key = rb_gc_location((VALUE)*key);
+        return ST_DELETE;
+    }
 
     return ST_CONTINUE;
 }
@@ -216,7 +225,10 @@ allocation_info_tracer_compact(void *ptr)
     struct traceobj_arg *trace_arg = (struct traceobj_arg *)ptr;
 
     if (trace_arg->object_table &&
-            st_foreach_with_replace(trace_arg->object_table, hash_foreach_should_replace_key, hash_replace_key, 0)) {
+            st_foreach(
+                trace_arg->object_table,
+                allocation_info_tracer_compact_update_object_table_i,
+                (st_data_t)trace_arg->object_table)) {
         rb_raise(rb_eRuntimeError, "hash modified during iteration");
     }
 }
diff --git a/ext/objspace/objspace.c b/ext/objspace/objspace.c
index e8762d1be6f5bb..5e183e78ed5352 100644
--- a/ext/objspace/objspace.c
+++ b/ext/objspace/objspace.c
@@ -19,7 +19,6 @@
 #include "internal/hash.h"
 #include "internal/imemo.h"
 #include "internal/sanitizers.h"
-#include "node.h"
 #include "ruby/io.h"
 #include "ruby/re.h"
 #include "ruby/st.h"
@@ -82,15 +81,15 @@ heap_iter(void *vstart, void *vend, size_t stride, void *ptr)
     VALUE v;
 
     for (v = (VALUE)vstart; v != (VALUE)vend; v += stride) {
-        void *poisoned = asan_poisoned_object_p(v);
-        asan_unpoison_object(v, false);
+        void *poisoned = rb_asan_poisoned_object_p(v);
+        rb_asan_unpoison_object(v, false);
 
         if (RBASIC(v)->flags) {
             (*ctx->cb)(v, ctx->data);
         }
 
         if (poisoned) {
-            asan_poison_object(v);
+            rb_asan_poison_object(v);
         }
     }
 
@@ -170,8 +169,7 @@ setup_hash(int argc, VALUE *argv)
         hash = rb_hash_new();
     }
     else if (!RHASH_EMPTY_P(hash)) {
-        /* WB: no new reference */
-        st_foreach(RHASH_TBL_RAW(hash), set_zero_i, hash);
+        rb_hash_foreach(hash, set_zero_i, (st_data_t)hash);
     }
 
     return hash;
@@ -337,17 +335,6 @@ count_symbols(int argc, VALUE *argv, VALUE os)
     return hash;
 }
 
-static void
-cn_i(VALUE v, void *n)
-{
-    size_t *nodes = (size_t *)n;
-
-    if (BUILTIN_TYPE(v) == T_NODE) {
-        size_t s = nd_type((NODE *)v);
-        nodes[s]++;
-    }
-}
-
 /*
  *  call-seq:
  *     ObjectSpace.count_nodes([result_hash]) -> hash
@@ -374,135 +361,7 @@ cn_i(VALUE v, void *n)
 static VALUE
 count_nodes(int argc, VALUE *argv, VALUE os)
 {
-    size_t nodes[NODE_LAST+1];
-    enum node_type i;
-    VALUE hash = setup_hash(argc, argv);
-
-    for (i = 0; i <= NODE_LAST; i++) {
-        nodes[i] = 0;
-    }
-
-    each_object_with_flags(cn_i, &nodes[0]);
-
-    for (i=0; i<NODE_LAST; i++) {
-        if (nodes[i] != 0) {
-            VALUE node;
-            switch (i) {
-#define COUNT_NODE(n) case n: node = ID2SYM(rb_intern(#n)); goto set
-                COUNT_NODE(NODE_SCOPE);
-                COUNT_NODE(NODE_BLOCK);
-                COUNT_NODE(NODE_IF);
-                COUNT_NODE(NODE_UNLESS);
-                COUNT_NODE(NODE_CASE);
-                COUNT_NODE(NODE_CASE2);
-                COUNT_NODE(NODE_CASE3);
-                COUNT_NODE(NODE_WHEN);
-                COUNT_NODE(NODE_IN);
-                COUNT_NODE(NODE_WHILE);
-                COUNT_NODE(NODE_UNTIL);
-                COUNT_NODE(NODE_ITER);
-                COUNT_NODE(NODE_FOR);
-                COUNT_NODE(NODE_FOR_MASGN);
-                COUNT_NODE(NODE_BREAK);
-                COUNT_NODE(NODE_NEXT);
-                COUNT_NODE(NODE_REDO);
-                COUNT_NODE(NODE_RETRY);
-                COUNT_NODE(NODE_BEGIN);
-                COUNT_NODE(NODE_RESCUE);
-                COUNT_NODE(NODE_RESBODY);
-                COUNT_NODE(NODE_ENSURE);
-                COUNT_NODE(NODE_AND);
-                COUNT_NODE(NODE_OR);
-                COUNT_NODE(NODE_MASGN);
-                COUNT_NODE(NODE_LASGN);
-                COUNT_NODE(NODE_DASGN);
-                COUNT_NODE(NODE_GASGN);
-                COUNT_NODE(NODE_IASGN);
-                COUNT_NODE(NODE_CDECL);
-                COUNT_NODE(NODE_CVASGN);
-                COUNT_NODE(NODE_OP_ASGN1);
-                COUNT_NODE(NODE_OP_ASGN2);
-                COUNT_NODE(NODE_OP_ASGN_AND);
-                COUNT_NODE(NODE_OP_ASGN_OR);
-                COUNT_NODE(NODE_OP_CDECL);
-                COUNT_NODE(NODE_CALL);
-                COUNT_NODE(NODE_OPCALL);
-                COUNT_NODE(NODE_FCALL);
-                COUNT_NODE(NODE_VCALL);
-                COUNT_NODE(NODE_QCALL);
-                COUNT_NODE(NODE_SUPER);
-                COUNT_NODE(NODE_ZSUPER);
-                COUNT_NODE(NODE_LIST);
-                COUNT_NODE(NODE_ZLIST);
-                COUNT_NODE(NODE_VALUES);
-                COUNT_NODE(NODE_HASH);
-                COUNT_NODE(NODE_RETURN);
-                COUNT_NODE(NODE_YIELD);
-                COUNT_NODE(NODE_LVAR);
-                COUNT_NODE(NODE_DVAR);
-                COUNT_NODE(NODE_GVAR);
-                COUNT_NODE(NODE_IVAR);
-                COUNT_NODE(NODE_CONST);
-                COUNT_NODE(NODE_CVAR);
-                COUNT_NODE(NODE_NTH_REF);
-                COUNT_NODE(NODE_BACK_REF);
-                COUNT_NODE(NODE_MATCH);
-                COUNT_NODE(NODE_MATCH2);
-                COUNT_NODE(NODE_MATCH3);
-                COUNT_NODE(NODE_LIT);
-                COUNT_NODE(NODE_STR);
-                COUNT_NODE(NODE_DSTR);
-                COUNT_NODE(NODE_XSTR);
-                COUNT_NODE(NODE_DXSTR);
-                COUNT_NODE(NODE_EVSTR);
-                COUNT_NODE(NODE_DREGX);
-                COUNT_NODE(NODE_ONCE);
-                COUNT_NODE(NODE_ARGS);
-                COUNT_NODE(NODE_ARGS_AUX);
-                COUNT_NODE(NODE_OPT_ARG);
-                COUNT_NODE(NODE_KW_ARG);
-                COUNT_NODE(NODE_POSTARG);
-                COUNT_NODE(NODE_ARGSCAT);
-                COUNT_NODE(NODE_ARGSPUSH);
-                COUNT_NODE(NODE_SPLAT);
-                COUNT_NODE(NODE_BLOCK_PASS);
-                COUNT_NODE(NODE_DEFN);
-                COUNT_NODE(NODE_DEFS);
-                COUNT_NODE(NODE_ALIAS);
-                COUNT_NODE(NODE_VALIAS);
-                COUNT_NODE(NODE_UNDEF);
-                COUNT_NODE(NODE_CLASS);
-                COUNT_NODE(NODE_MODULE);
-                COUNT_NODE(NODE_SCLASS);
-                COUNT_NODE(NODE_COLON2);
-                COUNT_NODE(NODE_COLON3);
-                COUNT_NODE(NODE_DOT2);
-                COUNT_NODE(NODE_DOT3);
-                COUNT_NODE(NODE_FLIP2);
-                COUNT_NODE(NODE_FLIP3);
-                COUNT_NODE(NODE_SELF);
-                COUNT_NODE(NODE_NIL);
-                COUNT_NODE(NODE_TRUE);
-                COUNT_NODE(NODE_FALSE);
-                COUNT_NODE(NODE_ERRINFO);
-                COUNT_NODE(NODE_DEFINED);
-                COUNT_NODE(NODE_POSTEXE);
-                COUNT_NODE(NODE_DSYM);
-                COUNT_NODE(NODE_ATTRASGN);
-                COUNT_NODE(NODE_LAMBDA);
-                COUNT_NODE(NODE_ARYPTN);
-                COUNT_NODE(NODE_FNDPTN);
-                COUNT_NODE(NODE_HSHPTN);
-                COUNT_NODE(NODE_ERROR);
-#undef COUNT_NODE
-              case NODE_LAST: break;
-            }
-            UNREACHABLE;
-          set:
-            rb_hash_aset(hash, node, SIZET2NUM(nodes[i]));
-        }
-    }
-    return hash;
+    return setup_hash(argc, argv);
 }
 
 static void
@@ -645,6 +504,7 @@ count_imemo_objects(int argc, VALUE *argv, VALUE self)
         INIT_IMEMO_TYPE_ID(imemo_callinfo);
         INIT_IMEMO_TYPE_ID(imemo_callcache);
         INIT_IMEMO_TYPE_ID(imemo_constcache);
+        INIT_IMEMO_TYPE_ID(imemo_fields);
 #undef INIT_IMEMO_TYPE_ID
     }
 
@@ -718,7 +578,7 @@ reachable_object_from_i(VALUE obj, void *data_ptr)
     VALUE key = obj;
     VALUE val = obj;
 
-    if (rb_objspace_markable_object_p(obj)) {
+    if (!rb_objspace_garbage_object_p(obj)) {
         if (NIL_P(rb_hash_lookup(data->refs, key))) {
             rb_hash_aset(data->refs, key, Qtrue);
 
@@ -764,7 +624,7 @@ collect_values(st_data_t key, st_data_t value, st_data_t data)
  *
  *  With this method, you can find memory leaks.
  *
- *  This method is only expected to work except with C Ruby.
+ *  This method is only expected to work with C Ruby.
  *
  *  Example:
  *    ObjectSpace.reachable_objects_from(['a', 'b', 'c'])
@@ -784,7 +644,7 @@ collect_values(st_data_t key, st_data_t value, st_data_t data)
 static VALUE
 reachable_objects_from(VALUE self, VALUE obj)
 {
-    if (rb_objspace_markable_object_p(obj)) {
+    if (!RB_SPECIAL_CONST_P(obj)) {
         struct rof_data data;
 
         if (rb_typeddata_is_kind_of(obj, &iow_data_type)) {
@@ -831,7 +691,7 @@ reachable_object_from_root_i(const char *category, VALUE obj, void *ptr)
         rb_hash_aset(data->categories, category_str, category_objects);
     }
 
-    if (rb_objspace_markable_object_p(obj) &&
+    if (!rb_objspace_garbage_object_p(obj) &&
         obj != data->categories &&
         obj != data->last_category_objects) {
         if (rb_objspace_internal_object_p(obj)) {
@@ -933,7 +793,7 @@ objspace_internal_super_of(VALUE self, VALUE obj)
       case T_MODULE:
       case T_CLASS:
       case T_ICLASS:
-        super = RCLASS_SUPER(obj);
+        super = rb_class_super_of(obj);
         break;
       default:
         rb_raise(rb_eArgError, "class or module is expected");
diff --git a/ext/objspace/objspace_dump.c b/ext/objspace/objspace_dump.c
index 39584e03b8c11b..80732d0282d384 100644
--- a/ext/objspace/objspace_dump.c
+++ b/ext/objspace/objspace_dump.c
@@ -28,6 +28,7 @@
 #include "ruby/debug.h"
 #include "ruby/util.h"
 #include "ruby/io.h"
+#include "vm_callinfo.h"
 #include "vm_core.h"
 
 RUBY_EXTERN const char ruby_hexdigits[];
@@ -35,9 +36,10 @@ RUBY_EXTERN const char ruby_hexdigits[];
 #define BUFFER_CAPACITY 4096
 
 struct dump_config {
-    VALUE type;
-    VALUE stream;
+    VALUE given_output;
+    VALUE output_io;
     VALUE string;
+    FILE *stream;
     const char *root_category;
     VALUE cur_obj;
     VALUE cur_obj_klass;
@@ -57,7 +59,7 @@ dump_flush(struct dump_config *dc)
 {
     if (dc->buffer_len) {
         if (dc->stream) {
-            size_t written = rb_io_bufwrite(dc->stream, dc->buffer, dc->buffer_len);
+            size_t written = fwrite(dc->buffer, sizeof(dc->buffer[0]), dc->buffer_len, dc->stream);
             if (written < dc->buffer_len) {
                 MEMMOVE(dc->buffer, dc->buffer + written, char, dc->buffer_len - written);
                 dc->buffer_len -= written;
@@ -167,10 +169,8 @@ dump_append_c(struct dump_config *dc, unsigned char c)
 }
 
 static void
-dump_append_ref(struct dump_config *dc, VALUE ref)
+dump_append_ptr(struct dump_config *dc, VALUE ref)
 {
-    RUBY_ASSERT(ref > 0);
-
     char buffer[roomof(sizeof(VALUE) * CHAR_BIT, 4) + rb_strlen_lit("\"0x\"")];
     char *buffer_start, *buffer_end;
 
@@ -186,6 +186,14 @@ dump_append_ref(struct dump_config *dc, VALUE ref)
     buffer_append(dc, buffer_start, buffer_end - buffer_start);
 }
 
+static void
+dump_append_ref(struct dump_config *dc, VALUE ref)
+{
+    RUBY_ASSERT(ref > 0);
+    dump_append_ptr(dc, ref);
+}
+
+
 static void
 dump_append_string_value(struct dump_config *dc, VALUE obj)
 {
@@ -359,8 +367,9 @@ dump_append_string_content(struct dump_config *dc, VALUE obj)
 static inline void
 dump_append_id(struct dump_config *dc, ID id)
 {
-    if (is_instance_id(id)) {
-        dump_append_string_value(dc, rb_sym2str(ID2SYM(id)));
+    VALUE str = rb_sym2str(ID2SYM(id));
+    if (RTEST(str)) {
+        dump_append_string_value(dc, str);
     }
     else {
         dump_append(dc, "\"ID_INTERNAL(");
@@ -376,8 +385,7 @@ dump_object(VALUE obj, struct dump_config *dc)
     size_t memsize;
     struct allocation_info *ainfo = objspace_lookup_allocation_info(obj);
     rb_io_t *fptr;
-    ID flags[RB_OBJ_GC_FLAGS_MAX];
-    size_t n, i;
+    ID mid;
 
     if (SPECIAL_CONST_P(obj)) {
         dump_append_special_const(dc, obj);
@@ -386,9 +394,10 @@ dump_object(VALUE obj, struct dump_config *dc)
 
     dc->cur_obj = obj;
     dc->cur_obj_references = 0;
-    if (BUILTIN_TYPE(obj) == T_NODE || BUILTIN_TYPE(obj) == T_IMEMO) {
+    if (BUILTIN_TYPE(obj) == T_NODE || (BUILTIN_TYPE(obj) == T_IMEMO && !IMEMO_TYPE_P(obj, imemo_fields))) {
         dc->cur_obj_klass = 0;
-    } else {
+    }
+    else {
         dc->cur_obj_klass = RBASIC_CLASS(obj);
     }
 
@@ -406,9 +415,11 @@ dump_object(VALUE obj, struct dump_config *dc)
     dump_append(dc, obj_type(obj));
     dump_append(dc, "\"");
 
-    size_t shape_id = rb_shape_get_shape_id(obj);
-    dump_append(dc, ", \"shape_id\":");
-    dump_append_sizet(dc, shape_id);
+    if (BUILTIN_TYPE(obj) != T_IMEMO || IMEMO_TYPE_P(obj, imemo_fields)) {
+        size_t shape_id = rb_obj_shape_id(obj) & SHAPE_ID_OFFSET_MASK;
+        dump_append(dc, ", \"shape_id\":");
+        dump_append_sizet(dc, shape_id);
+    }
 
     dump_append(dc, ", \"slot_size\":");
     dump_append_sizet(dc, dc->cur_page_slot_size);
@@ -429,6 +440,33 @@ dump_object(VALUE obj, struct dump_config *dc)
         dump_append(dc, ", \"imemo_type\":\"");
         dump_append(dc, rb_imemo_name(imemo_type(obj)));
         dump_append(dc, "\"");
+
+        switch (imemo_type(obj)) {
+          case imemo_callinfo:
+            mid = vm_ci_mid((const struct rb_callinfo *)obj);
+            if (mid != 0) {
+                dump_append(dc, ", \"mid\":");
+                dump_append_id(dc, mid);
+            }
+            break;
+
+          case imemo_callcache:
+            mid = vm_cc_cme((const struct rb_callcache *)obj)->called_id;
+            if (mid != 0) {
+                dump_append(dc, ", \"called_id\":");
+                dump_append_id(dc, mid);
+
+                VALUE klass = ((const struct rb_callcache *)obj)->klass;
+                if (klass != 0) {
+                    dump_append(dc, ", \"receiver_class\":");
+                    dump_append_ref(dc, klass);
+                }
+            }
+            break;
+
+          default:
+            break;
+        }
         break;
 
       case T_SYMBOL:
@@ -440,6 +478,8 @@ dump_object(VALUE obj, struct dump_config *dc)
             dump_append(dc, ", \"embedded\":true");
         if (FL_TEST(obj, RSTRING_FSTR))
             dump_append(dc, ", \"fstring\":true");
+        if (CHILLED_STRING_P(obj))
+            dump_append(dc, ", \"chilled\":true");
         if (STR_SHARED_P(obj))
             dump_append(dc, ", \"shared\":true");
         else
@@ -500,7 +540,7 @@ dump_object(VALUE obj, struct dump_config *dc)
 
       case T_CLASS:
         dump_append(dc, ", \"variation_count\":");
-        dump_append_d(dc, RCLASS_EXT(obj)->variation_count);
+        dump_append_d(dc, rb_class_variation_count(obj));
 
       case T_MODULE:
         if (rb_class_get_superclass(obj)) {
@@ -511,9 +551,8 @@ dump_object(VALUE obj, struct dump_config *dc)
         if (dc->cur_obj_klass) {
             VALUE mod_name = rb_mod_name(obj);
             if (!NIL_P(mod_name)) {
-                dump_append(dc, ", \"name\":\"");
-                dump_append(dc, RSTRING_PTR(mod_name));
-                dump_append(dc, "\"");
+                dump_append(dc, ", \"name\":");
+                dump_append_string_value(dc, mod_name);
             }
             else {
                 VALUE real_mod_name = rb_mod_name(rb_class_real(obj));
@@ -524,7 +563,7 @@ dump_object(VALUE obj, struct dump_config *dc)
                 }
             }
 
-            if (FL_TEST(obj, FL_SINGLETON)) {
+            if (rb_class_singleton_p(obj)) {
                 dump_append(dc, ", \"singleton\":true");
             }
         }
@@ -550,8 +589,8 @@ dump_object(VALUE obj, struct dump_config *dc)
         }
 
         dump_append(dc, ", \"ivars\":");
-        dump_append_lu(dc, ROBJECT_IV_COUNT(obj));
-        if (rb_shape_obj_too_complex(obj)) {
+        dump_append_lu(dc, ROBJECT_FIELDS_COUNT(obj));
+        if (rb_shape_obj_too_complex_p(obj)) {
             dump_append(dc, ", \"too_complex_shape\":true");
         }
         break;
@@ -600,14 +639,24 @@ dump_object(VALUE obj, struct dump_config *dc)
         dump_append_sizet(dc, memsize);
     }
 
-    if ((n = rb_obj_gc_flags(obj, flags, sizeof(flags))) > 0) {
-        dump_append(dc, ", \"flags\":{");
-        for (i=0; i<n; i++) {
-            dump_append(dc, "\"");
-            dump_append(dc, rb_id2name(flags[i]));
-            dump_append(dc, "\":true");
-            if (i != n-1) dump_append(dc, ", ");
+    struct rb_gc_object_metadata_entry *gc_metadata = rb_gc_object_metadata(obj);
+    for (int i = 0; gc_metadata[i].name != 0; i++) {
+        if (i == 0) {
+            dump_append(dc, ", \"flags\":{");
+        }
+        else {
+            dump_append(dc, ", ");
         }
+
+        dump_append(dc, "\"");
+        dump_append(dc, rb_id2name(gc_metadata[i].name));
+        dump_append(dc, "\":");
+        dump_append_special_const(dc, gc_metadata[i].val);
+    }
+
+    /* If rb_gc_object_metadata had any entries, we need to close the opening
+     * `"flags":{`. */
+    if (gc_metadata[0].name != 0) {
         dump_append(dc, "}");
     }
 
@@ -620,15 +669,15 @@ heap_i(void *vstart, void *vend, size_t stride, void *data)
     struct dump_config *dc = (struct dump_config *)data;
     VALUE v = (VALUE)vstart;
     for (; v != (VALUE)vend; v += stride) {
-        void *ptr = asan_poisoned_object_p(v);
-        asan_unpoison_object(v, false);
+        void *ptr = rb_asan_poisoned_object_p(v);
+        rb_asan_unpoison_object(v, false);
         dc->cur_page_slot_size = stride;
 
         if (dc->full_heap || RBASIC(v)->flags)
             dump_object(v, dc);
 
         if (ptr) {
-            asan_poison_object(v);
+            rb_asan_poison_object(v);
         }
     }
     return 0;
@@ -659,16 +708,34 @@ root_obj_i(const char *category, VALUE obj, void *data)
 static void
 dump_output(struct dump_config *dc, VALUE output, VALUE full, VALUE since, VALUE shapes)
 {
-
+    dc->given_output = output;
     dc->full_heap = 0;
     dc->buffer_len = 0;
 
     if (TYPE(output) == T_STRING) {
-        dc->stream = Qfalse;
+        dc->stream = NULL;
         dc->string = output;
     }
     else {
-        dc->stream = output;
+        rb_io_t *fptr;
+        // Output should be an IO, typecheck and get a FILE* for writing.
+        // We cannot write with the usual IO code here because writes
+        // interleave with calls to rb_gc_mark(). The usual IO code can
+        // cause a thread switch, raise exceptions, and even run arbitrary
+        // ruby code through the fiber scheduler.
+        //
+        // Mark functions generally can't handle these possibilities so
+        // the usual IO code is unsafe in this context. (For example,
+        // there are many ways to crash when ruby code runs and mutates
+        // the execution context while rb_execution_context_mark() is in
+        // progress.)
+        //
+        // Using FILE* isn't perfect, but it avoids the most acute problems.
+        output = rb_io_get_io(output);
+        dc->output_io = rb_io_get_write_io(output);
+        rb_io_flush(dc->output_io);
+        GetOpenFile(dc->output_io, fptr);
+        dc->stream = rb_io_stdio_file(fptr);
         dc->string = Qfalse;
     }
 
@@ -692,13 +759,13 @@ dump_result(struct dump_config *dc)
 {
     dump_flush(dc);
 
+    if (dc->stream) {
+        fflush(dc->stream);
+    }
     if (dc->string) {
         return dc->string;
     }
-    else {
-        rb_io_flush(dc->stream);
-        return dc->stream;
-    }
+    return dc->given_output;
 }
 
 /* :nodoc: */
@@ -718,69 +785,49 @@ objspace_dump(VALUE os, VALUE obj, VALUE output)
 }
 
 static void
-shape_i(rb_shape_t *shape, void *data)
+shape_id_i(shape_id_t shape_id, void *data)
 {
     struct dump_config *dc = (struct dump_config *)data;
 
-    size_t shape_id = rb_shape_id(shape);
     if (shape_id < dc->shapes_since) {
         return;
     }
 
     dump_append(dc, "{\"address\":");
-    dump_append_ref(dc, (VALUE)shape);
+    dump_append_ref(dc, (VALUE)RSHAPE(shape_id));
 
     dump_append(dc, ", \"type\":\"SHAPE\", \"id\":");
     dump_append_sizet(dc, shape_id);
 
-    if (shape->type != SHAPE_ROOT) {
+    if (RSHAPE_TYPE(shape_id) != SHAPE_ROOT) {
         dump_append(dc, ", \"parent_id\":");
-        dump_append_lu(dc, shape->parent_id);
+        dump_append_lu(dc, RSHAPE_PARENT(shape_id));
     }
 
     dump_append(dc, ", \"depth\":");
-    dump_append_sizet(dc, rb_shape_depth(shape));
+    dump_append_sizet(dc, rb_shape_depth(shape_id));
 
-    dump_append(dc, ", \"shape_type\":");
-    switch((enum shape_type)shape->type) {
+    switch (RSHAPE_TYPE(shape_id)) {
       case SHAPE_ROOT:
-        dump_append(dc, "\"ROOT\"");
+        dump_append(dc, ", \"shape_type\":\"ROOT\"");
         break;
       case SHAPE_IVAR:
-        dump_append(dc, "\"IVAR\"");
+        dump_append(dc, ", \"shape_type\":\"IVAR\"");
 
         dump_append(dc, ",\"edge_name\":");
-        dump_append_id(dc, shape->edge_name);
+        dump_append_id(dc, RSHAPE_EDGE_NAME(shape_id));
 
         break;
-      case SHAPE_FROZEN:
-        dump_append(dc, "\"FROZEN\"");
+      case SHAPE_OBJ_ID:
+        dump_append(dc, ", \"shape_type\":\"OBJ_ID\"");
         break;
-      case SHAPE_CAPACITY_CHANGE:
-        dump_append(dc, "\"CAPACITY_CHANGE\"");
-        dump_append(dc, ", \"capacity\":");
-        dump_append_sizet(dc, shape->capacity);
-        break;
-      case SHAPE_INITIAL_CAPACITY:
-        dump_append(dc, "\"INITIAL_CAPACITY\"");
-        dump_append(dc, ", \"capacity\":");
-        dump_append_sizet(dc, shape->capacity);
-        break;
-      case SHAPE_T_OBJECT:
-        dump_append(dc, "\"T_OBJECT\"");
-        break;
-      case SHAPE_OBJ_TOO_COMPLEX:
-        dump_append(dc, "\"OBJ_TOO_COMPLEX\"");
-        break;
-      default:
-        rb_bug("[objspace] unexpected shape type");
     }
 
     dump_append(dc, ", \"edges\":");
-    dump_append_sizet(dc, rb_shape_edges_count(shape));
+    dump_append_sizet(dc, rb_shape_edges_count(shape_id));
 
     dump_append(dc, ", \"memsize\":");
-    dump_append_sizet(dc, rb_shape_memsize(shape));
+    dump_append_sizet(dc, rb_shape_memsize(shape_id));
 
     dump_append(dc, "}\n");
 }
@@ -799,7 +846,7 @@ objspace_dump_all(VALUE os, VALUE output, VALUE full, VALUE since, VALUE shapes)
     }
 
     if (RTEST(shapes)) {
-        rb_shape_each_shape(shape_i, &dc);
+        rb_shape_each_shape_id(shape_id_i, &dc);
     }
 
     /* dump all objects */
@@ -816,7 +863,7 @@ objspace_dump_shapes(VALUE os, VALUE output, VALUE shapes)
     dump_output(&dc, output, Qfalse, Qnil, shapes);
 
     if (RTEST(shapes)) {
-        rb_shape_each_shape(shape_i, &dc);
+        rb_shape_each_shape_id(shape_id_i, &dc);
     }
     return dump_result(&dc);
 }
@@ -832,7 +879,4 @@ Init_objspace_dump(VALUE rb_mObjSpace)
     rb_define_module_function(rb_mObjSpace, "_dump", objspace_dump, 2);
     rb_define_module_function(rb_mObjSpace, "_dump_all", objspace_dump_all, 4);
     rb_define_module_function(rb_mObjSpace, "_dump_shapes", objspace_dump_shapes, 2);
-
-    /* force create static IDs */
-    rb_obj_gc_flags(rb_mObjSpace, 0, 0);
 }
diff --git a/ext/openssl/History.md b/ext/openssl/History.md
index 1e0df7dd8739c0..ad3417f9d0f859 100644
--- a/ext/openssl/History.md
+++ b/ext/openssl/History.md
@@ -1,3 +1,131 @@
+Version 3.3.0
+=============
+
+Compatibility
+-------------
+
+* Ruby version: 2.7 or later
+* OpenSSL version: OpenSSL 1.0.2 or later, and LibreSSL 3.1 or later
+
+Notable changes
+---------------
+
+* `OpenSSL::SSL`
+  - `OpenSSL::SSL::SSLSocket#set_params` no longer sets `#min_version=` to TLS
+    1.0 except when OpenSSL 1.0.2 is used. This has been done to disable
+    SSL 3.0, which is not supported by default in OpenSSL 1.1.0 or later, or in
+    LibreSSL. This lets it respect the system default if the system-wide
+    configuration file specifies a higher minimum protocol version.
+    [[GitHub #710]](https://github.com/ruby/openssl/pull/710)
+  - `OpenSSL::SSL::SSLSocket.new` no longer enables the `OpenSSL::SSL::OP_ALL`
+    SSL options by default and follows the system default.
+    [[GitHub #767]](https://github.com/ruby/openssl/pull/767)
+  - Add the following IO methods to `OpenSSL::SSL::SSLSocket`, which will pass
+    along to the underlying socket: `#local_address`, `#remote_address`,
+    `#close_on_exec=`, `#close_on_exec?`, `#wait`, `#wait_readable`, and
+    `#wait_writable`.
+    [[GitHub #708]](https://github.com/ruby/openssl/pull/708)
+  - Update `OpenSSL::SSL::SSLSocket#gets` to take the `chomp` keyword argument.
+    [[GitHub #708]](https://github.com/ruby/openssl/pull/708)
+  - Make `OpenSSL::SSL::SSLSocket` respect the `IO#timeout` value of the
+    underlying socket on Ruby 3.2 or later. `#timeout` and `#timeout=` methods
+    are also added.
+    [[GitHub #714]](https://github.com/ruby/openssl/pull/714)
+  - Add `OpenSSL::SSL::SSLSocket#close_read` and `#close_write`.
+    [[GitHub #743]](https://github.com/ruby/openssl/pull/743)
+  - Add `OpenSSL::Digest.digests` to get a list of all available digest
+    algorithms.
+    [[GitHub #726]](https://github.com/ruby/openssl/pull/726)
+  - Fix `OpenSSL::SSL::SSLSocket#read_nonblock` clearing the passed String
+    buffer when nothing can be read from the connection.
+    [[GitHub #739]](https://github.com/ruby/openssl/pull/739)
+* Add `#to_text` methods to `OpenSSL::Timestamp::Response`,
+  `OpenSSL::Timestamp::Request`, `OpenSSL::Timestamp::TokenInfo`, and
+  `OpenSSL::PKCS7` to get a human-readable representation of the object.
+  [[GitHub #756]](https://github.com/ruby/openssl/pull/756)
+* Add `OpenSSL::X509::Certificate#tbs_bytes` to get the DER encoding of the
+  TBSCertificate.
+  [[GitHub #753]](https://github.com/ruby/openssl/pull/753)
+* Allow passing `nil` as the digest algorithm to `#sign` methods on
+  `OpenSSL::X509::Certificate`, `OpenSSL::X509::Request`, and
+  `OpenSSL::X509::CRL`. This adds supports for signing with EdDSA keys.
+  [[GitHub #761]](https://github.com/ruby/openssl/pull/761)
+  [[GitHub #804]](https://github.com/ruby/openssl/pull/804)
+* Add `OpenSSL::SSL::SSLSocket#readbyte`.
+  [[GitHub #771]](https://github.com/ruby/openssl/pull/771)
+* Change `OpenSSL::X509::Store#time=` to set the time to the `X509_VERIFY_PARAM`
+  in the `X509_STORE`. This allows `OpenSSL::Timestamp::Response#verify` to
+  verify a signature with the specified timestamp.
+  [[GitHub #770]](https://github.com/ruby/openssl/pull/770)
+* Make `OpenSSL::PKCS7.encrypt`'s third parameter `cipher` mandatory. It had
+  an undocumented default value "RC2-40-CBC", which is not only insecure, but
+  also not supported in OpenSSL 3.0 or later.
+  [[GitHub #796]](https://github.com/ruby/openssl/pull/796)
+* Make `OpenSSL::BN` shareable between ractors when frozen.
+  [[GitHub #808]](https://github.com/ruby/openssl/pull/808)
+* Make `OpenSSL::Config` instances frozen by default, and make it shareable
+  between ractors. `OpenSSL::Config::DEFAULT_CONFIG_FILE` is also frozen.
+  [[GitHub #809]](https://github.com/ruby/openssl/pull/809)
+* Add `OpenSSL::PKCS12#set_mac` to configure the MAC parameters and recalculate
+  a MAC for the content.
+  [[GitHub #788]](https://github.com/ruby/openssl/pull/788)
+
+And various non-user-visible changes and bug fixes. Please see the commit
+history for more details.
+
+
+Version 3.2.1
+=============
+
+Merged changes in 3.0.3.
+
+
+Version 3.2.0
+=============
+
+Compatibility
+-------------
+
+* Ruby >= 2.7
+  - Support for Ruby 2.6 has been removed. Note that Ruby 2.6 reached the
+    end-of-life in 2022-04.
+    [[GitHub #639]](https://github.com/ruby/openssl/pull/639)
+* OpenSSL >= 1.0.2 or LibreSSL >= 3.1
+
+Notable changes
+---------------
+
+* Add a stub gemspec for JRuby, which depends on the `jruby-openssl` gem.
+  [[GitHub #598]](https://github.com/ruby/openssl/pull/598)
+* Add support for the FIPS module in OpenSSL 3.0/3.1.
+  [[GitHub #608]](https://github.com/ruby/openssl/pull/608)
+* Rework `OpenSSL::PKey` routines for loading DER or PEM encoded keys for better
+  compatibility with OpenSSL 3.0/3.1 with the FIPS module.
+  [[GitHub #615]](https://github.com/ruby/openssl/pull/615)
+  [[GitHub #669]](https://github.com/ruby/openssl/pull/669)
+* Add `OpenSSL::Provider` module for loading and unloading OpenSSL 3 providers.
+  [[GitHub #635]](https://github.com/ruby/openssl/pull/635)
+* Add `OpenSSL::PKey.new_raw_private_key`, `.new_raw_public_key`,
+  `OpenSSL::PKey::PKey#raw_private_key`, and `#raw_public_key` for public key
+  algorithms that use "raw private/public key", such as X25519 and Ed25519.
+  [[GitHub #646]](https://github.com/ruby/openssl/pull/646)
+* Improve OpenSSL error messages to include additional information when
+  it is available in OpenSSL's error queue.
+  [[GitHub #648]](https://github.com/ruby/openssl/pull/648)
+* Change `OpenSSL::SSL::SSLContext#ca_file=` and `#ca_path=` to raise
+  `OpenSSL::SSL::SSLError` instead of printing a warning message.
+  [[GitHub #659]](https://github.com/ruby/openssl/pull/659)
+* Allow `OpenSSL::X509::ExtensionFactory#create_extension` to take OIDs in the
+  dotted-decimal notation.
+  [[GitHub #141]](https://github.com/ruby/openssl/pull/141)
+
+
+Version 3.1.1
+=============
+
+Merged changes in 3.0.3.
+
+
 Version 3.1.0
 =============
 
@@ -34,6 +162,31 @@ Notable changes
   LibreSSL 3.6 and Ed25519 support in LibreSSL 3.7.
 
 
+Version 3.0.3
+=============
+
+Bug fixes
+---------
+
+* Fix a performance regression introduced in v2.1.3 on a buffered write to
+  `SSLSocket`.
+  [[GitHub #706]](https://github.com/ruby/openssl/pull/706)
+* Fix `OpenSSL::PKCS7` to handle PKCS#7 structures without content.
+  [[GitHub #690]](https://github.com/ruby/openssl/pull/690)
+  [[GitHub #752]](https://github.com/ruby/openssl/pull/752)
+* Fix `OpenSSL::ASN1::ObjectId#==` with OIDs without a known name.
+  [[GitHub #791]](https://github.com/ruby/openssl/issues/791)
+  [[GitHub #792]](https://github.com/ruby/openssl/pull/792)
+* Fix `OpenSSL::X509::Certificate#crl_uris` to handle CDP with multiple CRL
+  URIs.
+  [[GitHub #775]](https://github.com/ruby/openssl/issues/775)
+  [[GitHub #776]](https://github.com/ruby/openssl/pull/776)
+* Fix `OpenSSL::Cipher#update` to always make the output buffer `String`
+  independent.
+  [[Bug #20937]](https://bugs.ruby-lang.org/issues/20937)
+  [[GitHub #824]](https://github.com/ruby/openssl/pull/824)
+
+
 Version 3.0.2
 =============
 
@@ -417,7 +570,7 @@ Security fixes
 Bug fixes
 ---------
 
-* Fixed OpenSSL::PKey::*.{new,generate} immediately aborting if the thread is
+* Fixed OpenSSL::PKey::\*.{new,generate} immediately aborting if the thread is
   interrupted.
   [[Bug #14882]](https://bugs.ruby-lang.org/issues/14882)
   [[GitHub #205]](https://github.com/ruby/openssl/pull/205)
diff --git a/ext/openssl/depend b/ext/openssl/depend
index 0d03c85b806e9d..435f4a1c68266e 100644
--- a/ext/openssl/depend
+++ b/ext/openssl/depend
@@ -142,6 +142,7 @@ ossl.o: $(hdrdir)/ruby/internal/intern/re.h
 ossl.o: $(hdrdir)/ruby/internal/intern/ruby.h
 ossl.o: $(hdrdir)/ruby/internal/intern/select.h
 ossl.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+ossl.o: $(hdrdir)/ruby/internal/intern/set.h
 ossl.o: $(hdrdir)/ruby/internal/intern/signal.h
 ossl.o: $(hdrdir)/ruby/internal/intern/sprintf.h
 ossl.o: $(hdrdir)/ruby/internal/intern/string.h
@@ -161,6 +162,7 @@ ossl.o: $(hdrdir)/ruby/internal/special_consts.h
 ossl.o: $(hdrdir)/ruby/internal/static_assert.h
 ossl.o: $(hdrdir)/ruby/internal/stdalign.h
 ossl.o: $(hdrdir)/ruby/internal/stdbool.h
+ossl.o: $(hdrdir)/ruby/internal/stdckdint.h
 ossl.o: $(hdrdir)/ruby/internal/symbol.h
 ossl.o: $(hdrdir)/ruby/internal/value.h
 ossl.o: $(hdrdir)/ruby/internal/value_type.h
@@ -171,6 +173,7 @@ ossl.o: $(hdrdir)/ruby/io.h
 ossl.o: $(hdrdir)/ruby/missing.h
 ossl.o: $(hdrdir)/ruby/onigmo.h
 ossl.o: $(hdrdir)/ruby/oniguruma.h
+ossl.o: $(hdrdir)/ruby/ractor.h
 ossl.o: $(hdrdir)/ruby/ruby.h
 ossl.o: $(hdrdir)/ruby/st.h
 ossl.o: $(hdrdir)/ruby/subst.h
@@ -336,6 +339,7 @@ ossl_asn1.o: $(hdrdir)/ruby/internal/intern/re.h
 ossl_asn1.o: $(hdrdir)/ruby/internal/intern/ruby.h
 ossl_asn1.o: $(hdrdir)/ruby/internal/intern/select.h
 ossl_asn1.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+ossl_asn1.o: $(hdrdir)/ruby/internal/intern/set.h
 ossl_asn1.o: $(hdrdir)/ruby/internal/intern/signal.h
 ossl_asn1.o: $(hdrdir)/ruby/internal/intern/sprintf.h
 ossl_asn1.o: $(hdrdir)/ruby/internal/intern/string.h
@@ -355,6 +359,7 @@ ossl_asn1.o: $(hdrdir)/ruby/internal/special_consts.h
 ossl_asn1.o: $(hdrdir)/ruby/internal/static_assert.h
 ossl_asn1.o: $(hdrdir)/ruby/internal/stdalign.h
 ossl_asn1.o: $(hdrdir)/ruby/internal/stdbool.h
+ossl_asn1.o: $(hdrdir)/ruby/internal/stdckdint.h
 ossl_asn1.o: $(hdrdir)/ruby/internal/symbol.h
 ossl_asn1.o: $(hdrdir)/ruby/internal/value.h
 ossl_asn1.o: $(hdrdir)/ruby/internal/value_type.h
@@ -365,6 +370,7 @@ ossl_asn1.o: $(hdrdir)/ruby/io.h
 ossl_asn1.o: $(hdrdir)/ruby/missing.h
 ossl_asn1.o: $(hdrdir)/ruby/onigmo.h
 ossl_asn1.o: $(hdrdir)/ruby/oniguruma.h
+ossl_asn1.o: $(hdrdir)/ruby/ractor.h
 ossl_asn1.o: $(hdrdir)/ruby/ruby.h
 ossl_asn1.o: $(hdrdir)/ruby/st.h
 ossl_asn1.o: $(hdrdir)/ruby/subst.h
@@ -530,6 +536,7 @@ ossl_bio.o: $(hdrdir)/ruby/internal/intern/re.h
 ossl_bio.o: $(hdrdir)/ruby/internal/intern/ruby.h
 ossl_bio.o: $(hdrdir)/ruby/internal/intern/select.h
 ossl_bio.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+ossl_bio.o: $(hdrdir)/ruby/internal/intern/set.h
 ossl_bio.o: $(hdrdir)/ruby/internal/intern/signal.h
 ossl_bio.o: $(hdrdir)/ruby/internal/intern/sprintf.h
 ossl_bio.o: $(hdrdir)/ruby/internal/intern/string.h
@@ -549,6 +556,7 @@ ossl_bio.o: $(hdrdir)/ruby/internal/special_consts.h
 ossl_bio.o: $(hdrdir)/ruby/internal/static_assert.h
 ossl_bio.o: $(hdrdir)/ruby/internal/stdalign.h
 ossl_bio.o: $(hdrdir)/ruby/internal/stdbool.h
+ossl_bio.o: $(hdrdir)/ruby/internal/stdckdint.h
 ossl_bio.o: $(hdrdir)/ruby/internal/symbol.h
 ossl_bio.o: $(hdrdir)/ruby/internal/value.h
 ossl_bio.o: $(hdrdir)/ruby/internal/value_type.h
@@ -559,6 +567,7 @@ ossl_bio.o: $(hdrdir)/ruby/io.h
 ossl_bio.o: $(hdrdir)/ruby/missing.h
 ossl_bio.o: $(hdrdir)/ruby/onigmo.h
 ossl_bio.o: $(hdrdir)/ruby/oniguruma.h
+ossl_bio.o: $(hdrdir)/ruby/ractor.h
 ossl_bio.o: $(hdrdir)/ruby/ruby.h
 ossl_bio.o: $(hdrdir)/ruby/st.h
 ossl_bio.o: $(hdrdir)/ruby/subst.h
@@ -724,6 +733,7 @@ ossl_bn.o: $(hdrdir)/ruby/internal/intern/re.h
 ossl_bn.o: $(hdrdir)/ruby/internal/intern/ruby.h
 ossl_bn.o: $(hdrdir)/ruby/internal/intern/select.h
 ossl_bn.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+ossl_bn.o: $(hdrdir)/ruby/internal/intern/set.h
 ossl_bn.o: $(hdrdir)/ruby/internal/intern/signal.h
 ossl_bn.o: $(hdrdir)/ruby/internal/intern/sprintf.h
 ossl_bn.o: $(hdrdir)/ruby/internal/intern/string.h
@@ -743,6 +753,7 @@ ossl_bn.o: $(hdrdir)/ruby/internal/special_consts.h
 ossl_bn.o: $(hdrdir)/ruby/internal/static_assert.h
 ossl_bn.o: $(hdrdir)/ruby/internal/stdalign.h
 ossl_bn.o: $(hdrdir)/ruby/internal/stdbool.h
+ossl_bn.o: $(hdrdir)/ruby/internal/stdckdint.h
 ossl_bn.o: $(hdrdir)/ruby/internal/symbol.h
 ossl_bn.o: $(hdrdir)/ruby/internal/value.h
 ossl_bn.o: $(hdrdir)/ruby/internal/value_type.h
@@ -919,6 +930,7 @@ ossl_cipher.o: $(hdrdir)/ruby/internal/intern/re.h
 ossl_cipher.o: $(hdrdir)/ruby/internal/intern/ruby.h
 ossl_cipher.o: $(hdrdir)/ruby/internal/intern/select.h
 ossl_cipher.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+ossl_cipher.o: $(hdrdir)/ruby/internal/intern/set.h
 ossl_cipher.o: $(hdrdir)/ruby/internal/intern/signal.h
 ossl_cipher.o: $(hdrdir)/ruby/internal/intern/sprintf.h
 ossl_cipher.o: $(hdrdir)/ruby/internal/intern/string.h
@@ -938,6 +950,7 @@ ossl_cipher.o: $(hdrdir)/ruby/internal/special_consts.h
 ossl_cipher.o: $(hdrdir)/ruby/internal/static_assert.h
 ossl_cipher.o: $(hdrdir)/ruby/internal/stdalign.h
 ossl_cipher.o: $(hdrdir)/ruby/internal/stdbool.h
+ossl_cipher.o: $(hdrdir)/ruby/internal/stdckdint.h
 ossl_cipher.o: $(hdrdir)/ruby/internal/symbol.h
 ossl_cipher.o: $(hdrdir)/ruby/internal/value.h
 ossl_cipher.o: $(hdrdir)/ruby/internal/value_type.h
@@ -948,6 +961,7 @@ ossl_cipher.o: $(hdrdir)/ruby/io.h
 ossl_cipher.o: $(hdrdir)/ruby/missing.h
 ossl_cipher.o: $(hdrdir)/ruby/onigmo.h
 ossl_cipher.o: $(hdrdir)/ruby/oniguruma.h
+ossl_cipher.o: $(hdrdir)/ruby/ractor.h
 ossl_cipher.o: $(hdrdir)/ruby/ruby.h
 ossl_cipher.o: $(hdrdir)/ruby/st.h
 ossl_cipher.o: $(hdrdir)/ruby/subst.h
@@ -1113,6 +1127,7 @@ ossl_config.o: $(hdrdir)/ruby/internal/intern/re.h
 ossl_config.o: $(hdrdir)/ruby/internal/intern/ruby.h
 ossl_config.o: $(hdrdir)/ruby/internal/intern/select.h
 ossl_config.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+ossl_config.o: $(hdrdir)/ruby/internal/intern/set.h
 ossl_config.o: $(hdrdir)/ruby/internal/intern/signal.h
 ossl_config.o: $(hdrdir)/ruby/internal/intern/sprintf.h
 ossl_config.o: $(hdrdir)/ruby/internal/intern/string.h
@@ -1132,6 +1147,7 @@ ossl_config.o: $(hdrdir)/ruby/internal/special_consts.h
 ossl_config.o: $(hdrdir)/ruby/internal/static_assert.h
 ossl_config.o: $(hdrdir)/ruby/internal/stdalign.h
 ossl_config.o: $(hdrdir)/ruby/internal/stdbool.h
+ossl_config.o: $(hdrdir)/ruby/internal/stdckdint.h
 ossl_config.o: $(hdrdir)/ruby/internal/symbol.h
 ossl_config.o: $(hdrdir)/ruby/internal/value.h
 ossl_config.o: $(hdrdir)/ruby/internal/value_type.h
@@ -1142,6 +1158,7 @@ ossl_config.o: $(hdrdir)/ruby/io.h
 ossl_config.o: $(hdrdir)/ruby/missing.h
 ossl_config.o: $(hdrdir)/ruby/onigmo.h
 ossl_config.o: $(hdrdir)/ruby/oniguruma.h
+ossl_config.o: $(hdrdir)/ruby/ractor.h
 ossl_config.o: $(hdrdir)/ruby/ruby.h
 ossl_config.o: $(hdrdir)/ruby/st.h
 ossl_config.o: $(hdrdir)/ruby/subst.h
@@ -1307,6 +1324,7 @@ ossl_digest.o: $(hdrdir)/ruby/internal/intern/re.h
 ossl_digest.o: $(hdrdir)/ruby/internal/intern/ruby.h
 ossl_digest.o: $(hdrdir)/ruby/internal/intern/select.h
 ossl_digest.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+ossl_digest.o: $(hdrdir)/ruby/internal/intern/set.h
 ossl_digest.o: $(hdrdir)/ruby/internal/intern/signal.h
 ossl_digest.o: $(hdrdir)/ruby/internal/intern/sprintf.h
 ossl_digest.o: $(hdrdir)/ruby/internal/intern/string.h
@@ -1326,6 +1344,7 @@ ossl_digest.o: $(hdrdir)/ruby/internal/special_consts.h
 ossl_digest.o: $(hdrdir)/ruby/internal/static_assert.h
 ossl_digest.o: $(hdrdir)/ruby/internal/stdalign.h
 ossl_digest.o: $(hdrdir)/ruby/internal/stdbool.h
+ossl_digest.o: $(hdrdir)/ruby/internal/stdckdint.h
 ossl_digest.o: $(hdrdir)/ruby/internal/symbol.h
 ossl_digest.o: $(hdrdir)/ruby/internal/value.h
 ossl_digest.o: $(hdrdir)/ruby/internal/value_type.h
@@ -1336,6 +1355,7 @@ ossl_digest.o: $(hdrdir)/ruby/io.h
 ossl_digest.o: $(hdrdir)/ruby/missing.h
 ossl_digest.o: $(hdrdir)/ruby/onigmo.h
 ossl_digest.o: $(hdrdir)/ruby/oniguruma.h
+ossl_digest.o: $(hdrdir)/ruby/ractor.h
 ossl_digest.o: $(hdrdir)/ruby/ruby.h
 ossl_digest.o: $(hdrdir)/ruby/st.h
 ossl_digest.o: $(hdrdir)/ruby/subst.h
@@ -1501,6 +1521,7 @@ ossl_engine.o: $(hdrdir)/ruby/internal/intern/re.h
 ossl_engine.o: $(hdrdir)/ruby/internal/intern/ruby.h
 ossl_engine.o: $(hdrdir)/ruby/internal/intern/select.h
 ossl_engine.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+ossl_engine.o: $(hdrdir)/ruby/internal/intern/set.h
 ossl_engine.o: $(hdrdir)/ruby/internal/intern/signal.h
 ossl_engine.o: $(hdrdir)/ruby/internal/intern/sprintf.h
 ossl_engine.o: $(hdrdir)/ruby/internal/intern/string.h
@@ -1520,6 +1541,7 @@ ossl_engine.o: $(hdrdir)/ruby/internal/special_consts.h
 ossl_engine.o: $(hdrdir)/ruby/internal/static_assert.h
 ossl_engine.o: $(hdrdir)/ruby/internal/stdalign.h
 ossl_engine.o: $(hdrdir)/ruby/internal/stdbool.h
+ossl_engine.o: $(hdrdir)/ruby/internal/stdckdint.h
 ossl_engine.o: $(hdrdir)/ruby/internal/symbol.h
 ossl_engine.o: $(hdrdir)/ruby/internal/value.h
 ossl_engine.o: $(hdrdir)/ruby/internal/value_type.h
@@ -1530,6 +1552,7 @@ ossl_engine.o: $(hdrdir)/ruby/io.h
 ossl_engine.o: $(hdrdir)/ruby/missing.h
 ossl_engine.o: $(hdrdir)/ruby/onigmo.h
 ossl_engine.o: $(hdrdir)/ruby/oniguruma.h
+ossl_engine.o: $(hdrdir)/ruby/ractor.h
 ossl_engine.o: $(hdrdir)/ruby/ruby.h
 ossl_engine.o: $(hdrdir)/ruby/st.h
 ossl_engine.o: $(hdrdir)/ruby/subst.h
@@ -1695,6 +1718,7 @@ ossl_hmac.o: $(hdrdir)/ruby/internal/intern/re.h
 ossl_hmac.o: $(hdrdir)/ruby/internal/intern/ruby.h
 ossl_hmac.o: $(hdrdir)/ruby/internal/intern/select.h
 ossl_hmac.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+ossl_hmac.o: $(hdrdir)/ruby/internal/intern/set.h
 ossl_hmac.o: $(hdrdir)/ruby/internal/intern/signal.h
 ossl_hmac.o: $(hdrdir)/ruby/internal/intern/sprintf.h
 ossl_hmac.o: $(hdrdir)/ruby/internal/intern/string.h
@@ -1714,6 +1738,7 @@ ossl_hmac.o: $(hdrdir)/ruby/internal/special_consts.h
 ossl_hmac.o: $(hdrdir)/ruby/internal/static_assert.h
 ossl_hmac.o: $(hdrdir)/ruby/internal/stdalign.h
 ossl_hmac.o: $(hdrdir)/ruby/internal/stdbool.h
+ossl_hmac.o: $(hdrdir)/ruby/internal/stdckdint.h
 ossl_hmac.o: $(hdrdir)/ruby/internal/symbol.h
 ossl_hmac.o: $(hdrdir)/ruby/internal/value.h
 ossl_hmac.o: $(hdrdir)/ruby/internal/value_type.h
@@ -1724,6 +1749,7 @@ ossl_hmac.o: $(hdrdir)/ruby/io.h
 ossl_hmac.o: $(hdrdir)/ruby/missing.h
 ossl_hmac.o: $(hdrdir)/ruby/onigmo.h
 ossl_hmac.o: $(hdrdir)/ruby/oniguruma.h
+ossl_hmac.o: $(hdrdir)/ruby/ractor.h
 ossl_hmac.o: $(hdrdir)/ruby/ruby.h
 ossl_hmac.o: $(hdrdir)/ruby/st.h
 ossl_hmac.o: $(hdrdir)/ruby/subst.h
@@ -1889,6 +1915,7 @@ ossl_kdf.o: $(hdrdir)/ruby/internal/intern/re.h
 ossl_kdf.o: $(hdrdir)/ruby/internal/intern/ruby.h
 ossl_kdf.o: $(hdrdir)/ruby/internal/intern/select.h
 ossl_kdf.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+ossl_kdf.o: $(hdrdir)/ruby/internal/intern/set.h
 ossl_kdf.o: $(hdrdir)/ruby/internal/intern/signal.h
 ossl_kdf.o: $(hdrdir)/ruby/internal/intern/sprintf.h
 ossl_kdf.o: $(hdrdir)/ruby/internal/intern/string.h
@@ -1908,6 +1935,7 @@ ossl_kdf.o: $(hdrdir)/ruby/internal/special_consts.h
 ossl_kdf.o: $(hdrdir)/ruby/internal/static_assert.h
 ossl_kdf.o: $(hdrdir)/ruby/internal/stdalign.h
 ossl_kdf.o: $(hdrdir)/ruby/internal/stdbool.h
+ossl_kdf.o: $(hdrdir)/ruby/internal/stdckdint.h
 ossl_kdf.o: $(hdrdir)/ruby/internal/symbol.h
 ossl_kdf.o: $(hdrdir)/ruby/internal/value.h
 ossl_kdf.o: $(hdrdir)/ruby/internal/value_type.h
@@ -1918,6 +1946,7 @@ ossl_kdf.o: $(hdrdir)/ruby/io.h
 ossl_kdf.o: $(hdrdir)/ruby/missing.h
 ossl_kdf.o: $(hdrdir)/ruby/onigmo.h
 ossl_kdf.o: $(hdrdir)/ruby/oniguruma.h
+ossl_kdf.o: $(hdrdir)/ruby/ractor.h
 ossl_kdf.o: $(hdrdir)/ruby/ruby.h
 ossl_kdf.o: $(hdrdir)/ruby/st.h
 ossl_kdf.o: $(hdrdir)/ruby/subst.h
@@ -2083,6 +2112,7 @@ ossl_ns_spki.o: $(hdrdir)/ruby/internal/intern/re.h
 ossl_ns_spki.o: $(hdrdir)/ruby/internal/intern/ruby.h
 ossl_ns_spki.o: $(hdrdir)/ruby/internal/intern/select.h
 ossl_ns_spki.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+ossl_ns_spki.o: $(hdrdir)/ruby/internal/intern/set.h
 ossl_ns_spki.o: $(hdrdir)/ruby/internal/intern/signal.h
 ossl_ns_spki.o: $(hdrdir)/ruby/internal/intern/sprintf.h
 ossl_ns_spki.o: $(hdrdir)/ruby/internal/intern/string.h
@@ -2102,6 +2132,7 @@ ossl_ns_spki.o: $(hdrdir)/ruby/internal/special_consts.h
 ossl_ns_spki.o: $(hdrdir)/ruby/internal/static_assert.h
 ossl_ns_spki.o: $(hdrdir)/ruby/internal/stdalign.h
 ossl_ns_spki.o: $(hdrdir)/ruby/internal/stdbool.h
+ossl_ns_spki.o: $(hdrdir)/ruby/internal/stdckdint.h
 ossl_ns_spki.o: $(hdrdir)/ruby/internal/symbol.h
 ossl_ns_spki.o: $(hdrdir)/ruby/internal/value.h
 ossl_ns_spki.o: $(hdrdir)/ruby/internal/value_type.h
@@ -2112,6 +2143,7 @@ ossl_ns_spki.o: $(hdrdir)/ruby/io.h
 ossl_ns_spki.o: $(hdrdir)/ruby/missing.h
 ossl_ns_spki.o: $(hdrdir)/ruby/onigmo.h
 ossl_ns_spki.o: $(hdrdir)/ruby/oniguruma.h
+ossl_ns_spki.o: $(hdrdir)/ruby/ractor.h
 ossl_ns_spki.o: $(hdrdir)/ruby/ruby.h
 ossl_ns_spki.o: $(hdrdir)/ruby/st.h
 ossl_ns_spki.o: $(hdrdir)/ruby/subst.h
@@ -2277,6 +2309,7 @@ ossl_ocsp.o: $(hdrdir)/ruby/internal/intern/re.h
 ossl_ocsp.o: $(hdrdir)/ruby/internal/intern/ruby.h
 ossl_ocsp.o: $(hdrdir)/ruby/internal/intern/select.h
 ossl_ocsp.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+ossl_ocsp.o: $(hdrdir)/ruby/internal/intern/set.h
 ossl_ocsp.o: $(hdrdir)/ruby/internal/intern/signal.h
 ossl_ocsp.o: $(hdrdir)/ruby/internal/intern/sprintf.h
 ossl_ocsp.o: $(hdrdir)/ruby/internal/intern/string.h
@@ -2296,6 +2329,7 @@ ossl_ocsp.o: $(hdrdir)/ruby/internal/special_consts.h
 ossl_ocsp.o: $(hdrdir)/ruby/internal/static_assert.h
 ossl_ocsp.o: $(hdrdir)/ruby/internal/stdalign.h
 ossl_ocsp.o: $(hdrdir)/ruby/internal/stdbool.h
+ossl_ocsp.o: $(hdrdir)/ruby/internal/stdckdint.h
 ossl_ocsp.o: $(hdrdir)/ruby/internal/symbol.h
 ossl_ocsp.o: $(hdrdir)/ruby/internal/value.h
 ossl_ocsp.o: $(hdrdir)/ruby/internal/value_type.h
@@ -2306,6 +2340,7 @@ ossl_ocsp.o: $(hdrdir)/ruby/io.h
 ossl_ocsp.o: $(hdrdir)/ruby/missing.h
 ossl_ocsp.o: $(hdrdir)/ruby/onigmo.h
 ossl_ocsp.o: $(hdrdir)/ruby/oniguruma.h
+ossl_ocsp.o: $(hdrdir)/ruby/ractor.h
 ossl_ocsp.o: $(hdrdir)/ruby/ruby.h
 ossl_ocsp.o: $(hdrdir)/ruby/st.h
 ossl_ocsp.o: $(hdrdir)/ruby/subst.h
@@ -2471,6 +2506,7 @@ ossl_pkcs12.o: $(hdrdir)/ruby/internal/intern/re.h
 ossl_pkcs12.o: $(hdrdir)/ruby/internal/intern/ruby.h
 ossl_pkcs12.o: $(hdrdir)/ruby/internal/intern/select.h
 ossl_pkcs12.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+ossl_pkcs12.o: $(hdrdir)/ruby/internal/intern/set.h
 ossl_pkcs12.o: $(hdrdir)/ruby/internal/intern/signal.h
 ossl_pkcs12.o: $(hdrdir)/ruby/internal/intern/sprintf.h
 ossl_pkcs12.o: $(hdrdir)/ruby/internal/intern/string.h
@@ -2490,6 +2526,7 @@ ossl_pkcs12.o: $(hdrdir)/ruby/internal/special_consts.h
 ossl_pkcs12.o: $(hdrdir)/ruby/internal/static_assert.h
 ossl_pkcs12.o: $(hdrdir)/ruby/internal/stdalign.h
 ossl_pkcs12.o: $(hdrdir)/ruby/internal/stdbool.h
+ossl_pkcs12.o: $(hdrdir)/ruby/internal/stdckdint.h
 ossl_pkcs12.o: $(hdrdir)/ruby/internal/symbol.h
 ossl_pkcs12.o: $(hdrdir)/ruby/internal/value.h
 ossl_pkcs12.o: $(hdrdir)/ruby/internal/value_type.h
@@ -2500,6 +2537,7 @@ ossl_pkcs12.o: $(hdrdir)/ruby/io.h
 ossl_pkcs12.o: $(hdrdir)/ruby/missing.h
 ossl_pkcs12.o: $(hdrdir)/ruby/onigmo.h
 ossl_pkcs12.o: $(hdrdir)/ruby/oniguruma.h
+ossl_pkcs12.o: $(hdrdir)/ruby/ractor.h
 ossl_pkcs12.o: $(hdrdir)/ruby/ruby.h
 ossl_pkcs12.o: $(hdrdir)/ruby/st.h
 ossl_pkcs12.o: $(hdrdir)/ruby/subst.h
@@ -2665,6 +2703,7 @@ ossl_pkcs7.o: $(hdrdir)/ruby/internal/intern/re.h
 ossl_pkcs7.o: $(hdrdir)/ruby/internal/intern/ruby.h
 ossl_pkcs7.o: $(hdrdir)/ruby/internal/intern/select.h
 ossl_pkcs7.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+ossl_pkcs7.o: $(hdrdir)/ruby/internal/intern/set.h
 ossl_pkcs7.o: $(hdrdir)/ruby/internal/intern/signal.h
 ossl_pkcs7.o: $(hdrdir)/ruby/internal/intern/sprintf.h
 ossl_pkcs7.o: $(hdrdir)/ruby/internal/intern/string.h
@@ -2684,6 +2723,7 @@ ossl_pkcs7.o: $(hdrdir)/ruby/internal/special_consts.h
 ossl_pkcs7.o: $(hdrdir)/ruby/internal/static_assert.h
 ossl_pkcs7.o: $(hdrdir)/ruby/internal/stdalign.h
 ossl_pkcs7.o: $(hdrdir)/ruby/internal/stdbool.h
+ossl_pkcs7.o: $(hdrdir)/ruby/internal/stdckdint.h
 ossl_pkcs7.o: $(hdrdir)/ruby/internal/symbol.h
 ossl_pkcs7.o: $(hdrdir)/ruby/internal/value.h
 ossl_pkcs7.o: $(hdrdir)/ruby/internal/value_type.h
@@ -2694,6 +2734,7 @@ ossl_pkcs7.o: $(hdrdir)/ruby/io.h
 ossl_pkcs7.o: $(hdrdir)/ruby/missing.h
 ossl_pkcs7.o: $(hdrdir)/ruby/onigmo.h
 ossl_pkcs7.o: $(hdrdir)/ruby/oniguruma.h
+ossl_pkcs7.o: $(hdrdir)/ruby/ractor.h
 ossl_pkcs7.o: $(hdrdir)/ruby/ruby.h
 ossl_pkcs7.o: $(hdrdir)/ruby/st.h
 ossl_pkcs7.o: $(hdrdir)/ruby/subst.h
@@ -2859,6 +2900,7 @@ ossl_pkey.o: $(hdrdir)/ruby/internal/intern/re.h
 ossl_pkey.o: $(hdrdir)/ruby/internal/intern/ruby.h
 ossl_pkey.o: $(hdrdir)/ruby/internal/intern/select.h
 ossl_pkey.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+ossl_pkey.o: $(hdrdir)/ruby/internal/intern/set.h
 ossl_pkey.o: $(hdrdir)/ruby/internal/intern/signal.h
 ossl_pkey.o: $(hdrdir)/ruby/internal/intern/sprintf.h
 ossl_pkey.o: $(hdrdir)/ruby/internal/intern/string.h
@@ -2878,6 +2920,7 @@ ossl_pkey.o: $(hdrdir)/ruby/internal/special_consts.h
 ossl_pkey.o: $(hdrdir)/ruby/internal/static_assert.h
 ossl_pkey.o: $(hdrdir)/ruby/internal/stdalign.h
 ossl_pkey.o: $(hdrdir)/ruby/internal/stdbool.h
+ossl_pkey.o: $(hdrdir)/ruby/internal/stdckdint.h
 ossl_pkey.o: $(hdrdir)/ruby/internal/symbol.h
 ossl_pkey.o: $(hdrdir)/ruby/internal/value.h
 ossl_pkey.o: $(hdrdir)/ruby/internal/value_type.h
@@ -2888,6 +2931,7 @@ ossl_pkey.o: $(hdrdir)/ruby/io.h
 ossl_pkey.o: $(hdrdir)/ruby/missing.h
 ossl_pkey.o: $(hdrdir)/ruby/onigmo.h
 ossl_pkey.o: $(hdrdir)/ruby/oniguruma.h
+ossl_pkey.o: $(hdrdir)/ruby/ractor.h
 ossl_pkey.o: $(hdrdir)/ruby/ruby.h
 ossl_pkey.o: $(hdrdir)/ruby/st.h
 ossl_pkey.o: $(hdrdir)/ruby/subst.h
@@ -3053,6 +3097,7 @@ ossl_pkey_dh.o: $(hdrdir)/ruby/internal/intern/re.h
 ossl_pkey_dh.o: $(hdrdir)/ruby/internal/intern/ruby.h
 ossl_pkey_dh.o: $(hdrdir)/ruby/internal/intern/select.h
 ossl_pkey_dh.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+ossl_pkey_dh.o: $(hdrdir)/ruby/internal/intern/set.h
 ossl_pkey_dh.o: $(hdrdir)/ruby/internal/intern/signal.h
 ossl_pkey_dh.o: $(hdrdir)/ruby/internal/intern/sprintf.h
 ossl_pkey_dh.o: $(hdrdir)/ruby/internal/intern/string.h
@@ -3072,6 +3117,7 @@ ossl_pkey_dh.o: $(hdrdir)/ruby/internal/special_consts.h
 ossl_pkey_dh.o: $(hdrdir)/ruby/internal/static_assert.h
 ossl_pkey_dh.o: $(hdrdir)/ruby/internal/stdalign.h
 ossl_pkey_dh.o: $(hdrdir)/ruby/internal/stdbool.h
+ossl_pkey_dh.o: $(hdrdir)/ruby/internal/stdckdint.h
 ossl_pkey_dh.o: $(hdrdir)/ruby/internal/symbol.h
 ossl_pkey_dh.o: $(hdrdir)/ruby/internal/value.h
 ossl_pkey_dh.o: $(hdrdir)/ruby/internal/value_type.h
@@ -3082,6 +3128,7 @@ ossl_pkey_dh.o: $(hdrdir)/ruby/io.h
 ossl_pkey_dh.o: $(hdrdir)/ruby/missing.h
 ossl_pkey_dh.o: $(hdrdir)/ruby/onigmo.h
 ossl_pkey_dh.o: $(hdrdir)/ruby/oniguruma.h
+ossl_pkey_dh.o: $(hdrdir)/ruby/ractor.h
 ossl_pkey_dh.o: $(hdrdir)/ruby/ruby.h
 ossl_pkey_dh.o: $(hdrdir)/ruby/st.h
 ossl_pkey_dh.o: $(hdrdir)/ruby/subst.h
@@ -3247,6 +3294,7 @@ ossl_pkey_dsa.o: $(hdrdir)/ruby/internal/intern/re.h
 ossl_pkey_dsa.o: $(hdrdir)/ruby/internal/intern/ruby.h
 ossl_pkey_dsa.o: $(hdrdir)/ruby/internal/intern/select.h
 ossl_pkey_dsa.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+ossl_pkey_dsa.o: $(hdrdir)/ruby/internal/intern/set.h
 ossl_pkey_dsa.o: $(hdrdir)/ruby/internal/intern/signal.h
 ossl_pkey_dsa.o: $(hdrdir)/ruby/internal/intern/sprintf.h
 ossl_pkey_dsa.o: $(hdrdir)/ruby/internal/intern/string.h
@@ -3266,6 +3314,7 @@ ossl_pkey_dsa.o: $(hdrdir)/ruby/internal/special_consts.h
 ossl_pkey_dsa.o: $(hdrdir)/ruby/internal/static_assert.h
 ossl_pkey_dsa.o: $(hdrdir)/ruby/internal/stdalign.h
 ossl_pkey_dsa.o: $(hdrdir)/ruby/internal/stdbool.h
+ossl_pkey_dsa.o: $(hdrdir)/ruby/internal/stdckdint.h
 ossl_pkey_dsa.o: $(hdrdir)/ruby/internal/symbol.h
 ossl_pkey_dsa.o: $(hdrdir)/ruby/internal/value.h
 ossl_pkey_dsa.o: $(hdrdir)/ruby/internal/value_type.h
@@ -3276,6 +3325,7 @@ ossl_pkey_dsa.o: $(hdrdir)/ruby/io.h
 ossl_pkey_dsa.o: $(hdrdir)/ruby/missing.h
 ossl_pkey_dsa.o: $(hdrdir)/ruby/onigmo.h
 ossl_pkey_dsa.o: $(hdrdir)/ruby/oniguruma.h
+ossl_pkey_dsa.o: $(hdrdir)/ruby/ractor.h
 ossl_pkey_dsa.o: $(hdrdir)/ruby/ruby.h
 ossl_pkey_dsa.o: $(hdrdir)/ruby/st.h
 ossl_pkey_dsa.o: $(hdrdir)/ruby/subst.h
@@ -3441,6 +3491,7 @@ ossl_pkey_ec.o: $(hdrdir)/ruby/internal/intern/re.h
 ossl_pkey_ec.o: $(hdrdir)/ruby/internal/intern/ruby.h
 ossl_pkey_ec.o: $(hdrdir)/ruby/internal/intern/select.h
 ossl_pkey_ec.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+ossl_pkey_ec.o: $(hdrdir)/ruby/internal/intern/set.h
 ossl_pkey_ec.o: $(hdrdir)/ruby/internal/intern/signal.h
 ossl_pkey_ec.o: $(hdrdir)/ruby/internal/intern/sprintf.h
 ossl_pkey_ec.o: $(hdrdir)/ruby/internal/intern/string.h
@@ -3460,6 +3511,7 @@ ossl_pkey_ec.o: $(hdrdir)/ruby/internal/special_consts.h
 ossl_pkey_ec.o: $(hdrdir)/ruby/internal/static_assert.h
 ossl_pkey_ec.o: $(hdrdir)/ruby/internal/stdalign.h
 ossl_pkey_ec.o: $(hdrdir)/ruby/internal/stdbool.h
+ossl_pkey_ec.o: $(hdrdir)/ruby/internal/stdckdint.h
 ossl_pkey_ec.o: $(hdrdir)/ruby/internal/symbol.h
 ossl_pkey_ec.o: $(hdrdir)/ruby/internal/value.h
 ossl_pkey_ec.o: $(hdrdir)/ruby/internal/value_type.h
@@ -3470,6 +3522,7 @@ ossl_pkey_ec.o: $(hdrdir)/ruby/io.h
 ossl_pkey_ec.o: $(hdrdir)/ruby/missing.h
 ossl_pkey_ec.o: $(hdrdir)/ruby/onigmo.h
 ossl_pkey_ec.o: $(hdrdir)/ruby/oniguruma.h
+ossl_pkey_ec.o: $(hdrdir)/ruby/ractor.h
 ossl_pkey_ec.o: $(hdrdir)/ruby/ruby.h
 ossl_pkey_ec.o: $(hdrdir)/ruby/st.h
 ossl_pkey_ec.o: $(hdrdir)/ruby/subst.h
@@ -3635,6 +3688,7 @@ ossl_pkey_rsa.o: $(hdrdir)/ruby/internal/intern/re.h
 ossl_pkey_rsa.o: $(hdrdir)/ruby/internal/intern/ruby.h
 ossl_pkey_rsa.o: $(hdrdir)/ruby/internal/intern/select.h
 ossl_pkey_rsa.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+ossl_pkey_rsa.o: $(hdrdir)/ruby/internal/intern/set.h
 ossl_pkey_rsa.o: $(hdrdir)/ruby/internal/intern/signal.h
 ossl_pkey_rsa.o: $(hdrdir)/ruby/internal/intern/sprintf.h
 ossl_pkey_rsa.o: $(hdrdir)/ruby/internal/intern/string.h
@@ -3654,6 +3708,7 @@ ossl_pkey_rsa.o: $(hdrdir)/ruby/internal/special_consts.h
 ossl_pkey_rsa.o: $(hdrdir)/ruby/internal/static_assert.h
 ossl_pkey_rsa.o: $(hdrdir)/ruby/internal/stdalign.h
 ossl_pkey_rsa.o: $(hdrdir)/ruby/internal/stdbool.h
+ossl_pkey_rsa.o: $(hdrdir)/ruby/internal/stdckdint.h
 ossl_pkey_rsa.o: $(hdrdir)/ruby/internal/symbol.h
 ossl_pkey_rsa.o: $(hdrdir)/ruby/internal/value.h
 ossl_pkey_rsa.o: $(hdrdir)/ruby/internal/value_type.h
@@ -3664,6 +3719,7 @@ ossl_pkey_rsa.o: $(hdrdir)/ruby/io.h
 ossl_pkey_rsa.o: $(hdrdir)/ruby/missing.h
 ossl_pkey_rsa.o: $(hdrdir)/ruby/onigmo.h
 ossl_pkey_rsa.o: $(hdrdir)/ruby/oniguruma.h
+ossl_pkey_rsa.o: $(hdrdir)/ruby/ractor.h
 ossl_pkey_rsa.o: $(hdrdir)/ruby/ruby.h
 ossl_pkey_rsa.o: $(hdrdir)/ruby/st.h
 ossl_pkey_rsa.o: $(hdrdir)/ruby/subst.h
@@ -3829,6 +3885,7 @@ ossl_provider.o: $(hdrdir)/ruby/internal/intern/re.h
 ossl_provider.o: $(hdrdir)/ruby/internal/intern/ruby.h
 ossl_provider.o: $(hdrdir)/ruby/internal/intern/select.h
 ossl_provider.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+ossl_provider.o: $(hdrdir)/ruby/internal/intern/set.h
 ossl_provider.o: $(hdrdir)/ruby/internal/intern/signal.h
 ossl_provider.o: $(hdrdir)/ruby/internal/intern/sprintf.h
 ossl_provider.o: $(hdrdir)/ruby/internal/intern/string.h
@@ -3848,6 +3905,7 @@ ossl_provider.o: $(hdrdir)/ruby/internal/special_consts.h
 ossl_provider.o: $(hdrdir)/ruby/internal/static_assert.h
 ossl_provider.o: $(hdrdir)/ruby/internal/stdalign.h
 ossl_provider.o: $(hdrdir)/ruby/internal/stdbool.h
+ossl_provider.o: $(hdrdir)/ruby/internal/stdckdint.h
 ossl_provider.o: $(hdrdir)/ruby/internal/symbol.h
 ossl_provider.o: $(hdrdir)/ruby/internal/value.h
 ossl_provider.o: $(hdrdir)/ruby/internal/value_type.h
@@ -3858,6 +3916,7 @@ ossl_provider.o: $(hdrdir)/ruby/io.h
 ossl_provider.o: $(hdrdir)/ruby/missing.h
 ossl_provider.o: $(hdrdir)/ruby/onigmo.h
 ossl_provider.o: $(hdrdir)/ruby/oniguruma.h
+ossl_provider.o: $(hdrdir)/ruby/ractor.h
 ossl_provider.o: $(hdrdir)/ruby/ruby.h
 ossl_provider.o: $(hdrdir)/ruby/st.h
 ossl_provider.o: $(hdrdir)/ruby/subst.h
@@ -4023,6 +4082,7 @@ ossl_rand.o: $(hdrdir)/ruby/internal/intern/re.h
 ossl_rand.o: $(hdrdir)/ruby/internal/intern/ruby.h
 ossl_rand.o: $(hdrdir)/ruby/internal/intern/select.h
 ossl_rand.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+ossl_rand.o: $(hdrdir)/ruby/internal/intern/set.h
 ossl_rand.o: $(hdrdir)/ruby/internal/intern/signal.h
 ossl_rand.o: $(hdrdir)/ruby/internal/intern/sprintf.h
 ossl_rand.o: $(hdrdir)/ruby/internal/intern/string.h
@@ -4042,6 +4102,7 @@ ossl_rand.o: $(hdrdir)/ruby/internal/special_consts.h
 ossl_rand.o: $(hdrdir)/ruby/internal/static_assert.h
 ossl_rand.o: $(hdrdir)/ruby/internal/stdalign.h
 ossl_rand.o: $(hdrdir)/ruby/internal/stdbool.h
+ossl_rand.o: $(hdrdir)/ruby/internal/stdckdint.h
 ossl_rand.o: $(hdrdir)/ruby/internal/symbol.h
 ossl_rand.o: $(hdrdir)/ruby/internal/value.h
 ossl_rand.o: $(hdrdir)/ruby/internal/value_type.h
@@ -4052,6 +4113,7 @@ ossl_rand.o: $(hdrdir)/ruby/io.h
 ossl_rand.o: $(hdrdir)/ruby/missing.h
 ossl_rand.o: $(hdrdir)/ruby/onigmo.h
 ossl_rand.o: $(hdrdir)/ruby/oniguruma.h
+ossl_rand.o: $(hdrdir)/ruby/ractor.h
 ossl_rand.o: $(hdrdir)/ruby/ruby.h
 ossl_rand.o: $(hdrdir)/ruby/st.h
 ossl_rand.o: $(hdrdir)/ruby/subst.h
@@ -4217,6 +4279,7 @@ ossl_ssl.o: $(hdrdir)/ruby/internal/intern/re.h
 ossl_ssl.o: $(hdrdir)/ruby/internal/intern/ruby.h
 ossl_ssl.o: $(hdrdir)/ruby/internal/intern/select.h
 ossl_ssl.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+ossl_ssl.o: $(hdrdir)/ruby/internal/intern/set.h
 ossl_ssl.o: $(hdrdir)/ruby/internal/intern/signal.h
 ossl_ssl.o: $(hdrdir)/ruby/internal/intern/sprintf.h
 ossl_ssl.o: $(hdrdir)/ruby/internal/intern/string.h
@@ -4236,6 +4299,7 @@ ossl_ssl.o: $(hdrdir)/ruby/internal/special_consts.h
 ossl_ssl.o: $(hdrdir)/ruby/internal/static_assert.h
 ossl_ssl.o: $(hdrdir)/ruby/internal/stdalign.h
 ossl_ssl.o: $(hdrdir)/ruby/internal/stdbool.h
+ossl_ssl.o: $(hdrdir)/ruby/internal/stdckdint.h
 ossl_ssl.o: $(hdrdir)/ruby/internal/symbol.h
 ossl_ssl.o: $(hdrdir)/ruby/internal/value.h
 ossl_ssl.o: $(hdrdir)/ruby/internal/value_type.h
@@ -4246,6 +4310,7 @@ ossl_ssl.o: $(hdrdir)/ruby/io.h
 ossl_ssl.o: $(hdrdir)/ruby/missing.h
 ossl_ssl.o: $(hdrdir)/ruby/onigmo.h
 ossl_ssl.o: $(hdrdir)/ruby/oniguruma.h
+ossl_ssl.o: $(hdrdir)/ruby/ractor.h
 ossl_ssl.o: $(hdrdir)/ruby/ruby.h
 ossl_ssl.o: $(hdrdir)/ruby/st.h
 ossl_ssl.o: $(hdrdir)/ruby/subst.h
@@ -4411,6 +4476,7 @@ ossl_ssl_session.o: $(hdrdir)/ruby/internal/intern/re.h
 ossl_ssl_session.o: $(hdrdir)/ruby/internal/intern/ruby.h
 ossl_ssl_session.o: $(hdrdir)/ruby/internal/intern/select.h
 ossl_ssl_session.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+ossl_ssl_session.o: $(hdrdir)/ruby/internal/intern/set.h
 ossl_ssl_session.o: $(hdrdir)/ruby/internal/intern/signal.h
 ossl_ssl_session.o: $(hdrdir)/ruby/internal/intern/sprintf.h
 ossl_ssl_session.o: $(hdrdir)/ruby/internal/intern/string.h
@@ -4430,6 +4496,7 @@ ossl_ssl_session.o: $(hdrdir)/ruby/internal/special_consts.h
 ossl_ssl_session.o: $(hdrdir)/ruby/internal/static_assert.h
 ossl_ssl_session.o: $(hdrdir)/ruby/internal/stdalign.h
 ossl_ssl_session.o: $(hdrdir)/ruby/internal/stdbool.h
+ossl_ssl_session.o: $(hdrdir)/ruby/internal/stdckdint.h
 ossl_ssl_session.o: $(hdrdir)/ruby/internal/symbol.h
 ossl_ssl_session.o: $(hdrdir)/ruby/internal/value.h
 ossl_ssl_session.o: $(hdrdir)/ruby/internal/value_type.h
@@ -4440,6 +4507,7 @@ ossl_ssl_session.o: $(hdrdir)/ruby/io.h
 ossl_ssl_session.o: $(hdrdir)/ruby/missing.h
 ossl_ssl_session.o: $(hdrdir)/ruby/onigmo.h
 ossl_ssl_session.o: $(hdrdir)/ruby/oniguruma.h
+ossl_ssl_session.o: $(hdrdir)/ruby/ractor.h
 ossl_ssl_session.o: $(hdrdir)/ruby/ruby.h
 ossl_ssl_session.o: $(hdrdir)/ruby/st.h
 ossl_ssl_session.o: $(hdrdir)/ruby/subst.h
@@ -4605,6 +4673,7 @@ ossl_ts.o: $(hdrdir)/ruby/internal/intern/re.h
 ossl_ts.o: $(hdrdir)/ruby/internal/intern/ruby.h
 ossl_ts.o: $(hdrdir)/ruby/internal/intern/select.h
 ossl_ts.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+ossl_ts.o: $(hdrdir)/ruby/internal/intern/set.h
 ossl_ts.o: $(hdrdir)/ruby/internal/intern/signal.h
 ossl_ts.o: $(hdrdir)/ruby/internal/intern/sprintf.h
 ossl_ts.o: $(hdrdir)/ruby/internal/intern/string.h
@@ -4624,6 +4693,7 @@ ossl_ts.o: $(hdrdir)/ruby/internal/special_consts.h
 ossl_ts.o: $(hdrdir)/ruby/internal/static_assert.h
 ossl_ts.o: $(hdrdir)/ruby/internal/stdalign.h
 ossl_ts.o: $(hdrdir)/ruby/internal/stdbool.h
+ossl_ts.o: $(hdrdir)/ruby/internal/stdckdint.h
 ossl_ts.o: $(hdrdir)/ruby/internal/symbol.h
 ossl_ts.o: $(hdrdir)/ruby/internal/value.h
 ossl_ts.o: $(hdrdir)/ruby/internal/value_type.h
@@ -4634,6 +4704,7 @@ 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/ractor.h
 ossl_ts.o: $(hdrdir)/ruby/ruby.h
 ossl_ts.o: $(hdrdir)/ruby/st.h
 ossl_ts.o: $(hdrdir)/ruby/subst.h
@@ -4799,6 +4870,7 @@ ossl_x509.o: $(hdrdir)/ruby/internal/intern/re.h
 ossl_x509.o: $(hdrdir)/ruby/internal/intern/ruby.h
 ossl_x509.o: $(hdrdir)/ruby/internal/intern/select.h
 ossl_x509.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+ossl_x509.o: $(hdrdir)/ruby/internal/intern/set.h
 ossl_x509.o: $(hdrdir)/ruby/internal/intern/signal.h
 ossl_x509.o: $(hdrdir)/ruby/internal/intern/sprintf.h
 ossl_x509.o: $(hdrdir)/ruby/internal/intern/string.h
@@ -4818,6 +4890,7 @@ ossl_x509.o: $(hdrdir)/ruby/internal/special_consts.h
 ossl_x509.o: $(hdrdir)/ruby/internal/static_assert.h
 ossl_x509.o: $(hdrdir)/ruby/internal/stdalign.h
 ossl_x509.o: $(hdrdir)/ruby/internal/stdbool.h
+ossl_x509.o: $(hdrdir)/ruby/internal/stdckdint.h
 ossl_x509.o: $(hdrdir)/ruby/internal/symbol.h
 ossl_x509.o: $(hdrdir)/ruby/internal/value.h
 ossl_x509.o: $(hdrdir)/ruby/internal/value_type.h
@@ -4828,6 +4901,7 @@ ossl_x509.o: $(hdrdir)/ruby/io.h
 ossl_x509.o: $(hdrdir)/ruby/missing.h
 ossl_x509.o: $(hdrdir)/ruby/onigmo.h
 ossl_x509.o: $(hdrdir)/ruby/oniguruma.h
+ossl_x509.o: $(hdrdir)/ruby/ractor.h
 ossl_x509.o: $(hdrdir)/ruby/ruby.h
 ossl_x509.o: $(hdrdir)/ruby/st.h
 ossl_x509.o: $(hdrdir)/ruby/subst.h
@@ -4993,6 +5067,7 @@ ossl_x509attr.o: $(hdrdir)/ruby/internal/intern/re.h
 ossl_x509attr.o: $(hdrdir)/ruby/internal/intern/ruby.h
 ossl_x509attr.o: $(hdrdir)/ruby/internal/intern/select.h
 ossl_x509attr.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+ossl_x509attr.o: $(hdrdir)/ruby/internal/intern/set.h
 ossl_x509attr.o: $(hdrdir)/ruby/internal/intern/signal.h
 ossl_x509attr.o: $(hdrdir)/ruby/internal/intern/sprintf.h
 ossl_x509attr.o: $(hdrdir)/ruby/internal/intern/string.h
@@ -5012,6 +5087,7 @@ ossl_x509attr.o: $(hdrdir)/ruby/internal/special_consts.h
 ossl_x509attr.o: $(hdrdir)/ruby/internal/static_assert.h
 ossl_x509attr.o: $(hdrdir)/ruby/internal/stdalign.h
 ossl_x509attr.o: $(hdrdir)/ruby/internal/stdbool.h
+ossl_x509attr.o: $(hdrdir)/ruby/internal/stdckdint.h
 ossl_x509attr.o: $(hdrdir)/ruby/internal/symbol.h
 ossl_x509attr.o: $(hdrdir)/ruby/internal/value.h
 ossl_x509attr.o: $(hdrdir)/ruby/internal/value_type.h
@@ -5022,6 +5098,7 @@ ossl_x509attr.o: $(hdrdir)/ruby/io.h
 ossl_x509attr.o: $(hdrdir)/ruby/missing.h
 ossl_x509attr.o: $(hdrdir)/ruby/onigmo.h
 ossl_x509attr.o: $(hdrdir)/ruby/oniguruma.h
+ossl_x509attr.o: $(hdrdir)/ruby/ractor.h
 ossl_x509attr.o: $(hdrdir)/ruby/ruby.h
 ossl_x509attr.o: $(hdrdir)/ruby/st.h
 ossl_x509attr.o: $(hdrdir)/ruby/subst.h
@@ -5187,6 +5264,7 @@ ossl_x509cert.o: $(hdrdir)/ruby/internal/intern/re.h
 ossl_x509cert.o: $(hdrdir)/ruby/internal/intern/ruby.h
 ossl_x509cert.o: $(hdrdir)/ruby/internal/intern/select.h
 ossl_x509cert.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+ossl_x509cert.o: $(hdrdir)/ruby/internal/intern/set.h
 ossl_x509cert.o: $(hdrdir)/ruby/internal/intern/signal.h
 ossl_x509cert.o: $(hdrdir)/ruby/internal/intern/sprintf.h
 ossl_x509cert.o: $(hdrdir)/ruby/internal/intern/string.h
@@ -5206,6 +5284,7 @@ ossl_x509cert.o: $(hdrdir)/ruby/internal/special_consts.h
 ossl_x509cert.o: $(hdrdir)/ruby/internal/static_assert.h
 ossl_x509cert.o: $(hdrdir)/ruby/internal/stdalign.h
 ossl_x509cert.o: $(hdrdir)/ruby/internal/stdbool.h
+ossl_x509cert.o: $(hdrdir)/ruby/internal/stdckdint.h
 ossl_x509cert.o: $(hdrdir)/ruby/internal/symbol.h
 ossl_x509cert.o: $(hdrdir)/ruby/internal/value.h
 ossl_x509cert.o: $(hdrdir)/ruby/internal/value_type.h
@@ -5216,6 +5295,7 @@ ossl_x509cert.o: $(hdrdir)/ruby/io.h
 ossl_x509cert.o: $(hdrdir)/ruby/missing.h
 ossl_x509cert.o: $(hdrdir)/ruby/onigmo.h
 ossl_x509cert.o: $(hdrdir)/ruby/oniguruma.h
+ossl_x509cert.o: $(hdrdir)/ruby/ractor.h
 ossl_x509cert.o: $(hdrdir)/ruby/ruby.h
 ossl_x509cert.o: $(hdrdir)/ruby/st.h
 ossl_x509cert.o: $(hdrdir)/ruby/subst.h
@@ -5381,6 +5461,7 @@ ossl_x509crl.o: $(hdrdir)/ruby/internal/intern/re.h
 ossl_x509crl.o: $(hdrdir)/ruby/internal/intern/ruby.h
 ossl_x509crl.o: $(hdrdir)/ruby/internal/intern/select.h
 ossl_x509crl.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+ossl_x509crl.o: $(hdrdir)/ruby/internal/intern/set.h
 ossl_x509crl.o: $(hdrdir)/ruby/internal/intern/signal.h
 ossl_x509crl.o: $(hdrdir)/ruby/internal/intern/sprintf.h
 ossl_x509crl.o: $(hdrdir)/ruby/internal/intern/string.h
@@ -5400,6 +5481,7 @@ ossl_x509crl.o: $(hdrdir)/ruby/internal/special_consts.h
 ossl_x509crl.o: $(hdrdir)/ruby/internal/static_assert.h
 ossl_x509crl.o: $(hdrdir)/ruby/internal/stdalign.h
 ossl_x509crl.o: $(hdrdir)/ruby/internal/stdbool.h
+ossl_x509crl.o: $(hdrdir)/ruby/internal/stdckdint.h
 ossl_x509crl.o: $(hdrdir)/ruby/internal/symbol.h
 ossl_x509crl.o: $(hdrdir)/ruby/internal/value.h
 ossl_x509crl.o: $(hdrdir)/ruby/internal/value_type.h
@@ -5410,6 +5492,7 @@ ossl_x509crl.o: $(hdrdir)/ruby/io.h
 ossl_x509crl.o: $(hdrdir)/ruby/missing.h
 ossl_x509crl.o: $(hdrdir)/ruby/onigmo.h
 ossl_x509crl.o: $(hdrdir)/ruby/oniguruma.h
+ossl_x509crl.o: $(hdrdir)/ruby/ractor.h
 ossl_x509crl.o: $(hdrdir)/ruby/ruby.h
 ossl_x509crl.o: $(hdrdir)/ruby/st.h
 ossl_x509crl.o: $(hdrdir)/ruby/subst.h
@@ -5575,6 +5658,7 @@ ossl_x509ext.o: $(hdrdir)/ruby/internal/intern/re.h
 ossl_x509ext.o: $(hdrdir)/ruby/internal/intern/ruby.h
 ossl_x509ext.o: $(hdrdir)/ruby/internal/intern/select.h
 ossl_x509ext.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+ossl_x509ext.o: $(hdrdir)/ruby/internal/intern/set.h
 ossl_x509ext.o: $(hdrdir)/ruby/internal/intern/signal.h
 ossl_x509ext.o: $(hdrdir)/ruby/internal/intern/sprintf.h
 ossl_x509ext.o: $(hdrdir)/ruby/internal/intern/string.h
@@ -5594,6 +5678,7 @@ ossl_x509ext.o: $(hdrdir)/ruby/internal/special_consts.h
 ossl_x509ext.o: $(hdrdir)/ruby/internal/static_assert.h
 ossl_x509ext.o: $(hdrdir)/ruby/internal/stdalign.h
 ossl_x509ext.o: $(hdrdir)/ruby/internal/stdbool.h
+ossl_x509ext.o: $(hdrdir)/ruby/internal/stdckdint.h
 ossl_x509ext.o: $(hdrdir)/ruby/internal/symbol.h
 ossl_x509ext.o: $(hdrdir)/ruby/internal/value.h
 ossl_x509ext.o: $(hdrdir)/ruby/internal/value_type.h
@@ -5604,6 +5689,7 @@ ossl_x509ext.o: $(hdrdir)/ruby/io.h
 ossl_x509ext.o: $(hdrdir)/ruby/missing.h
 ossl_x509ext.o: $(hdrdir)/ruby/onigmo.h
 ossl_x509ext.o: $(hdrdir)/ruby/oniguruma.h
+ossl_x509ext.o: $(hdrdir)/ruby/ractor.h
 ossl_x509ext.o: $(hdrdir)/ruby/ruby.h
 ossl_x509ext.o: $(hdrdir)/ruby/st.h
 ossl_x509ext.o: $(hdrdir)/ruby/subst.h
@@ -5769,6 +5855,7 @@ ossl_x509name.o: $(hdrdir)/ruby/internal/intern/re.h
 ossl_x509name.o: $(hdrdir)/ruby/internal/intern/ruby.h
 ossl_x509name.o: $(hdrdir)/ruby/internal/intern/select.h
 ossl_x509name.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+ossl_x509name.o: $(hdrdir)/ruby/internal/intern/set.h
 ossl_x509name.o: $(hdrdir)/ruby/internal/intern/signal.h
 ossl_x509name.o: $(hdrdir)/ruby/internal/intern/sprintf.h
 ossl_x509name.o: $(hdrdir)/ruby/internal/intern/string.h
@@ -5788,6 +5875,7 @@ ossl_x509name.o: $(hdrdir)/ruby/internal/special_consts.h
 ossl_x509name.o: $(hdrdir)/ruby/internal/static_assert.h
 ossl_x509name.o: $(hdrdir)/ruby/internal/stdalign.h
 ossl_x509name.o: $(hdrdir)/ruby/internal/stdbool.h
+ossl_x509name.o: $(hdrdir)/ruby/internal/stdckdint.h
 ossl_x509name.o: $(hdrdir)/ruby/internal/symbol.h
 ossl_x509name.o: $(hdrdir)/ruby/internal/value.h
 ossl_x509name.o: $(hdrdir)/ruby/internal/value_type.h
@@ -5798,6 +5886,7 @@ ossl_x509name.o: $(hdrdir)/ruby/io.h
 ossl_x509name.o: $(hdrdir)/ruby/missing.h
 ossl_x509name.o: $(hdrdir)/ruby/onigmo.h
 ossl_x509name.o: $(hdrdir)/ruby/oniguruma.h
+ossl_x509name.o: $(hdrdir)/ruby/ractor.h
 ossl_x509name.o: $(hdrdir)/ruby/ruby.h
 ossl_x509name.o: $(hdrdir)/ruby/st.h
 ossl_x509name.o: $(hdrdir)/ruby/subst.h
@@ -5963,6 +6052,7 @@ ossl_x509req.o: $(hdrdir)/ruby/internal/intern/re.h
 ossl_x509req.o: $(hdrdir)/ruby/internal/intern/ruby.h
 ossl_x509req.o: $(hdrdir)/ruby/internal/intern/select.h
 ossl_x509req.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+ossl_x509req.o: $(hdrdir)/ruby/internal/intern/set.h
 ossl_x509req.o: $(hdrdir)/ruby/internal/intern/signal.h
 ossl_x509req.o: $(hdrdir)/ruby/internal/intern/sprintf.h
 ossl_x509req.o: $(hdrdir)/ruby/internal/intern/string.h
@@ -5982,6 +6072,7 @@ ossl_x509req.o: $(hdrdir)/ruby/internal/special_consts.h
 ossl_x509req.o: $(hdrdir)/ruby/internal/static_assert.h
 ossl_x509req.o: $(hdrdir)/ruby/internal/stdalign.h
 ossl_x509req.o: $(hdrdir)/ruby/internal/stdbool.h
+ossl_x509req.o: $(hdrdir)/ruby/internal/stdckdint.h
 ossl_x509req.o: $(hdrdir)/ruby/internal/symbol.h
 ossl_x509req.o: $(hdrdir)/ruby/internal/value.h
 ossl_x509req.o: $(hdrdir)/ruby/internal/value_type.h
@@ -5992,6 +6083,7 @@ ossl_x509req.o: $(hdrdir)/ruby/io.h
 ossl_x509req.o: $(hdrdir)/ruby/missing.h
 ossl_x509req.o: $(hdrdir)/ruby/onigmo.h
 ossl_x509req.o: $(hdrdir)/ruby/oniguruma.h
+ossl_x509req.o: $(hdrdir)/ruby/ractor.h
 ossl_x509req.o: $(hdrdir)/ruby/ruby.h
 ossl_x509req.o: $(hdrdir)/ruby/st.h
 ossl_x509req.o: $(hdrdir)/ruby/subst.h
@@ -6157,6 +6249,7 @@ ossl_x509revoked.o: $(hdrdir)/ruby/internal/intern/re.h
 ossl_x509revoked.o: $(hdrdir)/ruby/internal/intern/ruby.h
 ossl_x509revoked.o: $(hdrdir)/ruby/internal/intern/select.h
 ossl_x509revoked.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+ossl_x509revoked.o: $(hdrdir)/ruby/internal/intern/set.h
 ossl_x509revoked.o: $(hdrdir)/ruby/internal/intern/signal.h
 ossl_x509revoked.o: $(hdrdir)/ruby/internal/intern/sprintf.h
 ossl_x509revoked.o: $(hdrdir)/ruby/internal/intern/string.h
@@ -6176,6 +6269,7 @@ ossl_x509revoked.o: $(hdrdir)/ruby/internal/special_consts.h
 ossl_x509revoked.o: $(hdrdir)/ruby/internal/static_assert.h
 ossl_x509revoked.o: $(hdrdir)/ruby/internal/stdalign.h
 ossl_x509revoked.o: $(hdrdir)/ruby/internal/stdbool.h
+ossl_x509revoked.o: $(hdrdir)/ruby/internal/stdckdint.h
 ossl_x509revoked.o: $(hdrdir)/ruby/internal/symbol.h
 ossl_x509revoked.o: $(hdrdir)/ruby/internal/value.h
 ossl_x509revoked.o: $(hdrdir)/ruby/internal/value_type.h
@@ -6186,6 +6280,7 @@ ossl_x509revoked.o: $(hdrdir)/ruby/io.h
 ossl_x509revoked.o: $(hdrdir)/ruby/missing.h
 ossl_x509revoked.o: $(hdrdir)/ruby/onigmo.h
 ossl_x509revoked.o: $(hdrdir)/ruby/oniguruma.h
+ossl_x509revoked.o: $(hdrdir)/ruby/ractor.h
 ossl_x509revoked.o: $(hdrdir)/ruby/ruby.h
 ossl_x509revoked.o: $(hdrdir)/ruby/st.h
 ossl_x509revoked.o: $(hdrdir)/ruby/subst.h
@@ -6351,6 +6446,7 @@ ossl_x509store.o: $(hdrdir)/ruby/internal/intern/re.h
 ossl_x509store.o: $(hdrdir)/ruby/internal/intern/ruby.h
 ossl_x509store.o: $(hdrdir)/ruby/internal/intern/select.h
 ossl_x509store.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+ossl_x509store.o: $(hdrdir)/ruby/internal/intern/set.h
 ossl_x509store.o: $(hdrdir)/ruby/internal/intern/signal.h
 ossl_x509store.o: $(hdrdir)/ruby/internal/intern/sprintf.h
 ossl_x509store.o: $(hdrdir)/ruby/internal/intern/string.h
@@ -6370,6 +6466,7 @@ ossl_x509store.o: $(hdrdir)/ruby/internal/special_consts.h
 ossl_x509store.o: $(hdrdir)/ruby/internal/static_assert.h
 ossl_x509store.o: $(hdrdir)/ruby/internal/stdalign.h
 ossl_x509store.o: $(hdrdir)/ruby/internal/stdbool.h
+ossl_x509store.o: $(hdrdir)/ruby/internal/stdckdint.h
 ossl_x509store.o: $(hdrdir)/ruby/internal/symbol.h
 ossl_x509store.o: $(hdrdir)/ruby/internal/value.h
 ossl_x509store.o: $(hdrdir)/ruby/internal/value_type.h
@@ -6380,6 +6477,7 @@ ossl_x509store.o: $(hdrdir)/ruby/io.h
 ossl_x509store.o: $(hdrdir)/ruby/missing.h
 ossl_x509store.o: $(hdrdir)/ruby/onigmo.h
 ossl_x509store.o: $(hdrdir)/ruby/oniguruma.h
+ossl_x509store.o: $(hdrdir)/ruby/ractor.h
 ossl_x509store.o: $(hdrdir)/ruby/ruby.h
 ossl_x509store.o: $(hdrdir)/ruby/st.h
 ossl_x509store.o: $(hdrdir)/ruby/subst.h
diff --git a/ext/openssl/extconf.rb b/ext/openssl/extconf.rb
index 56f4a1c3ab0ea6..afbed10b54bd06 100644
--- a/ext/openssl/extconf.rb
+++ b/ext/openssl/extconf.rb
@@ -8,19 +8,12 @@
 
 = Licence
   This program is licensed under the same licence as Ruby.
-  (See the file 'LICENCE'.)
+  (See the file 'COPYING'.)
 =end
 
 require "mkmf"
 
-ssl_dirs = nil
-if defined?(::TruffleRuby)
-  # Always respect the openssl prefix chosen by truffle/openssl-prefix
-  require 'truffle/openssl-prefix'
-  ssl_dirs = dir_config("openssl", ENV["OPENSSL_PREFIX"])
-else
-  ssl_dirs = dir_config("openssl")
-end
+ssl_dirs = dir_config("openssl")
 dir_config_given = ssl_dirs.any?
 
 _, ssl_ldir = ssl_dirs
@@ -41,14 +34,13 @@
     "library directories."
 end
 
-dir_config("kerberos")
-
 Logging::message "=== OpenSSL for Ruby configurator ===\n"
 
 $defs.push("-D""OPENSSL_SUPPRESS_DEPRECATED")
 
-have_func("rb_io_descriptor")
+have_func("rb_io_descriptor", "ruby/io.h")
 have_func("rb_io_maybe_wait(0, Qnil, Qnil, Qnil)", "ruby/io.h") # Ruby 3.1
+have_func("rb_io_timeout", "ruby/io.h")
 
 Logging::message "=== Checking for system dependent stuff... ===\n"
 have_library("nsl", "t_open")
@@ -66,7 +58,6 @@
 def find_openssl_library
   if $mswin || $mingw
     # required for static OpenSSL libraries
-    have_library("gdi32") # OpenSSL <= 1.0.2 (for RAND_screen())
     have_library("crypt32")
   end
 
@@ -83,12 +74,6 @@ def find_openssl_library
       return true
     end
 
-    # OpenSSL <= 1.0.2: libeay32.lib and ssleay32.lib.
-    if have_library("libeay32", "CRYPTO_malloc") &&
-        have_library("ssleay32", "SSL_new")
-      return true
-    end
-
     # LibreSSL: libcrypto-##.lib and libssl-##.lib, where ## is the ABI version
     # number. We have to find the version number out by scanning libpath.
     libpath = $LIBPATH.dup
@@ -126,14 +111,15 @@ def find_openssl_library
 
 version_ok = if have_macro("LIBRESSL_VERSION_NUMBER", "openssl/opensslv.h")
   is_libressl = true
-  checking_for("LibreSSL version >= 3.1.0") {
-    try_static_assert("LIBRESSL_VERSION_NUMBER >= 0x30100000L", "openssl/opensslv.h") }
+  checking_for("LibreSSL version >= 3.9.0") {
+    try_static_assert("LIBRESSL_VERSION_NUMBER >= 0x30900000L", "openssl/opensslv.h") }
 else
-  checking_for("OpenSSL version >= 1.0.2") {
-    try_static_assert("OPENSSL_VERSION_NUMBER >= 0x10002000L", "openssl/opensslv.h") }
+  is_openssl = true
+  checking_for("OpenSSL version >= 1.1.1") {
+    try_static_assert("OPENSSL_VERSION_NUMBER >= 0x10101000L", "openssl/opensslv.h") }
 end
 unless version_ok
-  raise "OpenSSL >= 1.0.2 or LibreSSL >= 3.1.0 is required"
+  raise "OpenSSL >= 1.1.1 or LibreSSL >= 3.9.0 is required"
 end
 
 # Prevent wincrypt.h from being included, which defines conflicting macro with openssl/x509.h
@@ -143,66 +129,26 @@ def find_openssl_library
 
 Logging::message "=== Checking for OpenSSL features... ===\n"
 evp_h = "openssl/evp.h".freeze
-x509_h = "openssl/x509.h".freeze
 ts_h = "openssl/ts.h".freeze
 ssl_h = "openssl/ssl.h".freeze
 
 # compile options
 have_func("RAND_egd()", "openssl/rand.h")
-engines = %w{dynamic 4758cca aep atalla chil
-             cswift nuron sureware ubsec padlock capi gmp gost cryptodev}
-engines.each { |name|
-  have_func("ENGINE_load_#{name}()", "openssl/engine.h")
-}
-
-# added in 1.1.0
-if !have_struct_member("SSL", "ctx", "openssl/ssl.h") || is_libressl
-  $defs.push("-DHAVE_OPAQUE_OPENSSL")
-end
-have_func("EVP_MD_CTX_new()", evp_h)
-have_func("EVP_MD_CTX_free(NULL)", evp_h)
-have_func("EVP_MD_CTX_pkey_ctx(NULL)", evp_h)
-have_func("X509_STORE_get_ex_data(NULL, 0)", x509_h)
-have_func("X509_STORE_set_ex_data(NULL, 0, NULL)", x509_h)
-have_func("X509_STORE_get_ex_new_index(0, NULL, NULL, NULL, NULL)", x509_h)
-have_func("X509_CRL_get0_signature(NULL, NULL, NULL)", x509_h)
-have_func("X509_REQ_get0_signature(NULL, NULL, NULL)", x509_h)
-have_func("X509_REVOKED_get0_serialNumber(NULL)", x509_h)
-have_func("X509_REVOKED_get0_revocationDate(NULL)", x509_h)
-have_func("X509_get0_tbs_sigalg(NULL)", x509_h)
-have_func("X509_STORE_CTX_get0_untrusted(NULL)", x509_h)
-have_func("X509_STORE_CTX_get0_cert(NULL)", x509_h)
-have_func("X509_STORE_CTX_get0_chain(NULL)", x509_h)
-have_func("OCSP_SINGLERESP_get0_id(NULL)", "openssl/ocsp.h")
-have_func("SSL_CTX_get_ciphers(NULL)", ssl_h)
-have_func("X509_up_ref(NULL)", x509_h)
-have_func("X509_CRL_up_ref(NULL)", x509_h)
-have_func("X509_STORE_up_ref(NULL)", x509_h)
-have_func("SSL_SESSION_up_ref(NULL)", ssl_h)
-have_func("EVP_PKEY_up_ref(NULL)", evp_h)
-have_func("SSL_CTX_set_min_proto_version(NULL, 0)", ssl_h)
-have_func("SSL_CTX_get_security_level(NULL)", ssl_h)
-have_func("X509_get0_notBefore(NULL)", x509_h)
-have_func("SSL_SESSION_get_protocol_version(NULL)", ssl_h)
-have_func("TS_STATUS_INFO_get0_status(NULL)", ts_h)
-have_func("TS_STATUS_INFO_get0_text(NULL)", ts_h)
-have_func("TS_STATUS_INFO_get0_failure_info(NULL)", ts_h)
-have_func("TS_VERIFY_CTS_set_certs(NULL, NULL)", ts_h)
-have_func("TS_VERIFY_CTX_set_store(NULL, NULL)", ts_h)
-have_func("TS_VERIFY_CTX_add_flags(NULL, 0)", ts_h)
-have_func("TS_RESP_CTX_set_time_cb(NULL, NULL, NULL)", ts_h)
+
+# added in OpenSSL 1.0.2, not in LibreSSL yet
+have_func("SSL_CTX_set1_sigalgs_list(NULL, NULL)", ssl_h)
+# added in OpenSSL 1.0.2, not in LibreSSL or AWS-LC yet
+have_func("SSL_CTX_set1_client_sigalgs_list(NULL, NULL)", ssl_h)
+
+# added in 1.1.0, currently not in LibreSSL
 have_func("EVP_PBE_scrypt(\"\", 0, (unsigned char *)\"\", 0, 0, 0, 0, 0, NULL, 0)", evp_h)
-have_func("SSL_CTX_set_post_handshake_auth(NULL, 0)", ssl_h)
 
-# added in 1.1.1
+# added in OpenSSL 1.1.1 and LibreSSL 3.5.0, then removed in LibreSSL 4.0.0
 have_func("EVP_PKEY_check(NULL)", evp_h)
-have_func("EVP_PKEY_new_raw_private_key(0, NULL, (unsigned char *)\"\", 0)", evp_h)
-have_func("SSL_CTX_set_ciphersuites(NULL, \"\")", ssl_h)
 
 # added in 3.0.0
 have_func("SSL_set0_tmp_dh_pkey(NULL, NULL)", ssl_h)
 have_func("ERR_get_error_all(NULL, NULL, NULL, NULL, NULL)", "openssl/err.h")
-have_func("TS_VERIFY_CTX_set_certs(NULL, NULL)", ts_h)
 have_func("SSL_CTX_load_verify_file(NULL, \"\")", ssl_h)
 have_func("BN_check_prime(NULL, NULL, NULL)", "openssl/bn.h")
 have_func("EVP_MD_CTX_get0_md(NULL)", evp_h)
@@ -210,6 +156,9 @@ def find_openssl_library
 have_func("EVP_PKEY_eq(NULL, NULL)", evp_h)
 have_func("EVP_PKEY_dup(NULL)", evp_h)
 
+# added in 3.4.0
+have_func("TS_VERIFY_CTX_set0_certs(NULL, NULL)", ts_h)
+
 Logging::message "=== Checking done. ===\n"
 
 # Append flags from environment variables.
diff --git a/ext/openssl/lib/openssl.rb b/ext/openssl/lib/openssl.rb
index 8a342f15b659eb..08899238903fbb 100644
--- a/ext/openssl/lib/openssl.rb
+++ b/ext/openssl/lib/openssl.rb
@@ -7,12 +7,13 @@
 
 = Licence
   This program is licensed under the same licence as Ruby.
-  (See the file 'LICENCE'.)
+  (See the file 'COPYING'.)
 =end
 
 require 'openssl.so'
 
 require_relative 'openssl/bn'
+require_relative 'openssl/asn1'
 require_relative 'openssl/pkey'
 require_relative 'openssl/cipher'
 require_relative 'openssl/digest'
diff --git a/ext/openssl/lib/openssl/asn1.rb b/ext/openssl/lib/openssl/asn1.rb
new file mode 100644
index 00000000000000..89fa28e1fb0b4a
--- /dev/null
+++ b/ext/openssl/lib/openssl/asn1.rb
@@ -0,0 +1,188 @@
+# frozen_string_literal: true
+#--
+#
+# = Ruby-space definitions that completes C-space funcs for ASN.1
+#
+# = Licence
+# This program is licensed under the same licence as Ruby.
+# (See the file 'COPYING'.)
+#++
+
+module OpenSSL
+  module ASN1
+    class ASN1Data
+      #
+      # Carries the value of a ASN.1 type.
+      # Please confer Constructive and Primitive for the mappings between
+      # ASN.1 data types and Ruby classes.
+      #
+      attr_accessor :value
+
+      # An Integer representing the tag number of this ASN1Data. Never +nil+.
+      attr_accessor :tag
+
+      # A Symbol representing the tag class of this ASN1Data. Never +nil+.
+      # See ASN1Data for possible values.
+      attr_accessor :tag_class
+
+      #
+      # Never +nil+. A boolean value indicating whether the encoding uses
+      # indefinite length (in the case of parsing) or whether an indefinite
+      # length form shall be used (in the encoding case).
+      # In DER, every value uses definite length form. But in scenarios where
+      # large amounts of data need to be transferred it might be desirable to
+      # have some kind of streaming support available.
+      # For example, huge OCTET STRINGs are preferably sent in smaller-sized
+      # chunks, each at a time.
+      # This is possible in BER by setting the length bytes of an encoding
+      # to zero and by this indicating that the following value will be
+      # sent in chunks. Indefinite length encodings are always constructed.
+      # The end of such a stream of chunks is indicated by sending a EOC
+      # (End of Content) tag. SETs and SEQUENCEs may use an indefinite length
+      # encoding, but also primitive types such as e.g. OCTET STRINGS or
+      # BIT STRINGS may leverage this functionality (cf. ITU-T X.690).
+      #
+      attr_accessor :indefinite_length
+
+      alias infinite_length indefinite_length
+      alias infinite_length= indefinite_length=
+
+      #
+      # :call-seq:
+      #    OpenSSL::ASN1::ASN1Data.new(value, tag, tag_class) => ASN1Data
+      #
+      # _value_: Please have a look at Constructive and Primitive to see how Ruby
+      # types are mapped to ASN.1 types and vice versa.
+      #
+      # _tag_: An Integer indicating the tag number.
+      #
+      # _tag_class_: A Symbol indicating the tag class. Please cf. ASN1 for
+      # possible values.
+      #
+      # == Example
+      #   asn1_int = OpenSSL::ASN1Data.new(42, 2, :UNIVERSAL) # => Same as OpenSSL::ASN1::Integer.new(42)
+      #   tagged_int = OpenSSL::ASN1Data.new(42, 0, :CONTEXT_SPECIFIC) # implicitly 0-tagged INTEGER
+      #
+      def initialize(value, tag, tag_class)
+        raise ASN1Error, "invalid tag class" unless tag_class.is_a?(Symbol)
+
+        @tag = tag
+        @value = value
+        @tag_class = tag_class
+        @indefinite_length = false
+      end
+    end
+
+    module TaggedASN1Data
+      #
+      # May be used as a hint for encoding a value either implicitly or
+      # explicitly by setting it either to +:IMPLICIT+ or to +:EXPLICIT+.
+      # _tagging_ is not set when a ASN.1 structure is parsed using
+      # OpenSSL::ASN1.decode.
+      #
+      attr_accessor :tagging
+
+      # :call-seq:
+      #    OpenSSL::ASN1::Primitive.new(value [, tag, tagging, tag_class ]) => Primitive
+      #
+      # _value_: is mandatory.
+      #
+      # _tag_: optional, may be specified for tagged values. If no _tag_ is
+      # specified, the UNIVERSAL tag corresponding to the Primitive sub-class
+      # is used by default.
+      #
+      # _tagging_: may be used as an encoding hint to encode a value either
+      # explicitly or implicitly, see ASN1 for possible values.
+      #
+      # _tag_class_: if _tag_ and _tagging_ are +nil+ then this is set to
+      # +:UNIVERSAL+ by default. If either _tag_ or _tagging_ are set then
+      # +:CONTEXT_SPECIFIC+ is used as the default. For possible values please
+      # cf. ASN1.
+      #
+      # == Example
+      #   int = OpenSSL::ASN1::Integer.new(42)
+      #   zero_tagged_int = OpenSSL::ASN1::Integer.new(42, 0, :IMPLICIT)
+      #   private_explicit_zero_tagged_int = OpenSSL::ASN1::Integer.new(42, 0, :EXPLICIT, :PRIVATE)
+      #
+      def initialize(value, tag = nil, tagging = nil, tag_class = nil)
+        tag ||= ASN1.take_default_tag(self.class)
+
+        raise ASN1Error, "must specify tag number" unless tag
+
+        if tagging
+          raise ASN1Error, "invalid tagging method" unless tagging.is_a?(Symbol)
+        end
+
+        tag_class ||= tagging ? :CONTEXT_SPECIFIC : :UNIVERSAL
+
+        raise ASN1Error, "invalid tag class" unless tag_class.is_a?(Symbol)
+
+        @tagging = tagging
+        super(value ,tag, tag_class)
+      end
+    end
+
+    class Primitive < ASN1Data
+      include TaggedASN1Data
+
+      undef_method :indefinite_length=
+      undef_method :infinite_length=
+    end
+
+    class Constructive < ASN1Data
+      include TaggedASN1Data
+      include Enumerable
+
+      # :call-seq:
+      #    asn1_ary.each { |asn1| block } => asn1_ary
+      #
+      # Calls the given block once for each element in self, passing that element
+      # as parameter _asn1_. If no block is given, an enumerator is returned
+      # instead.
+      #
+      # == Example
+      #   asn1_ary.each do |asn1|
+      #     puts asn1
+      #   end
+      #
+      def each(&blk)
+        @value.each(&blk)
+
+        self
+      end
+    end
+
+    class Boolean < Primitive ; end
+    class Integer < Primitive ; end
+    class Enumerated < Primitive ; end
+
+    class BitString < Primitive
+      attr_accessor :unused_bits
+
+      def initialize(*)
+        super
+
+        @unused_bits = 0
+      end
+    end
+
+    class EndOfContent < ASN1Data
+      def initialize
+        super("", 0, :UNIVERSAL)
+      end
+    end
+
+    # :nodoc:
+    def self.take_default_tag(klass)
+      tag = CLASS_TAG_MAP[klass]
+
+      return tag if tag
+
+      sklass = klass.superclass
+
+      return unless sklass
+
+      take_default_tag(sklass)
+    end
+  end
+end
diff --git a/ext/openssl/lib/openssl/bn.rb b/ext/openssl/lib/openssl/bn.rb
index 0a5e11b4c2e269..e4889a140c90b3 100644
--- a/ext/openssl/lib/openssl/bn.rb
+++ b/ext/openssl/lib/openssl/bn.rb
@@ -10,7 +10,7 @@
 #
 # = Licence
 # This program is licensed under the same licence as Ruby.
-# (See the file 'LICENCE'.)
+# (See the file 'COPYING'.)
 #++
 
 module OpenSSL
diff --git a/ext/openssl/lib/openssl/buffering.rb b/ext/openssl/lib/openssl/buffering.rb
index 9570f14f375632..1464a4292d5c02 100644
--- a/ext/openssl/lib/openssl/buffering.rb
+++ b/ext/openssl/lib/openssl/buffering.rb
@@ -8,7 +8,7 @@
 #
 #= Licence
 #  This program is licensed under the same licence as Ruby.
-#  (See the file 'LICENCE'.)
+#  (See the file 'COPYING'.)
 #++
 
 ##
@@ -24,25 +24,21 @@ module OpenSSL::Buffering
 
   # A buffer which will retain binary encoding.
   class Buffer < String
-    BINARY = Encoding::BINARY
-
-    def initialize
-      super
-
-      force_encoding(BINARY)
-    end
+    unless String.method_defined?(:append_as_bytes)
+      alias_method :_append, :<<
+      def append_as_bytes(string)
+        if string.encoding == Encoding::BINARY
+          _append(string)
+        else
+          _append(string.b)
+        end
 
-    def << string
-      if string.encoding == BINARY
-        super(string)
-      else
-        super(string.b)
+        self
       end
-
-      return self
     end
 
-    alias concat <<
+    undef_method :concat
+    undef_method :<<
   end
 
   ##
@@ -77,7 +73,7 @@ def initialize(*)
 
   def fill_rbuff
     begin
-      @rbuffer << self.sysread(BLOCK_SIZE)
+      @rbuffer.append_as_bytes(self.sysread(BLOCK_SIZE))
     rescue Errno::EAGAIN
       retry
     rescue EOFError
@@ -107,6 +103,12 @@ def getbyte
     read(1)&.ord
   end
 
+  # Get the next 8bit byte. Raises EOFError on EOF
+  def readbyte
+    raise EOFError if eof?
+    getbyte
+  end
+
   ##
   # Reads _size_ bytes from the stream.  If _buf_ is provided it must
   # reference a string which will receive the data.
@@ -229,7 +231,7 @@ def read_nonblock(maxlen, buf=nil, exception: true)
   #
   # Unlike IO#gets the separator must be provided if a limit is provided.
 
-  def gets(eol=$/, limit=nil)
+  def gets(eol=$/, limit=nil, chomp: false)
     idx = @rbuffer.index(eol)
     until @eof
       break if idx
@@ -244,7 +246,11 @@ def gets(eol=$/, limit=nil)
     if size && limit && limit >= 0
       size = [size, limit].min
     end
-    consume_rbuff(size)
+    line = consume_rbuff(size)
+    if chomp && line
+      line.chomp!(eol)
+    end
+    line
   end
 
   ##
@@ -342,17 +348,32 @@ def eof?
 
   def do_write(s)
     @wbuffer = Buffer.new unless defined? @wbuffer
-    @wbuffer << s
-    @wbuffer.force_encoding(Encoding::BINARY)
+    @wbuffer.append_as_bytes(s)
+
     @sync ||= false
-    if @sync or @wbuffer.size > BLOCK_SIZE
-      until @wbuffer.empty?
-        begin
-          nwrote = syswrite(@wbuffer)
-        rescue Errno::EAGAIN
-          retry
+    buffer_size = @wbuffer.bytesize
+    if @sync or buffer_size > BLOCK_SIZE
+      nwrote = 0
+      begin
+        while nwrote < buffer_size do
+          begin
+            chunk = if nwrote > 0
+              @wbuffer.byteslice(nwrote, @wbuffer.bytesize)
+            else
+              @wbuffer
+            end
+
+            nwrote += syswrite(chunk)
+          rescue Errno::EAGAIN
+            retry
+          end
+        end
+      ensure
+        if nwrote < @wbuffer.bytesize
+          @wbuffer[0, nwrote] = ""
+        else
+          @wbuffer.clear
         end
-        @wbuffer[0, nwrote] = ""
       end
     end
   end
@@ -429,10 +450,10 @@ def <<(s)
   def puts(*args)
     s = Buffer.new
     if args.empty?
-      s << "\n"
+      s.append_as_bytes("\n")
     end
     args.each{|arg|
-      s << arg.to_s
+      s.append_as_bytes(arg.to_s)
       s.sub!(/(?<!\n)\z/, "\n")
     }
     do_write(s)
@@ -446,7 +467,7 @@ def puts(*args)
 
   def print(*args)
     s = Buffer.new
-    args.each{ |arg| s << arg.to_s }
+    args.each{ |arg| s.append_as_bytes(arg.to_s) }
     do_write(s)
     nil
   end
diff --git a/ext/openssl/lib/openssl/cipher.rb b/ext/openssl/lib/openssl/cipher.rb
index 8ad8c35dd30264..ab75ac8e1ae3d7 100644
--- a/ext/openssl/lib/openssl/cipher.rb
+++ b/ext/openssl/lib/openssl/cipher.rb
@@ -9,7 +9,7 @@
 #
 # = Licence
 # This program is licensed under the same licence as Ruby.
-# (See the file 'LICENCE'.)
+# (See the file 'COPYING'.)
 #++
 
 module OpenSSL
diff --git a/ext/openssl/lib/openssl/digest.rb b/ext/openssl/lib/openssl/digest.rb
index 0f35ddadd307e2..5cda1e931c8b44 100644
--- a/ext/openssl/lib/openssl/digest.rb
+++ b/ext/openssl/lib/openssl/digest.rb
@@ -9,7 +9,7 @@
 #
 # = Licence
 # This program is licensed under the same licence as Ruby.
-# (See the file 'LICENCE'.)
+# (See the file 'COPYING'.)
 #++
 
 module OpenSSL
diff --git a/ext/openssl/lib/openssl/marshal.rb b/ext/openssl/lib/openssl/marshal.rb
index af5647192a4680..eb8eda47482c30 100644
--- a/ext/openssl/lib/openssl/marshal.rb
+++ b/ext/openssl/lib/openssl/marshal.rb
@@ -9,7 +9,7 @@
 #
 # = Licence
 # This program is licensed under the same licence as Ruby.
-# (See the file 'LICENCE'.)
+# (See the file 'COPYING'.)
 #++
 module OpenSSL
   module Marshal
diff --git a/ext/openssl/lib/openssl/pkey.rb b/ext/openssl/lib/openssl/pkey.rb
index 0414658a106134..3d1e8885ca22f6 100644
--- a/ext/openssl/lib/openssl/pkey.rb
+++ b/ext/openssl/lib/openssl/pkey.rb
@@ -34,6 +34,18 @@ def public_key
       DH.new(to_der)
     end
 
+    # :call-seq:
+    #    dh.params -> hash
+    #
+    # Stores all parameters of key to a Hash.
+    #
+    # The hash has keys 'p', 'q', 'g', 'pub_key', and 'priv_key'.
+    def params
+      %w{p q g pub_key priv_key}.map { |name|
+        [name, send(name)]
+      }.to_h
+    end
+
     # :call-seq:
     #    dh.compute_key(pub_bn) -> string
     #
@@ -154,6 +166,18 @@ def public_key
       OpenSSL::PKey.read(public_to_der)
     end
 
+    # :call-seq:
+    #    dsa.params -> hash
+    #
+    # Stores all parameters of key to a Hash.
+    #
+    # The hash has keys 'p', 'q', 'g', 'pub_key', and 'priv_key'.
+    def params
+      %w{p q g pub_key priv_key}.map { |name|
+        [name, send(name)]
+      }.to_h
+    end
+
     class << self
       # :call-seq:
       #    DSA.generate(size) -> dsa
@@ -328,6 +352,18 @@ def public_key
       OpenSSL::PKey.read(public_to_der)
     end
 
+    # :call-seq:
+    #    rsa.params -> hash
+    #
+    # Stores all parameters of key to a Hash.
+    #
+    # The hash has keys 'n', 'e', 'd', 'p', 'q', 'dmp1', 'dmq1', and 'iqmp'.
+    def params
+      %w{n e d p q dmp1 dmq1 iqmp}.map { |name|
+        [name, send(name)]
+      }.to_h
+    end
+
     class << self
       # :call-seq:
       #    RSA.generate(size, exponent = 65537) -> RSA
diff --git a/ext/openssl/lib/openssl/ssl.rb b/ext/openssl/lib/openssl/ssl.rb
index e557b8b483f77e..a0ad5dc3a670dc 100644
--- a/ext/openssl/lib/openssl/ssl.rb
+++ b/ext/openssl/lib/openssl/ssl.rb
@@ -7,7 +7,7 @@
 
 = Licence
   This program is licensed under the same licence as Ruby.
-  (See the file 'LICENCE'.)
+  (See the file 'COPYING'.)
 =end
 
 require "openssl/buffering"
@@ -22,7 +22,6 @@ module OpenSSL
   module SSL
     class SSLContext
       DEFAULT_PARAMS = { # :nodoc:
-        :min_version => OpenSSL::SSL::TLS1_VERSION,
         :verify_mode => OpenSSL::SSL::VERIFY_PEER,
         :verify_hostname => true,
         :options => -> {
@@ -52,9 +51,9 @@ class SSLContext
         }
       end
 
-      if !(OpenSSL::OPENSSL_VERSION.start_with?("OpenSSL") &&
-           OpenSSL::OPENSSL_VERSION_NUMBER >= 0x10100000)
+      if !OpenSSL::OPENSSL_VERSION.start_with?("OpenSSL")
         DEFAULT_PARAMS.merge!(
+          min_version: OpenSSL::SSL::TLS1_VERSION,
           ciphers: %w{
             ECDHE-ECDSA-AES128-GCM-SHA256
             ECDHE-RSA-AES128-GCM-SHA256
@@ -125,7 +124,6 @@ class SSLContext
       # that this form is deprecated. New applications should use #min_version=
       # and #max_version= as necessary.
       def initialize(version = nil)
-        self.options |= OpenSSL::SSL::OP_ALL
         self.ssl_version = version if version
         self.verify_mode = OpenSSL::SSL::VERIFY_NONE
         self.verify_hostname = false
@@ -145,7 +143,7 @@ def initialize(version = nil)
       # used.
       def set_params(params={})
         params = DEFAULT_PARAMS.merge(params)
-        self.options = params.delete(:options) # set before min_version/max_version
+        self.options |= params.delete(:options) # set before min_version/max_version
         params.each{|name, value| self.__send__("#{name}=", value) }
         if self.verify_mode != OpenSSL::SSL::VERIFY_NONE
           unless self.ca_file or self.ca_path or self.cert_store
@@ -155,43 +153,6 @@ def set_params(params={})
         return params
       end
 
-      # call-seq:
-      #    ctx.min_version = OpenSSL::SSL::TLS1_2_VERSION
-      #    ctx.min_version = :TLS1_2
-      #    ctx.min_version = nil
-      #
-      # Sets the lower bound on the supported SSL/TLS protocol version. The
-      # version may be specified by an integer constant named
-      # OpenSSL::SSL::*_VERSION, a Symbol, or +nil+ which means "any version".
-      #
-      # Be careful that you don't overwrite OpenSSL::SSL::OP_NO_{SSL,TLS}v*
-      # options by #options= once you have called #min_version= or
-      # #max_version=.
-      #
-      # === Example
-      #   ctx = OpenSSL::SSL::SSLContext.new
-      #   ctx.min_version = OpenSSL::SSL::TLS1_1_VERSION
-      #   ctx.max_version = OpenSSL::SSL::TLS1_2_VERSION
-      #
-      #   sock = OpenSSL::SSL::SSLSocket.new(tcp_sock, ctx)
-      #   sock.connect # Initiates a connection using either TLS 1.1 or TLS 1.2
-      def min_version=(version)
-        set_minmax_proto_version(version, @max_proto_version ||= nil)
-        @min_proto_version = version
-      end
-
-      # call-seq:
-      #    ctx.max_version = OpenSSL::SSL::TLS1_2_VERSION
-      #    ctx.max_version = :TLS1_2
-      #    ctx.max_version = nil
-      #
-      # Sets the upper bound of the supported SSL/TLS protocol version. See
-      # #min_version= for the possible values.
-      def max_version=(version)
-        set_minmax_proto_version(@min_proto_version ||= nil, version)
-        @max_proto_version = version
-      end
-
       # call-seq:
       #    ctx.ssl_version = :TLSv1
       #    ctx.ssl_version = "SSLv23"
@@ -216,8 +177,7 @@ def ssl_version=(meth)
         end
         version = METHODS_MAP[meth.intern] or
           raise ArgumentError, "unknown SSL method `%s'" % meth
-        set_minmax_proto_version(version, version)
-        @min_proto_version = @max_proto_version = version
+        self.min_version = self.max_version = version
       end
 
       METHODS_MAP = {
@@ -252,6 +212,14 @@ def peeraddr
         to_io.peeraddr
       end
 
+      def local_address
+        to_io.local_address
+      end
+
+      def remote_address
+        to_io.remote_address
+      end
+
       def setsockopt(level, optname, optval)
         to_io.setsockopt(level, optname, optval)
       end
@@ -271,6 +239,36 @@ def closed?
       def do_not_reverse_lookup=(flag)
         to_io.do_not_reverse_lookup = flag
       end
+
+      def close_on_exec=(value)
+        to_io.close_on_exec = value
+      end
+
+      def close_on_exec?
+        to_io.close_on_exec?
+      end
+
+      def wait(*args)
+        to_io.wait(*args)
+      end
+
+      def wait_readable(*args)
+        to_io.wait_readable(*args)
+      end
+
+      def wait_writable(*args)
+        to_io.wait_writable(*args)
+      end
+
+      if IO.method_defined?(:timeout)
+        def timeout
+          to_io.timeout
+        end
+
+        def timeout=(value)
+          to_io.timeout=(value)
+        end
+      end
     end
 
     def verify_certificate_identity(cert, hostname)
@@ -421,6 +419,32 @@ def session
         nil
       end
 
+      # Close the stream for reading.
+      # This method is ignored by OpenSSL as there is no reasonable way to
+      # implement it, but exists for compatibility with IO.
+      def close_read
+        # Unsupported and ignored.
+        # Just don't read any more.
+      end
+
+      # Closes the stream for writing. The behavior of this method depends on
+      # the version of OpenSSL and the TLS protocol in use.
+      #
+      # - Sends a 'close_notify' alert to the peer.
+      # - Does not wait for the peer's 'close_notify' alert in response.
+      #
+      # In TLS 1.2 and earlier:
+      # - On receipt of a 'close_notify' alert, responds with a 'close_notify'
+      #   alert of its own and close down the connection immediately,
+      #   discarding any pending writes.
+      #
+      # Therefore, on TLS 1.2, this method will cause the connection to be
+      # completely shut down. On TLS 1.3, the connection will remain open for
+      # reading only.
+      def close_write
+        stop
+      end
+
       private
 
       def using_anon_cipher?
diff --git a/ext/openssl/lib/openssl/version.rb b/ext/openssl/lib/openssl/version.rb
index 4163f550642b49..3398fe39ccc8c6 100644
--- a/ext/openssl/lib/openssl/version.rb
+++ b/ext/openssl/lib/openssl/version.rb
@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module OpenSSL
-  VERSION = "3.1.0"
+  VERSION = "3.3.0"
 end
diff --git a/ext/openssl/lib/openssl/x509.rb b/ext/openssl/lib/openssl/x509.rb
index f973f4f4dc6ca3..6459d37b12766e 100644
--- a/ext/openssl/lib/openssl/x509.rb
+++ b/ext/openssl/lib/openssl/x509.rb
@@ -9,7 +9,7 @@
 #
 # = Licence
 # This program is licensed under the same licence as Ruby.
-# (See the file 'LICENCE'.)
+# (See the file 'COPYING'.)
 #++
 
 require_relative 'marshal'
@@ -122,8 +122,8 @@ 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
+        # distribution points extension, as described in RFC 5280 Section
+        # 4.2.1.13.
         #
         # Returns an array of strings or nil or raises ASN1::ASN1Error.
         def crl_uris
@@ -135,19 +135,19 @@ def crl_uris
             raise ASN1::ASN1Error, "invalid extension"
           end
 
-          crl_uris = cdp_asn1.map do |crl_distribution_point|
+          crl_uris = cdp_asn1.flat_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|
+            full_name&.value&.select do |v|
               v.tag_class == :CONTEXT_SPECIFIC && v.tag == 6 # uniformResourceIdentifier
             end
           end
 
-          crl_uris&.map(&:value)
+          crl_uris.empty? ? nil : crl_uris.map(&:value)
         end
       end
 
diff --git a/ext/openssl/openssl.gemspec b/ext/openssl/openssl.gemspec
index 674dc20debf05b..2ec1551885b201 100644
--- a/ext/openssl/openssl.gemspec
+++ b/ext/openssl/openssl.gemspec
@@ -1,19 +1,20 @@
 Gem::Specification.new do |spec|
   spec.name          = "openssl"
-  spec.version       = "3.1.0"
+  spec.version       = "3.3.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.summary       = %q{SSL/TLS and general-purpose cryptography for Ruby}
+  spec.description   = %q{OpenSSL for Ruby provides access to SSL/TLS and general-purpose cryptography based on the OpenSSL library.}
   spec.homepage      = "https://github.com/ruby/openssl"
-  spec.license       = "Ruby"
+  spec.licenses      = ["Ruby", "BSD-2-Clause"]
 
   if Gem::Platform === spec.platform and spec.platform =~ 'java' or RUBY_ENGINE == 'jruby'
     spec.platform    = "java"
     spec.files       = []
     spec.add_runtime_dependency('jruby-openssl', '~> 0.14')
   else
-    spec.files         = Dir["lib/**/*.rb", "ext/**/*.{c,h,rb}", "*.md", "BSDL", "LICENSE.txt"]
+    spec.files         = Dir.glob(["lib/**/*.rb", "ext/**/*.{c,h,rb}", "*.md"], base: File.expand_path("..", __FILE__)) +
+                         ["BSDL", "COPYING"]
     spec.require_paths = ["lib"]
     spec.extensions    = ["ext/openssl/extconf.rb"]
   end
diff --git a/ext/openssl/openssl_missing.c b/ext/openssl/openssl_missing.c
deleted file mode 100644
index 4415703db4d072..00000000000000
--- a/ext/openssl/openssl_missing.c
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * 'OpenSSL for Ruby' project
- * Copyright (C) 2001-2002  Michal Rokos <m.rokos@sh.cvut.cz>
- * All rights reserved.
- */
-/*
- * This program is licensed under the same licence as Ruby.
- * (See the file 'LICENCE'.)
- */
-#include RUBY_EXTCONF_H
-
-#include <string.h> /* memcpy() */
-#include <openssl/x509_vfy.h>
-
-#include "openssl_missing.h"
-
-/*** added in 1.1.0 ***/
-#if !defined(HAVE_X509_CRL_GET0_SIGNATURE)
-void
-ossl_X509_CRL_get0_signature(const X509_CRL *crl, const ASN1_BIT_STRING **psig,
-			     const X509_ALGOR **palg)
-{
-    if (psig != NULL)
-	*psig = crl->signature;
-    if (palg != NULL)
-	*palg = crl->sig_alg;
-}
-#endif
-
-#if !defined(HAVE_X509_REQ_GET0_SIGNATURE)
-void
-ossl_X509_REQ_get0_signature(const X509_REQ *req, const ASN1_BIT_STRING **psig,
-			     const X509_ALGOR **palg)
-{
-    if (psig != NULL)
-	*psig = req->signature;
-    if (palg != NULL)
-	*palg = req->sig_alg;
-}
-#endif
diff --git a/ext/openssl/openssl_missing.h b/ext/openssl/openssl_missing.h
index 8629bfe505cb09..6592f9cceaf714 100644
--- a/ext/openssl/openssl_missing.h
+++ b/ext/openssl/openssl_missing.h
@@ -5,216 +5,14 @@
  */
 /*
  * This program is licensed under the same licence as Ruby.
- * (See the file 'LICENCE'.)
+ * (See the file 'COPYING'.)
  */
 #if !defined(_OSSL_OPENSSL_MISSING_H_)
 #define _OSSL_OPENSSL_MISSING_H_
 
 #include "ruby/config.h"
 
-/* added in 1.1.0 */
-#if !defined(HAVE_EVP_MD_CTX_NEW)
-#  define EVP_MD_CTX_new EVP_MD_CTX_create
-#endif
-
-#if !defined(HAVE_EVP_MD_CTX_FREE)
-#  define EVP_MD_CTX_free EVP_MD_CTX_destroy
-#endif
-
-#if !defined(HAVE_X509_STORE_GET_EX_DATA)
-#  define X509_STORE_get_ex_data(x, idx) \
-	CRYPTO_get_ex_data(&(x)->ex_data, (idx))
-#endif
-
-#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))
-#endif
-
-#if !defined(HAVE_X509_CRL_GET0_SIGNATURE)
-void ossl_X509_CRL_get0_signature(const X509_CRL *, const ASN1_BIT_STRING **, const X509_ALGOR **);
-#  define X509_CRL_get0_signature ossl_X509_CRL_get0_signature
-#endif
-
-#if !defined(HAVE_X509_REQ_GET0_SIGNATURE)
-void ossl_X509_REQ_get0_signature(const X509_REQ *, const ASN1_BIT_STRING **, const X509_ALGOR **);
-#  define X509_REQ_get0_signature ossl_X509_REQ_get0_signature
-#endif
-
-#if !defined(HAVE_X509_REVOKED_GET0_SERIALNUMBER)
-#  define X509_REVOKED_get0_serialNumber(x) ((x)->serialNumber)
-#endif
-
-#if !defined(HAVE_X509_REVOKED_GET0_REVOCATIONDATE)
-#  define X509_REVOKED_get0_revocationDate(x) ((x)->revocationDate)
-#endif
-
-#if !defined(HAVE_X509_GET0_TBS_SIGALG)
-#  define X509_get0_tbs_sigalg(x) ((x)->cert_info->signature)
-#endif
-
-#if !defined(HAVE_X509_STORE_CTX_GET0_UNTRUSTED)
-#  define X509_STORE_CTX_get0_untrusted(x) ((x)->untrusted)
-#endif
-
-#if !defined(HAVE_X509_STORE_CTX_GET0_CERT)
-#  define X509_STORE_CTX_get0_cert(x) ((x)->cert)
-#endif
-
-#if !defined(HAVE_X509_STORE_CTX_GET0_CHAIN)
-#  define X509_STORE_CTX_get0_chain(ctx) X509_STORE_CTX_get_chain(ctx)
-#endif
-
-#if !defined(HAVE_OCSP_SINGLERESP_GET0_ID)
-#  define OCSP_SINGLERESP_get0_id(s) ((s)->certId)
-#endif
-
-#if !defined(HAVE_SSL_CTX_GET_CIPHERS)
-#  define SSL_CTX_get_ciphers(ctx) ((ctx)->cipher_list)
-#endif
-
-#if !defined(HAVE_X509_UP_REF)
-#  define X509_up_ref(x) \
-	CRYPTO_add(&(x)->references, 1, CRYPTO_LOCK_X509)
-#endif
-
-#if !defined(HAVE_X509_CRL_UP_REF)
-#  define X509_CRL_up_ref(x) \
-	CRYPTO_add(&(x)->references, 1, CRYPTO_LOCK_X509_CRL);
-#endif
-
-#if !defined(HAVE_X509_STORE_UP_REF)
-#  define X509_STORE_up_ref(x) \
-	CRYPTO_add(&(x)->references, 1, CRYPTO_LOCK_X509_STORE);
-#endif
-
-#if !defined(HAVE_SSL_SESSION_UP_REF)
-#  define SSL_SESSION_up_ref(x) \
-	CRYPTO_add(&(x)->references, 1, CRYPTO_LOCK_SSL_SESSION);
-#endif
-
-#if !defined(HAVE_EVP_PKEY_UP_REF)
-#  define EVP_PKEY_up_ref(x) \
-	CRYPTO_add(&(x)->references, 1, CRYPTO_LOCK_EVP_PKEY);
-#endif
-
-#if !defined(HAVE_OPAQUE_OPENSSL)
-#define IMPL_PKEY_GETTER(_type, _name) \
-static inline _type *EVP_PKEY_get0_##_type(EVP_PKEY *pkey) { \
-	return pkey->pkey._name; }
-#define IMPL_KEY_ACCESSOR2(_type, _group, a1, a2, _fail_cond) \
-static inline void _type##_get0_##_group(const _type *obj, const BIGNUM **a1, const BIGNUM **a2) { \
-	if (a1) *a1 = obj->a1; \
-	if (a2) *a2 = obj->a2; } \
-static inline int _type##_set0_##_group(_type *obj, BIGNUM *a1, BIGNUM *a2) { \
-	if (_fail_cond) return 0; \
-	BN_clear_free(obj->a1); obj->a1 = a1; \
-	BN_clear_free(obj->a2); obj->a2 = a2; \
-	return 1; }
-#define IMPL_KEY_ACCESSOR3(_type, _group, a1, a2, a3, _fail_cond) \
-static inline void _type##_get0_##_group(const _type *obj, const BIGNUM **a1, const BIGNUM **a2, const BIGNUM **a3) { \
-	if (a1) *a1 = obj->a1; \
-	if (a2) *a2 = obj->a2; \
-	if (a3) *a3 = obj->a3; } \
-static inline int _type##_set0_##_group(_type *obj, BIGNUM *a1, BIGNUM *a2, BIGNUM *a3) { \
-	if (_fail_cond) return 0; \
-	BN_clear_free(obj->a1); obj->a1 = a1; \
-	BN_clear_free(obj->a2); obj->a2 = a2; \
-	BN_clear_free(obj->a3); obj->a3 = a3; \
-	return 1; }
-
-#if !defined(OPENSSL_NO_RSA)
-IMPL_PKEY_GETTER(RSA, rsa)
-IMPL_KEY_ACCESSOR3(RSA, key, n, e, d, (n == obj->n || e == obj->e || (obj->d && d == obj->d)))
-IMPL_KEY_ACCESSOR2(RSA, factors, p, q, (p == obj->p || q == obj->q))
-IMPL_KEY_ACCESSOR3(RSA, crt_params, dmp1, dmq1, iqmp, (dmp1 == obj->dmp1 || dmq1 == obj->dmq1 || iqmp == obj->iqmp))
-#endif
-
-#if !defined(OPENSSL_NO_DSA)
-IMPL_PKEY_GETTER(DSA, dsa)
-IMPL_KEY_ACCESSOR2(DSA, key, pub_key, priv_key, (pub_key == obj->pub_key || (obj->priv_key && priv_key == obj->priv_key)))
-IMPL_KEY_ACCESSOR3(DSA, pqg, p, q, g, (p == obj->p || q == obj->q || g == obj->g))
-#endif
-
-#if !defined(OPENSSL_NO_DH)
-IMPL_PKEY_GETTER(DH, dh)
-IMPL_KEY_ACCESSOR2(DH, key, pub_key, priv_key, (pub_key == obj->pub_key || (obj->priv_key && priv_key == obj->priv_key)))
-IMPL_KEY_ACCESSOR3(DH, pqg, p, q, g, (p == obj->p || (obj->q && q == obj->q) || g == obj->g))
-static inline ENGINE *DH_get0_engine(DH *dh) { return dh->engine; }
-#endif
-
-#if !defined(OPENSSL_NO_EC)
-IMPL_PKEY_GETTER(EC_KEY, ec)
-#endif
-
-#undef IMPL_PKEY_GETTER
-#undef IMPL_KEY_ACCESSOR2
-#undef IMPL_KEY_ACCESSOR3
-#endif /* HAVE_OPAQUE_OPENSSL */
-
-#if !defined(EVP_CTRL_AEAD_GET_TAG)
-#  define EVP_CTRL_AEAD_GET_TAG EVP_CTRL_GCM_GET_TAG
-#  define EVP_CTRL_AEAD_SET_TAG EVP_CTRL_GCM_SET_TAG
-#  define EVP_CTRL_AEAD_SET_IVLEN EVP_CTRL_GCM_SET_IVLEN
-#endif
-
-#if !defined(HAVE_X509_GET0_NOTBEFORE)
-#  define X509_get0_notBefore(x) X509_get_notBefore(x)
-#  define X509_get0_notAfter(x) X509_get_notAfter(x)
-#  define X509_CRL_get0_lastUpdate(x) X509_CRL_get_lastUpdate(x)
-#  define X509_CRL_get0_nextUpdate(x) X509_CRL_get_nextUpdate(x)
-#  define X509_set1_notBefore(x, t) X509_set_notBefore(x, t)
-#  define X509_set1_notAfter(x, t) X509_set_notAfter(x, t)
-#  define X509_CRL_set1_lastUpdate(x, t) X509_CRL_set_lastUpdate(x, t)
-#  define X509_CRL_set1_nextUpdate(x, t) X509_CRL_set_nextUpdate(x, t)
-#endif
-
-#if !defined(HAVE_SSL_SESSION_GET_PROTOCOL_VERSION)
-#  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
-
 /* added in 3.0.0 */
-#if !defined(HAVE_TS_VERIFY_CTX_SET_CERTS)
-#  define TS_VERIFY_CTX_set_certs(ctx, crts) TS_VERIFY_CTS_set_certs(ctx, crts)
-#endif
-
 #ifndef HAVE_EVP_MD_CTX_GET0_MD
 #  define EVP_MD_CTX_get0_md(ctx) EVP_MD_CTX_md(ctx)
 #endif
@@ -224,11 +22,7 @@ IMPL_PKEY_GETTER(EC_KEY, ec)
  * EVP_MD_CTX_get_pkey_ctx(x) in OpenSSL 3.0.
  */
 #ifndef HAVE_EVP_MD_CTX_GET_PKEY_CTX
-# ifdef HAVE_EVP_MD_CTX_PKEY_CTX
 #  define EVP_MD_CTX_get_pkey_ctx(x) EVP_MD_CTX_pkey_ctx(x)
-# else
-#  define EVP_MD_CTX_get_pkey_ctx(x) (x)->pctx
-# endif
 #endif
 
 #ifndef HAVE_EVP_PKEY_EQ
diff --git a/ext/openssl/ossl.c b/ext/openssl/ossl.c
index 00eded55cb9ad6..60780790b02d1d 100644
--- a/ext/openssl/ossl.c
+++ b/ext/openssl/ossl.c
@@ -5,18 +5,11 @@
  */
 /*
  * This program is licensed under the same licence as Ruby.
- * (See the file 'LICENCE'.)
+ * (See the file 'COPYING'.)
  */
 #include "ossl.h"
 #include <stdarg.h> /* for ossl_raise */
 
-/* OpenSSL >= 1.1.0 and LibreSSL >= 2.9.0 */
-#if defined(LIBRESSL_VERSION_NUMBER) || OPENSSL_VERSION_NUMBER >= 0x10100000
-# define HAVE_OPENSSL_110_THREADING_API
-#else
-# include <ruby/thread_native.h>
-#endif
-
 /*
  * Data Conversion
  */
@@ -76,16 +69,9 @@ ossl_##name##_sk2ary(const STACK_OF(type) *sk)	\
     int i, num;					\
     VALUE ary;					\
 						\
-    if (!sk) {					\
-	OSSL_Debug("empty sk!");		\
-	return Qnil;				\
-    }						\
+    RUBY_ASSERT(sk != NULL);			\
     num = sk_##type##_num(sk);			\
-    if (num < 0) {				\
-	OSSL_Debug("items in sk < -1???");	\
-	return rb_ary_new();			\
-    }						\
-    ary = rb_ary_new2(num);			\
+    ary = rb_ary_new_capa(num);			\
 						\
     for (i=0; i<num; i++) {			\
 	t = sk_##type##_value(sk, i);		\
@@ -355,7 +341,7 @@ ossl_clear_error(void)
  * Any errors you see here are probably due to a bug in Ruby's OpenSSL
  * implementation.
  */
-VALUE
+static VALUE
 ossl_get_errors(VALUE _)
 {
     VALUE ary;
@@ -411,7 +397,7 @@ ossl_fips_mode_get(VALUE self)
     VALUE enabled;
     enabled = EVP_default_properties_is_fips_enabled(NULL) ? Qtrue : Qfalse;
     return enabled;
-#elif defined(OPENSSL_FIPS)
+#elif defined(OPENSSL_FIPS) || defined(OPENSSL_IS_AWSLC)
     VALUE enabled;
     enabled = FIPS_mode() ? Qtrue : Qfalse;
     return enabled;
@@ -446,7 +432,7 @@ ossl_fips_mode_set(VALUE self, VALUE enabled)
         }
     }
     return enabled;
-#elif defined(OPENSSL_FIPS)
+#elif defined(OPENSSL_FIPS) || defined(OPENSSL_IS_AWSLC)
     if (RTEST(enabled)) {
 	int mode = FIPS_mode();
 	if(!mode && !FIPS_mode_set(1)) /* turning on twice leads to an error */
@@ -463,97 +449,6 @@ ossl_fips_mode_set(VALUE self, VALUE enabled)
 #endif
 }
 
-#if !defined(HAVE_OPENSSL_110_THREADING_API)
-/**
- * Stores locks needed for OpenSSL thread safety
- */
-struct CRYPTO_dynlock_value {
-    rb_nativethread_lock_t lock;
-    rb_nativethread_id_t owner;
-    size_t count;
-};
-
-static void
-ossl_lock_init(struct CRYPTO_dynlock_value *l)
-{
-    rb_nativethread_lock_initialize(&l->lock);
-    l->count = 0;
-}
-
-static void
-ossl_lock_unlock(int mode, struct CRYPTO_dynlock_value *l)
-{
-    if (mode & CRYPTO_LOCK) {
-	/* TODO: rb_nativethread_id_t is not necessarily compared with ==. */
-	rb_nativethread_id_t tid = rb_nativethread_self();
-	if (l->count && l->owner == tid) {
-	    l->count++;
-	    return;
-	}
-	rb_nativethread_lock_lock(&l->lock);
-	l->owner = tid;
-	l->count = 1;
-    } else {
-	if (!--l->count)
-	    rb_nativethread_lock_unlock(&l->lock);
-    }
-}
-
-static struct CRYPTO_dynlock_value *
-ossl_dyn_create_callback(const char *file, int line)
-{
-    /* Do not use xmalloc() here, since it may raise NoMemoryError */
-    struct CRYPTO_dynlock_value *dynlock =
-	OPENSSL_malloc(sizeof(struct CRYPTO_dynlock_value));
-    if (dynlock)
-	ossl_lock_init(dynlock);
-    return dynlock;
-}
-
-static void
-ossl_dyn_lock_callback(int mode, struct CRYPTO_dynlock_value *l, const char *file, int line)
-{
-    ossl_lock_unlock(mode, l);
-}
-
-static void
-ossl_dyn_destroy_callback(struct CRYPTO_dynlock_value *l, const char *file, int line)
-{
-    rb_nativethread_lock_destroy(&l->lock);
-    OPENSSL_free(l);
-}
-
-static void ossl_threadid_func(CRYPTO_THREADID *id)
-{
-    /* register native thread id */
-    CRYPTO_THREADID_set_pointer(id, (void *)rb_nativethread_self());
-}
-
-static struct CRYPTO_dynlock_value *ossl_locks;
-
-static void
-ossl_lock_callback(int mode, int type, const char *file, int line)
-{
-    ossl_lock_unlock(mode, &ossl_locks[type]);
-}
-
-static void Init_ossl_locks(void)
-{
-    int i;
-    int num_locks = CRYPTO_num_locks();
-
-    ossl_locks = ALLOC_N(struct CRYPTO_dynlock_value, num_locks);
-    for (i = 0; i < num_locks; i++)
-	ossl_lock_init(&ossl_locks[i]);
-
-    CRYPTO_THREADID_set_callback(ossl_threadid_func);
-    CRYPTO_set_locking_callback(ossl_lock_callback);
-    CRYPTO_set_dynlock_create_callback(ossl_dyn_create_callback);
-    CRYPTO_set_dynlock_lock_callback(ossl_dyn_lock_callback);
-    CRYPTO_set_dynlock_destroy_callback(ossl_dyn_destroy_callback);
-}
-#endif /* !HAVE_OPENSSL_110_THREADING_API */
-
 /*
  * call-seq:
  *   OpenSSL.fixed_length_secure_compare(string, string) -> boolean
@@ -1050,15 +945,8 @@ Init_openssl(void)
     /*
      * Init all digests, ciphers
      */
-#if !defined(LIBRESSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER >= 0x10100000
     if (!OPENSSL_init_ssl(0, NULL))
         rb_raise(rb_eRuntimeError, "OPENSSL_init_ssl");
-#else
-    OpenSSL_add_ssl_algorithms();
-    OpenSSL_add_all_algorithms();
-    ERR_load_crypto_strings();
-    SSL_load_error_strings();
-#endif
 
     /*
      * Init main module
@@ -1075,11 +963,7 @@ Init_openssl(void)
     /*
      * Version of OpenSSL the ruby OpenSSL extension is running with
      */
-#if !defined(LIBRESSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER >= 0x10100000
     rb_define_const(mOSSL, "OPENSSL_LIBRARY_VERSION", rb_str_new2(OpenSSL_version(OPENSSL_VERSION)));
-#else
-    rb_define_const(mOSSL, "OPENSSL_LIBRARY_VERSION", rb_str_new2(SSLeay_version(SSLEAY_VERSION)));
-#endif
 
     /*
      * Version number of OpenSSL the ruby OpenSSL extension was built with
@@ -1113,6 +997,8 @@ Init_openssl(void)
                     Qtrue
 #elif defined(OPENSSL_FIPS)
 		    Qtrue
+#elif defined(OPENSSL_IS_AWSLC) // AWS-LC FIPS can only be enabled during compile time.
+            FIPS_mode() ? Qtrue : Qfalse
 #else
 		    Qfalse
 #endif
@@ -1143,31 +1029,25 @@ Init_openssl(void)
      */
     ossl_s_to_der = rb_intern("to_der");
 
-#if !defined(HAVE_OPENSSL_110_THREADING_API)
-    Init_ossl_locks();
-#endif
-
     /*
      * Init components
      */
+    Init_ossl_asn1();
     Init_ossl_bn();
     Init_ossl_cipher();
     Init_ossl_config();
     Init_ossl_digest();
+    Init_ossl_engine();
     Init_ossl_hmac();
+    Init_ossl_kdf();
     Init_ossl_ns_spki();
+    Init_ossl_ocsp();
     Init_ossl_pkcs12();
     Init_ossl_pkcs7();
     Init_ossl_pkey();
+    Init_ossl_provider();
     Init_ossl_rand();
     Init_ossl_ssl();
-#ifndef OPENSSL_NO_TS
     Init_ossl_ts();
-#endif
     Init_ossl_x509();
-    Init_ossl_ocsp();
-    Init_ossl_engine();
-    Init_ossl_provider();
-    Init_ossl_asn1();
-    Init_ossl_kdf();
 }
diff --git a/ext/openssl/ossl.h b/ext/openssl/ossl.h
index 68d42b71e2285e..22471d2085fa69 100644
--- a/ext/openssl/ossl.h
+++ b/ext/openssl/ossl.h
@@ -5,7 +5,7 @@
  */
 /*
  * This program is licensed under the same licence as Ruby.
- * (See the file 'LICENCE'.)
+ * (See the file 'COPYING'.)
  */
 #if !defined(_OSSL_H_)
 #define _OSSL_H_
@@ -17,6 +17,12 @@
 #include <errno.h>
 #include <ruby/io.h>
 #include <ruby/thread.h>
+#ifdef HAVE_RUBY_RACTOR_H
+#include <ruby/ractor.h>
+#else
+#define RUBY_TYPED_FROZEN_SHAREABLE 0
+#endif
+
 #include <openssl/opensslv.h>
 
 #include <openssl/err.h>
@@ -39,6 +45,7 @@
 #include <openssl/dsa.h>
 #include <openssl/evp.h>
 #include <openssl/dh.h>
+#include "openssl_missing.h"
 
 #ifndef LIBRESSL_VERSION_NUMBER
 # define OSSL_IS_LIBRESSL 0
@@ -64,6 +71,7 @@
 
 #if OSSL_OPENSSL_PREREQ(3, 0, 0)
 # define OSSL_USE_PROVIDER
+# include <openssl/provider.h>
 #endif
 
 /*
@@ -172,28 +180,25 @@ extern VALUE dOSSL;
 /*
  * Include all parts
  */
-#include "openssl_missing.h"
 #include "ossl_asn1.h"
 #include "ossl_bio.h"
 #include "ossl_bn.h"
 #include "ossl_cipher.h"
 #include "ossl_config.h"
 #include "ossl_digest.h"
+#include "ossl_engine.h"
 #include "ossl_hmac.h"
+#include "ossl_kdf.h"
 #include "ossl_ns_spki.h"
 #include "ossl_ocsp.h"
 #include "ossl_pkcs12.h"
 #include "ossl_pkcs7.h"
 #include "ossl_pkey.h"
+#include "ossl_provider.h"
 #include "ossl_rand.h"
 #include "ossl_ssl.h"
-#ifndef OPENSSL_NO_TS
-  #include "ossl_ts.h"
-#endif
+#include "ossl_ts.h"
 #include "ossl_x509.h"
-#include "ossl_engine.h"
-#include "ossl_provider.h"
-#include "ossl_kdf.h"
 
 void Init_openssl(void);
 
diff --git a/ext/openssl/ossl_asn1.c b/ext/openssl/ossl_asn1.c
index 71c452c88af26f..186679da4c6b55 100644
--- a/ext/openssl/ossl_asn1.c
+++ b/ext/openssl/ossl_asn1.c
@@ -5,13 +5,12 @@
  */
 /*
  * This program is licensed under the same licence as Ruby.
- * (See the file 'LICENCE'.)
+ * (See the file 'COPYING'.)
  */
 #include "ossl.h"
 
 static VALUE ossl_asn1_decode0(unsigned char **pp, long length, long *offset,
 			       int depth, int yield, long *num_read);
-static VALUE ossl_asn1_initialize(int argc, VALUE *argv, VALUE self);
 
 /*
  * DATE conversion
@@ -37,7 +36,7 @@ asn1time_to_time(const ASN1_TIME *time)
 	    ossl_raise(rb_eTypeError, "bad UTCTIME format: \"%s\"",
 		    time->data);
 	}
-	if (tm.tm_year < 69) {
+	if (tm.tm_year < 50) {
 	    tm.tm_year += 2000;
 	} else {
 	    tm.tm_year += 1900;
@@ -158,38 +157,33 @@ asn1integer_to_num_i(VALUE arg)
 #define ossl_asn1_get_tag_class(o)       rb_attr_get((o),sivTAG_CLASS)
 #define ossl_asn1_get_indefinite_length(o) rb_attr_get((o),sivINDEFINITE_LENGTH)
 
-#define ossl_asn1_set_value(o,v)           rb_ivar_set((o),sivVALUE,(v))
-#define ossl_asn1_set_tag(o,v)             rb_ivar_set((o),sivTAG,(v))
-#define ossl_asn1_set_tagging(o,v)         rb_ivar_set((o),sivTAGGING,(v))
-#define ossl_asn1_set_tag_class(o,v)       rb_ivar_set((o),sivTAG_CLASS,(v))
 #define ossl_asn1_set_indefinite_length(o,v) rb_ivar_set((o),sivINDEFINITE_LENGTH,(v))
 
 VALUE mASN1;
 VALUE eASN1Error;
 
 VALUE cASN1Data;
-VALUE cASN1Primitive;
-VALUE cASN1Constructive;
-
-VALUE cASN1EndOfContent;
-VALUE cASN1Boolean;                           /* BOOLEAN           */
-VALUE cASN1Integer, cASN1Enumerated;          /* INTEGER           */
-VALUE cASN1BitString;                         /* BIT STRING        */
-VALUE cASN1OctetString, cASN1UTF8String;      /* STRINGs           */
-VALUE cASN1NumericString, cASN1PrintableString;
-VALUE cASN1T61String, cASN1VideotexString;
-VALUE cASN1IA5String, cASN1GraphicString;
-VALUE cASN1ISO64String, cASN1GeneralString;
-VALUE cASN1UniversalString, cASN1BMPString;
-VALUE cASN1Null;                              /* NULL              */
-VALUE cASN1ObjectId;                          /* OBJECT IDENTIFIER */
-VALUE cASN1UTCTime, cASN1GeneralizedTime;     /* TIME              */
-VALUE cASN1Sequence, cASN1Set;                /* CONSTRUCTIVE      */
+static VALUE cASN1Primitive;
+static VALUE cASN1Constructive;
+
+static VALUE cASN1EndOfContent;
+static VALUE cASN1Boolean;                           /* BOOLEAN           */
+static VALUE cASN1Integer, cASN1Enumerated;          /* INTEGER           */
+static VALUE cASN1BitString;                         /* BIT STRING        */
+static VALUE cASN1OctetString, cASN1UTF8String;      /* STRINGs           */
+static VALUE cASN1NumericString, cASN1PrintableString;
+static VALUE cASN1T61String, cASN1VideotexString;
+static VALUE cASN1IA5String, cASN1GraphicString;
+static VALUE cASN1ISO64String, cASN1GeneralString;
+static VALUE cASN1UniversalString, cASN1BMPString;
+static VALUE cASN1Null;                              /* NULL              */
+static VALUE cASN1ObjectId;                          /* OBJECT IDENTIFIER */
+static VALUE cASN1UTCTime, cASN1GeneralizedTime;     /* TIME              */
+static VALUE cASN1Sequence, cASN1Set;                /* CONSTRUCTIVE      */
 
 static VALUE sym_IMPLICIT, sym_EXPLICIT;
 static VALUE sym_UNIVERSAL, sym_APPLICATION, sym_CONTEXT_SPECIFIC, sym_PRIVATE;
 static ID sivVALUE, sivTAG, sivTAG_CLASS, sivTAGGING, sivINDEFINITE_LENGTH, sivUNUSED_BITS;
-static ID id_each;
 
 /*
  * Ruby to ASN1 converters
@@ -503,7 +497,7 @@ static VALUE class_tag_map;
 
 static int ossl_asn1_default_tag(VALUE obj);
 
-ASN1_TYPE*
+static ASN1_TYPE *
 ossl_asn1_get_asn1type(VALUE obj)
 {
     ASN1_TYPE *ret;
@@ -638,35 +632,6 @@ ossl_asn1_class2sym(int tc)
 	return sym_UNIVERSAL;
 }
 
-/*
- * call-seq:
- *    OpenSSL::ASN1::ASN1Data.new(value, tag, tag_class) => ASN1Data
- *
- * _value_: Please have a look at Constructive and Primitive to see how Ruby
- * types are mapped to ASN.1 types and vice versa.
- *
- * _tag_: An Integer indicating the tag number.
- *
- * _tag_class_: A Symbol indicating the tag class. Please cf. ASN1 for
- * possible values.
- *
- * == Example
- *   asn1_int = OpenSSL::ASN1Data.new(42, 2, :UNIVERSAL) # => Same as OpenSSL::ASN1::Integer.new(42)
- *   tagged_int = OpenSSL::ASN1Data.new(42, 0, :CONTEXT_SPECIFIC) # implicitly 0-tagged INTEGER
- */
-static VALUE
-ossl_asn1data_initialize(VALUE self, VALUE value, VALUE tag, VALUE tag_class)
-{
-    if(!SYMBOL_P(tag_class))
-	ossl_raise(eASN1Error, "invalid tag class");
-    ossl_asn1_set_tag(self, tag);
-    ossl_asn1_set_value(self, value);
-    ossl_asn1_set_tag_class(self, tag_class);
-    ossl_asn1_set_indefinite_length(self, Qfalse);
-
-    return self;
-}
-
 static VALUE
 to_der_internal(VALUE self, int constructed, int indef_len, VALUE body)
 {
@@ -795,20 +760,19 @@ int_ossl_asn1_decode0_prim(unsigned char **pp, long length, long hlen, int tag,
     if (tc == sym_UNIVERSAL &&
 	tag < ossl_asn1_info_size && ossl_asn1_info[tag].klass) {
 	VALUE klass = *ossl_asn1_info[tag].klass;
-	VALUE args[4];
-	args[0] = value;
-	args[1] = INT2NUM(tag);
-	args[2] = Qnil;
-	args[3] = tc;
-	asn1data = rb_obj_alloc(klass);
-	ossl_asn1_initialize(4, args, asn1data);
+	if (tag == V_ASN1_EOC)
+	    asn1data = rb_funcall(cASN1EndOfContent, rb_intern("new"), 0);
+	else {
+	    VALUE args[4] = { value, INT2NUM(tag), Qnil, tc };
+	    asn1data = rb_funcallv_public(klass, rb_intern("new"), 4, args);
+	}
 	if(tag == V_ASN1_BIT_STRING){
 	    rb_ivar_set(asn1data, sivUNUSED_BITS, LONG2NUM(flag));
 	}
     }
     else {
-	asn1data = rb_obj_alloc(cASN1Data);
-	ossl_asn1data_initialize(asn1data, value, INT2NUM(tag), tc);
+        VALUE args[3] = { value, INT2NUM(tag), tc };
+        asn1data = rb_funcallv_public(cASN1Data, rb_intern("new"), 3, args);
     }
 
     return asn1data;
@@ -833,29 +797,31 @@ int_ossl_asn1_decode0_cons(unsigned char **pp, long max_len, long length,
 	*num_read += inner_read;
 	available_len -= inner_read;
 
-	if (indefinite &&
-	    ossl_asn1_tag(value) == V_ASN1_EOC &&
-	    ossl_asn1_get_tag_class(value) == sym_UNIVERSAL) {
-	    break;
+	if (indefinite) {
+            if (ossl_asn1_tag(value) == V_ASN1_EOC &&
+                ossl_asn1_get_tag_class(value) == sym_UNIVERSAL)
+                break;
+            if (available_len == 0)
+                ossl_raise(eASN1Error, "EOC missing in indefinite length encoding");
 	}
 	rb_ary_push(ary, value);
     }
 
     if (tc == sym_UNIVERSAL) {
-	VALUE args[4];
-	if (tag == V_ASN1_SEQUENCE || tag == V_ASN1_SET)
-	    asn1data = rb_obj_alloc(*ossl_asn1_info[tag].klass);
-	else
-	    asn1data = rb_obj_alloc(cASN1Constructive);
-	args[0] = ary;
-	args[1] = INT2NUM(tag);
-	args[2] = Qnil;
-	args[3] = tc;
-	ossl_asn1_initialize(4, args, asn1data);
+        if (tag == V_ASN1_SEQUENCE) {
+            VALUE args[4] = { ary, INT2NUM(tag), Qnil, tc };
+            asn1data = rb_funcallv_public(cASN1Sequence, rb_intern("new"), 4, args);
+        } else if (tag == V_ASN1_SET) {
+            VALUE args[4] = { ary, INT2NUM(tag), Qnil, tc };
+            asn1data = rb_funcallv_public(cASN1Set, rb_intern("new"), 4, args);
+        } else {
+            VALUE args[4] = { ary, INT2NUM(tag), Qnil, tc };
+            asn1data = rb_funcallv_public(cASN1Constructive, rb_intern("new"), 4, args);
+        }
     }
     else {
-	asn1data = rb_obj_alloc(cASN1Data);
-	ossl_asn1data_initialize(asn1data, ary, INT2NUM(tag), tc);
+        VALUE args[3] = {ary, INT2NUM(tag), tc};
+        asn1data = rb_funcallv_public(cASN1Data, rb_intern("new"), 3, args);
     }
 
     if (indefinite)
@@ -1048,83 +1014,6 @@ ossl_asn1_decode_all(VALUE self, VALUE obj)
     return ary;
 }
 
-/*
- * call-seq:
- *    OpenSSL::ASN1::Primitive.new(value [, tag, tagging, tag_class ]) => Primitive
- *
- * _value_: is mandatory.
- *
- * _tag_: optional, may be specified for tagged values. If no _tag_ is
- * specified, the UNIVERSAL tag corresponding to the Primitive sub-class
- * is used by default.
- *
- * _tagging_: may be used as an encoding hint to encode a value either
- * explicitly or implicitly, see ASN1 for possible values.
- *
- * _tag_class_: if _tag_ and _tagging_ are +nil+ then this is set to
- * +:UNIVERSAL+ by default. If either _tag_ or _tagging_ are set then
- * +:CONTEXT_SPECIFIC+ is used as the default. For possible values please
- * cf. ASN1.
- *
- * == Example
- *   int = OpenSSL::ASN1::Integer.new(42)
- *   zero_tagged_int = OpenSSL::ASN1::Integer.new(42, 0, :IMPLICIT)
- *   private_explicit_zero_tagged_int = OpenSSL::ASN1::Integer.new(42, 0, :EXPLICIT, :PRIVATE)
- */
-static VALUE
-ossl_asn1_initialize(int argc, VALUE *argv, VALUE self)
-{
-    VALUE value, tag, tagging, tag_class;
-    int default_tag;
-
-    rb_scan_args(argc, argv, "13", &value, &tag, &tagging, &tag_class);
-    default_tag = ossl_asn1_default_tag(self);
-
-    if (default_tag == -1 || argc > 1) {
-	if(NIL_P(tag))
-	    ossl_raise(eASN1Error, "must specify tag number");
-	if(!NIL_P(tagging) && !SYMBOL_P(tagging))
-	    ossl_raise(eASN1Error, "invalid tagging method");
-	if(NIL_P(tag_class)) {
-	    if (NIL_P(tagging))
-		tag_class = sym_UNIVERSAL;
-	    else
-		tag_class = sym_CONTEXT_SPECIFIC;
-	}
-	if(!SYMBOL_P(tag_class))
-	    ossl_raise(eASN1Error, "invalid tag class");
-    }
-    else{
-	tag = INT2NUM(default_tag);
-	tagging = Qnil;
-	tag_class = sym_UNIVERSAL;
-    }
-    ossl_asn1_set_tag(self, tag);
-    ossl_asn1_set_value(self, value);
-    ossl_asn1_set_tagging(self, tagging);
-    ossl_asn1_set_tag_class(self, tag_class);
-    ossl_asn1_set_indefinite_length(self, Qfalse);
-    if (default_tag == V_ASN1_BIT_STRING)
-	rb_ivar_set(self, sivUNUSED_BITS, INT2FIX(0));
-
-    return self;
-}
-
-static VALUE
-ossl_asn1eoc_initialize(VALUE self) {
-    VALUE tag, tagging, tag_class, value;
-    tag = INT2FIX(0);
-    tagging = Qnil;
-    tag_class = sym_UNIVERSAL;
-    value = rb_str_new("", 0);
-    ossl_asn1_set_tag(self, tag);
-    ossl_asn1_set_value(self, value);
-    ossl_asn1_set_tagging(self, tagging);
-    ossl_asn1_set_tag_class(self, tag_class);
-    ossl_asn1_set_indefinite_length(self, Qfalse);
-    return self;
-}
-
 static VALUE
 ossl_asn1eoc_to_der(VALUE self)
 {
@@ -1163,9 +1052,12 @@ ossl_asn1prim_to_der(VALUE self)
 	rb_jump_tag(state);
     }
     p0 = p1 = (unsigned char *)RSTRING_PTR(str);
-    i2d_ASN1_TYPE(asn1, &p0);
+    if (i2d_ASN1_TYPE(asn1, &p0) < 0) {
+        ASN1_TYPE_free(asn1);
+        ossl_raise(eASN1Error, "i2d_ASN1_TYPE");
+    }
     ASN1_TYPE_free(asn1);
-    assert(p0 - p1 == alllen);
+    ossl_str_adjust(str, p0);
 
     /* Strip header since to_der_internal() wants only the payload */
     j = ASN1_get_object((const unsigned char **)&p1, &bodylen, &tag, &tc, alllen);
@@ -1213,27 +1105,6 @@ ossl_asn1cons_to_der(VALUE self)
     return to_der_internal(self, 1, indef_len, str);
 }
 
-/*
- * call-seq:
- *    asn1_ary.each { |asn1| block } => asn1_ary
- *
- * Calls the given block once for each element in self, passing that element
- * as parameter _asn1_. If no block is given, an enumerator is returned
- * instead.
- *
- * == Example
- *   asn1_ary.each do |asn1|
- *     puts asn1
- *   end
- */
-static VALUE
-ossl_asn1cons_each(VALUE self)
-{
-    rb_block_call(ossl_asn1_get_value(self), id_each, 0, 0, 0, 0);
-
-    return self;
-}
-
 /*
  * call-seq:
  *    OpenSSL::ASN1::ObjectId.register(object_id, short_name, long_name)
@@ -1298,30 +1169,6 @@ 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)
 {
@@ -1366,9 +1213,28 @@ ossl_asn1obj_get_oid(VALUE self)
     return str;
 }
 
+/*
+ *  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 oid1, oid2;
+
+    if (!rb_obj_is_kind_of(other, cASN1ObjectId))
+        return Qfalse;
+
+    oid1 = ossl_asn1obj_get_oid(self);
+    oid2 = ossl_asn1obj_get_oid(other);
+    return rb_str_equal(oid1, oid2);
+}
+
 #define OSSL_ASN1_IMPL_FACTORY_METHOD(klass) \
 static VALUE ossl_asn1_##klass(int argc, VALUE *argv, VALUE self)\
-{ return rb_funcall3(cASN1##klass, rb_intern("new"), argc, argv); }
+{ return rb_funcallv_public(cASN1##klass, rb_intern("new"), argc, argv); }
 
 OSSL_ASN1_IMPL_FACTORY_METHOD(Boolean)
 OSSL_ASN1_IMPL_FACTORY_METHOD(Integer)
@@ -1654,42 +1520,6 @@ Init_ossl_asn1(void)
      *   puts int2.value # => 1
      */
     cASN1Data = rb_define_class_under(mASN1, "ASN1Data", rb_cObject);
-    /*
-     * Carries the value of a ASN.1 type.
-     * Please confer Constructive and Primitive for the mappings between
-     * ASN.1 data types and Ruby classes.
-     */
-    rb_attr(cASN1Data, rb_intern("value"), 1, 1, 0);
-    /*
-     * An Integer representing the tag number of this ASN1Data. Never +nil+.
-     */
-    rb_attr(cASN1Data, rb_intern("tag"), 1, 1, 0);
-    /*
-     * A Symbol representing the tag class of this ASN1Data. Never +nil+.
-     * See ASN1Data for possible values.
-     */
-    rb_attr(cASN1Data, rb_intern("tag_class"), 1, 1, 0);
-    /*
-     * Never +nil+. A boolean value indicating whether the encoding uses
-     * indefinite length (in the case of parsing) or whether an indefinite
-     * length form shall be used (in the encoding case).
-     * In DER, every value uses definite length form. But in scenarios where
-     * large amounts of data need to be transferred it might be desirable to
-     * have some kind of streaming support available.
-     * For example, huge OCTET STRINGs are preferably sent in smaller-sized
-     * chunks, each at a time.
-     * This is possible in BER by setting the length bytes of an encoding
-     * to zero and by this indicating that the following value will be
-     * sent in chunks. Indefinite length encodings are always constructed.
-     * The end of such a stream of chunks is indicated by sending a EOC
-     * (End of Content) tag. SETs and SEQUENCEs may use an indefinite length
-     * encoding, but also primitive types such as e.g. OCTET STRINGS or
-     * BIT STRINGS may leverage this functionality (cf. ITU-T X.690).
-     */
-    rb_attr(cASN1Data, rb_intern("indefinite_length"), 1, 1, 0);
-    rb_define_alias(cASN1Data, "infinite_length", "indefinite_length");
-    rb_define_alias(cASN1Data, "infinite_length=", "indefinite_length=");
-    rb_define_method(cASN1Data, "initialize", ossl_asn1data_initialize, 3);
     rb_define_method(cASN1Data, "to_der", ossl_asn1data_to_der, 0);
 
     /* Document-class: OpenSSL::ASN1::Primitive
@@ -1757,16 +1587,6 @@ Init_ossl_asn1(void)
      *   prim_zero_tagged_explicit = <class>.new(value, 0, :EXPLICIT)
      */
     cASN1Primitive = rb_define_class_under(mASN1, "Primitive", cASN1Data);
-    /*
-     * May be used as a hint for encoding a value either implicitly or
-     * explicitly by setting it either to +:IMPLICIT+ or to +:EXPLICIT+.
-     * _tagging_ is not set when a ASN.1 structure is parsed using
-     * OpenSSL::ASN1.decode.
-     */
-    rb_attr(cASN1Primitive, rb_intern("tagging"), 1, 1, Qtrue);
-    rb_undef_method(cASN1Primitive, "indefinite_length=");
-    rb_undef_method(cASN1Primitive, "infinite_length=");
-    rb_define_method(cASN1Primitive, "initialize", ossl_asn1_initialize, -1);
     rb_define_method(cASN1Primitive, "to_der", ossl_asn1prim_to_der, 0);
 
     /* Document-class: OpenSSL::ASN1::Constructive
@@ -1797,17 +1617,7 @@ Init_ossl_asn1(void)
      *   set = OpenSSL::ASN1::Set.new( [ int, str ] )
      */
     cASN1Constructive = rb_define_class_under(mASN1,"Constructive", cASN1Data);
-    rb_include_module(cASN1Constructive, rb_mEnumerable);
-    /*
-     * May be used as a hint for encoding a value either implicitly or
-     * explicitly by setting it either to +:IMPLICIT+ or to +:EXPLICIT+.
-     * _tagging_ is not set when a ASN.1 structure is parsed using
-     * OpenSSL::ASN1.decode.
-     */
-    rb_attr(cASN1Constructive, rb_intern("tagging"), 1, 1, Qtrue);
-    rb_define_method(cASN1Constructive, "initialize", ossl_asn1_initialize, -1);
     rb_define_method(cASN1Constructive, "to_der", ossl_asn1cons_to_der, 0);
-    rb_define_method(cASN1Constructive, "each", ossl_asn1cons_each, 0);
 
 #define OSSL_ASN1_DEFINE_CLASS(name, super) \
 do{\
@@ -1856,13 +1666,10 @@ do{\
     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);
     rb_define_method(cASN1EndOfContent, "to_der", ossl_asn1eoc_to_der, 0);
 
     class_tag_map = rb_hash_new();
-    rb_gc_register_mark_object(class_tag_map);
     rb_hash_aset(class_tag_map, cASN1EndOfContent, INT2NUM(V_ASN1_EOC));
     rb_hash_aset(class_tag_map, cASN1Boolean, INT2NUM(V_ASN1_BOOLEAN));
     rb_hash_aset(class_tag_map, cASN1Integer, INT2NUM(V_ASN1_INTEGER));
@@ -1886,6 +1693,5 @@ do{\
     rb_hash_aset(class_tag_map, cASN1GeneralString, INT2NUM(V_ASN1_GENERALSTRING));
     rb_hash_aset(class_tag_map, cASN1UniversalString, INT2NUM(V_ASN1_UNIVERSALSTRING));
     rb_hash_aset(class_tag_map, cASN1BMPString, INT2NUM(V_ASN1_BMPSTRING));
-
-    id_each = rb_intern_const("each");
+    rb_define_const(mASN1, "CLASS_TAG_MAP", class_tag_map);
 }
diff --git a/ext/openssl/ossl_asn1.h b/ext/openssl/ossl_asn1.h
index 939a96ce7483c0..3b689c0ee7ded5 100644
--- a/ext/openssl/ossl_asn1.h
+++ b/ext/openssl/ossl_asn1.h
@@ -5,7 +5,7 @@
  */
 /*
  * This program is licensed under the same licence as Ruby.
- * (See the file 'LICENCE'.)
+ * (See the file 'COPYING'.)
  */
 #if !defined(_OSSL_ASN1_H_)
 #define _OSSL_ASN1_H_
@@ -38,24 +38,6 @@ extern VALUE mASN1;
 extern VALUE eASN1Error;
 
 extern VALUE cASN1Data;
-extern VALUE cASN1Primitive;
-extern VALUE cASN1Constructive;
-
-extern VALUE cASN1Boolean;                           /* BOOLEAN           */
-extern VALUE cASN1Integer, cASN1Enumerated;          /* INTEGER           */
-extern VALUE cASN1BitString;                         /* BIT STRING        */
-extern VALUE cASN1OctetString, cASN1UTF8String;      /* STRINGs           */
-extern VALUE cASN1NumericString, cASN1PrintableString;
-extern VALUE cASN1T61String, cASN1VideotexString;
-extern VALUE cASN1IA5String, cASN1GraphicString;
-extern VALUE cASN1ISO64String, cASN1GeneralString;
-extern VALUE cASN1UniversalString, cASN1BMPString;
-extern VALUE cASN1Null;                              /* NULL              */
-extern VALUE cASN1ObjectId;                          /* OBJECT IDENTIFIER */
-extern VALUE cASN1UTCTime, cASN1GeneralizedTime;     /* TIME              */
-extern VALUE cASN1Sequence, cASN1Set;                /* CONSTRUCTIVE      */
-
-ASN1_TYPE *ossl_asn1_get_asn1type(VALUE);
 
 void Init_ossl_asn1(void);
 
diff --git a/ext/openssl/ossl_bio.c b/ext/openssl/ossl_bio.c
index 42833d901acffa..2ef2080507b709 100644
--- a/ext/openssl/ossl_bio.c
+++ b/ext/openssl/ossl_bio.c
@@ -5,7 +5,7 @@
  */
 /*
  * This program is licensed under the same licence as Ruby.
- * (See the file 'LICENCE'.)
+ * (See the file 'COPYING'.)
  */
 #include "ossl.h"
 
diff --git a/ext/openssl/ossl_bio.h b/ext/openssl/ossl_bio.h
index da68c5e5a29f13..1b871f1cd7ab0c 100644
--- a/ext/openssl/ossl_bio.h
+++ b/ext/openssl/ossl_bio.h
@@ -5,7 +5,7 @@
  */
 /*
  * This program is licensed under the same licence as Ruby.
- * (See the file 'LICENCE'.)
+ * (See the file 'COPYING'.)
  */
 #if !defined(_OSSL_BIO_H_)
 #define _OSSL_BIO_H_
diff --git a/ext/openssl/ossl_bn.c b/ext/openssl/ossl_bn.c
index ce0d3ec7eed144..8699ce8ec5665b 100644
--- a/ext/openssl/ossl_bn.c
+++ b/ext/openssl/ossl_bn.c
@@ -5,15 +5,11 @@
  */
 /*
  * This program is licensed under the same licence as Ruby.
- * (See the file 'LICENCE'.)
+ * (See the file 'COPYING'.)
  */
 /* modified by Michal Rokos <m.rokos@sh.cvut.cz> */
 #include "ossl.h"
 
-#ifdef HAVE_RB_EXT_RACTOR_SAFE
-#include <ruby/ractor.h>
-#endif
-
 #define NewBN(klass) \
   TypedData_Wrap_Struct((klass), &ossl_bn_type, 0)
 #define SetBN(obj, bn) do { \
@@ -41,7 +37,7 @@ static const rb_data_type_t ossl_bn_type = {
     {
 	0, ossl_bn_free,
     },
-    0, 0, RUBY_TYPED_FREE_IMMEDIATELY | RUBY_TYPED_WB_PROTECTED,
+    0, 0, RUBY_TYPED_FREE_IMMEDIATELY | RUBY_TYPED_WB_PROTECTED | RUBY_TYPED_FROZEN_SHAREABLE,
 };
 
 /*
@@ -53,7 +49,7 @@ VALUE cBN;
  *
  * Generic Error for all of OpenSSL::BN (big num)
  */
-VALUE eBNError;
+static VALUE eBNError;
 
 /*
  * Public
@@ -156,19 +152,19 @@ ossl_bn_value_ptr(volatile VALUE *ptr)
  */
 
 #ifdef HAVE_RB_EXT_RACTOR_SAFE
-void
+static void
 ossl_bn_ctx_free(void *ptr)
 {
     BN_CTX *ctx = (BN_CTX *)ptr;
     BN_CTX_free(ctx);
 }
 
-struct rb_ractor_local_storage_type ossl_bn_ctx_key_type = {
+static struct rb_ractor_local_storage_type ossl_bn_ctx_key_type = {
     NULL, // mark
     ossl_bn_ctx_free,
 };
 
-rb_ractor_local_key_t ossl_bn_ctx_key;
+static rb_ractor_local_key_t ossl_bn_ctx_key;
 
 BN_CTX *
 ossl_bn_ctx_get(void)
@@ -244,7 +240,7 @@ ossl_bn_alloc(VALUE klass)
  *     number.
  *   - +10+ - Decimal number representation, with a leading '-' for a negative
  *     number.
- *   - +16+ - Hexadeciaml number representation, with a leading '-' for a
+ *   - +16+ - Hexadecimal number representation, with a leading '-' for a
  *     negative number.
  */
 static VALUE
@@ -263,6 +259,7 @@ ossl_bn_initialize(int argc, VALUE *argv, VALUE self)
         ossl_raise(rb_eArgError, "invalid argument");
     }
 
+    rb_check_frozen(self);
     if (RB_INTEGER_TYPE_P(str)) {
 	GetBN(self, bn);
 	integer_to_bnptr(str, bn);
@@ -326,7 +323,7 @@ ossl_bn_initialize(int argc, VALUE *argv, VALUE self)
  *     the bignum is ignored.
  *   - +10+ - Decimal number representation, with a leading '-' for a negative
  *     bignum.
- *   - +16+ - Hexadeciaml number representation, with a leading '-' for a
+ *   - +16+ - Hexadecimal number representation, with a leading '-' for a
  *     negative bignum.
  */
 static VALUE
@@ -693,6 +690,7 @@ BIGNUM_3c(mod_exp)
     ossl_bn_##func(VALUE self, VALUE bit)		\
     {							\
 	BIGNUM *bn;					\
+	rb_check_frozen(self);				\
 	GetBN(self, bn);				\
 	if (BN_##func(bn, NUM2INT(bit)) <= 0) {		\
 	    ossl_raise(eBNError, NULL);			\
@@ -782,6 +780,7 @@ BIGNUM_SHIFT(rshift)
     {							\
 	BIGNUM *bn;					\
 	int b;						\
+	rb_check_frozen(self);				\
 	b = NUM2INT(bits);				\
 	GetBN(self, bn);				\
 	if (BN_##func(bn, bn, b) <= 0)			\
@@ -930,6 +929,7 @@ BIGNUM_NUM(num_bytes)
  */
 BIGNUM_NUM(num_bits)
 
+/* :nodoc: */
 static VALUE
 ossl_bn_copy(VALUE self, VALUE other)
 {
@@ -1191,6 +1191,7 @@ ossl_bn_set_flags(VALUE self, VALUE arg)
     BIGNUM *bn;
     GetBN(self, bn);
 
+    rb_check_frozen(self);
     BN_set_flags(bn, NUM2INT(arg));
     return Qnil;
 }
diff --git a/ext/openssl/ossl_bn.h b/ext/openssl/ossl_bn.h
index 1cc041fc22faff..0c186bd1c5dd1f 100644
--- a/ext/openssl/ossl_bn.h
+++ b/ext/openssl/ossl_bn.h
@@ -5,13 +5,12 @@
  */
 /*
  * This program is licensed under the same licence as Ruby.
- * (See the file 'LICENCE'.)
+ * (See the file 'COPYING'.)
  */
 #if !defined(_OSSL_BN_H_)
 #define _OSSL_BN_H_
 
 extern VALUE cBN;
-extern VALUE eBNError;
 
 BN_CTX *ossl_bn_ctx_get(void);
 #define ossl_bn_ctx ossl_bn_ctx_get()
diff --git a/ext/openssl/ossl_cipher.c b/ext/openssl/ossl_cipher.c
index 110610e1f920a4..07e651335d53e1 100644
--- a/ext/openssl/ossl_cipher.c
+++ b/ext/openssl/ossl_cipher.c
@@ -5,7 +5,7 @@
  */
 /*
  * This program is licensed under the same licence as Ruby.
- * (See the file 'LICENCE'.)
+ * (See the file 'COPYING'.)
  */
 #include "ossl.h"
 
@@ -30,8 +30,8 @@
 /*
  * Classes
  */
-VALUE cCipher;
-VALUE eCipherError;
+static VALUE cCipher;
+static VALUE eCipherError;
 static ID id_auth_tag_len, id_key_set;
 
 static VALUE ossl_cipher_alloc(VALUE klass);
@@ -130,6 +130,7 @@ ossl_cipher_initialize(VALUE self, VALUE str)
     return self;
 }
 
+/* :nodoc: */
 static VALUE
 ossl_cipher_copy(VALUE self, VALUE other)
 {
@@ -197,47 +198,16 @@ ossl_cipher_reset(VALUE self)
 }
 
 static VALUE
-ossl_cipher_init(int argc, VALUE *argv, VALUE self, int mode)
+ossl_cipher_init(VALUE self, int enc)
 {
     EVP_CIPHER_CTX *ctx;
-    unsigned char key[EVP_MAX_KEY_LENGTH], *p_key = NULL;
-    unsigned char iv[EVP_MAX_IV_LENGTH], *p_iv = NULL;
-    VALUE pass, init_v;
-
-    if(rb_scan_args(argc, argv, "02", &pass, &init_v) > 0){
-	/*
-	 * oops. this code mistakes salt for IV.
-	 * We deprecated the arguments for this method, but we decided
-	 * keeping this behaviour for backward compatibility.
-	 */
-	VALUE cname  = rb_class_path(rb_obj_class(self));
-	rb_warn("arguments for %"PRIsVALUE"#encrypt and %"PRIsVALUE"#decrypt were deprecated; "
-                "use %"PRIsVALUE"#pkcs5_keyivgen to derive key and IV",
-                cname, cname, cname);
-	StringValue(pass);
-	GetCipher(self, ctx);
-	if (NIL_P(init_v)) memcpy(iv, "OpenSSL for Ruby rulez!", sizeof(iv));
-	else{
-	    StringValue(init_v);
-	    if (EVP_MAX_IV_LENGTH > RSTRING_LEN(init_v)) {
-		memset(iv, 0, EVP_MAX_IV_LENGTH);
-		memcpy(iv, RSTRING_PTR(init_v), RSTRING_LEN(init_v));
-	    }
-	    else memcpy(iv, RSTRING_PTR(init_v), sizeof(iv));
-	}
-	EVP_BytesToKey(EVP_CIPHER_CTX_cipher(ctx), EVP_md5(), iv,
-		       (unsigned char *)RSTRING_PTR(pass), RSTRING_LENINT(pass), 1, key, NULL);
-	p_key = key;
-	p_iv = iv;
-    }
-    else {
-	GetCipher(self, ctx);
-    }
-    if (EVP_CipherInit_ex(ctx, NULL, NULL, p_key, p_iv, mode) != 1) {
-	ossl_raise(eCipherError, NULL);
+
+    GetCipher(self, ctx);
+    if (EVP_CipherInit_ex(ctx, NULL, NULL, NULL, NULL, enc) != 1) {
+        ossl_raise(eCipherError, "EVP_CipherInit_ex");
     }
 
-    rb_ivar_set(self, id_key_set, p_key ? Qtrue : Qfalse);
+    rb_ivar_set(self, id_key_set, Qfalse);
 
     return self;
 }
@@ -255,9 +225,9 @@ ossl_cipher_init(int argc, VALUE *argv, VALUE self, int mode)
  *  Internally calls EVP_CipherInit_ex(ctx, NULL, NULL, NULL, NULL, 1).
  */
 static VALUE
-ossl_cipher_encrypt(int argc, VALUE *argv, VALUE self)
+ossl_cipher_encrypt(VALUE self)
 {
-    return ossl_cipher_init(argc, argv, self, 1);
+    return ossl_cipher_init(self, 1);
 }
 
 /*
@@ -273,9 +243,9 @@ ossl_cipher_encrypt(int argc, VALUE *argv, VALUE self)
  *  Internally calls EVP_CipherInit_ex(ctx, NULL, NULL, NULL, NULL, 0).
  */
 static VALUE
-ossl_cipher_decrypt(int argc, VALUE *argv, VALUE self)
+ossl_cipher_decrypt(VALUE self)
 {
-    return ossl_cipher_init(argc, argv, self, 0);
+    return ossl_cipher_init(self, 0);
 }
 
 /*
@@ -386,22 +356,37 @@ ossl_cipher_update(int argc, VALUE *argv, VALUE self)
     in = (unsigned char *)RSTRING_PTR(data);
     in_len = RSTRING_LEN(data);
     GetCipher(self, ctx);
-    out_len = in_len+EVP_CIPHER_CTX_block_size(ctx);
-    if (out_len <= 0) {
+
+    /*
+     * As of OpenSSL 3.2, there is no reliable way to determine the required
+     * output buffer size for arbitrary cipher modes.
+     * https://github.com/openssl/openssl/issues/22628
+     *
+     * in_len+block_size is usually sufficient, but AES key wrap with padding
+     * ciphers require in_len+15 even though they have a block size of 8 bytes.
+     *
+     * Using EVP_MAX_BLOCK_LENGTH (32) as a safe upper bound for ciphers
+     * currently implemented in OpenSSL, but this can change in the future.
+     */
+    if (in_len > LONG_MAX - EVP_MAX_BLOCK_LENGTH) {
 	ossl_raise(rb_eRangeError,
 		   "data too big to make output buffer: %ld bytes", in_len);
     }
+    out_len = in_len + EVP_MAX_BLOCK_LENGTH;
 
     if (NIL_P(str)) {
         str = rb_str_new(0, out_len);
     } else {
         StringValue(str);
-        rb_str_resize(str, out_len);
+        if ((long)rb_str_capacity(str) >= out_len)
+            rb_str_modify(str);
+        else
+            rb_str_modify_expand(str, out_len - RSTRING_LEN(str));
     }
 
     if (!ossl_cipher_update_long(ctx, (unsigned char *)RSTRING_PTR(str), &out_len, in, in_len))
 	ossl_raise(eCipherError, NULL);
-    assert(out_len < RSTRING_LEN(str));
+    assert(out_len <= RSTRING_LEN(str));
     rb_str_set_len(str, out_len);
 
     return str;
@@ -442,8 +427,8 @@ ossl_cipher_final(VALUE self)
  *  call-seq:
  *     cipher.name -> string
  *
- *  Returns the name of the cipher which may differ slightly from the original
- *  name provided.
+ *  Returns the short name of the cipher which may differ slightly from the
+ *  original name provided.
  */
 static VALUE
 ossl_cipher_name(VALUE self)
@@ -1048,8 +1033,8 @@ Init_ossl_cipher(void)
     rb_define_module_function(cCipher, "ciphers", ossl_s_ciphers, 0);
     rb_define_method(cCipher, "initialize", ossl_cipher_initialize, 1);
     rb_define_method(cCipher, "reset", ossl_cipher_reset, 0);
-    rb_define_method(cCipher, "encrypt", ossl_cipher_encrypt, -1);
-    rb_define_method(cCipher, "decrypt", ossl_cipher_decrypt, -1);
+    rb_define_method(cCipher, "encrypt", ossl_cipher_encrypt, 0);
+    rb_define_method(cCipher, "decrypt", ossl_cipher_decrypt, 0);
     rb_define_method(cCipher, "pkcs5_keyivgen", ossl_cipher_pkcs5_keyivgen, -1);
     rb_define_method(cCipher, "update", ossl_cipher_update, -1);
     rb_define_method(cCipher, "final", ossl_cipher_final, 0);
diff --git a/ext/openssl/ossl_cipher.h b/ext/openssl/ossl_cipher.h
index 2392d41c6a9df8..12da68ca3e9cd5 100644
--- a/ext/openssl/ossl_cipher.h
+++ b/ext/openssl/ossl_cipher.h
@@ -5,14 +5,11 @@
  */
 /*
  * This program is licensed under the same licence as Ruby.
- * (See the file 'LICENCE'.)
+ * (See the file 'COPYING'.)
  */
 #if !defined(_OSSL_CIPHER_H_)
 #define _OSSL_CIPHER_H_
 
-extern VALUE cCipher;
-extern VALUE eCipherError;
-
 const EVP_CIPHER *ossl_evp_get_cipherbyname(VALUE);
 VALUE ossl_cipher_new(const EVP_CIPHER *);
 void Init_ossl_cipher(void);
diff --git a/ext/openssl/ossl_config.c b/ext/openssl/ossl_config.c
index 0e598b4d518cf0..ee2ff6786fbb28 100644
--- a/ext/openssl/ossl_config.c
+++ b/ext/openssl/ossl_config.c
@@ -5,7 +5,7 @@
  */
 /*
  * This program is licensed under the same licence as Ruby.
- * (See the file 'LICENCE'.)
+ * (See the file 'COPYING'.)
  */
 #include "ossl.h"
 
@@ -22,7 +22,7 @@ static const rb_data_type_t ossl_config_type = {
     {
         0, nconf_free,
     },
-    0, 0, RUBY_TYPED_FREE_IMMEDIATELY | RUBY_TYPED_WB_PROTECTED,
+    0, 0, RUBY_TYPED_FREE_IMMEDIATELY | RUBY_TYPED_WB_PROTECTED | RUBY_TYPED_FROZEN_SHAREABLE,
 };
 
 CONF *
@@ -87,6 +87,7 @@ config_s_parse(VALUE klass, VALUE str)
 
     bio = ossl_obj2bio(&str);
     config_load_bio(conf, bio); /* Consumes BIO */
+    rb_obj_freeze(obj);
     return obj;
 }
 
@@ -144,6 +145,7 @@ config_initialize(int argc, VALUE *argv, VALUE self)
             ossl_raise(eConfigError, "BIO_new_file");
         config_load_bio(conf, bio); /* Consumes BIO */
     }
+    rb_obj_freeze(self);
     return self;
 }
 
@@ -158,6 +160,7 @@ config_initialize_copy(VALUE self, VALUE other)
     rb_check_frozen(self);
     bio = ossl_obj2bio(&str);
     config_load_bio(conf, bio); /* Consumes BIO */
+    rb_obj_freeze(self);
     return self;
 }
 
@@ -305,18 +308,16 @@ static IMPLEMENT_LHASH_DOALL_ARG_FN(dump_conf_value, CONF_VALUE, VALUE)
  *
  * Gets the parsable form of the current configuration.
  *
- * Given the following configuration being created:
+ * Given the following configuration file being loaded:
  *
- *   config = OpenSSL::Config.new
- *     #=> #<OpenSSL::Config sections=[]>
- *   config['default'] = {"foo"=>"bar","baz"=>"buz"}
- *     #=> {"foo"=>"bar", "baz"=>"buz"}
+ *   config = OpenSSL::Config.load('baz.cnf')
+ *     #=> #<OpenSSL::Config sections=["default"]>
  *   puts config.to_s
  *     #=> [ default ]
  *     #   foo=bar
  *     #   baz=buz
  *
- * You can parse get the serialized configuration using #to_s and then parse
+ * You can get the serialized configuration using #to_s and then parse
  * it later:
  *
  *   serialized_config = config.to_s
@@ -455,6 +456,6 @@ Init_ossl_config(void)
      * The default system configuration file for OpenSSL.
      */
     path = CONF_get1_default_config_file();
-    path_str = ossl_buf2str(path, rb_long2int(strlen(path)));
+    path_str = rb_obj_freeze(ossl_buf2str(path, rb_long2int(strlen(path))));
     rb_define_const(cConfig, "DEFAULT_CONFIG_FILE", path_str);
 }
diff --git a/ext/openssl/ossl_config.h b/ext/openssl/ossl_config.h
index 4e604f1aed36e2..a254360c2c81ef 100644
--- a/ext/openssl/ossl_config.h
+++ b/ext/openssl/ossl_config.h
@@ -5,7 +5,7 @@
  */
 /*
  * This program is licensed under the same licence as Ruby.
- * (See the file 'LICENCE'.)
+ * (See the file 'COPYING'.)
  */
 #ifndef OSSL_CONFIG_H
 #define OSSL_CONFIG_H
diff --git a/ext/openssl/ossl_digest.c b/ext/openssl/ossl_digest.c
index 16aeeb81069446..329de6c1bab078 100644
--- a/ext/openssl/ossl_digest.c
+++ b/ext/openssl/ossl_digest.c
@@ -5,7 +5,7 @@
  */
 /*
  * This program is licensed under the same licence as Ruby.
- * (See the file 'LICENCE'.)
+ * (See the file 'COPYING'.)
  */
 #include "ossl.h"
 
@@ -19,8 +19,8 @@
 /*
  * Classes
  */
-VALUE cDigest;
-VALUE eDigestError;
+static VALUE cDigest;
+static VALUE eDigestError;
 
 static VALUE ossl_digest_alloc(VALUE klass);
 
@@ -96,14 +96,15 @@ ossl_digest_alloc(VALUE klass)
     return TypedData_Wrap_Struct(klass, &ossl_digest_type, 0);
 }
 
-VALUE ossl_digest_update(VALUE, VALUE);
+static VALUE ossl_digest_update(VALUE, VALUE);
 
 /*
  *  call-seq:
  *     Digest.new(string [, data]) -> Digest
  *
  * Creates a Digest instance based on _string_, which is either the ln
- * (long name) or sn (short name) of a supported digest algorithm.
+ * (long name) or sn (short name) of a supported digest algorithm. A list of
+ * supported algorithms can be obtained by calling OpenSSL::Digest.digests.
  *
  * If _data_ (a String) is given, it is used as the initial input to the
  * Digest instance, i.e.
@@ -140,6 +141,7 @@ ossl_digest_initialize(int argc, VALUE *argv, VALUE self)
     return self;
 }
 
+/* :nodoc: */
 static VALUE
 ossl_digest_copy(VALUE self, VALUE other)
 {
@@ -162,6 +164,32 @@ ossl_digest_copy(VALUE self, VALUE other)
     return self;
 }
 
+static void
+add_digest_name_to_ary(const OBJ_NAME *name, void *arg)
+{
+    VALUE ary = (VALUE)arg;
+    rb_ary_push(ary, rb_str_new2(name->name));
+}
+
+/*
+ *  call-seq:
+ *     OpenSSL::Digest.digests -> array[string...]
+ *
+ *  Returns the names of all available digests in an array.
+ */
+static VALUE
+ossl_s_digests(VALUE self)
+{
+    VALUE ary;
+
+    ary = rb_ary_new();
+    OBJ_NAME_do_all_sorted(OBJ_NAME_TYPE_MD_METH,
+                    add_digest_name_to_ary,
+                    (void*)ary);
+
+    return ary;
+}
+
 /*
  *  call-seq:
  *     digest.reset -> self
@@ -198,7 +226,7 @@ ossl_digest_reset(VALUE self)
  *   result = digest.digest
  *
  */
-VALUE
+static VALUE
 ossl_digest_update(VALUE self, VALUE data)
 {
     EVP_MD_CTX *ctx;
@@ -218,23 +246,13 @@ ossl_digest_update(VALUE self, VALUE data)
  *
  */
 static VALUE
-ossl_digest_finish(int argc, VALUE *argv, VALUE self)
+ossl_digest_finish(VALUE self)
 {
     EVP_MD_CTX *ctx;
     VALUE str;
-    int out_len;
 
     GetDigest(self, ctx);
-    rb_scan_args(argc, argv, "01", &str);
-    out_len = EVP_MD_CTX_size(ctx);
-
-    if (NIL_P(str)) {
-        str = rb_str_new(NULL, out_len);
-    } else {
-        StringValue(str);
-        rb_str_resize(str, out_len);
-    }
-
+    str = rb_str_new(NULL, EVP_MD_CTX_size(ctx));
     if (!EVP_DigestFinal_ex(ctx, (unsigned char *)RSTRING_PTR(str), NULL))
 	ossl_raise(eDigestError, "EVP_DigestFinal_ex");
 
@@ -245,7 +263,8 @@ ossl_digest_finish(int argc, VALUE *argv, VALUE self)
  *  call-seq:
  *      digest.name -> string
  *
- * Returns the sn of this Digest algorithm.
+ * Returns the short name of this Digest algorithm which may differ slightly
+ * from the original name provided.
  *
  * === Example
  *   digest = OpenSSL::Digest.new('SHA512')
@@ -412,12 +431,13 @@ Init_ossl_digest(void)
 
     rb_define_alloc_func(cDigest, ossl_digest_alloc);
 
+    rb_define_module_function(cDigest, "digests", ossl_s_digests, 0);
     rb_define_method(cDigest, "initialize", ossl_digest_initialize, -1);
     rb_define_method(cDigest, "initialize_copy", ossl_digest_copy, 1);
     rb_define_method(cDigest, "reset", ossl_digest_reset, 0);
     rb_define_method(cDigest, "update", ossl_digest_update, 1);
     rb_define_alias(cDigest, "<<", "update");
-    rb_define_private_method(cDigest, "finish", ossl_digest_finish, -1);
+    rb_define_private_method(cDigest, "finish", ossl_digest_finish, 0);
     rb_define_method(cDigest, "digest_length", ossl_digest_size, 0);
     rb_define_method(cDigest, "block_length", ossl_digest_block_length, 0);
 
diff --git a/ext/openssl/ossl_digest.h b/ext/openssl/ossl_digest.h
index 50bf5666a37346..588a0c6f578a63 100644
--- a/ext/openssl/ossl_digest.h
+++ b/ext/openssl/ossl_digest.h
@@ -5,14 +5,11 @@
  */
 /*
  * This program is licensed under the same licence as Ruby.
- * (See the file 'LICENCE'.)
+ * (See the file 'COPYING'.)
  */
 #if !defined(_OSSL_DIGEST_H_)
 #define _OSSL_DIGEST_H_
 
-extern VALUE cDigest;
-extern VALUE eDigestError;
-
 const EVP_MD *ossl_evp_get_digestbyname(VALUE);
 VALUE ossl_digest_new(const EVP_MD *);
 void Init_ossl_digest(void);
diff --git a/ext/openssl/ossl_engine.c b/ext/openssl/ossl_engine.c
index 9e86321d062a93..cb08049a8214b7 100644
--- a/ext/openssl/ossl_engine.c
+++ b/ext/openssl/ossl_engine.c
@@ -5,7 +5,7 @@
  */
 /*
  * This program is licensed under the same licence as Ruby.
- * (See the file 'LICENCE'.)
+ * (See the file 'COPYING'.)
  */
 #include "ossl.h"
 
@@ -37,17 +37,16 @@
  *
  * See also, https://www.openssl.org/docs/crypto/engine.html
  */
-VALUE cEngine;
+static VALUE cEngine;
 /* Document-class: OpenSSL::Engine::EngineError
  *
  * This is the generic exception for OpenSSL::Engine related errors
  */
-VALUE eEngineError;
+static VALUE eEngineError;
 
 /*
  * Private
  */
-#if !defined(LIBRESSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER >= 0x10100000
 #define OSSL_ENGINE_LOAD_IF_MATCH(engine_name, x) \
 do{\
   if(!strcmp(#engine_name, RSTRING_PTR(name))){\
@@ -57,15 +56,6 @@ do{\
       ossl_raise(eEngineError, "OPENSSL_init_crypto"); \
   }\
 }while(0)
-#else
-#define OSSL_ENGINE_LOAD_IF_MATCH(engine_name, x)  \
-do{\
-  if(!strcmp(#engine_name, RSTRING_PTR(name))){\
-    ENGINE_load_##engine_name();\
-    return Qtrue;\
-  }\
-}while(0)
-#endif
 
 static void
 ossl_engine_free(void *engine)
@@ -102,50 +92,10 @@ ossl_engine_s_load(int argc, VALUE *argv, VALUE klass)
         return Qtrue;
     }
     StringValueCStr(name);
-#ifdef HAVE_ENGINE_LOAD_DYNAMIC
     OSSL_ENGINE_LOAD_IF_MATCH(dynamic, DYNAMIC);
-#endif
-#ifndef OPENSSL_NO_STATIC_ENGINE
-#ifdef HAVE_ENGINE_LOAD_4758CCA
-    OSSL_ENGINE_LOAD_IF_MATCH(4758cca, 4758CCA);
-#endif
-#ifdef HAVE_ENGINE_LOAD_AEP
-    OSSL_ENGINE_LOAD_IF_MATCH(aep, AEP);
-#endif
-#ifdef HAVE_ENGINE_LOAD_ATALLA
-    OSSL_ENGINE_LOAD_IF_MATCH(atalla, ATALLA);
-#endif
-#ifdef HAVE_ENGINE_LOAD_CHIL
-    OSSL_ENGINE_LOAD_IF_MATCH(chil, CHIL);
-#endif
-#ifdef HAVE_ENGINE_LOAD_CSWIFT
-    OSSL_ENGINE_LOAD_IF_MATCH(cswift, CSWIFT);
-#endif
-#ifdef HAVE_ENGINE_LOAD_NURON
-    OSSL_ENGINE_LOAD_IF_MATCH(nuron, NURON);
-#endif
-#ifdef HAVE_ENGINE_LOAD_SUREWARE
-    OSSL_ENGINE_LOAD_IF_MATCH(sureware, SUREWARE);
-#endif
-#ifdef HAVE_ENGINE_LOAD_UBSEC
-    OSSL_ENGINE_LOAD_IF_MATCH(ubsec, UBSEC);
-#endif
-#ifdef HAVE_ENGINE_LOAD_PADLOCK
     OSSL_ENGINE_LOAD_IF_MATCH(padlock, PADLOCK);
-#endif
-#ifdef HAVE_ENGINE_LOAD_CAPI
     OSSL_ENGINE_LOAD_IF_MATCH(capi, CAPI);
-#endif
-#ifdef HAVE_ENGINE_LOAD_GMP
-    OSSL_ENGINE_LOAD_IF_MATCH(gmp, GMP);
-#endif
-#ifdef HAVE_ENGINE_LOAD_GOST
-    OSSL_ENGINE_LOAD_IF_MATCH(gost, GOST);
-#endif
-#endif
-#ifdef HAVE_ENGINE_LOAD_CRYPTODEV
     OSSL_ENGINE_LOAD_IF_MATCH(cryptodev, CRYPTODEV);
-#endif
     OSSL_ENGINE_LOAD_IF_MATCH(openssl, OPENSSL);
     rb_warning("no such builtin loader for `%"PRIsVALUE"'", name);
     return Qnil;
@@ -163,9 +113,6 @@ ossl_engine_s_load(int argc, VALUE *argv, VALUE klass)
 static VALUE
 ossl_engine_s_cleanup(VALUE self)
 {
-#if defined(LIBRESSL_VERSION_NUMBER) || OPENSSL_VERSION_NUMBER < 0x10100000
-    ENGINE_cleanup();
-#endif
     return Qnil;
 }
 
@@ -549,12 +496,6 @@ Init_ossl_engine(void)
     DefEngineConst(METHOD_DSA);
     DefEngineConst(METHOD_DH);
     DefEngineConst(METHOD_RAND);
-#ifdef ENGINE_METHOD_BN_MOD_EXP
-    DefEngineConst(METHOD_BN_MOD_EXP);
-#endif
-#ifdef ENGINE_METHOD_BN_MOD_EXP_CRT
-    DefEngineConst(METHOD_BN_MOD_EXP_CRT);
-#endif
     DefEngineConst(METHOD_CIPHERS);
     DefEngineConst(METHOD_DIGESTS);
     DefEngineConst(METHOD_ALL);
diff --git a/ext/openssl/ossl_engine.h b/ext/openssl/ossl_engine.h
index cd548beea3192a..cedcebb77227bb 100644
--- a/ext/openssl/ossl_engine.h
+++ b/ext/openssl/ossl_engine.h
@@ -6,14 +6,11 @@
  */
 /*
  * This program is licensed under the same licence as Ruby.
- * (See the file 'LICENCE'.)
+ * (See the file 'COPYING'.)
  */
 #if !defined(OSSL_ENGINE_H)
 #define OSSL_ENGINE_H
 
-extern VALUE cEngine;
-extern VALUE eEngineError;
-
 void Init_ossl_engine(void);
 
 #endif /* OSSL_ENGINE_H */
diff --git a/ext/openssl/ossl_hmac.c b/ext/openssl/ossl_hmac.c
index c485ba7e678a50..b30482757997b6 100644
--- a/ext/openssl/ossl_hmac.c
+++ b/ext/openssl/ossl_hmac.c
@@ -5,7 +5,7 @@
  */
 /*
  * This program is licensed under the same licence as Ruby.
- * (See the file 'LICENCE'.)
+ * (See the file 'COPYING'.)
  */
 #include "ossl.h"
 
@@ -21,8 +21,8 @@
 /*
  * Classes
  */
-VALUE cHMAC;
-VALUE eHMACError;
+static VALUE cHMAC;
+static VALUE eHMACError;
 
 /*
  * Public
@@ -97,19 +97,11 @@ ossl_hmac_initialize(VALUE self, VALUE key, VALUE digest)
 
     GetHMAC(self, ctx);
     StringValue(key);
-#ifdef HAVE_EVP_PKEY_NEW_RAW_PRIVATE_KEY
     pkey = EVP_PKEY_new_raw_private_key(EVP_PKEY_HMAC, NULL,
                                         (unsigned char *)RSTRING_PTR(key),
                                         RSTRING_LENINT(key));
     if (!pkey)
         ossl_raise(eHMACError, "EVP_PKEY_new_raw_private_key");
-#else
-    pkey = EVP_PKEY_new_mac_key(EVP_PKEY_HMAC, NULL,
-                                (unsigned char *)RSTRING_PTR(key),
-                                RSTRING_LENINT(key));
-    if (!pkey)
-        ossl_raise(eHMACError, "EVP_PKEY_new_mac_key");
-#endif
     if (EVP_DigestSignInit(ctx, NULL, ossl_evp_get_digestbyname(digest),
                            NULL, pkey) != 1) {
         EVP_PKEY_free(pkey);
@@ -121,6 +113,7 @@ ossl_hmac_initialize(VALUE self, VALUE key, VALUE digest)
     return self;
 }
 
+/* :nodoc: */
 static VALUE
 ossl_hmac_copy(VALUE self, VALUE other)
 {
diff --git a/ext/openssl/ossl_hmac.h b/ext/openssl/ossl_hmac.h
index 7c51f4722d059a..e5bed37c9fc552 100644
--- a/ext/openssl/ossl_hmac.h
+++ b/ext/openssl/ossl_hmac.h
@@ -5,14 +5,11 @@
  */
 /*
  * This program is licensed under the same licence as Ruby.
- * (See the file 'LICENCE'.)
+ * (See the file 'COPYING'.)
  */
 #if !defined(_OSSL_HMAC_H_)
 #define _OSSL_HMAC_H_
 
-extern VALUE cHMAC;
-extern VALUE eHMACError;
-
 void Init_ossl_hmac(void);
 
 #endif /* _OSSL_HMAC_H_ */
diff --git a/ext/openssl/ossl_kdf.c b/ext/openssl/ossl_kdf.c
index 48b161d4f47749..f349939a80475e 100644
--- a/ext/openssl/ossl_kdf.c
+++ b/ext/openssl/ossl_kdf.c
@@ -3,9 +3,7 @@
  * Copyright (C) 2007, 2017 Ruby/OpenSSL Project Authors
  */
 #include "ossl.h"
-#if OSSL_OPENSSL_PREREQ(1, 1, 0) || OSSL_LIBRESSL_PREREQ(3, 6, 0)
-# include <openssl/kdf.h>
-#endif
+#include <openssl/kdf.h>
 
 static VALUE mKDF, eKDF;
 
@@ -18,7 +16,7 @@ static VALUE mKDF, eKDF;
  * of _length_ bytes.
  *
  * For more information about PBKDF2, see RFC 2898 Section 5.2
- * (https://tools.ietf.org/html/rfc2898#section-5.2).
+ * (https://www.rfc-editor.org/rfc/rfc2898#section-5.2).
  *
  * === Parameters
  * pass       :: The password.
@@ -81,10 +79,10 @@ kdf_pbkdf2_hmac(int argc, VALUE *argv, VALUE self)
  * bcrypt.
  *
  * The keyword arguments _N_, _r_ and _p_ can be used to tune scrypt. RFC 7914
- * (published on 2016-08, https://tools.ietf.org/html/rfc7914#section-2) states
+ * (published on 2016-08, https://www.rfc-editor.org/rfc/rfc7914#section-2) states
  * that using values r=8 and p=1 appears to yield good results.
  *
- * See RFC 7914 (https://tools.ietf.org/html/rfc7914) for more information.
+ * See RFC 7914 (https://www.rfc-editor.org/rfc/rfc7914) for more information.
  *
  * === Parameters
  * pass   :: Passphrase.
@@ -141,13 +139,12 @@ kdf_scrypt(int argc, VALUE *argv, VALUE self)
 }
 #endif
 
-#if OSSL_OPENSSL_PREREQ(1, 1, 0) || OSSL_LIBRESSL_PREREQ(3, 6, 0)
 /*
  * call-seq:
  *    KDF.hkdf(ikm, salt:, info:, length:, hash:) -> String
  *
  * HMAC-based Extract-and-Expand Key Derivation Function (HKDF) as specified in
- * {RFC 5869}[https://tools.ietf.org/html/rfc5869].
+ * {RFC 5869}[https://www.rfc-editor.org/rfc/rfc5869].
  *
  * New in OpenSSL 1.1.0.
  *
@@ -165,7 +162,7 @@ kdf_scrypt(int argc, VALUE *argv, VALUE self)
  *   The hash function.
  *
  * === Example
- *   # The values from https://datatracker.ietf.org/doc/html/rfc5869#appendix-A.1
+ *   # The values from https://www.rfc-editor.org/rfc/rfc5869#appendix-A.1
  *   ikm = ["0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b"].pack("H*")
  *   salt = ["000102030405060708090a0b0c"].pack("H*")
  *   info = ["f0f1f2f3f4f5f6f7f8f9"].pack("H*")
@@ -238,7 +235,6 @@ kdf_hkdf(int argc, VALUE *argv, VALUE self)
 
     return str;
 }
-#endif
 
 void
 Init_ossl_kdf(void)
@@ -305,7 +301,5 @@ Init_ossl_kdf(void)
 #if defined(HAVE_EVP_PBE_SCRYPT)
     rb_define_module_function(mKDF, "scrypt", kdf_scrypt, -1);
 #endif
-#if OSSL_OPENSSL_PREREQ(1, 1, 0) || OSSL_LIBRESSL_PREREQ(3, 6, 0)
     rb_define_module_function(mKDF, "hkdf", kdf_hkdf, -1);
-#endif
 }
diff --git a/ext/openssl/ossl_ns_spki.c b/ext/openssl/ossl_ns_spki.c
index 9bed1f330ec5e2..445aeeba152fa4 100644
--- a/ext/openssl/ossl_ns_spki.c
+++ b/ext/openssl/ossl_ns_spki.c
@@ -5,7 +5,7 @@
  */
 /*
  * This program is licensed under the same licence as Ruby.
- * (See the file 'LICENCE'.)
+ * (See the file 'COPYING'.)
  */
 #include "ossl.h"
 
@@ -27,9 +27,9 @@
 /*
  * Classes
  */
-VALUE mNetscape;
-VALUE cSPKI;
-VALUE eSPKIError;
+static VALUE mNetscape;
+static VALUE cSPKI;
+static VALUE eSPKIError;
 
 /*
  * Public functions
@@ -115,11 +115,11 @@ ossl_spki_to_der(VALUE self)
 
     GetSPKI(self, spki);
     if ((len = i2d_NETSCAPE_SPKI(spki, NULL)) <= 0)
-        ossl_raise(eX509CertError, NULL);
+        ossl_raise(eSPKIError, "i2d_NETSCAPE_SPKI");
     str = rb_str_new(0, len);
     p = (unsigned char *)RSTRING_PTR(str);
     if (i2d_NETSCAPE_SPKI(spki, &p) <= 0)
-        ossl_raise(eX509CertError, NULL);
+        ossl_raise(eSPKIError, "i2d_NETSCAPE_SPKI");
     ossl_str_adjust(str, p);
 
     return str;
@@ -365,8 +365,8 @@ ossl_spki_verify(VALUE self, VALUE key)
  *
  * OpenSSL::Netscape is a namespace for SPKI (Simple Public Key
  * Infrastructure) which implements Signed Public Key and Challenge.
- * See {RFC 2692}[http://tools.ietf.org/html/rfc2692] and {RFC
- * 2693}[http://tools.ietf.org/html/rfc2692] for details.
+ * See {RFC 2692}[https://www.rfc-editor.org/rfc/rfc2692] and {RFC
+ * 2693}[https://www.rfc-editor.org/rfc/rfc2692] for details.
  */
 
 /* Document-class: OpenSSL::Netscape::SPKIError
diff --git a/ext/openssl/ossl_ns_spki.h b/ext/openssl/ossl_ns_spki.h
index 62ba8cb16327bf..043b6cdb660b30 100644
--- a/ext/openssl/ossl_ns_spki.h
+++ b/ext/openssl/ossl_ns_spki.h
@@ -5,15 +5,11 @@
  */
 /*
  * This program is licensed under the same licence as Ruby.
- * (See the file 'LICENCE'.)
+ * (See the file 'COPYING'.)
  */
 #if !defined(_OSSL_NS_SPKI_H_)
 #define _OSSL_NS_SPKI_H_
 
-extern VALUE mNetscape;
-extern VALUE cSPKI;
-extern VALUE eSPKIError;
-
 void Init_ossl_ns_spki(void);
 
 #endif /* _OSSL_NS_SPKI_H_ */
diff --git a/ext/openssl/ossl_ocsp.c b/ext/openssl/ossl_ocsp.c
index df986bb3eeb0e2..cb2f1a62d0aa69 100644
--- a/ext/openssl/ossl_ocsp.c
+++ b/ext/openssl/ossl_ocsp.c
@@ -6,7 +6,7 @@
  */
 /*
  * This program is licensed under the same licence as Ruby.
- * (See the file 'LICENCE'.)
+ * (See the file 'COPYING'.)
  */
 #include "ossl.h"
 
@@ -67,13 +67,13 @@
     if(!(cid)) ossl_raise(rb_eRuntimeError, "Cert ID wasn't initialized!"); \
 } while (0)
 
-VALUE mOCSP;
-VALUE eOCSPError;
-VALUE cOCSPReq;
-VALUE cOCSPRes;
-VALUE cOCSPBasicRes;
-VALUE cOCSPSingleRes;
-VALUE cOCSPCertId;
+static VALUE mOCSP;
+static VALUE eOCSPError;
+static VALUE cOCSPReq;
+static VALUE cOCSPRes;
+static VALUE cOCSPBasicRes;
+static VALUE cOCSPSingleRes;
+static VALUE cOCSPCertId;
 
 static void
 ossl_ocsp_request_free(void *ptr)
@@ -173,6 +173,7 @@ ossl_ocspreq_alloc(VALUE klass)
     return obj;
 }
 
+/* :nodoc: */
 static VALUE
 ossl_ocspreq_initialize_copy(VALUE self, VALUE other)
 {
@@ -513,6 +514,7 @@ ossl_ocspres_alloc(VALUE klass)
     return obj;
 }
 
+/* :nodoc: */
 static VALUE
 ossl_ocspres_initialize_copy(VALUE self, VALUE other)
 {
@@ -669,6 +671,7 @@ ossl_ocspbres_alloc(VALUE klass)
     return obj;
 }
 
+/* :nodoc: */
 static VALUE
 ossl_ocspbres_initialize_copy(VALUE self, VALUE other)
 {
@@ -1157,6 +1160,7 @@ ossl_ocspsres_initialize(VALUE self, VALUE arg)
     return self;
 }
 
+/* :nodoc: */
 static VALUE
 ossl_ocspsres_initialize_copy(VALUE self, VALUE other)
 {
@@ -1418,6 +1422,7 @@ ossl_ocspcid_alloc(VALUE klass)
     return obj;
 }
 
+/* :nodoc: */
 static VALUE
 ossl_ocspcid_initialize_copy(VALUE self, VALUE other)
 {
diff --git a/ext/openssl/ossl_ocsp.h b/ext/openssl/ossl_ocsp.h
index 6d2aac8657c9d3..becd70ffedb832 100644
--- a/ext/openssl/ossl_ocsp.h
+++ b/ext/openssl/ossl_ocsp.h
@@ -6,18 +6,11 @@
  */
 /*
  * This program is licensed under the same licence as Ruby.
- * (See the file 'LICENCE'.)
+ * (See the file 'COPYING'.)
  */
 #if !defined(_OSSL_OCSP_H_)
 #define _OSSL_OCSP_H_
 
-#if !defined(OPENSSL_NO_OCSP)
-extern VALUE mOCSP;
-extern VALUE cOCSPReq;
-extern VALUE cOCSPRes;
-extern VALUE cOCSPBasicRes;
-#endif
-
 void Init_ossl_ocsp(void);
 
 #endif /* _OSSL_OCSP_H_ */
diff --git a/ext/openssl/ossl_pkcs12.c b/ext/openssl/ossl_pkcs12.c
index 164b2da465fba8..be09eb2071c125 100644
--- a/ext/openssl/ossl_pkcs12.c
+++ b/ext/openssl/ossl_pkcs12.c
@@ -1,6 +1,6 @@
 /*
  * This program is licensed under the same licence as Ruby.
- * (See the file 'LICENCE'.)
+ * (See the file 'COPYING'.)
  */
 #include "ossl.h"
 
@@ -27,8 +27,8 @@
 /*
  * Classes
  */
-VALUE cPKCS12;
-VALUE ePKCS12Error;
+static VALUE cPKCS12;
+static VALUE ePKCS12Error;
 
 /*
  * Private
@@ -60,6 +60,7 @@ ossl_pkcs12_s_allocate(VALUE klass)
     return obj;
 }
 
+/* :nodoc: */
 static VALUE
 ossl_pkcs12_initialize_copy(VALUE self, VALUE other)
 {
@@ -134,6 +135,16 @@ ossl_pkcs12_s_create(int argc, VALUE *argv, VALUE self)
     if (!NIL_P(keytype))
         ktype = NUM2INT(keytype);
 
+#if defined(OPENSSL_IS_AWSLC)
+    if (ktype != 0) {
+        ossl_raise(rb_eArgError, "Unknown key usage type %"PRIsVALUE, INT2NUM(ktype));
+    }
+#else
+    if (ktype != 0 && ktype != KEY_SIG && ktype != KEY_EX) {
+        ossl_raise(rb_eArgError, "Unknown key usage type %"PRIsVALUE, INT2NUM(ktype));
+    }
+#endif
+
     obj = NewPKCS12(cPKCS12);
     x509s = NIL_P(ca) ? NULL : ossl_x509_ary2sk(ca);
     p12 = PKCS12_create(passphrase, friendlyname, key, x509, x509s,
@@ -197,12 +208,8 @@ ossl_pkcs12_initialize(int argc, VALUE *argv, VALUE self)
     BIO_free(in);
 
     pkey = cert = ca = Qnil;
-    /* OpenSSL's bug; PKCS12_parse() puts errors even if it succeeds.
-     * Fixed in OpenSSL 1.0.0t, 1.0.1p, 1.0.2d */
-    ERR_set_mark();
     if(!PKCS12_parse(pkcs, passphrase, &key, &x509, &x509s))
 	ossl_raise(ePKCS12Error, "PKCS12_parse");
-    ERR_pop_to_mark();
     if (key) {
 	pkey = rb_protect(ossl_pkey_new_i, (VALUE)key, &st);
 	if (st) goto err;
@@ -247,6 +254,48 @@ ossl_pkcs12_to_der(VALUE self)
     return str;
 }
 
+/*
+ * call-seq:
+ *    pkcs12.set_mac(pass, salt = nil, iter = nil, md_type = nil)
+ *
+ * Sets MAC parameters and generates MAC over the PKCS #12 structure.
+ *
+ * This method uses HMAC and the PKCS #12 specific password-based KDF as
+ * specified in the original PKCS #12.
+ *
+ * See also the man page PKCS12_set_mac(3).
+ *
+ * Added in version 3.3.0.
+ */
+static VALUE
+pkcs12_set_mac(int argc, VALUE *argv, VALUE self)
+{
+    PKCS12 *p12;
+    VALUE pass, salt, iter, md_name;
+    int iter_i = 0;
+    const EVP_MD *md_type = NULL;
+
+    rb_scan_args(argc, argv, "13", &pass, &salt, &iter, &md_name);
+    rb_check_frozen(self);
+    GetPKCS12(self, p12);
+
+    StringValue(pass);
+    if (!NIL_P(salt))
+        StringValue(salt);
+    if (!NIL_P(iter))
+        iter_i = NUM2INT(iter);
+    if (!NIL_P(md_name))
+        md_type = ossl_evp_get_digestbyname(md_name);
+
+    if (!PKCS12_set_mac(p12, RSTRING_PTR(pass), RSTRING_LENINT(pass),
+                        !NIL_P(salt) ? (unsigned char *)RSTRING_PTR(salt) : NULL,
+                        !NIL_P(salt) ? RSTRING_LENINT(salt) : 0,
+                        iter_i, md_type))
+        ossl_raise(ePKCS12Error, "PKCS12_set_mac");
+
+    return Qnil;
+}
+
 void
 Init_ossl_pkcs12(void)
 {
@@ -272,4 +321,11 @@ Init_ossl_pkcs12(void)
     rb_attr(cPKCS12, rb_intern("ca_certs"), 1, 0, Qfalse);
     rb_define_method(cPKCS12, "initialize", ossl_pkcs12_initialize, -1);
     rb_define_method(cPKCS12, "to_der", ossl_pkcs12_to_der, 0);
+    rb_define_method(cPKCS12, "set_mac", pkcs12_set_mac, -1);
+
+#if !defined(OPENSSL_IS_AWSLC)
+    /* MSIE specific PKCS12 key usage extensions */
+    rb_define_const(cPKCS12, "KEY_EX", INT2NUM(KEY_EX));
+    rb_define_const(cPKCS12, "KEY_SIG", INT2NUM(KEY_SIG));
+#endif
 }
diff --git a/ext/openssl/ossl_pkcs12.h b/ext/openssl/ossl_pkcs12.h
index fe4f15ef60a109..6d2cd901cbceff 100644
--- a/ext/openssl/ossl_pkcs12.h
+++ b/ext/openssl/ossl_pkcs12.h
@@ -1,13 +1,10 @@
 /*
  * This program is licensed under the same licence as Ruby.
- * (See the file 'LICENCE'.)
+ * (See the file 'COPYING'.)
  */
 #if !defined(_OSSL_PKCS12_H_)
 #define _OSSL_PKCS12_H_
 
-extern VALUE cPKCS12;
-extern VALUE ePKCS12Error;
-
 void Init_ossl_pkcs12(void);
 
 #endif /* _OSSL_PKCS12_H_ */
diff --git a/ext/openssl/ossl_pkcs7.c b/ext/openssl/ossl_pkcs7.c
index 78dcbd667a78ea..4d719c96da141c 100644
--- a/ext/openssl/ossl_pkcs7.c
+++ b/ext/openssl/ossl_pkcs7.c
@@ -5,10 +5,25 @@
  */
 /*
  * This program is licensed under the same licence as Ruby.
- * (See the file 'LICENCE'.)
+ * (See the file 'COPYING'.)
  */
 #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 { \
@@ -49,10 +64,10 @@
 /*
  * Classes
  */
-VALUE cPKCS7;
-VALUE cPKCS7Signer;
-VALUE cPKCS7Recipient;
-VALUE ePKCS7Error;
+static VALUE cPKCS7;
+static VALUE cPKCS7Signer;
+static VALUE cPKCS7Recipient;
+static VALUE ePKCS7Error;
 
 static void
 ossl_pkcs7_free(void *ptr)
@@ -60,7 +75,7 @@ ossl_pkcs7_free(void *ptr)
     PKCS7_free(ptr);
 }
 
-const rb_data_type_t ossl_pkcs7_type = {
+static const rb_data_type_t ossl_pkcs7_type = {
     "OpenSSL/PKCS7",
     {
 	0, ossl_pkcs7_free,
@@ -68,6 +83,20 @@ const rb_data_type_t ossl_pkcs7_type = {
     0, 0, RUBY_TYPED_FREE_IMMEDIATELY | RUBY_TYPED_WB_PROTECTED,
 };
 
+VALUE
+ossl_pkcs7_new(PKCS7 *p7)
+{
+    PKCS7 *new;
+    VALUE obj = NewPKCS7(cPKCS7);
+
+    new = PKCS7_dup(p7);
+    if (!new)
+        ossl_raise(ePKCS7Error, "PKCS7_dup");
+    SetPKCS7(obj, new);
+
+    return obj;
+}
+
 static void
 ossl_pkcs7_signer_info_free(void *ptr)
 {
@@ -165,7 +194,13 @@ ossl_pkcs7_s_read_smime(VALUE klass, VALUE arg)
     out = NULL;
     pkcs7 = SMIME_read_PKCS7(in, &out);
     BIO_free(in);
-    if(!pkcs7) ossl_raise(ePKCS7Error, NULL);
+    if (!pkcs7)
+        ossl_raise(ePKCS7Error, "Could not parse the PKCS7");
+    if (!pkcs7->d.ptr) {
+        PKCS7_free(pkcs7);
+        ossl_raise(ePKCS7Error, "No content in PKCS7");
+    }
+
     data = out ? ossl_membio2str(out) : Qnil;
     SetPKCS7(ret, pkcs7);
     ossl_pkcs7_set_data(ret, data);
@@ -255,7 +290,14 @@ ossl_pkcs7_s_sign(int argc, VALUE *argv, VALUE klass)
 
 /*
  * call-seq:
- *    PKCS7.encrypt(certs, data, [, cipher [, flags]]) => pkcs7
+ *    PKCS7.encrypt(certs, data, cipher, flags = 0) => pkcs7
+ *
+ * Creates a PKCS #7 enveloped-data structure.
+ *
+ * Before version 3.3.0, +cipher+ was optional and defaulted to
+ * <tt>"RC2-40-CBC"</tt>.
+ *
+ * See also the man page PKCS7_encrypt(3).
  */
 static VALUE
 ossl_pkcs7_s_encrypt(int argc, VALUE *argv, VALUE klass)
@@ -269,21 +311,12 @@ ossl_pkcs7_s_encrypt(int argc, VALUE *argv, VALUE klass)
     PKCS7 *p7;
 
     rb_scan_args(argc, argv, "22", &certs, &data, &cipher, &flags);
-    if(NIL_P(cipher)){
-#if !defined(OPENSSL_NO_RC2)
-	ciph = EVP_rc2_40_cbc();
-#elif !defined(OPENSSL_NO_DES)
-	ciph = EVP_des_ede3_cbc();
-#elif !defined(OPENSSL_NO_RC2)
-	ciph = EVP_rc2_40_cbc();
-#elif !defined(OPENSSL_NO_AES)
-	ciph = EVP_EVP_aes_128_cbc();
-#else
-	ossl_raise(ePKCS7Error, "Must specify cipher");
-#endif
-
+    if (NIL_P(cipher)) {
+        rb_raise(rb_eArgError,
+                 "cipher must be specified. Before version 3.3, " \
+                 "the default cipher was RC2-40-CBC.");
     }
-    else ciph = ossl_evp_get_cipherbyname(cipher);
+    ciph = ossl_evp_get_cipherbyname(cipher);
     flg = NIL_P(flags) ? 0 : NUM2INT(flags);
     ret = NewPKCS7(cPKCS7);
     in = ossl_obj2bio(&data);
@@ -292,7 +325,7 @@ ossl_pkcs7_s_encrypt(int argc, VALUE *argv, VALUE klass)
 	BIO_free(in);
 	rb_jump_tag(status);
     }
-    if(!(p7 = PKCS7_encrypt(x509s, in, (EVP_CIPHER*)ciph, flg))){
+    if (!(p7 = PKCS7_encrypt(x509s, in, ciph, flg))) {
 	BIO_free(in);
 	sk_X509_pop_free(x509s, X509_free);
 	ossl_raise(ePKCS7Error, NULL);
@@ -346,6 +379,10 @@ ossl_pkcs7_initialize(int argc, VALUE *argv, VALUE self)
     BIO_free(in);
     if (!p7)
         ossl_raise(rb_eArgError, "Could not parse the PKCS7");
+    if (!p7->d.ptr) {
+        PKCS7_free(p7);
+        ossl_raise(rb_eArgError, "No content in PKCS7");
+    }
 
     RTYPEDDATA_DATA(self) = p7;
     PKCS7_free(p7_orig);
@@ -355,6 +392,7 @@ ossl_pkcs7_initialize(int argc, VALUE *argv, VALUE self)
     return self;
 }
 
+/* :nodoc: */
 static VALUE
 ossl_pkcs7_copy(VALUE self, VALUE other)
 {
@@ -520,21 +558,16 @@ ossl_pkcs7_get_signer(VALUE self)
 {
     PKCS7 *pkcs7;
     STACK_OF(PKCS7_SIGNER_INFO) *sk;
-    PKCS7_SIGNER_INFO *si;
     int num, i;
     VALUE ary;
 
     GetPKCS7(self, pkcs7);
-    if (!(sk = PKCS7_get_signer_info(pkcs7))) {
-	OSSL_Debug("OpenSSL::PKCS7#get_signer_info == NULL!");
-	return rb_ary_new();
-    }
-    if ((num = sk_PKCS7_SIGNER_INFO_num(sk)) < 0) {
-	ossl_raise(ePKCS7Error, "Negative number of signers!");
-    }
-    ary = rb_ary_new2(num);
+    if (!(sk = PKCS7_get_signer_info(pkcs7)))
+        return rb_ary_new();
+    num = sk_PKCS7_SIGNER_INFO_num(sk);
+    ary = rb_ary_new_capa(num);
     for (i=0; i<num; i++) {
-	si = sk_PKCS7_SIGNER_INFO_value(sk, i);
+	PKCS7_SIGNER_INFO *si = sk_PKCS7_SIGNER_INFO_value(sk, i);
 	rb_ary_push(ary, ossl_pkcs7si_new(si));
     }
 
@@ -567,7 +600,6 @@ ossl_pkcs7_get_recipient(VALUE self)
 {
     PKCS7 *pkcs7;
     STACK_OF(PKCS7_RECIP_INFO) *sk;
-    PKCS7_RECIP_INFO *si;
     int num, i;
     VALUE ary;
 
@@ -578,13 +610,11 @@ ossl_pkcs7_get_recipient(VALUE self)
 	sk = pkcs7->d.signed_and_enveloped->recipientinfo;
     else sk = NULL;
     if (!sk) return rb_ary_new();
-    if ((num = sk_PKCS7_RECIP_INFO_num(sk)) < 0) {
-	ossl_raise(ePKCS7Error, "Negative number of recipient!");
-    }
-    ary = rb_ary_new2(num);
+    num = sk_PKCS7_RECIP_INFO_num(sk);
+    ary = rb_ary_new_capa(num);
     for (i=0; i<num; i++) {
-	si = sk_PKCS7_RECIP_INFO_value(sk, i);
-	rb_ary_push(ary, ossl_pkcs7ri_new(si));
+        PKCS7_RECIP_INFO *ri = sk_PKCS7_RECIP_INFO_value(sk, i);
+        rb_ary_push(ary, ossl_pkcs7ri_new(ri));
     }
 
     return ary;
@@ -664,7 +694,10 @@ ossl_pkcs7_set_certificates(VALUE self, VALUE ary)
     X509 *cert;
 
     certs = pkcs7_get_certs(self);
-    while((cert = sk_X509_pop(certs))) X509_free(cert);
+    if (certs) {
+        while ((cert = sk_X509_pop(certs)))
+            X509_free(cert);
+    }
     rb_block_call(ary, rb_intern("each"), 0, 0, ossl_pkcs7_set_certs_i, self);
 
     return ary;
@@ -673,7 +706,10 @@ ossl_pkcs7_set_certificates(VALUE self, VALUE ary)
 static VALUE
 ossl_pkcs7_get_certificates(VALUE self)
 {
-    return ossl_x509_sk2ary(pkcs7_get_certs(self));
+    STACK_OF(X509) *certs = pkcs7_get_certs(self);
+    if (!certs)
+        return Qnil;
+    return ossl_x509_sk2ary(certs);
 }
 
 static VALUE
@@ -704,7 +740,10 @@ ossl_pkcs7_set_crls(VALUE self, VALUE ary)
     X509_CRL *crl;
 
     crls = pkcs7_get_crls(self);
-    while((crl = sk_X509_CRL_pop(crls))) X509_CRL_free(crl);
+    if (crls) {
+        while ((crl = sk_X509_CRL_pop(crls)))
+            X509_CRL_free(crl);
+    }
     rb_block_call(ary, rb_intern("each"), 0, 0, ossl_pkcs7_set_crls_i, self);
 
     return ary;
@@ -713,7 +752,10 @@ ossl_pkcs7_set_crls(VALUE self, VALUE ary)
 static VALUE
 ossl_pkcs7_get_crls(VALUE self)
 {
-    return ossl_x509crl_sk2ary(pkcs7_get_crls(self));
+    STACK_OF(X509_CRL) *crls = pkcs7_get_crls(self);
+    if (!crls)
+        return Qnil;
+    return ossl_x509crl_sk2ary(crls);
 }
 
 static VALUE
@@ -841,6 +883,25 @@ ossl_pkcs7_to_der(VALUE self)
     return str;
 }
 
+static VALUE
+ossl_pkcs7_to_text(VALUE self)
+{
+    PKCS7 *pkcs7;
+    BIO *out;
+    VALUE str;
+
+    GetPKCS7(self, pkcs7);
+    if(!(out = BIO_new(BIO_s_mem())))
+        ossl_raise(ePKCS7Error, NULL);
+    if(!PKCS7_print_ctx(out, pkcs7, 0, NULL)) {
+        BIO_free(out);
+        ossl_raise(ePKCS7Error, NULL);
+    }
+    str = ossl_membio2str(out);
+
+    return str;
+}
+
 static VALUE
 ossl_pkcs7_to_pem(VALUE self)
 {
@@ -891,7 +952,7 @@ ossl_pkcs7si_initialize(VALUE self, VALUE cert, VALUE key, VALUE digest)
     x509 = GetX509CertPtr(cert); /* NO NEED TO DUP */
     md = ossl_evp_get_digestbyname(digest);
     GetPKCS7si(self, p7si);
-    if (!(PKCS7_SIGNER_INFO_set(p7si, x509, pkey, (EVP_MD*)md))) {
+    if (!(PKCS7_SIGNER_INFO_set(p7si, x509, pkey, md))) {
 	ossl_raise(ePKCS7Error, NULL);
     }
 
@@ -1050,6 +1111,7 @@ Init_ossl_pkcs7(void)
     rb_define_method(cPKCS7, "to_pem", ossl_pkcs7_to_pem, 0);
     rb_define_alias(cPKCS7,  "to_s", "to_pem");
     rb_define_method(cPKCS7, "to_der", ossl_pkcs7_to_der, 0);
+    rb_define_method(cPKCS7, "to_text", ossl_pkcs7_to_text, 0);
 
     cPKCS7Signer = rb_define_class_under(cPKCS7, "SignerInfo", rb_cObject);
     rb_define_const(cPKCS7, "Signer", cPKCS7Signer);
diff --git a/ext/openssl/ossl_pkcs7.h b/ext/openssl/ossl_pkcs7.h
index 3e1b0946707163..140fda1835eece 100644
--- a/ext/openssl/ossl_pkcs7.h
+++ b/ext/openssl/ossl_pkcs7.h
@@ -5,32 +5,12 @@
  */
 /*
  * This program is licensed under the same licence as Ruby.
- * (See the file 'LICENCE'.)
+ * (See the file 'COPYING'.)
  */
 #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;
-extern VALUE ePKCS7Error;
-
+VALUE ossl_pkcs7_new(PKCS7 *p7);
 void Init_ossl_pkcs7(void);
 
 #endif /* _OSSL_PKCS7_H_ */
diff --git a/ext/openssl/ossl_pkey.c b/ext/openssl/ossl_pkey.c
index 013412c27f5329..b00a3648d141c6 100644
--- a/ext/openssl/ossl_pkey.c
+++ b/ext/openssl/ossl_pkey.c
@@ -5,7 +5,7 @@
  */
 /*
  * This program is licensed under the same licence as Ruby.
- * (See the file 'LICENCE'.)
+ * (See the file 'COPYING'.)
  */
 #include "ossl.h"
 
@@ -517,8 +517,7 @@ ossl_pkey_check_public_key(const EVP_PKEY *pkey)
     if (EVP_PKEY_missing_parameters(pkey))
 	ossl_raise(ePKeyError, "parameters missing");
 
-    /* OpenSSL < 1.1.0 takes non-const pointer */
-    ptr = EVP_PKEY_get0((EVP_PKEY *)pkey);
+    ptr = EVP_PKEY_get0(pkey);
     switch (EVP_PKEY_base_id(pkey)) {
       case EVP_PKEY_RSA:
 	RSA_get0_key(ptr, &n, &e, NULL);
@@ -616,6 +615,7 @@ ossl_pkey_initialize(VALUE self)
 }
 
 #ifdef HAVE_EVP_PKEY_DUP
+/* :nodoc: */
 static VALUE
 ossl_pkey_initialize_copy(VALUE self, VALUE other)
 {
@@ -635,7 +635,29 @@ ossl_pkey_initialize_copy(VALUE self, VALUE other)
 }
 #endif
 
-#ifdef HAVE_EVP_PKEY_NEW_RAW_PRIVATE_KEY
+#ifndef OSSL_USE_PROVIDER
+static int
+lookup_pkey_type(VALUE type)
+{
+    const EVP_PKEY_ASN1_METHOD *ameth;
+    int pkey_id;
+
+    StringValue(type);
+    /*
+     * XXX: EVP_PKEY_asn1_find_str() looks up a PEM type string. Should we use
+     * OBJ_txt2nid() instead (and then somehow check if the NID is an acceptable
+     * EVP_PKEY type)?
+     * It is probably fine, though, since it can handle all algorithms that
+     * support raw keys in 1.1.1: { X25519, X448, ED25519, ED448, HMAC }.
+     */
+    ameth = EVP_PKEY_asn1_find_str(NULL, RSTRING_PTR(type), RSTRING_LENINT(type));
+    if (!ameth)
+        ossl_raise(ePKeyError, "algorithm %"PRIsVALUE" not found", type);
+    EVP_PKEY_asn1_get0_info(&pkey_id, NULL, NULL, NULL, NULL, ameth);
+    return pkey_id;
+}
+#endif
+
 /*
  *  call-seq:
  *      OpenSSL::PKey.new_raw_private_key(algo, string) -> PKey
@@ -647,28 +669,27 @@ static VALUE
 ossl_pkey_new_raw_private_key(VALUE self, VALUE type, VALUE key)
 {
     EVP_PKEY *pkey;
-    const EVP_PKEY_ASN1_METHOD *ameth;
-    int pkey_id;
     size_t keylen;
 
-    StringValue(type);
     StringValue(key);
-    ameth = EVP_PKEY_asn1_find_str(NULL, RSTRING_PTR(type), RSTRING_LENINT(type));
-    if (!ameth)
-        ossl_raise(ePKeyError, "algorithm %"PRIsVALUE" not found", type);
-    EVP_PKEY_asn1_get0_info(&pkey_id, NULL, NULL, NULL, NULL, ameth);
-
     keylen = RSTRING_LEN(key);
 
+#ifdef OSSL_USE_PROVIDER
+    pkey = EVP_PKEY_new_raw_private_key_ex(NULL, StringValueCStr(type), NULL,
+                                           (unsigned char *)RSTRING_PTR(key),
+                                           keylen);
+    if (!pkey)
+        ossl_raise(ePKeyError, "EVP_PKEY_new_raw_private_key_ex");
+#else
+    int pkey_id = lookup_pkey_type(type);
     pkey = EVP_PKEY_new_raw_private_key(pkey_id, NULL, (unsigned char *)RSTRING_PTR(key), keylen);
     if (!pkey)
         ossl_raise(ePKeyError, "EVP_PKEY_new_raw_private_key");
+#endif
 
     return ossl_pkey_new(pkey);
 }
-#endif
 
-#ifdef HAVE_EVP_PKEY_NEW_RAW_PRIVATE_KEY
 /*
  *  call-seq:
  *      OpenSSL::PKey.new_raw_public_key(algo, string) -> PKey
@@ -680,26 +701,26 @@ static VALUE
 ossl_pkey_new_raw_public_key(VALUE self, VALUE type, VALUE key)
 {
     EVP_PKEY *pkey;
-    const EVP_PKEY_ASN1_METHOD *ameth;
-    int pkey_id;
     size_t keylen;
 
-    StringValue(type);
     StringValue(key);
-    ameth = EVP_PKEY_asn1_find_str(NULL, RSTRING_PTR(type), RSTRING_LENINT(type));
-    if (!ameth)
-        ossl_raise(ePKeyError, "algorithm %"PRIsVALUE" not found", type);
-    EVP_PKEY_asn1_get0_info(&pkey_id, NULL, NULL, NULL, NULL, ameth);
-
     keylen = RSTRING_LEN(key);
 
+#ifdef OSSL_USE_PROVIDER
+    pkey = EVP_PKEY_new_raw_public_key_ex(NULL, StringValueCStr(type), NULL,
+                                          (unsigned char *)RSTRING_PTR(key),
+                                          keylen);
+    if (!pkey)
+        ossl_raise(ePKeyError, "EVP_PKEY_new_raw_public_key_ex");
+#else
+    int pkey_id = lookup_pkey_type(type);
     pkey = EVP_PKEY_new_raw_public_key(pkey_id, NULL, (unsigned char *)RSTRING_PTR(key), keylen);
     if (!pkey)
         ossl_raise(ePKeyError, "EVP_PKEY_new_raw_public_key");
+#endif
 
     return ossl_pkey_new(pkey);
 }
-#endif
 
 /*
  * call-seq:
@@ -715,6 +736,10 @@ ossl_pkey_oid(VALUE self)
 
     GetPKey(self, pkey);
     nid = EVP_PKEY_id(pkey);
+#ifdef OSSL_USE_PROVIDER
+    if (nid == EVP_PKEY_KEYMGMT)
+        ossl_raise(ePKeyError, "EVP_PKEY_id");
+#endif
     return rb_str_new_cstr(OBJ_nid2sn(nid));
 }
 
@@ -728,13 +753,23 @@ static VALUE
 ossl_pkey_inspect(VALUE self)
 {
     EVP_PKEY *pkey;
-    int nid;
 
     GetPKey(self, pkey);
-    nid = EVP_PKEY_id(pkey);
-    return rb_sprintf("#<%"PRIsVALUE":%p oid=%s>",
-                      rb_class_name(CLASS_OF(self)), (void *)self,
-                      OBJ_nid2sn(nid));
+    VALUE str = rb_sprintf("#<%"PRIsVALUE":%p",
+                           rb_obj_class(self), (void *)self);
+    int nid = EVP_PKEY_id(pkey);
+#ifdef OSSL_USE_PROVIDER
+    if (nid != EVP_PKEY_KEYMGMT)
+#endif
+    rb_str_catf(str, " oid=%s", OBJ_nid2sn(nid));
+#ifdef OSSL_USE_PROVIDER
+    rb_str_catf(str, " type_name=%s", EVP_PKEY_get0_type_name(pkey));
+    const OSSL_PROVIDER *prov = EVP_PKEY_get0_provider(pkey);
+    if (prov)
+        rb_str_catf(str, " provider=%s", OSSL_PROVIDER_get0_name(prov));
+#endif
+    rb_str_catf(str, ">");
+    return str;
 }
 
 /*
@@ -799,20 +834,9 @@ ossl_pkey_export_traditional(int argc, VALUE *argv, VALUE self, int to_der)
 	}
     }
     else {
-#if OSSL_OPENSSL_PREREQ(1, 1, 0) || OSSL_LIBRESSL_PREREQ(3, 5, 0)
 	if (!PEM_write_bio_PrivateKey_traditional(bio, pkey, enc, NULL, 0,
 						  ossl_pem_passwd_cb,
 						  (void *)pass)) {
-#else
-	char pem_str[80];
-	const char *aname;
-
-	EVP_PKEY_asn1_get0_info(NULL, NULL, NULL, NULL, &aname, pkey->ameth);
-	snprintf(pem_str, sizeof(pem_str), "%s PRIVATE KEY", aname);
-	if (!PEM_ASN1_write_bio((i2d_of_void *)i2d_PrivateKey, pem_str, bio,
-				pkey, enc, NULL, 0, ossl_pem_passwd_cb,
-				(void *)pass)) {
-#endif
 	    BIO_free(bio);
 	    ossl_raise(ePKeyError, "PEM_write_bio_PrivateKey_traditional");
 	}
@@ -901,7 +925,6 @@ ossl_pkey_private_to_pem(int argc, VALUE *argv, VALUE self)
     return do_pkcs8_export(argc, argv, self, 0);
 }
 
-#ifdef HAVE_EVP_PKEY_NEW_RAW_PRIVATE_KEY
 /*
  *  call-seq:
  *     pkey.raw_private_key   => string
@@ -928,7 +951,6 @@ ossl_pkey_raw_private_key(VALUE self)
 
     return str;
 }
-#endif
 
 VALUE
 ossl_pkey_export_spki(VALUE self, int to_der)
@@ -937,6 +959,7 @@ ossl_pkey_export_spki(VALUE self, int to_der)
     BIO *bio;
 
     GetPKey(self, pkey);
+    ossl_pkey_check_public_key(pkey);
     bio = BIO_new(BIO_s_mem());
     if (!bio)
 	ossl_raise(ePKeyError, "BIO_new");
@@ -985,7 +1008,6 @@ ossl_pkey_public_to_pem(VALUE self)
     return ossl_pkey_export_spki(self, 0);
 }
 
-#ifdef HAVE_EVP_PKEY_NEW_RAW_PRIVATE_KEY
 /*
  *  call-seq:
  *     pkey.raw_public_key   => string
@@ -1012,7 +1034,6 @@ ossl_pkey_raw_public_key(VALUE self)
 
     return str;
 }
-#endif
 
 /*
  *  call-seq:
@@ -1116,7 +1137,6 @@ ossl_pkey_sign(int argc, VALUE *argv, VALUE self)
             rb_jump_tag(state);
         }
     }
-#if OSSL_OPENSSL_PREREQ(1, 1, 1) || OSSL_LIBRESSL_PREREQ(3, 4, 0)
     if (EVP_DigestSign(ctx, NULL, &siglen, (unsigned char *)RSTRING_PTR(data),
                        RSTRING_LEN(data)) < 1) {
         EVP_MD_CTX_free(ctx);
@@ -1137,30 +1157,6 @@ ossl_pkey_sign(int argc, VALUE *argv, VALUE self)
         EVP_MD_CTX_free(ctx);
         ossl_raise(ePKeyError, "EVP_DigestSign");
     }
-#else
-    if (EVP_DigestSignUpdate(ctx, RSTRING_PTR(data), RSTRING_LEN(data)) < 1) {
-        EVP_MD_CTX_free(ctx);
-        ossl_raise(ePKeyError, "EVP_DigestSignUpdate");
-    }
-    if (EVP_DigestSignFinal(ctx, NULL, &siglen) < 1) {
-        EVP_MD_CTX_free(ctx);
-        ossl_raise(ePKeyError, "EVP_DigestSignFinal");
-    }
-    if (siglen > LONG_MAX) {
-        EVP_MD_CTX_free(ctx);
-        rb_raise(ePKeyError, "signature would be too large");
-    }
-    sig = ossl_str_new(NULL, (long)siglen, &state);
-    if (state) {
-        EVP_MD_CTX_free(ctx);
-        rb_jump_tag(state);
-    }
-    if (EVP_DigestSignFinal(ctx, (unsigned char *)RSTRING_PTR(sig),
-                            &siglen) < 1) {
-        EVP_MD_CTX_free(ctx);
-        ossl_raise(ePKeyError, "EVP_DigestSignFinal");
-    }
-#endif
     EVP_MD_CTX_free(ctx);
     rb_str_set_len(sig, siglen);
     return sig;
@@ -1221,24 +1217,12 @@ ossl_pkey_verify(int argc, VALUE *argv, VALUE self)
             rb_jump_tag(state);
         }
     }
-#if OSSL_OPENSSL_PREREQ(1, 1, 1) || OSSL_LIBRESSL_PREREQ(3, 4, 0)
     ret = EVP_DigestVerify(ctx, (unsigned char *)RSTRING_PTR(sig),
                            RSTRING_LEN(sig), (unsigned char *)RSTRING_PTR(data),
                            RSTRING_LEN(data));
     EVP_MD_CTX_free(ctx);
     if (ret < 0)
         ossl_raise(ePKeyError, "EVP_DigestVerify");
-#else
-    if (EVP_DigestVerifyUpdate(ctx, RSTRING_PTR(data), RSTRING_LEN(data)) < 1) {
-        EVP_MD_CTX_free(ctx);
-        ossl_raise(ePKeyError, "EVP_DigestVerifyUpdate");
-    }
-    ret = EVP_DigestVerifyFinal(ctx, (unsigned char *)RSTRING_PTR(sig),
-                                RSTRING_LEN(sig));
-    EVP_MD_CTX_free(ctx);
-    if (ret < 0)
-        ossl_raise(ePKeyError, "EVP_DigestVerifyFinal");
-#endif
     if (ret)
         return Qtrue;
     else {
@@ -1751,10 +1735,8 @@ Init_ossl_pkey(void)
     rb_define_module_function(mPKey, "read", ossl_pkey_new_from_data, -1);
     rb_define_module_function(mPKey, "generate_parameters", ossl_pkey_s_generate_parameters, -1);
     rb_define_module_function(mPKey, "generate_key", ossl_pkey_s_generate_key, -1);
-#ifdef HAVE_EVP_PKEY_NEW_RAW_PRIVATE_KEY
     rb_define_module_function(mPKey, "new_raw_private_key", ossl_pkey_new_raw_private_key, 2);
     rb_define_module_function(mPKey, "new_raw_public_key", ossl_pkey_new_raw_public_key, 2);
-#endif
 
     rb_define_alloc_func(cPKey, ossl_pkey_alloc);
     rb_define_method(cPKey, "initialize", ossl_pkey_initialize, 0);
@@ -1770,10 +1752,8 @@ Init_ossl_pkey(void)
     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);
-#ifdef HAVE_EVP_PKEY_NEW_RAW_PRIVATE_KEY
     rb_define_method(cPKey, "raw_private_key", ossl_pkey_raw_private_key, 0);
     rb_define_method(cPKey, "raw_public_key", ossl_pkey_raw_public_key, 0);
-#endif
     rb_define_method(cPKey, "compare?", ossl_pkey_compare, 1);
 
     rb_define_method(cPKey, "sign", ossl_pkey_sign, -1);
diff --git a/ext/openssl/ossl_pkey.h b/ext/openssl/ossl_pkey.h
index 10669b824c8814..fdc5e94aed0e8c 100644
--- a/ext/openssl/ossl_pkey.h
+++ b/ext/openssl/ossl_pkey.h
@@ -5,7 +5,7 @@
  */
 /*
  * This program is licensed under the same licence as Ruby.
- * (See the file 'LICENCE'.)
+ * (See the file 'COPYING'.)
  */
 #if !defined(OSSL_PKEY_H)
 #define OSSL_PKEY_H
@@ -53,35 +53,24 @@ void Init_ossl_pkey(void);
  * RSA
  */
 extern VALUE cRSA;
-extern VALUE eRSAError;
-
 void Init_ossl_rsa(void);
 
 /*
  * DSA
  */
 extern VALUE cDSA;
-extern VALUE eDSAError;
-
 void Init_ossl_dsa(void);
 
 /*
  * DH
  */
 extern VALUE cDH;
-extern VALUE eDHError;
-
 void Init_ossl_dh(void);
 
 /*
  * EC
  */
 extern VALUE cEC;
-extern VALUE eECError;
-extern VALUE cEC_GROUP;
-extern VALUE eEC_GROUP;
-extern VALUE cEC_POINT;
-extern VALUE eEC_POINT;
 VALUE ossl_ec_new(EVP_PKEY *);
 void Init_ossl_ec(void);
 
@@ -136,7 +125,7 @@ static VALUE ossl_##_keytype##_set_##_group(VALUE self, VALUE v1, VALUE v2, VALU
 		BN_clear_free(bn1);					\
 		BN_clear_free(bn2);					\
 		BN_clear_free(bn3);					\
-		ossl_raise(eBNError, NULL);				\
+		ossl_raise(ePKeyError, "BN_dup");			\
 	}								\
 									\
 	if (!_type##_set0_##_group(obj, bn1, bn2, bn3)) {		\
@@ -164,7 +153,7 @@ static VALUE ossl_##_keytype##_set_##_group(VALUE self, VALUE v1, VALUE v2) \
             (orig_bn2 && !(bn2 = BN_dup(orig_bn2)))) {			\
 		BN_clear_free(bn1);					\
 		BN_clear_free(bn2);					\
-		ossl_raise(eBNError, NULL);				\
+		ossl_raise(ePKeyError, "BN_dup");			\
 	}								\
 									\
 	if (!_type##_set0_##_group(obj, bn1, bn2)) {			\
diff --git a/ext/openssl/ossl_pkey_dh.c b/ext/openssl/ossl_pkey_dh.c
index a231814a99b875..118d29f04fffed 100644
--- a/ext/openssl/ossl_pkey_dh.c
+++ b/ext/openssl/ossl_pkey_dh.c
@@ -5,7 +5,7 @@
  */
 /*
  * This program is licensed under the same licence as Ruby.
- * (See the file 'LICENCE'.)
+ * (See the file 'COPYING'.)
  */
 #include "ossl.h"
 
@@ -27,7 +27,7 @@
  * Classes
  */
 VALUE cDH;
-VALUE eDHError;
+static VALUE eDHError;
 
 /*
  * Private
@@ -128,6 +128,7 @@ ossl_dh_initialize(int argc, VALUE *argv, VALUE self)
 }
 
 #ifndef HAVE_EVP_PKEY_DUP
+/* :nodoc: */
 static VALUE
 ossl_dh_initialize_copy(VALUE self, VALUE other)
 {
@@ -284,35 +285,6 @@ ossl_dh_to_der(VALUE self)
     return str;
 }
 
-/*
- *  call-seq:
- *     dh.params -> hash
- *
- * Stores all parameters of key to the hash
- * INSECURE: PRIVATE INFORMATIONS CAN LEAK OUT!!!
- * Don't use :-)) (I's up to you)
- */
-static VALUE
-ossl_dh_get_params(VALUE self)
-{
-    OSSL_3_const DH *dh;
-    VALUE hash;
-    const BIGNUM *p, *q, *g, *pub_key, *priv_key;
-
-    GetDH(self, dh);
-    DH_get0_pqg(dh, &p, &q, &g);
-    DH_get0_key(dh, &pub_key, &priv_key);
-
-    hash = rb_hash_new();
-    rb_hash_aset(hash, rb_str_new2("p"), ossl_bn_new(p));
-    rb_hash_aset(hash, rb_str_new2("q"), ossl_bn_new(q));
-    rb_hash_aset(hash, rb_str_new2("g"), ossl_bn_new(g));
-    rb_hash_aset(hash, rb_str_new2("pub_key"), ossl_bn_new(pub_key));
-    rb_hash_aset(hash, rb_str_new2("priv_key"), ossl_bn_new(priv_key));
-
-    return hash;
-}
-
 /*
  *  call-seq:
  *     dh.params_ok? -> true | false
@@ -443,8 +415,6 @@ Init_ossl_dh(void)
     DEF_OSSL_PKEY_BN(cDH, dh, priv_key);
     rb_define_method(cDH, "set_pqg", ossl_dh_set_pqg, 3);
     rb_define_method(cDH, "set_key", ossl_dh_set_key, 2);
-
-    rb_define_method(cDH, "params", ossl_dh_get_params, 0);
 }
 
 #else /* defined NO_DH */
diff --git a/ext/openssl/ossl_pkey_dsa.c b/ext/openssl/ossl_pkey_dsa.c
index 058ce738882adb..9f4f012cfe1686 100644
--- a/ext/openssl/ossl_pkey_dsa.c
+++ b/ext/openssl/ossl_pkey_dsa.c
@@ -5,7 +5,7 @@
  */
 /*
  * This program is licensed under the same licence as Ruby.
- * (See the file 'LICENCE'.)
+ * (See the file 'COPYING'.)
  */
 #include "ossl.h"
 
@@ -41,7 +41,7 @@ DSA_PRIVATE(VALUE obj, OSSL_3_const DSA *dsa)
  * Classes
  */
 VALUE cDSA;
-VALUE eDSAError;
+static VALUE eDSAError;
 
 /*
  * Private
@@ -140,6 +140,7 @@ ossl_dsa_initialize(int argc, VALUE *argv, VALUE self)
 }
 
 #ifndef HAVE_EVP_PKEY_DUP
+/* :nodoc: */
 static VALUE
 ossl_dsa_initialize_copy(VALUE self, VALUE other)
 {
@@ -303,35 +304,6 @@ ossl_dsa_to_der(VALUE self)
 }
 
 
-/*
- *  call-seq:
- *    dsa.params -> hash
- *
- * Stores all parameters of key to the hash
- * INSECURE: PRIVATE INFORMATIONS CAN LEAK OUT!!!
- * Don't use :-)) (I's up to you)
- */
-static VALUE
-ossl_dsa_get_params(VALUE self)
-{
-    OSSL_3_const DSA *dsa;
-    VALUE hash;
-    const BIGNUM *p, *q, *g, *pub_key, *priv_key;
-
-    GetDSA(self, dsa);
-    DSA_get0_pqg(dsa, &p, &q, &g);
-    DSA_get0_key(dsa, &pub_key, &priv_key);
-
-    hash = rb_hash_new();
-    rb_hash_aset(hash, rb_str_new2("p"), ossl_bn_new(p));
-    rb_hash_aset(hash, rb_str_new2("q"), ossl_bn_new(q));
-    rb_hash_aset(hash, rb_str_new2("g"), ossl_bn_new(g));
-    rb_hash_aset(hash, rb_str_new2("pub_key"), ossl_bn_new(pub_key));
-    rb_hash_aset(hash, rb_str_new2("priv_key"), ossl_bn_new(priv_key));
-
-    return hash;
-}
-
 /*
  * Document-method: OpenSSL::PKey::DSA#set_pqg
  * call-seq:
@@ -396,8 +368,6 @@ Init_ossl_dsa(void)
     DEF_OSSL_PKEY_BN(cDSA, dsa, priv_key);
     rb_define_method(cDSA, "set_pqg", ossl_dsa_set_pqg, 3);
     rb_define_method(cDSA, "set_key", ossl_dsa_set_key, 2);
-
-    rb_define_method(cDSA, "params", ossl_dsa_get_params, 0);
 }
 
 #else /* defined NO_DSA */
diff --git a/ext/openssl/ossl_pkey_ec.c b/ext/openssl/ossl_pkey_ec.c
index 4b3a1fd0febb09..45e8bf19b246e7 100644
--- a/ext/openssl/ossl_pkey_ec.c
+++ b/ext/openssl/ossl_pkey_ec.c
@@ -41,17 +41,14 @@ static const rb_data_type_t ossl_ec_point_type;
 } while (0)
 
 VALUE cEC;
-VALUE eECError;
-VALUE cEC_GROUP;
-VALUE eEC_GROUP;
-VALUE cEC_POINT;
-VALUE eEC_POINT;
+static VALUE eECError;
+static VALUE cEC_GROUP;
+static VALUE eEC_GROUP;
+static VALUE cEC_POINT;
+static VALUE eEC_POINT;
 
-static ID s_GFp, s_GF2m;
-
-static ID ID_uncompressed;
-static ID ID_compressed;
-static ID ID_hybrid;
+static VALUE sym_GFp, sym_GF2m;
+static VALUE sym_uncompressed, sym_compressed, sym_hybrid;
 
 static ID id_i_group;
 
@@ -174,7 +171,7 @@ static VALUE ossl_ec_key_initialize(int argc, VALUE *argv, VALUE self)
     type = EVP_PKEY_base_id(pkey);
     if (type != EVP_PKEY_EC) {
         EVP_PKEY_free(pkey);
-        rb_raise(eDSAError, "incorrect pkey type: %s", OBJ_nid2sn(type));
+        rb_raise(eECError, "incorrect pkey type: %s", OBJ_nid2sn(type));
     }
     RTYPEDDATA_DATA(self) = pkey;
     return self;
@@ -191,6 +188,7 @@ static VALUE ossl_ec_key_initialize(int argc, VALUE *argv, VALUE self)
 }
 
 #ifndef HAVE_EVP_PKEY_DUP
+/* :nodoc: */
 static VALUE
 ossl_ec_key_initialize_copy(VALUE self, VALUE other)
 {
@@ -657,8 +655,11 @@ static VALUE ossl_ec_group_initialize(int argc, VALUE *argv, VALUE self)
 		ossl_clear_error(); /* ignore errors in d2i_ECPKParameters_bio() */
                 if (nid == NID_undef)
                     ossl_raise(eEC_GROUP, "unknown curve name (%"PRIsVALUE")", arg1);
-
+#if !defined(OPENSSL_IS_AWSLC)
                 group = EC_GROUP_new_by_curve_name(nid);
+#else /* EC_GROUPs are static and immutable by default in AWS-LC. */
+                group = EC_GROUP_new_by_curve_name_mutable(nid);
+#endif
                 if (group == NULL)
                     ossl_raise(eEC_GROUP, "unable to create curve (%"PRIsVALUE")", arg1);
 
@@ -670,19 +671,20 @@ static VALUE ossl_ec_group_initialize(int argc, VALUE *argv, VALUE self)
         break;
     case 4:
         if (SYMBOL_P(arg1)) {
-            ID id = SYM2ID(arg1);
             EC_GROUP *(*new_curve)(const BIGNUM *, const BIGNUM *, const BIGNUM *, BN_CTX *) = NULL;
             const BIGNUM *p = GetBNPtr(arg2);
             const BIGNUM *a = GetBNPtr(arg3);
             const BIGNUM *b = GetBNPtr(arg4);
 
-            if (id == s_GFp) {
+            if (arg1 == sym_GFp) {
                 new_curve = EC_GROUP_new_curve_GFp;
+            }
 #if !defined(OPENSSL_NO_EC2M)
-            } else if (id == s_GF2m) {
+            else if (arg1 == sym_GF2m) {
                 new_curve = EC_GROUP_new_curve_GF2m;
+            }
 #endif
-            } else {
+            else {
                 ossl_raise(rb_eArgError, "unknown symbol, must be :GFp or :GF2m");
             }
 
@@ -703,6 +705,7 @@ static VALUE ossl_ec_group_initialize(int argc, VALUE *argv, VALUE self)
     return self;
 }
 
+/* :nodoc: */
 static VALUE
 ossl_ec_group_initialize_copy(VALUE self, VALUE other)
 {
@@ -953,37 +956,36 @@ static VALUE ossl_ec_group_set_asn1_flag(VALUE self, VALUE flag_v)
  */
 static VALUE ossl_ec_group_get_point_conversion_form(VALUE self)
 {
-    EC_GROUP *group = NULL;
+    EC_GROUP *group;
     point_conversion_form_t form;
-    VALUE ret;
 
     GetECGroup(self, group);
     form = EC_GROUP_get_point_conversion_form(group);
 
     switch (form) {
-    case POINT_CONVERSION_UNCOMPRESSED:	ret = ID_uncompressed; break;
-    case POINT_CONVERSION_COMPRESSED:	ret = ID_compressed; break;
-    case POINT_CONVERSION_HYBRID:	ret = ID_hybrid; break;
-    default:	ossl_raise(eEC_GROUP, "unsupported point conversion form: %d, this module should be updated", form);
+      case POINT_CONVERSION_UNCOMPRESSED:
+        return sym_uncompressed;
+      case POINT_CONVERSION_COMPRESSED:
+        return sym_compressed;
+      case POINT_CONVERSION_HYBRID:
+        return sym_hybrid;
+      default:
+        ossl_raise(eEC_GROUP, "unsupported point conversion form: %d, " \
+                   "this module should be updated", form);
     }
-
-   return ID2SYM(ret);
 }
 
 static point_conversion_form_t
 parse_point_conversion_form_symbol(VALUE sym)
 {
-    ID id = SYM2ID(sym);
-
-    if (id == ID_uncompressed)
+    if (sym == sym_uncompressed)
 	return POINT_CONVERSION_UNCOMPRESSED;
-    else if (id == ID_compressed)
+    if (sym == sym_compressed)
 	return POINT_CONVERSION_COMPRESSED;
-    else if (id == ID_hybrid)
+    if (sym == sym_hybrid)
 	return POINT_CONVERSION_HYBRID;
-    else
-	ossl_raise(rb_eArgError, "unsupported point conversion form %+"PRIsVALUE
-		   " (expected :compressed, :uncompressed, or :hybrid)", sym);
+    ossl_raise(rb_eArgError, "unsupported point conversion form %+"PRIsVALUE
+               " (expected :compressed, :uncompressed, or :hybrid)", sym);
 }
 
 /*
@@ -1258,6 +1260,7 @@ static VALUE ossl_ec_point_initialize(int argc, VALUE *argv, VALUE self)
     return self;
 }
 
+/* :nodoc: */
 static VALUE
 ossl_ec_point_initialize_copy(VALUE self, VALUE other)
 {
@@ -1367,7 +1370,7 @@ static VALUE ossl_ec_point_make_affine(VALUE self)
     GetECPointGroup(self, group);
 
     rb_warn("OpenSSL::PKey::EC::Point#make_affine! is deprecated");
-#if !OSSL_OPENSSL_PREREQ(3, 0, 0)
+#if !OSSL_OPENSSL_PREREQ(3, 0, 0) && !defined(OPENSSL_IS_AWSLC)
     if (EC_POINT_make_affine(group, point, ossl_bn_ctx) != 1)
         ossl_raise(eEC_POINT, "EC_POINT_make_affine");
 #endif
@@ -1478,7 +1481,6 @@ static VALUE ossl_ec_point_add(VALUE self, VALUE other)
 /*
  * call-seq:
  *   point.mul(bn1 [, bn2]) => point
- *   point.mul(bns, points [, bn2]) => point
  *
  * Performs elliptic curve point multiplication.
  *
@@ -1486,11 +1488,9 @@ static VALUE ossl_ec_point_add(VALUE self, VALUE other)
  * generator of the group of _point_. _bn2_ may be omitted, and in that case,
  * the result is just <tt>bn1 * point</tt>.
  *
- * The second form calculates <tt>bns[0] * point + bns[1] * points[0] + ...
- * + bns[-1] * points[-1] + bn2 * G</tt>. _bn2_ may be omitted. _bns_ must be
- * an array of OpenSSL::BN. _points_ must be an array of
- * OpenSSL::PKey::EC::Point. Please note that <tt>points[0]</tt> is not
- * multiplied by <tt>bns[0]</tt>, but <tt>bns[1]</tt>.
+ * Before version 4.0.0, and when compiled with OpenSSL 1.1.1 or older, this
+ * method allowed another form:
+ *   point.mul(bns, points [, bn2]) => point
  */
 static VALUE ossl_ec_point_mul(int argc, VALUE *argv, VALUE self)
 {
@@ -1508,62 +1508,15 @@ static VALUE ossl_ec_point_mul(int argc, VALUE *argv, VALUE self)
     GetECPoint(result, point_result);
 
     rb_scan_args(argc, argv, "12", &arg1, &arg2, &arg3);
-    if (!RB_TYPE_P(arg1, T_ARRAY)) {
-	BIGNUM *bn = GetBNPtr(arg1);
+    if (RB_TYPE_P(arg1, T_ARRAY) || argc > 2)
+        rb_raise(rb_eNotImpError, "OpenSSL::PKey::EC::Point#mul with arrays " \
+                 "is no longer supported");
 
-	if (!NIL_P(arg2))
-	    bn_g = GetBNPtr(arg2);
-	if (EC_POINT_mul(group, point_result, bn_g, point_self, bn, ossl_bn_ctx) != 1)
-	    ossl_raise(eEC_POINT, NULL);
-    } else {
-#if (defined(OPENSSL_VERSION_MAJOR) && OPENSSL_VERSION_MAJOR >= 3) || defined(LIBRESSL_VERSION_NUMBER)
-        rb_raise(rb_eNotImpError, "calling #mul with arrays is not" \
-                 "supported by this OpenSSL version");
-#else
-	/*
-	 * bignums | arg1[0] | arg1[1] | arg1[2] | ...
-	 * points  | self    | arg2[0] | arg2[1] | ...
-	 */
-	long i, num;
-	VALUE bns_tmp, tmp_p, tmp_b;
-	const EC_POINT **points;
-	const BIGNUM **bignums;
-
-	Check_Type(arg1, T_ARRAY);
-	Check_Type(arg2, T_ARRAY);
-	if (RARRAY_LEN(arg1) != RARRAY_LEN(arg2) + 1) /* arg2 must be 1 larger */
-	    ossl_raise(rb_eArgError, "bns must be 1 longer than points; see the documentation");
-
-        rb_warning("OpenSSL::PKey::EC::Point#mul(ary, ary) is deprecated; " \
-                   "use #mul(bn) form instead");
-
-	num = RARRAY_LEN(arg1);
-	bns_tmp = rb_ary_tmp_new(num);
-	bignums = ALLOCV_N(const BIGNUM *, tmp_b, num);
-	for (i = 0; i < num; i++) {
-	    VALUE item = RARRAY_AREF(arg1, i);
-	    bignums[i] = GetBNPtr(item);
-	    rb_ary_push(bns_tmp, item);
-	}
-
-	points = ALLOCV_N(const EC_POINT *, tmp_p, num);
-	points[0] = point_self; /* self */
-	for (i = 0; i < num - 1; i++)
-	    GetECPoint(RARRAY_AREF(arg2, i), points[i + 1]);
-
-	if (!NIL_P(arg3))
-	    bn_g = GetBNPtr(arg3);
-
-	if (EC_POINTs_mul(group, point_result, bn_g, num, points, bignums, ossl_bn_ctx) != 1) {
-	    ALLOCV_END(tmp_b);
-	    ALLOCV_END(tmp_p);
-	    ossl_raise(eEC_POINT, NULL);
-	}
-
-	ALLOCV_END(tmp_b);
-	ALLOCV_END(tmp_p);
-#endif
-    }
+    BIGNUM *bn = GetBNPtr(arg1);
+    if (!NIL_P(arg2))
+        bn_g = GetBNPtr(arg2);
+    if (EC_POINT_mul(group, point_result, bn_g, point_self, bn, ossl_bn_ctx) != 1)
+        ossl_raise(eEC_POINT, NULL);
 
     return result;
 }
@@ -1601,17 +1554,15 @@ void Init_ossl_ec(void)
     eEC_GROUP = rb_define_class_under(cEC_GROUP, "Error", eOSSLError);
     eEC_POINT = rb_define_class_under(cEC_POINT, "Error", eOSSLError);
 
-    s_GFp = rb_intern("GFp");
-    s_GF2m = rb_intern("GF2m");
+    sym_GFp = ID2SYM(rb_intern_const("GFp"));
+    sym_GF2m = ID2SYM(rb_intern_const("GF2m"));
 
-    ID_uncompressed = rb_intern("uncompressed");
-    ID_compressed = rb_intern("compressed");
-    ID_hybrid = rb_intern("hybrid");
+    sym_uncompressed = ID2SYM(rb_intern_const("uncompressed"));
+    sym_compressed = ID2SYM(rb_intern_const("compressed"));
+    sym_hybrid = ID2SYM(rb_intern_const("hybrid"));
 
     rb_define_const(cEC, "NAMED_CURVE", INT2NUM(OPENSSL_EC_NAMED_CURVE));
-#if defined(OPENSSL_EC_EXPLICIT_CURVE)
     rb_define_const(cEC, "EXPLICIT_CURVE", INT2NUM(OPENSSL_EC_EXPLICIT_CURVE));
-#endif
 
     rb_define_singleton_method(cEC, "builtin_curves", ossl_s_builtin_curves, 0);
 
diff --git a/ext/openssl/ossl_pkey_rsa.c b/ext/openssl/ossl_pkey_rsa.c
index 389f76f309e3b4..185b47cbfb6561 100644
--- a/ext/openssl/ossl_pkey_rsa.c
+++ b/ext/openssl/ossl_pkey_rsa.c
@@ -5,7 +5,7 @@
  */
 /*
  * This program is licensed under the same licence as Ruby.
- * (See the file 'LICENCE'.)
+ * (See the file 'COPYING'.)
  */
 #include "ossl.h"
 
@@ -42,7 +42,7 @@ RSA_PRIVATE(VALUE obj, OSSL_3_const RSA *rsa)
  * Classes
  */
 VALUE cRSA;
-VALUE eRSAError;
+static VALUE eRSAError;
 
 /*
  * Private
@@ -136,6 +136,7 @@ ossl_rsa_initialize(int argc, VALUE *argv, VALUE self)
 }
 
 #ifndef HAVE_EVP_PKEY_DUP
+/* :nodoc: */
 static VALUE
 ossl_rsa_initialize_copy(VALUE self, VALUE other)
 {
@@ -494,42 +495,6 @@ ossl_rsa_verify_pss(int argc, VALUE *argv, VALUE self)
     ossl_raise(eRSAError, NULL);
 }
 
-/*
- * call-seq:
- *   rsa.params => hash
- *
- * THIS METHOD IS INSECURE, PRIVATE INFORMATION CAN LEAK OUT!!!
- *
- * Stores all parameters of key to the hash.  The hash has keys 'n', 'e', 'd',
- * 'p', 'q', 'dmp1', 'dmq1', 'iqmp'.
- *
- * Don't use :-)) (It's up to you)
- */
-static VALUE
-ossl_rsa_get_params(VALUE self)
-{
-    OSSL_3_const RSA *rsa;
-    VALUE hash;
-    const BIGNUM *n, *e, *d, *p, *q, *dmp1, *dmq1, *iqmp;
-
-    GetRSA(self, rsa);
-    RSA_get0_key(rsa, &n, &e, &d);
-    RSA_get0_factors(rsa, &p, &q);
-    RSA_get0_crt_params(rsa, &dmp1, &dmq1, &iqmp);
-
-    hash = rb_hash_new();
-    rb_hash_aset(hash, rb_str_new2("n"), ossl_bn_new(n));
-    rb_hash_aset(hash, rb_str_new2("e"), ossl_bn_new(e));
-    rb_hash_aset(hash, rb_str_new2("d"), ossl_bn_new(d));
-    rb_hash_aset(hash, rb_str_new2("p"), ossl_bn_new(p));
-    rb_hash_aset(hash, rb_str_new2("q"), ossl_bn_new(q));
-    rb_hash_aset(hash, rb_str_new2("dmp1"), ossl_bn_new(dmp1));
-    rb_hash_aset(hash, rb_str_new2("dmq1"), ossl_bn_new(dmq1));
-    rb_hash_aset(hash, rb_str_new2("iqmp"), ossl_bn_new(iqmp));
-
-    return hash;
-}
-
 /*
  * Document-method: OpenSSL::PKey::RSA#set_key
  * call-seq:
@@ -617,8 +582,6 @@ Init_ossl_rsa(void)
     rb_define_method(cRSA, "set_factors", ossl_rsa_set_factors, 2);
     rb_define_method(cRSA, "set_crt_params", ossl_rsa_set_crt_params, 3);
 
-    rb_define_method(cRSA, "params", ossl_rsa_get_params, 0);
-
 /*
  * TODO: Test it
     rb_define_method(cRSA, "blinding_on!", ossl_rsa_blinding_on, 0);
diff --git a/ext/openssl/ossl_provider.c b/ext/openssl/ossl_provider.c
index 981c6ccdc7aa5e..529a5e1c72ab0a 100644
--- a/ext/openssl/ossl_provider.c
+++ b/ext/openssl/ossl_provider.c
@@ -1,12 +1,10 @@
 /*
  * This program is licensed under the same licence as Ruby.
- * (See the file 'LICENCE'.)
+ * (See the file 'COPYING'.)
  */
 #include "ossl.h"
 
 #ifdef OSSL_USE_PROVIDER
-# include <openssl/provider.h>
-
 #define NewProvider(klass) \
     TypedData_Wrap_Struct((klass), &ossl_provider_type, 0)
 #define SetProvider(obj, provider) do { \
diff --git a/ext/openssl/ossl_rand.c b/ext/openssl/ossl_rand.c
index 659dc818b6eda2..764900dfc656ba 100644
--- a/ext/openssl/ossl_rand.c
+++ b/ext/openssl/ossl_rand.c
@@ -5,12 +5,12 @@
  * All rights reserved.
  *
  * This program is licensed under the same licence as Ruby.
- * (See the file 'LICENCE'.)
+ * (See the file 'COPYING'.)
  */
 #include "ossl.h"
 
-VALUE mRandom;
-VALUE eRandomError;
+static VALUE mRandom;
+static VALUE eRandomError;
 
 /*
  *  call-seq:
@@ -189,9 +189,7 @@ Init_ossl_rand(void)
     rb_define_module_function(mRandom, "load_random_file", ossl_rand_load_file, 1);
     rb_define_module_function(mRandom, "write_random_file", ossl_rand_write_file, 1);
     rb_define_module_function(mRandom, "random_bytes", ossl_rand_bytes, 1);
-#if OPENSSL_VERSION_NUMBER < 0x10101000 || defined(LIBRESSL_VERSION_NUMBER)
     rb_define_alias(rb_singleton_class(mRandom), "pseudo_bytes", "random_bytes");
-#endif
 #ifdef HAVE_RAND_EGD
     rb_define_module_function(mRandom, "egd", ossl_rand_egd, 1);
     rb_define_module_function(mRandom, "egd_bytes", ossl_rand_egd_bytes, 2);
diff --git a/ext/openssl/ossl_rand.h b/ext/openssl/ossl_rand.h
index 8f77a3b239cfa7..294986d0173266 100644
--- a/ext/openssl/ossl_rand.h
+++ b/ext/openssl/ossl_rand.h
@@ -5,14 +5,11 @@
  */
 /*
  * This program is licensed under the same licence as Ruby.
- * (See the file 'LICENCE'.)
+ * (See the file 'COPYING'.)
  */
 #if !defined(_OSSL_RAND_H_)
 #define _OSSL_RAND_H_
 
-extern VALUE mRandom;
-extern VALUE eRandomError;
-
 void Init_ossl_rand(void);
 
 #endif /* _OSSL_RAND_H_ */
diff --git a/ext/openssl/ossl_ssl.c b/ext/openssl/ossl_ssl.c
index 236d455ff2a48e..b5872f588125c2 100644
--- a/ext/openssl/ossl_ssl.c
+++ b/ext/openssl/ossl_ssl.c
@@ -7,7 +7,7 @@
  */
 /*
  * This program is licensed under the same licence as Ruby.
- * (See the file 'LICENCE'.)
+ * (See the file 'COPYING'.)
  */
 #include "ossl.h"
 
@@ -18,11 +18,6 @@
 # define OSSL_USE_NEXTPROTONEG
 #endif
 
-#if !defined(TLS1_3_VERSION) && \
-    OSSL_LIBRESSL_PREREQ(3, 2, 0) && !OSSL_LIBRESSL_PREREQ(3, 4, 0)
-#  define TLS1_3_VERSION 0x0304
-#endif
-
 #ifdef _WIN32
 #  define TO_SOCKET(s) _get_osfhandle(s)
 #else
@@ -35,7 +30,7 @@
 
 VALUE mSSL;
 static VALUE eSSLError;
-VALUE cSSLContext;
+static VALUE cSSLContext;
 VALUE cSSLSocket;
 
 static VALUE eSSLErrorWaitReadable;
@@ -55,7 +50,6 @@ static ID id_i_cert_store, id_i_ca_file, id_i_ca_path, id_i_verify_mode,
 	  id_i_verify_hostname, id_i_keylog_cb;
 static ID id_i_io, id_i_context, id_i_hostname;
 
-static int ossl_ssl_ex_vcb_idx;
 static int ossl_ssl_ex_ptr_idx;
 static int ossl_sslctx_ex_ptr_idx;
 
@@ -91,11 +85,7 @@ ossl_sslctx_s_alloc(VALUE klass)
     VALUE obj;
 
     obj = TypedData_Wrap_Struct(klass, &ossl_sslctx_type, 0);
-#if OPENSSL_VERSION_NUMBER >= 0x10100000 || defined(LIBRESSL_VERSION_NUMBER)
     ctx = SSL_CTX_new(TLS_method());
-#else
-    ctx = SSL_CTX_new(SSLv23_method());
-#endif
     if (!ctx) {
         ossl_raise(eSSLError, "SSL_CTX_new");
     }
@@ -103,109 +93,9 @@ ossl_sslctx_s_alloc(VALUE klass)
     RTYPEDDATA_DATA(obj) = ctx;
     SSL_CTX_set_ex_data(ctx, ossl_sslctx_ex_ptr_idx, (void *)obj);
 
-#if !defined(OPENSSL_NO_EC) && OPENSSL_VERSION_NUMBER < 0x10100000 && \
-    !defined(LIBRESSL_VERSION_NUMBER)
-    /* We use SSL_CTX_set1_curves_list() to specify the curve used in ECDH. It
-     * allows to specify multiple curve names and OpenSSL will select
-     * automatically from them. In OpenSSL 1.0.2, the automatic selection has to
-     * be enabled explicitly. OpenSSL 1.1.0 and LibreSSL 2.6.1 removed the knob
-     * and it is always enabled. To uniform the behavior, we enable the
-     * automatic selection also in 1.0.2. Users can still disable ECDH by
-     * removing ECDH cipher suites by SSLContext#ciphers=. */
-    if (!SSL_CTX_set_ecdh_auto(ctx, 1))
-	ossl_raise(eSSLError, "SSL_CTX_set_ecdh_auto");
-#endif
-
     return obj;
 }
 
-static int
-parse_proto_version(VALUE str)
-{
-    int i;
-    static const struct {
-	const char *name;
-	int version;
-    } map[] = {
-	{ "SSL2", SSL2_VERSION },
-	{ "SSL3", SSL3_VERSION },
-	{ "TLS1", TLS1_VERSION },
-	{ "TLS1_1", TLS1_1_VERSION },
-	{ "TLS1_2", TLS1_2_VERSION },
-#ifdef TLS1_3_VERSION
-	{ "TLS1_3", TLS1_3_VERSION },
-#endif
-    };
-
-    if (NIL_P(str))
-	return 0;
-    if (RB_INTEGER_TYPE_P(str))
-	return NUM2INT(str);
-
-    if (SYMBOL_P(str))
-	str = rb_sym2str(str);
-    StringValue(str);
-    for (i = 0; i < numberof(map); i++)
-	if (!strncmp(map[i].name, RSTRING_PTR(str), RSTRING_LEN(str)))
-	    return map[i].version;
-    rb_raise(rb_eArgError, "unrecognized version %+"PRIsVALUE, str);
-}
-
-/*
- * call-seq:
- *    ctx.set_minmax_proto_version(min, max) -> nil
- *
- * Sets the minimum and maximum supported protocol versions. See #min_version=
- * and #max_version=.
- */
-static VALUE
-ossl_sslctx_set_minmax_proto_version(VALUE self, VALUE min_v, VALUE max_v)
-{
-    SSL_CTX *ctx;
-    int min, max;
-
-    GetSSLCTX(self, ctx);
-    min = parse_proto_version(min_v);
-    max = parse_proto_version(max_v);
-
-#ifdef HAVE_SSL_CTX_SET_MIN_PROTO_VERSION
-    if (!SSL_CTX_set_min_proto_version(ctx, min))
-	ossl_raise(eSSLError, "SSL_CTX_set_min_proto_version");
-    if (!SSL_CTX_set_max_proto_version(ctx, max))
-	ossl_raise(eSSLError, "SSL_CTX_set_max_proto_version");
-#else
-    {
-	unsigned long sum = 0, opts = 0;
-	int i;
-	static const struct {
-	    int ver;
-	    unsigned long opts;
-	} options_map[] = {
-	    { SSL2_VERSION, SSL_OP_NO_SSLv2 },
-	    { SSL3_VERSION, SSL_OP_NO_SSLv3 },
-	    { TLS1_VERSION, SSL_OP_NO_TLSv1 },
-	    { TLS1_1_VERSION, SSL_OP_NO_TLSv1_1 },
-	    { TLS1_2_VERSION, SSL_OP_NO_TLSv1_2 },
-# if defined(TLS1_3_VERSION)
-	    { TLS1_3_VERSION, SSL_OP_NO_TLSv1_3 },
-# endif
-	};
-
-	for (i = 0; i < numberof(options_map); i++) {
-	    sum |= options_map[i].opts;
-            if ((min && min > options_map[i].ver) ||
-                (max && max < options_map[i].ver)) {
-		opts |= options_map[i].opts;
-            }
-	}
-	SSL_CTX_clear_options(ctx, sum);
-	SSL_CTX_set_options(ctx, opts);
-    }
-#endif
-
-    return Qnil;
-}
-
 static VALUE
 ossl_call_client_cert_cb(VALUE obj)
 {
@@ -327,9 +217,9 @@ ossl_ssl_verify_callback(int preverify_ok, X509_STORE_CTX *ctx)
     int status;
 
     ssl = X509_STORE_CTX_get_ex_data(ctx, SSL_get_ex_data_X509_STORE_CTX_idx());
-    cb = (VALUE)SSL_get_ex_data(ssl, ossl_ssl_ex_vcb_idx);
     ssl_obj = (VALUE)SSL_get_ex_data(ssl, ossl_ssl_ex_ptr_idx);
     sslctx_obj = rb_attr_get(ssl_obj, id_i_context);
+    cb = rb_attr_get(sslctx_obj, id_i_verify_callback);
     verify_hostname = rb_attr_get(sslctx_obj, id_i_verify_hostname);
 
     if (preverify_ok && RTEST(verify_hostname) && !SSL_is_server(ssl) &&
@@ -341,11 +231,7 @@ ossl_ssl_verify_callback(int preverify_ok, X509_STORE_CTX *ctx)
 	}
         if (ret != Qtrue) {
             preverify_ok = 0;
-#if defined(X509_V_ERR_HOSTNAME_MISMATCH)
             X509_STORE_CTX_set_error(ctx, X509_V_ERR_HOSTNAME_MISMATCH);
-#else
-            X509_STORE_CTX_set_error(ctx, X509_V_ERR_CERT_REJECTED);
-#endif
         }
     }
 
@@ -367,11 +253,7 @@ ossl_call_session_get_cb(VALUE ary)
 }
 
 static SSL_SESSION *
-#if defined(LIBRESSL_VERSION_NUMBER) || OPENSSL_VERSION_NUMBER >= 0x10100000
 ossl_sslctx_session_get_cb(SSL *ssl, const unsigned char *buf, int len, int *copy)
-#else
-ossl_sslctx_session_get_cb(SSL *ssl, unsigned char *buf, int len, int *copy)
-#endif
 {
     VALUE ary, ssl_obj, ret_obj;
     SSL_SESSION *sess;
@@ -444,7 +326,7 @@ ossl_sslctx_session_new_cb(SSL *ssl, SSL_SESSION *sess)
     return 0;
 }
 
-#if OPENSSL_VERSION_NUMBER >= 0x10101000 && !defined(LIBRESSL_VERSION_NUMBER)
+#if !OSSL_IS_LIBRESSL
 /*
  * It is only compatible with OpenSSL >= 1.1.1. Even if LibreSSL implements
  * SSL_CTX_set_keylog_callback() from v3.4.2, it does nothing (see
@@ -548,8 +430,9 @@ ossl_sslctx_add_extra_chain_cert_i(RB_BLOCK_CALL_FUNC_ARGLIST(i, arg))
 
     GetSSLCTX(arg, ctx);
     x509 = DupX509CertPtr(i);
-    if(!SSL_CTX_add_extra_chain_cert(ctx, x509)){
-	ossl_raise(eSSLError, NULL);
+    if (!SSL_CTX_add_extra_chain_cert(ctx, x509)) {
+        X509_free(x509);
+        ossl_raise(eSSLError, "SSL_CTX_add_extra_chain_cert");
     }
 
     return i;
@@ -558,52 +441,42 @@ ossl_sslctx_add_extra_chain_cert_i(RB_BLOCK_CALL_FUNC_ARGLIST(i, arg))
 static VALUE ossl_sslctx_setup(VALUE self);
 
 static VALUE
-ossl_call_servername_cb(VALUE ary)
+ossl_call_servername_cb(VALUE arg)
 {
-    VALUE ssl_obj, sslctx_obj, cb, ret_obj;
-
-    Check_Type(ary, T_ARRAY);
-    ssl_obj = rb_ary_entry(ary, 0);
+    SSL *ssl = (void *)arg;
+    const char *servername = SSL_get_servername(ssl, TLSEXT_NAMETYPE_host_name);
+    if (!servername)
+        return Qnil;
 
-    sslctx_obj = rb_attr_get(ssl_obj, id_i_context);
-    cb = rb_attr_get(sslctx_obj, id_i_servername_cb);
-    if (NIL_P(cb)) return Qnil;
+    VALUE ssl_obj = (VALUE)SSL_get_ex_data(ssl, ossl_ssl_ex_ptr_idx);
+    VALUE sslctx_obj = rb_attr_get(ssl_obj, id_i_context);
+    VALUE cb = rb_attr_get(sslctx_obj, id_i_servername_cb);
+    VALUE ary = rb_assoc_new(ssl_obj, rb_str_new_cstr(servername));
 
-    ret_obj = rb_funcallv(cb, id_call, 1, &ary);
+    VALUE ret_obj = rb_funcallv(cb, id_call, 1, &ary);
     if (rb_obj_is_kind_of(ret_obj, cSSLContext)) {
-        SSL *ssl;
         SSL_CTX *ctx2;
-
         ossl_sslctx_setup(ret_obj);
-        GetSSL(ssl_obj, ssl);
         GetSSLCTX(ret_obj, ctx2);
-        SSL_set_SSL_CTX(ssl, ctx2);
+        if (!SSL_set_SSL_CTX(ssl, ctx2))
+            ossl_raise(eSSLError, "SSL_set_SSL_CTX");
         rb_ivar_set(ssl_obj, id_i_context, ret_obj);
     } else if (!NIL_P(ret_obj)) {
 	ossl_raise(rb_eArgError, "servername_cb must return an "
 		   "OpenSSL::SSL::SSLContext object or nil");
     }
 
-    return ret_obj;
+    return Qnil;
 }
 
 static int
 ssl_servername_cb(SSL *ssl, int *ad, void *arg)
 {
-    VALUE ary, ssl_obj;
-    int state = 0;
-    const char *servername = SSL_get_servername(ssl, TLSEXT_NAMETYPE_host_name);
-
-    if (!servername)
-        return SSL_TLSEXT_ERR_OK;
-
-    ssl_obj = (VALUE)SSL_get_ex_data(ssl, ossl_ssl_ex_ptr_idx);
-    ary = rb_ary_new2(2);
-    rb_ary_push(ary, ssl_obj);
-    rb_ary_push(ary, rb_str_new2(servername));
+    int state;
 
-    rb_protect(ossl_call_servername_cb, ary, &state);
+    rb_protect(ossl_call_servername_cb, (VALUE)ssl, &state);
     if (state) {
+        VALUE ssl_obj = (VALUE)SSL_get_ex_data(ssl, ossl_ssl_ex_ptr_idx);
         rb_ivar_set(ssl_obj, ID_callback_state, INT2NUM(state));
         return SSL_TLSEXT_ERR_ALERT_FATAL;
     }
@@ -757,7 +630,10 @@ ssl_info_cb(const SSL *ssl, int where, int val)
 }
 
 /*
- * Gets various OpenSSL options.
+ * call-seq:
+ *    ctx.options -> integer
+ *
+ * Gets various \OpenSSL options.
  */
 static VALUE
 ossl_sslctx_get_options(VALUE self)
@@ -772,7 +648,17 @@ ossl_sslctx_get_options(VALUE self)
 }
 
 /*
- * Sets various OpenSSL options.
+ * call-seq:
+ *    ctx.options = integer
+ *
+ * Sets various \OpenSSL options. The options are a bit field and can be
+ * combined with the bitwise OR operator (<tt>|</tt>). Available options are
+ * defined as constants in OpenSSL::SSL that begin with +OP_+.
+ *
+ * For backwards compatibility, passing +nil+ has the same effect as passing
+ * OpenSSL::SSL::OP_ALL.
+ *
+ * See also man page SSL_CTX_set_options(3).
  */
 static VALUE
 ossl_sslctx_set_options(VALUE self, VALUE options)
@@ -820,7 +706,7 @@ ossl_sslctx_setup(VALUE self)
     SSL_CTX_set_tmp_dh_callback(ctx, ossl_tmp_dh_callback);
 #endif
 
-#ifdef HAVE_SSL_CTX_SET_POST_HANDSHAKE_AUTH
+#if !defined(OPENSSL_IS_AWSLC) /* AWS-LC has no support for TLS 1.3 PHA. */
     SSL_CTX_set_post_handshake_auth(ctx, 1);
 #endif
 
@@ -962,7 +848,7 @@ ossl_sslctx_setup(VALUE self)
 	OSSL_Debug("SSL TLSEXT servername callback added");
     }
 
-#if OPENSSL_VERSION_NUMBER >= 0x10101000 && !defined(LIBRESSL_VERSION_NUMBER)
+#if !OSSL_IS_LIBRESSL
     /*
      * It is only compatible with OpenSSL >= 1.1.1. Even if LibreSSL implements
      * SSL_CTX_set_keylog_callback() from v3.4.2, it does nothing (see
@@ -977,6 +863,93 @@ ossl_sslctx_setup(VALUE self)
     return Qtrue;
 }
 
+static int
+parse_proto_version(VALUE str)
+{
+    int i;
+    static const struct {
+	const char *name;
+	int version;
+    } map[] = {
+	{ "SSL2", SSL2_VERSION },
+	{ "SSL3", SSL3_VERSION },
+	{ "TLS1", TLS1_VERSION },
+	{ "TLS1_1", TLS1_1_VERSION },
+	{ "TLS1_2", TLS1_2_VERSION },
+	{ "TLS1_3", TLS1_3_VERSION },
+    };
+
+    if (NIL_P(str))
+	return 0;
+    if (RB_INTEGER_TYPE_P(str))
+	return NUM2INT(str);
+
+    if (SYMBOL_P(str))
+	str = rb_sym2str(str);
+    StringValue(str);
+    for (i = 0; i < numberof(map); i++)
+	if (!strncmp(map[i].name, RSTRING_PTR(str), RSTRING_LEN(str)))
+	    return map[i].version;
+    rb_raise(rb_eArgError, "unrecognized version %+"PRIsVALUE, str);
+}
+
+/*
+ * call-seq:
+ *    ctx.min_version = OpenSSL::SSL::TLS1_2_VERSION
+ *    ctx.min_version = :TLS1_2
+ *    ctx.min_version = nil
+ *
+ * Sets the lower bound on the supported SSL/TLS protocol version. The
+ * version may be specified by an integer constant named
+ * OpenSSL::SSL::*_VERSION, a Symbol, or +nil+ which means "any version".
+ *
+ * === Example
+ *   ctx = OpenSSL::SSL::SSLContext.new
+ *   ctx.min_version = OpenSSL::SSL::TLS1_1_VERSION
+ *   ctx.max_version = OpenSSL::SSL::TLS1_2_VERSION
+ *
+ *   sock = OpenSSL::SSL::SSLSocket.new(tcp_sock, ctx)
+ *   sock.connect # Initiates a connection using either TLS 1.1 or TLS 1.2
+ */
+static VALUE
+ossl_sslctx_set_min_version(VALUE self, VALUE v)
+{
+    SSL_CTX *ctx;
+    int version;
+
+    rb_check_frozen(self);
+    GetSSLCTX(self, ctx);
+    version = parse_proto_version(v);
+
+    if (!SSL_CTX_set_min_proto_version(ctx, version))
+        ossl_raise(eSSLError, "SSL_CTX_set_min_proto_version");
+    return v;
+}
+
+/*
+ * call-seq:
+ *    ctx.max_version = OpenSSL::SSL::TLS1_2_VERSION
+ *    ctx.max_version = :TLS1_2
+ *    ctx.max_version = nil
+ *
+ * Sets the upper bound of the supported SSL/TLS protocol version. See
+ * #min_version= for the possible values.
+ */
+static VALUE
+ossl_sslctx_set_max_version(VALUE self, VALUE v)
+{
+    SSL_CTX *ctx;
+    int version;
+
+    rb_check_frozen(self);
+    GetSSLCTX(self, ctx);
+    version = parse_proto_version(v);
+
+    if (!SSL_CTX_set_max_proto_version(ctx, version))
+        ossl_raise(eSSLError, "SSL_CTX_set_max_proto_version");
+    return v;
+}
+
 static VALUE
 ossl_ssl_cipher_to_ary(const SSL_CIPHER *cipher)
 {
@@ -1026,11 +999,10 @@ static VALUE
 build_cipher_string(VALUE v)
 {
     VALUE str, elem;
-    int i;
 
     if (RB_TYPE_P(v, T_ARRAY)) {
         str = rb_str_new(0, 0);
-        for (i = 0; i < RARRAY_LEN(v); i++) {
+        for (long i = 0; i < RARRAY_LEN(v); i++) {
             elem = rb_ary_entry(v, i);
             if (RB_TYPE_P(elem, T_ARRAY)) elem = rb_ary_entry(elem, 0);
             elem = rb_String(elem);
@@ -1051,9 +1023,14 @@ build_cipher_string(VALUE v)
  *    ctx.ciphers = [name, ...]
  *    ctx.ciphers = [[name, version, bits, alg_bits], ...]
  *
- * Sets the list of available cipher suites for this context.  Note in a server
- * context some ciphers require the appropriate certificates.  For example, an
- * RSA cipher suite can only be chosen when an RSA certificate is available.
+ * Sets the list of available cipher suites for TLS 1.2 and below for this
+ * context.
+ *
+ * Note in a server context some ciphers require the appropriate certificates.
+ * For example, an RSA cipher suite can only be chosen when an RSA certificate
+ * is available.
+ *
+ * This method does not affect TLS 1.3 connections. See also #ciphersuites=.
  */
 static VALUE
 ossl_sslctx_set_ciphers(VALUE self, VALUE v)
@@ -1062,6 +1039,7 @@ ossl_sslctx_set_ciphers(VALUE self, VALUE v)
     VALUE str;
 
     rb_check_frozen(self);
+    // Assigning nil is a no-op for compatibility
     if (NIL_P(v))
         return v;
 
@@ -1074,14 +1052,12 @@ ossl_sslctx_set_ciphers(VALUE self, VALUE v)
     return v;
 }
 
-#ifdef HAVE_SSL_CTX_SET_CIPHERSUITES
 /*
  * call-seq:
  *    ctx.ciphersuites = "cipher1:cipher2:..."
  *    ctx.ciphersuites = [name, ...]
- *    ctx.ciphersuites = [[name, version, bits, alg_bits], ...]
  *
- * Sets the list of available TLSv1.3 cipher suites for this context.
+ * Sets the list of available TLS 1.3 cipher suites for this context.
  */
 static VALUE
 ossl_sslctx_set_ciphersuites(VALUE self, VALUE v)
@@ -1090,6 +1066,7 @@ ossl_sslctx_set_ciphersuites(VALUE self, VALUE v)
     VALUE str;
 
     rb_check_frozen(self);
+    // Assigning nil is a no-op for compatibility
     if (NIL_P(v))
         return v;
 
@@ -1101,6 +1078,62 @@ ossl_sslctx_set_ciphersuites(VALUE self, VALUE v)
 
     return v;
 }
+
+#ifdef HAVE_SSL_CTX_SET1_SIGALGS_LIST
+/*
+ * call-seq:
+ *    ctx.sigalgs = "sigalg1:sigalg2:..."
+ *
+ * Sets the list of "supported signature algorithms" for this context.
+ *
+ * For a TLS client, the list is used in the "signature_algorithms" extension
+ * in the ClientHello message. For a server, the list is used by OpenSSL to
+ * determine the set of shared signature algorithms. OpenSSL will pick the most
+ * appropriate one from it.
+ *
+ * See also #client_sigalgs= for the client authentication equivalent.
+ */
+static VALUE
+ossl_sslctx_set_sigalgs(VALUE self, VALUE v)
+{
+    SSL_CTX *ctx;
+
+    rb_check_frozen(self);
+    GetSSLCTX(self, ctx);
+
+    if (!SSL_CTX_set1_sigalgs_list(ctx, StringValueCStr(v)))
+        ossl_raise(eSSLError, "SSL_CTX_set1_sigalgs_list");
+
+    return v;
+}
+#endif
+
+#ifdef HAVE_SSL_CTX_SET1_CLIENT_SIGALGS_LIST
+/*
+ * call-seq:
+ *    ctx.client_sigalgs = "sigalg1:sigalg2:..."
+ *
+ * Sets the list of "supported signature algorithms" for client authentication
+ * for this context.
+ *
+ * For a TLS server, the list is sent to the client as part of the
+ * CertificateRequest message.
+ *
+ * See also #sigalgs= for the server authentication equivalent.
+ */
+static VALUE
+ossl_sslctx_set_client_sigalgs(VALUE self, VALUE v)
+{
+    SSL_CTX *ctx;
+
+    rb_check_frozen(self);
+    GetSSLCTX(self, ctx);
+
+    if (!SSL_CTX_set1_client_sigalgs_list(ctx, StringValueCStr(v)))
+        ossl_raise(eSSLError, "SSL_CTX_set1_client_sigalgs_list");
+
+    return v;
+}
 #endif
 
 #ifndef OPENSSL_NO_DH
@@ -1149,25 +1182,29 @@ ossl_sslctx_set_tmp_dh(VALUE self, VALUE arg)
 }
 #endif
 
-#if !defined(OPENSSL_NO_EC)
 /*
  * call-seq:
- *    ctx.ecdh_curves = curve_list -> curve_list
+ *    ctx.groups = groups_list
+ *    ctx.ecdh_curves = groups_list
+ *
+ * Sets the list of supported groups for key agreement for this context.
  *
- * Sets the list of "supported elliptic curves" for this context.
+ * For a TLS client, the list is directly used in the "supported_groups"
+ * extension. For a server, the list is used by OpenSSL to determine the set of
+ * shared supported groups. OpenSSL will pick the most appropriate one from it.
  *
- * For a TLS client, the list is directly used in the Supported Elliptic Curves
- * Extension. For a server, the list is used by OpenSSL to determine the set of
- * shared curves. OpenSSL will pick the most appropriate one from it.
+ * #ecdh_curves= is a deprecated alias for #groups=.
+ *
+ * See also the man page SSL_CTX_set1_groups_list(3).
  *
  * === Example
  *   ctx1 = OpenSSL::SSL::SSLContext.new
- *   ctx1.ecdh_curves = "X25519:P-256:P-224"
+ *   ctx1.groups = "X25519:P-256:P-224"
  *   svr = OpenSSL::SSL::SSLServer.new(tcp_svr, ctx1)
  *   Thread.new { svr.accept }
  *
  *   ctx2 = OpenSSL::SSL::SSLContext.new
- *   ctx2.ecdh_curves = "P-256"
+ *   ctx2.groups = "P-256"
  *   cli = OpenSSL::SSL::SSLSocket.new(tcp_sock, ctx2)
  *   cli.connect
  *
@@ -1175,7 +1212,7 @@ ossl_sslctx_set_tmp_dh(VALUE self, VALUE arg)
  *   # => "prime256v1" (is an alias for NIST P-256)
  */
 static VALUE
-ossl_sslctx_set_ecdh_curves(VALUE self, VALUE arg)
+ossl_sslctx_set_groups(VALUE self, VALUE arg)
 {
     SSL_CTX *ctx;
 
@@ -1183,13 +1220,10 @@ ossl_sslctx_set_ecdh_curves(VALUE self, VALUE arg)
     GetSSLCTX(self, ctx);
     StringValueCStr(arg);
 
-    if (!SSL_CTX_set1_curves_list(ctx, RSTRING_PTR(arg)))
-	ossl_raise(eSSLError, NULL);
+    if (!SSL_CTX_set1_groups_list(ctx, RSTRING_PTR(arg)))
+        ossl_raise(eSSLError, "SSL_CTX_set1_groups_list");
     return arg;
 }
-#else
-#define ossl_sslctx_set_ecdh_curves rb_f_notimplement
-#endif
 
 /*
  * call-seq:
@@ -1206,12 +1240,7 @@ ossl_sslctx_get_security_level(VALUE self)
 
     GetSSLCTX(self, ctx);
 
-#if defined(HAVE_SSL_CTX_GET_SECURITY_LEVEL)
     return INT2NUM(SSL_CTX_get_security_level(ctx));
-#else
-    (void)ctx;
-    return INT2FIX(0);
-#endif
 }
 
 /*
@@ -1241,14 +1270,7 @@ ossl_sslctx_set_security_level(VALUE self, VALUE value)
     rb_check_frozen(self);
     GetSSLCTX(self, ctx);
 
-#if defined(HAVE_SSL_CTX_GET_SECURITY_LEVEL)
     SSL_CTX_set_security_level(ctx, NUM2INT(value));
-#else
-    (void)ctx;
-    if (NUM2INT(value) != 0)
-	ossl_raise(rb_eNotImpError, "setting security level to other than 0 is "
-		   "not supported in this version of OpenSSL");
-#endif
 
     return value;
 }
@@ -1553,11 +1575,6 @@ ossl_ssl_mark(void *ptr)
 {
     SSL *ssl = ptr;
     rb_gc_mark((VALUE)SSL_get_ex_data(ssl, ossl_ssl_ex_ptr_idx));
-
-    // Note: this reference is stored as @verify_callback so we don't need to mark it.
-    // However we do need to ensure GC compaction won't move it, hence why
-    // we call rb_gc_mark here.
-    rb_gc_mark((VALUE)SSL_get_ex_data(ssl, ossl_ssl_ex_vcb_idx));
 }
 
 static void
@@ -1622,7 +1639,7 @@ peeraddr_ip_str(VALUE self)
 static VALUE
 ossl_ssl_initialize(int argc, VALUE *argv, VALUE self)
 {
-    VALUE io, v_ctx, verify_cb;
+    VALUE io, v_ctx;
     SSL *ssl;
     SSL_CTX *ctx;
 
@@ -1649,10 +1666,6 @@ ossl_ssl_initialize(int argc, VALUE *argv, VALUE self)
 
     SSL_set_ex_data(ssl, ossl_ssl_ex_ptr_idx, (void *)self);
     SSL_set_info_callback(ssl, ssl_info_cb);
-    verify_cb = rb_attr_get(v_ctx, id_i_verify_callback);
-    // We don't need to trigger a write barrier because it's already
-    // an instance variable of this object.
-    SSL_set_ex_data(ssl, ossl_ssl_ex_vcb_idx, (void *)verify_cb);
 
     rb_call_super(0, NULL);
 
@@ -1725,11 +1738,20 @@ no_exception_p(VALUE opts)
 #define RUBY_IO_TIMEOUT_DEFAULT Qnil
 #endif
 
+#ifdef HAVE_RB_IO_TIMEOUT
+#define IO_TIMEOUT_ERROR rb_eIOTimeoutError
+#else
+#define IO_TIMEOUT_ERROR rb_eIOError
+#endif
+
+
 static void
 io_wait_writable(VALUE io)
 {
 #ifdef HAVE_RB_IO_MAYBE_WAIT
-    rb_io_maybe_wait_writable(errno, io, RUBY_IO_TIMEOUT_DEFAULT);
+    if (!rb_io_maybe_wait_writable(errno, io, RUBY_IO_TIMEOUT_DEFAULT)) {
+        rb_raise(IO_TIMEOUT_ERROR, "Timed out while waiting to become writable!");
+    }
 #else
     rb_io_t *fptr;
     GetOpenFile(io, fptr);
@@ -1741,7 +1763,9 @@ static void
 io_wait_readable(VALUE io)
 {
 #ifdef HAVE_RB_IO_MAYBE_WAIT
-    rb_io_maybe_wait_readable(errno, io, RUBY_IO_TIMEOUT_DEFAULT);
+    if (!rb_io_maybe_wait_readable(errno, io, RUBY_IO_TIMEOUT_DEFAULT)) {
+        rb_raise(IO_TIMEOUT_ERROR, "Timed out while waiting to become readable!");
+    }
 #else
     rb_io_t *fptr;
     GetOpenFile(io, fptr);
@@ -1925,7 +1949,7 @@ ossl_ssl_read_internal(int argc, VALUE *argv, VALUE self, int nonblock)
 {
     SSL *ssl;
     int ilen;
-    VALUE len, str;
+    VALUE len, str, cb_state;
     VALUE opts = Qnil;
 
     if (nonblock) {
@@ -1947,43 +1971,49 @@ ossl_ssl_read_internal(int argc, VALUE *argv, VALUE self, int nonblock)
 	else
 	    rb_str_modify_expand(str, ilen - RSTRING_LEN(str));
     }
-    rb_str_set_len(str, 0);
-    if (ilen == 0)
-	return str;
+
+    if (ilen == 0) {
+        rb_str_set_len(str, 0);
+        return str;
+    }
 
     VALUE io = rb_attr_get(self, id_i_io);
 
-    rb_str_locktmp(str);
     for (;;) {
+        rb_str_locktmp(str);
         int nread = SSL_read(ssl, RSTRING_PTR(str), ilen);
+        rb_str_unlocktmp(str);
+
+        cb_state = rb_attr_get(self, ID_callback_state);
+        if (!NIL_P(cb_state)) {
+            rb_ivar_set(self, ID_callback_state, Qnil);
+            ossl_clear_error();
+            rb_jump_tag(NUM2INT(cb_state));
+        }
+
         switch (ssl_get_error(ssl, nread)) {
           case SSL_ERROR_NONE:
-            rb_str_unlocktmp(str);
             rb_str_set_len(str, nread);
             return str;
           case SSL_ERROR_ZERO_RETURN:
-            rb_str_unlocktmp(str);
             if (no_exception_p(opts)) { return Qnil; }
             rb_eof_error();
           case SSL_ERROR_WANT_WRITE:
             if (nonblock) {
-                rb_str_unlocktmp(str);
                 if (no_exception_p(opts)) { return sym_wait_writable; }
                 write_would_block(nonblock);
             }
             io_wait_writable(io);
-            continue;
+            break;
           case SSL_ERROR_WANT_READ:
             if (nonblock) {
-                rb_str_unlocktmp(str);
                 if (no_exception_p(opts)) { return sym_wait_readable; }
                 read_would_block(nonblock);
             }
             io_wait_readable(io);
-            continue;
+            break;
           case SSL_ERROR_SYSCALL:
             if (!ERR_peek_error()) {
-                rb_str_unlocktmp(str);
                 if (errno)
                     rb_sys_fail(0);
                 else {
@@ -2000,9 +2030,13 @@ ossl_ssl_read_internal(int argc, VALUE *argv, VALUE self, int nonblock)
             }
             /* fall through */
           default:
-            rb_str_unlocktmp(str);
             ossl_raise(eSSLError, "SSL_read");
         }
+
+        // Ensure the buffer is not modified during io_wait_*able()
+        rb_str_modify(str);
+        if (rb_str_capacity(str) < (size_t)ilen)
+            rb_raise(eSSLError, "read buffer was modified");
     }
 }
 
@@ -2040,28 +2074,40 @@ ossl_ssl_read_nonblock(int argc, VALUE *argv, VALUE self)
 }
 
 static VALUE
-ossl_ssl_write_internal(VALUE self, VALUE str, VALUE opts)
+ossl_ssl_write_internal_safe(VALUE _args)
 {
+    VALUE *args = (VALUE*)_args;
+    VALUE self = args[0];
+    VALUE str = args[1];
+    VALUE opts = args[2];
+
     SSL *ssl;
     rb_io_t *fptr;
     int num, nonblock = opts != Qfalse;
-    VALUE tmp;
+    VALUE cb_state;
 
     GetSSL(self, ssl);
     if (!ssl_started(ssl))
         rb_raise(eSSLError, "SSL session is not started yet");
 
-    tmp = rb_str_new_frozen(StringValue(str));
     VALUE io = rb_attr_get(self, id_i_io);
     GetOpenFile(io, fptr);
 
     /* SSL_write(3ssl) manpage states num == 0 is undefined */
-    num = RSTRING_LENINT(tmp);
+    num = RSTRING_LENINT(str);
     if (num == 0)
         return INT2FIX(0);
 
     for (;;) {
-        int nwritten = SSL_write(ssl, RSTRING_PTR(tmp), num);
+        int nwritten = SSL_write(ssl, RSTRING_PTR(str), num);
+
+        cb_state = rb_attr_get(self, ID_callback_state);
+        if (!NIL_P(cb_state)) {
+            rb_ivar_set(self, ID_callback_state, Qnil);
+            ossl_clear_error();
+            rb_jump_tag(NUM2INT(cb_state));
+        }
+
         switch (ssl_get_error(ssl, nwritten)) {
           case SSL_ERROR_NONE:
             return INT2NUM(nwritten);
@@ -2094,6 +2140,28 @@ ossl_ssl_write_internal(VALUE self, VALUE str, VALUE opts)
     }
 }
 
+
+static VALUE
+ossl_ssl_write_internal(VALUE self, VALUE str, VALUE opts)
+{
+    StringValue(str);
+    int frozen = RB_OBJ_FROZEN(str);
+    if (!frozen) {
+        rb_str_locktmp(str);
+    }
+    int state;
+    VALUE args[3] = {self, str, opts};
+    VALUE result = rb_protect(ossl_ssl_write_internal_safe, (VALUE)args, &state);
+    if (!frozen) {
+        rb_str_unlocktmp(str);
+    }
+
+    if (state) {
+        rb_jump_tag(state);
+    }
+    return result;
+}
+
 /*
  * call-seq:
  *    ssl.syswrite(string) => Integer
@@ -2445,7 +2513,7 @@ ossl_ssl_get_peer_finished(VALUE self)
 
 /*
  * call-seq:
- *    ssl.client_ca => [x509name, ...]
+ *    ssl.client_ca => [x509name, ...] or nil
  *
  * Returns the list of client CAs. Please note that in contrast to
  * SSLContext#client_ca= no array of X509::Certificate is returned but
@@ -2463,6 +2531,8 @@ ossl_ssl_get_client_ca_list(VALUE self)
     GetSSL(self, ssl);
 
     ca = SSL_get_client_CA_list(ssl);
+    if (!ca)
+        return Qnil;
     return ossl_x509name_sk2ary(ca);
 }
 
@@ -2590,9 +2660,6 @@ Init_ossl_ssl(void)
     id_call = rb_intern_const("call");
     ID_callback_state = rb_intern_const("callback_state");
 
-    ossl_ssl_ex_vcb_idx = SSL_get_ex_new_index(0, (void *)"ossl_ssl_ex_vcb_idx", 0, 0, 0);
-    if (ossl_ssl_ex_vcb_idx < 0)
-	ossl_raise(rb_eRuntimeError, "SSL_get_ex_new_index");
     ossl_ssl_ex_ptr_idx = SSL_get_ex_new_index(0, (void *)"ossl_ssl_ex_ptr_idx", 0, 0, 0);
     if (ossl_ssl_ex_ptr_idx < 0)
 	ossl_raise(rb_eRuntimeError, "SSL_get_ex_new_index");
@@ -2878,17 +2945,22 @@ Init_ossl_ssl(void)
 
     rb_define_alias(cSSLContext, "ssl_timeout", "timeout");
     rb_define_alias(cSSLContext, "ssl_timeout=", "timeout=");
-    rb_define_private_method(cSSLContext, "set_minmax_proto_version",
-			     ossl_sslctx_set_minmax_proto_version, 2);
+    rb_define_method(cSSLContext, "min_version=", ossl_sslctx_set_min_version, 1);
+    rb_define_method(cSSLContext, "max_version=", ossl_sslctx_set_max_version, 1);
     rb_define_method(cSSLContext, "ciphers",     ossl_sslctx_get_ciphers, 0);
     rb_define_method(cSSLContext, "ciphers=",    ossl_sslctx_set_ciphers, 1);
-#ifdef HAVE_SSL_CTX_SET_CIPHERSUITES
     rb_define_method(cSSLContext, "ciphersuites=", ossl_sslctx_set_ciphersuites, 1);
+#ifdef HAVE_SSL_CTX_SET1_SIGALGS_LIST // Not in LibreSSL yet
+    rb_define_method(cSSLContext, "sigalgs=", ossl_sslctx_set_sigalgs, 1);
+#endif
+#ifdef HAVE_SSL_CTX_SET1_CLIENT_SIGALGS_LIST // Not in LibreSSL or AWS-LC yet
+    rb_define_method(cSSLContext, "client_sigalgs=", ossl_sslctx_set_client_sigalgs, 1);
 #endif
 #ifndef OPENSSL_NO_DH
     rb_define_method(cSSLContext, "tmp_dh=", ossl_sslctx_set_tmp_dh, 1);
 #endif
-    rb_define_method(cSSLContext, "ecdh_curves=", ossl_sslctx_set_ecdh_curves, 1);
+    rb_define_method(cSSLContext, "groups=", ossl_sslctx_set_groups, 1);
+    rb_define_alias(cSSLContext, "ecdh_curves=", "groups=");
     rb_define_method(cSSLContext, "security_level", ossl_sslctx_get_security_level, 0);
     rb_define_method(cSSLContext, "security_level=", ossl_sslctx_set_security_level, 1);
 #ifdef SSL_MODE_SEND_FALLBACK_SCSV
@@ -3020,7 +3092,7 @@ Init_ossl_ssl(void)
 #ifdef SSL_OP_DISABLE_TLSEXT_CA_NAMES /* OpenSSL 3.0 */
     rb_define_const(mSSL, "OP_DISABLE_TLSEXT_CA_NAMES", ULONG2NUM(SSL_OP_DISABLE_TLSEXT_CA_NAMES));
 #endif
-#ifdef SSL_OP_ALLOW_NO_DHE_KEX /* OpenSSL 1.1.1 */
+#ifdef SSL_OP_ALLOW_NO_DHE_KEX /* OpenSSL 1.1.1, missing in LibreSSL */
     rb_define_const(mSSL, "OP_ALLOW_NO_DHE_KEX", ULONG2NUM(SSL_OP_ALLOW_NO_DHE_KEX));
 #endif
     rb_define_const(mSSL, "OP_DONT_INSERT_EMPTY_FRAGMENTS", ULONG2NUM(SSL_OP_DONT_INSERT_EMPTY_FRAGMENTS));
@@ -3028,28 +3100,26 @@ Init_ossl_ssl(void)
     rb_define_const(mSSL, "OP_NO_SESSION_RESUMPTION_ON_RENEGOTIATION", ULONG2NUM(SSL_OP_NO_SESSION_RESUMPTION_ON_RENEGOTIATION));
     rb_define_const(mSSL, "OP_NO_COMPRESSION", ULONG2NUM(SSL_OP_NO_COMPRESSION));
     rb_define_const(mSSL, "OP_ALLOW_UNSAFE_LEGACY_RENEGOTIATION", ULONG2NUM(SSL_OP_ALLOW_UNSAFE_LEGACY_RENEGOTIATION));
-#ifdef SSL_OP_NO_ENCRYPT_THEN_MAC /* OpenSSL 1.1.1 */
+#ifdef SSL_OP_NO_ENCRYPT_THEN_MAC /* OpenSSL 1.1.1, missing in LibreSSL */
     rb_define_const(mSSL, "OP_NO_ENCRYPT_THEN_MAC", ULONG2NUM(SSL_OP_NO_ENCRYPT_THEN_MAC));
 #endif
-#ifdef SSL_OP_ENABLE_MIDDLEBOX_COMPAT /* OpenSSL 1.1.1 */
+#ifdef SSL_OP_ENABLE_MIDDLEBOX_COMPAT /* OpenSSL 1.1.1, missing in LibreSSL */
     rb_define_const(mSSL, "OP_ENABLE_MIDDLEBOX_COMPAT", ULONG2NUM(SSL_OP_ENABLE_MIDDLEBOX_COMPAT));
 #endif
-#ifdef SSL_OP_PRIORITIZE_CHACHA /* OpenSSL 1.1.1 */
+#ifdef SSL_OP_PRIORITIZE_CHACHA /* OpenSSL 1.1.1, missing in LibreSSL */
     rb_define_const(mSSL, "OP_PRIORITIZE_CHACHA", ULONG2NUM(SSL_OP_PRIORITIZE_CHACHA));
 #endif
-#ifdef SSL_OP_NO_ANTI_REPLAY /* OpenSSL 1.1.1 */
+#ifdef SSL_OP_NO_ANTI_REPLAY /* OpenSSL 1.1.1, missing in LibreSSL */
     rb_define_const(mSSL, "OP_NO_ANTI_REPLAY", ULONG2NUM(SSL_OP_NO_ANTI_REPLAY));
 #endif
     rb_define_const(mSSL, "OP_NO_SSLv3", ULONG2NUM(SSL_OP_NO_SSLv3));
     rb_define_const(mSSL, "OP_NO_TLSv1", ULONG2NUM(SSL_OP_NO_TLSv1));
     rb_define_const(mSSL, "OP_NO_TLSv1_1", ULONG2NUM(SSL_OP_NO_TLSv1_1));
     rb_define_const(mSSL, "OP_NO_TLSv1_2", ULONG2NUM(SSL_OP_NO_TLSv1_2));
-#ifdef SSL_OP_NO_TLSv1_3 /* OpenSSL 1.1.1 */
     rb_define_const(mSSL, "OP_NO_TLSv1_3", ULONG2NUM(SSL_OP_NO_TLSv1_3));
-#endif
     rb_define_const(mSSL, "OP_CIPHER_SERVER_PREFERENCE", ULONG2NUM(SSL_OP_CIPHER_SERVER_PREFERENCE));
     rb_define_const(mSSL, "OP_TLS_ROLLBACK_BUG", ULONG2NUM(SSL_OP_TLS_ROLLBACK_BUG));
-#ifdef SSL_OP_NO_RENEGOTIATION /* OpenSSL 1.1.1 */
+#ifdef SSL_OP_NO_RENEGOTIATION /* OpenSSL 1.1.1, missing in LibreSSL */
     rb_define_const(mSSL, "OP_NO_RENEGOTIATION", ULONG2NUM(SSL_OP_NO_RENEGOTIATION));
 #endif
     rb_define_const(mSSL, "OP_CRYPTOPRO_TLSEXT_BUG", ULONG2NUM(SSL_OP_CRYPTOPRO_TLSEXT_BUG));
@@ -3111,10 +3181,8 @@ Init_ossl_ssl(void)
     rb_define_const(mSSL, "TLS1_1_VERSION", INT2NUM(TLS1_1_VERSION));
     /* TLS 1.2 */
     rb_define_const(mSSL, "TLS1_2_VERSION", INT2NUM(TLS1_2_VERSION));
-#ifdef TLS1_3_VERSION /* OpenSSL 1.1.1 */
     /* TLS 1.3 */
     rb_define_const(mSSL, "TLS1_3_VERSION", INT2NUM(TLS1_3_VERSION));
-#endif
 
 
     sym_exception = ID2SYM(rb_intern_const("exception"));
diff --git a/ext/openssl/ossl_ssl.h b/ext/openssl/ossl_ssl.h
index 535c56097ce437..a92985c601ebf3 100644
--- a/ext/openssl/ossl_ssl.h
+++ b/ext/openssl/ossl_ssl.h
@@ -5,7 +5,7 @@
  */
 /*
  * This program is licensed under the same licence as Ruby.
- * (See the file 'LICENCE'.)
+ * (See the file 'COPYING'.)
  */
 #if !defined(_OSSL_SSL_H_)
 #define _OSSL_SSL_H_
diff --git a/ext/openssl/ossl_ssl_session.c b/ext/openssl/ossl_ssl_session.c
index c5df902c60e8f4..55b9d6c6d57e88 100644
--- a/ext/openssl/ossl_ssl_session.c
+++ b/ext/openssl/ossl_ssl_session.c
@@ -69,6 +69,7 @@ ossl_ssl_session_initialize(VALUE self, VALUE arg1)
     return self;
 }
 
+/* :nodoc: */
 static VALUE
 ossl_ssl_session_initialize_copy(VALUE self, VALUE other)
 {
diff --git a/ext/openssl/ossl_ts.c b/ext/openssl/ossl_ts.c
index f698bdc7ffb048..c7d2bd271b94c4 100644
--- a/ext/openssl/ossl_ts.c
+++ b/ext/openssl/ossl_ts.c
@@ -5,7 +5,7 @@
  */
 /*
  * This program is licenced under the same licence as Ruby.
- * (See the file 'LICENCE'.)
+ * (See the file 'COPYING'.)
  */
 #include "ossl.h"
 
@@ -152,7 +152,7 @@ obj_to_asn1obj_i(VALUE obj)
 }
 
 static VALUE
-get_asn1obj(ASN1_OBJECT *obj)
+get_asn1obj(const ASN1_OBJECT *obj)
 {
     BIO *out;
     VALUE ret;
@@ -161,8 +161,11 @@ get_asn1obj(ASN1_OBJECT *obj)
         ret = rb_str_new2(OBJ_nid2sn(nid));
     else{
         if (!(out = BIO_new(BIO_s_mem())))
-            ossl_raise(eX509AttrError, NULL);
-        i2a_ASN1_OBJECT(out, obj);
+            ossl_raise(eTimestampError, "BIO_new(BIO_s_mem())");
+        if (i2a_ASN1_OBJECT(out, obj) <= 0) {
+            BIO_free(out);
+            ossl_raise(eTimestampError, "i2a_ASN1_OBJECT");
+        }
         ret = ossl_membio2str(out);
     }
 
@@ -233,11 +236,13 @@ ossl_ts_req_get_algorithm(VALUE self)
     TS_REQ *req;
     TS_MSG_IMPRINT *mi;
     X509_ALGOR *algor;
+    const ASN1_OBJECT *obj;
 
     GetTSRequest(self, req);
     mi = TS_REQ_get_msg_imprint(req);
     algor = TS_MSG_IMPRINT_get_algo(mi);
-    return get_asn1obj(algor->algorithm);
+    X509_ALGOR_get0(&obj, NULL, NULL, algor);
+    return get_asn1obj(obj);
 }
 
 /*
@@ -487,13 +492,15 @@ ossl_ts_req_to_der(VALUE self)
     TS_REQ *req;
     TS_MSG_IMPRINT *mi;
     X509_ALGOR *algo;
+    const ASN1_OBJECT *obj;
     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)
+    X509_ALGOR_get0(&obj, NULL, NULL, algo);
+    if (OBJ_obj2nid(obj) == NID_undef)
         ossl_raise(eTimestampError, "Message imprint missing algorithm");
 
     hashed_msg = TS_MSG_IMPRINT_get_msg(mi);
@@ -503,6 +510,25 @@ ossl_ts_req_to_der(VALUE self)
     return asn1_to_der((void *)req, (int (*)(void *, unsigned char **))i2d_TS_REQ);
 }
 
+static VALUE
+ossl_ts_req_to_text(VALUE self)
+{
+    TS_REQ *req;
+    BIO *out;
+
+    GetTSRequest(self, req);
+
+    out = BIO_new(BIO_s_mem());
+    if (!out) ossl_raise(eTimestampError, NULL);
+
+    if (!TS_REQ_print_bio(out, req)) {
+        BIO_free(out);
+        ossl_raise(eTimestampError, NULL);
+    }
+
+    return ossl_membio2str(out);
+}
+
 static VALUE
 ossl_ts_resp_alloc(VALUE klass)
 {
@@ -598,14 +624,7 @@ 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);
@@ -672,21 +691,12 @@ static VALUE
 ossl_ts_resp_get_token(VALUE self)
 {
     TS_RESP *resp;
-    PKCS7 *p7, *copy;
-    VALUE obj;
+    PKCS7 *p7;
 
     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;
+    return ossl_pkcs7_new(p7);
 }
 
 /*
@@ -757,6 +767,25 @@ ossl_ts_resp_to_der(VALUE self)
     return asn1_to_der((void *)resp, (int (*)(void *, unsigned char **))i2d_TS_RESP);
 }
 
+static VALUE
+ossl_ts_resp_to_text(VALUE self)
+{
+    TS_RESP *resp;
+    BIO *out;
+
+    GetTSResponse(self, resp);
+
+    out = BIO_new(BIO_s_mem());
+    if (!out) ossl_raise(eTimestampError, NULL);
+
+    if (!TS_RESP_print_bio(out, resp)) {
+        BIO_free(out);
+        ossl_raise(eTimestampError, NULL);
+    }
+
+    return ossl_membio2str(out);
+}
+
 /*
  * Verifies a timestamp token by checking the signature, validating the
  * certificate chain implied by tsa_certificate and by checking conformance to
@@ -826,16 +855,26 @@ ossl_ts_resp_verify(int argc, VALUE *argv, VALUE self)
         X509_up_ref(cert);
     }
 
+    if (!X509_STORE_up_ref(x509st)) {
+        sk_X509_pop_free(x509inter, X509_free);
+        TS_VERIFY_CTX_free(ctx);
+        ossl_raise(eTimestampError, "X509_STORE_up_ref");
+    }
+
+#ifdef HAVE_TS_VERIFY_CTX_SET0_CERTS
+    TS_VERIFY_CTX_set0_certs(ctx, x509inter);
+    TS_VERIFY_CTX_set0_store(ctx, x509st);
+#else
+# if OSSL_OPENSSL_PREREQ(3, 0, 0) || OSSL_IS_LIBRESSL
     TS_VERIFY_CTX_set_certs(ctx, x509inter);
-    TS_VERIFY_CTX_add_flags(ctx, TS_VFY_SIGNATURE);
+# else
+    TS_VERIFY_CTS_set_certs(ctx, x509inter);
+# endif
     TS_VERIFY_CTX_set_store(ctx, x509st);
+#endif
+    TS_VERIFY_CTX_add_flags(ctx, TS_VFY_SIGNATURE);
 
     ok = TS_RESP_verify_response(ctx, resp);
-    /*
-     * TS_VERIFY_CTX_set_store() call above does not increment the reference
-     * counter, so it must be unset before TS_VERIFY_CTX_free() is called.
-     */
-    TS_VERIFY_CTX_set_store(ctx, NULL);
     TS_VERIFY_CTX_free(ctx);
 
     if (!ok)
@@ -944,11 +983,13 @@ ossl_ts_token_info_get_algorithm(VALUE self)
     TS_TST_INFO *info;
     TS_MSG_IMPRINT *mi;
     X509_ALGOR *algo;
+    const ASN1_OBJECT *obj;
 
     GetTSTokenInfo(self, info);
     mi = TS_TST_INFO_get_msg_imprint(info);
     algo = TS_MSG_IMPRINT_get_algo(mi);
-    return get_asn1obj(algo->algorithm);
+    X509_ALGOR_get0(&obj, NULL, NULL, algo);
+    return get_asn1obj(obj);
 }
 
 /*
@@ -1073,6 +1114,25 @@ ossl_ts_token_info_to_der(VALUE self)
     return asn1_to_der((void *)info, (int (*)(void *, unsigned char **))i2d_TS_TST_INFO);
 }
 
+static VALUE
+ossl_ts_token_info_to_text(VALUE self)
+{
+    TS_TST_INFO *info;
+    BIO *out;
+
+    GetTSTokenInfo(self, info);
+
+    out = BIO_new(BIO_s_mem());
+    if (!out) ossl_raise(eTimestampError, NULL);
+
+    if (!TS_TST_INFO_print_bio(out, info)) {
+        BIO_free(out);
+        ossl_raise(eTimestampError, NULL);
+    }
+
+    return ossl_membio2str(out);
+}
+
 static ASN1_INTEGER *
 ossl_tsfac_serial_cb(struct TS_resp_ctx *ctx, void *data)
 {
@@ -1356,6 +1416,7 @@ Init_ossl_ts(void)
     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, "to_text", ossl_ts_resp_to_text, 0);
     rb_define_method(cTimestampResponse, "verify", ossl_ts_resp_verify, -1);
 
     /* Document-class: OpenSSL::Timestamp::TokenInfo
@@ -1374,6 +1435,7 @@ Init_ossl_ts(void)
     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);
+    rb_define_method(cTimestampTokenInfo, "to_text", ossl_ts_token_info_to_text, 0);
 
     /* Document-class: OpenSSL::Timestamp::Request
      * Allows to create timestamp requests or parse existing ones. A Request is
@@ -1399,6 +1461,7 @@ Init_ossl_ts(void)
     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);
+    rb_define_method(cTimestampRequest, "to_text", ossl_ts_req_to_text, 0);
 
     /*
      * Indicates a successful response. Equal to +0+.
@@ -1535,5 +1598,9 @@ Init_ossl_ts(void)
     rb_attr(cTimestampFactory, rb_intern_const("additional_certs"), 1, 1, 0);
     rb_define_method(cTimestampFactory, "create_timestamp", ossl_tsfac_create_ts, 3);
 }
-
+#else /* OPENSSL_NO_TS */
+void
+Init_ossl_ts(void)
+{
+}
 #endif
diff --git a/ext/openssl/ossl_ts.h b/ext/openssl/ossl_ts.h
index 25fb0e1d6459ce..eeca3046eb7ab1 100644
--- a/ext/openssl/ossl_ts.h
+++ b/ext/openssl/ossl_ts.h
@@ -5,7 +5,7 @@
  */
 /*
  * This program is licenced under the same licence as Ruby.
- * (See the file 'LICENCE'.)
+ * (See the file 'COPYING'.)
  */
 
 #if !defined(_OSSL_TS_H_)
diff --git a/ext/openssl/ossl_x509.c b/ext/openssl/ossl_x509.c
index f8470703fcd177..2d552d78478b5b 100644
--- a/ext/openssl/ossl_x509.c
+++ b/ext/openssl/ossl_x509.c
@@ -5,7 +5,7 @@
  */
 /*
  * This program is licensed under the same licence as Ruby.
- * (See the file 'LICENCE'.)
+ * (See the file 'COPYING'.)
  */
 #include "ossl.h"
 
@@ -48,9 +48,7 @@ Init_ossl_x509(void)
 
     /* Certificate verification error code */
     DefX509Const(V_OK);
-#if defined(X509_V_ERR_UNSPECIFIED) /* 1.0.1r, 1.0.2f, 1.1.0 */
     DefX509Const(V_ERR_UNSPECIFIED);
-#endif
     DefX509Const(V_ERR_UNABLE_TO_GET_ISSUER_CERT);
     DefX509Const(V_ERR_UNABLE_TO_GET_CRL);
     DefX509Const(V_ERR_UNABLE_TO_DECRYPT_CERT_SIGNATURE);
@@ -104,10 +102,10 @@ Init_ossl_x509(void)
     DefX509Const(V_ERR_UNSUPPORTED_CONSTRAINT_SYNTAX);
     DefX509Const(V_ERR_UNSUPPORTED_NAME_SYNTAX);
     DefX509Const(V_ERR_CRL_PATH_VALIDATION_ERROR);
-#if defined(X509_V_ERR_PATH_LOOP)
+#if defined(X509_V_ERR_PATH_LOOP) /* OpenSSL 1.1.0, missing in LibreSSL */
     DefX509Const(V_ERR_PATH_LOOP);
 #endif
-#if defined(X509_V_ERR_SUITE_B_INVALID_VERSION)
+#if defined(X509_V_ERR_SUITE_B_INVALID_VERSION) /* OpenSSL 1.1.0, missing in LibreSSL */
     DefX509Const(V_ERR_SUITE_B_INVALID_VERSION);
     DefX509Const(V_ERR_SUITE_B_INVALID_ALGORITHM);
     DefX509Const(V_ERR_SUITE_B_INVALID_CURVE);
@@ -118,27 +116,21 @@ Init_ossl_x509(void)
     DefX509Const(V_ERR_HOSTNAME_MISMATCH);
     DefX509Const(V_ERR_EMAIL_MISMATCH);
     DefX509Const(V_ERR_IP_ADDRESS_MISMATCH);
-#if defined(X509_V_ERR_DANE_NO_MATCH)
+#if defined(X509_V_ERR_DANE_NO_MATCH) /* OpenSSL 1.1.0, missing in LibreSSL */
     DefX509Const(V_ERR_DANE_NO_MATCH);
 #endif
-#if defined(X509_V_ERR_EE_KEY_TOO_SMALL)
     DefX509Const(V_ERR_EE_KEY_TOO_SMALL);
     DefX509Const(V_ERR_CA_KEY_TOO_SMALL);
     DefX509Const(V_ERR_CA_MD_TOO_WEAK);
-#endif
-#if defined(X509_V_ERR_INVALID_CALL)
     DefX509Const(V_ERR_INVALID_CALL);
-#endif
-#if defined(X509_V_ERR_STORE_LOOKUP)
     DefX509Const(V_ERR_STORE_LOOKUP);
-#endif
-#if defined(X509_V_ERR_NO_VALID_SCTS)
+#if defined(X509_V_ERR_NO_VALID_SCTS) /* OpenSSL 1.1.0, missing in LibreSSL */
     DefX509Const(V_ERR_NO_VALID_SCTS);
 #endif
-#if defined(X509_V_ERR_PROXY_SUBJECT_NAME_VIOLATION)
+#if defined(X509_V_ERR_PROXY_SUBJECT_NAME_VIOLATION) /* OpenSSL 1.1.0, missing in LibreSSL */
     DefX509Const(V_ERR_PROXY_SUBJECT_NAME_VIOLATION);
 #endif
-#if defined(X509_V_ERR_OCSP_VERIFY_NEEDED)
+#if defined(X509_V_ERR_OCSP_VERIFY_NEEDED) /* OpenSSL 1.1.1, missing in LibreSSL */
     DefX509Const(V_ERR_OCSP_VERIFY_NEEDED);
     DefX509Const(V_ERR_OCSP_VERIFY_FAILED);
     DefX509Const(V_ERR_OCSP_CERT_UNKNOWN);
@@ -189,17 +181,13 @@ Init_ossl_x509(void)
      * certificate chain, search the Store first for the issuer certificate.
      * Enabled by default in OpenSSL >= 1.1.0. */
     DefX509Const(V_FLAG_TRUSTED_FIRST);
-#if defined(X509_V_FLAG_SUITEB_128_LOS_ONLY)
+#if defined(X509_V_FLAG_SUITEB_128_LOS_ONLY) /* OpenSSL 1.1.0, missing in LibreSSL */
     /* Set by Store#flags= and StoreContext#flags=.
      * Enables Suite B 128 bit only mode. */
     DefX509Const(V_FLAG_SUITEB_128_LOS_ONLY);
-#endif
-#if defined(X509_V_FLAG_SUITEB_192_LOS)
     /* Set by Store#flags= and StoreContext#flags=.
      * Enables Suite B 192 bit only mode. */
     DefX509Const(V_FLAG_SUITEB_192_LOS);
-#endif
-#if defined(X509_V_FLAG_SUITEB_128_LOS)
     /* Set by Store#flags= and StoreContext#flags=.
      * Enables Suite B 128 bit mode allowing 192 bit algorithms. */
     DefX509Const(V_FLAG_SUITEB_128_LOS);
@@ -207,17 +195,13 @@ Init_ossl_x509(void)
     /* Set by Store#flags= and StoreContext#flags=.
      * Allows partial chains if at least one certificate is in trusted store. */
     DefX509Const(V_FLAG_PARTIAL_CHAIN);
-#if defined(X509_V_FLAG_NO_ALT_CHAINS)
     /* Set by Store#flags= and StoreContext#flags=. Suppresses searching for
      * a alternative chain. No effect in OpenSSL >= 1.1.0. */
     DefX509Const(V_FLAG_NO_ALT_CHAINS);
-#endif
-#if defined(X509_V_FLAG_NO_CHECK_TIME)
     /* Set by Store#flags= and StoreContext#flags=. Suppresses checking the
      * validity period of certificates and CRLs. No effect when the current
      * time is explicitly set by Store#time= or StoreContext#time=. */
     DefX509Const(V_FLAG_NO_CHECK_TIME);
-#endif
 
     /* Set by Store#purpose=. SSL/TLS client. */
     DefX509Const(PURPOSE_SSL_CLIENT);
diff --git a/ext/openssl/ossl_x509.h b/ext/openssl/ossl_x509.h
index 4fadfa6b823188..d25167ee7b0868 100644
--- a/ext/openssl/ossl_x509.h
+++ b/ext/openssl/ossl_x509.h
@@ -5,7 +5,7 @@
  */
 /*
  * This program is licensed under the same licence as Ruby.
- * (See the file 'LICENCE'.)
+ * (See the file 'COPYING'.)
  */
 #if !defined(_OSSL_X509_H_)
 #define _OSSL_X509_H_
@@ -28,7 +28,6 @@ void Init_ossl_x509(void);
  * X509Attr
  */
 extern VALUE cX509Attr;
-extern VALUE eX509AttrError;
 
 VALUE ossl_x509attr_new(X509_ATTRIBUTE *);
 X509_ATTRIBUTE *GetX509AttrPtr(VALUE);
@@ -38,7 +37,6 @@ void Init_ossl_x509attr(void);
  * X509Cert
  */
 extern VALUE cX509Cert;
-extern VALUE eX509CertError;
 
 VALUE ossl_x509_new(X509 *);
 X509 *GetX509CertPtr(VALUE);
@@ -48,9 +46,6 @@ void Init_ossl_x509cert(void);
 /*
  * X509CRL
  */
-extern VALUE cX509CRL;
-extern VALUE eX509CRLError;
-
 VALUE ossl_x509crl_new(X509_CRL *);
 X509_CRL *GetX509CRLPtr(VALUE);
 void Init_ossl_x509crl(void);
@@ -59,8 +54,6 @@ void Init_ossl_x509crl(void);
  * X509Extension
  */
 extern VALUE cX509Ext;
-extern VALUE cX509ExtFactory;
-extern VALUE eX509ExtError;
 
 VALUE ossl_x509ext_new(X509_EXTENSION *);
 X509_EXTENSION *GetX509ExtPtr(VALUE);
@@ -69,9 +62,6 @@ void Init_ossl_x509ext(void);
 /*
  * X509Name
  */
-extern VALUE cX509Name;
-extern VALUE eX509NameError;
-
 VALUE ossl_x509name_new(X509_NAME *);
 X509_NAME *GetX509NamePtr(VALUE);
 void Init_ossl_x509name(void);
@@ -79,9 +69,6 @@ void Init_ossl_x509name(void);
 /*
  * X509Request
  */
-extern VALUE cX509Req;
-extern VALUE eX509ReqError;
-
 X509_REQ *GetX509ReqPtr(VALUE);
 void Init_ossl_x509req(void);
 
@@ -89,7 +76,6 @@ void Init_ossl_x509req(void);
  * X509Revoked
  */
 extern VALUE cX509Rev;
-extern VALUE eX509RevError;
 
 VALUE ossl_x509revoked_new(X509_REVOKED *);
 X509_REVOKED *DupX509RevokedPtr(VALUE);
@@ -98,12 +84,7 @@ void Init_ossl_x509revoked(void);
 /*
  * X509Store and X509StoreContext
  */
-extern VALUE cX509Store;
-extern VALUE cX509StoreContext;
-extern VALUE eX509StoreError;
-
 X509_STORE *GetX509StorePtr(VALUE);
-
 void Init_ossl_x509store(void);
 
 /*
diff --git a/ext/openssl/ossl_x509attr.c b/ext/openssl/ossl_x509attr.c
index d1d8bb5e95e695..3f6b89bdde5af3 100644
--- a/ext/openssl/ossl_x509attr.c
+++ b/ext/openssl/ossl_x509attr.c
@@ -5,7 +5,7 @@
  */
 /*
  * This program is licensed under the same licence as Ruby.
- * (See the file 'LICENCE'.)
+ * (See the file 'COPYING'.)
  */
 #include "ossl.h"
 
@@ -28,7 +28,7 @@
  * Classes
  */
 VALUE cX509Attr;
-VALUE eX509AttrError;
+static VALUE eX509AttrError;
 
 static void
 ossl_x509attr_free(void *ptr)
@@ -123,6 +123,7 @@ ossl_x509attr_initialize(int argc, VALUE *argv, VALUE self)
     return self;
 }
 
+/* :nodoc: */
 static VALUE
 ossl_x509attr_initialize_copy(VALUE self, VALUE other)
 {
@@ -201,37 +202,36 @@ static VALUE
 ossl_x509attr_set_value(VALUE self, VALUE value)
 {
     X509_ATTRIBUTE *attr;
-    VALUE asn1_value;
-    int i, asn1_tag;
+    GetX509Attr(self, attr);
 
     OSSL_Check_Kind(value, cASN1Data);
-    asn1_tag = NUM2INT(rb_attr_get(value, rb_intern("@tag")));
-    asn1_value = rb_attr_get(value, rb_intern("@value"));
-    if (asn1_tag != V_ASN1_SET)
-	ossl_raise(eASN1Error, "argument must be ASN1::Set");
-    if (!RB_TYPE_P(asn1_value, T_ARRAY))
-	ossl_raise(eASN1Error, "ASN1::Set has non-array value");
+    VALUE der = ossl_to_der(value);
+    const unsigned char *p = (const unsigned char *)RSTRING_PTR(der);
+    STACK_OF(ASN1_TYPE) *sk = d2i_ASN1_SET_ANY(NULL, &p, RSTRING_LEN(der));
+    if (!sk)
+        ossl_raise(eX509AttrError, "attribute value must be ASN1::Set");
 
-    GetX509Attr(self, attr);
     if (X509_ATTRIBUTE_count(attr)) { /* populated, reset first */
-	ASN1_OBJECT *obj = X509_ATTRIBUTE_get0_object(attr);
-	X509_ATTRIBUTE *new_attr = X509_ATTRIBUTE_create_by_OBJ(NULL, obj, 0, NULL, -1);
-	if (!new_attr)
-	    ossl_raise(eX509AttrError, NULL);
-	SetX509Attr(self, new_attr);
-	X509_ATTRIBUTE_free(attr);
-	attr = new_attr;
+        ASN1_OBJECT *obj = X509_ATTRIBUTE_get0_object(attr);
+        X509_ATTRIBUTE *new_attr = X509_ATTRIBUTE_create_by_OBJ(NULL, obj, 0, NULL, -1);
+        if (!new_attr) {
+            sk_ASN1_TYPE_pop_free(sk, ASN1_TYPE_free);
+            ossl_raise(eX509AttrError, "X509_ATTRIBUTE_create_by_OBJ");
+        }
+        SetX509Attr(self, new_attr);
+        X509_ATTRIBUTE_free(attr);
+        attr = new_attr;
     }
 
-    for (i = 0; i < RARRAY_LEN(asn1_value); i++) {
-	ASN1_TYPE *a1type = ossl_asn1_get_asn1type(RARRAY_AREF(asn1_value, i));
-	if (!X509_ATTRIBUTE_set1_data(attr, ASN1_TYPE_get(a1type),
-				      a1type->value.ptr, -1)) {
-	    ASN1_TYPE_free(a1type);
-	    ossl_raise(eX509AttrError, NULL);
-	}
-	ASN1_TYPE_free(a1type);
+    for (int i = 0; i < sk_ASN1_TYPE_num(sk); i++) {
+        ASN1_TYPE *a1type = sk_ASN1_TYPE_value(sk, i);
+        if (!X509_ATTRIBUTE_set1_data(attr, ASN1_TYPE_get(a1type),
+                                      a1type->value.ptr, -1)) {
+            sk_ASN1_TYPE_pop_free(sk, ASN1_TYPE_free);
+            ossl_raise(eX509AttrError, "X509_ATTRIBUTE_set1_data");
+        }
     }
+    sk_ASN1_TYPE_pop_free(sk, ASN1_TYPE_free);
 
     return value;
 }
diff --git a/ext/openssl/ossl_x509cert.c b/ext/openssl/ossl_x509cert.c
index aa6b9bb7ce2cd8..4734602bef187c 100644
--- a/ext/openssl/ossl_x509cert.c
+++ b/ext/openssl/ossl_x509cert.c
@@ -5,7 +5,7 @@
  */
 /*
  * This program is licensed under the same licence as Ruby.
- * (See the file 'LICENCE'.)
+ * (See the file 'COPYING'.)
  */
 #include "ossl.h"
 
@@ -28,7 +28,7 @@
  * Classes
  */
 VALUE cX509Cert;
-VALUE eX509CertError;
+static VALUE eX509CertError;
 
 static void
 ossl_x509_free(void *ptr)
@@ -140,6 +140,7 @@ ossl_x509_initialize(int argc, VALUE *argv, VALUE self)
     return self;
 }
 
+/* :nodoc: */
 static VALUE
 ossl_x509_copy(VALUE self, VALUE other)
 {
@@ -328,13 +329,15 @@ ossl_x509_get_signature_algorithm(VALUE self)
 {
     X509 *x509;
     BIO *out;
+    const ASN1_OBJECT *obj;
     VALUE str;
 
     GetX509(self, x509);
     out = BIO_new(BIO_s_mem());
     if (!out) ossl_raise(eX509CertError, NULL);
 
-    if (!i2a_ASN1_OBJECT(out, X509_get0_tbs_sigalg(x509)->algorithm)) {
+    X509_ALGOR_get0(&obj, NULL, NULL, X509_get0_tbs_sigalg(x509));
+    if (!i2a_ASN1_OBJECT(out, obj)) {
 	BIO_free(out);
 	ossl_raise(eX509CertError, NULL);
     }
@@ -539,7 +542,11 @@ ossl_x509_sign(VALUE self, VALUE key, VALUE digest)
     const EVP_MD *md;
 
     pkey = GetPrivPKeyPtr(key); /* NO NEED TO DUP */
-    md = ossl_evp_get_digestbyname(digest);
+    if (NIL_P(digest)) {
+        md = NULL; /* needed for some key types, e.g. Ed25519 */
+    } else {
+        md = ossl_evp_get_digestbyname(digest);
+    }
     GetX509(self, x509);
     if (!X509_sign(x509, pkey, md)) {
 	ossl_raise(eX509CertError, NULL);
@@ -613,10 +620,7 @@ ossl_x509_get_extensions(VALUE self)
 
     GetX509(self, x509);
     count = X509_get_ext_count(x509);
-    if (count < 0) {
-	return rb_ary_new();
-    }
-    ary = rb_ary_new2(count);
+    ary = rb_ary_new_capa(count);
     for (i=0; i<count; i++) {
 	ext = X509_get_ext(x509, i); /* NO DUP - don't free! */
 	rb_ary_push(ary, ossl_x509ext_new(ext));
@@ -707,6 +711,36 @@ ossl_x509_eq(VALUE self, VALUE other)
     return !X509_cmp(a, b) ? Qtrue : Qfalse;
 }
 
+/*
+ * call-seq:
+ *    cert.tbs_bytes => string
+ *
+ * Returns the DER-encoded bytes of the certificate's to be signed certificate.
+ * This is mainly useful for validating embedded certificate transparency signatures.
+ */
+static VALUE
+ossl_x509_tbs_bytes(VALUE self)
+{
+    X509 *x509;
+    int len;
+    unsigned char *p0;
+    VALUE str;
+
+    GetX509(self, x509);
+    len = i2d_re_X509_tbs(x509, NULL);
+    if (len <= 0) {
+        ossl_raise(eX509CertError, "i2d_re_X509_tbs");
+    }
+    str = rb_str_new(NULL, len);
+    p0 = (unsigned char *)RSTRING_PTR(str);
+    if (i2d_re_X509_tbs(x509, &p0) <= 0) {
+        ossl_raise(eX509CertError, "i2d_re_X509_tbs");
+    }
+    ossl_str_adjust(str, p0);
+
+    return str;
+}
+
 struct load_chained_certificates_arguments {
     VALUE certificates;
     X509 *certificate;
@@ -999,4 +1033,5 @@ Init_ossl_x509cert(void)
     rb_define_method(cX509Cert, "add_extension", ossl_x509_add_extension, 1);
     rb_define_method(cX509Cert, "inspect", ossl_x509_inspect, 0);
     rb_define_method(cX509Cert, "==", ossl_x509_eq, 1);
+    rb_define_method(cX509Cert, "tbs_bytes", ossl_x509_tbs_bytes, 0);
 }
diff --git a/ext/openssl/ossl_x509crl.c b/ext/openssl/ossl_x509crl.c
index 80e29f9df2dfab..135dfe3d758d18 100644
--- a/ext/openssl/ossl_x509crl.c
+++ b/ext/openssl/ossl_x509crl.c
@@ -5,7 +5,7 @@
  */
 /*
  * This program is licensed under the same licence as Ruby.
- * (See the file 'LICENCE'.)
+ * (See the file 'COPYING'.)
  */
 #include "ossl.h"
 
@@ -27,8 +27,8 @@
 /*
  * Classes
  */
-VALUE cX509CRL;
-VALUE eX509CRLError;
+static VALUE cX509CRL;
+static VALUE eX509CRLError;
 
 static void
 ossl_x509crl_free(void *ptr)
@@ -117,6 +117,7 @@ ossl_x509crl_initialize(int argc, VALUE *argv, VALUE self)
     return self;
 }
 
+/* :nodoc: */
 static VALUE
 ossl_x509crl_copy(VALUE self, VALUE other)
 {
@@ -169,6 +170,7 @@ ossl_x509crl_get_signature_algorithm(VALUE self)
 {
     X509_CRL *crl;
     const X509_ALGOR *alg;
+    const ASN1_OBJECT *obj;
     BIO *out;
 
     GetX509CRL(self, crl);
@@ -176,7 +178,8 @@ ossl_x509crl_get_signature_algorithm(VALUE self)
 	ossl_raise(eX509CRLError, NULL);
     }
     X509_CRL_get0_signature(crl, NULL, &alg);
-    if (!i2a_ASN1_OBJECT(out, alg->algorithm)) {
+    X509_ALGOR_get0(&obj, NULL, NULL, alg);
+    if (!i2a_ASN1_OBJECT(out, obj)) {
 	BIO_free(out);
 	ossl_raise(eX509CRLError, NULL);
     }
@@ -274,21 +277,19 @@ ossl_x509crl_get_revoked(VALUE self)
 {
     X509_CRL *crl;
     int i, num;
-    X509_REVOKED *rev;
-    VALUE ary, revoked;
+    STACK_OF(X509_REVOKED) *sk;
+    VALUE ary;
 
     GetX509CRL(self, crl);
-    num = sk_X509_REVOKED_num(X509_CRL_get_REVOKED(crl));
-    if (num < 0) {
-	OSSL_Debug("num < 0???");
-	return rb_ary_new();
-    }
-    ary = rb_ary_new2(num);
+    sk = X509_CRL_get_REVOKED(crl);
+    if (!sk)
+        return rb_ary_new();
+
+    num = sk_X509_REVOKED_num(sk);
+    ary = rb_ary_new_capa(num);
     for(i=0; i<num; i++) {
-	/* NO DUP - don't free! */
-	rev = sk_X509_REVOKED_value(X509_CRL_get_REVOKED(crl), i);
-	revoked = ossl_x509revoked_new(rev);
-	rb_ary_push(ary, revoked);
+	X509_REVOKED *rev = sk_X509_REVOKED_value(sk, i);
+	rb_ary_push(ary, ossl_x509revoked_new(rev));
     }
 
     return ary;
@@ -350,7 +351,11 @@ ossl_x509crl_sign(VALUE self, VALUE key, VALUE digest)
 
     GetX509CRL(self, crl);
     pkey = GetPrivPKeyPtr(key); /* NO NEED TO DUP */
-    md = ossl_evp_get_digestbyname(digest);
+    if (NIL_P(digest)) {
+	md = NULL; /* needed for some key types, e.g. Ed25519 */
+    } else {
+	md = ossl_evp_get_digestbyname(digest);
+    }
     if (!X509_CRL_sign(crl, pkey, md)) {
 	ossl_raise(eX509CRLError, NULL);
     }
@@ -445,11 +450,7 @@ ossl_x509crl_get_extensions(VALUE self)
 
     GetX509CRL(self, crl);
     count = X509_CRL_get_ext_count(crl);
-    if (count < 0) {
-	OSSL_Debug("count < 0???");
-	return rb_ary_new();
-    }
-    ary = rb_ary_new2(count);
+    ary = rb_ary_new_capa(count);
     for (i=0; i<count; i++) {
 	ext = X509_CRL_get_ext(crl, i); /* NO DUP - don't free! */
 	rb_ary_push(ary, ossl_x509ext_new(ext));
diff --git a/ext/openssl/ossl_x509ext.c b/ext/openssl/ossl_x509ext.c
index 192d09bd3feab6..9b0d9aa651977d 100644
--- a/ext/openssl/ossl_x509ext.c
+++ b/ext/openssl/ossl_x509ext.c
@@ -5,7 +5,7 @@
  */
 /*
  * This program is licensed under the same licence as Ruby.
- * (See the file 'LICENCE'.)
+ * (See the file 'COPYING'.)
  */
 #include "ossl.h"
 
@@ -41,8 +41,8 @@
  * Classes
  */
 VALUE cX509Ext;
-VALUE cX509ExtFactory;
-VALUE eX509ExtError;
+static VALUE cX509ExtFactory;
+static VALUE eX509ExtError;
 
 static void
 ossl_x509ext_free(void *ptr)
@@ -230,11 +230,7 @@ ossl_x509extfactory_create_ext(int argc, VALUE *argv, VALUE self)
     conf = NIL_P(rconf) ? NULL : GetConfig(rconf);
     X509V3_set_nconf(ctx, conf);
 
-#if OSSL_OPENSSL_PREREQ(1, 1, 0) || OSSL_IS_LIBRESSL
     ext = X509V3_EXT_nconf(conf, ctx, oid_cstr, RSTRING_PTR(valstr));
-#else
-    ext = X509V3_EXT_nconf(conf, ctx, (char *)oid_cstr, RSTRING_PTR(valstr));
-#endif
     X509V3_set_ctx_nodb(ctx);
     if (!ext){
 	ossl_raise(eX509ExtError, "%"PRIsVALUE" = %"PRIsVALUE, oid, valstr);
@@ -299,6 +295,7 @@ ossl_x509ext_initialize(int argc, VALUE *argv, VALUE self)
     return self;
 }
 
+/* :nodoc: */
 static VALUE
 ossl_x509ext_initialize_copy(VALUE self, VALUE other)
 {
diff --git a/ext/openssl/ossl_x509name.c b/ext/openssl/ossl_x509name.c
index 9591912f70b0fd..b3791aefa38826 100644
--- a/ext/openssl/ossl_x509name.c
+++ b/ext/openssl/ossl_x509name.c
@@ -5,7 +5,7 @@
  */
 /*
  * This program is licensed under the same licence as Ruby.
- * (See the file 'LICENCE'.)
+ * (See the file 'COPYING'.)
  */
 #include "ossl.h"
 
@@ -32,8 +32,8 @@
 /*
  * Classes
  */
-VALUE cX509Name;
-VALUE eX509NameError;
+static VALUE cX509Name;
+static VALUE eX509NameError;
 
 static void
 ossl_x509name_free(void *ptr)
@@ -177,6 +177,7 @@ ossl_x509name_initialize(int argc, VALUE *argv, VALUE self)
     return self;
 }
 
+/* :nodoc: */
 static VALUE
 ossl_x509name_initialize_copy(VALUE self, VALUE other)
 {
@@ -354,11 +355,7 @@ ossl_x509name_to_a(VALUE self)
 
     GetX509Name(self, name);
     entries = X509_NAME_entry_count(name);
-    if (entries < 0) {
-	OSSL_Debug("name entries < 0!");
-	return rb_ary_new();
-    }
-    ret = rb_ary_new2(entries);
+    ret = rb_ary_new_capa(entries);
     for (i=0; i<entries; i++) {
 	if (!(entry = X509_NAME_get_entry(name, i))) {
 	    ossl_raise(eX509NameError, NULL);
diff --git a/ext/openssl/ossl_x509req.c b/ext/openssl/ossl_x509req.c
index f0581851515423..add1f8d077e888 100644
--- a/ext/openssl/ossl_x509req.c
+++ b/ext/openssl/ossl_x509req.c
@@ -5,7 +5,7 @@
  */
 /*
  * This program is licensed under the same licence as Ruby.
- * (See the file 'LICENCE'.)
+ * (See the file 'COPYING'.)
  */
 #include "ossl.h"
 
@@ -27,8 +27,8 @@
 /*
  * Classes
  */
-VALUE cX509Req;
-VALUE eX509ReqError;
+static VALUE cX509Req;
+static VALUE eX509ReqError;
 
 static void
 ossl_x509req_free(void *ptr)
@@ -103,6 +103,7 @@ ossl_x509req_initialize(int argc, VALUE *argv, VALUE self)
     return self;
 }
 
+/* :nodoc: */
 static VALUE
 ossl_x509req_copy(VALUE self, VALUE other)
 {
@@ -259,6 +260,7 @@ ossl_x509req_get_signature_algorithm(VALUE self)
 {
     X509_REQ *req;
     const X509_ALGOR *alg;
+    const ASN1_OBJECT *obj;
     BIO *out;
 
     GetX509Req(self, req);
@@ -267,7 +269,8 @@ ossl_x509req_get_signature_algorithm(VALUE self)
 	ossl_raise(eX509ReqError, NULL);
     }
     X509_REQ_get0_signature(req, NULL, &alg);
-    if (!i2a_ASN1_OBJECT(out, alg->algorithm)) {
+    X509_ALGOR_get0(&obj, NULL, NULL, alg);
+    if (!i2a_ASN1_OBJECT(out, obj)) {
 	BIO_free(out);
 	ossl_raise(eX509ReqError, NULL);
     }
@@ -312,7 +315,11 @@ ossl_x509req_sign(VALUE self, VALUE key, VALUE digest)
 
     GetX509Req(self, req);
     pkey = GetPrivPKeyPtr(key); /* NO NEED TO DUP */
-    md = ossl_evp_get_digestbyname(digest);
+    if (NIL_P(digest)) {
+        md = NULL; /* needed for some key types, e.g. Ed25519 */
+    } else {
+        md = ossl_evp_get_digestbyname(digest);
+    }
     if (!X509_REQ_sign(req, pkey, md)) {
 	ossl_raise(eX509ReqError, NULL);
     }
diff --git a/ext/openssl/ossl_x509revoked.c b/ext/openssl/ossl_x509revoked.c
index 108447c868f9d0..1eff5dd3556d57 100644
--- a/ext/openssl/ossl_x509revoked.c
+++ b/ext/openssl/ossl_x509revoked.c
@@ -5,7 +5,7 @@
  */
 /*
  * This program is licensed under the same licence as Ruby.
- * (See the file 'LICENCE'.)
+ * (See the file 'COPYING'.)
  */
 #include "ossl.h"
 
@@ -28,7 +28,7 @@
  * Classes
  */
 VALUE cX509Rev;
-VALUE eX509RevError;
+static VALUE eX509RevError;
 
 static void
 ossl_x509rev_free(void *ptr)
@@ -105,6 +105,7 @@ ossl_x509revoked_initialize(int argc, VALUE *argv, VALUE self)
     return self;
 }
 
+/* :nodoc: */
 static VALUE
 ossl_x509revoked_initialize_copy(VALUE self, VALUE other)
 {
@@ -194,11 +195,7 @@ ossl_x509revoked_get_extensions(VALUE self)
 
     GetX509Rev(self, rev);
     count = X509_REVOKED_get_ext_count(rev);
-    if (count < 0) {
-	OSSL_Debug("count < 0???");
-	return rb_ary_new();
-    }
-    ary = rb_ary_new2(count);
+    ary = rb_ary_new_capa(count);
     for (i=0; i<count; i++) {
 	ext = X509_REVOKED_get_ext(rev, i);
 	rb_ary_push(ary, ossl_x509ext_new(ext));
diff --git a/ext/openssl/ossl_x509store.c b/ext/openssl/ossl_x509store.c
index f27381ca905fa6..18acdc8ad0f3fb 100644
--- a/ext/openssl/ossl_x509store.c
+++ b/ext/openssl/ossl_x509store.c
@@ -5,7 +5,7 @@
  */
 /*
  * This program is licensed under the same licence as Ruby.
- * (See the file 'LICENCE'.)
+ * (See the file 'COPYING'.)
  */
 #include "ossl.h"
 
@@ -108,9 +108,9 @@ ossl_verify_cb_call(VALUE proc, int ok, X509_STORE_CTX *ctx)
 /*
  * Classes
  */
-VALUE cX509Store;
-VALUE cX509StoreContext;
-VALUE eX509StoreError;
+static VALUE cX509Store;
+static VALUE cX509StoreContext;
+static VALUE eX509StoreError;
 
 static void
 ossl_x509store_mark(void *ptr)
@@ -212,10 +212,6 @@ ossl_x509store_initialize(int argc, VALUE *argv, VALUE self)
     GetX509Store(self, store);
     if (argc != 0)
         rb_warn("OpenSSL::X509::Store.new does not take any arguments");
-#if !defined(HAVE_OPAQUE_OPENSSL)
-    /* [Bug #405] [Bug #1678] [Bug #3000]; already fixed? */
-    store->ex_data.sk = NULL;
-#endif
     X509_STORE_set_verify_cb(store, x509store_verify_cb);
     ossl_x509store_set_vfy_cb(self, Qnil);
 
@@ -223,7 +219,6 @@ ossl_x509store_initialize(int argc, VALUE *argv, VALUE self)
     rb_iv_set(self, "@error", Qnil);
     rb_iv_set(self, "@error_string", Qnil);
     rb_iv_set(self, "@chain", Qnil);
-    rb_iv_set(self, "@time", Qnil);
 
     return self;
 }
@@ -329,7 +324,12 @@ ossl_x509store_set_trust(VALUE self, VALUE trust)
 static VALUE
 ossl_x509store_set_time(VALUE self, VALUE time)
 {
-    rb_iv_set(self, "@time", time);
+    X509_STORE *store;
+    X509_VERIFY_PARAM *param;
+
+    GetX509Store(self, store);
+    param = X509_STORE_get0_param(store);
+    X509_VERIFY_PARAM_set_time(param, NUM2LONG(rb_Integer(time)));
     return time;
 }
 
@@ -357,15 +357,6 @@ ossl_x509store_add_file(VALUE self, VALUE file)
         ossl_raise(eX509StoreError, "X509_STORE_add_lookup");
     if (X509_LOOKUP_load_file(lookup, path, X509_FILETYPE_PEM) != 1)
         ossl_raise(eX509StoreError, "X509_LOOKUP_load_file");
-#if OPENSSL_VERSION_NUMBER < 0x10101000 || defined(LIBRESSL_VERSION_NUMBER)
-    /*
-     * X509_load_cert_crl_file() which is called from X509_LOOKUP_load_file()
-     * did not check the return value of X509_STORE_add_{cert,crl}(), leaking
-     * "cert already in hash table" errors on the error queue, if duplicate
-     * certificates are found. This will be fixed by OpenSSL 1.1.1.
-     */
-    ossl_clear_error();
-#endif
 
     return self;
 }
@@ -564,7 +555,6 @@ ossl_x509stctx_new(X509_STORE_CTX *ctx)
 static VALUE ossl_x509stctx_set_flags(VALUE, VALUE);
 static VALUE ossl_x509stctx_set_purpose(VALUE, VALUE);
 static VALUE ossl_x509stctx_set_trust(VALUE, VALUE);
-static VALUE ossl_x509stctx_set_time(VALUE, VALUE);
 
 /*
  * call-seq:
@@ -575,7 +565,7 @@ static VALUE ossl_x509stctx_set_time(VALUE, VALUE);
 static VALUE
 ossl_x509stctx_initialize(int argc, VALUE *argv, VALUE self)
 {
-    VALUE store, cert, chain, t;
+    VALUE store, cert, chain;
     X509_STORE_CTX *ctx;
     X509_STORE *x509st;
     X509 *x509 = NULL;
@@ -599,8 +589,6 @@ ossl_x509stctx_initialize(int argc, VALUE *argv, VALUE self)
         sk_X509_pop_free(x509s, X509_free);
         ossl_raise(eX509StoreError, "X509_STORE_CTX_init");
     }
-    if (!NIL_P(t = rb_iv_get(store, "@time")))
-	ossl_x509stctx_set_time(self, t);
     rb_iv_set(self, "@verify_callback", rb_iv_get(store, "@verify_callback"));
     rb_iv_set(self, "@cert", cert);
 
@@ -631,7 +619,7 @@ ossl_x509stctx_verify(VALUE self)
         ossl_clear_error();
         return Qfalse;
       default:
-        ossl_raise(eX509CertError, "X509_verify_cert");
+        ossl_raise(eX509StoreError, "X509_verify_cert");
     }
 }
 
diff --git a/ext/pathname/depend b/ext/pathname/depend
index 5dd8b042dec55e..585b9e47c3cb0d 100644
--- a/ext/pathname/depend
+++ b/ext/pathname/depend
@@ -138,6 +138,7 @@ pathname.o: $(hdrdir)/ruby/internal/intern/re.h
 pathname.o: $(hdrdir)/ruby/internal/intern/ruby.h
 pathname.o: $(hdrdir)/ruby/internal/intern/select.h
 pathname.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+pathname.o: $(hdrdir)/ruby/internal/intern/set.h
 pathname.o: $(hdrdir)/ruby/internal/intern/signal.h
 pathname.o: $(hdrdir)/ruby/internal/intern/sprintf.h
 pathname.o: $(hdrdir)/ruby/internal/intern/string.h
@@ -157,6 +158,7 @@ pathname.o: $(hdrdir)/ruby/internal/special_consts.h
 pathname.o: $(hdrdir)/ruby/internal/static_assert.h
 pathname.o: $(hdrdir)/ruby/internal/stdalign.h
 pathname.o: $(hdrdir)/ruby/internal/stdbool.h
+pathname.o: $(hdrdir)/ruby/internal/stdckdint.h
 pathname.o: $(hdrdir)/ruby/internal/symbol.h
 pathname.o: $(hdrdir)/ruby/internal/value.h
 pathname.o: $(hdrdir)/ruby/internal/value_type.h
diff --git a/ext/pathname/extconf.rb b/ext/pathname/extconf.rb
index 84e68277aae84e..b4e1617b9e6b7f 100644
--- a/ext/pathname/extconf.rb
+++ b/ext/pathname/extconf.rb
@@ -1,4 +1,3 @@
 # frozen_string_literal: false
 require 'mkmf'
-have_func("rb_file_s_birthtime")
 create_makefile('pathname')
diff --git a/ext/pathname/lib/pathname.rb b/ext/pathname/lib/pathname.rb
index e0f38b2b37fa02..35fd77856162a4 100644
--- a/ext/pathname/lib/pathname.rb
+++ b/ext/pathname/lib/pathname.rb
@@ -14,7 +14,7 @@
 
 class Pathname
 
-  VERSION = "0.2.1"
+  VERSION = "0.4.0"
 
   # :stopdoc:
 
@@ -572,7 +572,7 @@ def find(ignore_error: true) # :yield: pathname
     return to_enum(__method__, ignore_error: ignore_error) unless block_given?
     require 'find'
     if @path == '.'
-      Find.find(@path, ignore_error: ignore_error) {|f| yield self.class.new(f.sub(%r{\A\./}, '')) }
+      Find.find(@path, ignore_error: ignore_error) {|f| yield self.class.new(f.delete_prefix('./')) }
     else
       Find.find(@path, ignore_error: ignore_error) {|f| yield self.class.new(f) }
     end
@@ -580,16 +580,15 @@ def find(ignore_error: true) # :yield: pathname
 end
 
 
-autoload(:FileUtils, 'fileutils')
-
 class Pathname    # * FileUtils *
   # Creates a full path, including any intermediate directories that don't yet
   # exist.
   #
   # See FileUtils.mkpath and FileUtils.mkdir_p
   def mkpath(mode: nil)
+    require 'fileutils'
     FileUtils.mkpath(@path, mode: mode)
-    nil
+    self
   end
 
   # Recursively deletes a directory, including all directories beneath it.
@@ -600,7 +599,23 @@ def rmtree(noop: nil, verbose: nil, secure: nil)
     # File::Path provides "mkpath" and "rmtree".
     require 'fileutils'
     FileUtils.rm_rf(@path, noop: noop, verbose: verbose, secure: secure)
-    nil
+    self
   end
 end
 
+class Pathname    # * tmpdir *
+  # Creates a tmp directory and wraps the returned path in a Pathname object.
+  #
+  # See Dir.mktmpdir
+  def self.mktmpdir
+    require 'tmpdir' unless defined?(Dir.mktmpdir)
+    if block_given?
+      Dir.mktmpdir do |dir|
+        dir = self.new(dir)
+        yield dir
+      end
+    else
+      self.new(Dir.mktmpdir)
+    end
+  end
+end
diff --git a/ext/pathname/pathname.c b/ext/pathname/pathname.c
index 878f216fb5cad7..cdecb3f897ee68 100644
--- a/ext/pathname/pathname.c
+++ b/ext/pathname/pathname.c
@@ -479,7 +479,6 @@ path_atime(VALUE self)
     return rb_funcall(rb_cFile, id_atime, 1, get_strpath(self));
 }
 
-#if defined(HAVE_RB_FILE_S_BIRTHTIME)
 /*
  * call-seq:
  *   pathname.birthtime	-> time
@@ -494,10 +493,6 @@ path_birthtime(VALUE self)
 {
     return rb_funcall(rb_cFile, id_birthtime, 1, get_strpath(self));
 }
-#else
-/* check at compilation time for `respond_to?` */
-# define path_birthtime rb_f_notimplement
-#endif
 
 /*
  * call-seq:
diff --git a/ext/psych/depend b/ext/psych/depend
index 13fbe3fb1927ca..95175841a2e541 100644
--- a/ext/psych/depend
+++ b/ext/psych/depend
@@ -152,6 +152,7 @@ psych.o: $(hdrdir)/ruby/internal/intern/re.h
 psych.o: $(hdrdir)/ruby/internal/intern/ruby.h
 psych.o: $(hdrdir)/ruby/internal/intern/select.h
 psych.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+psych.o: $(hdrdir)/ruby/internal/intern/set.h
 psych.o: $(hdrdir)/ruby/internal/intern/signal.h
 psych.o: $(hdrdir)/ruby/internal/intern/sprintf.h
 psych.o: $(hdrdir)/ruby/internal/intern/string.h
@@ -171,6 +172,7 @@ psych.o: $(hdrdir)/ruby/internal/special_consts.h
 psych.o: $(hdrdir)/ruby/internal/static_assert.h
 psych.o: $(hdrdir)/ruby/internal/stdalign.h
 psych.o: $(hdrdir)/ruby/internal/stdbool.h
+psych.o: $(hdrdir)/ruby/internal/stdckdint.h
 psych.o: $(hdrdir)/ruby/internal/symbol.h
 psych.o: $(hdrdir)/ruby/internal/value.h
 psych.o: $(hdrdir)/ruby/internal/value_type.h
@@ -328,6 +330,7 @@ psych_emitter.o: $(hdrdir)/ruby/internal/intern/re.h
 psych_emitter.o: $(hdrdir)/ruby/internal/intern/ruby.h
 psych_emitter.o: $(hdrdir)/ruby/internal/intern/select.h
 psych_emitter.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+psych_emitter.o: $(hdrdir)/ruby/internal/intern/set.h
 psych_emitter.o: $(hdrdir)/ruby/internal/intern/signal.h
 psych_emitter.o: $(hdrdir)/ruby/internal/intern/sprintf.h
 psych_emitter.o: $(hdrdir)/ruby/internal/intern/string.h
@@ -347,6 +350,7 @@ psych_emitter.o: $(hdrdir)/ruby/internal/special_consts.h
 psych_emitter.o: $(hdrdir)/ruby/internal/static_assert.h
 psych_emitter.o: $(hdrdir)/ruby/internal/stdalign.h
 psych_emitter.o: $(hdrdir)/ruby/internal/stdbool.h
+psych_emitter.o: $(hdrdir)/ruby/internal/stdckdint.h
 psych_emitter.o: $(hdrdir)/ruby/internal/symbol.h
 psych_emitter.o: $(hdrdir)/ruby/internal/value.h
 psych_emitter.o: $(hdrdir)/ruby/internal/value_type.h
@@ -504,6 +508,7 @@ psych_parser.o: $(hdrdir)/ruby/internal/intern/re.h
 psych_parser.o: $(hdrdir)/ruby/internal/intern/ruby.h
 psych_parser.o: $(hdrdir)/ruby/internal/intern/select.h
 psych_parser.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+psych_parser.o: $(hdrdir)/ruby/internal/intern/set.h
 psych_parser.o: $(hdrdir)/ruby/internal/intern/signal.h
 psych_parser.o: $(hdrdir)/ruby/internal/intern/sprintf.h
 psych_parser.o: $(hdrdir)/ruby/internal/intern/string.h
@@ -523,6 +528,7 @@ psych_parser.o: $(hdrdir)/ruby/internal/special_consts.h
 psych_parser.o: $(hdrdir)/ruby/internal/static_assert.h
 psych_parser.o: $(hdrdir)/ruby/internal/stdalign.h
 psych_parser.o: $(hdrdir)/ruby/internal/stdbool.h
+psych_parser.o: $(hdrdir)/ruby/internal/stdckdint.h
 psych_parser.o: $(hdrdir)/ruby/internal/symbol.h
 psych_parser.o: $(hdrdir)/ruby/internal/value.h
 psych_parser.o: $(hdrdir)/ruby/internal/value_type.h
@@ -680,6 +686,7 @@ psych_to_ruby.o: $(hdrdir)/ruby/internal/intern/re.h
 psych_to_ruby.o: $(hdrdir)/ruby/internal/intern/ruby.h
 psych_to_ruby.o: $(hdrdir)/ruby/internal/intern/select.h
 psych_to_ruby.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+psych_to_ruby.o: $(hdrdir)/ruby/internal/intern/set.h
 psych_to_ruby.o: $(hdrdir)/ruby/internal/intern/signal.h
 psych_to_ruby.o: $(hdrdir)/ruby/internal/intern/sprintf.h
 psych_to_ruby.o: $(hdrdir)/ruby/internal/intern/string.h
@@ -699,6 +706,7 @@ psych_to_ruby.o: $(hdrdir)/ruby/internal/special_consts.h
 psych_to_ruby.o: $(hdrdir)/ruby/internal/static_assert.h
 psych_to_ruby.o: $(hdrdir)/ruby/internal/stdalign.h
 psych_to_ruby.o: $(hdrdir)/ruby/internal/stdbool.h
+psych_to_ruby.o: $(hdrdir)/ruby/internal/stdckdint.h
 psych_to_ruby.o: $(hdrdir)/ruby/internal/symbol.h
 psych_to_ruby.o: $(hdrdir)/ruby/internal/value.h
 psych_to_ruby.o: $(hdrdir)/ruby/internal/value_type.h
@@ -856,6 +864,7 @@ psych_yaml_tree.o: $(hdrdir)/ruby/internal/intern/re.h
 psych_yaml_tree.o: $(hdrdir)/ruby/internal/intern/ruby.h
 psych_yaml_tree.o: $(hdrdir)/ruby/internal/intern/select.h
 psych_yaml_tree.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+psych_yaml_tree.o: $(hdrdir)/ruby/internal/intern/set.h
 psych_yaml_tree.o: $(hdrdir)/ruby/internal/intern/signal.h
 psych_yaml_tree.o: $(hdrdir)/ruby/internal/intern/sprintf.h
 psych_yaml_tree.o: $(hdrdir)/ruby/internal/intern/string.h
@@ -875,6 +884,7 @@ psych_yaml_tree.o: $(hdrdir)/ruby/internal/special_consts.h
 psych_yaml_tree.o: $(hdrdir)/ruby/internal/static_assert.h
 psych_yaml_tree.o: $(hdrdir)/ruby/internal/stdalign.h
 psych_yaml_tree.o: $(hdrdir)/ruby/internal/stdbool.h
+psych_yaml_tree.o: $(hdrdir)/ruby/internal/stdckdint.h
 psych_yaml_tree.o: $(hdrdir)/ruby/internal/symbol.h
 psych_yaml_tree.o: $(hdrdir)/ruby/internal/value.h
 psych_yaml_tree.o: $(hdrdir)/ruby/internal/value_type.h
diff --git a/ext/psych/lib/psych.rb b/ext/psych/lib/psych.rb
index ae167472f2aee9..0c158c9ff329b1 100644
--- a/ext/psych/lib/psych.rb
+++ b/ext/psych/lib/psych.rb
@@ -1,4 +1,6 @@
 # frozen_string_literal: true
+require 'date'
+
 require_relative 'psych/versions'
 case RUBY_ENGINE
 when 'jruby'
@@ -21,7 +23,6 @@
 require_relative 'psych/omap'
 require_relative 'psych/set'
 require_relative 'psych/coder'
-require_relative 'psych/core_ext'
 require_relative 'psych/stream'
 require_relative 'psych/json/tree_builder'
 require_relative 'psych/json/stream'
@@ -84,7 +85,7 @@
 #   Psych.safe_load_file("data.yml", permitted_classes: [Date])
 #   Psych.load_file("trusted_database.yml")
 #
-# ==== Exception handling
+# ==== \Exception handling
 #
 #   begin
 #     # The second argument changes only the exception contents
@@ -148,7 +149,7 @@
 #   # Returns Psych::Nodes::Document
 #   Psych.parse_file('database.yml')
 #
-# ==== Exception handling
+# ==== \Exception handling
 #
 #   begin
 #     # The second argument changes only the exception contents
@@ -340,7 +341,7 @@ def self.safe_load yaml, permitted_classes: [], permitted_symbols: [], aliases:
   # provided, the object contained in the first document will be returned.
   # +filename+ will be used in the exception message if any exception
   # is raised while parsing.  If +yaml+ is empty, it returns
-  # the specified +fallback+ return value, which defaults to +false+.
+  # the specified +fallback+ return value, which defaults to +nil+.
   #
   # Raises a Psych::SyntaxError when a YAML syntax error is detected.
   #
@@ -479,6 +480,7 @@ def self.parse_stream yaml, filename: nil, &block
   #
   #                           Default: <tt>2</tt>.
   # [<tt>:line_width</tt>]    Max character to wrap line at.
+  #                           For unlimited line width use <tt>-1</tt>.
   #
   #                           Default: <tt>0</tt> (meaning "wrap at 81").
   # [<tt>:canonical</tt>]     Write "canonical" YAML form (very verbose, yet
@@ -489,6 +491,10 @@ def self.parse_stream yaml, filename: nil, &block
   #
   #                           Default: <tt>false</tt>.
   #
+  # [<tt>:stringify_names</tt>] Dump symbol keys in Hash objects as string.
+  #
+  #                             Default: <tt>false</tt>.
+  #
   # Example:
   #
   #   # Dump an array, get back a YAML string
@@ -502,6 +508,9 @@ def self.parse_stream yaml, filename: nil, &block
   #
   #   # Dump an array to an IO with indentation set
   #   Psych.dump(['a', ['b']], StringIO.new, indentation: 3)
+  #
+  #   # Dump hash with symbol keys as string
+  #   Psych.dump({a: "b"}, stringify_names: true) # => "---\na: b\n"
   def self.dump o, io = nil, options = {}
     if Hash === io
       options = io
@@ -552,6 +561,7 @@ def self.dump o, io = nil, options = {}
   #
   #                           Default: <tt>2</tt>.
   # [<tt>:line_width</tt>]    Max character to wrap line at.
+  #                           For unlimited line width use <tt>-1</tt>.
   #
   #                           Default: <tt>0</tt> (meaning "wrap at 81").
   # [<tt>:canonical</tt>]     Write "canonical" YAML form (very verbose, yet
@@ -562,6 +572,10 @@ def self.dump o, io = nil, options = {}
   #
   #                           Default: <tt>false</tt>.
   #
+  # [<tt>:stringify_names</tt>] Dump symbol keys in Hash objects as string.
+  #
+  #                             Default: <tt>false</tt>.
+  #
   # Example:
   #
   #   # Dump an array, get back a YAML string
@@ -575,6 +589,9 @@ def self.dump o, io = nil, options = {}
   #
   #   # Dump an array to an IO with indentation set
   #   Psych.safe_dump(['a', ['b']], StringIO.new, indentation: 3)
+  #
+  #   # Dump hash with symbol keys as string
+  #   Psych.dump({a: "b"}, stringify_names: true) # => "---\na: b\n"
   def self.safe_dump o, io = nil, options = {}
     if Hash === io
       options = io
@@ -636,6 +653,35 @@ def self.load_stream yaml, filename: nil, fallback: [], **kwargs
     result
   end
 
+  ###
+  # Load multiple documents given in +yaml+. Returns the parsed documents
+  # as a list.
+  #
+  # Example:
+  #
+  #   Psych.safe_load_stream("--- foo\n...\n--- bar\n...") # => ['foo', 'bar']
+  #
+  #   list = []
+  #   Psych.safe_load_stream("--- foo\n...\n--- bar\n...") do |ruby|
+  #     list << ruby
+  #   end
+  #   list # => ['foo', 'bar']
+  #
+  def self.safe_load_stream yaml, filename: nil, permitted_classes: [], aliases: false
+    documents = parse_stream(yaml, filename: filename).children.map do |child|
+      stream = Psych::Nodes::Stream.new
+      stream.children << child
+      safe_load(stream.to_yaml, permitted_classes: permitted_classes, aliases: aliases)
+    end
+
+    if block_given?
+      documents.each { |doc| yield doc }
+      nil
+    else
+      documents
+    end
+  end
+
   ###
   # Load the document contained in +filename+.  Returns the yaml contained in
   # +filename+ as a Ruby object, or if the file is empty, it returns
@@ -653,7 +699,7 @@ def self.unsafe_load_file filename, **kwargs
   ###
   # Safely loads the document contained in +filename+.  Returns the yaml contained in
   # +filename+ as a Ruby object, or if the file is empty, it returns
-  # the specified +fallback+ return value, which defaults to +false+.
+  # the specified +fallback+ return value, which defaults to +nil+.
   # See safe_load for options.
   def self.safe_load_file filename, **kwargs
     File.open(filename, 'r:bom|utf-8') { |f|
@@ -664,7 +710,7 @@ def self.safe_load_file filename, **kwargs
   ###
   # Loads the document contained in +filename+.  Returns the yaml contained in
   # +filename+ as a Ruby object, or if the file is empty, it returns
-  # the specified +fallback+ return value, which defaults to +false+.
+  # the specified +fallback+ return value, which defaults to +nil+.
   # See load for options.
   def self.load_file filename, **kwargs
     File.open(filename, 'r:bom|utf-8') { |f|
@@ -743,3 +789,5 @@ def domain_types=(value)
   self.domain_types = {}
   # :startdoc:
 end
+
+require_relative 'psych/core_ext'
diff --git a/ext/psych/lib/psych/class_loader.rb b/ext/psych/lib/psych/class_loader.rb
index 50efc35ee28fcd..c8f509720af6a8 100644
--- a/ext/psych/lib/psych/class_loader.rb
+++ b/ext/psych/lib/psych/class_loader.rb
@@ -6,6 +6,7 @@ module Psych
   class ClassLoader # :nodoc:
     BIG_DECIMAL = 'BigDecimal'
     COMPLEX     = 'Complex'
+    DATA        = 'Data' unless RUBY_VERSION < "3.2"
     DATE        = 'Date'
     DATE_TIME   = 'DateTime'
     EXCEPTION   = 'Exception'
diff --git a/ext/psych/lib/psych/core_ext.rb b/ext/psych/lib/psych/core_ext.rb
index 0721a133c3ae59..fc259fd4a2f771 100644
--- a/ext/psych/lib/psych/core_ext.rb
+++ b/ext/psych/lib/psych/core_ext.rb
@@ -17,3 +17,24 @@ def to_yaml options = {}
 if defined?(::IRB)
   require_relative 'y'
 end
+
+# Up to Ruby 3.4, Set was a regular object and was dumped as such
+# by Pysch.
+# Starting from Ruby 3.5 it's a core class written in C, so we have to implement
+# #encode_with / #init_with to preserve backward compatibility.
+if defined?(::Set) && Set.new.instance_variables.empty?
+  class Set
+    def encode_with(coder)
+      hash = {}
+      each do |m|
+        hash[m] = true
+      end
+      coder["hash"] = hash
+      coder
+    end
+
+    def init_with(coder)
+      replace(coder["hash"].keys)
+    end
+  end
+end
diff --git a/ext/psych/lib/psych/nodes/node.rb b/ext/psych/lib/psych/nodes/node.rb
index f44fce5f053a5f..6ae5c591484539 100644
--- a/ext/psych/lib/psych/nodes/node.rb
+++ b/ext/psych/lib/psych/nodes/node.rb
@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-require 'stringio'
 require_relative '../class_loader'
 require_relative '../scalar_scanner'
 
@@ -56,6 +55,8 @@ def to_ruby(symbolize_names: false, freeze: false, strict_integer: false)
       #
       # See also Psych::Visitors::Emitter
       def yaml io = nil, options = {}
+        require "stringio" unless defined?(StringIO)
+
         real_io = io || StringIO.new(''.encode('utf-8'))
 
         Visitors::Emitter.new(real_io, options).accept self
diff --git a/ext/psych/lib/psych/scalar_scanner.rb b/ext/psych/lib/psych/scalar_scanner.rb
index 3cb4bf3c7e89da..8cf868f8638e9e 100644
--- a/ext/psych/lib/psych/scalar_scanner.rb
+++ b/ext/psych/lib/psych/scalar_scanner.rb
@@ -11,18 +11,18 @@ class ScalarScanner
     # Base 60, [-+]inf and NaN are handled separately
     FLOAT = /^(?:[-+]?([0-9][0-9_,]*)?\.[0-9]*([eE][-+][0-9]+)?(?# base 10))$/x
 
-    # Taken from http://yaml.org/type/int.html
-    INTEGER_STRICT = /^(?:[-+]?0b[0-1_]+                  (?# base 2)
-                         |[-+]?0[0-7_]+                   (?# base 8)
-                         |[-+]?(0|[1-9][0-9_]*)           (?# base 10)
-                         |[-+]?0x[0-9a-fA-F_]+            (?# base 16))$/x
+    # Taken from http://yaml.org/type/int.html and modified to ensure at least one numerical symbol exists
+    INTEGER_STRICT = /^(?:[-+]?0b[_]*[0-1][0-1_]*             (?# base 2)
+                         |[-+]?0[_]*[0-7][0-7_]*              (?# base 8)
+                         |[-+]?(0|[1-9][0-9_]*)               (?# base 10)
+                         |[-+]?0x[_]*[0-9a-fA-F][0-9a-fA-F_]* (?# base 16))$/x
 
     # Same as above, but allows commas.
     # Not to YML spec, but kept for backwards compatibility
-    INTEGER_LEGACY = /^(?:[-+]?0b[0-1_,]+                        (?# base 2)
-                         |[-+]?0[0-7_,]+                         (?# base 8)
+    INTEGER_LEGACY = /^(?:[-+]?0b[_,]*[0-1][0-1_,]*                (?# base 2)
+                         |[-+]?0[_,]*[0-7][0-7_,]*                 (?# base 8)
                          |[-+]?(?:0|[1-9](?:[0-9]|,[0-9]|_[0-9])*) (?# base 10)
-                         |[-+]?0x[0-9a-fA-F_,]+                  (?# base 16))$/x
+                         |[-+]?0x[_,]*[0-9a-fA-F][0-9a-fA-F_,]*    (?# base 16))$/x
 
     attr_reader :class_loader
 
@@ -61,7 +61,6 @@ def tokenize string
           string
         end
       elsif string.match?(/^\d{4}-(?:1[012]|0\d|\d)-(?:[12]\d|3[01]|0\d|\d)$/)
-        require 'date'
         begin
           class_loader.date.strptime(string, '%F', Date::GREGORIAN)
         rescue ArgumentError
diff --git a/ext/psych/lib/psych/versions.rb b/ext/psych/lib/psych/versions.rb
index 57b7659b571a85..3202b10296f549 100644
--- a/ext/psych/lib/psych/versions.rb
+++ b/ext/psych/lib/psych/versions.rb
@@ -2,9 +2,9 @@
 
 module Psych
   # The version of Psych you are using
-  VERSION = '5.1.0'
+  VERSION = '5.2.6'
 
   if RUBY_ENGINE == 'jruby'
-    DEFAULT_SNAKEYAML_VERSION = '2.6'.freeze
+    DEFAULT_SNAKEYAML_VERSION = '2.9'.freeze
   end
 end
diff --git a/ext/psych/lib/psych/visitors/to_ruby.rb b/ext/psych/lib/psych/visitors/to_ruby.rb
index 8614251ca9e6c3..580a74e9fb034d 100644
--- a/ext/psych/lib/psych/visitors/to_ruby.rb
+++ b/ext/psych/lib/psych/visitors/to_ruby.rb
@@ -36,7 +36,7 @@ def accept target
 
         unless @domain_types.empty? || !target.tag
           key = target.tag.sub(/^[!\/]*/, '').sub(/(,\d+)\//, '\1:')
-          key = "tag:#{key}" unless key =~ /^(?:tag:|x-private)/
+          key = "tag:#{key}" unless key.match?(/^(?:tag:|x-private)/)
 
           if @domain_types.key? key
             value, block = @domain_types[key]
@@ -79,7 +79,6 @@ def deserialize o
           class_loader.big_decimal._load o.value
         when "!ruby/object:DateTime"
           class_loader.date_time
-          require 'date' unless defined? DateTime
           t = @ss.parse_time(o.value)
           DateTime.civil(*t.to_a[0, 6].reverse, Rational(t.utc_offset, 86400)) +
             (t.subsec/86400)
@@ -97,11 +96,11 @@ def deserialize o
           Float(@ss.tokenize(o.value))
         when "!ruby/regexp"
           klass = class_loader.regexp
-          o.value =~ /^\/(.*)\/([mixn]*)$/m
-          source  = $1
+          matches = /^\/(?<string>.*)\/(?<options>[mixn]*)$/m.match(o.value)
+          source  = matches[:string].gsub('\/', '/')
           options = 0
           lang    = nil
-          ($2 || '').split('').each do |option|
+          matches[:options].each_char do |option|
             case option
             when 'x' then options |= Regexp::EXTENDED
             when 'i' then options |= Regexp::IGNORECASE
@@ -198,6 +197,32 @@ def visit_Psych_Nodes_Mapping o
             s
           end
 
+        when /^!ruby\/data(-with-ivars)?(?::(.*))?$/
+          data = register(o, resolve_class($2).allocate) if $2
+          members = {}
+
+          if $1 # data-with-ivars
+            ivars   = {}
+            o.children.each_slice(2) do |type, vars|
+              case accept(type)
+              when 'members'
+                revive_data_members(members, vars)
+                data ||= allocate_anon_data(o, members)
+              when 'ivars'
+                revive_hash(ivars, vars)
+              end
+            end
+            ivars.each do |ivar, v|
+              data.instance_variable_set ivar, v
+            end
+          else
+            revive_data_members(members, o)
+          end
+          data ||= allocate_anon_data(o, members)
+          init_struct(data, **members)
+          data.freeze
+          data
+
         when /^!ruby\/object:?(.*)?$/
           name = $1 || 'Object'
 
@@ -341,6 +366,20 @@ def register_empty object
         list
       end
 
+      def allocate_anon_data node, members
+        klass = class_loader.data.define(*members.keys)
+        register(node, klass.allocate)
+      end
+
+      def revive_data_members hash, o
+        o.children.each_slice(2) do |k,v|
+          name  = accept(k)
+          value = accept(v)
+          hash[class_loader.symbolize(name)] = value
+        end
+        hash
+      end
+
       def revive_hash hash, o, tagged= false
         o.children.each_slice(2) { |k,v|
           key = accept(k)
diff --git a/ext/psych/lib/psych/visitors/yaml_tree.rb b/ext/psych/lib/psych/visitors/yaml_tree.rb
index 51491783c314c7..b6c86f4c94046f 100644
--- a/ext/psych/lib/psych/visitors/yaml_tree.rb
+++ b/ext/psych/lib/psych/visitors/yaml_tree.rb
@@ -15,30 +15,25 @@ module Visitors
     class YAMLTree < Psych::Visitors::Visitor
       class Registrar # :nodoc:
         def initialize
-          @obj_to_id   = {}
-          @obj_to_node = {}
-          @targets     = []
+          @obj_to_id   = {}.compare_by_identity
+          @obj_to_node = {}.compare_by_identity
           @counter     = 0
         end
 
         def register target, node
-          return unless target.respond_to? :object_id
-          @targets << target
-          @obj_to_node[target.object_id] = node
+          @obj_to_node[target] = node
         end
 
         def key? target
-          @obj_to_node.key? target.object_id
-        rescue NoMethodError
-          false
+          @obj_to_node.key? target
         end
 
         def id_for target
-          @obj_to_id[target.object_id] ||= (@counter += 1)
+          @obj_to_id[target] ||= (@counter += 1)
         end
 
         def node_for target
-          @obj_to_node[target.object_id]
+          @obj_to_node[target]
         end
       end
 
@@ -70,6 +65,7 @@ def initialize emitter, ss, options
             fail(ArgumentError, "Invalid line_width #{@line_width}, must be non-negative or -1 for unlimited.")
           end
         end
+        @stringify_names = options[:stringify_names]
         @coders     = []
 
         @dispatch_cache = Hash.new do |h,klass|
@@ -77,7 +73,7 @@ def initialize emitter, ss, options
 
           method = respond_to?(method) ? method : h[klass.superclass]
 
-          raise(TypeError, "Can't dump #{target.class}") unless method
+          raise(TypeError, "can't dump #{klass.name}") unless method
 
           h[klass] = method
         end.compare_by_identity
@@ -166,6 +162,44 @@ def visit_Object o
 
       alias :visit_Delegator :visit_Object
 
+      def visit_Data o
+        ivars = o.instance_variables
+        if ivars.empty?
+          tag = ['!ruby/data', o.class.name].compact.join(':')
+          register o, @emitter.start_mapping(nil, tag, false, Nodes::Mapping::BLOCK)
+          o.members.each do |member|
+            @emitter.scalar member.to_s, nil, nil, true, false, Nodes::Scalar::ANY
+            accept o.send member
+          end
+          @emitter.end_mapping
+
+        else
+          tag = ['!ruby/data-with-ivars', o.class.name].compact.join(':')
+          node = @emitter.start_mapping(nil, tag, false, Psych::Nodes::Mapping::BLOCK)
+          register(o, node)
+
+          # Dump the members
+          accept 'members'
+          @emitter.start_mapping nil, nil, true, Nodes::Mapping::BLOCK
+          o.members.each do |member|
+            @emitter.scalar member.to_s, nil, nil, true, false, Nodes::Scalar::ANY
+            accept o.send member
+          end
+          @emitter.end_mapping
+
+          # Dump the ivars
+          accept 'ivars'
+          @emitter.start_mapping nil, nil, true, Nodes::Mapping::BLOCK
+          ivars.each do |ivar|
+            accept ivar.to_s
+            accept o.instance_variable_get ivar
+          end
+          @emitter.end_mapping
+
+          @emitter.end_mapping
+        end
+      end unless RUBY_VERSION < "3.2"
+
       def visit_Struct o
         tag = ['!ruby/struct', o.class.name].compact.join(':')
 
@@ -193,7 +227,8 @@ def visit_Regexp o
       end
 
       def visit_Date o
-        register o, visit_Integer(o.gregorian)
+        formatted = format_date o
+        register o, @emitter.scalar(formatted, nil, nil, true, false, Nodes::Scalar::ANY)
       end
 
       def visit_DateTime o
@@ -265,20 +300,20 @@ def visit_String o
           style = Nodes::Scalar::LITERAL
           plain = false
           quote = false
-        elsif o =~ /\n(?!\Z)/  # match \n except blank line at the end of string
+        elsif o.match?(/\n(?!\Z)/)  # match \n except blank line at the end of string
           style = Nodes::Scalar::LITERAL
         elsif o == '<<'
           style = Nodes::Scalar::SINGLE_QUOTED
           tag   = 'tag:yaml.org,2002:str'
           plain = false
           quote = false
-        elsif o == 'y' || o == 'n'
+        elsif o == 'y' || o == 'Y' || o == 'n' || o == 'N'
           style = Nodes::Scalar::DOUBLE_QUOTED
         elsif @line_width && o.length > @line_width
           style = Nodes::Scalar::FOLDED
-        elsif o =~ /^[^[:word:]][^"]*$/
+        elsif o.match?(/^[^[:word:]][^"]*$/)
           style = Nodes::Scalar::DOUBLE_QUOTED
-        elsif not String === @ss.tokenize(o) or /\A0[0-7]*[89]/ =~ o
+        elsif not String === @ss.tokenize(o) or /\A0[0-7]*[89]/.match?(o)
           style = Nodes::Scalar::SINGLE_QUOTED
         end
 
@@ -328,7 +363,7 @@ def visit_Hash o
         if o.class == ::Hash
           register(o, @emitter.start_mapping(nil, nil, true, Psych::Nodes::Mapping::BLOCK))
           o.each do |k,v|
-            accept k
+            accept(@stringify_names && Symbol === k ? k.to_s : k)
             accept v
           end
           @emitter.end_mapping
@@ -341,7 +376,7 @@ def visit_Psych_Set o
         register(o, @emitter.start_mapping(nil, '!set', false, Psych::Nodes::Mapping::BLOCK))
 
         o.each do |k,v|
-          accept k
+          accept(@stringify_names && Symbol === k ? k.to_s : k)
           accept v
         end
 
@@ -490,6 +525,10 @@ def format_time time, utc = time.utc?
         end
       end
 
+      def format_date date
+        date.strftime("%Y-%m-%d")
+      end
+
       def register target, yaml_obj
         @st.register target, yaml_obj
         yaml_obj
diff --git a/ext/psych/psych.c b/ext/psych/psych.c
index 8af0bb6a5a2c57..afbd7a35714f9d 100644
--- a/ext/psych/psych.c
+++ b/ext/psych/psych.c
@@ -23,7 +23,7 @@ VALUE mPsych;
 void Init_psych(void)
 {
     #ifdef HAVE_RB_EXT_RACTOR_SAFE
-	RB_EXT_RACTOR_SAFE(true);
+        RB_EXT_RACTOR_SAFE(true);
     #endif
     mPsych = rb_define_module("Psych");
 
@@ -34,4 +34,3 @@ void Init_psych(void)
     Init_psych_to_ruby();
     Init_psych_yaml_tree();
 }
-/* vim: set noet sws=4 sw=4: */
diff --git a/ext/psych/psych.gemspec b/ext/psych/psych.gemspec
index 34f70095d32d1d..a32f79bc16ff88 100644
--- a/ext/psych/psych.gemspec
+++ b/ext/psych/psych.gemspec
@@ -75,6 +75,8 @@ DESCRIPTION
     s.add_dependency 'stringio'
   end
 
-  s.metadata['msys2_mingw_dependencies'] = 'libyaml'
+  s.add_dependency 'date'
 
+  s.metadata['msys2_mingw_dependencies'] = 'libyaml'
+  s.metadata['changelog_uri'] = s.homepage + '/releases'
 end
diff --git a/ext/psych/psych_emitter.c b/ext/psych/psych_emitter.c
index 022ffa0946708a..624ab7c528f864 100644
--- a/ext/psych/psych_emitter.c
+++ b/ext/psych/psych_emitter.c
@@ -17,7 +17,7 @@ static ID id_canonical;
 static void emit(yaml_emitter_t * emitter, yaml_event_t * event)
 {
     if(!yaml_emitter_emit(emitter, event))
-	rb_raise(rb_eRuntimeError, "%s", emitter->problem);
+        rb_raise(rb_eRuntimeError, "%s", emitter->problem);
 }
 
 static int writer(void *ctx, unsigned char *buffer, size_t size)
@@ -82,13 +82,13 @@ static VALUE initialize(int argc, VALUE *argv, VALUE self)
     TypedData_Get_Struct(self, yaml_emitter_t, &psych_emitter_type, emitter);
 
     if (rb_scan_args(argc, argv, "11", &io, &options) == 2) {
-	line_width = rb_funcall(options, id_line_width, 0);
-	indent     = rb_funcall(options, id_indentation, 0);
-	canonical  = rb_funcall(options, id_canonical, 0);
+        line_width = rb_funcall(options, id_line_width, 0);
+        indent     = rb_funcall(options, id_indentation, 0);
+        canonical  = rb_funcall(options, id_canonical, 0);
 
-	yaml_emitter_set_width(emitter, NUM2INT(line_width));
-	yaml_emitter_set_indent(emitter, NUM2INT(indent));
-	yaml_emitter_set_canonical(emitter, Qtrue == canonical ? 1 : 0);
+        yaml_emitter_set_width(emitter, NUM2INT(line_width));
+        yaml_emitter_set_indent(emitter, NUM2INT(indent));
+        yaml_emitter_set_canonical(emitter, Qtrue == canonical ? 1 : 0);
     }
 
     rb_ivar_set(self, id_io, io);
@@ -136,84 +136,118 @@ static VALUE end_stream(VALUE self)
     return self;
 }
 
-/* call-seq: emitter.start_document(version, tags, implicit)
- *
- * Start a document emission with YAML +version+, +tags+, and an +implicit+
- * start.
- *
- * See Psych::Handler#start_document
- */
-static VALUE start_document(VALUE self, VALUE version, VALUE tags, VALUE imp)
+struct start_document_data {
+    VALUE self;
+    VALUE version;
+    VALUE tags;
+    VALUE imp;
+
+    yaml_tag_directive_t * head;
+};
+
+static VALUE start_document_try(VALUE d)
 {
+    struct start_document_data * data = (struct start_document_data *)d;
+    VALUE self = data->self;
+    VALUE version = data->version;
+    VALUE tags = data->tags;
+    VALUE imp = data->imp;
+
     yaml_emitter_t * emitter;
-    yaml_tag_directive_t * head = NULL;
     yaml_tag_directive_t * tail = NULL;
     yaml_event_t event;
     yaml_version_directive_t version_directive;
     TypedData_Get_Struct(self, yaml_emitter_t, &psych_emitter_type, emitter);
 
-
     Check_Type(version, T_ARRAY);
 
     if(RARRAY_LEN(version) > 0) {
-	VALUE major = rb_ary_entry(version, (long)0);
-	VALUE minor = rb_ary_entry(version, (long)1);
+        VALUE major = rb_ary_entry(version, (long)0);
+        VALUE minor = rb_ary_entry(version, (long)1);
 
-	version_directive.major = NUM2INT(major);
-	version_directive.minor = NUM2INT(minor);
+        version_directive.major = NUM2INT(major);
+        version_directive.minor = NUM2INT(minor);
     }
 
     if(RTEST(tags)) {
-	long i = 0;
-	long len;
-	rb_encoding * encoding = rb_utf8_encoding();
-
-	Check_Type(tags, T_ARRAY);
-
-	len = RARRAY_LEN(tags);
-	head  = xcalloc((size_t)len, sizeof(yaml_tag_directive_t));
-	tail  = head;
-
-	for(i = 0; i < len && i < RARRAY_LEN(tags); i++) {
-	    VALUE tuple = RARRAY_AREF(tags, i);
-	    VALUE name;
-	    VALUE value;
-
-	    Check_Type(tuple, T_ARRAY);
-
-	    if(RARRAY_LEN(tuple) < 2) {
-		xfree(head);
-		rb_raise(rb_eRuntimeError, "tag tuple must be of length 2");
-	    }
-	    name  = RARRAY_AREF(tuple, 0);
-	    value = RARRAY_AREF(tuple, 1);
-	    StringValue(name);
-	    StringValue(value);
-	    name = rb_str_export_to_enc(name, encoding);
-	    value = rb_str_export_to_enc(value, encoding);
-
-	    tail->handle = (yaml_char_t *)StringValueCStr(name);
-	    tail->prefix = (yaml_char_t *)StringValueCStr(value);
-
-	    tail++;
-	}
+        long i = 0;
+        long len;
+        rb_encoding * encoding = rb_utf8_encoding();
+
+        Check_Type(tags, T_ARRAY);
+
+        len = RARRAY_LEN(tags);
+        data->head = xcalloc((size_t)len, sizeof(yaml_tag_directive_t));
+        tail = data->head;
+
+        for(i = 0; i < len && i < RARRAY_LEN(tags); i++) {
+            VALUE tuple = RARRAY_AREF(tags, i);
+            VALUE name;
+            VALUE value;
+
+            Check_Type(tuple, T_ARRAY);
+
+            if(RARRAY_LEN(tuple) < 2) {
+                rb_raise(rb_eRuntimeError, "tag tuple must be of length 2");
+            }
+
+            name  = RARRAY_AREF(tuple, 0);
+            value = RARRAY_AREF(tuple, 1);
+            StringValue(name);
+            StringValue(value);
+            name = rb_str_export_to_enc(name, encoding);
+            value = rb_str_export_to_enc(value, encoding);
+
+            tail->handle = (yaml_char_t *)StringValueCStr(name);
+            tail->prefix = (yaml_char_t *)StringValueCStr(value);
+
+            tail++;
+        }
     }
 
     yaml_document_start_event_initialize(
-	    &event,
-	    (RARRAY_LEN(version) > 0) ? &version_directive : NULL,
-	    head,
-	    tail,
-	    imp ? 1 : 0
-	    );
+            &event,
+            (RARRAY_LEN(version) > 0) ? &version_directive : NULL,
+            data->head,
+            tail,
+            imp ? 1 : 0
+            );
 
     emit(emitter, &event);
 
-    if(head) xfree(head);
-
     return self;
 }
 
+static VALUE start_document_ensure(VALUE d)
+{
+    struct start_document_data * data = (struct start_document_data *)d;
+
+    xfree(data->head);
+
+    return Qnil;
+}
+
+/* call-seq: emitter.start_document(version, tags, implicit)
+ *
+ * Start a document emission with YAML +version+, +tags+, and an +implicit+
+ * start.
+ *
+ * See Psych::Handler#start_document
+ */
+static VALUE start_document(VALUE self, VALUE version, VALUE tags, VALUE imp)
+{
+    struct start_document_data data = {
+        .self = self,
+        .version = version,
+        .tags = tags,
+        .imp = imp,
+
+        .head = NULL,
+    };
+
+    return rb_ensure(start_document_try, (VALUE)&data, start_document_ensure, (VALUE)&data);
+}
+
 /* call-seq: emitter.end_document(implicit)
  *
  * End a document emission with an +implicit+ ending.
@@ -241,14 +275,14 @@ static VALUE end_document(VALUE self, VALUE imp)
  * See Psych::Handler#scalar
  */
 static VALUE scalar(
-	VALUE self,
-	VALUE value,
-	VALUE anchor,
-	VALUE tag,
-	VALUE plain,
-	VALUE quoted,
-	VALUE style
-	) {
+        VALUE self,
+        VALUE value,
+        VALUE anchor,
+        VALUE tag,
+        VALUE plain,
+        VALUE quoted,
+        VALUE style
+        ) {
     yaml_emitter_t * emitter;
     yaml_event_t event;
     rb_encoding *encoding;
@@ -261,25 +295,26 @@ static VALUE scalar(
     value = rb_str_export_to_enc(value, encoding);
 
     if(!NIL_P(anchor)) {
-	Check_Type(anchor, T_STRING);
-	anchor = rb_str_export_to_enc(anchor, encoding);
+        Check_Type(anchor, T_STRING);
+        anchor = rb_str_export_to_enc(anchor, encoding);
     }
 
     if(!NIL_P(tag)) {
-	Check_Type(tag, T_STRING);
-	tag = rb_str_export_to_enc(tag, encoding);
+        Check_Type(tag, T_STRING);
+        tag = rb_str_export_to_enc(tag, encoding);
     }
 
+    const char *value_ptr = StringValuePtr(value);
     yaml_scalar_event_initialize(
-	    &event,
-	    (yaml_char_t *)(NIL_P(anchor) ? NULL : StringValueCStr(anchor)),
-	    (yaml_char_t *)(NIL_P(tag) ? NULL : StringValueCStr(tag)),
-	    (yaml_char_t*)StringValuePtr(value),
-	    (int)RSTRING_LEN(value),
-	    plain ? 1 : 0,
-	    quoted ? 1 : 0,
-	    (yaml_scalar_style_t)NUM2INT(style)
-	    );
+            &event,
+            (yaml_char_t *)(NIL_P(anchor) ? NULL : StringValueCStr(anchor)),
+            (yaml_char_t *)(NIL_P(tag) ? NULL : StringValueCStr(tag)),
+            (yaml_char_t*)value_ptr,
+            (int)RSTRING_LEN(value),
+            plain ? 1 : 0,
+            quoted ? 1 : 0,
+            (yaml_scalar_style_t)NUM2INT(style)
+            );
 
     emit(emitter, &event);
 
@@ -294,36 +329,36 @@ static VALUE scalar(
  * See Psych::Handler#start_sequence
  */
 static VALUE start_sequence(
-	VALUE self,
-	VALUE anchor,
-	VALUE tag,
-	VALUE implicit,
-	VALUE style
-	) {
+        VALUE self,
+        VALUE anchor,
+        VALUE tag,
+        VALUE implicit,
+        VALUE style
+        ) {
     yaml_emitter_t * emitter;
     yaml_event_t event;
 
     rb_encoding * encoding = rb_utf8_encoding();
 
     if(!NIL_P(anchor)) {
-	Check_Type(anchor, T_STRING);
-	anchor = rb_str_export_to_enc(anchor, encoding);
+        Check_Type(anchor, T_STRING);
+        anchor = rb_str_export_to_enc(anchor, encoding);
     }
 
     if(!NIL_P(tag)) {
-	Check_Type(tag, T_STRING);
-	tag = rb_str_export_to_enc(tag, encoding);
+        Check_Type(tag, T_STRING);
+        tag = rb_str_export_to_enc(tag, encoding);
     }
 
     TypedData_Get_Struct(self, yaml_emitter_t, &psych_emitter_type, emitter);
 
     yaml_sequence_start_event_initialize(
-	    &event,
-	    (yaml_char_t *)(NIL_P(anchor) ? NULL : StringValueCStr(anchor)),
-	    (yaml_char_t *)(NIL_P(tag) ? NULL : StringValueCStr(tag)),
-	    implicit ? 1 : 0,
-	    (yaml_sequence_style_t)NUM2INT(style)
-	    );
+            &event,
+            (yaml_char_t *)(NIL_P(anchor) ? NULL : StringValueCStr(anchor)),
+            (yaml_char_t *)(NIL_P(tag) ? NULL : StringValueCStr(tag)),
+            implicit ? 1 : 0,
+            (yaml_sequence_style_t)NUM2INT(style)
+            );
 
     emit(emitter, &event);
 
@@ -357,12 +392,12 @@ static VALUE end_sequence(VALUE self)
  * See Psych::Handler#start_mapping
  */
 static VALUE start_mapping(
-	VALUE self,
-	VALUE anchor,
-	VALUE tag,
-	VALUE implicit,
-	VALUE style
-	) {
+        VALUE self,
+        VALUE anchor,
+        VALUE tag,
+        VALUE implicit,
+        VALUE style
+        ) {
     yaml_emitter_t * emitter;
     yaml_event_t event;
     rb_encoding *encoding;
@@ -372,22 +407,22 @@ static VALUE start_mapping(
     encoding = rb_utf8_encoding();
 
     if(!NIL_P(anchor)) {
-	Check_Type(anchor, T_STRING);
-	anchor = rb_str_export_to_enc(anchor, encoding);
+        Check_Type(anchor, T_STRING);
+        anchor = rb_str_export_to_enc(anchor, encoding);
     }
 
     if(!NIL_P(tag)) {
-	Check_Type(tag, T_STRING);
-	tag = rb_str_export_to_enc(tag, encoding);
+        Check_Type(tag, T_STRING);
+        tag = rb_str_export_to_enc(tag, encoding);
     }
 
     yaml_mapping_start_event_initialize(
-	    &event,
-	    (yaml_char_t *)(NIL_P(anchor) ? NULL : StringValueCStr(anchor)),
-	    (yaml_char_t *)(NIL_P(tag) ? NULL : StringValueCStr(tag)),
-	    implicit ? 1 : 0,
-	    (yaml_mapping_style_t)NUM2INT(style)
-	    );
+            &event,
+            (yaml_char_t *)(NIL_P(anchor) ? NULL : StringValueCStr(anchor)),
+            (yaml_char_t *)(NIL_P(tag) ? NULL : StringValueCStr(tag)),
+            implicit ? 1 : 0,
+            (yaml_mapping_style_t)NUM2INT(style)
+            );
 
     emit(emitter, &event);
 
@@ -426,14 +461,14 @@ static VALUE alias(VALUE self, VALUE anchor)
     TypedData_Get_Struct(self, yaml_emitter_t, &psych_emitter_type, emitter);
 
     if(!NIL_P(anchor)) {
-	Check_Type(anchor, T_STRING);
-	anchor = rb_str_export_to_enc(anchor, rb_utf8_encoding());
+        Check_Type(anchor, T_STRING);
+        anchor = rb_str_export_to_enc(anchor, rb_utf8_encoding());
     }
 
     yaml_alias_event_initialize(
-	    &event,
-	    (yaml_char_t *)(NIL_P(anchor) ? NULL : StringValueCStr(anchor))
-	    );
+            &event,
+            (yaml_char_t *)(NIL_P(anchor) ? NULL : StringValueCStr(anchor))
+            );
 
     emit(emitter, &event);
 
@@ -552,4 +587,3 @@ void Init_psych_emitter(void)
     id_indentation = rb_intern("indentation");
     id_canonical   = rb_intern("canonical");
 }
-/* vim: set noet sws=4 sw=4: */
diff --git a/ext/psych/psych_parser.c b/ext/psych/psych_parser.c
index 9c5179cc44398d..d973496284f1d6 100644
--- a/ext/psych/psych_parser.c
+++ b/ext/psych/psych_parser.c
@@ -32,9 +32,9 @@ static int io_reader(void * data, unsigned char *buf, size_t size, size_t *read)
     *read = 0;
 
     if(! NIL_P(string)) {
-	void * str = (void *)StringValuePtr(string);
-	*read = (size_t)RSTRING_LEN(string);
-	memcpy(buf, str, *read);
+        void * str = (void *)StringValuePtr(string);
+        *read = (size_t)RSTRING_LEN(string);
+        memcpy(buf, str, *read);
     }
 
     return 1;
@@ -80,23 +80,23 @@ static VALUE allocate(VALUE klass)
 static VALUE make_exception(yaml_parser_t * parser, VALUE path)
 {
     if (parser->error == YAML_MEMORY_ERROR) {
-	return rb_eNoMemError;
+        return rb_eNoMemError;
     } else {
-	size_t line, column;
-	VALUE ePsychSyntaxError;
+        size_t line, column;
+        VALUE ePsychSyntaxError;
 
-	line = parser->context_mark.line + 1;
-	column = parser->context_mark.column + 1;
+        line = parser->context_mark.line + 1;
+        column = parser->context_mark.column + 1;
 
-	ePsychSyntaxError = rb_const_get(mPsych, rb_intern("SyntaxError"));
+        ePsychSyntaxError = rb_const_get(mPsych, rb_intern("SyntaxError"));
 
-	return rb_funcall(ePsychSyntaxError, rb_intern("new"), 6,
-		path,
-		SIZET2NUM(line),
-		SIZET2NUM(column),
-		SIZET2NUM(parser->problem_offset),
-		parser->problem ? rb_usascii_str_new2(parser->problem) : Qnil,
-		parser->context ? rb_usascii_str_new2(parser->context) : Qnil);
+        return rb_funcall(ePsychSyntaxError, rb_intern("new"), 6,
+                path,
+                SIZET2NUM(line),
+                SIZET2NUM(column),
+                SIZET2NUM(parser->problem_offset),
+                parser->problem ? rb_usascii_str_new2(parser->problem) : Qnil,
+                parser->context ? rb_usascii_str_new2(parser->context) : Qnil);
     }
 }
 
@@ -108,18 +108,18 @@ static VALUE transcode_string(VALUE src, int * parser_encoding)
     int source_encoding = rb_enc_get_index(src);
 
     if (source_encoding == utf8) {
-	*parser_encoding = YAML_UTF8_ENCODING;
-	return src;
+        *parser_encoding = YAML_UTF8_ENCODING;
+        return src;
     }
 
     if (source_encoding == utf16le) {
-	*parser_encoding = YAML_UTF16LE_ENCODING;
-	return src;
+        *parser_encoding = YAML_UTF16LE_ENCODING;
+        return src;
     }
 
     if (source_encoding == utf16be) {
-	*parser_encoding = YAML_UTF16BE_ENCODING;
-	return src;
+        *parser_encoding = YAML_UTF16BE_ENCODING;
+        return src;
     }
 
     src = rb_str_export_to_enc(src, rb_utf8_encoding());
@@ -138,36 +138,36 @@ static VALUE transcode_io(VALUE src, int * parser_encoding)
 
     /* if no encoding is returned, assume ascii8bit. */
     if (NIL_P(io_external_encoding)) {
-	io_external_enc_index = rb_ascii8bit_encindex();
+        io_external_enc_index = rb_ascii8bit_encindex();
     } else {
-	io_external_enc_index = rb_to_encoding_index(io_external_encoding);
+        io_external_enc_index = rb_to_encoding_index(io_external_encoding);
     }
 
     /* Treat US-ASCII as utf_8 */
     if (io_external_enc_index == rb_usascii_encindex()) {
-	*parser_encoding = YAML_UTF8_ENCODING;
-	return src;
+        *parser_encoding = YAML_UTF8_ENCODING;
+        return src;
     }
 
     if (io_external_enc_index == rb_utf8_encindex()) {
-	*parser_encoding = YAML_UTF8_ENCODING;
-	return src;
+        *parser_encoding = YAML_UTF8_ENCODING;
+        return src;
     }
 
     if (io_external_enc_index == rb_enc_find_index("UTF-16LE")) {
-	*parser_encoding = YAML_UTF16LE_ENCODING;
-	return src;
+        *parser_encoding = YAML_UTF16LE_ENCODING;
+        return src;
     }
 
     if (io_external_enc_index == rb_enc_find_index("UTF-16BE")) {
-	*parser_encoding = YAML_UTF16BE_ENCODING;
-	return src;
+        *parser_encoding = YAML_UTF16BE_ENCODING;
+        return src;
     }
 
     /* Just guess on ASCII-8BIT */
     if (io_external_enc_index == rb_ascii8bit_encindex()) {
-	*parser_encoding = YAML_ANY_ENCODING;
-	return src;
+        *parser_encoding = YAML_ANY_ENCODING;
+        return src;
     }
 
     /* If the external encoding is something we don't know how to handle,
@@ -261,238 +261,238 @@ static VALUE parse(VALUE self, VALUE handler, VALUE yaml, VALUE path)
     yaml_parser_initialize(parser);
 
     if (rb_respond_to(yaml, id_read)) {
-	yaml = transcode_io(yaml, &parser_encoding);
-	yaml_parser_set_encoding(parser, parser_encoding);
-	yaml_parser_set_input(parser, io_reader, (void *)yaml);
+        yaml = transcode_io(yaml, &parser_encoding);
+        yaml_parser_set_encoding(parser, parser_encoding);
+        yaml_parser_set_input(parser, io_reader, (void *)yaml);
     } else {
-	StringValue(yaml);
-	yaml = transcode_string(yaml, &parser_encoding);
-	yaml_parser_set_encoding(parser, parser_encoding);
-	yaml_parser_set_input_string(
-		parser,
-		(const unsigned char *)RSTRING_PTR(yaml),
-		(size_t)RSTRING_LEN(yaml)
-		);
+        StringValue(yaml);
+        yaml = transcode_string(yaml, &parser_encoding);
+        yaml_parser_set_encoding(parser, parser_encoding);
+        yaml_parser_set_input_string(
+                parser,
+                (const unsigned char *)RSTRING_PTR(yaml),
+                (size_t)RSTRING_LEN(yaml)
+                );
     }
 
     while(!done) {
-	VALUE event_args[5];
-	VALUE start_line, start_column, end_line, end_column;
-
-	if(parser->error || !yaml_parser_parse(parser, &event)) {
-	    VALUE exception;
-
-	    exception = make_exception(parser, path);
-	    yaml_parser_delete(parser);
-	    yaml_parser_initialize(parser);
-
-	    rb_exc_raise(exception);
-	}
-
-	start_line = SIZET2NUM(event.start_mark.line);
-	start_column = SIZET2NUM(event.start_mark.column);
-	end_line = SIZET2NUM(event.end_mark.line);
-	end_column = SIZET2NUM(event.end_mark.column);
-
-	event_args[0] = handler;
-	event_args[1] = start_line;
-	event_args[2] = start_column;
-	event_args[3] = end_line;
-	event_args[4] = end_column;
-	rb_protect(protected_event_location, (VALUE)event_args, &state);
-
-	switch(event.type) {
-	    case YAML_STREAM_START_EVENT:
-	      {
-		  VALUE args[2];
-
-		  args[0] = handler;
-		  args[1] = INT2NUM(event.data.stream_start.encoding);
-		  rb_protect(protected_start_stream, (VALUE)args, &state);
-	      }
-	      break;
-	  case YAML_DOCUMENT_START_EVENT:
-	    {
-		VALUE args[4];
-		/* Get a list of tag directives (if any) */
-		VALUE tag_directives = rb_ary_new();
-		/* Grab the document version */
-		VALUE version = event.data.document_start.version_directive ?
-		    rb_ary_new3(
-			(long)2,
-			INT2NUM(event.data.document_start.version_directive->major),
-			INT2NUM(event.data.document_start.version_directive->minor)
-			) : rb_ary_new();
-
-		if(event.data.document_start.tag_directives.start) {
-		    yaml_tag_directive_t *start =
-			event.data.document_start.tag_directives.start;
-		    yaml_tag_directive_t *end =
-			event.data.document_start.tag_directives.end;
-		    for(; start != end; start++) {
-			VALUE handle = Qnil;
-			VALUE prefix = Qnil;
-			if(start->handle) {
-			    handle = rb_str_new2((const char *)start->handle);
-			    PSYCH_TRANSCODE(handle, encoding, internal_enc);
-			}
-
-			if(start->prefix) {
-			    prefix = rb_str_new2((const char *)start->prefix);
-			    PSYCH_TRANSCODE(prefix, encoding, internal_enc);
-			}
-
-			rb_ary_push(tag_directives, rb_ary_new3((long)2, handle, prefix));
-		    }
-		}
-		args[0] = handler;
-		args[1] = version;
-		args[2] = tag_directives;
-		args[3] = event.data.document_start.implicit == 1 ? Qtrue : Qfalse;
-		rb_protect(protected_start_document, (VALUE)args, &state);
-	    }
-	    break;
-	  case YAML_DOCUMENT_END_EVENT:
-	    {
-		VALUE args[2];
-
-		args[0] = handler;
-		args[1] = event.data.document_end.implicit == 1 ? Qtrue : Qfalse;
-		rb_protect(protected_end_document, (VALUE)args, &state);
-	    }
-	    break;
-	  case YAML_ALIAS_EVENT:
-	    {
-		VALUE args[2];
-		VALUE alias = Qnil;
-		if(event.data.alias.anchor) {
-		    alias = rb_str_new2((const char *)event.data.alias.anchor);
-		    PSYCH_TRANSCODE(alias, encoding, internal_enc);
-		}
-
-		args[0] = handler;
-		args[1] = alias;
-		rb_protect(protected_alias, (VALUE)args, &state);
-	    }
-	    break;
-	  case YAML_SCALAR_EVENT:
-	    {
-		VALUE args[7];
-		VALUE anchor = Qnil;
-		VALUE tag = Qnil;
-		VALUE plain_implicit, quoted_implicit, style;
-		VALUE val = rb_str_new(
-		    (const char *)event.data.scalar.value,
-		    (long)event.data.scalar.length
-		    );
-
-		PSYCH_TRANSCODE(val, encoding, internal_enc);
-
-		if(event.data.scalar.anchor) {
-		    anchor = rb_str_new2((const char *)event.data.scalar.anchor);
-		    PSYCH_TRANSCODE(anchor, encoding, internal_enc);
-		}
-
-		if(event.data.scalar.tag) {
-		    tag = rb_str_new2((const char *)event.data.scalar.tag);
-		    PSYCH_TRANSCODE(tag, encoding, internal_enc);
-		}
-
-		plain_implicit =
-		    event.data.scalar.plain_implicit == 0 ? Qfalse : Qtrue;
-
-		quoted_implicit =
-		    event.data.scalar.quoted_implicit == 0 ? Qfalse : Qtrue;
-
-		style = INT2NUM(event.data.scalar.style);
-
-		args[0] = handler;
-		args[1] = val;
-		args[2] = anchor;
-		args[3] = tag;
-		args[4] = plain_implicit;
-		args[5] = quoted_implicit;
-		args[6] = style;
-		rb_protect(protected_scalar, (VALUE)args, &state);
-	    }
-	    break;
-	  case YAML_SEQUENCE_START_EVENT:
-	    {
-		VALUE args[5];
-		VALUE anchor = Qnil;
-		VALUE tag = Qnil;
-		VALUE implicit, style;
-		if(event.data.sequence_start.anchor) {
-		    anchor = rb_str_new2((const char *)event.data.sequence_start.anchor);
-		    PSYCH_TRANSCODE(anchor, encoding, internal_enc);
-		}
-
-		tag = Qnil;
-		if(event.data.sequence_start.tag) {
-		    tag = rb_str_new2((const char *)event.data.sequence_start.tag);
-		    PSYCH_TRANSCODE(tag, encoding, internal_enc);
-		}
-
-		implicit =
-		    event.data.sequence_start.implicit == 0 ? Qfalse : Qtrue;
-
-		style = INT2NUM(event.data.sequence_start.style);
-
-		args[0] = handler;
-		args[1] = anchor;
-		args[2] = tag;
-		args[3] = implicit;
-		args[4] = style;
-
-		rb_protect(protected_start_sequence, (VALUE)args, &state);
-	    }
-	    break;
-	  case YAML_SEQUENCE_END_EVENT:
-	    rb_protect(protected_end_sequence, handler, &state);
-	    break;
-	  case YAML_MAPPING_START_EVENT:
-	    {
-		VALUE args[5];
-		VALUE anchor = Qnil;
-		VALUE tag = Qnil;
-		VALUE implicit, style;
-		if(event.data.mapping_start.anchor) {
-		    anchor = rb_str_new2((const char *)event.data.mapping_start.anchor);
-		    PSYCH_TRANSCODE(anchor, encoding, internal_enc);
-		}
-
-		if(event.data.mapping_start.tag) {
-		    tag = rb_str_new2((const char *)event.data.mapping_start.tag);
-		    PSYCH_TRANSCODE(tag, encoding, internal_enc);
-		}
-
-		implicit =
-		    event.data.mapping_start.implicit == 0 ? Qfalse : Qtrue;
-
-		style = INT2NUM(event.data.mapping_start.style);
-
-		args[0] = handler;
-		args[1] = anchor;
-		args[2] = tag;
-		args[3] = implicit;
-		args[4] = style;
-
-		rb_protect(protected_start_mapping, (VALUE)args, &state);
-	    }
-	    break;
-	  case YAML_MAPPING_END_EVENT:
-	    rb_protect(protected_end_mapping, handler, &state);
-	    break;
-	  case YAML_NO_EVENT:
-	    rb_protect(protected_empty, handler, &state);
-	    break;
-	  case YAML_STREAM_END_EVENT:
-	    rb_protect(protected_end_stream, handler, &state);
-	    done = 1;
-	    break;
-	}
-	yaml_event_delete(&event);
-	if (state) rb_jump_tag(state);
+        VALUE event_args[5];
+        VALUE start_line, start_column, end_line, end_column;
+
+        if(parser->error || !yaml_parser_parse(parser, &event)) {
+            VALUE exception;
+
+            exception = make_exception(parser, path);
+            yaml_parser_delete(parser);
+            yaml_parser_initialize(parser);
+
+            rb_exc_raise(exception);
+        }
+
+        start_line = SIZET2NUM(event.start_mark.line);
+        start_column = SIZET2NUM(event.start_mark.column);
+        end_line = SIZET2NUM(event.end_mark.line);
+        end_column = SIZET2NUM(event.end_mark.column);
+
+        event_args[0] = handler;
+        event_args[1] = start_line;
+        event_args[2] = start_column;
+        event_args[3] = end_line;
+        event_args[4] = end_column;
+        rb_protect(protected_event_location, (VALUE)event_args, &state);
+
+        switch(event.type) {
+            case YAML_STREAM_START_EVENT:
+              {
+                  VALUE args[2];
+
+                  args[0] = handler;
+                  args[1] = INT2NUM(event.data.stream_start.encoding);
+                  rb_protect(protected_start_stream, (VALUE)args, &state);
+              }
+              break;
+          case YAML_DOCUMENT_START_EVENT:
+            {
+                VALUE args[4];
+                /* Get a list of tag directives (if any) */
+                VALUE tag_directives = rb_ary_new();
+                /* Grab the document version */
+                VALUE version = event.data.document_start.version_directive ?
+                    rb_ary_new3(
+                        (long)2,
+                        INT2NUM(event.data.document_start.version_directive->major),
+                        INT2NUM(event.data.document_start.version_directive->minor)
+                        ) : rb_ary_new();
+
+                if(event.data.document_start.tag_directives.start) {
+                    yaml_tag_directive_t *start =
+                        event.data.document_start.tag_directives.start;
+                    yaml_tag_directive_t *end =
+                        event.data.document_start.tag_directives.end;
+                    for(; start != end; start++) {
+                        VALUE handle = Qnil;
+                        VALUE prefix = Qnil;
+                        if(start->handle) {
+                            handle = rb_str_new2((const char *)start->handle);
+                            PSYCH_TRANSCODE(handle, encoding, internal_enc);
+                        }
+
+                        if(start->prefix) {
+                            prefix = rb_str_new2((const char *)start->prefix);
+                            PSYCH_TRANSCODE(prefix, encoding, internal_enc);
+                        }
+
+                        rb_ary_push(tag_directives, rb_ary_new3((long)2, handle, prefix));
+                    }
+                }
+                args[0] = handler;
+                args[1] = version;
+                args[2] = tag_directives;
+                args[3] = event.data.document_start.implicit == 1 ? Qtrue : Qfalse;
+                rb_protect(protected_start_document, (VALUE)args, &state);
+            }
+            break;
+          case YAML_DOCUMENT_END_EVENT:
+            {
+                VALUE args[2];
+
+                args[0] = handler;
+                args[1] = event.data.document_end.implicit == 1 ? Qtrue : Qfalse;
+                rb_protect(protected_end_document, (VALUE)args, &state);
+            }
+            break;
+          case YAML_ALIAS_EVENT:
+            {
+                VALUE args[2];
+                VALUE alias = Qnil;
+                if(event.data.alias.anchor) {
+                    alias = rb_str_new2((const char *)event.data.alias.anchor);
+                    PSYCH_TRANSCODE(alias, encoding, internal_enc);
+                }
+
+                args[0] = handler;
+                args[1] = alias;
+                rb_protect(protected_alias, (VALUE)args, &state);
+            }
+            break;
+          case YAML_SCALAR_EVENT:
+            {
+                VALUE args[7];
+                VALUE anchor = Qnil;
+                VALUE tag = Qnil;
+                VALUE plain_implicit, quoted_implicit, style;
+                VALUE val = rb_str_new(
+                    (const char *)event.data.scalar.value,
+                    (long)event.data.scalar.length
+                    );
+
+                PSYCH_TRANSCODE(val, encoding, internal_enc);
+
+                if(event.data.scalar.anchor) {
+                    anchor = rb_str_new2((const char *)event.data.scalar.anchor);
+                    PSYCH_TRANSCODE(anchor, encoding, internal_enc);
+                }
+
+                if(event.data.scalar.tag) {
+                    tag = rb_str_new2((const char *)event.data.scalar.tag);
+                    PSYCH_TRANSCODE(tag, encoding, internal_enc);
+                }
+
+                plain_implicit =
+                    event.data.scalar.plain_implicit == 0 ? Qfalse : Qtrue;
+
+                quoted_implicit =
+                    event.data.scalar.quoted_implicit == 0 ? Qfalse : Qtrue;
+
+                style = INT2NUM(event.data.scalar.style);
+
+                args[0] = handler;
+                args[1] = val;
+                args[2] = anchor;
+                args[3] = tag;
+                args[4] = plain_implicit;
+                args[5] = quoted_implicit;
+                args[6] = style;
+                rb_protect(protected_scalar, (VALUE)args, &state);
+            }
+            break;
+          case YAML_SEQUENCE_START_EVENT:
+            {
+                VALUE args[5];
+                VALUE anchor = Qnil;
+                VALUE tag = Qnil;
+                VALUE implicit, style;
+                if(event.data.sequence_start.anchor) {
+                    anchor = rb_str_new2((const char *)event.data.sequence_start.anchor);
+                    PSYCH_TRANSCODE(anchor, encoding, internal_enc);
+                }
+
+                tag = Qnil;
+                if(event.data.sequence_start.tag) {
+                    tag = rb_str_new2((const char *)event.data.sequence_start.tag);
+                    PSYCH_TRANSCODE(tag, encoding, internal_enc);
+                }
+
+                implicit =
+                    event.data.sequence_start.implicit == 0 ? Qfalse : Qtrue;
+
+                style = INT2NUM(event.data.sequence_start.style);
+
+                args[0] = handler;
+                args[1] = anchor;
+                args[2] = tag;
+                args[3] = implicit;
+                args[4] = style;
+
+                rb_protect(protected_start_sequence, (VALUE)args, &state);
+            }
+            break;
+          case YAML_SEQUENCE_END_EVENT:
+            rb_protect(protected_end_sequence, handler, &state);
+            break;
+          case YAML_MAPPING_START_EVENT:
+            {
+                VALUE args[5];
+                VALUE anchor = Qnil;
+                VALUE tag = Qnil;
+                VALUE implicit, style;
+                if(event.data.mapping_start.anchor) {
+                    anchor = rb_str_new2((const char *)event.data.mapping_start.anchor);
+                    PSYCH_TRANSCODE(anchor, encoding, internal_enc);
+                }
+
+                if(event.data.mapping_start.tag) {
+                    tag = rb_str_new2((const char *)event.data.mapping_start.tag);
+                    PSYCH_TRANSCODE(tag, encoding, internal_enc);
+                }
+
+                implicit =
+                    event.data.mapping_start.implicit == 0 ? Qfalse : Qtrue;
+
+                style = INT2NUM(event.data.mapping_start.style);
+
+                args[0] = handler;
+                args[1] = anchor;
+                args[2] = tag;
+                args[3] = implicit;
+                args[4] = style;
+
+                rb_protect(protected_start_mapping, (VALUE)args, &state);
+            }
+            break;
+          case YAML_MAPPING_END_EVENT:
+            rb_protect(protected_end_mapping, handler, &state);
+            break;
+          case YAML_NO_EVENT:
+            rb_protect(protected_empty, handler, &state);
+            break;
+          case YAML_STREAM_END_EVENT:
+            rb_protect(protected_end_stream, handler, &state);
+            done = 1;
+            break;
+        }
+        yaml_event_delete(&event);
+        if (state) rb_jump_tag(state);
     }
 
     return self;
@@ -562,4 +562,3 @@ void Init_psych_parser(void)
     id_end_mapping     = rb_intern("end_mapping");
     id_event_location  = rb_intern("event_location");
 }
-/* vim: set noet sws=4 sw=4: */
diff --git a/ext/psych/psych_to_ruby.c b/ext/psych/psych_to_ruby.c
index b388ff77545e5b..d473a5f840a1d7 100644
--- a/ext/psych/psych_to_ruby.c
+++ b/ext/psych/psych_to_ruby.c
@@ -24,6 +24,15 @@ static VALUE path2class(VALUE self, VALUE path)
     return rb_path_to_class(path);
 }
 
+static VALUE init_struct(VALUE self, VALUE data, VALUE attrs)
+{
+    VALUE args = rb_ary_new2(1);
+    rb_ary_push(args, attrs);
+    rb_struct_initialize(data, args);
+
+    return data;
+}
+
 void Init_psych_to_ruby(void)
 {
     VALUE psych     = rb_define_module("Psych");
@@ -33,7 +42,7 @@ void Init_psych_to_ruby(void)
     VALUE visitor   = rb_define_class_under(visitors, "Visitor", rb_cObject);
     cPsychVisitorsToRuby = rb_define_class_under(visitors, "ToRuby", visitor);
 
+    rb_define_private_method(cPsychVisitorsToRuby, "init_struct", init_struct, 2);
     rb_define_private_method(cPsychVisitorsToRuby, "build_exception", build_exception, 2);
     rb_define_private_method(class_loader, "path2class", path2class, 1);
 }
-/* vim: set noet sws=4 sw=4: */
diff --git a/ext/psych/psych_yaml_tree.c b/ext/psych/psych_yaml_tree.c
index 225655d127063e..bbd93f874dd71c 100644
--- a/ext/psych/psych_yaml_tree.c
+++ b/ext/psych/psych_yaml_tree.c
@@ -9,4 +9,3 @@ void Init_psych_yaml_tree(void)
     VALUE visitor   = rb_define_class_under(visitors, "Visitor", rb_cObject);
     cPsychVisitorsYamlTree = rb_define_class_under(visitors, "YAMLTree", visitor);
 }
-/* vim: set noet sws=4 sw=4: */
diff --git a/ext/pty/depend b/ext/pty/depend
index d4d0d558eff6fc..8fa018d084cbc7 100644
--- a/ext/pty/depend
+++ b/ext/pty/depend
@@ -138,6 +138,7 @@ pty.o: $(hdrdir)/ruby/internal/intern/re.h
 pty.o: $(hdrdir)/ruby/internal/intern/ruby.h
 pty.o: $(hdrdir)/ruby/internal/intern/select.h
 pty.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+pty.o: $(hdrdir)/ruby/internal/intern/set.h
 pty.o: $(hdrdir)/ruby/internal/intern/signal.h
 pty.o: $(hdrdir)/ruby/internal/intern/sprintf.h
 pty.o: $(hdrdir)/ruby/internal/intern/string.h
@@ -157,6 +158,7 @@ pty.o: $(hdrdir)/ruby/internal/special_consts.h
 pty.o: $(hdrdir)/ruby/internal/static_assert.h
 pty.o: $(hdrdir)/ruby/internal/stdalign.h
 pty.o: $(hdrdir)/ruby/internal/stdbool.h
+pty.o: $(hdrdir)/ruby/internal/stdckdint.h
 pty.o: $(hdrdir)/ruby/internal/symbol.h
 pty.o: $(hdrdir)/ruby/internal/value.h
 pty.o: $(hdrdir)/ruby/internal/value_type.h
@@ -171,6 +173,7 @@ pty.o: $(hdrdir)/ruby/ruby.h
 pty.o: $(hdrdir)/ruby/st.h
 pty.o: $(hdrdir)/ruby/subst.h
 pty.o: $(hdrdir)/ruby/util.h
+pty.o: $(top_srcdir)/id_table.h
 pty.o: $(top_srcdir)/internal.h
 pty.o: $(top_srcdir)/internal/array.h
 pty.o: $(top_srcdir)/internal/compilers.h
diff --git a/ext/pty/extconf.rb b/ext/pty/extconf.rb
index ba0c4286fd31d1..da3655cf4d7118 100644
--- a/ext/pty/extconf.rb
+++ b/ext/pty/extconf.rb
@@ -13,10 +13,13 @@
     have_header("util.h") # OpenBSD openpty
     util = have_library("util", "openpty")
   end
-  if have_func("posix_openpt") or
+  openpt = have_func("posix_openpt")
+  if openpt
+    have_func("ptsname_r") or have_func("ptsname")
+  end
+  if openpt or
       (util or have_func("openpty")) or
       have_func("_getpty") or
-      have_func("ptsname") or
       have_func("ioctl")
     create_makefile('pty')
   end
diff --git a/ext/pty/pty.c b/ext/pty/pty.c
index 0aca10bfa070b5..7c79f81e338019 100644
--- a/ext/pty/pty.c
+++ b/ext/pty/pty.c
@@ -92,9 +92,13 @@ struct pty_info {
 
 static void getDevice(int*, int*, char [DEVICELEN], int);
 
+static int start_new_session(char *errbuf, size_t errbuf_len);
+static int obtain_ctty(int master, int slave, const char *slavename, char *errbuf, size_t errbuf_len);
+static int drop_privilege(char *errbuf, size_t errbuf_len);
+
 struct child_info {
     int master, slave;
-    char *slavename;
+    const char *slavename;
     VALUE execarg_obj;
     struct rb_execarg *eargp;
 };
@@ -102,26 +106,42 @@ struct child_info {
 static int
 chfunc(void *data, char *errbuf, size_t errbuf_len)
 {
-    struct child_info *carg = data;
+    const struct child_info *carg = data;
     int master = carg->master;
     int slave = carg->slave;
+    const char *slavename = carg->slavename;
+
+    if (start_new_session(errbuf, errbuf_len))
+        return -1;
+
+    if (obtain_ctty(master, slave, slavename, errbuf, errbuf_len))
+        return -1;
+
+    if (drop_privilege(errbuf, errbuf_len))
+        return -1;
+
+    return rb_exec_async_signal_safe(carg->eargp, errbuf, errbuf_len);
+}
 
 #define ERROR_EXIT(str) do { \
         strlcpy(errbuf, (str), errbuf_len); \
         return -1; \
     } while (0)
 
-    /*
-     * Set free from process group and controlling terminal
-     */
+/*
+ * Set free from process group and controlling terminal
+ */
+static int
+start_new_session(char *errbuf, size_t errbuf_len)
+{
 #ifdef HAVE_SETSID
     (void) setsid();
 #else /* HAS_SETSID */
 # ifdef HAVE_SETPGRP
-#  ifdef SETGRP_VOID
+#  ifdef SETPGRP_VOID
     if (setpgrp() == -1)
         ERROR_EXIT("setpgrp()");
-#  else /* SETGRP_VOID */
+#  else /* SETPGRP_VOID */
     if (setpgrp(0, getpid()) == -1)
         ERROR_EXIT("setpgrp()");
     {
@@ -132,20 +152,25 @@ chfunc(void *data, char *errbuf, size_t errbuf_len)
             ERROR_EXIT("ioctl(TIOCNOTTY)");
         close(i);
     }
-#  endif /* SETGRP_VOID */
+#  endif /* SETPGRP_VOID */
 # endif /* HAVE_SETPGRP */
 #endif /* HAS_SETSID */
+    return 0;
+}
 
-    /*
-     * obtain new controlling terminal
-     */
+/*
+ * obtain new controlling terminal
+ */
+static int
+obtain_ctty(int master, int slave, const char *slavename, char *errbuf, size_t errbuf_len)
+{
 #if defined(TIOCSCTTY)
     close(master);
     (void) ioctl(slave, TIOCSCTTY, (char *)0);
     /* errors ignored for sun */
 #else
     close(slave);
-    slave = rb_cloexec_open(carg->slavename, O_RDWR, 0);
+    slave = rb_cloexec_open(slavename, O_RDWR, 0);
     if (slave < 0) {
         ERROR_EXIT("open: pty slave");
     }
@@ -155,14 +180,20 @@ chfunc(void *data, char *errbuf, size_t errbuf_len)
     dup2(slave,0);
     dup2(slave,1);
     dup2(slave,2);
-    if (slave < 0 || slave > 2) (void)!close(slave);
+    if (slave > 2) (void)!close(slave);
+    return 0;
+}
+
+static int
+drop_privilege(char *errbuf, size_t errbuf_len)
+{
 #if defined(HAVE_SETEUID) || defined(HAVE_SETREUID) || defined(HAVE_SETRESUID)
     if (seteuid(getuid())) ERROR_EXIT("seteuid()");
 #endif
+    return 0;
+}
 
-    return rb_exec_async_signal_safe(carg->eargp, errbuf, sizeof(errbuf_len));
 #undef ERROR_EXIT
-}
 
 static void
 establishShell(int argc, VALUE *argv, struct pty_info *info,
@@ -184,9 +215,13 @@ establishShell(int argc, VALUE *argv, struct pty_info *info,
         else {
 #if defined HAVE_PWD_H
             const char *username = getenv("USER");
-            struct passwd *pwent = getpwnam(username ? username : getlogin());
-            if (pwent && pwent->pw_shell)
-                shellname = pwent->pw_shell;
+            if (username == NULL)
+                username = getlogin();
+            if (username != NULL) {
+                struct passwd *pwent = getpwnam(username);
+                if (pwent && pwent->pw_shell)
+                    shellname = pwent->pw_shell;
+            }
 #endif
         }
         v = rb_str_new2(shellname);
@@ -225,7 +260,21 @@ establishShell(int argc, VALUE *argv, struct pty_info *info,
     RB_GC_GUARD(carg.execarg_obj);
 }
 
-#if defined(HAVE_POSIX_OPENPT) || defined(HAVE_OPENPTY) || defined(HAVE_PTSNAME)
+#if (defined(HAVE_POSIX_OPENPT) || defined(HAVE_PTSNAME)) && !defined(HAVE_PTSNAME_R)
+/* glibc only, not obsolete interface on Tru64 or HP-UX */
+static int
+ptsname_r(int fd, char *buf, size_t buflen)
+{
+    extern char *ptsname(int);
+    char *name = ptsname(fd);
+    if (!name) return -1;
+    strlcpy(buf, name, buflen);
+    return 0;
+}
+# define HAVE_PTSNAME_R 1
+#endif
+
+#if defined(HAVE_POSIX_OPENPT) || defined(HAVE_OPENPTY) || defined(HAVE_PTSNAME_R)
 static int
 no_mesg(char *slavedevice, int nomesg)
 {
@@ -258,13 +307,19 @@ get_device_once(int *master, int *slave, char SlaveName[DEVICELEN], int nomesg,
     /* Unix98 PTY */
     int masterfd = -1, slavefd = -1;
     char *slavedevice;
+    struct sigaction dfl, old;
+
+    dfl.sa_handler = SIG_DFL;
+    dfl.sa_flags = 0;
+    sigemptyset(&dfl.sa_mask);
 
 #if defined(__sun) || defined(__OpenBSD__) || (defined(__FreeBSD__) && __FreeBSD_version < 902000)
     /* workaround for Solaris 10: grantpt() doesn't work if FD_CLOEXEC is set.  [ruby-dev:44688] */
     /* FreeBSD 9.2 or later supports O_CLOEXEC
      * http://www.freebsd.org/cgi/query-pr.cgi?pr=162374 */
     if ((masterfd = posix_openpt(O_RDWR|O_NOCTTY)) == -1) goto error;
-    if (rb_grantpt(masterfd) == -1) goto error;
+    if (sigaction(SIGCHLD, &dfl, &old) == -1) goto error;
+    if (grantpt(masterfd) == -1) goto grantpt_error;
     rb_fd_fix_cloexec(masterfd);
 #else
     {
@@ -278,10 +333,13 @@ get_device_once(int *master, int *slave, char SlaveName[DEVICELEN], int nomesg,
         if ((masterfd = posix_openpt(flags)) == -1) goto error;
     }
     rb_fd_fix_cloexec(masterfd);
-    if (rb_grantpt(masterfd) == -1) goto error;
+    if (sigaction(SIGCHLD, &dfl, &old) == -1) goto error;
+    if (grantpt(masterfd) == -1) goto grantpt_error;
 #endif
+    if (sigaction(SIGCHLD, &old, NULL) == -1) goto error;
     if (unlockpt(masterfd) == -1) goto error;
-    if ((slavedevice = ptsname(masterfd)) == NULL) goto error;
+    if (ptsname_r(masterfd, SlaveName, DEVICELEN) != 0) goto error;
+    slavedevice = SlaveName;
     if (no_mesg(slavedevice, nomesg) == -1) goto error;
     if ((slavefd = rb_cloexec_open(slavedevice, O_RDWR|O_NOCTTY, 0)) == -1) goto error;
     rb_update_max_fd(slavefd);
@@ -294,9 +352,10 @@ get_device_once(int *master, int *slave, char SlaveName[DEVICELEN], int nomesg,
 
     *master = masterfd;
     *slave = slavefd;
-    strlcpy(SlaveName, slavedevice, DEVICELEN);
     return 0;
 
+  grantpt_error:
+    sigaction(SIGCHLD, &old, NULL);
   error:
     if (slavefd != -1) close(slavefd);
     if (masterfd != -1) close(masterfd);
@@ -346,21 +405,25 @@ get_device_once(int *master, int *slave, char SlaveName[DEVICELEN], int nomesg,
     char *slavedevice;
     void (*s)();
 
-    extern char *ptsname(int);
     extern int unlockpt(int);
+    extern int grantpt(int);
 
 #if defined(__sun)
     /* workaround for Solaris 10: grantpt() doesn't work if FD_CLOEXEC is set.  [ruby-dev:44688] */
     if((masterfd = open("/dev/ptmx", O_RDWR, 0)) == -1) goto error;
-    if(rb_grantpt(masterfd) == -1) goto error;
+    s = signal(SIGCHLD, SIG_DFL);
+    if(grantpt(masterfd) == -1) goto error;
     rb_fd_fix_cloexec(masterfd);
 #else
     if((masterfd = rb_cloexec_open("/dev/ptmx", O_RDWR, 0)) == -1) goto error;
     rb_update_max_fd(masterfd);
-    if(rb_grantpt(masterfd) == -1) goto error;
+    s = signal(SIGCHLD, SIG_DFL);
+    if(grantpt(masterfd) == -1) goto error;
 #endif
+    signal(SIGCHLD, s);
     if(unlockpt(masterfd) == -1) goto error;
-    if((slavedevice = ptsname(masterfd)) == NULL) goto error;
+    if (ptsname_r(masterfd, SlaveName, DEVICELEN) != 0) goto error;
+    slavedevice = SlaveName;
     if (no_mesg(slavedevice, nomesg) == -1) goto error;
     if((slavefd = rb_cloexec_open(slavedevice, O_RDWR, 0)) == -1) goto error;
     rb_update_max_fd(slavefd);
@@ -371,7 +434,6 @@ get_device_once(int *master, int *slave, char SlaveName[DEVICELEN], int nomesg,
 #endif
     *master = masterfd;
     *slave = slavefd;
-    strlcpy(SlaveName, slavedevice, DEVICELEN);
     return 0;
 
   error:
@@ -548,9 +610,17 @@ pty_detach_process(VALUE v)
  * +env+ is an optional hash that provides additional environment variables to the spawned pty.
  *
  *   # sets FOO to "bar"
- *   PTY.spawn({"FOO"=>"bar"}, "printenv", "FOO") { |r,w,pid| p r.read } #=> "bar\r\n"
+ *   PTY.spawn({"FOO"=>"bar"}, "printenv", "FOO") do |r, w, pid|
+ *     p r.read #=> "bar\r\n"
+ *   ensure
+ *     r.close; w.close; Process.wait(pid)
+ *   end
  *   # unsets FOO
- *   PTY.spawn({"FOO"=>nil}, "printenv", "FOO") { |r,w,pid| p r.read } #=> ""
+ *   PTY.spawn({"FOO"=>nil}, "printenv", "FOO") do |r, w, pid|
+ *     p r.read #=> ""
+ *   ensure
+ *     r.close; w.close; Process.wait(pid)
+ *   end
  *
  * +command+ and +command_line+ are the full commands to run, given a String.
  * Any additional +arguments+ will be passed to the command.
@@ -566,6 +636,15 @@ pty_detach_process(VALUE v)
  *       standard output and standard error
  * +w+:: A writable IO that is the command's standard input
  * +pid+:: The process identifier for the command.
+ *
+ * === Clean up
+ *
+ * This method does not clean up like closing IOs or waiting for child
+ * process, except that the process is detached in the block form to
+ * prevent it from becoming a zombie (see Process.detach).  Any other
+ * cleanup is the responsibility of the caller.  If waiting for +pid+,
+ * be sure to close both +r+ and +w+ before doing so; doing it in the
+ * reverse order may cause deadlock on some OSes.
  */
 static VALUE
 pty_getpty(int argc, VALUE *argv, VALUE self)
@@ -745,8 +824,13 @@ void
 Init_pty(void)
 {
     cPTY = rb_define_module("PTY");
-    /* :nodoc: */
-    rb_define_module_function(cPTY,"getpty",pty_getpty,-1);
+#if 1
+    rb_define_module_function(cPTY,"get""pty",pty_getpty,-1);
+#else  /* for RDoc */
+    /* show getpty as an alias of spawn */
+    VALUE sPTY = rb_singleton_class(cPTY);
+    rb_define_alias(sPTY, "getpty", "spawn");
+#endif
     rb_define_module_function(cPTY,"spawn",pty_getpty,-1);
     rb_define_singleton_method(cPTY,"check",pty_check,-1);
     rb_define_singleton_method(cPTY,"open",pty_open,0);
diff --git a/ext/rbconfig/sizeof/depend b/ext/rbconfig/sizeof/depend
index 4e4ebd4ae51a39..7e6c950769f759 100644
--- a/ext/rbconfig/sizeof/depend
+++ b/ext/rbconfig/sizeof/depend
@@ -142,6 +142,7 @@ limits.o: $(hdrdir)/ruby/internal/intern/re.h
 limits.o: $(hdrdir)/ruby/internal/intern/ruby.h
 limits.o: $(hdrdir)/ruby/internal/intern/select.h
 limits.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+limits.o: $(hdrdir)/ruby/internal/intern/set.h
 limits.o: $(hdrdir)/ruby/internal/intern/signal.h
 limits.o: $(hdrdir)/ruby/internal/intern/sprintf.h
 limits.o: $(hdrdir)/ruby/internal/intern/string.h
@@ -161,6 +162,7 @@ limits.o: $(hdrdir)/ruby/internal/special_consts.h
 limits.o: $(hdrdir)/ruby/internal/static_assert.h
 limits.o: $(hdrdir)/ruby/internal/stdalign.h
 limits.o: $(hdrdir)/ruby/internal/stdbool.h
+limits.o: $(hdrdir)/ruby/internal/stdckdint.h
 limits.o: $(hdrdir)/ruby/internal/symbol.h
 limits.o: $(hdrdir)/ruby/internal/value.h
 limits.o: $(hdrdir)/ruby/internal/value_type.h
@@ -300,6 +302,7 @@ sizes.o: $(hdrdir)/ruby/internal/intern/re.h
 sizes.o: $(hdrdir)/ruby/internal/intern/ruby.h
 sizes.o: $(hdrdir)/ruby/internal/intern/select.h
 sizes.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+sizes.o: $(hdrdir)/ruby/internal/intern/set.h
 sizes.o: $(hdrdir)/ruby/internal/intern/signal.h
 sizes.o: $(hdrdir)/ruby/internal/intern/sprintf.h
 sizes.o: $(hdrdir)/ruby/internal/intern/string.h
@@ -319,6 +322,7 @@ sizes.o: $(hdrdir)/ruby/internal/special_consts.h
 sizes.o: $(hdrdir)/ruby/internal/static_assert.h
 sizes.o: $(hdrdir)/ruby/internal/stdalign.h
 sizes.o: $(hdrdir)/ruby/internal/stdbool.h
+sizes.o: $(hdrdir)/ruby/internal/stdckdint.h
 sizes.o: $(hdrdir)/ruby/internal/symbol.h
 sizes.o: $(hdrdir)/ruby/internal/value.h
 sizes.o: $(hdrdir)/ruby/internal/value_type.h
diff --git a/ext/ripper/depend b/ext/ripper/depend
index 19a7986f0a3d89..c8ba34962c6da2 100644
--- a/ext/ripper/depend
+++ b/ext/ripper/depend
@@ -1,7 +1,7 @@
 GEN  = $(srcdir)/tools/generate.rb
 SRC1 = $(top_srcdir)/parse.y
 SRC2 = $(srcdir)/eventids2.c
-BISON = $(BASERUBY) $(top_srcdir)/tool/lrama/exe/lrama
+LRAMA = $(BASERUBY) $(top_srcdir)/tool/lrama/exe/lrama
 
 .SUFFIXES: .y
 
@@ -12,7 +12,7 @@ ripper.o: ripper.c
 
 .y.c:
 	$(ECHO) compiling compiler $<
-	$(Q) $(BISON) -t -v -o$@ -h$*.h - $< < $<
+	$(Q) $(LRAMA) -o$@ - $< < $<
 
 all: check
 static: check
@@ -181,6 +181,7 @@ eventids1.o: $(hdrdir)/ruby/internal/intern/re.h
 eventids1.o: $(hdrdir)/ruby/internal/intern/ruby.h
 eventids1.o: $(hdrdir)/ruby/internal/intern/select.h
 eventids1.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+eventids1.o: $(hdrdir)/ruby/internal/intern/set.h
 eventids1.o: $(hdrdir)/ruby/internal/intern/signal.h
 eventids1.o: $(hdrdir)/ruby/internal/intern/sprintf.h
 eventids1.o: $(hdrdir)/ruby/internal/intern/string.h
@@ -200,6 +201,7 @@ eventids1.o: $(hdrdir)/ruby/internal/special_consts.h
 eventids1.o: $(hdrdir)/ruby/internal/static_assert.h
 eventids1.o: $(hdrdir)/ruby/internal/stdalign.h
 eventids1.o: $(hdrdir)/ruby/internal/stdbool.h
+eventids1.o: $(hdrdir)/ruby/internal/stdckdint.h
 eventids1.o: $(hdrdir)/ruby/internal/symbol.h
 eventids1.o: $(hdrdir)/ruby/internal/value.h
 eventids1.o: $(hdrdir)/ruby/internal/value_type.h
@@ -351,6 +353,7 @@ eventids2.o: $(hdrdir)/ruby/internal/intern/re.h
 eventids2.o: $(hdrdir)/ruby/internal/intern/ruby.h
 eventids2.o: $(hdrdir)/ruby/internal/intern/select.h
 eventids2.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+eventids2.o: $(hdrdir)/ruby/internal/intern/set.h
 eventids2.o: $(hdrdir)/ruby/internal/intern/signal.h
 eventids2.o: $(hdrdir)/ruby/internal/intern/sprintf.h
 eventids2.o: $(hdrdir)/ruby/internal/intern/string.h
@@ -370,6 +373,7 @@ eventids2.o: $(hdrdir)/ruby/internal/special_consts.h
 eventids2.o: $(hdrdir)/ruby/internal/static_assert.h
 eventids2.o: $(hdrdir)/ruby/internal/stdalign.h
 eventids2.o: $(hdrdir)/ruby/internal/stdbool.h
+eventids2.o: $(hdrdir)/ruby/internal/stdckdint.h
 eventids2.o: $(hdrdir)/ruby/internal/symbol.h
 eventids2.o: $(hdrdir)/ruby/internal/value.h
 eventids2.o: $(hdrdir)/ruby/internal/value_type.h
@@ -530,6 +534,7 @@ ripper.o: $(hdrdir)/ruby/internal/intern/re.h
 ripper.o: $(hdrdir)/ruby/internal/intern/ruby.h
 ripper.o: $(hdrdir)/ruby/internal/intern/select.h
 ripper.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+ripper.o: $(hdrdir)/ruby/internal/intern/set.h
 ripper.o: $(hdrdir)/ruby/internal/intern/signal.h
 ripper.o: $(hdrdir)/ruby/internal/intern/sprintf.h
 ripper.o: $(hdrdir)/ruby/internal/intern/string.h
@@ -549,6 +554,7 @@ ripper.o: $(hdrdir)/ruby/internal/special_consts.h
 ripper.o: $(hdrdir)/ruby/internal/static_assert.h
 ripper.o: $(hdrdir)/ruby/internal/stdalign.h
 ripper.o: $(hdrdir)/ruby/internal/stdbool.h
+ripper.o: $(hdrdir)/ruby/internal/stdckdint.h
 ripper.o: $(hdrdir)/ruby/internal/symbol.h
 ripper.o: $(hdrdir)/ruby/internal/value.h
 ripper.o: $(hdrdir)/ruby/internal/value_type.h
@@ -566,6 +572,7 @@ ripper.o: $(hdrdir)/ruby/st.h
 ripper.o: $(hdrdir)/ruby/subst.h
 ripper.o: $(hdrdir)/ruby/thread_native.h
 ripper.o: $(hdrdir)/ruby/util.h
+ripper.o: $(hdrdir)/ruby/version.h
 ripper.o: $(top_srcdir)/ccan/check_type/check_type.h
 ripper.o: $(top_srcdir)/ccan/container_of/container_of.h
 ripper.o: $(top_srcdir)/ccan/list/list.h
@@ -587,12 +594,15 @@ 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/namespace.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/ruby_parser.h
+ripper.o: $(top_srcdir)/internal/sanitizers.h
 ripper.o: $(top_srcdir)/internal/serial.h
+ripper.o: $(top_srcdir)/internal/set_table.h
 ripper.o: $(top_srcdir)/internal/static_assert.h
 ripper.o: $(top_srcdir)/internal/string.h
 ripper.o: $(top_srcdir)/internal/symbol.h
@@ -633,6 +643,7 @@ ripper_init.o: $(hdrdir)/ruby/backward.h
 ripper_init.o: $(hdrdir)/ruby/backward/2/assume.h
 ripper_init.o: $(hdrdir)/ruby/backward/2/attributes.h
 ripper_init.o: $(hdrdir)/ruby/backward/2/bool.h
+ripper_init.o: $(hdrdir)/ruby/backward/2/gcc_version_since.h
 ripper_init.o: $(hdrdir)/ruby/backward/2/inttypes.h
 ripper_init.o: $(hdrdir)/ruby/backward/2/limits.h
 ripper_init.o: $(hdrdir)/ruby/backward/2/long_long.h
@@ -764,6 +775,7 @@ ripper_init.o: $(hdrdir)/ruby/internal/intern/re.h
 ripper_init.o: $(hdrdir)/ruby/internal/intern/ruby.h
 ripper_init.o: $(hdrdir)/ruby/internal/intern/select.h
 ripper_init.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+ripper_init.o: $(hdrdir)/ruby/internal/intern/set.h
 ripper_init.o: $(hdrdir)/ruby/internal/intern/signal.h
 ripper_init.o: $(hdrdir)/ruby/internal/intern/sprintf.h
 ripper_init.o: $(hdrdir)/ruby/internal/intern/string.h
@@ -783,6 +795,7 @@ ripper_init.o: $(hdrdir)/ruby/internal/special_consts.h
 ripper_init.o: $(hdrdir)/ruby/internal/static_assert.h
 ripper_init.o: $(hdrdir)/ruby/internal/stdalign.h
 ripper_init.o: $(hdrdir)/ruby/internal/stdbool.h
+ripper_init.o: $(hdrdir)/ruby/internal/stdckdint.h
 ripper_init.o: $(hdrdir)/ruby/internal/symbol.h
 ripper_init.o: $(hdrdir)/ruby/internal/value.h
 ripper_init.o: $(hdrdir)/ruby/internal/value_type.h
@@ -797,13 +810,21 @@ ripper_init.o: $(hdrdir)/ruby/st.h
 ripper_init.o: $(hdrdir)/ruby/subst.h
 ripper_init.o: $(top_srcdir)/internal.h
 ripper_init.o: $(top_srcdir)/internal/array.h
+ripper_init.o: $(top_srcdir)/internal/bignum.h
+ripper_init.o: $(top_srcdir)/internal/bits.h
+ripper_init.o: $(top_srcdir)/internal/compilers.h
+ripper_init.o: $(top_srcdir)/internal/complex.h
+ripper_init.o: $(top_srcdir)/internal/fixnum.h
 ripper_init.o: $(top_srcdir)/internal/imemo.h
+ripper_init.o: $(top_srcdir)/internal/numeric.h
 ripper_init.o: $(top_srcdir)/internal/parse.h
+ripper_init.o: $(top_srcdir)/internal/rational.h
 ripper_init.o: $(top_srcdir)/internal/ruby_parser.h
 ripper_init.o: $(top_srcdir)/internal/serial.h
 ripper_init.o: $(top_srcdir)/internal/static_assert.h
 ripper_init.o: $(top_srcdir)/internal/vm.h
 ripper_init.o: $(top_srcdir)/node.h
+ripper_init.o: $(top_srcdir)/ruby_assert.h
 ripper_init.o: $(top_srcdir)/rubyparser.h
 ripper_init.o: eventids1.h
 ripper_init.o: eventids2.h
diff --git a/ext/ripper/eventids2.c b/ext/ripper/eventids2.c
index ac5495585780e0..87f2f588eccf89 100644
--- a/ext/ripper/eventids2.c
+++ b/ext/ripper/eventids2.c
@@ -65,6 +65,8 @@ static ripper_scanner_ids_t ripper_scanner_ids;
 
 #include "eventids2table.c"
 
+STATIC_ASSERT(eventids2_table_size, RIPPER_EVENTIDS2_TABLE_SIZE == sizeof(ripper_scanner_ids)/sizeof(ID));
+
 void
 ripper_init_eventids2(void)
 {
@@ -253,7 +255,6 @@ ripper_token2eventid(enum yytokentype tok)
         [tRATIONAL]		= O(rational),
         [tREGEXP_BEG]		= O(regexp_beg),
         [tREGEXP_END]		= O(regexp_end),
-        [tRPAREN]		= O(rparen),
         [tRSHFT]		= O(op),
         [tSTAR] 		= O(op),
         [tDSTAR]		= O(op),
diff --git a/ext/ripper/extconf.rb b/ext/ripper/extconf.rb
index 8eb7a921484c6c..c3c56c27c56c8d 100644
--- a/ext/ripper/extconf.rb
+++ b/ext/ripper/extconf.rb
@@ -6,7 +6,7 @@
 
 def main
   $objs = %w(eventids1.o eventids2.o ripper.o ripper_init.o)
-  $distcleanfiles.concat %w(ripper.y ripper.c ripper.h eventids1.c eventids1.h eventids2table.c ripper_init.c)
+  $distcleanfiles.concat %w(ripper.y ripper.c eventids1.c eventids1.h eventids2table.c ripper_init.c)
   $cleanfiles.concat %w(ripper.E ripper.output y.output .eventids2-check)
   $defs << '-DRIPPER'
   $defs << '-DRIPPER_DEBUG' if $debug
diff --git a/ext/ripper/lib/ripper/lexer.rb b/ext/ripper/lib/ripper/lexer.rb
index 6a3c04af302545..870c79857bd670 100644
--- a/ext/ripper/lib/ripper/lexer.rb
+++ b/ext/ripper/lib/ripper/lexer.rb
@@ -53,6 +53,7 @@ def Ripper.lex(src, filename = '-', lineno = 1, **kw)
   end
 
   class Lexer < ::Ripper   #:nodoc: internal use only
+    # :stopdoc:
     class State
       attr_reader :to_int, :to_s
 
@@ -242,7 +243,12 @@ def on_error1(mesg)
     end
 
     def on_error2(mesg, elem)
-      @errors.push Elem.new(elem.pos, __callee__, elem.tok, elem.state, mesg)
+      if elem
+        elem = Elem.new(elem.pos, __callee__, elem.tok, elem.state, mesg)
+      else
+        elem = Elem.new([lineno(), column()], __callee__, token(), state(), mesg)
+      end
+      @errors.push elem
     end
     PARSER_EVENTS.grep(/_error\z/) do |e|
       arity = PARSER_EVENT_TABLE.fetch(e)
@@ -253,6 +259,7 @@ def on_error2(mesg, elem)
     (SCANNER_EVENTS.map {|event|:"on_#{event}"} - private_instance_methods(false)).each do |event|
       alias_method event, :_push_token
     end
+    # :startdoc:
   end
 
   # [EXPERIMENTAL]
diff --git a/ext/ripper/ripper_init.c.tmpl b/ext/ripper/ripper_init.c.tmpl
index 40c583eeaebcb4..11e432423db208 100644
--- a/ext/ripper/ripper_init.c.tmpl
+++ b/ext/ripper/ripper_init.c.tmpl
@@ -1,32 +1,56 @@
+%# -*- c -*-
 #include "ruby/ruby.h"
 #include "ruby/encoding.h"
 #include "internal.h"
-#include "internal/imemo.h" /* needed by ruby_parser.h */
+#include "rubyparser.h"
+#define YYSTYPE_IS_DECLARED
+#include "parse.h"
 #include "internal/parse.h"
 #include "internal/ruby_parser.h"
 #include "node.h"
-#include "rubyparser.h"
 #include "eventids1.h"
-#define YYSTYPE_IS_DECLARED
-#include "parse.h"
 #include "eventids2.h"
 #include "ripper_init.h"
 
 #define STR_NEW2(ptr) rb_enc_str_new((ptr),strlen(ptr),rb_ruby_parser_enc(p))
-#define NODE_RIPPER NODE_CDECL
 #define RIPPER_VERSION "0.1.0"
 
 ID id_warn, id_warning, id_gets, id_assoc;
 
+enum lex_type {
+    lex_type_str,
+    lex_type_io,
+    lex_type_generic,
+};
+
 struct ripper {
     rb_parser_t *p;
+    enum lex_type type;
+    union {
+       struct lex_pointer_string ptr_str;
+       VALUE val;
+    } data;
 };
 
 static void
 ripper_parser_mark2(void *ptr)
 {
     struct ripper *r = (struct ripper*)ptr;
-    if (r->p) ripper_parser_mark(r->p);
+    if (r->p) {
+        ripper_parser_mark(r->p);
+
+        switch (r->type) {
+          case lex_type_str:
+            rb_gc_mark(r->data.ptr_str.str);
+            break;
+          case lex_type_io:
+            rb_gc_mark(r->data.val);
+            break;
+          case lex_type_generic:
+            rb_gc_mark(r->data.val);
+            break;
+        }
+    }
 }
 
 static void
@@ -54,37 +78,18 @@ static const rb_data_type_t parser_data_type = {
     0, 0, RUBY_TYPED_FREE_IMMEDIATELY
 };
 
-ID
-ripper_get_id(VALUE v)
-{
-    NODE *nd;
-    if (!RB_TYPE_P(v, T_NODE)) return 0;
-    nd = (NODE *)v;
-    if (!nd_type_p(nd, NODE_RIPPER)) return 0;
-    return nd->nd_vid;
-}
-
-VALUE
-ripper_get_value(VALUE v)
-{
-    NODE *nd;
-    if (UNDEF_P(v)) return Qnil;
-    if (!RB_TYPE_P(v, T_NODE)) return v;
-    nd = (NODE *)v;
-    if (!nd_type_p(nd, NODE_RIPPER)) return Qnil;
-    return nd->nd_rval;
-}
-
-static VALUE
-ripper_lex_get_generic(struct parser_params *p, VALUE src)
+static rb_parser_string_t *
+ripper_lex_get_generic(struct parser_params *p, rb_parser_input_data input, int line_count)
 {
+    VALUE src = (VALUE)input;
     VALUE line = rb_funcallv_public(src, id_gets, 0, 0);
-    if (!NIL_P(line) && !RB_TYPE_P(line, T_STRING)) {
+    if (NIL_P(line)) return 0;
+    if (!RB_TYPE_P(line, T_STRING)) {
         rb_raise(rb_eTypeError,
                  "gets returned %"PRIsVALUE" (expected String or nil)",
                  rb_obj_class(line));
     }
-    return line;
+    return rb_str_to_parser_string(p, line);
 }
 
 void
@@ -100,10 +105,19 @@ ripper_compile_error(struct parser_params *p, const char *fmt, ...)
     ripper_error(p);
 }
 
-static VALUE
-ripper_lex_io_get(struct parser_params *p, VALUE src)
+static rb_parser_string_t *
+ripper_lex_io_get(struct parser_params *p, rb_parser_input_data input, int line_count)
+{
+    VALUE src = (VALUE)input;
+    VALUE line = rb_io_gets(src);
+    if (NIL_P(line)) return 0;
+    return rb_str_to_parser_string(p, line);
+}
+
+static rb_parser_string_t *
+ripper_lex_get_str(struct parser_params *p, rb_parser_input_data input, int line_count)
 {
-    return rb_io_gets(src);
+    return rb_parser_lex_get_str(p, (struct lex_pointer_string *)input);
 }
 
 static VALUE
@@ -115,10 +129,8 @@ ripper_s_allocate(VALUE klass)
                                        &parser_data_type, r);
 
 #ifdef UNIVERSAL_PARSER
-    rb_parser_config_t *config;
-    config = rb_ruby_parser_config_new(ruby_xmalloc);
-    rb_parser_config_initialize(config);
-    r->p = rb_ruby_parser_allocate(config);
+    const rb_parser_config_t *config = rb_ruby_parser_config();
+    r->p = rb_ripper_parser_params_allocate(config);
 #else
     r->p = rb_ruby_ripper_parser_allocate();
 #endif
@@ -126,6 +138,20 @@ ripper_s_allocate(VALUE klass)
     return self;
 }
 
+static struct parser_params *
+ripper_parser_params(VALUE self, bool initialized)
+{
+    struct ripper *r;
+    struct parser_params *p;
+
+    TypedData_Get_Struct(self, struct ripper, &parser_data_type, r);
+    p = r->p;
+    if (initialized && !rb_ruby_ripper_initialized_p(p)) {
+        rb_raise(rb_eArgError, "method called for uninitialized object");
+    }
+    return p;
+}
+
 /*
  *  call-seq:
  *    ripper.error?   -> Boolean
@@ -135,10 +161,9 @@ ripper_s_allocate(VALUE klass)
 static VALUE
 ripper_error_p(VALUE vparser)
 {
-    struct ripper *r;
+    struct parser_params *p = ripper_parser_params(vparser, false);
 
-    TypedData_Get_Struct(vparser, struct ripper, &parser_data_type, r);
-    return RBOOL(rb_ruby_parser_error_p(r->p));
+    return RBOOL(rb_ruby_parser_error_p(p));
 }
 
 /*
@@ -150,10 +175,9 @@ ripper_error_p(VALUE vparser)
 static VALUE
 ripper_parser_end_seen_p(VALUE vparser)
 {
-    struct ripper *r;
+    struct parser_params *p = ripper_parser_params(vparser, false);
 
-    TypedData_Get_Struct(vparser, struct ripper, &parser_data_type, r);
-    return RBOOL(rb_ruby_parser_end_seen_p(r->p));
+    return RBOOL(rb_ruby_parser_end_seen_p(p));
 }
 
 /*
@@ -165,10 +189,9 @@ ripper_parser_end_seen_p(VALUE vparser)
 static VALUE
 ripper_parser_encoding(VALUE vparser)
 {
-    struct ripper *r;
+    struct parser_params *p = ripper_parser_params(vparser, false);
 
-    TypedData_Get_Struct(vparser, struct ripper, &parser_data_type, r);
-    return rb_ruby_parser_encoding(r->p);
+    return rb_enc_from_encoding(rb_ruby_parser_encoding(p));
 }
 
 /*
@@ -180,10 +203,9 @@ ripper_parser_encoding(VALUE vparser)
 static VALUE
 ripper_parser_get_yydebug(VALUE self)
 {
-    struct ripper *r;
+    struct parser_params *p = ripper_parser_params(self, false);
 
-    TypedData_Get_Struct(self, struct ripper, &parser_data_type, r);
-    return RBOOL(rb_ruby_parser_get_yydebug(r->p));
+    return RBOOL(rb_ruby_parser_get_yydebug(p));
 }
 
 /*
@@ -195,10 +217,9 @@ ripper_parser_get_yydebug(VALUE self)
 static VALUE
 ripper_parser_set_yydebug(VALUE self, VALUE flag)
 {
-    struct ripper *r;
+    struct parser_params *p = ripper_parser_params(self, false);
 
-    TypedData_Get_Struct(self, struct ripper, &parser_data_type, r);
-    rb_ruby_parser_set_yydebug(r->p, RTEST(flag));
+    rb_ruby_parser_set_yydebug(p, RTEST(flag));
     return flag;
 }
 
@@ -211,10 +232,9 @@ ripper_parser_set_yydebug(VALUE self, VALUE flag)
 static VALUE
 ripper_parser_get_debug_output(VALUE self)
 {
-    struct ripper *r;
+    struct parser_params *p = ripper_parser_params(self, false);
 
-    TypedData_Get_Struct(self, struct ripper, &parser_data_type, r);
-    return rb_ruby_parser_debug_output(r->p);
+    return rb_ruby_parser_debug_output(p);
 }
 
 /*
@@ -226,13 +246,24 @@ ripper_parser_get_debug_output(VALUE self)
 static VALUE
 ripper_parser_set_debug_output(VALUE self, VALUE output)
 {
-    struct ripper *r;
+    struct parser_params *p = ripper_parser_params(self, false);
 
-    TypedData_Get_Struct(self, struct ripper, &parser_data_type, r);
-    rb_ruby_parser_set_debug_output(r->p, output);
+    rb_ruby_parser_set_debug_output(p, output);
     return output;
 }
 
+static int
+ripper_parser_dedent_string(struct parser_params *p, VALUE string, int width)
+{
+    int col;
+    rb_parser_string_t *str;
+    str = rb_str_to_parser_string(p, string);
+    col = rb_ruby_ripper_dedent_string(p, str, width);
+    rb_str_replace(string, rb_str_new_parser_string(str));
+    rb_parser_string_free(p, str);
+    return col;
+}
+
 #ifdef UNIVERSAL_PARSER
 struct dedent_string_arg {
     struct parser_params *p;
@@ -248,16 +279,16 @@ parser_dedent_string0(VALUE a)
 
     StringValue(arg->input);
     wid = NUM2UINT(arg->width);
-    col = rb_ruby_ripper_dedent_string(arg->p, arg->input, wid);
+    col = ripper_parser_dedent_string(arg->p, arg->input, wid);
     return INT2NUM(col);
 }
 
 static VALUE
-parser_config_free(VALUE a)
+parser_free(VALUE a)
 {
-    rb_parser_config_t *config = (void *)a;
+    struct parser_params *p = (void *)a;
 
-    rb_ruby_parser_config_free(config);
+    rb_ruby_parser_free(p);
     return Qnil;
 }
 #endif
@@ -276,17 +307,14 @@ static VALUE
 parser_dedent_string(VALUE self, VALUE input, VALUE width)
 {
     struct parser_params *p;
-    rb_parser_config_t *config;
     struct dedent_string_arg args;
 
-    config = rb_ruby_parser_config_new(ruby_xmalloc);
-    rb_parser_config_initialize(config);
-    p = rb_ruby_parser_new(config);
+    p = rb_parser_params_new();
 
     args.p = p;
     args.input = input;
     args.width = width;
-    return rb_ensure(parser_dedent_string0, (VALUE)&args, parser_config_free, (VALUE)config);
+    return rb_ensure(parser_dedent_string0, (VALUE)&args, parser_free, (VALUE)p);
 }
 #else
 static VALUE
@@ -296,7 +324,7 @@ parser_dedent_string(VALUE self, VALUE input, VALUE width)
 
     StringValue(input);
     wid = NUM2UINT(width);
-    col = rb_ruby_ripper_dedent_string(0, input, wid);
+    col = ripper_parser_dedent_string(0, input, wid);
     return INT2NUM(col);
 }
 #endif
@@ -317,25 +345,35 @@ ripper_initialize(int argc, VALUE *argv, VALUE self)
     struct ripper *r;
     struct parser_params *p;
     VALUE src, fname, lineno;
-    VALUE (*gets)(struct parser_params*,VALUE);
-    VALUE input, sourcefile_string;
+    rb_parser_lex_gets_func *gets;
+    VALUE sourcefile_string;
     const char *sourcefile;
     int sourceline;
+    rb_parser_input_data input;
 
+    p = ripper_parser_params(self, false);
     TypedData_Get_Struct(self, struct ripper, &parser_data_type, r);
-    p = r->p;
     rb_scan_args(argc, argv, "12", &src, &fname, &lineno);
     if (RB_TYPE_P(src, T_FILE)) {
         gets = ripper_lex_io_get;
+        r->type = lex_type_io;
+        r->data.val = src;
+        input = (rb_parser_input_data)src;
     }
     else if (rb_respond_to(src, id_gets)) {
         gets = ripper_lex_get_generic;
+        r->type = lex_type_generic;
+        r->data.val = src;
+        input = (rb_parser_input_data)src;
     }
     else {
         StringValue(src);
-        gets = rb_ruby_ripper_lex_get_str;
+        gets = ripper_lex_get_str;
+        r->type = lex_type_str;
+        r->data.ptr_str.str = src;
+        r->data.ptr_str.ptr = 0;
+        input = (rb_parser_input_data)&r->data.ptr_str;
     }
-    input = src;
     if (NIL_P(fname)) {
         fname = STR_NEW2("(ripper)");
         OBJ_FREEZE(fname);
@@ -358,12 +396,8 @@ ripper_initialize(int argc, VALUE *argv, VALUE self)
 static VALUE
 ripper_parse0(VALUE vparser)
 {
-    struct ripper *r;
-    struct parser_params *p;
+    struct parser_params *p = ripper_parser_params(vparser, false);
 
-    TypedData_Get_Struct(vparser, struct ripper, &parser_data_type, r);
-    p = r->p;
-    // RB_GC_GUARD(vparser);
     rb_ruby_ripper_parse0(p);
     return rb_ruby_parser_result(p);
 }
@@ -371,10 +405,9 @@ ripper_parse0(VALUE vparser)
 static VALUE
 ripper_ensure(VALUE vparser)
 {
-    struct ripper *r;
+    struct parser_params *p = ripper_parser_params(vparser, false);
 
-    TypedData_Get_Struct(vparser, struct ripper, &parser_data_type, r);
-    rb_ruby_parser_set_parsing_thread(r->p, Qnil);
+    rb_ruby_parser_set_parsing_thread(p, Qnil);
     return Qnil;
 }
 
@@ -387,14 +420,9 @@ ripper_ensure(VALUE vparser)
 static VALUE
 ripper_parse(VALUE self)
 {
-    struct ripper *r;
-    struct parser_params *p;
+    struct parser_params *p = ripper_parser_params(self, true);
+    VALUE result;
 
-    TypedData_Get_Struct(self, struct ripper, &parser_data_type, r);
-    p = r->p;
-    if (!rb_ruby_ripper_initialized_p(p)) {
-        rb_raise(rb_eArgError, "method called for uninitialized object");
-    }
     if (!NIL_P(rb_ruby_parser_parsing_thread(p))) {
         if (rb_ruby_parser_parsing_thread(p) == rb_thread_current())
             rb_raise(rb_eArgError, "Ripper#parse is not reentrant");
@@ -402,9 +430,10 @@ ripper_parse(VALUE self)
             rb_raise(rb_eArgError, "Ripper#parse is not multithread-safe");
     }
     rb_ruby_parser_set_parsing_thread(p, rb_thread_current());
-    rb_ensure(ripper_parse0, self, ripper_ensure, self);
+    result = rb_ensure(ripper_parse0, self, ripper_ensure, self);
+    RB_GC_GUARD(self);
 
-    return rb_ruby_parser_result(p);
+    return result;
 }
 
 /*
@@ -417,15 +446,9 @@ ripper_parse(VALUE self)
 static VALUE
 ripper_column(VALUE self)
 {
-    struct ripper *r;
-    struct parser_params *p;
+    struct parser_params *p = ripper_parser_params(self, true);
     long col;
 
-    TypedData_Get_Struct(self, struct ripper, &parser_data_type, r);
-    p = r->p;
-    if (!rb_ruby_ripper_initialized_p(p)) {
-        rb_raise(rb_eArgError, "method called for uninitialized object");
-    }
     if (NIL_P(rb_ruby_parser_parsing_thread(p))) return Qnil;
     col = rb_ruby_ripper_column(p);
     return LONG2NUM(col);
@@ -440,14 +463,8 @@ ripper_column(VALUE self)
 static VALUE
 ripper_filename(VALUE self)
 {
-    struct ripper *r;
-    struct parser_params *p;
+    struct parser_params *p = ripper_parser_params(self, true);
 
-    TypedData_Get_Struct(self, struct ripper, &parser_data_type, r);
-    p = r->p;
-    if (!rb_ruby_ripper_initialized_p(p)) {
-        rb_raise(rb_eArgError, "method called for uninitialized object");
-    }
     return rb_ruby_parser_ruby_sourcefile_string(p);
 }
 
@@ -461,14 +478,8 @@ ripper_filename(VALUE self)
 static VALUE
 ripper_lineno(VALUE self)
 {
-    struct ripper *r;
-    struct parser_params *p;
+    struct parser_params *p = ripper_parser_params(self, true);
 
-    TypedData_Get_Struct(self, struct ripper, &parser_data_type, r);
-    p = r->p;
-    if (!rb_ruby_ripper_initialized_p(p)) {
-        rb_raise(rb_eArgError, "method called for uninitialized object");
-    }
     if (NIL_P(rb_ruby_parser_parsing_thread(p))) return Qnil;
     return INT2NUM(rb_ruby_parser_ruby_sourceline(p));
 }
@@ -482,14 +493,8 @@ ripper_lineno(VALUE self)
 static VALUE
 ripper_state(VALUE self)
 {
-    struct ripper *r;
-    struct parser_params *p;
+    struct parser_params *p = ripper_parser_params(self, true);
 
-    TypedData_Get_Struct(self, struct ripper, &parser_data_type, r);
-    p = r->p;
-    if (!rb_ruby_ripper_initialized_p(p)) {
-        rb_raise(rb_eArgError, "method called for uninitialized object");
-    }
     if (NIL_P(rb_ruby_parser_parsing_thread(p))) return Qnil;
     return INT2NUM(rb_ruby_parser_lex_state(p));
 }
@@ -503,19 +508,15 @@ ripper_state(VALUE self)
 static VALUE
 ripper_token(VALUE self)
 {
-    struct ripper *r;
-    struct parser_params *p;
+    struct parser_params *p = ripper_parser_params(self, true);
     long pos, len;
+    VALUE str;
 
-    TypedData_Get_Struct(self, struct ripper, &parser_data_type, r);
-    p = r->p;
-    if (!rb_ruby_ripper_initialized_p(p)) {
-        rb_raise(rb_eArgError, "method called for uninitialized object");
-    }
     if (NIL_P(rb_ruby_parser_parsing_thread(p))) return Qnil;
     pos = rb_ruby_ripper_column(p);
     len = rb_ruby_ripper_token_len(p);
-    return rb_str_subseq(rb_ruby_ripper_lex_lastline(p), pos, len);
+    str = rb_str_new_parser_string(rb_ruby_ripper_lex_lastline(p));
+    return rb_str_subseq(str, pos, len);
 }
 
 #ifdef RIPPER_DEBUG
@@ -536,6 +537,37 @@ ripper_raw_value(VALUE self, VALUE obj)
 {
     return ULONG2NUM(obj);
 }
+
+/* :nodoc: */
+static VALUE
+ripper_validate_object(VALUE self, VALUE x)
+{
+    if (x == Qfalse) return x;
+    if (x == Qtrue) return x;
+    if (NIL_P(x)) return x;
+    if (UNDEF_P(x))
+        rb_raise(rb_eArgError, "Qundef given");
+    if (FIXNUM_P(x)) return x;
+    if (SYMBOL_P(x)) return x;
+    switch (BUILTIN_TYPE(x)) {
+      case T_STRING:
+      case T_OBJECT:
+      case T_ARRAY:
+      case T_BIGNUM:
+      case T_FLOAT:
+      case T_COMPLEX:
+      case T_RATIONAL:
+        break;
+      default:
+        rb_raise(rb_eArgError, "wrong type of ruby object: %p (%s)",
+                 (void *)x, rb_obj_classname(x));
+    }
+    if (!RBASIC_CLASS(x)) {
+        rb_raise(rb_eArgError, "hidden ruby object: %p (%s)",
+                 (void *)x, rb_builtin_type_name(TYPE(x)));
+    }
+    return x;
+}
 #endif
 
 #ifdef UNIVERSAL_PARSER
@@ -564,17 +596,14 @@ static VALUE
 ripper_lex_state_name(VALUE self, VALUE state)
 {
     struct parser_params *p;
-    rb_parser_config_t *config;
     struct lex_state_name_arg args;
 
-    config = rb_ruby_parser_config_new(ruby_xmalloc);
-    rb_parser_config_initialize(config);
-    p = rb_ruby_parser_new(config);
+    p = rb_parser_params_new();
 
     args.p = p;
     args.state = state;
 
-    return rb_ensure(lex_state_name0, (VALUE)&args, parser_config_free, (VALUE)config);
+    return rb_ensure(lex_state_name0, (VALUE)&args, parser_free, (VALUE)p);
 }
 #else
 static VALUE
@@ -648,5 +677,4 @@ InitVM_ripper(void)
      */
     rb_define_global_const("SCRIPT_LINES__", Qnil);
 #endif
-
 }
diff --git a/ext/ripper/ripper_init.h b/ext/ripper/ripper_init.h
index 82ff13b95f8958..9d228107d1b172 100644
--- a/ext/ripper/ripper_init.h
+++ b/ext/ripper/ripper_init.h
@@ -1,8 +1,6 @@
 #ifndef RIPPER_INIT_H
 #define RIPPER_INIT_H
 
-VALUE ripper_get_value(VALUE v);
-ID ripper_get_id(VALUE v);
 PRINTF_ARGS(void ripper_compile_error(struct parser_params*, const char *fmt, ...), 2, 3);
 
 #endif /* RIPPER_INIT_H */
diff --git a/ext/ripper/tools/dsl.rb b/ext/ripper/tools/dsl.rb
index 49ff51711f00ff..38f859dd97ed61 100644
--- a/ext/ripper/tools/dsl.rb
+++ b/ext/ripper/tools/dsl.rb
@@ -1,83 +1,177 @@
+# frozen_string_literal: true
+
 # Simple DSL implementation for Ripper code generation
 #
-# input: /*% ripper: stmts_add(stmts_new, void_stmt) %*/
+# input: /*% ripper: stmts_add!(stmts_new!, void_stmt!) %*/
 # output:
 #   VALUE v1, v2;
 #   v1 = dispatch0(stmts_new);
 #   v2 = dispatch0(void_stmt);
 #   $$ = dispatch2(stmts_add, v1, v2);
-
-$dollar = "$$"
-alias $$ $dollar
+#
+# - The code must be a single line.
+#
+# - The code is basically Ruby code, even if it appears like in C and
+#   the result will be processed as C. e.g., comments need to be in
+#   Ruby style.
 
 class DSL
-  def initialize(code, options)
+  TAG_PATTERN = /(?><[a-zA-Z0-9_]+>)/.source
+  NAME_PATTERN = /(?>\$|\d+|[a-zA-Z_][a-zA-Z0-9_]*|\[[a-zA-Z_.][-a-zA-Z0-9_.]*\])(?>(?:\.|->)[a-zA-Z_][a-zA-Z0-9_]*)*/.source
+  NOT_REF_PATTERN = /(?>\#.*|[^\"$@]*|"(?>\\.|[^\"])*")/.source
+
+  def self.line?(line, lineno = nil, indent: nil)
+    if %r<(?<space>\s*)/\*% *ripper(?:\[(?<option>.*?)\])?: *(?<code>.*?) *%\*/> =~ line
+      new(code, comma_split(option), lineno, indent: indent || space)
+    end
+  end
+
+  def self.comma_split(str)
+    str or return []
+    str.scan(/(([^(,)]+|\((?:,|\g<0>)*\))+)/).map(&:first)
+  end
+
+  using Module.new {
+    refine Array do
+      def to_s
+        if empty?
+          "rb_ary_new()"
+        else
+          "rb_ary_new_from_args(#{size}, #{map(&:to_s).join(', ')})"
+        end
+      end
+    end
+  }
+
+  class Var
+    class Table < Hash
+      def initialize(&block)
+        super() {|tbl, arg|
+          tbl.fetch(arg, &block)
+        }
+      end
+
+      def fetch(arg, &block)
+        super {
+          self[arg] = Var.new(self, arg, &block)
+        }
+      end
+
+      def add(&block)
+        v = new_var
+        self[v] = Var.new(self, v, &block)
+      end
+
+      def defined?(name)
+        name = name.to_s
+        any? {|_, v| v.var == name}
+      end
+
+      def new_var
+        "v#{size+1}"
+      end
+    end
+
+    attr_reader :var, :value
+
+    PRETTY_PRINT_INSTANCE_VARIABLES = instance_methods(false).freeze
+
+    def pretty_print_instance_variables
+      PRETTY_PRINT_INSTANCE_VARIABLES
+    end
+
+    alias to_s var
+
+    def initialize(table, arg, &block)
+      @var = table.new_var
+      @value = yield arg
+      @table = table
+    end
+
+    # Indexing.
+    #
+    #   $:1 -> v1=get_value($:1)
+    #   $:1[0] -> rb_ary_entry(v1, 0)
+    #   $:1[0..1] -> [rb_ary_entry(v1, 0), rb_ary_entry(v1, 1)]
+    #   *$:1[0..1] -> rb_ary_entry(v1, 0), rb_ary_entry(v1, 1)
+    #
+    # Splat needs `[range]` because `Var` does not have the length info.
+    def [](idx)
+      if ::Range === idx
+        idx.map {|i| self[i]}
+      else
+        @table.fetch("#@var[#{idx}]") {"rb_ary_entry(#{@var}, #{idx})"}
+      end
+    end
+  end
+
+  def initialize(code, options, lineno = nil, indent: "\t\t\t")
+    @lineno = lineno
+    @indent = indent
     @events = {}
     @error = options.include?("error")
-    @brace = options.include?("brace")
     if options.include?("final")
       @final = "p->result"
     else
-      @final = (options.grep(/\A\$(?:\$|\d+)\z/)[0] || "$$")
+      @final = (options.grep(/\A\$#{NAME_PATTERN}\z/o)[0] || "p->s_lvalue")
     end
-    @vars = 0
 
-    # create $1 == "$1", $2 == "$2", ...
-    s = (1..20).map {|n| "$#{n}"}
-    re = Array.new(s.size, "([^\0]+)")
-    /#{re.join("\0")}/ =~ s.join("\0")
+    bind = dsl_binding
+    @var_table = Var::Table.new {|arg| "get_value(#{arg})"}
+    code = code.gsub(%r[\G#{NOT_REF_PATTERN}\K(\$|\$:|@)#{TAG_PATTERN}?#{NAME_PATTERN}]o) {
+      if (arg = $&) == "$:$"
+        '"p->s_lvalue"'
+      elsif arg.start_with?("$:")
+        "(#{@var_table[arg]}=@var_table[#{arg.dump}])"
+      else
+        arg.dump
+      end
+    }
+    @last_value = bind.eval(code)
+  rescue SyntaxError
+    $stderr.puts "error on line #{@lineno}" if @lineno
+    raise
+  end
 
+  def dsl_binding(p = "p")
     # struct parser_params *p
-    p = p = "p"
-
-    @code = ""
-    @last_value = eval(code)
+    binding
   end
 
   attr_reader :events
 
   undef lambda
   undef hash
-  undef class
+  undef :class
 
   def generate
-    s = "#@code#@final=#@last_value;"
-    s = "{VALUE #{ (1..@vars).map {|v| "v#{ v }" }.join(",") };#{ s }}" if @vars > 0
+    s = "#@final=#@last_value;"
     s << "ripper_error(p);" if @error
-    s = "{#{ s }}" if @brace
-    "\t\t\t#{s}"
-  end
-
-  def new_var
-    "v#{ @vars += 1 }"
-  end
-
-  def opt_event(event, default, addend)
-    add_event(event, [default, addend], true)
+    unless @var_table.empty?
+      vars = @var_table.map {|_, v| "#{v.var}=#{v.value}"}.join(", ")
+      s = "VALUE #{ vars }; #{ s }"
+    end
+    "#{@indent}{#{s}}"
   end
 
-  def add_event(event, args, qundef_check = false)
+  def add_event(event, args)
     event = event.to_s.sub(/!\z/, "")
     @events[event] = args.size
     vars = []
     args.each do |arg|
-      vars << v = new_var
-      @code << "#{ v }=#{ arg };"
+      arg = @var_table.add {arg} unless Var === arg
+      vars << arg
     end
-    v = new_var
-    d = "dispatch#{ args.size }(#{ [event, *vars].join(",") })"
-    d = "#{ vars.last }==Qundef ? #{ vars.first } : #{ d }" if qundef_check
-    @code << "#{ v }=#{ d };"
-    v
+    @var_table.add {"dispatch#{ args.size }(#{ [event, *vars].join(",") })"}
   end
 
   def method_missing(event, *args)
     if event.to_s =~ /!\z/
       add_event(event, args)
-    elsif args.empty? and /\Aid[A-Z_]/ =~ event.to_s
+    elsif args.empty? and (/\Aid[A-Z_]/ =~ event or @var_table.defined?(event))
       event
     else
-      "#{ event }(#{ args.join(", ") })"
+      "#{ event }(#{ args.map(&:to_s).join(", ") })"
     end
   end
 
@@ -85,4 +179,3 @@ def self.const_missing(name)
     name
   end
 end
-
diff --git a/ext/ripper/tools/generate.rb b/ext/ripper/tools/generate.rb
index bb64d2fe8b34f4..57ecac0b392524 100644
--- a/ext/ripper/tools/generate.rb
+++ b/ext/ripper/tools/generate.rb
@@ -75,6 +75,7 @@ def generate_eventids1_h(ids)
   buf << %Q[#ifndef RIPPER_EVENTIDS1\n]
   buf << %Q[#define RIPPER_EVENTIDS1\n]
   buf << %Q[\n]
+  buf << %Q[#define RIPPER_ID(n) ripper_parser_ids.id_ ## n\n]
   buf << %Q[void ripper_init_eventids1(void);\n]
   buf << %Q[void ripper_init_eventids1_table(VALUE self);\n]
   buf << %Q[\n]
@@ -84,9 +85,6 @@ def generate_eventids1_h(ids)
   end
   buf << %Q[};\n]
   buf << %Q[\n]
-  ids.each do |id, arity|
-    buf << %Q[#define ripper_id_#{id} ripper_parser_ids.id_#{id}\n]
-  end
   buf << %Q[#endif /* RIPPER_EVENTIDS1 */\n]
   buf << %Q[\n]
 end
@@ -101,7 +99,7 @@ def generate_eventids1(ids)
   buf << %Q[void\n]
   buf << %Q[ripper_init_eventids1(void)\n]
   buf << %Q[{\n]
-  buf << %Q[#define set_id1(name) ripper_id_##name = rb_intern_const("on_"#name)\n]
+  buf << %Q[#define set_id1(name) RIPPER_ID(name) = rb_intern_const("on_"#name)\n]
   ids.each do |id, arity|
     buf << %Q[    set_id1(#{id});\n]
   end
@@ -136,6 +134,8 @@ def generate_eventids2_table(ids)
     buf << %Q[    rb_hash_aset(h, intern_sym("#{id}"), INT2FIX(1));\n]
   end
   buf << %Q[}\n]
+  buf << %Q[\n]
+  buf << %Q[#define RIPPER_EVENTIDS2_TABLE_SIZE #{ids.size}\n]
   buf
 end
 
@@ -171,9 +171,7 @@ def read_ids1_with_locations(path)
       line.scan(/\bdispatch(\d)\((\w+)/) do |arity, event|
         (h[event] ||= []).push [f.lineno, arity.to_i]
       end
-      if line =~ %r</\*% *ripper(?:\[(.*?)\])?: *(.*?) *%\*/>
-        gen = DSL.new($2, ($1 || "").split(","))
-        gen.generate
+      if gen = DSL.line?(line, f.lineno)
         gen.events.each do |event, arity|
           (h[event] ||= []).push [f.lineno, arity.to_i]
         end
diff --git a/ext/ripper/tools/preproc.rb b/ext/ripper/tools/preproc.rb
index 07ef627cf34f2e..5e8a6e0cb58bb8 100644
--- a/ext/ripper/tools/preproc.rb
+++ b/ext/ripper/tools/preproc.rb
@@ -51,28 +51,26 @@ def process(f, out, path, template)
   usercode f, out, path, template
 end
 
-def prelude(f, out)
-  @exprs = {}
-  lex_state_def = false
+require_relative 'dsl'
+
+def generate_line(f, out)
   while line = f.gets
-    case line
-    when /\A%%/
+    case
+    when gen = DSL.line?(line, f.lineno)
+      out << gen.generate << "\n"
+    when line.start_with?("%%")
       out << "%%\n"
-      return
-    when /\A%token/, /\A} <node>/
-      out << line.sub(/<\w+>/, '<val>')
-    when /\A%type/
-      out << line.sub(/<\w+>/, '<val>')
-    when /^enum lex_state_(?:bits|e) \{/
-      lex_state_def = true
-      out << line
-    when /^\}/
-      lex_state_def = false
-      out << line
+      break
     else
-      out << line
+      out << yield(line)
     end
-    if lex_state_def
+  end
+end
+
+def prelude(f, out)
+  @exprs = {}
+  generate_line(f, out) do |line|
+    if (/^enum lex_state_(?:bits|e) \{/ =~ line)..(/^\}/ =~ line)
       case line
       when /^\s*(EXPR_\w+),\s+\/\*(.+)\*\//
         @exprs[$1.chomp("_bit")] = $2.strip
@@ -82,27 +80,21 @@ def prelude(f, out)
         @exprs[name] = "equals to " + (val.start_with?("(") ? "<tt>#{val}</tt>" : "+#{val}+")
       end
     end
+    line
   end
 end
 
-require_relative "dsl"
-
 def grammar(f, out)
-  while line = f.gets
+  generate_line(f, out) do |line|
     case line
-    when %r</\*% *ripper(?:\[(.*?)\])?: *(.*?) *%\*/>
-      out << DSL.new($2, ($1 || "").split(",")).generate << "\n"
     when %r</\*%%%\*/>
-      out << "#if 0\n"
+      "#if 0\n"
     when %r</\*%>
-      out << "#endif\n"
+      "#endif\n"
     when %r<%\*/>
-      out << "\n"
-    when /\A%%/
-      out << "%%\n"
-      return
+      "\n"
     else
-      out << line
+      line
     end
   end
 end
diff --git a/ext/socket/ancdata.c b/ext/socket/ancdata.c
index 6ef040b692f338..f1e9e425248d3e 100644
--- a/ext/socket/ancdata.c
+++ b/ext/socket/ancdata.c
@@ -1643,14 +1643,14 @@ bsock_recvmsg_internal(VALUE sock,
         rb_obj_reveal(dat_str, rb_cString);
     }
 
-    ret = rb_ary_new3(3, dat_str,
-                         rsock_io_socket_addrinfo(sock, mh.msg_name, mh.msg_namelen),
 #if defined(HAVE_STRUCT_MSGHDR_MSG_CONTROL)
-                         INT2NUM(mh.msg_flags)
+    VALUE msg_flags = INT2NUM(mh.msg_flags);
 #else
-                         Qnil
+    VALUE msg_flags = Qnil;
 #endif
-                         );
+    ret = rb_ary_new3(3, dat_str,
+                         rsock_io_socket_addrinfo(sock, mh.msg_name, mh.msg_namelen),
+                         msg_flags);
 
 #if defined(HAVE_STRUCT_MSGHDR_MSG_CONTROL)
     family = rsock_getfamily(fptr);
diff --git a/ext/socket/basicsocket.c b/ext/socket/basicsocket.c
index 54c369f6fcb4b8..2fcae8eb54f37c 100644
--- a/ext/socket/basicsocket.c
+++ b/ext/socket/basicsocket.c
@@ -124,7 +124,7 @@ bsock_close_read(VALUE sock)
     rb_io_t *fptr;
 
     GetOpenFile(sock, fptr);
-    shutdown(fptr->fd, 0);
+    shutdown(fptr->fd, SHUT_RD);
     if (!(fptr->mode & FMODE_WRITABLE)) {
         return rb_io_close(sock);
     }
@@ -157,7 +157,7 @@ bsock_close_write(VALUE sock)
     if (!(fptr->mode & FMODE_READABLE)) {
         return rb_io_close(sock);
     }
-    shutdown(fptr->fd, 1);
+    shutdown(fptr->fd, SHUT_WR);
     fptr->mode &= ~FMODE_WRITABLE;
 
     return Qnil;
@@ -597,7 +597,7 @@ rsock_bsock_send(int argc, VALUE *argv, VALUE socket)
         rb_io_wait(socket, RB_INT2NUM(RUBY_IO_WRITABLE), Qnil);
 #endif
 
-        ssize_t n = (ssize_t)BLOCKING_REGION_FD(func, &arg);
+        ssize_t n = (ssize_t)rb_io_blocking_region(fptr, func, &arg);
 
         if (n >= 0) return SSIZET2NUM(n);
 
diff --git a/ext/socket/depend b/ext/socket/depend
index 675520c0b5627e..6f2d280bfd1d8f 100644
--- a/ext/socket/depend
+++ b/ext/socket/depend
@@ -151,6 +151,7 @@ ancdata.o: $(hdrdir)/ruby/internal/intern/re.h
 ancdata.o: $(hdrdir)/ruby/internal/intern/ruby.h
 ancdata.o: $(hdrdir)/ruby/internal/intern/select.h
 ancdata.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+ancdata.o: $(hdrdir)/ruby/internal/intern/set.h
 ancdata.o: $(hdrdir)/ruby/internal/intern/signal.h
 ancdata.o: $(hdrdir)/ruby/internal/intern/sprintf.h
 ancdata.o: $(hdrdir)/ruby/internal/intern/string.h
@@ -170,6 +171,7 @@ ancdata.o: $(hdrdir)/ruby/internal/special_consts.h
 ancdata.o: $(hdrdir)/ruby/internal/static_assert.h
 ancdata.o: $(hdrdir)/ruby/internal/stdalign.h
 ancdata.o: $(hdrdir)/ruby/internal/stdbool.h
+ancdata.o: $(hdrdir)/ruby/internal/stdckdint.h
 ancdata.o: $(hdrdir)/ruby/internal/symbol.h
 ancdata.o: $(hdrdir)/ruby/internal/value.h
 ancdata.o: $(hdrdir)/ruby/internal/value_type.h
@@ -186,10 +188,12 @@ ancdata.o: $(hdrdir)/ruby/subst.h
 ancdata.o: $(hdrdir)/ruby/thread.h
 ancdata.o: $(hdrdir)/ruby/thread_native.h
 ancdata.o: $(hdrdir)/ruby/util.h
+ancdata.o: $(hdrdir)/ruby/version.h
 ancdata.o: $(top_srcdir)/ccan/check_type/check_type.h
 ancdata.o: $(top_srcdir)/ccan/container_of/container_of.h
 ancdata.o: $(top_srcdir)/ccan/list/list.h
 ancdata.o: $(top_srcdir)/ccan/str/str.h
+ancdata.o: $(top_srcdir)/id_table.h
 ancdata.o: $(top_srcdir)/internal.h
 ancdata.o: $(top_srcdir)/internal/array.h
 ancdata.o: $(top_srcdir)/internal/basic_operators.h
@@ -198,7 +202,10 @@ ancdata.o: $(top_srcdir)/internal/error.h
 ancdata.o: $(top_srcdir)/internal/gc.h
 ancdata.o: $(top_srcdir)/internal/imemo.h
 ancdata.o: $(top_srcdir)/internal/io.h
+ancdata.o: $(top_srcdir)/internal/namespace.h
+ancdata.o: $(top_srcdir)/internal/sanitizers.h
 ancdata.o: $(top_srcdir)/internal/serial.h
+ancdata.o: $(top_srcdir)/internal/set_table.h
 ancdata.o: $(top_srcdir)/internal/static_assert.h
 ancdata.o: $(top_srcdir)/internal/string.h
 ancdata.o: $(top_srcdir)/internal/thread.h
@@ -359,6 +366,7 @@ basicsocket.o: $(hdrdir)/ruby/internal/intern/re.h
 basicsocket.o: $(hdrdir)/ruby/internal/intern/ruby.h
 basicsocket.o: $(hdrdir)/ruby/internal/intern/select.h
 basicsocket.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+basicsocket.o: $(hdrdir)/ruby/internal/intern/set.h
 basicsocket.o: $(hdrdir)/ruby/internal/intern/signal.h
 basicsocket.o: $(hdrdir)/ruby/internal/intern/sprintf.h
 basicsocket.o: $(hdrdir)/ruby/internal/intern/string.h
@@ -378,6 +386,7 @@ basicsocket.o: $(hdrdir)/ruby/internal/special_consts.h
 basicsocket.o: $(hdrdir)/ruby/internal/static_assert.h
 basicsocket.o: $(hdrdir)/ruby/internal/stdalign.h
 basicsocket.o: $(hdrdir)/ruby/internal/stdbool.h
+basicsocket.o: $(hdrdir)/ruby/internal/stdckdint.h
 basicsocket.o: $(hdrdir)/ruby/internal/symbol.h
 basicsocket.o: $(hdrdir)/ruby/internal/value.h
 basicsocket.o: $(hdrdir)/ruby/internal/value_type.h
@@ -394,10 +403,12 @@ basicsocket.o: $(hdrdir)/ruby/subst.h
 basicsocket.o: $(hdrdir)/ruby/thread.h
 basicsocket.o: $(hdrdir)/ruby/thread_native.h
 basicsocket.o: $(hdrdir)/ruby/util.h
+basicsocket.o: $(hdrdir)/ruby/version.h
 basicsocket.o: $(top_srcdir)/ccan/check_type/check_type.h
 basicsocket.o: $(top_srcdir)/ccan/container_of/container_of.h
 basicsocket.o: $(top_srcdir)/ccan/list/list.h
 basicsocket.o: $(top_srcdir)/ccan/str/str.h
+basicsocket.o: $(top_srcdir)/id_table.h
 basicsocket.o: $(top_srcdir)/internal.h
 basicsocket.o: $(top_srcdir)/internal/array.h
 basicsocket.o: $(top_srcdir)/internal/basic_operators.h
@@ -406,7 +417,10 @@ basicsocket.o: $(top_srcdir)/internal/error.h
 basicsocket.o: $(top_srcdir)/internal/gc.h
 basicsocket.o: $(top_srcdir)/internal/imemo.h
 basicsocket.o: $(top_srcdir)/internal/io.h
+basicsocket.o: $(top_srcdir)/internal/namespace.h
+basicsocket.o: $(top_srcdir)/internal/sanitizers.h
 basicsocket.o: $(top_srcdir)/internal/serial.h
+basicsocket.o: $(top_srcdir)/internal/set_table.h
 basicsocket.o: $(top_srcdir)/internal/static_assert.h
 basicsocket.o: $(top_srcdir)/internal/string.h
 basicsocket.o: $(top_srcdir)/internal/thread.h
@@ -567,6 +581,7 @@ constants.o: $(hdrdir)/ruby/internal/intern/re.h
 constants.o: $(hdrdir)/ruby/internal/intern/ruby.h
 constants.o: $(hdrdir)/ruby/internal/intern/select.h
 constants.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+constants.o: $(hdrdir)/ruby/internal/intern/set.h
 constants.o: $(hdrdir)/ruby/internal/intern/signal.h
 constants.o: $(hdrdir)/ruby/internal/intern/sprintf.h
 constants.o: $(hdrdir)/ruby/internal/intern/string.h
@@ -586,6 +601,7 @@ constants.o: $(hdrdir)/ruby/internal/special_consts.h
 constants.o: $(hdrdir)/ruby/internal/static_assert.h
 constants.o: $(hdrdir)/ruby/internal/stdalign.h
 constants.o: $(hdrdir)/ruby/internal/stdbool.h
+constants.o: $(hdrdir)/ruby/internal/stdckdint.h
 constants.o: $(hdrdir)/ruby/internal/symbol.h
 constants.o: $(hdrdir)/ruby/internal/value.h
 constants.o: $(hdrdir)/ruby/internal/value_type.h
@@ -602,10 +618,12 @@ constants.o: $(hdrdir)/ruby/subst.h
 constants.o: $(hdrdir)/ruby/thread.h
 constants.o: $(hdrdir)/ruby/thread_native.h
 constants.o: $(hdrdir)/ruby/util.h
+constants.o: $(hdrdir)/ruby/version.h
 constants.o: $(top_srcdir)/ccan/check_type/check_type.h
 constants.o: $(top_srcdir)/ccan/container_of/container_of.h
 constants.o: $(top_srcdir)/ccan/list/list.h
 constants.o: $(top_srcdir)/ccan/str/str.h
+constants.o: $(top_srcdir)/id_table.h
 constants.o: $(top_srcdir)/internal.h
 constants.o: $(top_srcdir)/internal/array.h
 constants.o: $(top_srcdir)/internal/basic_operators.h
@@ -614,7 +632,10 @@ constants.o: $(top_srcdir)/internal/error.h
 constants.o: $(top_srcdir)/internal/gc.h
 constants.o: $(top_srcdir)/internal/imemo.h
 constants.o: $(top_srcdir)/internal/io.h
+constants.o: $(top_srcdir)/internal/namespace.h
+constants.o: $(top_srcdir)/internal/sanitizers.h
 constants.o: $(top_srcdir)/internal/serial.h
+constants.o: $(top_srcdir)/internal/set_table.h
 constants.o: $(top_srcdir)/internal/static_assert.h
 constants.o: $(top_srcdir)/internal/string.h
 constants.o: $(top_srcdir)/internal/thread.h
@@ -776,6 +797,7 @@ ifaddr.o: $(hdrdir)/ruby/internal/intern/re.h
 ifaddr.o: $(hdrdir)/ruby/internal/intern/ruby.h
 ifaddr.o: $(hdrdir)/ruby/internal/intern/select.h
 ifaddr.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+ifaddr.o: $(hdrdir)/ruby/internal/intern/set.h
 ifaddr.o: $(hdrdir)/ruby/internal/intern/signal.h
 ifaddr.o: $(hdrdir)/ruby/internal/intern/sprintf.h
 ifaddr.o: $(hdrdir)/ruby/internal/intern/string.h
@@ -795,6 +817,7 @@ ifaddr.o: $(hdrdir)/ruby/internal/special_consts.h
 ifaddr.o: $(hdrdir)/ruby/internal/static_assert.h
 ifaddr.o: $(hdrdir)/ruby/internal/stdalign.h
 ifaddr.o: $(hdrdir)/ruby/internal/stdbool.h
+ifaddr.o: $(hdrdir)/ruby/internal/stdckdint.h
 ifaddr.o: $(hdrdir)/ruby/internal/symbol.h
 ifaddr.o: $(hdrdir)/ruby/internal/value.h
 ifaddr.o: $(hdrdir)/ruby/internal/value_type.h
@@ -811,10 +834,12 @@ ifaddr.o: $(hdrdir)/ruby/subst.h
 ifaddr.o: $(hdrdir)/ruby/thread.h
 ifaddr.o: $(hdrdir)/ruby/thread_native.h
 ifaddr.o: $(hdrdir)/ruby/util.h
+ifaddr.o: $(hdrdir)/ruby/version.h
 ifaddr.o: $(top_srcdir)/ccan/check_type/check_type.h
 ifaddr.o: $(top_srcdir)/ccan/container_of/container_of.h
 ifaddr.o: $(top_srcdir)/ccan/list/list.h
 ifaddr.o: $(top_srcdir)/ccan/str/str.h
+ifaddr.o: $(top_srcdir)/id_table.h
 ifaddr.o: $(top_srcdir)/internal.h
 ifaddr.o: $(top_srcdir)/internal/array.h
 ifaddr.o: $(top_srcdir)/internal/basic_operators.h
@@ -823,7 +848,10 @@ ifaddr.o: $(top_srcdir)/internal/error.h
 ifaddr.o: $(top_srcdir)/internal/gc.h
 ifaddr.o: $(top_srcdir)/internal/imemo.h
 ifaddr.o: $(top_srcdir)/internal/io.h
+ifaddr.o: $(top_srcdir)/internal/namespace.h
+ifaddr.o: $(top_srcdir)/internal/sanitizers.h
 ifaddr.o: $(top_srcdir)/internal/serial.h
+ifaddr.o: $(top_srcdir)/internal/set_table.h
 ifaddr.o: $(top_srcdir)/internal/static_assert.h
 ifaddr.o: $(top_srcdir)/internal/string.h
 ifaddr.o: $(top_srcdir)/internal/thread.h
@@ -984,6 +1012,7 @@ init.o: $(hdrdir)/ruby/internal/intern/re.h
 init.o: $(hdrdir)/ruby/internal/intern/ruby.h
 init.o: $(hdrdir)/ruby/internal/intern/select.h
 init.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+init.o: $(hdrdir)/ruby/internal/intern/set.h
 init.o: $(hdrdir)/ruby/internal/intern/signal.h
 init.o: $(hdrdir)/ruby/internal/intern/sprintf.h
 init.o: $(hdrdir)/ruby/internal/intern/string.h
@@ -1003,6 +1032,7 @@ init.o: $(hdrdir)/ruby/internal/special_consts.h
 init.o: $(hdrdir)/ruby/internal/static_assert.h
 init.o: $(hdrdir)/ruby/internal/stdalign.h
 init.o: $(hdrdir)/ruby/internal/stdbool.h
+init.o: $(hdrdir)/ruby/internal/stdckdint.h
 init.o: $(hdrdir)/ruby/internal/symbol.h
 init.o: $(hdrdir)/ruby/internal/value.h
 init.o: $(hdrdir)/ruby/internal/value_type.h
@@ -1019,10 +1049,12 @@ init.o: $(hdrdir)/ruby/subst.h
 init.o: $(hdrdir)/ruby/thread.h
 init.o: $(hdrdir)/ruby/thread_native.h
 init.o: $(hdrdir)/ruby/util.h
+init.o: $(hdrdir)/ruby/version.h
 init.o: $(top_srcdir)/ccan/check_type/check_type.h
 init.o: $(top_srcdir)/ccan/container_of/container_of.h
 init.o: $(top_srcdir)/ccan/list/list.h
 init.o: $(top_srcdir)/ccan/str/str.h
+init.o: $(top_srcdir)/id_table.h
 init.o: $(top_srcdir)/internal.h
 init.o: $(top_srcdir)/internal/array.h
 init.o: $(top_srcdir)/internal/basic_operators.h
@@ -1031,7 +1063,10 @@ init.o: $(top_srcdir)/internal/error.h
 init.o: $(top_srcdir)/internal/gc.h
 init.o: $(top_srcdir)/internal/imemo.h
 init.o: $(top_srcdir)/internal/io.h
+init.o: $(top_srcdir)/internal/namespace.h
+init.o: $(top_srcdir)/internal/sanitizers.h
 init.o: $(top_srcdir)/internal/serial.h
+init.o: $(top_srcdir)/internal/set_table.h
 init.o: $(top_srcdir)/internal/static_assert.h
 init.o: $(top_srcdir)/internal/string.h
 init.o: $(top_srcdir)/internal/thread.h
@@ -1192,6 +1227,7 @@ ipsocket.o: $(hdrdir)/ruby/internal/intern/re.h
 ipsocket.o: $(hdrdir)/ruby/internal/intern/ruby.h
 ipsocket.o: $(hdrdir)/ruby/internal/intern/select.h
 ipsocket.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+ipsocket.o: $(hdrdir)/ruby/internal/intern/set.h
 ipsocket.o: $(hdrdir)/ruby/internal/intern/signal.h
 ipsocket.o: $(hdrdir)/ruby/internal/intern/sprintf.h
 ipsocket.o: $(hdrdir)/ruby/internal/intern/string.h
@@ -1211,6 +1247,7 @@ ipsocket.o: $(hdrdir)/ruby/internal/special_consts.h
 ipsocket.o: $(hdrdir)/ruby/internal/static_assert.h
 ipsocket.o: $(hdrdir)/ruby/internal/stdalign.h
 ipsocket.o: $(hdrdir)/ruby/internal/stdbool.h
+ipsocket.o: $(hdrdir)/ruby/internal/stdckdint.h
 ipsocket.o: $(hdrdir)/ruby/internal/symbol.h
 ipsocket.o: $(hdrdir)/ruby/internal/value.h
 ipsocket.o: $(hdrdir)/ruby/internal/value_type.h
@@ -1227,10 +1264,12 @@ ipsocket.o: $(hdrdir)/ruby/subst.h
 ipsocket.o: $(hdrdir)/ruby/thread.h
 ipsocket.o: $(hdrdir)/ruby/thread_native.h
 ipsocket.o: $(hdrdir)/ruby/util.h
+ipsocket.o: $(hdrdir)/ruby/version.h
 ipsocket.o: $(top_srcdir)/ccan/check_type/check_type.h
 ipsocket.o: $(top_srcdir)/ccan/container_of/container_of.h
 ipsocket.o: $(top_srcdir)/ccan/list/list.h
 ipsocket.o: $(top_srcdir)/ccan/str/str.h
+ipsocket.o: $(top_srcdir)/id_table.h
 ipsocket.o: $(top_srcdir)/internal.h
 ipsocket.o: $(top_srcdir)/internal/array.h
 ipsocket.o: $(top_srcdir)/internal/basic_operators.h
@@ -1239,7 +1278,10 @@ ipsocket.o: $(top_srcdir)/internal/error.h
 ipsocket.o: $(top_srcdir)/internal/gc.h
 ipsocket.o: $(top_srcdir)/internal/imemo.h
 ipsocket.o: $(top_srcdir)/internal/io.h
+ipsocket.o: $(top_srcdir)/internal/namespace.h
+ipsocket.o: $(top_srcdir)/internal/sanitizers.h
 ipsocket.o: $(top_srcdir)/internal/serial.h
+ipsocket.o: $(top_srcdir)/internal/set_table.h
 ipsocket.o: $(top_srcdir)/internal/static_assert.h
 ipsocket.o: $(top_srcdir)/internal/string.h
 ipsocket.o: $(top_srcdir)/internal/thread.h
@@ -1400,6 +1442,7 @@ option.o: $(hdrdir)/ruby/internal/intern/re.h
 option.o: $(hdrdir)/ruby/internal/intern/ruby.h
 option.o: $(hdrdir)/ruby/internal/intern/select.h
 option.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+option.o: $(hdrdir)/ruby/internal/intern/set.h
 option.o: $(hdrdir)/ruby/internal/intern/signal.h
 option.o: $(hdrdir)/ruby/internal/intern/sprintf.h
 option.o: $(hdrdir)/ruby/internal/intern/string.h
@@ -1419,6 +1462,7 @@ option.o: $(hdrdir)/ruby/internal/special_consts.h
 option.o: $(hdrdir)/ruby/internal/static_assert.h
 option.o: $(hdrdir)/ruby/internal/stdalign.h
 option.o: $(hdrdir)/ruby/internal/stdbool.h
+option.o: $(hdrdir)/ruby/internal/stdckdint.h
 option.o: $(hdrdir)/ruby/internal/symbol.h
 option.o: $(hdrdir)/ruby/internal/value.h
 option.o: $(hdrdir)/ruby/internal/value_type.h
@@ -1435,10 +1479,12 @@ option.o: $(hdrdir)/ruby/subst.h
 option.o: $(hdrdir)/ruby/thread.h
 option.o: $(hdrdir)/ruby/thread_native.h
 option.o: $(hdrdir)/ruby/util.h
+option.o: $(hdrdir)/ruby/version.h
 option.o: $(top_srcdir)/ccan/check_type/check_type.h
 option.o: $(top_srcdir)/ccan/container_of/container_of.h
 option.o: $(top_srcdir)/ccan/list/list.h
 option.o: $(top_srcdir)/ccan/str/str.h
+option.o: $(top_srcdir)/id_table.h
 option.o: $(top_srcdir)/internal.h
 option.o: $(top_srcdir)/internal/array.h
 option.o: $(top_srcdir)/internal/basic_operators.h
@@ -1447,7 +1493,10 @@ option.o: $(top_srcdir)/internal/error.h
 option.o: $(top_srcdir)/internal/gc.h
 option.o: $(top_srcdir)/internal/imemo.h
 option.o: $(top_srcdir)/internal/io.h
+option.o: $(top_srcdir)/internal/namespace.h
+option.o: $(top_srcdir)/internal/sanitizers.h
 option.o: $(top_srcdir)/internal/serial.h
+option.o: $(top_srcdir)/internal/set_table.h
 option.o: $(top_srcdir)/internal/static_assert.h
 option.o: $(top_srcdir)/internal/string.h
 option.o: $(top_srcdir)/internal/thread.h
@@ -1608,6 +1657,7 @@ raddrinfo.o: $(hdrdir)/ruby/internal/intern/re.h
 raddrinfo.o: $(hdrdir)/ruby/internal/intern/ruby.h
 raddrinfo.o: $(hdrdir)/ruby/internal/intern/select.h
 raddrinfo.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+raddrinfo.o: $(hdrdir)/ruby/internal/intern/set.h
 raddrinfo.o: $(hdrdir)/ruby/internal/intern/signal.h
 raddrinfo.o: $(hdrdir)/ruby/internal/intern/sprintf.h
 raddrinfo.o: $(hdrdir)/ruby/internal/intern/string.h
@@ -1627,6 +1677,7 @@ raddrinfo.o: $(hdrdir)/ruby/internal/special_consts.h
 raddrinfo.o: $(hdrdir)/ruby/internal/static_assert.h
 raddrinfo.o: $(hdrdir)/ruby/internal/stdalign.h
 raddrinfo.o: $(hdrdir)/ruby/internal/stdbool.h
+raddrinfo.o: $(hdrdir)/ruby/internal/stdckdint.h
 raddrinfo.o: $(hdrdir)/ruby/internal/symbol.h
 raddrinfo.o: $(hdrdir)/ruby/internal/value.h
 raddrinfo.o: $(hdrdir)/ruby/internal/value_type.h
@@ -1643,10 +1694,12 @@ raddrinfo.o: $(hdrdir)/ruby/subst.h
 raddrinfo.o: $(hdrdir)/ruby/thread.h
 raddrinfo.o: $(hdrdir)/ruby/thread_native.h
 raddrinfo.o: $(hdrdir)/ruby/util.h
+raddrinfo.o: $(hdrdir)/ruby/version.h
 raddrinfo.o: $(top_srcdir)/ccan/check_type/check_type.h
 raddrinfo.o: $(top_srcdir)/ccan/container_of/container_of.h
 raddrinfo.o: $(top_srcdir)/ccan/list/list.h
 raddrinfo.o: $(top_srcdir)/ccan/str/str.h
+raddrinfo.o: $(top_srcdir)/id_table.h
 raddrinfo.o: $(top_srcdir)/internal.h
 raddrinfo.o: $(top_srcdir)/internal/array.h
 raddrinfo.o: $(top_srcdir)/internal/basic_operators.h
@@ -1655,7 +1708,10 @@ raddrinfo.o: $(top_srcdir)/internal/error.h
 raddrinfo.o: $(top_srcdir)/internal/gc.h
 raddrinfo.o: $(top_srcdir)/internal/imemo.h
 raddrinfo.o: $(top_srcdir)/internal/io.h
+raddrinfo.o: $(top_srcdir)/internal/namespace.h
+raddrinfo.o: $(top_srcdir)/internal/sanitizers.h
 raddrinfo.o: $(top_srcdir)/internal/serial.h
+raddrinfo.o: $(top_srcdir)/internal/set_table.h
 raddrinfo.o: $(top_srcdir)/internal/static_assert.h
 raddrinfo.o: $(top_srcdir)/internal/string.h
 raddrinfo.o: $(top_srcdir)/internal/thread.h
@@ -1816,6 +1872,7 @@ socket.o: $(hdrdir)/ruby/internal/intern/re.h
 socket.o: $(hdrdir)/ruby/internal/intern/ruby.h
 socket.o: $(hdrdir)/ruby/internal/intern/select.h
 socket.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+socket.o: $(hdrdir)/ruby/internal/intern/set.h
 socket.o: $(hdrdir)/ruby/internal/intern/signal.h
 socket.o: $(hdrdir)/ruby/internal/intern/sprintf.h
 socket.o: $(hdrdir)/ruby/internal/intern/string.h
@@ -1835,6 +1892,7 @@ socket.o: $(hdrdir)/ruby/internal/special_consts.h
 socket.o: $(hdrdir)/ruby/internal/static_assert.h
 socket.o: $(hdrdir)/ruby/internal/stdalign.h
 socket.o: $(hdrdir)/ruby/internal/stdbool.h
+socket.o: $(hdrdir)/ruby/internal/stdckdint.h
 socket.o: $(hdrdir)/ruby/internal/symbol.h
 socket.o: $(hdrdir)/ruby/internal/value.h
 socket.o: $(hdrdir)/ruby/internal/value_type.h
@@ -1851,10 +1909,12 @@ socket.o: $(hdrdir)/ruby/subst.h
 socket.o: $(hdrdir)/ruby/thread.h
 socket.o: $(hdrdir)/ruby/thread_native.h
 socket.o: $(hdrdir)/ruby/util.h
+socket.o: $(hdrdir)/ruby/version.h
 socket.o: $(top_srcdir)/ccan/check_type/check_type.h
 socket.o: $(top_srcdir)/ccan/container_of/container_of.h
 socket.o: $(top_srcdir)/ccan/list/list.h
 socket.o: $(top_srcdir)/ccan/str/str.h
+socket.o: $(top_srcdir)/id_table.h
 socket.o: $(top_srcdir)/internal.h
 socket.o: $(top_srcdir)/internal/array.h
 socket.o: $(top_srcdir)/internal/basic_operators.h
@@ -1863,7 +1923,10 @@ socket.o: $(top_srcdir)/internal/error.h
 socket.o: $(top_srcdir)/internal/gc.h
 socket.o: $(top_srcdir)/internal/imemo.h
 socket.o: $(top_srcdir)/internal/io.h
+socket.o: $(top_srcdir)/internal/namespace.h
+socket.o: $(top_srcdir)/internal/sanitizers.h
 socket.o: $(top_srcdir)/internal/serial.h
+socket.o: $(top_srcdir)/internal/set_table.h
 socket.o: $(top_srcdir)/internal/static_assert.h
 socket.o: $(top_srcdir)/internal/string.h
 socket.o: $(top_srcdir)/internal/thread.h
@@ -2024,6 +2087,7 @@ sockssocket.o: $(hdrdir)/ruby/internal/intern/re.h
 sockssocket.o: $(hdrdir)/ruby/internal/intern/ruby.h
 sockssocket.o: $(hdrdir)/ruby/internal/intern/select.h
 sockssocket.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+sockssocket.o: $(hdrdir)/ruby/internal/intern/set.h
 sockssocket.o: $(hdrdir)/ruby/internal/intern/signal.h
 sockssocket.o: $(hdrdir)/ruby/internal/intern/sprintf.h
 sockssocket.o: $(hdrdir)/ruby/internal/intern/string.h
@@ -2043,6 +2107,7 @@ sockssocket.o: $(hdrdir)/ruby/internal/special_consts.h
 sockssocket.o: $(hdrdir)/ruby/internal/static_assert.h
 sockssocket.o: $(hdrdir)/ruby/internal/stdalign.h
 sockssocket.o: $(hdrdir)/ruby/internal/stdbool.h
+sockssocket.o: $(hdrdir)/ruby/internal/stdckdint.h
 sockssocket.o: $(hdrdir)/ruby/internal/symbol.h
 sockssocket.o: $(hdrdir)/ruby/internal/value.h
 sockssocket.o: $(hdrdir)/ruby/internal/value_type.h
@@ -2059,10 +2124,12 @@ sockssocket.o: $(hdrdir)/ruby/subst.h
 sockssocket.o: $(hdrdir)/ruby/thread.h
 sockssocket.o: $(hdrdir)/ruby/thread_native.h
 sockssocket.o: $(hdrdir)/ruby/util.h
+sockssocket.o: $(hdrdir)/ruby/version.h
 sockssocket.o: $(top_srcdir)/ccan/check_type/check_type.h
 sockssocket.o: $(top_srcdir)/ccan/container_of/container_of.h
 sockssocket.o: $(top_srcdir)/ccan/list/list.h
 sockssocket.o: $(top_srcdir)/ccan/str/str.h
+sockssocket.o: $(top_srcdir)/id_table.h
 sockssocket.o: $(top_srcdir)/internal.h
 sockssocket.o: $(top_srcdir)/internal/array.h
 sockssocket.o: $(top_srcdir)/internal/basic_operators.h
@@ -2071,7 +2138,10 @@ sockssocket.o: $(top_srcdir)/internal/error.h
 sockssocket.o: $(top_srcdir)/internal/gc.h
 sockssocket.o: $(top_srcdir)/internal/imemo.h
 sockssocket.o: $(top_srcdir)/internal/io.h
+sockssocket.o: $(top_srcdir)/internal/namespace.h
+sockssocket.o: $(top_srcdir)/internal/sanitizers.h
 sockssocket.o: $(top_srcdir)/internal/serial.h
+sockssocket.o: $(top_srcdir)/internal/set_table.h
 sockssocket.o: $(top_srcdir)/internal/static_assert.h
 sockssocket.o: $(top_srcdir)/internal/string.h
 sockssocket.o: $(top_srcdir)/internal/thread.h
@@ -2232,6 +2302,7 @@ tcpserver.o: $(hdrdir)/ruby/internal/intern/re.h
 tcpserver.o: $(hdrdir)/ruby/internal/intern/ruby.h
 tcpserver.o: $(hdrdir)/ruby/internal/intern/select.h
 tcpserver.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+tcpserver.o: $(hdrdir)/ruby/internal/intern/set.h
 tcpserver.o: $(hdrdir)/ruby/internal/intern/signal.h
 tcpserver.o: $(hdrdir)/ruby/internal/intern/sprintf.h
 tcpserver.o: $(hdrdir)/ruby/internal/intern/string.h
@@ -2251,6 +2322,7 @@ tcpserver.o: $(hdrdir)/ruby/internal/special_consts.h
 tcpserver.o: $(hdrdir)/ruby/internal/static_assert.h
 tcpserver.o: $(hdrdir)/ruby/internal/stdalign.h
 tcpserver.o: $(hdrdir)/ruby/internal/stdbool.h
+tcpserver.o: $(hdrdir)/ruby/internal/stdckdint.h
 tcpserver.o: $(hdrdir)/ruby/internal/symbol.h
 tcpserver.o: $(hdrdir)/ruby/internal/value.h
 tcpserver.o: $(hdrdir)/ruby/internal/value_type.h
@@ -2267,10 +2339,12 @@ tcpserver.o: $(hdrdir)/ruby/subst.h
 tcpserver.o: $(hdrdir)/ruby/thread.h
 tcpserver.o: $(hdrdir)/ruby/thread_native.h
 tcpserver.o: $(hdrdir)/ruby/util.h
+tcpserver.o: $(hdrdir)/ruby/version.h
 tcpserver.o: $(top_srcdir)/ccan/check_type/check_type.h
 tcpserver.o: $(top_srcdir)/ccan/container_of/container_of.h
 tcpserver.o: $(top_srcdir)/ccan/list/list.h
 tcpserver.o: $(top_srcdir)/ccan/str/str.h
+tcpserver.o: $(top_srcdir)/id_table.h
 tcpserver.o: $(top_srcdir)/internal.h
 tcpserver.o: $(top_srcdir)/internal/array.h
 tcpserver.o: $(top_srcdir)/internal/basic_operators.h
@@ -2279,7 +2353,10 @@ tcpserver.o: $(top_srcdir)/internal/error.h
 tcpserver.o: $(top_srcdir)/internal/gc.h
 tcpserver.o: $(top_srcdir)/internal/imemo.h
 tcpserver.o: $(top_srcdir)/internal/io.h
+tcpserver.o: $(top_srcdir)/internal/namespace.h
+tcpserver.o: $(top_srcdir)/internal/sanitizers.h
 tcpserver.o: $(top_srcdir)/internal/serial.h
+tcpserver.o: $(top_srcdir)/internal/set_table.h
 tcpserver.o: $(top_srcdir)/internal/static_assert.h
 tcpserver.o: $(top_srcdir)/internal/string.h
 tcpserver.o: $(top_srcdir)/internal/thread.h
@@ -2440,6 +2517,7 @@ tcpsocket.o: $(hdrdir)/ruby/internal/intern/re.h
 tcpsocket.o: $(hdrdir)/ruby/internal/intern/ruby.h
 tcpsocket.o: $(hdrdir)/ruby/internal/intern/select.h
 tcpsocket.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+tcpsocket.o: $(hdrdir)/ruby/internal/intern/set.h
 tcpsocket.o: $(hdrdir)/ruby/internal/intern/signal.h
 tcpsocket.o: $(hdrdir)/ruby/internal/intern/sprintf.h
 tcpsocket.o: $(hdrdir)/ruby/internal/intern/string.h
@@ -2459,6 +2537,7 @@ tcpsocket.o: $(hdrdir)/ruby/internal/special_consts.h
 tcpsocket.o: $(hdrdir)/ruby/internal/static_assert.h
 tcpsocket.o: $(hdrdir)/ruby/internal/stdalign.h
 tcpsocket.o: $(hdrdir)/ruby/internal/stdbool.h
+tcpsocket.o: $(hdrdir)/ruby/internal/stdckdint.h
 tcpsocket.o: $(hdrdir)/ruby/internal/symbol.h
 tcpsocket.o: $(hdrdir)/ruby/internal/value.h
 tcpsocket.o: $(hdrdir)/ruby/internal/value_type.h
@@ -2475,10 +2554,12 @@ tcpsocket.o: $(hdrdir)/ruby/subst.h
 tcpsocket.o: $(hdrdir)/ruby/thread.h
 tcpsocket.o: $(hdrdir)/ruby/thread_native.h
 tcpsocket.o: $(hdrdir)/ruby/util.h
+tcpsocket.o: $(hdrdir)/ruby/version.h
 tcpsocket.o: $(top_srcdir)/ccan/check_type/check_type.h
 tcpsocket.o: $(top_srcdir)/ccan/container_of/container_of.h
 tcpsocket.o: $(top_srcdir)/ccan/list/list.h
 tcpsocket.o: $(top_srcdir)/ccan/str/str.h
+tcpsocket.o: $(top_srcdir)/id_table.h
 tcpsocket.o: $(top_srcdir)/internal.h
 tcpsocket.o: $(top_srcdir)/internal/array.h
 tcpsocket.o: $(top_srcdir)/internal/basic_operators.h
@@ -2487,7 +2568,10 @@ tcpsocket.o: $(top_srcdir)/internal/error.h
 tcpsocket.o: $(top_srcdir)/internal/gc.h
 tcpsocket.o: $(top_srcdir)/internal/imemo.h
 tcpsocket.o: $(top_srcdir)/internal/io.h
+tcpsocket.o: $(top_srcdir)/internal/namespace.h
+tcpsocket.o: $(top_srcdir)/internal/sanitizers.h
 tcpsocket.o: $(top_srcdir)/internal/serial.h
+tcpsocket.o: $(top_srcdir)/internal/set_table.h
 tcpsocket.o: $(top_srcdir)/internal/static_assert.h
 tcpsocket.o: $(top_srcdir)/internal/string.h
 tcpsocket.o: $(top_srcdir)/internal/thread.h
@@ -2648,6 +2732,7 @@ udpsocket.o: $(hdrdir)/ruby/internal/intern/re.h
 udpsocket.o: $(hdrdir)/ruby/internal/intern/ruby.h
 udpsocket.o: $(hdrdir)/ruby/internal/intern/select.h
 udpsocket.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+udpsocket.o: $(hdrdir)/ruby/internal/intern/set.h
 udpsocket.o: $(hdrdir)/ruby/internal/intern/signal.h
 udpsocket.o: $(hdrdir)/ruby/internal/intern/sprintf.h
 udpsocket.o: $(hdrdir)/ruby/internal/intern/string.h
@@ -2667,6 +2752,7 @@ udpsocket.o: $(hdrdir)/ruby/internal/special_consts.h
 udpsocket.o: $(hdrdir)/ruby/internal/static_assert.h
 udpsocket.o: $(hdrdir)/ruby/internal/stdalign.h
 udpsocket.o: $(hdrdir)/ruby/internal/stdbool.h
+udpsocket.o: $(hdrdir)/ruby/internal/stdckdint.h
 udpsocket.o: $(hdrdir)/ruby/internal/symbol.h
 udpsocket.o: $(hdrdir)/ruby/internal/value.h
 udpsocket.o: $(hdrdir)/ruby/internal/value_type.h
@@ -2683,10 +2769,12 @@ udpsocket.o: $(hdrdir)/ruby/subst.h
 udpsocket.o: $(hdrdir)/ruby/thread.h
 udpsocket.o: $(hdrdir)/ruby/thread_native.h
 udpsocket.o: $(hdrdir)/ruby/util.h
+udpsocket.o: $(hdrdir)/ruby/version.h
 udpsocket.o: $(top_srcdir)/ccan/check_type/check_type.h
 udpsocket.o: $(top_srcdir)/ccan/container_of/container_of.h
 udpsocket.o: $(top_srcdir)/ccan/list/list.h
 udpsocket.o: $(top_srcdir)/ccan/str/str.h
+udpsocket.o: $(top_srcdir)/id_table.h
 udpsocket.o: $(top_srcdir)/internal.h
 udpsocket.o: $(top_srcdir)/internal/array.h
 udpsocket.o: $(top_srcdir)/internal/basic_operators.h
@@ -2695,7 +2783,10 @@ udpsocket.o: $(top_srcdir)/internal/error.h
 udpsocket.o: $(top_srcdir)/internal/gc.h
 udpsocket.o: $(top_srcdir)/internal/imemo.h
 udpsocket.o: $(top_srcdir)/internal/io.h
+udpsocket.o: $(top_srcdir)/internal/namespace.h
+udpsocket.o: $(top_srcdir)/internal/sanitizers.h
 udpsocket.o: $(top_srcdir)/internal/serial.h
+udpsocket.o: $(top_srcdir)/internal/set_table.h
 udpsocket.o: $(top_srcdir)/internal/static_assert.h
 udpsocket.o: $(top_srcdir)/internal/string.h
 udpsocket.o: $(top_srcdir)/internal/thread.h
@@ -2856,6 +2947,7 @@ unixserver.o: $(hdrdir)/ruby/internal/intern/re.h
 unixserver.o: $(hdrdir)/ruby/internal/intern/ruby.h
 unixserver.o: $(hdrdir)/ruby/internal/intern/select.h
 unixserver.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+unixserver.o: $(hdrdir)/ruby/internal/intern/set.h
 unixserver.o: $(hdrdir)/ruby/internal/intern/signal.h
 unixserver.o: $(hdrdir)/ruby/internal/intern/sprintf.h
 unixserver.o: $(hdrdir)/ruby/internal/intern/string.h
@@ -2875,6 +2967,7 @@ unixserver.o: $(hdrdir)/ruby/internal/special_consts.h
 unixserver.o: $(hdrdir)/ruby/internal/static_assert.h
 unixserver.o: $(hdrdir)/ruby/internal/stdalign.h
 unixserver.o: $(hdrdir)/ruby/internal/stdbool.h
+unixserver.o: $(hdrdir)/ruby/internal/stdckdint.h
 unixserver.o: $(hdrdir)/ruby/internal/symbol.h
 unixserver.o: $(hdrdir)/ruby/internal/value.h
 unixserver.o: $(hdrdir)/ruby/internal/value_type.h
@@ -2891,10 +2984,12 @@ unixserver.o: $(hdrdir)/ruby/subst.h
 unixserver.o: $(hdrdir)/ruby/thread.h
 unixserver.o: $(hdrdir)/ruby/thread_native.h
 unixserver.o: $(hdrdir)/ruby/util.h
+unixserver.o: $(hdrdir)/ruby/version.h
 unixserver.o: $(top_srcdir)/ccan/check_type/check_type.h
 unixserver.o: $(top_srcdir)/ccan/container_of/container_of.h
 unixserver.o: $(top_srcdir)/ccan/list/list.h
 unixserver.o: $(top_srcdir)/ccan/str/str.h
+unixserver.o: $(top_srcdir)/id_table.h
 unixserver.o: $(top_srcdir)/internal.h
 unixserver.o: $(top_srcdir)/internal/array.h
 unixserver.o: $(top_srcdir)/internal/basic_operators.h
@@ -2903,7 +2998,10 @@ unixserver.o: $(top_srcdir)/internal/error.h
 unixserver.o: $(top_srcdir)/internal/gc.h
 unixserver.o: $(top_srcdir)/internal/imemo.h
 unixserver.o: $(top_srcdir)/internal/io.h
+unixserver.o: $(top_srcdir)/internal/namespace.h
+unixserver.o: $(top_srcdir)/internal/sanitizers.h
 unixserver.o: $(top_srcdir)/internal/serial.h
+unixserver.o: $(top_srcdir)/internal/set_table.h
 unixserver.o: $(top_srcdir)/internal/static_assert.h
 unixserver.o: $(top_srcdir)/internal/string.h
 unixserver.o: $(top_srcdir)/internal/thread.h
@@ -3064,6 +3162,7 @@ unixsocket.o: $(hdrdir)/ruby/internal/intern/re.h
 unixsocket.o: $(hdrdir)/ruby/internal/intern/ruby.h
 unixsocket.o: $(hdrdir)/ruby/internal/intern/select.h
 unixsocket.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+unixsocket.o: $(hdrdir)/ruby/internal/intern/set.h
 unixsocket.o: $(hdrdir)/ruby/internal/intern/signal.h
 unixsocket.o: $(hdrdir)/ruby/internal/intern/sprintf.h
 unixsocket.o: $(hdrdir)/ruby/internal/intern/string.h
@@ -3083,6 +3182,7 @@ unixsocket.o: $(hdrdir)/ruby/internal/special_consts.h
 unixsocket.o: $(hdrdir)/ruby/internal/static_assert.h
 unixsocket.o: $(hdrdir)/ruby/internal/stdalign.h
 unixsocket.o: $(hdrdir)/ruby/internal/stdbool.h
+unixsocket.o: $(hdrdir)/ruby/internal/stdckdint.h
 unixsocket.o: $(hdrdir)/ruby/internal/symbol.h
 unixsocket.o: $(hdrdir)/ruby/internal/value.h
 unixsocket.o: $(hdrdir)/ruby/internal/value_type.h
@@ -3099,10 +3199,12 @@ unixsocket.o: $(hdrdir)/ruby/subst.h
 unixsocket.o: $(hdrdir)/ruby/thread.h
 unixsocket.o: $(hdrdir)/ruby/thread_native.h
 unixsocket.o: $(hdrdir)/ruby/util.h
+unixsocket.o: $(hdrdir)/ruby/version.h
 unixsocket.o: $(top_srcdir)/ccan/check_type/check_type.h
 unixsocket.o: $(top_srcdir)/ccan/container_of/container_of.h
 unixsocket.o: $(top_srcdir)/ccan/list/list.h
 unixsocket.o: $(top_srcdir)/ccan/str/str.h
+unixsocket.o: $(top_srcdir)/id_table.h
 unixsocket.o: $(top_srcdir)/internal.h
 unixsocket.o: $(top_srcdir)/internal/array.h
 unixsocket.o: $(top_srcdir)/internal/basic_operators.h
@@ -3111,7 +3213,10 @@ unixsocket.o: $(top_srcdir)/internal/error.h
 unixsocket.o: $(top_srcdir)/internal/gc.h
 unixsocket.o: $(top_srcdir)/internal/imemo.h
 unixsocket.o: $(top_srcdir)/internal/io.h
+unixsocket.o: $(top_srcdir)/internal/namespace.h
+unixsocket.o: $(top_srcdir)/internal/sanitizers.h
 unixsocket.o: $(top_srcdir)/internal/serial.h
+unixsocket.o: $(top_srcdir)/internal/set_table.h
 unixsocket.o: $(top_srcdir)/internal/static_assert.h
 unixsocket.o: $(top_srcdir)/internal/string.h
 unixsocket.o: $(top_srcdir)/internal/thread.h
diff --git a/ext/socket/extconf.rb b/ext/socket/extconf.rb
index 93bd850c348850..d44ce31b0a76dd 100644
--- a/ext/socket/extconf.rb
+++ b/ext/socket/extconf.rb
@@ -327,6 +327,8 @@ def test_recvmsg_with_msg_peek_creates_fds(headers)
   net/if_dl.h
   arpa/nameser.h
   resolv.h
+  pthread.h
+  sched.h
 ].each {|h|
   if have_header(h, headers)
     headers << h
@@ -700,6 +702,9 @@ def %(s) s || self end
     end
   end
 
+  have_func("pthread_create")
+  have_func("pthread_detach")
+
   $VPATH << '$(topdir)' << '$(top_srcdir)'
   create_makefile("socket")
 end
diff --git a/ext/socket/ifaddr.c b/ext/socket/ifaddr.c
index ab163dcc8fed23..3596c40a11890e 100644
--- a/ext/socket/ifaddr.c
+++ b/ext/socket/ifaddr.c
@@ -177,6 +177,8 @@ ifaddr_ifindex(VALUE self)
  *   ifaddr.flags => integer
  *
  * Returns the flags of _ifaddr_.
+ *
+ * The value is bitwise-or of Socket::IFF_* constants such as Socket::IFF_LOOPBACK.
  */
 
 static VALUE
diff --git a/ext/socket/init.c b/ext/socket/init.c
index e9dc6f84839f25..8e405609ba0aa4 100644
--- a/ext/socket/init.c
+++ b/ext/socket/init.c
@@ -27,6 +27,7 @@ VALUE rb_cSocket;
 VALUE rb_cAddrinfo;
 
 VALUE rb_eSocket;
+VALUE rb_eResolution;
 
 #ifdef SOCKS
 VALUE rb_cSOCKSSocket;
@@ -34,9 +35,10 @@ VALUE rb_cSOCKSSocket;
 
 int rsock_do_not_reverse_lookup = 1;
 static VALUE sym_wait_readable;
+static ID id_error_code;
 
 void
-rsock_raise_socket_error(const char *reason, int error)
+rsock_raise_resolution_error(const char *reason, int error)
 {
 #ifdef EAI_SYSTEM
     int e;
@@ -48,10 +50,14 @@ rsock_raise_socket_error(const char *reason, int error)
     VALUE msg = rb_sprintf("%s: ", reason);
     if (!enc) enc = rb_default_internal_encoding();
     rb_str_concat(msg, rb_w32_conv_from_wchar(gai_strerrorW(error), enc));
-    rb_exc_raise(rb_exc_new_str(rb_eSocket, msg));
 #else
-    rb_raise(rb_eSocket, "%s: %s", reason, gai_strerror(error));
+    VALUE msg = rb_sprintf("%s: %s", reason, gai_strerror(error));
 #endif
+
+    StringValue(msg);
+    VALUE self = rb_class_new_instance(1, &msg, rb_eResolution);
+    rb_ivar_set(self, id_error_code, INT2NUM(error));
+    rb_exc_raise(self);
 }
 
 #if defined __APPLE__
@@ -101,6 +107,7 @@ rsock_send_blocking(void *data)
 }
 
 struct recvfrom_arg {
+    rb_io_t *fptr;
     int fd, flags;
     VALUE str;
     size_t length;
@@ -145,7 +152,7 @@ recvfrom_locktmp(VALUE v)
 {
     struct recvfrom_arg *arg = (struct recvfrom_arg *)v;
 
-    return rb_thread_io_blocking_region(recvfrom_blocking, arg, arg->fd);
+    return rb_io_blocking_region(arg->fptr, recvfrom_blocking, arg);
 }
 
 int
@@ -186,6 +193,7 @@ rsock_s_recvfrom(VALUE socket, int argc, VALUE *argv, enum sock_recv_type from)
         rb_raise(rb_eIOError, "recv for buffered IO");
     }
 
+    arg.fptr = fptr;
     arg.fd = fptr->fd;
     arg.alen = (socklen_t)sizeof(arg.buf);
     arg.str = str;
@@ -198,7 +206,8 @@ rsock_s_recvfrom(VALUE socket, int argc, VALUE *argv, enum sock_recv_type from)
         rb_io_wait(fptr->self, RB_INT2NUM(RUBY_IO_READABLE), Qnil);
 #endif
 
-        slen = (long)rb_str_locktmp_ensure(str, recvfrom_locktmp, (VALUE)&arg);
+        rb_str_locktmp(str);
+        slen = (long)rb_ensure(recvfrom_locktmp, (VALUE)&arg, rb_str_unlocktmp, str);
 
         if (slen == 0 && !rsock_is_dgram(fptr)) {
             return Qnil;
@@ -412,7 +421,7 @@ rsock_write_nonblock(VALUE sock, VALUE str, VALUE ex)
         if (e == EWOULDBLOCK || e == EAGAIN) {
             if (ex == Qfalse) return sym_wait_writable;
             rb_readwrite_syserr_fail(RB_IO_WAIT_WRITABLE, e,
-                                    "write would block");
+                                     "write would block");
         }
         rb_syserr_fail_path(e, fptr->pathv);
     }
@@ -453,9 +462,9 @@ rsock_socket(int domain, int type, int proto)
 
     fd = rsock_socket0(domain, type, proto);
     if (fd < 0) {
-       if (rb_gc_for_fd(errno)) {
-           fd = rsock_socket0(domain, type, proto);
-       }
+        if (rb_gc_for_fd(errno)) {
+            fd = rsock_socket0(domain, type, proto);
+        }
     }
     if (0 <= fd)
         rb_update_max_fd(fd);
@@ -464,10 +473,11 @@ rsock_socket(int domain, int type, int proto)
 
 /* emulate blocking connect behavior on EINTR or non-blocking socket */
 static int
-wait_connectable(int fd, struct timeval *timeout)
+wait_connectable(VALUE self, VALUE timeout)
 {
-    int sockerr, revents;
+    int sockerr;
     socklen_t sockerrlen;
+    int fd = rb_io_descriptor(self);
 
     sockerrlen = (socklen_t)sizeof(sockerr);
     if (getsockopt(fd, SOL_SOCKET, SO_ERROR, (void *)&sockerr, &sockerrlen) < 0)
@@ -501,7 +511,13 @@ wait_connectable(int fd, struct timeval *timeout)
      *
      * Note: rb_wait_for_single_fd already retries on EINTR/ERESTART
      */
-    revents = rb_wait_for_single_fd(fd, RB_WAITFD_IN|RB_WAITFD_OUT, timeout);
+    VALUE result = rb_io_wait(self, RB_INT2NUM(RUBY_IO_READABLE|RUBY_IO_WRITABLE), timeout);
+
+    if (result == Qfalse) {
+        rb_raise(rb_eIOTimeoutError, "Connect timed out!");
+    }
+
+    int revents = RB_NUM2INT(result);
 
     if (revents < 0)
         return -1;
@@ -512,16 +528,10 @@ wait_connectable(int fd, struct timeval *timeout)
 
     switch (sockerr) {
       case 0:
-      /*
-       * be defensive in case some platforms set SO_ERROR on the original,
-       * interrupted connect()
-       */
-
-        /* when the connection timed out, no errno is set and revents is 0. */
-        if (timeout && revents == 0) {
-            errno = ETIMEDOUT;
-            return -1;
-        }
+        /*
+         * be defensive in case some platforms set SO_ERROR on the original,
+         * interrupted connect()
+         */
       case EINTR:
 #ifdef ERESTART
       case ERESTART:
@@ -569,19 +579,19 @@ socks_connect_blocking(void *data)
 #endif
 
 int
-rsock_connect(int fd, const struct sockaddr *sockaddr, int len, int socks, struct timeval *timeout)
+rsock_connect(VALUE self, const struct sockaddr *sockaddr, int len, int socks, VALUE timeout)
 {
-    int status;
+    int descriptor = rb_io_descriptor(self);
     rb_blocking_function_t *func = connect_blocking;
-    struct connect_arg arg;
+    struct connect_arg arg = {.fd = descriptor, .sockaddr = sockaddr, .len = len};
+
+    rb_io_t *fptr;
+    RB_IO_POINTER(self, fptr);
 
-    arg.fd = fd;
-    arg.sockaddr = sockaddr;
-    arg.len = len;
 #if defined(SOCKS) && !defined(SOCKS5)
     if (socks) func = socks_connect_blocking;
 #endif
-    status = (int)BLOCKING_REGION_FD(func, &arg);
+    int status = (int)rb_io_blocking_region(fptr, func, &arg);
 
     if (status < 0) {
         switch (errno) {
@@ -593,7 +603,7 @@ rsock_connect(int fd, const struct sockaddr *sockaddr, int len, int socks, struc
 #ifdef EINPROGRESS
           case EINPROGRESS:
 #endif
-            return wait_connectable(fd, timeout);
+            return wait_connectable(self, timeout);
         }
     }
     return status;
@@ -701,9 +711,9 @@ rsock_s_accept(VALUE klass, VALUE io, struct sockaddr *sockaddr, socklen_t *len)
     RB_IO_POINTER(io, fptr);
 
     struct accept_arg accept_arg = {
-      .fd = fptr->fd,
-      .sockaddr = sockaddr,
-      .len = len
+        .fd = fptr->fd,
+        .sockaddr = sockaddr,
+        .len = len
     };
 
     int retry = 0, peer;
@@ -712,7 +722,7 @@ rsock_s_accept(VALUE klass, VALUE io, struct sockaddr *sockaddr, socklen_t *len)
 #ifdef RSOCK_WAIT_BEFORE_BLOCKING
     rb_io_wait(fptr->self, RB_INT2NUM(RUBY_IO_READABLE), Qnil);
 #endif
-    peer = (int)BLOCKING_REGION_FD(accept_blocking, &accept_arg);
+    peer = (int)rb_io_blocking_region(fptr, accept_blocking, &accept_arg);
     if (peer < 0) {
         int error = errno;
 
@@ -750,10 +760,10 @@ rsock_getfamily(rb_io_t *fptr)
     if (cached) {
         switch (cached) {
 #ifdef AF_UNIX
-            case FMODE_UNIX: return AF_UNIX;
+          case FMODE_UNIX: return AF_UNIX;
 #endif
-            case FMODE_INET: return AF_INET;
-            case FMODE_INET6: return AF_INET6;
+          case FMODE_INET: return AF_INET;
+          case FMODE_INET6: return AF_INET6;
         }
     }
 
@@ -772,6 +782,28 @@ rsock_getfamily(rb_io_t *fptr)
     return ss.addr.sa_family;
 }
 
+/*
+ * call-seq:
+ *   error_code     -> integer
+ *
+ * Returns the raw error code indicating the cause of the hostname resolution failure.
+ *
+ *    begin
+ *      Addrinfo.getaddrinfo("ruby-lang.org", nil)
+ *    rescue Socket::ResolutionError => e
+ *      if e.error_code == Socket::EAI_AGAIN
+ *        puts "Temporary failure in name resolution."
+ *      end
+ *    end
+ *
+ * Note that error codes depend on the operating system.
+ */
+static VALUE
+sock_resolv_error_code(VALUE self)
+{
+    return rb_attr_get(self, id_error_code);
+}
+
 void
 rsock_init_socket_init(void)
 {
@@ -779,6 +811,11 @@ rsock_init_socket_init(void)
      * SocketError is the error class for socket.
      */
     rb_eSocket = rb_define_class("SocketError", rb_eStandardError);
+    /*
+     * Socket::ResolutionError is the error class for hostname resolution.
+     */
+    rb_eResolution = rb_define_class_under(rb_cSocket, "ResolutionError", rb_eSocket);
+    rb_define_method(rb_eResolution, "error_code", sock_resolv_error_code, 0);
     rsock_init_ipsocket();
     rsock_init_tcpsocket();
     rsock_init_tcpserver();
@@ -792,6 +829,8 @@ rsock_init_socket_init(void)
     rsock_init_sockifaddr();
     rsock_init_socket_constants();
 
+    id_error_code = rb_intern_const("error_code");
+
 #undef rb_intern
     sym_wait_readable = ID2SYM(rb_intern("wait_readable"));
 
diff --git a/ext/socket/ipsocket.c b/ext/socket/ipsocket.c
index 0c1362025846c1..eff4278c4f568f 100644
--- a/ext/socket/ipsocket.c
+++ b/ext/socket/ipsocket.c
@@ -9,16 +9,18 @@
 ************************************************/
 
 #include "rubysocket.h"
+#include <stdio.h>
 
 struct inetsock_arg
 {
-    VALUE sock;
+    VALUE self;
+    VALUE io;
+
     struct {
         VALUE host, serv;
         struct rb_addrinfo *res;
     } remote, local;
     int type;
-    int fd;
     VALUE resolv_timeout;
     VALUE connect_timeout;
 };
@@ -35,8 +37,9 @@ inetsock_cleanup(VALUE v)
         rb_freeaddrinfo(arg->local.res);
         arg->local.res = 0;
     }
-    if (arg->fd >= 0) {
-        close(arg->fd);
+    if (arg->io != Qnil) {
+        rb_io_close(arg->io);
+        arg->io = Qnil;
     }
     return Qnil;
 }
@@ -48,21 +51,17 @@ init_inetsock_internal(VALUE v)
     int error = 0;
     int type = arg->type;
     struct addrinfo *res, *lres;
-    int fd, status = 0, local = 0;
+    int status = 0, local = 0;
     int family = AF_UNSPEC;
     const char *syscall = 0;
+    VALUE resolv_timeout = arg->resolv_timeout;
     VALUE connect_timeout = arg->connect_timeout;
-    struct timeval tv_storage;
-    struct timeval *tv = NULL;
 
-    if (!NIL_P(connect_timeout)) {
-        tv_storage = rb_time_interval(connect_timeout);
-        tv = &tv_storage;
-    }
+    unsigned int t = NIL_P(resolv_timeout) ? 0 : rsock_value_timeout_to_msec(resolv_timeout);
 
     arg->remote.res = rsock_addrinfo(arg->remote.host, arg->remote.serv,
                                      family, SOCK_STREAM,
-                                     (type == INET_SERVER) ? AI_PASSIVE : 0);
+                                     (type == INET_SERVER) ? AI_PASSIVE : 0, t);
 
 
     /*
@@ -71,10 +70,11 @@ init_inetsock_internal(VALUE v)
 
     if (type != INET_SERVER && (!NIL_P(arg->local.host) || !NIL_P(arg->local.serv))) {
         arg->local.res = rsock_addrinfo(arg->local.host, arg->local.serv,
-                                        family, SOCK_STREAM, 0);
+                                        family, SOCK_STREAM, 0, 0);
     }
 
-    arg->fd = fd = -1;
+    VALUE io = Qnil;
+
     for (res = arg->remote.res->ai; res; res = res->ai_next) {
 #if !defined(INET6) && defined(AF_INET6)
         if (res->ai_family == AF_INET6)
@@ -96,12 +96,14 @@ init_inetsock_internal(VALUE v)
         }
         status = rsock_socket(res->ai_family,res->ai_socktype,res->ai_protocol);
         syscall = "socket(2)";
-        fd = status;
-        if (fd < 0) {
+        if (status < 0) {
             error = errno;
             continue;
         }
-        arg->fd = fd;
+
+        int fd = status;
+        io = arg->io = rsock_init_sock(arg->self, fd);
+
         if (type == INET_SERVER) {
 #if !defined(_WIN32) && !defined(__CYGWIN__)
             status = 1;
@@ -124,20 +126,22 @@ init_inetsock_internal(VALUE v)
             }
 
             if (status >= 0) {
-                status = rsock_connect(fd, res->ai_addr, res->ai_addrlen,
-                                       (type == INET_SOCKS), tv);
+                status = rsock_connect(io, res->ai_addr, res->ai_addrlen, (type == INET_SOCKS), connect_timeout);
                 syscall = "connect(2)";
             }
         }
 
         if (status < 0) {
             error = errno;
-            close(fd);
-            arg->fd = fd = -1;
+            arg->io = Qnil;
+            rb_io_close(io);
+            io = Qnil;
             continue;
-        } else
+        } else {
             break;
+        }
     }
+
     if (status < 0) {
         VALUE host, port;
 
@@ -152,28 +156,1155 @@ init_inetsock_internal(VALUE v)
         rsock_syserr_fail_host_port(error, syscall, host, port);
     }
 
-    arg->fd = -1;
+    // Don't close the socket in `inetsock_cleanup` if we are returning it:
+    arg->io = Qnil;
 
-    if (type == INET_SERVER) {
-        status = listen(fd, SOMAXCONN);
+    if (type == INET_SERVER && io != Qnil) {
+        status = listen(rb_io_descriptor(io), SOMAXCONN);
         if (status < 0) {
             error = errno;
-            close(fd);
+            rb_io_close(io);
             rb_syserr_fail(error, "listen(2)");
         }
     }
 
     /* create new instance */
-    return rsock_init_sock(arg->sock, fd);
+    return io;
+}
+
+#if FAST_FALLBACK_INIT_INETSOCK_IMPL == 0
+
+VALUE
+rsock_init_inetsock(VALUE self, VALUE remote_host, VALUE remote_serv, VALUE local_host, VALUE local_serv, int type, VALUE resolv_timeout, VALUE connect_timeout, VALUE _fast_fallback, VALUE _test_mode_settings)
+{
+    struct inetsock_arg arg;
+    arg.self = self;
+    arg.io = Qnil;
+    arg.remote.host = remote_host;
+    arg.remote.serv = remote_serv;
+    arg.remote.res = 0;
+    arg.local.host = local_host;
+    arg.local.serv = local_serv;
+    arg.local.res = 0;
+    arg.type = type;
+    arg.resolv_timeout = resolv_timeout;
+    arg.connect_timeout = connect_timeout;
+    return rb_ensure(init_inetsock_internal, (VALUE)&arg,
+                     inetsock_cleanup, (VALUE)&arg);
+}
+
+#elif FAST_FALLBACK_INIT_INETSOCK_IMPL == 1
+
+#define IPV6_ENTRY_POS 0
+#define IPV4_ENTRY_POS 1
+#define RESOLUTION_ERROR 0
+#define SYSCALL_ERROR 1
+
+static int
+is_specified_ip_address(const char *hostname)
+{
+    if (!hostname) return false;
+
+    struct in_addr ipv4addr;
+    struct in6_addr ipv6addr;
+
+    return (inet_pton(AF_INET6, hostname, &ipv6addr) == 1 ||
+            inet_pton(AF_INET, hostname, &ipv4addr) == 1);
+}
+
+struct fast_fallback_inetsock_arg
+{
+    VALUE self;
+    VALUE io;
+
+    struct {
+        VALUE host, serv;
+        struct rb_addrinfo *res;
+    } remote, local;
+    int type;
+    VALUE resolv_timeout;
+    VALUE connect_timeout;
+
+    const char *hostp, *portp;
+    int *families;
+    int family_size;
+    int additional_flags;
+    struct fast_fallback_getaddrinfo_entry *getaddrinfo_entries[2];
+    struct fast_fallback_getaddrinfo_shared *getaddrinfo_shared;
+    rb_fdset_t readfds, writefds;
+    int wait;
+    int connection_attempt_fds_size;
+    int *connection_attempt_fds;
+    VALUE test_mode_settings;
+};
+
+static struct fast_fallback_getaddrinfo_shared *
+allocate_fast_fallback_getaddrinfo_shared(int family_size)
+{
+    struct fast_fallback_getaddrinfo_shared *shared;
+
+    shared = (struct fast_fallback_getaddrinfo_shared *)calloc(
+        1,
+        sizeof(struct fast_fallback_getaddrinfo_shared) + (family_size == 1 ? 0 : 2) * sizeof(struct fast_fallback_getaddrinfo_entry)
+    );
+
+    return shared;
+}
+
+static void
+allocate_fast_fallback_getaddrinfo_hints(struct addrinfo *hints, int family, int remote_addrinfo_hints, int additional_flags)
+{
+    MEMZERO(hints, struct addrinfo, 1);
+    hints->ai_family = family;
+    hints->ai_socktype = SOCK_STREAM;
+    hints->ai_protocol = IPPROTO_TCP;
+    hints->ai_flags = remote_addrinfo_hints;
+    hints->ai_flags |= additional_flags;
+}
+
+static int*
+allocate_connection_attempt_fds(int additional_capacity)
+{
+    int *fds = (int *)malloc(additional_capacity * sizeof(int));
+    if (!fds) rb_syserr_fail(errno, "malloc(3)");
+    for (int i = 0; i < additional_capacity; i++) fds[i] = -1;
+    return fds;
+}
+
+static int
+reallocate_connection_attempt_fds(int **fds, int current_capacity, int additional_capacity)
+{
+    int new_capacity = current_capacity + additional_capacity;
+    int *new_fds;
+
+    new_fds = realloc(*fds, new_capacity * sizeof(int));
+    if (new_fds == NULL) {
+        rb_syserr_fail(errno, "realloc(3)");
+    }
+    *fds = new_fds;
+
+    for (int i = current_capacity; i < new_capacity; i++) (*fds)[i] = -1;
+    return new_capacity;
+}
+
+struct hostname_resolution_result
+{
+    struct addrinfo *ai;
+    int finished;
+    int has_error;
+};
+
+struct hostname_resolution_store
+{
+    struct hostname_resolution_result v6;
+    struct hostname_resolution_result v4;
+    int is_all_finished;
+};
+
+static int
+any_addrinfos(struct hostname_resolution_store *resolution_store)
+{
+    return resolution_store->v6.ai || resolution_store->v4.ai;
+}
+
+static struct timespec
+current_clocktime_ts(void)
+{
+    struct timespec ts;
+    if ((clock_gettime(CLOCK_MONOTONIC, &ts)) < 0) {
+        rb_syserr_fail(errno, "clock_gettime(2)");
+    }
+    return ts;
+}
+
+static void
+set_timeout_tv(struct timeval *tv, long ms, struct timespec from)
+{
+    long sec = ms / 1000;
+    long nsec = (ms % 1000) * 1000000;
+    long result_sec = from.tv_sec + sec;
+    long result_nsec = from.tv_nsec + nsec;
+
+    result_sec += result_nsec / 1000000000;
+    result_nsec = result_nsec % 1000000000;
+
+    tv->tv_sec = result_sec;
+    tv->tv_usec = (int)(result_nsec / 1000);
+}
+
+static struct timeval
+add_ts_to_tv(struct timeval tv, struct timespec ts)
+{
+    long ts_usec = ts.tv_nsec / 1000;
+    tv.tv_sec += ts.tv_sec;
+    tv.tv_usec += ts_usec;
+
+    if (tv.tv_usec >= 1000000) {
+        tv.tv_sec += tv.tv_usec / 1000000;
+        tv.tv_usec = tv.tv_usec % 1000000;
+    }
+
+    return tv;
+}
+
+static VALUE
+tv_to_seconds(struct timeval *timeout) {
+    if (timeout == NULL) return Qnil;
+
+    double seconds = (double)timeout->tv_sec + (double)timeout->tv_usec / 1000000.0;
+
+    return DBL2NUM(seconds);
+}
+
+static int
+is_infinity(struct timeval tv)
+{
+    // { -1, -1 } as infinity
+    return tv.tv_sec == -1 || tv.tv_usec == -1;
+}
+
+static int
+is_timeout_tv(struct timeval *timeout_tv, struct timespec now) {
+    if (!timeout_tv) return false;
+    if (timeout_tv->tv_sec == -1 && timeout_tv->tv_usec == -1) return false;
+
+    struct timespec ts;
+    ts.tv_sec = timeout_tv->tv_sec;
+    ts.tv_nsec = timeout_tv->tv_usec * 1000;
+
+    if (now.tv_sec > ts.tv_sec) return true;
+    if (now.tv_sec == ts.tv_sec && now.tv_nsec >= ts.tv_nsec) return true;
+    return false;
+}
+
+static struct timeval *
+select_expires_at(
+    struct hostname_resolution_store *resolution_store,
+    struct timeval *resolution_delay,
+    struct timeval *connection_attempt_delay,
+    struct timeval *user_specified_resolv_timeout_at,
+    struct timeval *user_specified_connect_timeout_at
+) {
+    if (any_addrinfos(resolution_store)) {
+        return resolution_delay ? resolution_delay : connection_attempt_delay;
+    }
+
+    struct timeval *timeout = NULL;
+
+    if (user_specified_resolv_timeout_at) {
+        if (is_infinity(*user_specified_resolv_timeout_at)) return NULL;
+        timeout = user_specified_resolv_timeout_at;
+    }
+
+    if (user_specified_connect_timeout_at) {
+        if (is_infinity(*user_specified_connect_timeout_at)) return NULL;
+        if (!timeout || timercmp(user_specified_connect_timeout_at, timeout, >)) {
+            return user_specified_connect_timeout_at;
+        }
+    }
+
+    return timeout;
+}
+
+static struct timeval
+tv_to_timeout(struct timeval *ends_at, struct timespec now)
+{
+    struct timeval delay;
+    struct timespec expires_at;
+    expires_at.tv_sec = ends_at->tv_sec;
+    expires_at.tv_nsec = ends_at->tv_usec * 1000;
+
+    struct timespec diff;
+    diff.tv_sec = expires_at.tv_sec - now.tv_sec;
+
+    if (expires_at.tv_nsec >= now.tv_nsec) {
+        diff.tv_nsec = expires_at.tv_nsec - now.tv_nsec;
+    } else {
+        diff.tv_sec -= 1;
+        diff.tv_nsec = (1000000000 + expires_at.tv_nsec) - now.tv_nsec;
+    }
+
+    delay.tv_sec = diff.tv_sec;
+    delay.tv_usec = (int)diff.tv_nsec / 1000;
+
+    return delay;
+}
+
+static struct addrinfo *
+pick_addrinfo(struct hostname_resolution_store *resolution_store, int last_family)
+{
+    int priority_on_v6[2] = { AF_INET6, AF_INET };
+    int priority_on_v4[2] = { AF_INET, AF_INET6 };
+    int *precedences = last_family == AF_INET6 ? priority_on_v4 : priority_on_v6;
+    struct addrinfo *selected_ai = NULL;
+
+    for (int i = 0; i < 2; i++) {
+        if (precedences[i] == AF_INET6) {
+            selected_ai = resolution_store->v6.ai;
+            if (selected_ai) {
+                resolution_store->v6.ai = selected_ai->ai_next;
+                break;
+            }
+        } else {
+            selected_ai = resolution_store->v4.ai;
+            if (selected_ai) {
+                resolution_store->v4.ai = selected_ai->ai_next;
+                break;
+            }
+        }
+    }
+    return selected_ai;
+}
+
+static void
+socket_nonblock_set(int fd)
+{
+    int flags = fcntl(fd, F_GETFL);
+
+    if (flags < 0) rb_syserr_fail(errno, "fcntl(2)");
+    if ((flags & O_NONBLOCK) != 0) return;
+
+    flags |= O_NONBLOCK;
+
+    if (fcntl(fd, F_SETFL, flags) < 0) rb_syserr_fail(errno, "fcntl(2)");
+    return;
+}
+
+static int
+in_progress_fds(int fds_size)
+{
+    return fds_size > 0;
+}
+
+static void
+remove_connection_attempt_fd(int *fds, int *fds_size, int removing_fd) {
+    int i, j;
+
+    for (i = 0; i < *fds_size; i++) {
+        if (fds[i] != removing_fd) continue;
+
+        for (j = i; j < *fds_size - 1; j++) {
+            fds[j] = fds[j + 1];
+        }
+
+        (*fds_size)--;
+        fds[*fds_size] = -1;
+        break;
+    }
+}
+
+struct fast_fallback_error
+{
+    int type;
+    int ecode;
+};
+
+static VALUE
+init_fast_fallback_inetsock_internal(VALUE v)
+{
+    struct fast_fallback_inetsock_arg *arg = (void *)v;
+    VALUE io = arg->io;
+    VALUE resolv_timeout = arg->resolv_timeout;
+    VALUE connect_timeout = arg->connect_timeout;
+    VALUE test_mode_settings = arg->test_mode_settings;
+    struct addrinfo *remote_ai = NULL, *local_ai = NULL;
+    int connected_fd = -1, status = 0, local_status = 0;
+    int remote_addrinfo_hints = 0;
+    struct fast_fallback_error last_error = { 0, 0 };
+    const char *syscall = 0;
+    VALUE host, serv;
+
+    #ifdef HAVE_CONST_AI_ADDRCONFIG
+    remote_addrinfo_hints |= AI_ADDRCONFIG;
+    #endif
+
+    pthread_t threads[arg->family_size];
+    char resolved_type[2];
+    ssize_t resolved_type_size;
+    int hostname_resolution_waiter = -1, hostname_resolution_notifier = -1;
+    int pipefd[2];
+
+    int nfds = 0;
+    struct timeval *ends_at = NULL;
+    struct timeval delay = (struct timeval){ -1, -1 };
+    struct timeval *delay_p = NULL;
+
+    struct hostname_resolution_store resolution_store;
+    resolution_store.is_all_finished = false;
+    resolution_store.v6.ai = NULL;
+    resolution_store.v6.finished = false;
+    resolution_store.v6.has_error = false;
+    resolution_store.v4.ai = NULL;
+    resolution_store.v4.finished = false;
+    resolution_store.v4.has_error = false;
+
+    int last_family = 0;
+    int additional_capacity = 10;
+    int current_capacity = additional_capacity;
+    arg->connection_attempt_fds = allocate_connection_attempt_fds(additional_capacity);
+    arg->connection_attempt_fds_size = 0;
+
+    struct timeval resolution_delay_storage;
+    struct timeval *resolution_delay_expires_at = NULL;
+    struct timeval connection_attempt_delay_strage;
+    struct timeval *connection_attempt_delay_expires_at = NULL;
+    struct timeval user_specified_resolv_timeout_storage;
+    struct timeval *user_specified_resolv_timeout_at = NULL;
+    struct timeval user_specified_connect_timeout_storage;
+    struct timeval *user_specified_connect_timeout_at = NULL;
+    struct timespec now = current_clocktime_ts();
+
+    /* start of hostname resolution */
+    if (arg->family_size == 1) {
+        arg->wait = -1;
+        arg->getaddrinfo_shared = NULL;
+
+        int family = arg->families[0];
+        unsigned int t = NIL_P(resolv_timeout) ? 0 : rsock_value_timeout_to_msec(resolv_timeout);
+
+        arg->remote.res = rsock_addrinfo(
+            arg->remote.host,
+            arg->remote.serv,
+            family,
+            SOCK_STREAM,
+            0,
+            t
+        );
+
+        if (family == AF_INET6) {
+            resolution_store.v6.ai = arg->remote.res->ai;
+            resolution_store.v6.finished = true;
+            resolution_store.v4.finished = true;
+        } else if (family == AF_INET) {
+            resolution_store.v4.ai = arg->remote.res->ai;
+            resolution_store.v4.finished = true;
+            resolution_store.v6.finished = true;
+        }
+        resolution_store.is_all_finished = true;
+    } else {
+        if (pipe(pipefd) != 0) rb_syserr_fail(errno, "pipe(2)");
+        hostname_resolution_waiter = pipefd[0];
+        int waiter_flags = fcntl(hostname_resolution_waiter, F_GETFL, 0);
+        if (waiter_flags < 0) rb_syserr_fail(errno, "fcntl(2)");
+        if ((fcntl(hostname_resolution_waiter, F_SETFL, waiter_flags | O_NONBLOCK)) < 0) {
+            rb_syserr_fail(errno, "fcntl(2)");
+        }
+        arg->wait = hostname_resolution_waiter;
+        hostname_resolution_notifier = pipefd[1];
+
+        arg->getaddrinfo_shared = allocate_fast_fallback_getaddrinfo_shared(arg->family_size);
+        if (!arg->getaddrinfo_shared) rb_syserr_fail(errno, "calloc(3)");
+
+        rb_nativethread_lock_initialize(&arg->getaddrinfo_shared->lock);
+        arg->getaddrinfo_shared->notify = hostname_resolution_notifier;
+
+        arg->getaddrinfo_shared->node = arg->hostp ? ruby_strdup(arg->hostp) : NULL;
+        arg->getaddrinfo_shared->service = arg->portp ? ruby_strdup(arg->portp) : NULL;
+        arg->getaddrinfo_shared->refcount = arg->family_size + 1;
+
+        for (int i = 0; i < arg->family_size; i++) {
+            arg->getaddrinfo_entries[i] = &arg->getaddrinfo_shared->getaddrinfo_entries[i];
+            arg->getaddrinfo_entries[i]->shared = arg->getaddrinfo_shared;
+
+            struct addrinfo getaddrinfo_hints[arg->family_size];
+
+            allocate_fast_fallback_getaddrinfo_hints(
+                &getaddrinfo_hints[i],
+                arg->families[i],
+                remote_addrinfo_hints,
+                arg->additional_flags
+            );
+
+            arg->getaddrinfo_entries[i]->hints = getaddrinfo_hints[i];
+            arg->getaddrinfo_entries[i]->ai = NULL;
+            arg->getaddrinfo_entries[i]->family = arg->families[i];
+            arg->getaddrinfo_entries[i]->refcount = 2;
+            arg->getaddrinfo_entries[i]->has_syserr = false;
+            arg->getaddrinfo_entries[i]->test_sleep_ms = 0;
+            arg->getaddrinfo_entries[i]->test_ecode = 0;
+
+            /* for testing HEv2 */
+            if (!NIL_P(test_mode_settings) && RB_TYPE_P(test_mode_settings, T_HASH)) {
+                const char *family_sym = arg->families[i] == AF_INET6 ? "ipv6" : "ipv4";
+
+                VALUE test_delay_setting = rb_hash_aref(test_mode_settings, ID2SYM(rb_intern("delay")));
+                if (!NIL_P(test_delay_setting)) {
+                    VALUE rb_test_delay_ms = rb_hash_aref(test_delay_setting, ID2SYM(rb_intern(family_sym)));
+                    long test_delay_ms = NIL_P(rb_test_delay_ms) ? 0 : rb_test_delay_ms;
+                    arg->getaddrinfo_entries[i]->test_sleep_ms = test_delay_ms;
+                }
+
+                VALUE test_error_setting = rb_hash_aref(test_mode_settings, ID2SYM(rb_intern("error")));
+                if (!NIL_P(test_error_setting)) {
+                    VALUE rb_test_ecode = rb_hash_aref(test_error_setting, ID2SYM(rb_intern(family_sym)));
+                    if (!NIL_P(rb_test_ecode)) {
+                        arg->getaddrinfo_entries[i]->test_ecode = NUM2INT(rb_test_ecode);
+                    }
+                }
+            }
+
+            if (raddrinfo_pthread_create(&threads[i], fork_safe_do_fast_fallback_getaddrinfo, arg->getaddrinfo_entries[i]) != 0) {
+                rsock_raise_resolution_error("getaddrinfo(3)", EAI_AGAIN);
+            }
+            pthread_detach(threads[i]);
+        }
+
+        if (NIL_P(resolv_timeout)) {
+            user_specified_resolv_timeout_storage = (struct timeval){ -1, -1 };
+        } else {
+            struct timeval resolv_timeout_tv = rb_time_interval(resolv_timeout);
+            user_specified_resolv_timeout_storage = add_ts_to_tv(resolv_timeout_tv, now);
+        }
+        user_specified_resolv_timeout_at = &user_specified_resolv_timeout_storage;
+    }
+
+    while (true) {
+        /* start of connection */
+        if (any_addrinfos(&resolution_store) &&
+            !resolution_delay_expires_at &&
+            !connection_attempt_delay_expires_at) {
+            while ((remote_ai = pick_addrinfo(&resolution_store, last_family))) {
+                int fd = -1;
+
+                #if !defined(INET6) && defined(AF_INET6)
+                if (remote_ai->ai_family == AF_INET6) {
+                    if (any_addrinfos(&resolution_store)) continue;
+                    if (!in_progress_fds(arg->connection_attempt_fds_size)) break;
+                    if (resolution_store.is_all_finished) break;
+
+                    if (local_status < 0) {
+                        host = arg->local.host;
+                        serv = arg->local.serv;
+                    } else {
+                        host = arg->remote.host;
+                        serv = arg->remote.serv;
+                    }
+                    if (last_error.type == RESOLUTION_ERROR) {
+                        rsock_raise_resolution_error(syscall, last_error.ecode);
+                    } else {
+                        rsock_syserr_fail_host_port(last_error.ecode, syscall, host, serv);
+                    }
+                }
+                #endif
+
+                local_ai = NULL;
+
+                if (arg->local.res) {
+                    for (local_ai = arg->local.res->ai; local_ai; local_ai = local_ai->ai_next) {
+                        if (local_ai->ai_family == remote_ai->ai_family) break;
+                    }
+                    if (!local_ai) {
+                        if (any_addrinfos(&resolution_store)) continue;
+                        if (in_progress_fds(arg->connection_attempt_fds_size)) break;
+                        if (!resolution_store.is_all_finished) break;
+
+                        /* Use a different family local address if no choice, this
+                         * will cause EAFNOSUPPORT. */
+                        rsock_syserr_fail_host_port(EAFNOSUPPORT, syscall, arg->local.host, arg->local.serv);
+                    }
+                }
+
+                status = rsock_socket(remote_ai->ai_family, remote_ai->ai_socktype, remote_ai->ai_protocol);
+                syscall = "socket(2)";
+
+                if (status < 0) {
+                    last_error.type = SYSCALL_ERROR;
+                    last_error.ecode = errno;
+
+                    if (any_addrinfos(&resolution_store)) continue;
+                    if (in_progress_fds(arg->connection_attempt_fds_size)) break;
+                    if (!resolution_store.is_all_finished) break;
+
+                    if (local_status < 0) {
+                        host = arg->local.host;
+                        serv = arg->local.serv;
+                    } else {
+                        host = arg->remote.host;
+                        serv = arg->remote.serv;
+                    }
+                    if (last_error.type == RESOLUTION_ERROR) {
+                        rsock_raise_resolution_error(syscall, last_error.ecode);
+                    } else {
+                        rsock_syserr_fail_host_port(last_error.ecode, syscall, host, serv);
+                    }
+                }
+
+                fd = status;
+
+                if (local_ai) {
+                    #if !defined(_WIN32) && !defined(__CYGWIN__)
+                    status = 1;
+                    if ((setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, (char*)&status, (socklen_t)sizeof(status))) < 0) {
+                        rb_syserr_fail(errno, "setsockopt(2)");
+                    }
+                    #endif
+                    status = bind(fd, local_ai->ai_addr, local_ai->ai_addrlen);
+                    local_status = status;
+                    syscall = "bind(2)";
+
+                    if (status < 0) {
+                        last_error.type = SYSCALL_ERROR;
+                        last_error.ecode = errno;
+                        close(fd);
+
+                        if (any_addrinfos(&resolution_store)) continue;
+                        if (in_progress_fds(arg->connection_attempt_fds_size)) break;
+                        if (!resolution_store.is_all_finished) break;
+
+                        if (local_status < 0) {
+                            host = arg->local.host;
+                            serv = arg->local.serv;
+                        } else {
+                            host = arg->remote.host;
+                            serv = arg->remote.serv;
+                        }
+                        if (last_error.type == RESOLUTION_ERROR) {
+                            rsock_raise_resolution_error(syscall, last_error.ecode);
+                        } else {
+                            rsock_syserr_fail_host_port(last_error.ecode, syscall, host, serv);
+                        }
+                    }
+                }
+
+                syscall = "connect(2)";
+
+                if (any_addrinfos(&resolution_store) ||
+                    in_progress_fds(arg->connection_attempt_fds_size) ||
+                    !resolution_store.is_all_finished) {
+                    socket_nonblock_set(fd);
+                    status = connect(fd, remote_ai->ai_addr, remote_ai->ai_addrlen);
+                    last_family = remote_ai->ai_family;
+                } else {
+                    if (!NIL_P(connect_timeout)) {
+                        user_specified_connect_timeout_storage = rb_time_interval(connect_timeout);
+                        user_specified_connect_timeout_at = &user_specified_connect_timeout_storage;
+                    }
+
+                    VALUE timeout =
+                        (user_specified_connect_timeout_at && is_infinity(*user_specified_connect_timeout_at)) ?
+                        Qnil : tv_to_seconds(user_specified_connect_timeout_at);
+                    io = arg->io = rsock_init_sock(arg->self, fd);
+                    status = rsock_connect(io, remote_ai->ai_addr, remote_ai->ai_addrlen, 0, timeout);
+                }
+
+                if (status == 0) {
+                    connected_fd = fd;
+                    break;
+                }
+
+                if (errno == EINPROGRESS) {
+                    if (current_capacity == arg->connection_attempt_fds_size) {
+                        current_capacity = reallocate_connection_attempt_fds(
+                            &arg->connection_attempt_fds,
+                            current_capacity,
+                            additional_capacity
+                        );
+                    }
+                    arg->connection_attempt_fds[arg->connection_attempt_fds_size] = fd;
+                    (arg->connection_attempt_fds_size)++;
+
+                    set_timeout_tv(&connection_attempt_delay_strage, 250, now);
+                    connection_attempt_delay_expires_at = &connection_attempt_delay_strage;
+
+                    if (!any_addrinfos(&resolution_store)) {
+                        if (NIL_P(connect_timeout)) {
+                            user_specified_connect_timeout_storage = (struct timeval){ -1, -1 };
+                        } else {
+                            struct timeval connect_timeout_tv = rb_time_interval(connect_timeout);
+                            user_specified_connect_timeout_storage = add_ts_to_tv(connect_timeout_tv, now);
+                        }
+                        user_specified_connect_timeout_at = &user_specified_connect_timeout_storage;
+                    }
+
+                    break;
+                }
+
+                last_error.type = SYSCALL_ERROR;
+                last_error.ecode = errno;
+
+                if (NIL_P(io)) {
+                    close(fd);
+                } else {
+                    rb_io_close(io);
+                }
+
+                if (any_addrinfos(&resolution_store)) continue;
+                if (in_progress_fds(arg->connection_attempt_fds_size)) break;
+                if (!resolution_store.is_all_finished) break;
+
+                if (local_status < 0) {
+                    host = arg->local.host;
+                    serv = arg->local.serv;
+                } else {
+                    host = arg->remote.host;
+                    serv = arg->remote.serv;
+                }
+                if (last_error.type == RESOLUTION_ERROR) {
+                    rsock_raise_resolution_error(syscall, last_error.ecode);
+                } else {
+                    rsock_syserr_fail_host_port(last_error.ecode, syscall, host, serv);
+                }
+            }
+        }
+
+        if (connected_fd >= 0) break;
+
+        ends_at = select_expires_at(
+            &resolution_store,
+            resolution_delay_expires_at,
+            connection_attempt_delay_expires_at,
+            user_specified_resolv_timeout_at,
+            user_specified_connect_timeout_at
+        );
+        if (ends_at) {
+            delay = tv_to_timeout(ends_at, now);
+            delay_p = &delay;
+        } else {
+            if (((resolution_store.v6.finished && !resolution_store.v4.finished) ||
+                (resolution_store.v4.finished && !resolution_store.v6.finished)) &&
+                !any_addrinfos(&resolution_store) &&
+                !in_progress_fds(arg->connection_attempt_fds_size)) {
+                /* A limited timeout is introduced to prevent select(2) from hanging when it is exclusively
+                 * waiting for name resolution and write(2) failure occurs in a child thread. */
+                delay.tv_sec = 0;
+                delay.tv_usec = 50000;
+                delay_p = &delay;
+            } else {
+                delay_p = NULL;
+            }
+        }
+
+        nfds = 0;
+        rb_fd_zero(&arg->writefds);
+        if (in_progress_fds(arg->connection_attempt_fds_size)) {
+            int n = 0;
+            for (int i = 0; i < arg->connection_attempt_fds_size; i++) {
+                int cfd = arg->connection_attempt_fds[i];
+                if (cfd < 0) continue;
+                if (cfd > n) n = cfd;
+                rb_fd_set(cfd, &arg->writefds);
+            }
+            if (n > 0) n++;
+            nfds = n;
+        }
+
+        rb_fd_zero(&arg->readfds);
+        if (arg->family_size > 1) {
+            rb_fd_set(hostname_resolution_waiter, &arg->readfds);
+
+            if ((hostname_resolution_waiter + 1) > nfds) {
+                nfds = hostname_resolution_waiter + 1;
+            }
+        }
+
+        status = rb_thread_fd_select(nfds, &arg->readfds, &arg->writefds, NULL, delay_p);
+
+        now = current_clocktime_ts();
+        if (is_timeout_tv(resolution_delay_expires_at, now)) {
+            resolution_delay_expires_at = NULL;
+        }
+        if (is_timeout_tv(connection_attempt_delay_expires_at, now)) {
+            connection_attempt_delay_expires_at = NULL;
+        }
+
+        if (status < 0 && (errno && errno != EINTR)) rb_syserr_fail(errno, "select(2)");
+
+        if (status > 0) {
+            /* check for connection */
+            if (in_progress_fds(arg->connection_attempt_fds_size)) {
+                for (int i = 0; i < arg->connection_attempt_fds_size; i++) {
+                    int fd = arg->connection_attempt_fds[i];
+                    if (fd < 0 || !rb_fd_isset(fd, &arg->writefds)) continue;
+
+                    int err;
+                    socklen_t len = sizeof(err);
+
+                    status = getsockopt(fd, SOL_SOCKET, SO_ERROR, &err, &len);
+
+                    if (status < 0) {
+                        last_error.type = SYSCALL_ERROR;
+                        last_error.ecode = errno;
+                        close(fd);
+
+                        if (any_addrinfos(&resolution_store)) continue;
+                        if (in_progress_fds(arg->connection_attempt_fds_size)) break;
+                        if (!resolution_store.is_all_finished) break;
+
+                        if (local_status < 0) {
+                            host = arg->local.host;
+                            serv = arg->local.serv;
+                        } else {
+                            host = arg->remote.host;
+                            serv = arg->remote.serv;
+                        }
+                        if (last_error.type == RESOLUTION_ERROR) {
+                            rsock_raise_resolution_error(syscall, last_error.ecode);
+                        } else {
+                            rsock_syserr_fail_host_port(last_error.ecode, syscall, host, serv);
+                        }
+                    }
+
+                    if (err == 0) { /* success */
+                        remove_connection_attempt_fd(
+                            arg->connection_attempt_fds,
+                            &arg->connection_attempt_fds_size,
+                            fd
+                        );
+                        connected_fd = fd;
+                        break;
+                    } else { /* fail */
+                        close(fd);
+                        remove_connection_attempt_fd(
+                            arg->connection_attempt_fds,
+                            &arg->connection_attempt_fds_size,
+                            fd
+                        );
+                        last_error.type = SYSCALL_ERROR;
+                        last_error.ecode = err;
+                    }
+                }
+
+                if (connected_fd >= 0) break;
+
+                if (!in_progress_fds(arg->connection_attempt_fds_size)) {
+                    if (!any_addrinfos(&resolution_store) && resolution_store.is_all_finished) {
+                        if (local_status < 0) {
+                            host = arg->local.host;
+                            serv = arg->local.serv;
+                        } else {
+                            host = arg->remote.host;
+                            serv = arg->remote.serv;
+                        }
+                        if (last_error.type == RESOLUTION_ERROR) {
+                            rsock_raise_resolution_error(syscall, last_error.ecode);
+                        } else {
+                            rsock_syserr_fail_host_port(last_error.ecode, syscall, host, serv);
+                        }
+                    }
+                    connection_attempt_delay_expires_at = NULL;
+                    user_specified_connect_timeout_at = NULL;
+                }
+            }
+
+            /* check for hostname resolution */
+            if (!resolution_store.is_all_finished && rb_fd_isset(hostname_resolution_waiter, &arg->readfds)) {
+                while (true) {
+                    resolved_type_size = read(
+                        hostname_resolution_waiter,
+                        resolved_type,
+                        sizeof(resolved_type) - 1
+                    );
+
+                    if (resolved_type_size > 0) {
+                        resolved_type[resolved_type_size] = '\0';
+
+                        if (resolved_type[0] == IPV6_HOSTNAME_RESOLVED) {
+                            resolution_store.v6.finished = true;
+
+                            if (arg->getaddrinfo_entries[IPV6_ENTRY_POS]->err &&
+                                arg->getaddrinfo_entries[IPV6_ENTRY_POS]->err != EAI_ADDRFAMILY) {
+                                if (!resolution_store.v4.finished || resolution_store.v4.has_error) {
+                                    last_error.type = RESOLUTION_ERROR;
+                                    last_error.ecode = arg->getaddrinfo_entries[IPV6_ENTRY_POS]->err;
+                                    syscall = "getaddrinfo(3)";
+                                }
+                                resolution_store.v6.has_error = true;
+                            } else {
+                                resolution_store.v6.ai = arg->getaddrinfo_entries[IPV6_ENTRY_POS]->ai;
+                            }
+                            if (resolution_store.v4.finished) {
+                                resolution_store.is_all_finished = true;
+                                resolution_delay_expires_at = NULL;
+                                user_specified_resolv_timeout_at = NULL;
+                                break;
+                            }
+                        } else if (resolved_type[0] == IPV4_HOSTNAME_RESOLVED) {
+                            resolution_store.v4.finished = true;
+
+                            if (arg->getaddrinfo_entries[IPV4_ENTRY_POS]->err) {
+                                if (!resolution_store.v6.finished || resolution_store.v6.has_error) {
+                                    last_error.type = RESOLUTION_ERROR;
+                                    last_error.ecode = arg->getaddrinfo_entries[IPV4_ENTRY_POS]->err;
+                                    syscall = "getaddrinfo(3)";
+                                }
+                                resolution_store.v4.has_error = true;
+                            } else {
+                                resolution_store.v4.ai = arg->getaddrinfo_entries[IPV4_ENTRY_POS]->ai;
+                            }
+
+                            if (resolution_store.v6.finished) {
+                                resolution_store.is_all_finished = true;
+                                resolution_delay_expires_at = NULL;
+                                user_specified_resolv_timeout_at = NULL;
+                                break;
+                            }
+                        } else {
+                            /* Retry to read from hostname_resolution_waiter */
+                        }
+                    } else if (resolved_type_size < 0 && (errno == EAGAIN || errno == EWOULDBLOCK)) {
+                        errno = 0;
+                        break;
+                    } else {
+                        /* Retry to read from hostname_resolution_waiter */
+                    }
+
+                    if (!resolution_store.v6.finished &&
+                        resolution_store.v4.finished &&
+                        !resolution_store.v4.has_error) {
+                        set_timeout_tv(&resolution_delay_storage, 50, now);
+                        resolution_delay_expires_at = &resolution_delay_storage;
+                    }
+                }
+            }
+
+            status = 0;
+        }
+
+        /* For cases where write(2) fails in child threads */
+        if (!resolution_store.is_all_finished) {
+            if (!resolution_store.v6.finished && arg->getaddrinfo_entries[IPV6_ENTRY_POS]->has_syserr) {
+                resolution_store.v6.finished = true;
+
+                if (arg->getaddrinfo_entries[IPV6_ENTRY_POS]->err) {
+                    if (!resolution_store.v4.finished || resolution_store.v4.has_error) {
+                        last_error.type = RESOLUTION_ERROR;
+                        last_error.ecode = arg->getaddrinfo_entries[IPV6_ENTRY_POS]->err;
+                        syscall = "getaddrinfo(3)";
+                    }
+                    resolution_store.v6.has_error = true;
+                } else {
+                    resolution_store.v6.ai = arg->getaddrinfo_entries[IPV6_ENTRY_POS]->ai;
+                }
+
+                if (resolution_store.v4.finished) {
+                    resolution_store.is_all_finished = true;
+                    resolution_delay_expires_at = NULL;
+                    user_specified_resolv_timeout_at = NULL;
+                }
+            }
+            if (!resolution_store.v4.finished && arg->getaddrinfo_entries[IPV4_ENTRY_POS]->has_syserr) {
+                resolution_store.v4.finished = true;
+
+                if (arg->getaddrinfo_entries[IPV4_ENTRY_POS]->err) {
+                    if (!resolution_store.v6.finished || resolution_store.v6.has_error) {
+                        last_error.type = RESOLUTION_ERROR;
+                        last_error.ecode = arg->getaddrinfo_entries[IPV4_ENTRY_POS]->err;
+                        syscall = "getaddrinfo(3)";
+                    }
+                    resolution_store.v4.has_error = true;
+                } else {
+                    resolution_store.v4.ai = arg->getaddrinfo_entries[IPV4_ENTRY_POS]->ai;
+                }
+
+                if (resolution_store.v6.finished) {
+                    resolution_store.is_all_finished = true;
+                    resolution_delay_expires_at = NULL;
+                    user_specified_resolv_timeout_at = NULL;
+                } else {
+                    set_timeout_tv(&resolution_delay_storage, 50, now);
+                    resolution_delay_expires_at = &resolution_delay_storage;
+                }
+            }
+        }
+
+        if (!any_addrinfos(&resolution_store)) {
+            if (!in_progress_fds(arg->connection_attempt_fds_size) &&
+                resolution_store.is_all_finished) {
+                if (local_status < 0) {
+                    host = arg->local.host;
+                    serv = arg->local.serv;
+                } else {
+                    host = arg->remote.host;
+                    serv = arg->remote.serv;
+                }
+                if (last_error.type == RESOLUTION_ERROR) {
+                    rsock_raise_resolution_error(syscall, last_error.ecode);
+                } else {
+                    rsock_syserr_fail_host_port(last_error.ecode, syscall, host, serv);
+                }
+            }
+
+            if ((is_timeout_tv(user_specified_resolv_timeout_at, now) ||
+                resolution_store.is_all_finished) &&
+                (is_timeout_tv(user_specified_connect_timeout_at, now) ||
+                !in_progress_fds(arg->connection_attempt_fds_size))) {
+                VALUE errno_module = rb_const_get(rb_cObject, rb_intern("Errno"));
+                VALUE etimedout_error = rb_const_get(errno_module, rb_intern("ETIMEDOUT"));
+                rb_raise(etimedout_error, "user specified timeout");
+            }
+        }
+    }
+
+    if (NIL_P(arg->io)) {
+        /* create new instance */
+        arg->io = rsock_init_sock(arg->self, connected_fd);
+    }
+
+    return arg->io;
+}
+
+static VALUE
+fast_fallback_inetsock_cleanup(VALUE v)
+{
+    struct fast_fallback_inetsock_arg *arg = (void *)v;
+    struct fast_fallback_getaddrinfo_shared *getaddrinfo_shared = arg->getaddrinfo_shared;
+
+    if (arg->remote.res) {
+        rb_freeaddrinfo(arg->remote.res);
+        arg->remote.res = 0;
+    }
+    if (arg->local.res) {
+        rb_freeaddrinfo(arg->local.res);
+        arg->local.res = 0;
+    }
+
+    if (arg->wait != -1) close(arg->wait);
+
+    if (getaddrinfo_shared) {
+        if (getaddrinfo_shared->notify != -1) close(getaddrinfo_shared->notify);
+        getaddrinfo_shared->notify = -1;
+
+        int shared_need_free = 0;
+        struct addrinfo *ais[arg->family_size];
+        for (int i = 0; i < arg->family_size; i++) ais[i] = NULL;
+
+        rb_nativethread_lock_lock(&getaddrinfo_shared->lock);
+        {
+            for (int i = 0; i < arg->family_size; i++) {
+                struct fast_fallback_getaddrinfo_entry *getaddrinfo_entry = arg->getaddrinfo_entries[i];
+
+                if (!getaddrinfo_entry) continue;
+
+                if (--(getaddrinfo_entry->refcount) == 0) {
+                    ais[i] = getaddrinfo_entry->ai;
+                    getaddrinfo_entry->ai = NULL;
+                }
+            }
+            if (--(getaddrinfo_shared->refcount) == 0) {
+                shared_need_free = 1;
+            }
+        }
+        rb_nativethread_lock_unlock(&getaddrinfo_shared->lock);
+
+        for (int i = 0; i < arg->family_size; i++) {
+            if (ais[i]) freeaddrinfo(ais[i]);
+        }
+        if (getaddrinfo_shared && shared_need_free) {
+            free_fast_fallback_getaddrinfo_shared(&getaddrinfo_shared);
+        }
+    }
+
+    int connection_attempt_fd;
+
+    for (int i = 0; i < arg->connection_attempt_fds_size; i++) {
+        connection_attempt_fd = arg->connection_attempt_fds[i];
+
+        if (connection_attempt_fd >= 0) {
+            int error = 0;
+            socklen_t len = sizeof(error);
+            getsockopt(connection_attempt_fd, SOL_SOCKET, SO_ERROR, &error, &len);
+            if (error == 0) shutdown(connection_attempt_fd, SHUT_RDWR);
+            close(connection_attempt_fd);
+       }
+    }
+
+    if (arg->readfds.fdset) rb_fd_term(&arg->readfds);
+    if (arg->writefds.fdset) rb_fd_term(&arg->writefds);
+
+    if (arg->connection_attempt_fds) {
+        free(arg->connection_attempt_fds);
+        arg->connection_attempt_fds = NULL;
+    }
+
+    return Qnil;
 }
 
 VALUE
-rsock_init_inetsock(VALUE sock, VALUE remote_host, VALUE remote_serv,
-                    VALUE local_host, VALUE local_serv, int type,
-                    VALUE resolv_timeout, VALUE connect_timeout)
+rsock_init_inetsock(VALUE self, VALUE remote_host, VALUE remote_serv, VALUE local_host, VALUE local_serv, int type, VALUE resolv_timeout, VALUE connect_timeout, VALUE fast_fallback, VALUE test_mode_settings)
 {
+    if (type == INET_CLIENT && FAST_FALLBACK_INIT_INETSOCK_IMPL == 1 && RTEST(fast_fallback)) {
+        struct rb_addrinfo *local_res = NULL;
+        char *hostp, *portp;
+        char hbuf[NI_MAXHOST], pbuf[NI_MAXSERV];
+        int additional_flags = 0;
+        hostp = raddrinfo_host_str(remote_host, hbuf, sizeof(hbuf), &additional_flags);
+        portp = raddrinfo_port_str(remote_serv, pbuf, sizeof(pbuf), &additional_flags);
+
+        if (!is_specified_ip_address(hostp)) {
+            int target_families[2] = { 0, 0 };
+            int resolving_family_size = 0;
+
+            /*
+             * Maybe also accept a local address
+             */
+            if (!NIL_P(local_host) || !NIL_P(local_serv)) {
+                local_res = rsock_addrinfo(
+                    local_host,
+                    local_serv,
+                    AF_UNSPEC,
+                    SOCK_STREAM,
+                    0,
+                    0
+                );
+
+                struct addrinfo *tmp_p = local_res->ai;
+                for (tmp_p; tmp_p != NULL; tmp_p = tmp_p->ai_next) {
+                    if (target_families[0] == 0 && tmp_p->ai_family == AF_INET6) {
+                        target_families[0] = AF_INET6;
+                        resolving_family_size++;
+                    }
+                    if (target_families[1] == 0 && tmp_p->ai_family == AF_INET) {
+                        target_families[1] = AF_INET;
+                        resolving_family_size++;
+                    }
+                }
+            }  else {
+                resolving_family_size = 2;
+                target_families[0] = AF_INET6;
+                target_families[1] = AF_INET;
+            }
+
+            struct fast_fallback_inetsock_arg fast_fallback_arg;
+            memset(&fast_fallback_arg, 0, sizeof(fast_fallback_arg));
+
+            fast_fallback_arg.self = self;
+            fast_fallback_arg.io = Qnil;
+            fast_fallback_arg.remote.host = remote_host;
+            fast_fallback_arg.remote.serv = remote_serv;
+            fast_fallback_arg.remote.res = 0;
+            fast_fallback_arg.local.host = local_host;
+            fast_fallback_arg.local.serv = local_serv;
+            fast_fallback_arg.local.res = local_res;
+            fast_fallback_arg.type = type;
+            fast_fallback_arg.resolv_timeout = resolv_timeout;
+            fast_fallback_arg.connect_timeout = connect_timeout;
+            fast_fallback_arg.hostp = hostp;
+            fast_fallback_arg.portp = portp;
+            fast_fallback_arg.additional_flags = additional_flags;
+
+            int resolving_families[resolving_family_size];
+            int resolving_family_index = 0;
+            for (int i = 0; 2 > i; i++) {
+                if (target_families[i] != 0) {
+                    resolving_families[resolving_family_index] = target_families[i];
+                    resolving_family_index++;
+                }
+            }
+            fast_fallback_arg.families = resolving_families;
+            fast_fallback_arg.family_size = resolving_family_size;
+            fast_fallback_arg.test_mode_settings = test_mode_settings;
+
+            rb_fd_init(&fast_fallback_arg.readfds);
+            rb_fd_init(&fast_fallback_arg.writefds);
+
+            return rb_ensure(init_fast_fallback_inetsock_internal, (VALUE)&fast_fallback_arg,
+                             fast_fallback_inetsock_cleanup, (VALUE)&fast_fallback_arg);
+        }
+    }
+
     struct inetsock_arg arg;
-    arg.sock = sock;
+    arg.self = self;
+    arg.io = Qnil;
     arg.remote.host = remote_host;
     arg.remote.serv = remote_serv;
     arg.remote.res = 0;
@@ -181,13 +1312,15 @@ rsock_init_inetsock(VALUE sock, VALUE remote_host, VALUE remote_serv,
     arg.local.serv = local_serv;
     arg.local.res = 0;
     arg.type = type;
-    arg.fd = -1;
     arg.resolv_timeout = resolv_timeout;
     arg.connect_timeout = connect_timeout;
+
     return rb_ensure(init_inetsock_internal, (VALUE)&arg,
                      inetsock_cleanup, (VALUE)&arg);
 }
 
+#endif
+
 static ID id_numeric, id_hostname;
 
 int
@@ -274,16 +1407,13 @@ ip_inspect(VALUE sock)
 static VALUE
 ip_addr(int argc, VALUE *argv, VALUE sock)
 {
-    rb_io_t *fptr;
     union_sockaddr addr;
     socklen_t len = (socklen_t)sizeof addr;
     int norevlookup;
 
-    GetOpenFile(sock, fptr);
-
     if (argc < 1 || !rsock_revlookup_flag(argv[0], &norevlookup))
-        norevlookup = fptr->mode & FMODE_NOREVLOOKUP;
-    if (getsockname(fptr->fd, &addr.addr, &len) < 0)
+        norevlookup = rb_io_mode(sock) & FMODE_NOREVLOOKUP;
+    if (getsockname(rb_io_descriptor(sock), &addr.addr, &len) < 0)
         rb_sys_fail("getsockname(2)");
     return rsock_ipaddr(&addr.addr, len, norevlookup);
 }
@@ -315,16 +1445,13 @@ ip_addr(int argc, VALUE *argv, VALUE sock)
 static VALUE
 ip_peeraddr(int argc, VALUE *argv, VALUE sock)
 {
-    rb_io_t *fptr;
     union_sockaddr addr;
     socklen_t len = (socklen_t)sizeof addr;
     int norevlookup;
 
-    GetOpenFile(sock, fptr);
-
     if (argc < 1 || !rsock_revlookup_flag(argv[0], &norevlookup))
-        norevlookup = fptr->mode & FMODE_NOREVLOOKUP;
-    if (getpeername(fptr->fd, &addr.addr, &len) < 0)
+        norevlookup = rb_io_mode(sock) & FMODE_NOREVLOOKUP;
+    if (getpeername(rb_io_descriptor(sock), &addr.addr, &len) < 0)
         rb_sys_fail("getpeername(2)");
     return rsock_ipaddr(&addr.addr, len, norevlookup);
 }
@@ -372,7 +1499,7 @@ static VALUE
 ip_s_getaddress(VALUE obj, VALUE host)
 {
     union_sockaddr addr;
-    struct rb_addrinfo *res = rsock_addrinfo(host, Qnil, AF_UNSPEC, SOCK_STREAM, 0);
+    struct rb_addrinfo *res = rsock_addrinfo(host, Qnil, AF_UNSPEC, SOCK_STREAM, 0, 0);
     socklen_t len = res->ai->ai_addrlen;
 
     /* just take the first one */
diff --git a/ext/socket/lib/socket.rb b/ext/socket/lib/socket.rb
index eecdc7d4b8b2e6..7c3f6f5b91baa9 100644
--- a/ext/socket/lib/socket.rb
+++ b/ext/socket/lib/socket.rb
@@ -333,9 +333,10 @@ def sendmsg_nonblock(mesg, flags = 0, dest_sockaddr = nil, *controls,
   # _flags_ is zero or more of the +MSG_+ options.
   # The result, _mesg_, is the data received.
   #
-  # When recvfrom(2) returns 0, Socket#recv_nonblock returns
-  # an empty string as data.
-  # The meaning depends on the socket: EOF on TCP, empty packet on UDP, etc.
+  # When recvfrom(2) returns 0, Socket#recv_nonblock returns nil.
+  # In most cases it means the connection was closed, but for UDP connections
+  # it may mean an empty packet was received, as the underlying API makes
+  # it impossible to distinguish these two cases.
   #
   # === Parameters
   # * +maxlen+ - the number of bytes to receive from the socket
@@ -480,9 +481,10 @@ def ipv6only!
   # The second element, _sender_addrinfo_, contains protocol-specific address
   # information of the sender.
   #
-  # When recvfrom(2) returns 0, Socket#recvfrom_nonblock returns
-  # an empty string as data.
-  # The meaning depends on the socket: EOF on TCP, empty packet on UDP, etc.
+  # When recvfrom(2) returns 0, Socket#recv_nonblock returns nil.
+  # In most cases it means the connection was closed, but for UDP connections
+  # it may mean an empty packet was received, as the underlying API makes
+  # it impossible to distinguish these two cases.
   #
   # === Parameters
   # * +maxlen+ - the maximum number of bytes to receive from the socket
@@ -597,19 +599,52 @@ def accept_nonblock(exception: true)
     __accept_nonblock(exception)
   end
 
+  RESOLUTION_DELAY = 0.05
+  private_constant :RESOLUTION_DELAY
+
+  CONNECTION_ATTEMPT_DELAY = 0.25
+  private_constant :CONNECTION_ATTEMPT_DELAY
+
+  ADDRESS_FAMILIES = {
+    ipv6: Socket::AF_INET6,
+    ipv4: Socket::AF_INET
+  }.freeze
+  private_constant :ADDRESS_FAMILIES
+
+  HOSTNAME_RESOLUTION_QUEUE_UPDATED = 0
+  private_constant :HOSTNAME_RESOLUTION_QUEUE_UPDATED
+
+  IPV6_ADDRESS_FORMAT = /\A(?i:(?:(?:[0-9A-F]{1,4}:){7}(?:[0-9A-F]{1,4}|:)|(?:[0-9A-F]{1,4}:){6}(?:[0-9A-F]{1,4}|:(?:[0-9A-F]{1,4}:){1,5}[0-9A-F]{1,4}|:)|(?:[0-9A-F]{1,4}:){5}(?:(?::[0-9A-F]{1,4}){1,2}|:(?:[0-9A-F]{1,4}:){1,4}[0-9A-F]{1,4}|:)|(?:[0-9A-F]{1,4}:){4}(?:(?::[0-9A-F]{1,4}){1,3}|:(?:[0-9A-F]{1,4}:){1,3}[0-9A-F]{1,4}|:)|(?:[0-9A-F]{1,4}:){3}(?:(?::[0-9A-F]{1,4}){1,4}|:(?:[0-9A-F]{1,4}:){1,2}[0-9A-F]{1,4}|:)|(?:[0-9A-F]{1,4}:){2}(?:(?::[0-9A-F]{1,4}){1,5}|:(?:[0-9A-F]{1,4}:)[0-9A-F]{1,4}|:)|(?:[0-9A-F]{1,4}:){1}(?:(?::[0-9A-F]{1,4}){1,6}|:(?:[0-9A-F]{1,4}:){0,5}[0-9A-F]{1,4}|:)|(?:::(?:[0-9A-F]{1,4}:){0,7}[0-9A-F]{1,4}|::)))(?:%.+)?\z/
+  private_constant :IPV6_ADDRESS_FORMAT
+
   # :call-seq:
   #   Socket.tcp(host, port, local_host=nil, local_port=nil, [opts]) {|socket| ... }
   #   Socket.tcp(host, port, local_host=nil, local_port=nil, [opts])
   #
   # creates a new socket object connected to host:port using TCP/IP.
   #
+  # Starting from Ruby 3.4, this method operates according to the
+  # Happy Eyeballs Version 2 ({RFC 8305}[https://datatracker.ietf.org/doc/html/rfc8305])
+  # algorithm by default.
+  #
+  # For details on Happy Eyeballs Version 2,
+  # see {Socket.tcp_fast_fallback=}[rdoc-ref:Socket.tcp_fast_fallback=].
+  #
+  # To make it behave the same as in Ruby 3.3 and earlier,
+  # explicitly specify the option fast_fallback:false.
+  # Or, setting Socket.tcp_fast_fallback=false will disable
+  # Happy Eyeballs Version 2 not only for this method but for all Socket globally.
+  #
   # If local_host:local_port is given,
   # the socket is bound to it.
   #
   # The optional last argument _opts_ is options represented by a hash.
   # _opts_ may have following options:
   #
-  # [:connect_timeout] specify the timeout in seconds.
+  # [:resolv_timeout] Specifies the timeout in seconds from when the hostname resolution starts.
+  # [:connect_timeout] This method sequentially attempts connecting to all candidate destination addresses.<br>The +connect_timeout+ specifies the timeout in seconds from the start of the connection attempt to the last candidate.<br>By default, all connection attempts continue until the timeout occurs.<br>When +fast_fallback:false+ is explicitly specified,<br>a timeout is set for each connection attempt and any connection attempt that exceeds its timeout will be canceled.
+  # [:open_timeout] Specifies the timeout in seconds from the start of the method execution.<br>If this timeout is reached while there are still addresses that have not yet been attempted for connection, no further attempts will be made.
+  # [:fast_fallback] Enables the Happy Eyeballs Version 2 algorithm (enabled by default).
   #
   # If a block is given, the block is called with the socket.
   # The value of the block is returned.
@@ -622,8 +657,274 @@ def accept_nonblock(exception: true)
   #     sock.close_write
   #     puts sock.read
   #   }
-  #
-  def self.tcp(host, port, local_host = nil, local_port = nil, connect_timeout: nil, resolv_timeout: nil) # :yield: socket
+  def self.tcp(host, port, local_host = nil, local_port = nil, connect_timeout: nil, resolv_timeout: nil, open_timeout: nil, fast_fallback: tcp_fast_fallback, &) # :yield: socket
+
+    if open_timeout && (connect_timeout || resolv_timeout)
+      raise ArgumentError, "Cannot specify open_timeout along with connect_timeout or resolv_timeout"
+    end
+
+    sock = if fast_fallback && !(host && ip_address?(host))
+      tcp_with_fast_fallback(host, port, local_host, local_port, connect_timeout:, resolv_timeout:, open_timeout:)
+    else
+      tcp_without_fast_fallback(host, port, local_host, local_port, connect_timeout:, resolv_timeout:, open_timeout:)
+    end
+
+    if block_given?
+      begin
+        yield sock
+      ensure
+        sock.close
+      end
+    else
+      sock
+    end
+  end
+
+  def self.tcp_with_fast_fallback(host, port, local_host = nil, local_port = nil, connect_timeout: nil, resolv_timeout: nil, open_timeout: nil)
+    if local_host || local_port
+      local_addrinfos = Addrinfo.getaddrinfo(local_host, local_port, nil, :STREAM, timeout: resolv_timeout)
+      resolving_family_names = local_addrinfos.map { |lai| ADDRESS_FAMILIES.key(lai.afamily) }.uniq
+    else
+      local_addrinfos = []
+      resolving_family_names = ADDRESS_FAMILIES.keys
+    end
+
+    hostname_resolution_threads = []
+    resolution_store = HostnameResolutionStore.new(resolving_family_names)
+    connecting_sockets = {}
+    is_windows_environment ||= (RUBY_PLATFORM =~ /mswin|mingw|cygwin/)
+
+    now = current_clock_time
+    resolution_delay_expires_at = nil
+    connection_attempt_delay_expires_at = nil
+    user_specified_connect_timeout_at = nil
+    user_specified_open_timeout_at = open_timeout ? now + open_timeout : nil
+    last_error = nil
+    last_error_from_thread = false
+
+    if resolving_family_names.size == 1
+      family_name = resolving_family_names.first
+      addrinfos = Addrinfo.getaddrinfo(host, port, family_name, :STREAM, timeout: resolv_timeout)
+      resolution_store.add_resolved(family_name, addrinfos)
+      hostname_resolution_result = nil
+      hostname_resolution_notifier = nil
+      user_specified_resolv_timeout_at = nil
+    else
+      hostname_resolution_result = HostnameResolutionResult.new(resolving_family_names.size)
+      hostname_resolution_notifier = hostname_resolution_result.notifier
+
+      hostname_resolution_threads.concat(
+        resolving_family_names.map { |family|
+          thread_args = [family, host, port, hostname_resolution_result]
+          thread = Thread.new(*thread_args) { |*thread_args| resolve_hostname(*thread_args) }
+          Thread.pass
+          thread
+        }
+      )
+
+      user_specified_resolv_timeout_at = resolv_timeout ? now + resolv_timeout : Float::INFINITY
+    end
+
+    loop do
+      if resolution_store.any_addrinfos? &&
+          !resolution_delay_expires_at &&
+          !connection_attempt_delay_expires_at
+        while (addrinfo = resolution_store.get_addrinfo)
+          if local_addrinfos.any?
+            local_addrinfo = local_addrinfos.find { |lai| lai.afamily == addrinfo.afamily }
+
+            if local_addrinfo.nil? # Connecting addrinfoと同じアドレスファミリのLocal addrinfoがない
+              if resolution_store.any_addrinfos?
+                # Try other Addrinfo in next "while"
+                next
+              elsif connecting_sockets.any? || resolution_store.any_unresolved_family?
+                # Exit this "while" and wait for connections to be established or hostname resolution in next loop
+                # Or exit this "while" and wait for hostname resolution in next loop
+                break
+              else
+                raise SocketError.new 'no appropriate local address'
+              end
+            end
+          end
+
+          begin
+            if resolution_store.any_addrinfos? ||
+               connecting_sockets.any? ||
+               resolution_store.any_unresolved_family?
+              socket = Socket.new(addrinfo.pfamily, addrinfo.socktype, addrinfo.protocol)
+              socket.bind(local_addrinfo) if local_addrinfo
+              result = socket.connect_nonblock(addrinfo, exception: false)
+            else
+              result = socket = local_addrinfo ?
+                addrinfo.connect_from(local_addrinfo, timeout: connect_timeout) :
+                addrinfo.connect(timeout: connect_timeout)
+            end
+
+            if result == :wait_writable
+              connection_attempt_delay_expires_at = now + CONNECTION_ATTEMPT_DELAY
+              if resolution_store.empty_addrinfos?
+                user_specified_connect_timeout_at = connect_timeout ? now + connect_timeout : Float::INFINITY
+              end
+
+              connecting_sockets[socket] = addrinfo
+              break
+            else
+              return socket # connection established
+            end
+          rescue SystemCallError => e
+            socket&.close
+            last_error = e
+
+            if resolution_store.any_addrinfos?
+              # Try other Addrinfo in next "while"
+              next
+            elsif connecting_sockets.any? || resolution_store.any_unresolved_family?
+              # Exit this "while" and wait for connections to be established or hostname resolution in next loop
+              # Or exit this "while" and wait for hostname resolution in next loop
+              break
+            else
+              raise last_error
+            end
+          end
+        end
+      end
+
+      ends_at =
+        if resolution_store.any_addrinfos?
+          [(resolution_delay_expires_at || connection_attempt_delay_expires_at),
+           user_specified_open_timeout_at].compact.min
+        elsif user_specified_open_timeout_at
+          user_specified_open_timeout_at
+        else
+          [user_specified_resolv_timeout_at, user_specified_connect_timeout_at].compact.max
+        end
+
+      hostname_resolved, writable_sockets, except_sockets = IO.select(
+        hostname_resolution_notifier,
+        connecting_sockets.keys,
+        # Use errorfds to wait for non-blocking connect failures on Windows
+        is_windows_environment ? connecting_sockets.keys : nil,
+        second_to_timeout(current_clock_time, ends_at),
+      )
+      now = current_clock_time
+      resolution_delay_expires_at = nil if expired?(now, resolution_delay_expires_at)
+      connection_attempt_delay_expires_at = nil if expired?(now, connection_attempt_delay_expires_at)
+
+      if writable_sockets&.any?
+        while (writable_socket = writable_sockets.pop)
+          is_connected = is_windows_environment || (
+            sockopt = writable_socket.getsockopt(Socket::SOL_SOCKET, Socket::SO_ERROR)
+            sockopt.int.zero?
+          )
+
+          if is_connected
+            connecting_sockets.delete writable_socket
+            return writable_socket
+          else
+            failed_ai = connecting_sockets.delete writable_socket
+            writable_socket.close
+            ip_address = failed_ai.ipv6? ? "[#{failed_ai.ip_address}]" : failed_ai.ip_address
+            last_error = SystemCallError.new("connect(2) for #{ip_address}:#{failed_ai.ip_port}", sockopt.int)
+
+            if writable_sockets.any? || connecting_sockets.any?
+              # Try other writable socket in next "while"
+              # Or exit this "while" and wait for connections to be established or hostname resolution in next loop
+            elsif resolution_store.any_addrinfos? || resolution_store.any_unresolved_family?
+              # Exit this "while" and try other connection attempt
+              # Or exit this "while" and wait for hostname resolution in next loop
+              connection_attempt_delay_expires_at = nil
+              user_specified_connect_timeout_at = nil
+            else
+              raise last_error
+            end
+          end
+        end
+      end
+
+      if except_sockets&.any?
+        except_sockets.each do |except_socket|
+          failed_ai = connecting_sockets.delete except_socket
+          sockopt = except_socket.getsockopt(Socket::SOL_SOCKET, Socket::SO_ERROR)
+          except_socket.close
+          ip_address = failed_ai.ipv6? ? "[#{failed_ai.ip_address}]" : failed_ai.ip_address
+          last_error = SystemCallError.new("connect(2) for #{ip_address}:#{failed_ai.ip_port}", sockopt.int)
+
+          if except_sockets.any? || connecting_sockets.any?
+            # Cleanup other except socket in next "each"
+            # Or exit this "while" and wait for connections to be established or hostname resolution in next loop
+          elsif resolution_store.any_addrinfos? || resolution_store.any_unresolved_family?
+            # Exit this "while" and try other connection attempt
+            # Or exit this "while" and wait for hostname resolution in next loop
+            connection_attempt_delay_expires_at = nil
+            user_specified_connect_timeout_at = nil
+          else
+            raise last_error
+          end
+        end
+      end
+
+      if hostname_resolved&.any?
+        while (family_and_result = hostname_resolution_result.get)
+          family_name, result = family_and_result
+
+          if result.is_a? Exception
+            resolution_store.add_error(family_name, result)
+
+            unless (Socket.const_defined?(:EAI_ADDRFAMILY)) &&
+              (result.is_a?(Socket::ResolutionError)) &&
+              (result.error_code == Socket::EAI_ADDRFAMILY)
+              other = family_name == :ipv6 ? :ipv4 : :ipv6
+              if !resolution_store.resolved?(other) || !resolution_store.resolved_successfully?(other)
+                last_error = result
+                last_error_from_thread = true
+              end
+            end
+          else
+            resolution_store.add_resolved(family_name, result)
+          end
+        end
+
+        if resolution_store.resolved?(:ipv4)
+          if resolution_store.resolved?(:ipv6)
+            hostname_resolution_notifier = nil
+            resolution_delay_expires_at = nil
+            user_specified_resolv_timeout_at = nil
+          elsif resolution_store.resolved_successfully?(:ipv4)
+            resolution_delay_expires_at = now + RESOLUTION_DELAY
+          end
+        end
+      end
+
+      raise(Errno::ETIMEDOUT, 'user specified timeout') if expired?(now, user_specified_open_timeout_at)
+
+      if resolution_store.empty_addrinfos?
+        if connecting_sockets.empty? && resolution_store.resolved_all_families?
+          if last_error_from_thread
+            raise last_error.class, last_error.message, cause: last_error
+          else
+            raise last_error
+          end
+        end
+
+        if (expired?(now, user_specified_resolv_timeout_at) || resolution_store.resolved_all_families?) &&
+           (expired?(now, user_specified_connect_timeout_at) || connecting_sockets.empty?)
+          raise Errno::ETIMEDOUT, 'user specified timeout'
+        end
+      end
+    end
+  ensure
+    hostname_resolution_threads.each do |thread|
+      thread.exit
+    end
+
+    hostname_resolution_result&.close
+
+    connecting_sockets.each_key do |connecting_socket|
+      connecting_socket.close
+    end
+  end
+
+  def self.tcp_without_fast_fallback(host, port, local_host, local_port, connect_timeout:, resolv_timeout:, open_timeout:)
     last_error = nil
     ret = nil
 
@@ -632,7 +933,10 @@ def self.tcp(host, port, local_host = nil, local_port = nil, connect_timeout: ni
       local_addr_list = Addrinfo.getaddrinfo(local_host, local_port, nil, :STREAM, nil)
     end
 
-    Addrinfo.foreach(host, port, nil, :STREAM, timeout: resolv_timeout) {|ai|
+    timeout = open_timeout ? open_timeout : resolv_timeout
+    starts_at = current_clock_time
+
+    Addrinfo.foreach(host, port, nil, :STREAM, timeout:) {|ai|
       if local_addr_list
         local_addr = local_addr_list.find {|local_ai| local_ai.afamily == ai.afamily }
         next unless local_addr
@@ -640,9 +944,10 @@ def self.tcp(host, port, local_host = nil, local_port = nil, connect_timeout: ni
         local_addr = nil
       end
       begin
+        timeout = open_timeout ? open_timeout - (current_clock_time - starts_at) : connect_timeout
         sock = local_addr ?
-          ai.connect_from(local_addr, timeout: connect_timeout) :
-          ai.connect(timeout: connect_timeout)
+          ai.connect_from(local_addr, timeout:) :
+          ai.connect(timeout:)
       rescue SystemCallError
         last_error = $!
         next
@@ -657,16 +962,149 @@ def self.tcp(host, port, local_host = nil, local_port = nil, connect_timeout: ni
         raise SocketError, "no appropriate local address"
       end
     end
-    if block_given?
-      begin
-        yield ret
-      ensure
-        ret.close
+
+    ret
+  end
+  private_class_method :tcp_without_fast_fallback
+
+  def self.ip_address?(hostname)
+    hostname.match?(IPV6_ADDRESS_FORMAT) || hostname.match?(/\A([0-9]{1,3}\.){3}[0-9]{1,3}\z/)
+  end
+  private_class_method :ip_address?
+
+  def self.resolve_hostname(family, host, port, hostname_resolution_result)
+    begin
+      resolved_addrinfos = Addrinfo.getaddrinfo(host, port, ADDRESS_FAMILIES[family], :STREAM)
+      hostname_resolution_result.add(family, resolved_addrinfos)
+    rescue => e
+      hostname_resolution_result.add(family, e)
+    end
+  end
+  private_class_method :resolve_hostname
+
+  def self.current_clock_time
+    Process.clock_gettime(Process::CLOCK_MONOTONIC)
+  end
+  private_class_method :current_clock_time
+
+  def self.second_to_timeout(started_at, ends_at)
+    return nil if ends_at == Float::INFINITY || ends_at.nil?
+
+    remaining = (ends_at - started_at)
+    remaining.negative? ? 0 : remaining
+  end
+  private_class_method :second_to_timeout
+
+  def self.expired?(started_at, ends_at)
+    second_to_timeout(started_at, ends_at)&.zero?
+  end
+  private_class_method :expired?
+
+  class HostnameResolutionResult
+    def initialize(size)
+      @size = size
+      @taken_count = 0
+      @rpipe, @wpipe = IO.pipe
+      @results = []
+      @mutex = Mutex.new
+    end
+
+    def notifier
+      [@rpipe]
+    end
+
+    def add(family, result)
+      @mutex.synchronize do
+        @results.push [family, result]
+        @wpipe.putc HOSTNAME_RESOLUTION_QUEUE_UPDATED
       end
-    else
-      ret
+    end
+
+    def get
+      return nil if @results.empty?
+
+      res = nil
+
+      @mutex.synchronize do
+        @rpipe.getbyte
+        res = @results.shift
+      end
+
+      @taken_count += 1
+      close if @taken_count == @size
+      res
+    end
+
+    def close
+      @rpipe.close
+      @wpipe.close
+    end
+  end
+  private_constant :HostnameResolutionResult
+
+  class HostnameResolutionStore
+    PRIORITY_ON_V6 = [:ipv6, :ipv4].freeze
+    PRIORITY_ON_V4 = [:ipv4, :ipv6].freeze
+
+    def initialize(family_names)
+      @family_names = family_names
+      @addrinfo_dict = {}
+      @error_dict = {}
+      @last_family = nil
+    end
+
+    def add_resolved(family_name, addrinfos)
+      @addrinfo_dict[family_name] = addrinfos
+    end
+
+    def add_error(family_name, error)
+      @addrinfo_dict[family_name] = []
+      @error_dict[family_name] = error
+    end
+
+    def get_addrinfo
+      precedences =
+        case @last_family
+        when :ipv4, nil then PRIORITY_ON_V6
+        when :ipv6      then PRIORITY_ON_V4
+        end
+
+      precedences.each do |family_name|
+        addrinfo = @addrinfo_dict[family_name]&.shift
+        next unless addrinfo
+
+        @last_family = family_name
+        return addrinfo
+      end
+
+      nil
+    end
+
+    def empty_addrinfos?
+      @addrinfo_dict.all? { |_, addrinfos| addrinfos.empty? }
+    end
+
+    def any_addrinfos?
+      !empty_addrinfos?
+    end
+
+    def resolved?(family)
+      @addrinfo_dict.has_key? family
+    end
+
+    def resolved_successfully?(family)
+      resolved?(family) && !@error_dict[family]
+    end
+
+    def resolved_all_families?
+      (@family_names - @addrinfo_dict.keys).empty?
+    end
+
+    def any_unresolved_family?
+      !resolved_all_families?
     end
   end
+  private_constant :HostnameResolutionStore
 
   # :stopdoc:
   def self.ip_sockets_port0(ai_list, reuseaddr)
@@ -1177,7 +1615,7 @@ def self.unix_server_loop(path, &b) # :yield: socket, client_addrinfo
   # Returns 0 if successful, otherwise an exception is raised.
   #
   # === Parameter
-  #  # +remote_sockaddr+ - the +struct+ sockaddr contained in a string or Addrinfo object
+  # * +remote_sockaddr+ - the +struct+ sockaddr contained in a string or Addrinfo object
   #
   # === Example:
   #   # Pull down Google's web page
@@ -1212,7 +1650,7 @@ def self.unix_server_loop(path, &b) # :yield: socket, client_addrinfo
   # return the symbol +:wait_writable+ instead.
   #
   # === See
-  #  # Socket#connect
+  # * Socket#connect
   def connect_nonblock(addr, exception: true)
     __connect_nonblock(addr, exception)
   end
@@ -1229,9 +1667,10 @@ class UDPSocket < IPSocket
   # The first element of the results, _mesg_, is the data received.
   # The second element, _sender_inet_addr_, is an array to represent the sender address.
   #
-  # When recvfrom(2) returns 0,
-  # Socket#recvfrom_nonblock returns an empty string as data.
-  # It means an empty packet.
+  # When recvfrom(2) returns 0, Socket#recv_nonblock returns nil.
+  # In most cases it means the connection was closed, but it may also mean
+  # an empty packet was received, as the underlying API makes
+  # it impossible to distinguish these two cases.
   #
   # === Parameters
   # * +maxlen+ - the number of bytes to receive from the socket
diff --git a/ext/socket/mkconstants.rb b/ext/socket/mkconstants.rb
index 5e6c0668f63da9..4271e40cd8485e 100644
--- a/ext/socket/mkconstants.rb
+++ b/ext/socket/mkconstants.rb
@@ -51,7 +51,10 @@ def c_str(str)
     next
   end
   h[name] = default_value
-  COMMENTS[name] = comment
+  if comment
+    # Stop unintentional references
+    COMMENTS[name] = comment.gsub(/\b(Data|Kernel|Process|Set|Socket|Time)\b/, '\\\\\\&')
+  end
 }
 DEFS = h.to_a
 
@@ -73,15 +76,11 @@ def each_name(pat)
   }
 end
 
-erb_new = lambda do |src, safe, trim|
-  if ERB.instance_method(:initialize).parameters.assoc(:key) # Ruby 2.6+
-    ERB.new(src, trim_mode: trim)
-  else
-    ERB.new(src, safe, trim)
-  end
+erb_new = lambda do |src, trim|
+  ERB.new(src, trim_mode: trim)
 end
 
-erb_new.call(<<'EOS', nil, '%').def_method(Object, "gen_const_decls")
+erb_new.call(<<'EOS', '%').def_method(Object, "gen_const_decls")
 % each_const {|guard, name, default_value|
 #if !defined(<%=name%>)
 # if defined(HAVE_CONST_<%=name.upcase%>)
@@ -95,7 +94,7 @@ def each_name(pat)
 % }
 EOS
 
-erb_new.call(<<'EOS', nil, '%').def_method(Object, "gen_const_defs_in_guard(name, default_value)")
+erb_new.call(<<'EOS', '%').def_method(Object, "gen_const_defs_in_guard(name, default_value)")
 #if defined(<%=name%>)
     /* <%= COMMENTS[name] %> */
     rb_define_const(rb_cSocket, <%=c_str name%>, INTEGER2NUM(<%=name%>));
@@ -104,7 +103,7 @@ def each_name(pat)
 #endif
 EOS
 
-erb_new.call(<<'EOS', nil, '%').def_method(Object, "gen_const_defs")
+erb_new.call(<<'EOS', '%').def_method(Object, "gen_const_defs")
 % each_const {|guard, name, default_value|
 %   if guard
 #if <%=guard%>
@@ -154,7 +153,7 @@ def each_names_with_len(pat, prefix_optional=nil)
   }
 end
 
-erb_new.call(<<'EOS', nil, '%').def_method(Object, "gen_name_to_int_decl(funcname, pat, prefix_optional, guard=nil)")
+erb_new.call(<<'EOS', '%').def_method(Object, "gen_name_to_int_decl(funcname, pat, prefix_optional, guard=nil)")
 %if guard
 #ifdef <%=guard%>
 int <%=funcname%>(const char *str, long len, int *valp);
@@ -164,7 +163,7 @@ def each_names_with_len(pat, prefix_optional=nil)
 %end
 EOS
 
-erb_new.call(<<'EOS', nil, '%').def_method(Object, "gen_name_to_int_func_in_guard(funcname, pat, prefix_optional, guard=nil)")
+erb_new.call(<<'EOS', '%').def_method(Object, "gen_name_to_int_func_in_guard(funcname, pat, prefix_optional, guard=nil)")
 int
 <%=funcname%>(const char *str, long len, int *valp)
 {
@@ -186,7 +185,7 @@ def each_names_with_len(pat, prefix_optional=nil)
 }
 EOS
 
-erb_new.call(<<'EOS', nil, '%').def_method(Object, "gen_name_to_int_func(funcname, pat, prefix_optional, guard=nil)")
+erb_new.call(<<'EOS', '%').def_method(Object, "gen_name_to_int_func(funcname, pat, prefix_optional, guard=nil)")
 %if guard
 #ifdef <%=guard%>
 <%=gen_name_to_int_func_in_guard(funcname, pat, prefix_optional, guard)%>
@@ -215,7 +214,7 @@ def reverse_each_name_with_prefix_optional(pat, prefix_pat)
   end
 end
 
-erb_new.call(<<'EOS', nil, '%').def_method(Object, "gen_int_to_name_hash(hash_var, pat, prefix_pat)")
+erb_new.call(<<'EOS', '%').def_method(Object, "gen_int_to_name_hash(hash_var, pat, prefix_pat)")
     <%=hash_var%> = st_init_numtable();
 % reverse_each_name_with_prefix_optional(pat, prefix_pat) {|n,s|
 #ifdef <%=n%>
@@ -224,7 +223,7 @@ def reverse_each_name_with_prefix_optional(pat, prefix_pat)
 % }
 EOS
 
-erb_new.call(<<'EOS', nil, '%').def_method(Object, "gen_int_to_name_func(func_name, hash_var)")
+erb_new.call(<<'EOS', '%').def_method(Object, "gen_int_to_name_func(func_name, hash_var)")
 ID
 <%=func_name%>(int val)
 {
@@ -235,7 +234,7 @@ def reverse_each_name_with_prefix_optional(pat, prefix_pat)
 }
 EOS
 
-erb_new.call(<<'EOS', nil, '%').def_method(Object, "gen_int_to_name_decl(func_name, hash_var)")
+erb_new.call(<<'EOS', '%').def_method(Object, "gen_int_to_name_decl(func_name, hash_var)")
 ID <%=func_name%>(int val);
 EOS
 
@@ -284,7 +283,7 @@ def def_intern(func_name, pat, prefix_optional=nil)
 def_intern('rsock_intern_scm_optname',  /\ASCM_/, "SCM_")
 def_intern('rsock_intern_local_optname',  /\ALOCAL_/, "LOCAL_")
 
-result = erb_new.call(<<'EOS', nil, '%').result(binding)
+result = erb_new.call(<<'EOS', '%').result(binding)
 /* autogenerated file */
 
 <%= INTERN_DEFS.map {|vardef, gen_hash, decl, func| vardef }.join("\n") %>
@@ -327,7 +326,7 @@ def def_intern(func_name, pat, prefix_optional=nil)
 
 EOS
 
-header_result = erb_new.call(<<'EOS', nil, '%').result(binding)
+header_result = erb_new.call(<<'EOS', '%').result(binding)
 /* autogenerated file */
 <%= gen_const_decls %>
 <%= NAME_TO_INT_DEFS.map {|decl, func| decl }.join("\n") %>
@@ -423,8 +422,8 @@ def def_intern(func_name, pat, prefix_optional=nil)
 PF_ISDN	nil	Integrated Services Digital Network
 AF_NATM	nil	Native ATM access
 PF_NATM	nil	Native ATM access
-AF_SYSTEM
-PF_SYSTEM
+AF_SYSTEM	nil	Kernel event messages
+PF_SYSTEM	nil	Kernel event messages
 AF_NETBIOS	nil	NetBIOS
 PF_NETBIOS	nil	NetBIOS
 AF_PPP	nil	Point-to-Point Protocol
@@ -440,8 +439,8 @@ def def_intern(func_name, pat, prefix_optional=nil)
 
 AF_E164	nil	CCITT (ITU-T) E.164 recommendation
 PF_XTP	nil	eXpress Transfer Protocol
-PF_RTIP
-PF_PIP
+PF_RTIP	nil	Help Identify RTIP packets
+PF_PIP	nil	Help Identify PIP packets
 AF_KEY	nil	Key management protocol, originally developed for usage with IPsec
 PF_KEY	nil	Key management protocol, originally developed for usage with IPsec
 AF_NETLINK	nil	Kernel user interface device
@@ -666,6 +665,7 @@ def def_intern(func_name, pat, prefix_optional=nil)
 SO_RTABLE               nil     Set the routing table for this socket (OpenBSD)
 SO_INCOMING_CPU         nil     Receive the cpu attached to the socket (Linux 3.19)
 SO_INCOMING_NAPI_ID     nil     Receive the napi ID attached to a RX queue (Linux 4.12)
+SO_CONNECT_TIME         nil     Returns the number of seconds a socket has been connected. This option is only valid for connection-oriented protocols (Windows)
 
 SOPRI_INTERACTIVE	nil	Interactive socket priority
 SOPRI_NORMAL	nil	Normal socket priority
@@ -745,6 +745,7 @@ def def_intern(func_name, pat, prefix_optional=nil)
 
 IPV6_JOIN_GROUP	nil	Join a group membership
 IPV6_LEAVE_GROUP	nil	Leave a group membership
+IPV6_MTU_DISCOVER nil Path MTU discovery
 IPV6_MULTICAST_HOPS	nil	IP6 multicast hops
 IPV6_MULTICAST_IF	nil	IP6 multicast interface
 IPV6_MULTICAST_LOOP	nil	IP6 multicast loopback
@@ -759,6 +760,7 @@ def def_intern(func_name, pat, prefix_optional=nil)
 IPV6_PATHMTU	nil	Retrieve current path MTU
 IPV6_PKTINFO	nil	Receive packet information with datagram
 IPV6_RECVDSTOPTS	nil	Receive all IP6 options for response
+IPV6_RECVERR	nil	Enable extended reliable error message passing
 IPV6_RECVHOPLIMIT	nil	Receive hop limit with datagram
 IPV6_RECVHOPOPTS	nil	Receive hop-by-hop options
 IPV6_RECVPKTINFO	nil	Receive destination IP address and incoming interface
diff --git a/ext/socket/raddrinfo.c b/ext/socket/raddrinfo.c
index 269edc4dadd526..6511f9b8b9c5be 100644
--- a/ext/socket/raddrinfo.c
+++ b/ext/socket/raddrinfo.c
@@ -10,6 +10,22 @@
 
 #include "rubysocket.h"
 
+// GETADDRINFO_IMPL == 0 : call getaddrinfo/getnameinfo directly
+// GETADDRINFO_IMPL == 1 : call getaddrinfo/getnameinfo without gvl (but uncancellable)
+// GETADDRINFO_IMPL == 2 : call getaddrinfo/getnameinfo in a dedicated pthread
+//                         (and if the call is interrupted, the pthread is detached)
+
+#ifndef GETADDRINFO_IMPL
+#  ifdef GETADDRINFO_EMU
+#    define GETADDRINFO_IMPL 0
+#  elif !defined(HAVE_PTHREAD_CREATE) || !defined(HAVE_PTHREAD_DETACH) || defined(__MINGW32__) || defined(__MINGW64__)
+#    define GETADDRINFO_IMPL 1
+#  else
+#    define GETADDRINFO_IMPL 2
+#    include "ruby/thread_native.h"
+#  endif
+#endif
+
 #if defined(INET6) && (defined(LOOKUP_ORDER_HACK_INET) || defined(LOOKUP_ORDER_HACK_INET6))
 #define LOOKUP_ORDERS (sizeof(lookup_order_table) / sizeof(lookup_order_table[0]))
 static const int lookup_order_table[] = {
@@ -173,32 +189,6 @@ parse_numeric_port(const char *service, int *portp)
 }
 #endif
 
-#ifndef GETADDRINFO_EMU
-struct getaddrinfo_arg
-{
-    const char *node;
-    const char *service;
-    const struct addrinfo *hints;
-    struct addrinfo **res;
-};
-
-static void *
-nogvl_getaddrinfo(void *arg)
-{
-    int ret;
-    struct getaddrinfo_arg *ptr = arg;
-    ret = getaddrinfo(ptr->node, ptr->service, ptr->hints, ptr->res);
-#ifdef __linux__
-    /* On Linux (mainly Ubuntu 13.04) /etc/nsswitch.conf has mdns4 and
-     * it cause getaddrinfo to return EAI_SYSTEM/ENOENT. [ruby-list:49420]
-     */
-    if (ret == EAI_SYSTEM && errno == ENOENT)
-        ret = EAI_NONAME;
-#endif
-    return (void *)(VALUE)ret;
-}
-#endif
-
 static int
 numeric_getaddrinfo(const char *node, const char *service,
         const struct addrinfo *hints,
@@ -287,8 +277,9 @@ numeric_getaddrinfo(const char *node, const char *service,
 void
 rb_freeaddrinfo(struct rb_addrinfo *ai)
 {
-    if (!ai->allocated_by_malloc)
-        freeaddrinfo(ai->ai);
+    if (!ai->allocated_by_malloc) {
+        if (ai->ai) freeaddrinfo(ai->ai);
+    }
     else {
         struct addrinfo *ai1, *ai2;
         ai1 = ai->ai;
@@ -302,7 +293,307 @@ rb_freeaddrinfo(struct rb_addrinfo *ai)
     xfree(ai);
 }
 
-#ifndef GETADDRINFO_EMU
+unsigned int
+rsock_value_timeout_to_msec(VALUE timeout)
+{
+    double seconds = NUM2DBL(timeout);
+    if (seconds < 0) rb_raise(rb_eArgError, "timeout must not be negative");
+
+    double msec = seconds * 1000.0;
+    if (msec > UINT_MAX) rb_raise(rb_eArgError, "timeout too large");
+
+    return (unsigned int)(msec + 0.5);
+}
+
+#if GETADDRINFO_IMPL == 0
+
+static int
+rb_getaddrinfo(const char *hostp, const char *portp, const struct addrinfo *hints, struct addrinfo **ai, unsigned int _timeout)
+{
+    return getaddrinfo(hostp, portp, hints, ai);
+}
+
+#elif GETADDRINFO_IMPL == 1
+
+struct getaddrinfo_arg
+{
+    const char *node;
+    const char *service;
+    const struct addrinfo *hints;
+    struct addrinfo **res;
+};
+
+static void *
+nogvl_getaddrinfo(void *arg)
+{
+    int ret;
+    struct getaddrinfo_arg *ptr = arg;
+    ret = getaddrinfo(ptr->node, ptr->service, ptr->hints, ptr->res);
+#ifdef __linux__
+    /* On Linux (mainly Ubuntu 13.04) /etc/nsswitch.conf has mdns4 and
+     * it cause getaddrinfo to return EAI_SYSTEM/ENOENT. [ruby-list:49420]
+     */
+    if (ret == EAI_SYSTEM && errno == ENOENT)
+        ret = EAI_NONAME;
+#endif
+    return (void *)(VALUE)ret;
+}
+
+static void *
+fork_safe_getaddrinfo(void *arg)
+{
+    return rb_thread_prevent_fork(nogvl_getaddrinfo, arg);
+}
+
+static int
+rb_getaddrinfo(const char *hostp, const char *portp, const struct addrinfo *hints, struct addrinfo **ai, unsigned int _timeout)
+{
+    struct getaddrinfo_arg arg;
+    MEMZERO(&arg, struct getaddrinfo_arg, 1);
+    arg.node = hostp;
+    arg.service = portp;
+    arg.hints = hints;
+    arg.res = ai;
+    return (int)(VALUE)rb_thread_call_without_gvl(fork_safe_getaddrinfo, &arg, RUBY_UBF_IO, 0);
+}
+
+#elif GETADDRINFO_IMPL == 2
+
+struct getaddrinfo_arg
+{
+    char *node, *service;
+    struct addrinfo hints;
+    struct addrinfo *ai;
+    int err, gai_errno, refcount, done, cancelled, timedout;
+    rb_nativethread_lock_t lock;
+    rb_nativethread_cond_t cond;
+    unsigned int timeout;
+};
+
+static struct getaddrinfo_arg *
+allocate_getaddrinfo_arg(const char *hostp, const char *portp, const struct addrinfo *hints, unsigned int timeout)
+{
+    size_t hostp_offset = sizeof(struct getaddrinfo_arg);
+    size_t portp_offset = hostp_offset + (hostp ? strlen(hostp) + 1 : 0);
+    size_t bufsize = portp_offset + (portp ? strlen(portp) + 1 : 0);
+
+    char *buf = malloc(bufsize);
+    if (!buf) {
+        rb_gc();
+        buf = malloc(bufsize);
+        if (!buf) return NULL;
+    }
+    struct getaddrinfo_arg *arg = (struct getaddrinfo_arg *)buf;
+
+    if (hostp) {
+        arg->node = buf + hostp_offset;
+        strcpy(arg->node, hostp);
+    }
+    else {
+        arg->node = NULL;
+    }
+
+    if (portp) {
+        arg->service = buf + portp_offset;
+        strcpy(arg->service, portp);
+    }
+    else {
+        arg->service = NULL;
+    }
+
+    arg->hints = *hints;
+    arg->ai = NULL;
+
+    arg->refcount = 2;
+    arg->done = arg->cancelled = arg->timedout = 0;
+    arg->timeout = timeout;
+
+    rb_nativethread_lock_initialize(&arg->lock);
+    rb_native_cond_initialize(&arg->cond);
+
+    return arg;
+}
+
+static void
+free_getaddrinfo_arg(struct getaddrinfo_arg *arg)
+{
+    rb_native_cond_destroy(&arg->cond);
+    rb_nativethread_lock_destroy(&arg->lock);
+    free(arg);
+}
+
+static void *
+do_getaddrinfo(void *ptr)
+{
+    struct getaddrinfo_arg *arg = (struct getaddrinfo_arg *)ptr;
+
+    int err, gai_errno;
+    err = getaddrinfo(arg->node, arg->service, &arg->hints, &arg->ai);
+    gai_errno = errno;
+#ifdef __linux__
+    /* On Linux (mainly Ubuntu 13.04) /etc/nsswitch.conf has mdns4 and
+     * it cause getaddrinfo to return EAI_SYSTEM/ENOENT. [ruby-list:49420]
+     */
+    if (err == EAI_SYSTEM && errno == ENOENT)
+        err = EAI_NONAME;
+#endif
+
+    int need_free = 0;
+    rb_nativethread_lock_lock(&arg->lock);
+    {
+        arg->err = err;
+        arg->gai_errno = gai_errno;
+        if (arg->cancelled) {
+            if (arg->ai) freeaddrinfo(arg->ai);
+        }
+        else {
+            arg->done = 1;
+            rb_native_cond_signal(&arg->cond);
+        }
+        if (--arg->refcount == 0) need_free = 1;
+    }
+    rb_nativethread_lock_unlock(&arg->lock);
+
+    if (need_free) free_getaddrinfo_arg(arg);
+
+    return 0;
+}
+
+static void *
+wait_getaddrinfo(void *ptr)
+{
+    struct getaddrinfo_arg *arg = (struct getaddrinfo_arg *)ptr;
+    rb_nativethread_lock_lock(&arg->lock);
+    while (!arg->done && !arg->cancelled) {
+        unsigned long msec = arg->timeout;
+        if (msec > 0) {
+            rb_native_cond_timedwait(&arg->cond, &arg->lock, msec);
+            if (!arg->done) {
+                arg->cancelled = 1;
+                arg->timedout = 1;
+            }
+        } else {
+            rb_native_cond_wait(&arg->cond, &arg->lock);
+        }
+    }
+    rb_nativethread_lock_unlock(&arg->lock);
+    return 0;
+}
+
+static void
+cancel_getaddrinfo(void *ptr)
+{
+    struct getaddrinfo_arg *arg = (struct getaddrinfo_arg *)ptr;
+    rb_nativethread_lock_lock(&arg->lock);
+    {
+        arg->cancelled = 1;
+        rb_native_cond_signal(&arg->cond);
+    }
+    rb_nativethread_lock_unlock(&arg->lock);
+}
+
+int
+raddrinfo_pthread_create(pthread_t *th, void *(*start_routine) (void *), void *arg)
+{
+    int limit = 3, ret;
+    do {
+        // It is said that pthread_create may fail spuriously, so we follow the JDK and retry several times.
+        //
+        // https://bugs.openjdk.org/browse/JDK-8268605
+        // https://github.com/openjdk/jdk/commit/e35005d5ce383ddd108096a3079b17cb0bcf76f1
+        ret = pthread_create(th, 0, start_routine, arg);
+    } while (ret == EAGAIN && limit-- > 0);
+    return ret;
+}
+
+static void *
+fork_safe_do_getaddrinfo(void *ptr)
+{
+    return rb_thread_prevent_fork(do_getaddrinfo, ptr);
+}
+
+static int
+rb_getaddrinfo(const char *hostp, const char *portp, const struct addrinfo *hints, struct addrinfo **ai, unsigned int timeout)
+{
+    int retry;
+    struct getaddrinfo_arg *arg;
+    int err = 0, gai_errno = 0, timedout = 0;
+
+start:
+    retry = 0;
+
+    arg = allocate_getaddrinfo_arg(hostp, portp, hints, timeout);
+    if (!arg) {
+        return EAI_MEMORY;
+    }
+
+    pthread_t th;
+    if (raddrinfo_pthread_create(&th, fork_safe_do_getaddrinfo, arg) != 0) {
+        int err = errno;
+        free_getaddrinfo_arg(arg);
+        errno = err;
+        return EAI_SYSTEM;
+    }
+    pthread_detach(th);
+
+    rb_thread_call_without_gvl2(wait_getaddrinfo, arg, cancel_getaddrinfo, arg);
+
+    int need_free = 0;
+    rb_nativethread_lock_lock(&arg->lock);
+    {
+        if (arg->done) {
+            err = arg->err;
+            gai_errno = arg->gai_errno;
+            if (err == 0) *ai = arg->ai;
+        }
+        else if (arg->cancelled) {
+            retry = 1;
+            timedout = arg->timedout;
+        }
+        else {
+            // If already interrupted, rb_thread_call_without_gvl2 may return without calling wait_getaddrinfo.
+            // In this case, it could be !arg->done && !arg->cancelled.
+            arg->cancelled = 1; // to make do_getaddrinfo call freeaddrinfo
+            retry = 1;
+        }
+        if (--arg->refcount == 0) need_free = 1;
+    }
+    rb_nativethread_lock_unlock(&arg->lock);
+
+    if (need_free) free_getaddrinfo_arg(arg);
+
+    if (timedout) {
+        VALUE errno_module = rb_const_get(rb_cObject, rb_intern("Errno"));
+        VALUE etimedout_error = rb_const_get(errno_module, rb_intern("ETIMEDOUT"));
+        rb_raise(etimedout_error, "user specified timeout");
+    }
+
+    // If the current thread is interrupted by asynchronous exception, the following raises the exception.
+    // But if the current thread is interrupted by timer thread, the following returns; we need to manually retry.
+    rb_thread_check_ints();
+    if (retry) goto start;
+
+    /* Because errno is threadlocal, the errno value we got from the call to getaddrinfo() in the thread
+     * (in case of EAI_SYSTEM return value) is not propagated to the caller of _this_ function. Set errno
+     * explicitly, as round-tripped through struct getaddrinfo_arg, to deal with that */
+    if (gai_errno) errno = gai_errno;
+    return err;
+}
+
+#endif
+
+#if GETADDRINFO_IMPL == 0
+
+int
+rb_getnameinfo(const struct sockaddr *sa, socklen_t salen,
+           char *host, size_t hostlen,
+           char *serv, size_t servlen, int flags)
+{
+    return getnameinfo(sa, salen, host, hostlen, serv, servlen, flags);
+}
+
+#elif GETADDRINFO_IMPL == 1
+
 struct getnameinfo_arg
 {
     const struct sockaddr *sa;
@@ -323,16 +614,11 @@ nogvl_getnameinfo(void *arg)
                                       ptr->serv, (socklen_t)ptr->servlen,
                                       ptr->flags);
 }
-#endif
-
 int
 rb_getnameinfo(const struct sockaddr *sa, socklen_t salen,
-           char *host, size_t hostlen,
-           char *serv, size_t servlen, int flags)
+               char *host, size_t hostlen,
+               char *serv, size_t servlen, int flags)
 {
-#ifdef GETADDRINFO_EMU
-    return getnameinfo(sa, salen, host, hostlen, serv, servlen, flags);
-#else
     struct getnameinfo_arg arg;
     int ret;
     arg.sa = sa;
@@ -344,9 +630,179 @@ rb_getnameinfo(const struct sockaddr *sa, socklen_t salen,
     arg.flags = flags;
     ret = (int)(VALUE)rb_thread_call_without_gvl(nogvl_getnameinfo, &arg, RUBY_UBF_IO, 0);
     return ret;
-#endif
 }
 
+#elif GETADDRINFO_IMPL == 2
+
+struct getnameinfo_arg
+{
+    struct sockaddr *sa;
+    socklen_t salen;
+    int flags;
+    char *host;
+    size_t hostlen;
+    char *serv;
+    size_t servlen;
+    int err, gni_errno, refcount, done, cancelled;
+    rb_nativethread_lock_t lock;
+    rb_nativethread_cond_t cond;
+};
+
+static struct getnameinfo_arg *
+allocate_getnameinfo_arg(const struct sockaddr *sa, socklen_t salen, size_t hostlen, size_t servlen, int flags)
+{
+    size_t sa_offset = sizeof(struct getnameinfo_arg);
+    size_t host_offset = sa_offset + salen;
+    size_t serv_offset = host_offset + hostlen;
+    size_t bufsize = serv_offset + servlen;
+
+    char *buf = malloc(bufsize);
+    if (!buf) {
+        rb_gc();
+        buf = malloc(bufsize);
+        if (!buf) return NULL;
+    }
+    struct getnameinfo_arg *arg = (struct getnameinfo_arg *)buf;
+
+    arg->sa = (struct sockaddr *)(buf + sa_offset);
+    memcpy(arg->sa, sa, salen);
+    arg->salen = salen;
+    arg->host = buf + host_offset;
+    arg->hostlen = hostlen;
+    arg->serv = buf + serv_offset;
+    arg->servlen = servlen;
+    arg->flags = flags;
+
+    arg->refcount = 2;
+    arg->done = arg->cancelled = 0;
+
+    rb_nativethread_lock_initialize(&arg->lock);
+    rb_native_cond_initialize(&arg->cond);
+
+    return arg;
+}
+
+static void
+free_getnameinfo_arg(struct getnameinfo_arg *arg)
+{
+    rb_native_cond_destroy(&arg->cond);
+    rb_nativethread_lock_destroy(&arg->lock);
+
+    free(arg);
+}
+
+static void *
+do_getnameinfo(void *ptr)
+{
+    struct getnameinfo_arg *arg = (struct getnameinfo_arg *)ptr;
+
+    int err, gni_errno;
+    err = getnameinfo(arg->sa, arg->salen, arg->host, (socklen_t)arg->hostlen, arg->serv, (socklen_t)arg->servlen, arg->flags);
+    gni_errno = errno;
+
+    int need_free = 0;
+    rb_nativethread_lock_lock(&arg->lock);
+    arg->err = err;
+    arg->gni_errno = gni_errno;
+    if (!arg->cancelled) {
+        arg->done = 1;
+        rb_native_cond_signal(&arg->cond);
+    }
+    if (--arg->refcount == 0) need_free = 1;
+    rb_nativethread_lock_unlock(&arg->lock);
+
+    if (need_free) free_getnameinfo_arg(arg);
+
+    return 0;
+}
+
+static void *
+wait_getnameinfo(void *ptr)
+{
+    struct getnameinfo_arg *arg = (struct getnameinfo_arg *)ptr;
+    rb_nativethread_lock_lock(&arg->lock);
+    while (!arg->done && !arg->cancelled) {
+        rb_native_cond_wait(&arg->cond, &arg->lock);
+    }
+    rb_nativethread_lock_unlock(&arg->lock);
+    return 0;
+}
+
+static void
+cancel_getnameinfo(void *ptr)
+{
+    struct getnameinfo_arg *arg = (struct getnameinfo_arg *)ptr;
+    rb_nativethread_lock_lock(&arg->lock);
+    arg->cancelled = 1;
+    rb_native_cond_signal(&arg->cond);
+    rb_nativethread_lock_unlock(&arg->lock);
+}
+
+int
+rb_getnameinfo(const struct sockaddr *sa, socklen_t salen,
+               char *host, size_t hostlen,
+               char *serv, size_t servlen, int flags)
+{
+    int retry;
+    struct getnameinfo_arg *arg;
+    int err = 0, gni_errno = 0;
+
+start:
+    retry = 0;
+
+    arg = allocate_getnameinfo_arg(sa, salen, hostlen, servlen, flags);
+    if (!arg) {
+        return EAI_MEMORY;
+    }
+
+    pthread_t th;
+    if (raddrinfo_pthread_create(&th, do_getnameinfo, arg) != 0) {
+        int err = errno;
+        free_getnameinfo_arg(arg);
+        errno = err;
+        return EAI_SYSTEM;
+    }
+    pthread_detach(th);
+
+    rb_thread_call_without_gvl2(wait_getnameinfo, arg, cancel_getnameinfo, arg);
+
+    int need_free = 0;
+    rb_nativethread_lock_lock(&arg->lock);
+    if (arg->done) {
+        err = arg->err;
+        gni_errno = arg->gni_errno;
+        if (err == 0) {
+            if (host) memcpy(host, arg->host, hostlen);
+            if (serv) memcpy(serv, arg->serv, servlen);
+        }
+    }
+    else if (arg->cancelled) {
+        retry = 1;
+    }
+    else {
+        // If already interrupted, rb_thread_call_without_gvl2 may return without calling wait_getnameinfo.
+        // In this case, it could be !arg->done && !arg->cancelled.
+        arg->cancelled = 1;
+        retry = 1;
+    }
+    if (--arg->refcount == 0) need_free = 1;
+    rb_nativethread_lock_unlock(&arg->lock);
+
+    if (need_free) free_getnameinfo_arg(arg);
+
+    // If the current thread is interrupted by asynchronous exception, the following raises the exception.
+    // But if the current thread is interrupted by timer thread, the following returns; we need to manually retry.
+    rb_thread_check_ints();
+    if (retry) goto start;
+
+    /* Make sure we copy the thread-local errno value from the getnameinfo thread back to this thread, so
+     * calling code sees the correct errno */
+    if (gni_errno) errno = gni_errno;
+    return err;
+}
+
+#endif
+
 static void
 make_ipaddr0(struct sockaddr *addr, socklen_t addrlen, char *buf, size_t buflen)
 {
@@ -354,7 +810,7 @@ make_ipaddr0(struct sockaddr *addr, socklen_t addrlen, char *buf, size_t buflen)
 
     error = rb_getnameinfo(addr, addrlen, buf, buflen, NULL, 0, NI_NUMERICHOST);
     if (error) {
-        rsock_raise_socket_error("getnameinfo", error);
+        rsock_raise_resolution_error("getnameinfo", error);
     }
 }
 
@@ -396,8 +852,8 @@ str_is_number(const char *p)
     ((ptr)[0] == name[0] && \
      rb_strlen_lit(name) == (len) && memcmp(ptr, name, len) == 0)
 
-static char*
-host_str(VALUE host, char *hbuf, size_t hbuflen, int *flags_ptr)
+char*
+raddrinfo_host_str(VALUE host, char *hbuf, size_t hbuflen, int *flags_ptr)
 {
     if (NIL_P(host)) {
         return NULL;
@@ -435,8 +891,8 @@ host_str(VALUE host, char *hbuf, size_t hbuflen, int *flags_ptr)
     }
 }
 
-static char*
-port_str(VALUE port, char *pbuf, size_t pbuflen, int *flags_ptr)
+char*
+raddrinfo_port_str(VALUE port, char *pbuf, size_t pbuflen, int *flags_ptr)
 {
     if (NIL_P(port)) {
         return 0;
@@ -488,7 +944,7 @@ rb_scheduler_getaddrinfo(VALUE scheduler, VALUE host, const char *service,
 
     for(i=0; i<len; i++) {
         ip_address = rb_ary_entry(ip_addresses_array, i);
-        hostp = host_str(ip_address, _hbuf, sizeof(_hbuf), &_additional_flags);
+        hostp = raddrinfo_host_str(ip_address, _hbuf, sizeof(_hbuf), &_additional_flags);
         error = numeric_getaddrinfo(hostp, service, hints, &ai);
         if (error == 0) {
             if (!res_allocated) {
@@ -515,7 +971,7 @@ rb_scheduler_getaddrinfo(VALUE scheduler, VALUE host, const char *service,
 }
 
 struct rb_addrinfo*
-rsock_getaddrinfo(VALUE host, VALUE port, struct addrinfo *hints, int socktype_hack)
+rsock_getaddrinfo(VALUE host, VALUE port, struct addrinfo *hints, int socktype_hack, unsigned int timeout)
 {
     struct rb_addrinfo* res = NULL;
     struct addrinfo *ai;
@@ -524,8 +980,8 @@ rsock_getaddrinfo(VALUE host, VALUE port, struct addrinfo *hints, int socktype_h
     char hbuf[NI_MAXHOST], pbuf[NI_MAXSERV];
     int additional_flags = 0;
 
-    hostp = host_str(host, hbuf, sizeof(hbuf), &additional_flags);
-    portp = port_str(port, pbuf, sizeof(pbuf), &additional_flags);
+    hostp = raddrinfo_host_str(host, hbuf, sizeof(hbuf), &additional_flags);
+    portp = raddrinfo_port_str(port, pbuf, sizeof(pbuf), &additional_flags);
 
     if (socktype_hack && hints->ai_socktype == 0 && str_is_number(portp)) {
         hints->ai_socktype = SOCK_DGRAM;
@@ -550,17 +1006,7 @@ rsock_getaddrinfo(VALUE host, VALUE port, struct addrinfo *hints, int socktype_h
         }
 
         if (!resolved) {
-#ifdef GETADDRINFO_EMU
-            error = getaddrinfo(hostp, portp, hints, &ai);
-#else
-            struct getaddrinfo_arg arg;
-            MEMZERO(&arg, struct getaddrinfo_arg, 1);
-            arg.node = hostp;
-            arg.service = portp;
-            arg.hints = hints;
-            arg.res = &ai;
-            error = (int)(VALUE)rb_thread_call_without_gvl(nogvl_getaddrinfo, &arg, RUBY_UBF_IO, 0);
-#endif
+            error = rb_getaddrinfo(hostp, portp, hints, &ai, timeout);
             if (error == 0) {
                 res = (struct rb_addrinfo *)xmalloc(sizeof(struct rb_addrinfo));
                 res->allocated_by_malloc = 0;
@@ -573,7 +1019,7 @@ rsock_getaddrinfo(VALUE host, VALUE port, struct addrinfo *hints, int socktype_h
         if (hostp && hostp[strlen(hostp)-1] == '\n') {
             rb_raise(rb_eSocket, "newline at the end of hostname");
         }
-        rsock_raise_socket_error("getaddrinfo", error);
+        rsock_raise_resolution_error("getaddrinfo", error);
     }
 
     return res;
@@ -593,7 +1039,7 @@ rsock_fd_family(int fd)
 }
 
 struct rb_addrinfo*
-rsock_addrinfo(VALUE host, VALUE port, int family, int socktype, int flags)
+rsock_addrinfo(VALUE host, VALUE port, int family, int socktype, int flags, unsigned int timeout)
 {
     struct addrinfo hints;
 
@@ -601,7 +1047,7 @@ rsock_addrinfo(VALUE host, VALUE port, int family, int socktype, int flags)
     hints.ai_family = family;
     hints.ai_socktype = socktype;
     hints.ai_flags = flags;
-    return rsock_getaddrinfo(host, port, &hints, 1);
+    return rsock_getaddrinfo(host, port, &hints, 1, timeout);
 }
 
 VALUE
@@ -632,7 +1078,7 @@ rsock_ipaddr(struct sockaddr *sockaddr, socklen_t sockaddrlen, int norevlookup)
     error = rb_getnameinfo(sockaddr, sockaddrlen, hbuf, sizeof(hbuf),
                            pbuf, sizeof(pbuf), NI_NUMERICHOST | NI_NUMERICSERV);
     if (error) {
-        rsock_raise_socket_error("getnameinfo", error);
+        rsock_raise_resolution_error("getnameinfo", error);
     }
     addr2 = rb_str_new2(hbuf);
     if (addr1 == Qnil) {
@@ -721,7 +1167,7 @@ make_hostent_internal(VALUE v)
         hostp = addr->ai_canonname;
     }
     else {
-        hostp = host_str(host, hbuf, sizeof(hbuf), NULL);
+        hostp = raddrinfo_host_str(host, hbuf, sizeof(hbuf), NULL);
     }
     rb_ary_push(ary, rb_str_new2(hostp));
 
@@ -795,6 +1241,7 @@ addrinfo_memsize(const void *ptr)
 static const rb_data_type_t addrinfo_type = {
     "socket/addrinfo",
     {addrinfo_mark, addrinfo_free, addrinfo_memsize,},
+    0, 0, RUBY_TYPED_FREE_IMMEDIATELY | RUBY_TYPED_FROZEN_SHAREABLE | RUBY_TYPED_WB_PROTECTED,
 };
 
 static VALUE
@@ -832,7 +1279,7 @@ alloc_addrinfo(void)
 }
 
 static void
-init_addrinfo(rb_addrinfo_t *rai, struct sockaddr *sa, socklen_t len,
+init_addrinfo(VALUE self, rb_addrinfo_t *rai, struct sockaddr *sa, socklen_t len,
               int pfamily, int socktype, int protocol,
               VALUE canonname, VALUE inspectname)
 {
@@ -844,8 +1291,8 @@ init_addrinfo(rb_addrinfo_t *rai, struct sockaddr *sa, socklen_t len,
     rai->pfamily = pfamily;
     rai->socktype = socktype;
     rai->protocol = protocol;
-    rai->canonname = canonname;
-    rai->inspectname = inspectname;
+    RB_OBJ_WRITE(self, &rai->canonname, canonname);
+    RB_OBJ_WRITE(self, &rai->inspectname, inspectname);
 }
 
 VALUE
@@ -858,7 +1305,7 @@ rsock_addrinfo_new(struct sockaddr *addr, socklen_t len,
 
     a = addrinfo_s_allocate(rb_cAddrinfo);
     DATA_PTR(a) = rai = alloc_addrinfo();
-    init_addrinfo(rai, addr, len, family, socktype, protocol, canonname, inspectname);
+    init_addrinfo(a, rai, addr, len, family, socktype, protocol, canonname, inspectname);
     return a;
 }
 
@@ -883,7 +1330,8 @@ call_getaddrinfo(VALUE node, VALUE service,
         hints.ai_flags = NUM2INT(flags);
     }
 
-    res = rsock_getaddrinfo(node, service, &hints, socktype_hack);
+    unsigned int t = NIL_P(timeout) ? 0 : rsock_value_timeout_to_msec(timeout);
+    res = rsock_getaddrinfo(node, service, &hints, socktype_hack, t);
 
     if (res == NULL)
         rb_raise(rb_eSocket, "host not found");
@@ -893,7 +1341,7 @@ call_getaddrinfo(VALUE node, VALUE service,
 static VALUE make_inspectname(VALUE node, VALUE service, struct addrinfo *res);
 
 static void
-init_addrinfo_getaddrinfo(rb_addrinfo_t *rai, VALUE node, VALUE service,
+init_addrinfo_getaddrinfo(VALUE self, rb_addrinfo_t *rai, VALUE node, VALUE service,
                           VALUE family, VALUE socktype, VALUE protocol, VALUE flags,
                           VALUE inspectnode, VALUE inspectservice)
 {
@@ -907,7 +1355,7 @@ init_addrinfo_getaddrinfo(rb_addrinfo_t *rai, VALUE node, VALUE service,
         OBJ_FREEZE(canonname);
     }
 
-    init_addrinfo(rai, res->ai->ai_addr, res->ai->ai_addrlen,
+    init_addrinfo(self, rai, res->ai->ai_addr, res->ai->ai_addrlen,
                   NUM2INT(family), NUM2INT(socktype), NUM2INT(protocol),
                   canonname, inspectname);
 
@@ -1019,7 +1467,7 @@ addrinfo_list_new(VALUE node, VALUE service, VALUE family, VALUE socktype, VALUE
 
 #ifdef HAVE_TYPE_STRUCT_SOCKADDR_UN
 static void
-init_unix_addrinfo(rb_addrinfo_t *rai, VALUE path, int socktype)
+init_unix_addrinfo(VALUE self, rb_addrinfo_t *rai, VALUE path, int socktype)
 {
     struct sockaddr_un un;
     socklen_t len;
@@ -1035,7 +1483,7 @@ init_unix_addrinfo(rb_addrinfo_t *rai, VALUE path, int socktype)
     memcpy((void*)&un.sun_path, RSTRING_PTR(path), RSTRING_LEN(path));
 
     len = rsock_unix_sockaddr_len(path);
-    init_addrinfo(rai, (struct sockaddr *)&un, len,
+    init_addrinfo(self, rai, (struct sockaddr *)&un, len,
                   PF_UNIX, socktype, 0, Qnil, Qnil);
 }
 
@@ -1139,7 +1587,7 @@ addrinfo_initialize(int argc, VALUE *argv, VALUE self)
             flags |= AI_NUMERICSERV;
 #endif
 
-            init_addrinfo_getaddrinfo(rai, numericnode, service,
+            init_addrinfo_getaddrinfo(self, rai, numericnode, service,
                     INT2NUM(i_pfamily ? i_pfamily : af), INT2NUM(i_socktype), INT2NUM(i_protocol),
                     INT2NUM(flags),
                     nodename, service);
@@ -1151,7 +1599,7 @@ addrinfo_initialize(int argc, VALUE *argv, VALUE self)
           {
             VALUE path = rb_ary_entry(sockaddr_ary, 1);
             StringValue(path);
-            init_unix_addrinfo(rai, path, SOCK_STREAM);
+            init_unix_addrinfo(self, rai, path, SOCK_STREAM);
             break;
           }
 #endif
@@ -1164,7 +1612,7 @@ addrinfo_initialize(int argc, VALUE *argv, VALUE self)
         StringValue(sockaddr_arg);
         sockaddr_ptr = (struct sockaddr *)RSTRING_PTR(sockaddr_arg);
         sockaddr_len = RSTRING_SOCKLEN(sockaddr_arg);
-        init_addrinfo(rai, sockaddr_ptr, sockaddr_len,
+        init_addrinfo(self, rai, sockaddr_ptr, sockaddr_len,
                       i_pfamily, i_socktype, i_protocol,
                       canonname, inspectname);
     }
@@ -1266,11 +1714,11 @@ rsock_inspect_sockaddr(struct sockaddr *sockaddr_arg, socklen_t socklen, VALUE r
                  * RFC 4007: IPv6 Scoped Address Architecture
                  * draft-ietf-ipv6-scope-api-00.txt: Scoped Address Extensions to the IPv6 Basic Socket API
                  */
-                error = getnameinfo(&sockaddr->addr, socklen,
-                                    hbuf, (socklen_t)sizeof(hbuf), NULL, 0,
-                                    NI_NUMERICHOST|NI_NUMERICSERV);
+                error = rb_getnameinfo(&sockaddr->addr, socklen,
+                                       hbuf, (socklen_t)sizeof(hbuf), NULL, 0,
+                                       NI_NUMERICHOST|NI_NUMERICSERV);
                 if (error) {
-                    rsock_raise_socket_error("getnameinfo", error);
+                    rsock_raise_resolution_error("getnameinfo", error);
                 }
                 if (addr->sin6_port == 0) {
                     rb_str_cat2(ret, hbuf);
@@ -1634,11 +2082,11 @@ addrinfo_mdump(VALUE self)
       {
         char hbuf[NI_MAXHOST], pbuf[NI_MAXSERV];
         int error;
-        error = getnameinfo(&rai->addr.addr, rai->sockaddr_len,
-                            hbuf, (socklen_t)sizeof(hbuf), pbuf, (socklen_t)sizeof(pbuf),
-                            NI_NUMERICHOST|NI_NUMERICSERV);
+        error = rb_getnameinfo(&rai->addr.addr, rai->sockaddr_len,
+                               hbuf, (socklen_t)sizeof(hbuf), pbuf, (socklen_t)sizeof(pbuf),
+                               NI_NUMERICHOST|NI_NUMERICSERV);
         if (error) {
-            rsock_raise_socket_error("getnameinfo", error);
+            rsock_raise_resolution_error("getnameinfo", error);
         }
         sockaddr = rb_assoc_new(rb_str_new_cstr(hbuf), rb_str_new_cstr(pbuf));
         break;
@@ -1753,7 +2201,7 @@ addrinfo_mload(VALUE self, VALUE ary)
     }
 
     DATA_PTR(self) = rai = alloc_addrinfo();
-    init_addrinfo(rai, &ss.addr, len,
+    init_addrinfo(self, rai, &ss.addr, len,
                   pfamily, socktype, protocol,
                   canonname, inspectname);
     return self;
@@ -1980,11 +2428,11 @@ addrinfo_getnameinfo(int argc, VALUE *argv, VALUE self)
     if (rai->socktype == SOCK_DGRAM)
         flags |= NI_DGRAM;
 
-    error = getnameinfo(&rai->addr.addr, rai->sockaddr_len,
-                        hbuf, (socklen_t)sizeof(hbuf), pbuf, (socklen_t)sizeof(pbuf),
-                        flags);
+    error = rb_getnameinfo(&rai->addr.addr, rai->sockaddr_len,
+                           hbuf, (socklen_t)sizeof(hbuf), pbuf, (socklen_t)sizeof(pbuf),
+                           flags);
     if (error) {
-        rsock_raise_socket_error("getnameinfo", error);
+        rsock_raise_resolution_error("getnameinfo", error);
     }
 
     return rb_assoc_new(rb_str_new2(hbuf), rb_str_new2(pbuf));
@@ -2521,7 +2969,7 @@ addrinfo_s_unix(int argc, VALUE *argv, VALUE self)
 
     addr = addrinfo_s_allocate(rb_cAddrinfo);
     DATA_PTR(addr) = rai = alloc_addrinfo();
-    init_unix_addrinfo(rai, path, socktype);
+    init_unix_addrinfo(self, rai, path, socktype);
     return addr;
 }
 
@@ -2608,18 +3056,111 @@ rsock_io_socket_addrinfo(VALUE io, struct sockaddr *addr, socklen_t len)
     UNREACHABLE_RETURN(Qnil);
 }
 
+#if FAST_FALLBACK_INIT_INETSOCK_IMPL == 1
+
+void
+free_fast_fallback_getaddrinfo_shared(struct fast_fallback_getaddrinfo_shared **shared)
+{
+    xfree((*shared)->node);
+    (*shared)->node = NULL;
+    xfree((*shared)->service);
+    (*shared)->service = NULL;
+    rb_nativethread_lock_destroy(&(*shared)->lock);
+    free(*shared);
+    *shared = NULL;
+}
+
+static void *
+do_fast_fallback_getaddrinfo(void *ptr)
+{
+    struct fast_fallback_getaddrinfo_entry *entry = (struct fast_fallback_getaddrinfo_entry *)ptr;
+    struct fast_fallback_getaddrinfo_shared *shared = entry->shared;
+    int err = 0, shared_need_free = 0;
+    struct addrinfo *ai = NULL;
+
+    sigset_t set;
+    sigemptyset(&set);
+    sigaddset(&set, SIGPIPE);
+    pthread_sigmask(SIG_BLOCK, &set, NULL);
+
+    err = numeric_getaddrinfo(shared->node, shared->service, &entry->hints, &entry->ai);
+
+    if (err != 0) {
+        err = getaddrinfo(shared->node, shared->service, &entry->hints, &entry->ai);
+       #ifdef __linux__
+       /* On Linux (mainly Ubuntu 13.04) /etc/nsswitch.conf has mdns4 and
+        * it cause getaddrinfo to return EAI_SYSTEM/ENOENT. [ruby-list:49420]
+        */
+       if (err == EAI_SYSTEM && errno == ENOENT)
+           err = EAI_NONAME;
+       #endif
+    }
+
+    /* for testing HEv2 */
+    if (entry->test_sleep_ms > 0) {
+        struct timespec sleep_ts;
+        sleep_ts.tv_sec = entry->test_sleep_ms / 1000;
+        sleep_ts.tv_nsec = (entry->test_sleep_ms % 1000) * 1000000L;
+        if (sleep_ts.tv_nsec >= 1000000000L) {
+            sleep_ts.tv_sec += sleep_ts.tv_nsec / 1000000000L;
+            sleep_ts.tv_nsec = sleep_ts.tv_nsec % 1000000000L;
+        }
+        nanosleep(&sleep_ts, NULL);
+    }
+    if (entry->test_ecode != 0) {
+        err = entry->test_ecode;
+        if (entry->ai) {
+            freeaddrinfo(entry->ai);
+            entry->ai = NULL;
+        }
+    }
+
+    rb_nativethread_lock_lock(&shared->lock);
+    {
+        entry->err = err;
+        const char notification = entry->family == AF_INET6 ?
+        IPV6_HOSTNAME_RESOLVED : IPV4_HOSTNAME_RESOLVED;
+
+        if (shared->notify != -1 && (write(shared->notify, &notification, 1)) < 0) {
+            entry->err = errno;
+            entry->has_syserr = true;
+        }
+        if (--(entry->refcount) == 0) {
+            ai = entry->ai;
+            entry->ai = NULL;
+        }
+        if (--(shared->refcount) == 0) shared_need_free = 1;
+    }
+    rb_nativethread_lock_unlock(&shared->lock);
+
+    if (ai) freeaddrinfo(ai);
+    if (shared_need_free && shared) {
+        free_fast_fallback_getaddrinfo_shared(&shared);
+    }
+
+    return 0;
+}
+
+void *
+fork_safe_do_fast_fallback_getaddrinfo(void *ptr)
+{
+    return rb_thread_prevent_fork(do_fast_fallback_getaddrinfo, ptr);
+}
+
+#endif
+
 /*
  * Addrinfo class
  */
 void
 rsock_init_addrinfo(void)
 {
+    id_timeout = rb_intern("timeout");
+
     /*
      * The Addrinfo class maps <tt>struct addrinfo</tt> to ruby.  This
      * structure identifies an Internet host and a service.
      */
-    id_timeout = rb_intern("timeout");
-
     rb_cAddrinfo = rb_define_class("Addrinfo", rb_cObject);
     rb_define_alloc_func(rb_cAddrinfo, addrinfo_s_allocate);
     rb_define_method(rb_cAddrinfo, "initialize", addrinfo_initialize, -1);
diff --git a/ext/socket/rubysocket.h b/ext/socket/rubysocket.h
index 7c5739808d1618..e2daa1b3265bd3 100644
--- a/ext/socket/rubysocket.h
+++ b/ext/socket/rubysocket.h
@@ -35,6 +35,7 @@
 #ifdef _WIN32
 #  include <winsock2.h>
 #  include <ws2tcpip.h>
+#  include <mswsock.h>
 #  include <iphlpapi.h>
 #  if defined(_MSC_VER)
 #    undef HAVE_TYPE_STRUCT_SOCKADDR_DL
@@ -137,6 +138,7 @@
 
 #include "internal.h"
 #include "internal/array.h"
+#include "internal/compilers.h"
 #include "internal/error.h"
 #include "internal/gc.h"
 #include "internal/io.h"
@@ -285,19 +287,18 @@ extern VALUE rb_cAddrinfo;
 extern VALUE rb_cSockOpt;
 
 extern VALUE rb_eSocket;
+extern VALUE rb_eResolution;
 
 #ifdef SOCKS
 extern VALUE rb_cSOCKSSocket;
 #  ifndef SOCKS5
-void SOCKSinit();
-int Rconnect();
+void SOCKSinit(char *);
+int Rconnect(int, const struct sockaddr *, socklen_t);
 #  endif
 #endif
 
 #include "constdefs.h"
 
-#define BLOCKING_REGION_FD(func, arg) (long)rb_thread_io_blocking_region((func), (arg), (arg)->fd)
-
 #define SockAddrStringValue(v) rsock_sockaddr_string_value(&(v))
 #define SockAddrStringValuePtr(v) rsock_sockaddr_string_value_ptr(&(v))
 #define SockAddrStringValueWithAddrinfo(v, rai_ret) rsock_sockaddr_string_value_with_addrinfo(&(v), &(rai_ret))
@@ -307,7 +308,7 @@ VALUE rsock_sockaddr_string_value_with_addrinfo(volatile VALUE *v, VALUE *ai_ret
 
 VALUE rb_check_sockaddr_string_type(VALUE);
 
-NORETURN(void rsock_raise_socket_error(const char *, int));
+NORETURN(void rsock_raise_resolution_error(const char *, int));
 
 int rsock_family_arg(VALUE domain);
 int rsock_socktype_arg(VALUE type);
@@ -326,8 +327,8 @@ void rb_freeaddrinfo(struct rb_addrinfo *ai);
 VALUE rsock_freeaddrinfo(VALUE arg);
 int rb_getnameinfo(const struct sockaddr *sa, socklen_t salen, char *host, size_t hostlen, char *serv, size_t servlen, int flags);
 int rsock_fd_family(int fd);
-struct rb_addrinfo *rsock_addrinfo(VALUE host, VALUE port, int family, int socktype, int flags);
-struct rb_addrinfo *rsock_getaddrinfo(VALUE host, VALUE port, struct addrinfo *hints, int socktype_hack);
+struct rb_addrinfo *rsock_addrinfo(VALUE host, VALUE port, int family, int socktype, int flags, unsigned int timeout);
+struct rb_addrinfo *rsock_getaddrinfo(VALUE host, VALUE port, struct addrinfo *hints, int socktype_hack, unsigned int timeout);
 
 VALUE rsock_fd_socket_addrinfo(int fd, struct sockaddr *addr, socklen_t len);
 VALUE rsock_io_socket_addrinfo(VALUE io, struct sockaddr *addr, socklen_t len);
@@ -354,7 +355,7 @@ int rsock_socket(int domain, int type, int proto);
 int rsock_detect_cloexec(int fd);
 VALUE rsock_init_sock(VALUE sock, int fd);
 VALUE rsock_sock_s_socketpair(int argc, VALUE *argv, VALUE klass);
-VALUE rsock_init_inetsock(VALUE sock, VALUE remote_host, VALUE remote_serv, VALUE local_host, VALUE local_serv, int type, VALUE resolv_timeout, VALUE connect_timeout);
+VALUE rsock_init_inetsock(VALUE sock, VALUE remote_host, VALUE remote_serv, VALUE local_host, VALUE local_serv, int type, VALUE resolv_timeout, VALUE connect_timeout, VALUE fast_fallback, VALUE test_mode_settings);
 VALUE rsock_init_unixsock(VALUE sock, VALUE path, int server);
 
 struct rsock_send_arg {
@@ -379,7 +380,7 @@ VALUE rsock_s_recvfrom_nonblock(VALUE sock, VALUE len, VALUE flg, VALUE str,
                                 VALUE ex, enum sock_recv_type from);
 VALUE rsock_s_recvfrom(VALUE sock, int argc, VALUE *argv, enum sock_recv_type from);
 
-int rsock_connect(int fd, const struct sockaddr *sockaddr, int len, int socks, struct timeval *timeout);
+int rsock_connect(VALUE self, const struct sockaddr *sockaddr, int len, int socks, VALUE timeout);
 
 VALUE rsock_s_accept(VALUE klass, VALUE io, struct sockaddr *sockaddr, socklen_t *len);
 VALUE rsock_s_accept_nonblock(VALUE klass, VALUE ex, rb_io_t *fptr,
@@ -413,6 +414,47 @@ ssize_t rsock_recvmsg(int socket, struct msghdr *message, int flags);
 void rsock_discard_cmsg_resource(struct msghdr *mh, int msg_peek_p);
 #endif
 
+char *raddrinfo_host_str(VALUE host, char *hbuf, size_t hbuflen, int *flags_ptr);
+char *raddrinfo_port_str(VALUE port, char *pbuf, size_t pbuflen, int *flags_ptr);
+
+#ifndef FAST_FALLBACK_INIT_INETSOCK_IMPL
+#  if !defined(HAVE_PTHREAD_CREATE) || !defined(HAVE_PTHREAD_DETACH) || defined(__MINGW32__) || defined(__MINGW64__)
+#    define FAST_FALLBACK_INIT_INETSOCK_IMPL 0
+#  else
+#    include "ruby/thread_native.h"
+#    define FAST_FALLBACK_INIT_INETSOCK_IMPL 1
+#    define IPV6_HOSTNAME_RESOLVED '1'
+#    define IPV4_HOSTNAME_RESOLVED '2'
+#    define SELECT_CANCELLED '3'
+
+struct fast_fallback_getaddrinfo_entry
+{
+    int family, err, refcount;
+    struct addrinfo hints;
+    struct addrinfo *ai;
+    struct fast_fallback_getaddrinfo_shared *shared;
+    int has_syserr;
+    long test_sleep_ms;
+    int test_ecode;
+};
+
+struct fast_fallback_getaddrinfo_shared
+{
+    int notify, refcount;
+    char *node, *service;
+    rb_nativethread_lock_t lock;
+    struct fast_fallback_getaddrinfo_entry getaddrinfo_entries[FLEX_ARY_LEN];
+};
+
+int raddrinfo_pthread_create(pthread_t *th, void *(*start_routine) (void *), void *arg);
+void *fork_safe_do_fast_fallback_getaddrinfo(void *ptr);
+void free_fast_fallback_getaddrinfo_entry(struct fast_fallback_getaddrinfo_entry **entry);
+void free_fast_fallback_getaddrinfo_shared(struct fast_fallback_getaddrinfo_shared **shared);
+#  endif
+#endif
+
+unsigned int rsock_value_timeout_to_msec(VALUE);
+
 void rsock_init_basicsocket(void);
 void rsock_init_ipsocket(void);
 void rsock_init_tcpsocket(void);
@@ -461,6 +503,8 @@ void rsock_make_fd_nonblock(int fd);
 
 int rsock_is_dgram(rb_io_t *fptr);
 
+extern ID tcp_fast_fallback;
+
 #if !defined HAVE_INET_NTOP && ! defined _WIN32
 const char *inet_ntop(int, const void *, char *, size_t);
 #elif defined __MINGW32__
diff --git a/ext/socket/socket.c b/ext/socket/socket.c
index 74cb0644e6f643..26bf0bae8c046d 100644
--- a/ext/socket/socket.c
+++ b/ext/socket/socket.c
@@ -14,6 +14,8 @@ static VALUE sym_wait_writable;
 
 static VALUE sock_s_unpack_sockaddr_in(VALUE, VALUE);
 
+ID tcp_fast_fallback;
+
 void
 rsock_sys_fail_host_port(const char *mesg, VALUE host, VALUE port)
 {
@@ -387,22 +389,20 @@ rsock_sock_s_socketpair(int argc, VALUE *argv, VALUE klass)
  * * connect function in Microsoft's Winsock functions reference
  */
 static VALUE
-sock_connect(VALUE sock, VALUE addr)
+sock_connect(VALUE self, VALUE addr)
 {
     VALUE rai;
-    rb_io_t *fptr;
-    int fd, n;
 
     SockAddrStringValueWithAddrinfo(addr, rai);
     addr = rb_str_new4(addr);
-    GetOpenFile(sock, fptr);
-    fd = fptr->fd;
-    n = rsock_connect(fd, (struct sockaddr*)RSTRING_PTR(addr), RSTRING_SOCKLEN(addr), 0, NULL);
-    if (n < 0) {
+
+    int result = rsock_connect(self, (struct sockaddr*)RSTRING_PTR(addr), RSTRING_SOCKLEN(addr), 0, RUBY_IO_TIMEOUT_DEFAULT);
+
+    if (result < 0) {
         rsock_sys_fail_raddrinfo_or_sockaddr("connect(2)", addr, rai);
     }
 
-    return INT2FIX(n);
+    return INT2FIX(result);
 }
 
 /* :nodoc: */
@@ -965,7 +965,7 @@ sock_s_gethostbyname(VALUE obj, VALUE host)
 {
     rb_warn("Socket.gethostbyname is deprecated; use Addrinfo.getaddrinfo instead.");
     struct rb_addrinfo *res =
-        rsock_addrinfo(host, Qnil, AF_UNSPEC, SOCK_STREAM, AI_CANONNAME);
+        rsock_addrinfo(host, Qnil, AF_UNSPEC, SOCK_STREAM, AI_CANONNAME, 0);
     return rsock_make_hostent(host, res, sock_sockaddr);
 }
 
@@ -1183,7 +1183,7 @@ sock_s_getaddrinfo(int argc, VALUE *argv, VALUE _)
         norevlookup = rsock_do_not_reverse_lookup;
     }
 
-    res = rsock_getaddrinfo(host, port, &hints, 0);
+    res = rsock_getaddrinfo(host, port, &hints, 0, 0);
 
     ret = make_addrinfo(res, norevlookup);
     rb_freeaddrinfo(res);
@@ -1279,7 +1279,7 @@ sock_s_getnameinfo(int argc, VALUE *argv, VALUE _)
         hints.ai_socktype = (fl & NI_DGRAM) ? SOCK_DGRAM : SOCK_STREAM;
         /* af */
         hints.ai_family = NIL_P(af) ? PF_UNSPEC : rsock_family_arg(af);
-        res = rsock_getaddrinfo(host, port, &hints, 0);
+        res = rsock_getaddrinfo(host, port, &hints, 0, 0);
         sap = res->ai->ai_addr;
         salen = res->ai->ai_addrlen;
     }
@@ -1313,7 +1313,7 @@ sock_s_getnameinfo(int argc, VALUE *argv, VALUE _)
     saved_errno = errno;
     if (res) rb_freeaddrinfo(res);
     errno = saved_errno;
-    rsock_raise_socket_error("getnameinfo", error);
+    rsock_raise_resolution_error("getnameinfo", error);
 
     UNREACHABLE_RETURN(Qnil);
 }
@@ -1335,7 +1335,7 @@ sock_s_getnameinfo(int argc, VALUE *argv, VALUE _)
 static VALUE
 sock_s_pack_sockaddr_in(VALUE self, VALUE port, VALUE host)
 {
-    struct rb_addrinfo *res = rsock_addrinfo(host, port, AF_UNSPEC, 0, 0);
+    struct rb_addrinfo *res = rsock_addrinfo(host, port, AF_UNSPEC, 0, 0, 0);
     VALUE addr = rb_str_new((char*)res->ai->ai_addr, res->ai->ai_addrlen);
 
     rb_freeaddrinfo(res);
@@ -1856,6 +1856,67 @@ socket_s_ip_address_list(VALUE self)
 #define socket_s_ip_address_list rb_f_notimplement
 #endif
 
+/*
+ * call-seq:
+ *   Socket.tcp_fast_fallback -> true or false
+ *
+ * Returns whether Happy Eyeballs Version 2 ({RFC 8305}[https://datatracker.ietf.org/doc/html/rfc8305]),
+ * which is provided starting from Ruby 3.4 when using TCPSocket.new and Socket.tcp,
+ * is enabled or disabled.
+ *
+ * If true, it is enabled for TCPSocket.new and Socket.tcp.
+ * (Note: Happy Eyeballs Version 2 is not provided when using TCPSocket.new on Windows.)
+ *
+ * If false, Happy Eyeballs Version 2 is disabled.
+ *
+ * For details on Happy Eyeballs Version 2,
+ * see {Socket.tcp_fast_fallback=}[rdoc-ref:Socket.tcp_fast_fallback=].
+ */
+VALUE socket_s_tcp_fast_fallback(VALUE self) {
+    return rb_ivar_get(rb_cSocket, tcp_fast_fallback);
+}
+
+/*
+ * call-seq:
+ *   Socket.tcp_fast_fallback= -> true or false
+ *
+ * Enable or disable Happy Eyeballs Version 2 ({RFC 8305}[https://datatracker.ietf.org/doc/html/rfc8305])
+ * globally, which is provided starting from Ruby 3.4 when using TCPSocket.new and Socket.tcp.
+ *
+ * When set to true, the feature is enabled for both `TCPSocket.new` and `Socket.tcp`.
+ * (Note: This feature is not available when using TCPSocket.new on Windows.)
+ *
+ * When set to false, the behavior reverts to that of Ruby 3.3 or earlier.
+ *
+ * The default value is true if no value is explicitly set by calling this method.
+ * However, when the environment variable RUBY_TCP_NO_FAST_FALLBACK=1 is set,
+ * the default is false.
+ *
+ * To control the setting on a per-method basis, use the fast_fallback keyword argument for each method.
+ *
+ * === Happy Eyeballs Version 2
+ * Happy Eyeballs Version 2 ({RFC 8305}[https://datatracker.ietf.org/doc/html/rfc8305])
+ * is an algorithm designed to improve client socket connectivity.<br>
+ * It aims for more reliable and efficient connections by performing hostname resolution
+ * and connection attempts in parallel, instead of serially.
+ *
+ * Starting from Ruby 3.4, this method operates as follows with this algorithm:
+ *
+ * 1. Start resolving both IPv6 and IPv4 addresses concurrently.
+ * 2. Start connecting to the one of the addresses that are obtained first.<br>If IPv4 addresses are obtained first,
+ *    the method waits 50 ms for IPv6 name resolution to prioritize IPv6 connections.
+ * 3. After starting a connection attempt, wait 250 ms for the connection to be established.<br>
+ *    If no connection is established within this time, a new connection is started every 250 ms<br>
+ *    until a connection is  established or there are no more candidate addresses.<br>
+ *    (Although RFC 8305 strictly specifies sorting addresses,<br>
+ *    this method only alternates between IPv6 / IPv4 addresses due to the performance concerns)
+ * 4. Once a connection is established, all remaining connection attempts are canceled.
+ */
+VALUE socket_s_tcp_fast_fallback_set(VALUE self, VALUE value) {
+    rb_ivar_set(rb_cSocket, tcp_fast_fallback, value);
+    return value;
+}
+
 void
 Init_socket(void)
 {
@@ -1984,6 +2045,16 @@ Init_socket(void)
 
     rsock_init_socket_init();
 
+    const char *tcp_no_fast_fallback_config = getenv("RUBY_TCP_NO_FAST_FALLBACK");
+    VALUE fast_fallback_default;
+    if (tcp_no_fast_fallback_config == NULL || strcmp(tcp_no_fast_fallback_config, "0") == 0) {
+        fast_fallback_default = Qtrue;
+    } else {
+        fast_fallback_default = Qfalse;
+    }
+    tcp_fast_fallback = rb_intern_const("tcp_fast_fallback");
+    rb_ivar_set(rb_cSocket, tcp_fast_fallback, fast_fallback_default);
+
     rb_define_method(rb_cSocket, "initialize", sock_initialize, -1);
     rb_define_method(rb_cSocket, "connect", sock_connect, 1);
 
@@ -2027,6 +2098,9 @@ Init_socket(void)
 
     rb_define_singleton_method(rb_cSocket, "ip_address_list", socket_s_ip_address_list, 0);
 
+    rb_define_singleton_method(rb_cSocket, "tcp_fast_fallback", socket_s_tcp_fast_fallback, 0);
+    rb_define_singleton_method(rb_cSocket, "tcp_fast_fallback=", socket_s_tcp_fast_fallback_set, 1);
+
 #undef rb_intern
     sym_wait_writable = ID2SYM(rb_intern("wait_writable"));
 }
diff --git a/ext/socket/sockssocket.c b/ext/socket/sockssocket.c
index f263ac3804abc7..f033f39b2e8888 100644
--- a/ext/socket/sockssocket.c
+++ b/ext/socket/sockssocket.c
@@ -30,11 +30,12 @@ socks_init(VALUE sock, VALUE host, VALUE port)
     static int init = 0;
 
     if (init == 0) {
-        SOCKSinit("ruby");
+        char progname[] = "ruby";
+        SOCKSinit(progname);
         init = 1;
     }
 
-    return rsock_init_inetsock(sock, host, port, Qnil, Qnil, INET_SOCKS, Qnil, Qnil);
+    return rsock_init_inetsock(sock, host, port, Qnil, Qnil, INET_SOCKS, Qnil, Qnil, Qfalse, Qnil);
 }
 
 #ifdef SOCKS5
@@ -48,7 +49,7 @@ socks_s_close(VALUE sock)
     rb_io_t *fptr;
 
     GetOpenFile(sock, fptr);
-    shutdown(fptr->fd, 2);
+    shutdown(fptr->fd, SHUT_RDWR);
     return rb_io_close(sock);
 }
 #endif
diff --git a/ext/socket/tcpserver.c b/ext/socket/tcpserver.c
index 04e5a0bb51d49d..8206fe46a9dee9 100644
--- a/ext/socket/tcpserver.c
+++ b/ext/socket/tcpserver.c
@@ -36,7 +36,7 @@ tcp_svr_init(int argc, VALUE *argv, VALUE sock)
     VALUE hostname, port;
 
     rb_scan_args(argc, argv, "011", &hostname, &port);
-    return rsock_init_inetsock(sock, hostname, port, Qnil, Qnil, INET_SERVER, Qnil, Qnil);
+    return rsock_init_inetsock(sock, hostname, port, Qnil, Qnil, INET_SERVER, Qnil, Qnil, Qfalse, Qnil);
 }
 
 /*
diff --git a/ext/socket/tcpsocket.c b/ext/socket/tcpsocket.c
index 03787272f3baf6..0467bcfd89630b 100644
--- a/ext/socket/tcpsocket.c
+++ b/ext/socket/tcpsocket.c
@@ -12,13 +12,30 @@
 
 /*
  * call-seq:
- *    TCPSocket.new(remote_host, remote_port, local_host=nil, local_port=nil, connect_timeout: nil)
+ *    TCPSocket.new(remote_host, remote_port, local_host=nil, local_port=nil, resolv_timeout: nil, connect_timeout: nil, fast_fallback: true)
  *
  * Opens a TCP connection to +remote_host+ on +remote_port+.  If +local_host+
  * and +local_port+ are specified, then those parameters are used on the local
  * end to establish the connection.
  *
- * [:connect_timeout] specify the timeout in seconds.
+ * Starting from Ruby 3.4, this method operates according to the
+ * Happy Eyeballs Version 2 ({RFC 8305}[https://datatracker.ietf.org/doc/html/rfc8305])
+ * algorithm by default, except on Windows.
+ *
+ * For details on Happy Eyeballs Version 2,
+ * see {Socket.tcp_fast_fallback=}[rdoc-ref:Socket.tcp_fast_fallback=].
+ *
+ * To make it behave the same as in Ruby 3.3 and earlier,
+ * explicitly specify the option fast_fallback:false.
+ * Or, setting Socket.tcp_fast_fallback=false will disable
+ * Happy Eyeballs Version 2 not only for this method but for all Socket globally.
+ *
+ * When using TCPSocket.new on Windows, Happy Eyeballs Version 2 is not provided,
+ * and it behaves the same as in Ruby 3.3 and earlier.
+ *
+ * [:resolv_timeout] Specifies the timeout in seconds from when the hostname resolution starts.
+ * [:connect_timeout] This method sequentially attempts connecting to all candidate destination addresses.<br>The +connect_timeout+ specifies the timeout in seconds from the start of the connection attempt to the last candidate.<br>By default, all connection attempts continue until the timeout occurs.<br>When +fast_fallback:false+ is explicitly specified,<br>a timeout is set for each connection attempt and any connection attempt that exceeds its timeout will be canceled.
+ * [:fast_fallback] Enables the Happy Eyeballs Version 2 algorithm (enabled by default).
  */
 static VALUE
 tcp_init(int argc, VALUE *argv, VALUE sock)
@@ -26,28 +43,40 @@ tcp_init(int argc, VALUE *argv, VALUE sock)
     VALUE remote_host, remote_serv;
     VALUE local_host, local_serv;
     VALUE opt;
-    static ID keyword_ids[2];
-    VALUE kwargs[2];
+    static ID keyword_ids[4];
+    VALUE kwargs[4];
     VALUE resolv_timeout = Qnil;
     VALUE connect_timeout = Qnil;
+    VALUE fast_fallback = Qnil;
+    VALUE test_mode_settings = Qnil;
 
     if (!keyword_ids[0]) {
         CONST_ID(keyword_ids[0], "resolv_timeout");
         CONST_ID(keyword_ids[1], "connect_timeout");
+        CONST_ID(keyword_ids[2], "fast_fallback");
+        CONST_ID(keyword_ids[3], "test_mode_settings");
     }
 
     rb_scan_args(argc, argv, "22:", &remote_host, &remote_serv,
                         &local_host, &local_serv, &opt);
 
     if (!NIL_P(opt)) {
-        rb_get_kwargs(opt, keyword_ids, 0, 2, kwargs);
+        rb_get_kwargs(opt, keyword_ids, 0, 4, kwargs);
         if (kwargs[0] != Qundef) { resolv_timeout = kwargs[0]; }
         if (kwargs[1] != Qundef) { connect_timeout = kwargs[1]; }
+        if (kwargs[2] != Qundef) { fast_fallback = kwargs[2]; }
+        if (kwargs[3] != Qundef) { test_mode_settings = kwargs[3]; }
+    }
+
+    if (fast_fallback == Qnil) {
+        fast_fallback = rb_ivar_get(rb_cSocket, tcp_fast_fallback);
+        if (fast_fallback == Qnil) fast_fallback = Qtrue;
     }
 
     return rsock_init_inetsock(sock, remote_host, remote_serv,
                                local_host, local_serv, INET_CLIENT,
-                               resolv_timeout, connect_timeout);
+                               resolv_timeout, connect_timeout, fast_fallback,
+                               test_mode_settings);
 }
 
 static VALUE
@@ -80,7 +109,7 @@ tcp_s_gethostbyname(VALUE obj, VALUE host)
 {
     rb_warn("TCPSocket.gethostbyname is deprecated; use Addrinfo.getaddrinfo instead.");
     struct rb_addrinfo *res =
-        rsock_addrinfo(host, Qnil, AF_UNSPEC, SOCK_STREAM, AI_CANONNAME);
+        rsock_addrinfo(host, Qnil, AF_UNSPEC, SOCK_STREAM, AI_CANONNAME, 0);
     return rsock_make_hostent(host, res, tcp_sockaddr);
 }
 
diff --git a/ext/socket/udpsocket.c b/ext/socket/udpsocket.c
index 5224e48a96a1fd..5538f24523fc09 100644
--- a/ext/socket/udpsocket.c
+++ b/ext/socket/udpsocket.c
@@ -45,22 +45,18 @@ udp_init(int argc, VALUE *argv, VALUE sock)
 
 struct udp_arg
 {
+    VALUE io;
     struct rb_addrinfo *res;
-    rb_io_t *fptr;
 };
 
 static VALUE
 udp_connect_internal(VALUE v)
 {
     struct udp_arg *arg = (void *)v;
-    rb_io_t *fptr;
-    int fd;
     struct addrinfo *res;
 
-    rb_io_check_closed(fptr = arg->fptr);
-    fd = fptr->fd;
     for (res = arg->res->ai; res; res = res->ai_next) {
-        if (rsock_connect(fd, res->ai_addr, res->ai_addrlen, 0, NULL) >= 0) {
+        if (rsock_connect(arg->io, res->ai_addr, res->ai_addrlen, 0, RUBY_IO_TIMEOUT_DEFAULT) >= 0) {
             return Qtrue;
         }
     }
@@ -84,16 +80,17 @@ udp_connect_internal(VALUE v)
  *
  */
 static VALUE
-udp_connect(VALUE sock, VALUE host, VALUE port)
+udp_connect(VALUE self, VALUE host, VALUE port)
 {
-    struct udp_arg arg;
-    VALUE ret;
+    struct udp_arg arg = {.io = self};
+
+    arg.res = rsock_addrinfo(host, port, rsock_fd_family(rb_io_descriptor(self)), SOCK_DGRAM, 0, 0);
+
+    int result = (int)rb_ensure(udp_connect_internal, (VALUE)&arg, rsock_freeaddrinfo, (VALUE)arg.res);
+    if (!result) {
+        rsock_sys_fail_host_port("connect(2)", host, port);
+    }
 
-    GetOpenFile(sock, arg.fptr);
-    arg.res = rsock_addrinfo(host, port, rsock_fd_family(arg.fptr->fd), SOCK_DGRAM, 0);
-    ret = rb_ensure(udp_connect_internal, (VALUE)&arg,
-                    rsock_freeaddrinfo, (VALUE)arg.res);
-    if (!ret) rsock_sys_fail_host_port("connect(2)", host, port);
     return INT2FIX(0);
 }
 
@@ -101,14 +98,13 @@ static VALUE
 udp_bind_internal(VALUE v)
 {
     struct udp_arg *arg = (void *)v;
-    rb_io_t *fptr;
-    int fd;
     struct addrinfo *res;
 
-    rb_io_check_closed(fptr = arg->fptr);
-    fd = fptr->fd;
+    rb_io_t *fptr;
+    RB_IO_POINTER(arg->io, fptr);
+
     for (res = arg->res->ai; res; res = res->ai_next) {
-        if (bind(fd, res->ai_addr, res->ai_addrlen) < 0) {
+        if (bind(fptr->fd, res->ai_addr, res->ai_addrlen) < 0) {
             continue;
         }
         return Qtrue;
@@ -129,22 +125,23 @@ udp_bind_internal(VALUE v)
  *
  */
 static VALUE
-udp_bind(VALUE sock, VALUE host, VALUE port)
+udp_bind(VALUE self, VALUE host, VALUE port)
 {
-    struct udp_arg arg;
-    VALUE ret;
+    struct udp_arg arg = {.io = self};
+
+    arg.res = rsock_addrinfo(host, port, rsock_fd_family(rb_io_descriptor(self)), SOCK_DGRAM, 0, 0);
+
+    VALUE result = rb_ensure(udp_bind_internal, (VALUE)&arg, rsock_freeaddrinfo, (VALUE)arg.res);
+    if (!result) {
+        rsock_sys_fail_host_port("bind(2)", host, port);
+    }
 
-    GetOpenFile(sock, arg.fptr);
-    arg.res = rsock_addrinfo(host, port, rsock_fd_family(arg.fptr->fd), SOCK_DGRAM, 0);
-    ret = rb_ensure(udp_bind_internal, (VALUE)&arg,
-                    rsock_freeaddrinfo, (VALUE)arg.res);
-    if (!ret) rsock_sys_fail_host_port("bind(2)", host, port);
     return INT2FIX(0);
 }
 
 struct udp_send_arg {
-    struct rb_addrinfo *res;
     rb_io_t *fptr;
+    struct rb_addrinfo *res;
     struct rsock_send_arg sarg;
 };
 
@@ -166,7 +163,7 @@ udp_send_internal(VALUE v)
         rb_io_wait(fptr->self, RB_INT2NUM(RUBY_IO_WRITABLE), Qnil);
 #endif
 
-        ssize_t n = (ssize_t)BLOCKING_REGION_FD(rsock_sendto_blocking, &arg->sarg);
+        ssize_t n = (ssize_t)rb_io_blocking_region(fptr, rsock_sendto_blocking, &arg->sarg);
 
         if (n >= 0) return RB_SSIZE2NUM(n);
 
@@ -215,7 +212,7 @@ udp_send(int argc, VALUE *argv, VALUE sock)
     GetOpenFile(sock, arg.fptr);
     arg.sarg.fd = arg.fptr->fd;
     arg.sarg.flags = NUM2INT(flags);
-    arg.res = rsock_addrinfo(host, port, rsock_fd_family(arg.fptr->fd), SOCK_DGRAM, 0);
+    arg.res = rsock_addrinfo(host, port, rsock_fd_family(arg.fptr->fd), SOCK_DGRAM, 0, 0);
     ret = rb_ensure(udp_send_internal, (VALUE)&arg,
                     rsock_freeaddrinfo, (VALUE)arg.res);
     if (!ret) rsock_sys_fail_host_port("sendto(2)", host, port);
diff --git a/ext/socket/unixsocket.c b/ext/socket/unixsocket.c
index a8475e3e6090a4..31e2acee04e896 100644
--- a/ext/socket/unixsocket.c
+++ b/ext/socket/unixsocket.c
@@ -14,15 +14,14 @@
 struct unixsock_arg {
     struct sockaddr_un *sockaddr;
     socklen_t sockaddrlen;
-    int fd;
+    VALUE io;
 };
 
 static VALUE
 unixsock_connect_internal(VALUE a)
 {
     struct unixsock_arg *arg = (struct unixsock_arg *)a;
-    return (VALUE)rsock_connect(arg->fd, (struct sockaddr*)arg->sockaddr,
-                                arg->sockaddrlen, 0, NULL);
+    return (VALUE)rsock_connect(arg->io, (struct sockaddr*)arg->sockaddr, arg->sockaddrlen, 0, RUBY_IO_TIMEOUT_DEFAULT);
 }
 
 static VALUE
@@ -51,7 +50,7 @@ unixsock_path_value(VALUE path)
 }
 
 VALUE
-rsock_init_unixsock(VALUE sock, VALUE path, int server)
+rsock_init_unixsock(VALUE self, VALUE path, int server)
 {
     struct sockaddr_un sockaddr;
     socklen_t sockaddrlen;
@@ -73,43 +72,46 @@ rsock_init_unixsock(VALUE sock, VALUE path, int server)
         rsock_sys_fail_path("socket(2)", path);
     }
 
+    VALUE io = rsock_init_sock(self, fd);
+    RB_IO_POINTER(io, fptr);
+
     if (server) {
         status = bind(fd, (struct sockaddr*)&sockaddr, sockaddrlen);
     }
     else {
-        int prot;
+        int error_tag;
         struct unixsock_arg arg;
         arg.sockaddr = &sockaddr;
         arg.sockaddrlen = sockaddrlen;
-        arg.fd = fd;
-        status = (int)rb_protect(unixsock_connect_internal, (VALUE)&arg, &prot);
-        if (prot) {
-            close(fd);
-            rb_jump_tag(prot);
+        arg.io = io;
+
+        status = (int)rb_protect(unixsock_connect_internal, (VALUE)&arg, &error_tag);
+
+        if (error_tag) {
+            rb_io_close(io);
+            rb_jump_tag(error_tag);
         }
     }
 
     if (status < 0) {
         int e = errno;
-        close(fd);
+        rb_io_close(io);
         rsock_syserr_fail_path(e, "connect(2)", path);
     }
 
     if (server) {
         if (listen(fd, SOMAXCONN) < 0) {
             int e = errno;
-            close(fd);
+            rb_io_close(io);
             rsock_syserr_fail_path(e, "listen(2)", path);
         }
     }
 
-    rsock_init_sock(sock, fd);
     if (server) {
-        GetOpenFile(sock, fptr);
         fptr->pathv = rb_str_new_frozen(path);
     }
 
-    return sock;
+    return io;
 }
 
 /*
@@ -125,9 +127,9 @@ rsock_init_unixsock(VALUE sock, VALUE path, int server)
  *
  */
 static VALUE
-unix_init(VALUE sock, VALUE path)
+unix_init(VALUE self, VALUE path)
 {
-    return rsock_init_unixsock(sock, path, 0);
+    return rsock_init_unixsock(self, path, 0);
 }
 
 /*
@@ -288,7 +290,7 @@ unix_send_io(VALUE sock, VALUE val)
 #endif
 
     arg.fd = fptr->fd;
-    while ((int)BLOCKING_REGION_FD(sendmsg_blocking, &arg) == -1) {
+    while ((int)rb_io_blocking_region(fptr, sendmsg_blocking, &arg) == -1) {
         if (!rb_io_wait_writable(arg.fd))
             rsock_sys_fail_path("sendmsg(2)", fptr->pathv);
     }
@@ -390,7 +392,7 @@ unix_recv_io(int argc, VALUE *argv, VALUE sock)
 #endif
 
     arg.fd = fptr->fd;
-    while ((int)BLOCKING_REGION_FD(recvmsg_blocking, &arg) == -1) {
+    while ((int)rb_io_blocking_region(fptr, recvmsg_blocking, &arg) == -1) {
         int e = errno;
         if (e == EMSGSIZE && !(gc_reason & GC_REASON_EMSGSIZE)) {
             /* FreeBSD gets here when we're out of FDs */
diff --git a/ext/stringio/.document b/ext/stringio/.document
new file mode 100644
index 00000000000000..decba0135a9458
--- /dev/null
+++ b/ext/stringio/.document
@@ -0,0 +1 @@
+*.[ch]
diff --git a/ext/stringio/depend b/ext/stringio/depend
index ba2b8120415ea5..3a82ad0a11cfbf 100644
--- a/ext/stringio/depend
+++ b/ext/stringio/depend
@@ -138,6 +138,7 @@ stringio.o: $(hdrdir)/ruby/internal/intern/re.h
 stringio.o: $(hdrdir)/ruby/internal/intern/ruby.h
 stringio.o: $(hdrdir)/ruby/internal/intern/select.h
 stringio.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+stringio.o: $(hdrdir)/ruby/internal/intern/set.h
 stringio.o: $(hdrdir)/ruby/internal/intern/signal.h
 stringio.o: $(hdrdir)/ruby/internal/intern/sprintf.h
 stringio.o: $(hdrdir)/ruby/internal/intern/string.h
@@ -157,6 +158,7 @@ stringio.o: $(hdrdir)/ruby/internal/special_consts.h
 stringio.o: $(hdrdir)/ruby/internal/static_assert.h
 stringio.o: $(hdrdir)/ruby/internal/stdalign.h
 stringio.o: $(hdrdir)/ruby/internal/stdbool.h
+stringio.o: $(hdrdir)/ruby/internal/stdckdint.h
 stringio.o: $(hdrdir)/ruby/internal/symbol.h
 stringio.o: $(hdrdir)/ruby/internal/value.h
 stringio.o: $(hdrdir)/ruby/internal/value_type.h
@@ -170,5 +172,6 @@ stringio.o: $(hdrdir)/ruby/oniguruma.h
 stringio.o: $(hdrdir)/ruby/ruby.h
 stringio.o: $(hdrdir)/ruby/st.h
 stringio.o: $(hdrdir)/ruby/subst.h
+stringio.o: $(hdrdir)/ruby/version.h
 stringio.o: stringio.c
 # AUTOGENERATED DEPENDENCIES END
diff --git a/ext/stringio/extconf.rb b/ext/stringio/extconf.rb
index ad8650dce2cda4..00897669836c2a 100644
--- a/ext/stringio/extconf.rb
+++ b/ext/stringio/extconf.rb
@@ -1,3 +1,9 @@
 # frozen_string_literal: false
 require 'mkmf'
-create_makefile('stringio')
+if RUBY_ENGINE == 'ruby'
+  have_type("rb_io_mode_t", "ruby/io.h")
+
+  create_makefile('stringio')
+else
+  File.write('Makefile', dummy_makefile("").join)
+end
diff --git a/ext/stringio/stringio.c b/ext/stringio/stringio.c
index e89a1d780cf996..3003939e10f8e4 100644
--- a/ext/stringio/stringio.c
+++ b/ext/stringio/stringio.c
@@ -12,11 +12,15 @@
 
 **********************************************************************/
 
-#define STRINGIO_VERSION "3.0.9"
+static const char *const
+STRINGIO_VERSION = "3.1.8.dev";
+
+#include <stdbool.h>
 
 #include "ruby.h"
 #include "ruby/io.h"
 #include "ruby/encoding.h"
+#include "ruby/version.h"
 #if defined(HAVE_FCNTL_H) || defined(_WIN32)
 #include <fcntl.h>
 #elif defined(HAVE_SYS_FCNTL_H)
@@ -32,12 +36,29 @@
 # define rb_class_new_instance_kw(argc, argv, klass, kw_splat) rb_class_new_instance(argc, argv, klass)
 #endif
 
+static inline bool
+str_chilled_p(VALUE str)
+{
+#if (RUBY_API_VERSION_MAJOR == 3 && RUBY_API_VERSION_MINOR >= 4) || RUBY_API_VERSION_MAJOR >= 4
+    // Do not attempt to modify chilled strings on Ruby 3.4+
+    // RUBY_FL_USER2 == STR_CHILLED_LITERAL
+    // RUBY_FL_USER3 == STR_CHILLED_SYMBOL_TO_S
+    return FL_TEST_RAW(str, RUBY_FL_USER2 | RUBY_FL_USER3);
+#else
+    return false;
+#endif
+}
+
+#ifndef HAVE_TYPE_RB_IO_MODE_T
+typedef int rb_io_mode_t;
+#endif
+
 struct StringIO {
     VALUE string;
     rb_encoding *enc;
     long pos;
     long lineno;
-    int flags;
+    rb_io_mode_t flags;
     int count;
 };
 
@@ -47,7 +68,13 @@ static long strio_write(VALUE self, VALUE str);
 
 #define IS_STRIO(obj) (rb_typeddata_is_kind_of((obj), &strio_data_type))
 #define error_inval(msg) (rb_syserr_fail(EINVAL, msg))
-#define get_enc(ptr) ((ptr)->enc ? (ptr)->enc : rb_enc_get((ptr)->string))
+#define get_enc(ptr) ((ptr)->enc ? (ptr)->enc : !NIL_P((ptr)->string) ? rb_enc_get((ptr)->string) : NULL)
+
+static bool
+readonly_string_p(VALUE string)
+{
+    return OBJ_FROZEN_RAW(string);
+}
 
 static struct StringIO *
 strio_alloc(void)
@@ -165,9 +192,15 @@ writable(VALUE strio)
 static void
 check_modifiable(struct StringIO *ptr)
 {
-    if (OBJ_FROZEN(ptr->string)) {
+    if (NIL_P(ptr->string)) {
+	/* Null device StringIO */
+    }
+    else if (OBJ_FROZEN_RAW(ptr->string)) {
 	rb_raise(rb_eIOError, "not modifiable string");
     }
+    else {
+	rb_str_modify(ptr->string);
+    }
 }
 
 static VALUE
@@ -280,13 +313,14 @@ strio_init(int argc, VALUE *argv, struct StringIO *ptr, VALUE self)
 
     argc = rb_scan_args(argc, argv, "02:", &string, &vmode, &opt);
     rb_io_extract_modeenc(&vmode, 0, opt, &oflags, &ptr->flags, &convconfig);
-    if (argc) {
+    if (!NIL_P(string)) {
 	StringValue(string);
     }
-    else {
+    else if (!argc) {
 	string = rb_enc_str_new("", 0, rb_default_external_encoding());
     }
-    if (OBJ_FROZEN_RAW(string)) {
+
+    if (!NIL_P(string) && readonly_string_p(string)) {
 	if (ptr->flags & FMODE_WRITABLE) {
 	    rb_syserr_fail(EACCES, 0);
 	}
@@ -296,11 +330,11 @@ strio_init(int argc, VALUE *argv, struct StringIO *ptr, VALUE self)
 	    ptr->flags |= FMODE_WRITABLE;
 	}
     }
-    if (ptr->flags & FMODE_TRUNC) {
+    if (!NIL_P(string) && (ptr->flags & FMODE_TRUNC)) {
 	rb_str_resize(string, 0);
     }
     RB_OBJ_WRITE(self, &ptr->string, string);
-    if (argc == 1) {
+    if (argc == 1 && !NIL_P(string)) {
 	ptr->enc = rb_enc_get(string);
     }
     else {
@@ -480,7 +514,7 @@ strio_set_string(VALUE self, VALUE string)
     rb_io_taint_check(self);
     ptr->flags &= ~FMODE_READWRITE;
     StringValue(string);
-    ptr->flags = OBJ_FROZEN(string) ? FMODE_READABLE : FMODE_READWRITE;
+    ptr->flags = readonly_string_p(string) ? FMODE_READABLE : FMODE_READWRITE;
     ptr->pos = 0;
     ptr->lineno = 0;
     RB_OBJ_WRITE(self, &ptr->string, string);
@@ -594,6 +628,7 @@ static struct StringIO *
 strio_to_read(VALUE self)
 {
     struct StringIO *ptr = readable(self);
+    if (NIL_P(ptr->string)) return NULL;
     if (ptr->pos < RSTRING_LEN(ptr->string)) return ptr;
     return NULL;
 }
@@ -603,7 +638,7 @@ strio_to_read(VALUE self)
  *   eof? -> true or false
  *
  * Returns +true+ if positioned at end-of-stream, +false+ otherwise;
- * see {Position}[rdoc-ref:File@Position].
+ * see {Position}[rdoc-ref:IO@Position].
  *
  * Raises IOError if the stream is not opened for reading.
  */
@@ -871,7 +906,7 @@ strio_getc(VALUE self)
     int len;
     char *p;
 
-    if (pos >= RSTRING_LEN(str)) {
+    if (NIL_P(str) || pos >= RSTRING_LEN(str)) {
 	return Qnil;
     }
     p = RSTRING_PTR(str)+pos;
@@ -892,7 +927,7 @@ strio_getbyte(VALUE self)
 {
     struct StringIO *ptr = readable(self);
     int c;
-    if (ptr->pos >= RSTRING_LEN(ptr->string)) {
+    if (NIL_P(ptr->string) || ptr->pos >= RSTRING_LEN(ptr->string)) {
 	return Qnil;
     }
     c = RSTRING_PTR(ptr->string)[ptr->pos++];
@@ -914,8 +949,17 @@ strio_extend(struct StringIO *ptr, long pos, long len)
 	if (pos > olen)
 	    MEMZERO(RSTRING_PTR(ptr->string) + olen, char, pos - olen);
     }
-    else {
-	rb_str_modify(ptr->string);
+}
+
+static void
+strio_unget_string(struct StringIO *ptr, VALUE c)
+{
+    const char *cp = NULL;
+    long cl = RSTRING_LEN(c);
+    if (cl > 0) {
+	if (c != ptr->string) cp = RSTRING_PTR(c);
+	strio_unget_bytes(ptr, cp, cl);
+	RB_GC_GUARD(c);
     }
 }
 
@@ -933,6 +977,7 @@ strio_ungetc(VALUE self, VALUE c)
     rb_encoding *enc, *enc2;
 
     check_modifiable(ptr);
+    if (NIL_P(ptr->string)) return Qnil;
     if (NIL_P(c)) return Qnil;
     if (RB_INTEGER_TYPE_P(c)) {
 	int len, cc = NUM2INT(c);
@@ -940,19 +985,22 @@ strio_ungetc(VALUE self, VALUE c)
 
 	enc = rb_enc_get(ptr->string);
 	len = rb_enc_codelen(cc, enc);
-	if (len <= 0) rb_enc_uint_chr(cc, enc);
+	if (len <= 0) {
+	    rb_enc_uint_chr(cc, enc); /* to raise an exception */
+	    UNREACHABLE;
+	}
 	rb_enc_mbcput(cc, buf, enc);
 	return strio_unget_bytes(ptr, buf, len);
     }
     else {
-	SafeStringValue(c);
+	StringValue(c);
+	if (RSTRING_LEN(c) == 0) return Qnil;
 	enc = rb_enc_get(ptr->string);
 	enc2 = rb_enc_get(c);
 	if (enc != enc2 && enc != rb_ascii8bit_encoding()) {
 	    c = rb_str_conv_enc(c, enc2, enc);
 	}
-	strio_unget_bytes(ptr, RSTRING_PTR(c), RSTRING_LEN(c));
-	RB_GC_GUARD(c);
+	strio_unget_string(ptr, c);
 	return Qnil;
     }
 }
@@ -970,21 +1018,17 @@ strio_ungetbyte(VALUE self, VALUE c)
     struct StringIO *ptr = readable(self);
 
     check_modifiable(ptr);
+    if (NIL_P(ptr->string)) return Qnil;
     if (NIL_P(c)) return Qnil;
     if (RB_INTEGER_TYPE_P(c)) {
-        /* rb_int_and() not visible from exts */
-        VALUE v = rb_funcall(c, '&', 1, INT2FIX(0xff));
-        const char cc = NUM2INT(v) & 0xFF;
-        strio_unget_bytes(ptr, &cc, 1);
+	/* rb_int_and() not visible from exts */
+	VALUE v = rb_funcall(c, '&', 1, INT2FIX(0xff));
+	const char cc = NUM2INT(v) & 0xFF;
+	strio_unget_bytes(ptr, &cc, 1);
     }
     else {
-	long cl;
-	SafeStringValue(c);
-	cl = RSTRING_LEN(c);
-	if (cl > 0) {
-	    strio_unget_bytes(ptr, RSTRING_PTR(c), cl);
-	    RB_GC_GUARD(c);
-	}
+	StringValue(c);
+	strio_unget_string(ptr, c);
     }
     return Qnil;
 }
@@ -1015,7 +1059,7 @@ strio_unget_bytes(struct StringIO *ptr, const char *cp, long cl)
 	if (rest > cl) memset(s + len, 0, rest - cl);
 	pos -= cl;
     }
-    memcpy(s + pos, cp, cl);
+    memcpy(s + pos, (cp ? cp : s), cl);
     ptr->pos = pos;
     return Qnil;
 }
@@ -1142,38 +1186,57 @@ struct getline_arg {
 };
 
 static struct getline_arg *
-prepare_getline_args(struct getline_arg *arg, int argc, VALUE *argv)
+prepare_getline_args(struct StringIO *ptr, struct getline_arg *arg, int argc, VALUE *argv)
 {
-    VALUE str, lim, opts;
+    VALUE rs, lim, opts;
     long limit = -1;
     int respect_chomp;
 
-    argc = rb_scan_args(argc, argv, "02:", &str, &lim, &opts);
-    respect_chomp = argc == 0 || !NIL_P(str);
+    argc = rb_scan_args(argc, argv, "02:", &rs, &lim, &opts);
+    respect_chomp = argc == 0 || !NIL_P(rs);
     switch (argc) {
       case 0:
-	str = rb_rs;
+	rs = rb_rs;
 	break;
 
       case 1:
-	if (!NIL_P(str) && !RB_TYPE_P(str, T_STRING)) {
-	    VALUE tmp = rb_check_string_type(str);
+	if (!NIL_P(rs) && !RB_TYPE_P(rs, T_STRING)) {
+	    VALUE tmp = rb_check_string_type(rs);
 	    if (NIL_P(tmp)) {
-		limit = NUM2LONG(str);
-		str = rb_rs;
+		limit = NUM2LONG(rs);
+		rs = rb_rs;
 	    }
 	    else {
-		str = tmp;
+		rs = tmp;
 	    }
 	}
 	break;
 
       case 2:
-	if (!NIL_P(str)) StringValue(str);
+	if (!NIL_P(rs)) StringValue(rs);
 	if (!NIL_P(lim)) limit = NUM2LONG(lim);
 	break;
     }
-    arg->rs = str;
+    if (!NIL_P(ptr->string) && !NIL_P(rs)) {
+	rb_encoding *enc_rs, *enc_io;
+	enc_rs = rb_enc_get(rs);
+	enc_io = get_enc(ptr);
+	if (enc_rs != enc_io &&
+	    (rb_enc_str_coderange(rs) != ENC_CODERANGE_7BIT ||
+	     (RSTRING_LEN(rs) > 0 && !rb_enc_asciicompat(enc_io)))) {
+	    if (rs == rb_rs) {
+		rs = rb_enc_str_new(0, 0, enc_io);
+		rb_str_buf_cat_ascii(rs, "\n");
+		rs = rs;
+	    }
+	    else {
+		rb_raise(rb_eArgError, "encoding mismatch: %s IO with %s RS",
+			 rb_enc_name(enc_io),
+			 rb_enc_name(enc_rs));
+	    }
+	}
+    }
+    arg->rs = rs;
     arg->limit = limit;
     arg->chomp = 0;
     if (!NIL_P(opts)) {
@@ -1183,9 +1246,9 @@ prepare_getline_args(struct getline_arg *arg, int argc, VALUE *argv)
 	    keywords[0] = rb_intern_const("chomp");
 	}
 	rb_get_kwargs(opts, keywords, 0, 1, &vchomp);
-        if (respect_chomp) {
+	if (respect_chomp) {
 	    arg->chomp = (vchomp != Qundef) && RTEST(vchomp);
-        }
+	}
     }
     return arg;
 }
@@ -1209,7 +1272,7 @@ strio_getline(struct getline_arg *arg, struct StringIO *ptr)
     long w = 0;
     rb_encoding *enc = get_enc(ptr);
 
-    if (ptr->pos >= (n = RSTRING_LEN(ptr->string))) {
+    if (NIL_P(ptr->string) || ptr->pos >= (n = RSTRING_LEN(ptr->string))) {
 	return Qnil;
     }
     s = RSTRING_PTR(ptr->string);
@@ -1225,7 +1288,7 @@ strio_getline(struct getline_arg *arg, struct StringIO *ptr)
 	str = strio_substr(ptr, ptr->pos, e - s - w, enc);
     }
     else if ((n = RSTRING_LEN(str)) == 0) {
-        const char *paragraph_end = NULL;
+	const char *paragraph_end = NULL;
 	p = s;
 	while (p[(p + 1 < e) && (*p == '\r') && 0] == '\n') {
 	    p += *p == '\r';
@@ -1235,18 +1298,18 @@ strio_getline(struct getline_arg *arg, struct StringIO *ptr)
 	}
 	s = p;
 	while ((p = memchr(p, '\n', e - p)) && (p != e)) {
-            p++;
-            if (!((p < e && *p == '\n') ||
-                  (p + 1 < e && *p == '\r' && *(p+1) == '\n'))) {
-                continue;
-            }
-            paragraph_end = p - ((*(p-2) == '\r') ? 2 : 1);
-            while ((p < e && *p == '\n') ||
-                   (p + 1 < e && *p == '\r' && *(p+1) == '\n')) {
-                p += (*p == '\r') ? 2 : 1;
-            }
-            e = p;
-            break;
+	    p++;
+	    if (!((p < e && *p == '\n') ||
+		  (p + 1 < e && *p == '\r' && *(p+1) == '\n'))) {
+		continue;
+	    }
+	    paragraph_end = p - ((*(p-2) == '\r') ? 2 : 1);
+	    while ((p < e && *p == '\n') ||
+		   (p + 1 < e && *p == '\r' && *(p+1) == '\n')) {
+		p += (*p == '\r') ? 2 : 1;
+	    }
+	    e = p;
+	    break;
 	}
 	if (arg->chomp && paragraph_end) {
 	    w = e - paragraph_end;
@@ -1301,15 +1364,16 @@ strio_getline(struct getline_arg *arg, struct StringIO *ptr)
 static VALUE
 strio_gets(int argc, VALUE *argv, VALUE self)
 {
+    struct StringIO *ptr = readable(self);
     struct getline_arg arg;
     VALUE str;
 
-    if (prepare_getline_args(&arg, argc, argv)->limit == 0) {
-	struct StringIO *ptr = readable(self);
+    if (prepare_getline_args(ptr, &arg, argc, argv)->limit == 0) {
+	if (NIL_P(ptr->string)) return Qnil;
 	return rb_enc_str_new(0, 0, get_enc(ptr));
     }
 
-    str = strio_getline(&arg, readable(self));
+    str = strio_getline(&arg, ptr);
     rb_lastline_set(str);
     return str;
 }
@@ -1346,16 +1410,16 @@ static VALUE
 strio_each(int argc, VALUE *argv, VALUE self)
 {
     VALUE line;
+    struct StringIO *ptr = readable(self);
     struct getline_arg arg;
 
-    StringIO(self);
     RETURN_ENUMERATOR(self, argc, argv);
 
-    if (prepare_getline_args(&arg, argc, argv)->limit == 0) {
+    if (prepare_getline_args(ptr, &arg, argc, argv)->limit == 0) {
 	rb_raise(rb_eArgError, "invalid limit: 0 for each_line");
     }
 
-    while (!NIL_P(line = strio_getline(&arg, readable(self)))) {
+    while (!NIL_P(line = strio_getline(&arg, ptr))) {
 	rb_yield(line);
     }
     return self;
@@ -1373,15 +1437,15 @@ static VALUE
 strio_readlines(int argc, VALUE *argv, VALUE self)
 {
     VALUE ary, line;
+    struct StringIO *ptr = readable(self);
     struct getline_arg arg;
 
-    StringIO(self);
-    ary = rb_ary_new();
-    if (prepare_getline_args(&arg, argc, argv)->limit == 0) {
+    if (prepare_getline_args(ptr, &arg, argc, argv)->limit == 0) {
 	rb_raise(rb_eArgError, "invalid limit: 0 for readlines");
     }
 
-    while (!NIL_P(line = strio_getline(&arg, readable(self)))) {
+    ary = rb_ary_new();
+    while (!NIL_P(line = strio_getline(&arg, ptr))) {
 	rb_ary_push(ary, line);
     }
     return ary;
@@ -1420,6 +1484,7 @@ strio_write(VALUE self, VALUE str)
     if (!RB_TYPE_P(str, T_STRING))
 	str = rb_obj_as_string(str);
     enc = get_enc(ptr);
+    if (!enc) return 0;
     enc2 = rb_enc_get(str);
     if (enc != enc2 && enc != ascii8bit && enc != (usascii = rb_usascii_encoding())) {
 	VALUE converted = rb_str_conv_enc(str, enc2, enc);
@@ -1445,6 +1510,7 @@ strio_write(VALUE self, VALUE str)
     }
     else {
 	strio_extend(ptr, ptr->pos, len);
+	rb_str_modify(ptr->string);
 	memmove(RSTRING_PTR(ptr->string)+ptr->pos, RSTRING_PTR(str), len);
     }
     RB_GC_GUARD(str);
@@ -1491,10 +1557,12 @@ strio_putc(VALUE self, VALUE ch)
 
     check_modifiable(ptr);
     if (RB_TYPE_P(ch, T_STRING)) {
+	if (NIL_P(ptr->string)) return ch;
 	str = rb_str_substr(ch, 0, 1);
     }
     else {
 	char c = NUM2CHR(ch);
+	if (NIL_P(ptr->string)) return ch;
 	str = rb_str_new(&c, 1);
     }
     strio_write(self, str);
@@ -1537,7 +1605,8 @@ strio_read(int argc, VALUE *argv, VALUE self)
 	    if (len < 0) {
 		rb_raise(rb_eArgError, "negative length %ld given", len);
 	    }
-	    if (len > 0 && ptr->pos >= RSTRING_LEN(ptr->string)) {
+	    if (len > 0 &&
+		(NIL_P(ptr->string) || ptr->pos >= RSTRING_LEN(ptr->string))) {
 		if (!NIL_P(str)) rb_str_resize(str, 0);
 		return Qnil;
 	    }
@@ -1546,6 +1615,7 @@ strio_read(int argc, VALUE *argv, VALUE self)
 	}
 	/* fall through */
       case 0:
+	if (NIL_P(ptr->string)) return Qnil;
 	len = RSTRING_LEN(ptr->string);
 	if (len <= ptr->pos) {
 	    rb_encoding *enc = get_enc(ptr);
@@ -1563,7 +1633,7 @@ strio_read(int argc, VALUE *argv, VALUE self)
 	}
 	break;
       default:
-        rb_error_arity(argc, 0, 2);
+	rb_error_arity(argc, 0, 2);
     }
     if (NIL_P(str)) {
 	rb_encoding *enc = binary ? rb_ascii8bit_encoding() : get_enc(ptr);
@@ -1574,10 +1644,9 @@ strio_read(int argc, VALUE *argv, VALUE self)
 	if (len > rest) len = rest;
 	rb_str_resize(str, len);
 	MEMCPY(RSTRING_PTR(str), RSTRING_PTR(ptr->string) + ptr->pos, char, len);
-	if (binary)
-	    rb_enc_associate(str, rb_ascii8bit_encoding());
-	else
+	if (!binary) {
 	    rb_enc_copy(str, ptr->string);
+	}
     }
     ptr->pos += RSTRING_LEN(str);
     return str;
@@ -1599,21 +1668,28 @@ strio_pread(int argc, VALUE *argv, VALUE self)
     long offset = NUM2LONG(rb_offset);
 
     if (len < 0) {
-        rb_raise(rb_eArgError, "negative string size (or size too big): %" PRIsVALUE, rb_len);
+	rb_raise(rb_eArgError, "negative string size (or size too big): %" PRIsVALUE, rb_len);
+    }
+
+    if (len == 0) {
+	if (NIL_P(rb_buf)) {
+	    return rb_str_new("", 0);
+	}
+	return rb_buf;
     }
 
     if (offset < 0) {
-        rb_syserr_fail_str(EINVAL, rb_sprintf("pread: Invalid offset argument: %" PRIsVALUE, rb_offset));
+	rb_syserr_fail_str(EINVAL, rb_sprintf("pread: Invalid offset argument: %" PRIsVALUE, rb_offset));
     }
 
     struct StringIO *ptr = readable(self);
 
     if (offset >= RSTRING_LEN(ptr->string)) {
-        rb_eof_error();
+	rb_eof_error();
     }
 
     if (NIL_P(rb_buf)) {
-        return strio_substr(ptr, offset, len, rb_ascii8bit_encoding());
+	return strio_substr(ptr, offset, len, rb_ascii8bit_encoding());
     }
 
     long rest = RSTRING_LEN(ptr->string) - offset;
@@ -1673,8 +1749,14 @@ strio_read_nonblock(int argc, VALUE *argv, VALUE self)
     return val;
 }
 
+/*
+ * See IO#write
+ */
 #define strio_syswrite rb_io_write
 
+/*
+ * See IO#write_nonblock
+ */
 static VALUE
 strio_syswrite_nonblock(int argc, VALUE *argv, VALUE self)
 {
@@ -1702,7 +1784,7 @@ strio_size(VALUE self)
 {
     VALUE string = StringIO(self)->string;
     if (NIL_P(string)) {
-	rb_raise(rb_eIOError, "not opened");
+	return INT2FIX(0);
     }
     return ULONG2NUM(RSTRING_LEN(string));
 }
@@ -1719,10 +1801,12 @@ strio_truncate(VALUE self, VALUE len)
 {
     VALUE string = writable(self)->string;
     long l = NUM2LONG(len);
-    long plen = RSTRING_LEN(string);
+    long plen;
     if (l < 0) {
 	error_inval("negative length");
     }
+    if (NIL_P(string)) return 0;
+    plen = RSTRING_LEN(string);
     rb_str_resize(string, l);
     if (plen < l) {
 	MEMZERO(RSTRING_PTR(string) + plen, char, l - plen);
@@ -1786,20 +1870,30 @@ strio_set_encoding(int argc, VALUE *argv, VALUE self)
 	enc = rb_find_encoding(ext_enc);
 	if (!enc) {
 	    rb_io_enc_t convconfig;
-	    int oflags, fmode;
+	    int oflags;
+	    rb_io_mode_t fmode;
 	    VALUE vmode = rb_str_append(rb_str_new_cstr("r:"), ext_enc);
 	    rb_io_extract_modeenc(&vmode, 0, Qnil, &oflags, &fmode, &convconfig);
 	    enc = convconfig.enc2;
 	}
     }
     ptr->enc = enc;
-    if (WRITABLE(self)) {
+    if (!NIL_P(ptr->string) && WRITABLE(self) && !str_chilled_p(ptr->string)) {
 	rb_enc_associate(ptr->string, enc);
     }
 
     return self;
 }
 
+/*
+ *  call-seq:
+ *     strio.set_encoding_by_bom  => strio or nil
+ *
+ *  Sets the encoding according to the BOM (Byte Order Mark) in the
+ *  string.
+ *
+ *  Returns +self+ if the BOM is found, otherwise +nil.
+ */
 static VALUE
 strio_set_encoding_by_bom(VALUE self)
 {
@@ -1832,10 +1926,15 @@ Init_stringio(void)
 
     VALUE StringIO = rb_define_class("StringIO", rb_cObject);
 
+    /* The version string */
     rb_define_const(StringIO, "VERSION", rb_str_new_cstr(STRINGIO_VERSION));
 
     rb_include_module(StringIO, rb_mEnumerable);
     rb_define_alloc_func(StringIO, strio_s_allocate);
+
+    /* Maximum length that a StringIO instance can hold */
+    rb_define_const(StringIO, "MAX_LENGTH", LONG2NUM(LONG_MAX));
+
     rb_define_singleton_method(StringIO, "new", strio_s_new, -1);
     rb_define_singleton_method(StringIO, "open", strio_s_open, -1);
     rb_define_method(StringIO, "initialize", strio_initialize, -1);
diff --git a/ext/stringio/stringio.gemspec b/ext/stringio/stringio.gemspec
index 7d320b3e788ff4..f9a0742049dd69 100644
--- a/ext/stringio/stringio.gemspec
+++ b/ext/stringio/stringio.gemspec
@@ -4,7 +4,7 @@
 source_version = ["", "ext/stringio/"].find do |dir|
   begin
     break File.open(File.join(__dir__, "#{dir}stringio.c")) {|f|
-      f.gets("\n#define STRINGIO_VERSION ")
+      f.gets("\nSTRINGIO_VERSION ")
       f.gets[/\s*"(.+)"/, 1]
     }
   rescue Errno::ENOENT
@@ -21,17 +21,26 @@ Gem::Specification.new do |s|
   s.files = ["README.md"]
   jruby = true if Gem::Platform.new('java') =~ s.platform or RUBY_ENGINE == 'jruby'
   if jruby
-    s.files += ["lib/stringio.rb", "lib/stringio.jar"]
+    s.require_paths = "lib/java"
+    s.files += ["lib/java/stringio.rb", "lib/java/stringio.jar"]
     s.platform = "java"
   else
     s.extensions = ["ext/stringio/extconf.rb"]
     s.files += ["ext/stringio/extconf.rb", "ext/stringio/stringio.c"]
   end
+
+  s.extra_rdoc_files = [
+    ".document", ".rdoc_options", "COPYING", "LICENSE.txt",
+    "NEWS.md", "README.md", "docs/io.rb", "ext/stringio/.document",
+  ]
+
   s.homepage = "https://github.com/ruby/stringio"
   s.licenses = ["Ruby", "BSD-2-Clause"]
   s.required_ruby_version = ">= 2.7"
   s.summary = "Pseudo IO on String"
 
+  s.metadata["changelog_uri"] = "#{s.homepage}/releases/tag/v#{s.version}"
+
   # s.cert_chain  = %w[certs/nobu.pem]
   # s.signing_key = File.expand_path("~/.ssh/gem-private_key.pem") if $0 =~ /gem\z/
 end
diff --git a/ext/strscan/depend b/ext/strscan/depend
index 8d985b59e87714..b40a0252308a48 100644
--- a/ext/strscan/depend
+++ b/ext/strscan/depend
@@ -138,6 +138,7 @@ strscan.o: $(hdrdir)/ruby/internal/intern/re.h
 strscan.o: $(hdrdir)/ruby/internal/intern/ruby.h
 strscan.o: $(hdrdir)/ruby/internal/intern/select.h
 strscan.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+strscan.o: $(hdrdir)/ruby/internal/intern/set.h
 strscan.o: $(hdrdir)/ruby/internal/intern/signal.h
 strscan.o: $(hdrdir)/ruby/internal/intern/sprintf.h
 strscan.o: $(hdrdir)/ruby/internal/intern/string.h
@@ -157,6 +158,7 @@ strscan.o: $(hdrdir)/ruby/internal/special_consts.h
 strscan.o: $(hdrdir)/ruby/internal/static_assert.h
 strscan.o: $(hdrdir)/ruby/internal/stdalign.h
 strscan.o: $(hdrdir)/ruby/internal/stdbool.h
+strscan.o: $(hdrdir)/ruby/internal/stdckdint.h
 strscan.o: $(hdrdir)/ruby/internal/symbol.h
 strscan.o: $(hdrdir)/ruby/internal/value.h
 strscan.o: $(hdrdir)/ruby/internal/value_type.h
diff --git a/ext/strscan/extconf.rb b/ext/strscan/extconf.rb
index bd65606a4e5984..3c311d2364b7d7 100644
--- a/ext/strscan/extconf.rb
+++ b/ext/strscan/extconf.rb
@@ -2,8 +2,8 @@
 require 'mkmf'
 if RUBY_ENGINE == 'ruby'
   $INCFLAGS << " -I$(top_srcdir)" if $extmk
-  have_func("onig_region_memsize", "ruby.h")
-  have_func("rb_reg_onig_match", "ruby.h")
+  have_func("onig_region_memsize(NULL)")
+  have_func("rb_reg_onig_match", "ruby/re.h")
   create_makefile 'strscan'
 else
   File.write('Makefile', dummy_makefile("").join)
diff --git a/ext/strscan/lib/strscan/strscan.rb b/ext/strscan/lib/strscan/strscan.rb
new file mode 100644
index 00000000000000..46acc7ea823f07
--- /dev/null
+++ b/ext/strscan/lib/strscan/strscan.rb
@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+class StringScanner
+  # call-seq:
+  #   scan_integer(base: 10)
+  #
+  # If `base` isn't provided or is `10`, then it is equivalent to calling `#scan` with a `[+-]?\d+` pattern,
+  # and returns an Integer or nil.
+  #
+  # If `base` is `16`, then it is equivalent to calling `#scan` with a `[+-]?(0x)?[0-9a-fA-F]+` pattern,
+  # and returns an Integer or nil.
+  #
+  # The scanned string must be encoded with an ASCII compatible encoding, otherwise
+  # Encoding::CompatibilityError will be raised.
+  def scan_integer(base: 10)
+    case base
+    when 10
+      scan_base10_integer
+    when 16
+      scan_base16_integer
+    else
+      raise ArgumentError, "Unsupported integer base: #{base.inspect}, expected 10 or 16"
+    end
+  end
+end
diff --git a/ext/strscan/strscan.c b/ext/strscan/strscan.c
index 16d669d8a5860a..bc543f62b1aa1e 100644
--- a/ext/strscan/strscan.c
+++ b/ext/strscan/strscan.c
@@ -22,7 +22,7 @@ extern size_t onig_region_memsize(const struct re_registers *regs);
 
 #include <stdbool.h>
 
-#define STRSCAN_VERSION "3.0.7"
+#define STRSCAN_VERSION "3.1.6.dev"
 
 /* =======================================================================
                          Data Type Definitions
@@ -32,6 +32,8 @@ static VALUE StringScanner;
 static VALUE ScanError;
 static ID id_byteslice;
 
+static int usascii_encindex, utf8_encindex, binary_encindex;
+
 struct strscanner
 {
     /* multi-purpose flags */
@@ -56,8 +58,13 @@ struct strscanner
 };
 
 #define MATCHED_P(s)          ((s)->flags & FLAG_MATCHED)
-#define MATCHED(s)             (s)->flags |= FLAG_MATCHED
-#define CLEAR_MATCH_STATUS(s)  (s)->flags &= ~FLAG_MATCHED
+#define MATCHED(s)            ((s)->flags |= FLAG_MATCHED)
+#define CLEAR_MATCHED(s)      ((s)->flags &= ~FLAG_MATCHED)
+#define CLEAR_NAMED_CAPTURES(s) ((s)->regex = Qnil)
+#define CLEAR_MATCH_STATUS(s) do {\
+    CLEAR_MATCHED(s);\
+    CLEAR_NAMED_CAPTURES(s);\
+} while (0)
 
 #define S_PBEG(s)  (RSTRING_PTR((s)->str))
 #define S_LEN(s)  (RSTRING_LEN((s)->str))
@@ -115,6 +122,7 @@ static VALUE strscan_get_byte _((VALUE self));
 static VALUE strscan_getbyte _((VALUE self));
 static VALUE strscan_peek _((VALUE self, VALUE len));
 static VALUE strscan_peep _((VALUE self, VALUE len));
+static VALUE strscan_scan_base10_integer _((VALUE self));
 static VALUE strscan_unscan _((VALUE self));
 static VALUE strscan_bol_p _((VALUE self));
 static VALUE strscan_eos_p _((VALUE self));
@@ -201,7 +209,7 @@ strscan_memsize(const void *ptr)
 static const rb_data_type_t strscanner_type = {
     "StringScanner",
     {strscan_mark, strscan_free, strscan_memsize},
-    0, 0, RUBY_TYPED_FREE_IMMEDIATELY
+    0, 0, RUBY_TYPED_FREE_IMMEDIATELY | RUBY_TYPED_WB_PROTECTED
 };
 
 static VALUE
@@ -213,21 +221,32 @@ strscan_s_allocate(VALUE klass)
     CLEAR_MATCH_STATUS(p);
     onig_region_init(&(p->regs));
     p->str = Qnil;
-    p->regex = Qnil;
     return obj;
 }
 
 /*
- * call-seq:
- *    StringScanner.new(string, fixed_anchor: false)
- *    StringScanner.new(string, dup = false)
+ * :markup: markdown
+ * :include: strscan/link_refs.txt
  *
- * Creates a new StringScanner object to scan over the given +string+.
- *
- * If +fixed_anchor+ is +true+, +\A+ always matches the beginning of
- * the string. Otherwise, +\A+ always matches the current position.
+ * call-seq:
+ *   StringScanner.new(string, fixed_anchor: false) -> string_scanner
+ *
+ * Returns a new `StringScanner` object whose [stored string][1]
+ * is the given `string`;
+ * sets the [fixed-anchor property][10]:
+ *
+ * ```rb
+ * scanner = StringScanner.new('foobarbaz')
+ * scanner.string        # => "foobarbaz"
+ * scanner.fixed_anchor? # => false
+ * put_situation(scanner)
+ * # Situation:
+ * #   pos:       0
+ * #   charpos:   0
+ * #   rest:      "foobarbaz"
+ * #   rest_size: 9
+ * ```
  *
- * +dup+ argument is obsolete and not used now.
  */
 static VALUE
 strscan_initialize(int argc, VALUE *argv, VALUE self)
@@ -254,7 +273,7 @@ strscan_initialize(int argc, VALUE *argv, VALUE self)
         p->fixed_anchor_p = false;
     }
     StringValue(str);
-    p->str = str;
+    RB_OBJ_WRITE(self, &p->str, str);
 
     return self;
 }
@@ -266,11 +285,14 @@ check_strscan(VALUE obj)
 }
 
 /*
+ * :markup: markdown
+ * :include: strscan/link_refs.txt
+ *
  * call-seq:
- *   dup
- *   clone
+ *   dup -> shallow_copy
  *
- * Duplicates a StringScanner object.
+ * Returns a shallow copy of `self`;
+ * the [stored string][1] in the copy is the same string as in `self`.
  */
 static VALUE
 strscan_init_copy(VALUE vself, VALUE vorig)
@@ -281,7 +303,7 @@ strscan_init_copy(VALUE vself, VALUE vorig)
     orig = check_strscan(vorig);
     if (self != orig) {
 	self->flags = orig->flags;
-	self->str = orig->str;
+	RB_OBJ_WRITE(vself, &self->str, orig->str);
 	self->prev = orig->prev;
 	self->curr = orig->curr;
 	if (rb_reg_region_copy(&self->regs, &orig->regs))
@@ -297,10 +319,13 @@ strscan_init_copy(VALUE vself, VALUE vorig)
    ======================================================================= */
 
 /*
- * call-seq: StringScanner.must_C_version
+ * call-seq:
+ *   StringScanner.must_C_version -> self
  *
- * This method is defined for backward compatibility.
+ * Returns +self+; defined for backward compatibility.
  */
+
+ /* :nodoc: */
 static VALUE
 strscan_s_mustc(VALUE self)
 {
@@ -308,7 +333,30 @@ strscan_s_mustc(VALUE self)
 }
 
 /*
- * Reset the scan pointer (index 0) and clear matching data.
+ * :markup: markdown
+ * :include: strscan/link_refs.txt
+ *
+ * call-seq:
+ *   reset -> self
+ *
+ * Sets both [byte position][2] and [character position][7] to zero,
+ * and clears [match values][9];
+ * returns +self+:
+ *
+ * ```rb
+ * scanner = StringScanner.new('foobarbaz')
+ * scanner.exist?(/bar/)          # => 6
+ * scanner.reset                  # => #<StringScanner 0/9 @ "fooba...">
+ * put_situation(scanner)
+ * # Situation:
+ * #   pos:       0
+ * #   charpos:   0
+ * #   rest:      "foobarbaz"
+ * #   rest_size: 9
+ * # => nil
+ * match_values_cleared?(scanner) # => true
+ * ```
+ *
  */
 static VALUE
 strscan_reset(VALUE self)
@@ -322,11 +370,9 @@ strscan_reset(VALUE self)
 }
 
 /*
- * call-seq:
- *   terminate
- *   clear
- *
- * Sets the scan pointer to the end of the string and clear matching data.
+ * :markup: markdown
+ * :include: strscan/link_refs.txt
+ * :include: strscan/methods/terminate.md
  */
 static VALUE
 strscan_terminate(VALUE self)
@@ -340,9 +386,13 @@ strscan_terminate(VALUE self)
 }
 
 /*
- * Equivalent to #terminate.
- * This method is obsolete; use #terminate instead.
+ * call-seq:
+ *   clear -> self
+ *
+ * This method is obsolete; use the equivalent method StringScanner#terminate.
  */
+
+ /* :nodoc: */
 static VALUE
 strscan_clear(VALUE self)
 {
@@ -351,7 +401,21 @@ strscan_clear(VALUE self)
 }
 
 /*
- * Returns the string being scanned.
+ * :markup: markdown
+ * :include: strscan/link_refs.txt
+ *
+ * call-seq:
+ *   string -> stored_string
+ *
+ * Returns the [stored string][1]:
+ *
+ * ```rb
+ * scanner = StringScanner.new('foobar')
+ * scanner.string # => "foobar"
+ * scanner.concat('baz')
+ * scanner.string # => "foobarbaz"
+ * ```
+ *
  */
 static VALUE
 strscan_get_string(VALUE self)
@@ -363,10 +427,39 @@ strscan_get_string(VALUE self)
 }
 
 /*
- * call-seq: string=(str)
+ * :markup: markdown
+ * :include: strscan/link_refs.txt
+ *
+ * call-seq:
+ *   string = other_string -> other_string
+ *
+ * Replaces the [stored string][1] with the given `other_string`:
+ *
+ * - Sets both [positions][11] to zero.
+ * - Clears [match values][9].
+ * - Returns `other_string`.
+ *
+ * ```rb
+ * scanner = StringScanner.new('foobar')
+ * scanner.scan(/foo/)
+ * put_situation(scanner)
+ * # Situation:
+ * #   pos:       3
+ * #   charpos:   3
+ * #   rest:      "bar"
+ * #   rest_size: 3
+ * match_values_cleared?(scanner) # => false
+ *
+ * scanner.string = 'baz'         # => "baz"
+ * put_situation(scanner)
+ * # Situation:
+ * #   pos:       0
+ * #   charpos:   0
+ * #   rest:      "baz"
+ * #   rest_size: 3
+ * match_values_cleared?(scanner) # => true
+ * ```
  *
- * Changes the string being scanned to +str+ and resets the scanner.
- * Returns +str+.
  */
 static VALUE
 strscan_set_string(VALUE self, VALUE str)
@@ -374,25 +467,40 @@ strscan_set_string(VALUE self, VALUE str)
     struct strscanner *p = check_strscan(self);
 
     StringValue(str);
-    p->str = str;
+    RB_OBJ_WRITE(self, &p->str, str);
     p->curr = 0;
     CLEAR_MATCH_STATUS(p);
     return str;
 }
 
 /*
- * call-seq:
- *   concat(str)
- *   <<(str)
+ * :markup: markdown
+ * :include: strscan/link_refs.txt
  *
- * Appends +str+ to the string being scanned.
- * This method does not affect scan pointer.
+ * call-seq:
+ *   concat(more_string) -> self
+ *
+ * - Appends the given `more_string`
+ *   to the [stored string][1].
+ * - Returns `self`.
+ * - Does not affect the [positions][11]
+ *   or [match values][9].
+ *
+ *
+ * ```rb
+ * scanner = StringScanner.new('foo')
+ * scanner.string           # => "foo"
+ * scanner.terminate
+ * scanner.concat('barbaz') # => #<StringScanner 3/9 "foo" @ "barba...">
+ * scanner.string           # => "foobarbaz"
+ * put_situation(scanner)
+ * # Situation:
+ * #   pos:       3
+ * #   charpos:   3
+ * #   rest:      "barbaz"
+ * #   rest_size: 6
+ * ```
  *
- *   s = StringScanner.new("Fri Dec 12 1975 14:39")
- *   s.scan(/Fri /)
- *   s << " +1000 GMT"
- *   s.string            # -> "Fri Dec 12 1975 14:39 +1000 GMT"
- *   s.scan(/Dec/)       # -> "Dec"
  */
 static VALUE
 strscan_concat(VALUE self, VALUE str)
@@ -406,18 +514,9 @@ strscan_concat(VALUE self, VALUE str)
 }
 
 /*
- * Returns the byte position of the scan pointer.  In the 'reset' position, this
- * value is zero.  In the 'terminated' position (i.e. the string is exhausted),
- * this value is the bytesize of the string.
- *
- * In short, it's a 0-based index into bytes of the string.
- *
- *   s = StringScanner.new('test string')
- *   s.pos               # -> 0
- *   s.scan_until /str/  # -> "test str"
- *   s.pos               # -> 8
- *   s.terminate         # -> #<StringScanner fin>
- *   s.pos               # -> 11
+ * :markup: markdown
+ * :include: strscan/link_refs.txt
+ * :include: strscan/methods/get_pos.md
  */
 static VALUE
 strscan_get_pos(VALUE self)
@@ -425,21 +524,13 @@ strscan_get_pos(VALUE self)
     struct strscanner *p;
 
     GET_SCANNER(self, p);
-    return INT2FIX(p->curr);
+    return LONG2NUM(p->curr);
 }
 
 /*
- * Returns the character position of the scan pointer.  In the 'reset' position, this
- * value is zero.  In the 'terminated' position (i.e. the string is exhausted),
- * this value is the size of the string.
- *
- * In short, it's a 0-based index into the string.
- *
- *   s = StringScanner.new("abc\u00e4def\u00f6ghi")
- *   s.charpos                # -> 0
- *   s.scan_until(/\u00e4/)   # -> "abc\u00E4"
- *   s.pos                    # -> 5
- *   s.charpos                # -> 4
+ * :markup: markdown
+ * :include: strscan/link_refs.txt
+ * :include: strscan/methods/get_charpos.md
  */
 static VALUE
 strscan_get_charpos(VALUE self)
@@ -452,13 +543,9 @@ strscan_get_charpos(VALUE self)
 }
 
 /*
- * call-seq: pos=(n)
- *
- * Sets the byte position of the scan pointer.
- *
- *   s = StringScanner.new('test string')
- *   s.pos = 7            # -> 7
- *   s.rest               # -> "ring"
+ * :markup: markdown
+ * :include: strscan/link_refs.txt
+ * :include: strscan/methods/set_pos.md
  */
 static VALUE
 strscan_set_pos(VALUE self, VALUE v)
@@ -467,7 +554,7 @@ strscan_set_pos(VALUE self, VALUE v)
     long i;
 
     GET_SCANNER(self, p);
-    i = NUM2INT(v);
+    i = NUM2LONG(v);
     if (i < 0) i += S_LEN(p);
     if (i < 0) rb_raise(rb_eRangeError, "index out of range");
     if (i > S_LEN(p)) rb_raise(rb_eRangeError, "index out of range");
@@ -488,19 +575,20 @@ match_target(struct strscanner *p)
 }
 
 static inline void
-set_registers(struct strscanner *p, size_t length)
+set_registers(struct strscanner *p, size_t pos, size_t length)
 {
     const int at = 0;
     OnigRegion *regs = &(p->regs);
     onig_region_clear(regs);
     if (onig_region_set(regs, at, 0, 0)) return;
     if (p->fixed_anchor_p) {
-        regs->beg[at] = p->curr;
-        regs->end[at] = p->curr + length;
+        regs->beg[at] = pos + p->curr;
+        regs->end[at] = pos + p->curr + length;
     }
     else
     {
-        regs->end[at] = length;
+        regs->beg[at] = pos;
+        regs->end[at] = pos + length;
     }
 }
 
@@ -546,12 +634,13 @@ rb_reg_onig_match(VALUE re, VALUE str,
                   OnigPosition (*match)(regex_t *reg, VALUE str, struct re_registers *regs, void *args),
                   void *args, struct re_registers *regs)
 {
+    OnigPosition result;
     regex_t *reg = rb_reg_prepare_re(re, str);
 
     bool tmpreg = reg != RREGEXP_PTR(re);
     if (!tmpreg) RREGEXP(re)->usecnt++;
 
-    OnigPosition result = match(reg, str, regs, args);
+    result = match(reg, str, regs, args);
 
     if (!tmpreg) RREGEXP(re)->usecnt--;
     if (tmpreg) {
@@ -601,19 +690,19 @@ strscan_search(regex_t *reg, VALUE str, struct re_registers *regs, void *args_pt
                        ONIG_OPTION_NONE);
 }
 
+static void
+strscan_enc_check(VALUE str1, VALUE str2)
+{
+    if (RB_ENCODING_GET(str1) != RB_ENCODING_GET(str2)) {
+        rb_enc_check(str1, str2);
+    }
+}
+
 static VALUE
 strscan_do_scan(VALUE self, VALUE pattern, int succptr, int getstr, int headonly)
 {
     struct strscanner *p;
 
-    if (headonly) {
-        if (!RB_TYPE_P(pattern, T_REGEXP)) {
-            StringValue(pattern);
-        }
-    }
-    else {
-        Check_Type(pattern, T_REGEXP);
-    }
     GET_SCANNER(self, p);
 
     CLEAR_MATCH_STATUS(p);
@@ -622,26 +711,42 @@ strscan_do_scan(VALUE self, VALUE pattern, int succptr, int getstr, int headonly
     }
 
     if (RB_TYPE_P(pattern, T_REGEXP)) {
-        p->regex = pattern;
-        OnigPosition ret = rb_reg_onig_match(pattern,
-                                             p->str,
-                                             headonly ? strscan_match : strscan_search,
-                                             (void *)p,
-                                             &(p->regs));
+        OnigPosition ret;
+        RB_OBJ_WRITE(self, &p->regex, pattern);
+        ret = rb_reg_onig_match(p->regex,
+                                p->str,
+                                headonly ? strscan_match : strscan_search,
+                                (void *)p,
+                                &(p->regs));
 
         if (ret == ONIG_MISMATCH) {
             return Qnil;
         }
     }
     else {
-        rb_enc_check(p->str, pattern);
+        StringValue(pattern);
         if (S_RESTLEN(p) < RSTRING_LEN(pattern)) {
+            strscan_enc_check(p->str, pattern);
             return Qnil;
         }
-        if (memcmp(CURPTR(p), RSTRING_PTR(pattern), RSTRING_LEN(pattern)) != 0) {
-            return Qnil;
+
+        if (headonly) {
+            strscan_enc_check(p->str, pattern);
+
+            if (memcmp(CURPTR(p), RSTRING_PTR(pattern), RSTRING_LEN(pattern)) != 0) {
+                return Qnil;
+            }
+            set_registers(p, 0, RSTRING_LEN(pattern));
+        }
+        else {
+            rb_encoding *enc = rb_enc_check(p->str, pattern);
+            long pos = rb_memsearch(RSTRING_PTR(pattern), RSTRING_LEN(pattern),
+                                    CURPTR(p), S_RESTLEN(p), enc);
+            if (pos == -1) {
+                return Qnil;
+            }
+            set_registers(p, pos, RSTRING_LEN(pattern));
         }
-        set_registers(p, RSTRING_LEN(pattern));
     }
 
     MATCHED(p);
@@ -662,20 +767,9 @@ strscan_do_scan(VALUE self, VALUE pattern, int succptr, int getstr, int headonly
 }
 
 /*
- * call-seq: scan(pattern) => String
- *
- * Tries to match with +pattern+ at the current position. If there's a match,
- * the scanner advances the "scan pointer" and returns the matched string.
- * Otherwise, the scanner returns +nil+.
- *
- *   s = StringScanner.new('test string')
- *   p s.scan(/\w+/)   # -> "test"
- *   p s.scan(/\w+/)   # -> nil
- *   p s.scan(/\s+/)   # -> " "
- *   p s.scan("str")   # -> "str"
- *   p s.scan(/\w+/)   # -> "ing"
- *   p s.scan(/./)     # -> nil
- *
+ * :markup: markdown
+ * :include: strscan/link_refs.txt
+ * :include: strscan/methods/scan.md
  */
 static VALUE
 strscan_scan(VALUE self, VALUE re)
@@ -684,16 +778,60 @@ strscan_scan(VALUE self, VALUE re)
 }
 
 /*
- * call-seq: match?(pattern)
+ * :markup: markdown
+ * :include: strscan/link_refs.txt
  *
- * Tests whether the given +pattern+ is matched from the current scan pointer.
- * Returns the length of the match, or +nil+.  The scan pointer is not advanced.
+ * call-seq:
+ *   match?(pattern) -> updated_position or nil
+ *
+ * Attempts to [match][17] the given `pattern`
+ * at the beginning of the [target substring][3];
+ * does not modify the [positions][11].
+ *
+ * If the match succeeds:
+ *
+ * - Sets [match values][9].
+ * - Returns the size in bytes of the matched substring.
+ *
+ *
+ * ```rb
+ * scanner = StringScanner.new('foobarbaz')
+ * scanner.pos = 3
+ * scanner.match?(/bar/) => 3
+ * put_match_values(scanner)
+ * # Basic match values:
+ * #   matched?:       true
+ * #   matched_size:   3
+ * #   pre_match:      "foo"
+ * #   matched  :      "bar"
+ * #   post_match:     "baz"
+ * # Captured match values:
+ * #   size:           1
+ * #   captures:       []
+ * #   named_captures: {}
+ * #   values_at:      ["bar", nil]
+ * #   []:
+ * #     [0]:          "bar"
+ * #     [1]:          nil
+ * put_situation(scanner)
+ * # Situation:
+ * #   pos:       3
+ * #   charpos:   3
+ * #   rest:      "barbaz"
+ * #   rest_size: 6
+ * ```
+ *
+ * If the match fails:
+ *
+ * - Clears match values.
+ * - Returns `nil`.
+ * - Does not increment positions.
+ *
+ * ```rb
+ * scanner.match?(/nope/)         # => nil
+ * match_values_cleared?(scanner) # => true
+ * ```
  *
- *   s = StringScanner.new('test string')
- *   p s.match?(/\w+/)   # -> 4
- *   p s.match?(/\w+/)   # -> 4
- *   p s.match?("test")  # -> 4
- *   p s.match?(/\s+/)   # -> nil
  */
 static VALUE
 strscan_match_p(VALUE self, VALUE re)
@@ -702,22 +840,9 @@ strscan_match_p(VALUE self, VALUE re)
 }
 
 /*
- * call-seq: skip(pattern)
- *
- * Attempts to skip over the given +pattern+ beginning with the scan pointer.
- * If it matches, the scan pointer is advanced to the end of the match, and the
- * length of the match is returned.  Otherwise, +nil+ is returned.
- *
- * It's similar to #scan, but without returning the matched string.
- *
- *   s = StringScanner.new('test string')
- *   p s.skip(/\w+/)   # -> 4
- *   p s.skip(/\w+/)   # -> nil
- *   p s.skip(/\s+/)   # -> 1
- *   p s.skip("st")    # -> 2
- *   p s.skip(/\w+/)   # -> 4
- *   p s.skip(/./)     # -> nil
- *
+ * :markup: markdown
+ * :include: strscan/link_refs.txt
+ * :include: strscan/methods/skip.md
  */
 static VALUE
 strscan_skip(VALUE self, VALUE re)
@@ -726,19 +851,59 @@ strscan_skip(VALUE self, VALUE re)
 }
 
 /*
- * call-seq: check(pattern)
- *
- * This returns the value that #scan would return, without advancing the scan
- * pointer.  The match register is affected, though.
+ * :markup: markdown
+ * :include: strscan/link_refs.txt
  *
- *   s = StringScanner.new("Fri Dec 12 1975 14:39")
- *   s.check /Fri/               # -> "Fri"
- *   s.pos                       # -> 0
- *   s.matched                   # -> "Fri"
- *   s.check /12/                # -> nil
- *   s.matched                   # -> nil
+ * call-seq:
+ *   check(pattern) -> matched_substring or nil
+ *
+ * Attempts to [match][17] the given `pattern`
+ * at the beginning of the [target substring][3];
+ * does not modify the [positions][11].
+ *
+ * If the match succeeds:
+ *
+ * - Returns the matched substring.
+ * - Sets all [match values][9].
+ *
+ * ```rb
+ * scanner = StringScanner.new('foobarbaz')
+ * scanner.pos = 3
+ * scanner.check('bar') # => "bar"
+ * put_match_values(scanner)
+ * # Basic match values:
+ * #   matched?:       true
+ * #   matched_size:   3
+ * #   pre_match:      "foo"
+ * #   matched  :      "bar"
+ * #   post_match:     "baz"
+ * # Captured match values:
+ * #   size:           1
+ * #   captures:       []
+ * #   named_captures: {}
+ * #   values_at:      ["bar", nil]
+ * #   []:
+ * #     [0]:          "bar"
+ * #     [1]:          nil
+ * # => 0..1
+ * put_situation(scanner)
+ * # Situation:
+ * #   pos:       3
+ * #   charpos:   3
+ * #   rest:      "barbaz"
+ * #   rest_size: 6
+ * ```
+ *
+ * If the match fails:
+ *
+ * - Returns `nil`.
+ * - Clears all [match values][9].
+ *
+ * ```rb
+ * scanner.check(/nope/)          # => nil
+ * match_values_cleared?(scanner) # => true
+ * ```
  *
- * Mnemonic: it "checks" to see whether a #scan will return a value.
  */
 static VALUE
 strscan_check(VALUE self, VALUE re)
@@ -747,15 +912,24 @@ strscan_check(VALUE self, VALUE re)
 }
 
 /*
- * call-seq: scan_full(pattern, advance_pointer_p, return_string_p)
+ * call-seq:
+ *   scan_full(pattern, advance_pointer_p, return_string_p) -> matched_substring or nil
+ *
+ * Equivalent to one of the following:
+ *
+ * - +advance_pointer_p+ +true+:
+ *
+ *   - +return_string_p+ +true+: StringScanner#scan(pattern).
+ *   - +return_string_p+ +false+: StringScanner#skip(pattern).
+ *
+ * - +advance_pointer_p+ +false+:
  *
- * Tests whether the given +pattern+ is matched from the current scan pointer.
- * Advances the scan pointer if +advance_pointer_p+ is true.
- * Returns the matched string if +return_string_p+ is true.
- * The match register is affected.
+ *   - +return_string_p+ +true+: StringScanner#check(pattern).
+ *   - +return_string_p+ +false+: StringScanner#match?(pattern).
  *
- * "full" means "#scan with full parameters".
  */
+
+ /* :nodoc: */
 static VALUE
 strscan_scan_full(VALUE self, VALUE re, VALUE s, VALUE f)
 {
@@ -763,16 +937,9 @@ strscan_scan_full(VALUE self, VALUE re, VALUE s, VALUE f)
 }
 
 /*
- * call-seq: scan_until(pattern)
- *
- * Scans the string _until_ the +pattern+ is matched.  Returns the substring up
- * to and including the end of the match, advancing the scan pointer to that
- * location. If there is no match, +nil+ is returned.
- *
- *   s = StringScanner.new("Fri Dec 12 1975 14:39")
- *   s.scan_until(/1/)        # -> "Fri Dec 1"
- *   s.pre_match              # -> "Fri Dec "
- *   s.scan_until(/XYZ/)      # -> nil
+ * :markup: markdown
+ * :include: strscan/link_refs.txt
+ * :include: strscan/methods/scan_until.md
  */
 static VALUE
 strscan_scan_until(VALUE self, VALUE re)
@@ -781,17 +948,61 @@ strscan_scan_until(VALUE self, VALUE re)
 }
 
 /*
- * call-seq: exist?(pattern)
+ * :markup: markdown
+ * :include: strscan/link_refs.txt
  *
- * Looks _ahead_ to see if the +pattern+ exists _anywhere_ in the string,
- * without advancing the scan pointer.  This predicates whether a #scan_until
- * will return a value.
+ * call-seq:
+ *   exist?(pattern) -> byte_offset or nil
+ *
+ * Attempts to [match][17] the given `pattern`
+ * anywhere (at any [position][2])
+ * n the [target substring][3];
+ * does not modify the [positions][11].
+ *
+ * If the match succeeds:
+ *
+ * - Returns a byte offset:
+ *   the distance in bytes between the current [position][2]
+ *   and the end of the matched substring.
+ * - Sets all [match values][9].
+ *
+ * ```rb
+ * scanner = StringScanner.new('foobarbazbatbam')
+ * scanner.pos = 6
+ * scanner.exist?(/bat/) # => 6
+ * put_match_values(scanner)
+ * # Basic match values:
+ * #   matched?:       true
+ * #   matched_size:   3
+ * #   pre_match:      "foobarbaz"
+ * #   matched  :      "bat"
+ * #   post_match:     "bam"
+ * # Captured match values:
+ * #   size:           1
+ * #   captures:       []
+ * #   named_captures: {}
+ * #   values_at:      ["bat", nil]
+ * #   []:
+ * #     [0]:          "bat"
+ * #     [1]:          nil
+ * put_situation(scanner)
+ * # Situation:
+ * #   pos:       6
+ * #   charpos:   6
+ * #   rest:      "bazbatbam"
+ * #   rest_size: 9
+ * ```
+ *
+ * If the match fails:
+ *
+ * - Returns `nil`.
+ * - Clears all [match values][9].
+ *
+ * ```rb
+ * scanner.exist?(/nope/)         # => nil
+ * match_values_cleared?(scanner) # => true
+ * ```
  *
- *   s = StringScanner.new('test string')
- *   s.exist? /s/            # -> 3
- *   s.scan /test/           # -> "test"
- *   s.exist? /s/            # -> 2
- *   s.exist? /e/            # -> nil
  */
 static VALUE
 strscan_exist_p(VALUE self, VALUE re)
@@ -800,20 +1011,9 @@ strscan_exist_p(VALUE self, VALUE re)
 }
 
 /*
- * call-seq: skip_until(pattern)
- *
- * Advances the scan pointer until +pattern+ is matched and consumed.  Returns
- * the number of bytes advanced, or +nil+ if no match was found.
- *
- * Look ahead to match +pattern+, and advance the scan pointer to the _end_
- * of the match.  Return the number of characters advanced, or +nil+ if the
- * match was unsuccessful.
- *
- * It's similar to #scan_until, but without returning the intervening string.
- *
- *   s = StringScanner.new("Fri Dec 12 1975 14:39")
- *   s.skip_until /12/           # -> 10
- *   s                           #
+ * :markup: markdown
+ * :include: strscan/link_refs.txt
+ * :include: strscan/methods/skip_until.md
  */
 static VALUE
 strscan_skip_until(VALUE self, VALUE re)
@@ -822,17 +1022,61 @@ strscan_skip_until(VALUE self, VALUE re)
 }
 
 /*
- * call-seq: check_until(pattern)
+ * :markup: markdown
+ * :include: strscan/link_refs.txt
  *
- * This returns the value that #scan_until would return, without advancing the
- * scan pointer.  The match register is affected, though.
- *
- *   s = StringScanner.new("Fri Dec 12 1975 14:39")
- *   s.check_until /12/          # -> "Fri Dec 12"
- *   s.pos                       # -> 0
- *   s.matched                   # -> 12
+ * call-seq:
+ *   check_until(pattern) -> substring or nil
+ *
+ * Attempts to [match][17] the given `pattern`
+ * anywhere (at any [position][2])
+ * in the [target substring][3];
+ * does not modify the [positions][11].
+ *
+ * If the match succeeds:
+ *
+ * - Sets all [match values][9].
+ * - Returns the matched substring,
+ *   which extends from the current [position][2]
+ *   to the end of the matched substring.
+ *
+ * ```rb
+ * scanner = StringScanner.new('foobarbazbatbam')
+ * scanner.pos = 6
+ * scanner.check_until(/bat/) # => "bazbat"
+ * put_match_values(scanner)
+ * # Basic match values:
+ * #   matched?:       true
+ * #   matched_size:   3
+ * #   pre_match:      "foobarbaz"
+ * #   matched  :      "bat"
+ * #   post_match:     "bam"
+ * # Captured match values:
+ * #   size:           1
+ * #   captures:       []
+ * #   named_captures: {}
+ * #   values_at:      ["bat", nil]
+ * #   []:
+ * #     [0]:          "bat"
+ * #     [1]:          nil
+ * put_situation(scanner)
+ * # Situation:
+ * #   pos:       6
+ * #   charpos:   6
+ * #   rest:      "bazbatbam"
+ * #   rest_size: 9
+ * ```
+ *
+ * If the match fails:
+ *
+ * - Clears all [match values][9].
+ * - Returns `nil`.
+ *
+ * ```rb
+ * scanner.check_until(/nope/)    # => nil
+ * match_values_cleared?(scanner) # => true
+ * ```
  *
- * Mnemonic: it "checks" to see whether a #scan_until will return a value.
  */
 static VALUE
 strscan_check_until(VALUE self, VALUE re)
@@ -841,14 +1085,24 @@ strscan_check_until(VALUE self, VALUE re)
 }
 
 /*
- * call-seq: search_full(pattern, advance_pointer_p, return_string_p)
+ * call-seq:
+ *   search_full(pattern, advance_pointer_p, return_string_p) -> matched_substring or position_delta or nil
+ *
+ * Equivalent to one of the following:
+ *
+ * - +advance_pointer_p+ +true+:
+ *
+ *   - +return_string_p+ +true+: StringScanner#scan_until(pattern).
+ *   - +return_string_p+ +false+: StringScanner#skip_until(pattern).
+ *
+ * - +advance_pointer_p+ +false+:
+ *
+ *   - +return_string_p+ +true+: StringScanner#check_until(pattern).
+ *   - +return_string_p+ +false+: StringScanner#exist?(pattern).
  *
- * Scans the string _until_ the +pattern+ is matched.
- * Advances the scan pointer if +advance_pointer_p+, otherwise not.
- * Returns the matched string if +return_string_p+ is true, otherwise
- * returns the number of bytes advanced.
- * This method does affect the match register.
  */
+
+ /* :nodoc: */
 static VALUE
 strscan_search_full(VALUE self, VALUE re, VALUE s, VALUE f)
 {
@@ -868,17 +1122,9 @@ adjust_registers_to_matched(struct strscanner *p)
 }
 
 /*
- * Scans one character and returns it.
- * This method is multibyte character sensitive.
- *
- *   s = StringScanner.new("ab")
- *   s.getch           # => "a"
- *   s.getch           # => "b"
- *   s.getch           # => nil
- *
- *   s = StringScanner.new("\244\242".force_encoding("euc-jp"))
- *   s.getch           # => "\x{A4A2}"   # Japanese hira-kana "A" in EUC-JP
- *   s.getch           # => nil
+ * :markup: markdown
+ * :include: strscan/link_refs.txt
+ * :include: strscan/methods/getch.md
  */
 static VALUE
 strscan_getch(VALUE self)
@@ -903,19 +1149,55 @@ strscan_getch(VALUE self)
 }
 
 /*
- * Scans one byte and returns it.
+ * call-seq:
+ *   scan_byte -> integer_byte
+ *
+ * Scans one byte and returns it as an integer.
  * This method is not multibyte character sensitive.
  * See also: #getch.
  *
+ */
+static VALUE
+strscan_scan_byte(VALUE self)
+{
+    struct strscanner *p;
+    VALUE byte;
+
+    GET_SCANNER(self, p);
+    CLEAR_MATCH_STATUS(p);
+    if (EOS_P(p))
+        return Qnil;
+
+    byte = INT2FIX((unsigned char)*CURPTR(p));
+    p->prev = p->curr;
+    p->curr++;
+    MATCHED(p);
+    adjust_registers_to_matched(p);
+    return byte;
+}
+
+/*
+ * Peeks at the current byte and returns it as an integer.
+ *
  *   s = StringScanner.new('ab')
- *   s.get_byte         # => "a"
- *   s.get_byte         # => "b"
- *   s.get_byte         # => nil
- *
- *   s = StringScanner.new("\244\242".force_encoding("euc-jp"))
- *   s.get_byte         # => "\xA4"
- *   s.get_byte         # => "\xA2"
- *   s.get_byte         # => nil
+ *   s.peek_byte         # => 97
+ */
+static VALUE
+strscan_peek_byte(VALUE self)
+{
+    struct strscanner *p;
+
+    GET_SCANNER(self, p);
+    if (EOS_P(p))
+        return Qnil;
+
+    return INT2FIX((unsigned char)*CURPTR(p));
+}
+
+/*
+ * :markup: markdown
+ * :include: strscan/link_refs.txt
+ * :include: strscan/methods/get_byte.md
  */
 static VALUE
 strscan_get_byte(VALUE self)
@@ -937,9 +1219,14 @@ strscan_get_byte(VALUE self)
 }
 
 /*
+ * call-seq:
+ *   getbyte
+ *
  * Equivalent to #get_byte.
  * This method is obsolete; use #get_byte instead.
  */
+
+ /* :nodoc: */
 static VALUE
 strscan_getbyte(VALUE self)
 {
@@ -948,14 +1235,22 @@ strscan_getbyte(VALUE self)
 }
 
 /*
- * call-seq: peek(len)
+ * :markup: markdown
+ * :include: strscan/link_refs.txt
  *
- * Extracts a string corresponding to <tt>string[pos,len]</tt>, without
- * advancing the scan pointer.
+ * call-seq:
+ *   peek(length) -> substring
  *
- *   s = StringScanner.new('test string')
- *   s.peek(7)          # => "test st"
- *   s.peek(7)          # => "test st"
+ * Returns the substring `string[pos, length]`;
+ * does not update [match values][9] or [positions][11]:
+ *
+ * ```rb
+ * scanner = StringScanner.new('foobarbaz')
+ * scanner.pos = 3
+ * scanner.peek(3)   # => "bar"
+ * scanner.terminate
+ * scanner.peek(3)   # => ""
+ * ```
  *
  */
 static VALUE
@@ -975,9 +1270,14 @@ strscan_peek(VALUE self, VALUE vlen)
 }
 
 /*
+ * call-seq:
+ *   peep
+ *
  * Equivalent to #peek.
  * This method is obsolete; use #peek instead.
  */
+
+ /* :nodoc: */
 static VALUE
 strscan_peep(VALUE self, VALUE vlen)
 {
@@ -985,16 +1285,158 @@ strscan_peep(VALUE self, VALUE vlen)
     return strscan_peek(self, vlen);
 }
 
+static VALUE
+strscan_parse_integer(struct strscanner *p, int base, long len)
+{
+    VALUE buffer_v, integer;
+
+    char *buffer = RB_ALLOCV_N(char, buffer_v, len + 1);
+
+    MEMCPY(buffer, CURPTR(p), char, len);
+    buffer[len] = '\0';
+    integer = rb_cstr2inum(buffer, base);
+    RB_ALLOCV_END(buffer_v);
+    p->curr += len;
+
+    MATCHED(p);
+    adjust_registers_to_matched(p);
+
+    return integer;
+}
+
+static inline bool
+strscan_ascii_compat_fastpath(VALUE str) {
+    int encindex = ENCODING_GET_INLINED(str);
+    // The overwhelming majority of strings are in one of these 3 encodings.
+    return encindex == utf8_encindex || encindex == binary_encindex || encindex == usascii_encindex;
+}
+
+static inline void
+strscan_must_ascii_compat(VALUE str)
+{
+    // The overwhelming majority of strings are in one of these 3 encodings.
+    if (RB_LIKELY(strscan_ascii_compat_fastpath(str))) {
+        return;
+    }
+
+    rb_must_asciicompat(str);
+}
+
+static VALUE
+strscan_scan_base10_integer(VALUE self)
+{
+    char *ptr;
+    long len = 0;
+    struct strscanner *p;
+
+    GET_SCANNER(self, p);
+    CLEAR_MATCH_STATUS(p);
+
+    strscan_must_ascii_compat(p->str);
+
+    ptr = CURPTR(p);
+
+    long remaining_len = S_RESTLEN(p);
+
+    if (remaining_len <= 0) {
+        return Qnil;
+    }
+
+    if (ptr[len] == '-' || ptr[len] == '+') {
+        len++;
+    }
+
+    if (!rb_isdigit(ptr[len])) {
+        return Qnil;
+    }
+
+    p->prev = p->curr;
+
+    while (len < remaining_len && rb_isdigit(ptr[len])) {
+        len++;
+    }
+
+    return strscan_parse_integer(p, 10, len);
+}
+
+static VALUE
+strscan_scan_base16_integer(VALUE self)
+{
+    char *ptr;
+    long len = 0;
+    struct strscanner *p;
+
+    GET_SCANNER(self, p);
+    CLEAR_MATCH_STATUS(p);
+
+    strscan_must_ascii_compat(p->str);
+
+    ptr = CURPTR(p);
+
+    long remaining_len = S_RESTLEN(p);
+
+    if (remaining_len <= 0) {
+        return Qnil;
+    }
+
+    if (ptr[len] == '-' || ptr[len] == '+') {
+        len++;
+    }
+
+    if ((remaining_len >= (len + 3)) && ptr[len] == '0' && ptr[len + 1] == 'x' && rb_isxdigit(ptr[len + 2])) {
+        len += 2;
+    }
+
+    if (len >= remaining_len || !rb_isxdigit(ptr[len])) {
+        return Qnil;
+    }
+
+    p->prev = p->curr;
+
+    while (len < remaining_len && rb_isxdigit(ptr[len])) {
+        len++;
+    }
+
+    return strscan_parse_integer(p, 16, len);
+}
+
 /*
- * Sets the scan pointer to the previous position.  Only one previous position is
- * remembered, and it changes with each scanning operation.
+ * :markup: markdown
+ * :include: strscan/link_refs.txt
+ *
+ * call-seq:
+ *   unscan -> self
+ *
+ * Sets the [position][2] to its value previous to the recent successful
+ * [match][17] attempt:
+ *
+ * ```rb
+ * scanner = StringScanner.new('foobarbaz')
+ * scanner.scan(/foo/)
+ * put_situation(scanner)
+ * # Situation:
+ * #   pos:       3
+ * #   charpos:   3
+ * #   rest:      "barbaz"
+ * #   rest_size: 6
+ * scanner.unscan
+ * # => #<StringScanner 0/9 @ "fooba...">
+ * put_situation(scanner)
+ * # Situation:
+ * #   pos:       0
+ * #   charpos:   0
+ * #   rest:      "foobarbaz"
+ * #   rest_size: 9
+ * ```
+ *
+ * Raises an exception if match values are clear:
+ *
+ * ```rb
+ * scanner.scan(/nope/)           # => nil
+ * match_values_cleared?(scanner) # => true
+ * scanner.unscan                 # Raises StringScanner::Error.
+ * ```
  *
- *   s = StringScanner.new('test string')
- *   s.scan(/\w+/)        # => "test"
- *   s.unscan
- *   s.scan(/../)         # => "te"
- *   s.scan(/\d/)         # => nil
- *   s.unscan             # ScanError: unscan failed: previous match record not exist
  */
 static VALUE
 strscan_unscan(VALUE self)
@@ -1010,16 +1452,37 @@ strscan_unscan(VALUE self)
 }
 
 /*
- * Returns +true+ if and only if the scan pointer is at the beginning of the line.
- *
- *   s = StringScanner.new("test\ntest\n")
- *   s.bol?           # => true
- *   s.scan(/te/)
- *   s.bol?           # => false
- *   s.scan(/st\n/)
- *   s.bol?           # => true
- *   s.terminate
- *   s.bol?           # => true
+ *
+ * :markup: markdown
+ * :include: strscan/link_refs.txt
+ *
+ * call-seq:
+ *   beginning_of_line? -> true or false
+ *
+ * Returns whether the [position][2] is at the beginning of a line;
+ * that is, at the beginning of the [stored string][1]
+ * or immediately after a newline:
+ *
+ *     scanner = StringScanner.new(MULTILINE_TEXT)
+ *     scanner.string
+ *     # => "Go placidly amid the noise and haste,\nand remember what peace there may be in silence.\n"
+ *     scanner.pos                # => 0
+ *     scanner.beginning_of_line? # => true
+ *
+ *     scanner.scan_until(/,/)    # => "Go placidly amid the noise and haste,"
+ *     scanner.beginning_of_line? # => false
+ *
+ *     scanner.scan(/\n/)         # => "\n"
+ *     scanner.beginning_of_line? # => true
+ *
+ *     scanner.terminate
+ *     scanner.beginning_of_line? # => true
+ *
+ *     scanner.concat('x')
+ *     scanner.terminate
+ *     scanner.beginning_of_line? # => false
+ *
+ * StringScanner#bol? is an alias for StringScanner#beginning_of_line?.
  */
 static VALUE
 strscan_bol_p(VALUE self)
@@ -1033,14 +1496,24 @@ strscan_bol_p(VALUE self)
 }
 
 /*
- * Returns +true+ if the scan pointer is at the end of the string.
+ * :markup: markdown
+ * :include: strscan/link_refs.txt
+ *
+ * call-seq:
+ *   eos? -> true or false
+ *
+ * Returns whether the [position][2]
+ * is at the end of the [stored string][1]:
+ *
+ * ```rb
+ * scanner = StringScanner.new('foobarbaz')
+ * scanner.eos? # => false
+ * pos = 3
+ * scanner.eos? # => false
+ * scanner.terminate
+ * scanner.eos? # => true
+ * ```
  *
- *   s = StringScanner.new('test string')
- *   p s.eos?          # => false
- *   s.scan(/test/)
- *   p s.eos?          # => false
- *   s.terminate
- *   p s.eos?          # => true
  */
 static VALUE
 strscan_eos_p(VALUE self)
@@ -1052,9 +1525,14 @@ strscan_eos_p(VALUE self)
 }
 
 /*
+ * call-seq:
+ *   empty?
+ *
  * Equivalent to #eos?.
  * This method is obsolete, use #eos? instead.
  */
+
+ /* :nodoc: */
 static VALUE
 strscan_empty_p(VALUE self)
 {
@@ -1063,6 +1541,9 @@ strscan_empty_p(VALUE self)
 }
 
 /*
+ * call-seq:
+ *   rest?
+ *
  * Returns true if and only if there is more data in the string.  See #eos?.
  * This method is obsolete; use #eos? instead.
  *
@@ -1071,6 +1552,8 @@ strscan_empty_p(VALUE self)
  *   s.eos? # => false
  *   s.rest? # => true
  */
+
+ /* :nodoc: */
 static VALUE
 strscan_rest_p(VALUE self)
 {
@@ -1081,13 +1564,26 @@ strscan_rest_p(VALUE self)
 }
 
 /*
- * Returns +true+ if and only if the last match was successful.
+ * :markup: markdown
+ * :include: strscan/link_refs.txt
+ *
+ * call-seq:
+ *   matched? -> true or false
+ *
+ * Returns `true` of the most recent [match attempt][17] was successful,
+ * `false` otherwise;
+ * see [Basic Matched Values][18]:
+ *
+ * ```rb
+ * scanner = StringScanner.new('foobarbaz')
+ * scanner.matched?       # => false
+ * scanner.pos = 3
+ * scanner.exist?(/baz/)  # => 6
+ * scanner.matched?       # => true
+ * scanner.exist?(/nope/) # => nil
+ * scanner.matched?       # => false
+ * ```
  *
- *   s = StringScanner.new('test string')
- *   s.match?(/\w+/)     # => 4
- *   s.matched?          # => true
- *   s.match?(/\d+/)     # => nil
- *   s.matched?          # => false
  */
 static VALUE
 strscan_matched_p(VALUE self)
@@ -1099,11 +1595,27 @@ strscan_matched_p(VALUE self)
 }
 
 /*
- * Returns the last matched string.
+ * :markup: markdown
+ * :include: strscan/link_refs.txt
+ *
+ * call-seq:
+ *   matched -> matched_substring or nil
+ *
+ * Returns the matched substring from the most recent [match][17] attempt
+ * if it was successful,
+ * or `nil` otherwise;
+ * see [Basic Matched Values][18]:
+ *
+ * ```rb
+ * scanner = StringScanner.new('foobarbaz')
+ * scanner.matched        # => nil
+ * scanner.pos = 3
+ * scanner.match?(/bar/)  # => 3
+ * scanner.matched        # => "bar"
+ * scanner.match?(/nope/) # => nil
+ * scanner.matched        # => nil
+ * ```
  *
- *   s = StringScanner.new('test string')
- *   s.match?(/\w+/)     # -> 4
- *   s.matched           # -> "test"
  */
 static VALUE
 strscan_matched(VALUE self)
@@ -1118,15 +1630,29 @@ strscan_matched(VALUE self)
 }
 
 /*
- * Returns the size of the most recent match in bytes, or +nil+ if there
- * was no recent match.  This is different than <tt>matched.size</tt>,
- * which will return the size in characters.
+ * :markup: markdown
+ * :include: strscan/link_refs.txt
+ *
+ * call-seq:
+ *   matched_size -> substring_size or nil
+ *
+ * Returns the size (in bytes) of the matched substring
+ * from the most recent match [match attempt][17] if it was successful,
+ * or `nil` otherwise;
+ * see [Basic Matched Values][18]:
+ *
+ * ```rb
+ * scanner = StringScanner.new('foobarbaz')
+ * scanner.matched_size   # => nil
+ *
+ * pos = 3
+ * scanner.exist?(/baz/)  # => 9
+ * scanner.matched_size   # => 3
+ *
+ * scanner.exist?(/nope/) # => nil
+ * scanner.matched_size   # => nil
+ * ```
  *
- *   s = StringScanner.new('test string')
- *   s.check /\w+/           # -> "test"
- *   s.matched_size          # -> 4
- *   s.check /\d+/           # -> nil
- *   s.matched_size          # -> nil
  */
 static VALUE
 strscan_matched_size(VALUE self)
@@ -1141,46 +1667,89 @@ strscan_matched_size(VALUE self)
 static int
 name_to_backref_number(struct re_registers *regs, VALUE regexp, const char* name, const char* name_end, rb_encoding *enc)
 {
-    int num;
-
-    num = onig_name_to_backref_number(RREGEXP_PTR(regexp),
-	(const unsigned char* )name, (const unsigned char* )name_end, regs);
-    if (num >= 1) {
-	return num;
-    }
-    else {
-	rb_enc_raise(enc, rb_eIndexError, "undefined group name reference: %.*s",
-					  rb_long2int(name_end - name), name);
+    if (RTEST(regexp)) {
+        int num = onig_name_to_backref_number(RREGEXP_PTR(regexp),
+                                              (const unsigned char* )name,
+                                              (const unsigned char* )name_end,
+                                              regs);
+        if (num >= 1) {
+	        return num;
+        }
     }
-
-    UNREACHABLE;
+    rb_enc_raise(enc, rb_eIndexError, "undefined group name reference: %.*s",
+                 rb_long2int(name_end - name), name);
 }
 
 /*
- * call-seq: [](n)
- *
- * Returns the n-th subgroup in the most recent match.
- *
- *   s = StringScanner.new("Fri Dec 12 1975 14:39")
- *   s.scan(/(\w+) (\w+) (\d+) /)       # -> "Fri Dec 12 "
- *   s[0]                               # -> "Fri Dec 12 "
- *   s[1]                               # -> "Fri"
- *   s[2]                               # -> "Dec"
- *   s[3]                               # -> "12"
- *   s.post_match                       # -> "1975 14:39"
- *   s.pre_match                        # -> ""
- *
- *   s.reset
- *   s.scan(/(?<wday>\w+) (?<month>\w+) (?<day>\d+) /)       # -> "Fri Dec 12 "
- *   s[0]                               # -> "Fri Dec 12 "
- *   s[1]                               # -> "Fri"
- *   s[2]                               # -> "Dec"
- *   s[3]                               # -> "12"
- *   s[:wday]                           # -> "Fri"
- *   s[:month]                          # -> "Dec"
- *   s[:day]                            # -> "12"
- *   s.post_match                       # -> "1975 14:39"
- *   s.pre_match                        # -> ""
+ *
+ * :markup: markdown
+ * :include: strscan/link_refs.txt
+ *
+ * call-seq:
+ *   [](specifier) -> substring or nil
+ *
+ * Returns a captured substring or `nil`;
+ * see [Captured Match Values][13].
+ *
+ * When there are captures:
+ *
+ * ```rb
+ * scanner = StringScanner.new('Fri Dec 12 1975 14:39')
+ * scanner.scan(/(?<wday>\w+) (?<month>\w+) (?<day>\d+) /)
+ * ```
+ *
+ * - `specifier` zero: returns the entire matched substring:
+ *
+ *     ```rb
+ *     scanner[0]         # => "Fri Dec 12 "
+ *     scanner.pre_match  # => ""
+ *     scanner.post_match # => "1975 14:39"
+ *     ```
+ *
+ * - `specifier` positive integer. returns the `n`th capture, or `nil` if out of range:
+ *
+ *     ```rb
+ *     scanner[1] # => "Fri"
+ *     scanner[2] # => "Dec"
+ *     scanner[3] # => "12"
+ *     scanner[4] # => nil
+ *     ```
+ *
+ * - `specifier` negative integer. counts backward from the last subgroup:
+ *
+ *     ```rb
+ *     scanner[-1] # => "12"
+ *     scanner[-4] # => "Fri Dec 12 "
+ *     scanner[-5] # => nil
+ *     ```
+ *
+ * - `specifier` symbol or string. returns the named subgroup, or `nil` if no such:
+ *
+ *     ```rb
+ *     scanner[:wday]  # => "Fri"
+ *     scanner['wday'] # => "Fri"
+ *     scanner[:month] # => "Dec"
+ *     scanner[:day]   # => "12"
+ *     scanner[:nope]  # => nil
+ *     ```
+ *
+ * When there are no captures, only `[0]` returns non-`nil`:
+ *
+ * ```rb
+ * scanner = StringScanner.new('foobarbaz')
+ * scanner.exist?(/bar/)
+ * scanner[0] # => "bar"
+ * scanner[1] # => nil
+ * ```
+ *
+ * For a failed match, even `[0]` returns `nil`:
+ *
+ * ```rb
+ * scanner.scan(/nope/) # => nil
+ * scanner[0]           # => nil
+ * scanner[1]           # => nil
+ * ```
+ *
  */
 static VALUE
 strscan_aref(VALUE self, VALUE idx)
@@ -1197,7 +1766,6 @@ strscan_aref(VALUE self, VALUE idx)
             idx = rb_sym2str(idx);
             /* fall through */
         case T_STRING:
-            if (!RTEST(p->regex)) return Qnil;
             RSTRING_GETMEM(idx, name, i);
             i = name_to_backref_number(&(p->regs), p->regex, name, name + i, rb_enc_get(idx));
             break;
@@ -1217,14 +1785,28 @@ strscan_aref(VALUE self, VALUE idx)
 }
 
 /*
- * call-seq: size
+ * :markup: markdown
+ * :include: strscan/link_refs.txt
  *
- * Returns the amount of subgroups in the most recent match.
- * The full match counts as a subgroup.
+ * call-seq:
+ *   size -> captures_count
+ *
+ * Returns the count of captures if the most recent match attempt succeeded, `nil` otherwise;
+ * see [Captures Match Values][13]:
+ *
+ * ```rb
+ * scanner = StringScanner.new('Fri Dec 12 1975 14:39')
+ * scanner.size                        # => nil
+ *
+ * pattern = /(?<wday>\w+) (?<month>\w+) (?<day>\d+) /
+ * scanner.match?(pattern)
+ * scanner.values_at(*0..scanner.size) # => ["Fri Dec 12 ", "Fri", "Dec", "12", nil]
+ * scanner.size                        # => 4
+ *
+ * scanner.match?(/nope/)              # => nil
+ * scanner.size                        # => nil
+ * ```
  *
- *   s = StringScanner.new("Fri Dec 12 1975 14:39")
- *   s.scan(/(\w+) (\w+) (\d+) /)       # -> "Fri Dec 12 "
- *   s.size                             # -> 4
  */
 static VALUE
 strscan_size(VALUE self)
@@ -1237,16 +1819,30 @@ strscan_size(VALUE self)
 }
 
 /*
- * call-seq: captures
+ * :markup: markdown
+ * :include: strscan/link_refs.txt
+ *
+ * call-seq:
+ *   captures -> substring_array or nil
+ *
+ * Returns the array of [captured match values][13] at indexes `(1..)`
+ * if the most recent match attempt succeeded, or `nil` otherwise:
+ *
+ * ```rb
+ * scanner = StringScanner.new('Fri Dec 12 1975 14:39')
+ * scanner.captures         # => nil
+ *
+ * scanner.exist?(/(?<wday>\w+) (?<month>\w+) (?<day>\d+) /)
+ * scanner.captures         # => ["Fri", "Dec", "12"]
+ * scanner.values_at(*0..4) # => ["Fri Dec 12 ", "Fri", "Dec", "12", nil]
+ *
+ * scanner.exist?(/Fri/)
+ * scanner.captures         # => []
  *
- * Returns the subgroups in the most recent match (not including the full match).
- * If nothing was priorly matched, it returns nil.
+ * scanner.scan(/nope/)
+ * scanner.captures         # => nil
+ * ```
  *
- *   s = StringScanner.new("Fri Dec 12 1975 14:39")
- *   s.scan(/(\w+) (\w+) (\d+) /)       # -> "Fri Dec 12 "
- *   s.captures                         # -> ["Fri", "Dec", "12"]
- *   s.scan(/(\w+) (\w+) (\d+) /)       # -> nil
- *   s.captures                         # -> nil
  */
 static VALUE
 strscan_captures(VALUE self)
@@ -1262,9 +1858,13 @@ strscan_captures(VALUE self)
     new_ary  = rb_ary_new2(num_regs);
 
     for (i = 1; i < num_regs; i++) {
-        VALUE str = extract_range(p,
-                                  adjust_register_position(p, p->regs.beg[i]),
-                                  adjust_register_position(p, p->regs.end[i]));
+        VALUE str;
+        if (p->regs.beg[i] == -1)
+            str = Qnil;
+        else
+            str = extract_range(p,
+                                adjust_register_position(p, p->regs.beg[i]),
+                                adjust_register_position(p, p->regs.end[i]));
         rb_ary_push(new_ary, str);
     }
 
@@ -1272,17 +1872,25 @@ strscan_captures(VALUE self)
 }
 
 /*
- *  call-seq:
- *     scanner.values_at( i1, i2, ... iN )   -> an_array
+ * :markup: markdown
+ * :include: strscan/link_refs.txt
  *
- * Returns the subgroups in the most recent match at the given indices.
- * If nothing was priorly matched, it returns nil.
+ * call-seq:
+ *   values_at(*specifiers) -> array_of_captures or nil
+ *
+ * Returns an array of captured substrings, or `nil` of none.
+ *
+ * For each `specifier`, the returned substring is `[specifier]`;
+ * see #[].
+ *
+ * ```rb
+ * scanner = StringScanner.new('Fri Dec 12 1975 14:39')
+ * pattern = /(?<wday>\w+) (?<month>\w+) (?<day>\d+) /
+ * scanner.match?(pattern)
+ * scanner.values_at(*0..3)               # => ["Fri Dec 12 ", "Fri", "Dec", "12"]
+ * scanner.values_at(*%i[wday month day]) # => ["Fri", "Dec", "12"]
+ * ```
  *
- *   s = StringScanner.new("Fri Dec 12 1975 14:39")
- *   s.scan(/(\w+) (\w+) (\d+) /)       # -> "Fri Dec 12 "
- *   s.values_at 0, -1, 5, 2            # -> ["Fri Dec 12 ", "12", nil, "Dec"]
- *   s.scan(/(\w+) (\w+) (\d+) /)       # -> nil
- *   s.values_at 0, -1, 5, 2            # -> nil
  */
 
 static VALUE
@@ -1304,13 +1912,29 @@ strscan_values_at(int argc, VALUE *argv, VALUE self)
 }
 
 /*
- * Returns the <i><b>pre</b>-match</i> (in the regular expression sense) of the last scan.
+ * :markup: markdown
+ * :include: strscan/link_refs.txt
+ *
+ * call-seq:
+ *   pre_match -> substring
+ *
+ * Returns the substring that precedes the matched substring
+ * from the most recent match attempt if it was successful,
+ * or `nil` otherwise;
+ * see [Basic Match Values][18]:
+ *
+ * ```rb
+ * scanner = StringScanner.new('foobarbaz')
+ * scanner.pre_match      # => nil
+ *
+ * scanner.pos = 3
+ * scanner.exist?(/baz/)  # => 6
+ * scanner.pre_match      # => "foobar" # Substring of entire string, not just target string.
+ *
+ * scanner.exist?(/nope/) # => nil
+ * scanner.pre_match      # => nil
+ * ```
  *
- *   s = StringScanner.new('test string')
- *   s.scan(/\w+/)           # -> "test"
- *   s.scan(/\s+/)           # -> " "
- *   s.pre_match             # -> "test"
- *   s.post_match            # -> "string"
  */
 static VALUE
 strscan_pre_match(VALUE self)
@@ -1325,13 +1949,29 @@ strscan_pre_match(VALUE self)
 }
 
 /*
- * Returns the <i><b>post</b>-match</i> (in the regular expression sense) of the last scan.
+ * :markup: markdown
+ * :include: strscan/link_refs.txt
+ *
+ * call-seq:
+ *   post_match -> substring
+ *
+ * Returns the substring that follows the matched substring
+ * from the most recent match attempt if it was successful,
+ * or `nil` otherwise;
+ * see [Basic Match Values][18]:
+ *
+ * ```rb
+ * scanner = StringScanner.new('foobarbaz')
+ * scanner.post_match     # => nil
+ *
+ * scanner.pos = 3
+ * scanner.match?(/bar/)  # => 3
+ * scanner.post_match     # => "baz"
+ *
+ * scanner.match?(/nope/) # => nil
+ * scanner.post_match     # => nil
+ * ```
  *
- *   s = StringScanner.new('test string')
- *   s.scan(/\w+/)           # -> "test"
- *   s.scan(/\s+/)           # -> " "
- *   s.pre_match             # -> "test"
- *   s.post_match            # -> "string"
  */
 static VALUE
 strscan_post_match(VALUE self)
@@ -1346,8 +1986,24 @@ strscan_post_match(VALUE self)
 }
 
 /*
- * Returns the "rest" of the string (i.e. everything after the scan pointer).
- * If there is no more data (eos? = true), it returns <tt>""</tt>.
+ * :markup: markdown
+ * :include: strscan/link_refs.txt
+ *
+ * call-seq:
+ *   rest -> target_substring
+ *
+ * Returns the 'rest' of the [stored string][1] (all after the current [position][2]),
+ * which is the [target substring][3]:
+ *
+ * ```rb
+ * scanner = StringScanner.new('foobarbaz')
+ * scanner.rest # => "foobarbaz"
+ * scanner.pos = 3
+ * scanner.rest # => "barbaz"
+ * scanner.terminate
+ * scanner.rest # => ""
+ * ```
+ *
  */
 static VALUE
 strscan_rest(VALUE self)
@@ -1362,7 +2018,26 @@ strscan_rest(VALUE self)
 }
 
 /*
- * <tt>s.rest_size</tt> is equivalent to <tt>s.rest.size</tt>.
+ * :markup: markdown
+ * :include: strscan/link_refs.txt
+ *
+ * call-seq:
+ *   rest_size -> integer
+ *
+ * Returns the size (in bytes) of the #rest of the [stored string][1]:
+ *
+ * ```rb
+ * scanner = StringScanner.new('foobarbaz')
+ * scanner.rest      # => "foobarbaz"
+ * scanner.rest_size # => 9
+ * scanner.pos = 3
+ * scanner.rest      # => "barbaz"
+ * scanner.rest_size # => 6
+ * scanner.terminate
+ * scanner.rest      # => ""
+ * scanner.rest_size # => 0
+ * ```
+ *
  */
 static VALUE
 strscan_rest_size(VALUE self)
@@ -1379,9 +2054,14 @@ strscan_rest_size(VALUE self)
 }
 
 /*
+ * call-seq:
+ *   restsize
+ *
  * <tt>s.restsize</tt> is equivalent to <tt>s.rest_size</tt>.
  * This method is obsolete; use #rest_size instead.
  */
+
+ /* :nodoc: */
 static VALUE
 strscan_restsize(VALUE self)
 {
@@ -1392,15 +2072,39 @@ strscan_restsize(VALUE self)
 #define INSPECT_LENGTH 5
 
 /*
- * Returns a string that represents the StringScanner object, showing:
- * - the current position
- * - the size of the string
- * - the characters surrounding the scan pointer
- *
- *   s = StringScanner.new("Fri Dec 12 1975 14:39")
- *   s.inspect            # -> '#<StringScanner 0/21 @ "Fri D...">'
- *   s.scan_until /12/    # -> "Fri Dec 12"
- *   s.inspect            # -> '#<StringScanner 10/21 "...ec 12" @ " 1975...">'
+ * :markup: markdown
+ * :include: strscan/link_refs.txt
+ *
+ * call-seq:
+ *   inspect -> string
+ *
+ * Returns a string representation of `self` that may show:
+ *
+ * 1. The current [position][2].
+ * 2. The size (in bytes) of the [stored string][1].
+ * 3. The substring preceding the current position.
+ * 4. The substring following the current position (which is also the [target substring][3]).
+ *
+ * ```rb
+ * scanner = StringScanner.new("Fri Dec 12 1975 14:39")
+ * scanner.pos = 11
+ * scanner.inspect # => "#<StringScanner 11/21 \"...c 12 \" @ \"1975 ...\">"
+ * ```
+ *
+ * If at beginning-of-string, item 4 above (following substring) is omitted:
+ *
+ * ```rb
+ * scanner.reset
+ * scanner.inspect # => "#<StringScanner 0/21 @ \"Fri D...\">"
+ * ```
+ *
+ * If at end-of-string, all items above are omitted:
+ *
+ * ```rb
+ * scanner.terminate
+ * scanner.inspect # => "#<StringScanner fin>"
+ * ```
+ *
  */
 static VALUE
 strscan_inspect(VALUE self)
@@ -1472,13 +2176,13 @@ inspect2(struct strscanner *p)
 }
 
 /*
- * call-seq:
- *    scanner.fixed_anchor? -> true or false
+ * :markup: markdown
+ * :include: strscan/link_refs.txt
  *
- * Whether +scanner+ uses fixed anchor mode or not.
+ * call-seq:
+ *   fixed_anchor? -> true or false
  *
- * If fixed anchor mode is used, +\A+ always matches the beginning of
- * the string. Otherwise, +\A+ always matches the current position.
+ * Returns whether the [fixed-anchor property][10] is set.
  */
 static VALUE
 strscan_fixed_anchor_p(VALUE self)
@@ -1507,28 +2211,49 @@ named_captures_iter(const OnigUChar *name,
     VALUE value = RUBY_Qnil;
     int i;
     for (i = 0; i < back_num; i++) {
-        value = strscan_aref(data->self, INT2NUM(back_refs[i]));
+        VALUE v = strscan_aref(data->self, INT2NUM(back_refs[i]));
+        if (!RB_NIL_P(v)) {
+            value = v;
+        }
     }
     rb_hash_aset(data->captures, key, value);
     return 0;
 }
 
 /*
+ * :markup: markdown
+ * :include: strscan/link_refs.txt
+ *
  * call-seq:
- *   scanner.named_captures -> hash
+ *   named_captures -> hash
  *
- * Returns a hash of string variables matching the regular expression.
+ * Returns the array of captured match values at indexes (1..)
+ * if the most recent match attempt succeeded, or nil otherwise;
+ * see [Captured Match Values][13]:
+ *
+ * ```rb
+ * scanner = StringScanner.new('Fri Dec 12 1975 14:39')
+ * scanner.named_captures # => {}
+ *
+ * pattern = /(?<wday>\w+) (?<month>\w+) (?<day>\d+) /
+ * scanner.match?(pattern)
+ * scanner.named_captures # => {"wday"=>"Fri", "month"=>"Dec", "day"=>"12"}
+ *
+ * scanner.string = 'nope'
+ * scanner.match?(pattern)
+ * scanner.named_captures # => {"wday"=>nil, "month"=>nil, "day"=>nil}
+ *
+ * scanner.match?(/nosuch/)
+ * scanner.named_captures # => {}
+ * ```
  *
- *   scan = StringScanner.new('foobarbaz')
- *   scan.match?(/(?<f>foo)(?<r>bar)(?<z>baz)/)
- *   scan.named_captures # -> {"f"=>"foo", "r"=>"bar", "z"=>"baz"}
  */
 static VALUE
 strscan_named_captures(VALUE self)
 {
     struct strscanner *p;
-    GET_SCANNER(self, p);
     named_captures_data data;
+    GET_SCANNER(self, p);
     data.self = self;
     data.captures = rb_hash_new();
     if (!RB_NIL_P(p->regex)) {
@@ -1545,107 +2270,11 @@ strscan_named_captures(VALUE self)
 /*
  * Document-class: StringScanner
  *
- * StringScanner provides for lexical scanning operations on a String.  Here is
- * an example of its usage:
- *
- *   require 'strscan'
- *
- *   s = StringScanner.new('This is an example string')
- *   s.eos?               # -> false
- *
- *   p s.scan(/\w+/)      # -> "This"
- *   p s.scan(/\w+/)      # -> nil
- *   p s.scan(/\s+/)      # -> " "
- *   p s.scan(/\s+/)      # -> nil
- *   p s.scan(/\w+/)      # -> "is"
- *   s.eos?               # -> false
- *
- *   p s.scan(/\s+/)      # -> " "
- *   p s.scan(/\w+/)      # -> "an"
- *   p s.scan(/\s+/)      # -> " "
- *   p s.scan(/\w+/)      # -> "example"
- *   p s.scan(/\s+/)      # -> " "
- *   p s.scan(/\w+/)      # -> "string"
- *   s.eos?               # -> true
+ * :markup: markdown
  *
- *   p s.scan(/\s+/)      # -> nil
- *   p s.scan(/\w+/)      # -> nil
+ * :include: strscan/link_refs.txt
+ * :include: strscan/strscan.md
  *
- * Scanning a string means remembering the position of a <i>scan pointer</i>,
- * which is just an index.  The point of scanning is to move forward a bit at
- * a time, so matches are sought after the scan pointer; usually immediately
- * after it.
- *
- * Given the string "test string", here are the pertinent scan pointer
- * positions:
- *
- *     t e s t   s t r i n g
- *   0 1 2 ...             1
- *                         0
- *
- * When you #scan for a pattern (a regular expression), the match must occur
- * at the character after the scan pointer.  If you use #scan_until, then the
- * match can occur anywhere after the scan pointer.  In both cases, the scan
- * pointer moves <i>just beyond</i> the last character of the match, ready to
- * scan again from the next character onwards.  This is demonstrated by the
- * example above.
- *
- * == Method Categories
- *
- * There are other methods besides the plain scanners.  You can look ahead in
- * the string without actually scanning.  You can access the most recent match.
- * You can modify the string being scanned, reset or terminate the scanner,
- * find out or change the position of the scan pointer, skip ahead, and so on.
- *
- * === Advancing the Scan Pointer
- *
- * - #getch
- * - #get_byte
- * - #scan
- * - #scan_until
- * - #skip
- * - #skip_until
- *
- * === Looking Ahead
- *
- * - #check
- * - #check_until
- * - #exist?
- * - #match?
- * - #peek
- *
- * === Finding Where we Are
- *
- * - #beginning_of_line? (<tt>#bol?</tt>)
- * - #eos?
- * - #rest?
- * - #rest_size
- * - #pos
- *
- * === Setting Where we Are
- *
- * - #reset
- * - #terminate
- * - #pos=
- *
- * === Match Data
- *
- * - #matched
- * - #matched?
- * - #matched_size
- * - <tt>#[]</tt>
- * - #pre_match
- * - #post_match
- *
- * === Miscellaneous
- *
- * - <tt><<</tt>
- * - #concat
- * - #string
- * - #string=
- * - #unscan
- *
- * There are aliases to several of the methods.
  */
 void
 Init_strscan(void)
@@ -1660,6 +2289,10 @@ Init_strscan(void)
 
     id_byteslice = rb_intern("byteslice");
 
+    usascii_encindex = rb_usascii_encindex();
+    utf8_encindex = rb_utf8_encindex();
+    binary_encindex = rb_ascii8bit_encindex();
+
     StringScanner = rb_define_class("StringScanner", rb_cObject);
     ScanError = rb_define_class_under(StringScanner, "Error", rb_eStandardError);
     if (!rb_const_defined(rb_cObject, id_scanerr)) {
@@ -1704,9 +2337,14 @@ Init_strscan(void)
     rb_define_method(StringScanner, "getch",       strscan_getch,       0);
     rb_define_method(StringScanner, "get_byte",    strscan_get_byte,    0);
     rb_define_method(StringScanner, "getbyte",     strscan_getbyte,     0);
+    rb_define_method(StringScanner, "scan_byte",   strscan_scan_byte,   0);
     rb_define_method(StringScanner, "peek",        strscan_peek,        1);
+    rb_define_method(StringScanner, "peek_byte",   strscan_peek_byte,   0);
     rb_define_method(StringScanner, "peep",        strscan_peep,        1);
 
+    rb_define_private_method(StringScanner, "scan_base10_integer", strscan_scan_base10_integer, 0);
+    rb_define_private_method(StringScanner, "scan_base16_integer", strscan_scan_base16_integer, 0);
+
     rb_define_method(StringScanner, "unscan",      strscan_unscan,      0);
 
     rb_define_method(StringScanner, "beginning_of_line?", strscan_bol_p, 0);
@@ -1734,4 +2372,6 @@ Init_strscan(void)
     rb_define_method(StringScanner, "fixed_anchor?", strscan_fixed_anchor_p, 0);
 
     rb_define_method(StringScanner, "named_captures", strscan_named_captures, 0);
+
+    rb_require("strscan/strscan");
 }
diff --git a/ext/strscan/strscan.gemspec b/ext/strscan/strscan.gemspec
index 8a61c7abe65974..47180bb8d831cb 100644
--- a/ext/strscan/strscan.gemspec
+++ b/ext/strscan/strscan.gemspec
@@ -19,16 +19,24 @@ Gem::Specification.new do |s|
   files = [
     "COPYING",
     "LICENSE.txt",
+    "lib/strscan/strscan.rb"
   ]
+
+  s.require_paths = %w{lib}
+
   if RUBY_ENGINE == "jruby"
-    s.require_paths = %w{ext/jruby/lib lib}
-    files << "ext/jruby/lib/strscan.rb"
     files << "lib/strscan.jar"
+    files << "ext/jruby/lib/strscan.rb"
+    s.require_paths += %w{ext/jruby/lib}
     s.platform = "java"
   else
-    s.require_paths = %w{lib}
     files << "ext/strscan/extconf.rb"
     files << "ext/strscan/strscan.c"
+    s.rdoc_options << "-idoc"
+    s.extra_rdoc_files = [
+      ".rdoc_options",
+      *Dir.glob("doc/strscan/**/*")
+    ]
     s.extensions = %w{ext/strscan/extconf.rb}
   end
   s.files = files
diff --git a/ext/syslog/depend b/ext/syslog/depend
deleted file mode 100644
index ee4ac5f47db5e5..00000000000000
--- a/ext/syslog/depend
+++ /dev/null
@@ -1,161 +0,0 @@
-# AUTOGENERATED DEPENDENCIES START
-syslog.o: $(RUBY_EXTCONF_H)
-syslog.o: $(arch_hdrdir)/ruby/config.h
-syslog.o: $(hdrdir)/ruby/assert.h
-syslog.o: $(hdrdir)/ruby/backward.h
-syslog.o: $(hdrdir)/ruby/backward/2/assume.h
-syslog.o: $(hdrdir)/ruby/backward/2/attributes.h
-syslog.o: $(hdrdir)/ruby/backward/2/bool.h
-syslog.o: $(hdrdir)/ruby/backward/2/inttypes.h
-syslog.o: $(hdrdir)/ruby/backward/2/limits.h
-syslog.o: $(hdrdir)/ruby/backward/2/long_long.h
-syslog.o: $(hdrdir)/ruby/backward/2/stdalign.h
-syslog.o: $(hdrdir)/ruby/backward/2/stdarg.h
-syslog.o: $(hdrdir)/ruby/defines.h
-syslog.o: $(hdrdir)/ruby/intern.h
-syslog.o: $(hdrdir)/ruby/internal/abi.h
-syslog.o: $(hdrdir)/ruby/internal/anyargs.h
-syslog.o: $(hdrdir)/ruby/internal/arithmetic.h
-syslog.o: $(hdrdir)/ruby/internal/arithmetic/char.h
-syslog.o: $(hdrdir)/ruby/internal/arithmetic/double.h
-syslog.o: $(hdrdir)/ruby/internal/arithmetic/fixnum.h
-syslog.o: $(hdrdir)/ruby/internal/arithmetic/gid_t.h
-syslog.o: $(hdrdir)/ruby/internal/arithmetic/int.h
-syslog.o: $(hdrdir)/ruby/internal/arithmetic/intptr_t.h
-syslog.o: $(hdrdir)/ruby/internal/arithmetic/long.h
-syslog.o: $(hdrdir)/ruby/internal/arithmetic/long_long.h
-syslog.o: $(hdrdir)/ruby/internal/arithmetic/mode_t.h
-syslog.o: $(hdrdir)/ruby/internal/arithmetic/off_t.h
-syslog.o: $(hdrdir)/ruby/internal/arithmetic/pid_t.h
-syslog.o: $(hdrdir)/ruby/internal/arithmetic/short.h
-syslog.o: $(hdrdir)/ruby/internal/arithmetic/size_t.h
-syslog.o: $(hdrdir)/ruby/internal/arithmetic/st_data_t.h
-syslog.o: $(hdrdir)/ruby/internal/arithmetic/uid_t.h
-syslog.o: $(hdrdir)/ruby/internal/assume.h
-syslog.o: $(hdrdir)/ruby/internal/attr/alloc_size.h
-syslog.o: $(hdrdir)/ruby/internal/attr/artificial.h
-syslog.o: $(hdrdir)/ruby/internal/attr/cold.h
-syslog.o: $(hdrdir)/ruby/internal/attr/const.h
-syslog.o: $(hdrdir)/ruby/internal/attr/constexpr.h
-syslog.o: $(hdrdir)/ruby/internal/attr/deprecated.h
-syslog.o: $(hdrdir)/ruby/internal/attr/diagnose_if.h
-syslog.o: $(hdrdir)/ruby/internal/attr/enum_extensibility.h
-syslog.o: $(hdrdir)/ruby/internal/attr/error.h
-syslog.o: $(hdrdir)/ruby/internal/attr/flag_enum.h
-syslog.o: $(hdrdir)/ruby/internal/attr/forceinline.h
-syslog.o: $(hdrdir)/ruby/internal/attr/format.h
-syslog.o: $(hdrdir)/ruby/internal/attr/maybe_unused.h
-syslog.o: $(hdrdir)/ruby/internal/attr/noalias.h
-syslog.o: $(hdrdir)/ruby/internal/attr/nodiscard.h
-syslog.o: $(hdrdir)/ruby/internal/attr/noexcept.h
-syslog.o: $(hdrdir)/ruby/internal/attr/noinline.h
-syslog.o: $(hdrdir)/ruby/internal/attr/nonnull.h
-syslog.o: $(hdrdir)/ruby/internal/attr/noreturn.h
-syslog.o: $(hdrdir)/ruby/internal/attr/packed_struct.h
-syslog.o: $(hdrdir)/ruby/internal/attr/pure.h
-syslog.o: $(hdrdir)/ruby/internal/attr/restrict.h
-syslog.o: $(hdrdir)/ruby/internal/attr/returns_nonnull.h
-syslog.o: $(hdrdir)/ruby/internal/attr/warning.h
-syslog.o: $(hdrdir)/ruby/internal/attr/weakref.h
-syslog.o: $(hdrdir)/ruby/internal/cast.h
-syslog.o: $(hdrdir)/ruby/internal/compiler_is.h
-syslog.o: $(hdrdir)/ruby/internal/compiler_is/apple.h
-syslog.o: $(hdrdir)/ruby/internal/compiler_is/clang.h
-syslog.o: $(hdrdir)/ruby/internal/compiler_is/gcc.h
-syslog.o: $(hdrdir)/ruby/internal/compiler_is/intel.h
-syslog.o: $(hdrdir)/ruby/internal/compiler_is/msvc.h
-syslog.o: $(hdrdir)/ruby/internal/compiler_is/sunpro.h
-syslog.o: $(hdrdir)/ruby/internal/compiler_since.h
-syslog.o: $(hdrdir)/ruby/internal/config.h
-syslog.o: $(hdrdir)/ruby/internal/constant_p.h
-syslog.o: $(hdrdir)/ruby/internal/core.h
-syslog.o: $(hdrdir)/ruby/internal/core/rarray.h
-syslog.o: $(hdrdir)/ruby/internal/core/rbasic.h
-syslog.o: $(hdrdir)/ruby/internal/core/rbignum.h
-syslog.o: $(hdrdir)/ruby/internal/core/rclass.h
-syslog.o: $(hdrdir)/ruby/internal/core/rdata.h
-syslog.o: $(hdrdir)/ruby/internal/core/rfile.h
-syslog.o: $(hdrdir)/ruby/internal/core/rhash.h
-syslog.o: $(hdrdir)/ruby/internal/core/robject.h
-syslog.o: $(hdrdir)/ruby/internal/core/rregexp.h
-syslog.o: $(hdrdir)/ruby/internal/core/rstring.h
-syslog.o: $(hdrdir)/ruby/internal/core/rstruct.h
-syslog.o: $(hdrdir)/ruby/internal/core/rtypeddata.h
-syslog.o: $(hdrdir)/ruby/internal/ctype.h
-syslog.o: $(hdrdir)/ruby/internal/dllexport.h
-syslog.o: $(hdrdir)/ruby/internal/dosish.h
-syslog.o: $(hdrdir)/ruby/internal/error.h
-syslog.o: $(hdrdir)/ruby/internal/eval.h
-syslog.o: $(hdrdir)/ruby/internal/event.h
-syslog.o: $(hdrdir)/ruby/internal/fl_type.h
-syslog.o: $(hdrdir)/ruby/internal/gc.h
-syslog.o: $(hdrdir)/ruby/internal/glob.h
-syslog.o: $(hdrdir)/ruby/internal/globals.h
-syslog.o: $(hdrdir)/ruby/internal/has/attribute.h
-syslog.o: $(hdrdir)/ruby/internal/has/builtin.h
-syslog.o: $(hdrdir)/ruby/internal/has/c_attribute.h
-syslog.o: $(hdrdir)/ruby/internal/has/cpp_attribute.h
-syslog.o: $(hdrdir)/ruby/internal/has/declspec_attribute.h
-syslog.o: $(hdrdir)/ruby/internal/has/extension.h
-syslog.o: $(hdrdir)/ruby/internal/has/feature.h
-syslog.o: $(hdrdir)/ruby/internal/has/warning.h
-syslog.o: $(hdrdir)/ruby/internal/intern/array.h
-syslog.o: $(hdrdir)/ruby/internal/intern/bignum.h
-syslog.o: $(hdrdir)/ruby/internal/intern/class.h
-syslog.o: $(hdrdir)/ruby/internal/intern/compar.h
-syslog.o: $(hdrdir)/ruby/internal/intern/complex.h
-syslog.o: $(hdrdir)/ruby/internal/intern/cont.h
-syslog.o: $(hdrdir)/ruby/internal/intern/dir.h
-syslog.o: $(hdrdir)/ruby/internal/intern/enum.h
-syslog.o: $(hdrdir)/ruby/internal/intern/enumerator.h
-syslog.o: $(hdrdir)/ruby/internal/intern/error.h
-syslog.o: $(hdrdir)/ruby/internal/intern/eval.h
-syslog.o: $(hdrdir)/ruby/internal/intern/file.h
-syslog.o: $(hdrdir)/ruby/internal/intern/hash.h
-syslog.o: $(hdrdir)/ruby/internal/intern/io.h
-syslog.o: $(hdrdir)/ruby/internal/intern/load.h
-syslog.o: $(hdrdir)/ruby/internal/intern/marshal.h
-syslog.o: $(hdrdir)/ruby/internal/intern/numeric.h
-syslog.o: $(hdrdir)/ruby/internal/intern/object.h
-syslog.o: $(hdrdir)/ruby/internal/intern/parse.h
-syslog.o: $(hdrdir)/ruby/internal/intern/proc.h
-syslog.o: $(hdrdir)/ruby/internal/intern/process.h
-syslog.o: $(hdrdir)/ruby/internal/intern/random.h
-syslog.o: $(hdrdir)/ruby/internal/intern/range.h
-syslog.o: $(hdrdir)/ruby/internal/intern/rational.h
-syslog.o: $(hdrdir)/ruby/internal/intern/re.h
-syslog.o: $(hdrdir)/ruby/internal/intern/ruby.h
-syslog.o: $(hdrdir)/ruby/internal/intern/select.h
-syslog.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
-syslog.o: $(hdrdir)/ruby/internal/intern/signal.h
-syslog.o: $(hdrdir)/ruby/internal/intern/sprintf.h
-syslog.o: $(hdrdir)/ruby/internal/intern/string.h
-syslog.o: $(hdrdir)/ruby/internal/intern/struct.h
-syslog.o: $(hdrdir)/ruby/internal/intern/thread.h
-syslog.o: $(hdrdir)/ruby/internal/intern/time.h
-syslog.o: $(hdrdir)/ruby/internal/intern/variable.h
-syslog.o: $(hdrdir)/ruby/internal/intern/vm.h
-syslog.o: $(hdrdir)/ruby/internal/interpreter.h
-syslog.o: $(hdrdir)/ruby/internal/iterator.h
-syslog.o: $(hdrdir)/ruby/internal/memory.h
-syslog.o: $(hdrdir)/ruby/internal/method.h
-syslog.o: $(hdrdir)/ruby/internal/module.h
-syslog.o: $(hdrdir)/ruby/internal/newobj.h
-syslog.o: $(hdrdir)/ruby/internal/scan_args.h
-syslog.o: $(hdrdir)/ruby/internal/special_consts.h
-syslog.o: $(hdrdir)/ruby/internal/static_assert.h
-syslog.o: $(hdrdir)/ruby/internal/stdalign.h
-syslog.o: $(hdrdir)/ruby/internal/stdbool.h
-syslog.o: $(hdrdir)/ruby/internal/symbol.h
-syslog.o: $(hdrdir)/ruby/internal/value.h
-syslog.o: $(hdrdir)/ruby/internal/value_type.h
-syslog.o: $(hdrdir)/ruby/internal/variable.h
-syslog.o: $(hdrdir)/ruby/internal/warning_push.h
-syslog.o: $(hdrdir)/ruby/internal/xmalloc.h
-syslog.o: $(hdrdir)/ruby/missing.h
-syslog.o: $(hdrdir)/ruby/ruby.h
-syslog.o: $(hdrdir)/ruby/st.h
-syslog.o: $(hdrdir)/ruby/subst.h
-syslog.o: $(hdrdir)/ruby/util.h
-syslog.o: syslog.c
-# AUTOGENERATED DEPENDENCIES END
diff --git a/ext/syslog/extconf.rb b/ext/syslog/extconf.rb
deleted file mode 100644
index 1230a4d52edc2f..00000000000000
--- a/ext/syslog/extconf.rb
+++ /dev/null
@@ -1,13 +0,0 @@
-# frozen_string_literal: false
-# $RoughId: extconf.rb,v 1.3 2001/11/24 17:49:26 knu Exp $
-# $Id$
-
-require 'mkmf'
-
-have_library("log") # for Android
-
-have_header("syslog.h") &&
-  have_func("openlog") &&
-  have_func("setlogmask") &&
-  create_makefile("syslog")
-
diff --git a/ext/syslog/lib/syslog/logger.rb b/ext/syslog/lib/syslog/logger.rb
deleted file mode 100644
index 453ca2785c7a87..00000000000000
--- a/ext/syslog/lib/syslog/logger.rb
+++ /dev/null
@@ -1,209 +0,0 @@
-# frozen_string_literal: false
-require 'syslog'
-require 'logger'
-
-##
-# Syslog::Logger is a Logger work-alike that logs via syslog instead of to a
-# file.  You can use Syslog::Logger to aggregate logs between multiple
-# machines.
-#
-# By default, Syslog::Logger uses the program name 'ruby', but this can be
-# changed via the first argument to Syslog::Logger.new.
-#
-# NOTE! You can only set the Syslog::Logger program name when you initialize
-# Syslog::Logger for the first time.  This is a limitation of the way
-# Syslog::Logger uses syslog (and in some ways, a limitation of the way
-# syslog(3) works).  Attempts to change Syslog::Logger's program name after
-# the first initialization will be ignored.
-#
-# === Example
-#
-# The following will log to syslogd on your local machine:
-#
-#   require 'syslog/logger'
-#
-#   log = Syslog::Logger.new 'my_program'
-#   log.info 'this line will be logged via syslog(3)'
-#
-# Also the facility may be set to specify the facility level which will be used:
-#
-#   log.info 'this line will be logged using Syslog default facility level'
-#
-#   log_local1 = Syslog::Logger.new 'my_program', Syslog::LOG_LOCAL1
-#   log_local1.info 'this line will be logged using local1 facility level'
-#
-#
-# You may need to perform some syslog.conf setup first.  For a BSD machine add
-# the following lines to /etc/syslog.conf:
-#
-#  !my_program
-#  *.*                                             /var/log/my_program.log
-#
-# Then touch /var/log/my_program.log and signal syslogd with a HUP
-# (killall -HUP syslogd, on FreeBSD).
-#
-# If you wish to have logs automatically roll over and archive, see the
-# newsyslog.conf(5) and newsyslog(8) man pages.
-
-class Syslog::Logger
-  # Default formatter for log messages.
-  class Formatter
-    def call severity, time, progname, msg
-      clean msg
-    end
-
-    private
-
-    ##
-    # Clean up messages so they're nice and pretty.
-
-    def clean message
-      message = message.to_s.strip
-      message.gsub!(/\e\[[0-9;]*m/, '') # remove useless ansi color codes
-      return message
-    end
-  end
-
-  ##
-  # The version of Syslog::Logger you are using.
-
-  VERSION = '2.1.0'
-
-  ##
-  # Maps Logger warning types to syslog(3) warning types.
-  #
-  # Messages from Ruby applications are not considered as critical as messages
-  # from other system daemons using syslog(3), so most messages are reduced by
-  # one level.  For example, a fatal message for Ruby's Logger is considered
-  # an error for syslog(3).
-
-  LEVEL_MAP = {
-    ::Logger::UNKNOWN => Syslog::LOG_ALERT,
-    ::Logger::FATAL   => Syslog::LOG_ERR,
-    ::Logger::ERROR   => Syslog::LOG_WARNING,
-    ::Logger::WARN    => Syslog::LOG_NOTICE,
-    ::Logger::INFO    => Syslog::LOG_INFO,
-    ::Logger::DEBUG   => Syslog::LOG_DEBUG,
-  }
-
-  ##
-  # Returns the internal Syslog object that is initialized when the
-  # first instance is created.
-
-  def self.syslog
-    @@syslog
-  end
-
-  ##
-  # Specifies the internal Syslog object to be used.
-
-  def self.syslog= syslog
-    @@syslog = syslog
-  end
-
-  ##
-  # Builds a methods for level +meth+.
-
-  def self.make_methods meth
-    level = ::Logger.const_get(meth.upcase)
-    eval <<-EOM, nil, __FILE__, __LINE__ + 1
-      def #{meth}(message = nil, &block)
-        add(#{level}, message, &block)
-      end
-
-      def #{meth}?
-        level <= #{level}
-      end
-    EOM
-  end
-
-  ##
-  # :method: unknown
-  #
-  # Logs a +message+ at the unknown (syslog alert) log level, or logs the
-  # message returned from the block.
-
-  ##
-  # :method: fatal
-  #
-  # Logs a +message+ at the fatal (syslog err) log level, or logs the message
-  # returned from the block.
-
-  ##
-  # :method: error
-  #
-  # Logs a +message+ at the error (syslog warning) log level, or logs the
-  # message returned from the block.
-
-  ##
-  # :method: warn
-  #
-  # Logs a +message+ at the warn (syslog notice) log level, or logs the
-  # message returned from the block.
-
-  ##
-  # :method: info
-  #
-  # Logs a +message+ at the info (syslog info) log level, or logs the message
-  # returned from the block.
-
-  ##
-  # :method: debug
-  #
-  # Logs a +message+ at the debug (syslog debug) log level, or logs the
-  # message returned from the block.
-
-  Logger::Severity::constants.each do |severity|
-    make_methods severity.downcase
-  end
-
-  ##
-  # Log level for Logger compatibility.
-
-  attr_accessor :level
-
-  # Logging formatter, as a +Proc+ that will take four arguments and
-  # return the formatted message. The arguments are:
-  #
-  # +severity+:: The Severity of the log message.
-  # +time+:: A Time instance representing when the message was logged.
-  # +progname+:: The #progname configured, or passed to the logger method.
-  # +msg+:: The _Object_ the user passed to the log message; not necessarily a
-  #         String.
-  #
-  # The block should return an Object that can be written to the logging
-  # device via +write+.  The default formatter is used when no formatter is
-  # set.
-  attr_accessor :formatter
-
-  ##
-  # The facility argument is used to specify what type of program is logging the message.
-
-  attr_accessor :facility
-
-  ##
-  # Fills in variables for Logger compatibility.  If this is the first
-  # instance of Syslog::Logger, +program_name+ may be set to change the logged
-  # program name. The +facility+ may be set to specify the facility level which will be used.
-  #
-  # Due to the way syslog works, only one program name may be chosen.
-
-  def initialize program_name = 'ruby', facility = nil
-    @level = ::Logger::DEBUG
-    @formatter = Formatter.new
-
-    @@syslog ||= Syslog.open(program_name)
-
-    @facility = (facility || @@syslog.facility)
-  end
-
-  ##
-  # Almost duplicates Logger#add.  +progname+ is ignored.
-
-  def add severity, message = nil, progname = nil, &block
-    severity ||= ::Logger::UNKNOWN
-    level <= severity and
-      @@syslog.log( (LEVEL_MAP[severity] | @facility), '%s', formatter.call(severity, Time.now, progname, (message || block.call)) )
-    true
-  end
-end
diff --git a/ext/syslog/syslog.c b/ext/syslog/syslog.c
deleted file mode 100644
index 6a97c15811888a..00000000000000
--- a/ext/syslog/syslog.c
+++ /dev/null
@@ -1,592 +0,0 @@
-/*
- * UNIX Syslog extension for Ruby
- * Amos Gouaux, University of Texas at Dallas
- * <amos+ruby@utdallas.edu>
- * Documented by mathew <meta@pobox.com>
- *
- * $RoughId: syslog.c,v 1.21 2002/02/25 12:21:17 knu Exp $
- * $Id$
- */
-
-#include "ruby/ruby.h"
-#include "ruby/util.h"
-#include <syslog.h>
-
-#define SYSLOG_VERSION "0.1.1"
-
-/* Syslog class */
-static VALUE mSyslog;
-/*
- * Module holding all Syslog constants.  See Syslog::log and
- * Syslog::open for constant descriptions.
- */
-static VALUE mSyslogConstants;
-/* Module holding Syslog option constants */
-static VALUE mSyslogOption;
-/* Module holding Syslog facility constants */
-static VALUE mSyslogFacility;
-/* Module holding Syslog level constants */
-static VALUE mSyslogLevel;
-/* Module holding Syslog utility macros */
-static VALUE mSyslogMacros;
-
-static const char *syslog_ident = NULL;
-static int syslog_options = -1, syslog_facility = -1, syslog_mask = -1;
-static int syslog_opened = 0;
-
-/* Package helper routines */
-static void syslog_write(int pri, int argc, VALUE *argv)
-{
-    VALUE str;
-
-    if (argc < 1) {
-        rb_raise(rb_eArgError, "no log message supplied");
-    }
-
-    if (!syslog_opened) {
-        rb_raise(rb_eRuntimeError, "must open syslog before write");
-    }
-
-    str = rb_f_sprintf(argc, argv);
-
-    syslog(pri, "%s", RSTRING_PTR(str));
-}
-
-/* Closes the syslog facility.
- * Raises a runtime exception if it is not open.
- */
-static VALUE mSyslog_close(VALUE self)
-{
-    if (!syslog_opened) {
-        rb_raise(rb_eRuntimeError, "syslog not opened");
-    }
-
-    closelog();
-
-    xfree((void *)syslog_ident);
-    syslog_ident = NULL;
-    syslog_options = syslog_facility = syslog_mask = -1;
-    syslog_opened = 0;
-
-    return Qnil;
-}
-
-/* call-seq:
- *   open(ident, options, facility) => syslog
- *
- * :yields: syslog
- *
- * Open the syslog facility.
- * Raises a runtime exception if it is already open.
- *
- * Can be called with or without a code block. If called with a block, the
- * Syslog object created is passed to the block.
- *
- * If the syslog is already open, raises a RuntimeError.
- *
- * +ident+ is a String which identifies the calling program.
- *
- * +options+ is the logical OR of any of the following:
- *
- * LOG_CONS:: If there is an error while sending to the system logger,
- *            write directly to the console instead.
- *
- * LOG_NDELAY:: Open the connection now, rather than waiting for the first
- *              message to be written.
- *
- * LOG_NOWAIT:: Don't wait for any child processes created while logging
- *              messages. (Has no effect on Linux.)
- *
- * LOG_ODELAY:: Opposite of LOG_NDELAY; wait until a message is sent before
- *              opening the connection. (This is the default.)
- *
- * LOG_PERROR:: Print the message to stderr as well as sending it to syslog.
- *              (Not in POSIX.1-2001.)
- *
- * LOG_PID:: Include the current process ID with each message.
- *
- * +facility+ describes the type of program opening the syslog, and is
- * the logical OR of any of the following which are defined for the host OS:
- *
- * LOG_AUTH:: Security or authorization. Deprecated, use LOG_AUTHPRIV
- *            instead.
- *
- * LOG_AUTHPRIV:: Security or authorization messages which should be kept
- *                private.
- *
- * LOG_CONSOLE:: System console message.
- *
- * LOG_CRON:: System task scheduler (cron or at).
- *
- * LOG_DAEMON:: A system daemon which has no facility value of its own.
- *
- * LOG_FTP:: An FTP server.
- *
- * LOG_KERN:: A kernel message (not sendable by user processes, so not of
- *            much use to Ruby, but listed here for completeness).
- *
- * LOG_LPR:: Line printer subsystem.
- *
- * LOG_MAIL:: Mail delivery or transport subsystem.
- *
- * LOG_NEWS:: Usenet news system.
- *
- * LOG_NTP:: Network Time Protocol server.
- *
- * LOG_SECURITY:: General security message.
- *
- * LOG_SYSLOG:: Messages generated internally by syslog.
- *
- * LOG_USER:: Generic user-level message.
- *
- * LOG_UUCP:: UUCP subsystem.
- *
- * LOG_LOCAL0 to LOG_LOCAL7:: Locally-defined facilities.
- *
- * Example:
- *
- *  Syslog.open("webrick", Syslog::LOG_PID,
- *              Syslog::LOG_DAEMON | Syslog::LOG_LOCAL3)
- *
- */
-static VALUE mSyslog_open(int argc, VALUE *argv, VALUE self)
-{
-    VALUE ident, opt, fac;
-    const char *ident_ptr;
-
-    if (syslog_opened) {
-        rb_raise(rb_eRuntimeError, "syslog already open");
-    }
-
-    rb_scan_args(argc, argv, "03", &ident, &opt, &fac);
-
-    if (NIL_P(ident)) {
-        ident = rb_gv_get("$0");
-    }
-    ident_ptr = StringValueCStr(ident);
-    syslog_ident = strdup(ident_ptr);
-
-    if (NIL_P(opt)) {
-        syslog_options = LOG_PID | LOG_CONS;
-    } else {
-        syslog_options = NUM2INT(opt);
-    }
-
-    if (NIL_P(fac)) {
-        syslog_facility = LOG_USER;
-    } else {
-        syslog_facility = NUM2INT(fac);
-    }
-
-    openlog(syslog_ident, syslog_options, syslog_facility);
-
-    syslog_opened = 1;
-
-    setlogmask(syslog_mask = setlogmask(0));
-
-    /* be like File.new.open {...} */
-    if (rb_block_given_p()) {
-        rb_ensure(rb_yield, self, mSyslog_close, self);
-    }
-
-    return self;
-}
-
-/* call-seq:
- *   reopen(ident, options, facility) => syslog
- *
- * :yields: syslog
- *
- * Closes and then reopens the syslog.
- *
- * Arguments are the same as for open().
- */
-static VALUE mSyslog_reopen(int argc, VALUE *argv, VALUE self)
-{
-    mSyslog_close(self);
-
-    return mSyslog_open(argc, argv, self);
-}
-
-/* call-seq:
- *   opened?
- *
- * Returns true if the syslog is open.
- */
-static VALUE mSyslog_isopen(VALUE self)
-{
-    return syslog_opened ? Qtrue : Qfalse;
-}
-
-/* Returns the identity string used in the last call to open()
- */
-static VALUE mSyslog_ident(VALUE self)
-{
-    return syslog_opened ? rb_str_new2(syslog_ident) : Qnil;
-}
-
-/* Returns the options bitmask used in the last call to open()
- */
-static VALUE mSyslog_options(VALUE self)
-{
-    return syslog_opened ? INT2NUM(syslog_options) : Qnil;
-}
-
-/* Returns the facility number used in the last call to open()
- */
-static VALUE mSyslog_facility(VALUE self)
-{
-    return syslog_opened ? INT2NUM(syslog_facility) : Qnil;
-}
-
-/* Returns the log priority mask in effect. The mask is not reset by opening
- * or closing syslog.
- */
-static VALUE mSyslog_get_mask(VALUE self)
-{
-    return syslog_opened ? INT2NUM(syslog_mask) : Qnil;
-}
-
-/* call-seq:
- *   mask=(priority_mask)
- *
- * Sets the log priority mask. A method LOG_UPTO is defined to make it easier
- * to set mask values. Example:
- *
- *   Syslog.mask = Syslog::LOG_UPTO(Syslog::LOG_ERR)
- *
- * Alternatively, specific priorities can be selected and added together using
- * binary OR. Example:
- *
- *   Syslog.mask = Syslog::LOG_MASK(Syslog::LOG_ERR) | Syslog::LOG_MASK(Syslog::LOG_CRIT)
- *
- * The priority mask persists through calls to open() and close().
- */
-static VALUE mSyslog_set_mask(VALUE self, VALUE mask)
-{
-    if (!syslog_opened) {
-        rb_raise(rb_eRuntimeError, "must open syslog before setting log mask");
-    }
-
-    setlogmask(syslog_mask = NUM2INT(mask));
-
-    return mask;
-}
-
-/* call-seq:
- *   log(priority, format_string, *format_args)
- *
- * Log a message with the specified priority. Example:
- *
- *   Syslog.log(Syslog::LOG_CRIT, "Out of disk space")
- *   Syslog.log(Syslog::LOG_CRIT, "User %s logged in", ENV['USER'])
- *
- * The priority levels, in descending order, are:
- *
- * LOG_EMERG::   System is unusable
- * LOG_ALERT::   Action needs to be taken immediately
- * LOG_CRIT::    A critical condition has occurred
- * LOG_ERR::     An error occurred
- * LOG_WARNING:: Warning of a possible problem
- * LOG_NOTICE::  A normal but significant condition occurred
- * LOG_INFO::    Informational message
- * LOG_DEBUG::   Debugging information
- *
- * Each priority level also has a shortcut method that logs with it's named priority.
- * As an example, the two following statements would produce the same result:
- *
- *   Syslog.log(Syslog::LOG_ALERT, "Out of memory")
- *   Syslog.alert("Out of memory")
- *
- */
-static VALUE mSyslog_log(int argc, VALUE *argv, VALUE self)
-{
-    VALUE pri;
-
-    rb_check_arity(argc, 2, UNLIMITED_ARGUMENTS);
-
-    argc--;
-    pri = *argv++;
-
-    if (!FIXNUM_P(pri)) {
-        rb_raise(rb_eTypeError, "type mismatch: %"PRIsVALUE" given", rb_obj_class(pri));
-    }
-
-    syslog_write(FIX2INT(pri), argc, argv);
-
-    return self;
-}
-
-/* Returns an inspect() string summarizing the object state.
- */
-static VALUE mSyslog_inspect(VALUE self)
-{
-    Check_Type(self, T_MODULE);
-
-    if (!syslog_opened)
-        return rb_sprintf("<#%"PRIsVALUE": opened=false>", self);
-
-    return rb_sprintf("<#%"PRIsVALUE": opened=true, ident=\"%s\", options=%d, facility=%d, mask=%d>",
-                      self,
-                      syslog_ident,
-                      syslog_options,
-                      syslog_facility,
-                      syslog_mask);
-}
-
-/* Returns self, for backward compatibility.
- */
-static VALUE mSyslog_instance(VALUE self)
-{
-    return self;
-}
-
-#define define_syslog_shortcut_method(pri, name) \
-static VALUE mSyslog_##name(int argc, VALUE *argv, VALUE self) \
-{ \
-    syslog_write((pri), argc, argv); \
-\
-    return self; \
-}
-
-#ifdef LOG_EMERG
-define_syslog_shortcut_method(LOG_EMERG, emerg)
-#endif
-#ifdef LOG_ALERT
-define_syslog_shortcut_method(LOG_ALERT, alert)
-#endif
-#ifdef LOG_CRIT
-define_syslog_shortcut_method(LOG_CRIT, crit)
-#endif
-#ifdef LOG_ERR
-define_syslog_shortcut_method(LOG_ERR, err)
-#endif
-#ifdef LOG_WARNING
-define_syslog_shortcut_method(LOG_WARNING, warning)
-#endif
-#ifdef LOG_NOTICE
-define_syslog_shortcut_method(LOG_NOTICE, notice)
-#endif
-#ifdef LOG_INFO
-define_syslog_shortcut_method(LOG_INFO, info)
-#endif
-#ifdef LOG_DEBUG
-define_syslog_shortcut_method(LOG_DEBUG, debug)
-#endif
-
-/* call-seq:
- *   LOG_MASK(priority_level) => priority_mask
- *
- * Generates a mask bit for a priority level. See #mask=
- */
-static VALUE mSyslogMacros_LOG_MASK(VALUE mod, VALUE pri)
-{
-    return INT2FIX(LOG_MASK(NUM2INT(pri)));
-}
-
-/* call-seq:
- *   LOG_UPTO(priority_level) => priority_mask
- *
- * Generates a mask value for priority levels at or below the level specified.
- * See #mask=
- */
-static VALUE mSyslogMacros_LOG_UPTO(VALUE mod, VALUE pri)
-{
-    return INT2FIX(LOG_UPTO(NUM2INT(pri)));
-}
-
-static VALUE mSyslogMacros_included(VALUE mod, VALUE target)
-{
-    rb_extend_object(target, mSyslogMacros);
-    return mod;
-}
-
-/* The syslog package provides a Ruby interface to the POSIX system logging
- * facility.
- *
- * Syslog messages are typically passed to a central logging daemon.
- * The daemon may filter them; route them into different files (usually
- * found under /var/log); place them in SQL databases; forward
- * them to centralized logging servers via TCP or UDP; or even alert the
- * system administrator via email, pager or text message.
- *
- * Unlike application-level logging via Logger or Log4r, syslog is designed
- * to allow secure tamper-proof logging.
- *
- * The syslog protocol is standardized in RFC 5424.
- */
-void Init_syslog(void)
-{
-#undef rb_intern
-    mSyslog = rb_define_module("Syslog");
-
-    mSyslogConstants    = rb_define_module_under(mSyslog, "Constants");
-
-    mSyslogOption       = rb_define_module_under(mSyslog, "Option");
-    mSyslogFacility     = rb_define_module_under(mSyslog, "Facility");
-    mSyslogLevel        = rb_define_module_under(mSyslog, "Level");
-    mSyslogMacros       = rb_define_module_under(mSyslog, "Macros");
-
-    rb_define_module_function(mSyslog, "open", mSyslog_open, -1);
-    rb_define_module_function(mSyslog, "reopen", mSyslog_reopen, -1);
-    rb_define_module_function(mSyslog, "open!", mSyslog_reopen, -1);
-    rb_define_module_function(mSyslog, "opened?", mSyslog_isopen, 0);
-
-    rb_define_module_function(mSyslog, "ident", mSyslog_ident, 0);
-    rb_define_module_function(mSyslog, "options", mSyslog_options, 0);
-    rb_define_module_function(mSyslog, "facility", mSyslog_facility, 0);
-
-    rb_define_module_function(mSyslog, "log", mSyslog_log, -1);
-    rb_define_module_function(mSyslog, "close", mSyslog_close, 0);
-    rb_define_module_function(mSyslog, "mask", mSyslog_get_mask, 0);
-    rb_define_module_function(mSyslog, "mask=", mSyslog_set_mask, 1);
-
-    rb_define_singleton_method(mSyslog, "inspect", mSyslog_inspect, 0);
-    rb_define_module_function(mSyslog, "instance", mSyslog_instance, 0);
-
-    /* Syslog options */
-
-#define rb_define_syslog_option(c) \
-    rb_define_const(mSyslogOption, #c, INT2NUM(c))
-
-#ifdef LOG_PID
-    rb_define_syslog_option(LOG_PID);
-#endif
-#ifdef LOG_CONS
-    rb_define_syslog_option(LOG_CONS);
-#endif
-#ifdef LOG_ODELAY
-    rb_define_syslog_option(LOG_ODELAY); /* deprecated */
-#endif
-#ifdef LOG_NDELAY
-    rb_define_syslog_option(LOG_NDELAY);
-#endif
-#ifdef LOG_NOWAIT
-    rb_define_syslog_option(LOG_NOWAIT); /* deprecated */
-#endif
-#ifdef LOG_PERROR
-    rb_define_syslog_option(LOG_PERROR);
-#endif
-
-    /* Syslog facilities */
-
-#define rb_define_syslog_facility(c) \
-    rb_define_const(mSyslogFacility, #c, INT2NUM(c))
-
-#ifdef LOG_AUTH
-    rb_define_syslog_facility(LOG_AUTH);
-#endif
-#ifdef LOG_AUTHPRIV
-    rb_define_syslog_facility(LOG_AUTHPRIV);
-#endif
-#ifdef LOG_CONSOLE
-    rb_define_syslog_facility(LOG_CONSOLE);
-#endif
-#ifdef LOG_CRON
-    rb_define_syslog_facility(LOG_CRON);
-#endif
-#ifdef LOG_DAEMON
-    rb_define_syslog_facility(LOG_DAEMON);
-#endif
-#ifdef LOG_FTP
-    rb_define_syslog_facility(LOG_FTP);
-#endif
-#ifdef LOG_KERN
-    rb_define_syslog_facility(LOG_KERN);
-#endif
-#ifdef LOG_LPR
-    rb_define_syslog_facility(LOG_LPR);
-#endif
-#ifdef LOG_MAIL
-    rb_define_syslog_facility(LOG_MAIL);
-#endif
-#ifdef LOG_NEWS
-    rb_define_syslog_facility(LOG_NEWS);
-#endif
-#ifdef LOG_NTP
-    rb_define_syslog_facility(LOG_NTP);
-#endif
-#ifdef LOG_SECURITY
-    rb_define_syslog_facility(LOG_SECURITY);
-#endif
-#ifdef LOG_SYSLOG
-    rb_define_syslog_facility(LOG_SYSLOG);
-#endif
-#ifdef LOG_USER
-    rb_define_syslog_facility(LOG_USER);
-#endif
-#ifdef LOG_UUCP
-    rb_define_syslog_facility(LOG_UUCP);
-#endif
-#ifdef LOG_LOCAL0
-    rb_define_syslog_facility(LOG_LOCAL0);
-#endif
-#ifdef LOG_LOCAL1
-    rb_define_syslog_facility(LOG_LOCAL1);
-#endif
-#ifdef LOG_LOCAL2
-    rb_define_syslog_facility(LOG_LOCAL2);
-#endif
-#ifdef LOG_LOCAL3
-    rb_define_syslog_facility(LOG_LOCAL3);
-#endif
-#ifdef LOG_LOCAL4
-    rb_define_syslog_facility(LOG_LOCAL4);
-#endif
-#ifdef LOG_LOCAL5
-    rb_define_syslog_facility(LOG_LOCAL5);
-#endif
-#ifdef LOG_LOCAL6
-    rb_define_syslog_facility(LOG_LOCAL6);
-#endif
-#ifdef LOG_LOCAL7
-    rb_define_syslog_facility(LOG_LOCAL7);
-#endif
-
-    /* Syslog levels and the shortcut methods */
-
-#define rb_define_syslog_level(c, m)				\
-    rb_define_const(mSyslogLevel, #c, INT2NUM(c));		\
-    rb_define_module_function(mSyslog, #m, mSyslog_##m, -1)
-
-#ifdef LOG_EMERG
-    rb_define_syslog_level(LOG_EMERG, emerg);
-#endif
-#ifdef LOG_ALERT
-    rb_define_syslog_level(LOG_ALERT, alert);
-#endif
-#ifdef LOG_CRIT
-    rb_define_syslog_level(LOG_CRIT, crit);
-#endif
-#ifdef LOG_ERR
-    rb_define_syslog_level(LOG_ERR, err);
-#endif
-#ifdef LOG_WARNING
-    rb_define_syslog_level(LOG_WARNING, warning);
-#endif
-#ifdef LOG_NOTICE
-    rb_define_syslog_level(LOG_NOTICE, notice);
-#endif
-#ifdef LOG_INFO
-    rb_define_syslog_level(LOG_INFO, info);
-#endif
-#ifdef LOG_DEBUG
-    rb_define_syslog_level(LOG_DEBUG, debug);
-#endif
-
-    /* Syslog macros */
-
-    rb_define_const(mSyslog, "VERSION", rb_str_new_cstr(SYSLOG_VERSION));
-
-    rb_define_method(mSyslogMacros, "LOG_MASK", mSyslogMacros_LOG_MASK, 1);
-    rb_define_method(mSyslogMacros, "LOG_UPTO", mSyslogMacros_LOG_UPTO, 1);
-    rb_define_singleton_method(mSyslogMacros, "included", mSyslogMacros_included, 1);
-
-    rb_include_module(mSyslogConstants, mSyslogOption);
-    rb_include_module(mSyslogConstants, mSyslogFacility);
-    rb_include_module(mSyslogConstants, mSyslogLevel);
-    rb_funcall(mSyslogConstants, rb_intern("include"), 1, mSyslogMacros);
-
-    rb_define_singleton_method(mSyslogConstants, "included", mSyslogMacros_included, 1);
-    rb_funcall(mSyslog, rb_intern("include"), 1, mSyslogConstants);
-}
diff --git a/ext/syslog/syslog.gemspec b/ext/syslog/syslog.gemspec
deleted file mode 100644
index 10a6d1f25c3b7a..00000000000000
--- a/ext/syslog/syslog.gemspec
+++ /dev/null
@@ -1,28 +0,0 @@
-source_version = %w[. ext/syslog].find do |dir|
-  break $1 if File.foreach(File.join(__dir__, dir, "syslog.c")).any?(/^#define\s+SYSLOG_VERSION\s+"(.+)"/)
-rescue Errno::ENOENT
-end
-
-Gem::Specification.new do |spec|
-  spec.name          = "syslog"
-  spec.version       = source_version
-  spec.authors       = ["Akinori MUSHA"]
-  spec.email         = ["knu@idaemons.org"]
-
-  spec.summary       = %q{Ruby interface for the POSIX system logging facility.}
-  spec.description   = %q{Ruby interface for the POSIX system logging facility.}
-  spec.homepage      = "https://github.com/ruby/syslog"
-  spec.required_ruby_version = Gem::Requirement.new(">= 2.5.0")
-  spec.licenses      = ["Ruby", "BSD-2-Clause"]
-
-  spec.metadata["homepage_uri"] = spec.homepage
-  spec.metadata["source_code_uri"] = spec.homepage
-
-  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.extensions    = ["ext/syslog/extconf.rb"]
-  spec.bindir        = "exe"
-  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
-  spec.require_paths = ["lib"]
-end
diff --git a/ext/syslog/syslog.txt b/ext/syslog/syslog.txt
deleted file mode 100644
index 1507a87924e26b..00000000000000
--- a/ext/syslog/syslog.txt
+++ /dev/null
@@ -1,124 +0,0 @@
-.\" syslog.txt -  -*- Indented-Text -*-
-$RoughId: syslog.txt,v 1.18 2002/02/25 08:20:14 knu Exp $
-$Id$
-
-UNIX Syslog extension for Ruby
-Amos Gouaux, University of Texas at Dallas
-<amos+ruby@utdallas.edu>
-&
-Akinori MUSHA
-<knu@iDaemons.org>
-
-Contact:
-  - Akinori MUSHA <knu@iDaemons.org> (current maintainer)
-
-** Syslog(Module)
-
-Included Modules: Syslog::Constants
-
-require 'syslog'
-
-A Simple wrapper for the UNIX syslog system calls that might be handy
-if you're writing a server in Ruby.  For the details of the syslog(8)
-architecture and constants, see the syslog(3) manual page of your
-platform.
-
-Module Methods:
-
-   open(ident = $0, logopt = Syslog::LOG_PID | Syslog::LOG_CONS,
-		facility = Syslog::LOG_USER) [{ |syslog| ... }]
-
-	Opens syslog with the given options and returns the module
-	itself.  If a block is given, calls it with an argument of
-	itself.  If syslog is already opened, raises RuntimeError.
-
-	Example:
-	  Syslog.open('ftpd', Syslog::LOG_PID | Syslog::LOG_NDELAY,
-			      Syslog::LOG_FTP)
-
-   open!(ident = $0, logopt = Syslog::LOG_PID | Syslog::LOG_CONS,
-		facility = Syslog::LOG_USER)
-   reopen(ident = $0, logopt = Syslog::LOG_PID | Syslog::LOG_CONS,
-		facility = Syslog::LOG_USER)
-
-	Same as open, but does a close first.
-
-   opened?
-
-	Returns true if syslog opened, otherwise false.
-
-   ident
-   options
-   facility
-
-	Returns the parameters given in the last open, respectively.
-	Every call of Syslog::open resets these values.
-
-   log(pri, message, ...)
-
-	Writes message to syslog.
-
-	Example:
-	  Syslog.log(Syslog::LOG_CRIT, "the sky is falling in %d seconds!", 10)
-
-   crit(message, ...)
-   emerg(message, ...)
-   alert(message, ...)
-   err(message, ...)
-   warning(message, ...)
-   notice(message, ...)
-   info(message, ...)
-   debug(message, ...)
-
-	These are shortcut methods of Syslog::log().  The lineup may
-	vary depending on what priorities are defined on your system.
-
-	Example:
-	  Syslog.crit("the sky is falling in %d seconds!", 5)
-
-   mask
-   mask=(mask)
-
-	Returns or sets the log priority mask.  The value of the mask
-	is persistent and will not be reset by Syslog::open or
-	Syslog::close.
-
-	Example:
-	  Syslog.mask = Syslog::LOG_UPTO(Syslog::LOG_ERR)
-
-   close
-
-	Closes syslog.
-
-   inspect
-
-	Returns the "inspect" string of the Syslog module.
-
-   instance
-
-	Returns the module itself. (Just for backward compatibility)
-
-   LOG_MASK(pri)
-
-	Creates a mask for one priority.
-
-   LOG_UPTO(pri)
-
-	Creates a mask for all priorities up to pri.
-
-** Syslog::Constants(Module)
-
-require 'syslog'
-include Syslog::Constants
-
-This module includes the LOG_* constants available on the system.
-
-Module Methods:
-
-   LOG_MASK(pri)
-
-	Creates a mask for one priority.
-
-   LOG_UPTO(pri)
-
-	Creates a mask for all priorities up to pri.
diff --git a/ext/win32/lib/win32/registry.rb b/ext/win32/lib/win32/registry.rb
index b5b99ff684cee7..8e2c8b2e1ab135 100644
--- a/ext/win32/lib/win32/registry.rb
+++ b/ext/win32/lib/win32/registry.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 require 'fiddle/import'
 
 module Win32
@@ -69,7 +69,7 @@ module Win32
   WCHAR_NUL = "\0".encode(WCHAR).freeze
   WCHAR_CR = "\r".encode(WCHAR).freeze
   WCHAR_SIZE = WCHAR_NUL.bytesize
-  LOCALE = Encoding.find(Encoding.locale_charmap)
+  LOCALE = Encoding::UTF_8
 
   class Registry
 
@@ -178,7 +178,7 @@ def initialize(code)
         buff = WCHAR_NUL * 1024
         lang = 0
         begin
-          len = FormatMessageW.call(0x1200, 0, code, lang, buff, 1024, 0)
+          len = FormatMessageW.call(0x1200, nil, code, lang, buff, 1024, nil)
           msg = buff.byteslice(0, len * WCHAR_SIZE)
           msg.delete!(WCHAR_CR)
           msg.chomp!
@@ -198,7 +198,7 @@ def initialize(code)
     #
     class PredefinedKey < Registry
       def initialize(hkey, keyname)
-        @hkey = hkey
+        @hkey = Fiddle::Pointer.new(hkey)
         @parent = nil
         @keyname = keyname
         @disposition = REG_OPENED_EXISTING_KEY
@@ -238,7 +238,7 @@ module API
         "long RegDeleteKeyW(void *, void *)",
         "long RegFlushKey(void *)",
         "long RegCloseKey(void *)",
-        "long RegQueryInfoKey(void *, void *, void *, void *, void *, void *, void *, void *, void *, void *, void *, void *)",
+        "long RegQueryInfoKeyW(void *, void *, void *, void *, void *, void *, void *, void *, void *, void *, void *, void *)",
       ].each do |fn|
         cfunc = extern fn, :stdcall
         const_set cfunc.name.intern, cfunc
@@ -254,34 +254,38 @@ def win64?
         /^(?:x64|x86_64)/ =~ RUBY_PLATFORM
       end
 
+      TEMPLATE_HANDLE = 'J<'
+
       def packhandle(h)
-        win64? ? packqw(h) : packdw(h)
+        [h].pack(TEMPLATE_HANDLE)
       end
 
       def unpackhandle(h)
-        win64? ? unpackqw(h) : unpackdw(h)
+        (h + [0].pack(TEMPLATE_HANDLE)).unpack1(TEMPLATE_HANDLE)
       end
 
+      TEMPLATE_DWORD = 'V'
+
       def packdw(dw)
-        [dw].pack('V')
+        [dw].pack(TEMPLATE_DWORD)
       end
 
       def unpackdw(dw)
-        dw += [0].pack('V')
-        dw.unpack('V')[0]
+        (dw + [0].pack(TEMPLATE_DWORD)).unpack1(TEMPLATE_DWORD)
       end
 
+      TEMPLATE_QWORD = 'Q<'
+
       def packqw(qw)
-        [ qw & 0xFFFFFFFF, qw >> 32 ].pack('VV')
+        [qw].pack(TEMPLATE_QWORD)
       end
 
       def unpackqw(qw)
-        qw = qw.unpack('VV')
-        (qw[1] << 32) | qw[0]
+        (qw + [0].pack(TEMPLATE_QWORD)).unpack1(TEMPLATE_QWORD)
       end
 
       def make_wstr(str)
-        str.encode(WCHAR)
+        (str+"\0").encode(WCHAR)
       end
 
       def OpenKey(hkey, name, opt, desired)
@@ -294,14 +298,14 @@ def CreateKey(hkey, name, opt, desired)
         result = packhandle(0)
         disp = packdw(0)
         check RegCreateKeyExW.call(hkey, make_wstr(name), 0, 0, opt, desired,
-                                   0, result, disp)
+                                   nil, result, disp)
         [ unpackhandle(result), unpackdw(disp) ]
       end
 
       def EnumValue(hkey, index)
         name = WCHAR_NUL * Constants::MAX_KEY_LENGTH
         size = packdw(Constants::MAX_KEY_LENGTH)
-        check RegEnumValueW.call(hkey, index, name, size, 0, 0, 0, 0)
+        check RegEnumValueW.call(hkey, index, name, size, nil, nil, nil, nil)
         name.byteslice(0, unpackdw(size) * WCHAR_SIZE)
       end
 
@@ -309,7 +313,7 @@ def EnumKey(hkey, index)
         name = WCHAR_NUL * Constants::MAX_KEY_LENGTH
         size = packdw(Constants::MAX_KEY_LENGTH)
         wtime = ' ' * 8
-        check RegEnumKeyExW.call(hkey, index, name, size, 0, 0, 0, wtime)
+        check RegEnumKeyExW.call(hkey, index, name, size, nil, nil, nil, wtime)
         [ name.byteslice(0, unpackdw(size) * WCHAR_SIZE), unpackqw(wtime) ]
       end
 
@@ -317,9 +321,9 @@ def QueryValue(hkey, name)
         type = packdw(0)
         size = packdw(0)
         name = make_wstr(name)
-        check RegQueryValueExW.call(hkey, name, 0, type, 0, size)
-        data = "\0".force_encoding('ASCII-8BIT') * unpackdw(size)
-        check RegQueryValueExW.call(hkey, name, 0, type, data, size)
+        check RegQueryValueExW.call(hkey, name, nil, type, nil, size)
+        data = "\0".b * unpackdw(size)
+        check RegQueryValueExW.call(hkey, name, nil, type, data, size)
         [ unpackdw(type), data[0, unpackdw(size)] ]
       end
 
@@ -356,7 +360,7 @@ def QueryInfoKey(hkey)
         maxvaluelen = packdw(0)
         secdescs = packdw(0)
         wtime = ' ' * 8
-        check RegQueryInfoKey.call(hkey, 0, 0, 0, subkeys, maxsubkeylen, 0,
+        check RegQueryInfoKeyW.call(hkey, 0, 0, 0, subkeys, maxsubkeylen, 0,
           values, maxvaluenamelen, maxvaluelen, secdescs, wtime)
         [ unpackdw(subkeys), unpackdw(maxsubkeylen), unpackdw(values),
           unpackdw(maxvaluenamelen), unpackdw(maxvaluelen),
@@ -368,13 +372,12 @@ def QueryInfoKey(hkey)
     # Replace %\w+% into the environment value of what is contained between the %'s
     # This method is used for REG_EXPAND_SZ.
     #
-    # For detail, see expandEnvironmentStrings[http://msdn.microsoft.com/library/en-us/sysinfo/base/expandenvironmentstrings.asp] \Win32 \API.
+    # For detail, see expandEnvironmentStrings[https://learn.microsoft.com/en-us/windows/win32/api/processenv/nf-processenv-expandenvironmentstringsa] \Win32 \API.
     #
     def self.expand_environ(str)
       str.gsub(Regexp.compile("%([^%]+)%".encode(str.encoding))) {
         v = $1.encode(LOCALE)
-        (e = ENV[v] || ENV[v.upcase]; e.encode(str.encoding) if e) ||
-        $&
+        (ENV[v] || ENV[v.upcase])&.encode(str.encoding) || $&
       }
     end
 
@@ -384,7 +387,6 @@ def self.expand_environ(str)
       REG_RESOURCE_LIST REG_FULL_RESOURCE_DESCRIPTOR
       REG_RESOURCE_REQUIREMENTS_LIST REG_QWORD
     ].inject([]) do |ary, type|
-      type.freeze
       ary[Constants.const_get(type)] = type
       ary
     end.freeze
@@ -428,7 +430,7 @@ def self.time2wtime(time)
     # If block is given, the key is closed automatically.
     def self.open(hkey, subkey, desired = KEY_READ, opt = REG_OPTION_RESERVED)
       subkey = subkey.chomp('\\')
-      newkey = API.OpenKey(hkey.hkey, subkey, opt, desired)
+      newkey = API.OpenKey(hkey.instance_variable_get(:@hkey), subkey, opt, desired)
       obj = new(newkey, hkey, subkey, REG_OPENED_EXISTING_KEY)
       if block_given?
         begin
@@ -455,7 +457,7 @@ def self.open(hkey, subkey, desired = KEY_READ, opt = REG_OPTION_RESERVED)
     # If block is given, the key is closed automatically.
     #
     def self.create(hkey, subkey, desired = KEY_ALL_ACCESS, opt = REG_OPTION_RESERVED)
-      newkey, disp = API.CreateKey(hkey.hkey, subkey, opt, desired)
+      newkey, disp = API.CreateKey(hkey.instance_variable_get(:@hkey), subkey, opt, desired)
       obj = new(newkey, hkey, subkey, disp)
       if block_given?
         begin
@@ -477,7 +479,7 @@ def self.create(hkey, subkey, desired = KEY_ALL_ACCESS, opt = REG_OPTION_RESERVE
     # initialize
     #
     def initialize(hkey, parent, keyname, disposition)
-      @hkey = hkey
+      @hkey = Fiddle::Pointer.new(hkey)
       @parent = parent
       @keyname = keyname
       @disposition = disposition
@@ -485,9 +487,7 @@ def initialize(hkey, parent, keyname, disposition)
       ObjectSpace.define_finalizer self, @@final.call(@hkeyfinal)
     end
 
-    #  Returns key handle value.
-    attr_reader :hkey
-    # Win32::Registry object of parent key, or nil if predefeined key.
+    # Win32::Registry object of parent key, or nil if predefined key.
     attr_reader :parent
     # Same as subkey value of Registry.open or
     # Registry.create method.
@@ -495,6 +495,11 @@ def initialize(hkey, parent, keyname, disposition)
     #  Disposition value (REG_CREATED_NEW_KEY or REG_OPENED_EXISTING_KEY).
     attr_reader :disposition
 
+    #  Returns key handle value.
+    def hkey
+      @hkey.to_i
+    end
+
     #
     # Returns if key is created ((*newly*)).
     # (see Registry.create) -- basically you call create
@@ -561,9 +566,16 @@ def close
     end
 
     #
-    # Enumerate values.
+    # Enumerate all values in this registry path.
+    #
+    # For each value it yields key, type and data.
+    #
+    # key is a String which contains name of key.
+    # type is a type constant kind of Win32::Registry::REG_*
+    # data is the value of this key.
     #
     def each_value
+      return enum_for(:each_value) unless block_given?
       index = 0
       while true
         begin
@@ -594,13 +606,16 @@ def values
     end
 
     #
-    # Enumerate subkeys.
+    # Enumerate all subkeys.
+    #
+    # For each subkey it yields subkey and wtime.
     #
     # subkey is String which contains name of subkey.
     # wtime is last write time as FILETIME (64-bit integer).
     # (see Registry.wtime2time)
     #
     def each_key
+      return enum_for(:each_key) unless block_given?
       index = 0
       while true
         begin
@@ -657,7 +672,7 @@ def read(name, *rtype)
       when REG_DWORD
         [ type, API.unpackdw(data) ]
       when REG_DWORD_BIG_ENDIAN
-        [ type, data.unpack('N')[0] ]
+        [ type, data.unpack1('N') ]
       when REG_QWORD
         [ type, API.unpackqw(data) ]
       else
@@ -740,14 +755,11 @@ def read_bin(name)
     # method returns.
     #
     def write(name, type, data)
-      termsize = 0
       case type
       when REG_SZ, REG_EXPAND_SZ
-        data = data.encode(WCHAR)
-        termsize = WCHAR_SIZE
+        data = data.encode(WCHAR) << WCHAR_NUL
       when REG_MULTI_SZ
         data = data.to_a.map {|s| s.encode(WCHAR)}.join(WCHAR_NUL) << WCHAR_NUL
-        termsize = WCHAR_SIZE
       when REG_BINARY, REG_NONE
         data = data.to_s
       when REG_DWORD
@@ -759,7 +771,7 @@ def write(name, type, data)
       else
         raise TypeError, "Unsupported type #{Registry.type2name(type)}"
       end
-      API.SetValue(@hkey, name, type, data, data.bytesize + termsize)
+      API.SetValue(@hkey, name, type, data, data.bytesize)
     end
 
     #
diff --git a/ext/win32/lib/win32/resolv.rb b/ext/win32/lib/win32/resolv.rb
index d06658f0aa855f..67762da375af39 100644
--- a/ext/win32/lib/win32/resolv.rb
+++ b/ext/win32/lib/win32/resolv.rb
@@ -4,13 +4,8 @@
 
 =end
 
-require 'win32/registry'
-
 module Win32
   module Resolv
-    API = Registry::API
-    Error = Registry::Error
-
     def self.get_hosts_path
       path = get_hosts_dir
       path = File.expand_path('hosts', path)
@@ -47,89 +42,103 @@ module Win32
 # Windows NT
 #====================================================================
   module Resolv
-    module SZ
-      refine Registry do
-        # ad hoc workaround for broken registry
-        def read_s(key)
-          type, str = read(key)
-          unless type == Registry::REG_SZ
-            warn "Broken registry, #{name}\\#{key} was #{Registry.type2name(type)}, ignored"
-            return String.new
+    begin
+      require 'win32/registry'
+      module SZ
+        refine Registry do
+          # ad hoc workaround for broken registry
+          def read_s(key)
+            type, str = read(key)
+            unless type == Registry::REG_SZ
+              warn "Broken registry, #{name}\\#{key} was #{Registry.type2name(type)}, ignored"
+              return String.new
+            end
+            str
           end
-          str
         end
       end
+      using SZ
+    rescue LoadError
+      require "open3"
     end
-    using SZ
 
     TCPIP_NT = 'SYSTEM\CurrentControlSet\Services\Tcpip\Parameters'
 
     class << self
       private
       def get_hosts_dir
-        Registry::HKEY_LOCAL_MACHINE.open(TCPIP_NT) do |reg|
-          reg.read_s_expand('DataBasePath')
-        end
+        get_item_property(TCPIP_NT, 'DataBasePath', expand: true)
       end
 
       def get_info
         search = nil
         nameserver = get_dns_server_list
-        Registry::HKEY_LOCAL_MACHINE.open(TCPIP_NT) do |reg|
-          begin
-            slist = reg.read_s('SearchList')
-            search = slist.split(/,\s*/) unless slist.empty?
-          rescue Registry::Error
-          end
 
-          if add_search = search.nil?
-            search = []
-            begin
-              nvdom = reg.read_s('NV Domain')
-              unless nvdom.empty?
-                @search = [ nvdom ]
-                if reg.read_i('UseDomainNameDevolution') != 0
-                  if /^\w+\./ =~ nvdom
-                    devo = $'
-                  end
-                end
+        slist = get_item_property(TCPIP_NT, 'SearchList')
+        search = slist.split(/,\s*/) unless slist.empty?
+
+        if add_search = search.nil?
+          search = []
+          nvdom = get_item_property(TCPIP_NT, 'NV Domain')
+
+          unless nvdom.empty?
+            @search = [ nvdom ]
+            udmnd = get_item_property(TCPIP_NT, 'UseDomainNameDevolution').to_i
+            if udmnd != 0
+              if /^\w+\./ =~ nvdom
+                devo = $'
               end
-            rescue Registry::Error
             end
           end
+        end
 
-          reg.open('Interfaces') do |h|
-            h.each_key do |iface, |
-              h.open(iface) do |regif|
-                next unless ns = %w[NameServer DhcpNameServer].find do |key|
-                  begin
-                    ns = regif.read_s(key)
-                  rescue Registry::Error
-                  else
-                    break ns.split(/[,\s]\s*/) unless ns.empty?
-                  end
-                end
-                next if (nameserver & ns).empty?
-
-                if add_search
-                  begin
-                    [ 'Domain', 'DhcpDomain' ].each do |key|
-                      dom = regif.read_s(key)
-                      unless dom.empty?
-                        search.concat(dom.split(/,\s*/))
-                        break
-                      end
-                    end
-                  rescue Registry::Error
-                  end
+        ifs = if defined?(Win32::Registry)
+                Registry::HKEY_LOCAL_MACHINE.open(TCPIP_NT + '\Interfaces') do |reg|
+                  reg.keys
+                rescue Registry::Error
+                  []
                 end
+              else
+                cmd = "Get-ChildItem 'HKLM:\\#{TCPIP_NT}\\Interfaces' | ForEach-Object { $_.PSChildName }"
+                output, _ = Open3.capture2('powershell', '-Command', cmd)
+                output.split(/\n+/)
+              end
+
+        ifs.each do |iface|
+          next unless ns = %w[NameServer DhcpNameServer].find do |key|
+            ns = get_item_property(TCPIP_NT + '\Interfaces' + "\\#{iface}", key)
+            break ns.split(/[,\s]\s*/) unless ns.empty?
+          end
+
+          next if (nameserver & ns).empty?
+
+          if add_search
+            [ 'Domain', 'DhcpDomain' ].each do |key|
+              dom = get_item_property(TCPIP_NT + '\Interfaces' + "\\#{iface}", key)
+              unless dom.empty?
+                search.concat(dom.split(/,\s*/))
+                break
               end
             end
           end
-          search << devo if add_search and devo
         end
+        search << devo if add_search and devo
         [ search.uniq, nameserver.uniq ]
       end
+
+      def get_item_property(path, name, expand: false)
+        if defined?(Win32::Registry)
+          Registry::HKEY_LOCAL_MACHINE.open(path) do |reg|
+            expand ? reg.read_s_expand(name) : reg.read_s(name)
+          rescue Registry::Error
+            ""
+          end
+        else
+          cmd = "Get-ItemProperty -Path 'HKLM:\\#{path}' -Name '#{name}' -ErrorAction SilentlyContinue | Select-Object -ExpandProperty '#{name}'"
+          output, _ = Open3.capture2('powershell', '-Command', cmd)
+          output.strip
+        end
+      end
     end
   end
 end
diff --git a/ext/win32/lib/win32/sspi.rb b/ext/win32/lib/win32/sspi.rb
deleted file mode 100644
index 20205fd4d6e4f8..00000000000000
--- a/ext/win32/lib/win32/sspi.rb
+++ /dev/null
@@ -1,338 +0,0 @@
-# frozen_string_literal: false
-#
-# = win32/sspi.rb
-#
-# Copyright (c) 2006-2007 Justin Bailey
-#
-# Written and maintained by Justin Bailey <jgbailey@gmail.com>.
-#
-# This program is free software. You can re-distribute and/or
-# modify this program under the same terms of ruby itself ---
-# Ruby Distribution License or GNU General Public License.
-#
-
-require 'fiddle/import'
-
-# Implements bindings to Win32 SSPI functions, focused on authentication to a proxy server over HTTP.
-module Win32
-  module SSPI
-    # Specifies how credential structure requested will be used. Only SECPKG_CRED_OUTBOUND is used
-    # here.
-    SECPKG_CRED_INBOUND = 0x00000001
-    SECPKG_CRED_OUTBOUND = 0x00000002
-    SECPKG_CRED_BOTH = 0x00000003
-
-    # Format of token. NETWORK format is used here.
-    SECURITY_NATIVE_DREP = 0x00000010
-    SECURITY_NETWORK_DREP = 0x00000000
-
-    # InitializeSecurityContext Requirement flags
-    ISC_REQ_REPLAY_DETECT = 0x00000004
-    ISC_REQ_SEQUENCE_DETECT = 0x00000008
-    ISC_REQ_CONFIDENTIALITY = 0x00000010
-    ISC_REQ_USE_SESSION_KEY = 0x00000020
-    ISC_REQ_PROMPT_FOR_CREDS = 0x00000040
-    ISC_REQ_CONNECTION = 0x00000800
-
-    # Win32 API Functions. Uses Win32API to bind methods to constants contained in class.
-    module API
-      extend Fiddle::Importer
-      dlload "secur32.dll"
-      [
-        # Can be called with AcquireCredentialsHandleA.call()
-        "unsigned long AcquireCredentialsHandleA(void *, void *, unsigned long, void *, void *, void *, void *, void *, void *)",
-        # Can be called with InitializeSecurityContextA.call()
-        "unsigned long InitializeSecurityContextA(void *, void *, void *, unsigned long, unsigned long, unsigned long, void *, unsigned long, void *, void *, void *, void *)",
-        # Can be called with DeleteSecurityContext.call()
-        "unsigned long DeleteSecurityContext(void *)",
-        # Can be called with FreeCredentialsHandle.call()
-        "unsigned long FreeCredentialsHandle(void *)"
-      ].each do |fn|
-        cfunc = extern fn, :stdcall
-        const_set cfunc.name.intern, cfunc
-      end
-    end
-
-    # SecHandle struct
-    class SecurityHandle
-      def upper
-        @struct.unpack("LL")[1]
-      end
-
-      def lower
-        @struct.unpack("LL")[0]
-      end
-
-      def to_p
-        @struct ||= "\0" * 8
-      end
-    end
-
-    # Some familiar aliases for the SecHandle structure
-    CredHandle = CtxtHandle = SecurityHandle
-
-    # TimeStamp struct
-    class TimeStamp
-      attr_reader :struct
-
-      def to_p
-        @struct ||= "\0" * 8
-      end
-    end
-
-    # Creates binary representations of a SecBufferDesc structure,
-    # including the SecBuffer contained inside.
-    class SecurityBuffer
-
-      SECBUFFER_TOKEN = 2   # Security token
-
-      TOKENBUFSIZE = 12288
-      SECBUFFER_VERSION = 0
-
-      def initialize(buffer = nil)
-        @buffer = buffer || "\0" * TOKENBUFSIZE
-        @bufferSize = @buffer.length
-        @type = SECBUFFER_TOKEN
-      end
-
-      def bufferSize
-        unpack
-        @bufferSize
-      end
-
-      def bufferType
-        unpack
-        @type
-      end
-
-      def token
-        unpack
-        @buffer
-      end
-
-      def to_p
-        # Assumption is that when to_p is called we are going to get a packed structure. Therefore,
-        # set @unpacked back to nil so we know to unpack when accessors are next accessed.
-        @unpacked = nil
-        # Assignment of inner structure to variable is very important here. Without it,
-        # will not be able to unpack changes to the structure. Alternative, nested unpacks,
-        # does not work (i.e. @struct.unpack("LLP12")[2].unpack("LLP12") results in "no associated pointer")
-        @sec_buffer ||= [@bufferSize, @type, @buffer].pack("LLP")
-        @struct ||= [SECBUFFER_VERSION, 1, @sec_buffer].pack("LLP")
-      end
-
-    private
-
-      # Unpacks the SecurityBufferDesc structure into member variables. We
-      # only want to do this once per struct, so the struct is deleted
-      # after unpacking.
-      def unpack
-        if ! @unpacked && @sec_buffer && @struct
-          @bufferSize, @type = @sec_buffer.unpack("LL")
-          @buffer = @sec_buffer.unpack("LLP#{@bufferSize}")[2]
-          @struct = nil
-          @sec_buffer = nil
-          @unpacked = true
-        end
-      end
-    end
-
-    # SEC_WINNT_AUTH_IDENTITY structure
-    class Identity
-      SEC_WINNT_AUTH_IDENTITY_ANSI = 0x1
-
-      attr_accessor :user, :domain, :password
-
-      def initialize(user = nil, domain = nil, password = nil)
-        @user = user
-        @domain = domain
-        @password = password
-        @flags = SEC_WINNT_AUTH_IDENTITY_ANSI
-      end
-
-      def to_p
-        [@user, @user ? @user.length : 0,
-         @domain, @domain ? @domain.length : 0,
-         @password, @password ? @password.length : 0,
-         @flags].pack("PLPLPLL")
-      end
-    end
-
-    # Takes a return result from an SSPI function and interprets the value.
-    class SSPIResult
-      # Good results
-      SEC_E_OK = 0x00000000
-      SEC_I_CONTINUE_NEEDED = 0x00090312
-
-      # These are generally returned by InitializeSecurityContext
-      SEC_E_INSUFFICIENT_MEMORY = 0x80090300
-      SEC_E_INTERNAL_ERROR = 0x80090304
-      SEC_E_INVALID_HANDLE = 0x80090301
-      SEC_E_INVALID_TOKEN = 0x80090308
-      SEC_E_LOGON_DENIED = 0x8009030C
-      SEC_E_NO_AUTHENTICATING_AUTHORITY = 0x80090311
-      SEC_E_NO_CREDENTIALS = 0x8009030E
-      SEC_E_TARGET_UNKNOWN = 0x80090303
-      SEC_E_UNSUPPORTED_FUNCTION = 0x80090302
-      SEC_E_WRONG_PRINCIPAL = 0x80090322
-
-      # These are generally returned by AcquireCredentialsHandle
-      SEC_E_NOT_OWNER = 0x80090306
-      SEC_E_SECPKG_NOT_FOUND = 0x80090305
-      SEC_E_UNKNOWN_CREDENTIALS = 0x8009030D
-
-      @@map = {}
-      constants.each { |v| @@map[self.const_get(v.to_s)] = v }
-
-      attr_reader :value
-
-      def initialize(value)
-        # convert to unsigned long
-        value = [value].pack("L").unpack("L").first
-        raise "#{value.to_s(16)} is not a recognized result" unless @@map.has_key? value
-        @value = value
-      end
-
-      def to_s
-        @@map[@value].to_s
-      end
-
-      def ok?
-        @value == SEC_I_CONTINUE_NEEDED || @value == SEC_E_OK
-      end
-
-      def ==(other)
-        if other.is_a?(SSPIResult)
-          @value == other.value
-        elsif other.is_a?(Fixnum)
-          @value == @@map[other]
-        else
-          false
-        end
-      end
-    end
-
-    # Handles "Negotiate" type authentication. Geared towards authenticating with a proxy server over HTTP
-    class NegotiateAuth
-      attr_accessor :credentials, :context, :contextAttributes, :user, :domain
-
-      # Default request flags for SSPI functions
-      REQUEST_FLAGS = ISC_REQ_CONFIDENTIALITY | ISC_REQ_REPLAY_DETECT | ISC_REQ_CONNECTION
-
-      # NTLM tokens start with this header always. Encoding alone adds "==" and newline, so remove those
-      B64_TOKEN_PREFIX = ["NTLMSSP"].pack("m").delete("=\n")
-
-      # Given a connection and a request path, performs authentication as the current user and returns
-      # the response from a GET request. The connection should be a Net::HTTP object, and it should
-      # have been constructed using the Net::HTTP.Proxy method, but anything that responds to "get" will work.
-      # If a user and domain are given, will authenticate as the given user.
-      # Returns the response received from the get method (usually Net::HTTPResponse)
-      def NegotiateAuth.proxy_auth_get(http, path, user = nil, domain = nil)
-        raise "http must respond to :get" unless http.respond_to?(:get)
-        nego_auth = self.new user, domain
-
-        resp = http.get path, { "Proxy-Authorization" => "Negotiate " + nego_auth.get_initial_token }
-        if resp["Proxy-Authenticate"]
-          resp = http.get path, { "Proxy-Authorization" => "Negotiate " + nego_auth.complete_authentication(resp["Proxy-Authenticate"].split(" ").last.strip) }
-        end
-
-        resp
-      end
-
-      # Creates a new instance ready for authentication as the given user in the given domain.
-      # Defaults to current user and domain as defined by ENV["USERDOMAIN"] and ENV["USERNAME"] if
-      # no arguments are supplied.
-      def initialize(user = nil, domain = nil)
-        if user.nil? && domain.nil? && ENV["USERNAME"].nil? && ENV["USERDOMAIN"].nil?
-          raise "A username or domain must be supplied since they cannot be retrieved from the environment"
-        end
-
-        @user = user || ENV["USERNAME"]
-        @domain = domain || ENV["USERDOMAIN"]
-      end
-
-      # Gets the initial Negotiate token. Returns it as a base64 encoded string suitable for use in HTTP. Can
-      # be easily decoded, however.
-      def get_initial_token
-        raise "This object is no longer usable because its resources have been freed." if @cleaned_up
-        get_credentials
-
-        outputBuffer = SecurityBuffer.new
-        @context = CtxtHandle.new
-        @contextAttributes = "\0" * 4
-
-        result = SSPIResult.new(API::InitializeSecurityContextA.call(@credentials.to_p, nil, nil,
-          REQUEST_FLAGS,0, SECURITY_NETWORK_DREP, nil, 0, @context.to_p, outputBuffer.to_p, @contextAttributes, TimeStamp.new.to_p))
-
-        if result.ok? then
-          return encode_token(outputBuffer.token)
-        else
-          raise "Error: #{result.to_s}"
-        end
-      end
-
-      # Takes a token and gets the next token in the Negotiate authentication chain. Token can be Base64 encoded or not.
-      # The token can include the "Negotiate" header and it will be stripped.
-      # Does not indicate if SEC_I_CONTINUE or SEC_E_OK was returned.
-      # Token returned is Base64 encoded w/ all new lines removed.
-      def complete_authentication(token)
-        raise "This object is no longer usable because its resources have been freed." if @cleaned_up
-
-        # Nil token OK, just set it to empty string
-        token = "" if token.nil?
-
-        if token.include? "Negotiate"
-          # If the Negotiate prefix is passed in, assume we are seeing "Negotiate <token>" and get the token.
-          token = token.split(" ").last
-        end
-
-        if token.include? B64_TOKEN_PREFIX
-          # indicates base64 encoded token
-          token = token.strip.unpack("m")[0]
-        end
-
-        outputBuffer = SecurityBuffer.new
-        result = SSPIResult.new(API::InitializeSecurityContext.call(@credentials.to_p, @context.to_p, nil,
-          REQUEST_FLAGS, 0, SECURITY_NETWORK_DREP, SecurityBuffer.new(token).to_p, 0,
-          @context.to_p,
-          outputBuffer.to_p, @contextAttributes, TimeStamp.new.to_p))
-
-        if result.ok? then
-          return encode_token(outputBuffer.token)
-        else
-          raise "Error: #{result.to_s}"
-        end
-      ensure
-        # need to make sure we don't clean up if we've already cleaned up.
-        clean_up unless @cleaned_up
-      end
-
-     private
-
-      def clean_up
-        # free structures allocated
-        @cleaned_up = true
-        API::FreeCredentialsHandle.call(@credentials.to_p)
-        API::DeleteSecurityContext.call(@context.to_p)
-        @context = nil
-        @credentials = nil
-        @contextAttributes = nil
-      end
-
-      # Gets credentials based on user, domain or both. If both are nil, an error occurs
-      def get_credentials
-        @credentials = CredHandle.new
-        ts = TimeStamp.new
-        @identity = Identity.new @user, @domain
-        result = SSPIResult.new(API::AcquireCredentialsHandleA.call(nil, "Negotiate", SECPKG_CRED_OUTBOUND, nil, @identity.to_p,
-          nil, nil, @credentials.to_p, ts.to_p))
-        raise "Error acquire credentials: #{result}" unless result.ok?
-      end
-
-      def encode_token(t)
-        # encode64 will add newlines every 60 characters so we need to remove those.
-        [t].pack("m").delete("\n")
-      end
-    end
-  end
-end
diff --git a/ext/win32/resolv/extconf.rb b/ext/win32/resolv/extconf.rb
index 01f3df730afe16..4afbf8a4f6edce 100644
--- a/ext/win32/resolv/extconf.rb
+++ b/ext/win32/resolv/extconf.rb
@@ -1,3 +1,6 @@
-if have_library('iphlpapi', 'GetNetworkParams')
+require 'mkmf'
+if RUBY_ENGINE == "ruby" and have_library('iphlpapi', 'GetNetworkParams')
   create_makefile('win32/resolv')
+else
+  File.write('Makefile', "all clean install:\n\t@echo Done: $(@)\n")
 end
diff --git a/ext/win32/resolv/resolv.c b/ext/win32/resolv/resolv.c
index 8a50ef78249592..af678e1f178dda 100644
--- a/ext/win32/resolv/resolv.c
+++ b/ext/win32/resolv/resolv.c
@@ -13,6 +13,8 @@ w32error_make_error(DWORD e)
     return rb_class_new_instance(1, &code, rb_path2class("Win32::Resolv::Error"));
 }
 
+NORETURN(static void w32error_raise(DWORD e));
+
 static void
 w32error_raise(DWORD e)
 {
diff --git a/ext/win32/win32-registry.gemspec b/ext/win32/win32-registry.gemspec
new file mode 100644
index 00000000000000..d747daf458ddf1
--- /dev/null
+++ b/ext/win32/win32-registry.gemspec
@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+Gem::Specification.new do |spec|
+  spec.name = "win32-registry"
+  spec.version = "0.1.0"
+  spec.authors = ["U.Nakamura"]
+  spec.email = ["usa@garbagecollect.jp"]
+
+  spec.summary = %q{Provides an interface to the Windows Registry in Ruby}
+  spec.description = spec.summary
+  spec.homepage = "https://github.com/ruby/win32-registry"
+  spec.required_ruby_version = ">= 2.6.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.
+  excludes = %w[
+    bin/ test/ spec/ features/ rakelib/
+    .git .github .mailmap appveyor Rakefile Gemfile
+  ]
+  spec.files = Dir.chdir(__dir__) do
+    `git ls-files -z`.split("\x0").reject do |f|
+      File.identical?(f, __FILE__) || f.start_with?(*excludes)
+    end
+  end
+  spec.bindir = "exe"
+  spec.executables = spec.files.grep(%r{\Aexe/}) { |f| File.basename(f) }
+  spec.require_paths = ["lib"]
+
+  spec.add_dependency "fiddle", "~> 1.0"
+end
diff --git a/ext/win32ole/depend b/ext/win32ole/depend
deleted file mode 100644
index c8445ad5fa550d..00000000000000
--- a/ext/win32ole/depend
+++ /dev/null
@@ -1,12 +0,0 @@
-WIN32OLE_HEADERS = $(HDRS) $(ruby_headers)
-win32ole.o : win32ole.c $(WIN32OLE_HEADERS)
-win32ole_variant_m.o : win32ole_variant_m.c $(WIN32OLE_HEADERS)
-win32ole_typelib.o : win32ole_typelib.c $(WIN32OLE_HEADERS)
-win32ole_type.o : win32ole_type.c $(WIN32OLE_HEADERS)
-win32ole_variable.o : win32ole_variable.c $(WIN32OLE_HEADERS)
-win32ole_method.o : win32ole_method.c $(WIN32OLE_HEADERS)
-win32ole_param.o : win32ole_param.c $(WIN32OLE_HEADERS)
-win32ole_variant.o : win32ole_variant.c $(WIN32OLE_HEADERS)
-win32ole_event.o : win32ole_event.c $(WIN32OLE_HEADERS)
-win32ole_record.o : win32ole_record.c $(WIN32OLE_HEADERS)
-win32ole_error.o : win32ole_error.c $(WIN32OLE_HEADERS)
diff --git a/ext/win32ole/extconf.rb b/ext/win32ole/extconf.rb
deleted file mode 100644
index d2044663a92569..00000000000000
--- a/ext/win32ole/extconf.rb
+++ /dev/null
@@ -1,45 +0,0 @@
-# frozen_string_literal: false
-#----------------------------------
-# extconf.rb
-# $Revision$
-#----------------------------------
-require 'mkmf'
-
-case RUBY_PLATFORM
-when /cygwin/
-  inc = nil
-  lib = '/usr/lib/w32api'
-end
-
-dir_config("win32", inc, lib)
-
-def create_win32ole_makefile
-  if have_library("ole32") and
-     have_library("oleaut32") and
-     have_library("uuid", "&CLSID_CMultiLanguage", "mlang.h") and
-     have_library("user32") and
-     have_library("kernel32") and
-     have_library("advapi32") and
-     have_header("windows.h")
-    unless have_type("IMultiLanguage2", "mlang.h")
-      have_type("IMultiLanguage", "mlang.h")
-    end
-    spec = nil
-    checking_for('thread_specific', '%s') do
-      spec = %w[__declspec(thread) __thread].find {|th|
-        try_compile("#{th} int foo;", "", :werror => true)
-      }
-      spec or 'no'
-    end
-    $defs << "-DRB_THREAD_SPECIFIC=#{spec}" if spec
-    create_makefile("win32ole")
-  end
-end
-
-
-case RUBY_PLATFORM
-when /mswin/
-  $CFLAGS.sub!(/((?:\A|\s)[-\/])W\d(?=\z|\s)/, '\1W3') or
-    $CFLAGS += ' -W3'
-end
-create_win32ole_makefile
diff --git a/ext/win32ole/lib/win32ole.rb b/ext/win32ole/lib/win32ole.rb
deleted file mode 100644
index d7034f7845bc00..00000000000000
--- a/ext/win32ole/lib/win32ole.rb
+++ /dev/null
@@ -1,33 +0,0 @@
-begin
-  require 'win32ole.so'
-rescue LoadError
-  # do nothing
-end
-
-if defined?(WIN32OLE)
-  # WIN32OLE
-  class WIN32OLE
-
-    #
-    # By overriding Object#methods, WIN32OLE might
-    # work well with did_you_mean gem.
-    # This is experimental.
-    #
-    #  require 'win32ole'
-    #  dict = WIN32OLE.new('Scripting.Dictionary')
-    #  dict.Ade('a', 1)
-    #  #=> Did you mean?  Add
-    #
-    def methods(*args)
-      super + ole_methods_safely.map(&:name).map(&:to_sym)
-    end
-
-    private
-
-    def ole_methods_safely
-      ole_methods
-    rescue WIN32OLEQueryInterfaceError
-      []
-    end
-  end
-end
diff --git a/ext/win32ole/lib/win32ole/property.rb b/ext/win32ole/lib/win32ole/property.rb
deleted file mode 100644
index fea047cd19b2f4..00000000000000
--- a/ext/win32ole/lib/win32ole/property.rb
+++ /dev/null
@@ -1,17 +0,0 @@
-# frozen_string_literal: false
-# OLEProperty
-# helper class of Property with arguments.
-class OLEProperty
-  def initialize(obj, dispid, gettypes, settypes)
-    @obj = obj
-    @dispid = dispid
-    @gettypes = gettypes
-    @settypes = settypes
-  end
-  def [](*args)
-    @obj._getproperty(@dispid, args, @gettypes)
-  end
-  def []=(*args)
-    @obj._setproperty(@dispid, args, @settypes)
-  end
-end
diff --git a/ext/win32ole/sample/excel1.rb b/ext/win32ole/sample/excel1.rb
deleted file mode 100644
index 4fe1d0c2a9d157..00000000000000
--- a/ext/win32ole/sample/excel1.rb
+++ /dev/null
@@ -1,37 +0,0 @@
-# frozen_string_literal: false
-require 'win32ole'
-
-application = WIN32OLE.new('Excel.Application')
-
-application.visible = true
-workbook = application.Workbooks.Add();
-worksheet = workbook.Worksheets(1);
-
-=begin
-worksheet.Range("A1:D1").value = ["North","South","East","West"];
-worksheet.Range("A2:B2").value = [5.2, 10];
-
-worksheet.Range("C2").value = 8;
-worksheet.Range("D2").value = 20;
-=end
-
-worksheet.Range("A1:B2").value = [["North","South"],
-                                  [5.2, 10]];
-
-vals = WIN32OLE_VARIANT.new([["East","West"],
-                             [8, 20]],
-                            WIN32OLE::VARIANT::VT_ARRAY)
-worksheet.Range("C1:D2").value = vals
-
-range = worksheet.Range("A1:D2");
-range.Select
-chart = workbook.Charts.Add;
-
-workbook.saved = true;
-
-print "Now quit Excel... Please enter."
-gets
-
-application.ActiveWorkbook.Close(0);
-application.Quit();
-
diff --git a/ext/win32ole/sample/excel2.rb b/ext/win32ole/sample/excel2.rb
deleted file mode 100644
index 47a5715f846a88..00000000000000
--- a/ext/win32ole/sample/excel2.rb
+++ /dev/null
@@ -1,31 +0,0 @@
-# frozen_string_literal: false
-require 'win32ole'
-
-#   -4100 is the value for the Excel constant xl3DColumn.
-ChartTypeVal = -4100;
-
-#   Creates OLE object to Excel
-excel = WIN32OLE.new("excel.application")
-
-# Create and rotate the chart
-excel.visible = true;
-excel.Workbooks.Add();
-excel.Range("a1").value = 3;
-excel.Range("a2").value = 2;
-excel.Range("a3").value = 1;
-excel.Range("a1:a3").Select();
-excelchart = excel.Charts.Add();
-excelchart.type = ChartTypeVal;
-
-i = 0
-i.step(180, 10) do |rot|
-    excelchart.rotation=rot;
-    sleep 0.1
-end
-# Done, bye
-
-print "Now quit Excel... Please enter."
-gets
-
-excel.ActiveWorkbook.Close(0);
-excel.Quit();
diff --git a/ext/win32ole/sample/excel3.rb b/ext/win32ole/sample/excel3.rb
deleted file mode 100644
index 72aee2a929da9c..00000000000000
--- a/ext/win32ole/sample/excel3.rb
+++ /dev/null
@@ -1,21 +0,0 @@
-# frozen_string_literal: false
-require 'win32ole'
-
-#application = WIN32OLE.new('Excel.Application.5')
-application = WIN32OLE.new('Excel.Application')
-
-application.visible = true
-workbook = application.Workbooks.Add();
-sheet = workbook.Worksheets(1);
-sheetS = workbook.Worksheets
-puts "The number of sheets is #{sheetS.count}"
-puts "Now add 2 sheets after of `#{sheet.name}`"
-sheetS.add({'count'=>2, 'after'=>sheet})
-puts "The number of sheets is #{sheetS.count}"
-
-print "Now quit Excel... Please enter."
-gets
-
-application.ActiveWorkbook.Close(0);
-application.Quit();
-
diff --git a/ext/win32ole/sample/ie.rb b/ext/win32ole/sample/ie.rb
deleted file mode 100644
index 4db64eed30ca01..00000000000000
--- a/ext/win32ole/sample/ie.rb
+++ /dev/null
@@ -1,12 +0,0 @@
-# frozen_string_literal: false
-require 'win32ole'
-url = 'http://www.ruby-lang.org/'
-ie = WIN32OLE.new('InternetExplorer.Application')
-ie.visible = true
-ie.gohome
-print "Now navigate Ruby home page... Please enter."
-gets
-ie.navigate(url)
-print "Now quit Internet Explorer... Please enter."
-gets
-ie.Quit()
diff --git a/ext/win32ole/sample/ieconst.rb b/ext/win32ole/sample/ieconst.rb
deleted file mode 100644
index 363a4f8153f576..00000000000000
--- a/ext/win32ole/sample/ieconst.rb
+++ /dev/null
@@ -1,33 +0,0 @@
-# frozen_string_literal: false
-require 'win32ole'
-
-ie = WIN32OLE.new('InternetExplorer.Application')
-=begin
-WIN32OLE.const_load(ie)
-WIN32OLE.constants.sort.each do |c|
-  puts "#{c} = #{WIN32OLE.const_get(c)}"
-end
-=end
-
-module IE_CONST
-end
-
-WIN32OLE.const_load(ie, IE_CONST)
-IE_CONST.constants.sort.each do |c|
-  puts "#{c} = #{IE_CONST.const_get(c)}"
-end
-
-#------------------------------------------------------------
-# Remark!!! CONSTANTS has not tested enoughly!!!
-# CONSTANTS is alpha release.
-# If there are constants which first letter is not [a-zA-Z],
-# like a '_Foo', then maybe you can access the value by
-# using CONSTANTS['_Foo']
-#------------------------------------------------------------
-IE_CONST::CONSTANTS.each do |k, v|
-  puts "#{k} = #{v}"
-end
-
-puts WIN32OLE::VERSION
-ie.quit
-
diff --git a/ext/win32ole/sample/ienavi.rb b/ext/win32ole/sample/ienavi.rb
deleted file mode 100644
index 5d0536028bfc1c..00000000000000
--- a/ext/win32ole/sample/ienavi.rb
+++ /dev/null
@@ -1,41 +0,0 @@
-# frozen_string_literal: false
-require 'win32ole'
-
-$urls = []
-
-def navigate(url)
-  $urls << url
-end
-
-def stop_msg_loop
-  puts "Now Stop IE..."
-  $LOOP = false;
-end
-
-def default_handler(event, *args)
-  case event
-  when "BeforeNavigate"
-    puts "Now Navigate #{args[0]}..."
-  end
-end
-
-ie = WIN32OLE.new('InternetExplorer.Application')
-ie.visible = true
-ie.gohome
-
-ev = WIN32OLE_EVENT.new(ie, 'DWebBrowserEvents')
-
-ev.on_event {|*args| default_handler(*args)}
-ev.on_event("NavigateComplete") {|url| navigate(url)}
-ev.on_event("Quit") {|*args| stop_msg_loop}
-
-$LOOP = true
-while ($LOOP)
-  WIN32OLE_EVENT.message_loop
-end
-
-puts "You Navigated the URLs ..."
-$urls.each_with_index do |url, i|
-  puts "(#{i+1}) #{url}"
-end
-
diff --git a/ext/win32ole/sample/ienavi2.rb b/ext/win32ole/sample/ienavi2.rb
deleted file mode 100644
index 32483930775a8b..00000000000000
--- a/ext/win32ole/sample/ienavi2.rb
+++ /dev/null
@@ -1,41 +0,0 @@
-# frozen_string_literal: false
-require 'win32ole'
-
-class IEHandler
-  attr_reader :loop
-  def initialize
-    @urls = []
-    @loop = true
-  end
-  def method_missing(event, *args)
-    case event
-    when "BeforeNavigate2"
-      puts "Now Navigate #{args[1]}..."
-    end
-  end
-  def onNavigateComplete2(pdisp, url)
-    @urls << url
-  end
-  def onOnQuit
-    puts "Now Stop IE..."
-    @loop = false
-  end
-  def put_urls
-    puts "You Navigated the URLs ..."
-    @urls.each_with_index do |url, i|
-      puts "(#{i+1}) #{url}"
-    end
-  end
-end
-
-ie = WIN32OLE.new('InternetExplorer.Application')
-ie.visible = true
-ie.gohome
-
-ev = WIN32OLE_EVENT.new(ie)
-ev.handler = IEHandler.new
-
-while (ev.handler.loop)
-  WIN32OLE_EVENT.message_loop
-end
-ev.handler.put_urls
diff --git a/ext/win32ole/sample/oledirs.rb b/ext/win32ole/sample/oledirs.rb
deleted file mode 100644
index e52a0fd7ac813c..00000000000000
--- a/ext/win32ole/sample/oledirs.rb
+++ /dev/null
@@ -1,24 +0,0 @@
-# frozen_string_literal: false
-#
-# You need WSH(Windows Scripting Host) to run this script.
-#
-
-require "win32ole"
-
-def listup(items)
-#  items.each do |i|
-  for i in items
-    puts i.name
-  end
-end
-
-fs = WIN32OLE.new("Scripting.FileSystemObject")
-
-folder = fs.GetFolder(".")
-
-puts "--- folder of #{folder.path} ---"
-listup(folder.SubFolders)
-
-puts "--- files of #{folder.path} ---"
-listup(folder.Files)
-
diff --git a/ext/win32ole/sample/olegen.rb b/ext/win32ole/sample/olegen.rb
deleted file mode 100644
index 4b088a774f2062..00000000000000
--- a/ext/win32ole/sample/olegen.rb
+++ /dev/null
@@ -1,348 +0,0 @@
-# frozen_string_literal: false
-#-----------------------------
-# olegen.rb
-# $Revision$
-#-----------------------------
-
-require 'win32ole'
-
-class WIN32COMGen
-  def initialize(typelib)
-    @typelib = typelib
-    @receiver = ""
-  end
-  attr_reader :typelib
-
-  def ole_classes(typelib)
-    begin
-      @ole = WIN32OLE.new(typelib)
-      [@ole.ole_obj_help]
-    rescue
-      WIN32OLE_TYPE.ole_classes(typelib)
-    end
-  end
-
-  def generate_args(method)
-    args = []
-    if method.size_opt_params >= 0
-      size_required_params = method.size_params - method.size_opt_params
-    else
-      size_required_params = method.size_params - 1
-    end
-    size_required_params.times do |i|
-      if method.params[i] && method.params[i].optional?
-        args.push "arg#{i}=nil"
-      else
-        args.push "arg#{i}"
-      end
-    end
-    if method.size_opt_params >= 0
-      method.size_opt_params.times do |i|
-        args.push "arg#{i + size_required_params}=nil"
-      end
-    else
-      args.push "*arg"
-    end
-    args.join(", ")
-  end
-
-  def generate_argtype(typedetails)
-    ts = ''
-    typedetails.each do |t|
-      case t
-      when 'CARRAY', 'VOID', 'UINT', 'RESULT', 'DECIMAL', 'I8', 'UI8'
-#	  raise "Sorry type\"" + t + "\" not supported"
-      ts << "\"??? NOT SUPPORTED TYPE:`#{t}'\""
-      when 'USERDEFINED', 'Unknown Type 9'
-        ts << 'VT_DISPATCH'
-        break;
-      when 'SAFEARRAY'
-        ts << 'VT_ARRAY|'
-      when 'PTR'
-        ts << 'VT_BYREF|'
-      when 'INT'
-        ts << 'VT_I4'
-      else
-        if String === t
-          ts << 'VT_' + t
-        end
-      end
-    end
-    if ts.empty?
-      ts = 'VT_VARIANT'
-    elsif ts[-1] == ?|
-	ts += 'VT_VARIANT'
-    end
-    ts
-  end
-
-  def generate_argtypes(method, proptypes)
-    types = method.params.collect{|param|
-      generate_argtype(param.ole_type_detail)
-    }.join(", ")
-    if proptypes
-      types += ", " if types.size > 0
-      types += generate_argtype(proptypes)
-    end
-    types
-  end
-
-  def generate_method_body(method, disptype, types=nil)
-    "    ret = #{@receiver}#{disptype}(#{method.dispid}, [" +
-    generate_args(method).gsub("=nil", "") +
-    "], [" +
-    generate_argtypes(method, types) +
-    "])\n" +
-    "    @lastargs = WIN32OLE::ARGV\n" +
-    "    ret"
-  end
-
-  def generate_method_help(method, type = nil)
-    str = "  # "
-    if type
-      str += type
-    else
-      str += method.return_type
-    end
-    str += " #{method.name}"
-    if method.event?
-      str += " EVENT"
-      str += " in #{method.event_interface}"
-    end
-    if method.helpstring && method.helpstring != ""
-      str += "\n  # "
-      str += method.helpstring
-    end
-    args_help = generate_method_args_help(method)
-    if args_help
-      str += "\n"
-      str += args_help
-    end
-    str
-  end
-
-  def generate_method_args_help(method)
-    args = []
-    method.params.each_with_index {|param, i|
-      h = "  #   #{param.ole_type} arg#{i} --- #{param.name}"
-      inout = []
-      inout.push "IN" if param.input?
-      inout.push "OUT" if param.output?
-      h += " [#{inout.join('/')}]"
-      h += " ( = #{param.default})" if param.default
-      args.push h
-    }
-    if args.size > 0
-      args.join("\n")
-    else
-      nil
-    end
-  end
-
-  def generate_method(method, disptype, io = STDOUT, types = nil)
-    io.puts "\n"
-    io.puts  generate_method_help(method)
-    if method.invoke_kind == 'PROPERTYPUT'
-      io.print "  def #{method.name}=("
-    else
-      io.print "  def #{method.name}("
-    end
-    io.print generate_args(method)
-    io.puts ")"
-    io.puts generate_method_body(method, disptype, types)
-    io.puts "  end"
-  end
-
-  def generate_propputref_methods(klass, io = STDOUT)
-    klass.ole_methods.select {|method|
-      method.invoke_kind == 'PROPERTYPUTREF' && method.visible?
-    }.each do |method|
-      generate_method(method, io)
-    end
-  end
-
-  def generate_properties_with_args(klass, io = STDOUT)
-    klass.ole_methods.select {|method|
-      method.invoke_kind == 'PROPERTYGET' &&
-      method.visible? &&
-      method.size_params > 0
-    }.each do |method|
-      types = method.return_type_detail
-      io.puts "\n"
-      io.puts  generate_method_help(method, types[0])
-      io.puts  "  def #{method.name}"
-      if klass.ole_type == "Class"
-        io.print "    OLEProperty.new(@dispatch, #{method.dispid}, ["
-      else
-        io.print "    OLEProperty.new(self, #{method.dispid}, ["
-      end
-      io.print generate_argtypes(method, nil)
-      io.print "], ["
-      io.print generate_argtypes(method, types)
-      io.puts "])"
-      io.puts  "  end"
-    end
-  end
-
-  def generate_propput_methods(klass, io = STDOUT)
-    klass.ole_methods.select {|method|
-      method.invoke_kind == 'PROPERTYPUT' && method.visible? &&
-      method.size_params == 1
-    }.each do |method|
-      ms = klass.ole_methods.select {|m|
-        m.invoke_kind == 'PROPERTYGET' &&
-        m.dispid == method.dispid
-      }
-      types = []
-      if ms.size == 1
-        types = ms[0].return_type_detail
-      end
-      generate_method(method, '_setproperty', io, types)
-    end
-  end
-
-  def generate_propget_methods(klass, io = STDOUT)
-    klass.ole_methods.select {|method|
-      method.invoke_kind == 'PROPERTYGET' && method.visible? &&
-      method.size_params == 0
-    }.each do |method|
-      generate_method(method, '_getproperty', io)
-    end
-  end
-
-  def generate_func_methods(klass, io = STDOUT)
-    klass.ole_methods.select {|method|
-      method.invoke_kind == "FUNC" && method.visible?
-    }.each do |method|
-      generate_method(method, '_invoke', io)
-    end
-  end
-
-  def generate_methods(klass, io = STDOUT)
-    generate_propget_methods(klass, io)
-    generate_propput_methods(klass, io)
-    generate_properties_with_args(klass, io)
-    generate_func_methods(klass, io)
-#   generate_propputref_methods(klass, io)
-  end
-
-  def generate_constants(klass, io = STDOUT)
-    klass.variables.select {|v|
-      v.visible? && v.variable_kind == 'CONSTANT'
-    }.each do |v|
-      io.print "  "
-      io.print v.name.sub(/^./){$&.upcase}
-      io.print " = "
-      io.puts  v.value
-    end
-  end
-
-  def class_name(klass)
-    klass_name = klass.name
-    if klass.ole_type == "Class" &&
-       klass.guid &&
-       klass.progid
-       klass_name = klass.progid.gsub(/\./, '_')
-    end
-    if /^[A-Z]/ !~ klass_name || Module.constants.include?(klass_name)
-      klass_name = 'OLE' + klass_name
-    end
-    klass_name
-  end
-
-  def define_initialize(klass)
-    <<STR
-
-  def initialize(obj = nil)
-    @clsid = "#{klass.guid}"
-    @progid = "#{klass.progid}"
-    if obj.nil?
-      @dispatch = WIN32OLE.new @progid
-    else
-      @dispatch = obj
-    end
-  end
-STR
-  end
-
-  def define_include
-    "  include WIN32OLE::VARIANT"
-  end
-
-  def define_instance_variables
-    "  attr_reader :lastargs"
-  end
-
-  def define_method_missing
-    <<STR
-
-  def method_missing(cmd, *arg)
-    @dispatch.method_missing(cmd, *arg)
-  end
-STR
-  end
-
-  def define_class(klass, io = STDOUT)
-    io.puts "class #{class_name(klass)} # #{klass.name}"
-    io.puts define_include
-    io.puts define_instance_variables
-    io.puts "  attr_reader :dispatch"
-    io.puts "  attr_reader :clsid"
-    io.puts "  attr_reader :progid"
-    io.puts define_initialize(klass)
-    io.puts define_method_missing
-  end
-
-  def define_module(klass, io = STDOUT)
-    io.puts "module #{class_name(klass)}"
-    io.puts define_include
-    io.puts define_instance_variables
-  end
-
-  def generate_class(klass, io = STDOUT)
-    io.puts "\n# #{klass.helpstring}"
-    if klass.ole_type == "Class" &&
-       klass.guid &&
-       klass.progid
-      @receiver = "@dispatch."
-      define_class(klass, io)
-    else
-      @receiver = ""
-      define_module(klass, io)
-    end
-    generate_constants(klass, io)
-    generate_methods(klass, io)
-    io.puts "end"
-  end
-
-  def generate(io = STDOUT)
-    io.puts "require 'win32ole'"
-    io.puts "require 'win32ole/property'"
-
-    ole_classes(typelib).select{|klass|
-      klass.visible? &&
-      (klass.ole_type == "Class" ||
-       klass.ole_type == "Interface" ||
-       klass.ole_type == "Dispatch" ||
-       klass.ole_type == "Enum")
-    }.each do |klass|
-      generate_class(klass, io)
-    end
-    begin
-      @ole.quit if @ole
-    rescue
-    end
-  end
-end
-
-require 'win32ole'
-if __FILE__ == $0
-  if ARGV.size == 0
-    $stderr.puts "usage: #{$0} Type Library [...]"
-    exit 1
-  end
-  ARGV.each do |typelib|
-    comgen = WIN32COMGen.new(typelib)
-    comgen.generate
-  end
-end
diff --git a/ext/win32ole/sample/xml.rb b/ext/win32ole/sample/xml.rb
deleted file mode 100644
index 5a239c93367598..00000000000000
--- a/ext/win32ole/sample/xml.rb
+++ /dev/null
@@ -1,7307 +0,0 @@
-# frozen_string_literal: false
-#
-# This file created by olegen.rb as following.
-#    ruby olegen.rb 'Microsoft XML, version 2.0' > xml.rb
-#
-require 'win32ole'
-require 'win32ole/property'
-
-#
-module IXMLDOMImplementation
-  include WIN32OLE::VARIANT
-  attr_reader :lastargs
-
-  # BOOL hasFeature
-  #   BSTR arg0 --- feature [IN]
-  #   BSTR arg1 --- version [IN]
-  def hasFeature(arg0, arg1)
-    ret = _invoke(145, [arg0, arg1], [VT_BSTR, VT_BSTR])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-end
-
-# Core DOM node interface
-module IXMLDOMNode
-  include WIN32OLE::VARIANT
-  attr_reader :lastargs
-
-  # BSTR nodeName
-  # name of the node
-  def nodeName()
-    ret = _getproperty(2, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VARIANT nodeValue
-  # value stored in the node
-  def nodeValue()
-    ret = _getproperty(3, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # DOMNodeType nodeType
-  # the node's type
-  def nodeType()
-    ret = _getproperty(4, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode parentNode
-  # parent of the node
-  def parentNode()
-    ret = _getproperty(6, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNodeList childNodes
-  # the collection of the node's children
-  def childNodes()
-    ret = _getproperty(7, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode firstChild
-  # first child of the node
-  def firstChild()
-    ret = _getproperty(8, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode lastChild
-  # first child of the node
-  def lastChild()
-    ret = _getproperty(9, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode previousSibling
-  # left sibling of the node
-  def previousSibling()
-    ret = _getproperty(10, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode nextSibling
-  # right sibling of the node
-  def nextSibling()
-    ret = _getproperty(11, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNamedNodeMap attributes
-  # the collection of the node's attributes
-  def attributes()
-    ret = _getproperty(12, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMDocument ownerDocument
-  # document that contains the node
-  def ownerDocument()
-    ret = _getproperty(18, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR nodeTypeString
-  # the type of node in string form
-  def nodeTypeString()
-    ret = _getproperty(21, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR text
-  # text content of the node and subtree
-  def text()
-    ret = _getproperty(24, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BOOL specified
-  # indicates whether node is a default value
-  def specified()
-    ret = _getproperty(22, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode definition
-  # pointer to the definition of the node in the DTD or schema
-  def definition()
-    ret = _getproperty(23, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VARIANT nodeTypedValue
-  # get the strongly typed value of the node
-  def nodeTypedValue()
-    ret = _getproperty(25, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VARIANT dataType
-  # the data type of the node
-  def dataType()
-    ret = _getproperty(26, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR xml
-  # return the XML source for the node and each of its descendants
-  def xml()
-    ret = _getproperty(27, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BOOL parsed
-  # has sub-tree been completely parsed
-  def parsed()
-    ret = _getproperty(31, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR namespaceURI
-  # the URI for the namespace applying to the node
-  def namespaceURI()
-    ret = _getproperty(32, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR prefix
-  # the prefix for the namespace applying to the node
-  def prefix()
-    ret = _getproperty(33, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR baseName
-  # the base name of the node (nodename with the prefix stripped off)
-  def baseName()
-    ret = _getproperty(34, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID nodeValue
-  # value stored in the node
-  def nodeValue=(arg0)
-    ret = _setproperty(3, [arg0], [VT_VARIANT])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID text
-  # text content of the node and subtree
-  def text=(arg0)
-    ret = _setproperty(24, [arg0], [VT_BSTR])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID nodeTypedValue
-  # get the strongly typed value of the node
-  def nodeTypedValue=(arg0)
-    ret = _setproperty(25, [arg0], [VT_VARIANT])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID dataType
-  # the data type of the node
-  def dataType=(arg0)
-    ret = _setproperty(26, [arg0], [VT_VARIANT])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode insertBefore
-  # insert a child node
-  #   IXMLDOMNode arg0 --- newChild [IN]
-  #   VARIANT arg1 --- refChild [IN]
-  def insertBefore(arg0, arg1)
-    ret = _invoke(13, [arg0, arg1], [VT_BYREF|VT_DISPATCH, VT_VARIANT])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode replaceChild
-  # replace a child node
-  #   IXMLDOMNode arg0 --- newChild [IN]
-  #   IXMLDOMNode arg1 --- oldChild [IN]
-  def replaceChild(arg0, arg1)
-    ret = _invoke(14, [arg0, arg1], [VT_BYREF|VT_DISPATCH, VT_BYREF|VT_DISPATCH])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode removeChild
-  # remove a child node
-  #   IXMLDOMNode arg0 --- childNode [IN]
-  def removeChild(arg0)
-    ret = _invoke(15, [arg0], [VT_BYREF|VT_DISPATCH])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode appendChild
-  # append a child node
-  #   IXMLDOMNode arg0 --- newChild [IN]
-  def appendChild(arg0)
-    ret = _invoke(16, [arg0], [VT_BYREF|VT_DISPATCH])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BOOL hasChildNodes
-  def hasChildNodes()
-    ret = _invoke(17, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode cloneNode
-  #   BOOL arg0 --- deep [IN]
-  def cloneNode(arg0)
-    ret = _invoke(19, [arg0], [VT_BOOL])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR transformNode
-  # apply the stylesheet to the subtree
-  #   IXMLDOMNode arg0 --- stylesheet [IN]
-  def transformNode(arg0)
-    ret = _invoke(28, [arg0], [VT_BYREF|VT_DISPATCH])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNodeList selectNodes
-  # execute query on the subtree
-  #   BSTR arg0 --- queryString [IN]
-  def selectNodes(arg0)
-    ret = _invoke(29, [arg0], [VT_BSTR])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode selectSingleNode
-  # execute query on the subtree
-  #   BSTR arg0 --- queryString [IN]
-  def selectSingleNode(arg0)
-    ret = _invoke(30, [arg0], [VT_BSTR])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID transformNodeToObject
-  # apply the stylesheet to the subtree, returning the result through a document or a stream
-  #   IXMLDOMNode arg0 --- stylesheet [IN]
-  #   VARIANT arg1 --- outputObject [IN]
-  def transformNodeToObject(arg0, arg1)
-    ret = _invoke(35, [arg0, arg1], [VT_BYREF|VT_DISPATCH, VT_VARIANT])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-end
-
-# Constants that define a node's type
-module OLEtagDOMNodeType
-  include WIN32OLE::VARIANT
-  attr_reader :lastargs
-  NODE_INVALID = 0
-  NODE_ELEMENT = 1
-  NODE_ATTRIBUTE = 2
-  NODE_TEXT = 3
-  NODE_CDATA_SECTION = 4
-  NODE_ENTITY_REFERENCE = 5
-  NODE_ENTITY = 6
-  NODE_PROCESSING_INSTRUCTION = 7
-  NODE_COMMENT = 8
-  NODE_DOCUMENT = 9
-  NODE_DOCUMENT_TYPE = 10
-  NODE_DOCUMENT_FRAGMENT = 11
-  NODE_NOTATION = 12
-end
-
-#
-module IXMLDOMNodeList
-  include WIN32OLE::VARIANT
-  attr_reader :lastargs
-
-  # I4 length
-  # number of nodes in the collection
-  def length()
-    ret = _getproperty(74, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # PTR item
-  # collection of nodes
-  #   I4 arg0 --- index [IN]
-  def item
-    OLEProperty.new(self, 0, [VT_I4], [VT_I4, VT_BYREF|VT_DISPATCH])
-  end
-
-  # IXMLDOMNode nextNode
-  # get next node from iterator
-  def nextNode()
-    ret = _invoke(76, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID reset
-  # reset the position of iterator
-  def reset()
-    ret = _invoke(77, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-end
-
-#
-module IXMLDOMNamedNodeMap
-  include WIN32OLE::VARIANT
-  attr_reader :lastargs
-
-  # I4 length
-  # number of nodes in the collection
-  def length()
-    ret = _getproperty(74, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # PTR item
-  # collection of nodes
-  #   I4 arg0 --- index [IN]
-  def item
-    OLEProperty.new(self, 0, [VT_I4], [VT_I4, VT_BYREF|VT_DISPATCH])
-  end
-
-  # IXMLDOMNode getNamedItem
-  # lookup item by name
-  #   BSTR arg0 --- name [IN]
-  def getNamedItem(arg0)
-    ret = _invoke(83, [arg0], [VT_BSTR])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode setNamedItem
-  # set item by name
-  #   IXMLDOMNode arg0 --- newItem [IN]
-  def setNamedItem(arg0)
-    ret = _invoke(84, [arg0], [VT_BYREF|VT_DISPATCH])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode removeNamedItem
-  # remove item by name
-  #   BSTR arg0 --- name [IN]
-  def removeNamedItem(arg0)
-    ret = _invoke(85, [arg0], [VT_BSTR])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode getQualifiedItem
-  # lookup the item by name and namespace
-  #   BSTR arg0 --- baseName [IN]
-  #   BSTR arg1 --- namespaceURI [IN]
-  def getQualifiedItem(arg0, arg1)
-    ret = _invoke(87, [arg0, arg1], [VT_BSTR, VT_BSTR])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode removeQualifiedItem
-  # remove the item by name and namespace
-  #   BSTR arg0 --- baseName [IN]
-  #   BSTR arg1 --- namespaceURI [IN]
-  def removeQualifiedItem(arg0, arg1)
-    ret = _invoke(88, [arg0, arg1], [VT_BSTR, VT_BSTR])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode nextNode
-  # get next node from iterator
-  def nextNode()
-    ret = _invoke(89, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID reset
-  # reset the position of iterator
-  def reset()
-    ret = _invoke(90, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-end
-
-#
-module IXMLDOMDocument
-  include WIN32OLE::VARIANT
-  attr_reader :lastargs
-
-  # BSTR nodeName
-  # name of the node
-  def nodeName()
-    ret = _getproperty(2, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VARIANT nodeValue
-  # value stored in the node
-  def nodeValue()
-    ret = _getproperty(3, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # DOMNodeType nodeType
-  # the node's type
-  def nodeType()
-    ret = _getproperty(4, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode parentNode
-  # parent of the node
-  def parentNode()
-    ret = _getproperty(6, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNodeList childNodes
-  # the collection of the node's children
-  def childNodes()
-    ret = _getproperty(7, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode firstChild
-  # first child of the node
-  def firstChild()
-    ret = _getproperty(8, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode lastChild
-  # first child of the node
-  def lastChild()
-    ret = _getproperty(9, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode previousSibling
-  # left sibling of the node
-  def previousSibling()
-    ret = _getproperty(10, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode nextSibling
-  # right sibling of the node
-  def nextSibling()
-    ret = _getproperty(11, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNamedNodeMap attributes
-  # the collection of the node's attributes
-  def attributes()
-    ret = _getproperty(12, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMDocument ownerDocument
-  # document that contains the node
-  def ownerDocument()
-    ret = _getproperty(18, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR nodeTypeString
-  # the type of node in string form
-  def nodeTypeString()
-    ret = _getproperty(21, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR text
-  # text content of the node and subtree
-  def text()
-    ret = _getproperty(24, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BOOL specified
-  # indicates whether node is a default value
-  def specified()
-    ret = _getproperty(22, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode definition
-  # pointer to the definition of the node in the DTD or schema
-  def definition()
-    ret = _getproperty(23, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VARIANT nodeTypedValue
-  # get the strongly typed value of the node
-  def nodeTypedValue()
-    ret = _getproperty(25, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VARIANT dataType
-  # the data type of the node
-  def dataType()
-    ret = _getproperty(26, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR xml
-  # return the XML source for the node and each of its descendants
-  def xml()
-    ret = _getproperty(27, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BOOL parsed
-  # has sub-tree been completely parsed
-  def parsed()
-    ret = _getproperty(31, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR namespaceURI
-  # the URI for the namespace applying to the node
-  def namespaceURI()
-    ret = _getproperty(32, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR prefix
-  # the prefix for the namespace applying to the node
-  def prefix()
-    ret = _getproperty(33, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR baseName
-  # the base name of the node (nodename with the prefix stripped off)
-  def baseName()
-    ret = _getproperty(34, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMDocumentType doctype
-  # node corresponding to the DOCTYPE
-  def doctype()
-    ret = _getproperty(38, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMImplementation implementation
-  # info on this DOM implementation
-  def implementation()
-    ret = _getproperty(39, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMElement documentElement
-  # the root of the tree
-  def documentElement()
-    ret = _getproperty(40, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # I4 readyState
-  # get the state of the XML document
-  def readyState()
-    ret = _getproperty(-525, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMParseError parseError
-  # get the last parser error
-  def parseError()
-    ret = _getproperty(59, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR url
-  # get the URL for the loaded XML document
-  def url()
-    ret = _getproperty(60, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BOOL async
-  # flag for asynchronous download
-  def async()
-    ret = _getproperty(61, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BOOL validateOnParse
-  # indicates whether the parser performs validation
-  def validateOnParse()
-    ret = _getproperty(65, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BOOL resolveExternals
-  # indicates whether the parser resolves references to external DTD/Entities/Schema
-  def resolveExternals()
-    ret = _getproperty(66, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BOOL preserveWhiteSpace
-  # indicates whether the parser preserves whitespace
-  def preserveWhiteSpace()
-    ret = _getproperty(67, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID nodeValue
-  # value stored in the node
-  def nodeValue=(arg0)
-    ret = _setproperty(3, [arg0], [VT_VARIANT])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID text
-  # text content of the node and subtree
-  def text=(arg0)
-    ret = _setproperty(24, [arg0], [VT_BSTR])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID nodeTypedValue
-  # get the strongly typed value of the node
-  def nodeTypedValue=(arg0)
-    ret = _setproperty(25, [arg0], [VT_VARIANT])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID dataType
-  # the data type of the node
-  def dataType=(arg0)
-    ret = _setproperty(26, [arg0], [VT_VARIANT])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID async
-  # flag for asynchronous download
-  def async=(arg0)
-    ret = _setproperty(61, [arg0], [VT_BOOL])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID validateOnParse
-  # indicates whether the parser performs validation
-  def validateOnParse=(arg0)
-    ret = _setproperty(65, [arg0], [VT_BOOL])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID resolveExternals
-  # indicates whether the parser resolves references to external DTD/Entities/Schema
-  def resolveExternals=(arg0)
-    ret = _setproperty(66, [arg0], [VT_BOOL])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID preserveWhiteSpace
-  # indicates whether the parser preserves whitespace
-  def preserveWhiteSpace=(arg0)
-    ret = _setproperty(67, [arg0], [VT_BOOL])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID onreadystatechange
-  # register a readystatechange event handler
-  def onreadystatechange=(arg0)
-    ret = _setproperty(68, [arg0], [VT_VARIANT])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID ondataavailable
-  # register an ondataavailable event handler
-  def ondataavailable=(arg0)
-    ret = _setproperty(69, [arg0], [VT_VARIANT])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID ontransformnode
-  # register an ontransformnode event handler
-  def ontransformnode=(arg0)
-    ret = _setproperty(70, [arg0], [VT_VARIANT])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode insertBefore
-  # insert a child node
-  #   IXMLDOMNode arg0 --- newChild [IN]
-  #   VARIANT arg1 --- refChild [IN]
-  def insertBefore(arg0, arg1)
-    ret = _invoke(13, [arg0, arg1], [VT_BYREF|VT_DISPATCH, VT_VARIANT])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode replaceChild
-  # replace a child node
-  #   IXMLDOMNode arg0 --- newChild [IN]
-  #   IXMLDOMNode arg1 --- oldChild [IN]
-  def replaceChild(arg0, arg1)
-    ret = _invoke(14, [arg0, arg1], [VT_BYREF|VT_DISPATCH, VT_BYREF|VT_DISPATCH])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode removeChild
-  # remove a child node
-  #   IXMLDOMNode arg0 --- childNode [IN]
-  def removeChild(arg0)
-    ret = _invoke(15, [arg0], [VT_BYREF|VT_DISPATCH])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode appendChild
-  # append a child node
-  #   IXMLDOMNode arg0 --- newChild [IN]
-  def appendChild(arg0)
-    ret = _invoke(16, [arg0], [VT_BYREF|VT_DISPATCH])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BOOL hasChildNodes
-  def hasChildNodes()
-    ret = _invoke(17, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode cloneNode
-  #   BOOL arg0 --- deep [IN]
-  def cloneNode(arg0)
-    ret = _invoke(19, [arg0], [VT_BOOL])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR transformNode
-  # apply the stylesheet to the subtree
-  #   IXMLDOMNode arg0 --- stylesheet [IN]
-  def transformNode(arg0)
-    ret = _invoke(28, [arg0], [VT_BYREF|VT_DISPATCH])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNodeList selectNodes
-  # execute query on the subtree
-  #   BSTR arg0 --- queryString [IN]
-  def selectNodes(arg0)
-    ret = _invoke(29, [arg0], [VT_BSTR])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode selectSingleNode
-  # execute query on the subtree
-  #   BSTR arg0 --- queryString [IN]
-  def selectSingleNode(arg0)
-    ret = _invoke(30, [arg0], [VT_BSTR])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID transformNodeToObject
-  # apply the stylesheet to the subtree, returning the result through a document or a stream
-  #   IXMLDOMNode arg0 --- stylesheet [IN]
-  #   VARIANT arg1 --- outputObject [IN]
-  def transformNodeToObject(arg0, arg1)
-    ret = _invoke(35, [arg0, arg1], [VT_BYREF|VT_DISPATCH, VT_VARIANT])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMElement createElement
-  # create an Element node
-  #   BSTR arg0 --- tagName [IN]
-  def createElement(arg0)
-    ret = _invoke(41, [arg0], [VT_BSTR])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMDocumentFragment createDocumentFragment
-  # create a DocumentFragment node
-  def createDocumentFragment()
-    ret = _invoke(42, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMText createTextNode
-  # create a text node
-  #   BSTR arg0 --- data [IN]
-  def createTextNode(arg0)
-    ret = _invoke(43, [arg0], [VT_BSTR])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMComment createComment
-  # create a comment node
-  #   BSTR arg0 --- data [IN]
-  def createComment(arg0)
-    ret = _invoke(44, [arg0], [VT_BSTR])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMCDATASection createCDATASection
-  # create a CDATA section node
-  #   BSTR arg0 --- data [IN]
-  def createCDATASection(arg0)
-    ret = _invoke(45, [arg0], [VT_BSTR])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMProcessingInstruction createProcessingInstruction
-  # create a processing instruction node
-  #   BSTR arg0 --- target [IN]
-  #   BSTR arg1 --- data [IN]
-  def createProcessingInstruction(arg0, arg1)
-    ret = _invoke(46, [arg0, arg1], [VT_BSTR, VT_BSTR])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMAttribute createAttribute
-  # create an attribute node
-  #   BSTR arg0 --- name [IN]
-  def createAttribute(arg0)
-    ret = _invoke(47, [arg0], [VT_BSTR])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMEntityReference createEntityReference
-  # create an entity reference node
-  #   BSTR arg0 --- name [IN]
-  def createEntityReference(arg0)
-    ret = _invoke(49, [arg0], [VT_BSTR])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNodeList getElementsByTagName
-  # build a list of elements by name
-  #   BSTR arg0 --- tagName [IN]
-  def getElementsByTagName(arg0)
-    ret = _invoke(50, [arg0], [VT_BSTR])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode createNode
-  # create a node of the specified node type and name
-  #   VARIANT arg0 --- type [IN]
-  #   BSTR arg1 --- name [IN]
-  #   BSTR arg2 --- namespaceURI [IN]
-  def createNode(arg0, arg1, arg2)
-    ret = _invoke(54, [arg0, arg1, arg2], [VT_VARIANT, VT_BSTR, VT_BSTR])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode nodeFromID
-  # retrieve node from it's ID
-  #   BSTR arg0 --- idString [IN]
-  def nodeFromID(arg0)
-    ret = _invoke(56, [arg0], [VT_BSTR])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BOOL load
-  # load document from the specified XML source
-  #   VARIANT arg0 --- xmlSource [IN]
-  def load(arg0)
-    ret = _invoke(58, [arg0], [VT_VARIANT])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID abort
-  # abort an asynchronous download
-  def abort()
-    ret = _invoke(62, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BOOL loadXML
-  # load the document from a string
-  #   BSTR arg0 --- bstrXML [IN]
-  def loadXML(arg0)
-    ret = _invoke(63, [arg0], [VT_BSTR])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID save
-  # save the document to a specified destination
-  #   VARIANT arg0 --- destination [IN]
-  def save(arg0)
-    ret = _invoke(64, [arg0], [VT_VARIANT])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-end
-
-#
-module IXMLDOMDocumentType
-  include WIN32OLE::VARIANT
-  attr_reader :lastargs
-
-  # BSTR nodeName
-  # name of the node
-  def nodeName()
-    ret = _getproperty(2, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VARIANT nodeValue
-  # value stored in the node
-  def nodeValue()
-    ret = _getproperty(3, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # DOMNodeType nodeType
-  # the node's type
-  def nodeType()
-    ret = _getproperty(4, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode parentNode
-  # parent of the node
-  def parentNode()
-    ret = _getproperty(6, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNodeList childNodes
-  # the collection of the node's children
-  def childNodes()
-    ret = _getproperty(7, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode firstChild
-  # first child of the node
-  def firstChild()
-    ret = _getproperty(8, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode lastChild
-  # first child of the node
-  def lastChild()
-    ret = _getproperty(9, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode previousSibling
-  # left sibling of the node
-  def previousSibling()
-    ret = _getproperty(10, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode nextSibling
-  # right sibling of the node
-  def nextSibling()
-    ret = _getproperty(11, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNamedNodeMap attributes
-  # the collection of the node's attributes
-  def attributes()
-    ret = _getproperty(12, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMDocument ownerDocument
-  # document that contains the node
-  def ownerDocument()
-    ret = _getproperty(18, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR nodeTypeString
-  # the type of node in string form
-  def nodeTypeString()
-    ret = _getproperty(21, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR text
-  # text content of the node and subtree
-  def text()
-    ret = _getproperty(24, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BOOL specified
-  # indicates whether node is a default value
-  def specified()
-    ret = _getproperty(22, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode definition
-  # pointer to the definition of the node in the DTD or schema
-  def definition()
-    ret = _getproperty(23, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VARIANT nodeTypedValue
-  # get the strongly typed value of the node
-  def nodeTypedValue()
-    ret = _getproperty(25, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VARIANT dataType
-  # the data type of the node
-  def dataType()
-    ret = _getproperty(26, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR xml
-  # return the XML source for the node and each of its descendants
-  def xml()
-    ret = _getproperty(27, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BOOL parsed
-  # has sub-tree been completely parsed
-  def parsed()
-    ret = _getproperty(31, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR namespaceURI
-  # the URI for the namespace applying to the node
-  def namespaceURI()
-    ret = _getproperty(32, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR prefix
-  # the prefix for the namespace applying to the node
-  def prefix()
-    ret = _getproperty(33, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR baseName
-  # the base name of the node (nodename with the prefix stripped off)
-  def baseName()
-    ret = _getproperty(34, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR name
-  # name of the document type (root of the tree)
-  def name()
-    ret = _getproperty(131, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNamedNodeMap entities
-  # a list of entities in the document
-  def entities()
-    ret = _getproperty(132, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNamedNodeMap notations
-  # a list of notations in the document
-  def notations()
-    ret = _getproperty(133, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID nodeValue
-  # value stored in the node
-  def nodeValue=(arg0)
-    ret = _setproperty(3, [arg0], [VT_VARIANT])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID text
-  # text content of the node and subtree
-  def text=(arg0)
-    ret = _setproperty(24, [arg0], [VT_BSTR])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID nodeTypedValue
-  # get the strongly typed value of the node
-  def nodeTypedValue=(arg0)
-    ret = _setproperty(25, [arg0], [VT_VARIANT])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID dataType
-  # the data type of the node
-  def dataType=(arg0)
-    ret = _setproperty(26, [arg0], [VT_VARIANT])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode insertBefore
-  # insert a child node
-  #   IXMLDOMNode arg0 --- newChild [IN]
-  #   VARIANT arg1 --- refChild [IN]
-  def insertBefore(arg0, arg1)
-    ret = _invoke(13, [arg0, arg1], [VT_BYREF|VT_DISPATCH, VT_VARIANT])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode replaceChild
-  # replace a child node
-  #   IXMLDOMNode arg0 --- newChild [IN]
-  #   IXMLDOMNode arg1 --- oldChild [IN]
-  def replaceChild(arg0, arg1)
-    ret = _invoke(14, [arg0, arg1], [VT_BYREF|VT_DISPATCH, VT_BYREF|VT_DISPATCH])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode removeChild
-  # remove a child node
-  #   IXMLDOMNode arg0 --- childNode [IN]
-  def removeChild(arg0)
-    ret = _invoke(15, [arg0], [VT_BYREF|VT_DISPATCH])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode appendChild
-  # append a child node
-  #   IXMLDOMNode arg0 --- newChild [IN]
-  def appendChild(arg0)
-    ret = _invoke(16, [arg0], [VT_BYREF|VT_DISPATCH])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BOOL hasChildNodes
-  def hasChildNodes()
-    ret = _invoke(17, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode cloneNode
-  #   BOOL arg0 --- deep [IN]
-  def cloneNode(arg0)
-    ret = _invoke(19, [arg0], [VT_BOOL])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR transformNode
-  # apply the stylesheet to the subtree
-  #   IXMLDOMNode arg0 --- stylesheet [IN]
-  def transformNode(arg0)
-    ret = _invoke(28, [arg0], [VT_BYREF|VT_DISPATCH])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNodeList selectNodes
-  # execute query on the subtree
-  #   BSTR arg0 --- queryString [IN]
-  def selectNodes(arg0)
-    ret = _invoke(29, [arg0], [VT_BSTR])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode selectSingleNode
-  # execute query on the subtree
-  #   BSTR arg0 --- queryString [IN]
-  def selectSingleNode(arg0)
-    ret = _invoke(30, [arg0], [VT_BSTR])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID transformNodeToObject
-  # apply the stylesheet to the subtree, returning the result through a document or a stream
-  #   IXMLDOMNode arg0 --- stylesheet [IN]
-  #   VARIANT arg1 --- outputObject [IN]
-  def transformNodeToObject(arg0, arg1)
-    ret = _invoke(35, [arg0, arg1], [VT_BYREF|VT_DISPATCH, VT_VARIANT])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-end
-
-#
-module IXMLDOMElement
-  include WIN32OLE::VARIANT
-  attr_reader :lastargs
-
-  # BSTR nodeName
-  # name of the node
-  def nodeName()
-    ret = _getproperty(2, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VARIANT nodeValue
-  # value stored in the node
-  def nodeValue()
-    ret = _getproperty(3, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # DOMNodeType nodeType
-  # the node's type
-  def nodeType()
-    ret = _getproperty(4, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode parentNode
-  # parent of the node
-  def parentNode()
-    ret = _getproperty(6, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNodeList childNodes
-  # the collection of the node's children
-  def childNodes()
-    ret = _getproperty(7, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode firstChild
-  # first child of the node
-  def firstChild()
-    ret = _getproperty(8, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode lastChild
-  # first child of the node
-  def lastChild()
-    ret = _getproperty(9, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode previousSibling
-  # left sibling of the node
-  def previousSibling()
-    ret = _getproperty(10, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode nextSibling
-  # right sibling of the node
-  def nextSibling()
-    ret = _getproperty(11, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNamedNodeMap attributes
-  # the collection of the node's attributes
-  def attributes()
-    ret = _getproperty(12, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMDocument ownerDocument
-  # document that contains the node
-  def ownerDocument()
-    ret = _getproperty(18, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR nodeTypeString
-  # the type of node in string form
-  def nodeTypeString()
-    ret = _getproperty(21, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR text
-  # text content of the node and subtree
-  def text()
-    ret = _getproperty(24, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BOOL specified
-  # indicates whether node is a default value
-  def specified()
-    ret = _getproperty(22, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode definition
-  # pointer to the definition of the node in the DTD or schema
-  def definition()
-    ret = _getproperty(23, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VARIANT nodeTypedValue
-  # get the strongly typed value of the node
-  def nodeTypedValue()
-    ret = _getproperty(25, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VARIANT dataType
-  # the data type of the node
-  def dataType()
-    ret = _getproperty(26, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR xml
-  # return the XML source for the node and each of its descendants
-  def xml()
-    ret = _getproperty(27, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BOOL parsed
-  # has sub-tree been completely parsed
-  def parsed()
-    ret = _getproperty(31, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR namespaceURI
-  # the URI for the namespace applying to the node
-  def namespaceURI()
-    ret = _getproperty(32, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR prefix
-  # the prefix for the namespace applying to the node
-  def prefix()
-    ret = _getproperty(33, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR baseName
-  # the base name of the node (nodename with the prefix stripped off)
-  def baseName()
-    ret = _getproperty(34, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR tagName
-  # get the tagName of the element
-  def tagName()
-    ret = _getproperty(97, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID nodeValue
-  # value stored in the node
-  def nodeValue=(arg0)
-    ret = _setproperty(3, [arg0], [VT_VARIANT])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID text
-  # text content of the node and subtree
-  def text=(arg0)
-    ret = _setproperty(24, [arg0], [VT_BSTR])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID nodeTypedValue
-  # get the strongly typed value of the node
-  def nodeTypedValue=(arg0)
-    ret = _setproperty(25, [arg0], [VT_VARIANT])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID dataType
-  # the data type of the node
-  def dataType=(arg0)
-    ret = _setproperty(26, [arg0], [VT_VARIANT])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode insertBefore
-  # insert a child node
-  #   IXMLDOMNode arg0 --- newChild [IN]
-  #   VARIANT arg1 --- refChild [IN]
-  def insertBefore(arg0, arg1)
-    ret = _invoke(13, [arg0, arg1], [VT_BYREF|VT_DISPATCH, VT_VARIANT])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode replaceChild
-  # replace a child node
-  #   IXMLDOMNode arg0 --- newChild [IN]
-  #   IXMLDOMNode arg1 --- oldChild [IN]
-  def replaceChild(arg0, arg1)
-    ret = _invoke(14, [arg0, arg1], [VT_BYREF|VT_DISPATCH, VT_BYREF|VT_DISPATCH])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode removeChild
-  # remove a child node
-  #   IXMLDOMNode arg0 --- childNode [IN]
-  def removeChild(arg0)
-    ret = _invoke(15, [arg0], [VT_BYREF|VT_DISPATCH])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode appendChild
-  # append a child node
-  #   IXMLDOMNode arg0 --- newChild [IN]
-  def appendChild(arg0)
-    ret = _invoke(16, [arg0], [VT_BYREF|VT_DISPATCH])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BOOL hasChildNodes
-  def hasChildNodes()
-    ret = _invoke(17, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode cloneNode
-  #   BOOL arg0 --- deep [IN]
-  def cloneNode(arg0)
-    ret = _invoke(19, [arg0], [VT_BOOL])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR transformNode
-  # apply the stylesheet to the subtree
-  #   IXMLDOMNode arg0 --- stylesheet [IN]
-  def transformNode(arg0)
-    ret = _invoke(28, [arg0], [VT_BYREF|VT_DISPATCH])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNodeList selectNodes
-  # execute query on the subtree
-  #   BSTR arg0 --- queryString [IN]
-  def selectNodes(arg0)
-    ret = _invoke(29, [arg0], [VT_BSTR])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode selectSingleNode
-  # execute query on the subtree
-  #   BSTR arg0 --- queryString [IN]
-  def selectSingleNode(arg0)
-    ret = _invoke(30, [arg0], [VT_BSTR])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID transformNodeToObject
-  # apply the stylesheet to the subtree, returning the result through a document or a stream
-  #   IXMLDOMNode arg0 --- stylesheet [IN]
-  #   VARIANT arg1 --- outputObject [IN]
-  def transformNodeToObject(arg0, arg1)
-    ret = _invoke(35, [arg0, arg1], [VT_BYREF|VT_DISPATCH, VT_VARIANT])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VARIANT getAttribute
-  # look up the string value of an attribute by name
-  #   BSTR arg0 --- name [IN]
-  def getAttribute(arg0)
-    ret = _invoke(99, [arg0], [VT_BSTR])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID setAttribute
-  # set the string value of an attribute by name
-  #   BSTR arg0 --- name [IN]
-  #   VARIANT arg1 --- value [IN]
-  def setAttribute(arg0, arg1)
-    ret = _invoke(100, [arg0, arg1], [VT_BSTR, VT_VARIANT])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID removeAttribute
-  # remove an attribute by name
-  #   BSTR arg0 --- name [IN]
-  def removeAttribute(arg0)
-    ret = _invoke(101, [arg0], [VT_BSTR])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMAttribute getAttributeNode
-  # look up the attribute node by name
-  #   BSTR arg0 --- name [IN]
-  def getAttributeNode(arg0)
-    ret = _invoke(102, [arg0], [VT_BSTR])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMAttribute setAttributeNode
-  # set the specified attribute on the element
-  #   IXMLDOMAttribute arg0 --- DOMAttribute [IN]
-  def setAttributeNode(arg0)
-    ret = _invoke(103, [arg0], [VT_BYREF|VT_DISPATCH])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMAttribute removeAttributeNode
-  # remove the specified attribute
-  #   IXMLDOMAttribute arg0 --- DOMAttribute [IN]
-  def removeAttributeNode(arg0)
-    ret = _invoke(104, [arg0], [VT_BYREF|VT_DISPATCH])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNodeList getElementsByTagName
-  # build a list of elements by name
-  #   BSTR arg0 --- tagName [IN]
-  def getElementsByTagName(arg0)
-    ret = _invoke(105, [arg0], [VT_BSTR])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID normalize
-  # collapse all adjacent text nodes in sub-tree
-  def normalize()
-    ret = _invoke(106, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-end
-
-#
-module IXMLDOMAttribute
-  include WIN32OLE::VARIANT
-  attr_reader :lastargs
-
-  # BSTR nodeName
-  # name of the node
-  def nodeName()
-    ret = _getproperty(2, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VARIANT nodeValue
-  # value stored in the node
-  def nodeValue()
-    ret = _getproperty(3, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # DOMNodeType nodeType
-  # the node's type
-  def nodeType()
-    ret = _getproperty(4, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode parentNode
-  # parent of the node
-  def parentNode()
-    ret = _getproperty(6, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNodeList childNodes
-  # the collection of the node's children
-  def childNodes()
-    ret = _getproperty(7, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode firstChild
-  # first child of the node
-  def firstChild()
-    ret = _getproperty(8, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode lastChild
-  # first child of the node
-  def lastChild()
-    ret = _getproperty(9, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode previousSibling
-  # left sibling of the node
-  def previousSibling()
-    ret = _getproperty(10, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode nextSibling
-  # right sibling of the node
-  def nextSibling()
-    ret = _getproperty(11, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNamedNodeMap attributes
-  # the collection of the node's attributes
-  def attributes()
-    ret = _getproperty(12, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMDocument ownerDocument
-  # document that contains the node
-  def ownerDocument()
-    ret = _getproperty(18, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR nodeTypeString
-  # the type of node in string form
-  def nodeTypeString()
-    ret = _getproperty(21, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR text
-  # text content of the node and subtree
-  def text()
-    ret = _getproperty(24, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BOOL specified
-  # indicates whether node is a default value
-  def specified()
-    ret = _getproperty(22, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode definition
-  # pointer to the definition of the node in the DTD or schema
-  def definition()
-    ret = _getproperty(23, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VARIANT nodeTypedValue
-  # get the strongly typed value of the node
-  def nodeTypedValue()
-    ret = _getproperty(25, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VARIANT dataType
-  # the data type of the node
-  def dataType()
-    ret = _getproperty(26, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR xml
-  # return the XML source for the node and each of its descendants
-  def xml()
-    ret = _getproperty(27, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BOOL parsed
-  # has sub-tree been completely parsed
-  def parsed()
-    ret = _getproperty(31, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR namespaceURI
-  # the URI for the namespace applying to the node
-  def namespaceURI()
-    ret = _getproperty(32, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR prefix
-  # the prefix for the namespace applying to the node
-  def prefix()
-    ret = _getproperty(33, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR baseName
-  # the base name of the node (nodename with the prefix stripped off)
-  def baseName()
-    ret = _getproperty(34, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR name
-  # get name of the attribute
-  def name()
-    ret = _getproperty(118, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VARIANT value
-  # string value of the attribute
-  def value()
-    ret = _getproperty(120, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID nodeValue
-  # value stored in the node
-  def nodeValue=(arg0)
-    ret = _setproperty(3, [arg0], [VT_VARIANT])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID text
-  # text content of the node and subtree
-  def text=(arg0)
-    ret = _setproperty(24, [arg0], [VT_BSTR])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID nodeTypedValue
-  # get the strongly typed value of the node
-  def nodeTypedValue=(arg0)
-    ret = _setproperty(25, [arg0], [VT_VARIANT])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID dataType
-  # the data type of the node
-  def dataType=(arg0)
-    ret = _setproperty(26, [arg0], [VT_VARIANT])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID value
-  # string value of the attribute
-  def value=(arg0)
-    ret = _setproperty(120, [arg0], [VT_VARIANT])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode insertBefore
-  # insert a child node
-  #   IXMLDOMNode arg0 --- newChild [IN]
-  #   VARIANT arg1 --- refChild [IN]
-  def insertBefore(arg0, arg1)
-    ret = _invoke(13, [arg0, arg1], [VT_BYREF|VT_DISPATCH, VT_VARIANT])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode replaceChild
-  # replace a child node
-  #   IXMLDOMNode arg0 --- newChild [IN]
-  #   IXMLDOMNode arg1 --- oldChild [IN]
-  def replaceChild(arg0, arg1)
-    ret = _invoke(14, [arg0, arg1], [VT_BYREF|VT_DISPATCH, VT_BYREF|VT_DISPATCH])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode removeChild
-  # remove a child node
-  #   IXMLDOMNode arg0 --- childNode [IN]
-  def removeChild(arg0)
-    ret = _invoke(15, [arg0], [VT_BYREF|VT_DISPATCH])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode appendChild
-  # append a child node
-  #   IXMLDOMNode arg0 --- newChild [IN]
-  def appendChild(arg0)
-    ret = _invoke(16, [arg0], [VT_BYREF|VT_DISPATCH])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BOOL hasChildNodes
-  def hasChildNodes()
-    ret = _invoke(17, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode cloneNode
-  #   BOOL arg0 --- deep [IN]
-  def cloneNode(arg0)
-    ret = _invoke(19, [arg0], [VT_BOOL])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR transformNode
-  # apply the stylesheet to the subtree
-  #   IXMLDOMNode arg0 --- stylesheet [IN]
-  def transformNode(arg0)
-    ret = _invoke(28, [arg0], [VT_BYREF|VT_DISPATCH])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNodeList selectNodes
-  # execute query on the subtree
-  #   BSTR arg0 --- queryString [IN]
-  def selectNodes(arg0)
-    ret = _invoke(29, [arg0], [VT_BSTR])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode selectSingleNode
-  # execute query on the subtree
-  #   BSTR arg0 --- queryString [IN]
-  def selectSingleNode(arg0)
-    ret = _invoke(30, [arg0], [VT_BSTR])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID transformNodeToObject
-  # apply the stylesheet to the subtree, returning the result through a document or a stream
-  #   IXMLDOMNode arg0 --- stylesheet [IN]
-  #   VARIANT arg1 --- outputObject [IN]
-  def transformNodeToObject(arg0, arg1)
-    ret = _invoke(35, [arg0, arg1], [VT_BYREF|VT_DISPATCH, VT_VARIANT])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-end
-
-#
-module IXMLDOMDocumentFragment
-  include WIN32OLE::VARIANT
-  attr_reader :lastargs
-
-  # BSTR nodeName
-  # name of the node
-  def nodeName()
-    ret = _getproperty(2, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VARIANT nodeValue
-  # value stored in the node
-  def nodeValue()
-    ret = _getproperty(3, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # DOMNodeType nodeType
-  # the node's type
-  def nodeType()
-    ret = _getproperty(4, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode parentNode
-  # parent of the node
-  def parentNode()
-    ret = _getproperty(6, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNodeList childNodes
-  # the collection of the node's children
-  def childNodes()
-    ret = _getproperty(7, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode firstChild
-  # first child of the node
-  def firstChild()
-    ret = _getproperty(8, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode lastChild
-  # first child of the node
-  def lastChild()
-    ret = _getproperty(9, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode previousSibling
-  # left sibling of the node
-  def previousSibling()
-    ret = _getproperty(10, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode nextSibling
-  # right sibling of the node
-  def nextSibling()
-    ret = _getproperty(11, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNamedNodeMap attributes
-  # the collection of the node's attributes
-  def attributes()
-    ret = _getproperty(12, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMDocument ownerDocument
-  # document that contains the node
-  def ownerDocument()
-    ret = _getproperty(18, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR nodeTypeString
-  # the type of node in string form
-  def nodeTypeString()
-    ret = _getproperty(21, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR text
-  # text content of the node and subtree
-  def text()
-    ret = _getproperty(24, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BOOL specified
-  # indicates whether node is a default value
-  def specified()
-    ret = _getproperty(22, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode definition
-  # pointer to the definition of the node in the DTD or schema
-  def definition()
-    ret = _getproperty(23, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VARIANT nodeTypedValue
-  # get the strongly typed value of the node
-  def nodeTypedValue()
-    ret = _getproperty(25, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VARIANT dataType
-  # the data type of the node
-  def dataType()
-    ret = _getproperty(26, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR xml
-  # return the XML source for the node and each of its descendants
-  def xml()
-    ret = _getproperty(27, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BOOL parsed
-  # has sub-tree been completely parsed
-  def parsed()
-    ret = _getproperty(31, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR namespaceURI
-  # the URI for the namespace applying to the node
-  def namespaceURI()
-    ret = _getproperty(32, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR prefix
-  # the prefix for the namespace applying to the node
-  def prefix()
-    ret = _getproperty(33, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR baseName
-  # the base name of the node (nodename with the prefix stripped off)
-  def baseName()
-    ret = _getproperty(34, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID nodeValue
-  # value stored in the node
-  def nodeValue=(arg0)
-    ret = _setproperty(3, [arg0], [VT_VARIANT])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID text
-  # text content of the node and subtree
-  def text=(arg0)
-    ret = _setproperty(24, [arg0], [VT_BSTR])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID nodeTypedValue
-  # get the strongly typed value of the node
-  def nodeTypedValue=(arg0)
-    ret = _setproperty(25, [arg0], [VT_VARIANT])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID dataType
-  # the data type of the node
-  def dataType=(arg0)
-    ret = _setproperty(26, [arg0], [VT_VARIANT])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode insertBefore
-  # insert a child node
-  #   IXMLDOMNode arg0 --- newChild [IN]
-  #   VARIANT arg1 --- refChild [IN]
-  def insertBefore(arg0, arg1)
-    ret = _invoke(13, [arg0, arg1], [VT_BYREF|VT_DISPATCH, VT_VARIANT])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode replaceChild
-  # replace a child node
-  #   IXMLDOMNode arg0 --- newChild [IN]
-  #   IXMLDOMNode arg1 --- oldChild [IN]
-  def replaceChild(arg0, arg1)
-    ret = _invoke(14, [arg0, arg1], [VT_BYREF|VT_DISPATCH, VT_BYREF|VT_DISPATCH])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode removeChild
-  # remove a child node
-  #   IXMLDOMNode arg0 --- childNode [IN]
-  def removeChild(arg0)
-    ret = _invoke(15, [arg0], [VT_BYREF|VT_DISPATCH])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode appendChild
-  # append a child node
-  #   IXMLDOMNode arg0 --- newChild [IN]
-  def appendChild(arg0)
-    ret = _invoke(16, [arg0], [VT_BYREF|VT_DISPATCH])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BOOL hasChildNodes
-  def hasChildNodes()
-    ret = _invoke(17, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode cloneNode
-  #   BOOL arg0 --- deep [IN]
-  def cloneNode(arg0)
-    ret = _invoke(19, [arg0], [VT_BOOL])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR transformNode
-  # apply the stylesheet to the subtree
-  #   IXMLDOMNode arg0 --- stylesheet [IN]
-  def transformNode(arg0)
-    ret = _invoke(28, [arg0], [VT_BYREF|VT_DISPATCH])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNodeList selectNodes
-  # execute query on the subtree
-  #   BSTR arg0 --- queryString [IN]
-  def selectNodes(arg0)
-    ret = _invoke(29, [arg0], [VT_BSTR])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode selectSingleNode
-  # execute query on the subtree
-  #   BSTR arg0 --- queryString [IN]
-  def selectSingleNode(arg0)
-    ret = _invoke(30, [arg0], [VT_BSTR])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID transformNodeToObject
-  # apply the stylesheet to the subtree, returning the result through a document or a stream
-  #   IXMLDOMNode arg0 --- stylesheet [IN]
-  #   VARIANT arg1 --- outputObject [IN]
-  def transformNodeToObject(arg0, arg1)
-    ret = _invoke(35, [arg0, arg1], [VT_BYREF|VT_DISPATCH, VT_VARIANT])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-end
-
-#
-module IXMLDOMText
-  include WIN32OLE::VARIANT
-  attr_reader :lastargs
-
-  # BSTR nodeName
-  # name of the node
-  def nodeName()
-    ret = _getproperty(2, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VARIANT nodeValue
-  # value stored in the node
-  def nodeValue()
-    ret = _getproperty(3, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # DOMNodeType nodeType
-  # the node's type
-  def nodeType()
-    ret = _getproperty(4, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode parentNode
-  # parent of the node
-  def parentNode()
-    ret = _getproperty(6, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNodeList childNodes
-  # the collection of the node's children
-  def childNodes()
-    ret = _getproperty(7, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode firstChild
-  # first child of the node
-  def firstChild()
-    ret = _getproperty(8, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode lastChild
-  # first child of the node
-  def lastChild()
-    ret = _getproperty(9, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode previousSibling
-  # left sibling of the node
-  def previousSibling()
-    ret = _getproperty(10, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode nextSibling
-  # right sibling of the node
-  def nextSibling()
-    ret = _getproperty(11, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNamedNodeMap attributes
-  # the collection of the node's attributes
-  def attributes()
-    ret = _getproperty(12, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMDocument ownerDocument
-  # document that contains the node
-  def ownerDocument()
-    ret = _getproperty(18, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR nodeTypeString
-  # the type of node in string form
-  def nodeTypeString()
-    ret = _getproperty(21, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR text
-  # text content of the node and subtree
-  def text()
-    ret = _getproperty(24, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BOOL specified
-  # indicates whether node is a default value
-  def specified()
-    ret = _getproperty(22, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode definition
-  # pointer to the definition of the node in the DTD or schema
-  def definition()
-    ret = _getproperty(23, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VARIANT nodeTypedValue
-  # get the strongly typed value of the node
-  def nodeTypedValue()
-    ret = _getproperty(25, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VARIANT dataType
-  # the data type of the node
-  def dataType()
-    ret = _getproperty(26, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR xml
-  # return the XML source for the node and each of its descendants
-  def xml()
-    ret = _getproperty(27, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BOOL parsed
-  # has sub-tree been completely parsed
-  def parsed()
-    ret = _getproperty(31, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR namespaceURI
-  # the URI for the namespace applying to the node
-  def namespaceURI()
-    ret = _getproperty(32, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR prefix
-  # the prefix for the namespace applying to the node
-  def prefix()
-    ret = _getproperty(33, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR baseName
-  # the base name of the node (nodename with the prefix stripped off)
-  def baseName()
-    ret = _getproperty(34, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR data
-  # value of the node
-  def data()
-    ret = _getproperty(109, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # I4 length
-  # number of characters in value
-  def length()
-    ret = _getproperty(110, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID nodeValue
-  # value stored in the node
-  def nodeValue=(arg0)
-    ret = _setproperty(3, [arg0], [VT_VARIANT])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID text
-  # text content of the node and subtree
-  def text=(arg0)
-    ret = _setproperty(24, [arg0], [VT_BSTR])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID nodeTypedValue
-  # get the strongly typed value of the node
-  def nodeTypedValue=(arg0)
-    ret = _setproperty(25, [arg0], [VT_VARIANT])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID dataType
-  # the data type of the node
-  def dataType=(arg0)
-    ret = _setproperty(26, [arg0], [VT_VARIANT])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID data
-  # value of the node
-  def data=(arg0)
-    ret = _setproperty(109, [arg0], [VT_BSTR])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode insertBefore
-  # insert a child node
-  #   IXMLDOMNode arg0 --- newChild [IN]
-  #   VARIANT arg1 --- refChild [IN]
-  def insertBefore(arg0, arg1)
-    ret = _invoke(13, [arg0, arg1], [VT_BYREF|VT_DISPATCH, VT_VARIANT])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode replaceChild
-  # replace a child node
-  #   IXMLDOMNode arg0 --- newChild [IN]
-  #   IXMLDOMNode arg1 --- oldChild [IN]
-  def replaceChild(arg0, arg1)
-    ret = _invoke(14, [arg0, arg1], [VT_BYREF|VT_DISPATCH, VT_BYREF|VT_DISPATCH])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode removeChild
-  # remove a child node
-  #   IXMLDOMNode arg0 --- childNode [IN]
-  def removeChild(arg0)
-    ret = _invoke(15, [arg0], [VT_BYREF|VT_DISPATCH])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode appendChild
-  # append a child node
-  #   IXMLDOMNode arg0 --- newChild [IN]
-  def appendChild(arg0)
-    ret = _invoke(16, [arg0], [VT_BYREF|VT_DISPATCH])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BOOL hasChildNodes
-  def hasChildNodes()
-    ret = _invoke(17, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode cloneNode
-  #   BOOL arg0 --- deep [IN]
-  def cloneNode(arg0)
-    ret = _invoke(19, [arg0], [VT_BOOL])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR transformNode
-  # apply the stylesheet to the subtree
-  #   IXMLDOMNode arg0 --- stylesheet [IN]
-  def transformNode(arg0)
-    ret = _invoke(28, [arg0], [VT_BYREF|VT_DISPATCH])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNodeList selectNodes
-  # execute query on the subtree
-  #   BSTR arg0 --- queryString [IN]
-  def selectNodes(arg0)
-    ret = _invoke(29, [arg0], [VT_BSTR])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode selectSingleNode
-  # execute query on the subtree
-  #   BSTR arg0 --- queryString [IN]
-  def selectSingleNode(arg0)
-    ret = _invoke(30, [arg0], [VT_BSTR])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID transformNodeToObject
-  # apply the stylesheet to the subtree, returning the result through a document or a stream
-  #   IXMLDOMNode arg0 --- stylesheet [IN]
-  #   VARIANT arg1 --- outputObject [IN]
-  def transformNodeToObject(arg0, arg1)
-    ret = _invoke(35, [arg0, arg1], [VT_BYREF|VT_DISPATCH, VT_VARIANT])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR substringData
-  # retrieve substring of value
-  #   I4 arg0 --- offset [IN]
-  #   I4 arg1 --- count [IN]
-  def substringData(arg0, arg1)
-    ret = _invoke(111, [arg0, arg1], [VT_I4, VT_I4])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID appendData
-  # append string to value
-  #   BSTR arg0 --- data [IN]
-  def appendData(arg0)
-    ret = _invoke(112, [arg0], [VT_BSTR])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID insertData
-  # insert string into value
-  #   I4 arg0 --- offset [IN]
-  #   BSTR arg1 --- data [IN]
-  def insertData(arg0, arg1)
-    ret = _invoke(113, [arg0, arg1], [VT_I4, VT_BSTR])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID deleteData
-  # delete string within the value
-  #   I4 arg0 --- offset [IN]
-  #   I4 arg1 --- count [IN]
-  def deleteData(arg0, arg1)
-    ret = _invoke(114, [arg0, arg1], [VT_I4, VT_I4])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID replaceData
-  # replace string within the value
-  #   I4 arg0 --- offset [IN]
-  #   I4 arg1 --- count [IN]
-  #   BSTR arg2 --- data [IN]
-  def replaceData(arg0, arg1, arg2)
-    ret = _invoke(115, [arg0, arg1, arg2], [VT_I4, VT_I4, VT_BSTR])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMText splitText
-  # split the text node into two text nodes at the position specified
-  #   I4 arg0 --- offset [IN]
-  def splitText(arg0)
-    ret = _invoke(123, [arg0], [VT_I4])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-end
-
-#
-module IXMLDOMCharacterData
-  include WIN32OLE::VARIANT
-  attr_reader :lastargs
-
-  # BSTR nodeName
-  # name of the node
-  def nodeName()
-    ret = _getproperty(2, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VARIANT nodeValue
-  # value stored in the node
-  def nodeValue()
-    ret = _getproperty(3, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # DOMNodeType nodeType
-  # the node's type
-  def nodeType()
-    ret = _getproperty(4, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode parentNode
-  # parent of the node
-  def parentNode()
-    ret = _getproperty(6, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNodeList childNodes
-  # the collection of the node's children
-  def childNodes()
-    ret = _getproperty(7, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode firstChild
-  # first child of the node
-  def firstChild()
-    ret = _getproperty(8, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode lastChild
-  # first child of the node
-  def lastChild()
-    ret = _getproperty(9, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode previousSibling
-  # left sibling of the node
-  def previousSibling()
-    ret = _getproperty(10, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode nextSibling
-  # right sibling of the node
-  def nextSibling()
-    ret = _getproperty(11, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNamedNodeMap attributes
-  # the collection of the node's attributes
-  def attributes()
-    ret = _getproperty(12, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMDocument ownerDocument
-  # document that contains the node
-  def ownerDocument()
-    ret = _getproperty(18, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR nodeTypeString
-  # the type of node in string form
-  def nodeTypeString()
-    ret = _getproperty(21, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR text
-  # text content of the node and subtree
-  def text()
-    ret = _getproperty(24, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BOOL specified
-  # indicates whether node is a default value
-  def specified()
-    ret = _getproperty(22, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode definition
-  # pointer to the definition of the node in the DTD or schema
-  def definition()
-    ret = _getproperty(23, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VARIANT nodeTypedValue
-  # get the strongly typed value of the node
-  def nodeTypedValue()
-    ret = _getproperty(25, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VARIANT dataType
-  # the data type of the node
-  def dataType()
-    ret = _getproperty(26, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR xml
-  # return the XML source for the node and each of its descendants
-  def xml()
-    ret = _getproperty(27, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BOOL parsed
-  # has sub-tree been completely parsed
-  def parsed()
-    ret = _getproperty(31, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR namespaceURI
-  # the URI for the namespace applying to the node
-  def namespaceURI()
-    ret = _getproperty(32, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR prefix
-  # the prefix for the namespace applying to the node
-  def prefix()
-    ret = _getproperty(33, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR baseName
-  # the base name of the node (nodename with the prefix stripped off)
-  def baseName()
-    ret = _getproperty(34, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR data
-  # value of the node
-  def data()
-    ret = _getproperty(109, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # I4 length
-  # number of characters in value
-  def length()
-    ret = _getproperty(110, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID nodeValue
-  # value stored in the node
-  def nodeValue=(arg0)
-    ret = _setproperty(3, [arg0], [VT_VARIANT])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID text
-  # text content of the node and subtree
-  def text=(arg0)
-    ret = _setproperty(24, [arg0], [VT_BSTR])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID nodeTypedValue
-  # get the strongly typed value of the node
-  def nodeTypedValue=(arg0)
-    ret = _setproperty(25, [arg0], [VT_VARIANT])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID dataType
-  # the data type of the node
-  def dataType=(arg0)
-    ret = _setproperty(26, [arg0], [VT_VARIANT])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID data
-  # value of the node
-  def data=(arg0)
-    ret = _setproperty(109, [arg0], [VT_BSTR])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode insertBefore
-  # insert a child node
-  #   IXMLDOMNode arg0 --- newChild [IN]
-  #   VARIANT arg1 --- refChild [IN]
-  def insertBefore(arg0, arg1)
-    ret = _invoke(13, [arg0, arg1], [VT_BYREF|VT_DISPATCH, VT_VARIANT])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode replaceChild
-  # replace a child node
-  #   IXMLDOMNode arg0 --- newChild [IN]
-  #   IXMLDOMNode arg1 --- oldChild [IN]
-  def replaceChild(arg0, arg1)
-    ret = _invoke(14, [arg0, arg1], [VT_BYREF|VT_DISPATCH, VT_BYREF|VT_DISPATCH])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode removeChild
-  # remove a child node
-  #   IXMLDOMNode arg0 --- childNode [IN]
-  def removeChild(arg0)
-    ret = _invoke(15, [arg0], [VT_BYREF|VT_DISPATCH])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode appendChild
-  # append a child node
-  #   IXMLDOMNode arg0 --- newChild [IN]
-  def appendChild(arg0)
-    ret = _invoke(16, [arg0], [VT_BYREF|VT_DISPATCH])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BOOL hasChildNodes
-  def hasChildNodes()
-    ret = _invoke(17, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode cloneNode
-  #   BOOL arg0 --- deep [IN]
-  def cloneNode(arg0)
-    ret = _invoke(19, [arg0], [VT_BOOL])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR transformNode
-  # apply the stylesheet to the subtree
-  #   IXMLDOMNode arg0 --- stylesheet [IN]
-  def transformNode(arg0)
-    ret = _invoke(28, [arg0], [VT_BYREF|VT_DISPATCH])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNodeList selectNodes
-  # execute query on the subtree
-  #   BSTR arg0 --- queryString [IN]
-  def selectNodes(arg0)
-    ret = _invoke(29, [arg0], [VT_BSTR])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode selectSingleNode
-  # execute query on the subtree
-  #   BSTR arg0 --- queryString [IN]
-  def selectSingleNode(arg0)
-    ret = _invoke(30, [arg0], [VT_BSTR])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID transformNodeToObject
-  # apply the stylesheet to the subtree, returning the result through a document or a stream
-  #   IXMLDOMNode arg0 --- stylesheet [IN]
-  #   VARIANT arg1 --- outputObject [IN]
-  def transformNodeToObject(arg0, arg1)
-    ret = _invoke(35, [arg0, arg1], [VT_BYREF|VT_DISPATCH, VT_VARIANT])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR substringData
-  # retrieve substring of value
-  #   I4 arg0 --- offset [IN]
-  #   I4 arg1 --- count [IN]
-  def substringData(arg0, arg1)
-    ret = _invoke(111, [arg0, arg1], [VT_I4, VT_I4])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID appendData
-  # append string to value
-  #   BSTR arg0 --- data [IN]
-  def appendData(arg0)
-    ret = _invoke(112, [arg0], [VT_BSTR])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID insertData
-  # insert string into value
-  #   I4 arg0 --- offset [IN]
-  #   BSTR arg1 --- data [IN]
-  def insertData(arg0, arg1)
-    ret = _invoke(113, [arg0, arg1], [VT_I4, VT_BSTR])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID deleteData
-  # delete string within the value
-  #   I4 arg0 --- offset [IN]
-  #   I4 arg1 --- count [IN]
-  def deleteData(arg0, arg1)
-    ret = _invoke(114, [arg0, arg1], [VT_I4, VT_I4])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID replaceData
-  # replace string within the value
-  #   I4 arg0 --- offset [IN]
-  #   I4 arg1 --- count [IN]
-  #   BSTR arg2 --- data [IN]
-  def replaceData(arg0, arg1, arg2)
-    ret = _invoke(115, [arg0, arg1, arg2], [VT_I4, VT_I4, VT_BSTR])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-end
-
-#
-module IXMLDOMComment
-  include WIN32OLE::VARIANT
-  attr_reader :lastargs
-
-  # BSTR nodeName
-  # name of the node
-  def nodeName()
-    ret = _getproperty(2, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VARIANT nodeValue
-  # value stored in the node
-  def nodeValue()
-    ret = _getproperty(3, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # DOMNodeType nodeType
-  # the node's type
-  def nodeType()
-    ret = _getproperty(4, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode parentNode
-  # parent of the node
-  def parentNode()
-    ret = _getproperty(6, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNodeList childNodes
-  # the collection of the node's children
-  def childNodes()
-    ret = _getproperty(7, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode firstChild
-  # first child of the node
-  def firstChild()
-    ret = _getproperty(8, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode lastChild
-  # first child of the node
-  def lastChild()
-    ret = _getproperty(9, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode previousSibling
-  # left sibling of the node
-  def previousSibling()
-    ret = _getproperty(10, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode nextSibling
-  # right sibling of the node
-  def nextSibling()
-    ret = _getproperty(11, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNamedNodeMap attributes
-  # the collection of the node's attributes
-  def attributes()
-    ret = _getproperty(12, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMDocument ownerDocument
-  # document that contains the node
-  def ownerDocument()
-    ret = _getproperty(18, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR nodeTypeString
-  # the type of node in string form
-  def nodeTypeString()
-    ret = _getproperty(21, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR text
-  # text content of the node and subtree
-  def text()
-    ret = _getproperty(24, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BOOL specified
-  # indicates whether node is a default value
-  def specified()
-    ret = _getproperty(22, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode definition
-  # pointer to the definition of the node in the DTD or schema
-  def definition()
-    ret = _getproperty(23, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VARIANT nodeTypedValue
-  # get the strongly typed value of the node
-  def nodeTypedValue()
-    ret = _getproperty(25, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VARIANT dataType
-  # the data type of the node
-  def dataType()
-    ret = _getproperty(26, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR xml
-  # return the XML source for the node and each of its descendants
-  def xml()
-    ret = _getproperty(27, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BOOL parsed
-  # has sub-tree been completely parsed
-  def parsed()
-    ret = _getproperty(31, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR namespaceURI
-  # the URI for the namespace applying to the node
-  def namespaceURI()
-    ret = _getproperty(32, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR prefix
-  # the prefix for the namespace applying to the node
-  def prefix()
-    ret = _getproperty(33, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR baseName
-  # the base name of the node (nodename with the prefix stripped off)
-  def baseName()
-    ret = _getproperty(34, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR data
-  # value of the node
-  def data()
-    ret = _getproperty(109, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # I4 length
-  # number of characters in value
-  def length()
-    ret = _getproperty(110, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID nodeValue
-  # value stored in the node
-  def nodeValue=(arg0)
-    ret = _setproperty(3, [arg0], [VT_VARIANT])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID text
-  # text content of the node and subtree
-  def text=(arg0)
-    ret = _setproperty(24, [arg0], [VT_BSTR])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID nodeTypedValue
-  # get the strongly typed value of the node
-  def nodeTypedValue=(arg0)
-    ret = _setproperty(25, [arg0], [VT_VARIANT])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID dataType
-  # the data type of the node
-  def dataType=(arg0)
-    ret = _setproperty(26, [arg0], [VT_VARIANT])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID data
-  # value of the node
-  def data=(arg0)
-    ret = _setproperty(109, [arg0], [VT_BSTR])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode insertBefore
-  # insert a child node
-  #   IXMLDOMNode arg0 --- newChild [IN]
-  #   VARIANT arg1 --- refChild [IN]
-  def insertBefore(arg0, arg1)
-    ret = _invoke(13, [arg0, arg1], [VT_BYREF|VT_DISPATCH, VT_VARIANT])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode replaceChild
-  # replace a child node
-  #   IXMLDOMNode arg0 --- newChild [IN]
-  #   IXMLDOMNode arg1 --- oldChild [IN]
-  def replaceChild(arg0, arg1)
-    ret = _invoke(14, [arg0, arg1], [VT_BYREF|VT_DISPATCH, VT_BYREF|VT_DISPATCH])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode removeChild
-  # remove a child node
-  #   IXMLDOMNode arg0 --- childNode [IN]
-  def removeChild(arg0)
-    ret = _invoke(15, [arg0], [VT_BYREF|VT_DISPATCH])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode appendChild
-  # append a child node
-  #   IXMLDOMNode arg0 --- newChild [IN]
-  def appendChild(arg0)
-    ret = _invoke(16, [arg0], [VT_BYREF|VT_DISPATCH])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BOOL hasChildNodes
-  def hasChildNodes()
-    ret = _invoke(17, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode cloneNode
-  #   BOOL arg0 --- deep [IN]
-  def cloneNode(arg0)
-    ret = _invoke(19, [arg0], [VT_BOOL])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR transformNode
-  # apply the stylesheet to the subtree
-  #   IXMLDOMNode arg0 --- stylesheet [IN]
-  def transformNode(arg0)
-    ret = _invoke(28, [arg0], [VT_BYREF|VT_DISPATCH])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNodeList selectNodes
-  # execute query on the subtree
-  #   BSTR arg0 --- queryString [IN]
-  def selectNodes(arg0)
-    ret = _invoke(29, [arg0], [VT_BSTR])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode selectSingleNode
-  # execute query on the subtree
-  #   BSTR arg0 --- queryString [IN]
-  def selectSingleNode(arg0)
-    ret = _invoke(30, [arg0], [VT_BSTR])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID transformNodeToObject
-  # apply the stylesheet to the subtree, returning the result through a document or a stream
-  #   IXMLDOMNode arg0 --- stylesheet [IN]
-  #   VARIANT arg1 --- outputObject [IN]
-  def transformNodeToObject(arg0, arg1)
-    ret = _invoke(35, [arg0, arg1], [VT_BYREF|VT_DISPATCH, VT_VARIANT])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR substringData
-  # retrieve substring of value
-  #   I4 arg0 --- offset [IN]
-  #   I4 arg1 --- count [IN]
-  def substringData(arg0, arg1)
-    ret = _invoke(111, [arg0, arg1], [VT_I4, VT_I4])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID appendData
-  # append string to value
-  #   BSTR arg0 --- data [IN]
-  def appendData(arg0)
-    ret = _invoke(112, [arg0], [VT_BSTR])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID insertData
-  # insert string into value
-  #   I4 arg0 --- offset [IN]
-  #   BSTR arg1 --- data [IN]
-  def insertData(arg0, arg1)
-    ret = _invoke(113, [arg0, arg1], [VT_I4, VT_BSTR])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID deleteData
-  # delete string within the value
-  #   I4 arg0 --- offset [IN]
-  #   I4 arg1 --- count [IN]
-  def deleteData(arg0, arg1)
-    ret = _invoke(114, [arg0, arg1], [VT_I4, VT_I4])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID replaceData
-  # replace string within the value
-  #   I4 arg0 --- offset [IN]
-  #   I4 arg1 --- count [IN]
-  #   BSTR arg2 --- data [IN]
-  def replaceData(arg0, arg1, arg2)
-    ret = _invoke(115, [arg0, arg1, arg2], [VT_I4, VT_I4, VT_BSTR])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-end
-
-#
-module IXMLDOMCDATASection
-  include WIN32OLE::VARIANT
-  attr_reader :lastargs
-
-  # BSTR nodeName
-  # name of the node
-  def nodeName()
-    ret = _getproperty(2, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VARIANT nodeValue
-  # value stored in the node
-  def nodeValue()
-    ret = _getproperty(3, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # DOMNodeType nodeType
-  # the node's type
-  def nodeType()
-    ret = _getproperty(4, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode parentNode
-  # parent of the node
-  def parentNode()
-    ret = _getproperty(6, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNodeList childNodes
-  # the collection of the node's children
-  def childNodes()
-    ret = _getproperty(7, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode firstChild
-  # first child of the node
-  def firstChild()
-    ret = _getproperty(8, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode lastChild
-  # first child of the node
-  def lastChild()
-    ret = _getproperty(9, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode previousSibling
-  # left sibling of the node
-  def previousSibling()
-    ret = _getproperty(10, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode nextSibling
-  # right sibling of the node
-  def nextSibling()
-    ret = _getproperty(11, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNamedNodeMap attributes
-  # the collection of the node's attributes
-  def attributes()
-    ret = _getproperty(12, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMDocument ownerDocument
-  # document that contains the node
-  def ownerDocument()
-    ret = _getproperty(18, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR nodeTypeString
-  # the type of node in string form
-  def nodeTypeString()
-    ret = _getproperty(21, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR text
-  # text content of the node and subtree
-  def text()
-    ret = _getproperty(24, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BOOL specified
-  # indicates whether node is a default value
-  def specified()
-    ret = _getproperty(22, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode definition
-  # pointer to the definition of the node in the DTD or schema
-  def definition()
-    ret = _getproperty(23, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VARIANT nodeTypedValue
-  # get the strongly typed value of the node
-  def nodeTypedValue()
-    ret = _getproperty(25, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VARIANT dataType
-  # the data type of the node
-  def dataType()
-    ret = _getproperty(26, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR xml
-  # return the XML source for the node and each of its descendants
-  def xml()
-    ret = _getproperty(27, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BOOL parsed
-  # has sub-tree been completely parsed
-  def parsed()
-    ret = _getproperty(31, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR namespaceURI
-  # the URI for the namespace applying to the node
-  def namespaceURI()
-    ret = _getproperty(32, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR prefix
-  # the prefix for the namespace applying to the node
-  def prefix()
-    ret = _getproperty(33, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR baseName
-  # the base name of the node (nodename with the prefix stripped off)
-  def baseName()
-    ret = _getproperty(34, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR data
-  # value of the node
-  def data()
-    ret = _getproperty(109, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # I4 length
-  # number of characters in value
-  def length()
-    ret = _getproperty(110, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID nodeValue
-  # value stored in the node
-  def nodeValue=(arg0)
-    ret = _setproperty(3, [arg0], [VT_VARIANT])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID text
-  # text content of the node and subtree
-  def text=(arg0)
-    ret = _setproperty(24, [arg0], [VT_BSTR])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID nodeTypedValue
-  # get the strongly typed value of the node
-  def nodeTypedValue=(arg0)
-    ret = _setproperty(25, [arg0], [VT_VARIANT])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID dataType
-  # the data type of the node
-  def dataType=(arg0)
-    ret = _setproperty(26, [arg0], [VT_VARIANT])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID data
-  # value of the node
-  def data=(arg0)
-    ret = _setproperty(109, [arg0], [VT_BSTR])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode insertBefore
-  # insert a child node
-  #   IXMLDOMNode arg0 --- newChild [IN]
-  #   VARIANT arg1 --- refChild [IN]
-  def insertBefore(arg0, arg1)
-    ret = _invoke(13, [arg0, arg1], [VT_BYREF|VT_DISPATCH, VT_VARIANT])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode replaceChild
-  # replace a child node
-  #   IXMLDOMNode arg0 --- newChild [IN]
-  #   IXMLDOMNode arg1 --- oldChild [IN]
-  def replaceChild(arg0, arg1)
-    ret = _invoke(14, [arg0, arg1], [VT_BYREF|VT_DISPATCH, VT_BYREF|VT_DISPATCH])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode removeChild
-  # remove a child node
-  #   IXMLDOMNode arg0 --- childNode [IN]
-  def removeChild(arg0)
-    ret = _invoke(15, [arg0], [VT_BYREF|VT_DISPATCH])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode appendChild
-  # append a child node
-  #   IXMLDOMNode arg0 --- newChild [IN]
-  def appendChild(arg0)
-    ret = _invoke(16, [arg0], [VT_BYREF|VT_DISPATCH])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BOOL hasChildNodes
-  def hasChildNodes()
-    ret = _invoke(17, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode cloneNode
-  #   BOOL arg0 --- deep [IN]
-  def cloneNode(arg0)
-    ret = _invoke(19, [arg0], [VT_BOOL])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR transformNode
-  # apply the stylesheet to the subtree
-  #   IXMLDOMNode arg0 --- stylesheet [IN]
-  def transformNode(arg0)
-    ret = _invoke(28, [arg0], [VT_BYREF|VT_DISPATCH])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNodeList selectNodes
-  # execute query on the subtree
-  #   BSTR arg0 --- queryString [IN]
-  def selectNodes(arg0)
-    ret = _invoke(29, [arg0], [VT_BSTR])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode selectSingleNode
-  # execute query on the subtree
-  #   BSTR arg0 --- queryString [IN]
-  def selectSingleNode(arg0)
-    ret = _invoke(30, [arg0], [VT_BSTR])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID transformNodeToObject
-  # apply the stylesheet to the subtree, returning the result through a document or a stream
-  #   IXMLDOMNode arg0 --- stylesheet [IN]
-  #   VARIANT arg1 --- outputObject [IN]
-  def transformNodeToObject(arg0, arg1)
-    ret = _invoke(35, [arg0, arg1], [VT_BYREF|VT_DISPATCH, VT_VARIANT])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR substringData
-  # retrieve substring of value
-  #   I4 arg0 --- offset [IN]
-  #   I4 arg1 --- count [IN]
-  def substringData(arg0, arg1)
-    ret = _invoke(111, [arg0, arg1], [VT_I4, VT_I4])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID appendData
-  # append string to value
-  #   BSTR arg0 --- data [IN]
-  def appendData(arg0)
-    ret = _invoke(112, [arg0], [VT_BSTR])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID insertData
-  # insert string into value
-  #   I4 arg0 --- offset [IN]
-  #   BSTR arg1 --- data [IN]
-  def insertData(arg0, arg1)
-    ret = _invoke(113, [arg0, arg1], [VT_I4, VT_BSTR])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID deleteData
-  # delete string within the value
-  #   I4 arg0 --- offset [IN]
-  #   I4 arg1 --- count [IN]
-  def deleteData(arg0, arg1)
-    ret = _invoke(114, [arg0, arg1], [VT_I4, VT_I4])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID replaceData
-  # replace string within the value
-  #   I4 arg0 --- offset [IN]
-  #   I4 arg1 --- count [IN]
-  #   BSTR arg2 --- data [IN]
-  def replaceData(arg0, arg1, arg2)
-    ret = _invoke(115, [arg0, arg1, arg2], [VT_I4, VT_I4, VT_BSTR])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMText splitText
-  # split the text node into two text nodes at the position specified
-  #   I4 arg0 --- offset [IN]
-  def splitText(arg0)
-    ret = _invoke(123, [arg0], [VT_I4])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-end
-
-#
-module IXMLDOMProcessingInstruction
-  include WIN32OLE::VARIANT
-  attr_reader :lastargs
-
-  # BSTR nodeName
-  # name of the node
-  def nodeName()
-    ret = _getproperty(2, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VARIANT nodeValue
-  # value stored in the node
-  def nodeValue()
-    ret = _getproperty(3, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # DOMNodeType nodeType
-  # the node's type
-  def nodeType()
-    ret = _getproperty(4, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode parentNode
-  # parent of the node
-  def parentNode()
-    ret = _getproperty(6, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNodeList childNodes
-  # the collection of the node's children
-  def childNodes()
-    ret = _getproperty(7, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode firstChild
-  # first child of the node
-  def firstChild()
-    ret = _getproperty(8, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode lastChild
-  # first child of the node
-  def lastChild()
-    ret = _getproperty(9, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode previousSibling
-  # left sibling of the node
-  def previousSibling()
-    ret = _getproperty(10, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode nextSibling
-  # right sibling of the node
-  def nextSibling()
-    ret = _getproperty(11, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNamedNodeMap attributes
-  # the collection of the node's attributes
-  def attributes()
-    ret = _getproperty(12, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMDocument ownerDocument
-  # document that contains the node
-  def ownerDocument()
-    ret = _getproperty(18, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR nodeTypeString
-  # the type of node in string form
-  def nodeTypeString()
-    ret = _getproperty(21, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR text
-  # text content of the node and subtree
-  def text()
-    ret = _getproperty(24, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BOOL specified
-  # indicates whether node is a default value
-  def specified()
-    ret = _getproperty(22, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode definition
-  # pointer to the definition of the node in the DTD or schema
-  def definition()
-    ret = _getproperty(23, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VARIANT nodeTypedValue
-  # get the strongly typed value of the node
-  def nodeTypedValue()
-    ret = _getproperty(25, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VARIANT dataType
-  # the data type of the node
-  def dataType()
-    ret = _getproperty(26, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR xml
-  # return the XML source for the node and each of its descendants
-  def xml()
-    ret = _getproperty(27, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BOOL parsed
-  # has sub-tree been completely parsed
-  def parsed()
-    ret = _getproperty(31, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR namespaceURI
-  # the URI for the namespace applying to the node
-  def namespaceURI()
-    ret = _getproperty(32, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR prefix
-  # the prefix for the namespace applying to the node
-  def prefix()
-    ret = _getproperty(33, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR baseName
-  # the base name of the node (nodename with the prefix stripped off)
-  def baseName()
-    ret = _getproperty(34, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR target
-  # the target
-  def target()
-    ret = _getproperty(127, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR data
-  # the data
-  def data()
-    ret = _getproperty(128, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID nodeValue
-  # value stored in the node
-  def nodeValue=(arg0)
-    ret = _setproperty(3, [arg0], [VT_VARIANT])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID text
-  # text content of the node and subtree
-  def text=(arg0)
-    ret = _setproperty(24, [arg0], [VT_BSTR])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID nodeTypedValue
-  # get the strongly typed value of the node
-  def nodeTypedValue=(arg0)
-    ret = _setproperty(25, [arg0], [VT_VARIANT])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID dataType
-  # the data type of the node
-  def dataType=(arg0)
-    ret = _setproperty(26, [arg0], [VT_VARIANT])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID data
-  # the data
-  def data=(arg0)
-    ret = _setproperty(128, [arg0], [VT_BSTR])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode insertBefore
-  # insert a child node
-  #   IXMLDOMNode arg0 --- newChild [IN]
-  #   VARIANT arg1 --- refChild [IN]
-  def insertBefore(arg0, arg1)
-    ret = _invoke(13, [arg0, arg1], [VT_BYREF|VT_DISPATCH, VT_VARIANT])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode replaceChild
-  # replace a child node
-  #   IXMLDOMNode arg0 --- newChild [IN]
-  #   IXMLDOMNode arg1 --- oldChild [IN]
-  def replaceChild(arg0, arg1)
-    ret = _invoke(14, [arg0, arg1], [VT_BYREF|VT_DISPATCH, VT_BYREF|VT_DISPATCH])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode removeChild
-  # remove a child node
-  #   IXMLDOMNode arg0 --- childNode [IN]
-  def removeChild(arg0)
-    ret = _invoke(15, [arg0], [VT_BYREF|VT_DISPATCH])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode appendChild
-  # append a child node
-  #   IXMLDOMNode arg0 --- newChild [IN]
-  def appendChild(arg0)
-    ret = _invoke(16, [arg0], [VT_BYREF|VT_DISPATCH])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BOOL hasChildNodes
-  def hasChildNodes()
-    ret = _invoke(17, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode cloneNode
-  #   BOOL arg0 --- deep [IN]
-  def cloneNode(arg0)
-    ret = _invoke(19, [arg0], [VT_BOOL])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR transformNode
-  # apply the stylesheet to the subtree
-  #   IXMLDOMNode arg0 --- stylesheet [IN]
-  def transformNode(arg0)
-    ret = _invoke(28, [arg0], [VT_BYREF|VT_DISPATCH])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNodeList selectNodes
-  # execute query on the subtree
-  #   BSTR arg0 --- queryString [IN]
-  def selectNodes(arg0)
-    ret = _invoke(29, [arg0], [VT_BSTR])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode selectSingleNode
-  # execute query on the subtree
-  #   BSTR arg0 --- queryString [IN]
-  def selectSingleNode(arg0)
-    ret = _invoke(30, [arg0], [VT_BSTR])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID transformNodeToObject
-  # apply the stylesheet to the subtree, returning the result through a document or a stream
-  #   IXMLDOMNode arg0 --- stylesheet [IN]
-  #   VARIANT arg1 --- outputObject [IN]
-  def transformNodeToObject(arg0, arg1)
-    ret = _invoke(35, [arg0, arg1], [VT_BYREF|VT_DISPATCH, VT_VARIANT])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-end
-
-#
-module IXMLDOMEntityReference
-  include WIN32OLE::VARIANT
-  attr_reader :lastargs
-
-  # BSTR nodeName
-  # name of the node
-  def nodeName()
-    ret = _getproperty(2, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VARIANT nodeValue
-  # value stored in the node
-  def nodeValue()
-    ret = _getproperty(3, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # DOMNodeType nodeType
-  # the node's type
-  def nodeType()
-    ret = _getproperty(4, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode parentNode
-  # parent of the node
-  def parentNode()
-    ret = _getproperty(6, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNodeList childNodes
-  # the collection of the node's children
-  def childNodes()
-    ret = _getproperty(7, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode firstChild
-  # first child of the node
-  def firstChild()
-    ret = _getproperty(8, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode lastChild
-  # first child of the node
-  def lastChild()
-    ret = _getproperty(9, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode previousSibling
-  # left sibling of the node
-  def previousSibling()
-    ret = _getproperty(10, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode nextSibling
-  # right sibling of the node
-  def nextSibling()
-    ret = _getproperty(11, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNamedNodeMap attributes
-  # the collection of the node's attributes
-  def attributes()
-    ret = _getproperty(12, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMDocument ownerDocument
-  # document that contains the node
-  def ownerDocument()
-    ret = _getproperty(18, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR nodeTypeString
-  # the type of node in string form
-  def nodeTypeString()
-    ret = _getproperty(21, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR text
-  # text content of the node and subtree
-  def text()
-    ret = _getproperty(24, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BOOL specified
-  # indicates whether node is a default value
-  def specified()
-    ret = _getproperty(22, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode definition
-  # pointer to the definition of the node in the DTD or schema
-  def definition()
-    ret = _getproperty(23, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VARIANT nodeTypedValue
-  # get the strongly typed value of the node
-  def nodeTypedValue()
-    ret = _getproperty(25, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VARIANT dataType
-  # the data type of the node
-  def dataType()
-    ret = _getproperty(26, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR xml
-  # return the XML source for the node and each of its descendants
-  def xml()
-    ret = _getproperty(27, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BOOL parsed
-  # has sub-tree been completely parsed
-  def parsed()
-    ret = _getproperty(31, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR namespaceURI
-  # the URI for the namespace applying to the node
-  def namespaceURI()
-    ret = _getproperty(32, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR prefix
-  # the prefix for the namespace applying to the node
-  def prefix()
-    ret = _getproperty(33, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR baseName
-  # the base name of the node (nodename with the prefix stripped off)
-  def baseName()
-    ret = _getproperty(34, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID nodeValue
-  # value stored in the node
-  def nodeValue=(arg0)
-    ret = _setproperty(3, [arg0], [VT_VARIANT])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID text
-  # text content of the node and subtree
-  def text=(arg0)
-    ret = _setproperty(24, [arg0], [VT_BSTR])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID nodeTypedValue
-  # get the strongly typed value of the node
-  def nodeTypedValue=(arg0)
-    ret = _setproperty(25, [arg0], [VT_VARIANT])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID dataType
-  # the data type of the node
-  def dataType=(arg0)
-    ret = _setproperty(26, [arg0], [VT_VARIANT])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode insertBefore
-  # insert a child node
-  #   IXMLDOMNode arg0 --- newChild [IN]
-  #   VARIANT arg1 --- refChild [IN]
-  def insertBefore(arg0, arg1)
-    ret = _invoke(13, [arg0, arg1], [VT_BYREF|VT_DISPATCH, VT_VARIANT])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode replaceChild
-  # replace a child node
-  #   IXMLDOMNode arg0 --- newChild [IN]
-  #   IXMLDOMNode arg1 --- oldChild [IN]
-  def replaceChild(arg0, arg1)
-    ret = _invoke(14, [arg0, arg1], [VT_BYREF|VT_DISPATCH, VT_BYREF|VT_DISPATCH])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode removeChild
-  # remove a child node
-  #   IXMLDOMNode arg0 --- childNode [IN]
-  def removeChild(arg0)
-    ret = _invoke(15, [arg0], [VT_BYREF|VT_DISPATCH])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode appendChild
-  # append a child node
-  #   IXMLDOMNode arg0 --- newChild [IN]
-  def appendChild(arg0)
-    ret = _invoke(16, [arg0], [VT_BYREF|VT_DISPATCH])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BOOL hasChildNodes
-  def hasChildNodes()
-    ret = _invoke(17, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode cloneNode
-  #   BOOL arg0 --- deep [IN]
-  def cloneNode(arg0)
-    ret = _invoke(19, [arg0], [VT_BOOL])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR transformNode
-  # apply the stylesheet to the subtree
-  #   IXMLDOMNode arg0 --- stylesheet [IN]
-  def transformNode(arg0)
-    ret = _invoke(28, [arg0], [VT_BYREF|VT_DISPATCH])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNodeList selectNodes
-  # execute query on the subtree
-  #   BSTR arg0 --- queryString [IN]
-  def selectNodes(arg0)
-    ret = _invoke(29, [arg0], [VT_BSTR])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode selectSingleNode
-  # execute query on the subtree
-  #   BSTR arg0 --- queryString [IN]
-  def selectSingleNode(arg0)
-    ret = _invoke(30, [arg0], [VT_BSTR])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID transformNodeToObject
-  # apply the stylesheet to the subtree, returning the result through a document or a stream
-  #   IXMLDOMNode arg0 --- stylesheet [IN]
-  #   VARIANT arg1 --- outputObject [IN]
-  def transformNodeToObject(arg0, arg1)
-    ret = _invoke(35, [arg0, arg1], [VT_BYREF|VT_DISPATCH, VT_VARIANT])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-end
-
-# structure for reporting parser errors
-module IXMLDOMParseError
-  include WIN32OLE::VARIANT
-  attr_reader :lastargs
-
-  # I4 errorCode
-  # the error code
-  def errorCode()
-    ret = _getproperty(0, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR url
-  # the URL of the XML document containing the error
-  def url()
-    ret = _getproperty(179, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR reason
-  # the cause of the error
-  def reason()
-    ret = _getproperty(180, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR srcText
-  # the data where the error occurred
-  def srcText()
-    ret = _getproperty(181, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # I4 line
-  # the line number in the XML document where the error occurred
-  def line()
-    ret = _getproperty(182, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # I4 linepos
-  # the character position in the line containing the error
-  def linepos()
-    ret = _getproperty(183, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # I4 filepos
-  # the absolute file position in the XML document containing the error
-  def filepos()
-    ret = _getproperty(184, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-end
-
-#
-module IXMLDOMNotation
-  include WIN32OLE::VARIANT
-  attr_reader :lastargs
-
-  # BSTR nodeName
-  # name of the node
-  def nodeName()
-    ret = _getproperty(2, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VARIANT nodeValue
-  # value stored in the node
-  def nodeValue()
-    ret = _getproperty(3, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # DOMNodeType nodeType
-  # the node's type
-  def nodeType()
-    ret = _getproperty(4, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode parentNode
-  # parent of the node
-  def parentNode()
-    ret = _getproperty(6, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNodeList childNodes
-  # the collection of the node's children
-  def childNodes()
-    ret = _getproperty(7, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode firstChild
-  # first child of the node
-  def firstChild()
-    ret = _getproperty(8, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode lastChild
-  # first child of the node
-  def lastChild()
-    ret = _getproperty(9, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode previousSibling
-  # left sibling of the node
-  def previousSibling()
-    ret = _getproperty(10, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode nextSibling
-  # right sibling of the node
-  def nextSibling()
-    ret = _getproperty(11, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNamedNodeMap attributes
-  # the collection of the node's attributes
-  def attributes()
-    ret = _getproperty(12, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMDocument ownerDocument
-  # document that contains the node
-  def ownerDocument()
-    ret = _getproperty(18, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR nodeTypeString
-  # the type of node in string form
-  def nodeTypeString()
-    ret = _getproperty(21, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR text
-  # text content of the node and subtree
-  def text()
-    ret = _getproperty(24, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BOOL specified
-  # indicates whether node is a default value
-  def specified()
-    ret = _getproperty(22, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode definition
-  # pointer to the definition of the node in the DTD or schema
-  def definition()
-    ret = _getproperty(23, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VARIANT nodeTypedValue
-  # get the strongly typed value of the node
-  def nodeTypedValue()
-    ret = _getproperty(25, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VARIANT dataType
-  # the data type of the node
-  def dataType()
-    ret = _getproperty(26, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR xml
-  # return the XML source for the node and each of its descendants
-  def xml()
-    ret = _getproperty(27, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BOOL parsed
-  # has sub-tree been completely parsed
-  def parsed()
-    ret = _getproperty(31, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR namespaceURI
-  # the URI for the namespace applying to the node
-  def namespaceURI()
-    ret = _getproperty(32, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR prefix
-  # the prefix for the namespace applying to the node
-  def prefix()
-    ret = _getproperty(33, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR baseName
-  # the base name of the node (nodename with the prefix stripped off)
-  def baseName()
-    ret = _getproperty(34, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VARIANT publicId
-  # the public ID
-  def publicId()
-    ret = _getproperty(136, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VARIANT systemId
-  # the system ID
-  def systemId()
-    ret = _getproperty(137, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID nodeValue
-  # value stored in the node
-  def nodeValue=(arg0)
-    ret = _setproperty(3, [arg0], [VT_VARIANT])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID text
-  # text content of the node and subtree
-  def text=(arg0)
-    ret = _setproperty(24, [arg0], [VT_BSTR])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID nodeTypedValue
-  # get the strongly typed value of the node
-  def nodeTypedValue=(arg0)
-    ret = _setproperty(25, [arg0], [VT_VARIANT])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID dataType
-  # the data type of the node
-  def dataType=(arg0)
-    ret = _setproperty(26, [arg0], [VT_VARIANT])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode insertBefore
-  # insert a child node
-  #   IXMLDOMNode arg0 --- newChild [IN]
-  #   VARIANT arg1 --- refChild [IN]
-  def insertBefore(arg0, arg1)
-    ret = _invoke(13, [arg0, arg1], [VT_BYREF|VT_DISPATCH, VT_VARIANT])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode replaceChild
-  # replace a child node
-  #   IXMLDOMNode arg0 --- newChild [IN]
-  #   IXMLDOMNode arg1 --- oldChild [IN]
-  def replaceChild(arg0, arg1)
-    ret = _invoke(14, [arg0, arg1], [VT_BYREF|VT_DISPATCH, VT_BYREF|VT_DISPATCH])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode removeChild
-  # remove a child node
-  #   IXMLDOMNode arg0 --- childNode [IN]
-  def removeChild(arg0)
-    ret = _invoke(15, [arg0], [VT_BYREF|VT_DISPATCH])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode appendChild
-  # append a child node
-  #   IXMLDOMNode arg0 --- newChild [IN]
-  def appendChild(arg0)
-    ret = _invoke(16, [arg0], [VT_BYREF|VT_DISPATCH])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BOOL hasChildNodes
-  def hasChildNodes()
-    ret = _invoke(17, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode cloneNode
-  #   BOOL arg0 --- deep [IN]
-  def cloneNode(arg0)
-    ret = _invoke(19, [arg0], [VT_BOOL])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR transformNode
-  # apply the stylesheet to the subtree
-  #   IXMLDOMNode arg0 --- stylesheet [IN]
-  def transformNode(arg0)
-    ret = _invoke(28, [arg0], [VT_BYREF|VT_DISPATCH])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNodeList selectNodes
-  # execute query on the subtree
-  #   BSTR arg0 --- queryString [IN]
-  def selectNodes(arg0)
-    ret = _invoke(29, [arg0], [VT_BSTR])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode selectSingleNode
-  # execute query on the subtree
-  #   BSTR arg0 --- queryString [IN]
-  def selectSingleNode(arg0)
-    ret = _invoke(30, [arg0], [VT_BSTR])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID transformNodeToObject
-  # apply the stylesheet to the subtree, returning the result through a document or a stream
-  #   IXMLDOMNode arg0 --- stylesheet [IN]
-  #   VARIANT arg1 --- outputObject [IN]
-  def transformNodeToObject(arg0, arg1)
-    ret = _invoke(35, [arg0, arg1], [VT_BYREF|VT_DISPATCH, VT_VARIANT])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-end
-
-#
-module IXMLDOMEntity
-  include WIN32OLE::VARIANT
-  attr_reader :lastargs
-
-  # BSTR nodeName
-  # name of the node
-  def nodeName()
-    ret = _getproperty(2, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VARIANT nodeValue
-  # value stored in the node
-  def nodeValue()
-    ret = _getproperty(3, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # DOMNodeType nodeType
-  # the node's type
-  def nodeType()
-    ret = _getproperty(4, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode parentNode
-  # parent of the node
-  def parentNode()
-    ret = _getproperty(6, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNodeList childNodes
-  # the collection of the node's children
-  def childNodes()
-    ret = _getproperty(7, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode firstChild
-  # first child of the node
-  def firstChild()
-    ret = _getproperty(8, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode lastChild
-  # first child of the node
-  def lastChild()
-    ret = _getproperty(9, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode previousSibling
-  # left sibling of the node
-  def previousSibling()
-    ret = _getproperty(10, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode nextSibling
-  # right sibling of the node
-  def nextSibling()
-    ret = _getproperty(11, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNamedNodeMap attributes
-  # the collection of the node's attributes
-  def attributes()
-    ret = _getproperty(12, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMDocument ownerDocument
-  # document that contains the node
-  def ownerDocument()
-    ret = _getproperty(18, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR nodeTypeString
-  # the type of node in string form
-  def nodeTypeString()
-    ret = _getproperty(21, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR text
-  # text content of the node and subtree
-  def text()
-    ret = _getproperty(24, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BOOL specified
-  # indicates whether node is a default value
-  def specified()
-    ret = _getproperty(22, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode definition
-  # pointer to the definition of the node in the DTD or schema
-  def definition()
-    ret = _getproperty(23, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VARIANT nodeTypedValue
-  # get the strongly typed value of the node
-  def nodeTypedValue()
-    ret = _getproperty(25, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VARIANT dataType
-  # the data type of the node
-  def dataType()
-    ret = _getproperty(26, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR xml
-  # return the XML source for the node and each of its descendants
-  def xml()
-    ret = _getproperty(27, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BOOL parsed
-  # has sub-tree been completely parsed
-  def parsed()
-    ret = _getproperty(31, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR namespaceURI
-  # the URI for the namespace applying to the node
-  def namespaceURI()
-    ret = _getproperty(32, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR prefix
-  # the prefix for the namespace applying to the node
-  def prefix()
-    ret = _getproperty(33, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR baseName
-  # the base name of the node (nodename with the prefix stripped off)
-  def baseName()
-    ret = _getproperty(34, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VARIANT publicId
-  # the public ID
-  def publicId()
-    ret = _getproperty(140, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VARIANT systemId
-  # the system ID
-  def systemId()
-    ret = _getproperty(141, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR notationName
-  # the name of the notation
-  def notationName()
-    ret = _getproperty(142, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID nodeValue
-  # value stored in the node
-  def nodeValue=(arg0)
-    ret = _setproperty(3, [arg0], [VT_VARIANT])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID text
-  # text content of the node and subtree
-  def text=(arg0)
-    ret = _setproperty(24, [arg0], [VT_BSTR])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID nodeTypedValue
-  # get the strongly typed value of the node
-  def nodeTypedValue=(arg0)
-    ret = _setproperty(25, [arg0], [VT_VARIANT])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID dataType
-  # the data type of the node
-  def dataType=(arg0)
-    ret = _setproperty(26, [arg0], [VT_VARIANT])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode insertBefore
-  # insert a child node
-  #   IXMLDOMNode arg0 --- newChild [IN]
-  #   VARIANT arg1 --- refChild [IN]
-  def insertBefore(arg0, arg1)
-    ret = _invoke(13, [arg0, arg1], [VT_BYREF|VT_DISPATCH, VT_VARIANT])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode replaceChild
-  # replace a child node
-  #   IXMLDOMNode arg0 --- newChild [IN]
-  #   IXMLDOMNode arg1 --- oldChild [IN]
-  def replaceChild(arg0, arg1)
-    ret = _invoke(14, [arg0, arg1], [VT_BYREF|VT_DISPATCH, VT_BYREF|VT_DISPATCH])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode removeChild
-  # remove a child node
-  #   IXMLDOMNode arg0 --- childNode [IN]
-  def removeChild(arg0)
-    ret = _invoke(15, [arg0], [VT_BYREF|VT_DISPATCH])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode appendChild
-  # append a child node
-  #   IXMLDOMNode arg0 --- newChild [IN]
-  def appendChild(arg0)
-    ret = _invoke(16, [arg0], [VT_BYREF|VT_DISPATCH])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BOOL hasChildNodes
-  def hasChildNodes()
-    ret = _invoke(17, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode cloneNode
-  #   BOOL arg0 --- deep [IN]
-  def cloneNode(arg0)
-    ret = _invoke(19, [arg0], [VT_BOOL])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR transformNode
-  # apply the stylesheet to the subtree
-  #   IXMLDOMNode arg0 --- stylesheet [IN]
-  def transformNode(arg0)
-    ret = _invoke(28, [arg0], [VT_BYREF|VT_DISPATCH])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNodeList selectNodes
-  # execute query on the subtree
-  #   BSTR arg0 --- queryString [IN]
-  def selectNodes(arg0)
-    ret = _invoke(29, [arg0], [VT_BSTR])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode selectSingleNode
-  # execute query on the subtree
-  #   BSTR arg0 --- queryString [IN]
-  def selectSingleNode(arg0)
-    ret = _invoke(30, [arg0], [VT_BSTR])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID transformNodeToObject
-  # apply the stylesheet to the subtree, returning the result through a document or a stream
-  #   IXMLDOMNode arg0 --- stylesheet [IN]
-  #   VARIANT arg1 --- outputObject [IN]
-  def transformNodeToObject(arg0, arg1)
-    ret = _invoke(35, [arg0, arg1], [VT_BYREF|VT_DISPATCH, VT_VARIANT])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-end
-
-# XTL runtime object
-module IXTLRuntime
-  include WIN32OLE::VARIANT
-  attr_reader :lastargs
-
-  # BSTR nodeName
-  # name of the node
-  def nodeName()
-    ret = _getproperty(2, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VARIANT nodeValue
-  # value stored in the node
-  def nodeValue()
-    ret = _getproperty(3, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # DOMNodeType nodeType
-  # the node's type
-  def nodeType()
-    ret = _getproperty(4, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode parentNode
-  # parent of the node
-  def parentNode()
-    ret = _getproperty(6, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNodeList childNodes
-  # the collection of the node's children
-  def childNodes()
-    ret = _getproperty(7, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode firstChild
-  # first child of the node
-  def firstChild()
-    ret = _getproperty(8, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode lastChild
-  # first child of the node
-  def lastChild()
-    ret = _getproperty(9, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode previousSibling
-  # left sibling of the node
-  def previousSibling()
-    ret = _getproperty(10, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode nextSibling
-  # right sibling of the node
-  def nextSibling()
-    ret = _getproperty(11, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNamedNodeMap attributes
-  # the collection of the node's attributes
-  def attributes()
-    ret = _getproperty(12, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMDocument ownerDocument
-  # document that contains the node
-  def ownerDocument()
-    ret = _getproperty(18, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR nodeTypeString
-  # the type of node in string form
-  def nodeTypeString()
-    ret = _getproperty(21, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR text
-  # text content of the node and subtree
-  def text()
-    ret = _getproperty(24, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BOOL specified
-  # indicates whether node is a default value
-  def specified()
-    ret = _getproperty(22, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode definition
-  # pointer to the definition of the node in the DTD or schema
-  def definition()
-    ret = _getproperty(23, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VARIANT nodeTypedValue
-  # get the strongly typed value of the node
-  def nodeTypedValue()
-    ret = _getproperty(25, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VARIANT dataType
-  # the data type of the node
-  def dataType()
-    ret = _getproperty(26, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR xml
-  # return the XML source for the node and each of its descendants
-  def xml()
-    ret = _getproperty(27, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BOOL parsed
-  # has sub-tree been completely parsed
-  def parsed()
-    ret = _getproperty(31, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR namespaceURI
-  # the URI for the namespace applying to the node
-  def namespaceURI()
-    ret = _getproperty(32, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR prefix
-  # the prefix for the namespace applying to the node
-  def prefix()
-    ret = _getproperty(33, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR baseName
-  # the base name of the node (nodename with the prefix stripped off)
-  def baseName()
-    ret = _getproperty(34, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID nodeValue
-  # value stored in the node
-  def nodeValue=(arg0)
-    ret = _setproperty(3, [arg0], [VT_VARIANT])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID text
-  # text content of the node and subtree
-  def text=(arg0)
-    ret = _setproperty(24, [arg0], [VT_BSTR])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID nodeTypedValue
-  # get the strongly typed value of the node
-  def nodeTypedValue=(arg0)
-    ret = _setproperty(25, [arg0], [VT_VARIANT])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID dataType
-  # the data type of the node
-  def dataType=(arg0)
-    ret = _setproperty(26, [arg0], [VT_VARIANT])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode insertBefore
-  # insert a child node
-  #   IXMLDOMNode arg0 --- newChild [IN]
-  #   VARIANT arg1 --- refChild [IN]
-  def insertBefore(arg0, arg1)
-    ret = _invoke(13, [arg0, arg1], [VT_BYREF|VT_DISPATCH, VT_VARIANT])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode replaceChild
-  # replace a child node
-  #   IXMLDOMNode arg0 --- newChild [IN]
-  #   IXMLDOMNode arg1 --- oldChild [IN]
-  def replaceChild(arg0, arg1)
-    ret = _invoke(14, [arg0, arg1], [VT_BYREF|VT_DISPATCH, VT_BYREF|VT_DISPATCH])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode removeChild
-  # remove a child node
-  #   IXMLDOMNode arg0 --- childNode [IN]
-  def removeChild(arg0)
-    ret = _invoke(15, [arg0], [VT_BYREF|VT_DISPATCH])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode appendChild
-  # append a child node
-  #   IXMLDOMNode arg0 --- newChild [IN]
-  def appendChild(arg0)
-    ret = _invoke(16, [arg0], [VT_BYREF|VT_DISPATCH])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BOOL hasChildNodes
-  def hasChildNodes()
-    ret = _invoke(17, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode cloneNode
-  #   BOOL arg0 --- deep [IN]
-  def cloneNode(arg0)
-    ret = _invoke(19, [arg0], [VT_BOOL])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR transformNode
-  # apply the stylesheet to the subtree
-  #   IXMLDOMNode arg0 --- stylesheet [IN]
-  def transformNode(arg0)
-    ret = _invoke(28, [arg0], [VT_BYREF|VT_DISPATCH])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNodeList selectNodes
-  # execute query on the subtree
-  #   BSTR arg0 --- queryString [IN]
-  def selectNodes(arg0)
-    ret = _invoke(29, [arg0], [VT_BSTR])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode selectSingleNode
-  # execute query on the subtree
-  #   BSTR arg0 --- queryString [IN]
-  def selectSingleNode(arg0)
-    ret = _invoke(30, [arg0], [VT_BSTR])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID transformNodeToObject
-  # apply the stylesheet to the subtree, returning the result through a document or a stream
-  #   IXMLDOMNode arg0 --- stylesheet [IN]
-  #   VARIANT arg1 --- outputObject [IN]
-  def transformNodeToObject(arg0, arg1)
-    ret = _invoke(35, [arg0, arg1], [VT_BYREF|VT_DISPATCH, VT_VARIANT])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # I4 uniqueID
-  #   IXMLDOMNode arg0 --- pNode [IN]
-  def uniqueID(arg0)
-    ret = _invoke(187, [arg0], [VT_BYREF|VT_DISPATCH])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # I4 depth
-  #   IXMLDOMNode arg0 --- pNode [IN]
-  def depth(arg0)
-    ret = _invoke(188, [arg0], [VT_BYREF|VT_DISPATCH])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # I4 childNumber
-  #   IXMLDOMNode arg0 --- pNode [IN]
-  def childNumber(arg0)
-    ret = _invoke(189, [arg0], [VT_BYREF|VT_DISPATCH])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # I4 ancestorChildNumber
-  #   BSTR arg0 --- bstrNodeName [IN]
-  #   IXMLDOMNode arg1 --- pNode [IN]
-  def ancestorChildNumber(arg0, arg1)
-    ret = _invoke(190, [arg0, arg1], [VT_BSTR, VT_BYREF|VT_DISPATCH])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # I4 absoluteChildNumber
-  #   IXMLDOMNode arg0 --- pNode [IN]
-  def absoluteChildNumber(arg0)
-    ret = _invoke(191, [arg0], [VT_BYREF|VT_DISPATCH])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR formatIndex
-  #   I4 arg0 --- lIndex [IN]
-  #   BSTR arg1 --- bstrFormat [IN]
-  def formatIndex(arg0, arg1)
-    ret = _invoke(192, [arg0, arg1], [VT_I4, VT_BSTR])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR formatNumber
-  #   R8 arg0 --- dblNumber [IN]
-  #   BSTR arg1 --- bstrFormat [IN]
-  def formatNumber(arg0, arg1)
-    ret = _invoke(193, [arg0, arg1], [VT_R8, VT_BSTR])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR formatDate
-  #   VARIANT arg0 --- varDate [IN]
-  #   BSTR arg1 --- bstrFormat [IN]
-  #   VARIANT arg2 --- varDestLocale [IN]
-  def formatDate(arg0, arg1, arg2=nil)
-    ret = _invoke(194, [arg0, arg1, arg2], [VT_VARIANT, VT_BSTR, VT_VARIANT])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR formatTime
-  #   VARIANT arg0 --- varTime [IN]
-  #   BSTR arg1 --- bstrFormat [IN]
-  #   VARIANT arg2 --- varDestLocale [IN]
-  def formatTime(arg0, arg1, arg2=nil)
-    ret = _invoke(195, [arg0, arg1, arg2], [VT_VARIANT, VT_BSTR, VT_VARIANT])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-end
-
-# W3C-DOM XML Document
-class Microsoft_XMLDOM_1_0 # DOMDocument
-  include WIN32OLE::VARIANT
-  attr_reader :lastargs
-  attr_reader :dispatch
-  attr_reader :clsid
-  attr_reader :progid
-
-  def initialize(obj = nil)
-    @clsid = "{2933BF90-7B36-11D2-B20E-00C04F983E60}"
-    @progid = "Microsoft.XMLDOM.1.0"
-    if obj.nil?
-      @dispatch = WIN32OLE.new(@progid)
-    else
-      @dispatch = obj
-    end
-  end
-
-  def method_missing(cmd, *arg)
-    @dispatch.method_missing(cmd, *arg)
-  end
-
-  # BSTR nodeName
-  # name of the node
-  def nodeName()
-    ret = @dispatch._getproperty(2, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VARIANT nodeValue
-  # value stored in the node
-  def nodeValue()
-    ret = @dispatch._getproperty(3, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # DOMNodeType nodeType
-  # the node's type
-  def nodeType()
-    ret = @dispatch._getproperty(4, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode parentNode
-  # parent of the node
-  def parentNode()
-    ret = @dispatch._getproperty(6, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNodeList childNodes
-  # the collection of the node's children
-  def childNodes()
-    ret = @dispatch._getproperty(7, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode firstChild
-  # first child of the node
-  def firstChild()
-    ret = @dispatch._getproperty(8, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode lastChild
-  # first child of the node
-  def lastChild()
-    ret = @dispatch._getproperty(9, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode previousSibling
-  # left sibling of the node
-  def previousSibling()
-    ret = @dispatch._getproperty(10, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode nextSibling
-  # right sibling of the node
-  def nextSibling()
-    ret = @dispatch._getproperty(11, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNamedNodeMap attributes
-  # the collection of the node's attributes
-  def attributes()
-    ret = @dispatch._getproperty(12, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMDocument ownerDocument
-  # document that contains the node
-  def ownerDocument()
-    ret = @dispatch._getproperty(18, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR nodeTypeString
-  # the type of node in string form
-  def nodeTypeString()
-    ret = @dispatch._getproperty(21, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR text
-  # text content of the node and subtree
-  def text()
-    ret = @dispatch._getproperty(24, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BOOL specified
-  # indicates whether node is a default value
-  def specified()
-    ret = @dispatch._getproperty(22, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode definition
-  # pointer to the definition of the node in the DTD or schema
-  def definition()
-    ret = @dispatch._getproperty(23, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VARIANT nodeTypedValue
-  # get the strongly typed value of the node
-  def nodeTypedValue()
-    ret = @dispatch._getproperty(25, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VARIANT dataType
-  # the data type of the node
-  def dataType()
-    ret = @dispatch._getproperty(26, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR xml
-  # return the XML source for the node and each of its descendants
-  def xml()
-    ret = @dispatch._getproperty(27, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BOOL parsed
-  # has sub-tree been completely parsed
-  def parsed()
-    ret = @dispatch._getproperty(31, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR namespaceURI
-  # the URI for the namespace applying to the node
-  def namespaceURI()
-    ret = @dispatch._getproperty(32, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR prefix
-  # the prefix for the namespace applying to the node
-  def prefix()
-    ret = @dispatch._getproperty(33, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR baseName
-  # the base name of the node (nodename with the prefix stripped off)
-  def baseName()
-    ret = @dispatch._getproperty(34, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMDocumentType doctype
-  # node corresponding to the DOCTYPE
-  def doctype()
-    ret = @dispatch._getproperty(38, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMImplementation implementation
-  # info on this DOM implementation
-  def implementation()
-    ret = @dispatch._getproperty(39, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMElement documentElement
-  # the root of the tree
-  def documentElement()
-    ret = @dispatch._getproperty(40, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # I4 readyState
-  # get the state of the XML document
-  def readyState()
-    ret = @dispatch._getproperty(-525, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMParseError parseError
-  # get the last parser error
-  def parseError()
-    ret = @dispatch._getproperty(59, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR url
-  # get the URL for the loaded XML document
-  def url()
-    ret = @dispatch._getproperty(60, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BOOL async
-  # flag for asynchronous download
-  def async()
-    ret = @dispatch._getproperty(61, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BOOL validateOnParse
-  # indicates whether the parser performs validation
-  def validateOnParse()
-    ret = @dispatch._getproperty(65, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BOOL resolveExternals
-  # indicates whether the parser resolves references to external DTD/Entities/Schema
-  def resolveExternals()
-    ret = @dispatch._getproperty(66, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BOOL preserveWhiteSpace
-  # indicates whether the parser preserves whitespace
-  def preserveWhiteSpace()
-    ret = @dispatch._getproperty(67, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID nodeValue
-  # value stored in the node
-  def nodeValue=(arg0)
-    ret = @dispatch._setproperty(3, [arg0], [VT_VARIANT])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID text
-  # text content of the node and subtree
-  def text=(arg0)
-    ret = @dispatch._setproperty(24, [arg0], [VT_BSTR])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID nodeTypedValue
-  # get the strongly typed value of the node
-  def nodeTypedValue=(arg0)
-    ret = @dispatch._setproperty(25, [arg0], [VT_VARIANT])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID dataType
-  # the data type of the node
-  def dataType=(arg0)
-    ret = @dispatch._setproperty(26, [arg0], [VT_VARIANT])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID async
-  # flag for asynchronous download
-  def async=(arg0)
-    ret = @dispatch._setproperty(61, [arg0], [VT_BOOL])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID validateOnParse
-  # indicates whether the parser performs validation
-  def validateOnParse=(arg0)
-    ret = @dispatch._setproperty(65, [arg0], [VT_BOOL])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID resolveExternals
-  # indicates whether the parser resolves references to external DTD/Entities/Schema
-  def resolveExternals=(arg0)
-    ret = @dispatch._setproperty(66, [arg0], [VT_BOOL])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID preserveWhiteSpace
-  # indicates whether the parser preserves whitespace
-  def preserveWhiteSpace=(arg0)
-    ret = @dispatch._setproperty(67, [arg0], [VT_BOOL])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID onreadystatechange
-  # register a readystatechange event handler
-  def onreadystatechange=(arg0)
-    ret = @dispatch._setproperty(68, [arg0], [VT_VARIANT])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID ondataavailable
-  # register an ondataavailable event handler
-  def ondataavailable=(arg0)
-    ret = @dispatch._setproperty(69, [arg0], [VT_VARIANT])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID ontransformnode
-  # register an ontransformnode event handler
-  def ontransformnode=(arg0)
-    ret = @dispatch._setproperty(70, [arg0], [VT_VARIANT])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode insertBefore
-  # insert a child node
-  #   IXMLDOMNode arg0 --- newChild [IN]
-  #   VARIANT arg1 --- refChild [IN]
-  def insertBefore(arg0, arg1)
-    ret = @dispatch._invoke(13, [arg0, arg1], [VT_BYREF|VT_DISPATCH, VT_VARIANT])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode replaceChild
-  # replace a child node
-  #   IXMLDOMNode arg0 --- newChild [IN]
-  #   IXMLDOMNode arg1 --- oldChild [IN]
-  def replaceChild(arg0, arg1)
-    ret = @dispatch._invoke(14, [arg0, arg1], [VT_BYREF|VT_DISPATCH, VT_BYREF|VT_DISPATCH])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode removeChild
-  # remove a child node
-  #   IXMLDOMNode arg0 --- childNode [IN]
-  def removeChild(arg0)
-    ret = @dispatch._invoke(15, [arg0], [VT_BYREF|VT_DISPATCH])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode appendChild
-  # append a child node
-  #   IXMLDOMNode arg0 --- newChild [IN]
-  def appendChild(arg0)
-    ret = @dispatch._invoke(16, [arg0], [VT_BYREF|VT_DISPATCH])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BOOL hasChildNodes
-  def hasChildNodes()
-    ret = @dispatch._invoke(17, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode cloneNode
-  #   BOOL arg0 --- deep [IN]
-  def cloneNode(arg0)
-    ret = @dispatch._invoke(19, [arg0], [VT_BOOL])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR transformNode
-  # apply the stylesheet to the subtree
-  #   IXMLDOMNode arg0 --- stylesheet [IN]
-  def transformNode(arg0)
-    ret = @dispatch._invoke(28, [arg0], [VT_BYREF|VT_DISPATCH])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNodeList selectNodes
-  # execute query on the subtree
-  #   BSTR arg0 --- queryString [IN]
-  def selectNodes(arg0)
-    ret = @dispatch._invoke(29, [arg0], [VT_BSTR])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode selectSingleNode
-  # execute query on the subtree
-  #   BSTR arg0 --- queryString [IN]
-  def selectSingleNode(arg0)
-    ret = @dispatch._invoke(30, [arg0], [VT_BSTR])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID transformNodeToObject
-  # apply the stylesheet to the subtree, returning the result through a document or a stream
-  #   IXMLDOMNode arg0 --- stylesheet [IN]
-  #   VARIANT arg1 --- outputObject [IN]
-  def transformNodeToObject(arg0, arg1)
-    ret = @dispatch._invoke(35, [arg0, arg1], [VT_BYREF|VT_DISPATCH, VT_VARIANT])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMElement createElement
-  # create an Element node
-  #   BSTR arg0 --- tagName [IN]
-  def createElement(arg0)
-    ret = @dispatch._invoke(41, [arg0], [VT_BSTR])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMDocumentFragment createDocumentFragment
-  # create a DocumentFragment node
-  def createDocumentFragment()
-    ret = @dispatch._invoke(42, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMText createTextNode
-  # create a text node
-  #   BSTR arg0 --- data [IN]
-  def createTextNode(arg0)
-    ret = @dispatch._invoke(43, [arg0], [VT_BSTR])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMComment createComment
-  # create a comment node
-  #   BSTR arg0 --- data [IN]
-  def createComment(arg0)
-    ret = @dispatch._invoke(44, [arg0], [VT_BSTR])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMCDATASection createCDATASection
-  # create a CDATA section node
-  #   BSTR arg0 --- data [IN]
-  def createCDATASection(arg0)
-    ret = @dispatch._invoke(45, [arg0], [VT_BSTR])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMProcessingInstruction createProcessingInstruction
-  # create a processing instruction node
-  #   BSTR arg0 --- target [IN]
-  #   BSTR arg1 --- data [IN]
-  def createProcessingInstruction(arg0, arg1)
-    ret = @dispatch._invoke(46, [arg0, arg1], [VT_BSTR, VT_BSTR])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMAttribute createAttribute
-  # create an attribute node
-  #   BSTR arg0 --- name [IN]
-  def createAttribute(arg0)
-    ret = @dispatch._invoke(47, [arg0], [VT_BSTR])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMEntityReference createEntityReference
-  # create an entity reference node
-  #   BSTR arg0 --- name [IN]
-  def createEntityReference(arg0)
-    ret = @dispatch._invoke(49, [arg0], [VT_BSTR])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNodeList getElementsByTagName
-  # build a list of elements by name
-  #   BSTR arg0 --- tagName [IN]
-  def getElementsByTagName(arg0)
-    ret = @dispatch._invoke(50, [arg0], [VT_BSTR])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode createNode
-  # create a node of the specified node type and name
-  #   VARIANT arg0 --- type [IN]
-  #   BSTR arg1 --- name [IN]
-  #   BSTR arg2 --- namespaceURI [IN]
-  def createNode(arg0, arg1, arg2)
-    ret = @dispatch._invoke(54, [arg0, arg1, arg2], [VT_VARIANT, VT_BSTR, VT_BSTR])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode nodeFromID
-  # retrieve node from it's ID
-  #   BSTR arg0 --- idString [IN]
-  def nodeFromID(arg0)
-    ret = @dispatch._invoke(56, [arg0], [VT_BSTR])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BOOL load
-  # load document from the specified XML source
-  #   VARIANT arg0 --- xmlSource [IN]
-  def load(arg0)
-    ret = @dispatch._invoke(58, [arg0], [VT_VARIANT])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID abort
-  # abort an asynchronous download
-  def abort()
-    ret = @dispatch._invoke(62, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BOOL loadXML
-  # load the document from a string
-  #   BSTR arg0 --- bstrXML [IN]
-  def loadXML(arg0)
-    ret = @dispatch._invoke(63, [arg0], [VT_BSTR])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID save
-  # save the document to a specified destination
-  #   VARIANT arg0 --- destination [IN]
-  def save(arg0)
-    ret = @dispatch._invoke(64, [arg0], [VT_VARIANT])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # HRESULT ondataavailable EVENT in XMLDOMDocumentEvents
-  def ondataavailable()
-    ret = @dispatch._invoke(198, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # HRESULT onreadystatechange EVENT in XMLDOMDocumentEvents
-  def onreadystatechange()
-    ret = @dispatch._invoke(-609, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-end
-
-# W3C-DOM XML Document (Apartment)
-class Microsoft_FreeThreadedXMLDOM_1_0 # DOMFreeThreadedDocument
-  include WIN32OLE::VARIANT
-  attr_reader :lastargs
-  attr_reader :dispatch
-  attr_reader :clsid
-  attr_reader :progid
-
-  def initialize(obj = nil)
-    @clsid = "{2933BF91-7B36-11D2-B20E-00C04F983E60}"
-    @progid = "Microsoft.FreeThreadedXMLDOM.1.0"
-    if obj.nil?
-      @dispatch = WIN32OLE.new(@progid)
-    else
-      @dispatch = obj
-    end
-  end
-
-  def method_missing(cmd, *arg)
-    @dispatch.method_missing(cmd, *arg)
-  end
-
-  # BSTR nodeName
-  # name of the node
-  def nodeName()
-    ret = @dispatch._getproperty(2, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VARIANT nodeValue
-  # value stored in the node
-  def nodeValue()
-    ret = @dispatch._getproperty(3, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # DOMNodeType nodeType
-  # the node's type
-  def nodeType()
-    ret = @dispatch._getproperty(4, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode parentNode
-  # parent of the node
-  def parentNode()
-    ret = @dispatch._getproperty(6, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNodeList childNodes
-  # the collection of the node's children
-  def childNodes()
-    ret = @dispatch._getproperty(7, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode firstChild
-  # first child of the node
-  def firstChild()
-    ret = @dispatch._getproperty(8, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode lastChild
-  # first child of the node
-  def lastChild()
-    ret = @dispatch._getproperty(9, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode previousSibling
-  # left sibling of the node
-  def previousSibling()
-    ret = @dispatch._getproperty(10, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode nextSibling
-  # right sibling of the node
-  def nextSibling()
-    ret = @dispatch._getproperty(11, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNamedNodeMap attributes
-  # the collection of the node's attributes
-  def attributes()
-    ret = @dispatch._getproperty(12, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMDocument ownerDocument
-  # document that contains the node
-  def ownerDocument()
-    ret = @dispatch._getproperty(18, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR nodeTypeString
-  # the type of node in string form
-  def nodeTypeString()
-    ret = @dispatch._getproperty(21, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR text
-  # text content of the node and subtree
-  def text()
-    ret = @dispatch._getproperty(24, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BOOL specified
-  # indicates whether node is a default value
-  def specified()
-    ret = @dispatch._getproperty(22, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode definition
-  # pointer to the definition of the node in the DTD or schema
-  def definition()
-    ret = @dispatch._getproperty(23, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VARIANT nodeTypedValue
-  # get the strongly typed value of the node
-  def nodeTypedValue()
-    ret = @dispatch._getproperty(25, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VARIANT dataType
-  # the data type of the node
-  def dataType()
-    ret = @dispatch._getproperty(26, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR xml
-  # return the XML source for the node and each of its descendants
-  def xml()
-    ret = @dispatch._getproperty(27, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BOOL parsed
-  # has sub-tree been completely parsed
-  def parsed()
-    ret = @dispatch._getproperty(31, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR namespaceURI
-  # the URI for the namespace applying to the node
-  def namespaceURI()
-    ret = @dispatch._getproperty(32, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR prefix
-  # the prefix for the namespace applying to the node
-  def prefix()
-    ret = @dispatch._getproperty(33, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR baseName
-  # the base name of the node (nodename with the prefix stripped off)
-  def baseName()
-    ret = @dispatch._getproperty(34, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMDocumentType doctype
-  # node corresponding to the DOCTYPE
-  def doctype()
-    ret = @dispatch._getproperty(38, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMImplementation implementation
-  # info on this DOM implementation
-  def implementation()
-    ret = @dispatch._getproperty(39, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMElement documentElement
-  # the root of the tree
-  def documentElement()
-    ret = @dispatch._getproperty(40, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # I4 readyState
-  # get the state of the XML document
-  def readyState()
-    ret = @dispatch._getproperty(-525, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMParseError parseError
-  # get the last parser error
-  def parseError()
-    ret = @dispatch._getproperty(59, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR url
-  # get the URL for the loaded XML document
-  def url()
-    ret = @dispatch._getproperty(60, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BOOL async
-  # flag for asynchronous download
-  def async()
-    ret = @dispatch._getproperty(61, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BOOL validateOnParse
-  # indicates whether the parser performs validation
-  def validateOnParse()
-    ret = @dispatch._getproperty(65, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BOOL resolveExternals
-  # indicates whether the parser resolves references to external DTD/Entities/Schema
-  def resolveExternals()
-    ret = @dispatch._getproperty(66, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BOOL preserveWhiteSpace
-  # indicates whether the parser preserves whitespace
-  def preserveWhiteSpace()
-    ret = @dispatch._getproperty(67, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID nodeValue
-  # value stored in the node
-  def nodeValue=(arg0)
-    ret = @dispatch._setproperty(3, [arg0], [VT_VARIANT])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID text
-  # text content of the node and subtree
-  def text=(arg0)
-    ret = @dispatch._setproperty(24, [arg0], [VT_BSTR])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID nodeTypedValue
-  # get the strongly typed value of the node
-  def nodeTypedValue=(arg0)
-    ret = @dispatch._setproperty(25, [arg0], [VT_VARIANT])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID dataType
-  # the data type of the node
-  def dataType=(arg0)
-    ret = @dispatch._setproperty(26, [arg0], [VT_VARIANT])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID async
-  # flag for asynchronous download
-  def async=(arg0)
-    ret = @dispatch._setproperty(61, [arg0], [VT_BOOL])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID validateOnParse
-  # indicates whether the parser performs validation
-  def validateOnParse=(arg0)
-    ret = @dispatch._setproperty(65, [arg0], [VT_BOOL])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID resolveExternals
-  # indicates whether the parser resolves references to external DTD/Entities/Schema
-  def resolveExternals=(arg0)
-    ret = @dispatch._setproperty(66, [arg0], [VT_BOOL])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID preserveWhiteSpace
-  # indicates whether the parser preserves whitespace
-  def preserveWhiteSpace=(arg0)
-    ret = @dispatch._setproperty(67, [arg0], [VT_BOOL])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID onreadystatechange
-  # register a readystatechange event handler
-  def onreadystatechange=(arg0)
-    ret = @dispatch._setproperty(68, [arg0], [VT_VARIANT])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID ondataavailable
-  # register an ondataavailable event handler
-  def ondataavailable=(arg0)
-    ret = @dispatch._setproperty(69, [arg0], [VT_VARIANT])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID ontransformnode
-  # register an ontransformnode event handler
-  def ontransformnode=(arg0)
-    ret = @dispatch._setproperty(70, [arg0], [VT_VARIANT])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode insertBefore
-  # insert a child node
-  #   IXMLDOMNode arg0 --- newChild [IN]
-  #   VARIANT arg1 --- refChild [IN]
-  def insertBefore(arg0, arg1)
-    ret = @dispatch._invoke(13, [arg0, arg1], [VT_BYREF|VT_DISPATCH, VT_VARIANT])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode replaceChild
-  # replace a child node
-  #   IXMLDOMNode arg0 --- newChild [IN]
-  #   IXMLDOMNode arg1 --- oldChild [IN]
-  def replaceChild(arg0, arg1)
-    ret = @dispatch._invoke(14, [arg0, arg1], [VT_BYREF|VT_DISPATCH, VT_BYREF|VT_DISPATCH])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode removeChild
-  # remove a child node
-  #   IXMLDOMNode arg0 --- childNode [IN]
-  def removeChild(arg0)
-    ret = @dispatch._invoke(15, [arg0], [VT_BYREF|VT_DISPATCH])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode appendChild
-  # append a child node
-  #   IXMLDOMNode arg0 --- newChild [IN]
-  def appendChild(arg0)
-    ret = @dispatch._invoke(16, [arg0], [VT_BYREF|VT_DISPATCH])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BOOL hasChildNodes
-  def hasChildNodes()
-    ret = @dispatch._invoke(17, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode cloneNode
-  #   BOOL arg0 --- deep [IN]
-  def cloneNode(arg0)
-    ret = @dispatch._invoke(19, [arg0], [VT_BOOL])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR transformNode
-  # apply the stylesheet to the subtree
-  #   IXMLDOMNode arg0 --- stylesheet [IN]
-  def transformNode(arg0)
-    ret = @dispatch._invoke(28, [arg0], [VT_BYREF|VT_DISPATCH])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNodeList selectNodes
-  # execute query on the subtree
-  #   BSTR arg0 --- queryString [IN]
-  def selectNodes(arg0)
-    ret = @dispatch._invoke(29, [arg0], [VT_BSTR])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode selectSingleNode
-  # execute query on the subtree
-  #   BSTR arg0 --- queryString [IN]
-  def selectSingleNode(arg0)
-    ret = @dispatch._invoke(30, [arg0], [VT_BSTR])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID transformNodeToObject
-  # apply the stylesheet to the subtree, returning the result through a document or a stream
-  #   IXMLDOMNode arg0 --- stylesheet [IN]
-  #   VARIANT arg1 --- outputObject [IN]
-  def transformNodeToObject(arg0, arg1)
-    ret = @dispatch._invoke(35, [arg0, arg1], [VT_BYREF|VT_DISPATCH, VT_VARIANT])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMElement createElement
-  # create an Element node
-  #   BSTR arg0 --- tagName [IN]
-  def createElement(arg0)
-    ret = @dispatch._invoke(41, [arg0], [VT_BSTR])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMDocumentFragment createDocumentFragment
-  # create a DocumentFragment node
-  def createDocumentFragment()
-    ret = @dispatch._invoke(42, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMText createTextNode
-  # create a text node
-  #   BSTR arg0 --- data [IN]
-  def createTextNode(arg0)
-    ret = @dispatch._invoke(43, [arg0], [VT_BSTR])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMComment createComment
-  # create a comment node
-  #   BSTR arg0 --- data [IN]
-  def createComment(arg0)
-    ret = @dispatch._invoke(44, [arg0], [VT_BSTR])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMCDATASection createCDATASection
-  # create a CDATA section node
-  #   BSTR arg0 --- data [IN]
-  def createCDATASection(arg0)
-    ret = @dispatch._invoke(45, [arg0], [VT_BSTR])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMProcessingInstruction createProcessingInstruction
-  # create a processing instruction node
-  #   BSTR arg0 --- target [IN]
-  #   BSTR arg1 --- data [IN]
-  def createProcessingInstruction(arg0, arg1)
-    ret = @dispatch._invoke(46, [arg0, arg1], [VT_BSTR, VT_BSTR])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMAttribute createAttribute
-  # create an attribute node
-  #   BSTR arg0 --- name [IN]
-  def createAttribute(arg0)
-    ret = @dispatch._invoke(47, [arg0], [VT_BSTR])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMEntityReference createEntityReference
-  # create an entity reference node
-  #   BSTR arg0 --- name [IN]
-  def createEntityReference(arg0)
-    ret = @dispatch._invoke(49, [arg0], [VT_BSTR])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNodeList getElementsByTagName
-  # build a list of elements by name
-  #   BSTR arg0 --- tagName [IN]
-  def getElementsByTagName(arg0)
-    ret = @dispatch._invoke(50, [arg0], [VT_BSTR])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode createNode
-  # create a node of the specified node type and name
-  #   VARIANT arg0 --- type [IN]
-  #   BSTR arg1 --- name [IN]
-  #   BSTR arg2 --- namespaceURI [IN]
-  def createNode(arg0, arg1, arg2)
-    ret = @dispatch._invoke(54, [arg0, arg1, arg2], [VT_VARIANT, VT_BSTR, VT_BSTR])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # IXMLDOMNode nodeFromID
-  # retrieve node from it's ID
-  #   BSTR arg0 --- idString [IN]
-  def nodeFromID(arg0)
-    ret = @dispatch._invoke(56, [arg0], [VT_BSTR])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BOOL load
-  # load document from the specified XML source
-  #   VARIANT arg0 --- xmlSource [IN]
-  def load(arg0)
-    ret = @dispatch._invoke(58, [arg0], [VT_VARIANT])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID abort
-  # abort an asynchronous download
-  def abort()
-    ret = @dispatch._invoke(62, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BOOL loadXML
-  # load the document from a string
-  #   BSTR arg0 --- bstrXML [IN]
-  def loadXML(arg0)
-    ret = @dispatch._invoke(63, [arg0], [VT_BSTR])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID save
-  # save the document to a specified destination
-  #   VARIANT arg0 --- destination [IN]
-  def save(arg0)
-    ret = @dispatch._invoke(64, [arg0], [VT_VARIANT])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # HRESULT ondataavailable EVENT in XMLDOMDocumentEvents
-  def ondataavailable()
-    ret = @dispatch._invoke(198, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # HRESULT onreadystatechange EVENT in XMLDOMDocumentEvents
-  def onreadystatechange()
-    ret = @dispatch._invoke(-609, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-end
-
-# IXMLHttpRequest Interface
-module IXMLHttpRequest
-  include WIN32OLE::VARIANT
-  attr_reader :lastargs
-
-  # I4 status
-  # Get HTTP status code
-  def status()
-    ret = _getproperty(7, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR statusText
-  # Get HTTP status text
-  def statusText()
-    ret = _getproperty(8, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # DISPATCH responseXML
-  # Get response body
-  def responseXML()
-    ret = _getproperty(9, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR responseText
-  # Get response body
-  def responseText()
-    ret = _getproperty(10, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VARIANT responseBody
-  # Get response body
-  def responseBody()
-    ret = _getproperty(11, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VARIANT responseStream
-  # Get response body
-  def responseStream()
-    ret = _getproperty(12, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # I4 readyState
-  # Get ready state
-  def readyState()
-    ret = _getproperty(13, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID onreadystatechange
-  # Register a complete event handler
-  def onreadystatechange=(arg0)
-    ret = _setproperty(14, [arg0], [VT_VARIANT])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID open
-  # Open HTTP connection
-  #   BSTR arg0 --- bstrMethod [IN]
-  #   BSTR arg1 --- bstrUrl [IN]
-  #   VARIANT arg2 --- varAsync [IN]
-  #   VARIANT arg3 --- bstrUser [IN]
-  #   VARIANT arg4 --- bstrPassword [IN]
-  def open(arg0, arg1, arg2=nil, arg3=nil, arg4=nil)
-    ret = _invoke(1, [arg0, arg1, arg2, arg3, arg4], [VT_BSTR, VT_BSTR, VT_VARIANT, VT_VARIANT, VT_VARIANT])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID setRequestHeader
-  # Add HTTP request header
-  #   BSTR arg0 --- bstrHeader [IN]
-  #   BSTR arg1 --- bstrValue [IN]
-  def setRequestHeader(arg0, arg1)
-    ret = _invoke(2, [arg0, arg1], [VT_BSTR, VT_BSTR])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR getResponseHeader
-  # Get HTTP response header
-  #   BSTR arg0 --- bstrHeader [IN]
-  def getResponseHeader(arg0)
-    ret = _invoke(3, [arg0], [VT_BSTR])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR getAllResponseHeaders
-  # Get all HTTP response headers
-  def getAllResponseHeaders()
-    ret = _invoke(4, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID send
-  # Send HTTP request
-  #   VARIANT arg0 --- varBody [IN]
-  def send(arg0=nil)
-    ret = _invoke(5, [arg0], [VT_VARIANT])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID abort
-  # Abort HTTP request
-  def abort()
-    ret = _invoke(6, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-end
-
-# XML HTTP Request class.
-class Microsoft_XMLHTTP_1 # XMLHTTPRequest
-  include WIN32OLE::VARIANT
-  attr_reader :lastargs
-  attr_reader :dispatch
-  attr_reader :clsid
-  attr_reader :progid
-
-  def initialize(obj = nil)
-    @clsid = "{ED8C108E-4349-11D2-91A4-00C04F7969E8}"
-    @progid = "Microsoft.XMLHTTP.1"
-    if obj.nil?
-      @dispatch = WIN32OLE.new(@progid)
-    else
-      @dispatch = obj
-    end
-  end
-
-  def method_missing(cmd, *arg)
-    @dispatch.method_missing(cmd, *arg)
-  end
-
-  # I4 status
-  # Get HTTP status code
-  def status()
-    ret = @dispatch._getproperty(7, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR statusText
-  # Get HTTP status text
-  def statusText()
-    ret = @dispatch._getproperty(8, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # DISPATCH responseXML
-  # Get response body
-  def responseXML()
-    ret = @dispatch._getproperty(9, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR responseText
-  # Get response body
-  def responseText()
-    ret = @dispatch._getproperty(10, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VARIANT responseBody
-  # Get response body
-  def responseBody()
-    ret = @dispatch._getproperty(11, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VARIANT responseStream
-  # Get response body
-  def responseStream()
-    ret = @dispatch._getproperty(12, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # I4 readyState
-  # Get ready state
-  def readyState()
-    ret = @dispatch._getproperty(13, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID onreadystatechange
-  # Register a complete event handler
-  def onreadystatechange=(arg0)
-    ret = @dispatch._setproperty(14, [arg0], [VT_VARIANT])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID open
-  # Open HTTP connection
-  #   BSTR arg0 --- bstrMethod [IN]
-  #   BSTR arg1 --- bstrUrl [IN]
-  #   VARIANT arg2 --- varAsync [IN]
-  #   VARIANT arg3 --- bstrUser [IN]
-  #   VARIANT arg4 --- bstrPassword [IN]
-  def open(arg0, arg1, arg2=nil, arg3=nil, arg4=nil)
-    ret = @dispatch._invoke(1, [arg0, arg1, arg2, arg3, arg4], [VT_BSTR, VT_BSTR, VT_VARIANT, VT_VARIANT, VT_VARIANT])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID setRequestHeader
-  # Add HTTP request header
-  #   BSTR arg0 --- bstrHeader [IN]
-  #   BSTR arg1 --- bstrValue [IN]
-  def setRequestHeader(arg0, arg1)
-    ret = @dispatch._invoke(2, [arg0, arg1], [VT_BSTR, VT_BSTR])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR getResponseHeader
-  # Get HTTP response header
-  #   BSTR arg0 --- bstrHeader [IN]
-  def getResponseHeader(arg0)
-    ret = @dispatch._invoke(3, [arg0], [VT_BSTR])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # BSTR getAllResponseHeaders
-  # Get all HTTP response headers
-  def getAllResponseHeaders()
-    ret = @dispatch._invoke(4, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID send
-  # Send HTTP request
-  #   VARIANT arg0 --- varBody [IN]
-  def send(arg0=nil)
-    ret = @dispatch._invoke(5, [arg0], [VT_VARIANT])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID abort
-  # Abort HTTP request
-  def abort()
-    ret = @dispatch._invoke(6, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-end
-
-# XML Data Source Object
-class Microsoft_XMLDSO_1_0 # XMLDSOControl
-  include WIN32OLE::VARIANT
-  attr_reader :lastargs
-  attr_reader :dispatch
-  attr_reader :clsid
-  attr_reader :progid
-
-  def initialize(obj = nil)
-    @clsid = "{550DDA30-0541-11D2-9CA9-0060B0EC3D39}"
-    @progid = "Microsoft.XMLDSO.1.0"
-    if obj.nil?
-      @dispatch = WIN32OLE.new(@progid)
-    else
-      @dispatch = obj
-    end
-  end
-
-  def method_missing(cmd, *arg)
-    @dispatch.method_missing(cmd, *arg)
-  end
-
-  # IXMLDOMDocument XMLDocument
-  def XMLDocument()
-    ret = @dispatch._getproperty(65537, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # I4 JavaDSOCompatible
-  def JavaDSOCompatible()
-    ret = @dispatch._getproperty(65538, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # I4 readyState
-  def readyState()
-    ret = @dispatch._getproperty(-525, [], [])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID XMLDocument
-  def XMLDocument=(arg0)
-    ret = @dispatch._setproperty(65537, [arg0], [VT_BYREF|VT_DISPATCH])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # VOID JavaDSOCompatible
-  def JavaDSOCompatible=(arg0)
-    ret = @dispatch._setproperty(65538, [arg0], [VT_I4])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-end
-
-# Constants that define types for IXMLElement.
-module OLEtagXMLEMEM_TYPE
-  include WIN32OLE::VARIANT
-  attr_reader :lastargs
-  XMLELEMTYPE_ELEMENT = 0
-  XMLELEMTYPE_TEXT = 1
-  XMLELEMTYPE_COMMENT = 2
-  XMLELEMTYPE_DOCUMENT = 3
-  XMLELEMTYPE_DTD = 4
-  XMLELEMTYPE_PI = 5
-  XMLELEMTYPE_OTHER = 6
-end
-
-# XMLDocument extends IXML Document.  It is obsolete.  You should use DOMDocument.  This object should not be confused with the XMLDocument property on the XML data island.
-class Msxml # XMLDocument
-  include WIN32OLE::VARIANT
-  attr_reader :lastargs
-  attr_reader :dispatch
-  attr_reader :clsid
-  attr_reader :progid
-
-  def initialize(obj = nil)
-    @clsid = "{CFC399AF-D876-11D0-9C10-00C04FC99C8E}"
-    @progid = "Msxml"
-    if obj.nil?
-      @dispatch = WIN32OLE.new(@progid)
-    else
-      @dispatch = obj
-    end
-  end
-
-  def method_missing(cmd, *arg)
-    @dispatch.method_missing(cmd, *arg)
-  end
-
-  # HRESULT url
-  # set URL to load an XML document from the URL.
-  #   BSTR arg0 --- p [IN]
-  def url=(arg0)
-    ret = @dispatch._setproperty(65641, [arg0], [VT_BSTR, VT_HRESULT])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # HRESULT charset
-  # get encoding.
-  #   BSTR arg0 --- p [IN]
-  def charset=(arg0)
-    ret = @dispatch._setproperty(65645, [arg0], [VT_BSTR, VT_HRESULT])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # HRESULT async
-  # get asynchronous loading flag.
-  #   BOOL arg0 --- pf [IN]
-  def async=(arg0)
-    ret = @dispatch._setproperty(65649, [arg0], [VT_BOOL, VT_HRESULT])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-
-  # HRESULT root
-  # get root IXMLElement of the XML document.
-  #   IXMLElement2,IXMLElement2 arg0 --- p [OUT]
-  def root
-    OLEProperty.new(@dispatch, 65637, [VT_BYREF|VT_BYREF|VT_DISPATCH], [VT_BYREF|VT_BYREF|VT_DISPATCH, VT_HRESULT])
-  end
-
-  # HRESULT url
-  # set URL to load an XML document from the URL.
-  #   BSTR arg0 --- p [OUT]
-  def url
-    OLEProperty.new(@dispatch, 65641, [VT_BYREF|VT_BSTR], [VT_BYREF|VT_BSTR, VT_HRESULT])
-  end
-
-  # HRESULT readyState
-  # get ready state.
-  #   I4 arg0 --- pl [OUT]
-  def readyState
-    OLEProperty.new(@dispatch, 65643, [VT_BYREF|VT_I4], [VT_BYREF|VT_I4, VT_HRESULT])
-  end
-
-  # HRESULT charset
-  # get encoding.
-  #   BSTR arg0 --- p [OUT]
-  def charset
-    OLEProperty.new(@dispatch, 65645, [VT_BYREF|VT_BSTR], [VT_BYREF|VT_BSTR, VT_HRESULT])
-  end
-
-  # HRESULT version
-  # get XML version number.
-  #   BSTR arg0 --- p [OUT]
-  def version
-    OLEProperty.new(@dispatch, 65646, [VT_BYREF|VT_BSTR], [VT_BYREF|VT_BSTR, VT_HRESULT])
-  end
-
-  # HRESULT doctype
-  # get document type.
-  #   BSTR arg0 --- p [OUT]
-  def doctype
-    OLEProperty.new(@dispatch, 65647, [VT_BYREF|VT_BSTR], [VT_BYREF|VT_BSTR, VT_HRESULT])
-  end
-
-  # HRESULT async
-  # get asynchronous loading flag.
-  #   BOOL arg0 --- pf [OUT]
-  def async
-    OLEProperty.new(@dispatch, 65649, [VT_BYREF|VT_BOOL], [VT_BYREF|VT_BOOL, VT_HRESULT])
-  end
-
-  # HRESULT createElement
-  # create different types of IXMLElements.
-  #   VARIANT arg0 --- vType [IN]
-  #   VARIANT arg1 --- var1 [IN]
-  #   IXMLElement2,IXMLElement2 arg2 --- ppElem [OUT]
-  def createElement(arg0, arg1=nil, arg2=nil)
-    ret = @dispatch._invoke(65644, [arg0, arg1, arg2], [VT_VARIANT, VT_VARIANT, VT_BYREF|VT_BYREF|VT_DISPATCH])
-    @lastargs = WIN32OLE::ARGV
-    ret
-  end
-end
diff --git a/ext/win32ole/win32ole.c b/ext/win32ole/win32ole.c
deleted file mode 100644
index f630e657cd569d..00000000000000
--- a/ext/win32ole/win32ole.c
+++ /dev/null
@@ -1,4142 +0,0 @@
-/*
- *  (c) 1995 Microsoft Corporation. All rights reserved.
- *  Developed by ActiveWare Internet Corp., now known as
- *  ActiveState Tool Corp., http://www.ActiveState.com
- *
- *  Other modifications Copyright (c) 1997, 1998 by Gurusamy Sarathy
- *  <gsar@umich.edu> and Jan Dubois <jan.dubois@ibm.net>
- *
- *  You may distribute under the terms of either the GNU General Public
- *  License or the Artistic License, as specified in the README file
- *  of the Perl distribution.
- *
- */
-
-/*
-  modified for win32ole (ruby) by Masaki.Suketa <masaki.suketa@nifty.ne.jp>
- */
-
-#include "win32ole.h"
-
-/*
- * unfortunately IID_IMultiLanguage2 is not included in any libXXX.a
- * in Cygwin(mingw32).
- */
-#if defined(__CYGWIN__) ||  defined(__MINGW32__)
-#undef IID_IMultiLanguage2
-const IID IID_IMultiLanguage2 = {0xDCCFC164, 0x2B38, 0x11d2, {0xB7, 0xEC, 0x00, 0xC0, 0x4F, 0x8F, 0x5D, 0x9A}};
-#endif
-
-#define WIN32OLE_VERSION "1.8.9"
-
-typedef HRESULT (STDAPICALLTYPE FNCOCREATEINSTANCEEX)
-    (REFCLSID, IUnknown*, DWORD, COSERVERINFO*, DWORD, MULTI_QI*);
-
-typedef HWND (WINAPI FNHTMLHELP)(HWND hwndCaller, LPCSTR pszFile,
-                                 UINT uCommand, DWORD dwData);
-typedef BOOL (FNENUMSYSEMCODEPAGES) (CODEPAGE_ENUMPROC, DWORD);
-VALUE cWIN32OLE;
-
-#if defined(RB_THREAD_SPECIFIC) && (defined(__CYGWIN__))
-static RB_THREAD_SPECIFIC BOOL g_ole_initialized;
-# define g_ole_initialized_init() ((void)0)
-# define g_ole_initialized_set(val) (g_ole_initialized = (val))
-#else
-static volatile DWORD g_ole_initialized_key = TLS_OUT_OF_INDEXES;
-# define g_ole_initialized (TlsGetValue(g_ole_initialized_key)!=0)
-# define g_ole_initialized_init() (g_ole_initialized_key = TlsAlloc())
-# define g_ole_initialized_set(val) TlsSetValue(g_ole_initialized_key, (void*)(val))
-#endif
-
-static BOOL g_uninitialize_hooked = FALSE;
-static BOOL g_cp_installed = FALSE;
-static BOOL g_lcid_installed = FALSE;
-static BOOL g_running_nano = FALSE;
-static HINSTANCE ghhctrl = NULL;
-static HINSTANCE gole32 = NULL;
-static FNCOCREATEINSTANCEEX *gCoCreateInstanceEx = NULL;
-static VALUE com_hash;
-static VALUE enc2cp_hash;
-static IDispatchVtbl com_vtbl;
-static UINT cWIN32OLE_cp = CP_ACP;
-static rb_encoding *cWIN32OLE_enc;
-static UINT g_cp_to_check = CP_ACP;
-static char g_lcid_to_check[8 + 1];
-static VARTYPE g_nil_to = VT_ERROR;
-static IMessageFilterVtbl message_filter;
-static IMessageFilter imessage_filter = { &message_filter };
-static IMessageFilter* previous_filter;
-
-#if defined(HAVE_TYPE_IMULTILANGUAGE2)
-static IMultiLanguage2 *pIMultiLanguage = NULL;
-#elif defined(HAVE_TYPE_IMULTILANGUAGE)
-static IMultiLanguage *pIMultiLanguage = NULL;
-#else
-#define pIMultiLanguage NULL /* dummy */
-#endif
-
-struct oleparam {
-    DISPPARAMS dp;
-    OLECHAR** pNamedArgs;
-};
-
-static HRESULT ( STDMETHODCALLTYPE QueryInterface )(IDispatch __RPC_FAR *, REFIID riid, void __RPC_FAR *__RPC_FAR *ppvObject);
-static ULONG ( STDMETHODCALLTYPE AddRef )(IDispatch __RPC_FAR * This);
-static ULONG ( STDMETHODCALLTYPE Release )(IDispatch __RPC_FAR * This);
-static HRESULT ( STDMETHODCALLTYPE GetTypeInfoCount )(IDispatch __RPC_FAR * This, UINT __RPC_FAR *pctinfo);
-static HRESULT ( STDMETHODCALLTYPE GetTypeInfo )(IDispatch __RPC_FAR * This, UINT iTInfo, LCID lcid, ITypeInfo __RPC_FAR *__RPC_FAR *ppTInfo);
-static HRESULT ( STDMETHODCALLTYPE GetIDsOfNames )(IDispatch __RPC_FAR * This, REFIID riid, LPOLESTR __RPC_FAR *rgszNames, UINT cNames, LCID lcid, DISPID __RPC_FAR *rgDispId);
-static HRESULT ( STDMETHODCALLTYPE Invoke )( IDispatch __RPC_FAR * This, DISPID dispIdMember, REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS __RPC_FAR *pDispParams, VARIANT __RPC_FAR *pVarResult, EXCEPINFO __RPC_FAR *pExcepInfo, UINT __RPC_FAR *puArgErr);
-static IDispatch* val2dispatch(VALUE val);
-static double rbtime2vtdate(VALUE tmobj);
-static VALUE vtdate2rbtime(double date);
-static rb_encoding *ole_cp2encoding(UINT cp);
-static UINT ole_encoding2cp(rb_encoding *enc);
-NORETURN(static void failed_load_conv51932(void));
-#ifndef pIMultiLanguage
-static void load_conv_function51932(void);
-#endif
-static UINT ole_init_cp(void);
-static void ole_freeexceptinfo(EXCEPINFO *pExInfo);
-static VALUE ole_excepinfo2msg(EXCEPINFO *pExInfo);
-static void ole_free(void *ptr);
-static size_t ole_size(const void *ptr);
-static LPWSTR ole_mb2wc(char *pm, int len, UINT cp);
-static VALUE ole_ary_m_entry(VALUE val, LONG *pid);
-static VALUE is_all_index_under(LONG *pid, long *pub, long dim);
-static void * get_ptr_of_variant(VARIANT *pvar);
-static void ole_set_safe_array(long n, SAFEARRAY *psa, LONG *pid, long *pub, VALUE val, long dim,  VARTYPE vt);
-static long dimension(VALUE val);
-static long ary_len_of_dim(VALUE ary, long dim);
-static VALUE ole_set_member(VALUE self, IDispatch *dispatch);
-static VALUE fole_s_allocate(VALUE klass);
-static VALUE create_win32ole_object(VALUE klass, IDispatch *pDispatch, int argc, VALUE *argv);
-static VALUE ary_new_dim(VALUE myary, LONG *pid, LONG *plb, LONG dim);
-static void ary_store_dim(VALUE myary, LONG *pid, LONG *plb, LONG dim, VALUE val);
-static void ole_const_load(ITypeLib *pTypeLib, VALUE klass, VALUE self);
-static HRESULT clsid_from_remote(VALUE host, VALUE com, CLSID *pclsid);
-static VALUE ole_create_dcom(VALUE self, VALUE ole, VALUE host, VALUE others);
-static VALUE ole_bind_obj(VALUE moniker, int argc, VALUE *argv, VALUE self);
-static VALUE fole_s_connect(int argc, VALUE *argv, VALUE self);
-static VALUE fole_s_const_load(int argc, VALUE *argv, VALUE self);
-static ULONG reference_count(struct oledata * pole);
-static VALUE fole_s_reference_count(VALUE self, VALUE obj);
-static VALUE fole_s_free(VALUE self, VALUE obj);
-static HWND ole_show_help(VALUE helpfile, VALUE helpcontext);
-static VALUE fole_s_show_help(int argc, VALUE *argv, VALUE self);
-static VALUE fole_s_get_code_page(VALUE self);
-static BOOL CALLBACK installed_code_page_proc(LPTSTR str);
-static BOOL code_page_installed(UINT cp);
-static VALUE fole_s_set_code_page(VALUE self, VALUE vcp);
-static VALUE fole_s_get_locale(VALUE self);
-static BOOL CALLBACK installed_lcid_proc(LPTSTR str);
-static BOOL lcid_installed(LCID lcid);
-static VALUE fole_s_set_locale(VALUE self, VALUE vlcid);
-static VALUE fole_s_create_guid(VALUE self);
-static VALUE fole_s_ole_initialize(VALUE self);
-static VALUE fole_s_ole_uninitialize(VALUE self);
-static VALUE fole_initialize(int argc, VALUE *argv, VALUE self);
-static int hash2named_arg(VALUE key, VALUE val, VALUE pop);
-static VALUE set_argv(VARIANTARG* realargs, unsigned int beg, unsigned int end);
-static VALUE ole_invoke(int argc, VALUE *argv, VALUE self, USHORT wFlags, BOOL is_bracket);
-static VALUE fole_invoke(int argc, VALUE *argv, VALUE self);
-static VALUE ole_invoke2(VALUE self, VALUE dispid, VALUE args, VALUE types, USHORT dispkind);
-static VALUE fole_invoke2(VALUE self, VALUE dispid, VALUE args, VALUE types);
-static VALUE fole_getproperty2(VALUE self, VALUE dispid, VALUE args, VALUE types);
-static VALUE fole_setproperty2(VALUE self, VALUE dispid, VALUE args, VALUE types);
-static VALUE fole_setproperty_with_bracket(int argc, VALUE *argv, VALUE self);
-static VALUE fole_setproperty(int argc, VALUE *argv, VALUE self);
-static VALUE fole_getproperty_with_bracket(int argc, VALUE *argv, VALUE self);
-static VALUE ole_propertyput(VALUE self, VALUE property, VALUE value);
-static VALUE fole_free(VALUE self);
-static VALUE ole_each_sub(VALUE pEnumV);
-static VALUE ole_ienum_free(VALUE pEnumV);
-static VALUE fole_each(VALUE self);
-static VALUE fole_missing(int argc, VALUE *argv, VALUE self);
-static HRESULT typeinfo_from_ole(struct oledata *pole, ITypeInfo **ppti);
-static VALUE ole_methods(VALUE self, int mask);
-static VALUE fole_methods(VALUE self);
-static VALUE fole_get_methods(VALUE self);
-static VALUE fole_put_methods(VALUE self);
-static VALUE fole_func_methods(VALUE self);
-static VALUE fole_type(VALUE self);
-static VALUE fole_typelib(VALUE self);
-static VALUE fole_query_interface(VALUE self, VALUE str_iid);
-static VALUE fole_respond_to(VALUE self, VALUE method);
-static VALUE ole_usertype2val(ITypeInfo *pTypeInfo, TYPEDESC *pTypeDesc, VALUE typedetails);
-static VALUE ole_ptrtype2val(ITypeInfo *pTypeInfo, TYPEDESC *pTypeDesc, VALUE typedetails);
-static VALUE fole_method_help(VALUE self, VALUE cmdname);
-static VALUE fole_activex_initialize(VALUE self);
-
-static void com_hash_free(void *ptr);
-static void com_hash_mark(void *ptr);
-static size_t com_hash_size(const void *ptr);
-static void check_nano_server(void);
-
-static const rb_data_type_t ole_datatype = {
-    "win32ole",
-    {NULL, ole_free, ole_size,},
-    0, 0, RUBY_TYPED_FREE_IMMEDIATELY
-};
-
-static const rb_data_type_t win32ole_hash_datatype = {
-    "win32ole_hash",
-    {com_hash_mark, com_hash_free, com_hash_size,},
-    0, 0, RUBY_TYPED_FREE_IMMEDIATELY
-};
-
-static HRESULT (STDMETHODCALLTYPE mf_QueryInterface)(
-    IMessageFilter __RPC_FAR * This,
-    /* [in] */ REFIID riid,
-    /* [iid_is][out] */ void __RPC_FAR *__RPC_FAR *ppvObject)
-{
-    if (MEMCMP(riid, &IID_IUnknown, GUID, 1) == 0
-        || MEMCMP(riid, &IID_IMessageFilter, GUID, 1) == 0)
-    {
-        *ppvObject = &message_filter;
-        return S_OK;
-    }
-    return E_NOINTERFACE;
-}
-
-static ULONG (STDMETHODCALLTYPE mf_AddRef)(
-    IMessageFilter __RPC_FAR * This)
-{
-    return 1;
-}
-
-static ULONG (STDMETHODCALLTYPE mf_Release)(
-    IMessageFilter __RPC_FAR * This)
-{
-    return 1;
-}
-
-static DWORD (STDMETHODCALLTYPE mf_HandleInComingCall)(
-    IMessageFilter __RPC_FAR * pThis,
-    DWORD dwCallType,      //Type of incoming call
-    HTASK threadIDCaller,  //Task handle calling this task
-    DWORD dwTickCount,     //Elapsed tick count
-    LPINTERFACEINFO lpInterfaceInfo //Pointer to INTERFACEINFO structure
-    )
-{
-#ifdef DEBUG_MESSAGEFILTER
-    printf("incoming %08X, %08X, %d\n", dwCallType, threadIDCaller, dwTickCount);
-    fflush(stdout);
-#endif
-    switch (dwCallType)
-    {
-    case CALLTYPE_ASYNC:
-    case CALLTYPE_TOPLEVEL_CALLPENDING:
-    case CALLTYPE_ASYNC_CALLPENDING:
-        if (rb_during_gc()) {
-            return SERVERCALL_RETRYLATER;
-        }
-        break;
-    default:
-        break;
-    }
-    if (previous_filter) {
-        return previous_filter->lpVtbl->HandleInComingCall(previous_filter,
-                                                   dwCallType,
-                                                   threadIDCaller,
-                                                   dwTickCount,
-                                                   lpInterfaceInfo);
-    }
-    return SERVERCALL_ISHANDLED;
-}
-
-static DWORD (STDMETHODCALLTYPE mf_RetryRejectedCall)(
-    IMessageFilter* pThis,
-    HTASK threadIDCallee,  //Server task handle
-    DWORD dwTickCount,     //Elapsed tick count
-    DWORD dwRejectType     //Returned rejection message
-    )
-{
-    if (previous_filter) {
-        return previous_filter->lpVtbl->RetryRejectedCall(previous_filter,
-                                                  threadIDCallee,
-                                                  dwTickCount,
-                                                  dwRejectType);
-    }
-    return 1000;
-}
-
-static DWORD (STDMETHODCALLTYPE mf_MessagePending)(
-    IMessageFilter* pThis,
-    HTASK threadIDCallee,  //Called applications task handle
-    DWORD dwTickCount,     //Elapsed tick count
-    DWORD dwPendingType    //Call type
-    )
-{
-    if (rb_during_gc()) {
-        return PENDINGMSG_WAITNOPROCESS;
-    }
-    if (previous_filter) {
-        return previous_filter->lpVtbl->MessagePending(previous_filter,
-                                               threadIDCallee,
-                                               dwTickCount,
-                                               dwPendingType);
-    }
-    return PENDINGMSG_WAITNOPROCESS;
-}
-
-typedef struct _Win32OLEIDispatch
-{
-    IDispatch dispatch;
-    ULONG refcount;
-    VALUE obj;
-} Win32OLEIDispatch;
-
-static HRESULT ( STDMETHODCALLTYPE QueryInterface )(
-    IDispatch __RPC_FAR * This,
-    /* [in] */ REFIID riid,
-    /* [iid_is][out] */ void __RPC_FAR *__RPC_FAR *ppvObject)
-{
-    if (MEMCMP(riid, &IID_IUnknown, GUID, 1) == 0
-        || MEMCMP(riid, &IID_IDispatch, GUID, 1) == 0)
-    {
-        Win32OLEIDispatch* p = (Win32OLEIDispatch*)This;
-        p->refcount++;
-        *ppvObject = This;
-        return S_OK;
-    }
-    return E_NOINTERFACE;
-}
-
-static ULONG ( STDMETHODCALLTYPE AddRef )(
-    IDispatch __RPC_FAR * This)
-{
-    Win32OLEIDispatch* p = (Win32OLEIDispatch*)This;
-    return ++(p->refcount);
-}
-
-static ULONG ( STDMETHODCALLTYPE Release )(
-    IDispatch __RPC_FAR * This)
-{
-    Win32OLEIDispatch* p = (Win32OLEIDispatch*)This;
-    ULONG u = --(p->refcount);
-    if (u == 0) {
-        st_data_t key = p->obj;
-        st_delete(DATA_PTR(com_hash), &key, 0);
-        free(p);
-    }
-    return u;
-}
-
-static HRESULT ( STDMETHODCALLTYPE GetTypeInfoCount )(
-    IDispatch __RPC_FAR * This,
-    /* [out] */ UINT __RPC_FAR *pctinfo)
-{
-    return E_NOTIMPL;
-}
-
-static HRESULT ( STDMETHODCALLTYPE GetTypeInfo )(
-    IDispatch __RPC_FAR * This,
-    /* [in] */ UINT iTInfo,
-    /* [in] */ LCID lcid,
-    /* [out] */ ITypeInfo __RPC_FAR *__RPC_FAR *ppTInfo)
-{
-    return E_NOTIMPL;
-}
-
-
-static HRESULT ( STDMETHODCALLTYPE GetIDsOfNames )(
-    IDispatch __RPC_FAR * This,
-    /* [in] */ REFIID riid,
-    /* [size_is][in] */ LPOLESTR __RPC_FAR *rgszNames,
-    /* [in] */ UINT cNames,
-    /* [in] */ LCID lcid,
-    /* [size_is][out] */ DISPID __RPC_FAR *rgDispId)
-{
-    /*
-    Win32OLEIDispatch* p = (Win32OLEIDispatch*)This;
-    */
-    char* psz = ole_wc2mb(*rgszNames); // support only one method
-    ID nameid = rb_check_id_cstr(psz, (long)strlen(psz), cWIN32OLE_enc);
-    free(psz);
-    if ((ID)(DISPID)nameid != nameid) return E_NOINTERFACE;
-    *rgDispId = (DISPID)nameid;
-    return S_OK;
-}
-
-static /* [local] */ HRESULT ( STDMETHODCALLTYPE Invoke )(
-    IDispatch __RPC_FAR * This,
-    /* [in] */ DISPID dispIdMember,
-    /* [in] */ REFIID riid,
-    /* [in] */ LCID lcid,
-    /* [in] */ WORD wFlags,
-    /* [out][in] */ DISPPARAMS __RPC_FAR *pDispParams,
-    /* [out] */ VARIANT __RPC_FAR *pVarResult,
-    /* [out] */ EXCEPINFO __RPC_FAR *pExcepInfo,
-    /* [out] */ UINT __RPC_FAR *puArgErr)
-{
-    VALUE v;
-    int i;
-    int args = pDispParams->cArgs;
-    Win32OLEIDispatch* p = (Win32OLEIDispatch*)This;
-    VALUE* parg = ALLOCA_N(VALUE, args);
-    ID mid = (ID)dispIdMember;
-    for (i = 0; i < args; i++) {
-        *(parg + i) = ole_variant2val(&pDispParams->rgvarg[args - i - 1]);
-    }
-    if (dispIdMember == DISPID_VALUE) {
-        if (wFlags == DISPATCH_METHOD) {
-            mid = rb_intern("call");
-        } else if (wFlags & DISPATCH_PROPERTYGET) {
-            mid = rb_intern("value");
-        }
-    }
-    v = rb_funcallv(p->obj, mid, args, parg);
-    ole_val2variant(v, pVarResult);
-    return S_OK;
-}
-
-BOOL
-ole_initialized(void)
-{
-    return g_ole_initialized;
-}
-
-static IDispatch*
-val2dispatch(VALUE val)
-{
-    struct st_table *tbl = DATA_PTR(com_hash);
-    Win32OLEIDispatch* pdisp;
-    st_data_t data;
-    if (st_lookup(tbl, val, &data)) {
-        pdisp = (Win32OLEIDispatch *)(data & ~FIXNUM_FLAG);
-        pdisp->refcount++;
-    }
-    else {
-        pdisp = ALLOC(Win32OLEIDispatch);
-        pdisp->dispatch.lpVtbl = &com_vtbl;
-        pdisp->refcount = 1;
-        pdisp->obj = val;
-        st_insert(tbl, val, (VALUE)pdisp | FIXNUM_FLAG);
-    }
-    return &pdisp->dispatch;
-}
-
-static double
-rbtime2vtdate(VALUE tmobj)
-{
-    SYSTEMTIME st;
-    double t;
-    double nsec;
-
-    st.wYear = RB_FIX2INT(rb_funcall(tmobj, rb_intern("year"), 0));
-    st.wMonth = RB_FIX2INT(rb_funcall(tmobj, rb_intern("month"), 0));
-    st.wDay = RB_FIX2INT(rb_funcall(tmobj, rb_intern("mday"), 0));
-    st.wHour = RB_FIX2INT(rb_funcall(tmobj, rb_intern("hour"), 0));
-    st.wMinute = RB_FIX2INT(rb_funcall(tmobj, rb_intern("min"), 0));
-    st.wSecond = RB_FIX2INT(rb_funcall(tmobj, rb_intern("sec"), 0));
-    st.wMilliseconds = 0;
-    SystemTimeToVariantTime(&st, &t);
-
-    /*
-     * Unfortunately SystemTimeToVariantTime function always ignores the
-     * wMilliseconds of SYSTEMTIME struct.
-     * So, we need to calculate milliseconds by ourselves.
-     */
-    nsec =  RB_FIX2INT(rb_funcall(tmobj, rb_intern("nsec"), 0));
-    nsec /= 1000000.0;
-    nsec /= (24.0 * 3600.0);
-    nsec /= 1000;
-    return t + nsec;
-}
-
-static VALUE
-vtdate2rbtime(double date)
-{
-    SYSTEMTIME st;
-    VALUE v;
-    double msec;
-    double sec;
-    VariantTimeToSystemTime(date, &st);
-    v = rb_funcall(rb_cTime, rb_intern("new"), 6,
-                      RB_INT2FIX(st.wYear),
-                      RB_INT2FIX(st.wMonth),
-                      RB_INT2FIX(st.wDay),
-                      RB_INT2FIX(st.wHour),
-                      RB_INT2FIX(st.wMinute),
-                      RB_INT2FIX(st.wSecond));
-    st.wYear = RB_FIX2INT(rb_funcall(v, rb_intern("year"), 0));
-    st.wMonth = RB_FIX2INT(rb_funcall(v, rb_intern("month"), 0));
-    st.wDay = RB_FIX2INT(rb_funcall(v, rb_intern("mday"), 0));
-    st.wHour = RB_FIX2INT(rb_funcall(v, rb_intern("hour"), 0));
-    st.wMinute = RB_FIX2INT(rb_funcall(v, rb_intern("min"), 0));
-    st.wSecond = RB_FIX2INT(rb_funcall(v, rb_intern("sec"), 0));
-    st.wMilliseconds = 0;
-    SystemTimeToVariantTime(&st, &sec);
-    /*
-     * Unfortunately VariantTimeToSystemTime always ignores the
-     * wMilliseconds of SYSTEMTIME struct(The wMilliseconds is 0).
-     * So, we need to calculate milliseconds by ourselves.
-     */
-    msec = date - sec;
-    msec *= 24 * 60;
-    msec -= floor(msec);
-    msec *= 60;
-    if (msec >= 59) {
-        msec -= 60;
-    }
-    if (msec != 0) {
-        return rb_funcall(v, rb_intern("+"), 1, rb_float_new(msec));
-    }
-    return v;
-}
-
-#define ENC_MACHING_CP(enc,encname,cp) if(strcasecmp(rb_enc_name((enc)),(encname)) == 0) return cp
-
-static UINT ole_encoding2cp(rb_encoding *enc)
-{
-    /*
-     * Is there any better solution to convert
-     * Ruby encoding to Windows codepage???
-     */
-    ENC_MACHING_CP(enc, "Big5", 950);
-    ENC_MACHING_CP(enc, "CP51932", 51932);
-    ENC_MACHING_CP(enc, "CP850", 850);
-    ENC_MACHING_CP(enc, "CP852", 852);
-    ENC_MACHING_CP(enc, "CP855", 855);
-    ENC_MACHING_CP(enc, "CP949", 949);
-    ENC_MACHING_CP(enc, "EUC-JP", 20932);
-    ENC_MACHING_CP(enc, "EUC-KR", 51949);
-    ENC_MACHING_CP(enc, "EUC-TW", 51950);
-    ENC_MACHING_CP(enc, "GB18030", 54936);
-    ENC_MACHING_CP(enc, "GB2312", 20936);
-    ENC_MACHING_CP(enc, "GBK", 936);
-    ENC_MACHING_CP(enc, "IBM437", 437);
-    ENC_MACHING_CP(enc, "IBM720", 720);
-    ENC_MACHING_CP(enc, "IBM737", 737);
-    ENC_MACHING_CP(enc, "IBM775", 775);
-    ENC_MACHING_CP(enc, "IBM852", 852);
-    ENC_MACHING_CP(enc, "IBM855", 855);
-    ENC_MACHING_CP(enc, "IBM857", 857);
-    ENC_MACHING_CP(enc, "IBM860", 860);
-    ENC_MACHING_CP(enc, "IBM861", 861);
-    ENC_MACHING_CP(enc, "IBM862", 862);
-    ENC_MACHING_CP(enc, "IBM863", 863);
-    ENC_MACHING_CP(enc, "IBM864", 864);
-    ENC_MACHING_CP(enc, "IBM865", 865);
-    ENC_MACHING_CP(enc, "IBM866", 866);
-    ENC_MACHING_CP(enc, "IBM869", 869);
-    ENC_MACHING_CP(enc, "ISO-2022-JP", 50220);
-    ENC_MACHING_CP(enc, "ISO-8859-1", 28591);
-    ENC_MACHING_CP(enc, "ISO-8859-15", 28605);
-    ENC_MACHING_CP(enc, "ISO-8859-2", 28592);
-    ENC_MACHING_CP(enc, "ISO-8859-3", 28593);
-    ENC_MACHING_CP(enc, "ISO-8859-4", 28594);
-    ENC_MACHING_CP(enc, "ISO-8859-5", 28595);
-    ENC_MACHING_CP(enc, "ISO-8859-6", 28596);
-    ENC_MACHING_CP(enc, "ISO-8859-7", 28597);
-    ENC_MACHING_CP(enc, "ISO-8859-8", 28598);
-    ENC_MACHING_CP(enc, "ISO-8859-9", 28599);
-    ENC_MACHING_CP(enc, "KOI8-R", 20866);
-    ENC_MACHING_CP(enc, "KOI8-U", 21866);
-    ENC_MACHING_CP(enc, "Shift_JIS", 932);
-    ENC_MACHING_CP(enc, "UTF-16BE", 1201);
-    ENC_MACHING_CP(enc, "UTF-16LE", 1200);
-    ENC_MACHING_CP(enc, "UTF-7", 65000);
-    ENC_MACHING_CP(enc, "UTF-8", 65001);
-    ENC_MACHING_CP(enc, "Windows-1250", 1250);
-    ENC_MACHING_CP(enc, "Windows-1251", 1251);
-    ENC_MACHING_CP(enc, "Windows-1252", 1252);
-    ENC_MACHING_CP(enc, "Windows-1253", 1253);
-    ENC_MACHING_CP(enc, "Windows-1254", 1254);
-    ENC_MACHING_CP(enc, "Windows-1255", 1255);
-    ENC_MACHING_CP(enc, "Windows-1256", 1256);
-    ENC_MACHING_CP(enc, "Windows-1257", 1257);
-    ENC_MACHING_CP(enc, "Windows-1258", 1258);
-    ENC_MACHING_CP(enc, "Windows-31J", 932);
-    ENC_MACHING_CP(enc, "Windows-874", 874);
-    ENC_MACHING_CP(enc, "eucJP-ms", 20932);
-    return CP_ACP;
-}
-
-static void
-failed_load_conv51932(void)
-{
-    rb_raise(eWIN32OLERuntimeError, "fail to load convert function for CP51932");
-}
-
-#ifndef pIMultiLanguage
-static void
-load_conv_function51932(void)
-{
-    HRESULT hr = E_NOINTERFACE;
-    void *p;
-    if (!pIMultiLanguage) {
-#if defined(HAVE_TYPE_IMULTILANGUAGE2)
-        hr = CoCreateInstance(&CLSID_CMultiLanguage, NULL, CLSCTX_INPROC_SERVER,
-                              &IID_IMultiLanguage2, &p);
-#elif defined(HAVE_TYPE_IMULTILANGUAGE)
-        hr = CoCreateInstance(&CLSID_CMultiLanguage, NULL, CLSCTX_INPROC_SERVER,
-                              &IID_IMultiLanguage, &p);
-#endif
-        if (FAILED(hr)) {
-            failed_load_conv51932();
-        }
-        pIMultiLanguage = p;
-    }
-}
-#define need_conv_function51932() (load_conv_function51932(), 1)
-#else
-#define load_conv_function51932() failed_load_conv51932()
-#define need_conv_function51932() (failed_load_conv51932(), 0)
-#endif
-
-#define conv_51932(cp) ((cp) == 51932 && need_conv_function51932())
-
-static void
-set_ole_codepage(UINT cp)
-{
-    if (code_page_installed(cp)) {
-        cWIN32OLE_cp = cp;
-    } else {
-        switch(cp) {
-        case CP_ACP:
-        case CP_OEMCP:
-        case CP_MACCP:
-        case CP_THREAD_ACP:
-        case CP_SYMBOL:
-        case CP_UTF7:
-        case CP_UTF8:
-            cWIN32OLE_cp = cp;
-            break;
-        case 51932:
-            cWIN32OLE_cp = cp;
-            load_conv_function51932();
-            break;
-        default:
-            rb_raise(eWIN32OLERuntimeError, "codepage should be WIN32OLE::CP_ACP, WIN32OLE::CP_OEMCP, WIN32OLE::CP_MACCP, WIN32OLE::CP_THREAD_ACP, WIN32OLE::CP_SYMBOL, WIN32OLE::CP_UTF7, WIN32OLE::CP_UTF8, or installed codepage.");
-            break;
-        }
-    }
-    cWIN32OLE_enc = ole_cp2encoding(cWIN32OLE_cp);
-}
-
-
-static UINT
-ole_init_cp(void)
-{
-    UINT cp;
-    rb_encoding *encdef;
-    encdef = rb_default_internal_encoding();
-    if (!encdef) {
-        encdef = rb_default_external_encoding();
-    }
-    cp = ole_encoding2cp(encdef);
-    set_ole_codepage(cp);
-    return cp;
-}
-
-struct myCPINFOEX {
-  UINT MaxCharSize;
-  BYTE DefaultChar[2];
-  BYTE LeadByte[12];
-  WCHAR UnicodeDefaultChar;
-  UINT CodePage;
-  char CodePageName[MAX_PATH];
-};
-
-static rb_encoding *
-ole_cp2encoding(UINT cp)
-{
-    static BOOL (*pGetCPInfoEx)(UINT, DWORD, struct myCPINFOEX *) = NULL;
-    struct myCPINFOEX* buf;
-    VALUE enc_name;
-    char *enc_cstr;
-    int idx;
-
-    if (!code_page_installed(cp)) {
-        switch(cp) {
-          case CP_ACP:
-            cp = GetACP();
-            break;
-          case CP_OEMCP:
-            cp = GetOEMCP();
-            break;
-          case CP_MACCP:
-          case CP_THREAD_ACP:
-            if (!pGetCPInfoEx) {
-                pGetCPInfoEx = (BOOL (*)(UINT, DWORD, struct myCPINFOEX *))
-                    GetProcAddress(GetModuleHandle("kernel32"), "GetCPInfoEx");
-                if (!pGetCPInfoEx) {
-                    pGetCPInfoEx = (void*)-1;
-                }
-            }
-            buf = ALLOCA_N(struct myCPINFOEX, 1);
-            ZeroMemory(buf, sizeof(struct myCPINFOEX));
-            if (pGetCPInfoEx == (void*)-1 || !pGetCPInfoEx(cp, 0, buf)) {
-                rb_raise(eWIN32OLERuntimeError, "cannot map codepage to encoding.");
-                break;	/* never reach here */
-            }
-            cp = buf->CodePage;
-            break;
-          case CP_SYMBOL:
-          case CP_UTF7:
-          case CP_UTF8:
-            break;
-          case 51932:
-            load_conv_function51932();
-            break;
-          default:
-            rb_raise(eWIN32OLERuntimeError, "codepage should be WIN32OLE::CP_ACP, WIN32OLE::CP_OEMCP, WIN32OLE::CP_MACCP, WIN32OLE::CP_THREAD_ACP, WIN32OLE::CP_SYMBOL, WIN32OLE::CP_UTF7, WIN32OLE::CP_UTF8, or installed codepage.");
-            break;
-        }
-    }
-
-    enc_name = rb_sprintf("CP%d", cp);
-    idx = rb_enc_find_index(enc_cstr = StringValueCStr(enc_name));
-    if (idx < 0)
-        idx = rb_define_dummy_encoding(enc_cstr);
-    return rb_enc_from_index(idx);
-}
-
-#ifndef pIMultiLanguage
-static HRESULT
-ole_ml_wc2mb_conv0(LPWSTR pw, LPSTR pm, UINT *size)
-{
-    DWORD dw = 0;
-    return pIMultiLanguage->lpVtbl->ConvertStringFromUnicode(pIMultiLanguage,
-                    &dw, cWIN32OLE_cp, pw, NULL, pm, size);
-}
-#define ole_ml_wc2mb_conv(pw, pm, size, onfailure) do { \
-        HRESULT hr = ole_ml_wc2mb_conv0(pw, pm, &size); \
-        if (FAILED(hr)) { \
-            onfailure; \
-            ole_raise(hr, eWIN32OLERuntimeError, "fail to convert Unicode to CP%d", cWIN32OLE_cp); \
-        } \
-    } while (0)
-#endif
-
-#define ole_wc2mb_conv(pw, pm, size) WideCharToMultiByte(cWIN32OLE_cp, 0, (pw), -1, (pm), (size), NULL, NULL)
-
-static char *
-ole_wc2mb_alloc(LPWSTR pw, char *(alloc)(UINT size, void *arg), void *arg)
-{
-    LPSTR pm;
-    UINT size = 0;
-    if (conv_51932(cWIN32OLE_cp)) {
-#ifndef pIMultiLanguage
-        ole_ml_wc2mb_conv(pw, NULL, size, {});
-        pm = alloc(size, arg);
-        if (size) ole_ml_wc2mb_conv(pw, pm, size, xfree(pm));
-        pm[size] = '\0';
-        return pm;
-#endif
-    }
-    size = ole_wc2mb_conv(pw, NULL, 0);
-    pm = alloc(size, arg);
-    if (size) ole_wc2mb_conv(pw, pm, size);
-    pm[size] = '\0';
-    return pm;
-}
-
-static char *
-ole_alloc_str(UINT size, void *arg)
-{
-    return ALLOC_N(char, size + 1);
-}
-
-char *
-ole_wc2mb(LPWSTR pw)
-{
-    return ole_wc2mb_alloc(pw, ole_alloc_str, NULL);
-}
-
-static void
-ole_freeexceptinfo(EXCEPINFO *pExInfo)
-{
-    SysFreeString(pExInfo->bstrDescription);
-    SysFreeString(pExInfo->bstrSource);
-    SysFreeString(pExInfo->bstrHelpFile);
-}
-
-static VALUE
-ole_excepinfo2msg(EXCEPINFO *pExInfo)
-{
-    char error_code[40];
-    char *pSource = NULL;
-    char *pDescription = NULL;
-    VALUE error_msg;
-    if(pExInfo->pfnDeferredFillIn != NULL) {
-        (*pExInfo->pfnDeferredFillIn)(pExInfo);
-    }
-    if (pExInfo->bstrSource != NULL) {
-        pSource = ole_wc2mb(pExInfo->bstrSource);
-    }
-    if (pExInfo->bstrDescription != NULL) {
-        pDescription = ole_wc2mb(pExInfo->bstrDescription);
-    }
-    if(pExInfo->wCode == 0) {
-        sprintf(error_code, "\n    OLE error code:%lX in ", (unsigned long)pExInfo->scode);
-    }
-    else{
-        sprintf(error_code, "\n    OLE error code:%u in ", pExInfo->wCode);
-    }
-    error_msg = rb_str_new2(error_code);
-    if(pSource != NULL) {
-        rb_str_cat2(error_msg, pSource);
-    }
-    else {
-        rb_str_cat(error_msg, "<Unknown>", 9);
-    }
-    rb_str_cat2(error_msg, "\n      ");
-    if(pDescription != NULL) {
-        rb_str_cat2(error_msg, pDescription);
-    }
-    else {
-        rb_str_cat2(error_msg, "<No Description>");
-    }
-    if(pSource) free(pSource);
-    if(pDescription) free(pDescription);
-    ole_freeexceptinfo(pExInfo);
-    return error_msg;
-}
-
-void
-ole_uninitialize(void)
-{
-    if (!g_ole_initialized) return;
-    OleUninitialize();
-    g_ole_initialized_set(FALSE);
-}
-
-static void
-ole_uninitialize_hook(rb_event_flag_t evflag, VALUE data, VALUE self, ID mid, VALUE klass)
-{
-    ole_uninitialize();
-}
-
-void
-ole_initialize(void)
-{
-    HRESULT hr;
-
-    if(!g_uninitialize_hooked) {
-        rb_add_event_hook(ole_uninitialize_hook, RUBY_EVENT_THREAD_END, Qnil);
-        g_uninitialize_hooked = TRUE;
-    }
-
-    if(g_ole_initialized == FALSE) {
-        if(g_running_nano) {
-            hr = CoInitializeEx(NULL, COINIT_MULTITHREADED);
-        } else {
-            hr = OleInitialize(NULL);
-        }
-        if(FAILED(hr)) {
-            ole_raise(hr, rb_eRuntimeError, "fail: OLE initialize");
-        }
-        g_ole_initialized_set(TRUE);
-
-        if (g_running_nano == FALSE) {
-            hr = CoRegisterMessageFilter(&imessage_filter, &previous_filter);
-            if(FAILED(hr)) {
-                previous_filter = NULL;
-                ole_raise(hr, rb_eRuntimeError, "fail: install OLE MessageFilter");
-            }
-        }
-    }
-}
-
-static void
-ole_free(void *ptr)
-{
-    struct oledata *pole = ptr;
-    OLE_FREE(pole->pDispatch);
-    free(pole);
-}
-
-static size_t ole_size(const void *ptr)
-{
-    return ptr ? sizeof(struct oledata) : 0;
-}
-
-struct oledata *
-oledata_get_struct(VALUE ole)
-{
-    struct oledata *pole;
-    TypedData_Get_Struct(ole, struct oledata, &ole_datatype, pole);
-    return pole;
-}
-
-LPWSTR
-ole_vstr2wc(VALUE vstr)
-{
-    rb_encoding *enc;
-    int cp;
-    LPWSTR pw;
-    st_data_t data;
-    struct st_table *tbl = DATA_PTR(enc2cp_hash);
-
-    /* do not type-conversion here to prevent from other arguments
-     * changing (if exist) */
-    Check_Type(vstr, T_STRING);
-    if (RSTRING_LEN(vstr) == 0) {
-        return NULL;
-    }
-
-    enc = rb_enc_get(vstr);
-
-    if (st_lookup(tbl, (VALUE)enc | FIXNUM_FLAG, &data)) {
-        cp = RB_FIX2INT((VALUE)data);
-    } else {
-        cp = ole_encoding2cp(enc);
-        if (code_page_installed(cp) ||
-            cp == CP_ACP ||
-            cp == CP_OEMCP ||
-            cp == CP_MACCP ||
-            cp == CP_THREAD_ACP ||
-            cp == CP_SYMBOL ||
-            cp == CP_UTF7 ||
-            cp == CP_UTF8 ||
-            cp == 51932) {
-            st_insert(tbl, (VALUE)enc | FIXNUM_FLAG, RB_INT2FIX(cp));
-        } else {
-            rb_raise(eWIN32OLERuntimeError, "not installed Windows codepage(%d) according to `%s'", cp, rb_enc_name(enc));
-        }
-    }
-    pw = ole_mb2wc(RSTRING_PTR(vstr), RSTRING_LENINT(vstr), cp);
-    RB_GC_GUARD(vstr);
-    return pw;
-}
-
-static LPWSTR
-ole_mb2wc(char *pm, int len, UINT cp)
-{
-    UINT size = 0;
-    LPWSTR pw;
-
-    if (conv_51932(cp)) {
-#ifndef pIMultiLanguage
-        DWORD dw = 0;
-        UINT n = len;
-        HRESULT hr = pIMultiLanguage->lpVtbl->ConvertStringToUnicode(pIMultiLanguage,
-                &dw, cp, pm, &n, NULL, &size);
-        if (FAILED(hr)) {
-            ole_raise(hr, eWIN32OLERuntimeError, "fail to convert CP%d to Unicode", cp);
-        }
-        pw = SysAllocStringLen(NULL, size);
-        n = len;
-        hr = pIMultiLanguage->lpVtbl->ConvertStringToUnicode(pIMultiLanguage,
-                &dw, cp, pm, &n, pw, &size);
-        if (FAILED(hr)) {
-            ole_raise(hr, eWIN32OLERuntimeError, "fail to convert CP%d to Unicode", cp);
-        }
-        return pw;
-#endif
-    }
-    size = MultiByteToWideChar(cp, 0, pm, len, NULL, 0);
-    pw = SysAllocStringLen(NULL, size);
-    pw[size-1] = 0;
-    MultiByteToWideChar(cp, 0, pm, len, pw, size);
-    return pw;
-}
-
-static char *
-ole_alloc_vstr(UINT size, void *arg)
-{
-    VALUE str = rb_enc_str_new(NULL, size, cWIN32OLE_enc);
-    *(VALUE *)arg = str;
-    return RSTRING_PTR(str);
-}
-
-VALUE
-ole_wc2vstr(LPWSTR pw, BOOL isfree)
-{
-    VALUE vstr;
-    ole_wc2mb_alloc(pw, ole_alloc_vstr, &vstr);
-    rb_str_set_len(vstr, (long)strlen(RSTRING_PTR(vstr)));
-    if(isfree)
-        SysFreeString(pw);
-    return vstr;
-}
-
-static VALUE
-ole_ary_m_entry(VALUE val, LONG *pid)
-{
-    VALUE obj = Qnil;
-    int i = 0;
-    obj = val;
-    while(RB_TYPE_P(obj, T_ARRAY)) {
-        obj = rb_ary_entry(obj, pid[i]);
-        i++;
-    }
-    return obj;
-}
-
-static VALUE
-is_all_index_under(LONG *pid, long *pub, long dim)
-{
-  long i = 0;
-  for (i = 0; i < dim; i++) {
-    if (pid[i] > pub[i]) {
-      return Qfalse;
-    }
-  }
-  return Qtrue;
-}
-
-void
-ole_val2variant_ex(VALUE val, VARIANT *var, VARTYPE vt)
-{
-    if (val == Qnil) {
-        if (vt == VT_VARIANT) {
-            ole_val2variant2(val, var);
-        } else {
-            V_VT(var) = (vt & ~VT_BYREF);
-            if (V_VT(var) == VT_DISPATCH) {
-                V_DISPATCH(var) = NULL;
-            } else if (V_VT(var) == VT_UNKNOWN) {
-                V_UNKNOWN(var) = NULL;
-            }
-        }
-        return;
-    }
-#if (defined(_MSC_VER) && (_MSC_VER >= 1300)) || defined(__CYGWIN__) || defined(__MINGW32__)
-    switch(vt & ~VT_BYREF) {
-    case VT_I8:
-        V_VT(var) = VT_I8;
-        V_I8(var) = NUM2I8 (val);
-        break;
-    case VT_UI8:
-        V_VT(var) = VT_UI8;
-        V_UI8(var) = NUM2UI8(val);
-        break;
-    default:
-        ole_val2variant2(val, var);
-        break;
-    }
-#else  /* (defined(_MSC_VER) && (_MSC_VER >= 1300)) || defined(__CYGWIN__) || defined(__MINGW32__) */
-    ole_val2variant2(val, var);
-#endif
-}
-
-VOID *
-val2variant_ptr(VALUE val, VARIANT *var, VARTYPE vt)
-{
-    VOID *p = NULL;
-    HRESULT hr = S_OK;
-    ole_val2variant_ex(val, var, vt);
-    if ((vt & ~VT_BYREF) == VT_VARIANT) {
-        p = var;
-    } else {
-        if ( (vt & ~VT_BYREF) != V_VT(var)) {
-            hr = VariantChangeTypeEx(var, var,
-                    cWIN32OLE_lcid, 0, (VARTYPE)(vt & ~VT_BYREF));
-            if (FAILED(hr)) {
-                ole_raise(hr, rb_eRuntimeError, "failed to change type");
-            }
-        }
-        p = get_ptr_of_variant(var);
-    }
-    if (p == NULL) {
-        rb_raise(rb_eRuntimeError, "failed to get pointer of variant");
-    }
-    return p;
-}
-
-static void *
-get_ptr_of_variant(VARIANT *pvar)
-{
-    switch(V_VT(pvar)) {
-    case VT_UI1:
-        return &V_UI1(pvar);
-        break;
-    case VT_I2:
-        return &V_I2(pvar);
-        break;
-    case VT_UI2:
-        return &V_UI2(pvar);
-        break;
-    case VT_I4:
-        return &V_I4(pvar);
-        break;
-    case VT_UI4:
-        return &V_UI4(pvar);
-        break;
-    case VT_R4:
-        return &V_R4(pvar);
-        break;
-    case VT_R8:
-        return &V_R8(pvar);
-        break;
-#if (defined(_MSC_VER) && (_MSC_VER >= 1300)) || defined(__CYGWIN__) || defined(__MINGW32__)
-    case VT_I8:
-        return &V_I8(pvar);
-        break;
-    case VT_UI8:
-        return &V_UI8(pvar);
-        break;
-#endif
-    case VT_INT:
-        return &V_INT(pvar);
-        break;
-    case VT_UINT:
-        return &V_UINT(pvar);
-        break;
-    case VT_CY:
-        return &V_CY(pvar);
-        break;
-    case VT_DATE:
-        return &V_DATE(pvar);
-        break;
-    case VT_BSTR:
-        return V_BSTR(pvar);
-        break;
-    case VT_DISPATCH:
-        return V_DISPATCH(pvar);
-        break;
-    case VT_ERROR:
-        return &V_ERROR(pvar);
-        break;
-    case VT_BOOL:
-        return &V_BOOL(pvar);
-        break;
-    case VT_UNKNOWN:
-        return V_UNKNOWN(pvar);
-        break;
-    case VT_ARRAY:
-        return &V_ARRAY(pvar);
-        break;
-    default:
-        return NULL;
-        break;
-    }
-}
-
-static void
-ole_set_safe_array(long n, SAFEARRAY *psa, LONG *pid, long *pub, VALUE val, long dim,  VARTYPE vt)
-{
-    VALUE val1;
-    HRESULT hr = S_OK;
-    VARIANT var;
-    VOID *p = NULL;
-    long i = n;
-    while(i >= 0) {
-        val1 = ole_ary_m_entry(val, pid);
-        VariantInit(&var);
-        p = val2variant_ptr(val1, &var, vt);
-        if (is_all_index_under(pid, pub, dim) == Qtrue) {
-            if ((V_VT(&var) == VT_DISPATCH && V_DISPATCH(&var) == NULL) ||
-                (V_VT(&var) == VT_UNKNOWN && V_UNKNOWN(&var) == NULL)) {
-                rb_raise(eWIN32OLERuntimeError, "element of array does not have IDispatch or IUnknown Interface");
-            }
-            hr = SafeArrayPutElement(psa, pid, p);
-        }
-        if (FAILED(hr)) {
-            ole_raise(hr, rb_eRuntimeError, "failed to SafeArrayPutElement");
-        }
-        pid[i] += 1;
-        if (pid[i] > pub[i]) {
-            pid[i] = 0;
-            i -= 1;
-        } else {
-            i = dim - 1;
-        }
-    }
-}
-
-static long
-dimension(VALUE val) {
-    long dim = 0;
-    long dim1 = 0;
-    long len = 0;
-    long i = 0;
-    if (RB_TYPE_P(val, T_ARRAY)) {
-        len = RARRAY_LEN(val);
-        for (i = 0; i < len; i++) {
-            dim1 = dimension(rb_ary_entry(val, i));
-            if (dim < dim1) {
-                dim = dim1;
-            }
-        }
-        dim += 1;
-    }
-    return dim;
-}
-
-static long
-ary_len_of_dim(VALUE ary, long dim) {
-    long ary_len = 0;
-    long ary_len1 = 0;
-    long len = 0;
-    long i = 0;
-    VALUE val;
-    if (dim == 0) {
-        if (RB_TYPE_P(ary, T_ARRAY)) {
-            ary_len = RARRAY_LEN(ary);
-        }
-    } else {
-        if (RB_TYPE_P(ary, T_ARRAY)) {
-            len = RARRAY_LEN(ary);
-            for (i = 0; i < len; i++) {
-                val = rb_ary_entry(ary, i);
-                ary_len1 = ary_len_of_dim(val, dim-1);
-                if (ary_len < ary_len1) {
-                    ary_len = ary_len1;
-                }
-            }
-        }
-    }
-    return ary_len;
-}
-
-HRESULT
-ole_val_ary2variant_ary(VALUE val, VARIANT *var, VARTYPE vt)
-{
-    long dim = 0;
-    int  i = 0;
-    HRESULT hr = S_OK;
-
-    SAFEARRAYBOUND *psab = NULL;
-    SAFEARRAY *psa = NULL;
-    long      *pub;
-    LONG      *pid;
-
-    Check_Type(val, T_ARRAY);
-
-    dim = dimension(val);
-
-    psab = ALLOC_N(SAFEARRAYBOUND, dim);
-    pub  = ALLOC_N(long, dim);
-    pid  = ALLOC_N(LONG, dim);
-
-    if(!psab || !pub || !pid) {
-        if(pub) free(pub);
-        if(psab) free(psab);
-        if(pid) free(pid);
-        rb_raise(rb_eRuntimeError, "memory allocation error");
-    }
-
-    for (i = 0; i < dim; i++) {
-        psab[i].cElements = ary_len_of_dim(val, i);
-        psab[i].lLbound = 0;
-        pub[i] = psab[i].cElements - 1;
-        pid[i] = 0;
-    }
-    /* Create and fill VARIANT array */
-    if ((vt & ~VT_BYREF) == VT_ARRAY) {
-        vt = (vt | VT_VARIANT);
-    }
-    psa = SafeArrayCreate((VARTYPE)(vt & VT_TYPEMASK), dim, psab);
-    if (psa == NULL)
-        hr = E_OUTOFMEMORY;
-    else
-        hr = SafeArrayLock(psa);
-    if (SUCCEEDED(hr)) {
-        ole_set_safe_array(dim-1, psa, pid, pub, val, dim, (VARTYPE)(vt & VT_TYPEMASK));
-        hr = SafeArrayUnlock(psa);
-    }
-
-    if(pub) free(pub);
-    if(psab) free(psab);
-    if(pid) free(pid);
-
-    if (SUCCEEDED(hr)) {
-        V_VT(var) = vt;
-        V_ARRAY(var) = psa;
-    }
-    else {
-        if (psa != NULL)
-            SafeArrayDestroy(psa);
-    }
-    return hr;
-}
-
-void
-ole_val2variant(VALUE val, VARIANT *var)
-{
-    struct oledata *pole = NULL;
-    if(rb_obj_is_kind_of(val, cWIN32OLE)) {
-        pole = oledata_get_struct(val);
-        OLE_ADDREF(pole->pDispatch);
-        V_VT(var) = VT_DISPATCH;
-        V_DISPATCH(var) = pole->pDispatch;
-        return;
-    }
-    if (rb_obj_is_kind_of(val, cWIN32OLE_VARIANT)) {
-        ole_variant2variant(val, var);
-        return;
-    }
-    if (rb_obj_is_kind_of(val, cWIN32OLE_RECORD)) {
-        ole_rec2variant(val, var);
-        return;
-    }
-    if (rb_obj_is_kind_of(val, rb_cTime)) {
-        V_VT(var) = VT_DATE;
-        V_DATE(var) = rbtime2vtdate(val);
-        return;
-    }
-    switch (TYPE(val)) {
-    case T_ARRAY:
-        ole_val_ary2variant_ary(val, var, VT_VARIANT|VT_ARRAY);
-        break;
-    case T_STRING:
-        V_VT(var) = VT_BSTR;
-        V_BSTR(var) = ole_vstr2wc(val);
-        break;
-    case T_FIXNUM:
-        V_VT(var) = VT_I4;
-        {
-            long v = RB_NUM2LONG(val);
-            V_I4(var) = (LONG)v;
-#if SIZEOF_LONG > 4
-            if (V_I4(var) != v) {
-                V_I8(var) = v;
-                V_VT(var) = VT_I8;
-            }
-#endif
-        }
-        break;
-    case T_BIGNUM:
-        V_VT(var) = VT_R8;
-        V_R8(var) = rb_big2dbl(val);
-        break;
-    case T_FLOAT:
-        V_VT(var) = VT_R8;
-        V_R8(var) = NUM2DBL(val);
-        break;
-    case T_TRUE:
-        V_VT(var) = VT_BOOL;
-        V_BOOL(var) = VARIANT_TRUE;
-        break;
-    case T_FALSE:
-        V_VT(var) = VT_BOOL;
-        V_BOOL(var) = VARIANT_FALSE;
-        break;
-    case T_NIL:
-        if (g_nil_to == VT_ERROR) {
-            V_VT(var) = VT_ERROR;
-            V_ERROR(var) = DISP_E_PARAMNOTFOUND;
-        }else {
-            V_VT(var) = VT_EMPTY;
-        }
-        break;
-    default:
-        V_VT(var) = VT_DISPATCH;
-        V_DISPATCH(var) = val2dispatch(val);
-        break;
-    }
-}
-
-void
-ole_val2variant2(VALUE val, VARIANT *var)
-{
-    g_nil_to = VT_EMPTY;
-    ole_val2variant(val, var);
-    g_nil_to = VT_ERROR;
-}
-
-VALUE
-make_inspect(const char *class_name, VALUE detail)
-{
-    VALUE str;
-    str = rb_str_new2("#<");
-    rb_str_cat2(str, class_name);
-    rb_str_cat2(str, ":");
-    rb_str_concat(str, detail);
-    rb_str_cat2(str, ">");
-    return str;
-}
-
-VALUE
-default_inspect(VALUE self, const char *class_name)
-{
-    VALUE detail = rb_funcall(self, rb_intern("to_s"), 0);
-    return make_inspect(class_name, detail);
-}
-
-static VALUE
-ole_set_member(VALUE self, IDispatch *dispatch)
-{
-    struct oledata *pole = NULL;
-    pole = oledata_get_struct(self);
-    if (pole->pDispatch) {
-        OLE_RELEASE(pole->pDispatch);
-        pole->pDispatch = NULL;
-    }
-    pole->pDispatch = dispatch;
-    return self;
-}
-
-
-static VALUE
-fole_s_allocate(VALUE klass)
-{
-    struct oledata *pole;
-    VALUE obj;
-    ole_initialize();
-    obj = TypedData_Make_Struct(klass, struct oledata, &ole_datatype, pole);
-    pole->pDispatch = NULL;
-    return obj;
-}
-
-static VALUE
-create_win32ole_object(VALUE klass, IDispatch *pDispatch, int argc, VALUE *argv)
-{
-    VALUE obj = fole_s_allocate(klass);
-    ole_set_member(obj, pDispatch);
-    return obj;
-}
-
-static VALUE
-ary_new_dim(VALUE myary, LONG *pid, LONG *plb, LONG dim) {
-    long i;
-    VALUE obj = Qnil;
-    VALUE pobj = Qnil;
-    long *ids = ALLOC_N(long, dim);
-    if (!ids) {
-        rb_raise(rb_eRuntimeError, "memory allocation error");
-    }
-    for(i = 0; i < dim; i++) {
-        ids[i] = pid[i] - plb[i];
-    }
-    obj = myary;
-    pobj = myary;
-    for(i = 0; i < dim-1; i++) {
-        obj = rb_ary_entry(pobj, ids[i]);
-        if (obj == Qnil) {
-            rb_ary_store(pobj, ids[i], rb_ary_new());
-        }
-        obj = rb_ary_entry(pobj, ids[i]);
-        pobj = obj;
-    }
-    if (ids) free(ids);
-    return obj;
-}
-
-static void
-ary_store_dim(VALUE myary, LONG *pid, LONG *plb, LONG dim, VALUE val) {
-    long id = pid[dim - 1] - plb[dim - 1];
-    VALUE obj = ary_new_dim(myary, pid, plb, dim);
-    rb_ary_store(obj, id, val);
-}
-
-VALUE
-ole_variant2val(VARIANT *pvar)
-{
-    VALUE obj = Qnil;
-    VARTYPE vt = V_VT(pvar);
-    HRESULT hr;
-    while ( vt == (VT_BYREF | VT_VARIANT) ) {
-        pvar = V_VARIANTREF(pvar);
-        vt = V_VT(pvar);
-    }
-
-    if(V_ISARRAY(pvar)) {
-        VARTYPE vt_base = vt & VT_TYPEMASK;
-        SAFEARRAY *psa = V_ISBYREF(pvar) ? *V_ARRAYREF(pvar) : V_ARRAY(pvar);
-        UINT i = 0;
-        LONG *pid, *plb, *pub;
-        VARIANT variant;
-        VALUE val;
-        UINT dim = 0;
-        if (!psa) {
-            return obj;
-        }
-        dim = SafeArrayGetDim(psa);
-        pid = ALLOC_N(LONG, dim);
-        plb = ALLOC_N(LONG, dim);
-        pub = ALLOC_N(LONG, dim);
-
-        if(!pid || !plb || !pub) {
-            if(pid) free(pid);
-            if(plb) free(plb);
-            if(pub) free(pub);
-            rb_raise(rb_eRuntimeError, "memory allocation error");
-        }
-
-        for(i = 0; i < dim; ++i) {
-            SafeArrayGetLBound(psa, i+1, &plb[i]);
-            SafeArrayGetLBound(psa, i+1, &pid[i]);
-            SafeArrayGetUBound(psa, i+1, &pub[i]);
-        }
-        hr = SafeArrayLock(psa);
-        if (SUCCEEDED(hr)) {
-            obj = rb_ary_new();
-            i = 0;
-            VariantInit(&variant);
-            V_VT(&variant) = vt_base | VT_BYREF;
-            if (vt_base == VT_RECORD) {
-                hr = SafeArrayGetRecordInfo(psa, &V_RECORDINFO(&variant));
-                if (SUCCEEDED(hr)) {
-                    V_VT(&variant) = VT_RECORD;
-                }
-            }
-            while (i < dim) {
-                ary_new_dim(obj, pid, plb, dim);
-                if (vt_base == VT_RECORD)
-                    hr = SafeArrayPtrOfIndex(psa, pid, &V_RECORD(&variant));
-                else
-                    hr = SafeArrayPtrOfIndex(psa, pid, &V_BYREF(&variant));
-                if (SUCCEEDED(hr)) {
-                    val = ole_variant2val(&variant);
-                    ary_store_dim(obj, pid, plb, dim, val);
-                }
-                for (i = 0; i < dim; ++i) {
-                    if (++pid[i] <= pub[i])
-                        break;
-                    pid[i] = plb[i];
-                }
-            }
-            SafeArrayUnlock(psa);
-        }
-        if(pid) free(pid);
-        if(plb) free(plb);
-        if(pub) free(pub);
-        return obj;
-    }
-    switch(V_VT(pvar) & ~VT_BYREF){
-    case VT_EMPTY:
-        break;
-    case VT_NULL:
-        break;
-    case VT_I1:
-        if(V_ISBYREF(pvar))
-            obj = RB_INT2NUM((long)*V_I1REF(pvar));
-        else
-            obj = RB_INT2NUM((long)V_I1(pvar));
-        break;
-
-    case VT_UI1:
-        if(V_ISBYREF(pvar))
-            obj = RB_INT2NUM((long)*V_UI1REF(pvar));
-        else
-            obj = RB_INT2NUM((long)V_UI1(pvar));
-        break;
-
-    case VT_I2:
-        if(V_ISBYREF(pvar))
-            obj = RB_INT2NUM((long)*V_I2REF(pvar));
-        else
-            obj = RB_INT2NUM((long)V_I2(pvar));
-        break;
-
-    case VT_UI2:
-        if(V_ISBYREF(pvar))
-            obj = RB_INT2NUM((long)*V_UI2REF(pvar));
-        else
-            obj = RB_INT2NUM((long)V_UI2(pvar));
-        break;
-
-    case VT_I4:
-        if(V_ISBYREF(pvar))
-            obj = RB_INT2NUM((long)*V_I4REF(pvar));
-        else
-            obj = RB_INT2NUM((long)V_I4(pvar));
-        break;
-
-    case VT_UI4:
-        if(V_ISBYREF(pvar))
-            obj = RB_INT2NUM((long)*V_UI4REF(pvar));
-        else
-            obj = RB_INT2NUM((long)V_UI4(pvar));
-        break;
-
-    case VT_INT:
-        if(V_ISBYREF(pvar))
-            obj = RB_INT2NUM((long)*V_INTREF(pvar));
-        else
-            obj = RB_INT2NUM((long)V_INT(pvar));
-        break;
-
-    case VT_UINT:
-        if(V_ISBYREF(pvar))
-            obj = RB_INT2NUM((long)*V_UINTREF(pvar));
-        else
-            obj = RB_INT2NUM((long)V_UINT(pvar));
-        break;
-
-#if (defined(_MSC_VER) && (_MSC_VER >= 1300)) || defined(__CYGWIN__) || defined(__MINGW32__)
-    case VT_I8:
-        if(V_ISBYREF(pvar))
-#if (defined(_MSC_VER) && (_MSC_VER >= 1300)) || defined(__CYGWIN__) || defined(__MINGW32__)
-#ifdef V_I8REF
-            obj = I8_2_NUM(*V_I8REF(pvar));
-#endif
-#else
-            obj = Qnil;
-#endif
-        else
-            obj = I8_2_NUM(V_I8(pvar));
-        break;
-    case VT_UI8:
-        if(V_ISBYREF(pvar))
-#if (defined(_MSC_VER) && (_MSC_VER >= 1300)) || defined(__CYGWIN__) || defined(__MINGW32__)
-#ifdef V_UI8REF
-            obj = UI8_2_NUM(*V_UI8REF(pvar));
-#endif
-#else
-            obj = Qnil;
-#endif
-        else
-            obj = UI8_2_NUM(V_UI8(pvar));
-        break;
-#endif  /* (defined(_MSC_VER) && (_MSC_VER >= 1300)) || defined(__CYGWIN__) || defined(__MINGW32__) */
-
-    case VT_R4:
-        if(V_ISBYREF(pvar))
-            obj = rb_float_new(*V_R4REF(pvar));
-        else
-            obj = rb_float_new(V_R4(pvar));
-        break;
-
-    case VT_R8:
-        if(V_ISBYREF(pvar))
-            obj = rb_float_new(*V_R8REF(pvar));
-        else
-            obj = rb_float_new(V_R8(pvar));
-        break;
-
-    case VT_BSTR:
-    {
-        BSTR bstr;
-        if(V_ISBYREF(pvar))
-            bstr = *V_BSTRREF(pvar);
-        else
-            bstr = V_BSTR(pvar);
-        obj = (SysStringLen(bstr) == 0)
-            ? rb_str_new2("")
-            : ole_wc2vstr(bstr, FALSE);
-        break;
-    }
-
-    case VT_ERROR:
-        if(V_ISBYREF(pvar))
-            obj = RB_INT2NUM(*V_ERRORREF(pvar));
-        else
-            obj = RB_INT2NUM(V_ERROR(pvar));
-        break;
-
-    case VT_BOOL:
-        if (V_ISBYREF(pvar))
-            obj = (*V_BOOLREF(pvar) ? Qtrue : Qfalse);
-        else
-            obj = (V_BOOL(pvar) ? Qtrue : Qfalse);
-        break;
-
-    case VT_DISPATCH:
-    {
-        IDispatch *pDispatch;
-
-        if (V_ISBYREF(pvar))
-            pDispatch = *V_DISPATCHREF(pvar);
-        else
-            pDispatch = V_DISPATCH(pvar);
-
-        if (pDispatch != NULL ) {
-            OLE_ADDREF(pDispatch);
-            obj = create_win32ole_object(cWIN32OLE, pDispatch, 0, 0);
-        }
-        break;
-    }
-
-    case VT_UNKNOWN:
-    {
-        /* get IDispatch interface from IUnknown interface */
-        IUnknown *punk;
-        IDispatch *pDispatch;
-        void *p;
-        HRESULT hr;
-
-        if (V_ISBYREF(pvar))
-            punk = *V_UNKNOWNREF(pvar);
-        else
-            punk = V_UNKNOWN(pvar);
-
-        if(punk != NULL) {
-           hr = punk->lpVtbl->QueryInterface(punk, &IID_IDispatch, &p);
-           if(SUCCEEDED(hr)) {
-               pDispatch = p;
-               obj = create_win32ole_object(cWIN32OLE, pDispatch, 0, 0);
-           }
-        }
-        break;
-    }
-
-    case VT_DATE:
-    {
-        DATE date;
-        if(V_ISBYREF(pvar))
-            date = *V_DATEREF(pvar);
-        else
-            date = V_DATE(pvar);
-
-        obj =  vtdate2rbtime(date);
-        break;
-    }
-
-    case VT_RECORD:
-    {
-        IRecordInfo *pri = V_RECORDINFO(pvar);
-        void *prec = V_RECORD(pvar);
-        obj = create_win32ole_record(pri, prec);
-        break;
-    }
-
-    case VT_CY:
-    default:
-        {
-        HRESULT hr;
-        VARIANT variant;
-        VariantInit(&variant);
-        hr = VariantChangeTypeEx(&variant, pvar,
-                                  cWIN32OLE_lcid, 0, VT_BSTR);
-        if (SUCCEEDED(hr) && V_VT(&variant) == VT_BSTR) {
-            obj = ole_wc2vstr(V_BSTR(&variant), FALSE);
-        }
-        VariantClear(&variant);
-        break;
-        }
-    }
-    return obj;
-}
-
-LONG
-reg_open_key(HKEY hkey, const char *name, HKEY *phkey)
-{
-    return RegOpenKeyEx(hkey, name, 0, KEY_READ, phkey);
-}
-
-LONG
-reg_open_vkey(HKEY hkey, VALUE key, HKEY *phkey)
-{
-    return reg_open_key(hkey, StringValuePtr(key), phkey);
-}
-
-VALUE
-reg_enum_key(HKEY hkey, DWORD i)
-{
-    char buf[BUFSIZ + 1];
-    DWORD size_buf = sizeof(buf);
-    FILETIME ft;
-    LONG err = RegEnumKeyEx(hkey, i, buf, &size_buf,
-                            NULL, NULL, NULL, &ft);
-    if(err == ERROR_SUCCESS) {
-        buf[BUFSIZ] = '\0';
-        return rb_str_new2(buf);
-    }
-    return Qnil;
-}
-
-VALUE
-reg_get_val(HKEY hkey, const char *subkey)
-{
-    char *pbuf;
-    DWORD dwtype = 0;
-    DWORD size = 0;
-    VALUE val = Qnil;
-    LONG err = RegQueryValueEx(hkey, subkey, NULL, &dwtype, NULL, &size);
-
-    if (err == ERROR_SUCCESS) {
-        pbuf = ALLOC_N(char, size + 1);
-        err = RegQueryValueEx(hkey, subkey, NULL, &dwtype, (BYTE *)pbuf, &size);
-        if (err == ERROR_SUCCESS) {
-            pbuf[size] = '\0';
-            if (dwtype == REG_EXPAND_SZ) {
-                char* pbuf2 = (char *)pbuf;
-                DWORD len = ExpandEnvironmentStrings(pbuf2, NULL, 0);
-                pbuf = ALLOC_N(char, len + 1);
-                ExpandEnvironmentStrings(pbuf2, pbuf, len + 1);
-                free(pbuf2);
-            }
-            val = rb_str_new2((char *)pbuf);
-        }
-        free(pbuf);
-    }
-    return val;
-}
-
-VALUE
-reg_get_val2(HKEY hkey, const char *subkey)
-{
-    HKEY hsubkey;
-    LONG err;
-    VALUE val = Qnil;
-    err = RegOpenKeyEx(hkey, subkey, 0, KEY_READ, &hsubkey);
-    if (err == ERROR_SUCCESS) {
-        val = reg_get_val(hsubkey, NULL);
-        RegCloseKey(hsubkey);
-    }
-    if (val == Qnil) {
-        val = reg_get_val(hkey, subkey);
-    }
-    return val;
-}
-
-static void
-ole_const_load(ITypeLib *pTypeLib, VALUE klass, VALUE self)
-{
-    unsigned int count;
-    unsigned int index;
-    int iVar;
-    ITypeInfo *pTypeInfo;
-    TYPEATTR  *pTypeAttr;
-    VARDESC   *pVarDesc;
-    HRESULT hr;
-    unsigned int len;
-    BSTR bstr;
-    char *pName = NULL;
-    VALUE val;
-    VALUE constant;
-    ID id;
-    constant = rb_hash_new();
-    count = pTypeLib->lpVtbl->GetTypeInfoCount(pTypeLib);
-    for (index = 0; index < count; index++) {
-        hr = pTypeLib->lpVtbl->GetTypeInfo(pTypeLib, index, &pTypeInfo);
-        if (FAILED(hr))
-            continue;
-        hr = OLE_GET_TYPEATTR(pTypeInfo, &pTypeAttr);
-        if(FAILED(hr)) {
-            OLE_RELEASE(pTypeInfo);
-            continue;
-        }
-        for(iVar = 0; iVar < pTypeAttr->cVars; iVar++) {
-            hr = pTypeInfo->lpVtbl->GetVarDesc(pTypeInfo, iVar, &pVarDesc);
-            if(FAILED(hr))
-                continue;
-            if(pVarDesc->varkind == VAR_CONST &&
-               !(pVarDesc->wVarFlags & (VARFLAG_FHIDDEN |
-                                        VARFLAG_FRESTRICTED |
-                                        VARFLAG_FNONBROWSABLE))) {
-                hr = pTypeInfo->lpVtbl->GetNames(pTypeInfo, pVarDesc->memid, &bstr,
-                                                 1, &len);
-                if(FAILED(hr) || len == 0 || !bstr)
-                    continue;
-                pName = ole_wc2mb(bstr);
-                val = ole_variant2val(V_UNION1(pVarDesc, lpvarValue));
-                *pName = toupper((int)*pName);
-                id = rb_intern(pName);
-                if (rb_is_const_id(id)) {
-                    if(!rb_const_defined_at(klass, id)) {
-                        rb_define_const(klass, pName, val);
-                    }
-                }
-                else {
-                    rb_hash_aset(constant, rb_str_new2(pName), val);
-                }
-                SysFreeString(bstr);
-                if(pName) {
-                    free(pName);
-                    pName = NULL;
-                }
-            }
-            pTypeInfo->lpVtbl->ReleaseVarDesc(pTypeInfo, pVarDesc);
-        }
-        pTypeInfo->lpVtbl->ReleaseTypeAttr(pTypeInfo, pTypeAttr);
-        OLE_RELEASE(pTypeInfo);
-    }
-    rb_define_const(klass, "CONSTANTS", constant);
-}
-
-static HRESULT
-clsid_from_remote(VALUE host, VALUE com, CLSID *pclsid)
-{
-    HKEY hlm;
-    HKEY hpid;
-    VALUE subkey;
-    LONG err;
-    char clsid[100];
-    OLECHAR *pbuf;
-    DWORD len;
-    DWORD dwtype;
-    HRESULT hr = S_OK;
-    err = RegConnectRegistry(StringValuePtr(host), HKEY_LOCAL_MACHINE, &hlm);
-    if (err != ERROR_SUCCESS)
-        return HRESULT_FROM_WIN32(err);
-    subkey = rb_str_new2("SOFTWARE\\Classes\\");
-    rb_str_concat(subkey, com);
-    rb_str_cat2(subkey, "\\CLSID");
-    err = RegOpenKeyEx(hlm, StringValuePtr(subkey), 0, KEY_READ, &hpid);
-    if (err != ERROR_SUCCESS)
-        hr = HRESULT_FROM_WIN32(err);
-    else {
-        len = sizeof(clsid);
-        err = RegQueryValueEx(hpid, "", NULL, &dwtype, (BYTE *)clsid, &len);
-        if (err == ERROR_SUCCESS && dwtype == REG_SZ) {
-            pbuf = ole_mb2wc(clsid, -1, cWIN32OLE_cp);
-            hr = CLSIDFromString(pbuf, pclsid);
-            SysFreeString(pbuf);
-        }
-        else {
-            hr = HRESULT_FROM_WIN32(err);
-        }
-        RegCloseKey(hpid);
-    }
-    RegCloseKey(hlm);
-    return hr;
-}
-
-static VALUE
-ole_create_dcom(VALUE self, VALUE ole, VALUE host, VALUE others)
-{
-    HRESULT hr;
-    CLSID   clsid;
-    OLECHAR *pbuf;
-
-    COSERVERINFO serverinfo;
-    MULTI_QI multi_qi;
-    DWORD clsctx = CLSCTX_REMOTE_SERVER;
-
-    if (!gole32)
-        gole32 = LoadLibrary("OLE32");
-    if (!gole32)
-        rb_raise(rb_eRuntimeError, "failed to load OLE32");
-    if (!gCoCreateInstanceEx)
-        gCoCreateInstanceEx = (FNCOCREATEINSTANCEEX*)
-            GetProcAddress(gole32, "CoCreateInstanceEx");
-    if (!gCoCreateInstanceEx)
-        rb_raise(rb_eRuntimeError, "CoCreateInstanceEx is not supported in this environment");
-
-    pbuf  = ole_vstr2wc(ole);
-    hr = CLSIDFromProgID(pbuf, &clsid);
-    if (FAILED(hr))
-        hr = clsid_from_remote(host, ole, &clsid);
-    if (FAILED(hr))
-        hr = CLSIDFromString(pbuf, &clsid);
-    SysFreeString(pbuf);
-    if (FAILED(hr))
-        ole_raise(hr, eWIN32OLERuntimeError,
-                  "unknown OLE server: `%s'",
-                  StringValuePtr(ole));
-    memset(&serverinfo, 0, sizeof(COSERVERINFO));
-    serverinfo.pwszName = ole_vstr2wc(host);
-    memset(&multi_qi, 0, sizeof(MULTI_QI));
-    multi_qi.pIID = &IID_IDispatch;
-    hr = gCoCreateInstanceEx(&clsid, NULL, clsctx, &serverinfo, 1, &multi_qi);
-    SysFreeString(serverinfo.pwszName);
-    if (FAILED(hr))
-        ole_raise(hr, eWIN32OLERuntimeError,
-                  "failed to create DCOM server `%s' in `%s'",
-                  StringValuePtr(ole),
-                  StringValuePtr(host));
-
-    ole_set_member(self, (IDispatch*)multi_qi.pItf);
-    return self;
-}
-
-static VALUE
-ole_bind_obj(VALUE moniker, int argc, VALUE *argv, VALUE self)
-{
-    IBindCtx *pBindCtx;
-    IMoniker *pMoniker;
-    IDispatch *pDispatch;
-    void *p;
-    HRESULT hr;
-    OLECHAR *pbuf;
-    ULONG eaten = 0;
-
-    ole_initialize();
-
-    hr = CreateBindCtx(0, &pBindCtx);
-    if(FAILED(hr)) {
-        ole_raise(hr, eWIN32OLERuntimeError,
-                  "failed to create bind context");
-    }
-
-    pbuf  = ole_vstr2wc(moniker);
-    hr = MkParseDisplayName(pBindCtx, pbuf, &eaten, &pMoniker);
-    SysFreeString(pbuf);
-    if(FAILED(hr)) {
-        OLE_RELEASE(pBindCtx);
-        ole_raise(hr, eWIN32OLERuntimeError,
-                  "failed to parse display name of moniker `%s'",
-                  StringValuePtr(moniker));
-    }
-    hr = pMoniker->lpVtbl->BindToObject(pMoniker, pBindCtx, NULL,
-                                        &IID_IDispatch, &p);
-    pDispatch = p;
-    OLE_RELEASE(pMoniker);
-    OLE_RELEASE(pBindCtx);
-
-    if(FAILED(hr)) {
-        ole_raise(hr, eWIN32OLERuntimeError,
-                  "failed to bind moniker `%s'",
-                  StringValuePtr(moniker));
-    }
-    return create_win32ole_object(self, pDispatch, argc, argv);
-}
-
-/*
- *  call-seq:
- *     WIN32OLE.connect( ole ) --> aWIN32OLE
- *
- *  Returns running OLE Automation object or WIN32OLE object from moniker.
- *  1st argument should be OLE program id or class id or moniker.
- *
- *     WIN32OLE.connect('Excel.Application') # => WIN32OLE object which represents running Excel.
- */
-static VALUE
-fole_s_connect(int argc, VALUE *argv, VALUE self)
-{
-    VALUE svr_name;
-    VALUE others;
-    HRESULT hr;
-    CLSID   clsid;
-    OLECHAR *pBuf;
-    IDispatch *pDispatch;
-    void *p;
-    IUnknown *pUnknown;
-
-    /* initialize to use OLE */
-    ole_initialize();
-
-    rb_scan_args(argc, argv, "1*", &svr_name, &others);
-    StringValue(svr_name);
-
-    /* get CLSID from OLE server name */
-    pBuf = ole_vstr2wc(svr_name);
-    hr = CLSIDFromProgID(pBuf, &clsid);
-    if(FAILED(hr)) {
-        hr = CLSIDFromString(pBuf, &clsid);
-    }
-    SysFreeString(pBuf);
-    if(FAILED(hr)) {
-        return ole_bind_obj(svr_name, argc, argv, self);
-    }
-
-    hr = GetActiveObject(&clsid, 0, &pUnknown);
-    if (FAILED(hr)) {
-        ole_raise(hr, eWIN32OLERuntimeError,
-                  "OLE server `%s' not running", StringValuePtr(svr_name));
-    }
-    hr = pUnknown->lpVtbl->QueryInterface(pUnknown, &IID_IDispatch, &p);
-    pDispatch = p;
-    if(FAILED(hr)) {
-        OLE_RELEASE(pUnknown);
-        ole_raise(hr, eWIN32OLERuntimeError,
-                  "failed to create WIN32OLE server `%s'",
-                  StringValuePtr(svr_name));
-    }
-
-    OLE_RELEASE(pUnknown);
-
-    return create_win32ole_object(self, pDispatch, argc, argv);
-}
-
-/*
- *  call-seq:
- *     WIN32OLE.const_load( ole, mod = WIN32OLE)
- *
- *  Defines the constants of OLE Automation server as mod's constants.
- *  The first argument is WIN32OLE object or type library name.
- *  If 2nd argument is omitted, the default is WIN32OLE.
- *  The first letter of Ruby's constant variable name is upper case,
- *  so constant variable name of WIN32OLE object is capitalized.
- *  For example, the 'xlTop' constant of Excel is changed to 'XlTop'
- *  in WIN32OLE.
- *  If the first letter of constant variable is not [A-Z], then
- *  the constant is defined as CONSTANTS hash element.
- *
- *     module EXCEL_CONST
- *     end
- *     excel = WIN32OLE.new('Excel.Application')
- *     WIN32OLE.const_load(excel, EXCEL_CONST)
- *     puts EXCEL_CONST::XlTop # => -4160
- *     puts EXCEL_CONST::CONSTANTS['_xlDialogChartSourceData'] # => 541
- *
- *     WIN32OLE.const_load(excel)
- *     puts WIN32OLE::XlTop # => -4160
- *
- *     module MSO
- *     end
- *     WIN32OLE.const_load('Microsoft Office 9.0 Object Library', MSO)
- *     puts MSO::MsoLineSingle # => 1
- */
-static VALUE
-fole_s_const_load(int argc, VALUE *argv, VALUE self)
-{
-    VALUE ole;
-    VALUE klass;
-    struct oledata *pole = NULL;
-    ITypeInfo *pTypeInfo;
-    ITypeLib *pTypeLib;
-    unsigned int index;
-    HRESULT hr;
-    OLECHAR *pBuf;
-    VALUE file;
-    LCID    lcid = cWIN32OLE_lcid;
-
-    rb_scan_args(argc, argv, "11", &ole, &klass);
-    if (!RB_TYPE_P(klass, T_CLASS) &&
-        !RB_TYPE_P(klass, T_MODULE) &&
-        !RB_TYPE_P(klass, T_NIL)) {
-        rb_raise(rb_eTypeError, "2nd parameter must be Class or Module");
-    }
-    if (rb_obj_is_kind_of(ole, cWIN32OLE)) {
-        pole = oledata_get_struct(ole);
-        hr = pole->pDispatch->lpVtbl->GetTypeInfo(pole->pDispatch,
-                                                  0, lcid, &pTypeInfo);
-        if(FAILED(hr)) {
-            ole_raise(hr, eWIN32OLEQueryInterfaceError, "failed to GetTypeInfo");
-        }
-        hr = pTypeInfo->lpVtbl->GetContainingTypeLib(pTypeInfo, &pTypeLib, &index);
-        if(FAILED(hr)) {
-            OLE_RELEASE(pTypeInfo);
-            ole_raise(hr, eWIN32OLEQueryInterfaceError, "failed to GetContainingTypeLib");
-        }
-        OLE_RELEASE(pTypeInfo);
-        if(!RB_TYPE_P(klass, T_NIL)) {
-            ole_const_load(pTypeLib, klass, self);
-        }
-        else {
-            ole_const_load(pTypeLib, cWIN32OLE, self);
-        }
-        OLE_RELEASE(pTypeLib);
-    }
-    else if(RB_TYPE_P(ole, T_STRING)) {
-        file = typelib_file(ole);
-        if (file == Qnil) {
-            file = ole;
-        }
-        pBuf = ole_vstr2wc(file);
-        hr = LoadTypeLibEx(pBuf, REGKIND_NONE, &pTypeLib);
-        SysFreeString(pBuf);
-        if (FAILED(hr))
-          ole_raise(hr, eWIN32OLERuntimeError, "failed to LoadTypeLibEx");
-        if(!RB_TYPE_P(klass, T_NIL)) {
-            ole_const_load(pTypeLib, klass, self);
-        }
-        else {
-            ole_const_load(pTypeLib, cWIN32OLE, self);
-        }
-        OLE_RELEASE(pTypeLib);
-    }
-    else {
-        rb_raise(rb_eTypeError, "1st parameter must be WIN32OLE instance");
-    }
-    return Qnil;
-}
-
-static ULONG
-reference_count(struct oledata * pole)
-{
-    ULONG n = 0;
-    if(pole->pDispatch) {
-        OLE_ADDREF(pole->pDispatch);
-        n = OLE_RELEASE(pole->pDispatch);
-    }
-    return n;
-}
-
-/*
- *  call-seq:
- *     WIN32OLE.ole_reference_count(aWIN32OLE) --> number
- *
- *  Returns reference counter of Dispatch interface of WIN32OLE object.
- *  You should not use this method because this method
- *  exists only for debugging WIN32OLE.
- */
-static VALUE
-fole_s_reference_count(VALUE self, VALUE obj)
-{
-    struct oledata * pole = NULL;
-    pole = oledata_get_struct(obj);
-    return RB_INT2NUM(reference_count(pole));
-}
-
-/*
- *  call-seq:
- *     WIN32OLE.ole_free(aWIN32OLE) --> number
- *
- *  Invokes Release method of Dispatch interface of WIN32OLE object.
- *  You should not use this method because this method
- *  exists only for debugging WIN32OLE.
- *  The return value is reference counter of OLE object.
- */
-static VALUE
-fole_s_free(VALUE self, VALUE obj)
-{
-    ULONG n = 0;
-    struct oledata * pole = NULL;
-    pole = oledata_get_struct(obj);
-    if(pole->pDispatch) {
-        if (reference_count(pole) > 0) {
-            n = OLE_RELEASE(pole->pDispatch);
-        }
-    }
-    return RB_INT2NUM(n);
-}
-
-static HWND
-ole_show_help(VALUE helpfile, VALUE helpcontext)
-{
-    FNHTMLHELP *pfnHtmlHelp;
-    HWND hwnd = 0;
-
-    if(!ghhctrl)
-        ghhctrl = LoadLibrary("HHCTRL.OCX");
-    if (!ghhctrl)
-        return hwnd;
-    pfnHtmlHelp = (FNHTMLHELP*)GetProcAddress(ghhctrl, "HtmlHelpA");
-    if (!pfnHtmlHelp)
-        return hwnd;
-    hwnd = pfnHtmlHelp(GetDesktopWindow(), StringValuePtr(helpfile),
-                    0x0f, RB_NUM2INT(helpcontext));
-    if (hwnd == 0)
-        hwnd = pfnHtmlHelp(GetDesktopWindow(), StringValuePtr(helpfile),
-                 0,  RB_NUM2INT(helpcontext));
-    return hwnd;
-}
-
-/*
- *  call-seq:
- *     WIN32OLE.ole_show_help(obj [,helpcontext])
- *
- *  Displays helpfile. The 1st argument specifies WIN32OLE_TYPE
- *  object or WIN32OLE_METHOD object or helpfile.
- *
- *     excel = WIN32OLE.new('Excel.Application')
- *     typeobj = excel.ole_type
- *     WIN32OLE.ole_show_help(typeobj)
- */
-static VALUE
-fole_s_show_help(int argc, VALUE *argv, VALUE self)
-{
-    VALUE target;
-    VALUE helpcontext;
-    VALUE helpfile;
-    VALUE name;
-    HWND  hwnd;
-    rb_scan_args(argc, argv, "11", &target, &helpcontext);
-    if (rb_obj_is_kind_of(target, cWIN32OLE_TYPE) ||
-        rb_obj_is_kind_of(target, cWIN32OLE_METHOD)) {
-        helpfile = rb_funcall(target, rb_intern("helpfile"), 0);
-        if(strlen(StringValuePtr(helpfile)) == 0) {
-            name = rb_ivar_get(target, rb_intern("name"));
-            rb_raise(rb_eRuntimeError, "no helpfile of `%s'",
-                     StringValuePtr(name));
-        }
-        helpcontext = rb_funcall(target, rb_intern("helpcontext"), 0);
-    } else {
-        helpfile = target;
-    }
-    if (!RB_TYPE_P(helpfile, T_STRING)) {
-        rb_raise(rb_eTypeError, "1st parameter must be (String|WIN32OLE_TYPE|WIN32OLE_METHOD)");
-    }
-    hwnd = ole_show_help(helpfile, helpcontext);
-    if(hwnd == 0) {
-        rb_raise(rb_eRuntimeError, "failed to open help file `%s'",
-                 StringValuePtr(helpfile));
-    }
-    return Qnil;
-}
-
-/*
- *  call-seq:
- *     WIN32OLE.codepage
- *
- *  Returns current codepage.
- *     WIN32OLE.codepage # => WIN32OLE::CP_ACP
- */
-static VALUE
-fole_s_get_code_page(VALUE self)
-{
-    return RB_INT2FIX(cWIN32OLE_cp);
-}
-
-static BOOL CALLBACK
-installed_code_page_proc(LPTSTR str) {
-    if (strtoul(str, NULL, 10) == g_cp_to_check) {
-        g_cp_installed = TRUE;
-        return FALSE;
-    }
-    return TRUE;
-}
-
-static BOOL
-code_page_installed(UINT cp)
-{
-    g_cp_installed = FALSE;
-    g_cp_to_check = cp;
-    EnumSystemCodePages(installed_code_page_proc, CP_INSTALLED);
-    return g_cp_installed;
-}
-
-/*
- *  call-seq:
- *     WIN32OLE.codepage = CP
- *
- *  Sets current codepage.
- *  The WIN32OLE.codepage is initialized according to
- *  Encoding.default_internal.
- *  If Encoding.default_internal is nil then WIN32OLE.codepage
- *  is initialized according to Encoding.default_external.
- *
- *     WIN32OLE.codepage = WIN32OLE::CP_UTF8
- *     WIN32OLE.codepage = 65001
- */
-static VALUE
-fole_s_set_code_page(VALUE self, VALUE vcp)
-{
-    UINT cp = RB_FIX2INT(vcp);
-    set_ole_codepage(cp);
-    /*
-     * Should this method return old codepage?
-     */
-    return Qnil;
-}
-
-/*
- *  call-seq:
- *     WIN32OLE.locale -> locale id.
- *
- *  Returns current locale id (lcid). The default locale is
- *  WIN32OLE::LOCALE_SYSTEM_DEFAULT.
- *
- *     lcid = WIN32OLE.locale
- */
-static VALUE
-fole_s_get_locale(VALUE self)
-{
-    return RB_INT2FIX(cWIN32OLE_lcid);
-}
-
-static BOOL
-CALLBACK installed_lcid_proc(LPTSTR str)
-{
-    if (strcmp(str, g_lcid_to_check) == 0) {
-        g_lcid_installed = TRUE;
-        return FALSE;
-    }
-    return TRUE;
-}
-
-static BOOL
-lcid_installed(LCID lcid)
-{
-    g_lcid_installed = FALSE;
-    snprintf(g_lcid_to_check, sizeof(g_lcid_to_check), "%08lx", (unsigned long)lcid);
-    EnumSystemLocales(installed_lcid_proc, LCID_INSTALLED);
-    return g_lcid_installed;
-}
-
-/*
- *  call-seq:
- *     WIN32OLE.locale = lcid
- *
- *  Sets current locale id (lcid).
- *
- *     WIN32OLE.locale = 1033 # set locale English(U.S)
- *     obj = WIN32OLE_VARIANT.new("$100,000", WIN32OLE::VARIANT::VT_CY)
- *
- */
-static VALUE
-fole_s_set_locale(VALUE self, VALUE vlcid)
-{
-    LCID lcid = RB_FIX2INT(vlcid);
-    if (lcid_installed(lcid)) {
-        cWIN32OLE_lcid = lcid;
-    } else {
-        switch (lcid) {
-        case LOCALE_SYSTEM_DEFAULT:
-        case LOCALE_USER_DEFAULT:
-            cWIN32OLE_lcid = lcid;
-            break;
-        default:
-            rb_raise(eWIN32OLERuntimeError, "not installed locale: %u", (unsigned int)lcid);
-        }
-    }
-    return Qnil;
-}
-
-/*
- *  call-seq:
- *     WIN32OLE.create_guid
- *
- *  Creates GUID.
- *     WIN32OLE.create_guid # => {1CB530F1-F6B1-404D-BCE6-1959BF91F4A8}
- */
-static VALUE
-fole_s_create_guid(VALUE self)
-{
-    GUID guid;
-    HRESULT hr;
-    OLECHAR bstr[80];
-    int len = 0;
-    hr = CoCreateGuid(&guid);
-    if (FAILED(hr)) {
-        ole_raise(hr, eWIN32OLERuntimeError, "failed to create GUID");
-    }
-    len = StringFromGUID2(&guid, bstr, sizeof(bstr)/sizeof(OLECHAR));
-    if (len == 0) {
-        rb_raise(rb_eRuntimeError, "failed to create GUID(buffer over)");
-    }
-    return ole_wc2vstr(bstr, FALSE);
-}
-
-/*
- * WIN32OLE.ole_initialize and WIN32OLE.ole_uninitialize
- * are used in win32ole.rb to fix the issue bug #2618 (ruby-core:27634).
- * You must not use these method.
- */
-
-/* :nodoc: */
-static VALUE
-fole_s_ole_initialize(VALUE self)
-{
-    ole_initialize();
-    return Qnil;
-}
-
-/* :nodoc: */
-static VALUE
-fole_s_ole_uninitialize(VALUE self)
-{
-    ole_uninitialize();
-    return Qnil;
-}
-
-/*
- * Document-class: WIN32OLE
- *
- *   <code>WIN32OLE</code> objects represent OLE Automation object in Ruby.
- *
- *   By using WIN32OLE, you can access OLE server like VBScript.
- *
- *   Here is sample script.
- *
- *     require 'win32ole'
- *
- *     excel = WIN32OLE.new('Excel.Application')
- *     excel.visible = true
- *     workbook = excel.Workbooks.Add();
- *     worksheet = workbook.Worksheets(1);
- *     worksheet.Range("A1:D1").value = ["North","South","East","West"];
- *     worksheet.Range("A2:B2").value = [5.2, 10];
- *     worksheet.Range("C2").value = 8;
- *     worksheet.Range("D2").value = 20;
- *
- *     range = worksheet.Range("A1:D2");
- *     range.select
- *     chart = workbook.Charts.Add;
- *
- *     workbook.saved = true;
- *
- *     excel.ActiveWorkbook.Close(0);
- *     excel.Quit();
- *
- *   Unfortunately, Win32OLE doesn't support the argument passed by
- *   reference directly.
- *   Instead, Win32OLE provides WIN32OLE::ARGV or WIN32OLE_VARIANT object.
- *   If you want to get the result value of argument passed by reference,
- *   you can use WIN32OLE::ARGV or WIN32OLE_VARIANT.
- *
- *     oleobj.method(arg1, arg2, refargv3)
- *     puts WIN32OLE::ARGV[2]   # the value of refargv3 after called oleobj.method
- *
- *   or
- *
- *     refargv3 = WIN32OLE_VARIANT.new(XXX,
- *                 WIN32OLE::VARIANT::VT_BYREF|WIN32OLE::VARIANT::VT_XXX)
- *     oleobj.method(arg1, arg2, refargv3)
- *     p refargv3.value # the value of refargv3 after called oleobj.method.
- *
- */
-
-/*
- *  call-seq:
- *     WIN32OLE.new(server, [host]) -> WIN32OLE object
- *     WIN32OLE.new(server, license: 'key') -> WIN32OLE object
- *
- *  Returns a new WIN32OLE object(OLE Automation object).
- *  The first argument server specifies OLE Automation server.
- *  The first argument should be CLSID or PROGID.
- *  If second argument host specified, then returns OLE Automation
- *  object on host.
- *  If :license keyword argument is provided,
- *  IClassFactory2::CreateInstanceLic is used to create instance of
- *  licensed server.
- *
- *      WIN32OLE.new('Excel.Application') # => Excel OLE Automation WIN32OLE object.
- *      WIN32OLE.new('{00024500-0000-0000-C000-000000000046}') # => Excel OLE Automation WIN32OLE object.
- */
-static VALUE
-fole_initialize(int argc, VALUE *argv, VALUE self)
-{
-    VALUE svr_name;
-    VALUE host;
-    VALUE others;
-    VALUE opts;
-    HRESULT hr;
-    CLSID   clsid;
-    OLECHAR *pBuf;
-    OLECHAR *key_buf;
-    IDispatch *pDispatch;
-    IClassFactory2 * pIClassFactory2;
-    void *p;
-    static ID keyword_ids[1];
-    VALUE kwargs[1];
-
-    rb_call_super(0, 0);
-    rb_scan_args(argc, argv, "11*:", &svr_name, &host, &others, &opts);
-
-    StringValue(svr_name);
-    if (!NIL_P(host)) {
-        StringValue(host);
-        return ole_create_dcom(self, svr_name, host, others);
-    }
-
-    /* get CLSID from OLE server name */
-    pBuf  = ole_vstr2wc(svr_name);
-    hr = CLSIDFromProgID(pBuf, &clsid);
-    if(FAILED(hr)) {
-        hr = CLSIDFromString(pBuf, &clsid);
-    }
-    SysFreeString(pBuf);
-    if(FAILED(hr)) {
-        ole_raise(hr, eWIN32OLERuntimeError,
-                  "unknown OLE server: `%s'",
-                  StringValuePtr(svr_name));
-    }
-
-    if (!keyword_ids[0]) {
-        keyword_ids[0] = rb_intern_const("license");
-    }
-    rb_get_kwargs(opts, keyword_ids, 0, 1, kwargs);
-
-    if (kwargs[0] == Qundef) {
-        /* get IDispatch interface */
-        hr = CoCreateInstance(
-            &clsid,
-            NULL,
-            CLSCTX_INPROC_SERVER | CLSCTX_LOCAL_SERVER,
-            &IID_IDispatch,
-            &p
-        );
-    } else {
-        hr = CoGetClassObject(
-            &clsid,
-            CLSCTX_INPROC_SERVER | CLSCTX_LOCAL_SERVER,
-            NULL,
-            &IID_IClassFactory2,
-            (LPVOID)&pIClassFactory2
-        );
-        if (hr == S_OK) {
-            key_buf = ole_vstr2wc(kwargs[0]);
-            hr = pIClassFactory2->lpVtbl->CreateInstanceLic(pIClassFactory2, NULL, NULL, &IID_IDispatch, key_buf, &p);
-            SysFreeString(key_buf);
-            OLE_RELEASE(pIClassFactory2);
-        }
-    }
-    if(FAILED(hr)) {
-        ole_raise(hr, eWIN32OLERuntimeError,
-                  "failed to create WIN32OLE object from `%s'",
-                  StringValuePtr(svr_name));
-    }
-    pDispatch = p;
-
-    ole_set_member(self, pDispatch);
-    return self;
-}
-
-static int
-hash2named_arg(VALUE key, VALUE val, VALUE pop)
-{
-    struct oleparam* pOp = (struct oleparam *)pop;
-    unsigned int index, i;
-    index = pOp->dp.cNamedArgs;
-    /*---------------------------------------------
-      the data-type of key must be String or Symbol
-    -----------------------------------------------*/
-    if(!RB_TYPE_P(key, T_STRING) && !RB_TYPE_P(key, T_SYMBOL)) {
-        /* clear name of dispatch parameters */
-        for(i = 1; i < index + 1; i++) {
-            SysFreeString(pOp->pNamedArgs[i]);
-        }
-        /* clear dispatch parameters */
-        for(i = 0; i < index; i++ ) {
-            VariantClear(&(pOp->dp.rgvarg[i]));
-        }
-        /* raise an exception */
-        rb_raise(rb_eTypeError, "wrong argument type (expected String or Symbol)");
-    }
-    if (RB_TYPE_P(key, T_SYMBOL)) {
-        key = rb_sym2str(key);
-    }
-
-    /* pNamedArgs[0] is <method name>, so "index + 1" */
-    pOp->pNamedArgs[index + 1] = ole_vstr2wc(key);
-
-    VariantInit(&(pOp->dp.rgvarg[index]));
-    ole_val2variant(val, &(pOp->dp.rgvarg[index]));
-
-    pOp->dp.cNamedArgs += 1;
-    return ST_CONTINUE;
-}
-
-static VALUE
-set_argv(VARIANTARG* realargs, unsigned int beg, unsigned int end)
-{
-    VALUE argv = rb_const_get(cWIN32OLE, rb_intern("ARGV"));
-
-    Check_Type(argv, T_ARRAY);
-    rb_ary_clear(argv);
-    while (end-- > beg) {
-        rb_ary_push(argv, ole_variant2val(&realargs[end]));
-        if (V_VT(&realargs[end]) != VT_RECORD) {
-            VariantClear(&realargs[end]);
-        }
-    }
-    return argv;
-}
-
-static VALUE
-ole_invoke(int argc, VALUE *argv, VALUE self, USHORT wFlags, BOOL is_bracket)
-{
-    LCID    lcid = cWIN32OLE_lcid;
-    struct oledata *pole = NULL;
-    HRESULT hr;
-    VALUE cmd;
-    VALUE paramS;
-    VALUE param;
-    VALUE obj;
-    VALUE v;
-
-    BSTR wcmdname;
-
-    DISPID DispID;
-    DISPID* pDispID;
-    EXCEPINFO excepinfo;
-    VARIANT result;
-    VARIANTARG* realargs = NULL;
-    unsigned int argErr = 0;
-    unsigned int i;
-    unsigned int cNamedArgs;
-    int n;
-    struct oleparam op;
-    memset(&excepinfo, 0, sizeof(EXCEPINFO));
-
-    VariantInit(&result);
-
-    op.dp.rgvarg = NULL;
-    op.dp.rgdispidNamedArgs = NULL;
-    op.dp.cNamedArgs = 0;
-    op.dp.cArgs = 0;
-
-    rb_scan_args(argc, argv, "1*", &cmd, &paramS);
-    if(!RB_TYPE_P(cmd, T_STRING) && !RB_TYPE_P(cmd, T_SYMBOL) && !is_bracket) {
-        rb_raise(rb_eTypeError, "method is wrong type (expected String or Symbol)");
-    }
-    if (RB_TYPE_P(cmd, T_SYMBOL)) {
-        cmd = rb_sym2str(cmd);
-    }
-    pole = oledata_get_struct(self);
-    if(!pole->pDispatch) {
-        rb_raise(rb_eRuntimeError, "failed to get dispatch interface");
-    }
-    if (is_bracket) {
-        DispID = DISPID_VALUE;
-        argc += 1;
-        rb_ary_unshift(paramS, cmd);
-    } else {
-        wcmdname = ole_vstr2wc(cmd);
-        hr = pole->pDispatch->lpVtbl->GetIDsOfNames( pole->pDispatch, &IID_NULL,
-                &wcmdname, 1, lcid, &DispID);
-        SysFreeString(wcmdname);
-        if(FAILED(hr)) {
-            return rb_eNoMethodError;
-        }
-    }
-
-    /* pick up last argument of method */
-    param = rb_ary_entry(paramS, argc-2);
-
-    op.dp.cNamedArgs = 0;
-
-    /* if last arg is hash object */
-    if(RB_TYPE_P(param, T_HASH)) {
-        /*------------------------------------------
-          hash object ==> named dispatch parameters
-        --------------------------------------------*/
-        cNamedArgs = rb_long2int((long)RHASH_SIZE(param));
-        op.dp.cArgs = cNamedArgs + argc - 2;
-        op.pNamedArgs = ALLOCA_N(OLECHAR*, cNamedArgs + 1);
-        op.dp.rgvarg = ALLOCA_N(VARIANTARG, op.dp.cArgs);
-
-        rb_hash_foreach(param, hash2named_arg, (VALUE)&op);
-
-        pDispID = ALLOCA_N(DISPID, cNamedArgs + 1);
-        op.pNamedArgs[0] = ole_vstr2wc(cmd);
-        hr = pole->pDispatch->lpVtbl->GetIDsOfNames(pole->pDispatch,
-                                                    &IID_NULL,
-                                                    op.pNamedArgs,
-                                                    op.dp.cNamedArgs + 1,
-                                                    lcid, pDispID);
-        for(i = 0; i < op.dp.cNamedArgs + 1; i++) {
-            SysFreeString(op.pNamedArgs[i]);
-            op.pNamedArgs[i] = NULL;
-        }
-        if(FAILED(hr)) {
-            /* clear dispatch parameters */
-            for(i = 0; i < op.dp.cArgs; i++ ) {
-                VariantClear(&op.dp.rgvarg[i]);
-            }
-            ole_raise(hr, eWIN32OLERuntimeError,
-                      "failed to get named argument info: `%s'",
-                      StringValuePtr(cmd));
-        }
-        op.dp.rgdispidNamedArgs = &(pDispID[1]);
-    }
-    else {
-        cNamedArgs = 0;
-        op.dp.cArgs = argc - 1;
-        op.pNamedArgs = ALLOCA_N(OLECHAR*, cNamedArgs + 1);
-        if (op.dp.cArgs > 0) {
-            op.dp.rgvarg  = ALLOCA_N(VARIANTARG, op.dp.cArgs);
-        }
-    }
-    /*--------------------------------------
-      non hash args ==> dispatch parameters
-     ----------------------------------------*/
-    if(op.dp.cArgs > cNamedArgs) {
-        realargs = ALLOCA_N(VARIANTARG, op.dp.cArgs-cNamedArgs+1);
-        for(i = cNamedArgs; i < op.dp.cArgs; i++) {
-            n = op.dp.cArgs - i + cNamedArgs - 1;
-            VariantInit(&realargs[n]);
-            VariantInit(&op.dp.rgvarg[n]);
-            param = rb_ary_entry(paramS, i-cNamedArgs);
-            if (rb_obj_is_kind_of(param, cWIN32OLE_VARIANT)) {
-                ole_variant2variant(param, &op.dp.rgvarg[n]);
-            } else if (rb_obj_is_kind_of(param, cWIN32OLE_RECORD)) {
-                ole_val2variant(param, &realargs[n]);
-                op.dp.rgvarg[n] = realargs[n];
-                V_VT(&op.dp.rgvarg[n]) = VT_RECORD | VT_BYREF;
-            } else {
-                ole_val2variant(param, &realargs[n]);
-                V_VT(&op.dp.rgvarg[n]) = VT_VARIANT | VT_BYREF;
-                V_VARIANTREF(&op.dp.rgvarg[n]) = &realargs[n];
-            }
-        }
-    }
-    /* apparent you need to call propput, you need this */
-    if (wFlags & DISPATCH_PROPERTYPUT) {
-        if (op.dp.cArgs == 0)
-            ole_raise(ResultFromScode(E_INVALIDARG), eWIN32OLERuntimeError, "argument error");
-
-        op.dp.cNamedArgs = 1;
-        op.dp.rgdispidNamedArgs = ALLOCA_N( DISPID, 1 );
-        op.dp.rgdispidNamedArgs[0] = DISPID_PROPERTYPUT;
-    }
-    hr = pole->pDispatch->lpVtbl->Invoke(pole->pDispatch, DispID,
-                                         &IID_NULL, lcid, wFlags, &op.dp,
-                                         &result, &excepinfo, &argErr);
-
-    if (FAILED(hr)) {
-        /* retry to call args by value */
-        if(op.dp.cArgs >= cNamedArgs) {
-            for(i = cNamedArgs; i < op.dp.cArgs; i++) {
-                n = op.dp.cArgs - i + cNamedArgs - 1;
-                param = rb_ary_entry(paramS, i-cNamedArgs);
-                ole_val2variant(param, &op.dp.rgvarg[n]);
-            }
-            if (hr == DISP_E_EXCEPTION) {
-                ole_freeexceptinfo(&excepinfo);
-            }
-            memset(&excepinfo, 0, sizeof(EXCEPINFO));
-            VariantInit(&result);
-            hr = pole->pDispatch->lpVtbl->Invoke(pole->pDispatch, DispID,
-                                                 &IID_NULL, lcid, wFlags,
-                                                 &op.dp, &result,
-                                                 &excepinfo, &argErr);
-
-            /* mega kludge. if a method in WORD is called and we ask
-             * for a result when one is not returned then
-             * hResult == DISP_E_EXCEPTION. this only happens on
-             * functions whose DISPID > 0x8000 */
-            if ((hr == DISP_E_EXCEPTION || hr == DISP_E_MEMBERNOTFOUND) && DispID > 0x8000) {
-                if (hr == DISP_E_EXCEPTION) {
-                    ole_freeexceptinfo(&excepinfo);
-                }
-                memset(&excepinfo, 0, sizeof(EXCEPINFO));
-                hr = pole->pDispatch->lpVtbl->Invoke(pole->pDispatch, DispID,
-                        &IID_NULL, lcid, wFlags,
-                        &op.dp, NULL,
-                        &excepinfo, &argErr);
-
-            }
-            for(i = cNamedArgs; i < op.dp.cArgs; i++) {
-                n = op.dp.cArgs - i + cNamedArgs - 1;
-                if (V_VT(&op.dp.rgvarg[n]) != VT_RECORD) {
-                    VariantClear(&op.dp.rgvarg[n]);
-                }
-            }
-        }
-
-        if (FAILED(hr)) {
-            /* retry after converting nil to VT_EMPTY */
-            if (op.dp.cArgs > cNamedArgs) {
-                for(i = cNamedArgs; i < op.dp.cArgs; i++) {
-                    n = op.dp.cArgs - i + cNamedArgs - 1;
-                    param = rb_ary_entry(paramS, i-cNamedArgs);
-                    ole_val2variant2(param, &op.dp.rgvarg[n]);
-                }
-                if (hr == DISP_E_EXCEPTION) {
-                    ole_freeexceptinfo(&excepinfo);
-                }
-                memset(&excepinfo, 0, sizeof(EXCEPINFO));
-                VariantInit(&result);
-                hr = pole->pDispatch->lpVtbl->Invoke(pole->pDispatch, DispID,
-                        &IID_NULL, lcid, wFlags,
-                        &op.dp, &result,
-                        &excepinfo, &argErr);
-                for(i = cNamedArgs; i < op.dp.cArgs; i++) {
-                    n = op.dp.cArgs - i + cNamedArgs - 1;
-                    if (V_VT(&op.dp.rgvarg[n]) != VT_RECORD) {
-                        VariantClear(&op.dp.rgvarg[n]);
-                    }
-                }
-            }
-        }
-
-    }
-    /* clear dispatch parameter */
-    if(op.dp.cArgs > cNamedArgs) {
-        for(i = cNamedArgs; i < op.dp.cArgs; i++) {
-            n = op.dp.cArgs - i + cNamedArgs - 1;
-            param = rb_ary_entry(paramS, i-cNamedArgs);
-            if (rb_obj_is_kind_of(param, cWIN32OLE_VARIANT)) {
-                ole_val2variant(param, &realargs[n]);
-            } else if ( rb_obj_is_kind_of(param, cWIN32OLE_RECORD) &&
-                        V_VT(&realargs[n]) == VT_RECORD ) {
-                olerecord_set_ivar(param, V_RECORDINFO(&realargs[n]), V_RECORD(&realargs[n]));
-            }
-        }
-        set_argv(realargs, cNamedArgs, op.dp.cArgs);
-    }
-    else {
-        for(i = 0; i < op.dp.cArgs; i++) {
-            VariantClear(&op.dp.rgvarg[i]);
-        }
-    }
-
-    if (FAILED(hr)) {
-        v = ole_excepinfo2msg(&excepinfo);
-        ole_raise(hr, eWIN32OLERuntimeError, "(in OLE method `%s': )%s",
-                  StringValuePtr(cmd),
-                  StringValuePtr(v));
-    }
-    obj = ole_variant2val(&result);
-    VariantClear(&result);
-    return obj;
-}
-
-/*
- *  call-seq:
- *     WIN32OLE#invoke(method, [arg1,...])  => return value of method.
- *
- *  Runs OLE method.
- *  The first argument specifies the method name of OLE Automation object.
- *  The others specify argument of the <i>method</i>.
- *  If you can not execute <i>method</i> directly, then use this method instead.
- *
- *    excel = WIN32OLE.new('Excel.Application')
- *    excel.invoke('Quit')  # => same as excel.Quit
- *
- */
-static VALUE
-fole_invoke(int argc, VALUE *argv, VALUE self)
-{
-    VALUE v = ole_invoke(argc, argv, self, DISPATCH_METHOD|DISPATCH_PROPERTYGET, FALSE);
-    if (v == rb_eNoMethodError) {
-        return rb_call_super(argc, argv);
-    }
-    return v;
-}
-
-static VALUE
-ole_invoke2(VALUE self, VALUE dispid, VALUE args, VALUE types, USHORT dispkind)
-{
-    HRESULT hr;
-    struct oledata *pole = NULL;
-    unsigned int argErr = 0;
-    EXCEPINFO excepinfo;
-    VARIANT result;
-    DISPPARAMS dispParams;
-    VARIANTARG* realargs = NULL;
-    int i, j; VALUE obj = Qnil;
-    VALUE tp, param;
-    VALUE v;
-    VARTYPE vt;
-
-    Check_Type(args, T_ARRAY);
-    Check_Type(types, T_ARRAY);
-
-    memset(&excepinfo, 0, sizeof(EXCEPINFO));
-    memset(&dispParams, 0, sizeof(DISPPARAMS));
-    VariantInit(&result);
-    pole = oledata_get_struct(self);
-
-    dispParams.cArgs = RARRAY_LEN(args);
-    dispParams.rgvarg = ALLOCA_N(VARIANTARG, dispParams.cArgs);
-    realargs = ALLOCA_N(VARIANTARG, dispParams.cArgs);
-    for (i = 0, j = dispParams.cArgs - 1; i < (int)dispParams.cArgs; i++, j--)
-    {
-        VariantInit(&realargs[i]);
-        VariantInit(&dispParams.rgvarg[i]);
-        tp = rb_ary_entry(types, j);
-        vt = (VARTYPE)RB_FIX2INT(tp);
-        V_VT(&dispParams.rgvarg[i]) = vt;
-        param = rb_ary_entry(args, j);
-        if (param == Qnil)
-        {
-
-            V_VT(&dispParams.rgvarg[i]) = V_VT(&realargs[i]) = VT_ERROR;
-            V_ERROR(&dispParams.rgvarg[i]) = V_ERROR(&realargs[i]) = DISP_E_PARAMNOTFOUND;
-        }
-        else
-        {
-            if (vt & VT_ARRAY)
-            {
-                int ent;
-                LPBYTE pb;
-                short* ps;
-                LPLONG pl;
-                VARIANT* pv;
-                CY *py;
-                VARTYPE v;
-                SAFEARRAYBOUND rgsabound[1];
-                Check_Type(param, T_ARRAY);
-                rgsabound[0].lLbound = 0;
-                rgsabound[0].cElements = RARRAY_LEN(param);
-                v = vt & ~(VT_ARRAY | VT_BYREF);
-                V_ARRAY(&realargs[i]) = SafeArrayCreate(v, 1, rgsabound);
-                V_VT(&realargs[i]) = VT_ARRAY | v;
-                SafeArrayLock(V_ARRAY(&realargs[i]));
-                pb = V_ARRAY(&realargs[i])->pvData;
-                ps = V_ARRAY(&realargs[i])->pvData;
-                pl = V_ARRAY(&realargs[i])->pvData;
-                py = V_ARRAY(&realargs[i])->pvData;
-                pv = V_ARRAY(&realargs[i])->pvData;
-                for (ent = 0; ent < (int)rgsabound[0].cElements; ent++)
-                {
-                    VARIANT velem;
-                    VALUE elem = rb_ary_entry(param, ent);
-                    ole_val2variant(elem, &velem);
-                    if (v != VT_VARIANT)
-                    {
-                        VariantChangeTypeEx(&velem, &velem,
-                            cWIN32OLE_lcid, 0, v);
-                    }
-                    switch (v)
-                    {
-                    /* 128 bits */
-                    case VT_VARIANT:
-                        *pv++ = velem;
-                        break;
-                    /* 64 bits */
-                    case VT_R8:
-                    case VT_CY:
-                    case VT_DATE:
-                        *py++ = V_CY(&velem);
-                        break;
-                    /* 16 bits */
-                    case VT_BOOL:
-                    case VT_I2:
-                    case VT_UI2:
-                        *ps++ = V_I2(&velem);
-                        break;
-                    /* 8 bites */
-                    case VT_UI1:
-                    case VT_I1:
-                        *pb++ = V_UI1(&velem);
-                        break;
-                    /* 32 bits */
-                    default:
-                        *pl++ = V_I4(&velem);
-                        break;
-                    }
-                }
-                SafeArrayUnlock(V_ARRAY(&realargs[i]));
-            }
-            else
-            {
-                ole_val2variant(param, &realargs[i]);
-                if ((vt & (~VT_BYREF)) != VT_VARIANT)
-                {
-                    hr = VariantChangeTypeEx(&realargs[i], &realargs[i],
-                                             cWIN32OLE_lcid, 0,
-                                             (VARTYPE)(vt & (~VT_BYREF)));
-                    if (hr != S_OK)
-                    {
-                        rb_raise(rb_eTypeError, "not valid value");
-                    }
-                }
-            }
-            if ((vt & VT_BYREF) || vt == VT_VARIANT)
-            {
-                if (vt == VT_VARIANT)
-                    V_VT(&dispParams.rgvarg[i]) = VT_VARIANT | VT_BYREF;
-                switch (vt & (~VT_BYREF))
-                {
-                /* 128 bits */
-                case VT_VARIANT:
-                    V_VARIANTREF(&dispParams.rgvarg[i]) = &realargs[i];
-                    break;
-                /* 64 bits */
-                case VT_R8:
-                case VT_CY:
-                case VT_DATE:
-                    V_CYREF(&dispParams.rgvarg[i]) = &V_CY(&realargs[i]);
-                    break;
-                /* 16 bits */
-                case VT_BOOL:
-                case VT_I2:
-                case VT_UI2:
-                    V_I2REF(&dispParams.rgvarg[i]) = &V_I2(&realargs[i]);
-                    break;
-                /* 8 bites */
-                case VT_UI1:
-                case VT_I1:
-                    V_UI1REF(&dispParams.rgvarg[i]) = &V_UI1(&realargs[i]);
-                    break;
-                /* 32 bits */
-                default:
-                    V_I4REF(&dispParams.rgvarg[i]) = &V_I4(&realargs[i]);
-                    break;
-                }
-            }
-            else
-            {
-                /* copy 64 bits of data */
-                V_CY(&dispParams.rgvarg[i]) = V_CY(&realargs[i]);
-            }
-        }
-    }
-
-    if (dispkind & DISPATCH_PROPERTYPUT) {
-        dispParams.cNamedArgs = 1;
-        dispParams.rgdispidNamedArgs = ALLOCA_N( DISPID, 1 );
-        dispParams.rgdispidNamedArgs[0] = DISPID_PROPERTYPUT;
-    }
-
-    hr = pole->pDispatch->lpVtbl->Invoke(pole->pDispatch, RB_NUM2INT(dispid),
-                                         &IID_NULL, cWIN32OLE_lcid,
-                                         dispkind,
-                                         &dispParams, &result,
-                                         &excepinfo, &argErr);
-
-    if (FAILED(hr)) {
-        v = ole_excepinfo2msg(&excepinfo);
-        ole_raise(hr, eWIN32OLERuntimeError, "(in OLE method `<dispatch id:%d>': )%s",
-                  RB_NUM2INT(dispid),
-                  StringValuePtr(v));
-    }
-
-    /* clear dispatch parameter */
-    if(dispParams.cArgs > 0) {
-        set_argv(realargs, 0, dispParams.cArgs);
-    }
-
-    obj = ole_variant2val(&result);
-    VariantClear(&result);
-    return obj;
-}
-
-/*
- *   call-seq:
- *      WIN32OLE#_invoke(dispid, args, types)
- *
- *   Runs the early binding method.
- *   The 1st argument specifies dispatch ID,
- *   the 2nd argument specifies the array of arguments,
- *   the 3rd argument specifies the array of the type of arguments.
- *
- *      excel = WIN32OLE.new('Excel.Application')
- *      excel._invoke(302, [], []) #  same effect as excel.Quit
- */
-static VALUE
-fole_invoke2(VALUE self, VALUE dispid, VALUE args, VALUE types)
-{
-    return ole_invoke2(self, dispid, args, types, DISPATCH_METHOD);
-}
-
-/*
- *  call-seq:
- *     WIN32OLE#_getproperty(dispid, args, types)
- *
- *  Runs the early binding method to get property.
- *  The 1st argument specifies dispatch ID,
- *  the 2nd argument specifies the array of arguments,
- *  the 3rd argument specifies the array of the type of arguments.
- *
- *     excel = WIN32OLE.new('Excel.Application')
- *     puts excel._getproperty(558, [], []) # same effect as puts excel.visible
- */
-static VALUE
-fole_getproperty2(VALUE self, VALUE dispid, VALUE args, VALUE types)
-{
-    return ole_invoke2(self, dispid, args, types, DISPATCH_PROPERTYGET);
-}
-
-/*
- *   call-seq:
- *      WIN32OLE#_setproperty(dispid, args, types)
- *
- *   Runs the early binding method to set property.
- *   The 1st argument specifies dispatch ID,
- *   the 2nd argument specifies the array of arguments,
- *   the 3rd argument specifies the array of the type of arguments.
- *
- *      excel = WIN32OLE.new('Excel.Application')
- *      excel._setproperty(558, [true], [WIN32OLE::VARIANT::VT_BOOL]) # same effect as excel.visible = true
- */
-static VALUE
-fole_setproperty2(VALUE self, VALUE dispid, VALUE args, VALUE types)
-{
-    return ole_invoke2(self, dispid, args, types, DISPATCH_PROPERTYPUT);
-}
-
-/*
- *  call-seq:
- *     WIN32OLE[a1, a2, ...]=val
- *
- *  Sets the value to WIN32OLE object specified by a1, a2, ...
- *
- *     dict = WIN32OLE.new('Scripting.Dictionary')
- *     dict.add('ruby', 'RUBY')
- *     dict['ruby'] = 'Ruby'
- *     puts dict['ruby'] # => 'Ruby'
- *
- *  Remark: You can not use this method to set the property value.
- *
- *     excel = WIN32OLE.new('Excel.Application')
- *     # excel['Visible'] = true # This is error !!!
- *     excel.Visible = true # You should to use this style to set the property.
- *
- */
-static VALUE
-fole_setproperty_with_bracket(int argc, VALUE *argv, VALUE self)
-{
-    VALUE v = ole_invoke(argc, argv, self, DISPATCH_PROPERTYPUT, TRUE);
-    if (v == rb_eNoMethodError) {
-        return rb_call_super(argc, argv);
-    }
-    return v;
-}
-
-/*
- *  call-seq:
- *     WIN32OLE.setproperty('property', [arg1, arg2,...] val)
- *
- *  Sets property of OLE object.
- *  When you want to set property with argument, you can use this method.
- *
- *     excel = WIN32OLE.new('Excel.Application')
- *     excel.Visible = true
- *     book = excel.workbooks.add
- *     sheet = book.worksheets(1)
- *     sheet.setproperty('Cells', 1, 2, 10) # => The B1 cell value is 10.
- */
-static VALUE
-fole_setproperty(int argc, VALUE *argv, VALUE self)
-{
-    VALUE v = ole_invoke(argc, argv, self, DISPATCH_PROPERTYPUT, FALSE);
-    if (v == rb_eNoMethodError) {
-        return rb_call_super(argc, argv);
-    }
-    return v;
-}
-
-/*
- *  call-seq:
- *     WIN32OLE[a1,a2,...]
- *
- *  Returns the value of Collection specified by a1, a2,....
- *
- *     dict = WIN32OLE.new('Scripting.Dictionary')
- *     dict.add('ruby', 'Ruby')
- *     puts dict['ruby'] # => 'Ruby' (same as `puts dict.item('ruby')')
- *
- *  Remark: You can not use this method to get the property.
- *     excel = WIN32OLE.new('Excel.Application')
- *     # puts excel['Visible']  This is error !!!
- *     puts excel.Visible # You should to use this style to get the property.
- *
- */
-static VALUE
-fole_getproperty_with_bracket(int argc, VALUE *argv, VALUE self)
-{
-    VALUE v = ole_invoke(argc, argv, self, DISPATCH_PROPERTYGET, TRUE);
-    if (v == rb_eNoMethodError) {
-        return rb_call_super(argc, argv);
-    }
-    return v;
-}
-
-static VALUE
-ole_propertyput(VALUE self, VALUE property, VALUE value)
-{
-    struct oledata *pole = NULL;
-    unsigned argErr;
-    unsigned int index;
-    HRESULT hr;
-    EXCEPINFO excepinfo;
-    DISPID dispID = DISPID_VALUE;
-    DISPID dispIDParam = DISPID_PROPERTYPUT;
-    USHORT wFlags = DISPATCH_PROPERTYPUT|DISPATCH_PROPERTYPUTREF;
-    DISPPARAMS dispParams;
-    VARIANTARG propertyValue[2];
-    OLECHAR* pBuf[1];
-    VALUE v;
-    LCID    lcid = cWIN32OLE_lcid;
-    dispParams.rgdispidNamedArgs = &dispIDParam;
-    dispParams.rgvarg = propertyValue;
-    dispParams.cNamedArgs = 1;
-    dispParams.cArgs = 1;
-
-    VariantInit(&propertyValue[0]);
-    VariantInit(&propertyValue[1]);
-    memset(&excepinfo, 0, sizeof(excepinfo));
-
-    pole = oledata_get_struct(self);
-
-    /* get ID from property name */
-    pBuf[0]  = ole_vstr2wc(property);
-    hr = pole->pDispatch->lpVtbl->GetIDsOfNames(pole->pDispatch, &IID_NULL,
-                                                pBuf, 1, lcid, &dispID);
-    SysFreeString(pBuf[0]);
-    pBuf[0] = NULL;
-
-    if(FAILED(hr)) {
-        ole_raise(hr, eWIN32OLERuntimeError,
-                  "unknown property or method: `%s'",
-                  StringValuePtr(property));
-    }
-    /* set property value */
-    ole_val2variant(value, &propertyValue[0]);
-    hr = pole->pDispatch->lpVtbl->Invoke(pole->pDispatch, dispID, &IID_NULL,
-                                         lcid, wFlags, &dispParams,
-                                         NULL, &excepinfo, &argErr);
-
-    for(index = 0; index < dispParams.cArgs; ++index) {
-        VariantClear(&propertyValue[index]);
-    }
-    if (FAILED(hr)) {
-        v = ole_excepinfo2msg(&excepinfo);
-        ole_raise(hr, eWIN32OLERuntimeError, "(in setting property `%s': )%s",
-                  StringValuePtr(property),
-                  StringValuePtr(v));
-    }
-    return Qnil;
-}
-
-/*
- *  call-seq:
- *     WIN32OLE#ole_free
- *
- *  invokes Release method of Dispatch interface of WIN32OLE object.
- *  Usually, you do not need to call this method because Release method
- *  called automatically when WIN32OLE object garbaged.
- *
- */
-static VALUE
-fole_free(VALUE self)
-{
-    struct oledata *pole = NULL;
-    pole = oledata_get_struct(self);
-    OLE_FREE(pole->pDispatch);
-    pole->pDispatch = NULL;
-    return Qnil;
-}
-
-static VALUE
-ole_each_sub(VALUE pEnumV)
-{
-    VARIANT variant;
-    VALUE obj = Qnil;
-    IEnumVARIANT *pEnum = (IEnumVARIANT *)pEnumV;
-    VariantInit(&variant);
-    while(pEnum->lpVtbl->Next(pEnum, 1, &variant, NULL) == S_OK) {
-        obj = ole_variant2val(&variant);
-        VariantClear(&variant);
-        VariantInit(&variant);
-        rb_yield(obj);
-    }
-    return Qnil;
-}
-
-static VALUE
-ole_ienum_free(VALUE pEnumV)
-{
-    IEnumVARIANT *pEnum = (IEnumVARIANT *)pEnumV;
-    OLE_RELEASE(pEnum);
-    return Qnil;
-}
-
-/*
- *  call-seq:
- *     WIN32OLE#each {|i|...}
- *
- *  Iterates over each item of OLE collection which has IEnumVARIANT interface.
- *
- *     excel = WIN32OLE.new('Excel.Application')
- *     book = excel.workbooks.add
- *     sheets = book.worksheets(1)
- *     cells = sheets.cells("A1:A5")
- *     cells.each do |cell|
- *       cell.value = 10
- *     end
- */
-static VALUE
-fole_each(VALUE self)
-{
-    LCID    lcid = cWIN32OLE_lcid;
-
-    struct oledata *pole = NULL;
-
-    unsigned int argErr;
-    EXCEPINFO excepinfo;
-    DISPPARAMS dispParams;
-    VARIANT result;
-    HRESULT hr;
-    IEnumVARIANT *pEnum = NULL;
-    void *p;
-
-    RETURN_ENUMERATOR(self, 0, 0);
-
-    VariantInit(&result);
-    dispParams.rgvarg = NULL;
-    dispParams.rgdispidNamedArgs = NULL;
-    dispParams.cNamedArgs = 0;
-    dispParams.cArgs = 0;
-    memset(&excepinfo, 0, sizeof(excepinfo));
-
-    pole = oledata_get_struct(self);
-    hr = pole->pDispatch->lpVtbl->Invoke(pole->pDispatch, DISPID_NEWENUM,
-                                         &IID_NULL, lcid,
-                                         DISPATCH_METHOD | DISPATCH_PROPERTYGET,
-                                         &dispParams, &result,
-                                         &excepinfo, &argErr);
-
-    if (FAILED(hr)) {
-        VariantClear(&result);
-        ole_raise(hr, eWIN32OLEQueryInterfaceError, "failed to get IEnum Interface");
-    }
-
-    if (V_VT(&result) == VT_UNKNOWN) {
-        hr = V_UNKNOWN(&result)->lpVtbl->QueryInterface(V_UNKNOWN(&result),
-                                                        &IID_IEnumVARIANT,
-                                                        &p);
-        pEnum = p;
-    } else if (V_VT(&result) == VT_DISPATCH) {
-        hr = V_DISPATCH(&result)->lpVtbl->QueryInterface(V_DISPATCH(&result),
-                                                         &IID_IEnumVARIANT,
-                                                         &p);
-        pEnum = p;
-    }
-    if (FAILED(hr) || !pEnum) {
-        VariantClear(&result);
-        ole_raise(hr, eWIN32OLEQueryInterfaceError, "failed to get IEnum Interface");
-    }
-
-    VariantClear(&result);
-    rb_ensure(ole_each_sub, (VALUE)pEnum, ole_ienum_free, (VALUE)pEnum);
-    return Qnil;
-}
-
-/*
- *  call-seq:
- *     WIN32OLE#method_missing(id [,arg1, arg2, ...])
- *
- *  Calls WIN32OLE#invoke method.
- */
-static VALUE
-fole_missing(int argc, VALUE *argv, VALUE self)
-{
-    VALUE mid, org_mid, sym, v;
-    const char* mname;
-    long n;
-    rb_check_arity(argc, 1, UNLIMITED_ARGUMENTS);
-    mid = org_mid = argv[0];
-    sym = rb_check_symbol(&mid);
-    if (!NIL_P(sym)) mid = rb_sym2str(sym);
-    mname = StringValueCStr(mid);
-    if(!mname) {
-        rb_raise(rb_eRuntimeError, "fail: unknown method or property");
-    }
-    n = RSTRING_LEN(mid);
-    if(mname[n-1] == '=') {
-        rb_check_arity(argc, 2, 2);
-        argv[0] = rb_enc_associate(rb_str_subseq(mid, 0, n-1), cWIN32OLE_enc);
-
-        return ole_propertyput(self, argv[0], argv[1]);
-    }
-    else {
-        argv[0] = rb_enc_associate(rb_str_dup(mid), cWIN32OLE_enc);
-        v = ole_invoke(argc, argv, self, DISPATCH_METHOD|DISPATCH_PROPERTYGET, FALSE);
-        if (v == rb_eNoMethodError) {
-            argv[0] = org_mid;
-            return rb_call_super(argc, argv);
-        }
-        return v;
-    }
-}
-
-static HRESULT
-typeinfo_from_ole(struct oledata *pole, ITypeInfo **ppti)
-{
-    ITypeInfo *pTypeInfo;
-    ITypeLib *pTypeLib;
-    BSTR bstr;
-    VALUE type;
-    UINT i;
-    UINT count;
-    LCID    lcid = cWIN32OLE_lcid;
-    HRESULT hr = pole->pDispatch->lpVtbl->GetTypeInfo(pole->pDispatch,
-                                                      0, lcid, &pTypeInfo);
-    if(FAILED(hr)) {
-        ole_raise(hr, eWIN32OLEQueryInterfaceError, "failed to GetTypeInfo");
-    }
-    hr = pTypeInfo->lpVtbl->GetDocumentation(pTypeInfo,
-                                             -1,
-                                             &bstr,
-                                             NULL, NULL, NULL);
-    type = WC2VSTR(bstr);
-    hr = pTypeInfo->lpVtbl->GetContainingTypeLib(pTypeInfo, &pTypeLib, &i);
-    OLE_RELEASE(pTypeInfo);
-    if (FAILED(hr)) {
-        ole_raise(hr, eWIN32OLEQueryInterfaceError, "failed to GetContainingTypeLib");
-    }
-    count = pTypeLib->lpVtbl->GetTypeInfoCount(pTypeLib);
-    for (i = 0; i < count; i++) {
-        hr = pTypeLib->lpVtbl->GetDocumentation(pTypeLib, i,
-                                                &bstr, NULL, NULL, NULL);
-        if (SUCCEEDED(hr) && rb_str_cmp(WC2VSTR(bstr), type) == 0) {
-            hr = pTypeLib->lpVtbl->GetTypeInfo(pTypeLib, i, &pTypeInfo);
-            if (SUCCEEDED(hr)) {
-                *ppti = pTypeInfo;
-                break;
-            }
-        }
-    }
-    OLE_RELEASE(pTypeLib);
-    return hr;
-}
-
-static VALUE
-ole_methods(VALUE self, int mask)
-{
-    ITypeInfo *pTypeInfo;
-    HRESULT hr;
-    VALUE methods;
-    struct oledata *pole = NULL;
-
-    pole = oledata_get_struct(self);
-    methods = rb_ary_new();
-
-    hr = typeinfo_from_ole(pole, &pTypeInfo);
-    if(FAILED(hr))
-        return methods;
-    rb_ary_concat(methods, ole_methods_from_typeinfo(pTypeInfo, mask));
-    OLE_RELEASE(pTypeInfo);
-    return methods;
-}
-
-/*
- *  call-seq:
- *     WIN32OLE#ole_methods
- *
- *  Returns the array of WIN32OLE_METHOD object.
- *  The element is OLE method of WIN32OLE object.
- *
- *     excel = WIN32OLE.new('Excel.Application')
- *     methods = excel.ole_methods
- *
- */
-static VALUE
-fole_methods(VALUE self)
-{
-    return ole_methods( self, INVOKE_FUNC | INVOKE_PROPERTYGET | INVOKE_PROPERTYPUT | INVOKE_PROPERTYPUTREF);
-}
-
-/*
- *  call-seq:
- *     WIN32OLE#ole_get_methods
- *
- *  Returns the array of WIN32OLE_METHOD object .
- *  The element of the array is property (gettable) of WIN32OLE object.
- *
- *     excel = WIN32OLE.new('Excel.Application')
- *     properties = excel.ole_get_methods
- */
-static VALUE
-fole_get_methods(VALUE self)
-{
-    return ole_methods( self, INVOKE_PROPERTYGET);
-}
-
-/*
- *  call-seq:
- *     WIN32OLE#ole_put_methods
- *
- *  Returns the array of WIN32OLE_METHOD object .
- *  The element of the array is property (settable) of WIN32OLE object.
- *
- *     excel = WIN32OLE.new('Excel.Application')
- *     properties = excel.ole_put_methods
- */
-static VALUE
-fole_put_methods(VALUE self)
-{
-    return ole_methods( self, INVOKE_PROPERTYPUT|INVOKE_PROPERTYPUTREF);
-}
-
-/*
- *  call-seq:
- *     WIN32OLE#ole_func_methods
- *
- *  Returns the array of WIN32OLE_METHOD object .
- *  The element of the array is property (settable) of WIN32OLE object.
- *
- *     excel = WIN32OLE.new('Excel.Application')
- *     properties = excel.ole_func_methods
- *
- */
-static VALUE
-fole_func_methods(VALUE self)
-{
-    return ole_methods( self, INVOKE_FUNC);
-}
-
-/*
- *   call-seq:
- *      WIN32OLE#ole_type
- *
- *   Returns WIN32OLE_TYPE object.
- *
- *      excel = WIN32OLE.new('Excel.Application')
- *      tobj = excel.ole_type
- */
-static VALUE
-fole_type(VALUE self)
-{
-    ITypeInfo *pTypeInfo;
-    HRESULT hr;
-    struct oledata *pole = NULL;
-    LCID  lcid = cWIN32OLE_lcid;
-    VALUE type = Qnil;
-
-    pole = oledata_get_struct(self);
-
-    hr = pole->pDispatch->lpVtbl->GetTypeInfo( pole->pDispatch, 0, lcid, &pTypeInfo );
-    if(FAILED(hr)) {
-        ole_raise(hr, eWIN32OLEQueryInterfaceError, "failed to GetTypeInfo");
-    }
-    type = ole_type_from_itypeinfo(pTypeInfo);
-    OLE_RELEASE(pTypeInfo);
-    if (type == Qnil) {
-        rb_raise(rb_eRuntimeError, "failed to create WIN32OLE_TYPE obj from ITypeInfo");
-    }
-    return type;
-}
-
-/*
- *  call-seq:
- *     WIN32OLE#ole_typelib -> The WIN32OLE_TYPELIB object
- *
- *  Returns the WIN32OLE_TYPELIB object. The object represents the
- *  type library which contains the WIN32OLE object.
- *
- *     excel = WIN32OLE.new('Excel.Application')
- *     tlib = excel.ole_typelib
- *     puts tlib.name  # -> 'Microsoft Excel 9.0 Object Library'
- */
-static VALUE
-fole_typelib(VALUE self)
-{
-    struct oledata *pole = NULL;
-    HRESULT hr;
-    ITypeInfo *pTypeInfo;
-    LCID  lcid = cWIN32OLE_lcid;
-    VALUE vtlib = Qnil;
-
-    pole = oledata_get_struct(self);
-    hr = pole->pDispatch->lpVtbl->GetTypeInfo(pole->pDispatch,
-                                              0, lcid, &pTypeInfo);
-    if(FAILED(hr)) {
-        ole_raise(hr, eWIN32OLEQueryInterfaceError, "failed to GetTypeInfo");
-    }
-    vtlib = ole_typelib_from_itypeinfo(pTypeInfo);
-    OLE_RELEASE(pTypeInfo);
-    if (vtlib == Qnil) {
-        rb_raise(rb_eRuntimeError, "failed to get type library info.");
-    }
-    return vtlib;
-}
-
-/*
- *  call-seq:
- *     WIN32OLE#ole_query_interface(iid) -> WIN32OLE object
- *
- *  Returns WIN32OLE object for a specific dispatch or dual
- *  interface specified by iid.
- *
- *      ie = WIN32OLE.new('InternetExplorer.Application')
- *      ie_web_app = ie.ole_query_interface('{0002DF05-0000-0000-C000-000000000046}') # => WIN32OLE object for dispinterface IWebBrowserApp
- */
-static VALUE
-fole_query_interface(VALUE self, VALUE str_iid)
-{
-    HRESULT hr;
-    OLECHAR *pBuf;
-    IID iid;
-    struct oledata *pole = NULL;
-    IDispatch *pDispatch;
-    void *p;
-
-    pBuf  = ole_vstr2wc(str_iid);
-    hr = CLSIDFromString(pBuf, &iid);
-    SysFreeString(pBuf);
-    if(FAILED(hr)) {
-        ole_raise(hr, eWIN32OLERuntimeError,
-                  "invalid iid: `%s'",
-                  StringValuePtr(str_iid));
-    }
-
-    pole = oledata_get_struct(self);
-    if(!pole->pDispatch) {
-        rb_raise(rb_eRuntimeError, "failed to get dispatch interface");
-    }
-
-    hr = pole->pDispatch->lpVtbl->QueryInterface(pole->pDispatch, &iid,
-                                                 &p);
-    if(FAILED(hr)) {
-        ole_raise(hr, eWIN32OLEQueryInterfaceError,
-                  "failed to get interface `%s'",
-                  StringValuePtr(str_iid));
-    }
-
-    pDispatch = p;
-    return create_win32ole_object(cWIN32OLE, pDispatch, 0, 0);
-}
-
-/*
- *  call-seq:
- *     WIN32OLE#ole_respond_to?(method) -> true or false
- *
- *  Returns true when OLE object has OLE method, otherwise returns false.
- *
- *      ie = WIN32OLE.new('InternetExplorer.Application')
- *      ie.ole_respond_to?("gohome") => true
- */
-static VALUE
-fole_respond_to(VALUE self, VALUE method)
-{
-    struct oledata *pole = NULL;
-    BSTR wcmdname;
-    DISPID DispID;
-    HRESULT hr;
-    if(!RB_TYPE_P(method, T_STRING) && !RB_TYPE_P(method, T_SYMBOL)) {
-        rb_raise(rb_eTypeError, "wrong argument type (expected String or Symbol)");
-    }
-    if (RB_TYPE_P(method, T_SYMBOL)) {
-        method = rb_sym2str(method);
-    }
-    pole = oledata_get_struct(self);
-    wcmdname = ole_vstr2wc(method);
-    hr = pole->pDispatch->lpVtbl->GetIDsOfNames( pole->pDispatch, &IID_NULL,
-            &wcmdname, 1, cWIN32OLE_lcid, &DispID);
-    SysFreeString(wcmdname);
-    return SUCCEEDED(hr) ? Qtrue : Qfalse;
-}
-
-HRESULT
-ole_docinfo_from_type(ITypeInfo *pTypeInfo, BSTR *name, BSTR *helpstr, DWORD *helpcontext, BSTR *helpfile)
-{
-    HRESULT hr;
-    ITypeLib *pTypeLib;
-    UINT i;
-
-    hr = pTypeInfo->lpVtbl->GetContainingTypeLib(pTypeInfo, &pTypeLib, &i);
-    if (FAILED(hr)) {
-        return hr;
-    }
-
-    hr = pTypeLib->lpVtbl->GetDocumentation(pTypeLib, i,
-                                            name, helpstr,
-                                            helpcontext, helpfile);
-    if (FAILED(hr)) {
-        OLE_RELEASE(pTypeLib);
-        return hr;
-    }
-    OLE_RELEASE(pTypeLib);
-    return hr;
-}
-
-static VALUE
-ole_usertype2val(ITypeInfo *pTypeInfo, TYPEDESC *pTypeDesc, VALUE typedetails)
-{
-    HRESULT hr;
-    BSTR bstr;
-    ITypeInfo *pRefTypeInfo;
-    VALUE type = Qnil;
-
-    hr = pTypeInfo->lpVtbl->GetRefTypeInfo(pTypeInfo,
-                                           V_UNION1(pTypeDesc, hreftype),
-                                           &pRefTypeInfo);
-    if(FAILED(hr))
-        return Qnil;
-    hr = ole_docinfo_from_type(pRefTypeInfo, &bstr, NULL, NULL, NULL);
-    if(FAILED(hr)) {
-        OLE_RELEASE(pRefTypeInfo);
-        return Qnil;
-    }
-    OLE_RELEASE(pRefTypeInfo);
-    type = WC2VSTR(bstr);
-    if(typedetails != Qnil)
-        rb_ary_push(typedetails, type);
-    return type;
-}
-
-static VALUE
-ole_ptrtype2val(ITypeInfo *pTypeInfo, TYPEDESC *pTypeDesc, VALUE typedetails)
-{
-    TYPEDESC *p = pTypeDesc;
-    VALUE type = rb_str_new2("");
-
-    if (p->vt == VT_PTR || p->vt == VT_SAFEARRAY) {
-        p = V_UNION1(p, lptdesc);
-        type = ole_typedesc2val(pTypeInfo, p, typedetails);
-    }
-    return type;
-}
-
-VALUE
-ole_typedesc2val(ITypeInfo *pTypeInfo, TYPEDESC *pTypeDesc, VALUE typedetails)
-{
-    VALUE str;
-    VALUE typestr = Qnil;
-    switch(pTypeDesc->vt) {
-    case VT_I2:
-        typestr = rb_str_new2("I2");
-        break;
-    case VT_I4:
-        typestr = rb_str_new2("I4");
-        break;
-    case VT_R4:
-        typestr = rb_str_new2("R4");
-        break;
-    case VT_R8:
-        typestr = rb_str_new2("R8");
-        break;
-    case VT_CY:
-        typestr = rb_str_new2("CY");
-        break;
-    case VT_DATE:
-        typestr = rb_str_new2("DATE");
-        break;
-    case VT_BSTR:
-        typestr = rb_str_new2("BSTR");
-        break;
-    case VT_BOOL:
-        typestr = rb_str_new2("BOOL");
-        break;
-    case VT_VARIANT:
-        typestr = rb_str_new2("VARIANT");
-        break;
-    case VT_DECIMAL:
-        typestr = rb_str_new2("DECIMAL");
-        break;
-    case VT_I1:
-        typestr = rb_str_new2("I1");
-        break;
-    case VT_UI1:
-        typestr = rb_str_new2("UI1");
-        break;
-    case VT_UI2:
-        typestr = rb_str_new2("UI2");
-        break;
-    case VT_UI4:
-        typestr = rb_str_new2("UI4");
-        break;
-#if (defined(_MSC_VER) && (_MSC_VER >= 1300)) || defined(__CYGWIN__) || defined(__MINGW32__)
-    case VT_I8:
-        typestr = rb_str_new2("I8");
-        break;
-    case VT_UI8:
-        typestr = rb_str_new2("UI8");
-        break;
-#endif
-    case VT_INT:
-        typestr = rb_str_new2("INT");
-        break;
-    case VT_UINT:
-        typestr = rb_str_new2("UINT");
-        break;
-    case VT_VOID:
-        typestr = rb_str_new2("VOID");
-        break;
-    case VT_HRESULT:
-        typestr = rb_str_new2("HRESULT");
-        break;
-    case VT_PTR:
-        typestr = rb_str_new2("PTR");
-        if(typedetails != Qnil)
-            rb_ary_push(typedetails, typestr);
-        return ole_ptrtype2val(pTypeInfo, pTypeDesc, typedetails);
-    case VT_SAFEARRAY:
-        typestr = rb_str_new2("SAFEARRAY");
-        if(typedetails != Qnil)
-            rb_ary_push(typedetails, typestr);
-        return ole_ptrtype2val(pTypeInfo, pTypeDesc, typedetails);
-    case VT_CARRAY:
-        typestr = rb_str_new2("CARRAY");
-        break;
-    case VT_USERDEFINED:
-        typestr = rb_str_new2("USERDEFINED");
-        if (typedetails != Qnil)
-            rb_ary_push(typedetails, typestr);
-        str = ole_usertype2val(pTypeInfo, pTypeDesc, typedetails);
-        if (str != Qnil) {
-            return str;
-        }
-        return typestr;
-    case VT_UNKNOWN:
-        typestr = rb_str_new2("UNKNOWN");
-        break;
-    case VT_DISPATCH:
-        typestr = rb_str_new2("DISPATCH");
-        break;
-    case VT_ERROR:
-        typestr = rb_str_new2("ERROR");
-        break;
-    case VT_LPWSTR:
-        typestr = rb_str_new2("LPWSTR");
-        break;
-    case VT_LPSTR:
-        typestr = rb_str_new2("LPSTR");
-        break;
-    case VT_RECORD:
-        typestr = rb_str_new2("RECORD");
-        break;
-    default:
-        typestr = rb_str_new2("Unknown Type ");
-        rb_str_concat(typestr, rb_fix2str(RB_INT2FIX(pTypeDesc->vt), 10));
-        break;
-    }
-    if (typedetails != Qnil)
-        rb_ary_push(typedetails, typestr);
-    return typestr;
-}
-
-/*
- *   call-seq:
- *      WIN32OLE#ole_method_help(method)
- *
- *   Returns WIN32OLE_METHOD object corresponding with method
- *   specified by 1st argument.
- *
- *      excel = WIN32OLE.new('Excel.Application')
- *      method = excel.ole_method_help('Quit')
- *
- */
-static VALUE
-fole_method_help(VALUE self, VALUE cmdname)
-{
-    ITypeInfo *pTypeInfo;
-    HRESULT hr;
-    struct oledata *pole = NULL;
-    VALUE obj;
-
-    SafeStringValue(cmdname);
-    pole = oledata_get_struct(self);
-    hr = typeinfo_from_ole(pole, &pTypeInfo);
-    if(FAILED(hr))
-        ole_raise(hr, eWIN32OLEQueryInterfaceError, "failed to get ITypeInfo");
-
-    obj = create_win32ole_method(pTypeInfo, cmdname);
-
-    OLE_RELEASE(pTypeInfo);
-    if (obj == Qnil)
-        rb_raise(eWIN32OLERuntimeError, "not found %s",
-                 StringValuePtr(cmdname));
-    return obj;
-}
-
-/*
- *  call-seq:
- *     WIN32OLE#ole_activex_initialize() -> Qnil
- *
- *  Initialize WIN32OLE object(ActiveX Control) by calling
- *  IPersistMemory::InitNew.
- *
- *  Before calling OLE method, some kind of the ActiveX controls
- *  created with MFC should be initialized by calling
- *  IPersistXXX::InitNew.
- *
- *  If and only if you received the exception "HRESULT error code:
- *  0x8000ffff catastrophic failure", try this method before
- *  invoking any ole_method.
- *
- *     obj = WIN32OLE.new("ProgID_or_GUID_of_ActiveX_Control")
- *     obj.ole_activex_initialize
- *     obj.method(...)
- *
- */
-static VALUE
-fole_activex_initialize(VALUE self)
-{
-    struct oledata *pole = NULL;
-    IPersistMemory *pPersistMemory;
-    void *p;
-
-    HRESULT hr = S_OK;
-
-    pole = oledata_get_struct(self);
-
-    hr = pole->pDispatch->lpVtbl->QueryInterface(pole->pDispatch, &IID_IPersistMemory, &p);
-    pPersistMemory = p;
-    if (SUCCEEDED(hr)) {
-        hr = pPersistMemory->lpVtbl->InitNew(pPersistMemory);
-        OLE_RELEASE(pPersistMemory);
-        if (SUCCEEDED(hr)) {
-            return Qnil;
-        }
-    }
-
-    if (FAILED(hr)) {
-        ole_raise(hr, eWIN32OLERuntimeError, "fail to initialize ActiveX control");
-    }
-
-    return Qnil;
-}
-
-HRESULT
-typelib_from_val(VALUE obj, ITypeLib **pTypeLib)
-{
-    LCID lcid = cWIN32OLE_lcid;
-    HRESULT hr;
-    struct oledata *pole = NULL;
-    unsigned int index;
-    ITypeInfo *pTypeInfo;
-    pole = oledata_get_struct(obj);
-    hr = pole->pDispatch->lpVtbl->GetTypeInfo(pole->pDispatch,
-                                              0, lcid, &pTypeInfo);
-    if (FAILED(hr)) {
-        return hr;
-    }
-    hr = pTypeInfo->lpVtbl->GetContainingTypeLib(pTypeInfo, pTypeLib, &index);
-    OLE_RELEASE(pTypeInfo);
-    return hr;
-}
-
-static void
-com_hash_free(void *ptr)
-{
-    st_table *tbl = ptr;
-    st_free_table(tbl);
-}
-
-static void
-com_hash_mark(void *ptr)
-{
-    st_table *tbl = ptr;
-    rb_mark_hash(tbl);
-}
-
-static size_t
-com_hash_size(const void *ptr)
-{
-    const st_table *tbl = ptr;
-    return st_memsize(tbl);
-}
-
-static void
-check_nano_server(void)
-{
-    HKEY hsubkey;
-    LONG err;
-    const char * subkey = "SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\Server\\ServerLevels";
-    const char * regval = "NanoServer";
-
-    err = RegOpenKeyEx(HKEY_LOCAL_MACHINE, subkey, 0, KEY_READ, &hsubkey);
-    if (err == ERROR_SUCCESS) {
-        err = RegQueryValueEx(hsubkey, regval, NULL, NULL, NULL, NULL);
-        if (err == ERROR_SUCCESS) {
-            g_running_nano = TRUE;
-        }
-        RegCloseKey(hsubkey);
-    }
-}
-
-LCID cWIN32OLE_lcid;
-
-void
-Init_win32ole(void)
-{
-    cWIN32OLE_lcid = LOCALE_SYSTEM_DEFAULT;
-    g_ole_initialized_init();
-    check_nano_server();
-
-    com_vtbl.QueryInterface = QueryInterface;
-    com_vtbl.AddRef = AddRef;
-    com_vtbl.Release = Release;
-    com_vtbl.GetTypeInfoCount = GetTypeInfoCount;
-    com_vtbl.GetTypeInfo = GetTypeInfo;
-    com_vtbl.GetIDsOfNames = GetIDsOfNames;
-    com_vtbl.Invoke = Invoke;
-
-    message_filter.QueryInterface = mf_QueryInterface;
-    message_filter.AddRef = mf_AddRef;
-    message_filter.Release = mf_Release;
-    message_filter.HandleInComingCall = mf_HandleInComingCall;
-    message_filter.RetryRejectedCall = mf_RetryRejectedCall;
-    message_filter.MessagePending = mf_MessagePending;
-
-    enc2cp_hash = TypedData_Wrap_Struct(0, &win32ole_hash_datatype, 0);
-    RTYPEDDATA_DATA(enc2cp_hash) = st_init_numtable();
-    rb_gc_register_mark_object(enc2cp_hash);
-
-    com_hash = TypedData_Wrap_Struct(0, &win32ole_hash_datatype, 0);
-    RTYPEDDATA_DATA(com_hash) = st_init_numtable();
-    rb_gc_register_mark_object(com_hash);
-
-    cWIN32OLE = rb_define_class("WIN32OLE", rb_cObject);
-
-    rb_define_alloc_func(cWIN32OLE, fole_s_allocate);
-
-    rb_define_method(cWIN32OLE, "initialize", fole_initialize, -1);
-
-    rb_define_singleton_method(cWIN32OLE, "connect", fole_s_connect, -1);
-    rb_define_singleton_method(cWIN32OLE, "const_load", fole_s_const_load, -1);
-
-    rb_define_singleton_method(cWIN32OLE, "ole_free", fole_s_free, 1);
-    rb_define_singleton_method(cWIN32OLE, "ole_reference_count", fole_s_reference_count, 1);
-    rb_define_singleton_method(cWIN32OLE, "ole_show_help", fole_s_show_help, -1);
-    rb_define_singleton_method(cWIN32OLE, "codepage", fole_s_get_code_page, 0);
-    rb_define_singleton_method(cWIN32OLE, "codepage=", fole_s_set_code_page, 1);
-    rb_define_singleton_method(cWIN32OLE, "locale", fole_s_get_locale, 0);
-    rb_define_singleton_method(cWIN32OLE, "locale=", fole_s_set_locale, 1);
-    rb_define_singleton_method(cWIN32OLE, "create_guid", fole_s_create_guid, 0);
-    rb_define_singleton_method(cWIN32OLE, "ole_initialize", fole_s_ole_initialize, 0);
-    rb_define_singleton_method(cWIN32OLE, "ole_uninitialize", fole_s_ole_uninitialize, 0);
-
-    rb_define_method(cWIN32OLE, "invoke", fole_invoke, -1);
-    rb_define_method(cWIN32OLE, "[]", fole_getproperty_with_bracket, -1);
-    rb_define_method(cWIN32OLE, "_invoke", fole_invoke2, 3);
-    rb_define_method(cWIN32OLE, "_getproperty", fole_getproperty2, 3);
-    rb_define_method(cWIN32OLE, "_setproperty", fole_setproperty2, 3);
-
-    /* support propput method that takes an argument */
-    rb_define_method(cWIN32OLE, "[]=", fole_setproperty_with_bracket, -1);
-
-    rb_define_method(cWIN32OLE, "ole_free", fole_free, 0);
-
-    rb_define_method(cWIN32OLE, "each", fole_each, 0);
-    rb_define_method(cWIN32OLE, "method_missing", fole_missing, -1);
-
-    /* support setproperty method much like Perl ;-) */
-    rb_define_method(cWIN32OLE, "setproperty", fole_setproperty, -1);
-
-    rb_define_method(cWIN32OLE, "ole_methods", fole_methods, 0);
-    rb_define_method(cWIN32OLE, "ole_get_methods", fole_get_methods, 0);
-    rb_define_method(cWIN32OLE, "ole_put_methods", fole_put_methods, 0);
-    rb_define_method(cWIN32OLE, "ole_func_methods", fole_func_methods, 0);
-
-    rb_define_method(cWIN32OLE, "ole_method", fole_method_help, 1);
-    rb_define_alias(cWIN32OLE, "ole_method_help", "ole_method");
-    rb_define_method(cWIN32OLE, "ole_activex_initialize", fole_activex_initialize, 0);
-    rb_define_method(cWIN32OLE, "ole_type", fole_type, 0);
-    rb_define_alias(cWIN32OLE, "ole_obj_help", "ole_type");
-    rb_define_method(cWIN32OLE, "ole_typelib", fole_typelib, 0);
-    rb_define_method(cWIN32OLE, "ole_query_interface", fole_query_interface, 1);
-    rb_define_method(cWIN32OLE, "ole_respond_to?", fole_respond_to, 1);
-
-    /* Constants definition */
-
-    /*
-     * Version string of WIN32OLE.
-     */
-    rb_define_const(cWIN32OLE, "VERSION", rb_str_new2(WIN32OLE_VERSION));
-
-    /*
-     * After invoking OLE methods with reference arguments, you can access
-     * the value of arguments by using ARGV.
-     *
-     * If the method of OLE(COM) server written by C#.NET is following:
-     *
-     *   void calcsum(int a, int b, out int c) {
-     *       c = a + b;
-     *   }
-     *
-     * then, the Ruby OLE(COM) client script to retrieve the value of
-     * argument c after invoking calcsum method is following:
-     *
-     *   a = 10
-     *   b = 20
-     *   c = 0
-     *   comserver.calcsum(a, b, c)
-     *   p c # => 0
-     *   p WIN32OLE::ARGV # => [10, 20, 30]
-     *
-     * You can use WIN32OLE_VARIANT object to retrieve the value of reference
-     * arguments instead of referring WIN32OLE::ARGV.
-     *
-     */
-    rb_define_const(cWIN32OLE, "ARGV", rb_ary_new());
-
-    /*
-     * 0: ANSI code page. See WIN32OLE.codepage and WIN32OLE.codepage=.
-     */
-    rb_define_const(cWIN32OLE, "CP_ACP", RB_INT2FIX(CP_ACP));
-
-    /*
-     * 1: OEM code page. See WIN32OLE.codepage and WIN32OLE.codepage=.
-     */
-    rb_define_const(cWIN32OLE, "CP_OEMCP", RB_INT2FIX(CP_OEMCP));
-
-    /*
-     * 2
-     */
-    rb_define_const(cWIN32OLE, "CP_MACCP", RB_INT2FIX(CP_MACCP));
-
-    /*
-     * 3: current thread ANSI code page. See WIN32OLE.codepage and
-     * WIN32OLE.codepage=.
-     */
-    rb_define_const(cWIN32OLE, "CP_THREAD_ACP", RB_INT2FIX(CP_THREAD_ACP));
-
-    /*
-     * 42: symbol code page. See WIN32OLE.codepage and WIN32OLE.codepage=.
-     */
-    rb_define_const(cWIN32OLE, "CP_SYMBOL", RB_INT2FIX(CP_SYMBOL));
-
-    /*
-     * 65000: UTF-7 code page. See WIN32OLE.codepage and WIN32OLE.codepage=.
-     */
-    rb_define_const(cWIN32OLE, "CP_UTF7", RB_INT2FIX(CP_UTF7));
-
-    /*
-     * 65001: UTF-8 code page. See WIN32OLE.codepage and WIN32OLE.codepage=.
-     */
-    rb_define_const(cWIN32OLE, "CP_UTF8", RB_INT2FIX(CP_UTF8));
-
-    /*
-     * 0x0800: default locale for the operating system. See WIN32OLE.locale
-     * and WIN32OLE.locale=.
-     */
-    rb_define_const(cWIN32OLE, "LOCALE_SYSTEM_DEFAULT", RB_INT2FIX(LOCALE_SYSTEM_DEFAULT));
-
-    /*
-     * 0x0400: default locale for the user or process. See WIN32OLE.locale
-     * and WIN32OLE.locale=.
-     */
-    rb_define_const(cWIN32OLE, "LOCALE_USER_DEFAULT", RB_INT2FIX(LOCALE_USER_DEFAULT));
-
-    Init_win32ole_variant_m();
-    Init_win32ole_typelib();
-    Init_win32ole_type();
-    Init_win32ole_variable();
-    Init_win32ole_method();
-    Init_win32ole_param();
-    Init_win32ole_event();
-    Init_win32ole_variant();
-    Init_win32ole_record();
-    Init_win32ole_error();
-
-    ole_init_cp();
-}
diff --git a/ext/win32ole/win32ole.gemspec b/ext/win32ole/win32ole.gemspec
deleted file mode 100644
index 9c137a5d700610..00000000000000
--- a/ext/win32ole/win32ole.gemspec
+++ /dev/null
@@ -1,32 +0,0 @@
-source_version = ["", "ext/win32ole/"].find do |dir|
-  begin
-    break File.open(File.join(__dir__, "#{dir}win32ole.c")) {|f|
-      f.gets("\n#define WIN32OLE_VERSION ")
-      f.gets[/\s*"(.+)"/, 1]
-    }
-  rescue Errno::ENOENT
-  end
-end
-
-Gem::Specification.new do |spec|
-  spec.name          = "win32ole"
-  spec.version       = source_version
-  spec.authors       = ["Masaki Suketa"]
-  spec.email         = ["suke@ruby-lang.org"]
-
-  spec.summary       = %q{Provides an interface for OLE Automation in Ruby}
-  spec.description   = spec.summary
-  spec.homepage      = "https://github.com/ruby/win32ole"
-  spec.required_ruby_version = Gem::Requirement.new(">= 2.3.0")
-  spec.licenses      = ["Ruby", "BSD-2-Clause"]
-
-  spec.metadata["homepage_uri"] = spec.homepage
-  spec.metadata["source_code_uri"] = spec.homepage
-
-  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/ext/win32ole/win32ole.h b/ext/win32ole/win32ole.h
deleted file mode 100644
index cd627ef7652905..00000000000000
--- a/ext/win32ole/win32ole.h
+++ /dev/null
@@ -1,155 +0,0 @@
-#ifndef WIN32OLE_H
-#define WIN32OLE_H 1
-#include "ruby/ruby.h"
-#include "ruby/st.h"
-#include "ruby/encoding.h"
-
-#define GNUC_OLDER_3_4_4 \
-    ((__GNUC__ < 3) || \
-     ((__GNUC__ <= 3) && (__GNUC_MINOR__ < 4)) || \
-     ((__GNUC__ <= 3) && (__GNUC_MINOR__ <= 4) && (__GNUC_PATCHLEVEL__ <= 4)))
-
-#if (defined(__GNUC__)) && (GNUC_OLDER_3_4_4)
-#ifndef NONAMELESSUNION
-#define NONAMELESSUNION 1
-#endif
-#endif
-
-#include <ctype.h>
-
-#include <windows.h>
-#include <ocidl.h>
-#include <olectl.h>
-#include <ole2.h>
-#if defined(HAVE_TYPE_IMULTILANGUAGE2) || defined(HAVE_TYPE_IMULTILANGUAGE)
-#include <mlang.h>
-#endif
-#include <stdlib.h>
-#include <math.h>
-#ifdef HAVE_STDARG_PROTOTYPES
-#include <stdarg.h>
-#define va_init_list(a,b) va_start(a,b)
-#else
-#include <varargs.h>
-#define va_init_list(a,b) va_start(a)
-#endif
-#include <objidl.h>
-
-#define DOUT fprintf(stderr,"%s(%d)\n", __FILE__, __LINE__)
-#define DOUTS(x) fprintf(stderr,"%s(%d):" #x "=%s\n",__FILE__, __LINE__,x)
-#define DOUTMSG(x) fprintf(stderr, "%s(%d):" #x "\n",__FILE__, __LINE__)
-#define DOUTI(x) fprintf(stderr, "%s(%d):" #x "=%d\n",__FILE__, __LINE__,x)
-#define DOUTD(x) fprintf(stderr, "%s(%d):" #x "=%f\n",__FILE__, __LINE__,x)
-
-#if (defined(__GNUC__)) && (GNUC_OLDER_3_4_4)
-#define V_UNION1(X, Y) ((X)->u.Y)
-#else
-#define V_UNION1(X, Y) ((X)->Y)
-#endif
-
-#if (defined(__GNUC__)) && (GNUC_OLDER_3_4_4)
-#undef V_UNION
-#define V_UNION(X,Y) ((X)->n1.n2.n3.Y)
-
-#undef V_VT
-#define V_VT(X) ((X)->n1.n2.vt)
-
-#undef V_BOOL
-#define V_BOOL(X) V_UNION(X,boolVal)
-#endif
-
-#ifndef V_I1REF
-#define V_I1REF(X) V_UNION(X, pcVal)
-#endif
-
-#ifndef V_UI2REF
-#define V_UI2REF(X) V_UNION(X, puiVal)
-#endif
-
-#ifndef V_INT
-#define V_INT(X) V_UNION(X, intVal)
-#endif
-
-#ifndef V_INTREF
-#define V_INTREF(X) V_UNION(X, pintVal)
-#endif
-
-#ifndef V_UINT
-#define V_UINT(X) V_UNION(X, uintVal)
-#endif
-
-#ifndef V_UINTREF
-#define V_UINTREF(X) V_UNION(X, puintVal)
-#endif
-
-#ifdef HAVE_LONG_LONG
-#define I8_2_NUM LL2NUM
-#define UI8_2_NUM ULL2NUM
-#define NUM2I8  RB_NUM2LL
-#define NUM2UI8 RB_NUM2ULL
-#else
-#define I8_2_NUM RB_INT2NUM
-#define UI8_2_NUM RB_UINT2NUM
-#define NUM2I8  RB_NUM2INT
-#define NUM2UI8 RB_NUM2UINT
-#endif
-
-#define OLE_ADDREF(X) (X) ? ((X)->lpVtbl->AddRef(X)) : 0
-#define OLE_RELEASE(X) (X) ? ((X)->lpVtbl->Release(X)) : 0
-#define OLE_FREE(x) {\
-    if(ole_initialized() == TRUE) {\
-        if(x) {\
-            OLE_RELEASE(x);\
-            (x) = 0;\
-        }\
-    }\
-}
-
-#define OLE_GET_TYPEATTR(X, Y) ((X)->lpVtbl->GetTypeAttr((X), (Y)))
-#define OLE_RELEASE_TYPEATTR(X, Y) ((X)->lpVtbl->ReleaseTypeAttr((X), (Y)))
-
-struct oledata {
-    IDispatch *pDispatch;
-};
-
-extern VALUE cWIN32OLE;
-extern LCID cWIN32OLE_lcid;
-
-struct oledata *oledata_get_struct(VALUE obj);
-LPWSTR ole_vstr2wc(VALUE vstr);
-LONG reg_open_key(HKEY hkey, const char *name, HKEY *phkey);
-LONG reg_open_vkey(HKEY hkey, VALUE key, HKEY *phkey);
-VALUE reg_enum_key(HKEY hkey, DWORD i);
-VALUE reg_get_val(HKEY hkey, const char *subkey);
-VALUE reg_get_val2(HKEY hkey, const char *subkey);
-void ole_initialize(void);
-VALUE default_inspect(VALUE self, const char *class_name);
-char *ole_wc2mb(LPWSTR pw);
-VALUE ole_wc2vstr(LPWSTR pw, BOOL isfree);
-
-#define WC2VSTR(x) ole_wc2vstr((x), TRUE)
-
-BOOL ole_initialized(void);
-HRESULT ole_docinfo_from_type(ITypeInfo *pTypeInfo, BSTR *name, BSTR *helpstr, DWORD *helpcontext, BSTR *helpfile);
-VALUE ole_typedesc2val(ITypeInfo *pTypeInfo, TYPEDESC *pTypeDesc, VALUE typedetails);
-VALUE make_inspect(const char *class_name, VALUE detail);
-void ole_val2variant(VALUE val, VARIANT *var);
-void ole_val2variant2(VALUE val, VARIANT *var);
-void ole_val2variant_ex(VALUE val, VARIANT *var, VARTYPE vt);
-VALUE ole_variant2val(VARIANT *pvar);
-HRESULT ole_val_ary2variant_ary(VALUE val, VARIANT *var, VARTYPE vt);
-VOID *val2variant_ptr(VALUE val, VARIANT *var, VARTYPE vt);
-HRESULT typelib_from_val(VALUE obj, ITypeLib **pTypeLib);
-
-#include "win32ole_variant_m.h"
-#include "win32ole_typelib.h"
-#include "win32ole_type.h"
-#include "win32ole_variable.h"
-#include "win32ole_method.h"
-#include "win32ole_param.h"
-#include "win32ole_event.h"
-#include "win32ole_variant.h"
-#include "win32ole_record.h"
-#include "win32ole_error.h"
-
-#endif
diff --git a/ext/win32ole/win32ole_error.c b/ext/win32ole/win32ole_error.c
deleted file mode 100644
index 2bb515626324dd..00000000000000
--- a/ext/win32ole/win32ole_error.c
+++ /dev/null
@@ -1,87 +0,0 @@
-#include "win32ole.h"
-
-static VALUE ole_hresult2msg(HRESULT hr);
-
-static VALUE
-ole_hresult2msg(HRESULT hr)
-{
-    VALUE msg = Qnil;
-    char *p_msg = NULL;
-    char *term = NULL;
-    DWORD dwCount;
-
-    char strhr[100];
-    sprintf(strhr, "    HRESULT error code:0x%08x\n      ", (unsigned)hr);
-    msg = rb_str_new2(strhr);
-    dwCount = FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER |
-                            FORMAT_MESSAGE_FROM_SYSTEM |
-                            FORMAT_MESSAGE_IGNORE_INSERTS,
-                            NULL, hr,
-                            MAKELANGID(LANG_ENGLISH, SUBLANG_ENGLISH_US),
-                            (LPTSTR)&p_msg, 0, NULL);
-    if (dwCount == 0) {
-        dwCount = FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER |
-                                FORMAT_MESSAGE_FROM_SYSTEM |
-                                FORMAT_MESSAGE_IGNORE_INSERTS,
-                                NULL, hr, cWIN32OLE_lcid,
-                                (LPTSTR)&p_msg, 0, NULL);
-    }
-    if (dwCount > 0) {
-        term = p_msg + strlen(p_msg);
-        while (p_msg < term) {
-            term--;
-            if (*term == '\r' || *term == '\n')
-                *term = '\0';
-            else break;
-        }
-        if (p_msg[0] != '\0') {
-            rb_str_cat2(msg, p_msg);
-        }
-    }
-    LocalFree(p_msg);
-    return msg;
-}
-
-void
-ole_raise(HRESULT hr, VALUE ecs, const char *fmt, ...)
-{
-    va_list args;
-    VALUE msg;
-    VALUE err_msg;
-    va_init_list(args, fmt);
-    msg = rb_vsprintf(fmt, args);
-    va_end(args);
-
-    err_msg = ole_hresult2msg(hr);
-    if(err_msg != Qnil) {
-        rb_str_cat2(msg, "\n");
-        rb_str_append(msg, err_msg);
-    }
-    rb_exc_raise(rb_exc_new_str(ecs, msg));
-}
-
-VALUE eWIN32OLERuntimeError;
-VALUE eWIN32OLEQueryInterfaceError;
-
-void
-Init_win32ole_error(void)
-{
-    /*
-     * Document-class: WIN32OLERuntimeError
-     *
-     * Raised when OLE processing failed.
-     *
-     * EX:
-     *
-     *   obj = WIN32OLE.new("NonExistProgID")
-     *
-     * raises the exception:
-     *
-     *   WIN32OLERuntimeError: unknown OLE server: `NonExistProgID'
-     *       HRESULT error code:0x800401f3
-     *         Invalid class string
-     *
-     */
-    eWIN32OLERuntimeError = rb_define_class("WIN32OLERuntimeError", rb_eRuntimeError);
-    eWIN32OLEQueryInterfaceError = rb_define_class("WIN32OLEQueryInterfaceError", eWIN32OLERuntimeError);
-}
diff --git a/ext/win32ole/win32ole_error.h b/ext/win32ole/win32ole_error.h
deleted file mode 100644
index a2f329856f1dac..00000000000000
--- a/ext/win32ole/win32ole_error.h
+++ /dev/null
@@ -1,9 +0,0 @@
-#ifndef WIN32OLE_ERROR_H
-#define WIN32OLE_ERROR_H 1
-
-extern VALUE eWIN32OLERuntimeError;
-extern VALUE eWIN32OLEQueryInterfaceError;
-NORETURN(PRINTF_ARGS(void ole_raise(HRESULT hr, VALUE ecs, const char *fmt, ...), 3, 4));
-void Init_win32ole_error(void);
-
-#endif
diff --git a/ext/win32ole/win32ole_event.c b/ext/win32ole/win32ole_event.c
deleted file mode 100644
index 45ebf13433fb13..00000000000000
--- a/ext/win32ole/win32ole_event.c
+++ /dev/null
@@ -1,1278 +0,0 @@
-#include "win32ole.h"
-
-/*
- * Document-class: WIN32OLE_EVENT
- *
- *   <code>WIN32OLE_EVENT</code> objects controls OLE event.
- */
-
-RUBY_EXTERN void rb_write_error_str(VALUE mesg);
-
-typedef struct {
-    struct IEventSinkVtbl * lpVtbl;
-} IEventSink, *PEVENTSINK;
-
-typedef struct IEventSinkVtbl IEventSinkVtbl;
-
-struct IEventSinkVtbl {
-    STDMETHOD(QueryInterface)(
-        PEVENTSINK,
-        REFIID,
-        LPVOID *);
-    STDMETHOD_(ULONG, AddRef)(PEVENTSINK);
-    STDMETHOD_(ULONG, Release)(PEVENTSINK);
-
-    STDMETHOD(GetTypeInfoCount)(
-        PEVENTSINK,
-        UINT *);
-    STDMETHOD(GetTypeInfo)(
-        PEVENTSINK,
-        UINT,
-        LCID,
-        ITypeInfo **);
-    STDMETHOD(GetIDsOfNames)(
-        PEVENTSINK,
-        REFIID,
-        OLECHAR **,
-        UINT,
-        LCID,
-        DISPID *);
-    STDMETHOD(Invoke)(
-        PEVENTSINK,
-        DISPID,
-        REFIID,
-        LCID,
-        WORD,
-        DISPPARAMS *,
-        VARIANT *,
-        EXCEPINFO *,
-        UINT *);
-};
-
-typedef struct tagIEVENTSINKOBJ {
-    const IEventSinkVtbl *lpVtbl;
-    DWORD m_cRef;
-    IID m_iid;
-    long  m_event_id;
-    ITypeInfo *pTypeInfo;
-}IEVENTSINKOBJ, *PIEVENTSINKOBJ;
-
-struct oleeventdata {
-    DWORD dwCookie;
-    IConnectionPoint *pConnectionPoint;
-    IDispatch *pDispatch;
-    long event_id;
-};
-
-static VALUE ary_ole_event;
-static ID id_events;
-
-VALUE cWIN32OLE_EVENT;
-
-STDMETHODIMP EVENTSINK_QueryInterface(PEVENTSINK, REFIID, LPVOID*);
-STDMETHODIMP_(ULONG) EVENTSINK_AddRef(PEVENTSINK);
-STDMETHODIMP_(ULONG) EVENTSINK_Release(PEVENTSINK);
-STDMETHODIMP EVENTSINK_GetTypeInfoCount(PEVENTSINK, UINT*);
-STDMETHODIMP EVENTSINK_GetTypeInfo(PEVENTSINK, UINT, LCID, ITypeInfo**);
-STDMETHODIMP EVENTSINK_GetIDsOfNames(PEVENTSINK, REFIID, OLECHAR**, UINT, LCID, DISPID*);
-STDMETHODIMP EVENTSINK_Invoke(PEVENTSINK, DISPID, REFIID, LCID, WORD, DISPPARAMS*, VARIANT*, EXCEPINFO*, UINT*);
-
-static const IEventSinkVtbl vtEventSink = {
-    EVENTSINK_QueryInterface,
-    EVENTSINK_AddRef,
-    EVENTSINK_Release,
-    EVENTSINK_GetTypeInfoCount,
-    EVENTSINK_GetTypeInfo,
-    EVENTSINK_GetIDsOfNames,
-    EVENTSINK_Invoke,
-};
-
-void EVENTSINK_Destructor(PIEVENTSINKOBJ);
-static void ole_val2ptr_variant(VALUE val, VARIANT *var);
-static void hash2ptr_dispparams(VALUE hash, ITypeInfo *pTypeInfo, DISPID dispid, DISPPARAMS *pdispparams);
-static VALUE hash2result(VALUE hash);
-static void ary2ptr_dispparams(VALUE ary, DISPPARAMS *pdispparams);
-static VALUE exec_callback(VALUE arg);
-static VALUE rescue_callback(VALUE arg);
-static HRESULT find_iid(VALUE ole, char *pitf, IID *piid, ITypeInfo **ppTypeInfo);
-static HRESULT find_coclass(ITypeInfo *pTypeInfo, TYPEATTR *pTypeAttr, ITypeInfo **pTypeInfo2, TYPEATTR **pTypeAttr2);
-static HRESULT find_default_source_from_typeinfo(ITypeInfo *pTypeInfo, TYPEATTR *pTypeAttr, ITypeInfo **ppTypeInfo);
-static HRESULT find_default_source(VALUE ole, IID *piid, ITypeInfo **ppTypeInfo);
-static long ole_search_event_at(VALUE ary, VALUE ev);
-static VALUE ole_search_event(VALUE ary, VALUE ev, BOOL  *is_default);
-static VALUE ole_search_handler_method(VALUE handler, VALUE ev, BOOL *is_default_handler);
-static void ole_delete_event(VALUE ary, VALUE ev);
-static void oleevent_free(void *ptr);
-static size_t oleevent_size(const void *ptr);
-static VALUE fev_s_allocate(VALUE klass);
-static VALUE ev_advise(int argc, VALUE *argv, VALUE self);
-static VALUE fev_initialize(int argc, VALUE *argv, VALUE self);
-static void ole_msg_loop(void);
-static VALUE fev_s_msg_loop(VALUE klass);
-static void add_event_call_back(VALUE obj, VALUE event, VALUE data);
-static VALUE ev_on_event(int argc, VALUE *argv, VALUE self, VALUE is_ary_arg);
-static VALUE fev_on_event(int argc, VALUE *argv, VALUE self);
-static VALUE fev_on_event_with_outargs(int argc, VALUE *argv, VALUE self);
-static VALUE fev_off_event(int argc, VALUE *argv, VALUE self);
-static VALUE fev_unadvise(VALUE self);
-static VALUE fev_set_handler(VALUE self, VALUE val);
-static VALUE fev_get_handler(VALUE self);
-static VALUE evs_push(VALUE ev);
-static VALUE evs_delete(long i);
-static VALUE evs_entry(long i);
-static long  evs_length(void);
-
-
-static const rb_data_type_t oleevent_datatype = {
-    "win32ole_event",
-    {NULL, oleevent_free, oleevent_size,},
-    0, 0, RUBY_TYPED_FREE_IMMEDIATELY
-};
-
-STDMETHODIMP EVENTSINK_Invoke(
-    PEVENTSINK pEventSink,
-    DISPID dispid,
-    REFIID riid,
-    LCID lcid,
-    WORD wFlags,
-    DISPPARAMS *pdispparams,
-    VARIANT *pvarResult,
-    EXCEPINFO *pexcepinfo,
-    UINT *puArgErr
-    ) {
-
-    HRESULT hr;
-    BSTR bstr;
-    unsigned int count;
-    unsigned int i;
-    ITypeInfo *pTypeInfo;
-    VARIANT *pvar;
-    VALUE ary, obj, event, args, outargv, ev, result;
-    VALUE handler = Qnil;
-    VALUE arg[3];
-    VALUE mid;
-    VALUE is_outarg = Qfalse;
-    BOOL is_default_handler = FALSE;
-    int state;
-
-    PIEVENTSINKOBJ pEV = (PIEVENTSINKOBJ)pEventSink;
-    pTypeInfo = pEV->pTypeInfo;
-    obj = evs_entry(pEV->m_event_id);
-    if (!rb_obj_is_kind_of(obj, cWIN32OLE_EVENT)) {
-        return NOERROR;
-    }
-
-    ary = rb_ivar_get(obj, id_events);
-    if (NIL_P(ary) || !RB_TYPE_P(ary, T_ARRAY)) {
-        return NOERROR;
-    }
-    hr = pTypeInfo->lpVtbl->GetNames(pTypeInfo, dispid,
-                                     &bstr, 1, &count);
-    if (FAILED(hr)) {
-        return NOERROR;
-    }
-    ev = WC2VSTR(bstr);
-    event = ole_search_event(ary, ev, &is_default_handler);
-    if (RB_TYPE_P(event, T_ARRAY)) {
-        handler = rb_ary_entry(event, 0);
-        mid = rb_intern("call");
-        is_outarg = rb_ary_entry(event, 3);
-    } else {
-        handler = rb_ivar_get(obj, rb_intern("handler"));
-        if (handler == Qnil) {
-            return NOERROR;
-        }
-        mid = ole_search_handler_method(handler, ev, &is_default_handler);
-    }
-    if (handler == Qnil || mid == Qnil) {
-        return NOERROR;
-    }
-
-    args = rb_ary_new();
-    if (is_default_handler) {
-        rb_ary_push(args, ev);
-    }
-
-    /* make argument of event handler */
-    for (i = 0; i < pdispparams->cArgs; ++i) {
-        pvar = &pdispparams->rgvarg[pdispparams->cArgs-i-1];
-        rb_ary_push(args, ole_variant2val(pvar));
-    }
-    outargv = Qnil;
-    if (is_outarg == Qtrue) {
-        outargv = rb_ary_new();
-        rb_ary_push(args, outargv);
-    }
-
-    /*
-     * if exception raised in event callback,
-     * then you receive cfp consistency error.
-     * to avoid this error we use begin rescue end.
-     * and the exception raised then error message print
-     * and exit ruby process by Win32OLE itself.
-     */
-    arg[0] = handler;
-    arg[1] = mid;
-    arg[2] = args;
-    result = rb_protect(exec_callback, (VALUE)arg, &state);
-    if (state != 0) {
-        rescue_callback(Qnil);
-    }
-    if(RB_TYPE_P(result, T_HASH)) {
-        hash2ptr_dispparams(result, pTypeInfo, dispid, pdispparams);
-        result = hash2result(result);
-    }else if (is_outarg == Qtrue && RB_TYPE_P(outargv, T_ARRAY)) {
-        ary2ptr_dispparams(outargv, pdispparams);
-    }
-
-    if (pvarResult) {
-        VariantInit(pvarResult);
-        ole_val2variant(result, pvarResult);
-    }
-
-    return NOERROR;
-}
-
-STDMETHODIMP
-EVENTSINK_QueryInterface(
-    PEVENTSINK pEV,
-    REFIID     iid,
-    LPVOID*    ppv
-    ) {
-    if (IsEqualIID(iid, &IID_IUnknown) ||
-        IsEqualIID(iid, &IID_IDispatch) ||
-        IsEqualIID(iid, &((PIEVENTSINKOBJ)pEV)->m_iid)) {
-        *ppv = pEV;
-    }
-    else {
-        *ppv = NULL;
-        return E_NOINTERFACE;
-    }
-    ((LPUNKNOWN)*ppv)->lpVtbl->AddRef((LPUNKNOWN)*ppv);
-    return NOERROR;
-}
-
-STDMETHODIMP_(ULONG)
-EVENTSINK_AddRef(
-    PEVENTSINK pEV
-    ){
-    PIEVENTSINKOBJ pEVObj = (PIEVENTSINKOBJ)pEV;
-    return ++pEVObj->m_cRef;
-}
-
-STDMETHODIMP_(ULONG) EVENTSINK_Release(
-    PEVENTSINK pEV
-    ) {
-    PIEVENTSINKOBJ pEVObj = (PIEVENTSINKOBJ)pEV;
-    --pEVObj->m_cRef;
-    if(pEVObj->m_cRef != 0)
-        return pEVObj->m_cRef;
-    EVENTSINK_Destructor(pEVObj);
-    return 0;
-}
-
-STDMETHODIMP EVENTSINK_GetTypeInfoCount(
-    PEVENTSINK pEV,
-    UINT *pct
-    ) {
-    *pct = 0;
-    return NOERROR;
-}
-
-STDMETHODIMP EVENTSINK_GetTypeInfo(
-    PEVENTSINK pEV,
-    UINT info,
-    LCID lcid,
-    ITypeInfo **pInfo
-    ) {
-    *pInfo = NULL;
-    return DISP_E_BADINDEX;
-}
-
-STDMETHODIMP EVENTSINK_GetIDsOfNames(
-    PEVENTSINK pEventSink,
-    REFIID riid,
-    OLECHAR **szNames,
-    UINT cNames,
-    LCID lcid,
-    DISPID *pDispID
-    ) {
-    ITypeInfo *pTypeInfo;
-    PIEVENTSINKOBJ pEV = (PIEVENTSINKOBJ)pEventSink;
-    pTypeInfo = pEV->pTypeInfo;
-    if (pTypeInfo) {
-        return pTypeInfo->lpVtbl->GetIDsOfNames(pTypeInfo, szNames, cNames, pDispID);
-    }
-    return DISP_E_UNKNOWNNAME;
-}
-
-PIEVENTSINKOBJ
-EVENTSINK_Constructor(void)
-{
-    PIEVENTSINKOBJ pEv;
-    pEv = ALLOC_N(IEVENTSINKOBJ, 1);
-    if(pEv == NULL) return NULL;
-    pEv->lpVtbl = &vtEventSink;
-    pEv->m_cRef = 0;
-    pEv->m_event_id = 0;
-    pEv->pTypeInfo = NULL;
-    return pEv;
-}
-
-void
-EVENTSINK_Destructor(
-    PIEVENTSINKOBJ pEVObj
-    ) {
-    if(pEVObj != NULL) {
-        OLE_RELEASE(pEVObj->pTypeInfo);
-        free(pEVObj);
-        pEVObj = NULL;
-    }
-}
-
-static void
-ole_val2ptr_variant(VALUE val, VARIANT *var)
-{
-    switch (TYPE(val)) {
-    case T_STRING:
-        if (V_VT(var) == (VT_BSTR | VT_BYREF)) {
-            *V_BSTRREF(var) = ole_vstr2wc(val);
-        }
-        break;
-    case T_FIXNUM:
-        switch(V_VT(var)) {
-        case (VT_UI1 | VT_BYREF) :
-            *V_UI1REF(var) = RB_NUM2CHR(val);
-            break;
-        case (VT_I2 | VT_BYREF) :
-            *V_I2REF(var) = (short)RB_NUM2INT(val);
-            break;
-        case (VT_I4 | VT_BYREF) :
-            *V_I4REF(var) = RB_NUM2INT(val);
-            break;
-        case (VT_R4 | VT_BYREF) :
-            *V_R4REF(var) = (float)RB_NUM2INT(val);
-            break;
-        case (VT_R8 | VT_BYREF) :
-            *V_R8REF(var) = RB_NUM2INT(val);
-            break;
-        default:
-            break;
-        }
-        break;
-    case T_FLOAT:
-        switch(V_VT(var)) {
-        case (VT_I2 | VT_BYREF) :
-            *V_I2REF(var) = (short)RB_NUM2INT(val);
-            break;
-        case (VT_I4 | VT_BYREF) :
-            *V_I4REF(var) = RB_NUM2INT(val);
-            break;
-        case (VT_R4 | VT_BYREF) :
-            *V_R4REF(var) = (float)NUM2DBL(val);
-            break;
-        case (VT_R8 | VT_BYREF) :
-            *V_R8REF(var) = NUM2DBL(val);
-            break;
-        default:
-            break;
-        }
-        break;
-    case T_BIGNUM:
-        if (V_VT(var) == (VT_R8 | VT_BYREF)) {
-            *V_R8REF(var) = rb_big2dbl(val);
-        }
-        break;
-    case T_TRUE:
-        if (V_VT(var) == (VT_BOOL | VT_BYREF)) {
-            *V_BOOLREF(var) = VARIANT_TRUE;
-        }
-        break;
-    case T_FALSE:
-        if (V_VT(var) == (VT_BOOL | VT_BYREF)) {
-            *V_BOOLREF(var) = VARIANT_FALSE;
-        }
-        break;
-    default:
-        break;
-    }
-}
-
-static void
-hash2ptr_dispparams(VALUE hash, ITypeInfo *pTypeInfo, DISPID dispid, DISPPARAMS *pdispparams)
-{
-    BSTR *bstrs;
-    HRESULT hr;
-    UINT len, i;
-    VARIANT *pvar;
-    VALUE val;
-    VALUE key;
-    len = 0;
-    bstrs = ALLOCA_N(BSTR, pdispparams->cArgs + 1);
-    hr = pTypeInfo->lpVtbl->GetNames(pTypeInfo, dispid,
-                                     bstrs, pdispparams->cArgs + 1,
-                                     &len);
-    if (FAILED(hr))
-        return;
-
-    for (i = 0; i < len - 1; i++) {
-        key = WC2VSTR(bstrs[i + 1]);
-        val = rb_hash_aref(hash, RB_UINT2NUM(i));
-        if (val == Qnil)
-            val = rb_hash_aref(hash, key);
-        if (val == Qnil)
-            val = rb_hash_aref(hash, rb_str_intern(key));
-        pvar = &pdispparams->rgvarg[pdispparams->cArgs-i-1];
-        ole_val2ptr_variant(val, pvar);
-    }
-}
-
-static VALUE
-hash2result(VALUE hash)
-{
-    VALUE ret = Qnil;
-    ret = rb_hash_aref(hash, rb_str_new2("return"));
-    if (ret == Qnil)
-        ret = rb_hash_aref(hash, rb_str_intern(rb_str_new2("return")));
-    return ret;
-}
-
-static void
-ary2ptr_dispparams(VALUE ary, DISPPARAMS *pdispparams)
-{
-    int i;
-    VALUE v;
-    VARIANT *pvar;
-    for(i = 0; i < RARRAY_LEN(ary) && (unsigned int) i < pdispparams->cArgs; i++) {
-        v = rb_ary_entry(ary, i);
-        pvar = &pdispparams->rgvarg[pdispparams->cArgs-i-1];
-        ole_val2ptr_variant(v, pvar);
-    }
-}
-
-static VALUE
-exec_callback(VALUE arg)
-{
-    VALUE *parg = (VALUE *)arg;
-    VALUE handler = parg[0];
-    VALUE mid = parg[1];
-    VALUE args = parg[2];
-    return rb_apply(handler, mid, args);
-}
-
-static VALUE
-rescue_callback(VALUE arg)
-{
-
-    VALUE error;
-    VALUE e = rb_errinfo();
-    VALUE bt = rb_funcall(e, rb_intern("backtrace"), 0);
-    VALUE msg = rb_funcall(e, rb_intern("message"), 0);
-    bt = rb_ary_entry(bt, 0);
-    error = rb_sprintf("%"PRIsVALUE": %"PRIsVALUE" (%s)\n", bt, msg, rb_obj_classname(e));
-    rb_write_error_str(error);
-    rb_backtrace();
-    ruby_finalize();
-    exit(-1);
-
-    return Qnil;
-}
-
-static HRESULT
-find_iid(VALUE ole, char *pitf, IID *piid, ITypeInfo **ppTypeInfo)
-{
-    HRESULT hr;
-    IDispatch *pDispatch;
-    ITypeInfo *pTypeInfo;
-    ITypeLib *pTypeLib;
-    TYPEATTR *pTypeAttr;
-    HREFTYPE RefType;
-    ITypeInfo *pImplTypeInfo;
-    TYPEATTR *pImplTypeAttr;
-
-    struct oledata *pole = NULL;
-    unsigned int index;
-    unsigned int count;
-    int type;
-    BSTR bstr;
-    char *pstr;
-
-    BOOL is_found = FALSE;
-    LCID    lcid = cWIN32OLE_lcid;
-
-    pole = oledata_get_struct(ole);
-
-    pDispatch = pole->pDispatch;
-
-    hr = pDispatch->lpVtbl->GetTypeInfo(pDispatch, 0, lcid, &pTypeInfo);
-    if (FAILED(hr))
-        return hr;
-
-    hr = pTypeInfo->lpVtbl->GetContainingTypeLib(pTypeInfo,
-                                                 &pTypeLib,
-                                                 &index);
-    OLE_RELEASE(pTypeInfo);
-    if (FAILED(hr))
-        return hr;
-
-    if (!pitf) {
-        hr = pTypeLib->lpVtbl->GetTypeInfoOfGuid(pTypeLib,
-                                                 piid,
-                                                 ppTypeInfo);
-        OLE_RELEASE(pTypeLib);
-        return hr;
-    }
-    count = pTypeLib->lpVtbl->GetTypeInfoCount(pTypeLib);
-    for (index = 0; index < count; index++) {
-        hr = pTypeLib->lpVtbl->GetTypeInfo(pTypeLib,
-                                           index,
-                                           &pTypeInfo);
-        if (FAILED(hr))
-            break;
-        hr = OLE_GET_TYPEATTR(pTypeInfo, &pTypeAttr);
-
-        if(FAILED(hr)) {
-            OLE_RELEASE(pTypeInfo);
-            break;
-        }
-        if(pTypeAttr->typekind == TKIND_COCLASS) {
-            for (type = 0; type < pTypeAttr->cImplTypes; type++) {
-                hr = pTypeInfo->lpVtbl->GetRefTypeOfImplType(pTypeInfo,
-                                                             type,
-                                                             &RefType);
-                if (FAILED(hr))
-                    break;
-                hr = pTypeInfo->lpVtbl->GetRefTypeInfo(pTypeInfo,
-                                                       RefType,
-                                                       &pImplTypeInfo);
-                if (FAILED(hr))
-                    break;
-
-                hr = pImplTypeInfo->lpVtbl->GetDocumentation(pImplTypeInfo,
-                                                             -1,
-                                                             &bstr,
-                                                             NULL, NULL, NULL);
-                if (FAILED(hr)) {
-                    OLE_RELEASE(pImplTypeInfo);
-                    break;
-                }
-                pstr = ole_wc2mb(bstr);
-                if (strcmp(pitf, pstr) == 0) {
-                    hr = pImplTypeInfo->lpVtbl->GetTypeAttr(pImplTypeInfo,
-                                                            &pImplTypeAttr);
-                    if (SUCCEEDED(hr)) {
-                        is_found = TRUE;
-                        *piid = pImplTypeAttr->guid;
-                        if (ppTypeInfo) {
-                            *ppTypeInfo = pImplTypeInfo;
-                            (*ppTypeInfo)->lpVtbl->AddRef((*ppTypeInfo));
-                        }
-                        pImplTypeInfo->lpVtbl->ReleaseTypeAttr(pImplTypeInfo,
-                                                               pImplTypeAttr);
-                    }
-                }
-                free(pstr);
-                OLE_RELEASE(pImplTypeInfo);
-                if (is_found || FAILED(hr))
-                    break;
-            }
-        }
-
-        OLE_RELEASE_TYPEATTR(pTypeInfo, pTypeAttr);
-        OLE_RELEASE(pTypeInfo);
-        if (is_found || FAILED(hr))
-            break;
-    }
-    OLE_RELEASE(pTypeLib);
-    if(!is_found)
-        return E_NOINTERFACE;
-    return hr;
-}
-
-static HRESULT
-find_coclass(
-    ITypeInfo *pTypeInfo,
-    TYPEATTR *pTypeAttr,
-    ITypeInfo **pCOTypeInfo,
-    TYPEATTR **pCOTypeAttr)
-{
-    HRESULT hr = E_NOINTERFACE;
-    ITypeLib *pTypeLib;
-    int count;
-    BOOL found = FALSE;
-    ITypeInfo *pTypeInfo2;
-    TYPEATTR *pTypeAttr2;
-    int flags;
-    int i,j;
-    HREFTYPE href;
-    ITypeInfo *pRefTypeInfo;
-    TYPEATTR *pRefTypeAttr;
-
-    hr = pTypeInfo->lpVtbl->GetContainingTypeLib(pTypeInfo, &pTypeLib, NULL);
-    if (FAILED(hr)) {
-        return hr;
-    }
-    count = pTypeLib->lpVtbl->GetTypeInfoCount(pTypeLib);
-    for (i = 0; i < count && !found; i++) {
-        hr = pTypeLib->lpVtbl->GetTypeInfo(pTypeLib, i, &pTypeInfo2);
-        if (FAILED(hr))
-            continue;
-        hr = OLE_GET_TYPEATTR(pTypeInfo2, &pTypeAttr2);
-        if (FAILED(hr)) {
-            OLE_RELEASE(pTypeInfo2);
-            continue;
-        }
-        if (pTypeAttr2->typekind != TKIND_COCLASS) {
-            OLE_RELEASE_TYPEATTR(pTypeInfo2, pTypeAttr2);
-            OLE_RELEASE(pTypeInfo2);
-            continue;
-        }
-        for (j = 0; j < pTypeAttr2->cImplTypes && !found; j++) {
-            hr = pTypeInfo2->lpVtbl->GetImplTypeFlags(pTypeInfo2, j, &flags);
-            if (FAILED(hr))
-                continue;
-            if (!(flags & IMPLTYPEFLAG_FDEFAULT))
-                continue;
-            hr = pTypeInfo2->lpVtbl->GetRefTypeOfImplType(pTypeInfo2, j, &href);
-            if (FAILED(hr))
-                continue;
-            hr = pTypeInfo2->lpVtbl->GetRefTypeInfo(pTypeInfo2, href, &pRefTypeInfo);
-            if (FAILED(hr))
-                continue;
-            hr = OLE_GET_TYPEATTR(pRefTypeInfo, &pRefTypeAttr);
-            if (FAILED(hr))  {
-                OLE_RELEASE(pRefTypeInfo);
-                continue;
-            }
-            if (IsEqualGUID(&(pTypeAttr->guid), &(pRefTypeAttr->guid))) {
-                found = TRUE;
-            }
-        }
-        if (!found) {
-            OLE_RELEASE_TYPEATTR(pTypeInfo2, pTypeAttr2);
-            OLE_RELEASE(pTypeInfo2);
-        }
-    }
-    OLE_RELEASE(pTypeLib);
-    if (found) {
-        *pCOTypeInfo = pTypeInfo2;
-        *pCOTypeAttr = pTypeAttr2;
-        hr = S_OK;
-    } else {
-        hr = E_NOINTERFACE;
-    }
-    return hr;
-}
-
-static HRESULT
-find_default_source_from_typeinfo(
-    ITypeInfo *pTypeInfo,
-    TYPEATTR *pTypeAttr,
-    ITypeInfo **ppTypeInfo)
-{
-    int i = 0;
-    HRESULT hr = E_NOINTERFACE;
-    int flags;
-    HREFTYPE hRefType;
-    /* Enumerate all implemented types of the COCLASS */
-    for (i = 0; i < pTypeAttr->cImplTypes; i++) {
-        hr = pTypeInfo->lpVtbl->GetImplTypeFlags(pTypeInfo, i, &flags);
-        if (FAILED(hr))
-            continue;
-
-        /*
-           looking for the [default] [source]
-           we just hope that it is a dispinterface :-)
-        */
-        if ((flags & IMPLTYPEFLAG_FDEFAULT) &&
-            (flags & IMPLTYPEFLAG_FSOURCE)) {
-
-            hr = pTypeInfo->lpVtbl->GetRefTypeOfImplType(pTypeInfo,
-                                                         i, &hRefType);
-            if (FAILED(hr))
-                continue;
-            hr = pTypeInfo->lpVtbl->GetRefTypeInfo(pTypeInfo,
-                                                   hRefType, ppTypeInfo);
-            if (SUCCEEDED(hr))
-                break;
-        }
-    }
-    return hr;
-}
-
-static HRESULT
-find_default_source(VALUE ole, IID *piid, ITypeInfo **ppTypeInfo)
-{
-    HRESULT hr;
-    IProvideClassInfo2 *pProvideClassInfo2;
-    IProvideClassInfo *pProvideClassInfo;
-    void *p;
-
-    IDispatch *pDispatch;
-    ITypeInfo *pTypeInfo;
-    ITypeInfo *pTypeInfo2 = NULL;
-    TYPEATTR *pTypeAttr;
-    TYPEATTR *pTypeAttr2 = NULL;
-
-    struct oledata *pole = NULL;
-
-    pole = oledata_get_struct(ole);
-    pDispatch = pole->pDispatch;
-    hr = pDispatch->lpVtbl->QueryInterface(pDispatch,
-                                           &IID_IProvideClassInfo2,
-                                           &p);
-    if (SUCCEEDED(hr)) {
-        pProvideClassInfo2 = p;
-        hr = pProvideClassInfo2->lpVtbl->GetGUID(pProvideClassInfo2,
-                                                 GUIDKIND_DEFAULT_SOURCE_DISP_IID,
-                                                 piid);
-        OLE_RELEASE(pProvideClassInfo2);
-        if (SUCCEEDED(hr)) {
-            hr = find_iid(ole, NULL, piid, ppTypeInfo);
-        }
-    }
-    if (SUCCEEDED(hr)) {
-        return hr;
-    }
-    hr = pDispatch->lpVtbl->QueryInterface(pDispatch,
-            &IID_IProvideClassInfo,
-            &p);
-    if (SUCCEEDED(hr)) {
-        pProvideClassInfo = p;
-        hr = pProvideClassInfo->lpVtbl->GetClassInfo(pProvideClassInfo,
-                                                     &pTypeInfo);
-        OLE_RELEASE(pProvideClassInfo);
-    }
-    if (FAILED(hr)) {
-        hr = pDispatch->lpVtbl->GetTypeInfo(pDispatch, 0, cWIN32OLE_lcid, &pTypeInfo );
-    }
-    if (FAILED(hr))
-        return hr;
-    hr = OLE_GET_TYPEATTR(pTypeInfo, &pTypeAttr);
-    if (FAILED(hr)) {
-        OLE_RELEASE(pTypeInfo);
-        return hr;
-    }
-
-    *ppTypeInfo = 0;
-    hr = find_default_source_from_typeinfo(pTypeInfo, pTypeAttr, ppTypeInfo);
-    if (!*ppTypeInfo) {
-        hr = find_coclass(pTypeInfo, pTypeAttr, &pTypeInfo2, &pTypeAttr2);
-        if (SUCCEEDED(hr)) {
-            hr = find_default_source_from_typeinfo(pTypeInfo2, pTypeAttr2, ppTypeInfo);
-            OLE_RELEASE_TYPEATTR(pTypeInfo2, pTypeAttr2);
-            OLE_RELEASE(pTypeInfo2);
-        }
-    }
-    OLE_RELEASE_TYPEATTR(pTypeInfo, pTypeAttr);
-    OLE_RELEASE(pTypeInfo);
-    /* Now that would be a bad surprise, if we didn't find it, wouldn't it? */
-    if (!*ppTypeInfo) {
-        if (SUCCEEDED(hr))
-            hr = E_UNEXPECTED;
-        return hr;
-    }
-
-    /* Determine IID of default source interface */
-    hr = (*ppTypeInfo)->lpVtbl->GetTypeAttr(*ppTypeInfo, &pTypeAttr);
-    if (SUCCEEDED(hr)) {
-        *piid = pTypeAttr->guid;
-        (*ppTypeInfo)->lpVtbl->ReleaseTypeAttr(*ppTypeInfo, pTypeAttr);
-    }
-    else
-        OLE_RELEASE(*ppTypeInfo);
-
-    return hr;
-}
-
-static long
-ole_search_event_at(VALUE ary, VALUE ev)
-{
-    VALUE event;
-    VALUE event_name;
-    long i, len;
-    long ret = -1;
-    len = RARRAY_LEN(ary);
-    for(i = 0; i < len; i++) {
-        event = rb_ary_entry(ary, i);
-        event_name = rb_ary_entry(event, 1);
-        if(NIL_P(event_name) && NIL_P(ev)) {
-            ret = i;
-            break;
-        }
-        else if (RB_TYPE_P(ev, T_STRING) &&
-                 RB_TYPE_P(event_name, T_STRING) &&
-                 rb_str_cmp(ev, event_name) == 0) {
-            ret = i;
-            break;
-        }
-    }
-    return ret;
-}
-
-static VALUE
-ole_search_event(VALUE ary, VALUE ev, BOOL  *is_default)
-{
-    VALUE event;
-    VALUE def_event;
-    VALUE event_name;
-    int i, len;
-    *is_default = FALSE;
-    def_event = Qnil;
-    len = RARRAY_LEN(ary);
-    for(i = 0; i < len; i++) {
-        event = rb_ary_entry(ary, i);
-        event_name = rb_ary_entry(event, 1);
-        if(NIL_P(event_name)) {
-            *is_default = TRUE;
-            def_event = event;
-        }
-        else if (rb_str_cmp(ev, event_name) == 0) {
-            *is_default = FALSE;
-            return event;
-        }
-    }
-    return def_event;
-}
-
-static VALUE
-ole_search_handler_method(VALUE handler, VALUE ev, BOOL *is_default_handler)
-{
-    VALUE mid;
-
-    *is_default_handler = FALSE;
-    mid = rb_to_id(rb_sprintf("on%"PRIsVALUE, ev));
-    if (rb_respond_to(handler, mid)) {
-        return mid;
-    }
-    mid = rb_intern("method_missing");
-    if (rb_respond_to(handler, mid)) {
-        *is_default_handler = TRUE;
-        return mid;
-    }
-    return Qnil;
-}
-
-static void
-ole_delete_event(VALUE ary, VALUE ev)
-{
-    long at = -1;
-    at = ole_search_event_at(ary, ev);
-    if (at >= 0) {
-        rb_ary_delete_at(ary, at);
-    }
-}
-
-
-static void
-oleevent_free(void *ptr)
-{
-    struct oleeventdata *poleev = ptr;
-    if (poleev->pConnectionPoint) {
-        poleev->pConnectionPoint->lpVtbl->Unadvise(poleev->pConnectionPoint, poleev->dwCookie);
-        OLE_RELEASE(poleev->pConnectionPoint);
-        poleev->pConnectionPoint = NULL;
-    }
-    OLE_RELEASE(poleev->pDispatch);
-    free(poleev);
-}
-
-static size_t
-oleevent_size(const void *ptr)
-{
-    return ptr ? sizeof(struct oleeventdata) : 0;
-}
-
-static VALUE
-fev_s_allocate(VALUE klass)
-{
-    VALUE obj;
-    struct oleeventdata *poleev;
-    obj = TypedData_Make_Struct(klass, struct oleeventdata, &oleevent_datatype, poleev);
-    poleev->dwCookie = 0;
-    poleev->pConnectionPoint = NULL;
-    poleev->event_id = 0;
-    poleev->pDispatch = NULL;
-    return obj;
-}
-
-static VALUE
-ev_advise(int argc, VALUE *argv, VALUE self)
-{
-
-    VALUE ole, itf;
-    struct oledata *pole = NULL;
-    char *pitf;
-    HRESULT hr;
-    IID iid;
-    ITypeInfo *pTypeInfo = 0;
-    IDispatch *pDispatch;
-    IConnectionPointContainer *pContainer;
-    IConnectionPoint *pConnectionPoint;
-    IEVENTSINKOBJ *pIEV;
-    DWORD dwCookie;
-    struct oleeventdata *poleev;
-    void *p;
-
-    rb_scan_args(argc, argv, "11", &ole, &itf);
-
-    if (!rb_obj_is_kind_of(ole, cWIN32OLE)) {
-        rb_raise(rb_eTypeError, "1st parameter must be WIN32OLE object");
-    }
-
-    if(!RB_TYPE_P(itf, T_NIL)) {
-        pitf = StringValuePtr(itf);
-        hr = find_iid(ole, pitf, &iid, &pTypeInfo);
-    }
-    else {
-        hr = find_default_source(ole, &iid, &pTypeInfo);
-    }
-    if (FAILED(hr)) {
-        ole_raise(hr, rb_eRuntimeError, "interface not found");
-    }
-
-    pole = oledata_get_struct(ole);
-    pDispatch = pole->pDispatch;
-    hr = pDispatch->lpVtbl->QueryInterface(pDispatch,
-                                           &IID_IConnectionPointContainer,
-                                           &p);
-    if (FAILED(hr)) {
-        OLE_RELEASE(pTypeInfo);
-        ole_raise(hr, eWIN32OLEQueryInterfaceError,
-                  "failed to query IConnectionPointContainer");
-    }
-    pContainer = p;
-
-    hr = pContainer->lpVtbl->FindConnectionPoint(pContainer,
-                                                 &iid,
-                                                 &pConnectionPoint);
-    OLE_RELEASE(pContainer);
-    if (FAILED(hr)) {
-        OLE_RELEASE(pTypeInfo);
-        ole_raise(hr, eWIN32OLEQueryInterfaceError, "failed to query IConnectionPoint");
-    }
-    pIEV = EVENTSINK_Constructor();
-    pIEV->m_iid = iid;
-    hr = pConnectionPoint->lpVtbl->Advise(pConnectionPoint,
-                                          (IUnknown*)pIEV,
-                                          &dwCookie);
-    if (FAILED(hr)) {
-        ole_raise(hr, eWIN32OLEQueryInterfaceError, "Advise Error");
-    }
-
-    TypedData_Get_Struct(self, struct oleeventdata, &oleevent_datatype, poleev);
-    pIEV->m_event_id = evs_length();
-    pIEV->pTypeInfo = pTypeInfo;
-    poleev->dwCookie = dwCookie;
-    poleev->pConnectionPoint = pConnectionPoint;
-    poleev->event_id = pIEV->m_event_id;
-    poleev->pDispatch = pDispatch;
-    OLE_ADDREF(pDispatch);
-
-    return self;
-}
-
-/*
- *  call-seq:
- *     WIN32OLE_EVENT.new(ole, event) #=> WIN32OLE_EVENT object.
- *
- *  Returns OLE event object.
- *  The first argument specifies WIN32OLE object.
- *  The second argument specifies OLE event name.
- *     ie = WIN32OLE.new('InternetExplorer.Application')
- *     ev = WIN32OLE_EVENT.new(ie, 'DWebBrowserEvents')
- */
-static VALUE
-fev_initialize(int argc, VALUE *argv, VALUE self)
-{
-    ev_advise(argc, argv, self);
-    evs_push(self);
-    rb_ivar_set(self, id_events, rb_ary_new());
-    fev_set_handler(self, Qnil);
-    return self;
-}
-
-static void
-ole_msg_loop(void)
-{
-    MSG msg;
-    while(PeekMessage(&msg,NULL,0,0,PM_REMOVE)) {
-        TranslateMessage(&msg);
-        DispatchMessage(&msg);
-    }
-}
-
-/*
- *  call-seq:
- *     WIN32OLE_EVENT.message_loop
- *
- *  Translates and dispatches Windows message.
- */
-static VALUE
-fev_s_msg_loop(VALUE klass)
-{
-    ole_msg_loop();
-    return Qnil;
-}
-
-static void
-add_event_call_back(VALUE obj, VALUE event, VALUE data)
-{
-    VALUE events = rb_ivar_get(obj, id_events);
-    if (NIL_P(events) || !RB_TYPE_P(events, T_ARRAY)) {
-        events = rb_ary_new();
-        rb_ivar_set(obj, id_events, events);
-    }
-    ole_delete_event(events, event);
-    rb_ary_push(events, data);
-}
-
-static VALUE
-ev_on_event(int argc, VALUE *argv, VALUE self, VALUE is_ary_arg)
-{
-    struct oleeventdata *poleev;
-    VALUE event, args, data;
-    TypedData_Get_Struct(self, struct oleeventdata, &oleevent_datatype, poleev);
-    if (poleev->pConnectionPoint == NULL) {
-        rb_raise(eWIN32OLERuntimeError, "IConnectionPoint not found. You must call advise at first.");
-    }
-    rb_scan_args(argc, argv, "01*", &event, &args);
-    if(!NIL_P(event)) {
-        if(!RB_TYPE_P(event, T_STRING) && !RB_TYPE_P(event, T_SYMBOL)) {
-            rb_raise(rb_eTypeError, "wrong argument type (expected String or Symbol)");
-        }
-        if (RB_TYPE_P(event, T_SYMBOL)) {
-            event = rb_sym2str(event);
-        }
-    }
-    data = rb_ary_new3(4, rb_block_proc(), event, args, is_ary_arg);
-    add_event_call_back(self, event, data);
-    return Qnil;
-}
-
-/*
- *  call-seq:
- *     WIN32OLE_EVENT#on_event([event]){...}
- *
- *  Defines the callback event.
- *  If argument is omitted, this method defines the callback of all events.
- *  If you want to modify reference argument in callback, return hash in
- *  callback. If you want to return value to OLE server as result of callback
- *  use `return' or :return.
- *
- *    ie = WIN32OLE.new('InternetExplorer.Application')
- *    ev = WIN32OLE_EVENT.new(ie)
- *    ev.on_event("NavigateComplete") {|url| puts url}
- *    ev.on_event() {|ev, *args| puts "#{ev} fired"}
- *
- *    ev.on_event("BeforeNavigate2") {|*args|
- *      ...
- *      # set true to BeforeNavigate reference argument `Cancel'.
- *      # Cancel is 7-th argument of BeforeNavigate,
- *      # so you can use 6 as key of hash instead of 'Cancel'.
- *      # The argument is counted from 0.
- *      # The hash key of 0 means first argument.)
- *      {:Cancel => true}  # or {'Cancel' => true} or {6 => true}
- *    }
- *
- *    ev.on_event(...) {|*args|
- *      {:return => 1, :xxx => yyy}
- *    }
- */
-static VALUE
-fev_on_event(int argc, VALUE *argv, VALUE self)
-{
-    return ev_on_event(argc, argv, self, Qfalse);
-}
-
-/*
- *  call-seq:
- *     WIN32OLE_EVENT#on_event_with_outargs([event]){...}
- *
- *  Defines the callback of event.
- *  If you want modify argument in callback,
- *  you could use this method instead of WIN32OLE_EVENT#on_event.
- *
- *    ie = WIN32OLE.new('InternetExplorer.Application')
- *    ev = WIN32OLE_EVENT.new(ie)
- *    ev.on_event_with_outargs('BeforeNavigate2') {|*args|
- *      args.last[6] = true
- *    }
- */
-static VALUE
-fev_on_event_with_outargs(int argc, VALUE *argv, VALUE self)
-{
-    return ev_on_event(argc, argv, self, Qtrue);
-}
-
-/*
- *  call-seq:
- *     WIN32OLE_EVENT#off_event([event])
- *
- *  removes the callback of event.
- *
- *    ie = WIN32OLE.new('InternetExplorer.Application')
- *    ev = WIN32OLE_EVENT.new(ie)
- *    ev.on_event('BeforeNavigate2') {|*args|
- *      args.last[6] = true
- *    }
- *      ...
- *    ev.off_event('BeforeNavigate2')
- *      ...
- */
-static VALUE
-fev_off_event(int argc, VALUE *argv, VALUE self)
-{
-    VALUE event = Qnil;
-    VALUE events;
-
-    rb_scan_args(argc, argv, "01", &event);
-    if(!NIL_P(event)) {
-        if(!RB_TYPE_P(event, T_STRING) && !RB_TYPE_P(event, T_SYMBOL)) {
-            rb_raise(rb_eTypeError, "wrong argument type (expected String or Symbol)");
-        }
-        if (RB_TYPE_P(event, T_SYMBOL)) {
-            event = rb_sym2str(event);
-        }
-    }
-    events = rb_ivar_get(self, id_events);
-    if (NIL_P(events)) {
-        return Qnil;
-    }
-    ole_delete_event(events, event);
-    return Qnil;
-}
-
-/*
- *  call-seq:
- *     WIN32OLE_EVENT#unadvise -> nil
- *
- *  disconnects OLE server. If this method called, then the WIN32OLE_EVENT object
- *  does not receive the OLE server event any more.
- *  This method is trial implementation.
- *
- *      ie = WIN32OLE.new('InternetExplorer.Application')
- *      ev = WIN32OLE_EVENT.new(ie)
- *      ev.on_event() {...}
- *         ...
- *      ev.unadvise
- *
- */
-static VALUE
-fev_unadvise(VALUE self)
-{
-    struct oleeventdata *poleev;
-    TypedData_Get_Struct(self, struct oleeventdata, &oleevent_datatype, poleev);
-    if (poleev->pConnectionPoint) {
-        ole_msg_loop();
-        evs_delete(poleev->event_id);
-        poleev->pConnectionPoint->lpVtbl->Unadvise(poleev->pConnectionPoint, poleev->dwCookie);
-        OLE_RELEASE(poleev->pConnectionPoint);
-        poleev->pConnectionPoint = NULL;
-    }
-    OLE_FREE(poleev->pDispatch);
-    return Qnil;
-}
-
-static VALUE
-evs_push(VALUE ev)
-{
-    return rb_ary_push(ary_ole_event, ev);
-}
-
-static VALUE
-evs_delete(long i)
-{
-    rb_ary_store(ary_ole_event, i, Qnil);
-    return Qnil;
-}
-
-static VALUE
-evs_entry(long i)
-{
-    return rb_ary_entry(ary_ole_event, i);
-}
-
-static long
-evs_length(void)
-{
-    return RARRAY_LEN(ary_ole_event);
-}
-
-/*
- *  call-seq:
- *     WIN32OLE_EVENT#handler=
- *
- *  sets event handler object. If handler object has onXXX
- *  method according to XXX event, then onXXX method is called
- *  when XXX event occurs.
- *
- *  If handler object has method_missing and there is no
- *  method according to the event, then method_missing
- *  called and 1-st argument is event name.
- *
- *  If handler object has onXXX method and there is block
- *  defined by WIN32OLE_EVENT#on_event('XXX'){},
- *  then block is executed but handler object method is not called
- *  when XXX event occurs.
- *
- *      class Handler
- *        def onStatusTextChange(text)
- *          puts "StatusTextChanged"
- *        end
- *        def onPropertyChange(prop)
- *          puts "PropertyChanged"
- *        end
- *        def method_missing(ev, *arg)
- *          puts "other event #{ev}"
- *        end
- *      end
- *
- *      handler = Handler.new
- *      ie = WIN32OLE.new('InternetExplorer.Application')
- *      ev = WIN32OLE_EVENT.new(ie)
- *      ev.on_event("StatusTextChange") {|*args|
- *        puts "this block executed."
- *        puts "handler.onStatusTextChange method is not called."
- *      }
- *      ev.handler = handler
- *
- */
-static VALUE
-fev_set_handler(VALUE self, VALUE val)
-{
-    return rb_ivar_set(self, rb_intern("handler"), val);
-}
-
-/*
- *  call-seq:
- *     WIN32OLE_EVENT#handler
- *
- *  returns handler object.
- *
- */
-static VALUE
-fev_get_handler(VALUE self)
-{
-    return rb_ivar_get(self, rb_intern("handler"));
-}
-
-void
-Init_win32ole_event(void)
-{
-#undef rb_intern
-    ary_ole_event = rb_ary_new();
-    rb_gc_register_mark_object(ary_ole_event);
-    id_events = rb_intern("events");
-    cWIN32OLE_EVENT = rb_define_class_under(cWIN32OLE, "Event", rb_cObject);
-    rb_define_const(rb_cObject, "WIN32OLE_EVENT", cWIN32OLE_EVENT);
-    rb_define_singleton_method(cWIN32OLE_EVENT, "message_loop", fev_s_msg_loop, 0);
-    rb_define_alloc_func(cWIN32OLE_EVENT, fev_s_allocate);
-    rb_define_method(cWIN32OLE_EVENT, "initialize", fev_initialize, -1);
-    rb_define_method(cWIN32OLE_EVENT, "on_event", fev_on_event, -1);
-    rb_define_method(cWIN32OLE_EVENT, "on_event_with_outargs", fev_on_event_with_outargs, -1);
-    rb_define_method(cWIN32OLE_EVENT, "off_event", fev_off_event, -1);
-    rb_define_method(cWIN32OLE_EVENT, "unadvise", fev_unadvise, 0);
-    rb_define_method(cWIN32OLE_EVENT, "handler=", fev_set_handler, 1);
-    rb_define_method(cWIN32OLE_EVENT, "handler", fev_get_handler, 0);
-}
diff --git a/ext/win32ole/win32ole_event.h b/ext/win32ole/win32ole_event.h
deleted file mode 100644
index f1a5aa234de1e6..00000000000000
--- a/ext/win32ole/win32ole_event.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef WIN32OLE_EVENT_H
-#define WIN32OLE_EVENT_H 1
-
-void Init_win32ole_event(void);
-
-#endif
diff --git a/ext/win32ole/win32ole_method.c b/ext/win32ole/win32ole_method.c
deleted file mode 100644
index 646fdaf60c1e46..00000000000000
--- a/ext/win32ole/win32ole_method.c
+++ /dev/null
@@ -1,953 +0,0 @@
-#include "win32ole.h"
-
-static void olemethod_free(void *ptr);
-static size_t olemethod_size(const void *ptr);
-static VALUE ole_method_sub(VALUE self, ITypeInfo *pOwnerTypeInfo, ITypeInfo *pTypeInfo, VALUE name);
-static VALUE olemethod_from_typeinfo(VALUE self, ITypeInfo *pTypeInfo, VALUE name);
-static VALUE ole_methods_sub(ITypeInfo *pOwnerTypeInfo, ITypeInfo *pTypeInfo, VALUE methods, int mask);
-static VALUE olemethod_set_member(VALUE self, ITypeInfo *pTypeInfo, ITypeInfo *pOwnerTypeInfo, int index, VALUE name);
-static VALUE folemethod_initialize(VALUE self, VALUE oletype, VALUE method);
-static VALUE folemethod_name(VALUE self);
-static VALUE ole_method_return_type(ITypeInfo *pTypeInfo, UINT method_index);
-static VALUE folemethod_return_type(VALUE self);
-static VALUE ole_method_return_vtype(ITypeInfo *pTypeInfo, UINT method_index);
-static VALUE folemethod_return_vtype(VALUE self);
-static VALUE ole_method_return_type_detail(ITypeInfo *pTypeInfo, UINT method_index);
-static VALUE folemethod_return_type_detail(VALUE self);
-static VALUE ole_method_invkind(ITypeInfo *pTypeInfo, UINT method_index);
-static VALUE ole_method_invoke_kind(ITypeInfo *pTypeInfo, UINT method_index);
-static VALUE folemethod_invkind(VALUE self);
-static VALUE folemethod_invoke_kind(VALUE self);
-static VALUE ole_method_visible(ITypeInfo *pTypeInfo, UINT method_index);
-static VALUE folemethod_visible(VALUE self);
-static VALUE ole_method_event(ITypeInfo *pTypeInfo, UINT method_index, VALUE method_name);
-static VALUE folemethod_event(VALUE self);
-static VALUE folemethod_event_interface(VALUE self);
-static HRESULT ole_method_docinfo_from_type(ITypeInfo *pTypeInfo, UINT method_index, BSTR *name, BSTR *helpstr, DWORD *helpcontext, BSTR *helpfile);
-static VALUE ole_method_helpstring(ITypeInfo *pTypeInfo, UINT method_index);
-static VALUE folemethod_helpstring(VALUE self);
-static VALUE ole_method_helpfile(ITypeInfo *pTypeInfo, UINT method_index);
-static VALUE folemethod_helpfile(VALUE self);
-static VALUE ole_method_helpcontext(ITypeInfo *pTypeInfo, UINT method_index);
-static VALUE folemethod_helpcontext(VALUE self);
-static VALUE ole_method_dispid(ITypeInfo *pTypeInfo, UINT method_index);
-static VALUE folemethod_dispid(VALUE self);
-static VALUE ole_method_offset_vtbl(ITypeInfo *pTypeInfo, UINT method_index);
-static VALUE folemethod_offset_vtbl(VALUE self);
-static VALUE ole_method_size_params(ITypeInfo *pTypeInfo, UINT method_index);
-static VALUE folemethod_size_params(VALUE self);
-static VALUE ole_method_size_opt_params(ITypeInfo *pTypeInfo, UINT method_index);
-static VALUE folemethod_size_opt_params(VALUE self);
-static VALUE ole_method_params(ITypeInfo *pTypeInfo, UINT method_index);
-static VALUE folemethod_params(VALUE self);
-static VALUE folemethod_inspect(VALUE self);
-
-static const rb_data_type_t olemethod_datatype = {
-    "win32ole_method",
-    {NULL, olemethod_free, olemethod_size,},
-    0, 0, RUBY_TYPED_FREE_IMMEDIATELY
-};
-
-static void
-olemethod_free(void *ptr)
-{
-    struct olemethoddata *polemethod = ptr;
-    OLE_FREE(polemethod->pTypeInfo);
-    OLE_FREE(polemethod->pOwnerTypeInfo);
-    free(polemethod);
-}
-
-static size_t
-olemethod_size(const void *ptr)
-{
-    return ptr ? sizeof(struct olemethoddata) : 0;
-}
-
-struct olemethoddata *
-olemethod_data_get_struct(VALUE obj)
-{
-    struct olemethoddata *pmethod;
-    TypedData_Get_Struct(obj, struct olemethoddata, &olemethod_datatype, pmethod);
-    return pmethod;
-}
-
-static VALUE
-ole_method_sub(VALUE self, ITypeInfo *pOwnerTypeInfo, ITypeInfo *pTypeInfo, VALUE name)
-{
-    HRESULT hr;
-    TYPEATTR *pTypeAttr;
-    BSTR bstr;
-    FUNCDESC *pFuncDesc;
-    WORD i;
-    VALUE fname;
-    VALUE method = Qnil;
-    hr = OLE_GET_TYPEATTR(pTypeInfo, &pTypeAttr);
-    if (FAILED(hr)) {
-        ole_raise(hr, eWIN32OLEQueryInterfaceError, "failed to GetTypeAttr");
-    }
-    for(i = 0; i < pTypeAttr->cFuncs && method == Qnil; i++) {
-        hr = pTypeInfo->lpVtbl->GetFuncDesc(pTypeInfo, i, &pFuncDesc);
-        if (FAILED(hr))
-             continue;
-
-        hr = pTypeInfo->lpVtbl->GetDocumentation(pTypeInfo, pFuncDesc->memid,
-                                                 &bstr, NULL, NULL, NULL);
-        if (FAILED(hr)) {
-            pTypeInfo->lpVtbl->ReleaseFuncDesc(pTypeInfo, pFuncDesc);
-            continue;
-        }
-        fname = WC2VSTR(bstr);
-        if (strcasecmp(StringValuePtr(name), StringValuePtr(fname)) == 0) {
-            olemethod_set_member(self, pTypeInfo, pOwnerTypeInfo, i, fname);
-            method = self;
-        }
-        pTypeInfo->lpVtbl->ReleaseFuncDesc(pTypeInfo, pFuncDesc);
-        pFuncDesc=NULL;
-    }
-    OLE_RELEASE_TYPEATTR(pTypeInfo, pTypeAttr);
-    return method;
-}
-
-VALUE
-ole_methods_from_typeinfo(ITypeInfo *pTypeInfo, int mask)
-{
-    HRESULT hr;
-    TYPEATTR *pTypeAttr;
-    WORD i;
-    HREFTYPE href;
-    ITypeInfo *pRefTypeInfo;
-    VALUE methods = rb_ary_new();
-    hr = OLE_GET_TYPEATTR(pTypeInfo, &pTypeAttr);
-    if (FAILED(hr)) {
-        ole_raise(hr, eWIN32OLEQueryInterfaceError, "failed to GetTypeAttr");
-    }
-
-    ole_methods_sub(0, pTypeInfo, methods, mask);
-    for(i=0; i < pTypeAttr->cImplTypes; i++){
-       hr = pTypeInfo->lpVtbl->GetRefTypeOfImplType(pTypeInfo, i, &href);
-       if(FAILED(hr))
-           continue;
-       hr = pTypeInfo->lpVtbl->GetRefTypeInfo(pTypeInfo, href, &pRefTypeInfo);
-       if (FAILED(hr))
-           continue;
-       ole_methods_sub(pTypeInfo, pRefTypeInfo, methods, mask);
-       OLE_RELEASE(pRefTypeInfo);
-    }
-    OLE_RELEASE_TYPEATTR(pTypeInfo, pTypeAttr);
-    return methods;
-}
-
-static VALUE
-olemethod_from_typeinfo(VALUE self, ITypeInfo *pTypeInfo, VALUE name)
-{
-    HRESULT hr;
-    TYPEATTR *pTypeAttr;
-    WORD i;
-    HREFTYPE href;
-    ITypeInfo *pRefTypeInfo;
-    VALUE method = Qnil;
-    hr = OLE_GET_TYPEATTR(pTypeInfo, &pTypeAttr);
-    if (FAILED(hr)) {
-        ole_raise(hr, eWIN32OLEQueryInterfaceError, "failed to GetTypeAttr");
-    }
-    method = ole_method_sub(self, 0, pTypeInfo, name);
-    if (method != Qnil) {
-       return method;
-    }
-    for(i=0; i < pTypeAttr->cImplTypes && method == Qnil; i++){
-       hr = pTypeInfo->lpVtbl->GetRefTypeOfImplType(pTypeInfo, i, &href);
-       if(FAILED(hr))
-           continue;
-       hr = pTypeInfo->lpVtbl->GetRefTypeInfo(pTypeInfo, href, &pRefTypeInfo);
-       if (FAILED(hr))
-           continue;
-       method = ole_method_sub(self, pTypeInfo, pRefTypeInfo, name);
-       OLE_RELEASE(pRefTypeInfo);
-    }
-    OLE_RELEASE_TYPEATTR(pTypeInfo, pTypeAttr);
-    return method;
-}
-
-static VALUE
-ole_methods_sub(ITypeInfo *pOwnerTypeInfo, ITypeInfo *pTypeInfo, VALUE methods, int mask)
-{
-    HRESULT hr;
-    TYPEATTR *pTypeAttr;
-    BSTR bstr;
-    FUNCDESC *pFuncDesc;
-    VALUE method;
-    WORD i;
-    hr = OLE_GET_TYPEATTR(pTypeInfo, &pTypeAttr);
-    if (FAILED(hr)) {
-        ole_raise(hr, eWIN32OLEQueryInterfaceError, "failed to GetTypeAttr");
-    }
-    for(i = 0; i < pTypeAttr->cFuncs; i++) {
-        hr = pTypeInfo->lpVtbl->GetFuncDesc(pTypeInfo, i, &pFuncDesc);
-        if (FAILED(hr))
-             continue;
-
-        hr = pTypeInfo->lpVtbl->GetDocumentation(pTypeInfo, pFuncDesc->memid,
-                                                 &bstr, NULL, NULL, NULL);
-        if (FAILED(hr)) {
-            pTypeInfo->lpVtbl->ReleaseFuncDesc(pTypeInfo, pFuncDesc);
-            continue;
-        }
-        if(pFuncDesc->invkind & mask) {
-            method = folemethod_s_allocate(cWIN32OLE_METHOD);
-            olemethod_set_member(method, pTypeInfo, pOwnerTypeInfo,
-                                 i, WC2VSTR(bstr));
-            rb_ary_push(methods, method);
-        }
-        pTypeInfo->lpVtbl->ReleaseFuncDesc(pTypeInfo, pFuncDesc);
-        pFuncDesc=NULL;
-    }
-    OLE_RELEASE_TYPEATTR(pTypeInfo, pTypeAttr);
-
-    return methods;
-}
-
-VALUE
-create_win32ole_method(ITypeInfo *pTypeInfo, VALUE name)
-{
-
-    VALUE method = folemethod_s_allocate(cWIN32OLE_METHOD);
-    VALUE obj = olemethod_from_typeinfo(method, pTypeInfo, name);
-    return obj;
-}
-
-/*
- * Document-class: WIN32OLE_METHOD
- *
- *   <code>WIN32OLE_METHOD</code> objects represent OLE method information.
- */
-
-static VALUE
-olemethod_set_member(VALUE self, ITypeInfo *pTypeInfo, ITypeInfo *pOwnerTypeInfo, int index, VALUE name)
-{
-    struct olemethoddata *pmethod;
-    TypedData_Get_Struct(self, struct olemethoddata, &olemethod_datatype, pmethod);
-    pmethod->pTypeInfo = pTypeInfo;
-    OLE_ADDREF(pTypeInfo);
-    pmethod->pOwnerTypeInfo = pOwnerTypeInfo;
-    OLE_ADDREF(pOwnerTypeInfo);
-    pmethod->index = index;
-    rb_ivar_set(self, rb_intern("name"), name);
-    return self;
-}
-
-VALUE
-folemethod_s_allocate(VALUE klass)
-{
-    struct olemethoddata *pmethod;
-    VALUE obj;
-    obj = TypedData_Make_Struct(klass,
-                                struct olemethoddata,
-                                &olemethod_datatype, pmethod);
-    pmethod->pTypeInfo = NULL;
-    pmethod->pOwnerTypeInfo = NULL;
-    pmethod->index = 0;
-    return obj;
-}
-
-/*
- *  call-seq:
- *     WIN32OLE_METHOD.new(ole_type,  method) -> WIN32OLE_METHOD object
- *
- *  Returns a new WIN32OLE_METHOD object which represents the information
- *  about OLE method.
- *  The first argument <i>ole_type</i> specifies WIN32OLE_TYPE object.
- *  The second argument <i>method</i> specifies OLE method name defined OLE class
- *  which represents WIN32OLE_TYPE object.
- *
- *     tobj = WIN32OLE_TYPE.new('Microsoft Excel 9.0 Object Library', 'Workbook')
- *     method = WIN32OLE_METHOD.new(tobj, 'SaveAs')
- */
-static VALUE
-folemethod_initialize(VALUE self, VALUE oletype, VALUE method)
-{
-    VALUE obj = Qnil;
-    ITypeInfo *pTypeInfo;
-    if (rb_obj_is_kind_of(oletype, cWIN32OLE_TYPE)) {
-        SafeStringValue(method);
-        pTypeInfo = itypeinfo(oletype);
-        obj = olemethod_from_typeinfo(self, pTypeInfo, method);
-        if (obj == Qnil) {
-            rb_raise(eWIN32OLERuntimeError, "not found %s",
-                     StringValuePtr(method));
-        }
-    }
-    else {
-        rb_raise(rb_eTypeError, "1st argument should be WIN32OLE_TYPE object");
-    }
-    return obj;
-}
-
-/*
- *  call-seq:
- *     WIN32OLE_METHOD#name
- *
- *  Returns the name of the method.
- *
- *     tobj = WIN32OLE_TYPE.new('Microsoft Excel 9.0 Object Library', 'Workbook')
- *     method = WIN32OLE_METHOD.new(tobj, 'SaveAs')
- *     puts method.name # => SaveAs
- *
- */
-static VALUE
-folemethod_name(VALUE self)
-{
-    return rb_ivar_get(self, rb_intern("name"));
-}
-
-static VALUE
-ole_method_return_type(ITypeInfo *pTypeInfo, UINT method_index)
-{
-    FUNCDESC *pFuncDesc;
-    HRESULT hr;
-    VALUE type;
-
-    hr = pTypeInfo->lpVtbl->GetFuncDesc(pTypeInfo, method_index, &pFuncDesc);
-    if (FAILED(hr))
-        ole_raise(hr, eWIN32OLEQueryInterfaceError, "failed to GetFuncDesc");
-
-    type = ole_typedesc2val(pTypeInfo, &(pFuncDesc->elemdescFunc.tdesc), Qnil);
-    pTypeInfo->lpVtbl->ReleaseFuncDesc(pTypeInfo, pFuncDesc);
-    return type;
-}
-
-/*
- *  call-seq:
- *     WIN32OLE_METHOD#return_type
- *
- *  Returns string of return value type of method.
- *     tobj = WIN32OLE_TYPE.new('Microsoft Excel 9.0 Object Library', 'Workbooks')
- *     method = WIN32OLE_METHOD.new(tobj, 'Add')
- *     puts method.return_type # => Workbook
- *
- */
-static VALUE
-folemethod_return_type(VALUE self)
-{
-    struct olemethoddata *pmethod;
-    TypedData_Get_Struct(self, struct olemethoddata, &olemethod_datatype, pmethod);
-    return ole_method_return_type(pmethod->pTypeInfo, pmethod->index);
-}
-
-static VALUE
-ole_method_return_vtype(ITypeInfo *pTypeInfo, UINT method_index)
-{
-    FUNCDESC *pFuncDesc;
-    HRESULT hr;
-    VALUE vvt;
-
-    hr = pTypeInfo->lpVtbl->GetFuncDesc(pTypeInfo, method_index, &pFuncDesc);
-    if (FAILED(hr))
-        ole_raise(hr, eWIN32OLERuntimeError, "failed to GetFuncDesc");
-
-    vvt = RB_INT2FIX(pFuncDesc->elemdescFunc.tdesc.vt);
-    pTypeInfo->lpVtbl->ReleaseFuncDesc(pTypeInfo, pFuncDesc);
-    return vvt;
-}
-
-/*
- *  call-seq:
- *     WIN32OLE_METHOD#return_vtype
- *
- *  Returns number of return value type of method.
- *     tobj = WIN32OLE_TYPE.new('Microsoft Excel 9.0 Object Library', 'Workbooks')
- *     method = WIN32OLE_METHOD.new(tobj, 'Add')
- *     puts method.return_vtype # => 26
- *
- */
-static VALUE
-folemethod_return_vtype(VALUE self)
-{
-    struct olemethoddata *pmethod;
-    TypedData_Get_Struct(self, struct olemethoddata, &olemethod_datatype, pmethod);
-    return ole_method_return_vtype(pmethod->pTypeInfo, pmethod->index);
-}
-
-static VALUE
-ole_method_return_type_detail(ITypeInfo *pTypeInfo, UINT method_index)
-{
-    FUNCDESC *pFuncDesc;
-    HRESULT hr;
-    VALUE type = rb_ary_new();
-
-    hr = pTypeInfo->lpVtbl->GetFuncDesc(pTypeInfo, method_index, &pFuncDesc);
-    if (FAILED(hr))
-        return type;
-
-    ole_typedesc2val(pTypeInfo, &(pFuncDesc->elemdescFunc.tdesc), type);
-    pTypeInfo->lpVtbl->ReleaseFuncDesc(pTypeInfo, pFuncDesc);
-    return type;
-}
-
-/*
- *  call-seq:
- *     WIN32OLE_METHOD#return_type_detail
- *
- *  Returns detail information of return value type of method.
- *  The information is array.
- *     tobj = WIN32OLE_TYPE.new('Microsoft Excel 9.0 Object Library', 'Workbooks')
- *     method = WIN32OLE_METHOD.new(tobj, 'Add')
- *     p method.return_type_detail # => ["PTR", "USERDEFINED", "Workbook"]
- */
-static VALUE
-folemethod_return_type_detail(VALUE self)
-{
-    struct olemethoddata *pmethod;
-    TypedData_Get_Struct(self, struct olemethoddata, &olemethod_datatype, pmethod);
-    return ole_method_return_type_detail(pmethod->pTypeInfo, pmethod->index);
-}
-
-static VALUE
-ole_method_invkind(ITypeInfo *pTypeInfo, UINT method_index)
-{
-    FUNCDESC *pFuncDesc;
-    HRESULT hr;
-    VALUE invkind;
-    hr = pTypeInfo->lpVtbl->GetFuncDesc(pTypeInfo, method_index, &pFuncDesc);
-    if(FAILED(hr))
-        ole_raise(hr, eWIN32OLERuntimeError, "failed to GetFuncDesc");
-    invkind = RB_INT2FIX(pFuncDesc->invkind);
-    pTypeInfo->lpVtbl->ReleaseFuncDesc(pTypeInfo, pFuncDesc);
-    return invkind;
-}
-
-static VALUE
-ole_method_invoke_kind(ITypeInfo *pTypeInfo, UINT method_index)
-{
-    VALUE type = rb_str_new2("UNKNOWN");
-    VALUE invkind = ole_method_invkind(pTypeInfo, method_index);
-    if((RB_FIX2INT(invkind) & INVOKE_PROPERTYGET) &&
-       (RB_FIX2INT(invkind) & INVOKE_PROPERTYPUT) ) {
-        type = rb_str_new2("PROPERTY");
-    } else if(RB_FIX2INT(invkind) & INVOKE_PROPERTYGET) {
-        type =  rb_str_new2("PROPERTYGET");
-    } else if(RB_FIX2INT(invkind) & INVOKE_PROPERTYPUT) {
-        type = rb_str_new2("PROPERTYPUT");
-    } else if(RB_FIX2INT(invkind) & INVOKE_PROPERTYPUTREF) {
-        type = rb_str_new2("PROPERTYPUTREF");
-    } else if(RB_FIX2INT(invkind) & INVOKE_FUNC) {
-        type = rb_str_new2("FUNC");
-    }
-    return type;
-}
-
-/*
- *   call-seq:
- *      WIN32OLE_METHOD#invkind
- *
- *   Returns the method invoke kind.
- *     tobj = WIN32OLE_TYPE.new('Microsoft Excel 9.0 Object Library', 'Workbooks')
- *     method = WIN32OLE_METHOD.new(tobj, 'Add')
- *     puts method.invkind # => 1
- *
- */
-static VALUE
-folemethod_invkind(VALUE self)
-{
-    struct olemethoddata *pmethod;
-    TypedData_Get_Struct(self, struct olemethoddata, &olemethod_datatype, pmethod);
-    return ole_method_invkind(pmethod->pTypeInfo, pmethod->index);
-}
-
-/*
- *  call-seq:
- *     WIN32OLE_METHOD#invoke_kind
- *
- *  Returns the method kind string. The string is "UNKNOWN" or "PROPERTY"
- *  or "PROPERTY" or "PROPERTYGET" or "PROPERTYPUT" or "PROPERTYPPUTREF"
- *  or "FUNC".
- *     tobj = WIN32OLE_TYPE.new('Microsoft Excel 9.0 Object Library', 'Workbooks')
- *     method = WIN32OLE_METHOD.new(tobj, 'Add')
- *     puts method.invoke_kind # => "FUNC"
- */
-static VALUE
-folemethod_invoke_kind(VALUE self)
-{
-    struct olemethoddata *pmethod;
-    TypedData_Get_Struct(self, struct olemethoddata, &olemethod_datatype, pmethod);
-    return ole_method_invoke_kind(pmethod->pTypeInfo, pmethod->index);
-}
-
-static VALUE
-ole_method_visible(ITypeInfo *pTypeInfo, UINT method_index)
-{
-    FUNCDESC *pFuncDesc;
-    HRESULT hr;
-    VALUE visible;
-    hr = pTypeInfo->lpVtbl->GetFuncDesc(pTypeInfo, method_index, &pFuncDesc);
-    if(FAILED(hr))
-        return Qfalse;
-    if (pFuncDesc->wFuncFlags & (FUNCFLAG_FRESTRICTED |
-                                 FUNCFLAG_FHIDDEN |
-                                 FUNCFLAG_FNONBROWSABLE)) {
-        visible = Qfalse;
-    } else {
-        visible = Qtrue;
-    }
-    pTypeInfo->lpVtbl->ReleaseFuncDesc(pTypeInfo, pFuncDesc);
-    return visible;
-}
-
-/*
- *  call-seq:
- *     WIN32OLE_METHOD#visible?
- *
- *  Returns true if the method is public.
- *     tobj = WIN32OLE_TYPE.new('Microsoft Excel 9.0 Object Library', 'Workbooks')
- *     method = WIN32OLE_METHOD.new(tobj, 'Add')
- *     puts method.visible? # => true
- */
-static VALUE
-folemethod_visible(VALUE self)
-{
-    struct olemethoddata *pmethod;
-    TypedData_Get_Struct(self, struct olemethoddata, &olemethod_datatype, pmethod);
-    return ole_method_visible(pmethod->pTypeInfo, pmethod->index);
-}
-
-static VALUE
-ole_method_event(ITypeInfo *pTypeInfo, UINT method_index, VALUE method_name)
-{
-    TYPEATTR *pTypeAttr;
-    HRESULT hr;
-    WORD i;
-    int flags;
-    HREFTYPE href;
-    ITypeInfo *pRefTypeInfo;
-    FUNCDESC *pFuncDesc;
-    BSTR bstr;
-    VALUE name;
-    VALUE event = Qfalse;
-
-    hr = OLE_GET_TYPEATTR(pTypeInfo, &pTypeAttr);
-    if (FAILED(hr))
-        return event;
-    if(pTypeAttr->typekind != TKIND_COCLASS) {
-        pTypeInfo->lpVtbl->ReleaseTypeAttr(pTypeInfo, pTypeAttr);
-        return event;
-    }
-    for (i = 0; i < pTypeAttr->cImplTypes; i++) {
-        hr = pTypeInfo->lpVtbl->GetImplTypeFlags(pTypeInfo, i, &flags);
-        if (FAILED(hr))
-            continue;
-
-        if (flags & IMPLTYPEFLAG_FSOURCE) {
-            hr = pTypeInfo->lpVtbl->GetRefTypeOfImplType(pTypeInfo,
-                                                         i, &href);
-            if (FAILED(hr))
-                continue;
-            hr = pTypeInfo->lpVtbl->GetRefTypeInfo(pTypeInfo,
-                                                   href, &pRefTypeInfo);
-            if (FAILED(hr))
-                continue;
-            hr = pRefTypeInfo->lpVtbl->GetFuncDesc(pRefTypeInfo, method_index,
-                                                   &pFuncDesc);
-            if (FAILED(hr)) {
-                OLE_RELEASE(pRefTypeInfo);
-                continue;
-            }
-
-            hr = pRefTypeInfo->lpVtbl->GetDocumentation(pRefTypeInfo,
-                                                        pFuncDesc->memid,
-                                                        &bstr, NULL, NULL, NULL);
-            if (FAILED(hr)) {
-                pRefTypeInfo->lpVtbl->ReleaseFuncDesc(pRefTypeInfo, pFuncDesc);
-                OLE_RELEASE(pRefTypeInfo);
-                continue;
-            }
-
-            name = WC2VSTR(bstr);
-            pRefTypeInfo->lpVtbl->ReleaseFuncDesc(pRefTypeInfo, pFuncDesc);
-            OLE_RELEASE(pRefTypeInfo);
-            if (rb_str_cmp(method_name, name) == 0) {
-                event = Qtrue;
-                break;
-            }
-        }
-    }
-    OLE_RELEASE_TYPEATTR(pTypeInfo, pTypeAttr);
-    return event;
-}
-
-/*
- *  call-seq:
- *     WIN32OLE_METHOD#event?
- *
- *  Returns true if the method is event.
- *     tobj = WIN32OLE_TYPE.new('Microsoft Excel 9.0 Object Library', 'Workbook')
- *     method = WIN32OLE_METHOD.new(tobj, 'SheetActivate')
- *     puts method.event? # => true
- *
- */
-static VALUE
-folemethod_event(VALUE self)
-{
-    struct olemethoddata *pmethod;
-    TypedData_Get_Struct(self, struct olemethoddata, &olemethod_datatype, pmethod);
-    if (!pmethod->pOwnerTypeInfo)
-        return Qfalse;
-    return ole_method_event(pmethod->pOwnerTypeInfo,
-                            pmethod->index,
-                            rb_ivar_get(self, rb_intern("name")));
-}
-
-/*
- *  call-seq:
- *     WIN32OLE_METHOD#event_interface
- *
- *  Returns event interface name if the method is event.
- *    tobj = WIN32OLE_TYPE.new('Microsoft Excel 9.0 Object Library', 'Workbook')
- *    method = WIN32OLE_METHOD.new(tobj, 'SheetActivate')
- *    puts method.event_interface # =>  WorkbookEvents
- */
-static VALUE
-folemethod_event_interface(VALUE self)
-{
-    BSTR name;
-    struct olemethoddata *pmethod;
-    HRESULT hr;
-    TypedData_Get_Struct(self, struct olemethoddata, &olemethod_datatype, pmethod);
-    if(folemethod_event(self) == Qtrue) {
-        hr = ole_docinfo_from_type(pmethod->pTypeInfo, &name, NULL, NULL, NULL);
-        if(SUCCEEDED(hr))
-            return WC2VSTR(name);
-    }
-    return Qnil;
-}
-
-static HRESULT
-ole_method_docinfo_from_type(
-    ITypeInfo *pTypeInfo,
-    UINT method_index,
-    BSTR *name,
-    BSTR *helpstr,
-    DWORD *helpcontext,
-    BSTR *helpfile
-    )
-{
-    FUNCDESC *pFuncDesc;
-    HRESULT hr;
-    hr = pTypeInfo->lpVtbl->GetFuncDesc(pTypeInfo, method_index, &pFuncDesc);
-    if (FAILED(hr))
-        return hr;
-    hr = pTypeInfo->lpVtbl->GetDocumentation(pTypeInfo, pFuncDesc->memid,
-                                             name, helpstr,
-                                             helpcontext, helpfile);
-    pTypeInfo->lpVtbl->ReleaseFuncDesc(pTypeInfo, pFuncDesc);
-    return hr;
-}
-
-static VALUE
-ole_method_helpstring(ITypeInfo *pTypeInfo, UINT method_index)
-{
-    HRESULT hr;
-    BSTR bhelpstring;
-    hr = ole_method_docinfo_from_type(pTypeInfo, method_index, NULL, &bhelpstring,
-                                      NULL, NULL);
-    if (FAILED(hr))
-        return Qnil;
-    return WC2VSTR(bhelpstring);
-}
-
-/*
- *  call-seq:
- *     WIN32OLE_METHOD#helpstring
- *
- *  Returns help string of OLE method. If the help string is not found,
- *  then the method returns nil.
- *     tobj = WIN32OLE_TYPE.new('Microsoft Internet Controls', 'IWebBrowser')
- *     method = WIN32OLE_METHOD.new(tobj, 'Navigate')
- *     puts method.helpstring # => Navigates to a URL or file.
- *
- */
-static VALUE
-folemethod_helpstring(VALUE self)
-{
-    struct olemethoddata *pmethod;
-    TypedData_Get_Struct(self, struct olemethoddata, &olemethod_datatype, pmethod);
-    return ole_method_helpstring(pmethod->pTypeInfo, pmethod->index);
-}
-
-static VALUE
-ole_method_helpfile(ITypeInfo *pTypeInfo, UINT method_index)
-{
-    HRESULT hr;
-    BSTR bhelpfile;
-    hr = ole_method_docinfo_from_type(pTypeInfo, method_index, NULL, NULL,
-                                      NULL, &bhelpfile);
-    if (FAILED(hr))
-        return Qnil;
-    return WC2VSTR(bhelpfile);
-}
-
-/*
- *  call-seq:
- *     WIN32OLE_METHOD#helpfile
- *
- *  Returns help file. If help file is not found, then
- *  the method returns nil.
- *     tobj = WIN32OLE_TYPE.new('Microsoft Excel 9.0 Object Library', 'Workbooks')
- *     method = WIN32OLE_METHOD.new(tobj, 'Add')
- *     puts method.helpfile # => C:\...\VBAXL9.CHM
- */
-static VALUE
-folemethod_helpfile(VALUE self)
-{
-    struct olemethoddata *pmethod;
-    TypedData_Get_Struct(self, struct olemethoddata, &olemethod_datatype, pmethod);
-
-    return ole_method_helpfile(pmethod->pTypeInfo, pmethod->index);
-}
-
-static VALUE
-ole_method_helpcontext(ITypeInfo *pTypeInfo, UINT method_index)
-{
-    HRESULT hr;
-    DWORD helpcontext = 0;
-    hr = ole_method_docinfo_from_type(pTypeInfo, method_index, NULL, NULL,
-                                      &helpcontext, NULL);
-    if (FAILED(hr))
-        return Qnil;
-    return RB_INT2FIX(helpcontext);
-}
-
-/*
- *  call-seq:
- *     WIN32OLE_METHOD#helpcontext
- *
- *  Returns help context.
- *     tobj = WIN32OLE_TYPE.new('Microsoft Excel 9.0 Object Library', 'Workbooks')
- *     method = WIN32OLE_METHOD.new(tobj, 'Add')
- *     puts method.helpcontext # => 65717
- */
-static VALUE
-folemethod_helpcontext(VALUE self)
-{
-    struct olemethoddata *pmethod;
-    TypedData_Get_Struct(self, struct olemethoddata, &olemethod_datatype, pmethod);
-    return ole_method_helpcontext(pmethod->pTypeInfo, pmethod->index);
-}
-
-static VALUE
-ole_method_dispid(ITypeInfo *pTypeInfo, UINT method_index)
-{
-    FUNCDESC *pFuncDesc;
-    HRESULT hr;
-    VALUE dispid = Qnil;
-    hr = pTypeInfo->lpVtbl->GetFuncDesc(pTypeInfo, method_index, &pFuncDesc);
-    if (FAILED(hr))
-        return dispid;
-    dispid = RB_INT2NUM(pFuncDesc->memid);
-    pTypeInfo->lpVtbl->ReleaseFuncDesc(pTypeInfo, pFuncDesc);
-    return dispid;
-}
-
-/*
- *  call-seq:
- *     WIN32OLE_METHOD#dispid
- *
- *  Returns dispatch ID.
- *     tobj = WIN32OLE_TYPE.new('Microsoft Excel 9.0 Object Library', 'Workbooks')
- *     method = WIN32OLE_METHOD.new(tobj, 'Add')
- *     puts method.dispid # => 181
- */
-static VALUE
-folemethod_dispid(VALUE self)
-{
-    struct olemethoddata *pmethod;
-    TypedData_Get_Struct(self, struct olemethoddata, &olemethod_datatype, pmethod);
-    return ole_method_dispid(pmethod->pTypeInfo, pmethod->index);
-}
-
-static VALUE
-ole_method_offset_vtbl(ITypeInfo *pTypeInfo, UINT method_index)
-{
-    FUNCDESC *pFuncDesc;
-    HRESULT hr;
-    VALUE offset_vtbl = Qnil;
-    hr = pTypeInfo->lpVtbl->GetFuncDesc(pTypeInfo, method_index, &pFuncDesc);
-    if (FAILED(hr))
-        return offset_vtbl;
-    offset_vtbl = RB_INT2FIX(pFuncDesc->oVft);
-    pTypeInfo->lpVtbl->ReleaseFuncDesc(pTypeInfo, pFuncDesc);
-    return offset_vtbl;
-}
-
-/*
- *  call-seq:
- *     WIN32OLE_METHOD#offset_vtbl
- *
- *  Returns the offset ov VTBL.
- *     tobj = WIN32OLE_TYPE.new('Microsoft Excel 9.0 Object Library', 'Workbooks')
- *     method = WIN32OLE_METHOD.new(tobj, 'Add')
- *     puts method.offset_vtbl # => 40
- */
-static VALUE
-folemethod_offset_vtbl(VALUE self)
-{
-    struct olemethoddata *pmethod;
-    TypedData_Get_Struct(self, struct olemethoddata, &olemethod_datatype, pmethod);
-    return ole_method_offset_vtbl(pmethod->pTypeInfo, pmethod->index);
-}
-
-static VALUE
-ole_method_size_params(ITypeInfo *pTypeInfo, UINT method_index)
-{
-    FUNCDESC *pFuncDesc;
-    HRESULT hr;
-    VALUE size_params = Qnil;
-    hr = pTypeInfo->lpVtbl->GetFuncDesc(pTypeInfo, method_index, &pFuncDesc);
-    if (FAILED(hr))
-        return size_params;
-    size_params = RB_INT2FIX(pFuncDesc->cParams);
-    pTypeInfo->lpVtbl->ReleaseFuncDesc(pTypeInfo, pFuncDesc);
-    return size_params;
-}
-
-/*
- *  call-seq:
- *     WIN32OLE_METHOD#size_params
- *
- *  Returns the size of arguments of the method.
- *     tobj = WIN32OLE_TYPE.new('Microsoft Excel 9.0 Object Library', 'Workbook')
- *     method = WIN32OLE_METHOD.new(tobj, 'SaveAs')
- *     puts method.size_params # => 11
- *
- */
-static VALUE
-folemethod_size_params(VALUE self)
-{
-    struct olemethoddata *pmethod;
-    TypedData_Get_Struct(self, struct olemethoddata, &olemethod_datatype, pmethod);
-    return ole_method_size_params(pmethod->pTypeInfo, pmethod->index);
-}
-
-static VALUE
-ole_method_size_opt_params(ITypeInfo *pTypeInfo, UINT method_index)
-{
-    FUNCDESC *pFuncDesc;
-    HRESULT hr;
-    VALUE size_opt_params = Qnil;
-    hr = pTypeInfo->lpVtbl->GetFuncDesc(pTypeInfo, method_index, &pFuncDesc);
-    if (FAILED(hr))
-        return size_opt_params;
-    size_opt_params = RB_INT2FIX(pFuncDesc->cParamsOpt);
-    pTypeInfo->lpVtbl->ReleaseFuncDesc(pTypeInfo, pFuncDesc);
-    return size_opt_params;
-}
-
-/*
- *  call-seq:
- *     WIN32OLE_METHOD#size_opt_params
- *
- *  Returns the size of optional parameters.
- *     tobj = WIN32OLE_TYPE.new('Microsoft Excel 9.0 Object Library', 'Workbook')
- *     method = WIN32OLE_METHOD.new(tobj, 'SaveAs')
- *     puts method.size_opt_params # => 4
- */
-static VALUE
-folemethod_size_opt_params(VALUE self)
-{
-    struct olemethoddata *pmethod;
-    TypedData_Get_Struct(self, struct olemethoddata, &olemethod_datatype, pmethod);
-    return ole_method_size_opt_params(pmethod->pTypeInfo, pmethod->index);
-}
-
-static VALUE
-ole_method_params(ITypeInfo *pTypeInfo, UINT method_index)
-{
-    FUNCDESC *pFuncDesc;
-    HRESULT hr;
-    BSTR *bstrs;
-    UINT len, i;
-    VALUE param;
-    VALUE params = rb_ary_new();
-    hr = pTypeInfo->lpVtbl->GetFuncDesc(pTypeInfo, method_index, &pFuncDesc);
-    if (FAILED(hr))
-        return params;
-
-    len = 0;
-    bstrs = ALLOCA_N(BSTR, pFuncDesc->cParams + 1);
-    hr = pTypeInfo->lpVtbl->GetNames(pTypeInfo, pFuncDesc->memid,
-                                     bstrs, pFuncDesc->cParams + 1,
-                                     &len);
-    if (FAILED(hr)) {
-        pTypeInfo->lpVtbl->ReleaseFuncDesc(pTypeInfo, pFuncDesc);
-        return params;
-    }
-    SysFreeString(bstrs[0]);
-    if (pFuncDesc->cParams > 0) {
-        for(i = 1; i < len; i++) {
-            param = create_win32ole_param(pTypeInfo, method_index, i-1, WC2VSTR(bstrs[i]));
-            rb_ary_push(params, param);
-         }
-     }
-     pTypeInfo->lpVtbl->ReleaseFuncDesc(pTypeInfo, pFuncDesc);
-     return params;
-}
-
-/*
- *  call-seq:
- *     WIN32OLE_METHOD#params
- *
- *  returns array of WIN32OLE_PARAM object corresponding with method parameters.
- *     tobj = WIN32OLE_TYPE.new('Microsoft Excel 9.0 Object Library', 'Workbook')
- *     method = WIN32OLE_METHOD.new(tobj, 'SaveAs')
- *     p method.params # => [Filename, FileFormat, Password, WriteResPassword,
- *                           ReadOnlyRecommended, CreateBackup, AccessMode,
- *                           ConflictResolution, AddToMru, TextCodepage,
- *                           TextVisualLayout]
- */
-static VALUE
-folemethod_params(VALUE self)
-{
-    struct olemethoddata *pmethod;
-    TypedData_Get_Struct(self, struct olemethoddata, &olemethod_datatype, pmethod);
-    return ole_method_params(pmethod->pTypeInfo, pmethod->index);
-}
-
-/*
- *  call-seq:
- *     WIN32OLE_METHOD#inspect -> String
- *
- *  Returns the method name with class name.
- *
- */
-static VALUE
-folemethod_inspect(VALUE self)
-{
-    return default_inspect(self, "WIN32OLE_METHOD");
-}
-
-VALUE cWIN32OLE_METHOD;
-
-void Init_win32ole_method(void)
-{
-    cWIN32OLE_METHOD = rb_define_class_under(cWIN32OLE, "Method", rb_cObject);
-    rb_define_const(rb_cObject, "WIN32OLE_METHOD", cWIN32OLE_METHOD);
-    rb_define_alloc_func(cWIN32OLE_METHOD, folemethod_s_allocate);
-    rb_define_method(cWIN32OLE_METHOD, "initialize", folemethod_initialize, 2);
-    rb_define_method(cWIN32OLE_METHOD, "name", folemethod_name, 0);
-    rb_define_method(cWIN32OLE_METHOD, "return_type", folemethod_return_type, 0);
-    rb_define_method(cWIN32OLE_METHOD, "return_vtype", folemethod_return_vtype, 0);
-    rb_define_method(cWIN32OLE_METHOD, "return_type_detail", folemethod_return_type_detail, 0);
-    rb_define_method(cWIN32OLE_METHOD, "invoke_kind", folemethod_invoke_kind, 0);
-    rb_define_method(cWIN32OLE_METHOD, "invkind", folemethod_invkind, 0);
-    rb_define_method(cWIN32OLE_METHOD, "visible?", folemethod_visible, 0);
-    rb_define_method(cWIN32OLE_METHOD, "event?", folemethod_event, 0);
-    rb_define_method(cWIN32OLE_METHOD, "event_interface", folemethod_event_interface, 0);
-    rb_define_method(cWIN32OLE_METHOD, "helpstring", folemethod_helpstring, 0);
-    rb_define_method(cWIN32OLE_METHOD, "helpfile", folemethod_helpfile, 0);
-    rb_define_method(cWIN32OLE_METHOD, "helpcontext", folemethod_helpcontext, 0);
-    rb_define_method(cWIN32OLE_METHOD, "dispid", folemethod_dispid, 0);
-    rb_define_method(cWIN32OLE_METHOD, "offset_vtbl", folemethod_offset_vtbl, 0);
-    rb_define_method(cWIN32OLE_METHOD, "size_params", folemethod_size_params, 0);
-    rb_define_method(cWIN32OLE_METHOD, "size_opt_params", folemethod_size_opt_params, 0);
-    rb_define_method(cWIN32OLE_METHOD, "params", folemethod_params, 0);
-    rb_define_alias(cWIN32OLE_METHOD, "to_s", "name");
-    rb_define_method(cWIN32OLE_METHOD, "inspect", folemethod_inspect, 0);
-}
diff --git a/ext/win32ole/win32ole_method.h b/ext/win32ole/win32ole_method.h
deleted file mode 100644
index ef907d2fac5588..00000000000000
--- a/ext/win32ole/win32ole_method.h
+++ /dev/null
@@ -1,16 +0,0 @@
-#ifndef WIN32OLE_METHOD_H
-#define WIN32OLE_METHOD_H 1
-
-struct olemethoddata {
-    ITypeInfo *pOwnerTypeInfo;
-    ITypeInfo *pTypeInfo;
-    UINT index;
-};
-
-extern VALUE cWIN32OLE_METHOD;
-VALUE folemethod_s_allocate(VALUE klass);
-VALUE ole_methods_from_typeinfo(ITypeInfo *pTypeInfo, int mask);
-VALUE create_win32ole_method(ITypeInfo *pTypeInfo, VALUE name);
-struct olemethoddata *olemethod_data_get_struct(VALUE obj);
-void Init_win32ole_method(void);
-#endif
diff --git a/ext/win32ole/win32ole_param.c b/ext/win32ole/win32ole_param.c
deleted file mode 100644
index b654aaa845451e..00000000000000
--- a/ext/win32ole/win32ole_param.c
+++ /dev/null
@@ -1,439 +0,0 @@
-#include "win32ole.h"
-
-VALUE cWIN32OLE_PARAM;
-
-struct oleparamdata {
-    ITypeInfo *pTypeInfo;
-    UINT method_index;
-    UINT index;
-};
-
-static void oleparam_free(void *ptr);
-static size_t oleparam_size(const void *ptr);
-static VALUE foleparam_s_allocate(VALUE klass);
-static VALUE oleparam_ole_param_from_index(VALUE self, ITypeInfo *pTypeInfo, UINT method_index, int param_index);
-static VALUE oleparam_ole_param(VALUE self, VALUE olemethod, int n);
-static VALUE foleparam_initialize(VALUE self, VALUE olemethod, VALUE n);
-static VALUE foleparam_name(VALUE self);
-static VALUE ole_param_ole_type(ITypeInfo *pTypeInfo, UINT method_index, UINT index);
-static VALUE foleparam_ole_type(VALUE self);
-static VALUE ole_param_ole_type_detail(ITypeInfo *pTypeInfo, UINT method_index, UINT index);
-static VALUE foleparam_ole_type_detail(VALUE self);
-static VALUE ole_param_flag_mask(ITypeInfo *pTypeInfo, UINT method_index, UINT index, USHORT mask);
-static VALUE foleparam_input(VALUE self);
-static VALUE foleparam_output(VALUE self);
-static VALUE foleparam_optional(VALUE self);
-static VALUE foleparam_retval(VALUE self);
-static VALUE ole_param_default(ITypeInfo *pTypeInfo, UINT method_index, UINT index);
-static VALUE foleparam_default(VALUE self);
-static VALUE foleparam_inspect(VALUE self);
-
-static const rb_data_type_t oleparam_datatype = {
-    "win32ole_param",
-    {NULL, oleparam_free, oleparam_size,},
-    0, 0, RUBY_TYPED_FREE_IMMEDIATELY
-};
-
-static void
-oleparam_free(void *ptr)
-{
-    struct oleparamdata *pole = ptr;
-    OLE_FREE(pole->pTypeInfo);
-    free(pole);
-}
-
-static size_t
-oleparam_size(const void *ptr)
-{
-    return ptr ? sizeof(struct oleparamdata) : 0;
-}
-
-VALUE
-create_win32ole_param(ITypeInfo *pTypeInfo, UINT method_index, UINT index, VALUE name)
-{
-    struct oleparamdata *pparam;
-    VALUE obj = foleparam_s_allocate(cWIN32OLE_PARAM);
-    TypedData_Get_Struct(obj, struct oleparamdata, &oleparam_datatype, pparam);
-
-    pparam->pTypeInfo = pTypeInfo;
-    OLE_ADDREF(pTypeInfo);
-    pparam->method_index = method_index;
-    pparam->index = index;
-    rb_ivar_set(obj, rb_intern("name"), name);
-    return obj;
-}
-
-/*
- * Document-class: WIN32OLE_PARAM
- *
- *   <code>WIN32OLE_PARAM</code> objects represent param information of
- *   the OLE method.
- */
-static VALUE
-foleparam_s_allocate(VALUE klass)
-{
-    struct oleparamdata *pparam;
-    VALUE obj;
-    obj = TypedData_Make_Struct(klass,
-                                struct oleparamdata,
-                                &oleparam_datatype, pparam);
-    pparam->pTypeInfo = NULL;
-    pparam->method_index = 0;
-    pparam->index = 0;
-    return obj;
-}
-
-static VALUE
-oleparam_ole_param_from_index(VALUE self, ITypeInfo *pTypeInfo, UINT method_index, int param_index)
-{
-    FUNCDESC *pFuncDesc;
-    HRESULT hr;
-    BSTR *bstrs;
-    UINT len;
-    struct oleparamdata *pparam;
-    hr = pTypeInfo->lpVtbl->GetFuncDesc(pTypeInfo, method_index, &pFuncDesc);
-    if (FAILED(hr))
-        ole_raise(hr, rb_eRuntimeError, "fail to ITypeInfo::GetFuncDesc");
-
-    len = 0;
-    bstrs = ALLOCA_N(BSTR, pFuncDesc->cParams + 1);
-    hr = pTypeInfo->lpVtbl->GetNames(pTypeInfo, pFuncDesc->memid,
-                                     bstrs, pFuncDesc->cParams + 1,
-                                     &len);
-    if (FAILED(hr)) {
-        pTypeInfo->lpVtbl->ReleaseFuncDesc(pTypeInfo, pFuncDesc);
-        ole_raise(hr, rb_eRuntimeError, "fail to ITypeInfo::GetNames");
-    }
-    SysFreeString(bstrs[0]);
-    if (param_index < 1 || len <= (UINT)param_index)
-    {
-        pTypeInfo->lpVtbl->ReleaseFuncDesc(pTypeInfo, pFuncDesc);
-        rb_raise(rb_eIndexError, "index of param must be in 1..%d", len);
-    }
-
-    TypedData_Get_Struct(self, struct oleparamdata, &oleparam_datatype, pparam);
-    pparam->pTypeInfo = pTypeInfo;
-    OLE_ADDREF(pTypeInfo);
-    pparam->method_index = method_index;
-    pparam->index = param_index - 1;
-    rb_ivar_set(self, rb_intern("name"), WC2VSTR(bstrs[param_index]));
-
-    pTypeInfo->lpVtbl->ReleaseFuncDesc(pTypeInfo, pFuncDesc);
-    return self;
-}
-
-static VALUE
-oleparam_ole_param(VALUE self, VALUE olemethod, int n)
-{
-    struct olemethoddata *pmethod = olemethod_data_get_struct(olemethod);
-    return oleparam_ole_param_from_index(self, pmethod->pTypeInfo, pmethod->index, n);
-}
-
-/*
- * call-seq:
- *    WIN32OLE_PARAM.new(method, n) -> WIN32OLE_PARAM object
- *
- * Returns WIN32OLE_PARAM object which represents OLE parameter information.
- * 1st argument should be WIN32OLE_METHOD object.
- * 2nd argument `n' is n-th parameter of the method specified by 1st argument.
- *
- *    tobj = WIN32OLE_TYPE.new('Microsoft Scripting Runtime', 'IFileSystem')
- *    method = WIN32OLE_METHOD.new(tobj, 'CreateTextFile')
- *    param = WIN32OLE_PARAM.new(method, 2) # => #<WIN32OLE_PARAM:Overwrite=true>
- *
- */
-static VALUE
-foleparam_initialize(VALUE self, VALUE olemethod, VALUE n)
-{
-    int idx;
-    if (!rb_obj_is_kind_of(olemethod, cWIN32OLE_METHOD)) {
-        rb_raise(rb_eTypeError, "1st parameter must be WIN32OLE_METHOD object");
-    }
-    idx = RB_FIX2INT(n);
-    return oleparam_ole_param(self, olemethod, idx);
-}
-
-/*
- *  call-seq:
- *     WIN32OLE_PARAM#name
- *
- *  Returns name.
- *     tobj = WIN32OLE_TYPE.new('Microsoft Excel 9.0 Object Library', 'Workbook')
- *     method = WIN32OLE_METHOD.new(tobj, 'SaveAs')
- *     param1 = method.params[0]
- *     puts param1.name # => Filename
- */
-static VALUE
-foleparam_name(VALUE self)
-{
-    return rb_ivar_get(self, rb_intern("name"));
-}
-
-static VALUE
-ole_param_ole_type(ITypeInfo *pTypeInfo, UINT method_index, UINT index)
-{
-    FUNCDESC *pFuncDesc;
-    HRESULT hr;
-    VALUE type = rb_str_new2("unknown type");
-    hr = pTypeInfo->lpVtbl->GetFuncDesc(pTypeInfo, method_index, &pFuncDesc);
-    if (FAILED(hr))
-        return type;
-    type = ole_typedesc2val(pTypeInfo,
-                            &(pFuncDesc->lprgelemdescParam[index].tdesc), Qnil);
-    pTypeInfo->lpVtbl->ReleaseFuncDesc(pTypeInfo, pFuncDesc);
-    return type;
-}
-
-/*
- *  call-seq:
- *     WIN32OLE_PARAM#ole_type
- *
- *  Returns OLE type of WIN32OLE_PARAM object(parameter of OLE method).
- *     tobj = WIN32OLE_TYPE.new('Microsoft Excel 9.0 Object Library', 'Workbook')
- *     method = WIN32OLE_METHOD.new(tobj, 'SaveAs')
- *     param1 = method.params[0]
- *     puts param1.ole_type # => VARIANT
- */
-static VALUE
-foleparam_ole_type(VALUE self)
-{
-    struct oleparamdata *pparam;
-    TypedData_Get_Struct(self, struct oleparamdata, &oleparam_datatype, pparam);
-    return ole_param_ole_type(pparam->pTypeInfo, pparam->method_index,
-                              pparam->index);
-}
-
-static VALUE
-ole_param_ole_type_detail(ITypeInfo *pTypeInfo, UINT method_index, UINT index)
-{
-    FUNCDESC *pFuncDesc;
-    HRESULT hr;
-    VALUE typedetail = rb_ary_new();
-    hr = pTypeInfo->lpVtbl->GetFuncDesc(pTypeInfo, method_index, &pFuncDesc);
-    if (FAILED(hr))
-        return typedetail;
-    ole_typedesc2val(pTypeInfo,
-                     &(pFuncDesc->lprgelemdescParam[index].tdesc), typedetail);
-    pTypeInfo->lpVtbl->ReleaseFuncDesc(pTypeInfo, pFuncDesc);
-    return typedetail;
-}
-
-/*
- *  call-seq:
- *     WIN32OLE_PARAM#ole_type_detail
- *
- *  Returns detail information of type of argument.
- *     tobj = WIN32OLE_TYPE.new('Microsoft Excel 9.0 Object Library', 'IWorksheetFunction')
- *     method = WIN32OLE_METHOD.new(tobj, 'SumIf')
- *     param1 = method.params[0]
- *     p param1.ole_type_detail # => ["PTR", "USERDEFINED", "Range"]
- */
-static VALUE
-foleparam_ole_type_detail(VALUE self)
-{
-    struct oleparamdata *pparam;
-    TypedData_Get_Struct(self, struct oleparamdata, &oleparam_datatype, pparam);
-    return ole_param_ole_type_detail(pparam->pTypeInfo, pparam->method_index,
-                                     pparam->index);
-}
-
-static VALUE
-ole_param_flag_mask(ITypeInfo *pTypeInfo, UINT method_index, UINT index, USHORT mask)
-{
-    FUNCDESC *pFuncDesc;
-    HRESULT hr;
-    VALUE ret = Qfalse;
-    hr = pTypeInfo->lpVtbl->GetFuncDesc(pTypeInfo, method_index, &pFuncDesc);
-    if(FAILED(hr))
-        return ret;
-    if (V_UNION1((&(pFuncDesc->lprgelemdescParam[index])), paramdesc).wParamFlags &mask)
-        ret = Qtrue;
-    pTypeInfo->lpVtbl->ReleaseFuncDesc(pTypeInfo, pFuncDesc);
-    return ret;
-}
-
-/*
- *  call-seq:
- *     WIN32OLE_PARAM#input?
- *
- *  Returns true if the parameter is input.
- *     tobj = WIN32OLE_TYPE.new('Microsoft Excel 9.0 Object Library', 'Workbook')
- *     method = WIN32OLE_METHOD.new(tobj, 'SaveAs')
- *     param1 = method.params[0]
- *     puts param1.input? # => true
- */
-static VALUE
-foleparam_input(VALUE self)
-{
-    struct oleparamdata *pparam;
-    TypedData_Get_Struct(self, struct oleparamdata, &oleparam_datatype, pparam);
-    return ole_param_flag_mask(pparam->pTypeInfo, pparam->method_index,
-                               pparam->index, PARAMFLAG_FIN);
-}
-
-/*
- *  call-seq:
- *     WIN32OLE#output?
- *
- *  Returns true if argument is output.
- *     tobj = WIN32OLE_TYPE.new('Microsoft Internet Controls', 'DWebBrowserEvents')
- *     method = WIN32OLE_METHOD.new(tobj, 'NewWindow')
- *     method.params.each do |param|
- *       puts "#{param.name} #{param.output?}"
- *     end
- *
- *     The result of above script is following:
- *       URL false
- *       Flags false
- *       TargetFrameName false
- *       PostData false
- *       Headers false
- *       Processed true
- */
-static VALUE
-foleparam_output(VALUE self)
-{
-    struct oleparamdata *pparam;
-    TypedData_Get_Struct(self, struct oleparamdata, &oleparam_datatype, pparam);
-    return ole_param_flag_mask(pparam->pTypeInfo, pparam->method_index,
-                               pparam->index, PARAMFLAG_FOUT);
-}
-
-/*
- *  call-seq:
- *     WIN32OLE_PARAM#optional?
- *
- *  Returns true if argument is optional.
- *     tobj = WIN32OLE_TYPE.new('Microsoft Excel 9.0 Object Library', 'Workbook')
- *     method = WIN32OLE_METHOD.new(tobj, 'SaveAs')
- *     param1 = method.params[0]
- *     puts "#{param1.name} #{param1.optional?}" # => Filename true
- */
-static VALUE
-foleparam_optional(VALUE self)
-{
-    struct oleparamdata *pparam;
-    TypedData_Get_Struct(self, struct oleparamdata, &oleparam_datatype, pparam);
-    return ole_param_flag_mask(pparam->pTypeInfo, pparam->method_index,
-                               pparam->index, PARAMFLAG_FOPT);
-}
-
-/*
- *  call-seq:
- *     WIN32OLE_PARAM#retval?
- *
- *  Returns true if argument is return value.
- *     tobj = WIN32OLE_TYPE.new('DirectX 7 for Visual Basic Type Library',
- *                              'DirectPlayLobbyConnection')
- *     method = WIN32OLE_METHOD.new(tobj, 'GetPlayerShortName')
- *     param = method.params[0]
- *     puts "#{param.name} #{param.retval?}"  # => name true
- */
-static VALUE
-foleparam_retval(VALUE self)
-{
-    struct oleparamdata *pparam;
-    TypedData_Get_Struct(self, struct oleparamdata, &oleparam_datatype, pparam);
-    return ole_param_flag_mask(pparam->pTypeInfo, pparam->method_index,
-                               pparam->index, PARAMFLAG_FRETVAL);
-}
-
-static VALUE
-ole_param_default(ITypeInfo *pTypeInfo, UINT method_index, UINT index)
-{
-    FUNCDESC *pFuncDesc;
-    ELEMDESC *pElemDesc;
-    PARAMDESCEX * pParamDescEx;
-    HRESULT hr;
-    USHORT wParamFlags;
-    USHORT mask = PARAMFLAG_FOPT|PARAMFLAG_FHASDEFAULT;
-    VALUE defval = Qnil;
-    hr = pTypeInfo->lpVtbl->GetFuncDesc(pTypeInfo, method_index, &pFuncDesc);
-    if (FAILED(hr))
-        return defval;
-    pElemDesc = &pFuncDesc->lprgelemdescParam[index];
-    wParamFlags = V_UNION1(pElemDesc, paramdesc).wParamFlags;
-    if ((wParamFlags & mask) == mask) {
-         pParamDescEx = V_UNION1(pElemDesc, paramdesc).pparamdescex;
-         defval = ole_variant2val(&pParamDescEx->varDefaultValue);
-    }
-    pTypeInfo->lpVtbl->ReleaseFuncDesc(pTypeInfo, pFuncDesc);
-    return defval;
-}
-
-/*
- *  call-seq:
- *     WIN32OLE_PARAM#default
- *
- *  Returns default value. If the default value does not exist,
- *  this method returns nil.
- *     tobj = WIN32OLE_TYPE.new('Microsoft Excel 9.0 Object Library', 'Workbook')
- *     method = WIN32OLE_METHOD.new(tobj, 'SaveAs')
- *     method.params.each do |param|
- *       if param.default
- *         puts "#{param.name} (= #{param.default})"
- *       else
- *         puts "#{param}"
- *       end
- *     end
- *
- *     The above script result is following:
- *         Filename
- *         FileFormat
- *         Password
- *         WriteResPassword
- *         ReadOnlyRecommended
- *         CreateBackup
- *         AccessMode (= 1)
- *         ConflictResolution
- *         AddToMru
- *         TextCodepage
- *         TextVisualLayout
- */
-static VALUE
-foleparam_default(VALUE self)
-{
-    struct oleparamdata *pparam;
-    TypedData_Get_Struct(self, struct oleparamdata, &oleparam_datatype, pparam);
-    return ole_param_default(pparam->pTypeInfo, pparam->method_index,
-                             pparam->index);
-}
-
-/*
- *  call-seq:
- *     WIN32OLE_PARAM#inspect -> String
- *
- *  Returns the parameter name with class name. If the parameter has default value,
- *  then returns name=value string with class name.
- *
- */
-static VALUE
-foleparam_inspect(VALUE self)
-{
-    VALUE detail = foleparam_name(self);
-    VALUE defval = foleparam_default(self);
-    if (defval != Qnil) {
-        rb_str_cat2(detail, "=");
-        rb_str_concat(detail, rb_inspect(defval));
-    }
-    return make_inspect("WIN32OLE_PARAM", detail);
-}
-
-void
-Init_win32ole_param(void)
-{
-    cWIN32OLE_PARAM = rb_define_class_under(cWIN32OLE, "Param", rb_cObject);
-    rb_define_const(rb_cObject, "WIN32OLE_PARAM", cWIN32OLE_PARAM);
-    rb_define_alloc_func(cWIN32OLE_PARAM, foleparam_s_allocate);
-    rb_define_method(cWIN32OLE_PARAM, "initialize", foleparam_initialize, 2);
-    rb_define_method(cWIN32OLE_PARAM, "name", foleparam_name, 0);
-    rb_define_method(cWIN32OLE_PARAM, "ole_type", foleparam_ole_type, 0);
-    rb_define_method(cWIN32OLE_PARAM, "ole_type_detail", foleparam_ole_type_detail, 0);
-    rb_define_method(cWIN32OLE_PARAM, "input?", foleparam_input, 0);
-    rb_define_method(cWIN32OLE_PARAM, "output?", foleparam_output, 0);
-    rb_define_method(cWIN32OLE_PARAM, "optional?", foleparam_optional, 0);
-    rb_define_method(cWIN32OLE_PARAM, "retval?", foleparam_retval, 0);
-    rb_define_method(cWIN32OLE_PARAM, "default", foleparam_default, 0);
-    rb_define_alias(cWIN32OLE_PARAM, "to_s", "name");
-    rb_define_method(cWIN32OLE_PARAM, "inspect", foleparam_inspect, 0);
-}
diff --git a/ext/win32ole/win32ole_param.h b/ext/win32ole/win32ole_param.h
deleted file mode 100644
index 7e2650cb44b498..00000000000000
--- a/ext/win32ole/win32ole_param.h
+++ /dev/null
@@ -1,8 +0,0 @@
-#ifndef WIN32OLE_PARAM_H
-#define WIN32OLE_PARAM_H
-
-VALUE create_win32ole_param(ITypeInfo *pTypeInfo, UINT method_index, UINT index, VALUE name);
-void Init_win32ole_param(void);
-
-#endif
-
diff --git a/ext/win32ole/win32ole_record.c b/ext/win32ole/win32ole_record.c
deleted file mode 100644
index 9e18653db99064..00000000000000
--- a/ext/win32ole/win32ole_record.c
+++ /dev/null
@@ -1,607 +0,0 @@
-#include "win32ole.h"
-
-struct olerecorddata {
-    IRecordInfo *pri;
-    void *pdata;
-};
-
-static HRESULT recordinfo_from_itypelib(ITypeLib *pTypeLib, VALUE name, IRecordInfo **ppri);
-static int hash2olerec(VALUE key, VALUE val, VALUE rec);
-static void olerecord_free(void *pvar);
-static size_t olerecord_size(const void *ptr);
-static VALUE folerecord_s_allocate(VALUE klass);
-static VALUE folerecord_initialize(VALUE self, VALUE typename, VALUE oleobj);
-static VALUE folerecord_to_h(VALUE self);
-static VALUE folerecord_typename(VALUE self);
-static VALUE olerecord_ivar_get(VALUE self, VALUE name);
-static VALUE olerecord_ivar_set(VALUE self, VALUE name, VALUE val);
-static VALUE folerecord_method_missing(int argc, VALUE *argv, VALUE self);
-static VALUE folerecord_ole_instance_variable_get(VALUE self, VALUE name);
-static VALUE folerecord_ole_instance_variable_set(VALUE self, VALUE name, VALUE val);
-static VALUE folerecord_inspect(VALUE self);
-
-static const rb_data_type_t olerecord_datatype = {
-    "win32ole_record",
-    {NULL, olerecord_free, olerecord_size,},
-    0, 0, RUBY_TYPED_FREE_IMMEDIATELY
-};
-
-static HRESULT
-recordinfo_from_itypelib(ITypeLib *pTypeLib, VALUE name, IRecordInfo **ppri)
-{
-
-    unsigned int count;
-    unsigned int i;
-    ITypeInfo *pTypeInfo;
-    HRESULT hr = OLE_E_LAST;
-    BSTR bstr;
-
-    count = pTypeLib->lpVtbl->GetTypeInfoCount(pTypeLib);
-    for (i = 0; i < count; i++) {
-        hr = pTypeLib->lpVtbl->GetDocumentation(pTypeLib, i,
-                                                &bstr, NULL, NULL, NULL);
-        if (FAILED(hr))
-            continue;
-
-        hr = pTypeLib->lpVtbl->GetTypeInfo(pTypeLib, i, &pTypeInfo);
-        if (FAILED(hr))
-            continue;
-
-        if (rb_str_cmp(WC2VSTR(bstr), name) == 0) {
-            hr = GetRecordInfoFromTypeInfo(pTypeInfo, ppri);
-            OLE_RELEASE(pTypeInfo);
-            return hr;
-        }
-        OLE_RELEASE(pTypeInfo);
-    }
-    hr = OLE_E_LAST;
-    return hr;
-}
-
-static int
-hash2olerec(VALUE key, VALUE val, VALUE rec)
-{
-    VARIANT var;
-    OLECHAR *pbuf;
-    struct olerecorddata *prec;
-    IRecordInfo *pri;
-    HRESULT hr;
-
-    if (val != Qnil) {
-        TypedData_Get_Struct(rec, struct olerecorddata, &olerecord_datatype, prec);
-        pri = prec->pri;
-        VariantInit(&var);
-        ole_val2variant(val, &var);
-        pbuf = ole_vstr2wc(key);
-        hr = pri->lpVtbl->PutField(pri, INVOKE_PROPERTYPUT, prec->pdata, pbuf, &var);
-        SysFreeString(pbuf);
-        VariantClear(&var);
-        if (FAILED(hr)) {
-            ole_raise(hr, eWIN32OLERuntimeError, "failed to putfield of `%s`", StringValuePtr(key));
-        }
-    }
-    return ST_CONTINUE;
-}
-
-void
-ole_rec2variant(VALUE rec, VARIANT *var)
-{
-    struct olerecorddata *prec;
-    ULONG size = 0;
-    IRecordInfo *pri;
-    HRESULT hr;
-    VALUE fields;
-    TypedData_Get_Struct(rec, struct olerecorddata, &olerecord_datatype, prec);
-    pri = prec->pri;
-    if (pri) {
-        hr = pri->lpVtbl->GetSize(pri, &size);
-        if (FAILED(hr)) {
-            ole_raise(hr, eWIN32OLERuntimeError, "failed to get size for allocation of VT_RECORD object");
-        }
-        if (prec->pdata) {
-            free(prec->pdata);
-        }
-        prec->pdata = ALLOC_N(char, size);
-        if (!prec->pdata) {
-            rb_raise(rb_eRuntimeError, "failed to memory allocation of %lu bytes", (unsigned long)size);
-        }
-        hr = pri->lpVtbl->RecordInit(pri, prec->pdata);
-        if (FAILED(hr)) {
-            ole_raise(hr, eWIN32OLERuntimeError, "failed to initialize VT_RECORD object");
-        }
-        fields = folerecord_to_h(rec);
-        rb_hash_foreach(fields, hash2olerec, rec);
-        V_RECORDINFO(var) = pri;
-        V_RECORD(var) = prec->pdata;
-        V_VT(var) = VT_RECORD;
-    } else {
-        rb_raise(eWIN32OLERuntimeError, "failed to retrieve IRecordInfo interface");
-    }
-}
-
-void
-olerecord_set_ivar(VALUE obj, IRecordInfo *pri, void *prec)
-{
-    HRESULT hr;
-    BSTR bstr;
-    BSTR *bstrs;
-    ULONG count = 0;
-    ULONG i;
-    VALUE fields;
-    VALUE val;
-    VARIANT var;
-    void *pdata = NULL;
-    struct olerecorddata *pvar;
-
-    TypedData_Get_Struct(obj, struct olerecorddata, &olerecord_datatype, pvar);
-    OLE_ADDREF(pri);
-    OLE_RELEASE(pvar->pri);
-    pvar->pri = pri;
-
-    hr = pri->lpVtbl->GetName(pri, &bstr);
-    if (SUCCEEDED(hr)) {
-        rb_ivar_set(obj, rb_intern("typename"), WC2VSTR(bstr));
-    }
-
-    hr = pri->lpVtbl->GetFieldNames(pri, &count, NULL);
-    if (FAILED(hr) || count == 0)
-        return;
-    bstrs = ALLOCA_N(BSTR, count);
-    hr = pri->lpVtbl->GetFieldNames(pri, &count, bstrs);
-    if (FAILED(hr)) {
-        return;
-    }
-
-    fields = rb_hash_new();
-    rb_ivar_set(obj, rb_intern("fields"), fields);
-    for (i = 0; i < count; i++) {
-        pdata = NULL;
-        VariantInit(&var);
-        val = Qnil;
-        if (prec) {
-            hr = pri->lpVtbl->GetFieldNoCopy(pri, prec, bstrs[i], &var, &pdata);
-            if (SUCCEEDED(hr)) {
-                val = ole_variant2val(&var);
-            }
-        }
-        rb_hash_aset(fields, WC2VSTR(bstrs[i]), val);
-    }
-}
-
-VALUE
-create_win32ole_record(IRecordInfo *pri, void *prec)
-{
-    VALUE obj = folerecord_s_allocate(cWIN32OLE_RECORD);
-    olerecord_set_ivar(obj, pri, prec);
-    return obj;
-}
-
-/*
- * Document-class: WIN32OLE_RECORD
- *
- *   <code>WIN32OLE_RECORD</code> objects represents VT_RECORD OLE variant.
- *   Win32OLE returns WIN32OLE_RECORD object if the result value of invoking
- *   OLE methods.
- *
- *   If COM server in VB.NET ComServer project is the following:
- *
- *     Imports System.Runtime.InteropServices
- *     Public Class ComClass
- *         Public Structure Book
- *             <MarshalAs(UnmanagedType.BStr)> _
- *             Public title As String
- *             Public cost As Integer
- *         End Structure
- *         Public Function getBook() As Book
- *             Dim book As New Book
- *             book.title = "The Ruby Book"
- *             book.cost = 20
- *             Return book
- *         End Function
- *     End Class
- *
- *   then, you can retrieve getBook return value from the following
- *   Ruby script:
- *
- *     require 'win32ole'
- *     obj = WIN32OLE.new('ComServer.ComClass')
- *     book = obj.getBook
- *     book.class # => WIN32OLE_RECORD
- *     book.title # => "The Ruby Book"
- *     book.cost  # => 20
- *
- */
-
-static void
-olerecord_free(void *ptr) {
-    struct olerecorddata *pvar = ptr;
-    OLE_FREE(pvar->pri);
-    if (pvar->pdata) {
-        free(pvar->pdata);
-    }
-    free(pvar);
-}
-
-static size_t
-olerecord_size(const void *ptr)
-{
-    const struct olerecorddata *pvar = ptr;
-    size_t s = 0;
-    ULONG size = 0;
-    HRESULT hr;
-    if (ptr) {
-        s += sizeof(struct olerecorddata);
-        if (pvar->pri) {
-            hr = pvar->pri->lpVtbl->GetSize(pvar->pri, &size);
-            if (SUCCEEDED(hr)) {
-                s += size;
-            }
-        }
-    }
-    return s;
-}
-
-static VALUE
-folerecord_s_allocate(VALUE klass) {
-    VALUE obj = Qnil;
-    struct olerecorddata *pvar;
-    obj = TypedData_Make_Struct(klass, struct olerecorddata, &olerecord_datatype, pvar);
-    pvar->pri = NULL;
-    pvar->pdata = NULL;
-    return obj;
-}
-
-/*
- * call-seq:
- *    WIN32OLE_RECORD.new(typename, obj) -> WIN32OLE_RECORD object
- *
- * Returns WIN32OLE_RECORD object. The first argument is struct name (String
- * or Symbol).
- * The second parameter obj should be WIN32OLE object or WIN32OLE_TYPELIB object.
- * If COM server in VB.NET ComServer project is the following:
- *
- *   Imports System.Runtime.InteropServices
- *   Public Class ComClass
- *       Public Structure Book
- *           <MarshalAs(UnmanagedType.BStr)> _
- *           Public title As String
- *           Public cost As Integer
- *       End Structure
- *   End Class
- *
- * then, you can create WIN32OLE_RECORD object is as following:
- *
- *   require 'win32ole'
- *   obj = WIN32OLE.new('ComServer.ComClass')
- *   book1 = WIN32OLE_RECORD.new('Book', obj) # => WIN32OLE_RECORD object
- *   tlib = obj.ole_typelib
- *   book2 = WIN32OLE_RECORD.new('Book', tlib) # => WIN32OLE_RECORD object
- *
- */
-static VALUE
-folerecord_initialize(VALUE self, VALUE typename, VALUE oleobj) {
-    HRESULT hr;
-    ITypeLib *pTypeLib = NULL;
-    IRecordInfo *pri = NULL;
-
-    if (!RB_TYPE_P(typename, T_STRING) && !RB_TYPE_P(typename, T_SYMBOL)) {
-        rb_raise(rb_eArgError, "1st argument should be String or Symbol");
-    }
-    if (RB_TYPE_P(typename, T_SYMBOL)) {
-        typename = rb_sym2str(typename);
-    }
-
-    hr = S_OK;
-    if(rb_obj_is_kind_of(oleobj, cWIN32OLE)) {
-        hr = typelib_from_val(oleobj, &pTypeLib);
-    } else if (rb_obj_is_kind_of(oleobj, cWIN32OLE_TYPELIB)) {
-        pTypeLib = itypelib(oleobj);
-        OLE_ADDREF(pTypeLib);
-        if (pTypeLib) {
-            hr = S_OK;
-        } else {
-            hr = E_FAIL;
-        }
-    } else {
-        rb_raise(rb_eArgError, "2nd argument should be WIN32OLE object or WIN32OLE_TYPELIB object");
-    }
-
-    if (FAILED(hr)) {
-        ole_raise(hr, eWIN32OLERuntimeError, "fail to query ITypeLib interface");
-    }
-
-    hr = recordinfo_from_itypelib(pTypeLib, typename, &pri);
-    OLE_RELEASE(pTypeLib);
-    if (FAILED(hr)) {
-        ole_raise(hr, eWIN32OLERuntimeError, "fail to query IRecordInfo interface for `%s'", StringValuePtr(typename));
-    }
-
-    olerecord_set_ivar(self, pri, NULL);
-
-    return self;
-}
-
-/*
- *  call-seq:
- *     WIN32OLE_RECORD#to_h #=> Ruby Hash object.
- *
- *  Returns Ruby Hash object which represents VT_RECORD variable.
- *  The keys of Hash object are member names of VT_RECORD OLE variable and
- *  the values of Hash object are values of VT_RECORD OLE variable.
- *
- *  If COM server in VB.NET ComServer project is the following:
- *
- *     Imports System.Runtime.InteropServices
- *     Public Class ComClass
- *         Public Structure Book
- *             <MarshalAs(UnmanagedType.BStr)> _
- *             Public title As String
- *             Public cost As Integer
- *         End Structure
- *         Public Function getBook() As Book
- *             Dim book As New Book
- *             book.title = "The Ruby Book"
- *             book.cost = 20
- *             Return book
- *         End Function
- *     End Class
- *
- *  then, the result of WIN32OLE_RECORD#to_h is the following:
- *
- *     require 'win32ole'
- *     obj = WIN32OLE.new('ComServer.ComClass')
- *     book = obj.getBook
- *     book.to_h # => {"title"=>"The Ruby Book", "cost"=>20}
- *
- */
-static VALUE
-folerecord_to_h(VALUE self)
-{
-    return rb_ivar_get(self, rb_intern("fields"));
-}
-
-/*
- *  call-seq:
- *     WIN32OLE_RECORD#typename #=> String object
- *
- *  Returns the type name of VT_RECORD OLE variable.
- *
- *  If COM server in VB.NET ComServer project is the following:
- *
- *     Imports System.Runtime.InteropServices
- *     Public Class ComClass
- *         Public Structure Book
- *             <MarshalAs(UnmanagedType.BStr)> _
- *             Public title As String
- *             Public cost As Integer
- *         End Structure
- *         Public Function getBook() As Book
- *             Dim book As New Book
- *             book.title = "The Ruby Book"
- *             book.cost = 20
- *             Return book
- *         End Function
- *     End Class
- *
- *  then, the result of WIN32OLE_RECORD#typename is the following:
- *
- *     require 'win32ole'
- *     obj = WIN32OLE.new('ComServer.ComClass')
- *     book = obj.getBook
- *     book.typename # => "Book"
- *
- */
-static VALUE
-folerecord_typename(VALUE self)
-{
-    return rb_ivar_get(self, rb_intern("typename"));
-}
-
-static VALUE
-olerecord_ivar_get(VALUE self, VALUE name)
-{
-    VALUE fields;
-    fields = rb_ivar_get(self, rb_intern("fields"));
-    return rb_hash_fetch(fields, name);
-}
-
-static VALUE
-olerecord_ivar_set(VALUE self, VALUE name, VALUE val)
-{
-    long len;
-    char *p;
-    VALUE fields;
-    len  = RSTRING_LEN(name);
-    p = RSTRING_PTR(name);
-    if (p[len-1] == '=') {
-        name = rb_str_subseq(name, 0, len-1);
-    }
-    fields = rb_ivar_get(self, rb_intern("fields"));
-    rb_hash_fetch(fields, name);
-    return rb_hash_aset(fields, name, val);
-}
-
-/*
- *  call-seq:
- *     WIN32OLE_RECORD#method_missing(name)
- *
- *  Returns value specified by the member name of VT_RECORD OLE variable.
- *  Or sets value specified by the member name of VT_RECORD OLE variable.
- *  If the member name is not correct, KeyError exception is raised.
- *
- *  If COM server in VB.NET ComServer project is the following:
- *
- *     Imports System.Runtime.InteropServices
- *     Public Class ComClass
- *         Public Structure Book
- *             <MarshalAs(UnmanagedType.BStr)> _
- *             Public title As String
- *             Public cost As Integer
- *         End Structure
- *     End Class
- *
- *  Then getting/setting value from Ruby is as the following:
- *
- *     obj = WIN32OLE.new('ComServer.ComClass')
- *     book = WIN32OLE_RECORD.new('Book', obj)
- *     book.title # => nil ( book.method_missing(:title) is invoked. )
- *     book.title = "Ruby" # ( book.method_missing(:title=, "Ruby") is invoked. )
- */
-static VALUE
-folerecord_method_missing(int argc, VALUE *argv, VALUE self)
-{
-    VALUE name;
-    rb_check_arity(argc, 1, 2);
-    name = rb_sym2str(argv[0]);
-
-#if SIZEOF_SIZE_T > SIZEOF_LONG
-    {
-        size_t n = strlen(StringValueCStr(name));
-        if (n >= LONG_MAX) {
-            rb_raise(rb_eRuntimeError, "too long member name");
-        }
-    }
-#endif
-
-    if (argc == 1) {
-        return olerecord_ivar_get(self, name);
-    } else if (argc == 2) {
-        return olerecord_ivar_set(self, name, argv[1]);
-    }
-    return Qnil;
-}
-
-/*
- *  call-seq:
- *     WIN32OLE_RECORD#ole_instance_variable_get(name)
- *
- *  Returns value specified by the member name of VT_RECORD OLE object.
- *  If the member name is not correct, KeyError exception is raised.
- *  If you can't access member variable of VT_RECORD OLE object directly,
- *  use this method.
- *
- *  If COM server in VB.NET ComServer project is the following:
- *
- *     Imports System.Runtime.InteropServices
- *     Public Class ComClass
- *         Public Structure ComObject
- *             Public object_id As Ineger
- *         End Structure
- *     End Class
- *
- *  and Ruby Object class has title attribute:
- *
- *  then accessing object_id of ComObject from Ruby is as the following:
- *
- *     srver = WIN32OLE.new('ComServer.ComClass')
- *     obj = WIN32OLE_RECORD.new('ComObject', server)
- *     # obj.object_id returns Ruby Object#object_id
- *     obj.ole_instance_variable_get(:object_id) # => nil
- *
- */
-static VALUE
-folerecord_ole_instance_variable_get(VALUE self, VALUE name)
-{
-    VALUE sname;
-    if(!RB_TYPE_P(name, T_STRING) && !RB_TYPE_P(name, T_SYMBOL)) {
-        rb_raise(rb_eTypeError, "wrong argument type (expected String or Symbol)");
-    }
-    sname = name;
-    if (RB_TYPE_P(name, T_SYMBOL)) {
-        sname = rb_sym2str(name);
-    }
-    return olerecord_ivar_get(self, sname);
-}
-
-/*
- *  call-seq:
- *     WIN32OLE_RECORD#ole_instance_variable_set(name, val)
- *
- *  Sets value specified by the member name of VT_RECORD OLE object.
- *  If the member name is not correct, KeyError exception is raised.
- *  If you can't set value of member of VT_RECORD OLE object directly,
- *  use this method.
- *
- *  If COM server in VB.NET ComServer project is the following:
- *
- *     Imports System.Runtime.InteropServices
- *     Public Class ComClass
- *         <MarshalAs(UnmanagedType.BStr)> _
- *         Public title As String
- *         Public cost As Integer
- *     End Class
- *
- *  then setting value of the `title' member is as following:
- *
- *     srver = WIN32OLE.new('ComServer.ComClass')
- *     obj = WIN32OLE_RECORD.new('Book', server)
- *     obj.ole_instance_variable_set(:title, "The Ruby Book")
- *
- */
-static VALUE
-folerecord_ole_instance_variable_set(VALUE self, VALUE name, VALUE val)
-{
-    VALUE sname;
-    if(!RB_TYPE_P(name, T_STRING) && !RB_TYPE_P(name, T_SYMBOL)) {
-        rb_raise(rb_eTypeError, "wrong argument type (expected String or Symbol)");
-    }
-    sname = name;
-    if (RB_TYPE_P(name, T_SYMBOL)) {
-        sname = rb_sym2str(name);
-    }
-    return olerecord_ivar_set(self, sname, val);
-}
-
-/*
- *  call-seq:
- *     WIN32OLE_RECORD#inspect -> String
- *
- *  Returns the OLE struct name and member name and the value of member
- *
- *  If COM server in VB.NET ComServer project is the following:
- *
- *     Imports System.Runtime.InteropServices
- *     Public Class ComClass
- *         <MarshalAs(UnmanagedType.BStr)> _
- *         Public title As String
- *         Public cost As Integer
- *     End Class
- *
- *  then
- *
- *     srver = WIN32OLE.new('ComServer.ComClass')
- *     obj = WIN32OLE_RECORD.new('Book', server)
- *     obj.inspect # => <WIN32OLE_RECORD(ComClass) {"title" => nil, "cost" => nil}>
- *
- */
-static VALUE
-folerecord_inspect(VALUE self)
-{
-    VALUE tname;
-    VALUE field;
-    tname = folerecord_typename(self);
-    if (tname == Qnil) {
-        tname = rb_inspect(tname);
-    }
-    field = rb_inspect(folerecord_to_h(self));
-    return rb_sprintf("#<WIN32OLE_RECORD(%"PRIsVALUE") %"PRIsVALUE">",
-                      tname,
-                      field);
-}
-
-VALUE cWIN32OLE_RECORD;
-
-void
-Init_win32ole_record(void)
-{
-    cWIN32OLE_RECORD = rb_define_class_under(cWIN32OLE, "Record", rb_cObject);
-    rb_define_const(rb_cObject, "WIN32OLE_RECORD", cWIN32OLE_RECORD);
-    rb_define_alloc_func(cWIN32OLE_RECORD, folerecord_s_allocate);
-    rb_define_method(cWIN32OLE_RECORD, "initialize", folerecord_initialize, 2);
-    rb_define_method(cWIN32OLE_RECORD, "to_h", folerecord_to_h, 0);
-    rb_define_method(cWIN32OLE_RECORD, "typename", folerecord_typename, 0);
-    rb_define_method(cWIN32OLE_RECORD, "method_missing", folerecord_method_missing, -1);
-    rb_define_method(cWIN32OLE_RECORD, "ole_instance_variable_get", folerecord_ole_instance_variable_get, 1);
-    rb_define_method(cWIN32OLE_RECORD, "ole_instance_variable_set", folerecord_ole_instance_variable_set, 2);
-    rb_define_method(cWIN32OLE_RECORD, "inspect", folerecord_inspect, 0);
-}
diff --git a/ext/win32ole/win32ole_record.h b/ext/win32ole/win32ole_record.h
deleted file mode 100644
index ab1df0ee7fd1ec..00000000000000
--- a/ext/win32ole/win32ole_record.h
+++ /dev/null
@@ -1,10 +0,0 @@
-#ifndef WIN32OLE_RECORD_H
-#define WIN32OLE_RECORD_H 1
-
-extern VALUE cWIN32OLE_RECORD;
-void ole_rec2variant(VALUE rec, VARIANT *var);
-void olerecord_set_ivar(VALUE obj, IRecordInfo *pri, void *prec);
-VALUE create_win32ole_record(IRecordInfo *pri, void *prec);
-void Init_win32ole_record(void);
-
-#endif
diff --git a/ext/win32ole/win32ole_type.c b/ext/win32ole/win32ole_type.c
deleted file mode 100644
index 1b96aea858787d..00000000000000
--- a/ext/win32ole/win32ole_type.c
+++ /dev/null
@@ -1,918 +0,0 @@
-#include "win32ole.h"
-
-struct oletypedata {
-    ITypeInfo *pTypeInfo;
-};
-
-static void oletype_free(void *ptr);
-static size_t oletype_size(const void *ptr);
-static VALUE foletype_s_ole_classes(VALUE self, VALUE typelib);
-static VALUE foletype_s_typelibs(VALUE self);
-static VALUE foletype_s_progids(VALUE self);
-static VALUE oletype_set_member(VALUE self, ITypeInfo *pTypeInfo, VALUE name);
-static VALUE foletype_s_allocate(VALUE klass);
-static VALUE oleclass_from_typelib(VALUE self, ITypeLib *pTypeLib, VALUE oleclass);
-static VALUE foletype_initialize(VALUE self, VALUE typelib, VALUE oleclass);
-static VALUE foletype_name(VALUE self);
-static VALUE ole_ole_type(ITypeInfo *pTypeInfo);
-static VALUE foletype_ole_type(VALUE self);
-static VALUE ole_type_guid(ITypeInfo *pTypeInfo);
-static VALUE foletype_guid(VALUE self);
-static VALUE ole_type_progid(ITypeInfo *pTypeInfo);
-static VALUE foletype_progid(VALUE self);
-static VALUE ole_type_visible(ITypeInfo *pTypeInfo);
-static VALUE foletype_visible(VALUE self);
-static VALUE ole_type_major_version(ITypeInfo *pTypeInfo);
-static VALUE foletype_major_version(VALUE self);
-static VALUE ole_type_minor_version(ITypeInfo *pTypeInfo);
-static VALUE foletype_minor_version(VALUE self);
-static VALUE ole_type_typekind(ITypeInfo *pTypeInfo);
-static VALUE foletype_typekind(VALUE self);
-static VALUE ole_type_helpstring(ITypeInfo *pTypeInfo);
-static VALUE foletype_helpstring(VALUE self);
-static VALUE ole_type_src_type(ITypeInfo *pTypeInfo);
-static VALUE foletype_src_type(VALUE self);
-static VALUE ole_type_helpfile(ITypeInfo *pTypeInfo);
-static VALUE foletype_helpfile(VALUE self);
-static VALUE ole_type_helpcontext(ITypeInfo *pTypeInfo);
-static VALUE foletype_helpcontext(VALUE self);
-static VALUE ole_variables(ITypeInfo *pTypeInfo);
-static VALUE foletype_variables(VALUE self);
-static VALUE foletype_methods(VALUE self);
-static VALUE foletype_ole_typelib(VALUE self);
-static VALUE ole_type_impl_ole_types(ITypeInfo *pTypeInfo, int implflags);
-static VALUE foletype_impl_ole_types(VALUE self);
-static VALUE foletype_source_ole_types(VALUE self);
-static VALUE foletype_default_event_sources(VALUE self);
-static VALUE foletype_default_ole_types(VALUE self);
-static VALUE foletype_inspect(VALUE self);
-
-static const rb_data_type_t oletype_datatype = {
-    "win32ole_type",
-    {NULL, oletype_free, oletype_size,},
-    0, 0, RUBY_TYPED_FREE_IMMEDIATELY
-};
-
-/*
- * Document-class: WIN32OLE_TYPE
- *
- *   <code>WIN32OLE_TYPE</code> objects represent OLE type library information.
- */
-
-static void
-oletype_free(void *ptr)
-{
-    struct oletypedata *poletype = ptr;
-    OLE_FREE(poletype->pTypeInfo);
-    free(poletype);
-}
-
-static size_t
-oletype_size(const void *ptr)
-{
-    return ptr ? sizeof(struct oletypedata) : 0;
-}
-
-ITypeInfo *itypeinfo(VALUE self)
-{
-    struct oletypedata *ptype;
-    TypedData_Get_Struct(self, struct oletypedata, &oletype_datatype, ptype);
-    return ptype->pTypeInfo;
-}
-
-VALUE
-ole_type_from_itypeinfo(ITypeInfo *pTypeInfo)
-{
-    ITypeLib *pTypeLib;
-    VALUE type = Qnil;
-    HRESULT hr;
-    unsigned int index;
-    BSTR bstr;
-
-    hr = pTypeInfo->lpVtbl->GetContainingTypeLib( pTypeInfo, &pTypeLib, &index );
-    if(FAILED(hr)) {
-        return Qnil;
-    }
-    hr = pTypeLib->lpVtbl->GetDocumentation( pTypeLib, index,
-                                             &bstr, NULL, NULL, NULL);
-    OLE_RELEASE(pTypeLib);
-    if (FAILED(hr)) {
-        return Qnil;
-    }
-    type = create_win32ole_type(pTypeInfo, WC2VSTR(bstr));
-    return type;
-}
-
-
-/*
- *   call-seq:
- *      WIN32OLE_TYPE.ole_classes(typelib)
- *
- *   Returns array of WIN32OLE_TYPE objects defined by the <i>typelib</i> type library.
- *   This method will be OBSOLETE. Use WIN32OLE_TYPELIB.new(typelib).ole_classes instead.
- */
-static VALUE
-foletype_s_ole_classes(VALUE self, VALUE typelib)
-{
-    VALUE obj;
-
-    /*
-    rb_warn("%s is obsolete; use %s instead.",
-            "WIN32OLE_TYPE.ole_classes",
-            "WIN32OLE_TYPELIB.new(typelib).ole_types");
-    */
-    obj = rb_funcall(cWIN32OLE_TYPELIB, rb_intern("new"), 1, typelib);
-    return rb_funcall(obj, rb_intern("ole_types"), 0);
-}
-
-/*
- *  call-seq:
- *     WIN32OLE_TYPE.typelibs
- *
- *  Returns array of type libraries.
- *  This method will be OBSOLETE. Use WIN32OLE_TYPELIB.typelibs.collect{|t| t.name} instead.
- *
- */
-static VALUE
-foletype_s_typelibs(VALUE self)
-{
-    /*
-    rb_warn("%s is obsolete. use %s instead.",
-            "WIN32OLE_TYPE.typelibs",
-            "WIN32OLE_TYPELIB.typelibs.collect{t|t.name}");
-    */
-    return rb_eval_string("WIN32OLE_TYPELIB.typelibs.collect{|t|t.name}");
-}
-
-/*
- *  call-seq:
- *     WIN32OLE_TYPE.progids
- *
- *  Returns array of ProgID.
- */
-static VALUE
-foletype_s_progids(VALUE self)
-{
-    HKEY hclsids, hclsid;
-    DWORD i;
-    LONG err;
-    VALUE clsid;
-    VALUE v = rb_str_new2("");
-    VALUE progids = rb_ary_new();
-
-    err = reg_open_key(HKEY_CLASSES_ROOT, "CLSID", &hclsids);
-    if(err != ERROR_SUCCESS) {
-        return progids;
-    }
-    for(i = 0; ; i++) {
-        clsid = reg_enum_key(hclsids, i);
-        if (clsid == Qnil)
-            break;
-        err = reg_open_vkey(hclsids, clsid, &hclsid);
-        if (err != ERROR_SUCCESS)
-            continue;
-        if ((v = reg_get_val2(hclsid, "ProgID")) != Qnil)
-            rb_ary_push(progids, v);
-        if ((v = reg_get_val2(hclsid, "VersionIndependentProgID")) != Qnil)
-            rb_ary_push(progids, v);
-        RegCloseKey(hclsid);
-    }
-    RegCloseKey(hclsids);
-    return progids;
-}
-
-static VALUE
-oletype_set_member(VALUE self, ITypeInfo *pTypeInfo, VALUE name)
-{
-    struct oletypedata *ptype;
-    TypedData_Get_Struct(self, struct oletypedata, &oletype_datatype, ptype);
-    rb_ivar_set(self, rb_intern("name"), name);
-    ptype->pTypeInfo = pTypeInfo;
-    OLE_ADDREF(pTypeInfo);
-    return self;
-}
-
-static VALUE
-foletype_s_allocate(VALUE klass)
-{
-    struct oletypedata *poletype;
-    VALUE obj;
-    ole_initialize();
-    obj = TypedData_Make_Struct(klass,struct oletypedata, &oletype_datatype, poletype);
-    poletype->pTypeInfo = NULL;
-    return obj;
-}
-
-VALUE
-create_win32ole_type(ITypeInfo *pTypeInfo, VALUE name)
-{
-    VALUE obj = foletype_s_allocate(cWIN32OLE_TYPE);
-    oletype_set_member(obj, pTypeInfo, name);
-    return obj;
-}
-
-static VALUE
-oleclass_from_typelib(VALUE self, ITypeLib *pTypeLib, VALUE oleclass)
-{
-
-    long count;
-    int i;
-    HRESULT hr;
-    BSTR bstr;
-    VALUE typelib;
-    ITypeInfo *pTypeInfo;
-
-    VALUE found = Qfalse;
-
-    count = pTypeLib->lpVtbl->GetTypeInfoCount(pTypeLib);
-    for (i = 0; i < count && found == Qfalse; i++) {
-        hr = pTypeLib->lpVtbl->GetTypeInfo(pTypeLib, i, &pTypeInfo);
-        if (FAILED(hr))
-            continue;
-        hr = pTypeLib->lpVtbl->GetDocumentation(pTypeLib, i,
-                                                &bstr, NULL, NULL, NULL);
-        if (FAILED(hr))
-            continue;
-        typelib = WC2VSTR(bstr);
-        if (rb_str_cmp(oleclass, typelib) == 0) {
-            oletype_set_member(self, pTypeInfo, typelib);
-            found = Qtrue;
-        }
-        OLE_RELEASE(pTypeInfo);
-    }
-    return found;
-}
-
-/*
- *  call-seq:
- *     WIN32OLE_TYPE.new(typelib, ole_class) -> WIN32OLE_TYPE object
- *
- *  Returns a new WIN32OLE_TYPE object.
- *  The first argument <i>typelib</i> specifies OLE type library name.
- *  The second argument specifies OLE class name.
- *
- *      WIN32OLE_TYPE.new('Microsoft Excel 9.0 Object Library', 'Application')
- *          # => WIN32OLE_TYPE object of Application class of Excel.
- */
-static VALUE
-foletype_initialize(VALUE self, VALUE typelib, VALUE oleclass)
-{
-    VALUE file;
-    OLECHAR * pbuf;
-    ITypeLib *pTypeLib;
-    HRESULT hr;
-
-    SafeStringValue(oleclass);
-    SafeStringValue(typelib);
-    file = typelib_file(typelib);
-    if (file == Qnil) {
-        file = typelib;
-    }
-    pbuf = ole_vstr2wc(file);
-    hr = LoadTypeLibEx(pbuf, REGKIND_NONE, &pTypeLib);
-    if (FAILED(hr))
-        ole_raise(hr, eWIN32OLERuntimeError, "failed to LoadTypeLibEx");
-    SysFreeString(pbuf);
-    if (oleclass_from_typelib(self, pTypeLib, oleclass) == Qfalse) {
-        OLE_RELEASE(pTypeLib);
-        rb_raise(eWIN32OLERuntimeError, "not found `%s` in `%s`",
-                 StringValuePtr(oleclass), StringValuePtr(typelib));
-    }
-    OLE_RELEASE(pTypeLib);
-    return self;
-}
-
-/*
- * call-seq:
- *    WIN32OLE_TYPE#name #=> OLE type name
- *
- * Returns OLE type name.
- *    tobj = WIN32OLE_TYPE.new('Microsoft Excel 9.0 Object Library', 'Application')
- *    puts tobj.name  # => Application
- */
-static VALUE
-foletype_name(VALUE self)
-{
-    return rb_ivar_get(self, rb_intern("name"));
-}
-
-static VALUE
-ole_ole_type(ITypeInfo *pTypeInfo)
-{
-    HRESULT hr;
-    TYPEATTR *pTypeAttr;
-    VALUE type = Qnil;
-    hr = OLE_GET_TYPEATTR(pTypeInfo, &pTypeAttr);
-    if(FAILED(hr)){
-        return type;
-    }
-    switch(pTypeAttr->typekind) {
-    case TKIND_ENUM:
-        type = rb_str_new2("Enum");
-        break;
-    case TKIND_RECORD:
-        type = rb_str_new2("Record");
-        break;
-    case TKIND_MODULE:
-        type = rb_str_new2("Module");
-        break;
-    case TKIND_INTERFACE:
-        type = rb_str_new2("Interface");
-        break;
-    case TKIND_DISPATCH:
-        type = rb_str_new2("Dispatch");
-        break;
-    case TKIND_COCLASS:
-        type = rb_str_new2("Class");
-        break;
-    case TKIND_ALIAS:
-        type = rb_str_new2("Alias");
-        break;
-    case TKIND_UNION:
-        type = rb_str_new2("Union");
-        break;
-    case TKIND_MAX:
-        type = rb_str_new2("Max");
-        break;
-    default:
-        type = Qnil;
-        break;
-    }
-    OLE_RELEASE_TYPEATTR(pTypeInfo, pTypeAttr);
-    return type;
-}
-
-/*
- *  call-seq:
- *     WIN32OLE_TYPE#ole_type #=> OLE type string.
- *
- *  returns type of OLE class.
- *    tobj = WIN32OLE_TYPE.new('Microsoft Excel 9.0 Object Library', 'Application')
- *    puts tobj.ole_type  # => Class
- */
-static VALUE
-foletype_ole_type(VALUE self)
-{
-    ITypeInfo *pTypeInfo = itypeinfo(self);
-    return ole_ole_type(pTypeInfo);
-}
-
-static VALUE
-ole_type_guid(ITypeInfo *pTypeInfo)
-{
-    HRESULT hr;
-    TYPEATTR *pTypeAttr;
-    int len;
-    OLECHAR bstr[80];
-    VALUE guid = Qnil;
-    hr = OLE_GET_TYPEATTR(pTypeInfo, &pTypeAttr);
-    if (FAILED(hr))
-        return guid;
-    len = StringFromGUID2(&pTypeAttr->guid, bstr, sizeof(bstr)/sizeof(OLECHAR));
-    if (len > 3) {
-        guid = ole_wc2vstr(bstr, FALSE);
-    }
-    OLE_RELEASE_TYPEATTR(pTypeInfo, pTypeAttr);
-    return guid;
-}
-
-/*
- *  call-seq:
- *     WIN32OLE_TYPE#guid  #=> GUID
- *
- *  Returns GUID.
- *    tobj = WIN32OLE_TYPE.new('Microsoft Excel 9.0 Object Library', 'Application')
- *    puts tobj.guid  # => {00024500-0000-0000-C000-000000000046}
- */
-static VALUE
-foletype_guid(VALUE self)
-{
-    ITypeInfo *pTypeInfo = itypeinfo(self);
-    return ole_type_guid(pTypeInfo);
-}
-
-static VALUE
-ole_type_progid(ITypeInfo *pTypeInfo)
-{
-    HRESULT hr;
-    TYPEATTR *pTypeAttr;
-    OLECHAR *pbuf;
-    VALUE progid = Qnil;
-    hr = OLE_GET_TYPEATTR(pTypeInfo, &pTypeAttr);
-    if (FAILED(hr))
-        return progid;
-    hr = ProgIDFromCLSID(&pTypeAttr->guid, &pbuf);
-    if (SUCCEEDED(hr)) {
-        progid = ole_wc2vstr(pbuf, FALSE);
-        CoTaskMemFree(pbuf);
-    }
-    OLE_RELEASE_TYPEATTR(pTypeInfo, pTypeAttr);
-    return progid;
-}
-
-/*
- * call-seq:
- *    WIN32OLE_TYPE#progid  #=> ProgID
- *
- * Returns ProgID if it exists. If not found, then returns nil.
- *    tobj = WIN32OLE_TYPE.new('Microsoft Excel 9.0 Object Library', 'Application')
- *    puts tobj.progid  # =>   Excel.Application.9
- */
-static VALUE
-foletype_progid(VALUE self)
-{
-    ITypeInfo *pTypeInfo = itypeinfo(self);
-    return ole_type_progid(pTypeInfo);
-}
-
-
-static VALUE
-ole_type_visible(ITypeInfo *pTypeInfo)
-{
-    HRESULT hr;
-    TYPEATTR *pTypeAttr;
-    VALUE visible;
-    hr = OLE_GET_TYPEATTR(pTypeInfo, &pTypeAttr);
-    if (FAILED(hr))
-        return Qtrue;
-    if (pTypeAttr->wTypeFlags & (TYPEFLAG_FHIDDEN | TYPEFLAG_FRESTRICTED)) {
-        visible = Qfalse;
-    } else {
-        visible = Qtrue;
-    }
-    OLE_RELEASE_TYPEATTR(pTypeInfo, pTypeAttr);
-    return visible;
-}
-
-/*
- *  call-seq:
- *    WIN32OLE_TYPE#visible?  #=> true or false
- *
- *  Returns true if the OLE class is public.
- *    tobj = WIN32OLE_TYPE.new('Microsoft Excel 9.0 Object Library', 'Application')
- *    puts tobj.visible  # => true
- */
-static VALUE
-foletype_visible(VALUE self)
-{
-    ITypeInfo *pTypeInfo = itypeinfo(self);
-    return ole_type_visible(pTypeInfo);
-}
-
-static VALUE
-ole_type_major_version(ITypeInfo *pTypeInfo)
-{
-    VALUE ver;
-    TYPEATTR *pTypeAttr;
-    HRESULT hr;
-    hr = OLE_GET_TYPEATTR(pTypeInfo, &pTypeAttr);
-    if (FAILED(hr))
-        ole_raise(hr, eWIN32OLERuntimeError, "failed to GetTypeAttr");
-    ver = RB_INT2FIX(pTypeAttr->wMajorVerNum);
-    OLE_RELEASE_TYPEATTR(pTypeInfo, pTypeAttr);
-    return ver;
-}
-
-/*
- *  call-seq:
- *     WIN32OLE_TYPE#major_version
- *
- *  Returns major version.
- *     tobj = WIN32OLE_TYPE.new('Microsoft Word 10.0 Object Library', 'Documents')
- *     puts tobj.major_version # => 8
- */
-static VALUE
-foletype_major_version(VALUE self)
-{
-    ITypeInfo *pTypeInfo = itypeinfo(self);
-    return ole_type_major_version(pTypeInfo);
-}
-
-static VALUE
-ole_type_minor_version(ITypeInfo *pTypeInfo)
-{
-    VALUE ver;
-    TYPEATTR *pTypeAttr;
-    HRESULT hr;
-    hr = OLE_GET_TYPEATTR(pTypeInfo, &pTypeAttr);
-    if (FAILED(hr))
-        ole_raise(hr, eWIN32OLERuntimeError, "failed to GetTypeAttr");
-    ver = RB_INT2FIX(pTypeAttr->wMinorVerNum);
-    OLE_RELEASE_TYPEATTR(pTypeInfo, pTypeAttr);
-    return ver;
-}
-
-/*
- *  call-seq:
- *    WIN32OLE_TYPE#minor_version #=> OLE minor version
- *
- *  Returns minor version.
- *     tobj = WIN32OLE_TYPE.new('Microsoft Word 10.0 Object Library', 'Documents')
- *     puts tobj.minor_version # => 2
- */
-static VALUE
-foletype_minor_version(VALUE self)
-{
-    ITypeInfo *pTypeInfo = itypeinfo(self);
-    return ole_type_minor_version(pTypeInfo);
-}
-
-static VALUE
-ole_type_typekind(ITypeInfo *pTypeInfo)
-{
-    VALUE typekind;
-    TYPEATTR *pTypeAttr;
-    HRESULT hr;
-    hr = OLE_GET_TYPEATTR(pTypeInfo, &pTypeAttr);
-    if (FAILED(hr))
-        ole_raise(hr, eWIN32OLERuntimeError, "failed to GetTypeAttr");
-    typekind = RB_INT2FIX(pTypeAttr->typekind);
-    OLE_RELEASE_TYPEATTR(pTypeInfo, pTypeAttr);
-    return typekind;
-}
-
-/*
- *  call-seq:
- *    WIN32OLE_TYPE#typekind #=> number of type.
- *
- *  Returns number which represents type.
- *    tobj = WIN32OLE_TYPE.new('Microsoft Word 10.0 Object Library', 'Documents')
- *    puts tobj.typekind # => 4
- *
- */
-static VALUE
-foletype_typekind(VALUE self)
-{
-    ITypeInfo *pTypeInfo = itypeinfo(self);
-    return ole_type_typekind(pTypeInfo);
-}
-
-static VALUE
-ole_type_helpstring(ITypeInfo *pTypeInfo)
-{
-    HRESULT hr;
-    BSTR bhelpstr;
-    hr = ole_docinfo_from_type(pTypeInfo, NULL, &bhelpstr, NULL, NULL);
-    if(FAILED(hr)) {
-        return Qnil;
-    }
-    return WC2VSTR(bhelpstr);
-}
-
-/*
- *  call-seq:
- *    WIN32OLE_TYPE#helpstring #=> help string.
- *
- *  Returns help string.
- *    tobj = WIN32OLE_TYPE.new('Microsoft Internet Controls', 'IWebBrowser')
- *    puts tobj.helpstring # => Web Browser interface
- */
-static VALUE
-foletype_helpstring(VALUE self)
-{
-    ITypeInfo *pTypeInfo = itypeinfo(self);
-    return ole_type_helpstring(pTypeInfo);
-}
-
-static VALUE
-ole_type_src_type(ITypeInfo *pTypeInfo)
-{
-    HRESULT hr;
-    TYPEATTR *pTypeAttr;
-    VALUE alias = Qnil;
-    hr = OLE_GET_TYPEATTR(pTypeInfo, &pTypeAttr);
-    if (FAILED(hr))
-        return alias;
-    if(pTypeAttr->typekind != TKIND_ALIAS) {
-        OLE_RELEASE_TYPEATTR(pTypeInfo, pTypeAttr);
-        return alias;
-    }
-    alias = ole_typedesc2val(pTypeInfo, &(pTypeAttr->tdescAlias), Qnil);
-    OLE_RELEASE_TYPEATTR(pTypeInfo, pTypeAttr);
-    return alias;
-}
-
-/*
- *  call-seq:
- *     WIN32OLE_TYPE#src_type #=> OLE source class
- *
- *  Returns source class when the OLE class is 'Alias'.
- *     tobj =  WIN32OLE_TYPE.new('Microsoft Office 9.0 Object Library', 'MsoRGBType')
- *     puts tobj.src_type # => I4
- *
- */
-static VALUE
-foletype_src_type(VALUE self)
-{
-    ITypeInfo *pTypeInfo = itypeinfo(self);
-    return ole_type_src_type(pTypeInfo);
-}
-
-static VALUE
-ole_type_helpfile(ITypeInfo *pTypeInfo)
-{
-    HRESULT hr;
-    BSTR bhelpfile;
-    hr = ole_docinfo_from_type(pTypeInfo, NULL, NULL, NULL, &bhelpfile);
-    if(FAILED(hr)) {
-        return Qnil;
-    }
-    return WC2VSTR(bhelpfile);
-}
-
-/*
- *  call-seq:
- *     WIN32OLE_TYPE#helpfile
- *
- *  Returns helpfile path. If helpfile is not found, then returns nil.
- *     tobj = WIN32OLE_TYPE.new('Microsoft Excel 9.0 Object Library', 'Worksheet')
- *     puts tobj.helpfile # => C:\...\VBAXL9.CHM
- *
- */
-static VALUE
-foletype_helpfile(VALUE self)
-{
-    ITypeInfo *pTypeInfo = itypeinfo(self);
-    return ole_type_helpfile(pTypeInfo);
-}
-
-static VALUE
-ole_type_helpcontext(ITypeInfo *pTypeInfo)
-{
-    HRESULT hr;
-    DWORD helpcontext;
-    hr = ole_docinfo_from_type(pTypeInfo, NULL, NULL,
-                               &helpcontext, NULL);
-    if(FAILED(hr))
-        return Qnil;
-    return RB_INT2FIX(helpcontext);
-}
-
-/*
- *  call-seq:
- *     WIN32OLE_TYPE#helpcontext
- *
- *  Returns helpcontext. If helpcontext is not found, then returns nil.
- *     tobj = WIN32OLE_TYPE.new('Microsoft Excel 9.0 Object Library', 'Worksheet')
- *     puts tobj.helpfile # => 131185
- */
-static VALUE
-foletype_helpcontext(VALUE self)
-{
-    ITypeInfo *pTypeInfo = itypeinfo(self);
-    return ole_type_helpcontext(pTypeInfo);
-}
-
-static VALUE
-ole_variables(ITypeInfo *pTypeInfo)
-{
-    HRESULT hr;
-    TYPEATTR *pTypeAttr;
-    WORD i;
-    UINT len;
-    BSTR bstr;
-    VARDESC *pVarDesc;
-    VALUE var;
-    VALUE variables = rb_ary_new();
-    hr = OLE_GET_TYPEATTR(pTypeInfo, &pTypeAttr);
-    if (FAILED(hr)) {
-        ole_raise(hr, eWIN32OLERuntimeError, "failed to GetTypeAttr");
-    }
-
-    for(i = 0; i < pTypeAttr->cVars; i++) {
-        hr = pTypeInfo->lpVtbl->GetVarDesc(pTypeInfo, i, &pVarDesc);
-        if(FAILED(hr))
-            continue;
-        len = 0;
-        hr = pTypeInfo->lpVtbl->GetNames(pTypeInfo, pVarDesc->memid, &bstr,
-                                         1, &len);
-        if(FAILED(hr) || len == 0 || !bstr)
-            continue;
-
-        var = create_win32ole_variable(pTypeInfo, i, WC2VSTR(bstr));
-        rb_ary_push(variables, var);
-
-        pTypeInfo->lpVtbl->ReleaseVarDesc(pTypeInfo, pVarDesc);
-        pVarDesc = NULL;
-    }
-    OLE_RELEASE_TYPEATTR(pTypeInfo, pTypeAttr);
-    return variables;
-}
-
-/*
- *  call-seq:
- *     WIN32OLE_TYPE#variables
- *
- *  Returns array of WIN32OLE_VARIABLE objects which represent variables
- *  defined in OLE class.
- *     tobj = WIN32OLE_TYPE.new('Microsoft Excel 9.0 Object Library', 'XlSheetType')
- *     vars = tobj.variables
- *     vars.each do |v|
- *       puts "#{v.name} = #{v.value}"
- *     end
- *
- *     The result of above sample script is follows:
- *       xlChart = -4109
- *       xlDialogSheet = -4116
- *       xlExcel4IntlMacroSheet = 4
- *       xlExcel4MacroSheet = 3
- *       xlWorksheet = -4167
- *
- */
-static VALUE
-foletype_variables(VALUE self)
-{
-    ITypeInfo *pTypeInfo = itypeinfo(self);
-    return ole_variables(pTypeInfo);
-}
-
-/*
- *  call-seq:
- *     WIN32OLE_TYPE#ole_methods # the array of WIN32OLE_METHOD objects.
- *
- *  Returns array of WIN32OLE_METHOD objects which represent OLE method defined in
- *  OLE type library.
- *    tobj = WIN32OLE_TYPE.new('Microsoft Excel 9.0 Object Library', 'Worksheet')
- *    methods = tobj.ole_methods.collect{|m|
- *      m.name
- *    }
- *    # => ['Activate', 'Copy', 'Delete',....]
- */
-static VALUE
-foletype_methods(VALUE self)
-{
-    ITypeInfo *pTypeInfo = itypeinfo(self);
-    return ole_methods_from_typeinfo(pTypeInfo, INVOKE_FUNC | INVOKE_PROPERTYGET | INVOKE_PROPERTYPUT | INVOKE_PROPERTYPUTREF);
-}
-
-/*
- *  call-seq:
- *     WIN32OLE_TYPE#ole_typelib
- *
- *  Returns the WIN32OLE_TYPELIB object which is including the WIN32OLE_TYPE
- *  object. If it is not found, then returns nil.
- *     tobj = WIN32OLE_TYPE.new('Microsoft Excel 9.0 Object Library', 'Worksheet')
- *     puts tobj.ole_typelib # => 'Microsoft Excel 9.0 Object Library'
- */
-static VALUE
-foletype_ole_typelib(VALUE self)
-{
-    ITypeInfo *pTypeInfo = itypeinfo(self);
-    return ole_typelib_from_itypeinfo(pTypeInfo);
-}
-
-static VALUE
-ole_type_impl_ole_types(ITypeInfo *pTypeInfo, int implflags)
-{
-    HRESULT hr;
-    ITypeInfo *pRefTypeInfo;
-    HREFTYPE href;
-    WORD i;
-    VALUE type;
-    TYPEATTR *pTypeAttr;
-    int flags;
-
-    VALUE types = rb_ary_new();
-    hr = OLE_GET_TYPEATTR(pTypeInfo, &pTypeAttr);
-    if (FAILED(hr)) {
-        return types;
-    }
-    for (i = 0; i < pTypeAttr->cImplTypes; i++) {
-        hr = pTypeInfo->lpVtbl->GetImplTypeFlags(pTypeInfo, i, &flags);
-        if (FAILED(hr))
-            continue;
-
-        hr = pTypeInfo->lpVtbl->GetRefTypeOfImplType(pTypeInfo, i, &href);
-        if (FAILED(hr))
-            continue;
-        hr = pTypeInfo->lpVtbl->GetRefTypeInfo(pTypeInfo, href, &pRefTypeInfo);
-        if (FAILED(hr))
-            continue;
-
-        if ((flags & implflags) == implflags) {
-            type = ole_type_from_itypeinfo(pRefTypeInfo);
-            if (type != Qnil) {
-                rb_ary_push(types, type);
-            }
-        }
-
-        OLE_RELEASE(pRefTypeInfo);
-    }
-    OLE_RELEASE_TYPEATTR(pTypeInfo, pTypeAttr);
-    return types;
-}
-
-/*
- *  call-seq:
- *     WIN32OLE_TYPE#implemented_ole_types
- *
- *  Returns the array of WIN32OLE_TYPE object which is implemented by the WIN32OLE_TYPE
- *  object.
- *     tobj = WIN32OLE_TYPE.new('Microsoft Excel 9.0 Object Library', 'Worksheet')
- *     p tobj.implemented_ole_types # => [_Worksheet, DocEvents]
- */
-static VALUE
-foletype_impl_ole_types(VALUE self)
-{
-    ITypeInfo *pTypeInfo = itypeinfo(self);
-    return ole_type_impl_ole_types(pTypeInfo, 0);
-}
-
-/*
- *  call-seq:
- *     WIN32OLE_TYPE#source_ole_types
- *
- *  Returns the array of WIN32OLE_TYPE object which is implemented by the WIN32OLE_TYPE
- *  object and having IMPLTYPEFLAG_FSOURCE.
- *     tobj = WIN32OLE_TYPE.new('Microsoft Internet Controls', "InternetExplorer")
- *     p tobj.source_ole_types
- *     # => [#<WIN32OLE_TYPE:DWebBrowserEvents2>, #<WIN32OLE_TYPE:DWebBrowserEvents>]
- */
-static VALUE
-foletype_source_ole_types(VALUE self)
-{
-    ITypeInfo *pTypeInfo = itypeinfo(self);
-    return ole_type_impl_ole_types(pTypeInfo, IMPLTYPEFLAG_FSOURCE);
-}
-
-/*
- *  call-seq:
- *     WIN32OLE_TYPE#default_event_sources
- *
- *  Returns the array of WIN32OLE_TYPE object which is implemented by the WIN32OLE_TYPE
- *  object and having IMPLTYPEFLAG_FSOURCE and IMPLTYPEFLAG_FDEFAULT.
- *     tobj = WIN32OLE_TYPE.new('Microsoft Internet Controls', "InternetExplorer")
- *     p tobj.default_event_sources  # => [#<WIN32OLE_TYPE:DWebBrowserEvents2>]
- */
-static VALUE
-foletype_default_event_sources(VALUE self)
-{
-    ITypeInfo *pTypeInfo = itypeinfo(self);
-    return ole_type_impl_ole_types(pTypeInfo, IMPLTYPEFLAG_FSOURCE|IMPLTYPEFLAG_FDEFAULT);
-}
-
-/*
- *  call-seq:
- *     WIN32OLE_TYPE#default_ole_types
- *
- *  Returns the array of WIN32OLE_TYPE object which is implemented by the WIN32OLE_TYPE
- *  object and having IMPLTYPEFLAG_FDEFAULT.
- *     tobj = WIN32OLE_TYPE.new('Microsoft Internet Controls', "InternetExplorer")
- *     p tobj.default_ole_types
- *     # => [#<WIN32OLE_TYPE:IWebBrowser2>, #<WIN32OLE_TYPE:DWebBrowserEvents2>]
- */
-static VALUE
-foletype_default_ole_types(VALUE self)
-{
-    ITypeInfo *pTypeInfo = itypeinfo(self);
-    return ole_type_impl_ole_types(pTypeInfo, IMPLTYPEFLAG_FDEFAULT);
-}
-
-/*
- *  call-seq:
- *     WIN32OLE_TYPE#inspect -> String
- *
- *  Returns the type name with class name.
- *
- *     ie = WIN32OLE.new('InternetExplorer.Application')
- *     ie.ole_type.inspect => #<WIN32OLE_TYPE:IWebBrowser2>
- */
-static VALUE
-foletype_inspect(VALUE self)
-{
-    return default_inspect(self, "WIN32OLE_TYPE");
-}
-
-VALUE cWIN32OLE_TYPE;
-
-void Init_win32ole_type(void)
-{
-    cWIN32OLE_TYPE = rb_define_class_under(cWIN32OLE, "Type", rb_cObject);
-    rb_define_const(rb_cObject, "WIN32OLE_TYPE", cWIN32OLE_TYPE);
-    rb_define_singleton_method(cWIN32OLE_TYPE, "ole_classes", foletype_s_ole_classes, 1);
-    rb_define_singleton_method(cWIN32OLE_TYPE, "typelibs", foletype_s_typelibs, 0);
-    rb_define_singleton_method(cWIN32OLE_TYPE, "progids", foletype_s_progids, 0);
-    rb_define_alloc_func(cWIN32OLE_TYPE, foletype_s_allocate);
-    rb_define_method(cWIN32OLE_TYPE, "initialize", foletype_initialize, 2);
-    rb_define_method(cWIN32OLE_TYPE, "name", foletype_name, 0);
-    rb_define_method(cWIN32OLE_TYPE, "ole_type", foletype_ole_type, 0);
-    rb_define_method(cWIN32OLE_TYPE, "guid", foletype_guid, 0);
-    rb_define_method(cWIN32OLE_TYPE, "progid", foletype_progid, 0);
-    rb_define_method(cWIN32OLE_TYPE, "visible?", foletype_visible, 0);
-    rb_define_alias(cWIN32OLE_TYPE, "to_s", "name");
-    rb_define_method(cWIN32OLE_TYPE, "major_version", foletype_major_version, 0);
-    rb_define_method(cWIN32OLE_TYPE, "minor_version", foletype_minor_version, 0);
-    rb_define_method(cWIN32OLE_TYPE, "typekind", foletype_typekind, 0);
-    rb_define_method(cWIN32OLE_TYPE, "helpstring", foletype_helpstring, 0);
-    rb_define_method(cWIN32OLE_TYPE, "src_type", foletype_src_type, 0);
-    rb_define_method(cWIN32OLE_TYPE, "helpfile", foletype_helpfile, 0);
-    rb_define_method(cWIN32OLE_TYPE, "helpcontext", foletype_helpcontext, 0);
-    rb_define_method(cWIN32OLE_TYPE, "variables", foletype_variables, 0);
-    rb_define_method(cWIN32OLE_TYPE, "ole_methods", foletype_methods, 0);
-    rb_define_method(cWIN32OLE_TYPE, "ole_typelib", foletype_ole_typelib, 0);
-    rb_define_method(cWIN32OLE_TYPE, "implemented_ole_types", foletype_impl_ole_types, 0);
-    rb_define_method(cWIN32OLE_TYPE, "source_ole_types", foletype_source_ole_types, 0);
-    rb_define_method(cWIN32OLE_TYPE, "default_event_sources", foletype_default_event_sources, 0);
-    rb_define_method(cWIN32OLE_TYPE, "default_ole_types", foletype_default_ole_types, 0);
-    rb_define_method(cWIN32OLE_TYPE, "inspect", foletype_inspect, 0);
-}
diff --git a/ext/win32ole/win32ole_type.h b/ext/win32ole/win32ole_type.h
deleted file mode 100644
index 87b551e502d18c..00000000000000
--- a/ext/win32ole/win32ole_type.h
+++ /dev/null
@@ -1,8 +0,0 @@
-#ifndef WIN32OLE_TYPE_H
-#define WIN32OLE_TYPE_H 1
-extern VALUE cWIN32OLE_TYPE;
-VALUE create_win32ole_type(ITypeInfo *pTypeInfo, VALUE name);
-ITypeInfo *itypeinfo(VALUE self);
-VALUE ole_type_from_itypeinfo(ITypeInfo *pTypeInfo);
-void Init_win32ole_type(void);
-#endif
diff --git a/ext/win32ole/win32ole_typelib.c b/ext/win32ole/win32ole_typelib.c
deleted file mode 100644
index fb68bebda875ab..00000000000000
--- a/ext/win32ole/win32ole_typelib.c
+++ /dev/null
@@ -1,847 +0,0 @@
-#include "win32ole.h"
-
-struct oletypelibdata {
-    ITypeLib *pTypeLib;
-};
-
-static VALUE reg_get_typelib_file_path(HKEY hkey);
-static VALUE oletypelib_path(VALUE guid, VALUE version);
-static HRESULT oletypelib_from_guid(VALUE guid, VALUE version, ITypeLib **ppTypeLib);
-static VALUE foletypelib_s_typelibs(VALUE self);
-static VALUE oletypelib_set_member(VALUE self, ITypeLib *pTypeLib);
-static void oletypelib_free(void *ptr);
-static size_t oletypelib_size(const void *ptr);
-static VALUE foletypelib_s_allocate(VALUE klass);
-static VALUE oletypelib_search_registry(VALUE self, VALUE typelib);
-static void oletypelib_get_libattr(ITypeLib *pTypeLib, TLIBATTR **ppTLibAttr);
-static VALUE oletypelib_search_registry2(VALUE self, VALUE args);
-static VALUE foletypelib_initialize(VALUE self, VALUE args);
-static VALUE foletypelib_guid(VALUE self);
-static VALUE foletypelib_name(VALUE self);
-static VALUE make_version_str(VALUE major, VALUE minor);
-static VALUE foletypelib_version(VALUE self);
-static VALUE foletypelib_major_version(VALUE self);
-static VALUE foletypelib_minor_version(VALUE self);
-static VALUE foletypelib_path(VALUE self);
-static VALUE foletypelib_visible(VALUE self);
-static VALUE foletypelib_library_name(VALUE self);
-static VALUE ole_types_from_typelib(ITypeLib *pTypeLib, VALUE classes);
-static VALUE typelib_file_from_typelib(VALUE ole);
-static VALUE typelib_file_from_clsid(VALUE ole);
-static VALUE foletypelib_ole_types(VALUE self);
-static VALUE foletypelib_inspect(VALUE self);
-
-static const rb_data_type_t oletypelib_datatype = {
-    "win32ole_typelib",
-    {NULL, oletypelib_free, oletypelib_size,},
-    0, 0, RUBY_TYPED_FREE_IMMEDIATELY
-};
-
-static VALUE
-reg_get_typelib_file_path(HKEY hkey)
-{
-    VALUE path = Qnil;
-    path = reg_get_val2(hkey, "win64");
-    if (path != Qnil) {
-        return path;
-    }
-    path = reg_get_val2(hkey, "win32");
-    if (path != Qnil) {
-        return path;
-    }
-    path = reg_get_val2(hkey, "win16");
-    return path;
-}
-
-static VALUE
-oletypelib_path(VALUE guid, VALUE version)
-{
-    int k;
-    LONG err;
-    HKEY hkey;
-    HKEY hlang;
-    VALUE lang;
-    VALUE path = Qnil;
-
-    VALUE key = rb_str_new2("TypeLib\\");
-    rb_str_concat(key, guid);
-    rb_str_cat2(key, "\\");
-    rb_str_concat(key, version);
-
-    err = reg_open_vkey(HKEY_CLASSES_ROOT, key, &hkey);
-    if (err != ERROR_SUCCESS) {
-        return Qnil;
-    }
-    for(k = 0; path == Qnil; k++) {
-        lang = reg_enum_key(hkey, k);
-        if (lang == Qnil)
-            break;
-        err = reg_open_vkey(hkey, lang, &hlang);
-        if (err == ERROR_SUCCESS) {
-            path = reg_get_typelib_file_path(hlang);
-            RegCloseKey(hlang);
-        }
-    }
-    RegCloseKey(hkey);
-    return path;
-}
-
-static HRESULT
-oletypelib_from_guid(VALUE guid, VALUE version, ITypeLib **ppTypeLib)
-{
-    VALUE path;
-    OLECHAR *pBuf;
-    HRESULT hr;
-    path = oletypelib_path(guid, version);
-    if (path == Qnil) {
-        return E_UNEXPECTED;
-    }
-    pBuf = ole_vstr2wc(path);
-    hr = LoadTypeLibEx(pBuf, REGKIND_NONE, ppTypeLib);
-    SysFreeString(pBuf);
-    return hr;
-}
-
-ITypeLib *
-itypelib(VALUE self)
-{
-    struct oletypelibdata *ptlib;
-    TypedData_Get_Struct(self, struct oletypelibdata, &oletypelib_datatype, ptlib);
-    return ptlib->pTypeLib;
-}
-
-VALUE
-ole_typelib_from_itypeinfo(ITypeInfo *pTypeInfo)
-{
-    HRESULT hr;
-    ITypeLib *pTypeLib;
-    unsigned int index;
-    VALUE retval = Qnil;
-
-    hr = pTypeInfo->lpVtbl->GetContainingTypeLib(pTypeInfo, &pTypeLib, &index);
-    if(FAILED(hr)) {
-        return Qnil;
-    }
-    retval = create_win32ole_typelib(pTypeLib);
-    return retval;
-}
-
-/*
- * Document-class: WIN32OLE_TYPELIB
- *
- *   <code>WIN32OLE_TYPELIB</code> objects represent OLE tyblib information.
- */
-
-/*
- *  call-seq:
- *
- *     WIN32OLE_TYPELIB.typelibs
- *
- *  Returns the array of WIN32OLE_TYPELIB object.
- *
- *     tlibs = WIN32OLE_TYPELIB.typelibs
- *
- */
-static VALUE
-foletypelib_s_typelibs(VALUE self)
-{
-    HKEY htypelib, hguid;
-    DWORD i, j;
-    LONG err;
-    VALUE guid;
-    VALUE version;
-    VALUE name = Qnil;
-    VALUE typelibs = rb_ary_new();
-    VALUE typelib = Qnil;
-    HRESULT hr;
-    ITypeLib *pTypeLib;
-
-    err = reg_open_key(HKEY_CLASSES_ROOT, "TypeLib", &htypelib);
-    if(err != ERROR_SUCCESS) {
-        return typelibs;
-    }
-    for(i = 0; ; i++) {
-        guid = reg_enum_key(htypelib, i);
-        if (guid == Qnil)
-            break;
-        err = reg_open_vkey(htypelib, guid, &hguid);
-        if (err != ERROR_SUCCESS)
-            continue;
-        for(j = 0; ; j++) {
-            version = reg_enum_key(hguid, j);
-            if (version == Qnil)
-                break;
-            if ( (name = reg_get_val2(hguid, StringValuePtr(version))) != Qnil ) {
-                hr = oletypelib_from_guid(guid, version, &pTypeLib);
-                if (SUCCEEDED(hr)) {
-                    typelib = create_win32ole_typelib(pTypeLib);
-                    rb_ary_push(typelibs, typelib);
-                }
-            }
-        }
-        RegCloseKey(hguid);
-    }
-    RegCloseKey(htypelib);
-    return typelibs;
-}
-
-static VALUE
-oletypelib_set_member(VALUE self, ITypeLib *pTypeLib)
-{
-    struct oletypelibdata *ptlib;
-    TypedData_Get_Struct(self, struct oletypelibdata, &oletypelib_datatype, ptlib);
-    ptlib->pTypeLib = pTypeLib;
-    return self;
-}
-
-static void
-oletypelib_free(void *ptr)
-{
-    struct oletypelibdata *poletypelib = ptr;
-    OLE_FREE(poletypelib->pTypeLib);
-    free(poletypelib);
-}
-
-static size_t
-oletypelib_size(const void *ptr)
-{
-    return ptr ? sizeof(struct oletypelibdata) : 0;
-}
-
-static VALUE
-foletypelib_s_allocate(VALUE klass)
-{
-    struct oletypelibdata *poletypelib;
-    VALUE obj;
-    ole_initialize();
-    obj = TypedData_Make_Struct(klass, struct oletypelibdata, &oletypelib_datatype, poletypelib);
-    poletypelib->pTypeLib = NULL;
-    return obj;
-}
-
-VALUE
-create_win32ole_typelib(ITypeLib *pTypeLib)
-{
-    VALUE obj = foletypelib_s_allocate(cWIN32OLE_TYPELIB);
-    oletypelib_set_member(obj, pTypeLib);
-    return obj;
-}
-
-static VALUE
-oletypelib_search_registry(VALUE self, VALUE typelib)
-{
-    HKEY htypelib, hguid, hversion;
-    DWORD i, j;
-    LONG err;
-    VALUE found = Qfalse;
-    VALUE tlib;
-    VALUE guid;
-    VALUE ver;
-    HRESULT hr;
-    ITypeLib *pTypeLib;
-
-    err = reg_open_key(HKEY_CLASSES_ROOT, "TypeLib", &htypelib);
-    if(err != ERROR_SUCCESS) {
-        return Qfalse;
-    }
-    for(i = 0; !found; i++) {
-        guid = reg_enum_key(htypelib, i);
-        if (guid == Qnil)
-            break;
-        err = reg_open_vkey(htypelib, guid, &hguid);
-        if (err != ERROR_SUCCESS)
-            continue;
-        for(j = 0; found == Qfalse; j++) {
-            ver = reg_enum_key(hguid, j);
-            if (ver == Qnil)
-                break;
-            err = reg_open_vkey(hguid, ver, &hversion);
-            if (err != ERROR_SUCCESS)
-                continue;
-            tlib = reg_get_val(hversion, NULL);
-            if (tlib == Qnil) {
-                RegCloseKey(hversion);
-                continue;
-            }
-            if (rb_str_cmp(typelib, tlib) == 0) {
-                hr = oletypelib_from_guid(guid, ver, &pTypeLib);
-                if (SUCCEEDED(hr)) {
-                    oletypelib_set_member(self, pTypeLib);
-                    found = Qtrue;
-                }
-            }
-            RegCloseKey(hversion);
-        }
-        RegCloseKey(hguid);
-    }
-    RegCloseKey(htypelib);
-    return  found;
-}
-
-static void
-oletypelib_get_libattr(ITypeLib *pTypeLib, TLIBATTR **ppTLibAttr)
-{
-    HRESULT hr;
-    hr = pTypeLib->lpVtbl->GetLibAttr(pTypeLib, ppTLibAttr);
-    if (FAILED(hr)) {
-        ole_raise(hr, eWIN32OLERuntimeError,
-                  "failed to get library attribute(TLIBATTR) from ITypeLib");
-    }
-}
-
-static VALUE
-oletypelib_search_registry2(VALUE self, VALUE args)
-{
-    HKEY htypelib, hguid, hversion;
-    double fver;
-    DWORD j;
-    LONG err;
-    VALUE found = Qfalse;
-    VALUE tlib;
-    VALUE ver;
-    VALUE version_str;
-    VALUE version = Qnil;
-    VALUE typelib = Qnil;
-    HRESULT hr;
-    ITypeLib *pTypeLib;
-
-    VALUE guid = rb_ary_entry(args, 0);
-    version_str = make_version_str(rb_ary_entry(args, 1), rb_ary_entry(args, 2));
-
-    err = reg_open_key(HKEY_CLASSES_ROOT, "TypeLib", &htypelib);
-    if(err != ERROR_SUCCESS) {
-        return Qfalse;
-    }
-    err = reg_open_vkey(htypelib, guid, &hguid);
-    if (err != ERROR_SUCCESS) {
-        RegCloseKey(htypelib);
-        return Qfalse;
-    }
-    if (version_str != Qnil) {
-        err = reg_open_vkey(hguid, version_str, &hversion);
-        if (err == ERROR_SUCCESS) {
-            tlib = reg_get_val(hversion, NULL);
-            if (tlib != Qnil) {
-                typelib = tlib;
-                version = version_str;
-            }
-        }
-        RegCloseKey(hversion);
-    } else {
-        fver = 0.0;
-        for(j = 0; ;j++) {
-            ver = reg_enum_key(hguid, j);
-            if (ver == Qnil)
-                break;
-            err = reg_open_vkey(hguid, ver, &hversion);
-            if (err != ERROR_SUCCESS)
-                continue;
-            tlib = reg_get_val(hversion, NULL);
-            if (tlib == Qnil) {
-                RegCloseKey(hversion);
-                continue;
-            }
-            if (fver < atof(StringValuePtr(ver))) {
-                fver = atof(StringValuePtr(ver));
-                version = ver;
-                typelib = tlib;
-            }
-            RegCloseKey(hversion);
-        }
-    }
-    RegCloseKey(hguid);
-    RegCloseKey(htypelib);
-    if (typelib != Qnil) {
-        hr = oletypelib_from_guid(guid, version, &pTypeLib);
-        if (SUCCEEDED(hr)) {
-            found = Qtrue;
-            oletypelib_set_member(self, pTypeLib);
-        }
-    }
-    return found;
-}
-
-
-/*
- * call-seq:
- *    WIN32OLE_TYPELIB.new(typelib [, version1, version2]) -> WIN32OLE_TYPELIB object
- *
- * Returns a new WIN32OLE_TYPELIB object.
- *
- * The first argument <i>typelib</i>  specifies OLE type library name or GUID or
- * OLE library file.
- * The second argument is major version or version of the type library.
- * The third argument is minor version.
- * The second argument and third argument are optional.
- * If the first argument is type library name, then the second and third argument
- * are ignored.
- *
- *     tlib1 = WIN32OLE_TYPELIB.new('Microsoft Excel 9.0 Object Library')
- *     tlib2 = WIN32OLE_TYPELIB.new('{00020813-0000-0000-C000-000000000046}')
- *     tlib3 = WIN32OLE_TYPELIB.new('{00020813-0000-0000-C000-000000000046}', 1.3)
- *     tlib4 = WIN32OLE_TYPELIB.new('{00020813-0000-0000-C000-000000000046}', 1, 3)
- *     tlib5 = WIN32OLE_TYPELIB.new("C:\\WINNT\\SYSTEM32\\SHELL32.DLL")
- *     puts tlib1.name  # -> 'Microsoft Excel 9.0 Object Library'
- *     puts tlib2.name  # -> 'Microsoft Excel 9.0 Object Library'
- *     puts tlib3.name  # -> 'Microsoft Excel 9.0 Object Library'
- *     puts tlib4.name  # -> 'Microsoft Excel 9.0 Object Library'
- *     puts tlib5.name  # -> 'Microsoft Shell Controls And Automation'
- *
- */
-static VALUE
-foletypelib_initialize(VALUE self, VALUE args)
-{
-    VALUE found = Qfalse;
-    VALUE typelib = Qnil;
-    int len = 0;
-    OLECHAR * pbuf;
-    ITypeLib *pTypeLib;
-    HRESULT hr = S_OK;
-
-    len = RARRAY_LEN(args);
-    rb_check_arity(len, 1, 3);
-
-    typelib = rb_ary_entry(args, 0);
-
-    SafeStringValue(typelib);
-
-    found = oletypelib_search_registry(self, typelib);
-    if (found == Qfalse) {
-        found = oletypelib_search_registry2(self, args);
-    }
-    if (found == Qfalse) {
-        pbuf = ole_vstr2wc(typelib);
-        hr = LoadTypeLibEx(pbuf, REGKIND_NONE, &pTypeLib);
-        SysFreeString(pbuf);
-        if (SUCCEEDED(hr)) {
-            found = Qtrue;
-            oletypelib_set_member(self, pTypeLib);
-        }
-    }
-
-    if (found == Qfalse) {
-        rb_raise(eWIN32OLERuntimeError, "not found type library `%s`",
-                 StringValuePtr(typelib));
-    }
-    return self;
-}
-
-/*
- *  call-seq:
- *     WIN32OLE_TYPELIB#guid -> The guid string.
- *
- *  Returns guid string which specifies type library.
- *
- *     tlib = WIN32OLE_TYPELIB.new('Microsoft Excel 9.0 Object Library')
- *     guid = tlib.guid # -> '{00020813-0000-0000-C000-000000000046}'
- */
-static VALUE
-foletypelib_guid(VALUE self)
-{
-    ITypeLib *pTypeLib;
-    OLECHAR bstr[80];
-    VALUE guid = Qnil;
-    int len;
-    TLIBATTR *pTLibAttr;
-
-    pTypeLib = itypelib(self);
-    oletypelib_get_libattr(pTypeLib, &pTLibAttr);
-    len = StringFromGUID2(&pTLibAttr->guid, bstr, sizeof(bstr)/sizeof(OLECHAR));
-    if (len > 3) {
-        guid = ole_wc2vstr(bstr, FALSE);
-    }
-    pTypeLib->lpVtbl->ReleaseTLibAttr(pTypeLib, pTLibAttr);
-    return guid;
-}
-
-/*
- *  call-seq:
- *     WIN32OLE_TYPELIB#name -> The type library name
- *
- *  Returns the type library name.
- *
- *     tlib = WIN32OLE_TYPELIB.new('Microsoft Excel 9.0 Object Library')
- *     name = tlib.name # -> 'Microsoft Excel 9.0 Object Library'
- */
-static VALUE
-foletypelib_name(VALUE self)
-{
-    ITypeLib *pTypeLib;
-    HRESULT hr;
-    BSTR bstr;
-    VALUE name;
-    pTypeLib = itypelib(self);
-    hr = pTypeLib->lpVtbl->GetDocumentation(pTypeLib, -1,
-                                            NULL, &bstr, NULL, NULL);
-
-    if (FAILED(hr)) {
-        ole_raise(hr, eWIN32OLERuntimeError, "failed to get name from ITypeLib");
-    }
-    name = WC2VSTR(bstr);
-    return name;
-}
-
-static VALUE
-make_version_str(VALUE major, VALUE minor)
-{
-    VALUE version_str = Qnil;
-    VALUE minor_str = Qnil;
-    if (major == Qnil) {
-        return Qnil;
-    }
-    version_str = rb_String(major);
-    if (minor != Qnil) {
-        minor_str = rb_String(minor);
-        rb_str_cat2(version_str, ".");
-        rb_str_append(version_str, minor_str);
-    }
-    return version_str;
-}
-
-/*
- *  call-seq:
- *     WIN32OLE_TYPELIB#version -> The type library version String object.
- *
- *  Returns the type library version.
- *
- *     tlib = WIN32OLE_TYPELIB.new('Microsoft Excel 9.0 Object Library')
- *     puts tlib.version #-> "1.3"
- */
-static VALUE
-foletypelib_version(VALUE self)
-{
-    TLIBATTR *pTLibAttr;
-    ITypeLib *pTypeLib;
-    VALUE version;
-
-    pTypeLib = itypelib(self);
-    oletypelib_get_libattr(pTypeLib, &pTLibAttr);
-    version = rb_sprintf("%d.%d", pTLibAttr->wMajorVerNum, pTLibAttr->wMinorVerNum);
-    pTypeLib->lpVtbl->ReleaseTLibAttr(pTypeLib, pTLibAttr);
-    return version;
-}
-
-/*
- *  call-seq:
- *     WIN32OLE_TYPELIB#major_version -> The type library major version.
- *
- *  Returns the type library major version.
- *
- *     tlib = WIN32OLE_TYPELIB.new('Microsoft Excel 9.0 Object Library')
- *     puts tlib.major_version # -> 1
- */
-static VALUE
-foletypelib_major_version(VALUE self)
-{
-    TLIBATTR *pTLibAttr;
-    VALUE major;
-    ITypeLib *pTypeLib;
-    pTypeLib = itypelib(self);
-    oletypelib_get_libattr(pTypeLib, &pTLibAttr);
-
-    major =  RB_INT2NUM(pTLibAttr->wMajorVerNum);
-    pTypeLib->lpVtbl->ReleaseTLibAttr(pTypeLib, pTLibAttr);
-    return major;
-}
-
-/*
- *  call-seq:
- *     WIN32OLE_TYPELIB#minor_version -> The type library minor version.
- *
- *  Returns the type library minor version.
- *
- *     tlib = WIN32OLE_TYPELIB.new('Microsoft Excel 9.0 Object Library')
- *     puts tlib.minor_version # -> 3
- */
-static VALUE
-foletypelib_minor_version(VALUE self)
-{
-    TLIBATTR *pTLibAttr;
-    VALUE minor;
-    ITypeLib *pTypeLib;
-    pTypeLib = itypelib(self);
-    oletypelib_get_libattr(pTypeLib, &pTLibAttr);
-    minor =  RB_INT2NUM(pTLibAttr->wMinorVerNum);
-    pTypeLib->lpVtbl->ReleaseTLibAttr(pTypeLib, pTLibAttr);
-    return minor;
-}
-
-/*
- *  call-seq:
- *     WIN32OLE_TYPELIB#path -> The type library file path.
- *
- *  Returns the type library file path.
- *
- *     tlib = WIN32OLE_TYPELIB.new('Microsoft Excel 9.0 Object Library')
- *     puts tlib.path #-> 'C:\...\EXCEL9.OLB'
- */
-static VALUE
-foletypelib_path(VALUE self)
-{
-    TLIBATTR *pTLibAttr;
-    HRESULT hr = S_OK;
-    BSTR bstr;
-    LCID lcid = cWIN32OLE_lcid;
-    VALUE path;
-    ITypeLib *pTypeLib;
-
-    pTypeLib = itypelib(self);
-    oletypelib_get_libattr(pTypeLib, &pTLibAttr);
-    hr = QueryPathOfRegTypeLib(&pTLibAttr->guid,
-                               pTLibAttr->wMajorVerNum,
-                               pTLibAttr->wMinorVerNum,
-                               lcid,
-                               &bstr);
-    if (FAILED(hr)) {
-        pTypeLib->lpVtbl->ReleaseTLibAttr(pTypeLib, pTLibAttr);
-        ole_raise(hr, eWIN32OLERuntimeError, "failed to QueryPathOfRegTypeTypeLib");
-    }
-
-    pTypeLib->lpVtbl->ReleaseTLibAttr(pTypeLib, pTLibAttr);
-    path = WC2VSTR(bstr);
-    return path;
-}
-
-/*
- *  call-seq:
- *     WIN32OLE_TYPELIB#visible?
- *
- *  Returns true if the type library information is not hidden.
- *  If wLibFlags of TLIBATTR is 0 or LIBFLAG_FRESTRICTED or LIBFLAG_FHIDDEN,
- *  the method returns false, otherwise, returns true.
- *  If the method fails to access the TLIBATTR information, then
- *  WIN32OLERuntimeError is raised.
- *
- *     tlib = WIN32OLE_TYPELIB.new('Microsoft Excel 9.0 Object Library')
- *     tlib.visible? # => true
- */
-static VALUE
-foletypelib_visible(VALUE self)
-{
-    ITypeLib *pTypeLib = NULL;
-    VALUE visible = Qtrue;
-    TLIBATTR *pTLibAttr;
-
-    pTypeLib = itypelib(self);
-    oletypelib_get_libattr(pTypeLib, &pTLibAttr);
-
-    if ((pTLibAttr->wLibFlags == 0) ||
-        (pTLibAttr->wLibFlags & LIBFLAG_FRESTRICTED) ||
-        (pTLibAttr->wLibFlags & LIBFLAG_FHIDDEN)) {
-        visible = Qfalse;
-    }
-    pTypeLib->lpVtbl->ReleaseTLibAttr(pTypeLib, pTLibAttr);
-    return visible;
-}
-
-/*
- *  call-seq:
- *     WIN32OLE_TYPELIB#library_name
- *
- *  Returns library name.
- *  If the method fails to access library name, WIN32OLERuntimeError is raised.
- *
- *     tlib = WIN32OLE_TYPELIB.new('Microsoft Excel 9.0 Object Library')
- *     tlib.library_name # => Excel
- */
-static VALUE
-foletypelib_library_name(VALUE self)
-{
-    HRESULT hr;
-    ITypeLib *pTypeLib = NULL;
-    VALUE libname = Qnil;
-    BSTR bstr;
-
-    pTypeLib = itypelib(self);
-    hr = pTypeLib->lpVtbl->GetDocumentation(pTypeLib, -1,
-                                            &bstr, NULL, NULL, NULL);
-    if (FAILED(hr)) {
-        ole_raise(hr, eWIN32OLERuntimeError, "failed to get library name");
-    }
-    libname = WC2VSTR(bstr);
-    return libname;
-}
-
-static VALUE
-ole_types_from_typelib(ITypeLib *pTypeLib, VALUE classes)
-{
-    long count;
-    int i;
-    HRESULT hr;
-    BSTR bstr;
-    ITypeInfo *pTypeInfo;
-    VALUE type;
-
-    count = pTypeLib->lpVtbl->GetTypeInfoCount(pTypeLib);
-    for (i = 0; i < count; i++) {
-        hr = pTypeLib->lpVtbl->GetDocumentation(pTypeLib, i,
-                                                &bstr, NULL, NULL, NULL);
-        if (FAILED(hr))
-            continue;
-
-        hr = pTypeLib->lpVtbl->GetTypeInfo(pTypeLib, i, &pTypeInfo);
-        if (FAILED(hr))
-            continue;
-
-        type = create_win32ole_type(pTypeInfo, WC2VSTR(bstr));
-
-        rb_ary_push(classes, type);
-        OLE_RELEASE(pTypeInfo);
-    }
-    return classes;
-}
-
-static VALUE
-typelib_file_from_typelib(VALUE ole)
-{
-    HKEY htypelib, hclsid, hversion, hlang;
-    double fver;
-    DWORD i, j, k;
-    LONG err;
-    BOOL found = FALSE;
-    VALUE typelib;
-    VALUE file = Qnil;
-    VALUE clsid;
-    VALUE ver;
-    VALUE lang;
-
-    err = reg_open_key(HKEY_CLASSES_ROOT, "TypeLib", &htypelib);
-    if(err != ERROR_SUCCESS) {
-        return Qnil;
-    }
-    for(i = 0; !found; i++) {
-        clsid = reg_enum_key(htypelib, i);
-        if (clsid == Qnil)
-            break;
-        err = reg_open_vkey(htypelib, clsid, &hclsid);
-        if (err != ERROR_SUCCESS)
-            continue;
-        fver = 0;
-        for(j = 0; !found; j++) {
-            ver = reg_enum_key(hclsid, j);
-            if (ver == Qnil)
-                break;
-            err = reg_open_vkey(hclsid, ver, &hversion);
-                        if (err != ERROR_SUCCESS || fver > atof(StringValuePtr(ver)))
-                continue;
-            fver = atof(StringValuePtr(ver));
-            typelib = reg_get_val(hversion, NULL);
-            if (typelib == Qnil)
-                continue;
-            if (rb_str_cmp(typelib, ole) == 0) {
-                for(k = 0; !found; k++) {
-                    lang = reg_enum_key(hversion, k);
-                    if (lang == Qnil)
-                        break;
-                    err = reg_open_vkey(hversion, lang, &hlang);
-                    if (err == ERROR_SUCCESS) {
-                        if ((file = reg_get_typelib_file_path(hlang)) != Qnil)
-                            found = TRUE;
-                        RegCloseKey(hlang);
-                    }
-                }
-            }
-            RegCloseKey(hversion);
-        }
-        RegCloseKey(hclsid);
-    }
-    RegCloseKey(htypelib);
-    return  file;
-}
-
-static VALUE
-typelib_file_from_clsid(VALUE ole)
-{
-    HKEY hroot, hclsid;
-    LONG err;
-    VALUE typelib;
-    char path[MAX_PATH + 1];
-
-    err = reg_open_key(HKEY_CLASSES_ROOT, "CLSID", &hroot);
-    if (err != ERROR_SUCCESS) {
-        return Qnil;
-    }
-    err = reg_open_key(hroot, StringValuePtr(ole), &hclsid);
-    if (err != ERROR_SUCCESS) {
-        RegCloseKey(hroot);
-        return Qnil;
-    }
-    typelib = reg_get_val2(hclsid, "InprocServer32");
-    RegCloseKey(hroot);
-    RegCloseKey(hclsid);
-    if (typelib != Qnil) {
-        ExpandEnvironmentStrings(StringValuePtr(typelib), path, sizeof(path));
-        path[MAX_PATH] = '\0';
-        typelib = rb_str_new2(path);
-    }
-    return typelib;
-}
-
-VALUE
-typelib_file(VALUE ole)
-{
-    VALUE file = typelib_file_from_clsid(ole);
-    if (file != Qnil) {
-        return file;
-    }
-    return typelib_file_from_typelib(ole);
-}
-
-
-/*
- *  call-seq:
- *     WIN32OLE_TYPELIB#ole_types -> The array of WIN32OLE_TYPE object included the type library.
- *
- *  Returns the type library file path.
- *
- *     tlib = WIN32OLE_TYPELIB.new('Microsoft Excel 9.0 Object Library')
- *     classes = tlib.ole_types.collect{|k| k.name} # -> ['AddIn', 'AddIns' ...]
- */
-static VALUE
-foletypelib_ole_types(VALUE self)
-{
-    ITypeLib *pTypeLib = NULL;
-    VALUE classes = rb_ary_new();
-    pTypeLib = itypelib(self);
-    ole_types_from_typelib(pTypeLib, classes);
-    return classes;
-}
-
-/*
- *  call-seq:
- *     WIN32OLE_TYPELIB#inspect -> String
- *
- *  Returns the type library name with class name.
- *
- *     tlib = WIN32OLE_TYPELIB.new('Microsoft Excel 9.0 Object Library')
- *     tlib.inspect # => "<#WIN32OLE_TYPELIB:Microsoft Excel 9.0 Object Library>"
- */
-static VALUE
-foletypelib_inspect(VALUE self)
-{
-    return default_inspect(self, "WIN32OLE_TYPELIB");
-}
-
-VALUE cWIN32OLE_TYPELIB;
-
-void
-Init_win32ole_typelib(void)
-{
-    cWIN32OLE_TYPELIB = rb_define_class_under(cWIN32OLE, "Typelib", rb_cObject);
-    rb_define_const(rb_cObject, "WIN32OLE_TYPELIB", cWIN32OLE_TYPELIB);
-    rb_define_singleton_method(cWIN32OLE_TYPELIB, "typelibs", foletypelib_s_typelibs, 0);
-    rb_define_alloc_func(cWIN32OLE_TYPELIB, foletypelib_s_allocate);
-    rb_define_method(cWIN32OLE_TYPELIB, "initialize", foletypelib_initialize, -2);
-    rb_define_method(cWIN32OLE_TYPELIB, "guid", foletypelib_guid, 0);
-    rb_define_method(cWIN32OLE_TYPELIB, "name", foletypelib_name, 0);
-    rb_define_method(cWIN32OLE_TYPELIB, "version", foletypelib_version, 0);
-    rb_define_method(cWIN32OLE_TYPELIB, "major_version", foletypelib_major_version, 0);
-    rb_define_method(cWIN32OLE_TYPELIB, "minor_version", foletypelib_minor_version, 0);
-    rb_define_method(cWIN32OLE_TYPELIB, "path", foletypelib_path, 0);
-    rb_define_method(cWIN32OLE_TYPELIB, "ole_types", foletypelib_ole_types, 0);
-    rb_define_alias(cWIN32OLE_TYPELIB, "ole_classes", "ole_types");
-    rb_define_method(cWIN32OLE_TYPELIB, "visible?", foletypelib_visible, 0);
-    rb_define_method(cWIN32OLE_TYPELIB, "library_name", foletypelib_library_name, 0);
-    rb_define_alias(cWIN32OLE_TYPELIB, "to_s", "name");
-    rb_define_method(cWIN32OLE_TYPELIB, "inspect", foletypelib_inspect, 0);
-}
diff --git a/ext/win32ole/win32ole_typelib.h b/ext/win32ole/win32ole_typelib.h
deleted file mode 100644
index 2c2730bb585301..00000000000000
--- a/ext/win32ole/win32ole_typelib.h
+++ /dev/null
@@ -1,11 +0,0 @@
-#ifndef WIN32OLE_TYPELIB_H
-#define WIN32OLE_TYPELIB_H 1
-
-extern VALUE cWIN32OLE_TYPELIB;
-
-void Init_win32ole_typelib(void);
-ITypeLib * itypelib(VALUE self);
-VALUE typelib_file(VALUE ole);
-VALUE create_win32ole_typelib(ITypeLib *pTypeLib);
-VALUE ole_typelib_from_itypeinfo(ITypeInfo *pTypeInfo);
-#endif
diff --git a/ext/win32ole/win32ole_variable.c b/ext/win32ole/win32ole_variable.c
deleted file mode 100644
index e7f58c891e68b5..00000000000000
--- a/ext/win32ole/win32ole_variable.c
+++ /dev/null
@@ -1,384 +0,0 @@
-#include "win32ole.h"
-
-struct olevariabledata {
-    ITypeInfo *pTypeInfo;
-    UINT index;
-};
-
-static void olevariable_free(void *ptr);
-static size_t olevariable_size(const void *ptr);
-static VALUE folevariable_name(VALUE self);
-static VALUE ole_variable_ole_type(ITypeInfo *pTypeInfo, UINT var_index);
-static VALUE folevariable_ole_type(VALUE self);
-static VALUE ole_variable_ole_type_detail(ITypeInfo *pTypeInfo, UINT var_index);
-static VALUE folevariable_ole_type_detail(VALUE self);
-static VALUE ole_variable_value(ITypeInfo *pTypeInfo, UINT var_index);
-static VALUE folevariable_value(VALUE self);
-static VALUE ole_variable_visible(ITypeInfo *pTypeInfo, UINT var_index);
-static VALUE folevariable_visible(VALUE self);
-static VALUE ole_variable_kind(ITypeInfo *pTypeInfo, UINT var_index);
-static VALUE folevariable_variable_kind(VALUE self);
-static VALUE ole_variable_varkind(ITypeInfo *pTypeInfo, UINT var_index);
-static VALUE folevariable_varkind(VALUE self);
-static VALUE folevariable_inspect(VALUE self);
-
-static const rb_data_type_t olevariable_datatype = {
-    "win32ole_variable",
-    {NULL, olevariable_free, olevariable_size,},
-    0, 0, RUBY_TYPED_FREE_IMMEDIATELY
-};
-
-static void
-olevariable_free(void *ptr)
-{
-    struct olevariabledata *polevar = ptr;
-    OLE_FREE(polevar->pTypeInfo);
-    free(polevar);
-}
-
-static size_t
-olevariable_size(const void *ptr)
-{
-    return ptr ? sizeof(struct olevariabledata) : 0;
-}
-
-/*
- * Document-class: WIN32OLE_VARIABLE
- *
- *   <code>WIN32OLE_VARIABLE</code> objects represent OLE variable information.
- */
-
-VALUE
-create_win32ole_variable(ITypeInfo *pTypeInfo, UINT index, VALUE name)
-{
-    struct olevariabledata *pvar;
-    VALUE obj = TypedData_Make_Struct(cWIN32OLE_VARIABLE, struct olevariabledata,
-                                      &olevariable_datatype, pvar);
-    pvar->pTypeInfo = pTypeInfo;
-    OLE_ADDREF(pTypeInfo);
-    pvar->index = index;
-    rb_ivar_set(obj, rb_intern("name"), name);
-    return obj;
-}
-
-/*
- *  call-seq:
- *     WIN32OLE_VARIABLE#name
- *
- *  Returns the name of variable.
- *
- *     tobj = WIN32OLE_TYPE.new('Microsoft Excel 9.0 Object Library', 'XlSheetType')
- *     variables = tobj.variables
- *     variables.each do |variable|
- *       puts "#{variable.name}"
- *     end
- *
- *     The result of above script is following:
- *       xlChart
- *       xlDialogSheet
- *       xlExcel4IntlMacroSheet
- *       xlExcel4MacroSheet
- *       xlWorksheet
- *
- */
-static VALUE
-folevariable_name(VALUE self)
-{
-    return rb_ivar_get(self, rb_intern("name"));
-}
-
-static VALUE
-ole_variable_ole_type(ITypeInfo *pTypeInfo, UINT var_index)
-{
-    VARDESC *pVarDesc;
-    HRESULT hr;
-    VALUE type;
-    hr = pTypeInfo->lpVtbl->GetVarDesc(pTypeInfo, var_index, &pVarDesc);
-    if (FAILED(hr))
-        ole_raise(hr, eWIN32OLERuntimeError, "failed to GetVarDesc");
-    type = ole_typedesc2val(pTypeInfo, &(pVarDesc->elemdescVar.tdesc), Qnil);
-    pTypeInfo->lpVtbl->ReleaseVarDesc(pTypeInfo, pVarDesc);
-    return type;
-}
-
-/*
- *   call-seq:
- *      WIN32OLE_VARIABLE#ole_type
- *
- *   Returns OLE type string.
- *
- *     tobj = WIN32OLE_TYPE.new('Microsoft Excel 9.0 Object Library', 'XlSheetType')
- *     variables = tobj.variables
- *     variables.each do |variable|
- *       puts "#{variable.ole_type} #{variable.name}"
- *     end
- *
- *     The result of above script is following:
- *       INT xlChart
- *       INT xlDialogSheet
- *       INT xlExcel4IntlMacroSheet
- *       INT xlExcel4MacroSheet
- *       INT xlWorksheet
- *
- */
-static VALUE
-folevariable_ole_type(VALUE self)
-{
-    struct olevariabledata *pvar;
-    TypedData_Get_Struct(self, struct olevariabledata, &olevariable_datatype, pvar);
-    return ole_variable_ole_type(pvar->pTypeInfo, pvar->index);
-}
-
-static VALUE
-ole_variable_ole_type_detail(ITypeInfo *pTypeInfo, UINT var_index)
-{
-    VARDESC *pVarDesc;
-    HRESULT hr;
-    VALUE type = rb_ary_new();
-    hr = pTypeInfo->lpVtbl->GetVarDesc(pTypeInfo, var_index, &pVarDesc);
-    if (FAILED(hr))
-        ole_raise(hr, eWIN32OLERuntimeError, "failed to GetVarDesc");
-    ole_typedesc2val(pTypeInfo, &(pVarDesc->elemdescVar.tdesc), type);
-    pTypeInfo->lpVtbl->ReleaseVarDesc(pTypeInfo, pVarDesc);
-    return type;
-}
-
-/*
- *  call-seq:
- *     WIN32OLE_VARIABLE#ole_type_detail
- *
- *  Returns detail information of type. The information is array of type.
- *
- *     tobj = WIN32OLE_TYPE.new('DirectX 7 for Visual Basic Type Library', 'D3DCLIPSTATUS')
- *     variable = tobj.variables.find {|variable| variable.name == 'lFlags'}
- *     tdetail  = variable.ole_type_detail
- *     p tdetail # => ["USERDEFINED", "CONST_D3DCLIPSTATUSFLAGS"]
- *
- */
-static VALUE
-folevariable_ole_type_detail(VALUE self)
-{
-    struct olevariabledata *pvar;
-    TypedData_Get_Struct(self, struct olevariabledata, &olevariable_datatype, pvar);
-    return ole_variable_ole_type_detail(pvar->pTypeInfo, pvar->index);
-}
-
-static VALUE
-ole_variable_value(ITypeInfo *pTypeInfo, UINT var_index)
-{
-    VARDESC *pVarDesc;
-    HRESULT hr;
-    VALUE val = Qnil;
-    hr = pTypeInfo->lpVtbl->GetVarDesc(pTypeInfo, var_index, &pVarDesc);
-    if (FAILED(hr))
-        return Qnil;
-    if(pVarDesc->varkind == VAR_CONST)
-        val = ole_variant2val(V_UNION1(pVarDesc, lpvarValue));
-    pTypeInfo->lpVtbl->ReleaseVarDesc(pTypeInfo, pVarDesc);
-    return val;
-}
-
-/*
- *  call-seq:
- *     WIN32OLE_VARIABLE#value
- *
- *  Returns value if value is exists. If the value does not exist,
- *  this method returns nil.
- *
- *     tobj = WIN32OLE_TYPE.new('Microsoft Excel 9.0 Object Library', 'XlSheetType')
- *     variables = tobj.variables
- *     variables.each do |variable|
- *       puts "#{variable.name} #{variable.value}"
- *     end
- *
- *     The result of above script is following:
- *       xlChart = -4109
- *       xlDialogSheet = -4116
- *       xlExcel4IntlMacroSheet = 4
- *       xlExcel4MacroSheet = 3
- *       xlWorksheet = -4167
- *
- */
-static VALUE
-folevariable_value(VALUE self)
-{
-    struct olevariabledata *pvar;
-    TypedData_Get_Struct(self, struct olevariabledata, &olevariable_datatype, pvar);
-    return ole_variable_value(pvar->pTypeInfo, pvar->index);
-}
-
-static VALUE
-ole_variable_visible(ITypeInfo *pTypeInfo, UINT var_index)
-{
-    VARDESC *pVarDesc;
-    HRESULT hr;
-    VALUE visible = Qfalse;
-    hr = pTypeInfo->lpVtbl->GetVarDesc(pTypeInfo, var_index, &pVarDesc);
-    if (FAILED(hr))
-        return visible;
-    if (!(pVarDesc->wVarFlags & (VARFLAG_FHIDDEN |
-                                 VARFLAG_FRESTRICTED |
-                                 VARFLAG_FNONBROWSABLE))) {
-        visible = Qtrue;
-    }
-    pTypeInfo->lpVtbl->ReleaseVarDesc(pTypeInfo, pVarDesc);
-    return visible;
-}
-
-/*
- *  call-seq:
- *     WIN32OLE_VARIABLE#visible?
- *
- *  Returns true if the variable is public.
- *
- *     tobj = WIN32OLE_TYPE.new('Microsoft Excel 9.0 Object Library', 'XlSheetType')
- *     variables = tobj.variables
- *     variables.each do |variable|
- *       puts "#{variable.name} #{variable.visible?}"
- *     end
- *
- *     The result of above script is following:
- *       xlChart true
- *       xlDialogSheet true
- *       xlExcel4IntlMacroSheet true
- *       xlExcel4MacroSheet true
- *       xlWorksheet true
- *
- */
-static VALUE
-folevariable_visible(VALUE self)
-{
-    struct olevariabledata *pvar;
-    TypedData_Get_Struct(self, struct olevariabledata, &olevariable_datatype, pvar);
-    return ole_variable_visible(pvar->pTypeInfo, pvar->index);
-}
-
-static VALUE
-ole_variable_kind(ITypeInfo *pTypeInfo, UINT var_index)
-{
-    VARDESC *pVarDesc;
-    HRESULT hr;
-    VALUE kind = rb_str_new2("UNKNOWN");
-    hr = pTypeInfo->lpVtbl->GetVarDesc(pTypeInfo, var_index, &pVarDesc);
-    if (FAILED(hr))
-        return kind;
-    switch(pVarDesc->varkind) {
-    case VAR_PERINSTANCE:
-        kind = rb_str_new2("PERINSTANCE");
-        break;
-    case VAR_STATIC:
-        kind = rb_str_new2("STATIC");
-        break;
-    case VAR_CONST:
-        kind = rb_str_new2("CONSTANT");
-        break;
-    case VAR_DISPATCH:
-        kind = rb_str_new2("DISPATCH");
-        break;
-    default:
-        break;
-    }
-    pTypeInfo->lpVtbl->ReleaseVarDesc(pTypeInfo, pVarDesc);
-    return kind;
-}
-
-/*
- * call-seq:
- *   WIN32OLE_VARIABLE#variable_kind
- *
- * Returns variable kind string.
- *
- *    tobj = WIN32OLE_TYPE.new('Microsoft Excel 9.0 Object Library', 'XlSheetType')
- *    variables = tobj.variables
- *    variables.each do |variable|
- *      puts "#{variable.name} #{variable.variable_kind}"
- *    end
- *
- *    The result of above script is following:
- *      xlChart CONSTANT
- *      xlDialogSheet CONSTANT
- *      xlExcel4IntlMacroSheet CONSTANT
- *      xlExcel4MacroSheet CONSTANT
- *      xlWorksheet CONSTANT
- */
-static VALUE
-folevariable_variable_kind(VALUE self)
-{
-    struct olevariabledata *pvar;
-    TypedData_Get_Struct(self, struct olevariabledata, &olevariable_datatype, pvar);
-    return ole_variable_kind(pvar->pTypeInfo, pvar->index);
-}
-
-static VALUE
-ole_variable_varkind(ITypeInfo *pTypeInfo, UINT var_index)
-{
-    VARDESC *pVarDesc;
-    HRESULT hr;
-    VALUE kind = Qnil;
-    hr = pTypeInfo->lpVtbl->GetVarDesc(pTypeInfo, var_index, &pVarDesc);
-    if (FAILED(hr))
-        return kind;
-    pTypeInfo->lpVtbl->ReleaseVarDesc(pTypeInfo, pVarDesc);
-    kind = RB_INT2FIX(pVarDesc->varkind);
-    return kind;
-}
-
-/*
- *  call-seq:
- *     WIN32OLE_VARIABLE#varkind
- *
- *  Returns the number which represents variable kind.
- *    tobj = WIN32OLE_TYPE.new('Microsoft Excel 9.0 Object Library', 'XlSheetType')
- *    variables = tobj.variables
- *    variables.each do |variable|
- *      puts "#{variable.name} #{variable.varkind}"
- *    end
- *
- *    The result of above script is following:
- *       xlChart 2
- *       xlDialogSheet 2
- *       xlExcel4IntlMacroSheet 2
- *       xlExcel4MacroSheet 2
- *       xlWorksheet 2
- */
-static VALUE
-folevariable_varkind(VALUE self)
-{
-    struct olevariabledata *pvar;
-    TypedData_Get_Struct(self, struct olevariabledata, &olevariable_datatype, pvar);
-    return ole_variable_varkind(pvar->pTypeInfo, pvar->index);
-}
-
-/*
- *  call-seq:
- *     WIN32OLE_VARIABLE#inspect -> String
- *
- *  Returns the OLE variable name and the value with class name.
- *
- */
-static VALUE
-folevariable_inspect(VALUE self)
-{
-    VALUE v = rb_inspect(folevariable_value(self));
-    VALUE n = folevariable_name(self);
-    VALUE detail = rb_sprintf("%"PRIsVALUE"=%"PRIsVALUE, n, v);
-    return make_inspect("WIN32OLE_VARIABLE", detail);
-}
-
-VALUE cWIN32OLE_VARIABLE;
-
-void Init_win32ole_variable(void)
-{
-    cWIN32OLE_VARIABLE = rb_define_class_under(cWIN32OLE, "Variable", rb_cObject);
-    rb_define_const(rb_cObject, "WIN32OLE_VARIABLE", cWIN32OLE_VARIABLE);
-    rb_undef_alloc_func(cWIN32OLE_VARIABLE);
-    rb_define_method(cWIN32OLE_VARIABLE, "name", folevariable_name, 0);
-    rb_define_method(cWIN32OLE_VARIABLE, "ole_type", folevariable_ole_type, 0);
-    rb_define_method(cWIN32OLE_VARIABLE, "ole_type_detail", folevariable_ole_type_detail, 0);
-    rb_define_method(cWIN32OLE_VARIABLE, "value", folevariable_value, 0);
-    rb_define_method(cWIN32OLE_VARIABLE, "visible?", folevariable_visible, 0);
-    rb_define_method(cWIN32OLE_VARIABLE, "variable_kind", folevariable_variable_kind, 0);
-    rb_define_method(cWIN32OLE_VARIABLE, "varkind", folevariable_varkind, 0);
-    rb_define_method(cWIN32OLE_VARIABLE, "inspect", folevariable_inspect, 0);
-    rb_define_alias(cWIN32OLE_VARIABLE, "to_s", "name");
-}
diff --git a/ext/win32ole/win32ole_variable.h b/ext/win32ole/win32ole_variable.h
deleted file mode 100644
index 209613fd44b018..00000000000000
--- a/ext/win32ole/win32ole_variable.h
+++ /dev/null
@@ -1,8 +0,0 @@
-#ifndef WIN32OLE_VARIABLE_H
-#define WIN32OLE_VARIABLE_H 1
-
-extern VALUE cWIN32OLE_VARIABLE;
-VALUE create_win32ole_variable(ITypeInfo *pTypeInfo, UINT index, VALUE name);
-void Init_win32ole_variable(void);
-
-#endif
diff --git a/ext/win32ole/win32ole_variant.c b/ext/win32ole/win32ole_variant.c
deleted file mode 100644
index f1d83ed2e1d7e3..00000000000000
--- a/ext/win32ole/win32ole_variant.c
+++ /dev/null
@@ -1,736 +0,0 @@
-#include "win32ole.h"
-
-struct olevariantdata {
-    VARIANT realvar;
-    VARIANT var;
-};
-
-static void  olevariant_free(void *ptr);
-static size_t  olevariant_size(const void *ptr);
-static void ole_val2olevariantdata(VALUE val, VARTYPE vt, struct olevariantdata *pvar);
-static void ole_val2variant_err(VALUE val, VARIANT *var);
-static void ole_set_byref(VARIANT *realvar, VARIANT *var,  VARTYPE vt);
-static VALUE folevariant_s_allocate(VALUE klass);
-static VALUE folevariant_s_array(VALUE klass, VALUE dims, VALUE vvt);
-static void check_type_val2variant(VALUE val);
-static VALUE folevariant_initialize(VALUE self, VALUE args);
-static LONG *ary2safe_array_index(int ary_size, VALUE *ary, SAFEARRAY *psa);
-static void unlock_safe_array(SAFEARRAY *psa);
-static SAFEARRAY *get_locked_safe_array(VALUE val);
-static VALUE folevariant_ary_aref(int argc, VALUE *argv, VALUE self);
-static VALUE folevariant_ary_aset(int argc, VALUE *argv, VALUE self);
-static VALUE folevariant_value(VALUE self);
-static VALUE folevariant_vartype(VALUE self);
-static VALUE folevariant_set_value(VALUE self, VALUE val);
-
-static const rb_data_type_t olevariant_datatype = {
-    "win32ole_variant",
-    {NULL, olevariant_free, olevariant_size,},
-    0, 0, RUBY_TYPED_FREE_IMMEDIATELY
-};
-
-static void
-olevariant_free(void *ptr)
-{
-    struct olevariantdata *pvar = ptr;
-    VariantClear(&(pvar->realvar));
-    VariantClear(&(pvar->var));
-    free(pvar);
-}
-
-static size_t
-olevariant_size(const void *ptr)
-{
-    return ptr ? sizeof(struct olevariantdata) : 0;
-}
-
-static void
-ole_val2olevariantdata(VALUE val, VARTYPE vt, struct olevariantdata *pvar)
-{
-    HRESULT hr = S_OK;
-
-    if (((vt & ~VT_BYREF) ==  (VT_ARRAY | VT_UI1)) && RB_TYPE_P(val, T_STRING)) {
-        long len = RSTRING_LEN(val);
-        void *pdest = NULL;
-        SAFEARRAY *p = NULL;
-        SAFEARRAY *psa = SafeArrayCreateVector(VT_UI1, 0, len);
-        if (!psa) {
-            rb_raise(rb_eRuntimeError, "fail to SafeArrayCreateVector");
-        }
-        hr = SafeArrayAccessData(psa, &pdest);
-        if (SUCCEEDED(hr)) {
-            memcpy(pdest, RSTRING_PTR(val), len);
-            SafeArrayUnaccessData(psa);
-            V_VT(&(pvar->realvar)) = (vt & ~VT_BYREF);
-            p = V_ARRAY(&(pvar->realvar));
-            if (p != NULL) {
-                SafeArrayDestroy(p);
-            }
-            V_ARRAY(&(pvar->realvar)) = psa;
-            if (vt & VT_BYREF) {
-                V_VT(&(pvar->var)) = vt;
-                V_ARRAYREF(&(pvar->var)) = &(V_ARRAY(&(pvar->realvar)));
-            } else {
-                hr = VariantCopy(&(pvar->var), &(pvar->realvar));
-            }
-        } else {
-            if (psa)
-                SafeArrayDestroy(psa);
-        }
-    } else if (vt & VT_ARRAY) {
-        if (val == Qnil) {
-            V_VT(&(pvar->var)) = vt;
-            if (vt & VT_BYREF) {
-                V_ARRAYREF(&(pvar->var)) = &(V_ARRAY(&(pvar->realvar)));
-            }
-        } else {
-            hr = ole_val_ary2variant_ary(val, &(pvar->realvar), (VARTYPE)(vt & ~VT_BYREF));
-            if (SUCCEEDED(hr)) {
-                if (vt & VT_BYREF) {
-                    V_VT(&(pvar->var)) = vt;
-                    V_ARRAYREF(&(pvar->var)) = &(V_ARRAY(&(pvar->realvar)));
-                } else {
-                    hr = VariantCopy(&(pvar->var), &(pvar->realvar));
-                }
-            }
-        }
-#if (defined(_MSC_VER) && (_MSC_VER >= 1300)) || defined(__CYGWIN__) || defined(__MINGW32__)
-    } else if ( (vt & ~VT_BYREF) == VT_I8 || (vt & ~VT_BYREF) == VT_UI8) {
-        ole_val2variant_ex(val, &(pvar->realvar), (vt & ~VT_BYREF));
-        ole_val2variant_ex(val, &(pvar->var), (vt & ~VT_BYREF));
-        V_VT(&(pvar->var)) = vt;
-        if (vt & VT_BYREF) {
-            ole_set_byref(&(pvar->realvar), &(pvar->var), vt);
-        }
-#endif
-    } else if ( (vt & ~VT_BYREF) == VT_ERROR) {
-        ole_val2variant_err(val, &(pvar->realvar));
-        if (vt & VT_BYREF) {
-            ole_set_byref(&(pvar->realvar), &(pvar->var), vt);
-        } else {
-            hr = VariantCopy(&(pvar->var), &(pvar->realvar));
-        }
-    } else {
-        if (val == Qnil) {
-            V_VT(&(pvar->var)) = vt;
-            if (vt == (VT_BYREF | VT_VARIANT)) {
-                ole_set_byref(&(pvar->realvar), &(pvar->var), vt);
-            } else {
-                V_VT(&(pvar->realvar)) = vt & ~VT_BYREF;
-                if (vt & VT_BYREF) {
-                    ole_set_byref(&(pvar->realvar), &(pvar->var), vt);
-                }
-            }
-        } else {
-            ole_val2variant_ex(val, &(pvar->realvar), (VARTYPE)(vt & ~VT_BYREF));
-            if (vt == (VT_BYREF | VT_VARIANT)) {
-                ole_set_byref(&(pvar->realvar), &(pvar->var), vt);
-            } else if (vt & VT_BYREF) {
-                if ( (vt & ~VT_BYREF) != V_VT(&(pvar->realvar))) {
-                    hr = VariantChangeTypeEx(&(pvar->realvar), &(pvar->realvar),
-                            cWIN32OLE_lcid, 0, (VARTYPE)(vt & ~VT_BYREF));
-                }
-                if (SUCCEEDED(hr)) {
-                    ole_set_byref(&(pvar->realvar), &(pvar->var), vt);
-                }
-            } else {
-                if (vt == V_VT(&(pvar->realvar))) {
-                    hr = VariantCopy(&(pvar->var), &(pvar->realvar));
-                } else {
-                    hr = VariantChangeTypeEx(&(pvar->var), &(pvar->realvar),
-                            cWIN32OLE_lcid, 0, vt);
-                }
-            }
-        }
-    }
-    if (FAILED(hr)) {
-        ole_raise(hr, eWIN32OLERuntimeError, "failed to change type");
-    }
-}
-
-static void
-ole_val2variant_err(VALUE val, VARIANT *var)
-{
-    VALUE v = val;
-    if (rb_obj_is_kind_of(v, cWIN32OLE_VARIANT)) {
-        v = folevariant_value(v);
-    }
-    if (!(FIXNUM_P(v) || RB_TYPE_P(v, T_BIGNUM) || v == Qnil)) {
-        rb_raise(eWIN32OLERuntimeError, "failed to convert VT_ERROR VARIANT:`%"PRIsVALUE"'", rb_inspect(v));
-    }
-    V_VT(var) = VT_ERROR;
-    if (v != Qnil) {
-        V_ERROR(var) = RB_NUM2LONG(val);
-    } else {
-        V_ERROR(var) = 0;
-    }
-}
-
-static void
-ole_set_byref(VARIANT *realvar, VARIANT *var,  VARTYPE vt)
-{
-    V_VT(var) = vt;
-    if (vt == (VT_VARIANT|VT_BYREF)) {
-        V_VARIANTREF(var) = realvar;
-    } else {
-        if (V_VT(realvar) != (vt & ~VT_BYREF)) {
-            rb_raise(eWIN32OLERuntimeError, "variant type mismatch");
-        }
-        switch(vt & ~VT_BYREF) {
-        case VT_I1:
-            V_I1REF(var) = &V_I1(realvar);
-            break;
-        case VT_UI1:
-            V_UI1REF(var) = &V_UI1(realvar);
-            break;
-        case VT_I2:
-            V_I2REF(var) = &V_I2(realvar);
-            break;
-        case VT_UI2:
-            V_UI2REF(var) = &V_UI2(realvar);
-            break;
-        case VT_I4:
-            V_I4REF(var) = &V_I4(realvar);
-            break;
-        case VT_UI4:
-            V_UI4REF(var) = &V_UI4(realvar);
-            break;
-        case VT_R4:
-            V_R4REF(var) = &V_R4(realvar);
-            break;
-        case VT_R8:
-            V_R8REF(var) = &V_R8(realvar);
-            break;
-
-#if (defined(_MSC_VER) && (_MSC_VER >= 1300)) || defined(__CYGWIN__) || defined(__MINGW32__)
-#ifdef V_I8REF
-        case VT_I8:
-            V_I8REF(var) = &V_I8(realvar);
-            break;
-#endif
-#ifdef V_UI8REF
-        case VT_UI8:
-            V_UI8REF(var) = &V_UI8(realvar);
-            break;
-#endif
-#endif
-        case VT_INT:
-            V_INTREF(var) = &V_INT(realvar);
-            break;
-
-        case VT_UINT:
-            V_UINTREF(var) = &V_UINT(realvar);
-            break;
-
-        case VT_CY:
-            V_CYREF(var) = &V_CY(realvar);
-            break;
-        case VT_DATE:
-            V_DATEREF(var) = &V_DATE(realvar);
-            break;
-        case VT_BSTR:
-            V_BSTRREF(var) = &V_BSTR(realvar);
-            break;
-        case VT_DISPATCH:
-            V_DISPATCHREF(var) = &V_DISPATCH(realvar);
-            break;
-        case VT_ERROR:
-            V_ERRORREF(var) = &V_ERROR(realvar);
-            break;
-        case VT_BOOL:
-            V_BOOLREF(var) = &V_BOOL(realvar);
-            break;
-        case VT_UNKNOWN:
-            V_UNKNOWNREF(var) = &V_UNKNOWN(realvar);
-            break;
-        case VT_ARRAY:
-            V_ARRAYREF(var) = &V_ARRAY(realvar);
-            break;
-        default:
-            rb_raise(eWIN32OLERuntimeError, "unknown type specified(setting BYREF):%d", vt);
-            break;
-        }
-    }
-}
-
-static VALUE
-folevariant_s_allocate(VALUE klass)
-{
-    struct olevariantdata *pvar;
-    VALUE obj;
-    ole_initialize();
-    obj = TypedData_Make_Struct(klass, struct olevariantdata, &olevariant_datatype, pvar);
-    VariantInit(&(pvar->var));
-    VariantInit(&(pvar->realvar));
-    return obj;
-}
-
-/*
- *  call-seq:
- *     WIN32OLE_VARIANT.array(ary, vt)
- *
- *  Returns Ruby object wrapping OLE variant whose variant type is VT_ARRAY.
- *  The first argument should be Array object which specifies dimensions
- *  and each size of dimensions of OLE array.
- *  The second argument specifies variant type of the element of OLE array.
- *
- *  The following create 2 dimensions OLE array. The first dimensions size
- *  is 3, and the second is 4.
- *
- *     ole_ary = WIN32OLE_VARIANT.array([3,4], VT_I4)
- *     ruby_ary = ole_ary.value # => [[0, 0, 0, 0], [0, 0, 0, 0], [0, 0, 0, 0]]
- *
- */
-static VALUE
-folevariant_s_array(VALUE klass, VALUE elems, VALUE vvt)
-{
-    VALUE obj = Qnil;
-    VARTYPE vt;
-    struct olevariantdata *pvar;
-    SAFEARRAYBOUND *psab = NULL;
-    SAFEARRAY *psa = NULL;
-    UINT dim = 0;
-    UINT i = 0;
-
-    ole_initialize();
-
-    vt = RB_NUM2UINT(vvt);
-    vt = (vt | VT_ARRAY);
-    Check_Type(elems, T_ARRAY);
-    obj = folevariant_s_allocate(klass);
-
-    TypedData_Get_Struct(obj, struct olevariantdata, &olevariant_datatype, pvar);
-    dim = RARRAY_LEN(elems);
-
-    psab = ALLOC_N(SAFEARRAYBOUND, dim);
-
-    if(!psab) {
-        rb_raise(rb_eRuntimeError, "memory allocation error");
-    }
-
-    for (i = 0; i < dim; i++) {
-        psab[i].cElements = RB_FIX2INT(rb_ary_entry(elems, i));
-        psab[i].lLbound = 0;
-    }
-
-    psa = SafeArrayCreate((VARTYPE)(vt & VT_TYPEMASK), dim, psab);
-    if (psa == NULL) {
-        if (psab) free(psab);
-        rb_raise(rb_eRuntimeError, "memory allocation error(SafeArrayCreate)");
-    }
-
-    V_VT(&(pvar->var)) = vt;
-    if (vt & VT_BYREF) {
-        V_VT(&(pvar->realvar)) = (vt & ~VT_BYREF);
-        V_ARRAY(&(pvar->realvar)) = psa;
-        V_ARRAYREF(&(pvar->var)) = &(V_ARRAY(&(pvar->realvar)));
-    } else {
-        V_ARRAY(&(pvar->var)) = psa;
-    }
-    if (psab) free(psab);
-    return obj;
-}
-
-static void
-check_type_val2variant(VALUE val)
-{
-    VALUE elem;
-    int len = 0;
-    int i = 0;
-    if(!rb_obj_is_kind_of(val, cWIN32OLE) &&
-       !rb_obj_is_kind_of(val, cWIN32OLE_VARIANT) &&
-       !rb_obj_is_kind_of(val, rb_cTime)) {
-        switch (TYPE(val)) {
-        case T_ARRAY:
-            len = RARRAY_LEN(val);
-            for(i = 0; i < len; i++) {
-                elem = rb_ary_entry(val, i);
-                check_type_val2variant(elem);
-            }
-            break;
-        case T_STRING:
-        case T_FIXNUM:
-        case T_BIGNUM:
-        case T_FLOAT:
-        case T_TRUE:
-        case T_FALSE:
-        case T_NIL:
-            break;
-        default:
-            rb_raise(rb_eTypeError, "can not convert WIN32OLE_VARIANT from type %s",
-                     rb_obj_classname(val));
-        }
-    }
-}
-
-/*
- * Document-class: WIN32OLE_VARIANT
- *
- *   <code>WIN32OLE_VARIANT</code> objects represents OLE variant.
- *
- *   Win32OLE converts Ruby object into OLE variant automatically when
- *   invoking OLE methods. If OLE method requires the argument which is
- *   different from the variant by automatic conversion of Win32OLE, you
- *   can convert the specified variant type by using WIN32OLE_VARIANT class.
- *
- *     param = WIN32OLE_VARIANT.new(10, WIN32OLE::VARIANT::VT_R4)
- *     oleobj.method(param)
- *
- *   WIN32OLE_VARIANT does not support VT_RECORD variant. Use WIN32OLE_RECORD
- *   class instead of WIN32OLE_VARIANT if the VT_RECORD variant is needed.
- */
-
-/*
- *  call-seq:
- *     WIN32OLE_VARIANT.new(val, vartype) #=> WIN32OLE_VARIANT object.
- *
- *  Returns Ruby object wrapping OLE variant.
- *  The first argument specifies Ruby object to convert OLE variant variable.
- *  The second argument specifies VARIANT type.
- *  In some situation, you need the WIN32OLE_VARIANT object to pass OLE method
- *
- *     shell = WIN32OLE.new("Shell.Application")
- *     folder = shell.NameSpace("C:\\Windows")
- *     item = folder.ParseName("tmp.txt")
- *     # You can't use Ruby String object to call FolderItem.InvokeVerb.
- *     # Instead, you have to use WIN32OLE_VARIANT object to call the method.
- *     shortcut = WIN32OLE_VARIANT.new("Create Shortcut(\&S)")
- *     item.invokeVerb(shortcut)
- *
- */
-static VALUE
-folevariant_initialize(VALUE self, VALUE args)
-{
-    int len = 0;
-    VARIANT var;
-    VALUE val;
-    VALUE vvt;
-    VARTYPE vt;
-    struct olevariantdata *pvar;
-
-    len = RARRAY_LEN(args);
-    rb_check_arity(len, 1, 3);
-    VariantInit(&var);
-    val = rb_ary_entry(args, 0);
-
-    check_type_val2variant(val);
-
-    TypedData_Get_Struct(self, struct olevariantdata, &olevariant_datatype, pvar);
-    if (len == 1) {
-        ole_val2variant(val, &(pvar->var));
-    } else {
-        vvt = rb_ary_entry(args, 1);
-        vt = RB_NUM2INT(vvt);
-        if ((vt & VT_TYPEMASK) == VT_RECORD) {
-            rb_raise(rb_eArgError, "not supported VT_RECORD WIN32OLE_VARIANT object");
-        }
-        ole_val2olevariantdata(val, vt, pvar);
-    }
-    return self;
-}
-
-static SAFEARRAY *
-get_locked_safe_array(VALUE val)
-{
-    struct olevariantdata *pvar;
-    SAFEARRAY *psa = NULL;
-    HRESULT hr;
-    TypedData_Get_Struct(val, struct olevariantdata, &olevariant_datatype, pvar);
-    if (!(V_VT(&(pvar->var)) & VT_ARRAY)) {
-        rb_raise(rb_eTypeError, "variant type is not VT_ARRAY.");
-    }
-    psa = V_ISBYREF(&(pvar->var)) ? *V_ARRAYREF(&(pvar->var)) : V_ARRAY(&(pvar->var));
-    if (psa == NULL) {
-        return psa;
-    }
-    hr = SafeArrayLock(psa);
-    if (FAILED(hr)) {
-        ole_raise(hr, rb_eRuntimeError, "failed to SafeArrayLock");
-    }
-    return psa;
-}
-
-static LONG *
-ary2safe_array_index(int ary_size, VALUE *ary, SAFEARRAY *psa)
-{
-    long dim;
-    LONG *pid;
-    long i;
-    dim = SafeArrayGetDim(psa);
-    if (dim != ary_size) {
-        rb_raise(rb_eArgError, "unmatch number of indices");
-    }
-    pid = ALLOC_N(LONG, dim);
-    if (pid == NULL) {
-        rb_raise(rb_eRuntimeError, "failed to allocate memory for indices");
-    }
-    for (i = 0; i < dim; i++) {
-        pid[i] = RB_NUM2INT(ary[i]);
-    }
-    return pid;
-}
-
-static void
-unlock_safe_array(SAFEARRAY *psa)
-{
-    HRESULT hr;
-    hr = SafeArrayUnlock(psa);
-    if (FAILED(hr)) {
-        ole_raise(hr, rb_eRuntimeError, "failed to SafeArrayUnlock");
-    }
-}
-
-/*
- *  call-seq:
- *     WIN32OLE_VARIANT[i,j,...] #=> element of OLE array.
- *
- *  Returns the element of WIN32OLE_VARIANT object(OLE array).
- *  This method is available only when the variant type of
- *  WIN32OLE_VARIANT object is VT_ARRAY.
- *
- *  REMARK:
- *     The all indices should be 0 or natural number and
- *     lower than or equal to max indices.
- *     (This point is different with Ruby Array indices.)
- *
- *     obj = WIN32OLE_VARIANT.new([[1,2,3],[4,5,6]])
- *     p obj[0,0] # => 1
- *     p obj[1,0] # => 4
- *     p obj[2,0] # => WIN32OLERuntimeError
- *     p obj[0, -1] # => WIN32OLERuntimeError
- *
- */
-static VALUE
-folevariant_ary_aref(int argc, VALUE *argv, VALUE self)
-{
-    struct olevariantdata *pvar;
-    SAFEARRAY *psa;
-    VALUE val = Qnil;
-    VARIANT variant;
-    LONG *pid;
-    HRESULT hr;
-
-    TypedData_Get_Struct(self, struct olevariantdata, &olevariant_datatype, pvar);
-    if (!V_ISARRAY(&(pvar->var))) {
-        rb_raise(eWIN32OLERuntimeError,
-                 "`[]' is not available for this variant type object");
-    }
-    psa = get_locked_safe_array(self);
-    if (psa == NULL) {
-        return val;
-    }
-
-    pid = ary2safe_array_index(argc, argv, psa);
-
-    VariantInit(&variant);
-    V_VT(&variant) = (V_VT(&(pvar->var)) & ~VT_ARRAY) | VT_BYREF;
-    hr = SafeArrayPtrOfIndex(psa, pid, &V_BYREF(&variant));
-    if (FAILED(hr)) {
-        ole_raise(hr, eWIN32OLERuntimeError, "failed to SafeArrayPtrOfIndex");
-    }
-    val = ole_variant2val(&variant);
-
-    unlock_safe_array(psa);
-    if (pid) free(pid);
-    return val;
-}
-
-/*
- *  call-seq:
- *     WIN32OLE_VARIANT[i,j,...] = val #=> set the element of OLE array
- *
- *  Set the element of WIN32OLE_VARIANT object(OLE array) to val.
- *  This method is available only when the variant type of
- *  WIN32OLE_VARIANT object is VT_ARRAY.
- *
- *  REMARK:
- *     The all indices should be 0 or natural number and
- *     lower than or equal to max indices.
- *     (This point is different with Ruby Array indices.)
- *
- *     obj = WIN32OLE_VARIANT.new([[1,2,3],[4,5,6]])
- *     obj[0,0] = 7
- *     obj[1,0] = 8
- *     p obj.value # => [[7,2,3], [8,5,6]]
- *     obj[2,0] = 9 # => WIN32OLERuntimeError
- *     obj[0, -1] = 9 # => WIN32OLERuntimeError
- *
- */
-static VALUE
-folevariant_ary_aset(int argc, VALUE *argv, VALUE self)
-{
-    struct olevariantdata *pvar;
-    SAFEARRAY *psa;
-    VARIANT var;
-    VARTYPE vt;
-    LONG *pid;
-    HRESULT hr;
-    VOID *p = NULL;
-
-    TypedData_Get_Struct(self, struct olevariantdata, &olevariant_datatype, pvar);
-    if (!V_ISARRAY(&(pvar->var))) {
-        rb_raise(eWIN32OLERuntimeError,
-                 "`[]' is not available for this variant type object");
-    }
-    psa = get_locked_safe_array(self);
-    if (psa == NULL) {
-        rb_raise(rb_eRuntimeError, "failed to get SafeArray pointer");
-    }
-
-    pid = ary2safe_array_index(argc-1, argv, psa);
-
-    VariantInit(&var);
-    vt = (V_VT(&(pvar->var)) & ~VT_ARRAY);
-    p = val2variant_ptr(argv[argc-1], &var, vt);
-    if ((V_VT(&var) == VT_DISPATCH && V_DISPATCH(&var) == NULL) ||
-        (V_VT(&var) == VT_UNKNOWN && V_UNKNOWN(&var) == NULL)) {
-        rb_raise(eWIN32OLERuntimeError, "argument does not have IDispatch or IUnknown Interface");
-    }
-    hr = SafeArrayPutElement(psa, pid, p);
-    if (FAILED(hr)) {
-        ole_raise(hr, eWIN32OLERuntimeError, "failed to SafeArrayPutElement");
-    }
-
-    unlock_safe_array(psa);
-    if (pid) free(pid);
-    return argv[argc-1];
-}
-
-/*
- *  call-seq:
- *     WIN32OLE_VARIANT.value #=> Ruby object.
- *
- *  Returns Ruby object value from OLE variant.
- *     obj = WIN32OLE_VARIANT.new(1, WIN32OLE::VARIANT::VT_BSTR)
- *     obj.value # => "1" (not Integer object, but String object "1")
- *
- */
-static VALUE
-folevariant_value(VALUE self)
-{
-    struct olevariantdata *pvar;
-    VALUE val = Qnil;
-    VARTYPE vt;
-    int dim;
-    SAFEARRAY *psa;
-    TypedData_Get_Struct(self, struct olevariantdata, &olevariant_datatype, pvar);
-
-    val = ole_variant2val(&(pvar->var));
-    vt = V_VT(&(pvar->var));
-
-    if ((vt & ~VT_BYREF) == (VT_UI1|VT_ARRAY)) {
-        if (vt & VT_BYREF) {
-            psa = *V_ARRAYREF(&(pvar->var));
-        } else {
-            psa  = V_ARRAY(&(pvar->var));
-        }
-        if (!psa) {
-            return val;
-        }
-        dim = SafeArrayGetDim(psa);
-        if (dim == 1) {
-            val = rb_funcall(val, rb_intern("pack"), 1, rb_str_new2("C*"));
-        }
-    }
-    return val;
-}
-
-/*
- *  call-seq:
- *     WIN32OLE_VARIANT.vartype #=> OLE variant type.
- *
- *  Returns OLE variant type.
- *     obj = WIN32OLE_VARIANT.new("string")
- *     obj.vartype # => WIN32OLE::VARIANT::VT_BSTR
- *
- */
-static VALUE
-folevariant_vartype(VALUE self)
-{
-    struct olevariantdata *pvar;
-    TypedData_Get_Struct(self, struct olevariantdata, &olevariant_datatype, pvar);
-    return RB_INT2FIX(V_VT(&pvar->var));
-}
-
-/*
- *  call-seq:
- *     WIN32OLE_VARIANT.value = val #=> set WIN32OLE_VARIANT value to val.
- *
- *  Sets variant value to val. If the val type does not match variant value
- *  type(vartype), then val is changed to match variant value type(vartype)
- *  before setting val.
- *  This method is not available when vartype is VT_ARRAY(except VT_UI1|VT_ARRAY).
- *  If the vartype is VT_UI1|VT_ARRAY, the val should be String object.
- *
- *     obj = WIN32OLE_VARIANT.new(1) # obj.vartype is WIN32OLE::VARIANT::VT_I4
- *     obj.value = 3.2 # 3.2 is changed to 3 when setting value.
- *     p obj.value # => 3
- */
-static VALUE
-folevariant_set_value(VALUE self, VALUE val)
-{
-    struct olevariantdata *pvar;
-    VARTYPE vt;
-    TypedData_Get_Struct(self, struct olevariantdata, &olevariant_datatype, pvar);
-    vt = V_VT(&(pvar->var));
-    if (V_ISARRAY(&(pvar->var)) && ((vt & ~VT_BYREF) != (VT_UI1|VT_ARRAY) || !RB_TYPE_P(val, T_STRING))) {
-        rb_raise(eWIN32OLERuntimeError,
-                 "`value=' is not available for this variant type object");
-    }
-    ole_val2olevariantdata(val, vt, pvar);
-    return Qnil;
-}
-
-void
-ole_variant2variant(VALUE val, VARIANT *var)
-{
-    struct olevariantdata *pvar;
-    TypedData_Get_Struct(val, struct olevariantdata, &olevariant_datatype, pvar);
-    VariantCopy(var, &(pvar->var));
-}
-
-VALUE cWIN32OLE_VARIANT;
-
-void
-Init_win32ole_variant(void)
-{
-#undef rb_intern
-    cWIN32OLE_VARIANT = rb_define_class_under(cWIN32OLE, "Variant", rb_cObject);
-    rb_define_const(rb_cObject, "WIN32OLE_VARIANT", cWIN32OLE_VARIANT);
-    rb_define_alloc_func(cWIN32OLE_VARIANT, folevariant_s_allocate);
-    rb_define_singleton_method(cWIN32OLE_VARIANT, "array", folevariant_s_array, 2);
-    rb_define_method(cWIN32OLE_VARIANT, "initialize", folevariant_initialize, -2);
-    rb_define_method(cWIN32OLE_VARIANT, "value", folevariant_value, 0);
-    rb_define_method(cWIN32OLE_VARIANT, "value=", folevariant_set_value, 1);
-    rb_define_method(cWIN32OLE_VARIANT, "vartype", folevariant_vartype, 0);
-    rb_define_method(cWIN32OLE_VARIANT, "[]", folevariant_ary_aref, -1);
-    rb_define_method(cWIN32OLE_VARIANT, "[]=", folevariant_ary_aset, -1);
-
-    /*
-     * represents VT_EMPTY OLE object.
-     */
-    rb_define_const(cWIN32OLE_VARIANT, "Empty",
-            rb_funcall(cWIN32OLE_VARIANT, rb_intern("new"), 2, Qnil, RB_INT2FIX(VT_EMPTY)));
-
-    /*
-     * represents VT_NULL OLE object.
-     */
-    rb_define_const(cWIN32OLE_VARIANT, "Null",
-            rb_funcall(cWIN32OLE_VARIANT, rb_intern("new"), 2, Qnil, RB_INT2FIX(VT_NULL)));
-
-    /*
-     * represents Nothing of VB.NET or VB.
-     */
-    rb_define_const(cWIN32OLE_VARIANT, "Nothing",
-            rb_funcall(cWIN32OLE_VARIANT, rb_intern("new"), 2, Qnil, RB_INT2FIX(VT_DISPATCH)));
-
-    /*
-     * represents VT_ERROR variant with DISP_E_PARAMNOTFOUND.
-     * This constants is used for not specified parameter.
-     *
-     *  fso = WIN32OLE.new("Scripting.FileSystemObject")
-     *  fso.openTextFile(filename, WIN32OLE_VARIANT::NoParam, false)
-     */
-    rb_define_const(cWIN32OLE_VARIANT, "NoParam",
-            rb_funcall(cWIN32OLE_VARIANT, rb_intern("new"), 2, INT2NUM(DISP_E_PARAMNOTFOUND), RB_INT2FIX(VT_ERROR)));
-}
diff --git a/ext/win32ole/win32ole_variant.h b/ext/win32ole/win32ole_variant.h
deleted file mode 100644
index 4bd3b0aeea462f..00000000000000
--- a/ext/win32ole/win32ole_variant.h
+++ /dev/null
@@ -1,9 +0,0 @@
-#ifndef WIN32OLE_VARIANT_H
-#define WIN32OLE_VARIANT_H 1
-
-extern VALUE cWIN32OLE_VARIANT;
-void ole_variant2variant(VALUE val, VARIANT *var);
-void Init_win32ole_variant(void);
-
-#endif
-
diff --git a/ext/win32ole/win32ole_variant_m.c b/ext/win32ole/win32ole_variant_m.c
deleted file mode 100644
index c285a001776695..00000000000000
--- a/ext/win32ole/win32ole_variant_m.c
+++ /dev/null
@@ -1,151 +0,0 @@
-#include "win32ole.h"
-
-VALUE mWIN32OLE_VARIANT;
-
-void Init_win32ole_variant_m(void)
-{
-    /*
-     * Document-module: WIN32OLE::VARIANT
-     *
-     * The WIN32OLE::VARIANT module includes constants of VARIANT type constants.
-     * The constants is used when creating WIN32OLE_VARIANT object.
-     *
-     *   obj = WIN32OLE_VARIANT.new("2e3", WIN32OLE::VARIANT::VT_R4)
-     *   obj.value # => 2000.0
-     *
-     */
-    mWIN32OLE_VARIANT = rb_define_module_under(cWIN32OLE, "VARIANT");
-
-    /*
-     * represents VT_EMPTY type constant.
-     */
-    rb_define_const(mWIN32OLE_VARIANT, "VT_EMPTY", RB_INT2FIX(VT_EMPTY));
-
-    /*
-     * represents VT_NULL type constant.
-     */
-    rb_define_const(mWIN32OLE_VARIANT, "VT_NULL", RB_INT2FIX(VT_NULL));
-
-    /*
-     * represents VT_I2 type constant.
-     */
-    rb_define_const(mWIN32OLE_VARIANT, "VT_I2", RB_INT2FIX(VT_I2));
-
-    /*
-     * represents VT_I4 type constant.
-     */
-    rb_define_const(mWIN32OLE_VARIANT, "VT_I4", RB_INT2FIX(VT_I4));
-
-    /*
-     * represents VT_R4 type constant.
-     */
-    rb_define_const(mWIN32OLE_VARIANT, "VT_R4", RB_INT2FIX(VT_R4));
-
-    /*
-     * represents VT_R8 type constant.
-     */
-    rb_define_const(mWIN32OLE_VARIANT, "VT_R8", RB_INT2FIX(VT_R8));
-
-    /*
-     * represents VT_CY type constant.
-     */
-    rb_define_const(mWIN32OLE_VARIANT, "VT_CY", RB_INT2FIX(VT_CY));
-
-    /*
-     * represents VT_DATE type constant.
-     */
-    rb_define_const(mWIN32OLE_VARIANT, "VT_DATE", RB_INT2FIX(VT_DATE));
-
-    /*
-     * represents VT_BSTR type constant.
-     */
-    rb_define_const(mWIN32OLE_VARIANT, "VT_BSTR", RB_INT2FIX(VT_BSTR));
-
-    /*
-     * represents VT_USERDEFINED type constant.
-     */
-    rb_define_const(mWIN32OLE_VARIANT, "VT_USERDEFINED", RB_INT2FIX(VT_USERDEFINED));
-
-    /*
-     * represents VT_PTR type constant.
-     */
-    rb_define_const(mWIN32OLE_VARIANT, "VT_PTR", RB_INT2FIX(VT_PTR));
-
-    /*
-     * represents VT_DISPATCH type constant.
-     */
-    rb_define_const(mWIN32OLE_VARIANT, "VT_DISPATCH", RB_INT2FIX(VT_DISPATCH));
-
-    /*
-     * represents VT_ERROR type constant.
-     */
-    rb_define_const(mWIN32OLE_VARIANT, "VT_ERROR", RB_INT2FIX(VT_ERROR));
-
-    /*
-     * represents VT_BOOL type constant.
-     */
-    rb_define_const(mWIN32OLE_VARIANT, "VT_BOOL", RB_INT2FIX(VT_BOOL));
-
-    /*
-     * represents VT_VARIANT type constant.
-     */
-    rb_define_const(mWIN32OLE_VARIANT, "VT_VARIANT", RB_INT2FIX(VT_VARIANT));
-
-    /*
-     * represents VT_UNKNOWN type constant.
-     */
-    rb_define_const(mWIN32OLE_VARIANT, "VT_UNKNOWN", RB_INT2FIX(VT_UNKNOWN));
-
-    /*
-     * represents VT_I1 type constant.
-     */
-    rb_define_const(mWIN32OLE_VARIANT, "VT_I1", RB_INT2FIX(VT_I1));
-
-    /*
-     * represents VT_UI1 type constant.
-     */
-    rb_define_const(mWIN32OLE_VARIANT, "VT_UI1", RB_INT2FIX(VT_UI1));
-
-    /*
-     * represents VT_UI2 type constant.
-     */
-    rb_define_const(mWIN32OLE_VARIANT, "VT_UI2", RB_INT2FIX(VT_UI2));
-
-    /*
-     * represents VT_UI4 type constant.
-     */
-    rb_define_const(mWIN32OLE_VARIANT, "VT_UI4", RB_INT2FIX(VT_UI4));
-
-#if (defined(_MSC_VER) && (_MSC_VER >= 1300)) || defined(__CYGWIN__) || defined(__MINGW32__)
-    /*
-     * represents VT_I8 type constant.
-     */
-    rb_define_const(mWIN32OLE_VARIANT, "VT_I8", RB_INT2FIX(VT_I8));
-
-    /*
-     * represents VT_UI8 type constant.
-     */
-    rb_define_const(mWIN32OLE_VARIANT, "VT_UI8", RB_INT2FIX(VT_UI8));
-#endif
-
-    /*
-     * represents VT_INT type constant.
-     */
-    rb_define_const(mWIN32OLE_VARIANT, "VT_INT", RB_INT2FIX(VT_INT));
-
-    /*
-     * represents VT_UINT type constant.
-     */
-    rb_define_const(mWIN32OLE_VARIANT, "VT_UINT", RB_INT2FIX(VT_UINT));
-
-    /*
-     * represents VT_ARRAY type constant.
-     */
-    rb_define_const(mWIN32OLE_VARIANT, "VT_ARRAY", RB_INT2FIX(VT_ARRAY));
-
-    /*
-     * represents VT_BYREF type constant.
-     */
-    rb_define_const(mWIN32OLE_VARIANT, "VT_BYREF", RB_INT2FIX(VT_BYREF));
-
-}
diff --git a/ext/win32ole/win32ole_variant_m.h b/ext/win32ole/win32ole_variant_m.h
deleted file mode 100644
index 6272a6578f3c78..00000000000000
--- a/ext/win32ole/win32ole_variant_m.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#ifndef WIN32OLE_VARIANT_M_H
-#define WIN32OLE_VARIANT_M_H 1
-
-extern VALUE mWIN32OLE_VARIANT;
-void Init_win32ole_variant_m(void);
-
-#endif
diff --git a/ext/zlib/depend b/ext/zlib/depend
index bdcf6a93e81ac7..22e9ca867a06d0 100644
--- a/ext/zlib/depend
+++ b/ext/zlib/depend
@@ -138,6 +138,7 @@ zlib.o: $(hdrdir)/ruby/internal/intern/re.h
 zlib.o: $(hdrdir)/ruby/internal/intern/ruby.h
 zlib.o: $(hdrdir)/ruby/internal/intern/select.h
 zlib.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+zlib.o: $(hdrdir)/ruby/internal/intern/set.h
 zlib.o: $(hdrdir)/ruby/internal/intern/signal.h
 zlib.o: $(hdrdir)/ruby/internal/intern/sprintf.h
 zlib.o: $(hdrdir)/ruby/internal/intern/string.h
@@ -157,6 +158,7 @@ zlib.o: $(hdrdir)/ruby/internal/special_consts.h
 zlib.o: $(hdrdir)/ruby/internal/static_assert.h
 zlib.o: $(hdrdir)/ruby/internal/stdalign.h
 zlib.o: $(hdrdir)/ruby/internal/stdbool.h
+zlib.o: $(hdrdir)/ruby/internal/stdckdint.h
 zlib.o: $(hdrdir)/ruby/internal/symbol.h
 zlib.o: $(hdrdir)/ruby/internal/value.h
 zlib.o: $(hdrdir)/ruby/internal/value_type.h
diff --git a/ext/zlib/extconf.rb b/ext/zlib/extconf.rb
index 1254c62a1785bf..2b2dbb1a5b5b46 100644
--- a/ext/zlib/extconf.rb
+++ b/ext/zlib/extconf.rb
@@ -120,12 +120,18 @@
     $defs << "-DHAVE_CRC32_COMBINE"
     $defs << "-DHAVE_ADLER32_COMBINE"
     $defs << "-DHAVE_TYPE_Z_CRC_T"
-    $defs << "-DHAVE_TYPE_Z_SIZE_T"
+    $defs << "-DHAVE_CRC32_Z"
+    $defs << "-DHAVE_ADLER32_Z"
+    $defs << "-DHAVE_ZLIB_SIZE_T_FUNCS"
   else
     have_func('crc32_combine', 'zlib.h')
     have_func('adler32_combine', 'zlib.h')
     have_type('z_crc_t', 'zlib.h')
-    have_type('z_size_t', 'zlib.h')
+    if (have_type('z_size_t', 'zlib.h') &&
+        have_func('crc32_z', 'zlib.h') &&
+        have_func('adler32_z', 'zlib.h'))
+      $defs << "-DHAVE_ZLIB_SIZE_T_FUNCS"
+    end
   end
 
   create_makefile('zlib') {|conf|
diff --git a/ext/zlib/zlib.c b/ext/zlib/zlib.c
index ef6e8921ba7232..0b9c4d65ee8694 100644
--- a/ext/zlib/zlib.c
+++ b/ext/zlib/zlib.c
@@ -25,7 +25,7 @@
 # define VALGRIND_MAKE_MEM_UNDEFINED(p, n) 0
 #endif
 
-#define RUBY_ZLIB_VERSION "3.0.0"
+#define RUBY_ZLIB_VERSION "3.2.1"
 
 #ifndef RB_PASS_CALLED_KEYWORDS
 # define rb_class_new_instance_kw(argc, argv, klass, kw_splat) rb_class_new_instance(argc, argv, klass)
@@ -44,7 +44,7 @@
 #endif
 #endif
 
-#if defined(HAVE_TYPE_Z_SIZE_T)
+#if defined(HAVE_ZLIB_SIZE_T_FUNCS)
 typedef uLong (*checksum_func)(uLong, const Bytef*, z_size_t);
 # define crc32 crc32_z
 # define adler32 adler32_z
@@ -90,7 +90,7 @@ static void zstream_expand_buffer_into(struct zstream*, unsigned long);
 static int zstream_expand_buffer_non_stream(struct zstream *z);
 static void zstream_append_buffer(struct zstream*, const Bytef*, long);
 static VALUE zstream_detach_buffer(struct zstream*);
-static VALUE zstream_shift_buffer(struct zstream*, long);
+static VALUE zstream_shift_buffer(struct zstream*, long, VALUE);
 static void zstream_buffer_ungets(struct zstream*, const Bytef*, unsigned long);
 static void zstream_buffer_ungetbyte(struct zstream*, int);
 static void zstream_append_input(struct zstream*, const Bytef*, long);
@@ -170,8 +170,8 @@ static void gzfile_check_footer(struct gzfile*, VALUE outbuf);
 static void gzfile_write(struct gzfile*, Bytef*, long);
 static long gzfile_read_more(struct gzfile*, VALUE outbuf);
 static void gzfile_calc_crc(struct gzfile*, VALUE);
-static VALUE gzfile_read(struct gzfile*, long);
-static VALUE gzfile_read_all(struct gzfile*);
+static VALUE gzfile_read(struct gzfile*, long, VALUE);
+static VALUE gzfile_read_all(struct gzfile*, VALUE);
 static void gzfile_ungets(struct gzfile*, const Bytef*, long);
 static void gzfile_ungetbyte(struct gzfile*, int);
 static VALUE gzfile_writer_end_run(VALUE);
@@ -388,7 +388,7 @@ rb_zlib_version(VALUE klass)
 # define mask32(x) (x)
 #endif
 
-#if SIZEOF_LONG > SIZEOF_INT && !defined(HAVE_TYPE_Z_SIZE_T)
+#if SIZEOF_LONG > SIZEOF_INT && !defined(HAVE_ZLIB_SIZE_T_FUNCS)
 static uLong
 checksum_long(uLong (*func)(uLong, const Bytef*, uInt), uLong sum, const Bytef *ptr, long len)
 {
@@ -674,9 +674,7 @@ zstream_expand_buffer(struct zstream *z)
 	        rb_obj_reveal(z->buf, rb_cString);
             }
 
-            rb_mutex_unlock(z->mutex);
-	    rb_protect(rb_yield, z->buf, &state);
-            rb_mutex_lock(z->mutex);
+            rb_protect(rb_yield, z->buf, &state);
 
             if (ZSTREAM_REUSE_BUFFER_P(z)) {
                 rb_str_modify(z->buf);
@@ -720,15 +718,14 @@ zstream_expand_buffer_into(struct zstream *z, unsigned long size)
     }
 }
 
-static void *
-zstream_expand_buffer_protect(void *ptr)
+static int
+zstream_expand_buffer_protect(struct zstream *z)
 {
-    struct zstream *z = (struct zstream *)ptr;
     int state = 0;
 
     rb_protect((VALUE (*)(VALUE))zstream_expand_buffer, (VALUE)z, &state);
 
-    return (void *)(VALUE)state;
+    return state;
 }
 
 static int
@@ -820,19 +817,31 @@ zstream_detach_buffer(struct zstream *z)
 }
 
 static VALUE
-zstream_shift_buffer(struct zstream *z, long len)
+zstream_shift_buffer(struct zstream *z, long len, VALUE dst)
 {
-    VALUE dst;
     char *bufptr;
     long buflen = ZSTREAM_BUF_FILLED(z);
 
     if (buflen <= len) {
-	return zstream_detach_buffer(z);
+        if (NIL_P(dst) || (!ZSTREAM_IS_FINISHED(z) && !ZSTREAM_IS_GZFILE(z) &&
+                rb_block_given_p())) {
+            return zstream_detach_buffer(z);
+        } else {
+            bufptr = RSTRING_PTR(z->buf);
+            rb_str_resize(dst, buflen);
+            memcpy(RSTRING_PTR(dst), bufptr, buflen);
+        }
+        buflen = 0;
+    } else {
+        bufptr = RSTRING_PTR(z->buf);
+        if (NIL_P(dst)) {
+            dst = rb_str_new(bufptr, len);
+        } else {
+            rb_str_resize(dst, len);
+            memcpy(RSTRING_PTR(dst), bufptr, len);
+        }
+        buflen -= len;
     }
-
-    bufptr = RSTRING_PTR(z->buf);
-    dst = rb_str_new(bufptr, len);
-    buflen -= len;
     memmove(bufptr, bufptr + len, buflen);
     rb_str_set_len(z->buf, buflen);
     z->stream.next_out = (Bytef*)RSTRING_END(z->buf);
@@ -1011,57 +1020,14 @@ zstream_ensure_end(VALUE v)
 }
 
 static void *
-zstream_run_func(void *ptr)
+zstream_run_once(void *_arguments)
 {
-    struct zstream_run_args *args = (struct zstream_run_args *)ptr;
-    int err, state, flush = args->flush;
-    struct zstream *z = args->z;
-    uInt n;
-
-    err = Z_OK;
-    while (!args->interrupt) {
-	n = z->stream.avail_out;
-	err = z->func->run(&z->stream, flush);
-	rb_str_set_len(z->buf, ZSTREAM_BUF_FILLED(z) + (n - z->stream.avail_out));
+    struct zstream_run_args *arguments = (struct zstream_run_args *)_arguments;
+    struct zstream *z = arguments->z;
 
-	if (err == Z_STREAM_END) {
-	    z->flags &= ~ZSTREAM_FLAG_IN_STREAM;
-	    z->flags |= ZSTREAM_FLAG_FINISHED;
-	    break;
-	}
+    uintptr_t error = z->func->run(&z->stream, arguments->flush);
 
-	if (err != Z_OK && err != Z_BUF_ERROR)
-	    break;
-
-	if (z->stream.avail_out > 0) {
-	    z->flags |= ZSTREAM_FLAG_IN_STREAM;
-	    break;
-	}
-
-	if (z->stream.avail_in == 0 && z->func == &inflate_funcs) {
-	    /* break here because inflate() return Z_BUF_ERROR when avail_in == 0. */
-	    /* but deflate() could be called with avail_in == 0 (there's hidden buffer
-	       in zstream->state) */
-	    z->flags |= ZSTREAM_FLAG_IN_STREAM;
-	    break;
-	}
-
-	if (args->stream_output) {
-	    state = (int)(VALUE)rb_thread_call_with_gvl(zstream_expand_buffer_protect,
-							(void *)z);
-	}
-	else {
-	    state = zstream_expand_buffer_non_stream(z);
-	}
-
-	if (state) {
-	    err = Z_OK; /* buffer expanded but stream processing was stopped */
-	    args->jump_state = state;
-	    break;
-	}
-    }
-
-    return (void *)(VALUE)err;
+    return (void*)error;
 }
 
 /*
@@ -1076,6 +1042,91 @@ zstream_unblock_func(void *ptr)
     args->interrupt = 1;
 }
 
+#ifndef RB_NOGVL_OFFLOAD_SAFE
+// Default to no-op if it's not defined:
+#define RB_NOGVL_OFFLOAD_SAFE 0
+#endif
+
+static VALUE
+zstream_run_once_begin(VALUE _arguments)
+{
+    struct zstream_run_args *arguments = (struct zstream_run_args *)_arguments;
+    struct zstream *z = arguments->z;
+
+    rb_str_locktmp(z->buf);
+
+#ifndef RB_NOGVL_UBF_ASYNC_SAFE
+    return (VALUE)rb_thread_call_without_gvl(zstream_run_once, (void *)arguments, zstream_unblock_func, (void *)arguments);
+#else
+    return (VALUE)rb_nogvl(zstream_run_once, (void *)arguments, zstream_unblock_func, (void *)arguments, RB_NOGVL_UBF_ASYNC_SAFE | RB_NOGVL_OFFLOAD_SAFE);
+#endif
+}
+
+static VALUE
+zstream_run_once_ensure(VALUE _arguments)
+{
+    struct zstream_run_args *arguments = (struct zstream_run_args *)_arguments;
+    struct zstream *z = arguments->z;
+
+    rb_str_unlocktmp(z->buf);
+
+    return Qnil;
+}
+
+static int
+zstream_run_func(struct zstream_run_args *args)
+{
+    struct zstream *z = args->z;
+    int state;
+    uInt n;
+
+    int err = Z_OK;
+    while (!args->interrupt) {
+        n = z->stream.avail_out;
+
+        err = (int)(VALUE)rb_ensure(zstream_run_once_begin, (VALUE)args, zstream_run_once_ensure, (VALUE)args);
+
+        rb_str_set_len(z->buf, ZSTREAM_BUF_FILLED(z) + (n - z->stream.avail_out));
+
+        if (err == Z_STREAM_END) {
+            z->flags &= ~ZSTREAM_FLAG_IN_STREAM;
+            z->flags |= ZSTREAM_FLAG_FINISHED;
+            break;
+        }
+
+        if (err != Z_OK && err != Z_BUF_ERROR)
+            break;
+
+        if (z->stream.avail_out > 0) {
+            z->flags |= ZSTREAM_FLAG_IN_STREAM;
+            break;
+        }
+
+        if (z->stream.avail_in == 0 && z->func == &inflate_funcs) {
+            /* break here because inflate() return Z_BUF_ERROR when avail_in == 0. */
+            /* but deflate() could be called with avail_in == 0 (there's hidden buffer
+                in zstream->state) */
+            z->flags |= ZSTREAM_FLAG_IN_STREAM;
+            break;
+        }
+
+        if (args->stream_output) {
+            state = zstream_expand_buffer_protect(z);
+        }
+        else {
+            state = zstream_expand_buffer_non_stream(z);
+        }
+
+        if (state) {
+            err = Z_OK; /* buffer expanded but stream processing was stopped */
+            args->jump_state = state;
+            break;
+        }
+    }
+
+    return err;
+}
+
 static VALUE
 zstream_run_try(VALUE value_arg)
 {
@@ -1088,6 +1139,12 @@ zstream_run_try(VALUE value_arg)
     int err;
     VALUE old_input = Qnil;
 
+    /* Cannot start zstream while it is in progress. */
+    if (z->flags & ZSTREAM_IN_PROGRESS) {
+	rb_raise(cInProgressError, "zlib stream is in progress");
+    }
+    z->flags |= ZSTREAM_IN_PROGRESS;
+
     if (NIL_P(z->input) && len == 0) {
 	z->stream.next_in = (Bytef*)"";
 	z->stream.avail_in = 0;
@@ -1108,14 +1165,7 @@ zstream_run_try(VALUE value_arg)
     }
 
 loop:
-#ifndef RB_NOGVL_UBF_ASYNC_SAFE
-    err = (int)(VALUE)rb_thread_call_without_gvl(zstream_run_func, (void *)args,
-						 zstream_unblock_func, (void *)args);
-#else
-    err = (int)(VALUE)rb_nogvl(zstream_run_func, (void *)args,
-                               zstream_unblock_func, (void *)args,
-                               RB_NOGVL_UBF_ASYNC_SAFE);
-#endif
+    err = zstream_run_func(args);
 
     /* retry if no exception is thrown */
     if (err == Z_OK && args->interrupt) {
@@ -1155,9 +1205,6 @@ zstream_run_try(VALUE value_arg)
 	rb_str_resize(old_input, 0);
     }
 
-    if (args->jump_state)
-	rb_jump_tag(args->jump_state);
-
     return Qnil;
 }
 
@@ -1165,25 +1212,10 @@ static VALUE
 zstream_run_ensure(VALUE value_arg)
 {
     struct zstream_run_args *args = (struct zstream_run_args *)value_arg;
+    struct zstream *z = args->z;
 
     /* Remove ZSTREAM_IN_PROGRESS flag to signal that this zstream is not in use. */
-    args->z->flags &= ~ZSTREAM_IN_PROGRESS;
-
-    return Qnil;
-}
-
-static VALUE
-zstream_run_synchronized(VALUE value_arg)
-{
-    struct zstream_run_args *args = (struct zstream_run_args *)value_arg;
-
-    /* Cannot start zstream while it is in progress. */
-    if (args->z->flags & ZSTREAM_IN_PROGRESS) {
-        rb_raise(cInProgressError, "zlib stream is in progress");
-    }
-    args->z->flags |= ZSTREAM_IN_PROGRESS;
-
-    rb_ensure(zstream_run_try, value_arg, zstream_run_ensure, value_arg);
+    z->flags &= ~ZSTREAM_IN_PROGRESS;
 
     return Qnil;
 }
@@ -1200,7 +1232,10 @@ zstream_run(struct zstream *z, Bytef *src, long len, int flush)
         .jump_state = 0,
         .stream_output = !ZSTREAM_IS_GZFILE(z) && rb_block_given_p(),
     };
-    rb_mutex_synchronize(z->mutex, zstream_run_synchronized, (VALUE)&args);
+
+    rb_ensure(zstream_run_try, (VALUE)&args, zstream_run_ensure, (VALUE)&args);
+    if (args.jump_state)
+	rb_jump_tag(args.jump_state);
 }
 
 static VALUE
@@ -1509,7 +1544,7 @@ rb_zstream_total_out(VALUE obj)
 }
 
 /*
- * Guesses the type of the data which have been inputed into the stream. The
+ * Guesses the type of the data which have been inputted into the stream. The
  * returned value is either <tt>BINARY</tt>, <tt>ASCII</tt>, or
  * <tt>UNKNOWN</tt>.
  */
@@ -1766,6 +1801,22 @@ do_deflate(struct zstream *z, VALUE src, int flush)
     }
 }
 
+struct rb_zlib_deflate_arguments {
+    struct zstream *z;
+    VALUE src;
+    int flush;
+};
+
+static VALUE
+rb_deflate_deflate_body(VALUE args)
+{
+    struct rb_zlib_deflate_arguments *arguments = (struct rb_zlib_deflate_arguments *)args;
+
+    do_deflate(arguments->z, arguments->src, arguments->flush);
+
+    return zstream_detach_buffer(arguments->z);
+}
+
 /*
  * Document-method: Zlib::Deflate#deflate
  *
@@ -1797,11 +1848,10 @@ rb_deflate_deflate(int argc, VALUE *argv, VALUE obj)
 {
     struct zstream *z = get_zstream(obj);
     VALUE src, flush;
-
     rb_scan_args(argc, argv, "11", &src, &flush);
-    do_deflate(z, src, ARG_FLUSH(flush));
+    struct rb_zlib_deflate_arguments arguments = {z, src, ARG_FLUSH(flush)};
 
-    return zstream_detach_buffer(z);
+    return rb_mutex_synchronize(z->mutex, rb_deflate_deflate_body, (VALUE)&arguments);
 }
 
 /*
@@ -2097,56 +2147,19 @@ rb_inflate_add_dictionary(VALUE obj, VALUE dictionary)
     return obj;
 }
 
-/*
- * Document-method: Zlib::Inflate#inflate
- *
- * call-seq:
- *   inflate(deflate_string, buffer: nil)                 -> String
- *   inflate(deflate_string, buffer: nil) { |chunk| ... } -> nil
- *
- * Inputs +deflate_string+ into the inflate stream and returns the output from
- * the stream.  Calling this method, both the input and the output buffer of
- * the stream are flushed.  If string is +nil+, this method finishes the
- * stream, just like Zlib::ZStream#finish.
- *
- * If a block is given consecutive inflated chunks from the +deflate_string+
- * are yielded to the block and +nil+ is returned.
- *
- * If a :buffer keyword argument is given and not nil:
- *
- * * The :buffer keyword should be a String, and will used as the output buffer.
- *   Using this option can reuse the memory required during inflation.
- * * When not passing a block, the return value will be the same object as the
- *   :buffer keyword argument.
- * * When passing a block, the yielded chunks will be the same value as the
- *   :buffer keyword argument.
- *
- * Raises a Zlib::NeedDict exception if a preset dictionary is needed to
- * decompress.  Set the dictionary by Zlib::Inflate#set_dictionary and then
- * call this method again with an empty string to flush the stream:
- *
- *   inflater = Zlib::Inflate.new
- *
- *   begin
- *     out = inflater.inflate compressed
- *   rescue Zlib::NeedDict
- *     # ensure the dictionary matches the stream's required dictionary
- *     raise unless inflater.adler == Zlib.adler32(dictionary)
- *
- *     inflater.set_dictionary dictionary
- *     inflater.inflate ''
- *   end
- *
- *   # ...
- *
- *   inflater.close
- *
- * See also Zlib::Inflate.new
- */
+struct rb_zlib_inflate_arguments {
+    struct zstream *z;
+    int argc;
+    VALUE *argv;
+};
+
 static VALUE
-rb_inflate_inflate(int argc, VALUE* argv, VALUE obj)
+rb_inflate_inflate_body(VALUE _arguments)
 {
-    struct zstream *z = get_zstream(obj);
+    struct rb_zlib_inflate_arguments *arguments = (struct rb_zlib_inflate_arguments*)_arguments;
+    struct zstream *z = arguments->z;
+    int argc = arguments->argc;
+    VALUE *argv = arguments->argv;
     VALUE dst, src, opts, buffer = Qnil;
 
     if (OPTHASH_GIVEN_P(opts)) {
@@ -2201,6 +2214,60 @@ rb_inflate_inflate(int argc, VALUE* argv, VALUE obj)
     return dst;
 }
 
+/*
+ * Document-method: Zlib::Inflate#inflate
+ *
+ * call-seq:
+ *   inflate(deflate_string, buffer: nil)                 -> String
+ *   inflate(deflate_string, buffer: nil) { |chunk| ... } -> nil
+ *
+ * Inputs +deflate_string+ into the inflate stream and returns the output from
+ * the stream.  Calling this method, both the input and the output buffer of
+ * the stream are flushed.  If string is +nil+, this method finishes the
+ * stream, just like Zlib::ZStream#finish.
+ *
+ * If a block is given consecutive inflated chunks from the +deflate_string+
+ * are yielded to the block and +nil+ is returned.
+ *
+ * If a :buffer keyword argument is given and not nil:
+ *
+ * * The :buffer keyword should be a String, and will used as the output buffer.
+ *   Using this option can reuse the memory required during inflation.
+ * * When not passing a block, the return value will be the same object as the
+ *   :buffer keyword argument.
+ * * When passing a block, the yielded chunks will be the same value as the
+ *   :buffer keyword argument.
+ *
+ * Raises a Zlib::NeedDict exception if a preset dictionary is needed to
+ * decompress.  Set the dictionary by Zlib::Inflate#set_dictionary and then
+ * call this method again with an empty string to flush the stream:
+ *
+ *   inflater = Zlib::Inflate.new
+ *
+ *   begin
+ *     out = inflater.inflate compressed
+ *   rescue Zlib::NeedDict
+ *     # ensure the dictionary matches the stream's required dictionary
+ *     raise unless inflater.adler == Zlib.adler32(dictionary)
+ *
+ *     inflater.set_dictionary dictionary
+ *     inflater.inflate ''
+ *   end
+ *
+ *   # ...
+ *
+ *   inflater.close
+ *
+ * See also Zlib::Inflate.new
+ */
+static VALUE
+rb_inflate_inflate(int argc, VALUE* argv, VALUE obj)
+{
+    struct zstream *z = get_zstream(obj);
+    struct rb_zlib_inflate_arguments arguments = {z, argc, argv};
+    return rb_mutex_synchronize(z->mutex, rb_inflate_inflate_body, (VALUE)&arguments);
+}
+
 /*
  * call-seq: << string
  *
@@ -2874,18 +2941,18 @@ gzfile_newstr(struct gzfile *gz, VALUE str)
 }
 
 static long
-gzfile_fill(struct gzfile *gz, long len)
+gzfile_fill(struct gzfile *gz, long len, VALUE outbuf)
 {
     if (len < 0)
         rb_raise(rb_eArgError, "negative length %ld given", len);
     if (len == 0)
 	return 0;
     while (!ZSTREAM_IS_FINISHED(&gz->z) && ZSTREAM_BUF_FILLED(&gz->z) < len) {
-	gzfile_read_more(gz, Qnil);
+	gzfile_read_more(gz, outbuf);
     }
     if (GZFILE_IS_FINISHED(gz)) {
 	if (!(gz->z.flags & GZFILE_FLAG_FOOTER_FINISHED)) {
-	    gzfile_check_footer(gz, Qnil);
+	    gzfile_check_footer(gz, outbuf);
 	}
 	return -1;
     }
@@ -2893,14 +2960,27 @@ gzfile_fill(struct gzfile *gz, long len)
 }
 
 static VALUE
-gzfile_read(struct gzfile *gz, long len)
+gzfile_read(struct gzfile *gz, long len, VALUE outbuf)
 {
     VALUE dst;
 
-    len = gzfile_fill(gz, len);
-    if (len == 0) return rb_str_new(0, 0);
-    if (len < 0) return Qnil;
-    dst = zstream_shift_buffer(&gz->z, len);
+    len = gzfile_fill(gz, len, outbuf);
+
+    if (len < 0) {
+        if (!NIL_P(outbuf))
+            rb_str_resize(outbuf, 0);
+        return Qnil;
+    }
+    if (len == 0) {
+        if (NIL_P(outbuf))
+            return rb_str_new(0, 0);
+        else {
+            rb_str_resize(outbuf, 0);
+            return outbuf;
+        }
+    }
+
+    dst = zstream_shift_buffer(&gz->z, len, outbuf);
     if (!NIL_P(dst)) gzfile_calc_crc(gz, dst);
     return dst;
 }
@@ -2933,29 +3013,26 @@ gzfile_readpartial(struct gzfile *gz, long len, VALUE outbuf)
 	rb_raise(rb_eEOFError, "end of file reached");
     }
 
-    dst = zstream_shift_buffer(&gz->z, len);
+    dst = zstream_shift_buffer(&gz->z, len, outbuf);
     gzfile_calc_crc(gz, dst);
 
-    if (!NIL_P(outbuf)) {
-        rb_str_resize(outbuf, RSTRING_LEN(dst));
-        memcpy(RSTRING_PTR(outbuf), RSTRING_PTR(dst), RSTRING_LEN(dst));
-	dst = outbuf;
-    }
     return dst;
 }
 
 static VALUE
-gzfile_read_all(struct gzfile *gz)
+gzfile_read_all(struct gzfile *gz, VALUE dst)
 {
-    VALUE dst;
-
     while (!ZSTREAM_IS_FINISHED(&gz->z)) {
-	gzfile_read_more(gz, Qnil);
+	gzfile_read_more(gz, dst);
     }
     if (GZFILE_IS_FINISHED(gz)) {
 	if (!(gz->z.flags & GZFILE_FLAG_FOOTER_FINISHED)) {
-	    gzfile_check_footer(gz, Qnil);
+	    gzfile_check_footer(gz, dst);
 	}
+        if (!NIL_P(dst)) {
+            rb_str_resize(dst, 0);
+            return dst;
+        }
 	return rb_str_new(0, 0);
     }
 
@@ -2993,7 +3070,7 @@ gzfile_getc(struct gzfile *gz)
         de = (unsigned char *)ds + GZFILE_CBUF_CAPA;
         (void)rb_econv_convert(gz->ec, &sp, se, &dp, de, ECONV_PARTIAL_INPUT|ECONV_AFTER_OUTPUT);
         rb_econv_check_error(gz->ec);
-	dst = zstream_shift_buffer(&gz->z, sp - ss);
+	dst = zstream_shift_buffer(&gz->z, sp - ss, Qnil);
 	gzfile_calc_crc(gz, dst);
 	rb_str_resize(cbuf, dp - ds);
 	return cbuf;
@@ -3001,7 +3078,7 @@ gzfile_getc(struct gzfile *gz)
     else {
 	buf = gz->z.buf;
 	len = rb_enc_mbclen(RSTRING_PTR(buf), RSTRING_END(buf), gz->enc);
-	dst = gzfile_read(gz, len);
+	dst = gzfile_read(gz, len, Qnil);
 	if (NIL_P(dst)) return dst;
 	return gzfile_newstr(gz, dst);
     }
@@ -3500,6 +3577,9 @@ static VALUE
 rb_gzfile_eof_p(VALUE obj)
 {
     struct gzfile *gz = get_gzfile(obj);
+    while (!ZSTREAM_IS_FINISHED(&gz->z) && ZSTREAM_BUF_FILLED(&gz->z) == 0) {
+	gzfile_read_more(gz, Qnil);
+    }
     return GZFILE_IS_FINISHED(gz) ? Qtrue : Qfalse;
 }
 
@@ -3906,7 +3986,7 @@ rb_gzreader_s_zcat(int argc, VALUE *argv, VALUE klass)
             if (!buf) {
                 buf = rb_str_new(0, 0);
             }
-            tmpbuf = gzfile_read_all(get_gzfile(obj));
+            tmpbuf = gzfile_read_all(get_gzfile(obj), Qnil);
             rb_str_cat(buf, RSTRING_PTR(tmpbuf), RSTRING_LEN(tmpbuf));
         }
 
@@ -4008,19 +4088,19 @@ static VALUE
 rb_gzreader_read(int argc, VALUE *argv, VALUE obj)
 {
     struct gzfile *gz = get_gzfile(obj);
-    VALUE vlen;
+    VALUE vlen, outbuf;
     long len;
 
-    rb_scan_args(argc, argv, "01", &vlen);
+    rb_scan_args(argc, argv, "02", &vlen, &outbuf);
     if (NIL_P(vlen)) {
-	return gzfile_read_all(gz);
+	return gzfile_read_all(gz, outbuf);
     }
 
     len = NUM2INT(vlen);
     if (len < 0) {
 	rb_raise(rb_eArgError, "negative length %ld given", len);
     }
-    return gzfile_read(gz, len);
+    return gzfile_read(gz, len, outbuf);
 }
 
 /*
@@ -4029,7 +4109,7 @@ rb_gzreader_read(int argc, VALUE *argv, VALUE obj)
  *  call-seq:
  *     gzipreader.readpartial(maxlen [, outbuf]) => string, outbuf
  *
- *  Reads at most <i>maxlen</i> bytes from the gziped stream but
+ *  Reads at most <i>maxlen</i> bytes from the gzipped stream but
  *  it blocks only if <em>gzipreader</em> has no data immediately available.
  *  If the optional <i>outbuf</i> argument is present,
  *  it must reference a String, which will receive the data.
@@ -4093,7 +4173,7 @@ rb_gzreader_getbyte(VALUE obj)
     struct gzfile *gz = get_gzfile(obj);
     VALUE dst;
 
-    dst = gzfile_read(gz, 1);
+    dst = gzfile_read(gz, 1, Qnil);
     if (!NIL_P(dst)) {
 	dst = INT2FIX((unsigned int)(RSTRING_PTR(dst)[0]) & 0xff);
     }
@@ -4204,6 +4284,7 @@ gzreader_skip_linebreaks(struct gzfile *gz)
     while (n++, *(p++) == '\n') {
 	if (n >= ZSTREAM_BUF_FILLED(&gz->z)) {
 	    str = zstream_detach_buffer(&gz->z);
+	    ASSUME(!NIL_P(str));
 	    gzfile_calc_crc(gz, str);
 	    while (ZSTREAM_BUF_FILLED(&gz->z) == 0) {
 		if (GZFILE_IS_FINISHED(gz)) return;
@@ -4214,7 +4295,7 @@ gzreader_skip_linebreaks(struct gzfile *gz)
 	}
     }
 
-    str = zstream_shift_buffer(&gz->z, n - 1);
+    str = zstream_shift_buffer(&gz->z, n - 1, Qnil);
     gzfile_calc_crc(gz, str);
 }
 
@@ -4235,7 +4316,7 @@ gzreader_charboundary(struct gzfile *gz, long n)
     if (l < n) {
 	int n_bytes = rb_enc_precise_mbclen(p, e, gz->enc);
 	if (MBCLEN_NEEDMORE_P(n_bytes)) {
-	    if ((l = gzfile_fill(gz, n + MBCLEN_NEEDMORE_LEN(n_bytes))) > 0) {
+	    if ((l = gzfile_fill(gz, n + MBCLEN_NEEDMORE_LEN(n_bytes), Qnil)) > 0) {
 		return l;
 	    }
 	}
@@ -4287,10 +4368,10 @@ gzreader_gets(int argc, VALUE *argv, VALUE obj)
 
     if (NIL_P(rs)) {
 	if (limit < 0) {
-	    dst = gzfile_read_all(gz);
+	    dst = gzfile_read_all(gz, Qnil);
 	    if (RSTRING_LEN(dst) == 0) return Qnil;
 	}
-	else if ((n = gzfile_fill(gz, limit)) <= 0) {
+	else if ((n = gzfile_fill(gz, limit, Qnil)) <= 0) {
 	    return Qnil;
 	}
 	else {
@@ -4300,7 +4381,7 @@ gzreader_gets(int argc, VALUE *argv, VALUE obj)
 	    else {
 		n = limit;
 	    }
-	    dst = zstream_shift_buffer(&gz->z, n);
+	    dst = zstream_shift_buffer(&gz->z, n, Qnil);
 	    if (NIL_P(dst)) return dst;
 	    gzfile_calc_crc(gz, dst);
 	    dst = gzfile_newstr(gz, dst);
@@ -4327,7 +4408,7 @@ gzreader_gets(int argc, VALUE *argv, VALUE obj)
     while (ZSTREAM_BUF_FILLED(&gz->z) < rslen) {
 	if (ZSTREAM_IS_FINISHED(&gz->z)) {
 	    if (ZSTREAM_BUF_FILLED(&gz->z) > 0) gz->lineno++;
-	    return gzfile_read(gz, rslen);
+	    return gzfile_read(gz, rslen, Qnil);
 	}
 	gzfile_read_more(gz, Qnil);
     }
@@ -4364,7 +4445,7 @@ gzreader_gets(int argc, VALUE *argv, VALUE obj)
     }
 
     gz->lineno++;
-    dst = gzfile_read(gz, n);
+    dst = gzfile_read(gz, n, Qnil);
     if (NIL_P(dst)) return dst;
     if (rspara) {
 	gzreader_skip_linebreaks(gz);
@@ -4612,6 +4693,7 @@ zlib_gunzip_run(VALUE arg)
 
     gzfile_read_header(gz, Qnil);
     dst = zstream_detach_buffer(&gz->z);
+    ASSUME(!NIL_P(dst));
     gzfile_calc_crc(gz, dst);
     if (!ZSTREAM_IS_FINISHED(&gz->z)) {
 	rb_raise(cGzError, "unexpected end of file");
diff --git a/ext/zlib/zlib.gemspec b/ext/zlib/zlib.gemspec
index 4a5f8f2ee820cb..345dc5f22575e1 100644
--- a/ext/zlib/zlib.gemspec
+++ b/ext/zlib/zlib.gemspec
@@ -22,10 +22,10 @@ Gem::Specification.new do |spec|
   spec.homepage      = "https://github.com/ruby/zlib"
   spec.licenses       = ["Ruby", "BSD-2-Clause"]
 
-  spec.files         = ["LICENSE.txt", "README.md", "ext/zlib/extconf.rb", "ext/zlib/zlib.c", "zlib.gemspec"]
+  spec.files         = ["COPYING", "BSDL", "README.md", "ext/zlib/extconf.rb", "ext/zlib/zlib.c", "zlib.gemspec"]
   spec.bindir        = "exe"
   spec.executables   = []
   spec.require_paths = ["lib"]
   spec.extensions    = "ext/zlib/extconf.rb"
-  spec.required_ruby_version = ">= 2.3.0"
+  spec.required_ruby_version = ">= 2.5.0"
 end
diff --git a/file.c b/file.c
index 4a5c8a8f8aa965..936e0cdb9564fa 100644
--- a/file.c
+++ b/file.c
@@ -131,6 +131,14 @@ int flock(int, int);
 # define STAT(p, s)      stat((p), (s))
 #endif /* _WIN32 */
 
+#ifdef HAVE_STRUCT_STATX_STX_BTIME
+# define ST_(name) stx_ ## name
+typedef struct statx_timestamp stat_timestamp;
+#else
+# define ST_(name) st_ ## name
+typedef struct timespec stat_timestamp;
+#endif
+
 #if defined _WIN32 || defined __APPLE__
 # define USE_OSPATH 1
 # define TO_OSPATH(str) rb_str_encode_ospath(str)
@@ -172,6 +180,13 @@ int flock(int, int);
 #include "ruby/thread.h"
 #include "ruby/util.h"
 
+#define UIANY2NUM(x) \
+    ((sizeof(x) <= sizeof(unsigned int)) ? \
+     UINT2NUM((unsigned)(x)) : \
+     (sizeof(x) <= sizeof(unsigned long)) ? \
+     ULONG2NUM((unsigned long)(x)) : \
+     ULL2NUM((unsigned LONG_LONG)(x)))
+
 VALUE rb_cFile;
 VALUE rb_mFileTest;
 VALUE rb_cStat;
@@ -271,6 +286,18 @@ rb_str_encode_ospath(VALUE path)
 # define NORMALIZE_UTF8PATH 1
 
 # ifdef HAVE_WORKING_FORK
+static CFMutableStringRef
+mutable_CFString_new(CFStringRef *s, const char *ptr, long len)
+{
+    const CFAllocatorRef alloc = kCFAllocatorDefault;
+    *s = CFStringCreateWithBytesNoCopy(alloc, (const UInt8 *)ptr, len,
+                                       kCFStringEncodingUTF8, FALSE,
+                                       kCFAllocatorNull);
+    return CFStringCreateMutableCopy(alloc, len, *s);
+}
+
+#   define mutable_CFString_release(m, s) (CFRelease(m), CFRelease(s))
+
 static void
 rb_CFString_class_initialize_before_fork(void)
 {
@@ -297,15 +324,17 @@ rb_CFString_class_initialize_before_fork(void)
     /* Enough small but non-empty ASCII string to fit in NSTaggedPointerString. */
     const char small_str[] = "/";
     long len = sizeof(small_str) - 1;
-
-    const CFAllocatorRef alloc = kCFAllocatorDefault;
-    CFStringRef s = CFStringCreateWithBytesNoCopy(alloc,
-                                                  (const UInt8 *)small_str,
-                                                  len, kCFStringEncodingUTF8,
-                                                  FALSE, kCFAllocatorNull);
-    CFMutableStringRef m = CFStringCreateMutableCopy(alloc, len, s);
-    CFRelease(m);
-    CFRelease(s);
+    CFStringRef s;
+    /*
+     * Touch `CFStringCreateWithBytesNoCopy` *twice* because the implementation
+     * shipped with macOS 15.0 24A5331b does not return `NSTaggedPointerString`
+     * instance for the first call (totally not sure why). CoreFoundation
+     * shipped with macOS 15.1 does not have this issue.
+     */
+    for (int i = 0; i < 2; i++) {
+        CFMutableStringRef m = mutable_CFString_new(&s, small_str, len);
+        mutable_CFString_release(m, s);
+    }
 }
 # endif /* HAVE_WORKING_FORK */
 
@@ -314,11 +343,8 @@ rb_str_append_normalized_ospath(VALUE str, const char *ptr, long len)
 {
     CFIndex buflen = 0;
     CFRange all;
-    CFStringRef s = CFStringCreateWithBytesNoCopy(kCFAllocatorDefault,
-                                                  (const UInt8 *)ptr, len,
-                                                  kCFStringEncodingUTF8, FALSE,
-                                                  kCFAllocatorNull);
-    CFMutableStringRef m = CFStringCreateMutableCopy(kCFAllocatorDefault, len, s);
+    CFStringRef s;
+    CFMutableStringRef m = mutable_CFString_new(&s, ptr, len);
     long oldlen = RSTRING_LEN(str);
 
     CFStringNormalize(m, kCFStringNormalizationFormC);
@@ -328,8 +354,7 @@ rb_str_append_normalized_ospath(VALUE str, const char *ptr, long len)
     CFStringGetBytes(m, all, kCFStringEncodingUTF8, '?', FALSE,
                      (UInt8 *)(RSTRING_PTR(str) + oldlen), buflen, &buflen);
     rb_str_set_len(str, oldlen + buflen);
-    CFRelease(m);
-    CFRelease(s);
+    mutable_CFString_release(m, s);
     return str;
 }
 
@@ -468,7 +493,7 @@ apply2files(int (*func)(const char *, void *), int argc, VALUE *argv, void *arg)
         aa->fn[aa->i].path = path;
     }
 
-    rb_thread_call_without_gvl(no_gvl_apply2files, aa, RUBY_UBF_IO, 0);
+    IO_WITHOUT_GVL(no_gvl_apply2files, aa);
     if (aa->errnum) {
 #ifdef UTIME_EINVAL
         if (func == utime_internal) {
@@ -483,48 +508,99 @@ apply2files(int (*func)(const char *, void *), int argc, VALUE *argv, void *arg)
     return LONG2FIX(argc);
 }
 
-static size_t
-stat_memsize(const void *p)
-{
-    return sizeof(struct stat);
-}
+static stat_timestamp stat_atimespec(const struct stat *st);
+static stat_timestamp stat_mtimespec(const struct stat *st);
+static stat_timestamp stat_ctimespec(const struct stat *st);
 
 static const rb_data_type_t stat_data_type = {
     "stat",
-    {NULL, RUBY_TYPED_DEFAULT_FREE, stat_memsize,},
-    0, 0, RUBY_TYPED_FREE_IMMEDIATELY | RUBY_TYPED_WB_PROTECTED
+    {
+        NULL,
+        RUBY_TYPED_DEFAULT_FREE,
+        NULL, // No external memory to report
+    },
+    0, 0, RUBY_TYPED_FREE_IMMEDIATELY | RUBY_TYPED_WB_PROTECTED | RUBY_TYPED_EMBEDDABLE
 };
 
-static VALUE
-stat_new_0(VALUE klass, const struct stat *st)
+struct rb_stat {
+    rb_io_stat_data stat;
+    bool initialized;
+};
+
+static struct rb_stat *
+stat_alloc(VALUE klass, VALUE *obj)
 {
-    struct stat *nst = 0;
-    VALUE obj = TypedData_Wrap_Struct(klass, &stat_data_type, 0);
+    struct rb_stat *rb_st;
+    *obj = TypedData_Make_Struct(klass, struct rb_stat, &stat_data_type, rb_st);
+    return rb_st;
+}
 
+VALUE
+rb_stat_new(const struct stat *st)
+{
+    VALUE obj;
+    struct rb_stat *rb_st = stat_alloc(rb_cStat, &obj);
     if (st) {
-        nst = ALLOC(struct stat);
-        *nst = *st;
-        RTYPEDDATA_DATA(obj) = nst;
+#if RUBY_USE_STATX
+# define CP(m) .stx_ ## m = st->st_ ## m
+# define CP_32(m) .stx_ ## m = (uint32_t)st->st_ ## m
+# define CP_TS(m) .stx_ ## m = stat_ ## m ## spec(st)
+        rb_st->stat = (struct statx){
+            .stx_mask = STATX_BASIC_STATS,
+            CP(mode),
+            CP_32(nlink),
+            CP(uid),
+            CP(gid),
+            CP_TS(atime),
+            CP_TS(mtime),
+            CP_TS(ctime),
+            CP(ino),
+            CP(size),
+            CP(blocks),
+        };
+# undef CP
+# undef CP_TS
+#else
+        rb_st->stat = *st;
+#endif
+        rb_st->initialized = true;
     }
+
     return obj;
 }
 
+#ifndef rb_statx_new
 VALUE
-rb_stat_new(const struct stat *st)
+rb_statx_new(const rb_io_stat_data *st)
 {
-    return stat_new_0(rb_cStat, st);
+    VALUE obj;
+    struct rb_stat *rb_st = stat_alloc(rb_cStat, &obj);
+    if (st) {
+        rb_st->stat = *st;
+        rb_st->initialized = true;
+    }
+    return obj;
 }
+#endif
 
-static struct stat*
+static rb_io_stat_data*
 get_stat(VALUE self)
 {
-    struct stat* st;
-    TypedData_Get_Struct(self, struct stat, &stat_data_type, st);
-    if (!st) rb_raise(rb_eTypeError, "uninitialized File::Stat");
-    return st;
+    struct rb_stat* rb_st;
+    TypedData_Get_Struct(self, struct rb_stat, &stat_data_type, rb_st);
+    if (!rb_st->initialized) rb_raise(rb_eTypeError, "uninitialized File::Stat");
+    return &rb_st->stat;
 }
 
-static struct timespec stat_mtimespec(const struct stat *st);
+#if RUBY_USE_STATX
+static stat_timestamp
+statx_mtimespec(const rb_io_stat_data *st)
+{
+    return st->stx_mtime;
+}
+#else
+# define statx_mtimespec stat_mtimespec
+#endif
 
 /*
  *  call-seq:
@@ -545,8 +621,8 @@ static VALUE
 rb_stat_cmp(VALUE self, VALUE other)
 {
     if (rb_obj_is_kind_of(other, rb_obj_class(self))) {
-        struct timespec ts1 = stat_mtimespec(get_stat(self));
-        struct timespec ts2 = stat_mtimespec(get_stat(other));
+        stat_timestamp ts1 = statx_mtimespec(get_stat(self));
+        stat_timestamp ts2 = statx_mtimespec(get_stat(other));
         if (ts1.tv_sec == ts2.tv_sec) {
             if (ts1.tv_nsec == ts2.tv_nsec) return INT2FIX(0);
             if (ts1.tv_nsec < ts2.tv_nsec) return INT2FIX(-1);
@@ -583,7 +659,11 @@ rb_stat_cmp(VALUE self, VALUE other)
 static VALUE
 rb_stat_dev(VALUE self)
 {
-#if SIZEOF_STRUCT_STAT_ST_DEV <= SIZEOF_DEV_T
+#if RUBY_USE_STATX
+    unsigned int m = get_stat(self)->stx_dev_major;
+    unsigned int n = get_stat(self)->stx_dev_minor;
+    return ULL2NUM(makedev(m, n));
+#elif SIZEOF_STRUCT_STAT_ST_DEV <= SIZEOF_DEV_T
     return DEVT2NUM(get_stat(self)->st_dev);
 #elif SIZEOF_STRUCT_STAT_ST_DEV <= SIZEOF_LONG
     return ULONG2NUM(get_stat(self)->st_dev);
@@ -606,7 +686,9 @@ rb_stat_dev(VALUE self)
 static VALUE
 rb_stat_dev_major(VALUE self)
 {
-#if defined(major)
+#if RUBY_USE_STATX
+    return UINT2NUM(get_stat(self)->stx_dev_major);
+#elif defined(major)
     return UINT2NUM(major(get_stat(self)->st_dev));
 #else
     return Qnil;
@@ -627,7 +709,9 @@ rb_stat_dev_major(VALUE self)
 static VALUE
 rb_stat_dev_minor(VALUE self)
 {
-#if defined(minor)
+#if RUBY_USE_STATX
+    return UINT2NUM(get_stat(self)->stx_dev_minor);
+#elif defined(minor)
     return UINT2NUM(minor(get_stat(self)->st_dev));
 #else
     return Qnil;
@@ -647,16 +731,15 @@ rb_stat_dev_minor(VALUE self)
 static VALUE
 rb_stat_ino(VALUE self)
 {
+    rb_io_stat_data *ptr = get_stat(self);
 #ifdef HAVE_STRUCT_STAT_ST_INOHIGH
     /* assume INTEGER_PACK_LSWORD_FIRST and st_inohigh is just next of st_ino */
-    return rb_integer_unpack(&get_stat(self)->st_ino, 2,
+    return rb_integer_unpack(&ptr->st_ino, 2,
             SIZEOF_STRUCT_STAT_ST_INO, 0,
             INTEGER_PACK_LSWORD_FIRST|INTEGER_PACK_NATIVE_BYTE_ORDER|
             INTEGER_PACK_2COMP);
-#elif SIZEOF_STRUCT_STAT_ST_INO > SIZEOF_LONG
-    return ULL2NUM(get_stat(self)->st_ino);
 #else
-    return ULONG2NUM(get_stat(self)->st_ino);
+    return UIANY2NUM(ptr->ST_(ino));
 #endif
 }
 
@@ -676,7 +759,7 @@ rb_stat_ino(VALUE self)
 static VALUE
 rb_stat_mode(VALUE self)
 {
-    return UINT2NUM(ST2UINT(get_stat(self)->st_mode));
+    return UINT2NUM(ST2UINT(get_stat(self)->ST_(mode)));
 }
 
 /*
@@ -695,20 +778,9 @@ static VALUE
 rb_stat_nlink(VALUE self)
 {
     /* struct stat::st_nlink is nlink_t in POSIX.  Not the case for Windows. */
-    const struct stat *ptr = get_stat(self);
+    const rb_io_stat_data *ptr = get_stat(self);
 
-    if (sizeof(ptr->st_nlink) <= sizeof(int)) {
-        return UINT2NUM((unsigned)ptr->st_nlink);
-    }
-    else if (sizeof(ptr->st_nlink) == sizeof(long)) {
-        return ULONG2NUM((unsigned long)ptr->st_nlink);
-    }
-    else if (sizeof(ptr->st_nlink) == sizeof(LONG_LONG)) {
-        return ULL2NUM((unsigned LONG_LONG)ptr->st_nlink);
-    }
-    else {
-        rb_bug(":FIXME: don't know what to do");
-    }
+    return UIANY2NUM(ptr->ST_(nlink));
 }
 
 /*
@@ -724,7 +796,7 @@ rb_stat_nlink(VALUE self)
 static VALUE
 rb_stat_uid(VALUE self)
 {
-    return UIDT2NUM(get_stat(self)->st_uid);
+    return UIDT2NUM(get_stat(self)->ST_(uid));
 }
 
 /*
@@ -740,7 +812,7 @@ rb_stat_uid(VALUE self)
 static VALUE
 rb_stat_gid(VALUE self)
 {
-    return GIDT2NUM(get_stat(self)->st_gid);
+    return GIDT2NUM(get_stat(self)->ST_(gid));
 }
 
 /*
@@ -758,16 +830,18 @@ rb_stat_gid(VALUE self)
 static VALUE
 rb_stat_rdev(VALUE self)
 {
-#ifdef HAVE_STRUCT_STAT_ST_RDEV
-# if SIZEOF_STRUCT_STAT_ST_RDEV <= SIZEOF_DEV_T
-    return DEVT2NUM(get_stat(self)->st_rdev);
-# elif SIZEOF_STRUCT_STAT_ST_RDEV <= SIZEOF_LONG
-    return ULONG2NUM(get_stat(self)->st_rdev);
-# else
-    return ULL2NUM(get_stat(self)->st_rdev);
-# endif
-#else
+#if RUBY_USE_STATX
+    unsigned int m = get_stat(self)->stx_rdev_major;
+    unsigned int n = get_stat(self)->stx_rdev_minor;
+    return ULL2NUM(makedev(m, n));
+#elif !defined(HAVE_STRUCT_STAT_ST_RDEV)
     return Qnil;
+#elif SIZEOF_STRUCT_STAT_ST_RDEV <= SIZEOF_DEV_T
+    return DEVT2NUM(get_stat(self)->ST_(rdev));
+#elif SIZEOF_STRUCT_STAT_ST_RDEV <= SIZEOF_LONG
+    return ULONG2NUM(get_stat(self)->ST_(rdev));
+#else
+    return ULL2NUM(get_stat(self)->ST_(rdev));
 #endif
 }
 
@@ -785,8 +859,10 @@ rb_stat_rdev(VALUE self)
 static VALUE
 rb_stat_rdev_major(VALUE self)
 {
-#if defined(HAVE_STRUCT_STAT_ST_RDEV) && defined(major)
-    return UINT2NUM(major(get_stat(self)->st_rdev));
+#if RUBY_USE_STATX
+    return UINT2NUM(get_stat(self)->stx_rdev_major);
+#elif defined(HAVE_STRUCT_STAT_ST_RDEV) && defined(major)
+    return UINT2NUM(major(get_stat(self)->ST_(rdev)));
 #else
     return Qnil;
 #endif
@@ -806,8 +882,10 @@ rb_stat_rdev_major(VALUE self)
 static VALUE
 rb_stat_rdev_minor(VALUE self)
 {
-#if defined(HAVE_STRUCT_STAT_ST_RDEV) && defined(minor)
-    return UINT2NUM(minor(get_stat(self)->st_rdev));
+#if RUBY_USE_STATX
+    return UINT2NUM(get_stat(self)->stx_rdev_minor);
+#elif defined(HAVE_STRUCT_STAT_ST_RDEV) && defined(minor)
+    return UINT2NUM(minor(get_stat(self)->ST_(rdev)));
 #else
     return Qnil;
 #endif
@@ -825,7 +903,7 @@ rb_stat_rdev_minor(VALUE self)
 static VALUE
 rb_stat_size(VALUE self)
 {
-    return OFFT2NUM(get_stat(self)->st_size);
+    return OFFT2NUM(get_stat(self)->ST_(size));
 }
 
 /*
@@ -843,7 +921,7 @@ static VALUE
 rb_stat_blksize(VALUE self)
 {
 #ifdef HAVE_STRUCT_STAT_ST_BLKSIZE
-    return ULONG2NUM(get_stat(self)->st_blksize);
+    return ULONG2NUM(get_stat(self)->ST_(blksize));
 #else
     return Qnil;
 #endif
@@ -865,34 +943,44 @@ rb_stat_blocks(VALUE self)
 {
 #ifdef HAVE_STRUCT_STAT_ST_BLOCKS
 # if SIZEOF_STRUCT_STAT_ST_BLOCKS > SIZEOF_LONG
-    return ULL2NUM(get_stat(self)->st_blocks);
+    return ULL2NUM(get_stat(self)->ST_(blocks));
 # else
-    return ULONG2NUM(get_stat(self)->st_blocks);
+    return ULONG2NUM(get_stat(self)->ST_(blocks));
 # endif
 #else
     return Qnil;
 #endif
 }
 
-static struct timespec
+static stat_timestamp
 stat_atimespec(const struct stat *st)
 {
-    struct timespec ts;
+    stat_timestamp ts;
     ts.tv_sec = st->st_atime;
 #if defined(HAVE_STRUCT_STAT_ST_ATIM)
-    ts.tv_nsec = st->st_atim.tv_nsec;
+    ts.tv_nsec = (uint32_t)st->st_atim.tv_nsec;
 #elif defined(HAVE_STRUCT_STAT_ST_ATIMESPEC)
-    ts.tv_nsec = st->st_atimespec.tv_nsec;
+    ts.tv_nsec = (uint32_t)st->st_atimespec.tv_nsec;
 #elif defined(HAVE_STRUCT_STAT_ST_ATIMENSEC)
-    ts.tv_nsec = (long)st->st_atimensec;
+    ts.tv_nsec = (uint32_t)st->st_atimensec;
 #else
-    ts.tv_nsec = 0;
+    ts.tv_nsec = 0
 #endif
     return ts;
 }
 
+#if RUBY_USE_STATX
+static stat_timestamp
+statx_atimespec(const rb_io_stat_data *st)
+{
+    return st->stx_atime;
+}
+#else
+# define statx_atimespec stat_atimespec
+#endif
+
 static VALUE
-stat_time(const struct timespec ts)
+stat_time(const stat_timestamp ts)
 {
     return rb_time_nano_new(ts.tv_sec, ts.tv_nsec);
 }
@@ -903,17 +991,17 @@ stat_atime(const struct stat *st)
     return stat_time(stat_atimespec(st));
 }
 
-static struct timespec
+static stat_timestamp
 stat_mtimespec(const struct stat *st)
 {
-    struct timespec ts;
+    stat_timestamp ts;
     ts.tv_sec = st->st_mtime;
 #if defined(HAVE_STRUCT_STAT_ST_MTIM)
-    ts.tv_nsec = st->st_mtim.tv_nsec;
+    ts.tv_nsec = (uint32_t)st->st_mtim.tv_nsec;
 #elif defined(HAVE_STRUCT_STAT_ST_MTIMESPEC)
-    ts.tv_nsec = st->st_mtimespec.tv_nsec;
+    ts.tv_nsec = (uint32_t)st->st_mtimespec.tv_nsec;
 #elif defined(HAVE_STRUCT_STAT_ST_MTIMENSEC)
-    ts.tv_nsec = (long)st->st_mtimensec;
+    ts.tv_nsec = (uint32_t)st->st_mtimensec;
 #else
     ts.tv_nsec = 0;
 #endif
@@ -926,23 +1014,33 @@ stat_mtime(const struct stat *st)
     return stat_time(stat_mtimespec(st));
 }
 
-static struct timespec
+static stat_timestamp
 stat_ctimespec(const struct stat *st)
 {
-    struct timespec ts;
+    stat_timestamp ts;
     ts.tv_sec = st->st_ctime;
 #if defined(HAVE_STRUCT_STAT_ST_CTIM)
-    ts.tv_nsec = st->st_ctim.tv_nsec;
+    ts.tv_nsec = (uint32_t)st->st_ctim.tv_nsec;
 #elif defined(HAVE_STRUCT_STAT_ST_CTIMESPEC)
-    ts.tv_nsec = st->st_ctimespec.tv_nsec;
+    ts.tv_nsec = (uint32_t)st->st_ctimespec.tv_nsec;
 #elif defined(HAVE_STRUCT_STAT_ST_CTIMENSEC)
-    ts.tv_nsec = (long)st->st_ctimensec;
+    ts.tv_nsec = (uint32_t)st->st_ctimensec;
 #else
     ts.tv_nsec = 0;
 #endif
     return ts;
 }
 
+#if RUBY_USE_STATX
+static stat_timestamp
+statx_ctimespec(const rb_io_stat_data *st)
+{
+    return st->stx_ctime;
+}
+#else
+# define statx_ctimespec stat_ctimespec
+#endif
+
 static VALUE
 stat_ctime(const struct stat *st)
 {
@@ -951,16 +1049,16 @@ stat_ctime(const struct stat *st)
 
 #define HAVE_STAT_BIRTHTIME
 #if defined(HAVE_STRUCT_STAT_ST_BIRTHTIMESPEC)
-typedef struct stat statx_data;
 static VALUE
-stat_birthtime(const struct stat *st)
+statx_birthtime(const rb_io_stat_data *st)
 {
-    const struct timespec *ts = &st->st_birthtimespec;
+    const stat_timestamp *ts = &st->ST_(birthtimespec);
     return rb_time_nano_new(ts->tv_sec, ts->tv_nsec);
 }
+#elif defined(HAVE_STRUCT_STATX_STX_BTIME)
+static VALUE statx_birthtime(const rb_io_stat_data *st);
 #elif defined(_WIN32)
-typedef struct stat statx_data;
-# define stat_birthtime stat_ctime
+# define statx_birthtime stat_ctime
 #else
 # undef HAVE_STAT_BIRTHTIME
 #endif /* defined(HAVE_STRUCT_STAT_ST_BIRTHTIMESPEC) */
@@ -979,7 +1077,7 @@ typedef struct stat statx_data;
 static VALUE
 rb_stat_atime(VALUE self)
 {
-    return stat_atime(get_stat(self));
+    return stat_time(statx_atimespec(get_stat(self)));
 }
 
 /*
@@ -995,7 +1093,7 @@ rb_stat_atime(VALUE self)
 static VALUE
 rb_stat_mtime(VALUE self)
 {
-    return stat_mtime(get_stat(self));
+    return stat_time(statx_mtimespec(get_stat(self)));
 }
 
 /*
@@ -1015,7 +1113,7 @@ rb_stat_mtime(VALUE self)
 static VALUE
 rb_stat_ctime(VALUE self)
 {
-    return stat_ctime(get_stat(self));
+    return stat_time(statx_ctimespec(get_stat(self)));
 }
 
 #if defined(HAVE_STAT_BIRTHTIME)
@@ -1044,7 +1142,7 @@ rb_stat_ctime(VALUE self)
 static VALUE
 rb_stat_birthtime(VALUE self)
 {
-    return stat_birthtime(get_stat(self));
+    return statx_birthtime(get_stat(self));
 }
 #else
 # define rb_stat_birthtime rb_f_notimplement
@@ -1092,9 +1190,9 @@ rb_stat_inspect(VALUE self)
 #endif
     };
 
-    struct stat* st;
-    TypedData_Get_Struct(self, struct stat, &stat_data_type, st);
-    if (!st) {
+    struct rb_stat* rb_st;
+    TypedData_Get_Struct(self, struct rb_stat, &stat_data_type, rb_st);
+    if (!rb_st->initialized) {
         return rb_sprintf("#<%s: uninitialized>", rb_obj_classname(self));
     }
 
@@ -1142,14 +1240,14 @@ no_gvl_fstat(void *data)
 }
 
 static int
-fstat_without_gvl(int fd, struct stat *st)
+fstat_without_gvl(rb_io_t *fptr, struct stat *st)
 {
     no_gvl_stat_data data;
 
-    data.file.fd = fd;
+    data.file.fd = fptr->fd;
     data.st = st;
 
-    return (int)(VALUE)rb_thread_io_blocking_region(no_gvl_fstat, &data, fd);
+    return (int)rb_io_blocking_region(fptr, no_gvl_fstat, &data);
 }
 
 static void *
@@ -1167,13 +1265,14 @@ stat_without_gvl(const char *path, struct stat *st)
     data.file.path = path;
     data.st = st;
 
-    return (int)(VALUE)rb_thread_call_without_gvl(no_gvl_stat, &data,
-                                                  RUBY_UBF_IO, NULL);
+    return IO_WITHOUT_GVL_INT(no_gvl_stat, &data);
 }
 
 #if !defined(HAVE_STRUCT_STAT_ST_BIRTHTIMESPEC) && \
     defined(HAVE_STRUCT_STATX_STX_BTIME)
 
+# define STATX(path, st, mask) statx(AT_FDCWD, path, 0, mask, st)
+
 # ifndef HAVE_STATX
 #   ifdef HAVE_SYSCALL_H
 #     include <syscall.h>
@@ -1191,18 +1290,18 @@ statx(int dirfd, const char *pathname, int flags,
 #   endif /* __linux__ */
 # endif /* HAVE_STATX */
 
-typedef struct no_gvl_statx_data {
+typedef struct no_gvl_rb_io_stat_data {
     struct statx *stx;
     int fd;
     const char *path;
     int flags;
     unsigned int mask;
-} no_gvl_statx_data;
+} no_gvl_rb_io_stat_data;
 
 static VALUE
 io_blocking_statx(void *data)
 {
-    no_gvl_statx_data *arg = data;
+    no_gvl_rb_io_stat_data *arg = data;
     return (VALUE)statx(arg->fd, arg->path, arg->flags, arg->mask, arg->stx);
 }
 
@@ -1213,24 +1312,34 @@ no_gvl_statx(void *data)
 }
 
 static int
-statx_without_gvl(const char *path, struct statx *stx, unsigned int mask)
+statx_without_gvl(const char *path, rb_io_stat_data *stx, unsigned int mask)
 {
-    no_gvl_statx_data data = {stx, AT_FDCWD, path, 0, mask};
+    no_gvl_rb_io_stat_data data = {stx, AT_FDCWD, path, 0, mask};
 
     /* call statx(2) with pathname */
-    return (int)(VALUE)rb_thread_call_without_gvl(no_gvl_statx, &data,
-                                                  RUBY_UBF_IO, NULL);
+    return IO_WITHOUT_GVL_INT(no_gvl_statx, &data);
 }
 
 static int
-fstatx_without_gvl(int fd, struct statx *stx, unsigned int mask)
+lstatx_without_gvl(const char *path, rb_io_stat_data *stx, unsigned int mask)
 {
-    no_gvl_statx_data data = {stx, fd, "", AT_EMPTY_PATH, mask};
+    no_gvl_rb_io_stat_data data = {stx, AT_FDCWD, path, AT_SYMLINK_NOFOLLOW, mask};
+
+    /* call statx(2) with pathname */
+    return IO_WITHOUT_GVL_INT(no_gvl_statx, &data);
+}
+
+static int
+fstatx_without_gvl(rb_io_t *fptr, rb_io_stat_data *stx, unsigned int mask)
+{
+    no_gvl_rb_io_stat_data data = {stx, fptr->fd, "", AT_EMPTY_PATH, mask};
 
     /* call statx(2) with fd */
-    return (int)rb_thread_io_blocking_region(io_blocking_statx, &data, fd);
+    return (int)rb_io_blocking_region(fptr, io_blocking_statx, &data);
 }
 
+#define FSTATX(fd, st) statx(fd, "", AT_EMPTY_PATH, STATX_ALL, st)
+
 static int
 rb_statx(VALUE file, struct statx *stx, unsigned int mask)
 {
@@ -1240,8 +1349,9 @@ rb_statx(VALUE file, struct statx *stx, unsigned int mask)
     tmp = rb_check_convert_type_with_id(file, T_FILE, "IO", idTo_io);
     if (!NIL_P(tmp)) {
         rb_io_t *fptr;
+
         GetOpenFile(tmp, fptr);
-        result = fstatx_without_gvl(fptr->fd, stx, mask);
+        result = fstatx_without_gvl(fptr, stx, mask);
         file = tmp;
     }
     else {
@@ -1268,7 +1378,7 @@ statx_notimplement(const char *field_name)
 }
 
 static VALUE
-statx_birthtime(const struct statx *stx, VALUE fname)
+statx_birthtime(const rb_io_stat_data *stx)
 {
     if (!statx_has_birthtime(stx)) {
         /* birthtime is not supported on the filesystem */
@@ -1277,20 +1387,27 @@ statx_birthtime(const struct statx *stx, VALUE fname)
     return rb_time_nano_new((time_t)stx->stx_btime.tv_sec, stx->stx_btime.tv_nsec);
 }
 
-typedef struct statx statx_data;
-# define HAVE_STAT_BIRTHTIME
+#else
 
-#elif defined(HAVE_STAT_BIRTHTIME)
 # define statx_without_gvl(path, st, mask) stat_without_gvl(path, st)
-# define fstatx_without_gvl(fd, st, mask) fstat_without_gvl(fd, st)
-# define statx_birthtime(st, fname) stat_birthtime(st)
+# define fstatx_without_gvl(fptr, st, mask) fstat_without_gvl(fptr, st)
+# define lstatx_without_gvl(path, st, mask) lstat_without_gvl(path, st)
+# define rb_statx(file, stx, mask) rb_stat(file, stx)
+# define STATX(path, st, mask) STAT(path, st)
+
+#if defined(HAVE_STAT_BIRTHTIME)
 # define statx_has_birthtime(st) 1
-# define rb_statx(file, st, mask) rb_stat(file, st)
 #else
 # define statx_has_birthtime(st) 0
+#endif
+
 #endif /* !defined(HAVE_STRUCT_STAT_ST_BIRTHTIMESPEC) && \
         defined(HAVE_STRUCT_STATX_STX_BTIME) */
 
+#ifndef FSTAT
+# define FSTAT(fd, st) fstat(fd, st)
+#endif
+
 static int
 rb_stat(VALUE file, struct stat *st)
 {
@@ -1302,7 +1419,7 @@ rb_stat(VALUE file, struct stat *st)
         rb_io_t *fptr;
 
         GetOpenFile(tmp, fptr);
-        result = fstat_without_gvl(fptr->fd, st);
+        result = fstat_without_gvl(fptr, st);
         file = tmp;
     }
     else {
@@ -1327,14 +1444,14 @@ rb_stat(VALUE file, struct stat *st)
 static VALUE
 rb_file_s_stat(VALUE klass, VALUE fname)
 {
-    struct stat st;
+    rb_io_stat_data st;
 
     FilePathValue(fname);
     fname = rb_str_encode_ospath(fname);
-    if (stat_without_gvl(RSTRING_PTR(fname), &st) < 0) {
+    if (statx_without_gvl(RSTRING_PTR(fname), &st, STATX_ALL) < 0) {
         rb_sys_fail_path(fname);
     }
-    return rb_stat_new(&st);
+    return rb_statx_new(&st);
 }
 
 /*
@@ -1356,13 +1473,13 @@ static VALUE
 rb_io_stat(VALUE obj)
 {
     rb_io_t *fptr;
-    struct stat st;
+    rb_io_stat_data st;
 
     GetOpenFile(obj, fptr);
-    if (fstat(fptr->fd, &st) == -1) {
+    if (fstatx_without_gvl(fptr, &st, STATX_ALL) == -1) {
         rb_sys_fail_path(fptr->pathv);
     }
-    return rb_stat_new(&st);
+    return rb_statx_new(&st);
 }
 
 #ifdef HAVE_LSTAT
@@ -1381,8 +1498,7 @@ lstat_without_gvl(const char *path, struct stat *st)
     data.file.path = path;
     data.st = st;
 
-    return (int)(VALUE)rb_thread_call_without_gvl(no_gvl_lstat, &data,
-                                                    RUBY_UBF_IO, NULL);
+    return IO_WITHOUT_GVL_INT(no_gvl_lstat, &data);
 }
 #endif /* HAVE_LSTAT */
 
@@ -1403,14 +1519,14 @@ static VALUE
 rb_file_s_lstat(VALUE klass, VALUE fname)
 {
 #ifdef HAVE_LSTAT
-    struct stat st;
+    rb_io_stat_data st;
 
     FilePathValue(fname);
     fname = rb_str_encode_ospath(fname);
-    if (lstat_without_gvl(StringValueCStr(fname), &st) == -1) {
+    if (lstatx_without_gvl(StringValueCStr(fname), &st, STATX_ALL) == -1) {
         rb_sys_fail_path(fname);
     }
-    return rb_stat_new(&st);
+    return rb_statx_new(&st);
 #else
     return rb_file_s_stat(klass, fname);
 #endif
@@ -1435,16 +1551,16 @@ rb_file_lstat(VALUE obj)
 {
 #ifdef HAVE_LSTAT
     rb_io_t *fptr;
-    struct stat st;
+    rb_io_stat_data st;
     VALUE path;
 
     GetOpenFile(obj, fptr);
     if (NIL_P(fptr->pathv)) return Qnil;
     path = rb_str_encode_ospath(fptr->pathv);
-    if (lstat_without_gvl(RSTRING_PTR(path), &st) == -1) {
+    if (lstatx_without_gvl(RSTRING_PTR(path), &st, STATX_ALL) == -1) {
         rb_sys_fail_path(fptr->pathv);
     }
-    return rb_stat_new(&st);
+    return rb_statx_new(&st);
 #else
     return rb_io_stat(obj);
 #endif
@@ -1556,8 +1672,7 @@ rb_eaccess(VALUE fname, int mode)
     aa.path = StringValueCStr(fname);
     aa.mode = mode;
 
-    return (int)(VALUE)rb_thread_call_without_gvl(nogvl_eaccess, &aa,
-                                                RUBY_UBF_IO, 0);
+    return IO_WITHOUT_GVL_INT(nogvl_eaccess, &aa);
 }
 
 static void *
@@ -1578,8 +1693,7 @@ rb_access(VALUE fname, int mode)
     aa.path = StringValueCStr(fname);
     aa.mode = mode;
 
-    return (int)(VALUE)rb_thread_call_without_gvl(nogvl_access, &aa,
-                                                RUBY_UBF_IO, 0);
+    return IO_WITHOUT_GVL_INT(nogvl_access, &aa);
 }
 
 /*
@@ -1593,8 +1707,6 @@ rb_access(VALUE fname, int mode)
  */
 
 /*
- * Document-method: directory?
- *
  * call-seq:
  *   File.directory?(path) -> true or false
  *
@@ -1773,7 +1885,7 @@ rb_file_blockdev_p(VALUE obj, VALUE fname)
  *
  * Returns +true+ if +filepath+ points to a character device, +false+ otherwise.
  *
-  *  File.chardev?($stdin)     # => true
+ *   File.chardev?($stdin)     # => true
  *   File.chardev?('t.txt')     # => false
  *
  */
@@ -2233,36 +2345,36 @@ rb_file_s_size(VALUE klass, VALUE fname)
 }
 
 static VALUE
-rb_file_ftype(const struct stat *st)
+rb_file_ftype(mode_t mode)
 {
     const char *t;
 
-    if (S_ISREG(st->st_mode)) {
+    if (S_ISREG(mode)) {
         t = "file";
     }
-    else if (S_ISDIR(st->st_mode)) {
+    else if (S_ISDIR(mode)) {
         t = "directory";
     }
-    else if (S_ISCHR(st->st_mode)) {
+    else if (S_ISCHR(mode)) {
         t = "characterSpecial";
     }
 #ifdef S_ISBLK
-    else if (S_ISBLK(st->st_mode)) {
+    else if (S_ISBLK(mode)) {
         t = "blockSpecial";
     }
 #endif
 #ifdef S_ISFIFO
-    else if (S_ISFIFO(st->st_mode)) {
+    else if (S_ISFIFO(mode)) {
         t = "fifo";
     }
 #endif
 #ifdef S_ISLNK
-    else if (S_ISLNK(st->st_mode)) {
+    else if (S_ISLNK(mode)) {
         t = "link";
     }
 #endif
 #ifdef S_ISSOCK
-    else if (S_ISSOCK(st->st_mode)) {
+    else if (S_ISSOCK(mode)) {
         t = "socket";
     }
 #endif
@@ -2299,7 +2411,7 @@ rb_file_s_ftype(VALUE klass, VALUE fname)
         rb_sys_fail_path(fname);
     }
 
-    return rb_file_ftype(&st);
+    return rb_file_ftype(st.st_mode);
 }
 
 /*
@@ -2324,7 +2436,7 @@ rb_file_s_atime(VALUE klass, VALUE fname)
         FilePathValue(fname);
         rb_syserr_fail_path(e, fname);
     }
-    return stat_atime(&st);
+    return stat_time(stat_atimespec(&st));
 }
 
 /*
@@ -2348,7 +2460,7 @@ rb_file_atime(VALUE obj)
     if (fstat(fptr->fd, &st) == -1) {
         rb_sys_fail_path(fptr->pathv);
     }
-    return stat_atime(&st);
+    return stat_time(stat_atimespec(&st));
 }
 
 /*
@@ -2373,7 +2485,7 @@ rb_file_s_mtime(VALUE klass, VALUE fname)
         FilePathValue(fname);
         rb_syserr_fail_path(e, fname);
     }
-    return stat_mtime(&st);
+    return stat_time(stat_mtimespec(&st));
 }
 
 /*
@@ -2396,7 +2508,7 @@ rb_file_mtime(VALUE obj)
     if (fstat(fptr->fd, &st) == -1) {
         rb_sys_fail_path(fptr->pathv);
     }
-    return stat_mtime(&st);
+    return stat_time(stat_mtimespec(&st));
 }
 
 /*
@@ -2425,7 +2537,7 @@ rb_file_s_ctime(VALUE klass, VALUE fname)
         FilePathValue(fname);
         rb_syserr_fail_path(e, fname);
     }
-    return stat_ctime(&st);
+    return stat_time(stat_ctimespec(&st));
 }
 
 /*
@@ -2451,9 +2563,10 @@ rb_file_ctime(VALUE obj)
     if (fstat(fptr->fd, &st) == -1) {
         rb_sys_fail_path(fptr->pathv);
     }
-    return stat_ctime(&st);
+    return stat_time(stat_ctimespec(&st));
 }
 
+#if defined(HAVE_STAT_BIRTHTIME)
 /*
  *  call-seq:
  *     File.birthtime(file_name)  -> time
@@ -2468,18 +2581,17 @@ rb_file_ctime(VALUE obj)
  *
  */
 
-#if defined(HAVE_STAT_BIRTHTIME)
-RUBY_FUNC_EXPORTED VALUE
+VALUE
 rb_file_s_birthtime(VALUE klass, VALUE fname)
 {
-    statx_data st;
+    rb_io_stat_data st;
 
     if (rb_statx(fname, &st, STATX_BTIME) < 0) {
         int e = errno;
         FilePathValue(fname);
         rb_syserr_fail_path(e, fname);
     }
-    return statx_birthtime(&st, fname);
+    return statx_birthtime(&st);
 }
 #else
 # define rb_file_s_birthtime rb_f_notimplement
@@ -2502,28 +2614,18 @@ static VALUE
 rb_file_birthtime(VALUE obj)
 {
     rb_io_t *fptr;
-    statx_data st;
+    rb_io_stat_data st;
 
     GetOpenFile(obj, fptr);
-    if (fstatx_without_gvl(fptr->fd, &st, STATX_BTIME) == -1) {
+    if (fstatx_without_gvl(fptr, &st, STATX_BTIME) == -1) {
         rb_sys_fail_path(fptr->pathv);
     }
-    return statx_birthtime(&st, fptr->pathv);
+    return statx_birthtime(&st);
 }
 #else
 # define rb_file_birthtime rb_f_notimplement
 #endif
 
-/*
- *  call-seq:
- *     file.size    -> integer
- *
- *  Returns the size of <i>file</i> in bytes.
- *
- *     File.new("testfile").size   #=> 66
- *
- */
-
 rb_off_t
 rb_file_size(VALUE file)
 {
@@ -2547,12 +2649,45 @@ rb_file_size(VALUE file)
     }
 }
 
+/*
+ *  call-seq:
+ *     file.size    -> integer
+ *
+ *  Returns the size of <i>file</i> in bytes.
+ *
+ *     File.new("testfile").size   #=> 66
+ *
+ */
+
 static VALUE
 file_size(VALUE self)
 {
     return OFFT2NUM(rb_file_size(self));
 }
 
+struct nogvl_chmod_data {
+    const char *path;
+    mode_t mode;
+};
+
+static void *
+nogvl_chmod(void *ptr)
+{
+    struct nogvl_chmod_data *data = ptr;
+    int ret = chmod(data->path, data->mode);
+    return (void *)(VALUE)ret;
+}
+
+static int
+rb_chmod(const char *path, mode_t mode)
+{
+    struct nogvl_chmod_data data = {
+        .path = path,
+        .mode = mode,
+    };
+    return IO_WITHOUT_GVL_INT(nogvl_chmod, &data);
+}
+
 static int
 chmod_internal(const char *path, void *mode)
 {
@@ -2583,6 +2718,29 @@ rb_file_s_chmod(int argc, VALUE *argv, VALUE _)
     return apply2files(chmod_internal, argc, argv, &mode);
 }
 
+#ifdef HAVE_FCHMOD
+struct nogvl_fchmod_data {
+    int fd;
+    mode_t mode;
+};
+
+static VALUE
+io_blocking_fchmod(void *ptr)
+{
+    struct nogvl_fchmod_data *data = ptr;
+    int ret = fchmod(data->fd, data->mode);
+    return (VALUE)ret;
+}
+
+static int
+rb_fchmod(struct rb_io* io, mode_t mode)
+{
+    (void)rb_chmod; /* suppress unused-function warning when HAVE_FCHMOD */
+    struct nogvl_fchmod_data data = {.fd = io->fd, .mode = mode};
+    return (int)rb_thread_io_blocking_region(io, io_blocking_fchmod, &data);
+}
+#endif
+
 /*
  *  call-seq:
  *     file.chmod(mode_int)   -> 0
@@ -2609,7 +2767,7 @@ rb_file_chmod(VALUE obj, VALUE vmode)
 
     GetOpenFile(obj, fptr);
 #ifdef HAVE_FCHMOD
-    if (fchmod(fptr->fd, mode) == -1) {
+    if (rb_fchmod(fptr, mode) == -1) {
         if (HAVE_FCHMOD || errno != ENOSYS)
             rb_sys_fail_path(fptr->pathv);
     }
@@ -2620,7 +2778,7 @@ rb_file_chmod(VALUE obj, VALUE vmode)
 #if !defined HAVE_FCHMOD || !HAVE_FCHMOD
     if (NIL_P(fptr->pathv)) return Qnil;
     path = rb_str_encode_ospath(fptr->pathv);
-    if (chmod(RSTRING_PTR(path), mode) == -1)
+    if (rb_chmod(RSTRING_PTR(path), mode) == -1)
         rb_sys_fail_path(fptr->pathv);
 #endif
 
@@ -2715,6 +2873,51 @@ rb_file_s_chown(int argc, VALUE *argv, VALUE _)
     return apply2files(chown_internal, argc, argv, &arg);
 }
 
+struct nogvl_chown_data {
+    union {
+        const char *path;
+        int fd;
+    } as;
+    struct chown_args new;
+};
+
+static void *
+nogvl_chown(void *ptr)
+{
+    struct nogvl_chown_data *data = ptr;
+    return (void *)(VALUE)chown(data->as.path, data->new.owner, data->new.group);
+}
+
+static int
+rb_chown(const char *path, rb_uid_t owner, rb_gid_t group)
+{
+    struct nogvl_chown_data data = {
+        .as = {.path = path},
+        .new = {.owner = owner, .group = group},
+    };
+    return IO_WITHOUT_GVL_INT(nogvl_chown, &data);
+}
+
+#ifdef HAVE_FCHOWN
+static void *
+nogvl_fchown(void *ptr)
+{
+    struct nogvl_chown_data *data = ptr;
+    return (void *)(VALUE)fchown(data->as.fd, data->new.owner, data->new.group);
+}
+
+static int
+rb_fchown(int fd, rb_uid_t owner, rb_gid_t group)
+{
+    (void)rb_chown; /* suppress unused-function warning when HAVE_FCHMOD */
+    struct nogvl_chown_data data = {
+        .as = {.fd = fd},
+        .new = {.owner = owner, .group = group},
+    };
+    return IO_WITHOUT_GVL_INT(nogvl_fchown, &data);
+}
+#endif
+
 /*
  *  call-seq:
  *     file.chown(owner_int, group_int )   -> 0
@@ -2746,10 +2949,10 @@ rb_file_chown(VALUE obj, VALUE owner, VALUE group)
 #ifndef HAVE_FCHOWN
     if (NIL_P(fptr->pathv)) return Qnil;
     path = rb_str_encode_ospath(fptr->pathv);
-    if (chown(RSTRING_PTR(path), o, g) == -1)
+    if (rb_chown(RSTRING_PTR(path), o, g) == -1)
         rb_sys_fail_path(fptr->pathv);
 #else
-    if (fchown(fptr->fd, o, g) == -1)
+    if (rb_fchown(fptr->fd, o, g) == -1)
         rb_sys_fail_path(fptr->pathv);
 #endif
 
@@ -2845,7 +3048,7 @@ utime_failed(struct apply_arg *aa)
 # elif defined(__APPLE__) && \
     (!defined(MAC_OS_X_VERSION_13_0) || (MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_13_0))
 
-#   if defined(__has_attribute) && __has_attribute(availability)
+#   if __has_attribute(availability) && __has_warning("-Wunguarded-availability-new")
 typedef int utimensat_func(int, const char *, const struct timespec [2], int);
 
 RBIMPL_WARNING_PUSH()
@@ -2860,7 +3063,7 @@ RBIMPL_WARNING_POP()
 #   define utimensat rb_utimensat()
 #   else /* __API_AVAILABLE macro does nothing on gcc */
 __attribute__((weak)) int utimensat(int, const char *, const struct timespec [2], int);
-#   endif /* defined(__has_attribute) && __has_attribute(availability) */
+#   endif /* utimesat availability */
 # endif /* __APPLE__ && < MAC_OS_X_VERSION_13_0 */
 
 static int
@@ -2933,7 +3136,7 @@ static int
 utime_internal(const char *path, void *arg)
 {
     struct utime_args *v = arg;
-    const struct timespec *tsp = v->tsp;
+    const stat_timestamp *tsp = v->tsp;
     struct utimbuf utbuf, *utp = NULL;
     if (tsp) {
         utbuf.actime = tsp[0].tv_sec;
@@ -3141,8 +3344,7 @@ readlink_without_gvl(VALUE path, VALUE buf, size_t size)
     ra.buf = RSTRING_PTR(buf);
     ra.size = size;
 
-    return (ssize_t)rb_thread_call_without_gvl(nogvl_readlink, &ra,
-                                                RUBY_UBF_IO, 0);
+    return (ssize_t)IO_WITHOUT_GVL(nogvl_readlink, &ra);
 }
 
 VALUE
@@ -3243,8 +3445,7 @@ rb_file_s_rename(VALUE klass, VALUE from, VALUE to)
 #if defined __CYGWIN__
     errno = 0;
 #endif
-    if ((int)(VALUE)rb_thread_call_without_gvl(no_gvl_rename, &ra,
-                                         RUBY_UBF_IO, 0) < 0) {
+    if (IO_WITHOUT_GVL_INT(no_gvl_rename, &ra) < 0) {
         int e = errno;
 #if defined DOSISH
         switch (e) {
@@ -3611,12 +3812,16 @@ VALUE
 rb_home_dir_of(VALUE user, VALUE result)
 {
 #ifdef HAVE_PWD_H
-    struct passwd *pwPtr;
+    VALUE dirname = rb_getpwdirnam_for_login(user);
+    if (dirname == Qnil) {
+        rb_raise(rb_eArgError, "user %"PRIsVALUE" doesn't exist", user);
+    }
+    const char *dir = RSTRING_PTR(dirname);
 #else
     extern char *getlogin(void);
     const char *pwPtr = 0;
+    const char *login;
     # define endpwent() ((void)0)
-#endif
     const char *dir, *username = RSTRING_PTR(user);
     rb_encoding *enc = rb_enc_get(user);
 #if defined _WIN32
@@ -3628,21 +3833,13 @@ rb_home_dir_of(VALUE user, VALUE result)
         dir = username = RSTRING_PTR(rb_str_conv_enc(user, enc, fsenc));
     }
 
-#ifdef HAVE_PWD_H
-    pwPtr = getpwnam(username);
-#else
-    if (strcasecmp(username, getlogin()) == 0)
+    if ((login = getlogin()) && strcasecmp(username, login) == 0)
         dir = pwPtr = getenv("HOME");
-#endif
     if (!pwPtr) {
-        endpwent();
         rb_raise(rb_eArgError, "user %"PRIsVALUE" doesn't exist", user);
     }
-#ifdef HAVE_PWD_H
-    dir = pwPtr->pw_dir;
 #endif
     copy_home_path(result, dir);
-    endpwent();
     return result;
 }
 
@@ -3674,7 +3871,7 @@ rb_default_home_dir(VALUE result)
          * lookup by getuid() has a chance of succeeding.
          */
         if (NIL_P(login_name)) {
-            rb_raise(rb_eArgError, "couldn't find login name -- expanding `~'");
+            rb_raise(rb_eArgError, "couldn't find login name -- expanding '~'");
         }
 # endif /* !defined(HAVE_GETPWUID_R) && !defined(HAVE_GETPWUID) */
 
@@ -3682,7 +3879,7 @@ rb_default_home_dir(VALUE result)
         if (NIL_P(pw_dir)) {
             pw_dir = rb_getpwdiruid();
             if (NIL_P(pw_dir)) {
-                rb_raise(rb_eArgError, "couldn't find home for uid `%ld'", (long)getuid());
+                rb_raise(rb_eArgError, "couldn't find home for uid '%ld'", (long)getuid());
             }
         }
 
@@ -3693,7 +3890,7 @@ rb_default_home_dir(VALUE result)
     }
 #endif /* defined HAVE_PWD_H */
     if (!dir) {
-        rb_raise(rb_eArgError, "couldn't find HOME environment -- expanding `~'");
+        rb_raise(rb_eArgError, "couldn't find HOME environment -- expanding '~'");
     }
     return copy_home_path(result, dir);
 }
@@ -3718,7 +3915,15 @@ append_fspath(VALUE result, VALUE fname, char *dir, rb_encoding **enc, rb_encodi
     size_t dirlen = strlen(dir), buflen = rb_str_capacity(result);
 
     if (NORMALIZE_UTF8PATH || *enc != fsenc) {
-        rb_encoding *direnc = fs_enc_check(fname, dirname = ospath_new(dir, dirlen, fsenc));
+        dirname = ospath_new(dir, dirlen, fsenc);
+        if (!rb_enc_compatible(fname, dirname)) {
+            xfree(dir);
+            /* rb_enc_check must raise because the two encodings are not
+             * compatible. */
+            rb_enc_check(fname, dirname);
+            rb_bug("unreachable");
+        }
+        rb_encoding *direnc = fs_enc_check(fname, dirname);
         if (direnc != fsenc) {
             dirname = rb_str_conv_enc(dirname, fsenc, direnc);
             RSTRING_GETMEM(dirname, cwdp, dirlen);
@@ -4446,6 +4651,11 @@ rb_check_realpath_emulate_rescue(VALUE arg, VALUE exc)
 {
     return Qnil;
 }
+#elif !defined(NEEDS_REALPATH_BUFFER) && defined(__APPLE__) && \
+    (!defined(MAC_OS_X_VERSION_10_6) || (MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_6))
+/* realpath() on OSX < 10.6 doesn't implement automatic allocation */
+# include <sys/syslimits.h>
+# define NEEDS_REALPATH_BUFFER 1
 #endif /* HAVE_REALPATH */
 
 static VALUE
@@ -4455,6 +4665,11 @@ rb_check_realpath_internal(VALUE basedir, VALUE path, rb_encoding *origenc, enum
     VALUE unresolved_path;
     char *resolved_ptr = NULL;
     VALUE resolved;
+# if defined(NEEDS_REALPATH_BUFFER) && NEEDS_REALPATH_BUFFER
+    char resolved_buffer[PATH_MAX];
+# else
+    char *const resolved_buffer = NULL;
+# endif
 
     if (mode == RB_REALPATH_DIR) {
         return rb_check_realpath_emulate(basedir, path, origenc, mode);
@@ -4466,13 +4681,17 @@ rb_check_realpath_internal(VALUE basedir, VALUE path, rb_encoding *origenc, enum
     }
     if (origenc) unresolved_path = TO_OSPATH(unresolved_path);
 
-    if ((resolved_ptr = realpath(RSTRING_PTR(unresolved_path), NULL)) == NULL) {
-        /* glibc realpath(3) does not allow /path/to/file.rb/../other_file.rb,
+    if ((resolved_ptr = realpath(RSTRING_PTR(unresolved_path), resolved_buffer)) == NULL) {
+        /*
+           wasi-libc 22 and later support realpath(3) but return ENOTSUP
+           when the underlying host syscall returns it.
+           glibc realpath(3) does not allow /path/to/file.rb/../other_file.rb,
            returning ENOTDIR in that case.
            glibc realpath(3) can also return ENOENT for paths that exist,
            such as /dev/fd/5.
            Fallback to the emulated approach in either of those cases. */
-        if (errno == ENOTDIR ||
+        if (errno == ENOTSUP ||
+            errno == ENOTDIR ||
             (errno == ENOENT && rb_file_exist_p(0, unresolved_path))) {
             return rb_check_realpath_emulate(basedir, path, origenc, mode);
 
@@ -4483,9 +4702,11 @@ rb_check_realpath_internal(VALUE basedir, VALUE path, rb_encoding *origenc, enum
         rb_sys_fail_path(unresolved_path);
     }
     resolved = ospath_new(resolved_ptr, strlen(resolved_ptr), rb_filesystem_encoding());
+# if !(defined(NEEDS_REALPATH_BUFFER) && NEEDS_REALPATH_BUFFER)
     free(resolved_ptr);
+# endif
 
-# if !defined(__LINUX__) && !defined(__APPLE__)
+# if !defined(__linux__) && !defined(__APPLE__)
     /* As `resolved` is a String in the filesystem encoding, no
      * conversion is needed */
     struct stat st;
@@ -4495,7 +4716,7 @@ rb_check_realpath_internal(VALUE basedir, VALUE path, rb_encoding *origenc, enum
         }
         rb_sys_fail_path(unresolved_path);
     }
-# endif /* !defined(__LINUX__) && !defined(__APPLE__) */
+# endif /* !defined(__linux__) && !defined(__APPLE__) */
 
     if (origenc && origenc != rb_enc_get(resolved)) {
         if (!rb_enc_str_asciionly_p(resolved)) {
@@ -5129,8 +5350,7 @@ rb_file_s_truncate(VALUE klass, VALUE path, VALUE len)
     path = rb_str_encode_ospath(path);
     ta.path = StringValueCStr(path);
 
-    r = (int)(VALUE)rb_thread_call_without_gvl(nogvl_truncate, &ta,
-                                                RUBY_UBF_IO, NULL);
+    r = IO_WITHOUT_GVL_INT(nogvl_truncate, &ta);
     if (r < 0)
         rb_sys_fail_path(path);
     return INT2FIX(0);
@@ -5180,7 +5400,7 @@ rb_file_truncate(VALUE obj, VALUE len)
     }
     rb_io_flush_raw(obj, 0);
     fa.fd = fptr->fd;
-    if ((int)rb_thread_io_blocking_region(nogvl_ftruncate, &fa, fa.fd) < 0) {
+    if ((int)rb_io_blocking_region(fptr, nogvl_ftruncate, &fa) < 0) {
         rb_sys_fail_path(fptr->pathv);
     }
     return INT2FIX(0);
@@ -5223,47 +5443,46 @@ rb_thread_flock(void *data)
     return (VALUE)ret;
 }
 
-/*
+/*  :markup: markdown
+ *
  *  call-seq:
- *     file.flock(locking_constant) -> 0 or false
- *
- *  Locks or unlocks a file according to <i>locking_constant</i> (a
- *  logical <em>or</em> of the values in the table below).
- *  Returns <code>false</code> if File::LOCK_NB is specified and the
- *  operation would otherwise have blocked. Not available on all
- *  platforms.
- *
- *  Locking constants (in class File):
- *
- *     LOCK_EX   | Exclusive lock. Only one process may hold an
- *               | exclusive lock for a given file at a time.
- *     ----------+------------------------------------------------
- *     LOCK_NB   | Don't block when locking. May be combined
- *               | with other lock options using logical or.
- *     ----------+------------------------------------------------
- *     LOCK_SH   | Shared lock. Multiple processes may each hold a
- *               | shared lock for a given file at the same time.
- *     ----------+------------------------------------------------
- *     LOCK_UN   | Unlock.
+ *    flock(locking_constant) -> 0 or false
+ *
+ *  Locks or unlocks file +self+ according to the given `locking_constant`,
+ *  a bitwise OR of the values in the table below.
+ *
+ *  Not available on all platforms.
+ *
+ *  Returns `false` if `File::LOCK_NB` is specified and the operation would have blocked;
+ *  otherwise returns `0`.
+ *
+ *  | Constant        | Lock         | Effect
+ *  |-----------------|--------------|-----------------------------------------------------------------------------------------------------------------|
+ *  | +File::LOCK_EX+ | Exclusive    | Only one process may hold an exclusive lock for +self+ at a time.                                               |
+ *  | +File::LOCK_NB+ | Non-blocking | No blocking; may be combined with +File::LOCK_SH+ or +File::LOCK_EX+ using the bitwise OR operator <tt>\|</tt>. |
+ *  | +File::LOCK_SH+ | Shared       | Multiple processes may each hold a shared lock for +self+ at the same time.                                     |
+ *  | +File::LOCK_UN+ | Unlock       | Remove an existing lock held by this process.                                                                   |
  *
  *  Example:
  *
- *     # update a counter using write lock
- *     # don't use "w" because it truncates the file before lock.
- *     File.open("counter", File::RDWR|File::CREAT, 0644) {|f|
- *       f.flock(File::LOCK_EX)
- *       value = f.read.to_i + 1
- *       f.rewind
- *       f.write("#{value}\n")
- *       f.flush
- *       f.truncate(f.pos)
- *     }
- *
- *     # read the counter using read lock
- *     File.open("counter", "r") {|f|
- *       f.flock(File::LOCK_SH)
- *       p f.read
- *     }
+ *  ```ruby
+ *  # Update a counter using an exclusive lock.
+ *  # Don't use File::WRONLY because it truncates the file.
+ *  File.open('counter', File::RDWR | File::CREAT, 0644) do |f|
+ *    f.flock(File::LOCK_EX)
+ *    value = f.read.to_i + 1
+ *    f.rewind
+ *    f.write("#{value}\n")
+ *    f.flush
+ *    f.truncate(f.pos)
+ *  end
+ *
+ *  # Read the counter using a shared lock.
+ *  File.open('counter', 'r') do |f|
+ *    f.flock(File::LOCK_SH)
+ *    f.read
+ *  end
+ *  ```
  *
  */
 
@@ -5281,7 +5500,7 @@ rb_file_flock(VALUE obj, VALUE operation)
     if (fptr->mode & FMODE_WRITABLE) {
         rb_io_flush_raw(obj, 0);
     }
-    while ((int)rb_thread_io_blocking_region(rb_thread_flock, op, fptr->fd) < 0) {
+    while ((int)rb_io_blocking_region(fptr, rb_thread_flock, op) < 0) {
         int e = errno;
         switch (e) {
           case EAGAIN:
@@ -5327,60 +5546,83 @@ test_check(int n, int argc, VALUE *argv)
 #define CHECK(n) test_check((n), argc, argv)
 
 /*
+ *  :markup: markdown
+ *
  *  call-seq:
- *     test(cmd, file1 [, file2] ) -> obj
- *
- *  Uses the character +cmd+ to perform various tests on +file1+ (first
- *  table below) or on +file1+ and +file2+ (second table).
- *
- *  File tests on a single file:
- *
- *    Cmd    Returns   Meaning
- *    "A"  | Time    | Last access time for file1
- *    "b"  | boolean | True if file1 is a block device
- *    "c"  | boolean | True if file1 is a character device
- *    "C"  | Time    | Last change time for file1
- *    "d"  | boolean | True if file1 exists and is a directory
- *    "e"  | boolean | True if file1 exists
- *    "f"  | boolean | True if file1 exists and is a regular file
- *    "g"  | boolean | True if file1 has the setgid bit set
- *    "G"  | boolean | True if file1 exists and has a group
- *         |         | ownership equal to the caller's group
- *    "k"  | boolean | True if file1 exists and has the sticky bit set
- *    "l"  | boolean | True if file1 exists and is a symbolic link
- *    "M"  | Time    | Last modification time for file1
- *    "o"  | boolean | True if file1 exists and is owned by
- *         |         | the caller's effective uid
- *    "O"  | boolean | True if file1 exists and is owned by
- *         |         | the caller's real uid
- *    "p"  | boolean | True if file1 exists and is a fifo
- *    "r"  | boolean | True if file1 is readable by the effective
- *         |         | uid/gid of the caller
- *    "R"  | boolean | True if file is readable by the real
- *         |         | uid/gid of the caller
- *    "s"  | int/nil | If file1 has nonzero size, return the size,
- *         |         | otherwise return nil
- *    "S"  | boolean | True if file1 exists and is a socket
- *    "u"  | boolean | True if file1 has the setuid bit set
- *    "w"  | boolean | True if file1 exists and is writable by
- *         |         | the effective uid/gid
- *    "W"  | boolean | True if file1 exists and is writable by
- *         |         | the real uid/gid
- *    "x"  | boolean | True if file1 exists and is executable by
- *         |         | the effective uid/gid
- *    "X"  | boolean | True if file1 exists and is executable by
- *         |         | the real uid/gid
- *    "z"  | boolean | True if file1 exists and has a zero length
- *
- *  Tests that take two files:
- *
- *    "-"  | boolean | True if file1 and file2 are identical
- *    "="  | boolean | True if the modification times of file1
- *         |         | and file2 are equal
- *    "<"  | boolean | True if the modification time of file1
- *         |         | is prior to that of file2
- *    ">"  | boolean | True if the modification time of file1
- *         |         | is after that of file2
+ *    test(char, path0, path1 = nil) -> object
+ *
+ *  Performs a test on one or both of the <i>filesystem entities</i> at the given paths
+ *  `path0` and `path1`:
+ *
+ *  - Each path `path0` or `path1` points to a file, directory, device, pipe, etc.
+ *  - Character `char` selects a specific test.
+ *
+ *  The tests:
+ *
+ *  - Each of these tests operates only on the entity at `path0`,
+ *    and returns `true` or `false`;
+ *    for a non-existent entity, returns `false` (does not raise exception):
+ *
+ *      | Character    | Test                                                                      |
+ *      |:------------:|:--------------------------------------------------------------------------|
+ *      | <tt>'b'</tt> | Whether the entity is a block device.                                     |
+ *      | <tt>'c'</tt> | Whether the entity is a character device.                                 |
+ *      | <tt>'d'</tt> | Whether the entity is a directory.                                        |
+ *      | <tt>'e'</tt> | Whether the entity is an existing entity.                                 |
+ *      | <tt>'f'</tt> | Whether the entity is an existing regular file.                           |
+ *      | <tt>'g'</tt> | Whether the entity's setgid bit is set.                                   |
+ *      | <tt>'G'</tt> | Whether the entity's group ownership is equal to the caller's.            |
+ *      | <tt>'k'</tt> | Whether the entity's sticky bit is set.                                   |
+ *      | <tt>'l'</tt> | Whether the entity is a symbolic link.                                    |
+ *      | <tt>'o'</tt> | Whether the entity is owned by the caller's effective uid.                |
+ *      | <tt>'O'</tt> | Like <tt>'o'</tt>, but uses the real uid (not the effective uid).         |
+ *      | <tt>'p'</tt> | Whether the entity is a FIFO device (named pipe).                         |
+ *      | <tt>'r'</tt> | Whether the entity is readable by the caller's effective uid/gid.         |
+ *      | <tt>'R'</tt> | Like <tt>'r'</tt>, but uses the real uid/gid (not the effective uid/gid). |
+ *      | <tt>'S'</tt> | Whether the entity is a socket.                                           |
+ *      | <tt>'u'</tt> | Whether the entity's setuid bit is set.                                   |
+ *      | <tt>'w'</tt> | Whether the entity is writable by the caller's effective uid/gid.         |
+ *      | <tt>'W'</tt> | Like <tt>'w'</tt>, but uses the real uid/gid (not the effective uid/gid). |
+ *      | <tt>'x'</tt> | Whether the entity is executable by the caller's effective uid/gid.       |
+ *      | <tt>'X'</tt> | Like <tt>'x'</tt>, but uses the real uid/gid (not the effective uid/git). |
+ *      | <tt>'z'</tt> | Whether the entity exists and is of length zero.                          |
+ *
+ *  - This test operates only on the entity at `path0`,
+ *    and returns an integer size or +nil+:
+ *
+ *      | Character    | Test                                                                                         |
+ *      |:------------:|:---------------------------------------------------------------------------------------------|
+ *      | <tt>'s'</tt> | Returns positive integer size if the entity exists and has non-zero length, +nil+ otherwise. |
+ *
+ *  - Each of these tests operates only on the entity at `path0`,
+ *    and returns a Time object;
+ *    raises an exception if the entity does not exist:
+ *
+ *      | Character    | Test                                   |
+ *      |:------------:|:---------------------------------------|
+ *      | <tt>'A'</tt> | Last access time for the entity.       |
+ *      | <tt>'C'</tt> | Last change time for the entity.       |
+ *      | <tt>'M'</tt> | Last modification time for the entity. |
+ *
+ *  - Each of these tests operates on the modification time (`mtime`)
+ *    of each of the entities at `path0` and `path1`,
+ *    and returns a `true` or `false`;
+ *    returns `false` if either entity does not exist:
+ *
+ *      | Character    | Test                                                            |
+ *      |:------------:|:----------------------------------------------------------------|
+ *      | <tt>'<'</tt> | Whether the `mtime` at `path0` is less than that at `path1`.    |
+ *      | <tt>'='</tt> | Whether the `mtime` at `path0` is equal to that at `path1`.     |
+ *      | <tt>'>'</tt> | Whether the `mtime` at `path0` is greater than that at `path1`. |
+ *
+ *  - This test operates on the content of each of the entities at `path0` and `path1`,
+ *    and returns a `true` or `false`;
+ *    returns `false` if either entity does not exist:
+ *
+ *      | Character    | Test                                          |
+ *      |:------------:|:----------------------------------------------|
+ *      | <tt>'-'</tt> | Whether the entities exist and are identical. |
+ *
  */
 
 static VALUE
@@ -5492,7 +5734,7 @@ rb_f_test(int argc, VALUE *argv, VALUE _)
 
     if (strchr("=<>", cmd)) {
         struct stat st1, st2;
-        struct timespec t1, t2;
+        stat_timestamp t1, t2;
 
         CHECK(2);
         if (rb_stat(argv[1], &st1) < 0) return Qfalse;
@@ -5544,12 +5786,13 @@ rb_f_test(int argc, VALUE *argv, VALUE _)
 static VALUE
 rb_stat_s_alloc(VALUE klass)
 {
-    return stat_new_0(klass, 0);
+    VALUE obj;
+    stat_alloc(rb_cStat, &obj);
+    return obj;
 }
 
 /*
  * call-seq:
- *
  *   File::Stat.new(file_name)  -> stat
  *
  * Create a File::Stat object for the given file name (raising an
@@ -5559,21 +5802,19 @@ rb_stat_s_alloc(VALUE klass)
 static VALUE
 rb_stat_init(VALUE obj, VALUE fname)
 {
-    struct stat st, *nst;
+    rb_io_stat_data st;
 
     FilePathValue(fname);
     fname = rb_str_encode_ospath(fname);
-    if (STAT(StringValueCStr(fname), &st) == -1) {
+    if (STATX(StringValueCStr(fname), &st, STATX_ALL) == -1) {
         rb_sys_fail_path(fname);
     }
 
-    if (DATA_PTR(obj)) {
-        xfree(DATA_PTR(obj));
-        DATA_PTR(obj) = NULL;
-    }
-    nst = ALLOC(struct stat);
-    *nst = st;
-    DATA_PTR(obj) = nst;
+    struct rb_stat *rb_st;
+    TypedData_Get_Struct(obj, struct rb_stat, &stat_data_type, rb_st);
+
+    rb_st->stat = st;
+    rb_st->initialized = true;
 
     return Qnil;
 }
@@ -5582,19 +5823,15 @@ rb_stat_init(VALUE obj, VALUE fname)
 static VALUE
 rb_stat_init_copy(VALUE copy, VALUE orig)
 {
-    struct stat *nst;
-
     if (!OBJ_INIT_COPY(copy, orig)) return copy;
-    if (DATA_PTR(copy)) {
-        xfree(DATA_PTR(copy));
-        DATA_PTR(copy) = 0;
-    }
-    if (DATA_PTR(orig)) {
-        nst = ALLOC(struct stat);
-        *nst = *(struct stat*)DATA_PTR(orig);
-        DATA_PTR(copy) = nst;
-    }
 
+    struct rb_stat *orig_rb_st;
+    TypedData_Get_Struct(orig, struct rb_stat, &stat_data_type, orig_rb_st);
+
+    struct rb_stat *copy_rb_st;
+    TypedData_Get_Struct(copy, struct rb_stat, &stat_data_type, copy_rb_st);
+
+    *copy_rb_st = *orig_rb_st;
     return copy;
 }
 
@@ -5615,7 +5852,7 @@ rb_stat_init_copy(VALUE copy, VALUE orig)
 static VALUE
 rb_stat_ftype(VALUE obj)
 {
-    return rb_file_ftype(get_stat(obj));
+    return rb_file_ftype(get_stat(obj)->ST_(mode));
 }
 
 /*
@@ -5632,7 +5869,7 @@ rb_stat_ftype(VALUE obj)
 static VALUE
 rb_stat_d(VALUE obj)
 {
-    if (S_ISDIR(get_stat(obj)->st_mode)) return Qtrue;
+    if (S_ISDIR(get_stat(obj)->ST_(mode))) return Qtrue;
     return Qfalse;
 }
 
@@ -5648,7 +5885,7 @@ static VALUE
 rb_stat_p(VALUE obj)
 {
 #ifdef S_IFIFO
-    if (S_ISFIFO(get_stat(obj)->st_mode)) return Qtrue;
+    if (S_ISFIFO(get_stat(obj)->ST_(mode))) return Qtrue;
 
 #endif
     return Qfalse;
@@ -5674,7 +5911,7 @@ static VALUE
 rb_stat_l(VALUE obj)
 {
 #ifdef S_ISLNK
-    if (S_ISLNK(get_stat(obj)->st_mode)) return Qtrue;
+    if (S_ISLNK(get_stat(obj)->ST_(mode))) return Qtrue;
 #endif
     return Qfalse;
 }
@@ -5695,7 +5932,7 @@ static VALUE
 rb_stat_S(VALUE obj)
 {
 #ifdef S_ISSOCK
-    if (S_ISSOCK(get_stat(obj)->st_mode)) return Qtrue;
+    if (S_ISSOCK(get_stat(obj)->ST_(mode))) return Qtrue;
 
 #endif
     return Qfalse;
@@ -5718,7 +5955,7 @@ static VALUE
 rb_stat_b(VALUE obj)
 {
 #ifdef S_ISBLK
-    if (S_ISBLK(get_stat(obj)->st_mode)) return Qtrue;
+    if (S_ISBLK(get_stat(obj)->ST_(mode))) return Qtrue;
 
 #endif
     return Qfalse;
@@ -5739,7 +5976,7 @@ rb_stat_b(VALUE obj)
 static VALUE
 rb_stat_c(VALUE obj)
 {
-    if (S_ISCHR(get_stat(obj)->st_mode)) return Qtrue;
+    if (S_ISCHR(get_stat(obj)->ST_(mode))) return Qtrue;
 
     return Qfalse;
 }
@@ -5759,14 +5996,14 @@ rb_stat_c(VALUE obj)
 static VALUE
 rb_stat_owned(VALUE obj)
 {
-    if (get_stat(obj)->st_uid == geteuid()) return Qtrue;
+    if (get_stat(obj)->ST_(uid) == geteuid()) return Qtrue;
     return Qfalse;
 }
 
 static VALUE
 rb_stat_rowned(VALUE obj)
 {
-    if (get_stat(obj)->st_uid == getuid()) return Qtrue;
+    if (get_stat(obj)->ST_(uid) == getuid()) return Qtrue;
     return Qfalse;
 }
 
@@ -5786,7 +6023,7 @@ static VALUE
 rb_stat_grpowned(VALUE obj)
 {
 #ifndef _WIN32
-    if (rb_group_member(get_stat(obj)->st_gid)) return Qtrue;
+    if (rb_group_member(get_stat(obj)->ST_(gid))) return Qtrue;
 #endif
     return Qfalse;
 }
@@ -5805,21 +6042,21 @@ rb_stat_grpowned(VALUE obj)
 static VALUE
 rb_stat_r(VALUE obj)
 {
-    struct stat *st = get_stat(obj);
+    rb_io_stat_data *st = get_stat(obj);
 
 #ifdef USE_GETEUID
     if (geteuid() == 0) return Qtrue;
 #endif
 #ifdef S_IRUSR
     if (rb_stat_owned(obj))
-        return RBOOL(st->st_mode & S_IRUSR);
+        return RBOOL(st->ST_(mode) & S_IRUSR);
 #endif
 #ifdef S_IRGRP
     if (rb_stat_grpowned(obj))
-        return RBOOL(st->st_mode & S_IRGRP);
+        return RBOOL(st->ST_(mode) & S_IRGRP);
 #endif
 #ifdef S_IROTH
-    if (!(st->st_mode & S_IROTH)) return Qfalse;
+    if (!(st->ST_(mode) & S_IROTH)) return Qfalse;
 #endif
     return Qtrue;
 }
@@ -5838,21 +6075,21 @@ rb_stat_r(VALUE obj)
 static VALUE
 rb_stat_R(VALUE obj)
 {
-    struct stat *st = get_stat(obj);
+    rb_io_stat_data *st = get_stat(obj);
 
 #ifdef USE_GETEUID
     if (getuid() == 0) return Qtrue;
 #endif
 #ifdef S_IRUSR
     if (rb_stat_rowned(obj))
-        return RBOOL(st->st_mode & S_IRUSR);
+        return RBOOL(st->ST_(mode) & S_IRUSR);
 #endif
 #ifdef S_IRGRP
-    if (rb_group_member(get_stat(obj)->st_gid))
-        return RBOOL(st->st_mode & S_IRGRP);
+    if (rb_group_member(get_stat(obj)->ST_(gid)))
+        return RBOOL(st->ST_(mode) & S_IRGRP);
 #endif
 #ifdef S_IROTH
-    if (!(st->st_mode & S_IROTH)) return Qfalse;
+    if (!(st->ST_(mode) & S_IROTH)) return Qfalse;
 #endif
     return Qtrue;
 }
@@ -5874,9 +6111,9 @@ static VALUE
 rb_stat_wr(VALUE obj)
 {
 #ifdef S_IROTH
-    struct stat *st = get_stat(obj);
-    if ((st->st_mode & (S_IROTH)) == S_IROTH) {
-        return UINT2NUM(st->st_mode & (S_IRUGO|S_IWUGO|S_IXUGO));
+    rb_io_stat_data *st = get_stat(obj);
+    if ((st->ST_(mode) & (S_IROTH)) == S_IROTH) {
+        return UINT2NUM(st->ST_(mode) & (S_IRUGO|S_IWUGO|S_IXUGO));
     }
 #endif
     return Qnil;
@@ -5896,21 +6133,21 @@ rb_stat_wr(VALUE obj)
 static VALUE
 rb_stat_w(VALUE obj)
 {
-    struct stat *st = get_stat(obj);
+    rb_io_stat_data *st = get_stat(obj);
 
 #ifdef USE_GETEUID
     if (geteuid() == 0) return Qtrue;
 #endif
 #ifdef S_IWUSR
     if (rb_stat_owned(obj))
-        return RBOOL(st->st_mode & S_IWUSR);
+        return RBOOL(st->ST_(mode) & S_IWUSR);
 #endif
 #ifdef S_IWGRP
     if (rb_stat_grpowned(obj))
-        return RBOOL(st->st_mode & S_IWGRP);
+        return RBOOL(st->ST_(mode) & S_IWGRP);
 #endif
 #ifdef S_IWOTH
-    if (!(st->st_mode & S_IWOTH)) return Qfalse;
+    if (!(st->ST_(mode) & S_IWOTH)) return Qfalse;
 #endif
     return Qtrue;
 }
@@ -5929,21 +6166,21 @@ rb_stat_w(VALUE obj)
 static VALUE
 rb_stat_W(VALUE obj)
 {
-    struct stat *st = get_stat(obj);
+    rb_io_stat_data *st = get_stat(obj);
 
 #ifdef USE_GETEUID
     if (getuid() == 0) return Qtrue;
 #endif
 #ifdef S_IWUSR
     if (rb_stat_rowned(obj))
-        return RBOOL(st->st_mode & S_IWUSR);
+        return RBOOL(st->ST_(mode) & S_IWUSR);
 #endif
 #ifdef S_IWGRP
-    if (rb_group_member(get_stat(obj)->st_gid))
-        return RBOOL(st->st_mode & S_IWGRP);
+    if (rb_group_member(get_stat(obj)->ST_(gid)))
+        return RBOOL(st->ST_(mode) & S_IWGRP);
 #endif
 #ifdef S_IWOTH
-    if (!(st->st_mode & S_IWOTH)) return Qfalse;
+    if (!(st->ST_(mode) & S_IWOTH)) return Qfalse;
 #endif
     return Qtrue;
 }
@@ -5965,9 +6202,9 @@ static VALUE
 rb_stat_ww(VALUE obj)
 {
 #ifdef S_IWOTH
-    struct stat *st = get_stat(obj);
-    if ((st->st_mode & (S_IWOTH)) == S_IWOTH) {
-        return UINT2NUM(st->st_mode & (S_IRUGO|S_IWUGO|S_IXUGO));
+    rb_io_stat_data *st = get_stat(obj);
+    if ((st->ST_(mode) & (S_IWOTH)) == S_IWOTH) {
+        return UINT2NUM(st->ST_(mode) & (S_IRUGO|S_IWUGO|S_IXUGO));
     }
 #endif
     return Qnil;
@@ -5989,23 +6226,23 @@ rb_stat_ww(VALUE obj)
 static VALUE
 rb_stat_x(VALUE obj)
 {
-    struct stat *st = get_stat(obj);
+    rb_io_stat_data *st = get_stat(obj);
 
 #ifdef USE_GETEUID
     if (geteuid() == 0) {
-        return RBOOL(st->st_mode & S_IXUGO);
+        return RBOOL(st->ST_(mode) & S_IXUGO);
     }
 #endif
 #ifdef S_IXUSR
     if (rb_stat_owned(obj))
-        return RBOOL(st->st_mode & S_IXUSR);
+        return RBOOL(st->ST_(mode) & S_IXUSR);
 #endif
 #ifdef S_IXGRP
     if (rb_stat_grpowned(obj))
-        return RBOOL(st->st_mode & S_IXGRP);
+        return RBOOL(st->ST_(mode) & S_IXGRP);
 #endif
 #ifdef S_IXOTH
-    if (!(st->st_mode & S_IXOTH)) return Qfalse;
+    if (!(st->ST_(mode) & S_IXOTH)) return Qfalse;
 #endif
     return Qtrue;
 }
@@ -6021,23 +6258,23 @@ rb_stat_x(VALUE obj)
 static VALUE
 rb_stat_X(VALUE obj)
 {
-    struct stat *st = get_stat(obj);
+    rb_io_stat_data *st = get_stat(obj);
 
 #ifdef USE_GETEUID
     if (getuid() == 0) {
-        return RBOOL(st->st_mode & S_IXUGO);
+        return RBOOL(st->ST_(mode) & S_IXUGO);
     }
 #endif
 #ifdef S_IXUSR
     if (rb_stat_rowned(obj))
-        return RBOOL(st->st_mode & S_IXUSR);
+        return RBOOL(st->ST_(mode) & S_IXUSR);
 #endif
 #ifdef S_IXGRP
-    if (rb_group_member(get_stat(obj)->st_gid))
-        return RBOOL(st->st_mode & S_IXGRP);
+    if (rb_group_member(get_stat(obj)->ST_(gid)))
+        return RBOOL(st->ST_(mode) & S_IXGRP);
 #endif
 #ifdef S_IXOTH
-    if (!(st->st_mode & S_IXOTH)) return Qfalse;
+    if (!(st->ST_(mode) & S_IXOTH)) return Qfalse;
 #endif
     return Qtrue;
 }
@@ -6056,7 +6293,7 @@ rb_stat_X(VALUE obj)
 static VALUE
 rb_stat_f(VALUE obj)
 {
-    if (S_ISREG(get_stat(obj)->st_mode)) return Qtrue;
+    if (S_ISREG(get_stat(obj)->ST_(mode))) return Qtrue;
     return Qfalse;
 }
 
@@ -6074,7 +6311,7 @@ rb_stat_f(VALUE obj)
 static VALUE
 rb_stat_z(VALUE obj)
 {
-    if (get_stat(obj)->st_size == 0) return Qtrue;
+    if (get_stat(obj)->ST_(size) == 0) return Qtrue;
     return Qfalse;
 }
 
@@ -6093,7 +6330,7 @@ rb_stat_z(VALUE obj)
 static VALUE
 rb_stat_s(VALUE obj)
 {
-    rb_off_t size = get_stat(obj)->st_size;
+    rb_off_t size = get_stat(obj)->ST_(size);
 
     if (size == 0) return Qnil;
     return OFFT2NUM(size);
@@ -6114,7 +6351,7 @@ static VALUE
 rb_stat_suid(VALUE obj)
 {
 #ifdef S_ISUID
-    if (get_stat(obj)->st_mode & S_ISUID) return Qtrue;
+    if (get_stat(obj)->ST_(mode) & S_ISUID) return Qtrue;
 #endif
     return Qfalse;
 }
@@ -6135,7 +6372,7 @@ static VALUE
 rb_stat_sgid(VALUE obj)
 {
 #ifdef S_ISGID
-    if (get_stat(obj)->st_mode & S_ISGID) return Qtrue;
+    if (get_stat(obj)->ST_(mode) & S_ISGID) return Qtrue;
 #endif
     return Qfalse;
 }
@@ -6156,7 +6393,7 @@ static VALUE
 rb_stat_sticky(VALUE obj)
 {
 #ifdef S_ISVTX
-    if (get_stat(obj)->st_mode & S_ISVTX) return Qtrue;
+    if (get_stat(obj)->ST_(mode) & S_ISVTX) return Qtrue;
 #endif
     return Qfalse;
 }
@@ -6205,7 +6442,7 @@ rb_file_s_mkfifo(int argc, VALUE *argv, VALUE _)
     FilePathValue(path);
     path = rb_str_encode_ospath(path);
     ma.path = RSTRING_PTR(path);
-    if (rb_thread_call_without_gvl(nogvl_mkfifo, &ma, RUBY_UBF_IO, 0)) {
+    if (IO_WITHOUT_GVL(nogvl_mkfifo, &ma)) {
         rb_sys_fail_path(path);
     }
     return INT2FIX(0);
@@ -6302,6 +6539,7 @@ path_check_0(VALUE path)
 int
 rb_path_check(const char *path)
 {
+    rb_warn_deprecated_to_remove_at(3.6, "rb_path_check", NULL);
 #if ENABLE_PATH_CHECK
     const char *p0, *p, *pend;
     const char sep = PATH_SEP_CHAR;
@@ -6528,10 +6766,10 @@ const char ruby_null_device[] =
 /*
  *  A \File object is a representation of a file in the underlying platform.
  *
- *  \Class \File extends module FileTest, supporting such singleton methods
+ *  Class \File extends module FileTest, supporting such singleton methods
  *  as <tt>File.exist?</tt>.
  *
- *  === About the Examples
+ *  == About the Examples
  *
  *  Many examples here use these variables:
  *
@@ -6612,7 +6850,7 @@ const char ruby_null_device[] =
  *
  *  - <tt>'r'</tt>:
  *
- *    - File is not initially truncated:
+ *    - \File is not initially truncated:
  *
  *        f = File.new('t.txt') # => #<File:t.txt>
  *        f.size == 0           # => false
@@ -6621,7 +6859,7 @@ const char ruby_null_device[] =
  *
  *        f.pos # => 0
  *
- *    - File may be read anywhere; see IO#rewind, IO#pos=, IO#seek:
+ *    - \File may be read anywhere; see IO#rewind, IO#pos=, IO#seek:
  *
  *        f.readline # => "First line\n"
  *        f.readline # => "Second line\n"
@@ -6641,7 +6879,7 @@ const char ruby_null_device[] =
  *
  *  - <tt>'w'</tt>:
  *
- *    - File is initially truncated:
+ *    - \File is initially truncated:
  *
  *        path = 't.tmp'
  *        File.write(path, text)
@@ -6652,7 +6890,7 @@ const char ruby_null_device[] =
  *
  *        f.pos # => 0
  *
- *    - File may be written anywhere (even past end-of-file);
+ *    - \File may be written anywhere (even past end-of-file);
  *      see IO#rewind, IO#pos=, IO#seek:
  *
  *        f.write('foo')
@@ -6695,7 +6933,7 @@ const char ruby_null_device[] =
  *
  *  - <tt>'a'</tt>:
  *
- *    - File is not initially truncated:
+ *    - \File is not initially truncated:
  *
  *        path = 't.tmp'
  *        File.write(path, 'foo')
@@ -6706,7 +6944,7 @@ const char ruby_null_device[] =
  *
  *        f.pos # => 0
  *
- *    - File may be written only at end-of-file;
+ *    - \File may be written only at end-of-file;
  *      IO#rewind, IO#pos=, IO#seek do not affect writing:
  *
  *        f.write('bar')
@@ -6727,7 +6965,7 @@ const char ruby_null_device[] =
  *
  *  - <tt>'r+'</tt>:
  *
- *    - File is not initially truncated:
+ *    - \File is not initially truncated:
  *
  *        path = 't.tmp'
  *        File.write(path, text)
@@ -6738,7 +6976,7 @@ const char ruby_null_device[] =
  *
  *        f.pos # => 0
  *
- *    - File may be read or written anywhere (even past end-of-file);
+ *    - \File may be read or written anywhere (even past end-of-file);
  *      see IO#rewind, IO#pos=, IO#seek:
  *
  *        f.readline # => "First line\n"
@@ -6783,7 +7021,7 @@ const char ruby_null_device[] =
  *
  *  - <tt>'a+'</tt>:
  *
- *    - File is not initially truncated:
+ *    - \File is not initially truncated:
  *
  *        path = 't.tmp'
  *        File.write(path, 'foo')
@@ -6794,7 +7032,7 @@ const char ruby_null_device[] =
  *
  *        f.pos # => 0
  *
- *    - File may be written only at end-of-file;
+ *    - \File may be written only at end-of-file;
  *      IO#rewind, IO#pos=, IO#seek do not affect writing:
  *
  *        f.write('bar')
@@ -6809,7 +7047,7 @@ const char ruby_null_device[] =
  *        f.flush
  *        File.read(path) # => "foobarbazbat"
  *
- *    - File may be read anywhere; see IO#rewind, IO#pos=, IO#seek:
+ *    - \File may be read anywhere; see IO#rewind, IO#pos=, IO#seek:
  *
  *        f.rewind
  *        f.read # => "foobarbazbat"
@@ -6834,7 +7072,7 @@ const char ruby_null_device[] =
  *        f = File.new(path, 'w')
  *        f.pos # => 0
  *
- *    - File may be written anywhere (even past end-of-file);
+ *    - \File may be written anywhere (even past end-of-file);
  *      see IO#rewind, IO#pos=, IO#seek:
  *
  *        f.write('foo')
@@ -6911,7 +7149,7 @@ const char ruby_null_device[] =
  *        f = File.new(path, 'w+')
  *        f.pos # => 0
  *
- *    - File may be written anywhere (even past end-of-file);
+ *    - \File may be written anywhere (even past end-of-file);
  *      see IO#rewind, IO#pos=, IO#seek:
  *
  *        f.write('foo')
@@ -6948,7 +7186,7 @@ const char ruby_null_device[] =
  *        File.read(path) # => "bazbam\u0000\u0000bah"
  *        f.pos # => 11
  *
- *    - File may be read anywhere (even past end-of-file);
+ *    - \File may be read anywhere (even past end-of-file);
  *      see IO#rewind, IO#pos=, IO#seek:
  *
  *        f.rewind
@@ -6989,7 +7227,7 @@ const char ruby_null_device[] =
  *        f.flush
  *        File.read(path) # => "foobarbaz"
  *
- *    - File may be read anywhere (even past end-of-file);
+ *    - \File may be read anywhere (even past end-of-file);
  *      see IO#rewind, IO#pos=, IO#seek:
  *
  *        f.rewind
@@ -7185,7 +7423,7 @@ const char ruby_null_device[] =
  *
  *  == What's Here
  *
- *  First, what's elsewhere. \Class \File:
+ *  First, what's elsewhere. Class \File:
  *
  *  - Inherits from {class IO}[rdoc-ref:IO@What-27s+Here],
  *    in particular, methods for creating, reading, and writing files
@@ -7431,7 +7669,7 @@ Init_File(void)
     /*
      * Document-module: File::Constants
      *
-     * \Module +File::Constants+ defines file-related constants.
+     * Module +File::Constants+ defines file-related constants.
      *
      * There are two families of constants here:
      *
@@ -7472,7 +7710,7 @@ Init_File(void)
      *
      * ==== File::RDONLY
      *
-     * Flag File::RDONLY specifies the the stream should be opened for reading only:
+     * Flag File::RDONLY specifies the stream should be opened for reading only:
      *
      *   filepath = '/tmp/t.tmp'
      *   f = File.new(filepath, File::RDONLY)
@@ -7646,11 +7884,13 @@ Init_File(void)
      *
      * Flag File::BINARY specifies that the stream is to be accessed in binary mode.
      *
-     * ==== File::SHARE_DELETE (Windows Only)
+     * ==== File::SHARE_DELETE
      *
      * Flag File::SHARE_DELETE enables other processes to open the stream
      * with delete access.
      *
+     * Windows only.
+     *
      * If the stream is opened for (local) delete access without File::SHARE_DELETE,
      * and another process attempts to open it with delete access,
      * the attempt fails and the stream is not opened for that process.
@@ -7725,9 +7965,11 @@ Init_File(void)
      * do not match the directory separator
      * (the value of constant File::SEPARATOR).
      *
-     * ==== File::FNM_SHORTNAME (Windows Only)
+     * ==== File::FNM_SHORTNAME
+     *
+     * Flag File::FNM_SHORTNAME allows patterns to match short names if they exist.
      *
-     * Flag File::FNM_SHORTNAME Allows patterns to match short names if they exist.
+     * Windows only.
      *
      * ==== File::FNM_SYSCASE
      *
@@ -7747,57 +7989,80 @@ Init_File(void)
      */
     rb_mFConst = rb_define_module_under(rb_cFile, "Constants");
     rb_include_module(rb_cIO, rb_mFConst);
+    /* {File::RDONLY}[rdoc-ref:File::Constants@File-3A-3ARDONLY] */
     rb_define_const(rb_mFConst, "RDONLY", INT2FIX(O_RDONLY));
+    /* {File::WRONLY}[rdoc-ref:File::Constants@File-3A-3AWRONLY] */
     rb_define_const(rb_mFConst, "WRONLY", INT2FIX(O_WRONLY));
+    /* {File::RDWR}[rdoc-ref:File::Constants@File-3A-3ARDWR] */
     rb_define_const(rb_mFConst, "RDWR", INT2FIX(O_RDWR));
+    /* {File::APPEND}[rdoc-ref:File::Constants@File-3A-3AAPPEND] */
     rb_define_const(rb_mFConst, "APPEND", INT2FIX(O_APPEND));
+    /* {File::CREAT}[rdoc-ref:File::Constants@File-3A-3ACREAT] */
     rb_define_const(rb_mFConst, "CREAT", INT2FIX(O_CREAT));
+    /* {File::EXCL}[rdoc-ref:File::Constants@File-3A-3AEXCL] */
     rb_define_const(rb_mFConst, "EXCL", INT2FIX(O_EXCL));
 #if defined(O_NDELAY) || defined(O_NONBLOCK)
 # ifndef O_NONBLOCK
 #   define O_NONBLOCK O_NDELAY
 # endif
+    /* {File::NONBLOCK}[rdoc-ref:File::Constants@File-3A-3ANONBLOCK] */
     rb_define_const(rb_mFConst, "NONBLOCK", INT2FIX(O_NONBLOCK));
 #endif
+    /* {File::TRUNC}[rdoc-ref:File::Constants@File-3A-3ATRUNC] */
     rb_define_const(rb_mFConst, "TRUNC", INT2FIX(O_TRUNC));
 #ifdef O_NOCTTY
+    /* {File::NOCTTY}[rdoc-ref:File::Constants@File-3A-3ANOCTTY] */
     rb_define_const(rb_mFConst, "NOCTTY", INT2FIX(O_NOCTTY));
 #endif
 #ifndef O_BINARY
 # define  O_BINARY 0
 #endif
+    /* {File::BINARY}[rdoc-ref:File::Constants@File-3A-3ABINARY] */
     rb_define_const(rb_mFConst, "BINARY", INT2FIX(O_BINARY));
 #ifndef O_SHARE_DELETE
 # define O_SHARE_DELETE 0
 #endif
+    /* {File::SHARE_DELETE}[rdoc-ref:File::Constants@File-3A-3ASHARE_DELETE] */
     rb_define_const(rb_mFConst, "SHARE_DELETE", INT2FIX(O_SHARE_DELETE));
 #ifdef O_SYNC
+    /* {File::SYNC}[rdoc-ref:File::Constants@File-3A-3ASYNC-2C+File-3A-3ARSYNC-2C+and+File-3A-3ADSYNC] */
     rb_define_const(rb_mFConst, "SYNC", INT2FIX(O_SYNC));
 #endif
 #ifdef O_DSYNC
+    /* {File::DSYNC}[rdoc-ref:File::Constants@File-3A-3ASYNC-2C+File-3A-3ARSYNC-2C+and+File-3A-3ADSYNC] */
     rb_define_const(rb_mFConst, "DSYNC", INT2FIX(O_DSYNC));
 #endif
 #ifdef O_RSYNC
+    /* {File::RSYNC}[rdoc-ref:File::Constants@File-3A-3ASYNC-2C+File-3A-3ARSYNC-2C+and+File-3A-3ADSYNC] */
     rb_define_const(rb_mFConst, "RSYNC", INT2FIX(O_RSYNC));
 #endif
 #ifdef O_NOFOLLOW
+    /* {File::NOFOLLOW}[rdoc-ref:File::Constants@File-3A-3ANOFOLLOW] */
     rb_define_const(rb_mFConst, "NOFOLLOW", INT2FIX(O_NOFOLLOW)); /* FreeBSD, Linux */
 #endif
 #ifdef O_NOATIME
+    /* {File::NOATIME}[rdoc-ref:File::Constants@File-3A-3ANOATIME] */
     rb_define_const(rb_mFConst, "NOATIME", INT2FIX(O_NOATIME)); /* Linux */
 #endif
 #ifdef O_DIRECT
+    /* {File::DIRECT}[rdoc-ref:File::Constants@File-3A-3ADIRECT] */
     rb_define_const(rb_mFConst, "DIRECT", INT2FIX(O_DIRECT));
 #endif
 #ifdef O_TMPFILE
+    /* {File::TMPFILE}[rdoc-ref:File::Constants@File-3A-3ATMPFILE] */
     rb_define_const(rb_mFConst, "TMPFILE", INT2FIX(O_TMPFILE));
 #endif
 
+    /* {File::LOCK_SH}[rdoc-ref:File::Constants@File-3A-3ALOCK_SH] */
     rb_define_const(rb_mFConst, "LOCK_SH", INT2FIX(LOCK_SH));
+    /* {File::LOCK_EX}[rdoc-ref:File::Constants@File-3A-3ALOCK_EX] */
     rb_define_const(rb_mFConst, "LOCK_EX", INT2FIX(LOCK_EX));
+    /* {File::LOCK_UN}[rdoc-ref:File::Constants@File-3A-3ALOCK_UN] */
     rb_define_const(rb_mFConst, "LOCK_UN", INT2FIX(LOCK_UN));
+    /* {File::LOCK_NB}[rdoc-ref:File::Constants@File-3A-3ALOCK_NB] */
     rb_define_const(rb_mFConst, "LOCK_NB", INT2FIX(LOCK_NB));
 
+    /* {File::NULL}[rdoc-ref:File::Constants@File-3A-3ANULL] */
     rb_define_const(rb_mFConst, "NULL", rb_fstring_cstr(ruby_null_device));
 
     rb_define_global_function("test", rb_f_test, -1);
diff --git a/gc.c b/gc.c
index c71fdd10ed91ca..4a3623cd755826 100644
--- a/gc.c
+++ b/gc.c
@@ -19,15 +19,6 @@
 # include "ruby/ruby.h"
 #endif
 
-#include <signal.h>
-
-#define sighandler_t ruby_sighandler_t
-
-#ifndef _WIN32
-#include <unistd.h>
-#include <sys/mman.h>
-#endif
-
 #if defined(__wasm__) && !defined(__EMSCRIPTEN__)
 # include "wasm/setjmp.h"
 # include "wasm/machine.h"
@@ -60,10 +51,6 @@
 # endif
 #endif
 
-#if !defined(PAGE_SIZE) && defined(HAVE_SYS_USER_H)
-/* LIST_HEAD conflicts with sys/queue.h on macOS */
-# include <sys/user.h>
-#endif
 /* MALLOC_HEADERS_END */
 
 #ifdef HAVE_SYS_TIME_H
@@ -87,17 +74,18 @@
 #include <emscripten.h>
 #endif
 
-#ifdef HAVE_MACH_TASK_EXCEPTION_PORTS
-# include <mach/task.h>
-# include <mach/mach_init.h>
-# include <mach/mach_port.h>
+/* For ruby_annotate_mmap */
+#ifdef HAVE_SYS_PRCTL_H
+#include <sys/prctl.h>
 #endif
+
 #undef LIST_HEAD /* ccan/list conflicts with BSD-origin sys/queue.h. */
 
 #include "constant.h"
 #include "darray.h"
 #include "debug_counter.h"
 #include "eval_intern.h"
+#include "gc/gc.h"
 #include "id_table.h"
 #include "internal.h"
 #include "internal/class.h"
@@ -120,7 +108,6 @@
 #include "internal/thread.h"
 #include "internal/variable.h"
 #include "internal/warnings.h"
-#include "rjit.h"
 #include "probes.h"
 #include "regint.h"
 #include "ruby/debug.h"
@@ -129,17 +116,278 @@
 #include "ruby/st.h"
 #include "ruby/thread.h"
 #include "ruby/util.h"
+#include "ruby/vm.h"
 #include "ruby_assert.h"
 #include "ruby_atomic.h"
 #include "symbol.h"
+#include "variable.h"
 #include "vm_core.h"
 #include "vm_sync.h"
 #include "vm_callinfo.h"
 #include "ractor_core.h"
+#include "yjit.h"
 
 #include "builtin.h"
 #include "shape.h"
 
+unsigned int
+rb_gc_vm_lock(const char *file, int line)
+{
+    unsigned int lev = 0;
+    rb_vm_lock_enter(&lev, file, line);
+    return lev;
+}
+
+void
+rb_gc_vm_unlock(unsigned int lev, const char *file, int line)
+{
+    rb_vm_lock_leave(&lev, file, line);
+}
+
+unsigned int
+rb_gc_cr_lock(const char *file, int line)
+{
+    unsigned int lev;
+    rb_vm_lock_enter_cr(GET_RACTOR(), &lev, file, line);
+    return lev;
+}
+
+void
+rb_gc_cr_unlock(unsigned int lev, const char *file, int line)
+{
+    rb_vm_lock_leave_cr(GET_RACTOR(), &lev, file, line);
+}
+
+unsigned int
+rb_gc_vm_lock_no_barrier(const char *file, int line)
+{
+    unsigned int lev = 0;
+    rb_vm_lock_enter_nb(&lev, file, line);
+    return lev;
+}
+
+void
+rb_gc_vm_unlock_no_barrier(unsigned int lev, const char *file, int line)
+{
+    rb_vm_lock_leave_nb(&lev, file, line);
+}
+
+void
+rb_gc_vm_barrier(void)
+{
+    rb_vm_barrier();
+}
+
+#if USE_MODULAR_GC
+void *
+rb_gc_get_ractor_newobj_cache(void)
+{
+    return GET_RACTOR()->newobj_cache;
+}
+
+void
+rb_gc_initialize_vm_context(struct rb_gc_vm_context *context)
+{
+    rb_native_mutex_initialize(&context->lock);
+    context->ec = GET_EC();
+}
+
+void
+rb_gc_worker_thread_set_vm_context(struct rb_gc_vm_context *context)
+{
+    rb_native_mutex_lock(&context->lock);
+
+    GC_ASSERT(rb_current_execution_context(false) == NULL);
+
+#ifdef RB_THREAD_LOCAL_SPECIFIER
+    rb_current_ec_set(context->ec);
+#else
+    native_tls_set(ruby_current_ec_key, context->ec);
+#endif
+}
+
+void
+rb_gc_worker_thread_unset_vm_context(struct rb_gc_vm_context *context)
+{
+    rb_native_mutex_unlock(&context->lock);
+
+    GC_ASSERT(rb_current_execution_context(true) == context->ec);
+
+#ifdef RB_THREAD_LOCAL_SPECIFIER
+    rb_current_ec_set(NULL);
+#else
+    native_tls_set(ruby_current_ec_key, NULL);
+#endif
+}
+#endif
+
+bool
+rb_gc_event_hook_required_p(rb_event_flag_t event)
+{
+    return ruby_vm_event_flags & event;
+}
+
+void
+rb_gc_event_hook(VALUE obj, rb_event_flag_t event)
+{
+    if (LIKELY(!rb_gc_event_hook_required_p(event))) return;
+
+    rb_execution_context_t *ec = GET_EC();
+    if (!ec->cfp) return;
+
+    EXEC_EVENT_HOOK(ec, event, ec->cfp->self, 0, 0, 0, obj);
+}
+
+void *
+rb_gc_get_objspace(void)
+{
+    return GET_VM()->gc.objspace;
+}
+
+
+void
+rb_gc_ractor_newobj_cache_foreach(void (*func)(void *cache, void *data), void *data)
+{
+    rb_ractor_t *r = NULL;
+    if (RB_LIKELY(ruby_single_main_ractor)) {
+        GC_ASSERT(
+            ccan_list_empty(&GET_VM()->ractor.set) ||
+                (ccan_list_top(&GET_VM()->ractor.set, rb_ractor_t, vmlr_node) == ruby_single_main_ractor &&
+                    ccan_list_tail(&GET_VM()->ractor.set, rb_ractor_t, vmlr_node) == ruby_single_main_ractor)
+        );
+
+        func(ruby_single_main_ractor->newobj_cache, data);
+    }
+    else {
+        ccan_list_for_each(&GET_VM()->ractor.set, r, vmlr_node) {
+            func(r->newobj_cache, data);
+        }
+    }
+}
+
+void
+rb_gc_run_obj_finalizer(VALUE objid, long count, VALUE (*callback)(long i, void *data), void *data)
+{
+    volatile struct {
+        VALUE errinfo;
+        VALUE final;
+        rb_control_frame_t *cfp;
+        VALUE *sp;
+        long finished;
+    } saved;
+
+    rb_execution_context_t * volatile ec = GET_EC();
+#define RESTORE_FINALIZER() (\
+        ec->cfp = saved.cfp, \
+        ec->cfp->sp = saved.sp, \
+        ec->errinfo = saved.errinfo)
+
+    saved.errinfo = ec->errinfo;
+    saved.cfp = ec->cfp;
+    saved.sp = ec->cfp->sp;
+    saved.finished = 0;
+    saved.final = Qundef;
+
+    rb_ractor_ignore_belonging(true);
+    EC_PUSH_TAG(ec);
+    enum ruby_tag_type state = EC_EXEC_TAG();
+    if (state != TAG_NONE) {
+        ++saved.finished;	/* skip failed finalizer */
+
+        VALUE failed_final = saved.final;
+        saved.final = Qundef;
+        if (!UNDEF_P(failed_final) && !NIL_P(ruby_verbose)) {
+            rb_warn("Exception in finalizer %+"PRIsVALUE, failed_final);
+            rb_ec_error_print(ec, ec->errinfo);
+        }
+    }
+
+    for (long i = saved.finished; RESTORE_FINALIZER(), i < count; saved.finished = ++i) {
+        saved.final = callback(i, data);
+        rb_check_funcall(saved.final, idCall, 1, &objid);
+    }
+    EC_POP_TAG();
+    rb_ractor_ignore_belonging(false);
+#undef RESTORE_FINALIZER
+}
+
+void
+rb_gc_set_pending_interrupt(void)
+{
+    rb_execution_context_t *ec = GET_EC();
+    ec->interrupt_mask |= PENDING_INTERRUPT_MASK;
+}
+
+void
+rb_gc_unset_pending_interrupt(void)
+{
+    rb_execution_context_t *ec = GET_EC();
+    ec->interrupt_mask &= ~PENDING_INTERRUPT_MASK;
+}
+
+bool
+rb_gc_multi_ractor_p(void)
+{
+    return rb_multi_ractor_p();
+}
+
+bool rb_obj_is_main_ractor(VALUE gv);
+
+bool
+rb_gc_shutdown_call_finalizer_p(VALUE obj)
+{
+    switch (BUILTIN_TYPE(obj)) {
+      case T_DATA:
+        if (!ruby_free_at_exit_p() && (!DATA_PTR(obj) || !RDATA(obj)->dfree)) return false;
+        if (rb_obj_is_thread(obj)) return false;
+        if (rb_obj_is_mutex(obj)) return false;
+        if (rb_obj_is_fiber(obj)) return false;
+        if (rb_obj_is_main_ractor(obj)) return false;
+        if (rb_obj_is_fstring_table(obj)) return false;
+
+        return true;
+
+      case T_FILE:
+        return true;
+
+      case T_SYMBOL:
+        if (RSYMBOL(obj)->fstr &&
+                (BUILTIN_TYPE(RSYMBOL(obj)->fstr) == T_NONE ||
+                    BUILTIN_TYPE(RSYMBOL(obj)->fstr) == T_ZOMBIE)) {
+            RSYMBOL(obj)->fstr = 0;
+        }
+        return true;
+
+      case T_NONE:
+        return false;
+
+      default:
+        return ruby_free_at_exit_p();
+    }
+}
+
+uint32_t
+rb_gc_get_shape(VALUE obj)
+{
+    return (uint32_t)rb_obj_shape_id(obj);
+}
+
+void
+rb_gc_set_shape(VALUE obj, uint32_t shape_id)
+{
+    rb_obj_set_shape_id(obj, (uint32_t)shape_id);
+}
+
+uint32_t
+rb_gc_rebuild_shape(VALUE obj, size_t heap_id)
+{
+    RUBY_ASSERT(RB_TYPE_P(obj, T_OBJECT));
+
+    return (uint32_t)rb_shape_transition_heap(obj, heap_id);
+}
+
+void rb_vm_update_references(void *ptr);
+
 #define rb_setjmp(env) RUBY_SETJMP(env)
 #define rb_jmp_buf rb_jmpbuf_t
 #undef rb_data_object_wrap
@@ -148,36 +396,102 @@
 #define MAP_ANONYMOUS MAP_ANON
 #endif
 
-static inline struct rbimpl_size_mul_overflow_tag
-size_add_overflow(size_t x, size_t y)
-{
-    size_t z;
-    bool p;
-#if 0
+#define unless_objspace(objspace) \
+    void *objspace; \
+    rb_vm_t *unless_objspace_vm = GET_VM(); \
+    if (unless_objspace_vm) objspace = unless_objspace_vm->gc.objspace; \
+    else /* return; or objspace will be warned uninitialized */
+
+#define RMOVED(obj) ((struct RMoved *)(obj))
 
-#elif __has_builtin(__builtin_add_overflow)
-    p = __builtin_add_overflow(x, y, &z);
+#define TYPED_UPDATE_IF_MOVED(_objspace, _type, _thing) do { \
+    if (rb_gc_impl_object_moved_p((_objspace), (VALUE)(_thing))) {    \
+        *(_type *)&(_thing) = (_type)gc_location_internal(_objspace, (VALUE)_thing); \
+    } \
+} while (0)
 
-#elif defined(DSIZE_T)
-    RB_GNUC_EXTENSION DSIZE_T dx = x;
-    RB_GNUC_EXTENSION DSIZE_T dy = y;
-    RB_GNUC_EXTENSION DSIZE_T dz = dx + dy;
-    p = dz > SIZE_MAX;
-    z = (size_t)dz;
+#define UPDATE_IF_MOVED(_objspace, _thing) TYPED_UPDATE_IF_MOVED(_objspace, VALUE, _thing)
 
-#else
-    z = x + y;
-    p = z < y;
+#if RUBY_MARK_FREE_DEBUG
+int ruby_gc_debug_indent = 0;
+#endif
+
+#ifndef RGENGC_OBJ_INFO
+# define RGENGC_OBJ_INFO RGENGC_CHECK_MODE
+#endif
+
+#ifndef CALC_EXACT_MALLOC_SIZE
+# define CALC_EXACT_MALLOC_SIZE 0
+#endif
+
+VALUE rb_mGC;
 
+static size_t malloc_offset = 0;
+#if defined(HAVE_MALLOC_USABLE_SIZE)
+static size_t
+gc_compute_malloc_offset(void)
+{
+    // Different allocators use different metadata storage strategies which result in different
+    // ideal sizes.
+    // For instance malloc(64) will waste 8B with glibc, but waste 0B with jemalloc.
+    // But malloc(56) will waste 0B with glibc, but waste 8B with jemalloc.
+    // So we try allocating 64, 56 and 48 bytes and select the first offset that doesn't
+    // waste memory.
+    // This was tested on Linux with glibc 2.35 and jemalloc 5, and for both it result in
+    // no wasted memory.
+    size_t offset = 0;
+    for (offset = 0; offset <= 16; offset += 8) {
+        size_t allocated = (64 - offset);
+        void *test_ptr = malloc(allocated);
+        size_t wasted = malloc_usable_size(test_ptr) - allocated;
+        free(test_ptr);
+
+        if (wasted == 0) {
+            return offset;
+        }
+    }
+    return 0;
+}
+#else
+static size_t
+gc_compute_malloc_offset(void)
+{
+    // If we don't have malloc_usable_size, we use powers of 2.
+    return 0;
+}
 #endif
-    return (struct rbimpl_size_mul_overflow_tag) { p, z, };
+
+size_t
+rb_malloc_grow_capa(size_t current, size_t type_size)
+{
+    size_t current_capacity = current;
+    if (current_capacity < 4) {
+        current_capacity = 4;
+    }
+    current_capacity *= type_size;
+
+    // We double the current capacity.
+    size_t new_capacity = (current_capacity * 2);
+
+    // And round up to the next power of 2 if it's not already one.
+    if (rb_popcount64(new_capacity) != 1) {
+        new_capacity = (size_t)(1 << (64 - nlz_int64(new_capacity)));
+    }
+
+    new_capacity -= malloc_offset;
+    new_capacity /= type_size;
+    if (current > new_capacity) {
+        rb_bug("rb_malloc_grow_capa: current_capacity=%zu, new_capacity=%zu, malloc_offset=%zu", current, new_capacity, malloc_offset);
+    }
+    RUBY_ASSERT(new_capacity > current);
+    return new_capacity;
 }
 
 static inline struct rbimpl_size_mul_overflow_tag
 size_mul_add_overflow(size_t x, size_t y, size_t z) /* x * y + z */
 {
     struct rbimpl_size_mul_overflow_tag t = rbimpl_size_mul_overflow(x, y);
-    struct rbimpl_size_mul_overflow_tag u = size_add_overflow(t.right, z);
+    struct rbimpl_size_mul_overflow_tag u = rbimpl_size_add_overflow(t.right, z);
     return (struct rbimpl_size_mul_overflow_tag) { t.left || u.left, u.right };
 }
 
@@ -186,7 +500,7 @@ size_mul_add_mul_overflow(size_t x, size_t y, size_t z, size_t w) /* x * y + z *
 {
     struct rbimpl_size_mul_overflow_tag t = rbimpl_size_mul_overflow(x, y);
     struct rbimpl_size_mul_overflow_tag u = rbimpl_size_mul_overflow(z, w);
-    struct rbimpl_size_mul_overflow_tag v = size_add_overflow(t.right, u.right);
+    struct rbimpl_size_mul_overflow_tag v = rbimpl_size_add_overflow(t.right, u.right);
     return (struct rbimpl_size_mul_overflow_tag) { t.left || u.left || v.left, v.right };
 }
 
@@ -279,13075 +593,4014 @@ rb_gc_guarded_ptr_val(volatile VALUE *ptr, VALUE val)
 }
 #endif
 
-#ifndef GC_HEAP_INIT_SLOTS
-#define GC_HEAP_INIT_SLOTS 10000
-#endif
-#ifndef GC_HEAP_FREE_SLOTS
-#define GC_HEAP_FREE_SLOTS  4096
-#endif
-#ifndef GC_HEAP_GROWTH_FACTOR
-#define GC_HEAP_GROWTH_FACTOR 1.8
-#endif
-#ifndef GC_HEAP_GROWTH_MAX_SLOTS
-#define GC_HEAP_GROWTH_MAX_SLOTS 0 /* 0 is disable */
-#endif
-#ifndef GC_HEAP_REMEMBERED_WB_UNPROTECTED_OBJECTS_LIMIT_RATIO
-# define GC_HEAP_REMEMBERED_WB_UNPROTECTED_OBJECTS_LIMIT_RATIO 0.01
+static const char *obj_type_name(VALUE obj);
+#include "gc/default/default.c"
+
+#if USE_MODULAR_GC && !defined(HAVE_DLOPEN)
+# error "Modular GC requires dlopen"
+#elif USE_MODULAR_GC
+#include <dlfcn.h>
+
+typedef struct gc_function_map {
+    // Bootup
+    void *(*objspace_alloc)(void);
+    void (*objspace_init)(void *objspace_ptr);
+    void *(*ractor_cache_alloc)(void *objspace_ptr, void *ractor);
+    void (*set_params)(void *objspace_ptr);
+    void (*init)(void);
+    size_t *(*heap_sizes)(void *objspace_ptr);
+    // Shutdown
+    void (*shutdown_free_objects)(void *objspace_ptr);
+    void (*objspace_free)(void *objspace_ptr);
+    void (*ractor_cache_free)(void *objspace_ptr, void *cache);
+    // GC
+    void (*start)(void *objspace_ptr, bool full_mark, bool immediate_mark, bool immediate_sweep, bool compact);
+    bool (*during_gc_p)(void *objspace_ptr);
+    void (*prepare_heap)(void *objspace_ptr);
+    void (*gc_enable)(void *objspace_ptr);
+    void (*gc_disable)(void *objspace_ptr, bool finish_current_gc);
+    bool (*gc_enabled_p)(void *objspace_ptr);
+    VALUE (*config_get)(void *objpace_ptr);
+    void (*config_set)(void *objspace_ptr, VALUE hash);
+    void (*stress_set)(void *objspace_ptr, VALUE flag);
+    VALUE (*stress_get)(void *objspace_ptr);
+    // Object allocation
+    VALUE (*new_obj)(void *objspace_ptr, void *cache_ptr, VALUE klass, VALUE flags, VALUE v1, VALUE v2, VALUE v3, bool wb_protected, size_t alloc_size);
+    size_t (*obj_slot_size)(VALUE obj);
+    size_t (*heap_id_for_size)(void *objspace_ptr, size_t size);
+    bool (*size_allocatable_p)(size_t size);
+    // Malloc
+    void *(*malloc)(void *objspace_ptr, size_t size);
+    void *(*calloc)(void *objspace_ptr, size_t size);
+    void *(*realloc)(void *objspace_ptr, void *ptr, size_t new_size, size_t old_size);
+    void (*free)(void *objspace_ptr, void *ptr, size_t old_size);
+    void (*adjust_memory_usage)(void *objspace_ptr, ssize_t diff);
+    // Marking
+    void (*mark)(void *objspace_ptr, VALUE obj);
+    void (*mark_and_move)(void *objspace_ptr, VALUE *ptr);
+    void (*mark_and_pin)(void *objspace_ptr, VALUE obj);
+    void (*mark_maybe)(void *objspace_ptr, VALUE obj);
+    void (*mark_weak)(void *objspace_ptr, VALUE *ptr);
+    void (*remove_weak)(void *objspace_ptr, VALUE parent_obj, VALUE *ptr);
+    // Compaction
+    bool (*object_moved_p)(void *objspace_ptr, VALUE obj);
+    VALUE (*location)(void *objspace_ptr, VALUE value);
+    // Write barriers
+    void (*writebarrier)(void *objspace_ptr, VALUE a, VALUE b);
+    void (*writebarrier_unprotect)(void *objspace_ptr, VALUE obj);
+    void (*writebarrier_remember)(void *objspace_ptr, VALUE obj);
+    // Heap walking
+    void (*each_objects)(void *objspace_ptr, int (*callback)(void *, void *, size_t, void *), void *data);
+    void (*each_object)(void *objspace_ptr, void (*func)(VALUE obj, void *data), void *data);
+    // Finalizers
+    void (*make_zombie)(void *objspace_ptr, VALUE obj, void (*dfree)(void *), void *data);
+    VALUE (*define_finalizer)(void *objspace_ptr, VALUE obj, VALUE block);
+    void (*undefine_finalizer)(void *objspace_ptr, VALUE obj);
+    void (*copy_finalizer)(void *objspace_ptr, VALUE dest, VALUE obj);
+    void (*shutdown_call_finalizer)(void *objspace_ptr);
+    // Forking
+    void (*before_fork)(void *objspace_ptr);
+    void (*after_fork)(void *objspace_ptr, rb_pid_t pid);
+    // Statistics
+    void (*set_measure_total_time)(void *objspace_ptr, VALUE flag);
+    bool (*get_measure_total_time)(void *objspace_ptr);
+    unsigned long long (*get_total_time)(void *objspace_ptr);
+    size_t (*gc_count)(void *objspace_ptr);
+    VALUE (*latest_gc_info)(void *objspace_ptr, VALUE key);
+    VALUE (*stat)(void *objspace_ptr, VALUE hash_or_sym);
+    VALUE (*stat_heap)(void *objspace_ptr, VALUE heap_name, VALUE hash_or_sym);
+    const char *(*active_gc_name)(void);
+    // Miscellaneous
+    struct rb_gc_object_metadata_entry *(*object_metadata)(void *objspace_ptr, VALUE obj);
+    bool (*pointer_to_heap_p)(void *objspace_ptr, const void *ptr);
+    bool (*garbage_object_p)(void *objspace_ptr, VALUE obj);
+    void (*set_event_hook)(void *objspace_ptr, const rb_event_flag_t event);
+    void (*copy_attributes)(void *objspace_ptr, VALUE dest, VALUE obj);
+
+    bool modular_gc_loaded_p;
+} rb_gc_function_map_t;
+
+static rb_gc_function_map_t rb_gc_functions;
+
+# define RUBY_GC_LIBRARY "RUBY_GC_LIBRARY"
+# define MODULAR_GC_DIR STRINGIZE(modular_gc_dir)
+
+static void
+ruby_modular_gc_init(void)
+{
+    // Assert that the directory path ends with a /
+    RUBY_ASSERT_ALWAYS(MODULAR_GC_DIR[sizeof(MODULAR_GC_DIR) - 2] == '/');
+
+    const char *gc_so_file = getenv(RUBY_GC_LIBRARY);
+
+    rb_gc_function_map_t gc_functions = { 0 };
+
+    char *gc_so_path = NULL;
+    void *handle = NULL;
+    if (gc_so_file) {
+        /* Check to make sure that gc_so_file matches /[\w-_]+/ so that it does
+         * not load a shared object outside of the directory. */
+        for (size_t i = 0; i < strlen(gc_so_file); i++) {
+            char c = gc_so_file[i];
+            if (isalnum(c)) continue;
+            switch (c) {
+              case '-':
+              case '_':
+                break;
+              default:
+                fprintf(stderr, "Only alphanumeric, dash, and underscore is allowed in "RUBY_GC_LIBRARY"\n");
+                exit(1);
+            }
+        }
+
+        size_t gc_so_path_size = strlen(MODULAR_GC_DIR "librubygc." DLEXT) + strlen(gc_so_file) + 1;
+#ifdef LOAD_RELATIVE
+        Dl_info dli;
+        size_t prefix_len = 0;
+        if (dladdr((void *)(uintptr_t)ruby_modular_gc_init, &dli)) {
+            const char *base = strrchr(dli.dli_fname, '/');
+            if (base) {
+                size_t tail = 0;
+# define end_with_p(lit) \
+                (prefix_len >= (tail = rb_strlen_lit(lit)) && \
+                 memcmp(base - tail, lit, tail) == 0)
+
+                prefix_len = base - dli.dli_fname;
+                if (end_with_p("/bin") || end_with_p("/lib")) {
+                    prefix_len -= tail;
+                }
+                prefix_len += MODULAR_GC_DIR[0] != '/';
+                gc_so_path_size += prefix_len;
+            }
+        }
 #endif
-#ifndef GC_HEAP_OLDOBJECT_LIMIT_FACTOR
-#define GC_HEAP_OLDOBJECT_LIMIT_FACTOR 2.0
+        gc_so_path = alloca(gc_so_path_size);
+        {
+            size_t gc_so_path_idx = 0;
+#define GC_SO_PATH_APPEND(str) do { \
+    gc_so_path_idx += strlcpy(gc_so_path + gc_so_path_idx, str, gc_so_path_size - gc_so_path_idx); \
+} while (0)
+#ifdef LOAD_RELATIVE
+            if (prefix_len > 0) {
+                memcpy(gc_so_path, dli.dli_fname, prefix_len);
+                gc_so_path_idx = prefix_len;
+            }
 #endif
+            GC_SO_PATH_APPEND(MODULAR_GC_DIR "librubygc.");
+            GC_SO_PATH_APPEND(gc_so_file);
+            GC_SO_PATH_APPEND(DLEXT);
+            GC_ASSERT(gc_so_path_idx == gc_so_path_size - 1);
+#undef GC_SO_PATH_APPEND
+        }
 
-#ifndef GC_HEAP_FREE_SLOTS_MIN_RATIO
-#define GC_HEAP_FREE_SLOTS_MIN_RATIO  0.20
-#endif
-#ifndef GC_HEAP_FREE_SLOTS_GOAL_RATIO
-#define GC_HEAP_FREE_SLOTS_GOAL_RATIO 0.40
-#endif
-#ifndef GC_HEAP_FREE_SLOTS_MAX_RATIO
-#define GC_HEAP_FREE_SLOTS_MAX_RATIO  0.65
-#endif
+        handle = dlopen(gc_so_path, RTLD_LAZY | RTLD_GLOBAL);
+        if (!handle) {
+            fprintf(stderr, "ruby_modular_gc_init: Shared library %s cannot be opened: %s\n", gc_so_path, dlerror());
+            exit(1);
+        }
 
-#ifndef GC_MALLOC_LIMIT_MIN
-#define GC_MALLOC_LIMIT_MIN (16 * 1024 * 1024 /* 16MB */)
-#endif
-#ifndef GC_MALLOC_LIMIT_MAX
-#define GC_MALLOC_LIMIT_MAX (32 * 1024 * 1024 /* 32MB */)
-#endif
-#ifndef GC_MALLOC_LIMIT_GROWTH_FACTOR
-#define GC_MALLOC_LIMIT_GROWTH_FACTOR 1.4
-#endif
+        gc_functions.modular_gc_loaded_p = true;
+    }
 
-#ifndef GC_OLDMALLOC_LIMIT_MIN
-#define GC_OLDMALLOC_LIMIT_MIN (16 * 1024 * 1024 /* 16MB */)
-#endif
-#ifndef GC_OLDMALLOC_LIMIT_GROWTH_FACTOR
-#define GC_OLDMALLOC_LIMIT_GROWTH_FACTOR 1.2
-#endif
-#ifndef GC_OLDMALLOC_LIMIT_MAX
-#define GC_OLDMALLOC_LIMIT_MAX (128 * 1024 * 1024 /* 128MB */)
-#endif
+# define load_modular_gc_func(name) do { \
+    if (handle) { \
+        const char *func_name = "rb_gc_impl_" #name; \
+        gc_functions.name = dlsym(handle, func_name); \
+        if (!gc_functions.name) { \
+            fprintf(stderr, "ruby_modular_gc_init: %s function not exported by library %s\n", func_name, gc_so_path); \
+            exit(1); \
+        } \
+    } \
+    else { \
+        gc_functions.name = rb_gc_impl_##name; \
+    } \
+} while (0)
 
-#ifndef GC_CAN_COMPILE_COMPACTION
-#if defined(__wasi__) /* WebAssembly doesn't support signals */
-# define GC_CAN_COMPILE_COMPACTION 0
-#else
-# define GC_CAN_COMPILE_COMPACTION 1
-#endif
-#endif
+    // Bootup
+    load_modular_gc_func(objspace_alloc);
+    load_modular_gc_func(objspace_init);
+    load_modular_gc_func(ractor_cache_alloc);
+    load_modular_gc_func(set_params);
+    load_modular_gc_func(init);
+    load_modular_gc_func(heap_sizes);
+    // Shutdown
+    load_modular_gc_func(shutdown_free_objects);
+    load_modular_gc_func(objspace_free);
+    load_modular_gc_func(ractor_cache_free);
+    // GC
+    load_modular_gc_func(start);
+    load_modular_gc_func(during_gc_p);
+    load_modular_gc_func(prepare_heap);
+    load_modular_gc_func(gc_enable);
+    load_modular_gc_func(gc_disable);
+    load_modular_gc_func(gc_enabled_p);
+    load_modular_gc_func(config_set);
+    load_modular_gc_func(config_get);
+    load_modular_gc_func(stress_set);
+    load_modular_gc_func(stress_get);
+    // Object allocation
+    load_modular_gc_func(new_obj);
+    load_modular_gc_func(obj_slot_size);
+    load_modular_gc_func(heap_id_for_size);
+    load_modular_gc_func(size_allocatable_p);
+    // Malloc
+    load_modular_gc_func(malloc);
+    load_modular_gc_func(calloc);
+    load_modular_gc_func(realloc);
+    load_modular_gc_func(free);
+    load_modular_gc_func(adjust_memory_usage);
+    // Marking
+    load_modular_gc_func(mark);
+    load_modular_gc_func(mark_and_move);
+    load_modular_gc_func(mark_and_pin);
+    load_modular_gc_func(mark_maybe);
+    load_modular_gc_func(mark_weak);
+    load_modular_gc_func(remove_weak);
+    // Compaction
+    load_modular_gc_func(object_moved_p);
+    load_modular_gc_func(location);
+    // Write barriers
+    load_modular_gc_func(writebarrier);
+    load_modular_gc_func(writebarrier_unprotect);
+    load_modular_gc_func(writebarrier_remember);
+    // Heap walking
+    load_modular_gc_func(each_objects);
+    load_modular_gc_func(each_object);
+    // Finalizers
+    load_modular_gc_func(make_zombie);
+    load_modular_gc_func(define_finalizer);
+    load_modular_gc_func(undefine_finalizer);
+    load_modular_gc_func(copy_finalizer);
+    load_modular_gc_func(shutdown_call_finalizer);
+    // Forking
+    load_modular_gc_func(before_fork);
+    load_modular_gc_func(after_fork);
+    // Statistics
+    load_modular_gc_func(set_measure_total_time);
+    load_modular_gc_func(get_measure_total_time);
+    load_modular_gc_func(get_total_time);
+    load_modular_gc_func(gc_count);
+    load_modular_gc_func(latest_gc_info);
+    load_modular_gc_func(stat);
+    load_modular_gc_func(stat_heap);
+    load_modular_gc_func(active_gc_name);
+    // Miscellaneous
+    load_modular_gc_func(object_metadata);
+    load_modular_gc_func(pointer_to_heap_p);
+    load_modular_gc_func(garbage_object_p);
+    load_modular_gc_func(set_event_hook);
+    load_modular_gc_func(copy_attributes);
+
+# undef load_modular_gc_func
+
+    rb_gc_functions = gc_functions;
+}
+
+// Bootup
+# define rb_gc_impl_objspace_alloc rb_gc_functions.objspace_alloc
+# define rb_gc_impl_objspace_init rb_gc_functions.objspace_init
+# define rb_gc_impl_ractor_cache_alloc rb_gc_functions.ractor_cache_alloc
+# define rb_gc_impl_set_params rb_gc_functions.set_params
+# define rb_gc_impl_init rb_gc_functions.init
+# define rb_gc_impl_heap_sizes rb_gc_functions.heap_sizes
+// Shutdown
+# define rb_gc_impl_shutdown_free_objects rb_gc_functions.shutdown_free_objects
+# define rb_gc_impl_objspace_free rb_gc_functions.objspace_free
+# define rb_gc_impl_ractor_cache_free rb_gc_functions.ractor_cache_free
+// GC
+# define rb_gc_impl_start rb_gc_functions.start
+# define rb_gc_impl_during_gc_p rb_gc_functions.during_gc_p
+# define rb_gc_impl_prepare_heap rb_gc_functions.prepare_heap
+# define rb_gc_impl_gc_enable rb_gc_functions.gc_enable
+# define rb_gc_impl_gc_disable rb_gc_functions.gc_disable
+# define rb_gc_impl_gc_enabled_p rb_gc_functions.gc_enabled_p
+# define rb_gc_impl_config_get rb_gc_functions.config_get
+# define rb_gc_impl_config_set rb_gc_functions.config_set
+# define rb_gc_impl_stress_set rb_gc_functions.stress_set
+# define rb_gc_impl_stress_get rb_gc_functions.stress_get
+// Object allocation
+# define rb_gc_impl_new_obj rb_gc_functions.new_obj
+# define rb_gc_impl_obj_slot_size rb_gc_functions.obj_slot_size
+# define rb_gc_impl_heap_id_for_size rb_gc_functions.heap_id_for_size
+# define rb_gc_impl_size_allocatable_p rb_gc_functions.size_allocatable_p
+// Malloc
+# define rb_gc_impl_malloc rb_gc_functions.malloc
+# define rb_gc_impl_calloc rb_gc_functions.calloc
+# define rb_gc_impl_realloc rb_gc_functions.realloc
+# define rb_gc_impl_free rb_gc_functions.free
+# define rb_gc_impl_adjust_memory_usage rb_gc_functions.adjust_memory_usage
+// Marking
+# define rb_gc_impl_mark rb_gc_functions.mark
+# define rb_gc_impl_mark_and_move rb_gc_functions.mark_and_move
+# define rb_gc_impl_mark_and_pin rb_gc_functions.mark_and_pin
+# define rb_gc_impl_mark_maybe rb_gc_functions.mark_maybe
+# define rb_gc_impl_mark_weak rb_gc_functions.mark_weak
+# define rb_gc_impl_remove_weak rb_gc_functions.remove_weak
+// Compaction
+# define rb_gc_impl_object_moved_p rb_gc_functions.object_moved_p
+# define rb_gc_impl_location rb_gc_functions.location
+// Write barriers
+# define rb_gc_impl_writebarrier rb_gc_functions.writebarrier
+# define rb_gc_impl_writebarrier_unprotect rb_gc_functions.writebarrier_unprotect
+# define rb_gc_impl_writebarrier_remember rb_gc_functions.writebarrier_remember
+// Heap walking
+# define rb_gc_impl_each_objects rb_gc_functions.each_objects
+# define rb_gc_impl_each_object rb_gc_functions.each_object
+// Finalizers
+# define rb_gc_impl_make_zombie rb_gc_functions.make_zombie
+# define rb_gc_impl_define_finalizer rb_gc_functions.define_finalizer
+# define rb_gc_impl_undefine_finalizer rb_gc_functions.undefine_finalizer
+# define rb_gc_impl_copy_finalizer rb_gc_functions.copy_finalizer
+# define rb_gc_impl_shutdown_call_finalizer rb_gc_functions.shutdown_call_finalizer
+// Forking
+# define rb_gc_impl_before_fork rb_gc_functions.before_fork
+# define rb_gc_impl_after_fork rb_gc_functions.after_fork
+// Statistics
+# define rb_gc_impl_set_measure_total_time rb_gc_functions.set_measure_total_time
+# define rb_gc_impl_get_measure_total_time rb_gc_functions.get_measure_total_time
+# define rb_gc_impl_get_total_time rb_gc_functions.get_total_time
+# define rb_gc_impl_gc_count rb_gc_functions.gc_count
+# define rb_gc_impl_latest_gc_info rb_gc_functions.latest_gc_info
+# define rb_gc_impl_stat rb_gc_functions.stat
+# define rb_gc_impl_stat_heap rb_gc_functions.stat_heap
+# define rb_gc_impl_active_gc_name rb_gc_functions.active_gc_name
+// Miscellaneous
+# define rb_gc_impl_object_metadata rb_gc_functions.object_metadata
+# define rb_gc_impl_pointer_to_heap_p rb_gc_functions.pointer_to_heap_p
+# define rb_gc_impl_garbage_object_p rb_gc_functions.garbage_object_p
+# define rb_gc_impl_set_event_hook rb_gc_functions.set_event_hook
+# define rb_gc_impl_copy_attributes rb_gc_functions.copy_attributes
+#endif
+
+#ifdef RUBY_ASAN_ENABLED
+static void
+asan_death_callback(void)
+{
+    if (GET_VM()) {
+        rb_bug_without_die("ASAN error");
+    }
+}
+#endif
+
+static VALUE initial_stress = Qfalse;
 
-#ifndef PRINT_MEASURE_LINE
-#define PRINT_MEASURE_LINE 0
-#endif
-#ifndef PRINT_ENTER_EXIT_TICK
-#define PRINT_ENTER_EXIT_TICK 0
-#endif
-#ifndef PRINT_ROOT_TICKS
-#define PRINT_ROOT_TICKS 0
+void *
+rb_objspace_alloc(void)
+{
+#if USE_MODULAR_GC
+    ruby_modular_gc_init();
 #endif
 
-#define USE_TICK_T                 (PRINT_ENTER_EXIT_TICK || PRINT_MEASURE_LINE || PRINT_ROOT_TICKS)
-#define TICK_TYPE 1
-
-typedef struct {
-    size_t size_pool_init_slots[SIZE_POOL_COUNT];
-    size_t heap_free_slots;
-    double growth_factor;
-    size_t growth_max_slots;
-
-    double heap_free_slots_min_ratio;
-    double heap_free_slots_goal_ratio;
-    double heap_free_slots_max_ratio;
-    double uncollectible_wb_unprotected_objects_limit_ratio;
-    double oldobject_limit_factor;
-
-    size_t malloc_limit_min;
-    size_t malloc_limit_max;
-    double malloc_limit_growth_factor;
-
-    size_t oldmalloc_limit_min;
-    size_t oldmalloc_limit_max;
-    double oldmalloc_limit_growth_factor;
-
-    VALUE gc_stress;
-} ruby_gc_params_t;
-
-static ruby_gc_params_t gc_params = {
-    { 0 },
-    GC_HEAP_FREE_SLOTS,
-    GC_HEAP_GROWTH_FACTOR,
-    GC_HEAP_GROWTH_MAX_SLOTS,
-
-    GC_HEAP_FREE_SLOTS_MIN_RATIO,
-    GC_HEAP_FREE_SLOTS_GOAL_RATIO,
-    GC_HEAP_FREE_SLOTS_MAX_RATIO,
-    GC_HEAP_REMEMBERED_WB_UNPROTECTED_OBJECTS_LIMIT_RATIO,
-    GC_HEAP_OLDOBJECT_LIMIT_FACTOR,
-
-    GC_MALLOC_LIMIT_MIN,
-    GC_MALLOC_LIMIT_MAX,
-    GC_MALLOC_LIMIT_GROWTH_FACTOR,
-
-    GC_OLDMALLOC_LIMIT_MIN,
-    GC_OLDMALLOC_LIMIT_MAX,
-    GC_OLDMALLOC_LIMIT_GROWTH_FACTOR,
-
-    FALSE,
-};
-
-/* GC_DEBUG:
- *  enable to embed GC debugging information.
- */
-#ifndef GC_DEBUG
-#define GC_DEBUG 0
-#endif
+    void *objspace = rb_gc_impl_objspace_alloc();
+    ruby_current_vm_ptr->gc.objspace = objspace;
+    rb_gc_impl_objspace_init(objspace);
+    rb_gc_impl_stress_set(objspace, initial_stress);
 
-/* RGENGC_DEBUG:
- * 1: basic information
- * 2: remember set operation
- * 3: mark
- * 4:
- * 5: sweep
- */
-#ifndef RGENGC_DEBUG
-#ifdef RUBY_DEVEL
-#define RGENGC_DEBUG       -1
-#else
-#define RGENGC_DEBUG       0
-#endif
-#endif
-#if RGENGC_DEBUG < 0 && !defined(_MSC_VER)
-# define RGENGC_DEBUG_ENABLED(level) (-(RGENGC_DEBUG) >= (level) && ruby_rgengc_debug >= (level))
-#elif defined(HAVE_VA_ARGS_MACRO)
-# define RGENGC_DEBUG_ENABLED(level) ((RGENGC_DEBUG) >= (level))
-#else
-# define RGENGC_DEBUG_ENABLED(level) 0
-#endif
-int ruby_rgengc_debug;
-
-/* RGENGC_CHECK_MODE
- * 0: disable all assertions
- * 1: enable assertions (to debug RGenGC)
- * 2: enable internal consistency check at each GC (for debugging)
- * 3: enable internal consistency check at each GC steps (for debugging)
- * 4: enable liveness check
- * 5: show all references
- */
-#ifndef RGENGC_CHECK_MODE
-#define RGENGC_CHECK_MODE  0
+#ifdef RUBY_ASAN_ENABLED
+    __sanitizer_set_death_callback(asan_death_callback);
 #endif
 
-// Note: using RUBY_ASSERT_WHEN() extend a macro in expr (info by nobu).
-#define GC_ASSERT(expr) RUBY_ASSERT_MESG_WHEN(RGENGC_CHECK_MODE > 0, expr, #expr)
+    return objspace;
+}
 
-/* RGENGC_PROFILE
- * 0: disable RGenGC profiling
- * 1: enable profiling for basic information
- * 2: enable profiling for each types
- */
-#ifndef RGENGC_PROFILE
-#define RGENGC_PROFILE     0
-#endif
-
-/* RGENGC_ESTIMATE_OLDMALLOC
- * Enable/disable to estimate increase size of malloc'ed size by old objects.
- * If estimation exceeds threshold, then will invoke full GC.
- * 0: disable estimation.
- * 1: enable estimation.
- */
-#ifndef RGENGC_ESTIMATE_OLDMALLOC
-#define RGENGC_ESTIMATE_OLDMALLOC 1
-#endif
-
-/* RGENGC_FORCE_MAJOR_GC
- * Force major/full GC if this macro is not 0.
- */
-#ifndef RGENGC_FORCE_MAJOR_GC
-#define RGENGC_FORCE_MAJOR_GC 0
-#endif
-
-#ifndef GC_PROFILE_MORE_DETAIL
-#define GC_PROFILE_MORE_DETAIL 0
-#endif
-#ifndef GC_PROFILE_DETAIL_MEMORY
-#define GC_PROFILE_DETAIL_MEMORY 0
-#endif
-#ifndef GC_ENABLE_LAZY_SWEEP
-#define GC_ENABLE_LAZY_SWEEP   1
-#endif
-#ifndef CALC_EXACT_MALLOC_SIZE
-#define CALC_EXACT_MALLOC_SIZE USE_GC_MALLOC_OBJ_INFO_DETAILS
-#endif
-#if defined(HAVE_MALLOC_USABLE_SIZE) || CALC_EXACT_MALLOC_SIZE > 0
-#ifndef MALLOC_ALLOCATED_SIZE
-#define MALLOC_ALLOCATED_SIZE 0
-#endif
-#else
-#define MALLOC_ALLOCATED_SIZE 0
-#endif
-#ifndef MALLOC_ALLOCATED_SIZE_CHECK
-#define MALLOC_ALLOCATED_SIZE_CHECK 0
-#endif
-
-#ifndef GC_DEBUG_STRESS_TO_CLASS
-#define GC_DEBUG_STRESS_TO_CLASS RUBY_DEBUG
-#endif
-
-#ifndef RGENGC_OBJ_INFO
-#define RGENGC_OBJ_INFO (RGENGC_DEBUG | RGENGC_CHECK_MODE)
-#endif
-
-typedef enum {
-    GPR_FLAG_NONE               = 0x000,
-    /* major reason */
-    GPR_FLAG_MAJOR_BY_NOFREE    = 0x001,
-    GPR_FLAG_MAJOR_BY_OLDGEN    = 0x002,
-    GPR_FLAG_MAJOR_BY_SHADY     = 0x004,
-    GPR_FLAG_MAJOR_BY_FORCE     = 0x008,
-#if RGENGC_ESTIMATE_OLDMALLOC
-    GPR_FLAG_MAJOR_BY_OLDMALLOC = 0x020,
-#endif
-    GPR_FLAG_MAJOR_MASK         = 0x0ff,
-
-    /* gc reason */
-    GPR_FLAG_NEWOBJ             = 0x100,
-    GPR_FLAG_MALLOC             = 0x200,
-    GPR_FLAG_METHOD             = 0x400,
-    GPR_FLAG_CAPI               = 0x800,
-    GPR_FLAG_STRESS            = 0x1000,
-
-    /* others */
-    GPR_FLAG_IMMEDIATE_SWEEP   = 0x2000,
-    GPR_FLAG_HAVE_FINALIZE     = 0x4000,
-    GPR_FLAG_IMMEDIATE_MARK    = 0x8000,
-    GPR_FLAG_FULL_MARK        = 0x10000,
-    GPR_FLAG_COMPACT          = 0x20000,
-
-    GPR_DEFAULT_REASON =
-        (GPR_FLAG_FULL_MARK | GPR_FLAG_IMMEDIATE_MARK |
-         GPR_FLAG_IMMEDIATE_SWEEP | GPR_FLAG_CAPI),
-} gc_profile_record_flag;
-
-typedef struct gc_profile_record {
-    unsigned int flags;
-
-    double gc_time;
-    double gc_invoke_time;
-
-    size_t heap_total_objects;
-    size_t heap_use_size;
-    size_t heap_total_size;
-    size_t moved_objects;
-
-#if GC_PROFILE_MORE_DETAIL
-    double gc_mark_time;
-    double gc_sweep_time;
-
-    size_t heap_use_pages;
-    size_t heap_live_objects;
-    size_t heap_free_objects;
-
-    size_t allocate_increase;
-    size_t allocate_limit;
-
-    double prepare_time;
-    size_t removing_objects;
-    size_t empty_objects;
-#if GC_PROFILE_DETAIL_MEMORY
-    long maxrss;
-    long minflt;
-    long majflt;
-#endif
-#endif
-#if MALLOC_ALLOCATED_SIZE
-    size_t allocated_size;
-#endif
-
-#if RGENGC_PROFILE > 0
-    size_t old_objects;
-    size_t remembered_normal_objects;
-    size_t remembered_shady_objects;
-#endif
-} gc_profile_record;
-
-struct RMoved {
-    VALUE flags;
-    VALUE dummy;
-    VALUE destination;
-    shape_id_t original_shape_id;
-};
-
-#define RMOVED(obj) ((struct RMoved *)(obj))
-
-typedef struct RVALUE {
-    union {
-        struct {
-            VALUE flags;		/* always 0 for freed obj */
-            struct RVALUE *next;
-        } free;
-        struct RMoved  moved;
-        struct RBasic  basic;
-        struct RObject object;
-        struct RClass  klass;
-        struct RFloat  flonum;
-        struct RString string;
-        struct RArray  array;
-        struct RRegexp regexp;
-        struct RHash   hash;
-        struct RData   data;
-        struct RTypedData   typeddata;
-        struct RStruct rstruct;
-        struct RBignum bignum;
-        struct RFile   file;
-        struct RMatch  match;
-        struct RRational rational;
-        struct RComplex complex;
-        struct RSymbol symbol;
-        union {
-            rb_cref_t cref;
-            struct vm_svar svar;
-            struct vm_throw_data throw_data;
-            struct vm_ifunc ifunc;
-            struct MEMO memo;
-            struct rb_method_entry_struct ment;
-            const rb_iseq_t iseq;
-            rb_env_t env;
-            struct rb_imemo_tmpbuf_struct alloc;
-            rb_ast_t ast;
-        } imemo;
-        struct {
-            struct RBasic basic;
-            VALUE v1;
-            VALUE v2;
-            VALUE v3;
-        } values;
-    } as;
-
-    /* Start of RVALUE_OVERHEAD.
-     * Do not directly read these members from the RVALUE as they're located
-     * at the end of the slot (which may differ in size depending on the size
-     * pool). */
-#if RACTOR_CHECK_MODE
-    uint32_t _ractor_belonging_id;
-#endif
-#if GC_DEBUG
-    const char *file;
-    int line;
-#endif
-} RVALUE;
-
-#if RACTOR_CHECK_MODE
-# define RVALUE_OVERHEAD (sizeof(RVALUE) - offsetof(RVALUE, _ractor_belonging_id))
-#elif GC_DEBUG
-# define RVALUE_OVERHEAD (sizeof(RVALUE) - offsetof(RVALUE, file))
-#else
-# define RVALUE_OVERHEAD 0
-#endif
-
-STATIC_ASSERT(sizeof_rvalue, sizeof(RVALUE) == (SIZEOF_VALUE * 5) + RVALUE_OVERHEAD);
-STATIC_ASSERT(alignof_rvalue, RUBY_ALIGNOF(RVALUE) == SIZEOF_VALUE);
-
-typedef uintptr_t bits_t;
-enum {
-    BITS_SIZE = sizeof(bits_t),
-    BITS_BITLENGTH = ( BITS_SIZE * CHAR_BIT )
-};
-#define popcount_bits rb_popcount_intptr
-
-struct heap_page_header {
-    struct heap_page *page;
-};
-
-struct heap_page_body {
-    struct heap_page_header header;
-    /* char gap[];      */
-    /* RVALUE values[]; */
-};
-
-struct gc_list {
-    VALUE *varptr;
-    struct gc_list *next;
-};
-
-#define STACK_CHUNK_SIZE 500
-
-typedef struct stack_chunk {
-    VALUE data[STACK_CHUNK_SIZE];
-    struct stack_chunk *next;
-} stack_chunk_t;
-
-typedef struct mark_stack {
-    stack_chunk_t *chunk;
-    stack_chunk_t *cache;
-    int index;
-    int limit;
-    size_t cache_size;
-    size_t unused_cache_size;
-} mark_stack_t;
-
-#define SIZE_POOL_EDEN_HEAP(size_pool) (&(size_pool)->eden_heap)
-#define SIZE_POOL_TOMB_HEAP(size_pool) (&(size_pool)->tomb_heap)
-
-typedef struct rb_heap_struct {
-    struct heap_page *free_pages;
-    struct ccan_list_head pages;
-    struct heap_page *sweeping_page; /* iterator for .pages */
-    struct heap_page *compact_cursor;
-    uintptr_t compact_cursor_index;
-    struct heap_page *pooled_pages;
-    size_t total_pages;      /* total page count in a heap */
-    size_t total_slots;      /* total slot count (about total_pages * HEAP_PAGE_OBJ_LIMIT) */
-} rb_heap_t;
-
-typedef struct rb_size_pool_struct {
-    short slot_size;
-
-    size_t allocatable_pages;
-
-    /* Basic statistics */
-    size_t total_allocated_pages;
-    size_t total_freed_pages;
-    size_t force_major_gc_count;
-    size_t force_incremental_marking_finish_count;
-    size_t total_allocated_objects;
-    size_t total_freed_objects;
-
-    /* Sweeping statistics */
-    size_t freed_slots;
-    size_t empty_slots;
-
-    rb_heap_t eden_heap;
-    rb_heap_t tomb_heap;
-} rb_size_pool_t;
-
-enum gc_mode {
-    gc_mode_none,
-    gc_mode_marking,
-    gc_mode_sweeping,
-    gc_mode_compacting,
-};
-
-typedef struct rb_objspace {
-    struct {
-        size_t limit;
-        size_t increase;
-#if MALLOC_ALLOCATED_SIZE
-        size_t allocated_size;
-        size_t allocations;
-#endif
-
-    } malloc_params;
-
-    struct {
-        unsigned int mode : 2;
-        unsigned int immediate_sweep : 1;
-        unsigned int dont_gc : 1;
-        unsigned int dont_incremental : 1;
-        unsigned int during_gc : 1;
-        unsigned int during_compacting : 1;
-        unsigned int during_reference_updating : 1;
-        unsigned int gc_stressful: 1;
-        unsigned int has_hook: 1;
-        unsigned int during_minor_gc : 1;
-        unsigned int during_incremental_marking : 1;
-        unsigned int measure_gc : 1;
-    } flags;
-
-    rb_event_flag_t hook_events;
-    VALUE next_object_id;
-
-    rb_size_pool_t size_pools[SIZE_POOL_COUNT];
-
-    struct {
-        rb_atomic_t finalizing;
-    } atomic_flags;
-
-    mark_stack_t mark_stack;
-    size_t marked_slots;
-
-    struct {
-        struct heap_page **sorted;
-        size_t allocated_pages;
-        size_t allocatable_pages;
-        size_t sorted_length;
-        uintptr_t range[2];
-        size_t freeable_pages;
-
-        /* final */
-        size_t final_slots;
-        VALUE deferred_final;
-    } heap_pages;
-
-    st_table *finalizer_table;
-
-    struct {
-        int run;
-        unsigned int latest_gc_info;
-        gc_profile_record *records;
-        gc_profile_record *current_record;
-        size_t next_index;
-        size_t size;
-
-#if GC_PROFILE_MORE_DETAIL
-        double prepare_time;
-#endif
-        double invoke_time;
-
-        size_t minor_gc_count;
-        size_t major_gc_count;
-        size_t compact_count;
-        size_t read_barrier_faults;
-#if RGENGC_PROFILE > 0
-        size_t total_generated_normal_object_count;
-        size_t total_generated_shady_object_count;
-        size_t total_shade_operation_count;
-        size_t total_promoted_count;
-        size_t total_remembered_normal_object_count;
-        size_t total_remembered_shady_object_count;
-
-#if RGENGC_PROFILE >= 2
-        size_t generated_normal_object_count_types[RUBY_T_MASK];
-        size_t generated_shady_object_count_types[RUBY_T_MASK];
-        size_t shade_operation_count_types[RUBY_T_MASK];
-        size_t promoted_types[RUBY_T_MASK];
-        size_t remembered_normal_object_count_types[RUBY_T_MASK];
-        size_t remembered_shady_object_count_types[RUBY_T_MASK];
-#endif
-#endif /* RGENGC_PROFILE */
-
-        /* temporary profiling space */
-        double gc_sweep_start_time;
-        size_t total_allocated_objects_at_gc_start;
-        size_t heap_used_at_gc_start;
-
-        /* basic statistics */
-        size_t count;
-        uint64_t marking_time_ns;
-        struct timespec marking_start_time;
-        uint64_t sweeping_time_ns;
-        struct timespec sweeping_start_time;
-
-        /* Weak references */
-        size_t weak_references_count;
-        size_t retained_weak_references_count;
-    } profile;
-    struct gc_list *global_list;
-
-    VALUE gc_stress_mode;
-
-    struct {
-        VALUE parent_object;
-        int need_major_gc;
-        size_t last_major_gc;
-        size_t uncollectible_wb_unprotected_objects;
-        size_t uncollectible_wb_unprotected_objects_limit;
-        size_t old_objects;
-        size_t old_objects_limit;
-
-#if RGENGC_ESTIMATE_OLDMALLOC
-        size_t oldmalloc_increase;
-        size_t oldmalloc_increase_limit;
-#endif
-
-#if RGENGC_CHECK_MODE >= 2
-        struct st_table *allrefs_table;
-        size_t error_count;
-#endif
-    } rgengc;
-
-    struct {
-        size_t considered_count_table[T_MASK];
-        size_t moved_count_table[T_MASK];
-        size_t moved_up_count_table[T_MASK];
-        size_t moved_down_count_table[T_MASK];
-        size_t total_moved;
-    } rcompactor;
-
-    struct {
-        size_t pooled_slots;
-        size_t step_slots;
-    } rincgc;
-
-    st_table *id_to_obj_tbl;
-    st_table *obj_to_id_tbl;
-
-#if GC_DEBUG_STRESS_TO_CLASS
-    VALUE stress_to_class;
-#endif
-
-    rb_darray(VALUE *) weak_references;
-} rb_objspace_t;
-
-
-#ifndef HEAP_PAGE_ALIGN_LOG
-/* default tiny heap size: 64KiB */
-#define HEAP_PAGE_ALIGN_LOG 16
-#endif
-
-#define BASE_SLOT_SIZE sizeof(RVALUE)
+void
+rb_objspace_free(void *objspace)
+{
+    rb_gc_impl_objspace_free(objspace);
+}
 
-#define CEILDIV(i, mod) roomof(i, mod)
-enum {
-    HEAP_PAGE_ALIGN = (1UL << HEAP_PAGE_ALIGN_LOG),
-    HEAP_PAGE_ALIGN_MASK = (~(~0UL << HEAP_PAGE_ALIGN_LOG)),
-    HEAP_PAGE_SIZE = HEAP_PAGE_ALIGN,
-    HEAP_PAGE_OBJ_LIMIT = (unsigned int)((HEAP_PAGE_SIZE - sizeof(struct heap_page_header)) / BASE_SLOT_SIZE),
-    HEAP_PAGE_BITMAP_LIMIT = CEILDIV(CEILDIV(HEAP_PAGE_SIZE, BASE_SLOT_SIZE), BITS_BITLENGTH),
-    HEAP_PAGE_BITMAP_SIZE = (BITS_SIZE * HEAP_PAGE_BITMAP_LIMIT),
-};
-#define HEAP_PAGE_ALIGN (1 << HEAP_PAGE_ALIGN_LOG)
-#define HEAP_PAGE_SIZE HEAP_PAGE_ALIGN
+size_t
+rb_gc_obj_slot_size(VALUE obj)
+{
+    return rb_gc_impl_obj_slot_size(obj);
+}
 
-#if !defined(INCREMENTAL_MARK_STEP_ALLOCATIONS)
-# define INCREMENTAL_MARK_STEP_ALLOCATIONS 500
+static inline void
+gc_validate_pc(void)
+{
+#if RUBY_DEBUG
+    rb_execution_context_t *ec = GET_EC();
+    const rb_control_frame_t *cfp = ec->cfp;
+    if (cfp && VM_FRAME_RUBYFRAME_P(cfp) && cfp->pc) {
+        RUBY_ASSERT(cfp->pc >= ISEQ_BODY(cfp->iseq)->iseq_encoded);
+        RUBY_ASSERT(cfp->pc <= ISEQ_BODY(cfp->iseq)->iseq_encoded + ISEQ_BODY(cfp->iseq)->iseq_size);
+    }
 #endif
+}
 
-#undef INIT_HEAP_PAGE_ALLOC_USE_MMAP
-/* Must define either HEAP_PAGE_ALLOC_USE_MMAP or
- * INIT_HEAP_PAGE_ALLOC_USE_MMAP. */
-
-#ifndef HAVE_MMAP
-/* We can't use mmap of course, if it is not available. */
-static const bool HEAP_PAGE_ALLOC_USE_MMAP = false;
-
-#elif defined(__wasm__)
-/* wasmtime does not have proper support for mmap.
- * See https://github.com/bytecodealliance/wasmtime/blob/main/docs/WASI-rationale.md#why-no-mmap-and-friends
- */
-static const bool HEAP_PAGE_ALLOC_USE_MMAP = false;
-
-#elif HAVE_CONST_PAGE_SIZE
-/* If we have the PAGE_SIZE and it is a constant, then we can directly use it. */
-static const bool HEAP_PAGE_ALLOC_USE_MMAP = (PAGE_SIZE <= HEAP_PAGE_SIZE);
-
-#elif defined(PAGE_MAX_SIZE) && (PAGE_MAX_SIZE <= HEAP_PAGE_SIZE)
-/* If we can use the maximum page size. */
-static const bool HEAP_PAGE_ALLOC_USE_MMAP = true;
-
-#elif defined(PAGE_SIZE)
-/* If the PAGE_SIZE macro can be used dynamically. */
-# define INIT_HEAP_PAGE_ALLOC_USE_MMAP (PAGE_SIZE <= HEAP_PAGE_SIZE)
-
-#elif defined(HAVE_SYSCONF) && defined(_SC_PAGE_SIZE)
-/* If we can use sysconf to determine the page size. */
-# define INIT_HEAP_PAGE_ALLOC_USE_MMAP (sysconf(_SC_PAGE_SIZE) <= HEAP_PAGE_SIZE)
-
-#else
-/* Otherwise we can't determine the system page size, so don't use mmap. */
-static const bool HEAP_PAGE_ALLOC_USE_MMAP = false;
-#endif
+static inline VALUE
+newobj_of(rb_ractor_t *cr, VALUE klass, VALUE flags, VALUE v1, VALUE v2, VALUE v3, bool wb_protected, size_t size)
+{
+    VALUE obj = rb_gc_impl_new_obj(rb_gc_get_objspace(), cr->newobj_cache, klass, flags, v1, v2, v3, wb_protected, size);
 
-#ifdef INIT_HEAP_PAGE_ALLOC_USE_MMAP
-/* We can determine the system page size at runtime. */
-# define HEAP_PAGE_ALLOC_USE_MMAP (heap_page_alloc_use_mmap != false)
+    gc_validate_pc();
 
-static bool heap_page_alloc_use_mmap;
-#endif
+    if (UNLIKELY(rb_gc_event_hook_required_p(RUBY_INTERNAL_EVENT_NEWOBJ))) {
+        unsigned int lev;
+        RB_VM_LOCK_ENTER_CR_LEV(cr, &lev);
+        {
+            memset((char *)obj + RVALUE_SIZE, 0, rb_gc_obj_slot_size(obj) - RVALUE_SIZE);
+
+            /* We must disable GC here because the callback could call xmalloc
+             * which could potentially trigger a GC, and a lot of code is unsafe
+             * to trigger a GC right after an object has been allocated because
+             * they perform initialization for the object and assume that the
+             * GC does not trigger before then. */
+            bool gc_disabled = RTEST(rb_gc_disable_no_rest());
+            {
+                rb_gc_event_hook(obj, RUBY_INTERNAL_EVENT_NEWOBJ);
+            }
+            if (!gc_disabled) rb_gc_enable();
+        }
+        RB_VM_LOCK_LEAVE_CR_LEV(cr, &lev);
+    }
 
-#define RVALUE_AGE_BIT_COUNT 2
-#define RVALUE_AGE_BIT_MASK (((bits_t)1 << RVALUE_AGE_BIT_COUNT) - 1)
-
-struct heap_page {
-    short slot_size;
-    short total_slots;
-    short free_slots;
-    short final_slots;
-    struct {
-        unsigned int before_sweep : 1;
-        unsigned int has_remembered_objects : 1;
-        unsigned int has_uncollectible_wb_unprotected_objects : 1;
-        unsigned int in_tomb : 1;
-    } flags;
-
-    rb_size_pool_t *size_pool;
-
-    struct heap_page *free_next;
-    uintptr_t start;
-    RVALUE *freelist;
-    struct ccan_list_node page_node;
-
-    bits_t wb_unprotected_bits[HEAP_PAGE_BITMAP_LIMIT];
-    /* the following three bitmaps are cleared at the beginning of full GC */
-    bits_t mark_bits[HEAP_PAGE_BITMAP_LIMIT];
-    bits_t uncollectible_bits[HEAP_PAGE_BITMAP_LIMIT];
-    bits_t marking_bits[HEAP_PAGE_BITMAP_LIMIT];
-
-    bits_t remembered_bits[HEAP_PAGE_BITMAP_LIMIT];
-
-    /* If set, the object is not movable */
-    bits_t pinned_bits[HEAP_PAGE_BITMAP_LIMIT];
-    bits_t age_bits[HEAP_PAGE_BITMAP_LIMIT * RVALUE_AGE_BIT_COUNT];
-};
+    return obj;
+}
 
-/*
- * When asan is enabled, this will prohibit writing to the freelist until it is unlocked
- */
-static void
-asan_lock_freelist(struct heap_page *page)
+VALUE
+rb_wb_unprotected_newobj_of(VALUE klass, VALUE flags, size_t size)
 {
-    asan_poison_memory_region(&page->freelist, sizeof(RVALUE*));
+    GC_ASSERT((flags & FL_WB_PROTECTED) == 0);
+    return newobj_of(GET_RACTOR(), klass, flags, 0, 0, 0, FALSE, size);
 }
 
-/*
- * When asan is enabled, this will enable the ability to write to the freelist
- */
-static void
-asan_unlock_freelist(struct heap_page *page)
+VALUE
+rb_wb_protected_newobj_of(rb_execution_context_t *ec, VALUE klass, VALUE flags, size_t size)
 {
-    asan_unpoison_memory_region(&page->freelist, sizeof(RVALUE*), false);
+    GC_ASSERT((flags & FL_WB_PROTECTED) == 0);
+    return newobj_of(rb_ec_ractor_ptr(ec), klass, flags, 0, 0, 0, TRUE, size);
 }
 
-#define GET_PAGE_BODY(x)   ((struct heap_page_body *)((bits_t)(x) & ~(HEAP_PAGE_ALIGN_MASK)))
-#define GET_PAGE_HEADER(x) (&GET_PAGE_BODY(x)->header)
-#define GET_HEAP_PAGE(x)   (GET_PAGE_HEADER(x)->page)
-
-#define NUM_IN_PAGE(p)   (((bits_t)(p) & HEAP_PAGE_ALIGN_MASK) / BASE_SLOT_SIZE)
-#define BITMAP_INDEX(p)  (NUM_IN_PAGE(p) / BITS_BITLENGTH )
-#define BITMAP_OFFSET(p) (NUM_IN_PAGE(p) & (BITS_BITLENGTH-1))
-#define BITMAP_BIT(p)    ((bits_t)1 << BITMAP_OFFSET(p))
-
-/* Bitmap Operations */
-#define MARKED_IN_BITMAP(bits, p)    ((bits)[BITMAP_INDEX(p)] & BITMAP_BIT(p))
-#define MARK_IN_BITMAP(bits, p)      ((bits)[BITMAP_INDEX(p)] = (bits)[BITMAP_INDEX(p)] | BITMAP_BIT(p))
-#define CLEAR_IN_BITMAP(bits, p)     ((bits)[BITMAP_INDEX(p)] = (bits)[BITMAP_INDEX(p)] & ~BITMAP_BIT(p))
-
-/* getting bitmap */
-#define GET_HEAP_MARK_BITS(x)           (&GET_HEAP_PAGE(x)->mark_bits[0])
-#define GET_HEAP_PINNED_BITS(x)         (&GET_HEAP_PAGE(x)->pinned_bits[0])
-#define GET_HEAP_UNCOLLECTIBLE_BITS(x)  (&GET_HEAP_PAGE(x)->uncollectible_bits[0])
-#define GET_HEAP_WB_UNPROTECTED_BITS(x) (&GET_HEAP_PAGE(x)->wb_unprotected_bits[0])
-#define GET_HEAP_MARKING_BITS(x)        (&GET_HEAP_PAGE(x)->marking_bits[0])
-
-#define GC_SWEEP_PAGES_FREEABLE_PER_STEP 3
-
-#define RVALUE_AGE_BITMAP_INDEX(n)  (NUM_IN_PAGE(n) / (BITS_BITLENGTH / RVALUE_AGE_BIT_COUNT))
-#define RVALUE_AGE_BITMAP_OFFSET(n) ((NUM_IN_PAGE(n) % (BITS_BITLENGTH / RVALUE_AGE_BIT_COUNT)) * RVALUE_AGE_BIT_COUNT)
-
-#define RVALUE_OLD_AGE   3
+#define UNEXPECTED_NODE(func) \
+    rb_bug(#func"(): GC does not handle T_NODE 0x%x(%p) 0x%"PRIxVALUE, \
+           BUILTIN_TYPE(obj), (void*)(obj), RBASIC(obj)->flags)
 
-static int
-RVALUE_AGE_GET(VALUE obj)
+static inline void
+rb_data_object_check(VALUE klass)
 {
-    bits_t *age_bits = GET_HEAP_PAGE(obj)->age_bits;
-    return (int)(age_bits[RVALUE_AGE_BITMAP_INDEX(obj)] >> RVALUE_AGE_BITMAP_OFFSET(obj)) & RVALUE_AGE_BIT_MASK;
+    if (klass != rb_cObject && (rb_get_alloc_func(klass) == rb_class_allocate_instance)) {
+        rb_undef_alloc_func(klass);
+        rb_warn("undefining the allocator of T_DATA class %"PRIsVALUE, klass);
+    }
 }
 
-static void
-RVALUE_AGE_SET(VALUE obj, int age)
+VALUE
+rb_data_object_wrap(VALUE klass, void *datap, RUBY_DATA_FUNC dmark, RUBY_DATA_FUNC dfree)
 {
-    RUBY_ASSERT(age <= RVALUE_OLD_AGE);
-    bits_t *age_bits = GET_HEAP_PAGE(obj)->age_bits;
-    // clear the bits
-    age_bits[RVALUE_AGE_BITMAP_INDEX(obj)] &= ~(RVALUE_AGE_BIT_MASK << (RVALUE_AGE_BITMAP_OFFSET(obj)));
-    // shift the correct value in
-    age_bits[RVALUE_AGE_BITMAP_INDEX(obj)] |= ((bits_t)age << RVALUE_AGE_BITMAP_OFFSET(obj));
-    if (age == RVALUE_OLD_AGE) {
-        RB_FL_SET_RAW(obj, RUBY_FL_PROMOTED);
-    }
-    else {
-        RB_FL_UNSET_RAW(obj, RUBY_FL_PROMOTED);
-    }
+    RUBY_ASSERT_ALWAYS(dfree != (RUBY_DATA_FUNC)1);
+    if (klass) rb_data_object_check(klass);
+    return newobj_of(GET_RACTOR(), klass, T_DATA, (VALUE)dmark, (VALUE)datap, (VALUE)dfree, !dmark, sizeof(struct RTypedData));
 }
 
-/* Aliases */
-#define rb_objspace (*rb_objspace_of(GET_VM()))
-#define rb_objspace_of(vm) ((vm)->objspace)
-#define unless_objspace(objspace) \
-    rb_objspace_t *objspace; \
-    rb_vm_t *unless_objspace_vm = GET_VM(); \
-    if (unless_objspace_vm) objspace = unless_objspace_vm->objspace; \
-    else /* return; or objspace will be warned uninitialized */
-
-#define ruby_initial_gc_stress	gc_params.gc_stress
-
-VALUE *ruby_initial_gc_stress_ptr = &ruby_initial_gc_stress;
-
-#define malloc_limit		objspace->malloc_params.limit
-#define malloc_increase 	objspace->malloc_params.increase
-#define malloc_allocated_size 	objspace->malloc_params.allocated_size
-#define heap_pages_sorted       objspace->heap_pages.sorted
-#define heap_allocated_pages    objspace->heap_pages.allocated_pages
-#define heap_pages_sorted_length objspace->heap_pages.sorted_length
-#define heap_pages_lomem	objspace->heap_pages.range[0]
-#define heap_pages_himem	objspace->heap_pages.range[1]
-#define heap_pages_freeable_pages	objspace->heap_pages.freeable_pages
-#define heap_pages_final_slots		objspace->heap_pages.final_slots
-#define heap_pages_deferred_final	objspace->heap_pages.deferred_final
-#define size_pools              objspace->size_pools
-#define during_gc		objspace->flags.during_gc
-#define finalizing		objspace->atomic_flags.finalizing
-#define finalizer_table 	objspace->finalizer_table
-#define global_list		objspace->global_list
-#define ruby_gc_stressful	objspace->flags.gc_stressful
-#define ruby_gc_stress_mode     objspace->gc_stress_mode
-#if GC_DEBUG_STRESS_TO_CLASS
-#define stress_to_class         objspace->stress_to_class
-#define set_stress_to_class(c)  (stress_to_class = (c))
-#else
-#define stress_to_class         (objspace, 0)
-#define set_stress_to_class(c)  (objspace, (c))
-#endif
+VALUE
+rb_data_object_zalloc(VALUE klass, size_t size, RUBY_DATA_FUNC dmark, RUBY_DATA_FUNC dfree)
+{
+    VALUE obj = rb_data_object_wrap(klass, 0, dmark, dfree);
+    DATA_PTR(obj) = xcalloc(1, size);
+    return obj;
+}
 
-#if 0
-#define dont_gc_on()          (fprintf(stderr, "dont_gc_on@%s:%d\n",      __FILE__, __LINE__), objspace->flags.dont_gc = 1)
-#define dont_gc_off()         (fprintf(stderr, "dont_gc_off@%s:%d\n",     __FILE__, __LINE__), objspace->flags.dont_gc = 0)
-#define dont_gc_set(b)        (fprintf(stderr, "dont_gc_set(%d)@%s:%d\n", __FILE__, __LINE__), (int)b), objspace->flags.dont_gc = (b))
-#define dont_gc_val()         (objspace->flags.dont_gc)
-#else
-#define dont_gc_on()          (objspace->flags.dont_gc = 1)
-#define dont_gc_off()         (objspace->flags.dont_gc = 0)
-#define dont_gc_set(b)        (((int)b), objspace->flags.dont_gc = (b))
-#define dont_gc_val()         (objspace->flags.dont_gc)
-#endif
+static VALUE
+typed_data_alloc(VALUE klass, VALUE typed_flag, void *datap, const rb_data_type_t *type, size_t size)
+{
+    RBIMPL_NONNULL_ARG(type);
+    if (klass) rb_data_object_check(klass);
+    bool wb_protected = (type->flags & RUBY_FL_WB_PROTECTED) || !type->function.dmark;
+    return newobj_of(GET_RACTOR(), klass, T_DATA, ((VALUE)type) | IS_TYPED_DATA | typed_flag, (VALUE)datap, 0, wb_protected, size);
+}
 
-static inline enum gc_mode
-gc_mode_verify(enum gc_mode mode)
+VALUE
+rb_data_typed_object_wrap(VALUE klass, void *datap, const rb_data_type_t *type)
 {
-#if RGENGC_CHECK_MODE > 0
-    switch (mode) {
-      case gc_mode_none:
-      case gc_mode_marking:
-      case gc_mode_sweeping:
-      case gc_mode_compacting:
-        break;
-      default:
-        rb_bug("gc_mode_verify: unreachable (%d)", (int)mode);
+    if (UNLIKELY(type->flags & RUBY_TYPED_EMBEDDABLE)) {
+        rb_raise(rb_eTypeError, "Cannot wrap an embeddable TypedData");
     }
-#endif
-    return mode;
+
+    return typed_data_alloc(klass, 0, datap, type, sizeof(struct RTypedData));
 }
 
-static inline bool
-has_sweeping_pages(rb_objspace_t *objspace)
+VALUE
+rb_data_typed_object_zalloc(VALUE klass, size_t size, const rb_data_type_t *type)
 {
-    for (int i = 0; i < SIZE_POOL_COUNT; i++) {
-        if (SIZE_POOL_EDEN_HEAP(&size_pools[i])->sweeping_page) {
-            return TRUE;
+    if (type->flags & RUBY_TYPED_EMBEDDABLE) {
+        if (!(type->flags & RUBY_TYPED_FREE_IMMEDIATELY)) {
+            rb_raise(rb_eTypeError, "Embeddable TypedData must be freed immediately");
+        }
+
+        size_t embed_size = offsetof(struct RTypedData, data) + size;
+        if (rb_gc_size_allocatable_p(embed_size)) {
+            VALUE obj = typed_data_alloc(klass, TYPED_DATA_EMBEDDED, 0, type, embed_size);
+            memset((char *)obj + offsetof(struct RTypedData, data), 0, size);
+            return obj;
         }
     }
-    return FALSE;
+
+    VALUE obj = typed_data_alloc(klass, 0, NULL, type, sizeof(struct RTypedData));
+    DATA_PTR(obj) = xcalloc(1, size);
+    return obj;
 }
 
-static inline size_t
-heap_eden_total_pages(rb_objspace_t *objspace)
+static size_t
+rb_objspace_data_type_memsize(VALUE obj)
 {
-    size_t count = 0;
-    for (int i = 0; i < SIZE_POOL_COUNT; i++) {
-        count += SIZE_POOL_EDEN_HEAP(&size_pools[i])->total_pages;
+    size_t size = 0;
+    if (RTYPEDDATA_P(obj)) {
+        const rb_data_type_t *type = RTYPEDDATA_TYPE(obj);
+        const void *ptr = RTYPEDDATA_GET_DATA(obj);
+
+        if (RTYPEDDATA_TYPE(obj)->flags & RUBY_TYPED_EMBEDDABLE && !RTYPEDDATA_EMBEDDED_P(obj)) {
+#ifdef HAVE_MALLOC_USABLE_SIZE
+            size += malloc_usable_size((void *)ptr);
+#endif
+        }
+
+        if (ptr && type->function.dsize) {
+            size += type->function.dsize(ptr);
+        }
     }
-    return count;
+
+    return size;
 }
 
-static inline size_t
-heap_eden_total_slots(rb_objspace_t *objspace)
+const char *
+rb_objspace_data_type_name(VALUE obj)
 {
-    size_t count = 0;
-    for (int i = 0; i < SIZE_POOL_COUNT; i++) {
-        count += SIZE_POOL_EDEN_HEAP(&size_pools[i])->total_slots;
+    if (RTYPEDDATA_P(obj)) {
+        return RTYPEDDATA_TYPE(obj)->wrap_struct_name;
+    }
+    else {
+        return 0;
     }
-    return count;
 }
 
-static inline size_t
-heap_tomb_total_pages(rb_objspace_t *objspace)
+static enum rb_id_table_iterator_result
+cvar_table_free_i(VALUE value, void *ctx)
 {
-    size_t count = 0;
-    for (int i = 0; i < SIZE_POOL_COUNT; i++) {
-        count += SIZE_POOL_TOMB_HEAP(&size_pools[i])->total_pages;
-    }
-    return count;
+    xfree((void *)value);
+    return ID_TABLE_CONTINUE;
 }
 
-static inline size_t
-heap_allocatable_pages(rb_objspace_t *objspace)
+static void
+io_fptr_finalize(void *fptr)
 {
-    size_t count = 0;
-    for (int i = 0; i < SIZE_POOL_COUNT; i++) {
-        count += size_pools[i].allocatable_pages;
-    }
-    return count;
+    rb_io_fptr_finalize((struct rb_io *)fptr);
 }
 
-static inline size_t
-heap_allocatable_slots(rb_objspace_t *objspace)
+static inline void
+make_io_zombie(void *objspace, VALUE obj)
 {
-    size_t count = 0;
-    for (int i = 0; i < SIZE_POOL_COUNT; i++) {
-        rb_size_pool_t *size_pool = &size_pools[i];
-        int slot_size_multiple = size_pool->slot_size / BASE_SLOT_SIZE;
-        count += size_pool->allocatable_pages * HEAP_PAGE_OBJ_LIMIT / slot_size_multiple;
-    }
-    return count;
+    rb_io_t *fptr = RFILE(obj)->fptr;
+    rb_gc_impl_make_zombie(objspace, obj, io_fptr_finalize, fptr);
 }
 
-static inline size_t
-total_allocated_pages(rb_objspace_t *objspace)
+static bool
+rb_data_free(void *objspace, VALUE obj)
 {
-    size_t count = 0;
-    for (int i = 0; i < SIZE_POOL_COUNT; i++) {
-        rb_size_pool_t *size_pool = &size_pools[i];
-        count += size_pool->total_allocated_pages;
+    void *data = RTYPEDDATA_P(obj) ? RTYPEDDATA_GET_DATA(obj) : DATA_PTR(obj);
+    if (data) {
+        int free_immediately = false;
+        void (*dfree)(void *);
+
+        if (RTYPEDDATA_P(obj)) {
+            free_immediately = (RTYPEDDATA_TYPE(obj)->flags & RUBY_TYPED_FREE_IMMEDIATELY) != 0;
+            dfree = RTYPEDDATA_TYPE(obj)->function.dfree;
+        }
+        else {
+            dfree = RDATA(obj)->dfree;
+        }
+
+        if (dfree) {
+            if (dfree == RUBY_DEFAULT_FREE) {
+                if (!RTYPEDDATA_P(obj) || !RTYPEDDATA_EMBEDDED_P(obj)) {
+                    xfree(data);
+                    RB_DEBUG_COUNTER_INC(obj_data_xfree);
+                }
+            }
+            else if (free_immediately) {
+                (*dfree)(data);
+                if (RTYPEDDATA_TYPE(obj)->flags & RUBY_TYPED_EMBEDDABLE && !RTYPEDDATA_EMBEDDED_P(obj)) {
+                    xfree(data);
+                }
+
+                RB_DEBUG_COUNTER_INC(obj_data_imm_free);
+            }
+            else {
+                rb_gc_impl_make_zombie(objspace, obj, dfree, data);
+                RB_DEBUG_COUNTER_INC(obj_data_zombie);
+                return FALSE;
+            }
+        }
+        else {
+            RB_DEBUG_COUNTER_INC(obj_data_empty);
+        }
     }
-    return count;
+
+    return true;
 }
 
-static inline size_t
-total_freed_pages(rb_objspace_t *objspace)
+struct classext_foreach_args {
+    VALUE klass;
+    rb_objspace_t *objspace; // used for update_*
+};
+
+static void
+classext_free(rb_classext_t *ext, bool is_prime, VALUE namespace, void *arg)
 {
-    size_t count = 0;
-    for (int i = 0; i < SIZE_POOL_COUNT; i++) {
-        rb_size_pool_t *size_pool = &size_pools[i];
-        count += size_pool->total_freed_pages;
+    struct rb_id_table *tbl;
+    struct classext_foreach_args *args = (struct classext_foreach_args *)arg;
+
+    rb_id_table_free(RCLASSEXT_M_TBL(ext));
+    rb_cc_tbl_free(RCLASSEXT_CC_TBL(ext), args->klass);
+    if (!RCLASSEXT_SHARED_CONST_TBL(ext) && (tbl = RCLASSEXT_CONST_TBL(ext)) != NULL) {
+        rb_free_const_table(tbl);
+    }
+    if ((tbl = RCLASSEXT_CVC_TBL(ext)) != NULL) {
+        rb_id_table_foreach_values(tbl, cvar_table_free_i, NULL);
+        rb_id_table_free(tbl);
+    }
+    rb_class_classext_free_subclasses(ext, args->klass);
+    if (RCLASSEXT_SUPERCLASSES_WITH_SELF(ext)) {
+        RUBY_ASSERT(is_prime); // superclasses should only be used on prime
+        xfree(RCLASSEXT_SUPERCLASSES(ext));
+    }
+    if (!is_prime) { // the prime classext will be freed with RClass
+        xfree(ext);
     }
-    return count;
 }
 
-static inline size_t
-total_allocated_objects(rb_objspace_t *objspace)
+static void
+classext_iclass_free(rb_classext_t *ext, bool is_prime, VALUE namespace, void *arg)
 {
-    size_t count = 0;
-    for (int i = 0; i < SIZE_POOL_COUNT; i++) {
-        rb_size_pool_t *size_pool = &size_pools[i];
-        count += size_pool->total_allocated_objects;
+    struct classext_foreach_args *args = (struct classext_foreach_args *)arg;
+
+    if (RCLASSEXT_ICLASS_IS_ORIGIN(ext) && !RCLASSEXT_ICLASS_ORIGIN_SHARED_MTBL(ext)) {
+        /* Method table is not shared for origin iclasses of classes */
+        rb_id_table_free(RCLASSEXT_M_TBL(ext));
     }
-    return count;
-}
+    if (RCLASSEXT_CALLABLE_M_TBL(ext) != NULL) {
+        rb_id_table_free(RCLASSEXT_CALLABLE_M_TBL(ext));
+    }
+    rb_cc_tbl_free(RCLASSEXT_CC_TBL(ext), args->klass);
 
-static inline size_t
-total_freed_objects(rb_objspace_t *objspace)
-{
-    size_t count = 0;
-    for (int i = 0; i < SIZE_POOL_COUNT; i++) {
-        rb_size_pool_t *size_pool = &size_pools[i];
-        count += size_pool->total_freed_objects;
+    rb_class_classext_free_subclasses(ext, args->klass);
+
+    if (!is_prime) { // the prime classext will be freed with RClass
+        xfree(ext);
     }
-    return count;
 }
 
-#define gc_mode(objspace)                gc_mode_verify((enum gc_mode)(objspace)->flags.mode)
-#define gc_mode_set(objspace, mode)      ((objspace)->flags.mode = (unsigned int)gc_mode_verify(mode))
+bool
+rb_gc_obj_free(void *objspace, VALUE obj)
+{
+    struct classext_foreach_args args;
 
-#define is_marking(objspace)             (gc_mode(objspace) == gc_mode_marking)
-#define is_sweeping(objspace)            (gc_mode(objspace) == gc_mode_sweeping)
-#define is_full_marking(objspace)        ((objspace)->flags.during_minor_gc == FALSE)
-#define is_incremental_marking(objspace) ((objspace)->flags.during_incremental_marking != FALSE)
-#define will_be_incremental_marking(objspace) ((objspace)->rgengc.need_major_gc != GPR_FLAG_NONE)
-#define GC_INCREMENTAL_SWEEP_SLOT_COUNT 2048
-#define GC_INCREMENTAL_SWEEP_POOL_SLOT_COUT 1024
-#define is_lazy_sweeping(objspace)           (GC_ENABLE_LAZY_SWEEP && has_sweeping_pages(objspace))
+    RB_DEBUG_COUNTER_INC(obj_free);
 
-#if SIZEOF_LONG == SIZEOF_VOIDP
-# define obj_id_to_ref(objid) ((objid) ^ FIXNUM_FLAG) /* unset FIXNUM_FLAG */
-#elif SIZEOF_LONG_LONG == SIZEOF_VOIDP
-# define obj_id_to_ref(objid) (FIXNUM_P(objid) ? \
-   ((objid) ^ FIXNUM_FLAG) : (NUM2PTR(objid) << 1))
-#else
-# error not supported
-#endif
-
-#define RANY(o) ((RVALUE*)(o))
-
-struct RZombie {
-    struct RBasic basic;
-    VALUE next;
-    void (*dfree)(void *);
-    void *data;
-};
-
-#define RZOMBIE(o) ((struct RZombie *)(o))
-
-#define nomem_error GET_VM()->special_exceptions[ruby_error_nomemory]
-
-#if RUBY_MARK_FREE_DEBUG
-int ruby_gc_debug_indent = 0;
-#endif
-VALUE rb_mGC;
-int ruby_disable_gc = 0;
-int ruby_enable_autocompact = 0;
-
-void rb_iseq_mark_and_move(rb_iseq_t *iseq, bool referece_updating);
-void rb_iseq_free(const rb_iseq_t *iseq);
-size_t rb_iseq_memsize(const rb_iseq_t *iseq);
-void rb_vm_update_references(void *ptr);
-
-void rb_gcdebug_print_obj_condition(VALUE obj);
-
-NORETURN(static void *gc_vraise(void *ptr));
-NORETURN(static void gc_raise(VALUE exc, const char *fmt, ...));
-NORETURN(static void negative_size_allocation_error(const char *));
-
-static void init_mark_stack(mark_stack_t *stack);
-static int garbage_collect(rb_objspace_t *, unsigned int reason);
-
-static int  gc_start(rb_objspace_t *objspace, unsigned int reason);
-static void gc_rest(rb_objspace_t *objspace);
-
-enum gc_enter_event {
-    gc_enter_event_start,
-    gc_enter_event_continue,
-    gc_enter_event_rest,
-    gc_enter_event_finalizer,
-    gc_enter_event_rb_memerror,
-};
-
-static inline void gc_enter(rb_objspace_t *objspace, enum gc_enter_event event, unsigned int *lock_lev);
-static inline void gc_exit(rb_objspace_t *objspace, enum gc_enter_event event, unsigned int *lock_lev);
-static void gc_marking_enter(rb_objspace_t *objspace);
-static void gc_marking_exit(rb_objspace_t *objspace);
-static void gc_sweeping_enter(rb_objspace_t *objspace);
-static void gc_sweeping_exit(rb_objspace_t *objspace);
-static bool gc_marks_continue(rb_objspace_t *objspace, rb_size_pool_t *size_pool, rb_heap_t *heap);
-
-static void gc_sweep(rb_objspace_t *objspace);
-static void gc_sweep_finish_size_pool(rb_objspace_t *objspace, rb_size_pool_t *size_pool);
-static void gc_sweep_continue(rb_objspace_t *objspace, rb_size_pool_t *size_pool, rb_heap_t *heap);
-
-static inline void gc_mark(rb_objspace_t *objspace, VALUE ptr);
-static inline void gc_pin(rb_objspace_t *objspace, VALUE ptr);
-static inline void gc_mark_and_pin(rb_objspace_t *objspace, VALUE ptr);
-NO_SANITIZE("memory", static void gc_mark_maybe(rb_objspace_t *objspace, VALUE ptr));
-
-static int gc_mark_stacked_objects_incremental(rb_objspace_t *, size_t count);
-NO_SANITIZE("memory", static inline int is_pointer_to_heap(rb_objspace_t *objspace, void *ptr));
-
-static size_t obj_memsize_of(VALUE obj, int use_all_types);
-static void gc_verify_internal_consistency(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, unsigned int reason);
-static inline void gc_prof_timer_start(rb_objspace_t *);
-static inline void gc_prof_timer_stop(rb_objspace_t *);
-static inline void gc_prof_mark_timer_start(rb_objspace_t *);
-static inline void gc_prof_mark_timer_stop(rb_objspace_t *);
-static inline void gc_prof_sweep_timer_start(rb_objspace_t *);
-static inline void gc_prof_sweep_timer_stop(rb_objspace_t *);
-static inline void gc_prof_set_malloc_info(rb_objspace_t *);
-static inline void gc_prof_set_heap_info(rb_objspace_t *);
-
-#define TYPED_UPDATE_IF_MOVED(_objspace, _type, _thing) do { \
-    if (gc_object_moved_p((_objspace), (VALUE)(_thing))) {    \
-        *(_type *)&(_thing) = (_type)RMOVED(_thing)->destination; \
-    } \
-} while (0)
-
-#define UPDATE_IF_MOVED(_objspace, _thing) TYPED_UPDATE_IF_MOVED(_objspace, VALUE, _thing)
-
-#define gc_prof_record(objspace) (objspace)->profile.current_record
-#define gc_prof_enabled(objspace) ((objspace)->profile.run && (objspace)->profile.current_record)
-
-#ifdef HAVE_VA_ARGS_MACRO
-# define gc_report(level, objspace, ...) \
-    if (!RGENGC_DEBUG_ENABLED(level)) {} else gc_report_body(level, objspace, __VA_ARGS__)
-#else
-# define gc_report if (!RGENGC_DEBUG_ENABLED(0)) {} else gc_report_body
-#endif
-PRINTF_ARGS(static void gc_report_body(int level, rb_objspace_t *objspace, const char *fmt, ...), 3, 4);
-static const char *obj_info(VALUE obj);
-static const char *obj_type_name(VALUE obj);
-
-/*
- * 1 - TSC (H/W Time Stamp Counter)
- * 2 - getrusage
- */
-#ifndef TICK_TYPE
-#define TICK_TYPE 1
-#endif
-
-#if USE_TICK_T
-
-#if TICK_TYPE == 1
-/* the following code is only for internal tuning. */
-
-/* Source code to use RDTSC is quoted and modified from
- * https://www.mcs.anl.gov/~kazutomo/rdtsc.html
- * written by Kazutomo Yoshii <kazutomo@mcs.anl.gov>
- */
-
-#if defined(__GNUC__) && defined(__i386__)
-typedef unsigned long long tick_t;
-#define PRItick "llu"
-static inline tick_t
-tick(void)
-{
-    unsigned long long int x;
-    __asm__ __volatile__ ("rdtsc" : "=A" (x));
-    return x;
-}
-
-#elif defined(__GNUC__) && defined(__x86_64__)
-typedef unsigned long long tick_t;
-#define PRItick "llu"
-
-static __inline__ tick_t
-tick(void)
-{
-    unsigned long hi, lo;
-    __asm__ __volatile__ ("rdtsc" : "=a"(lo), "=d"(hi));
-    return ((unsigned long long)lo)|( ((unsigned long long)hi)<<32);
-}
-
-#elif defined(__powerpc64__) && (GCC_VERSION_SINCE(4,8,0) || defined(__clang__))
-typedef unsigned long long tick_t;
-#define PRItick "llu"
-
-static __inline__ tick_t
-tick(void)
-{
-    unsigned long long val = __builtin_ppc_get_timebase();
-    return val;
-}
-
-/* Implementation for macOS PPC by @nobu
- * See: https://github.com/ruby/ruby/pull/5975#discussion_r890045558
- */
-#elif defined(__POWERPC__) && defined(__APPLE__)
-typedef unsigned long long tick_t;
-#define PRItick "llu"
-
-static __inline__ tick_t
-tick(void)
-{
-    unsigned long int upper, lower, tmp;
-    # define mftbu(r) __asm__ volatile("mftbu   %0" : "=r"(r))
-    # define mftb(r)  __asm__ volatile("mftb    %0" : "=r"(r))
-        do {
-            mftbu(upper);
-            mftb(lower);
-            mftbu(tmp);
-        } while (tmp != upper);
-    return ((tick_t)upper << 32) | lower;
-}
-
-#elif defined(__aarch64__) &&  defined(__GNUC__)
-typedef unsigned long tick_t;
-#define PRItick "lu"
-
-static __inline__ tick_t
-tick(void)
-{
-    unsigned long val;
-    __asm__ __volatile__ ("mrs %0, cntvct_el0" : "=r" (val));
-    return val;
-}
-
-
-#elif defined(_WIN32) && defined(_MSC_VER)
-#include <intrin.h>
-typedef unsigned __int64 tick_t;
-#define PRItick "llu"
-
-static inline tick_t
-tick(void)
-{
-    return __rdtsc();
-}
-
-#else /* use clock */
-typedef clock_t tick_t;
-#define PRItick "llu"
-
-static inline tick_t
-tick(void)
-{
-    return clock();
-}
-#endif /* TSC */
-
-#elif TICK_TYPE == 2
-typedef double tick_t;
-#define PRItick "4.9f"
-
-static inline tick_t
-tick(void)
-{
-    return getrusage_time();
-}
-#else /* TICK_TYPE */
-#error "choose tick type"
-#endif /* TICK_TYPE */
-
-#define MEASURE_LINE(expr) do { \
-    volatile tick_t start_time = tick(); \
-    volatile tick_t end_time; \
-    expr; \
-    end_time = tick(); \
-    fprintf(stderr, "0\t%"PRItick"\t%s\n", end_time - start_time, #expr); \
-} while (0)
-
-#else /* USE_TICK_T */
-#define MEASURE_LINE(expr) expr
-#endif /* USE_TICK_T */
-
-static inline void *
-asan_unpoison_object_temporary(VALUE obj)
-{
-    void *ptr = asan_poisoned_object_p(obj);
-    asan_unpoison_object(obj, false);
-    return ptr;
-}
-
-static inline void *
-asan_poison_object_restore(VALUE obj, void *ptr)
-{
-    if (ptr) {
-        asan_poison_object(obj);
-    }
-    return NULL;
-}
-
-#define asan_unpoisoning_object(obj) \
-    for (void *poisoned = asan_unpoison_object_temporary(obj), \
-              *unpoisoning = &poisoned; /* flag to loop just once */ \
-         unpoisoning; \
-         unpoisoning = asan_poison_object_restore(obj, poisoned))
-
-#define FL_CHECK2(name, x, pred) \
-    ((RGENGC_CHECK_MODE && SPECIAL_CONST_P(x)) ? \
-     (rb_bug(name": SPECIAL_CONST (%p)", (void *)(x)), 0) : (pred))
-#define FL_TEST2(x,f)  FL_CHECK2("FL_TEST2",  x, FL_TEST_RAW((x),(f)) != 0)
-#define FL_SET2(x,f)   FL_CHECK2("FL_SET2",   x, RBASIC(x)->flags |= (f))
-#define FL_UNSET2(x,f) FL_CHECK2("FL_UNSET2", x, RBASIC(x)->flags &= ~(f))
-
-#define RVALUE_MARK_BITMAP(obj)           MARKED_IN_BITMAP(GET_HEAP_MARK_BITS(obj), (obj))
-#define RVALUE_PIN_BITMAP(obj)            MARKED_IN_BITMAP(GET_HEAP_PINNED_BITS(obj), (obj))
-#define RVALUE_PAGE_MARKED(page, obj)     MARKED_IN_BITMAP((page)->mark_bits, (obj))
-
-#define RVALUE_WB_UNPROTECTED_BITMAP(obj) MARKED_IN_BITMAP(GET_HEAP_WB_UNPROTECTED_BITS(obj), (obj))
-#define RVALUE_UNCOLLECTIBLE_BITMAP(obj)  MARKED_IN_BITMAP(GET_HEAP_UNCOLLECTIBLE_BITS(obj), (obj))
-#define RVALUE_MARKING_BITMAP(obj)        MARKED_IN_BITMAP(GET_HEAP_MARKING_BITS(obj), (obj))
-
-#define RVALUE_PAGE_WB_UNPROTECTED(page, obj) MARKED_IN_BITMAP((page)->wb_unprotected_bits, (obj))
-#define RVALUE_PAGE_UNCOLLECTIBLE(page, obj)  MARKED_IN_BITMAP((page)->uncollectible_bits, (obj))
-#define RVALUE_PAGE_MARKING(page, obj)        MARKED_IN_BITMAP((page)->marking_bits, (obj))
-
-static int rgengc_remember(rb_objspace_t *objspace, VALUE obj);
-static void rgengc_mark_and_rememberset_clear(rb_objspace_t *objspace, rb_heap_t *heap);
-static void rgengc_rememberset_mark(rb_objspace_t *objspace, rb_heap_t *heap);
-
-static int
-check_rvalue_consistency_force(const VALUE obj, int terminate)
-{
-    int err = 0;
-    rb_objspace_t *objspace = &rb_objspace;
-
-    RB_VM_LOCK_ENTER_NO_BARRIER();
-    {
-        if (SPECIAL_CONST_P(obj)) {
-            fprintf(stderr, "check_rvalue_consistency: %p is a special const.\n", (void *)obj);
-            err++;
-        }
-        else if (!is_pointer_to_heap(objspace, (void *)obj)) {
-            /* check if it is in tomb_pages */
-            struct heap_page *page = NULL;
-            for (int i = 0; i < SIZE_POOL_COUNT; i++) {
-                rb_size_pool_t *size_pool = &size_pools[i];
-                ccan_list_for_each(&size_pool->tomb_heap.pages, page, page_node) {
-                    if (page->start <= (uintptr_t)obj &&
-                            (uintptr_t)obj < (page->start + (page->total_slots * size_pool->slot_size))) {
-                        fprintf(stderr, "check_rvalue_consistency: %p is in a tomb_heap (%p).\n",
-                                (void *)obj, (void *)page);
-                        err++;
-                        goto skip;
-                    }
-                }
-            }
-            bp();
-            fprintf(stderr, "check_rvalue_consistency: %p is not a Ruby object.\n", (void *)obj);
-            err++;
-          skip:
-            ;
-        }
-        else {
-            const int wb_unprotected_bit = RVALUE_WB_UNPROTECTED_BITMAP(obj) != 0;
-            const int uncollectible_bit = RVALUE_UNCOLLECTIBLE_BITMAP(obj) != 0;
-            const int mark_bit = RVALUE_MARK_BITMAP(obj) != 0;
-            const int marking_bit = RVALUE_MARKING_BITMAP(obj) != 0;
-            const int remembered_bit = MARKED_IN_BITMAP(GET_HEAP_PAGE(obj)->remembered_bits, obj) != 0;
-            const int age = RVALUE_AGE_GET((VALUE)obj);
-
-            if (GET_HEAP_PAGE(obj)->flags.in_tomb) {
-                fprintf(stderr, "check_rvalue_consistency: %s is in tomb page.\n", obj_info(obj));
-                err++;
-            }
-            if (BUILTIN_TYPE(obj) == T_NONE) {
-                fprintf(stderr, "check_rvalue_consistency: %s is T_NONE.\n", obj_info(obj));
-                err++;
-            }
-            if (BUILTIN_TYPE(obj) == T_ZOMBIE) {
-                fprintf(stderr, "check_rvalue_consistency: %s is T_ZOMBIE.\n", obj_info(obj));
-                err++;
-            }
-
-            obj_memsize_of((VALUE)obj, FALSE);
-
-            /* check generation
-             *
-             * OLD == age == 3 && old-bitmap && mark-bit (except incremental marking)
-             */
-            if (age > 0 && wb_unprotected_bit) {
-                fprintf(stderr, "check_rvalue_consistency: %s is not WB protected, but age is %d > 0.\n", obj_info(obj), age);
-                err++;
-            }
-
-            if (!is_marking(objspace) && uncollectible_bit && !mark_bit) {
-                fprintf(stderr, "check_rvalue_consistency: %s is uncollectible, but is not marked while !gc.\n", obj_info(obj));
-                err++;
-            }
-
-            if (!is_full_marking(objspace)) {
-                if (uncollectible_bit && age != RVALUE_OLD_AGE && !wb_unprotected_bit) {
-                    fprintf(stderr, "check_rvalue_consistency: %s is uncollectible, but not old (age: %d) and not WB unprotected.\n",
-                            obj_info(obj), age);
-                    err++;
-                }
-                if (remembered_bit && age != RVALUE_OLD_AGE) {
-                    fprintf(stderr, "check_rvalue_consistency: %s is remembered, but not old (age: %d).\n",
-                            obj_info(obj), age);
-                    err++;
-                }
-            }
-
-            /*
-             * check coloring
-             *
-             *               marking:false marking:true
-             * marked:false  white         *invalid*
-             * marked:true   black         grey
-             */
-            if (is_incremental_marking(objspace) && marking_bit) {
-                if (!is_marking(objspace) && !mark_bit) {
-                    fprintf(stderr, "check_rvalue_consistency: %s is marking, but not marked.\n", obj_info(obj));
-                    err++;
-                }
-            }
-        }
-    }
-    RB_VM_LOCK_LEAVE_NO_BARRIER();
-
-    if (err > 0 && terminate) {
-        rb_bug("check_rvalue_consistency_force: there is %d errors.", err);
-    }
-    return err;
-}
-
-#if RGENGC_CHECK_MODE == 0
-static inline VALUE
-check_rvalue_consistency(const VALUE obj)
-{
-    return obj;
-}
-#else
-static VALUE
-check_rvalue_consistency(const VALUE obj)
-{
-    check_rvalue_consistency_force(obj, TRUE);
-    return obj;
-}
-#endif
-
-static inline int
-gc_object_moved_p(rb_objspace_t * objspace, VALUE obj)
-{
-    if (RB_SPECIAL_CONST_P(obj)) {
-        return FALSE;
-    }
-    else {
-        void *poisoned = asan_unpoison_object_temporary(obj);
-
-        int ret =  BUILTIN_TYPE(obj) == T_MOVED;
-        /* Re-poison slot if it's not the one we want */
-        if (poisoned) {
-            GC_ASSERT(BUILTIN_TYPE(obj) == T_NONE);
-            asan_poison_object(obj);
-        }
-        return ret;
-    }
-}
-
-static inline int
-RVALUE_MARKED(VALUE obj)
-{
-    check_rvalue_consistency(obj);
-    return RVALUE_MARK_BITMAP(obj) != 0;
-}
-
-static inline int
-RVALUE_PINNED(VALUE obj)
-{
-    check_rvalue_consistency(obj);
-    return RVALUE_PIN_BITMAP(obj) != 0;
-}
-
-static inline int
-RVALUE_WB_UNPROTECTED(VALUE obj)
-{
-    check_rvalue_consistency(obj);
-    return RVALUE_WB_UNPROTECTED_BITMAP(obj) != 0;
-}
-
-static inline int
-RVALUE_MARKING(VALUE obj)
-{
-    check_rvalue_consistency(obj);
-    return RVALUE_MARKING_BITMAP(obj) != 0;
-}
-
-static inline int
-RVALUE_REMEMBERED(VALUE obj)
-{
-    check_rvalue_consistency(obj);
-    return MARKED_IN_BITMAP(GET_HEAP_PAGE(obj)->remembered_bits, obj) != 0;
-}
-
-static inline int
-RVALUE_UNCOLLECTIBLE(VALUE obj)
-{
-    check_rvalue_consistency(obj);
-    return RVALUE_UNCOLLECTIBLE_BITMAP(obj) != 0;
-}
-
-static inline int
-RVALUE_OLD_P(VALUE obj)
-{
-    GC_ASSERT(!RB_SPECIAL_CONST_P(obj));
-    check_rvalue_consistency(obj);
-    // Because this will only ever be called on GC controlled objects,
-    // we can use the faster _RAW function here
-    return RB_OBJ_PROMOTED_RAW(obj);
-}
-
-static inline void
-RVALUE_PAGE_OLD_UNCOLLECTIBLE_SET(rb_objspace_t *objspace, struct heap_page *page, VALUE obj)
-{
-    MARK_IN_BITMAP(&page->uncollectible_bits[0], obj);
-    objspace->rgengc.old_objects++;
-
-#if RGENGC_PROFILE >= 2
-    objspace->profile.total_promoted_count++;
-    objspace->profile.promoted_types[BUILTIN_TYPE(obj)]++;
-#endif
-}
-
-static inline void
-RVALUE_OLD_UNCOLLECTIBLE_SET(rb_objspace_t *objspace, VALUE obj)
-{
-    RB_DEBUG_COUNTER_INC(obj_promote);
-    RVALUE_PAGE_OLD_UNCOLLECTIBLE_SET(objspace, GET_HEAP_PAGE(obj), obj);
-}
-
-/* set age to age+1 */
-static inline void
-RVALUE_AGE_INC(rb_objspace_t *objspace, VALUE obj)
-{
-    int age = RVALUE_AGE_GET((VALUE)obj);
-
-    if (RGENGC_CHECK_MODE && age == RVALUE_OLD_AGE) {
-        rb_bug("RVALUE_AGE_INC: can not increment age of OLD object %s.", obj_info(obj));
-    }
-
-    age++;
-    RVALUE_AGE_SET(obj, age);
-
-    if (age == RVALUE_OLD_AGE) {
-        RVALUE_OLD_UNCOLLECTIBLE_SET(objspace, obj);
-    }
-
-    check_rvalue_consistency(obj);
-}
-
-static inline void
-RVALUE_AGE_SET_CANDIDATE(rb_objspace_t *objspace, VALUE obj)
-{
-    check_rvalue_consistency(obj);
-    GC_ASSERT(!RVALUE_OLD_P(obj));
-    RVALUE_AGE_SET(obj, RVALUE_OLD_AGE - 1);
-    check_rvalue_consistency(obj);
-}
-
-static inline void
-RVALUE_AGE_RESET(VALUE obj)
-{
-    RVALUE_AGE_SET(obj, 0);
-}
-
-static inline void
-RVALUE_DEMOTE(rb_objspace_t *objspace, VALUE obj)
-{
-    check_rvalue_consistency(obj);
-    GC_ASSERT(RVALUE_OLD_P(obj));
-
-    if (!is_incremental_marking(objspace) && RVALUE_REMEMBERED(obj)) {
-        CLEAR_IN_BITMAP(GET_HEAP_PAGE(obj)->remembered_bits, obj);
-    }
-
-    CLEAR_IN_BITMAP(GET_HEAP_UNCOLLECTIBLE_BITS(obj), obj);
-    RVALUE_AGE_RESET(obj);
-
-    if (RVALUE_MARKED(obj)) {
-        objspace->rgengc.old_objects--;
-    }
-
-    check_rvalue_consistency(obj);
-}
-
-static inline int
-RVALUE_BLACK_P(VALUE obj)
-{
-    return RVALUE_MARKED(obj) && !RVALUE_MARKING(obj);
-}
-
-#if 0
-static inline int
-RVALUE_GREY_P(VALUE obj)
-{
-    return RVALUE_MARKED(obj) && RVALUE_MARKING(obj);
-}
-#endif
-
-static inline int
-RVALUE_WHITE_P(VALUE obj)
-{
-    return RVALUE_MARKED(obj) == FALSE;
-}
-
-/*
-  --------------------------- ObjectSpace -----------------------------
-*/
-
-static inline void *
-calloc1(size_t n)
-{
-    return calloc(1, n);
-}
-
-rb_objspace_t *
-rb_objspace_alloc(void)
-{
-    rb_objspace_t *objspace = calloc1(sizeof(rb_objspace_t));
-    objspace->flags.measure_gc = 1;
-    malloc_limit = gc_params.malloc_limit_min;
-
-    for (int i = 0; i < SIZE_POOL_COUNT; i++) {
-        rb_size_pool_t *size_pool = &size_pools[i];
-
-        size_pool->slot_size = (1 << i) * BASE_SLOT_SIZE;
-
-        ccan_list_head_init(&SIZE_POOL_EDEN_HEAP(size_pool)->pages);
-        ccan_list_head_init(&SIZE_POOL_TOMB_HEAP(size_pool)->pages);
-    }
-
-    rb_darray_make_without_gc(&objspace->weak_references, 0);
-
-    dont_gc_on();
-
-    return objspace;
-}
-
-static void free_stack_chunks(mark_stack_t *);
-static void mark_stack_free_cache(mark_stack_t *);
-static void heap_page_free(rb_objspace_t *objspace, struct heap_page *page);
-
-void
-rb_objspace_free(rb_objspace_t *objspace)
-{
-    if (is_lazy_sweeping(objspace))
-        rb_bug("lazy sweeping underway when freeing object space");
-
-    free(objspace->profile.records);
-    objspace->profile.records = NULL;
-
-    if (global_list) {
-        struct gc_list *list, *next;
-        for (list = global_list; list; list = next) {
-            next = list->next;
-            xfree(list);
-        }
-    }
-    if (heap_pages_sorted) {
-        size_t i;
-        for (i = 0; i < heap_allocated_pages; ++i) {
-            heap_page_free(objspace, heap_pages_sorted[i]);
-        }
-        free(heap_pages_sorted);
-        heap_allocated_pages = 0;
-        heap_pages_sorted_length = 0;
-        heap_pages_lomem = 0;
-        heap_pages_himem = 0;
-
-        for (int i = 0; i < SIZE_POOL_COUNT; i++) {
-            rb_size_pool_t *size_pool = &size_pools[i];
-            SIZE_POOL_EDEN_HEAP(size_pool)->total_pages = 0;
-            SIZE_POOL_EDEN_HEAP(size_pool)->total_slots = 0;
-        }
-    }
-    st_free_table(objspace->id_to_obj_tbl);
-    st_free_table(objspace->obj_to_id_tbl);
-
-    free_stack_chunks(&objspace->mark_stack);
-    mark_stack_free_cache(&objspace->mark_stack);
-
-    rb_darray_free_without_gc(objspace->weak_references);
-
-    free(objspace);
-}
-
-static void
-heap_pages_expand_sorted_to(rb_objspace_t *objspace, size_t next_length)
-{
-    struct heap_page **sorted;
-    size_t size = size_mul_or_raise(next_length, sizeof(struct heap_page *), rb_eRuntimeError);
-
-    gc_report(3, objspace, "heap_pages_expand_sorted: next_length: %"PRIdSIZE", size: %"PRIdSIZE"\n",
-              next_length, size);
-
-    if (heap_pages_sorted_length > 0) {
-        sorted = (struct heap_page **)realloc(heap_pages_sorted, size);
-        if (sorted) heap_pages_sorted = sorted;
-    }
-    else {
-        sorted = heap_pages_sorted = (struct heap_page **)malloc(size);
-    }
-
-    if (sorted == 0) {
-        rb_memerror();
-    }
-
-    heap_pages_sorted_length = next_length;
-}
-
-static void
-heap_pages_expand_sorted(rb_objspace_t *objspace)
-{
-    /* usually heap_allocatable_pages + heap_eden->total_pages == heap_pages_sorted_length
-     * because heap_allocatable_pages contains heap_tomb->total_pages (recycle heap_tomb pages).
-     * however, if there are pages which do not have empty slots, then try to create new pages
-     * so that the additional allocatable_pages counts (heap_tomb->total_pages) are added.
-     */
-    size_t next_length = heap_allocatable_pages(objspace);
-    for (int i = 0; i < SIZE_POOL_COUNT; i++) {
-        rb_size_pool_t *size_pool = &size_pools[i];
-        next_length += SIZE_POOL_EDEN_HEAP(size_pool)->total_pages;
-        next_length += SIZE_POOL_TOMB_HEAP(size_pool)->total_pages;
-    }
-
-    if (next_length > heap_pages_sorted_length) {
-        heap_pages_expand_sorted_to(objspace, next_length);
-    }
-
-    GC_ASSERT(heap_allocatable_pages(objspace) + heap_eden_total_pages(objspace) <= heap_pages_sorted_length);
-    GC_ASSERT(heap_allocated_pages <= heap_pages_sorted_length);
-}
-
-static void
-size_pool_allocatable_pages_set(rb_objspace_t *objspace, rb_size_pool_t *size_pool, size_t s)
-{
-    size_pool->allocatable_pages = s;
-    heap_pages_expand_sorted(objspace);
-}
-
-static inline void
-heap_page_add_freeobj(rb_objspace_t *objspace, struct heap_page *page, VALUE obj)
-{
-    ASSERT_vm_locking();
-
-    RVALUE *p = (RVALUE *)obj;
-
-    asan_unpoison_object(obj, false);
-
-    asan_unlock_freelist(page);
-
-    p->as.free.flags = 0;
-    p->as.free.next = page->freelist;
-    page->freelist = p;
-    asan_lock_freelist(page);
-
-    RVALUE_AGE_RESET(obj);
-
-    if (RGENGC_CHECK_MODE &&
-        /* obj should belong to page */
-        !(page->start <= (uintptr_t)obj &&
-          (uintptr_t)obj   <  ((uintptr_t)page->start + (page->total_slots * page->slot_size)) &&
-          obj % BASE_SLOT_SIZE == 0)) {
-        rb_bug("heap_page_add_freeobj: %p is not rvalue.", (void *)p);
-    }
-
-    asan_poison_object(obj);
-    gc_report(3, objspace, "heap_page_add_freeobj: add %p to freelist\n", (void *)obj);
-}
-
-static inline void
-heap_add_freepage(rb_heap_t *heap, struct heap_page *page)
-{
-    asan_unlock_freelist(page);
-    GC_ASSERT(page->free_slots != 0);
-    GC_ASSERT(page->freelist != NULL);
-
-    page->free_next = heap->free_pages;
-    heap->free_pages = page;
-
-    RUBY_DEBUG_LOG("page:%p freelist:%p", (void *)page, (void *)page->freelist);
-
-    asan_lock_freelist(page);
-}
-
-static inline void
-heap_add_poolpage(rb_objspace_t *objspace, rb_heap_t *heap, struct heap_page *page)
-{
-    asan_unlock_freelist(page);
-    GC_ASSERT(page->free_slots != 0);
-    GC_ASSERT(page->freelist != NULL);
-
-    page->free_next = heap->pooled_pages;
-    heap->pooled_pages = page;
-    objspace->rincgc.pooled_slots += page->free_slots;
-
-    asan_lock_freelist(page);
-}
-
-static void
-heap_unlink_page(rb_objspace_t *objspace, rb_heap_t *heap, struct heap_page *page)
-{
-    ccan_list_del(&page->page_node);
-    heap->total_pages--;
-    heap->total_slots -= page->total_slots;
-}
-
-static void rb_aligned_free(void *ptr, size_t size);
-
-static void
-heap_page_body_free(struct heap_page_body *page_body)
-{
-    GC_ASSERT((uintptr_t)page_body % HEAP_PAGE_ALIGN == 0);
-
-    if (HEAP_PAGE_ALLOC_USE_MMAP) {
-#ifdef HAVE_MMAP
-        GC_ASSERT(HEAP_PAGE_SIZE % sysconf(_SC_PAGE_SIZE) == 0);
-        if (munmap(page_body, HEAP_PAGE_SIZE)) {
-            rb_bug("heap_page_body_free: munmap failed");
-        }
-#endif
-    }
-    else {
-        rb_aligned_free(page_body, HEAP_PAGE_SIZE);
-    }
-}
-
-static void
-heap_page_free(rb_objspace_t *objspace, struct heap_page *page)
-{
-    heap_allocated_pages--;
-    page->size_pool->total_freed_pages++;
-    heap_page_body_free(GET_PAGE_BODY(page->start));
-    free(page);
-}
-
-static void
-heap_pages_free_unused_pages(rb_objspace_t *objspace)
-{
-    size_t i, j;
-
-    bool has_pages_in_tomb_heap = FALSE;
-    for (i = 0; i < SIZE_POOL_COUNT; i++) {
-        if (!ccan_list_empty(&SIZE_POOL_TOMB_HEAP(&size_pools[i])->pages)) {
-            has_pages_in_tomb_heap = TRUE;
-            break;
-        }
-    }
-
-    if (has_pages_in_tomb_heap) {
-        for (i = j = 0; j < heap_allocated_pages; i++) {
-            struct heap_page *page = heap_pages_sorted[i];
-
-            if (page->flags.in_tomb && page->free_slots == page->total_slots) {
-                heap_unlink_page(objspace, SIZE_POOL_TOMB_HEAP(page->size_pool), page);
-                heap_page_free(objspace, page);
-            }
-            else {
-                if (i != j) {
-                    heap_pages_sorted[j] = page;
-                }
-                j++;
-            }
-        }
-
-        struct heap_page *hipage = heap_pages_sorted[heap_allocated_pages - 1];
-        uintptr_t himem = (uintptr_t)hipage->start + (hipage->total_slots * hipage->slot_size);
-        GC_ASSERT(himem <= heap_pages_himem);
-        heap_pages_himem = himem;
-
-        struct heap_page *lopage = heap_pages_sorted[0];
-        uintptr_t lomem = (uintptr_t)lopage->start;
-        GC_ASSERT(lomem >= heap_pages_lomem);
-        heap_pages_lomem = lomem;
-
-        GC_ASSERT(j == heap_allocated_pages);
-    }
-}
-
-static struct heap_page_body *
-heap_page_body_allocate(void)
-{
-    struct heap_page_body *page_body;
-
-    if (HEAP_PAGE_ALLOC_USE_MMAP) {
-#ifdef HAVE_MMAP
-        GC_ASSERT(HEAP_PAGE_ALIGN % sysconf(_SC_PAGE_SIZE) == 0);
-
-        char *ptr = mmap(NULL, HEAP_PAGE_ALIGN + HEAP_PAGE_SIZE,
-                         PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
-        if (ptr == MAP_FAILED) {
-            return NULL;
-        }
-
-        char *aligned = ptr + HEAP_PAGE_ALIGN;
-        aligned -= ((VALUE)aligned & (HEAP_PAGE_ALIGN - 1));
-        GC_ASSERT(aligned > ptr);
-        GC_ASSERT(aligned <= ptr + HEAP_PAGE_ALIGN);
-
-        size_t start_out_of_range_size = aligned - ptr;
-        GC_ASSERT(start_out_of_range_size % sysconf(_SC_PAGE_SIZE) == 0);
-        if (start_out_of_range_size > 0) {
-            if (munmap(ptr, start_out_of_range_size)) {
-                rb_bug("heap_page_body_allocate: munmap failed for start");
-            }
-        }
-
-        size_t end_out_of_range_size = HEAP_PAGE_ALIGN - start_out_of_range_size;
-        GC_ASSERT(end_out_of_range_size % sysconf(_SC_PAGE_SIZE) == 0);
-        if (end_out_of_range_size > 0) {
-            if (munmap(aligned + HEAP_PAGE_SIZE, end_out_of_range_size)) {
-                rb_bug("heap_page_body_allocate: munmap failed for end");
-            }
-        }
-
-        page_body = (struct heap_page_body *)aligned;
-#endif
-    }
-    else {
-        page_body = rb_aligned_malloc(HEAP_PAGE_ALIGN, HEAP_PAGE_SIZE);
-    }
-
-    GC_ASSERT((uintptr_t)page_body % HEAP_PAGE_ALIGN == 0);
-
-    return page_body;
-}
-
-static struct heap_page *
-heap_page_allocate(rb_objspace_t *objspace, rb_size_pool_t *size_pool)
-{
-    uintptr_t start, end, p;
-    struct heap_page *page;
-    uintptr_t hi, lo, mid;
-    size_t stride = size_pool->slot_size;
-    unsigned int limit = (unsigned int)((HEAP_PAGE_SIZE - sizeof(struct heap_page_header)))/(int)stride;
-
-    /* assign heap_page body (contains heap_page_header and RVALUEs) */
-    struct heap_page_body *page_body = heap_page_body_allocate();
-    if (page_body == 0) {
-        rb_memerror();
-    }
-
-    /* assign heap_page entry */
-    page = calloc1(sizeof(struct heap_page));
-    if (page == 0) {
-        heap_page_body_free(page_body);
-        rb_memerror();
-    }
-
-    /* adjust obj_limit (object number available in this page) */
-    start = (uintptr_t)((VALUE)page_body + sizeof(struct heap_page_header));
-
-    if (start % BASE_SLOT_SIZE != 0) {
-        int delta = BASE_SLOT_SIZE - (start % BASE_SLOT_SIZE);
-        start = start + delta;
-        GC_ASSERT(NUM_IN_PAGE(start) == 0 || NUM_IN_PAGE(start) == 1);
-
-        /* Find a num in page that is evenly divisible by `stride`.
-         * This is to ensure that objects are aligned with bit planes.
-         * In other words, ensure there are an even number of objects
-         * per bit plane. */
-        if (NUM_IN_PAGE(start) == 1) {
-            start += stride - BASE_SLOT_SIZE;
-        }
-
-        GC_ASSERT(NUM_IN_PAGE(start) * BASE_SLOT_SIZE % stride == 0);
-
-        limit = (HEAP_PAGE_SIZE - (int)(start - (uintptr_t)page_body))/(int)stride;
-    }
-    end = start + (limit * (int)stride);
-
-    /* setup heap_pages_sorted */
-    lo = 0;
-    hi = (uintptr_t)heap_allocated_pages;
-    while (lo < hi) {
-        struct heap_page *mid_page;
-
-        mid = (lo + hi) / 2;
-        mid_page = heap_pages_sorted[mid];
-        if ((uintptr_t)mid_page->start < start) {
-            lo = mid + 1;
-        }
-        else if ((uintptr_t)mid_page->start > start) {
-            hi = mid;
-        }
-        else {
-            rb_bug("same heap page is allocated: %p at %"PRIuVALUE, (void *)page_body, (VALUE)mid);
-        }
-    }
-
-    if (hi < (uintptr_t)heap_allocated_pages) {
-        MEMMOVE(&heap_pages_sorted[hi+1], &heap_pages_sorted[hi], struct heap_page_header*, heap_allocated_pages - hi);
-    }
-
-    heap_pages_sorted[hi] = page;
-
-    heap_allocated_pages++;
-
-    GC_ASSERT(heap_eden_total_pages(objspace) + heap_allocatable_pages(objspace) <= heap_pages_sorted_length);
-    GC_ASSERT(heap_eden_total_pages(objspace) + heap_tomb_total_pages(objspace) == heap_allocated_pages - 1);
-    GC_ASSERT(heap_allocated_pages <= heap_pages_sorted_length);
-
-    size_pool->total_allocated_pages++;
-
-    if (heap_allocated_pages > heap_pages_sorted_length) {
-        rb_bug("heap_page_allocate: allocated(%"PRIdSIZE") > sorted(%"PRIdSIZE")",
-               heap_allocated_pages, heap_pages_sorted_length);
-    }
-
-    if (heap_pages_lomem == 0 || heap_pages_lomem > start) heap_pages_lomem = start;
-    if (heap_pages_himem < end) heap_pages_himem = end;
-
-    page->start = start;
-    page->total_slots = limit;
-    page->slot_size = size_pool->slot_size;
-    page->size_pool = size_pool;
-    page_body->header.page = page;
-
-    for (p = start; p != end; p += stride) {
-        gc_report(3, objspace, "assign_heap_page: %p is added to freelist\n", (void *)p);
-        heap_page_add_freeobj(objspace, page, (VALUE)p);
-    }
-    page->free_slots = limit;
-
-    asan_lock_freelist(page);
-    return page;
-}
-
-static struct heap_page *
-heap_page_resurrect(rb_objspace_t *objspace, rb_size_pool_t *size_pool)
-{
-    struct heap_page *page = 0, *next;
-
-    ccan_list_for_each_safe(&SIZE_POOL_TOMB_HEAP(size_pool)->pages, page, next, page_node) {
-        asan_unlock_freelist(page);
-        if (page->freelist != NULL) {
-            heap_unlink_page(objspace, &size_pool->tomb_heap, page);
-            asan_lock_freelist(page);
-            return page;
-        }
-    }
-
-    return NULL;
-}
-
-static struct heap_page *
-heap_page_create(rb_objspace_t *objspace, rb_size_pool_t *size_pool)
-{
-    struct heap_page *page;
-    const char *method = "recycle";
-
-    size_pool->allocatable_pages--;
-
-    page = heap_page_resurrect(objspace, size_pool);
-
-    if (page == NULL) {
-        page = heap_page_allocate(objspace, size_pool);
-        method = "allocate";
-    }
-    if (0) fprintf(stderr, "heap_page_create: %s - %p, "
-                   "heap_allocated_pages: %"PRIdSIZE", "
-                   "heap_allocated_pages: %"PRIdSIZE", "
-                   "tomb->total_pages: %"PRIdSIZE"\n",
-                   method, (void *)page, heap_pages_sorted_length, heap_allocated_pages, SIZE_POOL_TOMB_HEAP(size_pool)->total_pages);
-    return page;
-}
-
-static void
-heap_add_page(rb_objspace_t *objspace, rb_size_pool_t *size_pool, rb_heap_t *heap, struct heap_page *page)
-{
-    /* Adding to eden heap during incremental sweeping is forbidden */
-    GC_ASSERT(!(heap == SIZE_POOL_EDEN_HEAP(size_pool) && heap->sweeping_page));
-    page->flags.in_tomb = (heap == SIZE_POOL_TOMB_HEAP(size_pool));
-    ccan_list_add_tail(&heap->pages, &page->page_node);
-    heap->total_pages++;
-    heap->total_slots += page->total_slots;
-}
-
-static void
-heap_assign_page(rb_objspace_t *objspace, rb_size_pool_t *size_pool, rb_heap_t *heap)
-{
-    struct heap_page *page = heap_page_create(objspace, size_pool);
-    heap_add_page(objspace, size_pool, heap, page);
-    heap_add_freepage(heap, page);
-}
-
-#if GC_CAN_COMPILE_COMPACTION
-static void
-heap_add_pages(rb_objspace_t *objspace, rb_size_pool_t *size_pool, rb_heap_t *heap, size_t add)
-{
-    size_t i;
-
-    size_pool_allocatable_pages_set(objspace, size_pool, add);
-
-    for (i = 0; i < add; i++) {
-        heap_assign_page(objspace, size_pool, heap);
-    }
-
-    GC_ASSERT(size_pool->allocatable_pages == 0);
-}
-#endif
-
-static size_t
-slots_to_pages_for_size_pool(rb_objspace_t *objspace, rb_size_pool_t *size_pool, size_t slots)
-{
-    size_t multiple = size_pool->slot_size / BASE_SLOT_SIZE;
-    /* Due to alignment, heap pages may have one less slot. We should
-     * ensure there is enough pages to guarantee that we will have at
-     * least the required number of slots after allocating all the pages. */
-    size_t slots_per_page = (HEAP_PAGE_OBJ_LIMIT / multiple) - 1;
-    return CEILDIV(slots, slots_per_page);
-}
-
-static size_t
-minimum_pages_for_size_pool(rb_objspace_t *objspace, rb_size_pool_t *size_pool)
-{
-    size_t size_pool_idx = size_pool - size_pools;
-    size_t init_slots = gc_params.size_pool_init_slots[size_pool_idx];
-    return slots_to_pages_for_size_pool(objspace, size_pool, init_slots);
-}
-
-static size_t
-heap_extend_pages(rb_objspace_t *objspace, rb_size_pool_t *size_pool, size_t free_slots, size_t total_slots, size_t used)
-{
-    double goal_ratio = gc_params.heap_free_slots_goal_ratio;
-    size_t next_used;
-
-    if (goal_ratio == 0.0) {
-        next_used = (size_t)(used * gc_params.growth_factor);
-    }
-    else if (total_slots == 0) {
-        next_used = minimum_pages_for_size_pool(objspace, size_pool);
-    }
-    else {
-        /* Find `f' where free_slots = f * total_slots * goal_ratio
-         * => f = (total_slots - free_slots) / ((1 - goal_ratio) * total_slots)
-         */
-        double f = (double)(total_slots - free_slots) / ((1 - goal_ratio) * total_slots);
-
-        if (f > gc_params.growth_factor) f = gc_params.growth_factor;
-        if (f < 1.0) f = 1.1;
-
-        next_used = (size_t)(f * used);
-
-        if (0) {
-            fprintf(stderr,
-                    "free_slots(%8"PRIuSIZE")/total_slots(%8"PRIuSIZE")=%1.2f,"
-                    " G(%1.2f), f(%1.2f),"
-                    " used(%8"PRIuSIZE") => next_used(%8"PRIuSIZE")\n",
-                    free_slots, total_slots, free_slots/(double)total_slots,
-                    goal_ratio, f, used, next_used);
-        }
-    }
-
-    if (gc_params.growth_max_slots > 0) {
-        size_t max_used = (size_t)(used + gc_params.growth_max_slots/HEAP_PAGE_OBJ_LIMIT);
-        if (next_used > max_used) next_used = max_used;
-    }
-
-    size_t extend_page_count = next_used - used;
-    /* Extend by at least 1 page. */
-    if (extend_page_count == 0) extend_page_count = 1;
-
-    return extend_page_count;
-}
-
-static int
-heap_increment(rb_objspace_t *objspace, rb_size_pool_t *size_pool, rb_heap_t *heap)
-{
-    if (size_pool->allocatable_pages > 0) {
-        gc_report(1, objspace, "heap_increment: heap_pages_sorted_length: %"PRIdSIZE", "
-                  "heap_pages_inc: %"PRIdSIZE", heap->total_pages: %"PRIdSIZE"\n",
-                  heap_pages_sorted_length, size_pool->allocatable_pages, heap->total_pages);
-
-        GC_ASSERT(heap_allocatable_pages(objspace) + heap_eden_total_pages(objspace) <= heap_pages_sorted_length);
-        GC_ASSERT(heap_allocated_pages <= heap_pages_sorted_length);
-
-        heap_assign_page(objspace, size_pool, heap);
-        return TRUE;
-    }
-    return FALSE;
-}
-
-static void
-gc_continue(rb_objspace_t *objspace, rb_size_pool_t *size_pool, rb_heap_t *heap)
-{
-    unsigned int lock_lev;
-    gc_enter(objspace, gc_enter_event_continue, &lock_lev);
-
-    /* Continue marking if in incremental marking. */
-    if (is_incremental_marking(objspace)) {
-        if (gc_marks_continue(objspace, size_pool, heap)) {
-            gc_sweep(objspace);
-        }
-    }
-
-    /* Continue sweeping if in lazy sweeping or the previous incremental
-     * marking finished and did not yield a free page. */
-    if (heap->free_pages == NULL && is_lazy_sweeping(objspace)) {
-        gc_sweep_continue(objspace, size_pool, heap);
-    }
-
-    gc_exit(objspace, gc_enter_event_continue, &lock_lev);
-}
-
-static void
-heap_prepare(rb_objspace_t *objspace, rb_size_pool_t *size_pool, rb_heap_t *heap)
-{
-    GC_ASSERT(heap->free_pages == NULL);
-
-    /* Continue incremental marking or lazy sweeping, if in any of those steps. */
-    gc_continue(objspace, size_pool, heap);
-
-    /* If we still don't have a free page and not allowed to create a new page,
-     * we should start a new GC cycle. */
-    if (heap->free_pages == NULL &&
-            (will_be_incremental_marking(objspace) ||
-                (heap_increment(objspace, size_pool, heap) == FALSE))) {
-        if (gc_start(objspace, GPR_FLAG_NEWOBJ) == FALSE) {
-            rb_memerror();
-        }
-        else {
-            /* Do steps of incremental marking or lazy sweeping if the GC run permits. */
-            gc_continue(objspace, size_pool, heap);
-
-            /* If we're not incremental marking (e.g. a minor GC) or finished
-             * sweeping and still don't have a free page, then
-             * gc_sweep_finish_size_pool should allow us to create a new page. */
-            if (heap->free_pages == NULL && !heap_increment(objspace, size_pool, heap)) {
-                if (objspace->rgengc.need_major_gc == GPR_FLAG_NONE) {
-                    rb_bug("cannot create a new page after GC");
-                }
-                else { // Major GC is required, which will allow us to create new page
-                    if (gc_start(objspace, GPR_FLAG_NEWOBJ) == FALSE) {
-                        rb_memerror();
-                    }
-                    else {
-                        /* Do steps of incremental marking or lazy sweeping. */
-                        gc_continue(objspace, size_pool, heap);
-
-                        if (heap->free_pages == NULL &&
-                                !heap_increment(objspace, size_pool, heap)) {
-                            rb_bug("cannot create a new page after major GC");
-                        }
-                    }
-                }
-            }
-        }
-    }
-
-    GC_ASSERT(heap->free_pages != NULL);
-}
-
-void
-rb_objspace_set_event_hook(const rb_event_flag_t event)
-{
-    rb_objspace_t *objspace = &rb_objspace;
-    objspace->hook_events = event & RUBY_INTERNAL_EVENT_OBJSPACE_MASK;
-    objspace->flags.has_hook = (objspace->hook_events != 0);
-}
-
-static void
-gc_event_hook_body(rb_execution_context_t *ec, rb_objspace_t *objspace, const rb_event_flag_t event, VALUE data)
-{
-    if (UNLIKELY(!ec->cfp)) return;
-    EXEC_EVENT_HOOK(ec, event, ec->cfp->self, 0, 0, 0, data);
-}
-
-#define gc_event_hook_available_p(objspace) ((objspace)->flags.has_hook)
-#define gc_event_hook_needed_p(objspace, event) ((objspace)->hook_events & (event))
-
-#define gc_event_hook_prep(objspace, event, data, prep) do { \
-    if (UNLIKELY(gc_event_hook_needed_p(objspace, event))) { \
-        prep; \
-        gc_event_hook_body(GET_EC(), (objspace), (event), (data)); \
-    } \
-} while (0)
-
-#define gc_event_hook(objspace, event, data) gc_event_hook_prep(objspace, event, data, (void)0)
-
-static inline VALUE
-newobj_init(VALUE klass, VALUE flags, int wb_protected, rb_objspace_t *objspace, VALUE obj)
-{
-#if !__has_feature(memory_sanitizer)
-    GC_ASSERT(BUILTIN_TYPE(obj) == T_NONE);
-    GC_ASSERT((flags & FL_WB_PROTECTED) == 0);
-#endif
-    RVALUE *p = RANY(obj);
-    p->as.basic.flags = flags;
-    *((VALUE *)&p->as.basic.klass) = klass;
-
-    int t = flags & RUBY_T_MASK;
-    if (t == T_CLASS || t == T_MODULE || t == T_ICLASS) {
-        RVALUE_AGE_SET_CANDIDATE(objspace, obj);
-    }
-
-#if RACTOR_CHECK_MODE
-    rb_ractor_setup_belonging(obj);
-#endif
-
-#if RGENGC_CHECK_MODE
-    p->as.values.v1 = p->as.values.v2 = p->as.values.v3 = 0;
-
-    RB_VM_LOCK_ENTER_NO_BARRIER();
-    {
-        check_rvalue_consistency(obj);
-
-        GC_ASSERT(RVALUE_MARKED(obj) == FALSE);
-        GC_ASSERT(RVALUE_MARKING(obj) == FALSE);
-        GC_ASSERT(RVALUE_OLD_P(obj) == FALSE);
-        GC_ASSERT(RVALUE_WB_UNPROTECTED(obj) == FALSE);
-
-        if (RVALUE_REMEMBERED((VALUE)obj)) rb_bug("newobj: %s is remembered.", obj_info(obj));
-    }
-    RB_VM_LOCK_LEAVE_NO_BARRIER();
-#endif
-
-    if (UNLIKELY(wb_protected == FALSE)) {
-        ASSERT_vm_locking();
-        MARK_IN_BITMAP(GET_HEAP_WB_UNPROTECTED_BITS(obj), obj);
-    }
-
-#if RGENGC_PROFILE
-    if (wb_protected) {
-        objspace->profile.total_generated_normal_object_count++;
-#if RGENGC_PROFILE >= 2
-        objspace->profile.generated_normal_object_count_types[BUILTIN_TYPE(obj)]++;
-#endif
-    }
-    else {
-        objspace->profile.total_generated_shady_object_count++;
-#if RGENGC_PROFILE >= 2
-        objspace->profile.generated_shady_object_count_types[BUILTIN_TYPE(obj)]++;
-#endif
-    }
-#endif
-
-#if GC_DEBUG
-    RANY(obj)->file = rb_source_location_cstr(&RANY(obj)->line);
-    GC_ASSERT(!SPECIAL_CONST_P(obj)); /* check alignment */
-#endif
-
-    gc_report(5, objspace, "newobj: %s\n", obj_info(obj));
-
-    // RUBY_DEBUG_LOG("obj:%p (%s)", (void *)obj, obj_type_name(obj));
-    return obj;
-}
-
-size_t
-rb_gc_obj_slot_size(VALUE obj)
-{
-    return GET_HEAP_PAGE(obj)->slot_size - RVALUE_OVERHEAD;
-}
-
-static inline size_t
-size_pool_slot_size(unsigned char pool_id)
-{
-    GC_ASSERT(pool_id < SIZE_POOL_COUNT);
-
-    size_t slot_size = (1 << pool_id) * BASE_SLOT_SIZE;
-
-#if RGENGC_CHECK_MODE
-    rb_objspace_t *objspace = &rb_objspace;
-    GC_ASSERT(size_pools[pool_id].slot_size == (short)slot_size);
-#endif
-
-    slot_size -= RVALUE_OVERHEAD;
-
-    return slot_size;
-}
-
-size_t
-rb_size_pool_slot_size(unsigned char pool_id)
-{
-    return size_pool_slot_size(pool_id);
-}
-
-bool
-rb_gc_size_allocatable_p(size_t size)
-{
-    return size <= size_pool_slot_size(SIZE_POOL_COUNT - 1);
-}
-
-static inline VALUE
-ractor_cache_allocate_slot(rb_objspace_t *objspace, rb_ractor_newobj_cache_t *cache,
-                           size_t size_pool_idx)
-{
-    rb_ractor_newobj_size_pool_cache_t *size_pool_cache = &cache->size_pool_caches[size_pool_idx];
-    RVALUE *p = size_pool_cache->freelist;
-
-    if (is_incremental_marking(objspace)) {
-        // Not allowed to allocate without running an incremental marking step
-        if (cache->incremental_mark_step_allocated_slots >= INCREMENTAL_MARK_STEP_ALLOCATIONS) {
-            return Qfalse;
-        }
-
-        if (p) {
-            cache->incremental_mark_step_allocated_slots++;
-        }
-    }
-
-    if (p) {
-        VALUE obj = (VALUE)p;
-        MAYBE_UNUSED(const size_t) stride = size_pool_slot_size(size_pool_idx);
-        size_pool_cache->freelist = p->as.free.next;
-        asan_unpoison_memory_region(p, stride, true);
-#if RGENGC_CHECK_MODE
-        GC_ASSERT(rb_gc_obj_slot_size(obj) == stride);
-        // zero clear
-        MEMZERO((char *)obj, char, stride);
-#endif
-        return obj;
-    }
-    else {
-        return Qfalse;
-    }
-}
-
-static struct heap_page *
-heap_next_free_page(rb_objspace_t *objspace, rb_size_pool_t *size_pool, rb_heap_t *heap)
-{
-    ASSERT_vm_locking();
-
-    struct heap_page *page;
-
-    if (heap->free_pages == NULL) {
-        heap_prepare(objspace, size_pool, heap);
-    }
-
-    page = heap->free_pages;
-    heap->free_pages = page->free_next;
-
-    GC_ASSERT(page->free_slots != 0);
-    RUBY_DEBUG_LOG("page:%p freelist:%p cnt:%d", (void *)page, (void *)page->freelist, page->free_slots);
-
-    asan_unlock_freelist(page);
-
-    return page;
-}
-
-static inline void
-ractor_cache_set_page(rb_ractor_newobj_cache_t *cache, size_t size_pool_idx,
-                      struct heap_page *page)
-{
-    gc_report(3, &rb_objspace, "ractor_set_cache: Using page %p\n", (void *)GET_PAGE_BODY(page->start));
-
-    rb_ractor_newobj_size_pool_cache_t *size_pool_cache = &cache->size_pool_caches[size_pool_idx];
-
-    GC_ASSERT(size_pool_cache->freelist == NULL);
-    GC_ASSERT(page->free_slots != 0);
-    GC_ASSERT(page->freelist != NULL);
-
-    size_pool_cache->using_page = page;
-    size_pool_cache->freelist = page->freelist;
-    page->free_slots = 0;
-    page->freelist = NULL;
-
-    asan_unpoison_object((VALUE)size_pool_cache->freelist, false);
-    GC_ASSERT(RB_TYPE_P((VALUE)size_pool_cache->freelist, T_NONE));
-    asan_poison_object((VALUE)size_pool_cache->freelist);
-}
-
-static inline VALUE
-newobj_fill(VALUE obj, VALUE v1, VALUE v2, VALUE v3)
-{
-    RVALUE *p = (RVALUE *)obj;
-    p->as.values.v1 = v1;
-    p->as.values.v2 = v2;
-    p->as.values.v3 = v3;
-    return obj;
-}
-
-static inline size_t
-size_pool_idx_for_size(size_t size)
-{
-    size += RVALUE_OVERHEAD;
-
-    size_t slot_count = CEILDIV(size, BASE_SLOT_SIZE);
-
-    /* size_pool_idx is ceil(log2(slot_count)) */
-    size_t size_pool_idx = 64 - nlz_int64(slot_count - 1);
-
-    if (size_pool_idx >= SIZE_POOL_COUNT) {
-        rb_bug("size_pool_idx_for_size: allocation size too large");
-    }
-
-#if RGENGC_CHECK_MODE
-    rb_objspace_t *objspace = &rb_objspace;
-    GC_ASSERT(size <= (size_t)size_pools[size_pool_idx].slot_size);
-    if (size_pool_idx > 0) GC_ASSERT(size > (size_t)size_pools[size_pool_idx - 1].slot_size);
-#endif
-
-    return size_pool_idx;
-}
-
-static VALUE
-newobj_alloc(rb_objspace_t *objspace, rb_ractor_t *cr, size_t size_pool_idx, bool vm_locked)
-{
-    rb_size_pool_t *size_pool = &size_pools[size_pool_idx];
-    rb_heap_t *heap = SIZE_POOL_EDEN_HEAP(size_pool);
-    rb_ractor_newobj_cache_t *cache = &cr->newobj_cache;
-
-    VALUE obj = ractor_cache_allocate_slot(objspace, cache, size_pool_idx);
-
-    if (UNLIKELY(obj == Qfalse)) {
-        unsigned int lev;
-        bool unlock_vm = false;
-
-        if (!vm_locked) {
-            RB_VM_LOCK_ENTER_CR_LEV(cr, &lev);
-            vm_locked = true;
-            unlock_vm = true;
-        }
-
-        {
-            ASSERT_vm_locking();
-
-            if (is_incremental_marking(objspace)) {
-                gc_continue(objspace, size_pool, heap);
-                cache->incremental_mark_step_allocated_slots = 0;
-
-                // Retry allocation after resetting incremental_mark_step_allocated_slots
-                obj = ractor_cache_allocate_slot(objspace, cache, size_pool_idx);
-            }
-
-            if (obj == Qfalse) {
-                // Get next free page (possibly running GC)
-                struct heap_page *page = heap_next_free_page(objspace, size_pool, heap);
-                ractor_cache_set_page(cache, size_pool_idx, page);
-
-                // Retry allocation after moving to new page
-                obj = ractor_cache_allocate_slot(objspace, cache, size_pool_idx);
-
-                GC_ASSERT(obj != Qfalse);
-            }
-        }
-
-        if (unlock_vm) {
-            RB_VM_LOCK_LEAVE_CR_LEV(cr, &lev);
-        }
-    }
-
-    size_pool->total_allocated_objects++;
-
-    return obj;
-}
-
-static void
-newobj_zero_slot(VALUE obj)
-{
-    memset((char *)obj + sizeof(struct RBasic), 0, rb_gc_obj_slot_size(obj) - sizeof(struct RBasic));
-}
-
-ALWAYS_INLINE(static VALUE newobj_slowpath(VALUE klass, VALUE flags, rb_objspace_t *objspace, rb_ractor_t *cr, int wb_protected, size_t size_pool_idx));
-
-static inline VALUE
-newobj_slowpath(VALUE klass, VALUE flags, rb_objspace_t *objspace, rb_ractor_t *cr, int wb_protected, size_t size_pool_idx)
-{
-    VALUE obj;
-    unsigned int lev;
-
-    RB_VM_LOCK_ENTER_CR_LEV(cr, &lev);
-    {
-        if (UNLIKELY(during_gc || ruby_gc_stressful)) {
-            if (during_gc) {
-                dont_gc_on();
-                during_gc = 0;
-                rb_bug("object allocation during garbage collection phase");
-            }
-
-            if (ruby_gc_stressful) {
-                if (!garbage_collect(objspace, GPR_FLAG_NEWOBJ)) {
-                    rb_memerror();
-                }
-            }
-        }
-
-        obj = newobj_alloc(objspace, cr, size_pool_idx, true);
-        newobj_init(klass, flags, wb_protected, objspace, obj);
-
-        gc_event_hook_prep(objspace, RUBY_INTERNAL_EVENT_NEWOBJ, obj, newobj_zero_slot(obj));
-    }
-    RB_VM_LOCK_LEAVE_CR_LEV(cr, &lev);
-
-    return obj;
-}
-
-NOINLINE(static VALUE newobj_slowpath_wb_protected(VALUE klass, VALUE flags,
-                                                   rb_objspace_t *objspace, rb_ractor_t *cr, size_t size_pool_idx));
-NOINLINE(static VALUE newobj_slowpath_wb_unprotected(VALUE klass, VALUE flags,
-                                                     rb_objspace_t *objspace, rb_ractor_t *cr, size_t size_pool_idx));
-
-static VALUE
-newobj_slowpath_wb_protected(VALUE klass, VALUE flags, rb_objspace_t *objspace, rb_ractor_t *cr, size_t size_pool_idx)
-{
-    return newobj_slowpath(klass, flags, objspace, cr, TRUE, size_pool_idx);
-}
-
-static VALUE
-newobj_slowpath_wb_unprotected(VALUE klass, VALUE flags, rb_objspace_t *objspace, rb_ractor_t *cr, size_t size_pool_idx)
-{
-    return newobj_slowpath(klass, flags, objspace, cr, FALSE, size_pool_idx);
-}
-
-static inline VALUE
-newobj_of0(VALUE klass, VALUE flags, int wb_protected, rb_ractor_t *cr, size_t alloc_size)
-{
-    VALUE obj;
-    rb_objspace_t *objspace = &rb_objspace;
-
-    RB_DEBUG_COUNTER_INC(obj_newobj);
-    (void)RB_DEBUG_COUNTER_INC_IF(obj_newobj_wb_unprotected, !wb_protected);
-
-    if (UNLIKELY(stress_to_class)) {
-        long i, cnt = RARRAY_LEN(stress_to_class);
-        for (i = 0; i < cnt; ++i) {
-            if (klass == RARRAY_AREF(stress_to_class, i)) rb_memerror();
-        }
-    }
-
-    size_t size_pool_idx = size_pool_idx_for_size(alloc_size);
-
-    if (SHAPE_IN_BASIC_FLAGS || (flags & RUBY_T_MASK) == T_OBJECT) {
-        flags |= (VALUE)size_pool_idx << SHAPE_FLAG_SHIFT;
-    }
-
-    if (!UNLIKELY(during_gc ||
-                  ruby_gc_stressful ||
-                  gc_event_hook_available_p(objspace)) &&
-            wb_protected) {
-        obj = newobj_alloc(objspace, cr, size_pool_idx, false);
-        newobj_init(klass, flags, wb_protected, objspace, obj);
-    }
-    else {
-        RB_DEBUG_COUNTER_INC(obj_newobj_slowpath);
-
-        obj = wb_protected ?
-          newobj_slowpath_wb_protected(klass, flags, objspace, cr, size_pool_idx) :
-          newobj_slowpath_wb_unprotected(klass, flags, objspace, cr, size_pool_idx);
-    }
-
-    return obj;
-}
-
-static inline VALUE
-newobj_of(rb_ractor_t *cr, VALUE klass, VALUE flags, VALUE v1, VALUE v2, VALUE v3, int wb_protected, size_t alloc_size)
-{
-    VALUE obj = newobj_of0(klass, flags, wb_protected, cr, alloc_size);
-    return newobj_fill(obj, v1, v2, v3);
-}
-
-VALUE
-rb_wb_unprotected_newobj_of(VALUE klass, VALUE flags, size_t size)
-{
-    GC_ASSERT((flags & FL_WB_PROTECTED) == 0);
-    return newobj_of(GET_RACTOR(), klass, flags, 0, 0, 0, FALSE, size);
-}
-
-VALUE
-rb_wb_protected_newobj_of(rb_execution_context_t *ec, VALUE klass, VALUE flags, size_t size)
-{
-    GC_ASSERT((flags & FL_WB_PROTECTED) == 0);
-    return newobj_of(rb_ec_ractor_ptr(ec), klass, flags, 0, 0, 0, TRUE, size);
-}
-
-/* for compatibility */
-
-VALUE
-rb_newobj(void)
-{
-    return newobj_of(GET_RACTOR(), 0, T_NONE, 0, 0, 0, FALSE, RVALUE_SIZE);
-}
-
-static size_t
-rb_obj_embedded_size(uint32_t numiv)
-{
-    return offsetof(struct RObject, as.ary) + (sizeof(VALUE) * numiv);
-}
-
-static VALUE
-rb_class_instance_allocate_internal(VALUE klass, VALUE flags, bool wb_protected)
-{
-    GC_ASSERT((flags & RUBY_T_MASK) == T_OBJECT);
-    GC_ASSERT(flags & ROBJECT_EMBED);
-
-    size_t size;
-    uint32_t index_tbl_num_entries = RCLASS_EXT(klass)->max_iv_count;
-
-    size = rb_obj_embedded_size(index_tbl_num_entries);
-    if (!rb_gc_size_allocatable_p(size)) {
-        size = sizeof(struct RObject);
-    }
-
-    VALUE obj = newobj_of(GET_RACTOR(), klass, flags, 0, 0, 0, wb_protected, size);
-    RUBY_ASSERT(rb_shape_get_shape(obj)->type == SHAPE_ROOT ||
-            rb_shape_get_shape(obj)->type == SHAPE_INITIAL_CAPACITY);
-
-    // Set the shape to the specific T_OBJECT shape which is always
-    // SIZE_POOL_COUNT away from the root shape.
-    ROBJECT_SET_SHAPE_ID(obj, ROBJECT_SHAPE_ID(obj) + SIZE_POOL_COUNT);
-
-#if RUBY_DEBUG
-    RUBY_ASSERT(!rb_shape_obj_too_complex(obj));
-    VALUE *ptr = ROBJECT_IVPTR(obj);
-    for (size_t i = 0; i < ROBJECT_IV_CAPACITY(obj); i++) {
-        ptr[i] = Qundef;
-    }
-#endif
-
-    return obj;
-}
-
-VALUE
-rb_newobj_of(VALUE klass, VALUE flags)
-{
-    if ((flags & RUBY_T_MASK) == T_OBJECT) {
-        return rb_class_instance_allocate_internal(klass, (flags | ROBJECT_EMBED) & ~FL_WB_PROTECTED, flags & FL_WB_PROTECTED);
-    }
-    else {
-        return newobj_of(GET_RACTOR(), klass, flags & ~FL_WB_PROTECTED, 0, 0, 0, flags & FL_WB_PROTECTED, RVALUE_SIZE);
-    }
-}
-
-#define UNEXPECTED_NODE(func) \
-    rb_bug(#func"(): GC does not handle T_NODE 0x%x(%p) 0x%"PRIxVALUE, \
-           BUILTIN_TYPE(obj), (void*)(obj), RBASIC(obj)->flags)
-
-const char *
-rb_imemo_name(enum imemo_type type)
-{
-    // put no default case to get a warning if an imemo type is missing
-    switch (type) {
-#define IMEMO_NAME(x) case imemo_##x: return #x;
-        IMEMO_NAME(env);
-        IMEMO_NAME(cref);
-        IMEMO_NAME(svar);
-        IMEMO_NAME(throw_data);
-        IMEMO_NAME(ifunc);
-        IMEMO_NAME(memo);
-        IMEMO_NAME(ment);
-        IMEMO_NAME(iseq);
-        IMEMO_NAME(tmpbuf);
-        IMEMO_NAME(ast);
-        IMEMO_NAME(parser_strterm);
-        IMEMO_NAME(callinfo);
-        IMEMO_NAME(callcache);
-        IMEMO_NAME(constcache);
-#undef IMEMO_NAME
-    }
-    return "unknown";
-}
-
-#undef rb_imemo_new
-
-VALUE
-rb_imemo_new(enum imemo_type type, VALUE v1, VALUE v2, VALUE v3, VALUE v0)
-{
-    size_t size = RVALUE_SIZE;
-    VALUE flags = T_IMEMO | (type << FL_USHIFT);
-    return newobj_of(GET_RACTOR(), v0, flags, v1, v2, v3, TRUE, size);
-}
-
-static VALUE
-rb_imemo_tmpbuf_new(VALUE v1, VALUE v2, VALUE v3, VALUE v0)
-{
-    size_t size = sizeof(struct rb_imemo_tmpbuf_struct);
-    VALUE flags = T_IMEMO | (imemo_tmpbuf << FL_USHIFT);
-    return newobj_of(GET_RACTOR(), v0, flags, v1, v2, v3, FALSE, size);
-}
-
-static VALUE
-rb_imemo_tmpbuf_auto_free_maybe_mark_buffer(void *buf, size_t cnt)
-{
-    return rb_imemo_tmpbuf_new((VALUE)buf, 0, (VALUE)cnt, 0);
-}
-
-rb_imemo_tmpbuf_t *
-rb_imemo_tmpbuf_parser_heap(void *buf, rb_imemo_tmpbuf_t *old_heap, size_t cnt)
-{
-    return (rb_imemo_tmpbuf_t *)rb_imemo_tmpbuf_new((VALUE)buf, (VALUE)old_heap, (VALUE)cnt, 0);
-}
-
-static size_t
-imemo_memsize(VALUE obj)
-{
-    size_t size = 0;
-    switch (imemo_type(obj)) {
-      case imemo_ment:
-        size += sizeof(RANY(obj)->as.imemo.ment.def);
-        break;
-      case imemo_iseq:
-        size += rb_iseq_memsize((rb_iseq_t *)obj);
-        break;
-      case imemo_env:
-        size += RANY(obj)->as.imemo.env.env_size * sizeof(VALUE);
-        break;
-      case imemo_tmpbuf:
-        size += RANY(obj)->as.imemo.alloc.cnt * sizeof(VALUE);
-        break;
-      case imemo_ast:
-        size += rb_ast_memsize(&RANY(obj)->as.imemo.ast);
-        break;
-      case imemo_cref:
-      case imemo_svar:
-      case imemo_throw_data:
-      case imemo_ifunc:
-      case imemo_memo:
-      case imemo_parser_strterm:
-        break;
-      default:
-        /* unreachable */
-        break;
-    }
-    return size;
-}
-
-#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)
-{
-    VALUE memo = rb_imemo_new(type, v1, v2, v3, v0);
-    fprintf(stderr, "memo %p (type: %d) @ %s:%d\n", (void *)memo, imemo_type(memo), file, line);
-    return memo;
-}
-#endif
-
-VALUE
-rb_class_allocate_instance(VALUE klass)
-{
-    return rb_class_instance_allocate_internal(klass, T_OBJECT | ROBJECT_EMBED, RGENGC_WB_PROTECTED_OBJECT);
-}
-
-static inline void
-rb_data_object_check(VALUE klass)
-{
-    if (klass != rb_cObject && (rb_get_alloc_func(klass) == rb_class_allocate_instance)) {
-        rb_undef_alloc_func(klass);
-        rb_warn("undefining the allocator of T_DATA class %"PRIsVALUE, klass);
-    }
-}
-
-VALUE
-rb_data_object_wrap(VALUE klass, void *datap, RUBY_DATA_FUNC dmark, RUBY_DATA_FUNC dfree)
-{
-    RUBY_ASSERT_ALWAYS(dfree != (RUBY_DATA_FUNC)1);
-    if (klass) rb_data_object_check(klass);
-    return newobj_of(GET_RACTOR(), klass, T_DATA, (VALUE)dmark, (VALUE)dfree, (VALUE)datap, !dmark, sizeof(struct RTypedData));
-}
-
-VALUE
-rb_data_object_zalloc(VALUE klass, size_t size, RUBY_DATA_FUNC dmark, RUBY_DATA_FUNC dfree)
-{
-    VALUE obj = rb_data_object_wrap(klass, 0, dmark, dfree);
-    DATA_PTR(obj) = xcalloc(1, size);
-    return obj;
-}
-
-VALUE
-rb_data_typed_object_wrap(VALUE klass, void *datap, const rb_data_type_t *type)
-{
-    RBIMPL_NONNULL_ARG(type);
-    if (klass) rb_data_object_check(klass);
-    bool wb_protected = (type->flags & RUBY_FL_WB_PROTECTED) || !type->function.dmark;
-    return newobj_of(GET_RACTOR(), klass, T_DATA, (VALUE)type, (VALUE)1, (VALUE)datap, wb_protected, sizeof(struct RTypedData));
-}
-
-VALUE
-rb_data_typed_object_zalloc(VALUE klass, size_t size, const rb_data_type_t *type)
-{
-    VALUE obj = rb_data_typed_object_wrap(klass, 0, type);
-    DATA_PTR(obj) = xcalloc(1, size);
-    return obj;
-}
-
-size_t
-rb_objspace_data_type_memsize(VALUE obj)
-{
-    if (RTYPEDDATA_P(obj)) {
-        const rb_data_type_t *type = RTYPEDDATA_TYPE(obj);
-        const void *ptr = RTYPEDDATA_DATA(obj);
-        if (ptr && type->function.dsize) {
-            return type->function.dsize(ptr);
-        }
-    }
-    return 0;
-}
-
-const char *
-rb_objspace_data_type_name(VALUE obj)
-{
-    if (RTYPEDDATA_P(obj)) {
-        return RTYPEDDATA_TYPE(obj)->wrap_struct_name;
-    }
-    else {
-        return 0;
-    }
-}
-
-static int
-ptr_in_page_body_p(const void *ptr, const void *memb)
-{
-    struct heap_page *page = *(struct heap_page **)memb;
-    uintptr_t p_body = (uintptr_t)GET_PAGE_BODY(page->start);
-
-    if ((uintptr_t)ptr >= p_body) {
-        return (uintptr_t)ptr < (p_body + HEAP_PAGE_SIZE) ? 0 : 1;
-    }
-    else {
-        return -1;
-    }
-}
-
-PUREFUNC(static inline struct heap_page * heap_page_for_ptr(rb_objspace_t *objspace, uintptr_t ptr);)
-static inline struct heap_page *
-heap_page_for_ptr(rb_objspace_t *objspace, uintptr_t ptr)
-{
-    struct heap_page **res;
-
-    if (ptr < (uintptr_t)heap_pages_lomem ||
-            ptr > (uintptr_t)heap_pages_himem) {
-        return NULL;
-    }
-
-    res = bsearch((void *)ptr, heap_pages_sorted,
-                  (size_t)heap_allocated_pages, sizeof(struct heap_page *),
-                  ptr_in_page_body_p);
-
-    if (res) {
-        return *res;
-    }
-    else {
-        return NULL;
-    }
-}
-
-PUREFUNC(static inline int is_pointer_to_heap(rb_objspace_t *objspace, void *ptr);)
-static inline int
-is_pointer_to_heap(rb_objspace_t *objspace, void *ptr)
-{
-    register uintptr_t p = (uintptr_t)ptr;
-    register struct heap_page *page;
-
-    RB_DEBUG_COUNTER_INC(gc_isptr_trial);
-
-    if (p < heap_pages_lomem || p > heap_pages_himem) return FALSE;
-    RB_DEBUG_COUNTER_INC(gc_isptr_range);
-
-    if (p % BASE_SLOT_SIZE != 0) return FALSE;
-    RB_DEBUG_COUNTER_INC(gc_isptr_align);
-
-    page = heap_page_for_ptr(objspace, (uintptr_t)ptr);
-    if (page) {
-        RB_DEBUG_COUNTER_INC(gc_isptr_maybe);
-        if (page->flags.in_tomb) {
-            return FALSE;
-        }
-        else {
-            if (p < page->start) return FALSE;
-            if (p >= page->start + (page->total_slots * page->slot_size)) return FALSE;
-            if ((NUM_IN_PAGE(p) * BASE_SLOT_SIZE) % page->slot_size != 0) return FALSE;
-
-            return TRUE;
-        }
-    }
-    return FALSE;
-}
-
-static enum rb_id_table_iterator_result
-free_const_entry_i(VALUE value, void *data)
-{
-    rb_const_entry_t *ce = (rb_const_entry_t *)value;
-    xfree(ce);
-    return ID_TABLE_CONTINUE;
-}
-
-void
-rb_free_const_table(struct rb_id_table *tbl)
-{
-    rb_id_table_foreach_values(tbl, free_const_entry_i, 0);
-    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; i<ccs->len; i++) {
-            const struct rb_callcache *cc = ccs->entries[i].cc;
-            if (!alive) {
-                void *ptr = asan_unpoison_object_temporary((VALUE)cc);
-                // 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 {
-                    if (ptr) {
-                        asan_poison_object((VALUE)cc);
-                    }
-                    continue;
-                }
-                if (ptr) {
-                    asan_poison_object((VALUE)cc);
-                }
-            }
-
-            VM_ASSERT(!vm_cc_super_p(cc) && !vm_cc_refinement_p(cc));
-            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; i<ccs->len; i++) {
-            VM_ASSERT(data->klass == ccs->entries[i].cc->klass);
-            VM_ASSERT(vm_cc_check_cme(ccs->entries[i].cc, ccs->cme));
-
-            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(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_values(cc_tbl, cc_table_free_i, &data);
-        rb_id_table_free(cc_tbl);
-    }
-}
-
-static enum rb_id_table_iterator_result
-cvar_table_free_i(VALUE value, void * ctx)
-{
-    xfree((void *) value);
-    return ID_TABLE_CONTINUE;
-}
-
-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)
-{
-    struct RZombie *zombie = RZOMBIE(obj);
-    zombie->basic.flags = T_ZOMBIE | (zombie->basic.flags & FL_SEEN_OBJ_ID);
-    zombie->dfree = dfree;
-    zombie->data = data;
-    VALUE prev, next = heap_pages_deferred_final;
-    do {
-        zombie->next = prev = next;
-        next = RUBY_ATOMIC_VALUE_CAS(heap_pages_deferred_final, prev, obj);
-    } while (next != prev);
-
-    struct heap_page *page = GET_HEAP_PAGE(obj);
-    page->final_slots++;
-    heap_pages_final_slots++;
-}
-
-static inline void
-make_io_zombie(rb_objspace_t *objspace, VALUE obj)
-{
-    rb_io_t *fptr = RANY(obj)->as.file.fptr;
-    make_zombie(objspace, obj, rb_io_fptr_finalize_internal, fptr);
-}
-
-static void
-obj_free_object_id(rb_objspace_t *objspace, VALUE obj)
-{
-    ASSERT_vm_locking();
-    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, &o, &id)) {
-        GC_ASSERT(id);
-        st_delete(objspace->id_to_obj_tbl, &id, NULL);
-    }
-    else {
-        rb_bug("Object ID seen, but not in mapping table: %s", obj_info(obj));
-    }
-}
-
-static bool
-rb_data_free(rb_objspace_t *objspace, VALUE obj)
-{
-    if (DATA_PTR(obj)) {
-        int free_immediately = false;
-        void (*dfree)(void *);
-        void *data = DATA_PTR(obj);
-
-        if (RTYPEDDATA_P(obj)) {
-            free_immediately = (RANY(obj)->as.typeddata.type->flags & RUBY_TYPED_FREE_IMMEDIATELY) != 0;
-            dfree = RANY(obj)->as.typeddata.type->function.dfree;
-        }
-        else {
-            dfree = RANY(obj)->as.data.dfree;
-        }
-
-        if (dfree) {
-            if (dfree == RUBY_DEFAULT_FREE) {
-                xfree(data);
-                RB_DEBUG_COUNTER_INC(obj_data_xfree);
-            }
-            else if (free_immediately) {
-                (*dfree)(data);
-                RB_DEBUG_COUNTER_INC(obj_data_imm_free);
-            }
-            else {
-                RB_DEBUG_COUNTER_INC(obj_data_zombie);
-                make_zombie(objspace, obj, dfree, data);
-                return false;
-            }
-        }
-        else {
-            RB_DEBUG_COUNTER_INC(obj_data_empty);
-        }
-    }
-
-    return true;
-}
-
-static int
-obj_free(rb_objspace_t *objspace, VALUE obj)
-{
-    RB_DEBUG_COUNTER_INC(obj_free);
-    // RUBY_DEBUG_LOG("obj:%p (%s)", (void *)obj, obj_type_name(obj));
-
-    gc_event_hook(objspace, RUBY_INTERNAL_EVENT_FREEOBJ, obj);
-
-    switch (BUILTIN_TYPE(obj)) {
-      case T_NIL:
-      case T_FIXNUM:
-      case T_TRUE:
-      case T_FALSE:
-        rb_bug("obj_free() called for broken object");
-        break;
-      default:
-        break;
-    }
-
-    if (FL_TEST(obj, FL_EXIVAR)) {
-        rb_free_generic_ivar((VALUE)obj);
-        FL_UNSET(obj, FL_EXIVAR);
-    }
-
-    if (FL_TEST(obj, FL_SEEN_OBJ_ID) && !FL_TEST(obj, FL_FINALIZE)) {
-        obj_free_object_id(objspace, obj);
-    }
-
-    if (RVALUE_WB_UNPROTECTED(obj)) CLEAR_IN_BITMAP(GET_HEAP_WB_UNPROTECTED_BITS(obj), obj);
-
-#if RGENGC_CHECK_MODE
-#define CHECK(x) if (x(obj) != FALSE) rb_bug("obj_free: " #x "(%s) != FALSE", obj_info(obj))
-        CHECK(RVALUE_WB_UNPROTECTED);
-        CHECK(RVALUE_MARKED);
-        CHECK(RVALUE_MARKING);
-        CHECK(RVALUE_UNCOLLECTIBLE);
-#undef CHECK
-#endif
-
-    switch (BUILTIN_TYPE(obj)) {
-      case T_OBJECT:
-        if (rb_shape_obj_too_complex(obj)) {
-            RB_DEBUG_COUNTER_INC(obj_obj_too_complex);
-            st_free_table(ROBJECT_IV_HASH(obj));
-        }
-        else if (RANY(obj)->as.basic.flags & ROBJECT_EMBED) {
-            RB_DEBUG_COUNTER_INC(obj_obj_embed);
-        }
-        else {
-            xfree(RANY(obj)->as.object.as.heap.ivptr);
-            RB_DEBUG_COUNTER_INC(obj_obj_ptr);
-        }
-        break;
-      case T_MODULE:
-      case T_CLASS:
-        rb_id_table_free(RCLASS_M_TBL(obj));
-        cc_table_free(objspace, obj, FALSE);
-        if (RCLASS_IVPTR(obj)) {
-            xfree(RCLASS_IVPTR(obj));
-        }
-        if (RCLASS_CONST_TBL(obj)) {
-            rb_free_const_table(RCLASS_CONST_TBL(obj));
-        }
-        if (RCLASS_CVC_TBL(obj)) {
-            rb_id_table_foreach_values(RCLASS_CVC_TBL(obj), cvar_table_free_i, NULL);
-            rb_id_table_free(RCLASS_CVC_TBL(obj));
-        }
-        rb_class_remove_subclass_head(obj);
-        rb_class_remove_from_module_subclasses(obj);
-        rb_class_remove_from_super_subclasses(obj);
-        if (FL_TEST_RAW(obj, RCLASS_SUPERCLASSES_INCLUDE_SELF)) {
-            xfree(RCLASS_SUPERCLASSES(obj));
-        }
-
-        (void)RB_DEBUG_COUNTER_INC_IF(obj_module_ptr, BUILTIN_TYPE(obj) == T_MODULE);
-        (void)RB_DEBUG_COUNTER_INC_IF(obj_class_ptr, BUILTIN_TYPE(obj) == T_CLASS);
-        break;
-      case T_STRING:
-        rb_str_free(obj);
-        break;
-      case T_ARRAY:
-        rb_ary_free(obj);
-        break;
-      case T_HASH:
-#if USE_DEBUG_COUNTER
-        switch (RHASH_SIZE(obj)) {
-          case 0:
-            RB_DEBUG_COUNTER_INC(obj_hash_empty);
-            break;
-          case 1:
-            RB_DEBUG_COUNTER_INC(obj_hash_1);
-            break;
-          case 2:
-            RB_DEBUG_COUNTER_INC(obj_hash_2);
-            break;
-          case 3:
-            RB_DEBUG_COUNTER_INC(obj_hash_3);
-            break;
-          case 4:
-            RB_DEBUG_COUNTER_INC(obj_hash_4);
-            break;
-          case 5:
-          case 6:
-          case 7:
-          case 8:
-            RB_DEBUG_COUNTER_INC(obj_hash_5_8);
-            break;
-          default:
-            GC_ASSERT(RHASH_SIZE(obj) > 8);
-            RB_DEBUG_COUNTER_INC(obj_hash_g8);
-        }
-
-        if (RHASH_AR_TABLE_P(obj)) {
-            if (RHASH_AR_TABLE(obj) == NULL) {
-                RB_DEBUG_COUNTER_INC(obj_hash_null);
-            }
-            else {
-                RB_DEBUG_COUNTER_INC(obj_hash_ar);
-            }
-        }
-        else {
-            RB_DEBUG_COUNTER_INC(obj_hash_st);
-        }
-#endif
-
-        if (RHASH_ST_TABLE_P(obj)) {
-            st_table *tab = RHASH_ST_TABLE(obj);
-
-            free(tab->bins);
-            free(tab->entries);
-        }
-        break;
-      case T_REGEXP:
-        if (RANY(obj)->as.regexp.ptr) {
-            onig_free(RANY(obj)->as.regexp.ptr);
-            RB_DEBUG_COUNTER_INC(obj_regexp_ptr);
-        }
-        break;
-      case T_DATA:
-        if (!rb_data_free(objspace, obj)) return false;
-        break;
-      case T_MATCH:
-        {
-            rb_matchext_t *rm = RMATCH_EXT(obj);
-#if USE_DEBUG_COUNTER
-            if (rm->regs.num_regs >= 8) {
-                RB_DEBUG_COUNTER_INC(obj_match_ge8);
-            }
-            else if (rm->regs.num_regs >= 4) {
-                RB_DEBUG_COUNTER_INC(obj_match_ge4);
-            }
-            else if (rm->regs.num_regs >= 1) {
-                RB_DEBUG_COUNTER_INC(obj_match_under4);
-            }
-#endif
-            onig_region_free(&rm->regs, 0);
-            if (rm->char_offset)
-                xfree(rm->char_offset);
-
-            RB_DEBUG_COUNTER_INC(obj_match_ptr);
-        }
-        break;
-      case T_FILE:
-        if (RANY(obj)->as.file.fptr) {
-            make_io_zombie(objspace, obj);
-            RB_DEBUG_COUNTER_INC(obj_file_ptr);
-            return FALSE;
-        }
-        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:
-        /* Basically , T_ICLASS shares table with the module */
-        if (RICLASS_OWNS_M_TBL_P(obj)) {
-            /* Method table is not shared for origin iclasses of classes */
-            rb_id_table_free(RCLASS_M_TBL(obj));
-        }
-        if (RCLASS_CALLABLE_M_TBL(obj) != NULL) {
-            rb_id_table_free(RCLASS_CALLABLE_M_TBL(obj));
-        }
-        rb_class_remove_subclass_head(obj);
-        cc_table_free(objspace, obj, FALSE);
-        rb_class_remove_from_module_subclasses(obj);
-        rb_class_remove_from_super_subclasses(obj);
-
-        RB_DEBUG_COUNTER_INC(obj_iclass_ptr);
-        break;
-
-      case T_FLOAT:
-        RB_DEBUG_COUNTER_INC(obj_float);
-        break;
-
-      case T_BIGNUM:
-        if (!BIGNUM_EMBED_P(obj) && BIGNUM_DIGITS(obj)) {
-            xfree(BIGNUM_DIGITS(obj));
-            RB_DEBUG_COUNTER_INC(obj_bignum_ptr);
-        }
-        else {
-            RB_DEBUG_COUNTER_INC(obj_bignum_embed);
-        }
-        break;
-
-      case T_NODE:
-        UNEXPECTED_NODE(obj_free);
-        break;
-
-      case T_STRUCT:
-        if ((RBASIC(obj)->flags & RSTRUCT_EMBED_LEN_MASK) ||
-            RANY(obj)->as.rstruct.as.heap.ptr == NULL) {
-            RB_DEBUG_COUNTER_INC(obj_struct_embed);
-        }
-        else {
-            xfree((void *)RANY(obj)->as.rstruct.as.heap.ptr);
-            RB_DEBUG_COUNTER_INC(obj_struct_ptr);
-        }
-        break;
-
-      case T_SYMBOL:
-        {
-            rb_gc_free_dsymbol(obj);
-            RB_DEBUG_COUNTER_INC(obj_symbol);
-        }
-        break;
-
-      case T_IMEMO:
-        switch (imemo_type(obj)) {
-          case imemo_ment:
-            rb_free_method_entry(&RANY(obj)->as.imemo.ment);
-            RB_DEBUG_COUNTER_INC(obj_imemo_ment);
-            break;
-          case imemo_iseq:
-            rb_iseq_free(&RANY(obj)->as.imemo.iseq);
-            RB_DEBUG_COUNTER_INC(obj_imemo_iseq);
-            break;
-          case imemo_env:
-            GC_ASSERT(VM_ENV_ESCAPED_P(RANY(obj)->as.imemo.env.ep));
-            xfree((VALUE *)RANY(obj)->as.imemo.env.env);
-            RB_DEBUG_COUNTER_INC(obj_imemo_env);
-            break;
-          case imemo_tmpbuf:
-            xfree(RANY(obj)->as.imemo.alloc.ptr);
-            RB_DEBUG_COUNTER_INC(obj_imemo_tmpbuf);
-            break;
-          case imemo_ast:
-            rb_ast_free(&RANY(obj)->as.imemo.ast);
-            RB_DEBUG_COUNTER_INC(obj_imemo_ast);
-            break;
-          case imemo_cref:
-            RB_DEBUG_COUNTER_INC(obj_imemo_cref);
-            break;
-          case imemo_svar:
-            RB_DEBUG_COUNTER_INC(obj_imemo_svar);
-            break;
-          case imemo_throw_data:
-            RB_DEBUG_COUNTER_INC(obj_imemo_throw_data);
-            break;
-          case imemo_ifunc:
-            RB_DEBUG_COUNTER_INC(obj_imemo_ifunc);
-            break;
-          case imemo_memo:
-            RB_DEBUG_COUNTER_INC(obj_imemo_memo);
-            break;
-          case imemo_parser_strterm:
-            RB_DEBUG_COUNTER_INC(obj_imemo_parser_strterm);
-            break;
-          case imemo_callinfo:
-            RB_DEBUG_COUNTER_INC(obj_imemo_callinfo);
-            break;
-          case imemo_callcache:
-            RB_DEBUG_COUNTER_INC(obj_imemo_callcache);
-            break;
-          case imemo_constcache:
-            RB_DEBUG_COUNTER_INC(obj_imemo_constcache);
-            break;
-        }
-        return TRUE;
-
-      default:
-        rb_bug("gc_sweep(): unknown data type 0x%x(%p) 0x%"PRIxVALUE,
-               BUILTIN_TYPE(obj), (void*)obj, RBASIC(obj)->flags);
-    }
-
-    if (FL_TEST(obj, FL_FINALIZE)) {
-        make_zombie(objspace, obj, 0, 0);
-        return FALSE;
-    }
-    else {
-        return TRUE;
-    }
-}
-
-
-#define OBJ_ID_INCREMENT (sizeof(RVALUE) / 2)
-#define OBJ_ID_INITIAL (OBJ_ID_INCREMENT * 2)
-
-static int
-object_id_cmp(st_data_t x, st_data_t y)
-{
-    if (RB_BIGNUM_TYPE_P(x)) {
-        return !rb_big_eql(x, y);
-    }
-    else {
-        return x != y;
-    }
-}
-
-static st_index_t
-object_id_hash(st_data_t n)
-{
-    if (RB_BIGNUM_TYPE_P(n)) {
-        return FIX2LONG(rb_big_hash(n));
-    }
-    else {
-        return st_numhash(n);
-    }
-}
-static const struct st_hash_type object_id_hash_type = {
-    object_id_cmp,
-    object_id_hash,
-};
-
-void
-Init_heap(void)
-{
-    rb_objspace_t *objspace = &rb_objspace;
-
-#if defined(INIT_HEAP_PAGE_ALLOC_USE_MMAP)
-    /* Need to determine if we can use mmap at runtime. */
-    heap_page_alloc_use_mmap = INIT_HEAP_PAGE_ALLOC_USE_MMAP;
-#endif
-
-    objspace->next_object_id = INT2FIX(OBJ_ID_INITIAL);
-    objspace->id_to_obj_tbl = st_init_table(&object_id_hash_type);
-    objspace->obj_to_id_tbl = st_init_numtable();
-
-#if RGENGC_ESTIMATE_OLDMALLOC
-    objspace->rgengc.oldmalloc_increase_limit = gc_params.oldmalloc_limit_min;
-#endif
-
-    /* Set size pools allocatable pages. */
-    for (int i = 0; i < SIZE_POOL_COUNT; i++) {
-        rb_size_pool_t *size_pool = &size_pools[i];
-
-        /* Set the default value of size_pool_init_slots. */
-        gc_params.size_pool_init_slots[i] = GC_HEAP_INIT_SLOTS;
-
-        size_pool->allocatable_pages = minimum_pages_for_size_pool(objspace, size_pool);
-    }
-    heap_pages_expand_sorted(objspace);
-
-    init_mark_stack(&objspace->mark_stack);
-
-    objspace->profile.invoke_time = getrusage_time();
-    finalizer_table = st_init_numtable();
-}
-
-void
-Init_gc_stress(void)
-{
-    rb_objspace_t *objspace = &rb_objspace;
-
-    gc_stress_set(objspace, ruby_initial_gc_stress);
-}
-
-typedef int each_obj_callback(void *, void *, size_t, void *);
-
-static void objspace_each_objects(rb_objspace_t *objspace, each_obj_callback *callback, void *data, bool protected);
-static void objspace_reachable_objects_from_root(rb_objspace_t *, void (func)(const char *, VALUE, void *), void *);
-
-struct each_obj_data {
-    rb_objspace_t *objspace;
-    bool reenable_incremental;
-
-    each_obj_callback *callback;
-    void *data;
-
-    struct heap_page **pages[SIZE_POOL_COUNT];
-    size_t pages_counts[SIZE_POOL_COUNT];
-};
-
-static VALUE
-objspace_each_objects_ensure(VALUE arg)
-{
-    struct each_obj_data *data = (struct each_obj_data *)arg;
-    rb_objspace_t *objspace = data->objspace;
-
-    /* Reenable incremental GC */
-    if (data->reenable_incremental) {
-        objspace->flags.dont_incremental = FALSE;
-    }
-
-    for (int i = 0; i < SIZE_POOL_COUNT; i++) {
-        struct heap_page **pages = data->pages[i];
-        free(pages);
-    }
-
-    return Qnil;
-}
-
-static VALUE
-objspace_each_objects_try(VALUE arg)
-{
-    struct each_obj_data *data = (struct each_obj_data *)arg;
-    rb_objspace_t *objspace = data->objspace;
-
-    /* Copy pages from all size_pools to their respective buffers. */
-    for (int i = 0; i < SIZE_POOL_COUNT; i++) {
-        rb_size_pool_t *size_pool = &size_pools[i];
-        size_t size = size_mul_or_raise(SIZE_POOL_EDEN_HEAP(size_pool)->total_pages, sizeof(struct heap_page *), rb_eRuntimeError);
-
-        struct heap_page **pages = malloc(size);
-        if (!pages) rb_memerror();
-
-        /* Set up pages buffer by iterating over all pages in the current eden
-         * heap. This will be a snapshot of the state of the heap before we
-         * call the callback over each page that exists in this buffer. Thus it
-         * is safe for the callback to allocate objects without possibly entering
-         * an infinite loop. */
-        struct heap_page *page = 0;
-        size_t pages_count = 0;
-        ccan_list_for_each(&SIZE_POOL_EDEN_HEAP(size_pool)->pages, page, page_node) {
-            pages[pages_count] = page;
-            pages_count++;
-        }
-        data->pages[i] = pages;
-        data->pages_counts[i] = pages_count;
-        GC_ASSERT(pages_count == SIZE_POOL_EDEN_HEAP(size_pool)->total_pages);
-    }
-
-    for (int i = 0; i < SIZE_POOL_COUNT; i++) {
-        rb_size_pool_t *size_pool = &size_pools[i];
-        size_t pages_count = data->pages_counts[i];
-        struct heap_page **pages = data->pages[i];
-
-        struct heap_page *page = ccan_list_top(&SIZE_POOL_EDEN_HEAP(size_pool)->pages, struct heap_page, page_node);
-        for (size_t i = 0; i < pages_count; i++) {
-            /* If we have reached the end of the linked list then there are no
-             * more pages, so break. */
-            if (page == NULL) break;
-
-            /* If this page does not match the one in the buffer, then move to
-             * the next page in the buffer. */
-            if (pages[i] != page) continue;
-
-            uintptr_t pstart = (uintptr_t)page->start;
-            uintptr_t pend = pstart + (page->total_slots * size_pool->slot_size);
-
-            if (!__asan_region_is_poisoned((void *)pstart, pend - pstart) &&
-                (*data->callback)((void *)pstart, (void *)pend, size_pool->slot_size, data->data)) {
-                break;
-            }
-
-            page = ccan_list_next(&SIZE_POOL_EDEN_HEAP(size_pool)->pages, page, page_node);
-        }
-    }
-
-    return Qnil;
-}
-
-/*
- * rb_objspace_each_objects() is special C API to walk through
- * Ruby object space.  This C API is too difficult to use it.
- * To be frank, you should not use it. Or you need to read the
- * source code of this function and understand what this function does.
- *
- * 'callback' will be called several times (the number of heap page,
- * at current implementation) with:
- *   vstart: a pointer to the first living object of the heap_page.
- *   vend: a pointer to next to the valid heap_page area.
- *   stride: a distance to next VALUE.
- *
- * If callback() returns non-zero, the iteration will be stopped.
- *
- * This is a sample callback code to iterate liveness objects:
- *
- *   static int
- *   sample_callback(void *vstart, void *vend, int stride, void *data)
- *   {
- *       VALUE v = (VALUE)vstart;
- *       for (; v != (VALUE)vend; v += stride) {
- *           if (!rb_objspace_internal_object_p(v)) { // liveness check
- *               // do something with live object 'v'
- *           }
- *       }
- *       return 0; // continue to iteration
- *   }
- *
- * Note: 'vstart' is not a top of heap_page.  This point the first
- *       living object to grasp at least one object to avoid GC issue.
- *       This means that you can not walk through all Ruby object page
- *       including freed object page.
- *
- * Note: On this implementation, 'stride' is the same as sizeof(RVALUE).
- *       However, there are possibilities to pass variable values with
- *       'stride' with some reasons.  You must use stride instead of
- *       use some constant value in the iteration.
- */
-void
-rb_objspace_each_objects(each_obj_callback *callback, void *data)
-{
-    objspace_each_objects(&rb_objspace, callback, data, TRUE);
-}
-
-static void
-objspace_each_objects(rb_objspace_t *objspace, each_obj_callback *callback, void *data, bool protected)
-{
-    /* Disable incremental GC */
-    bool reenable_incremental = FALSE;
-    if (protected) {
-        reenable_incremental = !objspace->flags.dont_incremental;
-
-        gc_rest(objspace);
-        objspace->flags.dont_incremental = TRUE;
-    }
-
-    struct each_obj_data each_obj_data = {
-        .objspace = objspace,
-        .reenable_incremental = reenable_incremental,
-
-        .callback = callback,
-        .data = data,
-
-        .pages = {NULL},
-        .pages_counts = {0},
-    };
-    rb_ensure(objspace_each_objects_try, (VALUE)&each_obj_data,
-              objspace_each_objects_ensure, (VALUE)&each_obj_data);
-}
-
-void
-rb_objspace_each_objects_without_setup(each_obj_callback *callback, void *data)
-{
-    objspace_each_objects(&rb_objspace, callback, data, FALSE);
-}
-
-struct os_each_struct {
-    size_t num;
-    VALUE of;
-};
-
-static int
-internal_object_p(VALUE obj)
-{
-    RVALUE *p = (RVALUE *)obj;
-    void *ptr = asan_unpoison_object_temporary(obj);
-    bool used_p = p->as.basic.flags;
-
-    if (used_p) {
-        switch (BUILTIN_TYPE(obj)) {
-          case T_NODE:
-            UNEXPECTED_NODE(internal_object_p);
-            break;
-          case T_NONE:
-          case T_MOVED:
-          case T_IMEMO:
-          case T_ICLASS:
-          case T_ZOMBIE:
-            break;
-          case T_CLASS:
-            if (!p->as.basic.klass) break;
-            if (FL_TEST(obj, FL_SINGLETON)) {
-                return rb_singleton_class_internal_p(obj);
-            }
-            return 0;
-          default:
-            if (!p->as.basic.klass) break;
-            return 0;
-        }
-    }
-    if (ptr || ! used_p) {
-        asan_poison_object(obj);
-    }
-    return 1;
-}
-
-int
-rb_objspace_internal_object_p(VALUE obj)
-{
-    return internal_object_p(obj);
-}
-
-static int
-os_obj_of_i(void *vstart, void *vend, size_t stride, void *data)
-{
-    struct os_each_struct *oes = (struct os_each_struct *)data;
-
-    VALUE v = (VALUE)vstart;
-    for (; v != (VALUE)vend; v += stride) {
-        if (!internal_object_p(v)) {
-            if (!oes->of || rb_obj_is_kind_of(v, oes->of)) {
-                if (!rb_multi_ractor_p() || rb_ractor_shareable_p(v)) {
-                    rb_yield(v);
-                    oes->num++;
-                }
-            }
-        }
-    }
-
-    return 0;
-}
-
-static VALUE
-os_obj_of(VALUE of)
-{
-    struct os_each_struct oes;
-
-    oes.num = 0;
-    oes.of = of;
-    rb_objspace_each_objects(os_obj_of_i, &oes);
-    return SIZET2NUM(oes.num);
-}
-
-/*
- *  call-seq:
- *     ObjectSpace.each_object([module]) {|obj| ... } -> integer
- *     ObjectSpace.each_object([module])              -> an_enumerator
- *
- *  Calls the block once for each living, nonimmediate object in this
- *  Ruby process. If <i>module</i> is specified, calls the block
- *  for only those classes or modules that match (or are a subclass of)
- *  <i>module</i>. Returns the number of objects found. Immediate
- *  objects (<code>Fixnum</code>s, <code>Symbol</code>s
- *  <code>true</code>, <code>false</code>, and <code>nil</code>) are
- *  never returned. In the example below, #each_object returns both
- *  the numbers we defined and several constants defined in the Math
- *  module.
- *
- *  If no block is given, an enumerator is returned instead.
- *
- *     a = 102.7
- *     b = 95       # Won't be returned
- *     c = 12345678987654321
- *     count = ObjectSpace.each_object(Numeric) {|x| p x }
- *     puts "Total count: #{count}"
- *
- *  <em>produces:</em>
- *
- *     12345678987654321
- *     102.7
- *     2.71828182845905
- *     3.14159265358979
- *     2.22044604925031e-16
- *     1.7976931348623157e+308
- *     2.2250738585072e-308
- *     Total count: 7
- *
- */
-
-static VALUE
-os_each_obj(int argc, VALUE *argv, VALUE os)
-{
-    VALUE of;
-
-    of = (!rb_check_arity(argc, 0, 1) ? 0 : argv[0]);
-    RETURN_ENUMERATOR(os, 1, &of);
-    return os_obj_of(of);
-}
-
-/*
- *  call-seq:
- *     ObjectSpace.undefine_finalizer(obj)
- *
- *  Removes all finalizers for <i>obj</i>.
- *
- */
-
-static VALUE
-undefine_final(VALUE os, VALUE obj)
-{
-    return rb_undefine_finalizer(obj);
-}
-
-VALUE
-rb_undefine_finalizer(VALUE obj)
-{
-    rb_objspace_t *objspace = &rb_objspace;
-    st_data_t data = obj;
-    rb_check_frozen(obj);
-    st_delete(finalizer_table, &data, 0);
-    FL_UNSET(obj, FL_FINALIZE);
-    return obj;
-}
-
-static void
-should_be_callable(VALUE block)
-{
-    if (!rb_obj_respond_to(block, idCall, TRUE)) {
-        rb_raise(rb_eArgError, "wrong type argument %"PRIsVALUE" (should be callable)",
-                 rb_obj_class(block));
-    }
-}
-
-static void
-should_be_finalizable(VALUE obj)
-{
-    if (!FL_ABLE(obj)) {
-        rb_raise(rb_eArgError, "cannot define finalizer for %s",
-                 rb_obj_classname(obj));
-    }
-    rb_check_frozen(obj);
-}
-
-VALUE
-rb_define_finalizer_no_check(VALUE obj, VALUE block)
-{
-    rb_objspace_t *objspace = &rb_objspace;
-    VALUE table;
-    st_data_t data;
-
-    RBASIC(obj)->flags |= FL_FINALIZE;
-
-    if (st_lookup(finalizer_table, obj, &data)) {
-        table = (VALUE)data;
-
-        /* avoid duplicate block, table is usually small */
-        {
-            long len = RARRAY_LEN(table);
-            long i;
-
-            for (i = 0; i < len; i++) {
-                VALUE recv = RARRAY_AREF(table, i);
-                if (rb_equal(recv, block)) {
-                    block = recv;
-                    goto end;
-                }
-            }
-        }
-
-        rb_ary_push(table, block);
-    }
-    else {
-        table = rb_ary_new3(1, block);
-        RBASIC_CLEAR_CLASS(table);
-        st_add_direct(finalizer_table, obj, table);
-    }
-  end:
-    block = rb_ary_new3(2, INT2FIX(0), block);
-    OBJ_FREEZE(block);
-    return block;
-}
-
-/*
- *  call-seq:
- *     ObjectSpace.define_finalizer(obj, aProc=proc())
- *
- *  Adds <i>aProc</i> as a finalizer, to be called after <i>obj</i>
- *  was destroyed. The object ID of the <i>obj</i> will be passed
- *  as an argument to <i>aProc</i>. If <i>aProc</i> is a lambda or
- *  method, make sure it can be called with a single argument.
- *
- *  The return value is an array <code>[0, aProc]</code>.
- *
- *  The two recommended patterns are to either create the finaliser proc
- *  in a non-instance method where it can safely capture the needed state,
- *  or to use a custom callable object that stores the needed state
- *  explicitly as instance variables.
- *
- *      class Foo
- *        def initialize(data_needed_for_finalization)
- *          ObjectSpace.define_finalizer(self, self.class.create_finalizer(data_needed_for_finalization))
- *        end
- *
- *        def self.create_finalizer(data_needed_for_finalization)
- *          proc {
- *            puts "finalizing #{data_needed_for_finalization}"
- *          }
- *        end
- *      end
- *
- *      class Bar
- *       class Remover
- *          def initialize(data_needed_for_finalization)
- *            @data_needed_for_finalization = data_needed_for_finalization
- *          end
- *
- *          def call(id)
- *            puts "finalizing #{@data_needed_for_finalization}"
- *          end
- *        end
- *
- *        def initialize(data_needed_for_finalization)
- *          ObjectSpace.define_finalizer(self, Remover.new(data_needed_for_finalization))
- *        end
- *      end
- *
- *  Note that if your finalizer references the object to be
- *  finalized it will never be run on GC, although it will still be
- *  run at exit. You will get a warning if you capture the object
- *  to be finalized as the receiver of the finalizer.
- *
- *      class CapturesSelf
- *        def initialize(name)
- *          ObjectSpace.define_finalizer(self, proc {
- *            # this finalizer will only be run on exit
- *            puts "finalizing #{name}"
- *          })
- *        end
- *      end
- *
- *  Also note that finalization can be unpredictable and is never guaranteed
- *  to be run except on exit.
- */
-
-static VALUE
-define_final(int argc, VALUE *argv, VALUE os)
-{
-    VALUE obj, block;
-
-    rb_scan_args(argc, argv, "11", &obj, &block);
-    should_be_finalizable(obj);
-    if (argc == 1) {
-        block = rb_block_proc();
-    }
-    else {
-        should_be_callable(block);
-    }
-
-    if (rb_callable_receiver(block) == obj) {
-        rb_warn("finalizer references object to be finalized");
-    }
-
-    return rb_define_finalizer_no_check(obj, block);
-}
-
-VALUE
-rb_define_finalizer(VALUE obj, VALUE block)
-{
-    should_be_finalizable(obj);
-    should_be_callable(block);
-    return rb_define_finalizer_no_check(obj, block);
-}
-
-void
-rb_gc_copy_finalizer(VALUE dest, VALUE obj)
-{
-    rb_objspace_t *objspace = &rb_objspace;
-    VALUE table;
-    st_data_t data;
-
-    if (!FL_TEST(obj, FL_FINALIZE)) return;
-    if (st_lookup(finalizer_table, obj, &data)) {
-        table = (VALUE)data;
-        st_insert(finalizer_table, dest, table);
-    }
-    FL_SET(dest, FL_FINALIZE);
-}
-
-static VALUE
-run_single_final(VALUE cmd, VALUE objid)
-{
-    return rb_check_funcall(cmd, idCall, 1, &objid);
-}
-
-static void
-warn_exception_in_finalizer(rb_execution_context_t *ec, VALUE final)
-{
-    if (!UNDEF_P(final) && !NIL_P(ruby_verbose)) {
-        VALUE errinfo = ec->errinfo;
-        rb_warn("Exception in finalizer %+"PRIsVALUE, final);
-        rb_ec_error_print(ec, errinfo);
-    }
-}
-
-static void
-run_finalizer(rb_objspace_t *objspace, VALUE obj, VALUE table)
-{
-    long i;
-    enum ruby_tag_type state;
-    volatile struct {
-        VALUE errinfo;
-        VALUE objid;
-        VALUE final;
-        rb_control_frame_t *cfp;
-        long finished;
-    } saved;
-    rb_execution_context_t * volatile ec = GET_EC();
-#define RESTORE_FINALIZER() (\
-        ec->cfp = saved.cfp, \
-        ec->errinfo = saved.errinfo)
-
-    saved.errinfo = ec->errinfo;
-    saved.objid = rb_obj_id(obj);
-    saved.cfp = ec->cfp;
-    saved.finished = 0;
-    saved.final = Qundef;
-
-    EC_PUSH_TAG(ec);
-    state = EC_EXEC_TAG();
-    if (state != TAG_NONE) {
-        ++saved.finished;	/* skip failed finalizer */
-        warn_exception_in_finalizer(ec, ATOMIC_VALUE_EXCHANGE(saved.final, Qundef));
-    }
-    for (i = saved.finished;
-         RESTORE_FINALIZER(), i<RARRAY_LEN(table);
-         saved.finished = ++i) {
-        run_single_final(saved.final = RARRAY_AREF(table, i), saved.objid);
-    }
-    EC_POP_TAG();
-#undef RESTORE_FINALIZER
-}
-
-static void
-run_final(rb_objspace_t *objspace, VALUE zombie)
-{
-    st_data_t key, table;
-
-    if (RZOMBIE(zombie)->dfree) {
-        RZOMBIE(zombie)->dfree(RZOMBIE(zombie)->data);
-    }
-
-    key = (st_data_t)zombie;
-    if (st_delete(finalizer_table, &key, &table)) {
-        run_finalizer(objspace, zombie, (VALUE)table);
-    }
-}
-
-static void
-finalize_list(rb_objspace_t *objspace, VALUE zombie)
-{
-    while (zombie) {
-        VALUE next_zombie;
-        struct heap_page *page;
-        asan_unpoison_object(zombie, false);
-        next_zombie = RZOMBIE(zombie)->next;
-        page = GET_HEAP_PAGE(zombie);
-
-        run_final(objspace, zombie);
-
-        RB_VM_LOCK_ENTER();
-        {
-            GC_ASSERT(BUILTIN_TYPE(zombie) == T_ZOMBIE);
-            if (FL_TEST(zombie, FL_SEEN_OBJ_ID)) {
-                obj_free_object_id(objspace, zombie);
-            }
-
-            GC_ASSERT(heap_pages_final_slots > 0);
-            GC_ASSERT(page->final_slots > 0);
-
-            heap_pages_final_slots--;
-            page->final_slots--;
-            page->free_slots++;
-            heap_page_add_freeobj(objspace, page, zombie);
-            page->size_pool->total_freed_objects++;
-        }
-        RB_VM_LOCK_LEAVE();
-
-        zombie = next_zombie;
-    }
-}
-
-static void
-finalize_deferred_heap_pages(rb_objspace_t *objspace)
-{
-    VALUE zombie;
-    while ((zombie = ATOMIC_VALUE_EXCHANGE(heap_pages_deferred_final, 0)) != 0) {
-        finalize_list(objspace, zombie);
-    }
-}
-
-static void
-finalize_deferred(rb_objspace_t *objspace)
-{
-    rb_execution_context_t *ec = GET_EC();
-    ec->interrupt_mask |= PENDING_INTERRUPT_MASK;
-    finalize_deferred_heap_pages(objspace);
-    ec->interrupt_mask &= ~PENDING_INTERRUPT_MASK;
-}
-
-static void
-gc_finalize_deferred(void *dmy)
-{
-    rb_objspace_t *objspace = dmy;
-    if (ATOMIC_EXCHANGE(finalizing, 1)) return;
-
-    finalize_deferred(objspace);
-    ATOMIC_SET(finalizing, 0);
-}
-
-static void
-gc_finalize_deferred_register(rb_objspace_t *objspace)
-{
-    if (rb_postponed_job_register_one(0, gc_finalize_deferred, objspace) == 0) {
-        rb_bug("gc_finalize_deferred_register: can't register finalizer.");
-    }
-}
-
-struct force_finalize_list {
-    VALUE obj;
-    VALUE table;
-    struct force_finalize_list *next;
-};
-
-static int
-force_chain_object(st_data_t key, st_data_t val, st_data_t arg)
-{
-    struct force_finalize_list **prev = (struct force_finalize_list **)arg;
-    struct force_finalize_list *curr = ALLOC(struct force_finalize_list);
-    curr->obj = key;
-    curr->table = val;
-    curr->next = *prev;
-    *prev = curr;
-    return ST_CONTINUE;
-}
-
-bool rb_obj_is_main_ractor(VALUE gv);
-
-void
-rb_objspace_call_finalizer(rb_objspace_t *objspace)
-{
-    size_t i;
-
-#if RGENGC_CHECK_MODE >= 2
-    gc_verify_internal_consistency(objspace);
-#endif
-    gc_rest(objspace);
-
-    if (ATOMIC_EXCHANGE(finalizing, 1)) return;
-
-    /* run finalizers */
-    finalize_deferred(objspace);
-    GC_ASSERT(heap_pages_deferred_final == 0);
-
-    gc_rest(objspace);
-    /* prohibit incremental GC */
-    objspace->flags.dont_incremental = 1;
-
-    /* force to run finalizer */
-    while (finalizer_table->num_entries) {
-        struct force_finalize_list *list = 0;
-        st_foreach(finalizer_table, force_chain_object, (st_data_t)&list);
-        while (list) {
-            struct force_finalize_list *curr = list;
-            st_data_t obj = (st_data_t)curr->obj;
-            run_finalizer(objspace, curr->obj, curr->table);
-            st_delete(finalizer_table, &obj, 0);
-            list = curr->next;
-            xfree(curr);
-        }
-    }
-
-    /* prohibit GC because force T_DATA finalizers can break an object graph consistency */
-    dont_gc_on();
-
-    /* running data/file finalizers are part of garbage collection */
-    unsigned int lock_lev;
-    gc_enter(objspace, gc_enter_event_finalizer, &lock_lev);
-
-    /* run data/file object's finalizers */
-    for (i = 0; i < heap_allocated_pages; i++) {
-        struct heap_page *page = heap_pages_sorted[i];
-        short stride = page->slot_size;
-
-        uintptr_t p = (uintptr_t)page->start;
-        uintptr_t pend = p + page->total_slots * stride;
-        for (; p < pend; p += stride) {
-            VALUE vp = (VALUE)p;
-            void *poisoned = asan_unpoison_object_temporary(vp);
-            switch (BUILTIN_TYPE(vp)) {
-              case T_DATA:
-                if (!DATA_PTR(p) || !RANY(p)->as.data.dfree) break;
-                if (rb_obj_is_thread(vp)) break;
-                if (rb_obj_is_mutex(vp)) break;
-                if (rb_obj_is_fiber(vp)) break;
-                if (rb_obj_is_main_ractor(vp)) break;
-
-                rb_data_free(objspace, vp);
-                break;
-              case T_FILE:
-                if (RANY(p)->as.file.fptr) {
-                    make_io_zombie(objspace, vp);
-                }
-                break;
-              default:
-                break;
-            }
-            if (poisoned) {
-                GC_ASSERT(BUILTIN_TYPE(vp) == T_NONE);
-                asan_poison_object(vp);
-            }
-        }
-    }
-
-    gc_exit(objspace, gc_enter_event_finalizer, &lock_lev);
-
-    finalize_deferred_heap_pages(objspace);
-
-    st_free_table(finalizer_table);
-    finalizer_table = 0;
-    ATOMIC_SET(finalizing, 0);
-}
-
-static inline int
-is_swept_object(VALUE ptr)
-{
-    struct heap_page *page = GET_HEAP_PAGE(ptr);
-    return page->flags.before_sweep ? FALSE : TRUE;
-}
-
-/* garbage objects will be collected soon. */
-static inline int
-is_garbage_object(rb_objspace_t *objspace, VALUE ptr)
-{
-    if (!is_lazy_sweeping(objspace) ||
-        is_swept_object(ptr) ||
-        MARKED_IN_BITMAP(GET_HEAP_MARK_BITS(ptr), ptr)) {
-
-        return FALSE;
-    }
-    else {
-        return TRUE;
-    }
-}
-
-static inline int
-is_live_object(rb_objspace_t *objspace, VALUE ptr)
-{
-    switch (BUILTIN_TYPE(ptr)) {
-      case T_NONE:
-      case T_MOVED:
-      case T_ZOMBIE:
-        return FALSE;
-      default:
-        break;
-    }
-
-    if (!is_garbage_object(objspace, ptr)) {
-        return TRUE;
-    }
-    else {
-        return FALSE;
-    }
-}
-
-static inline int
-is_markable_object(VALUE obj)
-{
-    if (rb_special_const_p(obj)) return FALSE; /* special const is not markable */
-    check_rvalue_consistency(obj);
-    return TRUE;
-}
-
-int
-rb_objspace_markable_object_p(VALUE obj)
-{
-    rb_objspace_t *objspace = &rb_objspace;
-    return is_markable_object(obj) && is_live_object(objspace, obj);
-}
-
-int
-rb_objspace_garbage_object_p(VALUE obj)
-{
-    rb_objspace_t *objspace = &rb_objspace;
-    return is_garbage_object(objspace, obj);
-}
-
-bool
-rb_gc_is_ptr_to_obj(void *ptr)
-{
-    rb_objspace_t *objspace = &rb_objspace;
-    return is_pointer_to_heap(objspace, ptr);
-}
-
-VALUE
-rb_gc_id2ref_obj_tbl(VALUE objid)
-{
-    rb_objspace_t *objspace = &rb_objspace;
-
-    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
- *
- *  Converts an object id to a reference to the object. May not be
- *  called on an object id passed as a parameter to a finalizer.
- *
- *     s = "I am a string"                    #=> "I am a string"
- *     r = ObjectSpace._id2ref(s.object_id)   #=> "I am a string"
- *     r == s                                 #=> true
- *
- *  On multi-ractor mode, if the object is not shareable, it raises
- *  RangeError.
- */
-
-static VALUE
-id2ref(VALUE objid)
-{
-#if SIZEOF_LONG == SIZEOF_VOIDP
-#define NUM2PTR(x) NUM2ULONG(x)
-#elif SIZEOF_LONG_LONG == SIZEOF_VOIDP
-#define NUM2PTR(x) NUM2ULL(x)
-#endif
-    rb_objspace_t *objspace = &rb_objspace;
-    VALUE ptr;
-    VALUE orig;
-    void *p0;
-
-    objid = rb_to_int(objid);
-    if (FIXNUM_P(objid) || rb_big_size(objid) <= SIZEOF_VOIDP) {
-        ptr = NUM2PTR(objid);
-        if (ptr == Qtrue) return Qtrue;
-        if (ptr == Qfalse) return Qfalse;
-        if (NIL_P(ptr)) return Qnil;
-        if (FIXNUM_P(ptr)) return (VALUE)ptr;
-        if (FLONUM_P(ptr)) return (VALUE)ptr;
-
-        ptr = obj_id_to_ref(objid);
-        if ((ptr % sizeof(RVALUE)) == (4 << 2)) {
-            ID symid = ptr / sizeof(RVALUE);
-            p0 = (void *)ptr;
-            if (!rb_static_id_valid_p(symid))
-                rb_raise(rb_eRangeError, "%p is not symbol id value", p0);
-            return ID2SYM(symid);
-        }
-    }
-
-    if (!UNDEF_P(orig = rb_gc_id2ref_obj_tbl(objid)) &&
-        is_live_object(objspace, orig)) {
-
-        if (!rb_multi_ractor_p() || rb_ractor_shareable_p(orig)) {
-            return orig;
-        }
-        else {
-            rb_raise(rb_eRangeError, "%+"PRIsVALUE" is id of the unshareable object on multi-ractor", rb_int2str(objid, 10));
-        }
-    }
-
-    if (rb_int_ge(objid, objspace->next_object_id)) {
-        rb_raise(rb_eRangeError, "%+"PRIsVALUE" is not id value", rb_int2str(objid, 10));
-    }
-    else {
-        rb_raise(rb_eRangeError, "%+"PRIsVALUE" is recycled object", rb_int2str(objid, 10));
-    }
-}
-
-/* :nodoc: */
-static VALUE
-os_id2ref(VALUE os, VALUE objid)
-{
-    return id2ref(objid);
-}
-
-static VALUE
-rb_find_object_id(VALUE obj, VALUE (*get_heap_object_id)(VALUE))
-{
-    if (STATIC_SYM_P(obj)) {
-        return (SYM2ID(obj) * sizeof(RVALUE) + (4 << 2)) | FIXNUM_FLAG;
-    }
-    else if (FLONUM_P(obj)) {
-#if SIZEOF_LONG == SIZEOF_VOIDP
-        return LONG2NUM((SIGNED_VALUE)obj);
-#else
-        return LL2NUM((SIGNED_VALUE)obj);
-#endif
-    }
-    else if (SPECIAL_CONST_P(obj)) {
-        return LONG2NUM((SIGNED_VALUE)obj);
-    }
-
-    return get_heap_object_id(obj);
-}
-
-static VALUE
-cached_object_id(VALUE obj)
-{
-    VALUE id;
-    rb_objspace_t *objspace = &rb_objspace;
-
-    RB_VM_LOCK_ENTER();
-    if (st_lookup(objspace->obj_to_id_tbl, (st_data_t)obj, &id)) {
-        GC_ASSERT(FL_TEST(obj, FL_SEEN_OBJ_ID));
-    }
-    else {
-        GC_ASSERT(!FL_TEST(obj, FL_SEEN_OBJ_ID));
-
-        id = objspace->next_object_id;
-        objspace->next_object_id = rb_int_plus(id, INT2FIX(OBJ_ID_INCREMENT));
-
-        VALUE already_disabled = rb_gc_disable_no_rest();
-        st_insert(objspace->obj_to_id_tbl, (st_data_t)obj, (st_data_t)id);
-        st_insert(objspace->id_to_obj_tbl, (st_data_t)id, (st_data_t)obj);
-        if (already_disabled == Qfalse) rb_objspace_gc_enable(objspace);
-        FL_SET(obj, FL_SEEN_OBJ_ID);
-    }
-    RB_VM_LOCK_LEAVE();
-
-    return id;
-}
-
-static VALUE
-nonspecial_obj_id(VALUE obj)
-{
-#if SIZEOF_LONG == SIZEOF_VOIDP
-    return (VALUE)((SIGNED_VALUE)(obj)|FIXNUM_FLAG);
-#elif SIZEOF_LONG_LONG == SIZEOF_VOIDP
-    return LL2NUM((SIGNED_VALUE)(obj) / 2);
-#else
-# error not supported
-#endif
-}
-
-VALUE
-rb_memory_id(VALUE obj)
-{
-    return rb_find_object_id(obj, nonspecial_obj_id);
-}
-
-/*
- *  Document-method: __id__
- *  Document-method: object_id
- *
- *  call-seq:
- *     obj.__id__       -> integer
- *     obj.object_id    -> integer
- *
- *  Returns an integer identifier for +obj+.
- *
- *  The same number will be returned on all calls to +object_id+ for a given
- *  object, and no two active objects will share an id.
- *
- *  Note: that some objects of builtin classes are reused for optimization.
- *  This is the case for immediate values and frozen string literals.
- *
- *  BasicObject implements +__id__+, Kernel implements +object_id+.
- *
- *  Immediate values are not passed by reference but are passed by value:
- *  +nil+, +true+, +false+, Fixnums, Symbols, and some Floats.
- *
- *      Object.new.object_id  == Object.new.object_id  # => false
- *      (21 * 2).object_id    == (21 * 2).object_id    # => true
- *      "hello".object_id     == "hello".object_id     # => false
- *      "hi".freeze.object_id == "hi".freeze.object_id # => true
- */
-
-VALUE
-rb_obj_id(VALUE obj)
-{
-    /*
-     *                32-bit VALUE space
-     *          MSB ------------------------ LSB
-     *  false   00000000000000000000000000000000
-     *  true    00000000000000000000000000000010
-     *  nil     00000000000000000000000000000100
-     *  undef   00000000000000000000000000000110
-     *  symbol  ssssssssssssssssssssssss00001110
-     *  object  oooooooooooooooooooooooooooooo00        = 0 (mod sizeof(RVALUE))
-     *  fixnum  fffffffffffffffffffffffffffffff1
-     *
-     *                    object_id space
-     *                                       LSB
-     *  false   00000000000000000000000000000000
-     *  true    00000000000000000000000000000010
-     *  nil     00000000000000000000000000000100
-     *  undef   00000000000000000000000000000110
-     *  symbol   000SSSSSSSSSSSSSSSSSSSSSSSSSSS0        S...S % A = 4 (S...S = s...s * A + 4)
-     *  object   oooooooooooooooooooooooooooooo0        o...o % A = 0
-     *  fixnum  fffffffffffffffffffffffffffffff1        bignum if required
-     *
-     *  where A = sizeof(RVALUE)/4
-     *
-     *  sizeof(RVALUE) is
-     *  20 if 32-bit, double is 4-byte aligned
-     *  24 if 32-bit, double is 8-byte aligned
-     *  40 if 64-bit
-     */
-
-    return rb_find_object_id(obj, cached_object_id);
-}
-
-static enum rb_id_table_iterator_result
-cc_table_memsize_i(VALUE ccs_ptr, void *data_ptr)
-{
-    size_t *total_size = data_ptr;
-    struct rb_class_cc_entries *ccs = (struct rb_class_cc_entries *)ccs_ptr;
-    *total_size += sizeof(*ccs);
-    *total_size += sizeof(ccs->entries[0]) * ccs->capa;
-    return ID_TABLE_CONTINUE;
-}
-
-static size_t
-cc_table_memsize(struct rb_id_table *cc_table)
-{
-    size_t total = rb_id_table_memsize(cc_table);
-    rb_id_table_foreach_values(cc_table, cc_table_memsize_i, &total);
-    return total;
-}
-
-static size_t
-obj_memsize_of(VALUE obj, int use_all_types)
-{
-    size_t size = 0;
-
-    if (SPECIAL_CONST_P(obj)) {
-        return 0;
-    }
-
-    if (FL_TEST(obj, FL_EXIVAR)) {
-        size += rb_generic_ivar_memsize(obj);
-    }
-
-    switch (BUILTIN_TYPE(obj)) {
-      case T_OBJECT:
-        if (rb_shape_obj_too_complex(obj)) {
-            size += rb_st_memsize(ROBJECT_IV_HASH(obj));
-        }
-        else if (!(RBASIC(obj)->flags & ROBJECT_EMBED)) {
-            size += ROBJECT_IV_CAPACITY(obj) * sizeof(VALUE);
-        }
-        break;
-      case T_MODULE:
-      case T_CLASS:
-        if (RCLASS_EXT(obj)) {
-            if (RCLASS_M_TBL(obj)) {
-                size += rb_id_table_memsize(RCLASS_M_TBL(obj));
-            }
-            // class IV sizes are allocated as powers of two
-            size += SIZEOF_VALUE << bit_length(RCLASS_IV_COUNT(obj));
-            if (RCLASS_CVC_TBL(obj)) {
-                size += rb_id_table_memsize(RCLASS_CVC_TBL(obj));
-            }
-            if (RCLASS_EXT(obj)->const_tbl) {
-                size += rb_id_table_memsize(RCLASS_EXT(obj)->const_tbl);
-            }
-            if (RCLASS_CC_TBL(obj)) {
-                size += cc_table_memsize(RCLASS_CC_TBL(obj));
-            }
-            if (FL_TEST_RAW(obj, RCLASS_SUPERCLASSES_INCLUDE_SELF)) {
-                size += (RCLASS_SUPERCLASS_DEPTH(obj) + 1) * sizeof(VALUE);
-            }
-        }
-        break;
-      case T_ICLASS:
-        if (RICLASS_OWNS_M_TBL_P(obj)) {
-            if (RCLASS_M_TBL(obj)) {
-                size += rb_id_table_memsize(RCLASS_M_TBL(obj));
-            }
-        }
-        if (RCLASS_EXT(obj) && RCLASS_CC_TBL(obj)) {
-            size += cc_table_memsize(RCLASS_CC_TBL(obj));
-        }
-        break;
-      case T_STRING:
-        size += rb_str_memsize(obj);
-        break;
-      case T_ARRAY:
-        size += rb_ary_memsize(obj);
-        break;
-      case T_HASH:
-        if (RHASH_ST_TABLE_P(obj)) {
-            VM_ASSERT(RHASH_ST_TABLE(obj) != NULL);
-            /* st_table is in the slot */
-            size += st_memsize(RHASH_ST_TABLE(obj)) - sizeof(st_table);
-        }
-        break;
-      case T_REGEXP:
-        if (RREGEXP_PTR(obj)) {
-            size += onig_memsize(RREGEXP_PTR(obj));
-        }
-        break;
-      case T_DATA:
-        if (use_all_types) size += rb_objspace_data_type_memsize(obj);
-        break;
-      case T_MATCH:
-        {
-            rb_matchext_t *rm = RMATCH_EXT(obj);
-            size += onig_region_memsize(&rm->regs);
-            size += sizeof(struct rmatch_offset) * rm->char_offset_num_allocated;
-        }
-        break;
-      case T_FILE:
-        if (RFILE(obj)->fptr) {
-            size += rb_io_memsize(RFILE(obj)->fptr);
-        }
-        break;
-      case T_RATIONAL:
-      case T_COMPLEX:
-        break;
-      case T_IMEMO:
-        size += imemo_memsize(obj);
-        break;
-
-      case T_FLOAT:
-      case T_SYMBOL:
-        break;
-
-      case T_BIGNUM:
-        if (!(RBASIC(obj)->flags & BIGNUM_EMBED_FLAG) && BIGNUM_DIGITS(obj)) {
-            size += BIGNUM_LEN(obj) * sizeof(BDIGIT);
-        }
-        break;
-
-      case T_NODE:
-        UNEXPECTED_NODE(obj_memsize_of);
-        break;
-
-      case T_STRUCT:
-        if ((RBASIC(obj)->flags & RSTRUCT_EMBED_LEN_MASK) == 0 &&
-            RSTRUCT(obj)->as.heap.ptr) {
-            size += sizeof(VALUE) * RSTRUCT_LEN(obj);
-        }
-        break;
-
-      case T_ZOMBIE:
-      case T_MOVED:
-        break;
-
-      default:
-        rb_bug("objspace/memsize_of(): unknown data type 0x%x(%p)",
-               BUILTIN_TYPE(obj), (void*)obj);
-    }
-
-    return size + rb_gc_obj_slot_size(obj);
-}
-
-size_t
-rb_obj_memsize_of(VALUE obj)
-{
-    return obj_memsize_of(obj, TRUE);
-}
-
-static int
-set_zero(st_data_t key, st_data_t val, st_data_t arg)
-{
-    VALUE k = (VALUE)key;
-    VALUE hash = (VALUE)arg;
-    rb_hash_aset(hash, k, INT2FIX(0));
-    return ST_CONTINUE;
-}
-
-static VALUE
-type_sym(size_t type)
-{
-    switch (type) {
-#define COUNT_TYPE(t) case (t): return ID2SYM(rb_intern(#t)); break;
-        COUNT_TYPE(T_NONE);
-        COUNT_TYPE(T_OBJECT);
-        COUNT_TYPE(T_CLASS);
-        COUNT_TYPE(T_MODULE);
-        COUNT_TYPE(T_FLOAT);
-        COUNT_TYPE(T_STRING);
-        COUNT_TYPE(T_REGEXP);
-        COUNT_TYPE(T_ARRAY);
-        COUNT_TYPE(T_HASH);
-        COUNT_TYPE(T_STRUCT);
-        COUNT_TYPE(T_BIGNUM);
-        COUNT_TYPE(T_FILE);
-        COUNT_TYPE(T_DATA);
-        COUNT_TYPE(T_MATCH);
-        COUNT_TYPE(T_COMPLEX);
-        COUNT_TYPE(T_RATIONAL);
-        COUNT_TYPE(T_NIL);
-        COUNT_TYPE(T_TRUE);
-        COUNT_TYPE(T_FALSE);
-        COUNT_TYPE(T_SYMBOL);
-        COUNT_TYPE(T_FIXNUM);
-        COUNT_TYPE(T_IMEMO);
-        COUNT_TYPE(T_UNDEF);
-        COUNT_TYPE(T_NODE);
-        COUNT_TYPE(T_ICLASS);
-        COUNT_TYPE(T_ZOMBIE);
-        COUNT_TYPE(T_MOVED);
-#undef COUNT_TYPE
-        default:              return SIZET2NUM(type); break;
-    }
-}
-
-/*
- *  call-seq:
- *     ObjectSpace.count_objects([result_hash]) -> hash
- *
- *  Counts all objects grouped by type.
- *
- *  It returns a hash, such as:
- *	{
- *	  :TOTAL=>10000,
- *	  :FREE=>3011,
- *	  :T_OBJECT=>6,
- *	  :T_CLASS=>404,
- *	  # ...
- *	}
- *
- *  The contents of the returned hash are implementation specific.
- *  It may be changed in future.
- *
- *  The keys starting with +:T_+ means live objects.
- *  For example, +:T_ARRAY+ is the number of arrays.
- *  +:FREE+ means object slots which is not used now.
- *  +:TOTAL+ means sum of above.
- *
- *  If the optional argument +result_hash+ is given,
- *  it is overwritten and returned. This is intended to avoid probe effect.
- *
- *    h = {}
- *    ObjectSpace.count_objects(h)
- *    puts h
- *    # => { :TOTAL=>10000, :T_CLASS=>158280, :T_MODULE=>20672, :T_STRING=>527249 }
- *
- *  This method is only expected to work on C Ruby.
- *
- */
-
-static VALUE
-count_objects(int argc, VALUE *argv, VALUE os)
-{
-    rb_objspace_t *objspace = &rb_objspace;
-    size_t counts[T_MASK+1];
-    size_t freed = 0;
-    size_t total = 0;
-    size_t i;
-    VALUE hash = Qnil;
-
-    if (rb_check_arity(argc, 0, 1) == 1) {
-        hash = argv[0];
-        if (!RB_TYPE_P(hash, T_HASH))
-            rb_raise(rb_eTypeError, "non-hash given");
-    }
-
-    for (i = 0; i <= T_MASK; i++) {
-        counts[i] = 0;
-    }
-
-    for (i = 0; i < heap_allocated_pages; i++) {
-        struct heap_page *page = heap_pages_sorted[i];
-        short stride = page->slot_size;
-
-        uintptr_t p = (uintptr_t)page->start;
-        uintptr_t pend = p + page->total_slots * stride;
-        for (;p < pend; p += stride) {
-            VALUE vp = (VALUE)p;
-            GC_ASSERT((NUM_IN_PAGE(vp) * BASE_SLOT_SIZE) % page->slot_size == 0);
-
-            void *poisoned = asan_unpoison_object_temporary(vp);
-            if (RANY(p)->as.basic.flags) {
-                counts[BUILTIN_TYPE(vp)]++;
-            }
-            else {
-                freed++;
-            }
-            if (poisoned) {
-                GC_ASSERT(BUILTIN_TYPE(vp) == T_NONE);
-                asan_poison_object(vp);
-            }
-        }
-        total += page->total_slots;
-    }
-
-    if (NIL_P(hash)) {
-        hash = rb_hash_new();
-    }
-    else if (!RHASH_EMPTY_P(hash)) {
-        rb_hash_stlike_foreach(hash, set_zero, hash);
-    }
-    rb_hash_aset(hash, ID2SYM(rb_intern("TOTAL")), SIZET2NUM(total));
-    rb_hash_aset(hash, ID2SYM(rb_intern("FREE")), SIZET2NUM(freed));
-
-    for (i = 0; i <= T_MASK; i++) {
-        VALUE type = type_sym(i);
-        if (counts[i])
-            rb_hash_aset(hash, type, SIZET2NUM(counts[i]));
-    }
-
-    return hash;
-}
-
-/*
-  ------------------------ Garbage Collection ------------------------
-*/
-
-/* Sweeping */
-
-static size_t
-objspace_available_slots(rb_objspace_t *objspace)
-{
-    size_t total_slots = 0;
-    for (int i = 0; i < SIZE_POOL_COUNT; i++) {
-        rb_size_pool_t *size_pool = &size_pools[i];
-        total_slots += SIZE_POOL_EDEN_HEAP(size_pool)->total_slots;
-        total_slots += SIZE_POOL_TOMB_HEAP(size_pool)->total_slots;
-    }
-    return total_slots;
-}
-
-static size_t
-objspace_live_slots(rb_objspace_t *objspace)
-{
-    return total_allocated_objects(objspace) - total_freed_objects(objspace) - heap_pages_final_slots;
-}
-
-static size_t
-objspace_free_slots(rb_objspace_t *objspace)
-{
-    return objspace_available_slots(objspace) - objspace_live_slots(objspace) - heap_pages_final_slots;
-}
-
-static void
-gc_setup_mark_bits(struct heap_page *page)
-{
-    /* copy oldgen bitmap to mark bitmap */
-    memcpy(&page->mark_bits[0], &page->uncollectible_bits[0], HEAP_PAGE_BITMAP_SIZE);
-}
-
-static int gc_is_moveable_obj(rb_objspace_t *objspace, VALUE obj);
-static VALUE gc_move(rb_objspace_t *objspace, VALUE scan, VALUE free, size_t src_slot_size, size_t slot_size);
-
-#if defined(_WIN32)
-enum {HEAP_PAGE_LOCK = PAGE_NOACCESS, HEAP_PAGE_UNLOCK = PAGE_READWRITE};
-
-static BOOL
-protect_page_body(struct heap_page_body *body, DWORD protect)
-{
-    DWORD old_protect;
-    return VirtualProtect(body, HEAP_PAGE_SIZE, protect, &old_protect) != 0;
-}
-#else
-enum {HEAP_PAGE_LOCK = PROT_NONE, HEAP_PAGE_UNLOCK = PROT_READ | PROT_WRITE};
-#define protect_page_body(body, protect) !mprotect((body), HEAP_PAGE_SIZE, (protect))
-#endif
-
-static void
-lock_page_body(rb_objspace_t *objspace, struct heap_page_body *body)
-{
-    if (!protect_page_body(body, HEAP_PAGE_LOCK)) {
-        rb_bug("Couldn't protect page %p, errno: %s", (void *)body, strerror(errno));
-    }
-    else {
-        gc_report(5, objspace, "Protecting page in move %p\n", (void *)body);
-    }
-}
-
-static void
-unlock_page_body(rb_objspace_t *objspace, struct heap_page_body *body)
-{
-    if (!protect_page_body(body, HEAP_PAGE_UNLOCK)) {
-        rb_bug("Couldn't unprotect page %p, errno: %s", (void *)body, strerror(errno));
-    }
-    else {
-        gc_report(5, objspace, "Unprotecting page in move %p\n", (void *)body);
-    }
-}
-
-static bool
-try_move(rb_objspace_t *objspace, rb_heap_t *heap, struct heap_page *free_page, VALUE src)
-{
-    GC_ASSERT(gc_is_moveable_obj(objspace, src));
-
-    struct heap_page *src_page = GET_HEAP_PAGE(src);
-    if (!free_page) {
-        return false;
-    }
-
-    /* We should return true if either src is successfully moved, or src is
-     * unmoveable. A false return will cause the sweeping cursor to be
-     * incremented to the next page, and src will attempt to move again */
-    GC_ASSERT(MARKED_IN_BITMAP(GET_HEAP_MARK_BITS(src), src));
-
-    asan_unlock_freelist(free_page);
-    VALUE dest = (VALUE)free_page->freelist;
-    asan_lock_freelist(free_page);
-    asan_unpoison_object(dest, false);
-    if (!dest) {
-        /* if we can't get something from the freelist then the page must be
-         * full */
-        return false;
-    }
-    free_page->freelist = RANY(dest)->as.free.next;
-
-    GC_ASSERT(RB_BUILTIN_TYPE(dest) == T_NONE);
-
-    if (src_page->slot_size > free_page->slot_size) {
-        objspace->rcompactor.moved_down_count_table[BUILTIN_TYPE(src)]++;
-    }
-    else if (free_page->slot_size > src_page->slot_size) {
-        objspace->rcompactor.moved_up_count_table[BUILTIN_TYPE(src)]++;
-    }
-    objspace->rcompactor.moved_count_table[BUILTIN_TYPE(src)]++;
-    objspace->rcompactor.total_moved++;
-
-    gc_move(objspace, src, dest, src_page->slot_size, free_page->slot_size);
-    gc_pin(objspace, src);
-    free_page->free_slots--;
-
-    return true;
-}
-
-static void
-gc_unprotect_pages(rb_objspace_t *objspace, rb_heap_t *heap)
-{
-    struct heap_page *cursor = heap->compact_cursor;
-
-    while (cursor) {
-        unlock_page_body(objspace, GET_PAGE_BODY(cursor->start));
-        cursor = ccan_list_next(&heap->pages, cursor, page_node);
-    }
-}
-
-static void gc_update_references(rb_objspace_t * objspace);
-#if GC_CAN_COMPILE_COMPACTION
-static void invalidate_moved_page(rb_objspace_t *objspace, struct heap_page *page);
-#endif
-
-#if defined(__MINGW32__) || defined(_WIN32)
-# define GC_COMPACTION_SUPPORTED 1
-#else
-/* If not MinGW, Windows, or does not have mmap, we cannot use mprotect for
- * the read barrier, so we must disable compaction. */
-# define GC_COMPACTION_SUPPORTED (GC_CAN_COMPILE_COMPACTION && HEAP_PAGE_ALLOC_USE_MMAP)
-#endif
-
-#if GC_CAN_COMPILE_COMPACTION
-static void
-read_barrier_handler(uintptr_t original_address)
-{
-    VALUE obj;
-    rb_objspace_t * objspace = &rb_objspace;
-
-    /* Calculate address aligned to slots. */
-    uintptr_t address = original_address - (original_address % BASE_SLOT_SIZE);
-
-    obj = (VALUE)address;
-
-    struct heap_page_body *page_body = GET_PAGE_BODY(obj);
-
-    /* If the page_body is NULL, then mprotect cannot handle it and will crash
-     * with "Cannot allocate memory". */
-    if (page_body == NULL) {
-        rb_bug("read_barrier_handler: segmentation fault at %p", (void *)original_address);
-    }
-
-    RB_VM_LOCK_ENTER();
-    {
-        unlock_page_body(objspace, page_body);
-
-        objspace->profile.read_barrier_faults++;
-
-        invalidate_moved_page(objspace, GET_HEAP_PAGE(obj));
-    }
-    RB_VM_LOCK_LEAVE();
-}
-#endif
-
-#if !GC_CAN_COMPILE_COMPACTION
-static void
-uninstall_handlers(void)
-{
-    /* no-op */
-}
-
-static void
-install_handlers(void)
-{
-    /* no-op */
-}
-#elif defined(_WIN32)
-static LPTOP_LEVEL_EXCEPTION_FILTER old_handler;
-typedef void (*signal_handler)(int);
-static signal_handler old_sigsegv_handler;
-
-static LONG WINAPI
-read_barrier_signal(EXCEPTION_POINTERS * info)
-{
-    /* EXCEPTION_ACCESS_VIOLATION is what's raised by access to protected pages */
-    if (info->ExceptionRecord->ExceptionCode == EXCEPTION_ACCESS_VIOLATION) {
-        /* > The second array element specifies the virtual address of the inaccessible data.
-         * https://docs.microsoft.com/en-us/windows/win32/api/winnt/ns-winnt-exception_record
-         *
-         * Use this address to invalidate the page */
-        read_barrier_handler((uintptr_t)info->ExceptionRecord->ExceptionInformation[1]);
-        return EXCEPTION_CONTINUE_EXECUTION;
-    }
-    else {
-        return EXCEPTION_CONTINUE_SEARCH;
-    }
-}
-
-static void
-uninstall_handlers(void)
-{
-    signal(SIGSEGV, old_sigsegv_handler);
-    SetUnhandledExceptionFilter(old_handler);
-}
-
-static void
-install_handlers(void)
-{
-    /* Remove SEGV handler so that the Unhandled Exception Filter handles it */
-    old_sigsegv_handler = signal(SIGSEGV, NULL);
-    /* Unhandled Exception Filter has access to the violation address similar
-     * to si_addr from sigaction */
-    old_handler = SetUnhandledExceptionFilter(read_barrier_signal);
-}
-#else
-static struct sigaction old_sigbus_handler;
-static struct sigaction old_sigsegv_handler;
-
-#ifdef HAVE_MACH_TASK_EXCEPTION_PORTS
-static exception_mask_t old_exception_masks[32];
-static mach_port_t old_exception_ports[32];
-static exception_behavior_t old_exception_behaviors[32];
-static thread_state_flavor_t old_exception_flavors[32];
-static mach_msg_type_number_t old_exception_count;
-
-static void
-disable_mach_bad_access_exc(void)
-{
-    old_exception_count = sizeof(old_exception_masks) / sizeof(old_exception_masks[0]);
-    task_swap_exception_ports(
-        mach_task_self(), EXC_MASK_BAD_ACCESS,
-        MACH_PORT_NULL, EXCEPTION_DEFAULT, 0,
-        old_exception_masks, &old_exception_count,
-        old_exception_ports, old_exception_behaviors, old_exception_flavors
-    );
-}
-
-static void
-restore_mach_bad_access_exc(void)
-{
-    for (mach_msg_type_number_t i = 0; i < old_exception_count; i++) {
-        task_set_exception_ports(
-            mach_task_self(),
-            old_exception_masks[i], old_exception_ports[i],
-            old_exception_behaviors[i], old_exception_flavors[i]
-        );
-    }
-}
-#endif
-
-static void
-read_barrier_signal(int sig, siginfo_t * info, void * data)
-{
-    // setup SEGV/BUS handlers for errors
-    struct sigaction prev_sigbus, prev_sigsegv;
-    sigaction(SIGBUS, &old_sigbus_handler, &prev_sigbus);
-    sigaction(SIGSEGV, &old_sigsegv_handler, &prev_sigsegv);
-
-    // enable SIGBUS/SEGV
-    sigset_t set, prev_set;
-    sigemptyset(&set);
-    sigaddset(&set, SIGBUS);
-    sigaddset(&set, SIGSEGV);
-    sigprocmask(SIG_UNBLOCK, &set, &prev_set);
-#ifdef HAVE_MACH_TASK_EXCEPTION_PORTS
-    disable_mach_bad_access_exc();
-#endif
-    // run handler
-    read_barrier_handler((uintptr_t)info->si_addr);
-
-    // reset SEGV/BUS handlers
-#ifdef HAVE_MACH_TASK_EXCEPTION_PORTS
-    restore_mach_bad_access_exc();
-#endif
-    sigaction(SIGBUS, &prev_sigbus, NULL);
-    sigaction(SIGSEGV, &prev_sigsegv, NULL);
-    sigprocmask(SIG_SETMASK, &prev_set, NULL);
-}
-
-static void
-uninstall_handlers(void)
-{
-#ifdef HAVE_MACH_TASK_EXCEPTION_PORTS
-    restore_mach_bad_access_exc();
-#endif
-    sigaction(SIGBUS, &old_sigbus_handler, NULL);
-    sigaction(SIGSEGV, &old_sigsegv_handler, NULL);
-}
-
-static void
-install_handlers(void)
-{
-    struct sigaction action;
-    memset(&action, 0, sizeof(struct sigaction));
-    sigemptyset(&action.sa_mask);
-    action.sa_sigaction = read_barrier_signal;
-    action.sa_flags = SA_SIGINFO | SA_ONSTACK;
-
-    sigaction(SIGBUS, &action, &old_sigbus_handler);
-    sigaction(SIGSEGV, &action, &old_sigsegv_handler);
-#ifdef HAVE_MACH_TASK_EXCEPTION_PORTS
-    disable_mach_bad_access_exc();
-#endif
-}
-#endif
-
-static void
-gc_compact_finish(rb_objspace_t *objspace)
-{
-    for (int i = 0; i < SIZE_POOL_COUNT; i++) {
-        rb_size_pool_t *size_pool = &size_pools[i];
-        rb_heap_t *heap = SIZE_POOL_EDEN_HEAP(size_pool);
-        gc_unprotect_pages(objspace, heap);
-    }
-
-    uninstall_handlers();
-
-    gc_update_references(objspace);
-    objspace->profile.compact_count++;
-
-    for (int i = 0; i < SIZE_POOL_COUNT; i++) {
-        rb_size_pool_t *size_pool = &size_pools[i];
-        rb_heap_t *heap = SIZE_POOL_EDEN_HEAP(size_pool);
-        heap->compact_cursor = NULL;
-        heap->free_pages = NULL;
-        heap->compact_cursor_index = 0;
-    }
-
-    if (gc_prof_enabled(objspace)) {
-        gc_profile_record *record = gc_prof_record(objspace);
-        record->moved_objects = objspace->rcompactor.total_moved - record->moved_objects;
-    }
-    objspace->flags.during_compacting = FALSE;
-}
-
-struct gc_sweep_context {
-    struct heap_page *page;
-    int final_slots;
-    int freed_slots;
-    int empty_slots;
-};
-
-static inline void
-gc_sweep_plane(rb_objspace_t *objspace, rb_heap_t *heap, uintptr_t p, bits_t bitset, struct gc_sweep_context *ctx)
-{
-    struct heap_page * sweep_page = ctx->page;
-    short slot_size = sweep_page->slot_size;
-    short slot_bits = slot_size / BASE_SLOT_SIZE;
-    GC_ASSERT(slot_bits > 0);
-
-    do {
-        VALUE vp = (VALUE)p;
-        GC_ASSERT(vp % BASE_SLOT_SIZE == 0);
-
-        asan_unpoison_object(vp, false);
-        if (bitset & 1) {
-            switch (BUILTIN_TYPE(vp)) {
-                default: /* majority case */
-                    gc_report(2, objspace, "page_sweep: free %p\n", (void *)p);
-#if RGENGC_CHECK_MODE
-                    if (!is_full_marking(objspace)) {
-                        if (RVALUE_OLD_P(vp)) rb_bug("page_sweep: %p - old while minor GC.", (void *)p);
-                        if (RVALUE_REMEMBERED(vp)) rb_bug("page_sweep: %p - remembered.", (void *)p);
-                    }
-#endif
-                    if (obj_free(objspace, vp)) {
-                        // always add free slots back to the swept pages freelist,
-                        // so that if we're comapacting, we can re-use the slots
-                        (void)VALGRIND_MAKE_MEM_UNDEFINED((void*)p, BASE_SLOT_SIZE);
-                        heap_page_add_freeobj(objspace, sweep_page, vp);
-                        gc_report(3, objspace, "page_sweep: %s is added to freelist\n", obj_info(vp));
-                        ctx->freed_slots++;
-                    }
-                    else {
-                        ctx->final_slots++;
-                    }
-                    break;
-
-                case T_MOVED:
-                    if (objspace->flags.during_compacting) {
-                        /* The sweep cursor shouldn't have made it to any
-                         * T_MOVED slots while the compact flag is enabled.
-                         * The sweep cursor and compact cursor move in
-                         * opposite directions, and when they meet references will
-                         * get updated and "during_compacting" should get disabled */
-                        rb_bug("T_MOVED shouldn't be seen until compaction is finished");
-                    }
-                    gc_report(3, objspace, "page_sweep: %s is added to freelist\n", obj_info(vp));
-                    ctx->empty_slots++;
-                    heap_page_add_freeobj(objspace, sweep_page, vp);
-                    break;
-                case T_ZOMBIE:
-                    /* already counted */
-                    break;
-                case T_NONE:
-                    ctx->empty_slots++; /* already freed */
-                    break;
-            }
-        }
-        p += slot_size;
-        bitset >>= slot_bits;
-    } while (bitset);
-}
-
-static inline void
-gc_sweep_page(rb_objspace_t *objspace, rb_heap_t *heap, struct gc_sweep_context *ctx)
-{
-    struct heap_page *sweep_page = ctx->page;
-    GC_ASSERT(SIZE_POOL_EDEN_HEAP(sweep_page->size_pool) == heap);
-
-    uintptr_t p;
-    bits_t *bits, bitset;
-
-    gc_report(2, objspace, "page_sweep: start.\n");
-
-#if RGENGC_CHECK_MODE
-    if (!objspace->flags.immediate_sweep) {
-        GC_ASSERT(sweep_page->flags.before_sweep == TRUE);
-    }
-#endif
-    sweep_page->flags.before_sweep = FALSE;
-    sweep_page->free_slots = 0;
-
-    p = (uintptr_t)sweep_page->start;
-    bits = sweep_page->mark_bits;
-
-    int page_rvalue_count = sweep_page->total_slots * (sweep_page->slot_size / BASE_SLOT_SIZE);
-    int out_of_range_bits = (NUM_IN_PAGE(p) + page_rvalue_count) % BITS_BITLENGTH;
-    if (out_of_range_bits != 0) { // sizeof(RVALUE) == 64
-        bits[BITMAP_INDEX(p) + page_rvalue_count / BITS_BITLENGTH] |= ~(((bits_t)1 << out_of_range_bits) - 1);
-    }
-
-    /* The last bitmap plane may not be used if the last plane does not
-     * have enough space for the slot_size. In that case, the last plane must
-     * be skipped since none of the bits will be set. */
-    int bitmap_plane_count = CEILDIV(NUM_IN_PAGE(p) + page_rvalue_count, BITS_BITLENGTH);
-    GC_ASSERT(bitmap_plane_count == HEAP_PAGE_BITMAP_LIMIT - 1 ||
-                  bitmap_plane_count == HEAP_PAGE_BITMAP_LIMIT);
-
-    // Skip out of range slots at the head of the page
-    bitset = ~bits[0];
-    bitset >>= NUM_IN_PAGE(p);
-    if (bitset) {
-        gc_sweep_plane(objspace, heap, p, bitset, ctx);
-    }
-    p += (BITS_BITLENGTH - NUM_IN_PAGE(p)) * BASE_SLOT_SIZE;
-
-    for (int i = 1; i < bitmap_plane_count; i++) {
-        bitset = ~bits[i];
-        if (bitset) {
-            gc_sweep_plane(objspace, heap, p, bitset, ctx);
-        }
-        p += BITS_BITLENGTH * BASE_SLOT_SIZE;
-    }
-
-    if (!heap->compact_cursor) {
-        gc_setup_mark_bits(sweep_page);
-    }
-
-#if GC_PROFILE_MORE_DETAIL
-    if (gc_prof_enabled(objspace)) {
-        gc_profile_record *record = gc_prof_record(objspace);
-        record->removing_objects += ctx->final_slots + ctx->freed_slots;
-        record->empty_objects += ctx->empty_slots;
-    }
-#endif
-    if (0) fprintf(stderr, "gc_sweep_page(%"PRIdSIZE"): total_slots: %d, freed_slots: %d, empty_slots: %d, final_slots: %d\n",
-                   rb_gc_count(),
-                   sweep_page->total_slots,
-                   ctx->freed_slots, ctx->empty_slots, ctx->final_slots);
-
-    sweep_page->free_slots += ctx->freed_slots + ctx->empty_slots;
-    sweep_page->size_pool->total_freed_objects += ctx->freed_slots;
-
-    if (heap_pages_deferred_final && !finalizing) {
-        rb_thread_t *th = GET_THREAD();
-        if (th) {
-            gc_finalize_deferred_register(objspace);
-        }
-    }
-
-#if RGENGC_CHECK_MODE
-    short freelist_len = 0;
-    asan_unlock_freelist(sweep_page);
-    RVALUE *ptr = sweep_page->freelist;
-    while (ptr) {
-        freelist_len++;
-        ptr = ptr->as.free.next;
-    }
-    asan_lock_freelist(sweep_page);
-    if (freelist_len != sweep_page->free_slots) {
-        rb_bug("inconsistent freelist length: expected %d but was %d", sweep_page->free_slots, freelist_len);
-    }
-#endif
-
-    gc_report(2, objspace, "page_sweep: end.\n");
-}
-
-static const char *
-gc_mode_name(enum gc_mode mode)
-{
-    switch (mode) {
-      case gc_mode_none: return "none";
-      case gc_mode_marking: return "marking";
-      case gc_mode_sweeping: return "sweeping";
-      case gc_mode_compacting: return "compacting";
-      default: rb_bug("gc_mode_name: unknown mode: %d", (int)mode);
-    }
-}
-
-static void
-gc_mode_transition(rb_objspace_t *objspace, enum gc_mode mode)
-{
-#if RGENGC_CHECK_MODE
-    enum gc_mode prev_mode = gc_mode(objspace);
-    switch (prev_mode) {
-      case gc_mode_none:     GC_ASSERT(mode == gc_mode_marking); break;
-      case gc_mode_marking:  GC_ASSERT(mode == gc_mode_sweeping); break;
-      case gc_mode_sweeping: GC_ASSERT(mode == gc_mode_none || mode == gc_mode_compacting); break;
-      case gc_mode_compacting: GC_ASSERT(mode == gc_mode_none); break;
-    }
-#endif
-    if (0) fprintf(stderr, "gc_mode_transition: %s->%s\n", gc_mode_name(gc_mode(objspace)), gc_mode_name(mode));
-    gc_mode_set(objspace, mode);
-}
-
-static void
-heap_page_freelist_append(struct heap_page *page, RVALUE *freelist)
-{
-    if (freelist) {
-        asan_unlock_freelist(page);
-        if (page->freelist) {
-            RVALUE *p = page->freelist;
-            asan_unpoison_object((VALUE)p, false);
-            while (p->as.free.next) {
-                RVALUE *prev = p;
-                p = p->as.free.next;
-                asan_poison_object((VALUE)prev);
-                asan_unpoison_object((VALUE)p, false);
-            }
-            p->as.free.next = freelist;
-            asan_poison_object((VALUE)p);
-        }
-        else {
-            page->freelist = freelist;
-        }
-        asan_lock_freelist(page);
-    }
-}
-
-static void
-gc_sweep_start_heap(rb_objspace_t *objspace, rb_heap_t *heap)
-{
-    heap->sweeping_page = ccan_list_top(&heap->pages, struct heap_page, page_node);
-    heap->free_pages = NULL;
-    heap->pooled_pages = NULL;
-    if (!objspace->flags.immediate_sweep) {
-        struct heap_page *page = NULL;
-
-        ccan_list_for_each(&heap->pages, page, page_node) {
-            page->flags.before_sweep = TRUE;
-        }
-    }
-}
-
-#if defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ == 4
-__attribute__((noinline))
-#endif
-static void
-gc_sweep_start(rb_objspace_t *objspace)
-{
-    gc_mode_transition(objspace, gc_mode_sweeping);
-    objspace->rincgc.pooled_slots = 0;
-
-    for (int i = 0; i < SIZE_POOL_COUNT; i++) {
-        rb_size_pool_t *size_pool = &size_pools[i];
-        rb_heap_t *heap = SIZE_POOL_EDEN_HEAP(size_pool);
-
-        gc_sweep_start_heap(objspace, heap);
-
-        /* We should call gc_sweep_finish_size_pool for size pools with no pages. */
-        if (heap->sweeping_page == NULL) {
-            GC_ASSERT(heap->total_pages == 0);
-            GC_ASSERT(heap->total_slots == 0);
-            gc_sweep_finish_size_pool(objspace, size_pool);
-        }
-    }
-
-    rb_ractor_t *r = NULL;
-    ccan_list_for_each(&GET_VM()->ractor.set, r, vmlr_node) {
-        rb_gc_ractor_newobj_cache_clear(&r->newobj_cache);
-    }
-}
-
-static void
-gc_sweep_finish_size_pool(rb_objspace_t *objspace, rb_size_pool_t *size_pool)
-{
-    rb_heap_t *heap = SIZE_POOL_EDEN_HEAP(size_pool);
-    size_t total_slots = heap->total_slots + SIZE_POOL_TOMB_HEAP(size_pool)->total_slots;
-    size_t total_pages = heap->total_pages + SIZE_POOL_TOMB_HEAP(size_pool)->total_pages;
-    size_t swept_slots = size_pool->freed_slots + size_pool->empty_slots;
-
-    size_t init_slots = gc_params.size_pool_init_slots[size_pool - size_pools];
-    size_t min_free_slots = (size_t)(MAX(total_slots, init_slots) * gc_params.heap_free_slots_min_ratio);
-
-    /* If we don't have enough slots and we have pages on the tomb heap, move
-     * pages from the tomb heap to the eden heap. This may prevent page
-     * creation thrashing (frequently allocating and deallocting pages) and
-     * GC thrashing (running GC more frequently than required). */
-    struct heap_page *resurrected_page;
-    while (swept_slots < min_free_slots &&
-            (resurrected_page = heap_page_resurrect(objspace, size_pool))) {
-        swept_slots += resurrected_page->free_slots;
-
-        heap_add_page(objspace, size_pool, heap, resurrected_page);
-        heap_add_freepage(heap, resurrected_page);
-    }
-
-    if (swept_slots < min_free_slots) {
-        bool grow_heap = is_full_marking(objspace);
-
-        /* Consider growing or starting a major GC if we are not currently in a
-         * major GC and we can't allocate any more pages. */
-        if (!is_full_marking(objspace) && size_pool->allocatable_pages == 0) {
-            /* The heap is a growth heap if it freed more slots than had empty slots. */
-            bool is_growth_heap = size_pool->empty_slots == 0 || size_pool->freed_slots > size_pool->empty_slots;
-
-            /* Grow this heap if we haven't run at least RVALUE_OLD_AGE minor
-             * GC since the last major GC or if this heap is smaller than the
-             * the configured initial size. */
-            if (objspace->profile.count - objspace->rgengc.last_major_gc < RVALUE_OLD_AGE ||
-                    total_slots < init_slots) {
-                grow_heap = TRUE;
-            }
-            else if (is_growth_heap) { /* Only growth heaps are allowed to start a major GC. */
-                objspace->rgengc.need_major_gc |= GPR_FLAG_MAJOR_BY_NOFREE;
-                size_pool->force_major_gc_count++;
-            }
-        }
-
-        if (grow_heap) {
-            size_t extend_page_count = heap_extend_pages(objspace, size_pool, swept_slots, total_slots, total_pages);
-
-            if (extend_page_count > size_pool->allocatable_pages) {
-                size_pool_allocatable_pages_set(objspace, size_pool, extend_page_count);
-            }
-        }
-    }
-}
-
-static void
-gc_sweep_finish(rb_objspace_t *objspace)
-{
-    gc_report(1, objspace, "gc_sweep_finish\n");
-
-    gc_prof_set_heap_info(objspace);
-    heap_pages_free_unused_pages(objspace);
-
-    for (int i = 0; i < SIZE_POOL_COUNT; i++) {
-        rb_size_pool_t *size_pool = &size_pools[i];
-
-        /* if heap_pages has unused pages, then assign them to increment */
-        size_t tomb_pages = SIZE_POOL_TOMB_HEAP(size_pool)->total_pages;
-        if (size_pool->allocatable_pages < tomb_pages) {
-            size_pool->allocatable_pages = tomb_pages;
-        }
-
-        size_pool->freed_slots = 0;
-        size_pool->empty_slots = 0;
-
-        if (!will_be_incremental_marking(objspace)) {
-            rb_heap_t *eden_heap = SIZE_POOL_EDEN_HEAP(size_pool);
-            struct heap_page *end_page = eden_heap->free_pages;
-            if (end_page) {
-                while (end_page->free_next) end_page = end_page->free_next;
-                end_page->free_next = eden_heap->pooled_pages;
-            }
-            else {
-                eden_heap->free_pages = eden_heap->pooled_pages;
-            }
-            eden_heap->pooled_pages = NULL;
-            objspace->rincgc.pooled_slots = 0;
-        }
-    }
-    heap_pages_expand_sorted(objspace);
-
-    gc_event_hook(objspace, RUBY_INTERNAL_EVENT_GC_END_SWEEP, 0);
-    gc_mode_transition(objspace, gc_mode_none);
-
-#if RGENGC_CHECK_MODE >= 2
-    gc_verify_internal_consistency(objspace);
-#endif
-}
-
-static int
-gc_sweep_step(rb_objspace_t *objspace, rb_size_pool_t *size_pool, rb_heap_t *heap)
-{
-    struct heap_page *sweep_page = heap->sweeping_page;
-    int unlink_limit = GC_SWEEP_PAGES_FREEABLE_PER_STEP;
-    int swept_slots = 0;
-    int pooled_slots = 0;
-
-    if (sweep_page == NULL) return FALSE;
-
-#if GC_ENABLE_LAZY_SWEEP
-    gc_prof_sweep_timer_start(objspace);
-#endif
-
-    do {
-        RUBY_DEBUG_LOG("sweep_page:%p", (void *)sweep_page);
-
-        struct gc_sweep_context ctx = {
-            .page = sweep_page,
-            .final_slots = 0,
-            .freed_slots = 0,
-            .empty_slots = 0,
-        };
-        gc_sweep_page(objspace, heap, &ctx);
-        int free_slots = ctx.freed_slots + ctx.empty_slots;
-
-        heap->sweeping_page = ccan_list_next(&heap->pages, sweep_page, page_node);
-
-        if (sweep_page->final_slots + free_slots == sweep_page->total_slots &&
-            heap_pages_freeable_pages > 0 &&
-            unlink_limit > 0) {
-            heap_pages_freeable_pages--;
-            unlink_limit--;
-            /* there are no living objects -> move this page to tomb heap */
-            heap_unlink_page(objspace, heap, sweep_page);
-            heap_add_page(objspace, size_pool, SIZE_POOL_TOMB_HEAP(size_pool), sweep_page);
-        }
-        else if (free_slots > 0) {
-            size_pool->freed_slots += ctx.freed_slots;
-            size_pool->empty_slots += ctx.empty_slots;
-
-            if (pooled_slots < GC_INCREMENTAL_SWEEP_POOL_SLOT_COUT) {
-                heap_add_poolpage(objspace, heap, sweep_page);
-                pooled_slots += free_slots;
-            }
-            else {
-                heap_add_freepage(heap, sweep_page);
-                swept_slots += free_slots;
-                if (swept_slots > GC_INCREMENTAL_SWEEP_SLOT_COUNT) {
-                    break;
-                }
-            }
-        }
-        else {
-            sweep_page->free_next = NULL;
-        }
-    } while ((sweep_page = heap->sweeping_page));
-
-    if (!heap->sweeping_page) {
-        gc_sweep_finish_size_pool(objspace, size_pool);
-
-        if (!has_sweeping_pages(objspace)) {
-            gc_sweep_finish(objspace);
-        }
-    }
-
-#if GC_ENABLE_LAZY_SWEEP
-    gc_prof_sweep_timer_stop(objspace);
-#endif
-
-    return heap->free_pages != NULL;
-}
-
-static void
-gc_sweep_rest(rb_objspace_t *objspace)
-{
-    for (int i = 0; i < SIZE_POOL_COUNT; i++) {
-        rb_size_pool_t *size_pool = &size_pools[i];
-
-        while (SIZE_POOL_EDEN_HEAP(size_pool)->sweeping_page) {
-            gc_sweep_step(objspace, size_pool, SIZE_POOL_EDEN_HEAP(size_pool));
-        }
-    }
-}
-
-static void
-gc_sweep_continue(rb_objspace_t *objspace, rb_size_pool_t *sweep_size_pool, rb_heap_t *heap)
-{
-    GC_ASSERT(dont_gc_val() == FALSE);
-    if (!GC_ENABLE_LAZY_SWEEP) return;
-
-    gc_sweeping_enter(objspace);
-
-    for (int i = 0; i < SIZE_POOL_COUNT; i++) {
-        rb_size_pool_t *size_pool = &size_pools[i];
-        if (!gc_sweep_step(objspace, size_pool, SIZE_POOL_EDEN_HEAP(size_pool))) {
-            /* sweep_size_pool requires a free slot but sweeping did not yield any. */
-            if (size_pool == sweep_size_pool) {
-                if (size_pool->allocatable_pages > 0) {
-                    heap_increment(objspace, size_pool, heap);
-                }
-                else {
-                    /* Not allowed to create a new page so finish sweeping. */
-                    gc_sweep_rest(objspace);
-                    break;
-                }
-            }
-        }
-    }
-
-    gc_sweeping_exit(objspace);
-}
-
-#if GC_CAN_COMPILE_COMPACTION
-static void
-invalidate_moved_plane(rb_objspace_t *objspace, struct heap_page *page, uintptr_t p, bits_t bitset)
-{
-    if (bitset) {
-        do {
-            if (bitset & 1) {
-                VALUE forwarding_object = (VALUE)p;
-                VALUE object;
-
-                if (BUILTIN_TYPE(forwarding_object) == T_MOVED) {
-                    GC_ASSERT(MARKED_IN_BITMAP(GET_HEAP_PINNED_BITS(forwarding_object), forwarding_object));
-                    GC_ASSERT(!MARKED_IN_BITMAP(GET_HEAP_MARK_BITS(forwarding_object), forwarding_object));
-
-                    CLEAR_IN_BITMAP(GET_HEAP_PINNED_BITS(forwarding_object), forwarding_object);
-
-                    object = rb_gc_location(forwarding_object);
-
-                    shape_id_t original_shape_id = 0;
-                    if (RB_TYPE_P(object, T_OBJECT)) {
-                        original_shape_id = RMOVED(forwarding_object)->original_shape_id;
-                    }
-
-                    gc_move(objspace, object, forwarding_object, GET_HEAP_PAGE(object)->slot_size, page->slot_size);
-                    /* forwarding_object is now our actual object, and "object"
-                     * is the free slot for the original page */
-
-                    if (original_shape_id) {
-                        ROBJECT_SET_SHAPE_ID(forwarding_object, original_shape_id);
-                    }
-
-                    struct heap_page *orig_page = GET_HEAP_PAGE(object);
-                    orig_page->free_slots++;
-                    heap_page_add_freeobj(objspace, orig_page, object);
-
-                    GC_ASSERT(MARKED_IN_BITMAP(GET_HEAP_MARK_BITS(forwarding_object), forwarding_object));
-                    GC_ASSERT(BUILTIN_TYPE(forwarding_object) != T_MOVED);
-                    GC_ASSERT(BUILTIN_TYPE(forwarding_object) != T_NONE);
-                }
-            }
-            p += BASE_SLOT_SIZE;
-            bitset >>= 1;
-        } while (bitset);
-    }
-}
-
-static void
-invalidate_moved_page(rb_objspace_t *objspace, struct heap_page *page)
-{
-    int i;
-    bits_t *mark_bits, *pin_bits;
-    bits_t bitset;
-
-    mark_bits = page->mark_bits;
-    pin_bits = page->pinned_bits;
-
-    uintptr_t p = page->start;
-
-    // Skip out of range slots at the head of the page
-    bitset = pin_bits[0] & ~mark_bits[0];
-    bitset >>= NUM_IN_PAGE(p);
-    invalidate_moved_plane(objspace, page, p, bitset);
-    p += (BITS_BITLENGTH - NUM_IN_PAGE(p)) * BASE_SLOT_SIZE;
-
-    for (i=1; i < HEAP_PAGE_BITMAP_LIMIT; i++) {
-        /* Moved objects are pinned but never marked. We reuse the pin bits
-         * to indicate there is a moved object in this slot. */
-        bitset = pin_bits[i] & ~mark_bits[i];
-
-        invalidate_moved_plane(objspace, page, p, bitset);
-        p += BITS_BITLENGTH * BASE_SLOT_SIZE;
-    }
-}
-#endif
-
-static void
-gc_compact_start(rb_objspace_t *objspace)
-{
-    struct heap_page *page = NULL;
-    gc_mode_transition(objspace, gc_mode_compacting);
-
-    for (int i = 0; i < SIZE_POOL_COUNT; i++) {
-        rb_heap_t *heap = SIZE_POOL_EDEN_HEAP(&size_pools[i]);
-        ccan_list_for_each(&heap->pages, page, page_node) {
-            page->flags.before_sweep = TRUE;
-        }
-
-        heap->compact_cursor = ccan_list_tail(&heap->pages, struct heap_page, page_node);
-        heap->compact_cursor_index = 0;
-    }
-
-    if (gc_prof_enabled(objspace)) {
-        gc_profile_record *record = gc_prof_record(objspace);
-        record->moved_objects = objspace->rcompactor.total_moved;
-    }
-
-    memset(objspace->rcompactor.considered_count_table, 0, T_MASK * sizeof(size_t));
-    memset(objspace->rcompactor.moved_count_table, 0, T_MASK * sizeof(size_t));
-    memset(objspace->rcompactor.moved_up_count_table, 0, T_MASK * sizeof(size_t));
-    memset(objspace->rcompactor.moved_down_count_table, 0, T_MASK * sizeof(size_t));
-
-    /* Set up read barrier for pages containing MOVED objects */
-    install_handlers();
-}
-
-static void gc_sweep_compact(rb_objspace_t *objspace);
-
-static void
-gc_sweep(rb_objspace_t *objspace)
-{
-    gc_sweeping_enter(objspace);
-
-    const unsigned int immediate_sweep = objspace->flags.immediate_sweep;
-
-    gc_report(1, objspace, "gc_sweep: immediate: %d\n", immediate_sweep);
-
-    gc_sweep_start(objspace);
-    if (objspace->flags.during_compacting) {
-        gc_sweep_compact(objspace);
-    }
-
-    if (immediate_sweep) {
-#if !GC_ENABLE_LAZY_SWEEP
-        gc_prof_sweep_timer_start(objspace);
-#endif
-        gc_sweep_rest(objspace);
-#if !GC_ENABLE_LAZY_SWEEP
-        gc_prof_sweep_timer_stop(objspace);
-#endif
-    }
-    else {
-
-        /* Sweep every size pool. */
-        for (int i = 0; i < SIZE_POOL_COUNT; i++) {
-            rb_size_pool_t *size_pool = &size_pools[i];
-            gc_sweep_step(objspace, size_pool, SIZE_POOL_EDEN_HEAP(size_pool));
-        }
-    }
-
-    gc_sweeping_exit(objspace);
-}
-
-/* Marking - Marking stack */
-
-static stack_chunk_t *
-stack_chunk_alloc(void)
-{
-    stack_chunk_t *res;
-
-    res = malloc(sizeof(stack_chunk_t));
-    if (!res)
-        rb_memerror();
-
-    return res;
-}
-
-static inline int
-is_mark_stack_empty(mark_stack_t *stack)
-{
-    return stack->chunk == NULL;
-}
-
-static size_t
-mark_stack_size(mark_stack_t *stack)
-{
-    size_t size = stack->index;
-    stack_chunk_t *chunk = stack->chunk ? stack->chunk->next : NULL;
-
-    while (chunk) {
-        size += stack->limit;
-        chunk = chunk->next;
-    }
-    return size;
-}
-
-static void
-add_stack_chunk_cache(mark_stack_t *stack, stack_chunk_t *chunk)
-{
-    chunk->next = stack->cache;
-    stack->cache = chunk;
-    stack->cache_size++;
-}
-
-static void
-shrink_stack_chunk_cache(mark_stack_t *stack)
-{
-    stack_chunk_t *chunk;
-
-    if (stack->unused_cache_size > (stack->cache_size/2)) {
-        chunk = stack->cache;
-        stack->cache = stack->cache->next;
-        stack->cache_size--;
-        free(chunk);
-    }
-    stack->unused_cache_size = stack->cache_size;
-}
-
-static void
-push_mark_stack_chunk(mark_stack_t *stack)
-{
-    stack_chunk_t *next;
-
-    GC_ASSERT(stack->index == stack->limit);
-
-    if (stack->cache_size > 0) {
-        next = stack->cache;
-        stack->cache = stack->cache->next;
-        stack->cache_size--;
-        if (stack->unused_cache_size > stack->cache_size)
-            stack->unused_cache_size = stack->cache_size;
-    }
-    else {
-        next = stack_chunk_alloc();
-    }
-    next->next = stack->chunk;
-    stack->chunk = next;
-    stack->index = 0;
-}
-
-static void
-pop_mark_stack_chunk(mark_stack_t *stack)
-{
-    stack_chunk_t *prev;
-
-    prev = stack->chunk->next;
-    GC_ASSERT(stack->index == 0);
-    add_stack_chunk_cache(stack, stack->chunk);
-    stack->chunk = prev;
-    stack->index = stack->limit;
-}
-
-static void
-mark_stack_chunk_list_free(stack_chunk_t *chunk)
-{
-    stack_chunk_t *next = NULL;
-
-    while (chunk != NULL) {
-        next = chunk->next;
-        free(chunk);
-        chunk = next;
-    }
-}
-
-static void
-free_stack_chunks(mark_stack_t *stack)
-{
-    mark_stack_chunk_list_free(stack->chunk);
-}
-
-static void
-mark_stack_free_cache(mark_stack_t *stack)
-{
-    mark_stack_chunk_list_free(stack->cache);
-    stack->cache_size = 0;
-    stack->unused_cache_size = 0;
-}
-
-static void
-push_mark_stack(mark_stack_t *stack, VALUE data)
-{
-    VALUE obj = data;
-    switch (BUILTIN_TYPE(obj)) {
-      case T_OBJECT:
-      case T_CLASS:
-      case T_MODULE:
-      case T_FLOAT:
-      case T_STRING:
-      case T_REGEXP:
-      case T_ARRAY:
-      case T_HASH:
-      case T_STRUCT:
-      case T_BIGNUM:
-      case T_FILE:
-      case T_DATA:
-      case T_MATCH:
-      case T_COMPLEX:
-      case T_RATIONAL:
-      case T_TRUE:
-      case T_FALSE:
-      case T_SYMBOL:
-      case T_IMEMO:
-      case T_ICLASS:
-        if (stack->index == stack->limit) {
-            push_mark_stack_chunk(stack);
-        }
-        stack->chunk->data[stack->index++] = data;
-        return;
-
-      case T_NONE:
-      case T_NIL:
-      case T_FIXNUM:
-      case T_MOVED:
-      case T_ZOMBIE:
-      case T_UNDEF:
-      case T_MASK:
-        rb_bug("push_mark_stack() called for broken object");
-        break;
-
-      case T_NODE:
-        UNEXPECTED_NODE(push_mark_stack);
-        break;
-    }
-
-    rb_bug("rb_gc_mark(): unknown data type 0x%x(%p) %s",
-            BUILTIN_TYPE(obj), (void *)data,
-            is_pointer_to_heap(&rb_objspace, (void *)data) ? "corrupted object" : "non object");
-}
-
-static int
-pop_mark_stack(mark_stack_t *stack, VALUE *data)
-{
-    if (is_mark_stack_empty(stack)) {
-        return FALSE;
-    }
-    if (stack->index == 1) {
-        *data = stack->chunk->data[--stack->index];
-        pop_mark_stack_chunk(stack);
-    }
-    else {
-        *data = stack->chunk->data[--stack->index];
-    }
-    return TRUE;
-}
-
-static void
-init_mark_stack(mark_stack_t *stack)
-{
-    int i;
-
-    MEMZERO(stack, mark_stack_t, 1);
-    stack->index = stack->limit = STACK_CHUNK_SIZE;
-
-    for (i=0; i < 4; i++) {
-        add_stack_chunk_cache(stack, stack_chunk_alloc());
-    }
-    stack->unused_cache_size = stack->cache_size;
-}
-
-/* Marking */
-
-#define SET_STACK_END SET_MACHINE_STACK_END(&ec->machine.stack_end)
-
-#define STACK_START (ec->machine.stack_start)
-#define STACK_END (ec->machine.stack_end)
-#define STACK_LEVEL_MAX (ec->machine.stack_maxsize/sizeof(VALUE))
-
-#if STACK_GROW_DIRECTION < 0
-# define STACK_LENGTH  (size_t)(STACK_START - STACK_END)
-#elif STACK_GROW_DIRECTION > 0
-# define STACK_LENGTH  (size_t)(STACK_END - STACK_START + 1)
-#else
-# define STACK_LENGTH  ((STACK_END < STACK_START) ? (size_t)(STACK_START - STACK_END) \
-                        : (size_t)(STACK_END - STACK_START + 1))
-#endif
-#if !STACK_GROW_DIRECTION
-int ruby_stack_grow_direction;
-int
-ruby_get_stack_grow_direction(volatile VALUE *addr)
-{
-    VALUE *end;
-    SET_MACHINE_STACK_END(&end);
-
-    if (end > addr) return ruby_stack_grow_direction = 1;
-    return ruby_stack_grow_direction = -1;
-}
-#endif
-
-size_t
-ruby_stack_length(VALUE **p)
-{
-    rb_execution_context_t *ec = GET_EC();
-    SET_STACK_END;
-    if (p) *p = STACK_UPPER(STACK_END, STACK_START, STACK_END);
-    return STACK_LENGTH;
-}
-
-#define PREVENT_STACK_OVERFLOW 1
-#ifndef PREVENT_STACK_OVERFLOW
-#if !(defined(POSIX_SIGNAL) && defined(SIGSEGV) && defined(HAVE_SIGALTSTACK))
-# define PREVENT_STACK_OVERFLOW 1
-#else
-# define PREVENT_STACK_OVERFLOW 0
-#endif
-#endif
-#if PREVENT_STACK_OVERFLOW && !defined(__EMSCRIPTEN__)
-static int
-stack_check(rb_execution_context_t *ec, int water_mark)
-{
-    SET_STACK_END;
-
-    size_t length = STACK_LENGTH;
-    size_t maximum_length = STACK_LEVEL_MAX - water_mark;
-
-    return length > maximum_length;
-}
-#else
-#define stack_check(ec, water_mark) FALSE
-#endif
-
-#define STACKFRAME_FOR_CALL_CFUNC 2048
-
-int
-rb_ec_stack_check(rb_execution_context_t *ec)
-{
-    return stack_check(ec, STACKFRAME_FOR_CALL_CFUNC);
-}
-
-int
-ruby_stack_check(void)
-{
-    return stack_check(GET_EC(), STACKFRAME_FOR_CALL_CFUNC);
-}
-
-ATTRIBUTE_NO_ADDRESS_SAFETY_ANALYSIS(static void each_location(rb_objspace_t *objspace, register const VALUE *x, register long n, void (*cb)(rb_objspace_t *, VALUE)));
-static void
-each_location(rb_objspace_t *objspace, register const VALUE *x, register long n, void (*cb)(rb_objspace_t *, VALUE))
-{
-    VALUE v;
-    while (n--) {
-        v = *x;
-        cb(objspace, v);
-        x++;
-    }
-}
-
-static void
-gc_mark_locations(rb_objspace_t *objspace, const VALUE *start, const VALUE *end, void (*cb)(rb_objspace_t *, VALUE))
-{
-    long n;
-
-    if (end <= start) return;
-    n = end - start;
-    each_location(objspace, start, n, cb);
-}
-
-void
-rb_gc_mark_locations(const VALUE *start, const VALUE *end)
-{
-    gc_mark_locations(&rb_objspace, start, end, gc_mark_maybe);
-}
-
-void
-rb_gc_mark_values(long n, const VALUE *values)
-{
-    long i;
-    rb_objspace_t *objspace = &rb_objspace;
-
-    for (i=0; i<n; i++) {
-        gc_mark(objspace, values[i]);
-    }
-}
-
-static void
-gc_mark_stack_values(rb_objspace_t *objspace, long n, const VALUE *values)
-{
-    long i;
-
-    for (i=0; i<n; i++) {
-        if (is_markable_object(values[i])) {
-            gc_mark_and_pin(objspace, values[i]);
-        }
-    }
-}
-
-void
-rb_gc_mark_vm_stack_values(long n, const VALUE *values)
-{
-    rb_objspace_t *objspace = &rb_objspace;
-    gc_mark_stack_values(objspace, n, values);
-}
-
-static int
-mark_value(st_data_t key, st_data_t value, st_data_t data)
-{
-    rb_objspace_t *objspace = (rb_objspace_t *)data;
-    gc_mark(objspace, (VALUE)value);
-    return ST_CONTINUE;
-}
-
-static int
-mark_value_pin(st_data_t key, st_data_t value, st_data_t data)
-{
-    rb_objspace_t *objspace = (rb_objspace_t *)data;
-    gc_mark_and_pin(objspace, (VALUE)value);
-    return ST_CONTINUE;
-}
-
-static void
-mark_tbl_no_pin(rb_objspace_t *objspace, st_table *tbl)
-{
-    if (!tbl || tbl->num_entries == 0) return;
-    st_foreach(tbl, mark_value, (st_data_t)objspace);
-}
-
-static void
-mark_tbl(rb_objspace_t *objspace, st_table *tbl)
-{
-    if (!tbl || tbl->num_entries == 0) return;
-    st_foreach(tbl, mark_value_pin, (st_data_t)objspace);
-}
-
-static int
-mark_key(st_data_t key, st_data_t value, st_data_t data)
-{
-    rb_objspace_t *objspace = (rb_objspace_t *)data;
-    gc_mark_and_pin(objspace, (VALUE)key);
-    return ST_CONTINUE;
-}
-
-static void
-mark_set(rb_objspace_t *objspace, st_table *tbl)
-{
-    if (!tbl) return;
-    st_foreach(tbl, mark_key, (st_data_t)objspace);
-}
-
-static int
-pin_value(st_data_t key, st_data_t value, st_data_t data)
-{
-    rb_objspace_t *objspace = (rb_objspace_t *)data;
-    gc_mark_and_pin(objspace, (VALUE)value);
-    return ST_CONTINUE;
-}
-
-static void
-mark_finalizer_tbl(rb_objspace_t *objspace, st_table *tbl)
-{
-    if (!tbl) return;
-    st_foreach(tbl, pin_value, (st_data_t)objspace);
-}
-
-void
-rb_mark_set(st_table *tbl)
-{
-    mark_set(&rb_objspace, tbl);
-}
-
-static int
-mark_keyvalue(st_data_t key, st_data_t value, st_data_t data)
-{
-    rb_objspace_t *objspace = (rb_objspace_t *)data;
-
-    gc_mark(objspace, (VALUE)key);
-    gc_mark(objspace, (VALUE)value);
-    return ST_CONTINUE;
-}
-
-static int
-pin_key_pin_value(st_data_t key, st_data_t value, st_data_t data)
-{
-    rb_objspace_t *objspace = (rb_objspace_t *)data;
-
-    gc_mark_and_pin(objspace, (VALUE)key);
-    gc_mark_and_pin(objspace, (VALUE)value);
-    return ST_CONTINUE;
-}
-
-static int
-pin_key_mark_value(st_data_t key, st_data_t value, st_data_t data)
-{
-    rb_objspace_t *objspace = (rb_objspace_t *)data;
-
-    gc_mark_and_pin(objspace, (VALUE)key);
-    gc_mark(objspace, (VALUE)value);
-    return ST_CONTINUE;
-}
-
-static void
-mark_hash(rb_objspace_t *objspace, VALUE hash)
-{
-    if (rb_hash_compare_by_id_p(hash)) {
-        rb_hash_stlike_foreach(hash, pin_key_mark_value, (st_data_t)objspace);
-    }
-    else {
-        rb_hash_stlike_foreach(hash, mark_keyvalue, (st_data_t)objspace);
-    }
-
-    gc_mark(objspace, RHASH(hash)->ifnone);
-}
-
-static void
-mark_st(rb_objspace_t *objspace, st_table *tbl)
-{
-    if (!tbl) return;
-    st_foreach(tbl, pin_key_pin_value, (st_data_t)objspace);
-}
-
-void
-rb_mark_hash(st_table *tbl)
-{
-    mark_st(&rb_objspace, tbl);
-}
-
-static void
-mark_method_entry(rb_objspace_t *objspace, const rb_method_entry_t *me)
-{
-    const rb_method_definition_t *def = me->def;
-
-    gc_mark(objspace, me->owner);
-    gc_mark(objspace, me->defined_class);
-
-    if (def) {
-        switch (def->type) {
-          case VM_METHOD_TYPE_ISEQ:
-            if (def->body.iseq.iseqptr) gc_mark(objspace, (VALUE)def->body.iseq.iseqptr);
-            gc_mark(objspace, (VALUE)def->body.iseq.cref);
-
-            if (def->iseq_overload && me->defined_class) {
-                // it can be a key of "overloaded_cme" table
-                // so it should be pinned.
-                gc_mark_and_pin(objspace, (VALUE)me);
-            }
-            break;
-          case VM_METHOD_TYPE_ATTRSET:
-          case VM_METHOD_TYPE_IVAR:
-            gc_mark(objspace, def->body.attr.location);
-            break;
-          case VM_METHOD_TYPE_BMETHOD:
-            gc_mark(objspace, def->body.bmethod.proc);
-            if (def->body.bmethod.hooks) rb_hook_list_mark(def->body.bmethod.hooks);
-            break;
-          case VM_METHOD_TYPE_ALIAS:
-            gc_mark(objspace, (VALUE)def->body.alias.original_me);
-            return;
-          case VM_METHOD_TYPE_REFINED:
-            gc_mark(objspace, (VALUE)def->body.refined.orig_me);
-            gc_mark(objspace, (VALUE)def->body.refined.owner);
-            break;
-          case VM_METHOD_TYPE_CFUNC:
-          case VM_METHOD_TYPE_ZSUPER:
-          case VM_METHOD_TYPE_MISSING:
-          case VM_METHOD_TYPE_OPTIMIZED:
-          case VM_METHOD_TYPE_UNDEF:
-          case VM_METHOD_TYPE_NOTIMPLEMENTED:
-            break;
-        }
-    }
-}
-
-static enum rb_id_table_iterator_result
-mark_method_entry_i(VALUE me, void *data)
-{
-    rb_objspace_t *objspace = (rb_objspace_t *)data;
-
-    gc_mark(objspace, me);
-    return ID_TABLE_CONTINUE;
-}
-
-static void
-mark_m_tbl(rb_objspace_t *objspace, struct rb_id_table *tbl)
-{
-    if (tbl) {
-        rb_id_table_foreach_values(tbl, mark_method_entry_i, objspace);
-    }
-}
-
-static enum rb_id_table_iterator_result
-mark_const_entry_i(VALUE value, void *data)
-{
-    const rb_const_entry_t *ce = (const rb_const_entry_t *)value;
-    rb_objspace_t *objspace = data;
-
-    gc_mark(objspace, ce->value);
-    gc_mark(objspace, ce->file);
-    return ID_TABLE_CONTINUE;
-}
-
-static void
-mark_const_tbl(rb_objspace_t *objspace, struct rb_id_table *tbl)
-{
-    if (!tbl) return;
-    rb_id_table_foreach_values(tbl, mark_const_entry_i, objspace);
-}
-
-#if STACK_GROW_DIRECTION < 0
-#define GET_STACK_BOUNDS(start, end, appendix) ((start) = STACK_END, (end) = STACK_START)
-#elif STACK_GROW_DIRECTION > 0
-#define GET_STACK_BOUNDS(start, end, appendix) ((start) = STACK_START, (end) = STACK_END+(appendix))
-#else
-#define GET_STACK_BOUNDS(start, end, appendix) \
-    ((STACK_END < STACK_START) ? \
-     ((start) = STACK_END, (end) = STACK_START) : ((start) = STACK_START, (end) = STACK_END+(appendix)))
-#endif
-
-static void each_stack_location(rb_objspace_t *objspace, const rb_execution_context_t *ec,
-                                 const VALUE *stack_start, const VALUE *stack_end, void (*cb)(rb_objspace_t *, VALUE));
-
-#if defined(__wasm__)
-
-
-static VALUE *rb_stack_range_tmp[2];
-
-static void
-rb_mark_locations(void *begin, void *end)
-{
-    rb_stack_range_tmp[0] = begin;
-    rb_stack_range_tmp[1] = end;
-}
-
-# if defined(__EMSCRIPTEN__)
-
-static void
-mark_current_machine_context(rb_objspace_t *objspace, rb_execution_context_t *ec)
-{
-    emscripten_scan_stack(rb_mark_locations);
-    each_stack_location(objspace, ec, rb_stack_range_tmp[0], rb_stack_range_tmp[1], gc_mark_maybe);
-
-    emscripten_scan_registers(rb_mark_locations);
-    each_stack_location(objspace, ec, rb_stack_range_tmp[0], rb_stack_range_tmp[1], gc_mark_maybe);
-}
-# else // use Asyncify version
-
-static void
-mark_current_machine_context(rb_objspace_t *objspace, rb_execution_context_t *ec)
-{
-    VALUE *stack_start, *stack_end;
-    SET_STACK_END;
-    GET_STACK_BOUNDS(stack_start, stack_end, 1);
-    each_stack_location(objspace, ec, stack_start, stack_end, gc_mark_maybe);
-
-    rb_wasm_scan_locals(rb_mark_locations);
-    each_stack_location(objspace, ec, rb_stack_range_tmp[0], rb_stack_range_tmp[1], gc_mark_maybe);
-}
-
-# endif
-
-#else // !defined(__wasm__)
-
-static void
-mark_current_machine_context(rb_objspace_t *objspace, rb_execution_context_t *ec)
-{
-    union {
-        rb_jmp_buf j;
-        VALUE v[sizeof(rb_jmp_buf) / (sizeof(VALUE))];
-    } save_regs_gc_mark;
-    VALUE *stack_start, *stack_end;
-
-    FLUSH_REGISTER_WINDOWS;
-    memset(&save_regs_gc_mark, 0, sizeof(save_regs_gc_mark));
-    /* This assumes that all registers are saved into the jmp_buf (and stack) */
-    rb_setjmp(save_regs_gc_mark.j);
-
-    /* SET_STACK_END must be called in this function because
-     * the stack frame of this function may contain
-     * callee save registers and they should be marked. */
-    SET_STACK_END;
-    GET_STACK_BOUNDS(stack_start, stack_end, 1);
-
-    each_location(objspace, save_regs_gc_mark.v, numberof(save_regs_gc_mark.v), gc_mark_maybe);
-
-    each_stack_location(objspace, ec, stack_start, stack_end, gc_mark_maybe);
-}
-#endif
-
-static void
-each_machine_stack_value(const rb_execution_context_t *ec, void (*cb)(rb_objspace_t *, VALUE))
-{
-    rb_objspace_t *objspace = &rb_objspace;
-    VALUE *stack_start, *stack_end;
-
-    GET_STACK_BOUNDS(stack_start, stack_end, 0);
-    RUBY_DEBUG_LOG("ec->th:%u stack_start:%p stack_end:%p", rb_ec_thread_ptr(ec)->serial, stack_start, stack_end);
-    each_stack_location(objspace, ec, stack_start, stack_end, cb);
-}
-
-void
-rb_gc_mark_machine_stack(const rb_execution_context_t *ec)
-{
-    each_machine_stack_value(ec, gc_mark_maybe);
-}
-
-static void
-each_stack_location(rb_objspace_t *objspace, const rb_execution_context_t *ec,
-                     const VALUE *stack_start, const VALUE *stack_end, void (*cb)(rb_objspace_t *, VALUE))
-{
-
-    gc_mark_locations(objspace, stack_start, stack_end, cb);
-
-#if defined(__mc68000__)
-    gc_mark_locations(objspace,
-                      (VALUE*)((char*)stack_start + 2),
-                      (VALUE*)((char*)stack_end - 2), cb);
-#endif
-}
-
-void
-rb_mark_tbl(st_table *tbl)
-{
-    mark_tbl(&rb_objspace, tbl);
-}
-
-void
-rb_mark_tbl_no_pin(st_table *tbl)
-{
-    mark_tbl_no_pin(&rb_objspace, tbl);
-}
-
-static void
-gc_mark_maybe(rb_objspace_t *objspace, VALUE obj)
-{
-    (void)VALGRIND_MAKE_MEM_DEFINED(&obj, sizeof(obj));
-
-    if (is_pointer_to_heap(objspace, (void *)obj)) {
-        void *ptr = asan_unpoison_object_temporary(obj);
-
-        /* Garbage can live on the stack, so do not mark or pin */
-        switch (BUILTIN_TYPE(obj)) {
-          case T_ZOMBIE:
-          case T_NONE:
-            break;
-          default:
-            gc_mark_and_pin(objspace, obj);
-            break;
-        }
-
-        if (ptr) {
-            GC_ASSERT(BUILTIN_TYPE(obj) == T_NONE);
-            asan_poison_object(obj);
-        }
-    }
-}
-
-void
-rb_gc_mark_maybe(VALUE obj)
-{
-    gc_mark_maybe(&rb_objspace, obj);
-}
-
-static inline int
-gc_mark_set(rb_objspace_t *objspace, VALUE obj)
-{
-    ASSERT_vm_locking();
-    if (RVALUE_MARKED(obj)) return 0;
-    MARK_IN_BITMAP(GET_HEAP_MARK_BITS(obj), obj);
-    return 1;
-}
-
-static int
-gc_remember_unprotected(rb_objspace_t *objspace, VALUE obj)
-{
-    struct heap_page *page = GET_HEAP_PAGE(obj);
-    bits_t *uncollectible_bits = &page->uncollectible_bits[0];
-
-    if (!MARKED_IN_BITMAP(uncollectible_bits, obj)) {
-        page->flags.has_uncollectible_wb_unprotected_objects = TRUE;
-        MARK_IN_BITMAP(uncollectible_bits, obj);
-        objspace->rgengc.uncollectible_wb_unprotected_objects++;
-
-#if RGENGC_PROFILE > 0
-        objspace->profile.total_remembered_shady_object_count++;
-#if RGENGC_PROFILE >= 2
-        objspace->profile.remembered_shady_object_count_types[BUILTIN_TYPE(obj)]++;
-#endif
-#endif
-        return TRUE;
-    }
-    else {
-        return FALSE;
-    }
-}
-
-static void
-rgengc_check_relation(rb_objspace_t *objspace, VALUE obj)
-{
-    const VALUE old_parent = objspace->rgengc.parent_object;
-
-    if (old_parent) { /* parent object is old */
-        if (RVALUE_WB_UNPROTECTED(obj) || !RVALUE_OLD_P(obj)) {
-            rgengc_remember(objspace, old_parent);
-        }
-    }
-
-    GC_ASSERT(old_parent == objspace->rgengc.parent_object);
-}
-
-static void
-gc_grey(rb_objspace_t *objspace, VALUE obj)
-{
-#if RGENGC_CHECK_MODE
-    if (RVALUE_MARKED(obj) == FALSE) rb_bug("gc_grey: %s is not marked.", obj_info(obj));
-    if (RVALUE_MARKING(obj) == TRUE) rb_bug("gc_grey: %s is marking/remembered.", obj_info(obj));
-#endif
-
-    if (is_incremental_marking(objspace)) {
-        MARK_IN_BITMAP(GET_HEAP_MARKING_BITS(obj), obj);
-    }
-
-    push_mark_stack(&objspace->mark_stack, obj);
-}
-
-static void
-gc_aging(rb_objspace_t *objspace, VALUE obj)
-{
-    struct heap_page *page = GET_HEAP_PAGE(obj);
-
-    GC_ASSERT(RVALUE_MARKING(obj) == FALSE);
-    check_rvalue_consistency(obj);
-
-    if (!RVALUE_PAGE_WB_UNPROTECTED(page, obj)) {
-        if (!RVALUE_OLD_P(obj)) {
-            gc_report(3, objspace, "gc_aging: YOUNG: %s\n", obj_info(obj));
-            RVALUE_AGE_INC(objspace, obj);
-        }
-        else if (is_full_marking(objspace)) {
-            GC_ASSERT(RVALUE_PAGE_UNCOLLECTIBLE(page, obj) == FALSE);
-            RVALUE_PAGE_OLD_UNCOLLECTIBLE_SET(objspace, page, obj);
-        }
-    }
-    check_rvalue_consistency(obj);
-
-    objspace->marked_slots++;
-}
-
-NOINLINE(static void gc_mark_ptr(rb_objspace_t *objspace, VALUE obj));
-static void reachable_objects_from_callback(VALUE obj);
-
-static void
-gc_mark_ptr(rb_objspace_t *objspace, VALUE obj)
-{
-    if (LIKELY(during_gc)) {
-        rgengc_check_relation(objspace, obj);
-        if (!gc_mark_set(objspace, obj)) return; /* already marked */
-
-        if (0) { // for debug GC marking miss
-            if (objspace->rgengc.parent_object) {
-                RUBY_DEBUG_LOG("%p (%s) parent:%p (%s)",
-                               (void *)obj, obj_type_name(obj),
-                               (void *)objspace->rgengc.parent_object, obj_type_name(objspace->rgengc.parent_object));
-            }
-            else {
-                RUBY_DEBUG_LOG("%p (%s)", (void *)obj, obj_type_name(obj));
-            }
-        }
-
-        if (UNLIKELY(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);
-    }
-    else {
-        reachable_objects_from_callback(obj);
-    }
-}
-
-static inline void
-gc_pin(rb_objspace_t *objspace, VALUE obj)
-{
-    GC_ASSERT(is_markable_object(obj));
-    if (UNLIKELY(objspace->flags.during_compacting)) {
-        if (LIKELY(during_gc)) {
-            MARK_IN_BITMAP(GET_HEAP_PINNED_BITS(obj), obj);
-        }
-    }
-}
-
-static inline void
-gc_mark_and_pin(rb_objspace_t *objspace, VALUE obj)
-{
-    if (!is_markable_object(obj)) return;
-    gc_pin(objspace, obj);
-    gc_mark_ptr(objspace, obj);
-}
-
-static inline void
-gc_mark(rb_objspace_t *objspace, VALUE obj)
-{
-    if (!is_markable_object(obj)) return;
-    gc_mark_ptr(objspace, obj);
-}
-
-void
-rb_gc_mark_movable(VALUE ptr)
-{
-    gc_mark(&rb_objspace, ptr);
-}
-
-void
-rb_gc_mark(VALUE ptr)
-{
-    gc_mark_and_pin(&rb_objspace, ptr);
-}
-
-void
-rb_gc_mark_and_move(VALUE *ptr)
-{
-    rb_objspace_t *objspace = &rb_objspace;
-    if (RB_SPECIAL_CONST_P(*ptr)) return;
-
-    if (UNLIKELY(objspace->flags.during_reference_updating)) {
-        GC_ASSERT(objspace->flags.during_compacting);
-        GC_ASSERT(during_gc);
-
-        *ptr = rb_gc_location(*ptr);
-    }
-    else {
-        gc_mark_ptr(objspace, *ptr);
-    }
-}
-
-void
-rb_gc_mark_weak(VALUE *ptr)
-{
-    rb_objspace_t *objspace = &rb_objspace;
-
-    if (UNLIKELY(!during_gc)) return;
-
-    VALUE obj = *ptr;
-    if (RB_SPECIAL_CONST_P(obj)) return;
-
-    GC_ASSERT(objspace->rgengc.parent_object == 0 || FL_TEST(objspace->rgengc.parent_object, FL_WB_PROTECTED));
-
-    if (UNLIKELY(RB_TYPE_P(obj, T_NONE))) {
-        rp(obj);
-        rb_bug("try to mark T_NONE object");
-    }
-
-    /* If we are in a minor GC and the other object is old, then obj should
-     * already be marked and cannot be reclaimed in this GC cycle so we don't
-     * need to add it to the weak refences list. */
-    if (!is_full_marking(objspace) && RVALUE_OLD_P(obj)) {
-        GC_ASSERT(RVALUE_MARKED(obj));
-        GC_ASSERT(!objspace->flags.during_compacting);
-
-        return;
-    }
-
-    rgengc_check_relation(objspace, obj);
-
-    rb_darray_append_without_gc(&objspace->weak_references, ptr);
-
-    objspace->profile.weak_references_count++;
-}
-
-void
-rb_gc_remove_weak(VALUE parent_obj, VALUE *ptr)
-{
-    rb_objspace_t *objspace = &rb_objspace;
-
-    /* If we're not incremental marking, then the state of the objects can't
-     * change so we don't need to do anything. */
-    if (!is_incremental_marking(objspace)) return;
-    /* If parent_obj has not been marked, then ptr has not yet been marked
-     * weak, so we don't need to do anything. */
-    if (!RVALUE_MARKED(parent_obj)) return;
-
-    VALUE **ptr_ptr;
-    rb_darray_foreach(objspace->weak_references, i, ptr_ptr) {
-        if (*ptr_ptr == ptr) {
-            *ptr_ptr = NULL;
-            break;
-        }
-    }
-}
-
-/* CAUTION: THIS FUNCTION ENABLE *ONLY BEFORE* SWEEPING.
- * This function is only for GC_END_MARK timing.
- */
-
-int
-rb_objspace_marked_object_p(VALUE obj)
-{
-    return RVALUE_MARKED(obj) ? TRUE : FALSE;
-}
-
-static inline void
-gc_mark_set_parent(rb_objspace_t *objspace, VALUE obj)
-{
-    if (RVALUE_OLD_P(obj)) {
-        objspace->rgengc.parent_object = obj;
-    }
-    else {
-        objspace->rgengc.parent_object = Qfalse;
-    }
-}
-
-static void
-gc_mark_imemo(rb_objspace_t *objspace, VALUE obj)
-{
-    switch (imemo_type(obj)) {
-      case imemo_env:
-        {
-            const rb_env_t *env = (const rb_env_t *)obj;
-
-            if (LIKELY(env->ep)) {
-                // just after newobj() can be NULL here.
-                GC_ASSERT(env->ep[VM_ENV_DATA_INDEX_ENV] == obj);
-                GC_ASSERT(VM_ENV_ESCAPED_P(env->ep));
-                rb_gc_mark_values((long)env->env_size, env->env);
-                VM_ENV_FLAGS_SET(env->ep, VM_ENV_FLAG_WB_REQUIRED);
-                gc_mark(objspace, (VALUE)rb_vm_env_prev_env(env));
-                gc_mark(objspace, (VALUE)env->iseq);
-            }
-        }
-        return;
-      case imemo_cref:
-        gc_mark(objspace, RANY(obj)->as.imemo.cref.klass_or_self);
-        gc_mark(objspace, (VALUE)RANY(obj)->as.imemo.cref.next);
-        gc_mark(objspace, RANY(obj)->as.imemo.cref.refinements);
-        return;
-      case imemo_svar:
-        gc_mark(objspace, RANY(obj)->as.imemo.svar.cref_or_me);
-        gc_mark(objspace, RANY(obj)->as.imemo.svar.lastline);
-        gc_mark(objspace, RANY(obj)->as.imemo.svar.backref);
-        gc_mark(objspace, RANY(obj)->as.imemo.svar.others);
-        return;
-      case imemo_throw_data:
-        gc_mark(objspace, RANY(obj)->as.imemo.throw_data.throw_obj);
-        return;
-      case imemo_ifunc:
-        gc_mark_maybe(objspace, (VALUE)RANY(obj)->as.imemo.ifunc.data);
-        return;
-      case imemo_memo:
-        gc_mark(objspace, RANY(obj)->as.imemo.memo.v1);
-        gc_mark(objspace, RANY(obj)->as.imemo.memo.v2);
-        gc_mark_maybe(objspace, RANY(obj)->as.imemo.memo.u3.value);
-        return;
-      case imemo_ment:
-        mark_method_entry(objspace, &RANY(obj)->as.imemo.ment);
-        return;
-      case imemo_iseq:
-        rb_iseq_mark_and_move((rb_iseq_t *)obj, false);
-        return;
-      case imemo_tmpbuf:
-        {
-            const rb_imemo_tmpbuf_t *m = &RANY(obj)->as.imemo.alloc;
-            do {
-                rb_gc_mark_locations(m->ptr, m->ptr + m->cnt);
-            } while ((m = m->next) != NULL);
-        }
-        return;
-      case imemo_ast:
-        rb_ast_mark(&RANY(obj)->as.imemo.ast);
-        return;
-      case imemo_parser_strterm:
-        rb_strterm_mark(obj);
-        return;
-      case imemo_callinfo:
-        return;
-      case imemo_callcache:
-        /* cc is callcache.
-         *
-         * cc->klass (klass) should not be marked because if the klass is
-         * free'ed, the cc->klass will be cleared by `vm_cc_invalidate()`.
-         *
-         * cc->cme (cme) should not be marked because if cc is invalidated
-         * when cme is free'ed.
-         * - klass marks cme if klass uses cme.
-         * - caller classe's ccs->cme marks cc->cme.
-         * - if cc is invalidated (klass doesn't refer the cc),
-         *   cc is invalidated by `vm_cc_invalidate()` and cc->cme is
-         *   not be accessed.
-         * - On the multi-Ractors, cme will be collected with global GC
-         *   so that it is safe if GC is not interleaving while accessing
-         *   cc and cme.
-         * - However, cc_type_super is not chained from cc so the cc->cme
-         *   should be marked.
-         */
-        {
-            const struct rb_callcache *cc = (const struct rb_callcache *)obj;
-            if (vm_cc_super_p(cc)) {
-                gc_mark(objspace, (VALUE)cc->cme_);
-            }
-        }
-        return;
-      case imemo_constcache:
-        {
-            const struct iseq_inline_constant_cache_entry *ice = (struct iseq_inline_constant_cache_entry *)obj;
-            gc_mark(objspace, ice->value);
-        }
-        return;
-#if VM_CHECK_MODE > 0
-      default:
-        VM_UNREACHABLE(gc_mark_imemo);
-#endif
-    }
-}
-
-static bool
-gc_declarative_marking_p(const rb_data_type_t *type)
-{
-    return (type->flags & RUBY_TYPED_DECL_MARKING) != 0;
-}
-
-#define EDGE (VALUE *)((char *)data_struct + offset)
-
-static inline void
-gc_mark_from_offset(rb_objspace_t *objspace, VALUE obj)
-{
-    // we are overloading the dmark callback to contain a list of offsets
-    size_t *offset_list = (size_t *)RANY(obj)->as.typeddata.type->function.dmark;
-    void *data_struct = RANY(obj)->as.typeddata.data;
-
-    for (size_t offset = *offset_list; *offset_list != RUBY_REF_END; offset = *offset_list++) {
-        rb_gc_mark_movable(*EDGE);
-    }
-}
-
-static inline void
-gc_ref_update_from_offset(rb_objspace_t *objspace, VALUE obj)
-{
-    // we are overloading the dmark callback to contain a list of offsets
-    size_t *offset_list = (size_t *)RANY(obj)->as.typeddata.type->function.dmark;
-    void *data_struct = RANY(obj)->as.typeddata.data;
-
-    for (size_t offset = *offset_list; *offset_list != RUBY_REF_END; offset = *offset_list++) {
-        if (SPECIAL_CONST_P(*EDGE)) continue;
-        *EDGE = rb_gc_location(*EDGE);
-    }
-}
-
-static void mark_cvc_tbl(rb_objspace_t *objspace, VALUE klass);
-
-static void
-gc_mark_children(rb_objspace_t *objspace, VALUE obj)
-{
-    register RVALUE *any = RANY(obj);
-    gc_mark_set_parent(objspace, obj);
-
-    if (FL_TEST(obj, FL_EXIVAR)) {
-        rb_mark_and_update_generic_ivar(obj);
-    }
-
-    switch (BUILTIN_TYPE(obj)) {
-      case T_FLOAT:
-      case T_BIGNUM:
-      case T_SYMBOL:
-        /* Not immediates, but does not have references and singleton
-         * class */
-        return;
-
-      case T_NIL:
-      case T_FIXNUM:
-        rb_bug("rb_gc_mark() called for broken object");
-        break;
-
-      case T_NODE:
-        UNEXPECTED_NODE(rb_gc_mark);
-        break;
-
-      case T_IMEMO:
-        gc_mark_imemo(objspace, obj);
-        return;
-
-      default:
-        break;
-    }
-
-    gc_mark(objspace, any->as.basic.klass);
-
-    switch (BUILTIN_TYPE(obj)) {
-      case T_CLASS:
-        if (FL_TEST(obj, FL_SINGLETON)) {
-            gc_mark(objspace, RCLASS_ATTACHED_OBJECT(obj));
-        }
-        // Continue to the shared T_CLASS/T_MODULE
-      case T_MODULE:
-        if (RCLASS_SUPER(obj)) {
-            gc_mark(objspace, RCLASS_SUPER(obj));
-        }
-        if (!RCLASS_EXT(obj)) break;
-
-        mark_m_tbl(objspace, RCLASS_M_TBL(obj));
-        mark_cvc_tbl(objspace, obj);
-        cc_table_mark(objspace, obj);
-        for (attr_index_t i = 0; i < RCLASS_IV_COUNT(obj); i++) {
-            gc_mark(objspace, RCLASS_IVPTR(obj)[i]);
-        }
-        mark_const_tbl(objspace, RCLASS_CONST_TBL(obj));
-
-        gc_mark(objspace, RCLASS_EXT(obj)->classpath);
-        break;
-
-      case T_ICLASS:
-        if (RICLASS_OWNS_M_TBL_P(obj)) {
-            mark_m_tbl(objspace, RCLASS_M_TBL(obj));
-        }
-        if (RCLASS_SUPER(obj)) {
-            gc_mark(objspace, RCLASS_SUPER(obj));
-        }
-        if (!RCLASS_EXT(obj)) break;
-
-        if (RCLASS_INCLUDER(obj)) {
-            gc_mark(objspace, RCLASS_INCLUDER(obj));
-        }
-        mark_m_tbl(objspace, RCLASS_CALLABLE_M_TBL(obj));
-        cc_table_mark(objspace, obj);
-        break;
-
-      case T_ARRAY:
-        if (ARY_SHARED_P(obj)) {
-            VALUE root = ARY_SHARED_ROOT(obj);
-            gc_mark(objspace, root);
-        }
-        else {
-            long i, len = RARRAY_LEN(obj);
-            const VALUE *ptr = RARRAY_CONST_PTR(obj);
-            for (i=0; i < len; i++) {
-                gc_mark(objspace, ptr[i]);
-            }
-        }
-        break;
-
-      case T_HASH:
-        mark_hash(objspace, obj);
-        break;
-
-      case T_STRING:
-        if (STR_SHARED_P(obj)) {
-            gc_mark(objspace, any->as.string.as.heap.aux.shared);
-        }
-        break;
-
-      case T_DATA:
-        {
-            void *const ptr = DATA_PTR(obj);
-            if (ptr) {
-                if (RTYPEDDATA_P(obj) && gc_declarative_marking_p(any->as.typeddata.type)) {
-                    gc_mark_from_offset(objspace, obj);
-                }
-                else {
-                    RUBY_DATA_FUNC mark_func = RTYPEDDATA_P(obj) ?
-                        any->as.typeddata.type->function.dmark :
-                        any->as.data.dmark;
-                    if (mark_func) (*mark_func)(ptr);
-                }
-            }
-        }
-        break;
-
-      case T_OBJECT:
-        {
-            rb_shape_t *shape = rb_shape_get_shape_by_id(ROBJECT_SHAPE_ID(obj));
-            if (rb_shape_obj_too_complex(obj)) {
-                mark_tbl_no_pin(objspace, ROBJECT_IV_HASH(obj));
-            }
-            else {
-                const VALUE * const ptr = ROBJECT_IVPTR(obj);
-
-                uint32_t i, len = ROBJECT_IV_COUNT(obj);
-                for (i  = 0; i < len; i++) {
-                    gc_mark(objspace, ptr[i]);
-                }
-            }
-            if (shape) {
-                VALUE klass = RBASIC_CLASS(obj);
-
-                // Increment max_iv_count if applicable, used to determine size pool allocation
-                attr_index_t num_of_ivs = shape->next_iv_index;
-                if (RCLASS_EXT(klass)->max_iv_count < num_of_ivs) {
-                    RCLASS_EXT(klass)->max_iv_count = num_of_ivs;
-                }
-            }
-        }
-        break;
-
-      case T_FILE:
-        if (any->as.file.fptr) {
-            gc_mark(objspace, any->as.file.fptr->self);
-            gc_mark(objspace, any->as.file.fptr->pathv);
-            gc_mark(objspace, any->as.file.fptr->tied_io_for_writing);
-            gc_mark(objspace, any->as.file.fptr->writeconv_asciicompat);
-            gc_mark(objspace, any->as.file.fptr->writeconv_pre_ecopts);
-            gc_mark(objspace, any->as.file.fptr->encs.ecopts);
-            gc_mark(objspace, any->as.file.fptr->write_lock);
-            gc_mark(objspace, any->as.file.fptr->timeout);
-        }
-        break;
-
-      case T_REGEXP:
-        gc_mark(objspace, any->as.regexp.src);
-        break;
-
-      case T_MATCH:
-        gc_mark(objspace, any->as.match.regexp);
-        if (any->as.match.str) {
-            gc_mark(objspace, any->as.match.str);
-        }
-        break;
-
-      case T_RATIONAL:
-        gc_mark(objspace, any->as.rational.num);
-        gc_mark(objspace, any->as.rational.den);
-        break;
-
-      case T_COMPLEX:
-        gc_mark(objspace, any->as.complex.real);
-        gc_mark(objspace, any->as.complex.imag);
-        break;
-
-      case T_STRUCT:
-        {
-            long i;
-            const long len = RSTRUCT_LEN(obj);
-            const VALUE * const ptr = RSTRUCT_CONST_PTR(obj);
-
-            for (i=0; i<len; i++) {
-                gc_mark(objspace, ptr[i]);
-            }
-        }
-        break;
-
-      default:
-#if GC_DEBUG
-        rb_gcdebug_print_obj_condition((VALUE)obj);
-#endif
-        if (BUILTIN_TYPE(obj) == T_MOVED)   rb_bug("rb_gc_mark(): %p is T_MOVED", (void *)obj);
-        if (BUILTIN_TYPE(obj) == T_NONE)   rb_bug("rb_gc_mark(): %p is T_NONE", (void *)obj);
-        if (BUILTIN_TYPE(obj) == T_ZOMBIE) rb_bug("rb_gc_mark(): %p is T_ZOMBIE", (void *)obj);
-        rb_bug("rb_gc_mark(): unknown data type 0x%x(%p) %s",
-               BUILTIN_TYPE(obj), (void *)any,
-               is_pointer_to_heap(objspace, any) ? "corrupted object" : "non object");
-    }
-}
-
-/**
- * incremental: 0 -> not incremental (do all)
- * incremental: n -> mark at most `n' objects
- */
-static inline int
-gc_mark_stacked_objects(rb_objspace_t *objspace, int incremental, size_t count)
-{
-    mark_stack_t *mstack = &objspace->mark_stack;
-    VALUE obj;
-    size_t marked_slots_at_the_beginning = objspace->marked_slots;
-    size_t popped_count = 0;
-
-    while (pop_mark_stack(mstack, &obj)) {
-        if (UNDEF_P(obj)) continue; /* skip */
-
-        if (RGENGC_CHECK_MODE && !RVALUE_MARKED(obj)) {
-            rb_bug("gc_mark_stacked_objects: %s is not marked.", obj_info(obj));
-        }
-        gc_mark_children(objspace, obj);
-
-        if (incremental) {
-            if (RGENGC_CHECK_MODE && !RVALUE_MARKING(obj)) {
-                rb_bug("gc_mark_stacked_objects: incremental, but marking bit is 0");
-            }
-            CLEAR_IN_BITMAP(GET_HEAP_MARKING_BITS(obj), obj);
-            popped_count++;
-
-            if (popped_count + (objspace->marked_slots - marked_slots_at_the_beginning) > count) {
-                break;
-            }
-        }
-        else {
-            /* just ignore marking bits */
-        }
-    }
-
-    if (RGENGC_CHECK_MODE >= 3) gc_verify_internal_consistency(objspace);
-
-    if (is_mark_stack_empty(mstack)) {
-        shrink_stack_chunk_cache(mstack);
-        return TRUE;
-    }
-    else {
-        return FALSE;
-    }
-}
-
-static int
-gc_mark_stacked_objects_incremental(rb_objspace_t *objspace, size_t count)
-{
-    return gc_mark_stacked_objects(objspace, TRUE, count);
-}
-
-static int
-gc_mark_stacked_objects_all(rb_objspace_t *objspace)
-{
-    return gc_mark_stacked_objects(objspace, FALSE, 0);
-}
-
-#if PRINT_ROOT_TICKS
-#define MAX_TICKS 0x100
-static tick_t mark_ticks[MAX_TICKS];
-static const char *mark_ticks_categories[MAX_TICKS];
-
-static void
-show_mark_ticks(void)
-{
-    int i;
-    fprintf(stderr, "mark ticks result:\n");
-    for (i=0; i<MAX_TICKS; i++) {
-        const char *category = mark_ticks_categories[i];
-        if (category) {
-            fprintf(stderr, "%s\t%8lu\n", category, (unsigned long)mark_ticks[i]);
-        }
-        else {
-            break;
-        }
-    }
-}
-
-#endif /* PRINT_ROOT_TICKS */
-
-static void
-gc_mark_roots(rb_objspace_t *objspace, const char **categoryp)
-{
-    struct gc_list *list;
-    rb_execution_context_t *ec = GET_EC();
-    rb_vm_t *vm = rb_ec_vm_ptr(ec);
-
-#if PRINT_ROOT_TICKS
-    tick_t start_tick = tick();
-    int tick_count = 0;
-    const char *prev_category = 0;
-
-    if (mark_ticks_categories[0] == 0) {
-        atexit(show_mark_ticks);
-    }
-#endif
-
-    if (categoryp) *categoryp = "xxx";
-
-    objspace->rgengc.parent_object = Qfalse;
-
-#if PRINT_ROOT_TICKS
-#define MARK_CHECKPOINT_PRINT_TICK(category) do { \
-    if (prev_category) { \
-        tick_t t = tick(); \
-        mark_ticks[tick_count] = t - start_tick; \
-        mark_ticks_categories[tick_count] = prev_category; \
-        tick_count++; \
-    } \
-    prev_category = category; \
-    start_tick = tick(); \
-} while (0)
-#else /* PRINT_ROOT_TICKS */
-#define MARK_CHECKPOINT_PRINT_TICK(category)
-#endif
-
-#define MARK_CHECKPOINT(category) do { \
-    if (categoryp) *categoryp = category; \
-    MARK_CHECKPOINT_PRINT_TICK(category); \
-} while (0)
-
-    MARK_CHECKPOINT("vm");
-    SET_STACK_END;
-    rb_vm_mark(vm);
-    if (vm->self) gc_mark(objspace, vm->self);
-
-    MARK_CHECKPOINT("finalizers");
-    mark_finalizer_tbl(objspace, finalizer_table);
-
-    MARK_CHECKPOINT("machine_context");
-    mark_current_machine_context(objspace, ec);
-
-    /* mark protected global variables */
-    MARK_CHECKPOINT("global_list");
-    for (list = global_list; list; list = list->next) {
-        gc_mark_maybe(objspace, *list->varptr);
-    }
-
-    MARK_CHECKPOINT("end_proc");
-    rb_mark_end_proc();
-
-    MARK_CHECKPOINT("global_tbl");
-    rb_gc_mark_global_tbl();
-
-    MARK_CHECKPOINT("object_id");
-    rb_gc_mark(objspace->next_object_id);
-    mark_tbl_no_pin(objspace, objspace->obj_to_id_tbl); /* Only mark ids */
-
-    if (stress_to_class) rb_gc_mark(stress_to_class);
-
-    MARK_CHECKPOINT("finish");
-#undef MARK_CHECKPOINT
-}
-
-#if RGENGC_CHECK_MODE >= 4
-
-#define MAKE_ROOTSIG(obj) (((VALUE)(obj) << 1) | 0x01)
-#define IS_ROOTSIG(obj)   ((VALUE)(obj) & 0x01)
-#define GET_ROOTSIG(obj)  ((const char *)((VALUE)(obj) >> 1))
-
-struct reflist {
-    VALUE *list;
-    int pos;
-    int size;
-};
-
-static struct reflist *
-reflist_create(VALUE obj)
-{
-    struct reflist *refs = xmalloc(sizeof(struct reflist));
-    refs->size = 1;
-    refs->list = ALLOC_N(VALUE, refs->size);
-    refs->list[0] = obj;
-    refs->pos = 1;
-    return refs;
-}
-
-static void
-reflist_destruct(struct reflist *refs)
-{
-    xfree(refs->list);
-    xfree(refs);
-}
-
-static void
-reflist_add(struct reflist *refs, VALUE obj)
-{
-    if (refs->pos == refs->size) {
-        refs->size *= 2;
-        SIZED_REALLOC_N(refs->list, VALUE, refs->size, refs->size/2);
-    }
-
-    refs->list[refs->pos++] = obj;
-}
-
-static void
-reflist_dump(struct reflist *refs)
-{
-    int i;
-    for (i=0; i<refs->pos; i++) {
-        VALUE obj = refs->list[i];
-        if (IS_ROOTSIG(obj)) { /* root */
-            fprintf(stderr, "<root@%s>", GET_ROOTSIG(obj));
-        }
-        else {
-            fprintf(stderr, "<%s>", obj_info(obj));
-        }
-        if (i+1 < refs->pos) fprintf(stderr, ", ");
-    }
-}
-
-static int
-reflist_referred_from_machine_context(struct reflist *refs)
-{
-    int i;
-    for (i=0; i<refs->pos; i++) {
-        VALUE obj = refs->list[i];
-        if (IS_ROOTSIG(obj) && strcmp(GET_ROOTSIG(obj), "machine_context") == 0) return 1;
-    }
-    return 0;
-}
-
-struct allrefs {
-    rb_objspace_t *objspace;
-    /* a -> obj1
-     * b -> obj1
-     * c -> obj1
-     * c -> obj2
-     * d -> obj3
-     * #=> {obj1 => [a, b, c], obj2 => [c, d]}
-     */
-    struct st_table *references;
-    const char *category;
-    VALUE root_obj;
-    mark_stack_t mark_stack;
-};
-
-static int
-allrefs_add(struct allrefs *data, VALUE obj)
-{
-    struct reflist *refs;
-    st_data_t r;
-
-    if (st_lookup(data->references, obj, &r)) {
-        refs = (struct reflist *)r;
-        reflist_add(refs, data->root_obj);
-        return 0;
-    }
-    else {
-        refs = reflist_create(data->root_obj);
-        st_insert(data->references, obj, (st_data_t)refs);
-        return 1;
-    }
-}
-
-static void
-allrefs_i(VALUE obj, void *ptr)
-{
-    struct allrefs *data = (struct allrefs *)ptr;
-
-    if (allrefs_add(data, obj)) {
-        push_mark_stack(&data->mark_stack, obj);
-    }
-}
-
-static void
-allrefs_roots_i(VALUE obj, void *ptr)
-{
-    struct allrefs *data = (struct allrefs *)ptr;
-    if (strlen(data->category) == 0) rb_bug("!!!");
-    data->root_obj = MAKE_ROOTSIG(data->category);
-
-    if (allrefs_add(data, obj)) {
-        push_mark_stack(&data->mark_stack, obj);
-    }
-}
-#define PUSH_MARK_FUNC_DATA(v) do { \
-    struct gc_mark_func_data_struct *prev_mark_func_data = GET_RACTOR()->mfd; \
-    GET_RACTOR()->mfd = (v);
-
-#define POP_MARK_FUNC_DATA() GET_RACTOR()->mfd = prev_mark_func_data;} while (0)
-
-static st_table *
-objspace_allrefs(rb_objspace_t *objspace)
-{
-    struct allrefs data;
-    struct gc_mark_func_data_struct mfd;
-    VALUE obj;
-    int prev_dont_gc = dont_gc_val();
-    dont_gc_on();
-
-    data.objspace = objspace;
-    data.references = st_init_numtable();
-    init_mark_stack(&data.mark_stack);
-
-    mfd.mark_func = allrefs_roots_i;
-    mfd.data = &data;
-
-    /* traverse root objects */
-    PUSH_MARK_FUNC_DATA(&mfd);
-    GET_RACTOR()->mfd = &mfd;
-    gc_mark_roots(objspace, &data.category);
-    POP_MARK_FUNC_DATA();
-
-    /* traverse rest objects reachable from root objects */
-    while (pop_mark_stack(&data.mark_stack, &obj)) {
-        rb_objspace_reachable_objects_from(data.root_obj = obj, allrefs_i, &data);
-    }
-    free_stack_chunks(&data.mark_stack);
-
-    dont_gc_set(prev_dont_gc);
-    return data.references;
-}
-
-static int
-objspace_allrefs_destruct_i(st_data_t key, st_data_t value, st_data_t ptr)
-{
-    struct reflist *refs = (struct reflist *)value;
-    reflist_destruct(refs);
-    return ST_CONTINUE;
-}
-
-static void
-objspace_allrefs_destruct(struct st_table *refs)
-{
-    st_foreach(refs, objspace_allrefs_destruct_i, 0);
-    st_free_table(refs);
-}
-
-#if RGENGC_CHECK_MODE >= 5
-static int
-allrefs_dump_i(st_data_t k, st_data_t v, st_data_t ptr)
-{
-    VALUE obj = (VALUE)k;
-    struct reflist *refs = (struct reflist *)v;
-    fprintf(stderr, "[allrefs_dump_i] %s <- ", obj_info(obj));
-    reflist_dump(refs);
-    fprintf(stderr, "\n");
-    return ST_CONTINUE;
-}
-
-static void
-allrefs_dump(rb_objspace_t *objspace)
-{
-    VALUE size = objspace->rgengc.allrefs_table->num_entries;
-    fprintf(stderr, "[all refs] (size: %"PRIuVALUE")\n", size);
-    st_foreach(objspace->rgengc.allrefs_table, allrefs_dump_i, 0);
-}
-#endif
-
-static int
-gc_check_after_marks_i(st_data_t k, st_data_t v, st_data_t ptr)
-{
-    VALUE obj = k;
-    struct reflist *refs = (struct reflist *)v;
-    rb_objspace_t *objspace = (rb_objspace_t *)ptr;
-
-    /* object should be marked or oldgen */
-    if (!MARKED_IN_BITMAP(GET_HEAP_MARK_BITS(obj), obj)) {
-        fprintf(stderr, "gc_check_after_marks_i: %s is not marked and not oldgen.\n", obj_info(obj));
-        fprintf(stderr, "gc_check_after_marks_i: %p is referred from ", (void *)obj);
-        reflist_dump(refs);
-
-        if (reflist_referred_from_machine_context(refs)) {
-            fprintf(stderr, " (marked from machine stack).\n");
-            /* marked from machine context can be false positive */
-        }
-        else {
-            objspace->rgengc.error_count++;
-            fprintf(stderr, "\n");
-        }
-    }
-    return ST_CONTINUE;
-}
-
-static void
-gc_marks_check(rb_objspace_t *objspace, st_foreach_callback_func *checker_func, const char *checker_name)
-{
-    size_t saved_malloc_increase = objspace->malloc_params.increase;
-#if RGENGC_ESTIMATE_OLDMALLOC
-    size_t saved_oldmalloc_increase = objspace->rgengc.oldmalloc_increase;
-#endif
-    VALUE already_disabled = rb_objspace_gc_disable(objspace);
-
-    objspace->rgengc.allrefs_table = objspace_allrefs(objspace);
-
-    if (checker_func) {
-        st_foreach(objspace->rgengc.allrefs_table, checker_func, (st_data_t)objspace);
-    }
-
-    if (objspace->rgengc.error_count > 0) {
-#if RGENGC_CHECK_MODE >= 5
-        allrefs_dump(objspace);
-#endif
-        if (checker_name) rb_bug("%s: GC has problem.", checker_name);
-    }
-
-    objspace_allrefs_destruct(objspace->rgengc.allrefs_table);
-    objspace->rgengc.allrefs_table = 0;
-
-    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;
-#endif
-}
-#endif /* RGENGC_CHECK_MODE >= 4 */
-
-struct verify_internal_consistency_struct {
-    rb_objspace_t *objspace;
-    int err_count;
-    size_t live_object_count;
-    size_t zombie_object_count;
-
-    VALUE parent;
-    size_t old_object_count;
-    size_t remembered_shady_count;
-};
-
-static void
-check_generation_i(const VALUE child, void *ptr)
-{
-    struct verify_internal_consistency_struct *data = (struct verify_internal_consistency_struct *)ptr;
-    const VALUE parent = data->parent;
-
-    if (RGENGC_CHECK_MODE) GC_ASSERT(RVALUE_OLD_P(parent));
-
-    if (!RVALUE_OLD_P(child)) {
-        if (!RVALUE_REMEMBERED(parent) &&
-            !RVALUE_REMEMBERED(child) &&
-            !RVALUE_UNCOLLECTIBLE(child)) {
-            fprintf(stderr, "verify_internal_consistency_reachable_i: WB miss (O->Y) %s -> %s\n", obj_info(parent), obj_info(child));
-            data->err_count++;
-        }
-    }
-}
-
-static void
-check_color_i(const VALUE child, void *ptr)
-{
-    struct verify_internal_consistency_struct *data = (struct verify_internal_consistency_struct *)ptr;
-    const VALUE parent = data->parent;
-
-    if (!RVALUE_WB_UNPROTECTED(parent) && RVALUE_WHITE_P(child)) {
-        fprintf(stderr, "verify_internal_consistency_reachable_i: WB miss (B->W) - %s -> %s\n",
-                obj_info(parent), obj_info(child));
-        data->err_count++;
-    }
-}
-
-static void
-check_children_i(const VALUE child, void *ptr)
-{
-    struct verify_internal_consistency_struct *data = (struct verify_internal_consistency_struct *)ptr;
-    if (check_rvalue_consistency_force(child, FALSE) != 0) {
-        fprintf(stderr, "check_children_i: %s has error (referenced from %s)",
-                obj_info(child), obj_info(data->parent));
-        rb_print_backtrace(); /* C backtrace will help to debug */
-
-        data->err_count++;
-    }
-}
-
-static int
-verify_internal_consistency_i(void *page_start, void *page_end, size_t stride,
-                              struct verify_internal_consistency_struct *data)
-{
-    VALUE obj;
-    rb_objspace_t *objspace = data->objspace;
-
-    for (obj = (VALUE)page_start; obj != (VALUE)page_end; obj += stride) {
-        void *poisoned = asan_unpoison_object_temporary(obj);
-
-        if (is_live_object(objspace, obj)) {
-            /* count objects */
-            data->live_object_count++;
-            data->parent = obj;
-
-            /* Normally, we don't expect T_MOVED objects to be in the heap.
-             * But they can stay alive on the stack, */
-            if (!gc_object_moved_p(objspace, obj)) {
-                /* moved slots don't have children */
-                rb_objspace_reachable_objects_from(obj, check_children_i, (void *)data);
-            }
-
-            /* check health of children */
-            if (RVALUE_OLD_P(obj)) data->old_object_count++;
-            if (RVALUE_WB_UNPROTECTED(obj) && RVALUE_UNCOLLECTIBLE(obj)) data->remembered_shady_count++;
-
-            if (!is_marking(objspace) && RVALUE_OLD_P(obj)) {
-                /* reachable objects from an oldgen object should be old or (young with remember) */
-                data->parent = obj;
-                rb_objspace_reachable_objects_from(obj, check_generation_i, (void *)data);
-            }
-
-            if (is_incremental_marking(objspace)) {
-                if (RVALUE_BLACK_P(obj)) {
-                    /* reachable objects from black objects should be black or grey objects */
-                    data->parent = obj;
-                    rb_objspace_reachable_objects_from(obj, check_color_i, (void *)data);
-                }
-            }
-        }
-        else {
-            if (BUILTIN_TYPE(obj) == T_ZOMBIE) {
-                GC_ASSERT((RBASIC(obj)->flags & ~FL_SEEN_OBJ_ID) == T_ZOMBIE);
-                data->zombie_object_count++;
-            }
-        }
-        if (poisoned) {
-            GC_ASSERT(BUILTIN_TYPE(obj) == T_NONE);
-            asan_poison_object(obj);
-        }
-    }
-
-    return 0;
-}
-
-static int
-gc_verify_heap_page(rb_objspace_t *objspace, struct heap_page *page, VALUE obj)
-{
-    unsigned int has_remembered_shady = FALSE;
-    unsigned int has_remembered_old = FALSE;
-    int remembered_old_objects = 0;
-    int free_objects = 0;
-    int zombie_objects = 0;
-
-    short slot_size = page->slot_size;
-    uintptr_t start = (uintptr_t)page->start;
-    uintptr_t end = start + page->total_slots * slot_size;
-
-    for (uintptr_t ptr = start; ptr < end; ptr += slot_size) {
-        VALUE val = (VALUE)ptr;
-        void *poisoned = asan_unpoison_object_temporary(val);
-        enum ruby_value_type type = BUILTIN_TYPE(val);
-
-        if (type == T_NONE) free_objects++;
-        if (type == T_ZOMBIE) zombie_objects++;
-        if (RVALUE_PAGE_UNCOLLECTIBLE(page, val) && RVALUE_PAGE_WB_UNPROTECTED(page, val)) {
-            has_remembered_shady = TRUE;
-        }
-        if (RVALUE_PAGE_MARKING(page, val)) {
-            has_remembered_old = TRUE;
-            remembered_old_objects++;
-        }
-
-        if (poisoned) {
-            GC_ASSERT(BUILTIN_TYPE(val) == T_NONE);
-            asan_poison_object(val);
-        }
-    }
-
-    if (!is_incremental_marking(objspace) &&
-        page->flags.has_remembered_objects == FALSE && has_remembered_old == TRUE) {
-
-        for (uintptr_t ptr = start; ptr < end; ptr += slot_size) {
-            VALUE val = (VALUE)ptr;
-            if (RVALUE_PAGE_MARKING(page, val)) {
-                fprintf(stderr, "marking -> %s\n", obj_info(val));
-            }
-        }
-        rb_bug("page %p's has_remembered_objects should be false, but there are remembered old objects (%d). %s",
-               (void *)page, remembered_old_objects, obj ? obj_info(obj) : "");
-    }
-
-    if (page->flags.has_uncollectible_wb_unprotected_objects == FALSE && has_remembered_shady == TRUE) {
-        rb_bug("page %p's has_remembered_shady should be false, but there are remembered shady objects. %s",
-               (void *)page, obj ? obj_info(obj) : "");
-    }
-
-    if (0) {
-        /* free_slots may not equal to free_objects */
-        if (page->free_slots != free_objects) {
-            rb_bug("page %p's free_slots should be %d, but %d", (void *)page, page->free_slots, free_objects);
-        }
-    }
-    if (page->final_slots != zombie_objects) {
-        rb_bug("page %p's final_slots should be %d, but %d", (void *)page, page->final_slots, zombie_objects);
-    }
-
-    return remembered_old_objects;
-}
-
-static int
-gc_verify_heap_pages_(rb_objspace_t *objspace, struct ccan_list_head *head)
-{
-    int remembered_old_objects = 0;
-    struct heap_page *page = 0;
-
-    ccan_list_for_each(head, page, page_node) {
-        asan_unlock_freelist(page);
-        RVALUE *p = page->freelist;
-        while (p) {
-            VALUE vp = (VALUE)p;
-            VALUE prev = vp;
-            asan_unpoison_object(vp, false);
-            if (BUILTIN_TYPE(vp) != T_NONE) {
-                fprintf(stderr, "freelist slot expected to be T_NONE but was: %s\n", obj_info(vp));
-            }
-            p = p->as.free.next;
-            asan_poison_object(prev);
-        }
-        asan_lock_freelist(page);
-
-        if (page->flags.has_remembered_objects == FALSE) {
-            remembered_old_objects += gc_verify_heap_page(objspace, page, Qfalse);
-        }
-    }
-
-    return remembered_old_objects;
-}
-
-static int
-gc_verify_heap_pages(rb_objspace_t *objspace)
-{
-    int remembered_old_objects = 0;
-    for (int i = 0; i < SIZE_POOL_COUNT; i++) {
-        remembered_old_objects += gc_verify_heap_pages_(objspace, &(SIZE_POOL_EDEN_HEAP(&size_pools[i])->pages));
-        remembered_old_objects += gc_verify_heap_pages_(objspace, &(SIZE_POOL_TOMB_HEAP(&size_pools[i])->pages));
-    }
-    return remembered_old_objects;
-}
-
-/*
- *  call-seq:
- *     GC.verify_internal_consistency                  -> nil
- *
- *  Verify internal consistency.
- *
- *  This method is implementation specific.
- *  Now this method checks generational consistency
- *  if RGenGC is supported.
- */
-static VALUE
-gc_verify_internal_consistency_m(VALUE dummy)
-{
-    gc_verify_internal_consistency(&rb_objspace);
-    return Qnil;
-}
-
-static void
-gc_verify_internal_consistency_(rb_objspace_t *objspace)
-{
-    struct verify_internal_consistency_struct data = {0};
-
-    data.objspace = objspace;
-    gc_report(5, objspace, "gc_verify_internal_consistency: start\n");
-
-    /* check relations */
-    for (size_t i = 0; i < heap_allocated_pages; i++) {
-        struct heap_page *page = heap_pages_sorted[i];
-        short slot_size = page->slot_size;
-
-        uintptr_t start = (uintptr_t)page->start;
-        uintptr_t end = start + page->total_slots * slot_size;
-
-        verify_internal_consistency_i((void *)start, (void *)end, slot_size, &data);
-    }
-
-    if (data.err_count != 0) {
-#if RGENGC_CHECK_MODE >= 5
-        objspace->rgengc.error_count = data.err_count;
-        gc_marks_check(objspace, NULL, NULL);
-        allrefs_dump(objspace);
-#endif
-        rb_bug("gc_verify_internal_consistency: found internal inconsistency.");
-    }
-
-    /* check heap_page status */
-    gc_verify_heap_pages(objspace);
-
-    /* check counters */
-
-    if (!is_lazy_sweeping(objspace) &&
-        !finalizing &&
-        ruby_single_main_ractor != NULL) {
-        if (objspace_live_slots(objspace) != data.live_object_count) {
-            fprintf(stderr, "heap_pages_final_slots: %"PRIdSIZE", total_freed_objects: %"PRIdSIZE"\n",
-                    heap_pages_final_slots, total_freed_objects(objspace));
-            rb_bug("inconsistent live slot number: expect %"PRIuSIZE", but %"PRIuSIZE".",
-                   objspace_live_slots(objspace), data.live_object_count);
-        }
-    }
-
-    if (!is_marking(objspace)) {
-        if (objspace->rgengc.old_objects != data.old_object_count) {
-            rb_bug("inconsistent old slot number: expect %"PRIuSIZE", but %"PRIuSIZE".",
-                   objspace->rgengc.old_objects, data.old_object_count);
-        }
-        if (objspace->rgengc.uncollectible_wb_unprotected_objects != data.remembered_shady_count) {
-            rb_bug("inconsistent number of wb unprotected objects: expect %"PRIuSIZE", but %"PRIuSIZE".",
-                   objspace->rgengc.uncollectible_wb_unprotected_objects, data.remembered_shady_count);
-        }
-    }
-
-    if (!finalizing) {
-        size_t list_count = 0;
-
-        {
-            VALUE z = heap_pages_deferred_final;
-            while (z) {
-                list_count++;
-                z = RZOMBIE(z)->next;
-            }
-        }
-
-        if (heap_pages_final_slots != data.zombie_object_count ||
-            heap_pages_final_slots != list_count) {
-
-            rb_bug("inconsistent finalizing object count:\n"
-                    "  expect %"PRIuSIZE"\n"
-                    "  but    %"PRIuSIZE" zombies\n"
-                    "  heap_pages_deferred_final list has %"PRIuSIZE" items.",
-                    heap_pages_final_slots,
-                    data.zombie_object_count,
-                    list_count);
-        }
-    }
-
-    gc_report(5, objspace, "gc_verify_internal_consistency: OK\n");
-}
-
-static void
-gc_verify_internal_consistency(rb_objspace_t *objspace)
-{
-    RB_VM_LOCK_ENTER();
-    {
-        rb_vm_barrier(); // stop other ractors
-
-        unsigned int prev_during_gc = during_gc;
-        during_gc = FALSE; // stop gc here
-        {
-            gc_verify_internal_consistency_(objspace);
-        }
-        during_gc = prev_during_gc;
-    }
-    RB_VM_LOCK_LEAVE();
-}
-
-void
-rb_gc_verify_internal_consistency(void)
-{
-    gc_verify_internal_consistency(&rb_objspace);
-}
-
-static void
-heap_move_pooled_pages_to_free_pages(rb_heap_t *heap)
-{
-    if (heap->pooled_pages) {
-        if (heap->free_pages) {
-            struct heap_page *free_pages_tail = heap->free_pages;
-            while (free_pages_tail->free_next) {
-                free_pages_tail = free_pages_tail->free_next;
-            }
-            free_pages_tail->free_next = heap->pooled_pages;
-        }
-        else {
-            heap->free_pages = heap->pooled_pages;
-        }
-
-        heap->pooled_pages = NULL;
-    }
-}
-
-/* marks */
-
-static void
-gc_marks_start(rb_objspace_t *objspace, int full_mark)
-{
-    /* start marking */
-    gc_report(1, objspace, "gc_marks_start: (%s)\n", full_mark ? "full" : "minor");
-    gc_mode_transition(objspace, gc_mode_marking);
-
-    if (full_mark) {
-        size_t incremental_marking_steps = (objspace->rincgc.pooled_slots / INCREMENTAL_MARK_STEP_ALLOCATIONS) + 1;
-        objspace->rincgc.step_slots = (objspace->marked_slots * 2) / incremental_marking_steps;
-
-        if (0) fprintf(stderr, "objspace->marked_slots: %"PRIdSIZE", "
-                       "objspace->rincgc.pooled_page_num: %"PRIdSIZE", "
-                       "objspace->rincgc.step_slots: %"PRIdSIZE", \n",
-                       objspace->marked_slots, objspace->rincgc.pooled_slots, objspace->rincgc.step_slots);
-        objspace->flags.during_minor_gc = FALSE;
-        if (ruby_enable_autocompact) {
-            objspace->flags.during_compacting |= TRUE;
-        }
-        objspace->profile.major_gc_count++;
-        objspace->rgengc.uncollectible_wb_unprotected_objects = 0;
-        objspace->rgengc.old_objects = 0;
-        objspace->rgengc.last_major_gc = objspace->profile.count;
-        objspace->marked_slots = 0;
-
-        for (int i = 0; i < SIZE_POOL_COUNT; i++) {
-            rb_size_pool_t *size_pool = &size_pools[i];
-            rb_heap_t *heap = SIZE_POOL_EDEN_HEAP(size_pool);
-            rgengc_mark_and_rememberset_clear(objspace, heap);
-            heap_move_pooled_pages_to_free_pages(heap);
-        }
-    }
-    else {
-        objspace->flags.during_minor_gc = TRUE;
-        objspace->marked_slots =
-          objspace->rgengc.old_objects + objspace->rgengc.uncollectible_wb_unprotected_objects; /* uncollectible objects are marked already */
-        objspace->profile.minor_gc_count++;
-
-        for (int i = 0; i < SIZE_POOL_COUNT; i++) {
-            rgengc_rememberset_mark(objspace, SIZE_POOL_EDEN_HEAP(&size_pools[i]));
-        }
-    }
-
-    gc_mark_roots(objspace, NULL);
-
-    gc_report(1, objspace, "gc_marks_start: (%s) end, stack in %"PRIdSIZE"\n",
-              full_mark ? "full" : "minor", mark_stack_size(&objspace->mark_stack));
-}
-
-static inline void
-gc_marks_wb_unprotected_objects_plane(rb_objspace_t *objspace, uintptr_t p, bits_t bits)
-{
-    if (bits) {
-        do {
-            if (bits & 1) {
-                gc_report(2, objspace, "gc_marks_wb_unprotected_objects: marked shady: %s\n", obj_info((VALUE)p));
-                GC_ASSERT(RVALUE_WB_UNPROTECTED((VALUE)p));
-                GC_ASSERT(RVALUE_MARKED((VALUE)p));
-                gc_mark_children(objspace, (VALUE)p);
-            }
-            p += BASE_SLOT_SIZE;
-            bits >>= 1;
-        } while (bits);
-    }
-}
-
-static void
-gc_marks_wb_unprotected_objects(rb_objspace_t *objspace, rb_heap_t *heap)
-{
-    struct heap_page *page = 0;
-
-    ccan_list_for_each(&heap->pages, page, page_node) {
-        bits_t *mark_bits = page->mark_bits;
-        bits_t *wbun_bits = page->wb_unprotected_bits;
-        uintptr_t p = page->start;
-        size_t j;
-
-        bits_t bits = mark_bits[0] & wbun_bits[0];
-        bits >>= NUM_IN_PAGE(p);
-        gc_marks_wb_unprotected_objects_plane(objspace, p, bits);
-        p += (BITS_BITLENGTH - NUM_IN_PAGE(p)) * BASE_SLOT_SIZE;
-
-        for (j=1; j<HEAP_PAGE_BITMAP_LIMIT; j++) {
-            bits_t bits = mark_bits[j] & wbun_bits[j];
-
-            gc_marks_wb_unprotected_objects_plane(objspace, p, bits);
-            p += BITS_BITLENGTH * BASE_SLOT_SIZE;
-        }
-    }
-
-    gc_mark_stacked_objects_all(objspace);
-}
-
-static void
-gc_update_weak_references(rb_objspace_t *objspace)
-{
-    size_t retained_weak_references_count = 0;
-    VALUE **ptr_ptr;
-    rb_darray_foreach(objspace->weak_references, i, ptr_ptr) {
-        if (!ptr_ptr) continue;
-
-        VALUE obj = **ptr_ptr;
-
-        if (RB_SPECIAL_CONST_P(obj)) continue;
-
-        if (!RVALUE_MARKED(obj)) {
-            **ptr_ptr = Qundef;
-        }
-        else {
-            retained_weak_references_count++;
-        }
-    }
-
-    objspace->profile.retained_weak_references_count = retained_weak_references_count;
-
-    rb_darray_clear(objspace->weak_references);
-    rb_darray_resize_capa_without_gc(&objspace->weak_references, retained_weak_references_count);
-}
-
-static void
-gc_marks_finish(rb_objspace_t *objspace)
-{
-    /* finish incremental GC */
-    if (is_incremental_marking(objspace)) {
-        if (RGENGC_CHECK_MODE && is_mark_stack_empty(&objspace->mark_stack) == 0) {
-            rb_bug("gc_marks_finish: mark stack is not empty (%"PRIdSIZE").",
-                   mark_stack_size(&objspace->mark_stack));
-        }
-
-        gc_mark_roots(objspace, 0);
-        while (gc_mark_stacked_objects_incremental(objspace, INT_MAX) == false);
-
-#if RGENGC_CHECK_MODE >= 2
-        if (gc_verify_heap_pages(objspace) != 0) {
-            rb_bug("gc_marks_finish (incremental): there are remembered old objects.");
-        }
-#endif
-
-        objspace->flags.during_incremental_marking = FALSE;
-        /* check children of all marked wb-unprotected objects */
-        for (int i = 0; i < SIZE_POOL_COUNT; i++) {
-            gc_marks_wb_unprotected_objects(objspace, SIZE_POOL_EDEN_HEAP(&size_pools[i]));
-        }
-    }
-
-    gc_update_weak_references(objspace);
-
-#if RGENGC_CHECK_MODE >= 2
-    gc_verify_internal_consistency(objspace);
-#endif
-
-#if RGENGC_CHECK_MODE >= 4
-    during_gc = FALSE;
-    gc_marks_check(objspace, gc_check_after_marks_i, "after_marks");
-    during_gc = TRUE;
-#endif
-
-    {
-        /* decide full GC is needed or not */
-        size_t total_slots = heap_allocatable_slots(objspace) + heap_eden_total_slots(objspace);
-        size_t sweep_slots = total_slots - objspace->marked_slots; /* will be swept slots */
-        size_t max_free_slots = (size_t)(total_slots * gc_params.heap_free_slots_max_ratio);
-        size_t min_free_slots = (size_t)(total_slots * gc_params.heap_free_slots_min_ratio);
-        int full_marking = is_full_marking(objspace);
-        const int r_cnt = GET_VM()->ractor.cnt;
-        const int r_mul = r_cnt > 8 ? 8 : r_cnt; // upto 8
-
-        GC_ASSERT(heap_eden_total_slots(objspace) >= objspace->marked_slots);
-
-        /* Setup freeable slots. */
-        size_t total_init_slots = 0;
-        for (int i = 0; i < SIZE_POOL_COUNT; i++) {
-            total_init_slots += gc_params.size_pool_init_slots[i] * r_mul;
-        }
-
-        if (max_free_slots < total_init_slots) {
-            max_free_slots = total_init_slots;
-        }
-
-        if (sweep_slots > max_free_slots) {
-            heap_pages_freeable_pages = (sweep_slots - max_free_slots) / HEAP_PAGE_OBJ_LIMIT;
-        }
-        else {
-            heap_pages_freeable_pages = 0;
-        }
-
-        /* check free_min */
-        if (min_free_slots < gc_params.heap_free_slots * r_mul) {
-            min_free_slots = gc_params.heap_free_slots * r_mul;
-        }
-
-        if (sweep_slots < min_free_slots) {
-            if (!full_marking) {
-                if (objspace->profile.count - objspace->rgengc.last_major_gc < RVALUE_OLD_AGE) {
-                    full_marking = TRUE;
-                    /* do not update last_major_gc, because full marking is not done. */
-                    /* goto increment; */
-                }
-                else {
-                    gc_report(1, objspace, "gc_marks_finish: next is full GC!!)\n");
-                    objspace->rgengc.need_major_gc |= GPR_FLAG_MAJOR_BY_NOFREE;
-                }
-            }
-        }
-
-        if (full_marking) {
-            /* See the comment about RUBY_GC_HEAP_OLDOBJECT_LIMIT_FACTOR */
-            const double r = gc_params.oldobject_limit_factor;
-            objspace->rgengc.uncollectible_wb_unprotected_objects_limit = MAX(
-                (size_t)(objspace->rgengc.uncollectible_wb_unprotected_objects * r),
-                (size_t)(objspace->rgengc.old_objects * gc_params.uncollectible_wb_unprotected_objects_limit_ratio)
-            );
-            objspace->rgengc.old_objects_limit = (size_t)(objspace->rgengc.old_objects * r);
-        }
-
-        if (objspace->rgengc.uncollectible_wb_unprotected_objects > objspace->rgengc.uncollectible_wb_unprotected_objects_limit) {
-            objspace->rgengc.need_major_gc |= GPR_FLAG_MAJOR_BY_SHADY;
-        }
-        if (objspace->rgengc.old_objects > objspace->rgengc.old_objects_limit) {
-            objspace->rgengc.need_major_gc |= GPR_FLAG_MAJOR_BY_OLDGEN;
-        }
-        if (RGENGC_FORCE_MAJOR_GC) {
-            objspace->rgengc.need_major_gc = GPR_FLAG_MAJOR_BY_FORCE;
-        }
-
-        gc_report(1, objspace, "gc_marks_finish (marks %"PRIdSIZE" objects, "
-                  "old %"PRIdSIZE" objects, total %"PRIdSIZE" slots, "
-                  "sweep %"PRIdSIZE" slots, increment: %"PRIdSIZE", next GC: %s)\n",
-                  objspace->marked_slots, objspace->rgengc.old_objects, heap_eden_total_slots(objspace), sweep_slots, heap_allocatable_pages(objspace),
-                  objspace->rgengc.need_major_gc ? "major" : "minor");
-    }
-
-    rb_ractor_finish_marking();
-
-    gc_event_hook(objspace, RUBY_INTERNAL_EVENT_GC_END_MARK, 0);
-}
-
-static bool
-gc_compact_heap_cursors_met_p(rb_heap_t *heap)
-{
-    return heap->sweeping_page == heap->compact_cursor;
-}
-
-static rb_size_pool_t *
-gc_compact_destination_pool(rb_objspace_t *objspace, rb_size_pool_t *src_pool, VALUE src)
-{
-    size_t obj_size;
-    size_t idx = 0;
-
-    switch (BUILTIN_TYPE(src)) {
-      case T_ARRAY:
-        obj_size = rb_ary_size_as_embedded(src);
-        break;
-
-      case T_OBJECT:
-        if (rb_shape_obj_too_complex(src)) {
-            return &size_pools[0];
-        }
-        else {
-            obj_size = rb_obj_embedded_size(ROBJECT_IV_CAPACITY(src));
-        }
-        break;
-
-      case T_STRING:
-        obj_size = rb_str_size_as_embedded(src);
-        break;
-
-      case T_HASH:
-        obj_size = sizeof(struct RHash) + (RHASH_ST_TABLE_P(src) ? sizeof(st_table) : sizeof(ar_table));
-        break;
-
-      default:
-        return src_pool;
-    }
-
-    if (rb_gc_size_allocatable_p(obj_size)){
-        idx = size_pool_idx_for_size(obj_size);
-    }
-    return &size_pools[idx];
-}
-
-static bool
-gc_compact_move(rb_objspace_t *objspace, rb_heap_t *heap, rb_size_pool_t *size_pool, VALUE src)
-{
-    GC_ASSERT(BUILTIN_TYPE(src) != T_MOVED);
-    GC_ASSERT(gc_is_moveable_obj(objspace, src));
-
-    rb_size_pool_t *dest_pool = gc_compact_destination_pool(objspace, size_pool, src);
-    rb_heap_t *dheap = SIZE_POOL_EDEN_HEAP(dest_pool);
-    rb_shape_t *new_shape = NULL;
-    rb_shape_t *orig_shape = NULL;
-
-    if (gc_compact_heap_cursors_met_p(dheap)) {
-        return dheap != heap;
-    }
-
-    if (RB_TYPE_P(src, T_OBJECT)) {
-        orig_shape = rb_shape_get_shape(src);
-        if (dheap != heap && !rb_shape_obj_too_complex(src)) {
-            rb_shape_t *initial_shape = rb_shape_get_shape_by_id((shape_id_t)((dest_pool - size_pools) + SIZE_POOL_COUNT));
-            new_shape = rb_shape_traverse_from_new_root(initial_shape, orig_shape);
-
-            if (!new_shape) {
-                dest_pool = size_pool;
-                dheap = heap;
-            }
-        }
-    }
-
-    while (!try_move(objspace, dheap, dheap->free_pages, src)) {
-        struct gc_sweep_context ctx = {
-            .page = dheap->sweeping_page,
-            .final_slots = 0,
-            .freed_slots = 0,
-            .empty_slots = 0,
-        };
-
-        /* The page of src could be partially compacted, so it may contain
-         * T_MOVED. Sweeping a page may read objects on this page, so we
-         * need to lock the page. */
-        lock_page_body(objspace, GET_PAGE_BODY(src));
-        gc_sweep_page(objspace, dheap, &ctx);
-        unlock_page_body(objspace, GET_PAGE_BODY(src));
-
-        if (dheap->sweeping_page->free_slots > 0) {
-            heap_add_freepage(dheap, dheap->sweeping_page);
-        }
-
-        dheap->sweeping_page = ccan_list_next(&dheap->pages, dheap->sweeping_page, page_node);
-        if (gc_compact_heap_cursors_met_p(dheap)) {
-            return dheap != heap;
-        }
-    }
-
-    if (orig_shape) {
-        if (new_shape) {
-            VALUE dest = rb_gc_location(src);
-            rb_shape_set_shape(dest, new_shape);
-        }
-        RMOVED(src)->original_shape_id = rb_shape_id(orig_shape);
-    }
-
-    return true;
-}
-
-static bool
-gc_compact_plane(rb_objspace_t *objspace, rb_size_pool_t *size_pool, rb_heap_t *heap, uintptr_t p, bits_t bitset, struct heap_page *page)
-{
-    short slot_size = page->slot_size;
-    short slot_bits = slot_size / BASE_SLOT_SIZE;
-    GC_ASSERT(slot_bits > 0);
-
-    do {
-        VALUE vp = (VALUE)p;
-        GC_ASSERT(vp % sizeof(RVALUE) == 0);
-
-        if (bitset & 1) {
-            objspace->rcompactor.considered_count_table[BUILTIN_TYPE(vp)]++;
-
-            if (gc_is_moveable_obj(objspace, vp)) {
-                if (!gc_compact_move(objspace, heap, size_pool, vp)) {
-                    //the cursors met. bubble up
-                    return false;
-                }
-            }
-        }
-        p += slot_size;
-        bitset >>= slot_bits;
-    } while (bitset);
-
-    return true;
-}
-
-// Iterate up all the objects in page, moving them to where they want to go
-static bool
-gc_compact_page(rb_objspace_t *objspace, rb_size_pool_t *size_pool, rb_heap_t *heap, struct heap_page *page)
-{
-    GC_ASSERT(page == heap->compact_cursor);
-
-    bits_t *mark_bits, *pin_bits;
-    bits_t bitset;
-    uintptr_t p = page->start;
-
-    mark_bits = page->mark_bits;
-    pin_bits = page->pinned_bits;
-
-    // objects that can be moved are marked and not pinned
-    bitset = (mark_bits[0] & ~pin_bits[0]);
-    bitset >>= NUM_IN_PAGE(p);
-    if (bitset) {
-        if (!gc_compact_plane(objspace, size_pool, heap, (uintptr_t)p, bitset, page))
-            return false;
-    }
-    p += (BITS_BITLENGTH - NUM_IN_PAGE(p)) * BASE_SLOT_SIZE;
-
-    for (int j = 1; j < HEAP_PAGE_BITMAP_LIMIT; j++) {
-        bitset = (mark_bits[j] & ~pin_bits[j]);
-        if (bitset) {
-            if (!gc_compact_plane(objspace, size_pool, heap, (uintptr_t)p, bitset, page))
-                return false;
-        }
-        p += BITS_BITLENGTH * BASE_SLOT_SIZE;
-    }
-
-    return true;
-}
-
-static bool
-gc_compact_all_compacted_p(rb_objspace_t *objspace)
-{
-    for (int i = 0; i < SIZE_POOL_COUNT; i++) {
-        rb_size_pool_t *size_pool = &size_pools[i];
-        rb_heap_t *heap = SIZE_POOL_EDEN_HEAP(size_pool);
-
-        if (heap->total_pages > 0 &&
-                !gc_compact_heap_cursors_met_p(heap)) {
-            return false;
-        }
-    }
-
-    return true;
-}
-
-static void
-gc_sweep_compact(rb_objspace_t *objspace)
-{
-    gc_compact_start(objspace);
-#if RGENGC_CHECK_MODE >= 2
-    gc_verify_internal_consistency(objspace);
-#endif
-
-    while (!gc_compact_all_compacted_p(objspace)) {
-        for (int i = 0; i < SIZE_POOL_COUNT; i++) {
-            rb_size_pool_t *size_pool = &size_pools[i];
-            rb_heap_t *heap = SIZE_POOL_EDEN_HEAP(size_pool);
-
-            if (gc_compact_heap_cursors_met_p(heap)) {
-                continue;
-            }
-
-            struct heap_page *start_page = heap->compact_cursor;
-
-            if (!gc_compact_page(objspace, size_pool, heap, start_page)) {
-                lock_page_body(objspace, GET_PAGE_BODY(start_page->start));
-
-                continue;
-            }
-
-            // If we get here, we've finished moving all objects on the compact_cursor page
-            // So we can lock it and move the cursor on to the next one.
-            lock_page_body(objspace, GET_PAGE_BODY(start_page->start));
-            heap->compact_cursor = ccan_list_prev(&heap->pages, heap->compact_cursor, page_node);
-        }
-    }
-
-    gc_compact_finish(objspace);
-
-#if RGENGC_CHECK_MODE >= 2
-    gc_verify_internal_consistency(objspace);
-#endif
-}
-
-static void
-gc_marks_rest(rb_objspace_t *objspace)
-{
-    gc_report(1, objspace, "gc_marks_rest\n");
-
-    for (int i = 0; i < SIZE_POOL_COUNT; i++) {
-        SIZE_POOL_EDEN_HEAP(&size_pools[i])->pooled_pages = NULL;
-    }
-
-    if (is_incremental_marking(objspace)) {
-        while (gc_mark_stacked_objects_incremental(objspace, INT_MAX) == FALSE);
-    }
-    else {
-        gc_mark_stacked_objects_all(objspace);
-    }
-
-    gc_marks_finish(objspace);
-}
-
-static bool
-gc_marks_step(rb_objspace_t *objspace, size_t slots)
-{
-    bool marking_finished = false;
-
-    GC_ASSERT(is_marking(objspace));
-    if (gc_mark_stacked_objects_incremental(objspace, slots)) {
-        gc_marks_finish(objspace);
-
-        marking_finished = true;
-    }
-
-    return marking_finished;
-}
-
-static bool
-gc_marks_continue(rb_objspace_t *objspace, rb_size_pool_t *size_pool, rb_heap_t *heap)
-{
-    GC_ASSERT(dont_gc_val() == FALSE);
-    bool marking_finished = true;
-
-    gc_marking_enter(objspace);
-
-    if (heap->free_pages) {
-        gc_report(2, objspace, "gc_marks_continue: has pooled pages");
-
-        marking_finished = gc_marks_step(objspace, objspace->rincgc.step_slots);
-    }
-    else {
-        gc_report(2, objspace, "gc_marks_continue: no more pooled pages (stack depth: %"PRIdSIZE").\n",
-                  mark_stack_size(&objspace->mark_stack));
-        size_pool->force_incremental_marking_finish_count++;
-        gc_marks_rest(objspace);
-    }
-
-    gc_marking_exit(objspace);
-
-    return marking_finished;
-}
-
-static bool
-gc_marks(rb_objspace_t *objspace, int full_mark)
-{
-    gc_prof_mark_timer_start(objspace);
-    gc_marking_enter(objspace);
-
-    bool marking_finished = false;
-
-    /* setup marking */
-
-    gc_marks_start(objspace, full_mark);
-    if (!is_incremental_marking(objspace)) {
-        gc_marks_rest(objspace);
-        marking_finished = true;
-    }
-
-#if RGENGC_PROFILE > 0
-    if (gc_prof_record(objspace)) {
-        gc_profile_record *record = gc_prof_record(objspace);
-        record->old_objects = objspace->rgengc.old_objects;
-    }
-#endif
-
-    gc_marking_exit(objspace);
-    gc_prof_mark_timer_stop(objspace);
-
-    return marking_finished;
-}
-
-/* RGENGC */
-
-static void
-gc_report_body(int level, rb_objspace_t *objspace, const char *fmt, ...)
-{
-    if (level <= RGENGC_DEBUG) {
-        char buf[1024];
-        FILE *out = stderr;
-        va_list args;
-        const char *status = " ";
-
-        if (during_gc) {
-            status = is_full_marking(objspace) ? "+" : "-";
-        }
-        else {
-            if (is_lazy_sweeping(objspace)) {
-                status = "S";
-            }
-            if (is_incremental_marking(objspace)) {
-                status = "M";
-            }
-        }
-
-        va_start(args, fmt);
-        vsnprintf(buf, 1024, fmt, args);
-        va_end(args);
-
-        fprintf(out, "%s|", status);
-        fputs(buf, out);
-    }
-}
-
-/* bit operations */
-
-static int
-rgengc_remembersetbits_set(rb_objspace_t *objspace, VALUE obj)
-{
-    struct heap_page *page = GET_HEAP_PAGE(obj);
-    bits_t *bits = &page->remembered_bits[0];
-
-    if (MARKED_IN_BITMAP(bits, obj)) {
-        return FALSE;
-    }
-    else {
-        page->flags.has_remembered_objects = TRUE;
-        MARK_IN_BITMAP(bits, obj);
-        return TRUE;
-    }
-}
-
-/* wb, etc */
-
-/* return FALSE if already remembered */
-static int
-rgengc_remember(rb_objspace_t *objspace, VALUE obj)
-{
-    gc_report(6, objspace, "rgengc_remember: %s %s\n", obj_info(obj),
-              RVALUE_REMEMBERED(obj) ? "was already remembered" : "is remembered now");
-
-    check_rvalue_consistency(obj);
-
-    if (RGENGC_CHECK_MODE) {
-        if (RVALUE_WB_UNPROTECTED(obj)) rb_bug("rgengc_remember: %s is not wb protected.", obj_info(obj));
-    }
-
-#if RGENGC_PROFILE > 0
-    if (!RVALUE_REMEMBERED(obj)) {
-        if (RVALUE_WB_UNPROTECTED(obj) == 0) {
-            objspace->profile.total_remembered_normal_object_count++;
-#if RGENGC_PROFILE >= 2
-            objspace->profile.remembered_normal_object_count_types[BUILTIN_TYPE(obj)]++;
-#endif
-        }
-    }
-#endif /* RGENGC_PROFILE > 0 */
-
-    return rgengc_remembersetbits_set(objspace, obj);
-}
-
-#ifndef PROFILE_REMEMBERSET_MARK
-#define PROFILE_REMEMBERSET_MARK 0
-#endif
-
-static inline void
-rgengc_rememberset_mark_plane(rb_objspace_t *objspace, uintptr_t p, bits_t bitset)
-{
-    if (bitset) {
-        do {
-            if (bitset & 1) {
-                VALUE obj = (VALUE)p;
-                gc_report(2, objspace, "rgengc_rememberset_mark: mark %s\n", obj_info(obj));
-                GC_ASSERT(RVALUE_UNCOLLECTIBLE(obj));
-                GC_ASSERT(RVALUE_OLD_P(obj) || RVALUE_WB_UNPROTECTED(obj));
-
-                gc_mark_children(objspace, obj);
-            }
-            p += BASE_SLOT_SIZE;
-            bitset >>= 1;
-        } while (bitset);
-    }
-}
-
-static void
-rgengc_rememberset_mark(rb_objspace_t *objspace, rb_heap_t *heap)
-{
-    size_t j;
-    struct heap_page *page = 0;
-#if PROFILE_REMEMBERSET_MARK
-    int has_old = 0, has_shady = 0, has_both = 0, skip = 0;
-#endif
-    gc_report(1, objspace, "rgengc_rememberset_mark: start\n");
-
-    ccan_list_for_each(&heap->pages, page, page_node) {
-        if (page->flags.has_remembered_objects | page->flags.has_uncollectible_wb_unprotected_objects) {
-            uintptr_t p = page->start;
-            bits_t bitset, bits[HEAP_PAGE_BITMAP_LIMIT];
-            bits_t *remembered_bits = page->remembered_bits;
-            bits_t *uncollectible_bits = page->uncollectible_bits;
-            bits_t *wb_unprotected_bits = page->wb_unprotected_bits;
-#if PROFILE_REMEMBERSET_MARK
-            if (page->flags.has_remembered_objects && page->flags.has_uncollectible_wb_unprotected_objects) has_both++;
-            else if (page->flags.has_remembered_objects) has_old++;
-            else if (page->flags.has_uncollectible_wb_unprotected_objects) has_shady++;
-#endif
-            for (j=0; j<HEAP_PAGE_BITMAP_LIMIT; j++) {
-                bits[j] = remembered_bits[j] | (uncollectible_bits[j] & wb_unprotected_bits[j]);
-                remembered_bits[j] = 0;
-            }
-            page->flags.has_remembered_objects = FALSE;
-
-            bitset = bits[0];
-            bitset >>= NUM_IN_PAGE(p);
-            rgengc_rememberset_mark_plane(objspace, p, bitset);
-            p += (BITS_BITLENGTH - NUM_IN_PAGE(p)) * BASE_SLOT_SIZE;
-
-            for (j=1; j < HEAP_PAGE_BITMAP_LIMIT; j++) {
-                bitset = bits[j];
-                rgengc_rememberset_mark_plane(objspace, p, bitset);
-                p += BITS_BITLENGTH * BASE_SLOT_SIZE;
-            }
-        }
-#if PROFILE_REMEMBERSET_MARK
-        else {
-            skip++;
-        }
-#endif
-    }
-
-#if PROFILE_REMEMBERSET_MARK
-    fprintf(stderr, "%d\t%d\t%d\t%d\n", has_both, has_old, has_shady, skip);
-#endif
-    gc_report(1, objspace, "rgengc_rememberset_mark: finished\n");
-}
-
-static void
-rgengc_mark_and_rememberset_clear(rb_objspace_t *objspace, rb_heap_t *heap)
-{
-    struct heap_page *page = 0;
-
-    ccan_list_for_each(&heap->pages, page, page_node) {
-        memset(&page->mark_bits[0],       0, HEAP_PAGE_BITMAP_SIZE);
-        memset(&page->uncollectible_bits[0], 0, HEAP_PAGE_BITMAP_SIZE);
-        memset(&page->marking_bits[0],    0, HEAP_PAGE_BITMAP_SIZE);
-        memset(&page->remembered_bits[0], 0, HEAP_PAGE_BITMAP_SIZE);
-        memset(&page->pinned_bits[0],     0, HEAP_PAGE_BITMAP_SIZE);
-        page->flags.has_uncollectible_wb_unprotected_objects = FALSE;
-        page->flags.has_remembered_objects = FALSE;
-    }
-}
-
-/* RGENGC: APIs */
-
-NOINLINE(static void gc_writebarrier_generational(VALUE a, VALUE b, rb_objspace_t *objspace));
-
-static void
-gc_writebarrier_generational(VALUE a, VALUE b, rb_objspace_t *objspace)
-{
-    if (RGENGC_CHECK_MODE) {
-        if (!RVALUE_OLD_P(a)) rb_bug("gc_writebarrier_generational: %s is not an old object.", obj_info(a));
-        if ( RVALUE_OLD_P(b)) rb_bug("gc_writebarrier_generational: %s is an old object.", obj_info(b));
-        if (is_incremental_marking(objspace)) rb_bug("gc_writebarrier_generational: called while incremental marking: %s -> %s", obj_info(a), obj_info(b));
-    }
-
-    /* mark `a' and remember (default behavior) */
-    if (!RVALUE_REMEMBERED(a)) {
-        RB_VM_LOCK_ENTER_NO_BARRIER();
-        {
-            rgengc_remember(objspace, a);
-        }
-        RB_VM_LOCK_LEAVE_NO_BARRIER();
-        gc_report(1, objspace, "gc_writebarrier_generational: %s (remembered) -> %s\n", obj_info(a), obj_info(b));
-    }
-
-    check_rvalue_consistency(a);
-    check_rvalue_consistency(b);
-}
-
-static void
-gc_mark_from(rb_objspace_t *objspace, VALUE obj, VALUE parent)
-{
-    gc_mark_set_parent(objspace, parent);
-    rgengc_check_relation(objspace, obj);
-    if (gc_mark_set(objspace, obj) == FALSE) return;
-    gc_aging(objspace, obj);
-    gc_grey(objspace, obj);
-}
-
-NOINLINE(static void gc_writebarrier_incremental(VALUE a, VALUE b, rb_objspace_t *objspace));
-
-static void
-gc_writebarrier_incremental(VALUE a, VALUE b, rb_objspace_t *objspace)
-{
-    gc_report(2, objspace, "gc_writebarrier_incremental: [LG] %p -> %s\n", (void *)a, obj_info(b));
-
-    if (RVALUE_BLACK_P(a)) {
-        if (RVALUE_WHITE_P(b)) {
-            if (!RVALUE_WB_UNPROTECTED(a)) {
-                gc_report(2, objspace, "gc_writebarrier_incremental: [IN] %p -> %s\n", (void *)a, obj_info(b));
-                gc_mark_from(objspace, b, a);
-            }
-        }
-        else if (RVALUE_OLD_P(a) && !RVALUE_OLD_P(b)) {
-            rgengc_remember(objspace, a);
-        }
-
-        if (UNLIKELY(objspace->flags.during_compacting)) {
-            MARK_IN_BITMAP(GET_HEAP_PINNED_BITS(b), b);
-        }
-    }
-}
-
-void
-rb_gc_writebarrier(VALUE a, VALUE b)
-{
-    rb_objspace_t *objspace = &rb_objspace;
-
-    if (RGENGC_CHECK_MODE) {
-        if (SPECIAL_CONST_P(a)) rb_bug("rb_gc_writebarrier: a is special const: %"PRIxVALUE, a);
-        if (SPECIAL_CONST_P(b)) rb_bug("rb_gc_writebarrier: b is special const: %"PRIxVALUE, b);
-    }
-
-  retry:
-    if (!is_incremental_marking(objspace)) {
-        if (!RVALUE_OLD_P(a) || RVALUE_OLD_P(b)) {
-            // do nothing
-        }
-        else {
-            gc_writebarrier_generational(a, b, objspace);
-        }
-    }
-    else {
-        bool retry = false;
-        /* slow path */
-        RB_VM_LOCK_ENTER_NO_BARRIER();
-        {
-            if (is_incremental_marking(objspace)) {
-                gc_writebarrier_incremental(a, b, objspace);
-            }
-            else {
-                retry = true;
-            }
-        }
-        RB_VM_LOCK_LEAVE_NO_BARRIER();
-
-        if (retry) goto retry;
-    }
-    return;
-}
-
-void
-rb_gc_writebarrier_unprotect(VALUE obj)
-{
-    if (RVALUE_WB_UNPROTECTED(obj)) {
-        return;
-    }
-    else {
-        rb_objspace_t *objspace = &rb_objspace;
-
-        gc_report(2, objspace, "rb_gc_writebarrier_unprotect: %s %s\n", obj_info(obj),
-                  RVALUE_REMEMBERED(obj) ? " (already remembered)" : "");
-
-        RB_VM_LOCK_ENTER_NO_BARRIER();
-        {
-            if (RVALUE_OLD_P(obj)) {
-                gc_report(1, objspace, "rb_gc_writebarrier_unprotect: %s\n", obj_info(obj));
-                RVALUE_DEMOTE(objspace, obj);
-                gc_mark_set(objspace, obj);
-                gc_remember_unprotected(objspace, obj);
-
-#if RGENGC_PROFILE
-                objspace->profile.total_shade_operation_count++;
-#if RGENGC_PROFILE >= 2
-                objspace->profile.shade_operation_count_types[BUILTIN_TYPE(obj)]++;
-#endif /* RGENGC_PROFILE >= 2 */
-#endif /* RGENGC_PROFILE */
-            }
-            else {
-                RVALUE_AGE_RESET(obj);
-            }
-
-            RB_DEBUG_COUNTER_INC(obj_wb_unprotect);
-            MARK_IN_BITMAP(GET_HEAP_WB_UNPROTECTED_BITS(obj), obj);
-        }
-        RB_VM_LOCK_LEAVE_NO_BARRIER();
-    }
-}
-
-/*
- * remember `obj' if needed.
- */
-void
-rb_gc_writebarrier_remember(VALUE obj)
-{
-    rb_objspace_t *objspace = &rb_objspace;
-
-    gc_report(1, objspace, "rb_gc_writebarrier_remember: %s\n", obj_info(obj));
-
-    if (is_incremental_marking(objspace)) {
-        if (RVALUE_BLACK_P(obj)) {
-            gc_grey(objspace, obj);
-        }
-    }
-    else {
-        if (RVALUE_OLD_P(obj)) {
-            rgengc_remember(objspace, obj);
-        }
-    }
-}
-
-void
-rb_copy_wb_protected_attribute(VALUE dest, VALUE obj)
-{
-    rb_objspace_t *objspace = &rb_objspace;
-
-    if (RVALUE_WB_UNPROTECTED(obj) && !RVALUE_WB_UNPROTECTED(dest)) {
-        if (!RVALUE_OLD_P(dest)) {
-            MARK_IN_BITMAP(GET_HEAP_WB_UNPROTECTED_BITS(dest), dest);
-            RVALUE_AGE_RESET(dest);
-        }
-        else {
-            RVALUE_DEMOTE(objspace, dest);
-        }
-    }
-
-    check_rvalue_consistency(dest);
-}
-
-/* RGENGC analysis information */
-
-VALUE
-rb_obj_rgengc_writebarrier_protected_p(VALUE obj)
-{
-    return RBOOL(!RVALUE_WB_UNPROTECTED(obj));
-}
-
-VALUE
-rb_obj_rgengc_promoted_p(VALUE obj)
-{
-    return RBOOL(OBJ_PROMOTED(obj));
-}
-
-size_t
-rb_obj_gc_flags(VALUE obj, ID* flags, size_t max)
-{
-    size_t n = 0;
-    static ID ID_marked;
-    static ID ID_wb_protected, ID_old, ID_marking, ID_uncollectible, ID_pinned;
-
-    if (!ID_marked) {
-#define I(s) ID_##s = rb_intern(#s);
-        I(marked);
-        I(wb_protected);
-        I(old);
-        I(marking);
-        I(uncollectible);
-        I(pinned);
-#undef I
-    }
-
-    if (RVALUE_WB_UNPROTECTED(obj) == 0 && n<max)                   flags[n++] = ID_wb_protected;
-    if (RVALUE_OLD_P(obj) && n<max)                                 flags[n++] = ID_old;
-    if (RVALUE_UNCOLLECTIBLE(obj) && n<max)                         flags[n++] = ID_uncollectible;
-    if (MARKED_IN_BITMAP(GET_HEAP_MARKING_BITS(obj), obj) && n<max) flags[n++] = ID_marking;
-    if (MARKED_IN_BITMAP(GET_HEAP_MARK_BITS(obj), obj) && n<max)    flags[n++] = ID_marked;
-    if (MARKED_IN_BITMAP(GET_HEAP_PINNED_BITS(obj), obj) && n<max)  flags[n++] = ID_pinned;
-    return n;
-}
-
-/* GC */
-
-void
-rb_gc_ractor_newobj_cache_clear(rb_ractor_newobj_cache_t *newobj_cache)
-{
-    newobj_cache->incremental_mark_step_allocated_slots = 0;
-
-    for (size_t size_pool_idx = 0; size_pool_idx < SIZE_POOL_COUNT; size_pool_idx++) {
-        rb_ractor_newobj_size_pool_cache_t *cache = &newobj_cache->size_pool_caches[size_pool_idx];
-
-        struct heap_page *page = cache->using_page;
-        RVALUE *freelist = cache->freelist;
-        RUBY_DEBUG_LOG("ractor using_page:%p freelist:%p", (void *)page, (void *)freelist);
-
-        heap_page_freelist_append(page, freelist);
-
-        cache->using_page = NULL;
-        cache->freelist = NULL;
-    }
-}
-
-void
-rb_gc_force_recycle(VALUE obj)
-{
-    /* no-op */
-}
-
-#ifndef MARK_OBJECT_ARY_BUCKET_SIZE
-#define MARK_OBJECT_ARY_BUCKET_SIZE 1024
-#endif
-
-void
-rb_gc_register_mark_object(VALUE obj)
-{
-    if (!is_pointer_to_heap(&rb_objspace, (void *)obj))
-        return;
-
-    RB_VM_LOCK_ENTER();
-    {
-        VALUE ary_ary = GET_VM()->mark_object_ary;
-        VALUE ary = rb_ary_last(0, 0, ary_ary);
-
-        if (NIL_P(ary) || RARRAY_LEN(ary) >= MARK_OBJECT_ARY_BUCKET_SIZE) {
-            ary = rb_ary_hidden_new(MARK_OBJECT_ARY_BUCKET_SIZE);
-            rb_ary_push(ary_ary, ary);
-        }
-
-        rb_ary_push(ary, obj);
-    }
-    RB_VM_LOCK_LEAVE();
-}
-
-void
-rb_gc_register_address(VALUE *addr)
-{
-    rb_objspace_t *objspace = &rb_objspace;
-    struct gc_list *tmp;
-
-    VALUE obj = *addr;
-
-    tmp = ALLOC(struct gc_list);
-    tmp->next = global_list;
-    tmp->varptr = addr;
-    global_list = tmp;
-
-    /*
-     * Because some C extensions have assignment-then-register bugs,
-     * we guard `obj` here so that it would not get swept defensively.
-     */
-    RB_GC_GUARD(obj);
-    if (0 && !SPECIAL_CONST_P(obj)) {
-        rb_warn("Object is assigned to registering address already: %"PRIsVALUE,
-                rb_obj_class(obj));
-        rb_print_backtrace();
-    }
-}
-
-void
-rb_gc_unregister_address(VALUE *addr)
-{
-    rb_objspace_t *objspace = &rb_objspace;
-    struct gc_list *tmp = global_list;
-
-    if (tmp->varptr == addr) {
-        global_list = tmp->next;
-        xfree(tmp);
-        return;
-    }
-    while (tmp->next) {
-        if (tmp->next->varptr == addr) {
-            struct gc_list *t = tmp->next;
-
-            tmp->next = tmp->next->next;
-            xfree(t);
-            break;
-        }
-        tmp = tmp->next;
-    }
-}
-
-void
-rb_global_variable(VALUE *var)
-{
-    rb_gc_register_address(var);
-}
-
-#define GC_NOTIFY 0
-
-enum {
-    gc_stress_no_major,
-    gc_stress_no_immediate_sweep,
-    gc_stress_full_mark_after_malloc,
-    gc_stress_max
-};
-
-#define gc_stress_full_mark_after_malloc_p() \
-    (FIXNUM_P(ruby_gc_stress_mode) && (FIX2LONG(ruby_gc_stress_mode) & (1<<gc_stress_full_mark_after_malloc)))
-
-static void
-heap_ready_to_gc(rb_objspace_t *objspace, rb_size_pool_t *size_pool, rb_heap_t *heap)
-{
-    if (!heap->free_pages) {
-        if (!heap_increment(objspace, size_pool, heap)) {
-            size_pool_allocatable_pages_set(objspace, size_pool, 1);
-            heap_increment(objspace, size_pool, heap);
-        }
-    }
-}
-
-static int
-ready_to_gc(rb_objspace_t *objspace)
-{
-    if (dont_gc_val() || during_gc || ruby_disable_gc) {
-        for (int i = 0; i < SIZE_POOL_COUNT; i++) {
-            rb_size_pool_t *size_pool = &size_pools[i];
-            heap_ready_to_gc(objspace, size_pool, SIZE_POOL_EDEN_HEAP(size_pool));
-        }
-        return FALSE;
-    }
-    else {
-        return TRUE;
-    }
-}
-
-static void
-gc_reset_malloc_info(rb_objspace_t *objspace, bool full_mark)
-{
-    gc_prof_set_malloc_info(objspace);
-    {
-        size_t inc = ATOMIC_SIZE_EXCHANGE(malloc_increase, 0);
-        size_t old_limit = malloc_limit;
-
-        if (inc > malloc_limit) {
-            malloc_limit = (size_t)(inc * gc_params.malloc_limit_growth_factor);
-            if (malloc_limit > gc_params.malloc_limit_max) {
-                malloc_limit = gc_params.malloc_limit_max;
-            }
-        }
-        else {
-            malloc_limit = (size_t)(malloc_limit * 0.98); /* magic number */
-            if (malloc_limit < gc_params.malloc_limit_min) {
-                malloc_limit = gc_params.malloc_limit_min;
-            }
-        }
-
-        if (0) {
-            if (old_limit != malloc_limit) {
-                fprintf(stderr, "[%"PRIuSIZE"] malloc_limit: %"PRIuSIZE" -> %"PRIuSIZE"\n",
-                        rb_gc_count(), old_limit, malloc_limit);
-            }
-            else {
-                fprintf(stderr, "[%"PRIuSIZE"] malloc_limit: not changed (%"PRIuSIZE")\n",
-                        rb_gc_count(), malloc_limit);
-            }
-        }
-    }
-
-    /* reset oldmalloc info */
-#if RGENGC_ESTIMATE_OLDMALLOC
-    if (!full_mark) {
-        if (objspace->rgengc.oldmalloc_increase > objspace->rgengc.oldmalloc_increase_limit) {
-            objspace->rgengc.need_major_gc |= GPR_FLAG_MAJOR_BY_OLDMALLOC;
-            objspace->rgengc.oldmalloc_increase_limit =
-              (size_t)(objspace->rgengc.oldmalloc_increase_limit * gc_params.oldmalloc_limit_growth_factor);
-
-            if (objspace->rgengc.oldmalloc_increase_limit > gc_params.oldmalloc_limit_max) {
-                objspace->rgengc.oldmalloc_increase_limit = gc_params.oldmalloc_limit_max;
-            }
-        }
-
-        if (0) fprintf(stderr, "%"PRIdSIZE"\t%d\t%"PRIuSIZE"\t%"PRIuSIZE"\t%"PRIdSIZE"\n",
-                       rb_gc_count(),
-                       objspace->rgengc.need_major_gc,
-                       objspace->rgengc.oldmalloc_increase,
-                       objspace->rgengc.oldmalloc_increase_limit,
-                       gc_params.oldmalloc_limit_max);
-    }
-    else {
-        /* major GC */
-        objspace->rgengc.oldmalloc_increase = 0;
-
-        if ((objspace->profile.latest_gc_info & GPR_FLAG_MAJOR_BY_OLDMALLOC) == 0) {
-            objspace->rgengc.oldmalloc_increase_limit =
-              (size_t)(objspace->rgengc.oldmalloc_increase_limit / ((gc_params.oldmalloc_limit_growth_factor - 1)/10 + 1));
-            if (objspace->rgengc.oldmalloc_increase_limit < gc_params.oldmalloc_limit_min) {
-                objspace->rgengc.oldmalloc_increase_limit = gc_params.oldmalloc_limit_min;
-            }
-        }
-    }
-#endif
-}
-
-static int
-garbage_collect(rb_objspace_t *objspace, unsigned int reason)
-{
-    int ret;
-
-    RB_VM_LOCK_ENTER();
-    {
-#if GC_PROFILE_MORE_DETAIL
-        objspace->profile.prepare_time = getrusage_time();
-#endif
-
-        gc_rest(objspace);
-
-#if GC_PROFILE_MORE_DETAIL
-        objspace->profile.prepare_time = getrusage_time() - objspace->profile.prepare_time;
-#endif
-
-        ret = gc_start(objspace, reason);
-    }
-    RB_VM_LOCK_LEAVE();
-
-    return ret;
-}
-
-static int
-gc_start(rb_objspace_t *objspace, unsigned int reason)
-{
-    unsigned int do_full_mark = !!(reason & GPR_FLAG_FULL_MARK);
-    unsigned int immediate_mark = reason & GPR_FLAG_IMMEDIATE_MARK;
-
-    /* reason may be clobbered, later, so keep set immediate_sweep here */
-    objspace->flags.immediate_sweep = !!(reason & GPR_FLAG_IMMEDIATE_SWEEP);
-
-    /* Explicitly enable compaction (GC.compact) */
-    if (do_full_mark && ruby_enable_autocompact) {
-        objspace->flags.during_compacting = TRUE;
-    }
-    else {
-        objspace->flags.during_compacting = !!(reason & GPR_FLAG_COMPACT);
-    }
-
-    if (!heap_allocated_pages) return FALSE; /* heap is not ready */
-    if (!(reason & GPR_FLAG_METHOD) && !ready_to_gc(objspace)) return TRUE; /* GC is not allowed */
-
-    GC_ASSERT(gc_mode(objspace) == gc_mode_none);
-    GC_ASSERT(!is_lazy_sweeping(objspace));
-    GC_ASSERT(!is_incremental_marking(objspace));
-
-    unsigned int lock_lev;
-    gc_enter(objspace, gc_enter_event_start, &lock_lev);
-
-#if RGENGC_CHECK_MODE >= 2
-    gc_verify_internal_consistency(objspace);
-#endif
-
-    if (ruby_gc_stressful) {
-        int flag = FIXNUM_P(ruby_gc_stress_mode) ? FIX2INT(ruby_gc_stress_mode) : 0;
-
-        if ((flag & (1<<gc_stress_no_major)) == 0) {
-            do_full_mark = TRUE;
-        }
-
-        objspace->flags.immediate_sweep = !(flag & (1<<gc_stress_no_immediate_sweep));
-    }
-    else {
-        if (objspace->rgengc.need_major_gc) {
-            reason |= objspace->rgengc.need_major_gc;
-            do_full_mark = TRUE;
-        }
-        else if (RGENGC_FORCE_MAJOR_GC) {
-            reason = GPR_FLAG_MAJOR_BY_FORCE;
-            do_full_mark = TRUE;
-        }
-
-        objspace->rgengc.need_major_gc = GPR_FLAG_NONE;
-    }
-
-    if (do_full_mark && (reason & GPR_FLAG_MAJOR_MASK) == 0) {
-        reason |= GPR_FLAG_MAJOR_BY_FORCE; /* GC by CAPI, METHOD, and so on. */
-    }
-
-    if (objspace->flags.dont_incremental || immediate_mark) {
-        objspace->flags.during_incremental_marking = FALSE;
-    }
-    else {
-        objspace->flags.during_incremental_marking = do_full_mark;
-    }
-
-    if (!GC_ENABLE_LAZY_SWEEP || objspace->flags.dont_incremental) {
-        objspace->flags.immediate_sweep = TRUE;
-    }
-
-    if (objspace->flags.immediate_sweep) reason |= GPR_FLAG_IMMEDIATE_SWEEP;
-
-    gc_report(1, objspace, "gc_start(reason: %x) => %u, %d, %d\n",
-              reason,
-              do_full_mark, !is_incremental_marking(objspace), objspace->flags.immediate_sweep);
-
-#if USE_DEBUG_COUNTER
-    RB_DEBUG_COUNTER_INC(gc_count);
-
-    if (reason & GPR_FLAG_MAJOR_MASK) {
-        (void)RB_DEBUG_COUNTER_INC_IF(gc_major_nofree, reason & GPR_FLAG_MAJOR_BY_NOFREE);
-        (void)RB_DEBUG_COUNTER_INC_IF(gc_major_oldgen, reason & GPR_FLAG_MAJOR_BY_OLDGEN);
-        (void)RB_DEBUG_COUNTER_INC_IF(gc_major_shady,  reason & GPR_FLAG_MAJOR_BY_SHADY);
-        (void)RB_DEBUG_COUNTER_INC_IF(gc_major_force,  reason & GPR_FLAG_MAJOR_BY_FORCE);
-#if RGENGC_ESTIMATE_OLDMALLOC
-        (void)RB_DEBUG_COUNTER_INC_IF(gc_major_oldmalloc, reason & GPR_FLAG_MAJOR_BY_OLDMALLOC);
-#endif
-    }
-    else {
-        (void)RB_DEBUG_COUNTER_INC_IF(gc_minor_newobj, reason & GPR_FLAG_NEWOBJ);
-        (void)RB_DEBUG_COUNTER_INC_IF(gc_minor_malloc, reason & GPR_FLAG_MALLOC);
-        (void)RB_DEBUG_COUNTER_INC_IF(gc_minor_method, reason & GPR_FLAG_METHOD);
-        (void)RB_DEBUG_COUNTER_INC_IF(gc_minor_capi,   reason & GPR_FLAG_CAPI);
-        (void)RB_DEBUG_COUNTER_INC_IF(gc_minor_stress, reason & GPR_FLAG_STRESS);
-    }
-#endif
-
-    objspace->profile.count++;
-    objspace->profile.latest_gc_info = reason;
-    objspace->profile.total_allocated_objects_at_gc_start = total_allocated_objects(objspace);
-    objspace->profile.heap_used_at_gc_start = heap_allocated_pages;
-    objspace->profile.weak_references_count = 0;
-    objspace->profile.retained_weak_references_count = 0;
-    gc_prof_setup_new_record(objspace, reason);
-    gc_reset_malloc_info(objspace, do_full_mark);
-
-    gc_event_hook(objspace, RUBY_INTERNAL_EVENT_GC_START, 0 /* TODO: pass minor/immediate flag? */);
-    GC_ASSERT(during_gc);
-
-    gc_prof_timer_start(objspace);
-    {
-        if (gc_marks(objspace, do_full_mark)) {
-            gc_sweep(objspace);
-        }
-    }
-    gc_prof_timer_stop(objspace);
-
-    gc_exit(objspace, gc_enter_event_start, &lock_lev);
-    return TRUE;
-}
-
-static void
-gc_rest(rb_objspace_t *objspace)
-{
-    int marking = is_incremental_marking(objspace);
-    int sweeping = is_lazy_sweeping(objspace);
-
-    if (marking || sweeping) {
-        unsigned int lock_lev;
-        gc_enter(objspace, gc_enter_event_rest, &lock_lev);
-
-        if (RGENGC_CHECK_MODE >= 2) gc_verify_internal_consistency(objspace);
-
-        if (is_incremental_marking(objspace)) {
-            gc_marking_enter(objspace);
-            gc_marks_rest(objspace);
-            gc_marking_exit(objspace);
-
-            gc_sweep(objspace);
-        }
-
-        if (is_lazy_sweeping(objspace)) {
-            gc_sweeping_enter(objspace);
-            gc_sweep_rest(objspace);
-            gc_sweeping_exit(objspace);
-        }
-
-        gc_exit(objspace, gc_enter_event_rest, &lock_lev);
-    }
-}
-
-struct objspace_and_reason {
-    rb_objspace_t *objspace;
-    unsigned int reason;
-};
-
-static void
-gc_current_status_fill(rb_objspace_t *objspace, char *buff)
-{
-    int i = 0;
-    if (is_marking(objspace)) {
-        buff[i++] = 'M';
-        if (is_full_marking(objspace))        buff[i++] = 'F';
-        if (is_incremental_marking(objspace)) buff[i++] = 'I';
-    }
-    else if (is_sweeping(objspace)) {
-        buff[i++] = 'S';
-        if (is_lazy_sweeping(objspace))      buff[i++] = 'L';
-    }
-    else {
-        buff[i++] = 'N';
-    }
-    buff[i] = '\0';
-}
-
-static const char *
-gc_current_status(rb_objspace_t *objspace)
-{
-    static char buff[0x10];
-    gc_current_status_fill(objspace, buff);
-    return buff;
-}
-
-#if PRINT_ENTER_EXIT_TICK
-
-static tick_t last_exit_tick;
-static tick_t enter_tick;
-static int enter_count = 0;
-static char last_gc_status[0x10];
-
-static inline void
-gc_record(rb_objspace_t *objspace, int direction, const char *event)
-{
-    if (direction == 0) { /* enter */
-        enter_count++;
-        enter_tick = tick();
-        gc_current_status_fill(objspace, last_gc_status);
-    }
-    else { /* exit */
-        tick_t exit_tick = tick();
-        char current_gc_status[0x10];
-        gc_current_status_fill(objspace, current_gc_status);
-#if 1
-        /* [last mutator time] [gc time] [event] */
-        fprintf(stderr, "%"PRItick"\t%"PRItick"\t%s\t[%s->%s|%c]\n",
-                enter_tick - last_exit_tick,
-                exit_tick - enter_tick,
-                event,
-                last_gc_status, current_gc_status,
-                (objspace->profile.latest_gc_info & GPR_FLAG_MAJOR_MASK) ? '+' : '-');
-        last_exit_tick = exit_tick;
-#else
-        /* [enter_tick] [gc time] [event] */
-        fprintf(stderr, "%"PRItick"\t%"PRItick"\t%s\t[%s->%s|%c]\n",
-                enter_tick,
-                exit_tick - enter_tick,
-                event,
-                last_gc_status, current_gc_status,
-                (objspace->profile.latest_gc_info & GPR_FLAG_MAJOR_MASK) ? '+' : '-');
-#endif
-    }
-}
-#else /* PRINT_ENTER_EXIT_TICK */
-static inline void
-gc_record(rb_objspace_t *objspace, int direction, const char *event)
-{
-    /* null */
-}
-#endif /* PRINT_ENTER_EXIT_TICK */
-
-static const char *
-gc_enter_event_cstr(enum gc_enter_event event)
-{
-    switch (event) {
-      case gc_enter_event_start: return "start";
-      case gc_enter_event_continue: return "continue";
-      case gc_enter_event_rest: return "rest";
-      case gc_enter_event_finalizer: return "finalizer";
-      case gc_enter_event_rb_memerror: return "rb_memerror";
-    }
-    return NULL;
-}
-
-static void
-gc_enter_count(enum gc_enter_event event)
-{
-    switch (event) {
-      case gc_enter_event_start:          RB_DEBUG_COUNTER_INC(gc_enter_start); break;
-      case gc_enter_event_continue:       RB_DEBUG_COUNTER_INC(gc_enter_continue); break;
-      case gc_enter_event_rest:           RB_DEBUG_COUNTER_INC(gc_enter_rest); break;
-      case gc_enter_event_finalizer:      RB_DEBUG_COUNTER_INC(gc_enter_finalizer); break;
-      case gc_enter_event_rb_memerror:    /* nothing */ break;
-    }
-}
-
-#ifndef MEASURE_GC
-#define MEASURE_GC (objspace->flags.measure_gc)
-#endif
-
-static bool current_process_time(struct timespec *ts);
-
-static void
-gc_clock_start(struct timespec *ts)
-{
-    if (!current_process_time(ts)) {
-        ts->tv_sec = 0;
-        ts->tv_nsec = 0;
-    }
-}
-
-static uint64_t
-gc_clock_end(struct timespec *ts)
-{
-    struct timespec end_time;
-
-    if ((ts->tv_sec > 0 || ts->tv_nsec > 0) &&
-            current_process_time(&end_time) &&
-            end_time.tv_sec >= ts->tv_sec) {
-        return (uint64_t)(end_time.tv_sec - ts->tv_sec) * (1000 * 1000 * 1000) +
-                    (end_time.tv_nsec - ts->tv_nsec);
-    }
-
-    return 0;
-}
-
-static inline void
-gc_enter(rb_objspace_t *objspace, enum gc_enter_event event, unsigned int *lock_lev)
-{
-    RB_VM_LOCK_ENTER_LEV(lock_lev);
-
-    switch (event) {
-      case gc_enter_event_rest:
-        if (!is_marking(objspace)) break;
-        // fall through
-      case gc_enter_event_start:
-      case gc_enter_event_continue:
-        // stop other ractors
-        rb_vm_barrier();
-        break;
-      default:
-        break;
-    }
-
-    gc_enter_count(event);
-    if (UNLIKELY(during_gc != 0)) rb_bug("during_gc != 0");
-    if (RGENGC_CHECK_MODE >= 3) gc_verify_internal_consistency(objspace);
-
-    during_gc = TRUE;
-    RUBY_DEBUG_LOG("%s (%s)",gc_enter_event_cstr(event), gc_current_status(objspace));
-    gc_report(1, objspace, "gc_enter: %s [%s]\n", gc_enter_event_cstr(event), gc_current_status(objspace));
-    gc_record(objspace, 0, gc_enter_event_cstr(event));
-    gc_event_hook(objspace, RUBY_INTERNAL_EVENT_GC_ENTER, 0); /* TODO: which parameter should be passed? */
-}
-
-static inline void
-gc_exit(rb_objspace_t *objspace, enum gc_enter_event event, unsigned int *lock_lev)
-{
-    GC_ASSERT(during_gc != 0);
-
-    gc_event_hook(objspace, RUBY_INTERNAL_EVENT_GC_EXIT, 0); /* TODO: which parameter should be passed? */
-    gc_record(objspace, 1, gc_enter_event_cstr(event));
-    RUBY_DEBUG_LOG("%s (%s)", gc_enter_event_cstr(event), gc_current_status(objspace));
-    gc_report(1, objspace, "gc_exit: %s [%s]\n", gc_enter_event_cstr(event), gc_current_status(objspace));
-    during_gc = FALSE;
-
-    RB_VM_LOCK_LEAVE_LEV(lock_lev);
-}
-
-static void
-gc_marking_enter(rb_objspace_t *objspace)
-{
-    GC_ASSERT(during_gc != 0);
-
-    gc_clock_start(&objspace->profile.marking_start_time);
-}
-
-static void
-gc_marking_exit(rb_objspace_t *objspace)
-{
-    GC_ASSERT(during_gc != 0);
-
-    objspace->profile.marking_time_ns += gc_clock_end(&objspace->profile.marking_start_time);
-}
-
-static void
-gc_sweeping_enter(rb_objspace_t *objspace)
-{
-    GC_ASSERT(during_gc != 0);
-
-    gc_clock_start(&objspace->profile.sweeping_start_time);
-}
-
-static void
-gc_sweeping_exit(rb_objspace_t *objspace)
-{
-    GC_ASSERT(during_gc != 0);
-
-    objspace->profile.sweeping_time_ns += gc_clock_end(&objspace->profile.sweeping_start_time);
-}
-
-static void *
-gc_with_gvl(void *ptr)
-{
-    struct objspace_and_reason *oar = (struct objspace_and_reason *)ptr;
-    return (void *)(VALUE)garbage_collect(oar->objspace, oar->reason);
-}
-
-static int
-garbage_collect_with_gvl(rb_objspace_t *objspace, unsigned int reason)
-{
-    if (dont_gc_val()) return TRUE;
-    if (ruby_thread_has_gvl_p()) {
-        return garbage_collect(objspace, reason);
+    switch (BUILTIN_TYPE(obj)) {
+      case T_NIL:
+      case T_FIXNUM:
+      case T_TRUE:
+      case T_FALSE:
+        rb_bug("obj_free() called for broken object");
+        break;
+      default:
+        break;
     }
-    else {
-        if (ruby_native_thread_p()) {
-            struct objspace_and_reason oar;
-            oar.objspace = objspace;
-            oar.reason = reason;
-            return (int)(VALUE)rb_thread_call_with_gvl(gc_with_gvl, (void *)&oar);
+
+    switch (BUILTIN_TYPE(obj)) {
+      case T_OBJECT:
+        if (rb_shape_obj_too_complex_p(obj)) {
+            RB_DEBUG_COUNTER_INC(obj_obj_too_complex);
+            st_free_table(ROBJECT_FIELDS_HASH(obj));
+        }
+        else if (RBASIC(obj)->flags & ROBJECT_EMBED) {
+            RB_DEBUG_COUNTER_INC(obj_obj_embed);
         }
         else {
-            /* no ruby thread */
-            fprintf(stderr, "[FATAL] failed to allocate memory\n");
-            exit(EXIT_FAILURE);
+            xfree(ROBJECT(obj)->as.heap.fields);
+            RB_DEBUG_COUNTER_INC(obj_obj_ptr);
         }
-    }
-}
-
-static int
-gc_set_candidate_object_i(void *vstart, void *vend, size_t stride, void *data)
-{
-    rb_objspace_t *objspace = &rb_objspace;
-    VALUE v = (VALUE)vstart;
-    for (; v != (VALUE)vend; v += stride) {
-        switch (BUILTIN_TYPE(v)) {
-          case T_NONE:
-          case T_ZOMBIE:
+        break;
+      case T_MODULE:
+      case T_CLASS:
+        args.klass = obj;
+        rb_class_classext_foreach(obj, classext_free, (void *)&args);
+        if (RCLASS_CLASSEXT_TBL(obj)) {
+            st_free_table(RCLASS_CLASSEXT_TBL(obj));
+        }
+        (void)RB_DEBUG_COUNTER_INC_IF(obj_module_ptr, BUILTIN_TYPE(obj) == T_MODULE);
+        (void)RB_DEBUG_COUNTER_INC_IF(obj_class_ptr, BUILTIN_TYPE(obj) == T_CLASS);
+        break;
+      case T_STRING:
+        rb_str_free(obj);
+        break;
+      case T_ARRAY:
+        rb_ary_free(obj);
+        break;
+      case T_HASH:
+#if USE_DEBUG_COUNTER
+        switch (RHASH_SIZE(obj)) {
+          case 0:
+            RB_DEBUG_COUNTER_INC(obj_hash_empty);
+            break;
+          case 1:
+            RB_DEBUG_COUNTER_INC(obj_hash_1);
+            break;
+          case 2:
+            RB_DEBUG_COUNTER_INC(obj_hash_2);
+            break;
+          case 3:
+            RB_DEBUG_COUNTER_INC(obj_hash_3);
+            break;
+          case 4:
+            RB_DEBUG_COUNTER_INC(obj_hash_4);
+            break;
+          case 5:
+          case 6:
+          case 7:
+          case 8:
+            RB_DEBUG_COUNTER_INC(obj_hash_5_8);
             break;
-          case T_STRING:
-            // precompute the string coderange. This both save time for when it will be
-            // eventually needed, and avoid mutating heap pages after a potential fork.
-            rb_enc_str_coderange(v);
-            // fall through
           default:
-            if (!RVALUE_OLD_P(v) && !RVALUE_WB_UNPROTECTED(v)) {
-                RVALUE_AGE_SET_CANDIDATE(objspace, v);
-            }
+            GC_ASSERT(RHASH_SIZE(obj) > 8);
+            RB_DEBUG_COUNTER_INC(obj_hash_g8);
         }
-    }
-
-    return 0;
-}
-
-static VALUE
-gc_start_internal(rb_execution_context_t *ec, VALUE self, VALUE full_mark, VALUE immediate_mark, VALUE immediate_sweep, VALUE compact)
-{
-    rb_objspace_t *objspace = &rb_objspace;
-    unsigned int reason = (GPR_FLAG_FULL_MARK |
-                           GPR_FLAG_IMMEDIATE_MARK |
-                           GPR_FLAG_IMMEDIATE_SWEEP |
-                           GPR_FLAG_METHOD);
 
-    /* For now, compact implies full mark / sweep, so ignore other flags */
-    if (RTEST(compact)) {
-        GC_ASSERT(GC_COMPACTION_SUPPORTED);
-
-        reason |= GPR_FLAG_COMPACT;
-    }
-    else {
-        if (!RTEST(full_mark))       reason &= ~GPR_FLAG_FULL_MARK;
-        if (!RTEST(immediate_mark))  reason &= ~GPR_FLAG_IMMEDIATE_MARK;
-        if (!RTEST(immediate_sweep)) reason &= ~GPR_FLAG_IMMEDIATE_SWEEP;
-    }
-
-    garbage_collect(objspace, reason);
-    gc_finalize_deferred(objspace);
-
-    return Qnil;
-}
-
-static void
-free_empty_pages(void)
-{
-    rb_objspace_t *objspace = &rb_objspace;
-
-    for (int i = 0; i < SIZE_POOL_COUNT; i++) {
-        /* Move all empty pages to the tomb heap for freeing. */
-        rb_size_pool_t *size_pool = &size_pools[i];
-        rb_heap_t *heap = SIZE_POOL_EDEN_HEAP(size_pool);
-        rb_heap_t *tomb_heap = SIZE_POOL_TOMB_HEAP(size_pool);
-
-        size_t freed_pages = 0;
-
-        struct heap_page **next_page_ptr = &heap->free_pages;
-        struct heap_page *page = heap->free_pages;
-        while (page) {
-            /* All finalizers should have been ran in gc_start_internal, so there
-            * should be no objects that require finalization. */
-            GC_ASSERT(page->final_slots == 0);
-
-            struct heap_page *next_page = page->free_next;
-
-            if (page->free_slots == page->total_slots) {
-                heap_unlink_page(objspace, heap, page);
-                heap_add_page(objspace, size_pool, tomb_heap, page);
-                freed_pages++;
+        if (RHASH_AR_TABLE_P(obj)) {
+            if (RHASH_AR_TABLE(obj) == NULL) {
+                RB_DEBUG_COUNTER_INC(obj_hash_null);
             }
             else {
-                *next_page_ptr = page;
-                next_page_ptr = &page->free_next;
+                RB_DEBUG_COUNTER_INC(obj_hash_ar);
             }
-
-            page = next_page;
         }
-
-        *next_page_ptr = NULL;
-
-        size_pool_allocatable_pages_set(objspace, size_pool, size_pool->allocatable_pages + freed_pages);
-    }
-
-    heap_pages_free_unused_pages(objspace);
-}
-
-void
-rb_gc_prepare_heap(void)
-{
-    rb_objspace_each_objects(gc_set_candidate_object_i, NULL);
-    gc_start_internal(NULL, Qtrue, Qtrue, Qtrue, Qtrue, Qtrue);
-    free_empty_pages();
-}
-
-static int
-gc_is_moveable_obj(rb_objspace_t *objspace, VALUE obj)
-{
-    GC_ASSERT(!SPECIAL_CONST_P(obj));
-
-    switch (BUILTIN_TYPE(obj)) {
-      case T_NONE:
-      case T_NIL:
-      case T_MOVED:
-      case T_ZOMBIE:
-        return FALSE;
-      case T_SYMBOL:
-        if (DYNAMIC_SYM_P(obj) && (RSYMBOL(obj)->id & ~ID_SCOPE_MASK)) {
-            return FALSE;
+        else {
+            RB_DEBUG_COUNTER_INC(obj_hash_st);
         }
-        /* fall through */
-      case T_STRING:
-      case T_OBJECT:
-      case T_FLOAT:
-      case T_IMEMO:
-      case T_ARRAY:
-      case T_BIGNUM:
-      case T_ICLASS:
-      case T_MODULE:
+#endif
+
+        rb_hash_free(obj);
+        break;
       case T_REGEXP:
+        if (RREGEXP(obj)->ptr) {
+            onig_free(RREGEXP(obj)->ptr);
+            RB_DEBUG_COUNTER_INC(obj_regexp_ptr);
+        }
+        break;
       case T_DATA:
+        if (!rb_data_free(objspace, obj)) return false;
+        break;
       case T_MATCH:
-      case T_STRUCT:
-      case T_HASH:
-      case T_FILE:
-      case T_COMPLEX:
-      case T_RATIONAL:
-      case T_NODE:
-      case T_CLASS:
-        if (FL_TEST(obj, FL_FINALIZE)) {
-            /* The finalizer table is a numtable. It looks up objects by address.
-             * We can't mark the keys in the finalizer table because that would
-             * prevent the objects from being collected.  This check prevents
-             * objects that are keys in the finalizer table from being moved
-             * without directly pinning them. */
-            GC_ASSERT(st_is_member(finalizer_table, obj));
+        {
+            rb_matchext_t *rm = RMATCH_EXT(obj);
+#if USE_DEBUG_COUNTER
+            if (rm->regs.num_regs >= 8) {
+                RB_DEBUG_COUNTER_INC(obj_match_ge8);
+            }
+            else if (rm->regs.num_regs >= 4) {
+                RB_DEBUG_COUNTER_INC(obj_match_ge4);
+            }
+            else if (rm->regs.num_regs >= 1) {
+                RB_DEBUG_COUNTER_INC(obj_match_under4);
+            }
+#endif
+            onig_region_free(&rm->regs, 0);
+            xfree(rm->char_offset);
 
+            RB_DEBUG_COUNTER_INC(obj_match_ptr);
+        }
+        break;
+      case T_FILE:
+        if (RFILE(obj)->fptr) {
+            make_io_zombie(objspace, obj);
+            RB_DEBUG_COUNTER_INC(obj_file_ptr);
             return FALSE;
         }
-        GC_ASSERT(RVALUE_MARKED(obj));
-        GC_ASSERT(!RVALUE_PINNED(obj));
-
-        return TRUE;
-
-      default:
-        rb_bug("gc_is_moveable_obj: unreachable (%d)", (int)BUILTIN_TYPE(obj));
         break;
-    }
-
-    return FALSE;
-}
-
-static VALUE
-gc_move(rb_objspace_t *objspace, VALUE scan, VALUE free, size_t src_slot_size, size_t slot_size)
-{
-    int marked;
-    int wb_unprotected;
-    int uncollectible;
-    int age;
-    RVALUE *dest = (RVALUE *)free;
-    RVALUE *src = (RVALUE *)scan;
-
-    gc_report(4, objspace, "Moving object: %p -> %p\n", (void*)scan, (void *)free);
-
-    GC_ASSERT(BUILTIN_TYPE(scan) != T_NONE);
-    GC_ASSERT(!MARKED_IN_BITMAP(GET_HEAP_MARK_BITS(free), free));
+      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:
+        args.klass = obj;
 
-    GC_ASSERT(!RVALUE_MARKING((VALUE)src));
+        rb_class_classext_foreach(obj, classext_iclass_free, (void *)&args);
+        if (RCLASS_CLASSEXT_TBL(obj)) {
+            st_free_table(RCLASS_CLASSEXT_TBL(obj));
+        }
 
-    /* Save off bits for current object. */
-    marked = rb_objspace_marked_object_p((VALUE)src);
-    wb_unprotected = RVALUE_WB_UNPROTECTED((VALUE)src);
-    uncollectible = RVALUE_UNCOLLECTIBLE((VALUE)src);
-    bool remembered = RVALUE_REMEMBERED((VALUE)src);
-    age = RVALUE_AGE_GET((VALUE)src);
+        RB_DEBUG_COUNTER_INC(obj_iclass_ptr);
+        break;
 
-    /* Clear bits for eventual T_MOVED */
-    CLEAR_IN_BITMAP(GET_HEAP_MARK_BITS((VALUE)src), (VALUE)src);
-    CLEAR_IN_BITMAP(GET_HEAP_WB_UNPROTECTED_BITS((VALUE)src), (VALUE)src);
-    CLEAR_IN_BITMAP(GET_HEAP_UNCOLLECTIBLE_BITS((VALUE)src), (VALUE)src);
-    CLEAR_IN_BITMAP(GET_HEAP_PAGE((VALUE)src)->remembered_bits, (VALUE)src);
+      case T_FLOAT:
+        RB_DEBUG_COUNTER_INC(obj_float);
+        break;
 
-    if (FL_TEST((VALUE)src, FL_EXIVAR)) {
-        /* Resizing the st table could cause a malloc */
-        DURING_GC_COULD_MALLOC_REGION_START();
-        {
-            rb_mv_generic_ivar((VALUE)src, (VALUE)dest);
+      case T_BIGNUM:
+        if (!BIGNUM_EMBED_P(obj) && BIGNUM_DIGITS(obj)) {
+            xfree(BIGNUM_DIGITS(obj));
+            RB_DEBUG_COUNTER_INC(obj_bignum_ptr);
         }
-        DURING_GC_COULD_MALLOC_REGION_END();
-    }
-
-    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, srcid, &id)) {
-        gc_report(4, objspace, "Moving object with seen id: %p -> %p\n", (void *)src, (void *)dest);
-        /* Resizing the st table could cause a malloc */
-        DURING_GC_COULD_MALLOC_REGION_START();
-        {
-            st_delete(objspace->obj_to_id_tbl, &srcid, 0);
-            st_insert(objspace->obj_to_id_tbl, (st_data_t)dest, id);
+        else {
+            RB_DEBUG_COUNTER_INC(obj_bignum_embed);
         }
-        DURING_GC_COULD_MALLOC_REGION_END();
-    }
-
-    /* Move the object */
-    memcpy(dest, src, MIN(src_slot_size, slot_size));
-
-    if (RVALUE_OVERHEAD > 0) {
-        void *dest_overhead = (void *)(((uintptr_t)dest) + slot_size - RVALUE_OVERHEAD);
-        void *src_overhead = (void *)(((uintptr_t)src) + src_slot_size - RVALUE_OVERHEAD);
-
-        memcpy(dest_overhead, src_overhead, RVALUE_OVERHEAD);
-    }
+        break;
 
-    memset(src, 0, src_slot_size);
-    RVALUE_AGE_RESET((VALUE)src);
+      case T_NODE:
+        UNEXPECTED_NODE(obj_free);
+        break;
 
-    /* Set bits for object in new location */
-    if (remembered) {
-        MARK_IN_BITMAP(GET_HEAP_PAGE(dest)->remembered_bits, (VALUE)dest);
-    }
-    else {
-        CLEAR_IN_BITMAP(GET_HEAP_PAGE(dest)->remembered_bits, (VALUE)dest);
-    }
+      case T_STRUCT:
+        if ((RBASIC(obj)->flags & RSTRUCT_EMBED_LEN_MASK) ||
+            RSTRUCT(obj)->as.heap.ptr == NULL) {
+            RB_DEBUG_COUNTER_INC(obj_struct_embed);
+        }
+        else {
+            xfree((void *)RSTRUCT(obj)->as.heap.ptr);
+            RB_DEBUG_COUNTER_INC(obj_struct_ptr);
+        }
+        break;
 
-    if (marked) {
-        MARK_IN_BITMAP(GET_HEAP_MARK_BITS((VALUE)dest), (VALUE)dest);
-    }
-    else {
-        CLEAR_IN_BITMAP(GET_HEAP_MARK_BITS((VALUE)dest), (VALUE)dest);
-    }
+      case T_SYMBOL:
+        RB_DEBUG_COUNTER_INC(obj_symbol);
+        break;
 
-    if (wb_unprotected) {
-        MARK_IN_BITMAP(GET_HEAP_WB_UNPROTECTED_BITS((VALUE)dest), (VALUE)dest);
-    }
-    else {
-        CLEAR_IN_BITMAP(GET_HEAP_WB_UNPROTECTED_BITS((VALUE)dest), (VALUE)dest);
+      case T_IMEMO:
+        rb_imemo_free((VALUE)obj);
+        break;
+
+      default:
+        rb_bug("gc_sweep(): unknown data type 0x%x(%p) 0x%"PRIxVALUE,
+               BUILTIN_TYPE(obj), (void*)obj, RBASIC(obj)->flags);
     }
 
-    if (uncollectible) {
-        MARK_IN_BITMAP(GET_HEAP_UNCOLLECTIBLE_BITS((VALUE)dest), (VALUE)dest);
+    if (FL_TEST_RAW(obj, FL_FINALIZE)) {
+        rb_gc_impl_make_zombie(objspace, obj, 0, 0);
+        return FALSE;
     }
     else {
-        CLEAR_IN_BITMAP(GET_HEAP_UNCOLLECTIBLE_BITS((VALUE)dest), (VALUE)dest);
+        return TRUE;
     }
+}
 
-    RVALUE_AGE_SET((VALUE)dest, age);
-    /* Assign forwarding address */
-    src->as.moved.flags = T_MOVED;
-    src->as.moved.dummy = Qundef;
-    src->as.moved.destination = (VALUE)dest;
-    GC_ASSERT(BUILTIN_TYPE((VALUE)dest) != T_NONE);
-
-    return (VALUE)src;
+void
+rb_objspace_set_event_hook(const rb_event_flag_t event)
+{
+    rb_gc_impl_set_event_hook(rb_gc_get_objspace(), event);
 }
 
-#if GC_CAN_COMPILE_COMPACTION
 static int
-compare_free_slots(const void *left, const void *right, void *dummy)
+internal_object_p(VALUE obj)
 {
-    struct heap_page *left_page;
-    struct heap_page *right_page;
+    void *ptr = asan_unpoison_object_temporary(obj);
 
-    left_page = *(struct heap_page * const *)left;
-    right_page = *(struct heap_page * const *)right;
+    if (RBASIC(obj)->flags) {
+        switch (BUILTIN_TYPE(obj)) {
+          case T_NODE:
+            UNEXPECTED_NODE(internal_object_p);
+            break;
+          case T_NONE:
+          case T_MOVED:
+          case T_IMEMO:
+          case T_ICLASS:
+          case T_ZOMBIE:
+            break;
+          case T_CLASS:
+            if (obj == rb_mRubyVMFrozenCore)
+                return 1;
 
-    return left_page->free_slots - right_page->free_slots;
+            if (!RBASIC_CLASS(obj)) break;
+            if (RCLASS_SINGLETON_P(obj)) {
+                return rb_singleton_class_internal_p(obj);
+            }
+            return 0;
+          default:
+            if (!RBASIC(obj)->klass) break;
+            return 0;
+        }
+    }
+    if (ptr || !RBASIC(obj)->flags) {
+        rb_asan_poison_object(obj);
+    }
+    return 1;
 }
 
-static void
-gc_sort_heap_by_empty_slots(rb_objspace_t *objspace)
+int
+rb_objspace_internal_object_p(VALUE obj)
 {
-    for (int j = 0; j < SIZE_POOL_COUNT; j++) {
-        rb_size_pool_t *size_pool = &size_pools[j];
+    return internal_object_p(obj);
+}
+
+struct os_each_struct {
+    size_t num;
+    VALUE of;
+};
 
-        size_t total_pages = SIZE_POOL_EDEN_HEAP(size_pool)->total_pages;
-        size_t size = size_mul_or_raise(total_pages, sizeof(struct heap_page *), rb_eRuntimeError);
-        struct heap_page *page = 0, **page_list = malloc(size);
-        size_t i = 0;
+static int
+os_obj_of_i(void *vstart, void *vend, size_t stride, void *data)
+{
+    struct os_each_struct *oes = (struct os_each_struct *)data;
 
-        SIZE_POOL_EDEN_HEAP(size_pool)->free_pages = NULL;
-        ccan_list_for_each(&SIZE_POOL_EDEN_HEAP(size_pool)->pages, page, page_node) {
-            page_list[i++] = page;
-            GC_ASSERT(page);
+    VALUE v = (VALUE)vstart;
+    for (; v != (VALUE)vend; v += stride) {
+        if (!internal_object_p(v)) {
+            if (!oes->of || rb_obj_is_kind_of(v, oes->of)) {
+                if (!rb_multi_ractor_p() || rb_ractor_shareable_p(v)) {
+                    rb_yield(v);
+                    oes->num++;
+                }
+            }
         }
+    }
+
+    return 0;
+}
 
-        GC_ASSERT((size_t)i == total_pages);
+static VALUE
+os_obj_of(VALUE of)
+{
+    struct os_each_struct oes;
 
-        /* Sort the heap so "filled pages" are first. `heap_add_page` adds to the
-         * head of the list, so empty pages will end up at the start of the heap */
-        ruby_qsort(page_list, total_pages, sizeof(struct heap_page *), compare_free_slots, NULL);
+    oes.num = 0;
+    oes.of = of;
+    rb_objspace_each_objects(os_obj_of_i, &oes);
+    return SIZET2NUM(oes.num);
+}
 
-        /* Reset the eden heap */
-        ccan_list_head_init(&SIZE_POOL_EDEN_HEAP(size_pool)->pages);
+/*
+ *  call-seq:
+ *     ObjectSpace.each_object([module]) {|obj| ... } -> integer
+ *     ObjectSpace.each_object([module])              -> an_enumerator
+ *
+ *  Calls the block once for each living, nonimmediate object in this
+ *  Ruby process. If <i>module</i> is specified, calls the block
+ *  for only those classes or modules that match (or are a subclass of)
+ *  <i>module</i>. Returns the number of objects found. Immediate
+ *  objects (<code>Fixnum</code>s, <code>Symbol</code>s
+ *  <code>true</code>, <code>false</code>, and <code>nil</code>) are
+ *  never returned. In the example below, #each_object returns both
+ *  the numbers we defined and several constants defined in the Math
+ *  module.
+ *
+ *  If no block is given, an enumerator is returned instead.
+ *
+ *     a = 102.7
+ *     b = 95       # Won't be returned
+ *     c = 12345678987654321
+ *     count = ObjectSpace.each_object(Numeric) {|x| p x }
+ *     puts "Total count: #{count}"
+ *
+ *  <em>produces:</em>
+ *
+ *     12345678987654321
+ *     102.7
+ *     2.71828182845905
+ *     3.14159265358979
+ *     2.22044604925031e-16
+ *     1.7976931348623157e+308
+ *     2.2250738585072e-308
+ *     Total count: 7
+ *
+ *  Due to a current known Ractor implementation issue, this method will not yield
+ *  Ractor-unshareable objects in multi-Ractor mode (when
+ *  <code>Ractor.new</code> has been called within the process at least once).
+ *  See https://bugs.ruby-lang.org/issues/19387 for more information.
+ *
+ *     a = 12345678987654321 # shareable
+ *     b = [].freeze # shareable
+ *     c = {} # not shareable
+ *     ObjectSpace.each_object {|x| x } # yields a, b, and c
+ *     Ractor.new {} # enter multi-Ractor mode
+ *     ObjectSpace.each_object {|x| x } # does not yield c
+ *
+ */
 
-        for (i = 0; i < total_pages; i++) {
-            ccan_list_add(&SIZE_POOL_EDEN_HEAP(size_pool)->pages, &page_list[i]->page_node);
-            if (page_list[i]->free_slots != 0) {
-                heap_add_freepage(SIZE_POOL_EDEN_HEAP(size_pool), page_list[i]);
-            }
-        }
+static VALUE
+os_each_obj(int argc, VALUE *argv, VALUE os)
+{
+    VALUE of;
 
-        free(page_list);
-    }
+    of = (!rb_check_arity(argc, 0, 1) ? 0 : argv[0]);
+    RETURN_ENUMERATOR(os, 1, &of);
+    return os_obj_of(of);
 }
-#endif
 
-static void
-gc_ref_update_array(rb_objspace_t * objspace, VALUE v)
-{
-    if (ARY_SHARED_P(v)) {
-        VALUE old_root = RARRAY(v)->as.heap.aux.shared_root;
+/*
+ *  call-seq:
+ *     ObjectSpace.undefine_finalizer(obj)
+ *
+ *  Removes all finalizers for <i>obj</i>.
+ *
+ */
 
-        UPDATE_IF_MOVED(objspace, RARRAY(v)->as.heap.aux.shared_root);
+static VALUE
+undefine_final(VALUE os, VALUE obj)
+{
+    return rb_undefine_finalizer(obj);
+}
 
-        VALUE new_root = RARRAY(v)->as.heap.aux.shared_root;
-        // If the root is embedded and its location has changed
-        if (ARY_EMBED_P(new_root) && new_root != old_root) {
-            size_t offset = (size_t)(RARRAY(v)->as.heap.ptr - RARRAY(old_root)->as.ary);
-            GC_ASSERT(RARRAY(v)->as.heap.ptr >= RARRAY(old_root)->as.ary);
-            RARRAY(v)->as.heap.ptr = RARRAY(new_root)->as.ary + offset;
-        }
-    }
-    else {
-        long len = RARRAY_LEN(v);
+VALUE
+rb_undefine_finalizer(VALUE obj)
+{
+    rb_check_frozen(obj);
 
-        if (len > 0) {
-            VALUE *ptr = (VALUE *)RARRAY_CONST_PTR(v);
-            for (long i = 0; i < len; i++) {
-                UPDATE_IF_MOVED(objspace, ptr[i]);
-            }
-        }
+    rb_gc_impl_undefine_finalizer(rb_gc_get_objspace(), obj);
 
-        if (rb_gc_obj_slot_size(v) >= rb_ary_size_as_embedded(v)) {
-            if (rb_ary_embeddable_p(v)) {
-                rb_ary_make_embedded(v);
-            }
-        }
-    }
+    return obj;
 }
 
 static void
-gc_ref_update_object(rb_objspace_t *objspace, VALUE v)
+should_be_callable(VALUE block)
 {
-    VALUE *ptr = ROBJECT_IVPTR(v);
-
-    if (rb_shape_obj_too_complex(v)) {
-        rb_gc_update_tbl_refs(ROBJECT_IV_HASH(v));
-        return;
+    if (!rb_obj_respond_to(block, idCall, TRUE)) {
+        rb_raise(rb_eArgError, "wrong type argument %"PRIsVALUE" (should be callable)",
+                 rb_obj_class(block));
     }
+}
 
-    size_t slot_size = rb_gc_obj_slot_size(v);
-    size_t embed_size = rb_obj_embedded_size(ROBJECT_IV_CAPACITY(v));
-    if (slot_size >= embed_size && !RB_FL_TEST_RAW(v, ROBJECT_EMBED)) {
-        // Object can be re-embedded
-        memcpy(ROBJECT(v)->as.ary, ptr, sizeof(VALUE) * ROBJECT_IV_COUNT(v));
-        RB_FL_SET_RAW(v, ROBJECT_EMBED);
-        xfree(ptr);
-        ptr = ROBJECT(v)->as.ary;
+static void
+should_be_finalizable(VALUE obj)
+{
+    if (!FL_ABLE(obj)) {
+        rb_raise(rb_eArgError, "cannot define finalizer for %s",
+                 rb_obj_classname(obj));
     }
+    rb_check_frozen(obj);
+}
 
-    for (uint32_t i = 0; i < ROBJECT_IV_COUNT(v); i++) {
-        UPDATE_IF_MOVED(objspace, ptr[i]);
-    }
+void
+rb_gc_copy_finalizer(VALUE dest, VALUE obj)
+{
+    rb_gc_impl_copy_finalizer(rb_gc_get_objspace(), dest, obj);
 }
 
-static int
-hash_replace_ref(st_data_t *key, st_data_t *value, st_data_t argp, int existing)
+/*
+ *  call-seq:
+ *     ObjectSpace.define_finalizer(obj, aProc=proc())
+ *
+ *  Adds <i>aProc</i> as a finalizer, to be called after <i>obj</i>
+ *  was destroyed. The object ID of the <i>obj</i> will be passed
+ *  as an argument to <i>aProc</i>. If <i>aProc</i> is a lambda or
+ *  method, make sure it can be called with a single argument.
+ *
+ *  The return value is an array <code>[0, aProc]</code>.
+ *
+ *  The two recommended patterns are to either create the finaliser proc
+ *  in a non-instance method where it can safely capture the needed state,
+ *  or to use a custom callable object that stores the needed state
+ *  explicitly as instance variables.
+ *
+ *      class Foo
+ *        def initialize(data_needed_for_finalization)
+ *          ObjectSpace.define_finalizer(self, self.class.create_finalizer(data_needed_for_finalization))
+ *        end
+ *
+ *        def self.create_finalizer(data_needed_for_finalization)
+ *          proc {
+ *            puts "finalizing #{data_needed_for_finalization}"
+ *          }
+ *        end
+ *      end
+ *
+ *      class Bar
+ *       class Remover
+ *          def initialize(data_needed_for_finalization)
+ *            @data_needed_for_finalization = data_needed_for_finalization
+ *          end
+ *
+ *          def call(id)
+ *            puts "finalizing #{@data_needed_for_finalization}"
+ *          end
+ *        end
+ *
+ *        def initialize(data_needed_for_finalization)
+ *          ObjectSpace.define_finalizer(self, Remover.new(data_needed_for_finalization))
+ *        end
+ *      end
+ *
+ *  Note that if your finalizer references the object to be
+ *  finalized it will never be run on GC, although it will still be
+ *  run at exit. You will get a warning if you capture the object
+ *  to be finalized as the receiver of the finalizer.
+ *
+ *      class CapturesSelf
+ *        def initialize(name)
+ *          ObjectSpace.define_finalizer(self, proc {
+ *            # this finalizer will only be run on exit
+ *            puts "finalizing #{name}"
+ *          })
+ *        end
+ *      end
+ *
+ *  Also note that finalization can be unpredictable and is never guaranteed
+ *  to be run except on exit.
+ */
+
+static VALUE
+define_final(int argc, VALUE *argv, VALUE os)
 {
-    rb_objspace_t *objspace = (rb_objspace_t *)argp;
+    VALUE obj, block;
 
-    if (gc_object_moved_p(objspace, (VALUE)*key)) {
-        *key = rb_gc_location((VALUE)*key);
+    rb_scan_args(argc, argv, "11", &obj, &block);
+    if (argc == 1) {
+        block = rb_block_proc();
     }
 
-    if (gc_object_moved_p(objspace, (VALUE)*value)) {
-        *value = rb_gc_location((VALUE)*value);
+    if (rb_callable_receiver(block) == obj) {
+        rb_warn("finalizer references object to be finalized");
     }
 
-    return ST_CONTINUE;
+    return rb_define_finalizer(obj, block);
 }
 
-static int
-hash_foreach_replace(st_data_t key, st_data_t value, st_data_t argp, int error)
+VALUE
+rb_define_finalizer(VALUE obj, VALUE block)
 {
-    rb_objspace_t *objspace;
-
-    objspace = (rb_objspace_t *)argp;
+    should_be_finalizable(obj);
+    should_be_callable(block);
 
-    if (gc_object_moved_p(objspace, (VALUE)key)) {
-        return ST_REPLACE;
-    }
+    block = rb_gc_impl_define_finalizer(rb_gc_get_objspace(), obj, block);
 
-    if (gc_object_moved_p(objspace, (VALUE)value)) {
-        return ST_REPLACE;
-    }
-    return ST_CONTINUE;
+    block = rb_ary_new3(2, INT2FIX(0), block);
+    OBJ_FREEZE(block);
+    return block;
 }
 
-static int
-hash_replace_ref_value(st_data_t *key, st_data_t *value, st_data_t argp, int existing)
+void
+rb_objspace_call_finalizer(void)
 {
-    rb_objspace_t *objspace = (rb_objspace_t *)argp;
+    rb_gc_impl_shutdown_call_finalizer(rb_gc_get_objspace());
+}
 
-    if (gc_object_moved_p(objspace, (VALUE)*value)) {
-        *value = rb_gc_location((VALUE)*value);
-    }
+void
+rb_objspace_free_objects(void *objspace)
+{
+    rb_gc_impl_shutdown_free_objects(objspace);
+}
 
-    return ST_CONTINUE;
+int
+rb_objspace_garbage_object_p(VALUE obj)
+{
+    return rb_gc_impl_garbage_object_p(rb_gc_get_objspace(), obj);
 }
 
-static int
-hash_foreach_replace_value(st_data_t key, st_data_t value, st_data_t argp, int error)
+bool
+rb_gc_pointer_to_heap_p(VALUE obj)
 {
-    rb_objspace_t *objspace;
+    return rb_gc_impl_pointer_to_heap_p(rb_gc_get_objspace(), (void *)obj);
+}
 
-    objspace = (rb_objspace_t *)argp;
+#define OBJ_ID_INCREMENT (RUBY_IMMEDIATE_MASK + 1)
+#define LAST_OBJECT_ID() (object_id_counter * OBJ_ID_INCREMENT)
+static VALUE id2ref_value = 0;
+static st_table *id2ref_tbl = NULL;
+static bool id2ref_tbl_built = false;
 
-    if (gc_object_moved_p(objspace, (VALUE)value)) {
-        return ST_REPLACE;
-    }
-    return ST_CONTINUE;
-}
+#if SIZEOF_SIZE_T == SIZEOF_LONG_LONG
+static size_t object_id_counter = 1;
+#else
+static unsigned long long object_id_counter = 1;
+#endif
 
-static void
-gc_update_tbl_refs(rb_objspace_t * objspace, st_table *tbl)
+static inline VALUE
+generate_next_object_id(void)
 {
-    if (!tbl || tbl->num_entries == 0) return;
+#if SIZEOF_SIZE_T == SIZEOF_LONG_LONG
+    // 64bit atomics are available
+    return SIZET2NUM(RUBY_ATOMIC_SIZE_FETCH_ADD(object_id_counter, 1) * OBJ_ID_INCREMENT);
+#else
+    unsigned int lock_lev = RB_GC_VM_LOCK();
+    VALUE id = ULL2NUM(++object_id_counter * OBJ_ID_INCREMENT);
+    RB_GC_VM_UNLOCK(lock_lev);
+    return id;
+#endif
+}
 
-    if (st_foreach_with_replace(tbl, hash_foreach_replace_value, hash_replace_ref_value, (st_data_t)objspace)) {
-        rb_raise(rb_eRuntimeError, "hash modified during iteration");
+void
+rb_gc_obj_id_moved(VALUE obj)
+{
+    if (UNLIKELY(id2ref_tbl)) {
+        st_insert(id2ref_tbl, (st_data_t)rb_obj_id(obj), (st_data_t)obj);
     }
 }
 
-static void
-gc_update_table_refs(rb_objspace_t * objspace, st_table *tbl)
+static int
+object_id_cmp(st_data_t x, st_data_t y)
 {
-    if (!tbl || tbl->num_entries == 0) return;
-
-    if (st_foreach_with_replace(tbl, hash_foreach_replace, hash_replace_ref, (st_data_t)objspace)) {
-        rb_raise(rb_eRuntimeError, "hash modified during iteration");
+    if (RB_TYPE_P(x, T_BIGNUM)) {
+        return !rb_big_eql(x, y);
+    }
+    else {
+        return x != y;
     }
 }
 
-/* Update MOVED references in an st_table */
-void
-rb_gc_update_tbl_refs(st_table *ptr)
+static st_index_t
+object_id_hash(st_data_t n)
 {
-    rb_objspace_t *objspace = &rb_objspace;
-    gc_update_table_refs(objspace, ptr);
+    return FIX2LONG(rb_hash((VALUE)n));
 }
 
+static const struct st_hash_type object_id_hash_type = {
+    object_id_cmp,
+    object_id_hash,
+};
+
+static void gc_mark_tbl_no_pin(st_table *table);
+
 static void
-gc_ref_update_hash(rb_objspace_t * objspace, VALUE v)
+id2ref_tbl_mark(void *data)
 {
-    rb_hash_stlike_foreach_with_replace(v, hash_foreach_replace, hash_replace_ref, (st_data_t)objspace);
+    st_table *table = (st_table *)data;
+    if (UNLIKELY(!RB_POSFIXABLE(LAST_OBJECT_ID()))) {
+        // It's very unlikely, but if enough object ids were generated, keys may be T_BIGNUM
+        rb_mark_set(table);
+    }
+    // We purposedly don't mark values, as they are weak references.
+    // rb_gc_obj_free_vm_weak_references takes care of cleaning them up.
+}
+
+static size_t
+id2ref_tbl_memsize(const void *data)
+{
+    return rb_st_memsize(data);
 }
 
 static void
-gc_ref_update_method_entry(rb_objspace_t *objspace, rb_method_entry_t *me)
+id2ref_tbl_free(void *data)
 {
-    rb_method_definition_t *def = me->def;
+    id2ref_tbl = NULL; // clear global ref
+    st_table *table = (st_table *)data;
+    st_free_table(table);
+}
 
-    UPDATE_IF_MOVED(objspace, me->owner);
-    UPDATE_IF_MOVED(objspace, me->defined_class);
+static const rb_data_type_t id2ref_tbl_type = {
+    .wrap_struct_name = "VM/_id2ref_table",
+    .function = {
+        .dmark = id2ref_tbl_mark,
+        .dfree = id2ref_tbl_free,
+        .dsize = id2ref_tbl_memsize,
+        // dcompact function not required because the table is reference updated
+        // in rb_gc_vm_weak_table_foreach
+    },
+    .flags = RUBY_TYPED_WB_PROTECTED | RUBY_TYPED_FREE_IMMEDIATELY
+};
 
-    if (def) {
-        switch (def->type) {
-          case VM_METHOD_TYPE_ISEQ:
-            if (def->body.iseq.iseqptr) {
-                TYPED_UPDATE_IF_MOVED(objspace, rb_iseq_t *, def->body.iseq.iseqptr);
-            }
-            TYPED_UPDATE_IF_MOVED(objspace, rb_cref_t *, def->body.iseq.cref);
-            break;
-          case VM_METHOD_TYPE_ATTRSET:
-          case VM_METHOD_TYPE_IVAR:
-            UPDATE_IF_MOVED(objspace, def->body.attr.location);
-            break;
-          case VM_METHOD_TYPE_BMETHOD:
-            UPDATE_IF_MOVED(objspace, def->body.bmethod.proc);
-            break;
-          case VM_METHOD_TYPE_ALIAS:
-            TYPED_UPDATE_IF_MOVED(objspace, struct rb_method_entry_struct *, def->body.alias.original_me);
-            return;
-          case VM_METHOD_TYPE_REFINED:
-            TYPED_UPDATE_IF_MOVED(objspace, struct rb_method_entry_struct *, def->body.refined.orig_me);
-            UPDATE_IF_MOVED(objspace, def->body.refined.owner);
-            break;
-          case VM_METHOD_TYPE_CFUNC:
-          case VM_METHOD_TYPE_ZSUPER:
-          case VM_METHOD_TYPE_MISSING:
-          case VM_METHOD_TYPE_OPTIMIZED:
-          case VM_METHOD_TYPE_UNDEF:
-          case VM_METHOD_TYPE_NOTIMPLEMENTED:
-            break;
+static VALUE
+class_object_id(VALUE klass)
+{
+    VALUE id = RUBY_ATOMIC_VALUE_LOAD(RCLASS(klass)->object_id);
+    if (!id) {
+        unsigned int lock_lev = RB_GC_VM_LOCK();
+        id = generate_next_object_id();
+        VALUE existing_id = RUBY_ATOMIC_VALUE_CAS(RCLASS(klass)->object_id, 0, id);
+        if (existing_id) {
+            id = existing_id;
+        }
+        else if (RB_UNLIKELY(id2ref_tbl)) {
+            st_insert(id2ref_tbl, id, klass);
         }
+        RB_GC_VM_UNLOCK(lock_lev);
     }
+    return id;
 }
 
-static void
-gc_update_values(rb_objspace_t *objspace, long n, VALUE *values)
+static inline VALUE
+object_id_get(VALUE obj, shape_id_t shape_id)
 {
-    long i;
+    VALUE id;
+    if (rb_shape_too_complex_p(shape_id)) {
+        id = rb_obj_field_get(obj, ROOT_TOO_COMPLEX_WITH_OBJ_ID);
+    }
+    else {
+        id = rb_obj_field_get(obj, rb_shape_object_id(shape_id));
+    }
 
-    for (i=0; i<n; i++) {
-        UPDATE_IF_MOVED(objspace, values[i]);
+#if RUBY_DEBUG
+    if (!(FIXNUM_P(id) || RB_TYPE_P(id, T_BIGNUM))) {
+        rb_p(obj);
+        rb_bug("Object's shape includes object_id, but it's missing %s", rb_obj_info(obj));
     }
+#endif
+
+    return id;
 }
 
-void
-rb_gc_update_values(long n, VALUE *values)
+static VALUE
+object_id0(VALUE obj)
 {
-    gc_update_values(&rb_objspace, n, values);
+    VALUE id = Qfalse;
+    shape_id_t shape_id = RBASIC_SHAPE_ID(obj);
+
+    if (rb_shape_has_object_id(shape_id)) {
+        return object_id_get(obj, shape_id);
+    }
+
+    // rb_shape_object_id_shape may lock if the current shape has
+    // multiple children.
+    shape_id_t object_id_shape_id = rb_shape_transition_object_id(obj);
+
+    id = generate_next_object_id();
+    rb_obj_field_set(obj, object_id_shape_id, 0, id);
+
+    RUBY_ASSERT(RBASIC_SHAPE_ID(obj) == object_id_shape_id);
+    RUBY_ASSERT(rb_shape_obj_has_id(obj));
+
+    if (RB_UNLIKELY(id2ref_tbl)) {
+        st_insert(id2ref_tbl, (st_data_t)id, (st_data_t)obj);
+    }
+    return id;
 }
 
-static bool
-moved_or_living_object_strictly_p(rb_objspace_t *objspace, VALUE obj)
+static VALUE
+object_id(VALUE obj)
 {
-    return obj &&
-           is_pointer_to_heap(objspace, (void *)obj) &&
-           (is_live_object(objspace, obj) || BUILTIN_TYPE(obj) == T_MOVED);
+    switch (BUILTIN_TYPE(obj)) {
+      case T_CLASS:
+      case T_MODULE:
+        // With namespaces, classes and modules have different fields
+        // in different namespaces, so we cannot store the object id
+        // in fields.
+        return class_object_id(obj);
+      case T_IMEMO:
+        rb_bug("T_IMEMO can't have an object_id");
+        break;
+      default:
+        break;
+    }
+
+    if (UNLIKELY(rb_gc_multi_ractor_p() && rb_ractor_shareable_p(obj))) {
+        unsigned int lock_lev = RB_GC_VM_LOCK();
+        VALUE id = object_id0(obj);
+        RB_GC_VM_UNLOCK(lock_lev);
+        return id;
+    }
+
+    return object_id0(obj);
 }
 
 static void
-gc_ref_update_imemo(rb_objspace_t *objspace, VALUE obj)
+build_id2ref_i(VALUE obj, void *data)
 {
-    switch (imemo_type(obj)) {
-      case imemo_env:
-        {
-            rb_env_t *env = (rb_env_t *)obj;
-            if (LIKELY(env->ep)) {
-                // just after newobj() can be NULL here.
-                TYPED_UPDATE_IF_MOVED(objspace, rb_iseq_t *, env->iseq);
-                UPDATE_IF_MOVED(objspace, env->ep[VM_ENV_DATA_INDEX_ENV]);
-                gc_update_values(objspace, (long)env->env_size, (VALUE *)env->env);
-            }
-        }
-        break;
-      case imemo_cref:
-        UPDATE_IF_MOVED(objspace, RANY(obj)->as.imemo.cref.klass_or_self);
-        TYPED_UPDATE_IF_MOVED(objspace, struct rb_cref_struct *, RANY(obj)->as.imemo.cref.next);
-        UPDATE_IF_MOVED(objspace, RANY(obj)->as.imemo.cref.refinements);
-        break;
-      case imemo_svar:
-        UPDATE_IF_MOVED(objspace, RANY(obj)->as.imemo.svar.cref_or_me);
-        UPDATE_IF_MOVED(objspace, RANY(obj)->as.imemo.svar.lastline);
-        UPDATE_IF_MOVED(objspace, RANY(obj)->as.imemo.svar.backref);
-        UPDATE_IF_MOVED(objspace, RANY(obj)->as.imemo.svar.others);
-        break;
-      case imemo_throw_data:
-        UPDATE_IF_MOVED(objspace, RANY(obj)->as.imemo.throw_data.throw_obj);
-        break;
-      case imemo_ifunc:
-        break;
-      case imemo_memo:
-        UPDATE_IF_MOVED(objspace, RANY(obj)->as.imemo.memo.v1);
-        UPDATE_IF_MOVED(objspace, RANY(obj)->as.imemo.memo.v2);
-        break;
-      case imemo_ment:
-        gc_ref_update_method_entry(objspace, &RANY(obj)->as.imemo.ment);
-        break;
-      case imemo_iseq:
-        rb_iseq_mark_and_move((rb_iseq_t *)obj, true);
-        break;
-      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;
+    st_table *id2ref_tbl = (st_table *)data;
 
-            if (!cc->klass) {
-                // already invalidated
-            }
-            else {
-                if (moved_or_living_object_strictly_p(objspace, cc->klass) &&
-                    moved_or_living_object_strictly_p(objspace, (VALUE)cc->cme_)) {
-                    UPDATE_IF_MOVED(objspace, cc->klass);
-                    TYPED_UPDATE_IF_MOVED(objspace, struct rb_callable_method_entry_struct *, cc->cme_);
-                }
-                else {
-                    vm_cc_invalidate(cc);
-                }
-            }
-        }
-        break;
-      case imemo_constcache:
-        {
-            const struct iseq_inline_constant_cache_entry *ice = (struct iseq_inline_constant_cache_entry *)obj;
-            UPDATE_IF_MOVED(objspace, ice->value);
+    switch (BUILTIN_TYPE(obj)) {
+      case T_CLASS:
+      case T_MODULE:
+        if (RCLASS(obj)->object_id) {
+            st_insert(id2ref_tbl, RCLASS(obj)->object_id, obj);
         }
         break;
-      case imemo_parser_strterm:
-      case imemo_tmpbuf:
-      case imemo_callinfo:
+      case T_IMEMO:
+      case T_NONE:
         break;
       default:
-        rb_bug("not reachable %d", imemo_type(obj));
+        if (rb_shape_obj_has_id(obj)) {
+            st_insert(id2ref_tbl, rb_obj_id(obj), obj);
+        }
         break;
     }
 }
 
-static enum rb_id_table_iterator_result
-check_id_table_move(VALUE value, void *data)
+static VALUE
+object_id_to_ref(void *objspace_ptr, VALUE object_id)
 {
-    rb_objspace_t *objspace = (rb_objspace_t *)data;
+    rb_objspace_t *objspace = objspace_ptr;
 
-    if (gc_object_moved_p(objspace, (VALUE)value)) {
-        return ID_TABLE_REPLACE;
-    }
+    unsigned int lev = RB_GC_VM_LOCK();
 
-    return ID_TABLE_CONTINUE;
-}
+    if (!id2ref_tbl) {
+        rb_gc_vm_barrier(); // stop other ractors
 
-/* Returns the new location of an object, if it moved.  Otherwise returns
- * the existing location. */
-VALUE
-rb_gc_location(VALUE value)
-{
+        // GC Must not trigger while we build the table, otherwise if we end
+        // up freeing an object that had an ID, we might try to delete it from
+        // the table even though it wasn't inserted yet.
+        id2ref_tbl = st_init_table(&object_id_hash_type);
+        id2ref_value = TypedData_Wrap_Struct(0, &id2ref_tbl_type, id2ref_tbl);
+
+        // build_id2ref_i will most certainly malloc, which could trigger GC and sweep
+        // objects we just added to the table.
+        bool gc_disabled = RTEST(rb_gc_disable_no_rest());
+        {
+            rb_gc_impl_each_object(objspace, build_id2ref_i, (void *)id2ref_tbl);
+        }
+        if (!gc_disabled) rb_gc_enable();
+        id2ref_tbl_built = true;
+    }
 
-    VALUE destination;
+    VALUE obj;
+    bool found = st_lookup(id2ref_tbl, object_id, &obj) && !rb_gc_impl_garbage_object_p(objspace, obj);
 
-    if (!SPECIAL_CONST_P(value)) {
-        void *poisoned = asan_unpoison_object_temporary(value);
+    RB_GC_VM_UNLOCK(lev);
 
-        if (BUILTIN_TYPE(value) == T_MOVED) {
-            destination = (VALUE)RMOVED(value)->destination;
-            GC_ASSERT(BUILTIN_TYPE(destination) != T_NONE);
-        }
-        else {
-            destination = value;
-        }
+    if (found) {
+        return obj;
+    }
 
-        /* Re-poison slot if it's not the one we want */
-        if (poisoned) {
-            GC_ASSERT(BUILTIN_TYPE(value) == T_NONE);
-            asan_poison_object(value);
-        }
+    if (rb_funcall(object_id, rb_intern(">="), 1, ULL2NUM(LAST_OBJECT_ID()))) {
+        rb_raise(rb_eRangeError, "%+"PRIsVALUE" is not an id value", rb_funcall(object_id, rb_intern("to_s"), 1, INT2FIX(10)));
     }
     else {
-        destination = value;
+        rb_raise(rb_eRangeError, "%+"PRIsVALUE" is a recycled object", rb_funcall(object_id, rb_intern("to_s"), 1, INT2FIX(10)));
     }
-
-    return destination;
 }
 
-static enum rb_id_table_iterator_result
-update_id_table(VALUE *value, void *data, int existing)
+static inline void
+obj_free_object_id(VALUE obj)
 {
-    rb_objspace_t *objspace = (rb_objspace_t *)data;
+    VALUE obj_id = 0;
+    if (RB_UNLIKELY(id2ref_tbl)) {
+        switch (BUILTIN_TYPE(obj)) {
+          case T_CLASS:
+          case T_MODULE:
+            obj_id = RCLASS(obj)->object_id;
+            break;
+          case T_IMEMO:
+            if (!IMEMO_TYPE_P(obj, imemo_fields)) {
+                return;
+            }
+            // fallthrough
+          case T_OBJECT:
+            {
+            shape_id_t shape_id = RBASIC_SHAPE_ID(obj);
+            if (rb_shape_has_object_id(shape_id)) {
+                obj_id = object_id_get(obj, shape_id);
+            }
+            break;
+          }
+          default:
+            // For generic_fields, the T_IMEMO/fields is responsible for freeing the id.
+            return;
+        }
 
-    if (gc_object_moved_p(objspace, (VALUE)*value)) {
-        *value = rb_gc_location((VALUE)*value);
-    }
+        if (RB_UNLIKELY(obj_id)) {
+            RUBY_ASSERT(FIXNUM_P(obj_id) || RB_TYPE_P(obj_id, T_BIGNUM));
 
-    return ID_TABLE_CONTINUE;
+            if (!st_delete(id2ref_tbl, (st_data_t *)&obj_id, NULL)) {
+                // If we're currently building the table then it's not a bug.
+                // The the object is a T_IMEMO/fields, then it's possible the actual object
+                // has been garbage collected already.
+                if (id2ref_tbl_built && !RB_TYPE_P(obj, T_IMEMO)) {
+                    rb_bug("Object ID seen, but not in _id2ref table: object_id=%llu object=%s", NUM2ULL(obj_id), rb_obj_info(obj));
+                }
+            }
+        }
+    }
 }
 
-static void
-update_m_tbl(rb_objspace_t *objspace, struct rb_id_table *tbl)
+void
+rb_gc_obj_free_vm_weak_references(VALUE obj)
 {
-    if (tbl) {
-        rb_id_table_foreach_values_with_replace(tbl, check_id_table_move, update_id_table, objspace);
+    obj_free_object_id(obj);
+
+    if (rb_obj_exivar_p(obj)) {
+        rb_free_generic_ivar(obj);
     }
-}
 
-static enum rb_id_table_iterator_result
-update_cc_tbl_i(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));
+    switch (BUILTIN_TYPE(obj)) {
+      case T_STRING:
+        if (FL_TEST_RAW(obj, RSTRING_FSTR)) {
+            rb_gc_free_fstring(obj);
+        }
+        break;
+      case T_SYMBOL:
+        rb_gc_free_dsymbol(obj);
+        break;
+      case T_IMEMO:
+        switch (imemo_type(obj)) {
+          case imemo_callcache: {
+            const struct rb_callcache *cc = (const struct rb_callcache *)obj;
+
+            if (vm_cc_refinement_p(cc)) {
+                rb_vm_delete_cc_refinement(cc);
+            }
 
-    if (gc_object_moved_p(objspace, (VALUE)ccs->cme)) {
-        ccs->cme = (const rb_callable_method_entry_t *)rb_gc_location((VALUE)ccs->cme);
+            break;
+          }
+          case imemo_callinfo:
+            rb_vm_ci_free((const struct rb_callinfo *)obj);
+            break;
+          case imemo_ment:
+            rb_free_method_entry_vm_weak_references((const rb_method_entry_t *)obj);
+            break;
+          default:
+            break;
+        }
+        break;
+      default:
+        break;
     }
+}
+
+/*
+ *  call-seq:
+ *     ObjectSpace._id2ref(object_id) -> an_object
+ *
+ *  Converts an object id to a reference to the object. May not be
+ *  called on an object id passed as a parameter to a finalizer.
+ *
+ *     s = "I am a string"                    #=> "I am a string"
+ *     r = ObjectSpace._id2ref(s.object_id)   #=> "I am a string"
+ *     r == s                                 #=> true
+ *
+ *  On multi-ractor mode, if the object is not shareable, it raises
+ *  RangeError.
+ *
+ *  This method is deprecated and should no longer be used.
+ */
+
+static VALUE
+id2ref(VALUE objid)
+{
+#if SIZEOF_LONG == SIZEOF_VOIDP
+#define NUM2PTR(x) NUM2ULONG(x)
+#elif SIZEOF_LONG_LONG == SIZEOF_VOIDP
+#define NUM2PTR(x) NUM2ULL(x)
+#endif
+    objid = rb_to_int(objid);
+    if (FIXNUM_P(objid) || rb_big_size(objid) <= SIZEOF_VOIDP) {
+        VALUE ptr = NUM2PTR(objid);
+        if (SPECIAL_CONST_P(ptr)) {
+            if (ptr == Qtrue) return Qtrue;
+            if (ptr == Qfalse) return Qfalse;
+            if (NIL_P(ptr)) return Qnil;
+            if (FIXNUM_P(ptr)) return ptr;
+            if (FLONUM_P(ptr)) return ptr;
+
+            if (SYMBOL_P(ptr)) {
+                // Check that the symbol is valid
+                if (rb_static_id_valid_p(SYM2ID(ptr))) {
+                    return ptr;
+                }
+                else {
+                    rb_raise(rb_eRangeError, "%p is not a symbol id value", (void *)ptr);
+                }
+            }
 
-    for (int i=0; i<ccs->len; 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);
+            rb_raise(rb_eRangeError, "%+"PRIsVALUE" is not an id value", rb_int2str(objid, 10));
         }
     }
 
-    // do not replace
-    return ID_TABLE_CONTINUE;
+    VALUE obj = object_id_to_ref(rb_gc_get_objspace(), objid);
+    if (!rb_multi_ractor_p() || rb_ractor_shareable_p(obj)) {
+        return obj;
+    }
+    else {
+        rb_raise(rb_eRangeError, "%+"PRIsVALUE" is the id of an unshareable object on multi-ractor", rb_int2str(objid, 10));
+    }
 }
 
-static void
-update_cc_tbl(rb_objspace_t *objspace, VALUE klass)
+/* :nodoc: */
+static VALUE
+os_id2ref(VALUE os, VALUE objid)
 {
-    struct rb_id_table *tbl = RCLASS_CC_TBL(klass);
-    if (tbl) {
-        rb_id_table_foreach_values(tbl, update_cc_tbl_i, objspace);
-    }
+    rb_category_warn(RB_WARN_CATEGORY_DEPRECATED, "ObjectSpace._id2ref is deprecated");
+    return id2ref(objid);
 }
 
-static enum rb_id_table_iterator_result
-update_cvc_tbl_i(VALUE cvc_entry, void *data)
+static VALUE
+rb_find_object_id(void *objspace, VALUE obj, VALUE (*get_heap_object_id)(VALUE))
 {
-    struct rb_cvar_class_tbl_entry *entry;
-    rb_objspace_t * objspace = (rb_objspace_t *)data;
-
-    entry = (struct rb_cvar_class_tbl_entry *)cvc_entry;
-
-    if (entry->cref) {
-        TYPED_UPDATE_IF_MOVED(objspace, rb_cref_t *, entry->cref);
+    if (SPECIAL_CONST_P(obj)) {
+#if SIZEOF_LONG == SIZEOF_VOIDP
+        return LONG2NUM((SIGNED_VALUE)obj);
+#else
+        return LL2NUM((SIGNED_VALUE)obj);
+#endif
     }
 
-    entry->class_value = rb_gc_location(entry->class_value);
-
-    return ID_TABLE_CONTINUE;
+    return get_heap_object_id(obj);
 }
 
-static void
-update_cvc_tbl(rb_objspace_t *objspace, VALUE klass)
+static VALUE
+nonspecial_obj_id(VALUE obj)
 {
-    struct rb_id_table *tbl = RCLASS_CVC_TBL(klass);
-    if (tbl) {
-        rb_id_table_foreach_values(tbl, update_cvc_tbl_i, objspace);
-    }
+#if SIZEOF_LONG == SIZEOF_VOIDP
+    return (VALUE)((SIGNED_VALUE)(obj)|FIXNUM_FLAG);
+#elif SIZEOF_LONG_LONG == SIZEOF_VOIDP
+    return LL2NUM((SIGNED_VALUE)(obj) / 2);
+#else
+# error not supported
+#endif
 }
 
-static enum rb_id_table_iterator_result
-mark_cvc_tbl_i(VALUE cvc_entry, void *data)
+VALUE
+rb_memory_id(VALUE obj)
 {
-    rb_objspace_t *objspace = (rb_objspace_t *)data;
-    struct rb_cvar_class_tbl_entry *entry;
-
-    entry = (struct rb_cvar_class_tbl_entry *)cvc_entry;
+    return rb_find_object_id(NULL, obj, nonspecial_obj_id);
+}
 
-    RUBY_ASSERT(entry->cref == 0 || (BUILTIN_TYPE((VALUE)entry->cref) == T_IMEMO && IMEMO_TYPE_P(entry->cref, imemo_cref)));
-    gc_mark(objspace, (VALUE) entry->cref);
+/*
+ *  Document-method: __id__
+ *  Document-method: object_id
+ *
+ *  call-seq:
+ *     obj.__id__       -> integer
+ *     obj.object_id    -> integer
+ *
+ *  Returns an integer identifier for +obj+.
+ *
+ *  The same number will be returned on all calls to +object_id+ for a given
+ *  object, and no two active objects will share an id.
+ *
+ *  Note: that some objects of builtin classes are reused for optimization.
+ *  This is the case for immediate values and frozen string literals.
+ *
+ *  BasicObject implements +__id__+, Kernel implements +object_id+.
+ *
+ *  Immediate values are not passed by reference but are passed by value:
+ *  +nil+, +true+, +false+, Fixnums, Symbols, and some Floats.
+ *
+ *      Object.new.object_id  == Object.new.object_id  # => false
+ *      (21 * 2).object_id    == (21 * 2).object_id    # => true
+ *      "hello".object_id     == "hello".object_id     # => false
+ *      "hi".freeze.object_id == "hi".freeze.object_id # => true
+ */
 
-    return ID_TABLE_CONTINUE;
+VALUE
+rb_obj_id(VALUE obj)
+{
+    /* If obj is an immediate, the object ID is obj directly converted to a Numeric.
+     * Otherwise, the object ID is a Numeric that is a non-zero multiple of
+     * (RUBY_IMMEDIATE_MASK + 1) which guarantees that it does not collide with
+     * any immediates. */
+    return rb_find_object_id(rb_gc_get_objspace(), obj, object_id);
 }
 
-static void
-mark_cvc_tbl(rb_objspace_t *objspace, VALUE klass)
+bool
+rb_obj_id_p(VALUE obj)
 {
-    struct rb_id_table *tbl = RCLASS_CVC_TBL(klass);
-    if (tbl) {
-        rb_id_table_foreach_values(tbl, mark_cvc_tbl_i, objspace);
-    }
+    return !RB_TYPE_P(obj, T_IMEMO) && rb_shape_obj_has_id(obj);
 }
 
-static enum rb_id_table_iterator_result
-update_const_table(VALUE value, void *data)
+/*
+ * GC implementations should call this function before the GC phase that updates references
+ * embedded in the machine code generated by JIT compilers.  JIT compilers usually enforce the
+ * "W^X" policy and protect the code memory from being modified during execution.  This function
+ * makes the code memory writeable.
+ */
+void
+rb_gc_before_updating_jit_code(void)
 {
-    rb_const_entry_t *ce = (rb_const_entry_t *)value;
-    rb_objspace_t * objspace = (rb_objspace_t *)data;
-
-    if (gc_object_moved_p(objspace, ce->value)) {
-        ce->value = rb_gc_location(ce->value);
-    }
-
-    if (gc_object_moved_p(objspace, ce->file)) {
-        ce->file = rb_gc_location(ce->file);
-    }
-
-    return ID_TABLE_CONTINUE;
+#if USE_YJIT
+    rb_yjit_mark_all_writeable();
+#endif
 }
 
-static void
-update_const_tbl(rb_objspace_t *objspace, struct rb_id_table *tbl)
+/*
+ * GC implementations should call this function before the GC phase that updates references
+ * embedded in the machine code generated by JIT compilers.  This function makes the code memory
+ * executable again.
+ */
+void
+rb_gc_after_updating_jit_code(void)
 {
-    if (!tbl) return;
-    rb_id_table_foreach_values(tbl, update_const_table, objspace);
+#if USE_YJIT
+    rb_yjit_mark_all_executable();
+#endif
 }
 
-static void
-update_subclass_entries(rb_objspace_t *objspace, rb_subclass_entry_t *entry)
+static enum rb_id_table_iterator_result
+cc_table_memsize_i(VALUE ccs_ptr, void *data_ptr)
 {
-    while (entry) {
-        UPDATE_IF_MOVED(objspace, entry->klass);
-        entry = entry->next;
-    }
+    size_t *total_size = data_ptr;
+    struct rb_class_cc_entries *ccs = (struct rb_class_cc_entries *)ccs_ptr;
+    *total_size += sizeof(*ccs);
+    *total_size += sizeof(ccs->entries[0]) * ccs->capa;
+    return ID_TABLE_CONTINUE;
 }
 
-static void
-update_class_ext(rb_objspace_t *objspace, rb_classext_t *ext)
+static size_t
+cc_table_memsize(struct rb_id_table *cc_table)
 {
-    UPDATE_IF_MOVED(objspace, ext->origin_);
-    UPDATE_IF_MOVED(objspace, ext->includer);
-    UPDATE_IF_MOVED(objspace, ext->refined_class);
-    update_subclass_entries(objspace, ext->subclasses);
+    size_t total = rb_id_table_memsize(cc_table);
+    rb_id_table_foreach_values(cc_table, cc_table_memsize_i, &total);
+    return total;
 }
 
 static void
-update_superclasses(rb_objspace_t *objspace, VALUE obj)
+classext_memsize(rb_classext_t *ext, bool prime, VALUE namespace, void *arg)
 {
-    if (FL_TEST_RAW(obj, RCLASS_SUPERCLASSES_INCLUDE_SELF)) {
-        for (size_t i = 0; i < RCLASS_SUPERCLASS_DEPTH(obj) + 1; i++) {
-            UPDATE_IF_MOVED(objspace, RCLASS_SUPERCLASSES(obj)[i]);
-        }
+    size_t *size = (size_t *)arg;
+    size_t s = 0;
+
+    if (RCLASSEXT_M_TBL(ext)) {
+        s += rb_id_table_memsize(RCLASSEXT_M_TBL(ext));
+    }
+    if (RCLASSEXT_CVC_TBL(ext)) {
+        s += rb_id_table_memsize(RCLASSEXT_CVC_TBL(ext));
+    }
+    if (RCLASSEXT_CONST_TBL(ext)) {
+        s += rb_id_table_memsize(RCLASSEXT_CONST_TBL(ext));
     }
+    if (RCLASSEXT_CC_TBL(ext)) {
+        s += cc_table_memsize(RCLASSEXT_CC_TBL(ext));
+    }
+    if (RCLASSEXT_SUPERCLASSES_WITH_SELF(ext)) {
+        s += (RCLASSEXT_SUPERCLASS_DEPTH(ext) + 1) * sizeof(VALUE);
+    }
+    if (!prime) {
+        s += sizeof(rb_classext_t);
+    }
+    *size += s;
 }
 
 static void
-gc_update_object_references(rb_objspace_t *objspace, VALUE obj)
+classext_superclasses_memsize(rb_classext_t *ext, bool prime, VALUE namespace, void *arg)
 {
-    RVALUE *any = RANY(obj);
+    size_t *size = (size_t *)arg;
+    size_t array_size;
+    if (RCLASSEXT_SUPERCLASSES_WITH_SELF(ext)) {
+        RUBY_ASSERT(prime);
+        array_size = RCLASSEXT_SUPERCLASS_DEPTH(ext) + 1;
+        *size += array_size * sizeof(VALUE);
+    }
+}
 
-    gc_report(4, objspace, "update-refs: %p ->\n", (void *)obj);
+size_t
+rb_obj_memsize_of(VALUE obj)
+{
+    size_t size = 0;
 
-    if (FL_TEST(obj, FL_EXIVAR)) {
-        rb_mark_and_update_generic_ivar(obj);
+    if (SPECIAL_CONST_P(obj)) {
+        return 0;
     }
 
     switch (BUILTIN_TYPE(obj)) {
-      case T_CLASS:
-        if (FL_TEST(obj, FL_SINGLETON)) {
-            UPDATE_IF_MOVED(objspace, RCLASS_ATTACHED_OBJECT(obj));
-        }
-        // Continue to the shared T_CLASS/T_MODULE
-      case T_MODULE:
-        if (RCLASS_SUPER((VALUE)obj)) {
-            UPDATE_IF_MOVED(objspace, RCLASS(obj)->super);
+      case T_OBJECT:
+        if (rb_shape_obj_too_complex_p(obj)) {
+            size += rb_st_memsize(ROBJECT_FIELDS_HASH(obj));
         }
-        if (!RCLASS_EXT(obj)) break;
-        update_m_tbl(objspace, RCLASS_M_TBL(obj));
-        update_cc_tbl(objspace, obj);
-        update_cvc_tbl(objspace, obj);
-        update_superclasses(objspace, obj);
-
-        for (attr_index_t i = 0; i < RCLASS_IV_COUNT(obj); i++) {
-            UPDATE_IF_MOVED(objspace, RCLASS_IVPTR(obj)[i]);
+        else if (!(RBASIC(obj)->flags & ROBJECT_EMBED)) {
+            size += ROBJECT_FIELDS_CAPACITY(obj) * sizeof(VALUE);
         }
-
-        update_class_ext(objspace, RCLASS_EXT(obj));
-        update_const_tbl(objspace, RCLASS_CONST_TBL(obj));
-
-        UPDATE_IF_MOVED(objspace, RCLASS_EXT(obj)->classpath);
         break;
-
+      case T_MODULE:
+      case T_CLASS:
+        rb_class_classext_foreach(obj, classext_memsize, (void *)&size);
+        rb_class_classext_foreach(obj, classext_superclasses_memsize, (void *)&size);
+        break;
       case T_ICLASS:
-        if (FL_TEST(obj, RICLASS_IS_ORIGIN) &&
-                !FL_TEST(obj, RICLASS_ORIGIN_SHARED_MTBL)) {
-            update_m_tbl(objspace, RCLASS_M_TBL(obj));
+        if (RICLASS_OWNS_M_TBL_P(obj)) {
+            if (RCLASS_M_TBL(obj)) {
+                size += rb_id_table_memsize(RCLASS_M_TBL(obj));
+            }
         }
-        if (RCLASS_SUPER((VALUE)obj)) {
-            UPDATE_IF_MOVED(objspace, RCLASS(obj)->super);
+        if (RCLASS_WRITABLE_CC_TBL(obj)) {
+            size += cc_table_memsize(RCLASS_WRITABLE_CC_TBL(obj));
         }
-        if (!RCLASS_EXT(obj)) break;
-        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:
-        gc_ref_update_imemo(objspace, obj);
-        return;
-
-      case T_NIL:
-      case T_FIXNUM:
-      case T_NODE:
-      case T_MOVED:
-      case T_NONE:
-        /* These can't move */
-        return;
-
+      case T_STRING:
+        size += rb_str_memsize(obj);
+        break;
       case T_ARRAY:
-        gc_ref_update_array(objspace, obj);
+        size += rb_ary_memsize(obj);
         break;
-
       case T_HASH:
-        gc_ref_update_hash(objspace, obj);
-        UPDATE_IF_MOVED(objspace, any->as.hash.ifnone);
+        if (RHASH_ST_TABLE_P(obj)) {
+            VM_ASSERT(RHASH_ST_TABLE(obj) != NULL);
+            /* st_table is in the slot */
+            size += st_memsize(RHASH_ST_TABLE(obj)) - sizeof(st_table);
+        }
         break;
-
-      case T_STRING:
-        {
-            if (STR_SHARED_P(obj)) {
-                VALUE old_root = any->as.string.as.heap.aux.shared;
-                UPDATE_IF_MOVED(objspace, any->as.string.as.heap.aux.shared);
-                VALUE new_root = any->as.string.as.heap.aux.shared;
-                rb_str_update_shared_ary(obj, old_root, new_root);
-            }
-
-            /* If, after move the string is not embedded, and can fit in the
-             * slot it's been placed in, then re-embed it. */
-            if (rb_gc_obj_slot_size(obj) >= rb_str_size_as_embedded(obj)) {
-                if (!STR_EMBED_P(obj) && rb_str_reembeddable_p(obj)) {
-                    rb_str_make_embedded(obj);
-                }
-            }
-
-            break;
+      case T_REGEXP:
+        if (RREGEXP_PTR(obj)) {
+            size += onig_memsize(RREGEXP_PTR(obj));
         }
+        break;
       case T_DATA:
-        /* Call the compaction callback, if it exists */
+        size += rb_objspace_data_type_memsize(obj);
+        break;
+      case T_MATCH:
         {
-            void *const ptr = DATA_PTR(obj);
-            if (ptr) {
-                if (RTYPEDDATA_P(obj) && gc_declarative_marking_p(any->as.typeddata.type)) {
-                    gc_ref_update_from_offset(objspace, obj);
-                }
-                else if (RTYPEDDATA_P(obj)) {
-                    RUBY_DATA_FUNC compact_func = any->as.typeddata.type->function.dcompact;
-                    if (compact_func) (*compact_func)(ptr);
-                }
-            }
+            rb_matchext_t *rm = RMATCH_EXT(obj);
+            size += onig_region_memsize(&rm->regs);
+            size += sizeof(struct rmatch_offset) * rm->char_offset_num_allocated;
         }
         break;
-
-      case T_OBJECT:
-        gc_ref_update_object(objspace, obj);
-        break;
-
       case T_FILE:
-        if (any->as.file.fptr) {
-            UPDATE_IF_MOVED(objspace, any->as.file.fptr->self);
-            UPDATE_IF_MOVED(objspace, any->as.file.fptr->pathv);
-            UPDATE_IF_MOVED(objspace, any->as.file.fptr->tied_io_for_writing);
-            UPDATE_IF_MOVED(objspace, any->as.file.fptr->writeconv_asciicompat);
-            UPDATE_IF_MOVED(objspace, any->as.file.fptr->writeconv_pre_ecopts);
-            UPDATE_IF_MOVED(objspace, any->as.file.fptr->encs.ecopts);
-            UPDATE_IF_MOVED(objspace, any->as.file.fptr->write_lock);
+        if (RFILE(obj)->fptr) {
+            size += rb_io_memsize(RFILE(obj)->fptr);
         }
         break;
-      case T_REGEXP:
-        UPDATE_IF_MOVED(objspace, any->as.regexp.src);
+      case T_RATIONAL:
+      case T_COMPLEX:
         break;
-
-      case T_SYMBOL:
-        if (DYNAMIC_SYM_P((VALUE)any)) {
-            UPDATE_IF_MOVED(objspace, RSYMBOL(any)->fstr);
-        }
+      case T_IMEMO:
+        size += rb_imemo_memsize(obj);
         break;
 
       case T_FLOAT:
-      case T_BIGNUM:
+      case T_SYMBOL:
         break;
 
-      case T_MATCH:
-        UPDATE_IF_MOVED(objspace, any->as.match.regexp);
-
-        if (any->as.match.str) {
-            UPDATE_IF_MOVED(objspace, any->as.match.str);
+      case T_BIGNUM:
+        if (!(RBASIC(obj)->flags & BIGNUM_EMBED_FLAG) && BIGNUM_DIGITS(obj)) {
+            size += BIGNUM_LEN(obj) * sizeof(BDIGIT);
         }
         break;
 
-      case T_RATIONAL:
-        UPDATE_IF_MOVED(objspace, any->as.rational.num);
-        UPDATE_IF_MOVED(objspace, any->as.rational.den);
-        break;
-
-      case T_COMPLEX:
-        UPDATE_IF_MOVED(objspace, any->as.complex.real);
-        UPDATE_IF_MOVED(objspace, any->as.complex.imag);
-
+      case T_NODE:
+        UNEXPECTED_NODE(obj_memsize_of);
         break;
 
       case T_STRUCT:
-        {
-            long i, len = RSTRUCT_LEN(obj);
-            VALUE *ptr = (VALUE *)RSTRUCT_CONST_PTR(obj);
-
-            for (i = 0; i < len; i++) {
-                UPDATE_IF_MOVED(objspace, ptr[i]);
-            }
+        if ((RBASIC(obj)->flags & RSTRUCT_EMBED_LEN_MASK) == 0 &&
+            RSTRUCT(obj)->as.heap.ptr) {
+            size += sizeof(VALUE) * RSTRUCT_LEN(obj);
         }
         break;
-      default:
-#if GC_DEBUG
-        rb_gcdebug_print_obj_condition((VALUE)obj);
-        rb_obj_info_dump(obj);
-        rb_bug("unreachable");
-#endif
+
+      case T_ZOMBIE:
+      case T_MOVED:
         break;
 
+      default:
+        rb_bug("objspace/memsize_of(): unknown data type 0x%x(%p)",
+               BUILTIN_TYPE(obj), (void*)obj);
     }
 
-    UPDATE_IF_MOVED(objspace, RBASIC(obj)->klass);
-
-    gc_report(4, objspace, "update-refs: %p <-\n", (void *)obj);
+    return size + rb_gc_obj_slot_size(obj);
 }
 
 static int
-gc_ref_update(void *vstart, void *vend, size_t stride, rb_objspace_t * objspace, struct heap_page *page)
+set_zero(st_data_t key, st_data_t val, st_data_t arg)
 {
-    VALUE v = (VALUE)vstart;
-    asan_unlock_freelist(page);
-    asan_lock_freelist(page);
-    page->flags.has_uncollectible_wb_unprotected_objects = FALSE;
-    page->flags.has_remembered_objects = FALSE;
-
-    /* For each object on the page */
-    for (; v != (VALUE)vend; v += stride) {
-        void *poisoned = asan_unpoison_object_temporary(v);
-
-        switch (BUILTIN_TYPE(v)) {
-          case T_NONE:
-          case T_MOVED:
-          case T_ZOMBIE:
-            break;
-          default:
-            if (RVALUE_WB_UNPROTECTED(v)) {
-                page->flags.has_uncollectible_wb_unprotected_objects = TRUE;
-            }
-            if (RVALUE_REMEMBERED(v)) {
-                page->flags.has_remembered_objects = TRUE;
-            }
-            if (page->flags.before_sweep) {
-                if (RVALUE_MARKED(v)) {
-                    gc_update_object_references(objspace, v);
-                }
-            }
-            else {
-                gc_update_object_references(objspace, v);
-            }
-        }
-
-        if (poisoned) {
-            asan_poison_object(v);
-        }
-    }
-
-    return 0;
+    VALUE k = (VALUE)key;
+    VALUE hash = (VALUE)arg;
+    rb_hash_aset(hash, k, INT2FIX(0));
+    return ST_CONTINUE;
 }
 
-extern rb_symbols_t ruby_global_symbols;
-#define global_symbols ruby_global_symbols
+struct count_objects_data {
+    size_t counts[T_MASK+1];
+    size_t freed;
+    size_t total;
+};
 
 static void
-gc_update_references(rb_objspace_t *objspace)
+count_objects_i(VALUE obj, void *d)
 {
-    objspace->flags.during_reference_updating = true;
-
-    rb_execution_context_t *ec = GET_EC();
-    rb_vm_t *vm = rb_ec_vm_ptr(ec);
-
-    struct heap_page *page = NULL;
-
-    for (int i = 0; i < SIZE_POOL_COUNT; i++) {
-        bool should_set_mark_bits = TRUE;
-        rb_size_pool_t *size_pool = &size_pools[i];
-        rb_heap_t *heap = SIZE_POOL_EDEN_HEAP(size_pool);
+    struct count_objects_data *data = (struct count_objects_data *)d;
 
-        ccan_list_for_each(&heap->pages, page, page_node) {
-            uintptr_t start = (uintptr_t)page->start;
-            uintptr_t end = start + (page->total_slots * size_pool->slot_size);
-
-            gc_ref_update((void *)start, (void *)end, size_pool->slot_size, objspace, page);
-            if (page == heap->sweeping_page) {
-                should_set_mark_bits = FALSE;
-            }
-            if (should_set_mark_bits) {
-                gc_setup_mark_bits(page);
-            }
-        }
+    if (RBASIC(obj)->flags) {
+        data->counts[BUILTIN_TYPE(obj)]++;
+    }
+    else {
+        data->freed++;
     }
-    rb_vm_update_references(vm);
-    rb_gc_update_global_tbl();
-    global_symbols.ids = rb_gc_location(global_symbols.ids);
-    global_symbols.dsymbol_fstr_hash = rb_gc_location(global_symbols.dsymbol_fstr_hash);
-    gc_update_tbl_refs(objspace, objspace->obj_to_id_tbl);
-    gc_update_table_refs(objspace, objspace->id_to_obj_tbl);
-    gc_update_table_refs(objspace, global_symbols.str_sym);
-    gc_update_table_refs(objspace, finalizer_table);
 
-    objspace->flags.during_reference_updating = false;
+    data->total++;
 }
 
-#if GC_CAN_COMPILE_COMPACTION
 /*
  *  call-seq:
- *     GC.latest_compact_info -> hash
+ *     ObjectSpace.count_objects([result_hash]) -> hash
+ *
+ *  Counts all objects grouped by type.
+ *
+ *  It returns a hash, such as:
+ *	{
+ *	  :TOTAL=>10000,
+ *	  :FREE=>3011,
+ *	  :T_OBJECT=>6,
+ *	  :T_CLASS=>404,
+ *	  # ...
+ *	}
+ *
+ *  The contents of the returned hash are implementation specific.
+ *  It may be changed in future.
+ *
+ *  The keys starting with +:T_+ means live objects.
+ *  For example, +:T_ARRAY+ is the number of arrays.
+ *  +:FREE+ means object slots which is not used now.
+ *  +:TOTAL+ means sum of above.
+ *
+ *  If the optional argument +result_hash+ is given,
+ *  it is overwritten and returned. This is intended to avoid probe effect.
+ *
+ *    h = {}
+ *    ObjectSpace.count_objects(h)
+ *    puts h
+ *    # => { :TOTAL=>10000, :T_CLASS=>158280, :T_MODULE=>20672, :T_STRING=>527249 }
  *
- * Returns information about object moved in the most recent \GC compaction.
+ *  This method is only expected to work on C Ruby.
  *
- * The returned hash has two keys :considered and :moved.  The hash for
- * :considered lists the number of objects that were considered for movement
- * by the compactor, and the :moved hash lists the number of objects that
- * were actually moved.  Some objects can't be moved (maybe they were pinned)
- * so these numbers can be used to calculate compaction efficiency.
  */
+
 static VALUE
-gc_compact_stats(VALUE self)
-{
-    size_t i;
-    rb_objspace_t *objspace = &rb_objspace;
-    VALUE h = rb_hash_new();
-    VALUE considered = rb_hash_new();
-    VALUE moved = rb_hash_new();
-    VALUE moved_up = rb_hash_new();
-    VALUE moved_down = rb_hash_new();
-
-    for (i=0; i<T_MASK; i++) {
-        if (objspace->rcompactor.considered_count_table[i]) {
-            rb_hash_aset(considered, type_sym(i), SIZET2NUM(objspace->rcompactor.considered_count_table[i]));
-        }
+count_objects(int argc, VALUE *argv, VALUE os)
+{
+    struct count_objects_data data = { 0 };
+    VALUE hash = Qnil;
 
-        if (objspace->rcompactor.moved_count_table[i]) {
-            rb_hash_aset(moved, type_sym(i), SIZET2NUM(objspace->rcompactor.moved_count_table[i]));
-        }
+    if (rb_check_arity(argc, 0, 1) == 1) {
+        hash = argv[0];
+        if (!RB_TYPE_P(hash, T_HASH))
+            rb_raise(rb_eTypeError, "non-hash given");
+    }
 
-        if (objspace->rcompactor.moved_up_count_table[i]) {
-            rb_hash_aset(moved_up, type_sym(i), SIZET2NUM(objspace->rcompactor.moved_up_count_table[i]));
-        }
+    rb_gc_impl_each_object(rb_gc_get_objspace(), count_objects_i, &data);
 
-        if (objspace->rcompactor.moved_down_count_table[i]) {
-            rb_hash_aset(moved_down, type_sym(i), SIZET2NUM(objspace->rcompactor.moved_down_count_table[i]));
-        }
+    if (NIL_P(hash)) {
+        hash = rb_hash_new();
     }
+    else if (!RHASH_EMPTY_P(hash)) {
+        rb_hash_stlike_foreach(hash, set_zero, hash);
+    }
+    rb_hash_aset(hash, ID2SYM(rb_intern("TOTAL")), SIZET2NUM(data.total));
+    rb_hash_aset(hash, ID2SYM(rb_intern("FREE")), SIZET2NUM(data.freed));
 
-    rb_hash_aset(h, ID2SYM(rb_intern("considered")), considered);
-    rb_hash_aset(h, ID2SYM(rb_intern("moved")), moved);
-    rb_hash_aset(h, ID2SYM(rb_intern("moved_up")), moved_up);
-    rb_hash_aset(h, ID2SYM(rb_intern("moved_down")), moved_down);
+    for (size_t i = 0; i <= T_MASK; i++) {
+        VALUE type = type_sym(i);
+        if (data.counts[i])
+            rb_hash_aset(hash, type, SIZET2NUM(data.counts[i]));
+    }
 
-    return h;
+    return hash;
 }
+
+#define SET_STACK_END SET_MACHINE_STACK_END(&ec->machine.stack_end)
+
+#define STACK_START (ec->machine.stack_start)
+#define STACK_END (ec->machine.stack_end)
+#define STACK_LEVEL_MAX (ec->machine.stack_maxsize/sizeof(VALUE))
+
+#if STACK_GROW_DIRECTION < 0
+# define STACK_LENGTH  (size_t)(STACK_START - STACK_END)
+#elif STACK_GROW_DIRECTION > 0
+# define STACK_LENGTH  (size_t)(STACK_END - STACK_START + 1)
 #else
-#  define gc_compact_stats rb_f_notimplement
+# define STACK_LENGTH  ((STACK_END < STACK_START) ? (size_t)(STACK_START - STACK_END) \
+                        : (size_t)(STACK_END - STACK_START + 1))
 #endif
-
-#if GC_CAN_COMPILE_COMPACTION
-static void
-root_obj_check_moved_i(const char *category, VALUE obj, void *data)
+#if !STACK_GROW_DIRECTION
+int ruby_stack_grow_direction;
+int
+ruby_get_stack_grow_direction(volatile VALUE *addr)
 {
-    if (gc_object_moved_p(&rb_objspace, obj)) {
-        rb_bug("ROOT %s points to MOVED: %p -> %s", category, (void *)obj, obj_info(rb_gc_location(obj)));
-    }
+    VALUE *end;
+    SET_MACHINE_STACK_END(&end);
+
+    if (end > addr) return ruby_stack_grow_direction = 1;
+    return ruby_stack_grow_direction = -1;
 }
+#endif
 
-static void
-reachable_object_check_moved_i(VALUE ref, void *data)
+size_t
+ruby_stack_length(VALUE **p)
 {
-    VALUE parent = (VALUE)data;
-    if (gc_object_moved_p(&rb_objspace, ref)) {
-        rb_bug("Object %s points to MOVED: %p -> %s", obj_info(parent), (void *)ref, obj_info(rb_gc_location(ref)));
-    }
+    rb_execution_context_t *ec = GET_EC();
+    SET_STACK_END;
+    if (p) *p = STACK_UPPER(STACK_END, STACK_START, STACK_END);
+    return STACK_LENGTH;
 }
 
+#define PREVENT_STACK_OVERFLOW 1
+#ifndef PREVENT_STACK_OVERFLOW
+#if !(defined(POSIX_SIGNAL) && defined(SIGSEGV) && defined(HAVE_SIGALTSTACK))
+# define PREVENT_STACK_OVERFLOW 1
+#else
+# define PREVENT_STACK_OVERFLOW 0
+#endif
+#endif
+#if PREVENT_STACK_OVERFLOW && !defined(__EMSCRIPTEN__)
 static int
-heap_check_moved_i(void *vstart, void *vend, size_t stride, void *data)
+stack_check(rb_execution_context_t *ec, int water_mark)
 {
-    VALUE v = (VALUE)vstart;
-    for (; v != (VALUE)vend; v += stride) {
-        if (gc_object_moved_p(&rb_objspace, v)) {
-            /* Moved object still on the heap, something may have a reference. */
-        }
-        else {
-            void *poisoned = asan_unpoison_object_temporary(v);
+    SET_STACK_END;
 
-            switch (BUILTIN_TYPE(v)) {
-              case T_NONE:
-              case T_ZOMBIE:
-                break;
-              default:
-                if (!rb_objspace_garbage_object_p(v)) {
-                    rb_objspace_reachable_objects_from(v, reachable_object_check_moved_i, (void *)v);
-                }
-            }
+    size_t length = STACK_LENGTH;
+    size_t maximum_length = STACK_LEVEL_MAX - water_mark;
 
-            if (poisoned) {
-                GC_ASSERT(BUILTIN_TYPE(v) == T_NONE);
-                asan_poison_object(v);
-            }
-        }
-    }
+    return length > maximum_length;
+}
+#else
+#define stack_check(ec, water_mark) FALSE
+#endif
 
-    return 0;
+#define STACKFRAME_FOR_CALL_CFUNC 2048
+
+int
+rb_ec_stack_check(rb_execution_context_t *ec)
+{
+    return stack_check(ec, STACKFRAME_FOR_CALL_CFUNC);
 }
 
-/*
- *  call-seq:
- *     GC.compact
- *
- * This function compacts objects together in Ruby's heap.  It eliminates
- * unused space (or fragmentation) in the heap by moving objects in to that
- * unused space.  This function returns a hash which contains statistics about
- * which objects were moved.  See <tt>GC.latest_gc_info</tt> for details about
- * compaction statistics.
- *
- * This method is implementation specific and not expected to be implemented
- * in any implementation besides MRI.
- *
- * To test whether \GC compaction is supported, use the idiom:
- *
- *   GC.respond_to?(:compact)
- */
-static VALUE
-gc_compact(VALUE self)
+int
+ruby_stack_check(void)
 {
-    /* Run GC with compaction enabled */
-    gc_start_internal(NULL, self, Qtrue, Qtrue, Qtrue, Qtrue);
+    return stack_check(GET_EC(), STACKFRAME_FOR_CALL_CFUNC);
+}
+
+/* ==================== Marking ==================== */
+
+#define RB_GC_MARK_OR_TRAVERSE(func, obj_or_ptr, obj, check_obj) do { \
+    if (!RB_SPECIAL_CONST_P(obj)) { \
+        rb_vm_t *vm = GET_VM(); \
+        void *objspace = vm->gc.objspace; \
+        if (LIKELY(vm->gc.mark_func_data == NULL)) { \
+            GC_ASSERT(rb_gc_impl_during_gc_p(objspace)); \
+            (func)(objspace, (obj_or_ptr)); \
+        } \
+        else if (check_obj ? \
+                rb_gc_impl_pointer_to_heap_p(objspace, (const void *)obj) && \
+                    !rb_gc_impl_garbage_object_p(objspace, obj) : \
+                true) { \
+            GC_ASSERT(!rb_gc_impl_during_gc_p(objspace)); \
+            struct gc_mark_func_data_struct *mark_func_data = vm->gc.mark_func_data; \
+            vm->gc.mark_func_data = NULL; \
+            mark_func_data->mark_func((obj), mark_func_data->data); \
+            vm->gc.mark_func_data = mark_func_data; \
+        } \
+    } \
+} while (0)
 
-    return gc_compact_stats(self);
+static inline void
+gc_mark_internal(VALUE obj)
+{
+    RB_GC_MARK_OR_TRAVERSE(rb_gc_impl_mark, obj, obj, false);
 }
-#else
-#  define gc_compact rb_f_notimplement
-#endif
 
-#if GC_CAN_COMPILE_COMPACTION
-static VALUE
-gc_verify_compaction_references(rb_execution_context_t *ec, VALUE self, VALUE double_heap, VALUE expand_heap, VALUE toward_empty)
+void
+rb_gc_mark_movable(VALUE obj)
 {
-    rb_objspace_t *objspace = &rb_objspace;
+    gc_mark_internal(obj);
+}
 
-    /* Clear the heap. */
-    gc_start_internal(NULL, self, Qtrue, Qtrue, Qtrue, Qfalse);
+void
+rb_gc_mark_and_move(VALUE *ptr)
+{
+    RB_GC_MARK_OR_TRAVERSE(rb_gc_impl_mark_and_move, ptr, *ptr, false);
+}
 
-    if (RTEST(double_heap)) {
-        rb_warn("double_heap is deprecated, please use expand_heap instead");
-    }
+static inline void
+gc_mark_and_pin_internal(VALUE obj)
+{
+    RB_GC_MARK_OR_TRAVERSE(rb_gc_impl_mark_and_pin, obj, obj, false);
+}
 
-    RB_VM_LOCK_ENTER();
-    {
-        gc_rest(objspace);
+void
+rb_gc_mark(VALUE obj)
+{
+    gc_mark_and_pin_internal(obj);
+}
+
+static inline void
+gc_mark_maybe_internal(VALUE obj)
+{
+    RB_GC_MARK_OR_TRAVERSE(rb_gc_impl_mark_maybe, obj, obj, true);
+}
 
-        /* if both double_heap and expand_heap are set, expand_heap takes precedence */
-        if (RTEST(double_heap) || RTEST(expand_heap)) {
-            for (int i = 0; i < SIZE_POOL_COUNT; i++) {
-                rb_size_pool_t *size_pool = &size_pools[i];
-                rb_heap_t *heap = SIZE_POOL_EDEN_HEAP(size_pool);
+void
+rb_gc_mark_maybe(VALUE obj)
+{
+    gc_mark_maybe_internal(obj);
+}
 
-                size_t minimum_pages = 0;
-                if (RTEST(expand_heap)) {
-                    minimum_pages = minimum_pages_for_size_pool(objspace, size_pool);
-                }
+void
+rb_gc_mark_weak(VALUE *ptr)
+{
+    if (RB_SPECIAL_CONST_P(*ptr)) return;
 
-                heap_add_pages(objspace, size_pool, heap, MAX(minimum_pages, heap->total_pages));
-            }
-        }
+    rb_vm_t *vm = GET_VM();
+    void *objspace = vm->gc.objspace;
+    if (LIKELY(vm->gc.mark_func_data == NULL)) {
+        GC_ASSERT(rb_gc_impl_during_gc_p(objspace));
 
-        if (RTEST(toward_empty)) {
-            gc_sort_heap_by_empty_slots(objspace);
-        }
+        rb_gc_impl_mark_weak(objspace, ptr);
+    }
+    else {
+        GC_ASSERT(!rb_gc_impl_during_gc_p(objspace));
+    }
+}
+
+void
+rb_gc_remove_weak(VALUE parent_obj, VALUE *ptr)
+{
+    rb_gc_impl_remove_weak(rb_gc_get_objspace(), parent_obj, ptr);
+}
+
+ATTRIBUTE_NO_ADDRESS_SAFETY_ANALYSIS(static void each_location(register const VALUE *x, register long n, void (*cb)(VALUE, void *), void *data));
+static void
+each_location(register const VALUE *x, register long n, void (*cb)(VALUE, void *), void *data)
+{
+    VALUE v;
+    while (n--) {
+        v = *x;
+        cb(v, data);
+        x++;
     }
-    RB_VM_LOCK_LEAVE();
+}
 
-    gc_start_internal(NULL, self, Qtrue, Qtrue, Qtrue, Qtrue);
+static void
+each_location_ptr(const VALUE *start, const VALUE *end, void (*cb)(VALUE, void *), void *data)
+{
+    if (end <= start) return;
+    each_location(start, end - start, cb, data);
+}
 
-    objspace_reachable_objects_from_root(objspace, root_obj_check_moved_i, NULL);
-    objspace_each_objects(objspace, heap_check_moved_i, NULL, TRUE);
+static void
+gc_mark_maybe_each_location(VALUE obj, void *data)
+{
+    gc_mark_maybe_internal(obj);
+}
 
-    return gc_compact_stats(self);
+void
+rb_gc_mark_locations(const VALUE *start, const VALUE *end)
+{
+    each_location_ptr(start, end, gc_mark_maybe_each_location, NULL);
 }
-#else
-#  define gc_verify_compaction_references (rb_builtin_arity3_function_type)rb_f_notimplement
-#endif
 
-VALUE
-rb_gc_start(void)
+void
+rb_gc_mark_values(long n, const VALUE *values)
 {
-    rb_gc();
-    return Qnil;
+    for (long i = 0; i < n; i++) {
+        gc_mark_internal(values[i]);
+    }
 }
 
 void
-rb_gc(void)
+rb_gc_mark_vm_stack_values(long n, const VALUE *values)
 {
-    unless_objspace(objspace) { return; }
-    unsigned int reason = GPR_DEFAULT_REASON;
-    garbage_collect(objspace, reason);
+    for (long i = 0; i < n; i++) {
+        gc_mark_and_pin_internal(values[i]);
+    }
 }
 
-int
-rb_during_gc(void)
+static int
+mark_key(st_data_t key, st_data_t value, st_data_t data)
 {
-    unless_objspace(objspace) { return FALSE; }
-    return during_gc;
+    gc_mark_and_pin_internal((VALUE)key);
+
+    return ST_CONTINUE;
 }
 
-#if RGENGC_PROFILE >= 2
+void
+rb_mark_set(st_table *tbl)
+{
+    if (!tbl) return;
 
-static const char *type_name(int type, VALUE obj);
+    st_foreach(tbl, mark_key, (st_data_t)rb_gc_get_objspace());
+}
 
-static void
-gc_count_add_each_types(VALUE hash, const char *name, const size_t *types)
+static int
+mark_keyvalue(st_data_t key, st_data_t value, st_data_t data)
 {
-    VALUE result = rb_hash_new_with_size(T_MASK);
-    int i;
-    for (i=0; i<T_MASK; i++) {
-        const char *type = type_name(i, 0);
-        rb_hash_aset(result, ID2SYM(rb_intern(type)), SIZET2NUM(types[i]));
-    }
-    rb_hash_aset(hash, ID2SYM(rb_intern(name)), result);
+    gc_mark_internal((VALUE)key);
+    gc_mark_internal((VALUE)value);
+
+    return ST_CONTINUE;
 }
-#endif
 
-size_t
-rb_gc_count(void)
+static int
+pin_key_pin_value(st_data_t key, st_data_t value, st_data_t data)
 {
-    return rb_objspace.profile.count;
+    gc_mark_and_pin_internal((VALUE)key);
+    gc_mark_and_pin_internal((VALUE)value);
+
+    return ST_CONTINUE;
 }
 
-static VALUE
-gc_count(rb_execution_context_t *ec, VALUE self)
+static int
+pin_key_mark_value(st_data_t key, st_data_t value, st_data_t data)
 {
-    return SIZET2NUM(rb_gc_count());
+    gc_mark_and_pin_internal((VALUE)key);
+    gc_mark_internal((VALUE)value);
+
+    return ST_CONTINUE;
 }
 
-static VALUE
-gc_info_decode(rb_objspace_t *objspace, const VALUE hash_or_key, const unsigned int orig_flags)
+static void
+mark_hash(VALUE hash)
 {
-    static VALUE sym_major_by = Qnil, sym_gc_by, sym_immediate_sweep, sym_have_finalizer, sym_state, sym_need_major_by;
-    static VALUE sym_nofree, sym_oldgen, sym_shady, sym_force, sym_stress;
-#if RGENGC_ESTIMATE_OLDMALLOC
-    static VALUE sym_oldmalloc;
-#endif
-    static VALUE sym_newobj, sym_malloc, sym_method, sym_capi;
-    static VALUE sym_none, sym_marking, sym_sweeping;
-    static VALUE sym_weak_references_count, sym_retained_weak_references_count;
-    VALUE hash = Qnil, key = Qnil;
-    VALUE major_by, need_major_by;
-    unsigned int flags = orig_flags ? orig_flags : objspace->profile.latest_gc_info;
-
-    if (SYMBOL_P(hash_or_key)) {
-        key = hash_or_key;
-    }
-    else if (RB_TYPE_P(hash_or_key, T_HASH)) {
-        hash = hash_or_key;
+    if (rb_hash_compare_by_id_p(hash)) {
+        rb_hash_stlike_foreach(hash, pin_key_mark_value, 0);
     }
     else {
-        rb_raise(rb_eTypeError, "non-hash or symbol given");
-    }
-
-    if (NIL_P(sym_major_by)) {
-#define S(s) sym_##s = ID2SYM(rb_intern_const(#s))
-        S(major_by);
-        S(gc_by);
-        S(immediate_sweep);
-        S(have_finalizer);
-        S(state);
-        S(need_major_by);
-
-        S(stress);
-        S(nofree);
-        S(oldgen);
-        S(shady);
-        S(force);
-#if RGENGC_ESTIMATE_OLDMALLOC
-        S(oldmalloc);
-#endif
-        S(newobj);
-        S(malloc);
-        S(method);
-        S(capi);
-
-        S(none);
-        S(marking);
-        S(sweeping);
-
-        S(weak_references_count);
-        S(retained_weak_references_count);
-#undef S
-    }
-
-#define SET(name, attr) \
-    if (key == sym_##name) \
-        return (attr); \
-    else if (hash != Qnil) \
-        rb_hash_aset(hash, sym_##name, (attr));
-
-    major_by =
-      (flags & GPR_FLAG_MAJOR_BY_NOFREE) ? sym_nofree :
-      (flags & GPR_FLAG_MAJOR_BY_OLDGEN) ? sym_oldgen :
-      (flags & GPR_FLAG_MAJOR_BY_SHADY)  ? sym_shady :
-      (flags & GPR_FLAG_MAJOR_BY_FORCE)  ? sym_force :
-#if RGENGC_ESTIMATE_OLDMALLOC
-      (flags & GPR_FLAG_MAJOR_BY_OLDMALLOC) ? sym_oldmalloc :
-#endif
-      Qnil;
-    SET(major_by, major_by);
-
-    if (orig_flags == 0) { /* set need_major_by only if flags not set explicitly */
-        unsigned int need_major_flags = objspace->rgengc.need_major_gc;
-        need_major_by =
-            (need_major_flags & GPR_FLAG_MAJOR_BY_NOFREE) ? sym_nofree :
-            (need_major_flags & GPR_FLAG_MAJOR_BY_OLDGEN) ? sym_oldgen :
-            (need_major_flags & GPR_FLAG_MAJOR_BY_SHADY)  ? sym_shady :
-            (need_major_flags & GPR_FLAG_MAJOR_BY_FORCE)  ? sym_force :
-#if RGENGC_ESTIMATE_OLDMALLOC
-            (need_major_flags & GPR_FLAG_MAJOR_BY_OLDMALLOC) ? sym_oldmalloc :
-#endif
-            Qnil;
-        SET(need_major_by, need_major_by);
-    }
-
-    SET(gc_by,
-        (flags & GPR_FLAG_NEWOBJ) ? sym_newobj :
-        (flags & GPR_FLAG_MALLOC) ? sym_malloc :
-        (flags & GPR_FLAG_METHOD) ? sym_method :
-        (flags & GPR_FLAG_CAPI)   ? sym_capi :
-        (flags & GPR_FLAG_STRESS) ? sym_stress :
-        Qnil
-    );
-
-    SET(have_finalizer, RBOOL(flags & GPR_FLAG_HAVE_FINALIZE));
-    SET(immediate_sweep, RBOOL(flags & GPR_FLAG_IMMEDIATE_SWEEP));
-
-    if (orig_flags == 0) {
-        SET(state, gc_mode(objspace) == gc_mode_none ? sym_none :
-                   gc_mode(objspace) == gc_mode_marking ? sym_marking : sym_sweeping);
+        rb_hash_stlike_foreach(hash, mark_keyvalue, 0);
     }
 
-    SET(weak_references_count, LONG2FIX(objspace->profile.weak_references_count));
-    SET(retained_weak_references_count, LONG2FIX(objspace->profile.retained_weak_references_count));
-#undef SET
+    gc_mark_internal(RHASH(hash)->ifnone);
+}
 
-    if (!NIL_P(key)) {/* matched key should return above */
-        rb_raise(rb_eArgError, "unknown key: %"PRIsVALUE, rb_sym2str(key));
-    }
+void
+rb_mark_hash(st_table *tbl)
+{
+    if (!tbl) return;
 
-    return hash;
+    st_foreach(tbl, pin_key_pin_value, 0);
 }
 
-VALUE
-rb_gc_latest_gc_info(VALUE key)
+static enum rb_id_table_iterator_result
+mark_method_entry_i(VALUE me, void *objspace)
 {
-    rb_objspace_t *objspace = &rb_objspace;
-    return gc_info_decode(objspace, key, 0);
+    gc_mark_internal(me);
+
+    return ID_TABLE_CONTINUE;
 }
 
-static VALUE
-gc_latest_gc_info(rb_execution_context_t *ec, VALUE self, VALUE arg)
+static void
+mark_m_tbl(void *objspace, struct rb_id_table *tbl)
 {
-    rb_objspace_t *objspace = &rb_objspace;
-
-    if (NIL_P(arg)) {
-        arg = rb_hash_new();
-    }
-    else if (!SYMBOL_P(arg) && !RB_TYPE_P(arg, T_HASH)) {
-        rb_raise(rb_eTypeError, "non-hash or symbol given");
+    if (tbl) {
+        rb_id_table_foreach_values(tbl, mark_method_entry_i, objspace);
     }
+}
 
-    return gc_info_decode(objspace, arg, 0);
-}
-
-enum gc_stat_sym {
-    gc_stat_sym_count,
-    gc_stat_sym_time,
-    gc_stat_sym_marking_time,
-    gc_stat_sym_sweeping_time,
-    gc_stat_sym_heap_allocated_pages,
-    gc_stat_sym_heap_sorted_length,
-    gc_stat_sym_heap_allocatable_pages,
-    gc_stat_sym_heap_available_slots,
-    gc_stat_sym_heap_live_slots,
-    gc_stat_sym_heap_free_slots,
-    gc_stat_sym_heap_final_slots,
-    gc_stat_sym_heap_marked_slots,
-    gc_stat_sym_heap_eden_pages,
-    gc_stat_sym_heap_tomb_pages,
-    gc_stat_sym_total_allocated_pages,
-    gc_stat_sym_total_freed_pages,
-    gc_stat_sym_total_allocated_objects,
-    gc_stat_sym_total_freed_objects,
-    gc_stat_sym_malloc_increase_bytes,
-    gc_stat_sym_malloc_increase_bytes_limit,
-    gc_stat_sym_minor_gc_count,
-    gc_stat_sym_major_gc_count,
-    gc_stat_sym_compact_count,
-    gc_stat_sym_read_barrier_faults,
-    gc_stat_sym_total_moved_objects,
-    gc_stat_sym_remembered_wb_unprotected_objects,
-    gc_stat_sym_remembered_wb_unprotected_objects_limit,
-    gc_stat_sym_old_objects,
-    gc_stat_sym_old_objects_limit,
-#if RGENGC_ESTIMATE_OLDMALLOC
-    gc_stat_sym_oldmalloc_increase_bytes,
-    gc_stat_sym_oldmalloc_increase_bytes_limit,
-#endif
-    gc_stat_sym_weak_references_count,
-#if RGENGC_PROFILE
-    gc_stat_sym_total_generated_normal_object_count,
-    gc_stat_sym_total_generated_shady_object_count,
-    gc_stat_sym_total_shade_operation_count,
-    gc_stat_sym_total_promoted_count,
-    gc_stat_sym_total_remembered_normal_object_count,
-    gc_stat_sym_total_remembered_shady_object_count,
-#endif
-    gc_stat_sym_last
-};
-
-static VALUE gc_stat_symbols[gc_stat_sym_last];
+static enum rb_id_table_iterator_result
+mark_const_entry_i(VALUE value, void *objspace)
+{
+    const rb_const_entry_t *ce = (const rb_const_entry_t *)value;
 
-static void
-setup_gc_stat_symbols(void)
-{
-    if (gc_stat_symbols[0] == 0) {
-#define S(s) gc_stat_symbols[gc_stat_sym_##s] = ID2SYM(rb_intern_const(#s))
-        S(count);
-        S(time);
-        S(marking_time),
-        S(sweeping_time),
-        S(heap_allocated_pages);
-        S(heap_sorted_length);
-        S(heap_allocatable_pages);
-        S(heap_available_slots);
-        S(heap_live_slots);
-        S(heap_free_slots);
-        S(heap_final_slots);
-        S(heap_marked_slots);
-        S(heap_eden_pages);
-        S(heap_tomb_pages);
-        S(total_allocated_pages);
-        S(total_freed_pages);
-        S(total_allocated_objects);
-        S(total_freed_objects);
-        S(malloc_increase_bytes);
-        S(malloc_increase_bytes_limit);
-        S(minor_gc_count);
-        S(major_gc_count);
-        S(compact_count);
-        S(read_barrier_faults);
-        S(total_moved_objects);
-        S(remembered_wb_unprotected_objects);
-        S(remembered_wb_unprotected_objects_limit);
-        S(old_objects);
-        S(old_objects_limit);
-#if RGENGC_ESTIMATE_OLDMALLOC
-        S(oldmalloc_increase_bytes);
-        S(oldmalloc_increase_bytes_limit);
-#endif
-        S(weak_references_count);
-#if RGENGC_PROFILE
-        S(total_generated_normal_object_count);
-        S(total_generated_shady_object_count);
-        S(total_shade_operation_count);
-        S(total_promoted_count);
-        S(total_remembered_normal_object_count);
-        S(total_remembered_shady_object_count);
-#endif /* RGENGC_PROFILE */
-#undef S
-    }
+    gc_mark_internal(ce->value);
+    gc_mark_internal(ce->file);
+    return ID_TABLE_CONTINUE;
 }
 
-static uint64_t
-ns_to_ms(uint64_t ns)
+static void
+mark_const_tbl(rb_objspace_t *objspace, struct rb_id_table *tbl)
 {
-    return ns / (1000 * 1000);
+    if (!tbl) return;
+    rb_id_table_foreach_values(tbl, mark_const_entry_i, objspace);
 }
 
-static size_t
-gc_stat_internal(VALUE hash_or_sym)
+struct mark_cc_entry_args {
+    rb_objspace_t *objspace;
+    VALUE klass;
+};
+
+static enum rb_id_table_iterator_result
+mark_cc_entry_i(VALUE ccs_ptr, void *data)
 {
-    rb_objspace_t *objspace = &rb_objspace;
-    VALUE hash = Qnil, key = Qnil;
+    struct rb_class_cc_entries *ccs = (struct rb_class_cc_entries *)ccs_ptr;
 
-    setup_gc_stat_symbols();
+    VM_ASSERT(vm_ccs_p(ccs));
 
-    if (RB_TYPE_P(hash_or_sym, T_HASH)) {
-        hash = hash_or_sym;
-    }
-    else if (SYMBOL_P(hash_or_sym)) {
-        key = hash_or_sym;
+    if (METHOD_ENTRY_INVALIDATED(ccs->cme)) {
+        rb_vm_ccs_free(ccs);
+        return ID_TABLE_DELETE;
     }
     else {
-        rb_raise(rb_eTypeError, "non-hash or symbol argument");
-    }
-
-#define SET(name, attr) \
-    if (key == gc_stat_symbols[gc_stat_sym_##name]) \
-        return attr; \
-    else if (hash != Qnil) \
-        rb_hash_aset(hash, gc_stat_symbols[gc_stat_sym_##name], SIZET2NUM(attr));
-
-    SET(count, objspace->profile.count);
-    SET(time, (size_t)ns_to_ms(objspace->profile.marking_time_ns + objspace->profile.sweeping_time_ns)); // TODO: UINT64T2NUM
-    SET(marking_time, (size_t)ns_to_ms(objspace->profile.marking_time_ns));
-    SET(sweeping_time, (size_t)ns_to_ms(objspace->profile.sweeping_time_ns));
-
-    /* implementation dependent counters */
-    SET(heap_allocated_pages, heap_allocated_pages);
-    SET(heap_sorted_length, heap_pages_sorted_length);
-    SET(heap_allocatable_pages, heap_allocatable_pages(objspace));
-    SET(heap_available_slots, objspace_available_slots(objspace));
-    SET(heap_live_slots, objspace_live_slots(objspace));
-    SET(heap_free_slots, objspace_free_slots(objspace));
-    SET(heap_final_slots, heap_pages_final_slots);
-    SET(heap_marked_slots, objspace->marked_slots);
-    SET(heap_eden_pages, heap_eden_total_pages(objspace));
-    SET(heap_tomb_pages, heap_tomb_total_pages(objspace));
-    SET(total_allocated_pages, total_allocated_pages(objspace));
-    SET(total_freed_pages, total_freed_pages(objspace));
-    SET(total_allocated_objects, total_allocated_objects(objspace));
-    SET(total_freed_objects, total_freed_objects(objspace));
-    SET(malloc_increase_bytes, malloc_increase);
-    SET(malloc_increase_bytes_limit, malloc_limit);
-    SET(minor_gc_count, objspace->profile.minor_gc_count);
-    SET(major_gc_count, objspace->profile.major_gc_count);
-    SET(compact_count, objspace->profile.compact_count);
-    SET(read_barrier_faults, objspace->profile.read_barrier_faults);
-    SET(total_moved_objects, objspace->rcompactor.total_moved);
-    SET(remembered_wb_unprotected_objects, objspace->rgengc.uncollectible_wb_unprotected_objects);
-    SET(remembered_wb_unprotected_objects_limit, objspace->rgengc.uncollectible_wb_unprotected_objects_limit);
-    SET(old_objects, objspace->rgengc.old_objects);
-    SET(old_objects_limit, objspace->rgengc.old_objects_limit);
-#if RGENGC_ESTIMATE_OLDMALLOC
-    SET(oldmalloc_increase_bytes, objspace->rgengc.oldmalloc_increase);
-    SET(oldmalloc_increase_bytes_limit, objspace->rgengc.oldmalloc_increase_limit);
-#endif
+        gc_mark_internal((VALUE)ccs->cme);
 
-#if RGENGC_PROFILE
-    SET(total_generated_normal_object_count, objspace->profile.total_generated_normal_object_count);
-    SET(total_generated_shady_object_count, objspace->profile.total_generated_shady_object_count);
-    SET(total_shade_operation_count, objspace->profile.total_shade_operation_count);
-    SET(total_promoted_count, objspace->profile.total_promoted_count);
-    SET(total_remembered_normal_object_count, objspace->profile.total_remembered_normal_object_count);
-    SET(total_remembered_shady_object_count, objspace->profile.total_remembered_shady_object_count);
-#endif /* RGENGC_PROFILE */
-#undef SET
-
-    if (!NIL_P(key)) { /* matched key should return above */
-        rb_raise(rb_eArgError, "unknown key: %"PRIsVALUE, rb_sym2str(key));
-    }
+        for (int i=0; i<ccs->len; i++) {
+            VM_ASSERT(((struct mark_cc_entry_args *)data)->klass == ccs->entries[i].cc->klass);
+            VM_ASSERT(vm_cc_check_cme(ccs->entries[i].cc, ccs->cme));
 
-#if defined(RGENGC_PROFILE) && RGENGC_PROFILE >= 2
-    if (hash != Qnil) {
-        gc_count_add_each_types(hash, "generated_normal_object_count_types", objspace->profile.generated_normal_object_count_types);
-        gc_count_add_each_types(hash, "generated_shady_object_count_types", objspace->profile.generated_shady_object_count_types);
-        gc_count_add_each_types(hash, "shade_operation_count_types", objspace->profile.shade_operation_count_types);
-        gc_count_add_each_types(hash, "promoted_types", objspace->profile.promoted_types);
-        gc_count_add_each_types(hash, "remembered_normal_object_count_types", objspace->profile.remembered_normal_object_count_types);
-        gc_count_add_each_types(hash, "remembered_shady_object_count_types", objspace->profile.remembered_shady_object_count_types);
+            gc_mark_internal((VALUE)ccs->entries[i].cc);
+        }
+        return ID_TABLE_CONTINUE;
     }
-#endif
-
-    return 0;
 }
 
-static VALUE
-gc_stat(rb_execution_context_t *ec, VALUE self, VALUE arg) // arg is (nil || hash || symbol)
+static void
+mark_cc_tbl(rb_objspace_t *objspace, struct rb_id_table *tbl, VALUE klass)
 {
-    if (NIL_P(arg)) {
-        arg = rb_hash_new();
-    }
-    else if (SYMBOL_P(arg)) {
-        size_t value = gc_stat_internal(arg);
-        return SIZET2NUM(value);
-    }
-    else if (RB_TYPE_P(arg, T_HASH)) {
-        // ok
-    }
-    else {
-        rb_raise(rb_eTypeError, "non-hash or symbol given");
-    }
+    struct mark_cc_entry_args args;
+
+    if (!tbl) return;
 
-    gc_stat_internal(arg);
-    return arg;
+    args.objspace = objspace;
+    args.klass = klass;
+    rb_id_table_foreach_values(tbl, mark_cc_entry_i, (void *)&args);
 }
 
-size_t
-rb_gc_stat(VALUE key)
+static enum rb_id_table_iterator_result
+mark_cvc_tbl_i(VALUE cvc_entry, void *objspace)
 {
-    if (SYMBOL_P(key)) {
-        size_t value = gc_stat_internal(key);
-        return value;
-    }
-    else {
-        gc_stat_internal(key);
-        return 0;
-    }
-}
+    struct rb_cvar_class_tbl_entry *entry;
 
+    entry = (struct rb_cvar_class_tbl_entry *)cvc_entry;
 
-enum gc_stat_heap_sym {
-    gc_stat_heap_sym_slot_size,
-    gc_stat_heap_sym_heap_allocatable_pages,
-    gc_stat_heap_sym_heap_eden_pages,
-    gc_stat_heap_sym_heap_eden_slots,
-    gc_stat_heap_sym_heap_tomb_pages,
-    gc_stat_heap_sym_heap_tomb_slots,
-    gc_stat_heap_sym_total_allocated_pages,
-    gc_stat_heap_sym_total_freed_pages,
-    gc_stat_heap_sym_force_major_gc_count,
-    gc_stat_heap_sym_force_incremental_marking_finish_count,
-    gc_stat_heap_sym_total_allocated_objects,
-    gc_stat_heap_sym_total_freed_objects,
-    gc_stat_heap_sym_last
-};
+    RUBY_ASSERT(entry->cref == 0 || (BUILTIN_TYPE((VALUE)entry->cref) == T_IMEMO && IMEMO_TYPE_P(entry->cref, imemo_cref)));
+    gc_mark_internal((VALUE)entry->cref);
 
-static VALUE gc_stat_heap_symbols[gc_stat_heap_sym_last];
+    return ID_TABLE_CONTINUE;
+}
 
 static void
-setup_gc_stat_heap_symbols(void)
-{
-    if (gc_stat_heap_symbols[0] == 0) {
-#define S(s) gc_stat_heap_symbols[gc_stat_heap_sym_##s] = ID2SYM(rb_intern_const(#s))
-        S(slot_size);
-        S(heap_allocatable_pages);
-        S(heap_eden_pages);
-        S(heap_eden_slots);
-        S(heap_tomb_pages);
-        S(heap_tomb_slots);
-        S(total_allocated_pages);
-        S(total_freed_pages);
-        S(force_major_gc_count);
-        S(force_incremental_marking_finish_count);
-        S(total_allocated_objects);
-        S(total_freed_objects);
-#undef S
-    }
+mark_cvc_tbl(rb_objspace_t *objspace, struct rb_id_table *tbl)
+{
+    if (!tbl) return;
+    rb_id_table_foreach_values(tbl, mark_cvc_tbl_i, objspace);
 }
 
-static size_t
-gc_stat_heap_internal(int size_pool_idx, VALUE hash_or_sym)
-{
-    rb_objspace_t *objspace = &rb_objspace;
-    VALUE hash = Qnil, key = Qnil;
+#if STACK_GROW_DIRECTION < 0
+#define GET_STACK_BOUNDS(start, end, appendix) ((start) = STACK_END, (end) = STACK_START)
+#elif STACK_GROW_DIRECTION > 0
+#define GET_STACK_BOUNDS(start, end, appendix) ((start) = STACK_START, (end) = STACK_END+(appendix))
+#else
+#define GET_STACK_BOUNDS(start, end, appendix) \
+    ((STACK_END < STACK_START) ? \
+     ((start) = STACK_END, (end) = STACK_START) : ((start) = STACK_START, (end) = STACK_END+(appendix)))
+#endif
 
-    setup_gc_stat_heap_symbols();
+static void
+gc_mark_machine_stack_location_maybe(VALUE obj, void *data)
+{
+    gc_mark_maybe_internal(obj);
 
-    if (RB_TYPE_P(hash_or_sym, T_HASH)) {
-        hash = hash_or_sym;
-    }
-    else if (SYMBOL_P(hash_or_sym)) {
-        key = hash_or_sym;
-    }
-    else {
-        rb_raise(rb_eTypeError, "non-hash or symbol argument");
+#ifdef RUBY_ASAN_ENABLED
+    const rb_execution_context_t *ec = (const rb_execution_context_t *)data;
+    void *fake_frame_start;
+    void *fake_frame_end;
+    bool is_fake_frame = asan_get_fake_stack_extents(
+        ec->machine.asan_fake_stack_handle, obj,
+        ec->machine.stack_start, ec->machine.stack_end,
+        &fake_frame_start, &fake_frame_end
+    );
+    if (is_fake_frame) {
+        each_location_ptr(fake_frame_start, fake_frame_end, gc_mark_maybe_each_location, NULL);
     }
+#endif
+}
 
-    if (size_pool_idx < 0 || size_pool_idx >= SIZE_POOL_COUNT) {
-        rb_raise(rb_eArgError, "size pool index out of range");
+static VALUE
+gc_location_internal(void *objspace, VALUE value)
+{
+    if (SPECIAL_CONST_P(value)) {
+        return value;
     }
 
-    rb_size_pool_t *size_pool = &size_pools[size_pool_idx];
-
-#define SET(name, attr) \
-    if (key == gc_stat_heap_symbols[gc_stat_heap_sym_##name]) \
-        return attr; \
-    else if (hash != Qnil) \
-        rb_hash_aset(hash, gc_stat_heap_symbols[gc_stat_heap_sym_##name], SIZET2NUM(attr));
-
-    SET(slot_size, size_pool->slot_size);
-    SET(heap_allocatable_pages, size_pool->allocatable_pages);
-    SET(heap_eden_pages, SIZE_POOL_EDEN_HEAP(size_pool)->total_pages);
-    SET(heap_eden_slots, SIZE_POOL_EDEN_HEAP(size_pool)->total_slots);
-    SET(heap_tomb_pages, SIZE_POOL_TOMB_HEAP(size_pool)->total_pages);
-    SET(heap_tomb_slots, SIZE_POOL_TOMB_HEAP(size_pool)->total_slots);
-    SET(total_allocated_pages, size_pool->total_allocated_pages);
-    SET(total_freed_pages, size_pool->total_freed_pages);
-    SET(force_major_gc_count, size_pool->force_major_gc_count);
-    SET(force_incremental_marking_finish_count, size_pool->force_incremental_marking_finish_count);
-    SET(total_allocated_objects, size_pool->total_allocated_objects);
-    SET(total_freed_objects, size_pool->total_freed_objects);
-#undef SET
+    GC_ASSERT(rb_gc_impl_pointer_to_heap_p(objspace, (void *)value));
 
-    if (!NIL_P(key)) { /* matched key should return above */
-        rb_raise(rb_eArgError, "unknown key: %"PRIsVALUE, rb_sym2str(key));
-    }
-
-    return 0;
+    return rb_gc_impl_location(objspace, value);
 }
 
-static VALUE
-gc_stat_heap(rb_execution_context_t *ec, VALUE self, VALUE heap_name, VALUE arg)
+VALUE
+rb_gc_location(VALUE value)
 {
-    if (NIL_P(heap_name)) {
-        if (NIL_P(arg)) {
-            arg = rb_hash_new();
-        }
-        else if (RB_TYPE_P(arg, T_HASH)) {
-            // ok
-        }
-        else {
-            rb_raise(rb_eTypeError, "non-hash given");
-        }
+    return gc_location_internal(rb_gc_get_objspace(), value);
+}
 
-        for (int i = 0; i < SIZE_POOL_COUNT; i++) {
-            VALUE hash = rb_hash_aref(arg, INT2FIX(i));
-            if (NIL_P(hash)) {
-                hash = rb_hash_new();
-                rb_hash_aset(arg, INT2FIX(i), hash);
-            }
-            gc_stat_heap_internal(i, hash);
-        }
-    }
-    else if (FIXNUM_P(heap_name)) {
-        int size_pool_idx = FIX2INT(heap_name);
+#if defined(__wasm__)
 
-        if (NIL_P(arg)) {
-            arg = rb_hash_new();
-        }
-        else if (SYMBOL_P(arg)) {
-            size_t value = gc_stat_heap_internal(size_pool_idx, arg);
-            return SIZET2NUM(value);
-        }
-        else if (RB_TYPE_P(arg, T_HASH)) {
-            // ok
-        }
-        else {
-            rb_raise(rb_eTypeError, "non-hash or symbol given");
-        }
 
-        gc_stat_heap_internal(size_pool_idx, arg);
-    }
-    else {
-        rb_raise(rb_eTypeError, "heap_name must be nil or an Integer");
-    }
+static VALUE *rb_stack_range_tmp[2];
 
-    return arg;
+static void
+rb_mark_locations(void *begin, void *end)
+{
+    rb_stack_range_tmp[0] = begin;
+    rb_stack_range_tmp[1] = end;
 }
 
-static VALUE
-gc_stress_get(rb_execution_context_t *ec, VALUE self)
+void
+rb_gc_save_machine_context(void)
 {
-    rb_objspace_t *objspace = &rb_objspace;
-    return ruby_gc_stress_mode;
+    // no-op
 }
 
+# if defined(__EMSCRIPTEN__)
+
 static void
-gc_stress_set(rb_objspace_t *objspace, VALUE flag)
+mark_current_machine_context(const rb_execution_context_t *ec)
 {
-    objspace->flags.gc_stressful = RTEST(flag);
-    objspace->gc_stress_mode = flag;
+    emscripten_scan_stack(rb_mark_locations);
+    each_location_ptr(rb_stack_range_tmp[0], rb_stack_range_tmp[1], gc_mark_maybe_each_location, NULL);
+
+    emscripten_scan_registers(rb_mark_locations);
+    each_location_ptr(rb_stack_range_tmp[0], rb_stack_range_tmp[1], gc_mark_maybe_each_location, NULL);
 }
+# else // use Asyncify version
 
-static VALUE
-gc_stress_set_m(rb_execution_context_t *ec, VALUE self, VALUE flag)
+static void
+mark_current_machine_context(rb_execution_context_t *ec)
 {
-    rb_objspace_t *objspace = &rb_objspace;
-    gc_stress_set(objspace, flag);
-    return flag;
+    VALUE *stack_start, *stack_end;
+    SET_STACK_END;
+    GET_STACK_BOUNDS(stack_start, stack_end, 1);
+    each_location_ptr(stack_start, stack_end, gc_mark_maybe_each_location, NULL);
+
+    rb_wasm_scan_locals(rb_mark_locations);
+    each_location_ptr(rb_stack_range_tmp[0], rb_stack_range_tmp[1], gc_mark_maybe_each_location, NULL);
 }
 
-VALUE
-rb_gc_enable(void)
+# endif
+
+#else // !defined(__wasm__)
+
+void
+rb_gc_save_machine_context(void)
 {
-    rb_objspace_t *objspace = &rb_objspace;
-    return rb_objspace_gc_enable(objspace);
+    rb_thread_t *thread = GET_THREAD();
+
+    RB_VM_SAVE_MACHINE_CONTEXT(thread);
 }
 
-VALUE
-rb_objspace_gc_enable(rb_objspace_t *objspace)
-{
-    int old = dont_gc_val();
 
-    dont_gc_off();
-    return RBOOL(old);
+static void
+mark_current_machine_context(const rb_execution_context_t *ec)
+{
+    rb_gc_mark_machine_context(ec);
 }
+#endif
 
-static VALUE
-gc_enable(rb_execution_context_t *ec, VALUE _)
+void
+rb_gc_mark_machine_context(const rb_execution_context_t *ec)
 {
-    return rb_gc_enable();
+    VALUE *stack_start, *stack_end;
+
+    GET_STACK_BOUNDS(stack_start, stack_end, 0);
+    RUBY_DEBUG_LOG("ec->th:%u stack_start:%p stack_end:%p", rb_ec_thread_ptr(ec)->serial, stack_start, stack_end);
+
+    void *data =
+#ifdef RUBY_ASAN_ENABLED
+        /* gc_mark_machine_stack_location_maybe() uses data as const */
+        (rb_execution_context_t *)ec;
+#else
+        NULL;
+#endif
+
+    each_location_ptr(stack_start, stack_end, gc_mark_machine_stack_location_maybe, data);
+    int num_regs = sizeof(ec->machine.regs)/(sizeof(VALUE));
+    each_location((VALUE*)&ec->machine.regs, num_regs, gc_mark_machine_stack_location_maybe, data);
 }
 
-VALUE
-rb_gc_disable_no_rest(void)
+static int
+rb_mark_tbl_i(st_data_t key, st_data_t value, st_data_t data)
 {
-    rb_objspace_t *objspace = &rb_objspace;
-    return gc_disable_no_rest(objspace);
+    gc_mark_and_pin_internal((VALUE)value);
+
+    return ST_CONTINUE;
 }
 
-static VALUE
-gc_disable_no_rest(rb_objspace_t *objspace)
+void
+rb_mark_tbl(st_table *tbl)
 {
-    int old = dont_gc_val();
-    dont_gc_on();
-    return RBOOL(old);
+    if (!tbl || tbl->num_entries == 0) return;
+
+    st_foreach(tbl, rb_mark_tbl_i, 0);
 }
 
-VALUE
-rb_gc_disable(void)
+static void
+gc_mark_tbl_no_pin(st_table *tbl)
 {
-    rb_objspace_t *objspace = &rb_objspace;
-    return rb_objspace_gc_disable(objspace);
+    if (!tbl || tbl->num_entries == 0) return;
+
+    st_foreach(tbl, gc_mark_tbl_no_pin_i, 0);
 }
 
-VALUE
-rb_objspace_gc_disable(rb_objspace_t *objspace)
+void
+rb_mark_tbl_no_pin(st_table *tbl)
 {
-    gc_rest(objspace);
-    return gc_disable_no_rest(objspace);
+    gc_mark_tbl_no_pin(tbl);
 }
 
-static VALUE
-gc_disable(rb_execution_context_t *ec, VALUE _)
+static bool
+gc_declarative_marking_p(const rb_data_type_t *type)
 {
-    return rb_gc_disable();
+    return (type->flags & RUBY_TYPED_DECL_MARKING) != 0;
 }
 
-#if GC_CAN_COMPILE_COMPACTION
-/*
- *  call-seq:
- *     GC.auto_compact = flag
- *
- *  Updates automatic compaction mode.
- *
- *  When enabled, the compactor will execute on every major collection.
- *
- *  Enabling compaction will degrade performance on major collections.
- */
-static VALUE
-gc_set_auto_compact(VALUE _, VALUE v)
+void
+rb_gc_mark_roots(void *objspace, const char **categoryp)
 {
-    GC_ASSERT(GC_COMPACTION_SUPPORTED);
+    rb_execution_context_t *ec = GET_EC();
+    rb_vm_t *vm = rb_ec_vm_ptr(ec);
 
-    ruby_enable_autocompact = RTEST(v);
-    return v;
-}
-#else
-#  define gc_set_auto_compact rb_f_notimplement
-#endif
+#define MARK_CHECKPOINT(category) do { \
+    if (categoryp) *categoryp = category; \
+} while (0)
 
-#if GC_CAN_COMPILE_COMPACTION
-/*
- *  call-seq:
- *     GC.auto_compact    -> true or false
- *
- *  Returns whether or not automatic compaction has been enabled.
- */
-static VALUE
-gc_get_auto_compact(VALUE _)
-{
-    return RBOOL(ruby_enable_autocompact);
-}
-#else
-#  define gc_get_auto_compact rb_f_notimplement
-#endif
+    MARK_CHECKPOINT("vm");
+    rb_vm_mark(vm);
 
-static int
-get_envparam_size(const char *name, size_t *default_value, size_t lower_bound)
-{
-    const char *ptr = getenv(name);
-    ssize_t val;
+    MARK_CHECKPOINT("end_proc");
+    rb_mark_end_proc();
 
-    if (ptr != NULL && *ptr) {
-        size_t unit = 0;
-        char *end;
-#if SIZEOF_SIZE_T == SIZEOF_LONG_LONG
-        val = strtoll(ptr, &end, 0);
-#else
-        val = strtol(ptr, &end, 0);
-#endif
-        switch (*end) {
-          case 'k': case 'K':
-            unit = 1024;
-            ++end;
-            break;
-          case 'm': case 'M':
-            unit = 1024*1024;
-            ++end;
-            break;
-          case 'g': case 'G':
-            unit = 1024*1024*1024;
-            ++end;
-            break;
-        }
-        while (*end && isspace((unsigned char)*end)) end++;
-        if (*end) {
-            if (RTEST(ruby_verbose)) fprintf(stderr, "invalid string for %s: %s\n", name, ptr);
-            return 0;
-        }
-        if (unit > 0) {
-            if (val < -(ssize_t)(SIZE_MAX / 2 / unit) || (ssize_t)(SIZE_MAX / 2 / unit) < val) {
-                if (RTEST(ruby_verbose)) fprintf(stderr, "%s=%s is ignored because it overflows\n", name, ptr);
-                return 0;
-            }
-            val *= unit;
-        }
-        if (val > 0 && (size_t)val > lower_bound) {
-            if (RTEST(ruby_verbose)) {
-                fprintf(stderr, "%s=%"PRIdSIZE" (default value: %"PRIuSIZE")\n", name, val, *default_value);
-            }
-            *default_value = (size_t)val;
-            return 1;
-        }
-        else {
-            if (RTEST(ruby_verbose)) {
-                fprintf(stderr, "%s=%"PRIdSIZE" (default value: %"PRIuSIZE") is ignored because it must be greater than %"PRIuSIZE".\n",
-                        name, val, *default_value, lower_bound);
-            }
-            return 0;
-        }
+    MARK_CHECKPOINT("global_tbl");
+    rb_gc_mark_global_tbl();
+
+#if USE_YJIT
+    void rb_yjit_root_mark(void); // in Rust
+
+    if (rb_yjit_enabled_p) {
+        MARK_CHECKPOINT("YJIT");
+        rb_yjit_root_mark();
     }
-    return 0;
-}
+#endif
 
-static int
-get_envparam_double(const char *name, double *default_value, double lower_bound, double upper_bound, int accept_zero)
-{
-    const char *ptr = getenv(name);
-    double val;
+    MARK_CHECKPOINT("machine_context");
+    mark_current_machine_context(ec);
 
-    if (ptr != NULL && *ptr) {
-        char *end;
-        val = strtod(ptr, &end);
-        if (!*ptr || *end) {
-            if (RTEST(ruby_verbose)) fprintf(stderr, "invalid string for %s: %s\n", name, ptr);
-            return 0;
-        }
+    MARK_CHECKPOINT("global_symbols");
+    rb_sym_global_symbols_mark();
 
-        if (accept_zero && val == 0.0) {
-            goto accept;
-        }
-        else if (val <= lower_bound) {
-            if (RTEST(ruby_verbose)) {
-                fprintf(stderr, "%s=%f (default value: %f) is ignored because it must be greater than %f.\n",
-                        name, val, *default_value, lower_bound);
-            }
-        }
-        else if (upper_bound != 0.0 && /* ignore upper_bound if it is 0.0 */
-                 val > upper_bound) {
-            if (RTEST(ruby_verbose)) {
-                fprintf(stderr, "%s=%f (default value: %f) is ignored because it must be lower than %f.\n",
-                        name, val, *default_value, upper_bound);
-            }
-        }
-        else {
-            goto accept;
-        }
-    }
-    return 0;
+    MARK_CHECKPOINT("finish");
 
-  accept:
-    if (RTEST(ruby_verbose)) fprintf(stderr, "%s=%f (default value: %f)\n", name, val, *default_value);
-    *default_value = val;
-    return 1;
+#undef MARK_CHECKPOINT
 }
 
+struct gc_mark_classext_foreach_arg {
+    rb_objspace_t *objspace;
+    VALUE obj;
+};
+
 static void
-gc_set_initial_pages(rb_objspace_t *objspace)
+gc_mark_classext_module(rb_classext_t *ext, bool prime, VALUE namespace, void *arg)
 {
-    gc_rest(objspace);
+    struct gc_mark_classext_foreach_arg *foreach_arg = (struct gc_mark_classext_foreach_arg *)arg;
+    rb_objspace_t *objspace = foreach_arg->objspace;
+    VALUE obj = foreach_arg->obj;
 
-    for (int i = 0; i < SIZE_POOL_COUNT; i++) {
-        rb_size_pool_t *size_pool = &size_pools[i];
-        char env_key[sizeof("RUBY_GC_HEAP_" "_INIT_SLOTS") + DECIMAL_SIZE_OF_BITS(sizeof(int) * CHAR_BIT)];
-        snprintf(env_key, sizeof(env_key), "RUBY_GC_HEAP_%d_INIT_SLOTS", i);
+    if (RCLASSEXT_SUPER(ext)) {
+        gc_mark_internal(RCLASSEXT_SUPER(ext));
+    }
+    mark_m_tbl(objspace, RCLASSEXT_M_TBL(ext));
+    gc_mark_internal(RCLASSEXT_FIELDS_OBJ(ext));
+    if (!RCLASSEXT_SHARED_CONST_TBL(ext) && RCLASSEXT_CONST_TBL(ext)) {
+        mark_const_tbl(objspace, RCLASSEXT_CONST_TBL(ext));
+    }
+    mark_m_tbl(objspace, RCLASSEXT_CALLABLE_M_TBL(ext));
+    mark_cc_tbl(objspace, RCLASSEXT_CC_TBL(ext), obj);
+    mark_cvc_tbl(objspace, RCLASSEXT_CVC_TBL(ext));
+    gc_mark_internal(RCLASSEXT_CLASSPATH(ext));
+}
 
-        size_t size_pool_init_slots = gc_params.size_pool_init_slots[i];
-        if (get_envparam_size(env_key, &size_pool_init_slots, 0)) {
-            gc_params.size_pool_init_slots[i] = size_pool_init_slots;
-        }
+static void
+gc_mark_classext_iclass(rb_classext_t *ext, bool prime, VALUE namespace, void *arg)
+{
+    struct gc_mark_classext_foreach_arg *foreach_arg = (struct gc_mark_classext_foreach_arg *)arg;
+    rb_objspace_t *objspace = foreach_arg->objspace;
+    VALUE iclass = foreach_arg->obj;
 
-        if (size_pool_init_slots > size_pool->eden_heap.total_slots) {
-            size_t slots = size_pool_init_slots - size_pool->eden_heap.total_slots;
-            size_pool->allocatable_pages = slots_to_pages_for_size_pool(objspace, size_pool, slots);
-        }
-        else {
-            /* We already have more slots than size_pool_init_slots allows, so
-             * prevent creating more pages. */
-            size_pool->allocatable_pages = 0;
-        }
+    if (RCLASSEXT_SUPER(ext)) {
+        gc_mark_internal(RCLASSEXT_SUPER(ext));
     }
-    heap_pages_expand_sorted(objspace);
+    if (RCLASSEXT_ICLASS_IS_ORIGIN(ext) && !RCLASSEXT_ICLASS_ORIGIN_SHARED_MTBL(ext)) {
+        mark_m_tbl(objspace, RCLASSEXT_M_TBL(ext));
+    }
+    if (RCLASSEXT_INCLUDER(ext)) {
+        gc_mark_internal(RCLASSEXT_INCLUDER(ext));
+    }
+    mark_m_tbl(objspace, RCLASSEXT_CALLABLE_M_TBL(ext));
+    mark_cc_tbl(objspace, RCLASSEXT_CC_TBL(ext), iclass);
 }
 
-/*
- * GC tuning environment variables
- *
- * * RUBY_GC_HEAP_FREE_SLOTS
- *   - Prepare at least this amount of slots after GC.
- *   - Allocate slots if there are not enough slots.
- * * RUBY_GC_HEAP_GROWTH_FACTOR (new from 2.1)
- *   - Allocate slots by this factor.
- *   - (next slots number) = (current slots number) * (this factor)
- * * RUBY_GC_HEAP_GROWTH_MAX_SLOTS (new from 2.1)
- *   - Allocation rate is limited to this number of slots.
- * * RUBY_GC_HEAP_FREE_SLOTS_MIN_RATIO (new from 2.4)
- *   - Allocate additional pages when the number of free slots is
- *     lower than the value (total_slots * (this ratio)).
- * * RUBY_GC_HEAP_FREE_SLOTS_GOAL_RATIO (new from 2.4)
- *   - Allocate slots to satisfy this formula:
- *       free_slots = total_slots * goal_ratio
- *   - In other words, prepare (total_slots * goal_ratio) free slots.
- *   - if this value is 0.0, then use RUBY_GC_HEAP_GROWTH_FACTOR directly.
- * * RUBY_GC_HEAP_FREE_SLOTS_MAX_RATIO (new from 2.4)
- *   - Allow to free pages when the number of free slots is
- *     greater than the value (total_slots * (this ratio)).
- * * RUBY_GC_HEAP_OLDOBJECT_LIMIT_FACTOR (new from 2.1.1)
- *   - Do full GC when the number of old objects is more than R * N
- *     where R is this factor and
- *           N is the number of old objects just after last full GC.
- *
- *  * obsolete
- *    * RUBY_FREE_MIN       -> RUBY_GC_HEAP_FREE_SLOTS (from 2.1)
- *    * RUBY_HEAP_MIN_SLOTS -> RUBY_GC_HEAP_INIT_SLOTS (from 2.1)
- *
- * * RUBY_GC_MALLOC_LIMIT
- * * RUBY_GC_MALLOC_LIMIT_MAX (new from 2.1)
- * * RUBY_GC_MALLOC_LIMIT_GROWTH_FACTOR (new from 2.1)
- *
- * * RUBY_GC_OLDMALLOC_LIMIT (new from 2.1)
- * * RUBY_GC_OLDMALLOC_LIMIT_MAX (new from 2.1)
- * * RUBY_GC_OLDMALLOC_LIMIT_GROWTH_FACTOR (new from 2.1)
- */
+#define TYPED_DATA_REFS_OFFSET_LIST(d) (size_t *)(uintptr_t)RTYPEDDATA_TYPE(d)->function.dmark
 
 void
-ruby_gc_set_params(void)
+rb_gc_mark_children(void *objspace, VALUE obj)
 {
-    rb_objspace_t *objspace = &rb_objspace;
-    /* RUBY_GC_HEAP_FREE_SLOTS */
-    if (get_envparam_size("RUBY_GC_HEAP_FREE_SLOTS", &gc_params.heap_free_slots, 0)) {
-        /* ok */
+    struct gc_mark_classext_foreach_arg foreach_args;
+
+    if (rb_obj_exivar_p(obj)) {
+        rb_mark_generic_ivar(obj);
     }
 
-    gc_set_initial_pages(objspace);
+    switch (BUILTIN_TYPE(obj)) {
+      case T_FLOAT:
+      case T_BIGNUM:
+      case T_SYMBOL:
+        /* Not immediates, but does not have references and singleton class.
+         *
+         * RSYMBOL(obj)->fstr intentionally not marked. See log for 96815f1e
+         * ("symbol.c: remove rb_gc_mark_symbols()") */
+        return;
+
+      case T_NIL:
+      case T_FIXNUM:
+        rb_bug("rb_gc_mark() called for broken object");
+        break;
 
-    get_envparam_double("RUBY_GC_HEAP_GROWTH_FACTOR", &gc_params.growth_factor, 1.0, 0.0, FALSE);
-    get_envparam_size  ("RUBY_GC_HEAP_GROWTH_MAX_SLOTS", &gc_params.growth_max_slots, 0);
-    get_envparam_double("RUBY_GC_HEAP_FREE_SLOTS_MIN_RATIO", &gc_params.heap_free_slots_min_ratio,
-                        0.0, 1.0, FALSE);
-    get_envparam_double("RUBY_GC_HEAP_FREE_SLOTS_MAX_RATIO", &gc_params.heap_free_slots_max_ratio,
-                        gc_params.heap_free_slots_min_ratio, 1.0, FALSE);
-    get_envparam_double("RUBY_GC_HEAP_FREE_SLOTS_GOAL_RATIO", &gc_params.heap_free_slots_goal_ratio,
-                        gc_params.heap_free_slots_min_ratio, gc_params.heap_free_slots_max_ratio, TRUE);
-    get_envparam_double("RUBY_GC_HEAP_OLDOBJECT_LIMIT_FACTOR", &gc_params.oldobject_limit_factor, 0.0, 0.0, TRUE);
-    get_envparam_double("RUBY_GC_HEAP_REMEMBERED_WB_UNPROTECTED_OBJECTS_LIMIT_RATIO", &gc_params.uncollectible_wb_unprotected_objects_limit_ratio, 0.0, 0.0, TRUE);
+      case T_NODE:
+        UNEXPECTED_NODE(rb_gc_mark);
+        break;
 
-    if (get_envparam_size("RUBY_GC_MALLOC_LIMIT", &gc_params.malloc_limit_min, 0)) {
-        malloc_limit = gc_params.malloc_limit_min;
-    }
-    get_envparam_size  ("RUBY_GC_MALLOC_LIMIT_MAX", &gc_params.malloc_limit_max, 0);
-    if (!gc_params.malloc_limit_max) { /* ignore max-check if 0 */
-        gc_params.malloc_limit_max = SIZE_MAX;
-    }
-    get_envparam_double("RUBY_GC_MALLOC_LIMIT_GROWTH_FACTOR", &gc_params.malloc_limit_growth_factor, 1.0, 0.0, FALSE);
+      case T_IMEMO:
+        rb_imemo_mark_and_move(obj, false);
+        return;
 
-#if RGENGC_ESTIMATE_OLDMALLOC
-    if (get_envparam_size("RUBY_GC_OLDMALLOC_LIMIT", &gc_params.oldmalloc_limit_min, 0)) {
-        objspace->rgengc.oldmalloc_increase_limit = gc_params.oldmalloc_limit_min;
+      default:
+        break;
     }
-    get_envparam_size  ("RUBY_GC_OLDMALLOC_LIMIT_MAX", &gc_params.oldmalloc_limit_max, 0);
-    get_envparam_double("RUBY_GC_OLDMALLOC_LIMIT_GROWTH_FACTOR", &gc_params.oldmalloc_limit_growth_factor, 1.0, 0.0, FALSE);
-#endif
-}
 
-static void
-reachable_objects_from_callback(VALUE obj)
-{
-    rb_ractor_t *cr = GET_RACTOR();
-    cr->mfd->mark_func(obj, cr->mfd->data);
-}
+    gc_mark_internal(RBASIC(obj)->klass);
 
-void
-rb_objspace_reachable_objects_from(VALUE obj, void (func)(VALUE, void *), void *data)
-{
-    rb_objspace_t *objspace = &rb_objspace;
+    switch (BUILTIN_TYPE(obj)) {
+      case T_CLASS:
+        if (FL_TEST_RAW(obj, FL_SINGLETON)) {
+            gc_mark_internal(RCLASS_ATTACHED_OBJECT(obj));
+        }
+        // Continue to the shared T_CLASS/T_MODULE
+      case T_MODULE:
+        foreach_args.objspace = objspace;
+        foreach_args.obj = obj;
+        rb_class_classext_foreach(obj, gc_mark_classext_module, (void *)&foreach_args);
+        break;
 
-    RB_VM_LOCK_ENTER();
-    {
-        if (during_gc) rb_bug("rb_objspace_reachable_objects_from() is not supported while during_gc == true");
+      case T_ICLASS:
+        foreach_args.objspace = objspace;
+        foreach_args.obj = obj;
+        rb_class_classext_foreach(obj, gc_mark_classext_iclass, (void *)&foreach_args);
+        break;
 
-        if (is_markable_object(obj)) {
-            rb_ractor_t *cr = GET_RACTOR();
-            struct gc_mark_func_data_struct mfd = {
-                .mark_func = func,
-                .data = data,
-            }, *prev_mfd = cr->mfd;
+      case T_ARRAY:
+        if (ARY_SHARED_P(obj)) {
+            VALUE root = ARY_SHARED_ROOT(obj);
+            gc_mark_internal(root);
+        }
+        else {
+            long len = RARRAY_LEN(obj);
+            const VALUE *ptr = RARRAY_CONST_PTR(obj);
+            for (long i = 0; i < len; i++) {
+                gc_mark_internal(ptr[i]);
+            }
+        }
+        break;
 
-            cr->mfd = &mfd;
-            gc_mark_children(objspace, obj);
-            cr->mfd = prev_mfd;
+      case T_HASH:
+        mark_hash(obj);
+        break;
+
+      case T_STRING:
+        if (STR_SHARED_P(obj)) {
+            if (STR_EMBED_P(RSTRING(obj)->as.heap.aux.shared)) {
+                /* Embedded shared strings cannot be moved because this string
+                 * points into the slot of the shared string. There may be code
+                 * using the RSTRING_PTR on the stack, which would pin this
+                 * string but not pin the shared string, causing it to move. */
+                gc_mark_and_pin_internal(RSTRING(obj)->as.heap.aux.shared);
+            }
+            else {
+                gc_mark_internal(RSTRING(obj)->as.heap.aux.shared);
+            }
         }
-    }
-    RB_VM_LOCK_LEAVE();
-}
+        break;
 
-struct root_objects_data {
-    const char *category;
-    void (*func)(const char *category, VALUE, void *);
-    void *data;
-};
+      case T_DATA: {
+        void *const ptr = RTYPEDDATA_P(obj) ? RTYPEDDATA_GET_DATA(obj) : DATA_PTR(obj);
 
-static void
-root_objects_from(VALUE obj, void *ptr)
-{
-    const struct root_objects_data *data = (struct root_objects_data *)ptr;
-    (*data->func)(data->category, obj, data->data);
-}
+        if (ptr) {
+            if (RTYPEDDATA_P(obj) && gc_declarative_marking_p(RTYPEDDATA_TYPE(obj))) {
+                size_t *offset_list = TYPED_DATA_REFS_OFFSET_LIST(obj);
 
-void
-rb_objspace_reachable_objects_from_root(void (func)(const char *category, VALUE, void *), void *passing_data)
-{
-    rb_objspace_t *objspace = &rb_objspace;
-    objspace_reachable_objects_from_root(objspace, func, passing_data);
-}
+                for (size_t offset = *offset_list; offset != RUBY_REF_END; offset = *offset_list++) {
+                    gc_mark_internal(*(VALUE *)((char *)ptr + offset));
+                }
+            }
+            else {
+                RUBY_DATA_FUNC mark_func = RTYPEDDATA_P(obj) ?
+                    RTYPEDDATA_TYPE(obj)->function.dmark :
+                    RDATA(obj)->dmark;
+                if (mark_func) (*mark_func)(ptr);
+            }
+        }
 
-static void
-objspace_reachable_objects_from_root(rb_objspace_t *objspace, void (func)(const char *category, VALUE, void *), void *passing_data)
-{
-    if (during_gc) rb_bug("objspace_reachable_objects_from_root() is not supported while during_gc == true");
+        break;
+      }
 
-    rb_ractor_t *cr = GET_RACTOR();
-    struct root_objects_data data = {
-        .func = func,
-        .data = passing_data,
-    };
-    struct gc_mark_func_data_struct mfd = {
-        .mark_func = root_objects_from,
-        .data = &data,
-    }, *prev_mfd = cr->mfd;
+      case T_OBJECT: {
+        if (rb_shape_obj_too_complex_p(obj)) {
+            gc_mark_tbl_no_pin(ROBJECT_FIELDS_HASH(obj));
+        }
+        else {
+            const VALUE * const ptr = ROBJECT_FIELDS(obj);
 
-    cr->mfd = &mfd;
-    gc_mark_roots(objspace, &data.category);
-    cr->mfd = prev_mfd;
-}
+            uint32_t len = ROBJECT_FIELDS_COUNT(obj);
+            for (uint32_t i = 0; i < len; i++) {
+                gc_mark_internal(ptr[i]);
+            }
+        }
 
-/*
-  ------------------------ Extended allocator ------------------------
-*/
+        attr_index_t fields_count = ROBJECT_FIELDS_COUNT(obj);
+        if (fields_count) {
+            VALUE klass = RBASIC_CLASS(obj);
 
-struct gc_raise_tag {
-    VALUE exc;
-    const char *fmt;
-    va_list *ap;
-};
+            // Increment max_iv_count if applicable, used to determine size pool allocation
+            if (RCLASS_MAX_IV_COUNT(klass) < fields_count) {
+                RCLASS_SET_MAX_IV_COUNT(klass, fields_count);
+            }
+        }
 
-static void *
-gc_vraise(void *ptr)
-{
-    struct gc_raise_tag *argv = ptr;
-    rb_vraise(argv->exc, argv->fmt, *argv->ap);
-    UNREACHABLE_RETURN(NULL);
-}
+        break;
+      }
 
-static void
-gc_raise(VALUE exc, const char *fmt, ...)
-{
-    va_list ap;
-    va_start(ap, fmt);
-    struct gc_raise_tag argv = {
-        exc, fmt, &ap,
-    };
+      case T_FILE:
+        if (RFILE(obj)->fptr) {
+            gc_mark_internal(RFILE(obj)->fptr->self);
+            gc_mark_internal(RFILE(obj)->fptr->pathv);
+            gc_mark_internal(RFILE(obj)->fptr->tied_io_for_writing);
+            gc_mark_internal(RFILE(obj)->fptr->writeconv_asciicompat);
+            gc_mark_internal(RFILE(obj)->fptr->writeconv_pre_ecopts);
+            gc_mark_internal(RFILE(obj)->fptr->encs.ecopts);
+            gc_mark_internal(RFILE(obj)->fptr->write_lock);
+            gc_mark_internal(RFILE(obj)->fptr->timeout);
+            gc_mark_internal(RFILE(obj)->fptr->wakeup_mutex);
+        }
+        break;
 
-    if (ruby_thread_has_gvl_p()) {
-        gc_vraise(&argv);
-        UNREACHABLE;
-    }
-    else if (ruby_native_thread_p()) {
-        rb_thread_call_with_gvl(gc_vraise, &argv);
-        UNREACHABLE;
-    }
-    else {
-        /* Not in a ruby thread */
-        fprintf(stderr, "%s", "[FATAL] ");
-        vfprintf(stderr, fmt, ap);
-    }
+      case T_REGEXP:
+        gc_mark_internal(RREGEXP(obj)->src);
+        break;
+
+      case T_MATCH:
+        gc_mark_internal(RMATCH(obj)->regexp);
+        if (RMATCH(obj)->str) {
+            gc_mark_internal(RMATCH(obj)->str);
+        }
+        break;
 
-    va_end(ap);
-    abort();
-}
+      case T_RATIONAL:
+        gc_mark_internal(RRATIONAL(obj)->num);
+        gc_mark_internal(RRATIONAL(obj)->den);
+        break;
 
-static void objspace_xfree(rb_objspace_t *objspace, void *ptr, size_t size);
+      case T_COMPLEX:
+        gc_mark_internal(RCOMPLEX(obj)->real);
+        gc_mark_internal(RCOMPLEX(obj)->imag);
+        break;
 
-static void
-negative_size_allocation_error(const char *msg)
-{
-    gc_raise(rb_eNoMemError, "%s", msg);
-}
+      case T_STRUCT: {
+        const long len = RSTRUCT_LEN(obj);
+        const VALUE * const ptr = RSTRUCT_CONST_PTR(obj);
 
-static void *
-ruby_memerror_body(void *dummy)
-{
-    rb_memerror();
-    return 0;
+        for (long i = 0; i < len; i++) {
+            gc_mark_internal(ptr[i]);
+        }
+
+        break;
+      }
+
+      default:
+        if (BUILTIN_TYPE(obj) == T_MOVED)   rb_bug("rb_gc_mark(): %p is T_MOVED", (void *)obj);
+        if (BUILTIN_TYPE(obj) == T_NONE)   rb_bug("rb_gc_mark(): %p is T_NONE", (void *)obj);
+        if (BUILTIN_TYPE(obj) == T_ZOMBIE) rb_bug("rb_gc_mark(): %p is T_ZOMBIE", (void *)obj);
+        rb_bug("rb_gc_mark(): unknown data type 0x%x(%p) %s",
+               BUILTIN_TYPE(obj), (void *)obj,
+               rb_gc_impl_pointer_to_heap_p(objspace, (void *)obj) ? "corrupted object" : "non object");
+    }
 }
 
-NORETURN(static void ruby_memerror(void));
-RBIMPL_ATTR_MAYBE_UNUSED()
-static void
-ruby_memerror(void)
+size_t
+rb_gc_obj_optimal_size(VALUE obj)
 {
-    if (ruby_thread_has_gvl_p()) {
-        rb_memerror();
-    }
-    else {
-        if (ruby_native_thread_p()) {
-            rb_thread_call_with_gvl(ruby_memerror_body, 0);
+    switch (BUILTIN_TYPE(obj)) {
+      case T_ARRAY:
+        return rb_ary_size_as_embedded(obj);
+
+      case T_OBJECT:
+        if (rb_shape_obj_too_complex_p(obj)) {
+            return sizeof(struct RObject);
         }
         else {
-            /* no ruby thread */
-            fprintf(stderr, "[FATAL] failed to allocate memory\n");
+            return rb_obj_embedded_size(ROBJECT_FIELDS_CAPACITY(obj));
         }
+
+      case T_STRING:
+        return rb_str_size_as_embedded(obj);
+
+      case T_HASH:
+        return sizeof(struct RHash) + (RHASH_ST_TABLE_P(obj) ? sizeof(st_table) : sizeof(ar_table));
+
+      default:
+        return 0;
     }
-    exit(EXIT_FAILURE);
 }
 
 void
-rb_memerror(void)
+rb_gc_writebarrier(VALUE a, VALUE b)
 {
-    rb_execution_context_t *ec = GET_EC();
-    rb_objspace_t *objspace = rb_objspace_of(rb_ec_vm_ptr(ec));
-    VALUE exc;
-
-    if (0) {
-        // Print out pid, sleep, so you can attach debugger to see what went wrong:
-        fprintf(stderr, "rb_memerror pid=%"PRI_PIDT_PREFIX"d\n", getpid());
-        sleep(60);
-    }
-
-    if (during_gc) {
-        // TODO: OMG!! How to implement it?
-        gc_exit(objspace, gc_enter_event_rb_memerror, NULL);
-    }
+    rb_gc_impl_writebarrier(rb_gc_get_objspace(), a, b);
+}
 
-    exc = nomem_error;
-    if (!exc ||
-        rb_ec_raised_p(ec, RAISED_NOMEMORY)) {
-        fprintf(stderr, "[FATAL] failed to allocate memory\n");
-        exit(EXIT_FAILURE);
-    }
-    if (rb_ec_raised_p(ec, RAISED_NOMEMORY)) {
-        rb_ec_raised_clear(ec);
-    }
-    else {
-        rb_ec_raised_set(ec, RAISED_NOMEMORY);
-        exc = ruby_vm_special_exception_copy(exc);
-    }
-    ec->errinfo = exc;
-    EC_JUMP_TAG(ec, TAG_RAISE);
+void
+rb_gc_writebarrier_unprotect(VALUE obj)
+{
+    rb_gc_impl_writebarrier_unprotect(rb_gc_get_objspace(), obj);
 }
 
-void *
-rb_aligned_malloc(size_t alignment, size_t size)
+/*
+ * remember `obj' if needed.
+ */
+void
+rb_gc_writebarrier_remember(VALUE obj)
 {
-    /* alignment must be a power of 2 */
-    GC_ASSERT(((alignment - 1) & alignment) == 0);
-    GC_ASSERT(alignment % sizeof(void*) == 0);
+    rb_gc_impl_writebarrier_remember(rb_gc_get_objspace(), obj);
+}
 
-    void *res;
+void
+rb_gc_copy_attributes(VALUE dest, VALUE obj)
+{
+    rb_gc_impl_copy_attributes(rb_gc_get_objspace(), dest, obj);
+}
 
-#if defined __MINGW32__
-    res = __mingw_aligned_malloc(size, alignment);
-#elif defined _WIN32
-    void *_aligned_malloc(size_t, size_t);
-    res = _aligned_malloc(size, alignment);
-#elif defined(HAVE_POSIX_MEMALIGN)
-    if (posix_memalign(&res, alignment, size) != 0) {
-        return NULL;
-    }
-#elif defined(HAVE_MEMALIGN)
-    res = memalign(alignment, size);
+int
+rb_gc_modular_gc_loaded_p(void)
+{
+#if USE_MODULAR_GC
+    return rb_gc_functions.modular_gc_loaded_p;
 #else
-    char* aligned;
-    res = malloc(alignment + size + sizeof(void*));
-    aligned = (char*)res + alignment + sizeof(void*);
-    aligned -= ((VALUE)aligned & (alignment - 1));
-    ((void**)aligned)[-1] = res;
-    res = (void*)aligned;
+    return false;
 #endif
+}
+
+const char *
+rb_gc_active_gc_name(void)
+{
+    const char *gc_name = rb_gc_impl_active_gc_name();
 
-    GC_ASSERT((uintptr_t)res % alignment == 0);
+    const size_t len = strlen(gc_name);
+    if (len > RB_GC_MAX_NAME_LEN) {
+        rb_bug("GC should have a name no more than %d chars long. Currently: %zu (%s)",
+               RB_GC_MAX_NAME_LEN, len, gc_name);
+    }
 
-    return res;
+    return gc_name;
 }
 
-static void
-rb_aligned_free(void *ptr, size_t size)
+struct rb_gc_object_metadata_entry *
+rb_gc_object_metadata(VALUE obj)
 {
-#if defined __MINGW32__
-    __mingw_aligned_free(ptr);
-#elif defined _WIN32
-    _aligned_free(ptr);
-#elif defined(HAVE_POSIX_MEMALIGN) || defined(HAVE_MEMALIGN)
-    free(ptr);
-#else
-    free(((void**)ptr)[-1]);
-#endif
+    return rb_gc_impl_object_metadata(rb_gc_get_objspace(), obj);
 }
 
-static inline size_t
-objspace_malloc_size(rb_objspace_t *objspace, void *ptr, size_t hint)
+/* GC */
+
+void *
+rb_gc_ractor_cache_alloc(rb_ractor_t *ractor)
 {
-#ifdef HAVE_MALLOC_USABLE_SIZE
-    return malloc_usable_size(ptr);
-#else
-    return hint;
-#endif
+    return rb_gc_impl_ractor_cache_alloc(rb_gc_get_objspace(), ractor);
 }
 
-enum memop_type {
-    MEMOP_TYPE_MALLOC  = 0,
-    MEMOP_TYPE_FREE,
-    MEMOP_TYPE_REALLOC
-};
+void
+rb_gc_ractor_cache_free(void *cache)
+{
+    rb_gc_impl_ractor_cache_free(rb_gc_get_objspace(), cache);
+}
 
-static inline void
-atomic_sub_nounderflow(size_t *var, size_t sub)
+void
+rb_gc_register_mark_object(VALUE obj)
 {
-    if (sub == 0) return;
+    if (!rb_gc_impl_pointer_to_heap_p(rb_gc_get_objspace(), (void *)obj))
+        return;
 
-    while (1) {
-        size_t val = *var;
-        if (val < sub) sub = val;
-        if (ATOMIC_SIZE_CAS(*var, val, val-sub) == val) break;
-    }
+    rb_vm_register_global_object(obj);
 }
 
-static void
-objspace_malloc_gc_stress(rb_objspace_t *objspace)
+void
+rb_gc_register_address(VALUE *addr)
 {
-    if (ruby_gc_stressful && ruby_native_thread_p()) {
-        unsigned int reason = (GPR_FLAG_IMMEDIATE_MARK | GPR_FLAG_IMMEDIATE_SWEEP |
-                               GPR_FLAG_STRESS | GPR_FLAG_MALLOC);
+    rb_vm_t *vm = GET_VM();
 
-        if (gc_stress_full_mark_after_malloc_p()) {
-            reason |= GPR_FLAG_FULL_MARK;
-        }
-        garbage_collect_with_gvl(objspace, reason);
+    VALUE obj = *addr;
+
+    struct global_object_list *tmp = ALLOC(struct global_object_list);
+    tmp->next = vm->global_object_list;
+    tmp->varptr = addr;
+    vm->global_object_list = tmp;
+
+    /*
+     * Because some C extensions have assignment-then-register bugs,
+     * we guard `obj` here so that it would not get swept defensively.
+     */
+    RB_GC_GUARD(obj);
+    if (0 && !SPECIAL_CONST_P(obj)) {
+        rb_warn("Object is assigned to registering address already: %"PRIsVALUE,
+                rb_obj_class(obj));
+        rb_print_backtrace(stderr);
     }
 }
 
-static inline bool
-objspace_malloc_increase_report(rb_objspace_t *objspace, void *mem, size_t new_size, size_t old_size, enum memop_type type)
+void
+rb_gc_unregister_address(VALUE *addr)
 {
-    if (0) fprintf(stderr, "increase - ptr: %p, type: %s, new_size: %"PRIdSIZE", old_size: %"PRIdSIZE"\n",
-                   mem,
-                   type == MEMOP_TYPE_MALLOC  ? "malloc" :
-                   type == MEMOP_TYPE_FREE    ? "free  " :
-                   type == MEMOP_TYPE_REALLOC ? "realloc": "error",
-                   new_size, old_size);
-    return false;
-}
+    rb_vm_t *vm = GET_VM();
+    struct global_object_list *tmp = vm->global_object_list;
 
-static bool
-objspace_malloc_increase_body(rb_objspace_t *objspace, void *mem, size_t new_size, size_t old_size, enum memop_type type)
-{
-    if (new_size > old_size) {
-        ATOMIC_SIZE_ADD(malloc_increase, new_size - old_size);
-#if RGENGC_ESTIMATE_OLDMALLOC
-        ATOMIC_SIZE_ADD(objspace->rgengc.oldmalloc_increase, new_size - old_size);
-#endif
-    }
-    else {
-        atomic_sub_nounderflow(&malloc_increase, old_size - new_size);
-#if RGENGC_ESTIMATE_OLDMALLOC
-        atomic_sub_nounderflow(&objspace->rgengc.oldmalloc_increase, old_size - new_size);
-#endif
+    if (tmp->varptr == addr) {
+        vm->global_object_list = tmp->next;
+        xfree(tmp);
+        return;
     }
+    while (tmp->next) {
+        if (tmp->next->varptr == addr) {
+            struct global_object_list *t = tmp->next;
 
-    if (type == MEMOP_TYPE_MALLOC) {
-      retry:
-        if (malloc_increase > malloc_limit && ruby_native_thread_p() && !dont_gc_val()) {
-            if (ruby_thread_has_gvl_p() && is_lazy_sweeping(objspace)) {
-                gc_rest(objspace); /* gc_rest can reduce malloc_increase */
-                goto retry;
-            }
-            garbage_collect_with_gvl(objspace, GPR_FLAG_MALLOC);
+            tmp->next = tmp->next->next;
+            xfree(t);
+            break;
         }
+        tmp = tmp->next;
     }
+}
 
-#if MALLOC_ALLOCATED_SIZE
-    if (new_size >= old_size) {
-        ATOMIC_SIZE_ADD(objspace->malloc_params.allocated_size, new_size - old_size);
-    }
-    else {
-        size_t dec_size = old_size - new_size;
-        size_t allocated_size = objspace->malloc_params.allocated_size;
+void
+rb_global_variable(VALUE *var)
+{
+    rb_gc_register_address(var);
+}
 
-#if MALLOC_ALLOCATED_SIZE_CHECK
-        if (allocated_size < dec_size) {
-            rb_bug("objspace_malloc_increase: underflow malloc_params.allocated_size.");
-        }
-#endif
-        atomic_sub_nounderflow(&objspace->malloc_params.allocated_size, dec_size);
-    }
+static VALUE
+gc_start_internal(rb_execution_context_t *ec, VALUE self, VALUE full_mark, VALUE immediate_mark, VALUE immediate_sweep, VALUE compact)
+{
+    rb_gc_impl_start(rb_gc_get_objspace(), RTEST(full_mark), RTEST(immediate_mark), RTEST(immediate_sweep), RTEST(compact));
 
-    switch (type) {
-      case MEMOP_TYPE_MALLOC:
-        ATOMIC_SIZE_INC(objspace->malloc_params.allocations);
-        break;
-      case MEMOP_TYPE_FREE:
-        {
-            size_t allocations = objspace->malloc_params.allocations;
-            if (allocations > 0) {
-                atomic_sub_nounderflow(&objspace->malloc_params.allocations, 1);
-            }
-#if MALLOC_ALLOCATED_SIZE_CHECK
-            else {
-                GC_ASSERT(objspace->malloc_params.allocations > 0);
-            }
-#endif
-        }
-        break;
-      case MEMOP_TYPE_REALLOC: /* ignore */ break;
-    }
-#endif
-    return true;
+    return Qnil;
 }
 
-#define objspace_malloc_increase(...) \
-    for (bool malloc_increase_done = objspace_malloc_increase_report(__VA_ARGS__); \
-         !malloc_increase_done; \
-         malloc_increase_done = objspace_malloc_increase_body(__VA_ARGS__))
+/*
+ * rb_objspace_each_objects() is special C API to walk through
+ * Ruby object space.  This C API is too difficult to use it.
+ * To be frank, you should not use it. Or you need to read the
+ * source code of this function and understand what this function does.
+ *
+ * 'callback' will be called several times (the number of heap page,
+ * at current implementation) with:
+ *   vstart: a pointer to the first living object of the heap_page.
+ *   vend: a pointer to next to the valid heap_page area.
+ *   stride: a distance to next VALUE.
+ *
+ * If callback() returns non-zero, the iteration will be stopped.
+ *
+ * This is a sample callback code to iterate liveness objects:
+ *
+ *   static int
+ *   sample_callback(void *vstart, void *vend, int stride, void *data)
+ *   {
+ *       VALUE v = (VALUE)vstart;
+ *       for (; v != (VALUE)vend; v += stride) {
+ *           if (!rb_objspace_internal_object_p(v)) { // liveness check
+ *               // do something with live object 'v'
+ *           }
+ *       }
+ *       return 0; // continue to iteration
+ *   }
+ *
+ * Note: 'vstart' is not a top of heap_page.  This point the first
+ *       living object to grasp at least one object to avoid GC issue.
+ *       This means that you can not walk through all Ruby object page
+ *       including freed object page.
+ *
+ * Note: On this implementation, 'stride' is the same as sizeof(RVALUE).
+ *       However, there are possibilities to pass variable values with
+ *       'stride' with some reasons.  You must use stride instead of
+ *       use some constant value in the iteration.
+ */
+void
+rb_objspace_each_objects(int (*callback)(void *, void *, size_t, void *), void *data)
+{
+    rb_gc_impl_each_objects(rb_gc_get_objspace(), callback, data);
+}
 
-struct malloc_obj_info { /* 4 words */
-    size_t size;
-#if USE_GC_MALLOC_OBJ_INFO_DETAILS
-    size_t gen;
-    const char *file;
-    size_t line;
-#endif
-};
+static void
+gc_ref_update_array(void *objspace, VALUE v)
+{
+    if (ARY_SHARED_P(v)) {
+        VALUE old_root = RARRAY(v)->as.heap.aux.shared_root;
 
-#if USE_GC_MALLOC_OBJ_INFO_DETAILS
-const char *ruby_malloc_info_file;
-int ruby_malloc_info_line;
-#endif
+        UPDATE_IF_MOVED(objspace, RARRAY(v)->as.heap.aux.shared_root);
 
-static inline size_t
-objspace_malloc_prepare(rb_objspace_t *objspace, size_t size)
-{
-    if (size == 0) size = 1;
+        VALUE new_root = RARRAY(v)->as.heap.aux.shared_root;
+        // If the root is embedded and its location has changed
+        if (ARY_EMBED_P(new_root) && new_root != old_root) {
+            size_t offset = (size_t)(RARRAY(v)->as.heap.ptr - RARRAY(old_root)->as.ary);
+            GC_ASSERT(RARRAY(v)->as.heap.ptr >= RARRAY(old_root)->as.ary);
+            RARRAY(v)->as.heap.ptr = RARRAY(new_root)->as.ary + offset;
+        }
+    }
+    else {
+        long len = RARRAY_LEN(v);
 
-#if CALC_EXACT_MALLOC_SIZE
-    size += sizeof(struct malloc_obj_info);
-#endif
+        if (len > 0) {
+            VALUE *ptr = (VALUE *)RARRAY_CONST_PTR(v);
+            for (long i = 0; i < len; i++) {
+                UPDATE_IF_MOVED(objspace, ptr[i]);
+            }
+        }
 
-    return size;
+        if (rb_gc_obj_slot_size(v) >= rb_ary_size_as_embedded(v)) {
+            if (rb_ary_embeddable_p(v)) {
+                rb_ary_make_embedded(v);
+            }
+        }
+    }
 }
 
-static bool
-malloc_during_gc_p(rb_objspace_t *objspace)
+static void
+gc_ref_update_object(void *objspace, VALUE v)
 {
-    /* malloc is not allowed during GC when we're not using multiple ractors
-     * (since ractors can run while another thread is sweeping) and when we
-     * have the GVL (since if we don't have the GVL, we'll try to acquire the
-     * GVL which will block and ensure the other thread finishes GC). */
-    return during_gc && !dont_gc_val() && !rb_multi_ractor_p() && ruby_thread_has_gvl_p();
-}
+    VALUE *ptr = ROBJECT_FIELDS(v);
 
-static inline void *
-objspace_malloc_fixup(rb_objspace_t *objspace, void *mem, size_t size)
-{
-    size = objspace_malloc_size(objspace, mem, size);
-    objspace_malloc_increase(objspace, mem, size, 0, MEMOP_TYPE_MALLOC);
+    if (rb_shape_obj_too_complex_p(v)) {
+        gc_ref_update_table_values_only(ROBJECT_FIELDS_HASH(v));
+        return;
+    }
 
-#if CALC_EXACT_MALLOC_SIZE
-    {
-        struct malloc_obj_info *info = mem;
-        info->size = size;
-#if USE_GC_MALLOC_OBJ_INFO_DETAILS
-        info->gen = objspace->profile.count;
-        info->file = ruby_malloc_info_file;
-        info->line = info->file ? ruby_malloc_info_line : 0;
-#endif
-        mem = info + 1;
+    size_t slot_size = rb_gc_obj_slot_size(v);
+    size_t embed_size = rb_obj_embedded_size(ROBJECT_FIELDS_CAPACITY(v));
+    if (slot_size >= embed_size && !RB_FL_TEST_RAW(v, ROBJECT_EMBED)) {
+        // Object can be re-embedded
+        memcpy(ROBJECT(v)->as.ary, ptr, sizeof(VALUE) * ROBJECT_FIELDS_COUNT(v));
+        RB_FL_SET_RAW(v, ROBJECT_EMBED);
+        xfree(ptr);
+        ptr = ROBJECT(v)->as.ary;
     }
-#endif
 
-    return mem;
+    for (uint32_t i = 0; i < ROBJECT_FIELDS_COUNT(v); i++) {
+        UPDATE_IF_MOVED(objspace, ptr[i]);
+    }
 }
 
-#if defined(__GNUC__) && RUBY_DEBUG
-#define RB_BUG_INSTEAD_OF_RB_MEMERROR 1
-#endif
-
-#ifndef RB_BUG_INSTEAD_OF_RB_MEMERROR
-# define RB_BUG_INSTEAD_OF_RB_MEMERROR 0
-#endif
+void
+rb_gc_ref_update_table_values_only(st_table *tbl)
+{
+    gc_ref_update_table_values_only(tbl);
+}
 
-#define GC_MEMERROR(...) \
-    ((RB_BUG_INSTEAD_OF_RB_MEMERROR+0) ? rb_bug("" __VA_ARGS__) : rb_memerror())
-
-#define TRY_WITH_GC(siz, expr) do {                          \
-        const gc_profile_record_flag gpr =                   \
-            GPR_FLAG_FULL_MARK           |                   \
-            GPR_FLAG_IMMEDIATE_MARK      |                   \
-            GPR_FLAG_IMMEDIATE_SWEEP     |                   \
-            GPR_FLAG_MALLOC;                                 \
-        objspace_malloc_gc_stress(objspace);                 \
-                                                             \
-        if (LIKELY((expr))) {                                \
-            /* Success on 1st try */                         \
-        }                                                    \
-        else if (!garbage_collect_with_gvl(objspace, gpr)) { \
-            /* @shyouhei thinks this doesn't happen */       \
-            GC_MEMERROR("TRY_WITH_GC: could not GC");        \
-        }                                                    \
-        else if ((expr)) {                                   \
-            /* Success on 2nd try */                         \
-        }                                                    \
-        else {                                               \
-            GC_MEMERROR("TRY_WITH_GC: could not allocate:"   \
-                        "%"PRIdSIZE" bytes for %s",          \
-                        siz, # expr);                        \
-        }                                                    \
-    } while (0)
+/* Update MOVED references in a VALUE=>VALUE st_table */
+void
+rb_gc_update_tbl_refs(st_table *ptr)
+{
+    gc_update_table_refs(ptr);
+}
 
 static void
-check_malloc_not_in_gc(rb_objspace_t *objspace, const char *msg)
+gc_ref_update_hash(void *objspace, VALUE v)
 {
-    if (UNLIKELY(malloc_during_gc_p(objspace))) {
-        dont_gc_on();
-        during_gc = false;
-        rb_bug("Cannot %s during GC", msg);
-    }
+    rb_hash_stlike_foreach_with_replace(v, hash_foreach_replace, hash_replace_ref, (st_data_t)objspace);
 }
 
-/* these shouldn't be called directly.
- * objspace_* functions do not check allocation size.
- */
-static void *
-objspace_xmalloc0(rb_objspace_t *objspace, size_t size)
+static void
+gc_update_values(void *objspace, long n, VALUE *values)
 {
-    check_malloc_not_in_gc(objspace, "malloc");
-
-    void *mem;
-
-    size = objspace_malloc_prepare(objspace, size);
-    TRY_WITH_GC(size, mem = malloc(size));
-    RB_DEBUG_COUNTER_INC(heap_xmalloc);
-    return objspace_malloc_fixup(objspace, mem, size);
+    for (long i = 0; i < n; i++) {
+        UPDATE_IF_MOVED(objspace, values[i]);
+    }
 }
 
-static inline size_t
-xmalloc2_size(const size_t count, const size_t elsize)
+void
+rb_gc_update_values(long n, VALUE *values)
 {
-    return size_mul_or_raise(count, elsize, rb_eArgError);
+    gc_update_values(rb_gc_get_objspace(), n, values);
 }
 
-static void *
-objspace_xrealloc(rb_objspace_t *objspace, void *ptr, size_t new_size, size_t old_size)
+static enum rb_id_table_iterator_result
+check_id_table_move(VALUE value, void *data)
 {
-    check_malloc_not_in_gc(objspace, "realloc");
-
-    void *mem;
-
-    if (!ptr) return objspace_xmalloc0(objspace, new_size);
-
-    /*
-     * The behavior of realloc(ptr, 0) is implementation defined.
-     * Therefore we don't use realloc(ptr, 0) for portability reason.
-     * see http://www.open-std.org/jtc1/sc22/wg14/www/docs/dr_400.htm
-     */
-    if (new_size == 0) {
-        if ((mem = objspace_xmalloc0(objspace, 0)) != NULL) {
-            /*
-             * - OpenBSD's malloc(3) man page says that when 0 is passed, it
-             *   returns a non-NULL pointer to an access-protected memory page.
-             *   The returned pointer cannot be read / written at all, but
-             *   still be a valid argument of free().
-             *
-             *   https://man.openbsd.org/malloc.3
-             *
-             * - Linux's malloc(3) man page says that it _might_ perhaps return
-             *   a non-NULL pointer when its argument is 0.  That return value
-             *   is safe (and is expected) to be passed to free().
-             *
-             *   https://man7.org/linux/man-pages/man3/malloc.3.html
-             *
-             * - As I read the implementation jemalloc's malloc() returns fully
-             *   normal 16 bytes memory region when its argument is 0.
-             *
-             * - As I read the implementation musl libc's malloc() returns
-             *   fully normal 32 bytes memory region when its argument is 0.
-             *
-             * - Other malloc implementations can also return non-NULL.
-             */
-            objspace_xfree(objspace, ptr, old_size);
-            return mem;
-        }
-        else {
-            /*
-             * It is dangerous to return NULL here, because that could lead to
-             * RCE.  Fallback to 1 byte instead of zero.
-             *
-             * https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2019-11932
-             */
-            new_size = 1;
-        }
-    }
+    void *objspace = (void *)data;
 
-#if CALC_EXACT_MALLOC_SIZE
-    {
-        struct malloc_obj_info *info = (struct malloc_obj_info *)ptr - 1;
-        new_size += sizeof(struct malloc_obj_info);
-        ptr = info;
-        old_size = info->size;
+    if (rb_gc_impl_object_moved_p(objspace, (VALUE)value)) {
+        return ID_TABLE_REPLACE;
     }
-#endif
 
-    old_size = objspace_malloc_size(objspace, ptr, old_size);
-    TRY_WITH_GC(new_size, mem = RB_GNUC_EXTENSION_BLOCK(realloc(ptr, new_size)));
-    new_size = objspace_malloc_size(objspace, mem, new_size);
+    return ID_TABLE_CONTINUE;
+}
 
-#if CALC_EXACT_MALLOC_SIZE
-    {
-        struct malloc_obj_info *info = mem;
-        info->size = new_size;
-        mem = info + 1;
+void
+rb_gc_prepare_heap_process_object(VALUE obj)
+{
+    switch (BUILTIN_TYPE(obj)) {
+      case T_STRING:
+        // Precompute the string coderange. This both save time for when it will be
+        // eventually needed, and avoid mutating heap pages after a potential fork.
+        rb_enc_str_coderange(obj);
+        break;
+      default:
+        break;
     }
-#endif
-
-    objspace_malloc_increase(objspace, mem, new_size, old_size, MEMOP_TYPE_REALLOC);
-
-    RB_DEBUG_COUNTER_INC(heap_xrealloc);
-    return mem;
 }
 
-#if CALC_EXACT_MALLOC_SIZE && USE_GC_MALLOC_OBJ_INFO_DETAILS
-
-#define MALLOC_INFO_GEN_SIZE 100
-#define MALLOC_INFO_SIZE_SIZE 10
-static size_t malloc_info_gen_cnt[MALLOC_INFO_GEN_SIZE];
-static size_t malloc_info_gen_size[MALLOC_INFO_GEN_SIZE];
-static size_t malloc_info_size[MALLOC_INFO_SIZE_SIZE+1];
-static st_table *malloc_info_file_table;
-
-static int
-mmalloc_info_file_i(st_data_t key, st_data_t val, st_data_t dmy)
+void
+rb_gc_prepare_heap(void)
 {
-    const char *file = (void *)key;
-    const size_t *data = (void *)val;
-
-    fprintf(stderr, "%s\t%"PRIdSIZE"\t%"PRIdSIZE"\n", file, data[0], data[1]);
+    rb_gc_impl_prepare_heap(rb_gc_get_objspace());
+}
 
-    return ST_CONTINUE;
+size_t
+rb_gc_heap_id_for_size(size_t size)
+{
+    return rb_gc_impl_heap_id_for_size(rb_gc_get_objspace(), size);
 }
 
-__attribute__((destructor))
-void
-rb_malloc_info_show_results(void)
+bool
+rb_gc_size_allocatable_p(size_t size)
 {
-    int i;
+    return rb_gc_impl_size_allocatable_p(size);
+}
 
-    fprintf(stderr, "* malloc_info gen statistics\n");
-    for (i=0; i<MALLOC_INFO_GEN_SIZE; i++) {
-        if (i == MALLOC_INFO_GEN_SIZE-1) {
-            fprintf(stderr, "more\t%"PRIdSIZE"\t%"PRIdSIZE"\n", malloc_info_gen_cnt[i], malloc_info_gen_size[i]);
-        }
-        else {
-            fprintf(stderr, "%d\t%"PRIdSIZE"\t%"PRIdSIZE"\n", i, malloc_info_gen_cnt[i], malloc_info_gen_size[i]);
-        }
-    }
+static enum rb_id_table_iterator_result
+update_id_table(VALUE *value, void *data, int existing)
+{
+    void *objspace = (void *)data;
 
-    fprintf(stderr, "* malloc_info size statistics\n");
-    for (i=0; i<MALLOC_INFO_SIZE_SIZE; i++) {
-        int s = 16 << i;
-        fprintf(stderr, "%d\t%"PRIdSIZE"\n", s, malloc_info_size[i]);
+    if (rb_gc_impl_object_moved_p(objspace, (VALUE)*value)) {
+        *value = gc_location_internal(objspace, (VALUE)*value);
     }
-    fprintf(stderr, "more\t%"PRIdSIZE"\n", malloc_info_size[i]);
 
-    if (malloc_info_file_table) {
-        fprintf(stderr, "* malloc_info file statistics\n");
-        st_foreach(malloc_info_file_table, mmalloc_info_file_i, 0);
-    }
-}
-#else
-void
-rb_malloc_info_show_results(void)
-{
+    return ID_TABLE_CONTINUE;
 }
-#endif
 
 static void
-objspace_xfree(rb_objspace_t *objspace, void *ptr, size_t old_size)
+update_m_tbl(void *objspace, struct rb_id_table *tbl)
 {
-    if (!ptr) {
-        /*
-         * ISO/IEC 9899 says "If ptr is a null pointer, no action occurs" since
-         * its first version.  We would better follow.
-         */
-        return;
+    if (tbl) {
+        rb_id_table_foreach_values_with_replace(tbl, check_id_table_move, update_id_table, objspace);
     }
-#if CALC_EXACT_MALLOC_SIZE
-    struct malloc_obj_info *info = (struct malloc_obj_info *)ptr - 1;
-    ptr = info;
-    old_size = info->size;
-
-#if USE_GC_MALLOC_OBJ_INFO_DETAILS
-    {
-        int gen = (int)(objspace->profile.count - info->gen);
-        int gen_index = gen >= MALLOC_INFO_GEN_SIZE ? MALLOC_INFO_GEN_SIZE-1 : gen;
-        int i;
-
-        malloc_info_gen_cnt[gen_index]++;
-        malloc_info_gen_size[gen_index] += info->size;
-
-        for (i=0; i<MALLOC_INFO_SIZE_SIZE; i++) {
-            size_t s = 16 << i;
-            if (info->size <= s) {
-                malloc_info_size[i]++;
-                goto found;
-            }
-        }
-        malloc_info_size[i]++;
-      found:;
+}
 
-        {
-            st_data_t key = (st_data_t)info->file, d;
-            size_t *data;
+static enum rb_id_table_iterator_result
+update_cc_tbl_i(VALUE ccs_ptr, void *objspace)
+{
+    struct rb_class_cc_entries *ccs = (struct rb_class_cc_entries *)ccs_ptr;
+    VM_ASSERT(vm_ccs_p(ccs));
 
-            if (malloc_info_file_table == NULL) {
-                malloc_info_file_table = st_init_numtable_with_size(1024);
-            }
-            if (st_lookup(malloc_info_file_table, key, &d)) {
-                /* hit */
-                data = (size_t *)d;
-            }
-            else {
-                data = malloc(xmalloc2_size(2, sizeof(size_t)));
-                if (data == NULL) rb_bug("objspace_xfree: can not allocate memory");
-                data[0] = data[1] = 0;
-                st_insert(malloc_info_file_table, key, (st_data_t)data);
-            }
-            data[0] ++;
-            data[1] += info->size;
-        };
-        if (0 && gen >= 2) {         /* verbose output */
-            if (info->file) {
-                fprintf(stderr, "free - size:%"PRIdSIZE", gen:%d, pos: %s:%"PRIdSIZE"\n",
-                        info->size, gen, info->file, info->line);
-            }
-            else {
-                fprintf(stderr, "free - size:%"PRIdSIZE", gen:%d\n",
-                        info->size, gen);
-            }
-        }
+    if (rb_gc_impl_object_moved_p(objspace, (VALUE)ccs->cme)) {
+        ccs->cme = (const rb_callable_method_entry_t *)gc_location_internal(objspace, (VALUE)ccs->cme);
     }
-#endif
-#endif
-    old_size = objspace_malloc_size(objspace, ptr, old_size);
 
-    objspace_malloc_increase(objspace, ptr, 0, old_size, MEMOP_TYPE_FREE) {
-        free(ptr);
-        ptr = NULL;
-        RB_DEBUG_COUNTER_INC(heap_xfree);
+    for (int i=0; i<ccs->len; i++) {
+        if (rb_gc_impl_object_moved_p(objspace, (VALUE)ccs->entries[i].cc)) {
+            ccs->entries[i].cc = (struct rb_callcache *)gc_location_internal(objspace, (VALUE)ccs->entries[i].cc);
+        }
     }
-}
 
-static void *
-ruby_xmalloc0(size_t size)
-{
-    return objspace_xmalloc0(&rb_objspace, size);
+    // do not replace
+    return ID_TABLE_CONTINUE;
 }
 
-void *
-ruby_xmalloc_body(size_t size)
+static void
+update_cc_tbl(void *objspace, struct rb_id_table *tbl)
 {
-    if ((ssize_t)size < 0) {
-        negative_size_allocation_error("too large allocation size");
-    }
-    return ruby_xmalloc0(size);
+    if (!tbl) return;
+    rb_id_table_foreach_values(tbl, update_cc_tbl_i, objspace);
 }
 
-void
-ruby_malloc_size_overflow(size_t count, size_t elsize)
+static enum rb_id_table_iterator_result
+update_cvc_tbl_i(VALUE cvc_entry, void *objspace)
 {
-    rb_raise(rb_eArgError,
-             "malloc: possible integer overflow (%"PRIuSIZE"*%"PRIuSIZE")",
-             count, elsize);
-}
+    struct rb_cvar_class_tbl_entry *entry;
 
-void *
-ruby_xmalloc2_body(size_t n, size_t size)
-{
-    return objspace_xmalloc0(&rb_objspace, xmalloc2_size(n, size));
-}
+    entry = (struct rb_cvar_class_tbl_entry *)cvc_entry;
 
-static void *
-objspace_xcalloc(rb_objspace_t *objspace, size_t size)
-{
-    if (UNLIKELY(malloc_during_gc_p(objspace))) {
-        rb_warn("calloc during GC detected, this could cause crashes if it triggers another GC");
-#if RGENGC_CHECK_MODE || RUBY_DEBUG
-        rb_bug("Cannot calloc during GC");
-#endif
+    if (entry->cref) {
+        TYPED_UPDATE_IF_MOVED(objspace, rb_cref_t *, entry->cref);
     }
 
-    void *mem;
+    entry->class_value = gc_location_internal(objspace, entry->class_value);
 
-    size = objspace_malloc_prepare(objspace, size);
-    TRY_WITH_GC(size, mem = calloc1(size));
-    return objspace_malloc_fixup(objspace, mem, size);
+    return ID_TABLE_CONTINUE;
 }
 
-void *
-ruby_xcalloc_body(size_t n, size_t size)
+static void
+update_cvc_tbl(void *objspace, struct rb_id_table *tbl)
 {
-    return objspace_xcalloc(&rb_objspace, xmalloc2_size(n, size));
+    if (!tbl) return;
+    rb_id_table_foreach_values(tbl, update_cvc_tbl_i, objspace);
 }
 
-#ifdef ruby_sized_xrealloc
-#undef ruby_sized_xrealloc
-#endif
-void *
-ruby_sized_xrealloc(void *ptr, size_t new_size, size_t old_size)
+static enum rb_id_table_iterator_result
+update_const_tbl_i(VALUE value, void *objspace)
 {
-    if ((ssize_t)new_size < 0) {
-        negative_size_allocation_error("too large allocation size");
+    rb_const_entry_t *ce = (rb_const_entry_t *)value;
+
+    if (rb_gc_impl_object_moved_p(objspace, ce->value)) {
+        ce->value = gc_location_internal(objspace, ce->value);
     }
 
-    return objspace_xrealloc(&rb_objspace, ptr, new_size, old_size);
-}
+    if (rb_gc_impl_object_moved_p(objspace, ce->file)) {
+        ce->file = gc_location_internal(objspace, ce->file);
+    }
 
-void *
-ruby_xrealloc_body(void *ptr, size_t new_size)
-{
-    return ruby_sized_xrealloc(ptr, new_size, 0);
+    return ID_TABLE_CONTINUE;
 }
 
-#ifdef ruby_sized_xrealloc2
-#undef ruby_sized_xrealloc2
-#endif
-void *
-ruby_sized_xrealloc2(void *ptr, size_t n, size_t size, size_t old_n)
+static void
+update_const_tbl(void *objspace, struct rb_id_table *tbl)
 {
-    size_t len = xmalloc2_size(n, size);
-    return objspace_xrealloc(&rb_objspace, ptr, len, old_n * size);
+    if (!tbl) return;
+    rb_id_table_foreach_values(tbl, update_const_tbl_i, objspace);
 }
 
-void *
-ruby_xrealloc2_body(void *ptr, size_t n, size_t size)
+static void
+update_subclasses(void *objspace, rb_classext_t *ext)
 {
-    return ruby_sized_xrealloc2(ptr, n, size, 0);
+    rb_subclass_entry_t *entry;
+    rb_subclass_anchor_t *anchor = RCLASSEXT_SUBCLASSES(ext);
+    if (!anchor) return;
+    entry = anchor->head;
+    while (entry) {
+        if (entry->klass)
+            UPDATE_IF_MOVED(objspace, entry->klass);
+        entry = entry->next;
+    }
 }
 
-#ifdef ruby_sized_xfree
-#undef ruby_sized_xfree
-#endif
-void
-ruby_sized_xfree(void *x, size_t size)
+static void
+update_superclasses(rb_objspace_t *objspace, rb_classext_t *ext)
 {
-    if (LIKELY(x)) {
-        /* It's possible for a C extension's pthread destructor function set by pthread_key_create
-         * to be called after ruby_vm_destruct and attempt to free memory. Fall back to mimfree in
-         * that case. */
-        if (LIKELY(GET_VM())) {
-            objspace_xfree(&rb_objspace, x, size);
-        }
-        else {
-            ruby_mimfree(x);
+    if (RCLASSEXT_SUPERCLASSES_WITH_SELF(ext)) {
+        size_t array_size = RCLASSEXT_SUPERCLASS_DEPTH(ext) + 1;
+        for (size_t i = 0; i < array_size; i++) {
+            UPDATE_IF_MOVED(objspace, RCLASSEXT_SUPERCLASSES(ext)[i]);
         }
     }
 }
 
-void
-ruby_xfree(void *x)
+static void
+update_classext_values(rb_objspace_t *objspace, rb_classext_t *ext, bool is_iclass)
 {
-    ruby_sized_xfree(x, 0);
+    UPDATE_IF_MOVED(objspace, RCLASSEXT_ORIGIN(ext));
+    UPDATE_IF_MOVED(objspace, RCLASSEXT_REFINED_CLASS(ext));
+    UPDATE_IF_MOVED(objspace, RCLASSEXT_CLASSPATH(ext));
+    if (is_iclass) {
+        UPDATE_IF_MOVED(objspace, RCLASSEXT_INCLUDER(ext));
+    }
 }
 
-void *
-rb_xmalloc_mul_add(size_t x, size_t y, size_t z) /* x * y + z */
+static void
+update_classext(rb_classext_t *ext, bool is_prime, VALUE namespace, void *arg)
 {
-    size_t w = size_mul_add_or_raise(x, y, z, rb_eArgError);
-    return ruby_xmalloc(w);
-}
+    struct classext_foreach_args *args = (struct classext_foreach_args *)arg;
+    rb_objspace_t *objspace = args->objspace;
 
-void *
-rb_xcalloc_mul_add(size_t x, size_t y, size_t z) /* x * y + z */
-{
-    size_t w = size_mul_add_or_raise(x, y, z, rb_eArgError);
-    return ruby_xcalloc(w, 1);
-}
+    if (RCLASSEXT_SUPER(ext)) {
+        UPDATE_IF_MOVED(objspace, RCLASSEXT_SUPER(ext));
+    }
 
-void *
-rb_xrealloc_mul_add(const void *p, size_t x, size_t y, size_t z) /* x * y + z */
-{
-    size_t w = size_mul_add_or_raise(x, y, z, rb_eArgError);
-    return ruby_xrealloc((void *)p, w);
+    update_m_tbl(objspace, RCLASSEXT_M_TBL(ext));
+
+    UPDATE_IF_MOVED(objspace, ext->fields_obj);
+    if (!RCLASSEXT_SHARED_CONST_TBL(ext)) {
+        update_const_tbl(objspace, RCLASSEXT_CONST_TBL(ext));
+    }
+    update_cc_tbl(objspace, RCLASSEXT_CC_TBL(ext));
+    update_cvc_tbl(objspace, RCLASSEXT_CVC_TBL(ext));
+    update_superclasses(objspace, ext);
+    update_subclasses(objspace, ext);
+
+    update_classext_values(objspace, ext, false);
 }
 
-void *
-rb_xmalloc_mul_add_mul(size_t x, size_t y, size_t z, size_t w) /* x * y + z * w */
+static void
+update_iclass_classext(rb_classext_t *ext, bool is_prime, VALUE namespace, void *arg)
 {
-    size_t u = size_mul_add_mul_or_raise(x, y, z, w, rb_eArgError);
-    return ruby_xmalloc(u);
+    struct classext_foreach_args *args = (struct classext_foreach_args *)arg;
+    rb_objspace_t *objspace = args->objspace;
+
+    if (RCLASSEXT_SUPER(ext)) {
+        UPDATE_IF_MOVED(objspace, RCLASSEXT_SUPER(ext));
+    }
+    update_m_tbl(objspace, RCLASSEXT_M_TBL(ext));
+    update_m_tbl(objspace, RCLASSEXT_CALLABLE_M_TBL(ext));
+    update_cc_tbl(objspace, RCLASSEXT_CC_TBL(ext));
+    update_subclasses(objspace, ext);
+
+    update_classext_values(objspace, ext, true);
 }
 
-void *
-rb_xcalloc_mul_add_mul(size_t x, size_t y, size_t z, size_t w) /* x * y + z * w */
+extern rb_symbols_t ruby_global_symbols;
+#define global_symbols ruby_global_symbols
+
+struct global_vm_table_foreach_data {
+    vm_table_foreach_callback_func callback;
+    vm_table_update_callback_func update_callback;
+    void *data;
+    bool weak_only;
+};
+
+static int
+vm_weak_table_foreach_weak_key(st_data_t key, st_data_t value, st_data_t data, int error)
 {
-    size_t u = size_mul_add_mul_or_raise(x, y, z, w, rb_eArgError);
-    return ruby_xcalloc(u, 1);
+    struct global_vm_table_foreach_data *iter_data = (struct global_vm_table_foreach_data *)data;
+
+    int ret = iter_data->callback((VALUE)key, iter_data->data);
+
+    if (!iter_data->weak_only) {
+        if (ret != ST_CONTINUE) return ret;
+
+        ret = iter_data->callback((VALUE)value, iter_data->data);
+    }
+
+    return ret;
 }
 
-/* Mimic ruby_xmalloc, but need not rb_objspace.
- * should return pointer suitable for ruby_xfree
- */
-void *
-ruby_mimmalloc(size_t size)
+static int
+vm_weak_table_foreach_update_weak_key(st_data_t *key, st_data_t *value, st_data_t data, int existing)
 {
-    void *mem;
-#if CALC_EXACT_MALLOC_SIZE
-    size += sizeof(struct malloc_obj_info);
-#endif
-    mem = malloc(size);
-#if CALC_EXACT_MALLOC_SIZE
-    if (!mem) {
-        return NULL;
-    }
-    else
-    /* set 0 for consistency of allocated_size/allocations */
-    {
-        struct malloc_obj_info *info = mem;
-        info->size = 0;
-#if USE_GC_MALLOC_OBJ_INFO_DETAILS
-        info->gen = 0;
-        info->file = NULL;
-        info->line = 0;
-#endif
-        mem = info + 1;
+    struct global_vm_table_foreach_data *iter_data = (struct global_vm_table_foreach_data *)data;
+
+    int ret = iter_data->update_callback((VALUE *)key, iter_data->data);
+
+    if (!iter_data->weak_only) {
+        if (ret != ST_CONTINUE) return ret;
+
+        ret = iter_data->update_callback((VALUE *)value, iter_data->data);
     }
-#endif
-    return mem;
+
+    return ret;
 }
 
-void
-ruby_mimfree(void *ptr)
+static int
+vm_weak_table_cc_refinement_foreach(st_data_t key, st_data_t data, int error)
 {
-#if CALC_EXACT_MALLOC_SIZE
-    struct malloc_obj_info *info = (struct malloc_obj_info *)ptr - 1;
-    ptr = info;
-#endif
-    free(ptr);
+    struct global_vm_table_foreach_data *iter_data = (struct global_vm_table_foreach_data *)data;
+
+    return iter_data->callback((VALUE)key, iter_data->data);
 }
 
-void *
-rb_alloc_tmp_buffer_with_count(volatile VALUE *store, size_t size, size_t cnt)
-{
-    void *ptr;
-    VALUE imemo;
-    rb_imemo_tmpbuf_t *tmpbuf;
-
-    /* Keep the order; allocate an empty imemo first then xmalloc, to
-     * get rid of potential memory leak */
-    imemo = rb_imemo_tmpbuf_auto_free_maybe_mark_buffer(NULL, 0);
-    *store = imemo;
-    ptr = ruby_xmalloc0(size);
-    tmpbuf = (rb_imemo_tmpbuf_t *)imemo;
-    tmpbuf->ptr = ptr;
-    tmpbuf->cnt = cnt;
-    return ptr;
+static int
+vm_weak_table_cc_refinement_foreach_update_update(st_data_t *key, st_data_t data, int existing)
+{
+    struct global_vm_table_foreach_data *iter_data = (struct global_vm_table_foreach_data *)data;
+
+    return iter_data->update_callback((VALUE *)key, iter_data->data);
 }
 
-void *
-rb_alloc_tmp_buffer(volatile VALUE *store, long len)
+
+static int
+vm_weak_table_str_sym_foreach(st_data_t key, st_data_t value, st_data_t data, int error)
 {
-    long cnt;
+    struct global_vm_table_foreach_data *iter_data = (struct global_vm_table_foreach_data *)data;
 
-    if (len < 0 || (cnt = (long)roomof(len, sizeof(VALUE))) < 0) {
-        rb_raise(rb_eArgError, "negative buffer size (or size too big)");
+    if (!iter_data->weak_only) {
+        int ret = iter_data->callback((VALUE)key, iter_data->data);
+        if (ret != ST_CONTINUE) return ret;
     }
 
-    return rb_alloc_tmp_buffer_with_count(store, len, cnt);
+    if (STATIC_SYM_P(value)) {
+        return ST_CONTINUE;
+    }
+    else {
+        return iter_data->callback((VALUE)value, iter_data->data);
+    }
 }
 
-void
-rb_free_tmp_buffer(volatile VALUE *store)
+static int
+vm_weak_table_foreach_update_weak_value(st_data_t *key, st_data_t *value, st_data_t data, int existing)
 {
-    rb_imemo_tmpbuf_t *s = (rb_imemo_tmpbuf_t*)ATOMIC_VALUE_EXCHANGE(*store, 0);
-    if (s) {
-        void *ptr = ATOMIC_PTR_EXCHANGE(s->ptr, 0);
-        s->cnt = 0;
-        ruby_xfree(ptr);
+    struct global_vm_table_foreach_data *iter_data = (struct global_vm_table_foreach_data *)data;
+
+    if (!iter_data->weak_only) {
+        int ret = iter_data->update_callback((VALUE *)key, iter_data->data);
+        if (ret != ST_CONTINUE) return ret;
     }
+
+    return iter_data->update_callback((VALUE *)value, iter_data->data);
 }
 
-#if MALLOC_ALLOCATED_SIZE
-/*
- *  call-seq:
- *     GC.malloc_allocated_size -> Integer
- *
- *  Returns the size of memory allocated by malloc().
- *
- *  Only available if ruby was built with +CALC_EXACT_MALLOC_SIZE+.
- */
+struct st_table *rb_generic_fields_tbl_get(void);
 
-static VALUE
-gc_malloc_allocated_size(VALUE self)
+static int
+vm_weak_table_id2ref_foreach(st_data_t key, st_data_t value, st_data_t data, int error)
 {
-    return UINT2NUM(rb_objspace.malloc_params.allocated_size);
-}
+    struct global_vm_table_foreach_data *iter_data = (struct global_vm_table_foreach_data *)data;
 
-/*
- *  call-seq:
- *     GC.malloc_allocations -> Integer
- *
- *  Returns the number of malloc() allocations.
- *
- *  Only available if ruby was built with +CALC_EXACT_MALLOC_SIZE+.
- */
+    if (!iter_data->weak_only && !FIXNUM_P((VALUE)key)) {
+        int ret = iter_data->callback((VALUE)key, iter_data->data);
+        if (ret != ST_CONTINUE) return ret;
+    }
 
-static VALUE
-gc_malloc_allocations(VALUE self)
-{
-    return UINT2NUM(rb_objspace.malloc_params.allocations);
+    return iter_data->callback((VALUE)value, iter_data->data);
 }
-#endif
 
-void
-rb_gc_adjust_memory_usage(ssize_t diff)
+static int
+vm_weak_table_id2ref_foreach_update(st_data_t *key, st_data_t *value, st_data_t data, int existing)
 {
-    unless_objspace(objspace) { return; }
+    struct global_vm_table_foreach_data *iter_data = (struct global_vm_table_foreach_data *)data;
 
-    if (diff > 0) {
-        objspace_malloc_increase(objspace, 0, diff, 0, MEMOP_TYPE_REALLOC);
-    }
-    else if (diff < 0) {
-        objspace_malloc_increase(objspace, 0, 0, -diff, MEMOP_TYPE_REALLOC);
+    iter_data->update_callback((VALUE *)value, iter_data->data);
+
+    if (!iter_data->weak_only && !FIXNUM_P((VALUE)*key)) {
+        iter_data->update_callback((VALUE *)key, iter_data->data);
     }
+
+    return ST_CONTINUE;
 }
 
-/*
-  ------------------------------ GC profiler ------------------------------
-*/
+static int
+vm_weak_table_gen_fields_foreach(st_data_t key, st_data_t value, st_data_t data)
+{
+    struct global_vm_table_foreach_data *iter_data = (struct global_vm_table_foreach_data *)data;
 
-#define GC_PROFILE_RECORD_DEFAULT_SIZE 100
+    int ret = iter_data->callback((VALUE)key, iter_data->data);
 
-static bool
-current_process_time(struct timespec *ts)
-{
-#if defined(HAVE_CLOCK_GETTIME) && defined(CLOCK_PROCESS_CPUTIME_ID)
-    {
-        static int try_clock_gettime = 1;
-        if (try_clock_gettime && clock_gettime(CLOCK_PROCESS_CPUTIME_ID, ts) == 0) {
-            return true;
-        }
-        else {
-            try_clock_gettime = 0;
+    VALUE new_value = (VALUE)value;
+    VALUE new_key = (VALUE)key;
+
+    switch (ret) {
+      case ST_CONTINUE:
+        break;
+
+      case ST_DELETE:
+        RBASIC_SET_SHAPE_ID((VALUE)key, ROOT_SHAPE_ID);
+        return ST_DELETE;
+
+      case ST_REPLACE: {
+        ret = iter_data->update_callback(&new_key, iter_data->data);
+        if (key != new_key) {
+            ret = ST_DELETE;
         }
+        break;
+      }
+
+      default:
+        rb_bug("vm_weak_table_gen_fields_foreach: return value %d not supported", ret);
     }
-#endif
 
-#ifdef RUSAGE_SELF
-    {
-        struct rusage usage;
-        struct timeval time;
-        if (getrusage(RUSAGE_SELF, &usage) == 0) {
-            time = usage.ru_utime;
-            ts->tv_sec = time.tv_sec;
-            ts->tv_nsec = (int32_t)time.tv_usec * 1000;
-            return true;
+    if (!iter_data->weak_only) {
+        int ivar_ret = iter_data->callback(new_value, iter_data->data);
+        switch (ivar_ret) {
+          case ST_CONTINUE:
+            break;
+
+          case ST_REPLACE:
+            iter_data->update_callback(&new_value, iter_data->data);
+            break;
+
+          default:
+            rb_bug("vm_weak_table_gen_fields_foreach: return value %d not supported", ivar_ret);
         }
     }
-#endif
 
-#ifdef _WIN32
-    {
-        FILETIME creation_time, exit_time, kernel_time, user_time;
-        ULARGE_INTEGER ui;
-
-        if (GetProcessTimes(GetCurrentProcess(),
-                            &creation_time, &exit_time, &kernel_time, &user_time) != 0) {
-            memcpy(&ui, &user_time, sizeof(FILETIME));
-#define PER100NSEC (uint64_t)(1000 * 1000 * 10)
-            ts->tv_nsec = (long)(ui.QuadPart % PER100NSEC);
-            ts->tv_sec  = (time_t)(ui.QuadPart / PER100NSEC);
-            return true;
+    if (key != new_key || value != new_value) {
+        DURING_GC_COULD_MALLOC_REGION_START();
+        {
+            st_insert(rb_generic_fields_tbl_get(), (st_data_t)new_key, new_value);
         }
+        DURING_GC_COULD_MALLOC_REGION_END();
     }
-#endif
 
-    return false;
+    return ret;
 }
 
-static double
-getrusage_time(void)
+static int
+vm_weak_table_frozen_strings_foreach(VALUE *str, void *data)
 {
-    struct timespec ts;
-    if (current_process_time(&ts)) {
-        return ts.tv_sec + ts.tv_nsec * 1e-9;
+    // int retval = vm_weak_table_foreach_weak_key(key, value, data, error);
+    struct global_vm_table_foreach_data *iter_data = (struct global_vm_table_foreach_data *)data;
+    int retval = iter_data->callback(*str, iter_data->data);
+
+    if (retval == ST_REPLACE) {
+        retval = iter_data->update_callback(str, iter_data->data);
     }
-    else {
-        return 0.0;
+
+    if (retval == ST_DELETE) {
+        FL_UNSET(*str, RSTRING_FSTR);
+    }
+
+    return retval;
+}
+
+void rb_fstring_foreach_with_replace(int (*callback)(VALUE *str, void *data), void *data);
+void
+rb_gc_vm_weak_table_foreach(vm_table_foreach_callback_func callback,
+                            vm_table_update_callback_func update_callback,
+                            void *data,
+                            bool weak_only,
+                            enum rb_gc_vm_weak_tables table)
+{
+    rb_vm_t *vm = GET_VM();
+
+    struct global_vm_table_foreach_data foreach_data = {
+        .callback = callback,
+        .update_callback = update_callback,
+        .data = data,
+        .weak_only = weak_only,
+    };
+
+    switch (table) {
+      case RB_GC_VM_CI_TABLE: {
+        if (vm->ci_table) {
+            st_foreach_with_replace(
+                vm->ci_table,
+                vm_weak_table_foreach_weak_key,
+                vm_weak_table_foreach_update_weak_key,
+                (st_data_t)&foreach_data
+            );
+        }
+        break;
+      }
+      case RB_GC_VM_OVERLOADED_CME_TABLE: {
+        if (vm->overloaded_cme_table) {
+            st_foreach_with_replace(
+                vm->overloaded_cme_table,
+                vm_weak_table_foreach_weak_key,
+                vm_weak_table_foreach_update_weak_key,
+                (st_data_t)&foreach_data
+            );
+        }
+        break;
+      }
+      case RB_GC_VM_GLOBAL_SYMBOLS_TABLE: {
+        if (global_symbols.str_sym) {
+            st_foreach_with_replace(
+                global_symbols.str_sym,
+                vm_weak_table_str_sym_foreach,
+                vm_weak_table_foreach_update_weak_value,
+                (st_data_t)&foreach_data
+            );
+        }
+        break;
+      }
+      case RB_GC_VM_ID2REF_TABLE: {
+        if (id2ref_tbl) {
+            st_foreach_with_replace(
+                id2ref_tbl,
+                vm_weak_table_id2ref_foreach,
+                vm_weak_table_id2ref_foreach_update,
+                (st_data_t)&foreach_data
+            );
+        }
+        break;
+      }
+      case RB_GC_VM_GENERIC_FIELDS_TABLE: {
+        st_table *generic_fields_tbl = rb_generic_fields_tbl_get();
+        if (generic_fields_tbl) {
+            st_foreach(
+                generic_fields_tbl,
+                vm_weak_table_gen_fields_foreach,
+                (st_data_t)&foreach_data
+            );
+        }
+        break;
+      }
+      case RB_GC_VM_FROZEN_STRINGS_TABLE: {
+        rb_fstring_foreach_with_replace(
+            vm_weak_table_frozen_strings_foreach,
+            &foreach_data
+        );
+        break;
+      }
+      case RB_GC_VM_CC_REFINEMENT_TABLE: {
+        if (vm->cc_refinement_table) {
+            set_foreach_with_replace(
+              vm->cc_refinement_table,
+              vm_weak_table_cc_refinement_foreach,
+              vm_weak_table_cc_refinement_foreach_update_update,
+              (st_data_t)&foreach_data
+            );
+        }
+        break;
+      }
+      case RB_GC_VM_WEAK_TABLE_COUNT:
+        rb_bug("Unreachable");
+      default:
+        rb_bug("rb_gc_vm_weak_table_foreach: unknown table %d", table);
     }
 }
 
+void
+rb_gc_update_vm_references(void *objspace)
+{
+    rb_execution_context_t *ec = GET_EC();
+    rb_vm_t *vm = rb_ec_vm_ptr(ec);
+
+    rb_vm_update_references(vm);
+    rb_gc_update_global_tbl();
+    rb_sym_global_symbols_update_references();
 
-static inline void
-gc_prof_setup_new_record(rb_objspace_t *objspace, unsigned int reason)
+#if USE_YJIT
+    void rb_yjit_root_update_references(void); // in Rust
+
+    if (rb_yjit_enabled_p) {
+        rb_yjit_root_update_references();
+    }
+#endif
+}
+
+void
+rb_gc_update_object_references(void *objspace, VALUE obj)
 {
-    if (objspace->profile.run) {
-        size_t index = objspace->profile.next_index;
-        gc_profile_record *record;
+    struct classext_foreach_args args;
+
+    switch (BUILTIN_TYPE(obj)) {
+      case T_CLASS:
+        if (FL_TEST_RAW(obj, FL_SINGLETON)) {
+            UPDATE_IF_MOVED(objspace, RCLASS_ATTACHED_OBJECT(obj));
+        }
+        // Continue to the shared T_CLASS/T_MODULE
+      case T_MODULE:
+        args.klass = obj;
+        args.objspace = objspace;
+        rb_class_classext_foreach(obj, update_classext, (void *)&args);
+        break;
+
+      case T_ICLASS:
+        args.objspace = objspace;
+        rb_class_classext_foreach(obj, update_iclass_classext, (void *)&args);
+        break;
+
+      case T_IMEMO:
+        rb_imemo_mark_and_move(obj, true);
+        return;
+
+      case T_NIL:
+      case T_FIXNUM:
+      case T_NODE:
+      case T_MOVED:
+      case T_NONE:
+        /* These can't move */
+        return;
+
+      case T_ARRAY:
+        gc_ref_update_array(objspace, obj);
+        break;
+
+      case T_HASH:
+        gc_ref_update_hash(objspace, obj);
+        UPDATE_IF_MOVED(objspace, RHASH(obj)->ifnone);
+        break;
+
+      case T_STRING:
+        {
+            if (STR_SHARED_P(obj)) {
+                UPDATE_IF_MOVED(objspace, RSTRING(obj)->as.heap.aux.shared);
+            }
+
+            /* If, after move the string is not embedded, and can fit in the
+             * slot it's been placed in, then re-embed it. */
+            if (rb_gc_obj_slot_size(obj) >= rb_str_size_as_embedded(obj)) {
+                if (!STR_EMBED_P(obj) && rb_str_reembeddable_p(obj)) {
+                    rb_str_make_embedded(obj);
+                }
+            }
+
+            break;
+        }
+      case T_DATA:
+        /* Call the compaction callback, if it exists */
+        {
+            void *const ptr = RTYPEDDATA_P(obj) ? RTYPEDDATA_GET_DATA(obj) : DATA_PTR(obj);
+            if (ptr) {
+                if (RTYPEDDATA_P(obj) && gc_declarative_marking_p(RTYPEDDATA_TYPE(obj))) {
+                    size_t *offset_list = TYPED_DATA_REFS_OFFSET_LIST(obj);
+
+                    for (size_t offset = *offset_list; offset != RUBY_REF_END; offset = *offset_list++) {
+                        VALUE *ref = (VALUE *)((char *)ptr + offset);
+                        *ref = gc_location_internal(objspace, *ref);
+                    }
+                }
+                else if (RTYPEDDATA_P(obj)) {
+                    RUBY_DATA_FUNC compact_func = RTYPEDDATA_TYPE(obj)->function.dcompact;
+                    if (compact_func) (*compact_func)(ptr);
+                }
+            }
+        }
+        break;
+
+      case T_OBJECT:
+        gc_ref_update_object(objspace, obj);
+        break;
+
+      case T_FILE:
+        if (RFILE(obj)->fptr) {
+            UPDATE_IF_MOVED(objspace, RFILE(obj)->fptr->self);
+            UPDATE_IF_MOVED(objspace, RFILE(obj)->fptr->pathv);
+            UPDATE_IF_MOVED(objspace, RFILE(obj)->fptr->tied_io_for_writing);
+            UPDATE_IF_MOVED(objspace, RFILE(obj)->fptr->writeconv_asciicompat);
+            UPDATE_IF_MOVED(objspace, RFILE(obj)->fptr->writeconv_pre_ecopts);
+            UPDATE_IF_MOVED(objspace, RFILE(obj)->fptr->encs.ecopts);
+            UPDATE_IF_MOVED(objspace, RFILE(obj)->fptr->write_lock);
+            UPDATE_IF_MOVED(objspace, RFILE(obj)->fptr->timeout);
+            UPDATE_IF_MOVED(objspace, RFILE(obj)->fptr->wakeup_mutex);
+        }
+        break;
+      case T_REGEXP:
+        UPDATE_IF_MOVED(objspace, RREGEXP(obj)->src);
+        break;
+
+      case T_SYMBOL:
+        UPDATE_IF_MOVED(objspace, RSYMBOL(obj)->fstr);
+        break;
+
+      case T_FLOAT:
+      case T_BIGNUM:
+        break;
+
+      case T_MATCH:
+        UPDATE_IF_MOVED(objspace, RMATCH(obj)->regexp);
+
+        if (RMATCH(obj)->str) {
+            UPDATE_IF_MOVED(objspace, RMATCH(obj)->str);
+        }
+        break;
+
+      case T_RATIONAL:
+        UPDATE_IF_MOVED(objspace, RRATIONAL(obj)->num);
+        UPDATE_IF_MOVED(objspace, RRATIONAL(obj)->den);
+        break;
 
-        /* create new record */
-        objspace->profile.next_index++;
+      case T_COMPLEX:
+        UPDATE_IF_MOVED(objspace, RCOMPLEX(obj)->real);
+        UPDATE_IF_MOVED(objspace, RCOMPLEX(obj)->imag);
 
-        if (!objspace->profile.records) {
-            objspace->profile.size = GC_PROFILE_RECORD_DEFAULT_SIZE;
-            objspace->profile.records = malloc(xmalloc2_size(sizeof(gc_profile_record), objspace->profile.size));
-        }
-        if (index >= objspace->profile.size) {
-            void *ptr;
-            objspace->profile.size += 1000;
-            ptr = realloc(objspace->profile.records, xmalloc2_size(sizeof(gc_profile_record), objspace->profile.size));
-            if (!ptr) rb_memerror();
-            objspace->profile.records = ptr;
-        }
-        if (!objspace->profile.records) {
-            rb_bug("gc_profile malloc or realloc miss");
-        }
-        record = objspace->profile.current_record = &objspace->profile.records[objspace->profile.next_index - 1];
-        MEMZERO(record, gc_profile_record, 1);
+        break;
 
-        /* setup before-GC parameter */
-        record->flags = reason | (ruby_gc_stressful ? GPR_FLAG_STRESS : 0);
-#if MALLOC_ALLOCATED_SIZE
-        record->allocated_size = malloc_allocated_size;
-#endif
-#if GC_PROFILE_MORE_DETAIL && GC_PROFILE_DETAIL_MEMORY
-#ifdef RUSAGE_SELF
+      case T_STRUCT:
         {
-            struct rusage usage;
-            if (getrusage(RUSAGE_SELF, &usage) == 0) {
-                record->maxrss = usage.ru_maxrss;
-                record->minflt = usage.ru_minflt;
-                record->majflt = usage.ru_majflt;
+            long i, len = RSTRUCT_LEN(obj);
+            VALUE *ptr = (VALUE *)RSTRUCT_CONST_PTR(obj);
+
+            for (i = 0; i < len; i++) {
+                UPDATE_IF_MOVED(objspace, ptr[i]);
             }
         }
-#endif
-#endif
+        break;
+      default:
+        rb_bug("unreachable");
+        break;
     }
+
+    UPDATE_IF_MOVED(objspace, RBASIC(obj)->klass);
 }
 
-static inline void
-gc_prof_timer_start(rb_objspace_t *objspace)
+VALUE
+rb_gc_start(void)
 {
-    if (gc_prof_enabled(objspace)) {
-        gc_profile_record *record = gc_prof_record(objspace);
-#if GC_PROFILE_MORE_DETAIL
-        record->prepare_time = objspace->profile.prepare_time;
-#endif
-        record->gc_time = 0;
-        record->gc_invoke_time = getrusage_time();
-    }
+    rb_gc();
+    return Qnil;
 }
 
-static double
-elapsed_time_from(double time)
+void
+rb_gc(void)
 {
-    double now = getrusage_time();
-    if (now > time) {
-        return now - time;
-    }
-    else {
-        return 0;
-    }
+    unless_objspace(objspace) { return; }
+
+    rb_gc_impl_start(objspace, true, true, true, false);
 }
 
-static inline void
-gc_prof_timer_stop(rb_objspace_t *objspace)
+int
+rb_during_gc(void)
 {
-    if (gc_prof_enabled(objspace)) {
-        gc_profile_record *record = gc_prof_record(objspace);
-        record->gc_time = elapsed_time_from(record->gc_invoke_time);
-        record->gc_invoke_time -= objspace->profile.invoke_time;
-    }
+    unless_objspace(objspace) { return FALSE; }
+
+    return rb_gc_impl_during_gc_p(objspace);
 }
 
-#define RUBY_DTRACE_GC_HOOK(name) \
-    do {if (RUBY_DTRACE_GC_##name##_ENABLED()) RUBY_DTRACE_GC_##name();} while (0)
-static inline void
-gc_prof_mark_timer_start(rb_objspace_t *objspace)
+size_t
+rb_gc_count(void)
 {
-    RUBY_DTRACE_GC_HOOK(MARK_BEGIN);
-#if GC_PROFILE_MORE_DETAIL
-    if (gc_prof_enabled(objspace)) {
-        gc_prof_record(objspace)->gc_mark_time = getrusage_time();
-    }
-#endif
+    return rb_gc_impl_gc_count(rb_gc_get_objspace());
 }
 
-static inline void
-gc_prof_mark_timer_stop(rb_objspace_t *objspace)
+static VALUE
+gc_count(rb_execution_context_t *ec, VALUE self)
 {
-    RUBY_DTRACE_GC_HOOK(MARK_END);
-#if GC_PROFILE_MORE_DETAIL
-    if (gc_prof_enabled(objspace)) {
-        gc_profile_record *record = gc_prof_record(objspace);
-        record->gc_mark_time = elapsed_time_from(record->gc_mark_time);
-    }
-#endif
+    return SIZET2NUM(rb_gc_count());
 }
 
-static inline void
-gc_prof_sweep_timer_start(rb_objspace_t *objspace)
+VALUE
+rb_gc_latest_gc_info(VALUE key)
 {
-    RUBY_DTRACE_GC_HOOK(SWEEP_BEGIN);
-    if (gc_prof_enabled(objspace)) {
-        gc_profile_record *record = gc_prof_record(objspace);
+    if (!SYMBOL_P(key) && !RB_TYPE_P(key, T_HASH)) {
+        rb_raise(rb_eTypeError, "non-hash or symbol given");
+    }
 
-        if (record->gc_time > 0 || GC_PROFILE_MORE_DETAIL) {
-            objspace->profile.gc_sweep_start_time = getrusage_time();
-        }
+    VALUE val = rb_gc_impl_latest_gc_info(rb_gc_get_objspace(), key);
+
+    if (val == Qundef) {
+        rb_raise(rb_eArgError, "unknown key: %"PRIsVALUE, rb_sym2str(key));
     }
+
+    return val;
 }
 
-static inline void
-gc_prof_sweep_timer_stop(rb_objspace_t *objspace)
+static VALUE
+gc_stat(rb_execution_context_t *ec, VALUE self, VALUE arg) // arg is (nil || hash || symbol)
 {
-    RUBY_DTRACE_GC_HOOK(SWEEP_END);
+    if (NIL_P(arg)) {
+        arg = rb_hash_new();
+    }
+    else if (!RB_TYPE_P(arg, T_HASH) && !SYMBOL_P(arg)) {
+        rb_raise(rb_eTypeError, "non-hash or symbol given");
+    }
 
-    if (gc_prof_enabled(objspace)) {
-        double sweep_time;
-        gc_profile_record *record = gc_prof_record(objspace);
+    VALUE ret = rb_gc_impl_stat(rb_gc_get_objspace(), arg);
 
-        if (record->gc_time > 0) {
-            sweep_time = elapsed_time_from(objspace->profile.gc_sweep_start_time);
-            /* need to accumulate GC time for lazy sweep after gc() */
-            record->gc_time += sweep_time;
-        }
-        else if (GC_PROFILE_MORE_DETAIL) {
-            sweep_time = elapsed_time_from(objspace->profile.gc_sweep_start_time);
-        }
+    if (ret == Qundef) {
+        GC_ASSERT(SYMBOL_P(arg));
 
-#if GC_PROFILE_MORE_DETAIL
-        record->gc_sweep_time += sweep_time;
-        if (heap_pages_deferred_final) record->flags |= GPR_FLAG_HAVE_FINALIZE;
-#endif
-        if (heap_pages_deferred_final) objspace->profile.latest_gc_info |= GPR_FLAG_HAVE_FINALIZE;
+        rb_raise(rb_eArgError, "unknown key: %"PRIsVALUE, rb_sym2str(arg));
     }
+
+    return ret;
 }
 
-static inline void
-gc_prof_set_malloc_info(rb_objspace_t *objspace)
+size_t
+rb_gc_stat(VALUE arg)
 {
-#if GC_PROFILE_MORE_DETAIL
-    if (gc_prof_enabled(objspace)) {
-        gc_profile_record *record = gc_prof_record(objspace);
-        record->allocate_increase = malloc_increase;
-        record->allocate_limit = malloc_limit;
+    if (!RB_TYPE_P(arg, T_HASH) && !SYMBOL_P(arg)) {
+        rb_raise(rb_eTypeError, "non-hash or symbol given");
     }
-#endif
-}
 
-static inline void
-gc_prof_set_heap_info(rb_objspace_t *objspace)
-{
-    if (gc_prof_enabled(objspace)) {
-        gc_profile_record *record = gc_prof_record(objspace);
-        size_t live = objspace->profile.total_allocated_objects_at_gc_start - total_freed_objects(objspace);
-        size_t total = objspace->profile.heap_used_at_gc_start * HEAP_PAGE_OBJ_LIMIT;
+    VALUE ret = rb_gc_impl_stat(rb_gc_get_objspace(), arg);
 
-#if GC_PROFILE_MORE_DETAIL
-        record->heap_use_pages = objspace->profile.heap_used_at_gc_start;
-        record->heap_live_objects = live;
-        record->heap_free_objects = total - live;
-#endif
+    if (ret == Qundef) {
+        GC_ASSERT(SYMBOL_P(arg));
 
-        record->heap_total_objects = total;
-        record->heap_use_size = live * sizeof(RVALUE);
-        record->heap_total_size = total * sizeof(RVALUE);
+        rb_raise(rb_eArgError, "unknown key: %"PRIsVALUE, rb_sym2str(arg));
     }
-}
 
-/*
- *  call-seq:
- *    GC::Profiler.clear          -> nil
- *
- *  Clears the \GC profiler data.
- *
- */
+    if (SYMBOL_P(arg)) {
+        return NUM2SIZET(ret);
+    }
+    else {
+        return 0;
+    }
+}
 
 static VALUE
-gc_profile_clear(VALUE _)
-{
-    rb_objspace_t *objspace = &rb_objspace;
-    void *p = objspace->profile.records;
-    objspace->profile.records = NULL;
-    objspace->profile.size = 0;
-    objspace->profile.next_index = 0;
-    objspace->profile.current_record = 0;
-    free(p);
-    return Qnil;
-}
+gc_stat_heap(rb_execution_context_t *ec, VALUE self, VALUE heap_name, VALUE arg)
+{
+    if (NIL_P(arg)) {
+        arg = rb_hash_new();
+    }
 
-/*
- *  call-seq:
- *     GC::Profiler.raw_data	-> [Hash, ...]
- *
- *  Returns an Array of individual raw profile data Hashes ordered
- *  from earliest to latest by +:GC_INVOKE_TIME+.
- *
- *  For example:
- *
- *    [
- *	{
- *	   :GC_TIME=>1.3000000000000858e-05,
- *	   :GC_INVOKE_TIME=>0.010634999999999999,
- *	   :HEAP_USE_SIZE=>289640,
- *	   :HEAP_TOTAL_SIZE=>588960,
- *	   :HEAP_TOTAL_OBJECTS=>14724,
- *	   :GC_IS_MARKED=>false
- *	},
- *      # ...
- *    ]
- *
- *  The keys mean:
- *
- *  +:GC_TIME+::
- *	Time elapsed in seconds for this GC run
- *  +:GC_INVOKE_TIME+::
- *	Time elapsed in seconds from startup to when the GC was invoked
- *  +:HEAP_USE_SIZE+::
- *	Total bytes of heap used
- *  +:HEAP_TOTAL_SIZE+::
- *	Total size of heap in bytes
- *  +:HEAP_TOTAL_OBJECTS+::
- *	Total number of objects
- *  +:GC_IS_MARKED+::
- *	Returns +true+ if the GC is in mark phase
- *
- *  If ruby was built with +GC_PROFILE_MORE_DETAIL+, you will also have access
- *  to the following hash keys:
- *
- *  +:GC_MARK_TIME+::
- *  +:GC_SWEEP_TIME+::
- *  +:ALLOCATE_INCREASE+::
- *  +:ALLOCATE_LIMIT+::
- *  +:HEAP_USE_PAGES+::
- *  +:HEAP_LIVE_OBJECTS+::
- *  +:HEAP_FREE_OBJECTS+::
- *  +:HAVE_FINALIZE+::
- *
- */
+    if (NIL_P(heap_name)) {
+        if (!RB_TYPE_P(arg, T_HASH)) {
+            rb_raise(rb_eTypeError, "non-hash given");
+        }
+    }
+    else if (FIXNUM_P(heap_name)) {
+        if (!SYMBOL_P(arg) && !RB_TYPE_P(arg, T_HASH)) {
+            rb_raise(rb_eTypeError, "non-hash or symbol given");
+        }
+    }
+    else {
+        rb_raise(rb_eTypeError, "heap_name must be nil or an Integer");
+    }
 
-static VALUE
-gc_profile_record_get(VALUE _)
-{
-    VALUE prof;
-    VALUE gc_profile = rb_ary_new();
-    size_t i;
-    rb_objspace_t *objspace = (&rb_objspace);
-
-    if (!objspace->profile.run) {
-        return Qnil;
-    }
-
-    for (i =0; i < objspace->profile.next_index; i++) {
-        gc_profile_record *record = &objspace->profile.records[i];
-
-        prof = rb_hash_new();
-        rb_hash_aset(prof, ID2SYM(rb_intern("GC_FLAGS")), gc_info_decode(0, rb_hash_new(), record->flags));
-        rb_hash_aset(prof, ID2SYM(rb_intern("GC_TIME")), DBL2NUM(record->gc_time));
-        rb_hash_aset(prof, ID2SYM(rb_intern("GC_INVOKE_TIME")), DBL2NUM(record->gc_invoke_time));
-        rb_hash_aset(prof, ID2SYM(rb_intern("HEAP_USE_SIZE")), SIZET2NUM(record->heap_use_size));
-        rb_hash_aset(prof, ID2SYM(rb_intern("HEAP_TOTAL_SIZE")), SIZET2NUM(record->heap_total_size));
-        rb_hash_aset(prof, ID2SYM(rb_intern("HEAP_TOTAL_OBJECTS")), SIZET2NUM(record->heap_total_objects));
-        rb_hash_aset(prof, ID2SYM(rb_intern("MOVED_OBJECTS")), SIZET2NUM(record->moved_objects));
-        rb_hash_aset(prof, ID2SYM(rb_intern("GC_IS_MARKED")), Qtrue);
-#if GC_PROFILE_MORE_DETAIL
-        rb_hash_aset(prof, ID2SYM(rb_intern("GC_MARK_TIME")), DBL2NUM(record->gc_mark_time));
-        rb_hash_aset(prof, ID2SYM(rb_intern("GC_SWEEP_TIME")), DBL2NUM(record->gc_sweep_time));
-        rb_hash_aset(prof, ID2SYM(rb_intern("ALLOCATE_INCREASE")), SIZET2NUM(record->allocate_increase));
-        rb_hash_aset(prof, ID2SYM(rb_intern("ALLOCATE_LIMIT")), SIZET2NUM(record->allocate_limit));
-        rb_hash_aset(prof, ID2SYM(rb_intern("HEAP_USE_PAGES")), SIZET2NUM(record->heap_use_pages));
-        rb_hash_aset(prof, ID2SYM(rb_intern("HEAP_LIVE_OBJECTS")), SIZET2NUM(record->heap_live_objects));
-        rb_hash_aset(prof, ID2SYM(rb_intern("HEAP_FREE_OBJECTS")), SIZET2NUM(record->heap_free_objects));
-
-        rb_hash_aset(prof, ID2SYM(rb_intern("REMOVING_OBJECTS")), SIZET2NUM(record->removing_objects));
-        rb_hash_aset(prof, ID2SYM(rb_intern("EMPTY_OBJECTS")), SIZET2NUM(record->empty_objects));
-
-        rb_hash_aset(prof, ID2SYM(rb_intern("HAVE_FINALIZE")), RBOOL(record->flags & GPR_FLAG_HAVE_FINALIZE));
-#endif
+    VALUE ret = rb_gc_impl_stat_heap(rb_gc_get_objspace(), heap_name, arg);
 
-#if RGENGC_PROFILE > 0
-        rb_hash_aset(prof, ID2SYM(rb_intern("OLD_OBJECTS")), SIZET2NUM(record->old_objects));
-        rb_hash_aset(prof, ID2SYM(rb_intern("REMEMBERED_NORMAL_OBJECTS")), SIZET2NUM(record->remembered_normal_objects));
-        rb_hash_aset(prof, ID2SYM(rb_intern("REMEMBERED_SHADY_OBJECTS")), SIZET2NUM(record->remembered_shady_objects));
-#endif
-        rb_ary_push(gc_profile, prof);
+    if (ret == Qundef) {
+        GC_ASSERT(SYMBOL_P(arg));
+
+        rb_raise(rb_eArgError, "unknown key: %"PRIsVALUE, rb_sym2str(arg));
     }
 
-    return gc_profile;
+    return ret;
 }
 
-#if GC_PROFILE_MORE_DETAIL
-#define MAJOR_REASON_MAX 0x10
-
-static char *
-gc_profile_dump_major_reason(unsigned int flags, char *buff)
+static VALUE
+gc_config_get(rb_execution_context_t *ec, VALUE self)
 {
-    unsigned int reason = flags & GPR_FLAG_MAJOR_MASK;
-    int i = 0;
+    VALUE cfg_hash = rb_gc_impl_config_get(rb_gc_get_objspace());
+    rb_hash_aset(cfg_hash, sym("implementation"), rb_fstring_cstr(rb_gc_impl_active_gc_name()));
 
-    if (reason == GPR_FLAG_NONE) {
-        buff[0] = '-';
-        buff[1] = 0;
-    }
-    else {
-#define C(x, s) \
-  if (reason & GPR_FLAG_MAJOR_BY_##x) { \
-      buff[i++] = #x[0]; \
-      if (i >= MAJOR_REASON_MAX) rb_bug("gc_profile_dump_major_reason: overflow"); \
-      buff[i] = 0; \
-  }
-        C(NOFREE, N);
-        C(OLDGEN, O);
-        C(SHADY,  S);
-#if RGENGC_ESTIMATE_OLDMALLOC
-        C(OLDMALLOC, M);
-#endif
-#undef C
-    }
-    return buff;
+    return cfg_hash;
 }
-#endif
 
-static void
-gc_profile_dump_on(VALUE out, VALUE (*append)(VALUE, VALUE))
+static VALUE
+gc_config_set(rb_execution_context_t *ec, VALUE self, VALUE hash)
 {
-    rb_objspace_t *objspace = &rb_objspace;
-    size_t count = objspace->profile.next_index;
-#ifdef MAJOR_REASON_MAX
-    char reason_str[MAJOR_REASON_MAX];
-#endif
-
-    if (objspace->profile.run && count /* > 1 */) {
-        size_t i;
-        const gc_profile_record *record;
+    void *objspace = rb_gc_get_objspace();
 
-        append(out, rb_sprintf("GC %"PRIuSIZE" invokes.\n", objspace->profile.count));
-        append(out, rb_str_new_cstr("Index    Invoke Time(sec)       Use Size(byte)     Total Size(byte)         Total Object                    GC Time(ms)\n"));
+    rb_gc_impl_config_set(objspace, hash);
 
-        for (i = 0; i < count; i++) {
-            record = &objspace->profile.records[i];
-            append(out, rb_sprintf("%5"PRIuSIZE" %19.3f %20"PRIuSIZE" %20"PRIuSIZE" %20"PRIuSIZE" %30.20f\n",
-                                   i+1, record->gc_invoke_time, record->heap_use_size,
-                                   record->heap_total_size, record->heap_total_objects, record->gc_time*1000));
-        }
+    return rb_gc_impl_config_get(objspace);
+}
 
-#if GC_PROFILE_MORE_DETAIL
-        const char *str = "\n\n" \
-                                    "More detail.\n" \
-                                    "Prepare Time = Previously GC's rest sweep time\n"
-                                    "Index Flags          Allocate Inc.  Allocate Limit"
-#if CALC_EXACT_MALLOC_SIZE
-                                    "  Allocated Size"
-#endif
-                                    "  Use Page     Mark Time(ms)    Sweep Time(ms)  Prepare Time(ms)  LivingObj    FreeObj RemovedObj   EmptyObj"
-#if RGENGC_PROFILE
-                                    " OldgenObj RemNormObj RemShadObj"
-#endif
-#if GC_PROFILE_DETAIL_MEMORY
-                                    " MaxRSS(KB) MinorFLT MajorFLT"
-#endif
-                                    "\n";
-        append(out, rb_str_new_cstr(str));
+static VALUE
+gc_stress_get(rb_execution_context_t *ec, VALUE self)
+{
+    return rb_gc_impl_stress_get(rb_gc_get_objspace());
+}
 
-        for (i = 0; i < count; i++) {
-            record = &objspace->profile.records[i];
-            append(out, rb_sprintf("%5"PRIuSIZE" %4s/%c/%6s%c %13"PRIuSIZE" %15"PRIuSIZE
-#if CALC_EXACT_MALLOC_SIZE
-                                   " %15"PRIuSIZE
-#endif
-                                   " %9"PRIuSIZE" %17.12f %17.12f %17.12f %10"PRIuSIZE" %10"PRIuSIZE" %10"PRIuSIZE" %10"PRIuSIZE
-#if RGENGC_PROFILE
-                                   "%10"PRIuSIZE" %10"PRIuSIZE" %10"PRIuSIZE
-#endif
-#if GC_PROFILE_DETAIL_MEMORY
-                                   "%11ld %8ld %8ld"
-#endif
+static VALUE
+gc_stress_set_m(rb_execution_context_t *ec, VALUE self, VALUE flag)
+{
+    rb_gc_impl_stress_set(rb_gc_get_objspace(), flag);
 
-                                   "\n",
-                                   i+1,
-                                   gc_profile_dump_major_reason(record->flags, reason_str),
-                                   (record->flags & GPR_FLAG_HAVE_FINALIZE) ? 'F' : '.',
-                                   (record->flags & GPR_FLAG_NEWOBJ) ? "NEWOBJ" :
-                                   (record->flags & GPR_FLAG_MALLOC) ? "MALLOC" :
-                                   (record->flags & GPR_FLAG_METHOD) ? "METHOD" :
-                                   (record->flags & GPR_FLAG_CAPI)   ? "CAPI__" : "??????",
-                                   (record->flags & GPR_FLAG_STRESS) ? '!' : ' ',
-                                   record->allocate_increase, record->allocate_limit,
-#if CALC_EXACT_MALLOC_SIZE
-                                   record->allocated_size,
-#endif
-                                   record->heap_use_pages,
-                                   record->gc_mark_time*1000,
-                                   record->gc_sweep_time*1000,
-                                   record->prepare_time*1000,
-
-                                   record->heap_live_objects,
-                                   record->heap_free_objects,
-                                   record->removing_objects,
-                                   record->empty_objects
-#if RGENGC_PROFILE
-                                   ,
-                                   record->old_objects,
-                                   record->remembered_normal_objects,
-                                   record->remembered_shady_objects
-#endif
-#if GC_PROFILE_DETAIL_MEMORY
-                                   ,
-                                   record->maxrss / 1024,
-                                   record->minflt,
-                                   record->majflt
-#endif
+    return flag;
+}
 
-                       ));
-        }
-#endif
-    }
+void
+rb_gc_initial_stress_set(VALUE flag)
+{
+    initial_stress = flag;
 }
 
-/*
- *  call-seq:
- *     GC::Profiler.result  -> String
- *
- *  Returns a profile data report such as:
- *
- *    GC 1 invokes.
- *    Index    Invoke Time(sec)       Use Size(byte)     Total Size(byte)         Total Object                    GC time(ms)
- *        1               0.012               159240               212940                10647         0.00000000000001530000
- */
+size_t *
+rb_gc_heap_sizes(void)
+{
+    return rb_gc_impl_heap_sizes(rb_gc_get_objspace());
+}
 
-static VALUE
-gc_profile_result(VALUE _)
+VALUE
+rb_gc_enable(void)
 {
-    VALUE str = rb_str_buf_new(0);
-    gc_profile_dump_on(str, rb_str_buf_append);
-    return str;
+    return rb_objspace_gc_enable(rb_gc_get_objspace());
 }
 
-/*
- *  call-seq:
- *     GC::Profiler.report
- *     GC::Profiler.report(io)
- *
- *  Writes the GC::Profiler.result to <tt>$stdout</tt> or the given IO object.
- *
- */
+VALUE
+rb_objspace_gc_enable(void *objspace)
+{
+    bool disabled = !rb_gc_impl_gc_enabled_p(objspace);
+    rb_gc_impl_gc_enable(objspace);
+    return RBOOL(disabled);
+}
 
 static VALUE
-gc_profile_report(int argc, VALUE *argv, VALUE self)
+gc_enable(rb_execution_context_t *ec, VALUE _)
 {
-    VALUE out;
-
-    out = (!rb_check_arity(argc, 0, 1) ? rb_stdout : argv[0]);
-    gc_profile_dump_on(out, rb_io_write);
-
-    return Qnil;
+    return rb_gc_enable();
 }
 
-/*
- *  call-seq:
- *     GC::Profiler.total_time	-> float
- *
- *  The total time used for garbage collection in seconds
- */
-
 static VALUE
-gc_profile_total_time(VALUE self)
+gc_disable_no_rest(void *objspace)
 {
-    double time = 0;
-    rb_objspace_t *objspace = &rb_objspace;
+    bool disabled = !rb_gc_impl_gc_enabled_p(objspace);
+    rb_gc_impl_gc_disable(objspace, false);
+    return RBOOL(disabled);
+}
 
-    if (objspace->profile.run && objspace->profile.next_index > 0) {
-        size_t i;
-        size_t count = objspace->profile.next_index;
+VALUE
+rb_gc_disable_no_rest(void)
+{
+    return gc_disable_no_rest(rb_gc_get_objspace());
+}
 
-        for (i = 0; i < count; i++) {
-            time += objspace->profile.records[i].gc_time;
-        }
-    }
-    return DBL2NUM(time);
+VALUE
+rb_gc_disable(void)
+{
+    return rb_objspace_gc_disable(rb_gc_get_objspace());
 }
 
-/*
- *  call-seq:
- *    GC::Profiler.enabled?	-> true or false
- *
- *  The current status of \GC profile mode.
- */
+VALUE
+rb_objspace_gc_disable(void *objspace)
+{
+    bool disabled = !rb_gc_impl_gc_enabled_p(objspace);
+    rb_gc_impl_gc_disable(objspace, true);
+    return RBOOL(disabled);
+}
 
 static VALUE
-gc_profile_enable_get(VALUE self)
+gc_disable(rb_execution_context_t *ec, VALUE _)
 {
-    rb_objspace_t *objspace = &rb_objspace;
-    return RBOOL(objspace->profile.run);
+    return rb_gc_disable();
 }
 
-/*
- *  call-seq:
- *    GC::Profiler.enable	-> nil
- *
- *  Starts the \GC profiler.
- *
- */
+// TODO: think about moving ruby_gc_set_params into Init_heap or Init_gc
+void
+ruby_gc_set_params(void)
+{
+    rb_gc_impl_set_params(rb_gc_get_objspace());
+}
 
-static VALUE
-gc_profile_enable(VALUE _)
+void
+rb_objspace_reachable_objects_from(VALUE obj, void (func)(VALUE, void *), void *data)
 {
-    rb_objspace_t *objspace = &rb_objspace;
-    objspace->profile.run = TRUE;
-    objspace->profile.current_record = 0;
-    return Qnil;
+    RB_VM_LOCKING() {
+        if (rb_gc_impl_during_gc_p(rb_gc_get_objspace())) rb_bug("rb_objspace_reachable_objects_from() is not supported while during GC");
+
+        if (!RB_SPECIAL_CONST_P(obj)) {
+            rb_vm_t *vm = GET_VM();
+            struct gc_mark_func_data_struct *prev_mfd = vm->gc.mark_func_data;
+            struct gc_mark_func_data_struct mfd = {
+                .mark_func = func,
+                .data = data,
+            };
+
+            vm->gc.mark_func_data = &mfd;
+            rb_gc_mark_children(rb_gc_get_objspace(), obj);
+            vm->gc.mark_func_data = prev_mfd;
+        }
+    }
 }
 
-/*
- *  call-seq:
- *    GC::Profiler.disable	-> nil
- *
- *  Stops the \GC profiler.
- *
- */
+struct root_objects_data {
+    const char *category;
+    void (*func)(const char *category, VALUE, void *);
+    void *data;
+};
+
+static void
+root_objects_from(VALUE obj, void *ptr)
+{
+    const struct root_objects_data *data = (struct root_objects_data *)ptr;
+    (*data->func)(data->category, obj, data->data);
+}
 
-static VALUE
-gc_profile_disable(VALUE _)
+void
+rb_objspace_reachable_objects_from_root(void (func)(const char *category, VALUE, void *), void *passing_data)
 {
-    rb_objspace_t *objspace = &rb_objspace;
+    if (rb_gc_impl_during_gc_p(rb_gc_get_objspace())) rb_bug("rb_gc_impl_objspace_reachable_objects_from_root() is not supported while during GC");
 
-    objspace->profile.run = FALSE;
-    objspace->profile.current_record = 0;
-    return Qnil;
+    rb_vm_t *vm = GET_VM();
+
+    struct root_objects_data data = {
+        .func = func,
+        .data = passing_data,
+    };
+
+    struct gc_mark_func_data_struct *prev_mfd = vm->gc.mark_func_data;
+    struct gc_mark_func_data_struct mfd = {
+        .mark_func = root_objects_from,
+        .data = &data,
+    };
+
+    vm->gc.mark_func_data = &mfd;
+    rb_gc_save_machine_context();
+    rb_gc_mark_roots(vm->gc.objspace, &data.category);
+    vm->gc.mark_func_data = prev_mfd;
 }
 
 /*
@@ -13451,7 +4704,6 @@ str_len_no_raise(VALUE str)
             memcpy(buff + pos, (s), rb_strlen_lit(s) + 1); \
         } \
     } while (0)
-#define TF(c) ((c) != 0 ? "true" : "false")
 #define C(c, s) ((c) != 0 ? (s) : " ")
 
 static size_t
@@ -13470,24 +4722,26 @@ rb_raw_obj_info_common(char *const buff, const size_t buff_size, const VALUE obj
         }
     }
     else {
-        const int age = RVALUE_AGE_GET(obj);
-
-        if (is_pointer_to_heap(&rb_objspace, (void *)obj)) {
-            APPEND_F("%p [%d%s%s%s%s%s%s] %s ",
-                     (void *)obj, age,
-                     C(RVALUE_UNCOLLECTIBLE_BITMAP(obj),  "L"),
-                     C(RVALUE_MARK_BITMAP(obj),           "M"),
-                     C(RVALUE_PIN_BITMAP(obj),            "P"),
-                     C(RVALUE_MARKING_BITMAP(obj),        "R"),
-                     C(RVALUE_WB_UNPROTECTED_BITMAP(obj), "U"),
-                     C(rb_objspace_garbage_object_p(obj), "G"),
-                     obj_type_name(obj));
+        // const int age = RVALUE_AGE_GET(obj);
+
+        if (rb_gc_impl_pointer_to_heap_p(rb_gc_get_objspace(), (void *)obj)) {
+            APPEND_F("%p %s/", (void *)obj, obj_type_name(obj));
+            // TODO: fixme
+            // APPEND_F("%p [%d%s%s%s%s%s%s] %s ",
+            //          (void *)obj, age,
+            //          C(RVALUE_UNCOLLECTIBLE_BITMAP(obj),  "L"),
+            //          C(RVALUE_MARK_BITMAP(obj),           "M"),
+            //          C(RVALUE_PIN_BITMAP(obj),            "P"),
+            //          C(RVALUE_MARKING_BITMAP(obj),        "R"),
+            //          C(RVALUE_WB_UNPROTECTED_BITMAP(obj), "U"),
+            //          C(rb_objspace_garbage_object_p(obj), "G"),
+            //          obj_type_name(obj));
         }
         else {
             /* fake */
-            APPEND_F("%p [%dXXXX] %s",
-                     (void *)obj, age,
-                     obj_type_name(obj));
+            // APPEND_F("%p [%dXXXX] %s",
+            //          (void *)obj, age,
+            //          obj_type_name(obj));
         }
 
         if (internal_object_p(obj)) {
@@ -13499,19 +4753,17 @@ rb_raw_obj_info_common(char *const buff, const size_t buff_size, const VALUE obj
         else if (RTEST(RBASIC(obj)->klass)) {
             VALUE class_path = rb_class_path_cached(RBASIC(obj)->klass);
             if (!NIL_P(class_path)) {
-                APPEND_F("(%s)", RSTRING_PTR(class_path));
+                APPEND_F("%s ", RSTRING_PTR(class_path));
             }
         }
-
-#if GC_DEBUG
-        APPEND_F("@%s:%d", RANY(obj)->file, RANY(obj)->line);
-#endif
     }
   end:
 
     return pos;
 }
 
+const char *rb_raw_obj_info(char *const buff, const size_t buff_size, VALUE obj);
+
 static size_t
 rb_raw_obj_info_buitin_type(char *const buff, const size_t buff_size, const VALUE obj, size_t pos)
 {
@@ -13566,7 +4818,7 @@ rb_raw_obj_info_buitin_type(char *const buff, const size_t buff_size, const VALU
             break;
           }
           case T_MOVED: {
-            APPEND_F("-> %p", (void*)rb_gc_location(obj));
+            APPEND_F("-> %p", (void*)gc_location_internal(rb_gc_get_objspace(), obj));
             break;
           }
           case T_HASH: {
@@ -13597,14 +4849,20 @@ rb_raw_obj_info_buitin_type(char *const buff, const size_t buff_size, const VALU
             }
           case T_OBJECT:
             {
-                uint32_t len = ROBJECT_IV_CAPACITY(obj);
-
-                if (RANY(obj)->as.basic.flags & ROBJECT_EMBED) {
-                    APPEND_F("(embed) len:%d", len);
+                if (rb_shape_obj_too_complex_p(obj)) {
+                    size_t hash_len = rb_st_table_size(ROBJECT_FIELDS_HASH(obj));
+                    APPEND_F("(too_complex) len:%zu", hash_len);
                 }
                 else {
-                    VALUE *ptr = ROBJECT_IVPTR(obj);
-                    APPEND_F("len:%d ptr:%p", len, (void *)ptr);
+                    uint32_t len = ROBJECT_FIELDS_CAPACITY(obj);
+
+                    if (RBASIC(obj)->flags & ROBJECT_EMBED) {
+                        APPEND_F("(embed) len:%d", len);
+                    }
+                    else {
+                        VALUE *ptr = ROBJECT_FIELDS(obj);
+                        APPEND_F("len:%d ptr:%p", len, (void *)ptr);
+                    }
                 }
             }
             break;
@@ -13637,9 +4895,9 @@ rb_raw_obj_info_buitin_type(char *const buff, const size_t buff_size, const VALU
             switch (imemo_type(obj)) {
               case imemo_ment:
                 {
-                    const rb_method_entry_t *me = &RANY(obj)->as.imemo.ment;
+                    const rb_method_entry_t *me = (const rb_method_entry_t *)obj;
 
-                    APPEND_F(":%s (%s%s%s%s) type:%s alias:%d owner:%p defined_class:%p",
+                    APPEND_F(":%s (%s%s%s%s) type:%s aliased:%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",
@@ -13647,7 +4905,7 @@ rb_raw_obj_info_buitin_type(char *const buff, const size_t buff_size, const VALU
                              METHOD_ENTRY_CACHED(me) ? ",cc" : "",
                              METHOD_ENTRY_INVALIDATED(me) ? ",inv" : "",
                              me->def ? rb_method_type_name(me->def->type) : "NULL",
-                             me->def ? me->def->alias_count : -1,
+                             me->def ? me->def->aliased : -1,
                              (void *)me->owner, // obj_info(me->owner),
                              (void *)me->defined_class); //obj_info(me->defined_class)));
 
@@ -13691,7 +4949,7 @@ rb_raw_obj_info_buitin_type(char *const buff, const size_t buff_size, const VALU
                              cme ? rb_id2name(cme->called_id) : "<NULL>",
                              cme ? (METHOD_ENTRY_INVALIDATED(cme) ? " [inv]" : "") : "",
                              (void *)cme,
-                             (void *)vm_cc_call(cc));
+                             (void *)(uintptr_t)vm_cc_call(cc));
                     break;
                 }
               default:
@@ -13704,179 +4962,508 @@ rb_raw_obj_info_buitin_type(char *const buff, const size_t buff_size, const VALU
     }
   end:
 
-    return pos;
+    return pos;
+}
+
+#undef C
+
+#ifdef RUBY_ASAN_ENABLED
+void
+rb_asan_poison_object(VALUE obj)
+{
+    MAYBE_UNUSED(struct RVALUE *) ptr = (void *)obj;
+    asan_poison_memory_region(ptr, rb_gc_obj_slot_size(obj));
+}
+
+void
+rb_asan_unpoison_object(VALUE obj, bool newobj_p)
+{
+    MAYBE_UNUSED(struct RVALUE *) ptr = (void *)obj;
+    asan_unpoison_memory_region(ptr, rb_gc_obj_slot_size(obj), newobj_p);
+}
+
+void *
+rb_asan_poisoned_object_p(VALUE obj)
+{
+    MAYBE_UNUSED(struct RVALUE *) ptr = (void *)obj;
+    return __asan_region_is_poisoned(ptr, rb_gc_obj_slot_size(obj));
+}
+#endif
+
+static void
+raw_obj_info(char *const buff, const size_t buff_size, VALUE obj)
+{
+    size_t pos = rb_raw_obj_info_common(buff, buff_size, obj);
+    pos = rb_raw_obj_info_buitin_type(buff, buff_size, obj, pos);
+    if (pos >= buff_size) {} // truncated
+}
+
+const char *
+rb_raw_obj_info(char *const buff, const size_t buff_size, VALUE obj)
+{
+    void *objspace = rb_gc_get_objspace();
+
+    if (SPECIAL_CONST_P(obj)) {
+        raw_obj_info(buff, buff_size, obj);
+    }
+    else if (!rb_gc_impl_pointer_to_heap_p(objspace, (const void *)obj)) {
+        snprintf(buff, buff_size, "out-of-heap:%p", (void *)obj);
+    }
+#if 0 // maybe no need to check it?
+    else if (0 && rb_gc_impl_garbage_object_p(objspace, obj)) {
+        snprintf(buff, buff_size, "garbage:%p", (void *)obj);
+    }
+#endif
+    else {
+        asan_unpoisoning_object(obj) {
+            raw_obj_info(buff, buff_size, obj);
+        }
+    }
+    return buff;
+}
+
+#undef APPEND_S
+#undef APPEND_F
+#undef BUFF_ARGS
+
+#if RGENGC_OBJ_INFO
+#define OBJ_INFO_BUFFERS_NUM  10
+#define OBJ_INFO_BUFFERS_SIZE 0x100
+static rb_atomic_t obj_info_buffers_index = 0;
+static char obj_info_buffers[OBJ_INFO_BUFFERS_NUM][OBJ_INFO_BUFFERS_SIZE];
+
+/* Increments *var atomically and resets *var to 0 when maxval is
+ * reached. Returns the wraparound old *var value (0...maxval). */
+static rb_atomic_t
+atomic_inc_wraparound(rb_atomic_t *var, const rb_atomic_t maxval)
+{
+    rb_atomic_t oldval = RUBY_ATOMIC_FETCH_ADD(*var, 1);
+    if (RB_UNLIKELY(oldval >= maxval - 1)) { // wraparound *var
+        const rb_atomic_t newval = oldval + 1;
+        RUBY_ATOMIC_CAS(*var, newval, newval % maxval);
+        oldval %= maxval;
+    }
+    return oldval;
+}
+
+static const char *
+obj_info(VALUE obj)
+{
+    rb_atomic_t index = atomic_inc_wraparound(&obj_info_buffers_index, OBJ_INFO_BUFFERS_NUM);
+    char *const buff = obj_info_buffers[index];
+    return rb_raw_obj_info(buff, OBJ_INFO_BUFFERS_SIZE, obj);
+}
+#else
+static const char *
+obj_info(VALUE obj)
+{
+    return obj_type_name(obj);
+}
+#endif
+
+/*
+  ------------------------ Extended allocator ------------------------
+*/
+
+struct gc_raise_tag {
+    VALUE exc;
+    const char *fmt;
+    va_list *ap;
+};
+
+static void *
+gc_vraise(void *ptr)
+{
+    struct gc_raise_tag *argv = ptr;
+    rb_vraise(argv->exc, argv->fmt, *argv->ap);
+    UNREACHABLE_RETURN(NULL);
+}
+
+static void
+gc_raise(VALUE exc, const char *fmt, ...)
+{
+    va_list ap;
+    va_start(ap, fmt);
+    struct gc_raise_tag argv = {
+        exc, fmt, &ap,
+    };
+
+    if (ruby_thread_has_gvl_p()) {
+        gc_vraise(&argv);
+        UNREACHABLE;
+    }
+    else if (ruby_native_thread_p()) {
+        rb_thread_call_with_gvl(gc_vraise, &argv);
+        UNREACHABLE;
+    }
+    else {
+        /* Not in a ruby thread */
+        fprintf(stderr, "%s", "[FATAL] ");
+        vfprintf(stderr, fmt, ap);
+    }
+
+    va_end(ap);
+    abort();
+}
+
+NORETURN(static void negative_size_allocation_error(const char *));
+static void
+negative_size_allocation_error(const char *msg)
+{
+    gc_raise(rb_eNoMemError, "%s", msg);
+}
+
+static void *
+ruby_memerror_body(void *dummy)
+{
+    rb_memerror();
+    return 0;
+}
+
+NORETURN(static void ruby_memerror(void));
+RBIMPL_ATTR_MAYBE_UNUSED()
+static void
+ruby_memerror(void)
+{
+    if (ruby_thread_has_gvl_p()) {
+        rb_memerror();
+    }
+    else {
+        if (ruby_native_thread_p()) {
+            rb_thread_call_with_gvl(ruby_memerror_body, 0);
+        }
+        else {
+            /* no ruby thread */
+            fprintf(stderr, "[FATAL] failed to allocate memory\n");
+        }
+    }
+
+    /* We have discussions whether we should die here; */
+    /* We might rethink about it later. */
+    exit(EXIT_FAILURE);
+}
+
+void
+rb_memerror(void)
+{
+    /* the `GET_VM()->special_exceptions` below assumes that
+     * the VM is reachable from the current thread.  We should
+     * definitely make sure of that. */
+    RUBY_ASSERT_ALWAYS(ruby_thread_has_gvl_p());
+
+    rb_execution_context_t *ec = GET_EC();
+    VALUE exc = GET_VM()->special_exceptions[ruby_error_nomemory];
+
+    if (!exc ||
+        rb_ec_raised_p(ec, RAISED_NOMEMORY) ||
+        rb_ec_vm_lock_rec(ec) != ec->tag->lock_rec) {
+        fprintf(stderr, "[FATAL] failed to allocate memory\n");
+        exit(EXIT_FAILURE);
+    }
+    if (rb_ec_raised_p(ec, RAISED_NOMEMORY)) {
+        rb_ec_raised_clear(ec);
+    }
+    else {
+        rb_ec_raised_set(ec, RAISED_NOMEMORY);
+        exc = ruby_vm_special_exception_copy(exc);
+    }
+    ec->errinfo = exc;
+    EC_JUMP_TAG(ec, TAG_RAISE);
+}
+
+bool
+rb_memerror_reentered(void)
+{
+    rb_execution_context_t *ec = GET_EC();
+    return (ec && rb_ec_raised_p(ec, RAISED_NOMEMORY));
+}
+
+static void *
+handle_malloc_failure(void *ptr)
+{
+    if (LIKELY(ptr)) {
+        return ptr;
+    }
+    else {
+        ruby_memerror();
+        UNREACHABLE_RETURN(ptr);
+    }
+}
+
+static void *ruby_xmalloc_body(size_t size);
+
+void *
+ruby_xmalloc(size_t size)
+{
+    return handle_malloc_failure(ruby_xmalloc_body(size));
+}
+
+static void *
+ruby_xmalloc_body(size_t size)
+{
+    if ((ssize_t)size < 0) {
+        negative_size_allocation_error("too large allocation size");
+    }
+
+    return rb_gc_impl_malloc(rb_gc_get_objspace(), size);
+}
+
+void
+ruby_malloc_size_overflow(size_t count, size_t elsize)
+{
+    rb_raise(rb_eArgError,
+             "malloc: possible integer overflow (%"PRIuSIZE"*%"PRIuSIZE")",
+             count, elsize);
+}
+
+void
+ruby_malloc_add_size_overflow(size_t x, size_t y)
+{
+    rb_raise(rb_eArgError,
+             "malloc: possible integer overflow (%"PRIuSIZE"+%"PRIuSIZE")",
+             x, y);
+}
+
+static void *ruby_xmalloc2_body(size_t n, size_t size);
+
+void *
+ruby_xmalloc2(size_t n, size_t size)
+{
+    return handle_malloc_failure(ruby_xmalloc2_body(n, size));
+}
+
+static void *
+ruby_xmalloc2_body(size_t n, size_t size)
+{
+    return rb_gc_impl_malloc(rb_gc_get_objspace(), xmalloc2_size(n, size));
+}
+
+static void *ruby_xcalloc_body(size_t n, size_t size);
+
+void *
+ruby_xcalloc(size_t n, size_t size)
+{
+    return handle_malloc_failure(ruby_xcalloc_body(n, size));
+}
+
+static void *
+ruby_xcalloc_body(size_t n, size_t size)
+{
+    return rb_gc_impl_calloc(rb_gc_get_objspace(), xmalloc2_size(n, size));
 }
 
-#undef TF
-#undef C
+static void *ruby_sized_xrealloc_body(void *ptr, size_t new_size, size_t old_size);
 
-const char *
-rb_raw_obj_info(char *const buff, const size_t buff_size, VALUE obj)
+#ifdef ruby_sized_xrealloc
+#undef ruby_sized_xrealloc
+#endif
+void *
+ruby_sized_xrealloc(void *ptr, size_t new_size, size_t old_size)
+{
+    return handle_malloc_failure(ruby_sized_xrealloc_body(ptr, new_size, old_size));
+}
+
+static void *
+ruby_sized_xrealloc_body(void *ptr, size_t new_size, size_t old_size)
 {
-    asan_unpoisoning_object(obj) {
-        size_t pos = rb_raw_obj_info_common(buff, buff_size, obj);
-        pos = rb_raw_obj_info_buitin_type(buff, buff_size, obj, pos);
-        if (pos >= buff_size) {} // truncated
+    if ((ssize_t)new_size < 0) {
+        negative_size_allocation_error("too large allocation size");
     }
 
-    return buff;
+    return rb_gc_impl_realloc(rb_gc_get_objspace(), ptr, new_size, old_size);
 }
 
-#undef APPEND_S
-#undef APPEND_F
-#undef BUFF_ARGS
+void *
+ruby_xrealloc(void *ptr, size_t new_size)
+{
+    return ruby_sized_xrealloc(ptr, new_size, 0);
+}
 
-#if RGENGC_OBJ_INFO
-#define OBJ_INFO_BUFFERS_NUM  10
-#define OBJ_INFO_BUFFERS_SIZE 0x100
-static rb_atomic_t obj_info_buffers_index = 0;
-static char obj_info_buffers[OBJ_INFO_BUFFERS_NUM][OBJ_INFO_BUFFERS_SIZE];
+static void *ruby_sized_xrealloc2_body(void *ptr, size_t n, size_t size, size_t old_n);
 
-/* Increments *var atomically and resets *var to 0 when maxval is
- * reached. Returns the wraparound old *var value (0...maxval). */
-static rb_atomic_t
-atomic_inc_wraparound(rb_atomic_t *var, const rb_atomic_t maxval)
+#ifdef ruby_sized_xrealloc2
+#undef ruby_sized_xrealloc2
+#endif
+void *
+ruby_sized_xrealloc2(void *ptr, size_t n, size_t size, size_t old_n)
 {
-    rb_atomic_t oldval = RUBY_ATOMIC_FETCH_ADD(*var, 1);
-    if (UNLIKELY(oldval >= maxval - 1)) { // wraparound *var
-        const rb_atomic_t newval = oldval + 1;
-        RUBY_ATOMIC_CAS(*var, newval, newval % maxval);
-        oldval %= maxval;
-    }
-    return oldval;
+    return handle_malloc_failure(ruby_sized_xrealloc2_body(ptr, n, size, old_n));
 }
 
-static const char *
-obj_info(VALUE obj)
+static void *
+ruby_sized_xrealloc2_body(void *ptr, size_t n, size_t size, size_t old_n)
 {
-    rb_atomic_t index = atomic_inc_wraparound(&obj_info_buffers_index, OBJ_INFO_BUFFERS_NUM);
-    char *const buff = obj_info_buffers[index];
-    return rb_raw_obj_info(buff, OBJ_INFO_BUFFERS_SIZE, obj);
+    size_t len = xmalloc2_size(n, size);
+    return rb_gc_impl_realloc(rb_gc_get_objspace(), ptr, len, old_n * size);
 }
-#else
-static const char *
-obj_info(VALUE obj)
+
+void *
+ruby_xrealloc2(void *ptr, size_t n, size_t size)
 {
-    return obj_type_name(obj);
+    return ruby_sized_xrealloc2(ptr, n, size, 0);
 }
-#endif
 
-const char *
-rb_obj_info(VALUE obj)
+#ifdef ruby_sized_xfree
+#undef ruby_sized_xfree
+#endif
+void
+ruby_sized_xfree(void *x, size_t size)
 {
-    return obj_info(obj);
+    if (LIKELY(x)) {
+        /* It's possible for a C extension's pthread destructor function set by pthread_key_create
+         * to be called after ruby_vm_destruct and attempt to free memory. Fall back to mimfree in
+         * that case. */
+        if (LIKELY(GET_VM())) {
+            rb_gc_impl_free(rb_gc_get_objspace(), x, size);
+        }
+        else {
+            ruby_mimfree(x);
+        }
+    }
 }
 
 void
-rb_obj_info_dump(VALUE obj)
+ruby_xfree(void *x)
 {
-    char buff[0x100];
-    fprintf(stderr, "rb_obj_info_dump: %s\n", rb_raw_obj_info(buff, 0x100, obj));
+    ruby_sized_xfree(x, 0);
 }
 
-void
-rb_obj_info_dump_loc(VALUE obj, const char *file, int line, const char *func)
+void *
+rb_xmalloc_mul_add(size_t x, size_t y, size_t z) /* x * y + z */
 {
-    char buff[0x100];
-    fprintf(stderr, "<OBJ_INFO:%s@%s:%d> %s\n", func, file, line, rb_raw_obj_info(buff, 0x100, obj));
+    size_t w = size_mul_add_or_raise(x, y, z, rb_eArgError);
+    return ruby_xmalloc(w);
+}
+
+void *
+rb_xcalloc_mul_add(size_t x, size_t y, size_t z) /* x * y + z */
+{
+    size_t w = size_mul_add_or_raise(x, y, z, rb_eArgError);
+    return ruby_xcalloc(w, 1);
 }
 
-#if GC_DEBUG
+void *
+rb_xrealloc_mul_add(const void *p, size_t x, size_t y, size_t z) /* x * y + z */
+{
+    size_t w = size_mul_add_or_raise(x, y, z, rb_eArgError);
+    return ruby_xrealloc((void *)p, w);
+}
 
-void
-rb_gcdebug_print_obj_condition(VALUE obj)
+void *
+rb_xmalloc_mul_add_mul(size_t x, size_t y, size_t z, size_t w) /* x * y + z * w */
 {
-    rb_objspace_t *objspace = &rb_objspace;
+    size_t u = size_mul_add_mul_or_raise(x, y, z, w, rb_eArgError);
+    return ruby_xmalloc(u);
+}
 
-    fprintf(stderr, "created at: %s:%d\n", RANY(obj)->file, RANY(obj)->line);
+void *
+rb_xcalloc_mul_add_mul(size_t x, size_t y, size_t z, size_t w) /* x * y + z * w */
+{
+    size_t u = size_mul_add_mul_or_raise(x, y, z, w, rb_eArgError);
+    return ruby_xcalloc(u, 1);
+}
 
-    if (BUILTIN_TYPE(obj) == T_MOVED) {
-        fprintf(stderr, "moved?: true\n");
-    }
-    else {
-        fprintf(stderr, "moved?: false\n");
-    }
-    if (is_pointer_to_heap(objspace, (void *)obj)) {
-        fprintf(stderr, "pointer to heap?: true\n");
+/* Mimic ruby_xmalloc, but need not rb_objspace.
+ * should return pointer suitable for ruby_xfree
+ */
+void *
+ruby_mimmalloc(size_t size)
+{
+    void *mem;
+#if CALC_EXACT_MALLOC_SIZE
+    size += sizeof(struct malloc_obj_info);
+#endif
+    mem = malloc(size);
+#if CALC_EXACT_MALLOC_SIZE
+    if (!mem) {
+        return NULL;
     }
-    else {
-        fprintf(stderr, "pointer to heap?: false\n");
-        return;
+    else
+    /* set 0 for consistency of allocated_size/allocations */
+    {
+        struct malloc_obj_info *info = mem;
+        info->size = 0;
+        mem = info + 1;
     }
+#endif
+    return mem;
+}
 
-    fprintf(stderr, "marked?      : %s\n", MARKED_IN_BITMAP(GET_HEAP_MARK_BITS(obj), obj) ? "true" : "false");
-    fprintf(stderr, "pinned?      : %s\n", MARKED_IN_BITMAP(GET_HEAP_PINNED_BITS(obj), obj) ? "true" : "false");
-    fprintf(stderr, "age?         : %d\n", RVALUE_AGE_GET(obj));
-    fprintf(stderr, "old?         : %s\n", RVALUE_OLD_P(obj) ? "true" : "false");
-    fprintf(stderr, "WB-protected?: %s\n", RVALUE_WB_UNPROTECTED(obj) ? "false" : "true");
-    fprintf(stderr, "remembered?  : %s\n", RVALUE_REMEMBERED(obj) ? "true" : "false");
-
-    if (is_lazy_sweeping(objspace)) {
-        fprintf(stderr, "lazy sweeping?: true\n");
-        fprintf(stderr, "swept?: %s\n", is_swept_object(obj) ? "done" : "not yet");
+void *
+ruby_mimcalloc(size_t num, size_t size)
+{
+    void *mem;
+#if CALC_EXACT_MALLOC_SIZE
+    struct rbimpl_size_mul_overflow_tag t = rbimpl_size_mul_overflow(num, size);
+    if (UNLIKELY(t.left)) {
+        return NULL;
     }
-    else {
-        fprintf(stderr, "lazy sweeping?: false\n");
+    size = t.right + sizeof(struct malloc_obj_info);
+    mem = calloc1(size);
+    if (!mem) {
+        return NULL;
+    }
+    else
+    /* set 0 for consistency of allocated_size/allocations */
+    {
+        struct malloc_obj_info *info = mem;
+        info->size = 0;
+        mem = info + 1;
     }
+#else
+    mem = calloc(num, size);
+#endif
+    return mem;
 }
 
-static VALUE
-gcdebug_sentinel(RB_BLOCK_CALL_FUNC_ARGLIST(obj, name))
+void
+ruby_mimfree(void *ptr)
 {
-    fprintf(stderr, "WARNING: object %s(%p) is inadvertently collected\n", (char *)name, (void *)obj);
-    return Qnil;
+#if CALC_EXACT_MALLOC_SIZE
+    struct malloc_obj_info *info = (struct malloc_obj_info *)ptr - 1;
+    ptr = info;
+#endif
+    free(ptr);
 }
 
 void
-rb_gcdebug_sentinel(VALUE obj, const char *name)
+rb_gc_adjust_memory_usage(ssize_t diff)
 {
-    rb_define_finalizer(obj, rb_proc_new(gcdebug_sentinel, (VALUE)name));
+    unless_objspace(objspace) { return; }
+
+    rb_gc_impl_adjust_memory_usage(objspace, diff);
 }
 
-#endif /* GC_DEBUG */
+const char *
+rb_obj_info(VALUE obj)
+{
+    return obj_info(obj);
+}
 
-/*
- *  call-seq:
- *    GC.add_stress_to_class(class[, ...])
- *
- *  Raises NoMemoryError when allocating an instance of the given classes.
- *
- */
-static VALUE
-rb_gcdebug_add_stress_to_class(int argc, VALUE *argv, VALUE self)
+void
+rb_obj_info_dump(VALUE obj)
 {
-    rb_objspace_t *objspace = &rb_objspace;
+    char buff[0x100];
+    fprintf(stderr, "rb_obj_info_dump: %s\n", rb_raw_obj_info(buff, 0x100, obj));
+}
 
-    if (!stress_to_class) {
-        set_stress_to_class(rb_ary_hidden_new(argc));
-    }
-    rb_ary_cat(stress_to_class, argv, argc);
-    return self;
+void
+rb_obj_info_dump_loc(VALUE obj, const char *file, int line, const char *func)
+{
+    char buff[0x100];
+    fprintf(stderr, "<OBJ_INFO:%s@%s:%d> %s\n", func, file, line, rb_raw_obj_info(buff, 0x100, obj));
 }
 
-/*
- *  call-seq:
- *    GC.remove_stress_to_class(class[, ...])
- *
- *  No longer raises NoMemoryError when allocating an instance of the
- *  given classes.
- *
- */
-static VALUE
-rb_gcdebug_remove_stress_to_class(int argc, VALUE *argv, VALUE self)
+void
+rb_gc_before_fork(void)
 {
-    rb_objspace_t *objspace = &rb_objspace;
-    int i;
+    rb_gc_impl_before_fork(rb_gc_get_objspace());
+}
 
-    if (stress_to_class) {
-        for (i = 0; i < argc; ++i) {
-            rb_ary_delete_same(stress_to_class, argv[i]);
-        }
-        if (RARRAY_LEN(stress_to_class) == 0) {
-            set_stress_to_class(0);
-        }
-    }
-    return Qnil;
+void
+rb_gc_after_fork(rb_pid_t pid)
+{
+    rb_gc_impl_after_fork(rb_gc_get_objspace(), pid);
 }
 
 /*
@@ -13887,10 +5474,9 @@ rb_gcdebug_remove_stress_to_class(int argc, VALUE *argv, VALUE self)
  *  traverse all living objects with an iterator.
  *
  *  ObjectSpace also provides support for object finalizers, procs that will be
- *  called when a specific object is about to be destroyed by garbage
- *  collection. See the documentation for
- *  <code>ObjectSpace.define_finalizer</code> for important information on
- *  how to use this method correctly.
+ *  called after a specific object was destroyed by garbage collection.  See
+ *  the documentation for +ObjectSpace.define_finalizer+ for important
+ *  information on how to use this method correctly.
  *
  *     a = "A"
  *     b = "B"
@@ -13931,41 +5517,13 @@ void
 Init_GC(void)
 {
 #undef rb_intern
-    VALUE rb_mObjSpace;
-    VALUE rb_mProfiler;
-    VALUE gc_constants;
+    rb_gc_register_address(&id2ref_value);
+
+    malloc_offset = gc_compute_malloc_offset();
 
     rb_mGC = rb_define_module("GC");
 
-    gc_constants = rb_hash_new();
-    rb_hash_aset(gc_constants, ID2SYM(rb_intern("DEBUG")), RBOOL(GC_DEBUG));
-    rb_hash_aset(gc_constants, ID2SYM(rb_intern("BASE_SLOT_SIZE")), SIZET2NUM(BASE_SLOT_SIZE - RVALUE_OVERHEAD));
-    rb_hash_aset(gc_constants, ID2SYM(rb_intern("RVALUE_OVERHEAD")), SIZET2NUM(RVALUE_OVERHEAD));
-    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));
-    rb_hash_aset(gc_constants, ID2SYM(rb_intern("HEAP_PAGE_SIZE")), SIZET2NUM(HEAP_PAGE_SIZE));
-    rb_hash_aset(gc_constants, ID2SYM(rb_intern("SIZE_POOL_COUNT")), LONG2FIX(SIZE_POOL_COUNT));
-    rb_hash_aset(gc_constants, ID2SYM(rb_intern("RVARGC_MAX_ALLOCATE_SIZE")), LONG2FIX(size_pool_slot_size(SIZE_POOL_COUNT - 1)));
-    rb_hash_aset(gc_constants, ID2SYM(rb_intern("RVALUE_OLD_AGE")), LONG2FIX(RVALUE_OLD_AGE));
-    if (RB_BUG_INSTEAD_OF_RB_MEMERROR+0) {
-        rb_hash_aset(gc_constants, ID2SYM(rb_intern("RB_BUG_INSTEAD_OF_RB_MEMERROR")), Qtrue);
-    }
-    OBJ_FREEZE(gc_constants);
-    /* Internal constants in the garbage collector. */
-    rb_define_const(rb_mGC, "INTERNAL_CONSTANTS", gc_constants);
-
-    rb_mProfiler = rb_define_module_under(rb_mGC, "Profiler");
-    rb_define_singleton_method(rb_mProfiler, "enabled?", gc_profile_enable_get, 0);
-    rb_define_singleton_method(rb_mProfiler, "enable", gc_profile_enable, 0);
-    rb_define_singleton_method(rb_mProfiler, "raw_data", gc_profile_record_get, 0);
-    rb_define_singleton_method(rb_mProfiler, "disable", gc_profile_disable, 0);
-    rb_define_singleton_method(rb_mProfiler, "clear", gc_profile_clear, 0);
-    rb_define_singleton_method(rb_mProfiler, "result", gc_profile_result, 0);
-    rb_define_singleton_method(rb_mProfiler, "report", gc_profile_report, -1);
-    rb_define_singleton_method(rb_mProfiler, "total_time", gc_profile_total_time, 0);
-
-    rb_mObjSpace = rb_define_module("ObjectSpace");
+    VALUE rb_mObjSpace = rb_define_module("ObjectSpace");
 
     rb_define_module_function(rb_mObjSpace, "each_object", os_each_obj, -1);
 
@@ -13981,118 +5539,38 @@ Init_GC(void)
 
     rb_define_module_function(rb_mObjSpace, "count_objects", count_objects, -1);
 
-    /* internal methods */
-    rb_define_singleton_method(rb_mGC, "verify_internal_consistency", gc_verify_internal_consistency_m, 0);
-#if MALLOC_ALLOCATED_SIZE
-    rb_define_singleton_method(rb_mGC, "malloc_allocated_size", gc_malloc_allocated_size, 0);
-    rb_define_singleton_method(rb_mGC, "malloc_allocations", gc_malloc_allocations, 0);
-#endif
-
-    if (GC_COMPACTION_SUPPORTED) {
-        rb_define_singleton_method(rb_mGC, "compact", gc_compact, 0);
-        rb_define_singleton_method(rb_mGC, "auto_compact", gc_get_auto_compact, 0);
-        rb_define_singleton_method(rb_mGC, "auto_compact=", gc_set_auto_compact, 1);
-        rb_define_singleton_method(rb_mGC, "latest_compact_info", gc_compact_stats, 0);
-    }
-    else {
-        rb_define_singleton_method(rb_mGC, "compact", rb_f_notimplement, 0);
-        rb_define_singleton_method(rb_mGC, "auto_compact", rb_f_notimplement, 0);
-        rb_define_singleton_method(rb_mGC, "auto_compact=", rb_f_notimplement, 1);
-        rb_define_singleton_method(rb_mGC, "latest_compact_info", rb_f_notimplement, 0);
-        /* When !GC_COMPACTION_SUPPORTED, this method is not defined in gc.rb */
-        rb_define_singleton_method(rb_mGC, "verify_compaction_references", rb_f_notimplement, -1);
-    }
-
-    if (GC_DEBUG_STRESS_TO_CLASS) {
-        rb_define_singleton_method(rb_mGC, "add_stress_to_class", rb_gcdebug_add_stress_to_class, -1);
-        rb_define_singleton_method(rb_mGC, "remove_stress_to_class", rb_gcdebug_remove_stress_to_class, -1);
-    }
-
-    {
-        VALUE opts;
-        /* \GC build options */
-        rb_define_const(rb_mGC, "OPTS", opts = rb_ary_new());
-#define OPT(o) if (o) rb_ary_push(opts, rb_fstring_lit(#o))
-        OPT(GC_DEBUG);
-        OPT(USE_RGENGC);
-        OPT(RGENGC_DEBUG);
-        OPT(RGENGC_CHECK_MODE);
-        OPT(RGENGC_PROFILE);
-        OPT(RGENGC_ESTIMATE_OLDMALLOC);
-        OPT(GC_PROFILE_MORE_DETAIL);
-        OPT(GC_ENABLE_LAZY_SWEEP);
-        OPT(CALC_EXACT_MALLOC_SIZE);
-        OPT(MALLOC_ALLOCATED_SIZE);
-        OPT(MALLOC_ALLOCATED_SIZE_CHECK);
-        OPT(GC_PROFILE_DETAIL_MEMORY);
-        OPT(GC_COMPACTION_SUPPORTED);
-#undef OPT
-        OBJ_FREEZE(opts);
-    }
-}
-
-#ifdef ruby_xmalloc
-#undef ruby_xmalloc
-#endif
-#ifdef ruby_xmalloc2
-#undef ruby_xmalloc2
-#endif
-#ifdef ruby_xcalloc
-#undef ruby_xcalloc
-#endif
-#ifdef ruby_xrealloc
-#undef ruby_xrealloc
-#endif
-#ifdef ruby_xrealloc2
-#undef ruby_xrealloc2
-#endif
-
-void *
-ruby_xmalloc(size_t size)
-{
-#if USE_GC_MALLOC_OBJ_INFO_DETAILS
-    ruby_malloc_info_file = __FILE__;
-    ruby_malloc_info_line = __LINE__;
-#endif
-    return ruby_xmalloc_body(size);
-}
-
-void *
-ruby_xmalloc2(size_t n, size_t size)
-{
-#if USE_GC_MALLOC_OBJ_INFO_DETAILS
-    ruby_malloc_info_file = __FILE__;
-    ruby_malloc_info_line = __LINE__;
-#endif
-    return ruby_xmalloc2_body(n, size);
-}
-
-void *
-ruby_xcalloc(size_t n, size_t size)
-{
-#if USE_GC_MALLOC_OBJ_INFO_DETAILS
-    ruby_malloc_info_file = __FILE__;
-    ruby_malloc_info_line = __LINE__;
-#endif
-    return ruby_xcalloc_body(n, size);
-}
-
-void *
-ruby_xrealloc(void *ptr, size_t new_size)
-{
-#if USE_GC_MALLOC_OBJ_INFO_DETAILS
-    ruby_malloc_info_file = __FILE__;
-    ruby_malloc_info_line = __LINE__;
-#endif
-    return ruby_xrealloc_body(ptr, new_size);
-}
-
-void *
-ruby_xrealloc2(void *ptr, size_t n, size_t new_size)
-{
-#if USE_GC_MALLOC_OBJ_INFO_DETAILS
-    ruby_malloc_info_file = __FILE__;
-    ruby_malloc_info_line = __LINE__;
+    rb_gc_impl_init();
+}
+
+// Set a name for the anonymous virtual memory area. `addr` is the starting
+// address of the area and `size` is its length in bytes. `name` is a
+// NUL-terminated human-readable string.
+//
+// This function is usually called after calling `mmap()`.  The human-readable
+// annotation helps developers identify the call site of `mmap()` that created
+// the memory mapping.
+//
+// This function currently only works on Linux 5.17 or higher.  After calling
+// this function, we can see annotations in the form of "[anon:...]" in
+// `/proc/self/maps`, where `...` is the content of `name`.  This function has
+// no effect when called on other platforms.
+void
+ruby_annotate_mmap(const void *addr, unsigned long size, const char *name)
+{
+#if defined(HAVE_SYS_PRCTL_H) && defined(PR_SET_VMA) && defined(PR_SET_VMA_ANON_NAME)
+    // The name length cannot exceed 80 (including the '\0').
+    RUBY_ASSERT(strlen(name) < 80);
+    prctl(PR_SET_VMA, PR_SET_VMA_ANON_NAME, (unsigned long)addr, size, name);
+    // We ignore errors in prctl. prctl may set errno to EINVAL for several
+    // reasons.
+    // 1. The attr (PR_SET_VMA_ANON_NAME) is not a valid attribute.
+    // 2. addr is an invalid address.
+    // 3. The string pointed by name is too long.
+    // The first error indicates PR_SET_VMA_ANON_NAME is not available, and may
+    // happen if we run the compiled binary on an old kernel.  In theory, all
+    // other errors should result in a failure.  But since EINVAL cannot tell
+    // the first error from others, and this function is mainly used for
+    // debugging, we silently ignore the error.
+    errno = 0;
 #endif
-    return ruby_xrealloc2_body(ptr, n, new_size);
 }
diff --git a/gc.rb b/gc.rb
index c3b104454cb715..d3bb8db036b1cb 100644
--- a/gc.rb
+++ b/gc.rb
@@ -1,190 +1,186 @@
 # for gc.c
 
-#  The \GC module provides an interface to Ruby's mark and
-#  sweep garbage collection mechanism.
+#  The \GC module provides an interface to Ruby's mark-and-sweep garbage collection mechanism.
 #
-#  Some of the underlying methods are also available via the ObjectSpace
-#  module.
+#  Some of the underlying methods are also available via the ObjectSpace module.
 #
-#  You may obtain information about the operation of the \GC through
-#  GC::Profiler.
+#  You may obtain information about the operation of the \GC through GC::Profiler.
 module GC
 
   # Initiates garbage collection, even if manually disabled.
   #
   # The +full_mark+ keyword argument determines whether or not to perform a
   # major garbage collection cycle. When set to +true+, a major garbage
-  # collection cycle is ran, meaning all objects are marked. When set to
-  # +false+, a minor garbage collection cycle is ran, meaning only young
+  # collection cycle is run, meaning all objects are marked. When set to
+  # +false+, a minor garbage collection cycle is run, meaning only young
   # objects are marked.
   #
   # The +immediate_mark+ keyword argument determines whether or not to perform
   # incremental marking. When set to +true+, marking is completed during the
   # call to this method. When set to +false+, marking is performed in steps
-  # that is interleaved with future Ruby code execution, so marking might not
-  # be completed during this method call. Note that if +full_mark+ is +false+
+  # that are interleaved with future Ruby code execution, so marking might not
+  # be completed during this method call. Note that if +full_mark+ is +false+,
   # then marking will always be immediate, regardless of the value of
   # +immediate_mark+.
   #
-  # The +immedate_sweep+ keyword argument determines whether or not to defer
-  # sweeping (using lazy sweep). When set to +true+, sweeping is performed in
-  # steps that is interleaved with future Ruby code execution, so sweeping might
-  # not be completed during this method call. When set to +false+, sweeping is
+  # The +immediate_sweep+ keyword argument determines whether or not to defer
+  # sweeping (using lazy sweep). When set to +false+, sweeping is performed in
+  # steps that are interleaved with future Ruby code execution, so sweeping might
+  # not be completed during this method call. When set to +true+, sweeping is
   # completed during the call to this method.
   #
-  # Note: These keyword arguments are implementation and version dependent. They
-  # are not guaranteed to be future-compatible, and may be ignored if the
+  # Note: These keyword arguments are implementation and version-dependent. They
+  # are not guaranteed to be future-compatible and may be ignored if the
   # underlying implementation does not support them.
   def self.start full_mark: true, immediate_mark: true, immediate_sweep: true
     Primitive.gc_start_internal full_mark, immediate_mark, immediate_sweep, false
   end
 
+  # Alias of GC.start
   def garbage_collect full_mark: true, immediate_mark: true, immediate_sweep: true
     Primitive.gc_start_internal full_mark, immediate_mark, immediate_sweep, false
   end
 
-  #  call-seq:
-  #     GC.enable    -> true or false
+  # call-seq:
+  #    GC.enable -> true or false
   #
-  #  Enables garbage collection, returning +true+ if garbage
-  #  collection was previously disabled.
+  # Enables garbage collection, returning +true+ if garbage
+  # collection was previously disabled.
   #
-  #     GC.disable   #=> false
-  #     GC.enable    #=> true
-  #     GC.enable    #=> false
+  #    GC.disable   #=> false
+  #    GC.enable    #=> true
+  #    GC.enable    #=> false
   #
   def self.enable
     Primitive.gc_enable
   end
 
-  #  call-seq:
-  #     GC.disable    -> true or false
+  # call-seq:
+  #    GC.disable -> true or false
   #
-  #  Disables garbage collection, returning +true+ if garbage
-  #  collection was already disabled.
+  # Disables garbage collection, returning +true+ if garbage
+  # collection was already disabled.
   #
-  #     GC.disable   #=> false
-  #     GC.disable   #=> true
+  #    GC.disable   #=> false
+  #    GC.disable   #=> true
   def self.disable
     Primitive.gc_disable
   end
 
-  #  call-seq:
-  #    GC.stress	    -> integer, true or false
+  # call-seq:
+  #   GC.stress -> integer, true, or false
   #
-  #  Returns current status of \GC stress mode.
+  # Returns the current status of \GC stress mode.
   def self.stress
     Primitive.gc_stress_get
   end
 
-  #  call-seq:
-  #    GC.stress = flag          -> flag
+  # call-seq:
+  #   GC.stress = flag -> flag
   #
-  #  Updates the \GC stress mode.
+  # Updates the \GC stress mode.
   #
-  #  When stress mode is enabled, the \GC is invoked at every \GC opportunity:
-  #  all memory and object allocations.
+  # When stress mode is enabled, the \GC is invoked at every \GC opportunity:
+  # all memory and object allocations.
   #
-  #  Enabling stress mode will degrade performance, it is only for debugging.
+  # Enabling stress mode will degrade performance; it is only for debugging.
   #
-  #  flag can be true, false, or an integer bit-ORed following flags.
-  #    0x01:: no major GC
-  #    0x02:: no immediate sweep
-  #    0x04:: full mark after malloc/calloc/realloc
+  # The flag can be true, false, or an integer bitwise-ORed with the following flags:
+  #   0x01:: no major GC
+  #   0x02:: no immediate sweep
+  #   0x04:: full mark after malloc/calloc/realloc
   def self.stress=(flag)
     Primitive.gc_stress_set_m flag
   end
 
-  #  call-seq:
-  #     GC.count -> Integer
-  #
-  #  The number of times \GC occurred.
+  # call-seq:
+  #    GC.count -> Integer
   #
-  #  It returns the number of times \GC occurred since the process started.
+  # Returns the number of times \GC has occurred since the process started.
   def self.count
     Primitive.gc_count
   end
 
-  #  call-seq:
-  #     GC.stat -> Hash
-  #     GC.stat(hash) -> Hash
-  #     GC.stat(:key) -> Numeric
-  #
-  #  Returns a Hash containing information about the \GC.
-  #
-  #  The contents of the hash are implementation specific and may change in
-  #  the future without notice.
-  #
-  #  The hash includes information about internal statistics about \GC such as:
-  #
-  #  [count]
-  #    The total number of garbage collections ran since application start
-  #    (count includes both minor and major garbage collections)
-  #  [time]
-  #    The total time spent in garbage collections (in milliseconds)
-  #  [heap_allocated_pages]
-  #    The total number of +:heap_eden_pages+ + +:heap_tomb_pages+
-  #  [heap_sorted_length]
-  #    The number of pages that can fit into the buffer that holds references to
-  #    all pages
-  #  [heap_allocatable_pages]
-  #    The total number of pages the application could allocate without additional \GC
-  #  [heap_available_slots]
-  #    The total number of slots in all +:heap_allocated_pages+
-  #  [heap_live_slots]
-  #    The total number of slots which contain live objects
-  #  [heap_free_slots]
-  #    The total number of slots which do not contain live objects
-  #  [heap_final_slots]
-  #    The total number of slots with pending finalizers to be run
-  #  [heap_marked_slots]
-  #    The total number of objects marked in the last \GC
-  #  [heap_eden_pages]
-  #    The total number of pages which contain at least one live slot
-  #  [heap_tomb_pages]
-  #    The total number of pages which do not contain any live slots
-  #  [total_allocated_pages]
-  #    The cumulative number of pages allocated since application start
-  #  [total_freed_pages]
-  #    The cumulative number of pages freed since application start
-  #  [total_allocated_objects]
-  #    The cumulative number of objects allocated since application start
-  #  [total_freed_objects]
-  #    The cumulative number of objects freed since application start
-  #  [malloc_increase_bytes]
-  #    Amount of memory allocated on the heap for objects. Decreased by any \GC
-  #  [malloc_increase_bytes_limit]
-  #    When +:malloc_increase_bytes+ crosses this limit, \GC is triggered
-  #  [minor_gc_count]
-  #    The total number of minor garbage collections run since process start
-  #  [major_gc_count]
-  #    The total number of major garbage collections run since process start
-  #  [compact_count]
-  #    The total number of compactions run since process start
-  #  [read_barrier_faults]
-  #    The total number of times the read barrier was triggered during
-  #    compaction
-  #  [total_moved_objects]
-  #    The total number of objects compaction has moved
-  #  [remembered_wb_unprotected_objects]
-  #    The total number of objects without write barriers
-  #  [remembered_wb_unprotected_objects_limit]
-  #    When +:remembered_wb_unprotected_objects+ crosses this limit,
-  #    major \GC is triggered
-  #  [old_objects]
-  #    Number of live, old objects which have survived at least 3 garbage collections
-  #  [old_objects_limit]
-  #    When +:old_objects+ crosses this limit, major \GC is triggered
-  #  [oldmalloc_increase_bytes]
-  #    Amount of memory allocated on the heap for objects. Decreased by major \GC
-  #  [oldmalloc_increase_bytes_limit]
-  #    When +:old_malloc_increase_bytes+ crosses this limit, major \GC is triggered
-  #
-  #  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 CRuby.
+  # call-seq:
+  #    GC.stat -> Hash
+  #    GC.stat(hash) -> Hash
+  #    GC.stat(:key) -> Numeric
+  #
+  # Returns a Hash containing information about the \GC.
+  #
+  # The contents of the hash are implementation-specific and may change in
+  # the future without notice.
+  #
+  # The hash includes internal statistics about \GC such as:
+  #
+  # [count]
+  #   The total number of garbage collections run since application start
+  #   (count includes both minor and major garbage collections)
+  # [time]
+  #   The total time spent in garbage collections (in milliseconds)
+  # [heap_allocated_pages]
+  #   The total number of +:heap_eden_pages+ + +:heap_tomb_pages+
+  # [heap_sorted_length]
+  #   The number of pages that can fit into the buffer that holds references to
+  #   all pages
+  # [heap_allocatable_pages]
+  #   The total number of pages the application could allocate without additional \GC
+  # [heap_available_slots]
+  #   The total number of slots in all +:heap_allocated_pages+
+  # [heap_live_slots]
+  #   The total number of slots which contain live objects
+  # [heap_free_slots]
+  #   The total number of slots which do not contain live objects
+  # [heap_final_slots]
+  #   The total number of slots with pending finalizers to be run
+  # [heap_marked_slots]
+  #   The total number of objects marked in the last \GC
+  # [heap_eden_pages]
+  #   The total number of pages which contain at least one live slot
+  # [heap_tomb_pages]
+  #   The total number of pages which do not contain any live slots
+  # [total_allocated_pages]
+  #   The cumulative number of pages allocated since application start
+  # [total_freed_pages]
+  #   The cumulative number of pages freed since application start
+  # [total_allocated_objects]
+  #   The cumulative number of objects allocated since application start
+  # [total_freed_objects]
+  #   The cumulative number of objects freed since application start
+  # [malloc_increase_bytes]
+  #   Amount of memory allocated on the heap for objects. Decreased by any \GC
+  # [malloc_increase_bytes_limit]
+  #   When +:malloc_increase_bytes+ crosses this limit, \GC is triggered
+  # [minor_gc_count]
+  #   The total number of minor garbage collections run since process start
+  # [major_gc_count]
+  #   The total number of major garbage collections run since process start
+  # [compact_count]
+  #   The total number of compactions run since process start
+  # [read_barrier_faults]
+  #   The total number of times the read barrier was triggered during
+  #   compaction
+  # [total_moved_objects]
+  #   The total number of objects compaction has moved
+  # [remembered_wb_unprotected_objects]
+  #   The total number of objects without write barriers
+  # [remembered_wb_unprotected_objects_limit]
+  #   When +:remembered_wb_unprotected_objects+ crosses this limit,
+  #   major \GC is triggered
+  # [old_objects]
+  #   Number of live, old objects which have survived at least 3 garbage collections
+  # [old_objects_limit]
+  #   When +:old_objects+ crosses this limit, major \GC is triggered
+  # [oldmalloc_increase_bytes]
+  #   Amount of memory allocated on the heap for objects. Decreased by major \GC
+  # [oldmalloc_increase_bytes_limit]
+  #   When +:oldmalloc_increase_bytes+ crosses this limit, major \GC is triggered
+  #
+  # If the optional argument, hash, is given,
+  # it is overwritten and returned.
+  # This is intended to avoid the probe effect.
+  #
+  # This method is only expected to work on CRuby.
   def self.stat hash_or_key = nil
     Primitive.gc_stat hash_or_key
   end
@@ -203,16 +199,16 @@ def self.stat hash_or_key = nil
   # Otherwise, it will return a +Hash+ with heap names as keys and
   # a +Hash+ containing information about the heap as values.
   #
-  # If the second optional argument, +hash_or_key+, is given as +Hash+, it will
+  # If the second optional argument, +hash_or_key+, is given as a +Hash+, it will
   # be overwritten and returned. This is intended to avoid the probe effect.
   #
   # If both optional arguments are passed in and the second optional argument is
-  # a symbol, it will return a +Numeric+ of the value for the particular heap.
+  # a symbol, it will return a +Numeric+ value for the particular heap.
   #
   # On CRuby, +heap_name+ is of the type +Integer+ but may be of type +String+
   # on other implementations.
   #
-  # The contents of the hash are implementation specific and may change in
+  # The contents of the hash are implementation-specific and may change in
   # the future without notice.
   #
   # If the optional argument, hash, is given, it is overwritten and returned.
@@ -242,7 +238,7 @@ def self.stat hash_or_key = nil
   #   The total number of pages that have been freed and released back to the
   #   system in the heap.
   # [force_major_gc_count]
-  #   The number of times major garbage collection cycles this heap has forced
+  #   The number of times this heap has forced major garbage collection cycles
   #   to start due to running out of free slots.
   # [force_incremental_marking_finish_count]
   #   The number of times this heap has forced incremental marking to complete
@@ -252,49 +248,122 @@ def self.stat_heap heap_name = nil, hash_or_key = nil
     Primitive.gc_stat_heap heap_name, hash_or_key
   end
 
+  # call-seq:
+  #     GC.config -> hash
+  #     GC.config(hash) -> hash
+  #
+  # Sets or gets information about the current \GC config.
+  #
+  # Configuration parameters are \GC implementation-specific and may change
+  # without notice.
+  #
+  # This method can be called without parameters to retrieve the current config
+  # as a +Hash+ with +Symbol+ keys.
+  #
+  # This method can also be called with a +Hash+ argument to assign values to
+  # valid config keys. Config keys missing from the passed +Hash+ will be left
+  # unmodified.
+  #
+  # If a key/value pair is passed to this function that does not correspond to
+  # a valid config key for the \GC implementation being used, no config will be
+  # updated, the key will be present in the returned Hash, and its value will
+  # be +nil+. This is to facilitate easy migration between \GC implementations.
+  #
+  # In both call-seqs, the return value of <code>GC.config</code> will be a +Hash+
+  # containing the most recent full configuration, i.e., all keys and values
+  # defined by the specific \GC implementation being used. In the case of a
+  # config update, the return value will include the new values being updated.
+  #
+  # This method is only expected to work on CRuby.
+  #
+  # === \GC Implementation independent values
+  #
+  # The <code>GC.config</code> hash can also contain keys that are global and
+  # read-only. These keys are not specific to any one \GC library implementation
+  # and attempting to write to them will raise +ArgumentError+.
+  #
+  # There is currently only one global, read-only key:
+  #
+  # [implementation]
+  #    Returns a +String+ containing the name of the currently loaded \GC library,
+  #    if one has been loaded using +RUBY_GC_LIBRARY+, and "default" in all other
+  #    cases
+  #
+  # === \GC Implementation specific values
+  #
+  # \GC libraries are expected to document their own configuration. Valid keys
+  # for Ruby's default \GC implementation are:
+  #
+  # [rgengc_allow_full_mark]
+  #   Controls whether the \GC is allowed to run a full mark (young & old objects).
+  #
+  #   When +true+, \GC interleaves major and minor collections. This is the default. \GC
+  #   will function as intended.
+  #
+  #   When +false+, the \GC will never trigger a full marking cycle unless
+  #   explicitly requested by user code. Instead, only a minor mark will run—
+  #   only young objects will be marked. When the heap space is exhausted, new
+  #   pages will be allocated immediately instead of running a full mark.
+  #
+  #   A flag will be set to notify that a full mark has been
+  #   requested. This flag is accessible using
+  #   <code>GC.latest_gc_info(:need_major_by)</code>
+  #
+  #   The user can trigger a major collection at any time using
+  #   <code>GC.start(full_mark: true)</code>
+  #
+  #   When +false+, Young to Old object promotion is disabled. For performance
+  #   reasons, it is recommended to warm up an application using +Process.warmup+
+  #   before setting this parameter to +false+.
+  def self.config hash = nil
+    return Primitive.gc_config_get unless hash
+
+    if(Primitive.cexpr!("RBOOL(RB_TYPE_P(hash, T_HASH))"))
+      if hash.include?(:implementation)
+        raise ArgumentError, 'Attempting to set read-only key "Implementation"'
+      end
+
+      Primitive.gc_config_set hash
+    else
+      raise ArgumentError
+    end
+  end
+
   # call-seq:
   #     GC.latest_gc_info -> hash
   #     GC.latest_gc_info(hash) -> hash
-  #     GC.latest_gc_info(:major_by) -> :malloc
+  #     GC.latest_gc_info(key) -> value
   #
   # Returns information about the most recent garbage collection.
   #
-  # If the optional argument, hash, is given,
+  # If the argument +hash+ is given and is a Hash object,
   # it is overwritten and returned.
-  # This is intended to avoid probe effect.
+  # This is intended to avoid the probe effect.
+  #
+  # If the argument +key+ is given and is a Symbol object,
+  # it returns the value associated with the key.
+  # This is equivalent to <tt>GC.latest_gc_info[key]</tt>.
   def self.latest_gc_info hash_or_key = nil
-    Primitive.gc_latest_gc_info hash_or_key
-  end
-
-  if respond_to?(:compact)
-    # call-seq:
-    #    GC.verify_compaction_references(toward: nil, double_heap: false) -> hash
-    #
-    # 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 expands 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, expand_heap: false)
-      Primitive.gc_verify_compaction_references(double_heap, expand_heap, toward == :empty)
+    if hash_or_key == nil
+      hash_or_key = {}
+    elsif Primitive.cexpr!("RBOOL(!SYMBOL_P(hash_or_key) && !RB_TYPE_P(hash_or_key, T_HASH))")
+      raise TypeError, "non-hash or symbol given"
     end
+
+    Primitive.cstmt! %{
+      return rb_gc_latest_gc_info(hash_or_key);
+    }
   end
 
   # call-seq:
   #    GC.measure_total_time = true/false
   #
-  # Enable to measure \GC time.
+  # Enables measuring \GC time.
   # You can get the result with <tt>GC.stat(:time)</tt>.
   # Note that \GC time measurement can cause some performance overhead.
   def self.measure_total_time=(flag)
     Primitive.cstmt! %{
-      rb_objspace.flags.measure_gc = RTEST(flag) ? TRUE : FALSE;
+      rb_gc_impl_set_measure_total_time(rb_gc_get_objspace(), flag);
       return flag;
     }
   end
@@ -302,26 +371,27 @@ def self.measure_total_time=(flag)
   # call-seq:
   #    GC.measure_total_time -> true/false
   #
-  # Return measure_total_time flag (default: +true+).
-  # Note that measurement can affect the application performance.
+  # Returns the measure_total_time flag (default: +true+).
+  # Note that measurement can affect the application's performance.
   def self.measure_total_time
     Primitive.cexpr! %{
-      RBOOL(rb_objspace.flags.measure_gc)
+      RBOOL(rb_gc_impl_get_measure_total_time(rb_gc_get_objspace()))
     }
   end
 
   # call-seq:
   #    GC.total_time -> int
   #
-  # Return measured \GC total time in nano seconds.
+  # Returns the measured \GC total time in nanoseconds.
   def self.total_time
     Primitive.cexpr! %{
-      ULL2NUM(rb_objspace.profile.marking_time_ns + rb_objspace.profile.sweeping_time_ns)
+      ULL2NUM(rb_gc_impl_get_total_time(rb_gc_get_objspace()))
     }
   end
 end
 
 module ObjectSpace
+  # Alias of GC.start
   def garbage_collect full_mark: true, immediate_mark: true, immediate_sweep: true
     Primitive.gc_start_internal full_mark, immediate_mark, immediate_sweep, false
   end
diff --git a/gc/README.md b/gc/README.md
new file mode 100644
index 00000000000000..cb71357973d2c4
--- /dev/null
+++ b/gc/README.md
@@ -0,0 +1,37 @@
+# Ruby's Garbage Collectors
+
+This directory contains implementations for Ruby's garbage collector (GC). The GC implementations use the Modular GC API to interact with Ruby. For more details about this API, see the [Modular GC API](#modular-gc-api) section.
+
+Two GC implementations are included in Ruby:
+
+- Default: The GC implementation that is used by default in Ruby. This GC is stable and production ready. The implementation uses a mark-sweep-compact algorithm.
+- MMTk: An experimental implementation using the [MMTk](https://www.mmtk.io/) framework. The code lives in the [ruby/mmtk](https://github.com/ruby/mmtk) repository and is synchronized here. MMTk provides a [wide variety of GC algorithms](https://www.mmtk.io/status#implemented-collectors) to choose from. For usage instructions and current progress, refer to the [ruby/mmtk](https://github.com/ruby/mmtk) repository.
+
+## Building guide
+
+> [!TIP]
+> If you are not sure how to build Ruby, follow the [Building Ruby](https://docs.ruby-lang.org/en/master/contributing/building_ruby_md.html) guide.
+
+> [!IMPORTANT]
+> Ruby's modular GC feature is experimental and subject to change. There may be bugs or performance impacts. Use at your own risk.
+
+### Building Ruby with Modular GC
+
+1. Configure Ruby with the `--with-modular-gc=<dir>` option, where `dir` is the directory you want to place the built GC libraries into.
+2. Build Ruby as usual.
+
+### Building GC implementations shipped with Ruby
+
+1. Build your desired GC implementation with `make install-modular-gc MODULAR_GC=<impl>`. This will build the GC implementation and place the built library into the `dir` specified in step 1. `impl` can be one of:
+    - `default`: The default GC that Ruby ships with.
+    - `mmtk`: The GC that uses [MMTk](https://www.mmtk.io/) as the back-end. See Ruby-specific details in the [ruby/mmtk](https://github.com/ruby/mmtk) repository.
+2. Run your desired GC implementation by setting the `RUBY_GC_LIBRARY=<lib>` environment variable, where `lib` could be `default`, `mmtk`, or your own implementation (as long as you place it in the `dir` specified in step 1).
+
+## Modular GC API
+
+> [!WARNING]
+> The Modular GC API is experimental and subject to change without notice.
+
+GC implementations interact with Ruby via the Modular GC API. All implementations must provide the functions in [gc/gc_impl.h](https://github.com/ruby/ruby/blob/master/gc/gc_impl.h) for Ruby to hook into. GC implementations can use any public C API in Ruby, along with additional APIs defined in [gc/gc.h](https://github.com/ruby/ruby/blob/master/gc/gc.h).
+
+Additionally, create an extconf.rb file to build the GC library. This file must use [gc/extconf_base.rb](https://github.com/ruby/ruby/blob/master/gc/extconf_base.rb) and the `create_gc_makefile` method.
diff --git a/gc/default/default.c b/gc/default/default.c
new file mode 100644
index 00000000000000..384b3f10f05771
--- /dev/null
+++ b/gc/default/default.c
@@ -0,0 +1,9446 @@
+#include "ruby/internal/config.h"
+
+#include <signal.h>
+
+#ifndef _WIN32
+# include <sys/mman.h>
+# include <unistd.h>
+# ifdef HAVE_SYS_PRCTL_H
+#  include <sys/prctl.h>
+# endif
+#endif
+
+#if !defined(PAGE_SIZE) && defined(HAVE_SYS_USER_H)
+/* LIST_HEAD conflicts with sys/queue.h on macOS */
+# include <sys/user.h>
+#endif
+
+#ifdef BUILDING_MODULAR_GC
+# define nlz_int64(x) (x == 0 ? 64 : (unsigned int)__builtin_clzll((unsigned long long)x))
+#else
+# include "internal/bits.h"
+#endif
+
+#include "ruby/ruby.h"
+#include "ruby/atomic.h"
+#include "ruby/debug.h"
+#include "ruby/thread.h"
+#include "ruby/util.h"
+#include "ruby/vm.h"
+#include "ruby/internal/encoding/string.h"
+#include "ccan/list/list.h"
+#include "darray.h"
+#include "gc/gc.h"
+#include "gc/gc_impl.h"
+
+#ifndef BUILDING_MODULAR_GC
+# include "probes.h"
+#endif
+
+#ifdef BUILDING_MODULAR_GC
+# define RB_DEBUG_COUNTER_INC(_name) ((void)0)
+# define RB_DEBUG_COUNTER_INC_IF(_name, cond) (!!(cond))
+#else
+# include "debug_counter.h"
+#endif
+
+#ifdef BUILDING_MODULAR_GC
+# define rb_asan_poison_object(obj) ((void)(obj))
+# define rb_asan_unpoison_object(obj, newobj_p) ((void)(obj), (void)(newobj_p))
+# define asan_unpoisoning_object(obj) if ((obj) || true)
+# define asan_poison_memory_region(ptr, size) ((void)(ptr), (void)(size))
+# define asan_unpoison_memory_region(ptr, size, malloc_p) ((void)(ptr), (size), (malloc_p))
+# define asan_unpoisoning_memory_region(ptr, size) if ((ptr) || (size) || true)
+
+# define VALGRIND_MAKE_MEM_DEFINED(ptr, size) ((void)(ptr), (void)(size))
+# define VALGRIND_MAKE_MEM_UNDEFINED(ptr, size) ((void)(ptr), (void)(size))
+#else
+# include "internal/sanitizers.h"
+#endif
+
+/* MALLOC_HEADERS_BEGIN */
+#ifndef HAVE_MALLOC_USABLE_SIZE
+# ifdef _WIN32
+#  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)
+# endif
+#endif
+
+#ifdef HAVE_MALLOC_USABLE_SIZE
+# ifdef RUBY_ALTERNATIVE_MALLOC_HEADER
+/* Alternative malloc header is included in ruby/missing.h */
+# elif defined(HAVE_MALLOC_H)
+#  include <malloc.h>
+# elif defined(HAVE_MALLOC_NP_H)
+#  include <malloc_np.h>
+# elif defined(HAVE_MALLOC_MALLOC_H)
+#  include <malloc/malloc.h>
+# endif
+#endif
+
+#ifdef HAVE_MALLOC_TRIM
+# include <malloc.h>
+
+# ifdef __EMSCRIPTEN__
+/* malloc_trim is defined in emscripten/emmalloc.h on emscripten. */
+#  include <emscripten/emmalloc.h>
+# endif
+#endif
+
+#ifdef HAVE_MACH_TASK_EXCEPTION_PORTS
+# include <mach/task.h>
+# include <mach/mach_init.h>
+# include <mach/mach_port.h>
+#endif
+
+#ifndef VM_CHECK_MODE
+# define VM_CHECK_MODE RUBY_DEBUG
+#endif
+
+// From ractor_core.h
+#ifndef RACTOR_CHECK_MODE
+# define RACTOR_CHECK_MODE (VM_CHECK_MODE || RUBY_DEBUG) && (SIZEOF_UINT64_T == SIZEOF_VALUE)
+#endif
+
+#ifndef RUBY_DEBUG_LOG
+# define RUBY_DEBUG_LOG(...)
+#endif
+
+#ifndef GC_HEAP_INIT_SLOTS
+#define GC_HEAP_INIT_SLOTS 10000
+#endif
+#ifndef GC_HEAP_FREE_SLOTS
+#define GC_HEAP_FREE_SLOTS  4096
+#endif
+#ifndef GC_HEAP_GROWTH_FACTOR
+#define GC_HEAP_GROWTH_FACTOR 1.8
+#endif
+#ifndef GC_HEAP_GROWTH_MAX_SLOTS
+#define GC_HEAP_GROWTH_MAX_SLOTS 0 /* 0 is disable */
+#endif
+#ifndef GC_HEAP_REMEMBERED_WB_UNPROTECTED_OBJECTS_LIMIT_RATIO
+# define GC_HEAP_REMEMBERED_WB_UNPROTECTED_OBJECTS_LIMIT_RATIO 0.01
+#endif
+#ifndef GC_HEAP_OLDOBJECT_LIMIT_FACTOR
+#define GC_HEAP_OLDOBJECT_LIMIT_FACTOR 2.0
+#endif
+
+#ifndef GC_HEAP_FREE_SLOTS_MIN_RATIO
+#define GC_HEAP_FREE_SLOTS_MIN_RATIO  0.20
+#endif
+#ifndef GC_HEAP_FREE_SLOTS_GOAL_RATIO
+#define GC_HEAP_FREE_SLOTS_GOAL_RATIO 0.40
+#endif
+#ifndef GC_HEAP_FREE_SLOTS_MAX_RATIO
+#define GC_HEAP_FREE_SLOTS_MAX_RATIO  0.65
+#endif
+
+#ifndef GC_MALLOC_LIMIT_MIN
+#define GC_MALLOC_LIMIT_MIN (16 * 1024 * 1024 /* 16MB */)
+#endif
+#ifndef GC_MALLOC_LIMIT_MAX
+#define GC_MALLOC_LIMIT_MAX (32 * 1024 * 1024 /* 32MB */)
+#endif
+#ifndef GC_MALLOC_LIMIT_GROWTH_FACTOR
+#define GC_MALLOC_LIMIT_GROWTH_FACTOR 1.4
+#endif
+
+#ifndef GC_OLDMALLOC_LIMIT_MIN
+#define GC_OLDMALLOC_LIMIT_MIN (16 * 1024 * 1024 /* 16MB */)
+#endif
+#ifndef GC_OLDMALLOC_LIMIT_GROWTH_FACTOR
+#define GC_OLDMALLOC_LIMIT_GROWTH_FACTOR 1.2
+#endif
+#ifndef GC_OLDMALLOC_LIMIT_MAX
+#define GC_OLDMALLOC_LIMIT_MAX (128 * 1024 * 1024 /* 128MB */)
+#endif
+
+#ifndef GC_CAN_COMPILE_COMPACTION
+#if defined(__wasi__) /* WebAssembly doesn't support signals */
+# define GC_CAN_COMPILE_COMPACTION 0
+#else
+# define GC_CAN_COMPILE_COMPACTION 1
+#endif
+#endif
+
+#ifndef PRINT_ENTER_EXIT_TICK
+# define PRINT_ENTER_EXIT_TICK 0
+#endif
+#ifndef PRINT_ROOT_TICKS
+#define PRINT_ROOT_TICKS 0
+#endif
+
+#define USE_TICK_T                 (PRINT_ENTER_EXIT_TICK || PRINT_ROOT_TICKS)
+
+#ifndef HEAP_COUNT
+# define HEAP_COUNT 5
+#endif
+
+typedef struct ractor_newobj_heap_cache {
+    struct free_slot *freelist;
+    struct heap_page *using_page;
+    size_t allocated_objects_count;
+} rb_ractor_newobj_heap_cache_t;
+
+typedef struct ractor_newobj_cache {
+    size_t incremental_mark_step_allocated_slots;
+    rb_ractor_newobj_heap_cache_t heap_caches[HEAP_COUNT];
+} rb_ractor_newobj_cache_t;
+
+typedef struct {
+    size_t heap_init_slots[HEAP_COUNT];
+    size_t heap_free_slots;
+    double growth_factor;
+    size_t growth_max_slots;
+
+    double heap_free_slots_min_ratio;
+    double heap_free_slots_goal_ratio;
+    double heap_free_slots_max_ratio;
+    double uncollectible_wb_unprotected_objects_limit_ratio;
+    double oldobject_limit_factor;
+
+    size_t malloc_limit_min;
+    size_t malloc_limit_max;
+    double malloc_limit_growth_factor;
+
+    size_t oldmalloc_limit_min;
+    size_t oldmalloc_limit_max;
+    double oldmalloc_limit_growth_factor;
+} ruby_gc_params_t;
+
+static ruby_gc_params_t gc_params = {
+    { GC_HEAP_INIT_SLOTS },
+    GC_HEAP_FREE_SLOTS,
+    GC_HEAP_GROWTH_FACTOR,
+    GC_HEAP_GROWTH_MAX_SLOTS,
+
+    GC_HEAP_FREE_SLOTS_MIN_RATIO,
+    GC_HEAP_FREE_SLOTS_GOAL_RATIO,
+    GC_HEAP_FREE_SLOTS_MAX_RATIO,
+    GC_HEAP_REMEMBERED_WB_UNPROTECTED_OBJECTS_LIMIT_RATIO,
+    GC_HEAP_OLDOBJECT_LIMIT_FACTOR,
+
+    GC_MALLOC_LIMIT_MIN,
+    GC_MALLOC_LIMIT_MAX,
+    GC_MALLOC_LIMIT_GROWTH_FACTOR,
+
+    GC_OLDMALLOC_LIMIT_MIN,
+    GC_OLDMALLOC_LIMIT_MAX,
+    GC_OLDMALLOC_LIMIT_GROWTH_FACTOR,
+};
+
+/* GC_DEBUG:
+ *  enable to embed GC debugging information.
+ */
+#ifndef GC_DEBUG
+#define GC_DEBUG 0
+#endif
+
+/* RGENGC_DEBUG:
+ * 1: basic information
+ * 2: remember set operation
+ * 3: mark
+ * 4:
+ * 5: sweep
+ */
+#ifndef RGENGC_DEBUG
+#ifdef RUBY_DEVEL
+#define RGENGC_DEBUG       -1
+#else
+#define RGENGC_DEBUG       0
+#endif
+#endif
+#if RGENGC_DEBUG < 0 && !defined(_MSC_VER)
+# define RGENGC_DEBUG_ENABLED(level) (-(RGENGC_DEBUG) >= (level) && ruby_rgengc_debug >= (level))
+#elif defined(HAVE_VA_ARGS_MACRO)
+# define RGENGC_DEBUG_ENABLED(level) ((RGENGC_DEBUG) >= (level))
+#else
+# define RGENGC_DEBUG_ENABLED(level) 0
+#endif
+int ruby_rgengc_debug;
+
+/* RGENGC_PROFILE
+ * 0: disable RGenGC profiling
+ * 1: enable profiling for basic information
+ * 2: enable profiling for each types
+ */
+#ifndef RGENGC_PROFILE
+# define RGENGC_PROFILE     0
+#endif
+
+/* RGENGC_ESTIMATE_OLDMALLOC
+ * Enable/disable to estimate increase size of malloc'ed size by old objects.
+ * If estimation exceeds threshold, then will invoke full GC.
+ * 0: disable estimation.
+ * 1: enable estimation.
+ */
+#ifndef RGENGC_ESTIMATE_OLDMALLOC
+# define RGENGC_ESTIMATE_OLDMALLOC 1
+#endif
+
+#ifndef GC_PROFILE_MORE_DETAIL
+# define GC_PROFILE_MORE_DETAIL 0
+#endif
+#ifndef GC_PROFILE_DETAIL_MEMORY
+# define GC_PROFILE_DETAIL_MEMORY 0
+#endif
+#ifndef GC_ENABLE_LAZY_SWEEP
+# define GC_ENABLE_LAZY_SWEEP   1
+#endif
+#ifndef CALC_EXACT_MALLOC_SIZE
+# define CALC_EXACT_MALLOC_SIZE 0
+#endif
+#if defined(HAVE_MALLOC_USABLE_SIZE) || CALC_EXACT_MALLOC_SIZE > 0
+# ifndef MALLOC_ALLOCATED_SIZE
+#  define MALLOC_ALLOCATED_SIZE 0
+# endif
+#else
+# define MALLOC_ALLOCATED_SIZE 0
+#endif
+#ifndef MALLOC_ALLOCATED_SIZE_CHECK
+# define MALLOC_ALLOCATED_SIZE_CHECK 0
+#endif
+
+#ifndef GC_DEBUG_STRESS_TO_CLASS
+# define GC_DEBUG_STRESS_TO_CLASS 1
+#endif
+
+typedef enum {
+    GPR_FLAG_NONE               = 0x000,
+    /* major reason */
+    GPR_FLAG_MAJOR_BY_NOFREE    = 0x001,
+    GPR_FLAG_MAJOR_BY_OLDGEN    = 0x002,
+    GPR_FLAG_MAJOR_BY_SHADY     = 0x004,
+    GPR_FLAG_MAJOR_BY_FORCE     = 0x008,
+#if RGENGC_ESTIMATE_OLDMALLOC
+    GPR_FLAG_MAJOR_BY_OLDMALLOC = 0x020,
+#endif
+    GPR_FLAG_MAJOR_MASK         = 0x0ff,
+
+    /* gc reason */
+    GPR_FLAG_NEWOBJ             = 0x100,
+    GPR_FLAG_MALLOC             = 0x200,
+    GPR_FLAG_METHOD             = 0x400,
+    GPR_FLAG_CAPI               = 0x800,
+    GPR_FLAG_STRESS            = 0x1000,
+
+    /* others */
+    GPR_FLAG_IMMEDIATE_SWEEP   = 0x2000,
+    GPR_FLAG_HAVE_FINALIZE     = 0x4000,
+    GPR_FLAG_IMMEDIATE_MARK    = 0x8000,
+    GPR_FLAG_FULL_MARK        = 0x10000,
+    GPR_FLAG_COMPACT          = 0x20000,
+
+    GPR_DEFAULT_REASON =
+        (GPR_FLAG_FULL_MARK | GPR_FLAG_IMMEDIATE_MARK |
+         GPR_FLAG_IMMEDIATE_SWEEP | GPR_FLAG_CAPI),
+} gc_profile_record_flag;
+
+typedef struct gc_profile_record {
+    unsigned int flags;
+
+    double gc_time;
+    double gc_invoke_time;
+
+    size_t heap_total_objects;
+    size_t heap_use_size;
+    size_t heap_total_size;
+    size_t moved_objects;
+
+#if GC_PROFILE_MORE_DETAIL
+    double gc_mark_time;
+    double gc_sweep_time;
+
+    size_t heap_use_pages;
+    size_t heap_live_objects;
+    size_t heap_free_objects;
+
+    size_t allocate_increase;
+    size_t allocate_limit;
+
+    double prepare_time;
+    size_t removing_objects;
+    size_t empty_objects;
+#if GC_PROFILE_DETAIL_MEMORY
+    long maxrss;
+    long minflt;
+    long majflt;
+#endif
+#endif
+#if MALLOC_ALLOCATED_SIZE
+    size_t allocated_size;
+#endif
+
+#if RGENGC_PROFILE > 0
+    size_t old_objects;
+    size_t remembered_normal_objects;
+    size_t remembered_shady_objects;
+#endif
+} gc_profile_record;
+
+struct RMoved {
+    VALUE flags;
+    VALUE dummy;
+    VALUE destination;
+    uint32_t original_shape_id;
+};
+
+#define RMOVED(obj) ((struct RMoved *)(obj))
+
+typedef uintptr_t bits_t;
+enum {
+    BITS_SIZE = sizeof(bits_t),
+    BITS_BITLENGTH = ( BITS_SIZE * CHAR_BIT )
+};
+
+struct heap_page_header {
+    struct heap_page *page;
+};
+
+struct heap_page_body {
+    struct heap_page_header header;
+    /* char gap[];      */
+    /* RVALUE values[]; */
+};
+
+#define STACK_CHUNK_SIZE 500
+
+typedef struct stack_chunk {
+    VALUE data[STACK_CHUNK_SIZE];
+    struct stack_chunk *next;
+} stack_chunk_t;
+
+typedef struct mark_stack {
+    stack_chunk_t *chunk;
+    stack_chunk_t *cache;
+    int index;
+    int limit;
+    size_t cache_size;
+    size_t unused_cache_size;
+} mark_stack_t;
+
+typedef int (*gc_compact_compare_func)(const void *l, const void *r, void *d);
+
+typedef struct rb_heap_struct {
+    short slot_size;
+
+    /* Basic statistics */
+    size_t total_allocated_pages;
+    size_t force_major_gc_count;
+    size_t force_incremental_marking_finish_count;
+    size_t total_allocated_objects;
+    size_t total_freed_objects;
+    size_t final_slots_count;
+
+    /* Sweeping statistics */
+    size_t freed_slots;
+    size_t empty_slots;
+
+    struct heap_page *free_pages;
+    struct ccan_list_head pages;
+    struct heap_page *sweeping_page; /* iterator for .pages */
+    struct heap_page *compact_cursor;
+    uintptr_t compact_cursor_index;
+    struct heap_page *pooled_pages;
+    size_t total_pages;      /* total page count in a heap */
+    size_t total_slots;      /* total slot count (about total_pages * HEAP_PAGE_OBJ_LIMIT) */
+
+} rb_heap_t;
+
+enum {
+    gc_stress_no_major,
+    gc_stress_no_immediate_sweep,
+    gc_stress_full_mark_after_malloc,
+    gc_stress_max
+};
+
+enum gc_mode {
+    gc_mode_none,
+    gc_mode_marking,
+    gc_mode_sweeping,
+    gc_mode_compacting,
+};
+
+typedef struct rb_objspace {
+    struct {
+        size_t limit;
+        size_t increase;
+#if MALLOC_ALLOCATED_SIZE
+        size_t allocated_size;
+        size_t allocations;
+#endif
+    } malloc_params;
+
+    struct rb_gc_config {
+        bool full_mark;
+    } gc_config;
+
+    struct {
+        unsigned int mode : 2;
+        unsigned int immediate_sweep : 1;
+        unsigned int dont_gc : 1;
+        unsigned int dont_incremental : 1;
+        unsigned int during_gc : 1;
+        unsigned int during_compacting : 1;
+        unsigned int during_reference_updating : 1;
+        unsigned int gc_stressful: 1;
+        unsigned int has_newobj_hook: 1;
+        unsigned int during_minor_gc : 1;
+        unsigned int during_incremental_marking : 1;
+        unsigned int measure_gc : 1;
+    } flags;
+
+    rb_event_flag_t hook_events;
+
+    rb_heap_t heaps[HEAP_COUNT];
+    size_t empty_pages_count;
+    struct heap_page *empty_pages;
+
+    struct {
+        rb_atomic_t finalizing;
+    } atomic_flags;
+
+    mark_stack_t mark_stack;
+    size_t marked_slots;
+
+    struct {
+        rb_darray(struct heap_page *) sorted;
+
+        size_t allocated_pages;
+        size_t freed_pages;
+        uintptr_t range[2];
+        size_t freeable_pages;
+
+        size_t allocatable_slots;
+
+        /* final */
+        VALUE deferred_final;
+    } heap_pages;
+
+    st_table *finalizer_table;
+
+    struct {
+        int run;
+        unsigned int latest_gc_info;
+        gc_profile_record *records;
+        gc_profile_record *current_record;
+        size_t next_index;
+        size_t size;
+
+#if GC_PROFILE_MORE_DETAIL
+        double prepare_time;
+#endif
+        double invoke_time;
+
+        size_t minor_gc_count;
+        size_t major_gc_count;
+        size_t compact_count;
+        size_t read_barrier_faults;
+#if RGENGC_PROFILE > 0
+        size_t total_generated_normal_object_count;
+        size_t total_generated_shady_object_count;
+        size_t total_shade_operation_count;
+        size_t total_promoted_count;
+        size_t total_remembered_normal_object_count;
+        size_t total_remembered_shady_object_count;
+
+#if RGENGC_PROFILE >= 2
+        size_t generated_normal_object_count_types[RUBY_T_MASK];
+        size_t generated_shady_object_count_types[RUBY_T_MASK];
+        size_t shade_operation_count_types[RUBY_T_MASK];
+        size_t promoted_types[RUBY_T_MASK];
+        size_t remembered_normal_object_count_types[RUBY_T_MASK];
+        size_t remembered_shady_object_count_types[RUBY_T_MASK];
+#endif
+#endif /* RGENGC_PROFILE */
+
+        /* temporary profiling space */
+        double gc_sweep_start_time;
+        size_t total_allocated_objects_at_gc_start;
+        size_t heap_used_at_gc_start;
+
+        /* basic statistics */
+        size_t count;
+        unsigned long long marking_time_ns;
+        struct timespec marking_start_time;
+        unsigned long long sweeping_time_ns;
+        struct timespec sweeping_start_time;
+
+        /* Weak references */
+        size_t weak_references_count;
+        size_t retained_weak_references_count;
+    } profile;
+
+    VALUE gc_stress_mode;
+
+    struct {
+        VALUE parent_object;
+        int need_major_gc;
+        size_t last_major_gc;
+        size_t uncollectible_wb_unprotected_objects;
+        size_t uncollectible_wb_unprotected_objects_limit;
+        size_t old_objects;
+        size_t old_objects_limit;
+
+#if RGENGC_ESTIMATE_OLDMALLOC
+        size_t oldmalloc_increase;
+        size_t oldmalloc_increase_limit;
+#endif
+
+#if RGENGC_CHECK_MODE >= 2
+        struct st_table *allrefs_table;
+        size_t error_count;
+#endif
+    } rgengc;
+
+    struct {
+        size_t considered_count_table[T_MASK];
+        size_t moved_count_table[T_MASK];
+        size_t moved_up_count_table[T_MASK];
+        size_t moved_down_count_table[T_MASK];
+        size_t total_moved;
+
+        /* This function will be used, if set, to sort the heap prior to compaction */
+        gc_compact_compare_func compare_func;
+    } rcompactor;
+
+    struct {
+        size_t pooled_slots;
+        size_t step_slots;
+    } rincgc;
+
+#if GC_DEBUG_STRESS_TO_CLASS
+    VALUE stress_to_class;
+#endif
+
+    rb_darray(VALUE *) weak_references;
+    rb_postponed_job_handle_t finalize_deferred_pjob;
+
+    unsigned long live_ractor_cache_count;
+} rb_objspace_t;
+
+#ifndef HEAP_PAGE_ALIGN_LOG
+/* default tiny heap size: 64KiB */
+#define HEAP_PAGE_ALIGN_LOG 16
+#endif
+
+#if RACTOR_CHECK_MODE || GC_DEBUG
+struct rvalue_overhead {
+# if RACTOR_CHECK_MODE
+    uint32_t _ractor_belonging_id;
+# endif
+# if GC_DEBUG
+    const char *file;
+    int line;
+# endif
+};
+
+// Make sure that RVALUE_OVERHEAD aligns to sizeof(VALUE)
+# define RVALUE_OVERHEAD (sizeof(struct { \
+    union { \
+        struct rvalue_overhead overhead; \
+        VALUE value; \
+    }; \
+}))
+size_t rb_gc_impl_obj_slot_size(VALUE obj);
+# define GET_RVALUE_OVERHEAD(obj) ((struct rvalue_overhead *)((uintptr_t)obj + rb_gc_impl_obj_slot_size(obj)))
+#else
+# ifndef RVALUE_OVERHEAD
+#  define RVALUE_OVERHEAD 0
+# endif
+#endif
+
+#define BASE_SLOT_SIZE (sizeof(struct RBasic) + sizeof(VALUE[RBIMPL_RVALUE_EMBED_LEN_MAX]) + RVALUE_OVERHEAD)
+
+#ifndef MAX
+# define MAX(a, b) (((a) > (b)) ? (a) : (b))
+#endif
+#ifndef MIN
+# define MIN(a, b) (((a) < (b)) ? (a) : (b))
+#endif
+#define roomof(x, y) (((x) + (y) - 1) / (y))
+#define CEILDIV(i, mod) roomof(i, mod)
+enum {
+    HEAP_PAGE_ALIGN = (1UL << HEAP_PAGE_ALIGN_LOG),
+    HEAP_PAGE_ALIGN_MASK = (~(~0UL << HEAP_PAGE_ALIGN_LOG)),
+    HEAP_PAGE_SIZE = HEAP_PAGE_ALIGN,
+    HEAP_PAGE_OBJ_LIMIT = (unsigned int)((HEAP_PAGE_SIZE - sizeof(struct heap_page_header)) / BASE_SLOT_SIZE),
+    HEAP_PAGE_BITMAP_LIMIT = CEILDIV(CEILDIV(HEAP_PAGE_SIZE, BASE_SLOT_SIZE), BITS_BITLENGTH),
+    HEAP_PAGE_BITMAP_SIZE = (BITS_SIZE * HEAP_PAGE_BITMAP_LIMIT),
+};
+#define HEAP_PAGE_ALIGN (1 << HEAP_PAGE_ALIGN_LOG)
+#define HEAP_PAGE_SIZE HEAP_PAGE_ALIGN
+
+#if !defined(INCREMENTAL_MARK_STEP_ALLOCATIONS)
+# define INCREMENTAL_MARK_STEP_ALLOCATIONS 500
+#endif
+
+#undef INIT_HEAP_PAGE_ALLOC_USE_MMAP
+/* Must define either HEAP_PAGE_ALLOC_USE_MMAP or
+ * INIT_HEAP_PAGE_ALLOC_USE_MMAP. */
+
+#ifndef HAVE_MMAP
+/* We can't use mmap of course, if it is not available. */
+static const bool HEAP_PAGE_ALLOC_USE_MMAP = false;
+
+#elif defined(__wasm__)
+/* wasmtime does not have proper support for mmap.
+ * See https://github.com/bytecodealliance/wasmtime/blob/main/docs/WASI-rationale.md#why-no-mmap-and-friends
+ */
+static const bool HEAP_PAGE_ALLOC_USE_MMAP = false;
+
+#elif HAVE_CONST_PAGE_SIZE
+/* If we have the PAGE_SIZE and it is a constant, then we can directly use it. */
+static const bool HEAP_PAGE_ALLOC_USE_MMAP = (PAGE_SIZE <= HEAP_PAGE_SIZE);
+
+#elif defined(PAGE_MAX_SIZE) && (PAGE_MAX_SIZE <= HEAP_PAGE_SIZE)
+/* If we can use the maximum page size. */
+static const bool HEAP_PAGE_ALLOC_USE_MMAP = true;
+
+#elif defined(PAGE_SIZE)
+/* If the PAGE_SIZE macro can be used dynamically. */
+# define INIT_HEAP_PAGE_ALLOC_USE_MMAP (PAGE_SIZE <= HEAP_PAGE_SIZE)
+
+#elif defined(HAVE_SYSCONF) && defined(_SC_PAGE_SIZE)
+/* If we can use sysconf to determine the page size. */
+# define INIT_HEAP_PAGE_ALLOC_USE_MMAP (sysconf(_SC_PAGE_SIZE) <= HEAP_PAGE_SIZE)
+
+#else
+/* Otherwise we can't determine the system page size, so don't use mmap. */
+static const bool HEAP_PAGE_ALLOC_USE_MMAP = false;
+#endif
+
+#ifdef INIT_HEAP_PAGE_ALLOC_USE_MMAP
+/* We can determine the system page size at runtime. */
+# define HEAP_PAGE_ALLOC_USE_MMAP (heap_page_alloc_use_mmap != false)
+
+static bool heap_page_alloc_use_mmap;
+#endif
+
+#define RVALUE_AGE_BIT_COUNT 2
+#define RVALUE_AGE_BIT_MASK (((bits_t)1 << RVALUE_AGE_BIT_COUNT) - 1)
+#define RVALUE_OLD_AGE   3
+
+struct free_slot {
+    VALUE flags;		/* always 0 for freed obj */
+    struct free_slot *next;
+};
+
+struct heap_page {
+    unsigned short slot_size;
+    unsigned short total_slots;
+    unsigned short free_slots;
+    unsigned short final_slots;
+    unsigned short pinned_slots;
+    struct {
+        unsigned int before_sweep : 1;
+        unsigned int has_remembered_objects : 1;
+        unsigned int has_uncollectible_wb_unprotected_objects : 1;
+    } flags;
+
+    rb_heap_t *heap;
+
+    struct heap_page *free_next;
+    struct heap_page_body *body;
+    uintptr_t start;
+    struct free_slot *freelist;
+    struct ccan_list_node page_node;
+
+    bits_t wb_unprotected_bits[HEAP_PAGE_BITMAP_LIMIT];
+    /* the following three bitmaps are cleared at the beginning of full GC */
+    bits_t mark_bits[HEAP_PAGE_BITMAP_LIMIT];
+    bits_t uncollectible_bits[HEAP_PAGE_BITMAP_LIMIT];
+    bits_t marking_bits[HEAP_PAGE_BITMAP_LIMIT];
+
+    bits_t remembered_bits[HEAP_PAGE_BITMAP_LIMIT];
+
+    /* If set, the object is not movable */
+    bits_t pinned_bits[HEAP_PAGE_BITMAP_LIMIT];
+    bits_t age_bits[HEAP_PAGE_BITMAP_LIMIT * RVALUE_AGE_BIT_COUNT];
+};
+
+/*
+ * When asan is enabled, this will prohibit writing to the freelist until it is unlocked
+ */
+static void
+asan_lock_freelist(struct heap_page *page)
+{
+    asan_poison_memory_region(&page->freelist, sizeof(struct free_list *));
+}
+
+/*
+ * When asan is enabled, this will enable the ability to write to the freelist
+ */
+static void
+asan_unlock_freelist(struct heap_page *page)
+{
+    asan_unpoison_memory_region(&page->freelist, sizeof(struct free_list *), false);
+}
+
+static inline bool
+heap_page_in_global_empty_pages_pool(rb_objspace_t *objspace, struct heap_page *page)
+{
+    if (page->total_slots == 0) {
+        GC_ASSERT(page->start == 0);
+        GC_ASSERT(page->slot_size == 0);
+        GC_ASSERT(page->heap == NULL);
+        GC_ASSERT(page->free_slots == 0);
+        asan_unpoisoning_memory_region(&page->freelist, sizeof(&page->freelist)) {
+            GC_ASSERT(page->freelist == NULL);
+        }
+
+        return true;
+    }
+    else {
+        GC_ASSERT(page->start != 0);
+        GC_ASSERT(page->slot_size != 0);
+        GC_ASSERT(page->heap != NULL);
+
+        return false;
+    }
+}
+
+#define GET_PAGE_BODY(x)   ((struct heap_page_body *)((bits_t)(x) & ~(HEAP_PAGE_ALIGN_MASK)))
+#define GET_PAGE_HEADER(x) (&GET_PAGE_BODY(x)->header)
+#define GET_HEAP_PAGE(x)   (GET_PAGE_HEADER(x)->page)
+
+#define NUM_IN_PAGE(p)   (((bits_t)(p) & HEAP_PAGE_ALIGN_MASK) / BASE_SLOT_SIZE)
+#define BITMAP_INDEX(p)  (NUM_IN_PAGE(p) / BITS_BITLENGTH )
+#define BITMAP_OFFSET(p) (NUM_IN_PAGE(p) & (BITS_BITLENGTH-1))
+#define BITMAP_BIT(p)    ((bits_t)1 << BITMAP_OFFSET(p))
+
+/* Bitmap Operations */
+#define MARKED_IN_BITMAP(bits, p)    ((bits)[BITMAP_INDEX(p)] & BITMAP_BIT(p))
+#define MARK_IN_BITMAP(bits, p)      ((bits)[BITMAP_INDEX(p)] = (bits)[BITMAP_INDEX(p)] | BITMAP_BIT(p))
+#define CLEAR_IN_BITMAP(bits, p)     ((bits)[BITMAP_INDEX(p)] = (bits)[BITMAP_INDEX(p)] & ~BITMAP_BIT(p))
+
+/* getting bitmap */
+#define GET_HEAP_MARK_BITS(x)           (&GET_HEAP_PAGE(x)->mark_bits[0])
+#define GET_HEAP_PINNED_BITS(x)         (&GET_HEAP_PAGE(x)->pinned_bits[0])
+#define GET_HEAP_UNCOLLECTIBLE_BITS(x)  (&GET_HEAP_PAGE(x)->uncollectible_bits[0])
+#define GET_HEAP_WB_UNPROTECTED_BITS(x) (&GET_HEAP_PAGE(x)->wb_unprotected_bits[0])
+#define GET_HEAP_MARKING_BITS(x)        (&GET_HEAP_PAGE(x)->marking_bits[0])
+
+#define RVALUE_AGE_BITMAP_INDEX(n)  (NUM_IN_PAGE(n) / (BITS_BITLENGTH / RVALUE_AGE_BIT_COUNT))
+#define RVALUE_AGE_BITMAP_OFFSET(n) ((NUM_IN_PAGE(n) % (BITS_BITLENGTH / RVALUE_AGE_BIT_COUNT)) * RVALUE_AGE_BIT_COUNT)
+
+static int
+RVALUE_AGE_GET(VALUE obj)
+{
+    bits_t *age_bits = GET_HEAP_PAGE(obj)->age_bits;
+    return (int)(age_bits[RVALUE_AGE_BITMAP_INDEX(obj)] >> RVALUE_AGE_BITMAP_OFFSET(obj)) & RVALUE_AGE_BIT_MASK;
+}
+
+static void
+RVALUE_AGE_SET(VALUE obj, int age)
+{
+    RUBY_ASSERT(age <= RVALUE_OLD_AGE);
+    bits_t *age_bits = GET_HEAP_PAGE(obj)->age_bits;
+    // clear the bits
+    age_bits[RVALUE_AGE_BITMAP_INDEX(obj)] &= ~(RVALUE_AGE_BIT_MASK << (RVALUE_AGE_BITMAP_OFFSET(obj)));
+    // shift the correct value in
+    age_bits[RVALUE_AGE_BITMAP_INDEX(obj)] |= ((bits_t)age << RVALUE_AGE_BITMAP_OFFSET(obj));
+    if (age == RVALUE_OLD_AGE) {
+        RB_FL_SET_RAW(obj, RUBY_FL_PROMOTED);
+    }
+    else {
+        RB_FL_UNSET_RAW(obj, RUBY_FL_PROMOTED);
+    }
+}
+
+#define malloc_limit		objspace->malloc_params.limit
+#define malloc_increase 	objspace->malloc_params.increase
+#define malloc_allocated_size 	objspace->malloc_params.allocated_size
+#define heap_pages_lomem	objspace->heap_pages.range[0]
+#define heap_pages_himem	objspace->heap_pages.range[1]
+#define heap_pages_freeable_pages	objspace->heap_pages.freeable_pages
+#define heap_pages_deferred_final	objspace->heap_pages.deferred_final
+#define heaps              objspace->heaps
+#define during_gc		objspace->flags.during_gc
+#define finalizing		objspace->atomic_flags.finalizing
+#define finalizer_table 	objspace->finalizer_table
+#define ruby_gc_stressful	objspace->flags.gc_stressful
+#define ruby_gc_stress_mode     objspace->gc_stress_mode
+#if GC_DEBUG_STRESS_TO_CLASS
+#define stress_to_class         objspace->stress_to_class
+#define set_stress_to_class(c)  (stress_to_class = (c))
+#else
+#define stress_to_class         ((void)objspace, 0)
+#define set_stress_to_class(c)  ((void)objspace, (c))
+#endif
+
+#if 0
+#define dont_gc_on()          (fprintf(stderr, "dont_gc_on@%s:%d\n",      __FILE__, __LINE__), objspace->flags.dont_gc = 1)
+#define dont_gc_off()         (fprintf(stderr, "dont_gc_off@%s:%d\n",     __FILE__, __LINE__), objspace->flags.dont_gc = 0)
+#define dont_gc_set(b)        (fprintf(stderr, "dont_gc_set(%d)@%s:%d\n", __FILE__, __LINE__), objspace->flags.dont_gc = (int)(b))
+#define dont_gc_val()         (objspace->flags.dont_gc)
+#else
+#define dont_gc_on()          (objspace->flags.dont_gc = 1)
+#define dont_gc_off()         (objspace->flags.dont_gc = 0)
+#define dont_gc_set(b)        (objspace->flags.dont_gc = (int)(b))
+#define dont_gc_val()         (objspace->flags.dont_gc)
+#endif
+
+#define gc_config_full_mark_set(b) (objspace->gc_config.full_mark = (int)(b))
+#define gc_config_full_mark_val    (objspace->gc_config.full_mark)
+
+#ifndef DURING_GC_COULD_MALLOC_REGION_START
+# define DURING_GC_COULD_MALLOC_REGION_START() \
+    assert(rb_during_gc()); \
+    bool _prev_enabled = rb_gc_impl_gc_enabled_p(objspace); \
+    rb_gc_impl_gc_disable(objspace, false)
+#endif
+
+#ifndef DURING_GC_COULD_MALLOC_REGION_END
+# define DURING_GC_COULD_MALLOC_REGION_END() \
+    if (_prev_enabled) rb_gc_impl_gc_enable(objspace)
+#endif
+
+static inline enum gc_mode
+gc_mode_verify(enum gc_mode mode)
+{
+#if RGENGC_CHECK_MODE > 0
+    switch (mode) {
+      case gc_mode_none:
+      case gc_mode_marking:
+      case gc_mode_sweeping:
+      case gc_mode_compacting:
+        break;
+      default:
+        rb_bug("gc_mode_verify: unreachable (%d)", (int)mode);
+    }
+#endif
+    return mode;
+}
+
+static inline bool
+has_sweeping_pages(rb_objspace_t *objspace)
+{
+    for (int i = 0; i < HEAP_COUNT; i++) {
+        if ((&heaps[i])->sweeping_page) {
+            return TRUE;
+        }
+    }
+    return FALSE;
+}
+
+static inline size_t
+heap_eden_total_pages(rb_objspace_t *objspace)
+{
+    size_t count = 0;
+    for (int i = 0; i < HEAP_COUNT; i++) {
+        count += (&heaps[i])->total_pages;
+    }
+    return count;
+}
+
+static inline size_t
+total_allocated_objects(rb_objspace_t *objspace)
+{
+    size_t count = 0;
+    for (int i = 0; i < HEAP_COUNT; i++) {
+        rb_heap_t *heap = &heaps[i];
+        count += heap->total_allocated_objects;
+    }
+    return count;
+}
+
+static inline size_t
+total_freed_objects(rb_objspace_t *objspace)
+{
+    size_t count = 0;
+    for (int i = 0; i < HEAP_COUNT; i++) {
+        rb_heap_t *heap = &heaps[i];
+        count += heap->total_freed_objects;
+    }
+    return count;
+}
+
+static inline size_t
+total_final_slots_count(rb_objspace_t *objspace)
+{
+    size_t count = 0;
+    for (int i = 0; i < HEAP_COUNT; i++) {
+        rb_heap_t *heap = &heaps[i];
+        count += heap->final_slots_count;
+    }
+    return count;
+}
+
+#define gc_mode(objspace)                gc_mode_verify((enum gc_mode)(objspace)->flags.mode)
+#define gc_mode_set(objspace, m)         ((objspace)->flags.mode = (unsigned int)gc_mode_verify(m))
+#define gc_needs_major_flags objspace->rgengc.need_major_gc
+
+#define is_marking(objspace)             (gc_mode(objspace) == gc_mode_marking)
+#define is_sweeping(objspace)            (gc_mode(objspace) == gc_mode_sweeping)
+#define is_full_marking(objspace)        ((objspace)->flags.during_minor_gc == FALSE)
+#define is_incremental_marking(objspace) ((objspace)->flags.during_incremental_marking != FALSE)
+#define will_be_incremental_marking(objspace) ((objspace)->rgengc.need_major_gc != GPR_FLAG_NONE)
+#define GC_INCREMENTAL_SWEEP_SLOT_COUNT 2048
+#define GC_INCREMENTAL_SWEEP_POOL_SLOT_COUNT 1024
+#define is_lazy_sweeping(objspace)           (GC_ENABLE_LAZY_SWEEP && has_sweeping_pages(objspace))
+
+#if SIZEOF_LONG == SIZEOF_VOIDP
+# define obj_id_to_ref(objid) ((objid) ^ FIXNUM_FLAG) /* unset FIXNUM_FLAG */
+#elif SIZEOF_LONG_LONG == SIZEOF_VOIDP
+# define obj_id_to_ref(objid) (FIXNUM_P(objid) ? \
+   ((objid) ^ FIXNUM_FLAG) : (NUM2PTR(objid) << 1))
+#else
+# error not supported
+#endif
+
+struct RZombie {
+    struct RBasic basic;
+    VALUE next;
+    void (*dfree)(void *);
+    void *data;
+};
+
+#define RZOMBIE(o) ((struct RZombie *)(o))
+
+static bool ruby_enable_autocompact = false;
+#if RGENGC_CHECK_MODE
+static gc_compact_compare_func ruby_autocompact_compare_func;
+#endif
+
+static void init_mark_stack(mark_stack_t *stack);
+static int garbage_collect(rb_objspace_t *, unsigned int reason);
+
+static int  gc_start(rb_objspace_t *objspace, unsigned int reason);
+static void gc_rest(rb_objspace_t *objspace);
+
+enum gc_enter_event {
+    gc_enter_event_start,
+    gc_enter_event_continue,
+    gc_enter_event_rest,
+    gc_enter_event_finalizer,
+};
+
+static inline void gc_enter(rb_objspace_t *objspace, enum gc_enter_event event, unsigned int *lock_lev);
+static inline void gc_exit(rb_objspace_t *objspace, enum gc_enter_event event, unsigned int *lock_lev);
+static void gc_marking_enter(rb_objspace_t *objspace);
+static void gc_marking_exit(rb_objspace_t *objspace);
+static void gc_sweeping_enter(rb_objspace_t *objspace);
+static void gc_sweeping_exit(rb_objspace_t *objspace);
+static bool gc_marks_continue(rb_objspace_t *objspace, rb_heap_t *heap);
+
+static void gc_sweep(rb_objspace_t *objspace);
+static void gc_sweep_finish_heap(rb_objspace_t *objspace, rb_heap_t *heap);
+static void gc_sweep_continue(rb_objspace_t *objspace, rb_heap_t *heap);
+
+static inline void gc_mark(rb_objspace_t *objspace, VALUE ptr);
+static inline void gc_pin(rb_objspace_t *objspace, VALUE ptr);
+static inline void gc_mark_and_pin(rb_objspace_t *objspace, VALUE ptr);
+
+static int gc_mark_stacked_objects_incremental(rb_objspace_t *, size_t count);
+NO_SANITIZE("memory", static inline bool is_pointer_to_heap(rb_objspace_t *objspace, const void *ptr));
+
+static void gc_verify_internal_consistency(void *objspace_ptr);
+
+static double getrusage_time(void);
+static inline void gc_prof_setup_new_record(rb_objspace_t *objspace, unsigned int reason);
+static inline void gc_prof_timer_start(rb_objspace_t *);
+static inline void gc_prof_timer_stop(rb_objspace_t *);
+static inline void gc_prof_mark_timer_start(rb_objspace_t *);
+static inline void gc_prof_mark_timer_stop(rb_objspace_t *);
+static inline void gc_prof_sweep_timer_start(rb_objspace_t *);
+static inline void gc_prof_sweep_timer_stop(rb_objspace_t *);
+static inline void gc_prof_set_malloc_info(rb_objspace_t *);
+static inline void gc_prof_set_heap_info(rb_objspace_t *);
+
+#define gc_prof_record(objspace) (objspace)->profile.current_record
+#define gc_prof_enabled(objspace) ((objspace)->profile.run && (objspace)->profile.current_record)
+
+#ifdef HAVE_VA_ARGS_MACRO
+# define gc_report(level, objspace, ...) \
+    if (!RGENGC_DEBUG_ENABLED(level)) {} else gc_report_body(level, objspace, __VA_ARGS__)
+#else
+# define gc_report if (!RGENGC_DEBUG_ENABLED(0)) {} else gc_report_body
+#endif
+PRINTF_ARGS(static void gc_report_body(int level, rb_objspace_t *objspace, const char *fmt, ...), 3, 4);
+
+static void gc_finalize_deferred(void *dmy);
+
+#if USE_TICK_T
+
+/* the following code is only for internal tuning. */
+
+/* Source code to use RDTSC is quoted and modified from
+ * https://www.mcs.anl.gov/~kazutomo/rdtsc.html
+ * written by Kazutomo Yoshii <kazutomo@mcs.anl.gov>
+ */
+
+#if defined(__GNUC__) && defined(__i386__)
+typedef unsigned long long tick_t;
+#define PRItick "llu"
+static inline tick_t
+tick(void)
+{
+    unsigned long long int x;
+    __asm__ __volatile__ ("rdtsc" : "=A" (x));
+    return x;
+}
+
+#elif defined(__GNUC__) && defined(__x86_64__)
+typedef unsigned long long tick_t;
+#define PRItick "llu"
+
+static __inline__ tick_t
+tick(void)
+{
+    unsigned long hi, lo;
+    __asm__ __volatile__ ("rdtsc" : "=a"(lo), "=d"(hi));
+    return ((unsigned long long)lo)|( ((unsigned long long)hi)<<32);
+}
+
+#elif defined(__powerpc64__) && (GCC_VERSION_SINCE(4,8,0) || defined(__clang__))
+typedef unsigned long long tick_t;
+#define PRItick "llu"
+
+static __inline__ tick_t
+tick(void)
+{
+    unsigned long long val = __builtin_ppc_get_timebase();
+    return val;
+}
+
+#elif defined(__POWERPC__) && defined(__APPLE__)
+/* Implementation for macOS PPC by @nobu
+ * See: https://github.com/ruby/ruby/pull/5975#discussion_r890045558
+ */
+typedef unsigned long long tick_t;
+#define PRItick "llu"
+
+static __inline__ tick_t
+tick(void)
+{
+    unsigned long int upper, lower, tmp;
+    # define mftbu(r) __asm__ volatile("mftbu   %0" : "=r"(r))
+    # define mftb(r)  __asm__ volatile("mftb    %0" : "=r"(r))
+        do {
+            mftbu(upper);
+            mftb(lower);
+            mftbu(tmp);
+        } while (tmp != upper);
+    return ((tick_t)upper << 32) | lower;
+}
+
+#elif defined(__aarch64__) &&  defined(__GNUC__)
+typedef unsigned long tick_t;
+#define PRItick "lu"
+
+static __inline__ tick_t
+tick(void)
+{
+    unsigned long val;
+    __asm__ __volatile__ ("mrs %0, cntvct_el0" : "=r" (val));
+    return val;
+}
+
+
+#elif defined(_WIN32) && defined(_MSC_VER)
+#include <intrin.h>
+typedef unsigned __int64 tick_t;
+#define PRItick "llu"
+
+static inline tick_t
+tick(void)
+{
+    return __rdtsc();
+}
+
+#else /* use clock */
+typedef clock_t tick_t;
+#define PRItick "llu"
+
+static inline tick_t
+tick(void)
+{
+    return clock();
+}
+#endif /* TSC */
+#else /* USE_TICK_T */
+#define MEASURE_LINE(expr) expr
+#endif /* USE_TICK_T */
+
+static inline VALUE check_rvalue_consistency(rb_objspace_t *objspace, const VALUE obj);
+
+#define RVALUE_MARKED_BITMAP(obj)         MARKED_IN_BITMAP(GET_HEAP_MARK_BITS(obj), (obj))
+#define RVALUE_WB_UNPROTECTED_BITMAP(obj) MARKED_IN_BITMAP(GET_HEAP_WB_UNPROTECTED_BITS(obj), (obj))
+#define RVALUE_MARKING_BITMAP(obj)        MARKED_IN_BITMAP(GET_HEAP_MARKING_BITS(obj), (obj))
+#define RVALUE_UNCOLLECTIBLE_BITMAP(obj)  MARKED_IN_BITMAP(GET_HEAP_UNCOLLECTIBLE_BITS(obj), (obj))
+#define RVALUE_PINNED_BITMAP(obj)         MARKED_IN_BITMAP(GET_HEAP_PINNED_BITS(obj), (obj))
+
+static inline int
+RVALUE_MARKED(rb_objspace_t *objspace, VALUE obj)
+{
+    check_rvalue_consistency(objspace, obj);
+    return RVALUE_MARKED_BITMAP(obj) != 0;
+}
+
+static inline int
+RVALUE_PINNED(rb_objspace_t *objspace, VALUE obj)
+{
+    check_rvalue_consistency(objspace, obj);
+    return RVALUE_PINNED_BITMAP(obj) != 0;
+}
+
+static inline int
+RVALUE_WB_UNPROTECTED(rb_objspace_t *objspace, VALUE obj)
+{
+    check_rvalue_consistency(objspace, obj);
+    return RVALUE_WB_UNPROTECTED_BITMAP(obj) != 0;
+}
+
+static inline int
+RVALUE_MARKING(rb_objspace_t *objspace, VALUE obj)
+{
+    check_rvalue_consistency(objspace, obj);
+    return RVALUE_MARKING_BITMAP(obj) != 0;
+}
+
+static inline int
+RVALUE_REMEMBERED(rb_objspace_t *objspace, VALUE obj)
+{
+    check_rvalue_consistency(objspace, obj);
+    return MARKED_IN_BITMAP(GET_HEAP_PAGE(obj)->remembered_bits, obj) != 0;
+}
+
+static inline int
+RVALUE_UNCOLLECTIBLE(rb_objspace_t *objspace, VALUE obj)
+{
+    check_rvalue_consistency(objspace, obj);
+    return RVALUE_UNCOLLECTIBLE_BITMAP(obj) != 0;
+}
+
+#define RVALUE_PAGE_WB_UNPROTECTED(page, obj) MARKED_IN_BITMAP((page)->wb_unprotected_bits, (obj))
+#define RVALUE_PAGE_UNCOLLECTIBLE(page, obj)  MARKED_IN_BITMAP((page)->uncollectible_bits, (obj))
+#define RVALUE_PAGE_MARKING(page, obj)        MARKED_IN_BITMAP((page)->marking_bits, (obj))
+
+static int rgengc_remember(rb_objspace_t *objspace, VALUE obj);
+static void rgengc_mark_and_rememberset_clear(rb_objspace_t *objspace, rb_heap_t *heap);
+static void rgengc_rememberset_mark(rb_objspace_t *objspace, rb_heap_t *heap);
+
+static int
+check_rvalue_consistency_force(rb_objspace_t *objspace, const VALUE obj, int terminate)
+{
+    int err = 0;
+
+    int lev = RB_GC_VM_LOCK_NO_BARRIER();
+    {
+        if (SPECIAL_CONST_P(obj)) {
+            fprintf(stderr, "check_rvalue_consistency: %p is a special const.\n", (void *)obj);
+            err++;
+        }
+        else if (!is_pointer_to_heap(objspace, (void *)obj)) {
+            struct heap_page *empty_page = objspace->empty_pages;
+            while (empty_page) {
+                if ((uintptr_t)empty_page->body <= (uintptr_t)obj &&
+                        (uintptr_t)obj < (uintptr_t)empty_page->body + HEAP_PAGE_SIZE) {
+                    GC_ASSERT(heap_page_in_global_empty_pages_pool(objspace, empty_page));
+                    fprintf(stderr, "check_rvalue_consistency: %p is in an empty page (%p).\n",
+                            (void *)obj, (void *)empty_page);
+                    err++;
+                    goto skip;
+                }
+            }
+            fprintf(stderr, "check_rvalue_consistency: %p is not a Ruby object.\n", (void *)obj);
+            err++;
+          skip:
+            ;
+        }
+        else {
+            const int wb_unprotected_bit = RVALUE_WB_UNPROTECTED_BITMAP(obj) != 0;
+            const int uncollectible_bit = RVALUE_UNCOLLECTIBLE_BITMAP(obj) != 0;
+            const int mark_bit = RVALUE_MARKED_BITMAP(obj) != 0;
+            const int marking_bit = RVALUE_MARKING_BITMAP(obj) != 0;
+            const int remembered_bit = MARKED_IN_BITMAP(GET_HEAP_PAGE(obj)->remembered_bits, obj) != 0;
+            const int age = RVALUE_AGE_GET((VALUE)obj);
+
+            if (heap_page_in_global_empty_pages_pool(objspace, GET_HEAP_PAGE(obj))) {
+                fprintf(stderr, "check_rvalue_consistency: %s is in tomb page.\n", rb_obj_info(obj));
+                err++;
+            }
+            if (BUILTIN_TYPE(obj) == T_NONE) {
+                fprintf(stderr, "check_rvalue_consistency: %s is T_NONE.\n", rb_obj_info(obj));
+                err++;
+            }
+            if (BUILTIN_TYPE(obj) == T_ZOMBIE) {
+                fprintf(stderr, "check_rvalue_consistency: %s is T_ZOMBIE.\n", rb_obj_info(obj));
+                err++;
+            }
+
+            if (BUILTIN_TYPE(obj) != T_DATA) {
+                rb_obj_memsize_of((VALUE)obj);
+            }
+
+            /* check generation
+             *
+             * OLD == age == 3 && old-bitmap && mark-bit (except incremental marking)
+             */
+            if (age > 0 && wb_unprotected_bit) {
+                fprintf(stderr, "check_rvalue_consistency: %s is not WB protected, but age is %d > 0.\n", rb_obj_info(obj), age);
+                err++;
+            }
+
+            if (!is_marking(objspace) && uncollectible_bit && !mark_bit) {
+                fprintf(stderr, "check_rvalue_consistency: %s is uncollectible, but is not marked while !gc.\n", rb_obj_info(obj));
+                err++;
+            }
+
+            if (!is_full_marking(objspace)) {
+                if (uncollectible_bit && age != RVALUE_OLD_AGE && !wb_unprotected_bit) {
+                    fprintf(stderr, "check_rvalue_consistency: %s is uncollectible, but not old (age: %d) and not WB unprotected.\n",
+                            rb_obj_info(obj), age);
+                    err++;
+                }
+                if (remembered_bit && age != RVALUE_OLD_AGE) {
+                    fprintf(stderr, "check_rvalue_consistency: %s is remembered, but not old (age: %d).\n",
+                            rb_obj_info(obj), age);
+                    err++;
+                }
+            }
+
+            /*
+             * check coloring
+             *
+             *               marking:false marking:true
+             * marked:false  white         *invalid*
+             * marked:true   black         grey
+             */
+            if (is_incremental_marking(objspace) && marking_bit) {
+                if (!is_marking(objspace) && !mark_bit) {
+                    fprintf(stderr, "check_rvalue_consistency: %s is marking, but not marked.\n", rb_obj_info(obj));
+                    err++;
+                }
+            }
+        }
+    }
+    RB_GC_VM_UNLOCK_NO_BARRIER(lev);
+
+    if (err > 0 && terminate) {
+        rb_bug("check_rvalue_consistency_force: there is %d errors.", err);
+    }
+    return err;
+}
+
+#if RGENGC_CHECK_MODE == 0
+static inline VALUE
+check_rvalue_consistency(rb_objspace_t *objspace, const VALUE obj)
+{
+    return obj;
+}
+#else
+static VALUE
+check_rvalue_consistency(rb_objspace_t *objspace, const VALUE obj)
+{
+    check_rvalue_consistency_force(objspace, obj, TRUE);
+    return obj;
+}
+#endif
+
+static inline bool
+gc_object_moved_p(rb_objspace_t *objspace, VALUE obj)
+{
+    if (RB_SPECIAL_CONST_P(obj)) {
+        return FALSE;
+    }
+    else {
+        int ret;
+        asan_unpoisoning_object(obj) {
+            ret = BUILTIN_TYPE(obj) == T_MOVED;
+        }
+        return ret;
+    }
+}
+
+static inline int
+RVALUE_OLD_P(rb_objspace_t *objspace, VALUE obj)
+{
+    GC_ASSERT(!RB_SPECIAL_CONST_P(obj));
+    check_rvalue_consistency(objspace, obj);
+    // Because this will only ever be called on GC controlled objects,
+    // we can use the faster _RAW function here
+    return RB_OBJ_PROMOTED_RAW(obj);
+}
+
+static inline void
+RVALUE_PAGE_OLD_UNCOLLECTIBLE_SET(rb_objspace_t *objspace, struct heap_page *page, VALUE obj)
+{
+    MARK_IN_BITMAP(&page->uncollectible_bits[0], obj);
+    objspace->rgengc.old_objects++;
+
+#if RGENGC_PROFILE >= 2
+    objspace->profile.total_promoted_count++;
+    objspace->profile.promoted_types[BUILTIN_TYPE(obj)]++;
+#endif
+}
+
+static inline void
+RVALUE_OLD_UNCOLLECTIBLE_SET(rb_objspace_t *objspace, VALUE obj)
+{
+    RB_DEBUG_COUNTER_INC(obj_promote);
+    RVALUE_PAGE_OLD_UNCOLLECTIBLE_SET(objspace, GET_HEAP_PAGE(obj), obj);
+}
+
+/* set age to age+1 */
+static inline void
+RVALUE_AGE_INC(rb_objspace_t *objspace, VALUE obj)
+{
+    int age = RVALUE_AGE_GET((VALUE)obj);
+
+    if (RGENGC_CHECK_MODE && age == RVALUE_OLD_AGE) {
+        rb_bug("RVALUE_AGE_INC: can not increment age of OLD object %s.", rb_obj_info(obj));
+    }
+
+    age++;
+    RVALUE_AGE_SET(obj, age);
+
+    if (age == RVALUE_OLD_AGE) {
+        RVALUE_OLD_UNCOLLECTIBLE_SET(objspace, obj);
+    }
+
+    check_rvalue_consistency(objspace, obj);
+}
+
+static inline void
+RVALUE_AGE_SET_CANDIDATE(rb_objspace_t *objspace, VALUE obj)
+{
+    check_rvalue_consistency(objspace, obj);
+    GC_ASSERT(!RVALUE_OLD_P(objspace, obj));
+    RVALUE_AGE_SET(obj, RVALUE_OLD_AGE - 1);
+    check_rvalue_consistency(objspace, obj);
+}
+
+static inline void
+RVALUE_AGE_RESET(VALUE obj)
+{
+    RVALUE_AGE_SET(obj, 0);
+}
+
+static inline void
+RVALUE_DEMOTE(rb_objspace_t *objspace, VALUE obj)
+{
+    check_rvalue_consistency(objspace, obj);
+    GC_ASSERT(RVALUE_OLD_P(objspace, obj));
+
+    if (!is_incremental_marking(objspace) && RVALUE_REMEMBERED(objspace, obj)) {
+        CLEAR_IN_BITMAP(GET_HEAP_PAGE(obj)->remembered_bits, obj);
+    }
+
+    CLEAR_IN_BITMAP(GET_HEAP_UNCOLLECTIBLE_BITS(obj), obj);
+    RVALUE_AGE_RESET(obj);
+
+    if (RVALUE_MARKED(objspace, obj)) {
+        objspace->rgengc.old_objects--;
+    }
+
+    check_rvalue_consistency(objspace, obj);
+}
+
+static inline int
+RVALUE_BLACK_P(rb_objspace_t *objspace, VALUE obj)
+{
+    return RVALUE_MARKED(objspace, obj) && !RVALUE_MARKING(objspace, obj);
+}
+
+static inline int
+RVALUE_WHITE_P(rb_objspace_t *objspace, VALUE obj)
+{
+    return !RVALUE_MARKED(objspace, obj);
+}
+
+bool
+rb_gc_impl_gc_enabled_p(void *objspace_ptr)
+{
+    rb_objspace_t *objspace = objspace_ptr;
+    return !dont_gc_val();
+}
+
+void
+rb_gc_impl_gc_enable(void *objspace_ptr)
+{
+    rb_objspace_t *objspace = objspace_ptr;
+
+    dont_gc_off();
+}
+
+void
+rb_gc_impl_gc_disable(void *objspace_ptr, bool finish_current_gc)
+{
+    rb_objspace_t *objspace = objspace_ptr;
+
+    if (finish_current_gc) {
+        gc_rest(objspace);
+    }
+
+    dont_gc_on();
+}
+
+/*
+  --------------------------- ObjectSpace -----------------------------
+*/
+
+static inline void *
+calloc1(size_t n)
+{
+    return calloc(1, n);
+}
+
+void
+rb_gc_impl_set_event_hook(void *objspace_ptr, const rb_event_flag_t event)
+{
+    rb_objspace_t *objspace = objspace_ptr;
+    objspace->hook_events = event & RUBY_INTERNAL_EVENT_OBJSPACE_MASK;
+    objspace->flags.has_newobj_hook = !!(objspace->hook_events & RUBY_INTERNAL_EVENT_NEWOBJ);
+}
+
+unsigned long long
+rb_gc_impl_get_total_time(void *objspace_ptr)
+{
+    rb_objspace_t *objspace = objspace_ptr;
+
+    unsigned long long marking_time = objspace->profile.marking_time_ns;
+    unsigned long long sweeping_time = objspace->profile.sweeping_time_ns;
+
+    return marking_time + sweeping_time;
+}
+
+void
+rb_gc_impl_set_measure_total_time(void *objspace_ptr, VALUE flag)
+{
+    rb_objspace_t *objspace = objspace_ptr;
+
+    objspace->flags.measure_gc = RTEST(flag) ? TRUE : FALSE;
+}
+
+bool
+rb_gc_impl_get_measure_total_time(void *objspace_ptr)
+{
+    rb_objspace_t *objspace = objspace_ptr;
+
+    return objspace->flags.measure_gc;
+}
+
+static size_t
+minimum_slots_for_heap(rb_objspace_t *objspace, rb_heap_t *heap)
+{
+    size_t heap_idx = heap - heaps;
+    return gc_params.heap_init_slots[heap_idx];
+}
+
+/* garbage objects will be collected soon. */
+bool
+rb_gc_impl_garbage_object_p(void *objspace_ptr, VALUE ptr)
+{
+    rb_objspace_t *objspace = objspace_ptr;
+
+    bool dead = false;
+
+    asan_unpoisoning_object(ptr) {
+        switch (BUILTIN_TYPE(ptr)) {
+          case T_NONE:
+          case T_MOVED:
+          case T_ZOMBIE:
+            dead = true;
+            break;
+          default:
+            break;
+        }
+    }
+
+    if (dead) return true;
+    return is_lazy_sweeping(objspace) && GET_HEAP_PAGE(ptr)->flags.before_sweep &&
+        !RVALUE_MARKED(objspace, ptr);
+}
+
+static void free_stack_chunks(mark_stack_t *);
+static void mark_stack_free_cache(mark_stack_t *);
+static void heap_page_free(rb_objspace_t *objspace, struct heap_page *page);
+
+static inline void
+heap_page_add_freeobj(rb_objspace_t *objspace, struct heap_page *page, VALUE obj)
+{
+    rb_asan_unpoison_object(obj, false);
+
+    asan_unlock_freelist(page);
+
+    struct free_slot *slot = (struct free_slot *)obj;
+    slot->flags = 0;
+    slot->next = page->freelist;
+    page->freelist = slot;
+    asan_lock_freelist(page);
+
+    RVALUE_AGE_RESET(obj);
+
+    if (RGENGC_CHECK_MODE &&
+        /* obj should belong to page */
+        !(page->start <= (uintptr_t)obj &&
+          (uintptr_t)obj   <  ((uintptr_t)page->start + (page->total_slots * page->slot_size)) &&
+          obj % BASE_SLOT_SIZE == 0)) {
+        rb_bug("heap_page_add_freeobj: %p is not rvalue.", (void *)obj);
+    }
+
+    rb_asan_poison_object(obj);
+    gc_report(3, objspace, "heap_page_add_freeobj: add %p to freelist\n", (void *)obj);
+}
+
+static void
+heap_allocatable_slots_expand(rb_objspace_t *objspace,
+        rb_heap_t *heap, size_t free_slots, size_t total_slots)
+{
+    double goal_ratio = gc_params.heap_free_slots_goal_ratio;
+    size_t target_total_slots;
+
+    if (goal_ratio == 0.0) {
+        target_total_slots = (size_t)(total_slots * gc_params.growth_factor);
+    }
+    else if (total_slots == 0) {
+        target_total_slots = minimum_slots_for_heap(objspace, heap);
+    }
+    else {
+        /* Find `f' where free_slots = f * total_slots * goal_ratio
+         * => f = (total_slots - free_slots) / ((1 - goal_ratio) * total_slots)
+         */
+        double f = (double)(total_slots - free_slots) / ((1 - goal_ratio) * total_slots);
+
+        if (f > gc_params.growth_factor) f = gc_params.growth_factor;
+        if (f < 1.0) f = 1.1;
+
+        target_total_slots = (size_t)(f * total_slots);
+
+        if (0) {
+            fprintf(stderr,
+                    "free_slots(%8"PRIuSIZE")/total_slots(%8"PRIuSIZE")=%1.2f,"
+                    " G(%1.2f), f(%1.2f),"
+                    " total_slots(%8"PRIuSIZE") => target_total_slots(%8"PRIuSIZE")\n",
+                    free_slots, total_slots, free_slots/(double)total_slots,
+                    goal_ratio, f, total_slots, target_total_slots);
+        }
+    }
+
+    if (gc_params.growth_max_slots > 0) {
+        size_t max_total_slots = (size_t)(total_slots + gc_params.growth_max_slots);
+        if (target_total_slots > max_total_slots) target_total_slots = max_total_slots;
+    }
+
+    size_t extend_slot_count = target_total_slots - total_slots;
+    /* Extend by at least 1 page. */
+    if (extend_slot_count == 0) extend_slot_count = 1;
+
+    objspace->heap_pages.allocatable_slots += extend_slot_count;
+}
+
+static inline void
+heap_add_freepage(rb_heap_t *heap, struct heap_page *page)
+{
+    asan_unlock_freelist(page);
+    GC_ASSERT(page->free_slots != 0);
+    GC_ASSERT(page->freelist != NULL);
+
+    page->free_next = heap->free_pages;
+    heap->free_pages = page;
+
+    RUBY_DEBUG_LOG("page:%p freelist:%p", (void *)page, (void *)page->freelist);
+
+    asan_lock_freelist(page);
+}
+
+static inline void
+heap_add_poolpage(rb_objspace_t *objspace, rb_heap_t *heap, struct heap_page *page)
+{
+    asan_unlock_freelist(page);
+    GC_ASSERT(page->free_slots != 0);
+    GC_ASSERT(page->freelist != NULL);
+
+    page->free_next = heap->pooled_pages;
+    heap->pooled_pages = page;
+    objspace->rincgc.pooled_slots += page->free_slots;
+
+    asan_lock_freelist(page);
+}
+
+static void
+heap_unlink_page(rb_objspace_t *objspace, rb_heap_t *heap, struct heap_page *page)
+{
+    ccan_list_del(&page->page_node);
+    heap->total_pages--;
+    heap->total_slots -= page->total_slots;
+}
+
+static void
+gc_aligned_free(void *ptr, size_t size)
+{
+#if defined __MINGW32__
+    __mingw_aligned_free(ptr);
+#elif defined _WIN32
+    _aligned_free(ptr);
+#elif defined(HAVE_POSIX_MEMALIGN) || defined(HAVE_MEMALIGN)
+    free(ptr);
+#else
+    free(((void**)ptr)[-1]);
+#endif
+}
+
+static void
+heap_page_body_free(struct heap_page_body *page_body)
+{
+    GC_ASSERT((uintptr_t)page_body % HEAP_PAGE_ALIGN == 0);
+
+    if (HEAP_PAGE_ALLOC_USE_MMAP) {
+#ifdef HAVE_MMAP
+        GC_ASSERT(HEAP_PAGE_SIZE % sysconf(_SC_PAGE_SIZE) == 0);
+        if (munmap(page_body, HEAP_PAGE_SIZE)) {
+            rb_bug("heap_page_body_free: munmap failed");
+        }
+#endif
+    }
+    else {
+        gc_aligned_free(page_body, HEAP_PAGE_SIZE);
+    }
+}
+
+static void
+heap_page_free(rb_objspace_t *objspace, struct heap_page *page)
+{
+    objspace->heap_pages.freed_pages++;
+    heap_page_body_free(page->body);
+    free(page);
+}
+
+static void
+heap_pages_free_unused_pages(rb_objspace_t *objspace)
+{
+    if (objspace->empty_pages != NULL && heap_pages_freeable_pages > 0) {
+        GC_ASSERT(objspace->empty_pages_count > 0);
+        objspace->empty_pages = NULL;
+        objspace->empty_pages_count = 0;
+
+        size_t i, j;
+        for (i = j = 0; i < rb_darray_size(objspace->heap_pages.sorted); i++) {
+            struct heap_page *page = rb_darray_get(objspace->heap_pages.sorted, i);
+
+            if (heap_page_in_global_empty_pages_pool(objspace, page) && heap_pages_freeable_pages > 0) {
+                heap_page_free(objspace, page);
+                heap_pages_freeable_pages--;
+            }
+            else {
+                if (heap_page_in_global_empty_pages_pool(objspace, page)) {
+                    page->free_next = objspace->empty_pages;
+                    objspace->empty_pages = page;
+                    objspace->empty_pages_count++;
+                }
+
+                if (i != j) {
+                    rb_darray_set(objspace->heap_pages.sorted, j, page);
+                }
+                j++;
+            }
+        }
+
+        rb_darray_pop(objspace->heap_pages.sorted, i - j);
+        GC_ASSERT(rb_darray_size(objspace->heap_pages.sorted) == j);
+
+        struct heap_page *hipage = rb_darray_get(objspace->heap_pages.sorted, rb_darray_size(objspace->heap_pages.sorted) - 1);
+        uintptr_t himem = (uintptr_t)hipage->body + HEAP_PAGE_SIZE;
+        GC_ASSERT(himem <= heap_pages_himem);
+        heap_pages_himem = himem;
+
+        struct heap_page *lopage = rb_darray_get(objspace->heap_pages.sorted, 0);
+        uintptr_t lomem = (uintptr_t)lopage->body + sizeof(struct heap_page_header);
+        GC_ASSERT(lomem >= heap_pages_lomem);
+        heap_pages_lomem = lomem;
+    }
+}
+
+static void *
+gc_aligned_malloc(size_t alignment, size_t size)
+{
+    /* alignment must be a power of 2 */
+    GC_ASSERT(((alignment - 1) & alignment) == 0);
+    GC_ASSERT(alignment % sizeof(void*) == 0);
+
+    void *res;
+
+#if defined __MINGW32__
+    res = __mingw_aligned_malloc(size, alignment);
+#elif defined _WIN32
+    void *_aligned_malloc(size_t, size_t);
+    res = _aligned_malloc(size, alignment);
+#elif defined(HAVE_POSIX_MEMALIGN)
+    if (posix_memalign(&res, alignment, size) != 0) {
+        return NULL;
+    }
+#elif defined(HAVE_MEMALIGN)
+    res = memalign(alignment, size);
+#else
+    char* aligned;
+    res = malloc(alignment + size + sizeof(void*));
+    aligned = (char*)res + alignment + sizeof(void*);
+    aligned -= ((VALUE)aligned & (alignment - 1));
+    ((void**)aligned)[-1] = res;
+    res = (void*)aligned;
+#endif
+
+    GC_ASSERT((uintptr_t)res % alignment == 0);
+
+    return res;
+}
+
+static struct heap_page_body *
+heap_page_body_allocate(void)
+{
+    struct heap_page_body *page_body;
+
+    if (HEAP_PAGE_ALLOC_USE_MMAP) {
+#ifdef HAVE_MMAP
+        GC_ASSERT(HEAP_PAGE_ALIGN % sysconf(_SC_PAGE_SIZE) == 0);
+
+        size_t mmap_size = HEAP_PAGE_ALIGN + HEAP_PAGE_SIZE;
+        char *ptr = mmap(NULL, mmap_size,
+                         PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
+        if (ptr == MAP_FAILED) {
+            return NULL;
+        }
+
+        // If we are building `default.c` as part of the ruby executable, we
+        // may just call `ruby_annotate_mmap`.  But if we are building
+        // `default.c` as a shared library, we will not have access to private
+        // symbols, and we have to either call prctl directly or make our own
+        // wrapper.
+#if defined(HAVE_SYS_PRCTL_H) && defined(PR_SET_VMA) && defined(PR_SET_VMA_ANON_NAME)
+        prctl(PR_SET_VMA, PR_SET_VMA_ANON_NAME, ptr, mmap_size, "Ruby:GC:default:heap_page_body_allocate");
+        errno = 0;
+#endif
+
+        char *aligned = ptr + HEAP_PAGE_ALIGN;
+        aligned -= ((VALUE)aligned & (HEAP_PAGE_ALIGN - 1));
+        GC_ASSERT(aligned > ptr);
+        GC_ASSERT(aligned <= ptr + HEAP_PAGE_ALIGN);
+
+        size_t start_out_of_range_size = aligned - ptr;
+        GC_ASSERT(start_out_of_range_size % sysconf(_SC_PAGE_SIZE) == 0);
+        if (start_out_of_range_size > 0) {
+            if (munmap(ptr, start_out_of_range_size)) {
+                rb_bug("heap_page_body_allocate: munmap failed for start");
+            }
+        }
+
+        size_t end_out_of_range_size = HEAP_PAGE_ALIGN - start_out_of_range_size;
+        GC_ASSERT(end_out_of_range_size % sysconf(_SC_PAGE_SIZE) == 0);
+        if (end_out_of_range_size > 0) {
+            if (munmap(aligned + HEAP_PAGE_SIZE, end_out_of_range_size)) {
+                rb_bug("heap_page_body_allocate: munmap failed for end");
+            }
+        }
+
+        page_body = (struct heap_page_body *)aligned;
+#endif
+    }
+    else {
+        page_body = gc_aligned_malloc(HEAP_PAGE_ALIGN, HEAP_PAGE_SIZE);
+    }
+
+    GC_ASSERT((uintptr_t)page_body % HEAP_PAGE_ALIGN == 0);
+
+    return page_body;
+}
+
+static struct heap_page *
+heap_page_resurrect(rb_objspace_t *objspace)
+{
+    struct heap_page *page = NULL;
+    if (objspace->empty_pages != NULL) {
+        GC_ASSERT(objspace->empty_pages_count > 0);
+        objspace->empty_pages_count--;
+        page = objspace->empty_pages;
+        objspace->empty_pages = page->free_next;
+    }
+
+    return page;
+}
+
+static struct heap_page *
+heap_page_allocate(rb_objspace_t *objspace)
+{
+    struct heap_page_body *page_body = heap_page_body_allocate();
+    if (page_body == 0) {
+        rb_memerror();
+    }
+
+    struct heap_page *page = calloc1(sizeof(struct heap_page));
+    if (page == 0) {
+        heap_page_body_free(page_body);
+        rb_memerror();
+    }
+
+    uintptr_t start = (uintptr_t)page_body + sizeof(struct heap_page_header);
+    uintptr_t end = (uintptr_t)page_body + HEAP_PAGE_SIZE;
+
+    size_t lo = 0;
+    size_t hi = rb_darray_size(objspace->heap_pages.sorted);
+    while (lo < hi) {
+        struct heap_page *mid_page;
+
+        size_t mid = (lo + hi) / 2;
+        mid_page = rb_darray_get(objspace->heap_pages.sorted, mid);
+        if ((uintptr_t)mid_page->start < start) {
+            lo = mid + 1;
+        }
+        else if ((uintptr_t)mid_page->start > start) {
+            hi = mid;
+        }
+        else {
+            rb_bug("same heap page is allocated: %p at %"PRIuVALUE, (void *)page_body, (VALUE)mid);
+        }
+    }
+
+    rb_darray_insert_without_gc(&objspace->heap_pages.sorted, hi, page);
+
+    if (heap_pages_lomem == 0 || heap_pages_lomem > start) heap_pages_lomem = start;
+    if (heap_pages_himem < end) heap_pages_himem = end;
+
+    page->body = page_body;
+    page_body->header.page = page;
+
+    objspace->heap_pages.allocated_pages++;
+
+    return page;
+}
+
+static void
+heap_add_page(rb_objspace_t *objspace, rb_heap_t *heap, struct heap_page *page)
+{
+    /* Adding to eden heap during incremental sweeping is forbidden */
+    GC_ASSERT(!heap->sweeping_page);
+    GC_ASSERT(heap_page_in_global_empty_pages_pool(objspace, page));
+
+    /* adjust obj_limit (object number available in this page) */
+    uintptr_t start = (uintptr_t)page->body + sizeof(struct heap_page_header);
+    if (start % BASE_SLOT_SIZE != 0) {
+        int delta = BASE_SLOT_SIZE - (start % BASE_SLOT_SIZE);
+        start = start + delta;
+        GC_ASSERT(NUM_IN_PAGE(start) == 0 || NUM_IN_PAGE(start) == 1);
+
+        /* Find a num in page that is evenly divisible by `stride`.
+         * This is to ensure that objects are aligned with bit planes.
+         * In other words, ensure there are an even number of objects
+         * per bit plane. */
+        if (NUM_IN_PAGE(start) == 1) {
+            start += heap->slot_size - BASE_SLOT_SIZE;
+        }
+
+        GC_ASSERT(NUM_IN_PAGE(start) * BASE_SLOT_SIZE % heap->slot_size == 0);
+    }
+
+    int slot_count = (int)((HEAP_PAGE_SIZE - (start - (uintptr_t)page->body))/heap->slot_size);
+
+    page->start = start;
+    page->total_slots = slot_count;
+    page->slot_size = heap->slot_size;
+    page->heap = heap;
+
+    asan_unlock_freelist(page);
+    page->freelist = NULL;
+    asan_unpoison_memory_region(page->body, HEAP_PAGE_SIZE, false);
+    for (VALUE p = (VALUE)start; p < start + (slot_count * heap->slot_size); p += heap->slot_size) {
+        heap_page_add_freeobj(objspace, page, p);
+    }
+    asan_lock_freelist(page);
+
+    page->free_slots = slot_count;
+
+    heap->total_allocated_pages++;
+
+    ccan_list_add_tail(&heap->pages, &page->page_node);
+    heap->total_pages++;
+    heap->total_slots += page->total_slots;
+}
+
+static int
+heap_page_allocate_and_initialize(rb_objspace_t *objspace, rb_heap_t *heap)
+{
+    gc_report(1, objspace, "heap_page_allocate_and_initialize: rb_darray_size(objspace->heap_pages.sorted): %"PRIdSIZE", "
+                  "allocatable_slots: %"PRIdSIZE", heap->total_pages: %"PRIdSIZE"\n",
+                  rb_darray_size(objspace->heap_pages.sorted), objspace->heap_pages.allocatable_slots, heap->total_pages);
+
+    bool allocated = false;
+    struct heap_page *page = heap_page_resurrect(objspace);
+
+    if (page == NULL && objspace->heap_pages.allocatable_slots > 0) {
+        page = heap_page_allocate(objspace);
+        allocated = true;
+    }
+
+    if (page != NULL) {
+        heap_add_page(objspace, heap, page);
+        heap_add_freepage(heap, page);
+
+        if (allocated) {
+            if (objspace->heap_pages.allocatable_slots > (size_t)page->total_slots) {
+                objspace->heap_pages.allocatable_slots -= page->total_slots;
+            }
+            else {
+                objspace->heap_pages.allocatable_slots = 0;
+            }
+        }
+    }
+
+    return page != NULL;
+}
+
+static void
+heap_page_allocate_and_initialize_force(rb_objspace_t *objspace, rb_heap_t *heap)
+{
+    size_t prev_allocatable_slots = objspace->heap_pages.allocatable_slots;
+    // Set allocatable slots to 1 to force a page to be created.
+    objspace->heap_pages.allocatable_slots = 1;
+    heap_page_allocate_and_initialize(objspace, heap);
+    GC_ASSERT(heap->free_pages != NULL);
+    objspace->heap_pages.allocatable_slots = prev_allocatable_slots;
+}
+
+static void
+gc_continue(rb_objspace_t *objspace, rb_heap_t *heap)
+{
+    unsigned int lock_lev;
+    gc_enter(objspace, gc_enter_event_continue, &lock_lev);
+
+    /* Continue marking if in incremental marking. */
+    if (is_incremental_marking(objspace)) {
+        if (gc_marks_continue(objspace, heap)) {
+            gc_sweep(objspace);
+        }
+    }
+
+    /* Continue sweeping if in lazy sweeping or the previous incremental
+     * marking finished and did not yield a free page. */
+    if (heap->free_pages == NULL && is_lazy_sweeping(objspace)) {
+        gc_sweep_continue(objspace, heap);
+    }
+
+    gc_exit(objspace, gc_enter_event_continue, &lock_lev);
+}
+
+static void
+heap_prepare(rb_objspace_t *objspace, rb_heap_t *heap)
+{
+    GC_ASSERT(heap->free_pages == NULL);
+
+    if (heap->total_slots < gc_params.heap_init_slots[heap - heaps] &&
+            heap->sweeping_page == NULL) {
+        heap_page_allocate_and_initialize_force(objspace, heap);
+        GC_ASSERT(heap->free_pages != NULL);
+        return;
+    }
+
+    /* Continue incremental marking or lazy sweeping, if in any of those steps. */
+    gc_continue(objspace, heap);
+
+    if (heap->free_pages == NULL) {
+        heap_page_allocate_and_initialize(objspace, heap);
+    }
+
+    /* If we still don't have a free page and not allowed to create a new page,
+     * we should start a new GC cycle. */
+    if (heap->free_pages == NULL) {
+        if (gc_start(objspace, GPR_FLAG_NEWOBJ) == FALSE) {
+            rb_memerror();
+        }
+        else {
+            if (objspace->heap_pages.allocatable_slots == 0 && !gc_config_full_mark_val) {
+                heap_allocatable_slots_expand(objspace, heap,
+                        heap->freed_slots + heap->empty_slots,
+                        heap->total_slots);
+                GC_ASSERT(objspace->heap_pages.allocatable_slots > 0);
+            }
+            /* Do steps of incremental marking or lazy sweeping if the GC run permits. */
+            gc_continue(objspace, heap);
+
+            /* If we're not incremental marking (e.g. a minor GC) or finished
+             * sweeping and still don't have a free page, then
+             * gc_sweep_finish_heap should allow us to create a new page. */
+            if (heap->free_pages == NULL && !heap_page_allocate_and_initialize(objspace, heap)) {
+                if (gc_needs_major_flags == GPR_FLAG_NONE) {
+                    rb_bug("cannot create a new page after GC");
+                }
+                else { // Major GC is required, which will allow us to create new page
+                    if (gc_start(objspace, GPR_FLAG_NEWOBJ) == FALSE) {
+                        rb_memerror();
+                    }
+                    else {
+                        /* Do steps of incremental marking or lazy sweeping. */
+                        gc_continue(objspace, heap);
+
+                        if (heap->free_pages == NULL &&
+                                !heap_page_allocate_and_initialize(objspace, heap)) {
+                            rb_bug("cannot create a new page after major GC");
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    GC_ASSERT(heap->free_pages != NULL);
+}
+
+static inline VALUE
+newobj_fill(VALUE obj, VALUE v1, VALUE v2, VALUE v3)
+{
+    VALUE *p = (VALUE *)(obj + sizeof(struct RBasic));
+    p[0] = v1;
+    p[1] = v2;
+    p[2] = v3;
+    return obj;
+}
+
+#if GC_DEBUG
+static inline const char*
+rb_gc_impl_source_location_cstr(int *ptr)
+{
+    /* We could directly refer `rb_source_location_cstr()` before, but not any
+     * longer.  We have to heavy lift using our debugging API. */
+    if (! ptr) {
+        return NULL;
+    }
+    else if (! (*ptr = rb_sourceline())) {
+        return NULL;
+    }
+    else {
+        return rb_sourcefile();
+    }
+}
+#endif
+
+static inline VALUE
+newobj_init(VALUE klass, VALUE flags, int wb_protected, rb_objspace_t *objspace, VALUE obj)
+{
+    GC_ASSERT(BUILTIN_TYPE(obj) == T_NONE);
+    GC_ASSERT((flags & FL_WB_PROTECTED) == 0);
+    RBASIC(obj)->flags = flags;
+    *((VALUE *)&RBASIC(obj)->klass) = klass;
+#if RBASIC_SHAPE_ID_FIELD
+    RBASIC(obj)->shape_id = 0;
+#endif
+
+    int t = flags & RUBY_T_MASK;
+    if (t == T_CLASS || t == T_MODULE || t == T_ICLASS) {
+        RVALUE_AGE_SET_CANDIDATE(objspace, obj);
+    }
+
+#if RACTOR_CHECK_MODE
+    void rb_ractor_setup_belonging(VALUE obj);
+    rb_ractor_setup_belonging(obj);
+#endif
+
+#if RGENGC_CHECK_MODE
+    newobj_fill(obj, 0, 0, 0);
+
+    int lev = RB_GC_VM_LOCK_NO_BARRIER();
+    {
+        check_rvalue_consistency(objspace, obj);
+
+        GC_ASSERT(RVALUE_MARKED(objspace, obj) == FALSE);
+        GC_ASSERT(RVALUE_MARKING(objspace, obj) == FALSE);
+        GC_ASSERT(RVALUE_OLD_P(objspace, obj) == FALSE);
+        GC_ASSERT(RVALUE_WB_UNPROTECTED(objspace, obj) == FALSE);
+
+        if (RVALUE_REMEMBERED(objspace, obj)) rb_bug("newobj: %s is remembered.", rb_obj_info(obj));
+    }
+    RB_GC_VM_UNLOCK_NO_BARRIER(lev);
+#endif
+
+    if (RB_UNLIKELY(wb_protected == FALSE)) {
+        MARK_IN_BITMAP(GET_HEAP_WB_UNPROTECTED_BITS(obj), obj);
+    }
+
+#if RGENGC_PROFILE
+    if (wb_protected) {
+        objspace->profile.total_generated_normal_object_count++;
+#if RGENGC_PROFILE >= 2
+        objspace->profile.generated_normal_object_count_types[BUILTIN_TYPE(obj)]++;
+#endif
+    }
+    else {
+        objspace->profile.total_generated_shady_object_count++;
+#if RGENGC_PROFILE >= 2
+        objspace->profile.generated_shady_object_count_types[BUILTIN_TYPE(obj)]++;
+#endif
+    }
+#endif
+
+#if GC_DEBUG
+    GET_RVALUE_OVERHEAD(obj)->file = rb_gc_impl_source_location_cstr(&GET_RVALUE_OVERHEAD(obj)->line);
+    GC_ASSERT(!SPECIAL_CONST_P(obj)); /* check alignment */
+#endif
+
+    gc_report(5, objspace, "newobj: %s\n", rb_obj_info(obj));
+
+    // RUBY_DEBUG_LOG("obj:%p (%s)", (void *)obj, rb_obj_info(obj));
+    return obj;
+}
+
+size_t
+rb_gc_impl_obj_slot_size(VALUE obj)
+{
+    return GET_HEAP_PAGE(obj)->slot_size - RVALUE_OVERHEAD;
+}
+
+static inline size_t
+heap_slot_size(unsigned char pool_id)
+{
+    GC_ASSERT(pool_id < HEAP_COUNT);
+
+    size_t slot_size = (1 << pool_id) * BASE_SLOT_SIZE;
+
+#if RGENGC_CHECK_MODE
+    rb_objspace_t *objspace = rb_gc_get_objspace();
+    GC_ASSERT(heaps[pool_id].slot_size == (short)slot_size);
+#endif
+
+    slot_size -= RVALUE_OVERHEAD;
+
+    return slot_size;
+}
+
+bool
+rb_gc_impl_size_allocatable_p(size_t size)
+{
+    return size <= heap_slot_size(HEAP_COUNT - 1);
+}
+
+static const size_t ALLOCATED_COUNT_STEP = 1024;
+
+static inline VALUE
+ractor_cache_allocate_slot(rb_objspace_t *objspace, rb_ractor_newobj_cache_t *cache,
+                           size_t heap_idx)
+{
+    rb_ractor_newobj_heap_cache_t *heap_cache = &cache->heap_caches[heap_idx];
+    struct free_slot *p = heap_cache->freelist;
+
+    if (RB_UNLIKELY(is_incremental_marking(objspace))) {
+        // Not allowed to allocate without running an incremental marking step
+        if (cache->incremental_mark_step_allocated_slots >= INCREMENTAL_MARK_STEP_ALLOCATIONS) {
+            return Qfalse;
+        }
+
+        if (p) {
+            cache->incremental_mark_step_allocated_slots++;
+        }
+    }
+
+    if (RB_LIKELY(p)) {
+        VALUE obj = (VALUE)p;
+        rb_asan_unpoison_object(obj, true);
+        heap_cache->freelist = p->next;
+
+        if (rb_gc_multi_ractor_p()) {
+            heap_cache->allocated_objects_count++;
+            rb_heap_t *heap = &heaps[heap_idx];
+            if (heap_cache->allocated_objects_count >= ALLOCATED_COUNT_STEP) {
+                RUBY_ATOMIC_SIZE_ADD(heap->total_allocated_objects, heap_cache->allocated_objects_count);
+                heap_cache->allocated_objects_count = 0;
+            }
+        }
+        else {
+            rb_heap_t *heap = &heaps[heap_idx];
+            heap->total_allocated_objects++;
+            GC_ASSERT(heap->total_slots >=
+                    (heap->total_allocated_objects - heap->total_freed_objects - heap->final_slots_count));
+        }
+
+#if RGENGC_CHECK_MODE
+        GC_ASSERT(rb_gc_impl_obj_slot_size(obj) == heap_slot_size(heap_idx));
+        // zero clear
+        MEMZERO((char *)obj, char, heap_slot_size(heap_idx));
+#endif
+        return obj;
+    }
+    else {
+        return Qfalse;
+    }
+}
+
+static struct heap_page *
+heap_next_free_page(rb_objspace_t *objspace, rb_heap_t *heap)
+{
+    struct heap_page *page;
+
+    if (heap->free_pages == NULL) {
+        heap_prepare(objspace, heap);
+    }
+
+    page = heap->free_pages;
+    heap->free_pages = page->free_next;
+
+    GC_ASSERT(page->free_slots != 0);
+
+    asan_unlock_freelist(page);
+
+    return page;
+}
+
+static inline void
+ractor_cache_set_page(rb_objspace_t *objspace, rb_ractor_newobj_cache_t *cache, size_t heap_idx,
+                      struct heap_page *page)
+{
+    gc_report(3, objspace, "ractor_set_cache: Using page %p\n", (void *)page->body);
+
+    rb_ractor_newobj_heap_cache_t *heap_cache = &cache->heap_caches[heap_idx];
+
+    GC_ASSERT(heap_cache->freelist == NULL);
+    GC_ASSERT(page->free_slots != 0);
+    GC_ASSERT(page->freelist != NULL);
+
+    heap_cache->using_page = page;
+    heap_cache->freelist = page->freelist;
+    page->free_slots = 0;
+    page->freelist = NULL;
+
+    rb_asan_unpoison_object((VALUE)heap_cache->freelist, false);
+    GC_ASSERT(RB_TYPE_P((VALUE)heap_cache->freelist, T_NONE));
+    rb_asan_poison_object((VALUE)heap_cache->freelist);
+}
+
+static inline size_t
+heap_idx_for_size(size_t size)
+{
+    size += RVALUE_OVERHEAD;
+
+    size_t slot_count = CEILDIV(size, BASE_SLOT_SIZE);
+
+    /* heap_idx is ceil(log2(slot_count)) */
+    size_t heap_idx = 64 - nlz_int64(slot_count - 1);
+
+    if (heap_idx >= HEAP_COUNT) {
+        rb_bug("heap_idx_for_size: allocation size too large "
+               "(size=%"PRIuSIZE"u, heap_idx=%"PRIuSIZE"u)", size, heap_idx);
+    }
+
+#if RGENGC_CHECK_MODE
+    rb_objspace_t *objspace = rb_gc_get_objspace();
+    GC_ASSERT(size <= (size_t)heaps[heap_idx].slot_size);
+    if (heap_idx > 0) GC_ASSERT(size > (size_t)heaps[heap_idx - 1].slot_size);
+#endif
+
+    return heap_idx;
+}
+
+size_t
+rb_gc_impl_heap_id_for_size(void *objspace_ptr, size_t size)
+{
+    return heap_idx_for_size(size);
+}
+
+
+static size_t heap_sizes[HEAP_COUNT + 1] = { 0 };
+
+size_t *
+rb_gc_impl_heap_sizes(void *objspace_ptr)
+{
+    if (heap_sizes[0] == 0) {
+        for (unsigned char i = 0; i < HEAP_COUNT; i++) {
+            heap_sizes[i] = heap_slot_size(i);
+        }
+    }
+
+    return heap_sizes;
+}
+
+NOINLINE(static VALUE newobj_cache_miss(rb_objspace_t *objspace, rb_ractor_newobj_cache_t *cache, size_t heap_idx, bool vm_locked));
+
+static VALUE
+newobj_cache_miss(rb_objspace_t *objspace, rb_ractor_newobj_cache_t *cache, size_t heap_idx, bool vm_locked)
+{
+    rb_heap_t *heap = &heaps[heap_idx];
+    VALUE obj = Qfalse;
+
+    unsigned int lev = 0;
+    bool unlock_vm = false;
+
+    if (!vm_locked) {
+        lev = RB_GC_CR_LOCK();
+        unlock_vm = true;
+    }
+
+    {
+        if (is_incremental_marking(objspace)) {
+            gc_continue(objspace, heap);
+            cache->incremental_mark_step_allocated_slots = 0;
+
+            // Retry allocation after resetting incremental_mark_step_allocated_slots
+            obj = ractor_cache_allocate_slot(objspace, cache, heap_idx);
+        }
+
+        if (obj == Qfalse) {
+            // Get next free page (possibly running GC)
+            struct heap_page *page = heap_next_free_page(objspace, heap);
+            ractor_cache_set_page(objspace, cache, heap_idx, page);
+
+            // Retry allocation after moving to new page
+            obj = ractor_cache_allocate_slot(objspace, cache, heap_idx);
+        }
+    }
+
+    if (unlock_vm) {
+        RB_GC_CR_UNLOCK(lev);
+    }
+
+    if (RB_UNLIKELY(obj == Qfalse)) {
+        rb_memerror();
+    }
+    return obj;
+}
+
+static VALUE
+newobj_alloc(rb_objspace_t *objspace, rb_ractor_newobj_cache_t *cache, size_t heap_idx, bool vm_locked)
+{
+    VALUE obj = ractor_cache_allocate_slot(objspace, cache, heap_idx);
+
+    if (RB_UNLIKELY(obj == Qfalse)) {
+        obj = newobj_cache_miss(objspace, cache, heap_idx, vm_locked);
+    }
+
+    return obj;
+}
+
+ALWAYS_INLINE(static VALUE newobj_slowpath(VALUE klass, VALUE flags, rb_objspace_t *objspace, rb_ractor_newobj_cache_t *cache, int wb_protected, size_t heap_idx));
+
+static inline VALUE
+newobj_slowpath(VALUE klass, VALUE flags, rb_objspace_t *objspace, rb_ractor_newobj_cache_t *cache, int wb_protected, size_t heap_idx)
+{
+    VALUE obj;
+    unsigned int lev;
+
+    lev = RB_GC_CR_LOCK();
+    {
+        if (RB_UNLIKELY(during_gc || ruby_gc_stressful)) {
+            if (during_gc) {
+                dont_gc_on();
+                during_gc = 0;
+                if (rb_memerror_reentered()) {
+                    rb_memerror();
+                }
+                rb_bug("object allocation during garbage collection phase");
+            }
+
+            if (ruby_gc_stressful) {
+                if (!garbage_collect(objspace, GPR_FLAG_NEWOBJ)) {
+                    rb_memerror();
+                }
+            }
+        }
+
+        obj = newobj_alloc(objspace, cache, heap_idx, true);
+        newobj_init(klass, flags, wb_protected, objspace, obj);
+    }
+    RB_GC_CR_UNLOCK(lev);
+
+    return obj;
+}
+
+NOINLINE(static VALUE newobj_slowpath_wb_protected(VALUE klass, VALUE flags,
+                                                   rb_objspace_t *objspace, rb_ractor_newobj_cache_t *cache, size_t heap_idx));
+NOINLINE(static VALUE newobj_slowpath_wb_unprotected(VALUE klass, VALUE flags,
+                                                     rb_objspace_t *objspace, rb_ractor_newobj_cache_t *cache, size_t heap_idx));
+
+static VALUE
+newobj_slowpath_wb_protected(VALUE klass, VALUE flags, rb_objspace_t *objspace, rb_ractor_newobj_cache_t *cache, size_t heap_idx)
+{
+    return newobj_slowpath(klass, flags, objspace, cache, TRUE, heap_idx);
+}
+
+static VALUE
+newobj_slowpath_wb_unprotected(VALUE klass, VALUE flags, rb_objspace_t *objspace, rb_ractor_newobj_cache_t *cache, size_t heap_idx)
+{
+    return newobj_slowpath(klass, flags, objspace, cache, FALSE, heap_idx);
+}
+
+VALUE
+rb_gc_impl_new_obj(void *objspace_ptr, void *cache_ptr, VALUE klass, VALUE flags, VALUE v1, VALUE v2, VALUE v3, bool wb_protected, size_t alloc_size)
+{
+    VALUE obj;
+    rb_objspace_t *objspace = objspace_ptr;
+
+    RB_DEBUG_COUNTER_INC(obj_newobj);
+    (void)RB_DEBUG_COUNTER_INC_IF(obj_newobj_wb_unprotected, !wb_protected);
+
+    if (RB_UNLIKELY(stress_to_class)) {
+        if (rb_hash_lookup2(stress_to_class, klass, Qundef) != Qundef) {
+            rb_memerror();
+        }
+    }
+
+    size_t heap_idx = heap_idx_for_size(alloc_size);
+
+    rb_ractor_newobj_cache_t *cache = (rb_ractor_newobj_cache_t *)cache_ptr;
+
+    if (!RB_UNLIKELY(during_gc || ruby_gc_stressful) &&
+            wb_protected) {
+        obj = newobj_alloc(objspace, cache, heap_idx, false);
+        newobj_init(klass, flags, wb_protected, objspace, obj);
+    }
+    else {
+        RB_DEBUG_COUNTER_INC(obj_newobj_slowpath);
+
+        obj = wb_protected ?
+          newobj_slowpath_wb_protected(klass, flags, objspace, cache, heap_idx) :
+          newobj_slowpath_wb_unprotected(klass, flags, objspace, cache, heap_idx);
+    }
+
+    return newobj_fill(obj, v1, v2, v3);
+}
+
+static int
+ptr_in_page_body_p(const void *ptr, const void *memb)
+{
+    struct heap_page *page = *(struct heap_page **)memb;
+    uintptr_t p_body = (uintptr_t)page->body;
+
+    if ((uintptr_t)ptr >= p_body) {
+        return (uintptr_t)ptr < (p_body + HEAP_PAGE_SIZE) ? 0 : 1;
+    }
+    else {
+        return -1;
+    }
+}
+
+PUREFUNC(static inline struct heap_page *heap_page_for_ptr(rb_objspace_t *objspace, uintptr_t ptr);)
+static inline struct heap_page *
+heap_page_for_ptr(rb_objspace_t *objspace, uintptr_t ptr)
+{
+    struct heap_page **res;
+
+    if (ptr < (uintptr_t)heap_pages_lomem ||
+            ptr > (uintptr_t)heap_pages_himem) {
+        return NULL;
+    }
+
+    res = bsearch((void *)ptr, rb_darray_ref(objspace->heap_pages.sorted, 0),
+                  rb_darray_size(objspace->heap_pages.sorted), sizeof(struct heap_page *),
+                  ptr_in_page_body_p);
+
+    if (res) {
+        return *res;
+    }
+    else {
+        return NULL;
+    }
+}
+
+PUREFUNC(static inline bool is_pointer_to_heap(rb_objspace_t *objspace, const void *ptr);)
+static inline bool
+is_pointer_to_heap(rb_objspace_t *objspace, const void *ptr)
+{
+    register uintptr_t p = (uintptr_t)ptr;
+    register struct heap_page *page;
+
+    RB_DEBUG_COUNTER_INC(gc_isptr_trial);
+
+    if (p < heap_pages_lomem || p > heap_pages_himem) return FALSE;
+    RB_DEBUG_COUNTER_INC(gc_isptr_range);
+
+    if (p % BASE_SLOT_SIZE != 0) return FALSE;
+    RB_DEBUG_COUNTER_INC(gc_isptr_align);
+
+    page = heap_page_for_ptr(objspace, (uintptr_t)ptr);
+    if (page) {
+        RB_DEBUG_COUNTER_INC(gc_isptr_maybe);
+        if (heap_page_in_global_empty_pages_pool(objspace, page)) {
+            return FALSE;
+        }
+        else {
+            if (p < page->start) return FALSE;
+            if (p >= page->start + (page->total_slots * page->slot_size)) return FALSE;
+            if ((NUM_IN_PAGE(p) * BASE_SLOT_SIZE) % page->slot_size != 0) return FALSE;
+
+            return TRUE;
+        }
+    }
+    return FALSE;
+}
+
+bool
+rb_gc_impl_pointer_to_heap_p(void *objspace_ptr, const void *ptr)
+{
+    return is_pointer_to_heap(objspace_ptr, ptr);
+}
+
+#define ZOMBIE_OBJ_KEPT_FLAGS (FL_FINALIZE)
+
+void
+rb_gc_impl_make_zombie(void *objspace_ptr, VALUE obj, void (*dfree)(void *), void *data)
+{
+    rb_objspace_t *objspace = objspace_ptr;
+
+    struct RZombie *zombie = RZOMBIE(obj);
+    zombie->basic.flags = T_ZOMBIE | (zombie->basic.flags & ZOMBIE_OBJ_KEPT_FLAGS);
+    zombie->dfree = dfree;
+    zombie->data = data;
+    VALUE prev, next = heap_pages_deferred_final;
+    do {
+        zombie->next = prev = next;
+        next = RUBY_ATOMIC_VALUE_CAS(heap_pages_deferred_final, prev, obj);
+    } while (next != prev);
+
+    struct heap_page *page = GET_HEAP_PAGE(obj);
+    page->final_slots++;
+    page->heap->final_slots_count++;
+}
+
+typedef int each_obj_callback(void *, void *, size_t, void *);
+typedef int each_page_callback(struct heap_page *, void *);
+
+struct each_obj_data {
+    rb_objspace_t *objspace;
+    bool reenable_incremental;
+
+    each_obj_callback *each_obj_callback;
+    each_page_callback *each_page_callback;
+    void *data;
+
+    struct heap_page **pages[HEAP_COUNT];
+    size_t pages_counts[HEAP_COUNT];
+};
+
+static VALUE
+objspace_each_objects_ensure(VALUE arg)
+{
+    struct each_obj_data *data = (struct each_obj_data *)arg;
+    rb_objspace_t *objspace = data->objspace;
+
+    /* Reenable incremental GC */
+    if (data->reenable_incremental) {
+        objspace->flags.dont_incremental = FALSE;
+    }
+
+    for (int i = 0; i < HEAP_COUNT; i++) {
+        struct heap_page **pages = data->pages[i];
+        free(pages);
+    }
+
+    return Qnil;
+}
+
+static VALUE
+objspace_each_objects_try(VALUE arg)
+{
+    struct each_obj_data *data = (struct each_obj_data *)arg;
+    rb_objspace_t *objspace = data->objspace;
+
+    /* Copy pages from all heaps to their respective buffers. */
+    for (int i = 0; i < HEAP_COUNT; i++) {
+        rb_heap_t *heap = &heaps[i];
+        size_t size = heap->total_pages * sizeof(struct heap_page *);
+
+        struct heap_page **pages = malloc(size);
+        if (!pages) rb_memerror();
+
+        /* Set up pages buffer by iterating over all pages in the current eden
+         * heap. This will be a snapshot of the state of the heap before we
+         * call the callback over each page that exists in this buffer. Thus it
+         * is safe for the callback to allocate objects without possibly entering
+         * an infinite loop. */
+        struct heap_page *page = 0;
+        size_t pages_count = 0;
+        ccan_list_for_each(&heap->pages, page, page_node) {
+            pages[pages_count] = page;
+            pages_count++;
+        }
+        data->pages[i] = pages;
+        data->pages_counts[i] = pages_count;
+        GC_ASSERT(pages_count == heap->total_pages);
+    }
+
+    for (int i = 0; i < HEAP_COUNT; i++) {
+        rb_heap_t *heap = &heaps[i];
+        size_t pages_count = data->pages_counts[i];
+        struct heap_page **pages = data->pages[i];
+
+        struct heap_page *page = ccan_list_top(&heap->pages, struct heap_page, page_node);
+        for (size_t i = 0; i < pages_count; i++) {
+            /* If we have reached the end of the linked list then there are no
+             * more pages, so break. */
+            if (page == NULL) break;
+
+            /* If this page does not match the one in the buffer, then move to
+             * the next page in the buffer. */
+            if (pages[i] != page) continue;
+
+            uintptr_t pstart = (uintptr_t)page->start;
+            uintptr_t pend = pstart + (page->total_slots * heap->slot_size);
+
+            if (data->each_obj_callback &&
+                (*data->each_obj_callback)((void *)pstart, (void *)pend, heap->slot_size, data->data)) {
+                break;
+            }
+            if (data->each_page_callback &&
+                (*data->each_page_callback)(page, data->data)) {
+                break;
+            }
+
+            page = ccan_list_next(&heap->pages, page, page_node);
+        }
+    }
+
+    return Qnil;
+}
+
+static void
+objspace_each_exec(bool protected, struct each_obj_data *each_obj_data)
+{
+    /* Disable incremental GC */
+    rb_objspace_t *objspace = each_obj_data->objspace;
+    bool reenable_incremental = FALSE;
+    if (protected) {
+        reenable_incremental = !objspace->flags.dont_incremental;
+
+        gc_rest(objspace);
+        objspace->flags.dont_incremental = TRUE;
+    }
+
+    each_obj_data->reenable_incremental = reenable_incremental;
+    memset(&each_obj_data->pages, 0, sizeof(each_obj_data->pages));
+    memset(&each_obj_data->pages_counts, 0, sizeof(each_obj_data->pages_counts));
+    rb_ensure(objspace_each_objects_try, (VALUE)each_obj_data,
+              objspace_each_objects_ensure, (VALUE)each_obj_data);
+}
+
+static void
+objspace_each_objects(rb_objspace_t *objspace, each_obj_callback *callback, void *data, bool protected)
+{
+    struct each_obj_data each_obj_data = {
+        .objspace = objspace,
+        .each_obj_callback = callback,
+        .each_page_callback = NULL,
+        .data = data,
+    };
+    objspace_each_exec(protected, &each_obj_data);
+}
+
+void
+rb_gc_impl_each_objects(void *objspace_ptr, each_obj_callback *callback, void *data)
+{
+    objspace_each_objects(objspace_ptr, callback, data, TRUE);
+}
+
+#if GC_CAN_COMPILE_COMPACTION
+static void
+objspace_each_pages(rb_objspace_t *objspace, each_page_callback *callback, void *data, bool protected)
+{
+    struct each_obj_data each_obj_data = {
+        .objspace = objspace,
+        .each_obj_callback = NULL,
+        .each_page_callback = callback,
+        .data = data,
+    };
+    objspace_each_exec(protected, &each_obj_data);
+}
+#endif
+
+VALUE
+rb_gc_impl_define_finalizer(void *objspace_ptr, VALUE obj, VALUE block)
+{
+    rb_objspace_t *objspace = objspace_ptr;
+    VALUE table;
+    st_data_t data;
+
+    GC_ASSERT(!OBJ_FROZEN(obj));
+
+    RBASIC(obj)->flags |= FL_FINALIZE;
+
+    int lev = RB_GC_VM_LOCK();
+
+    if (st_lookup(finalizer_table, obj, &data)) {
+        table = (VALUE)data;
+
+        /* avoid duplicate block, table is usually small */
+        {
+            long len = RARRAY_LEN(table);
+            long i;
+
+            for (i = 0; i < len; i++) {
+                VALUE recv = RARRAY_AREF(table, i);
+                if (rb_equal(recv, block)) {
+                    RB_GC_VM_UNLOCK(lev);
+                    return recv;
+                }
+            }
+        }
+
+        rb_ary_push(table, block);
+    }
+    else {
+        table = rb_ary_new3(2, rb_obj_id(obj), block);
+        rb_obj_hide(table);
+        st_add_direct(finalizer_table, obj, table);
+    }
+
+    RB_GC_VM_UNLOCK(lev);
+
+    return block;
+}
+
+void
+rb_gc_impl_undefine_finalizer(void *objspace_ptr, VALUE obj)
+{
+    rb_objspace_t *objspace = objspace_ptr;
+
+    GC_ASSERT(!OBJ_FROZEN(obj));
+
+    st_data_t data = obj;
+
+    int lev = RB_GC_VM_LOCK();
+    st_delete(finalizer_table, &data, 0);
+    RB_GC_VM_UNLOCK(lev);
+
+    FL_UNSET(obj, FL_FINALIZE);
+}
+
+void
+rb_gc_impl_copy_finalizer(void *objspace_ptr, VALUE dest, VALUE obj)
+{
+    rb_objspace_t *objspace = objspace_ptr;
+    VALUE table;
+    st_data_t data;
+
+    if (!FL_TEST(obj, FL_FINALIZE)) return;
+
+    int lev = RB_GC_VM_LOCK();
+    if (RB_LIKELY(st_lookup(finalizer_table, obj, &data))) {
+        table = rb_ary_dup((VALUE)data);
+        RARRAY_ASET(table, 0, rb_obj_id(dest));
+        st_insert(finalizer_table, dest, table);
+        FL_SET(dest, FL_FINALIZE);
+    }
+    else {
+        rb_bug("rb_gc_copy_finalizer: FL_FINALIZE set but not found in finalizer_table: %s", rb_obj_info(obj));
+    }
+    RB_GC_VM_UNLOCK(lev);
+}
+
+static VALUE
+get_final(long i, void *data)
+{
+    VALUE table = (VALUE)data;
+
+    return RARRAY_AREF(table, i + 1);
+}
+
+static void
+run_final(rb_objspace_t *objspace, VALUE zombie)
+{
+    if (RZOMBIE(zombie)->dfree) {
+        RZOMBIE(zombie)->dfree(RZOMBIE(zombie)->data);
+    }
+
+    st_data_t key = (st_data_t)zombie;
+    if (FL_TEST_RAW(zombie, FL_FINALIZE)) {
+        FL_UNSET(zombie, FL_FINALIZE);
+        st_data_t table;
+        if (st_delete(finalizer_table, &key, &table)) {
+            rb_gc_run_obj_finalizer(RARRAY_AREF(table, 0), RARRAY_LEN(table) - 1, get_final, (void *)table);
+        }
+        else {
+            rb_bug("FL_FINALIZE flag is set, but finalizers are not found");
+        }
+    }
+    else {
+        GC_ASSERT(!st_lookup(finalizer_table, key, NULL));
+    }
+}
+
+static void
+finalize_list(rb_objspace_t *objspace, VALUE zombie)
+{
+    while (zombie) {
+        VALUE next_zombie;
+        struct heap_page *page;
+        rb_asan_unpoison_object(zombie, false);
+        next_zombie = RZOMBIE(zombie)->next;
+        page = GET_HEAP_PAGE(zombie);
+
+        int lev = RB_GC_VM_LOCK();
+
+        run_final(objspace, zombie);
+        {
+            GC_ASSERT(BUILTIN_TYPE(zombie) == T_ZOMBIE);
+            GC_ASSERT(page->heap->final_slots_count > 0);
+            GC_ASSERT(page->final_slots > 0);
+
+            page->heap->final_slots_count--;
+            page->final_slots--;
+            page->free_slots++;
+            heap_page_add_freeobj(objspace, page, zombie);
+            page->heap->total_freed_objects++;
+        }
+        RB_GC_VM_UNLOCK(lev);
+
+        zombie = next_zombie;
+    }
+}
+
+static void
+finalize_deferred_heap_pages(rb_objspace_t *objspace)
+{
+    VALUE zombie;
+    while ((zombie = RUBY_ATOMIC_VALUE_EXCHANGE(heap_pages_deferred_final, 0)) != 0) {
+        finalize_list(objspace, zombie);
+    }
+}
+
+static void
+finalize_deferred(rb_objspace_t *objspace)
+{
+    rb_gc_set_pending_interrupt();
+    finalize_deferred_heap_pages(objspace);
+    rb_gc_unset_pending_interrupt();
+}
+
+static void
+gc_finalize_deferred(void *dmy)
+{
+    rb_objspace_t *objspace = dmy;
+    if (RUBY_ATOMIC_EXCHANGE(finalizing, 1)) return;
+
+    finalize_deferred(objspace);
+    RUBY_ATOMIC_SET(finalizing, 0);
+}
+
+static void
+gc_finalize_deferred_register(rb_objspace_t *objspace)
+{
+    /* will enqueue a call to gc_finalize_deferred */
+    rb_postponed_job_trigger(objspace->finalize_deferred_pjob);
+}
+
+static int pop_mark_stack(mark_stack_t *stack, VALUE *data);
+
+static void
+gc_abort(void *objspace_ptr)
+{
+    rb_objspace_t *objspace = objspace_ptr;
+
+    if (is_incremental_marking(objspace)) {
+        /* Remove all objects from the mark stack. */
+        VALUE obj;
+        while (pop_mark_stack(&objspace->mark_stack, &obj));
+
+        objspace->flags.during_incremental_marking = FALSE;
+    }
+
+    if (is_lazy_sweeping(objspace)) {
+        for (int i = 0; i < HEAP_COUNT; i++) {
+            rb_heap_t *heap = &heaps[i];
+
+            heap->sweeping_page = NULL;
+            struct heap_page *page = NULL;
+
+            ccan_list_for_each(&heap->pages, page, page_node) {
+                page->flags.before_sweep = false;
+            }
+        }
+    }
+
+    for (int i = 0; i < HEAP_COUNT; i++) {
+        rb_heap_t *heap = &heaps[i];
+        rgengc_mark_and_rememberset_clear(objspace, heap);
+    }
+
+    gc_mode_set(objspace, gc_mode_none);
+}
+
+void
+rb_gc_impl_shutdown_free_objects(void *objspace_ptr)
+{
+    rb_objspace_t *objspace = objspace_ptr;
+
+    for (size_t i = 0; i < rb_darray_size(objspace->heap_pages.sorted); i++) {
+        struct heap_page *page = rb_darray_get(objspace->heap_pages.sorted, i);
+        short stride = page->slot_size;
+
+        uintptr_t p = (uintptr_t)page->start;
+        uintptr_t pend = p + page->total_slots * stride;
+        for (; p < pend; p += stride) {
+            VALUE vp = (VALUE)p;
+            asan_unpoisoning_object(vp) {
+                if (RB_BUILTIN_TYPE(vp) != T_NONE) {
+                    rb_gc_obj_free_vm_weak_references(vp);
+                    if (rb_gc_obj_free(objspace, vp)) {
+                        RBASIC(vp)->flags = 0;
+                    }
+                }
+            }
+        }
+    }
+}
+
+static int
+rb_gc_impl_shutdown_call_finalizer_i(st_data_t key, st_data_t val, st_data_t _data)
+{
+    VALUE obj = (VALUE)key;
+    VALUE table = (VALUE)val;
+
+    GC_ASSERT(RB_FL_TEST(obj, FL_FINALIZE));
+    GC_ASSERT(RB_BUILTIN_TYPE(val) == T_ARRAY);
+
+    rb_gc_run_obj_finalizer(RARRAY_AREF(table, 0), RARRAY_LEN(table) - 1, get_final, (void *)table);
+
+    FL_UNSET(obj, FL_FINALIZE);
+
+    return ST_DELETE;
+}
+
+void
+rb_gc_impl_shutdown_call_finalizer(void *objspace_ptr)
+{
+    rb_objspace_t *objspace = objspace_ptr;
+
+#if RGENGC_CHECK_MODE >= 2
+    gc_verify_internal_consistency(objspace);
+#endif
+
+    /* prohibit incremental GC */
+    objspace->flags.dont_incremental = 1;
+
+    if (RUBY_ATOMIC_EXCHANGE(finalizing, 1)) {
+        /* Abort incremental marking and lazy sweeping to speed up shutdown. */
+        gc_abort(objspace);
+        dont_gc_on();
+        return;
+    }
+
+    while (finalizer_table->num_entries) {
+        st_foreach(finalizer_table, rb_gc_impl_shutdown_call_finalizer_i, 0);
+    }
+
+    /* run finalizers */
+    finalize_deferred(objspace);
+    GC_ASSERT(heap_pages_deferred_final == 0);
+
+    /* Abort incremental marking and lazy sweeping to speed up shutdown. */
+    gc_abort(objspace);
+
+    /* prohibit GC because force T_DATA finalizers can break an object graph consistency */
+    dont_gc_on();
+
+    /* running data/file finalizers are part of garbage collection */
+    unsigned int lock_lev;
+    gc_enter(objspace, gc_enter_event_finalizer, &lock_lev);
+
+    /* run data/file object's finalizers */
+    for (size_t i = 0; i < rb_darray_size(objspace->heap_pages.sorted); i++) {
+        struct heap_page *page = rb_darray_get(objspace->heap_pages.sorted, i);
+        short stride = page->slot_size;
+
+        uintptr_t p = (uintptr_t)page->start;
+        uintptr_t pend = p + page->total_slots * stride;
+        for (; p < pend; p += stride) {
+            VALUE vp = (VALUE)p;
+            asan_unpoisoning_object(vp) {
+                if (rb_gc_shutdown_call_finalizer_p(vp)) {
+                    rb_gc_obj_free_vm_weak_references(vp);
+                    if (rb_gc_obj_free(objspace, vp)) {
+                        RBASIC(vp)->flags = 0;
+                    }
+                }
+            }
+        }
+    }
+
+    gc_exit(objspace, gc_enter_event_finalizer, &lock_lev);
+
+    finalize_deferred_heap_pages(objspace);
+
+    st_free_table(finalizer_table);
+    finalizer_table = 0;
+    RUBY_ATOMIC_SET(finalizing, 0);
+}
+
+void
+rb_gc_impl_each_object(void *objspace_ptr, void (*func)(VALUE obj, void *data), void *data)
+{
+    rb_objspace_t *objspace = objspace_ptr;
+
+    for (size_t i = 0; i < rb_darray_size(objspace->heap_pages.sorted); i++) {
+        struct heap_page *page = rb_darray_get(objspace->heap_pages.sorted, i);
+        short stride = page->slot_size;
+
+        uintptr_t p = (uintptr_t)page->start;
+        uintptr_t pend = p + page->total_slots * stride;
+        for (; p < pend; p += stride) {
+            VALUE obj = (VALUE)p;
+
+            asan_unpoisoning_object(obj) {
+                func(obj, data);
+            }
+        }
+    }
+}
+
+/*
+  ------------------------ Garbage Collection ------------------------
+*/
+
+/* Sweeping */
+
+static size_t
+objspace_available_slots(rb_objspace_t *objspace)
+{
+    size_t total_slots = 0;
+    for (int i = 0; i < HEAP_COUNT; i++) {
+        rb_heap_t *heap = &heaps[i];
+        total_slots += heap->total_slots;
+    }
+    return total_slots;
+}
+
+static size_t
+objspace_live_slots(rb_objspace_t *objspace)
+{
+    return total_allocated_objects(objspace) - total_freed_objects(objspace) - total_final_slots_count(objspace);
+}
+
+static size_t
+objspace_free_slots(rb_objspace_t *objspace)
+{
+    return objspace_available_slots(objspace) - objspace_live_slots(objspace) - total_final_slots_count(objspace);
+}
+
+static void
+gc_setup_mark_bits(struct heap_page *page)
+{
+    /* copy oldgen bitmap to mark bitmap */
+    memcpy(&page->mark_bits[0], &page->uncollectible_bits[0], HEAP_PAGE_BITMAP_SIZE);
+}
+
+static int gc_is_moveable_obj(rb_objspace_t *objspace, VALUE obj);
+static VALUE gc_move(rb_objspace_t *objspace, VALUE scan, VALUE free, size_t src_slot_size, size_t slot_size);
+
+#if defined(_WIN32)
+enum {HEAP_PAGE_LOCK = PAGE_NOACCESS, HEAP_PAGE_UNLOCK = PAGE_READWRITE};
+
+static BOOL
+protect_page_body(struct heap_page_body *body, DWORD protect)
+{
+    DWORD old_protect;
+    return VirtualProtect(body, HEAP_PAGE_SIZE, protect, &old_protect) != 0;
+}
+#elif defined(__wasi__)
+// wasi-libc's mprotect emulation does not support PROT_NONE
+enum {HEAP_PAGE_LOCK, HEAP_PAGE_UNLOCK};
+#define protect_page_body(body, protect) 1
+#else
+enum {HEAP_PAGE_LOCK = PROT_NONE, HEAP_PAGE_UNLOCK = PROT_READ | PROT_WRITE};
+#define protect_page_body(body, protect) !mprotect((body), HEAP_PAGE_SIZE, (protect))
+#endif
+
+static void
+lock_page_body(rb_objspace_t *objspace, struct heap_page_body *body)
+{
+    if (!protect_page_body(body, HEAP_PAGE_LOCK)) {
+        rb_bug("Couldn't protect page %p, errno: %s", (void *)body, strerror(errno));
+    }
+    else {
+        gc_report(5, objspace, "Protecting page in move %p\n", (void *)body);
+    }
+}
+
+static void
+unlock_page_body(rb_objspace_t *objspace, struct heap_page_body *body)
+{
+    if (!protect_page_body(body, HEAP_PAGE_UNLOCK)) {
+        rb_bug("Couldn't unprotect page %p, errno: %s", (void *)body, strerror(errno));
+    }
+    else {
+        gc_report(5, objspace, "Unprotecting page in move %p\n", (void *)body);
+    }
+}
+
+static bool
+try_move(rb_objspace_t *objspace, rb_heap_t *heap, struct heap_page *free_page, VALUE src)
+{
+    GC_ASSERT(gc_is_moveable_obj(objspace, src));
+
+    struct heap_page *src_page = GET_HEAP_PAGE(src);
+    if (!free_page) {
+        return false;
+    }
+
+    /* We should return true if either src is successfully moved, or src is
+     * unmoveable. A false return will cause the sweeping cursor to be
+     * incremented to the next page, and src will attempt to move again */
+    GC_ASSERT(RVALUE_MARKED(objspace, src));
+
+    asan_unlock_freelist(free_page);
+    VALUE dest = (VALUE)free_page->freelist;
+    asan_lock_freelist(free_page);
+    if (dest) {
+        rb_asan_unpoison_object(dest, false);
+    }
+    else {
+        /* if we can't get something from the freelist then the page must be
+         * full */
+        return false;
+    }
+    asan_unlock_freelist(free_page);
+    free_page->freelist = ((struct free_slot *)dest)->next;
+    asan_lock_freelist(free_page);
+
+    GC_ASSERT(RB_BUILTIN_TYPE(dest) == T_NONE);
+
+    if (src_page->slot_size > free_page->slot_size) {
+        objspace->rcompactor.moved_down_count_table[BUILTIN_TYPE(src)]++;
+    }
+    else if (free_page->slot_size > src_page->slot_size) {
+        objspace->rcompactor.moved_up_count_table[BUILTIN_TYPE(src)]++;
+    }
+    objspace->rcompactor.moved_count_table[BUILTIN_TYPE(src)]++;
+    objspace->rcompactor.total_moved++;
+
+    gc_move(objspace, src, dest, src_page->slot_size, free_page->slot_size);
+    gc_pin(objspace, src);
+    free_page->free_slots--;
+
+    return true;
+}
+
+static void
+gc_unprotect_pages(rb_objspace_t *objspace, rb_heap_t *heap)
+{
+    struct heap_page *cursor = heap->compact_cursor;
+
+    while (cursor) {
+        unlock_page_body(objspace, cursor->body);
+        cursor = ccan_list_next(&heap->pages, cursor, page_node);
+    }
+}
+
+static void gc_update_references(rb_objspace_t *objspace);
+#if GC_CAN_COMPILE_COMPACTION
+static void invalidate_moved_page(rb_objspace_t *objspace, struct heap_page *page);
+#endif
+
+#if defined(__MINGW32__) || defined(_WIN32)
+# define GC_COMPACTION_SUPPORTED 1
+#else
+/* If not MinGW, Windows, or does not have mmap, we cannot use mprotect for
+ * the read barrier, so we must disable compaction. */
+# define GC_COMPACTION_SUPPORTED (GC_CAN_COMPILE_COMPACTION && HEAP_PAGE_ALLOC_USE_MMAP)
+#endif
+
+#if GC_CAN_COMPILE_COMPACTION
+static void
+read_barrier_handler(uintptr_t address)
+{
+    rb_objspace_t *objspace = (rb_objspace_t *)rb_gc_get_objspace();
+
+    struct heap_page_body *page_body = GET_PAGE_BODY(address);
+
+    /* If the page_body is NULL, then mprotect cannot handle it and will crash
+     * with "Cannot allocate memory". */
+    if (page_body == NULL) {
+        rb_bug("read_barrier_handler: segmentation fault at %p", (void *)address);
+    }
+
+    int lev = RB_GC_VM_LOCK();
+    {
+        unlock_page_body(objspace, page_body);
+
+        objspace->profile.read_barrier_faults++;
+
+        invalidate_moved_page(objspace, GET_HEAP_PAGE(address));
+    }
+    RB_GC_VM_UNLOCK(lev);
+}
+#endif
+
+#if !GC_CAN_COMPILE_COMPACTION
+static void
+uninstall_handlers(void)
+{
+    /* no-op */
+}
+
+static void
+install_handlers(void)
+{
+    /* no-op */
+}
+#elif defined(_WIN32)
+static LPTOP_LEVEL_EXCEPTION_FILTER old_handler;
+typedef void (*signal_handler)(int);
+static signal_handler old_sigsegv_handler;
+
+static LONG WINAPI
+read_barrier_signal(EXCEPTION_POINTERS *info)
+{
+    /* EXCEPTION_ACCESS_VIOLATION is what's raised by access to protected pages */
+    if (info->ExceptionRecord->ExceptionCode == EXCEPTION_ACCESS_VIOLATION) {
+        /* > The second array element specifies the virtual address of the inaccessible data.
+         * https://docs.microsoft.com/en-us/windows/win32/api/winnt/ns-winnt-exception_record
+         *
+         * Use this address to invalidate the page */
+        read_barrier_handler((uintptr_t)info->ExceptionRecord->ExceptionInformation[1]);
+        return EXCEPTION_CONTINUE_EXECUTION;
+    }
+    else {
+        return EXCEPTION_CONTINUE_SEARCH;
+    }
+}
+
+static void
+uninstall_handlers(void)
+{
+    signal(SIGSEGV, old_sigsegv_handler);
+    SetUnhandledExceptionFilter(old_handler);
+}
+
+static void
+install_handlers(void)
+{
+    /* Remove SEGV handler so that the Unhandled Exception Filter handles it */
+    old_sigsegv_handler = signal(SIGSEGV, NULL);
+    /* Unhandled Exception Filter has access to the violation address similar
+     * to si_addr from sigaction */
+    old_handler = SetUnhandledExceptionFilter(read_barrier_signal);
+}
+#else
+static struct sigaction old_sigbus_handler;
+static struct sigaction old_sigsegv_handler;
+
+#ifdef HAVE_MACH_TASK_EXCEPTION_PORTS
+static exception_mask_t old_exception_masks[32];
+static mach_port_t old_exception_ports[32];
+static exception_behavior_t old_exception_behaviors[32];
+static thread_state_flavor_t old_exception_flavors[32];
+static mach_msg_type_number_t old_exception_count;
+
+static void
+disable_mach_bad_access_exc(void)
+{
+    old_exception_count = sizeof(old_exception_masks) / sizeof(old_exception_masks[0]);
+    task_swap_exception_ports(
+        mach_task_self(), EXC_MASK_BAD_ACCESS,
+        MACH_PORT_NULL, EXCEPTION_DEFAULT, 0,
+        old_exception_masks, &old_exception_count,
+        old_exception_ports, old_exception_behaviors, old_exception_flavors
+    );
+}
+
+static void
+restore_mach_bad_access_exc(void)
+{
+    for (mach_msg_type_number_t i = 0; i < old_exception_count; i++) {
+        task_set_exception_ports(
+            mach_task_self(),
+            old_exception_masks[i], old_exception_ports[i],
+            old_exception_behaviors[i], old_exception_flavors[i]
+        );
+    }
+}
+#endif
+
+static void
+read_barrier_signal(int sig, siginfo_t *info, void *data)
+{
+    // setup SEGV/BUS handlers for errors
+    struct sigaction prev_sigbus, prev_sigsegv;
+    sigaction(SIGBUS, &old_sigbus_handler, &prev_sigbus);
+    sigaction(SIGSEGV, &old_sigsegv_handler, &prev_sigsegv);
+
+    // enable SIGBUS/SEGV
+    sigset_t set, prev_set;
+    sigemptyset(&set);
+    sigaddset(&set, SIGBUS);
+    sigaddset(&set, SIGSEGV);
+    sigprocmask(SIG_UNBLOCK, &set, &prev_set);
+#ifdef HAVE_MACH_TASK_EXCEPTION_PORTS
+    disable_mach_bad_access_exc();
+#endif
+    // run handler
+    read_barrier_handler((uintptr_t)info->si_addr);
+
+    // reset SEGV/BUS handlers
+#ifdef HAVE_MACH_TASK_EXCEPTION_PORTS
+    restore_mach_bad_access_exc();
+#endif
+    sigaction(SIGBUS, &prev_sigbus, NULL);
+    sigaction(SIGSEGV, &prev_sigsegv, NULL);
+    sigprocmask(SIG_SETMASK, &prev_set, NULL);
+}
+
+static void
+uninstall_handlers(void)
+{
+#ifdef HAVE_MACH_TASK_EXCEPTION_PORTS
+    restore_mach_bad_access_exc();
+#endif
+    sigaction(SIGBUS, &old_sigbus_handler, NULL);
+    sigaction(SIGSEGV, &old_sigsegv_handler, NULL);
+}
+
+static void
+install_handlers(void)
+{
+    struct sigaction action;
+    memset(&action, 0, sizeof(struct sigaction));
+    sigemptyset(&action.sa_mask);
+    action.sa_sigaction = read_barrier_signal;
+    action.sa_flags = SA_SIGINFO | SA_ONSTACK;
+
+    sigaction(SIGBUS, &action, &old_sigbus_handler);
+    sigaction(SIGSEGV, &action, &old_sigsegv_handler);
+#ifdef HAVE_MACH_TASK_EXCEPTION_PORTS
+    disable_mach_bad_access_exc();
+#endif
+}
+#endif
+
+static void
+gc_compact_finish(rb_objspace_t *objspace)
+{
+    for (int i = 0; i < HEAP_COUNT; i++) {
+        rb_heap_t *heap = &heaps[i];
+        gc_unprotect_pages(objspace, heap);
+    }
+
+    uninstall_handlers();
+
+    gc_update_references(objspace);
+    objspace->profile.compact_count++;
+
+    for (int i = 0; i < HEAP_COUNT; i++) {
+        rb_heap_t *heap = &heaps[i];
+        heap->compact_cursor = NULL;
+        heap->free_pages = NULL;
+        heap->compact_cursor_index = 0;
+    }
+
+    if (gc_prof_enabled(objspace)) {
+        gc_profile_record *record = gc_prof_record(objspace);
+        record->moved_objects = objspace->rcompactor.total_moved - record->moved_objects;
+    }
+    objspace->flags.during_compacting = FALSE;
+}
+
+struct gc_sweep_context {
+    struct heap_page *page;
+    int final_slots;
+    int freed_slots;
+    int empty_slots;
+};
+
+static inline void
+gc_sweep_plane(rb_objspace_t *objspace, rb_heap_t *heap, uintptr_t p, bits_t bitset, struct gc_sweep_context *ctx)
+{
+    struct heap_page *sweep_page = ctx->page;
+    short slot_size = sweep_page->slot_size;
+    short slot_bits = slot_size / BASE_SLOT_SIZE;
+    GC_ASSERT(slot_bits > 0);
+
+    do {
+        VALUE vp = (VALUE)p;
+        GC_ASSERT(vp % BASE_SLOT_SIZE == 0);
+
+        rb_asan_unpoison_object(vp, false);
+        if (bitset & 1) {
+            switch (BUILTIN_TYPE(vp)) {
+              default: /* majority case */
+                gc_report(2, objspace, "page_sweep: free %p\n", (void *)p);
+#if RGENGC_CHECK_MODE
+                if (!is_full_marking(objspace)) {
+                    if (RVALUE_OLD_P(objspace, vp)) rb_bug("page_sweep: %p - old while minor GC.", (void *)p);
+                    if (RVALUE_REMEMBERED(objspace, vp)) rb_bug("page_sweep: %p - remembered.", (void *)p);
+                }
+#endif
+
+                if (RVALUE_WB_UNPROTECTED(objspace, vp)) CLEAR_IN_BITMAP(GET_HEAP_WB_UNPROTECTED_BITS(vp), vp);
+
+#if RGENGC_CHECK_MODE
+#define CHECK(x) if (x(objspace, vp) != FALSE) rb_bug("obj_free: " #x "(%s) != FALSE", rb_obj_info(vp))
+                CHECK(RVALUE_WB_UNPROTECTED);
+                CHECK(RVALUE_MARKED);
+                CHECK(RVALUE_MARKING);
+                CHECK(RVALUE_UNCOLLECTIBLE);
+#undef CHECK
+#endif
+
+                rb_gc_event_hook(vp, RUBY_INTERNAL_EVENT_FREEOBJ);
+
+                rb_gc_obj_free_vm_weak_references(vp);
+                if (rb_gc_obj_free(objspace, vp)) {
+                    // always add free slots back to the swept pages freelist,
+                    // so that if we're compacting, we can re-use the slots
+                    (void)VALGRIND_MAKE_MEM_UNDEFINED((void*)p, BASE_SLOT_SIZE);
+                    heap_page_add_freeobj(objspace, sweep_page, vp);
+                    gc_report(3, objspace, "page_sweep: %s is added to freelist\n", rb_obj_info(vp));
+                    ctx->freed_slots++;
+                }
+                else {
+                    ctx->final_slots++;
+                }
+                break;
+
+              case T_MOVED:
+                if (objspace->flags.during_compacting) {
+                    /* The sweep cursor shouldn't have made it to any
+                     * T_MOVED slots while the compact flag is enabled.
+                     * The sweep cursor and compact cursor move in
+                     * opposite directions, and when they meet references will
+                     * get updated and "during_compacting" should get disabled */
+                    rb_bug("T_MOVED shouldn't be seen until compaction is finished");
+                }
+                gc_report(3, objspace, "page_sweep: %s is added to freelist\n", rb_obj_info(vp));
+                ctx->empty_slots++;
+                heap_page_add_freeobj(objspace, sweep_page, vp);
+                break;
+              case T_ZOMBIE:
+                /* already counted */
+                break;
+              case T_NONE:
+                ctx->empty_slots++; /* already freed */
+                break;
+            }
+        }
+        p += slot_size;
+        bitset >>= slot_bits;
+    } while (bitset);
+}
+
+static inline void
+gc_sweep_page(rb_objspace_t *objspace, rb_heap_t *heap, struct gc_sweep_context *ctx)
+{
+    struct heap_page *sweep_page = ctx->page;
+    GC_ASSERT(sweep_page->heap == heap);
+
+    uintptr_t p;
+    bits_t *bits, bitset;
+
+    gc_report(2, objspace, "page_sweep: start.\n");
+
+#if RGENGC_CHECK_MODE
+    if (!objspace->flags.immediate_sweep) {
+        GC_ASSERT(sweep_page->flags.before_sweep == TRUE);
+    }
+#endif
+    sweep_page->flags.before_sweep = FALSE;
+    sweep_page->free_slots = 0;
+
+    p = (uintptr_t)sweep_page->start;
+    bits = sweep_page->mark_bits;
+
+    int page_rvalue_count = sweep_page->total_slots * (sweep_page->slot_size / BASE_SLOT_SIZE);
+    int out_of_range_bits = (NUM_IN_PAGE(p) + page_rvalue_count) % BITS_BITLENGTH;
+    if (out_of_range_bits != 0) { // sizeof(RVALUE) == 64
+        bits[BITMAP_INDEX(p) + page_rvalue_count / BITS_BITLENGTH] |= ~(((bits_t)1 << out_of_range_bits) - 1);
+    }
+
+    /* The last bitmap plane may not be used if the last plane does not
+     * have enough space for the slot_size. In that case, the last plane must
+     * be skipped since none of the bits will be set. */
+    int bitmap_plane_count = CEILDIV(NUM_IN_PAGE(p) + page_rvalue_count, BITS_BITLENGTH);
+    GC_ASSERT(bitmap_plane_count == HEAP_PAGE_BITMAP_LIMIT - 1 ||
+                  bitmap_plane_count == HEAP_PAGE_BITMAP_LIMIT);
+
+    // Skip out of range slots at the head of the page
+    bitset = ~bits[0];
+    bitset >>= NUM_IN_PAGE(p);
+    if (bitset) {
+        gc_sweep_plane(objspace, heap, p, bitset, ctx);
+    }
+    p += (BITS_BITLENGTH - NUM_IN_PAGE(p)) * BASE_SLOT_SIZE;
+
+    for (int i = 1; i < bitmap_plane_count; i++) {
+        bitset = ~bits[i];
+        if (bitset) {
+            gc_sweep_plane(objspace, heap, p, bitset, ctx);
+        }
+        p += BITS_BITLENGTH * BASE_SLOT_SIZE;
+    }
+
+    if (!heap->compact_cursor) {
+        gc_setup_mark_bits(sweep_page);
+    }
+
+#if GC_PROFILE_MORE_DETAIL
+    if (gc_prof_enabled(objspace)) {
+        gc_profile_record *record = gc_prof_record(objspace);
+        record->removing_objects += ctx->final_slots + ctx->freed_slots;
+        record->empty_objects += ctx->empty_slots;
+    }
+#endif
+    if (0) fprintf(stderr, "gc_sweep_page(%"PRIdSIZE"): total_slots: %d, freed_slots: %d, empty_slots: %d, final_slots: %d\n",
+                   rb_gc_count(),
+                   sweep_page->total_slots,
+                   ctx->freed_slots, ctx->empty_slots, ctx->final_slots);
+
+    sweep_page->free_slots += ctx->freed_slots + ctx->empty_slots;
+    sweep_page->heap->total_freed_objects += ctx->freed_slots;
+
+    if (heap_pages_deferred_final && !finalizing) {
+        gc_finalize_deferred_register(objspace);
+    }
+
+#if RGENGC_CHECK_MODE
+    short freelist_len = 0;
+    asan_unlock_freelist(sweep_page);
+    struct free_slot *ptr = sweep_page->freelist;
+    while (ptr) {
+        freelist_len++;
+        rb_asan_unpoison_object((VALUE)ptr, false);
+        struct free_slot *next = ptr->next;
+        rb_asan_poison_object((VALUE)ptr);
+        ptr = next;
+    }
+    asan_lock_freelist(sweep_page);
+    if (freelist_len != sweep_page->free_slots) {
+        rb_bug("inconsistent freelist length: expected %d but was %d", sweep_page->free_slots, freelist_len);
+    }
+#endif
+
+    gc_report(2, objspace, "page_sweep: end.\n");
+}
+
+static const char *
+gc_mode_name(enum gc_mode mode)
+{
+    switch (mode) {
+      case gc_mode_none: return "none";
+      case gc_mode_marking: return "marking";
+      case gc_mode_sweeping: return "sweeping";
+      case gc_mode_compacting: return "compacting";
+      default: rb_bug("gc_mode_name: unknown mode: %d", (int)mode);
+    }
+}
+
+static void
+gc_mode_transition(rb_objspace_t *objspace, enum gc_mode mode)
+{
+#if RGENGC_CHECK_MODE
+    enum gc_mode prev_mode = gc_mode(objspace);
+    switch (prev_mode) {
+      case gc_mode_none:     GC_ASSERT(mode == gc_mode_marking); break;
+      case gc_mode_marking:  GC_ASSERT(mode == gc_mode_sweeping); break;
+      case gc_mode_sweeping: GC_ASSERT(mode == gc_mode_none || mode == gc_mode_compacting); break;
+      case gc_mode_compacting: GC_ASSERT(mode == gc_mode_none); break;
+    }
+#endif
+    if (0) fprintf(stderr, "gc_mode_transition: %s->%s\n", gc_mode_name(gc_mode(objspace)), gc_mode_name(mode));
+    gc_mode_set(objspace, mode);
+}
+
+static void
+heap_page_freelist_append(struct heap_page *page, struct free_slot *freelist)
+{
+    if (freelist) {
+        asan_unlock_freelist(page);
+        if (page->freelist) {
+            struct free_slot *p = page->freelist;
+            rb_asan_unpoison_object((VALUE)p, false);
+            while (p->next) {
+                struct free_slot *prev = p;
+                p = p->next;
+                rb_asan_poison_object((VALUE)prev);
+                rb_asan_unpoison_object((VALUE)p, false);
+            }
+            p->next = freelist;
+            rb_asan_poison_object((VALUE)p);
+        }
+        else {
+            page->freelist = freelist;
+        }
+        asan_lock_freelist(page);
+    }
+}
+
+static void
+gc_sweep_start_heap(rb_objspace_t *objspace, rb_heap_t *heap)
+{
+    heap->sweeping_page = ccan_list_top(&heap->pages, struct heap_page, page_node);
+    heap->free_pages = NULL;
+    heap->pooled_pages = NULL;
+    if (!objspace->flags.immediate_sweep) {
+        struct heap_page *page = NULL;
+
+        ccan_list_for_each(&heap->pages, page, page_node) {
+            page->flags.before_sweep = TRUE;
+        }
+    }
+}
+
+#if defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ == 4
+__attribute__((noinline))
+#endif
+
+#if GC_CAN_COMPILE_COMPACTION
+static void gc_sort_heap_by_compare_func(rb_objspace_t *objspace, gc_compact_compare_func compare_func);
+static int compare_pinned_slots(const void *left, const void *right, void *d);
+#endif
+
+static void
+gc_ractor_newobj_cache_clear(void *c, void *data)
+{
+    rb_objspace_t *objspace = rb_gc_get_objspace();
+    rb_ractor_newobj_cache_t *newobj_cache = c;
+
+    newobj_cache->incremental_mark_step_allocated_slots = 0;
+
+    for (size_t heap_idx = 0; heap_idx < HEAP_COUNT; heap_idx++) {
+
+        rb_ractor_newobj_heap_cache_t *cache = &newobj_cache->heap_caches[heap_idx];
+
+        rb_heap_t *heap = &heaps[heap_idx];
+        RUBY_ATOMIC_SIZE_ADD(heap->total_allocated_objects, cache->allocated_objects_count);
+        cache->allocated_objects_count = 0;
+
+        struct heap_page *page = cache->using_page;
+        struct free_slot *freelist = cache->freelist;
+        RUBY_DEBUG_LOG("ractor using_page:%p freelist:%p", (void *)page, (void *)freelist);
+
+        heap_page_freelist_append(page, freelist);
+
+        cache->using_page = NULL;
+        cache->freelist = NULL;
+    }
+}
+
+static void
+gc_sweep_start(rb_objspace_t *objspace)
+{
+    gc_mode_transition(objspace, gc_mode_sweeping);
+    objspace->rincgc.pooled_slots = 0;
+
+#if GC_CAN_COMPILE_COMPACTION
+    if (objspace->flags.during_compacting) {
+        gc_sort_heap_by_compare_func(
+            objspace,
+            objspace->rcompactor.compare_func ? objspace->rcompactor.compare_func : compare_pinned_slots
+        );
+    }
+#endif
+
+    for (int i = 0; i < HEAP_COUNT; i++) {
+        rb_heap_t *heap = &heaps[i];
+        gc_sweep_start_heap(objspace, heap);
+
+        /* We should call gc_sweep_finish_heap for size pools with no pages. */
+        if (heap->sweeping_page == NULL) {
+            GC_ASSERT(heap->total_pages == 0);
+            GC_ASSERT(heap->total_slots == 0);
+            gc_sweep_finish_heap(objspace, heap);
+        }
+    }
+
+    rb_gc_ractor_newobj_cache_foreach(gc_ractor_newobj_cache_clear, NULL);
+}
+
+static void
+gc_sweep_finish_heap(rb_objspace_t *objspace, rb_heap_t *heap)
+{
+    size_t total_slots = heap->total_slots;
+    size_t swept_slots = heap->freed_slots + heap->empty_slots;
+
+    size_t init_slots = gc_params.heap_init_slots[heap - heaps];
+    size_t min_free_slots = (size_t)(MAX(total_slots, init_slots) * gc_params.heap_free_slots_min_ratio);
+
+    if (swept_slots < min_free_slots &&
+            /* The heap is a growth heap if it freed more slots than had empty slots. */
+            ((heap->empty_slots == 0 && total_slots > 0) || heap->freed_slots > heap->empty_slots)) {
+        /* If we don't have enough slots and we have pages on the tomb heap, move
+        * pages from the tomb heap to the eden heap. This may prevent page
+        * creation thrashing (frequently allocating and deallocting pages) and
+        * GC thrashing (running GC more frequently than required). */
+        struct heap_page *resurrected_page;
+        while (swept_slots < min_free_slots &&
+                (resurrected_page = heap_page_resurrect(objspace))) {
+            heap_add_page(objspace, heap, resurrected_page);
+            heap_add_freepage(heap, resurrected_page);
+
+            swept_slots += resurrected_page->free_slots;
+        }
+
+        if (swept_slots < min_free_slots) {
+            /* Grow this heap if we are in a major GC or if we haven't run at least
+             * RVALUE_OLD_AGE minor GC since the last major GC. */
+            if (is_full_marking(objspace) ||
+                    objspace->profile.count - objspace->rgengc.last_major_gc < RVALUE_OLD_AGE) {
+                if (objspace->heap_pages.allocatable_slots < min_free_slots) {
+                    heap_allocatable_slots_expand(objspace, heap, swept_slots, heap->total_slots);
+                }
+            }
+            else {
+                gc_needs_major_flags |= GPR_FLAG_MAJOR_BY_NOFREE;
+                heap->force_major_gc_count++;
+            }
+        }
+    }
+}
+
+static void
+gc_sweep_finish(rb_objspace_t *objspace)
+{
+    gc_report(1, objspace, "gc_sweep_finish\n");
+
+    gc_prof_set_heap_info(objspace);
+    heap_pages_free_unused_pages(objspace);
+
+    for (int i = 0; i < HEAP_COUNT; i++) {
+        rb_heap_t *heap = &heaps[i];
+
+        heap->freed_slots = 0;
+        heap->empty_slots = 0;
+
+        if (!will_be_incremental_marking(objspace)) {
+            struct heap_page *end_page = heap->free_pages;
+            if (end_page) {
+                while (end_page->free_next) end_page = end_page->free_next;
+                end_page->free_next = heap->pooled_pages;
+            }
+            else {
+                heap->free_pages = heap->pooled_pages;
+            }
+            heap->pooled_pages = NULL;
+            objspace->rincgc.pooled_slots = 0;
+        }
+    }
+
+    rb_gc_event_hook(0, RUBY_INTERNAL_EVENT_GC_END_SWEEP);
+    gc_mode_transition(objspace, gc_mode_none);
+
+#if RGENGC_CHECK_MODE >= 2
+    gc_verify_internal_consistency(objspace);
+#endif
+}
+
+static int
+gc_sweep_step(rb_objspace_t *objspace, rb_heap_t *heap)
+{
+    struct heap_page *sweep_page = heap->sweeping_page;
+    int swept_slots = 0;
+    int pooled_slots = 0;
+
+    if (sweep_page == NULL) return FALSE;
+
+#if GC_ENABLE_LAZY_SWEEP
+    gc_prof_sweep_timer_start(objspace);
+#endif
+
+    do {
+        RUBY_DEBUG_LOG("sweep_page:%p", (void *)sweep_page);
+
+        struct gc_sweep_context ctx = {
+            .page = sweep_page,
+            .final_slots = 0,
+            .freed_slots = 0,
+            .empty_slots = 0,
+        };
+        gc_sweep_page(objspace, heap, &ctx);
+        int free_slots = ctx.freed_slots + ctx.empty_slots;
+
+        heap->sweeping_page = ccan_list_next(&heap->pages, sweep_page, page_node);
+
+        if (free_slots == sweep_page->total_slots) {
+            /* There are no living objects, so move this page to the global empty pages. */
+            heap_unlink_page(objspace, heap, sweep_page);
+
+            sweep_page->start = 0;
+            sweep_page->total_slots = 0;
+            sweep_page->slot_size = 0;
+            sweep_page->heap = NULL;
+            sweep_page->free_slots = 0;
+
+            asan_unlock_freelist(sweep_page);
+            sweep_page->freelist = NULL;
+            asan_lock_freelist(sweep_page);
+
+            asan_poison_memory_region(sweep_page->body, HEAP_PAGE_SIZE);
+
+            objspace->empty_pages_count++;
+            sweep_page->free_next = objspace->empty_pages;
+            objspace->empty_pages = sweep_page;
+        }
+        else if (free_slots > 0) {
+            heap->freed_slots += ctx.freed_slots;
+            heap->empty_slots += ctx.empty_slots;
+
+            if (pooled_slots < GC_INCREMENTAL_SWEEP_POOL_SLOT_COUNT) {
+                heap_add_poolpage(objspace, heap, sweep_page);
+                pooled_slots += free_slots;
+            }
+            else {
+                heap_add_freepage(heap, sweep_page);
+                swept_slots += free_slots;
+                if (swept_slots > GC_INCREMENTAL_SWEEP_SLOT_COUNT) {
+                    break;
+                }
+            }
+        }
+        else {
+            sweep_page->free_next = NULL;
+        }
+    } while ((sweep_page = heap->sweeping_page));
+
+    if (!heap->sweeping_page) {
+        gc_sweep_finish_heap(objspace, heap);
+
+        if (!has_sweeping_pages(objspace)) {
+            gc_sweep_finish(objspace);
+        }
+    }
+
+#if GC_ENABLE_LAZY_SWEEP
+    gc_prof_sweep_timer_stop(objspace);
+#endif
+
+    return heap->free_pages != NULL;
+}
+
+static void
+gc_sweep_rest(rb_objspace_t *objspace)
+{
+    for (int i = 0; i < HEAP_COUNT; i++) {
+        rb_heap_t *heap = &heaps[i];
+
+        while (heap->sweeping_page) {
+            gc_sweep_step(objspace, heap);
+        }
+    }
+}
+
+static void
+gc_sweep_continue(rb_objspace_t *objspace, rb_heap_t *sweep_heap)
+{
+    GC_ASSERT(dont_gc_val() == FALSE || objspace->profile.latest_gc_info & GPR_FLAG_METHOD);
+    if (!GC_ENABLE_LAZY_SWEEP) return;
+
+    gc_sweeping_enter(objspace);
+
+    for (int i = 0; i < HEAP_COUNT; i++) {
+        rb_heap_t *heap = &heaps[i];
+        if (!gc_sweep_step(objspace, heap)) {
+            if (heap == sweep_heap && objspace->empty_pages_count == 0 && objspace->heap_pages.allocatable_slots == 0) {
+                /* Not allowed to create a new page so finish sweeping. */
+                gc_sweep_rest(objspace);
+                break;
+            }
+        }
+    }
+
+    gc_sweeping_exit(objspace);
+}
+
+VALUE
+rb_gc_impl_location(void *objspace_ptr, VALUE value)
+{
+    VALUE destination;
+
+    asan_unpoisoning_object(value) {
+        if (BUILTIN_TYPE(value) == T_MOVED) {
+            destination = (VALUE)RMOVED(value)->destination;
+            GC_ASSERT(BUILTIN_TYPE(destination) != T_NONE);
+        }
+        else {
+            destination = value;
+        }
+    }
+
+    return destination;
+}
+
+#if GC_CAN_COMPILE_COMPACTION
+static void
+invalidate_moved_plane(rb_objspace_t *objspace, struct heap_page *page, uintptr_t p, bits_t bitset)
+{
+    if (bitset) {
+        do {
+            if (bitset & 1) {
+                VALUE forwarding_object = (VALUE)p;
+                VALUE object;
+
+                if (BUILTIN_TYPE(forwarding_object) == T_MOVED) {
+                    GC_ASSERT(RVALUE_PINNED(objspace, forwarding_object));
+                    GC_ASSERT(!RVALUE_MARKED(objspace, forwarding_object));
+
+                    CLEAR_IN_BITMAP(GET_HEAP_PINNED_BITS(forwarding_object), forwarding_object);
+
+                    object = rb_gc_impl_location(objspace, forwarding_object);
+
+                    uint32_t original_shape_id = 0;
+                    if (RB_TYPE_P(object, T_OBJECT)) {
+                        original_shape_id = RMOVED(forwarding_object)->original_shape_id;
+                    }
+
+                    gc_move(objspace, object, forwarding_object, GET_HEAP_PAGE(object)->slot_size, page->slot_size);
+                    /* forwarding_object is now our actual object, and "object"
+                     * is the free slot for the original page */
+
+                    if (original_shape_id) {
+                        rb_gc_set_shape(forwarding_object, original_shape_id);
+                    }
+
+                    struct heap_page *orig_page = GET_HEAP_PAGE(object);
+                    orig_page->free_slots++;
+                    heap_page_add_freeobj(objspace, orig_page, object);
+
+                    GC_ASSERT(RVALUE_MARKED(objspace, forwarding_object));
+                    GC_ASSERT(BUILTIN_TYPE(forwarding_object) != T_MOVED);
+                    GC_ASSERT(BUILTIN_TYPE(forwarding_object) != T_NONE);
+                }
+            }
+            p += BASE_SLOT_SIZE;
+            bitset >>= 1;
+        } while (bitset);
+    }
+}
+
+static void
+invalidate_moved_page(rb_objspace_t *objspace, struct heap_page *page)
+{
+    int i;
+    bits_t *mark_bits, *pin_bits;
+    bits_t bitset;
+
+    mark_bits = page->mark_bits;
+    pin_bits = page->pinned_bits;
+
+    uintptr_t p = page->start;
+
+    // Skip out of range slots at the head of the page
+    bitset = pin_bits[0] & ~mark_bits[0];
+    bitset >>= NUM_IN_PAGE(p);
+    invalidate_moved_plane(objspace, page, p, bitset);
+    p += (BITS_BITLENGTH - NUM_IN_PAGE(p)) * BASE_SLOT_SIZE;
+
+    for (i=1; i < HEAP_PAGE_BITMAP_LIMIT; i++) {
+        /* Moved objects are pinned but never marked. We reuse the pin bits
+         * to indicate there is a moved object in this slot. */
+        bitset = pin_bits[i] & ~mark_bits[i];
+
+        invalidate_moved_plane(objspace, page, p, bitset);
+        p += BITS_BITLENGTH * BASE_SLOT_SIZE;
+    }
+}
+#endif
+
+static void
+gc_compact_start(rb_objspace_t *objspace)
+{
+    struct heap_page *page = NULL;
+    gc_mode_transition(objspace, gc_mode_compacting);
+
+    for (int i = 0; i < HEAP_COUNT; i++) {
+        rb_heap_t *heap = &heaps[i];
+        ccan_list_for_each(&heap->pages, page, page_node) {
+            page->flags.before_sweep = TRUE;
+        }
+
+        heap->compact_cursor = ccan_list_tail(&heap->pages, struct heap_page, page_node);
+        heap->compact_cursor_index = 0;
+    }
+
+    if (gc_prof_enabled(objspace)) {
+        gc_profile_record *record = gc_prof_record(objspace);
+        record->moved_objects = objspace->rcompactor.total_moved;
+    }
+
+    memset(objspace->rcompactor.considered_count_table, 0, T_MASK * sizeof(size_t));
+    memset(objspace->rcompactor.moved_count_table, 0, T_MASK * sizeof(size_t));
+    memset(objspace->rcompactor.moved_up_count_table, 0, T_MASK * sizeof(size_t));
+    memset(objspace->rcompactor.moved_down_count_table, 0, T_MASK * sizeof(size_t));
+
+    /* Set up read barrier for pages containing MOVED objects */
+    install_handlers();
+}
+
+static void gc_sweep_compact(rb_objspace_t *objspace);
+
+static void
+gc_sweep(rb_objspace_t *objspace)
+{
+    gc_sweeping_enter(objspace);
+
+    const unsigned int immediate_sweep = objspace->flags.immediate_sweep;
+
+    gc_report(1, objspace, "gc_sweep: immediate: %d\n", immediate_sweep);
+
+    gc_sweep_start(objspace);
+    if (objspace->flags.during_compacting) {
+        gc_sweep_compact(objspace);
+    }
+
+    if (immediate_sweep) {
+#if !GC_ENABLE_LAZY_SWEEP
+        gc_prof_sweep_timer_start(objspace);
+#endif
+        gc_sweep_rest(objspace);
+#if !GC_ENABLE_LAZY_SWEEP
+        gc_prof_sweep_timer_stop(objspace);
+#endif
+    }
+    else {
+
+        /* Sweep every size pool. */
+        for (int i = 0; i < HEAP_COUNT; i++) {
+            rb_heap_t *heap = &heaps[i];
+            gc_sweep_step(objspace, heap);
+        }
+    }
+
+    gc_sweeping_exit(objspace);
+}
+
+/* Marking - Marking stack */
+
+static stack_chunk_t *
+stack_chunk_alloc(void)
+{
+    stack_chunk_t *res;
+
+    res = malloc(sizeof(stack_chunk_t));
+    if (!res)
+        rb_memerror();
+
+    return res;
+}
+
+static inline int
+is_mark_stack_empty(mark_stack_t *stack)
+{
+    return stack->chunk == NULL;
+}
+
+static size_t
+mark_stack_size(mark_stack_t *stack)
+{
+    size_t size = stack->index;
+    stack_chunk_t *chunk = stack->chunk ? stack->chunk->next : NULL;
+
+    while (chunk) {
+        size += stack->limit;
+        chunk = chunk->next;
+    }
+    return size;
+}
+
+static void
+add_stack_chunk_cache(mark_stack_t *stack, stack_chunk_t *chunk)
+{
+    chunk->next = stack->cache;
+    stack->cache = chunk;
+    stack->cache_size++;
+}
+
+static void
+shrink_stack_chunk_cache(mark_stack_t *stack)
+{
+    stack_chunk_t *chunk;
+
+    if (stack->unused_cache_size > (stack->cache_size/2)) {
+        chunk = stack->cache;
+        stack->cache = stack->cache->next;
+        stack->cache_size--;
+        free(chunk);
+    }
+    stack->unused_cache_size = stack->cache_size;
+}
+
+static void
+push_mark_stack_chunk(mark_stack_t *stack)
+{
+    stack_chunk_t *next;
+
+    GC_ASSERT(stack->index == stack->limit);
+
+    if (stack->cache_size > 0) {
+        next = stack->cache;
+        stack->cache = stack->cache->next;
+        stack->cache_size--;
+        if (stack->unused_cache_size > stack->cache_size)
+            stack->unused_cache_size = stack->cache_size;
+    }
+    else {
+        next = stack_chunk_alloc();
+    }
+    next->next = stack->chunk;
+    stack->chunk = next;
+    stack->index = 0;
+}
+
+static void
+pop_mark_stack_chunk(mark_stack_t *stack)
+{
+    stack_chunk_t *prev;
+
+    prev = stack->chunk->next;
+    GC_ASSERT(stack->index == 0);
+    add_stack_chunk_cache(stack, stack->chunk);
+    stack->chunk = prev;
+    stack->index = stack->limit;
+}
+
+static void
+mark_stack_chunk_list_free(stack_chunk_t *chunk)
+{
+    stack_chunk_t *next = NULL;
+
+    while (chunk != NULL) {
+        next = chunk->next;
+        free(chunk);
+        chunk = next;
+    }
+}
+
+static void
+free_stack_chunks(mark_stack_t *stack)
+{
+    mark_stack_chunk_list_free(stack->chunk);
+}
+
+static void
+mark_stack_free_cache(mark_stack_t *stack)
+{
+    mark_stack_chunk_list_free(stack->cache);
+    stack->cache_size = 0;
+    stack->unused_cache_size = 0;
+}
+
+static void
+push_mark_stack(mark_stack_t *stack, VALUE obj)
+{
+    switch (BUILTIN_TYPE(obj)) {
+      case T_OBJECT:
+      case T_CLASS:
+      case T_MODULE:
+      case T_FLOAT:
+      case T_STRING:
+      case T_REGEXP:
+      case T_ARRAY:
+      case T_HASH:
+      case T_STRUCT:
+      case T_BIGNUM:
+      case T_FILE:
+      case T_DATA:
+      case T_MATCH:
+      case T_COMPLEX:
+      case T_RATIONAL:
+      case T_TRUE:
+      case T_FALSE:
+      case T_SYMBOL:
+      case T_IMEMO:
+      case T_ICLASS:
+        if (stack->index == stack->limit) {
+            push_mark_stack_chunk(stack);
+        }
+        stack->chunk->data[stack->index++] = obj;
+        return;
+
+      case T_NONE:
+      case T_NIL:
+      case T_FIXNUM:
+      case T_MOVED:
+      case T_ZOMBIE:
+      case T_UNDEF:
+      case T_MASK:
+        rb_bug("push_mark_stack() called for broken object");
+        break;
+
+      case T_NODE:
+        rb_bug("push_mark_stack: unexpected T_NODE object");
+        break;
+    }
+
+    rb_bug("rb_gc_mark(): unknown data type 0x%x(%p) %s",
+            BUILTIN_TYPE(obj), (void *)obj,
+            is_pointer_to_heap((rb_objspace_t *)rb_gc_get_objspace(), (void *)obj) ? "corrupted object" : "non object");
+}
+
+static int
+pop_mark_stack(mark_stack_t *stack, VALUE *data)
+{
+    if (is_mark_stack_empty(stack)) {
+        return FALSE;
+    }
+    if (stack->index == 1) {
+        *data = stack->chunk->data[--stack->index];
+        pop_mark_stack_chunk(stack);
+    }
+    else {
+        *data = stack->chunk->data[--stack->index];
+    }
+    return TRUE;
+}
+
+static void
+init_mark_stack(mark_stack_t *stack)
+{
+    int i;
+
+    MEMZERO(stack, mark_stack_t, 1);
+    stack->index = stack->limit = STACK_CHUNK_SIZE;
+
+    for (i=0; i < 4; i++) {
+        add_stack_chunk_cache(stack, stack_chunk_alloc());
+    }
+    stack->unused_cache_size = stack->cache_size;
+}
+
+/* Marking */
+
+static void
+rgengc_check_relation(rb_objspace_t *objspace, VALUE obj)
+{
+    const VALUE old_parent = objspace->rgengc.parent_object;
+
+    if (old_parent) { /* parent object is old */
+        if (RVALUE_WB_UNPROTECTED(objspace, obj) || !RVALUE_OLD_P(objspace, obj)) {
+            rgengc_remember(objspace, old_parent);
+        }
+    }
+
+    GC_ASSERT(old_parent == objspace->rgengc.parent_object);
+}
+
+static inline int
+gc_mark_set(rb_objspace_t *objspace, VALUE obj)
+{
+    if (RVALUE_MARKED(objspace, obj)) return 0;
+    MARK_IN_BITMAP(GET_HEAP_MARK_BITS(obj), obj);
+    return 1;
+}
+
+static void
+gc_aging(rb_objspace_t *objspace, VALUE obj)
+{
+    /* Disable aging if Major GC's are disabled. This will prevent longish lived
+     * objects filling up the heap at the expense of marking many more objects.
+     *
+     * We should always pre-warm our process when disabling majors, by running
+     * GC manually several times so that most objects likely to become oldgen
+     * are already oldgen.
+     */
+    if(!gc_config_full_mark_val)
+        return;
+
+    struct heap_page *page = GET_HEAP_PAGE(obj);
+
+    GC_ASSERT(RVALUE_MARKING(objspace, obj) == FALSE);
+    check_rvalue_consistency(objspace, obj);
+
+    if (!RVALUE_PAGE_WB_UNPROTECTED(page, obj)) {
+        if (!RVALUE_OLD_P(objspace, obj)) {
+            gc_report(3, objspace, "gc_aging: YOUNG: %s\n", rb_obj_info(obj));
+            RVALUE_AGE_INC(objspace, obj);
+        }
+        else if (is_full_marking(objspace)) {
+            GC_ASSERT(RVALUE_PAGE_UNCOLLECTIBLE(page, obj) == FALSE);
+            RVALUE_PAGE_OLD_UNCOLLECTIBLE_SET(objspace, page, obj);
+        }
+    }
+    check_rvalue_consistency(objspace, obj);
+
+    objspace->marked_slots++;
+}
+
+static void
+gc_grey(rb_objspace_t *objspace, VALUE obj)
+{
+#if RGENGC_CHECK_MODE
+    if (RVALUE_MARKED(objspace, obj) == FALSE) rb_bug("gc_grey: %s is not marked.", rb_obj_info(obj));
+    if (RVALUE_MARKING(objspace, obj) == TRUE) rb_bug("gc_grey: %s is marking/remembered.", rb_obj_info(obj));
+#endif
+
+    if (is_incremental_marking(objspace)) {
+        MARK_IN_BITMAP(GET_HEAP_MARKING_BITS(obj), obj);
+    }
+
+    push_mark_stack(&objspace->mark_stack, obj);
+}
+
+static void
+gc_mark(rb_objspace_t *objspace, VALUE obj)
+{
+    GC_ASSERT(during_gc);
+
+    rgengc_check_relation(objspace, obj);
+    if (!gc_mark_set(objspace, obj)) return; /* already marked */
+
+    if (0) { // for debug GC marking miss
+        if (objspace->rgengc.parent_object) {
+            RUBY_DEBUG_LOG("%p (%s) parent:%p (%s)",
+                            (void *)obj, obj_type_name(obj),
+                            (void *)objspace->rgengc.parent_object, obj_type_name(objspace->rgengc.parent_object));
+        }
+        else {
+            RUBY_DEBUG_LOG("%p (%s)", (void *)obj, obj_type_name(obj));
+        }
+    }
+
+    if (RB_UNLIKELY(RB_TYPE_P(obj, T_NONE))) {
+        rb_obj_info_dump(obj);
+        rb_bug("try to mark T_NONE object"); /* check here will help debugging */
+    }
+
+    gc_aging(objspace, obj);
+    gc_grey(objspace, obj);
+}
+
+static inline void
+gc_pin(rb_objspace_t *objspace, VALUE obj)
+{
+    GC_ASSERT(!SPECIAL_CONST_P(obj));
+    if (RB_UNLIKELY(objspace->flags.during_compacting)) {
+        if (RB_LIKELY(during_gc)) {
+            if (!RVALUE_PINNED(objspace, obj)) {
+                GC_ASSERT(GET_HEAP_PAGE(obj)->pinned_slots <= GET_HEAP_PAGE(obj)->total_slots);
+                GET_HEAP_PAGE(obj)->pinned_slots++;
+                MARK_IN_BITMAP(GET_HEAP_PINNED_BITS(obj), obj);
+            }
+        }
+    }
+}
+
+static inline void
+gc_mark_and_pin(rb_objspace_t *objspace, VALUE obj)
+{
+    gc_pin(objspace, obj);
+    gc_mark(objspace, obj);
+}
+
+void
+rb_gc_impl_mark_and_move(void *objspace_ptr, VALUE *ptr)
+{
+    rb_objspace_t *objspace = objspace_ptr;
+
+    if (RB_UNLIKELY(objspace->flags.during_reference_updating)) {
+        GC_ASSERT(objspace->flags.during_compacting);
+        GC_ASSERT(during_gc);
+
+        *ptr = rb_gc_impl_location(objspace, *ptr);
+    }
+    else {
+        gc_mark(objspace, *ptr);
+    }
+}
+
+void
+rb_gc_impl_mark(void *objspace_ptr, VALUE obj)
+{
+    rb_objspace_t *objspace = objspace_ptr;
+
+    gc_mark(objspace, obj);
+}
+
+void
+rb_gc_impl_mark_and_pin(void *objspace_ptr, VALUE obj)
+{
+    rb_objspace_t *objspace = objspace_ptr;
+
+    gc_mark_and_pin(objspace, obj);
+}
+
+void
+rb_gc_impl_mark_maybe(void *objspace_ptr, VALUE obj)
+{
+    rb_objspace_t *objspace = objspace_ptr;
+
+    (void)VALGRIND_MAKE_MEM_DEFINED(&obj, sizeof(obj));
+
+    if (is_pointer_to_heap(objspace, (void *)obj)) {
+        asan_unpoisoning_object(obj) {
+            /* Garbage can live on the stack, so do not mark or pin */
+            switch (BUILTIN_TYPE(obj)) {
+            case T_ZOMBIE:
+            case T_NONE:
+                break;
+            default:
+                gc_mark_and_pin(objspace, obj);
+                break;
+            }
+        }
+    }
+}
+
+void
+rb_gc_impl_mark_weak(void *objspace_ptr, VALUE *ptr)
+{
+    rb_objspace_t *objspace = objspace_ptr;
+
+    GC_ASSERT(objspace->rgengc.parent_object == 0 || FL_TEST(objspace->rgengc.parent_object, FL_WB_PROTECTED));
+
+    VALUE obj = *ptr;
+
+    if (RB_UNLIKELY(RB_TYPE_P(obj, T_NONE))) {
+        rb_obj_info_dump(obj);
+        rb_bug("try to mark T_NONE object");
+    }
+
+    /* If we are in a minor GC and the other object is old, then obj should
+     * already be marked and cannot be reclaimed in this GC cycle so we don't
+     * need to add it to the weak references list. */
+    if (!is_full_marking(objspace) && RVALUE_OLD_P(objspace, obj)) {
+        GC_ASSERT(RVALUE_MARKED(objspace, obj));
+        GC_ASSERT(!objspace->flags.during_compacting);
+
+        return;
+    }
+
+    rgengc_check_relation(objspace, obj);
+
+    rb_darray_append_without_gc(&objspace->weak_references, ptr);
+
+    objspace->profile.weak_references_count++;
+}
+
+void
+rb_gc_impl_remove_weak(void *objspace_ptr, VALUE parent_obj, VALUE *ptr)
+{
+    rb_objspace_t *objspace = objspace_ptr;
+
+    /* If we're not incremental marking, then the state of the objects can't
+     * change so we don't need to do anything. */
+    if (!is_incremental_marking(objspace)) return;
+    /* If parent_obj has not been marked, then ptr has not yet been marked
+     * weak, so we don't need to do anything. */
+    if (!RVALUE_MARKED(objspace, parent_obj)) return;
+
+    VALUE **ptr_ptr;
+    rb_darray_foreach(objspace->weak_references, i, ptr_ptr) {
+        if (*ptr_ptr == ptr) {
+            *ptr_ptr = NULL;
+            break;
+        }
+    }
+}
+
+static int
+pin_value(st_data_t key, st_data_t value, st_data_t data)
+{
+    rb_gc_impl_mark_and_pin((void *)data, (VALUE)value);
+
+    return ST_CONTINUE;
+}
+
+static void
+mark_roots(rb_objspace_t *objspace, const char **categoryp)
+{
+#define MARK_CHECKPOINT(category) do { \
+    if (categoryp) *categoryp = category; \
+} while (0)
+
+    MARK_CHECKPOINT("objspace");
+    objspace->rgengc.parent_object = Qfalse;
+
+    if (finalizer_table != NULL) {
+        st_foreach(finalizer_table, pin_value, (st_data_t)objspace);
+    }
+
+    if (stress_to_class) rb_gc_mark(stress_to_class);
+
+    rb_gc_save_machine_context();
+    rb_gc_mark_roots(objspace, categoryp);
+}
+
+static inline void
+gc_mark_set_parent(rb_objspace_t *objspace, VALUE obj)
+{
+    if (RVALUE_OLD_P(objspace, obj)) {
+        objspace->rgengc.parent_object = obj;
+    }
+    else {
+        objspace->rgengc.parent_object = Qfalse;
+    }
+}
+
+static void
+gc_mark_children(rb_objspace_t *objspace, VALUE obj)
+{
+    gc_mark_set_parent(objspace, obj);
+    rb_gc_mark_children(objspace, obj);
+}
+
+/**
+ * incremental: 0 -> not incremental (do all)
+ * incremental: n -> mark at most `n' objects
+ */
+static inline int
+gc_mark_stacked_objects(rb_objspace_t *objspace, int incremental, size_t count)
+{
+    mark_stack_t *mstack = &objspace->mark_stack;
+    VALUE obj;
+    size_t marked_slots_at_the_beginning = objspace->marked_slots;
+    size_t popped_count = 0;
+
+    while (pop_mark_stack(mstack, &obj)) {
+        if (obj == Qundef) continue; /* skip */
+
+        if (RGENGC_CHECK_MODE && !RVALUE_MARKED(objspace, obj)) {
+            rb_bug("gc_mark_stacked_objects: %s is not marked.", rb_obj_info(obj));
+        }
+        gc_mark_children(objspace, obj);
+
+        if (incremental) {
+            if (RGENGC_CHECK_MODE && !RVALUE_MARKING(objspace, obj)) {
+                rb_bug("gc_mark_stacked_objects: incremental, but marking bit is 0");
+            }
+            CLEAR_IN_BITMAP(GET_HEAP_MARKING_BITS(obj), obj);
+            popped_count++;
+
+            if (popped_count + (objspace->marked_slots - marked_slots_at_the_beginning) > count) {
+                break;
+            }
+        }
+        else {
+            /* just ignore marking bits */
+        }
+    }
+
+    if (RGENGC_CHECK_MODE >= 3) gc_verify_internal_consistency(objspace);
+
+    if (is_mark_stack_empty(mstack)) {
+        shrink_stack_chunk_cache(mstack);
+        return TRUE;
+    }
+    else {
+        return FALSE;
+    }
+}
+
+static int
+gc_mark_stacked_objects_incremental(rb_objspace_t *objspace, size_t count)
+{
+    return gc_mark_stacked_objects(objspace, TRUE, count);
+}
+
+static int
+gc_mark_stacked_objects_all(rb_objspace_t *objspace)
+{
+    return gc_mark_stacked_objects(objspace, FALSE, 0);
+}
+
+#if RGENGC_CHECK_MODE >= 4
+
+#define MAKE_ROOTSIG(obj) (((VALUE)(obj) << 1) | 0x01)
+#define IS_ROOTSIG(obj)   ((VALUE)(obj) & 0x01)
+#define GET_ROOTSIG(obj)  ((const char *)((VALUE)(obj) >> 1))
+
+struct reflist {
+    VALUE *list;
+    int pos;
+    int size;
+};
+
+static struct reflist *
+reflist_create(VALUE obj)
+{
+    struct reflist *refs = xmalloc(sizeof(struct reflist));
+    refs->size = 1;
+    refs->list = ALLOC_N(VALUE, refs->size);
+    refs->list[0] = obj;
+    refs->pos = 1;
+    return refs;
+}
+
+static void
+reflist_destruct(struct reflist *refs)
+{
+    xfree(refs->list);
+    xfree(refs);
+}
+
+static void
+reflist_add(struct reflist *refs, VALUE obj)
+{
+    if (refs->pos == refs->size) {
+        refs->size *= 2;
+        SIZED_REALLOC_N(refs->list, VALUE, refs->size, refs->size/2);
+    }
+
+    refs->list[refs->pos++] = obj;
+}
+
+static void
+reflist_dump(struct reflist *refs)
+{
+    int i;
+    for (i=0; i<refs->pos; i++) {
+        VALUE obj = refs->list[i];
+        if (IS_ROOTSIG(obj)) { /* root */
+            fprintf(stderr, "<root@%s>", GET_ROOTSIG(obj));
+        }
+        else {
+            fprintf(stderr, "<%s>", rb_obj_info(obj));
+        }
+        if (i+1 < refs->pos) fprintf(stderr, ", ");
+    }
+}
+
+static int
+reflist_referred_from_machine_context(struct reflist *refs)
+{
+    int i;
+    for (i=0; i<refs->pos; i++) {
+        VALUE obj = refs->list[i];
+        if (IS_ROOTSIG(obj) && strcmp(GET_ROOTSIG(obj), "machine_context") == 0) return 1;
+    }
+    return 0;
+}
+
+struct allrefs {
+    rb_objspace_t *objspace;
+    /* a -> obj1
+     * b -> obj1
+     * c -> obj1
+     * c -> obj2
+     * d -> obj3
+     * #=> {obj1 => [a, b, c], obj2 => [c, d]}
+     */
+    struct st_table *references;
+    const char *category;
+    VALUE root_obj;
+    mark_stack_t mark_stack;
+};
+
+static int
+allrefs_add(struct allrefs *data, VALUE obj)
+{
+    struct reflist *refs;
+    st_data_t r;
+
+    if (st_lookup(data->references, obj, &r)) {
+        refs = (struct reflist *)r;
+        reflist_add(refs, data->root_obj);
+        return 0;
+    }
+    else {
+        refs = reflist_create(data->root_obj);
+        st_insert(data->references, obj, (st_data_t)refs);
+        return 1;
+    }
+}
+
+static void
+allrefs_i(VALUE obj, void *ptr)
+{
+    struct allrefs *data = (struct allrefs *)ptr;
+
+    if (allrefs_add(data, obj)) {
+        push_mark_stack(&data->mark_stack, obj);
+    }
+}
+
+static void
+allrefs_roots_i(VALUE obj, void *ptr)
+{
+    struct allrefs *data = (struct allrefs *)ptr;
+    if (strlen(data->category) == 0) rb_bug("!!!");
+    data->root_obj = MAKE_ROOTSIG(data->category);
+
+    if (allrefs_add(data, obj)) {
+        push_mark_stack(&data->mark_stack, obj);
+    }
+}
+#define PUSH_MARK_FUNC_DATA(v) do { \
+    struct gc_mark_func_data_struct *prev_mark_func_data = GET_VM()->gc.mark_func_data; \
+    GET_VM()->gc.mark_func_data = (v);
+
+#define POP_MARK_FUNC_DATA() GET_VM()->gc.mark_func_data = prev_mark_func_data;} while (0)
+
+static st_table *
+objspace_allrefs(rb_objspace_t *objspace)
+{
+    struct allrefs data;
+    struct gc_mark_func_data_struct mfd;
+    VALUE obj;
+    int prev_dont_gc = dont_gc_val();
+    dont_gc_on();
+
+    data.objspace = objspace;
+    data.references = st_init_numtable();
+    init_mark_stack(&data.mark_stack);
+
+    mfd.mark_func = allrefs_roots_i;
+    mfd.data = &data;
+
+    /* traverse root objects */
+    PUSH_MARK_FUNC_DATA(&mfd);
+    GET_VM()->gc.mark_func_data = &mfd;
+    mark_roots(objspace, &data.category);
+    POP_MARK_FUNC_DATA();
+
+    /* traverse rest objects reachable from root objects */
+    while (pop_mark_stack(&data.mark_stack, &obj)) {
+        rb_objspace_reachable_objects_from(data.root_obj = obj, allrefs_i, &data);
+    }
+    free_stack_chunks(&data.mark_stack);
+
+    dont_gc_set(prev_dont_gc);
+    return data.references;
+}
+
+static int
+objspace_allrefs_destruct_i(st_data_t key, st_data_t value, st_data_t ptr)
+{
+    struct reflist *refs = (struct reflist *)value;
+    reflist_destruct(refs);
+    return ST_CONTINUE;
+}
+
+static void
+objspace_allrefs_destruct(struct st_table *refs)
+{
+    st_foreach(refs, objspace_allrefs_destruct_i, 0);
+    st_free_table(refs);
+}
+
+#if RGENGC_CHECK_MODE >= 5
+static int
+allrefs_dump_i(st_data_t k, st_data_t v, st_data_t ptr)
+{
+    VALUE obj = (VALUE)k;
+    struct reflist *refs = (struct reflist *)v;
+    fprintf(stderr, "[allrefs_dump_i] %s <- ", rb_obj_info(obj));
+    reflist_dump(refs);
+    fprintf(stderr, "\n");
+    return ST_CONTINUE;
+}
+
+static void
+allrefs_dump(rb_objspace_t *objspace)
+{
+    VALUE size = objspace->rgengc.allrefs_table->num_entries;
+    fprintf(stderr, "[all refs] (size: %"PRIuVALUE")\n", size);
+    st_foreach(objspace->rgengc.allrefs_table, allrefs_dump_i, 0);
+}
+#endif
+
+static int
+gc_check_after_marks_i(st_data_t k, st_data_t v, st_data_t ptr)
+{
+    VALUE obj = k;
+    struct reflist *refs = (struct reflist *)v;
+    rb_objspace_t *objspace = (rb_objspace_t *)ptr;
+
+    /* object should be marked or oldgen */
+    if (!RVALUE_MARKED(objspace, obj)) {
+        fprintf(stderr, "gc_check_after_marks_i: %s is not marked and not oldgen.\n", rb_obj_info(obj));
+        fprintf(stderr, "gc_check_after_marks_i: %p is referred from ", (void *)obj);
+        reflist_dump(refs);
+
+        if (reflist_referred_from_machine_context(refs)) {
+            fprintf(stderr, " (marked from machine stack).\n");
+            /* marked from machine context can be false positive */
+        }
+        else {
+            objspace->rgengc.error_count++;
+            fprintf(stderr, "\n");
+        }
+    }
+    return ST_CONTINUE;
+}
+
+static void
+gc_marks_check(rb_objspace_t *objspace, st_foreach_callback_func *checker_func, const char *checker_name)
+{
+    size_t saved_malloc_increase = objspace->malloc_params.increase;
+#if RGENGC_ESTIMATE_OLDMALLOC
+    size_t saved_oldmalloc_increase = objspace->rgengc.oldmalloc_increase;
+#endif
+    VALUE already_disabled = rb_objspace_gc_disable(objspace);
+
+    objspace->rgengc.allrefs_table = objspace_allrefs(objspace);
+
+    if (checker_func) {
+        st_foreach(objspace->rgengc.allrefs_table, checker_func, (st_data_t)objspace);
+    }
+
+    if (objspace->rgengc.error_count > 0) {
+#if RGENGC_CHECK_MODE >= 5
+        allrefs_dump(objspace);
+#endif
+        if (checker_name) rb_bug("%s: GC has problem.", checker_name);
+    }
+
+    objspace_allrefs_destruct(objspace->rgengc.allrefs_table);
+    objspace->rgengc.allrefs_table = 0;
+
+    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;
+#endif
+}
+#endif /* RGENGC_CHECK_MODE >= 4 */
+
+struct verify_internal_consistency_struct {
+    rb_objspace_t *objspace;
+    int err_count;
+    size_t live_object_count;
+    size_t zombie_object_count;
+
+    VALUE parent;
+    size_t old_object_count;
+    size_t remembered_shady_count;
+};
+
+static void
+check_generation_i(const VALUE child, void *ptr)
+{
+    struct verify_internal_consistency_struct *data = (struct verify_internal_consistency_struct *)ptr;
+    const VALUE parent = data->parent;
+
+    if (RGENGC_CHECK_MODE) GC_ASSERT(RVALUE_OLD_P(data->objspace, parent));
+
+    if (!RVALUE_OLD_P(data->objspace, child)) {
+        if (!RVALUE_REMEMBERED(data->objspace, parent) &&
+            !RVALUE_REMEMBERED(data->objspace, child) &&
+            !RVALUE_UNCOLLECTIBLE(data->objspace, child)) {
+            fprintf(stderr, "verify_internal_consistency_reachable_i: WB miss (O->Y) %s -> %s\n", rb_obj_info(parent), rb_obj_info(child));
+            data->err_count++;
+        }
+    }
+}
+
+static void
+check_color_i(const VALUE child, void *ptr)
+{
+    struct verify_internal_consistency_struct *data = (struct verify_internal_consistency_struct *)ptr;
+    const VALUE parent = data->parent;
+
+    if (!RVALUE_WB_UNPROTECTED(data->objspace, parent) && RVALUE_WHITE_P(data->objspace, child)) {
+        fprintf(stderr, "verify_internal_consistency_reachable_i: WB miss (B->W) - %s -> %s\n",
+                rb_obj_info(parent), rb_obj_info(child));
+        data->err_count++;
+    }
+}
+
+static void
+check_children_i(const VALUE child, void *ptr)
+{
+    struct verify_internal_consistency_struct *data = (struct verify_internal_consistency_struct *)ptr;
+    if (check_rvalue_consistency_force(data->objspace, child, FALSE) != 0) {
+        fprintf(stderr, "check_children_i: %s has error (referenced from %s)",
+                rb_obj_info(child), rb_obj_info(data->parent));
+
+        data->err_count++;
+    }
+}
+
+static int
+verify_internal_consistency_i(void *page_start, void *page_end, size_t stride,
+                              struct verify_internal_consistency_struct *data)
+{
+    VALUE obj;
+    rb_objspace_t *objspace = data->objspace;
+
+    for (obj = (VALUE)page_start; obj != (VALUE)page_end; obj += stride) {
+        asan_unpoisoning_object(obj) {
+            if (!rb_gc_impl_garbage_object_p(objspace, obj)) {
+                /* count objects */
+                data->live_object_count++;
+                data->parent = obj;
+
+                /* Normally, we don't expect T_MOVED objects to be in the heap.
+                * But they can stay alive on the stack, */
+                if (!gc_object_moved_p(objspace, obj)) {
+                    /* moved slots don't have children */
+                    rb_objspace_reachable_objects_from(obj, check_children_i, (void *)data);
+                }
+
+                /* check health of children */
+                if (RVALUE_OLD_P(objspace, obj)) data->old_object_count++;
+                if (RVALUE_WB_UNPROTECTED(objspace, obj) && RVALUE_UNCOLLECTIBLE(objspace, obj)) data->remembered_shady_count++;
+
+                if (!is_marking(objspace) && RVALUE_OLD_P(objspace, obj)) {
+                    /* reachable objects from an oldgen object should be old or (young with remember) */
+                    data->parent = obj;
+                    rb_objspace_reachable_objects_from(obj, check_generation_i, (void *)data);
+                }
+
+                if (is_incremental_marking(objspace)) {
+                    if (RVALUE_BLACK_P(objspace, obj)) {
+                        /* reachable objects from black objects should be black or grey objects */
+                        data->parent = obj;
+                        rb_objspace_reachable_objects_from(obj, check_color_i, (void *)data);
+                    }
+                }
+            }
+            else {
+                if (BUILTIN_TYPE(obj) == T_ZOMBIE) {
+                    data->zombie_object_count++;
+
+                    if ((RBASIC(obj)->flags & ~ZOMBIE_OBJ_KEPT_FLAGS) != T_ZOMBIE) {
+                        fprintf(stderr, "verify_internal_consistency_i: T_ZOMBIE has extra flags set: %s\n",
+                                rb_obj_info(obj));
+                        data->err_count++;
+                    }
+
+                    if (!!FL_TEST(obj, FL_FINALIZE) != !!st_is_member(finalizer_table, obj)) {
+                        fprintf(stderr, "verify_internal_consistency_i: FL_FINALIZE %s but %s finalizer_table: %s\n",
+                                FL_TEST(obj, FL_FINALIZE) ? "set" : "not set", st_is_member(finalizer_table, obj) ? "in" : "not in",
+                                rb_obj_info(obj));
+                        data->err_count++;
+                    }
+                }
+            }
+        }
+    }
+
+    return 0;
+}
+
+static int
+gc_verify_heap_page(rb_objspace_t *objspace, struct heap_page *page, VALUE obj)
+{
+    unsigned int has_remembered_shady = FALSE;
+    unsigned int has_remembered_old = FALSE;
+    int remembered_old_objects = 0;
+    int free_objects = 0;
+    int zombie_objects = 0;
+
+    short slot_size = page->slot_size;
+    uintptr_t start = (uintptr_t)page->start;
+    uintptr_t end = start + page->total_slots * slot_size;
+
+    for (uintptr_t ptr = start; ptr < end; ptr += slot_size) {
+        VALUE val = (VALUE)ptr;
+        asan_unpoisoning_object(val) {
+            enum ruby_value_type type = BUILTIN_TYPE(val);
+
+            if (type == T_NONE) free_objects++;
+            if (type == T_ZOMBIE) zombie_objects++;
+            if (RVALUE_PAGE_UNCOLLECTIBLE(page, val) && RVALUE_PAGE_WB_UNPROTECTED(page, val)) {
+                has_remembered_shady = TRUE;
+            }
+            if (RVALUE_PAGE_MARKING(page, val)) {
+                has_remembered_old = TRUE;
+                remembered_old_objects++;
+            }
+        }
+    }
+
+    if (!is_incremental_marking(objspace) &&
+        page->flags.has_remembered_objects == FALSE && has_remembered_old == TRUE) {
+
+        for (uintptr_t ptr = start; ptr < end; ptr += slot_size) {
+            VALUE val = (VALUE)ptr;
+            if (RVALUE_PAGE_MARKING(page, val)) {
+                fprintf(stderr, "marking -> %s\n", rb_obj_info(val));
+            }
+        }
+        rb_bug("page %p's has_remembered_objects should be false, but there are remembered old objects (%d). %s",
+               (void *)page, remembered_old_objects, obj ? rb_obj_info(obj) : "");
+    }
+
+    if (page->flags.has_uncollectible_wb_unprotected_objects == FALSE && has_remembered_shady == TRUE) {
+        rb_bug("page %p's has_remembered_shady should be false, but there are remembered shady objects. %s",
+               (void *)page, obj ? rb_obj_info(obj) : "");
+    }
+
+    if (0) {
+        /* free_slots may not equal to free_objects */
+        if (page->free_slots != free_objects) {
+            rb_bug("page %p's free_slots should be %d, but %d", (void *)page, page->free_slots, free_objects);
+        }
+    }
+    if (page->final_slots != zombie_objects) {
+        rb_bug("page %p's final_slots should be %d, but %d", (void *)page, page->final_slots, zombie_objects);
+    }
+
+    return remembered_old_objects;
+}
+
+static int
+gc_verify_heap_pages_(rb_objspace_t *objspace, struct ccan_list_head *head)
+{
+    int remembered_old_objects = 0;
+    struct heap_page *page = 0;
+
+    ccan_list_for_each(head, page, page_node) {
+        asan_unlock_freelist(page);
+        struct free_slot *p = page->freelist;
+        while (p) {
+            VALUE vp = (VALUE)p;
+            VALUE prev = vp;
+            rb_asan_unpoison_object(vp, false);
+            if (BUILTIN_TYPE(vp) != T_NONE) {
+                fprintf(stderr, "freelist slot expected to be T_NONE but was: %s\n", rb_obj_info(vp));
+            }
+            p = p->next;
+            rb_asan_poison_object(prev);
+        }
+        asan_lock_freelist(page);
+
+        if (page->flags.has_remembered_objects == FALSE) {
+            remembered_old_objects += gc_verify_heap_page(objspace, page, Qfalse);
+        }
+    }
+
+    return remembered_old_objects;
+}
+
+static int
+gc_verify_heap_pages(rb_objspace_t *objspace)
+{
+    int remembered_old_objects = 0;
+    for (int i = 0; i < HEAP_COUNT; i++) {
+        remembered_old_objects += gc_verify_heap_pages_(objspace, &((&heaps[i])->pages));
+    }
+    return remembered_old_objects;
+}
+
+static void
+gc_verify_internal_consistency_(rb_objspace_t *objspace)
+{
+    struct verify_internal_consistency_struct data = {0};
+
+    data.objspace = objspace;
+    gc_report(5, objspace, "gc_verify_internal_consistency: start\n");
+
+    /* check relations */
+    for (size_t i = 0; i < rb_darray_size(objspace->heap_pages.sorted); i++) {
+        struct heap_page *page = rb_darray_get(objspace->heap_pages.sorted, i);
+        short slot_size = page->slot_size;
+
+        uintptr_t start = (uintptr_t)page->start;
+        uintptr_t end = start + page->total_slots * slot_size;
+
+        verify_internal_consistency_i((void *)start, (void *)end, slot_size, &data);
+    }
+
+    if (data.err_count != 0) {
+#if RGENGC_CHECK_MODE >= 5
+        objspace->rgengc.error_count = data.err_count;
+        gc_marks_check(objspace, NULL, NULL);
+        allrefs_dump(objspace);
+#endif
+        rb_bug("gc_verify_internal_consistency: found internal inconsistency.");
+    }
+
+    /* check heap_page status */
+    gc_verify_heap_pages(objspace);
+
+    /* check counters */
+
+    if (!is_lazy_sweeping(objspace) &&
+            !finalizing &&
+            !rb_gc_multi_ractor_p()) {
+        if (objspace_live_slots(objspace) != data.live_object_count) {
+            fprintf(stderr, "heap_pages_final_slots: %"PRIdSIZE", total_freed_objects: %"PRIdSIZE"\n",
+                    total_final_slots_count(objspace), total_freed_objects(objspace));
+            rb_bug("inconsistent live slot number: expect %"PRIuSIZE", but %"PRIuSIZE".",
+                   objspace_live_slots(objspace), data.live_object_count);
+        }
+    }
+
+    if (!is_marking(objspace)) {
+        if (objspace->rgengc.old_objects != data.old_object_count) {
+            rb_bug("inconsistent old slot number: expect %"PRIuSIZE", but %"PRIuSIZE".",
+                   objspace->rgengc.old_objects, data.old_object_count);
+        }
+        if (objspace->rgengc.uncollectible_wb_unprotected_objects != data.remembered_shady_count) {
+            rb_bug("inconsistent number of wb unprotected objects: expect %"PRIuSIZE", but %"PRIuSIZE".",
+                   objspace->rgengc.uncollectible_wb_unprotected_objects, data.remembered_shady_count);
+        }
+    }
+
+    if (!finalizing) {
+        size_t list_count = 0;
+
+        {
+            VALUE z = heap_pages_deferred_final;
+            while (z) {
+                list_count++;
+                z = RZOMBIE(z)->next;
+            }
+        }
+
+        if (total_final_slots_count(objspace) != data.zombie_object_count ||
+            total_final_slots_count(objspace) != list_count) {
+
+            rb_bug("inconsistent finalizing object count:\n"
+                    "  expect %"PRIuSIZE"\n"
+                    "  but    %"PRIuSIZE" zombies\n"
+                    "  heap_pages_deferred_final list has %"PRIuSIZE" items.",
+                    total_final_slots_count(objspace),
+                    data.zombie_object_count,
+                    list_count);
+        }
+    }
+
+    gc_report(5, objspace, "gc_verify_internal_consistency: OK\n");
+}
+
+static void
+gc_verify_internal_consistency(void *objspace_ptr)
+{
+    rb_objspace_t *objspace = objspace_ptr;
+
+    unsigned int lev = RB_GC_VM_LOCK();
+    {
+        rb_gc_vm_barrier(); // stop other ractors
+
+        unsigned int prev_during_gc = during_gc;
+        during_gc = FALSE; // stop gc here
+        {
+            gc_verify_internal_consistency_(objspace);
+        }
+        during_gc = prev_during_gc;
+    }
+    RB_GC_VM_UNLOCK(lev);
+}
+
+static void
+heap_move_pooled_pages_to_free_pages(rb_heap_t *heap)
+{
+    if (heap->pooled_pages) {
+        if (heap->free_pages) {
+            struct heap_page *free_pages_tail = heap->free_pages;
+            while (free_pages_tail->free_next) {
+                free_pages_tail = free_pages_tail->free_next;
+            }
+            free_pages_tail->free_next = heap->pooled_pages;
+        }
+        else {
+            heap->free_pages = heap->pooled_pages;
+        }
+
+        heap->pooled_pages = NULL;
+    }
+}
+
+static int
+gc_remember_unprotected(rb_objspace_t *objspace, VALUE obj)
+{
+    struct heap_page *page = GET_HEAP_PAGE(obj);
+    bits_t *uncollectible_bits = &page->uncollectible_bits[0];
+
+    if (!MARKED_IN_BITMAP(uncollectible_bits, obj)) {
+        page->flags.has_uncollectible_wb_unprotected_objects = TRUE;
+        MARK_IN_BITMAP(uncollectible_bits, obj);
+        objspace->rgengc.uncollectible_wb_unprotected_objects++;
+
+#if RGENGC_PROFILE > 0
+        objspace->profile.total_remembered_shady_object_count++;
+#if RGENGC_PROFILE >= 2
+        objspace->profile.remembered_shady_object_count_types[BUILTIN_TYPE(obj)]++;
+#endif
+#endif
+        return TRUE;
+    }
+    else {
+        return FALSE;
+    }
+}
+
+static inline void
+gc_marks_wb_unprotected_objects_plane(rb_objspace_t *objspace, uintptr_t p, bits_t bits)
+{
+    if (bits) {
+        do {
+            if (bits & 1) {
+                gc_report(2, objspace, "gc_marks_wb_unprotected_objects: marked shady: %s\n", rb_obj_info((VALUE)p));
+                GC_ASSERT(RVALUE_WB_UNPROTECTED(objspace, (VALUE)p));
+                GC_ASSERT(RVALUE_MARKED(objspace, (VALUE)p));
+                gc_mark_children(objspace, (VALUE)p);
+            }
+            p += BASE_SLOT_SIZE;
+            bits >>= 1;
+        } while (bits);
+    }
+}
+
+static void
+gc_marks_wb_unprotected_objects(rb_objspace_t *objspace, rb_heap_t *heap)
+{
+    struct heap_page *page = 0;
+
+    ccan_list_for_each(&heap->pages, page, page_node) {
+        bits_t *mark_bits = page->mark_bits;
+        bits_t *wbun_bits = page->wb_unprotected_bits;
+        uintptr_t p = page->start;
+        size_t j;
+
+        bits_t bits = mark_bits[0] & wbun_bits[0];
+        bits >>= NUM_IN_PAGE(p);
+        gc_marks_wb_unprotected_objects_plane(objspace, p, bits);
+        p += (BITS_BITLENGTH - NUM_IN_PAGE(p)) * BASE_SLOT_SIZE;
+
+        for (j=1; j<HEAP_PAGE_BITMAP_LIMIT; j++) {
+            bits_t bits = mark_bits[j] & wbun_bits[j];
+
+            gc_marks_wb_unprotected_objects_plane(objspace, p, bits);
+            p += BITS_BITLENGTH * BASE_SLOT_SIZE;
+        }
+    }
+
+    gc_mark_stacked_objects_all(objspace);
+}
+
+static void
+gc_update_weak_references(rb_objspace_t *objspace)
+{
+    size_t retained_weak_references_count = 0;
+    VALUE **ptr_ptr;
+    rb_darray_foreach(objspace->weak_references, i, ptr_ptr) {
+        if (!*ptr_ptr) continue;
+
+        VALUE obj = **ptr_ptr;
+
+        if (RB_SPECIAL_CONST_P(obj)) continue;
+
+        if (!RVALUE_MARKED(objspace, obj)) {
+            **ptr_ptr = Qundef;
+        }
+        else {
+            retained_weak_references_count++;
+        }
+    }
+
+    objspace->profile.retained_weak_references_count = retained_weak_references_count;
+
+    rb_darray_clear(objspace->weak_references);
+    rb_darray_resize_capa_without_gc(&objspace->weak_references, retained_weak_references_count);
+}
+
+static void
+gc_marks_finish(rb_objspace_t *objspace)
+{
+    /* finish incremental GC */
+    if (is_incremental_marking(objspace)) {
+        if (RGENGC_CHECK_MODE && is_mark_stack_empty(&objspace->mark_stack) == 0) {
+            rb_bug("gc_marks_finish: mark stack is not empty (%"PRIdSIZE").",
+                   mark_stack_size(&objspace->mark_stack));
+        }
+
+        mark_roots(objspace, NULL);
+        while (gc_mark_stacked_objects_incremental(objspace, INT_MAX) == false);
+
+#if RGENGC_CHECK_MODE >= 2
+        if (gc_verify_heap_pages(objspace) != 0) {
+            rb_bug("gc_marks_finish (incremental): there are remembered old objects.");
+        }
+#endif
+
+        objspace->flags.during_incremental_marking = FALSE;
+        /* check children of all marked wb-unprotected objects */
+        for (int i = 0; i < HEAP_COUNT; i++) {
+            gc_marks_wb_unprotected_objects(objspace, &heaps[i]);
+        }
+    }
+
+    gc_update_weak_references(objspace);
+
+#if RGENGC_CHECK_MODE >= 2
+    gc_verify_internal_consistency(objspace);
+#endif
+
+#if RGENGC_CHECK_MODE >= 4
+    during_gc = FALSE;
+    gc_marks_check(objspace, gc_check_after_marks_i, "after_marks");
+    during_gc = TRUE;
+#endif
+
+    {
+        const unsigned long r_mul = objspace->live_ractor_cache_count > 8 ? 8 : objspace->live_ractor_cache_count; // upto 8
+
+        size_t total_slots = objspace_available_slots(objspace);
+        size_t sweep_slots = total_slots - objspace->marked_slots; /* will be swept slots */
+        size_t max_free_slots = (size_t)(total_slots * gc_params.heap_free_slots_max_ratio);
+        size_t min_free_slots = (size_t)(total_slots * gc_params.heap_free_slots_min_ratio);
+        if (min_free_slots < gc_params.heap_free_slots * r_mul) {
+            min_free_slots = gc_params.heap_free_slots * r_mul;
+        }
+
+        int full_marking = is_full_marking(objspace);
+
+        GC_ASSERT(objspace_available_slots(objspace) >= objspace->marked_slots);
+
+        /* Setup freeable slots. */
+        size_t total_init_slots = 0;
+        for (int i = 0; i < HEAP_COUNT; i++) {
+            total_init_slots += gc_params.heap_init_slots[i] * r_mul;
+        }
+
+        if (max_free_slots < total_init_slots) {
+            max_free_slots = total_init_slots;
+        }
+
+        if (sweep_slots > max_free_slots) {
+            heap_pages_freeable_pages = (sweep_slots - max_free_slots) / HEAP_PAGE_OBJ_LIMIT;
+        }
+        else {
+            heap_pages_freeable_pages = 0;
+        }
+
+        if (objspace->heap_pages.allocatable_slots == 0 && sweep_slots < min_free_slots) {
+            if (!full_marking) {
+                if (objspace->profile.count - objspace->rgengc.last_major_gc < RVALUE_OLD_AGE) {
+                    full_marking = TRUE;
+                }
+                else {
+                    gc_report(1, objspace, "gc_marks_finish: next is full GC!!)\n");
+                    gc_needs_major_flags |= GPR_FLAG_MAJOR_BY_NOFREE;
+                }
+            }
+
+            if (full_marking) {
+                heap_allocatable_slots_expand(objspace, NULL, sweep_slots, total_slots);
+            }
+        }
+
+        if (full_marking) {
+            /* See the comment about RUBY_GC_HEAP_OLDOBJECT_LIMIT_FACTOR */
+            const double r = gc_params.oldobject_limit_factor;
+            objspace->rgengc.uncollectible_wb_unprotected_objects_limit = MAX(
+                (size_t)(objspace->rgengc.uncollectible_wb_unprotected_objects * r),
+                (size_t)(objspace->rgengc.old_objects * gc_params.uncollectible_wb_unprotected_objects_limit_ratio)
+            );
+            objspace->rgengc.old_objects_limit = (size_t)(objspace->rgengc.old_objects * r);
+        }
+
+        if (objspace->rgengc.uncollectible_wb_unprotected_objects > objspace->rgengc.uncollectible_wb_unprotected_objects_limit) {
+            gc_needs_major_flags |= GPR_FLAG_MAJOR_BY_SHADY;
+        }
+        if (objspace->rgengc.old_objects > objspace->rgengc.old_objects_limit) {
+            gc_needs_major_flags |= GPR_FLAG_MAJOR_BY_OLDGEN;
+        }
+
+        gc_report(1, objspace, "gc_marks_finish (marks %"PRIdSIZE" objects, "
+                  "old %"PRIdSIZE" objects, total %"PRIdSIZE" slots, "
+                  "sweep %"PRIdSIZE" slots, allocatable %"PRIdSIZE" slots, next GC: %s)\n",
+                  objspace->marked_slots, objspace->rgengc.old_objects, objspace_available_slots(objspace), sweep_slots, objspace->heap_pages.allocatable_slots,
+                  gc_needs_major_flags ? "major" : "minor");
+    }
+
+    // TODO: refactor so we don't need to call this
+    rb_ractor_finish_marking();
+
+    rb_gc_event_hook(0, RUBY_INTERNAL_EVENT_GC_END_MARK);
+}
+
+static bool
+gc_compact_heap_cursors_met_p(rb_heap_t *heap)
+{
+    return heap->sweeping_page == heap->compact_cursor;
+}
+
+
+static rb_heap_t *
+gc_compact_destination_pool(rb_objspace_t *objspace, rb_heap_t *src_pool, VALUE obj)
+{
+    size_t obj_size = rb_gc_obj_optimal_size(obj);
+    if (obj_size == 0) {
+        return src_pool;
+    }
+
+    size_t idx = 0;
+    if (rb_gc_impl_size_allocatable_p(obj_size)) {
+        idx = heap_idx_for_size(obj_size);
+    }
+
+    return &heaps[idx];
+}
+
+static bool
+gc_compact_move(rb_objspace_t *objspace, rb_heap_t *heap, VALUE src)
+{
+    GC_ASSERT(BUILTIN_TYPE(src) != T_MOVED);
+    GC_ASSERT(gc_is_moveable_obj(objspace, src));
+
+    rb_heap_t *dest_pool = gc_compact_destination_pool(objspace, heap, src);
+    uint32_t orig_shape = 0;
+    uint32_t new_shape = 0;
+
+    if (gc_compact_heap_cursors_met_p(dest_pool)) {
+        return dest_pool != heap;
+    }
+
+    if (RB_TYPE_P(src, T_OBJECT)) {
+        orig_shape = rb_gc_get_shape(src);
+
+        if (dest_pool != heap) {
+            new_shape = rb_gc_rebuild_shape(src, dest_pool - heaps);
+
+            if (new_shape == 0) {
+                dest_pool = heap;
+            }
+        }
+    }
+
+    while (!try_move(objspace, dest_pool, dest_pool->free_pages, src)) {
+        struct gc_sweep_context ctx = {
+            .page = dest_pool->sweeping_page,
+            .final_slots = 0,
+            .freed_slots = 0,
+            .empty_slots = 0,
+        };
+
+        /* The page of src could be partially compacted, so it may contain
+         * T_MOVED. Sweeping a page may read objects on this page, so we
+         * need to lock the page. */
+        lock_page_body(objspace, GET_PAGE_BODY(src));
+        gc_sweep_page(objspace, dest_pool, &ctx);
+        unlock_page_body(objspace, GET_PAGE_BODY(src));
+
+        if (dest_pool->sweeping_page->free_slots > 0) {
+            heap_add_freepage(dest_pool, dest_pool->sweeping_page);
+        }
+
+        dest_pool->sweeping_page = ccan_list_next(&dest_pool->pages, dest_pool->sweeping_page, page_node);
+        if (gc_compact_heap_cursors_met_p(dest_pool)) {
+            return dest_pool != heap;
+        }
+    }
+
+    if (orig_shape != 0) {
+        if (new_shape != 0) {
+            VALUE dest = rb_gc_impl_location(objspace, src);
+            rb_gc_set_shape(dest, new_shape);
+        }
+        RMOVED(src)->original_shape_id = orig_shape;
+    }
+
+    return true;
+}
+
+static bool
+gc_compact_plane(rb_objspace_t *objspace, rb_heap_t *heap, uintptr_t p, bits_t bitset, struct heap_page *page)
+{
+    short slot_size = page->slot_size;
+    short slot_bits = slot_size / BASE_SLOT_SIZE;
+    GC_ASSERT(slot_bits > 0);
+
+    do {
+        VALUE vp = (VALUE)p;
+        GC_ASSERT(vp % BASE_SLOT_SIZE == 0);
+
+        if (bitset & 1) {
+            objspace->rcompactor.considered_count_table[BUILTIN_TYPE(vp)]++;
+
+            if (gc_is_moveable_obj(objspace, vp)) {
+                if (!gc_compact_move(objspace, heap, vp)) {
+                    //the cursors met. bubble up
+                    return false;
+                }
+            }
+        }
+        p += slot_size;
+        bitset >>= slot_bits;
+    } while (bitset);
+
+    return true;
+}
+
+// Iterate up all the objects in page, moving them to where they want to go
+static bool
+gc_compact_page(rb_objspace_t *objspace, rb_heap_t *heap, struct heap_page *page)
+{
+    GC_ASSERT(page == heap->compact_cursor);
+
+    bits_t *mark_bits, *pin_bits;
+    bits_t bitset;
+    uintptr_t p = page->start;
+
+    mark_bits = page->mark_bits;
+    pin_bits = page->pinned_bits;
+
+    // objects that can be moved are marked and not pinned
+    bitset = (mark_bits[0] & ~pin_bits[0]);
+    bitset >>= NUM_IN_PAGE(p);
+    if (bitset) {
+        if (!gc_compact_plane(objspace, heap, (uintptr_t)p, bitset, page))
+            return false;
+    }
+    p += (BITS_BITLENGTH - NUM_IN_PAGE(p)) * BASE_SLOT_SIZE;
+
+    for (int j = 1; j < HEAP_PAGE_BITMAP_LIMIT; j++) {
+        bitset = (mark_bits[j] & ~pin_bits[j]);
+        if (bitset) {
+            if (!gc_compact_plane(objspace, heap, (uintptr_t)p, bitset, page))
+                return false;
+        }
+        p += BITS_BITLENGTH * BASE_SLOT_SIZE;
+    }
+
+    return true;
+}
+
+static bool
+gc_compact_all_compacted_p(rb_objspace_t *objspace)
+{
+    for (int i = 0; i < HEAP_COUNT; i++) {
+        rb_heap_t *heap = &heaps[i];
+
+        if (heap->total_pages > 0 &&
+                !gc_compact_heap_cursors_met_p(heap)) {
+            return false;
+        }
+    }
+
+    return true;
+}
+
+static void
+gc_sweep_compact(rb_objspace_t *objspace)
+{
+    gc_compact_start(objspace);
+#if RGENGC_CHECK_MODE >= 2
+    gc_verify_internal_consistency(objspace);
+#endif
+
+    while (!gc_compact_all_compacted_p(objspace)) {
+        for (int i = 0; i < HEAP_COUNT; i++) {
+            rb_heap_t *heap = &heaps[i];
+
+            if (gc_compact_heap_cursors_met_p(heap)) {
+                continue;
+            }
+
+            struct heap_page *start_page = heap->compact_cursor;
+
+            if (!gc_compact_page(objspace, heap, start_page)) {
+                lock_page_body(objspace, start_page->body);
+
+                continue;
+            }
+
+            // If we get here, we've finished moving all objects on the compact_cursor page
+            // So we can lock it and move the cursor on to the next one.
+            lock_page_body(objspace, start_page->body);
+            heap->compact_cursor = ccan_list_prev(&heap->pages, heap->compact_cursor, page_node);
+        }
+    }
+
+    gc_compact_finish(objspace);
+
+#if RGENGC_CHECK_MODE >= 2
+    gc_verify_internal_consistency(objspace);
+#endif
+}
+
+static void
+gc_marks_rest(rb_objspace_t *objspace)
+{
+    gc_report(1, objspace, "gc_marks_rest\n");
+
+    for (int i = 0; i < HEAP_COUNT; i++) {
+        (&heaps[i])->pooled_pages = NULL;
+    }
+
+    if (is_incremental_marking(objspace)) {
+        while (gc_mark_stacked_objects_incremental(objspace, INT_MAX) == FALSE);
+    }
+    else {
+        gc_mark_stacked_objects_all(objspace);
+    }
+
+    gc_marks_finish(objspace);
+}
+
+static bool
+gc_marks_step(rb_objspace_t *objspace, size_t slots)
+{
+    bool marking_finished = false;
+
+    GC_ASSERT(is_marking(objspace));
+    if (gc_mark_stacked_objects_incremental(objspace, slots)) {
+        gc_marks_finish(objspace);
+
+        marking_finished = true;
+    }
+
+    return marking_finished;
+}
+
+static bool
+gc_marks_continue(rb_objspace_t *objspace, rb_heap_t *heap)
+{
+    GC_ASSERT(dont_gc_val() == FALSE || objspace->profile.latest_gc_info & GPR_FLAG_METHOD);
+    bool marking_finished = true;
+
+    gc_marking_enter(objspace);
+
+    if (heap->free_pages) {
+        gc_report(2, objspace, "gc_marks_continue: has pooled pages");
+
+        marking_finished = gc_marks_step(objspace, objspace->rincgc.step_slots);
+    }
+    else {
+        gc_report(2, objspace, "gc_marks_continue: no more pooled pages (stack depth: %"PRIdSIZE").\n",
+                  mark_stack_size(&objspace->mark_stack));
+        heap->force_incremental_marking_finish_count++;
+        gc_marks_rest(objspace);
+    }
+
+    gc_marking_exit(objspace);
+
+    return marking_finished;
+}
+
+static void
+gc_marks_start(rb_objspace_t *objspace, int full_mark)
+{
+    /* start marking */
+    gc_report(1, objspace, "gc_marks_start: (%s)\n", full_mark ? "full" : "minor");
+    gc_mode_transition(objspace, gc_mode_marking);
+
+    if (full_mark) {
+        size_t incremental_marking_steps = (objspace->rincgc.pooled_slots / INCREMENTAL_MARK_STEP_ALLOCATIONS) + 1;
+        objspace->rincgc.step_slots = (objspace->marked_slots * 2) / incremental_marking_steps;
+
+        if (0) fprintf(stderr, "objspace->marked_slots: %"PRIdSIZE", "
+                       "objspace->rincgc.pooled_page_num: %"PRIdSIZE", "
+                       "objspace->rincgc.step_slots: %"PRIdSIZE", \n",
+                       objspace->marked_slots, objspace->rincgc.pooled_slots, objspace->rincgc.step_slots);
+        objspace->flags.during_minor_gc = FALSE;
+        if (ruby_enable_autocompact) {
+            objspace->flags.during_compacting |= TRUE;
+        }
+        objspace->profile.major_gc_count++;
+        objspace->rgengc.uncollectible_wb_unprotected_objects = 0;
+        objspace->rgengc.old_objects = 0;
+        objspace->rgengc.last_major_gc = objspace->profile.count;
+        objspace->marked_slots = 0;
+
+        for (int i = 0; i < HEAP_COUNT; i++) {
+            rb_heap_t *heap = &heaps[i];
+            rgengc_mark_and_rememberset_clear(objspace, heap);
+            heap_move_pooled_pages_to_free_pages(heap);
+
+            if (objspace->flags.during_compacting) {
+                struct heap_page *page = NULL;
+
+                ccan_list_for_each(&heap->pages, page, page_node) {
+                    page->pinned_slots = 0;
+                }
+            }
+        }
+    }
+    else {
+        objspace->flags.during_minor_gc = TRUE;
+        objspace->marked_slots =
+          objspace->rgengc.old_objects + objspace->rgengc.uncollectible_wb_unprotected_objects; /* uncollectible objects are marked already */
+        objspace->profile.minor_gc_count++;
+
+        for (int i = 0; i < HEAP_COUNT; i++) {
+            rgengc_rememberset_mark(objspace, &heaps[i]);
+        }
+    }
+
+    mark_roots(objspace, NULL);
+
+    gc_report(1, objspace, "gc_marks_start: (%s) end, stack in %"PRIdSIZE"\n",
+              full_mark ? "full" : "minor", mark_stack_size(&objspace->mark_stack));
+}
+
+static bool
+gc_marks(rb_objspace_t *objspace, int full_mark)
+{
+    gc_prof_mark_timer_start(objspace);
+    gc_marking_enter(objspace);
+
+    bool marking_finished = false;
+
+    /* setup marking */
+
+    gc_marks_start(objspace, full_mark);
+    if (!is_incremental_marking(objspace)) {
+        gc_marks_rest(objspace);
+        marking_finished = true;
+    }
+
+#if RGENGC_PROFILE > 0
+    if (gc_prof_record(objspace)) {
+        gc_profile_record *record = gc_prof_record(objspace);
+        record->old_objects = objspace->rgengc.old_objects;
+    }
+#endif
+
+    gc_marking_exit(objspace);
+    gc_prof_mark_timer_stop(objspace);
+
+    return marking_finished;
+}
+
+/* RGENGC */
+
+static void
+gc_report_body(int level, rb_objspace_t *objspace, const char *fmt, ...)
+{
+    if (level <= RGENGC_DEBUG) {
+        char buf[1024];
+        FILE *out = stderr;
+        va_list args;
+        const char *status = " ";
+
+        if (during_gc) {
+            status = is_full_marking(objspace) ? "+" : "-";
+        }
+        else {
+            if (is_lazy_sweeping(objspace)) {
+                status = "S";
+            }
+            if (is_incremental_marking(objspace)) {
+                status = "M";
+            }
+        }
+
+        va_start(args, fmt);
+        vsnprintf(buf, 1024, fmt, args);
+        va_end(args);
+
+        fprintf(out, "%s|", status);
+        fputs(buf, out);
+    }
+}
+
+/* bit operations */
+
+static int
+rgengc_remembersetbits_set(rb_objspace_t *objspace, VALUE obj)
+{
+    struct heap_page *page = GET_HEAP_PAGE(obj);
+    bits_t *bits = &page->remembered_bits[0];
+
+    if (MARKED_IN_BITMAP(bits, obj)) {
+        return FALSE;
+    }
+    else {
+        page->flags.has_remembered_objects = TRUE;
+        MARK_IN_BITMAP(bits, obj);
+        return TRUE;
+    }
+}
+
+/* wb, etc */
+
+/* return FALSE if already remembered */
+static int
+rgengc_remember(rb_objspace_t *objspace, VALUE obj)
+{
+    gc_report(6, objspace, "rgengc_remember: %s %s\n", rb_obj_info(obj),
+              RVALUE_REMEMBERED(objspace, obj) ? "was already remembered" : "is remembered now");
+
+    check_rvalue_consistency(objspace, obj);
+
+    if (RGENGC_CHECK_MODE) {
+        if (RVALUE_WB_UNPROTECTED(objspace, obj)) rb_bug("rgengc_remember: %s is not wb protected.", rb_obj_info(obj));
+    }
+
+#if RGENGC_PROFILE > 0
+    if (!RVALUE_REMEMBERED(objspace, obj)) {
+        if (RVALUE_WB_UNPROTECTED(objspace, obj) == 0) {
+            objspace->profile.total_remembered_normal_object_count++;
+#if RGENGC_PROFILE >= 2
+            objspace->profile.remembered_normal_object_count_types[BUILTIN_TYPE(obj)]++;
+#endif
+        }
+    }
+#endif /* RGENGC_PROFILE > 0 */
+
+    return rgengc_remembersetbits_set(objspace, obj);
+}
+
+#ifndef PROFILE_REMEMBERSET_MARK
+#define PROFILE_REMEMBERSET_MARK 0
+#endif
+
+static inline void
+rgengc_rememberset_mark_plane(rb_objspace_t *objspace, uintptr_t p, bits_t bitset)
+{
+    if (bitset) {
+        do {
+            if (bitset & 1) {
+                VALUE obj = (VALUE)p;
+                gc_report(2, objspace, "rgengc_rememberset_mark: mark %s\n", rb_obj_info(obj));
+                GC_ASSERT(RVALUE_UNCOLLECTIBLE(objspace, obj));
+                GC_ASSERT(RVALUE_OLD_P(objspace, obj) || RVALUE_WB_UNPROTECTED(objspace, obj));
+
+                gc_mark_children(objspace, obj);
+            }
+            p += BASE_SLOT_SIZE;
+            bitset >>= 1;
+        } while (bitset);
+    }
+}
+
+static void
+rgengc_rememberset_mark(rb_objspace_t *objspace, rb_heap_t *heap)
+{
+    size_t j;
+    struct heap_page *page = 0;
+#if PROFILE_REMEMBERSET_MARK
+    int has_old = 0, has_shady = 0, has_both = 0, skip = 0;
+#endif
+    gc_report(1, objspace, "rgengc_rememberset_mark: start\n");
+
+    ccan_list_for_each(&heap->pages, page, page_node) {
+        if (page->flags.has_remembered_objects | page->flags.has_uncollectible_wb_unprotected_objects) {
+            uintptr_t p = page->start;
+            bits_t bitset, bits[HEAP_PAGE_BITMAP_LIMIT];
+            bits_t *remembered_bits = page->remembered_bits;
+            bits_t *uncollectible_bits = page->uncollectible_bits;
+            bits_t *wb_unprotected_bits = page->wb_unprotected_bits;
+#if PROFILE_REMEMBERSET_MARK
+            if (page->flags.has_remembered_objects && page->flags.has_uncollectible_wb_unprotected_objects) has_both++;
+            else if (page->flags.has_remembered_objects) has_old++;
+            else if (page->flags.has_uncollectible_wb_unprotected_objects) has_shady++;
+#endif
+            for (j=0; j<HEAP_PAGE_BITMAP_LIMIT; j++) {
+                bits[j] = remembered_bits[j] | (uncollectible_bits[j] & wb_unprotected_bits[j]);
+                remembered_bits[j] = 0;
+            }
+            page->flags.has_remembered_objects = FALSE;
+
+            bitset = bits[0];
+            bitset >>= NUM_IN_PAGE(p);
+            rgengc_rememberset_mark_plane(objspace, p, bitset);
+            p += (BITS_BITLENGTH - NUM_IN_PAGE(p)) * BASE_SLOT_SIZE;
+
+            for (j=1; j < HEAP_PAGE_BITMAP_LIMIT; j++) {
+                bitset = bits[j];
+                rgengc_rememberset_mark_plane(objspace, p, bitset);
+                p += BITS_BITLENGTH * BASE_SLOT_SIZE;
+            }
+        }
+#if PROFILE_REMEMBERSET_MARK
+        else {
+            skip++;
+        }
+#endif
+    }
+
+#if PROFILE_REMEMBERSET_MARK
+    fprintf(stderr, "%d\t%d\t%d\t%d\n", has_both, has_old, has_shady, skip);
+#endif
+    gc_report(1, objspace, "rgengc_rememberset_mark: finished\n");
+}
+
+static void
+rgengc_mark_and_rememberset_clear(rb_objspace_t *objspace, rb_heap_t *heap)
+{
+    struct heap_page *page = 0;
+
+    ccan_list_for_each(&heap->pages, page, page_node) {
+        memset(&page->mark_bits[0],       0, HEAP_PAGE_BITMAP_SIZE);
+        memset(&page->uncollectible_bits[0], 0, HEAP_PAGE_BITMAP_SIZE);
+        memset(&page->marking_bits[0],    0, HEAP_PAGE_BITMAP_SIZE);
+        memset(&page->remembered_bits[0], 0, HEAP_PAGE_BITMAP_SIZE);
+        memset(&page->pinned_bits[0],     0, HEAP_PAGE_BITMAP_SIZE);
+        page->flags.has_uncollectible_wb_unprotected_objects = FALSE;
+        page->flags.has_remembered_objects = FALSE;
+    }
+}
+
+/* RGENGC: APIs */
+
+NOINLINE(static void gc_writebarrier_generational(VALUE a, VALUE b, rb_objspace_t *objspace));
+
+static void
+gc_writebarrier_generational(VALUE a, VALUE b, rb_objspace_t *objspace)
+{
+    if (RGENGC_CHECK_MODE) {
+        if (!RVALUE_OLD_P(objspace, a)) rb_bug("gc_writebarrier_generational: %s is not an old object.", rb_obj_info(a));
+        if ( RVALUE_OLD_P(objspace, b)) rb_bug("gc_writebarrier_generational: %s is an old object.", rb_obj_info(b));
+        if (is_incremental_marking(objspace)) rb_bug("gc_writebarrier_generational: called while incremental marking: %s -> %s", rb_obj_info(a), rb_obj_info(b));
+    }
+
+    /* mark `a' and remember (default behavior) */
+    if (!RVALUE_REMEMBERED(objspace, a)) {
+        int lev = RB_GC_VM_LOCK_NO_BARRIER();
+        {
+            rgengc_remember(objspace, a);
+        }
+        RB_GC_VM_UNLOCK_NO_BARRIER(lev);
+
+        gc_report(1, objspace, "gc_writebarrier_generational: %s (remembered) -> %s\n", rb_obj_info(a), rb_obj_info(b));
+    }
+
+    check_rvalue_consistency(objspace, a);
+    check_rvalue_consistency(objspace, b);
+}
+
+static void
+gc_mark_from(rb_objspace_t *objspace, VALUE obj, VALUE parent)
+{
+    gc_mark_set_parent(objspace, parent);
+    rgengc_check_relation(objspace, obj);
+    if (gc_mark_set(objspace, obj) == FALSE) return;
+    gc_aging(objspace, obj);
+    gc_grey(objspace, obj);
+}
+
+NOINLINE(static void gc_writebarrier_incremental(VALUE a, VALUE b, rb_objspace_t *objspace));
+
+static void
+gc_writebarrier_incremental(VALUE a, VALUE b, rb_objspace_t *objspace)
+{
+    gc_report(2, objspace, "gc_writebarrier_incremental: [LG] %p -> %s\n", (void *)a, rb_obj_info(b));
+
+    if (RVALUE_BLACK_P(objspace, a)) {
+        if (RVALUE_WHITE_P(objspace, b)) {
+            if (!RVALUE_WB_UNPROTECTED(objspace, a)) {
+                gc_report(2, objspace, "gc_writebarrier_incremental: [IN] %p -> %s\n", (void *)a, rb_obj_info(b));
+                gc_mark_from(objspace, b, a);
+            }
+        }
+        else if (RVALUE_OLD_P(objspace, a) && !RVALUE_OLD_P(objspace, b)) {
+            rgengc_remember(objspace, a);
+        }
+
+        if (RB_UNLIKELY(objspace->flags.during_compacting)) {
+            MARK_IN_BITMAP(GET_HEAP_PINNED_BITS(b), b);
+        }
+    }
+}
+
+void
+rb_gc_impl_writebarrier(void *objspace_ptr, VALUE a, VALUE b)
+{
+    rb_objspace_t *objspace = objspace_ptr;
+
+    if (RGENGC_CHECK_MODE) {
+        if (SPECIAL_CONST_P(a)) rb_bug("rb_gc_writebarrier: a is special const: %"PRIxVALUE, a);
+    }
+
+    if (SPECIAL_CONST_P(b)) return;
+
+    GC_ASSERT(RB_BUILTIN_TYPE(a) != T_NONE);
+    GC_ASSERT(RB_BUILTIN_TYPE(a) != T_MOVED);
+    GC_ASSERT(RB_BUILTIN_TYPE(a) != T_ZOMBIE);
+    GC_ASSERT(RB_BUILTIN_TYPE(b) != T_NONE);
+    GC_ASSERT(RB_BUILTIN_TYPE(b) != T_MOVED);
+    GC_ASSERT(RB_BUILTIN_TYPE(b) != T_ZOMBIE);
+
+  retry:
+    if (!is_incremental_marking(objspace)) {
+        if (!RVALUE_OLD_P(objspace, a) || RVALUE_OLD_P(objspace, b)) {
+            // do nothing
+        }
+        else {
+            gc_writebarrier_generational(a, b, objspace);
+        }
+    }
+    else {
+        bool retry = false;
+        /* slow path */
+        int lev = RB_GC_VM_LOCK_NO_BARRIER();
+        {
+            if (is_incremental_marking(objspace)) {
+                gc_writebarrier_incremental(a, b, objspace);
+            }
+            else {
+                retry = true;
+            }
+        }
+        RB_GC_VM_UNLOCK_NO_BARRIER(lev);
+
+        if (retry) goto retry;
+    }
+    return;
+}
+
+void
+rb_gc_impl_writebarrier_unprotect(void *objspace_ptr, VALUE obj)
+{
+    rb_objspace_t *objspace = objspace_ptr;
+
+    if (RVALUE_WB_UNPROTECTED(objspace, obj)) {
+        return;
+    }
+    else {
+        gc_report(2, objspace, "rb_gc_writebarrier_unprotect: %s %s\n", rb_obj_info(obj),
+                  RVALUE_REMEMBERED(objspace, obj) ? " (already remembered)" : "");
+
+        unsigned int lev = RB_GC_VM_LOCK_NO_BARRIER();
+        {
+            if (RVALUE_OLD_P(objspace, obj)) {
+                gc_report(1, objspace, "rb_gc_writebarrier_unprotect: %s\n", rb_obj_info(obj));
+                RVALUE_DEMOTE(objspace, obj);
+                gc_mark_set(objspace, obj);
+                gc_remember_unprotected(objspace, obj);
+
+#if RGENGC_PROFILE
+                objspace->profile.total_shade_operation_count++;
+#if RGENGC_PROFILE >= 2
+                objspace->profile.shade_operation_count_types[BUILTIN_TYPE(obj)]++;
+#endif /* RGENGC_PROFILE >= 2 */
+#endif /* RGENGC_PROFILE */
+            }
+            else {
+                RVALUE_AGE_RESET(obj);
+            }
+
+            RB_DEBUG_COUNTER_INC(obj_wb_unprotect);
+            MARK_IN_BITMAP(GET_HEAP_WB_UNPROTECTED_BITS(obj), obj);
+        }
+        RB_GC_VM_UNLOCK_NO_BARRIER(lev);
+    }
+}
+
+void
+rb_gc_impl_copy_attributes(void *objspace_ptr, VALUE dest, VALUE obj)
+{
+    rb_objspace_t *objspace = objspace_ptr;
+
+    if (RVALUE_WB_UNPROTECTED(objspace, obj)) {
+        rb_gc_impl_writebarrier_unprotect(objspace, dest);
+    }
+    rb_gc_impl_copy_finalizer(objspace, dest, obj);
+}
+
+const char *
+rb_gc_impl_active_gc_name(void)
+{
+    return "default";
+}
+
+void
+rb_gc_impl_writebarrier_remember(void *objspace_ptr, VALUE obj)
+{
+    rb_objspace_t *objspace = objspace_ptr;
+
+    gc_report(1, objspace, "rb_gc_writebarrier_remember: %s\n", rb_obj_info(obj));
+
+    if (is_incremental_marking(objspace)) {
+        if (RVALUE_BLACK_P(objspace, obj)) {
+            gc_grey(objspace, obj);
+        }
+    }
+    else {
+        if (RVALUE_OLD_P(objspace, obj)) {
+            rgengc_remember(objspace, obj);
+        }
+    }
+}
+
+struct rb_gc_object_metadata_names {
+    // Must be ID only
+    ID ID_wb_protected, ID_age, ID_old, ID_uncollectible, ID_marking,
+        ID_marked, ID_pinned, ID_object_id, ID_shareable;
+};
+
+#define RB_GC_OBJECT_METADATA_ENTRY_COUNT (sizeof(struct rb_gc_object_metadata_names) / sizeof(ID))
+static struct rb_gc_object_metadata_entry object_metadata_entries[RB_GC_OBJECT_METADATA_ENTRY_COUNT + 1];
+
+struct rb_gc_object_metadata_entry *
+rb_gc_impl_object_metadata(void *objspace_ptr, VALUE obj)
+{
+    rb_objspace_t *objspace = objspace_ptr;
+    size_t n = 0;
+    static struct rb_gc_object_metadata_names names;
+
+    if (!names.ID_marked) {
+#define I(s) names.ID_##s = rb_intern(#s)
+        I(wb_protected);
+        I(age);
+        I(old);
+        I(uncollectible);
+        I(marking);
+        I(marked);
+        I(pinned);
+        I(object_id);
+        I(shareable);
+#undef I
+    }
+
+#define SET_ENTRY(na, v) do { \
+    GC_ASSERT(n <= RB_GC_OBJECT_METADATA_ENTRY_COUNT); \
+    object_metadata_entries[n].name = names.ID_##na; \
+    object_metadata_entries[n].val = v; \
+    n++; \
+} while (0)
+
+    if (!RVALUE_WB_UNPROTECTED(objspace, obj)) SET_ENTRY(wb_protected, Qtrue);
+    SET_ENTRY(age, INT2FIX(RVALUE_AGE_GET(obj)));
+    if (RVALUE_OLD_P(objspace, obj)) SET_ENTRY(old, Qtrue);
+    if (RVALUE_UNCOLLECTIBLE(objspace, obj)) SET_ENTRY(uncollectible, Qtrue);
+    if (RVALUE_MARKING(objspace, obj)) SET_ENTRY(marking, Qtrue);
+    if (RVALUE_MARKED(objspace, obj)) SET_ENTRY(marked, Qtrue);
+    if (RVALUE_PINNED(objspace, obj)) SET_ENTRY(pinned, Qtrue);
+    if (rb_obj_id_p(obj)) SET_ENTRY(object_id, rb_obj_id(obj));
+    if (FL_TEST(obj, FL_SHAREABLE)) SET_ENTRY(shareable, Qtrue);
+
+    object_metadata_entries[n].name = 0;
+    object_metadata_entries[n].val = 0;
+#undef SET_ENTRY
+
+    return object_metadata_entries;
+}
+
+void *
+rb_gc_impl_ractor_cache_alloc(void *objspace_ptr, void *ractor)
+{
+    rb_objspace_t *objspace = objspace_ptr;
+
+    objspace->live_ractor_cache_count++;
+
+    return calloc1(sizeof(rb_ractor_newobj_cache_t));
+}
+
+void
+rb_gc_impl_ractor_cache_free(void *objspace_ptr, void *cache)
+{
+    rb_objspace_t *objspace = objspace_ptr;
+
+    objspace->live_ractor_cache_count--;
+    gc_ractor_newobj_cache_clear(cache, NULL);
+    free(cache);
+}
+
+static void
+heap_ready_to_gc(rb_objspace_t *objspace, rb_heap_t *heap)
+{
+    if (!heap->free_pages) {
+        if (!heap_page_allocate_and_initialize(objspace, heap)) {
+            objspace->heap_pages.allocatable_slots = 1;
+            heap_page_allocate_and_initialize(objspace, heap);
+        }
+    }
+}
+
+static int
+ready_to_gc(rb_objspace_t *objspace)
+{
+    if (dont_gc_val() || during_gc) {
+        for (int i = 0; i < HEAP_COUNT; i++) {
+            rb_heap_t *heap = &heaps[i];
+            heap_ready_to_gc(objspace, heap);
+        }
+        return FALSE;
+    }
+    else {
+        return TRUE;
+    }
+}
+
+static void
+gc_reset_malloc_info(rb_objspace_t *objspace, bool full_mark)
+{
+    gc_prof_set_malloc_info(objspace);
+    {
+        size_t inc = RUBY_ATOMIC_SIZE_EXCHANGE(malloc_increase, 0);
+        size_t old_limit = malloc_limit;
+
+        if (inc > malloc_limit) {
+            malloc_limit = (size_t)(inc * gc_params.malloc_limit_growth_factor);
+            if (malloc_limit > gc_params.malloc_limit_max) {
+                malloc_limit = gc_params.malloc_limit_max;
+            }
+        }
+        else {
+            malloc_limit = (size_t)(malloc_limit * 0.98); /* magic number */
+            if (malloc_limit < gc_params.malloc_limit_min) {
+                malloc_limit = gc_params.malloc_limit_min;
+            }
+        }
+
+        if (0) {
+            if (old_limit != malloc_limit) {
+                fprintf(stderr, "[%"PRIuSIZE"] malloc_limit: %"PRIuSIZE" -> %"PRIuSIZE"\n",
+                        rb_gc_count(), old_limit, malloc_limit);
+            }
+            else {
+                fprintf(stderr, "[%"PRIuSIZE"] malloc_limit: not changed (%"PRIuSIZE")\n",
+                        rb_gc_count(), malloc_limit);
+            }
+        }
+    }
+
+    /* reset oldmalloc info */
+#if RGENGC_ESTIMATE_OLDMALLOC
+    if (!full_mark) {
+        if (objspace->rgengc.oldmalloc_increase > objspace->rgengc.oldmalloc_increase_limit) {
+            gc_needs_major_flags |= GPR_FLAG_MAJOR_BY_OLDMALLOC;
+            objspace->rgengc.oldmalloc_increase_limit =
+              (size_t)(objspace->rgengc.oldmalloc_increase_limit * gc_params.oldmalloc_limit_growth_factor);
+
+            if (objspace->rgengc.oldmalloc_increase_limit > gc_params.oldmalloc_limit_max) {
+                objspace->rgengc.oldmalloc_increase_limit = gc_params.oldmalloc_limit_max;
+            }
+        }
+
+        if (0) fprintf(stderr, "%"PRIdSIZE"\t%d\t%"PRIuSIZE"\t%"PRIuSIZE"\t%"PRIdSIZE"\n",
+                       rb_gc_count(),
+                       gc_needs_major_flags,
+                       objspace->rgengc.oldmalloc_increase,
+                       objspace->rgengc.oldmalloc_increase_limit,
+                       gc_params.oldmalloc_limit_max);
+    }
+    else {
+        /* major GC */
+        objspace->rgengc.oldmalloc_increase = 0;
+
+        if ((objspace->profile.latest_gc_info & GPR_FLAG_MAJOR_BY_OLDMALLOC) == 0) {
+            objspace->rgengc.oldmalloc_increase_limit =
+              (size_t)(objspace->rgengc.oldmalloc_increase_limit / ((gc_params.oldmalloc_limit_growth_factor - 1)/10 + 1));
+            if (objspace->rgengc.oldmalloc_increase_limit < gc_params.oldmalloc_limit_min) {
+                objspace->rgengc.oldmalloc_increase_limit = gc_params.oldmalloc_limit_min;
+            }
+        }
+    }
+#endif
+}
+
+static int
+garbage_collect(rb_objspace_t *objspace, unsigned int reason)
+{
+    int ret;
+
+    int lev = RB_GC_VM_LOCK();
+    {
+#if GC_PROFILE_MORE_DETAIL
+        objspace->profile.prepare_time = getrusage_time();
+#endif
+
+        gc_rest(objspace);
+
+#if GC_PROFILE_MORE_DETAIL
+        objspace->profile.prepare_time = getrusage_time() - objspace->profile.prepare_time;
+#endif
+
+        ret = gc_start(objspace, reason);
+    }
+    RB_GC_VM_UNLOCK(lev);
+
+    return ret;
+}
+
+static int
+gc_start(rb_objspace_t *objspace, unsigned int reason)
+{
+    unsigned int do_full_mark = !!(reason & GPR_FLAG_FULL_MARK);
+
+    /* reason may be clobbered, later, so keep set immediate_sweep here */
+    objspace->flags.immediate_sweep = !!(reason & GPR_FLAG_IMMEDIATE_SWEEP);
+
+    if (!rb_darray_size(objspace->heap_pages.sorted)) return TRUE; /* heap is not ready */
+    if (!(reason & GPR_FLAG_METHOD) && !ready_to_gc(objspace)) return TRUE; /* GC is not allowed */
+
+    GC_ASSERT(gc_mode(objspace) == gc_mode_none, "gc_mode is %s\n", gc_mode_name(gc_mode(objspace)));
+    GC_ASSERT(!is_lazy_sweeping(objspace));
+    GC_ASSERT(!is_incremental_marking(objspace));
+
+    unsigned int lock_lev;
+    gc_enter(objspace, gc_enter_event_start, &lock_lev);
+
+#if RGENGC_CHECK_MODE >= 2
+    gc_verify_internal_consistency(objspace);
+#endif
+
+    if (ruby_gc_stressful) {
+        int flag = FIXNUM_P(ruby_gc_stress_mode) ? FIX2INT(ruby_gc_stress_mode) : 0;
+
+        if ((flag & (1 << gc_stress_no_major)) == 0) {
+            do_full_mark = TRUE;
+        }
+
+        objspace->flags.immediate_sweep = !(flag & (1<<gc_stress_no_immediate_sweep));
+    }
+
+    if (gc_needs_major_flags) {
+        reason |= gc_needs_major_flags;
+        do_full_mark = TRUE;
+    }
+
+    /* if major gc has been disabled, never do a full mark */
+    if (!gc_config_full_mark_val) {
+        do_full_mark = FALSE;
+    }
+    gc_needs_major_flags = GPR_FLAG_NONE;
+
+    if (do_full_mark && (reason & GPR_FLAG_MAJOR_MASK) == 0) {
+        reason |= GPR_FLAG_MAJOR_BY_FORCE; /* GC by CAPI, METHOD, and so on. */
+    }
+
+    if (objspace->flags.dont_incremental ||
+            reason & GPR_FLAG_IMMEDIATE_MARK ||
+            ruby_gc_stressful) {
+        objspace->flags.during_incremental_marking = FALSE;
+    }
+    else {
+        objspace->flags.during_incremental_marking = do_full_mark;
+    }
+
+    /* Explicitly enable compaction (GC.compact) */
+    if (do_full_mark && ruby_enable_autocompact) {
+        objspace->flags.during_compacting = TRUE;
+#if RGENGC_CHECK_MODE
+        objspace->rcompactor.compare_func = ruby_autocompact_compare_func;
+#endif
+    }
+    else {
+        objspace->flags.during_compacting = !!(reason & GPR_FLAG_COMPACT);
+    }
+
+    if (!GC_ENABLE_LAZY_SWEEP || objspace->flags.dont_incremental) {
+        objspace->flags.immediate_sweep = TRUE;
+    }
+
+    if (objspace->flags.immediate_sweep) reason |= GPR_FLAG_IMMEDIATE_SWEEP;
+
+    gc_report(1, objspace, "gc_start(reason: %x) => %u, %d, %d\n",
+              reason,
+              do_full_mark, !is_incremental_marking(objspace), objspace->flags.immediate_sweep);
+
+    RB_DEBUG_COUNTER_INC(gc_count);
+
+    if (reason & GPR_FLAG_MAJOR_MASK) {
+        (void)RB_DEBUG_COUNTER_INC_IF(gc_major_nofree, reason & GPR_FLAG_MAJOR_BY_NOFREE);
+        (void)RB_DEBUG_COUNTER_INC_IF(gc_major_oldgen, reason & GPR_FLAG_MAJOR_BY_OLDGEN);
+        (void)RB_DEBUG_COUNTER_INC_IF(gc_major_shady,  reason & GPR_FLAG_MAJOR_BY_SHADY);
+        (void)RB_DEBUG_COUNTER_INC_IF(gc_major_force,  reason & GPR_FLAG_MAJOR_BY_FORCE);
+#if RGENGC_ESTIMATE_OLDMALLOC
+        (void)RB_DEBUG_COUNTER_INC_IF(gc_major_oldmalloc, reason & GPR_FLAG_MAJOR_BY_OLDMALLOC);
+#endif
+    }
+    else {
+        (void)RB_DEBUG_COUNTER_INC_IF(gc_minor_newobj, reason & GPR_FLAG_NEWOBJ);
+        (void)RB_DEBUG_COUNTER_INC_IF(gc_minor_malloc, reason & GPR_FLAG_MALLOC);
+        (void)RB_DEBUG_COUNTER_INC_IF(gc_minor_method, reason & GPR_FLAG_METHOD);
+        (void)RB_DEBUG_COUNTER_INC_IF(gc_minor_capi,   reason & GPR_FLAG_CAPI);
+        (void)RB_DEBUG_COUNTER_INC_IF(gc_minor_stress, reason & GPR_FLAG_STRESS);
+    }
+
+    objspace->profile.count++;
+    objspace->profile.latest_gc_info = reason;
+    objspace->profile.total_allocated_objects_at_gc_start = total_allocated_objects(objspace);
+    objspace->profile.heap_used_at_gc_start = rb_darray_size(objspace->heap_pages.sorted);
+    objspace->profile.weak_references_count = 0;
+    objspace->profile.retained_weak_references_count = 0;
+    gc_prof_setup_new_record(objspace, reason);
+    gc_reset_malloc_info(objspace, do_full_mark);
+
+    rb_gc_event_hook(0, RUBY_INTERNAL_EVENT_GC_START);
+
+    GC_ASSERT(during_gc);
+
+    gc_prof_timer_start(objspace);
+    {
+        if (gc_marks(objspace, do_full_mark)) {
+            gc_sweep(objspace);
+        }
+    }
+    gc_prof_timer_stop(objspace);
+
+    gc_exit(objspace, gc_enter_event_start, &lock_lev);
+    return TRUE;
+}
+
+static void
+gc_rest(rb_objspace_t *objspace)
+{
+    if (is_incremental_marking(objspace) || is_lazy_sweeping(objspace)) {
+        unsigned int lock_lev;
+        gc_enter(objspace, gc_enter_event_rest, &lock_lev);
+
+        if (RGENGC_CHECK_MODE >= 2) gc_verify_internal_consistency(objspace);
+
+        if (is_incremental_marking(objspace)) {
+            gc_marking_enter(objspace);
+            gc_marks_rest(objspace);
+            gc_marking_exit(objspace);
+
+            gc_sweep(objspace);
+        }
+
+        if (is_lazy_sweeping(objspace)) {
+            gc_sweeping_enter(objspace);
+            gc_sweep_rest(objspace);
+            gc_sweeping_exit(objspace);
+        }
+
+        gc_exit(objspace, gc_enter_event_rest, &lock_lev);
+    }
+}
+
+struct objspace_and_reason {
+    rb_objspace_t *objspace;
+    unsigned int reason;
+};
+
+static void
+gc_current_status_fill(rb_objspace_t *objspace, char *buff)
+{
+    int i = 0;
+    if (is_marking(objspace)) {
+        buff[i++] = 'M';
+        if (is_full_marking(objspace))        buff[i++] = 'F';
+        if (is_incremental_marking(objspace)) buff[i++] = 'I';
+    }
+    else if (is_sweeping(objspace)) {
+        buff[i++] = 'S';
+        if (is_lazy_sweeping(objspace))      buff[i++] = 'L';
+    }
+    else {
+        buff[i++] = 'N';
+    }
+    buff[i] = '\0';
+}
+
+static const char *
+gc_current_status(rb_objspace_t *objspace)
+{
+    static char buff[0x10];
+    gc_current_status_fill(objspace, buff);
+    return buff;
+}
+
+#if PRINT_ENTER_EXIT_TICK
+
+static tick_t last_exit_tick;
+static tick_t enter_tick;
+static int enter_count = 0;
+static char last_gc_status[0x10];
+
+static inline void
+gc_record(rb_objspace_t *objspace, int direction, const char *event)
+{
+    if (direction == 0) { /* enter */
+        enter_count++;
+        enter_tick = tick();
+        gc_current_status_fill(objspace, last_gc_status);
+    }
+    else { /* exit */
+        tick_t exit_tick = tick();
+        char current_gc_status[0x10];
+        gc_current_status_fill(objspace, current_gc_status);
+#if 1
+        /* [last mutator time] [gc time] [event] */
+        fprintf(stderr, "%"PRItick"\t%"PRItick"\t%s\t[%s->%s|%c]\n",
+                enter_tick - last_exit_tick,
+                exit_tick - enter_tick,
+                event,
+                last_gc_status, current_gc_status,
+                (objspace->profile.latest_gc_info & GPR_FLAG_MAJOR_MASK) ? '+' : '-');
+        last_exit_tick = exit_tick;
+#else
+        /* [enter_tick] [gc time] [event] */
+        fprintf(stderr, "%"PRItick"\t%"PRItick"\t%s\t[%s->%s|%c]\n",
+                enter_tick,
+                exit_tick - enter_tick,
+                event,
+                last_gc_status, current_gc_status,
+                (objspace->profile.latest_gc_info & GPR_FLAG_MAJOR_MASK) ? '+' : '-');
+#endif
+    }
+}
+#else /* PRINT_ENTER_EXIT_TICK */
+static inline void
+gc_record(rb_objspace_t *objspace, int direction, const char *event)
+{
+    /* null */
+}
+#endif /* PRINT_ENTER_EXIT_TICK */
+
+static const char *
+gc_enter_event_cstr(enum gc_enter_event event)
+{
+    switch (event) {
+      case gc_enter_event_start: return "start";
+      case gc_enter_event_continue: return "continue";
+      case gc_enter_event_rest: return "rest";
+      case gc_enter_event_finalizer: return "finalizer";
+    }
+    return NULL;
+}
+
+static void
+gc_enter_count(enum gc_enter_event event)
+{
+    switch (event) {
+      case gc_enter_event_start:          RB_DEBUG_COUNTER_INC(gc_enter_start); break;
+      case gc_enter_event_continue:       RB_DEBUG_COUNTER_INC(gc_enter_continue); break;
+      case gc_enter_event_rest:           RB_DEBUG_COUNTER_INC(gc_enter_rest); break;
+      case gc_enter_event_finalizer:      RB_DEBUG_COUNTER_INC(gc_enter_finalizer); break;
+    }
+}
+
+static bool current_process_time(struct timespec *ts);
+
+static void
+gc_clock_start(struct timespec *ts)
+{
+    if (!current_process_time(ts)) {
+        ts->tv_sec = 0;
+        ts->tv_nsec = 0;
+    }
+}
+
+static unsigned long long
+gc_clock_end(struct timespec *ts)
+{
+    struct timespec end_time;
+
+    if ((ts->tv_sec > 0 || ts->tv_nsec > 0) &&
+            current_process_time(&end_time) &&
+            end_time.tv_sec >= ts->tv_sec) {
+        return (unsigned long long)(end_time.tv_sec - ts->tv_sec) * (1000 * 1000 * 1000) +
+                    (end_time.tv_nsec - ts->tv_nsec);
+    }
+
+    return 0;
+}
+
+static inline void
+gc_enter(rb_objspace_t *objspace, enum gc_enter_event event, unsigned int *lock_lev)
+{
+    *lock_lev = RB_GC_VM_LOCK();
+
+    switch (event) {
+      case gc_enter_event_rest:
+        if (!is_marking(objspace)) break;
+        // fall through
+      case gc_enter_event_start:
+      case gc_enter_event_continue:
+        // stop other ractors
+        rb_gc_vm_barrier();
+        break;
+      default:
+        break;
+    }
+
+    gc_enter_count(event);
+    if (RB_UNLIKELY(during_gc != 0)) rb_bug("during_gc != 0");
+    if (RGENGC_CHECK_MODE >= 3) gc_verify_internal_consistency(objspace);
+
+    during_gc = TRUE;
+    RUBY_DEBUG_LOG("%s (%s)",gc_enter_event_cstr(event), gc_current_status(objspace));
+    gc_report(1, objspace, "gc_enter: %s [%s]\n", gc_enter_event_cstr(event), gc_current_status(objspace));
+    gc_record(objspace, 0, gc_enter_event_cstr(event));
+
+    rb_gc_event_hook(0, RUBY_INTERNAL_EVENT_GC_ENTER);
+}
+
+static inline void
+gc_exit(rb_objspace_t *objspace, enum gc_enter_event event, unsigned int *lock_lev)
+{
+    GC_ASSERT(during_gc != 0);
+
+    rb_gc_event_hook(0, RUBY_INTERNAL_EVENT_GC_EXIT);
+
+    gc_record(objspace, 1, gc_enter_event_cstr(event));
+    RUBY_DEBUG_LOG("%s (%s)", gc_enter_event_cstr(event), gc_current_status(objspace));
+    gc_report(1, objspace, "gc_exit: %s [%s]\n", gc_enter_event_cstr(event), gc_current_status(objspace));
+    during_gc = FALSE;
+
+    RB_GC_VM_UNLOCK(*lock_lev);
+}
+
+#ifndef MEASURE_GC
+#define MEASURE_GC (objspace->flags.measure_gc)
+#endif
+
+static void
+gc_marking_enter(rb_objspace_t *objspace)
+{
+    GC_ASSERT(during_gc != 0);
+
+    if (MEASURE_GC) {
+        gc_clock_start(&objspace->profile.marking_start_time);
+    }
+}
+
+static void
+gc_marking_exit(rb_objspace_t *objspace)
+{
+    GC_ASSERT(during_gc != 0);
+
+    if (MEASURE_GC) {
+        objspace->profile.marking_time_ns += gc_clock_end(&objspace->profile.marking_start_time);
+    }
+}
+
+static void
+gc_sweeping_enter(rb_objspace_t *objspace)
+{
+    GC_ASSERT(during_gc != 0);
+
+    if (MEASURE_GC) {
+        gc_clock_start(&objspace->profile.sweeping_start_time);
+    }
+}
+
+static void
+gc_sweeping_exit(rb_objspace_t *objspace)
+{
+    GC_ASSERT(during_gc != 0);
+
+    if (MEASURE_GC) {
+        objspace->profile.sweeping_time_ns += gc_clock_end(&objspace->profile.sweeping_start_time);
+    }
+}
+
+static void *
+gc_with_gvl(void *ptr)
+{
+    struct objspace_and_reason *oar = (struct objspace_and_reason *)ptr;
+    return (void *)(VALUE)garbage_collect(oar->objspace, oar->reason);
+}
+
+int ruby_thread_has_gvl_p(void);
+
+static int
+garbage_collect_with_gvl(rb_objspace_t *objspace, unsigned int reason)
+{
+    if (dont_gc_val()) {
+        return TRUE;
+    }
+    else if (!ruby_native_thread_p()) {
+        return TRUE;
+    }
+    else if (!ruby_thread_has_gvl_p()) {
+        void *ret;
+        struct objspace_and_reason oar;
+        oar.objspace = objspace;
+        oar.reason = reason;
+        ret = rb_thread_call_with_gvl(gc_with_gvl, (void *)&oar);
+
+        return !!ret;
+    }
+    else {
+        return garbage_collect(objspace, reason);
+    }
+}
+
+static int
+gc_set_candidate_object_i(void *vstart, void *vend, size_t stride, void *data)
+{
+    rb_objspace_t *objspace = (rb_objspace_t *)data;
+
+    VALUE v = (VALUE)vstart;
+    for (; v != (VALUE)vend; v += stride) {
+        asan_unpoisoning_object(v) {
+            switch (BUILTIN_TYPE(v)) {
+              case T_NONE:
+              case T_ZOMBIE:
+                break;
+              default:
+                rb_gc_prepare_heap_process_object(v);
+                if (!RVALUE_OLD_P(objspace, v) && !RVALUE_WB_UNPROTECTED(objspace, v)) {
+                    RVALUE_AGE_SET_CANDIDATE(objspace, v);
+                }
+            }
+        }
+    }
+
+    return 0;
+}
+
+void
+rb_gc_impl_start(void *objspace_ptr, bool full_mark, bool immediate_mark, bool immediate_sweep, bool compact)
+{
+    rb_objspace_t *objspace = objspace_ptr;
+    unsigned int reason = (GPR_FLAG_FULL_MARK |
+                           GPR_FLAG_IMMEDIATE_MARK |
+                           GPR_FLAG_IMMEDIATE_SWEEP |
+                           GPR_FLAG_METHOD);
+
+    int full_marking_p = gc_config_full_mark_val;
+    gc_config_full_mark_set(TRUE);
+
+    /* For now, compact implies full mark / sweep, so ignore other flags */
+    if (compact) {
+        GC_ASSERT(GC_COMPACTION_SUPPORTED);
+
+        reason |= GPR_FLAG_COMPACT;
+    }
+    else {
+        if (!full_mark)       reason &= ~GPR_FLAG_FULL_MARK;
+        if (!immediate_mark)  reason &= ~GPR_FLAG_IMMEDIATE_MARK;
+        if (!immediate_sweep) reason &= ~GPR_FLAG_IMMEDIATE_SWEEP;
+    }
+
+    garbage_collect(objspace, reason);
+    gc_finalize_deferred(objspace);
+
+    gc_config_full_mark_set(full_marking_p);
+}
+
+void
+rb_gc_impl_prepare_heap(void *objspace_ptr)
+{
+    rb_objspace_t *objspace = objspace_ptr;
+
+    size_t orig_total_slots = objspace_available_slots(objspace);
+    size_t orig_allocatable_slots = objspace->heap_pages.allocatable_slots;
+
+    rb_gc_impl_each_objects(objspace, gc_set_candidate_object_i, objspace_ptr);
+
+    double orig_max_free_slots = gc_params.heap_free_slots_max_ratio;
+    /* Ensure that all empty pages are moved onto empty_pages. */
+    gc_params.heap_free_slots_max_ratio = 0.0;
+    rb_gc_impl_start(objspace, true, true, true, true);
+    gc_params.heap_free_slots_max_ratio = orig_max_free_slots;
+
+    objspace->heap_pages.allocatable_slots = 0;
+    heap_pages_freeable_pages = objspace->empty_pages_count;
+    heap_pages_free_unused_pages(objspace_ptr);
+    GC_ASSERT(heap_pages_freeable_pages == 0);
+    GC_ASSERT(objspace->empty_pages_count == 0);
+    objspace->heap_pages.allocatable_slots = orig_allocatable_slots;
+
+    size_t total_slots = objspace_available_slots(objspace);
+    if (orig_total_slots > total_slots) {
+        objspace->heap_pages.allocatable_slots += orig_total_slots - total_slots;
+    }
+
+#if defined(HAVE_MALLOC_TRIM) && !defined(RUBY_ALTERNATIVE_MALLOC_HEADER)
+    malloc_trim(0);
+#endif
+}
+
+static int
+gc_is_moveable_obj(rb_objspace_t *objspace, VALUE obj)
+{
+    GC_ASSERT(!SPECIAL_CONST_P(obj));
+
+    switch (BUILTIN_TYPE(obj)) {
+      case T_NONE:
+      case T_MOVED:
+      case T_ZOMBIE:
+        return FALSE;
+      case T_SYMBOL:
+        // TODO: restore original behavior
+        // if (RSYMBOL(obj)->id & ~ID_SCOPE_MASK) {
+        //     return FALSE;
+        // }
+        return false;
+        /* fall through */
+      case T_STRING:
+      case T_OBJECT:
+      case T_FLOAT:
+      case T_IMEMO:
+      case T_ARRAY:
+      case T_BIGNUM:
+      case T_ICLASS:
+      case T_MODULE:
+      case T_REGEXP:
+      case T_DATA:
+      case T_MATCH:
+      case T_STRUCT:
+      case T_HASH:
+      case T_FILE:
+      case T_COMPLEX:
+      case T_RATIONAL:
+      case T_NODE:
+      case T_CLASS:
+        if (FL_TEST_RAW(obj, FL_FINALIZE)) {
+            /* The finalizer table is a numtable. It looks up objects by address.
+             * We can't mark the keys in the finalizer table because that would
+             * prevent the objects from being collected.  This check prevents
+             * objects that are keys in the finalizer table from being moved
+             * without directly pinning them. */
+            GC_ASSERT(st_is_member(finalizer_table, obj));
+
+            return FALSE;
+        }
+        GC_ASSERT(RVALUE_MARKED(objspace, obj));
+        GC_ASSERT(!RVALUE_PINNED(objspace, obj));
+
+        return TRUE;
+
+      default:
+        rb_bug("gc_is_moveable_obj: unreachable (%d)", (int)BUILTIN_TYPE(obj));
+        break;
+    }
+
+    return FALSE;
+}
+
+void rb_mv_generic_ivar(VALUE src, VALUE dst);
+
+static VALUE
+gc_move(rb_objspace_t *objspace, VALUE src, VALUE dest, size_t src_slot_size, size_t slot_size)
+{
+    int marked;
+    int wb_unprotected;
+    int uncollectible;
+    int age;
+
+    gc_report(4, objspace, "Moving object: %p -> %p\n", (void *)src, (void *)dest);
+
+    GC_ASSERT(BUILTIN_TYPE(src) != T_NONE);
+    GC_ASSERT(!MARKED_IN_BITMAP(GET_HEAP_MARK_BITS(dest), dest));
+
+    GC_ASSERT(!RVALUE_MARKING(objspace, src));
+
+    /* Save off bits for current object. */
+    marked = RVALUE_MARKED(objspace, src);
+    wb_unprotected = RVALUE_WB_UNPROTECTED(objspace, src);
+    uncollectible = RVALUE_UNCOLLECTIBLE(objspace, src);
+    bool remembered = RVALUE_REMEMBERED(objspace, src);
+    age = RVALUE_AGE_GET(src);
+
+    /* Clear bits for eventual T_MOVED */
+    CLEAR_IN_BITMAP(GET_HEAP_MARK_BITS(src), src);
+    CLEAR_IN_BITMAP(GET_HEAP_WB_UNPROTECTED_BITS(src), src);
+    CLEAR_IN_BITMAP(GET_HEAP_UNCOLLECTIBLE_BITS(src), src);
+    CLEAR_IN_BITMAP(GET_HEAP_PAGE(src)->remembered_bits, src);
+
+    /* Move the object */
+    memcpy((void *)dest, (void *)src, MIN(src_slot_size, slot_size));
+
+    if (RVALUE_OVERHEAD > 0) {
+        void *dest_overhead = (void *)(((uintptr_t)dest) + slot_size - RVALUE_OVERHEAD);
+        void *src_overhead = (void *)(((uintptr_t)src) + src_slot_size - RVALUE_OVERHEAD);
+
+        memcpy(dest_overhead, src_overhead, RVALUE_OVERHEAD);
+    }
+
+    memset((void *)src, 0, src_slot_size);
+    RVALUE_AGE_RESET(src);
+
+    /* Set bits for object in new location */
+    if (remembered) {
+        MARK_IN_BITMAP(GET_HEAP_PAGE(dest)->remembered_bits, dest);
+    }
+    else {
+        CLEAR_IN_BITMAP(GET_HEAP_PAGE(dest)->remembered_bits, dest);
+    }
+
+    if (marked) {
+        MARK_IN_BITMAP(GET_HEAP_MARK_BITS(dest), dest);
+    }
+    else {
+        CLEAR_IN_BITMAP(GET_HEAP_MARK_BITS(dest), dest);
+    }
+
+    if (wb_unprotected) {
+        MARK_IN_BITMAP(GET_HEAP_WB_UNPROTECTED_BITS(dest), dest);
+    }
+    else {
+        CLEAR_IN_BITMAP(GET_HEAP_WB_UNPROTECTED_BITS(dest), dest);
+    }
+
+    if (uncollectible) {
+        MARK_IN_BITMAP(GET_HEAP_UNCOLLECTIBLE_BITS(dest), dest);
+    }
+    else {
+        CLEAR_IN_BITMAP(GET_HEAP_UNCOLLECTIBLE_BITS(dest), dest);
+    }
+
+    RVALUE_AGE_SET(dest, age);
+    /* Assign forwarding address */
+    RMOVED(src)->flags = T_MOVED;
+    RMOVED(src)->dummy = Qundef;
+    RMOVED(src)->destination = dest;
+    GC_ASSERT(BUILTIN_TYPE(dest) != T_NONE);
+
+    GET_HEAP_PAGE(src)->heap->total_freed_objects++;
+    GET_HEAP_PAGE(dest)->heap->total_allocated_objects++;
+
+    return src;
+}
+
+#if GC_CAN_COMPILE_COMPACTION
+static int
+compare_pinned_slots(const void *left, const void *right, void *dummy)
+{
+    struct heap_page *left_page;
+    struct heap_page *right_page;
+
+    left_page = *(struct heap_page * const *)left;
+    right_page = *(struct heap_page * const *)right;
+
+    return left_page->pinned_slots - right_page->pinned_slots;
+}
+
+static int
+compare_free_slots(const void *left, const void *right, void *dummy)
+{
+    struct heap_page *left_page;
+    struct heap_page *right_page;
+
+    left_page = *(struct heap_page * const *)left;
+    right_page = *(struct heap_page * const *)right;
+
+    return left_page->free_slots - right_page->free_slots;
+}
+
+static void
+gc_sort_heap_by_compare_func(rb_objspace_t *objspace, gc_compact_compare_func compare_func)
+{
+    for (int j = 0; j < HEAP_COUNT; j++) {
+        rb_heap_t *heap = &heaps[j];
+
+        size_t total_pages = heap->total_pages;
+        size_t size = rb_size_mul_or_raise(total_pages, sizeof(struct heap_page *), rb_eRuntimeError);
+        struct heap_page *page = 0, **page_list = malloc(size);
+        size_t i = 0;
+
+        heap->free_pages = NULL;
+        ccan_list_for_each(&heap->pages, page, page_node) {
+            page_list[i++] = page;
+            GC_ASSERT(page);
+        }
+
+        GC_ASSERT((size_t)i == total_pages);
+
+        /* Sort the heap so "filled pages" are first. `heap_add_page` adds to the
+         * head of the list, so empty pages will end up at the start of the heap */
+        ruby_qsort(page_list, total_pages, sizeof(struct heap_page *), compare_func, NULL);
+
+        /* Reset the eden heap */
+        ccan_list_head_init(&heap->pages);
+
+        for (i = 0; i < total_pages; i++) {
+            ccan_list_add(&heap->pages, &page_list[i]->page_node);
+            if (page_list[i]->free_slots != 0) {
+                heap_add_freepage(heap, page_list[i]);
+            }
+        }
+
+        free(page_list);
+    }
+}
+#endif
+
+bool
+rb_gc_impl_object_moved_p(void *objspace_ptr, VALUE obj)
+{
+    return gc_object_moved_p(objspace_ptr, obj);
+}
+
+static int
+gc_ref_update(void *vstart, void *vend, size_t stride, rb_objspace_t *objspace, struct heap_page *page)
+{
+    VALUE v = (VALUE)vstart;
+
+    page->flags.has_uncollectible_wb_unprotected_objects = FALSE;
+    page->flags.has_remembered_objects = FALSE;
+
+    /* For each object on the page */
+    for (; v != (VALUE)vend; v += stride) {
+        asan_unpoisoning_object(v) {
+            switch (BUILTIN_TYPE(v)) {
+              case T_NONE:
+              case T_MOVED:
+              case T_ZOMBIE:
+                break;
+              default:
+                if (RVALUE_WB_UNPROTECTED(objspace, v)) {
+                    page->flags.has_uncollectible_wb_unprotected_objects = TRUE;
+                }
+                if (RVALUE_REMEMBERED(objspace, v)) {
+                    page->flags.has_remembered_objects = TRUE;
+                }
+                if (page->flags.before_sweep) {
+                    if (RVALUE_MARKED(objspace, v)) {
+                        rb_gc_update_object_references(objspace, v);
+                    }
+                }
+                else {
+                    rb_gc_update_object_references(objspace, v);
+                }
+            }
+        }
+    }
+
+    return 0;
+}
+
+static int
+gc_update_references_weak_table_i(VALUE obj, void *data)
+{
+    int ret;
+    asan_unpoisoning_object(obj) {
+        ret = BUILTIN_TYPE(obj) == T_MOVED ? ST_REPLACE : ST_CONTINUE;
+    }
+    return ret;
+}
+
+static int
+gc_update_references_weak_table_replace_i(VALUE *obj, void *data)
+{
+    *obj = rb_gc_location(*obj);
+
+    return ST_CONTINUE;
+}
+
+static void
+gc_update_references(rb_objspace_t *objspace)
+{
+    objspace->flags.during_reference_updating = true;
+
+    rb_gc_before_updating_jit_code();
+
+    struct heap_page *page = NULL;
+
+    for (int i = 0; i < HEAP_COUNT; i++) {
+        bool should_set_mark_bits = TRUE;
+        rb_heap_t *heap = &heaps[i];
+
+        ccan_list_for_each(&heap->pages, page, page_node) {
+            uintptr_t start = (uintptr_t)page->start;
+            uintptr_t end = start + (page->total_slots * heap->slot_size);
+
+            gc_ref_update((void *)start, (void *)end, heap->slot_size, objspace, page);
+            if (page == heap->sweeping_page) {
+                should_set_mark_bits = FALSE;
+            }
+            if (should_set_mark_bits) {
+                gc_setup_mark_bits(page);
+            }
+        }
+    }
+
+    gc_update_table_refs(finalizer_table);
+
+    rb_gc_update_vm_references((void *)objspace);
+
+    for (int table = 0; table < RB_GC_VM_WEAK_TABLE_COUNT; table++) {
+        rb_gc_vm_weak_table_foreach(
+            gc_update_references_weak_table_i,
+            gc_update_references_weak_table_replace_i,
+            NULL,
+            false,
+            table
+        );
+    }
+
+    rb_gc_after_updating_jit_code();
+
+    objspace->flags.during_reference_updating = false;
+}
+
+#if GC_CAN_COMPILE_COMPACTION
+static void
+root_obj_check_moved_i(const char *category, VALUE obj, void *data)
+{
+    rb_objspace_t *objspace = data;
+
+    if (gc_object_moved_p(objspace, obj)) {
+        rb_bug("ROOT %s points to MOVED: %p -> %s", category, (void *)obj, rb_obj_info(rb_gc_impl_location(objspace, obj)));
+    }
+}
+
+static void
+reachable_object_check_moved_i(VALUE ref, void *data)
+{
+    VALUE parent = (VALUE)data;
+    if (gc_object_moved_p(rb_gc_get_objspace(), ref)) {
+        rb_bug("Object %s points to MOVED: %p -> %s", rb_obj_info(parent), (void *)ref, rb_obj_info(rb_gc_impl_location(rb_gc_get_objspace(), ref)));
+    }
+}
+
+static int
+heap_check_moved_i(void *vstart, void *vend, size_t stride, void *data)
+{
+    rb_objspace_t *objspace = data;
+
+    VALUE v = (VALUE)vstart;
+    for (; v != (VALUE)vend; v += stride) {
+        if (gc_object_moved_p(objspace, v)) {
+            /* Moved object still on the heap, something may have a reference. */
+        }
+        else {
+            asan_unpoisoning_object(v) {
+                switch (BUILTIN_TYPE(v)) {
+                  case T_NONE:
+                  case T_ZOMBIE:
+                    break;
+                  default:
+                    if (!rb_gc_impl_garbage_object_p(objspace, v)) {
+                        rb_objspace_reachable_objects_from(v, reachable_object_check_moved_i, (void *)v);
+                    }
+                }
+            }
+        }
+    }
+
+    return 0;
+}
+#endif
+
+bool
+rb_gc_impl_during_gc_p(void *objspace_ptr)
+{
+    rb_objspace_t *objspace = objspace_ptr;
+
+    return during_gc;
+}
+
+#if RGENGC_PROFILE >= 2
+
+static const char*
+type_name(int type, VALUE obj)
+{
+    switch ((enum ruby_value_type)type) {
+      case RUBY_T_NONE:     return "T_NONE";
+      case RUBY_T_OBJECT:   return "T_OBJECT";
+      case RUBY_T_CLASS:    return "T_CLASS";
+      case RUBY_T_MODULE:   return "T_MODULE";
+      case RUBY_T_FLOAT:    return "T_FLOAT";
+      case RUBY_T_STRING:   return "T_STRING";
+      case RUBY_T_REGEXP:   return "T_REGEXP";
+      case RUBY_T_ARRAY:    return "T_ARRAY";
+      case RUBY_T_HASH:     return "T_HASH";
+      case RUBY_T_STRUCT:   return "T_STRUCT";
+      case RUBY_T_BIGNUM:   return "T_BIGNUM";
+      case RUBY_T_FILE:     return "T_FILE";
+      case RUBY_T_DATA:     return "T_DATA";
+      case RUBY_T_MATCH:    return "T_MATCH";
+      case RUBY_T_COMPLEX:  return "T_COMPLEX";
+      case RUBY_T_RATIONAL: return "T_RATIONAL";
+      case RUBY_T_NIL:      return "T_NIL";
+      case RUBY_T_TRUE:     return "T_TRUE";
+      case RUBY_T_FALSE:    return "T_FALSE";
+      case RUBY_T_SYMBOL:   return "T_SYMBOL";
+      case RUBY_T_FIXNUM:   return "T_FIXNUM";
+      case RUBY_T_UNDEF:    return "T_UNDEF";
+      case RUBY_T_IMEMO:    return "T_IMEMO";
+      case RUBY_T_NODE:     return "T_NODE";
+      case RUBY_T_ICLASS:   return "T_ICLASS";
+      case RUBY_T_ZOMBIE:   return "T_ZOMBIE";
+      case RUBY_T_MOVED:    return "T_MOVED";
+      default:              return "unknown";
+    }
+}
+
+static void
+gc_count_add_each_types(VALUE hash, const char *name, const size_t *types)
+{
+    VALUE result = rb_hash_new_with_size(T_MASK);
+    int i;
+    for (i=0; i<T_MASK; i++) {
+        const char *type = type_name(i, 0);
+        rb_hash_aset(result, ID2SYM(rb_intern(type)), SIZET2NUM(types[i]));
+    }
+    rb_hash_aset(hash, ID2SYM(rb_intern(name)), result);
+}
+#endif
+
+size_t
+rb_gc_impl_gc_count(void *objspace_ptr)
+{
+    rb_objspace_t *objspace = objspace_ptr;
+
+    return objspace->profile.count;
+}
+
+static VALUE
+gc_info_decode(rb_objspace_t *objspace, const VALUE hash_or_key, const unsigned int orig_flags)
+{
+    static VALUE sym_major_by = Qnil, sym_gc_by, sym_immediate_sweep, sym_have_finalizer, sym_state, sym_need_major_by;
+    static VALUE sym_nofree, sym_oldgen, sym_shady, sym_force, sym_stress;
+#if RGENGC_ESTIMATE_OLDMALLOC
+    static VALUE sym_oldmalloc;
+#endif
+    static VALUE sym_newobj, sym_malloc, sym_method, sym_capi;
+    static VALUE sym_none, sym_marking, sym_sweeping;
+    static VALUE sym_weak_references_count, sym_retained_weak_references_count;
+    VALUE hash = Qnil, key = Qnil;
+    VALUE major_by, need_major_by;
+    unsigned int flags = orig_flags ? orig_flags : objspace->profile.latest_gc_info;
+
+    if (SYMBOL_P(hash_or_key)) {
+        key = hash_or_key;
+    }
+    else if (RB_TYPE_P(hash_or_key, T_HASH)) {
+        hash = hash_or_key;
+    }
+    else {
+        rb_bug("gc_info_decode: non-hash or symbol given");
+    }
+
+    if (NIL_P(sym_major_by)) {
+#define S(s) sym_##s = ID2SYM(rb_intern_const(#s))
+        S(major_by);
+        S(gc_by);
+        S(immediate_sweep);
+        S(have_finalizer);
+        S(state);
+        S(need_major_by);
+
+        S(stress);
+        S(nofree);
+        S(oldgen);
+        S(shady);
+        S(force);
+#if RGENGC_ESTIMATE_OLDMALLOC
+        S(oldmalloc);
+#endif
+        S(newobj);
+        S(malloc);
+        S(method);
+        S(capi);
+
+        S(none);
+        S(marking);
+        S(sweeping);
+
+        S(weak_references_count);
+        S(retained_weak_references_count);
+#undef S
+    }
+
+#define SET(name, attr) \
+    if (key == sym_##name) \
+        return (attr); \
+    else if (hash != Qnil) \
+        rb_hash_aset(hash, sym_##name, (attr));
+
+    major_by =
+      (flags & GPR_FLAG_MAJOR_BY_NOFREE) ? sym_nofree :
+      (flags & GPR_FLAG_MAJOR_BY_OLDGEN) ? sym_oldgen :
+      (flags & GPR_FLAG_MAJOR_BY_SHADY)  ? sym_shady :
+      (flags & GPR_FLAG_MAJOR_BY_FORCE)  ? sym_force :
+#if RGENGC_ESTIMATE_OLDMALLOC
+      (flags & GPR_FLAG_MAJOR_BY_OLDMALLOC) ? sym_oldmalloc :
+#endif
+      Qnil;
+    SET(major_by, major_by);
+
+    if (orig_flags == 0) { /* set need_major_by only if flags not set explicitly */
+        unsigned int need_major_flags = gc_needs_major_flags;
+        need_major_by =
+            (need_major_flags & GPR_FLAG_MAJOR_BY_NOFREE) ? sym_nofree :
+            (need_major_flags & GPR_FLAG_MAJOR_BY_OLDGEN) ? sym_oldgen :
+            (need_major_flags & GPR_FLAG_MAJOR_BY_SHADY)  ? sym_shady :
+            (need_major_flags & GPR_FLAG_MAJOR_BY_FORCE)  ? sym_force :
+#if RGENGC_ESTIMATE_OLDMALLOC
+            (need_major_flags & GPR_FLAG_MAJOR_BY_OLDMALLOC) ? sym_oldmalloc :
+#endif
+            Qnil;
+        SET(need_major_by, need_major_by);
+    }
+
+    SET(gc_by,
+        (flags & GPR_FLAG_NEWOBJ) ? sym_newobj :
+        (flags & GPR_FLAG_MALLOC) ? sym_malloc :
+        (flags & GPR_FLAG_METHOD) ? sym_method :
+        (flags & GPR_FLAG_CAPI)   ? sym_capi :
+        (flags & GPR_FLAG_STRESS) ? sym_stress :
+        Qnil
+    );
+
+    SET(have_finalizer, (flags & GPR_FLAG_HAVE_FINALIZE) ? Qtrue : Qfalse);
+    SET(immediate_sweep, (flags & GPR_FLAG_IMMEDIATE_SWEEP) ? Qtrue : Qfalse);
+
+    if (orig_flags == 0) {
+        SET(state, gc_mode(objspace) == gc_mode_none ? sym_none :
+                   gc_mode(objspace) == gc_mode_marking ? sym_marking : sym_sweeping);
+    }
+
+    SET(weak_references_count, LONG2FIX(objspace->profile.weak_references_count));
+    SET(retained_weak_references_count, LONG2FIX(objspace->profile.retained_weak_references_count));
+#undef SET
+
+    if (!NIL_P(key)) {
+        // Matched key should return above
+        return Qundef;
+    }
+
+    return hash;
+}
+
+VALUE
+rb_gc_impl_latest_gc_info(void *objspace_ptr, VALUE key)
+{
+    rb_objspace_t *objspace = objspace_ptr;
+
+    return gc_info_decode(objspace, key, 0);
+}
+
+
+enum gc_stat_sym {
+    gc_stat_sym_count,
+    gc_stat_sym_time,
+    gc_stat_sym_marking_time,
+    gc_stat_sym_sweeping_time,
+    gc_stat_sym_heap_allocated_pages,
+    gc_stat_sym_heap_empty_pages,
+    gc_stat_sym_heap_allocatable_slots,
+    gc_stat_sym_heap_available_slots,
+    gc_stat_sym_heap_live_slots,
+    gc_stat_sym_heap_free_slots,
+    gc_stat_sym_heap_final_slots,
+    gc_stat_sym_heap_marked_slots,
+    gc_stat_sym_heap_eden_pages,
+    gc_stat_sym_total_allocated_pages,
+    gc_stat_sym_total_freed_pages,
+    gc_stat_sym_total_allocated_objects,
+    gc_stat_sym_total_freed_objects,
+    gc_stat_sym_malloc_increase_bytes,
+    gc_stat_sym_malloc_increase_bytes_limit,
+    gc_stat_sym_minor_gc_count,
+    gc_stat_sym_major_gc_count,
+    gc_stat_sym_compact_count,
+    gc_stat_sym_read_barrier_faults,
+    gc_stat_sym_total_moved_objects,
+    gc_stat_sym_remembered_wb_unprotected_objects,
+    gc_stat_sym_remembered_wb_unprotected_objects_limit,
+    gc_stat_sym_old_objects,
+    gc_stat_sym_old_objects_limit,
+#if RGENGC_ESTIMATE_OLDMALLOC
+    gc_stat_sym_oldmalloc_increase_bytes,
+    gc_stat_sym_oldmalloc_increase_bytes_limit,
+#endif
+    gc_stat_sym_weak_references_count,
+#if RGENGC_PROFILE
+    gc_stat_sym_total_generated_normal_object_count,
+    gc_stat_sym_total_generated_shady_object_count,
+    gc_stat_sym_total_shade_operation_count,
+    gc_stat_sym_total_promoted_count,
+    gc_stat_sym_total_remembered_normal_object_count,
+    gc_stat_sym_total_remembered_shady_object_count,
+#endif
+    gc_stat_sym_last
+};
+
+static VALUE gc_stat_symbols[gc_stat_sym_last];
+
+static void
+setup_gc_stat_symbols(void)
+{
+    if (gc_stat_symbols[0] == 0) {
+#define S(s) gc_stat_symbols[gc_stat_sym_##s] = ID2SYM(rb_intern_const(#s))
+        S(count);
+        S(time);
+        S(marking_time),
+        S(sweeping_time),
+        S(heap_allocated_pages);
+        S(heap_empty_pages);
+        S(heap_allocatable_slots);
+        S(heap_available_slots);
+        S(heap_live_slots);
+        S(heap_free_slots);
+        S(heap_final_slots);
+        S(heap_marked_slots);
+        S(heap_eden_pages);
+        S(total_allocated_pages);
+        S(total_freed_pages);
+        S(total_allocated_objects);
+        S(total_freed_objects);
+        S(malloc_increase_bytes);
+        S(malloc_increase_bytes_limit);
+        S(minor_gc_count);
+        S(major_gc_count);
+        S(compact_count);
+        S(read_barrier_faults);
+        S(total_moved_objects);
+        S(remembered_wb_unprotected_objects);
+        S(remembered_wb_unprotected_objects_limit);
+        S(old_objects);
+        S(old_objects_limit);
+#if RGENGC_ESTIMATE_OLDMALLOC
+        S(oldmalloc_increase_bytes);
+        S(oldmalloc_increase_bytes_limit);
+#endif
+        S(weak_references_count);
+#if RGENGC_PROFILE
+        S(total_generated_normal_object_count);
+        S(total_generated_shady_object_count);
+        S(total_shade_operation_count);
+        S(total_promoted_count);
+        S(total_remembered_normal_object_count);
+        S(total_remembered_shady_object_count);
+#endif /* RGENGC_PROFILE */
+#undef S
+    }
+}
+
+static uint64_t
+ns_to_ms(uint64_t ns)
+{
+    return ns / (1000 * 1000);
+}
+
+VALUE
+rb_gc_impl_stat(void *objspace_ptr, VALUE hash_or_sym)
+{
+    rb_objspace_t *objspace = objspace_ptr;
+    VALUE hash = Qnil, key = Qnil;
+
+    setup_gc_stat_symbols();
+
+    if (RB_TYPE_P(hash_or_sym, T_HASH)) {
+        hash = hash_or_sym;
+    }
+    else if (SYMBOL_P(hash_or_sym)) {
+        key = hash_or_sym;
+    }
+    else {
+        rb_bug("non-hash or symbol given");
+    }
+
+#define SET(name, attr) \
+    if (key == gc_stat_symbols[gc_stat_sym_##name]) \
+        return SIZET2NUM(attr); \
+    else if (hash != Qnil) \
+        rb_hash_aset(hash, gc_stat_symbols[gc_stat_sym_##name], SIZET2NUM(attr));
+
+    SET(count, objspace->profile.count);
+    SET(time, (size_t)ns_to_ms(objspace->profile.marking_time_ns + objspace->profile.sweeping_time_ns)); // TODO: UINT64T2NUM
+    SET(marking_time, (size_t)ns_to_ms(objspace->profile.marking_time_ns));
+    SET(sweeping_time, (size_t)ns_to_ms(objspace->profile.sweeping_time_ns));
+
+    /* implementation dependent counters */
+    SET(heap_allocated_pages, rb_darray_size(objspace->heap_pages.sorted));
+    SET(heap_empty_pages, objspace->empty_pages_count)
+    SET(heap_allocatable_slots, objspace->heap_pages.allocatable_slots);
+    SET(heap_available_slots, objspace_available_slots(objspace));
+    SET(heap_live_slots, objspace_live_slots(objspace));
+    SET(heap_free_slots, objspace_free_slots(objspace));
+    SET(heap_final_slots, total_final_slots_count(objspace));
+    SET(heap_marked_slots, objspace->marked_slots);
+    SET(heap_eden_pages, heap_eden_total_pages(objspace));
+    SET(total_allocated_pages, objspace->heap_pages.allocated_pages);
+    SET(total_freed_pages, objspace->heap_pages.freed_pages);
+    SET(total_allocated_objects, total_allocated_objects(objspace));
+    SET(total_freed_objects, total_freed_objects(objspace));
+    SET(malloc_increase_bytes, malloc_increase);
+    SET(malloc_increase_bytes_limit, malloc_limit);
+    SET(minor_gc_count, objspace->profile.minor_gc_count);
+    SET(major_gc_count, objspace->profile.major_gc_count);
+    SET(compact_count, objspace->profile.compact_count);
+    SET(read_barrier_faults, objspace->profile.read_barrier_faults);
+    SET(total_moved_objects, objspace->rcompactor.total_moved);
+    SET(remembered_wb_unprotected_objects, objspace->rgengc.uncollectible_wb_unprotected_objects);
+    SET(remembered_wb_unprotected_objects_limit, objspace->rgengc.uncollectible_wb_unprotected_objects_limit);
+    SET(old_objects, objspace->rgengc.old_objects);
+    SET(old_objects_limit, objspace->rgengc.old_objects_limit);
+#if RGENGC_ESTIMATE_OLDMALLOC
+    SET(oldmalloc_increase_bytes, objspace->rgengc.oldmalloc_increase);
+    SET(oldmalloc_increase_bytes_limit, objspace->rgengc.oldmalloc_increase_limit);
+#endif
+
+#if RGENGC_PROFILE
+    SET(total_generated_normal_object_count, objspace->profile.total_generated_normal_object_count);
+    SET(total_generated_shady_object_count, objspace->profile.total_generated_shady_object_count);
+    SET(total_shade_operation_count, objspace->profile.total_shade_operation_count);
+    SET(total_promoted_count, objspace->profile.total_promoted_count);
+    SET(total_remembered_normal_object_count, objspace->profile.total_remembered_normal_object_count);
+    SET(total_remembered_shady_object_count, objspace->profile.total_remembered_shady_object_count);
+#endif /* RGENGC_PROFILE */
+#undef SET
+
+    if (!NIL_P(key)) {
+        // Matched key should return above
+        return Qundef;
+    }
+
+#if defined(RGENGC_PROFILE) && RGENGC_PROFILE >= 2
+    if (hash != Qnil) {
+        gc_count_add_each_types(hash, "generated_normal_object_count_types", objspace->profile.generated_normal_object_count_types);
+        gc_count_add_each_types(hash, "generated_shady_object_count_types", objspace->profile.generated_shady_object_count_types);
+        gc_count_add_each_types(hash, "shade_operation_count_types", objspace->profile.shade_operation_count_types);
+        gc_count_add_each_types(hash, "promoted_types", objspace->profile.promoted_types);
+        gc_count_add_each_types(hash, "remembered_normal_object_count_types", objspace->profile.remembered_normal_object_count_types);
+        gc_count_add_each_types(hash, "remembered_shady_object_count_types", objspace->profile.remembered_shady_object_count_types);
+    }
+#endif
+
+    return hash;
+}
+
+enum gc_stat_heap_sym {
+    gc_stat_heap_sym_slot_size,
+    gc_stat_heap_sym_heap_eden_pages,
+    gc_stat_heap_sym_heap_eden_slots,
+    gc_stat_heap_sym_total_allocated_pages,
+    gc_stat_heap_sym_force_major_gc_count,
+    gc_stat_heap_sym_force_incremental_marking_finish_count,
+    gc_stat_heap_sym_total_allocated_objects,
+    gc_stat_heap_sym_total_freed_objects,
+    gc_stat_heap_sym_last
+};
+
+static VALUE gc_stat_heap_symbols[gc_stat_heap_sym_last];
+
+static void
+setup_gc_stat_heap_symbols(void)
+{
+    if (gc_stat_heap_symbols[0] == 0) {
+#define S(s) gc_stat_heap_symbols[gc_stat_heap_sym_##s] = ID2SYM(rb_intern_const(#s))
+        S(slot_size);
+        S(heap_eden_pages);
+        S(heap_eden_slots);
+        S(total_allocated_pages);
+        S(force_major_gc_count);
+        S(force_incremental_marking_finish_count);
+        S(total_allocated_objects);
+        S(total_freed_objects);
+#undef S
+    }
+}
+
+static VALUE
+stat_one_heap(rb_heap_t *heap, VALUE hash, VALUE key)
+{
+#define SET(name, attr) \
+    if (key == gc_stat_heap_symbols[gc_stat_heap_sym_##name]) \
+        return SIZET2NUM(attr); \
+    else if (hash != Qnil) \
+        rb_hash_aset(hash, gc_stat_heap_symbols[gc_stat_heap_sym_##name], SIZET2NUM(attr));
+
+    SET(slot_size, heap->slot_size);
+    SET(heap_eden_pages, heap->total_pages);
+    SET(heap_eden_slots, heap->total_slots);
+    SET(total_allocated_pages, heap->total_allocated_pages);
+    SET(force_major_gc_count, heap->force_major_gc_count);
+    SET(force_incremental_marking_finish_count, heap->force_incremental_marking_finish_count);
+    SET(total_allocated_objects, heap->total_allocated_objects);
+    SET(total_freed_objects, heap->total_freed_objects);
+#undef SET
+
+    if (!NIL_P(key)) {
+        // Matched key should return above
+        return Qundef;
+    }
+
+    return hash;
+}
+
+VALUE
+rb_gc_impl_stat_heap(void *objspace_ptr, VALUE heap_name, VALUE hash_or_sym)
+{
+    rb_objspace_t *objspace = objspace_ptr;
+
+    setup_gc_stat_heap_symbols();
+
+    if (NIL_P(heap_name)) {
+        if (!RB_TYPE_P(hash_or_sym, T_HASH)) {
+            rb_bug("non-hash given");
+        }
+
+        for (int i = 0; i < HEAP_COUNT; i++) {
+            VALUE hash = rb_hash_aref(hash_or_sym, INT2FIX(i));
+            if (NIL_P(hash)) {
+                hash = rb_hash_new();
+                rb_hash_aset(hash_or_sym, INT2FIX(i), hash);
+            }
+
+            stat_one_heap(&heaps[i], hash, Qnil);
+        }
+    }
+    else if (FIXNUM_P(heap_name)) {
+        int heap_idx = FIX2INT(heap_name);
+
+        if (heap_idx < 0 || heap_idx >= HEAP_COUNT) {
+            rb_raise(rb_eArgError, "size pool index out of range");
+        }
+
+        if (SYMBOL_P(hash_or_sym)) {
+            return stat_one_heap(&heaps[heap_idx], Qnil, hash_or_sym);
+        }
+        else if (RB_TYPE_P(hash_or_sym, T_HASH)) {
+            return stat_one_heap(&heaps[heap_idx], hash_or_sym, Qnil);
+        }
+        else {
+            rb_bug("non-hash or symbol given");
+        }
+    }
+    else {
+        rb_bug("heap_name must be nil or an Integer");
+    }
+
+    return hash_or_sym;
+}
+
+/* I could include internal.h for this, but doing so undefines some Array macros
+ * necessary for initialising objects, and I don't want to include all the array
+ * headers to get them back
+ * TODO: Investigate why RARRAY_AREF gets undefined in internal.h
+ */
+#ifndef RBOOL
+#define RBOOL(v) (v ? Qtrue : Qfalse)
+#endif
+
+VALUE
+rb_gc_impl_config_get(void *objspace_ptr)
+{
+#define sym(name) ID2SYM(rb_intern_const(name))
+    rb_objspace_t *objspace = objspace_ptr;
+    VALUE hash = rb_hash_new();
+
+    rb_hash_aset(hash, sym("rgengc_allow_full_mark"), RBOOL(gc_config_full_mark_val));
+
+    return hash;
+}
+
+static int
+gc_config_set_key(VALUE key, VALUE value, VALUE data)
+{
+    rb_objspace_t *objspace = (rb_objspace_t *)data;
+    if (rb_sym2id(key) == rb_intern("rgengc_allow_full_mark")) {
+        gc_rest(objspace);
+        gc_config_full_mark_set(RTEST(value));
+    }
+    return ST_CONTINUE;
+}
+
+void
+rb_gc_impl_config_set(void *objspace_ptr, VALUE hash)
+{
+    rb_objspace_t *objspace = objspace_ptr;
+
+    if (!RB_TYPE_P(hash, T_HASH)) {
+        rb_raise(rb_eArgError, "expected keyword arguments");
+    }
+
+    rb_hash_foreach(hash, gc_config_set_key, (st_data_t)objspace);
+}
+
+VALUE
+rb_gc_impl_stress_get(void *objspace_ptr)
+{
+    rb_objspace_t *objspace = objspace_ptr;
+    return ruby_gc_stress_mode;
+}
+
+void
+rb_gc_impl_stress_set(void *objspace_ptr, VALUE flag)
+{
+    rb_objspace_t *objspace = objspace_ptr;
+
+    objspace->flags.gc_stressful = RTEST(flag);
+    objspace->gc_stress_mode = flag;
+}
+
+static int
+get_envparam_size(const char *name, size_t *default_value, size_t lower_bound)
+{
+    const char *ptr = getenv(name);
+    ssize_t val;
+
+    if (ptr != NULL && *ptr) {
+        size_t unit = 0;
+        char *end;
+#if SIZEOF_SIZE_T == SIZEOF_LONG_LONG
+        val = strtoll(ptr, &end, 0);
+#else
+        val = strtol(ptr, &end, 0);
+#endif
+        switch (*end) {
+          case 'k': case 'K':
+            unit = 1024;
+            ++end;
+            break;
+          case 'm': case 'M':
+            unit = 1024*1024;
+            ++end;
+            break;
+          case 'g': case 'G':
+            unit = 1024*1024*1024;
+            ++end;
+            break;
+        }
+        while (*end && isspace((unsigned char)*end)) end++;
+        if (*end) {
+            if (RTEST(ruby_verbose)) fprintf(stderr, "invalid string for %s: %s\n", name, ptr);
+            return 0;
+        }
+        if (unit > 0) {
+            if (val < -(ssize_t)(SIZE_MAX / 2 / unit) || (ssize_t)(SIZE_MAX / 2 / unit) < val) {
+                if (RTEST(ruby_verbose)) fprintf(stderr, "%s=%s is ignored because it overflows\n", name, ptr);
+                return 0;
+            }
+            val *= unit;
+        }
+        if (val > 0 && (size_t)val > lower_bound) {
+            if (RTEST(ruby_verbose)) {
+                fprintf(stderr, "%s=%"PRIdSIZE" (default value: %"PRIuSIZE")\n", name, val, *default_value);
+            }
+            *default_value = (size_t)val;
+            return 1;
+        }
+        else {
+            if (RTEST(ruby_verbose)) {
+                fprintf(stderr, "%s=%"PRIdSIZE" (default value: %"PRIuSIZE") is ignored because it must be greater than %"PRIuSIZE".\n",
+                        name, val, *default_value, lower_bound);
+            }
+            return 0;
+        }
+    }
+    return 0;
+}
+
+static int
+get_envparam_double(const char *name, double *default_value, double lower_bound, double upper_bound, int accept_zero)
+{
+    const char *ptr = getenv(name);
+    double val;
+
+    if (ptr != NULL && *ptr) {
+        char *end;
+        val = strtod(ptr, &end);
+        if (!*ptr || *end) {
+            if (RTEST(ruby_verbose)) fprintf(stderr, "invalid string for %s: %s\n", name, ptr);
+            return 0;
+        }
+
+        if (accept_zero && val == 0.0) {
+            goto accept;
+        }
+        else if (val <= lower_bound) {
+            if (RTEST(ruby_verbose)) {
+                fprintf(stderr, "%s=%f (default value: %f) is ignored because it must be greater than %f.\n",
+                        name, val, *default_value, lower_bound);
+            }
+        }
+        else if (upper_bound != 0.0 && /* ignore upper_bound if it is 0.0 */
+                 val > upper_bound) {
+            if (RTEST(ruby_verbose)) {
+                fprintf(stderr, "%s=%f (default value: %f) is ignored because it must be lower than %f.\n",
+                        name, val, *default_value, upper_bound);
+            }
+        }
+        else {
+            goto accept;
+        }
+    }
+    return 0;
+
+  accept:
+    if (RTEST(ruby_verbose)) fprintf(stderr, "%s=%f (default value: %f)\n", name, val, *default_value);
+    *default_value = val;
+    return 1;
+}
+
+/*
+ * GC tuning environment variables
+ *
+ * * RUBY_GC_HEAP_FREE_SLOTS
+ *   - Prepare at least this amount of slots after GC.
+ *   - Allocate slots if there are not enough slots.
+ * * RUBY_GC_HEAP_GROWTH_FACTOR (new from 2.1)
+ *   - Allocate slots by this factor.
+ *   - (next slots number) = (current slots number) * (this factor)
+ * * RUBY_GC_HEAP_GROWTH_MAX_SLOTS (new from 2.1)
+ *   - Allocation rate is limited to this number of slots.
+ * * RUBY_GC_HEAP_FREE_SLOTS_MIN_RATIO (new from 2.4)
+ *   - Allocate additional pages when the number of free slots is
+ *     lower than the value (total_slots * (this ratio)).
+ * * RUBY_GC_HEAP_FREE_SLOTS_GOAL_RATIO (new from 2.4)
+ *   - Allocate slots to satisfy this formula:
+ *       free_slots = total_slots * goal_ratio
+ *   - In other words, prepare (total_slots * goal_ratio) free slots.
+ *   - if this value is 0.0, then use RUBY_GC_HEAP_GROWTH_FACTOR directly.
+ * * RUBY_GC_HEAP_FREE_SLOTS_MAX_RATIO (new from 2.4)
+ *   - Allow to free pages when the number of free slots is
+ *     greater than the value (total_slots * (this ratio)).
+ * * RUBY_GC_HEAP_OLDOBJECT_LIMIT_FACTOR (new from 2.1.1)
+ *   - Do full GC when the number of old objects is more than R * N
+ *     where R is this factor and
+ *           N is the number of old objects just after last full GC.
+ *
+ *  * obsolete
+ *    * RUBY_FREE_MIN       -> RUBY_GC_HEAP_FREE_SLOTS (from 2.1)
+ *    * RUBY_HEAP_MIN_SLOTS -> RUBY_GC_HEAP_INIT_SLOTS (from 2.1)
+ *
+ * * RUBY_GC_MALLOC_LIMIT
+ * * RUBY_GC_MALLOC_LIMIT_MAX (new from 2.1)
+ * * RUBY_GC_MALLOC_LIMIT_GROWTH_FACTOR (new from 2.1)
+ *
+ * * RUBY_GC_OLDMALLOC_LIMIT (new from 2.1)
+ * * RUBY_GC_OLDMALLOC_LIMIT_MAX (new from 2.1)
+ * * RUBY_GC_OLDMALLOC_LIMIT_GROWTH_FACTOR (new from 2.1)
+ */
+
+void
+rb_gc_impl_set_params(void *objspace_ptr)
+{
+    rb_objspace_t *objspace = objspace_ptr;
+    /* RUBY_GC_HEAP_FREE_SLOTS */
+    if (get_envparam_size("RUBY_GC_HEAP_FREE_SLOTS", &gc_params.heap_free_slots, 0)) {
+        /* ok */
+    }
+
+    for (int i = 0; i < HEAP_COUNT; i++) {
+        char env_key[sizeof("RUBY_GC_HEAP_" "_INIT_SLOTS") + DECIMAL_SIZE_OF_BITS(sizeof(int) * CHAR_BIT)];
+        snprintf(env_key, sizeof(env_key), "RUBY_GC_HEAP_%d_INIT_SLOTS", i);
+
+        get_envparam_size(env_key, &gc_params.heap_init_slots[i], 0);
+    }
+
+    get_envparam_double("RUBY_GC_HEAP_GROWTH_FACTOR", &gc_params.growth_factor, 1.0, 0.0, FALSE);
+    get_envparam_size  ("RUBY_GC_HEAP_GROWTH_MAX_SLOTS", &gc_params.growth_max_slots, 0);
+    get_envparam_double("RUBY_GC_HEAP_FREE_SLOTS_MIN_RATIO", &gc_params.heap_free_slots_min_ratio,
+                        0.0, 1.0, FALSE);
+    get_envparam_double("RUBY_GC_HEAP_FREE_SLOTS_MAX_RATIO", &gc_params.heap_free_slots_max_ratio,
+                        gc_params.heap_free_slots_min_ratio, 1.0, FALSE);
+    get_envparam_double("RUBY_GC_HEAP_FREE_SLOTS_GOAL_RATIO", &gc_params.heap_free_slots_goal_ratio,
+                        gc_params.heap_free_slots_min_ratio, gc_params.heap_free_slots_max_ratio, TRUE);
+    get_envparam_double("RUBY_GC_HEAP_OLDOBJECT_LIMIT_FACTOR", &gc_params.oldobject_limit_factor, 0.0, 0.0, TRUE);
+    get_envparam_double("RUBY_GC_HEAP_REMEMBERED_WB_UNPROTECTED_OBJECTS_LIMIT_RATIO", &gc_params.uncollectible_wb_unprotected_objects_limit_ratio, 0.0, 0.0, TRUE);
+
+    if (get_envparam_size("RUBY_GC_MALLOC_LIMIT", &gc_params.malloc_limit_min, 0)) {
+        malloc_limit = gc_params.malloc_limit_min;
+    }
+    get_envparam_size  ("RUBY_GC_MALLOC_LIMIT_MAX", &gc_params.malloc_limit_max, 0);
+    if (!gc_params.malloc_limit_max) { /* ignore max-check if 0 */
+        gc_params.malloc_limit_max = SIZE_MAX;
+    }
+    get_envparam_double("RUBY_GC_MALLOC_LIMIT_GROWTH_FACTOR", &gc_params.malloc_limit_growth_factor, 1.0, 0.0, FALSE);
+
+#if RGENGC_ESTIMATE_OLDMALLOC
+    if (get_envparam_size("RUBY_GC_OLDMALLOC_LIMIT", &gc_params.oldmalloc_limit_min, 0)) {
+        objspace->rgengc.oldmalloc_increase_limit = gc_params.oldmalloc_limit_min;
+    }
+    get_envparam_size  ("RUBY_GC_OLDMALLOC_LIMIT_MAX", &gc_params.oldmalloc_limit_max, 0);
+    get_envparam_double("RUBY_GC_OLDMALLOC_LIMIT_GROWTH_FACTOR", &gc_params.oldmalloc_limit_growth_factor, 1.0, 0.0, FALSE);
+#endif
+}
+
+static inline size_t
+objspace_malloc_size(rb_objspace_t *objspace, void *ptr, size_t hint)
+{
+#ifdef HAVE_MALLOC_USABLE_SIZE
+    if (!hint) {
+        hint = malloc_usable_size(ptr);
+    }
+#endif
+    return hint;
+}
+
+enum memop_type {
+    MEMOP_TYPE_MALLOC  = 0,
+    MEMOP_TYPE_FREE,
+    MEMOP_TYPE_REALLOC
+};
+
+static inline void
+atomic_sub_nounderflow(size_t *var, size_t sub)
+{
+    if (sub == 0) return;
+
+    while (1) {
+        size_t val = *var;
+        if (val < sub) sub = val;
+        if (RUBY_ATOMIC_SIZE_CAS(*var, val, val-sub) == val) break;
+    }
+}
+
+#define gc_stress_full_mark_after_malloc_p() \
+    (FIXNUM_P(ruby_gc_stress_mode) && (FIX2LONG(ruby_gc_stress_mode) & (1<<gc_stress_full_mark_after_malloc)))
+
+static void
+objspace_malloc_gc_stress(rb_objspace_t *objspace)
+{
+    if (ruby_gc_stressful && ruby_native_thread_p()) {
+        unsigned int reason = (GPR_FLAG_IMMEDIATE_MARK | GPR_FLAG_IMMEDIATE_SWEEP |
+                               GPR_FLAG_STRESS | GPR_FLAG_MALLOC);
+
+        if (gc_stress_full_mark_after_malloc_p()) {
+            reason |= GPR_FLAG_FULL_MARK;
+        }
+        garbage_collect_with_gvl(objspace, reason);
+    }
+}
+
+static inline bool
+objspace_malloc_increase_report(rb_objspace_t *objspace, void *mem, size_t new_size, size_t old_size, enum memop_type type)
+{
+    if (0) fprintf(stderr, "increase - ptr: %p, type: %s, new_size: %"PRIdSIZE", old_size: %"PRIdSIZE"\n",
+                   mem,
+                   type == MEMOP_TYPE_MALLOC  ? "malloc" :
+                   type == MEMOP_TYPE_FREE    ? "free  " :
+                   type == MEMOP_TYPE_REALLOC ? "realloc": "error",
+                   new_size, old_size);
+    return false;
+}
+
+static bool
+objspace_malloc_increase_body(rb_objspace_t *objspace, void *mem, size_t new_size, size_t old_size, enum memop_type type)
+{
+    if (new_size > old_size) {
+        RUBY_ATOMIC_SIZE_ADD(malloc_increase, new_size - old_size);
+#if RGENGC_ESTIMATE_OLDMALLOC
+        RUBY_ATOMIC_SIZE_ADD(objspace->rgengc.oldmalloc_increase, new_size - old_size);
+#endif
+    }
+    else {
+        atomic_sub_nounderflow(&malloc_increase, old_size - new_size);
+#if RGENGC_ESTIMATE_OLDMALLOC
+        atomic_sub_nounderflow(&objspace->rgengc.oldmalloc_increase, old_size - new_size);
+#endif
+    }
+
+    if (type == MEMOP_TYPE_MALLOC) {
+      retry:
+        if (malloc_increase > malloc_limit && ruby_native_thread_p() && !dont_gc_val()) {
+            if (ruby_thread_has_gvl_p() && is_lazy_sweeping(objspace)) {
+                gc_rest(objspace); /* gc_rest can reduce malloc_increase */
+                goto retry;
+            }
+            garbage_collect_with_gvl(objspace, GPR_FLAG_MALLOC);
+        }
+    }
+
+#if MALLOC_ALLOCATED_SIZE
+    if (new_size >= old_size) {
+        RUBY_ATOMIC_SIZE_ADD(objspace->malloc_params.allocated_size, new_size - old_size);
+    }
+    else {
+        size_t dec_size = old_size - new_size;
+
+#if MALLOC_ALLOCATED_SIZE_CHECK
+        size_t allocated_size = objspace->malloc_params.allocated_size;
+        if (allocated_size < dec_size) {
+            rb_bug("objspace_malloc_increase: underflow malloc_params.allocated_size.");
+        }
+#endif
+        atomic_sub_nounderflow(&objspace->malloc_params.allocated_size, dec_size);
+    }
+
+    switch (type) {
+      case MEMOP_TYPE_MALLOC:
+        RUBY_ATOMIC_SIZE_INC(objspace->malloc_params.allocations);
+        break;
+      case MEMOP_TYPE_FREE:
+        {
+            size_t allocations = objspace->malloc_params.allocations;
+            if (allocations > 0) {
+                atomic_sub_nounderflow(&objspace->malloc_params.allocations, 1);
+            }
+#if MALLOC_ALLOCATED_SIZE_CHECK
+            else {
+                GC_ASSERT(objspace->malloc_params.allocations > 0);
+            }
+#endif
+        }
+        break;
+      case MEMOP_TYPE_REALLOC: /* ignore */ break;
+    }
+#endif
+    return true;
+}
+
+#define objspace_malloc_increase(...) \
+    for (bool malloc_increase_done = objspace_malloc_increase_report(__VA_ARGS__); \
+         !malloc_increase_done; \
+         malloc_increase_done = objspace_malloc_increase_body(__VA_ARGS__))
+
+struct malloc_obj_info { /* 4 words */
+    size_t size;
+};
+
+static inline size_t
+objspace_malloc_prepare(rb_objspace_t *objspace, size_t size)
+{
+    if (size == 0) size = 1;
+
+#if CALC_EXACT_MALLOC_SIZE
+    size += sizeof(struct malloc_obj_info);
+#endif
+
+    return size;
+}
+
+static bool
+malloc_during_gc_p(rb_objspace_t *objspace)
+{
+    /* malloc is not allowed during GC when we're not using multiple ractors
+     * (since ractors can run while another thread is sweeping) and when we
+     * have the GVL (since if we don't have the GVL, we'll try to acquire the
+     * GVL which will block and ensure the other thread finishes GC). */
+    return during_gc && !dont_gc_val() && !rb_gc_multi_ractor_p() && ruby_thread_has_gvl_p();
+}
+
+static inline void *
+objspace_malloc_fixup(rb_objspace_t *objspace, void *mem, size_t size)
+{
+    size = objspace_malloc_size(objspace, mem, size);
+    objspace_malloc_increase(objspace, mem, size, 0, MEMOP_TYPE_MALLOC) {}
+
+#if CALC_EXACT_MALLOC_SIZE
+    {
+        struct malloc_obj_info *info = mem;
+        info->size = size;
+        mem = info + 1;
+    }
+#endif
+
+    return mem;
+}
+
+#if defined(__GNUC__) && RUBY_DEBUG
+#define RB_BUG_INSTEAD_OF_RB_MEMERROR 1
+#endif
+
+#ifndef RB_BUG_INSTEAD_OF_RB_MEMERROR
+# define RB_BUG_INSTEAD_OF_RB_MEMERROR 0
+#endif
+
+#define GC_MEMERROR(...) \
+    ((RB_BUG_INSTEAD_OF_RB_MEMERROR+0) ? rb_bug("" __VA_ARGS__) : (void)0)
+
+#define TRY_WITH_GC(siz, expr) do {                          \
+        const gc_profile_record_flag gpr =                   \
+            GPR_FLAG_FULL_MARK           |                   \
+            GPR_FLAG_IMMEDIATE_MARK      |                   \
+            GPR_FLAG_IMMEDIATE_SWEEP     |                   \
+            GPR_FLAG_MALLOC;                                 \
+        objspace_malloc_gc_stress(objspace);                 \
+                                                             \
+        if (RB_LIKELY((expr))) {                                \
+            /* Success on 1st try */                         \
+        }                                                    \
+        else if (!garbage_collect_with_gvl(objspace, gpr)) { \
+            /* @shyouhei thinks this doesn't happen */       \
+            GC_MEMERROR("TRY_WITH_GC: could not GC");        \
+        }                                                    \
+        else if ((expr)) {                                   \
+            /* Success on 2nd try */                         \
+        }                                                    \
+        else {                                               \
+            GC_MEMERROR("TRY_WITH_GC: could not allocate:"   \
+                        "%"PRIdSIZE" bytes for %s",          \
+                        siz, # expr);                        \
+        }                                                    \
+    } while (0)
+
+static void
+check_malloc_not_in_gc(rb_objspace_t *objspace, const char *msg)
+{
+    if (RB_UNLIKELY(malloc_during_gc_p(objspace))) {
+        dont_gc_on();
+        during_gc = false;
+        rb_bug("Cannot %s during GC", msg);
+    }
+}
+
+void
+rb_gc_impl_free(void *objspace_ptr, void *ptr, size_t old_size)
+{
+    rb_objspace_t *objspace = objspace_ptr;
+
+    if (!ptr) {
+        /*
+         * ISO/IEC 9899 says "If ptr is a null pointer, no action occurs" since
+         * its first version.  We would better follow.
+         */
+        return;
+    }
+#if CALC_EXACT_MALLOC_SIZE
+    struct malloc_obj_info *info = (struct malloc_obj_info *)ptr - 1;
+    ptr = info;
+    old_size = info->size;
+#endif
+    old_size = objspace_malloc_size(objspace, ptr, old_size);
+
+    objspace_malloc_increase(objspace, ptr, 0, old_size, MEMOP_TYPE_FREE) {
+        free(ptr);
+        ptr = NULL;
+        RB_DEBUG_COUNTER_INC(heap_xfree);
+    }
+}
+
+void *
+rb_gc_impl_malloc(void *objspace_ptr, size_t size)
+{
+    rb_objspace_t *objspace = objspace_ptr;
+    check_malloc_not_in_gc(objspace, "malloc");
+
+    void *mem;
+
+    size = objspace_malloc_prepare(objspace, size);
+    TRY_WITH_GC(size, mem = malloc(size));
+    RB_DEBUG_COUNTER_INC(heap_xmalloc);
+    if (!mem) return mem;
+    return objspace_malloc_fixup(objspace, mem, size);
+}
+
+void *
+rb_gc_impl_calloc(void *objspace_ptr, size_t size)
+{
+    rb_objspace_t *objspace = objspace_ptr;
+
+    if (RB_UNLIKELY(malloc_during_gc_p(objspace))) {
+        rb_warn("calloc during GC detected, this could cause crashes if it triggers another GC");
+#if RGENGC_CHECK_MODE || RUBY_DEBUG
+        rb_bug("Cannot calloc during GC");
+#endif
+    }
+
+    void *mem;
+
+    size = objspace_malloc_prepare(objspace, size);
+    TRY_WITH_GC(size, mem = calloc1(size));
+    if (!mem) return mem;
+    return objspace_malloc_fixup(objspace, mem, size);
+}
+
+void *
+rb_gc_impl_realloc(void *objspace_ptr, void *ptr, size_t new_size, size_t old_size)
+{
+    rb_objspace_t *objspace = objspace_ptr;
+
+    check_malloc_not_in_gc(objspace, "realloc");
+
+    void *mem;
+
+    if (!ptr) return rb_gc_impl_malloc(objspace, new_size);
+
+    /*
+     * The behavior of realloc(ptr, 0) is implementation defined.
+     * Therefore we don't use realloc(ptr, 0) for portability reason.
+     * see http://www.open-std.org/jtc1/sc22/wg14/www/docs/dr_400.htm
+     */
+    if (new_size == 0) {
+        if ((mem = rb_gc_impl_malloc(objspace, 0)) != NULL) {
+            /*
+             * - OpenBSD's malloc(3) man page says that when 0 is passed, it
+             *   returns a non-NULL pointer to an access-protected memory page.
+             *   The returned pointer cannot be read / written at all, but
+             *   still be a valid argument of free().
+             *
+             *   https://man.openbsd.org/malloc.3
+             *
+             * - Linux's malloc(3) man page says that it _might_ perhaps return
+             *   a non-NULL pointer when its argument is 0.  That return value
+             *   is safe (and is expected) to be passed to free().
+             *
+             *   https://man7.org/linux/man-pages/man3/malloc.3.html
+             *
+             * - As I read the implementation jemalloc's malloc() returns fully
+             *   normal 16 bytes memory region when its argument is 0.
+             *
+             * - As I read the implementation musl libc's malloc() returns
+             *   fully normal 32 bytes memory region when its argument is 0.
+             *
+             * - Other malloc implementations can also return non-NULL.
+             */
+            rb_gc_impl_free(objspace, ptr, old_size);
+            return mem;
+        }
+        else {
+            /*
+             * It is dangerous to return NULL here, because that could lead to
+             * RCE.  Fallback to 1 byte instead of zero.
+             *
+             * https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2019-11932
+             */
+            new_size = 1;
+        }
+    }
+
+#if CALC_EXACT_MALLOC_SIZE
+    {
+        struct malloc_obj_info *info = (struct malloc_obj_info *)ptr - 1;
+        new_size += sizeof(struct malloc_obj_info);
+        ptr = info;
+        old_size = info->size;
+    }
+#endif
+
+    old_size = objspace_malloc_size(objspace, ptr, old_size);
+    TRY_WITH_GC(new_size, mem = RB_GNUC_EXTENSION_BLOCK(realloc(ptr, new_size)));
+    if (!mem) return mem;
+    new_size = objspace_malloc_size(objspace, mem, new_size);
+
+#if CALC_EXACT_MALLOC_SIZE
+    {
+        struct malloc_obj_info *info = mem;
+        info->size = new_size;
+        mem = info + 1;
+    }
+#endif
+
+    objspace_malloc_increase(objspace, mem, new_size, old_size, MEMOP_TYPE_REALLOC);
+
+    RB_DEBUG_COUNTER_INC(heap_xrealloc);
+    return mem;
+}
+
+void
+rb_gc_impl_adjust_memory_usage(void *objspace_ptr, ssize_t diff)
+{
+    rb_objspace_t *objspace = objspace_ptr;
+
+    if (diff > 0) {
+        objspace_malloc_increase(objspace, 0, diff, 0, MEMOP_TYPE_REALLOC);
+    }
+    else if (diff < 0) {
+        objspace_malloc_increase(objspace, 0, 0, -diff, MEMOP_TYPE_REALLOC);
+    }
+}
+
+// TODO: move GC profiler stuff back into gc.c
+/*
+  ------------------------------ GC profiler ------------------------------
+*/
+
+#define GC_PROFILE_RECORD_DEFAULT_SIZE 100
+
+static bool
+current_process_time(struct timespec *ts)
+{
+#if defined(HAVE_CLOCK_GETTIME) && defined(CLOCK_PROCESS_CPUTIME_ID)
+    {
+        static int try_clock_gettime = 1;
+        if (try_clock_gettime && clock_gettime(CLOCK_PROCESS_CPUTIME_ID, ts) == 0) {
+            return true;
+        }
+        else {
+            try_clock_gettime = 0;
+        }
+    }
+#endif
+
+#ifdef RUSAGE_SELF
+    {
+        struct rusage usage;
+        struct timeval time;
+        if (getrusage(RUSAGE_SELF, &usage) == 0) {
+            time = usage.ru_utime;
+            ts->tv_sec = time.tv_sec;
+            ts->tv_nsec = (int32_t)time.tv_usec * 1000;
+            return true;
+        }
+    }
+#endif
+
+#ifdef _WIN32
+    {
+        FILETIME creation_time, exit_time, kernel_time, user_time;
+        ULARGE_INTEGER ui;
+
+        if (GetProcessTimes(GetCurrentProcess(),
+                            &creation_time, &exit_time, &kernel_time, &user_time) != 0) {
+            memcpy(&ui, &user_time, sizeof(FILETIME));
+#define PER100NSEC (uint64_t)(1000 * 1000 * 10)
+            ts->tv_nsec = (long)(ui.QuadPart % PER100NSEC);
+            ts->tv_sec  = (time_t)(ui.QuadPart / PER100NSEC);
+            return true;
+        }
+    }
+#endif
+
+    return false;
+}
+
+static double
+getrusage_time(void)
+{
+    struct timespec ts;
+    if (current_process_time(&ts)) {
+        return ts.tv_sec + ts.tv_nsec * 1e-9;
+    }
+    else {
+        return 0.0;
+    }
+}
+
+
+static inline void
+gc_prof_setup_new_record(rb_objspace_t *objspace, unsigned int reason)
+{
+    if (objspace->profile.run) {
+        size_t index = objspace->profile.next_index;
+        gc_profile_record *record;
+
+        /* create new record */
+        objspace->profile.next_index++;
+
+        if (!objspace->profile.records) {
+            objspace->profile.size = GC_PROFILE_RECORD_DEFAULT_SIZE;
+            objspace->profile.records = malloc(xmalloc2_size(sizeof(gc_profile_record), objspace->profile.size));
+        }
+        if (index >= objspace->profile.size) {
+            void *ptr;
+            objspace->profile.size += 1000;
+            ptr = realloc(objspace->profile.records, xmalloc2_size(sizeof(gc_profile_record), objspace->profile.size));
+            if (!ptr) rb_memerror();
+            objspace->profile.records = ptr;
+        }
+        if (!objspace->profile.records) {
+            rb_bug("gc_profile malloc or realloc miss");
+        }
+        record = objspace->profile.current_record = &objspace->profile.records[objspace->profile.next_index - 1];
+        MEMZERO(record, gc_profile_record, 1);
+
+        /* setup before-GC parameter */
+        record->flags = reason | (ruby_gc_stressful ? GPR_FLAG_STRESS : 0);
+#if MALLOC_ALLOCATED_SIZE
+        record->allocated_size = malloc_allocated_size;
+#endif
+#if GC_PROFILE_MORE_DETAIL && GC_PROFILE_DETAIL_MEMORY
+#ifdef RUSAGE_SELF
+        {
+            struct rusage usage;
+            if (getrusage(RUSAGE_SELF, &usage) == 0) {
+                record->maxrss = usage.ru_maxrss;
+                record->minflt = usage.ru_minflt;
+                record->majflt = usage.ru_majflt;
+            }
+        }
+#endif
+#endif
+    }
+}
+
+static inline void
+gc_prof_timer_start(rb_objspace_t *objspace)
+{
+    if (gc_prof_enabled(objspace)) {
+        gc_profile_record *record = gc_prof_record(objspace);
+#if GC_PROFILE_MORE_DETAIL
+        record->prepare_time = objspace->profile.prepare_time;
+#endif
+        record->gc_time = 0;
+        record->gc_invoke_time = getrusage_time();
+    }
+}
+
+static double
+elapsed_time_from(double time)
+{
+    double now = getrusage_time();
+    if (now > time) {
+        return now - time;
+    }
+    else {
+        return 0;
+    }
+}
+
+static inline void
+gc_prof_timer_stop(rb_objspace_t *objspace)
+{
+    if (gc_prof_enabled(objspace)) {
+        gc_profile_record *record = gc_prof_record(objspace);
+        record->gc_time = elapsed_time_from(record->gc_invoke_time);
+        record->gc_invoke_time -= objspace->profile.invoke_time;
+    }
+}
+
+#ifdef BUILDING_MODULAR_GC
+# define RUBY_DTRACE_GC_HOOK(name)
+#else
+# define RUBY_DTRACE_GC_HOOK(name) \
+    do {if (RUBY_DTRACE_GC_##name##_ENABLED()) RUBY_DTRACE_GC_##name();} while (0)
+#endif
+
+static inline void
+gc_prof_mark_timer_start(rb_objspace_t *objspace)
+{
+    RUBY_DTRACE_GC_HOOK(MARK_BEGIN);
+#if GC_PROFILE_MORE_DETAIL
+    if (gc_prof_enabled(objspace)) {
+        gc_prof_record(objspace)->gc_mark_time = getrusage_time();
+    }
+#endif
+}
+
+static inline void
+gc_prof_mark_timer_stop(rb_objspace_t *objspace)
+{
+    RUBY_DTRACE_GC_HOOK(MARK_END);
+#if GC_PROFILE_MORE_DETAIL
+    if (gc_prof_enabled(objspace)) {
+        gc_profile_record *record = gc_prof_record(objspace);
+        record->gc_mark_time = elapsed_time_from(record->gc_mark_time);
+    }
+#endif
+}
+
+static inline void
+gc_prof_sweep_timer_start(rb_objspace_t *objspace)
+{
+    RUBY_DTRACE_GC_HOOK(SWEEP_BEGIN);
+    if (gc_prof_enabled(objspace)) {
+        gc_profile_record *record = gc_prof_record(objspace);
+
+        if (record->gc_time > 0 || GC_PROFILE_MORE_DETAIL) {
+            objspace->profile.gc_sweep_start_time = getrusage_time();
+        }
+    }
+}
+
+static inline void
+gc_prof_sweep_timer_stop(rb_objspace_t *objspace)
+{
+    RUBY_DTRACE_GC_HOOK(SWEEP_END);
+
+    if (gc_prof_enabled(objspace)) {
+        double sweep_time;
+        gc_profile_record *record = gc_prof_record(objspace);
+
+        if (record->gc_time > 0) {
+            sweep_time = elapsed_time_from(objspace->profile.gc_sweep_start_time);
+            /* need to accumulate GC time for lazy sweep after gc() */
+            record->gc_time += sweep_time;
+        }
+        else if (GC_PROFILE_MORE_DETAIL) {
+            sweep_time = elapsed_time_from(objspace->profile.gc_sweep_start_time);
+        }
+
+#if GC_PROFILE_MORE_DETAIL
+        record->gc_sweep_time += sweep_time;
+        if (heap_pages_deferred_final) record->flags |= GPR_FLAG_HAVE_FINALIZE;
+#endif
+        if (heap_pages_deferred_final) objspace->profile.latest_gc_info |= GPR_FLAG_HAVE_FINALIZE;
+    }
+}
+
+static inline void
+gc_prof_set_malloc_info(rb_objspace_t *objspace)
+{
+#if GC_PROFILE_MORE_DETAIL
+    if (gc_prof_enabled(objspace)) {
+        gc_profile_record *record = gc_prof_record(objspace);
+        record->allocate_increase = malloc_increase;
+        record->allocate_limit = malloc_limit;
+    }
+#endif
+}
+
+static inline void
+gc_prof_set_heap_info(rb_objspace_t *objspace)
+{
+    if (gc_prof_enabled(objspace)) {
+        gc_profile_record *record = gc_prof_record(objspace);
+        size_t live = objspace->profile.total_allocated_objects_at_gc_start - total_freed_objects(objspace);
+        size_t total = objspace->profile.heap_used_at_gc_start * HEAP_PAGE_OBJ_LIMIT;
+
+#if GC_PROFILE_MORE_DETAIL
+        record->heap_use_pages = objspace->profile.heap_used_at_gc_start;
+        record->heap_live_objects = live;
+        record->heap_free_objects = total - live;
+#endif
+
+        record->heap_total_objects = total;
+        record->heap_use_size = live * BASE_SLOT_SIZE;
+        record->heap_total_size = total * BASE_SLOT_SIZE;
+    }
+}
+
+/*
+ *  call-seq:
+ *    GC::Profiler.clear          -> nil
+ *
+ *  Clears the \GC profiler data.
+ *
+ */
+
+static VALUE
+gc_profile_clear(VALUE _)
+{
+    rb_objspace_t *objspace = rb_gc_get_objspace();
+    void *p = objspace->profile.records;
+    objspace->profile.records = NULL;
+    objspace->profile.size = 0;
+    objspace->profile.next_index = 0;
+    objspace->profile.current_record = 0;
+    free(p);
+    return Qnil;
+}
+
+/*
+ *  call-seq:
+ *     GC::Profiler.raw_data	-> [Hash, ...]
+ *
+ *  Returns an Array of individual raw profile data Hashes ordered
+ *  from earliest to latest by +:GC_INVOKE_TIME+.
+ *
+ *  For example:
+ *
+ *    [
+ *	{
+ *	   :GC_TIME=>1.3000000000000858e-05,
+ *	   :GC_INVOKE_TIME=>0.010634999999999999,
+ *	   :HEAP_USE_SIZE=>289640,
+ *	   :HEAP_TOTAL_SIZE=>588960,
+ *	   :HEAP_TOTAL_OBJECTS=>14724,
+ *	   :GC_IS_MARKED=>false
+ *	},
+ *      # ...
+ *    ]
+ *
+ *  The keys mean:
+ *
+ *  +:GC_TIME+::
+ *	Time elapsed in seconds for this GC run
+ *  +:GC_INVOKE_TIME+::
+ *	Time elapsed in seconds from startup to when the GC was invoked
+ *  +:HEAP_USE_SIZE+::
+ *	Total bytes of heap used
+ *  +:HEAP_TOTAL_SIZE+::
+ *	Total size of heap in bytes
+ *  +:HEAP_TOTAL_OBJECTS+::
+ *	Total number of objects
+ *  +:GC_IS_MARKED+::
+ *	Returns +true+ if the GC is in mark phase
+ *
+ *  If ruby was built with +GC_PROFILE_MORE_DETAIL+, you will also have access
+ *  to the following hash keys:
+ *
+ *  +:GC_MARK_TIME+::
+ *  +:GC_SWEEP_TIME+::
+ *  +:ALLOCATE_INCREASE+::
+ *  +:ALLOCATE_LIMIT+::
+ *  +:HEAP_USE_PAGES+::
+ *  +:HEAP_LIVE_OBJECTS+::
+ *  +:HEAP_FREE_OBJECTS+::
+ *  +:HAVE_FINALIZE+::
+ *
+ */
+
+static VALUE
+gc_profile_record_get(VALUE _)
+{
+    VALUE prof;
+    VALUE gc_profile = rb_ary_new();
+    size_t i;
+    rb_objspace_t *objspace = rb_gc_get_objspace();
+
+    if (!objspace->profile.run) {
+        return Qnil;
+    }
+
+    for (i =0; i < objspace->profile.next_index; i++) {
+        gc_profile_record *record = &objspace->profile.records[i];
+
+        prof = rb_hash_new();
+        rb_hash_aset(prof, ID2SYM(rb_intern("GC_FLAGS")), gc_info_decode(objspace, rb_hash_new(), record->flags));
+        rb_hash_aset(prof, ID2SYM(rb_intern("GC_TIME")), DBL2NUM(record->gc_time));
+        rb_hash_aset(prof, ID2SYM(rb_intern("GC_INVOKE_TIME")), DBL2NUM(record->gc_invoke_time));
+        rb_hash_aset(prof, ID2SYM(rb_intern("HEAP_USE_SIZE")), SIZET2NUM(record->heap_use_size));
+        rb_hash_aset(prof, ID2SYM(rb_intern("HEAP_TOTAL_SIZE")), SIZET2NUM(record->heap_total_size));
+        rb_hash_aset(prof, ID2SYM(rb_intern("HEAP_TOTAL_OBJECTS")), SIZET2NUM(record->heap_total_objects));
+        rb_hash_aset(prof, ID2SYM(rb_intern("MOVED_OBJECTS")), SIZET2NUM(record->moved_objects));
+        rb_hash_aset(prof, ID2SYM(rb_intern("GC_IS_MARKED")), Qtrue);
+#if GC_PROFILE_MORE_DETAIL
+        rb_hash_aset(prof, ID2SYM(rb_intern("GC_MARK_TIME")), DBL2NUM(record->gc_mark_time));
+        rb_hash_aset(prof, ID2SYM(rb_intern("GC_SWEEP_TIME")), DBL2NUM(record->gc_sweep_time));
+        rb_hash_aset(prof, ID2SYM(rb_intern("ALLOCATE_INCREASE")), SIZET2NUM(record->allocate_increase));
+        rb_hash_aset(prof, ID2SYM(rb_intern("ALLOCATE_LIMIT")), SIZET2NUM(record->allocate_limit));
+        rb_hash_aset(prof, ID2SYM(rb_intern("HEAP_USE_PAGES")), SIZET2NUM(record->heap_use_pages));
+        rb_hash_aset(prof, ID2SYM(rb_intern("HEAP_LIVE_OBJECTS")), SIZET2NUM(record->heap_live_objects));
+        rb_hash_aset(prof, ID2SYM(rb_intern("HEAP_FREE_OBJECTS")), SIZET2NUM(record->heap_free_objects));
+
+        rb_hash_aset(prof, ID2SYM(rb_intern("REMOVING_OBJECTS")), SIZET2NUM(record->removing_objects));
+        rb_hash_aset(prof, ID2SYM(rb_intern("EMPTY_OBJECTS")), SIZET2NUM(record->empty_objects));
+
+        rb_hash_aset(prof, ID2SYM(rb_intern("HAVE_FINALIZE")), (record->flags & GPR_FLAG_HAVE_FINALIZE) ? Qtrue : Qfalse);
+#endif
+
+#if RGENGC_PROFILE > 0
+        rb_hash_aset(prof, ID2SYM(rb_intern("OLD_OBJECTS")), SIZET2NUM(record->old_objects));
+        rb_hash_aset(prof, ID2SYM(rb_intern("REMEMBERED_NORMAL_OBJECTS")), SIZET2NUM(record->remembered_normal_objects));
+        rb_hash_aset(prof, ID2SYM(rb_intern("REMEMBERED_SHADY_OBJECTS")), SIZET2NUM(record->remembered_shady_objects));
+#endif
+        rb_ary_push(gc_profile, prof);
+    }
+
+    return gc_profile;
+}
+
+#if GC_PROFILE_MORE_DETAIL
+#define MAJOR_REASON_MAX 0x10
+
+static char *
+gc_profile_dump_major_reason(unsigned int flags, char *buff)
+{
+    unsigned int reason = flags & GPR_FLAG_MAJOR_MASK;
+    int i = 0;
+
+    if (reason == GPR_FLAG_NONE) {
+        buff[0] = '-';
+        buff[1] = 0;
+    }
+    else {
+#define C(x, s) \
+  if (reason & GPR_FLAG_MAJOR_BY_##x) { \
+      buff[i++] = #x[0]; \
+      if (i >= MAJOR_REASON_MAX) rb_bug("gc_profile_dump_major_reason: overflow"); \
+      buff[i] = 0; \
+  }
+        C(NOFREE, N);
+        C(OLDGEN, O);
+        C(SHADY,  S);
+#if RGENGC_ESTIMATE_OLDMALLOC
+        C(OLDMALLOC, M);
+#endif
+#undef C
+    }
+    return buff;
+}
+#endif
+
+
+
+static void
+gc_profile_dump_on(VALUE out, VALUE (*append)(VALUE, VALUE))
+{
+    rb_objspace_t *objspace = rb_gc_get_objspace();
+    size_t count = objspace->profile.next_index;
+#ifdef MAJOR_REASON_MAX
+    char reason_str[MAJOR_REASON_MAX];
+#endif
+
+    if (objspace->profile.run && count /* > 1 */) {
+        size_t i;
+        const gc_profile_record *record;
+
+        append(out, rb_sprintf("GC %"PRIuSIZE" invokes.\n", objspace->profile.count));
+        append(out, rb_str_new_cstr("Index    Invoke Time(sec)       Use Size(byte)     Total Size(byte)         Total Object                    GC Time(ms)\n"));
+
+        for (i = 0; i < count; i++) {
+            record = &objspace->profile.records[i];
+            append(out, rb_sprintf("%5"PRIuSIZE" %19.3f %20"PRIuSIZE" %20"PRIuSIZE" %20"PRIuSIZE" %30.20f\n",
+                                   i+1, record->gc_invoke_time, record->heap_use_size,
+                                   record->heap_total_size, record->heap_total_objects, record->gc_time*1000));
+        }
+
+#if GC_PROFILE_MORE_DETAIL
+        const char *str = "\n\n" \
+                                    "More detail.\n" \
+                                    "Prepare Time = Previously GC's rest sweep time\n"
+                                    "Index Flags          Allocate Inc.  Allocate Limit"
+#if CALC_EXACT_MALLOC_SIZE
+                                    "  Allocated Size"
+#endif
+                                    "  Use Page     Mark Time(ms)    Sweep Time(ms)  Prepare Time(ms)  LivingObj    FreeObj RemovedObj   EmptyObj"
+#if RGENGC_PROFILE
+                                    " OldgenObj RemNormObj RemShadObj"
+#endif
+#if GC_PROFILE_DETAIL_MEMORY
+                                    " MaxRSS(KB) MinorFLT MajorFLT"
+#endif
+                                    "\n";
+        append(out, rb_str_new_cstr(str));
+
+        for (i = 0; i < count; i++) {
+            record = &objspace->profile.records[i];
+            append(out, rb_sprintf("%5"PRIuSIZE" %4s/%c/%6s%c %13"PRIuSIZE" %15"PRIuSIZE
+#if CALC_EXACT_MALLOC_SIZE
+                                   " %15"PRIuSIZE
+#endif
+                                   " %9"PRIuSIZE" %17.12f %17.12f %17.12f %10"PRIuSIZE" %10"PRIuSIZE" %10"PRIuSIZE" %10"PRIuSIZE
+#if RGENGC_PROFILE
+                                   "%10"PRIuSIZE" %10"PRIuSIZE" %10"PRIuSIZE
+#endif
+#if GC_PROFILE_DETAIL_MEMORY
+                                   "%11ld %8ld %8ld"
+#endif
+
+                                   "\n",
+                                   i+1,
+                                   gc_profile_dump_major_reason(record->flags, reason_str),
+                                   (record->flags & GPR_FLAG_HAVE_FINALIZE) ? 'F' : '.',
+                                   (record->flags & GPR_FLAG_NEWOBJ) ? "NEWOBJ" :
+                                   (record->flags & GPR_FLAG_MALLOC) ? "MALLOC" :
+                                   (record->flags & GPR_FLAG_METHOD) ? "METHOD" :
+                                   (record->flags & GPR_FLAG_CAPI)   ? "CAPI__" : "??????",
+                                   (record->flags & GPR_FLAG_STRESS) ? '!' : ' ',
+                                   record->allocate_increase, record->allocate_limit,
+#if CALC_EXACT_MALLOC_SIZE
+                                   record->allocated_size,
+#endif
+                                   record->heap_use_pages,
+                                   record->gc_mark_time*1000,
+                                   record->gc_sweep_time*1000,
+                                   record->prepare_time*1000,
+
+                                   record->heap_live_objects,
+                                   record->heap_free_objects,
+                                   record->removing_objects,
+                                   record->empty_objects
+#if RGENGC_PROFILE
+                                   ,
+                                   record->old_objects,
+                                   record->remembered_normal_objects,
+                                   record->remembered_shady_objects
+#endif
+#if GC_PROFILE_DETAIL_MEMORY
+                                   ,
+                                   record->maxrss / 1024,
+                                   record->minflt,
+                                   record->majflt
+#endif
+
+                       ));
+        }
+#endif
+    }
+}
+
+/*
+ *  call-seq:
+ *     GC::Profiler.result  -> String
+ *
+ *  Returns a profile data report such as:
+ *
+ *    GC 1 invokes.
+ *    Index    Invoke Time(sec)       Use Size(byte)     Total Size(byte)         Total Object                    GC time(ms)
+ *        1               0.012               159240               212940                10647         0.00000000000001530000
+ */
+
+static VALUE
+gc_profile_result(VALUE _)
+{
+    VALUE str = rb_str_buf_new(0);
+    gc_profile_dump_on(str, rb_str_buf_append);
+    return str;
+}
+
+/*
+ *  call-seq:
+ *     GC::Profiler.report
+ *     GC::Profiler.report(io)
+ *
+ *  Writes the GC::Profiler.result to <tt>$stdout</tt> or the given IO object.
+ *
+ */
+
+static VALUE
+gc_profile_report(int argc, VALUE *argv, VALUE self)
+{
+    VALUE out;
+
+    out = (!rb_check_arity(argc, 0, 1) ? rb_stdout : argv[0]);
+    gc_profile_dump_on(out, rb_io_write);
+
+    return Qnil;
+}
+
+/*
+ *  call-seq:
+ *     GC::Profiler.total_time	-> float
+ *
+ *  The total time used for garbage collection in seconds
+ */
+
+static VALUE
+gc_profile_total_time(VALUE self)
+{
+    double time = 0;
+    rb_objspace_t *objspace = rb_gc_get_objspace();
+
+    if (objspace->profile.run && objspace->profile.next_index > 0) {
+        size_t i;
+        size_t count = objspace->profile.next_index;
+
+        for (i = 0; i < count; i++) {
+            time += objspace->profile.records[i].gc_time;
+        }
+    }
+    return DBL2NUM(time);
+}
+
+/*
+ *  call-seq:
+ *    GC::Profiler.enabled?	-> true or false
+ *
+ *  The current status of \GC profile mode.
+ */
+
+static VALUE
+gc_profile_enable_get(VALUE self)
+{
+    rb_objspace_t *objspace = rb_gc_get_objspace();
+    return objspace->profile.run ? Qtrue : Qfalse;
+}
+
+/*
+ *  call-seq:
+ *    GC::Profiler.enable	-> nil
+ *
+ *  Starts the \GC profiler.
+ *
+ */
+
+static VALUE
+gc_profile_enable(VALUE _)
+{
+    rb_objspace_t *objspace = rb_gc_get_objspace();
+    objspace->profile.run = TRUE;
+    objspace->profile.current_record = 0;
+    return Qnil;
+}
+
+/*
+ *  call-seq:
+ *    GC::Profiler.disable	-> nil
+ *
+ *  Stops the \GC profiler.
+ *
+ */
+
+static VALUE
+gc_profile_disable(VALUE _)
+{
+    rb_objspace_t *objspace = rb_gc_get_objspace();
+
+    objspace->profile.run = FALSE;
+    objspace->profile.current_record = 0;
+    return Qnil;
+}
+
+/*
+ *  call-seq:
+ *     GC.verify_internal_consistency                  -> nil
+ *
+ *  Verify internal consistency.
+ *
+ *  This method is implementation specific.
+ *  Now this method checks generational consistency
+ *  if RGenGC is supported.
+ */
+static VALUE
+gc_verify_internal_consistency_m(VALUE dummy)
+{
+    gc_verify_internal_consistency(rb_gc_get_objspace());
+    return Qnil;
+}
+
+#if GC_CAN_COMPILE_COMPACTION
+/*
+ *  call-seq:
+ *     GC.auto_compact = flag
+ *
+ *  Updates automatic compaction mode.
+ *
+ *  When enabled, the compactor will execute on every major collection.
+ *
+ *  Enabling compaction will degrade performance on major collections.
+ */
+static VALUE
+gc_set_auto_compact(VALUE _, VALUE v)
+{
+    GC_ASSERT(GC_COMPACTION_SUPPORTED);
+
+    ruby_enable_autocompact = RTEST(v);
+
+#if RGENGC_CHECK_MODE
+    ruby_autocompact_compare_func = NULL;
+
+    if (SYMBOL_P(v)) {
+        ID id = RB_SYM2ID(v);
+        if (id == rb_intern("empty")) {
+            ruby_autocompact_compare_func = compare_free_slots;
+        }
+    }
+#endif
+
+    return v;
+}
+#else
+#  define gc_set_auto_compact rb_f_notimplement
+#endif
+
+#if GC_CAN_COMPILE_COMPACTION
+/*
+ *  call-seq:
+ *     GC.auto_compact    -> true or false
+ *
+ *  Returns whether or not automatic compaction has been enabled.
+ */
+static VALUE
+gc_get_auto_compact(VALUE _)
+{
+    return ruby_enable_autocompact ? Qtrue : Qfalse;
+}
+#else
+#  define gc_get_auto_compact rb_f_notimplement
+#endif
+
+#if GC_CAN_COMPILE_COMPACTION
+/*
+ *  call-seq:
+ *     GC.latest_compact_info -> hash
+ *
+ * Returns information about object moved in the most recent \GC compaction.
+ *
+ * The returned +hash+ contains the following keys:
+ *
+ * [considered]
+ *   Hash containing the type of the object as the key and the number of
+ *   objects of that type that were considered for movement.
+ * [moved]
+ *   Hash containing the type of the object as the key and the number of
+ *   objects of that type that were actually moved.
+ * [moved_up]
+ *   Hash containing the type of the object as the key and the number of
+ *   objects of that type that were increased in size.
+ * [moved_down]
+ *   Hash containing the type of the object as the key and the number of
+ *   objects of that type that were decreased in size.
+ *
+ * Some objects can't be moved (due to pinning) so these numbers can be used to
+ * calculate compaction efficiency.
+ */
+static VALUE
+gc_compact_stats(VALUE self)
+{
+    rb_objspace_t *objspace = rb_gc_get_objspace();
+    VALUE h = rb_hash_new();
+    VALUE considered = rb_hash_new();
+    VALUE moved = rb_hash_new();
+    VALUE moved_up = rb_hash_new();
+    VALUE moved_down = rb_hash_new();
+
+    for (size_t i = 0; i < T_MASK; i++) {
+        if (objspace->rcompactor.considered_count_table[i]) {
+            rb_hash_aset(considered, type_sym(i), SIZET2NUM(objspace->rcompactor.considered_count_table[i]));
+        }
+
+        if (objspace->rcompactor.moved_count_table[i]) {
+            rb_hash_aset(moved, type_sym(i), SIZET2NUM(objspace->rcompactor.moved_count_table[i]));
+        }
+
+        if (objspace->rcompactor.moved_up_count_table[i]) {
+            rb_hash_aset(moved_up, type_sym(i), SIZET2NUM(objspace->rcompactor.moved_up_count_table[i]));
+        }
+
+        if (objspace->rcompactor.moved_down_count_table[i]) {
+            rb_hash_aset(moved_down, type_sym(i), SIZET2NUM(objspace->rcompactor.moved_down_count_table[i]));
+        }
+    }
+
+    rb_hash_aset(h, ID2SYM(rb_intern("considered")), considered);
+    rb_hash_aset(h, ID2SYM(rb_intern("moved")), moved);
+    rb_hash_aset(h, ID2SYM(rb_intern("moved_up")), moved_up);
+    rb_hash_aset(h, ID2SYM(rb_intern("moved_down")), moved_down);
+
+    return h;
+}
+#else
+#  define gc_compact_stats rb_f_notimplement
+#endif
+
+#if GC_CAN_COMPILE_COMPACTION
+/*
+ *  call-seq:
+ *     GC.compact -> hash
+ *
+ * This function compacts objects together in Ruby's heap. It eliminates
+ * unused space (or fragmentation) in the heap by moving objects in to that
+ * unused space.
+ *
+ * The returned +hash+ contains statistics about the objects that were moved;
+ * see GC.latest_compact_info.
+ *
+ * This method is only expected to work on CRuby.
+ *
+ * To test whether \GC compaction is supported, use the idiom:
+ *
+ *   GC.respond_to?(:compact)
+ */
+static VALUE
+gc_compact(VALUE self)
+{
+    rb_objspace_t *objspace = rb_gc_get_objspace();
+    int full_marking_p = gc_config_full_mark_val;
+    gc_config_full_mark_set(TRUE);
+
+    /* Run GC with compaction enabled */
+    rb_gc_impl_start(rb_gc_get_objspace(), true, true, true, true);
+    gc_config_full_mark_set(full_marking_p);
+
+    return gc_compact_stats(self);
+}
+#else
+#  define gc_compact rb_f_notimplement
+#endif
+
+#if GC_CAN_COMPILE_COMPACTION
+struct desired_compaction_pages_i_data {
+    rb_objspace_t *objspace;
+    size_t required_slots[HEAP_COUNT];
+};
+
+static int
+desired_compaction_pages_i(struct heap_page *page, void *data)
+{
+    struct desired_compaction_pages_i_data *tdata = data;
+    rb_objspace_t *objspace = tdata->objspace;
+    VALUE vstart = (VALUE)page->start;
+    VALUE vend = vstart + (VALUE)(page->total_slots * page->heap->slot_size);
+
+
+    for (VALUE v = vstart; v != vend; v += page->heap->slot_size) {
+        asan_unpoisoning_object(v) {
+            /* skip T_NONEs; they won't be moved */
+            if (BUILTIN_TYPE(v) != T_NONE) {
+                rb_heap_t *dest_pool = gc_compact_destination_pool(objspace, page->heap, v);
+                size_t dest_pool_idx = dest_pool - heaps;
+                tdata->required_slots[dest_pool_idx]++;
+            }
+        }
+    }
+
+    return 0;
+}
+
+/* call-seq:
+ *    GC.verify_compaction_references(toward: nil, double_heap: false) -> hash
+ *
+ * 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 expands 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 self)
+{
+    static ID keywords[3] = {0};
+    if (!keywords[0]) {
+        keywords[0] = rb_intern("toward");
+        keywords[1] = rb_intern("double_heap");
+        keywords[2] = rb_intern("expand_heap");
+    }
+
+    VALUE options;
+    rb_scan_args_kw(rb_keyword_given_p(), argc, argv, ":", &options);
+
+    VALUE arguments[3] = { Qnil, Qfalse, Qfalse };
+    int kwarg_count = rb_get_kwargs(options, keywords, 0, 3, arguments);
+    bool toward_empty = kwarg_count > 0 && SYMBOL_P(arguments[0]) && SYM2ID(arguments[0]) == rb_intern("empty");
+    bool expand_heap = (kwarg_count > 1 && RTEST(arguments[1])) || (kwarg_count > 2 && RTEST(arguments[2]));
+
+    rb_objspace_t *objspace = rb_gc_get_objspace();
+
+    /* Clear the heap. */
+    rb_gc_impl_start(objspace, true, true, true, false);
+
+    unsigned int lev = RB_GC_VM_LOCK();
+    {
+        gc_rest(objspace);
+
+        /* if both double_heap and expand_heap are set, expand_heap takes precedence */
+        if (expand_heap) {
+            struct desired_compaction_pages_i_data desired_compaction = {
+                .objspace = objspace,
+                .required_slots = {0},
+            };
+            /* Work out how many objects want to be in each size pool, taking account of moves */
+            objspace_each_pages(objspace, desired_compaction_pages_i, &desired_compaction, TRUE);
+
+            /* Find out which pool has the most pages */
+            size_t max_existing_pages = 0;
+            for (int i = 0; i < HEAP_COUNT; i++) {
+                rb_heap_t *heap = &heaps[i];
+                max_existing_pages = MAX(max_existing_pages, heap->total_pages);
+            }
+
+            /* Add pages to each size pool so that compaction is guaranteed to move every object */
+            for (int i = 0; i < HEAP_COUNT; i++) {
+                rb_heap_t *heap = &heaps[i];
+
+                size_t pages_to_add = 0;
+                /*
+                 * Step 1: Make sure every pool has the same number of pages, by adding empty pages
+                 * to smaller pools. This is required to make sure the compact cursor can advance
+                 * through all of the pools in `gc_sweep_compact` without hitting the "sweep &
+                 * compact cursors met" condition on some pools before fully compacting others
+                 */
+                pages_to_add += max_existing_pages - heap->total_pages;
+                /*
+                 * Step 2: Now add additional free pages to each size pool sufficient to hold all objects
+                 * that want to be in that size pool, whether moved into it or moved within it
+                 */
+                objspace->heap_pages.allocatable_slots = desired_compaction.required_slots[i];
+                while (objspace->heap_pages.allocatable_slots > 0) {
+                    heap_page_allocate_and_initialize(objspace, heap);
+                }
+                /*
+                 * Step 3: Add two more pages so that the compact & sweep cursors will meet _after_ all objects
+                 * have been moved, and not on the last iteration of the `gc_sweep_compact` loop
+                 */
+                pages_to_add += 2;
+
+                for (; pages_to_add > 0; pages_to_add--) {
+                    heap_page_allocate_and_initialize_force(objspace, heap);
+                }
+            }
+        }
+
+        if (toward_empty) {
+            objspace->rcompactor.compare_func = compare_free_slots;
+        }
+    }
+    RB_GC_VM_UNLOCK(lev);
+
+    rb_gc_impl_start(rb_gc_get_objspace(), true, true, true, true);
+
+    rb_objspace_reachable_objects_from_root(root_obj_check_moved_i, objspace);
+    objspace_each_objects(objspace, heap_check_moved_i, objspace, TRUE);
+
+    objspace->rcompactor.compare_func = NULL;
+
+    return gc_compact_stats(self);
+}
+#else
+# define gc_verify_compaction_references rb_f_notimplement
+#endif
+
+void
+rb_gc_impl_objspace_free(void *objspace_ptr)
+{
+    rb_objspace_t *objspace = objspace_ptr;
+
+    if (is_lazy_sweeping(objspace))
+        rb_bug("lazy sweeping underway when freeing object space");
+
+    free(objspace->profile.records);
+    objspace->profile.records = NULL;
+
+    for (size_t i = 0; i < rb_darray_size(objspace->heap_pages.sorted); i++) {
+        heap_page_free(objspace, rb_darray_get(objspace->heap_pages.sorted, i));
+    }
+    rb_darray_free_without_gc(objspace->heap_pages.sorted);
+    heap_pages_lomem = 0;
+    heap_pages_himem = 0;
+
+    for (int i = 0; i < HEAP_COUNT; i++) {
+        rb_heap_t *heap = &heaps[i];
+        heap->total_pages = 0;
+        heap->total_slots = 0;
+    }
+
+    free_stack_chunks(&objspace->mark_stack);
+    mark_stack_free_cache(&objspace->mark_stack);
+
+    rb_darray_free_without_gc(objspace->weak_references);
+
+    free(objspace);
+}
+
+#if MALLOC_ALLOCATED_SIZE
+/*
+ *  call-seq:
+ *     GC.malloc_allocated_size -> Integer
+ *
+ *  Returns the size of memory allocated by malloc().
+ *
+ *  Only available if ruby was built with +CALC_EXACT_MALLOC_SIZE+.
+ */
+
+static VALUE
+gc_malloc_allocated_size(VALUE self)
+{
+    rb_objspace_t *objspace = (rb_objspace_t *)rb_gc_get_objspace();
+    return ULL2NUM(objspace->malloc_params.allocated_size);
+}
+
+/*
+ *  call-seq:
+ *     GC.malloc_allocations -> Integer
+ *
+ *  Returns the number of malloc() allocations.
+ *
+ *  Only available if ruby was built with +CALC_EXACT_MALLOC_SIZE+.
+ */
+
+static VALUE
+gc_malloc_allocations(VALUE self)
+{
+    rb_objspace_t *objspace = (rb_objspace_t *)rb_gc_get_objspace();
+    return ULL2NUM(objspace->malloc_params.allocations);
+}
+#endif
+
+void rb_gc_impl_before_fork(void *objspace_ptr) { /* no-op */ }
+void rb_gc_impl_after_fork(void *objspace_ptr, rb_pid_t pid) {
+    if (pid == 0) { /* child process */
+        rb_gc_ractor_newobj_cache_foreach(gc_ractor_newobj_cache_clear, NULL);
+    }
+}
+
+VALUE rb_ident_hash_new_with_size(st_index_t size);
+
+/*
+ *  call-seq:
+ *    GC.add_stress_to_class(class[, ...])
+ *
+ *  Raises NoMemoryError when allocating an instance of the given classes.
+ *
+ */
+static VALUE
+rb_gcdebug_add_stress_to_class(int argc, VALUE *argv, VALUE self)
+{
+    rb_objspace_t *objspace = rb_gc_get_objspace();
+
+    if (!stress_to_class) {
+        set_stress_to_class(rb_ident_hash_new_with_size(argc));
+    }
+
+    for (int i = 0; i < argc; i++) {
+        VALUE klass = argv[i];
+        rb_hash_aset(stress_to_class, klass, Qtrue);
+    }
+
+    return self;
+}
+
+/*
+ *  call-seq:
+ *    GC.remove_stress_to_class(class[, ...])
+ *
+ *  No longer raises NoMemoryError when allocating an instance of the
+ *  given classes.
+ *
+ */
+static VALUE
+rb_gcdebug_remove_stress_to_class(int argc, VALUE *argv, VALUE self)
+{
+    rb_objspace_t *objspace = rb_gc_get_objspace();
+
+    if (stress_to_class) {
+        for (int i = 0; i < argc; ++i) {
+            rb_hash_delete(stress_to_class, argv[i]);
+        }
+
+        if (rb_hash_size(stress_to_class) == 0) {
+            stress_to_class = 0;
+        }
+    }
+
+    return Qnil;
+}
+
+void *
+rb_gc_impl_objspace_alloc(void)
+{
+    rb_objspace_t *objspace = calloc1(sizeof(rb_objspace_t));
+
+    return objspace;
+}
+
+void
+rb_gc_impl_objspace_init(void *objspace_ptr)
+{
+    rb_objspace_t *objspace = objspace_ptr;
+
+    gc_config_full_mark_set(TRUE);
+
+    objspace->flags.measure_gc = true;
+    malloc_limit = gc_params.malloc_limit_min;
+    objspace->finalize_deferred_pjob = rb_postponed_job_preregister(0, gc_finalize_deferred, objspace);
+    if (objspace->finalize_deferred_pjob == POSTPONED_JOB_HANDLE_INVALID) {
+        rb_bug("Could not preregister postponed job for GC");
+    }
+
+    for (int i = 0; i < HEAP_COUNT; i++) {
+        rb_heap_t *heap = &heaps[i];
+
+        heap->slot_size = (1 << i) * BASE_SLOT_SIZE;
+
+        ccan_list_head_init(&heap->pages);
+    }
+
+    rb_darray_make_without_gc(&objspace->heap_pages.sorted, 0);
+    rb_darray_make_without_gc(&objspace->weak_references, 0);
+
+    // TODO: debug why on Windows Ruby crashes on boot when GC is on.
+#ifdef _WIN32
+    dont_gc_on();
+#endif
+
+#if defined(INIT_HEAP_PAGE_ALLOC_USE_MMAP)
+    /* Need to determine if we can use mmap at runtime. */
+    heap_page_alloc_use_mmap = INIT_HEAP_PAGE_ALLOC_USE_MMAP;
+#endif
+#if RGENGC_ESTIMATE_OLDMALLOC
+    objspace->rgengc.oldmalloc_increase_limit = gc_params.oldmalloc_limit_min;
+#endif
+    /* Set size pools allocatable pages. */
+    for (int i = 0; i < HEAP_COUNT; i++) {
+        /* Set the default value of heap_init_slots. */
+        gc_params.heap_init_slots[i] = GC_HEAP_INIT_SLOTS;
+    }
+
+    init_mark_stack(&objspace->mark_stack);
+
+    objspace->profile.invoke_time = getrusage_time();
+    finalizer_table = st_init_numtable();
+}
+
+void
+rb_gc_impl_init(void)
+{
+    VALUE 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("BASE_SLOT_SIZE")), SIZET2NUM(BASE_SLOT_SIZE - RVALUE_OVERHEAD));
+    rb_hash_aset(gc_constants, ID2SYM(rb_intern("RBASIC_SIZE")), SIZET2NUM(sizeof(struct RBasic)));
+    rb_hash_aset(gc_constants, ID2SYM(rb_intern("RVALUE_OVERHEAD")), SIZET2NUM(RVALUE_OVERHEAD));
+    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));
+    rb_hash_aset(gc_constants, ID2SYM(rb_intern("HEAP_PAGE_SIZE")), SIZET2NUM(HEAP_PAGE_SIZE));
+    rb_hash_aset(gc_constants, ID2SYM(rb_intern("HEAP_COUNT")), LONG2FIX(HEAP_COUNT));
+    rb_hash_aset(gc_constants, ID2SYM(rb_intern("RVARGC_MAX_ALLOCATE_SIZE")), LONG2FIX(heap_slot_size(HEAP_COUNT - 1)));
+    rb_hash_aset(gc_constants, ID2SYM(rb_intern("RVALUE_OLD_AGE")), LONG2FIX(RVALUE_OLD_AGE));
+    if (RB_BUG_INSTEAD_OF_RB_MEMERROR+0) {
+        rb_hash_aset(gc_constants, ID2SYM(rb_intern("RB_BUG_INSTEAD_OF_RB_MEMERROR")), Qtrue);
+    }
+    OBJ_FREEZE(gc_constants);
+    /* Internal constants in the garbage collector. */
+    rb_define_const(rb_mGC, "INTERNAL_CONSTANTS", gc_constants);
+
+    if (GC_COMPACTION_SUPPORTED) {
+        rb_define_singleton_method(rb_mGC, "compact", gc_compact, 0);
+        rb_define_singleton_method(rb_mGC, "auto_compact", gc_get_auto_compact, 0);
+        rb_define_singleton_method(rb_mGC, "auto_compact=", gc_set_auto_compact, 1);
+        rb_define_singleton_method(rb_mGC, "latest_compact_info", gc_compact_stats, 0);
+        rb_define_singleton_method(rb_mGC, "verify_compaction_references", gc_verify_compaction_references, -1);
+    }
+    else {
+        rb_define_singleton_method(rb_mGC, "compact", rb_f_notimplement, 0);
+        rb_define_singleton_method(rb_mGC, "auto_compact", rb_f_notimplement, 0);
+        rb_define_singleton_method(rb_mGC, "auto_compact=", rb_f_notimplement, 1);
+        rb_define_singleton_method(rb_mGC, "latest_compact_info", rb_f_notimplement, 0);
+        rb_define_singleton_method(rb_mGC, "verify_compaction_references", rb_f_notimplement, -1);
+    }
+
+    if (GC_DEBUG_STRESS_TO_CLASS) {
+        rb_define_singleton_method(rb_mGC, "add_stress_to_class", rb_gcdebug_add_stress_to_class, -1);
+        rb_define_singleton_method(rb_mGC, "remove_stress_to_class", rb_gcdebug_remove_stress_to_class, -1);
+    }
+
+    /* internal methods */
+    rb_define_singleton_method(rb_mGC, "verify_internal_consistency", gc_verify_internal_consistency_m, 0);
+
+#if MALLOC_ALLOCATED_SIZE
+    rb_define_singleton_method(rb_mGC, "malloc_allocated_size", gc_malloc_allocated_size, 0);
+    rb_define_singleton_method(rb_mGC, "malloc_allocations", gc_malloc_allocations, 0);
+#endif
+
+    VALUE rb_mProfiler = rb_define_module_under(rb_mGC, "Profiler");
+    rb_define_singleton_method(rb_mProfiler, "enabled?", gc_profile_enable_get, 0);
+    rb_define_singleton_method(rb_mProfiler, "enable", gc_profile_enable, 0);
+    rb_define_singleton_method(rb_mProfiler, "raw_data", gc_profile_record_get, 0);
+    rb_define_singleton_method(rb_mProfiler, "disable", gc_profile_disable, 0);
+    rb_define_singleton_method(rb_mProfiler, "clear", gc_profile_clear, 0);
+    rb_define_singleton_method(rb_mProfiler, "result", gc_profile_result, 0);
+    rb_define_singleton_method(rb_mProfiler, "report", gc_profile_report, -1);
+    rb_define_singleton_method(rb_mProfiler, "total_time", gc_profile_total_time, 0);
+
+    {
+        VALUE opts;
+        /* \GC build options */
+        rb_define_const(rb_mGC, "OPTS", opts = rb_ary_new());
+#define OPT(o) if (o) rb_ary_push(opts, rb_interned_str(#o, sizeof(#o) - 1))
+        OPT(GC_DEBUG);
+        OPT(USE_RGENGC);
+        OPT(RGENGC_DEBUG);
+        OPT(RGENGC_CHECK_MODE);
+        OPT(RGENGC_PROFILE);
+        OPT(RGENGC_ESTIMATE_OLDMALLOC);
+        OPT(GC_PROFILE_MORE_DETAIL);
+        OPT(GC_ENABLE_LAZY_SWEEP);
+        OPT(CALC_EXACT_MALLOC_SIZE);
+        OPT(MALLOC_ALLOCATED_SIZE);
+        OPT(MALLOC_ALLOCATED_SIZE_CHECK);
+        OPT(GC_PROFILE_DETAIL_MEMORY);
+        OPT(GC_COMPACTION_SUPPORTED);
+#undef OPT
+        OBJ_FREEZE(opts);
+    }
+}
diff --git a/gc/default/extconf.rb b/gc/default/extconf.rb
new file mode 100644
index 00000000000000..2940a4c96273e0
--- /dev/null
+++ b/gc/default/extconf.rb
@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+
+require_relative "../extconf_base"
+
+create_gc_makefile("default")
diff --git a/gc/extconf_base.rb b/gc/extconf_base.rb
new file mode 100644
index 00000000000000..2a224b9b0e310f
--- /dev/null
+++ b/gc/extconf_base.rb
@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+require "mkmf"
+
+srcdir = File.join(__dir__, "..")
+$INCFLAGS << " -I#{srcdir}"
+
+$CPPFLAGS << " -DBUILDING_MODULAR_GC"
+
+append_cflags("-fPIC")
+
+def create_gc_makefile(name, &block)
+  create_makefile("librubygc.#{name}", &block)
+end
diff --git a/gc/gc.h b/gc/gc.h
new file mode 100644
index 00000000000000..fe9aaeb96538a5
--- /dev/null
+++ b/gc/gc.h
@@ -0,0 +1,259 @@
+#ifndef GC_GC_H
+#define GC_GC_H
+/**
+ * @author     Ruby developers <ruby-core@ruby-lang.org>
+ * @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.
+ * @brief      Private header for the default GC and other GC implementations
+ *             first introduced for [Feature #20470].
+ */
+#include "ruby/ruby.h"
+
+#if USE_MODULAR_GC
+#include "ruby/thread_native.h"
+
+struct rb_gc_vm_context {
+    rb_nativethread_lock_t lock;
+
+    struct rb_execution_context_struct *ec;
+};
+#endif
+
+typedef int (*vm_table_foreach_callback_func)(VALUE value, void *data);
+typedef int (*vm_table_update_callback_func)(VALUE *value, void *data);
+
+enum rb_gc_vm_weak_tables {
+    RB_GC_VM_CI_TABLE,
+    RB_GC_VM_OVERLOADED_CME_TABLE,
+    RB_GC_VM_GLOBAL_SYMBOLS_TABLE,
+    RB_GC_VM_ID2REF_TABLE,
+    RB_GC_VM_GENERIC_FIELDS_TABLE,
+    RB_GC_VM_FROZEN_STRINGS_TABLE,
+    RB_GC_VM_CC_REFINEMENT_TABLE,
+    RB_GC_VM_WEAK_TABLE_COUNT
+};
+
+#define RB_GC_VM_LOCK() rb_gc_vm_lock(__FILE__, __LINE__)
+#define RB_GC_VM_UNLOCK(lev) rb_gc_vm_unlock(lev, __FILE__, __LINE__)
+#define RB_GC_CR_LOCK() rb_gc_cr_lock(__FILE__, __LINE__)
+#define RB_GC_CR_UNLOCK(lev) rb_gc_cr_unlock(lev, __FILE__, __LINE__)
+#define RB_GC_VM_LOCK_NO_BARRIER() rb_gc_vm_lock_no_barrier(__FILE__, __LINE__)
+#define RB_GC_VM_UNLOCK_NO_BARRIER(lev) rb_gc_vm_unlock_no_barrier(lev, __FILE__, __LINE__)
+
+#if USE_MODULAR_GC
+# define MODULAR_GC_FN
+#else
+// This takes advantage of internal linkage winning when appearing first.
+// See C99 6.2.2p4.
+# define MODULAR_GC_FN static
+#endif
+
+#if USE_MODULAR_GC
+RUBY_SYMBOL_EXPORT_BEGIN
+#endif
+
+// These functions cannot be defined as static because they are used by other
+// files in Ruby.
+size_t rb_size_mul_or_raise(size_t x, size_t y, VALUE exc);
+void rb_objspace_reachable_objects_from(VALUE obj, void (func)(VALUE, void *), void *data);
+void rb_obj_info_dump(VALUE obj);
+const char *rb_obj_info(VALUE obj);
+size_t rb_obj_memsize_of(VALUE obj);
+bool ruby_free_at_exit_p(void);
+void rb_objspace_reachable_objects_from_root(void (func)(const char *category, VALUE, void *), void *passing_data);
+
+MODULAR_GC_FN unsigned int rb_gc_vm_lock(const char *file, int line);
+MODULAR_GC_FN void rb_gc_vm_unlock(unsigned int lev, const char *file, int line);
+MODULAR_GC_FN unsigned int rb_gc_cr_lock(const char *file, int line);
+MODULAR_GC_FN void rb_gc_cr_unlock(unsigned int lev, const char *file, int line);
+MODULAR_GC_FN unsigned int rb_gc_vm_lock_no_barrier(const char *file, int line);
+MODULAR_GC_FN void rb_gc_vm_unlock_no_barrier(unsigned int lev, const char *file, int line);
+MODULAR_GC_FN void rb_gc_vm_barrier(void);
+MODULAR_GC_FN size_t rb_gc_obj_optimal_size(VALUE obj);
+MODULAR_GC_FN void rb_gc_mark_children(void *objspace, VALUE obj);
+MODULAR_GC_FN void rb_gc_vm_weak_table_foreach(vm_table_foreach_callback_func callback, vm_table_update_callback_func update_callback, void *data, bool weak_only, enum rb_gc_vm_weak_tables table);
+MODULAR_GC_FN void rb_gc_update_object_references(void *objspace, VALUE obj);
+MODULAR_GC_FN void rb_gc_update_vm_references(void *objspace);
+MODULAR_GC_FN void rb_gc_event_hook(VALUE obj, rb_event_flag_t event);
+MODULAR_GC_FN void *rb_gc_get_objspace(void);
+MODULAR_GC_FN void rb_gc_run_obj_finalizer(VALUE objid, long count, VALUE (*callback)(long i, void *data), void *data);
+MODULAR_GC_FN void rb_gc_set_pending_interrupt(void);
+MODULAR_GC_FN void rb_gc_unset_pending_interrupt(void);
+MODULAR_GC_FN void rb_gc_obj_free_vm_weak_references(VALUE obj);
+MODULAR_GC_FN bool rb_gc_obj_free(void *objspace, VALUE obj);
+MODULAR_GC_FN void rb_gc_save_machine_context(void);
+MODULAR_GC_FN void rb_gc_mark_roots(void *objspace, const char **categoryp);
+MODULAR_GC_FN void rb_gc_ractor_newobj_cache_foreach(void (*func)(void *cache, void *data), void *data);
+MODULAR_GC_FN bool rb_gc_multi_ractor_p(void);
+MODULAR_GC_FN bool rb_gc_shutdown_call_finalizer_p(VALUE obj);
+MODULAR_GC_FN uint32_t rb_gc_get_shape(VALUE obj);
+MODULAR_GC_FN void rb_gc_set_shape(VALUE obj, uint32_t shape_id);
+MODULAR_GC_FN uint32_t rb_gc_rebuild_shape(VALUE obj, size_t heap_id);
+MODULAR_GC_FN void rb_gc_prepare_heap_process_object(VALUE obj);
+MODULAR_GC_FN bool rb_memerror_reentered(void);
+MODULAR_GC_FN bool rb_obj_id_p(VALUE);
+MODULAR_GC_FN void rb_gc_before_updating_jit_code(void);
+MODULAR_GC_FN void rb_gc_after_updating_jit_code(void);
+
+#if USE_MODULAR_GC
+MODULAR_GC_FN bool rb_gc_event_hook_required_p(rb_event_flag_t event);
+MODULAR_GC_FN void *rb_gc_get_ractor_newobj_cache(void);
+MODULAR_GC_FN void rb_gc_initialize_vm_context(struct rb_gc_vm_context *context);
+MODULAR_GC_FN void rb_gc_worker_thread_set_vm_context(struct rb_gc_vm_context *context);
+MODULAR_GC_FN void rb_gc_worker_thread_unset_vm_context(struct rb_gc_vm_context *context);
+#endif
+
+#if USE_MODULAR_GC
+RUBY_SYMBOL_EXPORT_END
+#endif
+
+void rb_ractor_finish_marking(void);
+
+// -------------------Private section begin------------------------
+// Functions in this section are private to the default GC and gc.c
+
+#ifdef BUILDING_MODULAR_GC
+RBIMPL_WARNING_PUSH()
+RBIMPL_WARNING_IGNORED(-Wunused-function)
+#endif
+
+/* RGENGC_CHECK_MODE
+ * 0: disable all assertions
+ * 1: enable assertions (to debug RGenGC)
+ * 2: enable internal consistency check at each GC (for debugging)
+ * 3: enable internal consistency check at each GC steps (for debugging)
+ * 4: enable liveness check
+ * 5: show all references
+ */
+#ifndef RGENGC_CHECK_MODE
+# define RGENGC_CHECK_MODE  0
+#endif
+
+#ifndef GC_ASSERT
+# define GC_ASSERT(expr, ...) RUBY_ASSERT_MESG_WHEN(RGENGC_CHECK_MODE > 0, expr, #expr RBIMPL_VA_OPT_ARGS(__VA_ARGS__))
+#endif
+
+static int
+hash_foreach_replace_value(st_data_t key, st_data_t value, st_data_t argp, int error)
+{
+    if (rb_gc_location((VALUE)value) != (VALUE)value) {
+        return ST_REPLACE;
+    }
+    return ST_CONTINUE;
+}
+
+static int
+hash_replace_ref_value(st_data_t *key, st_data_t *value, st_data_t argp, int existing)
+{
+    *value = rb_gc_location((VALUE)*value);
+
+    return ST_CONTINUE;
+}
+
+static void
+gc_ref_update_table_values_only(st_table *tbl)
+{
+    if (!tbl || tbl->num_entries == 0) return;
+
+    if (st_foreach_with_replace(tbl, hash_foreach_replace_value, hash_replace_ref_value, 0)) {
+        rb_raise(rb_eRuntimeError, "hash modified during iteration");
+    }
+}
+
+static int
+gc_mark_tbl_no_pin_i(st_data_t key, st_data_t value, st_data_t data)
+{
+    rb_gc_mark_movable((VALUE)value);
+
+    return ST_CONTINUE;
+}
+
+static int
+hash_foreach_replace(st_data_t key, st_data_t value, st_data_t argp, int error)
+{
+    if (rb_gc_location((VALUE)key) != (VALUE)key) {
+        return ST_REPLACE;
+    }
+
+    if (rb_gc_location((VALUE)value) != (VALUE)value) {
+        return ST_REPLACE;
+    }
+
+    return ST_CONTINUE;
+}
+
+static int
+hash_replace_ref(st_data_t *key, st_data_t *value, st_data_t argp, int existing)
+{
+    if (rb_gc_location((VALUE)*key) != (VALUE)*key) {
+        *key = rb_gc_location((VALUE)*key);
+    }
+
+    if (rb_gc_location((VALUE)*value) != (VALUE)*value) {
+        *value = rb_gc_location((VALUE)*value);
+    }
+
+    return ST_CONTINUE;
+}
+
+static void
+gc_update_table_refs(st_table *tbl)
+{
+    if (!tbl || tbl->num_entries == 0) return;
+
+    if (st_foreach_with_replace(tbl, hash_foreach_replace, hash_replace_ref, 0)) {
+        rb_raise(rb_eRuntimeError, "hash modified during iteration");
+    }
+}
+
+static inline size_t
+xmalloc2_size(const size_t count, const size_t elsize)
+{
+    return rb_size_mul_or_raise(count, elsize, rb_eArgError);
+}
+
+static VALUE
+type_sym(size_t type)
+{
+    switch (type) {
+#define COUNT_TYPE(t) case (t): return ID2SYM(rb_intern(#t)); break;
+        COUNT_TYPE(T_NONE);
+        COUNT_TYPE(T_OBJECT);
+        COUNT_TYPE(T_CLASS);
+        COUNT_TYPE(T_MODULE);
+        COUNT_TYPE(T_FLOAT);
+        COUNT_TYPE(T_STRING);
+        COUNT_TYPE(T_REGEXP);
+        COUNT_TYPE(T_ARRAY);
+        COUNT_TYPE(T_HASH);
+        COUNT_TYPE(T_STRUCT);
+        COUNT_TYPE(T_BIGNUM);
+        COUNT_TYPE(T_FILE);
+        COUNT_TYPE(T_DATA);
+        COUNT_TYPE(T_MATCH);
+        COUNT_TYPE(T_COMPLEX);
+        COUNT_TYPE(T_RATIONAL);
+        COUNT_TYPE(T_NIL);
+        COUNT_TYPE(T_TRUE);
+        COUNT_TYPE(T_FALSE);
+        COUNT_TYPE(T_SYMBOL);
+        COUNT_TYPE(T_FIXNUM);
+        COUNT_TYPE(T_IMEMO);
+        COUNT_TYPE(T_UNDEF);
+        COUNT_TYPE(T_NODE);
+        COUNT_TYPE(T_ICLASS);
+        COUNT_TYPE(T_ZOMBIE);
+        COUNT_TYPE(T_MOVED);
+#undef COUNT_TYPE
+        default:              return SIZET2NUM(type); break;
+    }
+}
+
+#ifdef BUILDING_MODULAR_GC
+RBIMPL_WARNING_POP()
+#endif
+// -------------------Private section end------------------------
+
+#endif
diff --git a/gc/gc_impl.h b/gc/gc_impl.h
new file mode 100644
index 00000000000000..d1ae7983a26b94
--- /dev/null
+++ b/gc/gc_impl.h
@@ -0,0 +1,124 @@
+#ifndef GC_GC_IMPL_H
+#define GC_GC_IMPL_H
+/**
+ * @author     Ruby developers <ruby-core@ruby-lang.org>
+ * @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.
+ * @brief      Header for GC implementations introduced in [Feature #20470].
+ */
+#include "ruby/ruby.h"
+
+#ifndef RB_GC_OBJECT_METADATA_ENTRY_DEFINED
+# define RB_GC_OBJECT_METADATA_ENTRY_DEFINED
+struct rb_gc_object_metadata_entry {
+    ID name;
+    VALUE val;
+};
+#endif
+
+#ifdef BUILDING_MODULAR_GC
+# define GC_IMPL_FN
+#else
+// `GC_IMPL_FN` is an implementation detail of `!USE_MODULAR_GC` builds
+// to have the default GC in the same translation unit as gc.c for
+// the sake of optimizer visibility. It expands to nothing unless
+// you're the default GC.
+//
+// For the default GC, do not copy-paste this when implementing
+// these functions. This takes advantage of internal linkage winning
+// when appearing first. See C99 6.2.2p4.
+# define GC_IMPL_FN static
+#endif
+
+// Bootup
+GC_IMPL_FN void *rb_gc_impl_objspace_alloc(void);
+GC_IMPL_FN void rb_gc_impl_objspace_init(void *objspace_ptr);
+GC_IMPL_FN void *rb_gc_impl_ractor_cache_alloc(void *objspace_ptr, void *ractor);
+GC_IMPL_FN void rb_gc_impl_set_params(void *objspace_ptr);
+GC_IMPL_FN void rb_gc_impl_init(void);
+GC_IMPL_FN size_t *rb_gc_impl_heap_sizes(void *objspace_ptr);
+// Shutdown
+GC_IMPL_FN void rb_gc_impl_shutdown_free_objects(void *objspace_ptr);
+GC_IMPL_FN void rb_gc_impl_objspace_free(void *objspace_ptr);
+GC_IMPL_FN void rb_gc_impl_ractor_cache_free(void *objspace_ptr, void *cache);
+// GC
+GC_IMPL_FN void rb_gc_impl_start(void *objspace_ptr, bool full_mark, bool immediate_mark, bool immediate_sweep, bool compact);
+GC_IMPL_FN bool rb_gc_impl_during_gc_p(void *objspace_ptr);
+GC_IMPL_FN void rb_gc_impl_prepare_heap(void *objspace_ptr);
+GC_IMPL_FN void rb_gc_impl_gc_enable(void *objspace_ptr);
+GC_IMPL_FN void rb_gc_impl_gc_disable(void *objspace_ptr, bool finish_current_gc);
+GC_IMPL_FN bool rb_gc_impl_gc_enabled_p(void *objspace_ptr);
+GC_IMPL_FN void rb_gc_impl_stress_set(void *objspace_ptr, VALUE flag);
+GC_IMPL_FN VALUE rb_gc_impl_stress_get(void *objspace_ptr);
+GC_IMPL_FN VALUE rb_gc_impl_config_get(void *objspace_ptr);
+GC_IMPL_FN void rb_gc_impl_config_set(void *objspace_ptr, VALUE hash);
+// Object allocation
+GC_IMPL_FN VALUE rb_gc_impl_new_obj(void *objspace_ptr, void *cache_ptr, VALUE klass, VALUE flags, VALUE v1, VALUE v2, VALUE v3, bool wb_protected, size_t alloc_size);
+GC_IMPL_FN size_t rb_gc_impl_obj_slot_size(VALUE obj);
+GC_IMPL_FN size_t rb_gc_impl_heap_id_for_size(void *objspace_ptr, size_t size);
+GC_IMPL_FN bool rb_gc_impl_size_allocatable_p(size_t size);
+// Malloc
+/*
+ * BEWARE: These functions may or may not run under GVL.
+ *
+ * You might want to make them thread-safe.
+ * Garbage collecting inside is possible if and only if you
+ * already have GVL.  Also raising exceptions without one is a
+ * total disaster.
+ *
+ * When you absolutely cannot allocate the requested amount of
+ * memory just return NULL (with appropriate errno set).
+ * The caller side takes care of that situation.
+ */
+GC_IMPL_FN void *rb_gc_impl_malloc(void *objspace_ptr, size_t size);
+GC_IMPL_FN void *rb_gc_impl_calloc(void *objspace_ptr, size_t size);
+GC_IMPL_FN void *rb_gc_impl_realloc(void *objspace_ptr, void *ptr, size_t new_size, size_t old_size);
+GC_IMPL_FN void rb_gc_impl_free(void *objspace_ptr, void *ptr, size_t old_size);
+GC_IMPL_FN void rb_gc_impl_adjust_memory_usage(void *objspace_ptr, ssize_t diff);
+// Marking
+GC_IMPL_FN void rb_gc_impl_mark(void *objspace_ptr, VALUE obj);
+GC_IMPL_FN void rb_gc_impl_mark_and_move(void *objspace_ptr, VALUE *ptr);
+GC_IMPL_FN void rb_gc_impl_mark_and_pin(void *objspace_ptr, VALUE obj);
+GC_IMPL_FN void rb_gc_impl_mark_maybe(void *objspace_ptr, VALUE obj);
+GC_IMPL_FN void rb_gc_impl_mark_weak(void *objspace_ptr, VALUE *ptr);
+GC_IMPL_FN void rb_gc_impl_remove_weak(void *objspace_ptr, VALUE parent_obj, VALUE *ptr);
+// Compaction
+GC_IMPL_FN bool rb_gc_impl_object_moved_p(void *objspace_ptr, VALUE obj);
+GC_IMPL_FN VALUE rb_gc_impl_location(void *objspace_ptr, VALUE value);
+// Write barriers
+GC_IMPL_FN void rb_gc_impl_writebarrier(void *objspace_ptr, VALUE a, VALUE b);
+GC_IMPL_FN void rb_gc_impl_writebarrier_unprotect(void *objspace_ptr, VALUE obj);
+GC_IMPL_FN void rb_gc_impl_writebarrier_remember(void *objspace_ptr, VALUE obj);
+// Heap walking
+GC_IMPL_FN void rb_gc_impl_each_objects(void *objspace_ptr, int (*callback)(void *, void *, size_t, void *), void *data);
+GC_IMPL_FN void rb_gc_impl_each_object(void *objspace_ptr, void (*func)(VALUE obj, void *data), void *data);
+// Finalizers
+GC_IMPL_FN void rb_gc_impl_make_zombie(void *objspace_ptr, VALUE obj, void (*dfree)(void *), void *data);
+GC_IMPL_FN VALUE rb_gc_impl_define_finalizer(void *objspace_ptr, VALUE obj, VALUE block);
+GC_IMPL_FN void rb_gc_impl_undefine_finalizer(void *objspace_ptr, VALUE obj);
+GC_IMPL_FN void rb_gc_impl_copy_finalizer(void *objspace_ptr, VALUE dest, VALUE obj);
+GC_IMPL_FN void rb_gc_impl_shutdown_call_finalizer(void *objspace_ptr);
+// Forking
+GC_IMPL_FN void rb_gc_impl_before_fork(void *objspace_ptr);
+GC_IMPL_FN void rb_gc_impl_after_fork(void *objspace_ptr, rb_pid_t pid);
+// Statistics
+GC_IMPL_FN void rb_gc_impl_set_measure_total_time(void *objspace_ptr, VALUE flag);
+GC_IMPL_FN bool rb_gc_impl_get_measure_total_time(void *objspace_ptr);
+GC_IMPL_FN unsigned long long rb_gc_impl_get_total_time(void *objspace_ptr);
+GC_IMPL_FN size_t rb_gc_impl_gc_count(void *objspace_ptr);
+GC_IMPL_FN VALUE rb_gc_impl_latest_gc_info(void *objspace_ptr, VALUE key);
+GC_IMPL_FN VALUE rb_gc_impl_stat(void *objspace_ptr, VALUE hash_or_sym);
+GC_IMPL_FN VALUE rb_gc_impl_stat_heap(void *objspace_ptr, VALUE heap_name, VALUE hash_or_sym);
+GC_IMPL_FN const char *rb_gc_impl_active_gc_name(void);
+// Miscellaneous
+GC_IMPL_FN struct rb_gc_object_metadata_entry *rb_gc_impl_object_metadata(void *objspace_ptr, VALUE obj);
+GC_IMPL_FN bool rb_gc_impl_pointer_to_heap_p(void *objspace_ptr, const void *ptr);
+GC_IMPL_FN bool rb_gc_impl_garbage_object_p(void *objspace_ptr, VALUE obj);
+GC_IMPL_FN void rb_gc_impl_set_event_hook(void *objspace_ptr, const rb_event_flag_t event);
+GC_IMPL_FN void rb_gc_impl_copy_attributes(void *objspace_ptr, VALUE dest, VALUE obj);
+
+#undef GC_IMPL_FN
+
+#endif
diff --git a/gc/mmtk/.gitignore b/gc/mmtk/.gitignore
new file mode 100644
index 00000000000000..eb5a316cbd195d
--- /dev/null
+++ b/gc/mmtk/.gitignore
@@ -0,0 +1 @@
+target
diff --git a/gc/mmtk/Cargo.lock b/gc/mmtk/Cargo.lock
new file mode 100644
index 00000000000000..f7d62ddacb1428
--- /dev/null
+++ b/gc/mmtk/Cargo.lock
@@ -0,0 +1,1107 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+version = 4
+
+[[package]]
+name = "aho-corasick"
+version = "1.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916"
+dependencies = [
+ "memchr",
+]
+
+[[package]]
+name = "anstream"
+version = "0.6.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8acc5369981196006228e28809f761875c0327210a891e941f4c683b3a99529b"
+dependencies = [
+ "anstyle",
+ "anstyle-parse",
+ "anstyle-query",
+ "anstyle-wincon",
+ "colorchoice",
+ "is_terminal_polyfill",
+ "utf8parse",
+]
+
+[[package]]
+name = "anstyle"
+version = "1.0.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "55cc3b69f167a1ef2e161439aa98aed94e6028e5f9a59be9a6ffb47aef1651f9"
+
+[[package]]
+name = "anstyle-parse"
+version = "0.2.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3b2d16507662817a6a20a9ea92df6652ee4f94f914589377d69f3b21bc5798a9"
+dependencies = [
+ "utf8parse",
+]
+
+[[package]]
+name = "anstyle-query"
+version = "1.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "79947af37f4177cfead1110013d678905c37501914fba0efea834c3fe9a8d60c"
+dependencies = [
+ "windows-sys",
+]
+
+[[package]]
+name = "anstyle-wincon"
+version = "3.0.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6680de5231bd6ee4c6191b8a1325daa282b415391ec9d3a37bd34f2060dc73fa"
+dependencies = [
+ "anstyle",
+ "once_cell_polyfill",
+ "windows-sys",
+]
+
+[[package]]
+name = "atomic"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8d818003e740b63afc82337e3160717f4f63078720a810b7b903e70a5d1d2994"
+dependencies = [
+ "bytemuck",
+]
+
+[[package]]
+name = "atomic-traits"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "707f750b93bd1b739cf9ddf85f8fe7c97a4a62c60ccf8b6f232514bd9103bedc"
+dependencies = [
+ "cfg-if",
+ "rustc_version",
+]
+
+[[package]]
+name = "atomic_refcell"
+version = "0.1.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "41e67cd8309bbd06cd603a9e693a784ac2e5d1e955f11286e355089fcab3047c"
+
+[[package]]
+name = "autocfg"
+version = "1.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
+
+[[package]]
+name = "bitflags"
+version = "2.9.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1b8e56985ec62d17e9c1001dc89c88ecd7dc08e47eba5ec7c29c7b5eeecde967"
+
+[[package]]
+name = "built"
+version = "0.7.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "56ed6191a7e78c36abdb16ab65341eefd73d64d303fffccdbb00d51e4205967b"
+dependencies = [
+ "git2",
+]
+
+[[package]]
+name = "bytemuck"
+version = "1.23.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9134a6ef01ce4b366b50689c94f82c14bc72bc5d0386829828a2e2752ef7958c"
+dependencies = [
+ "bytemuck_derive",
+]
+
+[[package]]
+name = "bytemuck_derive"
+version = "1.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3fa76293b4f7bb636ab88fd78228235b5248b4d05cc589aed610f954af5d7c7a"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.101",
+]
+
+[[package]]
+name = "cc"
+version = "1.2.24"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "16595d3be041c03b09d08d0858631facccee9221e579704070e6e9e4915d3bc7"
+dependencies = [
+ "jobserver",
+ "libc",
+ "shlex",
+]
+
+[[package]]
+name = "cfg-if"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
+
+[[package]]
+name = "colorchoice"
+version = "1.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5b63caa9aa9397e2d9480a9b13673856c78d8ac123288526c37d7839f2a86990"
+
+[[package]]
+name = "core-foundation-sys"
+version = "0.8.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b"
+
+[[package]]
+name = "crossbeam"
+version = "0.8.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1137cd7e7fc0fb5d3c5a8678be38ec56e819125d8d7907411fe24ccb943faca8"
+dependencies = [
+ "crossbeam-channel",
+ "crossbeam-deque",
+ "crossbeam-epoch",
+ "crossbeam-queue",
+ "crossbeam-utils",
+]
+
+[[package]]
+name = "crossbeam-channel"
+version = "0.5.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "82b8f8f868b36967f9606790d1903570de9ceaf870a7bf9fbbd3016d636a2cb2"
+dependencies = [
+ "crossbeam-utils",
+]
+
+[[package]]
+name = "crossbeam-deque"
+version = "0.8.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9dd111b7b7f7d55b72c0a6ae361660ee5853c9af73f70c3c2ef6858b950e2e51"
+dependencies = [
+ "crossbeam-epoch",
+ "crossbeam-utils",
+]
+
+[[package]]
+name = "crossbeam-epoch"
+version = "0.9.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e"
+dependencies = [
+ "crossbeam-utils",
+]
+
+[[package]]
+name = "crossbeam-queue"
+version = "0.3.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0f58bbc28f91df819d0aa2a2c00cd19754769c2fad90579b3592b1c9ba7a3115"
+dependencies = [
+ "crossbeam-utils",
+]
+
+[[package]]
+name = "crossbeam-utils"
+version = "0.8.21"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d0a5c400df2834b80a4c3327b3aad3a4c4cd4de0629063962b03235697506a28"
+
+[[package]]
+name = "delegate"
+version = "0.13.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b9b6483c2bbed26f97861cf57651d4f2b731964a28cd2257f934a4b452480d21"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.101",
+]
+
+[[package]]
+name = "downcast-rs"
+version = "2.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ea8a8b81cacc08888170eef4d13b775126db426d0b348bee9d18c2c1eaf123cf"
+
+[[package]]
+name = "either"
+version = "1.15.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "48c757948c5ede0e46177b7add2e67155f70e33c07fea8284df6576da70b3719"
+
+[[package]]
+name = "enum-map"
+version = "2.7.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6866f3bfdf8207509a033af1a75a7b08abda06bbaaeae6669323fd5a097df2e9"
+dependencies = [
+ "enum-map-derive",
+]
+
+[[package]]
+name = "enum-map-derive"
+version = "0.17.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f282cfdfe92516eb26c2af8589c274c7c17681f5ecc03c18255fe741c6aa64eb"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.101",
+]
+
+[[package]]
+name = "env_filter"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "186e05a59d4c50738528153b83b0b0194d3a29507dfec16eccd4b342903397d0"
+dependencies = [
+ "log",
+ "regex",
+]
+
+[[package]]
+name = "env_logger"
+version = "0.11.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "13c863f0904021b108aa8b2f55046443e6b1ebde8fd4a15c399893aae4fa069f"
+dependencies = [
+ "anstream",
+ "anstyle",
+ "env_filter",
+ "jiff",
+ "log",
+]
+
+[[package]]
+name = "form_urlencoded"
+version = "1.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456"
+dependencies = [
+ "percent-encoding",
+]
+
+[[package]]
+name = "getrandom"
+version = "0.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "26145e563e54f2cadc477553f1ec5ee650b00862f0a58bcd12cbdc5f0ea2d2f4"
+dependencies = [
+ "cfg-if",
+ "libc",
+ "r-efi",
+ "wasi",
+]
+
+[[package]]
+name = "git2"
+version = "0.20.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2deb07a133b1520dc1a5690e9bd08950108873d7ed5de38dcc74d3b5ebffa110"
+dependencies = [
+ "bitflags",
+ "libc",
+ "libgit2-sys",
+ "log",
+ "url",
+]
+
+[[package]]
+name = "heck"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
+
+[[package]]
+name = "hermit-abi"
+version = "0.3.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024"
+
+[[package]]
+name = "hermit-abi"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f154ce46856750ed433c8649605bf7ed2de3bc35fd9d2a9f30cddd873c80cb08"
+
+[[package]]
+name = "idna"
+version = "1.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "686f825264d630750a544639377bae737628043f20d38bbc029e8f29ea968a7e"
+dependencies = [
+ "idna_adapter",
+ "smallvec",
+ "utf8_iter",
+]
+
+[[package]]
+name = "idna_adapter"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "279259b0ac81c89d11c290495fdcfa96ea3643b7df311c138b6fe8ca5237f0f8"
+dependencies = [
+ "idna_mapping",
+ "unicode-bidi",
+ "unicode-normalization",
+]
+
+[[package]]
+name = "idna_mapping"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "11c13906586a4b339310541a274dd927aff6fcbb5b8e3af90634c4b31681c792"
+dependencies = [
+ "unicode-joining-type",
+]
+
+[[package]]
+name = "is-terminal"
+version = "0.4.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e04d7f318608d35d4b61ddd75cbdaee86b023ebe2bd5a66ee0915f0bf93095a9"
+dependencies = [
+ "hermit-abi 0.5.1",
+ "libc",
+ "windows-sys",
+]
+
+[[package]]
+name = "is_terminal_polyfill"
+version = "1.70.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf"
+
+[[package]]
+name = "itertools"
+version = "0.14.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2b192c782037fadd9cfa75548310488aabdbf3d2da73885b31bd0abd03351285"
+dependencies = [
+ "either",
+]
+
+[[package]]
+name = "jiff"
+version = "0.2.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a194df1107f33c79f4f93d02c80798520551949d59dfad22b6157048a88cca93"
+dependencies = [
+ "jiff-static",
+ "log",
+ "portable-atomic",
+ "portable-atomic-util",
+ "serde",
+]
+
+[[package]]
+name = "jiff-static"
+version = "0.2.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6c6e1db7ed32c6c71b759497fae34bf7933636f75a251b9e736555da426f6442"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.101",
+]
+
+[[package]]
+name = "jobserver"
+version = "0.1.33"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "38f262f097c174adebe41eb73d66ae9c06b2844fb0da69969647bbddd9b0538a"
+dependencies = [
+ "getrandom",
+ "libc",
+]
+
+[[package]]
+name = "lazy_static"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
+
+[[package]]
+name = "libc"
+version = "0.2.172"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d750af042f7ef4f724306de029d18836c26c1765a54a6a3f094cbd23a7267ffa"
+
+[[package]]
+name = "libgit2-sys"
+version = "0.18.1+1.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e1dcb20f84ffcdd825c7a311ae347cce604a6f084a767dec4a4929829645290e"
+dependencies = [
+ "cc",
+ "libc",
+ "libz-sys",
+ "pkg-config",
+]
+
+[[package]]
+name = "libz-sys"
+version = "1.1.22"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8b70e7a7df205e92a1a4cd9aaae7898dac0aa555503cc0a649494d0d60e7651d"
+dependencies = [
+ "cc",
+ "libc",
+ "pkg-config",
+ "vcpkg",
+]
+
+[[package]]
+name = "lock_api"
+version = "0.4.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17"
+dependencies = [
+ "autocfg",
+ "scopeguard",
+]
+
+[[package]]
+name = "log"
+version = "0.4.27"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "13dc2df351e3202783a1fe0d44375f7295ffb4049267b0f3018346dc122a1d94"
+
+[[package]]
+name = "memchr"
+version = "2.7.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3"
+
+[[package]]
+name = "memoffset"
+version = "0.9.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a"
+dependencies = [
+ "autocfg",
+]
+
+[[package]]
+name = "mmtk"
+version = "0.31.0"
+source = "git+https://github.com/mmtk/mmtk-core.git?rev=3d89bb51c191d3077278684ec5059726128d3e2b#3d89bb51c191d3077278684ec5059726128d3e2b"
+dependencies = [
+ "atomic",
+ "atomic-traits",
+ "atomic_refcell",
+ "built",
+ "bytemuck",
+ "bytemuck_derive",
+ "cfg-if",
+ "crossbeam",
+ "delegate",
+ "downcast-rs",
+ "enum-map",
+ "env_logger",
+ "idna_adapter",
+ "is-terminal",
+ "itertools",
+ "lazy_static",
+ "libc",
+ "log",
+ "memoffset",
+ "mmtk-macros",
+ "num-traits",
+ "num_cpus",
+ "portable-atomic",
+ "probe",
+ "regex",
+ "rustversion",
+ "spin",
+ "static_assertions",
+ "strum",
+ "strum_macros",
+ "sysinfo 0.33.1",
+]
+
+[[package]]
+name = "mmtk-macros"
+version = "0.31.0"
+source = "git+https://github.com/mmtk/mmtk-core.git?rev=3d89bb51c191d3077278684ec5059726128d3e2b#3d89bb51c191d3077278684ec5059726128d3e2b"
+dependencies = [
+ "proc-macro-error",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.101",
+]
+
+[[package]]
+name = "mmtk_ruby"
+version = "0.1.0"
+dependencies = [
+ "atomic_refcell",
+ "env_logger",
+ "libc",
+ "log",
+ "mmtk",
+ "once_cell",
+ "probe",
+ "sysinfo 0.32.1",
+]
+
+[[package]]
+name = "ntapi"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e8a3895c6391c39d7fe7ebc444a87eb2991b2a0bc718fdabd071eec617fc68e4"
+dependencies = [
+ "winapi",
+]
+
+[[package]]
+name = "num-traits"
+version = "0.2.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"
+dependencies = [
+ "autocfg",
+]
+
+[[package]]
+name = "num_cpus"
+version = "1.16.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43"
+dependencies = [
+ "hermit-abi 0.3.9",
+ "libc",
+]
+
+[[package]]
+name = "once_cell"
+version = "1.21.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d"
+
+[[package]]
+name = "once_cell_polyfill"
+version = "1.70.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a4895175b425cb1f87721b59f0f286c2092bd4af812243672510e1ac53e2e0ad"
+
+[[package]]
+name = "percent-encoding"
+version = "2.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e"
+
+[[package]]
+name = "pkg-config"
+version = "0.3.32"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7edddbd0b52d732b21ad9a5fab5c704c14cd949e5e9a1ec5929a24fded1b904c"
+
+[[package]]
+name = "portable-atomic"
+version = "1.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "350e9b48cbc6b0e028b0473b114454c6316e57336ee184ceab6e53f72c178b3e"
+
+[[package]]
+name = "portable-atomic-util"
+version = "0.2.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d8a2f0d8d040d7848a709caf78912debcc3f33ee4b3cac47d73d1e1069e83507"
+dependencies = [
+ "portable-atomic",
+]
+
+[[package]]
+name = "probe"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d8e2d2444b730c8f027344c60f9e1f1554d7a3342df9bdd425142ed119a6e5a3"
+
+[[package]]
+name = "proc-macro-error"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c"
+dependencies = [
+ "proc-macro-error-attr",
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+ "version_check",
+]
+
+[[package]]
+name = "proc-macro-error-attr"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "version_check",
+]
+
+[[package]]
+name = "proc-macro2"
+version = "1.0.95"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "02b3e5e68a3a1a02aad3ec490a98007cbc13c37cbe84a3cd7b8e406d76e7f778"
+dependencies = [
+ "unicode-ident",
+]
+
+[[package]]
+name = "quote"
+version = "1.0.40"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1885c039570dc00dcb4ff087a89e185fd56bae234ddc7f056a945bf36467248d"
+dependencies = [
+ "proc-macro2",
+]
+
+[[package]]
+name = "r-efi"
+version = "5.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "74765f6d916ee2faa39bc8e68e4f3ed8949b48cccdac59983d287a7cb71ce9c5"
+
+[[package]]
+name = "rayon"
+version = "1.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa"
+dependencies = [
+ "either",
+ "rayon-core",
+]
+
+[[package]]
+name = "rayon-core"
+version = "1.12.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2"
+dependencies = [
+ "crossbeam-deque",
+ "crossbeam-utils",
+]
+
+[[package]]
+name = "regex"
+version = "1.11.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191"
+dependencies = [
+ "aho-corasick",
+ "memchr",
+ "regex-automata",
+ "regex-syntax",
+]
+
+[[package]]
+name = "regex-automata"
+version = "0.4.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "809e8dc61f6de73b46c85f4c96486310fe304c434cfa43669d7b40f711150908"
+dependencies = [
+ "aho-corasick",
+ "memchr",
+ "regex-syntax",
+]
+
+[[package]]
+name = "regex-syntax"
+version = "0.8.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c"
+
+[[package]]
+name = "rustc_version"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cfcb3a22ef46e85b45de6ee7e79d063319ebb6594faafcf1c225ea92ab6e9b92"
+dependencies = [
+ "semver",
+]
+
+[[package]]
+name = "rustversion"
+version = "1.0.21"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8a0d197bd2c9dc6e53b84da9556a69ba4cdfab8619eb41a8bd1cc2027a0f6b1d"
+
+[[package]]
+name = "scopeguard"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
+
+[[package]]
+name = "semver"
+version = "1.0.26"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "56e6fa9c48d24d85fb3de5ad847117517440f6beceb7798af16b4a87d616b8d0"
+
+[[package]]
+name = "serde"
+version = "1.0.219"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5f0e2c6ed6606019b4e29e69dbaba95b11854410e5347d525002456dbbb786b6"
+dependencies = [
+ "serde_derive",
+]
+
+[[package]]
+name = "serde_derive"
+version = "1.0.219"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5b0276cf7f2c73365f7157c8123c21cd9a50fbbd844757af28ca1f5925fc2a00"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.101",
+]
+
+[[package]]
+name = "shlex"
+version = "1.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
+
+[[package]]
+name = "smallvec"
+version = "1.15.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8917285742e9f3e1683f0a9c4e6b57960b7314d0b08d30d1ecd426713ee2eee9"
+
+[[package]]
+name = "spin"
+version = "0.9.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67"
+dependencies = [
+ "lock_api",
+]
+
+[[package]]
+name = "static_assertions"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
+
+[[package]]
+name = "strum"
+version = "0.27.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f64def088c51c9510a8579e3c5d67c65349dcf755e5479ad3d010aa6454e2c32"
+
+[[package]]
+name = "strum_macros"
+version = "0.27.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c77a8c5abcaf0f9ce05d62342b7d298c346515365c36b673df4ebe3ced01fde8"
+dependencies = [
+ "heck",
+ "proc-macro2",
+ "quote",
+ "rustversion",
+ "syn 2.0.101",
+]
+
+[[package]]
+name = "syn"
+version = "1.0.109"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
+dependencies = [
+ "proc-macro2",
+ "unicode-ident",
+]
+
+[[package]]
+name = "syn"
+version = "2.0.101"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8ce2b7fc941b3a24138a0a7cf8e858bfc6a992e7978a068a5c760deb0ed43caf"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "unicode-ident",
+]
+
+[[package]]
+name = "sysinfo"
+version = "0.32.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4c33cd241af0f2e9e3b5c32163b873b29956890b5342e6745b917ce9d490f4af"
+dependencies = [
+ "core-foundation-sys",
+ "libc",
+ "memchr",
+ "ntapi",
+ "rayon",
+ "windows",
+]
+
+[[package]]
+name = "sysinfo"
+version = "0.33.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4fc858248ea01b66f19d8e8a6d55f41deaf91e9d495246fd01368d99935c6c01"
+dependencies = [
+ "core-foundation-sys",
+ "libc",
+ "memchr",
+ "ntapi",
+ "rayon",
+ "windows",
+]
+
+[[package]]
+name = "tinyvec"
+version = "1.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "09b3661f17e86524eccd4371ab0429194e0d7c008abb45f7a7495b1719463c71"
+dependencies = [
+ "tinyvec_macros",
+]
+
+[[package]]
+name = "tinyvec_macros"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
+
+[[package]]
+name = "unicode-bidi"
+version = "0.3.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5c1cb5db39152898a79168971543b1cb5020dff7fe43c8dc468b0885f5e29df5"
+
+[[package]]
+name = "unicode-ident"
+version = "1.0.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5a5f39404a5da50712a4c1eecf25e90dd62b613502b7e925fd4e4d19b5c96512"
+
+[[package]]
+name = "unicode-joining-type"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d8d00a78170970967fdb83f9d49b92f959ab2bb829186b113e4f4604ad98e180"
+
+[[package]]
+name = "unicode-normalization"
+version = "0.1.24"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5033c97c4262335cded6d6fc3e5c18ab755e1a3dc96376350f3d8e9f009ad956"
+dependencies = [
+ "tinyvec",
+]
+
+[[package]]
+name = "url"
+version = "2.5.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "32f8b686cadd1473f4bd0117a5d28d36b1ade384ea9b5069a1c40aefed7fda60"
+dependencies = [
+ "form_urlencoded",
+ "idna",
+ "percent-encoding",
+]
+
+[[package]]
+name = "utf8_iter"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be"
+
+[[package]]
+name = "utf8parse"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821"
+
+[[package]]
+name = "vcpkg"
+version = "0.2.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426"
+
+[[package]]
+name = "version_check"
+version = "0.9.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a"
+
+[[package]]
+name = "wasi"
+version = "0.14.2+wasi-0.2.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9683f9a5a998d873c0d21fcbe3c083009670149a8fab228644b8bd36b2c48cb3"
+dependencies = [
+ "wit-bindgen-rt",
+]
+
+[[package]]
+name = "winapi"
+version = "0.3.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
+dependencies = [
+ "winapi-i686-pc-windows-gnu",
+ "winapi-x86_64-pc-windows-gnu",
+]
+
+[[package]]
+name = "winapi-i686-pc-windows-gnu"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
+
+[[package]]
+name = "winapi-x86_64-pc-windows-gnu"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
+
+[[package]]
+name = "windows"
+version = "0.57.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "12342cb4d8e3b046f3d80effd474a7a02447231330ef77d71daa6fbc40681143"
+dependencies = [
+ "windows-core",
+ "windows-targets",
+]
+
+[[package]]
+name = "windows-core"
+version = "0.57.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d2ed2439a290666cd67ecce2b0ffaad89c2a56b976b736e6ece670297897832d"
+dependencies = [
+ "windows-implement",
+ "windows-interface",
+ "windows-result",
+ "windows-targets",
+]
+
+[[package]]
+name = "windows-implement"
+version = "0.57.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9107ddc059d5b6fbfbffdfa7a7fe3e22a226def0b2608f72e9d552763d3e1ad7"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.101",
+]
+
+[[package]]
+name = "windows-interface"
+version = "0.57.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "29bee4b38ea3cde66011baa44dba677c432a78593e202392d1e9070cf2a7fca7"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.101",
+]
+
+[[package]]
+name = "windows-result"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5e383302e8ec8515204254685643de10811af0ed97ea37210dc26fb0032647f8"
+dependencies = [
+ "windows-targets",
+]
+
+[[package]]
+name = "windows-sys"
+version = "0.59.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b"
+dependencies = [
+ "windows-targets",
+]
+
+[[package]]
+name = "windows-targets"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973"
+dependencies = [
+ "windows_aarch64_gnullvm",
+ "windows_aarch64_msvc",
+ "windows_i686_gnu",
+ "windows_i686_gnullvm",
+ "windows_i686_msvc",
+ "windows_x86_64_gnu",
+ "windows_x86_64_gnullvm",
+ "windows_x86_64_msvc",
+]
+
+[[package]]
+name = "windows_aarch64_gnullvm"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3"
+
+[[package]]
+name = "windows_aarch64_msvc"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469"
+
+[[package]]
+name = "windows_i686_gnu"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b"
+
+[[package]]
+name = "windows_i686_gnullvm"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66"
+
+[[package]]
+name = "windows_i686_msvc"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66"
+
+[[package]]
+name = "windows_x86_64_gnu"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78"
+
+[[package]]
+name = "windows_x86_64_gnullvm"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d"
+
+[[package]]
+name = "windows_x86_64_msvc"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
+
+[[package]]
+name = "wit-bindgen-rt"
+version = "0.39.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6f42320e61fe2cfd34354ecb597f86f413484a798ba44a8ca1165c58d42da6c1"
+dependencies = [
+ "bitflags",
+]
diff --git a/gc/mmtk/Cargo.toml b/gc/mmtk/Cargo.toml
new file mode 100644
index 00000000000000..e1b1d1e13b14d5
--- /dev/null
+++ b/gc/mmtk/Cargo.toml
@@ -0,0 +1,42 @@
+[package]
+name = "mmtk_ruby"
+version = "0.1.0"
+authors = []
+edition = "2021"
+
+[lib]
+name = "mmtk_ruby"
+crate-type = ["cdylib", "staticlib"]
+
+[profile.release]
+lto = true
+
+[dependencies]
+libc = "0.2"
+log = "0.4.14"
+env_logger = "0.11.3"
+once_cell = "1.17.0"
+atomic_refcell = "0.1.9"
+probe = "0.5"
+sysinfo = "0.32.0"
+
+[dependencies.mmtk]
+features = ["is_mmtk_object", "object_pinning", "sticky_immix_non_moving_nursery", "immix_non_moving"]
+
+# Uncomment the following lines to use mmtk-core from the official repository.
+git = "https://github.com/mmtk/mmtk-core.git"
+rev = "3d89bb51c191d3077278684ec5059726128d3e2b"
+
+# Uncomment the following line to use mmtk-core from a local repository.
+# path = "../../../mmtk-core"
+
+[features]
+default = []
+
+# When moving an object, clear its original copy.
+clear_old_copy = []
+
+# Enable extra assertions in release build.  For debugging.
+extra_assert = []
+
+[workspace]
diff --git a/gc/mmtk/cbindgen.toml b/gc/mmtk/cbindgen.toml
new file mode 100644
index 00000000000000..c66f829b3dd1d0
--- /dev/null
+++ b/gc/mmtk/cbindgen.toml
@@ -0,0 +1,31 @@
+language = "C"
+
+include_guard = "MMTK_H"
+
+autogen_warning = "/* Warning, this file is autogenerated by cbindgen from the mmtk-ruby repository. Don't modify this manually. */"
+
+tab_width = 4
+
+usize_is_size_t = true
+
+after_includes = """
+
+typedef struct MMTk_Builder MMTk_Builder;
+typedef struct MMTk_Mutator MMTk_Mutator;
+
+typedef struct MMTk_ractor_cache *MMTk_VMThread;
+typedef struct MMTk_ractor_cache *MMTk_VMMutatorThread;
+typedef struct MMTk_GCThreadTLS *MMTk_VMWorkerThread;
+typedef void *MMTk_Address;
+typedef void *MMTk_ObjectReference;
+typedef void *MMTk_NullableObjectReference;
+typedef uint32_t MMTk_AllocationSemantics;
+"""
+
+[export]
+exclude = ["RubyMutator"]
+prefix = "MMTk_"
+
+[export.rename]
+"MMTKBuilder" = "Builder"
+"RubyMutator" = "Mutator"
diff --git a/gc/mmtk/depend b/gc/mmtk/depend
new file mode 100644
index 00000000000000..77b229af36d272
--- /dev/null
+++ b/gc/mmtk/depend
@@ -0,0 +1,18 @@
+$(TARGET_SO): $(MMTK_BUILD)/$(LIBMMTK_RUBY)
+
+# Add the `libmmtk_ruby.a` target to run `cargo build`
+
+release/$(LIBMMTK_RUBY) debug/$(LIBMMTK_RUBY): $(RUSTSRCS) $(srcdir)/Cargo.toml $(srcdir)/Cargo.toml
+
+release/$(LIBMMTK_RUBY):
+	CARGO_TARGET_DIR="." cargo build --manifest-path=$(srcdir)/Cargo.toml --release
+
+debug/$(LIBMMTK_RUBY):
+	CARGO_TARGET_DIR="." cargo build --manifest-path=$(srcdir)/Cargo.toml
+
+clean: clean-mmtk
+
+.PHONY: clean-mmtk
+clean-mmtk:
+	-$(Q)$(RM_RF) debug release
+	-$(Q)$(RM) .rustc_info.json
diff --git a/gc/mmtk/extconf.rb b/gc/mmtk/extconf.rb
new file mode 100644
index 00000000000000..5f4228972bbbb8
--- /dev/null
+++ b/gc/mmtk/extconf.rb
@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+require_relative "../extconf_base"
+
+# Statically link `libmmtk_ruby.a`
+$LIBS << " $(MMTK_BUILD)/$(LIBMMTK_RUBY)"
+
+rustsrcs = Dir.glob("src/*.rs", base: __dir__).map {|s| "$(srcdir)/#{s}"}
+
+create_gc_makefile("mmtk") do |makefile|
+  [
+    *makefile,
+
+    <<~MAKEFILE,
+    MMTK_BUILD = debug
+    LIBMMTK_RUBY = libmmtk_ruby.#$LIBEXT
+    RUSTSRCS = #{rustsrcs.join(" \\\n\t   ")}
+    MAKEFILE
+  ]
+end
diff --git a/gc/mmtk/mmtk.c b/gc/mmtk/mmtk.c
new file mode 100644
index 00000000000000..c318c6fe48cfd8
--- /dev/null
+++ b/gc/mmtk/mmtk.c
@@ -0,0 +1,1263 @@
+#include <pthread.h>
+#include <stdbool.h>
+
+#include "ruby/assert.h"
+#include "ruby/atomic.h"
+#include "ruby/debug.h"
+
+#include "gc/gc.h"
+#include "gc/gc_impl.h"
+#include "gc/mmtk/mmtk.h"
+
+#include "ccan/list/list.h"
+#include "darray.h"
+
+#ifdef __APPLE__
+#include <sys/sysctl.h>
+#endif
+
+struct objspace {
+    bool measure_gc_time;
+    bool gc_stress;
+
+    size_t gc_count;
+    size_t total_gc_time;
+    size_t total_allocated_objects;
+
+    st_table *finalizer_table;
+    struct MMTk_final_job *finalizer_jobs;
+    rb_postponed_job_handle_t finalizer_postponed_job;
+
+    struct ccan_list_head ractor_caches;
+    unsigned long live_ractor_cache_count;
+
+    pthread_mutex_t mutex;
+    bool world_stopped;
+    pthread_cond_t cond_world_stopped;
+    pthread_cond_t cond_world_started;
+    size_t start_the_world_count;
+
+    struct rb_gc_vm_context vm_context;
+};
+
+struct MMTk_ractor_cache {
+    struct ccan_list_node list_node;
+
+    MMTk_Mutator *mutator;
+    bool gc_mutator_p;
+};
+
+struct MMTk_final_job {
+    struct MMTk_final_job *next;
+    enum {
+        MMTK_FINAL_JOB_DFREE,
+        MMTK_FINAL_JOB_FINALIZE,
+    } kind;
+    union {
+        struct {
+            void (*func)(void *);
+            void *data;
+        } dfree;
+        struct {
+            /* HACK: we store the object ID on the 0th element of this array. */
+            VALUE finalizer_array;
+        } finalize;
+    } as;
+};
+
+#ifdef RB_THREAD_LOCAL_SPECIFIER
+RB_THREAD_LOCAL_SPECIFIER struct MMTk_GCThreadTLS *rb_mmtk_gc_thread_tls;
+#else
+# error We currently need language-supported TLS
+#endif
+
+#include <pthread.h>
+
+static void
+rb_mmtk_init_gc_worker_thread(MMTk_VMWorkerThread gc_thread_tls)
+{
+    rb_mmtk_gc_thread_tls = gc_thread_tls;
+}
+
+static bool
+rb_mmtk_is_mutator(void)
+{
+    return ruby_native_thread_p();
+}
+
+static void
+rb_mmtk_stop_the_world(void)
+{
+    struct objspace *objspace = rb_gc_get_objspace();
+
+    int err;
+    if ((err = pthread_mutex_lock(&objspace->mutex)) != 0) {
+        rb_bug("ERROR: cannot lock objspace->mutex: %s", strerror(err));
+    }
+
+    while (!objspace->world_stopped) {
+        pthread_cond_wait(&objspace->cond_world_stopped, &objspace->mutex);
+    }
+
+    if ((err = pthread_mutex_unlock(&objspace->mutex)) != 0) {
+        rb_bug("ERROR: cannot release objspace->mutex: %s", strerror(err));
+    }
+}
+
+static void
+rb_mmtk_resume_mutators(void)
+{
+    struct objspace *objspace = rb_gc_get_objspace();
+
+    int err;
+    if ((err = pthread_mutex_lock(&objspace->mutex)) != 0) {
+        rb_bug("ERROR: cannot lock objspace->mutex: %s", strerror(err));
+    }
+
+    objspace->world_stopped = false;
+    objspace->gc_count++;
+    pthread_cond_broadcast(&objspace->cond_world_started);
+
+    if ((err = pthread_mutex_unlock(&objspace->mutex)) != 0) {
+        rb_bug("ERROR: cannot release objspace->mutex: %s", strerror(err));
+    }
+}
+
+static void
+rb_mmtk_block_for_gc(MMTk_VMMutatorThread mutator)
+{
+    struct objspace *objspace = rb_gc_get_objspace();
+
+    size_t starting_gc_count = objspace->gc_count;
+    int lock_lev = RB_GC_VM_LOCK();
+    int err;
+    if ((err = pthread_mutex_lock(&objspace->mutex)) != 0) {
+        rb_bug("ERROR: cannot lock objspace->mutex: %s", strerror(err));
+    }
+
+    if (objspace->gc_count == starting_gc_count) {
+        rb_gc_event_hook(0, RUBY_INTERNAL_EVENT_GC_START);
+
+        rb_gc_initialize_vm_context(&objspace->vm_context);
+
+        mutator->gc_mutator_p = true;
+
+        struct timespec gc_start_time;
+        if (objspace->measure_gc_time) {
+            clock_gettime(CLOCK_MONOTONIC, &gc_start_time);
+        }
+
+        rb_gc_save_machine_context();
+
+        rb_gc_vm_barrier();
+
+        objspace->world_stopped = true;
+
+        pthread_cond_broadcast(&objspace->cond_world_stopped);
+
+        // Wait for GC end
+        while (objspace->world_stopped) {
+            pthread_cond_wait(&objspace->cond_world_started, &objspace->mutex);
+        }
+
+        if (objspace->measure_gc_time) {
+            struct timespec gc_end_time;
+            clock_gettime(CLOCK_MONOTONIC, &gc_end_time);
+
+            objspace->total_gc_time +=
+                (gc_end_time.tv_sec - gc_start_time.tv_sec) * (1000 * 1000 * 1000) +
+                    (gc_end_time.tv_nsec - gc_start_time.tv_nsec);
+        }
+    }
+
+    if ((err = pthread_mutex_unlock(&objspace->mutex)) != 0) {
+        rb_bug("ERROR: cannot release objspace->mutex: %s", strerror(err));
+    }
+    RB_GC_VM_UNLOCK(lock_lev);
+}
+
+static size_t
+rb_mmtk_number_of_mutators(void)
+{
+    struct objspace *objspace = rb_gc_get_objspace();
+    return objspace->live_ractor_cache_count;
+}
+
+static void
+rb_mmtk_get_mutators(void (*visit_mutator)(MMTk_Mutator *mutator, void *data), void *data)
+{
+    struct objspace *objspace = rb_gc_get_objspace();
+    struct MMTk_ractor_cache *ractor_cache;
+
+    ccan_list_for_each(&objspace->ractor_caches, ractor_cache, list_node) {
+        visit_mutator(ractor_cache->mutator, data);
+    }
+}
+
+static void
+rb_mmtk_scan_gc_roots(void)
+{
+    struct objspace *objspace = rb_gc_get_objspace();
+
+    // FIXME: Make `rb_gc_mark_roots` aware that the current thread may not have EC.
+    // See: https://github.com/ruby/mmtk/issues/22
+    rb_gc_worker_thread_set_vm_context(&objspace->vm_context);
+    rb_gc_mark_roots(objspace, NULL);
+    rb_gc_worker_thread_unset_vm_context(&objspace->vm_context);
+}
+
+static int
+pin_value(st_data_t key, st_data_t value, st_data_t data)
+{
+    rb_gc_impl_mark_and_pin((void *)data, (VALUE)value);
+
+    return ST_CONTINUE;
+}
+
+static void
+rb_mmtk_scan_objspace(void)
+{
+    struct objspace *objspace = rb_gc_get_objspace();
+
+    if (objspace->finalizer_table != NULL) {
+        st_foreach(objspace->finalizer_table, pin_value, (st_data_t)objspace);
+    }
+
+    struct MMTk_final_job *job = objspace->finalizer_jobs;
+    while (job != NULL) {
+        switch (job->kind) {
+          case MMTK_FINAL_JOB_DFREE:
+            break;
+          case MMTK_FINAL_JOB_FINALIZE:
+            rb_gc_impl_mark(objspace, job->as.finalize.finalizer_array);
+            break;
+          default:
+            rb_bug("rb_mmtk_scan_objspace: unknown final job type %d", job->kind);
+        }
+
+        job = job->next;
+    }
+}
+
+static void
+rb_mmtk_scan_object_ruby_style(MMTk_ObjectReference object)
+{
+    rb_gc_mark_children(rb_gc_get_objspace(), (VALUE)object);
+}
+
+static void
+rb_mmtk_call_gc_mark_children(MMTk_ObjectReference object)
+{
+    rb_gc_mark_children(rb_gc_get_objspace(), (VALUE)object);
+}
+
+static void
+rb_mmtk_call_obj_free(MMTk_ObjectReference object)
+{
+    VALUE obj = (VALUE)object;
+    struct objspace *objspace = rb_gc_get_objspace();
+
+    if (RB_UNLIKELY(rb_gc_event_hook_required_p(RUBY_INTERNAL_EVENT_FREEOBJ))) {
+        rb_gc_worker_thread_set_vm_context(&objspace->vm_context);
+        rb_gc_event_hook(obj, RUBY_INTERNAL_EVENT_FREEOBJ);
+        rb_gc_worker_thread_unset_vm_context(&objspace->vm_context);
+    }
+
+    rb_gc_obj_free(objspace, obj);
+}
+
+static size_t
+rb_mmtk_vm_live_bytes(void)
+{
+    return 0;
+}
+
+static void
+make_final_job(struct objspace *objspace, VALUE obj, VALUE table)
+{
+    RUBY_ASSERT(RB_FL_TEST(obj, RUBY_FL_FINALIZE));
+    RUBY_ASSERT(mmtk_is_reachable((MMTk_ObjectReference)table));
+    RUBY_ASSERT(RB_BUILTIN_TYPE(table) == T_ARRAY);
+
+    RB_FL_UNSET(obj, RUBY_FL_FINALIZE);
+
+    struct MMTk_final_job *job = xmalloc(sizeof(struct MMTk_final_job));
+    job->next = objspace->finalizer_jobs;
+    job->kind = MMTK_FINAL_JOB_FINALIZE;
+    job->as.finalize.finalizer_array = table;
+
+    objspace->finalizer_jobs = job;
+}
+
+static int
+rb_mmtk_update_finalizer_table_i(st_data_t key, st_data_t value, st_data_t data)
+{
+    RUBY_ASSERT(RB_FL_TEST(key, RUBY_FL_FINALIZE));
+    RUBY_ASSERT(mmtk_is_reachable((MMTk_ObjectReference)value));
+    RUBY_ASSERT(RB_BUILTIN_TYPE(value) == T_ARRAY);
+
+    struct objspace *objspace = (struct objspace *)data;
+
+    if (!mmtk_is_reachable((MMTk_ObjectReference)key)) {
+        make_final_job(objspace, (VALUE)key, (VALUE)value);
+
+        rb_postponed_job_trigger(objspace->finalizer_postponed_job);
+
+        return ST_DELETE;
+    }
+
+    return ST_CONTINUE;
+}
+
+static void
+rb_mmtk_update_finalizer_table(void)
+{
+    struct objspace *objspace = rb_gc_get_objspace();
+
+    // TODO: replace with st_foreach_with_replace when GC is moving
+    st_foreach(objspace->finalizer_table, rb_mmtk_update_finalizer_table_i, (st_data_t)objspace);
+}
+
+static int
+rb_mmtk_update_table_i(VALUE val, void *data)
+{
+    if (!mmtk_is_reachable((MMTk_ObjectReference)val)) {
+        return ST_DELETE;
+    }
+
+    return ST_CONTINUE;
+}
+
+static int
+rb_mmtk_global_tables_count(void)
+{
+    return RB_GC_VM_WEAK_TABLE_COUNT;
+}
+
+static void
+rb_mmtk_update_global_tables(int table)
+{
+    RUBY_ASSERT(table < RB_GC_VM_WEAK_TABLE_COUNT);
+
+    rb_gc_vm_weak_table_foreach(rb_mmtk_update_table_i, NULL, NULL, true, (enum rb_gc_vm_weak_tables)table);
+}
+
+// Bootup
+MMTk_RubyUpcalls ruby_upcalls = {
+    rb_mmtk_init_gc_worker_thread,
+    rb_mmtk_is_mutator,
+    rb_mmtk_stop_the_world,
+    rb_mmtk_resume_mutators,
+    rb_mmtk_block_for_gc,
+    rb_mmtk_number_of_mutators,
+    rb_mmtk_get_mutators,
+    rb_mmtk_scan_gc_roots,
+    rb_mmtk_scan_objspace,
+    rb_mmtk_scan_object_ruby_style,
+    rb_mmtk_call_gc_mark_children,
+    rb_mmtk_call_obj_free,
+    rb_mmtk_vm_live_bytes,
+    rb_mmtk_update_global_tables,
+    rb_mmtk_global_tables_count,
+    rb_mmtk_update_finalizer_table,
+};
+
+// Use max 80% of the available memory by default for MMTk
+#define RB_MMTK_HEAP_LIMIT_PERC 80
+#define RB_MMTK_DEFAULT_HEAP_MIN (1024 * 1024)
+#define RB_MMTK_DEFAULT_HEAP_MAX (rb_mmtk_system_physical_memory() / 100 * RB_MMTK_HEAP_LIMIT_PERC)
+
+enum mmtk_heap_mode {
+    RB_MMTK_DYNAMIC_HEAP,
+    RB_MMTK_FIXED_HEAP
+};
+
+MMTk_Builder *
+rb_mmtk_builder_init(void)
+{
+    MMTk_Builder *builder = mmtk_builder_default();
+    return builder;
+}
+
+void *
+rb_gc_impl_objspace_alloc(void)
+{
+    MMTk_Builder *builder = rb_mmtk_builder_init();
+    mmtk_init_binding(builder, NULL, &ruby_upcalls, (MMTk_ObjectReference)Qundef);
+
+    return calloc(1, sizeof(struct objspace));
+}
+
+static void gc_run_finalizers(void *data);
+
+void
+rb_gc_impl_objspace_init(void *objspace_ptr)
+{
+    struct objspace *objspace = objspace_ptr;
+
+    objspace->measure_gc_time = true;
+
+    objspace->finalizer_table = st_init_numtable();
+    objspace->finalizer_postponed_job = rb_postponed_job_preregister(0, gc_run_finalizers, objspace);
+
+    ccan_list_head_init(&objspace->ractor_caches);
+
+    objspace->mutex = (pthread_mutex_t)PTHREAD_MUTEX_INITIALIZER;
+    objspace->cond_world_stopped = (pthread_cond_t)PTHREAD_COND_INITIALIZER;
+    objspace->cond_world_started = (pthread_cond_t)PTHREAD_COND_INITIALIZER;
+}
+
+void
+rb_gc_impl_objspace_free(void *objspace_ptr)
+{
+    free(objspace_ptr);
+}
+
+void *
+rb_gc_impl_ractor_cache_alloc(void *objspace_ptr, void *ractor)
+{
+    struct objspace *objspace = objspace_ptr;
+    if (objspace->live_ractor_cache_count == 0) {
+        mmtk_initialize_collection(ractor);
+    }
+    objspace->live_ractor_cache_count++;
+
+    struct MMTk_ractor_cache *cache = malloc(sizeof(struct MMTk_ractor_cache));
+    ccan_list_add(&objspace->ractor_caches, &cache->list_node);
+
+    cache->mutator = mmtk_bind_mutator(cache);
+
+    return cache;
+}
+
+void
+rb_gc_impl_ractor_cache_free(void *objspace_ptr, void *cache_ptr)
+{
+    struct objspace *objspace = objspace_ptr;
+    struct MMTk_ractor_cache *cache = cache_ptr;
+
+    ccan_list_del(&cache->list_node);
+
+    RUBY_ASSERT(objspace->live_ractor_cache_count > 1);
+    objspace->live_ractor_cache_count--;
+
+    mmtk_destroy_mutator(cache->mutator);
+}
+
+void rb_gc_impl_set_params(void *objspace_ptr) { }
+
+static VALUE gc_verify_internal_consistency(VALUE self) { return Qnil; }
+
+void
+rb_gc_impl_init(void)
+{
+    VALUE gc_constants = rb_hash_new();
+    rb_hash_aset(gc_constants, ID2SYM(rb_intern("BASE_SLOT_SIZE")), SIZET2NUM(sizeof(VALUE) * 5));
+    rb_hash_aset(gc_constants, ID2SYM(rb_intern("RBASIC_SIZE")), SIZET2NUM(sizeof(struct RBasic)));
+    rb_hash_aset(gc_constants, ID2SYM(rb_intern("RVALUE_OVERHEAD")), INT2NUM(0));
+    rb_hash_aset(gc_constants, ID2SYM(rb_intern("RVARGC_MAX_ALLOCATE_SIZE")), LONG2FIX(640));
+    // Pretend we have 5 size pools
+    rb_hash_aset(gc_constants, ID2SYM(rb_intern("SIZE_POOL_COUNT")), LONG2FIX(5));
+    OBJ_FREEZE(gc_constants);
+    rb_define_const(rb_mGC, "INTERNAL_CONSTANTS", gc_constants);
+
+    // no-ops for compatibility
+    rb_define_singleton_method(rb_mGC, "verify_internal_consistency", gc_verify_internal_consistency, 0);
+
+    rb_define_singleton_method(rb_mGC, "compact", rb_f_notimplement, 0);
+    rb_define_singleton_method(rb_mGC, "auto_compact", rb_f_notimplement, 0);
+    rb_define_singleton_method(rb_mGC, "auto_compact=", rb_f_notimplement, 1);
+    rb_define_singleton_method(rb_mGC, "latest_compact_info", rb_f_notimplement, 0);
+    rb_define_singleton_method(rb_mGC, "verify_compaction_references", rb_f_notimplement, -1);
+}
+
+static size_t heap_sizes[6] = {
+    40, 80, 160, 320, 640, 0
+};
+
+size_t *
+rb_gc_impl_heap_sizes(void *objspace_ptr)
+{
+    return heap_sizes;
+}
+
+int
+rb_mmtk_obj_free_iter_wrapper(VALUE obj, void *data)
+{
+    struct objspace *objspace = data;
+
+    if (!RB_TYPE_P(obj, T_NONE)) {
+        rb_gc_obj_free_vm_weak_references(obj);
+        rb_gc_obj_free(objspace, obj);
+    }
+
+    return 0;
+}
+
+// Shutdown
+static void each_object(struct objspace *objspace, int (*func)(VALUE, void *), void *data);
+
+void
+rb_gc_impl_shutdown_free_objects(void *objspace_ptr)
+{
+    mmtk_set_gc_enabled(false);
+    each_object(objspace_ptr, rb_mmtk_obj_free_iter_wrapper, objspace_ptr);
+    mmtk_set_gc_enabled(true);
+}
+
+// GC
+void
+rb_gc_impl_start(void *objspace_ptr, bool full_mark, bool immediate_mark, bool immediate_sweep, bool compact)
+{
+    mmtk_handle_user_collection_request(rb_gc_get_ractor_newobj_cache(), true, full_mark);
+}
+
+bool
+rb_gc_impl_during_gc_p(void *objspace_ptr)
+{
+    // TODO
+    return false;
+}
+
+static void
+rb_gc_impl_prepare_heap_i(MMTk_ObjectReference obj, void *d)
+{
+    rb_gc_prepare_heap_process_object((VALUE)obj);
+}
+
+void
+rb_gc_impl_prepare_heap(void *objspace_ptr)
+{
+    mmtk_enumerate_objects(rb_gc_impl_prepare_heap_i, NULL);
+}
+
+void
+rb_gc_impl_gc_enable(void *objspace_ptr)
+{
+    mmtk_set_gc_enabled(true);
+}
+
+void
+rb_gc_impl_gc_disable(void *objspace_ptr, bool finish_current_gc)
+{
+    mmtk_set_gc_enabled(false);
+}
+
+bool
+rb_gc_impl_gc_enabled_p(void *objspace_ptr)
+{
+    return mmtk_gc_enabled_p();
+}
+
+void
+rb_gc_impl_stress_set(void *objspace_ptr, VALUE flag)
+{
+    struct objspace *objspace = objspace_ptr;
+
+    objspace->gc_stress = RTEST(flag);
+}
+
+VALUE
+rb_gc_impl_stress_get(void *objspace_ptr)
+{
+    struct objspace *objspace = objspace_ptr;
+
+    return objspace->gc_stress ? Qtrue : Qfalse;
+}
+
+VALUE
+rb_gc_impl_config_get(void *objspace_ptr)
+{
+    VALUE hash = rb_hash_new();
+
+    rb_hash_aset(hash, ID2SYM(rb_intern_const("mmtk_worker_count")), RB_ULONG2NUM(mmtk_worker_count()));
+    rb_hash_aset(hash, ID2SYM(rb_intern_const("mmtk_plan")), rb_str_new_cstr((const char *)mmtk_plan()));
+    rb_hash_aset(hash, ID2SYM(rb_intern_const("mmtk_heap_mode")), rb_str_new_cstr((const char *)mmtk_heap_mode()));
+    size_t heap_min = mmtk_heap_min();
+    if (heap_min > 0) rb_hash_aset(hash, ID2SYM(rb_intern_const("mmtk_heap_min")), RB_ULONG2NUM(heap_min));
+    rb_hash_aset(hash, ID2SYM(rb_intern_const("mmtk_heap_max")), RB_ULONG2NUM(mmtk_heap_max()));
+
+    return hash;
+}
+
+void
+rb_gc_impl_config_set(void *objspace_ptr, VALUE hash)
+{
+    // TODO
+}
+
+// Object allocation
+
+VALUE
+rb_gc_impl_new_obj(void *objspace_ptr, void *cache_ptr, VALUE klass, VALUE flags, VALUE v1, VALUE v2, VALUE v3, bool wb_protected, size_t alloc_size)
+{
+#define MMTK_ALLOCATION_SEMANTICS_DEFAULT 0
+    struct objspace *objspace = objspace_ptr;
+    struct MMTk_ractor_cache *ractor_cache = cache_ptr;
+
+    if (alloc_size > 640) rb_bug("too big");
+    for (int i = 0; i < 5; i++) {
+        if (alloc_size == heap_sizes[i]) break;
+        if (alloc_size < heap_sizes[i]) {
+            alloc_size = heap_sizes[i];
+            break;
+        }
+    }
+
+    if (objspace->gc_stress) {
+        mmtk_handle_user_collection_request(ractor_cache, false, false);
+    }
+
+    VALUE *alloc_obj = mmtk_alloc(ractor_cache->mutator, alloc_size + 8, MMTk_MIN_OBJ_ALIGN, 0, MMTK_ALLOCATION_SEMANTICS_DEFAULT);
+    alloc_obj++;
+    alloc_obj[-1] = alloc_size;
+    alloc_obj[0] = flags;
+    alloc_obj[1] = klass;
+    if (alloc_size > 16) alloc_obj[2] = v1;
+    if (alloc_size > 24) alloc_obj[3] = v2;
+    if (alloc_size > 32) alloc_obj[4] = v3;
+
+    mmtk_post_alloc(ractor_cache->mutator, (void*)alloc_obj, alloc_size + 8, MMTK_ALLOCATION_SEMANTICS_DEFAULT);
+
+    // TODO: only add when object needs obj_free to be called
+    mmtk_add_obj_free_candidate(alloc_obj);
+
+    objspace->total_allocated_objects++;
+
+    return (VALUE)alloc_obj;
+}
+
+size_t
+rb_gc_impl_obj_slot_size(VALUE obj)
+{
+    return ((VALUE *)obj)[-1];
+}
+
+size_t
+rb_gc_impl_heap_id_for_size(void *objspace_ptr, size_t size)
+{
+    for (int i = 0; i < 5; i++) {
+        if (size == heap_sizes[i]) return i;
+        if (size < heap_sizes[i])  return i;
+    }
+
+    rb_bug("size too big");
+}
+
+bool
+rb_gc_impl_size_allocatable_p(size_t size)
+{
+    return size <= 640;
+}
+
+// Malloc
+void *
+rb_gc_impl_malloc(void *objspace_ptr, size_t size)
+{
+    // TODO: don't use system malloc
+    return malloc(size);
+}
+
+void *
+rb_gc_impl_calloc(void *objspace_ptr, size_t size)
+{
+    // TODO: don't use system calloc
+    return calloc(1, size);
+}
+
+void *
+rb_gc_impl_realloc(void *objspace_ptr, void *ptr, size_t new_size, size_t old_size)
+{
+    // TODO: don't use system realloc
+    return realloc(ptr, new_size);
+}
+
+void
+rb_gc_impl_free(void *objspace_ptr, void *ptr, size_t old_size)
+{
+    // TODO: don't use system free
+    free(ptr);
+}
+
+void rb_gc_impl_adjust_memory_usage(void *objspace_ptr, ssize_t diff) { }
+
+// Marking
+void
+rb_gc_impl_mark(void *objspace_ptr, VALUE obj)
+{
+    if (RB_SPECIAL_CONST_P(obj)) return;
+
+    rb_mmtk_gc_thread_tls->object_closure.c_function(rb_mmtk_gc_thread_tls->object_closure.rust_closure,
+                                                     rb_mmtk_gc_thread_tls->gc_context,
+                                                     (MMTk_ObjectReference)obj,
+                                                     false);
+}
+
+void
+rb_gc_impl_mark_and_move(void *objspace_ptr, VALUE *ptr)
+{
+    if (RB_SPECIAL_CONST_P(*ptr)) return;
+
+    // TODO: make it movable
+    rb_gc_impl_mark(objspace_ptr, *ptr);
+}
+
+void
+rb_gc_impl_mark_and_pin(void *objspace_ptr, VALUE obj)
+{
+    if (RB_SPECIAL_CONST_P(obj)) return;
+
+    // TODO: also pin
+    rb_gc_impl_mark(objspace_ptr, obj);
+}
+
+void
+rb_gc_impl_mark_maybe(void *objspace_ptr, VALUE obj)
+{
+    if (rb_gc_impl_pointer_to_heap_p(objspace_ptr, (const void *)obj)) {
+        rb_gc_impl_mark_and_pin(objspace_ptr, obj);
+    }
+}
+
+void
+rb_gc_impl_mark_weak(void *objspace_ptr, VALUE *ptr)
+{
+    mmtk_mark_weak((MMTk_ObjectReference *)ptr);
+}
+
+void
+rb_gc_impl_remove_weak(void *objspace_ptr, VALUE parent_obj, VALUE *ptr)
+{
+    mmtk_remove_weak((MMTk_ObjectReference *)ptr);
+}
+
+// Compaction
+bool
+rb_gc_impl_object_moved_p(void *objspace_ptr, VALUE obj)
+{
+    rb_bug("unimplemented");
+}
+
+VALUE
+rb_gc_impl_location(void *objspace_ptr, VALUE value)
+{
+    rb_bug("unimplemented");
+}
+
+// Write barriers
+void
+rb_gc_impl_writebarrier(void *objspace_ptr, VALUE a, VALUE b)
+{
+    struct MMTk_ractor_cache *cache = rb_gc_get_ractor_newobj_cache();
+
+    if (SPECIAL_CONST_P(b)) return;
+
+    mmtk_object_reference_write_post(cache->mutator, (MMTk_ObjectReference)a);
+}
+
+void
+rb_gc_impl_writebarrier_unprotect(void *objspace_ptr, VALUE obj)
+{
+    mmtk_register_wb_unprotected_object((MMTk_ObjectReference)obj);
+}
+
+void
+rb_gc_impl_writebarrier_remember(void *objspace_ptr, VALUE obj)
+{
+    struct MMTk_ractor_cache *cache = rb_gc_get_ractor_newobj_cache();
+
+    mmtk_object_reference_write_post(cache->mutator, (MMTk_ObjectReference)obj);
+}
+
+// Heap walking
+static void
+each_objects_i(MMTk_ObjectReference obj, void *d)
+{
+    rb_darray(VALUE) *objs = d;
+
+    rb_darray_append(objs, (VALUE)obj);
+}
+
+static void
+each_object(struct objspace *objspace, int (*func)(VALUE, void *), void *data)
+{
+    rb_darray(VALUE) objs;
+    rb_darray_make(&objs, 0);
+
+    mmtk_enumerate_objects(each_objects_i, &objs);
+
+    VALUE *obj_ptr;
+    rb_darray_foreach(objs, i, obj_ptr) {
+        if (!mmtk_is_mmtk_object((MMTk_ObjectReference)*obj_ptr)) continue;
+
+        if (func(*obj_ptr, data) != 0) {
+            break;
+        }
+    }
+
+    rb_darray_free(objs);
+}
+
+struct rb_gc_impl_each_objects_data {
+    int (*func)(void *, void *, size_t, void *);
+    void *data;
+};
+
+static int
+rb_gc_impl_each_objects_i(VALUE obj, void *d)
+{
+    struct rb_gc_impl_each_objects_data *data = d;
+
+    size_t slot_size = rb_gc_impl_obj_slot_size(obj);
+
+    return data->func((void *)obj, (void *)(obj + slot_size), slot_size, data->data);
+}
+
+void
+rb_gc_impl_each_objects(void *objspace_ptr, int (*func)(void *, void *, size_t, void *), void *data)
+{
+    struct rb_gc_impl_each_objects_data each_objects_data = {
+        .func = func,
+        .data = data
+    };
+
+    each_object(objspace_ptr, rb_gc_impl_each_objects_i, &each_objects_data);
+}
+
+struct rb_gc_impl_each_object_data {
+    void (*func)(VALUE, void *);
+    void *data;
+};
+
+static int
+rb_gc_impl_each_object_i(VALUE obj, void *d)
+{
+    struct rb_gc_impl_each_object_data *data = d;
+
+    data->func(obj, data->data);
+
+    return 0;
+}
+
+void
+rb_gc_impl_each_object(void *objspace_ptr, void (*func)(VALUE, void *), void *data)
+{
+    struct rb_gc_impl_each_object_data each_object_data = {
+        .func = func,
+        .data = data
+    };
+
+    each_object(objspace_ptr, rb_gc_impl_each_object_i, &each_object_data);
+}
+
+// Finalizers
+static VALUE
+gc_run_finalizers_get_final(long i, void *data)
+{
+    VALUE table = (VALUE)data;
+
+    return RARRAY_AREF(table, i + 1);
+}
+
+static void
+gc_run_finalizers(void *data)
+{
+    struct objspace *objspace = data;
+
+    rb_gc_set_pending_interrupt();
+
+    while (objspace->finalizer_jobs != NULL) {
+        struct MMTk_final_job *job = objspace->finalizer_jobs;
+        objspace->finalizer_jobs = job->next;
+
+        switch (job->kind) {
+          case MMTK_FINAL_JOB_DFREE:
+            job->as.dfree.func(job->as.dfree.data);
+            break;
+          case MMTK_FINAL_JOB_FINALIZE: {
+            VALUE finalizer_array = job->as.finalize.finalizer_array;
+
+            rb_gc_run_obj_finalizer(
+                RARRAY_AREF(finalizer_array, 0),
+                RARRAY_LEN(finalizer_array) - 1,
+                gc_run_finalizers_get_final,
+                (void *)finalizer_array
+            );
+
+            RB_GC_GUARD(finalizer_array);
+            break;
+          }
+        }
+
+        xfree(job);
+    }
+
+    rb_gc_unset_pending_interrupt();
+}
+
+void
+rb_gc_impl_make_zombie(void *objspace_ptr, VALUE obj, void (*dfree)(void *), void *data)
+{
+    if (dfree == NULL) return;
+
+    struct objspace *objspace = objspace_ptr;
+
+    struct MMTk_final_job *job = xmalloc(sizeof(struct MMTk_final_job));
+    job->kind = MMTK_FINAL_JOB_DFREE;
+    job->as.dfree.func = dfree;
+    job->as.dfree.data = data;
+
+    struct MMTk_final_job *prev;
+    do {
+        job->next = objspace->finalizer_jobs;
+        prev = RUBY_ATOMIC_PTR_CAS(objspace->finalizer_jobs, job->next, job);
+    } while (prev != job->next);
+
+    if (!ruby_free_at_exit_p()) {
+        rb_postponed_job_trigger(objspace->finalizer_postponed_job);
+    }
+}
+
+VALUE
+rb_gc_impl_define_finalizer(void *objspace_ptr, VALUE obj, VALUE block)
+{
+    struct objspace *objspace = objspace_ptr;
+    VALUE table;
+    st_data_t data;
+
+    RBASIC(obj)->flags |= FL_FINALIZE;
+
+    int lev = RB_GC_VM_LOCK();
+
+    if (st_lookup(objspace->finalizer_table, obj, &data)) {
+        table = (VALUE)data;
+
+        /* avoid duplicate block, table is usually small */
+        {
+            long len = RARRAY_LEN(table);
+            long i;
+
+            for (i = 0; i < len; i++) {
+                VALUE recv = RARRAY_AREF(table, i);
+                if (rb_equal(recv, block)) {
+                    RB_GC_VM_UNLOCK(lev);
+                    return recv;
+                }
+            }
+        }
+
+        rb_ary_push(table, block);
+    }
+    else {
+        table = rb_ary_new3(2, rb_obj_id(obj), block);
+        rb_obj_hide(table);
+        st_add_direct(objspace->finalizer_table, obj, table);
+    }
+
+    RB_GC_VM_UNLOCK(lev);
+
+    return block;
+}
+
+void
+rb_gc_impl_undefine_finalizer(void *objspace_ptr, VALUE obj)
+{
+    struct objspace *objspace = objspace_ptr;
+
+    st_data_t data = obj;
+
+    int lev = RB_GC_VM_LOCK();
+    st_delete(objspace->finalizer_table, &data, 0);
+    RB_GC_VM_UNLOCK(lev);
+
+    FL_UNSET(obj, FL_FINALIZE);
+}
+
+void
+rb_gc_impl_copy_finalizer(void *objspace_ptr, VALUE dest, VALUE obj)
+{
+    struct objspace *objspace = objspace_ptr;
+    VALUE table;
+    st_data_t data;
+
+    if (!FL_TEST(obj, FL_FINALIZE)) return;
+
+    int lev = RB_GC_VM_LOCK();
+    if (RB_LIKELY(st_lookup(objspace->finalizer_table, obj, &data))) {
+        table = rb_ary_dup((VALUE)data);
+        RARRAY_ASET(table, 0, rb_obj_id(dest));
+        st_insert(objspace->finalizer_table, dest, table);
+        FL_SET(dest, FL_FINALIZE);
+    }
+    else {
+        rb_bug("rb_gc_copy_finalizer: FL_FINALIZE set but not found in finalizer_table: %s", rb_obj_info(obj));
+    }
+    RB_GC_VM_UNLOCK(lev);
+}
+
+static int
+move_finalizer_from_table_i(st_data_t key, st_data_t val, st_data_t arg)
+{
+    struct objspace *objspace = (struct objspace *)arg;
+
+    make_final_job(objspace, (VALUE)key, (VALUE)val);
+
+    return ST_DELETE;
+}
+
+void
+rb_gc_impl_shutdown_call_finalizer(void *objspace_ptr)
+{
+    struct objspace *objspace = objspace_ptr;
+
+    while (objspace->finalizer_table->num_entries) {
+        st_foreach(objspace->finalizer_table, move_finalizer_from_table_i, (st_data_t)objspace);
+
+        gc_run_finalizers(objspace);
+    }
+
+    struct MMTk_RawVecOfObjRef registered_candidates = mmtk_get_all_obj_free_candidates();
+    for (size_t i = 0; i < registered_candidates.len; i++) {
+        VALUE obj = (VALUE)registered_candidates.ptr[i];
+
+        if (rb_gc_shutdown_call_finalizer_p(obj)) {
+            rb_gc_obj_free(objspace_ptr, obj);
+            RBASIC(obj)->flags = 0;
+        }
+    }
+    mmtk_free_raw_vec_of_obj_ref(registered_candidates);
+
+    gc_run_finalizers(objspace);
+}
+
+// Forking
+
+void
+rb_gc_impl_before_fork(void *objspace_ptr)
+{
+    mmtk_before_fork();
+}
+
+void
+rb_gc_impl_after_fork(void *objspace_ptr, rb_pid_t pid)
+{
+    mmtk_after_fork(rb_gc_get_ractor_newobj_cache());
+}
+
+// Statistics
+
+void
+rb_gc_impl_set_measure_total_time(void *objspace_ptr, VALUE flag)
+{
+    struct objspace *objspace = objspace_ptr;
+
+    objspace->measure_gc_time = RTEST(flag);
+}
+
+bool
+rb_gc_impl_get_measure_total_time(void *objspace_ptr)
+{
+    struct objspace *objspace = objspace_ptr;
+
+    return objspace->measure_gc_time;
+}
+
+unsigned long long
+rb_gc_impl_get_total_time(void *objspace_ptr)
+{
+    struct objspace *objspace = objspace_ptr;
+
+    return objspace->total_gc_time;
+}
+
+size_t
+rb_gc_impl_gc_count(void *objspace_ptr)
+{
+    struct objspace *objspace = objspace_ptr;
+
+    return objspace->gc_count;
+}
+
+VALUE
+rb_gc_impl_latest_gc_info(void *objspace_ptr, VALUE hash_or_key)
+{
+    VALUE hash = Qnil, key = Qnil;
+
+    if (SYMBOL_P(hash_or_key)) {
+        key = hash_or_key;
+    }
+    else if (RB_TYPE_P(hash_or_key, T_HASH)) {
+        hash = hash_or_key;
+    }
+    else {
+        rb_bug("gc_info_decode: non-hash or symbol given");
+    }
+
+#define SET(name, attr) \
+    if (key == ID2SYM(rb_intern_const(#name))) \
+        return (attr); \
+    else if (hash != Qnil) \
+        rb_hash_aset(hash, ID2SYM(rb_intern_const(#name)), (attr));
+
+    /* Hack to get StackProf working because it calls rb_gc_latest_gc_info with
+     * the :state key and expects a result. This always returns the :none state. */
+    SET(state, ID2SYM(rb_intern_const("none")));
+#undef SET
+
+    if (!NIL_P(key)) {
+        // Matched key should return above
+        return Qundef;
+    }
+
+    return hash;
+}
+
+enum gc_stat_sym {
+    gc_stat_sym_count,
+    gc_stat_sym_time,
+    gc_stat_sym_total_allocated_objects,
+    gc_stat_sym_total_bytes,
+    gc_stat_sym_used_bytes,
+    gc_stat_sym_free_bytes,
+    gc_stat_sym_starting_heap_address,
+    gc_stat_sym_last_heap_address,
+    gc_stat_sym_last
+};
+
+static VALUE gc_stat_symbols[gc_stat_sym_last];
+
+static void
+setup_gc_stat_symbols(void)
+{
+    if (gc_stat_symbols[0] == 0) {
+#define S(s) gc_stat_symbols[gc_stat_sym_##s] = ID2SYM(rb_intern_const(#s))
+        S(count);
+        S(time);
+        S(total_allocated_objects);
+        S(total_bytes);
+        S(used_bytes);
+        S(free_bytes);
+        S(starting_heap_address);
+        S(last_heap_address);
+    }
+}
+
+VALUE
+rb_gc_impl_stat(void *objspace_ptr, VALUE hash_or_sym)
+{
+    struct objspace *objspace = objspace_ptr;
+    VALUE hash = Qnil, key = Qnil;
+
+    setup_gc_stat_symbols();
+
+    if (RB_TYPE_P(hash_or_sym, T_HASH)) {
+        hash = hash_or_sym;
+    }
+    else if (SYMBOL_P(hash_or_sym)) {
+        key = hash_or_sym;
+    }
+    else {
+        rb_bug("non-hash or symbol given");
+    }
+
+#define SET(name, attr) \
+    if (key == gc_stat_symbols[gc_stat_sym_##name]) \
+        return SIZET2NUM(attr); \
+    else if (hash != Qnil) \
+        rb_hash_aset(hash, gc_stat_symbols[gc_stat_sym_##name], SIZET2NUM(attr));
+
+        SET(count, objspace->gc_count);
+        SET(time, objspace->total_gc_time / (1000 * 1000));
+        SET(total_allocated_objects, objspace->total_allocated_objects);
+        SET(total_bytes, mmtk_total_bytes());
+        SET(used_bytes, mmtk_used_bytes());
+        SET(free_bytes, mmtk_free_bytes());
+        SET(starting_heap_address, (size_t)mmtk_starting_heap_address());
+        SET(last_heap_address, (size_t)mmtk_last_heap_address());
+#undef SET
+
+    if (!NIL_P(key)) {
+        // Matched key should return above
+        return Qundef;
+    }
+
+    return hash;
+}
+
+VALUE
+rb_gc_impl_stat_heap(void *objspace_ptr, VALUE heap_name, VALUE hash_or_sym)
+{
+    if (RB_TYPE_P(hash_or_sym, T_HASH)) {
+        return hash_or_sym;
+    }
+    else {
+        return Qundef;
+    }
+}
+
+// Miscellaneous
+
+#define RB_GC_OBJECT_METADATA_ENTRY_COUNT 1
+static struct rb_gc_object_metadata_entry object_metadata_entries[RB_GC_OBJECT_METADATA_ENTRY_COUNT + 1];
+
+struct rb_gc_object_metadata_entry *
+rb_gc_impl_object_metadata(void *objspace_ptr, VALUE obj)
+{
+    static ID ID_object_id;
+
+    if (!ID_object_id) {
+#define I(s) ID_##s = rb_intern(#s);
+        I(object_id);
+#undef I
+    }
+
+    size_t n = 0;
+
+#define SET_ENTRY(na, v) do { \
+    RUBY_ASSERT(n <= RB_GC_OBJECT_METADATA_ENTRY_COUNT); \
+    object_metadata_entries[n].name = ID_##na; \
+    object_metadata_entries[n].val = v; \
+    n++; \
+} while (0)
+
+    if (rb_obj_id_p(obj)) SET_ENTRY(object_id, rb_obj_id(obj));
+
+    object_metadata_entries[n].name = 0;
+    object_metadata_entries[n].val = 0;
+
+    return object_metadata_entries;
+}
+
+bool
+rb_gc_impl_pointer_to_heap_p(void *objspace_ptr, const void *ptr)
+{
+    if (ptr == NULL) return false;
+    if ((uintptr_t)ptr % sizeof(void*) != 0) return false;
+    return mmtk_is_mmtk_object((MMTk_Address)ptr);
+}
+
+bool
+rb_gc_impl_garbage_object_p(void *objspace_ptr, VALUE obj)
+{
+    return false;
+}
+
+void rb_gc_impl_set_event_hook(void *objspace_ptr, const rb_event_flag_t event) { }
+
+void
+rb_gc_impl_copy_attributes(void *objspace_ptr, VALUE dest, VALUE obj)
+{
+    if (mmtk_object_wb_unprotected_p((MMTk_ObjectReference)obj)) {
+        rb_gc_impl_writebarrier_unprotect(objspace_ptr, dest);
+    }
+
+    rb_gc_impl_copy_finalizer(objspace_ptr, dest, obj);
+}
+
+// GC Identification
+
+const char *
+rb_gc_impl_active_gc_name(void)
+{
+    return "mmtk";
+}
diff --git a/gc/mmtk/mmtk.h b/gc/mmtk/mmtk.h
new file mode 100644
index 00000000000000..72b4d9df0377fe
--- /dev/null
+++ b/gc/mmtk/mmtk.h
@@ -0,0 +1,157 @@
+#ifndef MMTK_H
+#define MMTK_H
+
+/* Warning, this file is autogenerated by cbindgen from the mmtk-ruby repository. Don't modify this manually. */
+
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stddef.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+typedef struct MMTk_Builder MMTk_Builder;
+typedef struct MMTk_Mutator MMTk_Mutator;
+
+typedef struct MMTk_ractor_cache *MMTk_VMThread;
+typedef struct MMTk_ractor_cache *MMTk_VMMutatorThread;
+typedef struct MMTk_GCThreadTLS *MMTk_VMWorkerThread;
+typedef void *MMTk_Address;
+typedef void *MMTk_ObjectReference;
+typedef void *MMTk_NullableObjectReference;
+typedef uint32_t MMTk_AllocationSemantics;
+
+
+#define MMTk_OBJREF_OFFSET 8
+
+#define MMTk_MIN_OBJ_ALIGN 8
+
+#define MMTk_GC_THREAD_KIND_WORKER 1
+
+typedef struct MMTk_RubyBindingOptions {
+    bool ractor_check_mode;
+    size_t suffix_size;
+} MMTk_RubyBindingOptions;
+
+typedef MMTk_ObjectReference (*MMTk_ObjectClosureFunction)(void*, void*, MMTk_ObjectReference, bool);
+
+typedef struct MMTk_ObjectClosure {
+    /**
+     * The function to be called from C.
+     */
+    MMTk_ObjectClosureFunction c_function;
+    /**
+     * The pointer to the Rust-level closure object.
+     */
+    void *rust_closure;
+} MMTk_ObjectClosure;
+
+typedef struct MMTk_GCThreadTLS {
+    int kind;
+    void *gc_context;
+    struct MMTk_ObjectClosure object_closure;
+} MMTk_GCThreadTLS;
+
+typedef struct MMTk_RubyUpcalls {
+    void (*init_gc_worker_thread)(struct MMTk_GCThreadTLS *gc_worker_tls);
+    bool (*is_mutator)(void);
+    void (*stop_the_world)(void);
+    void (*resume_mutators)(void);
+    void (*block_for_gc)(MMTk_VMMutatorThread tls);
+    size_t (*number_of_mutators)(void);
+    void (*get_mutators)(void (*visit_mutator)(MMTk_Mutator*, void*), void *data);
+    void (*scan_gc_roots)(void);
+    void (*scan_objspace)(void);
+    void (*scan_object_ruby_style)(MMTk_ObjectReference object);
+    void (*call_gc_mark_children)(MMTk_ObjectReference object);
+    void (*call_obj_free)(MMTk_ObjectReference object);
+    size_t (*vm_live_bytes)(void);
+    void (*update_global_tables)(int tbl_idx);
+    int (*global_tables_count)(void);
+    void (*update_finalizer_table)(void);
+} MMTk_RubyUpcalls;
+
+typedef struct MMTk_RawVecOfObjRef {
+    MMTk_ObjectReference *ptr;
+    size_t len;
+    size_t capa;
+} MMTk_RawVecOfObjRef;
+
+bool mmtk_is_live_object(MMTk_ObjectReference object);
+
+bool mmtk_is_reachable(MMTk_ObjectReference object);
+
+MMTk_Builder *mmtk_builder_default(void);
+
+void mmtk_init_binding(MMTk_Builder *builder,
+                       const struct MMTk_RubyBindingOptions *_binding_options,
+                       const struct MMTk_RubyUpcalls *upcalls,
+                       MMTk_ObjectReference weak_reference_dead_value);
+
+void mmtk_initialize_collection(MMTk_VMThread tls);
+
+MMTk_Mutator *mmtk_bind_mutator(MMTk_VMMutatorThread tls);
+
+void mmtk_destroy_mutator(MMTk_Mutator *mutator);
+
+void mmtk_handle_user_collection_request(MMTk_VMMutatorThread tls, bool force, bool exhaustive);
+
+void mmtk_set_gc_enabled(bool enable);
+
+bool mmtk_gc_enabled_p(void);
+
+MMTk_Address mmtk_alloc(MMTk_Mutator *mutator,
+                        size_t size,
+                        size_t align,
+                        size_t offset,
+                        MMTk_AllocationSemantics semantics);
+
+void mmtk_post_alloc(MMTk_Mutator *mutator,
+                     MMTk_ObjectReference refer,
+                     size_t bytes,
+                     MMTk_AllocationSemantics semantics);
+
+void mmtk_add_obj_free_candidate(MMTk_ObjectReference object);
+
+void mmtk_mark_weak(MMTk_ObjectReference *ptr);
+
+void mmtk_remove_weak(const MMTk_ObjectReference *ptr);
+
+void mmtk_object_reference_write_post(MMTk_Mutator *mutator, MMTk_ObjectReference object);
+
+void mmtk_register_wb_unprotected_object(MMTk_ObjectReference object);
+
+bool mmtk_object_wb_unprotected_p(MMTk_ObjectReference object);
+
+void mmtk_enumerate_objects(void (*callback)(MMTk_ObjectReference, void*), void *data);
+
+struct MMTk_RawVecOfObjRef mmtk_get_all_obj_free_candidates(void);
+
+void mmtk_free_raw_vec_of_obj_ref(struct MMTk_RawVecOfObjRef raw_vec);
+
+void mmtk_before_fork(void);
+
+void mmtk_after_fork(MMTk_VMThread tls);
+
+size_t mmtk_total_bytes(void);
+
+size_t mmtk_used_bytes(void);
+
+size_t mmtk_free_bytes(void);
+
+MMTk_Address mmtk_starting_heap_address(void);
+
+MMTk_Address mmtk_last_heap_address(void);
+
+size_t mmtk_worker_count(void);
+
+const uint8_t *mmtk_plan(void);
+
+const uint8_t *mmtk_heap_mode(void);
+
+size_t mmtk_heap_min(void);
+
+size_t mmtk_heap_max(void);
+
+bool mmtk_is_mmtk_object(MMTk_Address addr);
+
+#endif  /* MMTK_H */
diff --git a/gc/mmtk/src/abi.rs b/gc/mmtk/src/abi.rs
new file mode 100644
index 00000000000000..81e24679f051db
--- /dev/null
+++ b/gc/mmtk/src/abi.rs
@@ -0,0 +1,325 @@
+use crate::api::RubyMutator;
+use crate::{extra_assert, Ruby};
+use libc::c_int;
+use mmtk::scheduler::GCWorker;
+use mmtk::util::{Address, ObjectReference, VMMutatorThread, VMWorkerThread};
+
+// For the C binding
+pub const OBJREF_OFFSET: usize = 8;
+pub const MIN_OBJ_ALIGN: usize = 8; // Even on 32-bit machine.  A Ruby object is at least 40 bytes large.
+
+pub const GC_THREAD_KIND_WORKER: libc::c_int = 1;
+
+const HIDDEN_SIZE_MASK: usize = 0x0000FFFFFFFFFFFF;
+
+// An opaque type for the C counterpart.
+#[allow(non_camel_case_types)]
+pub struct st_table;
+
+#[repr(C)]
+pub struct HiddenHeader {
+    pub prefix: usize,
+}
+
+impl HiddenHeader {
+    #[inline(always)]
+    pub fn is_sane(&self) -> bool {
+        self.prefix & !HIDDEN_SIZE_MASK == 0
+    }
+
+    #[inline(always)]
+    fn assert_sane(&self) {
+        extra_assert!(
+            self.is_sane(),
+            "Hidden header is corrupted: {:x}",
+            self.prefix
+        );
+    }
+
+    pub fn payload_size(&self) -> usize {
+        self.assert_sane();
+        self.prefix & HIDDEN_SIZE_MASK
+    }
+}
+
+/// Provide convenient methods for accessing Ruby objects.
+/// TODO: Wrap C functions in `RubyUpcalls` as Rust-friendly methods.
+pub struct RubyObjectAccess {
+    objref: ObjectReference,
+}
+
+impl RubyObjectAccess {
+    pub fn from_objref(objref: ObjectReference) -> Self {
+        Self { objref }
+    }
+
+    pub fn obj_start(&self) -> Address {
+        self.objref.to_raw_address().sub(Self::prefix_size())
+    }
+
+    pub fn payload_addr(&self) -> Address {
+        self.objref.to_raw_address()
+    }
+
+    pub fn suffix_addr(&self) -> Address {
+        self.objref.to_raw_address().add(self.payload_size())
+    }
+
+    pub fn obj_end(&self) -> Address {
+        self.suffix_addr() + Self::suffix_size()
+    }
+
+    fn hidden_header(&self) -> &'static HiddenHeader {
+        unsafe { self.obj_start().as_ref() }
+    }
+
+    #[allow(unused)] // Maybe we need to mutate the hidden header in the future.
+    fn hidden_header_mut(&self) -> &'static mut HiddenHeader {
+        unsafe { self.obj_start().as_mut_ref() }
+    }
+
+    pub fn payload_size(&self) -> usize {
+        self.hidden_header().payload_size()
+    }
+
+    fn flags_field(&self) -> Address {
+        self.objref.to_raw_address()
+    }
+
+    pub fn load_flags(&self) -> usize {
+        unsafe { self.flags_field().load::<usize>() }
+    }
+
+    pub fn prefix_size() -> usize {
+        // Currently, a hidden size field of word size is placed before each object.
+        OBJREF_OFFSET
+    }
+
+    pub fn suffix_size() -> usize {
+        // In RACTOR_CHECK_MODE, Ruby hides a field after each object to hold the Ractor ID.
+        unsafe { crate::BINDING_FAST.suffix_size }
+    }
+
+    pub fn object_size(&self) -> usize {
+        Self::prefix_size() + self.payload_size() + Self::suffix_size()
+    }
+}
+
+type ObjectClosureFunction =
+    extern "C" fn(*mut libc::c_void, *mut libc::c_void, ObjectReference, bool) -> ObjectReference;
+
+#[repr(C)]
+pub struct ObjectClosure {
+    /// The function to be called from C.
+    pub c_function: ObjectClosureFunction,
+    /// The pointer to the Rust-level closure object.
+    pub rust_closure: *mut libc::c_void,
+}
+
+impl Default for ObjectClosure {
+    fn default() -> Self {
+        Self {
+            c_function: THE_UNREGISTERED_CLOSURE_FUNC,
+            rust_closure: std::ptr::null_mut(),
+        }
+    }
+}
+
+/// Rust doesn't require function items to have a unique address.
+/// We therefore force using this particular constant.
+///
+/// See: https://rust-lang.github.io/rust-clippy/master/index.html#fn_address_comparisons
+const THE_UNREGISTERED_CLOSURE_FUNC: ObjectClosureFunction = ObjectClosure::c_function_unregistered;
+
+impl ObjectClosure {
+    /// Set this ObjectClosure temporarily to `visit_object`, and execute `f`.  During the execution of
+    /// `f`, the Ruby VM may call this ObjectClosure.  When the Ruby VM calls this ObjectClosure,
+    /// it effectively calls `visit_object`.
+    ///
+    /// This method is intended to run Ruby VM code in `f` with temporarily modified behavior of
+    /// `rb_gc_mark`, `rb_gc_mark_movable` and `rb_gc_location`
+    ///
+    /// Both `f` and `visit_object` may access and modify local variables in the environment where
+    /// `set_temporarily_and_run_code` called.
+    ///
+    /// Note that this function is not reentrant.  Don't call this function in either `callback` or
+    /// `f`.
+    pub fn set_temporarily_and_run_code<'env, T, F1, F2>(
+        &mut self,
+        mut visit_object: F1,
+        f: F2,
+    ) -> T
+    where
+        F1: 'env + FnMut(&'static mut GCWorker<Ruby>, ObjectReference, bool) -> ObjectReference,
+        F2: 'env + FnOnce() -> T,
+    {
+        debug_assert!(
+            std::ptr::fn_addr_eq(self.c_function, THE_UNREGISTERED_CLOSURE_FUNC),
+            "set_temporarily_and_run_code is recursively called."
+        );
+        self.c_function = Self::c_function_registered::<F1>;
+        self.rust_closure = &mut visit_object as *mut F1 as *mut libc::c_void;
+        let result = f();
+        *self = Default::default();
+        result
+    }
+
+    extern "C" fn c_function_registered<F>(
+        rust_closure: *mut libc::c_void,
+        worker: *mut libc::c_void,
+        object: ObjectReference,
+        pin: bool,
+    ) -> ObjectReference
+    where
+        F: FnMut(&'static mut GCWorker<Ruby>, ObjectReference, bool) -> ObjectReference,
+    {
+        let rust_closure = unsafe { &mut *(rust_closure as *mut F) };
+        let worker = unsafe { &mut *(worker as *mut GCWorker<Ruby>) };
+        rust_closure(worker, object, pin)
+    }
+
+    extern "C" fn c_function_unregistered(
+        _rust_closure: *mut libc::c_void,
+        worker: *mut libc::c_void,
+        object: ObjectReference,
+        pin: bool,
+    ) -> ObjectReference {
+        let worker = unsafe { &mut *(worker as *mut GCWorker<Ruby>) };
+        panic!(
+            "object_closure is not set.  worker ordinal: {}, object: {}, pin: {}",
+            worker.ordinal, object, pin
+        );
+    }
+}
+
+#[repr(C)]
+pub struct GCThreadTLS {
+    pub kind: libc::c_int,
+    pub gc_context: *mut libc::c_void,
+    pub object_closure: ObjectClosure,
+}
+
+impl GCThreadTLS {
+    fn new(kind: libc::c_int, gc_context: *mut libc::c_void) -> Self {
+        Self {
+            kind,
+            gc_context,
+            object_closure: Default::default(),
+        }
+    }
+
+    pub fn for_worker(gc_context: *mut GCWorker<Ruby>) -> Self {
+        Self::new(GC_THREAD_KIND_WORKER, gc_context as *mut libc::c_void)
+    }
+
+    pub fn from_vwt(vwt: VMWorkerThread) -> *mut GCThreadTLS {
+        unsafe { std::mem::transmute(vwt) }
+    }
+
+    /// Cast a pointer to `GCThreadTLS` to a ref, with assertion for null pointer.
+    ///
+    /// # Safety
+    ///
+    /// Has undefined behavior if `ptr` is invalid.
+    pub unsafe fn check_cast(ptr: *mut GCThreadTLS) -> &'static mut GCThreadTLS {
+        assert!(!ptr.is_null());
+        let result = unsafe { &mut *ptr };
+        debug_assert!({
+            let kind = result.kind;
+            kind == GC_THREAD_KIND_WORKER
+        });
+        result
+    }
+
+    /// Cast a pointer to `VMWorkerThread` to a ref, with assertion for null pointer.
+    ///
+    /// # Safety
+    ///
+    /// Has undefined behavior if `ptr` is invalid.
+    pub unsafe fn from_vwt_check(vwt: VMWorkerThread) -> &'static mut GCThreadTLS {
+        let ptr = Self::from_vwt(vwt);
+        unsafe { Self::check_cast(ptr) }
+    }
+
+    #[allow(clippy::not_unsafe_ptr_arg_deref)] // `transmute` does not dereference pointer
+    pub fn to_vwt(ptr: *mut Self) -> VMWorkerThread {
+        unsafe { std::mem::transmute(ptr) }
+    }
+
+    pub fn worker<'w>(&mut self) -> &'w mut GCWorker<Ruby> {
+        // NOTE: The returned ref points to the worker which does not have the same lifetime as self.
+        assert!(self.kind == GC_THREAD_KIND_WORKER);
+        unsafe { &mut *(self.gc_context as *mut GCWorker<Ruby>) }
+    }
+}
+
+#[repr(C)]
+#[derive(Clone)]
+pub struct RawVecOfObjRef {
+    pub ptr: *mut ObjectReference,
+    pub len: usize,
+    pub capa: usize,
+}
+
+impl RawVecOfObjRef {
+    pub fn from_vec(vec: Vec<ObjectReference>) -> RawVecOfObjRef {
+        // Note: Vec::into_raw_parts is unstable. We implement it manually.
+        let mut vec = std::mem::ManuallyDrop::new(vec);
+        let (ptr, len, capa) = (vec.as_mut_ptr(), vec.len(), vec.capacity());
+
+        RawVecOfObjRef { ptr, len, capa }
+    }
+
+    /// # Safety
+    ///
+    /// This function turns raw pointer into a Vec without check.
+    pub unsafe fn into_vec(self) -> Vec<ObjectReference> {
+        unsafe { Vec::from_raw_parts(self.ptr, self.len, self.capa) }
+    }
+}
+
+impl From<Vec<ObjectReference>> for RawVecOfObjRef {
+    fn from(v: Vec<ObjectReference>) -> Self {
+        Self::from_vec(v)
+    }
+}
+
+#[repr(C)]
+#[derive(Clone)]
+pub struct RubyBindingOptions {
+    pub ractor_check_mode: bool,
+    pub suffix_size: usize,
+}
+
+#[repr(C)]
+#[derive(Clone)]
+pub struct RubyUpcalls {
+    pub init_gc_worker_thread: extern "C" fn(gc_worker_tls: *mut GCThreadTLS),
+    pub is_mutator: extern "C" fn() -> bool,
+    pub stop_the_world: extern "C" fn(),
+    pub resume_mutators: extern "C" fn(),
+    pub block_for_gc: extern "C" fn(tls: VMMutatorThread),
+    pub number_of_mutators: extern "C" fn() -> usize,
+    pub get_mutators: extern "C" fn(
+        visit_mutator: extern "C" fn(*mut RubyMutator, *mut libc::c_void),
+        data: *mut libc::c_void,
+    ),
+    pub scan_gc_roots: extern "C" fn(),
+    pub scan_objspace: extern "C" fn(),
+    pub scan_object_ruby_style: extern "C" fn(object: ObjectReference),
+    pub call_gc_mark_children: extern "C" fn(object: ObjectReference),
+    pub call_obj_free: extern "C" fn(object: ObjectReference),
+    pub vm_live_bytes: extern "C" fn() -> usize,
+    pub update_global_tables: extern "C" fn(tbl_idx: c_int),
+    pub global_tables_count: extern "C" fn() -> c_int,
+    pub update_finalizer_table: extern "C" fn(),
+}
+
+unsafe impl Sync for RubyUpcalls {}
+
+#[repr(C)]
+#[derive(Clone)]
+pub struct HeapBounds {
+    pub start: *mut libc::c_void,
+    pub end: *mut libc::c_void,
+}
diff --git a/gc/mmtk/src/active_plan.rs b/gc/mmtk/src/active_plan.rs
new file mode 100644
index 00000000000000..80372a7576ca07
--- /dev/null
+++ b/gc/mmtk/src/active_plan.rs
@@ -0,0 +1,56 @@
+use std::collections::VecDeque;
+use std::marker::PhantomData;
+
+use crate::mmtk;
+use crate::upcalls;
+use crate::Ruby;
+use mmtk::util::opaque_pointer::*;
+use mmtk::vm::ActivePlan;
+use mmtk::Mutator;
+
+pub struct VMActivePlan {}
+
+impl ActivePlan<Ruby> for VMActivePlan {
+    fn number_of_mutators() -> usize {
+        (upcalls().number_of_mutators)()
+    }
+
+    fn is_mutator(_tls: VMThread) -> bool {
+        (upcalls().is_mutator)()
+    }
+
+    fn mutator(_tls: VMMutatorThread) -> &'static mut Mutator<Ruby> {
+        unimplemented!()
+    }
+
+    fn mutators<'a>() -> Box<dyn Iterator<Item = &'a mut Mutator<Ruby>> + 'a> {
+        let mut mutators = VecDeque::new();
+        (upcalls().get_mutators)(
+            add_mutator_to_vec,
+            &mut mutators as *mut VecDeque<&mut Mutator<Ruby>> as _,
+        );
+
+        Box::new(RubyMutatorIterator {
+            mutators,
+            phantom_data: PhantomData,
+        })
+    }
+}
+
+extern "C" fn add_mutator_to_vec(mutator: *mut Mutator<Ruby>, mutators: *mut libc::c_void) {
+    let mutators = unsafe { &mut *(mutators as *mut VecDeque<*mut Mutator<Ruby>>) };
+    mutators.push_back(unsafe { &mut *mutator });
+}
+
+struct RubyMutatorIterator<'a> {
+    mutators: VecDeque<&'a mut Mutator<Ruby>>,
+    phantom_data: PhantomData<&'a ()>,
+}
+
+impl<'a> Iterator for RubyMutatorIterator<'a> {
+    type Item = &'a mut Mutator<Ruby>;
+
+    fn next(&mut self) -> Option<Self::Item> {
+        self.mutators.pop_front()
+    }
+}
diff --git a/gc/mmtk/src/api.rs b/gc/mmtk/src/api.rs
new file mode 100644
index 00000000000000..a1b94d520d57f4
--- /dev/null
+++ b/gc/mmtk/src/api.rs
@@ -0,0 +1,406 @@
+// Functions in this module are unsafe for one reason:
+// They are called by C functions and they need to pass raw pointers to Rust.
+#![allow(clippy::missing_safety_doc)]
+
+use mmtk::util::options::PlanSelector;
+use std::str::FromStr;
+use std::sync::atomic::Ordering;
+
+use crate::abi::RawVecOfObjRef;
+use crate::abi::RubyBindingOptions;
+use crate::abi::RubyUpcalls;
+use crate::binding;
+use crate::binding::RubyBinding;
+use crate::mmtk;
+use crate::utils::default_heap_max;
+use crate::utils::parse_capacity;
+use crate::Ruby;
+use crate::RubySlot;
+use mmtk::memory_manager;
+use mmtk::memory_manager::mmtk_init;
+use mmtk::util::constants::MIN_OBJECT_SIZE;
+use mmtk::util::options::GCTriggerSelector;
+use mmtk::util::Address;
+use mmtk::util::ObjectReference;
+use mmtk::util::VMMutatorThread;
+use mmtk::util::VMThread;
+use mmtk::AllocationSemantics;
+use mmtk::MMTKBuilder;
+use mmtk::Mutator;
+
+pub type RubyMutator = Mutator<Ruby>;
+
+#[no_mangle]
+pub extern "C" fn mmtk_is_live_object(object: ObjectReference) -> bool {
+    memory_manager::is_live_object(object)
+}
+
+#[no_mangle]
+pub extern "C" fn mmtk_is_reachable(object: ObjectReference) -> bool {
+    object.is_reachable()
+}
+
+// =============== Bootup ===============
+
+fn parse_env_var_with<T, F: FnOnce(&str) -> Option<T>>(key: &str, parse: F) -> Option<T> {
+    let val = match std::env::var(key) {
+        Ok(val) => val,
+        Err(std::env::VarError::NotPresent) => return None,
+        Err(std::env::VarError::NotUnicode(os_string)) => {
+            eprintln!("[FATAL] Invalid {key} {os_string:?}");
+            std::process::exit(1);
+        }
+    };
+
+    let parsed = parse(&val).unwrap_or_else(|| {
+        eprintln!("[FATAL] Invalid {key} {val}");
+        std::process::exit(1);
+    });
+
+    Some(parsed)
+}
+
+fn parse_env_var<T: FromStr>(key: &str) -> Option<T> {
+    parse_env_var_with(key, |s| s.parse().ok())
+}
+
+fn mmtk_builder_default_parse_threads() -> Option<usize> {
+    parse_env_var("MMTK_THREADS")
+}
+
+fn mmtk_builder_default_parse_heap_min() -> usize {
+    const DEFAULT_HEAP_MIN: usize = 1 << 20;
+    parse_env_var_with("MMTK_HEAP_MIN", parse_capacity).unwrap_or(DEFAULT_HEAP_MIN)
+}
+
+fn mmtk_builder_default_parse_heap_max() -> usize {
+    parse_env_var_with("MMTK_HEAP_MAX", parse_capacity).unwrap_or_else(default_heap_max)
+}
+
+fn mmtk_builder_default_parse_heap_mode(heap_min: usize, heap_max: usize) -> GCTriggerSelector {
+    let make_fixed = || GCTriggerSelector::FixedHeapSize(heap_max);
+    let make_dynamic = || GCTriggerSelector::DynamicHeapSize(heap_min, heap_max);
+
+    parse_env_var_with("MMTK_HEAP_MODE", |s| match s {
+        "fixed" => Some(make_fixed()),
+        "dynamic" => Some(make_dynamic()),
+        _ => None,
+    })
+    .unwrap_or_else(make_dynamic)
+}
+
+fn mmtk_builder_default_parse_plan() -> PlanSelector {
+    parse_env_var_with("MMTK_PLAN", |s| match s {
+        "NoGC" => Some(PlanSelector::NoGC),
+        "MarkSweep" => Some(PlanSelector::MarkSweep),
+        "Immix" => Some(PlanSelector::Immix),
+        _ => None,
+    })
+    .unwrap_or(PlanSelector::Immix)
+}
+
+#[no_mangle]
+pub extern "C" fn mmtk_builder_default() -> *mut MMTKBuilder {
+    let mut builder = MMTKBuilder::new_no_env_vars();
+    builder.options.no_finalizer.set(true);
+
+    if let Some(threads) = mmtk_builder_default_parse_threads() {
+        if !builder.options.threads.set(threads) {
+            // MMTk will validate it and reject 0.
+            eprintln!(
+                "[FATAL] Failed to set the number of MMTk threads to {}",
+                threads
+            );
+            std::process::exit(1);
+        }
+    }
+
+    let heap_min = mmtk_builder_default_parse_heap_min();
+
+    let heap_max = mmtk_builder_default_parse_heap_max();
+
+    if heap_min >= heap_max {
+        eprintln!(
+            "[FATAL] MMTK_HEAP_MIN({}) >= MMTK_HEAP_MAX({})",
+            heap_min, heap_max
+        );
+        std::process::exit(1);
+    }
+
+    builder
+        .options
+        .gc_trigger
+        .set(mmtk_builder_default_parse_heap_mode(heap_min, heap_max));
+
+    builder.options.plan.set(mmtk_builder_default_parse_plan());
+
+    Box::into_raw(Box::new(builder))
+}
+
+#[no_mangle]
+pub unsafe extern "C" fn mmtk_init_binding(
+    builder: *mut MMTKBuilder,
+    _binding_options: *const RubyBindingOptions,
+    upcalls: *const RubyUpcalls,
+    weak_reference_dead_value: ObjectReference,
+) {
+    crate::set_panic_hook();
+
+    let builder = unsafe { Box::from_raw(builder) };
+    let binding_options = RubyBindingOptions {
+        ractor_check_mode: false,
+        suffix_size: 0,
+    };
+    let mmtk_boxed = mmtk_init(&builder);
+    let mmtk_static = Box::leak(Box::new(mmtk_boxed));
+
+    let binding = RubyBinding::new(
+        mmtk_static,
+        &binding_options,
+        upcalls,
+        weak_reference_dead_value,
+    );
+
+    crate::BINDING
+        .set(binding)
+        .unwrap_or_else(|_| panic!("Binding is already initialized"));
+}
+
+#[no_mangle]
+pub extern "C" fn mmtk_initialize_collection(tls: VMThread) {
+    memory_manager::initialize_collection(mmtk(), tls)
+}
+
+#[no_mangle]
+pub extern "C" fn mmtk_bind_mutator(tls: VMMutatorThread) -> *mut RubyMutator {
+    Box::into_raw(memory_manager::bind_mutator(mmtk(), tls))
+}
+
+#[no_mangle]
+pub unsafe extern "C" fn mmtk_destroy_mutator(mutator: *mut RubyMutator) {
+    // notify mmtk-core about destroyed mutator
+    memory_manager::destroy_mutator(unsafe { &mut *mutator });
+    // turn the ptr back to a box, and let Rust properly reclaim it
+    let _ = unsafe { Box::from_raw(mutator) };
+}
+
+// =============== GC ===============
+
+#[no_mangle]
+pub extern "C" fn mmtk_handle_user_collection_request(
+    tls: VMMutatorThread,
+    force: bool,
+    exhaustive: bool,
+) {
+    crate::mmtk().handle_user_collection_request(tls, force, exhaustive);
+}
+
+#[no_mangle]
+pub extern "C" fn mmtk_set_gc_enabled(enable: bool) {
+    crate::CONFIGURATION
+        .gc_enabled
+        .store(enable, Ordering::Relaxed);
+}
+
+#[no_mangle]
+pub extern "C" fn mmtk_gc_enabled_p() -> bool {
+    crate::CONFIGURATION.gc_enabled.load(Ordering::Relaxed)
+}
+
+// =============== Object allocation ===============
+
+#[no_mangle]
+pub unsafe extern "C" fn mmtk_alloc(
+    mutator: *mut RubyMutator,
+    size: usize,
+    align: usize,
+    offset: usize,
+    semantics: AllocationSemantics,
+) -> Address {
+    let clamped_size = size.max(MIN_OBJECT_SIZE);
+    memory_manager::alloc::<Ruby>(
+        unsafe { &mut *mutator },
+        clamped_size,
+        align,
+        offset,
+        semantics,
+    )
+}
+
+#[no_mangle]
+pub unsafe extern "C" fn mmtk_post_alloc(
+    mutator: *mut RubyMutator,
+    refer: ObjectReference,
+    bytes: usize,
+    semantics: AllocationSemantics,
+) {
+    memory_manager::post_alloc::<Ruby>(unsafe { &mut *mutator }, refer, bytes, semantics)
+}
+
+// TODO: Replace with buffered mmtk_add_obj_free_candidates
+#[no_mangle]
+pub extern "C" fn mmtk_add_obj_free_candidate(object: ObjectReference) {
+    binding().weak_proc.add_obj_free_candidate(object)
+}
+
+// =============== Marking ===============
+
+#[no_mangle]
+pub extern "C" fn mmtk_mark_weak(ptr: &'static mut ObjectReference) {
+    binding().weak_proc.add_weak_reference(ptr);
+}
+
+#[no_mangle]
+pub extern "C" fn mmtk_remove_weak(ptr: &ObjectReference) {
+    binding().weak_proc.remove_weak_reference(ptr);
+}
+
+// =============== Write barriers ===============
+
+#[no_mangle]
+pub unsafe extern "C" fn mmtk_object_reference_write_post(
+    mutator: *mut RubyMutator,
+    object: ObjectReference,
+) {
+    let ignored_slot = RubySlot::from_address(Address::ZERO);
+    let ignored_target = ObjectReference::from_raw_address(Address::ZERO);
+    mmtk::memory_manager::object_reference_write_post(
+        unsafe { &mut *mutator },
+        object,
+        ignored_slot,
+        ignored_target,
+    )
+}
+
+#[no_mangle]
+pub extern "C" fn mmtk_register_wb_unprotected_object(object: ObjectReference) {
+    crate::binding().register_wb_unprotected_object(object)
+}
+
+#[no_mangle]
+pub extern "C" fn mmtk_object_wb_unprotected_p(object: ObjectReference) -> bool {
+    crate::binding().object_wb_unprotected_p(object)
+}
+
+// =============== Heap walking ===============
+
+#[no_mangle]
+pub extern "C" fn mmtk_enumerate_objects(
+    callback: extern "C" fn(ObjectReference, *mut libc::c_void),
+    data: *mut libc::c_void,
+) {
+    crate::mmtk().enumerate_objects(|object| {
+        callback(object, data);
+    })
+}
+
+// =============== Finalizers ===============
+
+#[no_mangle]
+pub extern "C" fn mmtk_get_all_obj_free_candidates() -> RawVecOfObjRef {
+    let vec = binding().weak_proc.get_all_obj_free_candidates();
+    RawVecOfObjRef::from_vec(vec)
+}
+
+#[no_mangle]
+pub extern "C" fn mmtk_free_raw_vec_of_obj_ref(raw_vec: RawVecOfObjRef) {
+    unsafe { raw_vec.into_vec() };
+}
+
+// =============== Forking ===============
+
+#[no_mangle]
+pub extern "C" fn mmtk_before_fork() {
+    mmtk().prepare_to_fork();
+    binding().join_all_gc_threads();
+}
+
+#[no_mangle]
+pub extern "C" fn mmtk_after_fork(tls: VMThread) {
+    mmtk().after_fork(tls);
+}
+
+// =============== Statistics ===============
+
+#[no_mangle]
+pub extern "C" fn mmtk_total_bytes() -> usize {
+    memory_manager::total_bytes(mmtk())
+}
+
+#[no_mangle]
+pub extern "C" fn mmtk_used_bytes() -> usize {
+    memory_manager::used_bytes(mmtk())
+}
+
+#[no_mangle]
+pub extern "C" fn mmtk_free_bytes() -> usize {
+    memory_manager::free_bytes(mmtk())
+}
+
+#[no_mangle]
+pub extern "C" fn mmtk_starting_heap_address() -> Address {
+    memory_manager::starting_heap_address()
+}
+
+#[no_mangle]
+pub extern "C" fn mmtk_last_heap_address() -> Address {
+    memory_manager::last_heap_address()
+}
+
+#[no_mangle]
+pub extern "C" fn mmtk_worker_count() -> usize {
+    memory_manager::num_of_workers(mmtk())
+}
+
+#[no_mangle]
+pub extern "C" fn mmtk_plan() -> *const u8 {
+    static NO_GC: &[u8] = b"NoGC\0";
+    static MARK_SWEEP: &[u8] = b"MarkSweep\0";
+    static IMMIX: &[u8] = b"Immix\0";
+
+    match *crate::BINDING.get().unwrap().mmtk.get_options().plan {
+        PlanSelector::NoGC => NO_GC.as_ptr(),
+        PlanSelector::MarkSweep => MARK_SWEEP.as_ptr(),
+        PlanSelector::Immix => IMMIX.as_ptr(),
+        _ => panic!("Unknown plan"),
+    }
+}
+
+#[no_mangle]
+pub extern "C" fn mmtk_heap_mode() -> *const u8 {
+    static FIXED_HEAP: &[u8] = b"fixed\0";
+    static DYNAMIC_HEAP: &[u8] = b"dynamic\0";
+
+    match *crate::BINDING.get().unwrap().mmtk.get_options().gc_trigger {
+        GCTriggerSelector::FixedHeapSize(_) => FIXED_HEAP.as_ptr(),
+        GCTriggerSelector::DynamicHeapSize(_, _) => DYNAMIC_HEAP.as_ptr(),
+        _ => panic!("Unknown heap mode"),
+    }
+}
+
+#[no_mangle]
+pub extern "C" fn mmtk_heap_min() -> usize {
+    match *crate::BINDING.get().unwrap().mmtk.get_options().gc_trigger {
+        GCTriggerSelector::FixedHeapSize(_) => 0,
+        GCTriggerSelector::DynamicHeapSize(min_size, _) => min_size,
+        _ => panic!("Unknown heap mode"),
+    }
+}
+
+#[no_mangle]
+pub extern "C" fn mmtk_heap_max() -> usize {
+    match *crate::BINDING.get().unwrap().mmtk.get_options().gc_trigger {
+        GCTriggerSelector::FixedHeapSize(max_size) => max_size,
+        GCTriggerSelector::DynamicHeapSize(_, max_size) => max_size,
+        _ => panic!("Unknown heap mode"),
+    }
+}
+
+// =============== Miscellaneous ===============
+
+#[no_mangle]
+pub extern "C" fn mmtk_is_mmtk_object(addr: Address) -> bool {
+    debug_assert!(!addr.is_zero());
+    debug_assert!(addr.is_aligned_to(mmtk::util::is_mmtk_object::VO_BIT_REGION_SIZE));
+    memory_manager::is_mmtk_object(addr).is_some()
+}
diff --git a/gc/mmtk/src/binding.rs b/gc/mmtk/src/binding.rs
new file mode 100644
index 00000000000000..619b7f246ce704
--- /dev/null
+++ b/gc/mmtk/src/binding.rs
@@ -0,0 +1,131 @@
+use std::collections::HashSet;
+use std::ffi::CString;
+use std::sync::atomic::AtomicBool;
+use std::sync::Mutex;
+use std::thread::JoinHandle;
+
+use mmtk::util::ObjectReference;
+use mmtk::MMTK;
+
+use crate::abi;
+use crate::abi::RubyBindingOptions;
+use crate::weak_proc::WeakProcessor;
+use crate::Ruby;
+
+pub struct RubyBindingFast {
+    pub suffix_size: usize,
+}
+
+impl Default for RubyBindingFast {
+    fn default() -> Self {
+        Self::new()
+    }
+}
+
+impl RubyBindingFast {
+    pub const fn new() -> Self {
+        Self { suffix_size: 0 }
+    }
+}
+
+pub struct RubyConfiguration {
+    pub gc_enabled: AtomicBool,
+}
+
+impl Default for RubyConfiguration {
+    fn default() -> Self {
+        Self::new()
+    }
+}
+
+impl RubyConfiguration {
+    pub const fn new() -> Self {
+        Self {
+            // Mimic the old behavior when the gc_enabled flag was in mmtk-core.
+            // We may refactor it so that it is false by default.
+            gc_enabled: AtomicBool::new(true),
+        }
+    }
+}
+
+pub struct RubyBinding {
+    pub mmtk: &'static MMTK<Ruby>,
+    pub options: RubyBindingOptions,
+    pub upcalls: *const abi::RubyUpcalls,
+    pub plan_name: Mutex<Option<CString>>,
+    pub weak_proc: WeakProcessor,
+    pub gc_thread_join_handles: Mutex<Vec<JoinHandle<()>>>,
+    pub wb_unprotected_objects: Mutex<HashSet<ObjectReference>>,
+
+    pub weak_reference_dead_value: ObjectReference,
+}
+
+unsafe impl Sync for RubyBinding {}
+unsafe impl Send for RubyBinding {}
+
+impl RubyBinding {
+    pub fn new(
+        mmtk: &'static MMTK<Ruby>,
+        binding_options: &RubyBindingOptions,
+        upcalls: *const abi::RubyUpcalls,
+        weak_reference_dead_value: ObjectReference,
+    ) -> Self {
+        unsafe {
+            crate::BINDING_FAST.suffix_size = binding_options.suffix_size;
+        }
+
+        Self {
+            mmtk,
+            options: binding_options.clone(),
+            upcalls,
+            plan_name: Mutex::new(None),
+            weak_proc: WeakProcessor::new(),
+            gc_thread_join_handles: Default::default(),
+            wb_unprotected_objects: Default::default(),
+
+            weak_reference_dead_value,
+        }
+    }
+
+    pub fn upcalls(&self) -> &'static abi::RubyUpcalls {
+        unsafe { &*self.upcalls as &'static abi::RubyUpcalls }
+    }
+
+    pub fn get_plan_name_c(&self) -> *const libc::c_char {
+        let mut plan_name = self.plan_name.lock().unwrap();
+        if plan_name.is_none() {
+            let name_string = format!("{:?}", *self.mmtk.get_options().plan);
+            let c_string = CString::new(name_string)
+                .unwrap_or_else(|e| panic!("Failed converting plan name to CString: {e}"));
+            *plan_name = Some(c_string);
+        }
+        plan_name.as_deref().unwrap().as_ptr()
+    }
+
+    pub fn join_all_gc_threads(&self) {
+        let handles = {
+            let mut guard = self.gc_thread_join_handles.lock().unwrap();
+            std::mem::take(&mut *guard)
+        };
+
+        debug!("Joining GC threads...");
+        let total = handles.len();
+        let mut joined = 0;
+        for handle in handles {
+            handle.join().unwrap();
+            joined += 1;
+            debug!("{joined}/{total} GC threads joined.");
+        }
+    }
+
+    pub fn register_wb_unprotected_object(&self, object: ObjectReference) {
+        debug!("Registering WB-unprotected object: {}", object);
+        let mut objects = self.wb_unprotected_objects.lock().unwrap();
+        objects.insert(object);
+    }
+
+    pub fn object_wb_unprotected_p(&self, object: ObjectReference) -> bool {
+        let objects = self.wb_unprotected_objects.lock().unwrap();
+        objects.contains(&object)
+    }
+}
diff --git a/gc/mmtk/src/collection.rs b/gc/mmtk/src/collection.rs
new file mode 100644
index 00000000000000..0570b64e3a6012
--- /dev/null
+++ b/gc/mmtk/src/collection.rs
@@ -0,0 +1,87 @@
+use crate::abi::GCThreadTLS;
+
+use crate::api::RubyMutator;
+use crate::{mmtk, upcalls, Ruby};
+use mmtk::memory_manager;
+use mmtk::scheduler::*;
+use mmtk::util::{VMMutatorThread, VMThread, VMWorkerThread};
+use mmtk::vm::{Collection, GCThreadContext};
+use std::sync::atomic::Ordering;
+use std::thread;
+
+pub struct VMCollection {}
+
+impl Collection<Ruby> for VMCollection {
+    fn is_collection_enabled() -> bool {
+        crate::CONFIGURATION.gc_enabled.load(Ordering::Relaxed)
+    }
+
+    fn stop_all_mutators<F>(_tls: VMWorkerThread, mut mutator_visitor: F)
+    where
+        F: FnMut(&'static mut mmtk::Mutator<Ruby>),
+    {
+        (upcalls().stop_the_world)();
+        (upcalls().get_mutators)(
+            Self::notify_mutator_ready::<F>,
+            &mut mutator_visitor as *mut F as *mut _,
+        );
+    }
+
+    fn resume_mutators(_tls: VMWorkerThread) {
+        (upcalls().resume_mutators)();
+    }
+
+    fn block_for_gc(tls: VMMutatorThread) {
+        (upcalls().block_for_gc)(tls);
+    }
+
+    fn spawn_gc_thread(_tls: VMThread, ctx: GCThreadContext<Ruby>) {
+        let join_handle = match ctx {
+            GCThreadContext::Worker(mut worker) => thread::Builder::new()
+                .name("MMTk Worker Thread".to_string())
+                .spawn(move || {
+                    let ordinal = worker.ordinal;
+                    debug!(
+                        "Hello! This is MMTk Worker Thread running! ordinal: {}",
+                        ordinal
+                    );
+                    crate::register_gc_thread(thread::current().id());
+                    let ptr_worker = &mut *worker as *mut GCWorker<Ruby>;
+                    let gc_thread_tls =
+                        Box::into_raw(Box::new(GCThreadTLS::for_worker(ptr_worker)));
+                    (upcalls().init_gc_worker_thread)(gc_thread_tls);
+                    memory_manager::start_worker(
+                        mmtk(),
+                        GCThreadTLS::to_vwt(gc_thread_tls),
+                        worker,
+                    );
+                    debug!(
+                        "An MMTk Worker Thread is quitting. Good bye! ordinal: {}",
+                        ordinal
+                    );
+                    crate::unregister_gc_thread(thread::current().id());
+                })
+                .unwrap(),
+        };
+
+        {
+            let mut handles = crate::binding().gc_thread_join_handles.lock().unwrap();
+            handles.push(join_handle);
+        }
+    }
+
+    fn vm_live_bytes() -> usize {
+        (upcalls().vm_live_bytes)()
+    }
+}
+
+impl VMCollection {
+    extern "C" fn notify_mutator_ready<F>(mutator_ptr: *mut RubyMutator, data: *mut libc::c_void)
+    where
+        F: FnMut(&'static mut mmtk::Mutator<Ruby>),
+    {
+        let mutator = unsafe { &mut *mutator_ptr };
+        let mutator_visitor = unsafe { &mut *(data as *mut F) };
+        mutator_visitor(mutator);
+    }
+}
diff --git a/gc/mmtk/src/lib.rs b/gc/mmtk/src/lib.rs
new file mode 100644
index 00000000000000..d16a5bf42f2ec5
--- /dev/null
+++ b/gc/mmtk/src/lib.rs
@@ -0,0 +1,148 @@
+// Warn about unsafe operations in functions that are already marked as unsafe.
+// This will become default in Rust 2024 edition.
+#![warn(unsafe_op_in_unsafe_fn)]
+
+extern crate libc;
+extern crate mmtk;
+#[macro_use]
+extern crate log;
+extern crate probe;
+
+use std::collections::HashSet;
+use std::panic::PanicHookInfo;
+use std::sync::Mutex;
+use std::thread::ThreadId;
+
+use abi::RubyUpcalls;
+use binding::{RubyBinding, RubyBindingFast, RubyConfiguration};
+use mmtk::vm::slot::{SimpleSlot, UnimplementedMemorySlice};
+use mmtk::vm::VMBinding;
+use mmtk::MMTK;
+use once_cell::sync::OnceCell;
+
+pub mod abi;
+pub mod active_plan;
+pub mod api;
+pub mod binding;
+pub mod collection;
+pub mod object_model;
+pub mod reference_glue;
+pub mod scanning;
+pub mod utils;
+pub mod weak_proc;
+
+#[derive(Default)]
+pub struct Ruby;
+
+/// Ruby slot type, i.e. a slot that holds a VALUE.
+/// Currently we use SimpleSlot.
+/// It doesn't matter, becaues we have not started using slot-enqueuing, yet.
+pub type RubySlot = SimpleSlot;
+
+/// Ruby memory slice, i.e. an array of VALUEs.
+/// It is used by array-copy barriers which is supposed to perform bettern than copying array
+/// elements one by one.  At this moment, we just leave it unimplemented.
+pub type RubyMemorySlice = UnimplementedMemorySlice<RubySlot>;
+
+impl VMBinding for Ruby {
+    type VMObjectModel = object_model::VMObjectModel;
+    type VMScanning = scanning::VMScanning;
+    type VMCollection = collection::VMCollection;
+    type VMActivePlan = active_plan::VMActivePlan;
+    type VMReferenceGlue = reference_glue::VMReferenceGlue;
+
+    type VMSlot = RubySlot;
+    type VMMemorySlice = RubyMemorySlice;
+}
+
+/// The singleton object for the Ruby binding itself.
+pub static BINDING: OnceCell<RubyBinding> = OnceCell::new();
+
+/// Some data needs to be accessed fast.
+/// We sacrifice safety for speed using unsynchronized global variables.
+pub static mut BINDING_FAST: RubyBindingFast = RubyBindingFast::new();
+
+/// Some data needs to be accessed fast.
+pub static CONFIGURATION: RubyConfiguration = RubyConfiguration::new();
+
+pub fn binding<'b>() -> &'b RubyBinding {
+    BINDING
+        .get()
+        .expect("Attempt to use the binding before it is initialization")
+}
+
+pub fn mmtk() -> &'static MMTK<Ruby> {
+    binding().mmtk
+}
+
+pub fn upcalls() -> &'static RubyUpcalls {
+    binding().upcalls()
+}
+
+pub static GC_THREADS: OnceCell<Mutex<HashSet<ThreadId>>> = OnceCell::new();
+
+pub(crate) fn register_gc_thread(thread_id: ThreadId) {
+    let mut gc_threads = GC_THREADS.get().unwrap().lock().unwrap();
+    gc_threads.insert(thread_id);
+}
+
+pub(crate) fn unregister_gc_thread(thread_id: ThreadId) {
+    let mut gc_threads = GC_THREADS.get().unwrap().lock().unwrap();
+    gc_threads.remove(&thread_id);
+}
+
+pub(crate) fn is_gc_thread(thread_id: ThreadId) -> bool {
+    let gc_threads = GC_THREADS.get().unwrap().lock().unwrap();
+    gc_threads.contains(&thread_id)
+}
+
+fn handle_gc_thread_panic(panic_info: &PanicHookInfo) {
+    eprintln!("ERROR: An MMTk GC thread panicked.  This is a bug.");
+    eprintln!("{panic_info}");
+
+    let bt = std::backtrace::Backtrace::capture();
+    match bt.status() {
+        std::backtrace::BacktraceStatus::Unsupported => {
+            eprintln!("Backtrace is unsupported.")
+        }
+        std::backtrace::BacktraceStatus::Disabled => {
+            eprintln!("Backtrace is disabled.");
+            eprintln!("run with `RUST_BACKTRACE=1` environment variable to display a backtrace");
+        }
+        std::backtrace::BacktraceStatus::Captured => {
+            eprintln!("{bt}");
+        }
+        s => {
+            eprintln!("Unknown backtrace status: {s:?}");
+        }
+    }
+
+    std::process::abort();
+}
+
+pub(crate) fn set_panic_hook() {
+    if GC_THREADS.set(Default::default()).is_err() {
+        return;
+    }
+
+    let old_hook = std::panic::take_hook();
+
+    std::panic::set_hook(Box::new(move |panic_info| {
+        if is_gc_thread(std::thread::current().id()) {
+            handle_gc_thread_panic(panic_info);
+        } else {
+            old_hook(panic_info);
+        }
+    }));
+}
+
+/// This kind of assertion is enabled if either building in debug mode or the
+/// "extra_assert" feature is enabled.
+#[macro_export]
+macro_rules! extra_assert {
+    ($($arg:tt)*) => {
+        if std::cfg!(any(debug_assertions, feature = "extra_assert")) {
+            std::assert!($($arg)*);
+        }
+    };
+}
diff --git a/gc/mmtk/src/object_model.rs b/gc/mmtk/src/object_model.rs
new file mode 100644
index 00000000000000..93b6063a05d506
--- /dev/null
+++ b/gc/mmtk/src/object_model.rs
@@ -0,0 +1,89 @@
+use crate::abi::{RubyObjectAccess, OBJREF_OFFSET};
+use crate::{abi, Ruby};
+use mmtk::util::constants::BITS_IN_BYTE;
+use mmtk::util::copy::{CopySemantics, GCWorkerCopyContext};
+use mmtk::util::{Address, ObjectReference};
+use mmtk::vm::*;
+
+pub struct VMObjectModel {}
+
+impl VMObjectModel {
+    const OBJREF_OFFSET: usize = abi::OBJREF_OFFSET;
+}
+
+impl ObjectModel<Ruby> for VMObjectModel {
+    const GLOBAL_LOG_BIT_SPEC: VMGlobalLogBitSpec = VMGlobalLogBitSpec::side_first();
+
+    // We overwrite the prepended word which were used to hold object sizes.
+    const LOCAL_FORWARDING_POINTER_SPEC: VMLocalForwardingPointerSpec =
+        VMLocalForwardingPointerSpec::in_header(-((OBJREF_OFFSET * BITS_IN_BYTE) as isize));
+
+    const LOCAL_FORWARDING_BITS_SPEC: VMLocalForwardingBitsSpec =
+        VMLocalForwardingBitsSpec::side_first();
+
+    const LOCAL_MARK_BIT_SPEC: VMLocalMarkBitSpec =
+        VMLocalMarkBitSpec::side_after(Self::LOCAL_FORWARDING_BITS_SPEC.as_spec());
+
+    const LOCAL_PINNING_BIT_SPEC: VMLocalPinningBitSpec =
+        VMLocalPinningBitSpec::side_after(Self::LOCAL_MARK_BIT_SPEC.as_spec());
+
+    const LOCAL_LOS_MARK_NURSERY_SPEC: VMLocalLOSMarkNurserySpec =
+        VMLocalLOSMarkNurserySpec::side_after(Self::LOCAL_PINNING_BIT_SPEC.as_spec());
+
+    const UNIFIED_OBJECT_REFERENCE_ADDRESS: bool = false;
+    const OBJECT_REF_OFFSET_LOWER_BOUND: isize = Self::OBJREF_OFFSET as isize;
+
+    const NEED_VO_BITS_DURING_TRACING: bool = true;
+
+    fn copy(
+        _from: ObjectReference,
+        _semantics: CopySemantics,
+        _copy_context: &mut GCWorkerCopyContext<Ruby>,
+    ) -> ObjectReference {
+        unimplemented!("Copying GC not currently supported")
+    }
+
+    fn copy_to(_from: ObjectReference, _to: ObjectReference, _region: Address) -> Address {
+        unimplemented!(
+            "This function cannot be called because we do not support MarkCompact for Ruby."
+        )
+    }
+
+    fn get_reference_when_copied_to(_from: ObjectReference, _to: Address) -> ObjectReference {
+        unimplemented!(
+            "This function cannot be called because we do not support MarkCompact for Ruby."
+        )
+    }
+
+    fn get_current_size(object: ObjectReference) -> usize {
+        RubyObjectAccess::from_objref(object).object_size()
+    }
+
+    fn get_type_descriptor(_reference: ObjectReference) -> &'static [i8] {
+        todo!()
+    }
+
+    fn ref_to_object_start(object: ObjectReference) -> Address {
+        RubyObjectAccess::from_objref(object).obj_start()
+    }
+
+    fn ref_to_header(object: ObjectReference) -> Address {
+        RubyObjectAccess::from_objref(object).payload_addr()
+    }
+
+    fn get_size_when_copied(object: ObjectReference) -> usize {
+        Self::get_current_size(object)
+    }
+
+    fn get_align_when_copied(_object: ObjectReference) -> usize {
+        todo!()
+    }
+
+    fn get_align_offset_when_copied(_object: ObjectReference) -> usize {
+        todo!()
+    }
+
+    fn dump_object(_object: ObjectReference) {
+        todo!()
+    }
+}
diff --git a/gc/mmtk/src/reference_glue.rs b/gc/mmtk/src/reference_glue.rs
new file mode 100644
index 00000000000000..1272bd54c164e9
--- /dev/null
+++ b/gc/mmtk/src/reference_glue.rs
@@ -0,0 +1,26 @@
+use crate::Ruby;
+use mmtk::util::ObjectReference;
+use mmtk::util::VMWorkerThread;
+use mmtk::vm::ReferenceGlue;
+
+pub struct VMReferenceGlue {}
+
+impl ReferenceGlue<Ruby> for VMReferenceGlue {
+    type FinalizableType = ObjectReference;
+
+    fn get_referent(_object: ObjectReference) -> Option<ObjectReference> {
+        unimplemented!()
+    }
+
+    fn set_referent(_reff: ObjectReference, _referent: ObjectReference) {
+        unimplemented!()
+    }
+
+    fn enqueue_references(_references: &[ObjectReference], _tls: VMWorkerThread) {
+        unimplemented!()
+    }
+
+    fn clear_referent(_new_reference: ObjectReference) {
+        unimplemented!()
+    }
+}
diff --git a/gc/mmtk/src/scanning.rs b/gc/mmtk/src/scanning.rs
new file mode 100644
index 00000000000000..36c0f998f4a3fe
--- /dev/null
+++ b/gc/mmtk/src/scanning.rs
@@ -0,0 +1,268 @@
+use crate::abi::GCThreadTLS;
+
+use crate::utils::ChunkedVecCollector;
+use crate::{upcalls, Ruby, RubySlot};
+use mmtk::scheduler::{GCWork, GCWorker, WorkBucketStage};
+use mmtk::util::{ObjectReference, VMWorkerThread};
+use mmtk::vm::{ObjectTracer, RootsWorkFactory, Scanning, SlotVisitor};
+use mmtk::Mutator;
+
+pub struct VMScanning {}
+
+impl Scanning<Ruby> for VMScanning {
+    const UNIQUE_OBJECT_ENQUEUING: bool = true;
+
+    fn support_slot_enqueuing(_tls: VMWorkerThread, _object: ObjectReference) -> bool {
+        false
+    }
+
+    fn scan_object<EV: SlotVisitor<RubySlot>>(
+        _tls: VMWorkerThread,
+        _object: ObjectReference,
+        _slot_visitor: &mut EV,
+    ) {
+        unreachable!("We have not enabled slot enqueuing for any types, yet.");
+    }
+
+    fn scan_object_and_trace_edges<OT: ObjectTracer>(
+        tls: VMWorkerThread,
+        object: ObjectReference,
+        object_tracer: &mut OT,
+    ) {
+        debug_assert!(
+            mmtk::memory_manager::is_mmtk_object(object.to_raw_address()).is_some(),
+            "Not an MMTk object: {object}",
+        );
+        let gc_tls = unsafe { GCThreadTLS::from_vwt_check(tls) };
+        let visit_object = |_worker, target_object: ObjectReference, pin| {
+            trace!(
+                "Tracing edge: {} -> {}{}",
+                object,
+                target_object,
+                if pin { " pin" } else { "" }
+            );
+            debug_assert!(
+                mmtk::memory_manager::is_mmtk_object(target_object.to_raw_address()).is_some(),
+                "Destination is not an MMTk object. Src: {object} dst: {target_object}"
+            );
+            let forwarded_target = object_tracer.trace_object(target_object);
+            if forwarded_target != target_object {
+                trace!(
+                    "  Forwarded target {} -> {}",
+                    target_object,
+                    forwarded_target
+                );
+            }
+            forwarded_target
+        };
+        gc_tls
+            .object_closure
+            .set_temporarily_and_run_code(visit_object, || {
+                (upcalls().scan_object_ruby_style)(object);
+            });
+    }
+
+    fn notify_initial_thread_scan_complete(_partial_scan: bool, _tls: VMWorkerThread) {
+        // Do nothing
+    }
+
+    fn scan_roots_in_mutator_thread(
+        _tls: VMWorkerThread,
+        _mutator: &'static mut Mutator<Ruby>,
+        mut _factory: impl RootsWorkFactory<RubySlot>,
+    ) {
+        // Do nothing.  All stacks (including Ruby stacks and machine stacks) are reachable from
+        // `rb_vm_t` -> ractor -> thread -> fiber -> stacks.  It is part of `ScanGCRoots` which
+        // calls `rb_gc_mark_roots` -> `rb_vm_mark`.
+    }
+
+    fn scan_vm_specific_roots(tls: VMWorkerThread, factory: impl RootsWorkFactory<RubySlot>) {
+        let gc_tls = unsafe { GCThreadTLS::from_vwt_check(tls) };
+        let root_scanning_work_packets: Vec<Box<dyn GCWork<Ruby>>> = vec![
+            Box::new(ScanGCRoots::new(factory.clone())),
+            Box::new(ScanObjspace::new(factory.clone())),
+        ];
+        gc_tls.worker().scheduler().work_buckets[WorkBucketStage::Prepare]
+            .bulk_add(root_scanning_work_packets);
+
+        // Generate WB-unprotected roots scanning work packets
+
+        'gen_wb_unprotected_work: {
+            let is_nursery_gc = (crate::mmtk().get_plan().generational())
+                .is_some_and(|gen| gen.is_current_gc_nursery());
+            if !is_nursery_gc {
+                break 'gen_wb_unprotected_work;
+            }
+
+            let vecs = {
+                let guard = crate::binding()
+                    .wb_unprotected_objects
+                    .try_lock()
+                    .expect("Someone is holding the lock of wb_unprotected_objects?");
+                if guard.is_empty() {
+                    break 'gen_wb_unprotected_work;
+                }
+
+                let mut collector = ChunkedVecCollector::new(128);
+                collector.extend(guard.iter().copied());
+                collector.into_vecs()
+            };
+
+            let packets = vecs
+                .into_iter()
+                .map(|objects| {
+                    let factory = factory.clone();
+                    Box::new(ScanWbUnprotectedRoots { factory, objects }) as _
+                })
+                .collect::<Vec<_>>();
+
+            gc_tls.worker().scheduler().work_buckets[WorkBucketStage::Prepare].bulk_add(packets);
+        }
+    }
+
+    fn supports_return_barrier() -> bool {
+        false
+    }
+
+    fn prepare_for_roots_re_scanning() {
+        todo!()
+    }
+
+    fn process_weak_refs(
+        worker: &mut GCWorker<Ruby>,
+        tracer_context: impl mmtk::vm::ObjectTracerContext<Ruby>,
+    ) -> bool {
+        crate::binding()
+            .weak_proc
+            .process_weak_stuff(worker, tracer_context);
+        false
+    }
+
+    fn forward_weak_refs(
+        _worker: &mut GCWorker<Ruby>,
+        _tracer_context: impl mmtk::vm::ObjectTracerContext<Ruby>,
+    ) {
+        panic!("We can't use MarkCompact in Ruby.");
+    }
+}
+
+impl VMScanning {
+    const OBJECT_BUFFER_SIZE: usize = 4096;
+
+    fn collect_object_roots_in<F: FnOnce()>(
+        root_scan_kind: &str,
+        gc_tls: &mut GCThreadTLS,
+        factory: &mut impl RootsWorkFactory<RubySlot>,
+        callback: F,
+    ) {
+        let mut buffer: Vec<ObjectReference> = Vec::new();
+        let visit_object = |_, object: ObjectReference, pin| {
+            debug!(
+                "[{}] Visiting object: {}{}",
+                root_scan_kind,
+                object,
+                if pin {
+                    "(unmovable root)"
+                } else {
+                    "(movable, but we pin it anyway)"
+                }
+            );
+            debug_assert!(
+                mmtk::memory_manager::is_mmtk_object(object.to_raw_address()).is_some(),
+                "Root does not point to MMTk object.  object: {object}"
+            );
+            buffer.push(object);
+            if buffer.len() >= Self::OBJECT_BUFFER_SIZE {
+                factory.create_process_pinning_roots_work(std::mem::take(&mut buffer));
+            }
+            object
+        };
+        gc_tls
+            .object_closure
+            .set_temporarily_and_run_code(visit_object, callback);
+
+        if !buffer.is_empty() {
+            factory.create_process_pinning_roots_work(buffer);
+        }
+    }
+}
+
+trait GlobaRootScanningWork {
+    type F: RootsWorkFactory<RubySlot>;
+    const NAME: &'static str;
+
+    fn new(factory: Self::F) -> Self;
+    fn scan_roots();
+    fn roots_work_factory(&mut self) -> &mut Self::F;
+
+    fn do_work(&mut self, worker: &mut GCWorker<Ruby>, _mmtk: &'static mmtk::MMTK<Ruby>) {
+        let gc_tls = unsafe { GCThreadTLS::from_vwt_check(worker.tls) };
+
+        let factory = self.roots_work_factory();
+
+        VMScanning::collect_object_roots_in(Self::NAME, gc_tls, factory, || {
+            Self::scan_roots();
+        });
+    }
+}
+
+macro_rules! define_global_root_scanner {
+    ($name: ident, $code: expr) => {
+        struct $name<F: RootsWorkFactory<RubySlot>> {
+            factory: F,
+        }
+        impl<F: RootsWorkFactory<RubySlot>> GlobaRootScanningWork for $name<F> {
+            type F = F;
+            const NAME: &'static str = stringify!($name);
+            fn new(factory: Self::F) -> Self {
+                Self { factory }
+            }
+            fn scan_roots() {
+                $code
+            }
+            fn roots_work_factory(&mut self) -> &mut Self::F {
+                &mut self.factory
+            }
+        }
+        impl<F: RootsWorkFactory<RubySlot>> GCWork<Ruby> for $name<F> {
+            fn do_work(&mut self, worker: &mut GCWorker<Ruby>, mmtk: &'static mmtk::MMTK<Ruby>) {
+                GlobaRootScanningWork::do_work(self, worker, mmtk);
+            }
+        }
+    };
+}
+
+define_global_root_scanner!(ScanGCRoots, {
+    (crate::upcalls().scan_gc_roots)();
+});
+
+define_global_root_scanner!(ScanObjspace, {
+    (crate::upcalls().scan_objspace)();
+});
+
+struct ScanWbUnprotectedRoots<F: RootsWorkFactory<RubySlot>> {
+    factory: F,
+    objects: Vec<ObjectReference>,
+}
+
+impl<F: RootsWorkFactory<RubySlot>> GCWork<Ruby> for ScanWbUnprotectedRoots<F> {
+    fn do_work(&mut self, worker: &mut GCWorker<Ruby>, _mmtk: &'static mmtk::MMTK<Ruby>) {
+        let gc_tls = unsafe { GCThreadTLS::from_vwt_check(worker.tls) };
+        VMScanning::collect_object_roots_in("wb_unprot_roots", gc_tls, &mut self.factory, || {
+            for object in self.objects.iter().copied() {
+                if object.is_reachable() {
+                    debug!(
+                        "[wb_unprot_roots] Visiting WB-unprotected object (parent): {}",
+                        object
+                    );
+                    (upcalls().scan_object_ruby_style)(object);
+                } else {
+                    debug!(
+                        "[wb_unprot_roots] Skipping young WB-unprotected object (parent): {}",
+                        object
+                    );
+                }
+            }
+        });
+    }
+}
diff --git a/gc/mmtk/src/utils.rs b/gc/mmtk/src/utils.rs
new file mode 100644
index 00000000000000..71a7ae8dd25f60
--- /dev/null
+++ b/gc/mmtk/src/utils.rs
@@ -0,0 +1,158 @@
+use std::sync::atomic::{AtomicUsize, Ordering};
+
+use atomic_refcell::AtomicRefCell;
+use mmtk::scheduler::{GCWork, GCWorker, WorkBucketStage};
+
+use crate::Ruby;
+use sysinfo::System;
+
+pub struct ChunkedVecCollector<T> {
+    vecs: Vec<Vec<T>>,
+    current_vec: Vec<T>,
+    chunk_size: usize,
+}
+
+impl<T> ChunkedVecCollector<T> {
+    pub fn new(chunk_size: usize) -> Self {
+        Self {
+            vecs: vec![],
+            current_vec: Vec::with_capacity(chunk_size),
+            chunk_size,
+        }
+    }
+
+    pub fn add(&mut self, item: T) {
+        self.current_vec.push(item);
+        if self.current_vec.len() == self.chunk_size {
+            self.flush();
+        }
+    }
+
+    fn flush(&mut self) {
+        let new_vec = Vec::with_capacity(self.chunk_size);
+        let old_vec = std::mem::replace(&mut self.current_vec, new_vec);
+        self.vecs.push(old_vec);
+    }
+
+    pub fn into_vecs(mut self) -> Vec<Vec<T>> {
+        if !self.current_vec.is_empty() {
+            self.flush();
+        }
+        self.vecs
+    }
+}
+
+impl<A> Extend<A> for ChunkedVecCollector<A> {
+    fn extend<T: IntoIterator<Item = A>>(&mut self, iter: T) {
+        for item in iter {
+            self.add(item);
+        }
+    }
+}
+
+pub struct AfterAll {
+    counter: AtomicUsize,
+    stage: WorkBucketStage,
+    packets: AtomicRefCell<Vec<Box<dyn GCWork<Ruby>>>>,
+}
+
+unsafe impl Sync for AfterAll {}
+
+impl AfterAll {
+    pub fn new(stage: WorkBucketStage) -> Self {
+        Self {
+            counter: AtomicUsize::new(0),
+            stage,
+            packets: AtomicRefCell::new(vec![]),
+        }
+    }
+
+    pub fn add_packets(&self, mut packets: Vec<Box<dyn GCWork<Ruby>>>) {
+        let mut borrow = self.packets.borrow_mut();
+        borrow.append(&mut packets);
+    }
+
+    pub fn count_up(&self, n: usize) {
+        self.counter.fetch_add(n, Ordering::SeqCst);
+    }
+
+    pub fn count_down(&self, worker: &mut GCWorker<Ruby>) {
+        let old = self.counter.fetch_sub(1, Ordering::SeqCst);
+        if old == 1 {
+            let packets = {
+                let mut borrow = self.packets.borrow_mut();
+                std::mem::take(borrow.as_mut())
+            };
+            worker.scheduler().work_buckets[self.stage].bulk_add(packets);
+        }
+    }
+}
+
+pub fn default_heap_max() -> usize {
+    let mut s = System::new();
+    s.refresh_memory();
+    s.total_memory()
+        .checked_mul(80)
+        .and_then(|v| v.checked_div(100))
+        .expect("Invalid Memory size") as usize
+}
+
+pub fn parse_capacity(input: &str) -> Option<usize> {
+    let trimmed = input.trim();
+
+    const KIBIBYTE: usize = 1024;
+    const MEBIBYTE: usize = 1024 * KIBIBYTE;
+    const GIBIBYTE: usize = 1024 * MEBIBYTE;
+
+    let (number, suffix) = if let Some(pos) = trimmed.find(|c: char| !c.is_numeric()) {
+        trimmed.split_at(pos)
+    } else {
+        (trimmed, "")
+    };
+
+    let Ok(v) = number.parse::<usize>() else {
+        return None;
+    };
+
+    match suffix {
+        "GiB" => Some(v * GIBIBYTE),
+        "MiB" => Some(v * MEBIBYTE),
+        "KiB" => Some(v * KIBIBYTE),
+        "" => Some(v),
+        _ => None,
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn test_parse_capacity_parses_bare_bytes() {
+        assert_eq!(Some(1234), parse_capacity("1234"));
+    }
+
+    #[test]
+    fn test_parse_capacity_parses_kibibytes() {
+        assert_eq!(Some(10240), parse_capacity("10KiB"));
+    }
+
+    #[test]
+    fn test_parse_capacity_parses_mebibytes() {
+        assert_eq!(Some(10485760), parse_capacity("10MiB"))
+    }
+
+    #[test]
+    fn test_parse_capacity_parses_gibibytes() {
+        assert_eq!(Some(10737418240), parse_capacity("10GiB"))
+    }
+
+    #[test]
+    fn test_parse_capacity_parses_nonsense_values() {
+        assert_eq!(None, parse_capacity("notanumber"));
+        assert_eq!(None, parse_capacity("5tartswithanumber"));
+        assert_eq!(None, parse_capacity("number1nthemiddle"));
+        assert_eq!(None, parse_capacity("numberattheend111"));
+        assert_eq!(None, parse_capacity("mult1pl3numb3r5"));
+    }
+}
diff --git a/gc/mmtk/src/weak_proc.rs b/gc/mmtk/src/weak_proc.rs
new file mode 100644
index 00000000000000..204dd203aa333f
--- /dev/null
+++ b/gc/mmtk/src/weak_proc.rs
@@ -0,0 +1,243 @@
+use std::sync::Mutex;
+
+use mmtk::{
+    scheduler::{GCWork, GCWorker, WorkBucketStage},
+    util::ObjectReference,
+    vm::ObjectTracerContext,
+};
+
+use crate::{abi::GCThreadTLS, upcalls, Ruby};
+
+pub struct WeakProcessor {
+    /// Objects that needs `obj_free` called when dying.
+    /// If it is a bottleneck, replace it with a lock-free data structure,
+    /// or add candidates in batch.
+    obj_free_candidates: Mutex<Vec<ObjectReference>>,
+    weak_references: Mutex<Vec<&'static mut ObjectReference>>,
+}
+
+impl Default for WeakProcessor {
+    fn default() -> Self {
+        Self::new()
+    }
+}
+
+impl WeakProcessor {
+    pub fn new() -> Self {
+        Self {
+            obj_free_candidates: Mutex::new(Vec::new()),
+            weak_references: Mutex::new(Vec::new()),
+        }
+    }
+
+    /// Add an object as a candidate for `obj_free`.
+    ///
+    /// Multiple mutators can call it concurrently, so it has `&self`.
+    pub fn add_obj_free_candidate(&self, object: ObjectReference) {
+        let mut obj_free_candidates = self.obj_free_candidates.lock().unwrap();
+        obj_free_candidates.push(object);
+    }
+
+    /// Add many objects as candidates for `obj_free`.
+    ///
+    /// Multiple mutators can call it concurrently, so it has `&self`.
+    pub fn add_obj_free_candidates(&self, objects: &[ObjectReference]) {
+        let mut obj_free_candidates = self.obj_free_candidates.lock().unwrap();
+        for object in objects.iter().copied() {
+            obj_free_candidates.push(object);
+        }
+    }
+
+    pub fn get_all_obj_free_candidates(&self) -> Vec<ObjectReference> {
+        let mut obj_free_candidates = self.obj_free_candidates.lock().unwrap();
+        std::mem::take(obj_free_candidates.as_mut())
+    }
+
+    pub fn add_weak_reference(&self, ptr: &'static mut ObjectReference) {
+        let mut weak_references = self.weak_references.lock().unwrap();
+        weak_references.push(ptr);
+    }
+
+    pub fn remove_weak_reference(&self, ptr: &ObjectReference) {
+        let mut weak_references = self.weak_references.lock().unwrap();
+        for (i, curr_ptr) in weak_references.iter().enumerate() {
+            if *curr_ptr == ptr {
+                weak_references.swap_remove(i);
+                break;
+            }
+        }
+    }
+
+    pub fn process_weak_stuff(
+        &self,
+        worker: &mut GCWorker<Ruby>,
+        _tracer_context: impl ObjectTracerContext<Ruby>,
+    ) {
+        worker.add_work(WorkBucketStage::VMRefClosure, ProcessObjFreeCandidates);
+        worker.add_work(WorkBucketStage::VMRefClosure, ProcessWeakReferences);
+
+        worker.add_work(WorkBucketStage::Prepare, UpdateFinalizerObjIdTables);
+
+        let global_tables_count = (crate::upcalls().global_tables_count)();
+        let work_packets = (0..global_tables_count)
+            .map(|i| Box::new(UpdateGlobalTables { idx: i }) as _)
+            .collect();
+
+        worker.scheduler().work_buckets[WorkBucketStage::VMRefClosure].bulk_add(work_packets);
+
+        worker.scheduler().work_buckets[WorkBucketStage::VMRefClosure]
+            .bulk_add(vec![Box::new(UpdateWbUnprotectedObjectsList) as _]);
+    }
+}
+
+struct ProcessObjFreeCandidates;
+
+impl GCWork<Ruby> for ProcessObjFreeCandidates {
+    fn do_work(&mut self, _worker: &mut GCWorker<Ruby>, _mmtk: &'static mmtk::MMTK<Ruby>) {
+        // If it blocks, it is a bug.
+        let mut obj_free_candidates = crate::binding()
+            .weak_proc
+            .obj_free_candidates
+            .try_lock()
+            .expect("It's GC time.  No mutators should hold this lock at this time.");
+
+        let n_cands = obj_free_candidates.len();
+
+        debug!("Total: {} candidates", n_cands);
+
+        // Process obj_free
+        let mut new_candidates = Vec::new();
+
+        for object in obj_free_candidates.iter().copied() {
+            if object.is_reachable() {
+                // Forward and add back to the candidate list.
+                let new_object = object.forward();
+                trace!(
+                    "Forwarding obj_free candidate: {} -> {}",
+                    object,
+                    new_object
+                );
+                new_candidates.push(new_object);
+            } else {
+                (upcalls().call_obj_free)(object);
+            }
+        }
+
+        *obj_free_candidates = new_candidates;
+    }
+}
+
+struct ProcessWeakReferences;
+
+impl GCWork<Ruby> for ProcessWeakReferences {
+    fn do_work(&mut self, _worker: &mut GCWorker<Ruby>, _mmtk: &'static mmtk::MMTK<Ruby>) {
+        let mut weak_references = crate::binding()
+            .weak_proc
+            .weak_references
+            .try_lock()
+            .expect("Mutators should not be holding the lock.");
+
+        for ptr_ptr in weak_references.iter_mut() {
+            if !(**ptr_ptr).is_reachable() {
+                **ptr_ptr = crate::binding().weak_reference_dead_value;
+            }
+        }
+
+        weak_references.clear();
+    }
+}
+
+trait GlobalTableProcessingWork {
+    fn process_table(&mut self);
+
+    fn do_work(&mut self, worker: &mut GCWorker<Ruby>, _mmtk: &'static mmtk::MMTK<Ruby>) {
+        let gc_tls = unsafe { GCThreadTLS::from_vwt_check(worker.tls) };
+
+        // `hash_foreach_replace` depends on `gb_object_moved_p` which has to have the semantics
+        // of `trace_object` due to the way it is used in `UPDATE_IF_MOVED`.
+        let forward_object = |_worker, object: ObjectReference, _pin| {
+            debug_assert!(
+                mmtk::memory_manager::is_mmtk_object(object.to_raw_address()).is_some(),
+                "{} is not an MMTk object",
+                object
+            );
+            let result = object.forward();
+            trace!("Forwarding reference: {} -> {}", object, result);
+            result
+        };
+
+        gc_tls
+            .object_closure
+            .set_temporarily_and_run_code(forward_object, || {
+                self.process_table();
+            });
+    }
+}
+
+struct UpdateFinalizerObjIdTables;
+impl GlobalTableProcessingWork for UpdateFinalizerObjIdTables {
+    fn process_table(&mut self) {
+        (crate::upcalls().update_finalizer_table)();
+    }
+}
+impl GCWork<Ruby> for UpdateFinalizerObjIdTables {
+    fn do_work(&mut self, worker: &mut GCWorker<Ruby>, mmtk: &'static mmtk::MMTK<Ruby>) {
+        GlobalTableProcessingWork::do_work(self, worker, mmtk);
+    }
+}
+
+struct UpdateGlobalTables {
+    idx: i32,
+}
+impl GlobalTableProcessingWork for UpdateGlobalTables {
+    fn process_table(&mut self) {
+        (crate::upcalls().update_global_tables)(self.idx)
+    }
+}
+impl GCWork<Ruby> for UpdateGlobalTables {
+    fn do_work(&mut self, worker: &mut GCWorker<Ruby>, mmtk: &'static mmtk::MMTK<Ruby>) {
+        GlobalTableProcessingWork::do_work(self, worker, mmtk);
+    }
+}
+
+struct UpdateWbUnprotectedObjectsList;
+
+impl GCWork<Ruby> for UpdateWbUnprotectedObjectsList {
+    fn do_work(&mut self, _worker: &mut GCWorker<Ruby>, _mmtk: &'static mmtk::MMTK<Ruby>) {
+        let mut objects = crate::binding().wb_unprotected_objects.try_lock().expect(
+            "Someone is holding the lock of wb_unprotected_objects during weak processing phase?",
+        );
+
+        let old_objects = std::mem::take(&mut *objects);
+
+        debug!("Updating {} WB-unprotected objects", old_objects.len());
+
+        for object in old_objects {
+            if object.is_reachable() {
+                // Forward and add back to the candidate list.
+                let new_object = object.forward();
+                trace!(
+                    "Forwarding WB-unprotected object: {} -> {}",
+                    object,
+                    new_object
+                );
+                objects.insert(new_object);
+            } else {
+                trace!("Removing WB-unprotected object from list: {}", object);
+            }
+        }
+
+        debug!("Retained {} live WB-unprotected objects.", objects.len());
+    }
+}
+
+// Provide a shorthand `object.forward()`.
+trait Forwardable {
+    fn forward(&self) -> Self;
+}
+
+impl Forwardable for ObjectReference {
+    fn forward(&self) -> Self {
+        self.get_forwarded_object().unwrap_or(*self)
+    }
+}
diff --git a/gems/bundled_gems b/gems/bundled_gems
index f11380027ac77c..6e748c375cff89 100644
--- a/gems/bundled_gems
+++ b/gems/bundled_gems
@@ -5,19 +5,43 @@
 # - repository-url: URL from where clone for test
 # - revision: revision in repository-url to test
 #   if `revision` is not given, "v"+`version` or `version` will be used.
-minitest        5.19.0  https://github.com/minitest/minitest
-power_assert    2.0.3   https://github.com/ruby/power_assert
-rake            13.0.6  https://github.com/ruby/rake
-test-unit       3.6.1   https://github.com/test-unit/test-unit
-rexml           3.2.6   https://github.com/ruby/rexml
-rss             0.3.0   https://github.com/ruby/rss
-net-ftp         0.2.0   https://github.com/ruby/net-ftp
-net-imap        0.3.7   https://github.com/ruby/net-imap
-net-pop         0.1.2   https://github.com/ruby/net-pop
-net-smtp        0.3.3   https://github.com/ruby/net-smtp
-matrix          0.4.2   https://github.com/ruby/matrix
-prime           0.1.2   https://github.com/ruby/prime
-rbs             3.2.1   https://github.com/ruby/rbs
-typeprof        0.21.8  https://github.com/ruby/typeprof
-debug           1.8.0   https://github.com/ruby/debug
-racc            1.7.1   https://github.com/ruby/racc
+
+minitest            5.25.5  https://github.com/minitest/minitest
+power_assert        2.0.5   https://github.com/ruby/power_assert f88e406e7c9e0810cc149869582afbae1fb84c4a
+rake                13.3.0  https://github.com/ruby/rake
+test-unit           3.7.0   https://github.com/test-unit/test-unit
+rexml               3.4.1   https://github.com/ruby/rexml
+rss                 0.3.1   https://github.com/ruby/rss
+net-ftp             0.3.8   https://github.com/ruby/net-ftp
+net-imap            0.5.9   https://github.com/ruby/net-imap
+net-pop             0.1.2   https://github.com/ruby/net-pop
+net-smtp            0.5.1   https://github.com/ruby/net-smtp
+matrix              0.4.3   https://github.com/ruby/matrix
+prime               0.1.4   https://github.com/ruby/prime
+rbs                 3.9.4   https://github.com/ruby/rbs
+typeprof            0.30.1  https://github.com/ruby/typeprof
+debug               1.11.0  https://github.com/ruby/debug
+racc                1.8.1   https://github.com/ruby/racc
+mutex_m             0.3.0   https://github.com/ruby/mutex_m
+getoptlong          0.2.1   https://github.com/ruby/getoptlong
+base64              0.3.0   https://github.com/ruby/base64
+bigdecimal          3.2.2   https://github.com/ruby/bigdecimal
+observer            0.1.2   https://github.com/ruby/observer
+abbrev              0.1.2   https://github.com/ruby/abbrev
+resolv-replace      0.1.1   https://github.com/ruby/resolv-replace
+rinda               0.2.0   https://github.com/ruby/rinda
+drb                 2.2.3   https://github.com/ruby/drb
+nkf                 0.2.0   https://github.com/ruby/nkf
+syslog              0.3.0   https://github.com/ruby/syslog
+csv                 3.3.5   https://github.com/ruby/csv
+repl_type_completor 0.1.11  https://github.com/ruby/repl_type_completor 25108aa8d69ddaba0b5da3feff1c0035371524b2
+ostruct             0.6.2   https://github.com/ruby/ostruct
+pstore              0.2.0   https://github.com/ruby/pstore
+benchmark           0.4.1   https://github.com/ruby/benchmark
+logger              1.7.0   https://github.com/ruby/logger
+rdoc                6.14.2  https://github.com/ruby/rdoc
+win32ole            1.9.2   https://github.com/ruby/win32ole
+irb                 1.15.2  https://github.com/ruby/irb 331c4e851296b115db766c291e8cf54a2492fb36
+reline              0.6.1   https://github.com/ruby/reline
+readline            0.0.4   https://github.com/ruby/readline
+fiddle              1.1.8   https://github.com/ruby/fiddle
diff --git a/gems/lib/envutil.rb b/gems/lib/envutil.rb
new file mode 100644
index 00000000000000..d684c22cf21182
--- /dev/null
+++ b/gems/lib/envutil.rb
@@ -0,0 +1 @@
+require_relative "../../tool/lib/envutil.rb"
diff --git a/gems/lib/rake/extensiontask.rb b/gems/lib/rake/extensiontask.rb
index aa668935fc154c..0ab0cb7b500785 100644
--- a/gems/lib/rake/extensiontask.rb
+++ b/gems/lib/rake/extensiontask.rb
@@ -1,3 +1,5 @@
+require "rake/tasklib" unless defined?(Rake::TaskLib)
+
 module Rake
   class ExtensionTask < TaskLib
     def initialize(...)
@@ -6,5 +8,7 @@ def initialize(...)
         puts "#{args.name} => #{args.prereqs.join(' ')}"
       end
     end
+
+    def lib_dir; end
   end
 end
diff --git a/goruby.c b/goruby.c
index 5d452772075a31..3ca96bfda0641a 100644
--- a/goruby.c
+++ b/goruby.c
@@ -1,4 +1,4 @@
-static void Init_golf(void);
+static void Init_golf_prelude(void);
 static void *goruby_options(int argc, char **argv);
 static int goruby_run_node(void *arg);
 #define ruby_options goruby_options
@@ -17,14 +17,13 @@ static int goruby_run_node(void *arg);
 
 RUBY_EXTERN void *ruby_options(int argc, char **argv);
 RUBY_EXTERN int ruby_run_node(void*);
-RUBY_EXTERN void ruby_init_ext(const char *name, void (*init)(void));
 
-#include "golf_prelude.c"
+#include "golf_prelude.rbbin"
 
 static VALUE
 init_golf(VALUE arg)
 {
-    Init_golf();
+    Init_golf_prelude();
     rb_provide("golf.so");
     return arg;
 }
@@ -61,7 +60,8 @@ int
 goruby_run_node(void *arg)
 {
     int state;
-    if (NIL_P(rb_protect(init_golf, Qtrue, &state))) {
+    if (ruby_executable_node(arg, NULL) &&
+        NIL_P(rb_protect(init_golf, Qtrue, &state))) {
         return state == EXIT_SUCCESS ? EXIT_FAILURE : state;
     }
     return ruby_run_node(arg);
diff --git a/hash.c b/hash.c
index 58d3badd851d18..84996358173542 100644
--- a/hash.c
+++ b/hash.c
@@ -35,6 +35,7 @@
 #include "internal/hash.h"
 #include "internal/object.h"
 #include "internal/proc.h"
+#include "internal/st.h"
 #include "internal/symbol.h"
 #include "internal/thread.h"
 #include "internal/time.h"
@@ -47,6 +48,7 @@
 #include "ruby/thread_native.h"
 #include "ruby/ractor.h"
 #include "vm_sync.h"
+#include "builtin.h"
 
 /* Flags of RHash
  *
@@ -62,7 +64,7 @@
  *            The bounds of the AR table.
  * 13-19: RHASH_LEV_MASK
  *            The iterational level of the hash. Used to prevent modifications
- *            to the hash during interation.
+ *            to the hash during iteration.
  */
 
 #ifndef HASH_DEBUG
@@ -101,6 +103,7 @@ static VALUE rb_hash_s_try_convert(VALUE, VALUE);
  *  2. Insert WBs
  */
 
+/* :nodoc: */
 VALUE
 rb_hash_freeze(VALUE hash)
 {
@@ -108,6 +111,7 @@ rb_hash_freeze(VALUE hash)
 }
 
 VALUE rb_cHash;
+VALUE rb_cHash_empty_frozen;
 
 static VALUE envtbl;
 static ID id_hash, id_flatten_bang;
@@ -209,10 +213,26 @@ any_hash(VALUE a, st_index_t (*other_func)(VALUE))
     return (long)hnum;
 }
 
+VALUE rb_obj_hash(VALUE obj);
+VALUE rb_vm_call0(rb_execution_context_t *ec, VALUE recv, ID id, int argc, const VALUE *argv, const rb_callable_method_entry_t *cme, int kw_splat);
+
 static st_index_t
 obj_any_hash(VALUE obj)
 {
-    VALUE hval = rb_check_funcall_basic_kw(obj, id_hash, rb_mKernel, 0, 0, 0);
+    VALUE hval = Qundef;
+    VALUE klass = CLASS_OF(obj);
+    if (klass) {
+        const rb_callable_method_entry_t *cme = rb_callable_method_entry(klass, id_hash);
+        if (cme && METHOD_ENTRY_BASIC(cme)) {
+            // Optimize away the frame push overhead if it's the default Kernel#hash
+            if (cme->def->type == VM_METHOD_TYPE_CFUNC && cme->def->body.cfunc.func == (rb_cfunc_t)rb_obj_hash) {
+                hval = rb_obj_hash(obj);
+            }
+            else if (RBASIC_CLASS(cme->defined_class) == rb_mKernel) {
+                hval = rb_vm_call0(GET_EC(), obj, id_hash, 0, 0, cme, 0);
+            }
+        }
+    }
 
     if (UNDEF_P(hval)) {
         hval = rb_exec_recursive_outer_mid(hash_recursive, obj, 0, id_hash);
@@ -377,6 +397,9 @@ const struct st_hash_type rb_hashtype_ident = {
     rb_ident_hash,
 };
 
+#define RHASH_IDENTHASH_P(hash) (RHASH_TYPE(hash) == &identhash)
+#define RHASH_STRING_KEY_P(hash, key) (!RHASH_IDENTHASH_P(hash) && (rb_obj_class(key) == rb_cString))
+
 typedef st_index_t st_hash_t;
 
 /*
@@ -685,9 +708,8 @@ ar_find_entry(VALUE hash, st_hash_t hash_value, st_data_t key)
     return ar_find_entry_hint(hash, hint, key);
 }
 
-//old one
 static inline void
-ar_free_and_clear_table(VALUE hash)
+hash_ar_free_and_clear_table(VALUE hash)
 {
     RHASH_AR_TABLE_CLEAR(hash);
 
@@ -695,61 +717,75 @@ ar_free_and_clear_table(VALUE hash)
     HASH_ASSERT(RHASH_AR_TABLE_BOUND(hash) == 0);
 }
 
-static void
-ar_try_convert_table(VALUE hash)
-{
-    if (!RHASH_AR_TABLE_P(hash)) return;
+void rb_st_add_direct_with_hash(st_table *tab, st_data_t key, st_data_t value, st_hash_t hash); // st.c
 
-    const unsigned size = RHASH_AR_TABLE_SIZE(hash);
-
-    if (size < RHASH_AR_TABLE_MAX_SIZE) {
-        return;
-    }
-
-    st_table tab;
-    st_table *new_tab = &tab;
-    rb_st_init_existing_table_with_size(new_tab, &objhash, size * 2);
+enum ar_each_key_type {
+    ar_each_key_copy,
+    ar_each_key_cmp,
+    ar_each_key_insert,
+};
 
-    for (st_index_t i = 0; i < RHASH_AR_TABLE_MAX_BOUND; i++) {
-        ar_table_pair *pair = RHASH_AR_TABLE_REF(hash, i);
-        st_add_direct(new_tab, pair->key, pair->val);
+static inline int
+ar_each_key(ar_table *ar, int max, enum ar_each_key_type type, st_data_t *dst_keys, st_table *new_tab, st_hash_t *hashes)
+{
+    for (int i = 0; i < max; i++) {
+        ar_table_pair *pair = &ar->pairs[i];
+
+        switch (type) {
+          case ar_each_key_copy:
+            dst_keys[i] = pair->key;
+            break;
+          case ar_each_key_cmp:
+            if (dst_keys[i] != pair->key) return 1;
+            break;
+          case ar_each_key_insert:
+            if (UNDEF_P(pair->key)) continue; // deleted entry
+            rb_st_add_direct_with_hash(new_tab, pair->key, pair->val, hashes[i]);
+            break;
+        }
     }
 
-    ar_free_and_clear_table(hash);
-    RHASH_ST_TABLE_SET(hash, new_tab);
+    return 0;
 }
 
 static st_table *
 ar_force_convert_table(VALUE hash, const char *file, int line)
 {
-    st_table *new_tab;
-    st_table tab;
-    new_tab = &tab;
-
     if (RHASH_ST_TABLE_P(hash)) {
         return RHASH_ST_TABLE(hash);
     }
+    else {
+        ar_table *ar = RHASH_AR_TABLE(hash);
+        st_hash_t hashes[RHASH_AR_TABLE_MAX_SIZE];
+        unsigned int bound, size;
+
+        // prepare hash values
+        do {
+            st_data_t keys[RHASH_AR_TABLE_MAX_SIZE];
+            bound = RHASH_AR_TABLE_BOUND(hash);
+            size = RHASH_AR_TABLE_SIZE(hash);
+            ar_each_key(ar, bound, ar_each_key_copy, keys, NULL, NULL);
+
+            for (unsigned int i = 0; i < bound; i++) {
+                // do_hash calls #hash method and it can modify hash object
+                hashes[i] = UNDEF_P(keys[i]) ? 0 : ar_do_hash(keys[i]);
+            }
 
-    RUBY_ASSERT(RHASH_AR_TABLE(hash));
-    {
-        unsigned i, bound = RHASH_AR_TABLE_BOUND(hash);
-
-        rb_st_init_existing_table_with_size(new_tab, &objhash, RHASH_AR_TABLE_SIZE(hash));
-
-        for (i = 0; i < bound; i++) {
-            if (ar_cleared_entry(hash, i)) continue;
-
-            ar_table_pair *pair = RHASH_AR_TABLE_REF(hash, i);
-            st_add_direct(new_tab, pair->key, pair->val);
-        }
-        ar_free_and_clear_table(hash);
+            // check if modified
+            if (UNLIKELY(!RHASH_AR_TABLE_P(hash))) return RHASH_ST_TABLE(hash);
+            if (UNLIKELY(RHASH_AR_TABLE_BOUND(hash) != bound)) continue;
+            if (UNLIKELY(ar_each_key(ar, bound, ar_each_key_cmp, keys, NULL, NULL))) continue;
+        } while (0);
+
+        // make st
+        st_table tab;
+        st_table *new_tab = &tab;
+        st_init_existing_table_with_size(new_tab, &objhash, size);
+        ar_each_key(ar, bound, ar_each_key_insert, NULL, new_tab, hashes);
+        hash_ar_free_and_clear_table(hash);
+        RHASH_ST_TABLE_SET(hash, new_tab);
+        return RHASH_ST_TABLE(hash);
     }
-
-    RHASH_ST_TABLE_SET(hash, new_tab);
-
-    new_tab = RHASH_ST_TABLE(hash);
-
-    return new_tab;
 }
 
 static int
@@ -812,6 +848,14 @@ ar_add_direct_with_hash(VALUE hash, st_data_t key, st_data_t val, st_hash_t hash
     }
 }
 
+static void
+ensure_ar_table(VALUE hash)
+{
+    if (!RHASH_AR_TABLE_P(hash)) {
+        rb_raise(rb_eRuntimeError, "hash representation was changed during iteration");
+    }
+}
+
 static int
 ar_general_foreach(VALUE hash, st_foreach_check_callback_func *func, st_update_callback_func *replace, st_data_t arg)
 {
@@ -822,7 +866,10 @@ ar_general_foreach(VALUE hash, st_foreach_check_callback_func *func, st_update_c
             if (ar_cleared_entry(hash, i)) continue;
 
             ar_table_pair *pair = RHASH_AR_TABLE_REF(hash, i);
-            enum st_retval retval = (*func)(pair->key, pair->val, arg, 0);
+            st_data_t key = (st_data_t)pair->key;
+            st_data_t val = (st_data_t)pair->val;
+            enum st_retval retval = (*func)(key, val, arg, 0);
+            ensure_ar_table(hash);
             /* pair may be not valid here because of theap */
 
             switch (retval) {
@@ -833,14 +880,12 @@ ar_general_foreach(VALUE hash, st_foreach_check_callback_func *func, st_update_c
                 return 0;
               case ST_REPLACE:
                 if (replace) {
-                    VALUE key = pair->key;
-                    VALUE val = pair->val;
-                    retval = (*replace)(&key, &val, arg, TRUE);
+                    (*replace)(&key, &val, arg, TRUE);
 
                     // TODO: pair should be same as pair before.
-                    ar_table_pair *pair = RHASH_AR_TABLE_REF(hash, i);
-                    pair->key = key;
-                    pair->val = val;
+                    pair = RHASH_AR_TABLE_REF(hash, i);
+                    pair->key = (VALUE)key;
+                    pair->val = (VALUE)val;
                 }
                 break;
               case ST_DELETE:
@@ -897,6 +942,7 @@ ar_foreach_check(VALUE hash, st_foreach_check_callback_func *func, st_data_t arg
             hint = ar_hint(hash, i);
 
             retval = (*func)(key, pair->val, arg, 0);
+            ensure_ar_table(hash);
             hash_verify(hash);
 
             switch (retval) {
@@ -905,7 +951,7 @@ ar_foreach_check(VALUE hash, st_foreach_check_callback_func *func, st_data_t arg
                 if (pair->key == never) break;
                 ret = ar_find_entry_hint(hash, hint, key);
                 if (ret == RHASH_AR_TABLE_MAX_BOUND) {
-                    retval = (*func)(0, 0, arg, 1);
+                    (*func)(0, 0, arg, 1);
                     return 2;
                 }
               }
@@ -957,6 +1003,7 @@ ar_update(VALUE hash, st_data_t key,
     old_key = key;
     retval = (*func)(&key, &value, arg, existing);
     /* pair can be invalid here because of theap */
+    ensure_ar_table(hash);
 
     switch (retval) {
       case ST_CONTINUE:
@@ -1161,18 +1208,32 @@ ar_clear(VALUE hash)
 }
 
 static void
-st_free_and_clear_table(VALUE hash)
+hash_st_free(VALUE hash)
 {
     HASH_ASSERT(RHASH_ST_TABLE_P(hash));
 
     st_table *tab = RHASH_ST_TABLE(hash);
 
-    free(tab->bins);
-    free(tab->entries);
+    xfree(tab->bins);
+    xfree(tab->entries);
+}
+
+static void
+hash_st_free_and_clear_table(VALUE hash)
+{
+    hash_st_free(hash);
 
     RHASH_ST_CLEAR(hash);
 }
 
+void
+rb_hash_free(VALUE hash)
+{
+    if (RHASH_ST_TABLE_P(hash)) {
+        hash_st_free(hash);
+    }
+}
+
 typedef int st_foreach_func(st_data_t, st_data_t, st_data_t);
 
 struct foreach_safe_arg {
@@ -1261,85 +1322,79 @@ hash_foreach_iter(st_data_t key, st_data_t value, st_data_t argp, int error)
     return hash_iter_status_check(status);
 }
 
-static int
+static unsigned long
 iter_lev_in_ivar(VALUE hash)
 {
     VALUE levval = rb_ivar_get(hash, id_hash_iter_lev);
     HASH_ASSERT(FIXNUM_P(levval));
-    return FIX2INT(levval);
+    long lev = FIX2LONG(levval);
+    HASH_ASSERT(lev >= 0);
+    return (unsigned long)lev;
 }
 
 void rb_ivar_set_internal(VALUE obj, ID id, VALUE val);
 
 static void
-iter_lev_in_ivar_set(VALUE hash, int lev)
+iter_lev_in_ivar_set(VALUE hash, unsigned long lev)
 {
-    rb_ivar_set_internal(hash, id_hash_iter_lev, INT2FIX(lev));
+    HASH_ASSERT(lev >= RHASH_LEV_MAX);
+    HASH_ASSERT(POSFIXABLE(lev)); /* POSFIXABLE means fitting to long */
+    rb_ivar_set_internal(hash, id_hash_iter_lev, LONG2FIX((long)lev));
 }
 
-static inline int
+static inline unsigned long
 iter_lev_in_flags(VALUE hash)
 {
-    unsigned int u = (unsigned int)((RBASIC(hash)->flags >> RHASH_LEV_SHIFT) & RHASH_LEV_MAX);
-    return (int)u;
+    return (unsigned long)((RBASIC(hash)->flags >> RHASH_LEV_SHIFT) & RHASH_LEV_MAX);
 }
 
 static inline void
-iter_lev_in_flags_set(VALUE hash, int lev)
+iter_lev_in_flags_set(VALUE hash, unsigned long lev)
 {
+    HASH_ASSERT(lev <= RHASH_LEV_MAX);
     RBASIC(hash)->flags = ((RBASIC(hash)->flags & ~RHASH_LEV_MASK) | ((VALUE)lev << RHASH_LEV_SHIFT));
 }
 
-static int
-RHASH_ITER_LEV(VALUE hash)
+static inline bool
+hash_iterating_p(VALUE hash)
 {
-    int lev = iter_lev_in_flags(hash);
-
-    if (lev == RHASH_LEV_MAX) {
-        return iter_lev_in_ivar(hash);
-    }
-    else {
-        return lev;
-    }
+    return iter_lev_in_flags(hash) > 0;
 }
 
 static void
 hash_iter_lev_inc(VALUE hash)
 {
-    int lev = iter_lev_in_flags(hash);
+    unsigned long lev = iter_lev_in_flags(hash);
     if (lev == RHASH_LEV_MAX) {
-        lev = iter_lev_in_ivar(hash);
-        iter_lev_in_ivar_set(hash, lev+1);
+        lev = iter_lev_in_ivar(hash) + 1;
+        if (!POSFIXABLE(lev)) { /* paranoiac check */
+            rb_raise(rb_eRuntimeError, "too much nested iterations");
+        }
     }
     else {
         lev += 1;
         iter_lev_in_flags_set(hash, lev);
-        if (lev == RHASH_LEV_MAX) {
-            iter_lev_in_ivar_set(hash, lev);
-        }
+        if (lev < RHASH_LEV_MAX) return;
     }
+    iter_lev_in_ivar_set(hash, lev);
 }
 
 static void
 hash_iter_lev_dec(VALUE hash)
 {
-    int lev = iter_lev_in_flags(hash);
+    unsigned long lev = iter_lev_in_flags(hash);
     if (lev == RHASH_LEV_MAX) {
         lev = iter_lev_in_ivar(hash);
-        HASH_ASSERT(lev > 0);
-        iter_lev_in_ivar_set(hash, lev-1);
+        if (lev > RHASH_LEV_MAX) {
+            iter_lev_in_ivar_set(hash, lev-1);
+            return;
+        }
+        rb_attr_delete(hash, id_hash_iter_lev);
     }
-    else {
-        HASH_ASSERT(lev > 0);
-        iter_lev_in_flags_set(hash, lev - 1);
+    else if (lev == 0) {
+        rb_raise(rb_eRuntimeError, "iteration level underflow");
     }
-}
-
-static VALUE
-hash_foreach_ensure_rollback(VALUE hash)
-{
-    hash_iter_lev_inc(hash);
-    return 0;
+    iter_lev_in_flags_set(hash, lev - 1);
 }
 
 static VALUE
@@ -1349,6 +1404,7 @@ hash_foreach_ensure(VALUE hash)
     return 0;
 }
 
+/* This does not manage iteration level */
 int
 rb_hash_stlike_foreach(VALUE hash, st_foreach_callback_func *func, st_data_t arg)
 {
@@ -1360,6 +1416,7 @@ rb_hash_stlike_foreach(VALUE hash, st_foreach_callback_func *func, st_data_t arg
     }
 }
 
+/* This does not manage iteration level */
 int
 rb_hash_stlike_foreach_with_replace(VALUE hash, st_foreach_check_callback_func *func, st_update_callback_func *replace, st_data_t arg)
 {
@@ -1410,6 +1467,16 @@ rb_hash_foreach(VALUE hash, rb_foreach_func *func, VALUE farg)
     hash_verify(hash);
 }
 
+void rb_st_compact_table(st_table *tab);
+
+static void
+compact_after_delete(VALUE hash)
+{
+    if (!hash_iterating_p(hash) && RHASH_ST_TABLE_P(hash)) {
+        rb_st_compact_table(RHASH_ST_TABLE(hash));
+    }
+}
+
 static VALUE
 hash_alloc_flags(VALUE klass, VALUE flags, VALUE ifnone, bool st)
 {
@@ -1481,7 +1548,7 @@ hash_copy(VALUE ret, VALUE hash)
         }
         else {
             st_table *tab = RHASH_ST_TABLE(ret);
-            rb_st_init_existing_table_with_size(tab, &objhash, RHASH_AR_TABLE_SIZE(hash));
+            st_init_existing_table_with_size(tab, &objhash, RHASH_AR_TABLE_SIZE(hash));
 
             int bound = RHASH_AR_TABLE_BOUND(hash);
             for (int i = 0; i < bound; i++) {
@@ -1508,7 +1575,15 @@ hash_copy(VALUE ret, VALUE hash)
 static VALUE
 hash_dup_with_compare_by_id(VALUE hash)
 {
-    return hash_copy(copy_compare_by_id(rb_hash_new(), hash), hash);
+    VALUE dup = hash_alloc_flags(rb_cHash, 0, Qnil, RHASH_ST_TABLE_P(hash));
+    if (RHASH_ST_TABLE_P(hash)) {
+        RHASH_SET_ST_FLAG(dup);
+    }
+    else {
+        RHASH_UNSET_ST_FLAG(dup);
+    }
+
+    return hash_copy(dup, hash);
 }
 
 static VALUE
@@ -1522,10 +1597,11 @@ VALUE
 rb_hash_dup(VALUE hash)
 {
     const VALUE flags = RBASIC(hash)->flags;
-    VALUE ret = hash_dup(hash, rb_obj_class(hash),
-                         flags & (FL_EXIVAR|RHASH_PROC_DEFAULT));
-    if (flags & FL_EXIVAR)
+    VALUE ret = hash_dup(hash, rb_obj_class(hash), flags & RHASH_PROC_DEFAULT);
+
+    if (rb_obj_exivar_p(hash)) {
         rb_copy_generic_ivar(ret, hash);
+    }
     return ret;
 }
 
@@ -1542,7 +1618,7 @@ rb_hash_modify_check(VALUE hash)
     rb_check_frozen(hash);
 }
 
-RUBY_FUNC_EXPORTED struct st_table *
+struct st_table *
 rb_hash_tbl_raw(VALUE hash, const char *file, int line)
 {
     return ar_force_convert_table(hash, file, line);
@@ -1603,7 +1679,7 @@ rb_hash_stlike_update(VALUE hash, st_data_t key, st_update_callback_func *func,
     if (RHASH_AR_TABLE_P(hash)) {
         int result = ar_update(hash, key, func, arg);
         if (result == -1) {
-            ar_try_convert_table(hash);
+            ar_force_convert_table(hash, __FILE__, __LINE__);
         }
         else {
             return result;
@@ -1648,26 +1724,26 @@ tbl_update(VALUE hash, VALUE key, tbl_update_func func, st_data_t optional_arg)
         .func = func,
         .hash = hash,
         .key  = key,
-        .value = (VALUE)optional_arg,
+        .value = 0
     };
 
     int ret = rb_hash_stlike_update(hash, key, tbl_update_modify, (st_data_t)&arg);
 
     /* write barrier */
     RB_OBJ_WRITTEN(hash, Qundef, arg.key);
-    RB_OBJ_WRITTEN(hash, Qundef, arg.value);
+    if (arg.value) RB_OBJ_WRITTEN(hash, Qundef, arg.value);
 
     return ret;
 }
 
-#define UPDATE_CALLBACK(iter_lev, func) ((iter_lev) > 0 ? func##_noinsert : func##_insert)
+#define UPDATE_CALLBACK(iter_p, func) ((iter_p) ? func##_noinsert : func##_insert)
 
-#define RHASH_UPDATE_ITER(h, iter_lev, key, func, a) do {                        \
-    tbl_update((h), (key), UPDATE_CALLBACK((iter_lev), func), (st_data_t)(a)); \
+#define RHASH_UPDATE_ITER(h, iter_p, key, func, a) do { \
+    tbl_update((h), (key), UPDATE_CALLBACK(iter_p, func), (st_data_t)(a)); \
 } while (0)
 
 #define RHASH_UPDATE(hash, key, func, arg) \
-    RHASH_UPDATE_ITER(hash, RHASH_ITER_LEV(hash), key, func, arg)
+    RHASH_UPDATE_ITER(hash, hash_iterating_p(hash), key, func, arg)
 
 static void
 set_proc_default(VALUE hash, VALUE proc)
@@ -1685,58 +1761,31 @@ set_proc_default(VALUE hash, VALUE proc)
     RHASH_SET_IFNONE(hash, proc);
 }
 
-/*
- *  call-seq:
- *     Hash.new(default_value = nil) -> new_hash
- *     Hash.new {|hash, key| ... } -> new_hash
- *
- *  Returns a new empty \Hash object.
- *
- *  The initial default value and initial default proc for the new hash
- *  depend on which form above was used. See {Default Values}[rdoc-ref:Hash@Default+Values].
- *
- *  If neither an argument nor a block given,
- *  initializes both the default value and the default proc to <tt>nil</tt>:
- *    h = Hash.new
- *    h.default # => nil
- *    h.default_proc # => nil
- *
- *  If argument <tt>default_value</tt> given but no block given,
- *  initializes the default value to the given <tt>default_value</tt>
- *  and the default proc to <tt>nil</tt>:
- *    h = Hash.new(false)
- *    h.default # => false
- *    h.default_proc # => nil
- *
- *  If a block given but no argument, stores the block as the default proc
- *  and sets the default value to <tt>nil</tt>:
- *    h = Hash.new {|hash, key| "Default value for #{key}" }
- *    h.default # => nil
- *    h.default_proc.class # => Proc
- *    h[:nosuch] # => "Default value for nosuch"
- */
-
 static VALUE
-rb_hash_initialize(int argc, VALUE *argv, VALUE hash)
+rb_hash_init(rb_execution_context_t *ec, VALUE hash, VALUE capa_value, VALUE ifnone_unset, VALUE ifnone, VALUE block)
 {
     rb_hash_modify(hash);
 
-    if (rb_block_given_p()) {
-        rb_check_arity(argc, 0, 0);
-        SET_PROC_DEFAULT(hash, rb_block_proc());
+    if (capa_value != INT2FIX(0)) {
+        long capa = NUM2LONG(capa_value);
+        if (capa > 0 && RHASH_SIZE(hash) == 0 && RHASH_AR_TABLE_P(hash)) {
+            hash_st_table_init(hash, &objhash, capa);
+        }
     }
-    else {
-        rb_check_arity(argc, 0, 1);
 
-        VALUE options, ifnone;
-        rb_scan_args(argc, argv, "01:", &ifnone, &options);
-        if (NIL_P(ifnone) && !NIL_P(options)) {
-            ifnone = options;
-            rb_warn_deprecated_to_remove("3.4", "Calling Hash.new with keyword arguments", "Hash.new({ key: value })");
+    if (!NIL_P(block)) {
+        if (ifnone_unset != Qtrue) {
+            rb_check_arity(1, 0, 0);
+        }
+        else {
+            SET_PROC_DEFAULT(hash, block);
         }
-        RHASH_SET_IFNONE(hash, ifnone);
+    }
+    else {
+        RHASH_SET_IFNONE(hash, ifnone_unset == Qtrue ? Qnil : ifnone);
     }
 
+    hash_verify(hash);
     return hash;
 }
 
@@ -1745,36 +1794,38 @@ static VALUE rb_hash_to_a(VALUE hash);
 /*
  *  call-seq:
  *    Hash[] -> new_empty_hash
- *    Hash[hash] -> new_hash
+ *    Hash[other_hash] -> new_hash
  *    Hash[ [*2_element_arrays] ] -> new_hash
  *    Hash[*objects] -> new_hash
  *
  *  Returns a new \Hash object populated with the given objects, if any.
  *  See Hash::new.
  *
- *  With no argument, returns a new empty \Hash.
+ *  With no argument given, returns a new empty hash.
  *
- *  When the single given argument is a \Hash, returns a new \Hash
- *  populated with the entries from the given \Hash, excluding the
- *  default value or proc.
+ *  With a single argument +other_hash+ given that is a hash,
+ *  returns a new hash initialized with the entries from that hash
+ *  (but not with its +default+ or +default_proc+):
  *
  *    h = {foo: 0, bar: 1, baz: 2}
- *    Hash[h] # => {:foo=>0, :bar=>1, :baz=>2}
+ *    Hash[h] # => {foo: 0, bar: 1, baz: 2}
  *
- *  When the single given argument is an Array of 2-element Arrays,
- *  returns a new \Hash object wherein each 2-element array forms a
+ *  With a single argument +2_element_arrays+ given that is an array of 2-element arrays,
+ *  returns a new hash wherein each given 2-element array forms a
  *  key-value entry:
  *
- *    Hash[ [ [:foo, 0], [:bar, 1] ] ] # => {:foo=>0, :bar=>1}
+ *    Hash[ [ [:foo, 0], [:bar, 1] ] ] # => {foo: 0, bar: 1}
  *
- *  When the argument count is an even number;
- *  returns a new \Hash object wherein each successive pair of arguments
- *  has become a key-value entry:
+ *  With an even number of arguments +objects+ given,
+ *  returns a new hash wherein each successive pair of arguments
+ *  is a key-value entry:
  *
- *    Hash[:foo, 0, :bar, 1] # => {:foo=>0, :bar=>1}
+ *    Hash[:foo, 0, :bar, 1] # => {foo: 0, bar: 1}
  *
- *  Raises an exception if the argument list does not conform to any
+ *  Raises ArgumentError if the argument list does not conform to any
  *  of the above.
+ *
+ *  See also {Methods for Creating a Hash}[rdoc-ref:Hash@Methods+for+Creating+a+Hash].
  */
 
 static VALUE
@@ -1854,16 +1905,15 @@ rb_check_hash_type(VALUE hash)
 
 /*
  *  call-seq:
- *    Hash.try_convert(obj) -> obj, new_hash, or nil
- *
- *  If +obj+ is a \Hash object, returns +obj+.
+ *    Hash.try_convert(object) -> object, new_hash, or nil
  *
- *  Otherwise if +obj+ responds to <tt>:to_hash</tt>,
- *  calls <tt>obj.to_hash</tt> and returns the result.
+ *  If +object+ is a hash, returns +object+.
  *
- *  Returns +nil+ if +obj+ does not respond to <tt>:to_hash</tt>
+ *  Otherwise if +object+ responds to +:to_hash+,
+ *  calls <tt>object.to_hash</tt>;
+ *  returns the result if it is a hash, or raises TypeError if not.
  *
- *  Raises an exception unless <tt>obj.to_hash</tt> returns a \Hash object.
+ *  Otherwise if +object+ does not respond to +:to_hash+, returns +nil+.
  */
 static VALUE
 rb_hash_s_try_convert(VALUE dummy, VALUE hash)
@@ -1939,10 +1989,11 @@ rb_hash_rehash_i(VALUE key, VALUE value, VALUE arg)
 
 /*
  *  call-seq:
- *     hash.rehash -> self
+ *     rehash -> self
  *
- *  Rebuilds the hash table by recomputing the hash index for each key;
+ *  Rebuilds the hash table for +self+ by recomputing the hash index for each key;
  *  returns <tt>self</tt>.
+ *  Calling this method ensures that the hash table is valid.
  *
  *  The hash table becomes invalid if the hash value of a key
  *  has changed after the entry was created.
@@ -1955,14 +2006,15 @@ rb_hash_rehash(VALUE hash)
     VALUE tmp;
     st_table *tbl;
 
-    if (RHASH_ITER_LEV(hash) > 0) {
+    if (hash_iterating_p(hash)) {
         rb_raise(rb_eRuntimeError, "rehash during iteration");
     }
     rb_hash_modify_check(hash);
     if (RHASH_AR_TABLE_P(hash)) {
         tmp = hash_alloc(0);
         rb_hash_foreach(hash, rb_hash_rehash_i, (VALUE)tmp);
-        ar_free_and_clear_table(hash);
+
+        hash_ar_free_and_clear_table(hash);
         ar_copy(hash, tmp);
     }
     else if (RHASH_ST_TABLE_P(hash)) {
@@ -1974,6 +2026,7 @@ rb_hash_rehash(VALUE hash)
 
         rb_hash_foreach(hash, rb_hash_rehash_i, (VALUE)tmp);
 
+        hash_st_free(hash);
         RHASH_ST_TABLE_SET(hash, tbl);
         RHASH_ST_CLEAR(tmp);
     }
@@ -1988,7 +2041,7 @@ call_default_proc(VALUE proc, VALUE hash, VALUE key)
     return rb_proc_call_with_block(proc, 2, args, Qnil);
 }
 
-static bool
+bool
 rb_hash_default_unredefined(VALUE hash)
 {
     VALUE klass = RBASIC_CLASS(hash);
@@ -2041,16 +2094,19 @@ rb_hash_stlike_lookup(VALUE hash, st_data_t key, st_data_t *pval)
 
 /*
  *  call-seq:
- *    hash[key] -> value
+ *    self[key] -> object
  *
- *  Returns the value associated with the given +key+, if found:
- *    h = {foo: 0, bar: 1, baz: 2}
- *    h[:foo] # => 0
+ *  Searches for a hash key equivalent to the given +key+;
+ *  see {Hash Key Equivalence}[rdoc-ref:Hash@Hash+Key+Equivalence].
  *
- *  If +key+ is not found, returns a default value
- *  (see {Default Values}[rdoc-ref:Hash@Default+Values]):
- *    h = {foo: 0, bar: 1, baz: 2}
- *    h[:nosuch] # => nil
+ *  If the key is found, returns its value:
+ *
+ *    {foo: 0, bar: 1, baz: 2}
+ *    h[:bar] # => 1
+ *
+ *  Otherwise, returns a default value (see {Hash Default}[rdoc-ref:Hash@Hash+Default]).
+ *
+ *  Related: #[]=; see also {Methods for Fetching}[rdoc-ref:Hash@Methods+for+Fetching].
  */
 
 VALUE
@@ -2087,25 +2143,28 @@ rb_hash_lookup(VALUE hash, VALUE key)
 
 /*
  *  call-seq:
- *    hash.fetch(key) -> object
- *    hash.fetch(key, default_value) -> object
- *    hash.fetch(key) {|key| ... } -> object
+ *    fetch(key) -> object
+ *    fetch(key, default_value) -> object
+ *    fetch(key) {|key| ... } -> object
+ *
+ *  With no block given, returns the value for the given +key+, if found;
  *
- *  Returns the value for the given +key+, if found.
  *    h = {foo: 0, bar: 1, baz: 2}
- *    h.fetch(:bar) # => 1
+ *    h.fetch(:bar)  # => 1
  *
- *  If +key+ is not found and no block was given,
- *  returns +default_value+:
- *    {}.fetch(:nosuch, :default) # => :default
+ *  If the key is not found, returns +default_value+, if given,
+ *  or raises KeyError otherwise:
  *
- *  If +key+ is not found and a block was given,
- *  yields +key+ to the block and returns the block's return value:
- *    {}.fetch(:nosuch) {|key| "No key #{key}"} # => "No key nosuch"
+ *    h.fetch(:nosuch, :default) # => :default
+ *    h.fetch(:nosuch)           # Raises KeyError.
  *
- *  Raises KeyError if neither +default_value+ nor a block was given.
+ *  With a block given, calls the block with +key+ and returns the block's return value:
+ *
+ *    {}.fetch(:nosuch) {|key| "No key #{key}"} # => "No key nosuch"
  *
  *  Note that this method does not use the values of either #default or #default_proc.
+ *
+ *  Related: see {Methods for Fetching}[rdoc-ref:Hash@Methods+for+Fetching].
  */
 
 static VALUE
@@ -2152,12 +2211,12 @@ rb_hash_fetch(VALUE hash, VALUE key)
 
 /*
  *  call-seq:
- *    hash.default -> object
- *    hash.default(key) -> object
+ *    default -> object
+ *    default(key) -> object
  *
  *  Returns the default value for the given +key+.
  *  The returned value will be determined either by the default proc or by the default value.
- *  See {Default Values}[rdoc-ref:Hash@Default+Values].
+ *  See {Hash Default}[rdoc-ref:Hash@Hash+Default].
  *
  *  With no argument, returns the current default value:
  *    h = {}
@@ -2186,7 +2245,7 @@ rb_hash_default(int argc, VALUE *argv, VALUE hash)
 
 /*
  *  call-seq:
- *    hash.default = value -> object
+ *    default = value -> object
  *
  *  Sets the default value to +value+; returns +value+:
  *    h = {}
@@ -2194,10 +2253,10 @@ rb_hash_default(int argc, VALUE *argv, VALUE hash)
  *    h.default = false # => false
  *    h.default # => false
  *
- *  See {Default Values}[rdoc-ref:Hash@Default+Values].
+ *  See {Hash Default}[rdoc-ref:Hash@Hash+Default].
  */
 
-static VALUE
+VALUE
 rb_hash_set_default(VALUE hash, VALUE ifnone)
 {
     rb_hash_modify_check(hash);
@@ -2207,10 +2266,10 @@ rb_hash_set_default(VALUE hash, VALUE ifnone)
 
 /*
  *  call-seq:
- *    hash.default_proc -> proc or nil
+ *    default_proc -> proc or nil
  *
  *  Returns the default proc for +self+
- *  (see {Default Values}[rdoc-ref:Hash@Default+Values]):
+ *  (see {Hash Default}[rdoc-ref:Hash@Hash+Default]):
  *    h = {}
  *    h.default_proc # => nil
  *    h.default_proc = proc {|hash, key| "Default value for #{key}" }
@@ -2228,10 +2287,10 @@ rb_hash_default_proc(VALUE hash)
 
 /*
  *  call-seq:
- *    hash.default_proc = proc -> proc
+ *    default_proc = proc -> proc
  *
- *  Sets the default proc for +self+ to +proc+:
- *  (see {Default Values}[rdoc-ref:Hash@Default+Values]):
+ *  Sets the default proc for +self+ to +proc+
+ *  (see {Hash Default}[rdoc-ref:Hash@Hash+Default]):
  *    h = {}
  *    h.default_proc # => nil
  *    h.default_proc = proc { |hash, key| "Default value for #{key}" }
@@ -2275,15 +2334,18 @@ key_i(VALUE key, VALUE value, VALUE arg)
 
 /*
  *  call-seq:
- *    hash.key(value) -> key or nil
+ *    key(value) -> key or nil
  *
  *  Returns the key for the first-found entry with the given +value+
  *  (see {Entry Order}[rdoc-ref:Hash@Entry+Order]):
+ *
  *    h = {foo: 0, bar: 2, baz: 2}
  *    h.key(0) # => :foo
  *    h.key(2) # => :bar
  *
  *  Returns +nil+ if no such value is found.
+ *
+ *  Related: see {Methods for Fetching}[rdoc-ref:Hash@Methods+for+Fetching].
  */
 
 static VALUE
@@ -2348,29 +2410,36 @@ rb_hash_delete(VALUE hash, VALUE key)
 
 /*
  *  call-seq:
- *    hash.delete(key) -> value or nil
- *    hash.delete(key) {|key| ... } -> object
+ *    delete(key) -> value or nil
+ *    delete(key) {|key| ... } -> object
+ *
+ *  If an entry for the given +key+ is found,
+ *  deletes the entry and returns its associated value;
+ *  otherwise returns +nil+ or calls the given block.
  *
- *  Deletes the entry for the given +key+ and returns its associated value.
+ *  With no block given and +key+ found, deletes the entry and returns its value:
  *
- *  If no block is given and +key+ is found, deletes the entry and returns the associated value:
  *    h = {foo: 0, bar: 1, baz: 2}
  *    h.delete(:bar) # => 1
- *    h # => {:foo=>0, :baz=>2}
+ *    h # => {foo: 0, baz: 2}
  *
- *  If no block given and +key+ is not found, returns +nil+.
+ *  With no block given and +key+ not found, returns +nil+.
+ *
+ *  With a block given and +key+ found, ignores the block,
+ *  deletes the entry, and returns its value:
  *
- *  If a block is given and +key+ is found, ignores the block,
- *  deletes the entry, and returns the associated value:
  *    h = {foo: 0, bar: 1, baz: 2}
  *    h.delete(:baz) { |key| raise 'Will never happen'} # => 2
- *    h # => {:foo=>0, :bar=>1}
+ *    h # => {foo: 0, bar: 1}
  *
- *  If a block is given and +key+ is not found,
+ *  With a block given and +key+ not found,
  *  calls the block and returns the block's return value:
+ *
  *    h = {foo: 0, bar: 1, baz: 2}
  *    h.delete(:nosuch) { |key| "Key #{key} not found" } # => "Key nosuch not found"
- *    h # => {:foo=>0, :bar=>1, :baz=>2}
+ *    h # => {foo: 0, bar: 1, baz: 2}
+ *
+ *  Related: see {Methods for Deleting}[rdoc-ref:Hash@Methods+for+Deleting].
  */
 
 static VALUE
@@ -2382,6 +2451,7 @@ rb_hash_delete_m(VALUE hash, VALUE key)
     val = rb_hash_delete_entry(hash, key);
 
     if (!UNDEF_P(val)) {
+        compact_after_delete(hash);
         return val;
     }
     else {
@@ -2411,16 +2481,18 @@ shift_i_safe(VALUE key, VALUE value, VALUE arg)
 
 /*
  *  call-seq:
- *    hash.shift -> [key, value] or nil
+ *    shift -> [key, value] or nil
+ *
+ *  Removes and returns the first entry of +self+ as a 2-element array;
+ *  see {Entry Order}[rdoc-ref:Hash@Entry+Order]:
  *
- *  Removes the first hash entry
- *  (see {Entry Order}[rdoc-ref:Hash@Entry+Order]);
- *  returns a 2-element Array containing the removed key and value:
  *    h = {foo: 0, bar: 1, baz: 2}
  *    h.shift # => [:foo, 0]
- *    h # => {:bar=>1, :baz=>2}
+ *    h       # => {bar: 1, baz: 2}
  *
- *  Returns nil if the hash is empty.
+ *  Returns +nil+ if +self+ is empty.
+ *
+ *  Related: see {Methods for Deleting}[rdoc-ref:Hash@Methods+for+Deleting].
  */
 
 static VALUE
@@ -2431,7 +2503,7 @@ rb_hash_shift(VALUE hash)
     rb_hash_modify_check(hash);
     if (RHASH_AR_TABLE_P(hash)) {
         var.key = Qundef;
-        if (RHASH_ITER_LEV(hash) == 0) {
+        if (!hash_iterating_p(hash)) {
             if (ar_shift(hash, &var.key, &var.val)) {
                 return rb_assoc_new(var.key, var.val);
             }
@@ -2446,7 +2518,7 @@ rb_hash_shift(VALUE hash)
     }
     if (RHASH_ST_TABLE_P(hash)) {
         var.key = Qundef;
-        if (RHASH_ITER_LEV(hash) == 0) {
+        if (!hash_iterating_p(hash)) {
             if (st_shift(RHASH_ST_TABLE(hash), &var.key, &var.val)) {
                 return rb_assoc_new(var.key, var.val);
             }
@@ -2480,19 +2552,19 @@ hash_enum_size(VALUE hash, VALUE args, VALUE eobj)
 
 /*
  *  call-seq:
- *    hash.delete_if {|key, value| ... } -> self
- *    hash.delete_if -> new_enumerator
+ *    delete_if {|key, value| ... } -> self
+ *    delete_if -> new_enumerator
  *
- *  If a block given, calls the block with each key-value pair;
- *  deletes each entry for which the block returns a truthy value;
- *  returns +self+:
- *    h = {foo: 0, bar: 1, baz: 2}
- *    h.delete_if {|key, value| value > 0 } # => {:foo=>0}
+ *  With a block given, calls the block with each key-value pair,
+ *  deletes each entry for which the block returns a truthy value,
+ *  and returns +self+:
  *
- *  If no block given, returns a new Enumerator:
  *    h = {foo: 0, bar: 1, baz: 2}
- *    e = h.delete_if # => #<Enumerator: {:foo=>0, :bar=>1, :baz=>2}:delete_if>
- *    e.each { |key, value| value > 0 } # => {:foo=>0}
+ *    h.delete_if {|key, value| value > 0 } # => {foo: 0}
+ *
+ *  With no block given, returns a new Enumerator.
+ *
+ *  Related: see {Methods for Deleting}[rdoc-ref:Hash@Methods+for+Deleting].
  */
 
 VALUE
@@ -2502,26 +2574,28 @@ rb_hash_delete_if(VALUE hash)
     rb_hash_modify_check(hash);
     if (!RHASH_TABLE_EMPTY_P(hash)) {
         rb_hash_foreach(hash, delete_if_i, hash);
+        compact_after_delete(hash);
     }
     return hash;
 }
 
 /*
  *  call-seq:
- *    hash.reject! {|key, value| ... } -> self or nil
- *    hash.reject! -> new_enumerator
+ *    reject! {|key, value| ... } -> self or nil
+ *    reject! -> new_enumerator
  *
- *  Returns +self+, whose remaining entries are those
- *  for which the block returns +false+ or +nil+:
- *    h = {foo: 0, bar: 1, baz: 2}
- *    h.reject! {|key, value| value < 2 } # => {:baz=>2}
+ *  With a block given, calls the block with each entry's key and value;
+ *  removes the entry from +self+ if the block returns a truthy value.
  *
- *  Returns +nil+ if no entries are removed.
+ *  Return +self+ if any entries were removed, +nil+ otherwise:
  *
- *  Returns a new Enumerator if no block given:
  *    h = {foo: 0, bar: 1, baz: 2}
- *    e = h.reject! # => #<Enumerator: {:foo=>0, :bar=>1, :baz=>2}:reject!>
- *    e.each {|key, value| key.start_with?('b') } # => {:foo=>0}
+ *    h.reject! {|key, value| value < 2 } # => {baz: 2}
+ *    h.reject! {|key, value| value < 2 } # => nil
+ *
+ *  With no block given, returns a new Enumerator.
+ *
+ *  Related: see {Methods for Deleting}[rdoc-ref:Hash@Methods+for+Deleting].
  */
 
 static VALUE
@@ -2540,20 +2614,21 @@ rb_hash_reject_bang(VALUE hash)
 
 /*
  *  call-seq:
- *    hash.reject {|key, value| ... } -> new_hash
- *    hash.reject -> new_enumerator
+ *    reject {|key, value| ... } -> new_hash
+ *    reject -> new_enumerator
  *
- *  Returns a new \Hash object whose entries are all those
- *  from +self+ for which the block returns +false+ or +nil+:
- *    h = {foo: 0, bar: 1, baz: 2}
- *    h1 = h.reject {|key, value| key.start_with?('b') }
- *    h1 # => {:foo=>0}
+ *  With a block given, returns a copy of +self+ with zero or more entries removed;
+ *  calls the block with each key-value pair;
+ *  excludes the entry in the copy if the block returns a truthy value,
+ *  includes it otherwise:
  *
- *  Returns a new Enumerator if no block given:
  *    h = {foo: 0, bar: 1, baz: 2}
- *    e = h.reject # => #<Enumerator: {:foo=>0, :bar=>1, :baz=>2}:reject>
- *    h1 = e.each {|key, value| key.start_with?('b') }
- *    h1 # => {:foo=>0}
+ *    h.reject {|key, value| key.start_with?('b') }
+ *    # => {foo: 0}
+ *
+ *  With no block given, returns a new Enumerator.
+ *
+ *  Related: see {Methods for Deleting}[rdoc-ref:Hash@Methods+for+Deleting].
  */
 
 static VALUE
@@ -2565,19 +2640,22 @@ rb_hash_reject(VALUE hash)
     result = hash_dup_with_compare_by_id(hash);
     if (!RHASH_EMPTY_P(hash)) {
         rb_hash_foreach(result, delete_if_i, result);
+        compact_after_delete(result);
     }
     return result;
 }
 
 /*
  *  call-seq:
- *    hash.slice(*keys) -> new_hash
+ *    slice(*keys) -> new_hash
+ *
+ *  Returns a new hash containing the entries from +self+ for the given +keys+;
+ *  ignores any keys that are not found:
  *
- *  Returns a new \Hash object containing the entries for the given +keys+:
  *    h = {foo: 0, bar: 1, baz: 2}
- *    h.slice(:baz, :foo) # => {:baz=>2, :foo=>0}
+ *    h.slice(:baz, :foo, :nosuch) # => {baz: 2, foo: 0}
  *
- *  Any given +keys+ that are not found are ignored.
+ *  Related: see {Methods for Deleting}[rdoc-ref:Hash@Methods+for+Deleting].
  */
 
 static VALUE
@@ -2603,13 +2681,16 @@ rb_hash_slice(int argc, VALUE *argv, VALUE hash)
 
 /*
  *  call-seq:
- *     hsh.except(*keys) -> a_hash
+ *    except(*keys) -> new_hash
  *
- *  Returns a new \Hash excluding entries for the given +keys+:
- *     h = { a: 100, b: 200, c: 300 }
- *     h.except(:a)          #=> {:b=>200, :c=>300}
+ *  Returns a copy of +self+ that excludes entries for the given +keys+;
+ *  any +keys+ that are not found are ignored:
  *
- *  Any given +keys+ that are not found are ignored.
+ *    h = {foo:0, bar: 1, baz: 2} # => {:foo=>0, :bar=>1, :baz=>2}
+ *    h.except(:baz, :foo)        # => {:bar=>1}
+ *    h.except(:bar, :nosuch)     # => {:foo=>0, :baz=>2}
+ *
+ *  Related: see {Methods for Deleting}[rdoc-ref:Hash@Methods+for+Deleting].
  */
 
 static VALUE
@@ -2624,21 +2705,26 @@ rb_hash_except(int argc, VALUE *argv, VALUE hash)
         key = argv[i];
         rb_hash_delete(result, key);
     }
+    compact_after_delete(result);
 
     return result;
 }
 
 /*
  *  call-seq:
- *    hash.values_at(*keys) -> new_array
+ *    values_at(*keys) -> new_array
+ *
+ *  Returns a new array containing values for the given +keys+:
  *
- *  Returns a new Array containing values for the given +keys+:
  *    h = {foo: 0, bar: 1, baz: 2}
  *    h.values_at(:baz, :foo) # => [2, 0]
  *
- *  The {default values}[rdoc-ref:Hash@Default+Values] are returned
- *  for any keys that are not found:
+ *  The {hash default}[rdoc-ref:Hash@Hash+Default] is returned
+ *  for each key that is not found:
+ *
  *    h.values_at(:hello, :foo) # => [nil, 0]
+ *
+ *  Related: see {Methods for Fetching}[rdoc-ref:Hash@Methods+for+Fetching].
  */
 
 static VALUE
@@ -2655,22 +2741,26 @@ rb_hash_values_at(int argc, VALUE *argv, VALUE hash)
 
 /*
  *  call-seq:
- *    hash.fetch_values(*keys) -> new_array
- *    hash.fetch_values(*keys) {|key| ... } -> new_array
+ *    fetch_values(*keys) -> new_array
+ *    fetch_values(*keys) {|key| ... } -> new_array
+ *
+ *  When all given +keys+ are found,
+ *  returns a new array containing the values associated with the given +keys+:
  *
- *  Returns a new Array containing the values associated with the given keys *keys:
  *    h = {foo: 0, bar: 1, baz: 2}
  *    h.fetch_values(:baz, :foo) # => [2, 0]
  *
- *  Returns a new empty Array if no arguments given.
+ *  When any given +keys+ are not found and a block is given,
+ *  calls the block with each unfound key and uses the block's return value
+ *  as the value for that key:
  *
- *  When a block is given, calls the block with each missing key,
- *  treating the block's return value as the value for that key:
- *    h = {foo: 0, bar: 1, baz: 2}
- *    values = h.fetch_values(:bar, :foo, :bad, :bam) {|key| key.to_s}
- *    values # => [1, 0, "bad", "bam"]
+ *    h.fetch_values(:bar, :foo, :bad, :bam) {|key| key.to_s}
+ *    # => [1, 0, "bad", "bam"]
  *
- *  When no block is given, raises an exception if any given key is not found.
+ *  When any given +keys+ are not found and no block is given,
+ *  raises KeyError.
+ *
+ *  Related: see {Methods for Fetching}[rdoc-ref:Hash@Methods+for+Fetching].
  */
 
 static VALUE
@@ -2697,17 +2787,18 @@ keep_if_i(VALUE key, VALUE value, VALUE hash)
 
 /*
  *  call-seq:
- *    hash.select {|key, value| ... } -> new_hash
- *    hash.select -> new_enumerator
+ *    select {|key, value| ... } -> new_hash
+ *    select -> new_enumerator
  *
- *  Returns a new \Hash object whose entries are those for which the block returns a truthy value:
- *    h = {foo: 0, bar: 1, baz: 2}
- *    h.select {|key, value| value < 2 } # => {:foo=>0, :bar=>1}
+ *  With a block given, calls the block with each entry's key and value;
+ *  returns a new hash whose entries are those for which the block returns a truthy value:
  *
- *  Returns a new Enumerator if no block given:
  *    h = {foo: 0, bar: 1, baz: 2}
- *    e = h.select # => #<Enumerator: {:foo=>0, :bar=>1, :baz=>2}:select>
- *    e.each {|key, value| value < 2 } # => {:foo=>0, :bar=>1}
+ *    h.select {|key, value| value < 2 } # => {foo: 0, bar: 1}
+ *
+ *  With no block given, returns a new Enumerator.
+ *
+ *  Related: see {Methods for Deleting}[rdoc-ref:Hash@Methods+for+Deleting].
  */
 
 static VALUE
@@ -2719,25 +2810,29 @@ rb_hash_select(VALUE hash)
     result = hash_dup_with_compare_by_id(hash);
     if (!RHASH_EMPTY_P(hash)) {
         rb_hash_foreach(result, keep_if_i, result);
+        compact_after_delete(result);
     }
     return result;
 }
 
 /*
  *  call-seq:
- *    hash.select! {|key, value| ... } -> self or nil
- *    hash.select! -> new_enumerator
+ *    select! {|key, value| ... } -> self or nil
+ *    select! -> new_enumerator
  *
- *  Returns +self+, whose entries are those for which the block returns a truthy value:
- *    h = {foo: 0, bar: 1, baz: 2}
- *    h.select! {|key, value| value < 2 }  => {:foo=>0, :bar=>1}
+ *  With a block given, calls the block with each entry's key and value;
+ *  removes from +self+ each entry for which the block returns +false+ or +nil+.
  *
- *  Returns +nil+ if no entries were removed.
+ *  Returns +self+ if any entries were removed, +nil+ otherwise:
  *
- *  Returns a new Enumerator if no block given:
  *    h = {foo: 0, bar: 1, baz: 2}
- *    e = h.select!  # => #<Enumerator: {:foo=>0, :bar=>1, :baz=>2}:select!>
- *    e.each { |key, value| value < 2 } # => {:foo=>0, :bar=>1}
+ *    h.select! {|key, value| value < 2 } # => {foo: 0, bar: 1}
+ *    h.select! {|key, value| value < 2 } # => nil
+ *
+ *
+ *  With no block given, returns a new Enumerator.
+ *
+ *  Related: see {Methods for Deleting}[rdoc-ref:Hash@Methods+for+Deleting].
  */
 
 static VALUE
@@ -2756,19 +2851,19 @@ rb_hash_select_bang(VALUE hash)
 
 /*
  *  call-seq:
- *    hash.keep_if {|key, value| ... } -> self
- *    hash.keep_if -> new_enumerator
+ *    keep_if {|key, value| ... } -> self
+ *    keep_if -> new_enumerator
  *
- *  Calls the block for each key-value pair;
+ *  With a block given, calls the block for each key-value pair;
  *  retains the entry if the block returns a truthy value;
- *  otherwise deletes the entry; returns +self+.
- *    h = {foo: 0, bar: 1, baz: 2}
- *    h.keep_if { |key, value| key.start_with?('b') } # => {:bar=>1, :baz=>2}
+ *  otherwise deletes the entry; returns +self+:
  *
- *  Returns a new Enumerator if no block given:
  *    h = {foo: 0, bar: 1, baz: 2}
- *    e = h.keep_if # => #<Enumerator: {:foo=>0, :bar=>1, :baz=>2}:keep_if>
- *    e.each { |key, value| key.start_with?('b') } # => {:bar=>1, :baz=>2}
+ *    h.keep_if { |key, value| key.start_with?('b') } # => {bar: 1, baz: 2}
+ *
+ *  With no block given, returns a new Enumerator.
+ *
+ *  Related: see {Methods for Deleting}[rdoc-ref:Hash@Methods+for+Deleting].
  */
 
 static VALUE
@@ -2790,9 +2885,11 @@ clear_i(VALUE key, VALUE value, VALUE dummy)
 
 /*
  *  call-seq:
- *    hash.clear -> self
+ *    clear -> self
+ *
+ *  Removes all entries from +self+; returns emptied +self+.
  *
- *  Removes all hash entries; returns +self+.
+ *  Related: see {Methods for Deleting}[rdoc-ref:Hash@Methods+for+Deleting].
  */
 
 VALUE
@@ -2800,7 +2897,7 @@ rb_hash_clear(VALUE hash)
 {
     rb_hash_modify_check(hash);
 
-    if (RHASH_ITER_LEV(hash) > 0) {
+    if (hash_iterating_p(hash)) {
         rb_hash_foreach(hash, clear_i, 0);
     }
     else if (RHASH_AR_TABLE_P(hash)) {
@@ -2808,6 +2905,7 @@ rb_hash_clear(VALUE hash)
     }
     else {
         st_clear(RHASH_ST_TABLE(hash));
+        compact_after_delete(hash);
     }
 
     return hash;
@@ -2823,7 +2921,7 @@ hash_aset(st_data_t *key, st_data_t *val, struct update_arg *arg, int existing)
 VALUE
 rb_hash_key_str(VALUE key)
 {
-    if (!RB_FL_ANY_RAW(key, FL_EXIVAR) && RBASIC_CLASS(key) == rb_cString) {
+    if (!rb_obj_exivar_p(key) && RBASIC_CLASS(key) == rb_cString) {
         return rb_fstring(key);
     }
     else {
@@ -2845,52 +2943,60 @@ NOINSERT_UPDATE_CALLBACK(hash_aset_str)
 
 /*
  *  call-seq:
- *    hash[key] = value -> value
- *    hash.store(key, value)
+ *    self[key] = object -> object
  *
- *  Associates the given +value+ with the given +key+; returns +value+.
+ *  Associates the given +object+ with the given +key+; returns +object+.
  *
- *  If the given +key+ exists, replaces its value with the given +value+;
+ *  Searches for a hash key equivalent to the given +key+;
+ *  see {Hash Key Equivalence}[rdoc-ref:Hash@Hash+Key+Equivalence].
+ *
+ *  If the key is found, replaces its value with the given +object+;
  *  the ordering is not affected
  *  (see {Entry Order}[rdoc-ref:Hash@Entry+Order]):
+ *
  *    h = {foo: 0, bar: 1}
  *    h[:foo] = 2 # => 2
- *    h.store(:bar, 3) # => 3
- *    h # => {:foo=>2, :bar=>3}
+ *    h[:foo]     # => 2
  *
- *  If +key+ does not exist, adds the +key+ and +value+;
+ *  If +key+ is not found, creates a new entry for the given +key+ and +object+;
  *  the new entry is last in the order
  *  (see {Entry Order}[rdoc-ref:Hash@Entry+Order]):
+ *
  *    h = {foo: 0, bar: 1}
  *    h[:baz] = 2 # => 2
- *    h.store(:bat, 3) # => 3
- *    h # => {:foo=>0, :bar=>1, :baz=>2, :bat=>3}
+ *    h[:baz]     # => 2
+ *    h           # => {:foo=>0, :bar=>1, :baz=>2}
+ *
+ *  Related: #[]; see also {Methods for Assigning}[rdoc-ref:Hash@Methods+for+Assigning].
  */
 
 VALUE
 rb_hash_aset(VALUE hash, VALUE key, VALUE val)
 {
-    int iter_lev = RHASH_ITER_LEV(hash);
+    bool iter_p = hash_iterating_p(hash);
 
     rb_hash_modify(hash);
 
-    if (RHASH_TYPE(hash) == &identhash || rb_obj_class(key) != rb_cString) {
-        RHASH_UPDATE_ITER(hash, iter_lev, key, hash_aset, val);
+    if (!RHASH_STRING_KEY_P(hash, key)) {
+        RHASH_UPDATE_ITER(hash, iter_p, key, hash_aset, val);
     }
     else {
-        RHASH_UPDATE_ITER(hash, iter_lev, key, hash_aset_str, val);
+        RHASH_UPDATE_ITER(hash, iter_p, key, hash_aset_str, val);
     }
     return val;
 }
 
 /*
  *  call-seq:
- *    hash.replace(other_hash) -> self
+ *    replace(other_hash) -> self
  *
  *  Replaces the entire contents of +self+ with the contents of +other_hash+;
  *  returns +self+:
+ *
  *    h = {foo: 0, bar: 1, baz: 2}
- *    h.replace({bat: 3, bam: 4}) # => {:bat=>3, :bam=>4}
+ *    h.replace({bat: 3, bam: 4}) # => {bat: 3, bam: 4}
+ *
+ *  Related: see {Methods for Assigning}[rdoc-ref:Hash@Methods+for+Assigning].
  */
 
 static VALUE
@@ -2898,7 +3004,7 @@ rb_hash_replace(VALUE hash, VALUE hash2)
 {
     rb_hash_modify_check(hash);
     if (hash == hash2) return hash;
-    if (RHASH_ITER_LEV(hash) > 0) {
+    if (hash_iterating_p(hash)) {
         rb_raise(rb_eRuntimeError, "can't replace hash during iteration");
     }
     hash2 = to_hash(hash2);
@@ -2906,10 +3012,10 @@ rb_hash_replace(VALUE hash, VALUE hash2)
     COPY_DEFAULT(hash, hash2);
 
     if (RHASH_AR_TABLE_P(hash)) {
-        ar_free_and_clear_table(hash);
+        hash_ar_free_and_clear_table(hash);
     }
     else {
-        st_free_and_clear_table(hash);
+        hash_st_free_and_clear_table(hash);
     }
 
     hash_copy(hash, hash2);
@@ -2919,13 +3025,13 @@ rb_hash_replace(VALUE hash, VALUE hash2)
 
 /*
  *  call-seq:
- *     hash.length -> integer
- *     hash.size -> integer
+ *     size -> integer
  *
  *  Returns the count of entries in +self+:
  *
- *    {foo: 0, bar: 1, baz: 2}.length # => 3
+ *    {foo: 0, bar: 1, baz: 2}.size # => 3
  *
+ *  Related: see {Methods for Querying}[rdoc-ref:Hash@Methods+for+Querying].
  */
 
 VALUE
@@ -2942,14 +3048,17 @@ rb_hash_size_num(VALUE hash)
 
 /*
  *  call-seq:
- *    hash.empty? -> true or false
+ *    empty? -> true or false
  *
  *  Returns +true+ if there are no hash entries, +false+ otherwise:
+ *
  *    {}.empty? # => true
- *    {foo: 0, bar: 1, baz: 2}.empty? # => false
+ *    {foo: 0}.empty? # => false
+ *
+ *  Related: see {Methods for Querying}[rdoc-ref:Hash@Methods+for+Querying].
  */
 
-static VALUE
+VALUE
 rb_hash_empty_p(VALUE hash)
 {
     return RBOOL(RHASH_EMPTY_P(hash));
@@ -2964,26 +3073,22 @@ each_value_i(VALUE key, VALUE value, VALUE _)
 
 /*
  *  call-seq:
- *    hash.each_value {|value| ... } -> self
- *    hash.each_value -> new_enumerator
+ *    each_value {|value| ... } -> self
+ *    each_value -> new_enumerator
  *
- *  Calls the given block with each value; returns +self+:
- *    h = {foo: 0, bar: 1, baz: 2}
- *    h.each_value {|value| puts value } # => {:foo=>0, :bar=>1, :baz=>2}
- *  Output:
- *    0
- *    1
- *    2
+ *  With a block given, calls the block with each value; returns +self+:
  *
- *  Returns a new Enumerator if no block given:
  *    h = {foo: 0, bar: 1, baz: 2}
- *    e = h.each_value # => #<Enumerator: {:foo=>0, :bar=>1, :baz=>2}:each_value>
- *    h1 = e.each {|value| puts value }
- *    h1 # => {:foo=>0, :bar=>1, :baz=>2}
+ *    h.each_value {|value| puts value } # => {foo: 0, bar: 1, baz: 2}
+ *
  *  Output:
  *    0
  *    1
  *    2
+ *
+ *  With no block given, returns a new Enumerator.
+ *
+ *  Related: see {Methods for Iterating}[rdoc-ref:Hash@Methods+for+Iterating].
  */
 
 static VALUE
@@ -3003,26 +3108,22 @@ each_key_i(VALUE key, VALUE value, VALUE _)
 
 /*
  *  call-seq:
- *    hash.each_key {|key| ... } -> self
- *    hash.each_key -> new_enumerator
+ *    each_key {|key| ... } -> self
+ *    each_key -> new_enumerator
  *
- *  Calls the given block with each key; returns +self+:
- *    h = {foo: 0, bar: 1, baz: 2}
- *    h.each_key {|key| puts key }  # => {:foo=>0, :bar=>1, :baz=>2}
- *  Output:
- *    foo
- *    bar
- *    baz
+ *  With a block given, calls the block with each key; returns +self+:
  *
- *  Returns a new Enumerator if no block given:
  *    h = {foo: 0, bar: 1, baz: 2}
- *    e = h.each_key # => #<Enumerator: {:foo=>0, :bar=>1, :baz=>2}:each_key>
- *    h1 = e.each {|key| puts key }
- *    h1 # => {:foo=>0, :bar=>1, :baz=>2}
+ *    h.each_key {|key| puts key }  # => {foo: 0, bar: 1, baz: 2}
+ *
  *  Output:
  *    foo
  *    bar
  *    baz
+ *
+ *  With no block given, returns a new Enumerator.
+ *
+ *  Related: see {Methods for Iterating}[rdoc-ref:Hash@Methods+for+Iterating].
  */
 static VALUE
 rb_hash_each_key(VALUE hash)
@@ -3051,28 +3152,23 @@ each_pair_i_fast(VALUE key, VALUE value, VALUE _)
 
 /*
  *  call-seq:
- *    hash.each {|key, value| ... } -> self
- *    hash.each_pair {|key, value| ... } -> self
- *    hash.each -> new_enumerator
- *    hash.each_pair -> new_enumerator
+ *    each_pair {|key, value| ... } -> self
+ *    each_pair -> new_enumerator
  *
- *  Calls the given block with each key-value pair; returns +self+:
- *    h = {foo: 0, bar: 1, baz: 2}
- *    h.each_pair {|key, value| puts "#{key}: #{value}"} # => {:foo=>0, :bar=>1, :baz=>2}
- *  Output:
- *    foo: 0
- *    bar: 1
- *    baz: 2
+ *  With a block given, calls the block with each key-value pair; returns +self+:
  *
- *  Returns a new Enumerator if no block given:
  *    h = {foo: 0, bar: 1, baz: 2}
- *    e = h.each_pair # => #<Enumerator: {:foo=>0, :bar=>1, :baz=>2}:each_pair>
- *    h1 = e.each {|key, value| puts "#{key}: #{value}"}
- *    h1 # => {:foo=>0, :bar=>1, :baz=>2}
+ *    h.each_pair {|key, value| puts "#{key}: #{value}"} # => {foo: 0, bar: 1, baz: 2}
+ *
  *  Output:
+ *
  *    foo: 0
  *    bar: 1
  *    baz: 2
+ *
+ *  With no block given, returns a new Enumerator.
+ *
+ *  Related: see {Methods for Iterating}[rdoc-ref:Hash@Methods+for+Iterating].
  */
 
 static VALUE
@@ -3118,40 +3214,91 @@ transform_keys_i(VALUE key, VALUE value, VALUE result)
 
 /*
  *  call-seq:
- *    hash.transform_keys {|key| ... } -> new_hash
- *    hash.transform_keys(hash2) -> new_hash
- *    hash.transform_keys(hash2) {|other_key| ...} -> new_hash
- *    hash.transform_keys -> new_enumerator
+ *    transform_keys {|old_key| ... } -> new_hash
+ *    transform_keys(other_hash) -> new_hash
+ *    transform_keys(other_hash) {|old_key| ...} -> new_hash
+ *    transform_keys -> new_enumerator
  *
- *  Returns a new \Hash object; each entry has:
- *  * A key provided by the block.
- *  * The value from +self+.
+ *  With an argument, a block, or both given,
+ *  derives a new hash +new_hash+ from +self+, the argument, and/or the block;
+ *  all, some, or none of its keys may be different from those in +self+.
  *
- *  An optional hash argument can be provided to map keys to new keys.
- *  Any key not given will be mapped using the provided block,
- *  or remain the same if no block is given.
+ *  With a block given and no argument,
+ *  +new_hash+ has keys determined only by the block.
+ *
+ *  For each key/value pair <tt>old_key/value</tt> in +self+, calls the block with +old_key+;
+ *  the block's return value becomes +new_key+;
+ *  sets <tt>new_hash[new_key] = value</tt>;
+ *  a duplicate key overwrites:
  *
- *  Transform keys:
  *      h = {foo: 0, bar: 1, baz: 2}
- *      h1 = h.transform_keys {|key| key.to_s }
- *      h1 # => {"foo"=>0, "bar"=>1, "baz"=>2}
+ *      h.transform_keys {|old_key| old_key.to_s }
+ *      # => {"foo" => 0, "bar" => 1, "baz" => 2}
+ *      h.transform_keys {|old_key| 'xxx' }
+ *      # => {"xxx" => 2}
  *
- *      h.transform_keys(foo: :bar, bar: :foo)
- *      #=> {bar: 0, foo: 1, baz: 2}
+ *  With argument +other_hash+ given and no block,
+ *  +new_hash+ may have new keys provided by +other_hash+
+ *  and unchanged keys provided by +self+.
  *
- *      h.transform_keys(foo: :hello, &:to_s)
- *      #=> {:hello=>0, "bar"=>1, "baz"=>2}
+ *  For each key/value pair <tt>old_key/old_value</tt> in +self+,
+ *  looks for key +old_key+ in +other_hash+:
  *
- *  Overwrites values for duplicate keys:
- *    h = {foo: 0, bar: 1, baz: 2}
- *    h1 = h.transform_keys {|key| :bat }
- *    h1 # => {:bat=>2}
+ *  - If +old_key+ is found, its value <tt>other_hash[old_key]</tt> is taken as +new_key+;
+ *    sets <tt>new_hash[new_key] = value</tt>;
+ *    a duplicate key overwrites:
+ *
+ *      h = {foo: 0, bar: 1, baz: 2}
+ *      h.transform_keys(baz: :BAZ, bar: :BAR, foo: :FOO)
+ *      # => {FOO: 0, BAR: 1, BAZ: 2}
+ *      h.transform_keys(baz: :FOO, bar: :FOO, foo: :FOO)
+ *      # => {FOO: 2}
+ *
+ *  - If +old_key+ is not found,
+ *    sets <tt>new_hash[old_key] = value</tt>;
+ *    a duplicate key overwrites:
+ *
+ *      h = {foo: 0, bar: 1, baz: 2}
+ *      h.transform_keys({})
+ *      # => {foo: 0, bar: 1, baz: 2}
+ *      h.transform_keys(baz: :foo)
+ *      # => {foo: 2, bar: 1}
+ *
+ *  Unused keys in +other_hash+ are ignored:
  *
- *  Returns a new Enumerator if no block given:
  *    h = {foo: 0, bar: 1, baz: 2}
- *    e = h.transform_keys # => #<Enumerator: {:foo=>0, :bar=>1, :baz=>2}:transform_keys>
- *    h1 = e.each { |key| key.to_s }
- *    h1 # => {"foo"=>0, "bar"=>1, "baz"=>2}
+ *    h.transform_keys(bat: 3)
+ *    # => {foo: 0, bar: 1, baz: 2}
+ *
+ *  With both argument +other_hash+ and a block given,
+ *  +new_hash+ has new keys specified by +other_hash+ or by the block,
+ *  and unchanged keys provided by +self+.
+ *
+ *  For each pair +old_key+ and +value+ in +self+:
+ *
+ *  - If +other_hash+ has key +old_key+ (with value +new_key+),
+ *    does not call the block for that key;
+ *    sets <tt>new_hash[new_key] = value</tt>;
+ *    a duplicate key overwrites:
+ *
+ *      h = {foo: 0, bar: 1, baz: 2}
+ *      h.transform_keys(baz: :BAZ, bar: :BAR, foo: :FOO) {|key| fail 'Not called' }
+ *      # => {FOO: 0, BAR: 1, BAZ: 2}
+ *
+ *  - If +other_hash+ does not have key +old_key+,
+ *    calls the block with +old_key+ and takes its return value as +new_key+;
+ *    sets <tt>new_hash[new_key] = value</tt>;
+ *    a duplicate key overwrites:
+ *
+ *      h = {foo: 0, bar: 1, baz: 2}
+ *      h.transform_keys(baz: :BAZ) {|key| key.to_s.reverse }
+ *      # => {"oof" => 0, "rab" => 1, BAZ: 2}
+ *      h.transform_keys(baz: :BAZ) {|key| 'ook' }
+ *      # => {"ook" => 1, BAZ: 2}
+ *
+ *  With no argument and no block given, returns a new Enumerator.
+ *
+ *  Related: see {Methods for Transforming Keys and Values}[rdoc-ref:Hash@Methods+for+Transforming+Keys+and+Values].
  */
 static VALUE
 rb_hash_transform_keys(int argc, VALUE *argv, VALUE hash)
@@ -3185,13 +3332,97 @@ static int flatten_i(VALUE key, VALUE val, VALUE ary);
 
 /*
  *  call-seq:
- *    hash.transform_keys! {|key| ... } -> self
- *    hash.transform_keys!(hash2) -> self
- *    hash.transform_keys!(hash2) {|other_key| ...} -> self
- *    hash.transform_keys! -> new_enumerator
+ *    transform_keys! {|old_key| ... } -> self
+ *    transform_keys!(other_hash) -> self
+ *    transform_keys!(other_hash) {|old_key| ...} -> self
+ *    transform_keys! -> new_enumerator
+ *
+ *  With an argument, a block, or both given,
+ *  derives keys from the argument, the block, and +self+;
+ *  all, some, or none of the keys in +self+ may be changed.
+ *
+ *  With a block given and no argument,
+ *  derives keys only from the block;
+ *  all, some, or none of the keys in +self+ may be changed.
+ *
+ *  For each key/value pair <tt>old_key/value</tt> in +self+, calls the block with +old_key+;
+ *  the block's return value becomes +new_key+;
+ *  removes the entry for +old_key+: <tt>self.delete(old_key)</tt>;
+ *  sets <tt>self[new_key] = value</tt>;
+ *  a duplicate key overwrites:
+ *
+ *      h = {foo: 0, bar: 1, baz: 2}
+ *      h.transform_keys! {|old_key| old_key.to_s }
+ *      # => {"foo" => 0, "bar" => 1, "baz" => 2}
+ *      h = {foo: 0, bar: 1, baz: 2}
+ *      h.transform_keys! {|old_key| 'xxx' }
+ *      # => {"xxx" => 2}
+ *
+ *  With argument +other_hash+ given and no block,
+ *  derives keys for +self+ from +other_hash+ and +self+;
+ *  all, some, or none of the keys in +self+ may be changed.
+ *
+ *  For each key/value pair <tt>old_key/old_value</tt> in +self+,
+ *  looks for key +old_key+ in +other_hash+:
+ *
+ *  - If +old_key+ is found, takes value <tt>other_hash[old_key]</tt> as +new_key+;
+ *    removes the entry for +old_key+: <tt>self.delete(old_key)</tt>;
+ *    sets <tt>self[new_key] = value</tt>;
+ *    a duplicate key overwrites:
+ *
+ *      h = {foo: 0, bar: 1, baz: 2}
+ *      h.transform_keys!(baz: :BAZ, bar: :BAR, foo: :FOO)
+ *      # => {FOO: 0, BAR: 1, BAZ: 2}
+ *      h = {foo: 0, bar: 1, baz: 2}
+ *      h.transform_keys!(baz: :FOO, bar: :FOO, foo: :FOO)
+ *      # => {FOO: 2}
+ *
+ *  - If +old_key+ is not found, does nothing:
+ *
+ *      h = {foo: 0, bar: 1, baz: 2}
+ *      h.transform_keys!({})
+ *      # => {foo: 0, bar: 1, baz: 2}
+ *      h.transform_keys!(baz: :foo)
+ *      # => {foo: 2, bar: 1}
+ *
+ *  Unused keys in +other_hash+ are ignored:
+ *
+ *    h = {foo: 0, bar: 1, baz: 2}
+ *    h.transform_keys!(bat: 3)
+ *    # => {foo: 0, bar: 1, baz: 2}
+ *
+ *  With both argument +other_hash+ and a block given,
+ *  derives keys from +other_hash+, the block, and +self+;
+ *  all, some, or none of the keys in +self+ may be changed.
+ *
+ *  For each pair +old_key+ and +value+ in +self+:
  *
- *  Same as Hash#transform_keys but modifies the receiver in place
- *  instead of returning a new hash.
+ *  - If +other_hash+ has key +old_key+ (with value +new_key+),
+ *    does not call the block for that key;
+ *    removes the entry for +old_key+: <tt>self.delete(old_key)</tt>;
+ *    sets <tt>self[new_key] = value</tt>;
+ *    a duplicate key overwrites:
+ *
+ *      h = {foo: 0, bar: 1, baz: 2}
+ *      h.transform_keys!(baz: :BAZ, bar: :BAR, foo: :FOO) {|key| fail 'Not called' }
+ *      # => {FOO: 0, BAR: 1, BAZ: 2}
+ *
+ *  - If +other_hash+ does not have key +old_key+,
+ *    calls the block with +old_key+ and takes its return value as +new_key+;
+ *    removes the entry for +old_key+: <tt>self.delete(old_key)</tt>;
+ *    sets <tt>self[new_key] = value</tt>;
+ *    a duplicate key overwrites:
+ *
+ *      h = {foo: 0, bar: 1, baz: 2}
+ *      h.transform_keys!(baz: :BAZ) {|key| key.to_s.reverse }
+ *      # => {"oof" => 0, "rab" => 1, BAZ: 2}
+ *      h = {foo: 0, bar: 1, baz: 2}
+ *      h.transform_keys!(baz: :BAZ) {|key| 'ook' }
+ *      # => {"ook" => 1, BAZ: 2}
+ *
+ *  With no argument and no block given, returns a new Enumerator.
+ *
+ *  Related: see {Methods for Transforming Keys and Values}[rdoc-ref:Hash@Methods+for+Transforming+Keys+and+Values].
  */
 static VALUE
 rb_hash_transform_keys_bang(int argc, VALUE *argv, VALUE hash)
@@ -3238,6 +3469,7 @@ rb_hash_transform_keys_bang(int argc, VALUE *argv, VALUE hash)
         rb_ary_clear(pairs);
         rb_hash_clear(new_keys);
     }
+    compact_after_delete(hash);
     return hash;
 }
 
@@ -3257,25 +3489,37 @@ transform_values_foreach_replace(st_data_t *key, st_data_t *value, st_data_t arg
     return ST_CONTINUE;
 }
 
+static VALUE
+transform_values_call(VALUE hash)
+{
+    rb_hash_stlike_foreach_with_replace(hash, transform_values_foreach_func, transform_values_foreach_replace, hash);
+    return hash;
+}
+
+static void
+transform_values(VALUE hash)
+{
+    hash_iter_lev_inc(hash);
+    rb_ensure(transform_values_call, hash, hash_foreach_ensure, hash);
+}
+
 /*
  *  call-seq:
- *    hash.transform_values {|value| ... } -> new_hash
- *    hash.transform_values -> new_enumerator
+ *    transform_values {|value| ... } -> new_hash
+ *    transform_values -> new_enumerator
  *
- *  Returns a new \Hash object; each entry has:
- *  * A key from +self+.
- *  * A value provided by the block.
+ *  With a block given, returns a new hash +new_hash+;
+ *  for each pair +key+/+value+ in +self+,
+ *  calls the block with +value+ and captures its return as +new_value+;
+ *  adds to +new_hash+ the entry +key+/+new_value+:
  *
- *  Transform values:
  *    h = {foo: 0, bar: 1, baz: 2}
  *    h1 = h.transform_values {|value| value * 100}
- *    h1 # => {:foo=>0, :bar=>100, :baz=>200}
+ *    h1 # => {foo: 0, bar: 100, baz: 200}
  *
- *  Returns a new Enumerator if no block given:
- *    h = {foo: 0, bar: 1, baz: 2}
- *    e = h.transform_values # => #<Enumerator: {:foo=>0, :bar=>1, :baz=>2}:transform_values>
- *    h1 = e.each { |value| value * 100}
- *    h1 # => {:foo=>0, :bar=>100, :baz=>200}
+ *  With no block given, returns a new Enumerator.
+ *
+ *  Related: see {Methods for Transforming Keys and Values}[rdoc-ref:Hash@Methods+for+Transforming+Keys+and+Values].
  */
 static VALUE
 rb_hash_transform_values(VALUE hash)
@@ -3287,7 +3531,8 @@ rb_hash_transform_values(VALUE hash)
     SET_DEFAULT(result, Qnil);
 
     if (!RHASH_EMPTY_P(hash)) {
-        rb_hash_stlike_foreach_with_replace(result, transform_values_foreach_func, transform_values_foreach_replace, result);
+        transform_values(result);
+        compact_after_delete(result);
     }
 
     return result;
@@ -3295,18 +3540,24 @@ rb_hash_transform_values(VALUE hash)
 
 /*
  *  call-seq:
- *    hash.transform_values! {|value| ... } -> self
- *    hash.transform_values! -> new_enumerator
+ *    transform_values! {|old_value| ... } -> self
+ *    transform_values! -> new_enumerator
  *
- *  Returns +self+, whose keys are unchanged, and whose values are determined by the given block.
- *    h = {foo: 0, bar: 1, baz: 2}
- *    h.transform_values! {|value| value * 100} # => {:foo=>0, :bar=>100, :baz=>200}
  *
- *  Returns a new Enumerator if no block given:
+ *  With a block given, changes the values of +self+ as determined by the block;
+ *  returns +self+.
+ *
+ *  For each entry +key+/+old_value+ in +self+,
+ *  calls the block with +old_value+,
+ *  captures its return value as +new_value+,
+ *  and sets <tt>self[key] = new_value</tt>:
+ *
  *    h = {foo: 0, bar: 1, baz: 2}
- *    e = h.transform_values! # => #<Enumerator: {:foo=>0, :bar=>100, :baz=>200}:transform_values!>
- *    h1 = e.each {|value| value * 100}
- *    h1 # => {:foo=>0, :bar=>100, :baz=>200}
+ *    h.transform_values! {|value| value * 100} # => {foo: 0, bar: 100, baz: 200}
+ *
+ *  With no block given, returns a new Enumerator.
+ *
+ *  Related: see {Methods for Transforming Keys and Values}[rdoc-ref:Hash@Methods+for+Transforming+Keys+and+Values].
  */
 static VALUE
 rb_hash_transform_values_bang(VALUE hash)
@@ -3315,7 +3566,7 @@ rb_hash_transform_values_bang(VALUE hash)
     rb_hash_modify_check(hash);
 
     if (!RHASH_TABLE_EMPTY_P(hash)) {
-        rb_hash_stlike_foreach_with_replace(hash, transform_values_foreach_func, transform_values_foreach_replace, hash);
+        transform_values(hash);
     }
 
     return hash;
@@ -3330,12 +3581,15 @@ to_a_i(VALUE key, VALUE value, VALUE ary)
 
 /*
  *  call-seq:
- *    hash.to_a -> new_array
+ *    to_a -> new_array
+ *
+ *  Returns all elements of +self+ as an array of 2-element arrays;
+ *  each nested array contains a key-value pair from +self+:
  *
- *  Returns a new Array of 2-element Array objects;
- *  each nested Array contains a key-value pair from +self+:
  *    h = {foo: 0, bar: 1, baz: 2}
  *    h.to_a # => [[:foo, 0], [:bar, 1], [:baz, 2]]
+ *
+ *  Related: see {Methods for Converting}[rdoc-ref:Hash@Methods+for+Converting].
  */
 
 static VALUE
@@ -3349,20 +3603,65 @@ rb_hash_to_a(VALUE hash)
     return ary;
 }
 
+static bool
+symbol_key_needs_quote(VALUE str)
+{
+    long len = RSTRING_LEN(str);
+    if (len == 0 || !rb_str_symname_p(str)) return true;
+    const char *s = RSTRING_PTR(str);
+    char first = s[0];
+    if (first == '@' || first == '$' || first == '!') return true;
+    if (!at_char_boundary(s, s + len - 1, RSTRING_END(str), rb_enc_get(str))) return false;
+    switch (s[len - 1]) {
+        case '+':
+        case '-':
+        case '*':
+        case '/':
+        case '`':
+        case '%':
+        case '^':
+        case '&':
+        case '|':
+        case ']':
+        case '<':
+        case '=':
+        case '>':
+        case '~':
+        case '@':
+            return true;
+        default:
+            return false;
+    }
+}
+
 static int
 inspect_i(VALUE key, VALUE value, VALUE str)
 {
     VALUE str2;
 
-    str2 = rb_inspect(key);
+    bool is_symbol = SYMBOL_P(key);
+    bool quote = false;
+    if (is_symbol) {
+        str2 = rb_sym2str(key);
+        quote = symbol_key_needs_quote(str2);
+    }
+    else {
+        str2 = rb_inspect(key);
+    }
     if (RSTRING_LEN(str) > 1) {
         rb_str_buf_cat_ascii(str, ", ");
     }
     else {
         rb_enc_copy(str, str2);
     }
-    rb_str_buf_append(str, str2);
-    rb_str_buf_cat_ascii(str, "=>");
+    if (quote) {
+        rb_str_buf_append(str, rb_str_inspect(str2));
+    }
+    else {
+        rb_str_buf_append(str, str2);
+    }
+
+    rb_str_buf_cat_ascii(str, is_symbol ? ": " : " => ");
     str2 = rb_inspect(value);
     rb_str_buf_append(str, str2);
 
@@ -3384,13 +3683,14 @@ inspect_hash(VALUE hash, VALUE dummy, int recur)
 
 /*
  *  call-seq:
- *    hash.inspect -> new_string
+ *    inspect -> new_string
+ *
+ *  Returns a new string containing the hash entries:
  *
- *  Returns a new String containing the hash entries:
-
  *    h = {foo: 0, bar: 1, baz: 2}
- *    h.inspect # => "{:foo=>0, :bar=>1, :baz=>2}"
+ *    h.inspect # => "{foo: 0, bar: 1, baz: 2}"
  *
+ *  Related: see {Methods for Converting}[rdoc-ref:Hash@Methods+for+Converting].
  */
 
 static VALUE
@@ -3403,9 +3703,11 @@ rb_hash_inspect(VALUE hash)
 
 /*
  *  call-seq:
- *    hash.to_hash -> self
+ *    to_hash -> self
  *
  *  Returns +self+.
+ *
+ *  Related: see {Methods for Converting}[rdoc-ref:Hash@Methods+for+Converting].
  */
 static VALUE
 rb_hash_to_hash(VALUE hash)
@@ -3448,21 +3750,22 @@ rb_hash_to_h_block(VALUE hash)
 
 /*
  *  call-seq:
- *    hash.to_h -> self or new_hash
- *    hash.to_h {|key, value| ... } -> new_hash
- *
- *  For an instance of \Hash, returns +self+.
+ *    to_h {|key, value| ... } -> new_hash
+ *    to_h -> self or new_hash
  *
- *  For a subclass of \Hash, returns a new \Hash
- *  containing the content of +self+.
+ *  With a block given, returns a new hash whose content is based on the block;
+ *  the block is called with each entry's key and value;
+ *  the block should return a 2-element array
+ *  containing the key and value to be included in the returned array:
  *
- *  When a block is given, returns a new \Hash object
- *  whose content is based on the block;
- *  the block should return a 2-element Array object
- *  specifying the key-value pair to be included in the returned Array:
  *    h = {foo: 0, bar: 1, baz: 2}
- *    h1 = h.to_h {|key, value| [value, key] }
- *    h1 # => {0=>:foo, 1=>:bar, 2=>:baz}
+ *    h.to_h {|key, value| [value, key] }
+ *    # => {0 => :foo, 1 => :bar, 2 => :baz}
+ *
+ *  With no block given, returns +self+ if +self+ is an instance of +Hash+;
+ *  if +self+ is a subclass of +Hash+, returns a new hash containing the content of +self+.
+ *
+ *  Related: see {Methods for Converting}[rdoc-ref:Hash@Methods+for+Converting].
  */
 
 static VALUE
@@ -3487,11 +3790,14 @@ keys_i(VALUE key, VALUE value, VALUE ary)
 
 /*
  *  call-seq:
- *    hash.keys -> new_array
+ *    keys -> new_array
+ *
+ *  Returns a new array containing all keys in +self+:
  *
- *  Returns a new Array containing all keys in +self+:
  *    h = {foo: 0, bar: 1, baz: 2}
  *    h.keys # => [:foo, :bar, :baz]
+ *
+ *  Related: see {Methods for Fetching}[rdoc-ref:Hash@Methods+for+Fetching].
  */
 
 VALUE
@@ -3531,11 +3837,14 @@ values_i(VALUE key, VALUE value, VALUE ary)
 
 /*
  *  call-seq:
- *    hash.values -> new_array
+ *    values -> new_array
+ *
+ *  Returns a new array containing all values in +self+:
  *
- *  Returns a new Array containing all values in +self+:
  *    h = {foo: 0, bar: 1, baz: 2}
  *    h.values # => [0, 1, 2]
+ *
+ *  Related: see {Methods for Fetching}[rdoc-ref:Hash@Methods+for+Fetching].
  */
 
 VALUE
@@ -3563,7 +3872,6 @@ rb_hash_values(VALUE hash)
         }
         rb_ary_set_len(values, size);
     }
-
     else {
         rb_hash_foreach(hash, values_i, values);
     }
@@ -3573,12 +3881,15 @@ rb_hash_values(VALUE hash)
 
 /*
  *  call-seq:
- *    hash.include?(key) -> true or false
- *    hash.has_key?(key) -> true or false
- *    hash.key?(key) -> true or false
- *    hash.member?(key) -> true or false
+ *    include?(key) -> true or false
+ *
+ *  Returns whether +key+ is a key in +self+:
+ *
+ *    h = {foo: 0, bar: 1, baz: 2}
+ *    h.include?(:bar) # => true
+ *    h.include?(:BAR) # => false
  *
- *  Returns +true+ if +key+ is a key in +self+, otherwise +false+.
+ *  Related: {Methods for Querying}[rdoc-ref:Hash@Methods+for+Querying].
  */
 
 VALUE
@@ -3601,10 +3912,11 @@ rb_hash_search_value(VALUE key, VALUE value, VALUE arg)
 
 /*
  *  call-seq:
- *    hash.has_value?(value) -> true or false
- *    hash.value?(value) -> true or false
+ *    has_value?(value) -> true or false
+ *
+ *  Returns whether +value+ is a value in +self+.
  *
- *  Returns +true+ if +value+ is a value in +self+, otherwise +false+.
+ *  Related: {Methods for Querying}[rdoc-ref:Hash@Methods+for+Querying].
  */
 
 static VALUE
@@ -3701,21 +4013,29 @@ hash_equal(VALUE hash1, VALUE hash2, int eql)
 
 /*
  *  call-seq:
- *    hash == object -> true or false
+ *    self == object -> true or false
+ *
+ *  Returns whether +self+ and +object+ are equal.
  *
  *  Returns +true+ if all of the following are true:
- *  * +object+ is a \Hash object.
- *  * +hash+ and +object+ have the same keys (regardless of order).
- *  * For each key +key+, <tt>hash[key] == object[key]</tt>.
+ *
+ *  - +object+ is a +Hash+ object (or can be converted to one).
+ *  - +self+ and +object+ have the same keys (regardless of order).
+ *  - For each key +key+, <tt>self[key] == object[key]</tt>.
  *
  *  Otherwise, returns +false+.
  *
- *  Equal:
- *    h1 = {foo: 0, bar: 1, baz: 2}
- *    h2 = {foo: 0, bar: 1, baz: 2}
- *    h1 == h2 # => true
- *    h3 = {baz: 2, bar: 1, foo: 0}
- *    h1 == h3 # => true
+ *  Examples:
+ *
+ *    h =  {foo: 0, bar: 1}
+ *    h == {foo: 0, bar: 1} # => true   # Equal entries (same order)
+ *    h == {bar: 1, foo: 0} # => true   # Equal entries (different order).
+ *    h == 1                            # => false  # Object not a hash.
+ *    h == {}                           # => false  # Different number of entries.
+ *    h == {foo: 0, bar: 1} # => false  # Different key.
+ *    h == {foo: 0, bar: 1} # => false  # Different value.
+ *
+ *  Related: see {Methods for Comparing}[rdoc-ref:Hash@Methods+for+Comparing].
  */
 
 static VALUE
@@ -3726,21 +4046,23 @@ rb_hash_equal(VALUE hash1, VALUE hash2)
 
 /*
  *  call-seq:
- *    hash.eql? object -> true or false
+ *    eql?(object) -> true or false
  *
  *  Returns +true+ if all of the following are true:
- *  * +object+ is a \Hash object.
- *  * +hash+ and +object+ have the same keys (regardless of order).
- *  * For each key +key+, <tt>h[key] eql? object[key]</tt>.
+ *
+ *  - The given +object+ is a +Hash+ object.
+ *  - +self+ and +object+ have the same keys (regardless of order).
+ *  - For each key +key+, <tt>self[key].eql?(object[key])</tt>.
  *
  *  Otherwise, returns +false+.
  *
- *  Equal:
  *    h1 = {foo: 0, bar: 1, baz: 2}
  *    h2 = {foo: 0, bar: 1, baz: 2}
  *    h1.eql? h2 # => true
  *    h3 = {baz: 2, bar: 1, foo: 0}
  *    h1.eql? h3 # => true
+ *
+ *  Related: see {Methods for Querying}[rdoc-ref:Hash@Methods+for+Querying].
  */
 
 static VALUE
@@ -3763,16 +4085,19 @@ hash_i(VALUE key, VALUE val, VALUE arg)
 
 /*
  *  call-seq:
- *    hash.hash -> an_integer
+ *    hash -> an_integer
  *
- *  Returns the Integer hash-code for the hash.
+ *  Returns the integer hash-code for the hash.
  *
- *  Two \Hash objects have the same hash-code if their content is the same
+ *  Two hashes have the same hash-code if their content is the same
  *  (regardless of order):
+ *
  *    h1 = {foo: 0, bar: 1, baz: 2}
  *    h2 = {baz: 2, bar: 1, foo: 0}
  *    h2.hash == h1.hash # => true
  *    h2.eql? h1 # => true
+ *
+ *  Related: see {Methods for Querying}[rdoc-ref:Hash@Methods+for+Querying].
  */
 
 static VALUE
@@ -3797,17 +4122,21 @@ rb_hash_invert_i(VALUE key, VALUE value, VALUE hash)
 
 /*
  *  call-seq:
- *    hash.invert -> new_hash
+ *    invert -> new_hash
+ *
+ *  Returns a new hash with each key-value pair inverted:
  *
- *  Returns a new \Hash object with the each key-value pair inverted:
  *    h = {foo: 0, bar: 1, baz: 2}
  *    h1 = h.invert
  *    h1 # => {0=>:foo, 1=>:bar, 2=>:baz}
  *
- *  Overwrites any repeated new keys:
+ *  Overwrites any repeated new keys
  *  (see {Entry Order}[rdoc-ref:Hash@Entry+Order]):
+ *
  *    h = {foo: 0, bar: 0, baz: 0}
  *    h.invert # => {0=>:baz}
+ *
+ *  Related: see {Methods for Transforming Keys and Values}[rdoc-ref:Hash@Methods+for+Transforming+Keys+and+Values].
  */
 
 static VALUE
@@ -3819,108 +4148,134 @@ rb_hash_invert(VALUE hash)
     return h;
 }
 
-static int
-rb_hash_update_callback(st_data_t *key, st_data_t *value, struct update_arg *arg, int existing)
-{
-    *value = arg->arg;
-    return ST_CONTINUE;
-}
-
-NOINSERT_UPDATE_CALLBACK(rb_hash_update_callback)
-
 static int
 rb_hash_update_i(VALUE key, VALUE value, VALUE hash)
 {
-    RHASH_UPDATE(hash, key, rb_hash_update_callback, value);
+    rb_hash_aset(hash, key, value);
     return ST_CONTINUE;
 }
 
+struct update_call_args {
+    VALUE hash, newvalue, *argv;
+    int argc;
+    bool block_given;
+    bool iterating;
+};
+
 static int
 rb_hash_update_block_callback(st_data_t *key, st_data_t *value, struct update_arg *arg, int existing)
 {
-    st_data_t newvalue = arg->arg;
+    VALUE k = (VALUE)*key, v = (VALUE)*value;
+    struct update_call_args *ua = (void *)arg->arg;
+    VALUE newvalue = ua->newvalue, hash = arg->hash;
 
     if (existing) {
-        newvalue = (st_data_t)rb_yield_values(3, (VALUE)*key, (VALUE)*value, (VALUE)newvalue);
+        hash_iter_lev_inc(hash);
+        ua->iterating = true;
+        newvalue = rb_yield_values(3, k, v, newvalue);
+        hash_iter_lev_dec(hash);
+        ua->iterating = false;
     }
-    *value = newvalue;
+    else if (RHASH_STRING_KEY_P(hash, k) && !RB_OBJ_FROZEN(k)) {
+        *key = (st_data_t)rb_hash_key_str(k);
+    }
+    *value = (st_data_t)newvalue;
     return ST_CONTINUE;
 }
 
 NOINSERT_UPDATE_CALLBACK(rb_hash_update_block_callback)
 
 static int
-rb_hash_update_block_i(VALUE key, VALUE value, VALUE hash)
+rb_hash_update_block_i(VALUE key, VALUE value, VALUE args)
 {
-    RHASH_UPDATE(hash, key, rb_hash_update_block_callback, value);
+    struct update_call_args *ua = (void *)args;
+    ua->newvalue = value;
+    RHASH_UPDATE(ua->hash, key, rb_hash_update_block_callback, args);
     return ST_CONTINUE;
 }
 
+static VALUE
+rb_hash_update_call(VALUE args)
+{
+    struct update_call_args *arg = (void *)args;
+
+    for (int i = 0; i < arg->argc; i++){
+        VALUE hash = to_hash(arg->argv[i]);
+        if (arg->block_given) {
+            rb_hash_foreach(hash, rb_hash_update_block_i, args);
+        }
+        else {
+            rb_hash_foreach(hash, rb_hash_update_i, arg->hash);
+        }
+    }
+    return arg->hash;
+}
+
+static VALUE
+rb_hash_update_ensure(VALUE args)
+{
+    struct update_call_args *ua = (void *)args;
+    if (ua->iterating) hash_iter_lev_dec(ua->hash);
+    return Qnil;
+}
+
 /*
  *  call-seq:
- *    hash.merge! -> self
- *    hash.merge!(*other_hashes) -> self
- *    hash.merge!(*other_hashes) { |key, old_value, new_value| ... } -> self
+ *    update(*other_hashes) -> self
+ *    update(*other_hashes) { |key, old_value, new_value| ... } -> self
  *
- *  Merges each of +other_hashes+ into +self+; returns +self+.
+ *  Updates values and/or adds entries to +self+; returns +self+.
  *
- *  Each argument in +other_hashes+ must be a \Hash.
+ *  Each argument +other_hash+ in +other_hashes+ must be a hash.
  *
- *  With arguments and no block:
- *  * Returns +self+, after the given hashes are merged into it.
- *  * The given hashes are merged left to right.
- *  * Each new entry is added at the end.
- *  * Each duplicate-key entry's value overwrites the previous value.
+ *  With no block given, for each successive entry +key+/+new_value+ in each successive +other_hash+:
  *
- *  Example:
- *    h = {foo: 0, bar: 1, baz: 2}
- *    h1 = {bat: 3, bar: 4}
- *    h2 = {bam: 5, bat:6}
- *    h.merge!(h1, h2) # => {:foo=>0, :bar=>4, :baz=>2, :bat=>6, :bam=>5}
+ *  - If +key+ is in +self+, sets <tt>self[key] = new_value</tt>, whose position is unchanged:
  *
- *  With arguments and a block:
- *  * Returns +self+, after the given hashes are merged.
- *  *  The given hashes are merged left to right.
- *  *  Each new-key entry is added at the end.
- *  *  For each duplicate key:
- *     * Calls the block with the key and the old and new values.
- *     * The block's return value becomes the new value for the entry.
+ *      h0 = {foo: 0, bar: 1, baz: 2}
+ *      h1 = {bar: 3, foo: -1}
+ *      h0.update(h1) # => {foo: -1, bar: 3, baz: 2}
  *
- *  Example:
- *    h = {foo: 0, bar: 1, baz: 2}
- *    h1 = {bat: 3, bar: 4}
- *    h2 = {bam: 5, bat:6}
- *    h3 = h.merge!(h1, h2) { |key, old_value, new_value| old_value + new_value }
- *    h3 # => {:foo=>0, :bar=>5, :baz=>2, :bat=>9, :bam=>5}
+ *  - If +key+ is not in +self+, adds the entry at the end of +self+:
  *
- *  With no arguments:
- *  * Returns +self+, unmodified.
- *  * The block, if given, is ignored.
+ *      h = {foo: 0, bar: 1, baz: 2}
+ *      h.update({bam: 3, bah: 4}) # => {foo: 0, bar: 1, baz: 2, bam: 3, bah: 4}
  *
- *  Example:
- *    h = {foo: 0, bar: 1, baz: 2}
- *    h.merge # => {:foo=>0, :bar=>1, :baz=>2}
- *    h1 = h.merge! { |key, old_value, new_value| raise 'Cannot happen' }
- *    h1 # => {:foo=>0, :bar=>1, :baz=>2}
+ *  With a block given, for each successive entry +key+/+new_value+ in each successive +other_hash+:
+ *
+ *  - If +key+ is in +self+, fetches +old_value+ from <tt>self[key]</tt>,
+ *    calls the block with +key+, +old_value+, and +new_value+,
+ *    and sets <tt>self[key] = new_value</tt>, whose position is unchanged  :
+ *
+ *      season = {AB: 75, H: 20, HR: 3, SO: 17, W: 11, HBP: 3}
+ *      today = {AB: 3, H: 1, W: 1}
+ *      yesterday = {AB: 4, H: 2, HR: 1}
+ *      season.update(yesterday, today) {|key, old_value, new_value| old_value + new_value }
+ *      # => {AB: 82, H: 23, HR: 4, SO: 17, W: 12, HBP: 3}
+ *
+ *  - If +key+ is not in +self+, adds the entry at the end of +self+:
+ *
+ *      h = {foo: 0, bar: 1, baz: 2}
+ *      h.update({bat: 3}) { fail 'Cannot happen' }
+ *      # => {foo: 0, bar: 1, baz: 2, bat: 3}
+ *
+ *  Related: see {Methods for Assigning}[rdoc-ref:Hash@Methods+for+Assigning].
  */
 
 static VALUE
 rb_hash_update(int argc, VALUE *argv, VALUE self)
 {
-    int i;
-    bool block_given = rb_block_given_p();
+    struct update_call_args args = {
+        .hash = self,
+        .argv = argv,
+        .argc = argc,
+        .block_given = rb_block_given_p(),
+        .iterating = false,
+    };
+    VALUE arg = (VALUE)&args;
 
     rb_hash_modify(self);
-    for (i = 0; i < argc; i++){
-        VALUE hash = to_hash(argv[i]);
-        if (block_given) {
-            rb_hash_foreach(hash, rb_hash_update_block_i, self);
-        }
-        else {
-            rb_hash_foreach(hash, rb_hash_update_i, self);
-        }
-    }
-    return self;
+    return rb_ensure(rb_hash_update_call, arg, rb_hash_update_ensure, arg);
 }
 
 struct update_func_arg {
@@ -3974,53 +4329,48 @@ rb_hash_update_by(VALUE hash1, VALUE hash2, rb_hash_update_func *func)
 
 /*
  *  call-seq:
- *    hash.merge -> copy_of_self
- *    hash.merge(*other_hashes) -> new_hash
- *    hash.merge(*other_hashes) { |key, old_value, new_value| ... } -> new_hash
- *
- *  Returns the new \Hash formed by merging each of +other_hashes+
- *  into a copy of +self+.
+ *    merge(*other_hashes) -> new_hash
+ *    merge(*other_hashes) { |key, old_value, new_value| ... } -> new_hash
  *
- *  Each argument in +other_hashes+ must be a \Hash.
+ *  Each argument +other_hash+ in +other_hashes+ must be a hash.
  *
- *  ---
+ *  With arguments +other_hashes+ given and no block,
+ *  returns the new hash formed by merging each successive +other_hash+
+ *  into a copy of +self+;
+ *  returns that copy;
+ *  for each successive entry in +other_hash+:
  *
- *  With arguments and no block:
- *  * Returns the new \Hash object formed by merging each successive
- *    \Hash in +other_hashes+ into +self+.
- *  * Each new-key entry is added at the end.
- *  * Each duplicate-key entry's value overwrites the previous value.
+ *  - For a new key, the entry is added at the end of +self+.
+ *  - For duplicate key, the entry overwrites the entry in +self+,
+ *    whose position is unchanged.
  *
  *  Example:
+ *
  *    h = {foo: 0, bar: 1, baz: 2}
  *    h1 = {bat: 3, bar: 4}
  *    h2 = {bam: 5, bat:6}
- *    h.merge(h1, h2) # => {:foo=>0, :bar=>4, :baz=>2, :bat=>6, :bam=>5}
+ *    h.merge(h1, h2) # => {foo: 0, bar: 4, baz: 2, bat: 6, bam: 5}
+ *
+ *  With arguments +other_hashes+ and a block given, behaves as above
+ *  except that for a duplicate key
+ *  the overwriting entry takes it value not from the entry in +other_hash+,
+ *  but instead from the block:
  *
- *  With arguments and a block:
- *  * Returns a new \Hash object that is the merge of +self+ and each given hash.
- *  * The given hashes are merged left to right.
- *  * Each new-key entry is added at the end.
- *  * For each duplicate key:
- *    * Calls the block with the key and the old and new values.
- *    * The block's return value becomes the new value for the entry.
+ *  - The block is called with the duplicate key and the values
+ *    from both +self+ and +other_hash+.
+ *  - The block's return value becomes the new value for the entry in +self+.
  *
  *  Example:
+ *
  *    h = {foo: 0, bar: 1, baz: 2}
  *    h1 = {bat: 3, bar: 4}
  *    h2 = {bam: 5, bat:6}
- *    h3 = h.merge(h1, h2) { |key, old_value, new_value| old_value + new_value }
- *    h3 # => {:foo=>0, :bar=>5, :baz=>2, :bat=>9, :bam=>5}
+ *    h.merge(h1, h2) { |key, old_value, new_value| old_value + new_value }
+ *    # => {foo: 0, bar: 5, baz: 2, bat: 9, bam: 5}
  *
- *  With no arguments:
- *  * Returns a copy of +self+.
- *  * The block, if given, is ignored.
+ *  With no arguments, returns a copy of +self+; the block, if given, is ignored.
  *
- *  Example:
- *    h = {foo: 0, bar: 1, baz: 2}
- *    h.merge # => {:foo=>0, :bar=>1, :baz=>2}
- *    h1 = h.merge { |key, old_value, new_value| raise 'Cannot happen' }
- *    h1 # => {:foo=>0, :bar=>1, :baz=>2}
+ *  Related: see {Methods for Assigning}[rdoc-ref:Hash@Methods+for+Assigning].
  */
 
 static VALUE
@@ -4035,24 +4385,17 @@ assoc_cmp(VALUE a, VALUE b)
     return !RTEST(rb_equal(a, b));
 }
 
-static VALUE
-lookup2_call(VALUE arg)
-{
-    VALUE *args = (VALUE *)arg;
-    return rb_hash_lookup2(args[0], args[1], Qundef);
-}
-
-struct reset_hash_type_arg {
-    VALUE hash;
-    const struct st_hash_type *orighash;
+struct assoc_arg {
+    st_table *tbl;
+    st_data_t key;
 };
 
 static VALUE
-reset_hash_type(VALUE arg)
+assoc_lookup(VALUE arg)
 {
-    struct reset_hash_type_arg *p = (struct reset_hash_type_arg *)arg;
-    HASH_ASSERT(RHASH_ST_TABLE_P(p->hash));
-    RHASH_ST_TABLE(p->hash)->type = p->orighash;
+    struct assoc_arg *p = (struct assoc_arg*)arg;
+    st_data_t data;
+    if (st_lookup(p->tbl, p->key, &data)) return (VALUE)data;
     return Qundef;
 }
 
@@ -4070,42 +4413,46 @@ assoc_i(VALUE key, VALUE val, VALUE arg)
 
 /*
  *  call-seq:
- *    hash.assoc(key) -> new_array or nil
+ *    assoc(key) -> entry or nil
+ *
+ *  If the given +key+ is found, returns its entry as a 2-element array
+ *  containing that key and its value:
  *
- *  If the given +key+ is found, returns a 2-element Array containing that key and its value:
  *    h = {foo: 0, bar: 1, baz: 2}
  *    h.assoc(:bar) # => [:bar, 1]
  *
- *  Returns +nil+ if key +key+ is not found.
+ *  Returns +nil+ if the key is not found.
+ *
+ *  Related: see {Methods for Fetching}[rdoc-ref:Hash@Methods+for+Fetching].
  */
 
 static VALUE
 rb_hash_assoc(VALUE hash, VALUE key)
 {
-    st_table *table;
-    const struct st_hash_type *orighash;
     VALUE args[2];
 
     if (RHASH_EMPTY_P(hash)) return Qnil;
 
-    ar_force_convert_table(hash, __FILE__, __LINE__);
-    HASH_ASSERT(RHASH_ST_TABLE_P(hash));
-    table = RHASH_ST_TABLE(hash);
-    orighash = table->type;
-
-    if (orighash != &identhash) {
-        VALUE value;
-        struct reset_hash_type_arg ensure_arg;
-        struct st_hash_type assochash;
-
-        assochash.compare = assoc_cmp;
-        assochash.hash = orighash->hash;
-        table->type = &assochash;
-        args[0] = hash;
-        args[1] = key;
-        ensure_arg.hash = hash;
-        ensure_arg.orighash = orighash;
-        value = rb_ensure(lookup2_call, (VALUE)&args, reset_hash_type, (VALUE)&ensure_arg);
+    if (RHASH_ST_TABLE_P(hash) && !RHASH_IDENTHASH_P(hash)) {
+        VALUE value = Qundef;
+        st_table assoctable = *RHASH_ST_TABLE(hash);
+        assoctable.type = &(struct st_hash_type){
+            .compare = assoc_cmp,
+            .hash = assoctable.type->hash,
+        };
+        VALUE arg = (VALUE)&(struct assoc_arg){
+            .tbl = &assoctable,
+            .key = (st_data_t)key,
+        };
+
+        if (RB_OBJ_FROZEN(hash)) {
+            value = assoc_lookup(arg);
+        }
+        else {
+            hash_iter_lev_inc(hash);
+            value = rb_ensure(assoc_lookup, arg, hash_foreach_ensure, hash);
+        }
+        hash_verify(hash);
         if (!UNDEF_P(value)) return rb_assoc_new(key, value);
     }
 
@@ -4129,15 +4476,18 @@ rassoc_i(VALUE key, VALUE val, VALUE arg)
 
 /*
  *  call-seq:
- *    hash.rassoc(value) -> new_array or nil
+ *    rassoc(value) -> new_array or nil
+ *
+ *  Searches +self+ for the first entry whose value is <tt>==</tt> to the given +value+;
+ *  see {Entry Order}[rdoc-ref:Hash@Entry+Order].
+ *
+ *  If the entry is found, returns its key and value as a 2-element array;
+ *  returns +nil+ if not found:
  *
- *  Returns a new 2-element Array consisting of the key and value
- *  of the first-found entry whose value is <tt>==</tt> to value
- *  (see {Entry Order}[rdoc-ref:Hash@Entry+Order]):
  *    h = {foo: 0, bar: 1, baz: 1}
  *    h.rassoc(1) # => [:bar, 1]
  *
- *  Returns +nil+ if no such value found.
+ *  Related: see {Methods for Fetching}[rdoc-ref:Hash@Methods+for+Fetching].
  */
 
 static VALUE
@@ -4165,33 +4515,38 @@ flatten_i(VALUE key, VALUE val, VALUE ary)
 
 /*
  *  call-seq:
- *     hash.flatten -> new_array
- *     hash.flatten(level) -> new_array
+ *    flatten(depth = 1) -> new_array
+ *
+ *  With positive integer +depth+,
+ *  returns a new array that is a recursive flattening of +self+ to the given +depth+.
+ *
+ *  At each level of recursion:
+ *
+ *  - Each element whose value is an array is "flattened" (that is, replaced by its individual array elements);
+ *    see Array#flatten.
+ *  - Each element whose value is not an array is unchanged.
+ *    even if the value is an object that has instance method flatten (such as a hash).
  *
- *  Returns a new Array object that is a 1-dimensional flattening of +self+.
+ *  Examples; note that entry <tt>foo: {bar: 1, baz: 2}</tt> is never flattened.
  *
- *  ---
+ *   h = {foo: {bar: 1, baz: 2}, bat: [:bam, [:bap, [:bah]]]}
+ *   h.flatten(1) # => [:foo, {:bar=>1, :baz=>2}, :bat, [:bam, [:bap, [:bah]]]]
+ *   h.flatten(2) # => [:foo, {:bar=>1, :baz=>2}, :bat, :bam, [:bap, [:bah]]]
+ *   h.flatten(3) # => [:foo, {:bar=>1, :baz=>2}, :bat, :bam, :bap, [:bah]]
+ *   h.flatten(4) # => [:foo, {:bar=>1, :baz=>2}, :bat, :bam, :bap, :bah]
+ *   h.flatten(5) # => [:foo, {:bar=>1, :baz=>2}, :bat, :bam, :bap, :bah]
  *
- *  By default, nested Arrays are not flattened:
- *    h = {foo: 0, bar: [:bat, 3], baz: 2}
- *    h.flatten # => [:foo, 0, :bar, [:bat, 3], :baz, 2]
+ *  With negative integer +depth+,
+ *  flattens all levels:
  *
- *  Takes the depth of recursive flattening from Integer argument +level+:
- *    h = {foo: 0, bar: [:bat, [:baz, [:bat, ]]]}
- *    h.flatten(1) # => [:foo, 0, :bar, [:bat, [:baz, [:bat]]]]
- *    h.flatten(2) # => [:foo, 0, :bar, :bat, [:baz, [:bat]]]
- *    h.flatten(3) # => [:foo, 0, :bar, :bat, :baz, [:bat]]
- *    h.flatten(4) # => [:foo, 0, :bar, :bat, :baz, :bat]
+ *    h.flatten(-1) # => [:foo, {:bar=>1, :baz=>2}, :bat, :bam, :bap, :bah]
  *
- *  When +level+ is negative, flattens all nested Arrays:
- *    h = {foo: 0, bar: [:bat, [:baz, [:bat, ]]]}
- *    h.flatten(-1) # => [:foo, 0, :bar, :bat, :baz, :bat]
- *    h.flatten(-2) # => [:foo, 0, :bar, :bat, :baz, :bat]
+ *  With +depth+ zero,
+ *  returns the equivalent of #to_a:
  *
- *  When +level+ is zero, returns the equivalent of #to_a :
- *    h = {foo: 0, bar: [:bat, 3], baz: 2}
- *    h.flatten(0) # => [[:foo, 0], [:bar, [:bat, 3]], [:baz, 2]]
- *    h.flatten(0) == h.to_a # => true
+ *    h.flatten(0) # => [[:foo, {:bar=>1, :baz=>2}], [:bat, [:bam, [:bap, [:bah]]]]]
+ *
+ *  Related: see {Methods for Converting}[rdoc-ref:Hash@Methods+for+Converting].
  */
 
 static VALUE
@@ -4238,12 +4593,14 @@ delete_if_nil(VALUE key, VALUE value, VALUE hash)
 
 /*
  *  call-seq:
- *    hash.compact -> new_hash
+ *    compact -> new_hash
  *
  *  Returns a copy of +self+ with all +nil+-valued entries removed:
+ *
  *    h = {foo: 0, bar: nil, baz: 2, bat: nil}
- *    h1 = h.compact
- *    h1 # => {:foo=>0, :baz=>2}
+ *    h.compact # => {foo: 0, baz: 2}
+ *
+ *  Related: see {Methods for Deleting}[rdoc-ref:Hash@Methods+for+Deleting].
  */
 
 static VALUE
@@ -4252,6 +4609,7 @@ rb_hash_compact(VALUE hash)
     VALUE result = rb_hash_dup(hash);
     if (!RHASH_EMPTY_P(hash)) {
         rb_hash_foreach(result, delete_if_nil, result);
+        compact_after_delete(result);
     }
     else if (rb_hash_compare_by_id_p(hash)) {
         result = rb_hash_compare_by_id(result);
@@ -4261,13 +4619,18 @@ rb_hash_compact(VALUE hash)
 
 /*
  *  call-seq:
- *    hash.compact! -> self or nil
+ *    compact! -> self or nil
+ *
+ *  If +self+ contains any +nil+-valued entries,
+ *  returns +self+ with all +nil+-valued entries removed;
+ *  returns +nil+ otherwise:
  *
- *  Returns +self+ with all its +nil+-valued entries removed (in place):
  *    h = {foo: 0, bar: nil, baz: 2, bat: nil}
- *    h.compact! # => {:foo=>0, :baz=>2}
+ *    h.compact!
+ *    h          # => {foo: 0, baz: 2}
+ *    h.compact! # => nil
  *
- *  Returns +nil+ if no entries were removed.
+ *  Related: see {Methods for Deleting}[rdoc-ref:Hash@Methods+for+Deleting].
  */
 
 static VALUE
@@ -4286,30 +4649,28 @@ rb_hash_compact_bang(VALUE hash)
 
 /*
  *  call-seq:
- *    hash.compare_by_identity -> self
+ *    compare_by_identity -> self
  *
- *  Sets +self+ to consider only identity in comparing keys;
- *  two keys are considered the same only if they are the same object;
- *  returns +self+.
+ *  Sets +self+ to compare keys using _identity_ (rather than mere _equality_);
+ *  returns +self+:
+ *
+ *  By default, two keys are considered to be the same key
+ *  if and only if they are _equal_ objects (per method #==):
  *
- *  By default, these two object are considered to be the same key,
- *  so +s1+ will overwrite +s0+:
- *    s0 = 'x'
- *    s1 = 'x'
  *    h = {}
- *    h.compare_by_identity? # => false
- *    h[s0] = 0
- *    h[s1] = 1
+ *    h['x'] = 0
+ *    h['x'] = 1 # Overwrites.
  *    h # => {"x"=>1}
  *
- *  After calling \#compare_by_identity, the keys are considered to be different,
- *  and therefore do not overwrite each other:
- *    h = {}
- *    h.compare_by_identity # => {}
- *    h.compare_by_identity? # => true
- *    h[s0] = 0
- *    h[s1] = 1
- *    h # => {"x"=>0, "x"=>1}
+ *  When this method has been called, two keys are considered to be the same key
+ *  if and only if they are the _same_ object:
+ *
+ *    h.compare_by_identity
+ *    h['x'] = 2 # Does not overwrite.
+ *    h # => {"x"=>1, "x"=>2}
+ *
+ *  Related: #compare_by_identity?;
+ *  see also {Methods for Comparing}[rdoc-ref:Hash@Methods+for+Comparing].
  */
 
 VALUE
@@ -4321,32 +4682,56 @@ rb_hash_compare_by_id(VALUE hash)
     if (rb_hash_compare_by_id_p(hash)) return hash;
 
     rb_hash_modify_check(hash);
-    ar_force_convert_table(hash, __FILE__, __LINE__);
-    HASH_ASSERT(RHASH_ST_TABLE_P(hash));
+    if (hash_iterating_p(hash)) {
+        rb_raise(rb_eRuntimeError, "compare_by_identity during iteration");
+    }
 
-    tmp = hash_alloc(0);
-    hash_st_table_init(tmp, &identhash, RHASH_SIZE(hash));
-    identtable = RHASH_ST_TABLE(tmp);
+    if (RHASH_TABLE_EMPTY_P(hash)) {
+        // Fast path: There's nothing to rehash, so we don't need a `tmp` table.
+        // We're most likely an AR table, so this will need an allocation.
+        ar_force_convert_table(hash, __FILE__, __LINE__);
+        HASH_ASSERT(RHASH_ST_TABLE_P(hash));
+
+        RHASH_ST_TABLE(hash)->type = &identhash;
+    }
+    else {
+        // Slow path: Need to rehash the members of `self` into a new
+        // `tmp` table using the new `identhash` compare/hash functions.
+        tmp = hash_alloc(0);
+        hash_st_table_init(tmp, &identhash, RHASH_SIZE(hash));
+        identtable = RHASH_ST_TABLE(tmp);
 
-    rb_hash_foreach(hash, rb_hash_rehash_i, (VALUE)tmp);
+        rb_hash_foreach(hash, rb_hash_rehash_i, (VALUE)tmp);
+        rb_hash_free(hash);
 
-    RHASH_ST_TABLE_SET(hash, identtable);
-    RHASH_ST_CLEAR(tmp);
+        // We know for sure `identtable` is an st table,
+        // so we can skip `ar_force_convert_table` here.
+        RHASH_ST_TABLE_SET(hash, identtable);
+        RHASH_ST_CLEAR(tmp);
+    }
 
     return hash;
 }
 
 /*
  *  call-seq:
- *    hash.compare_by_identity? -> true or false
+ *    compare_by_identity? -> true or false
+ *
+ *  Returns whether #compare_by_identity has been called:
+ *
+ *    h = {}
+ *    h.compare_by_identity? # => false
+ *    h.compare_by_identity
+ *    h.compare_by_identity? # => true
  *
- *  Returns +true+ if #compare_by_identity has been called, +false+ otherwise.
+ *  Related: #compare_by_identity;
+ *  see also {Methods for Comparing}[rdoc-ref:Hash@Methods+for+Comparing].
  */
 
 VALUE
 rb_hash_compare_by_id_p(VALUE hash)
 {
-    return RBOOL(RHASH_ST_TABLE_P(hash) && RHASH_ST_TABLE(hash)->type == &identhash);
+    return RBOOL(RHASH_IDENTHASH_P(hash));
 }
 
 VALUE
@@ -4406,36 +4791,42 @@ any_p_i_pattern(VALUE key, VALUE value, VALUE arg)
 
 /*
  *  call-seq:
- *    hash.any? -> true or false
- *    hash.any?(object) -> true or false
- *    hash.any? {|key, value| ... } -> true or false
+ *    any? -> true or false
+ *    any?(entry) -> true or false
+ *    any? {|key, value| ... } -> true or false
  *
  *  Returns +true+ if any element satisfies a given criterion;
  *  +false+ otherwise.
  *
- *  If +self+ has no element, returns +false+ and argument or block
- *  are not used.
+ *  If +self+ has no element, returns +false+ and argument or block are not used;
+ *  otherwise behaves as below.
  *
  *  With no argument and no block,
- *  returns +true+ if +self+ is non-empty; +false+ if empty.
+ *  returns +true+ if +self+ is non-empty, +false+ otherwise.
  *
- *  With argument +object+ and no block,
+ *  With argument +entry+ and no block,
  *  returns +true+ if for any key +key+
- *  <tt>h.assoc(key) == object</tt>:
+ *  <tt>self.assoc(key) == entry</tt>, +false+ otherwise:
+ *
  *   h = {foo: 0, bar: 1, baz: 2}
+ *   h.assoc(:bar)     # => [:bar, 1]
  *   h.any?([:bar, 1]) # => true
  *   h.any?([:bar, 0]) # => false
- *   h.any?([:baz, 1]) # => false
  *
- *  With no argument and a block,
+ *  With no argument and a block given,
  *  calls the block with each key-value pair;
- *  returns +true+ if the block returns any truthy value,
+ *  returns +true+ if the block returns a truthy value,
  *  +false+ otherwise:
+ *
  *    h = {foo: 0, bar: 1, baz: 2}
  *    h.any? {|key, value| value < 3 } # => true
  *    h.any? {|key, value| value > 3 } # => false
  *
- *  Related: Enumerable#any?
+ *  With both argument +entry+ and a block given,
+ *  issues a warning and ignores the block.
+ *
+ *  Related: Enumerable#any? (which this method overrides);
+ *  see also {Methods for Fetching}[rdoc-ref:Hash@Methods+for+Fetching].
  */
 
 static VALUE
@@ -4469,31 +4860,37 @@ rb_hash_any_p(int argc, VALUE *argv, VALUE hash)
 
 /*
  *  call-seq:
- *    hash.dig(key, *identifiers) -> object
+ *    dig(key, *identifiers) -> object
+ *
+ *  Finds and returns an object found in nested objects,
+ *  as specified by +key+ and +identifiers+.
  *
- *  Finds and returns the object in nested objects
- *  that is specified by +key+ and +identifiers+.
  *  The nested objects may be instances of various classes.
  *  See {Dig Methods}[rdoc-ref:dig_methods.rdoc].
  *
- *  Nested Hashes:
+ *  Nested hashes:
+ *
  *    h = {foo: {bar: {baz: 2}}}
- *    h.dig(:foo) # => {:bar=>{:baz=>2}}
- *    h.dig(:foo, :bar) # => {:baz=>2}
+ *    h.dig(:foo) # => {bar: {baz: 2}}
+ *    h.dig(:foo, :bar) # => {baz: 2}
  *    h.dig(:foo, :bar, :baz) # => 2
  *    h.dig(:foo, :bar, :BAZ) # => nil
  *
- *  Nested Hashes and Arrays:
+ *  Nested hashes and arrays:
+ *
  *    h = {foo: {bar: [:a, :b, :c]}}
  *    h.dig(:foo, :bar, 2) # => :c
  *
- *  This method will use the {default values}[rdoc-ref:Hash@Default+Values]
- *  for keys that are not present:
+ *  If no such object is found,
+ *  returns the {hash default}[rdoc-ref:Hash@Hash+Default]:
+ *
  *    h = {foo: {bar: [:a, :b, :c]}}
  *    h.dig(:hello) # => nil
  *    h.default_proc = -> (hash, _key) { hash }
- *    h.dig(:hello, :world) # => h
- *    h.dig(:hello, :world, :foo, :bar, 2) # => :c
+ *    h.dig(:hello, :world)
+ *    # => {:foo=>{:bar=>[:a, :b, :c]}}
+ *
+ *  Related: {Methods for Fetching}[rdoc-ref:Hash@Methods+for+Fetching].
  */
 
 static VALUE
@@ -4528,14 +4925,22 @@ hash_le(VALUE hash1, VALUE hash2)
 
 /*
  *  call-seq:
- *    hash <= other_hash -> true or false
+ *    self <= other_hash -> true or false
  *
- *  Returns +true+ if +hash+ is a subset of +other_hash+, +false+ otherwise:
- *    h1 = {foo: 0, bar: 1}
- *    h2 = {foo: 0, bar: 1, baz: 2}
- *    h1 <= h2 # => true
- *    h2 <= h1 # => false
- *    h1 <= h1 # => true
+ *  Returns +true+ if the entries of +self+ are a subset of the entries of +other_hash+,
+ *  +false+ otherwise:
+ *
+ *    h0 = {foo: 0, bar: 1}
+ *    h1 = {foo: 0, bar: 1, baz: 2}
+ *    h0 <= h0 # => true
+ *    h0 <= h1 # => true
+ *    h1 <= h0 # => false
+ *
+ *  See {Hash Inclusion}[rdoc-ref:hash_inclusion.rdoc].
+ *
+ *  Raises TypeError if +other_hash+ is not a hash and cannot be converted to a hash.
+ *
+ *  Related: see {Methods for Comparing}[rdoc-ref:Hash@Methods+for+Comparing].
  */
 static VALUE
 rb_hash_le(VALUE hash, VALUE other)
@@ -4547,14 +4952,24 @@ rb_hash_le(VALUE hash, VALUE other)
 
 /*
  *  call-seq:
- *    hash < other_hash -> true or false
+ *    self < other_hash -> true or false
  *
- *  Returns +true+ if +hash+ is a proper subset of +other_hash+, +false+ otherwise:
- *    h1 = {foo: 0, bar: 1}
- *    h2 = {foo: 0, bar: 1, baz: 2}
- *    h1 < h2 # => true
- *    h2 < h1 # => false
- *    h1 < h1 # => false
+ *  Returns +true+ if the entries of +self+ are a proper subset of the entries of +other_hash+,
+ *  +false+ otherwise:
+ *
+ *    h = {foo: 0, bar: 1}
+ *    h < {foo: 0, bar: 1, baz: 2} # => true   # Proper subset.
+ *    h < {baz: 2, bar: 1, foo: 0} # => true   # Order may differ.
+ *    h < h                        # => false  # Not a proper subset.
+ *    h < {bar: 1, foo: 0}         # => false  # Not a proper subset.
+ *    h < {foo: 0, bar: 1, baz: 2} # => false  # Different key.
+ *    h < {foo: 0, bar: 1, baz: 2} # => false  # Different value.
+ *
+ *  See {Hash Inclusion}[rdoc-ref:hash_inclusion.rdoc].
+ *
+ *  Raises TypeError if +other_hash+ is not a hash and cannot be converted to a hash.
+ *
+ *  Related: see {Methods for Comparing}[rdoc-ref:Hash@Methods+for+Comparing].
  */
 static VALUE
 rb_hash_lt(VALUE hash, VALUE other)
@@ -4566,14 +4981,22 @@ rb_hash_lt(VALUE hash, VALUE other)
 
 /*
  *  call-seq:
- *    hash >= other_hash -> true or false
+ *    self >= other_hash -> true or false
  *
- *  Returns +true+ if +hash+ is a superset of +other_hash+, +false+ otherwise:
- *    h1 = {foo: 0, bar: 1, baz: 2}
- *    h2 = {foo: 0, bar: 1}
- *    h1 >= h2 # => true
- *    h2 >= h1 # => false
- *    h1 >= h1 # => true
+ *  Returns +true+ if the entries of +self+ are a superset of the entries of +other_hash+,
+ *  +false+ otherwise:
+ *
+ *    h0 = {foo: 0, bar: 1, baz: 2}
+ *    h1 = {foo: 0, bar: 1}
+ *    h0 >= h1 # => true
+ *    h0 >= h0 # => true
+ *    h1 >= h0 # => false
+ *
+ *  See {Hash Inclusion}[rdoc-ref:hash_inclusion.rdoc].
+ *
+ *  Raises TypeError if +other_hash+ is not a hash and cannot be converted to a hash.
+ *
+ *  Related: see {Methods for Comparing}[rdoc-ref:Hash@Methods+for+Comparing].
  */
 static VALUE
 rb_hash_ge(VALUE hash, VALUE other)
@@ -4585,14 +5008,24 @@ rb_hash_ge(VALUE hash, VALUE other)
 
 /*
  *  call-seq:
- *    hash > other_hash -> true or false
+ *    self > other_hash -> true or false
  *
- *  Returns +true+ if +hash+ is a proper superset of +other_hash+, +false+ otherwise:
- *    h1 = {foo: 0, bar: 1, baz: 2}
- *    h2 = {foo: 0, bar: 1}
- *    h1 > h2 # => true
- *    h2 > h1 # => false
- *    h1 > h1 # => false
+ *  Returns +true+ if the entries of +self+ are a proper superset of the entries of +other_hash+,
+ *  +false+ otherwise:
+ *
+ *    h = {foo: 0, bar: 1, baz: 2}
+ *    h > {foo: 0, bar: 1}         # => true   # Proper superset.
+ *    h > {bar: 1, foo: 0}         # => true   # Order may differ.
+ *    h > h                        # => false  # Not a proper superset.
+ *    h > {baz: 2, bar: 1, foo: 0} # => false  # Not a proper superset.
+ *    h > {foo: 0, bar: 1}         # => false  # Different key.
+ *    h > {foo: 0, bar: 1}         # => false  # Different value.
+ *
+ *  See {Hash Inclusion}[rdoc-ref:hash_inclusion.rdoc].
+ *
+ *  Raises TypeError if +other_hash+ is not a hash and cannot be converted to a hash.
+ *
+ *  Related: see {Methods for Comparing}[rdoc-ref:Hash@Methods+for+Comparing].
  */
 static VALUE
 rb_hash_gt(VALUE hash, VALUE other)
@@ -4611,15 +5044,18 @@ hash_proc_call(RB_BLOCK_CALL_FUNC_ARGLIST(key, hash))
 
 /*
  *  call-seq:
- *    hash.to_proc -> proc
+ *    to_proc -> proc
  *
  *  Returns a Proc object that maps a key to its value:
+ *
  *    h = {foo: 0, bar: 1, baz: 2}
  *    proc = h.to_proc
  *    proc.class # => Proc
  *    proc.call(:foo) # => 0
  *    proc.call(:bar) # => 1
  *    proc.call(:nosuch) # => nil
+ *
+ *  Related: see {Methods for Converting}[rdoc-ref:Hash@Methods+for+Converting].
  */
 static VALUE
 rb_hash_to_proc(VALUE hash)
@@ -4627,6 +5063,7 @@ rb_hash_to_proc(VALUE hash)
     return rb_func_lambda_new(hash_proc_call, hash, 1, 1);
 }
 
+/* :nodoc: */
 static VALUE
 rb_hash_deconstruct_keys(VALUE hash, VALUE keys)
 {
@@ -4636,10 +5073,8 @@ rb_hash_deconstruct_keys(VALUE hash, VALUE keys)
 static int
 add_new_i(st_data_t *key, st_data_t *val, st_data_t arg, int existing)
 {
-    VALUE *args = (VALUE *)arg;
     if (existing) return ST_STOP;
-    RB_OBJ_WRITTEN(args[0], Qundef, (VALUE)*key);
-    RB_OBJ_WRITE(args[0], (VALUE *)val, args[1]);
+    *val = arg;
     return ST_CONTINUE;
 }
 
@@ -4651,21 +5086,25 @@ int
 rb_hash_add_new_element(VALUE hash, VALUE key, VALUE val)
 {
     st_table *tbl;
-    int ret = 0;
-    VALUE args[2];
-    args[0] = hash;
-    args[1] = val;
+    int ret = -1;
 
     if (RHASH_AR_TABLE_P(hash)) {
-        ret = ar_update(hash, (st_data_t)key, add_new_i, (st_data_t)args);
-        if (ret != -1) {
-            return ret;
+        ret = ar_update(hash, (st_data_t)key, add_new_i, (st_data_t)val);
+        if (ret == -1) {
+            ar_force_convert_table(hash, __FILE__, __LINE__);
         }
-        ar_try_convert_table(hash);
     }
-    tbl = RHASH_TBL_RAW(hash);
-    return st_update(tbl, (st_data_t)key, add_new_i, (st_data_t)args);
 
+    if (ret == -1) {
+        tbl = RHASH_TBL_RAW(hash);
+        ret = st_update(tbl, (st_data_t)key, add_new_i, (st_data_t)val);
+    }
+    if (!ret) {
+        // Newly inserted
+        RB_OBJ_WRITTEN(hash, Qundef, key);
+        RB_OBJ_WRITTEN(hash, Qundef, val);
+    }
+    return ret;
 }
 
 static st_data_t
@@ -4732,8 +5171,7 @@ extern char **environ;
 #define ENVNMATCH(s1, s2, n) (memcmp((s1), (s2), (n)) == 0)
 #endif
 
-#define ENV_LOCK()   RB_VM_LOCK_ENTER()
-#define ENV_UNLOCK() RB_VM_LOCK_LEAVE()
+#define ENV_LOCKING() RB_VM_LOCKING()
 
 static inline rb_encoding *
 env_encoding(void)
@@ -4771,12 +5209,10 @@ static VALUE
 getenv_with_lock(const char *name)
 {
     VALUE ret;
-    ENV_LOCK();
-    {
+    ENV_LOCKING() {
         const char *val = getenv(name);
         ret = env_str_new2(val);
     }
-    ENV_UNLOCK();
     return ret;
 }
 
@@ -4785,11 +5221,9 @@ has_env_with_lock(const char *name)
 {
     const char *val;
 
-    ENV_LOCK();
-    {
+    ENV_LOCKING() {
         val = getenv(name);
     }
-    ENV_UNLOCK();
 
     return val ? true : false;
 }
@@ -4819,7 +5253,7 @@ static inline const char *
 env_name(volatile VALUE *s)
 {
     const char *name;
-    SafeStringValue(*s);
+    StringValue(*s);
     get_env_ptr(name, *s);
     return name;
 }
@@ -4829,7 +5263,7 @@ env_name(volatile VALUE *s)
 static VALUE env_aset(VALUE nm, VALUE val);
 
 static void
-reset_by_modified_env(const char *nam)
+reset_by_modified_env(const char *nam, const char *val)
 {
     /*
      * ENV['TZ'] = nil has a special meaning.
@@ -4838,7 +5272,7 @@ reset_by_modified_env(const char *nam)
      * This hack might works only on Linux glibc.
      */
     if (ENVMATCH(nam, TZ_ENV)) {
-        ruby_reset_timezone();
+        ruby_reset_timezone(val);
     }
 }
 
@@ -4846,7 +5280,7 @@ static VALUE
 env_delete(VALUE name)
 {
     const char *nam = env_name(name);
-    reset_by_modified_env(nam);
+    reset_by_modified_env(nam, NULL);
     VALUE val = getenv_with_lock(nam);
 
     if (!NIL_P(val)) {
@@ -4992,44 +5426,6 @@ envix(const char *nam)
 }
 #endif
 
-#if defined(_WIN32)
-static size_t
-getenvsize(const WCHAR* p)
-{
-    const WCHAR* porg = p;
-    while (*p++) p += lstrlenW(p) + 1;
-    return p - porg + 1;
-}
-
-static size_t
-getenvblocksize(void)
-{
-#ifdef _MAX_ENV
-    return _MAX_ENV;
-#else
-    return 32767;
-#endif
-}
-
-static int
-check_envsize(size_t n)
-{
-    if (_WIN32_WINNT < 0x0600 && rb_w32_osver() < 6) {
-        /* https://msdn.microsoft.com/en-us/library/windows/desktop/ms682653(v=vs.85).aspx */
-        /* Windows Server 2003 and Windows XP: The maximum size of the
-         * environment block for the process is 32,767 characters. */
-        WCHAR* p = GetEnvironmentStringsW();
-        if (!p) return -1; /* never happen */
-        n += getenvsize(p);
-        FreeEnvironmentStringsW(p);
-        if (n >= getenvblocksize()) {
-            return -1;
-        }
-    }
-    return 0;
-}
-#endif
-
 #if defined(_WIN32) || \
   (defined(__sun) && !(defined(HAVE_SETENV) && defined(HAVE_UNSETENV)))
 
@@ -5055,9 +5451,6 @@ void
 ruby_setenv(const char *name, const char *value)
 {
 #if defined(_WIN32)
-# if defined(MINGW_HAS_SECURE_API) || RUBY_MSVCRT_VERSION >= 80
-#   define HAVE__WPUTENV_S 1
-# endif
     VALUE buf;
     WCHAR *wname;
     WCHAR *wvalue = 0;
@@ -5068,43 +5461,30 @@ ruby_setenv(const char *name, const char *value)
     if (value) {
         int len2;
         len2 = MultiByteToWideChar(CP_UTF8, 0, value, -1, NULL, 0);
-        if (check_envsize((size_t)len + len2)) { /* len and len2 include '\0' */
-            goto fail;  /* 2 for '=' & '\0' */
-        }
         wname = ALLOCV_N(WCHAR, buf, len + len2);
         wvalue = wname + len;
         MultiByteToWideChar(CP_UTF8, 0, name, -1, wname, len);
         MultiByteToWideChar(CP_UTF8, 0, value, -1, wvalue, len2);
-#ifndef HAVE__WPUTENV_S
-        wname[len-1] = L'=';
-#endif
     }
     else {
         wname = ALLOCV_N(WCHAR, buf, len + 1);
         MultiByteToWideChar(CP_UTF8, 0, name, -1, wname, len);
         wvalue = wname + len;
         *wvalue = L'\0';
-#ifndef HAVE__WPUTENV_S
-        wname[len-1] = L'=';
-#endif
     }
 
-    ENV_LOCK();
-    {
-#ifndef HAVE__WPUTENV_S
-        failed = _wputenv(wname);
-#else
+    ENV_LOCKING() {
+        /* Use _wputenv_s() instead of SetEnvironmentVariableW() to make sure
+         * special variables like "TZ" are interpret by libc. */
         failed = _wputenv_s(wname, wvalue);
-#endif
     }
-    ENV_UNLOCK();
 
     ALLOCV_END(buf);
     /* even if putenv() failed, clean up and try to delete the
      * variable from the system area. */
     if (!value || !*value) {
         /* putenv() doesn't handle empty value */
-        if (!SetEnvironmentVariable(name, value) &&
+        if (!SetEnvironmentVariableW(wname, value ? wvalue : NULL) &&
             GetLastError() != ERROR_ENVVAR_NOT_FOUND) goto fail;
     }
     if (failed) {
@@ -5114,28 +5494,22 @@ ruby_setenv(const char *name, const char *value)
 #elif defined(HAVE_SETENV) && defined(HAVE_UNSETENV)
     if (value) {
         int ret;
-        ENV_LOCK();
-        {
+        ENV_LOCKING() {
             ret = setenv(name, value, 1);
         }
-        ENV_UNLOCK();
 
         if (ret) rb_sys_fail_sprintf("setenv(%s)", name);
     }
     else {
 #ifdef VOID_UNSETENV
-        ENV_LOCK();
-        {
+        ENV_LOCKING() {
             unsetenv(name);
         }
-        ENV_UNLOCK();
 #else
         int ret;
-        ENV_LOCK();
-        {
+        ENV_LOCKING() {
             ret = unsetenv(name);
         }
-        ENV_UNLOCK();
 
         if (ret) rb_sys_fail_sprintf("unsetenv(%s)", name);
 #endif
@@ -5158,8 +5532,7 @@ ruby_setenv(const char *name, const char *value)
         snprintf(mem_ptr, mem_size, "%s=%s", name, value);
     }
 
-    ENV_LOCK();
-    {
+    ENV_LOCKING() {
         for (env_ptr = GET_ENVIRON(environ); (str = *env_ptr) != 0; ++env_ptr) {
             if (!strncmp(str, name, len) && str[len] == '=') {
                 if (!in_origenv(str)) free(str);
@@ -5168,15 +5541,12 @@ ruby_setenv(const char *name, const char *value)
             }
         }
     }
-    ENV_UNLOCK();
 
     if (value) {
         int ret;
-        ENV_LOCK();
-        {
+        ENV_LOCKING() {
             ret = putenv(mem_ptr);
         }
-        ENV_UNLOCK();
 
         if (ret) {
             free(mem_ptr);
@@ -5187,8 +5557,7 @@ ruby_setenv(const char *name, const char *value)
     size_t len;
     int i;
 
-    ENV_LOCK();
-    {
+    ENV_LOCKING() {
         i = envix(name);		/* where does it go? */
 
         if (environ == origenviron) {	/* need we copy environment? */
@@ -5229,7 +5598,6 @@ ruby_setenv(const char *name, const char *value)
 
       finish:;
     }
-    ENV_UNLOCK();
 #endif /* WIN32 */
 }
 
@@ -5296,15 +5664,15 @@ env_aset(VALUE nm, VALUE val)
         env_delete(nm);
         return Qnil;
     }
-    SafeStringValue(nm);
-    SafeStringValue(val);
+    StringValue(nm);
+    StringValue(val);
     /* nm can be modified in `val.to_str`, don't get `name` before
      * check for `val` */
     get_env_ptr(name, nm);
     get_env_ptr(value, val);
 
     ruby_setenv(name, value);
-    reset_by_modified_env(name);
+    reset_by_modified_env(name, value);
     return val;
 }
 
@@ -5314,8 +5682,7 @@ env_keys(int raw)
     rb_encoding *enc = raw ? 0 : rb_locale_encoding();
     VALUE ary = rb_ary_new();
 
-    ENV_LOCK();
-    {
+    ENV_LOCKING() {
         char **env = GET_ENVIRON(environ);
         while (*env) {
             char *s = strchr(*env, '=');
@@ -5329,7 +5696,6 @@ env_keys(int raw)
         }
         FREE_ENVIRON(environ);
     }
-    ENV_UNLOCK();
 
     return ary;
 }
@@ -5359,8 +5725,7 @@ rb_env_size(VALUE ehash, VALUE args, VALUE eobj)
     char **env;
     long cnt = 0;
 
-    ENV_LOCK();
-    {
+    ENV_LOCKING() {
         env = GET_ENVIRON(environ);
         for (; *env ; ++env) {
             if (strchr(*env, '=')) {
@@ -5369,7 +5734,6 @@ rb_env_size(VALUE ehash, VALUE args, VALUE eobj)
         }
         FREE_ENVIRON(environ);
     }
-    ENV_UNLOCK();
 
     return LONG2FIX(cnt);
 }
@@ -5410,8 +5774,7 @@ env_values(void)
 {
     VALUE ary = rb_ary_new();
 
-    ENV_LOCK();
-    {
+    ENV_LOCKING() {
         char **env = GET_ENVIRON(environ);
 
         while (*env) {
@@ -5423,7 +5786,6 @@ env_values(void)
         }
         FREE_ENVIRON(environ);
     }
-    ENV_UNLOCK();
 
     return ary;
 }
@@ -5504,8 +5866,7 @@ env_each_pair(VALUE ehash)
 
     VALUE ary = rb_ary_new();
 
-    ENV_LOCK();
-    {
+    ENV_LOCKING() {
         char **env = GET_ENVIRON(environ);
 
         while (*env) {
@@ -5518,7 +5879,6 @@ env_each_pair(VALUE ehash)
         }
         FREE_ENVIRON(environ);
     }
-    ENV_UNLOCK();
 
     if (rb_block_pair_yield_optimizable()) {
         for (i=0; i<RARRAY_LEN(ary); i+=2) {
@@ -5855,30 +6215,27 @@ env_to_s(VALUE _)
 static VALUE
 env_inspect(VALUE _)
 {
-    VALUE i;
     VALUE str = rb_str_buf_new2("{");
+    rb_encoding *enc = env_encoding();
 
-    ENV_LOCK();
-    {
+    ENV_LOCKING() {
         char **env = GET_ENVIRON(environ);
         while (*env) {
-            char *s = strchr(*env, '=');
+            const char *s = strchr(*env, '=');
 
             if (env != environ) {
                 rb_str_buf_cat2(str, ", ");
             }
             if (s) {
-                rb_str_buf_cat2(str, "\"");
-                rb_str_buf_cat(str, *env, s-*env);
-                rb_str_buf_cat2(str, "\"=>");
-                i = rb_inspect(rb_str_new2(s+1));
-                rb_str_buf_append(str, i);
+                rb_str_buf_append(str, rb_str_inspect(env_enc_str_new(*env, s-*env, enc)));
+                rb_str_buf_cat2(str, " => ");
+                s++;
+                rb_str_buf_append(str, rb_str_inspect(env_enc_str_new(s, strlen(s), enc)));
             }
             env++;
         }
         FREE_ENVIRON(environ);
     }
-    ENV_UNLOCK();
 
     rb_str_buf_cat2(str, "}");
 
@@ -5899,8 +6256,7 @@ env_to_a(VALUE _)
 {
     VALUE ary = rb_ary_new();
 
-    ENV_LOCK();
-    {
+    ENV_LOCKING() {
         char **env = GET_ENVIRON(environ);
         while (*env) {
             char *s = strchr(*env, '=');
@@ -5912,7 +6268,6 @@ env_to_a(VALUE _)
         }
         FREE_ENVIRON(environ);
     }
-    ENV_UNLOCK();
 
     return ary;
 }
@@ -5936,13 +6291,11 @@ env_size_with_lock(void)
 {
     int i = 0;
 
-    ENV_LOCK();
-    {
+    ENV_LOCKING() {
         char **env = GET_ENVIRON(environ);
         while (env[i]) i++;
         FREE_ENVIRON(environ);
     }
-    ENV_UNLOCK();
 
     return i;
 }
@@ -5978,15 +6331,13 @@ env_empty_p(VALUE _)
 {
     bool empty = true;
 
-    ENV_LOCK();
-    {
+    ENV_LOCKING() {
         char **env = GET_ENVIRON(environ);
         if (env[0] != 0) {
             empty = false;
         }
         FREE_ENVIRON(environ);
     }
-    ENV_UNLOCK();
 
     return RBOOL(empty);
 }
@@ -6075,8 +6426,7 @@ env_has_value(VALUE dmy, VALUE obj)
 
     VALUE ret = Qfalse;
 
-    ENV_LOCK();
-    {
+    ENV_LOCKING() {
         char **env = GET_ENVIRON(environ);
         while (*env) {
             char *s = strchr(*env, '=');
@@ -6091,7 +6441,6 @@ env_has_value(VALUE dmy, VALUE obj)
         }
         FREE_ENVIRON(environ);
     }
-    ENV_UNLOCK();
 
     return ret;
 }
@@ -6118,8 +6467,7 @@ env_rassoc(VALUE dmy, VALUE obj)
 
     VALUE result = Qnil;
 
-    ENV_LOCK();
-    {
+    ENV_LOCKING() {
         char **env = GET_ENVIRON(environ);
 
         while (*env) {
@@ -6136,7 +6484,6 @@ env_rassoc(VALUE dmy, VALUE obj)
         }
         FREE_ENVIRON(environ);
     }
-    ENV_UNLOCK();
 
     return result;
 }
@@ -6160,11 +6507,10 @@ env_rassoc(VALUE dmy, VALUE obj)
 static VALUE
 env_key(VALUE dmy, VALUE value)
 {
-    SafeStringValue(value);
+    StringValue(value);
     VALUE str = Qnil;
 
-    ENV_LOCK();
-    {
+    ENV_LOCKING() {
         char **env = GET_ENVIRON(environ);
         while (*env) {
             char *s = strchr(*env, '=');
@@ -6179,7 +6525,6 @@ env_key(VALUE dmy, VALUE value)
         }
         FREE_ENVIRON(environ);
     }
-    ENV_UNLOCK();
 
     return str;
 }
@@ -6189,8 +6534,7 @@ env_to_hash(void)
 {
     VALUE hash = rb_hash_new();
 
-    ENV_LOCK();
-    {
+    ENV_LOCKING() {
         char **env = GET_ENVIRON(environ);
         while (*env) {
             char *s = strchr(*env, '=');
@@ -6202,7 +6546,6 @@ env_to_hash(void)
         }
         FREE_ENVIRON(environ);
     }
-    ENV_UNLOCK();
 
     return hash;
 }
@@ -6246,7 +6589,7 @@ env_f_to_hash(VALUE _)
  * 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}
+ *   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:
@@ -6342,8 +6685,7 @@ env_shift(VALUE _)
     VALUE result = Qnil;
     VALUE key = Qnil;
 
-    ENV_LOCK();
-    {
+    ENV_LOCKING() {
         char **env = GET_ENVIRON(environ);
         if (*env) {
             const char *p = *env;
@@ -6356,7 +6698,6 @@ env_shift(VALUE _)
         }
         FREE_ENVIRON(environ);
     }
-    ENV_UNLOCK();
 
     if (!NIL_P(key)) {
         env_delete(key);
@@ -6567,70 +6908,71 @@ static const rb_data_type_t env_data_type = {
 };
 
 /*
- *  A \Hash maps each of its unique keys to a specific value.
+ *  A \Hash object maps each of its unique keys to a specific value.
  *
- *  A \Hash has certain similarities to an Array, but:
- *  - An Array index is always an Integer.
- *  - A \Hash key can be (almost) any object.
+ *  A hash has certain similarities to an Array, but:
+
+ *  - An array index is always an integer.
+ *  - A hash key can be (almost) any object.
  *
  *  === \Hash \Data Syntax
  *
- *  The older syntax for \Hash data uses the "hash rocket," <tt>=></tt>:
+ *  The original syntax for a hash entry uses the "hash rocket," <tt>=></tt>:
  *
  *    h = {:foo => 0, :bar => 1, :baz => 2}
- *    h # => {:foo=>0, :bar=>1, :baz=>2}
+ *    h # => {foo: 0, bar: 1, baz: 2}
  *
- *  Alternatively, but only for a \Hash key that's a Symbol,
+ *  Alternatively, but only for a key that's a symbol,
  *  you can use a newer JSON-style syntax,
- *  where each bareword becomes a Symbol:
+ *  where each bareword becomes a symbol:
  *
  *    h = {foo: 0, bar: 1, baz: 2}
- *    h # => {:foo=>0, :bar=>1, :baz=>2}
+ *    h # => {foo: 0, bar: 1, baz: 2}
  *
- *  You can also use a String in place of a bareword:
+ *  You can also use a string in place of a bareword:
  *
  *    h = {'foo': 0, 'bar': 1, 'baz': 2}
- *    h # => {:foo=>0, :bar=>1, :baz=>2}
+ *    h # => {foo: 0, bar: 1, baz: 2}
  *
  *  And you can mix the styles:
  *
  *    h = {foo: 0, :bar => 1, 'baz': 2}
- *    h # => {:foo=>0, :bar=>1, :baz=>2}
+ *    h # => {foo: 0, bar: 1, baz: 2}
  *
  *  But it's an error to try the JSON-style syntax
- *  for a key that's not a bareword or a String:
+ *  for a key that's not a bareword or a string:
  *
  *    # Raises SyntaxError (syntax error, unexpected ':', expecting =>):
  *    h = {0: 'zero'}
  *
- *  Hash value can be omitted, meaning that value will be fetched from the context
+ *  The value can be omitted, meaning that value will be fetched from the context
  *  by the name of the key:
  *
  *    x = 0
  *    y = 100
  *    h = {x:, y:}
- *    h # => {:x=>0, :y=>100}
+ *    h # => {x: 0, y: 100}
  *
  *  === Common Uses
  *
- *  You can use a \Hash to give names to objects:
+ *  You can use a hash to give names to objects:
  *
  *    person = {name: 'Matz', language: 'Ruby'}
- *    person # => {:name=>"Matz", :language=>"Ruby"}
+ *    person # => {name: "Matz", language: "Ruby"}
  *
- *  You can use a \Hash to give names to method arguments:
+ *  You can use a hash to give names to method arguments:
  *
  *    def some_method(hash)
  *      p hash
  *    end
- *    some_method({foo: 0, bar: 1, baz: 2}) # => {:foo=>0, :bar=>1, :baz=>2}
+ *    some_method({foo: 0, bar: 1, baz: 2}) # => {foo: 0, bar: 1, baz: 2}
  *
- *  Note: when the last argument in a method call is a \Hash,
+ *  Note: when the last argument in a method call is a hash,
  *  the curly braces may be omitted:
  *
- *    some_method(foo: 0, bar: 1, baz: 2) # => {:foo=>0, :bar=>1, :baz=>2}
+ *    some_method(foo: 0, bar: 1, baz: 2) # => {foo: 0, bar: 1, baz: 2}
  *
- *  You can use a \Hash to initialize an object:
+ *  You can use a hash to initialize an object:
  *
  *    class Dev
  *      attr_accessor :name, :language
@@ -6648,63 +6990,55 @@ static const rb_data_type_t env_data_type = {
  *
  *  - A {hash literal}[rdoc-ref:syntax/literals.rdoc@Hash+Literals].
  *
- *  You can convert certain objects to Hashes with:
- *
- *  - \Method #Hash.
+ *  You can convert certain objects to hashes with:
  *
- *  You can create a \Hash by calling method Hash.new.
+ *  - Method Kernel#Hash.
  *
- *  Create an empty Hash:
+ *  You can create a hash by calling method Hash.new:
  *
+ *    # Create an empty hash.
  *    h = Hash.new
  *    h # => {}
  *    h.class # => Hash
  *
- *  You can create a \Hash by calling method Hash.[].
- *
- *  Create an empty Hash:
+ *  You can create a hash by calling method Hash.[]:
  *
+ *    # Create an empty hash.
  *    h = Hash[]
  *    h # => {}
- *
- *  Create a \Hash with initial entries:
- *
+ *    # Create a hash with initial entries.
  *    h = Hash[foo: 0, bar: 1, baz: 2]
- *    h # => {:foo=>0, :bar=>1, :baz=>2}
- *
- *  You can create a \Hash by using its literal form (curly braces).
+ *    h # => {foo: 0, bar: 1, baz: 2}
  *
- *  Create an empty \Hash:
+ *  You can create a hash by using its literal form (curly braces):
  *
+ *    # Create an empty hash.
  *    h = {}
  *    h # => {}
- *
- *  Create a \Hash with initial entries:
- *
+ *    # Create a +Hash+ with initial entries.
  *    h = {foo: 0, bar: 1, baz: 2}
- *    h # => {:foo=>0, :bar=>1, :baz=>2}
- *
+ *    h # => {foo: 0, bar: 1, baz: 2}
  *
  *  === \Hash Value Basics
  *
- *  The simplest way to retrieve a \Hash value (instance method #[]):
+ *  The simplest way to retrieve a hash value (instance method #[]):
  *
  *    h = {foo: 0, bar: 1, baz: 2}
  *    h[:foo] # => 0
  *
- *  The simplest way to create or update a \Hash value (instance method #[]=):
+ *  The simplest way to create or update a hash value (instance method #[]=):
  *
  *    h = {foo: 0, bar: 1, baz: 2}
  *    h[:bat] = 3 # => 3
- *    h # => {:foo=>0, :bar=>1, :baz=>2, :bat=>3}
+ *    h # => {foo: 0, bar: 1, baz: 2, bat: 3}
  *    h[:foo] = 4 # => 4
- *    h # => {:foo=>4, :bar=>1, :baz=>2, :bat=>3}
+ *    h # => {foo: 4, bar: 1, baz: 2, bat: 3}
  *
- *  The simplest way to delete a \Hash entry (instance method #delete):
+ *  The simplest way to delete a hash entry (instance method #delete):
  *
  *    h = {foo: 0, bar: 1, baz: 2}
  *    h.delete(:bar) # => 1
- *    h # => {:foo=>0, :baz=>2}
+ *    h # => {foo: 0, baz: 2}
  *
  *  === Entry Order
  *
@@ -6712,41 +7046,41 @@ static const rb_data_type_t env_data_type = {
  *
  *  - Iterative methods such as <tt>each</tt>, <tt>each_key</tt>, <tt>each_pair</tt>, <tt>each_value</tt>.
  *  - Other order-sensitive methods such as <tt>shift</tt>, <tt>keys</tt>, <tt>values</tt>.
- *  - The String returned by method <tt>inspect</tt>.
+ *  - The string returned by method <tt>inspect</tt>.
  *
- *  A new \Hash has its initial ordering per the given entries:
+ *  A new hash has its initial ordering per the given entries:
  *
  *    h = Hash[foo: 0, bar: 1]
- *    h # => {:foo=>0, :bar=>1}
+ *    h # => {foo: 0, bar: 1}
  *
  *  New entries are added at the end:
  *
  *    h[:baz] = 2
- *    h # => {:foo=>0, :bar=>1, :baz=>2}
+ *    h # => {foo: 0, bar: 1, baz: 2}
  *
  *  Updating a value does not affect the order:
  *
  *    h[:baz] = 3
- *    h # => {:foo=>0, :bar=>1, :baz=>3}
+ *    h # => {foo: 0, bar: 1, baz: 3}
  *
  *  But re-creating a deleted entry can affect the order:
  *
  *    h.delete(:foo)
  *    h[:foo] = 5
- *    h # => {:bar=>1, :baz=>3, :foo=>5}
+ *    h # => {bar: 1, baz: 3, foo: 5}
  *
- *  === \Hash Keys
+ *  === +Hash+ Keys
  *
- *  ==== \Hash Key Equivalence
+ *  ==== +Hash+ Key Equivalence
  *
  *  Two objects are treated as the same \hash key when their <code>hash</code> value
  *  is identical and the two objects are <code>eql?</code> to each other.
  *
- *  ==== Modifying an Active \Hash Key
+ *  ==== Modifying an Active +Hash+ Key
  *
- *  Modifying a \Hash key while it is in use damages the hash's index.
+ *  Modifying a +Hash+ key while it is in use damages the hash's index.
  *
- *  This \Hash has keys that are Arrays:
+ *  This +Hash+ has keys that are Arrays:
  *
  *    a0 = [ :foo, :bar ]
  *    a1 = [ :baz, :bat ]
@@ -6760,7 +7094,7 @@ static const rb_data_type_t env_data_type = {
  *    a0[0] = :bam
  *    a0.hash # => 1069447059
  *
- *  And damages the \Hash index:
+ *  And damages the +Hash+ index:
  *
  *    h.include?(a0) # => false
  *    h[a0] # => nil
@@ -6781,10 +7115,10 @@ static const rb_data_type_t env_data_type = {
  *    first_key = h.keys.first
  *    first_key.frozen? # => true
  *
- *  ==== User-Defined \Hash Keys
+ *  ==== User-Defined +Hash+ Keys
  *
- *  To be useable as a \Hash key, objects must implement the methods <code>hash</code> and <code>eql?</code>.
- *  Note: this requirement does not apply if the \Hash uses #compare_by_identity since comparison will then
+ *  To be usable as a +Hash+ key, objects must implement the methods <code>hash</code> and <code>eql?</code>.
+ *  Note: this requirement does not apply if the +Hash+ uses #compare_by_identity since comparison will then
  *  rely on the keys' object id instead of <code>hash</code> and <code>eql?</code>.
  *
  *  Object defines basic implementation for <code>hash</code> and <code>eq?</code> that makes each object
@@ -6812,7 +7146,7 @@ static const rb_data_type_t env_data_type = {
  *      alias eql? ==
  *
  *      def hash
- *        @author.hash ^ @title.hash # XOR
+ *        [self.class, @author, @title].hash
  *      end
  *    end
  *
@@ -6826,103 +7160,98 @@ static const rb_data_type_t env_data_type = {
  *
  *    reviews.length #=> 1
  *
- *  === Default Values
+ *  === Key Not Found?
  *
- *  The methods #[], #values_at and #dig need to return the value associated to a certain key.
- *  When that key is not found, that value will be determined by its default proc (if any)
- *  or else its default (initially `nil`).
+ *  When a method tries to retrieve and return the value for a key and that key <i>is found</i>,
+ *  the returned value is the value associated with the key.
  *
- *  You can retrieve the default value with method #default:
+ *  But what if the key <i>is not found</i>?
+ *  In that case, certain methods will return a default value while other will raise a \KeyError.
  *
- *    h = Hash.new
- *    h.default # => nil
+ *  ==== Nil Return Value
  *
- *  You can set the default value by passing an argument to method Hash.new or
- *  with method #default=
+ *  If you want +nil+ returned for a not-found key, you can call:
  *
- *    h = Hash.new(-1)
- *    h.default # => -1
- *    h.default = 0
- *    h.default # => 0
+ *  - #[](key) (usually written as <tt>#[key]</tt>.
+ *  - #assoc(key).
+ *  - #dig(key, *identifiers).
+ *  - #values_at(*keys).
  *
- *  This default value is returned for #[], #values_at and #dig when a key is
- *  not found:
+ *  You can override these behaviors for #[], #dig, and #values_at (but not #assoc);
+ *  see {Hash Default}[rdoc-ref:Hash@Hash+Default].
  *
- *    counts = {foo: 42}
- *    counts.default # => nil (default)
- *    counts[:foo] = 42
- *    counts[:bar] # => nil
- *    counts.default = 0
- *    counts[:bar] # => 0
- *    counts.values_at(:foo, :bar, :baz) # => [42, 0, 0]
- *    counts.dig(:bar) # => 0
+ *  ==== \KeyError
  *
- *  Note that the default value is used without being duplicated. It is not advised to set
- *  the default value to a mutable object:
+ *  If you want KeyError raised for a not-found key, you can call:
  *
- *    synonyms = Hash.new([])
- *    synonyms[:hello] # => []
- *    synonyms[:hello] << :hi # => [:hi], but this mutates the default!
- *    synonyms.default # => [:hi]
- *    synonyms[:world] << :universe
- *    synonyms[:world] # => [:hi, :universe], oops
- *    synonyms.keys # => [], oops
+ *  - #fetch(key).
+ *  - #fetch_values(*keys).
  *
- *  To use a mutable object as default, it is recommended to use a default proc
+ *  ==== \Hash Default
  *
- *  ==== Default Proc
+ *  For certain methods (#[], #dig, and #values_at),
+ *  the return value for a not-found key is determined by two hash properties:
  *
- *  When the default proc for a \Hash is set (i.e., not +nil+),
- *  the default value returned by method #[] is determined by the default proc alone.
+ *  - <i>default value</i>: returned by method #default.
+ *  - <i>default proc</i>: returned by method #default_proc.
  *
- *  You can retrieve the default proc with method #default_proc:
+ *  In the simple case, both values are +nil+,
+ *  and the methods return +nil+ for a not-found key;
+ *  see {Nil Return Value}[rdoc-ref:Hash@Nil+Return+Value] above.
  *
- *    h = Hash.new
- *    h.default_proc # => nil
+ *  Note that this entire section ("Hash Default"):
  *
- *  You can set the default proc by calling Hash.new with a block or
- *  calling the method #default_proc=
+ *  - Applies _only_ to methods #[], #dig, and #values_at.
+ *  - Does _not_ apply to methods #assoc, #fetch, or #fetch_values,
+ *    which are not affected by the default value or default proc.
  *
- *    h = Hash.new { |hash, key| "Default value for #{key}" }
- *    h.default_proc.class # => Proc
- *    h.default_proc = proc { |hash, key| "Default value for #{key.inspect}" }
- *    h.default_proc.class # => Proc
+ *  ===== Any-Key Default
+ *
+ *  You can define an any-key default for a hash;
+ *  that is, a value that will be returned for _any_ not-found key:
+ *
+ *  - The value of #default_proc <i>must be</i> +nil+.
+ *  - The value of #default (which may be any object, including +nil+)
+ *    will be returned for a not-found key.
+ *
+ *  You can set the default value when the hash is created with Hash.new and option +default_value+,
+ *  or later with method #default=.
  *
- *  When the default proc is set (i.e., not +nil+)
- *  and method #[] is called with with a non-existent key,
- *  #[] calls the default proc with both the \Hash object itself and the missing key,
- *  then returns the proc's return value:
+ *  Note: although the value of #default may be any object,
+ *  it may not be a good idea to use a mutable object.
  *
- *    h = Hash.new { |hash, key| "Default value for #{key}" }
- *    h[:nosuch] # => "Default value for nosuch"
+ *  ===== Per-Key Defaults
  *
- *  Note that in the example above no entry for key +:nosuch+ is created:
+ *  You can define a per-key default for a hash;
+ *  that is, a Proc that will return a value based on the key itself.
  *
- *    h.include?(:nosuch) # => false
+ *  You can set the default proc when the hash is created with Hash.new and a block,
+ *  or later with method #default_proc=.
  *
- *  However, the proc itself can add a new entry:
+ *  Note that the proc can modify +self+,
+ *  but modifying +self+ in this way is not thread-safe;
+ *  multiple threads can concurrently call into the default proc
+ *  for the same key.
  *
- *    synonyms = Hash.new { |hash, key| hash[key] = [] }
- *    synonyms.include?(:hello) # => false
- *    synonyms[:hello] << :hi # => [:hi]
- *    synonyms[:world] << :universe # => [:universe]
- *    synonyms.keys # => [:hello, :world]
+ *  ==== \Method Default
  *
- *  Note that setting the default proc will clear the default value and vice versa.
+ *  For two methods, you can specify a default value for a not-found key
+ *  that has effect only for a single method call
+ *  (and not for any subsequent calls):
  *
- *  Be aware that a default proc that modifies the hash is not thread-safe in the
- *  sense that multiple threads can call into the default proc concurrently for the
- *  same key.
+ *  - For method #fetch, you can specify an any-key default:
+ *  - For either method #fetch or method #fetch_values,
+ *    you can specify a per-key default via a block.
  *
  *  === What's Here
  *
- *  First, what's elsewhere. \Class \Hash:
+ *  First, what's elsewhere. Class +Hash+:
  *
  *  - Inherits from {class Object}[rdoc-ref:Object@What-27s+Here].
  *  - Includes {module Enumerable}[rdoc-ref:Enumerable@What-27s+Here],
  *    which provides dozens of additional methods.
  *
- *  Here, class \Hash provides methods that are useful for:
+ *  Here, class +Hash+ provides methods that are useful for:
  *
  *  - {Creating a Hash}[rdoc-ref:Hash@Methods+for+Creating+a+Hash]
  *  - {Setting Hash State}[rdoc-ref:Hash@Methods+for+Setting+Hash+State]
@@ -6934,17 +7263,16 @@ static const rb_data_type_t env_data_type = {
  *  - {Iterating}[rdoc-ref:Hash@Methods+for+Iterating]
  *  - {Converting}[rdoc-ref:Hash@Methods+for+Converting]
  *  - {Transforming Keys and Values}[rdoc-ref:Hash@Methods+for+Transforming+Keys+and+Values]
- *  - {And more....}[rdoc-ref:Hash@Other+Methods]
  *
- *  \Class \Hash also includes methods from module Enumerable.
+ *  Class +Hash+ also includes methods from module Enumerable.
  *
- *  ==== Methods for Creating a \Hash
+ *  ==== Methods for Creating a +Hash+
  *
  *  - ::[]: Returns a new hash populated with given objects.
  *  - ::new: Returns a new empty hash.
  *  - ::try_convert: Returns a new hash created from a given object.
  *
- *  ==== Methods for Setting \Hash State
+ *  ==== Methods for Setting +Hash+ State
  *
  *  - #compare_by_identity: Sets +self+ to consider only identity in comparing keys.
  *  - #default=: Sets the default to a given value.
@@ -6960,10 +7288,9 @@ static const rb_data_type_t env_data_type = {
  *  - #empty?: Returns whether there are no entries.
  *  - #eql?: Returns whether a given object is equal to +self+.
  *  - #hash: Returns the integer hash code.
- *  - #has_value?: Returns whether a given object is a value in +self+.
- *  - #include?, #has_key?, #member?, #key?: Returns whether a given object is a key in +self+.
- *  - #length, #size: Returns the count of entries.
- *  - #value?: Returns whether a given object is a value in +self+.
+ *  - #has_value? (aliased as #value?): Returns whether a given object is a value in +self+.
+ *  - #include? (aliased as #has_key?, #member?, #key?): Returns whether a given object is a key in +self+.
+ *  - #size (aliased as #length): Returns the count of entries.
  *
  *  ==== Methods for Comparing
  *
@@ -6984,16 +7311,16 @@ static const rb_data_type_t env_data_type = {
  *  - #key: Returns the key for the first-found entry with a given value.
  *  - #keys: Returns an array containing all keys in +self+.
  *  - #rassoc: Returns a 2-element array consisting of the key and value
-      of the first-found entry having a given value.
+ *    of the first-found entry having a given value.
  *  - #values: Returns an array containing all values in +self+/
  *  - #values_at: Returns an array containing values for given keys.
  *
  *  ==== Methods for Assigning
  *
- *  - #[]=, #store: Associates a given key with a given value.
+ *  - #[]= (aliased as #store): Associates a given key with a given value.
  *  - #merge: Returns the hash formed by merging each given hash into a copy of +self+.
- *  - #merge!, #update: Merges each given hash into +self+.
- *  - #replace: Replaces the entire contents of +self+ with the contents of a given hash.
+ *  - #update (aliased as #merge!): Merges each given hash into +self+.
+ *  - #replace (aliased as #initialize_copy): Replaces the entire contents of +self+ with the contents of a given hash.
  *
  *  ==== Methods for Deleting
  *
@@ -7003,7 +7330,7 @@ static const rb_data_type_t env_data_type = {
  *  - #compact!: Removes all +nil+-valued entries from +self+.
  *  - #delete: Removes the entry for a given key.
  *  - #delete_if: Removes entries selected by a given block.
- *  - #filter!, #select!: Keep only those entries selected by a given block.
+ *  - #select! (aliased as #filter!): Keep only those entries selected by a given block.
  *  - #keep_if: Keep only those entries selected by a given block.
  *  - #reject!: Removes entries selected by a given block.
  *  - #shift: Removes and returns the first entry.
@@ -7012,36 +7339,35 @@ static const rb_data_type_t env_data_type = {
  *
  *  - #compact: Returns a copy of +self+ with all +nil+-valued entries removed.
  *  - #except: Returns a copy of +self+ with entries removed for specified keys.
- *  - #filter, #select: Returns a copy of +self+ with only those entries selected by a given block.
+ *  - #select (aliased as #filter): Returns a copy of +self+ with only those entries selected by a given block.
  *  - #reject: Returns a copy of +self+ with entries removed as specified by a given block.
  *  - #slice: Returns a hash containing the entries for given keys.
  *
  *  ==== Methods for Iterating
- *  - #each, #each_pair: Calls a given block with each key-value pair.
+ *  - #each_pair (aliased as #each): Calls a given block with each key-value pair.
  *  - #each_key: Calls a given block with each key.
  *  - #each_value: Calls a given block with each value.
  *
  *  ==== Methods for Converting
  *
- *  - #inspect, #to_s: Returns a new String containing the hash entries.
+ *  - #flatten: Returns an array that is a 1-dimensional flattening of +self+.
+ *  - #inspect (aliased as #to_s): Returns a new String containing the hash entries.
  *  - #to_a: Returns a new array of 2-element arrays;
  *    each nested array contains a key-value pair from +self+.
- *  - #to_h: Returns +self+ if a \Hash;
- *    if a subclass of \Hash, returns a \Hash containing the entries from +self+.
+ *  - #to_h: Returns +self+ if a +Hash+;
+ *    if a subclass of +Hash+, returns a +Hash+ containing the entries from +self+.
  *  - #to_hash: Returns +self+.
  *  - #to_proc: Returns a proc that maps a given key to its value.
  *
  *  ==== Methods for Transforming Keys and Values
  *
+ *  - #flatten!: Returns +self+, flattened.
+ *  - #invert: Returns a hash with the each key-value pair inverted.
  *  - #transform_keys: Returns a copy of +self+ with modified keys.
  *  - #transform_keys!: Modifies keys in +self+
  *  - #transform_values: Returns a copy of +self+ with modified values.
  *  - #transform_values!: Modifies values in +self+.
  *
- *  ==== Other Methods
- *  - #flatten: Returns an array that is a 1-dimensional flattening of +self+.
- *  - #invert: Returns a hash with the each key-value pair inverted.
- *
  */
 
 void
@@ -7058,9 +7384,9 @@ Init_Hash(void)
     rb_define_alloc_func(rb_cHash, empty_hash_alloc);
     rb_define_singleton_method(rb_cHash, "[]", rb_hash_s_create, -1);
     rb_define_singleton_method(rb_cHash, "try_convert", rb_hash_s_try_convert, 1);
-    rb_define_method(rb_cHash, "initialize", rb_hash_initialize, -1);
     rb_define_method(rb_cHash, "initialize_copy", rb_hash_replace, 1);
     rb_define_method(rb_cHash, "rehash", rb_hash_rehash, 0);
+    rb_define_method(rb_cHash, "freeze", rb_hash_freeze, 0);
 
     rb_define_method(rb_cHash, "to_hash", rb_hash_to_hash, 0);
     rb_define_method(rb_cHash, "to_h", rb_hash_to_h, 0);
@@ -7147,17 +7473,20 @@ Init_Hash(void)
     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);
 
+    rb_cHash_empty_frozen = rb_hash_freeze(rb_hash_new());
+    rb_vm_register_global_object(rb_cHash_empty_frozen);
+
     /* Document-class: ENV
      *
-     * \ENV is a hash-like accessor for environment variables.
+     * +ENV+ is a hash-like accessor for environment variables.
      *
      * === Interaction with the Operating System
      *
-     * The \ENV object interacts with the operating system's environment variables:
+     * The +ENV+ object interacts with the operating system's environment variables:
      *
-     * - When you get the value for a name in \ENV, the value is retrieved from among the current environment variables.
-     * - When you create or set a name-value pair in \ENV, the name and value are immediately set in the environment variables.
-     * - When you delete a name-value pair in \ENV, it is immediately deleted from the environment variables.
+     * - When you get the value for a name in +ENV+, the value is retrieved from among the current environment variables.
+     * - When you create or set a name-value pair in +ENV+, the name and value are immediately set in the environment variables.
+     * - When you delete a name-value pair in +ENV+, it is immediately deleted from the environment variables.
      *
      * === Names and Values
      *
@@ -7207,33 +7536,33 @@ Init_Hash(void)
      *
      * === About Ordering
      *
-     * \ENV enumerates its name/value pairs in the order found
+     * +ENV+ enumerates its name/value pairs in the order found
      * in the operating system's environment variables.
-     * Therefore the ordering of \ENV content is OS-dependent, and may be indeterminate.
+     * Therefore the ordering of +ENV+ content is OS-dependent, and may be indeterminate.
      *
      * This will be seen in:
-     * - A Hash returned by an \ENV method.
-     * - An Enumerator returned by an \ENV method.
+     * - A Hash returned by an +ENV+ method.
+     * - An Enumerator returned by an +ENV+ method.
      * - An Array returned by ENV.keys, ENV.values, or ENV.to_a.
      * - The String returned by ENV.inspect.
      * - The Array returned by ENV.shift.
      * - The name returned by ENV.key.
      *
      * === About the Examples
-     * Some methods in \ENV return \ENV itself. Typically, there are many environment variables.
-     * It's not useful to display a large \ENV in the examples here,
-     * so most example snippets begin by resetting the contents of \ENV:
-     * - ENV.replace replaces \ENV with a new collection of entries.
-     * - ENV.clear empties \ENV.
+     * Some methods in +ENV+ return +ENV+ itself. Typically, there are many environment variables.
+     * It's not useful to display a large +ENV+ in the examples here,
+     * so most example snippets begin by resetting the contents of +ENV+:
+     * - ENV.replace replaces +ENV+ with a new collection of entries.
+     * - ENV.clear empties +ENV+.
      *
-     * == What's Here
+     * === What's Here
      *
-     * First, what's elsewhere. \Class \ENV:
+     * First, what's elsewhere. Class +ENV+:
      *
      * - Inherits from {class Object}[rdoc-ref:Object@What-27s+Here].
      * - Extends {module Enumerable}[rdoc-ref:Enumerable@What-27s+Here],
      *
-     * Here, class \ENV provides methods that are useful for:
+     * Here, class +ENV+ provides methods that are useful for:
      *
      * - {Querying}[rdoc-ref:ENV@Methods+for+Querying]
      * - {Assigning}[rdoc-ref:ENV@Methods+for+Assigning]
@@ -7242,26 +7571,26 @@ Init_Hash(void)
      * - {Converting}[rdoc-ref:ENV@Methods+for+Converting]
      * - {And more ....}[rdoc-ref:ENV@More+Methods]
      *
-     * === Methods for Querying
+     * ==== Methods for Querying
      *
      * - ::[]: Returns the value for the given environment variable name if it exists:
-     * - ::empty?: Returns whether \ENV is empty.
-     * - ::has_value?, ::value?: Returns whether the given value is in \ENV.
+     * - ::empty?: Returns whether +ENV+ is empty.
+     * - ::has_value?, ::value?: Returns whether the given value is in +ENV+.
      * - ::include?, ::has_key?, ::key?, ::member?: Returns whether the given name
-         is in \ENV.
+         is in +ENV+.
      * - ::key: Returns the name of the first entry with the given value.
      * - ::size, ::length: Returns the number of entries.
      * - ::value?: Returns whether any entry has the given value.
      *
-     * === Methods for Assigning
+     * ==== Methods for Assigning
      *
      * - ::[]=, ::store: Creates, updates, or deletes the named environment variable.
-     * - ::clear: Removes every environment variable; returns \ENV:
-     * - ::update, ::merge!: Adds to \ENV each key/value pair in the given hash.
-     * - ::replace: Replaces the entire content of the \ENV
+     * - ::clear: Removes every environment variable; returns +ENV+:
+     * - ::update, ::merge!: Adds to +ENV+ each key/value pair in the given hash.
+     * - ::replace: Replaces the entire content of the +ENV+
      *   with the name/value pairs in the given hash.
      *
-     * === Methods for Deleting
+     * ==== Methods for Deleting
      *
      * - ::delete: Deletes the named environment variable name if it exists.
      * - ::delete_if: Deletes entries selected by the block.
@@ -7270,22 +7599,22 @@ Init_Hash(void)
      * - ::select!, ::filter!: Deletes entries selected by the block.
      * - ::shift: Removes and returns the first entry.
      *
-     * === Methods for Iterating
+     * ==== Methods for Iterating
      *
      * - ::each, ::each_pair: Calls the block with each name/value pair.
      * - ::each_key: Calls the block with each name.
      * - ::each_value: Calls the block with each value.
      *
-     * === Methods for Converting
+     * ==== Methods for Converting
      *
      * - ::assoc: Returns a 2-element array containing the name and value
      *   of the named environment variable if it exists:
-     * - ::clone: Returns \ENV (and issues a warning).
+     * - ::clone: Returns +ENV+ (and issues a warning).
      * - ::except: Returns a hash of all name/value pairs except those given.
      * - ::fetch: Returns the value for the given name.
-     * - ::inspect: Returns the contents of \ENV as a string.
-     * - ::invert: Returns a hash whose keys are the \ENV values,
-         and whose values are the corresponding \ENV names.
+     * - ::inspect: Returns the contents of +ENV+ as a string.
+     * - ::invert: Returns a hash whose keys are the +ENV+ values,
+         and whose values are the corresponding +ENV+ names.
      * - ::keys: Returns an array of all names.
      * - ::rassoc: Returns the name and value of the first found entry
      *   that has the given value.
@@ -7299,11 +7628,11 @@ Init_Hash(void)
      * - ::values: Returns all values as an array.
      * - ::values_at: Returns an array of the values for the given name.
      *
-     * === More Methods
+     * ==== More Methods
      *
      * - ::dup: Raises an exception.
      * - ::freeze: Raises an exception.
-     * - ::rehash: Returns +nil+, without modifying \ENV.
+     * - ::rehash: Returns +nil+, without modifying +ENV+.
      *
      */
 
@@ -7374,14 +7703,13 @@ Init_Hash(void)
     rb_undef_method(envtbl_class, "initialize_dup");
 
     /*
-     * \ENV is a Hash-like accessor for environment variables.
+     * +ENV+ is a Hash-like accessor for environment variables.
      *
      * See ENV (the class) for more details.
      */
     rb_define_global_const("ENV", envtbl);
 
-    /* for callcc */
-    ruby_register_rollback_func_for_ensure(hash_foreach_ensure, hash_foreach_ensure_rollback);
-
     HASH_ASSERT(sizeof(ar_hint_t) * RHASH_AR_TABLE_MAX_SIZE == sizeof(VALUE));
 }
+
+#include "hash.rbinc"
diff --git a/hash.rb b/hash.rb
new file mode 100644
index 00000000000000..99b34a9bda6a8b
--- /dev/null
+++ b/hash.rb
@@ -0,0 +1,40 @@
+class Hash
+  # call-seq:
+  #   Hash.new(default_value = nil, capacity: 0) -> new_hash
+  #   Hash.new(capacity: 0) {|self, key| ... } -> new_hash
+  #
+  # Returns a new empty \Hash object.
+  #
+  # Initializes the values of Hash#default and Hash#default_proc,
+  # which determine the behavior when a given key is not found;
+  # see {Key Not Found?}[rdoc-ref:Hash@Key+Not+Found-3F].
+  #
+  # By default, a hash has +nil+ values for both +default+ and +default_proc+:
+  #
+  #   h = Hash.new        # => {}
+  #   h.default           # => nil
+  #   h.default_proc      # => nil
+  #
+  # With argument +default_value+ given, sets the +default+ value for the hash:
+  #
+  #   h = Hash.new(false) # => {}
+  #   h.default           # => false
+  #   h.default_proc      # => nil
+  #
+  # With a block given, sets the +default_proc+ value:
+  #
+  #   h = Hash.new {|hash, key| "Hash #{hash}: Default value for #{key}" }
+  #   h.default      # => nil
+  #   h.default_proc # => #<Proc:0x00000289b6fa7048 (irb):185>
+  #   h[:nosuch]     # => "Hash {}: Default value for nosuch"
+  #
+  # Raises ArgumentError if both +default_value+ and a block are given.
+  #
+  # If optional keyword argument +capacity+ is given with a positive integer value +n+,
+  # initializes the hash with enough capacity to accommodate +n+ entries without resizing.
+  #
+  # See also {Methods for Creating a Hash}[rdoc-ref:Hash@Methods+for+Creating+a+Hash].
+  def initialize(ifnone = (ifnone_unset = true), capacity: 0, &block)
+    Primitive.rb_hash_init(capacity, ifnone_unset, ifnone, block)
+  end
+end
diff --git a/hrtime.h b/hrtime.h
index 7ed4e6b04cbfeb..2ca7b0c088e15a 100644
--- a/hrtime.h
+++ b/hrtime.h
@@ -6,6 +6,8 @@
 #  include <sys/time.h>
 #endif
 
+#include "internal/compilers.h"
+
 /*
  * Hi-res monotonic clock.  It is currently nsec resolution, which has over
  * 500 years of range (with an unsigned 64-bit integer).  Developers
@@ -61,7 +63,11 @@ rb_hrtime_mul(rb_hrtime_t a, rb_hrtime_t b)
 {
     rb_hrtime_t c;
 
-#ifdef HAVE_BUILTIN___BUILTIN_MUL_OVERFLOW
+#ifdef ckd_mul
+    if (ckd_mul(&c, a, b))
+        return RB_HRTIME_MAX;
+
+#elif __has_builtin(__builtin_mul_overflow)
     if (__builtin_mul_overflow(a, b, &c))
         return RB_HRTIME_MAX;
 #else
@@ -81,7 +87,11 @@ rb_hrtime_add(rb_hrtime_t a, rb_hrtime_t b)
 {
     rb_hrtime_t c;
 
-#ifdef HAVE_BUILTIN___BUILTIN_ADD_OVERFLOW
+#ifdef ckd_add
+    if (ckd_add(&c, a, b))
+        return RB_HRTIME_MAX;
+
+#elif __has_builtin(__builtin_add_overflow)
     if (__builtin_add_overflow(a, b, &c))
         return RB_HRTIME_MAX;
 #else
diff --git a/id_table.c b/id_table.c
index 650721c670accf..4c9ebf123b3089 100644
--- a/id_table.c
+++ b/id_table.c
@@ -80,9 +80,10 @@ round_capa(int capa)
     return (capa + 1) << 2;
 }
 
-static struct rb_id_table *
-rb_id_table_init(struct rb_id_table *tbl, int capa)
+struct rb_id_table *
+rb_id_table_init(struct rb_id_table *tbl, size_t s_capa)
 {
+    int capa = (int)s_capa;
     MEMZERO(tbl, struct rb_id_table, 1);
     if (capa > 0) {
         capa = round_capa(capa);
@@ -96,7 +97,13 @@ struct rb_id_table *
 rb_id_table_create(size_t capa)
 {
     struct rb_id_table *tbl = ALLOC(struct rb_id_table);
-    return rb_id_table_init(tbl, (int)capa);
+    return rb_id_table_init(tbl, capa);
+}
+
+void
+rb_id_table_free_items(struct rb_id_table *tbl)
+{
+    xfree(tbl->items);
 }
 
 void
@@ -150,7 +157,7 @@ hash_table_raw_insert(struct rb_id_table *tbl, id_key_t key, VALUE val)
     int mask = tbl->capa - 1;
     int ix = key & mask;
     int d = 1;
-    assert(key != 0);
+    RUBY_ASSERT(key != 0);
     while (ITEM_KEY_ISSET(tbl, ix)) {
         ITEM_SET_COLLIDED(tbl, ix);
         ix = (ix + d) & mask;
@@ -276,7 +283,7 @@ rb_id_table_foreach(struct rb_id_table *tbl, rb_id_table_foreach_func_t *func, v
         if (ITEM_KEY_ISSET(tbl, i)) {
             const id_key_t key = ITEM_GET_KEY(tbl, i);
             enum rb_id_table_iterator_result ret = (*func)(key2id(key), tbl->items[i].val, data);
-            assert(key != 0);
+            RUBY_ASSERT(key != 0);
 
             if (ret == ID_TABLE_DELETE)
                 hash_delete_index(tbl, i);
@@ -324,3 +331,99 @@ rb_id_table_foreach_values_with_replace(struct rb_id_table *tbl, rb_id_table_for
     }
 }
 
+static void
+managed_id_table_free(void *data)
+{
+    struct rb_id_table *tbl = (struct rb_id_table *)data;
+    rb_id_table_free_items(tbl);
+}
+
+static size_t
+managed_id_table_memsize(const void *data)
+{
+    const struct rb_id_table *tbl = (const struct rb_id_table *)data;
+    return rb_id_table_memsize(tbl) - sizeof(struct rb_id_table);
+}
+
+static const rb_data_type_t managed_id_table_type = {
+    .wrap_struct_name = "VM/managed_id_table",
+    .function = {
+        .dmark = NULL, // Nothing to mark
+        .dfree = (RUBY_DATA_FUNC)managed_id_table_free,
+        .dsize = managed_id_table_memsize,
+    },
+    .flags = RUBY_TYPED_FREE_IMMEDIATELY | RUBY_TYPED_WB_PROTECTED | RUBY_TYPED_EMBEDDABLE,
+};
+
+static inline struct rb_id_table *
+managed_id_table_ptr(VALUE obj)
+{
+    return RTYPEDDATA_GET_DATA(obj);
+}
+
+VALUE
+rb_managed_id_table_new(size_t capa)
+{
+    struct rb_id_table *tbl;
+    VALUE obj = TypedData_Make_Struct(0, struct rb_id_table, &managed_id_table_type, tbl);
+    rb_id_table_init(tbl, capa);
+    return obj;
+}
+
+static enum rb_id_table_iterator_result
+managed_id_table_dup_i(ID id, VALUE val, void *data)
+{
+    struct rb_id_table *new_tbl = (struct rb_id_table *)data;
+    rb_id_table_insert(new_tbl, id, val);
+    return ID_TABLE_CONTINUE;
+}
+
+VALUE
+rb_managed_id_table_dup(VALUE old_table)
+{
+    RUBY_ASSERT(RB_TYPE_P(old_table, T_DATA));
+    RUBY_ASSERT(rb_typeddata_inherited_p(RTYPEDDATA_TYPE(old_table), &managed_id_table_type));
+
+    struct rb_id_table *new_tbl;
+    VALUE obj = TypedData_Make_Struct(0, struct rb_id_table, &managed_id_table_type, new_tbl);
+    struct rb_id_table *old_tbl = RTYPEDDATA_GET_DATA(old_table);
+    rb_id_table_init(new_tbl, old_tbl->num + 1);
+    rb_id_table_foreach(old_tbl, managed_id_table_dup_i, new_tbl);
+    return obj;
+}
+
+int
+rb_managed_id_table_lookup(VALUE table, ID id, VALUE *valp)
+{
+    RUBY_ASSERT(RB_TYPE_P(table, T_DATA));
+    RUBY_ASSERT(rb_typeddata_inherited_p(RTYPEDDATA_TYPE(table), &managed_id_table_type));
+
+    return rb_id_table_lookup(RTYPEDDATA_GET_DATA(table), id, valp);
+}
+
+int
+rb_managed_id_table_insert(VALUE table, ID id, VALUE val)
+{
+    RUBY_ASSERT(RB_TYPE_P(table, T_DATA));
+    RUBY_ASSERT(rb_typeddata_inherited_p(RTYPEDDATA_TYPE(table), &managed_id_table_type));
+
+    return rb_id_table_insert(RTYPEDDATA_GET_DATA(table), id, val);
+}
+
+size_t
+rb_managed_id_table_size(VALUE table)
+{
+    RUBY_ASSERT(RB_TYPE_P(table, T_DATA));
+    RUBY_ASSERT(rb_typeddata_inherited_p(RTYPEDDATA_TYPE(table), &managed_id_table_type));
+
+    return rb_id_table_size(RTYPEDDATA_GET_DATA(table));
+}
+
+void
+rb_managed_id_table_foreach(VALUE table, rb_id_table_foreach_func_t *func, void *data)
+{
+    RUBY_ASSERT(RB_TYPE_P(table, T_DATA));
+    RUBY_ASSERT(rb_typeddata_inherited_p(RTYPEDDATA_TYPE(table), &managed_id_table_type));
+
+    rb_id_table_foreach(RTYPEDDATA_GET_DATA(table), func, data);
+}
diff --git a/id_table.h b/id_table.h
index f72e2d1d92ce7a..3e8d82e64af98a 100644
--- a/id_table.h
+++ b/id_table.h
@@ -16,7 +16,10 @@ enum rb_id_table_iterator_result {
 };
 
 struct rb_id_table *rb_id_table_create(size_t size);
+struct rb_id_table *rb_id_table_init(struct rb_id_table *tbl, size_t capa);
+
 void rb_id_table_free(struct rb_id_table *tbl);
+void rb_id_table_free_items(struct rb_id_table *tbl);
 void rb_id_table_clear(struct rb_id_table *tbl);
 
 size_t rb_id_table_memsize(const struct rb_id_table *tbl);
@@ -32,6 +35,13 @@ void rb_id_table_foreach(struct rb_id_table *tbl, rb_id_table_foreach_func_t *fu
 void rb_id_table_foreach_values(struct rb_id_table *tbl, rb_id_table_foreach_values_func_t *func, void *data);
 void rb_id_table_foreach_values_with_replace(struct rb_id_table *tbl, rb_id_table_foreach_values_func_t *func, rb_id_table_update_value_callback_func_t *replace, void *data);
 
+VALUE rb_managed_id_table_new(size_t capa);
+VALUE rb_managed_id_table_dup(VALUE table);
+int rb_managed_id_table_insert(VALUE table, ID id, VALUE val);
+int rb_managed_id_table_lookup(VALUE table, ID id, VALUE *valp);
+size_t rb_managed_id_table_size(VALUE table);
+void rb_managed_id_table_foreach(VALUE table, rb_id_table_foreach_func_t *func, void *data);
+
 RUBY_SYMBOL_EXPORT_BEGIN
 size_t rb_id_table_size(const struct rb_id_table *tbl);
 RUBY_SYMBOL_EXPORT_END
diff --git a/imemo.c b/imemo.c
new file mode 100644
index 00000000000000..7ab867e647bb9b
--- /dev/null
+++ b/imemo.c
@@ -0,0 +1,685 @@
+
+#include "constant.h"
+#include "id_table.h"
+#include "internal.h"
+#include "internal/imemo.h"
+#include "internal/st.h"
+#include "vm_callinfo.h"
+
+size_t rb_iseq_memsize(const rb_iseq_t *iseq);
+void rb_iseq_mark_and_move(rb_iseq_t *iseq, bool reference_updating);
+void rb_iseq_free(const rb_iseq_t *iseq);
+
+const char *
+rb_imemo_name(enum imemo_type type)
+{
+    // put no default case to get a warning if an imemo type is missing
+    switch (type) {
+#define IMEMO_NAME(x) case imemo_##x: return #x;
+        IMEMO_NAME(ast);
+        IMEMO_NAME(callcache);
+        IMEMO_NAME(callinfo);
+        IMEMO_NAME(constcache);
+        IMEMO_NAME(cref);
+        IMEMO_NAME(env);
+        IMEMO_NAME(ifunc);
+        IMEMO_NAME(iseq);
+        IMEMO_NAME(memo);
+        IMEMO_NAME(ment);
+        IMEMO_NAME(parser_strterm);
+        IMEMO_NAME(svar);
+        IMEMO_NAME(throw_data);
+        IMEMO_NAME(tmpbuf);
+        IMEMO_NAME(fields);
+#undef IMEMO_NAME
+    }
+    rb_bug("unreachable");
+}
+
+/* =========================================================================
+ * allocation
+ * ========================================================================= */
+
+VALUE
+rb_imemo_new(enum imemo_type type, VALUE v0, size_t size)
+{
+    VALUE flags = T_IMEMO | FL_WB_PROTECTED | (type << FL_USHIFT);
+    NEWOBJ_OF(obj, void, v0, flags, size, 0);
+
+    return (VALUE)obj;
+}
+
+static rb_imemo_tmpbuf_t *
+rb_imemo_tmpbuf_new(void)
+{
+    size_t size = sizeof(struct rb_imemo_tmpbuf_struct);
+    VALUE flags = T_IMEMO | (imemo_tmpbuf << FL_USHIFT);
+    NEWOBJ_OF(obj, struct rb_imemo_tmpbuf_struct, 0, flags, size, 0);
+
+    return obj;
+}
+
+void *
+rb_alloc_tmp_buffer_with_count(volatile VALUE *store, size_t size, size_t cnt)
+{
+    void *ptr;
+    rb_imemo_tmpbuf_t *tmpbuf;
+
+    /* Keep the order; allocate an empty imemo first then xmalloc, to
+     * get rid of potential memory leak */
+    tmpbuf = rb_imemo_tmpbuf_new();
+    *store = (VALUE)tmpbuf;
+    ptr = ruby_xmalloc(size);
+    tmpbuf->ptr = ptr;
+    tmpbuf->cnt = cnt;
+
+    return ptr;
+}
+
+void *
+rb_alloc_tmp_buffer(volatile VALUE *store, long len)
+{
+    long cnt;
+
+    if (len < 0 || (cnt = (long)roomof(len, sizeof(VALUE))) < 0) {
+        rb_raise(rb_eArgError, "negative buffer size (or size too big)");
+    }
+
+    return rb_alloc_tmp_buffer_with_count(store, len, cnt);
+}
+
+void
+rb_free_tmp_buffer(volatile VALUE *store)
+{
+    rb_imemo_tmpbuf_t *s = (rb_imemo_tmpbuf_t*)ATOMIC_VALUE_EXCHANGE(*store, 0);
+    if (s) {
+        void *ptr = ATOMIC_PTR_EXCHANGE(s->ptr, 0);
+        s->cnt = 0;
+        ruby_xfree(ptr);
+    }
+}
+
+rb_imemo_tmpbuf_t *
+rb_imemo_tmpbuf_parser_heap(void *buf, rb_imemo_tmpbuf_t *old_heap, size_t cnt)
+{
+    rb_imemo_tmpbuf_t *tmpbuf = rb_imemo_tmpbuf_new();
+    tmpbuf->ptr = buf;
+    tmpbuf->next = old_heap;
+    tmpbuf->cnt = cnt;
+
+    return tmpbuf;
+}
+
+static VALUE
+imemo_fields_new(VALUE klass, size_t capa)
+{
+    size_t embedded_size = offsetof(struct rb_fields, as.embed) + capa * sizeof(VALUE);
+    if (rb_gc_size_allocatable_p(embedded_size)) {
+        VALUE fields = rb_imemo_new(imemo_fields, klass, embedded_size);
+        RUBY_ASSERT(IMEMO_TYPE_P(fields, imemo_fields));
+        return fields;
+    }
+    else {
+        VALUE fields = rb_imemo_new(imemo_fields, klass, sizeof(struct rb_fields));
+        FL_SET_RAW(fields, OBJ_FIELD_EXTERNAL);
+        IMEMO_OBJ_FIELDS(fields)->as.external.ptr = ALLOC_N(VALUE, capa);
+        return fields;
+    }
+}
+
+VALUE
+rb_imemo_fields_new(VALUE klass, size_t capa)
+{
+    return imemo_fields_new(klass, capa);
+}
+
+static VALUE
+imemo_fields_new_complex(VALUE klass, size_t capa)
+{
+    VALUE fields = imemo_fields_new(klass, sizeof(struct rb_fields));
+    IMEMO_OBJ_FIELDS(fields)->as.complex.table = st_init_numtable_with_size(capa);
+    return fields;
+}
+
+VALUE
+rb_imemo_fields_new_complex(VALUE klass, size_t capa)
+{
+    return imemo_fields_new_complex(klass, capa);
+}
+
+static int
+imemo_fields_trigger_wb_i(st_data_t key, st_data_t value, st_data_t arg)
+{
+    VALUE field_obj = (VALUE)arg;
+    RB_OBJ_WRITTEN(field_obj, Qundef, (VALUE)value);
+    return ST_CONTINUE;
+}
+
+static int
+imemo_fields_complex_wb_i(st_data_t key, st_data_t value, st_data_t arg)
+{
+    RB_OBJ_WRITTEN((VALUE)arg, Qundef, (VALUE)value);
+    return ST_CONTINUE;
+}
+
+VALUE
+rb_imemo_fields_new_complex_tbl(VALUE klass, st_table *tbl)
+{
+    VALUE fields = imemo_fields_new(klass, sizeof(struct rb_fields));
+    IMEMO_OBJ_FIELDS(fields)->as.complex.table = tbl;
+    st_foreach(tbl, imemo_fields_trigger_wb_i, (st_data_t)fields);
+    return fields;
+}
+
+VALUE
+rb_imemo_fields_clone(VALUE fields_obj)
+{
+    shape_id_t shape_id = RBASIC_SHAPE_ID(fields_obj);
+    VALUE clone;
+
+    if (rb_shape_too_complex_p(shape_id)) {
+        clone = rb_imemo_fields_new_complex(CLASS_OF(fields_obj), 0);
+        RBASIC_SET_SHAPE_ID(clone, shape_id);
+        st_table *src_table = rb_imemo_fields_complex_tbl(fields_obj);
+        st_table *dest_table = rb_imemo_fields_complex_tbl(clone);
+        st_replace(dest_table, src_table);
+        st_foreach(dest_table, imemo_fields_complex_wb_i, (st_data_t)clone);
+    }
+    else {
+        clone = imemo_fields_new(CLASS_OF(fields_obj), RSHAPE_CAPACITY(shape_id));
+        RBASIC_SET_SHAPE_ID(clone, shape_id);
+        VALUE *fields = rb_imemo_fields_ptr(clone);
+        attr_index_t fields_count = RSHAPE_LEN(shape_id);
+        MEMCPY(fields, rb_imemo_fields_ptr(fields_obj), VALUE, fields_count);
+        for (attr_index_t i = 0; i < fields_count; i++) {
+            RB_OBJ_WRITTEN(clone, Qundef, fields[i]);
+        }
+    }
+
+    return clone;
+}
+
+void
+rb_imemo_fields_clear(VALUE fields_obj)
+{
+    // When replacing an imemo/fields by another one, we must clear
+    // its shape so that gc.c:obj_free_object_id won't be called.
+    if (rb_shape_obj_too_complex_p(fields_obj)) {
+        RBASIC_SET_SHAPE_ID(fields_obj, ROOT_TOO_COMPLEX_SHAPE_ID);
+    }
+    else {
+        RBASIC_SET_SHAPE_ID(fields_obj, ROOT_SHAPE_ID);
+    }
+}
+
+/* =========================================================================
+ * memsize
+ * ========================================================================= */
+
+size_t
+rb_imemo_memsize(VALUE obj)
+{
+    size_t size = 0;
+    switch (imemo_type(obj)) {
+      case imemo_ast:
+        rb_bug("imemo_ast is obsolete");
+
+        break;
+      case imemo_callcache:
+        break;
+      case imemo_callinfo:
+        break;
+      case imemo_constcache:
+        break;
+      case imemo_cref:
+        break;
+      case imemo_env:
+        size += ((rb_env_t *)obj)->env_size * sizeof(VALUE);
+
+        break;
+      case imemo_ifunc:
+        break;
+      case imemo_iseq:
+        size += rb_iseq_memsize((rb_iseq_t *)obj);
+
+        break;
+      case imemo_memo:
+        break;
+      case imemo_ment:
+        size += sizeof(((rb_method_entry_t *)obj)->def);
+
+        break;
+      case imemo_parser_strterm:
+        break;
+      case imemo_svar:
+        break;
+      case imemo_throw_data:
+        break;
+      case imemo_tmpbuf:
+        size += ((rb_imemo_tmpbuf_t *)obj)->cnt * sizeof(VALUE);
+
+        break;
+      case imemo_fields:
+        if (rb_shape_obj_too_complex_p(obj)) {
+            size += st_memsize(IMEMO_OBJ_FIELDS(obj)->as.complex.table);
+        }
+        else if (FL_TEST_RAW(obj, OBJ_FIELD_EXTERNAL)) {
+            size += RSHAPE_CAPACITY(RBASIC_SHAPE_ID(obj)) * sizeof(VALUE);
+        }
+        break;
+      default:
+        rb_bug("unreachable");
+    }
+
+    return size;
+}
+
+/* =========================================================================
+ * mark
+ * ========================================================================= */
+
+static bool
+moved_or_living_object_strictly_p(VALUE obj)
+{
+    return obj && (!rb_objspace_garbage_object_p(obj) || BUILTIN_TYPE(obj) == T_MOVED);
+}
+
+static void
+mark_and_move_method_entry(rb_method_entry_t *ment, bool reference_updating)
+{
+    rb_method_definition_t *def = ment->def;
+
+    rb_gc_mark_and_move(&ment->owner);
+    rb_gc_mark_and_move(&ment->defined_class);
+
+    if (def) {
+        switch (def->type) {
+          case VM_METHOD_TYPE_ISEQ:
+            if (def->body.iseq.iseqptr) {
+                rb_gc_mark_and_move_ptr(&def->body.iseq.iseqptr);
+            }
+            rb_gc_mark_and_move_ptr(&def->body.iseq.cref);
+
+            if (!reference_updating) {
+                if (def->iseq_overload && ment->defined_class) {
+                    // it can be a key of "overloaded_cme" table
+                    // so it should be pinned.
+                    rb_gc_mark((VALUE)ment);
+                }
+            }
+            break;
+          case VM_METHOD_TYPE_ATTRSET:
+          case VM_METHOD_TYPE_IVAR:
+            rb_gc_mark_and_move(&def->body.attr.location);
+            break;
+          case VM_METHOD_TYPE_BMETHOD:
+            rb_gc_mark_and_move(&def->body.bmethod.proc);
+            if (!reference_updating) {
+                if (def->body.bmethod.hooks) rb_hook_list_mark(def->body.bmethod.hooks);
+            }
+            break;
+          case VM_METHOD_TYPE_ALIAS:
+            rb_gc_mark_and_move_ptr(&def->body.alias.original_me);
+            return;
+          case VM_METHOD_TYPE_REFINED:
+            rb_gc_mark_and_move_ptr(&def->body.refined.orig_me);
+            break;
+          case VM_METHOD_TYPE_CFUNC:
+          case VM_METHOD_TYPE_ZSUPER:
+          case VM_METHOD_TYPE_MISSING:
+          case VM_METHOD_TYPE_OPTIMIZED:
+          case VM_METHOD_TYPE_UNDEF:
+          case VM_METHOD_TYPE_NOTIMPLEMENTED:
+            break;
+        }
+    }
+}
+
+void
+rb_imemo_mark_and_move(VALUE obj, bool reference_updating)
+{
+    switch (imemo_type(obj)) {
+      case imemo_ast:
+        rb_bug("imemo_ast is obsolete");
+
+        break;
+      case imemo_callcache: {
+        /* cc is callcache.
+         *
+         * cc->klass (klass) should not be marked because if the klass is
+         * free'ed, the cc->klass will be cleared by `vm_cc_invalidate()`.
+         *
+         * cc->cme (cme) should not be marked because if cc is invalidated
+         * when cme is free'ed.
+         * - klass marks cme if klass uses cme.
+         * - caller classe's ccs->cme marks cc->cme.
+         * - if cc is invalidated (klass doesn't refer the cc),
+         *   cc is invalidated by `vm_cc_invalidate()` and cc->cme is
+         *   not be accessed.
+         * - On the multi-Ractors, cme will be collected with global GC
+         *   so that it is safe if GC is not interleaving while accessing
+         *   cc and cme.
+         * - However, cc_type_super and cc_type_refinement are not chained
+         *   from ccs so cc->cme should be marked; the cme might be
+         *   reachable only through cc in these cases.
+         */
+        struct rb_callcache *cc = (struct rb_callcache *)obj;
+        if (reference_updating) {
+            if (!cc->klass) {
+                // already invalidated
+            }
+            else {
+                if (moved_or_living_object_strictly_p(cc->klass) &&
+                        moved_or_living_object_strictly_p((VALUE)cc->cme_)) {
+                    *((VALUE *)&cc->klass) = rb_gc_location(cc->klass);
+                    *((struct rb_callable_method_entry_struct **)&cc->cme_) =
+                        (struct rb_callable_method_entry_struct *)rb_gc_location((VALUE)cc->cme_);
+                }
+                else {
+                    vm_cc_invalidate(cc);
+                }
+            }
+        }
+        else {
+            if (cc->klass && (vm_cc_super_p(cc) || vm_cc_refinement_p(cc))) {
+                rb_gc_mark_movable((VALUE)cc->cme_);
+                rb_gc_mark_movable((VALUE)cc->klass);
+            }
+        }
+
+        break;
+      }
+      case imemo_callinfo:
+        break;
+      case imemo_constcache: {
+        struct iseq_inline_constant_cache_entry *ice = (struct iseq_inline_constant_cache_entry *)obj;
+
+        rb_gc_mark_and_move(&ice->value);
+
+        break;
+      }
+      case imemo_cref: {
+        rb_cref_t *cref = (rb_cref_t *)obj;
+
+        rb_gc_mark_and_move(&cref->klass_or_self);
+        rb_gc_mark_and_move_ptr(&cref->next);
+        rb_gc_mark_and_move(&cref->refinements);
+
+        break;
+      }
+      case imemo_env: {
+        rb_env_t *env = (rb_env_t *)obj;
+
+        if (LIKELY(env->ep)) {
+            // just after newobj() can be NULL here.
+            RUBY_ASSERT(rb_gc_location(env->ep[VM_ENV_DATA_INDEX_ENV]) == rb_gc_location(obj));
+            RUBY_ASSERT(reference_updating || VM_ENV_ESCAPED_P(env->ep));
+
+            for (unsigned int i = 0; i < env->env_size; i++) {
+                rb_gc_mark_and_move((VALUE *)&env->env[i]);
+            }
+
+            rb_gc_mark_and_move_ptr(&env->iseq);
+
+            if (reference_updating) {
+                ((VALUE *)env->ep)[VM_ENV_DATA_INDEX_ENV] = rb_gc_location(env->ep[VM_ENV_DATA_INDEX_ENV]);
+            }
+            else {
+                if (!VM_ENV_FLAGS(env->ep, VM_ENV_FLAG_WB_REQUIRED)) {
+                    VM_ENV_FLAGS_SET(env->ep, VM_ENV_FLAG_WB_REQUIRED);
+                }
+                rb_gc_mark_movable( (VALUE)rb_vm_env_prev_env(env));
+            }
+        }
+
+        break;
+      }
+      case imemo_ifunc: {
+        struct vm_ifunc *ifunc = (struct vm_ifunc *)obj;
+
+        if (!reference_updating) {
+            rb_gc_mark_maybe((VALUE)ifunc->data);
+        }
+
+        break;
+      }
+      case imemo_iseq:
+        rb_iseq_mark_and_move((rb_iseq_t *)obj, reference_updating);
+        break;
+      case imemo_memo: {
+        struct MEMO *memo = (struct MEMO *)obj;
+
+        rb_gc_mark_and_move((VALUE *)&memo->v1);
+        rb_gc_mark_and_move((VALUE *)&memo->v2);
+        if (!reference_updating) {
+            rb_gc_mark_maybe(memo->u3.value);
+        }
+
+        break;
+      }
+      case imemo_ment:
+        mark_and_move_method_entry((rb_method_entry_t *)obj, reference_updating);
+        break;
+      case imemo_parser_strterm:
+        break;
+      case imemo_svar: {
+        struct vm_svar *svar = (struct vm_svar *)obj;
+
+        rb_gc_mark_and_move((VALUE *)&svar->cref_or_me);
+        rb_gc_mark_and_move((VALUE *)&svar->lastline);
+        rb_gc_mark_and_move((VALUE *)&svar->backref);
+        rb_gc_mark_and_move((VALUE *)&svar->others);
+
+        break;
+      }
+      case imemo_throw_data: {
+        struct vm_throw_data *throw_data = (struct vm_throw_data *)obj;
+
+        rb_gc_mark_and_move((VALUE *)&throw_data->throw_obj);
+
+        break;
+      }
+      case imemo_tmpbuf: {
+        const rb_imemo_tmpbuf_t *m = (const rb_imemo_tmpbuf_t *)obj;
+
+        if (!reference_updating) {
+            do {
+                rb_gc_mark_locations(m->ptr, m->ptr + m->cnt);
+            } while ((m = m->next) != NULL);
+        }
+
+        break;
+      }
+      case imemo_fields: {
+        rb_gc_mark_and_move((VALUE *)&RBASIC(obj)->klass);
+
+        if (rb_shape_obj_too_complex_p(obj)) {
+            st_table *tbl = rb_imemo_fields_complex_tbl(obj);
+            if (reference_updating) {
+                rb_gc_ref_update_table_values_only(tbl);
+            }
+            else {
+                rb_mark_tbl_no_pin(tbl);
+            }
+        }
+        else {
+            VALUE *fields = rb_imemo_fields_ptr(obj);
+            attr_index_t len = RSHAPE_LEN(RBASIC_SHAPE_ID(obj));
+            for (attr_index_t i = 0; i < len; i++) {
+                rb_gc_mark_and_move(&fields[i]);
+            }
+        }
+        break;
+      }
+      default:
+        rb_bug("unreachable");
+    }
+}
+
+/* =========================================================================
+ * free
+ * ========================================================================= */
+
+static enum rb_id_table_iterator_result
+free_const_entry_i(VALUE value, void *data)
+{
+    rb_const_entry_t *ce = (rb_const_entry_t *)value;
+    xfree(ce);
+    return ID_TABLE_CONTINUE;
+}
+
+void
+rb_free_const_table(struct rb_id_table *tbl)
+{
+    rb_id_table_foreach_values(tbl, free_const_entry_i, 0);
+    rb_id_table_free(tbl);
+}
+
+// alive: if false, target pointers can be freed already.
+static void
+vm_ccs_free(struct rb_class_cc_entries *ccs, int alive, VALUE klass)
+{
+    if (ccs->entries) {
+        for (int i=0; i<ccs->len; i++) {
+            const struct rb_callcache *cc = ccs->entries[i].cc;
+            if (!alive) {
+                // ccs can be free'ed.
+                if (rb_gc_pointer_to_heap_p((VALUE)cc) &&
+                    !rb_objspace_garbage_object_p((VALUE)cc) &&
+                    IMEMO_TYPE_P(cc, imemo_callcache) &&
+                    cc->klass == klass) {
+                    // OK. maybe target cc.
+                }
+                else {
+                    continue;
+                }
+            }
+
+            VM_ASSERT(!vm_cc_super_p(cc) && !vm_cc_refinement_p(cc));
+            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, Qundef);
+}
+
+static enum rb_id_table_iterator_result
+cc_tbl_free_i(VALUE ccs_ptr, void *data)
+{
+    struct rb_class_cc_entries *ccs = (struct rb_class_cc_entries *)ccs_ptr;
+    VALUE klass = (VALUE)data;
+    VM_ASSERT(vm_ccs_p(ccs));
+
+    vm_ccs_free(ccs, false, klass);
+
+    return ID_TABLE_CONTINUE;
+}
+
+void
+rb_cc_tbl_free(struct rb_id_table *cc_tbl, VALUE klass)
+{
+    if (!cc_tbl) return;
+    rb_id_table_foreach_values(cc_tbl, cc_tbl_free_i, (void *)klass);
+    rb_id_table_free(cc_tbl);
+}
+
+static inline void
+imemo_fields_free(struct rb_fields *fields)
+{
+    if (rb_shape_obj_too_complex_p((VALUE)fields)) {
+        st_free_table(fields->as.complex.table);
+    }
+    else if (FL_TEST_RAW((VALUE)fields, OBJ_FIELD_EXTERNAL)) {
+        xfree(fields->as.external.ptr);
+    }
+}
+
+void
+rb_imemo_free(VALUE obj)
+{
+    switch (imemo_type(obj)) {
+      case imemo_ast:
+        rb_bug("imemo_ast is obsolete");
+
+        break;
+      case imemo_callcache:
+        RB_DEBUG_COUNTER_INC(obj_imemo_callcache);
+
+        break;
+      case imemo_callinfo:{
+        const struct rb_callinfo *ci = ((const struct rb_callinfo *)obj);
+
+        if (ci->kwarg) {
+            ((struct rb_callinfo_kwarg *)ci->kwarg)->references--;
+            if (ci->kwarg->references == 0) xfree((void *)ci->kwarg);
+        }
+        RB_DEBUG_COUNTER_INC(obj_imemo_callinfo);
+
+        break;
+      }
+      case imemo_constcache:
+        RB_DEBUG_COUNTER_INC(obj_imemo_constcache);
+
+        break;
+      case imemo_cref:
+        RB_DEBUG_COUNTER_INC(obj_imemo_cref);
+
+        break;
+      case imemo_env: {
+        rb_env_t *env = (rb_env_t *)obj;
+
+        RUBY_ASSERT(VM_ENV_ESCAPED_P(env->ep));
+        xfree((VALUE *)env->env);
+        RB_DEBUG_COUNTER_INC(obj_imemo_env);
+
+        break;
+      }
+      case imemo_ifunc:
+        RB_DEBUG_COUNTER_INC(obj_imemo_ifunc);
+        break;
+      case imemo_iseq:
+        rb_iseq_free((rb_iseq_t *)obj);
+        RB_DEBUG_COUNTER_INC(obj_imemo_iseq);
+
+        break;
+      case imemo_memo:
+        RB_DEBUG_COUNTER_INC(obj_imemo_memo);
+
+        break;
+      case imemo_ment:
+        rb_free_method_entry((rb_method_entry_t *)obj);
+        RB_DEBUG_COUNTER_INC(obj_imemo_ment);
+
+        break;
+      case imemo_parser_strterm:
+        RB_DEBUG_COUNTER_INC(obj_imemo_parser_strterm);
+
+        break;
+      case imemo_svar:
+        RB_DEBUG_COUNTER_INC(obj_imemo_svar);
+
+        break;
+      case imemo_throw_data:
+        RB_DEBUG_COUNTER_INC(obj_imemo_throw_data);
+
+        break;
+      case imemo_tmpbuf:
+        xfree(((rb_imemo_tmpbuf_t *)obj)->ptr);
+        RB_DEBUG_COUNTER_INC(obj_imemo_tmpbuf);
+
+        break;
+      case imemo_fields:
+        imemo_fields_free(IMEMO_OBJ_FIELDS(obj));
+        RB_DEBUG_COUNTER_INC(obj_imemo_fields);
+        break;
+      default:
+        rb_bug("unreachable");
+    }
+}
diff --git a/include/ruby/assert.h b/include/ruby/assert.h
index 0c052363bcf79a..acc5e5bbfc7a0b 100644
--- a/include/ruby/assert.h
+++ b/include/ruby/assert.h
@@ -22,6 +22,7 @@
  */
 #include "ruby/internal/assume.h"
 #include "ruby/internal/attr/cold.h"
+#include "ruby/internal/attr/format.h"
 #include "ruby/internal/attr/noreturn.h"
 #include "ruby/internal/cast.h"
 #include "ruby/internal/dllexport.h"
@@ -132,6 +133,11 @@ RBIMPL_SYMBOL_EXPORT_BEGIN()
 RBIMPL_ATTR_NORETURN()
 RBIMPL_ATTR_COLD()
 void rb_assert_failure(const char *file, int line, const char *name, const char *expr);
+
+RBIMPL_ATTR_NORETURN()
+RBIMPL_ATTR_COLD()
+RBIMPL_ATTR_FORMAT(RBIMPL_PRINTF_FORMAT, 5, 6)
+void rb_assert_failure_detail(const char *file, int line, const char *name, const char *expr, const char *fmt, ...);
 RBIMPL_SYMBOL_EXPORT_END()
 
 #ifdef RUBY_FUNCTION_NAME_STRING
@@ -147,8 +153,28 @@ RBIMPL_SYMBOL_EXPORT_END()
  *
  * @param  mesg  The message to display.
  */
-#define RUBY_ASSERT_FAIL(mesg) \
+#if defined(HAVE___VA_OPT__)
+# if RBIMPL_HAS_WARNING("-Wgnu-zero-variadic-macro-arguments")
+/* __VA_OPT__ is to be used for the zero variadic macro arguments
+ * cases. */
+RBIMPL_WARNING_IGNORED(-Wgnu-zero-variadic-macro-arguments)
+# endif
+# define RBIMPL_VA_OPT_ARGS(...) __VA_OPT__(,) __VA_ARGS__
+
+# define RUBY_ASSERT_FAIL(mesg, ...) \
+    rb_assert_failure##__VA_OPT__(_detail)( \
+        __FILE__, __LINE__, RBIMPL_ASSERT_FUNC, mesg RBIMPL_VA_OPT_ARGS(__VA_ARGS__))
+#elif !defined(__cplusplus)
+# define RBIMPL_VA_OPT_ARGS(...)
+
+# define RUBY_ASSERT_FAIL(mesg, ...) \
     rb_assert_failure(__FILE__, __LINE__, RBIMPL_ASSERT_FUNC, mesg)
+#else
+# undef RBIMPL_VA_OPT_ARGS
+
+# define RUBY_ASSERT_FAIL(mesg) \
+    rb_assert_failure(__FILE__, __LINE__, RBIMPL_ASSERT_FUNC, mesg)
+#endif
 
 /**
  * Asserts that the expression is truthy.  If not aborts with the message.
@@ -156,15 +182,25 @@ RBIMPL_SYMBOL_EXPORT_END()
  * @param  expr  What supposedly evaluates to true.
  * @param  mesg  The message to display on failure.
  */
-#define RUBY_ASSERT_MESG(expr, mesg) \
+#if defined(RBIMPL_VA_OPT_ARGS)
+# define RUBY_ASSERT_MESG(expr, ...) \
+    (RB_LIKELY(expr) ? RBIMPL_ASSERT_NOTHING : RUBY_ASSERT_FAIL(__VA_ARGS__))
+#else
+# define RUBY_ASSERT_MESG(expr, mesg) \
     (RB_LIKELY(expr) ? RBIMPL_ASSERT_NOTHING : RUBY_ASSERT_FAIL(mesg))
+#endif
 
 /**
  * A variant of #RUBY_ASSERT that does not interface with #RUBY_DEBUG.
  *
  * @copydetails #RUBY_ASSERT
  */
-#define RUBY_ASSERT_ALWAYS(expr) RUBY_ASSERT_MESG((expr), #expr)
+#if defined(RBIMPL_VA_OPT_ARGS)
+# define RUBY_ASSERT_ALWAYS(expr, ...) \
+    RUBY_ASSERT_MESG(expr, #expr RBIMPL_VA_OPT_ARGS(__VA_ARGS__))
+#else
+# define RUBY_ASSERT_ALWAYS(expr) RUBY_ASSERT_MESG((expr), #expr)
+#endif
 
 /**
  * Asserts that the given expression is truthy if and only if #RUBY_DEBUG is truthy.
@@ -172,9 +208,18 @@ RBIMPL_SYMBOL_EXPORT_END()
  * @param  expr  What supposedly evaluates to true.
  */
 #if RUBY_DEBUG
-# define RUBY_ASSERT(expr) RUBY_ASSERT_MESG((expr), #expr)
+# if defined(RBIMPL_VA_OPT_ARGS)
+#   define RUBY_ASSERT(expr, ...) \
+    RUBY_ASSERT_MESG((expr), #expr RBIMPL_VA_OPT_ARGS(__VA_ARGS__))
+# else
+#   define RUBY_ASSERT(expr) RUBY_ASSERT_MESG((expr), #expr)
+# endif
 #else
-# define RUBY_ASSERT(expr) RBIMPL_ASSERT_NOTHING
+# if defined(RBIMPL_VA_OPT_ARGS)
+#   define RUBY_ASSERT(/* expr, */...) RBIMPL_ASSERT_NOTHING
+# else
+#   define RUBY_ASSERT(expr) RBIMPL_ASSERT_NOTHING
+# endif
 #endif
 
 /**
@@ -187,9 +232,18 @@ RBIMPL_SYMBOL_EXPORT_END()
 /* Currently  `RUBY_DEBUG == ! defined(NDEBUG)` is  always true.   There is  no
  * difference any longer between this one and `RUBY_ASSERT`. */
 #if defined(NDEBUG)
-# define RUBY_ASSERT_NDEBUG(expr) RBIMPL_ASSERT_NOTHING
+# if defined(RBIMPL_VA_OPT_ARGS)
+#   define RUBY_ASSERT_NDEBUG(/* expr, */...) RBIMPL_ASSERT_NOTHING
+# else
+#   define RUBY_ASSERT_NDEBUG(expr) RBIMPL_ASSERT_NOTHING
+# endif
 #else
-# define RUBY_ASSERT_NDEBUG(expr) RUBY_ASSERT_MESG((expr), #expr)
+# if defined(RBIMPL_VA_OPT_ARGS)
+#   define RUBY_ASSERT_NDEBUG(expr, ...) \
+    RUBY_ASSERT_MESG((expr), #expr RBIMPL_VA_OPT_ARGS(__VA_ARGS__))
+# else
+#   define RUBY_ASSERT_NDEBUG(expr) RUBY_ASSERT_MESG((expr), #expr)
+# endif
 #endif
 
 /**
@@ -197,10 +251,20 @@ RBIMPL_SYMBOL_EXPORT_END()
  * @param  mesg  The message to display on failure.
  */
 #if RUBY_DEBUG
-# define RUBY_ASSERT_MESG_WHEN(cond, expr, mesg) RUBY_ASSERT_MESG((expr), (mesg))
+# if defined(RBIMPL_VA_OPT_ARGS)
+#   define RUBY_ASSERT_MESG_WHEN(cond, /* expr, */...)  \
+    RUBY_ASSERT_MESG(__VA_ARGS__)
+# else
+#   define RUBY_ASSERT_MESG_WHEN(cond, expr, mesg) RUBY_ASSERT_MESG((expr), (mesg))
+# endif
 #else
-# define RUBY_ASSERT_MESG_WHEN(cond, expr, mesg) \
+# if defined(RBIMPL_VA_OPT_ARGS)
+#   define RUBY_ASSERT_MESG_WHEN(cond, expr, ...) \
+    ((cond) ? RUBY_ASSERT_MESG((expr), __VA_ARGS__) : RBIMPL_ASSERT_NOTHING)
+# else
+#   define RUBY_ASSERT_MESG_WHEN(cond, expr, mesg) \
     ((cond) ? RUBY_ASSERT_MESG((expr), (mesg)) : RBIMPL_ASSERT_NOTHING)
+# endif
 #endif
 
 /**
@@ -210,7 +274,23 @@ RBIMPL_SYMBOL_EXPORT_END()
  * @param  cond  Extra condition that shall hold for assertion to take effect.
  * @param  expr  What supposedly evaluates to true.
  */
-#define RUBY_ASSERT_WHEN(cond, expr) RUBY_ASSERT_MESG_WHEN((cond), (expr), #expr)
+#if defined(RBIMPL_VA_OPT_ARGS)
+# define RUBY_ASSERT_WHEN(cond, expr, ...) \
+    RUBY_ASSERT_MESG_WHEN(cond, expr, #expr RBIMPL_VA_OPT_ARGS(__VA_ARGS__))
+#else
+# define RUBY_ASSERT_WHEN(cond, expr) RUBY_ASSERT_MESG_WHEN((cond), (expr), #expr)
+#endif
+
+/**
+ * A variant of #RUBY_ASSERT that  asserts when either #RUBY_DEBUG or built-in
+ * type of `obj` is `type`.
+ *
+ * @param  obj  Object to check its built-in typue.
+ * @param  type  Built-in type constant, T_ARRAY, T_STRING, etc.
+ */
+#define RUBY_ASSERT_BUILTIN_TYPE(obj, type) \
+    RUBY_ASSERT(RB_TYPE_P(obj, type), \
+                "Actual type is %s", rb_builtin_type_name(BUILTIN_TYPE(obj)))
 
 /**
  * This is either #RUBY_ASSERT or #RBIMPL_ASSUME, depending on #RUBY_DEBUG.
@@ -218,17 +298,19 @@ RBIMPL_SYMBOL_EXPORT_END()
  * @copydetails #RUBY_ASSERT
  */
 #if RUBY_DEBUG
-# define RBIMPL_ASSERT_OR_ASSUME(expr) RUBY_ASSERT_ALWAYS(expr)
+# define RBIMPL_ASSERT_OR_ASSUME RUBY_ASSERT_ALWAYS
+#elif ! defined(RBIMPL_VA_OPT_ARGS)
+# define RBIMPL_ASSERT_OR_ASSUME(expr) RBIMPL_ASSUME(expr)
 #elif RBIMPL_COMPILER_BEFORE(Clang, 7, 0, 0)
 # /* See commit 67d259c5dccd31fe49d417fec169977712ffdf10 */
-# define RBIMPL_ASSERT_OR_ASSUME(expr) RBIMPL_ASSERT_NOTHING
+# define RBIMPL_ASSERT_OR_ASSUME(...) RBIMPL_ASSERT_NOTHING
 #elif defined(RUBY_ASSERT_NOASSUME)
 # /* See commit d300a734414ef6de7e8eb563b7cc4389c455ed08 */
-# define RBIMPL_ASSERT_OR_ASSUME(expr) RBIMPL_ASSERT_NOTHING
+# define RBIMPL_ASSERT_OR_ASSUME(...) RBIMPL_ASSERT_NOTHING
 #elif ! defined(RBIMPL_HAVE___ASSUME)
-# define RBIMPL_ASSERT_OR_ASSUME(expr) RBIMPL_ASSERT_NOTHING
+# define RBIMPL_ASSERT_OR_ASSUME(...) RBIMPL_ASSERT_NOTHING
 #else
-# define RBIMPL_ASSERT_OR_ASSUME(expr) RBIMPL_ASSUME(expr)
+# define RBIMPL_ASSERT_OR_ASSUME(expr, ...) RBIMPL_ASSUME(expr)
 #endif
 
 #endif /* RUBY_ASSERT_H */
diff --git a/include/ruby/atomic.h b/include/ruby/atomic.h
index 3eb80fbf7d1f0c..4cf891b345c3b9 100644
--- a/include/ruby/atomic.h
+++ b/include/ruby/atomic.h
@@ -72,6 +72,8 @@ typedef unsigned int rb_atomic_t;
 #elif defined(HAVE_GCC_SYNC_BUILTINS)
 typedef unsigned int rb_atomic_t;
 #elif defined(_WIN32)
+# include <winsock2.h>       // to prevent macro redefinitions
+# include <windows.h>        // for `LONG` and `Interlocked` functions
 typedef LONG rb_atomic_t;
 #elif defined(__sun) && defined(HAVE_ATOMIC_H)
 typedef unsigned int rb_atomic_t;
@@ -138,6 +140,15 @@ typedef unsigned int rb_atomic_t;
 #define RUBY_ATOMIC_CAS(var, oldval, newval) \
     rbimpl_atomic_cas(&(var), (oldval), (newval))
 
+/**
+ * Atomic load. This loads `var` with an atomic intrinsic and returns
+ * its value.
+ *
+ * @param var  A variable of ::rb_atomic_t
+ * @return     What was stored in `var`j
+ */
+#define RUBY_ATOMIC_LOAD(var) rbimpl_atomic_load(&(var))
+
 /**
  * Identical to #RUBY_ATOMIC_EXCHANGE, except for the return type.
  *
@@ -186,6 +197,18 @@ typedef unsigned int rb_atomic_t;
  */
 #define RUBY_ATOMIC_DEC(var) rbimpl_atomic_dec(&(var))
 
+/**
+ * Identical to #RUBY_ATOMIC_FETCH_ADD,  except it expects its arguments to be `size_t`.
+ * There are cases where ::rb_atomic_t is  32bit while `size_t` is 64bit.  This
+ * should be used for size related operations to support such platforms.
+ *
+ * @param   var  A variable of `size_t`.
+ * @param   val  Value to add.
+ * @return  What was stored in `var` before the addition.
+ * @post    `var` holds `var + val`.
+ */
+#define RUBY_ATOMIC_SIZE_FETCH_ADD(var, val) rbimpl_atomic_size_fetch_add(&(var), (val))
+
 /**
  * Identical to #RUBY_ATOMIC_INC,  except it expects its  argument is `size_t`.
  * There are cases where ::rb_atomic_t is  32bit while `size_t` is 64bit.  This
@@ -279,6 +302,30 @@ typedef unsigned int rb_atomic_t;
 #define RUBY_ATOMIC_PTR_EXCHANGE(var, val) \
     RBIMPL_CAST(rbimpl_atomic_ptr_exchange((void **)&(var), (void *)val))
 
+/**
+ * Identical to #RUBY_ATOMIC_LOAD, except it expects its arguments are `void*`.
+ * There are cases where ::rb_atomic_t is 32bit while `void*` is 64bit.  This
+ * should be used for size related operations to support such platforms.
+ *
+ * @param   var        A variable of `void*`
+ * @return             The value of `var` (without tearing)
+ */
+#define RUBY_ATOMIC_PTR_LOAD(var) \
+    RBIMPL_CAST(rbimpl_atomic_ptr_load((void **)&var))
+
+/**
+* Identical  to #RUBY_ATOMIC_SET,  except  it expects  its arguments  are
+* `void*`.   There are  cases where  ::rb_atomic_t is  32bit while  ::VALUE is
+* 64bit.  This should  be used for pointer related operations  to support such
+* platforms.
+*
+* @param   var  A variable of `void*`.
+* @param   val   Value to set.
+* @post    `var` holds `val`.
+*/
+#define RUBY_ATOMIC_PTR_SET(var, val) \
+   rbimpl_atomic_ptr_set((volatile void **)&(var), (val))
+
 /**
  * Identical to #RUBY_ATOMIC_CAS, except it expects its arguments are `void*`.
  * There are cases where ::rb_atomic_t is 32bit while `void*` is 64bit.  This
@@ -291,7 +338,20 @@ typedef unsigned int rb_atomic_t;
  * @retval  otherwise  Something else is at `var`; not updated.
  */
 #define RUBY_ATOMIC_PTR_CAS(var, oldval, newval) \
-    RBIMPL_CAST(rbimpl_atomic_ptr_cas((void **)&(var), (oldval), (newval)))
+    RBIMPL_CAST(rbimpl_atomic_ptr_cas((void **)&(var), (void *)(oldval), (void *)(newval)))
+
+/**
+ * Identical  to #RUBY_ATOMIC_SET,  except  it expects  its arguments  are
+ * ::VALUE.   There are  cases where  ::rb_atomic_t is  32bit while  ::VALUE is
+ * 64bit.  This should  be used for pointer related operations  to support such
+ * platforms.
+ *
+ * @param   var  A variable of ::VALUE.
+ * @param   val   Value to set.
+ * @post    `var` holds `val`.
+ */
+#define RUBY_ATOMIC_VALUE_SET(var, val) \
+    rbimpl_atomic_value_set(&(var), (val))
 
 /**
  * Identical  to #RUBY_ATOMIC_EXCHANGE,  except  it expects  its arguments  are
@@ -353,6 +413,38 @@ rbimpl_atomic_fetch_add(volatile rb_atomic_t *ptr, rb_atomic_t val)
 #endif
 }
 
+/** @cond INTERNAL_MACRO */
+RBIMPL_ATTR_ARTIFICIAL()
+RBIMPL_ATTR_NOALIAS()
+RBIMPL_ATTR_NONNULL((1))
+static inline size_t
+rbimpl_atomic_size_fetch_add(volatile size_t *ptr, size_t val)
+{
+#if 0
+
+#elif defined(HAVE_GCC_ATOMIC_BUILTINS)
+    return __atomic_fetch_add(ptr, val, __ATOMIC_SEQ_CST);
+
+#elif defined(HAVE_GCC_SYNC_BUILTINS)
+    return __sync_fetch_and_add(ptr, val);
+
+#elif defined(_WIN32)
+    return InterlockedExchangeAdd64(ptr, val);
+
+#elif defined(__sun) && defined(HAVE_ATOMIC_H) && (defined(_LP64) || defined(_I32LPx))
+    /* Ditto for `atomic_add_int_nv`. */
+    RBIMPL_ASSERT_OR_ASSUME(val <= LONG_MAX);
+    atomic_add_long(ptr, val);
+
+#else
+    RBIMPL_STATIC_ASSERT(size_of_rb_atomic_t, sizeof *ptr == sizeof(rb_atomic_t));
+
+    volatile rb_atomic_t *const tmp = RBIMPL_CAST((volatile rb_atomic_t *)ptr);
+    rbimpl_atomic_fetch_add(tmp, val);
+
+#endif
+}
+
 RBIMPL_ATTR_ARTIFICIAL()
 RBIMPL_ATTR_NOALIAS()
 RBIMPL_ATTR_NONNULL((1))
@@ -404,7 +496,7 @@ rbimpl_atomic_size_add(volatile size_t *ptr, size_t val)
 #elif defined(HAVE_GCC_SYNC_BUILTINS)
     __sync_add_and_fetch(ptr, val);
 
-#elif defined(_WIN32) && defined(_M_AMD64)
+#elif defined(_WIN64)
     /* Ditto for `InterlockeExchangedAdd`. */
     InterlockedExchangeAdd64(ptr, val);
 
@@ -456,13 +548,15 @@ rbimpl_atomic_size_inc(volatile size_t *ptr)
 #elif defined(HAVE_GCC_ATOMIC_BUILTINS) || defined(HAVE_GCC_SYNC_BUILTINS)
     rbimpl_atomic_size_add(ptr, 1);
 
-#elif defined(_WIN32) && defined(_M_AMD64)
+#elif defined(_WIN64)
     InterlockedIncrement64(ptr);
 
 #elif defined(__sun) && defined(HAVE_ATOMIC_H) && (defined(_LP64) || defined(_I32LPx))
     atomic_inc_ulong(ptr);
 
 #else
+    RBIMPL_STATIC_ASSERT(size_of_size_t, sizeof *ptr == sizeof(rb_atomic_t));
+
     rbimpl_atomic_size_add(ptr, 1);
 
 #endif
@@ -538,7 +632,7 @@ rbimpl_atomic_size_sub(volatile size_t *ptr, size_t val)
 #elif defined(HAVE_GCC_SYNC_BUILTINS)
     __sync_sub_and_fetch(ptr, val);
 
-#elif defined(_WIN32) && defined(_M_AMD64)
+#elif defined(_WIN64)
     const ssize_t neg = -1;
     InterlockedExchangeAdd64(ptr, neg * val);
 
@@ -590,13 +684,15 @@ rbimpl_atomic_size_dec(volatile size_t *ptr)
 #elif defined(HAVE_GCC_ATOMIC_BUILTINS) || defined(HAVE_GCC_SYNC_BUILTINS)
     rbimpl_atomic_size_sub(ptr, 1);
 
-#elif defined(_WIN32) && defined(_M_AMD64)
+#elif defined(_WIN64)
     InterlockedDecrement64(ptr);
 
 #elif defined(__sun) && defined(HAVE_ATOMIC_H) && (defined(_LP64) || defined(_I32LPx))
     atomic_dec_ulong(ptr);
 
 #else
+    RBIMPL_STATIC_ASSERT(size_of_size_t, sizeof *ptr == sizeof(rb_atomic_t));
+
     rbimpl_atomic_size_sub(ptr, 1);
 
 #endif
@@ -688,7 +784,7 @@ rbimpl_atomic_size_exchange(volatile size_t *ptr, size_t val)
 #elif defined(HAVE_GCC_SYNC_BUILTINS)
     return __sync_lock_test_and_set(ptr, val);
 
-#elif defined(_WIN32) && defined(_M_AMD64)
+#elif defined(_WIN64)
     return InterlockedExchange64(ptr, val);
 
 #elif defined(__sun) && defined(HAVE_ATOMIC_H) && (defined(_LP64) || defined(_I32LPx))
@@ -704,6 +800,23 @@ rbimpl_atomic_size_exchange(volatile size_t *ptr, size_t val)
 #endif
 }
 
+RBIMPL_ATTR_ARTIFICIAL()
+RBIMPL_ATTR_NOALIAS()
+RBIMPL_ATTR_NONNULL((1))
+static inline void
+rbimpl_atomic_size_set(volatile size_t *ptr, size_t val)
+{
+#if 0
+
+#elif defined(HAVE_GCC_ATOMIC_BUILTINS)
+    __atomic_store_n(ptr, val, __ATOMIC_SEQ_CST);
+
+#else
+    rbimpl_atomic_size_exchange(ptr, val);
+
+#endif
+}
+
 RBIMPL_ATTR_ARTIFICIAL()
 RBIMPL_ATTR_NOALIAS()
 RBIMPL_ATTR_NONNULL((1))
@@ -732,6 +845,19 @@ rbimpl_atomic_ptr_exchange(void *volatile *ptr, const void *val)
 #endif
 }
 
+RBIMPL_ATTR_ARTIFICIAL()
+RBIMPL_ATTR_NOALIAS()
+RBIMPL_ATTR_NONNULL((1))
+static inline void
+rbimpl_atomic_ptr_set(volatile void **ptr, void *val)
+{
+    RBIMPL_STATIC_ASSERT(sizeof_value, sizeof *ptr == sizeof(size_t));
+
+    const size_t sval = RBIMPL_CAST((size_t)val);
+    volatile size_t *const sptr = RBIMPL_CAST((volatile size_t *)ptr);
+    rbimpl_atomic_size_set(sptr, sval);
+}
+
 RBIMPL_ATTR_ARTIFICIAL()
 RBIMPL_ATTR_NOALIAS()
 RBIMPL_ATTR_NONNULL((1))
@@ -746,6 +872,34 @@ rbimpl_atomic_value_exchange(volatile VALUE *ptr, VALUE val)
     return RBIMPL_CAST((VALUE)sret);
 }
 
+RBIMPL_ATTR_ARTIFICIAL()
+RBIMPL_ATTR_NOALIAS()
+RBIMPL_ATTR_NONNULL((1))
+static inline void
+rbimpl_atomic_value_set(volatile VALUE *ptr, VALUE val)
+{
+    RBIMPL_STATIC_ASSERT(sizeof_value, sizeof *ptr == sizeof(size_t));
+
+    const size_t sval = RBIMPL_CAST((size_t)val);
+    volatile size_t *const sptr = RBIMPL_CAST((volatile size_t *)ptr);
+    rbimpl_atomic_size_set(sptr, sval);
+}
+
+RBIMPL_ATTR_ARTIFICIAL()
+RBIMPL_ATTR_NOALIAS()
+RBIMPL_ATTR_NONNULL((1))
+static inline rb_atomic_t
+rbimpl_atomic_load(volatile rb_atomic_t *ptr)
+{
+#if 0
+
+#elif defined(HAVE_GCC_ATOMIC_BUILTINS)
+    return __atomic_load_n(ptr, __ATOMIC_SEQ_CST);
+#else
+    return rbimpl_atomic_fetch_add(ptr, 0);
+#endif
+}
+
 RBIMPL_ATTR_ARTIFICIAL()
 RBIMPL_ATTR_NOALIAS()
 RBIMPL_ATTR_NONNULL((1))
@@ -823,7 +977,7 @@ rbimpl_atomic_size_cas(volatile size_t *ptr, size_t oldval, size_t newval)
 #elif defined(HAVE_GCC_SYNC_BUILTINS)
     return __sync_val_compare_and_swap(ptr, oldval, newval);
 
-#elif defined(_WIN32) && defined(_M_AMD64)
+#elif defined(_WIN64)
     return InterlockedCompareExchange64(ptr, newval, oldval);
 
 #elif defined(__sun) && defined(HAVE_ATOMIC_H) && (defined(_LP64) || defined(_I32LPx))
@@ -872,6 +1026,22 @@ rbimpl_atomic_ptr_cas(void **ptr, const void *oldval, const void *newval)
 #endif
 }
 
+RBIMPL_ATTR_ARTIFICIAL()
+RBIMPL_ATTR_NOALIAS()
+RBIMPL_ATTR_NONNULL((1))
+static inline void *
+rbimpl_atomic_ptr_load(void **ptr)
+{
+#if 0
+
+#elif defined(HAVE_GCC_ATOMIC_BUILTINS)
+    return __atomic_load_n(ptr, __ATOMIC_SEQ_CST);
+#else
+    void *val = *ptr;
+    return rbimpl_atomic_ptr_cas(ptr, val, val);
+#endif
+}
+
 RBIMPL_ATTR_ARTIFICIAL()
 RBIMPL_ATTR_NOALIAS()
 RBIMPL_ATTR_NONNULL((1))
diff --git a/include/ruby/backward/2/rmodule.h b/include/ruby/backward/2/rmodule.h
index 53b37831c07e7e..76c0936462a0c0 100644
--- a/include/ruby/backward/2/rmodule.h
+++ b/include/ruby/backward/2/rmodule.h
@@ -23,7 +23,7 @@
  * who is implementing the internals) could have used those macros for a while.
  * Kept public as-is here to keep some theoretical backwards compatibility.
  */
-#define RMODULE_IV_TBL(m) RCLASS_IV_TBL(m)
+#define RMODULE_IV_TBL(m) RCLASS_FIELDS(m)
 #define RMODULE_CONST_TBL(m) RCLASS_CONST_TBL(m)
 #define RMODULE_M_TBL(m) RCLASS_M_TBL(m)
 #define RMODULE_SUPER(m) RCLASS_SUPER(m)
diff --git a/include/ruby/debug.h b/include/ruby/debug.h
index f95acdb17e44a2..0a9f693951dc1f 100644
--- a/include/ruby/debug.h
+++ b/include/ruby/debug.h
@@ -10,6 +10,7 @@
  *             modify this file, provided that  the conditions mentioned in the
  *             file COPYING are met.  Consult the file for details.
  */
+#include "ruby/internal/attr/deprecated.h"
 #include "ruby/internal/attr/nonnull.h"
 #include "ruby/internal/attr/returns_nonnull.h"
 #include "ruby/internal/dllexport.h"
@@ -50,6 +51,25 @@ RBIMPL_ATTR_NONNULL((3))
  */
 int rb_profile_frames(int start, int limit, VALUE *buff, int *lines);
 
+/**
+ * Queries mysterious "frame"s of the given range.
+ *
+ * A per-thread version of rb_profile_frames().
+ * Arguments and return values are the same with rb_profile_frames() with the
+ * exception of the first argument _thread_, which accepts the Thread to be
+ * profiled/queried.
+ *
+ * @param[in]   thread The Ruby Thread to be profiled.
+ * @param[in]   start  Start position (0 means the topmost).
+ * @param[in]   limit  Number objects of `buff`.
+ * @param[out]  buff   Return buffer.
+ * @param[out]  lines  Return buffer.
+ * @return      Number of objects filled into `buff`.
+ * @post        `buff` is filled with backtrace pointers.
+ * @post        `lines` is filled with `__LINE__` of each backtraces.
+ */
+int rb_profile_thread_frames(VALUE thread, int start, int limit, VALUE *buff, int *lines);
+
 /**
  * Queries the path of the passed backtrace.
  *
@@ -459,7 +479,7 @@ RBIMPL_ATTR_RETURNS_NONNULL()
  */
 rb_trace_arg_t *rb_tracearg_from_tracepoint(VALUE tpval);
 
-RBIMPL_ATTR_NONNULL(())
+RBIMPL_ATTR_NONNULL((1))
 /**
  * Queries the event of the passed trace.
  *
@@ -468,7 +488,7 @@ RBIMPL_ATTR_NONNULL(())
  */
 rb_event_flag_t rb_tracearg_event_flag(rb_trace_arg_t *trace_arg);
 
-RBIMPL_ATTR_NONNULL(())
+RBIMPL_ATTR_NONNULL((1))
 /**
  * Identical to  rb_tracearg_event_flag(), except  it returns  the name  of the
  * event in Ruby's symbol.
@@ -478,7 +498,7 @@ RBIMPL_ATTR_NONNULL(())
  */
 VALUE rb_tracearg_event(rb_trace_arg_t *trace_arg);
 
-RBIMPL_ATTR_NONNULL(())
+RBIMPL_ATTR_NONNULL((1))
 /**
  * Queries the line of the point where the trace is at.
  *
@@ -488,7 +508,7 @@ RBIMPL_ATTR_NONNULL(())
  */
 VALUE rb_tracearg_lineno(rb_trace_arg_t *trace_arg);
 
-RBIMPL_ATTR_NONNULL(())
+RBIMPL_ATTR_NONNULL((1))
 /**
  * Queries the file name of the point where the trace is at.
  *
@@ -498,7 +518,19 @@ RBIMPL_ATTR_NONNULL(())
  */
 VALUE rb_tracearg_path(rb_trace_arg_t *trace_arg);
 
-RBIMPL_ATTR_NONNULL(())
+RBIMPL_ATTR_NONNULL((1))
+/**
+ *
+ * Queries the parameters passed on a call or return event.
+ *
+ * @param[in]  trace_arg         A trace instance
+ * @exception  rb_eRuntimeError  The tracing event does not support querying parameters.
+ * @return     Array of parameters in the format of `Method#parameters`.
+ *
+ */
+VALUE rb_tracearg_parameters(rb_trace_arg_t *trace_arg);
+
+RBIMPL_ATTR_NONNULL((1))
 /**
  * Queries the method name of the point where the trace is at.
  *
@@ -508,7 +540,7 @@ RBIMPL_ATTR_NONNULL(())
  */
 VALUE rb_tracearg_method_id(rb_trace_arg_t *trace_arg);
 
-RBIMPL_ATTR_NONNULL(())
+RBIMPL_ATTR_NONNULL((1))
 /**
  * Identical  to  rb_tracearg_method_id(), except  it  returns  callee id  like
  * rb_frame_callee().
@@ -519,7 +551,7 @@ RBIMPL_ATTR_NONNULL(())
  */
 VALUE rb_tracearg_callee_id(rb_trace_arg_t *trace_arg);
 
-RBIMPL_ATTR_NONNULL(())
+RBIMPL_ATTR_NONNULL((1))
 /**
  * Queries the class that defines the method that the passed trace is at.  This
  * can be different from the class of rb_tracearg_self()'s return value because
@@ -531,7 +563,7 @@ RBIMPL_ATTR_NONNULL(())
  */
 VALUE rb_tracearg_defined_class(rb_trace_arg_t *trace_arg);
 
-RBIMPL_ATTR_NONNULL(())
+RBIMPL_ATTR_NONNULL((1))
 /**
  * Creates a binding object of the point where the trace is at.
  *
@@ -546,7 +578,7 @@ RBIMPL_ATTR_NONNULL(())
  */
 VALUE rb_tracearg_binding(rb_trace_arg_t *trace_arg);
 
-RBIMPL_ATTR_NONNULL(())
+RBIMPL_ATTR_NONNULL((1))
 /**
  * Queries the receiver of the point trace is at.
  *
@@ -555,7 +587,7 @@ RBIMPL_ATTR_NONNULL(())
  */
 VALUE rb_tracearg_self(rb_trace_arg_t *trace_arg);
 
-RBIMPL_ATTR_NONNULL(())
+RBIMPL_ATTR_NONNULL((1))
 /**
  * Queries the return value that the trace represents.
  *
@@ -565,7 +597,7 @@ RBIMPL_ATTR_NONNULL(())
  */
 VALUE rb_tracearg_return_value(rb_trace_arg_t *trace_arg);
 
-RBIMPL_ATTR_NONNULL(())
+RBIMPL_ATTR_NONNULL((1))
 /**
  * Queries the raised exception that the trace represents.
  *
@@ -575,7 +607,33 @@ RBIMPL_ATTR_NONNULL(())
  */
 VALUE rb_tracearg_raised_exception(rb_trace_arg_t *trace_arg);
 
-RBIMPL_ATTR_NONNULL(())
+RBIMPL_ATTR_NONNULL((1))
+/**
+ * Queries the compiled source code of the 'script_compiled' event.
+ * If loaded from a file, it will return nil.
+ *
+ * @param[in]  trace_arg         A trace instance
+ * @exception  rb_eRuntimeError  The tracing event is not 'script_compiled'.
+ * @retval     RUBY_Qnil         The script was loaded from a file.
+ * @retval     otherwise         The compiled source code.
+ *
+ */
+VALUE rb_tracearg_eval_script(rb_trace_arg_t *trace_arg);
+
+RBIMPL_ATTR_NONNULL((1))
+/**
+ *
+ * Queries the compiled instruction sequence on a 'script_compiled' event.
+ * Note that this method is MRI specific.
+ *
+ * @param[in]  trace_arg         A trace instance
+ * @exception  rb_eRuntimeError  The tracing event is not 'script_compiled'.
+ * @return     The `RubyVM::InstructionSequence` object representing the instruction sequence.
+ *
+ */
+VALUE rb_tracearg_instruction_sequence(rb_trace_arg_t *trace_arg);
+
+RBIMPL_ATTR_NONNULL((1))
 /**
  * Queries the allocated/deallocated object that the trace represents.
  *
@@ -596,48 +654,157 @@ VALUE rb_tracearg_object(rb_trace_arg_t *trace_arg);
 
 /*
  * Postponed Job API
- * rb_postponed_job_register and rb_postponed_job_register_one are
- * async-signal-safe and used via SIGPROF by the "stackprof" RubyGem
+ *
+ * This API is designed to be called from contexts where it is not safe to run Ruby
+ * code (e.g. because they do not hold the GVL or because GC is in progress), and
+ * defer a callback to run in a context where it _is_ safe. The primary intended
+ * users of this API is for sampling profilers like the "stackprof" gem; these work
+ * by scheduling the periodic delivery of a SIGPROF signal, and inside the C-level
+ * signal handler, deferring a job to collect a Ruby backtrace when it is next safe
+ * to do so.
+ *
+ * Ruby maintains a small, fixed-size postponed job table. An extension using this
+ * API should first call `rb_postponed_job_preregister` to register a callback
+ * function in this table and obtain a handle of type `rb_postponed_job_handle_t`
+ * to it. Subsequently, the callback can be triggered  by calling
+ * `rb_postponed_job_trigger` with that handle, or the `data` associated with the
+ * callback function can be changed by calling `rb_postponed_job_preregister` again.
+ *
+ * Because the postponed job table is quite small (it only has 32 entries on most
+ * common systems), extensions should generally only preregister one or two `func`
+ * values.
+ *
+ * Historically, this API provided two functions `rb_postponed_job_register` and
+ * `rb_postponed_job_register_one`, which claimed to be fully async-signal-safe and
+ * would call back the provided `func` and `data` at an appropriate time. However,
+ * these functions were subject to race conditions which could cause crashes when
+ * racing with Ruby's internal use of them. These two functions are still present,
+ * but are marked as deprecated and have slightly changed semantics:
+ *
+ * * rb_postponed_job_register now works like rb_postponed_job_register_one i.e.
+ *   `func` will only be executed at most one time each time Ruby checks for
+ *   interrupts, no matter how many times it is registered
+ * * They are also called with the last `data` to be registered, not the first
+ *   (which is how rb_postponed_job_register_one previously worked)
  */
 
+
 /**
  * Type of postponed jobs.
  *
- * @param[in,out]  arg What was passed to rb_postponed_job_register().
+ * @param[in,out]  arg What was passed to `rb_postponed_job_preregister`
  */
 typedef void (*rb_postponed_job_func_t)(void *arg);
 
 /**
- * Registers a postponed job.
+ * The type of a handle returned from `rb_postponed_job_preregister` and
+ * passed to `rb_postponed_job_trigger`
+ */
+typedef unsigned int rb_postponed_job_handle_t;
+#define POSTPONED_JOB_HANDLE_INVALID ((rb_postponed_job_handle_t)UINT_MAX)
+
+/**
+ * Pre-registers a func in Ruby's postponed job preregistration table,
+ * returning an opaque handle which can be used to trigger the job later. Generally,
+ * this function will be called during the initialization routine of an extension.
+ *
+ * The returned handle can be used later to call `rb_postponed_job_trigger`. This will
+ * cause Ruby to call back into the registered `func` with `data` at a later time, in
+ * a context where the GVL is held and it is safe to perform Ruby allocations.
+ *
+ * If the given `func` was already pre-registered, this function will overwrite the
+ * stored data with the newly passed data, and return the same handle instance as
+ * was previously returned.
+ *
+ * If this function is called concurrently with the same `func`, then the stored data
+ * could be the value from either call (but will definitely be one of them).
+ *
+ * If this function is called to update the data concurrently with a call to
+ * `rb_postponed_job_trigger` on the same handle, it's undefined whether `func` will
+ * be called with the old data or the new data.
+ *
+ * Although the current implementation of this function is in fact async-signal-safe and
+ * has defined semantics when called concurrently on the same `func`, a future Ruby
+ * version might require that this method be called under the GVL; thus, programs which
+ * aim to be forward-compatible should call this method whilst holding the GVL.
+ *
+ * @param[in]   flags       Unused and ignored
+ * @param[in]   func        The function to be pre-registered
+ * @param[in]   data        The data to be pre-registered
+ * @retval      POSTPONED_JOB_HANDLE_INVALID    The job table is full; this registration
+ *                          did not succeed and no further registration will do so for
+ *                          the lifetime of the program.
+ * @retval      otherwise   A handle which can be passed to `rb_postponed_job_trigger`
+ */
+rb_postponed_job_handle_t rb_postponed_job_preregister(unsigned int flags, rb_postponed_job_func_t func, void *data);
+
+/**
+ * Triggers a pre-registered job registered with rb_postponed_job_preregister,
+ * scheduling it for execution the next time the Ruby VM checks for interrupts.
+ * The context in which the job is called in holds the GVL and is safe to perform
+ * Ruby allocations within (i.e. it is not during GC).
+ *
+ * This method is async-signal-safe and can be called from any thread, at any
+ * time, including in signal handlers.
+ *
+ * If this method is called multiple times, Ruby will coalesce this into only
+ * one call to the job the next time it checks for interrupts.
+ *
+ * @params[in]  h   A handle returned from rb_postponed_job_preregister
+ */
+void rb_postponed_job_trigger(rb_postponed_job_handle_t h);
+
+/**
+ * Schedules the given `func` to be called with `data` when Ruby next checks for
+ * interrupts. If this function is called multiple times in between Ruby checking
+ * for interrupts, then `func` will be called only once with the `data` value from
+ * the first call to this function.
  *
- * There  are situations  when running  a ruby  program is  not possible.   For
- * instance when  a program is in  a signal handler; for  another instance when
- * the GC  is busy.   On such situations  however, there might  be needs  to do
- * something.  We cannot but defer such operations until we are 100% sure it is
- * safe  to execute  them.   This  mechanism is  called  postponed jobs.   This
- * function  registers a  new one.   The registered  job would  eventually gets
- * executed.
+ * Like `rb_postponed_job_trigger`, the context in which the job is called
+ * holds the GVL and can allocate Ruby objects.
  *
- * @param[in]      flags      (Unused) reserved for future extensions.
+ * This method essentially has the same semantics as:
+ *
+ * ```
+ *   rb_postponed_job_trigger(rb_postponed_job_preregister(func, data));
+ * ```
+ *
+ * @note    Previous versions of Ruby promised that the (`func`, `data`) pairs would
+ *          be executed as many times as they were registered with this function; in
+ *          reality this was always subject to race conditions and this function no
+ *          longer provides this guarantee. Instead, multiple calls to this function
+ *          can be coalesced into a single execution of the passed `func`, with the
+ *          most recent `data` registered at that time passed in.
+ *
+ * @deprecated  This interface implies that arbitrarily many `func`'s can be enqueued
+ *              over the lifetime of the program, whilst in reality the registration
+ *              slots for postponed jobs are a finite resource. This is made clearer
+ *              by the `rb_postponed_job_preregister` and `rb_postponed_job_trigger`
+ *              functions, and a future version of Ruby might delete this function.
+ *
+ * @param[in]      flags      Unused and ignored.
  * @param[in]      func       Job body.
  * @param[in,out]  data       Passed as-is to `func`.
- * @retval         0          Postponed job buffer is full.  Failed.
- * @retval         otherwise  Opaque return value.
- * @post           The passed job is postponed.
+ * @retval         0          Postponed job registration table is full. Failed.
+ * @retval         1          Registration succeeded.
+ * @post           The passed job will run on the next interrupt check.
  */
+ RBIMPL_ATTR_DEPRECATED(("use rb_postponed_job_preregister and rb_postponed_job_trigger"))
 int rb_postponed_job_register(unsigned int flags, rb_postponed_job_func_t func, void *data);
 
 /**
- * Identical to rb_postponed_job_register_one(),  except it additionally checks
- * for  duplicated registration.   In case  the passed  job is  already in  the
- * postponed job buffer this function does nothing.
+ * Identical to `rb_postponed_job_register`
+ *
+ * @deprecated  This is deprecated for the same reason as `rb_postponed_job_register`
  *
- * @param[in]      flags      (Unused) reserved for future extensions.
+ * @param[in]      flags      Unused and ignored.
  * @param[in]      func       Job body.
  * @param[in,out]  data       Passed as-is to `func`.
- * @retval         0          Postponed job buffer is full.  Failed.
- * @retval         otherwise  Opaque return value.
+ * @retval         0          Postponed job registration table is full. Failed.
+ * @retval         1          Registration succeeded.
+ * @post           The passed job will run on the next interrupt check.
  */
+ RBIMPL_ATTR_DEPRECATED(("use rb_postponed_job_preregister and rb_postponed_job_trigger"))
 int rb_postponed_job_register_one(unsigned int flags, rb_postponed_job_func_t func, void *data);
 
 /** @} */
diff --git a/include/ruby/fiber/scheduler.h b/include/ruby/fiber/scheduler.h
index ad3d2d74833ede..b06884f596665e 100644
--- a/include/ruby/fiber/scheduler.h
+++ b/include/ruby/fiber/scheduler.h
@@ -23,7 +23,8 @@
 
 RBIMPL_SYMBOL_EXPORT_BEGIN()
 
-#define RUBY_FIBER_SCHEDULER_VERSION 2
+// Version 3: Adds support for `fiber_interrupt`.
+#define RUBY_FIBER_SCHEDULER_VERSION 3
 
 struct timeval;
 
@@ -97,7 +98,7 @@ VALUE rb_fiber_scheduler_get(void);
  * current  thread  will  call  scheduler's  `#close`  method  on  finalisation
  * (allowing  the  scheduler  to  properly  manage  all  non-finished  fibers).
  * `scheduler`   can   be   an   object   of   any   class   corresponding   to
- * `Fiber::SchedulerInterface`. Its implementation is up to the user.
+ * `Fiber::Scheduler` interface. Its implementation is up to the user.
  *
  * @param[in]  scheduler     The scheduler to set.
  * @exception  rb_eArgError  `scheduler` does not conform the interface.
@@ -199,6 +200,8 @@ VALUE rb_fiber_scheduler_block(VALUE scheduler, VALUE blocker, VALUE timeout);
 /**
  * Wakes up a fiber previously blocked using rb_fiber_scheduler_block().
  *
+ * This function may be called from a different thread.
+ *
  * @param[in]  scheduler  Target scheduler.
  * @param[in]  blocker    What was awaited for.
  * @param[in]  fiber      What to unblock.
@@ -391,9 +394,89 @@ VALUE rb_fiber_scheduler_io_close(VALUE scheduler, VALUE io);
  */
 VALUE rb_fiber_scheduler_address_resolve(VALUE scheduler, VALUE hostname);
 
+// The state of the blocking operation execution.
+struct rb_fiber_scheduler_blocking_operation_state {
+    void *result;
+    int saved_errno;
+};
+
+// The opaque handle for the blocking operation.
+typedef struct rb_fiber_scheduler_blocking_operation rb_fiber_scheduler_blocking_operation_t;
+
+/**
+ * Extract the blocking operation handle from a BlockingOperationRuby object.
+ *
+ * This function safely extracts the opaque handle from a BlockingOperation VALUE
+ * while holding the GVL. The returned pointer can be passed to worker threads
+ * and used with rb_fiber_scheduler_blocking_operation_execute.
+ *
+ * @param[in] self The BlockingOperation VALUE to extract from
+ * @return The opaque struct pointer on success, NULL on error
+ * @note Experimental.
+ */
+rb_fiber_scheduler_blocking_operation_t *rb_fiber_scheduler_blocking_operation_extract(VALUE self);
+
+/**
+ * Execute blocking operation from handle (GVL not required).
+ *
+ * This function executes a blocking operation using the opaque handle
+ * obtained from rb_fiber_scheduler_blocking_operation_extract.
+ * It can be called from native threads without holding the GVL.
+ *
+ * @param[in] blocking_operation The opaque handle.
+ * @return 0 on success, -1 on error.
+ * @note Experimental. Can be called from any thread without holding the GVL
+ */
+int rb_fiber_scheduler_blocking_operation_execute(rb_fiber_scheduler_blocking_operation_t *blocking_operation);
+
+/**
+ * Cancel a blocking operation.
+ *
+ * This function cancels a blocking operation. If the operation is queued,
+ * it just marks it as cancelled. If it's executing, it marks it as cancelled
+ * and calls the unblock function to interrupt the operation.
+ *
+ * @param blocking_operation The opaque struct pointer
+ * @return 1 if unblock function was called, 0 if just marked cancelled, -1 on error
+ * @note Experimental.
+ */
+int rb_fiber_scheduler_blocking_operation_cancel(rb_fiber_scheduler_blocking_operation_t *blocking_operation);
+
+/**
+ * Defer the execution of the passed function to the scheduler.
+ *
+ * @param[in]  scheduler         Target scheduler.
+ * @param[in]  function          The function to run.
+ * @param[in]  data              The data to pass to the function.
+ * @param[in]  unblock_function  The unblock function to use to interrupt the operation.
+ * @param[in]  data2             The data to pass to the unblock function.
+ * @param[in]  flags             Flags passed to `rb_nogvl`.
+ * @param[out] state             The result and errno of the operation.
+ * @retval     RUBY_Qundef       `scheduler` doesn't have `#blocking_operation_wait`.
+ * @return     otherwise         What `scheduler.blocking_operation_wait` returns.
+ */
+VALUE rb_fiber_scheduler_blocking_operation_wait(VALUE scheduler, void* (*function)(void *), void *data, rb_unblock_function_t *unblock_function, void *data2, int flags, struct rb_fiber_scheduler_blocking_operation_state *state);
+
+/**
+ * Interrupt a fiber by raising an exception. You can construct an exception using `rb_make_exception`.
+ *
+ * This hook may be invoked by a different thread.
+ *
+ * @param[in]  scheduler  Target scheduler.
+ * @param[in]  fiber      The fiber to interrupt.
+ * @param[in]  exception  The exception to raise in the fiber.
+ * @return     What `scheduler.fiber_interrupt` returns.
+ */
+VALUE rb_fiber_scheduler_fiber_interrupt(VALUE scheduler, VALUE fiber, VALUE exception);
+
 /**
  * Create and schedule a non-blocking fiber.
  *
+ * @param[in]  scheduler  Target scheduler.
+ * @param[in]  argc      Number of arguments in argv.
+ * @param[in]  argv      Array of arguments to pass to the fiber.
+ * @param[in]  kw_splat  Whether to expand last argument as keywords.
+ * @return     The created and scheduled fiber.
  */
 VALUE rb_fiber_scheduler_fiber(VALUE scheduler, int argc, VALUE *argv, int kw_splat);
 
diff --git a/include/ruby/intern.h b/include/ruby/intern.h
index 48e4cd546e2d19..8718169ce2a291 100644
--- a/include/ruby/intern.h
+++ b/include/ruby/intern.h
@@ -51,6 +51,7 @@
 #include "ruby/internal/intern/re.h"
 #include "ruby/internal/intern/ruby.h"
 #include "ruby/internal/intern/select.h"
+#include "ruby/internal/intern/set.h"
 #include "ruby/internal/intern/signal.h"
 #include "ruby/internal/intern/sprintf.h"
 #include "ruby/internal/intern/string.h"
diff --git a/include/ruby/internal/abi.h b/include/ruby/internal/abi.h
index 8e1bbf3951086b..0c99d93bf9bd99 100644
--- a/include/ruby/internal/abi.h
+++ b/include/ruby/internal/abi.h
@@ -24,7 +24,7 @@
  * In released versions of Ruby, this number is not defined since teeny
  * versions of Ruby should guarantee ABI compatibility.
  */
-#define RUBY_ABI_VERSION 0
+#define RUBY_ABI_VERSION 2
 
 /* Windows does not support weak symbols so ruby_abi_version will not exist
  * in the shared library. */
@@ -33,7 +33,7 @@
 #endif
 #endif  /* RUBY_ABI_VERSION */
 
-#ifdef RUBY_DLN_CHECK_ABI
+#if defined(RUBY_DLN_CHECK_ABI) && !defined(RUBY_EXPORT)
 
 # ifdef __cplusplus
 extern "C" {
diff --git a/include/ruby/internal/anyargs.h b/include/ruby/internal/anyargs.h
index e3e1b6166db3fa..e4c6d155cc7b26 100644
--- a/include/ruby/internal/anyargs.h
+++ b/include/ruby/internal/anyargs.h
@@ -84,12 +84,15 @@
 
 #elif defined(_WIN32) || defined(__CYGWIN__)
 # /* Skip due to [Bug #16134] */
+# define RBIMPL_CAST_FN_PTR 1
 
 #elif ! RBIMPL_HAS_ATTRIBUTE(transparent_union)
 # /* :TODO: improve here, please find a way to support. */
+# define RBIMPL_CAST_FN_PTR 1
 
 #elif ! defined(HAVE_VA_ARGS_MACRO)
 # /* :TODO: improve here, please find a way to support. */
+# define RBIMPL_CAST_FN_PTR 1
 
 #else
 # /** @cond INTERNAL_MACRO */
@@ -348,6 +351,25 @@ RBIMPL_ANYARGS_DECL(rb_define_method, VALUE, const char *)
 
 #endif /* __cplusplus */
 
+#if defined(RBIMPL_CAST_FN_PTR) && !defined(__cplusplus)
+/* In C23, K&R style prototypes are gone and so `void foo(ANYARGS)` became
+ * equivalent to `void foo(void)` unlike in earlier versions. This is a problem
+ * for rb_define_* functions since that makes all valid functions one can pass
+ * trip -Wincompatible-pointer-types, which we treat as errors. This is mostly
+ * not a problem for the __builtin_choose_expr path, but outside of that we
+ * need to add a cast for compatibility.
+ */
+#define rb_define_method(klass, mid, func, arity)           rb_define_method((klass), (mid), (VALUE (*)(ANYARGS))(func), (arity))
+#define rb_define_method_id(klass, mid, func, arity)        rb_define_method_id((klass), (mid), (VALUE (*)(ANYARGS))(func), (arity))
+#define rb_define_singleton_method(obj, mid, func, arity)   rb_define_singleton_method((obj), (mid), (VALUE (*)(ANYARGS))(func), (arity))
+#define rb_define_protected_method(klass, mid, func, arity) rb_define_protected_method((klass), (mid), (VALUE (*)(ANYARGS))(func), (arity))
+#define rb_define_private_method(klass, mid, func, arity)   rb_define_private_method((klass), (mid), (VALUE (*)(ANYARGS))(func), (arity))
+#define rb_define_module_function(mod, mid, func, arity)    rb_define_module_function((mod), (mid), (VALUE (*)(ANYARGS))(func), (arity))
+#define rb_define_global_function(mid, func, arity)         rb_define_global_function((mid), (VALUE (*)(ANYARGS))(func), (arity))
+
+#undef RBIMPL_CAST_FN_PTR
+#endif /* defined(RBIMPL_CAST_FN_PTR) && !defined(__cplusplus) */
+
 /**
  * This  macro is  to properly  cast  a function  parameter of  *_define_method
  * family.  It  has been  around since  1.x era so  you can  maximise backwards
diff --git a/include/ruby/internal/arithmetic/int.h b/include/ruby/internal/arithmetic/int.h
index 6bd8ec21845945..7b24d16887da13 100644
--- a/include/ruby/internal/arithmetic/int.h
+++ b/include/ruby/internal/arithmetic/int.h
@@ -254,7 +254,7 @@ static inline VALUE
 rb_uint2num_inline(unsigned int v)
 {
     if (RB_POSFIXABLE(v))
-        return RB_LONG2FIX(v);
+        return RB_LONG2FIX(RBIMPL_CAST((long)v));
     else
         return rb_uint2big(v);
 }
diff --git a/include/ruby/internal/arithmetic/long.h b/include/ruby/internal/arithmetic/long.h
index 6b8fd8ffc31953..6c00dbceb71e32 100644
--- a/include/ruby/internal/arithmetic/long.h
+++ b/include/ruby/internal/arithmetic/long.h
@@ -114,11 +114,11 @@ RB_INT2FIX(long i)
 
     /* :NOTE: VALUE can be wider than long.  As j being unsigned, 2j+1 is fully
      * defined. Also it can be compiled into a single LEA instruction. */
-    const unsigned long j = i;
+    const unsigned long j = RBIMPL_CAST((unsigned long)i);
     const unsigned long k = (j << 1) + RUBY_FIXNUM_FLAG;
-    const long          l = k;
+    const long          l = RBIMPL_CAST((long)k);
     const SIGNED_VALUE  m = l; /* Sign extend */
-    const VALUE         n = m;
+    const VALUE         n = RBIMPL_CAST((VALUE)m);
 
     RBIMPL_ASSERT_OR_ASSUME(RB_FIXNUM_P(n));
     return n;
@@ -166,7 +166,7 @@ rbimpl_fix2long_by_idiv(VALUE x)
     /* :NOTE: VALUE  can be wider  than long.  (x-1)/2 never  overflows because
      * RB_FIXNUM_P(x)  holds.   Also it  has  no  portability issue  like  y>>1
      * below. */
-    const SIGNED_VALUE y = x - RUBY_FIXNUM_FLAG;
+    const SIGNED_VALUE y = RBIMPL_CAST((SIGNED_VALUE)(x - RUBY_FIXNUM_FLAG));
     const SIGNED_VALUE z = y / 2;
     const long         w = RBIMPL_CAST((long)z);
 
@@ -193,7 +193,7 @@ rbimpl_fix2long_by_shift(VALUE x)
 
     /* :NOTE: VALUE can be wider than long.  If right shift is arithmetic, this
      * is noticeably faster than above. */
-    const SIGNED_VALUE y = x;
+    const SIGNED_VALUE y = RBIMPL_CAST((SIGNED_VALUE)x);
     const SIGNED_VALUE z = y >> 1;
     const long         w = RBIMPL_CAST((long)z);
 
@@ -252,7 +252,7 @@ static inline unsigned long
 rb_fix2ulong(VALUE x)
 {
     RBIMPL_ASSERT_OR_ASSUME(RB_FIXNUM_P(x));
-    return rb_fix2long(x);
+    return RBIMPL_CAST((unsigned long)rb_fix2long(x));
 }
 
 /**
@@ -323,7 +323,7 @@ static inline VALUE
 rb_ulong2num_inline(unsigned long v)
 {
     if (RB_POSFIXABLE(v))
-        return RB_LONG2FIX(v);
+        return RB_LONG2FIX(RBIMPL_CAST((long)v));
     else
         return rb_uint2big(v);
 }
diff --git a/include/ruby/internal/arithmetic/long_long.h b/include/ruby/internal/arithmetic/long_long.h
index 65dec8729df623..aab455c83075aa 100644
--- a/include/ruby/internal/arithmetic/long_long.h
+++ b/include/ruby/internal/arithmetic/long_long.h
@@ -127,7 +127,7 @@ static inline unsigned LONG_LONG
 rb_num2ull_inline(VALUE x)
 {
     if (RB_FIXNUM_P(x))
-        return RB_FIX2LONG(x);
+        return RBIMPL_CAST((unsigned LONG_LONG)RB_FIX2LONG(x));
     else
         return rb_num2ull(x);
 }
diff --git a/include/ruby/internal/arithmetic/st_data_t.h b/include/ruby/internal/arithmetic/st_data_t.h
index 3bff4ffc0bff41..91776b3fce5af4 100644
--- a/include/ruby/internal/arithmetic/st_data_t.h
+++ b/include/ruby/internal/arithmetic/st_data_t.h
@@ -58,7 +58,7 @@ RBIMPL_ATTR_ARTIFICIAL()
 static inline VALUE
 RB_ST2FIX(st_data_t i)
 {
-    SIGNED_VALUE x = i;
+    SIGNED_VALUE x = RBIMPL_CAST((SIGNED_VALUE)i);
 
     if (x >= 0) {
         x &= RUBY_FIXNUM_MAX;
@@ -69,7 +69,7 @@ RB_ST2FIX(st_data_t i)
 
     RBIMPL_ASSERT_OR_ASSUME(RB_FIXABLE(x));
     unsigned long y = RBIMPL_CAST((unsigned long)x);
-    return RB_LONG2FIX(y);
+    return RB_LONG2FIX(RBIMPL_CAST((long)y));
 }
 
 #endif /* RBIMPL_ARITHMETIC_ST_DATA_T_H */
diff --git a/include/ruby/internal/attr/noexcept.h b/include/ruby/internal/attr/noexcept.h
index ea3001df2afedf..7c3f92f1e79e91 100644
--- a/include/ruby/internal/attr/noexcept.h
+++ b/include/ruby/internal/attr/noexcept.h
@@ -54,7 +54,7 @@
  *       get smarter and  smarter.  Today they can infer if  it actually throws
  *       or not without any annotations by humans (correct me if I'm wrong).
  *
- *     - When an inline function attributed `noexcepr` actually _does_ throw an
+ *     - When an inline function attributed `noexcept` actually _does_ throw an
  *       exception:  they  have to  call  `std::terminate`  then (C++  standard
  *       mandates  so).  This  means exception  handling routines  are actually
  *       enforced, not  omitted.  This doesn't impact  runtime performance (The
diff --git a/include/ruby/internal/attr/nonstring.h b/include/ruby/internal/attr/nonstring.h
new file mode 100644
index 00000000000000..9a66180e19e2d2
--- /dev/null
+++ b/include/ruby/internal/attr/nonstring.h
@@ -0,0 +1,38 @@
+#ifndef RBIMPL_ATTR_NONSTRING_H                        /*-*-C++-*-vi:se ft=cpp:*/
+#define RBIMPL_ATTR_NONSTRING_H
+/**
+ * @file
+ * @author     Ruby developers <ruby-core@ruby-lang.org>
+ * @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    Symbols   prefixed  with   either  `RBIMPL`   or  `rbimpl`   are
+ *             implementation details.   Don't take  them as canon.  They could
+ *             rapidly appear then vanish.  The name (path) of this header file
+ *             is also an  implementation detail.  Do not expect  it to persist
+ *             at the place it is now.  Developers are free to move it anywhere
+ *             anytime at will.
+ * @note       To  ruby-core:  remember  that   this  header  can  be  possibly
+ *             recursively included  from extension  libraries written  in C++.
+ *             Do not  expect for  instance `__VA_ARGS__` is  always available.
+ *             We assume C99  for ruby itself but we don't  assume languages of
+ *             extension libraries.  They could be written in C++98.
+ * @brief      Defines #RBIMPL_ATTR_NONSTRING.
+ */
+#include "ruby/internal/has/attribute.h"
+
+/** Wraps (or simulates) `__attribute__((nonstring))` */
+#if RBIMPL_HAS_ATTRIBUTE(nonstring)
+# define RBIMPL_ATTR_NONSTRING() __attribute__((nonstring))
+# if RBIMPL_COMPILER_SINCE(GCC, 15, 0, 0)
+#   define RBIMPL_ATTR_NONSTRING_ARRAY() RBIMPL_ATTR_NONSTRING()
+# else
+#   define RBIMPL_ATTR_NONSTRING_ARRAY() /* void */
+# endif
+#else
+# define RBIMPL_ATTR_NONSTRING() /* void */
+# define RBIMPL_ATTR_NONSTRING_ARRAY() /* void */
+#endif
+
+#endif /* RBIMPL_ATTR_NONSTRING_H */
diff --git a/include/ruby/internal/core/rarray.h b/include/ruby/internal/core/rarray.h
index 90690fe7945495..73cc0f5dd9c081 100644
--- a/include/ruby/internal/core/rarray.h
+++ b/include/ruby/internal/core/rarray.h
@@ -80,6 +80,8 @@
  * here is at least incomplete.
  */
 enum ruby_rarray_flags {
+    /* RUBY_FL_USER0 is for ELTS_SHARED */
+
     /**
      * This flag  has something to do  with memory footprint.  If  the array is
      * "small"  enough, ruby  tries to  be creative  to abuse  padding bits  of
@@ -99,8 +101,6 @@ enum ruby_rarray_flags {
      */
     RARRAY_EMBED_FLAG      = RUBY_FL_USER1,
 
-    /* RUBY_FL_USER2 is for ELTS_SHARED */
-
     /**
      * When an array employs embedded strategy (see ::RARRAY_EMBED_FLAG), these
      * bits  are used  to store  the number  of elements  actually filled  into
diff --git a/include/ruby/internal/core/rbasic.h b/include/ruby/internal/core/rbasic.h
index 4617f743a79a20..35af03f7c807e3 100644
--- a/include/ruby/internal/core/rbasic.h
+++ b/include/ruby/internal/core/rbasic.h
@@ -55,23 +55,27 @@ enum ruby_rvalue_flags {
     RVALUE_EMBED_LEN_MAX = RBIMPL_RVALUE_EMBED_LEN_MAX
 };
 
+#if (SIZEOF_VALUE < SIZEOF_UINT64_T)
+#define RBASIC_SHAPE_ID_FIELD 1
+#else
+#define RBASIC_SHAPE_ID_FIELD 0
+#endif
+
 /**
- * Ruby's object's,  base components.  Every  single ruby objects have  them in
- * common.
+ * Ruby object's base components. All Ruby objects have them in common.
  */
 struct
 RUBY_ALIGNAS(SIZEOF_VALUE)
 RBasic {
 
     /**
-     * Per-object  flags.  Each  ruby  objects have  their own  characteristics
-     * apart from their  classes.  For instance whether an object  is frozen or
-     * not is not  controlled by its class.  This is  where such properties are
-     * stored.
+     * Per-object flags.   Each Ruby object  has its own  characteristics apart
+     * from its class.  For instance, whether an object is frozen or not is not
+     * controlled by its class.  This is where such properties are stored.
      *
      * @see enum ::ruby_fl_type
      *
-     * @note  This is ::VALUE rather than  an enum for alignment purpose.  Back
+     * @note  This is ::VALUE rather than  an enum for alignment purposes.  Back
      *        in the 1990s there were no such thing like `_Alignas` in C.
      */
     VALUE flags;
@@ -79,14 +83,18 @@ RBasic {
     /**
      * Class of an object.  Every object has its class.  Also, everything is an
      * object  in Ruby.   This means  classes are  also objects.   Classes have
-     * their own classes,  classes of classes have their classes,  too ...  and
-     * it recursively continues forever.
+     * their own classes,  classes  of classes have their classes too,  and  it
+     * recursively continues forever.
      *
-     * Also note the `const` qualifier.  In  ruby an object cannot "change" its
+     * Also note the `const` qualifier.  In Ruby, an object cannot "change" its
      * class.
      */
     const VALUE klass;
 
+#if RBASIC_SHAPE_ID_FIELD
+    VALUE shape_id;
+#endif
+
 #ifdef __cplusplus
   public:
     RBIMPL_ATTR_CONSTEXPR(CXX11)
@@ -102,6 +110,9 @@ RBasic {
     RBasic() :
         flags(RBIMPL_VALUE_NULL),
         klass(RBIMPL_VALUE_NULL)
+#if RBASIC_SHAPE_ID_FIELD
+        , shape_id(RBIMPL_VALUE_NULL)
+#endif
     {
     }
 #endif
diff --git a/include/ruby/internal/core/rclass.h b/include/ruby/internal/core/rclass.h
index b0b6bfc80ce3b9..6f78cc569bf751 100644
--- a/include/ruby/internal/core/rclass.h
+++ b/include/ruby/internal/core/rclass.h
@@ -58,7 +58,7 @@ enum ruby_rmodule_flags {
      * rb_mod_refine()  has this  flag set.   This  is the  bit which  controls
      * difference between normal inclusion versus refinements.
      */
-    RMODULE_IS_REFINEMENT            = RUBY_FL_USER3
+    RMODULE_IS_REFINEMENT            = RUBY_FL_USER1
 };
 
 struct RClass; /* Opaque, declared here for RCLASS() macro. */
diff --git a/include/ruby/internal/core/rdata.h b/include/ruby/internal/core/rdata.h
index 43ab3c01e7a218..cab412af7229b9 100644
--- a/include/ruby/internal/core/rdata.h
+++ b/include/ruby/internal/core/rdata.h
@@ -37,12 +37,8 @@
 #include "ruby/defines.h"
 
 /** @cond INTERNAL_MACRO */
-#ifdef RUBY_UNTYPED_DATA_WARNING
-# /* Take that. */
-#elif defined(RUBY_EXPORT)
-# define RUBY_UNTYPED_DATA_WARNING 1
-#else
-# define RUBY_UNTYPED_DATA_WARNING 0
+#ifndef RUBY_UNTYPED_DATA_WARNING
+#define RUBY_UNTYPED_DATA_WARNING 1
 #endif
 
 #define RBIMPL_DATA_FUNC(f) RBIMPL_CAST((void (*)(void *))(f))
@@ -137,6 +133,12 @@ struct RData {
      */
     RUBY_DATA_FUNC dmark;
 
+    /** Pointer to the actual C level struct that you want to wrap.
+      * This is in between dmark and dfree to allow DATA_PTR to continue
+      * to work for both RData and non-embedded RTypedData.
+      */
+    void *data;
+
     /**
      * This function is called when the object  is no longer used.  You need to
      * do whatever necessary to avoid memory leaks.
@@ -145,9 +147,6 @@ struct RData {
      *           impossible at that moment (that is why GC runs).
      */
     RUBY_DATA_FUNC dfree;
-
-    /** Pointer to the actual C level struct that you want to wrap. */
-    void *data;
 };
 
 RBIMPL_SYMBOL_EXPORT_BEGIN()
@@ -331,15 +330,6 @@ rb_data_object_get_warning(VALUE obj)
     return rb_data_object_get(obj);
 }
 
-#if defined(HAVE_BUILTIN___BUILTIN_CHOOSE_EXPR_CONSTANT_P)
-# define rb_data_object_wrap_warning(klass, ptr, mark, free) \
-    RB_GNUC_EXTENSION(                                       \
-        __builtin_choose_expr(                               \
-            __builtin_constant_p(klass) && !(klass),         \
-            rb_data_object_wrap(klass, ptr, mark, free),     \
-            (rb_data_object_wrap_warning)(klass, ptr, mark, free)))
-#endif
-
 /**
  * This is an implementation detail  of #Data_Make_Struct.  People don't use it
  * directly.
diff --git a/include/ruby/internal/core/robject.h b/include/ruby/internal/core/robject.h
index c2bcae630610ce..d84e318a2cfe80 100644
--- a/include/ruby/internal/core/robject.h
+++ b/include/ruby/internal/core/robject.h
@@ -42,10 +42,10 @@
  */
 #define ROBJECT(obj)          RBIMPL_CAST((struct RObject *)(obj))
 /** @cond INTERNAL_MACRO */
-#define ROBJECT_EMBED_LEN_MAX ROBJECT_EMBED_LEN_MAX
-#define ROBJECT_EMBED         ROBJECT_EMBED
-#define ROBJECT_IV_CAPACITY   ROBJECT_IV_CAPACITY
-#define ROBJECT_IVPTR         ROBJECT_IVPTR
+#define ROBJECT_EMBED_LEN_MAX       ROBJECT_EMBED_LEN_MAX
+#define ROBJECT_EMBED               ROBJECT_EMBED
+#define ROBJECT_FIELDS_CAPACITY     ROBJECT_FIELDS_CAPACITY
+#define ROBJECT_FIELDS              ROBJECT_FIELDS
 /** @endcond */
 
 /**
@@ -94,17 +94,7 @@ struct RObject {
          */
         struct {
             /** Pointer to a C array that holds instance variables. */
-            VALUE *ivptr;
-
-            /**
-             * This  is a  table that  holds  instance variable  name to  index
-             * mapping.  Used when accessing instance variables using names.
-             *
-             * @internal
-             *
-             * This is a shortcut for `RCLASS_IV_INDEX_TBL(rb_obj_class(obj))`.
-             */
-            struct rb_id_table *iv_index_tbl;
+            VALUE *fields;
         } heap;
 
         /* Embedded instance variables. When an object is small enough, it
@@ -133,7 +123,7 @@ RBIMPL_ATTR_ARTIFICIAL()
  * @shyouhei finds no reason for this to be visible from extension libraries.
  */
 static inline VALUE *
-ROBJECT_IVPTR(VALUE obj)
+ROBJECT_FIELDS(VALUE obj)
 {
     RBIMPL_ASSERT_TYPE(obj, RUBY_T_OBJECT);
 
@@ -143,7 +133,7 @@ ROBJECT_IVPTR(VALUE obj)
         return ptr->as.ary;
     }
     else {
-        return ptr->as.heap.ivptr;
+        return ptr->as.heap.fields;
     }
 }
 
diff --git a/include/ruby/internal/core/rtypeddata.h b/include/ruby/internal/core/rtypeddata.h
index c7904746fd0115..edf482267abecc 100644
--- a/include/ruby/internal/core/rtypeddata.h
+++ b/include/ruby/internal/core/rtypeddata.h
@@ -114,6 +114,11 @@
 #define RUBY_TYPED_PROMOTED1         RUBY_TYPED_PROMOTED1
 /** @endcond */
 
+#define IS_TYPED_DATA ((VALUE)1)
+#define TYPED_DATA_EMBEDDED ((VALUE)2)
+#define TYPED_DATA_PTR_FLAGS ((VALUE)3)
+#define TYPED_DATA_PTR_MASK (~TYPED_DATA_PTR_FLAGS)
+
 /**
  * @private
  *
@@ -137,6 +142,8 @@ rbimpl_typeddata_flags {
      */
     RUBY_TYPED_FREE_IMMEDIATELY = 1,
 
+    RUBY_TYPED_EMBEDDABLE = 2,
+
     /**
      * This flag has something to do with Ractor.  Multiple Ractors run without
      * protecting each  other.  Sharing  an object  among Ractors  is basically
@@ -349,18 +356,16 @@ struct RTypedData {
     struct RBasic basic;
 
     /**
+     * This is a `const rb_data_type_t *const` value, with the low bits set:
+     *
+     * 1: Always set, to differentiate RTypedData from RData.
+     * 2: Set if object is embedded.
+     *
      * This field  stores various  information about how  Ruby should  handle a
      * data.   This roughly  resembles a  Ruby level  class (apart  from method
      * definition etc.)
      */
-    const rb_data_type_t *const type;
-
-    /**
-     * This has to be always 1.
-     *
-     * @internal
-     */
-    const VALUE typed_flag;
+    const VALUE type;
 
     /** Pointer to the actual C level struct that you want to wrap. */
     void *data;
@@ -460,14 +465,13 @@ RBIMPL_SYMBOL_EXPORT_END()
  */
 #define TypedData_Make_Struct0(result, klass, type, size, data_type, sval) \
     VALUE result = rb_data_typed_object_zalloc(klass, size, data_type);    \
-    (sval) = RBIMPL_CAST((type *)RTYPEDDATA_DATA(result));                  \
+    (sval) = (type *)RTYPEDDATA_GET_DATA(result); \
     RBIMPL_CAST(/*suppress unused variable warnings*/(void)(sval))
 
 /**
  * Identical to #TypedData_Wrap_Struct,  except it allocates a  new data region
  * internally instead of taking an existing  one.  The allocation is done using
- * ruby_calloc().  Hence  it makes no sense  for `data_type->function.dfree` to
- * be anything other than ::RUBY_TYPED_DEFAULT_FREE.
+ * ruby_calloc().
  *
  * @param      klass          Ruby level class of the object.
  * @param      type           Type name of the C struct.
@@ -511,6 +515,36 @@ RBIMPL_SYMBOL_EXPORT_END()
 #define TypedData_Get_Struct(obj,type,data_type,sval) \
     ((sval) = RBIMPL_CAST((type *)rb_check_typeddata((obj), (data_type))))
 
+static inline bool
+RTYPEDDATA_EMBEDDED_P(VALUE obj)
+{
+#if RUBY_DEBUG
+    if (RB_UNLIKELY(!RB_TYPE_P(obj, RUBY_T_DATA))) {
+        Check_Type(obj, RUBY_T_DATA);
+        RBIMPL_UNREACHABLE_RETURN(false);
+    }
+#endif
+
+    return (RTYPEDDATA(obj)->type) & TYPED_DATA_EMBEDDED;
+}
+
+static inline void *
+RTYPEDDATA_GET_DATA(VALUE obj)
+{
+#if RUBY_DEBUG
+    if (RB_UNLIKELY(!RB_TYPE_P(obj, RUBY_T_DATA))) {
+        Check_Type(obj, RUBY_T_DATA);
+        RBIMPL_UNREACHABLE_RETURN(false);
+    }
+#endif
+
+    /* We reuse the data pointer in embedded TypedData. We can't use offsetof
+     * since RTypedData a non-POD type in C++. */
+    const size_t embedded_typed_data_size = sizeof(struct RTypedData) - sizeof(void *);
+
+    return RTYPEDDATA_EMBEDDED_P(obj) ? (char *)obj + embedded_typed_data_size : RTYPEDDATA(obj)->data;
+}
+
 RBIMPL_ATTR_PURE()
 RBIMPL_ATTR_ARTIFICIAL()
 /**
@@ -527,7 +561,7 @@ RBIMPL_ATTR_ARTIFICIAL()
 static inline bool
 rbimpl_rtypeddata_p(VALUE obj)
 {
-    return RTYPEDDATA(obj)->typed_flag == 1;
+    return RTYPEDDATA(obj)->type & IS_TYPED_DATA;
 }
 
 RBIMPL_ATTR_PURE_UNLESS_DEBUG()
@@ -573,7 +607,7 @@ RTYPEDDATA_TYPE(VALUE obj)
     }
 #endif
 
-    return RTYPEDDATA(obj)->type;
+    return (const struct rb_data_type_struct *)(RTYPEDDATA(obj)->type & TYPED_DATA_PTR_MASK);
 }
 
 /**
diff --git a/include/ruby/internal/encoding/coderange.h b/include/ruby/internal/encoding/coderange.h
index 7a81208c9e23f5..c89f8715187a07 100644
--- a/include/ruby/internal/encoding/coderange.h
+++ b/include/ruby/internal/encoding/coderange.h
@@ -79,7 +79,7 @@ RBIMPL_ATTR_CONST()
 static inline bool
 RB_ENC_CODERANGE_CLEAN_P(enum ruby_coderange_type cr)
 {
-    return rb_enc_coderange_clean_p(cr);
+    return rb_enc_coderange_clean_p(RBIMPL_CAST((int)cr));
 }
 
 RBIMPL_ATTR_PURE_UNLESS_DEBUG()
diff --git a/include/ruby/internal/encoding/encoding.h b/include/ruby/internal/encoding/encoding.h
index dc3e0151f0420c..a58f9f2b1524b5 100644
--- a/include/ruby/internal/encoding/encoding.h
+++ b/include/ruby/internal/encoding/encoding.h
@@ -28,6 +28,7 @@
 #include "ruby/internal/attr/pure.h"
 #include "ruby/internal/attr/returns_nonnull.h"
 #include "ruby/internal/dllexport.h"
+#include "ruby/internal/encoding/coderange.h"
 #include "ruby/internal/value.h"
 #include "ruby/internal/core/rbasic.h"
 #include "ruby/internal/fl_type.h"
@@ -79,7 +80,7 @@ enum ruby_encoding_consts {
 static inline void
 RB_ENCODING_SET_INLINED(VALUE obj, int encindex)
 {
-    VALUE f = /* upcast */ encindex;
+    VALUE f = /* upcast */ RBIMPL_CAST((VALUE)encindex);
 
     f <<= RUBY_ENCODING_SHIFT;
     RB_FL_UNSET_RAW(obj, RUBY_ENCODING_MASK);
diff --git a/include/ruby/internal/encoding/string.h b/include/ruby/internal/encoding/string.h
index 6ed7ca1c90d8fc..2cfa91c01e1e81 100644
--- a/include/ruby/internal/encoding/string.h
+++ b/include/ruby/internal/encoding/string.h
@@ -30,7 +30,7 @@
 RBIMPL_SYMBOL_EXPORT_BEGIN()
 
 /**
- * Identical to rb_enc_str_new(), except it additionally takes an encoding.
+ * Identical to rb_str_new(), except it additionally takes an encoding.
  *
  * @param[in]  ptr             A memory region of `len` bytes length.
  * @param[in]  len             Length  of `ptr`,  in bytes,  not including  the
@@ -307,13 +307,13 @@ RBIMPL_ATTR_NONNULL(())
 /**
  * Looks for the passed string in the passed buffer.
  *
- * @param[in]  x          Buffer that potentially includes `y`.
+ * @param[in]  x          Query string.
  * @param[in]  m          Number of bytes of `x`.
- * @param[in]  y          Query string.
+ * @param[in]  y          Buffer that potentially includes `x`.
  * @param[in]  n          Number of bytes of `y`.
  * @param[in]  enc        Encoding of both `x` and `y`.
  * @retval     -1         Not found.
- * @retval     otherwise  Found index in `x`.
+ * @retval     otherwise  Found index in `y`.
  * @note       This API can match at a non-character-boundary.
  */
 long rb_memsearch(const void *x, long m, const void *y, long n, rb_encoding *enc);
diff --git a/include/ruby/internal/error.h b/include/ruby/internal/error.h
index 1ce9a30e6fa9dc..3ff885b2b151b7 100644
--- a/include/ruby/internal/error.h
+++ b/include/ruby/internal/error.h
@@ -53,6 +53,9 @@ typedef enum {
     /** Warning is for performance issues (not enabled by -w). */
     RB_WARN_CATEGORY_PERFORMANCE,
 
+    /** Warning is for checking unused block strictly */
+    RB_WARN_CATEGORY_STRICT_UNUSED_BLOCK,
+
     RB_WARN_CATEGORY_DEFAULT_BITS = (
         (1U << RB_WARN_CATEGORY_DEPRECATED) |
         (1U << RB_WARN_CATEGORY_EXPERIMENTAL) |
@@ -62,6 +65,7 @@ typedef enum {
         (1U << RB_WARN_CATEGORY_DEPRECATED) |
         (1U << RB_WARN_CATEGORY_EXPERIMENTAL) |
         (1U << RB_WARN_CATEGORY_PERFORMANCE) |
+        (1U << RB_WARN_CATEGORY_STRICT_UNUSED_BLOCK) |
         0)
 } rb_warning_category_t;
 
@@ -481,7 +485,7 @@ VALUE *rb_ruby_debug_ptr(void);
  */
 #define ruby_debug   (*rb_ruby_debug_ptr())
 
-/* reports if `-W' specified */
+/* reports if $VERBOSE is true */
 RBIMPL_ATTR_NONNULL((1))
 RBIMPL_ATTR_FORMAT(RBIMPL_PRINTF_FORMAT, 1, 2)
 /**
@@ -496,7 +500,8 @@ RBIMPL_ATTR_FORMAT(RBIMPL_PRINTF_FORMAT, 1, 2)
  * default,  the method  just emits  its passed  contents to  ::rb_stderr using
  * rb_io_write().
  *
- * @note       This function is affected by the `-W` flag.
+ * @note       This function is affected by the value of $VERBOSE, it does
+ *             nothing unless $VERBOSE is true.
  * @param[in]  fmt  Format specifier string compatible with rb_sprintf().
  *
  * @internal
@@ -521,7 +526,7 @@ RBIMPL_ATTR_FORMAT(RBIMPL_PRINTF_FORMAT, 3, 4)
  * Issues a compile-time warning  that happens at `__file__:__line__`.  Purpose
  * of this function being exposed to CAPI is unclear.
  *
- * @note       This function is affected by the `-W` flag.
+ * @note       This function is affected by the value of $VERBOSE.
  * @param[in]  file  The path corresponding to Ruby level `__FILE__`.
  * @param[in]  line  The number corresponding to Ruby level `__LINE__`.
  * @param[in]  fmt   Format specifier string compatible with rb_sprintf().
@@ -534,19 +539,20 @@ RBIMPL_ATTR_FORMAT(RBIMPL_PRINTF_FORMAT, 1, 2)
  * Identical to rb_sys_fail(), except it does  not raise an exception to render
  * a warning instead.
  *
- * @note       This function is affected by the `-W` flag.
+ * @note       This function is affected by the value of $VERBOSE.
  * @param[in]  fmt  Format specifier string compatible with rb_sprintf().
  */
 void rb_sys_warning(const char *fmt, ...);
 
-/* reports always */
+/* reports if $VERBOSE is not nil (so if it is true or false) */
 RBIMPL_ATTR_COLD()
 RBIMPL_ATTR_NONNULL((1))
 RBIMPL_ATTR_FORMAT(RBIMPL_PRINTF_FORMAT, 1, 2)
 /**
- * Identical to  rb_warning(), except it  reports always regardless  of runtime
- * `-W` flag.
+ * Identical to rb_warning(), except it reports unless $VERBOSE is nil.
  *
+ * @note       This function is affected by the value of $VERBOSE, it does
+ *             nothing if $VERBOSE is nil.
  * @param[in]  fmt  Format specifier string compatible with rb_sprintf().
  */
 void rb_warn(const char *fmt, ...);
@@ -555,8 +561,7 @@ RBIMPL_ATTR_COLD()
 RBIMPL_ATTR_NONNULL((2))
 RBIMPL_ATTR_FORMAT(RBIMPL_PRINTF_FORMAT, 2, 3)
 /**
- * Identical to  rb_category_warning(), except it reports  always regardless of
- * runtime `-W` flag.
+ * Identical to rb_category_warning(), except it reports unless $VERBOSE is nil.
  *
  * @param[in]  cat  Category e.g. deprecated.
  * @param[in]  fmt  Format specifier string compatible with rb_sprintf().
@@ -566,8 +571,7 @@ void rb_category_warn(rb_warning_category_t cat, const char *fmt, ...);
 RBIMPL_ATTR_NONNULL((1, 3))
 RBIMPL_ATTR_FORMAT(RBIMPL_PRINTF_FORMAT, 3, 4)
 /**
- * Identical to  rb_compile_warning(), except  it reports always  regardless of
- * runtime `-W` flag.
+ * Identical to rb_compile_warning(), except  it reports unless $VERBOSE is nil.
  *
  * @param[in]  file  The path corresponding to Ruby level `__FILE__`.
  * @param[in]  line  The number corresponding to Ruby level `__LINE__`.
diff --git a/include/ruby/internal/fl_type.h b/include/ruby/internal/fl_type.h
index f7f5abdd9b1e35..9e1f3dd15cf84b 100644
--- a/include/ruby/internal/fl_type.h
+++ b/include/ruby/internal/fl_type.h
@@ -62,7 +62,6 @@
 #define FL_TAINT        RBIMPL_CAST((VALUE)RUBY_FL_TAINT)                /**< @old{RUBY_FL_TAINT} */
 #define FL_SHAREABLE    RBIMPL_CAST((VALUE)RUBY_FL_SHAREABLE)            /**< @old{RUBY_FL_SHAREABLE} */
 #define FL_UNTRUSTED    RBIMPL_CAST((VALUE)RUBY_FL_UNTRUSTED)            /**< @old{RUBY_FL_UNTRUSTED} */
-#define FL_SEEN_OBJ_ID  RBIMPL_CAST((VALUE)RUBY_FL_SEEN_OBJ_ID)          /**< @old{RUBY_FL_SEEN_OBJ_ID} */
 #define FL_EXIVAR       RBIMPL_CAST((VALUE)RUBY_FL_EXIVAR)               /**< @old{RUBY_FL_EXIVAR} */
 #define FL_FREEZE       RBIMPL_CAST((VALUE)RUBY_FL_FREEZE)               /**< @old{RUBY_FL_FREEZE} */
 
@@ -249,6 +248,21 @@ ruby_fl_type {
     RBIMPL_ATTR_DEPRECATED(("taintedness turned out to be a wrong idea."))
 #elif defined(_MSC_VER)
 # pragma deprecated(RUBY_FL_TAINT)
+#endif
+
+                         = 0,
+
+    /**
+     * @deprecated  This flag was an implementation detail that should never have
+     *              no been exposed. Exists  here for  backwards
+     *              compatibility only.  You can safely forget about it.
+     */
+    RUBY_FL_EXIVAR
+
+#if defined(RBIMPL_HAVE_ENUM_ATTRIBUTE)
+    RBIMPL_ATTR_DEPRECATED(("FL_EXIVAR is an outdated implementation detail, it shoudl be used."))
+#elif defined(_MSC_VER)
+# pragma deprecated(RUBY_FL_EXIVAR)
 #endif
 
                          = 0,
@@ -280,37 +294,19 @@ ruby_fl_type {
 
                          = 0,
 
-    /**
-     * This flag has something to do with  object IDs.  Unlike in the old days,
-     * an object's object  ID (that a user can  query using `Object#object_id`)
-     * is no longer its physical address represented using Ruby level integers.
-     * It is  now a  monotonic-increasing integer  unrelated to  the underlying
-     * memory arrangement.  Object IDs are assigned when necessary; objects are
-     * born without one,  and will eventually have such  property when queried.
-     * The interpreter has to manage which one is which.  This is the flag that
-     * helps the  management.  Objects  with this  flag set  are the  ones with
-     * object IDs assigned.
-     *
-     * @internal
-     *
-     * But honestly, @shyouhei  doesn't think this flag should  be visible from
-     * 3rd parties.  It must be an implementation detail that they should never
-     * know.  Might better be hidden.
-     */
-    RUBY_FL_SEEN_OBJ_ID  = (1<<9),
+   /**
+    * This flag is no longer in use
+    *
+    * @internal
+    */
+    RUBY_FL_UNUSED9  = (1<<9),
 
-    /**
-     * This flag has something to do with instance variables.  3rd parties need
-     * not  know, but  there are  several ways  to store  an object's  instance
-     * variables.   Objects  with this  flag  use  so-called "generic"  backend
-     * storage.  This  distinction is purely an  implementation detail.  People
-     * need not be aware of this working behind-the-scene.
-     *
-     * @internal
-     *
-     * As of writing everything except ::RObject and RModule use this scheme.
-     */
-    RUBY_FL_EXIVAR       = (1<<10),
+   /**
+    * This flag is no longer in use
+    *
+    * @internal
+    */
+    RUBY_FL_UNUSED10 = (1<<10),
 
     /**
      * This flag has something to do with data immutability.  When this flag is
@@ -370,7 +366,7 @@ ruby_fl_type {
      * 3rd parties.  It must be an implementation detail that they should never
      * know.  Might better be hidden.
      */
-    RUBY_ELTS_SHARED  = RUBY_FL_USER2,
+    RUBY_ELTS_SHARED  = RUBY_FL_USER0,
 
     /**
      * This flag has something to do with an object's class.  There are kind of
@@ -395,7 +391,7 @@ ruby_fl_type {
      * 3rd parties.  It must be an implementation detail that they should never
      * know.  Might better be hidden.
      */
-    RUBY_FL_SINGLETON = RUBY_FL_USER0,
+    RUBY_FL_SINGLETON = RUBY_FL_USER1,
 };
 
 enum {
@@ -412,7 +408,7 @@ enum {
 # pragma deprecated(RUBY_FL_DUPPED)
 #endif
 
-    = (int)RUBY_T_MASK | (int)RUBY_FL_EXIVAR
+    = (int)RUBY_T_MASK
 };
 
 #undef RBIMPL_HAVE_ENUM_ATTRIBUTE
@@ -446,10 +442,8 @@ RB_FL_ABLE(VALUE obj)
     if (RB_SPECIAL_CONST_P(obj)) {
         return false;
     }
-    else if (RB_TYPE_P(obj, RUBY_T_NODE)) {
-        return false;
-    }
     else {
+        RBIMPL_ASSERT_OR_ASSUME(!RB_TYPE_P(obj, RUBY_T_NODE));
         return true;
     }
 }
@@ -457,7 +451,7 @@ RB_FL_ABLE(VALUE obj)
 RBIMPL_ATTR_PURE_UNLESS_DEBUG()
 RBIMPL_ATTR_ARTIFICIAL()
 /**
- * This is an implenentation detail of  RB_FL_TEST().  3rd parties need not use
+ * This is an implementation detail of  RB_FL_TEST().  3rd parties need not use
  * this.  Just always use RB_FL_TEST().
  *
  * @param[in]  obj    Object in question.
@@ -505,7 +499,7 @@ RB_FL_TEST(VALUE obj, VALUE flags)
 RBIMPL_ATTR_PURE_UNLESS_DEBUG()
 RBIMPL_ATTR_ARTIFICIAL()
 /**
- * This is an  implenentation detail of RB_FL_ANY().  3rd parties  need not use
+ * This is an  implementation detail of RB_FL_ANY().  3rd parties  need not use
  * this.  Just always use RB_FL_ANY().
  *
  * @param[in]  obj    Object in question.
@@ -539,7 +533,7 @@ RB_FL_ANY(VALUE obj, VALUE flags)
 RBIMPL_ATTR_PURE_UNLESS_DEBUG()
 RBIMPL_ATTR_ARTIFICIAL()
 /**
- * This is an  implenentation detail of RB_FL_ALL().  3rd parties  need not use
+ * This is an  implementation detail of RB_FL_ALL().  3rd parties  need not use
  * this.  Just always use RB_FL_ALL().
  *
  * @param[in]  obj    Object in question.
@@ -575,7 +569,7 @@ RBIMPL_ATTR_ARTIFICIAL()
 /**
  * @private
  *
- * This is an  implenentation detail of RB_FL_SET().  3rd parties  need not use
+ * This is an  implementation detail of RB_FL_SET().  3rd parties  need not use
  * this.  Just always use RB_FL_SET().
  *
  * @param[out]  obj    Object in question.
@@ -595,7 +589,7 @@ rbimpl_fl_set_raw_raw(struct RBasic *obj, VALUE flags)
 
 RBIMPL_ATTR_ARTIFICIAL()
 /**
- * This is an  implenentation detail of RB_FL_SET().  3rd parties  need not use
+ * This is an  implementation detail of RB_FL_SET().  3rd parties  need not use
  * this.  Just always use RB_FL_SET().
  *
  * @param[out]  obj    Object in question.
@@ -635,7 +629,7 @@ RBIMPL_ATTR_ARTIFICIAL()
 /**
  * @private
  *
- * This is an implenentation detail of RB_FL_UNSET().  3rd parties need not use
+ * This is an implementation detail of RB_FL_UNSET().  3rd parties need not use
  * this.  Just always use RB_FL_UNSET().
  *
  * @param[out]  obj    Object in question.
@@ -655,7 +649,7 @@ rbimpl_fl_unset_raw_raw(struct RBasic *obj, VALUE flags)
 
 RBIMPL_ATTR_ARTIFICIAL()
 /**
- * This is an implenentation detail of RB_FL_UNSET().  3rd parties need not use
+ * This is an implementation detail of RB_FL_UNSET().  3rd parties need not use
  * this.  Just always use RB_FL_UNSET().
  *
  * @param[out]  obj    Object in question.
@@ -690,7 +684,7 @@ RBIMPL_ATTR_ARTIFICIAL()
 /**
  * @private
  *
- * This is an  implenentation detail of RB_FL_REVERSE().  3rd  parties need not
+ * This is an  implementation detail of RB_FL_REVERSE().  3rd  parties need not
  * use this.  Just always use RB_FL_REVERSE().
  *
  * @param[out]  obj    Object in question.
@@ -710,7 +704,7 @@ rbimpl_fl_reverse_raw_raw(struct RBasic *obj, VALUE flags)
 
 RBIMPL_ATTR_ARTIFICIAL()
 /**
- * This is an  implenentation detail of RB_FL_REVERSE().  3rd  parties need not
+ * This is an  implementation detail of RB_FL_REVERSE().  3rd  parties need not
  * use this.  Just always use RB_FL_REVERSE().
  *
  * @param[out]  obj    Object in question.
@@ -866,7 +860,7 @@ RB_OBJ_INFECT(VALUE dst, VALUE src)
 RBIMPL_ATTR_PURE_UNLESS_DEBUG()
 RBIMPL_ATTR_ARTIFICIAL()
 /**
- * This is an  implenentation detail of RB_OBJ_FROZEN().  3rd  parties need not
+ * This is an  implementation detail of RB_OBJ_FROZEN().  3rd  parties need not
  * use this.  Just always use RB_OBJ_FROZEN().
  *
  * @param[in]  obj             Object in question.
@@ -905,9 +899,21 @@ RB_OBJ_FROZEN(VALUE obj)
     }
 }
 
+RUBY_SYMBOL_EXPORT_BEGIN
+/**
+ * Prevents further modifications to the given object.  ::rb_eFrozenError shall
+ * be raised if modification is attempted.
+ *
+ * @param[out]  x               Object in question.
+ * @exception   rb_eNoMemError  Failed   to   allocate memory  for  the  frozen
+ *                              representation of the object.
+ */
+void rb_obj_freeze_inline(VALUE obj);
+RUBY_SYMBOL_EXPORT_END
+
 RBIMPL_ATTR_ARTIFICIAL()
 /**
- * This is an  implenentation detail of RB_OBJ_FREEZE().  3rd  parties need not
+ * This is an  implementation detail of RB_OBJ_FREEZE().  3rd  parties need not
  * use this.  Just always use RB_OBJ_FREEZE().
  *
  * @param[out]  obj  Object in question.
@@ -915,11 +921,7 @@ RBIMPL_ATTR_ARTIFICIAL()
 static inline void
 RB_OBJ_FREEZE_RAW(VALUE obj)
 {
-    RB_FL_SET_RAW(obj, RUBY_FL_FREEZE);
+    rb_obj_freeze_inline(obj);
 }
 
-RUBY_SYMBOL_EXPORT_BEGIN
-void rb_obj_freeze_inline(VALUE obj);
-RUBY_SYMBOL_EXPORT_END
-
 #endif /* RBIMPL_FL_TYPE_H */
diff --git a/include/ruby/internal/gc.h b/include/ruby/internal/gc.h
index 2a5180671ce8df..19783f302342dc 100644
--- a/include/ruby/internal/gc.h
+++ b/include/ruby/internal/gc.h
@@ -44,10 +44,11 @@
 
 RBIMPL_SYMBOL_EXPORT_BEGIN()
 
-#define REF_EDGE(s, p) (offsetof(struct s, p))
-#define REFS_LIST_PTR(l) ((RUBY_DATA_FUNC)l)
+#define RUBY_REF_EDGE(s, p) offsetof(s, p)
+#define RUBY_REFS_LIST_PTR(l) (RUBY_DATA_FUNC)(uintptr_t)(l)
 #define RUBY_REF_END SIZE_MAX
-#define RUBY_REFERENCES_START(t) static size_t t[] = {
+#define RUBY_REFERENCES(t) static const size_t t[]
+#define RUBY_REFERENCES_START(t) RUBY_REFERENCES(t) = {
 #define RUBY_REFERENCES_END RUBY_REF_END, };
 
 /* gc.c */
@@ -208,22 +209,6 @@ void rb_gc_mark_movable(VALUE obj);
  */
 VALUE rb_gc_location(VALUE obj);
 
-/**
- * Asserts  that the  passed  object is  no longer  needed.   Such objects  are
- * reclaimed sooner or later so this  function is not mandatory.  But sometimes
- * you can know  from your application knowledge that an  object is surely dead
- * at some point.  Calling this as a hint can be a polite way.
- *
- * @param[out]  obj  Object, dead.
- * @pre         `obj` have never been passed to this function before.
- * @post        `obj` could be invalidated.
- * @warning     It  is a  failure  to pass  an object  multiple  times to  this
- *              function.
- * @deprecated  This is now a no-op function.
- */
-RBIMPL_ATTR_DEPRECATED(("this is now a no-op function"))
-void rb_gc_force_recycle(VALUE obj);
-
 /**
  * Triggers a GC process.  This was the only  GC entry point that we had at the
  * beginning.  Over time our GC evolved.  Now what this function does is just a
@@ -800,9 +785,7 @@ rb_obj_written(
     RGENGC_LOGGING_OBJ_WRITTEN(a, oldv, b, filename, line);
 #endif
 
-    if (!RB_SPECIAL_CONST_P(b)) {
-        rb_gc_writebarrier(a, b);
-    }
+    rb_gc_writebarrier(a, b);
 
     return a;
 }
@@ -838,4 +821,7 @@ rb_obj_write(
     return a;
 }
 
+RBIMPL_ATTR_DEPRECATED(("Will be removed soon"))
+static inline void rb_gc_force_recycle(VALUE obj){}
+
 #endif /* RBIMPL_GC_H */
diff --git a/include/ruby/internal/globals.h b/include/ruby/internal/globals.h
index 5a414fc47278f1..528371abbb5923 100644
--- a/include/ruby/internal/globals.h
+++ b/include/ruby/internal/globals.h
@@ -84,6 +84,8 @@ RUBY_EXTERN VALUE rb_cMethod;                 /**< `Method` class. */
 RUBY_EXTERN VALUE rb_cModule;                 /**< `Module` class. */
 RUBY_EXTERN VALUE rb_cRefinement;             /**< `Refinement` class. */
 RUBY_EXTERN VALUE rb_cNameErrorMesg;          /**< `NameError::Message` class. */
+RUBY_EXTERN VALUE rb_cNamespace;              /**< `Namespace` class. */
+RUBY_EXTERN VALUE rb_mNamespaceRefiner;       /**< `Namespace::Refiner` module. */
 RUBY_EXTERN VALUE rb_cNilClass;               /**< `NilClass` class. */
 RUBY_EXTERN VALUE rb_cNumeric;                /**< `Numeric` class. */
 RUBY_EXTERN VALUE rb_cProc;                   /**< `Proc` class. */
@@ -91,10 +93,11 @@ RUBY_EXTERN VALUE rb_cRandom;                 /**< `Random` class. */
 RUBY_EXTERN VALUE rb_cRange;                  /**< `Range` class. */
 RUBY_EXTERN VALUE rb_cRational;               /**< `Rational` class. */
 RUBY_EXTERN VALUE rb_cRegexp;                 /**< `Regexp` class. */
+RUBY_EXTERN VALUE rb_cSet;                    /**< `Set` class. */
 RUBY_EXTERN VALUE rb_cStat;                   /**< `File::Stat` class. */
 RUBY_EXTERN VALUE rb_cString;                 /**< `String` class. */
 RUBY_EXTERN VALUE rb_cStruct;                 /**< `Struct` class. */
-RUBY_EXTERN VALUE rb_cSymbol;                 /**< `Sumbol` class. */
+RUBY_EXTERN VALUE rb_cSymbol;                 /**< `Symbol` class. */
 RUBY_EXTERN VALUE rb_cThread;                 /**< `Thread` class. */
 RUBY_EXTERN VALUE rb_cTime;                   /**< `Time` class. */
 RUBY_EXTERN VALUE rb_cTrueClass;              /**< `TrueClass` class. */
diff --git a/include/ruby/internal/has/builtin.h b/include/ruby/internal/has/builtin.h
index 243ba2a34c2d4a..8e7fb173d8a3a6 100644
--- a/include/ruby/internal/has/builtin.h
+++ b/include/ruby/internal/has/builtin.h
@@ -48,6 +48,7 @@
 # /* https://gcc.gnu.org/bugzilla/show_bug.cgi?id=66970 */
 # define RBIMPL_HAS_BUILTIN(_) (RBIMPL_HAS_BUILTIN_ ## _)
 # define RBIMPL_HAS_BUILTIN___builtin_add_overflow      RBIMPL_COMPILER_SINCE(GCC, 5, 1, 0)
+# define RBIMPL_HAS_BUILTIN___builtin_add_overflow_p    RBIMPL_COMPILER_SINCE(GCC, 7, 0, 0)
 # define RBIMPL_HAS_BUILTIN___builtin_alloca            RBIMPL_COMPILER_SINCE(GCC, 0, 0, 0)
 # define RBIMPL_HAS_BUILTIN___builtin_alloca_with_align RBIMPL_COMPILER_SINCE(GCC, 6, 1, 0)
 # define RBIMPL_HAS_BUILTIN___builtin_assume            0
@@ -75,6 +76,7 @@
 # define RBIMPL_HAS_BUILTIN___builtin_rotateright32     0
 # define RBIMPL_HAS_BUILTIN___builtin_rotateright64     0
 # define RBIMPL_HAS_BUILTIN___builtin_sub_overflow      RBIMPL_COMPILER_SINCE(GCC, 5, 1, 0)
+# define RBIMPL_HAS_BUILTIN___builtin_sub_overflow_p    RBIMPL_COMPILER_SINCE(GCC, 7, 0, 0)
 # define RBIMPL_HAS_BUILTIN___builtin_unreachable       RBIMPL_COMPILER_SINCE(GCC, 4, 5, 0)
 # /* Note that "0, 0, 0" might be inaccurate. */
 
@@ -82,6 +84,7 @@
 # /* Take config.h definition when available */
 # define RBIMPL_HAS_BUILTIN(_) ((RBIMPL_HAS_BUILTIN_ ## _)+0)
 # define RBIMPL_HAS_BUILTIN___builtin_add_overflow      HAVE_BUILTIN___BUILTIN_ADD_OVERFLOW
+# define RBIMPL_HAS_BUILTIN___builtin_add_overflow_p    HAVE_BUILTIN___BUILTIN_ADD_OVERFLOW_P
 # define RBIMPL_HAS_BUILTIN___builtin_alloca            0
 # define RBIMPL_HAS_BUILTIN___builtin_alloca_with_align HAVE_BUILTIN___BUILTIN_ALLOCA_WITH_ALIGN
 # define RBIMPL_HAS_BUILTIN___builtin_assume            0
@@ -107,6 +110,7 @@
 # define RBIMPL_HAS_BUILTIN___builtin_rotateright64     0
 # define RBIMPL_HAS_BUILTIN___builtin_popcountll        HAVE_BUILTIN___BUILTIN_POPCOUNTLL
 # define RBIMPL_HAS_BUILTIN___builtin_sub_overflow      HAVE_BUILTIN___BUILTIN_SUB_OVERFLOW
+# define RBIMPL_HAS_BUILTIN___builtin_sub_overflow_p    HAVE_BUILTIN___BUILTIN_SUB_OVERFLOW_P
 # if defined(HAVE___BUILTIN_UNREACHABLE)
 #  define RBIMPL_HAS_BUILTIN___builtin_unreachable 1
 # else
diff --git a/include/ruby/internal/intern/array.h b/include/ruby/internal/intern/array.h
index 2262c6f0c621b1..b2cc6b132dae8a 100644
--- a/include/ruby/internal/intern/array.h
+++ b/include/ruby/internal/intern/array.h
@@ -144,7 +144,13 @@ void rb_ary_free(VALUE ary);
  */
 void rb_ary_modify(VALUE ary);
 
-/** @alias{rb_obj_freeze} */
+/**
+ * Freeze an array, preventing further modifications. The underlying  buffer may
+ * be shrunk before freezing to conserve memory.
+ *
+ * @param[out]  obj  Object assumed to be an array to freeze.
+ * @see         RB_OBJ_FREEZE()
+ */
 VALUE rb_ary_freeze(VALUE obj);
 
 RBIMPL_ATTR_PURE()
@@ -187,7 +193,7 @@ VALUE rb_ary_shared_with_p(VALUE lhs, VALUE rhs);
  *     : (int i)                 -> T?
  *     | (int beg, int len)      -> ::Array[T]?
  *     | (Range[int] r)          -> ::Array[T]?
- *     | (ArithmeticSequence as) -> ::Array[T]? # This also raises RagneError.
+ *     | (ArithmeticSequence as) -> ::Array[T]? # This also raises RangeError.
  * end
  * ```
  */
diff --git a/include/ruby/internal/intern/bignum.h b/include/ruby/internal/intern/bignum.h
index 43d68018de9e77..c27f77a1fb6eb9 100644
--- a/include/ruby/internal/intern/bignum.h
+++ b/include/ruby/internal/intern/bignum.h
@@ -51,7 +51,7 @@ RBIMPL_SYMBOL_EXPORT_BEGIN()
 VALUE rb_big_new(size_t len, int sign);
 
 /**
- * Queries if  the passed bignum  instance is a  "bigzro".  What is  a bigzero?
+ * Queries if  the passed bignum  instance is a  "bigzero".  What is a bigzero?
  * Well, bignums  are for very big  integers, but can also  represent tiny ones
  * like -1,  0, 1.   Bigzero are  instances of bignums  whose values  are zero.
  * Knowing if a bignum is bigzero can  be handy on occasions, like for instance
@@ -793,7 +793,7 @@ size_t rb_absint_size(VALUE val, int *nlz_bits_ret);
  * @exception   rb_eTypeError  `val` doesn't respond to `#to_int`.
  * @retval      (size_t)-1     Overflowed.
  * @retval      otherwise
-                `((val_numbits * CHAR_BIT + word_numbits - 1) / word_numbits)`,
+ *              `((val_numbits * CHAR_BIT + word_numbits - 1) / word_numbits)`,
  *              where val_numbits is the number of bits of `abs(val)`.
  * @post        If  `nlz_bits_ret` is  not  `NULL` and  there  is no  overflow,
  *              `(return_value * word_numbits - val_numbits)`   is  stored   in
diff --git a/include/ruby/internal/intern/class.h b/include/ruby/internal/intern/class.h
index 0fb2d001bcdb6d..357af5d176bfcb 100644
--- a/include/ruby/internal/intern/class.h
+++ b/include/ruby/internal/intern/class.h
@@ -88,8 +88,8 @@ VALUE rb_define_class_id(ID id, VALUE super);
  * @post        `outer::id` refers the returned class.
  * @note        If a class named `id` is  already defined and its superclass is
  *              `super`, the function just returns the defined class.
- * @note        The  compaction  GC does  not  move  classes returned  by  this
- *              function.
+ * @note        The GC does not collect nor move classes returned by this
+ *              function. They are immortal.
  */
 VALUE rb_define_class_id_under(VALUE outer, ID id, VALUE super);
 
@@ -127,8 +127,8 @@ VALUE rb_define_module_id(ID id);
  *                             constant is not a module.
  * @return      The created module.
  * @post        `outer::id` refers the returned module.
- * @note        The  compaction  GC does  not  move  classes returned  by  this
- *              function.
+ * @note        The GC does not collect nor move classes returned by this
+ *              function. They are immortal.
  */
 VALUE rb_define_module_id_under(VALUE outer, ID id);
 
diff --git a/include/ruby/internal/intern/error.h b/include/ruby/internal/intern/error.h
index bf8daadd3e978c..1fd9ec2f516eb3 100644
--- a/include/ruby/internal/intern/error.h
+++ b/include/ruby/internal/intern/error.h
@@ -237,6 +237,8 @@ RBIMPL_ATTR_NORETURN()
  */
 void rb_error_arity(int argc, int min, int max);
 
+void rb_str_modify(VALUE str);
+
 RBIMPL_SYMBOL_EXPORT_END()
 
 /**
@@ -244,12 +246,7 @@ RBIMPL_SYMBOL_EXPORT_END()
  *
  * Does anyone use this?  Remain not deleted for compatibility.
  */
-#define rb_check_frozen_internal(obj) do { \
-        VALUE frozen_obj = (obj); \
-        if (RB_UNLIKELY(RB_OBJ_FROZEN(frozen_obj))) { \
-            rb_error_frozen_object(frozen_obj); \
-        } \
-    } while (0)
+#define rb_check_frozen_internal rb_check_frozen
 
 /** @alias{rb_check_frozen} */
 static inline void
@@ -258,9 +255,16 @@ rb_check_frozen_inline(VALUE obj)
     if (RB_UNLIKELY(RB_OBJ_FROZEN(obj))) {
         rb_error_frozen_object(obj);
     }
+
+    /* ref: internal CHILLED_STRING_P()
+       This is an implementation detail subject to change. */
+    if (RB_UNLIKELY(RB_TYPE_P(obj, T_STRING) && FL_TEST_RAW(obj, RUBY_FL_USER2 | RUBY_FL_USER3))) { // STR_CHILLED
+        rb_str_modify(obj);
+    }
 }
 
-/** @alias{rb_check_frozen} */
+/* rb_check_frozen() is available as a symbol, but have
+ * the inline version take priority for native consumers. */
 #define rb_check_frozen rb_check_frozen_inline
 
 /**
diff --git a/include/ruby/internal/intern/file.h b/include/ruby/internal/intern/file.h
index 79820fdc61657c..b669758d21ac09 100644
--- a/include/ruby/internal/intern/file.h
+++ b/include/ruby/internal/intern/file.h
@@ -24,6 +24,9 @@
 #include "ruby/internal/attr/pure.h"
 #include "ruby/internal/dllexport.h"
 #include "ruby/internal/value.h"
+#if !defined RUBY_EXPORT && !defined RUBY_NO_OLD_COMPATIBILITY
+# include "ruby/backward.h"
+#endif
 
 RBIMPL_SYMBOL_EXPORT_BEGIN()
 
@@ -208,6 +211,22 @@ int rb_is_absolute_path(const char *path);
  */
 rb_off_t rb_file_size(VALUE file);
 
+#ifdef RBIMPL_ATTR_DEPRECATED_INTERNAL_ONLY
+RBIMPL_ATTR_DEPRECATED_INTERNAL_ONLY()
+#endif
+/**
+ * If the PATH_SEPARATOR-separated list of directory names contains the name of
+ * a world-writable directory, issue a warning  for it.  This may do nothing on
+ * some platforms.
+ *
+ * @param[in]  path       A local path.
+ * @retval     0          The "check" succeeded.
+ * @retval     otherwise  The "check" failed.
+ * @note       This  feature may  be  disabled  by setting  `ENABLE_PATH_CHECK`
+ *             macro to zero at compilation time.
+ */
+int rb_path_check(const char *path);
+
 RBIMPL_SYMBOL_EXPORT_END()
 
 #endif /* RBIMPL_INTERN_FILE_H */
diff --git a/include/ruby/internal/intern/hash.h b/include/ruby/internal/intern/hash.h
index af8dfd5d8f8acd..504770fa5fcd55 100644
--- a/include/ruby/internal/intern/hash.h
+++ b/include/ruby/internal/intern/hash.h
@@ -284,20 +284,6 @@ typedef VALUE rb_hash_update_func(VALUE newkey, VALUE oldkey, VALUE value);
  */
 VALUE rb_hash_update_by(VALUE hash1, VALUE hash2, rb_hash_update_func *func);
 
-/* file.c */
-
-/**
- * This function is mysterious.  What it does is not immediately obvious.  Also
- * what it does seems platform dependent.
- *
- * @param[in]  path       A local path.
- * @retval     0          The "check" succeeded.
- * @retval     otherwise  The "check" failed.
- */
-int rb_path_check(const char *path);
-
-/* hash.c */
-
 /**
  * Destructively removes every environment variables of the running process.
  *
diff --git a/include/ruby/internal/intern/io.h b/include/ruby/internal/intern/io.h
index 02c249723ef7a3..b9eb258cc100e3 100644
--- a/include/ruby/internal/intern/io.h
+++ b/include/ruby/internal/intern/io.h
@@ -385,7 +385,7 @@ VALUE rb_io_puts(int argc, const VALUE *argv, VALUE io);
  * @param[in]  fd     Target file descriptor.
  * @param[in]  flags  Flags, e.g. `O_CREAT|O_EXCL`
  * @param[in]  path   The path of the file that backs `fd`, for diagnostics.
- * @return     An allocated instance of ::rb_cIO.
+ * @return     An allocated instance of ::rb_cIO with the autoclose flag set.
  * @note       Leave `path` NULL if you don't know.
  */
 VALUE rb_io_fdopen(int fd, int flags, const char *path);
diff --git a/include/ruby/internal/intern/load.h b/include/ruby/internal/intern/load.h
index 288a16c2ec2005..9ceb98c2e40cd5 100644
--- a/include/ruby/internal/intern/load.h
+++ b/include/ruby/internal/intern/load.h
@@ -176,6 +176,43 @@ VALUE rb_f_require(VALUE self, VALUE feature);
  */
 VALUE rb_require_string(VALUE feature);
 
+/**
+ * Resolves  and  returns  a symbol  of  a  function  in  the  native extension
+ * specified by the feature and symbol names. Extensions will use this function
+ * to access the symbols provided by other native extensions.
+ *
+ * @param[in]  feature           Name of a feature, e.g. `"json"`.
+ * @param[in]  symbol            Name of a symbol defined by the feature.
+ * @return     The resolved symbol of  a function, defined and externed  by the
+ *             specified feature.  It may be NULL if the feature is not loaded,
+ *             the feature is not extension, or the symbol is not found.
+ */
+void *rb_ext_resolve_symbol(const char *feature, const char *symbol);
+
+/**
+ * This macro  is  to provide  backwards compatibility.  It provides  a  way to
+ * define function prototypes and resolving function symbols in a safe way.
+ *
+ * ```CXX
+ * // prototypes
+ * #ifdef HAVE_RB_EXT_RESOLVE_SYMBOL
+ * VALUE *(*other_extension_func)(VALUE,VALUE);
+ * #else
+ * VALUE other_extension_func(VALUE);
+ * #endif
+ *
+ * // in Init_xxx()
+ * #ifdef HAVE_RB_EXT_RESOLVE_SYMBOL
+ * other_extension_func = \
+ *     (VALUE(*)(VALUE,VALUE))rb_ext_resolve_symbol(fname, sym_name);
+ * if (other_extension_func == NULL) {
+ *   // raise your own error
+ * }
+ * #endif
+ * ```
+ */
+#define HAVE_RB_EXT_RESOLVE_SYMBOL 1
+
 /**
  * @name extension configuration
  * @{
diff --git a/include/ruby/internal/intern/object.h b/include/ruby/internal/intern/object.h
index b9ffa57c06c707..9daad7d046aea7 100644
--- a/include/ruby/internal/intern/object.h
+++ b/include/ruby/internal/intern/object.h
@@ -151,13 +151,12 @@ VALUE rb_obj_is_kind_of(VALUE obj, VALUE klass);
  * @return     An allocated, not yet initialised instance of `klass`.
  * @note       It calls  the allocator defined by  rb_define_alloc_func().  You
  *             cannot  use   this  function   to  define  an   allocator.   Use
- *             rb_newobj_of(), #TypedData_Make_Struct or others, instead.
+ *             TypedData_Make_Struct or others, instead.
  * @note       Usually  prefer  rb_class_new_instance() to  rb_obj_alloc()  and
  *             rb_obj_call_init().
  * @see        rb_class_new_instance()
  * @see        rb_obj_call_init()
  * @see        rb_define_alloc_func()
- * @see        rb_newobj_of()
  * @see        #TypedData_Make_Struct
  */
 VALUE rb_obj_alloc(VALUE klass);
diff --git a/include/ruby/internal/intern/process.h b/include/ruby/internal/intern/process.h
index 5dcf85e80c04e1..cfa5e13162f52e 100644
--- a/include/ruby/internal/intern/process.h
+++ b/include/ruby/internal/intern/process.h
@@ -256,7 +256,7 @@ rb_pid_t rb_spawn_err(int argc, const VALUE *argv, char *errbuf, size_t buflen);
  *
  * @internal
  *
- * This function  might or might  not exist depending on  `./confiugre` result.
+ * This function  might or might  not exist depending on  `./configure` result.
  * It must be a portability hell.  Better not use.
  */
 VALUE rb_proc_times(VALUE _);
diff --git a/include/ruby/internal/intern/select.h b/include/ruby/internal/intern/select.h
index fabc287cd14d28..6ba84c6e63464e 100644
--- a/include/ruby/internal/intern/select.h
+++ b/include/ruby/internal/intern/select.h
@@ -76,7 +76,7 @@ struct timeval;
  *
  * Although  any file  descriptors are  possible here,  it makes  completely no
  * sense to pass  a descriptor that is  not `O_NONBLOCK`.  If you  want to know
- * the reason for  this limitatuon in detail, you might  find this thread super
+ * the reason for  this limitation in detail, you might  find this thread super
  * interesting: https://lkml.org/lkml/2004/10/6/117
  */
 int rb_thread_fd_select(int nfds, rb_fdset_t *rfds, rb_fdset_t *wfds, rb_fdset_t *efds, struct timeval *timeout);
diff --git a/include/ruby/internal/intern/select/win32.h b/include/ruby/internal/intern/select/win32.h
index edaf7a85237972..b7301e63f3dc55 100644
--- a/include/ruby/internal/intern/select/win32.h
+++ b/include/ruby/internal/intern/select/win32.h
@@ -206,7 +206,7 @@ rb_fd_dup(rb_fdset_t *dst, const rb_fdset_t *src)
  * property  we heavily  touch  the  internals of  MSVCRT.   We `CreateFile`  a
  * `"NUL"` alongside of  a socket and directly manipulate  its `struct ioinfo`.
  * This is of  course a very dirty hack.   If we could design the  API today we
- * could use `CancellIoEx`.  But we are older than that Win32 API.
+ * could use `CancelIoEx`.  But we are older than that Win32 API.
  */
 static inline int
 rb_fd_select(int n, rb_fdset_t *rfds, rb_fdset_t *wfds, rb_fdset_t *efds, struct timeval *timeout)
@@ -253,7 +253,7 @@ rb_fd_max(const rb_fdset_t *f)
     const fd_set *p = f->fdset;
 
     RBIMPL_ASSERT_OR_ASSUME(p);
-    return p->fd_count;
+    return RBIMPL_CAST((int)p->fd_count);
 }
 
 #endif /* RBIMPL_INTERN_SELECT_WIN32_H */
diff --git a/include/ruby/internal/intern/set.h b/include/ruby/internal/intern/set.h
new file mode 100644
index 00000000000000..f4ff8665e2597b
--- /dev/null
+++ b/include/ruby/internal/intern/set.h
@@ -0,0 +1,111 @@
+#ifndef RBIMPL_INTERN_SET_H                         /*-*-C++-*-vi:se ft=cpp:*/
+#define RBIMPL_INTERN_SET_H
+/**
+ * @file
+ * @author     Ruby developers <ruby-core@ruby-lang.org>
+ * @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    Symbols   prefixed  with   either  `RBIMPL`   or  `rbimpl`   are
+ *             implementation details.   Don't take  them as canon.  They could
+ *             rapidly appear then vanish.  The name (path) of this header file
+ *             is also an  implementation detail.  Do not expect  it to persist
+ *             at the place it is now.  Developers are free to move it anywhere
+ *             anytime at will.
+ * @note       To  ruby-core:  remember  that   this  header  can  be  possibly
+ *             recursively included  from extension  libraries written  in C++.
+ *             Do not  expect for  instance `__VA_ARGS__` is  always available.
+ *             We assume C99  for ruby itself but we don't  assume languages of
+ *             extension libraries.  They could be written in C++98.
+ * @brief      Public APIs related to ::rb_cSet.
+ */
+#include "ruby/internal/attr/nonnull.h"
+#include "ruby/internal/dllexport.h"
+#include "ruby/internal/value.h"
+
+RBIMPL_SYMBOL_EXPORT_BEGIN()
+
+/* set.c */
+
+RBIMPL_ATTR_NONNULL(())
+/**
+ * Iterates   over  a   set.  Calls func with each element of the set and the
+ * argument given. func should return ST_CONTINUE, ST_STOP, or ST_DELETE.
+ *
+ * @param[in]  set               An instance of ::rb_cSet to iterate over.
+ * @param[in]  func              Callback function to yield.
+ * @param[in]  arg               Passed as-is to `func`.
+ * @exception  rb_eRuntimeError  `set` was tampered during iterating.
+ */
+void rb_set_foreach(VALUE set, int (*func)(VALUE element, VALUE arg), VALUE arg);
+
+/**
+ * Creates a new, empty set object.
+ *
+ * @return  An allocated new instance of ::rb_cSet.
+ */
+VALUE rb_set_new(void);
+
+/**
+ * Identical to rb_set_new(), except it additionally specifies how many elements
+ * it is expected to contain. This way you can create a set that is large enough
+ * for your need. For large sets, it means it won't need to be reallocated
+ * much, improving performance.
+ *
+ * @param[in]  capa  Designed capacity of the set.
+ * @return     An empty Set, whose capacity is `capa`.
+ */
+VALUE rb_set_new_capa(size_t capa);
+
+/**
+ * Whether the set contains the given element.
+ *
+ * @param[in]  set      Set to look into.
+ * @param[in]  element  Set element to look for.
+ * @return     true if element is in the set, falst otherwise.
+ */
+bool rb_set_lookup(VALUE set, VALUE element);
+
+/**
+ * Adds element to set.
+ *
+ * @param[in]   set              Target set table to modify.
+ * @param[in]   element          Arbitrary Ruby object.
+ * @exception   rb_eFrozenError  `set` is frozen.
+ * @return      true if element was not already in set, false otherwise
+ * @post        `element` is in `set`.
+ */
+bool rb_set_add(VALUE set, VALUE element);
+
+/**
+ * Removes all entries from set.
+ *
+ * @param[out]  set             Target to clear.
+ * @exception   rb_eFrozenError  `set`is frozen.
+ * @return      The passed `set`
+ * @post        `set` has no elements.
+ */
+VALUE rb_set_clear(VALUE set);
+
+/**
+ * Removes the element from from set.
+ *
+ * @param[in]   set        Target set to modify.
+ * @param[in]   element    Key to delete.
+ * @retval      true if element was already in set, false otherwise
+ * @post        `set` does not have `element` as an element.
+ */
+bool rb_set_delete(VALUE set, VALUE element);
+
+/**
+ * Returns the number of elements in the set.
+ *
+ * @param[in]  set  A set object.
+ * @return     The size of the set.
+ */
+size_t rb_set_size(VALUE set);
+
+RBIMPL_SYMBOL_EXPORT_END()
+
+#endif /* RBIMPL_INTERN_SET_H */
diff --git a/include/ruby/internal/intern/signal.h b/include/ruby/internal/intern/signal.h
index e5b6d6c3d52869..4773788651be83 100644
--- a/include/ruby/internal/intern/signal.h
+++ b/include/ruby/internal/intern/signal.h
@@ -97,7 +97,7 @@ RBIMPL_ATTR_NONNULL(())
  *   - Case #11: When  signo and PID  are both negative, the  behaviour of this
  *     function  depends on  how `killpg(3)`  works.  On  Linux, it  seems such
  *     attempt is  strictly prohibited and  `Errno::EINVAL` is raised.   But on
- *     macOS, it seems it  tries to to send the signal  actually to the process
+ *     macOS, it seems it  tries to send the signal  actually to the process
  *     group.
  *
  * @note       Above description is in fact different from how `kill(2)` works.
diff --git a/include/ruby/internal/intern/string.h b/include/ruby/internal/intern/string.h
index 3083125e5606d6..4573ec12626a89 100644
--- a/include/ruby/internal/intern/string.h
+++ b/include/ruby/internal/intern/string.h
@@ -412,7 +412,7 @@ VALUE rb_utf8_str_new_static(const char *ptr, long len);
 
 /**
  * Identical to rb_interned_str(),  except it takes a Ruby's  string instead of
- * C's.  It can also be seen  as a routine identical to to rb_str_new_shared(),
+ * C's.  It can also be seen  as a routine identical to rb_str_new_shared(),
  * except it returns an infamous "f"string.
  *
  * @param[in]  str  An object of ::RString.
@@ -454,7 +454,7 @@ VALUE rb_interned_str(const char *ptr, long len);
 RBIMPL_ATTR_NONNULL(())
 /**
  * Identical to  rb_interned_str(), except it  assumes the passed pointer  is a
- * pointer to a C's  string.  It can also be seen as a  routine identical to to
+ * pointer to a C's  string.  It can also be seen as a  routine identical to
  * rb_str_to_interned_str(), except  it takes a  C's string instead  of Ruby's.
  * Or it can  also be seen as a routine  identical to rb_str_new_cstr(), except
  * it returns an infamous "f"string.
@@ -1686,10 +1686,10 @@ rbimpl_exc_new_cstr(VALUE exc, const char *str)
  * Length of a string literal.
  *
  * @param[in]  str  A C String literal.
- * @return     An integer  constant expression that represents  `str`'s length,
- *             in bytes, not including the terminating NUL character.
+ * @return     An  integer constant  expression that  represents the  number of
+ *             `str`'s elements, not including the terminating NUL character.
  */
-#define rb_strlen_lit(str) (sizeof(str "") - 1)
+#define rb_strlen_lit(str) ((sizeof(str "") / sizeof(str ""[0])) - 1)
 
 /**
  * Identical to rb_str_new_static(), except it cannot take string variables.
diff --git a/include/ruby/internal/intern/struct.h b/include/ruby/internal/intern/struct.h
index 4510508d7750a0..16b3fad4e0878d 100644
--- a/include/ruby/internal/intern/struct.h
+++ b/include/ruby/internal/intern/struct.h
@@ -54,6 +54,8 @@ VALUE rb_struct_new(VALUE klass, ...);
  * @post       Global toplevel constant `name` is defined.
  * @note       `name` is allowed  to be a null pointer.   This function creates
  *             an anonymous struct class then.
+ * @note       The GC does not collect nor move classes returned by this
+ *             function. They are immortal.
  *
  * @internal
  *
@@ -78,6 +80,8 @@ RBIMPL_ATTR_NONNULL((2))
  * @post        `name` is a constant under `space`.
  * @note        In contrast to rb_struct_define(), it doesn't make any sense to
  *              pass  a null pointer to this function.
+ * @note        The GC does not collect nor move classes returned by this
+ *              function. They are immortal.
  */
 VALUE rb_struct_define_under(VALUE space, const char *name, ...);
 
@@ -195,6 +199,8 @@ RBIMPL_ATTR_NONNULL((2))
  * @post        `class_name` is a constant under `outer`.
  * @note        In contrast to  rb_struct_define_without_accessor(), it doesn't
  *              make any sense to pass a null name.
+ * @note        The GC does not collect nor move classes returned by this
+ *              function. They are immortal.
  */
 VALUE rb_struct_define_without_accessor_under(VALUE outer, const char *class_name, VALUE super, rb_alloc_func_t alloc, ...);
 
@@ -209,6 +215,8 @@ VALUE rb_struct_define_without_accessor_under(VALUE outer, const char *class_nam
  *                             NULL.  Each of which are the name of fields.
  * @exception  rb_eArgError    Duplicated field name.
  * @return     The defined class.
+ * @note       The GC does not collect nor move classes returned by this
+ *             function. They are immortal.
  */
 VALUE rb_data_define(VALUE super, ...);
 
diff --git a/include/ruby/internal/intern/thread.h b/include/ruby/internal/intern/thread.h
index 716375acd76809..4d874527453c07 100644
--- a/include/ruby/internal/intern/thread.h
+++ b/include/ruby/internal/intern/thread.h
@@ -61,10 +61,10 @@ int rb_thread_wait_fd(int fd);
 int rb_thread_fd_writable(int fd);
 
 /**
- * Notifies a closing of a file  descriptor to other threads.  Multiple threads
- * can wait for the given file descriptor  at once.  If such file descriptor is
- * closed, threads need to start propagating their exceptions.  This is the API
- * to kick that process.
+ * This funciton is now a no-op. It was previously used to interrupt threads
+ * that were using the given file descriptor and wait for them to finish.
+ *
+ * @deprecated Use IO with RUBY_IO_MODE_EXTERNAL and `rb_io_close` instead.
  *
  * @param[in]  fd  A file descriptor.
  * @note       This function blocks  until all the threads waiting  for such fd
diff --git a/include/ruby/internal/intern/vm.h b/include/ruby/internal/intern/vm.h
index 76af796b548bdc..29e0c7f534acb1 100644
--- a/include/ruby/internal/intern/vm.h
+++ b/include/ruby/internal/intern/vm.h
@@ -229,8 +229,7 @@ void rb_define_alloc_func(VALUE klass, rb_alloc_func_t func);
  * restrict creation  of an instance of  a class.  For example  it rarely makes
  * sense for  a DB adaptor class  to allow programmers creating  DB row objects
  * without querying  the DB  itself.  You  can kill  sporadic creation  of such
- * objects then,  by nullifying  the allocator function  using this  API.  Your
- * object shall be allocated using #RB_NEWOBJ_OF() directly.
+ * objects then,  by nullifying  the allocator function  using this  API.
  *
  * @param[out]  klass  The class to modify.
  * @pre         `klass` must be an instance of Class.
diff --git a/include/ruby/internal/interpreter.h b/include/ruby/internal/interpreter.h
index 662d39c0ec5702..a10e7ad2d850c4 100644
--- a/include/ruby/internal/interpreter.h
+++ b/include/ruby/internal/interpreter.h
@@ -141,7 +141,7 @@ void ruby_show_copyright(void);
  *
  * @param[in]  addr  A pointer somewhere on the stack, near its bottom.
  */
-void ruby_init_stack(volatile VALUE *addr);
+void ruby_init_stack(void *addr);
 
 /**
  * Initializes the VM and builtin libraries.
diff --git a/include/ruby/internal/memory.h b/include/ruby/internal/memory.h
index 6884db195dec25..9fc6c39efca70b 100644
--- a/include/ruby/internal/memory.h
+++ b/include/ruby/internal/memory.h
@@ -40,7 +40,12 @@
 
 #if defined(_MSC_VER) && defined(_WIN64)
 # include <intrin.h>
+# if defined(_M_AMD64)
 # pragma intrinsic(_umul128)
+# endif
+# if defined(_M_ARM64)
+# pragma intrinsic(__umulh)
+# endif
 #endif
 
 #include "ruby/internal/attr/alloc_size.h"
@@ -56,13 +61,14 @@
 #include "ruby/internal/has/builtin.h"
 #include "ruby/internal/stdalign.h"
 #include "ruby/internal/stdbool.h"
+#include "ruby/internal/stdckdint.h"
 #include "ruby/internal/xmalloc.h"
 #include "ruby/backward/2/limits.h"
 #include "ruby/backward/2/long_long.h"
 #include "ruby/backward/2/assume.h"
 #include "ruby/defines.h"
 
-/** @cond INTENAL_MACRO  */
+/** @cond INTERNAL_MACRO  */
 
 /* Make alloca work the best possible way.  */
 #if defined(alloca)
@@ -482,6 +488,18 @@ RBIMPL_ATTR_NORETURN()
  */
 void ruby_malloc_size_overflow(size_t x, size_t y);
 
+RBIMPL_ATTR_NORETURN()
+/**
+ * @private
+ *
+ * This is an implementation detail. People don't use this directly.
+ *
+ * @param[in]  x             Arbitrary value.
+ * @param[in]  y             Arbitrary value.
+ * @exception  rb_eArgError  `x` + `y` would integer overflow.
+ */
+void ruby_malloc_add_size_overflow(size_t x, size_t y);
+
 #ifdef HAVE_RB_GC_GUARDED_PTR_VAL
 volatile VALUE *rb_gc_guarded_ptr_val(volatile VALUE *ptr, VALUE val);
 #endif
@@ -567,7 +585,10 @@ rbimpl_size_mul_overflow(size_t x, size_t y)
 {
     struct rbimpl_size_mul_overflow_tag ret = { false,  0, };
 
-#if RBIMPL_HAS_BUILTIN(__builtin_mul_overflow)
+#if defined(ckd_mul)
+    ret.left = ckd_mul(&ret.right, x, y);
+
+#elif RBIMPL_HAS_BUILTIN(__builtin_mul_overflow)
     ret.left = __builtin_mul_overflow(x, y, &ret.right);
 
 #elif defined(DSIZE_T)
@@ -577,12 +598,16 @@ rbimpl_size_mul_overflow(size_t x, size_t y)
     ret.left  = dz > SIZE_MAX;
     ret.right = RBIMPL_CAST((size_t)dz);
 
-#elif defined(_MSC_VER) && defined(_WIN64)
+#elif defined(_MSC_VER) && defined(_M_AMD64)
     unsigned __int64 dp = 0;
     unsigned __int64 dz = _umul128(x, y, &dp);
     ret.left  = RBIMPL_CAST((bool)dp);
     ret.right = RBIMPL_CAST((size_t)dz);
 
+#elif defined(_MSC_VER) && defined(_M_ARM64)
+    ret.left  = __umulh(x, y) != 0;
+    ret.right = x * y;
+
 #else
     /* https://wiki.sei.cmu.edu/confluence/display/c/INT30-C.+Ensure+that+unsigned+integer+operations+do+not+wrap */
     ret.left  = (y != 0) && (x > SIZE_MAX / y);
@@ -622,6 +647,81 @@ rbimpl_size_mul_or_raise(size_t x, size_t y)
     }
 }
 
+#if defined(__DOXYGEN__)
+RBIMPL_ATTR_CONSTEXPR(CXX14)
+#elif RBIMPL_COMPILER_SINCE(GCC, 7, 0, 0)
+RBIMPL_ATTR_CONSTEXPR(CXX14) /* https://gcc.gnu.org/bugzilla/show_bug.cgi?id=70507 */
+#elif RBIMPL_COMPILER_SINCE(Clang, 7, 0, 0)
+RBIMPL_ATTR_CONSTEXPR(CXX14) /* https://bugs.llvm.org/show_bug.cgi?id=37633 */
+#endif
+RBIMPL_ATTR_CONST()
+/**
+ * @private
+ *
+ * This is an  implementation detail. People don't use this directly.
+ *
+ * @param[in]  x  Arbitrary value.
+ * @param[in]  y  Arbitrary value.
+ * @return     `{ left, right }`,  where `left` is whether there  is an integer
+ *             overflow or not,  and `right` is a  (possibly overflowed) result
+ *             of `x` + `y`.
+ *
+ * @internal
+ */
+static inline struct rbimpl_size_mul_overflow_tag
+rbimpl_size_add_overflow(size_t x, size_t y)
+{
+    struct rbimpl_size_mul_overflow_tag ret = { false,  0, };
+
+#if defined(ckd_add)
+    ret.left = ckd_add(&ret.right, x, y);
+
+#elif RBIMPL_HAS_BUILTIN(__builtin_add_overflow)
+    ret.left = __builtin_add_overflow(x, y, &ret.right);
+
+#elif defined(DSIZE_T)
+    RB_GNUC_EXTENSION DSIZE_T dx = x;
+    RB_GNUC_EXTENSION DSIZE_T dy = y;
+    RB_GNUC_EXTENSION DSIZE_T dz = dx + dy;
+    ret.left = dz > SIZE_MAX;
+    ret.right = (size_t)dz;
+
+#else
+    ret.right = x + y;
+    ret.left = ret.right < y;
+
+#endif
+
+    return ret;
+}
+
+/**
+ * @private
+ *
+ * This is an  implementation detail. People don't use this directly.
+ *
+ * @param[in]  x             Arbitrary value.
+ * @param[in]  y             Arbitrary value.
+ * @exception  rb_eArgError  Multiplication could integer overflow.
+ * @return     `x` + `y`.
+ *
+ * @internal
+ */
+static inline size_t
+rbimpl_size_add_or_raise(size_t x, size_t y)
+{
+    struct rbimpl_size_mul_overflow_tag size =
+        rbimpl_size_add_overflow(x, y);
+
+    if (RB_LIKELY(!size.left)) {
+        return size.right;
+    }
+    else {
+        ruby_malloc_add_size_overflow(x, y);
+        RBIMPL_UNREACHABLE_RETURN(0);
+    }
+}
+
 /**
  * This is an  implementation detail of #RB_ALLOCV_N().  People  don't use this
  * directly.
@@ -639,7 +739,7 @@ rbimpl_size_mul_or_raise(size_t x, size_t y)
 static inline void *
 rb_alloc_tmp_buffer2(volatile VALUE *store, long count, size_t elsize)
 {
-    const size_t total_size = rbimpl_size_mul_or_raise(count, elsize);
+    const size_t total_size = rbimpl_size_mul_or_raise(RBIMPL_CAST((size_t)count), elsize);
     const size_t cnt = (total_size + sizeof(VALUE) - 1) / sizeof(VALUE);
     return rb_alloc_tmp_buffer_with_count(store, total_size, cnt);
 }
diff --git a/include/ruby/internal/module.h b/include/ruby/internal/module.h
index d678dd210279c3..97b0b2b8b069ad 100644
--- a/include/ruby/internal/module.h
+++ b/include/ruby/internal/module.h
@@ -56,8 +56,8 @@ RBIMPL_ATTR_NONNULL(())
  * @post       Top-level constant named `name` refers the returned class.
  * @note       If a class named `name` is already defined and its superclass is
  *             `super`, the function just returns the defined class.
- * @note       The  compaction  GC  does  not move  classes  returned  by  this
- *             function.
+ * @note       The GC does not collect nor move classes returned by this
+ *             function. They are immortal.
  *
  * @internal
  *
@@ -75,8 +75,8 @@ RBIMPL_ATTR_NONNULL(())
  *                            constant is not a module.
  * @return     The created module.
  * @post       Top-level constant named `name` refers the returned module.
- * @note       The  compaction  GC  does  not move  classes  returned  by  this
- *             function.
+ * @note       The GC does not collect nor move modules returned by this
+ *             function. They are immortal.
  *
  * @internal
  *
@@ -103,8 +103,8 @@ RBIMPL_ATTR_NONNULL(())
  * @post        `outer::name` refers the returned class.
  * @note        If a class  named `name` is already defined  and its superclass
  *              is `super`, the function just returns the defined class.
- * @note        The  compaction  GC does  not  move  classes returned  by  this
- *              function.
+ * @note        The GC does not collect nor move classes returned by this
+ *              function. They are immortal.
  */
 VALUE rb_define_class_under(VALUE outer, const char *name, VALUE super);
 
@@ -118,8 +118,8 @@ RBIMPL_ATTR_NONNULL(())
  *                             the constant is not a class.
  * @return      The created module.
  * @post        `outer::name` refers the returned module.
- * @note        The  compaction  GC does  not  move  classes returned  by  this
- *              function.
+ * @note        The GC does not collect nor move modules returned by this
+ *              function. They are immortal.
  */
 VALUE rb_define_module_under(VALUE outer, const char *name);
 
diff --git a/include/ruby/internal/newobj.h b/include/ruby/internal/newobj.h
index ba1d7cbe59ae59..6eee2fa5fa7643 100644
--- a/include/ruby/internal/newobj.h
+++ b/include/ruby/internal/newobj.h
@@ -29,63 +29,14 @@
 #include "ruby/internal/value.h"
 #include "ruby/assert.h"
 
-/**
- * Declares, allocates, then assigns a new object to the given variable.
- *
- * @param      obj             Variable name.
- * @param      type            Variable type.
- * @exception  rb_eNoMemError  No space left.
- * @return     An allocated object, not initialised.
- * @note       Modern programs tend to use #NEWOBJ_OF instead.
- *
- * @internal
- *
- * :FIXME: Should we deprecate it?
- */
-#define RB_NEWOBJ(obj,type) type *(obj) = RBIMPL_CAST((type *)rb_newobj())
-
-/**
- * Identical  to #RB_NEWOBJ,  except it  also accepts  the allocating  object's
- * class and flags.
- *
- * @param      obj             Variable name.
- * @param      type            Variable type.
- * @param      klass           Object's class.
- * @param      flags           Object's flags.
- * @exception  rb_eNoMemError  No space left.
- * @return     An allocated object, filled with the arguments.
- */
-#define RB_NEWOBJ_OF(obj,type,klass,flags) type *(obj) = RBIMPL_CAST((type *)rb_newobj_of(klass, flags))
-
-#define NEWOBJ     RB_NEWOBJ      /**< @old{RB_NEWOBJ} */
-#define NEWOBJ_OF  RB_NEWOBJ_OF   /**< @old{RB_NEWOBJ_OF} */
 #define OBJSETUP   rb_obj_setup   /**< @old{rb_obj_setup} */
 #define CLONESETUP rb_clone_setup /**< @old{rb_clone_setup} */
 #define DUPSETUP   rb_dup_setup   /**< @old{rb_dup_setup} */
 
 RBIMPL_SYMBOL_EXPORT_BEGIN()
-/**
- * This is the implementation detail of #RB_NEWOBJ.
- *
- * @exception  rb_eNoMemError  No space left.
- * @return     An allocated object, not initialised.
- */
-VALUE rb_newobj(void);
-
-/**
- * This is the implementation detail of #RB_NEWOBJ_OF.
- *
- * @param      klass           Object's class.
- * @param      flags           Object's flags.
- * @exception  rb_eNoMemError  No space left.
- * @return     An allocated object, filled with the arguments.
- */
-VALUE rb_newobj_of(VALUE klass, VALUE flags);
-
 /**
  * Fills common fields in the object.
  *
- * @note           Prefer rb_newobj_of() to this function.
  * @param[in,out]  obj    A Ruby object to be set up.
  * @param[in]      klass  `obj` will belong to this class.
  * @param[in]      type   One of ::ruby_value_type.
diff --git a/include/ruby/internal/scan_args.h b/include/ruby/internal/scan_args.h
index 1ed2bf636874f3..2dbc1ee7bc39b9 100644
--- a/include/ruby/internal/scan_args.h
+++ b/include/ruby/internal/scan_args.h
@@ -75,7 +75,7 @@
  * Pass keywords if current method is called with keywords, useful for argument
  * delegation
  */
-#define RB_PASS_CALLED_KEYWORDS rb_keyword_given_p()
+#define RB_PASS_CALLED_KEYWORDS !!rb_keyword_given_p()
 
 /** @} */
 
diff --git a/include/ruby/internal/special_consts.h b/include/ruby/internal/special_consts.h
index dc0a6b41d6bad6..1e2636da4861a7 100644
--- a/include/ruby/internal/special_consts.h
+++ b/include/ruby/internal/special_consts.h
@@ -156,7 +156,7 @@ RB_TEST(VALUE obj)
      *
      *  RTEST(v) can be 0 if and only if (v == Qfalse || v == Qnil).
      */
-    return obj & ~RUBY_Qnil;
+    return obj & RBIMPL_CAST((VALUE)~RUBY_Qnil);
 }
 
 RBIMPL_ATTR_CONST()
@@ -226,7 +226,7 @@ RB_NIL_OR_UNDEF_P(VALUE obj)
      *
      *  NIL_OR_UNDEF_P(v) can be true only when v is Qundef or Qnil.
      */
-    const VALUE mask = ~(RUBY_Qundef ^ RUBY_Qnil);
+    const VALUE mask = RBIMPL_CAST((VALUE)~(RUBY_Qundef ^ RUBY_Qnil));
     const VALUE common_bits = RUBY_Qundef & RUBY_Qnil;
     return (obj & mask) == common_bits;
 }
@@ -326,7 +326,7 @@ RBIMPL_ATTR_ARTIFICIAL()
 static inline bool
 RB_SPECIAL_CONST_P(VALUE obj)
 {
-    return RB_IMMEDIATE_P(obj) || obj == RUBY_Qfalse;
+    return (obj == RUBY_Qfalse) || RB_IMMEDIATE_P(obj);
 }
 
 RBIMPL_ATTR_CONST()
@@ -346,7 +346,7 @@ RBIMPL_ATTR_CONSTEXPR(CXX11)
 static inline VALUE
 rb_special_const_p(VALUE obj)
 {
-    return RB_SPECIAL_CONST_P(obj) * RUBY_Qtrue;
+    return (unsigned int)RB_SPECIAL_CONST_P(obj) * RUBY_Qtrue;
 }
 
 /**
diff --git a/include/ruby/internal/static_assert.h b/include/ruby/internal/static_assert.h
index 594c2b2917b6c0..7f00bc21ebec14 100644
--- a/include/ruby/internal/static_assert.h
+++ b/include/ruby/internal/static_assert.h
@@ -23,6 +23,7 @@
 #include <assert.h>
 #include "ruby/internal/has/extension.h"
 #include "ruby/internal/compiler_since.h"
+#include "ruby/internal/attr/maybe_unused.h"
 
 /** @cond INTERNAL_MACRO */
 #if defined(__cplusplus) && defined(__cpp_static_assert)
@@ -71,7 +72,7 @@
 
 #else
 # define RBIMPL_STATIC_ASSERT(name, expr) \
-    typedef int static_assert_ ## name ## _check[1 - 2 * !(expr)]
+    RBIMPL_ATTR_MAYBE_UNUSED() typedef int static_assert_ ## name ## _check[1 - 2 * !(expr)]
 #endif
 
 #endif /* RBIMPL_STATIC_ASSERT_H */
diff --git a/include/ruby/internal/stdbool.h b/include/ruby/internal/stdbool.h
index 1ca61136ba2636..5d9026434b1321 100644
--- a/include/ruby/internal/stdbool.h
+++ b/include/ruby/internal/stdbool.h
@@ -27,25 +27,13 @@
 
 #elif defined(__cplusplus)
 # /* bool is a keyword in C++. */
-# if defined(HAVE_STDBOOL_H) && (__cplusplus >= 201103L)
-#  include <cstdbool>
-# endif
-#
 # ifndef __bool_true_false_are_defined
 #  define __bool_true_false_are_defined
 # endif
 
-#elif defined(HAVE_STDBOOL_H)
-# /* Take stdbool.h definition. */
+#else
+# /* Take stdbool.h definition. It exists since GCC 3.0 and VS 2015. */
 # include <stdbool.h>
-
-#elif !defined(HAVE__BOOL)
-typedef unsigned char _Bool;
-# /* 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
 
 #endif /* RBIMPL_STDBOOL_H */
diff --git a/include/ruby/internal/stdckdint.h b/include/ruby/internal/stdckdint.h
new file mode 100644
index 00000000000000..e5b5b8b7513c19
--- /dev/null
+++ b/include/ruby/internal/stdckdint.h
@@ -0,0 +1,68 @@
+#ifndef RBIMPL_STDCKDINT_H                           /*-*-C++-*-vi:se ft=cpp:*/
+#define RBIMPL_STDCKDINT_H
+/**
+ * @author     Ruby developers <ruby-core@ruby-lang.org>
+ * @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    Symbols   prefixed  with   either  `RBIMPL`   or  `rbimpl`   are
+ *             implementation details.   Don't take  them as canon.  They could
+ *             rapidly appear then vanish.  The name (path) of this header file
+ *             is also an  implementation detail.  Do not expect  it to persist
+ *             at the place it is now.  Developers are free to move it anywhere
+ *             anytime at will.
+ * @note       To  ruby-core:  remember  that   this  header  can  be  possibly
+ *             recursively included  from extension  libraries written  in C++.
+ *             Do not  expect for  instance `__VA_ARGS__` is  always available.
+ *             We assume C99  for ruby itself but we don't  assume languages of
+ *             extension libraries.  They could be written in C++98.
+ * @brief      C23 shim for <stdckdint.h>
+ */
+#include "ruby/internal/config.h"
+#include "ruby/internal/cast.h"
+#include "ruby/internal/has/builtin.h"
+#include "ruby/internal/stdbool.h"
+
+#ifdef __has_include
+# if __has_include(<stdckdint.h>)
+#  /* Conforming C23 situation; e.g. recent clang */
+#  define RBIMPL_HAVE_STDCKDINT_H
+# endif
+#endif
+
+#ifdef HAVE_STDCKDINT_H
+# /* Some OSes (most notably FreeBSD) have this file. */
+# define RBIMPL_HAVE_STDCKDINT_H
+#endif
+
+#ifdef __cplusplus
+# /* It seems OS/Compiler provided stdckdint.h tend not support C++ yet.
+#  * Situations could improve someday but in a meantime let us work around.
+#  */
+# undef RBIMPL_HAVE_STDCKDINT_H
+#endif
+
+#ifdef RBIMPL_HAVE_STDCKDINT_H
+# /* Take that. */
+# include <stdckdint.h>
+
+#elif RBIMPL_HAS_BUILTIN(__builtin_add_overflow)
+# define ckd_add(x, y, z) RBIMPL_CAST((bool)__builtin_add_overflow((y), (z), (x)))
+# define ckd_sub(x, y, z) RBIMPL_CAST((bool)__builtin_sub_overflow((y), (z), (x)))
+# define ckd_mul(x, y, z) RBIMPL_CAST((bool)__builtin_mul_overflow((y), (z), (x)))
+# define __STDC_VERSION_STDCKDINT_H__ 202311L
+
+#/* elif defined(__cplusplus) */
+#/* :TODO: if we assume C++11 we can use `<type_traits>` to implement them. */
+
+#else
+# /* intentionally leave them undefined */
+# /* to make `#ifdef ckd_add` etc. work as intended. */
+# undef ckd_add
+# undef ckd_sub
+# undef ckd_mul
+# undef __STDC_VERSION_STDCKDINT_H__
+#endif
+
+#endif /* RBIMPL_STDCKDINT_H */
diff --git a/include/ruby/internal/symbol.h b/include/ruby/internal/symbol.h
index 869a31115ce049..569bf215a2df85 100644
--- a/include/ruby/internal/symbol.h
+++ b/include/ruby/internal/symbol.h
@@ -121,10 +121,17 @@ ID rb_intern_str(VALUE str);
  * Retrieves the name mapped to the given id.
  *
  * @param[in]  id         An id to query.
- * @retval     NULL       No such id ever existed in the history.
+ * @retval     NULL       Unknown id.
  * @retval     otherwise  A name that the id represents.
  * @note       The return value  is managed by the interpreter.   Don't pass it
  *             to free().
+ * @note       The underlying name can contain internal NUL bytes, so the return
+ *             value might be a truncated representation due to the nature of C
+ *             strings.
+ * @note       This C string is backed by an underlying Ruby string. The Ruby
+ *             string may move during GC compaction which would make this
+ *             C string point to invalid memory. Do not use the return value
+ *             of this function after a potential GC entry point.
  */
 const char *rb_id2name(ID id);
 
@@ -186,7 +193,8 @@ ID rb_check_id(volatile VALUE *namep);
 ID rb_to_id(VALUE str);
 
 /**
- * Identical to rb_id2name(), except it returns a Ruby's String instead of C's.
+ * Identical to rb_id2name(), except it returns a frozen Ruby String instead of
+ * a C String.
  *
  * @param[in]  id           An id to query.
  * @retval     RUBY_Qfalse  No such id ever existed in the history.
@@ -201,14 +209,14 @@ ID rb_to_id(VALUE str);
 VALUE rb_id2str(ID id);
 
 /**
- * Identical to rb_id2str(), except it takes an instance of ::rb_cSymbol rather
- * than an ::ID.
+ * Obtain a frozen string representation of a symbol (not including the leading
+ * colon). Done without any object allocations.
  *
- * @param[in]  id           An id to query.
- * @retval     RUBY_Qfalse  No such id ever existed in the history.
- * @retval     otherwise    An instance of ::rb_cString with the name of id.
+ * @param[in]  symbol  A ::rb_cSymbol instance to query.
+ * @return     A frozen instance of ::rb_cString with the name of `symbol`.
+ * @note       This does not create a permanent ::ID using the symbol.
  */
-VALUE rb_sym2str(VALUE id);
+VALUE rb_sym2str(VALUE symbol);
 
 /**
  * Identical  to  rb_intern_str(), except  it  generates  a dynamic  symbol  if
@@ -308,8 +316,9 @@ rbimpl_intern_const(ID *ptr, const char *str)
     }
 
 /**
- * Old implementation detail of rb_intern().
- * @deprecated Does anyone use it?  Preserved for backward compat.
+ * Returns  the cached  ID  for  the given  str  in  var, in  compiler
+ * independent manner.   Use this instead of  GCC specific rb_intern()
+ * when you want to cache the ID on all platforms certainly.
  */
 #define RUBY_CONST_ID(var, str) \
     do { \
@@ -318,7 +327,8 @@ rbimpl_intern_const(ID *ptr, const char *str)
     } while (0)
 
 #if defined(HAVE_STMT_AND_DECL_IN_EXPR)
-/* __builtin_constant_p and statement expression is available
+/* GCC specific shorthand for RUBY_CONST_ID().
+ * __builtin_constant_p and statement expression is available
  * since gcc-2.7.2.3 at least. */
 #define rb_intern(str) \
     (RBIMPL_CONSTANT_P(str) ? \
diff --git a/include/ruby/internal/value_type.h b/include/ruby/internal/value_type.h
index 977f60a0094d52..b47d8afb97b2a7 100644
--- a/include/ruby/internal/value_type.h
+++ b/include/ruby/internal/value_type.h
@@ -96,10 +96,11 @@
 #define RB_TYPE_P         RB_TYPE_P
 #define Check_Type        Check_Type
 
-#if !RUBY_DEBUG
-# define RBIMPL_ASSERT_TYPE(v, t) RBIMPL_ASSERT_OR_ASSUME(RB_TYPE_P((v), (t)))
+#ifdef RBIMPL_VA_OPT_ARGS
+# define RBIMPL_ASSERT_TYPE(v, t) \
+    RBIMPL_ASSERT_OR_ASSUME(RB_TYPE_P(v, t), "actual type: %d", rb_type(v))
 #else
-# define RBIMPL_ASSERT_TYPE Check_Type
+# define RBIMPL_ASSERT_TYPE(v, t) RBIMPL_ASSERT_OR_ASSUME(RB_TYPE_P(v, t))
 #endif
 /** @endcond */
 
@@ -129,8 +130,8 @@ ruby_value_type {
     RUBY_T_RATIONAL = 0x0f, /**< @see struct ::RRational */
 
     RUBY_T_NIL      = 0x11, /**< @see ::RUBY_Qnil */
-    RUBY_T_TRUE     = 0x12, /**< @see ::RUBY_Qfalse */
-    RUBY_T_FALSE    = 0x13, /**< @see ::RUBY_Qtrue */
+    RUBY_T_TRUE     = 0x12, /**< @see ::RUBY_Qtrue */
+    RUBY_T_FALSE    = 0x13, /**< @see ::RUBY_Qfalse */
     RUBY_T_SYMBOL   = 0x14, /**< @see struct ::RSymbol */
     RUBY_T_FIXNUM   = 0x15, /**< Integers formerly known as Fixnums. */
     RUBY_T_UNDEF    = 0x16, /**< @see ::RUBY_Qundef */
@@ -443,7 +444,7 @@ Check_Type(VALUE v, enum ruby_value_type t)
     }
 
   unexpected_type:
-    rb_unexpected_type(v, t);
+    rb_unexpected_type(v, RBIMPL_CAST((int)t));
 }
 
 #endif /* RBIMPL_VALUE_TYPE_H */
diff --git a/include/ruby/internal/xmalloc.h b/include/ruby/internal/xmalloc.h
index 57552e4e7decf0..132bc478ce26ec 100644
--- a/include/ruby/internal/xmalloc.h
+++ b/include/ruby/internal/xmalloc.h
@@ -283,110 +283,6 @@ void ruby_xfree(void *ptr)
 RBIMPL_ATTR_NOEXCEPT(free(ptr))
 ;
 
-#if USE_GC_MALLOC_OBJ_INFO_DETAILS
-# define ruby_xmalloc(s1)            ruby_xmalloc_with_location(s1, __FILE__, __LINE__)
-# define ruby_xmalloc2(s1, s2)       ruby_xmalloc2_with_location(s1, s2, __FILE__, __LINE__)
-# define ruby_xcalloc(s1, s2)        ruby_xcalloc_with_location(s1, s2, __FILE__, __LINE__)
-# define ruby_xrealloc(ptr, s1)      ruby_xrealloc_with_location(ptr, s1, __FILE__, __LINE__)
-# define ruby_xrealloc2(ptr, s1, s2) ruby_xrealloc2_with_location(ptr, s1, s2, __FILE__, __LINE__)
-
-RBIMPL_ATTR_NODISCARD()
-RBIMPL_ATTR_RESTRICT()
-RBIMPL_ATTR_RETURNS_NONNULL()
-RBIMPL_ATTR_ALLOC_SIZE((1))
-void *ruby_xmalloc_body(size_t size)
-RBIMPL_ATTR_NOEXCEPT(malloc(size))
-;
-
-RBIMPL_ATTR_NODISCARD()
-RBIMPL_ATTR_RESTRICT()
-RBIMPL_ATTR_RETURNS_NONNULL()
-RBIMPL_ATTR_ALLOC_SIZE((1,2))
-void *ruby_xmalloc2_body(size_t nelems, size_t elemsiz)
-RBIMPL_ATTR_NOEXCEPT(malloc(nelems * elemsiz))
-;
-
-RBIMPL_ATTR_NODISCARD()
-RBIMPL_ATTR_RESTRICT()
-RBIMPL_ATTR_RETURNS_NONNULL()
-RBIMPL_ATTR_ALLOC_SIZE((1,2))
-void *ruby_xcalloc_body(size_t nelems, size_t elemsiz)
-RBIMPL_ATTR_NOEXCEPT(calloc(nelems, elemsiz))
-;
-
-RBIMPL_ATTR_NODISCARD()
-RBIMPL_ATTR_RETURNS_NONNULL()
-RBIMPL_ATTR_ALLOC_SIZE((2))
-void *ruby_xrealloc_body(void *ptr, size_t newsiz)
-RBIMPL_ATTR_NOEXCEPT(realloc(ptr, newsiz))
-;
-
-RBIMPL_ATTR_NODISCARD()
-RBIMPL_ATTR_RETURNS_NONNULL()
-RBIMPL_ATTR_ALLOC_SIZE((2,3))
-void *ruby_xrealloc2_body(void *ptr, size_t newelems, size_t newsiz)
-RBIMPL_ATTR_NOEXCEPT(realloc(ptr, newelems * newsiz))
-;
-
-RUBY_EXTERN const char *ruby_malloc_info_file;
-RUBY_EXTERN int ruby_malloc_info_line;
-
-static inline void *
-ruby_xmalloc_with_location(size_t s, const char *file, int line)
-{
-    void *ptr;
-    ruby_malloc_info_file = file;
-    ruby_malloc_info_line = line;
-    ptr = ruby_xmalloc_body(s);
-    ruby_malloc_info_file = NULL;
-    return ptr;
-}
-
-static inline void *
-ruby_xmalloc2_with_location(size_t s1, size_t s2, const char *file, int line)
-{
-    void *ptr;
-    ruby_malloc_info_file = file;
-    ruby_malloc_info_line = line;
-    ptr = ruby_xmalloc2_body(s1, s2);
-    ruby_malloc_info_file = NULL;
-    return ptr;
-}
-
-static inline void *
-ruby_xcalloc_with_location(size_t s1, size_t s2, const char *file, int line)
-{
-    void *ptr;
-    ruby_malloc_info_file = file;
-    ruby_malloc_info_line = line;
-    ptr = ruby_xcalloc_body(s1, s2);
-    ruby_malloc_info_file = NULL;
-    return ptr;
-}
-
-static inline void *
-ruby_xrealloc_with_location(void *ptr, size_t s, const char *file, int line)
-{
-    void *rptr;
-    ruby_malloc_info_file = file;
-    ruby_malloc_info_line = line;
-    rptr = ruby_xrealloc_body(ptr, s);
-    ruby_malloc_info_file = NULL;
-    return rptr;
-}
-
-static inline void *
-ruby_xrealloc2_with_location(void *ptr, size_t s1, size_t s2, const char *file, int line)
-{
-    void *rptr;
-    ruby_malloc_info_file = file;
-    ruby_malloc_info_line = line;
-    rptr = ruby_xrealloc2_body(ptr, s1, s2);
-    ruby_malloc_info_file = NULL;
-    return rptr;
-}
-#endif
-
 RBIMPL_SYMBOL_EXPORT_END()
 
 #endif /* RBIMPL_XMALLOC_H */
diff --git a/include/ruby/io.h b/include/ruby/io.h
index e9dfeda5b1214b..ed0967abadcb0b 100644
--- a/include/ruby/io.h
+++ b/include/ruby/io.h
@@ -66,6 +66,21 @@ RBIMPL_SYMBOL_EXPORT_BEGIN()
 struct stat;
 struct timeval;
 
+#if defined(HAVE_STRUCT_STAT_ST_BIRTHTIMESPEC)
+# define RUBY_USE_STATX 0
+#elif defined(HAVE_STRUCT_STATX_STX_BTIME)
+# define RUBY_USE_STATX 1
+struct statx;
+#else
+# define RUBY_USE_STATX 0
+#endif
+
+#if RUBY_USE_STATX
+typedef struct statx rb_io_stat_data;
+#else
+typedef struct stat rb_io_stat_data;
+#endif
+
 /**
  * Indicates that a timeout has occurred while performing an IO operation.
  */
@@ -137,6 +152,143 @@ struct rb_io_encoding {
     VALUE ecopts;
 };
 
+/**
+ * @name Possible flags for ::rb_io_t::mode
+ *
+ * @{
+ */
+
+/** The IO is opened for reading. */
+#define FMODE_READABLE              0x00000001
+
+/** The IO is opened for writing. */
+#define FMODE_WRITABLE              0x00000002
+
+/** The IO is opened for both read/write. */
+#define FMODE_READWRITE             (FMODE_READABLE|FMODE_WRITABLE)
+
+/**
+ * The IO  is in "binary  mode".  This  is not what  everything rb_io_binmode()
+ * concerns.  This low-level flag is to stop CR <-> CRLF conversions that would
+ * happen in the underlying operating system.
+ *
+ * Setting this  one and #FMODE_TEXTMODE at  the same time is  a contradiction.
+ * Setting this one and #ECONV_NEWLINE_DECORATOR_MASK  at the same time is also
+ * a contradiction.
+ */
+#define FMODE_BINMODE               0x00000004
+
+/**
+ * The  IO  is in  "sync  mode".   All output  is  immediately  flushed to  the
+ * underlying operating system then.  Can  be set via rb_io_synchronized(), but
+ * there is no way except calling `IO#sync=` to reset.
+ */
+#define FMODE_SYNC                  0x00000008
+
+/**
+ * The IO  is a TTY.  What  is a TTY and  what isn't depends on  the underlying
+ * operating system's `isatty(3)` output.  You cannot change this.
+ */
+#define FMODE_TTY                   0x00000010
+
+/**
+ * Ruby eventually  detects that the IO  is bidirectional.  For instance  a TTY
+ * has such  property.  There are  several other  things known to  be duplexed.
+ * Additionally you  (extension library  authors) can  also implement  your own
+ * bidirectional IO subclasses.  One of such example is `Socket`.
+ */
+#define FMODE_DUPLEX                0x00000020
+
+/**
+ * The IO is opened  for appending.  This mode always writes at  the end of the
+ * IO.  Ruby manages  this flag for record but basically  the logic behind this
+ * mode is at the underlying operating system.  We almost do nothing.
+ */
+#define FMODE_APPEND                0x00000040
+
+/**
+ * The IO is  opened for creating.  This makes sense  only when the destination
+ * file does  not exist at  the time  the IO object  was created.  This  is the
+ * default mode  for writing,  but you  can pass `"r+"`  to `IO.open`  etc., to
+ * reroute this creation.
+ */
+#define FMODE_CREATE                0x00000080
+/* #define FMODE_NOREVLOOKUP        0x00000100 */
+
+/**
+ * This flag amends the effect of #FMODE_CREATE,  so that if there already is a
+ * file at the given path the operation fails.  Using this you can be sure that
+ * the file you get is a fresh new one.
+ */
+#define FMODE_EXCL                  0x00000400
+
+/**
+ * This flag amends the effect of #FMODE_CREATE,  so that if there already is a
+ * file at the given path it gets truncated.
+ */
+#define FMODE_TRUNC                 0x00000800
+
+/**
+ * The IO is in "text mode".  On  systems where such mode make sense, this flag
+ * changes  the way  the  IO handles  the  contents.  On  POSIX  systems it  is
+ * basically  a no-op,  but with  this  flag set  you can  optionally let  Ruby
+ * manually convert newlines, unlike when in binary mode:
+ *
+ * ```ruby
+ * IO.open("/p/a/t/h", "wt", crlf_newline: true) # "wb" is NG.
+ * ```
+ *
+ * Setting this one and #FMODE_BINMODE at the same time is a contradiction.
+ */
+#define FMODE_TEXTMODE              0x00001000
+/**
+ * This flag means that an IO object is wrapping an "external" file descriptor,
+ * which is owned by something outside the Ruby interpreter (usually a C extension).
+ * Ruby will not close this file when the IO object is garbage collected.
+ * If this flag is set, then IO#autoclose? is false, and vice-versa.
+ *
+ * This flag was previously called FMODE_PREP internally.
+ */
+#define FMODE_EXTERNAL              0x00010000
+
+/* #define FMODE_SIGNAL_ON_EPIPE    0x00020000 */
+
+/**
+ * This flag amends the  encoding of the IO so that the BOM  of the contents of
+ * the IO takes effect.
+ */
+#define FMODE_SETENC_BY_BOM         0x00100000
+/* #define FMODE_UNIX                  0x00200000 */
+/* #define FMODE_INET                  0x00400000 */
+/* #define FMODE_INET6                 0x00800000 */
+
+/** @} */
+
+enum rb_io_mode {
+    RUBY_IO_MODE_EXTERNAL = FMODE_EXTERNAL,
+
+    RUBY_IO_MODE_READABLE = FMODE_READABLE,
+    RUBY_IO_MODE_WRITABLE = FMODE_WRITABLE,
+    RUBY_IO_MODE_READABLE_WRITABLE = (RUBY_IO_MODE_READABLE|RUBY_IO_MODE_WRITABLE),
+
+    RUBY_IO_MODE_BINARY = FMODE_BINMODE,
+    RUBY_IO_MODE_TEXT = FMODE_TEXTMODE,
+    RUBY_IO_MODE_TEXT_SET_ENCODING_FROM_BOM = FMODE_SETENC_BY_BOM,
+
+    RUBY_IO_MODE_SYNCHRONISED = FMODE_SYNC,
+
+    RUBY_IO_MODE_TTY = FMODE_TTY,
+
+    RUBY_IO_MODE_DUPLEX = FMODE_DUPLEX,
+
+    RUBY_IO_MODE_APPEND = FMODE_APPEND,
+    RUBY_IO_MODE_CREATE = FMODE_CREATE,
+    RUBY_IO_MODE_EXCLUSIVE = FMODE_EXCL,
+    RUBY_IO_MODE_TRUNCATE = FMODE_TRUNC,
+};
+
+typedef enum rb_io_mode rb_io_mode_t;
+
 #ifndef HAVE_RB_IO_T
 #define HAVE_RB_IO_T 1
 /** Ruby's IO, metadata and buffers. */
@@ -155,7 +307,7 @@ struct rb_io {
 
     /** mode flags: FMODE_XXXs */
     RBIMPL_ATTR_DEPRECATED(("rb_io_mode"))
-    int mode;
+    enum rb_io_mode mode;
 
     /** child's pid (for pipes) */
     RBIMPL_ATTR_DEPRECATED(("with no replacement"))
@@ -260,118 +412,6 @@ typedef struct rb_io rb_io_t;
 /** @alias{rb_io_enc_t} */
 typedef struct rb_io_encoding rb_io_enc_t;
 
-/**
- * @name Possible flags for ::rb_io_t::mode
- *
- * @{
- */
-
-/** The IO is opened for reading. */
-#define FMODE_READABLE              0x00000001
-
-/** The IO is opened for writing. */
-#define FMODE_WRITABLE              0x00000002
-
-/** The IO is opened for both read/write. */
-#define FMODE_READWRITE             (FMODE_READABLE|FMODE_WRITABLE)
-
-/**
- * The IO  is in "binary  mode".  This  is not what  everything rb_io_binmode()
- * concerns.  This low-level flag is to stop CR <-> CRLF conversions that would
- * happen in the underlying operating system.
- *
- * Setting this  one and #FMODE_TEXTMODE at  the same time is  a contradiction.
- * Setting this one and #ECONV_NEWLINE_DECORATOR_MASK  at the same time is also
- * a contradiction.
- */
-#define FMODE_BINMODE               0x00000004
-
-/**
- * The  IO  is in  "sync  mode".   All output  is  immediately  flushed to  the
- * underlying operating system then.  Can  be set via rb_io_synchronized(), but
- * there is no way except calling `IO#sync=` to reset.
- */
-#define FMODE_SYNC                  0x00000008
-
-/**
- * The IO  is a TTY.  What  is a TTY and  what isn't depends on  the underlying
- * operating system's `isatty(3)` output.  You cannot change this.
- */
-#define FMODE_TTY                   0x00000010
-
-/**
- * Ruby eventually  detects that the IO  is bidirectional.  For instance  a TTY
- * has such  property.  There are  several other  things known to  be duplexed.
- * Additionally you  (extension library  authors) can  also implement  your own
- * bidirectional IO subclasses.  One of such example is `Socket`.
- */
-#define FMODE_DUPLEX                0x00000020
-
-/**
- * The IO is opened  for appending.  This mode always writes at  the end of the
- * IO.  Ruby manages  this flag for record but basically  the logic behind this
- * mode is at the underlying operating system.  We almost do nothing.
- */
-#define FMODE_APPEND                0x00000040
-
-/**
- * The IO is  opened for creating.  This makes sense  only when the destination
- * file does  not exist at  the time  the IO object  was created.  This  is the
- * default mode  for writing,  but you  can pass `"r+"`  to `IO.open`  etc., to
- * reroute this creation.
- */
-#define FMODE_CREATE                0x00000080
-/* #define FMODE_NOREVLOOKUP        0x00000100 */
-
-/**
- * This flag amends the effect of #FMODE_CREATE,  so that if there already is a
- * file at the given path the operation fails.  Using this you can be sure that
- * the file you get is a fresh new one.
- */
-#define FMODE_EXCL                  0x00000400
-
-/**
- * This flag amends the effect of #FMODE_CREATE,  so that if there already is a
- * file at the given path it gets truncated.
- */
-#define FMODE_TRUNC                 0x00000800
-
-/**
- * The IO is in "text mode".  On  systems where such mode make sense, this flag
- * changes  the way  the  IO handles  the  contents.  On  POSIX  systems it  is
- * basically  a no-op,  but with  this  flag set  you can  optionally let  Ruby
- * manually convert newlines, unlike when in binary mode:
- *
- * ```ruby
- * IO.open("/p/a/t/h", "wt", crlf_newline: true) # "wb" is NG.
- * ```
- *
- * Setting this one and #FMODE_BINMODE at the same time is a contradiction.
- */
-#define FMODE_TEXTMODE              0x00001000
-/**
- * This flag means that an IO object is wrapping an "external" file descriptor,
- * which is owned by something outside the Ruby interpreter (usually a C extension).
- * Ruby will not close this file when the IO object is garbage collected.
- * If this flag is set, then IO#autoclose? is false, and vice-versa.
- *
- * This flag was previously called FMODE_PREP internally.
- */
-#define FMODE_EXTERNAL              0x00010000
-
-/* #define FMODE_SIGNAL_ON_EPIPE    0x00020000 */
-
-/**
- * This flag amends the  encoding of the IO so that the BOM  of the contents of
- * the IO takes effect.
- */
-#define FMODE_SETENC_BY_BOM         0x00100000
-/* #define FMODE_UNIX                  0x00200000 */
-/* #define FMODE_INET                  0x00400000 */
-/* #define FMODE_INET6                 0x00800000 */
-
-/** @} */
-
 /**
  * Allocate a new IO object, with the given file descriptor.
  */
@@ -525,7 +565,7 @@ FILE *rb_fdopen(int fd, const char *modestr);
  *
  * rb_io_modestr_fmode() is not a pure function because it raises.
  */
-int rb_io_modestr_fmode(const char *modestr);
+enum rb_io_mode rb_io_modestr_fmode(const char *modestr);
 
 /**
  * Identical  to rb_io_modestr_fmode(),  except it  returns a  mixture of  `O_`
@@ -780,7 +820,7 @@ int rb_io_mode(VALUE io);
  * @post        `enc2_p` is the specified external encoding.
  * @post        `fmode_p` is the specified set of `FMODE_` modes.
  */
-int rb_io_extract_encoding_option(VALUE opt, rb_encoding **enc_p, rb_encoding **enc2_p, int *fmode_p);
+int rb_io_extract_encoding_option(VALUE opt, rb_encoding **enc_p, rb_encoding **enc2_p, enum rb_io_mode *fmode_p);
 
 /**
  * This    function    can   be    seen    as    an   extended    version    of
@@ -849,7 +889,7 @@ int rb_io_extract_encoding_option(VALUE opt, rb_encoding **enc_p, rb_encoding **
  *   ) -> void
  * ```
  */
-void rb_io_extract_modeenc(VALUE *vmode_p, VALUE *vperm_p, VALUE opthash, int *oflags_p, int *fmode_p, rb_io_enc_t *convconfig_p);
+void rb_io_extract_modeenc(VALUE *vmode_p, VALUE *vperm_p, VALUE opthash, int *oflags_p, enum rb_io_mode *fmode_p, rb_io_enc_t *convconfig_p);
 
 /* :TODO: can this function be __attribute__((warn_unused_result)) or not? */
 /**
@@ -964,6 +1004,9 @@ VALUE rb_io_wait(VALUE io, VALUE events, VALUE timeout);
  * }
  * ```
  *
+ * On timeout, ::RUBY_Qfalse is returned. Unless you are specifically handling
+ * the timeouts, you should typically raise ::rb_eIOTimeoutError in this case.
+ *
  * @param[in]  error                System errno.
  * @param[in]  io                   An IO object to wait.
  * @param[in]  events               An integer set of interests.
@@ -972,19 +1015,19 @@ VALUE rb_io_wait(VALUE io, VALUE events, VALUE timeout);
  * @exception  rb_eRangeError       `timeout` is out of range.
  * @exception  rb_eSystemCallError  `select(2)` failed for some reason.
  * @retval     RUBY_Qfalse          Operation timed out.
+ * @retval     RUBY_Qnil            Operation failed for some other reason (errno).
  * @retval     Otherwise            Actual events reached.
  *
- * @internal
- *
- * This function  to return ::RUBY_Qfalse  on timeout could be  unintended.  It
- * seems timeout feature has some rough edge.
  */
 VALUE rb_io_maybe_wait(int error, VALUE io, VALUE events, VALUE timeout);
 
 /**
  * Blocks until the passed IO is ready for reading, if that makes sense for the
- * passed  errno.  This  is  a  special case  of  rb_io_maybe_wait() that  only
- * concerns for reading.
+ * passed  errno.  This  is  a  special case  of  rb_io_maybe_wait() that is
+ * only concerned with reading and handles the timeout.
+ *
+ * If you do not want the default timeout handling, consider using
+ * ::rb_io_maybe_wait directly.
  *
  * @param[in]  error                System errno.
  * @param[in]  io                   An IO object to wait.
@@ -992,15 +1035,18 @@ VALUE rb_io_maybe_wait(int error, VALUE io, VALUE events, VALUE timeout);
  * @exception  rb_eIOError          `io` is not open.
  * @exception  rb_eRangeError       `timeout` is out of range.
  * @exception  rb_eSystemCallError  `select(2)` failed for some reason.
- * @retval     0                    Operation timed out.
+ * @exception  rb_eIOTimeoutError   The wait operation timed out.
  * @retval     Otherwise            Always returns ::RUBY_IO_READABLE.
  */
 int rb_io_maybe_wait_readable(int error, VALUE io, VALUE timeout);
 
 /**
  * Blocks until the passed IO is ready for writing, if that makes sense for the
- * passed  errno.  This  is  a  special case  of  rb_io_maybe_wait() that  only
- * concernsfor writing.
+ * passed  errno.  This  is  a  special case  of  rb_io_maybe_wait() that is
+ * only concerned with writing, and handles the timeout.
+ *
+ * If you do not want the default timeout handling, consider using
+ * ::rb_io_maybe_wait directly.
  *
  * @param[in]  error                System errno.
  * @param[in]  io                   An IO object to wait.
@@ -1008,7 +1054,7 @@ int rb_io_maybe_wait_readable(int error, VALUE io, VALUE timeout);
  * @exception  rb_eIOError          `io` is not open.
  * @exception  rb_eRangeError       `timeout` is out of range.
  * @exception  rb_eSystemCallError  `select(2)` failed for some reason.
- * @retval     0                    Operation timed out.
+ * @exception  rb_eIOTimeoutError   The wait operation timed out.
  * @retval     Otherwise            Always returns ::RUBY_IO_WRITABLE.
  */
 int rb_io_maybe_wait_writable(int error, VALUE io, VALUE timeout);
@@ -1067,6 +1113,18 @@ int rb_io_read_pending(rb_io_t *fptr);
  */
 VALUE rb_stat_new(const struct stat *st);
 
+#if RUBY_USE_STATX
+/**
+ * Constructs an instance of ::rb_cStat from the passed information.
+ *
+ * @param[in]  st  A stat.
+ * @return     Allocated new instance of ::rb_cStat.
+ */
+VALUE rb_statx_new(const rb_io_stat_data *st);
+#else
+# define rb_statx_new rb_stat_new
+#endif
+
 /* gc.c */
 
 RBIMPL_SYMBOL_EXPORT_END()
diff --git a/include/ruby/io/buffer.h b/include/ruby/io/buffer.h
index f2ab8f1195995a..e4d98bf0511b12 100644
--- a/include/ruby/io/buffer.h
+++ b/include/ruby/io/buffer.h
@@ -23,10 +23,18 @@ RBIMPL_SYMBOL_EXPORT_BEGIN()
 
 #define RUBY_IO_BUFFER_VERSION 2
 
+// The `IO::Buffer` class.
 RUBY_EXTERN VALUE rb_cIOBuffer;
+
+// The operating system page size.
 RUBY_EXTERN size_t RUBY_IO_BUFFER_PAGE_SIZE;
+
+// The default buffer size, usually a (small) multiple of the page size.
+// Can be overridden by the RUBY_IO_BUFFER_DEFAULT_SIZE environment variable.
 RUBY_EXTERN size_t RUBY_IO_BUFFER_DEFAULT_SIZE;
 
+// Represents the internal state of the buffer.
+// More than one flag can be set at a time.
 enum rb_io_buffer_flags {
     // The memory in the buffer is owned by someone else.
     // More specifically, it means that someone else owns the buffer and we shouldn't try to resize it.
@@ -49,21 +57,22 @@ enum rb_io_buffer_flags {
     RB_IO_BUFFER_PRIVATE = 64,
 
     // The buffer is read-only and cannot be modified.
-    RB_IO_BUFFER_READONLY = 128
+    RB_IO_BUFFER_READONLY = 128,
+
+    // The buffer is backed by a file.
+    RB_IO_BUFFER_FILE = 256,
 };
 
+// Represents the endian of the data types.
 enum rb_io_buffer_endian {
+    // The least significant units are put first.
     RB_IO_BUFFER_LITTLE_ENDIAN = 4,
     RB_IO_BUFFER_BIG_ENDIAN = 8,
 
-#if defined(__BYTE_ORDER__) && __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
-    RB_IO_BUFFER_HOST_ENDIAN = RB_IO_BUFFER_LITTLE_ENDIAN,
-#elif defined(__BYTE_ORDER__) && __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
+#if defined(WORDS_BIGENDIAN)
     RB_IO_BUFFER_HOST_ENDIAN = RB_IO_BUFFER_BIG_ENDIAN,
-#elif defined(REG_DWORD) && REG_DWORD == REG_DWORD_LITTLE_ENDIAN
+#else
     RB_IO_BUFFER_HOST_ENDIAN = RB_IO_BUFFER_LITTLE_ENDIAN,
-#elif defined(REG_DWORD) && REG_DWORD == REG_DWORD_BIG_ENDIAN
-    RB_IO_BUFFER_HOST_ENDIAN = RB_IO_BUFFER_BIG_ENDIAN,
 #endif
 
     RB_IO_BUFFER_NETWORK_ENDIAN = RB_IO_BUFFER_BIG_ENDIAN
@@ -79,7 +88,10 @@ int rb_io_buffer_try_unlock(VALUE self);
 VALUE rb_io_buffer_free(VALUE self);
 VALUE rb_io_buffer_free_locked(VALUE self);
 
-int rb_io_buffer_get_bytes(VALUE self, void **base, size_t *size);
+// Access the internal buffer and flags. Validates the pointers.
+// The points may not remain valid if the source buffer is manipulated.
+// Consider using rb_io_buffer_lock if needed.
+enum rb_io_buffer_flags rb_io_buffer_get_bytes(VALUE self, void **base, size_t *size);
 void rb_io_buffer_get_bytes_for_reading(VALUE self, const void **base, size_t *size);
 void rb_io_buffer_get_bytes_for_writing(VALUE self, void **base, size_t *size);
 
diff --git a/include/ruby/memory_view.h b/include/ruby/memory_view.h
index 1ddca2d46f0663..42309d5afc3756 100644
--- a/include/ruby/memory_view.h
+++ b/include/ruby/memory_view.h
@@ -47,10 +47,10 @@ typedef struct {
     char format;
 
     /** :FIXME: what is a "native" size is unclear. */
-    unsigned native_size_p: 1;
+    bool native_size_p;
 
     /** Endian of the component */
-    unsigned little_endian_p: 1;
+    bool little_endian_p;
 
     /** The component's offset. */
     size_t offset;
diff --git a/include/ruby/onigmo.h b/include/ruby/onigmo.h
index d233336316ee19..db290cd47a644d 100644
--- a/include/ruby/onigmo.h
+++ b/include/ruby/onigmo.h
@@ -636,6 +636,7 @@ ONIG_EXTERN const OnigSyntaxType*   OnigDefaultSyntax;
 #define ONIGERR_PARSE_DEPTH_LIMIT_OVER                        -16
 #define ONIGERR_DEFAULT_ENCODING_IS_NOT_SET                   -21
 #define ONIGERR_SPECIFIED_ENCODING_CANT_CONVERT_TO_WIDE_CHAR  -22
+#define ONIGERR_TIMEOUT                                       -23
 /* general error */
 #define ONIGERR_INVALID_ARGUMENT                              -30
 /* syntax error */
diff --git a/include/ruby/random.h b/include/ruby/random.h
index 39bdb6f3e3950a..f3df0d96fba6e1 100644
--- a/include/ruby/random.h
+++ b/include/ruby/random.h
@@ -11,7 +11,7 @@
  *
  * This  is a  set of  APIs  to roll  your  own subclass  of ::rb_cRandom.   An
  * illustrative    example     of    such     PRNG    can    be     found    at
- * `ext/-test-/ramdom/loop.c`.
+ * `ext/-test-/random/loop.c`.
  */
 
 #include "ruby/ruby.h"
diff --git a/include/ruby/ruby.h b/include/ruby/ruby.h
index eb9a7e4d0f88e9..ca794bcaeb508d 100644
--- a/include/ruby/ruby.h
+++ b/include/ruby/ruby.h
@@ -97,8 +97,10 @@ VALUE rb_get_path(VALUE obj);
 VALUE rb_get_path_no_checksafe(VALUE);
 
 /**
- * @deprecated  This macro is an alias of #FilePathValue now.  The part that did
- *              "String" was deleted.  It remains here because of no harm.
+ * This macro actually does the same  thing as #FilePathValue now.  The "String"
+ * part indicates  that this is  for when a string  is treated like  a pathname,
+ * rather  than  the  actual  pathname  on  the  file  systems.   For  examples:
+ * `Dir.fnmatch?`, `File.join`, `File.basename`, etc.
  */
 #define FilePathStringValue(v) ((v) = rb_get_path(v))
 
@@ -270,6 +272,124 @@ RBIMPL_ATTR_FORMAT(RBIMPL_PRINTF_FORMAT, 3, 0)
  */
 int ruby_vsnprintf(char *str, size_t n, char const *fmt, va_list ap);
 
+#include <errno.h>
+
+/**
+ * @name  Errno handling routines for userland threads
+ * @note  POSIX chapter 2 section 3 states  that for each thread  of a process,
+ *        the  value of  `errno` shall  not be  affected by  function calls  or
+ *        assignments to `errno` by other threads.
+ *
+ * Soooo this `#define  errno` below seems like a noob  mistake at first sight.
+ * If you look at its actual  implementation, the functions are just adding one
+ * level of indirection.  It doesn't make any sense sorry?  But yes!  @ko1 told
+ * @shyouhei that this is inevitable.
+ *
+ * The  ultimate  reason is  because  Ruby  now  has N:M  threads  implemented.
+ * Threads of that sort  change their context in user land.   A function can be
+ * "transferred" between  threads in  middle of their  executions.  Let  us for
+ * instance consider:
+ *
+ * ```cxx
+ * void foo()
+ * {
+ *     auto i = errno;
+ *     close(0);
+ *     errno = i;
+ * }
+ * ```
+ *
+ * This function (if  ran under our Ractor) could change  its running thread at
+ * the `close` function.  But the  two `errno` invocations are different!  Look
+ * how the source code above is compiled by clang 17 with `-O3` flag @ Linux:
+ *
+ * ```
+ * foo(int):                                # @foo(int)
+ *         push    rbp
+ *         push    r14
+ *         push    rbx
+ *         mov     ebx, edi
+ *         call    __errno_location@PLT
+ *         mov     r14, rax
+ *         mov     ebp, dword ptr [rax]
+ *         mov     edi, ebx
+ *         call    close@PLT
+ *         mov     dword ptr [r14], ebp
+ *         pop     rbx
+ *         pop     r14
+ *         pop     rbp
+ *         ret
+ * ```
+ *
+ * Notice  how `__errno_location@PLT`  is  `call`-ed only  once.  The  compiler
+ * assumes that the location of `errno` does not change during a function call.
+ * Sadly this is  no longer true for us.  The  `close@PLT` now changes threads,
+ * which should also change where `errno` is stored.
+ *
+ * With the `#define errno` below the compilation result changes to this:
+ *
+ * ```
+ * foo(int):                                # @foo(int)
+ *         push    rbp
+ *         push    rbx
+ *         push    rax
+ *         mov     ebx, edi
+ *         call    rb_errno_ptr()@PLT
+ *         mov     ebp, dword ptr [rax]
+ *         mov     edi, ebx
+ *         call    close@PLT
+ *         call    rb_errno_ptr()@PLT
+ *         mov     dword ptr [rax], ebp
+ *         add     rsp, 8
+ *         pop     rbx
+ *         pop     rbp
+ *         ret
+ * ```
+ *
+ * Which fixes the problem.
+ */
+
+/**
+ * Identical to system `errno`.
+ *
+ * @return The last set `errno` number.
+ */
+int rb_errno(void);
+
+/**
+ * Set the errno.
+ *
+ * @param  err  New `errno`.
+ * @post   `errno` is now set to `err`.
+ */
+void rb_errno_set(int err);
+
+/**
+ * The location of `errno`
+ *
+ * @return The (thread-specific) location of `errno`.
+ */
+int *rb_errno_ptr(void);
+
+/**
+ * Not sure if  it is necessary for  extension libraries but this  is where the
+ * "bare" errno is located.
+ *
+ * @return The location of `errno`.
+ */
+static inline int *
+rb_orig_errno_ptr(void)
+{
+    return &errno;
+}
+
+#define rb_orig_errno errno /**< System-provided original `errno`. */
+#undef errno
+#define errno (*rb_errno_ptr()) /**< Ractor-aware version of `errno`. */
+
+/** @} */
+
+
 /** @cond INTERNAL_MACRO */
 #if RBIMPL_HAS_WARNING("-Wgnu-zero-variadic-macro-arguments")
 # /* Skip it; clang -pedantic doesn't like the following */
@@ -306,6 +426,21 @@ __extension__({ \
 # include "ruby/backward.h"
 #endif
 
+#ifndef RUBY__ASAN_DEFAULT_OPTIONS
+# define RUBY__ASAN_DEFAULT_OPTIONS
+#endif
+
+#define RUBY_GLOBAL_SETUP \
+    RUBY__ASAN_DEFAULT_OPTIONS \
+    /* RUBY_GLOBAL_SETUP end */
+
+#if defined(__wasm__) && !defined(__EMSCRIPTEN__)
+int rb_wasm_rt_start(int (*)(int, char **), int, char **);
+# define ruby_start_main rb_wasm_rt_start
+#else
+# define ruby_start_main(main, argc, argv) main(argc, argv)
+#endif
+
 RBIMPL_SYMBOL_EXPORT_END()
 
 #endif /* RUBY_RUBY_H */
diff --git a/include/ruby/st.h b/include/ruby/st.h
index ba69c066c926a1..f35ab436037237 100644
--- a/include/ruby/st.h
+++ b/include/ruby/st.h
@@ -104,8 +104,6 @@ st_table *rb_st_init_table(const struct st_hash_type *);
 #define st_init_table rb_st_init_table
 st_table *rb_st_init_table_with_size(const struct st_hash_type *, st_index_t);
 #define st_init_table_with_size rb_st_init_table_with_size
-st_table *rb_st_init_existing_table_with_size(st_table *tab, const struct st_hash_type *type, st_index_t size);
-#define st_init_existing_table_with_size rb_st_init_existing_table_with_size
 st_table *rb_st_init_numtable(void);
 #define st_init_numtable rb_st_init_numtable
 st_table *rb_st_init_numtable_with_size(st_index_t);
@@ -162,8 +160,6 @@ void rb_st_cleanup_safe(st_table *, st_data_t);
 #define st_cleanup_safe rb_st_cleanup_safe
 void rb_st_clear(st_table *);
 #define st_clear rb_st_clear
-st_table *rb_st_replace(st_table *new_tab, st_table *old_tab);
-#define st_replace rb_st_replace
 st_table *rb_st_copy(st_table *);
 #define st_copy rb_st_copy
 CONSTFUNC(int rb_st_numcmp(st_data_t, st_data_t));
diff --git a/include/ruby/thread.h b/include/ruby/thread.h
index 0b5b1ca0f3088a..2fa01229e28ab0 100644
--- a/include/ruby/thread.h
+++ b/include/ruby/thread.h
@@ -59,6 +59,19 @@
  */
 #define RB_NOGVL_UBF_ASYNC_SAFE  (0x2)
 
+/**
+ * Passing  this  flag   to  rb_nogvl()  indicates  that  the   passed function
+ * is safe to offload to a background thread or work pool. In other words, the
+ * function is safe to run using a fiber scheduler's `blocking_operation_wait`.
+ * hook.
+ *
+ * If your function depends on thread-local storage, or thread-specific data
+ * operations/data structures, you should not set this flag, as
+ * these operations may behave differently (or fail) when run in a different
+ * thread/context (e.g. unlocking a mutex).
+ */
+#define RB_NOGVL_OFFLOAD_SAFE  (0x4)
+
 /** @} */
 
 RBIMPL_SYMBOL_EXPORT_BEGIN()
@@ -190,14 +203,59 @@ void *rb_nogvl(void *(*func)(void *), void *data1,
  */
 #define RUBY_CALL_WO_GVL_FLAG_SKIP_CHECK_INTS_
 
-#define RUBY_INTERNAL_THREAD_EVENT_STARTED    1 << 0 /** thread started */
+/**
+ * Declare the current Ruby thread should acquire a dedicated
+ * native thread on M:N thread scheduler.
+ *
+ * If a C extension (or a library which the extension relies on) should
+ * keep to run on a native thread (e.g. using thread-local-storage),
+ * this function allocates a dedicated native thread for the thread.
+ *
+ * @return `false` if the thread already running on a dedicated native
+ *         thread. Otherwise `true`.
+ */
+bool rb_thread_lock_native_thread(void);
+
+/**
+ * Triggered when a new thread is started.
+ *
+ * @note       The callback will be called *without* the GVL held.
+ */
+#define RUBY_INTERNAL_THREAD_EVENT_STARTED    1 << 0
+
+/**
+* Triggered when a thread attempt to acquire the GVL.
+*
+* @note       The callback will be called *without* the GVL held.
+*/
 #define RUBY_INTERNAL_THREAD_EVENT_READY      1 << 1 /** acquiring GVL */
+
+/**
+ * Triggered when a thread successfully acquired the GVL.
+ *
+ * @note       The callback will be called *with* the GVL held.
+ */
 #define RUBY_INTERNAL_THREAD_EVENT_RESUMED    1 << 2 /** acquired GVL */
+
+/**
+ * Triggered when a thread released the GVL.
+ *
+ * @note       The callback will be called *without* the GVL held.
+ */
 #define RUBY_INTERNAL_THREAD_EVENT_SUSPENDED  1 << 3 /** released GVL */
+
+/**
+ * Triggered when a thread exits.
+ *
+ * @note       The callback will be called *without* the GVL held.
+ */
 #define RUBY_INTERNAL_THREAD_EVENT_EXITED     1 << 4 /** thread terminated */
+
 #define RUBY_INTERNAL_THREAD_EVENT_MASK       0xff /** All Thread events */
 
-typedef void rb_internal_thread_event_data_t; // for future extension.
+typedef struct rb_internal_thread_event_data {
+   VALUE thread;
+} rb_internal_thread_event_data_t;
 
 typedef void (*rb_internal_thread_event_callback)(rb_event_flag_t event,
               const rb_internal_thread_event_data_t *event_data,
@@ -211,7 +269,12 @@ typedef struct rb_internal_thread_event_hook rb_internal_thread_event_hook_t;
  * @param[in]  events  A set of events that `func` should run.
  * @param[in]  data    Passed as-is to `func`.
  * @return     An opaque pointer to the hook, to unregister it later.
- * @note       This functionality is a noop on Windows.
+ * @note       This functionality is a noop on Windows and WebAssembly.
+ * @note       The callback will be called without the GVL held, except for the
+ *             RESUMED event.
+ * @note       Callbacks are not guaranteed to be executed on the native threads
+ *             that corresponds to the Ruby thread. To identify which Ruby thread
+ *             the event refers to, you must use `event_data->thread`.
  * @warning    This function MUST not be called from a thread event callback.
  */
 rb_internal_thread_event_hook_t *rb_internal_thread_add_event_hook(
@@ -223,13 +286,60 @@ rb_internal_thread_event_hook_t *rb_internal_thread_add_event_hook(
  * Unregister the passed hook.
  *
  * @param[in]  hook.  The hook to unregister.
- * @return     Wether the hook was found and unregistered.
- * @note       This functionality is a noop on Windows.
+ * @return     Whether the hook was found and unregistered.
+ * @note       This functionality is a noop on Windows and WebAssembly.
  * @warning    This function MUST not be called from a thread event callback.
 */
 bool rb_internal_thread_remove_event_hook(
         rb_internal_thread_event_hook_t * hook);
 
+
+typedef int rb_internal_thread_specific_key_t;
+#define RB_INTERNAL_THREAD_SPECIFIC_KEY_MAX 8
+/**
+ * Create a key to store thread specific data.
+ *
+ * These APIs are designed for tools using
+ * rb_internal_thread_event_hook APIs.
+ *
+ * Note that only `RB_INTERNAL_THREAD_SPECIFIC_KEY_MAX` keys
+ * can be created. raises `ThreadError` if exceeded.
+ *
+ * Usage:
+ *   // at initialize time:
+ *   int tool_key; // gvar
+ *   Init_tool() {
+ *     tool_key = rb_internal_thread_specific_key_create();
+ *   }
+ *
+ *   // at any timing:
+ *   rb_internal_thread_specific_set(thread, tool_key, per_thread_data);
+ *   ...
+ *   per_thread_data = rb_internal_thread_specific_get(thread, tool_key);
+ */
+rb_internal_thread_specific_key_t rb_internal_thread_specific_key_create(void);
+
+/**
+ * Get thread and tool specific data.
+ *
+ * This function is async signal safe and thread safe.
+ */
+void *rb_internal_thread_specific_get(VALUE thread_val, rb_internal_thread_specific_key_t key);
+
+/**
+ * Set thread and tool specific data.
+ *
+ * This function is async signal safe and thread safe.
+ */
+void rb_internal_thread_specific_set(VALUE thread_val, rb_internal_thread_specific_key_t key, void *data);
+
+/**
+ * Whether the current thread is holding the GVL.
+ *
+ * @return true if the current thread is holding the GVL, false otherwise.
+ */
+int ruby_thread_has_gvl_p(void);
+
 RBIMPL_SYMBOL_EXPORT_END()
 
 #endif /* RUBY_THREAD_H */
diff --git a/include/ruby/util.h b/include/ruby/util.h
index ee11bc940aceae..12e69c4b80c5ad 100644
--- a/include/ruby/util.h
+++ b/include/ruby/util.h
@@ -33,7 +33,9 @@
 
 RBIMPL_SYMBOL_EXPORT_BEGIN()
 
-/** an approximation of ceil(n * log10(2)), up to 65536 at least */
+/** an approximation of ceil(n * log10(2)), up to 1,048,576 (1<<20)
+ * without overflow within 32-bit calculation
+ */
 #define DECIMAL_SIZE_OF_BITS(n) (((n) * 3010 + 9998) / 9999)
 
 /** an approximation of decimal representation size for n-bytes */
diff --git a/include/ruby/version.h b/include/ruby/version.h
index 08c0aadb07f60e..a521d925edd7ce 100644
--- a/include/ruby/version.h
+++ b/include/ruby/version.h
@@ -67,7 +67,7 @@
  * Minor  version.   As of  writing  this  version changes  annually.   Greater
  * version doesn't mean "better"; they just mean years passed.
  */
-#define RUBY_API_VERSION_MINOR 3
+#define RUBY_API_VERSION_MINOR 5
 
 /**
  * Teeny version.  This digit  is kind of reserved these days.   Kept 0 for the
diff --git a/include/ruby/vm.h b/include/ruby/vm.h
index 3458c28be7b78d..87797809524e1d 100644
--- a/include/ruby/vm.h
+++ b/include/ruby/vm.h
@@ -49,6 +49,13 @@ int ruby_vm_destruct(ruby_vm_t *vm);
  */
 void ruby_vm_at_exit(void(*func)(ruby_vm_t *));
 
+/**
+ * Returns whether the Ruby VM will free all memory at shutdown.
+ *
+ * @return true if free-at-exit is enabled, false otherwise.
+ */
+bool ruby_free_at_exit_p(void);
+
 RBIMPL_SYMBOL_EXPORT_END()
 
 #endif /* RUBY_VM_H */
diff --git a/include/ruby/win32.h b/include/ruby/win32.h
index dfb56f418237bc..31dc13e93251fb 100644
--- a/include/ruby/win32.h
+++ b/include/ruby/win32.h
@@ -35,6 +35,7 @@ extern "C++" {			/* template without extern "C++" */
 #endif
 #include <winsock2.h>
 #include <ws2tcpip.h>
+#include <mswsock.h>
 #if !defined(_MSC_VER) || _MSC_VER >= 1400
 #include <iphlpapi.h>
 #endif
@@ -125,8 +126,28 @@ typedef unsigned int uintptr_t;
 #define O_SHARE_DELETE 0x20000000 /* for rb_w32_open(), rb_w32_wopen() */
 
 typedef int clockid_t;
-#define CLOCK_REALTIME  0
-#define CLOCK_MONOTONIC 1
+#if defined(__MINGW32__)
+/* I don't know why but these return some strange values. */
+#undef CLOCK_PROCESS_CPUTIME_ID
+#undef CLOCK_THREAD_CPUTIME_ID
+#undef CLOCK_REALTIME_COARSE
+#endif
+
+/* defined in win32/win32.c for old versions */
+#if !defined(__MINGW32__) || !defined(HAVE_CLOCK_GETTIME)
+#  define HAVE_CLOCK_GETTIME 1
+#  define NEED_CLOCK_GETTIME 1
+#endif
+#if !defined(__MINGW32__) || !defined(HAVE_CLOCK_GETRES)
+#  define HAVE_CLOCK_GETRES 1
+#  define NEED_CLOCK_GETRES 1
+#endif
+#ifndef CLOCK_REALTIME
+#  define CLOCK_REALTIME  0
+#endif
+#ifndef CLOCK_MONOTONIC
+#  define CLOCK_MONOTONIC 1
+#endif
 
 #undef utime
 #undef lseek
diff --git a/inits.c b/inits.c
index 3d61f4067409cc..660162d655ea9f 100644
--- a/inits.c
+++ b/inits.c
@@ -22,8 +22,6 @@ rb_call_inits(void)
 {
     CALL(default_shapes);
     CALL(Thread_Mutex);
-    CALL(vm_postponed_job);
-    CALL(Method);
     CALL(RandomSeedCore);
     CALL(encodings);
     CALL(sym);
@@ -53,7 +51,6 @@ rb_call_inits(void)
     CALL(Dir);
     CALL(Time);
     CALL(Random);
-    CALL(signal);
     CALL(load);
     CALL(Proc);
     CALL(Binding);
@@ -65,9 +62,10 @@ rb_call_inits(void)
     CALL(VM);
     CALL(ISeq);
     CALL(Thread);
+    CALL(signal);
+    CALL(Cont);
     CALL(Fiber_Scheduler);
     CALL(process);
-    CALL(Cont);
     CALL(Rational);
     CALL(Complex);
     CALL(MemoryView);
@@ -75,9 +73,11 @@ rb_call_inits(void)
     CALL(vm_trace);
     CALL(vm_stack_canary);
     CALL(ast);
-    CALL(gc_stress);
     CALL(shape);
-    CALL(YARP);
+    CALL(Prism);
+    CALL(unicode_version);
+    CALL(Set);
+    CALL(Namespace);
 
     // enable builtin loading
     CALL(builtin);
@@ -87,6 +87,9 @@ void
 rb_call_builtin_inits(void)
 {
 #define BUILTIN(n) CALL(builtin_##n)
+    BUILTIN(kernel);
+    BUILTIN(yjit);
+    // BUILTIN(yjit_hook) is called after rb_yjit_init()
     BUILTIN(gc);
     BUILTIN(ractor);
     BUILTIN(numeric);
@@ -97,17 +100,13 @@ rb_call_builtin_inits(void)
     BUILTIN(pack);
     BUILTIN(warning);
     BUILTIN(array);
-    BUILTIN(kernel);
+    BUILTIN(hash);
     BUILTIN(symbol);
     BUILTIN(timev);
     BUILTIN(thread_sync);
-    BUILTIN(yjit);
     BUILTIN(nilclass);
     BUILTIN(marshal);
-#if USE_RJIT
-    BUILTIN(rjit_c);
-    BUILTIN(rjit);
-#endif
+    BUILTIN(zjit);
     Init_builtin_prelude();
 }
 #undef CALL
diff --git a/insns.def b/insns.def
index bbf946ac67adb4..f21a1810a5ddc5 100644
--- a/insns.def
+++ b/insns.def
@@ -222,7 +222,7 @@ setinstancevariable
 (ID id, IVC ic)
 (VALUE val)
 ()
-// attr bool leaf = false; /* has rb_check_frozen_internal() */
+// attr bool leaf = false; /* has rb_check_frozen() */
 {
     vm_setinstancevariable(GET_ISEQ(), GET_SELF(), id, val, ic);
 }
@@ -260,20 +260,7 @@ opt_getconstant_path
 (VALUE val)
 // attr bool leaf = false; /* may autoload or raise */
 {
-    const ID *segments = ic->segments;
-    struct iseq_inline_constant_cache_entry *ice = ic->entry;
-    if (ice && vm_ic_hit_p(ice, GET_EP())) {
-        val = ice->value;
-
-        VM_ASSERT(val == vm_get_ev_const_chain(ec, segments));
-    } else {
-        ruby_vm_constant_cache_misses++;
-        val = vm_get_ev_const_chain(ec, segments);
-        vm_ic_track_const_chain(GET_CFP(), ic, segments);
-        // Because leaf=false, we need to undo the PC increment to get the address to this instruction
-        // INSN_ATTR(width) == 2
-        vm_ic_update(GET_ISEQ(), ic, val, GET_EP(), GET_PC() - 2);
-    }
+    val = rb_vm_opt_getconstant_path(ec, GET_CFP(), ic);
 }
 
 /* Get constant variable id. If klass is Qnil and allow_nil is Qtrue, constants
@@ -388,7 +375,17 @@ putstring
 ()
 (VALUE val)
 {
-    val = rb_ec_str_resurrect(ec, str);
+    val = rb_ec_str_resurrect(ec, str, false);
+}
+
+/* put chilled string val. string will be copied but frozen in the future. */
+DEFINE_INSN
+putchilledstring
+(VALUE str)
+()
+(VALUE val)
+{
+    val = rb_ec_str_resurrect(ec, str, true);
 }
 
 /* put concatenate strings */
@@ -455,23 +452,17 @@ newarray
     val = rb_ec_ary_new_from_values(ec, num, STACK_ADDR_FROM_TOP(num));
 }
 
-/* put new array initialized with num values on the stack. There
-   should be at least one element on the stack, and the top element
-   should be a hash.  If the top element is empty, it is not
-   included in the array.
+/* push hash onto array unless the hash is empty (as empty keyword
+   splats should be ignored).
  */
 DEFINE_INSN
-newarraykwsplat
-(rb_num_t num)
-(...)
-(VALUE val)
-// attr rb_snum_t sp_inc = 1 - (rb_snum_t)num;
+pushtoarraykwsplat
+()
+(VALUE ary, VALUE hash)
+(VALUE ary)
 {
-    if (RHASH_EMPTY_P(*STACK_ADDR_FROM_TOP(1))) {
-        val = rb_ary_new4(num-1, STACK_ADDR_FROM_TOP(num));
-    }
-    else {
-        val = rb_ary_new4(num, STACK_ADDR_FROM_TOP(num));
+    if (!RHASH_EMPTY_P(hash)) {
+        rb_ary_push(ary, hash);
     }
 }
 
@@ -511,13 +502,16 @@ expandarray
 (rb_num_t num, rb_num_t flag)
 (..., VALUE ary)
 (...)
+// attr bool handles_sp = true;
 // attr bool leaf = false; /* has rb_check_array_type() */
 // attr rb_snum_t sp_inc = (rb_snum_t)num - 1 + (flag & 1 ? 1 : 0);
 {
-    vm_expandarray(GET_SP(), ary, num, (int)flag);
+    vm_expandarray(GET_CFP(), ary, num, (int)flag);
 }
 
-/* concat two arrays */
+/* concat two arrays, without modifying first array.
+ * attempts to convert both objects to arrays using to_a.
+ */
 DEFINE_INSN
 concatarray
 ()
@@ -528,6 +522,32 @@ concatarray
     ary = vm_concat_array(ary1, ary2);
 }
 
+/* concat second array to first array.
+ * first argument must already be an array.
+ * attempts to convert second object to array using to_a.
+ */
+DEFINE_INSN
+concattoarray
+()
+(VALUE ary1, VALUE ary2)
+(VALUE ary)
+// attr bool leaf = false; /* has rb_check_array_type() */
+{
+    ary = vm_concat_to_array(ary1, ary2);
+}
+
+/* push given number of objects to array directly before. */
+DEFINE_INSN
+pushtoarray
+(rb_num_t num)
+(...)
+(VALUE val)
+// attr rb_snum_t sp_inc = -(rb_snum_t)num;
+{
+    const VALUE *objp = STACK_ADDR_FROM_TOP(num);
+    val = rb_ary_cat(*(objp-1), objp, num);
+}
+
 /* call to_a on array ary to splat */
 DEFINE_INSN
 splatarray
@@ -539,6 +559,22 @@ splatarray
     obj = vm_splat_array(flag, ary);
 }
 
+/* call to_hash on hash to keyword splat before converting block */
+DEFINE_INSN
+splatkw
+()
+(VALUE hash, VALUE block)
+(VALUE obj, VALUE block)
+// attr bool leaf = false; /* has rb_to_hash_type() */
+{
+    if (NIL_P(hash)) {
+        obj = Qnil;
+    }
+    else {
+        obj = rb_to_hash_type(hash);
+    }
+}
+
 /* put new Hash from n elements. n must be an even number. */
 DEFINE_INSN
 newhash
@@ -710,7 +746,7 @@ definedivar
 // attr bool leaf  = false;
 {
     val = Qnil;
-    if (vm_getivar(GET_SELF(), id, GET_ISEQ(), ic, NULL, FALSE, Qundef) != Qundef) {
+    if (!UNDEF_P(vm_getivar(GET_SELF(), id, GET_ISEQ(), ic, NULL, FALSE, Qundef))) {
         val = pushval;
     }
 }
@@ -815,7 +851,34 @@ send
     val = vm_sendish(ec, GET_CFP(), cd, bh, mexp_search_method);
     JIT_EXEC(ec, val);
 
-    if (val == Qundef) {
+    if (UNDEF_P(val)) {
+        RESTORE_REGS();
+        NEXT_INSN();
+    }
+}
+
+/* invoke forward method. */
+DEFINE_INSN
+sendforward
+(CALL_DATA cd, ISEQ blockiseq)
+(...)
+(VALUE val)
+// attr rb_snum_t sp_inc = sp_inc_of_sendish(cd->ci);
+// attr rb_snum_t comptime_sp_inc = sp_inc_of_sendish(ci);
+{
+    struct rb_forwarding_call_data adjusted_cd;
+    struct rb_callinfo adjusted_ci;
+
+    VALUE bh = vm_caller_setup_fwd_args(ec, GET_CFP(), cd, blockiseq, 0, &adjusted_cd, &adjusted_ci);
+
+    val = vm_sendish(ec, GET_CFP(), &adjusted_cd.cd, bh, mexp_search_method);
+    JIT_EXEC(ec, val);
+
+    if (cd->cc != adjusted_cd.cd.cc && vm_cc_markable(adjusted_cd.cd.cc)) {
+        RB_OBJ_WRITE(GET_ISEQ(), &cd->cc, adjusted_cd.cd.cc);
+    }
+
+    if (UNDEF_P(val)) {
         RESTORE_REGS();
         NEXT_INSN();
     }
@@ -827,6 +890,7 @@ opt_send_without_block
 (CALL_DATA cd)
 (...)
 (VALUE val)
+// attr bool zjit_profile = true;
 // attr bool handles_sp = true;
 // attr rb_snum_t sp_inc = sp_inc_of_sendish(cd->ci);
 // attr rb_snum_t comptime_sp_inc = sp_inc_of_sendish(ci);
@@ -835,12 +899,38 @@ opt_send_without_block
     val = vm_sendish(ec, GET_CFP(), cd, bh, mexp_search_method);
     JIT_EXEC(ec, val);
 
-    if (val == Qundef) {
+    if (UNDEF_P(val)) {
         RESTORE_REGS();
         NEXT_INSN();
     }
 }
 
+/* Jump if "new" method has been defined by user */
+DEFINE_INSN
+opt_new
+(CALL_DATA cd, OFFSET dst)
+()
+()
+// attr bool leaf = false;
+{
+    VALUE argc = vm_ci_argc(cd->ci);
+    VALUE val = TOPN(argc);
+
+    // The bookkeeping slot should be empty.
+    RUBY_ASSERT(TOPN(argc + 1) == Qnil);
+
+    if (vm_method_cfunc_is(GET_ISEQ(), cd, val, rb_class_new_instance_pass_kw)) {
+        RB_DEBUG_COUNTER_INC(opt_new_hit);
+        val = rb_obj_alloc(val);
+        TOPN(argc) = val;
+        TOPN(argc + 1) = val;
+    }
+    else {
+        RB_DEBUG_COUNTER_INC(opt_new_miss);
+        JUMP(dst);
+    }
+}
+
 /* Convert object to string using to_s or equivalent. */
 DEFINE_INSN
 objtostring
@@ -851,7 +941,37 @@ objtostring
 {
     val = vm_objtostring(GET_ISEQ(), recv, cd);
 
-    if (val == Qundef) {
+    if (UNDEF_P(val)) {
+        CALL_SIMPLE_METHOD();
+    }
+}
+
+DEFINE_INSN
+opt_ary_freeze
+(VALUE ary, CALL_DATA cd)
+()
+(VALUE val)
+{
+    val = vm_opt_ary_freeze(ary, BOP_FREEZE, idFreeze);
+
+    if (UNDEF_P(val)) {
+        RUBY_DTRACE_CREATE_HOOK(ARRAY, RARRAY_LEN(ary));
+        PUSH(rb_ary_resurrect(ary));
+        CALL_SIMPLE_METHOD();
+    }
+}
+
+DEFINE_INSN
+opt_hash_freeze
+(VALUE hash, CALL_DATA cd)
+()
+(VALUE val)
+{
+    val = vm_opt_hash_freeze(hash, BOP_FREEZE, idFreeze);
+
+    if (UNDEF_P(val)) {
+        RUBY_DTRACE_CREATE_HOOK(HASH, RHASH_SIZE(hash) << 1);
+        PUSH(rb_hash_resurrect(hash));
         CALL_SIMPLE_METHOD();
     }
 }
@@ -864,7 +984,7 @@ opt_str_freeze
 {
     val = vm_opt_str_freeze(str, BOP_FREEZE, idFreeze);
 
-    if (val == Qundef) {
+    if (UNDEF_P(val)) {
         PUSH(rb_str_resurrect(str));
         CALL_SIMPLE_METHOD();
     }
@@ -876,10 +996,11 @@ opt_nil_p
 (CALL_DATA cd)
 (VALUE recv)
 (VALUE val)
+// attr bool zjit_profile = true;
 {
     val = vm_opt_nil_p(GET_ISEQ(), cd, recv);
 
-    if (val == Qundef) {
+    if (UNDEF_P(val)) {
         CALL_SIMPLE_METHOD();
     }
 }
@@ -892,15 +1013,37 @@ opt_str_uminus
 {
     val = vm_opt_str_freeze(str, BOP_UMINUS, idUMinus);
 
-    if (val == Qundef) {
+    if (UNDEF_P(val)) {
         PUSH(rb_str_resurrect(str));
         CALL_SIMPLE_METHOD();
     }
 }
 
+DEFINE_INSN
+opt_duparray_send
+(VALUE ary, ID method, rb_num_t argc)
+(...)
+(VALUE val)
+/* This instruction typically has no funcalls.  But it may compare array
+ * contents to each other which may call methods when necessary.
+ * No way to detect such method calls beforehand.
+ * We must mark it as not leaf. */
+// attr bool leaf = false; /* has rb_funcall() */
+// attr rb_snum_t sp_inc = 1 - (rb_snum_t)argc;
+// attr rb_snum_t comptime_sp_inc = 1 - (rb_snum_t)argc;
+{
+    switch (method) {
+      case idIncludeP:
+        val = vm_opt_duparray_include_p(ec, ary, TOPN(0));
+        break;
+      default:
+        rb_bug("unreachable");
+    }
+}
+
 DEFINE_INSN
 opt_newarray_send
-(rb_num_t num, ID method)
+(rb_num_t num, rb_num_t method)
 (...)
 (VALUE val)
 /* This instruction typically has no funcalls.  But it compares array
@@ -911,16 +1054,25 @@ opt_newarray_send
 // attr rb_snum_t sp_inc = 1 - (rb_snum_t)num;
 // attr rb_snum_t comptime_sp_inc = 1 - (rb_snum_t)num;
 {
-    switch(method) {
-      case idHash:
+    switch (method) {
+      case VM_OPT_NEWARRAY_SEND_HASH:
         val = vm_opt_newarray_hash(ec, num, STACK_ADDR_FROM_TOP(num));
         break;
-      case idMin:
+      case VM_OPT_NEWARRAY_SEND_MIN:
         val = vm_opt_newarray_min(ec, num, STACK_ADDR_FROM_TOP(num));
         break;
-      case idMax:
+      case VM_OPT_NEWARRAY_SEND_MAX:
         val = vm_opt_newarray_max(ec, num, STACK_ADDR_FROM_TOP(num));
         break;
+      case VM_OPT_NEWARRAY_SEND_INCLUDE_P:
+        val = vm_opt_newarray_include_p(ec, (long)num-1, STACK_ADDR_FROM_TOP(num), TOPN(0));
+        break;
+      case VM_OPT_NEWARRAY_SEND_PACK:
+        val = vm_opt_newarray_pack_buffer(ec, (long)num-1, STACK_ADDR_FROM_TOP(num), TOPN(0), Qundef);
+        break;
+      case VM_OPT_NEWARRAY_SEND_PACK_BUFFER:
+        val = vm_opt_newarray_pack_buffer(ec, (long)num-2, STACK_ADDR_FROM_TOP(num), TOPN(1), TOPN(0));
+        break;
       default:
         rb_bug("unreachable");
     }
@@ -939,7 +1091,34 @@ invokesuper
     val = vm_sendish(ec, GET_CFP(), cd, bh, mexp_search_super);
     JIT_EXEC(ec, val);
 
-    if (val == Qundef) {
+    if (UNDEF_P(val)) {
+        RESTORE_REGS();
+        NEXT_INSN();
+    }
+}
+
+/* super(args) # args.size => num */
+DEFINE_INSN
+invokesuperforward
+(CALL_DATA cd, ISEQ blockiseq)
+(...)
+(VALUE val)
+// attr rb_snum_t sp_inc = sp_inc_of_sendish(cd->ci);
+// attr rb_snum_t comptime_sp_inc = sp_inc_of_sendish(ci);
+{
+    struct rb_forwarding_call_data adjusted_cd;
+    struct rb_callinfo adjusted_ci;
+
+    VALUE bh = vm_caller_setup_fwd_args(ec, GET_CFP(), cd, blockiseq, 1, &adjusted_cd, &adjusted_ci);
+
+    val = vm_sendish(ec, GET_CFP(), &adjusted_cd.cd, bh, mexp_search_super);
+    JIT_EXEC(ec, val);
+
+    if (cd->cc != adjusted_cd.cd.cc && vm_cc_markable(adjusted_cd.cd.cc)) {
+        RB_OBJ_WRITE(GET_ISEQ(), &cd->cc, adjusted_cd.cd.cc);
+    }
+
+    if (UNDEF_P(val)) {
         RESTORE_REGS();
         NEXT_INSN();
     }
@@ -959,7 +1138,7 @@ invokeblock
     val = vm_sendish(ec, GET_CFP(), cd, bh, mexp_search_invokeblock);
     JIT_EXEC(ec, val);
 
-    if (val == Qundef) {
+    if (UNDEF_P(val)) {
         RESTORE_REGS();
         NEXT_INSN();
     }
@@ -1114,10 +1293,11 @@ opt_plus
 (CALL_DATA cd)
 (VALUE recv, VALUE obj)
 (VALUE val)
+// attr bool zjit_profile = true;
 {
     val = vm_opt_plus(recv, obj);
 
-    if (val == Qundef) {
+    if (UNDEF_P(val)) {
         CALL_SIMPLE_METHOD();
     }
 }
@@ -1128,10 +1308,11 @@ opt_minus
 (CALL_DATA cd)
 (VALUE recv, VALUE obj)
 (VALUE val)
+// attr bool zjit_profile = true;
 {
     val = vm_opt_minus(recv, obj);
 
-    if (val == Qundef) {
+    if (UNDEF_P(val)) {
         CALL_SIMPLE_METHOD();
     }
 }
@@ -1142,10 +1323,11 @@ opt_mult
 (CALL_DATA cd)
 (VALUE recv, VALUE obj)
 (VALUE val)
+// attr bool zjit_profile = true;
 {
     val = vm_opt_mult(recv, obj);
 
-    if (val == Qundef) {
+    if (UNDEF_P(val)) {
         CALL_SIMPLE_METHOD();
     }
 }
@@ -1159,10 +1341,11 @@ opt_div
 /* In case of division by zero, it raises. Thus
  * ZeroDivisionError#initialize is called.  */
 // attr bool leaf = false;
+// attr bool zjit_profile = true;
 {
     val = vm_opt_div(recv, obj);
 
-    if (val == Qundef) {
+    if (UNDEF_P(val)) {
         CALL_SIMPLE_METHOD();
     }
 }
@@ -1175,10 +1358,11 @@ opt_mod
 (VALUE val)
 /* Same discussion as opt_div. */
 // attr bool leaf = false;
+// attr bool zjit_profile = true;
 {
     val = vm_opt_mod(recv, obj);
 
-    if (val == Qundef) {
+    if (UNDEF_P(val)) {
         CALL_SIMPLE_METHOD();
     }
 }
@@ -1189,10 +1373,11 @@ opt_eq
 (CALL_DATA cd)
 (VALUE recv, VALUE obj)
 (VALUE val)
+// attr bool zjit_profile = true;
 {
     val = opt_equality(GET_ISEQ(), recv, obj, cd);
 
-    if (val == Qundef) {
+    if (UNDEF_P(val)) {
         CALL_SIMPLE_METHOD();
     }
 }
@@ -1203,10 +1388,11 @@ opt_neq
 (CALL_DATA cd_eq, CALL_DATA cd)
 (VALUE recv, VALUE obj)
 (VALUE val)
+// attr bool zjit_profile = true;
 {
     val = vm_opt_neq(GET_ISEQ(), cd, cd_eq, recv, obj);
 
-    if (val == Qundef) {
+    if (UNDEF_P(val)) {
         CALL_SIMPLE_METHOD();
     }
 }
@@ -1217,10 +1403,11 @@ opt_lt
 (CALL_DATA cd)
 (VALUE recv, VALUE obj)
 (VALUE val)
+// attr bool zjit_profile = true;
 {
     val = vm_opt_lt(recv, obj);
 
-    if (val == Qundef) {
+    if (UNDEF_P(val)) {
         CALL_SIMPLE_METHOD();
     }
 }
@@ -1231,10 +1418,11 @@ opt_le
 (CALL_DATA cd)
 (VALUE recv, VALUE obj)
 (VALUE val)
+// attr bool zjit_profile = true;
 {
     val = vm_opt_le(recv, obj);
 
-    if (val == Qundef) {
+    if (UNDEF_P(val)) {
         CALL_SIMPLE_METHOD();
     }
 }
@@ -1245,10 +1433,11 @@ opt_gt
 (CALL_DATA cd)
 (VALUE recv, VALUE obj)
 (VALUE val)
+// attr bool zjit_profile = true;
 {
     val = vm_opt_gt(recv, obj);
 
-    if (val == Qundef) {
+    if (UNDEF_P(val)) {
         CALL_SIMPLE_METHOD();
     }
 }
@@ -1259,10 +1448,11 @@ opt_ge
 (CALL_DATA cd)
 (VALUE recv, VALUE obj)
 (VALUE val)
+// attr bool zjit_profile = true;
 {
     val = vm_opt_ge(recv, obj);
 
-    if (val == Qundef) {
+    if (UNDEF_P(val)) {
         CALL_SIMPLE_METHOD();
     }
 }
@@ -1280,7 +1470,7 @@ opt_ltlt
 {
     val = vm_opt_ltlt(recv, obj);
 
-    if (val == Qundef) {
+    if (UNDEF_P(val)) {
         CALL_SIMPLE_METHOD();
     }
 }
@@ -1291,10 +1481,11 @@ opt_and
 (CALL_DATA cd)
 (VALUE recv, VALUE obj)
 (VALUE val)
+// attr bool zjit_profile = true;
 {
     val = vm_opt_and(recv, obj);
 
-    if (val == Qundef) {
+    if (UNDEF_P(val)) {
         CALL_SIMPLE_METHOD();
     }
 }
@@ -1305,10 +1496,11 @@ opt_or
 (CALL_DATA cd)
 (VALUE recv, VALUE obj)
 (VALUE val)
+// attr bool zjit_profile = true;
 {
     val = vm_opt_or(recv, obj);
 
-    if (val == Qundef) {
+    if (UNDEF_P(val)) {
         CALL_SIMPLE_METHOD();
     }
 }
@@ -1327,7 +1519,7 @@ opt_aref
 {
     val = vm_opt_aref(recv, obj);
 
-    if (val == Qundef) {
+    if (UNDEF_P(val)) {
         CALL_SIMPLE_METHOD();
     }
 }
@@ -1344,7 +1536,7 @@ opt_aset
 {
     val = vm_opt_aset(recv, obj, set);
 
-    if (val == Qundef) {
+    if (UNDEF_P(val)) {
         CALL_SIMPLE_METHOD();
     }
 }
@@ -1360,7 +1552,7 @@ opt_aset_with
 {
     VALUE tmp = vm_opt_aset_with(recv, key, val);
 
-    if (tmp != Qundef) {
+    if (!UNDEF_P(tmp)) {
         val = tmp;
     }
     else {
@@ -1381,7 +1573,7 @@ opt_aref_with
 {
     val = vm_opt_aref_with(recv, key);
 
-    if (val == Qundef) {
+    if (UNDEF_P(val)) {
         PUSH(rb_str_resurrect(key));
         CALL_SIMPLE_METHOD();
     }
@@ -1396,7 +1588,7 @@ opt_length
 {
     val = vm_opt_length(recv, BOP_LENGTH);
 
-    if (val == Qundef) {
+    if (UNDEF_P(val)) {
         CALL_SIMPLE_METHOD();
     }
 }
@@ -1410,7 +1602,7 @@ opt_size
 {
     val = vm_opt_length(recv, BOP_SIZE);
 
-    if (val == Qundef) {
+    if (UNDEF_P(val)) {
         CALL_SIMPLE_METHOD();
     }
 }
@@ -1424,7 +1616,7 @@ opt_empty_p
 {
     val = vm_opt_empty_p(recv);
 
-    if (val == Qundef) {
+    if (UNDEF_P(val)) {
         CALL_SIMPLE_METHOD();
     }
 }
@@ -1438,7 +1630,7 @@ opt_succ
 {
     val = vm_opt_succ(recv);
 
-    if (val == Qundef) {
+    if (UNDEF_P(val)) {
         CALL_SIMPLE_METHOD();
     }
 }
@@ -1452,7 +1644,7 @@ opt_not
 {
     val = vm_opt_not(GET_ISEQ(), cd, recv);
 
-    if (val == Qundef) {
+    if (UNDEF_P(val)) {
         CALL_SIMPLE_METHOD();
     }
 }
@@ -1467,7 +1659,7 @@ opt_regexpmatch2
 {
     val = vm_opt_regexpmatch2(obj2, obj1);
 
-    if (val == Qundef) {
+    if (UNDEF_P(val)) {
         CALL_SIMPLE_METHOD();
     }
 }
diff --git a/internal.h b/internal.h
index c66e057f60a3a5..002044cfa1a590 100644
--- a/internal.h
+++ b/internal.h
@@ -40,10 +40,6 @@
 #undef RClass
 #undef RCLASS_SUPER
 
-/* internal/gc.h */
-#undef NEWOBJ_OF
-#undef RB_NEWOBJ_OF
-
 /* internal/hash.h */
 #undef RHASH_IFNONE
 #undef RHASH_SIZE
@@ -62,9 +58,6 @@
 /* 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__)
 
diff --git a/internal/array.h b/internal/array.h
index 66017129c8849b..398676df4aa80d 100644
--- a/internal/array.h
+++ b/internal/array.h
@@ -37,6 +37,7 @@ size_t rb_ary_size_as_embedded(VALUE ary);
 void rb_ary_make_embedded(VALUE ary);
 bool rb_ary_embeddable_p(VALUE ary);
 VALUE rb_ary_diff(VALUE ary1, VALUE ary2);
+RUBY_EXTERN VALUE rb_cArray_empty_frozen;
 
 static inline VALUE rb_ary_entry_internal(VALUE ary, long offset);
 static inline bool ARY_PTR_USING_P(VALUE ary);
@@ -136,9 +137,16 @@ RBIMPL_ATTR_ARTIFICIAL()
 static inline VALUE
 RARRAY_AREF(VALUE ary, long i)
 {
+    VALUE val;
     RBIMPL_ASSERT_TYPE(ary, RUBY_T_ARRAY);
 
-    return RARRAY_CONST_PTR(ary)[i];
+    RBIMPL_WARNING_PUSH();
+#if defined(__GNUC__) && !defined(__clang__) && __GNUC__ == 13
+    RBIMPL_WARNING_IGNORED(-Warray-bounds);
+#endif
+    val = RARRAY_CONST_PTR(ary)[i];
+    RBIMPL_WARNING_POP();
+    return val;
 }
 
 #endif /* INTERNAL_ARRAY_H */
diff --git a/internal/basic_operators.h b/internal/basic_operators.h
index a59403631ef5ba..5dc8d7fe8d69fb 100644
--- a/internal/basic_operators.h
+++ b/internal/basic_operators.h
@@ -37,6 +37,8 @@ enum ruby_basic_operators {
     BOP_OR,
     BOP_CMP,
     BOP_DEFAULT,
+    BOP_PACK,
+    BOP_INCLUDE_P,
 
     BOP_LAST_
 };
diff --git a/internal/bits.h b/internal/bits.h
index 538e6c11ae8688..2b5aecf1128a72 100644
--- a/internal/bits.h
+++ b/internal/bits.h
@@ -90,6 +90,7 @@
 
 #define UNSIGNED_INTEGER_MAX(T) ((T)~(T)0)
 
+#ifndef MUL_OVERFLOW_SIGNED_INTEGER_P
 #if __has_builtin(__builtin_mul_overflow_p)
 # define MUL_OVERFLOW_P(a, b) \
     __builtin_mul_overflow_p((a), (b), (__typeof__(a * b))0)
@@ -131,6 +132,87 @@
 # 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
+#endif
+
+#ifndef ADD_OVERFLOW_SIGNED_INTEGER_P
+#if __has_builtin(__builtin_add_overflow_p)
+# define ADD_OVERFLOW_P(a, b) \
+    __builtin_add_overflow_p((a), (b), (__typeof__(a * b))0)
+#elif __has_builtin(__builtin_add_overflow)
+# define ADD_OVERFLOW_P(a, b) \
+    __extension__ ({ __typeof__(a) c; __builtin_add_overflow((a), (b), &c); })
+#endif
+
+#define ADD_OVERFLOW_SIGNED_INTEGER_P(a, b, min, max) ( \
+    (a) > 0 ? (b) > (max) - (a) : (b) < (min) - (a))
+
+#if __has_builtin(__builtin_add_overflow_p)
+/* __builtin_add_overflow_p can take bitfield */
+/* and GCC permits bitfields for integers other than int */
+# define ADD_OVERFLOW_FIXNUM_P(a, b) \
+    __extension__ ({ \
+        struct { long fixnum : sizeof(long) * CHAR_BIT - 1; } c = { 0 }; \
+        __builtin_add_overflow_p((a), (b), c.fixnum); \
+    })
+#else
+# define ADD_OVERFLOW_FIXNUM_P(a, b) \
+    ADD_OVERFLOW_SIGNED_INTEGER_P(a, b, FIXNUM_MIN, FIXNUM_MAX)
+#endif
+
+#if defined(ADD_OVERFLOW_P) && defined(USE___BUILTIN_ADD_OVERFLOW_LONG_LONG)
+# define ADD_OVERFLOW_LONG_LONG_P(a, b) ADD_OVERFLOW_P(a, b)
+#else
+# define ADD_OVERFLOW_LONG_LONG_P(a, b) ADD_OVERFLOW_SIGNED_INTEGER_P(a, b, LLONG_MIN, LLONG_MAX)
+#endif
+
+#ifdef ADD_OVERFLOW_P
+# define ADD_OVERFLOW_LONG_P(a, b)      ADD_OVERFLOW_P(a, b)
+# define ADD_OVERFLOW_INT_P(a, b)       ADD_OVERFLOW_P(a, b)
+#else
+# define ADD_OVERFLOW_LONG_P(a, b)      ADD_OVERFLOW_SIGNED_INTEGER_P(a, b, LONG_MIN, LONG_MAX)
+# define ADD_OVERFLOW_INT_P(a, b)       ADD_OVERFLOW_SIGNED_INTEGER_P(a, b, INT_MIN, INT_MAX)
+#endif
+#endif
+
+#ifndef SUB_OVERFLOW_SIGNED_INTEGER_P
+#if __has_builtin(__builtin_sub_overflow_p)
+# define SUB_OVERFLOW_P(a, b) \
+    __builtin_sub_overflow_p((a), (b), (__typeof__(a * b))0)
+#elif __has_builtin(__builtin_sub_overflow)
+# define SUB_OVERFLOW_P(a, b) \
+    __extension__ ({ __typeof__(a) c; __builtin_sub_overflow((a), (b), &c); })
+#endif
+
+#define SUB_OVERFLOW_SIGNED_INTEGER_P(a, b, min, max) ( \
+        (b) > 0 ? (a) < (min) + (b) : (a) > (max) + (b))
+
+#if __has_builtin(__builtin_sub_overflow_p)
+/* __builtin_sub_overflow_p can take bitfield */
+/* and GCC permits bitfields for integers other than int */
+# define SUB_OVERFLOW_FIXNUM_P(a, b) \
+    __extension__ ({ \
+        struct { long fixnum : sizeof(long) * CHAR_BIT - 1; } c = { 0 }; \
+        __builtin_sub_overflow_p((a), (b), c.fixnum); \
+    })
+#else
+# define SUB_OVERFLOW_FIXNUM_P(a, b) \
+    SUB_OVERFLOW_SIGNED_INTEGER_P(a, b, FIXNUM_MIN, FIXNUM_MAX)
+#endif
+
+#if defined(SUB_OVERFLOW_P) && defined(USE___BUILTIN_SUB_OVERFLOW_LONG_LONG)
+# define SUB_OVERFLOW_LONG_LONG_P(a, b) SUB_OVERFLOW_P(a, b)
+#else
+# define SUB_OVERFLOW_LONG_LONG_P(a, b) SUB_OVERFLOW_SIGNED_INTEGER_P(a, b, LLONG_MIN, LLONG_MAX)
+#endif
+
+#ifdef SUB_OVERFLOW_P
+# define SUB_OVERFLOW_LONG_P(a, b)      SUB_OVERFLOW_P(a, b)
+# define SUB_OVERFLOW_INT_P(a, b)       SUB_OVERFLOW_P(a, b)
+#else
+# define SUB_OVERFLOW_LONG_P(a, b)      SUB_OVERFLOW_SIGNED_INTEGER_P(a, b, LONG_MIN, LONG_MAX)
+# define SUB_OVERFLOW_INT_P(a, b)       SUB_OVERFLOW_SIGNED_INTEGER_P(a, b, INT_MIN, INT_MAX)
+#endif
+#endif
 
 #ifdef HAVE_UINT128_T
 # define bit_length(x) \
@@ -398,9 +480,9 @@ rb_popcount32(uint32_t 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);
-    x = (x & 0x0000003f) + (x >>16 & 0x0000003f);
+    x = (x & 0x07070707) + (x >> 4 & 0x07070707);
+    x = (x & 0x000f000f) + (x >> 8 & 0x000f000f);
+    x = (x & 0x0000001f) + (x >>16 & 0x0000001f);
     return (unsigned int)x;
 
 #endif
@@ -428,9 +510,9 @@ rb_popcount64(uint64_t x)
     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);
-    x = (x & 0x000000000000007f) + (x >>32 & 0x000000000000007f);
+    x = (x & 0x000f000f000f000f) + (x >> 8 & 0x000f000f000f000f);
+    x = (x & 0x0000001f0000001f) + (x >>16 & 0x0000001f0000001f);
+    x = (x & 0x000000000000003f) + (x >>32 & 0x000000000000003f);
     return (unsigned int)x;
 
 #endif
diff --git a/internal/class.h b/internal/class.h
index b9ff53a6b0903c..f8cfba3fd963b4 100644
--- a/internal/class.h
+++ b/internal/class.h
@@ -10,6 +10,7 @@
  */
 #include "id.h"
 #include "id_table.h"           /* for struct rb_id_table */
+#include "internal/namespace.h" /* for rb_current_namespace */
 #include "internal/serial.h"    /* for rb_serial_t */
 #include "internal/static_assert.h"
 #include "internal/variable.h"  /* for rb_class_ivar_set */
@@ -19,12 +20,48 @@
 #include "shape.h"
 #include "ruby_assert.h"
 #include "vm_core.h"
+#include "vm_sync.h"
 #include "method.h"             /* for rb_cref_t */
 
 #ifdef RCLASS_SUPER
 # undef RCLASS_SUPER
 #endif
 
+struct rb_ns_subclasses {
+    long refcount;
+    struct st_table *tbl;
+};
+typedef struct rb_ns_subclasses rb_ns_subclasses_t;
+
+static inline long
+rb_ns_subclasses_ref_count(rb_ns_subclasses_t *ns_sub)
+{
+    return ns_sub->refcount;
+}
+
+static inline rb_ns_subclasses_t *
+rb_ns_subclasses_ref_inc(rb_ns_subclasses_t *ns_sub)
+{
+    ns_sub->refcount++;
+    return ns_sub;
+}
+
+static inline void
+rb_ns_subclasses_ref_dec(rb_ns_subclasses_t *ns_sub)
+{
+    ns_sub->refcount--;
+    if (ns_sub->refcount == 0) {
+        st_free_table(ns_sub->tbl);
+        xfree(ns_sub);
+    }
+}
+
+struct rb_subclass_anchor {
+    rb_ns_subclasses_t *ns_subclasses;
+    struct rb_subclass_entry *head;
+};
+typedef struct rb_subclass_anchor rb_subclass_anchor_t;
+
 struct rb_subclass_entry {
     VALUE klass;
     struct rb_subclass_entry *next;
@@ -40,21 +77,35 @@ struct rb_cvar_class_tbl_entry {
 };
 
 struct rb_classext_struct {
-    VALUE *iv_ptr;
+    const rb_namespace_t *ns;
+    VALUE super;
+    VALUE fields_obj; // Fields are either ivar or other internal properties stored inline
+    struct rb_id_table *m_tbl;
     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_id_table *cc_tbl; /* ID -> [[ci1, cc1], [ci2, cc2] ...] */
     struct rb_id_table *cvc_tbl;
-    size_t superclass_depth;
     VALUE *superclasses;
-    struct rb_subclass_entry *subclasses;
-    struct rb_subclass_entry *subclass_entry;
     /**
-     * In the case that this is an `ICLASS`, `module_subclasses` points to the link
+     * The head of subclasses is a blank (w/o klass) entry to be referred from anchor (and be never deleted).
+     * (anchor -> head -> 1st-entry)
+     */
+    struct rb_subclass_anchor *subclasses;
+    /**
+     * The `ns_super_subclasses` points the `ns_subclasses` struct to retreive the subclasses
+     * of the super class in a specific namespace.
+     * In compaction GCs, collecting a classext should trigger the deletion of a rb_subclass_entry
+     * from the super's subclasses. But it may be prevented by the read barrier.
+     * Fetching the super's subclasses for a ns is to avoid the read barrier in that process.
+     */
+    rb_ns_subclasses_t *ns_super_subclasses;
+    /**
+     * In the case that this is an `ICLASS`, `ns_module_subclasses` points to the link
      * in the module's `subclasses` list that indicates that the klass has been
      * included. Hopefully that makes sense.
      */
-    struct rb_subclass_entry *module_subclass_entry;
+    rb_ns_subclasses_t *ns_module_subclasses;
+
     const VALUE origin_;
     const VALUE refined_class;
     union {
@@ -64,12 +115,19 @@ struct rb_classext_struct {
         struct {
             VALUE attached_object;
         } singleton_class;
+        struct {
+            const VALUE includer;
+        } iclass;
     } as;
-    const VALUE includer;
     attr_index_t max_iv_count;
+    uint16_t superclass_depth;
     unsigned char variation_count;
     bool permanent_classpath : 1;
     bool cloned : 1;
+    bool shared_const_tbl : 1;
+    bool iclass_is_origin : 1;
+    bool iclass_origin_shared_mtbl : 1;
+    bool superclasses_with_self : 1;
     VALUE classpath;
 };
 typedef struct rb_classext_struct rb_classext_t;
@@ -78,53 +136,374 @@ STATIC_ASSERT(shape_max_variations, SHAPE_MAX_VARIATIONS < (1 << (sizeof(((rb_cl
 
 struct RClass {
     struct RBasic basic;
-    VALUE super;
-    struct rb_id_table *m_tbl;
+    VALUE object_id;
+    /*
+     * If ns_classext_tbl is NULL, then the prime classext is readable (because no other classext exists).
+     * For the check whether writable or not, check flag RCLASS_PRIME_CLASSEXT_WRITABLE
+     */
+};
+
+struct RClass_and_rb_classext_t {
+    struct RClass rclass;
+    rb_classext_t classext;
+};
+
+#if SIZEOF_VALUE >= SIZEOF_LONG_LONG
+// Assert that classes can be embedded in heaps[2] (which has 160B slot size)
+// On 32bit platforms there is no variable width allocation so it doesn't matter.
+STATIC_ASSERT(sizeof_rb_classext_t, sizeof(struct RClass_and_rb_classext_t) <= 4 * RVALUE_SIZE);
+#endif
+
+struct RClass_namespaceable {
+    struct RClass_and_rb_classext_t base;
+    st_table *ns_classext_tbl; // ns_object -> (rb_classext_t *)
 };
 
-// Assert that classes can be embedded in size_pools[2] (which has 160B slot size)
-STATIC_ASSERT(sizeof_rb_classext_t, sizeof(struct RClass) + sizeof(rb_classext_t) <= 4 * RVALUE_SIZE);
-
-#define RCLASS_EXT(c) ((rb_classext_t *)((char *)(c) + sizeof(struct RClass)))
-#define RCLASS_CONST_TBL(c) (RCLASS_EXT(c)->const_tbl)
-#define RCLASS_M_TBL(c) (RCLASS(c)->m_tbl)
-#define RCLASS_IVPTR(c) (RCLASS_EXT(c)->iv_ptr)
-#define RCLASS_CALLABLE_M_TBL(c) (RCLASS_EXT(c)->callable_m_tbl)
-#define RCLASS_CC_TBL(c) (RCLASS_EXT(c)->cc_tbl)
-#define RCLASS_CVC_TBL(c) (RCLASS_EXT(c)->cvc_tbl)
-#define RCLASS_ORIGIN(c) (RCLASS_EXT(c)->origin_)
-#define RCLASS_REFINED_CLASS(c) (RCLASS_EXT(c)->refined_class)
-#define RCLASS_INCLUDER(c) (RCLASS_EXT(c)->includer)
-#define RCLASS_SUBCLASS_ENTRY(c) (RCLASS_EXT(c)->subclass_entry)
-#define RCLASS_MODULE_SUBCLASS_ENTRY(c) (RCLASS_EXT(c)->module_subclass_entry)
-#define RCLASS_SUBCLASSES(c) (RCLASS_EXT(c)->subclasses)
-#define RCLASS_SUPERCLASS_DEPTH(c) (RCLASS_EXT(c)->superclass_depth)
-#define RCLASS_SUPERCLASSES(c) (RCLASS_EXT(c)->superclasses)
-#define RCLASS_ATTACHED_OBJECT(c) (RCLASS_EXT(c)->as.singleton_class.attached_object)
-
-#define RICLASS_IS_ORIGIN FL_USER0
-#define RCLASS_SUPERCLASSES_INCLUDE_SELF FL_USER2
-#define RICLASS_ORIGIN_SHARED_MTBL FL_USER3
+static const uint16_t RCLASS_MAX_SUPERCLASS_DEPTH = ((uint16_t)-1);
+
+static inline bool RCLASS_SINGLETON_P(VALUE klass);
+
+static inline bool RCLASS_PRIME_CLASSEXT_READABLE_P(VALUE obj);
+static inline bool RCLASS_PRIME_CLASSEXT_WRITABLE_P(VALUE obj);
+static inline void RCLASS_SET_PRIME_CLASSEXT_WRITABLE(VALUE obj, bool writable);
+
+#define RCLASS_EXT_PRIME(c) (&((struct RClass_and_rb_classext_t*)(c))->classext)
+#define RCLASS_EXT_PRIME_P(ext, c) (&((struct RClass_and_rb_classext_t*)(c))->classext == ext)
+
+static inline rb_classext_t * RCLASS_EXT_READABLE_IN_NS(VALUE obj, const rb_namespace_t *ns);
+static inline rb_classext_t * RCLASS_EXT_READABLE(VALUE obj);
+static inline rb_classext_t * RCLASS_EXT_WRITABLE_IN_NS(VALUE obj, const rb_namespace_t *ns);
+static inline rb_classext_t * RCLASS_EXT_WRITABLE(VALUE obj);
+
+// Raw accessor
+#define RCLASSEXT_NS(ext) (ext->ns)
+#define RCLASSEXT_SUPER(ext) (ext->super)
+#define RCLASSEXT_FIELDS(ext) (ext->fields_obj ? ROBJECT_FIELDS(ext->fields_obj) : NULL)
+#define RCLASSEXT_FIELDS_OBJ(ext) (ext->fields_obj)
+#define RCLASSEXT_M_TBL(ext) (ext->m_tbl)
+#define RCLASSEXT_CONST_TBL(ext) (ext->const_tbl)
+#define RCLASSEXT_CALLABLE_M_TBL(ext) (ext->callable_m_tbl)
+#define RCLASSEXT_CC_TBL(ext) (ext->cc_tbl)
+#define RCLASSEXT_CVC_TBL(ext) (ext->cvc_tbl)
+#define RCLASSEXT_SUPERCLASS_DEPTH(ext) (ext->superclass_depth)
+#define RCLASSEXT_SUPERCLASSES(ext) (ext->superclasses)
+#define RCLASSEXT_SUBCLASSES(ext) (ext->subclasses)
+#define RCLASSEXT_NS_SUPER_SUBCLASSES(ext) (ext->ns_super_subclasses)
+#define RCLASSEXT_NS_MODULE_SUBCLASSES(ext) (ext->ns_module_subclasses)
+#define RCLASSEXT_ORIGIN(ext) (ext->origin_)
+#define RCLASSEXT_REFINED_CLASS(ext) (ext->refined_class)
+// class.allocator/singleton_class.attached_object are not accessed directly via RCLASSEXT_*
+#define RCLASSEXT_INCLUDER(ext) (ext->as.iclass.includer)
+#define RCLASSEXT_PERMANENT_CLASSPATH(ext) (ext->permanent_classpath)
+#define RCLASSEXT_CLONED(ext) (ext->cloned)
+#define RCLASSEXT_SHARED_CONST_TBL(ext) (ext->shared_const_tbl)
+#define RCLASSEXT_ICLASS_IS_ORIGIN(ext) (ext->iclass_is_origin)
+#define RCLASSEXT_ICLASS_ORIGIN_SHARED_MTBL(ext) (ext->iclass_origin_shared_mtbl)
+#define RCLASSEXT_SUPERCLASSES_WITH_SELF(ext) (ext->superclasses_with_self)
+#define RCLASSEXT_CLASSPATH(ext) (ext->classpath)
+
+static inline void RCLASSEXT_SET_ORIGIN(rb_classext_t *ext, VALUE klass, VALUE origin);
+static inline void RCLASSEXT_SET_INCLUDER(rb_classext_t *ext, VALUE klass, VALUE includer);
+
+/* Prime classext entry accessor for very specific reason */
+#define RCLASS_PRIME_NS(c) (RCLASS_EXT_PRIME(c)->ns)
+// To invalidate CC by inserting&invalidating method entry into tables containing the target cme
+// See clear_method_cache_by_id_in_class()
+#define RCLASS_PRIME_FIELDS_OBJ(c) (RCLASS_EXT_PRIME(c)->fields_obj)
+#define RCLASS_PRIME_M_TBL(c) (RCLASS_EXT_PRIME(c)->m_tbl)
+#define RCLASS_PRIME_CONST_TBL(c) (RCLASS_EXT_PRIME(c)->const_tbl)
+#define RCLASS_PRIME_CALLABLE_M_TBL(c) (RCLASS_EXT_PRIME(c)->callable_m_tbl)
+#define RCLASS_PRIME_CC_TBL(c) (RCLASS_EXT_PRIME(c)->cc_tbl)
+#define RCLASS_M_TBL_NOT_PRIME_P(c, tbl) (RCLASS_EXT_PRIME(c)->m_tbl != tbl)
+#define RCLASS_CALLABLE_M_TBL_NOT_PRIME_P(c, tbl) (RCLASS_EXT_PRIME(c)->callable_m_tbl != tbl)
+#define RCLASS_CC_TBL_NOT_PRIME_P(c, tbl) (RCLASS_EXT_PRIME(c)->cc_tbl != tbl)
+
+// Read accessor, regarding namespaces
+#define RCLASS_SUPER(c) (RCLASS_EXT_READABLE(c)->super)
+#define RCLASS_M_TBL(c) (RCLASS_EXT_READABLE(c)->m_tbl)
+#define RCLASS_CONST_TBL(c) (RCLASS_EXT_READABLE(c)->const_tbl)
+/*
+ * Both cc_tbl/callable_m_tbl are cache-like and always be changed when referreed,
+ * so always those should be writable.
+ */
+#define RCLASS_CVC_TBL(c) (RCLASS_EXT_READABLE(c)->cvc_tbl)
+#define RCLASS_SUBCLASSES_X(c) (RCLASS_EXT_READABLE(c)->subclasses)
+#define RCLASS_SUBCLASSES_FIRST(c) (RCLASS_EXT_READABLE(c)->subclasses->head->next)
+#define RCLASS_ORIGIN(c) (RCLASS_EXT_READABLE(c)->origin_)
+#define RICLASS_IS_ORIGIN_P(c) (RCLASS_EXT_READABLE(c)->iclass_is_origin)
+#define RCLASS_PERMANENT_CLASSPATH_P(c) (RCLASS_EXT_READABLE(c)->permanent_classpath)
+#define RCLASS_CLONED_P(c) (RCLASS_EXT_READABLE(c)->cloned)
+#define RCLASS_CLASSPATH(c) (RCLASS_EXT_READABLE(c)->classpath)
+
+// Superclasses can't be changed after initialization
+#define RCLASS_SUPERCLASS_DEPTH(c) (RCLASS_EXT_PRIME(c)->superclass_depth)
+#define RCLASS_SUPERCLASSES(c) (RCLASS_EXT_PRIME(c)->superclasses)
+#define RCLASS_SUPERCLASSES_WITH_SELF_P(c) (RCLASS_EXT_PRIME(c)->superclasses_with_self)
+
+// namespaces don't make changes on these refined_class/attached_object/includer
+#define RCLASS_REFINED_CLASS(c) (RCLASS_EXT_PRIME(c)->refined_class)
+#define RCLASS_ATTACHED_OBJECT(c) (RCLASS_EXT_PRIME(c)->as.singleton_class.attached_object)
+#define RCLASS_INCLUDER(c) (RCLASS_EXT_PRIME(c)->as.iclass.includer)
+
+// max IV count and variation count are just hints, so they don't need to be per-namespace
+#define RCLASS_MAX_IV_COUNT(ext) (RCLASS_EXT_PRIME(ext)->max_iv_count)
+#define RCLASS_VARIATION_COUNT(ext) (RCLASS_EXT_PRIME(ext)->variation_count)
+
+// Writable classext entries (instead of RCLASS_SET_*) because member data will be operated directly
+#define RCLASS_WRITABLE_M_TBL(c) (RCLASS_EXT_WRITABLE(c)->m_tbl)
+#define RCLASS_WRITABLE_CONST_TBL(c) (RCLASS_EXT_WRITABLE(c)->const_tbl)
+#define RCLASS_WRITABLE_CALLABLE_M_TBL(c) (RCLASS_EXT_WRITABLE(c)->callable_m_tbl)
+#define RCLASS_WRITABLE_CC_TBL(c) (RCLASS_EXT_WRITABLE(c)->cc_tbl)
+#define RCLASS_WRITABLE_CVC_TBL(c) (RCLASS_EXT_WRITABLE(c)->cvc_tbl)
+#define RCLASS_WRITABLE_SUBCLASSES(c) (RCLASS_EXT_WRITABLE(c)->subclasses)
+
+static inline void RCLASS_SET_SUPER(VALUE klass, VALUE super);
+static inline void RCLASS_WRITE_SUPER(VALUE klass, VALUE super);
+// TODO: rename RCLASS_SET_M_TBL_WORKAROUND (and _WRITE_) to RCLASS_SET_M_TBL with write barrier
+static inline void RCLASS_SET_M_TBL_WORKAROUND(VALUE klass, struct rb_id_table *table, bool check_promoted);
+static inline void RCLASS_WRITE_M_TBL_WORKAROUND(VALUE klass, struct rb_id_table *table, bool check_promoted);
+static inline void RCLASS_SET_CONST_TBL(VALUE klass, struct rb_id_table *table, bool shared);
+static inline void RCLASS_WRITE_CONST_TBL(VALUE klass, struct rb_id_table *table, bool shared);
+static inline void RCLASS_WRITE_CALLABLE_M_TBL(VALUE klass, struct rb_id_table *table);
+static inline void RCLASS_WRITE_CC_TBL(VALUE klass, struct rb_id_table *table);
+static inline void RCLASS_SET_CVC_TBL(VALUE klass, struct rb_id_table *table);
+static inline void RCLASS_WRITE_CVC_TBL(VALUE klass, struct rb_id_table *table);
+
+static inline void RCLASS_WRITE_SUPERCLASSES(VALUE klass, size_t depth, VALUE *superclasses, bool with_self);
+static inline void RCLASS_SET_SUBCLASSES(VALUE klass, rb_subclass_anchor_t *anchor);
+static inline void RCLASS_WRITE_NS_SUPER_SUBCLASSES(VALUE klass, rb_ns_subclasses_t *ns_subclasses);
+static inline void RCLASS_WRITE_NS_MODULE_SUBCLASSES(VALUE klass, rb_ns_subclasses_t *ns_subclasses);
+
+static inline void RCLASS_SET_ORIGIN(VALUE klass, VALUE origin);
+static inline void RCLASS_WRITE_ORIGIN(VALUE klass, VALUE origin);
+static inline void RICLASS_SET_ORIGIN_SHARED_MTBL(VALUE iclass);
+static inline void RICLASS_WRITE_ORIGIN_SHARED_MTBL(VALUE iclass);
+static inline bool RICLASS_OWNS_M_TBL_P(VALUE iclass);
+
+static inline void RCLASS_SET_REFINED_CLASS(VALUE klass, VALUE refined);
+static inline rb_alloc_func_t RCLASS_ALLOCATOR(VALUE klass);
+static inline void RCLASS_SET_ALLOCATOR(VALUE klass, rb_alloc_func_t allocator);
+static inline VALUE RCLASS_SET_ATTACHED_OBJECT(VALUE klass, VALUE attached_object);
+
+static inline void RCLASS_SET_INCLUDER(VALUE iclass, VALUE klass);
+static inline void RCLASS_SET_MAX_IV_COUNT(VALUE klass, attr_index_t count);
+static inline void RCLASS_SET_CLONED(VALUE klass, bool cloned);
+static inline void RCLASS_SET_CLASSPATH(VALUE klass, VALUE classpath, bool permanent);
+static inline void RCLASS_WRITE_CLASSPATH(VALUE klass, VALUE classpath, bool permanent);
+
+#define RCLASS_IS_ROOT FL_USER0
+// 1 is for RUBY_FL_SINGLETON or RMODULE_IS_REFINEMENT
+#define RCLASS_PRIME_CLASSEXT_WRITABLE FL_USER2
+#define RCLASS_IS_INITIALIZED FL_USER3
+// 3 is RMODULE_IS_REFINEMENT for RMODULE
+#define RCLASS_NAMESPACEABLE FL_USER4
+
+static inline st_table *
+RCLASS_CLASSEXT_TBL(VALUE klass)
+{
+    if (FL_TEST_RAW(klass, RCLASS_NAMESPACEABLE)) {
+        struct RClass_namespaceable *ns_klass = (struct RClass_namespaceable *)klass;
+        return ns_klass->ns_classext_tbl;
+    }
+    return NULL;
+}
+
+static inline void
+RCLASS_SET_CLASSEXT_TBL(VALUE klass, st_table *tbl)
+{
+    RUBY_ASSERT(FL_TEST_RAW(klass, RCLASS_NAMESPACEABLE));
+    struct RClass_namespaceable *ns_klass = (struct RClass_namespaceable *)klass;
+    ns_klass->ns_classext_tbl = tbl;
+}
+
+/* class.c */
+rb_classext_t * rb_class_duplicate_classext(rb_classext_t *orig, VALUE obj, const rb_namespace_t *ns);
+void rb_class_ensure_writable(VALUE obj);
+
+static inline int
+RCLASS_SET_NAMESPACE_CLASSEXT(VALUE obj, const rb_namespace_t *ns, rb_classext_t *ext)
+{
+    int first_set = 0;
+    st_table *tbl = RCLASS_CLASSEXT_TBL(obj);
+    VM_ASSERT(NAMESPACE_USER_P(ns)); // non-prime classext is only for user namespace, with ns_object
+    VM_ASSERT(ns->ns_object);
+    VM_ASSERT(RCLASSEXT_NS(ext) == ns);
+    if (!tbl) {
+        tbl = st_init_numtable_with_size(1);
+        RCLASS_SET_CLASSEXT_TBL(obj, tbl);
+    }
+    if (rb_st_table_size(tbl) == 0) {
+        first_set = 1;
+    }
+    rb_st_insert(tbl, (st_data_t)ns->ns_object, (st_data_t)ext);
+    return first_set;
+}
+
+static inline bool
+RCLASS_PRIME_CLASSEXT_READABLE_P(VALUE klass)
+{
+    VM_ASSERT(RB_TYPE_P(klass, T_CLASS) || RB_TYPE_P(klass, T_MODULE) || RB_TYPE_P(klass, T_ICLASS));
+    // if the lookup table exists, then it means the prime classext is NOT directly readable.
+    return !FL_TEST_RAW(klass, RCLASS_NAMESPACEABLE) || RCLASS_CLASSEXT_TBL(klass) == NULL;
+}
+
+static inline bool
+RCLASS_PRIME_CLASSEXT_WRITABLE_P(VALUE klass)
+{
+    VM_ASSERT(RB_TYPE_P(klass, T_CLASS) || RB_TYPE_P(klass, T_MODULE) || RB_TYPE_P(klass, T_ICLASS));
+    return FL_TEST(klass, RCLASS_PRIME_CLASSEXT_WRITABLE);
+}
+
+static inline void
+RCLASS_SET_PRIME_CLASSEXT_WRITABLE(VALUE klass, bool writable)
+{
+    VM_ASSERT(RB_TYPE_P(klass, T_CLASS) || RB_TYPE_P(klass, T_MODULE) || RB_TYPE_P(klass, T_ICLASS));
+
+    if (writable) {
+        FL_SET(klass, RCLASS_PRIME_CLASSEXT_WRITABLE);
+    }
+    else {
+        FL_UNSET(klass, RCLASS_PRIME_CLASSEXT_WRITABLE);
+    }
+}
+
+static inline rb_classext_t *
+RCLASS_EXT_TABLE_LOOKUP_INTERNAL(VALUE obj, const rb_namespace_t *ns)
+{
+    st_data_t classext_ptr;
+    st_table *classext_tbl = RCLASS_CLASSEXT_TBL(obj);
+    if (classext_tbl) {
+        if (rb_st_lookup(classext_tbl, (st_data_t)ns->ns_object, &classext_ptr)) {
+            return (rb_classext_t *)classext_ptr;
+        }
+    }
+    return NULL;
+}
+
+static inline rb_classext_t *
+RCLASS_EXT_READABLE_LOOKUP(VALUE obj, const rb_namespace_t *ns)
+{
+    rb_classext_t *ext = RCLASS_EXT_TABLE_LOOKUP_INTERNAL(obj, ns);
+    if (ext)
+        return ext;
+    // Classext for the ns not found. Refer the prime one instead.
+    return RCLASS_EXT_PRIME(obj);
+}
+
+static inline rb_classext_t *
+RCLASS_EXT_READABLE_IN_NS(VALUE obj, const rb_namespace_t *ns)
+{
+    if (!ns
+        || NAMESPACE_BUILTIN_P(ns)
+        || RCLASS_PRIME_CLASSEXT_READABLE_P(obj)) {
+        return RCLASS_EXT_PRIME(obj);
+    }
+    return RCLASS_EXT_READABLE_LOOKUP(obj, ns);
+}
+
+static inline rb_classext_t *
+RCLASS_EXT_READABLE(VALUE obj)
+{
+    const rb_namespace_t *ns;
+    if (RCLASS_PRIME_CLASSEXT_READABLE_P(obj)) {
+        return RCLASS_EXT_PRIME(obj);
+    }
+    // delay namespace loading to optimize for unmodified classes
+    ns = rb_current_namespace();
+    if (!ns || NAMESPACE_BUILTIN_P(ns)) {
+        return RCLASS_EXT_PRIME(obj);
+    }
+    return RCLASS_EXT_READABLE_LOOKUP(obj, ns);
+}
+
+static inline rb_classext_t *
+RCLASS_EXT_WRITABLE_LOOKUP(VALUE obj, const rb_namespace_t *ns)
+{
+    rb_classext_t *ext;
+    int first_set = 0;
+
+    ext = RCLASS_EXT_TABLE_LOOKUP_INTERNAL(obj, ns);
+    if (ext)
+        return ext;
+
+    RB_VM_LOCKING() {
+        // re-check the classext is not created to avoid the multi-thread race
+        ext = RCLASS_EXT_TABLE_LOOKUP_INTERNAL(obj, ns);
+        if (!ext) {
+            ext = rb_class_duplicate_classext(RCLASS_EXT_PRIME(obj), obj, ns);
+            first_set = RCLASS_SET_NAMESPACE_CLASSEXT(obj, ns, ext);
+            if (first_set) {
+                RCLASS_SET_PRIME_CLASSEXT_WRITABLE(obj, false);
+            }
+        }
+    }
+    return ext;
+}
+
+static inline rb_classext_t *
+RCLASS_EXT_WRITABLE_IN_NS(VALUE obj, const rb_namespace_t *ns)
+{
+    if (!ns
+        || NAMESPACE_BUILTIN_P(ns)
+        || RCLASS_PRIME_CLASSEXT_WRITABLE_P(obj)) {
+        return RCLASS_EXT_PRIME(obj);
+    }
+    return RCLASS_EXT_WRITABLE_LOOKUP(obj, ns);
+}
+
+static inline rb_classext_t *
+RCLASS_EXT_WRITABLE(VALUE obj)
+{
+    const rb_namespace_t *ns;
+    if (LIKELY(RCLASS_PRIME_CLASSEXT_WRITABLE_P(obj))) {
+        return RCLASS_EXT_PRIME(obj);
+    }
+    // delay namespace loading to optimize for unmodified classes
+    ns = rb_current_namespace();
+    if (!ns || NAMESPACE_BUILTIN_P(ns)) {
+        // If no namespace is specified, Ruby VM is in bootstrap
+        // and the clean class definition is under construction.
+        return RCLASS_EXT_PRIME(obj);
+    }
+    return RCLASS_EXT_WRITABLE_LOOKUP(obj, ns);
+}
+
+static inline void
+RCLASSEXT_SET_ORIGIN(rb_classext_t *ext, VALUE klass, VALUE origin)
+{
+    RB_OBJ_WRITE(klass, &(RCLASSEXT_ORIGIN(ext)), origin);
+}
+
+static inline void
+RCLASSEXT_SET_INCLUDER(rb_classext_t *ext, VALUE klass, VALUE includer)
+{
+    RUBY_ASSERT(RB_TYPE_P(klass, T_ICLASS));
+    RB_OBJ_WRITE(klass, &(RCLASSEXT_INCLUDER(ext)), includer);
+}
 
 /* class.c */
+typedef void rb_class_classext_foreach_callback_func(rb_classext_t *classext, bool is_prime, VALUE namespace, void *arg);
+void rb_class_classext_foreach(VALUE klass, rb_class_classext_foreach_callback_func *func, void *arg);
 void rb_class_subclass_add(VALUE super, VALUE klass);
 void rb_class_remove_from_super_subclasses(VALUE);
+void rb_class_remove_from_module_subclasses(VALUE);
+void rb_class_classext_free_subclasses(rb_classext_t *, 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_update_superclasses(VALUE);
 size_t rb_class_superclasses_memsize(VALUE);
 void rb_class_remove_subclass_head(VALUE);
 int rb_singleton_class_internal_p(VALUE sklass);
+VALUE rb_class_set_super(VALUE klass, VALUE super);
 VALUE rb_class_boot(VALUE);
 VALUE rb_class_s_alloc(VALUE klass);
 VALUE rb_module_s_alloc(VALUE klass);
-void rb_module_set_initialized(VALUE module);
+void rb_class_set_initialized(VALUE klass);
 void rb_module_check_initializable(VALUE module);
 VALUE rb_make_metaclass(VALUE, VALUE);
-VALUE rb_iclass_alloc(VALUE klass);
 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_define_class_id_under_no_pin(VALUE outer, ID id, VALUE super);
 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);
@@ -134,93 +513,301 @@ 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 rb_undef_methods_from(VALUE klass, VALUE super);
-
-static inline void RCLASS_SET_ORIGIN(VALUE klass, VALUE origin);
-static inline void RICLASS_SET_ORIGIN_SHARED_MTBL(VALUE iclass);
-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);
-
 VALUE rb_class_inherited(VALUE, VALUE);
 VALUE rb_keyword_error_new(const char *, VALUE);
 
+RUBY_SYMBOL_EXPORT_BEGIN
+
+/* for objspace */
+VALUE rb_class_super_of(VALUE klass);
+VALUE rb_class_singleton_p(VALUE klass);
+unsigned char rb_class_variation_count(VALUE klass);
+
+RUBY_SYMBOL_EXPORT_END
+
+static inline bool
+RCLASS_SINGLETON_P(VALUE klass)
+{
+    return RB_TYPE_P(klass, T_CLASS) && FL_TEST_RAW(klass, FL_SINGLETON);
+}
+
+static inline void
+RCLASS_SET_SUPER(VALUE klass, VALUE super)
+{
+    RB_OBJ_WRITE(klass, &RCLASSEXT_SUPER(RCLASS_EXT_PRIME(klass)), super);
+}
+
+static inline void
+RCLASS_WRITE_SUPER(VALUE klass, VALUE super)
+{
+    RB_OBJ_WRITE(klass, &RCLASSEXT_SUPER(RCLASS_EXT_WRITABLE(klass)), super);
+}
+
+static inline VALUE
+RCLASS_WRITABLE_ENSURE_FIELDS_OBJ(VALUE obj)
+{
+    RUBY_ASSERT(RB_TYPE_P(obj, RUBY_T_CLASS) || RB_TYPE_P(obj, RUBY_T_MODULE));
+    rb_classext_t *ext = RCLASS_EXT_WRITABLE(obj);
+    if (!ext->fields_obj) {
+        RB_OBJ_WRITE(obj, &ext->fields_obj, rb_imemo_fields_new(rb_singleton_class(obj), 1));
+    }
+    return ext->fields_obj;
+}
+
+static inline VALUE
+RCLASS_WRITABLE_FIELDS_OBJ(VALUE obj)
+{
+    RUBY_ASSERT(RB_TYPE_P(obj, RUBY_T_CLASS) || RB_TYPE_P(obj, RUBY_T_MODULE));
+    return RCLASSEXT_FIELDS_OBJ(RCLASS_EXT_WRITABLE(obj));
+}
+
+static inline void
+RCLASSEXT_SET_FIELDS_OBJ(VALUE obj, rb_classext_t *ext, VALUE fields_obj)
+{
+    RUBY_ASSERT(RB_TYPE_P(obj, RUBY_T_CLASS) || RB_TYPE_P(obj, RUBY_T_MODULE));
+
+    RB_OBJ_ATOMIC_WRITE(obj, &ext->fields_obj, fields_obj);
+}
+
+static inline void
+RCLASS_WRITABLE_SET_FIELDS_OBJ(VALUE obj, VALUE fields_obj)
+{
+    RUBY_ASSERT(RB_TYPE_P(obj, RUBY_T_CLASS) || RB_TYPE_P(obj, RUBY_T_MODULE));
+
+    RCLASSEXT_SET_FIELDS_OBJ(obj, RCLASS_EXT_WRITABLE(obj), fields_obj);
+}
+
+static inline uint32_t
+RCLASS_FIELDS_COUNT(VALUE obj)
+{
+    RUBY_ASSERT(RB_TYPE_P(obj, RUBY_T_CLASS) || RB_TYPE_P(obj, RUBY_T_MODULE));
+
+    VALUE fields_obj = RCLASS_WRITABLE_FIELDS_OBJ(obj);
+    if (fields_obj) {
+        if (rb_shape_obj_too_complex_p(fields_obj)) {
+            return (uint32_t)rb_st_table_size(rb_imemo_fields_complex_tbl(fields_obj));
+        }
+        else {
+            return RSHAPE_LEN(RBASIC_SHAPE_ID(fields_obj));
+        }
+    }
+    return 0;
+}
+
+#define RCLASS_SET_M_TBL_EVEN_WHEN_PROMOTED(klass, table) RCLASS_SET_M_TBL_WORKAROUND(klass, table, false)
+#define RCLASS_SET_M_TBL(klass, table) RCLASS_SET_M_TBL_WORKAROUND(klass, table, true)
+
+static inline void
+RCLASS_SET_M_TBL_WORKAROUND(VALUE klass, struct rb_id_table *table, bool check_promoted)
+{
+    RUBY_ASSERT(!check_promoted || !RB_OBJ_PROMOTED(klass));
+    RCLASSEXT_M_TBL(RCLASS_EXT_PRIME(klass)) = table;
+}
+
+#define RCLASS_WRITE_M_TBL_EVEN_WHEN_PROMOTED(klass, table) RCLASS_WRITE_M_TBL_WORKAROUND(klass, table, false)
+#define RCLASS_WRITE_M_TBL(klass, table) RCLASS_WRITE_M_TBL_WORKAROUND(klass, table, true)
+
+static inline void
+RCLASS_WRITE_M_TBL_WORKAROUND(VALUE klass, struct rb_id_table *table, bool check_promoted)
+{
+    RUBY_ASSERT(!check_promoted || !RB_OBJ_PROMOTED(klass));
+    // TODO: add write barrier here to guard assigning m_tbl
+    //       see commit 28a6e4ea9d9379a654a8f7c4b37fa33aa3ccd0b7
+    RCLASSEXT_M_TBL(RCLASS_EXT_WRITABLE(klass)) = table;
+}
+
+static inline void
+RCLASS_SET_CONST_TBL(VALUE klass, struct rb_id_table *table, bool shared)
+{
+    rb_classext_t *ext = RCLASS_EXT_PRIME(klass);
+    RCLASSEXT_CONST_TBL(ext) = table;
+    if (shared)
+        RCLASSEXT_SHARED_CONST_TBL(ext) = true;
+}
+
+static inline void
+RCLASS_WRITE_CONST_TBL(VALUE klass, struct rb_id_table *table, bool shared)
+{
+    rb_classext_t *ext = RCLASS_EXT_WRITABLE(klass);
+    RCLASSEXT_CONST_TBL(ext) = table;
+    if (shared)
+        RCLASSEXT_SHARED_CONST_TBL(ext) = true;
+}
+
+static inline void
+RCLASS_WRITE_CALLABLE_M_TBL(VALUE klass, struct rb_id_table *table)
+{
+    RCLASSEXT_CALLABLE_M_TBL(RCLASS_EXT_WRITABLE(klass)) = table;
+}
+
+static inline void
+RCLASS_WRITE_CC_TBL(VALUE klass, struct rb_id_table *table)
+{
+    RCLASSEXT_CC_TBL(RCLASS_EXT_WRITABLE(klass)) = table;
+}
+
+static inline void
+RCLASS_SET_CVC_TBL(VALUE klass, struct rb_id_table *table)
+{
+    RCLASSEXT_CVC_TBL(RCLASS_EXT_PRIME(klass)) = table;
+}
+
+static inline void
+RCLASS_WRITE_CVC_TBL(VALUE klass, struct rb_id_table *table)
+{
+    RCLASSEXT_CVC_TBL(RCLASS_EXT_WRITABLE(klass)) = table;
+}
+
+static inline void
+RCLASS_SET_REFINED_CLASS(VALUE klass, VALUE refined)
+{
+    RB_OBJ_WRITE(klass, &RCLASSEXT_REFINED_CLASS(RCLASS_EXT_PRIME(klass)), refined);
+}
+
 static inline rb_alloc_func_t
 RCLASS_ALLOCATOR(VALUE klass)
 {
-    if (FL_TEST_RAW(klass, FL_SINGLETON)) {
+    RUBY_ASSERT(RB_TYPE_P(klass, T_CLASS) || RB_TYPE_P(klass, T_ICLASS));
+    if (RCLASS_SINGLETON_P(klass) || RB_TYPE_P(klass, T_ICLASS)) {
         return 0;
     }
-    return RCLASS_EXT(klass)->as.class.allocator;
+    return RCLASS_EXT_PRIME(klass)->as.class.allocator;
 }
 
 static inline void
 RCLASS_SET_ALLOCATOR(VALUE klass, rb_alloc_func_t allocator)
 {
-    assert(!FL_TEST(klass, FL_SINGLETON));
-    RCLASS_EXT(klass)->as.class.allocator = allocator;
+    RUBY_ASSERT(RB_TYPE_P(klass, T_CLASS));
+    RUBY_ASSERT(!RCLASS_SINGLETON_P(klass));
+    RCLASS_EXT_PRIME(klass)->as.class.allocator = allocator; // Allocator is set only on the initial definition
 }
 
 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);
+    rb_classext_t *ext = RCLASS_EXT_PRIME(klass);
+    RB_OBJ_WRITE(klass, &RCLASSEXT_ORIGIN(ext), origin);
+    if (klass != origin) RCLASSEXT_ICLASS_IS_ORIGIN(RCLASS_EXT_WRITABLE(origin)) = true;
+}
+
+static inline void
+RCLASS_WRITE_ORIGIN(VALUE klass, VALUE origin)
+{
+    rb_classext_t *ext = RCLASS_EXT_WRITABLE(klass);
+    RB_OBJ_WRITE(klass, &RCLASSEXT_ORIGIN(ext), origin);
+    if (klass != origin) RCLASSEXT_ICLASS_IS_ORIGIN(RCLASS_EXT_WRITABLE(origin)) = true;
 }
 
 static inline void
 RICLASS_SET_ORIGIN_SHARED_MTBL(VALUE iclass)
 {
-    FL_SET(iclass, RICLASS_ORIGIN_SHARED_MTBL);
+    RCLASSEXT_ICLASS_ORIGIN_SHARED_MTBL(RCLASS_EXT_PRIME(iclass)) = true;
+}
+
+static inline void
+RICLASS_WRITE_ORIGIN_SHARED_MTBL(VALUE iclass)
+{
+    RCLASSEXT_ICLASS_ORIGIN_SHARED_MTBL(RCLASS_EXT_WRITABLE(iclass)) = true;
 }
 
 static inline bool
 RICLASS_OWNS_M_TBL_P(VALUE iclass)
 {
-    return FL_TEST_RAW(iclass, RICLASS_IS_ORIGIN | RICLASS_ORIGIN_SHARED_MTBL) == RICLASS_IS_ORIGIN;
+    rb_classext_t *ext = RCLASS_EXT_READABLE(iclass);
+    return RCLASSEXT_ICLASS_IS_ORIGIN(ext) && !RCLASSEXT_ICLASS_ORIGIN_SHARED_MTBL(ext);
 }
 
 static inline void
 RCLASS_SET_INCLUDER(VALUE iclass, VALUE klass)
 {
+    RUBY_ASSERT(RB_TYPE_P(iclass, T_ICLASS));
     RB_OBJ_WRITE(iclass, &RCLASS_INCLUDER(iclass), klass);
 }
 
-static inline VALUE
-RCLASS_SUPER(VALUE klass)
+static inline void
+RCLASS_WRITE_SUPERCLASSES(VALUE klass, size_t depth, VALUE *superclasses, bool with_self)
 {
-    return RCLASS(klass)->super;
+    RUBY_ASSERT(depth <= RCLASS_MAX_SUPERCLASS_DEPTH);
+
+    rb_classext_t *ext = RCLASS_EXT_PRIME(klass);
+    RCLASSEXT_SUPERCLASS_DEPTH(ext) = depth;
+    RCLASSEXT_SUPERCLASSES(ext) = superclasses;
+    RCLASSEXT_SUPERCLASSES_WITH_SELF(ext) = with_self;
 }
 
-static inline VALUE
-RCLASS_SET_SUPER(VALUE klass, VALUE super)
+static inline void
+RCLASS_SET_SUBCLASSES(VALUE klass, struct rb_subclass_anchor *anchor)
 {
-    if (super) {
-        rb_class_remove_from_super_subclasses(klass);
-        rb_class_subclass_add(super, klass);
-    }
-    RB_OBJ_WRITE(klass, &RCLASS(klass)->super, super);
-    rb_class_update_superclasses(klass);
-    return super;
+    rb_classext_t *ext = RCLASS_EXT_PRIME(klass);
+    RCLASSEXT_SUBCLASSES(ext) = anchor;
+}
+
+static inline void
+RCLASS_WRITE_NS_SUPER_SUBCLASSES(VALUE klass, rb_ns_subclasses_t *ns_subclasses)
+{
+    rb_classext_t *ext = RCLASS_EXT_WRITABLE(klass);
+    if (RCLASSEXT_NS_SUPER_SUBCLASSES(ext))
+        rb_ns_subclasses_ref_dec(RCLASSEXT_NS_SUPER_SUBCLASSES(ext));
+    RCLASSEXT_NS_SUPER_SUBCLASSES(ext) = rb_ns_subclasses_ref_inc(ns_subclasses);
+}
+
+static inline void
+RCLASS_WRITE_NS_MODULE_SUBCLASSES(VALUE klass, rb_ns_subclasses_t *ns_subclasses)
+{
+    rb_classext_t *ext = RCLASS_EXT_WRITABLE(klass);
+    if (RCLASSEXT_NS_MODULE_SUBCLASSES(ext))
+        rb_ns_subclasses_ref_dec(RCLASSEXT_NS_MODULE_SUBCLASSES(ext));
+    RCLASSEXT_NS_MODULE_SUBCLASSES(ext) = rb_ns_subclasses_ref_inc(ns_subclasses);
 }
 
 static inline void
 RCLASS_SET_CLASSPATH(VALUE klass, VALUE classpath, bool permanent)
 {
-    assert(BUILTIN_TYPE(klass) == T_CLASS || BUILTIN_TYPE(klass) == T_MODULE || klass == rb_mRubyVMFrozenCore);
+    rb_classext_t *ext = RCLASS_EXT_READABLE(klass);
+    assert(BUILTIN_TYPE(klass) == T_CLASS || BUILTIN_TYPE(klass) == T_MODULE);
     assert(classpath == 0 || BUILTIN_TYPE(classpath) == T_STRING);
 
-    RB_OBJ_WRITE(klass, &(RCLASS_EXT(klass)->classpath), classpath);
-    RCLASS_EXT(klass)->permanent_classpath = permanent;
+    RB_OBJ_WRITE(klass, &(RCLASSEXT_CLASSPATH(ext)), classpath);
+    RCLASSEXT_PERMANENT_CLASSPATH(ext) = permanent;
+}
+
+static inline void
+RCLASS_WRITE_CLASSPATH(VALUE klass, VALUE classpath, bool permanent)
+{
+    rb_classext_t *ext = RCLASS_EXT_WRITABLE(klass);
+    assert(BUILTIN_TYPE(klass) == T_CLASS || BUILTIN_TYPE(klass) == T_MODULE);
+    assert(classpath == 0 || BUILTIN_TYPE(classpath) == T_STRING);
+
+    RB_OBJ_WRITE(klass, &(RCLASSEXT_CLASSPATH(ext)), classpath);
+    RCLASSEXT_PERMANENT_CLASSPATH(ext) = permanent;
 }
 
 static inline VALUE
 RCLASS_SET_ATTACHED_OBJECT(VALUE klass, VALUE attached_object)
 {
-    assert(BUILTIN_TYPE(klass) == T_CLASS);
-    assert(FL_TEST_RAW(klass, FL_SINGLETON));
+    assert(RCLASS_SINGLETON_P(klass));
 
-    RB_OBJ_WRITE(klass, &RCLASS_EXT(klass)->as.singleton_class.attached_object, attached_object);
+    RB_OBJ_WRITE(klass, &RCLASS_EXT_PRIME(klass)->as.singleton_class.attached_object, attached_object);
     return attached_object;
 }
 
+static inline void
+RCLASS_SET_MAX_IV_COUNT(VALUE klass, attr_index_t count)
+{
+    RCLASS_MAX_IV_COUNT(klass) = count;
+}
+
+static inline void
+RCLASS_SET_CLONED(VALUE klass, bool cloned)
+{
+    RCLASSEXT_CLONED(RCLASS_EXT_PRIME(klass)) = cloned;
+}
+
+static inline bool
+RCLASS_INITIALIZED_P(VALUE klass)
+{
+    VM_ASSERT(RB_TYPE_P(klass, T_CLASS) || RB_TYPE_P(klass, T_MODULE));
+    return FL_TEST_RAW(klass, RCLASS_IS_INITIALIZED);
+}
+
 #endif /* INTERNAL_CLASS_H */
diff --git a/internal/cmdlineopt.h b/internal/cmdlineopt.h
index 3b678b1edd1d24..667fd6df2e976f 100644
--- a/internal/cmdlineopt.h
+++ b/internal/cmdlineopt.h
@@ -1,7 +1,6 @@
 #ifndef INTERNAL_CMDLINEOPT_H                               /*-*-C-*-vi:se ft=c:*/
 #define INTERNAL_CMDLINEOPT_H
 
-#include "rjit.h"
 #include "yjit.h"
 
 typedef struct {
@@ -24,10 +23,12 @@ typedef struct ruby_cmdline_options {
     ruby_features_t warn;
     unsigned int dump;
     long backtrace_length_limit;
-#if USE_RJIT
-    struct rb_rjit_options rjit;
+#if USE_ZJIT
+    void *zjit;
 #endif
 
+    const char *crash_report;
+
     signed int sflag: 2;
     unsigned int xflag: 1;
     unsigned int warning: 1;
diff --git a/internal/concurrent_set.h b/internal/concurrent_set.h
new file mode 100644
index 00000000000000..3000fc31bf058f
--- /dev/null
+++ b/internal/concurrent_set.h
@@ -0,0 +1,21 @@
+#ifndef RUBY_RACTOR_SAFE_TABLE_H
+#define RUBY_RACTOR_SAFE_TABLE_H
+
+#include "ruby/ruby.h"
+
+typedef VALUE (*rb_concurrent_set_hash_func)(VALUE key);
+typedef bool (*rb_concurrent_set_cmp_func)(VALUE a, VALUE b);
+typedef VALUE (*rb_concurrent_set_create_func)(VALUE key, void *data);
+
+struct rb_concurrent_set_funcs {
+    rb_concurrent_set_hash_func hash;
+    rb_concurrent_set_cmp_func cmp;
+    rb_concurrent_set_create_func create;
+};
+
+VALUE rb_concurrent_set_new(struct rb_concurrent_set_funcs *funcs, int capacity);
+VALUE rb_concurrent_set_find_or_insert(VALUE *set_obj_ptr, VALUE key, void *data);
+VALUE rb_concurrent_set_delete_by_identity(VALUE set_obj, VALUE key);
+void rb_concurrent_set_foreach_with_replace(VALUE set_obj, int (*callback)(VALUE *key, void *data), void *data);
+
+#endif
diff --git a/internal/cont.h b/internal/cont.h
index c3b091668a87b8..3c2528a02a6e77 100644
--- a/internal/cont.h
+++ b/internal/cont.h
@@ -22,6 +22,9 @@ void rb_jit_cont_init(void);
 void rb_jit_cont_each_iseq(rb_iseq_callback callback, void *data);
 void rb_jit_cont_finish(void);
 
+/* vm.c */
+void rb_free_shared_fiber_pool(void);
+
 // Copy locals from the current execution to the specified fiber.
 VALUE rb_fiber_inherit_storage(struct rb_execution_context_struct *ec, struct rb_fiber_struct *fiber);
 
diff --git a/internal/encoding.h b/internal/encoding.h
index a3b81bd3881436..c2ffaf4514c1d7 100644
--- a/internal/encoding.h
+++ b/internal/encoding.h
@@ -11,22 +11,28 @@
 #include "ruby/ruby.h"          /* for ID */
 #include "ruby/encoding.h"      /* for rb_encoding */
 
-#define rb_enc_autoload_p(enc) (!rb_enc_mbmaxlen(enc))
 #define rb_is_usascii_enc(enc) ((enc) == rb_usascii_encoding())
 #define rb_is_ascii8bit_enc(enc) ((enc) == rb_ascii8bit_encoding())
 #define rb_is_locale_enc(enc) ((enc) == rb_locale_encoding())
 
 /* encoding.c */
 ID rb_id_encoding(void);
+const char * rb_enc_inspect_name(rb_encoding *enc);
 rb_encoding *rb_enc_get_from_index(int index);
 rb_encoding *rb_enc_check_str(VALUE str1, VALUE str2);
 int rb_encdb_replicate(const char *alias, const char *orig);
 int rb_encdb_alias(const char *alias, const char *orig);
 int rb_enc_autoload(rb_encoding *enc);
+bool rb_enc_autoload_p(rb_encoding *enc);
 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_enc_raw_set(VALUE obj, rb_encoding *enc);
+
 PUREFUNC(int rb_data_is_encoding(VALUE obj));
 
+/* vm.c */
+void rb_free_global_enc_table(void);
+
 #endif /* INTERNAL_ENCODING_H */
diff --git a/internal/error.h b/internal/error.h
index 5fee4689297b2e..de189698b8f2e5 100644
--- a/internal/error.h
+++ b/internal/error.h
@@ -72,6 +72,7 @@ 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 *removal, const char *fmt, const char *suggest, ...), 2, 4);
+PRINTF_ARGS(void rb_warn_reserved_name(const char *removal, const char *fmt, ...), 2, 3);
 #if RUBY_DEBUG
 # include "ruby/version.h"
 # define RUBY_VERSION_SINCE(major, minor) (RUBY_API_VERSION_CODE >= (major * 10000) + (minor) * 100)
@@ -110,6 +111,14 @@ rb_deprecated_method_to_be_removed(const char *removal)
     RBIMPL_ATTR_DIAGNOSE_IF(RUBY_VERSION_STRING_SINCE(removal), "deprecated method to be removed", "error")
 {
 }
+
+RBIMPL_ATTR_FORCEINLINE()
+static void
+rb_diagnose_reserved_name_at(const char *coming)
+    RBIMPL_ATTR_DIAGNOSE_IF(!RUBY_VERSION_isdigit(coming[0]), "malformed version number", "error")
+    RBIMPL_ATTR_DIAGNOSE_IF(RUBY_VERSION_STRING_SINCE(coming), "reserved name already in use", "error")
+{
+}
 # else
 RBIMPL_ATTR_ERROR(("deprecated"))
 void rb_deprecated_method_to_be_removed(const char *);
@@ -117,16 +126,32 @@ void rb_deprecated_method_to_be_removed(const char *);
     (sizeof(char[1-2*(!RUBY_VERSION_isdigit(removal[0]) || RUBY_VERSION_STRING_SINCE(removal))])!=1 ? \
      rb_deprecated_method_to_be_removed(removal) : \
      RBIMPL_ASSERT_NOTHING)
+
+RBIMPL_ATTR_ERROR(("deprecated"))
+void rb_diagnose_reserved_name_at(const char *);
+#   define rb_diagnose_reserved_name_at(coming) \
+    (sizeof(char[1-2*(!RUBY_VERSION_isdigit(coming[0]) || RUBY_VERSION_STRING_SINCE(coming))])!=1 ? \
+     rb_diagnose_reserved_name_at(coming) : \
+     RBIMPL_ASSERT_NOTHING)
+
 # endif
 # define rb_warn_deprecated_to_remove_at(removal, ...) \
     (rb_deprecated_method_to_be_removed(#removal), \
      rb_warn_deprecated_to_remove(#removal, __VA_ARGS__))
+
+# define rb_warn_reserved_name_at(coming, ...) \
+    (rb_diagnose_reserved_name_at(#coming), \
+     rb_warn_reserved_name(#coming, __VA_ARGS__))
 # endif
 #endif
 #ifndef rb_warn_deprecated_to_remove_at
 # define rb_warn_deprecated_to_remove_at(removal, ...) \
         rb_warn_deprecated_to_remove(#removal, __VA_ARGS__)
 #endif
+#ifndef rb_warn_reserved_name_at
+# define rb_warn_reserved_name_at(removal, ...) \
+        rb_warn_reserved_name(#removal, __VA_ARGS__)
+#endif
 #ifndef RUBY_VERSION_SINCE
 # define RUBY_VERSION_SINCE(major, minor) 0
 #endif
@@ -142,6 +167,8 @@ VALUE rb_syntax_error_append(VALUE, VALUE, int, int, rb_encoding*, const char*,
 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);
+PRINTF_ARGS(void rb_enc_compile_warning(rb_encoding *enc, const char *file, int line, const char *fmt, ...), 4, 5);
+PRINTF_ARGS(void rb_enc_compile_warn(rb_encoding *enc, const char *file, int line, const char *fmt, ...), 4, 5);
 rb_warning_category_t rb_warning_category_from_name(VALUE category);
 bool rb_warning_category_enabled_p(rb_warning_category_t category);
 VALUE rb_name_err_new(VALUE mesg, VALUE recv, VALUE method);
@@ -158,6 +185,7 @@ 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
+void rb_bug_without_die(const char *fmt, ...);
 
 RUBY_SYMBOL_EXPORT_BEGIN
 /* error.c (export) */
@@ -169,6 +197,9 @@ VALUE rb_syserr_new_path_in(const char *func_name, int n, VALUE path);
 #endif
 RUBY_SYMBOL_EXPORT_END
 
+/* vm.c */
+void rb_free_warning(void);
+
 static inline void
 rb_raise_cstr_i(VALUE etype, VALUE mesg)
 {
@@ -210,4 +241,11 @@ 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);
 }
 
+typedef enum {
+    rb_stack_overflow_prevention = 0, // VM stack overflow or about to machine stack overflow
+    rb_stack_overflow_signal = 1, // machine stack overflow but may be recoverable
+    rb_stack_overflow_fatal = 2, // fatal machine stack overflow
+} ruby_stack_overflow_critical_level;
+NORETURN(void rb_ec_stack_overflow(struct rb_execution_context_struct *ec, ruby_stack_overflow_critical_level crit));
+
 #endif /* INTERNAL_ERROR_H */
diff --git a/internal/eval.h b/internal/eval.h
index 73bb656d968078..a8b649e509bc10 100644
--- a/internal/eval.h
+++ b/internal/eval.h
@@ -16,11 +16,19 @@
 #define id_status ruby_static_id_status
 
 /* eval.c */
+struct rb_refinements_data {
+    VALUE refinement;
+    VALUE refinements;
+};
+
 extern ID ruby_static_id_signo;
 extern ID ruby_static_id_status;
 VALUE rb_refinement_module_get_refined_class(VALUE module);
 void rb_class_modify_check(VALUE);
 NORETURN(VALUE rb_f_raise(int argc, VALUE *argv));
+void rb_refinement_setup(struct rb_refinements_data *data, VALUE module, VALUE klass);
+void rb_vm_using_module(VALUE module);
+VALUE rb_top_main_class(const char *method);
 
 /* eval_error.c */
 VALUE rb_get_backtrace(VALUE info);
diff --git a/internal/fixnum.h b/internal/fixnum.h
index 8c251adef17085..b78e31460eee1a 100644
--- a/internal/fixnum.h
+++ b/internal/fixnum.h
@@ -10,6 +10,7 @@
  */
 #include "ruby/internal/config.h"      /* for HAVE_LONG_LONG */
 #include <limits.h>             /* for CHAR_BIT */
+#include "internal/bits.h"      /* for MUL_OVERFLOW_FIXNUM_P */
 #include "internal/compilers.h" /* for __has_builtin */
 #include "ruby/internal/stdbool.h"     /* for bool */
 #include "ruby/intern.h"        /* for rb_big_mul */
diff --git a/internal/gc.h b/internal/gc.h
index f8f88a41cba39c..f0dc04fc58a954 100644
--- a/internal/gc.h
+++ b/internal/gc.h
@@ -16,6 +16,10 @@
 #include "ruby/ruby.h"          /* for rb_event_flag_t */
 #include "vm_core.h"            /* for GET_EC() */
 
+#ifndef USE_MODULAR_GC
+# define USE_MODULAR_GC 0
+#endif
+
 #if defined(__x86_64__) && !defined(_ILP32) && defined(__GNUC__)
 #define SET_MACHINE_STACK_END(p) __asm__ __volatile__ ("movq\t%%rsp, %0" : "=r" (*(p)))
 #elif defined(__i386) && defined(__GNUC__)
@@ -79,14 +83,6 @@ 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_MOVABLE_UNLESS_NULL(ptr) do { \
-    VALUE markobj = (ptr); \
-    if (RTEST(markobj)) {rb_gc_mark_movable(markobj);} \
-} while (0)
-#define RUBY_MARK_UNLESS_NULL(ptr) do { \
-    VALUE markobj = (ptr); \
-    if (RTEST(markobj)) {rb_gc_mark(markobj);} \
-} while (0)
 #define RUBY_FREE_UNLESS_NULL(ptr) if(ptr){ruby_xfree(ptr);(ptr)=NULL;}
 
 #if STACK_GROW_DIRECTION > 0
@@ -123,31 +119,21 @@ int ruby_get_stack_grow_direction(volatile VALUE *addr);
 const char *rb_obj_info(VALUE obj);
 const char *rb_raw_obj_info(char *const buff, const size_t buff_size, VALUE obj);
 
-size_t rb_size_pool_slot_size(unsigned char pool_id);
-
 struct rb_execution_context_struct; /* in vm_core.h */
 struct rb_objspace; /* in vm_core.h */
 
-#ifdef NEWOBJ_OF
-# undef NEWOBJ_OF
-# undef RB_NEWOBJ_OF
-#endif
-
-#define NEWOBJ_OF_0(var, T, c, f, s, ec) \
-    T *(var) = (T *)(((f) & FL_WB_PROTECTED) ? \
-            rb_wb_protected_newobj_of(GET_EC(), (c), (f) & ~FL_WB_PROTECTED, s) : \
-            rb_wb_unprotected_newobj_of((c), (f), s))
-#define NEWOBJ_OF_ec(var, T, c, f, s, ec) \
+#define NEWOBJ_OF(var, T, c, f, s, ec) \
     T *(var) = (T *)(((f) & FL_WB_PROTECTED) ? \
-            rb_wb_protected_newobj_of((ec), (c), (f) & ~FL_WB_PROTECTED, s) : \
+            rb_wb_protected_newobj_of((ec ? ec : GET_EC()), (c), (f) & ~FL_WB_PROTECTED, s) : \
             rb_wb_unprotected_newobj_of((c), (f), s))
 
-#define NEWOBJ_OF(var, T, c, f, s, ec) \
-        NEWOBJ_OF_HELPER(ec)(var, T, c, f, s, ec)
-
-#define NEWOBJ_OF_HELPER(ec) NEWOBJ_OF_ ## ec
-
-#define RB_OBJ_GC_FLAGS_MAX 6   /* used in ext/objspace */
+#ifndef RB_GC_OBJECT_METADATA_ENTRY_DEFINED
+# define RB_GC_OBJECT_METADATA_ENTRY_DEFINED
+struct rb_gc_object_metadata_entry {
+    ID name;
+    VALUE val;
+};
+#endif
 
 #ifndef USE_UNALIGNED_MEMBER_ACCESS
 # define UNALIGNED_MEMBER_ACCESS(expr) (expr)
@@ -183,12 +169,6 @@ struct rb_objspace; /* in vm_core.h */
     RB_OBJ_WRITE(old, _slot, young); \
 } while (0)
 
-// We use SIZE_POOL_COUNT number of shape IDs for transitions out of different size pools
-// The next available shape ID will be the SPECIAL_CONST_SHAPE_ID
-#ifndef SIZE_POOL_COUNT
-# define SIZE_POOL_COUNT 5
-#endif
-
 /* Used in places that could malloc during, which can cause the GC to run. We
  * need to temporarily disable the GC to allow the malloc to happen.
  * Allocating memory during GC is a bad idea, so use this only when absolutely
@@ -200,33 +180,19 @@ struct rb_objspace; /* in vm_core.h */
 #define DURING_GC_COULD_MALLOC_REGION_END() \
     if (_already_disabled == Qfalse) rb_gc_enable()
 
-typedef struct ractor_newobj_size_pool_cache {
-    struct RVALUE *freelist;
-    struct heap_page *using_page;
-} rb_ractor_newobj_size_pool_cache_t;
-
-typedef struct ractor_newobj_cache {
-    size_t incremental_mark_step_allocated_slots;
-    rb_ractor_newobj_size_pool_cache_t size_pool_caches[SIZE_POOL_COUNT];
-} rb_ractor_newobj_cache_t;
-
 /* gc.c */
-extern VALUE *ruby_initial_gc_stress_ptr;
-extern int ruby_disable_gc;
 RUBY_ATTR_MALLOC void *ruby_mimmalloc(size_t size);
+RUBY_ATTR_MALLOC void *ruby_mimcalloc(size_t num, size_t size);
 void ruby_mimfree(void *ptr);
 void rb_gc_prepare_heap(void);
 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 *);
+VALUE rb_objspace_gc_enable(void *objspace);
+VALUE rb_objspace_gc_disable(void *objspace);
 void ruby_gc_set_params(void);
-void rb_copy_wb_protected_attribute(VALUE dest, VALUE obj);
-#if __has_attribute(alloc_align)
-__attribute__((__alloc_align__(1)))
-#endif
-RUBY_ATTR_MALLOC void *rb_aligned_malloc(size_t, size_t) RUBY_ATTR_ALLOC_SIZE((2));
+void rb_gc_copy_attributes(VALUE dest, VALUE obj);
 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 */
+size_t rb_malloc_grow_capa(size_t current_capacity, size_t type_size);
 RUBY_ATTR_MALLOC void *rb_xmalloc_mul_add(size_t, size_t, size_t);
 RUBY_ATTR_MALLOC void *rb_xcalloc_mul_add(size_t, size_t, size_t);
 void *rb_xrealloc_mul_add(const void *, size_t, size_t, size_t);
@@ -235,20 +201,27 @@ RUBY_ATTR_MALLOC void *rb_xcalloc_mul_add_mul(size_t, size_t, size_t, size_t);
 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);
-VALUE rb_class_allocate_instance(VALUE klass);
-void rb_gc_ractor_newobj_cache_clear(rb_ractor_newobj_cache_t *newobj_cache);
-size_t rb_gc_obj_slot_size(VALUE obj);
+void rb_gc_obj_id_moved(VALUE obj);
+
+void *rb_gc_ractor_cache_alloc(rb_ractor_t *ractor);
+void rb_gc_ractor_cache_free(void *cache);
+
 bool rb_gc_size_allocatable_p(size_t size);
-int rb_objspace_garbage_object_p(VALUE obj);
-bool rb_gc_is_ptr_to_obj(void *ptr);
-VALUE rb_gc_id2ref_obj_tbl(VALUE objid);
-VALUE rb_define_finalizer_no_check(VALUE obj, VALUE block);
+size_t *rb_gc_heap_sizes(void);
+size_t rb_gc_heap_id_for_size(size_t size);
 
 void rb_gc_mark_and_move(VALUE *ptr);
 
 void rb_gc_mark_weak(VALUE *ptr);
 void rb_gc_remove_weak(VALUE parent_obj, VALUE *ptr);
 
+void rb_gc_ref_update_table_values_only(st_table *tbl);
+
+void rb_gc_initial_stress_set(VALUE flag);
+
+void rb_gc_before_fork(void);
+void rb_gc_after_fork(rb_pid_t pid);
+
 #define rb_gc_mark_and_move_ptr(ptr) do { \
     VALUE _obj = (VALUE)*(ptr); \
     rb_gc_mark_and_move(&_obj); \
@@ -257,44 +230,64 @@ void rb_gc_remove_weak(VALUE parent_obj, VALUE *ptr);
 
 RUBY_SYMBOL_EXPORT_BEGIN
 /* exports for objspace module */
-size_t rb_objspace_data_type_memsize(VALUE obj);
 void rb_objspace_reachable_objects_from(VALUE obj, void (func)(VALUE, void *), void *data);
 void rb_objspace_reachable_objects_from_root(void (func)(const char *category, VALUE, void *), void *data);
-int rb_objspace_markable_object_p(VALUE obj);
 int rb_objspace_internal_object_p(VALUE obj);
-int rb_objspace_marked_object_p(VALUE obj);
+int rb_objspace_garbage_object_p(VALUE obj);
+bool rb_gc_pointer_to_heap_p(VALUE obj);
 
 void rb_objspace_each_objects(
     int (*callback)(void *start, void *end, size_t stride, void *data),
     void *data);
 
-void rb_objspace_each_objects_without_setup(
-    int (*callback)(void *, void *, size_t, void *),
-    void *data);
-
 size_t rb_gc_obj_slot_size(VALUE obj);
 
 VALUE rb_gc_disable_no_rest(void);
 
+#define RB_GC_MAX_NAME_LEN 20
 
 /* gc.c (export) */
 const char *rb_objspace_data_type_name(VALUE obj);
 VALUE rb_wb_protected_newobj_of(struct rb_execution_context_struct *, VALUE, VALUE, size_t);
 VALUE rb_wb_unprotected_newobj_of(VALUE, VALUE, size_t);
 size_t rb_obj_memsize_of(VALUE);
-void rb_gc_verify_internal_consistency(void);
-size_t rb_obj_gc_flags(VALUE, ID[], size_t);
+struct rb_gc_object_metadata_entry *rb_gc_object_metadata(VALUE obj);
 void rb_gc_mark_values(long n, const VALUE *values);
 void rb_gc_mark_vm_stack_values(long n, const VALUE *values);
 void rb_gc_update_values(long n, 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);
+
+const char *rb_gc_active_gc_name(void);
+int rb_gc_modular_gc_loaded_p(void);
+
 RUBY_SYMBOL_EXPORT_END
 
+static inline VALUE
+rb_obj_atomic_write(
+    VALUE a, VALUE *slot, VALUE b,
+    RBIMPL_ATTR_MAYBE_UNUSED()
+    const char *filename,
+    RBIMPL_ATTR_MAYBE_UNUSED()
+    int line)
+{
+#ifdef RGENGC_LOGGING_WRITE
+    RGENGC_LOGGING_WRITE(a, slot, b, filename, line);
+#endif
+
+    RUBY_ATOMIC_VALUE_SET(*slot, b);
+
+    rb_obj_written(a, RUBY_Qundef /* ignore `oldv' now */, b, filename, line);
+    return a;
+}
+#define RB_OBJ_ATOMIC_WRITE(old, slot, young) \
+    RBIMPL_CAST(rb_obj_atomic_write((VALUE)(old), (VALUE *)(slot), (VALUE)(young), __FILE__, __LINE__))
+
 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);
+void ruby_annotate_mmap(const void *addr, unsigned long size, const char *name);
 
 #if defined(HAVE_MALLOC_USABLE_SIZE) || defined(HAVE_MALLOC_SIZE) || defined(_WIN32)
 
diff --git a/internal/hash.h b/internal/hash.h
index d1848e540801b4..03cd830506a6d6 100644
--- a/internal/hash.h
+++ b/internal/hash.h
@@ -72,6 +72,7 @@ struct RHash {
 /* hash.c */
 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(VALUE hash, VALUE ifnone);
 VALUE rb_hash_set_default_proc(VALUE hash, VALUE proc);
 long rb_dbl_long_hash(double d);
 st_table *rb_init_identtable(void);
@@ -86,7 +87,10 @@ VALUE rb_hash_set_pair(VALUE hash, VALUE pair);
 int rb_hash_stlike_delete(VALUE hash, st_data_t *pkey, st_data_t *pval);
 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);
+bool rb_hash_default_unredefined(VALUE hash);
 VALUE rb_ident_hash_new_with_size(st_index_t size);
+void rb_hash_free(VALUE hash);
+RUBY_EXTERN VALUE rb_cHash_empty_frozen;
 
 static inline unsigned RHASH_AR_TABLE_SIZE_RAW(VALUE h);
 static inline VALUE RHASH_IFNONE(VALUE h);
diff --git a/internal/imemo.h b/internal/imemo.h
index 57a705ce7717c3..a7e01f31e19c18 100644
--- a/internal/imemo.h
+++ b/internal/imemo.h
@@ -10,14 +10,11 @@
  */
 #include "ruby/internal/config.h"
 #include <stddef.h>             /* for size_t */
+#include "id_table.h"
 #include "internal/array.h"     /* for rb_ary_hidden_new_fill */
 #include "ruby/internal/stdbool.h"     /* for bool */
 #include "ruby/ruby.h"          /* for rb_block_call_func_t */
 
-#ifndef IMEMO_DEBUG
-# define IMEMO_DEBUG 0
-#endif
-
 #define IMEMO_MASK   0x0f
 
 /* FL_USER0 to FL_USER3 is for type */
@@ -28,6 +25,7 @@
 #define IMEMO_FL_USER3 FL_USER7
 #define IMEMO_FL_USER4 FL_USER8
 #define IMEMO_FL_USER5 FL_USER9
+#define IMEMO_FL_USER6 FL_USER10
 
 enum imemo_type {
     imemo_env            =  0,
@@ -39,11 +37,12 @@ enum imemo_type {
     imemo_ment           =  6,
     imemo_iseq           =  7,
     imemo_tmpbuf         =  8,
-    imemo_ast            =  9,
+    imemo_ast            =  9, // Obsolete due to the universal parser
     imemo_parser_strterm = 10,
     imemo_callinfo       = 11,
     imemo_callcache      = 12,
     imemo_constcache     = 13,
+    imemo_fields   = 14,
 };
 
 /* CREF (Class REFerence) is defined in method.h */
@@ -79,7 +78,12 @@ struct vm_ifunc_argc {
 #endif
 };
 
-/*! IFUNC (Internal FUNCtion) */
+/*! IFUNC (Internal FUNCtion)
+ *
+ * Bookkeeping for converting a C function and some closed-over data into a
+ * block passable to methods. Like Ruby Proc, but not directly accessible at
+ * Ruby level since this is an imemo. See rb_block_call() and friends.
+ */
 struct vm_ifunc {
     VALUE flags;
     VALUE *svar_lep;
@@ -87,6 +91,7 @@ struct vm_ifunc {
     const void *data;
     struct vm_ifunc_argc argc;
 };
+#define IFUNC_YIELD_OPTIMIZABLE IMEMO_FL_USER0
 
 struct rb_imemo_tmpbuf_struct {
     VALUE flags;
@@ -113,11 +118,12 @@ struct MEMO {
     } u3;
 };
 
+#define IMEMO_NEW(T, type, v0) ((T *)rb_imemo_new((type), (v0), sizeof(T)))
+
 /* ment is in method.h */
 
 #define THROW_DATA_P(err) imemo_throw_data_p((VALUE)err)
 #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 MEMO_FOR(type, value) ((type *)RARRAY_PTR(value))
 #define NEW_MEMO_FOR(type, value) \
   ((value) = rb_ary_hidden_new_fill(type_roomof(type, VALUE)), MEMO_FOR(type, value))
@@ -126,10 +132,11 @@ struct MEMO {
    rb_ary_set_len((value), offsetof(type, member) / sizeof(VALUE)), \
    MEMO_FOR(type, value))
 
+#ifndef RUBY_RUBYPARSER_H
 typedef struct rb_imemo_tmpbuf_struct rb_imemo_tmpbuf_t;
+#endif
 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);
@@ -141,16 +148,27 @@ static inline VALUE rb_imemo_tmpbuf_auto_free_pointer_new_from_an_RString(VALUE
 static inline void MEMO_V1_SET(struct MEMO *m, VALUE v);
 static inline void MEMO_V2_SET(struct MEMO *m, VALUE v);
 
+size_t rb_imemo_memsize(VALUE obj);
+void rb_imemo_mark_and_move(VALUE obj, bool reference_updating);
+void rb_cc_tbl_free(struct rb_id_table *cc_tbl, VALUE klass);
+void rb_imemo_free(VALUE obj);
+
 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
+VALUE rb_imemo_new(enum imemo_type type, VALUE v0, size_t size);
 const char *rb_imemo_name(enum imemo_type type);
 RUBY_SYMBOL_EXPORT_END
 
+static inline struct MEMO *
+MEMO_NEW(VALUE a, VALUE b, VALUE c)
+{
+    struct MEMO *memo = IMEMO_NEW(struct MEMO, imemo_memo, 0);
+    *((VALUE *)&memo->v1) = a;
+    *((VALUE *)&memo->v2) = b;
+    *((VALUE *)&memo->u3.value) = c;
+
+    return memo;
+}
+
 static inline enum imemo_type
 imemo_type(VALUE imemo)
 {
@@ -172,7 +190,7 @@ imemo_type_p(VALUE imemo, enum imemo_type imemo_type)
     }
 }
 
-#define IMEMO_TYPE_P(v, t) imemo_type_p((VALUE)v, t)
+#define IMEMO_TYPE_P(v, t) imemo_type_p((VALUE)(v), t)
 
 static inline bool
 imemo_throw_data_p(VALUE imemo)
@@ -189,7 +207,7 @@ rb_vm_ifunc_proc_new(rb_block_call_func_t func, const void *data)
 static inline VALUE
 rb_imemo_tmpbuf_auto_free_pointer(void)
 {
-    return rb_imemo_new(imemo_tmpbuf, 0, 0, 0, 0);
+    return rb_imemo_new(imemo_tmpbuf, 0, sizeof(rb_imemo_tmpbuf_t));
 }
 
 static inline void *
@@ -214,7 +232,7 @@ rb_imemo_tmpbuf_auto_free_pointer_new_from_an_RString(VALUE str)
     void *dst;
     size_t len;
 
-    SafeStringValue(str);
+    StringValue(str);
     /* create tmpbuf to keep the pointer before xmalloc */
     imemo = rb_imemo_tmpbuf_auto_free_pointer();
     tmpbuf = (rb_imemo_tmpbuf_t *)imemo;
@@ -238,4 +256,59 @@ MEMO_V2_SET(struct MEMO *m, VALUE v)
     RB_OBJ_WRITE(m, &m->v2, v);
 }
 
+struct rb_fields {
+    struct RBasic basic;
+    union {
+        struct {
+            VALUE fields[1];
+        } embed;
+        struct {
+            VALUE *ptr;
+        } external;
+        struct {
+            // Note: the st_table could be embedded, but complex T_CLASS should be rare to
+            // non-existent, so not really worth the trouble.
+            st_table *table;
+        } complex;
+    } as;
+};
+
+#define OBJ_FIELD_EXTERNAL IMEMO_FL_USER0
+#define IMEMO_OBJ_FIELDS(fields) ((struct rb_fields *)fields)
+
+VALUE rb_imemo_fields_new(VALUE klass, size_t capa);
+VALUE rb_imemo_fields_new_complex(VALUE klass, size_t capa);
+VALUE rb_imemo_fields_new_complex_tbl(VALUE klass, st_table *tbl);
+VALUE rb_imemo_fields_clone(VALUE fields_obj);
+void rb_imemo_fields_clear(VALUE fields_obj);
+
+static inline VALUE *
+rb_imemo_fields_ptr(VALUE obj_fields)
+{
+    if (!obj_fields) {
+        return NULL;
+    }
+
+    RUBY_ASSERT(IMEMO_TYPE_P(obj_fields, imemo_fields));
+
+    if (RB_UNLIKELY(FL_TEST_RAW(obj_fields, OBJ_FIELD_EXTERNAL))) {
+        return IMEMO_OBJ_FIELDS(obj_fields)->as.external.ptr;
+    }
+    else {
+        return IMEMO_OBJ_FIELDS(obj_fields)->as.embed.fields;
+    }
+}
+
+static inline st_table *
+rb_imemo_fields_complex_tbl(VALUE obj_fields)
+{
+    if (!obj_fields) {
+        return NULL;
+    }
+
+    RUBY_ASSERT(IMEMO_TYPE_P(obj_fields, imemo_fields));
+
+    return IMEMO_OBJ_FIELDS(obj_fields)->as.complex.table;
+}
+
 #endif /* INTERNAL_IMEMO_H */
diff --git a/internal/inits.h b/internal/inits.h
index 03e180f77bd026..e618d87cc335d2 100644
--- a/internal/inits.h
+++ b/internal/inits.h
@@ -19,15 +19,15 @@ 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);
 
+/* namespace.c */
+void Init_enable_namespace(void);
+
 /* vm.c */
 void Init_BareVM(void);
 void Init_vm_objects(void);
diff --git a/internal/io.h b/internal/io.h
index f16d9efc9c4483..e6a741ee71faee 100644
--- a/internal/io.h
+++ b/internal/io.h
@@ -14,6 +14,20 @@
 struct rb_io;
 
 #include "ruby/io.h"            /* for rb_io_t */
+#include "ccan/list/list.h"
+#include "serial.h"
+
+#define IO_WITHOUT_GVL(func, arg) rb_nogvl(func, arg, RUBY_UBF_IO, 0, RB_NOGVL_OFFLOAD_SAFE)
+#define IO_WITHOUT_GVL_INT(func, arg) (int)(VALUE)IO_WITHOUT_GVL(func, arg)
+
+// Represents an in-flight blocking operation:
+struct rb_io_blocking_operation {
+    // The linked list data structure.
+    struct ccan_list_node list;
+
+    // The execution context of the blocking operation.
+    struct rb_execution_context_struct *ec;
+};
 
 /** Ruby's IO, metadata and buffers. */
 struct rb_io {
@@ -28,7 +42,7 @@ struct rb_io {
     int fd;
 
     /** mode flags: FMODE_XXXs */
-    int mode;
+    enum rb_io_mode mode;
 
     /** child's pid (for pipes) */
     rb_pid_t pid;
@@ -108,6 +122,18 @@ struct rb_io {
      * The timeout associated with this IO when performing blocking operations.
      */
     VALUE timeout;
+
+    /**
+     * Threads that are performing a blocking operation without the GVL using
+     * this IO. On calling IO#close, these threads will be interrupted so that
+     * the operation can be cancelled.
+     */
+    struct ccan_list_head blocking_operations;
+    struct rb_execution_context_struct *closing_ec;
+    VALUE wakeup_mutex;
+
+    // The fork generation of the the blocking operations list.
+    rb_serial_t fork_generation;
 };
 
 /* io.c */
@@ -116,22 +142,22 @@ void rb_stdio_set_default_encoding(void);
 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
 VALUE rb_io_popen(VALUE pname, VALUE pmode, VALUE env, VALUE opt);
 
 VALUE rb_io_prep_stdin(void);
 VALUE rb_io_prep_stdout(void);
 VALUE rb_io_prep_stderr(void);
 
+int rb_io_notify_close(struct rb_io *fptr);
+
 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);
+
+VALUE rb_io_blocking_region_wait(struct rb_io *io, rb_blocking_function_t *function, void *argument, enum rb_io_event events);
+VALUE rb_io_blocking_region(struct rb_io *io, rb_blocking_function_t *function, void *argument);
 RUBY_SYMBOL_EXPORT_END
 
 #endif /* INTERNAL_IO_H */
diff --git a/internal/load.h b/internal/load.h
index d4c0bb91baea18..fb880a43ba42e0 100644
--- a/internal/load.h
+++ b/internal/load.h
@@ -12,6 +12,8 @@
 
 /* load.c */
 VALUE rb_get_expanded_load_path(void);
+VALUE rb_load_entrypoint(VALUE args);
+VALUE rb_require_relative_entrypoint(VALUE fname);
 int rb_require_internal(VALUE fname);
 NORETURN(void rb_load_fail(VALUE, const char*));
 
diff --git a/internal/missing.h b/internal/missing.h
index c0992a151a580c..6ca508c8f9b543 100644
--- a/internal/missing.h
+++ b/internal/missing.h
@@ -13,6 +13,7 @@
 /* missing/setproctitle.c */
 #ifndef HAVE_SETPROCTITLE
 extern void ruby_init_setproctitle(int argc, char *argv[]);
+extern void ruby_free_proctitle(void);
 #endif
 
 #endif /* INTERNAL_MISSING_H */
diff --git a/internal/namespace.h b/internal/namespace.h
new file mode 100644
index 00000000000000..4cdfbc305fe1da
--- /dev/null
+++ b/internal/namespace.h
@@ -0,0 +1,86 @@
+#ifndef INTERNAL_NAMESPACE_H                                  /*-*-C-*-vi:se ft=c:*/
+#define INTERNAL_NAMESPACE_H
+
+#include "ruby/ruby.h"          /* for VALUE */
+
+/**
+ * @author     Ruby developers <ruby-core@ruby-lang.org>
+ * @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.
+ * @brief      Internal header for Namespace.
+ */
+struct rb_namespace_struct {
+    /*
+     * To retrieve Namespace object that provides #require and so on.
+     * That is used from load.c, etc., that uses rb_namespace_t internally.
+     */
+    VALUE ns_object;
+    long ns_id; // namespace id to generate ext filenames
+
+    VALUE top_self;
+
+    VALUE load_path;
+    VALUE load_path_snapshot;
+    VALUE load_path_check_cache;
+    VALUE expanded_load_path;
+    VALUE loaded_features;
+    VALUE loaded_features_snapshot;
+    VALUE loaded_features_realpaths;
+    VALUE loaded_features_realpath_map;
+    struct st_table *loaded_features_index;
+    struct st_table *loading_table;
+    VALUE ruby_dln_libmap;
+
+    VALUE gvar_tbl;
+
+    bool is_builtin;
+    bool is_user;
+    bool is_optional;
+};
+typedef struct rb_namespace_struct rb_namespace_t;
+
+#define NAMESPACE_BUILTIN_P(ns) (ns && ns->is_builtin)
+#define NAMESPACE_USER_P(ns) (ns && ns->is_user)
+#define NAMESPACE_OPTIONAL_P(ns) (ns && ns->is_optional)
+#define NAMESPACE_MAIN_P(ns) (ns && ns->is_user && !ns->is_optional)
+
+#define NAMESPACE_METHOD_DEFINITION(mdef) (mdef ? mdef->ns : NULL)
+#define NAMESPACE_METHOD_ENTRY(me) (me ? NAMESPACE_METHOD_DEFINITION(me->def) : NULL)
+#define NAMESPACE_CC(cc) (cc ? NAMESPACE_METHOD_ENTRY(cc->cme_) : NULL)
+#define NAMESPACE_CC_ENTRIES(ccs) (ccs ? NAMESPACE_METHOD_ENTRY(ccs->cme) : NULL)
+
+RUBY_EXTERN bool ruby_namespace_enabled;
+RUBY_EXTERN bool ruby_namespace_init_done;
+
+static inline bool
+rb_namespace_available(void)
+{
+    return ruby_namespace_enabled;
+}
+
+void rb_namespace_enable_builtin(void);
+void rb_namespace_disable_builtin(void);
+void rb_namespace_push_loading_namespace(const rb_namespace_t *);
+void rb_namespace_pop_loading_namespace(const rb_namespace_t *);
+rb_namespace_t * rb_root_namespace(void);
+const rb_namespace_t *rb_builtin_namespace(void);
+rb_namespace_t * rb_main_namespace(void);
+const rb_namespace_t * rb_definition_namespace(void);
+const rb_namespace_t * rb_loading_namespace(void);
+const rb_namespace_t * rb_current_namespace(void);
+VALUE rb_current_namespace_details(VALUE);
+
+void rb_namespace_entry_mark(void *);
+
+rb_namespace_t * rb_get_namespace_t(VALUE ns);
+VALUE rb_get_namespace_object(rb_namespace_t *ns);
+typedef VALUE namespace_exec_func(VALUE arg);
+VALUE rb_namespace_exec(const rb_namespace_t *ns, namespace_exec_func *func, VALUE arg);
+
+VALUE rb_namespace_local_extension(VALUE namespace, VALUE fname, VALUE path);
+
+void rb_initialize_main_namespace(void);
+void rb_namespace_init_done(void);
+#endif /* INTERNAL_NAMESPACE_H */
diff --git a/internal/numeric.h b/internal/numeric.h
index f7b8d0ad2da086..6406cfc2fa7480 100644
--- a/internal/numeric.h
+++ b/internal/numeric.h
@@ -86,6 +86,7 @@ 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_rshift(VALUE x, VALUE y);
 VALUE rb_int_div(VALUE x, VALUE y);
 int rb_int_positive_p(VALUE num);
 int rb_int_negative_p(VALUE num);
@@ -158,7 +159,7 @@ 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) {
+    if (RB_UNDEF_P(r)) {
         rb_cmperr(num, zero);
     }
     return r;
diff --git a/internal/object.h b/internal/object.h
index 58e989562a182e..3bde53c31b10c6 100644
--- a/internal/object.h
+++ b/internal/object.h
@@ -11,10 +11,14 @@
 #include "ruby/ruby.h"          /* for VALUE */
 
 /* object.c */
+size_t rb_obj_embedded_size(uint32_t fields_count);
+VALUE rb_class_allocate_instance(VALUE klass);
 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_obj_clone_setup(VALUE obj, VALUE clone, VALUE kwfreeze);
+VALUE rb_obj_dup_setup(VALUE obj, VALUE dup);
 VALUE rb_immutable_obj_clone(int, VALUE *, VALUE);
 VALUE rb_check_convert_type_with_id(VALUE,int,const char*,ID);
 int rb_bool_expected(VALUE, const char *, int raise);
diff --git a/internal/parse.h b/internal/parse.h
index ce99556ef95842..8e04664ae8a7d2 100644
--- a/internal/parse.h
+++ b/internal/parse.h
@@ -12,60 +12,44 @@
 #include "rubyparser.h"
 #include "internal/static_assert.h"
 
+// The default parser to use for Ruby code.
+typedef enum {
+    RB_DEFAULT_PARSER_PARSE_Y,
+    RB_DEFAULT_PARSER_PRISM,
+} ruby_default_parser_enum;
+
+ruby_default_parser_enum rb_ruby_default_parser(void);
+void rb_ruby_default_parser_set(ruby_default_parser_enum parser);
+
+#define rb_ruby_prism_p() (rb_ruby_default_parser() == RB_DEFAULT_PARSER_PRISM)
+
 #ifdef UNIVERSAL_PARSER
-#define rb_encoding void
+#define rb_encoding const void
 #endif
 
 struct rb_iseq_struct;          /* in vm_core.h */
 
-#define STRTERM_HEREDOC IMEMO_FL_USER0
-
 /* structs for managing terminator of string literal and heredocment */
 typedef struct rb_strterm_literal_struct {
-    union {
-        VALUE dummy;
-        long nest;
-    } u0;
-    union {
-        VALUE dummy;
-        long func;	    /* STR_FUNC_* (e.g., STR_FUNC_ESCAPE and STR_FUNC_EXPAND) */
-    } u1;
-    union {
-        VALUE dummy;
-        long paren;	    /* '(' of `%q(...)` */
-    } u2;
-    union {
-        VALUE dummy;
-        long term;	    /* ')' of `%q(...)` */
-    } u3;
+    long nest;
+    int func;	    /* STR_FUNC_* (e.g., STR_FUNC_ESCAPE and STR_FUNC_EXPAND) */
+    int paren;	    /* '(' of `%q(...)` */
+    int term;	    /* ')' of `%q(...)` */
 } rb_strterm_literal_t;
 
-#define HERETERM_LENGTH_BITS ((SIZEOF_VALUE - 1) * CHAR_BIT - 1)
-
 typedef struct rb_strterm_heredoc_struct {
-    VALUE lastline;	/* the string of line that contains `<<"END"` */
+    rb_parser_string_t *lastline;	/* the string of line that contains `<<"END"` */
     long offset;	/* the column of END in `<<"END"` */
     int sourceline;	/* lineno of the line that contains `<<"END"` */
-    unsigned length	/* the length of END in `<<"END"` */
-#if HERETERM_LENGTH_BITS < SIZEOF_INT * CHAR_BIT
-    : HERETERM_LENGTH_BITS
-# define HERETERM_LENGTH_MAX ((1U << HERETERM_LENGTH_BITS) - 1)
-#else
-# define HERETERM_LENGTH_MAX UINT_MAX
-#endif
-    ;
-#if HERETERM_LENGTH_BITS < SIZEOF_INT * CHAR_BIT
-    unsigned quote: 1;
-    unsigned func: 8;
-#else
+    unsigned length;	/* the length of END in `<<"END"` */
     uint8_t quote;
     uint8_t func;
-#endif
 } rb_strterm_heredoc_t;
-STATIC_ASSERT(rb_strterm_heredoc_t, sizeof(rb_strterm_heredoc_t) <= 4 * SIZEOF_VALUE);
+
+#define HERETERM_LENGTH_MAX UINT_MAX
 
 typedef struct rb_strterm_struct {
-    VALUE flags;
+    bool heredoc;
     union {
         rb_strterm_literal_t literal;
         rb_strterm_heredoc_t heredoc;
@@ -78,22 +62,34 @@ size_t rb_ruby_parser_memsize(const void *ptr);
 
 void rb_ruby_parser_set_options(rb_parser_t *p, int print, int loop, int chomp, int split);
 rb_parser_t *rb_ruby_parser_set_context(rb_parser_t *p, const struct rb_iseq_struct *base, int main);
-void rb_ruby_parser_set_script_lines(rb_parser_t *p, VALUE lines_array);
+void rb_ruby_parser_set_script_lines(rb_parser_t *p);
 void rb_ruby_parser_error_tolerant(rb_parser_t *p);
-rb_ast_t* rb_ruby_parser_compile_file_path(rb_parser_t *p, VALUE fname, VALUE file, int start);
 void rb_ruby_parser_keep_tokens(rb_parser_t *p);
-rb_ast_t* rb_ruby_parser_compile_generic(rb_parser_t *p, VALUE (*lex_gets)(VALUE, int), VALUE fname, VALUE input, int start);
-rb_ast_t* rb_ruby_parser_compile_string_path(rb_parser_t *p, VALUE f, VALUE s, int line);
+typedef rb_parser_string_t*(rb_parser_lex_gets_func)(struct parser_params*, rb_parser_input_data, int);
+rb_ast_t *rb_parser_compile(rb_parser_t *p, rb_parser_lex_gets_func *gets, VALUE fname, rb_parser_input_data input, int line);
 
 RUBY_SYMBOL_EXPORT_BEGIN
 
-VALUE rb_ruby_parser_encoding(rb_parser_t *p);
+rb_encoding *rb_ruby_parser_encoding(rb_parser_t *p);
 int rb_ruby_parser_end_seen_p(rb_parser_t *p);
 int rb_ruby_parser_set_yydebug(rb_parser_t *p, int flag);
+rb_parser_string_t *rb_str_to_parser_string(rb_parser_t *p, VALUE str);
+void rb_parser_string_free(rb_parser_t *p, rb_parser_string_t *str);
+
+int rb_parser_dvar_defined_ref(struct parser_params*, ID, ID**);
+ID rb_parser_internal_id(struct parser_params*);
+typedef void (*rb_parser_reg_fragment_error_func)(struct parser_params *, VALUE);
+int rb_parser_reg_fragment_check(struct parser_params*, rb_parser_string_t*, int, rb_parser_reg_fragment_error_func);
+int rb_reg_named_capture_assign_iter_impl(struct parser_params *p, const char *s, long len, rb_encoding *enc, NODE **succ_block, const rb_code_location_t *loc, rb_parser_assignable_func assignable);
+int rb_parser_local_defined(struct parser_params *p, ID id, const struct rb_iseq_struct *iseq);
+NODE *rb_parser_assignable(struct parser_params *p, ID id, NODE *val, const YYLTYPE *loc);
 
 RUBY_SYMBOL_EXPORT_END
 
-int rb_reg_named_capture_assign_iter_impl(struct parser_params *p, const char *s, long len, rb_encoding *enc, NODE **succ_block, const rb_code_location_t *loc);
+#ifndef UNIVERSAL_PARSER
+rb_parser_t *rb_ruby_parser_allocate(void);
+rb_parser_t *rb_ruby_parser_new(void);
+#endif
 
 #ifdef RIPPER
 void ripper_parser_mark(void *ptr);
@@ -108,21 +104,23 @@ VALUE rb_ruby_parser_debug_output(rb_parser_t *p);
 void rb_ruby_parser_set_debug_output(rb_parser_t *p, VALUE output);
 VALUE rb_ruby_parser_parsing_thread(rb_parser_t *p);
 void rb_ruby_parser_set_parsing_thread(rb_parser_t *p, VALUE parsing_thread);
-void rb_ruby_parser_ripper_initialize(rb_parser_t *p, VALUE (*gets)(struct parser_params*,VALUE), VALUE input, VALUE sourcefile_string, const char *sourcefile, int sourceline);
+void rb_ruby_parser_ripper_initialize(rb_parser_t *p, rb_parser_lex_gets_func *gets, rb_parser_input_data input, VALUE sourcefile_string, const char *sourcefile, int sourceline);
 VALUE rb_ruby_parser_result(rb_parser_t *p);
 rb_encoding *rb_ruby_parser_enc(rb_parser_t *p);
 VALUE rb_ruby_parser_ruby_sourcefile_string(rb_parser_t *p);
 int rb_ruby_parser_ruby_sourceline(rb_parser_t *p);
 int rb_ruby_parser_lex_state(rb_parser_t *p);
 void rb_ruby_ripper_parse0(rb_parser_t *p);
-int rb_ruby_ripper_dedent_string(rb_parser_t *p, VALUE string, int width);
-VALUE rb_ruby_ripper_lex_get_str(rb_parser_t *p, VALUE s);
+int rb_ruby_ripper_dedent_string(rb_parser_t *p, rb_parser_string_t *string, int width);
 int rb_ruby_ripper_initialized_p(rb_parser_t *p);
 void rb_ruby_ripper_parser_initialize(rb_parser_t *p);
 long rb_ruby_ripper_column(rb_parser_t *p);
 long rb_ruby_ripper_token_len(rb_parser_t *p);
-VALUE rb_ruby_ripper_lex_lastline(rb_parser_t *p);
+rb_parser_string_t *rb_ruby_ripper_lex_lastline(rb_parser_t *p);
 VALUE rb_ruby_ripper_lex_state_name(struct parser_params *p, int state);
+#ifdef UNIVERSAL_PARSER
+rb_parser_t *rb_ripper_parser_params_allocate(const rb_parser_config_t *config);
+#endif
 struct parser_params *rb_ruby_ripper_parser_allocate(void);
 #endif
 
diff --git a/internal/proc.h b/internal/proc.h
index c75f15b283cb42..24a077ca6d8eda 100644
--- a/internal/proc.h
+++ b/internal/proc.h
@@ -22,7 +22,7 @@ int rb_block_min_max_arity(int *max);
 VALUE rb_block_to_s(VALUE self, const struct rb_block *block, const char *additional_info);
 VALUE rb_callable_receiver(VALUE);
 
-VALUE rb_func_proc_new(rb_block_call_func_t func, VALUE val);
+VALUE rb_func_proc_dup(VALUE src_obj);
 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);
diff --git a/internal/ractor.h b/internal/ractor.h
index eef5ffdb893aed..a65907a05a7cf2 100644
--- a/internal/ractor.h
+++ b/internal/ractor.h
@@ -3,4 +3,8 @@
 
 void rb_ractor_ensure_main_ractor(const char *msg);
 
+RUBY_SYMBOL_EXPORT_BEGIN
+void rb_ractor_setup_belonging(VALUE obj);
+RUBY_SYMBOL_EXPORT_END
+
 #endif /* INTERNAL_RACTOR_H */
diff --git a/internal/random.h b/internal/random.h
index 231e2d5d7e8e8f..127b908e163f05 100644
--- a/internal/random.h
+++ b/internal/random.h
@@ -12,5 +12,6 @@
 
 /* random.c */
 int ruby_fill_random_bytes(void *, size_t, int);
+void rb_free_default_rand_key(void);
 
 #endif /* INTERNAL_RANDOM_H */
diff --git a/internal/re.h b/internal/re.h
index 3e201146655ba5..2788f8b42a75b3 100644
--- a/internal/re.h
+++ b/internal/re.h
@@ -14,12 +14,12 @@
 /* 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);
+long rb_reg_search0(VALUE, VALUE, long, int, int, VALUE *);
 VALUE rb_reg_match_p(VALUE re, VALUE str, long pos);
 bool rb_reg_start_with_p(VALUE re, VALUE str);
 VALUE rb_reg_hash(VALUE re);
 VALUE rb_reg_equal(VALUE re1, VALUE re2);
-void rb_backref_set_string(VALUE string, long pos, long len);
+VALUE rb_backref_set_string(VALUE string, long pos, long len);
 void rb_match_unbusy(VALUE);
 int rb_match_count(VALUE match);
 VALUE rb_reg_new_ary(VALUE ary, int options);
diff --git a/internal/ruby_parser.h b/internal/ruby_parser.h
index fc23177719ea93..8e306d18decd35 100644
--- a/internal/ruby_parser.h
+++ b/internal/ruby_parser.h
@@ -2,31 +2,60 @@
 #define INTERNAL_RUBY_PARSE_H
 
 #include "internal.h"
-#include "internal/imemo.h"
+#include "internal/bignum.h"
+#include "internal/compilers.h"
+#include "internal/complex.h"
+#include "internal/parse.h"
+#include "internal/rational.h"
 #include "rubyparser.h"
 #include "vm.h"
 
+struct lex_pointer_string {
+    VALUE str;
+    long ptr;
+};
+
 RUBY_SYMBOL_EXPORT_BEGIN
 #ifdef UNIVERSAL_PARSER
-void rb_parser_config_initialize(rb_parser_config_t *config);
+const rb_parser_config_t *rb_ruby_parser_config(void);
+rb_parser_t *rb_parser_params_new(void);
 #endif
 VALUE rb_parser_set_context(VALUE, const struct rb_iseq_struct *, int);
+VALUE rb_parser_new(void);
+VALUE rb_parser_compile_string_path(VALUE vparser, VALUE fname, VALUE src, int line);
+VALUE rb_str_new_parser_string(rb_parser_string_t *str);
+VALUE rb_str_new_mutable_parser_string(rb_parser_string_t *str);
+rb_parser_string_t *rb_parser_lex_get_str(struct parser_params *p, struct lex_pointer_string *ptr_str);
+
+VALUE rb_node_str_string_val(const NODE *);
+VALUE rb_node_sym_string_val(const NODE *);
+VALUE rb_node_dstr_string_val(const NODE *);
+VALUE rb_node_regx_string_val(const NODE *);
+VALUE rb_node_dregx_string_val(const NODE *);
+VALUE rb_node_line_lineno_val(const NODE *);
+VALUE rb_node_file_path_val(const NODE *);
+VALUE rb_node_encoding_val(const NODE *);
+
+VALUE rb_node_integer_literal_val(const NODE *);
+VALUE rb_node_float_literal_val(const NODE *);
+VALUE rb_node_rational_literal_val(const NODE *);
+VALUE rb_node_imaginary_literal_val(const NODE *);
 RUBY_SYMBOL_EXPORT_END
 
-VALUE rb_parser_new(void);
 VALUE rb_parser_end_seen_p(VALUE);
 VALUE rb_parser_encoding(VALUE);
 VALUE rb_parser_set_yydebug(VALUE, VALUE);
+VALUE rb_parser_build_script_lines_from(rb_parser_ary_t *script_lines);
 void rb_parser_set_options(VALUE, int, int, int, int);
-void *rb_parser_load_file(VALUE parser, VALUE name);
-void rb_parser_set_script_lines(VALUE vparser, VALUE lines_array);
+VALUE rb_parser_load_file(VALUE parser, VALUE name);
+void rb_parser_set_script_lines(VALUE vparser);
 void rb_parser_error_tolerant(VALUE vparser);
 void rb_parser_keep_tokens(VALUE vparser);
 
-rb_ast_t *rb_parser_compile_string(VALUE, const char*, VALUE, int);
-rb_ast_t *rb_parser_compile_string_path(VALUE vparser, VALUE fname, VALUE src, int line);
-rb_ast_t *rb_parser_compile_file_path(VALUE vparser, VALUE fname, VALUE input, int line);
-rb_ast_t *rb_parser_compile_generic(VALUE vparser, VALUE (*lex_gets)(VALUE, int), VALUE fname, VALUE input, int line);
+VALUE rb_parser_compile_string(VALUE, const char*, VALUE, int);
+VALUE rb_parser_compile_file_path(VALUE vparser, VALUE fname, VALUE input, int line);
+VALUE rb_parser_compile_generic(VALUE vparser, rb_parser_lex_gets_func *lex_gets, VALUE fname, VALUE input, int line);
+VALUE rb_parser_compile_array(VALUE vparser, VALUE fname, VALUE array, int start);
 
 enum lex_state_bits {
     EXPR_BEG_bit,		/* ignore newline, +/- is a sign. */
@@ -66,4 +95,8 @@ enum lex_state_e {
     EXPR_END_ANY  =  (EXPR_END | EXPR_ENDARG | EXPR_ENDFN),
     EXPR_NONE = 0
 };
+
+VALUE rb_ruby_ast_new(const NODE *const root);
+rb_ast_t *rb_ruby_ast_data_get(VALUE ast_value);
+
 #endif /* INTERNAL_RUBY_PARSE_H */
diff --git a/internal/sanitizers.h b/internal/sanitizers.h
index 7b7d166c747d4e..8e6e87ddc8d749 100644
--- a/internal/sanitizers.h
+++ b/internal/sanitizers.h
@@ -16,11 +16,15 @@
 #endif
 
 #ifdef HAVE_SANITIZER_ASAN_INTERFACE_H
-# include <sanitizer/asan_interface.h>
+# if __has_feature(address_sanitizer) || defined(__SANITIZE_ADDRESS__)
+#  define RUBY_ASAN_ENABLED
+#  include <sanitizer/asan_interface.h>
+# endif
 #endif
 
 #ifdef HAVE_SANITIZER_MSAN_INTERFACE_H
 # if __has_feature(memory_sanitizer)
+#  define RUBY_MSAN_ENABLED
 #  include <sanitizer/msan_interface.h>
 # endif
 #endif
@@ -29,12 +33,15 @@
 #include "ruby/ruby.h"          /* for VALUE */
 
 #if 0
-#elif __has_feature(memory_sanitizer) && __has_feature(address_sanitizer)
+#elif defined(RUBY_ASAN_ENABLED) && defined(RUBY_MSAN_ENABLED)
 # define ATTRIBUTE_NO_ADDRESS_SAFETY_ANALYSIS(x) \
     __attribute__((__no_sanitize__("memory, address"), __noinline__)) x
-#elif __has_feature(address_sanitizer)
+#elif defined(RUBY_ASAN_ENABLED)
 # define ATTRIBUTE_NO_ADDRESS_SAFETY_ANALYSIS(x) \
     __attribute__((__no_sanitize__("address"), __noinline__)) x
+#elif defined(RUBY_MSAN_ENABLED)
+    # define ATTRIBUTE_NO_ADDRESS_SAFETY_ANALYSIS(x) \
+    __attribute__((__no_sanitize__("memory"), __noinline__)) x
 #elif defined(NO_SANITIZE_ADDRESS)
 # define ATTRIBUTE_NO_ADDRESS_SAFETY_ANALYSIS(x) \
     NO_SANITIZE_ADDRESS(NOINLINE(x))
@@ -50,23 +57,26 @@
 # include "internal/warnings.h"
 # undef NO_SANITIZE
 # define NO_SANITIZE(x, y) \
-    COMPILER_WARNING_PUSH; \
-    COMPILER_WARNING_IGNORED(-Wattributes); \
+    COMPILER_WARNING_PUSH \
+    COMPILER_WARNING_IGNORED(-Wattributes) \
     __attribute__((__no_sanitize__(x))) y; \
-    COMPILER_WARNING_POP
+    COMPILER_WARNING_POP \
+    y
 #endif
 
 #ifndef NO_SANITIZE
 # define NO_SANITIZE(x, y) y
 #endif
 
-#if !__has_feature(address_sanitizer)
+#ifndef RUBY_ASAN_ENABLED
 # define __asan_poison_memory_region(x, y)
 # define __asan_unpoison_memory_region(x, y)
 # define __asan_region_is_poisoned(x, y) 0
+# define __asan_get_current_fake_stack() NULL
+# define __asan_addr_is_in_fake_stack(fake_stack, slot, start, end) NULL
 #endif
 
-#if !__has_feature(memory_sanitizer)
+#ifndef RUBY_MSAN_ENABLED
 # 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))
@@ -89,7 +99,7 @@
 # define VALGRIND_MAKE_MEM_UNDEFINED(p, n) 0
 #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
@@ -99,8 +109,8 @@
  * 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.
+ * @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)
@@ -109,41 +119,48 @@ asan_poison_memory_region(const volatile void *ptr, size_t 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
+#ifdef RUBY_ASAN_ENABLED
 #define asan_poison_object_if(ptr, obj) do { \
-        if (ptr) asan_poison_object(obj); \
+        if (ptr) rb_asan_poison_object(obj); \
     } while (0)
+#else
+#define asan_poison_object_if(ptr, obj) ((void)(ptr), (void)(obj))
 #endif
 
-/*!
+#ifdef RUBY_ASAN_ENABLED
+RUBY_SYMBOL_EXPORT_BEGIN
+/**
+ * This is a variant of asan_poison_memory_region that takes a VALUE.
+ *
+ * @param[in]  obj   target object.
+ */
+void rb_asan_poison_object(VALUE obj);
+
+/**
  * 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.
+ * @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);
-}
+void *rb_asan_poisoned_object_p(VALUE obj);
+
+/**
+ * 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.
+ */
+void rb_asan_unpoison_object(VALUE obj, bool newobj_p);
 
-/*!
+RUBY_SYMBOL_EXPORT_END
+#else
+# define rb_asan_poison_object(obj) ((void)obj)
+# define rb_asan_poisoned_object_p(obj) ((void)obj, NULL)
+# define rb_asan_unpoison_object(obj, newobj_p) ((void)obj, (void)newobj_p)
+#endif
+
+/**
  * 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,
@@ -154,9 +171,9 @@ asan_poisoned_object_p(VALUE obj)
  * 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.
+ * @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)
@@ -170,17 +187,150 @@ asan_unpoison_memory_region(const volatile void *ptr, size_t size, bool malloc_p
     }
 }
 
-/*!
- * This is a variant of asan_unpoison_memory_region that takes a VALUE.
+static inline void *
+asan_unpoison_object_temporary(VALUE obj)
+{
+    void *ptr = rb_asan_poisoned_object_p(obj);
+    rb_asan_unpoison_object(obj, false);
+    return ptr;
+}
+
+static inline void *
+asan_poison_object_restore(VALUE obj, void *ptr)
+{
+    if (ptr) {
+        rb_asan_poison_object(obj);
+    }
+    return NULL;
+}
+
+#define asan_unpoisoning_object(obj) \
+    for (void *poisoned = asan_unpoison_object_temporary(obj), \
+              *unpoisoning = &poisoned; /* flag to loop just once */ \
+         unpoisoning; \
+         unpoisoning = asan_poison_object_restore(obj, poisoned))
+
+
+static inline void *
+asan_unpoison_memory_region_temporary(void *ptr, size_t len)
+{
+    void *poisoned_ptr = __asan_region_is_poisoned(ptr, len);
+    asan_unpoison_memory_region(ptr, len, false);
+    return poisoned_ptr;
+}
+
+static inline void *
+asan_poison_memory_region_restore(void *ptr, size_t len, void *poisoned_ptr)
+{
+    if (poisoned_ptr) {
+        asan_poison_memory_region(ptr, len);
+    }
+    return NULL;
+}
+
+#define asan_unpoisoning_memory_region(ptr, len) \
+    for (void *poisoned = asan_unpoison_memory_region_temporary(ptr, len), \
+              *unpoisoning = &poisoned; /* flag to loop just once */ \
+         unpoisoning; \
+         unpoisoning = asan_poison_memory_region_restore(ptr, len, poisoned))
+
+/**
+ * Checks if the given pointer is on an ASAN fake stack. If so, it returns the
+ * address this variable has on the real frame; if not, it returns the origin
+ * address unmodified.
+ *
+ * n.b. - _dereferencing_ the returned address is meaningless and should not
+ * be done; even though ASAN reserves space for the variable in both the real and
+ * fake stacks, the _value_ of that variable is only in the fake stack.
+ *
+ * n.b. - this only works for addresses passed in from local variables on the same
+ * thread, because the ASAN fake stacks are threadlocal.
  *
- * \param[in]  obj       target object.
- * \param[in]  malloc_p  if the memory region is like a malloc's return value or not.
+ * @param[in] slot  the address of some local variable
+ * @retval          a pointer to something from that frame on the _real_ machine stack
  */
-static inline void
-asan_unpoison_object(VALUE obj, bool newobj_p)
+static inline void *
+asan_get_real_stack_addr(void* slot)
+{
+    VALUE *addr;
+    addr = __asan_addr_is_in_fake_stack(__asan_get_current_fake_stack(), slot, NULL, NULL);
+    return addr ? addr : slot;
+}
+
+/**
+ * Gets the current thread's fake stack handle, which can be passed into get_fake_stack_extents
+ *
+ * @retval An opaque value which can be passed to asan_get_fake_stack_extents
+ */
+static inline void *
+asan_get_thread_fake_stack_handle(void)
+{
+    return __asan_get_current_fake_stack();
+}
+
+/**
+ * Checks if the given VALUE _actually_ represents a pointer to an ASAN fake stack.
+ *
+ * If the given slot _is_ actually a reference to an ASAN fake stack, and that fake stack
+ * contains the real values for the passed-in range of machine stack addresses, returns true
+ * and the range of the fake stack through the outparams.
+ *
+ * Otherwise, returns false, and sets the outparams to NULL.
+ *
+ * Note that this function expects "start" to be > "end" on downward-growing stack architectures;
+ *
+ * @param[in]  thread_fake_stack_handle  The asan fake stack reference for the thread we're scanning
+ * @param[in]  slot                      The value on the machine stack we want to inspect
+ * @param[in]  machine_stack_start       The extents of the real machine stack on which slot lives
+ * @param[in]  machine_stack_end         The extents of the real machine stack on which slot lives
+ * @param[out] fake_stack_start_out      The extents of the fake stack which contains real VALUEs
+ * @param[out] fake_stack_end_out        The extents of the fake stack which contains real VALUEs
+ * @return                               Whether slot is a pointer to a fake stack for the given machine stack range
+*/
+
+static inline bool
+asan_get_fake_stack_extents(void *thread_fake_stack_handle, VALUE slot,
+                            void *machine_stack_start, void *machine_stack_end,
+                            void **fake_stack_start_out, void **fake_stack_end_out)
 {
-    MAYBE_UNUSED(struct RVALUE *) ptr = (void *)obj;
-    asan_unpoison_memory_region(ptr, SIZEOF_VALUE, newobj_p);
+    /* the ifdef is needed here to suppress a warning about fake_frame_{start/end} being
+       uninitialized if __asan_addr_is_in_fake_stack is an empty macro */
+#ifdef RUBY_ASAN_ENABLED
+    void *fake_frame_start;
+    void *fake_frame_end;
+    void *real_stack_frame = __asan_addr_is_in_fake_stack(
+        thread_fake_stack_handle, (void *)slot, &fake_frame_start, &fake_frame_end
+    );
+    if (real_stack_frame) {
+        bool in_range;
+#if STACK_GROW_DIRECTION < 0
+        in_range = machine_stack_start >= real_stack_frame && real_stack_frame >= machine_stack_end;
+#else
+        in_range = machine_stack_start <= real_stack_frame && real_stack_frame <= machine_stack_end;
+#endif
+        if (in_range) {
+            *fake_stack_start_out = fake_frame_start;
+            *fake_stack_end_out = fake_frame_end;
+            return true;
+        }
+    }
+#endif
+    *fake_stack_start_out = 0;
+    *fake_stack_end_out = 0;
+    return false;
 }
 
+extern const char ruby_asan_default_options[];
+
+#ifdef RUBY_ASAN_ENABLED
+/* Compile in the ASAN options Ruby needs, rather than relying on environment variables, so
+ * that even tests which fork ruby with a clean environment will run ASAN with the right
+ * settings */
+# undef RUBY__ASAN_DEFAULT_OPTIONS
+# define RUBY__ASAN_DEFAULT_OPTIONS \
+    RBIMPL_SYMBOL_EXPORT_BEGIN() \
+    const char * __asan_default_options(void) {return ruby_asan_default_options;} \
+    RBIMPL_SYMBOL_EXPORT_END()
+#endif
+
 #endif /* INTERNAL_SANITIZERS_H */
diff --git a/internal/set_table.h b/internal/set_table.h
new file mode 100644
index 00000000000000..3cb9c6434975b4
--- /dev/null
+++ b/internal/set_table.h
@@ -0,0 +1,67 @@
+#ifndef INTERNAL_SET_TABLE_H
+#define INTERNAL_SET_TABLE_H
+
+#include "include/ruby/st.h"
+
+struct set_table_entry;
+
+typedef struct set_table_entry set_table_entry;
+
+struct set_table {
+    /* Cached features of the table -- see st.c for more details.  */
+    unsigned char entry_power, bin_power, size_ind;
+    /* How many times the table was rebuilt.  */
+    unsigned int rebuilds_num;
+    const struct st_hash_type *type;
+    /* Number of entries currently in the table.  */
+    st_index_t num_entries;
+    /* Array of bins used for access by keys.  */
+    st_index_t *bins;
+    /* Start and bound index of entries in array entries.
+       entries_starts and entries_bound are in interval
+       [0,allocated_entries].  */
+    st_index_t entries_start, entries_bound;
+    /* Array of size 2^entry_power.  */
+    set_table_entry *entries;
+};
+
+typedef struct set_table set_table;
+
+typedef int set_foreach_callback_func(st_data_t, st_data_t);
+typedef int set_foreach_check_callback_func(st_data_t, st_data_t, int);
+typedef int set_update_callback_func(st_data_t *key, st_data_t arg, int existing);
+
+#define set_table_size rb_set_table_size
+size_t rb_set_table_size(const struct set_table *tbl);
+#define set_init_table_with_size rb_set_init_table_with_size
+set_table *rb_set_init_table_with_size(set_table *tab, const struct st_hash_type *, st_index_t);
+#define set_init_numtable rb_set_init_numtable
+set_table *rb_set_init_numtable(void);
+#define set_init_numtable_with_size rb_set_init_numtable_with_size
+set_table *rb_set_init_numtable_with_size(st_index_t size);
+#define set_table_delete rb_set_table_delete
+int rb_set_table_delete(set_table *, st_data_t *); /* returns 0:notfound 1:deleted */
+#define set_insert rb_set_insert
+int rb_set_insert(set_table *, st_data_t);
+#define set_table_lookup rb_set_table_lookup
+int rb_set_table_lookup(set_table *, st_data_t);
+#define set_foreach_with_replace rb_set_foreach_with_replace
+int rb_set_foreach_with_replace(set_table *tab, set_foreach_check_callback_func *func, set_update_callback_func *replace, st_data_t arg);
+#define set_table_foreach rb_set_table_foreach
+int rb_set_table_foreach(set_table *, set_foreach_callback_func *, st_data_t);
+#define set_foreach_check rb_set_foreach_check
+int rb_set_foreach_check(set_table *, set_foreach_check_callback_func *, st_data_t, st_data_t);
+#define set_keys rb_set_keys
+st_index_t rb_set_keys(set_table *table, st_data_t *keys, st_index_t size);
+#define set_free_table rb_set_free_table
+void rb_set_free_table(set_table *);
+#define set_table_clear rb_set_table_clear
+void rb_set_table_clear(set_table *);
+#define set_copy rb_set_copy
+set_table *rb_set_copy(set_table *new_table, set_table *old_table);
+#define set_memsize rb_set_memsize
+PUREFUNC(size_t rb_set_memsize(const set_table *));
+#define set_compact_table rb_set_compact_table
+void set_compact_table(set_table *tab);
+
+#endif
diff --git a/internal/signal.h b/internal/signal.h
index 660cd95f78742d..904747e226a05f 100644
--- a/internal/signal.h
+++ b/internal/signal.h
@@ -19,7 +19,7 @@ void (*ruby_posix_signal(int, void (*)(int)))(int);
 
 RUBY_SYMBOL_EXPORT_BEGIN
 /* signal.c (export) */
-int rb_grantpt(int fd);
+void rb_signal_atfork(void);
 RUBY_SYMBOL_EXPORT_END
 
 #endif /* INTERNAL_SIGNAL_H */
diff --git a/internal/st.h b/internal/st.h
new file mode 100644
index 00000000000000..a26b224505e644
--- /dev/null
+++ b/internal/st.h
@@ -0,0 +1,11 @@
+#ifndef INTERNAL_ST_H
+#define INTERNAL_ST_H
+
+#include "include/ruby/st.h"
+
+st_table *rb_st_replace(st_table *new_tab, st_table *old_tab);
+#define st_replace rb_st_replace
+st_table *rb_st_init_existing_table_with_size(st_table *tab, const struct st_hash_type *type, st_index_t size);
+#define st_init_existing_table_with_size rb_st_init_existing_table_with_size
+
+#endif
diff --git a/internal/string.h b/internal/string.h
index abb0a536ade040..d6fea62061ddfa 100644
--- a/internal/string.h
+++ b/internal/string.h
@@ -15,14 +15,22 @@
 #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 */
+#define STR_SHARED                  FL_USER0 /* = ELTS_SHARED */
+#define STR_NOEMBED                 FL_USER1
+#define STR_CHILLED                 (FL_USER2 | FL_USER3)
+#define STR_CHILLED_LITERAL         FL_USER2
+#define STR_CHILLED_SYMBOL_TO_S     FL_USER3
+
+enum ruby_rstring_private_flags {
+    RSTRING_CHILLED = STR_CHILLED,
+};
 
 #ifdef rb_fstring_cstr
 # undef rb_fstring_cstr
 #endif
 
 /* string.c */
+VALUE rb_str_dup_m(VALUE str);
 VALUE rb_fstring(VALUE);
 VALUE rb_fstring_cstr(const char *str);
 VALUE rb_fstring_enc_new(const char *ptr, long len, rb_encoding *enc);
@@ -45,6 +53,20 @@ void rb_str_make_independent(VALUE str);
 int rb_enc_str_coderange_scan(VALUE str, rb_encoding *enc);
 int rb_ascii8bit_appendable_encoding_index(rb_encoding *enc, unsigned int code);
 VALUE rb_str_include(VALUE str, VALUE arg);
+VALUE rb_str_byte_substr(VALUE str, VALUE beg, VALUE len);
+VALUE rb_str_substr_two_fixnums(VALUE str, VALUE beg, VALUE len, int empty);
+VALUE rb_str_tmp_frozen_no_embed_acquire(VALUE str);
+void rb_str_make_embedded(VALUE);
+VALUE rb_str_upto_each(VALUE, VALUE, int, int (*each)(VALUE, VALUE), VALUE);
+size_t rb_str_size_as_embedded(VALUE);
+bool rb_str_reembeddable_p(VALUE);
+VALUE rb_str_upto_endless_each(VALUE, int (*each)(VALUE, VALUE), VALUE);
+VALUE rb_str_with_debug_created_info(VALUE, VALUE, int);
+VALUE rb_str_frozen_bare_string(VALUE);
+
+/* error.c */
+void rb_warn_unchilled_literal(VALUE str);
+void rb_warn_unchilled_symbol_to_s(VALUE str);
 
 static inline bool STR_EMBED_P(VALUE str);
 static inline bool STR_SHARED_P(VALUE str);
@@ -59,24 +81,22 @@ RUBY_SYMBOL_EXPORT_BEGIN
 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);
-void rb_str_make_embedded(VALUE);
-size_t rb_str_size_as_embedded(VALUE);
-bool rb_str_reembeddable_p(VALUE);
-void rb_str_update_shared_ary(VALUE str, VALUE old_root, VALUE new_root);
 RUBY_SYMBOL_EXPORT_END
 
 VALUE rb_fstring_new(const char *ptr, long len);
+void rb_gc_free_fstring(VALUE obj);
+bool rb_obj_is_fstring_table(VALUE obj);
+void Init_fstring_table();
 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);
+VALUE rb_enc_literal_str(const char *ptr, long len, rb_encoding *enc);
 
 struct rb_execution_context_struct;
-VALUE rb_ec_str_resurrect(struct rb_execution_context_struct *ec, VALUE str);
+VALUE rb_ec_str_resurrect(struct rb_execution_context_struct *ec, VALUE str, bool chilled);
 
 #define rb_fstring_lit(str) rb_fstring_new((str), rb_strlen_lit(str))
 #define rb_fstring_literal(str) rb_fstring_lit(str)
@@ -107,6 +127,29 @@ STR_SHARED_P(VALUE str)
     return FL_ALL_RAW(str, STR_NOEMBED | STR_SHARED);
 }
 
+static inline bool
+CHILLED_STRING_P(VALUE obj)
+{
+    return RB_TYPE_P(obj, T_STRING) && FL_TEST_RAW(obj, STR_CHILLED);
+}
+
+static inline void
+CHILLED_STRING_MUTATED(VALUE str)
+{
+    VALUE chilled_reason = RB_FL_TEST_RAW(str, STR_CHILLED);
+    FL_UNSET_RAW(str, STR_CHILLED);
+    switch (chilled_reason) {
+      case STR_CHILLED_SYMBOL_TO_S:
+        rb_warn_unchilled_symbol_to_s(str);
+        break;
+      case STR_CHILLED_LITERAL:
+        rb_warn_unchilled_literal(str);
+        break;
+      default:
+        rb_bug("RString was chilled for multiple reasons");
+    }
+}
+
 static inline bool
 is_ascii_string(VALUE str)
 {
diff --git a/internal/struct.h b/internal/struct.h
index 6da5bad10a4b00..a8c773b730300e 100644
--- a/internal/struct.h
+++ b/internal/struct.h
@@ -59,7 +59,6 @@ struct RStruct {
 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 long RSTRUCT_EMBED_LEN(VALUE st);
 static inline long RSTRUCT_LEN(VALUE st);
 static inline int RSTRUCT_LENINT(VALUE st);
@@ -117,11 +116,4 @@ RSTRUCT_GET(VALUE st, long k)
     return RSTRUCT_CONST_PTR(st)[k];
 }
 
-static inline const VALUE *
-rb_struct_const_heap_ptr(VALUE st)
-{
-    assert(!FL_TEST_RAW(st, RSTRUCT_EMBED_LEN_MASK));
-    return RSTRUCT(st)->as.heap.ptr;
-}
-
 #endif /* INTERNAL_STRUCT_H */
diff --git a/internal/symbol.h b/internal/symbol.h
index 30c81ea004169b..1a066af0e7d9a7 100644
--- a/internal/symbol.h
+++ b/internal/symbol.h
@@ -17,6 +17,8 @@
 #endif
 
 /* symbol.c */
+void rb_sym_global_symbols_mark(void);
+void rb_sym_global_symbols_update_references(void);
 VALUE rb_to_symbol_type(VALUE obj);
 VALUE rb_sym_intern(const char *ptr, long len, rb_encoding *enc);
 VALUE rb_sym_intern_ascii(const char *ptr, long len);
@@ -32,6 +34,9 @@ ID rb_make_temporary_id(size_t n);
 void rb_gc_free_dsymbol(VALUE);
 int rb_static_id_valid_p(ID id);
 
+/* vm.c */
+void rb_free_static_symid_str(void);
+
 #if __has_builtin(__builtin_constant_p)
 #define rb_sym_intern_ascii_cstr(ptr) \
     (__builtin_constant_p(ptr) ? \
diff --git a/internal/thread.h b/internal/thread.h
index c41a16c12d7697..928126c3b0dd25 100644
--- a/internal/thread.h
+++ b/internal/thread.h
@@ -13,6 +13,7 @@
 #include "ccan/list/list.h"     /* for list in rb_io_close_wait_list */
 
 struct rb_thread_struct;        /* in vm_core.h */
+struct rb_io;
 
 #define RB_VM_SAVE_MACHINE_CONTEXT(th)				\
     do {							\
@@ -46,29 +47,64 @@ 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_thread_acquire_fork_lock(void);
+void rb_thread_release_fork_lock(void);
+void rb_thread_reset_fork_lock(void);
 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);
 VALUE rb_exec_recursive_outer_mid(VALUE (*f)(VALUE g, VALUE h, int r), VALUE g, VALUE h, ID mid);
+void ruby_mn_threads_params(void);
 
+int rb_thread_io_wait(struct rb_io *io, int events, struct timeval * timeout);
 int rb_thread_wait_for_single_fd(int fd, int events, struct timeval * timeout);
 
-struct rb_io_close_wait_list {
-    struct ccan_list_head pending_fd_users;
-    VALUE closing_thread;
-    VALUE wakeup_mutex;
-};
-int rb_notify_fd_close(int fd, struct rb_io_close_wait_list *busy);
-void rb_notify_fd_close_wait(struct rb_io_close_wait_list *busy);
+size_t rb_thread_io_close_interrupt(struct rb_io *);
+void rb_thread_io_close_wait(struct rb_io *);
+
+void rb_ec_check_ints(struct rb_execution_context_struct *ec);
 
 RUBY_SYMBOL_EXPORT_BEGIN
+
+void *rb_thread_prevent_fork(void *(*func)(void *), void *data); /* for ext/socket/raddrinfo.c */
+
 /* Temporary.  This API will be removed (renamed). */
-VALUE rb_thread_io_blocking_region(rb_blocking_function_t *func, void *data1, int fd);
+VALUE rb_thread_io_blocking_region(struct rb_io *io, rb_blocking_function_t *func, void *data1);
+VALUE rb_thread_io_blocking_call(struct rb_io *io, rb_blocking_function_t *func, void *data1, int events);
+
+// Invoke the given function, with the specified argument, in a way that `IO#close` from another execution context can interrupt it.
+VALUE rb_thread_io_blocking_operation(VALUE self, VALUE(*function)(VALUE), VALUE argument);
 
 /* thread.c (export) */
 int ruby_thread_has_gvl_p(void); /* for ext/fiddle/closure.c */
+
 RUBY_SYMBOL_EXPORT_END
 
 int rb_threadptr_execute_interrupts(struct rb_thread_struct *th, int blocking_timing);
+bool rb_thread_mn_schedulable(VALUE thread);
+
+bool rb_thread_resolve_unblock_function(rb_unblock_function_t **unblock_function, void **data2, struct rb_thread_struct *thread);
+
+// interrupt exec
+
+typedef VALUE (rb_interrupt_exec_func_t)(void *data);
+
+enum rb_interrupt_exec_flag {
+    rb_interrupt_exec_flag_none = 0x00,
+    rb_interrupt_exec_flag_value_data = 0x01,
+    rb_interrupt_exec_flag_new_thread = 0x02,
+};
+
+// interrupt the target_th and run func.
+struct rb_ractor_struct;
+
+void rb_threadptr_interrupt_exec(struct rb_thread_struct *target_th,
+                                 rb_interrupt_exec_func_t *func, void *data, enum rb_interrupt_exec_flag flags);
+
+// create a thread in the target_r and run func on the created thread.
+void rb_ractor_interrupt_exec(struct rb_ractor_struct *target_r,
+                              rb_interrupt_exec_func_t *func, void *data, enum rb_interrupt_exec_flag flags);
+
+void rb_threadptr_interrupt_exec_task_mark(struct rb_thread_struct *th);
 
 #endif /* INTERNAL_THREAD_H */
diff --git a/internal/time.h b/internal/time.h
index a3bf0587ecfd14..e21b3574f6db7a 100644
--- a/internal/time.h
+++ b/internal/time.h
@@ -28,7 +28,10 @@ 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);
+#ifdef RBIMPL_ATTR_DEPRECATED_INTERNAL_ONLY
+RBIMPL_ATTR_DEPRECATED_INTERNAL_ONLY()
+#endif
+void ruby_reset_timezone(const char *);
 RUBY_SYMBOL_EXPORT_END
 
 #endif /* INTERNAL_TIME_H */
diff --git a/internal/transcode.h b/internal/transcode.h
index 9922332ea9c076..ce4f2341be889f 100644
--- a/internal/transcode.h
+++ b/internal/transcode.h
@@ -17,4 +17,7 @@
 extern VALUE rb_cEncodingConverter;
 size_t rb_econv_memsize(rb_econv_t *);
 
+/* vm.c */
+void rb_free_transcoder_table(void);
+
 #endif /* INTERNAL_TRANSCODE_H */
diff --git a/internal/variable.h b/internal/variable.h
index c467489b77baaa..bbf3243fe94283 100644
--- a/internal/variable.h
+++ b/internal/variable.h
@@ -13,21 +13,22 @@
 #include "constant.h"           /* for rb_const_entry_t */
 #include "ruby/internal/stdbool.h"     /* for bool */
 #include "ruby/ruby.h"          /* for VALUE */
-#include "shape.h"              /* for rb_shape_t */
+#include "shape.h"              /* for shape_id_t */
 
 /* variable.c */
 void rb_gc_mark_global_tbl(void);
 void rb_gc_update_global_tbl(void);
-size_t rb_generic_ivar_memsize(VALUE);
 VALUE rb_search_class_path(VALUE);
 VALUE rb_attr_delete(VALUE, ID);
 void rb_autoload_str(VALUE mod, ID id, VALUE file);
 VALUE rb_autoload_at_p(VALUE, ID, int);
+void rb_autoload_copy_table_for_namespace(st_table *, const rb_namespace_t *);
 NORETURN(VALUE rb_mod_const_missing(VALUE,VALUE));
 rb_gvar_getter_t *rb_gvar_getter_function_of(ID);
 rb_gvar_setter_t *rb_gvar_setter_function_of(ID);
 void rb_gvar_readonly_setter(VALUE v, ID id, VALUE *_);
 void rb_gvar_ractor_local(const char *name);
+void rb_gvar_namespace_ready(const char *name);
 
 /**
  * Sets the name of a module.
@@ -45,17 +46,21 @@ void rb_gvar_ractor_local(const char *name);
  */
 VALUE rb_mod_set_temporary_name(VALUE, VALUE);
 
-struct gen_ivtbl;
-int rb_gen_ivtbl_get(VALUE obj, ID id, struct gen_ivtbl **ivtbl);
-int rb_obj_evacuate_ivs_to_hash_table(ID key, VALUE val, st_data_t arg);
+int rb_gen_fields_tbl_get(VALUE obj, ID id, VALUE *fields_obj);
+void rb_obj_copy_ivs_to_hash_table(VALUE obj, st_table *table);
+void rb_obj_init_too_complex(VALUE obj, st_table *table);
+void rb_evict_ivars_to_hash(VALUE obj);
+shape_id_t rb_evict_fields_to_hash(VALUE obj);
+VALUE rb_obj_field_get(VALUE obj, shape_id_t target_shape_id);
+void rb_ivar_set_internal(VALUE obj, ID id, VALUE val);
+void rb_obj_field_set(VALUE obj, shape_id_t target_shape_id, ID field_name, VALUE val);
 
 RUBY_SYMBOL_EXPORT_BEGIN
 /* variable.c (export) */
-void rb_mark_and_update_generic_ivar(VALUE);
-void rb_mv_generic_ivar(VALUE src, VALUE dst);
+void rb_mark_generic_ivar(VALUE obj);
 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);
+bool rb_class_ivar_set(VALUE klass, ID vid, VALUE value);
+void rb_fields_tbl_copy(VALUE dst, VALUE src);
 RUBY_SYMBOL_EXPORT_END
 
 VALUE rb_ivar_lookup(VALUE obj, ID id, VALUE undef);
@@ -63,9 +68,7 @@ VALUE rb_gvar_get(ID);
 VALUE rb_gvar_set(ID, VALUE);
 VALUE rb_gvar_defined(ID);
 void rb_const_warn_if_deprecated(const rb_const_entry_t *, VALUE, ID);
-rb_shape_t * rb_grow_iv_list(VALUE obj);
-void rb_ensure_iv_list_size(VALUE obj, uint32_t len, uint32_t newsize);
-struct gen_ivtbl *rb_ensure_generic_iv_list_size(VALUE obj, rb_shape_t *shape, uint32_t newsize);
+void rb_ensure_iv_list_size(VALUE obj, uint32_t current_len, uint32_t newsize);
 attr_index_t rb_obj_ivar_set(VALUE obj, ID id, VALUE val);
 
 #endif /* INTERNAL_VARIABLE_H */
diff --git a/internal/vm.h b/internal/vm.h
index a89af3d9a99e89..3ee958a020f474 100644
--- a/internal/vm.h
+++ b/internal/vm.h
@@ -45,25 +45,24 @@ VALUE rb_vm_push_frame_fname(struct rb_execution_context_struct *ec, VALUE fname
 /* vm.c */
 VALUE rb_obj_is_thread(VALUE obj);
 void rb_vm_mark(void *ptr);
+void rb_vm_register_global_object(VALUE obj);
 void rb_vm_each_stack_value(void *ptr, void (*cb)(VALUE, void*), void *ctx);
 PUREFUNC(VALUE rb_vm_top_self(void));
 const void **rb_vm_get_insns_address_table(void);
 VALUE rb_source_location(int *pline);
 const char *rb_source_location_cstr(int *pline);
 void rb_vm_pop_cfunc_frame(void);
-int rb_vm_add_root_module(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);
 VALUE ruby_vm_special_exception_copy(VALUE);
-PUREFUNC(st_table *rb_vm_fstring_table(void));
+
+void rb_lastline_set_up(VALUE val, unsigned int up);
 
 /* 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);
@@ -75,12 +74,21 @@ 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);
 void rb_check_stack_overflow(void);
+#define RB_BLOCK_NO_USE_PACKED_ARGS 2
+VALUE rb_block_call2(VALUE obj, ID mid, int argc, const VALUE *argv, rb_block_call_func_t bl_proc, VALUE data2, long flags);
+struct vm_ifunc *rb_current_ifunc(void);
+VALUE rb_gccct_clear_table(VALUE);
 
 #if USE_YJIT
 /* vm_exec.c */
 extern uint64_t rb_vm_insns_count;
 #endif
 
+extern bool rb_free_at_exit;
+
+/* miniinit.c and builtin.c */
+void rb_free_loaded_builtin_table(void);
+
 /* vm_insnhelper.c */
 VALUE rb_equal_opt(VALUE obj1, VALUE obj2);
 VALUE rb_eql_opt(VALUE obj1, VALUE obj2);
@@ -89,13 +97,12 @@ struct rb_iseq_struct;
 const struct rb_callcache *rb_vm_search_method_slowpath(const struct rb_callinfo *ci, VALUE klass);
 
 /* vm_method.c */
-struct rb_execution_context_struct;
 int rb_ec_obj_respond_to(struct rb_execution_context_struct *ec, VALUE obj, ID id, int priv);
 
 void rb_clear_constant_cache(void);
 
 /* vm_dump.c */
-void rb_print_backtrace(void);
+void rb_print_backtrace(FILE *);
 
 /* vm_backtrace.c */
 VALUE rb_vm_thread_backtrace(int argc, const VALUE *argv, VALUE thval);
@@ -103,17 +110,17 @@ VALUE rb_vm_thread_backtrace_locations(int argc, const VALUE *argv, VALUE thval)
 VALUE rb_vm_backtrace(int argc, const VALUE * argv, struct rb_execution_context_struct * ec);
 VALUE rb_vm_backtrace_locations(int argc, const VALUE * argv, struct rb_execution_context_struct * ec);
 VALUE rb_make_backtrace(void);
-void rb_backtrace_print_as_bugreport(void);
+void rb_backtrace_print_as_bugreport(FILE*);
 int rb_backtrace_p(VALUE obj);
 VALUE rb_backtrace_to_str_ary(VALUE obj);
 VALUE rb_backtrace_to_location_ary(VALUE obj);
+VALUE rb_location_ary_to_backtrace(VALUE ary);
 void rb_backtrace_each(VALUE (*iter)(VALUE recv, VALUE str), VALUE output);
 int rb_frame_info_p(VALUE obj);
 int rb_get_node_id_from_frame_info(VALUE obj);
 const struct rb_iseq_struct *rb_get_iseq_from_frame_info(VALUE obj);
 
 VALUE rb_ec_backtrace_object(const struct rb_execution_context_struct *ec);
-void rb_backtrace_use_iseq_first_lineno_for_last_location(VALUE self);
 
 #define RUBY_DTRACE_CREATE_HOOK(name, arg) \
     RUBY_DTRACE_HOOK(name##_CREATE, arg)
diff --git a/io.c b/io.c
index f0432142d38db9..9dcfff76a33522 100644
--- a/io.c
+++ b/io.c
@@ -104,6 +104,16 @@
 
 #ifdef HAVE_COPYFILE_H
 # include <copyfile.h>
+
+# ifndef COPYFILE_STATE_COPIED
+/*
+ * Some OSes (e.g., OSX < 10.6) implement fcopyfile() but not
+ * COPYFILE_STATE_COPIED.  Since the only use of the former here
+ * requires the latter, we disable the former when the latter is undefined.
+ */
+#   undef HAVE_FCOPYFILE
+# endif
+
 #endif
 
 #include "ruby/internal/stdbool.h"
@@ -112,6 +122,7 @@
 #include "encindex.h"
 #include "id.h"
 #include "internal.h"
+#include "internal/class.h"
 #include "internal/encoding.h"
 #include "internal/error.h"
 #include "internal/inits.h"
@@ -170,6 +181,7 @@ off_t __syscall(quad_t number, ...);
 #define open	rb_w32_uopen
 #undef rename
 #define rename(f, t)	rb_w32_urename((f), (t))
+#include "win32/file.h"
 #endif
 
 VALUE rb_cIO;
@@ -208,7 +220,18 @@ static VALUE sym_DATA;
 static VALUE sym_HOLE;
 #endif
 
-static VALUE prep_io(int fd, int fmode, VALUE klass, const char *path);
+static VALUE prep_io(int fd, enum rb_io_mode fmode, VALUE klass, const char *path);
+
+VALUE
+rb_io_blocking_region_wait(struct rb_io *io, rb_blocking_function_t *function, void *argument, enum rb_io_event events)
+{
+    return rb_thread_io_blocking_call(io, function, argument, events);
+}
+
+VALUE rb_io_blocking_region(struct rb_io *io, rb_blocking_function_t *function, void *argument)
+{
+    return rb_io_blocking_region_wait(io, function, argument, 0);
+}
 
 struct argf {
     VALUE filename, current_file;
@@ -518,7 +541,8 @@ rb_cloexec_fcntl_dupfd(int fd, int minfd)
 #endif
 
 static int io_fflush(rb_io_t *);
-static rb_io_t *flush_before_seek(rb_io_t *fptr);
+static rb_io_t *flush_before_seek(rb_io_t *fptr, bool discard_rbuf);
+static void clear_codeconv(rb_io_t *fptr);
 
 #define FMODE_SIGNAL_ON_EPIPE (1<<17)
 
@@ -532,10 +556,12 @@ static rb_io_t *flush_before_seek(rb_io_t *fptr);
 
 extern ID ruby_static_id_signo;
 
-NORETURN(static void raise_on_write(rb_io_t *fptr, int e, VALUE errinfo));
+NORETURN(static void rb_sys_fail_on_write(rb_io_t *fptr));
 static void
-raise_on_write(rb_io_t *fptr, int e, VALUE errinfo)
+rb_sys_fail_on_write(rb_io_t *fptr)
 {
+    int e = errno;
+    VALUE errinfo = rb_syserr_new_path(e, (fptr)->pathv);
 #if defined EPIPE
     if (fptr_signal_on_epipe(fptr) && (e == EPIPE)) {
         const VALUE sig =
@@ -549,12 +575,6 @@ raise_on_write(rb_io_t *fptr, int e, VALUE errinfo)
     rb_exc_raise(errinfo);
 }
 
-#define rb_sys_fail_on_write(fptr) \
-    do { \
-        int e = errno; \
-        raise_on_write(fptr, e, rb_syserr_new_path(e, (fptr)->pathv)); \
-    } while (0)
-
 #define NEED_NEWLINE_DECORATOR_ON_READ(fptr) ((fptr)->mode & FMODE_TEXTMODE)
 #define NEED_NEWLINE_DECORATOR_ON_WRITE(fptr) ((fptr)->mode & FMODE_TEXTMODE)
 #if defined(RUBY_TEST_CRLF_ENVIRONMENT) || defined(_WIN32)
@@ -607,7 +627,7 @@ raise_on_write(rb_io_t *fptr, int e, VALUE errinfo)
  * IO unread with taking care of removed '\r' in text mode.
  */
 static void
-io_unread(rb_io_t *fptr)
+io_unread(rb_io_t *fptr, bool discard_rbuf)
 {
     rb_off_t r, pos;
     ssize_t read_size;
@@ -628,19 +648,17 @@ io_unread(rb_io_t *fptr)
         if (r < 0 && errno) {
             if (errno == ESPIPE)
                 fptr->mode |= FMODE_DUPLEX;
-            return;
+            if (!discard_rbuf) return;
         }
 
-        fptr->rbuf.off = 0;
-        fptr->rbuf.len = 0;
-        return;
+        goto end;
     }
 
     pos = lseek(fptr->fd, 0, SEEK_CUR);
     if (pos < 0 && errno) {
         if (errno == ESPIPE)
             fptr->mode |= FMODE_DUPLEX;
-        return;
+        if (!discard_rbuf) goto end;
     }
 
     /* add extra offset for removed '\r' in rbuf */
@@ -681,8 +699,10 @@ io_unread(rb_io_t *fptr)
         }
     }
     free(buf);
+  end:
     fptr->rbuf.off = 0;
     fptr->rbuf.len = 0;
+    clear_codeconv(fptr);
     return;
 }
 
@@ -701,7 +721,7 @@ set_binary_mode_with_seek_cur(rb_io_t *fptr)
     if (fptr->rbuf.len == 0 || fptr->mode & FMODE_DUPLEX) {
         return setmode(fptr->fd, O_BINARY);
     }
-    flush_before_seek(fptr);
+    flush_before_seek(fptr, false);
     return setmode(fptr->fd, O_BINARY);
 }
 #define SET_BINARY_MODE_WITH_SEEK_CUR(fptr) set_binary_mode_with_seek_cur(fptr)
@@ -897,7 +917,7 @@ rb_io_s_try_convert(VALUE dummy, VALUE io)
 
 #if !RUBY_CRLF_ENVIRONMENT
 static void
-io_unread(rb_io_t *fptr)
+io_unread(rb_io_t *fptr, bool discard_rbuf)
 {
     rb_off_t r;
     rb_io_check_closed(fptr);
@@ -909,10 +929,11 @@ io_unread(rb_io_t *fptr)
     if (r < 0 && errno) {
         if (errno == ESPIPE)
             fptr->mode |= FMODE_DUPLEX;
-        return;
+        if (!discard_rbuf) return;
     }
     fptr->rbuf.off = 0;
     fptr->rbuf.len = 0;
+    clear_codeconv(fptr);
     return;
 }
 #endif
@@ -953,17 +974,17 @@ io_ungetbyte(VALUE str, rb_io_t *fptr)
 }
 
 static rb_io_t *
-flush_before_seek(rb_io_t *fptr)
+flush_before_seek(rb_io_t *fptr, bool discard_rbuf)
 {
     if (io_fflush(fptr) < 0)
         rb_sys_fail_on_write(fptr);
-    io_unread(fptr);
+    io_unread(fptr, discard_rbuf);
     errno = 0;
     return fptr;
 }
 
-#define io_seek(fptr, ofs, whence) (errno = 0, lseek(flush_before_seek(fptr)->fd, (ofs), (whence)))
-#define io_tell(fptr) lseek(flush_before_seek(fptr)->fd, 0, SEEK_CUR)
+#define io_seek(fptr, ofs, whence) (errno = 0, lseek(flush_before_seek(fptr, true)->fd, (ofs), (whence)))
+#define io_tell(fptr) lseek(flush_before_seek(fptr, false)->fd, 0, SEEK_CUR)
 
 #ifndef SEEK_CUR
 # define SEEK_SET 0
@@ -1031,7 +1052,7 @@ rb_io_check_writable(rb_io_t *fptr)
         rb_raise(rb_eIOError, "not opened for writing");
     }
     if (fptr->rbuf.len) {
-        io_unread(fptr);
+        io_unread(fptr, true);
     }
 }
 
@@ -1145,6 +1166,11 @@ static int nogvl_wait_for(VALUE th, rb_io_t *fptr, short events, struct timeval
 static inline int
 io_internal_wait(VALUE thread, rb_io_t *fptr, int error, int events, struct timeval *timeout)
 {
+    if (!timeout && rb_thread_mn_schedulable(thread)) {
+        RUBY_ASSERT(errno == EWOULDBLOCK || errno == EAGAIN);
+        return -1;
+    }
+
     int ready = nogvl_wait_for(thread, fptr, events, timeout);
 
     if (ready > 0) {
@@ -1155,8 +1181,15 @@ io_internal_wait(VALUE thread, rb_io_t *fptr, int error, int events, struct time
         return -1;
     }
 
-    errno = error;
-    return -1;
+    // If there was an error BEFORE we started waiting, return it:
+    if (error) {
+        errno = error;
+        return -1;
+    }
+    else {
+        // Otherwise, whatever error was generated by `nogvl_wait_for` is the one we want:
+        return ready;
+    }
 }
 
 static VALUE
@@ -1285,7 +1318,7 @@ rb_io_read_memory(rb_io_t *fptr, void *buf, size_t count)
         iis.timeout = &timeout_storage;
     }
 
-    return (ssize_t)rb_thread_io_blocking_region(internal_read_func, &iis, fptr->fd);
+    return (ssize_t)rb_io_blocking_region_wait(fptr, internal_read_func, &iis, RUBY_IO_READABLE);
 }
 
 static ssize_t
@@ -1318,7 +1351,7 @@ rb_io_write_memory(rb_io_t *fptr, const void *buf, size_t count)
         iis.timeout = &timeout_storage;
     }
 
-    return (ssize_t)rb_thread_io_blocking_region(internal_write_func, &iis, fptr->fd);
+    return (ssize_t)rb_io_blocking_region_wait(fptr, internal_write_func, &iis, RUBY_IO_WRITABLE);
 }
 
 #ifdef HAVE_WRITEV
@@ -1355,7 +1388,7 @@ rb_writev_internal(rb_io_t *fptr, const struct iovec *iov, int iovcnt)
         iis.timeout = &timeout_storage;
     }
 
-    return (ssize_t)rb_thread_io_blocking_region(internal_writev_func, &iis, fptr->fd);
+    return (ssize_t)rb_io_blocking_region_wait(fptr, internal_writev_func, &iis, RUBY_IO_WRITABLE);
 }
 #endif
 
@@ -1385,7 +1418,7 @@ static VALUE
 io_flush_buffer_async(VALUE arg)
 {
     rb_io_t *fptr = (rb_io_t *)arg;
-    return rb_thread_io_blocking_region(io_flush_buffer_sync, fptr, fptr->fd);
+    return rb_io_blocking_region_wait(fptr, io_flush_buffer_sync, fptr, RUBY_IO_WRITABLE);
 }
 
 static inline int
@@ -1441,7 +1474,7 @@ rb_io_wait(VALUE io, VALUE events, VALUE timeout)
         tv = &tv_storage;
     }
 
-    int ready = rb_thread_wait_for_single_fd(fptr->fd, RB_NUM2INT(events), tv);
+    int ready = rb_thread_io_wait(fptr, RB_NUM2INT(events), tv);
 
     if (ready < 0) {
         rb_sys_fail(0);
@@ -1610,7 +1643,7 @@ rb_io_maybe_wait(int error, VALUE io, VALUE events, VALUE timeout)
 
       default:
         // Non-specific error, no event is ready:
-        return Qfalse;
+        return Qnil;
     }
 }
 
@@ -1622,9 +1655,11 @@ rb_io_maybe_wait_readable(int error, VALUE io, VALUE timeout)
     if (RTEST(result)) {
         return RB_NUM2INT(result);
     }
-    else {
-        return 0;
+    else if (result == RUBY_Qfalse) {
+        rb_raise(rb_eIOTimeoutError, "Timed out waiting for IO to become readable!");
     }
+
+    return 0;
 }
 
 int
@@ -1635,9 +1670,11 @@ rb_io_maybe_wait_writable(int error, VALUE io, VALUE timeout)
     if (RTEST(result)) {
         return RB_NUM2INT(result);
     }
-    else {
-        return 0;
+    else if (result == RUBY_Qfalse) {
+        rb_raise(rb_eIOTimeoutError, "Timed out waiting for IO to become writable!");
     }
+
+    return 0;
 }
 
 static void
@@ -1698,7 +1735,6 @@ make_writeconv(rb_io_t *fptr)
 /* writing functions */
 struct binwrite_arg {
     rb_io_t *fptr;
-    VALUE str;
     const char *ptr;
     long length;
 };
@@ -1794,13 +1830,11 @@ io_binwrite_string(VALUE arg)
         // Write as much as possible:
         ssize_t result = io_binwrite_string_internal(p->fptr, ptr, remaining);
 
-        // If only the internal buffer is written, result will be zero [bytes of given data written]. This means we
-        // should try again.
         if (result == 0) {
-            errno = EWOULDBLOCK;
+            // If only the internal buffer is written, result will be zero [bytes of given data written]. This means we
+            // should try again immediately.
         }
-
-        if (result > 0) {
+        else if (result > 0) {
             if ((size_t)result == remaining) break;
             ptr += result;
             remaining -= result;
@@ -1850,7 +1884,7 @@ io_binwrite_requires_flush_write(rb_io_t *fptr, long len, int nosync)
 }
 
 static long
-io_binwrite(VALUE str, const char *ptr, long len, rb_io_t *fptr, int nosync)
+io_binwrite(const char *ptr, long len, rb_io_t *fptr, int nosync)
 {
     if (len <= 0) return len;
 
@@ -1863,7 +1897,6 @@ io_binwrite(VALUE str, const char *ptr, long len, rb_io_t *fptr, int nosync)
         struct binwrite_arg arg;
 
         arg.fptr = fptr;
-        arg.str = str;
         arg.ptr = ptr;
         arg.length = len;
 
@@ -1971,9 +2004,9 @@ io_fwrite(VALUE str, rb_io_t *fptr, int nosync)
     if (converted)
         OBJ_FREEZE(str);
 
-    tmp = rb_str_tmp_frozen_acquire(str);
+    tmp = rb_str_tmp_frozen_no_embed_acquire(str);
     RSTRING_GETMEM(tmp, ptr, len);
-    n = io_binwrite(tmp, ptr, len, fptr, nosync);
+    n = io_binwrite(ptr, len, fptr, nosync);
     rb_str_tmp_frozen_release(str, tmp);
 
     return n;
@@ -1986,7 +2019,7 @@ rb_io_bufwrite(VALUE io, const void *buf, size_t size)
 
     GetOpenFile(io, fptr);
     rb_io_check_writable(fptr);
-    return (ssize_t)io_binwrite(0, buf, (long)size, fptr, 0);
+    return (ssize_t)io_binwrite(buf, (long)size, fptr, 0);
 }
 
 static VALUE
@@ -2278,7 +2311,7 @@ rb_io_writev(VALUE io, int argc, const VALUE *argv)
     if (argc > 1 && rb_obj_method_arity(io, id_write) == 1) {
         if (io != rb_ractor_stderr() && RTEST(ruby_verbose)) {
             VALUE klass = CLASS_OF(io);
-            char sep = FL_TEST(klass, FL_SINGLETON) ? (klass = io, '.') : '#';
+            char sep = RCLASS_SINGLETON_P(klass) ? (klass = io, '.') : '#';
             rb_category_warning(
                 RB_WARN_CATEGORY_DEPRECATED, "%+"PRIsVALUE"%c""write is outdated interface"
                 " which accepts just one argument",
@@ -2352,7 +2385,7 @@ rb_io_flush_raw(VALUE io, int sync)
             rb_sys_fail_on_write(fptr);
     }
     if (fptr->mode & FMODE_READABLE) {
-        io_unread(fptr);
+        io_unread(fptr, true);
     }
 
     return io;
@@ -2672,7 +2705,7 @@ rb_io_eof(VALUE io)
     READ_CHECK(fptr);
 #if RUBY_CRLF_ENVIRONMENT
     if (!NEED_READCONV(fptr) && NEED_NEWLINE_DECORATOR_ON_READ(fptr)) {
-        return RBOOL(eof(fptr->fd));;
+        return RBOOL(eof(fptr->fd));
     }
 #endif
     return RBOOL(io_fillbuf(fptr) < 0);
@@ -2775,8 +2808,10 @@ rb_io_fsync(VALUE io)
 
     if (io_fflush(fptr) < 0)
         rb_sys_fail_on_write(fptr);
-    if ((int)rb_thread_io_blocking_region(nogvl_fsync, fptr, fptr->fd) < 0)
+
+    if ((int)rb_io_blocking_region(fptr, nogvl_fsync, fptr))
         rb_sys_fail_path(fptr->pathv);
+
     return INT2FIX(0);
 }
 #else
@@ -2825,7 +2860,7 @@ rb_io_fdatasync(VALUE io)
     if (io_fflush(fptr) < 0)
         rb_sys_fail_on_write(fptr);
 
-    if ((int)rb_thread_io_blocking_region(nogvl_fdatasync, fptr, fptr->fd) == 0)
+    if ((int)rb_io_blocking_region(fptr, nogvl_fdatasync, fptr) == 0)
         return INT2FIX(0);
 
     /* fall back */
@@ -2869,8 +2904,15 @@ rb_io_descriptor(VALUE io)
         return fptr->fd;
     }
     else {
-        return RB_NUM2INT(rb_funcall(io, id_fileno, 0));
+        VALUE fileno = rb_check_funcall(io, id_fileno, 0, NULL);
+        if (!UNDEF_P(fileno)) {
+            return RB_NUM2INT(fileno);
+        }
     }
+
+    rb_raise(rb_eTypeError, "expected IO or #fileno, %"PRIsVALUE" given", rb_obj_class(io));
+
+    UNREACHABLE_RETURN(-1);
 }
 
 int
@@ -3268,9 +3310,10 @@ io_setstrbuf(VALUE *str, long len)
     }
     else {
         VALUE s = StringValue(*str);
+        rb_str_modify(s);
+
         long clen = RSTRING_LEN(s);
         if (clen >= len) {
-            rb_str_modify(s);
             return FALSE;
         }
         len -= clen;
@@ -3401,7 +3444,12 @@ io_read_memory_call(VALUE arg)
         }
     }
 
-    return rb_thread_io_blocking_region(internal_read_func, iis, iis->fptr->fd);
+    if (iis->nonblock) {
+        return rb_io_blocking_region(iis->fptr, internal_read_func, iis);
+    }
+    else {
+        return rb_io_blocking_region_wait(iis->fptr, internal_read_func, iis, RUBY_IO_READABLE);
+    }
 }
 
 static long
@@ -3808,8 +3856,33 @@ rscheck(const char *rsptr, long rslen, VALUE rs)
         rb_raise(rb_eRuntimeError, "rs modified");
 }
 
+static const char *
+search_delim(const char *p, long len, int delim, rb_encoding *enc)
+{
+    if (rb_enc_mbminlen(enc) == 1) {
+        p = memchr(p, delim, len);
+        if (p) return p + 1;
+    }
+    else {
+        const char *end = p + len;
+        while (p < end) {
+            int r = rb_enc_precise_mbclen(p, end, enc);
+            if (!MBCLEN_CHARFOUND_P(r)) {
+                p += rb_enc_mbminlen(enc);
+                continue;
+            }
+            int n = MBCLEN_CHARFOUND_LEN(r);
+            if (rb_enc_mbc_to_codepoint(p, end, enc) == (unsigned int)delim) {
+                return p + n;
+            }
+            p += n;
+        }
+    }
+    return NULL;
+}
+
 static int
-appendline(rb_io_t *fptr, int delim, VALUE *strp, long *lp)
+appendline(rb_io_t *fptr, int delim, VALUE *strp, long *lp, rb_encoding *enc)
 {
     VALUE str = *strp;
     long limit = *lp;
@@ -3824,9 +3897,9 @@ appendline(rb_io_t *fptr, int delim, VALUE *strp, long *lp)
                 p = READ_CHAR_PENDING_PTR(fptr);
                 if (0 < limit && limit < searchlen)
                     searchlen = (int)limit;
-                e = memchr(p, delim, searchlen);
+                e = search_delim(p, searchlen, delim, enc);
                 if (e) {
-                    int len = (int)(e-p+1);
+                    int len = (int)(e-p);
                     if (NIL_P(str))
                         *strp = str = rb_str_new(p, len);
                     else
@@ -3866,8 +3939,8 @@ appendline(rb_io_t *fptr, int delim, VALUE *strp, long *lp)
             long last;
 
             if (limit > 0 && pending > limit) pending = limit;
-            e = memchr(p, delim, pending);
-            if (e) pending = e - p + 1;
+            e = search_delim(p, pending, delim, enc);
+            if (e) pending = e - p;
             if (!NIL_P(str)) {
                 last = RSTRING_LEN(str);
                 rb_str_resize(str, last + pending);
@@ -4122,21 +4195,31 @@ rb_io_getline_0(VALUE rs, long limit, int chomp, rb_io_t *fptr)
                 rs = 0;
                 if (!rb_enc_asciicompat(enc)) {
                     rs = rb_usascii_str_new(rsptr, rslen);
-                    rs = rb_str_encode(rs, rb_enc_from_encoding(enc), 0, Qnil);
+                    rs = rb_str_conv_enc(rs, 0, enc);
                     OBJ_FREEZE(rs);
                     rsptr = RSTRING_PTR(rs);
                     rslen = RSTRING_LEN(rs);
                 }
+                newline = '\n';
+            }
+            else if (rb_enc_mbminlen(enc) == 1) {
+                 rsptr = RSTRING_PTR(rs);
+                 newline = (unsigned char)rsptr[rslen - 1];
             }
             else {
+                rs = rb_str_conv_enc(rs, 0, enc);
                 rsptr = RSTRING_PTR(rs);
+                const char *e = rsptr + rslen;
+                const char *last = rb_enc_prev_char(rsptr, e, e, enc);
+                int n;
+                newline = rb_enc_codepoint_len(last, e, &n, enc);
+                if (last + n != e) rb_raise(rb_eArgError, "broken separator");
             }
-            newline = (unsigned char)rsptr[rslen - 1];
-            chomp_cr = chomp && rslen == 1 && newline == '\n';
+            chomp_cr = chomp && newline == '\n' && rslen == rb_enc_mbminlen(enc);
         }
 
         /* MS - Optimization */
-        while ((c = appendline(fptr, newline, &str, &limit)) != EOF) {
+        while ((c = appendline(fptr, newline, &str, &limit, enc)) != EOF) {
             const char *s, *p, *pp, *e;
 
             if (c == newline) {
@@ -4157,8 +4240,8 @@ rb_io_getline_0(VALUE rs, long limit, int chomp, rb_io_t *fptr)
             if (limit == 0) {
                 s = RSTRING_PTR(str);
                 p = RSTRING_END(str);
-                pp = rb_enc_left_char_head(s, p-1, p, enc);
-                if (extra_limit &&
+                pp = rb_enc_prev_char(s, p, p, enc);
+                if (extra_limit && pp &&
                     MBCLEN_NEEDMORE_P(rb_enc_precise_mbclen(pp, p, enc))) {
                     /* relax the limit while incomplete character.
                      * extra_limit limits the relax length */
@@ -4285,11 +4368,8 @@ rb_io_gets_internal(VALUE io)
  *    File.open('t.txt') {|f| f.gets(12) } # => "First line\n"
  *
  *  With arguments +sep+ and +limit+ given,
- *  combines the two behaviors:
- *
- *  - Returns the next line as determined by line separator +sep+,
- *    or +nil+ if none.
- *  - But returns no more bytes than are allowed by the limit.
+ *  combines the two behaviors
+ *  (see {Line Separator and Line Limit}[rdoc-ref:IO@Line+Separator+and+Line+Limit]).
  *
  *  Optional keyword argument +chomp+ specifies whether line separators
  *  are to be omitted:
@@ -4356,22 +4436,36 @@ rb_io_set_lineno(VALUE io, VALUE lineno)
     return lineno;
 }
 
-/*
- *  call-seq:
- *    readline(sep = $/, chomp: false)   -> string
- *    readline(limit, chomp: false)      -> string
- *    readline(sep, limit, chomp: false) -> string
- *
- *  Reads a line as with IO#gets, but raises EOFError if already at end-of-stream.
- *
- *  Optional keyword argument +chomp+ specifies whether line separators
- *  are to be omitted.
- */
-
+/* :nodoc: */
 static VALUE
-rb_io_readline(int argc, VALUE *argv, VALUE io)
+io_readline(rb_execution_context_t *ec, VALUE io, VALUE sep, VALUE lim, VALUE chomp)
 {
-    VALUE line = rb_io_gets_m(argc, argv, io);
+    long limit = -1;
+    if (NIL_P(lim)) {
+        VALUE tmp = Qnil;
+        // If sep is specified, but it's not a string and not nil, then assume
+        // it's the limit (it should be an integer)
+        if (!NIL_P(sep) && NIL_P(tmp = rb_check_string_type(sep))) {
+            // If the user has specified a non-nil / non-string value
+            // for the separator, we assume it's the limit and set the
+            // separator to default: rb_rs.
+            lim = sep;
+            limit = NUM2LONG(lim);
+            sep = rb_rs;
+        }
+        else {
+            sep = tmp;
+        }
+    }
+    else {
+        if (!NIL_P(sep)) StringValue(sep);
+        limit = NUM2LONG(lim);
+    }
+
+    check_getline_args(&sep, &limit, io);
+
+    VALUE line = rb_io_getline_1(sep, limit, RTEST(chomp), io);
+    rb_lastline_set_up(line, 1);
 
     if (NIL_P(line)) {
         rb_eof_error();
@@ -4432,10 +4526,8 @@ static VALUE io_readlines(const struct getline_arg *arg, VALUE io);
  *    f.close
  *
  *  With arguments +sep+ and +limit+ given,
- *  combines the two behaviors:
- *
- *  - Returns lines as determined by line separator +sep+.
- *  - But returns no more bytes in a line than are allowed by the limit.
+ *  combines the two behaviors
+ *  (see {Line Separator and Line Limit}[rdoc-ref:IO@Line+Separator+and+Line+Limit]).
  *
  *  Optional keyword argument +chomp+ specifies whether line separators
  *  are to be omitted:
@@ -4555,10 +4647,8 @@ io_readlines(const struct getline_arg *arg, VALUE io)
  *    "ne\n"
  *
  *  With arguments +sep+ and +limit+ given,
- *  combines the two behaviors:
- *
- *  - Calls with the next line as determined by line separator +sep+.
- *  - But returns no more bytes than are allowed by the limit.
+ *  combines the two behaviors
+ *  (see {Line Separator and Line Limit}[rdoc-ref:IO@Line+Separator+and+Line+Limit]).
  *
  *  Optional keyword argument +chomp+ specifies whether line separators
  *  are to be omitted:
@@ -5096,7 +5186,7 @@ rb_io_ungetbyte(VALUE io, VALUE b)
         b = rb_str_new((const char *)&c, 1);
         break;
       default:
-        SafeStringValue(b);
+        StringValue(b);
     }
     io_ungetbyte(b, fptr);
     return Qnil;
@@ -5158,7 +5248,7 @@ rb_io_ungetc(VALUE io, VALUE c)
         c = rb_enc_uint_chr(NUM2UINT(c), io_read_encoding(fptr));
     }
     else {
-        SafeStringValue(c);
+        StringValue(c);
     }
     if (NEED_READCONV(fptr)) {
         SET_BINARY_MODE(fptr);
@@ -5404,7 +5494,7 @@ maygvl_close(int fd, int keepgvl)
      * close() may block for certain file types (NFS, SO_LINGER sockets,
      * inotify), so let other threads run.
      */
-    return (int)(intptr_t)rb_thread_call_without_gvl(nogvl_close, &fd, RUBY_UBF_IO, 0);
+    return IO_WITHOUT_GVL_INT(nogvl_close, &fd);
 }
 
 static void*
@@ -5421,15 +5511,13 @@ maygvl_fclose(FILE *file, int keepgvl)
     if (keepgvl)
         return fclose(file);
 
-    return (int)(intptr_t)rb_thread_call_without_gvl(nogvl_fclose, file, RUBY_UBF_IO, 0);
+    return IO_WITHOUT_GVL_INT(nogvl_fclose, file);
 }
 
 static void free_io_buffer(rb_io_buffer_t *buf);
-static void clear_codeconv(rb_io_t *fptr);
 
 static void
-fptr_finalize_flush(rb_io_t *fptr, int noraise, int keepgvl,
-                    struct rb_io_close_wait_list *busy)
+fptr_finalize_flush(rb_io_t *fptr, int noraise, int keepgvl)
 {
     VALUE error = Qnil;
     int fd = fptr->fd;
@@ -5469,11 +5557,8 @@ fptr_finalize_flush(rb_io_t *fptr, int noraise, int keepgvl,
     fptr->stdio_file = 0;
     fptr->mode &= ~(FMODE_READABLE|FMODE_WRITABLE);
 
-    // Ensure waiting_fd users do not hit EBADF.
-    if (busy) {
-        // Wait for them to exit before we call close().
-        rb_notify_fd_close_wait(busy);
-    }
+    // wait for blocking operations to ensure they do not hit EBADF:
+    rb_thread_io_close_wait(fptr);
 
     // Disable for now.
     // if (!done && fd >= 0) {
@@ -5521,7 +5606,7 @@ fptr_finalize_flush(rb_io_t *fptr, int noraise, int keepgvl,
 static void
 fptr_finalize(rb_io_t *fptr, int noraise)
 {
-    fptr_finalize_flush(fptr, noraise, FALSE, 0);
+    fptr_finalize_flush(fptr, noraise, FALSE);
     free_io_buffer(&fptr->rbuf);
     free_io_buffer(&fptr->wbuf);
     clear_codeconv(fptr);
@@ -5574,12 +5659,9 @@ clear_codeconv(rb_io_t *fptr)
     clear_writeconv(fptr);
 }
 
-void
-rb_io_fptr_finalize_internal(void *ptr)
+static void
+rb_io_fptr_cleanup_all(rb_io_t *fptr)
 {
-    rb_io_t *fptr = ptr;
-
-    if (!ptr) return;
     fptr->pathv = Qnil;
     if (0 <= fptr->fd)
         rb_io_fptr_cleanup(fptr, TRUE);
@@ -5587,32 +5669,38 @@ rb_io_fptr_finalize_internal(void *ptr)
     free_io_buffer(&fptr->rbuf);
     free_io_buffer(&fptr->wbuf);
     clear_codeconv(fptr);
-    free(fptr);
 }
 
-#undef rb_io_fptr_finalize
 int
-rb_io_fptr_finalize(rb_io_t *fptr)
+rb_io_fptr_finalize(struct rb_io *io)
 {
-    if (!fptr) {
-        return 0;
-    }
-    else {
-        rb_io_fptr_finalize_internal(fptr);
-        return 1;
-    }
+    if (!io) return 0;
+    rb_io_fptr_cleanup_all(io);
+    free(io);
+
+    return 1;
 }
-#define rb_io_fptr_finalize(fptr) rb_io_fptr_finalize_internal(fptr)
 
-RUBY_FUNC_EXPORTED size_t
-rb_io_memsize(const rb_io_t *fptr)
+size_t
+rb_io_memsize(const rb_io_t *io)
 {
     size_t size = sizeof(rb_io_t);
-    size += fptr->rbuf.capa;
-    size += fptr->wbuf.capa;
-    size += fptr->cbuf.capa;
-    if (fptr->readconv) size += rb_econv_memsize(fptr->readconv);
-    if (fptr->writeconv) size += rb_econv_memsize(fptr->writeconv);
+    size += io->rbuf.capa;
+    size += io->wbuf.capa;
+    size += io->cbuf.capa;
+    if (io->readconv) size += rb_econv_memsize(io->readconv);
+    if (io->writeconv) size += rb_econv_memsize(io->writeconv);
+
+    struct rb_io_blocking_operation *blocking_operation = 0;
+
+    // Validate the fork generation of the IO object. If the IO object fork generation is different, the list of blocking operations is not valid memory. See `rb_io_blocking_operations` for the exact semantics.
+    rb_serial_t fork_generation = GET_VM()->fork_gen;
+    if (io->fork_generation == fork_generation) {
+        ccan_list_for_each(&io->blocking_operations, blocking_operation, list) {
+            size += sizeof(struct rb_io_blocking_operation);
+        }
+    }
+
     return size;
 }
 
@@ -5629,7 +5717,6 @@ io_close_fptr(VALUE io)
     rb_io_t *fptr;
     VALUE write_io;
     rb_io_t *write_fptr;
-    struct rb_io_close_wait_list busy;
 
     write_io = GetWriteIO(io);
     if (io != write_io) {
@@ -5643,9 +5730,9 @@ io_close_fptr(VALUE io)
     if (!fptr) return 0;
     if (fptr->fd < 0) return 0;
 
-    if (rb_notify_fd_close(fptr->fd, &busy)) {
+    if (rb_thread_io_close_interrupt(fptr)) {
         /* calls close(fptr->fd): */
-        fptr_finalize_flush(fptr, FALSE, KEEPGVL, &busy);
+        fptr_finalize_flush(fptr, FALSE, KEEPGVL);
     }
     rb_io_fptr_cleanup(fptr, FALSE);
     return fptr;
@@ -5684,6 +5771,9 @@ rb_io_close(VALUE io)
  *  If the stream was opened by IO.popen, sets global variable <tt>$?</tt>
  *  (child exit status).
  *
+ *  It is not an error to close an IO object that has already been closed.
+ *  It just returns nil.
+ *
  *  Example:
  *
  *    IO.popen('ruby', 'r+') do |pipe|
@@ -6067,7 +6157,7 @@ rb_io_sysread(int argc, VALUE *argv, VALUE io)
 }
 
 struct prdwr_internal_arg {
-    VALUE io;
+    struct rb_io *io;
     int fd;
     void *buf;
     size_t count;
@@ -6089,14 +6179,14 @@ pread_internal_call(VALUE _arg)
 
     VALUE scheduler = rb_fiber_scheduler_current();
     if (scheduler != Qnil) {
-        VALUE result = rb_fiber_scheduler_io_pread_memory(scheduler, arg->io, arg->offset, arg->buf, arg->count, 0);
+        VALUE result = rb_fiber_scheduler_io_pread_memory(scheduler, arg->io->self, arg->offset, arg->buf, arg->count, 0);
 
         if (!UNDEF_P(result)) {
             return rb_fiber_scheduler_io_result_apply(result);
         }
     }
 
-    return rb_thread_io_blocking_region(internal_pread_func, arg, arg->fd);
+    return rb_io_blocking_region_wait(arg->io, internal_pread_func, arg, RUBY_IO_READABLE);
 }
 
 /*
@@ -6133,7 +6223,7 @@ rb_io_pread(int argc, VALUE *argv, VALUE io)
     VALUE len, offset, str;
     rb_io_t *fptr;
     ssize_t n;
-    struct prdwr_internal_arg arg = {.io = io};
+    struct prdwr_internal_arg arg;
     int shrinkable;
 
     rb_scan_args(argc, argv, "21", &len, &offset, &str);
@@ -6147,6 +6237,7 @@ rb_io_pread(int argc, VALUE *argv, VALUE io)
     GetOpenFile(io, fptr);
     rb_io_check_byte_readable(fptr);
 
+    arg.io = fptr;
     arg.fd = fptr->fd;
     rb_io_check_closed(fptr);
 
@@ -6171,7 +6262,7 @@ internal_pwrite_func(void *_arg)
 
     VALUE scheduler = rb_fiber_scheduler_current();
     if (scheduler != Qnil) {
-        VALUE result = rb_fiber_scheduler_io_pwrite_memory(scheduler, arg->io, arg->offset, arg->buf, arg->count, 0);
+        VALUE result = rb_fiber_scheduler_io_pwrite_memory(scheduler, arg->io->self, arg->offset, arg->buf, arg->count, 0);
 
         if (!UNDEF_P(result)) {
             return rb_fiber_scheduler_io_result_apply(result);
@@ -6212,7 +6303,7 @@ rb_io_pwrite(VALUE io, VALUE str, VALUE offset)
 {
     rb_io_t *fptr;
     ssize_t n;
-    struct prdwr_internal_arg arg = {.io = io};
+    struct prdwr_internal_arg arg;
     VALUE tmp;
 
     if (!RB_TYPE_P(str, T_STRING))
@@ -6223,13 +6314,15 @@ rb_io_pwrite(VALUE io, VALUE str, VALUE offset)
     io = GetWriteIO(io);
     GetOpenFile(io, fptr);
     rb_io_check_writable(fptr);
+
+    arg.io = fptr;
     arg.fd = fptr->fd;
 
     tmp = rb_str_tmp_frozen_acquire(str);
     arg.buf = RSTRING_PTR(tmp);
     arg.count = (size_t)RSTRING_LEN(tmp);
 
-    n = (ssize_t)rb_thread_io_blocking_region(internal_pwrite_func, &arg, fptr->fd);
+    n = (ssize_t)rb_io_blocking_region_wait(fptr, internal_pwrite_func, &arg, RUBY_IO_WRITABLE);
     if (n < 0) rb_sys_fail_path(fptr->pathv);
     rb_str_tmp_frozen_release(str, tmp);
 
@@ -6334,7 +6427,7 @@ rb_io_binmode_p(VALUE io)
 }
 
 static const char*
-rb_io_fmode_modestr(int fmode)
+rb_io_fmode_modestr(enum rb_io_mode fmode)
 {
     if (fmode & FMODE_APPEND) {
         if ((fmode & FMODE_READWRITE) == FMODE_READWRITE) {
@@ -6368,10 +6461,10 @@ io_encname_bom_p(const char *name, long len)
     return len > bom_prefix_len && STRNCASECMP(name, bom_prefix, bom_prefix_len) == 0;
 }
 
-int
+enum rb_io_mode
 rb_io_modestr_fmode(const char *modestr)
 {
-    int fmode = 0;
+    enum rb_io_mode fmode = 0;
     const char *m = modestr, *p = NULL;
 
     switch (*m++) {
@@ -6428,7 +6521,7 @@ rb_io_modestr_fmode(const char *modestr)
 int
 rb_io_oflags_fmode(int oflags)
 {
-    int fmode = 0;
+    enum rb_io_mode fmode = 0;
 
     switch (oflags & O_ACCMODE) {
       case O_RDONLY:
@@ -6464,7 +6557,7 @@ rb_io_oflags_fmode(int oflags)
 }
 
 static int
-rb_io_fmode_oflags(int fmode)
+rb_io_fmode_oflags(enum rb_io_mode fmode)
 {
     int oflags = 0;
 
@@ -6549,7 +6642,7 @@ rb_io_oflags_modestr(int oflags)
  * Qnil => no encoding specified (internal only)
  */
 static void
-rb_io_ext_int_to_encs(rb_encoding *ext, rb_encoding *intern, rb_encoding **enc, rb_encoding **enc2, int fmode)
+rb_io_ext_int_to_encs(rb_encoding *ext, rb_encoding *intern, rb_encoding **enc, rb_encoding **enc2, enum rb_io_mode fmode)
 {
     int default_ext = 0;
 
@@ -6584,12 +6677,12 @@ unsupported_encoding(const char *name, rb_encoding *enc)
 
 static void
 parse_mode_enc(const char *estr, rb_encoding *estr_enc,
-               rb_encoding **enc_p, rb_encoding **enc2_p, int *fmode_p)
+               rb_encoding **enc_p, rb_encoding **enc2_p, enum rb_io_mode *fmode_p)
 {
     const char *p;
     char encname[ENCODING_MAXNAMELEN+1];
     int idx, idx2;
-    int fmode = fmode_p ? *fmode_p : 0;
+    enum rb_io_mode fmode = fmode_p ? *fmode_p : 0;
     rb_encoding *ext_enc, *int_enc;
     long len;
 
@@ -6651,7 +6744,7 @@ parse_mode_enc(const char *estr, rb_encoding *estr_enc,
 }
 
 int
-rb_io_extract_encoding_option(VALUE opt, rb_encoding **enc_p, rb_encoding **enc2_p, int *fmode_p)
+rb_io_extract_encoding_option(VALUE opt, rb_encoding **enc_p, rb_encoding **enc2_p, enum rb_io_mode *fmode_p)
 {
     VALUE encoding=Qnil, extenc=Qundef, intenc=Qundef, tmp;
     int extracted = 0;
@@ -6720,9 +6813,9 @@ rb_io_extract_encoding_option(VALUE opt, rb_encoding **enc_p, rb_encoding **enc2
 }
 
 static void
-validate_enc_binmode(int *fmode_p, int ecflags, rb_encoding *enc, rb_encoding *enc2)
+validate_enc_binmode(enum rb_io_mode *fmode_p, int ecflags, rb_encoding *enc, rb_encoding *enc2)
 {
-    int fmode = *fmode_p;
+    enum rb_io_mode fmode = *fmode_p;
 
     if ((fmode & FMODE_READABLE) &&
         !enc2 &&
@@ -6747,7 +6840,7 @@ validate_enc_binmode(int *fmode_p, int ecflags, rb_encoding *enc, rb_encoding *e
 }
 
 static void
-extract_binmode(VALUE opthash, int *fmode)
+extract_binmode(VALUE opthash, enum rb_io_mode *fmode)
 {
     if (!NIL_P(opthash)) {
         VALUE v;
@@ -6777,10 +6870,11 @@ extract_binmode(VALUE opthash, int *fmode)
 
 void
 rb_io_extract_modeenc(VALUE *vmode_p, VALUE *vperm_p, VALUE opthash,
-        int *oflags_p, int *fmode_p, struct rb_io_encoding *convconfig_p)
+        int *oflags_p, enum rb_io_mode *fmode_p, struct rb_io_encoding *convconfig_p)
 {
     VALUE vmode;
-    int oflags, fmode;
+    int oflags;
+    enum rb_io_mode fmode;
     rb_encoding *enc, *enc2;
     int ecflags;
     VALUE ecopts;
@@ -6805,7 +6899,7 @@ rb_io_extract_modeenc(VALUE *vmode_p, VALUE *vperm_p, VALUE opthash,
     else {
         const char *p;
 
-        SafeStringValue(vmode);
+        StringValue(vmode);
         p = StringValueCStr(vmode);
         fmode = rb_io_modestr_fmode(p);
         oflags = rb_io_fmode_oflags(fmode);
@@ -6939,7 +7033,9 @@ static inline int
 rb_sysopen_internal(struct sysopen_struct *data)
 {
     int fd;
-    fd = (int)(VALUE)rb_thread_call_without_gvl(sysopen_func, data, RUBY_UBF_IO, 0);
+    do {
+        fd = IO_WITHOUT_GVL_INT(sysopen_func, data);
+    } while (fd < 0 && errno == EINTR);
     if (0 <= fd)
         rb_update_max_fd(fd);
     return fd;
@@ -7093,7 +7189,7 @@ io_set_encoding_by_bom(VALUE io)
 }
 
 static VALUE
-rb_file_open_generic(VALUE io, VALUE filename, int oflags, int fmode,
+rb_file_open_generic(VALUE io, VALUE filename, int oflags, enum rb_io_mode fmode,
                      const struct rb_io_encoding *convconfig, mode_t perm)
 {
     VALUE pathv;
@@ -7130,15 +7226,13 @@ rb_file_open_generic(VALUE io, VALUE filename, int oflags, int fmode,
 static VALUE
 rb_file_open_internal(VALUE io, VALUE filename, const char *modestr)
 {
-    int fmode = rb_io_modestr_fmode(modestr);
+    enum rb_io_mode fmode = rb_io_modestr_fmode(modestr);
     const char *p = strchr(modestr, ':');
     struct rb_io_encoding convconfig;
 
     if (p) {
         parse_mode_enc(p+1, rb_usascii_encoding(),
                        &convconfig.enc, &convconfig.enc2, &fmode);
-        convconfig.ecflags = 0;
-        convconfig.ecopts = Qnil;
     }
     else {
         rb_encoding *e;
@@ -7146,10 +7240,19 @@ rb_file_open_internal(VALUE io, VALUE filename, const char *modestr)
 
         e = (fmode & FMODE_BINMODE) ? rb_ascii8bit_encoding() : NULL;
         rb_io_ext_int_to_encs(e, NULL, &convconfig.enc, &convconfig.enc2, fmode);
-        convconfig.ecflags = 0;
-        convconfig.ecopts = Qnil;
     }
 
+    convconfig.ecflags = (fmode & FMODE_READABLE) ?
+        MODE_BTMODE(ECONV_DEFAULT_NEWLINE_DECORATOR,
+            0, ECONV_UNIVERSAL_NEWLINE_DECORATOR) : 0;
+#ifdef TEXTMODE_NEWLINE_DECORATOR_ON_WRITE
+    convconfig.ecflags |= (fmode & FMODE_WRITABLE) ?
+        MODE_BTMODE(TEXTMODE_NEWLINE_DECORATOR_ON_WRITE,
+            0, TEXTMODE_NEWLINE_DECORATOR_ON_WRITE) : 0;
+#endif
+    SET_UNIVERSAL_NEWLINE_DECORATOR_IF_ENC2(convconfig.enc2, convconfig.ecflags);
+    convconfig.ecopts = Qnil;
+
     return rb_file_open_generic(io, filename,
             rb_io_fmode_oflags(fmode),
             fmode,
@@ -7439,7 +7542,7 @@ char *rb_execarg_commandline(const struct rb_execarg *eargp, VALUE *prog);
 
 #ifndef __EMSCRIPTEN__
 static VALUE
-pipe_open(VALUE execarg_obj, const char *modestr, int fmode,
+pipe_open(VALUE execarg_obj, const char *modestr, enum rb_io_mode fmode,
           const struct rb_io_encoding *convconfig)
 {
     struct rb_execarg *eargp = NIL_P(execarg_obj) ? NULL : rb_execarg_get(execarg_obj);
@@ -7668,7 +7771,7 @@ pipe_open(VALUE execarg_obj, const char *modestr, int fmode,
 }
 #else
 static VALUE
-pipe_open(VALUE execarg_obj, const char *modestr, int fmode,
+pipe_open(VALUE execarg_obj, const char *modestr, enum rb_io_mode fmode,
           const struct rb_io_encoding *convconfig)
 {
     rb_raise(rb_eNotImpError, "popen() is not available");
@@ -7690,7 +7793,7 @@ is_popen_fork(VALUE prog)
 }
 
 static VALUE
-pipe_open_s(VALUE prog, const char *modestr, int fmode,
+pipe_open_s(VALUE prog, const char *modestr, enum rb_io_mode fmode,
             const struct rb_io_encoding *convconfig)
 {
     int argc = 1;
@@ -7761,7 +7864,7 @@ static VALUE popen_finish(VALUE port, VALUE klass);
  *  - {Encoding options}[rdoc-ref:encodings.rdoc@Encoding+Options].
  *  - Options for Kernel#spawn.
  *
- *  <b>Forked \Process</b>
+ *  <b>Forked Process</b>
  *
  *  When argument +cmd+ is the 1-character string <tt>'-'</tt>, causes the process to fork:
  *    IO.popen('-') do |pipe|
@@ -7899,7 +8002,8 @@ rb_io_popen(VALUE pname, VALUE pmode, VALUE env, VALUE opt)
 {
     const char *modestr;
     VALUE tmp, execarg_obj = Qnil;
-    int oflags, fmode;
+    int oflags;
+    enum rb_io_mode fmode;
     struct rb_io_encoding convconfig;
 
     tmp = rb_check_array_type(pname);
@@ -7914,7 +8018,7 @@ rb_io_popen(VALUE pname, VALUE pmode, VALUE env, VALUE opt)
         RB_GC_GUARD(tmp);
     }
     else {
-        SafeStringValue(pname);
+        StringValue(pname);
         execarg_obj = Qnil;
         if (!is_popen_fork(pname))
             execarg_obj = rb_execarg_new(1, &pname, TRUE, FALSE);
@@ -7937,7 +8041,7 @@ popen_finish(VALUE port, VALUE klass)
     if (NIL_P(port)) {
         /* child */
         if (rb_block_given_p()) {
-            rb_yield(Qnil);
+            rb_protect(rb_yield, Qnil, NULL);
             rb_io_flush(rb_ractor_stdout());
             rb_io_flush(rb_ractor_stderr());
             _exit(0);
@@ -7951,37 +8055,73 @@ popen_finish(VALUE port, VALUE klass)
     return port;
 }
 
-static void
-rb_scan_open_args(int argc, const VALUE *argv,
-        VALUE *fname_p, int *oflags_p, int *fmode_p,
-        struct rb_io_encoding *convconfig_p, mode_t *perm_p)
-{
-    VALUE opt, fname, vmode, vperm;
-    int oflags, fmode;
-    mode_t perm;
-
-    argc = rb_scan_args(argc, argv, "12:", &fname, &vmode, &vperm, &opt);
-    FilePathValue(fname);
+#if defined(HAVE_WORKING_FORK) && !defined(__EMSCRIPTEN__)
+struct popen_writer_arg {
+    char *const *argv;
+    struct popen_arg popen;
+};
 
-    rb_io_extract_modeenc(&vmode, &vperm, opt, &oflags, &fmode, convconfig_p);
+static int
+exec_popen_writer(void *arg, char *errmsg, size_t buflen)
+{
+    struct popen_writer_arg *pw = arg;
+    pw->popen.modef = FMODE_WRITABLE;
+    popen_redirect(&pw->popen);
+    execv(pw->argv[0], pw->argv);
+    strlcpy(errmsg, strerror(errno), buflen);
+    return -1;
+}
+#endif
 
-    perm = NIL_P(vperm) ? 0666 :  NUM2MODET(vperm);
+FILE *
+ruby_popen_writer(char *const *argv, rb_pid_t *pid)
+{
+#if (defined(HAVE_WORKING_FORK) && !defined(__EMSCRIPTEN__)) || defined(_WIN32)
+# ifdef HAVE_WORKING_FORK
+    struct popen_writer_arg pw;
+    int *const write_pair = pw.popen.pair;
+# else
+    int write_pair[2];
+# endif
 
-    *fname_p = fname;
-    *oflags_p = oflags;
-    *fmode_p = fmode;
-    *perm_p = perm;
+    int result = rb_cloexec_pipe(write_pair);
+    *pid = -1;
+    if (result == 0) {
+# ifdef HAVE_WORKING_FORK
+        pw.argv = argv;
+        int status;
+        char errmsg[80] = {'\0'};
+        *pid = rb_fork_async_signal_safe(&status, exec_popen_writer, &pw, Qnil, errmsg, sizeof(errmsg));
+# else
+        *pid = rb_w32_uspawn_process(P_NOWAIT, argv[0], argv, write_pair[0], -1, -1, 0);
+        const char *errmsg = (*pid < 0) ? strerror(errno) : NULL;
+# endif
+        close(write_pair[0]);
+        if (*pid < 0) {
+            close(write_pair[1]);
+            fprintf(stderr, "ruby_popen_writer(%s): %s\n", argv[0], errmsg);
+        }
+        else {
+            return fdopen(write_pair[1], "w");
+        }
+    }
+#endif
+    return NULL;
 }
 
 static VALUE
-rb_open_file(int argc, const VALUE *argv, VALUE io)
+rb_open_file(VALUE io, VALUE fname, VALUE vmode, VALUE vperm, VALUE opt)
 {
-    VALUE fname;
-    int oflags, fmode;
+    int oflags;
+    enum rb_io_mode fmode;
     struct rb_io_encoding convconfig;
     mode_t perm;
 
-    rb_scan_open_args(argc, argv, &fname, &oflags, &fmode, &convconfig, &perm);
+    FilePathValue(fname);
+
+    rb_io_extract_modeenc(&vmode, &vperm, opt, &oflags, &fmode, &convconfig);
+    perm = NIL_P(vperm) ? 0666 : NUM2MODET(vperm);
+
     rb_file_open_generic(io, fname, oflags, fmode, &convconfig, perm);
 
     return io;
@@ -8065,7 +8205,7 @@ rb_io_s_sysopen(int argc, VALUE *argv, VALUE _)
     else if (!NIL_P(intmode = rb_check_to_integer(vmode, "to_int")))
         oflags = NUM2INT(intmode);
     else {
-        SafeStringValue(vmode);
+        StringValue(vmode);
         oflags = rb_io_modestr_oflags(StringValueCStr(vmode));
     }
     if (NIL_P(vperm)) perm = 0666;
@@ -8157,22 +8297,8 @@ rb_f_open(int argc, VALUE *argv, VALUE _)
     return rb_io_s_open(argc, argv, rb_cFile);
 }
 
-static VALUE rb_io_open_generic(VALUE, VALUE, int, int, const struct rb_io_encoding *, mode_t);
-
 static VALUE
-rb_io_open(VALUE io, VALUE filename, VALUE vmode, VALUE vperm, VALUE opt)
-{
-    int oflags, fmode;
-    struct rb_io_encoding convconfig;
-    mode_t perm;
-
-    rb_io_extract_modeenc(&vmode, &vperm, opt, &oflags, &fmode, &convconfig);
-    perm = NIL_P(vperm) ? 0666 :  NUM2MODET(vperm);
-    return rb_io_open_generic(io, filename, oflags, fmode, &convconfig, perm);
-}
-
-static VALUE
-rb_io_open_generic(VALUE klass, VALUE filename, int oflags, int fmode,
+rb_io_open_generic(VALUE klass, VALUE filename, int oflags, enum rb_io_mode fmode,
                    const struct rb_io_encoding *convconfig, mode_t perm)
 {
     VALUE cmd;
@@ -8187,6 +8313,19 @@ rb_io_open_generic(VALUE klass, VALUE filename, int oflags, int fmode,
     }
 }
 
+static VALUE
+rb_io_open(VALUE io, VALUE filename, VALUE vmode, VALUE vperm, VALUE opt)
+{
+    int oflags;
+    enum rb_io_mode fmode;
+    struct rb_io_encoding convconfig;
+    mode_t perm;
+
+    rb_io_extract_modeenc(&vmode, &vperm, opt, &oflags, &fmode, &convconfig);
+    perm = NIL_P(vperm) ? 0666 :  NUM2MODET(vperm);
+    return rb_io_open_generic(io, filename, oflags, fmode, &convconfig, perm);
+}
+
 static VALUE
 io_reopen(VALUE io, VALUE nfile)
 {
@@ -8214,7 +8353,7 @@ io_reopen(VALUE io, VALUE nfile)
             rb_sys_fail_on_write(fptr);
     }
     else {
-        flush_before_seek(fptr);
+        flush_before_seek(fptr, true);
     }
     if (orig->mode & FMODE_READABLE) {
         pos = io_tell(orig);
@@ -8226,6 +8365,7 @@ io_reopen(VALUE io, VALUE nfile)
 
     /* copy rb_io_t structure */
     fptr->mode = orig->mode | (fptr->mode & FMODE_EXTERNAL);
+    fptr->encs = orig->encs;
     fptr->pid = orig->pid;
     fptr->lineno = orig->lineno;
     if (RTEST(orig->pathv)) fptr->pathv = orig->pathv;
@@ -8235,6 +8375,10 @@ io_reopen(VALUE io, VALUE nfile)
     fd = fptr->fd;
     fd2 = orig->fd;
     if (fd != fd2) {
+        // Interrupt all usage of the old file descriptor:
+        rb_thread_io_close_interrupt(fptr);
+        rb_thread_io_close_wait(fptr);
+
         if (RUBY_IO_EXTERNAL_P(fptr) || fd <= 2 || !fptr->stdio_file) {
             /* need to keep FILE objects of stdin, stdout and stderr */
             if (rb_cloexec_dup2(fd2, fd) < 0)
@@ -8250,7 +8394,7 @@ io_reopen(VALUE io, VALUE nfile)
             rb_update_max_fd(fd);
             fptr->fd = fd;
         }
-        rb_thread_fd_close(fd);
+
         if ((orig->mode & FMODE_READABLE) && pos >= 0) {
             if (io_seek(fptr, pos, SEEK_SET) < 0 && errno) {
                 rb_sys_fail_path(fptr->pathv);
@@ -8339,7 +8483,7 @@ rb_io_reopen(int argc, VALUE *argv, VALUE file)
     }
 
     if (!NIL_P(nmode) || !NIL_P(opt)) {
-        int fmode;
+        enum rb_io_mode fmode;
         struct rb_io_encoding convconfig;
 
         rb_io_extract_modeenc(&nmode, 0, opt, &oflags, &fmode, &convconfig);
@@ -8427,6 +8571,12 @@ rb_io_init_copy(VALUE dest, VALUE io)
     fptr->pid = orig->pid;
     fptr->lineno = orig->lineno;
     fptr->timeout = orig->timeout;
+
+    ccan_list_head_init(&fptr->blocking_operations);
+    fptr->closing_ec = NULL;
+    fptr->wakeup_mutex = Qnil;
+    fptr->fork_generation = GET_VM()->fork_gen;
+
     if (!NIL_P(orig->pathv)) fptr->pathv = orig->pathv;
     fptr_copy_finalizer(fptr, orig);
 
@@ -8525,7 +8675,26 @@ deprecated_str_setter(VALUE val, ID id, VALUE *var)
 {
     rb_str_setter(val, id, &val);
     if (!NIL_P(val)) {
-        rb_warn_deprecated("`%s'", NULL, rb_id2name(id));
+        rb_warn_deprecated("'%s'", NULL, rb_id2name(id));
+    }
+    *var = val;
+}
+
+static void
+deprecated_rs_setter(VALUE val, ID id, VALUE *var)
+{
+    if (!NIL_P(val)) {
+        if (!RB_TYPE_P(val, T_STRING)) {
+            rb_raise(rb_eTypeError, "value of %"PRIsVALUE" must be String", rb_id2str(id));
+        }
+        if (rb_str_equal(val, rb_default_rs)) {
+            val = rb_default_rs;
+        }
+        else {
+            val = rb_str_frozen_bare_string(val);
+        }
+        rb_enc_str_coderange(val);
+        rb_warn_deprecated("'%s'", NULL, rb_id2name(id));
     }
     *var = val;
 }
@@ -9145,6 +9314,11 @@ rb_io_open_descriptor(VALUE klass, int descriptor, int mode, VALUE path, VALUE t
 
     io->timeout = timeout;
 
+    ccan_list_head_init(&io->blocking_operations);
+    io->closing_ec = NULL;
+    io->wakeup_mutex = Qnil;
+    io->fork_generation = GET_VM()->fork_gen;
+
     if (encoding) {
         io->encs = *encoding;
     }
@@ -9155,14 +9329,30 @@ rb_io_open_descriptor(VALUE klass, int descriptor, int mode, VALUE path, VALUE t
 }
 
 static VALUE
-prep_io(int fd, int fmode, VALUE klass, const char *path)
+prep_io(int fd, enum rb_io_mode fmode, VALUE klass, const char *path)
 {
     VALUE path_value = Qnil;
+    rb_encoding *e;
+    struct rb_io_encoding convconfig;
+
     if (path) {
         path_value = rb_obj_freeze(rb_str_new_cstr(path));
     }
 
-    VALUE self = rb_io_open_descriptor(klass, fd, fmode, path_value, Qnil, NULL);
+    e = (fmode & FMODE_BINMODE) ? rb_ascii8bit_encoding() : NULL;
+    rb_io_ext_int_to_encs(e, NULL, &convconfig.enc, &convconfig.enc2, fmode);
+    convconfig.ecflags = (fmode & FMODE_READABLE) ?
+        MODE_BTMODE(ECONV_DEFAULT_NEWLINE_DECORATOR,
+            0, ECONV_UNIVERSAL_NEWLINE_DECORATOR) : 0;
+#ifdef TEXTMODE_NEWLINE_DECORATOR_ON_WRITE
+    convconfig.ecflags |= (fmode & FMODE_WRITABLE) ?
+        MODE_BTMODE(TEXTMODE_NEWLINE_DECORATOR_ON_WRITE,
+            0, TEXTMODE_NEWLINE_DECORATOR_ON_WRITE) : 0;
+#endif
+    SET_UNIVERSAL_NEWLINE_DECORATOR_IF_ENC2(convconfig.enc2, convconfig.ecflags);
+    convconfig.ecopts = Qnil;
+
+    VALUE self = rb_io_open_descriptor(klass, fd, fmode, path_value, Qnil, &convconfig);
     rb_io_t*io = RFILE(self)->fptr;
 
     if (!io_check_tty(io)) {
@@ -9185,7 +9375,7 @@ rb_io_fdopen(int fd, int oflags, const char *path)
 }
 
 static VALUE
-prep_stdio(FILE *f, int fmode, VALUE klass, const char *path)
+prep_stdio(FILE *f, enum rb_io_mode fmode, VALUE klass, const char *path)
 {
     rb_io_t *fptr;
     VALUE io = prep_io(fileno(f), fmode|FMODE_EXTERNAL|DEFAULT_TEXTMODE, klass, path);
@@ -9268,6 +9458,10 @@ rb_io_fptr_new(void)
     fp->encs.ecopts = Qnil;
     fp->write_lock = Qnil;
     fp->timeout = Qnil;
+    ccan_list_head_init(&fp->blocking_operations);
+    fp->closing_ec = NULL;
+    fp->wakeup_mutex = Qnil;
+    fp->fork_generation = GET_VM()->fork_gen;
     return fp;
 }
 
@@ -9288,6 +9482,8 @@ rb_io_make_open_file(VALUE obj)
     return fp;
 }
 
+static VALUE io_initialize(VALUE io, VALUE fnum, VALUE vmode, VALUE opt);
+
 /*
  *  call-seq:
  *    IO.new(fd, mode = 'r', **opts) -> io
@@ -9333,18 +9529,25 @@ static VALUE
 rb_io_initialize(int argc, VALUE *argv, VALUE io)
 {
     VALUE fnum, vmode;
+    VALUE opt;
+
+    rb_scan_args(argc, argv, "11:", &fnum, &vmode, &opt);
+    return io_initialize(io, fnum, vmode, opt);
+}
+
+static VALUE
+io_initialize(VALUE io, VALUE fnum, VALUE vmode, VALUE opt)
+{
     rb_io_t *fp;
-    int fd, fmode, oflags = O_RDONLY;
+    int fd, oflags = O_RDONLY;
+    enum rb_io_mode fmode;
     struct rb_io_encoding convconfig;
-    VALUE opt;
 #if defined(HAVE_FCNTL) && defined(F_GETFL)
     int ofmode;
 #else
     struct stat st;
 #endif
 
-
-    argc = rb_scan_args(argc, argv, "11:", &fnum, &vmode, &opt);
     rb_io_extract_modeenc(&vmode, 0, opt, &oflags, &fmode, &convconfig);
 
     fd = NUM2INT(fnum);
@@ -9389,6 +9592,10 @@ rb_io_initialize(int argc, VALUE *argv, VALUE io)
     fp->encs = convconfig;
     fp->pathv = path;
     fp->timeout = Qnil;
+    ccan_list_head_init(&fp->blocking_operations);
+    fp->closing_ec = NULL;
+    fp->wakeup_mutex = Qnil;
+    fp->fork_generation = GET_VM()->fork_gen;
     clear_codeconv(fp);
     io_check_tty(fp);
     if (fileno(stdin) == fd)
@@ -9493,17 +9700,16 @@ rb_file_initialize(int argc, VALUE *argv, VALUE io)
     if (RFILE(io)->fptr) {
         rb_raise(rb_eRuntimeError, "reinitializing File");
     }
-    if (0 < argc && argc < 3) {
-        VALUE fd = rb_check_to_int(argv[0]);
+    VALUE fname, vmode, vperm, opt;
+    int posargc = rb_scan_args(argc, argv, "12:", &fname, &vmode, &vperm, &opt);
+    if (posargc < 3) {          /* perm is File only */
+        VALUE fd = rb_check_to_int(fname);
 
         if (!NIL_P(fd)) {
-            argv[0] = fd;
-            return rb_io_initialize(argc, argv, io);
+            return io_initialize(io, fd, vmode, opt);
         }
     }
-    rb_open_file(argc, argv, io);
-
-    return io;
+    return rb_open_file(io, fname, vmode, vperm, opt);
 }
 
 /* :nodoc: */
@@ -9723,7 +9929,7 @@ io_event_from_value(VALUE value)
 /*
  * call-seq:
  *   io.wait(events, timeout) -> event mask, false or nil
- *   io.wait(timeout = nil, mode = :read) -> self, true, or false
+ *   io.wait(*event_symbols[, timeout]) -> self, true, or false
  *
  * Waits until the IO becomes ready for the specified events and returns the
  * subset of events that become ready, or a falsy value when times out.
@@ -9731,10 +9937,14 @@ io_event_from_value(VALUE value)
  * The events can be a bit mask of +IO::READABLE+, +IO::WRITABLE+ or
  * +IO::PRIORITY+.
  *
- * Returns an event mask (truthy value) immediately when buffered data is available.
+ * Returns an event mask (truthy value) immediately when buffered data is
+ * available.
  *
- * Optional parameter +mode+ is one of +:read+, +:write+, or
- * +:read_write+.
+ * The second form: if one or more event symbols (+:read+, +:write+, or
+ * +:read_write+) are passed, the event mask is the bit OR of the bitmask
+ * corresponding to those symbols.  In this form, +timeout+ is optional, the
+ * order of the arguments is arbitrary, and returns +io+ if any of the
+ * events is ready.
  */
 
 static VALUE
@@ -9744,10 +9954,6 @@ io_wait(int argc, VALUE *argv, VALUE io)
     enum rb_io_event events = 0;
     int return_io = 0;
 
-    // The documented signature for this method is actually incorrect.
-    // A single timeout is allowed in any position, and multiple symbols can be given.
-    // Whether this is intentional or not, I don't know, and as such I consider this to
-    // be a legacy/slow path.
     if (argc != 2 || (RB_SYMBOL_P(argv[0]) || RB_SYMBOL_P(argv[1]))) {
         // We'd prefer to return the actual mask, but this form would return the io itself:
         return_io = 1;
@@ -9811,9 +10017,20 @@ argf_memsize(const void *ptr)
     return size;
 }
 
+static void
+argf_compact(void *ptr)
+{
+    struct argf *p = ptr;
+    p->filename = rb_gc_location(p->filename);
+    p->current_file = rb_gc_location(p->current_file);
+    p->argv = rb_gc_location(p->argv);
+    p->inplace = rb_gc_location(p->inplace);
+    p->encs.ecopts = rb_gc_location(p->encs.ecopts);
+}
+
 static const rb_data_type_t argf_type = {
     "ARGF",
-    {argf_mark, RUBY_TYPED_DEFAULT_FREE, argf_memsize},
+    {argf_mark, RUBY_TYPED_DEFAULT_FREE, argf_memsize, argf_compact},
     0, 0, RUBY_TYPED_FREE_IMMEDIATELY
 };
 
@@ -9939,7 +10156,7 @@ argf_next_argv(VALUE argf)
     char *fn;
     rb_io_t *fptr;
     int stdout_binmode = 0;
-    int fmode;
+    enum rb_io_mode fmode;
 
     VALUE r_stdout = rb_ractor_stdout();
 
@@ -10370,8 +10587,9 @@ static VALUE argf_readlines(int, VALUE *, VALUE);
  *    $cat t.txt | ruby -e "p readlines 12"
  *    ["First line\n", "Second line\n", "\n", "Fourth line\n", "Fifth line\n"]
  *
- *  With arguments +sep+ and +limit+ given, combines the two behaviors;
- *  see {Line Separator and Line Limit}[rdoc-ref:IO@Line+Separator+and+Line+Limit].
+ *  With arguments +sep+ and +limit+ given,
+ *  combines the two behaviors
+ *  (see {Line Separator and Line Limit}[rdoc-ref:IO@Line+Separator+and+Line+Limit]).
  *
  *  Optional keyword argument +chomp+ specifies whether line separators
  *  are to be omitted:
@@ -10395,19 +10613,21 @@ rb_f_readlines(int argc, VALUE *argv, VALUE recv)
 
 /*
  *  call-seq:
- *     ARGF.readlines(sep = $/)     -> array
- *     ARGF.readlines(limit)      -> array
- *     ARGF.readlines(sep, limit) -> array
+ *     ARGF.readlines(sep = $/, chomp: false)   -> array
+ *     ARGF.readlines(limit, chomp: false)      -> array
+ *     ARGF.readlines(sep, limit, chomp: false) -> array
  *
- *     ARGF.to_a(sep = $/)     -> array
- *     ARGF.to_a(limit)      -> array
- *     ARGF.to_a(sep, limit) -> array
+ *     ARGF.to_a(sep = $/, chomp: false)   -> array
+ *     ARGF.to_a(limit, chomp: false)      -> array
+ *     ARGF.to_a(sep, limit, chomp: false) -> array
  *
  *  Reads each file in ARGF in its entirety, returning an Array containing
  *  lines from the files. Lines are assumed to be separated by _sep_.
  *
  *     lines = ARGF.readlines
  *     lines[0]                #=> "This is line one\n"
+ *
+ *  See +IO.readlines+ for a full description of all options.
  */
 static VALUE
 argf_readlines(int argc, VALUE *argv, VALUE argf)
@@ -10448,7 +10668,7 @@ argf_readlines(int argc, VALUE *argv, VALUE argf)
  *    $ `date`                 # => "Wed Apr  9 08:56:30 CDT 2003\n"
  *    $ `echo oops && exit 99` # => "oops\n"
  *    $ $?                     # => #<Process::Status: pid 17088 exit 99>
- *    $ $?.status              # => 99>
+ *    $ $?.exitstatus          # => 99
  *
  *  The built-in syntax <tt>%x{...}</tt> uses this method.
  *
@@ -10461,17 +10681,15 @@ rb_f_backquote(VALUE obj, VALUE str)
     VALUE result;
     rb_io_t *fptr;
 
-    SafeStringValue(str);
+    StringValue(str);
     rb_last_status_clear();
     port = pipe_open_s(str, "r", FMODE_READABLE|DEFAULT_TEXTMODE, NULL);
     if (NIL_P(port)) return rb_str_new(0,0);
 
     GetOpenFile(port, fptr);
-    rb_obj_hide(port);
     result = read_all(fptr, remain_size(fptr), Qnil);
     rb_io_close(port);
-    RFILE(port)->fptr = NULL;
-    rb_io_fptr_finalize(fptr);
+    rb_io_fptr_cleanup_all(fptr);
     RB_GC_GUARD(port);
 
     return result;
@@ -10706,7 +10924,7 @@ do_io_advise(rb_io_t *fptr, VALUE advice, rb_off_t offset, rb_off_t len)
     ias.offset = offset;
     ias.len    = len;
 
-    rv = (int)rb_thread_io_blocking_region(io_advise_internal, &ias, fptr->fd);
+    rv = (int)rb_io_blocking_region(fptr, io_advise_internal, &ias);
     if (rv && rv != ENOSYS) {
         /* posix_fadvise(2) doesn't set errno. On success it returns 0; otherwise
            it returns the error code. */
@@ -10796,6 +11014,16 @@ rb_io_advise(int argc, VALUE *argv, VALUE io)
 #endif
 }
 
+static int
+is_pos_inf(VALUE x)
+{
+    double f;
+    if (!RB_FLOAT_TYPE_P(x))
+        return 0;
+    f = RFLOAT_VALUE(x);
+    return isinf(f) && 0 < f;
+}
+
 /*
  *  call-seq:
  *    IO.select(read_ios, write_ios = [], error_ios = [], timeout = nil) -> array or nil
@@ -10810,7 +11038,10 @@ rb_io_advise(int argc, VALUE *argv, VALUE io)
  *  Each of the arguments +read_ios+, +write_ios+, and +error_ios+
  *  is an array of IO objects.
  *
- *  Argument +timeout+ is an integer timeout interval in seconds.
+ *  Argument +timeout+ is a numeric value (such as integer or float) timeout
+ *  interval in seconds.
+ *  +timeout+ can also be +nil+ or +Float::INFINITY+.
+ *  +nil+ and +Float::INFINITY+ means no timeout.
  *
  *  The method monitors the \IO objects given in all three arrays,
  *  waiting for some to be ready;
@@ -10961,7 +11192,7 @@ rb_f_select(int argc, VALUE *argv, VALUE obj)
     int i;
 
     rb_scan_args(argc, argv, "13", &args.read, &args.write, &args.except, &timeout);
-    if (NIL_P(timeout)) {
+    if (NIL_P(timeout) || is_pos_inf(timeout)) {
         args.timeout = 0;
     }
     else {
@@ -10998,16 +11229,16 @@ nogvl_ioctl(void *ptr)
 }
 
 static int
-do_ioctl(int fd, ioctl_req_t cmd, long narg)
+do_ioctl(struct rb_io *io, ioctl_req_t cmd, long narg)
 {
     int retval;
     struct ioctl_arg arg;
 
-    arg.fd = fd;
+    arg.fd = io->fd;
     arg.cmd = cmd;
     arg.narg = narg;
 
-    retval = (int)rb_thread_io_blocking_region(nogvl_ioctl, &arg, fd);
+    retval = (int)rb_io_blocking_region(io, nogvl_ioctl, &arg);
 
     return retval;
 }
@@ -11270,7 +11501,7 @@ rb_ioctl(VALUE io, VALUE req, VALUE arg)
 
     narg = setup_narg(cmd, &arg, ioctl_narg_len);
     GetOpenFile(io, fptr);
-    retval = do_ioctl(fptr->fd, cmd, narg);
+    retval = do_ioctl(fptr, cmd, narg);
     return finish_narg(retval, arg, fptr);
 }
 
@@ -11324,16 +11555,16 @@ nogvl_fcntl(void *ptr)
 }
 
 static int
-do_fcntl(int fd, int cmd, long narg)
+do_fcntl(struct rb_io *io, int cmd, long narg)
 {
     int retval;
     struct fcntl_arg arg;
 
-    arg.fd = fd;
+    arg.fd = io->fd;
     arg.cmd = cmd;
     arg.narg = narg;
 
-    retval = (int)rb_thread_io_blocking_region(nogvl_fcntl, &arg, fd);
+    retval = (int)rb_io_blocking_region(io, nogvl_fcntl, &arg);
     if (retval != -1) {
         switch (cmd) {
 #if defined(F_DUPFD)
@@ -11359,7 +11590,7 @@ rb_fcntl(VALUE io, VALUE req, VALUE arg)
 
     narg = setup_narg(cmd, &arg, fcntl_narg_len);
     GetOpenFile(io, fptr);
-    retval = do_fcntl(fptr->fd, cmd, narg);
+    retval = do_fcntl(fptr, cmd, narg);
     return finish_narg(retval, arg, fptr);
 }
 
@@ -11469,7 +11700,7 @@ rb_f_syscall(int argc, VALUE *argv, VALUE _)
         VALUE v = rb_check_string_type(argv[i]);
 
         if (!NIL_P(v)) {
-            SafeStringValue(v);
+            StringValue(v);
             rb_str_modify(v);
             arg[i] = (VALUE)StringValueCStr(v);
         }
@@ -11707,7 +11938,7 @@ rb_io_s_pipe(int argc, VALUE *argv, VALUE klass)
     VALUE opt;
     rb_io_t *fptr, *fptr2;
     struct io_encoding_set_args ies_args;
-    int fmode = 0;
+    enum rb_io_mode fmode = 0;
     VALUE ret;
 
     argc = rb_scan_args(argc, argv, "02:", &v1, &v2, &opt);
@@ -11882,7 +12113,7 @@ io_s_foreach(VALUE v)
  *
  *  With argument +limit+ given, parses lines as determined by the default
  *  line separator and the given line-length limit
- *  (see {Line Limit}[rdoc-ref:IO@Line+Limit]):
+ *  (see {Line Separator}[rdoc-ref:IO@Line+Separator] and {Line Limit}[rdoc-ref:IO@Line+Limit]):
  *
  *    File.foreach('t.txt', 7) {|line| p line }
  *
@@ -11898,10 +12129,9 @@ io_s_foreach(VALUE v)
  *    "Fourth l"
  *    "line\n"
  *
- *  With arguments +sep+ and  +limit+ given,
- *  parses lines as determined by the given
- *  line separator and the given line-length limit
- *  (see {Line Separator and Line Limit}[rdoc-ref:IO@Line+Separator+and+Line+Limit]):
+ *  With arguments +sep+ and +limit+ given,
+ *  combines the two behaviors
+ *  (see {Line Separator and Line Limit}[rdoc-ref:IO@Line+Separator+and+Line+Limit]).
  *
  *  Optional keyword arguments +opts+ specify:
  *
@@ -11974,15 +12204,14 @@ io_s_readlines(VALUE v)
  *
  *  With argument +limit+ given, parses lines as determined by the default
  *  line separator and the given line-length limit
- *  (see {Line Limit}[rdoc-ref:IO@Line+Limit]):
+ *  (see {Line Separator}[rdoc-ref:IO@Line+Separator] and {Line Limit}[rdoc-ref:IO@Line+Limit]:
  *
  *    IO.readlines('t.txt', 7)
  *    # => ["First l", "ine\n", "Second ", "line\n", "\n", "Third l", "ine\n", "Fourth ", "line\n"]
  *
- *  With arguments +sep+ and  +limit+ given,
- *  parses lines as determined by the given
- *  line separator and the given line-length limit
- *  (see {Line Separator and Line Limit}[rdoc-ref:IO@Line+Separator+and+Line+Limit]):
+ *  With arguments +sep+ and +limit+ given,
+ *  combines the two behaviors
+ *  (see {Line Separator and Line Limit}[rdoc-ref:IO@Line+Separator+and+Line+Limit]).
  *
  *  Optional keyword arguments +opts+ specify:
  *
@@ -12118,8 +12347,8 @@ rb_io_s_binread(int argc, VALUE *argv, VALUE io)
 {
     VALUE offset;
     struct foreach_arg arg;
+    enum rb_io_mode fmode = FMODE_READABLE|FMODE_BINMODE;
     enum {
-        fmode = FMODE_READABLE|FMODE_BINMODE,
         oflags = O_RDONLY
 #ifdef O_BINARY
                 |O_BINARY
@@ -12979,6 +13208,7 @@ copy_stream_fallback_body(VALUE arg)
     while (1) {
         long numwrote;
         long l;
+        rb_str_make_independent(buf);
         if (stp->copy_length < (rb_off_t)0) {
             l = buflen;
         }
@@ -13132,7 +13362,7 @@ copy_stream_body(VALUE arg)
         rb_str_resize(str,len);
         read_buffered_data(RSTRING_PTR(str), len, stp->src_fptr);
         if (stp->dst_fptr) { /* IO or filename */
-            if (io_binwrite(str, RSTRING_PTR(str), RSTRING_LEN(str), stp->dst_fptr, 0) < 0)
+            if (io_binwrite(RSTRING_PTR(str), RSTRING_LEN(str), stp->dst_fptr, 0) < 0)
                 rb_sys_fail_on_write(stp->dst_fptr);
         }
         else /* others such as StringIO */
@@ -13154,7 +13384,7 @@ copy_stream_body(VALUE arg)
         return copy_stream_fallback(stp);
     }
 
-    rb_thread_call_without_gvl(nogvl_copy_stream_func, (void*)stp, RUBY_UBF_IO, 0);
+    IO_WITHOUT_GVL(nogvl_copy_stream_func, stp);
     return Qnil;
 }
 
@@ -14481,14 +14711,14 @@ argf_write_io(VALUE argf)
 
 /*
  *  call-seq:
- *     ARGF.write(string)   -> integer
+ *     ARGF.write(*objects)  -> integer
  *
- *  Writes _string_ if inplace mode.
+ *  Writes each of the given +objects+ if inplace mode.
  */
 static VALUE
-argf_write(VALUE argf, VALUE str)
+argf_write(int argc, VALUE *argv, VALUE argf)
 {
-    return rb_io_write(argf_write_io(argf), str);
+    return rb_io_writev(argf_write_io(argf), argc, argv);
 }
 
 void
@@ -14594,50 +14824,261 @@ set_LAST_READ_LINE(VALUE val, ID _x, VALUE *_y)
 /*
  * Document-class:  ARGF
  *
- * ARGF is a stream designed for use in scripts that process files given as
- * command-line arguments or passed in via STDIN.
+ * == \ARGF and +ARGV+
+ *
+ * The \ARGF object works with the array at global variable +ARGV+
+ * to make <tt>$stdin</tt> and file streams available in the Ruby program:
+ *
+ * - **ARGV** may be thought of as the <b>argument vector</b> array.
+ *
+ *   Initially, it contains the command-line arguments and options
+ *   that are passed to the Ruby program;
+ *   the program can modify that array as it likes.
+ *
+ * - **ARGF** may be thought of as the <b>argument files</b> object.
+ *
+ *   It can access file streams and/or the <tt>$stdin</tt> stream,
+ *   based on what it finds in +ARGV+.
+ *   This provides a convenient way for the command line
+ *   to specify streams for a Ruby program to read.
+ *
+ * == Reading
+ *
+ * \ARGF may read from _source_ streams,
+ * which at any particular time are determined by the content of +ARGV+.
+ *
+ * === Simplest Case
+ *
+ * When the <i>very first</i> \ARGF read occurs with an empty +ARGV+ (<tt>[]</tt>),
+ * the source is <tt>$stdin</tt>:
+ *
+ * - \File +t.rb+:
+ *
+ *     p ['ARGV', ARGV]
+ *     p ['ARGF.read', ARGF.read]
+ *
+ * - Commands and outputs
+ *   (see below for the content of files +foo.txt+ and +bar.txt+):
+ *
+ *     $ echo "Open the pod bay doors, Hal." | ruby t.rb
+ *     ["ARGV", []]
+ *     ["ARGF.read", "Open the pod bay doors, Hal.\n"]
+ *
+ *     $ cat foo.txt bar.txt | ruby t.rb
+ *     ["ARGV", []]
+ *     ["ARGF.read", "Foo 0\nFoo 1\nBar 0\nBar 1\nBar 2\nBar 3\n"]
+ *
+ * === About the Examples
+ *
+ * Many examples here assume the existence of files +foo.txt+ and +bar.txt+:
+ *
+ *   $ cat foo.txt
+ *   Foo 0
+ *   Foo 1
+ *   $ cat bar.txt
+ *   Bar 0
+ *   Bar 1
+ *   Bar 2
+ *   Bar 3
+ *
+ * === Sources in +ARGV+
+ *
+ * For any \ARGF read _except_ the {simplest case}[rdoc-ref:ARGF@Simplest+Case]
+ * (that is, _except_ for the <i>very first</i> \ARGF read with an empty +ARGV+),
+ * the sources are found in +ARGV+.
+ *
+ * \ARGF assumes that each element in array +ARGV+ is a potential source,
+ * and is one of:
+ *
+ * - The string path to a file that may be opened as a stream.
+ * - The character <tt>'-'</tt>, meaning stream <tt>$stdin</tt>.
+ *
+ * Each element that is _not_ one of these
+ * should be removed from +ARGV+ before \ARGF accesses that source.
+ *
+ * In the following example:
+ *
+ * - Filepaths +foo.txt+ and +bar.txt+ may be retained as potential sources.
+ * - Options <tt>--xyzzy</tt> and <tt>--mojo</tt> should be removed.
+ *
+ * Example:
+ *
+ * - \File +t.rb+:
+ *
+ *     # Print arguments (and options, if any) found on command line.
+ *     p ['ARGV', ARGV]
+ *
+ * - Command and output:
  *
- * The arguments passed to your script are stored in the +ARGV+ Array, one
- * argument per element. ARGF assumes that any arguments that aren't
- * filenames have been removed from +ARGV+. For example:
+ *     $ ruby t.rb --xyzzy --mojo foo.txt bar.txt
+ *     ["ARGV", ["--xyzzy", "--mojo", "foo.txt", "bar.txt"]]
  *
- *     $ ruby argf.rb --verbose file1 file2
+ * \ARGF's stream access considers the elements of +ARGV+, left to right:
  *
- *     ARGV  #=> ["--verbose", "file1", "file2"]
- *     option = ARGV.shift #=> "--verbose"
- *     ARGV  #=> ["file1", "file2"]
+ * - \File +t.rb+:
  *
- * You can now use ARGF to work with a concatenation of each of these named
- * files. For instance, ARGF.read will return the contents of _file1_
- * followed by the contents of _file2_.
+ *     p "ARGV: #{ARGV}"
+ *     p "Read: #{ARGF.read}" # Read everything from all specified streams.
  *
- * After a file in +ARGV+ has been read ARGF removes it from the Array.
- * Thus, after all files have been read +ARGV+ will be empty.
+ * - Command and output:
  *
- * You can manipulate +ARGV+ yourself to control what ARGF operates on. If
- * you remove a file from +ARGV+, it is ignored by ARGF; if you add files to
- * +ARGV+, they are treated as if they were named on the command line. For
- * example:
+ *     $ ruby t.rb foo.txt bar.txt
+ *     "ARGV: [\"foo.txt\", \"bar.txt\"]"
+ *     "Read: Foo 0\nFoo 1\nBar 0\nBar 1\nBar 2\nBar 3\n"
  *
- *     ARGV.replace ["file1"]
- *     ARGF.readlines # Returns the contents of file1 as an Array
- *     ARGV           #=> []
- *     ARGV.replace ["file2", "file3"]
- *     ARGF.read      # Returns the contents of file2 and file3
+ * Because the value at +ARGV+ is an ordinary array,
+ * you can manipulate it to control which sources \ARGF considers:
  *
- * If +ARGV+ is empty, ARGF acts as if it contained STDIN, i.e. the data
- * piped to your script. For example:
+ * - If you remove an element from +ARGV+, \ARGF will not consider the corresponding source.
+ * - If you add an element to +ARGV+, \ARGF will consider the corresponding source.
+ *
+ * Each element in +ARGV+ is removed when its corresponding source is accessed;
+ * when all sources have been accessed, the array is empty:
+ *
+ * - \File +t.rb+:
+ *
+ *     until ARGV.empty? && ARGF.eof?
+ *       p "ARGV: #{ARGV}"
+ *       p "Line: #{ARGF.readline}" # Read each line from each specified stream.
+ *     end
+ *
+ * - Command and output:
+ *
+ *     $ ruby t.rb foo.txt bar.txt
+ *     "ARGV: [\"foo.txt\", \"bar.txt\"]"
+ *     "Line: Foo 0\n"
+ *     "ARGV: [\"bar.txt\"]"
+ *     "Line: Foo 1\n"
+ *     "ARGV: [\"bar.txt\"]"
+ *     "Line: Bar 0\n"
+ *     "ARGV: []"
+ *     "Line: Bar 1\n"
+ *     "ARGV: []"
+ *     "Line: Bar 2\n"
+ *     "ARGV: []"
+ *     "Line: Bar 3\n"
+ *
+ * ==== Filepaths in +ARGV+
+ *
+ * The +ARGV+ array may contain filepaths the specify sources for \ARGF reading.
+ *
+ * This program prints what it reads from files at the paths specified
+ * on the command line:
+ *
+ * - \File +t.rb+:
+ *
+ *     p ['ARGV', ARGV]
+ *     # Read and print all content from the specified sources.
+ *     p ['ARGF.read', ARGF.read]
+ *
+ * - Command and output:
+ *
+ *     $ ruby t.rb foo.txt bar.txt
+ *     ["ARGV", [foo.txt, bar.txt]
+ *     ["ARGF.read", "Foo 0\nFoo 1\nBar 0\nBar 1\nBar 2\nBar 3\n"]
+ *
+ * ==== Specifying <tt>$stdin</tt> in +ARGV+
+ *
+ * To specify stream <tt>$stdin</tt> in +ARGV+, us the character <tt>'-'</tt>:
+ *
+ * - \File +t.rb+:
+ *
+ *     p ['ARGV', ARGV]
+ *     p ['ARGF.read', ARGF.read]
+ *
+ * - Command and output:
+ *
+ *     $ echo "Open the pod bay doors, Hal." | ruby t.rb -
+ *     ["ARGV", ["-"]]
+ *     ["ARGF.read", "Open the pod bay doors, Hal.\n"]
+ *
+ * When no character <tt>'-'</tt> is given, stream <tt>$stdin</tt> is ignored
+ * (exception:
+ * see {Specifying $stdin in ARGV}[rdoc-ref:ARGF@Specifying+-24stdin+in+ARGV]):
+ *
+ * - Command and output:
+ *
+ *     $ echo "Open the pod bay doors, Hal." | ruby t.rb foo.txt bar.txt
+ *     "ARGV: [\"foo.txt\", \"bar.txt\"]"
+ *     "Read: Foo 0\nFoo 1\nBar 0\nBar 1\nBar 2\nBar 3\n"
+ *
+ * ==== Mixtures and Repetitions in +ARGV+
+ *
+ * For an \ARGF reader, +ARGV+ may contain any mixture of filepaths
+ * and character <tt>'-'</tt>, including repetitions.
+ *
+ * ==== Modifications to +ARGV+
+ *
+ * The running Ruby program may make any modifications to the +ARGV+ array;
+ * the current value of +ARGV+ affects \ARGF reading.
+ *
+ * ==== Empty +ARGV+
+ *
+ * For an empty +ARGV+, an \ARGF read method either returns +nil+
+ * or raises an exception, depending on the specific method.
+ *
+ * === More Read Methods
+ *
+ * As seen above, method ARGF#read reads the content of all sources
+ * into a single string.
+ * Other \ARGF methods provide other ways to access that content;
+ * these include:
+ *
+ * - Byte access: #each_byte, #getbyte, #readbyte.
+ * - Character access: #each_char, #getc, #readchar.
+ * - Codepoint access: #each_codepoint.
+ * - Line access: #each_line, #gets, #readline, #readlines.
+ * - Source access: #read, #read_nonblock, #readpartial.
+ *
+ * === About \Enumerable
+ *
+ * \ARGF includes module Enumerable.
+ * Virtually all methods in \Enumerable call method <tt>#each</tt> in the including class.
+ *
+ * <b>Note well</b>: In \ARGF, method #each returns data from the _sources_,
+ * _not_ from +ARGV+;
+ * therefore, for example, <tt>ARGF#entries</tt> returns an array of lines from the sources,
+ * not an array of the strings from +ARGV+:
+ *
+ * - \File +t.rb+:
+ *
+ *     p ['ARGV', ARGV]
+ *     p ['ARGF.entries', ARGF.entries]
+ *
+ * - Command and output:
+ *
+ *     $ ruby t.rb foo.txt bar.txt
+ *     ["ARGV", ["foo.txt", "bar.txt"]]
+ *     ["ARGF.entries", ["Foo 0\n", "Foo 1\n", "Bar 0\n", "Bar 1\n", "Bar 2\n", "Bar 3\n"]]
+ *
+ * == Writing
+ *
+ * If <i>inplace mode</i> is in effect,
+ * \ARGF may write to target streams,
+ * which at any particular time are determined by the content of ARGV.
+ *
+ * Methods about inplace mode:
+ *
+ * - #inplace_mode
+ * - #inplace_mode=
+ * - #to_write_io
+ *
+ * Methods for writing:
+ *
+ * - #print
+ * - #printf
+ * - #putc
+ * - #puts
+ * - #write
  *
- *     $ echo "glark" | ruby -e 'p ARGF.read'
- *     "glark\n"
  */
 
 /*
  *  An instance of class \IO (commonly called a _stream_)
  *  represents an input/output stream in the underlying operating system.
- *  \Class \IO is the basis for input and output in Ruby.
+ *  Class \IO is the basis for input and output in Ruby.
  *
- *  \Class File is the only class in the Ruby core that is a subclass of \IO.
+ *  Class File is the only class in the Ruby core that is a subclass of \IO.
  *  Some classes in the Ruby standard library are also subclasses of \IO;
  *  these include TCPSocket and UDPSocket.
  *
@@ -14646,7 +15087,7 @@ set_LAST_READ_LINE(VALUE val, ID _x, VALUE *_y)
  *  found in ARGV (or found in STDIN if ARGV is empty).
  *  ARGF is not itself a subclass of \IO.
  *
- *  \Class StringIO provides an IO-like stream that handles a String.
+ *  Class StringIO provides an IO-like stream that handles a String.
  *  StringIO is not itself a subclass of \IO.
  *
  *  Important objects based on \IO include:
@@ -14716,7 +15157,7 @@ set_LAST_READ_LINE(VALUE val, ID _x, VALUE *_y)
  *    #path method.
  *
  *  Also available are the options offered in String#encode,
- *  which may control conversion between external internal encoding.
+ *  which may control conversion between external and internal encoding.
  *
  *  == Basic \IO
  *
@@ -14734,6 +15175,9 @@ set_LAST_READ_LINE(VALUE val, ID _x, VALUE *_y)
  *  A new stream has position zero (and line number zero);
  *  method +rewind+ resets the position (and line number) to zero.
  *
+ *  These methods discard {buffers}[rdoc-ref:IO@Buffering] and the
+ *  Encoding::Converter instances used for that \IO.
+ *
  *  The relevant methods:
  *
  *  - IO#tell (aliased as +#pos+): Returns the current position (in bytes) in the stream.
@@ -14781,56 +15225,64 @@ set_LAST_READ_LINE(VALUE val, ID _x, VALUE *_y)
  *
  *  == Line \IO
  *
- *  You can read an \IO stream line-by-line using these methods:
+ *  Class \IO supports line-oriented
+ *  {input}[rdoc-ref:IO@Line+Input] and {output}[rdoc-ref:IO@Line+Output]
  *
- *  - IO#each_line: Reads each remaining line, passing it to the given block.
- *  - IO#gets: Returns the next line.
- *  - IO#readline: Like #gets, but raises an exception at end-of-stream.
- *  - IO#readlines: Returns all remaining lines in an array.
+ *  === Line Input
+ *
+ *  Class \IO supports line-oriented input for
+ *  {files}[rdoc-ref:IO@File+Line+Input] and {IO streams}[rdoc-ref:IO@Stream+Line+Input]
+ *
+ *  ==== \File Line Input
+ *
+ *  You can read lines from a file using these methods:
+ *
+ *  - IO.foreach: Reads each line and passes it to the given block.
+ *  - IO.readlines: Reads and returns all lines in an array.
  *
- *  Each of these reader methods accepts:
+ *  For each of these methods:
  *
- *  - An optional line separator, +sep+;
+ *  - You can specify {open options}[rdoc-ref:IO@Open+Options].
+ *  - Line parsing depends on the effective <i>line separator</i>;
  *    see {Line Separator}[rdoc-ref:IO@Line+Separator].
- *  - An optional line-size limit, +limit+;
+ *  - The length of each returned line depends on the effective <i>line limit</i>;
  *    see {Line Limit}[rdoc-ref:IO@Line+Limit].
  *
- *  For each of these reader methods, reading may begin mid-line,
- *  depending on the stream's position;
- *  see {Position}[rdoc-ref:IO@Position]:
- *
- *    f = File.new('t.txt')
- *    f.pos = 27
- *    f.each_line {|line| p line }
- *    f.close
+ *  ==== Stream Line Input
  *
- *  Output:
+ *  You can read lines from an \IO stream using these methods:
  *
- *    "rth line\n"
- *    "Fifth line\n"
+ *  - IO#each_line: Reads each remaining line, passing it to the given block.
+ *  - IO#gets: Returns the next line.
+ *  - IO#readline: Like #gets, but raises an exception at end-of-stream.
+ *  - IO#readlines: Returns all remaining lines in an array.
  *
- *  You can write to an \IO stream line-by-line using this method:
+ *  For each of these methods:
  *
- *  - IO#puts: Writes objects to the stream.
+ *  - Reading may begin mid-line,
+ *    depending on the stream's _position_;
+ *    see {Position}[rdoc-ref:IO@Position].
+ *  - Line parsing depends on the effective <i>line separator</i>;
+ *    see {Line Separator}[rdoc-ref:IO@Line+Separator].
+ *  - The length of each returned line depends on the effective <i>line limit</i>;
+ *    see {Line Limit}[rdoc-ref:IO@Line+Limit].
  *
- *  === Line Separator
+ *  ===== Line Separator
  *
- *  Each of these methods uses a <i>line separator</i>,
- *  which is the string that delimits lines:
+ *  Each of the {line input methods}[rdoc-ref:IO@Line+Input] uses a <i>line separator</i>:
+ *  the string that determines what is considered a line;
+ *  it is sometimes called the <i>input record separator</i>.
  *
- *  - IO.foreach.
- *  - IO.readlines.
- *  - IO#each_line.
- *  - IO#gets.
- *  - IO#readline.
- *  - IO#readlines.
+ *  The default line separator is taken from global variable <tt>$/</tt>,
+ *  whose initial value is <tt>"\n"</tt>.
  *
- *  The default line separator is the given by the global variable <tt>$/</tt>,
- *  whose value is by default <tt>"\n"</tt>.
- *  The line to be read next is all data from the current position
- *  to the next line separator:
+ *  Generally, the line to be read next is all data
+ *  from the current {position}[rdoc-ref:IO@Position]
+ *  to the next line separator
+ *  (but see {Special Line Separator Values}[rdoc-ref:IO@Special+Line+Separator+Values]):
  *
  *    f = File.new('t.txt')
+ *    # Method gets with no sep argument returns the next line, according to $/.
  *    f.gets # => "First line\n"
  *    f.gets # => "Second line\n"
  *    f.gets # => "\n"
@@ -14838,7 +15290,7 @@ set_LAST_READ_LINE(VALUE val, ID _x, VALUE *_y)
  *    f.gets # => "Fifth line\n"
  *    f.close
  *
- *  You can specify a different line separator:
+ *  You can use a different line separator by passing argument +sep+:
  *
  *    f = File.new('t.txt')
  *    f.gets('l')   # => "First l"
@@ -14847,15 +15299,27 @@ set_LAST_READ_LINE(VALUE val, ID _x, VALUE *_y)
  *    f.gets        # => "e\n"
  *    f.close
  *
- *  There are two special line separators:
+ *  Or by setting global variable <tt>$/</tt>:
+ *
+ *    f = File.new('t.txt')
+ *    $/ = 'l'
+ *    f.gets # => "First l"
+ *    f.gets # => "ine\nSecond l"
+ *    f.gets # => "ine\n\nFourth l"
+ *    f.close
+ *
+ *  ===== Special Line Separator Values
+ *
+ *  Each of the {line input methods}[rdoc-ref:IO@Line+Input]
+ *  accepts two special values for parameter +sep+:
  *
- *  - +nil+: The entire stream is read into a single string:
+ *  - +nil+: The entire stream is to be read ("slurped") into a single string:
  *
  *      f = File.new('t.txt')
  *      f.gets(nil) # => "First line\nSecond line\n\nFourth line\nFifth line\n"
  *      f.close
  *
- *  - <tt>''</tt> (the empty string): The next "paragraph" is read
+ *  - <tt>''</tt> (the empty string): The next "paragraph" is to be read
  *    (paragraphs being separated by two consecutive line separators):
  *
  *      f = File.new('t.txt')
@@ -14863,23 +15327,18 @@ set_LAST_READ_LINE(VALUE val, ID _x, VALUE *_y)
  *      f.gets('') # => "Fourth line\nFifth line\n"
  *      f.close
  *
- *  === Line Limit
+ *  ===== Line Limit
  *
- *  Each of these methods uses a <i>line limit</i>,
- *  which specifies that the number of bytes returned may not be (much) longer
- *  than the given +limit+;
+ *  Each of the {line input methods}[rdoc-ref:IO@Line+Input]
+ *  uses an integer <i>line limit</i>,
+ *  which restricts the number of bytes that may be returned.
+ *  (A multi-byte character will not be split, and so a returned line may be slightly longer
+ *  than the limit).
  *
- *  - IO.foreach.
- *  - IO.readlines.
- *  - IO#each_line.
- *  - IO#gets.
- *  - IO#readline.
- *  - IO#readlines.
+ *  The default limit value is <tt>-1</tt>;
+ *  any negative limit value means that there is no limit.
  *
- *  A multi-byte character will not be split, and so a line may be slightly longer
- *  than the given limit.
- *
- *  If +limit+ is not given, the line is determined only by +sep+.
+ *  If there is no limit, the line is determined only by +sep+.
  *
  *    # Text with 1-byte characters.
  *    File.open('t.txt') {|f| f.gets(1) }  # => "F"
@@ -14897,24 +15356,21 @@ set_LAST_READ_LINE(VALUE val, ID _x, VALUE *_y)
  *    File.open('t.rus') {|f| f.gets(3).size } # => 2
  *    File.open('t.rus') {|f| f.gets(4).size } # => 2
  *
- *  === Line Separator and Line Limit
+ *  ===== Line Separator and Line Limit
  *
- *  With arguments +sep+ and +limit+ given,
- *  combines the two behaviors:
+ *  With arguments +sep+ and +limit+ given, combines the two behaviors:
  *
  *  - Returns the next line as determined by line separator +sep+.
- *  - But returns no more bytes than are allowed by the limit.
+ *  - But returns no more bytes than are allowed by the limit +limit+.
  *
  *  Example:
  *
  *    File.open('t.txt') {|f| f.gets('li', 20) } # => "First li"
  *    File.open('t.txt') {|f| f.gets('li', 2) }  # => "Fi"
  *
- *  === Line Number
+ *  ===== Line Number
  *
- *  A readable \IO stream has a non-negative integer <i>line number</i>.
- *
- *  The relevant methods:
+ *  A readable \IO stream has a non-negative integer <i>line number</i>:
  *
  *  - IO#lineno: Returns the line number.
  *  - IO#lineno=: Resets and returns the line number.
@@ -14922,7 +15378,7 @@ set_LAST_READ_LINE(VALUE val, ID _x, VALUE *_y)
  *  Unless modified by a call to method IO#lineno=,
  *  the line number is the number of lines read
  *  by certain line-oriented methods,
- *  according to the given line separator +sep+:
+ *  according to the effective {line separator}[rdoc-ref:IO@Line+Separator]:
  *
  *  - IO.foreach: Increments the line number on each call to the block.
  *  - IO#each_line: Increments the line number on each call to the block.
@@ -14991,7 +15447,7 @@ set_LAST_READ_LINE(VALUE val, ID _x, VALUE *_y)
  *      # => 41
  *      f.close
  *
- *  - When a stream is read, <tt>#.</tt> is set to the line number for that stream:
+ *  - When a stream is read, <tt>$.</tt> is set to the line number for that stream:
  *
  *      f0 = File.new('t.txt')
  *      f1 = File.new('t.dat')
@@ -15012,6 +15468,12 @@ set_LAST_READ_LINE(VALUE val, ID _x, VALUE *_y)
  *      $.          # => 5
  *      f.close
  *
+ *  === Line Output
+ *
+ *  You can write to an \IO stream line-by-line using this method:
+ *
+ *  - IO#puts: Writes objects to the stream.
+ *
  *  == Character \IO
  *
  *  You can process an \IO stream character-by-character using these methods:
@@ -15022,6 +15484,7 @@ set_LAST_READ_LINE(VALUE val, ID _x, VALUE *_y)
  *  - IO#putc: Writes a character to the stream.
  *  - IO#each_char: Reads each remaining character in the stream,
  *    passing the character to the given block.
+ *
  *  == Byte \IO
  *
  *  You can process an \IO stream byte-by-byte using these methods:
@@ -15040,7 +15503,7 @@ set_LAST_READ_LINE(VALUE val, ID _x, VALUE *_y)
  *
  *  == What's Here
  *
- *  First, what's elsewhere. \Class \IO:
+ *  First, what's elsewhere. Class \IO:
  *
  *  - Inherits from {class Object}[rdoc-ref:Object@What-27s+Here].
  *  - Includes {module Enumerable}[rdoc-ref:Enumerable@What-27s+Here],
@@ -15243,8 +15706,11 @@ Init_IO(void)
     /* Can be raised by IO operations when IO#timeout= is set. */
     rb_eIOTimeoutError = rb_define_class_under(rb_cIO, "TimeoutError", rb_eIOError);
 
+    /* Readable event mask for IO#wait. */
     rb_define_const(rb_cIO, "READABLE", INT2NUM(RUBY_IO_READABLE));
+    /* Writable event mask for IO#wait. */
     rb_define_const(rb_cIO, "WRITABLE", INT2NUM(RUBY_IO_WRITABLE));
+    /* Priority event mask for IO#wait. */
     rb_define_const(rb_cIO, "PRIORITY", INT2NUM(RUBY_IO_PRIORITY));
 
     /* exception to wait for reading. see IO.select. */
@@ -15307,11 +15773,13 @@ Init_IO(void)
     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);
+    rb_vm_register_global_object(rb_default_rs);
     rb_rs = rb_default_rs;
     rb_output_rs = Qnil;
-    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_rs, 0, deprecated_rs_setter);
+    rb_gvar_ractor_local("$/"); // not local but ractor safe
+    rb_define_hooked_variable("$-0", &rb_rs, 0, deprecated_rs_setter);
+    rb_gvar_ractor_local("$-0"); // not local but ractor safe
     rb_define_hooked_variable("$\\", &rb_output_rs, 0, deprecated_str_setter);
 
     rb_define_virtual_variable("$_", get_LAST_READ_LINE, set_LAST_READ_LINE);
@@ -15358,7 +15826,6 @@ Init_IO(void)
     rb_define_method(rb_cIO, "read", io_read, -1);
     rb_define_method(rb_cIO, "write", io_write_m, -1);
     rb_define_method(rb_cIO, "gets", rb_io_gets_m, -1);
-    rb_define_method(rb_cIO, "readline", rb_io_readline, -1);
     rb_define_method(rb_cIO, "getc", rb_io_getc, 0);
     rb_define_method(rb_cIO, "getbyte", rb_io_getbyte, 0);
     rb_define_method(rb_cIO, "readchar",  rb_io_readchar, 0);
@@ -15502,7 +15969,7 @@ Init_IO(void)
     rb_define_method(rb_cARGF, "binmode", argf_binmode_m, 0);
     rb_define_method(rb_cARGF, "binmode?", argf_binmode_p, 0);
 
-    rb_define_method(rb_cARGF, "write", argf_write, 1);
+    rb_define_method(rb_cARGF, "write", argf_write, -1);
     rb_define_method(rb_cARGF, "print", rb_io_print, -1);
     rb_define_method(rb_cARGF, "putc", rb_io_putc, 1);
     rb_define_method(rb_cARGF, "puts", rb_io_puts, -1);
diff --git a/io.rb b/io.rb
index 40873ea4fdbd10..549c5e62bdb281 100644
--- a/io.rb
+++ b/io.rb
@@ -120,4 +120,17 @@ def read_nonblock(len, buf = nil, exception: true)
   def write_nonblock(buf, exception: true)
     Primitive.io_write_nonblock(buf, exception)
   end
+
+  # call-seq:
+  #   readline(sep = $/, chomp: false)   -> string
+  #   readline(limit, chomp: false)      -> string
+  #   readline(sep, limit, chomp: false) -> string
+  #
+  # Reads a line as with IO#gets, but raises EOFError if already at end-of-stream.
+  #
+  # Optional keyword argument +chomp+ specifies whether line separators
+  # are to be omitted.
+  def readline(sep = $/, limit = nil, chomp: false)
+    Primitive.io_readline(sep, limit, chomp)
+  end
 end
diff --git a/io_buffer.c b/io_buffer.c
index d987b8fa38e3cf..96f13c364afc30 100644
--- a/io_buffer.c
+++ b/io_buffer.c
@@ -6,17 +6,20 @@
 
 **********************************************************************/
 
-#include "ruby/io.h"
 #include "ruby/io/buffer.h"
 #include "ruby/fiber/scheduler.h"
 
+// For `rb_nogvl`.
+#include "ruby/thread.h"
+
 #include "internal.h"
 #include "internal/array.h"
 #include "internal/bits.h"
 #include "internal/error.h"
+#include "internal/gc.h"
 #include "internal/numeric.h"
 #include "internal/string.h"
-#include "internal/thread.h"
+#include "internal/io.h"
 
 VALUE rb_cIOBuffer;
 VALUE rb_eIOBufferLockedError;
@@ -34,6 +37,18 @@ size_t RUBY_IO_BUFFER_DEFAULT_SIZE;
 #include <sys/mman.h>
 #endif
 
+enum {
+    RB_IO_BUFFER_HEXDUMP_DEFAULT_WIDTH = 16,
+
+    RB_IO_BUFFER_INSPECT_HEXDUMP_MAXIMUM_SIZE = 256,
+    RB_IO_BUFFER_INSPECT_HEXDUMP_WIDTH = 16,
+
+    // This is used to validate the flags given by the user.
+    RB_IO_BUFFER_FLAGS_MASK = RB_IO_BUFFER_EXTERNAL | RB_IO_BUFFER_INTERNAL | RB_IO_BUFFER_MAPPED | RB_IO_BUFFER_SHARED | RB_IO_BUFFER_LOCKED | RB_IO_BUFFER_PRIVATE | RB_IO_BUFFER_READONLY,
+
+    RB_IO_BUFFER_DEBUG = 0,
+};
+
 struct rb_io_buffer {
     void *base;
     size_t size;
@@ -69,6 +84,8 @@ io_buffer_map_memory(size_t size, int flags)
     if (base == MAP_FAILED) {
         rb_sys_fail("io_buffer_map_memory:mmap");
     }
+
+    ruby_annotate_mmap(base, size, "Ruby:io_buffer_map_memory");
 #endif
 
     return base;
@@ -91,11 +108,9 @@ io_buffer_map_file(struct rb_io_buffer *buffer, int descriptor, size_t size, rb_
         access = FILE_MAP_WRITE;
     }
 
-    HANDLE mapping = CreateFileMapping(file, NULL, protect, 0, 0, NULL);
-    if (!mapping) rb_sys_fail("io_buffer_map_descriptor:CreateFileMapping");
-
     if (flags & RB_IO_BUFFER_PRIVATE) {
-        access |= FILE_MAP_COPY;
+        protect = PAGE_WRITECOPY;
+        access = FILE_MAP_COPY;
         buffer->flags |= RB_IO_BUFFER_PRIVATE;
     }
     else {
@@ -104,6 +119,10 @@ io_buffer_map_file(struct rb_io_buffer *buffer, int descriptor, size_t size, rb_
         buffer->flags |= RB_IO_BUFFER_SHARED;
     }
 
+    HANDLE mapping = CreateFileMapping(file, NULL, protect, 0, 0, NULL);
+    if (RB_IO_BUFFER_DEBUG) fprintf(stderr, "io_buffer_map_file:CreateFileMapping -> %p\n", mapping);
+    if (!mapping) rb_sys_fail("io_buffer_map_descriptor:CreateFileMapping");
+
     void *base = MapViewOfFile(mapping, access, (DWORD)(offset >> 32), (DWORD)(offset & 0xFFFFFFFF), size);
 
     if (!base) {
@@ -124,6 +143,7 @@ io_buffer_map_file(struct rb_io_buffer *buffer, int descriptor, size_t size, rb_
 
     if (flags & RB_IO_BUFFER_PRIVATE) {
         buffer->flags |= RB_IO_BUFFER_PRIVATE;
+        access |= MAP_PRIVATE;
     }
     else {
         // This buffer refers to external buffer.
@@ -143,16 +163,7 @@ io_buffer_map_file(struct rb_io_buffer *buffer, int descriptor, size_t size, rb_
     buffer->size = size;
 
     buffer->flags |= RB_IO_BUFFER_MAPPED;
-}
-
-static inline void
-io_buffer_unmap(void* base, size_t size)
-{
-#ifdef _WIN32
-    VirtualFree(base, 0, MEM_RELEASE);
-#else
-    munmap(base, size);
-#endif
+    buffer->flags |= RB_IO_BUFFER_FILE;
 }
 
 static void
@@ -183,7 +194,7 @@ io_buffer_zero(struct rb_io_buffer *buffer)
 }
 
 static void
-io_buffer_initialize(struct rb_io_buffer *buffer, void *base, size_t size, enum rb_io_buffer_flags flags, VALUE source)
+io_buffer_initialize(VALUE self, struct rb_io_buffer *buffer, void *base, size_t size, enum rb_io_buffer_flags flags, VALUE source)
 {
     if (base) {
         // If we are provided a pointer, we use it.
@@ -209,10 +220,14 @@ io_buffer_initialize(struct rb_io_buffer *buffer, void *base, size_t size, enum
     buffer->base = base;
     buffer->size = size;
     buffer->flags = flags;
-    buffer->source = source;
+    RB_OBJ_WRITE(self, &buffer->source, source);
+
+#if defined(_WIN32)
+    buffer->mapping = NULL;
+#endif
 }
 
-static int
+static void
 io_buffer_free(struct rb_io_buffer *buffer)
 {
     if (buffer->base) {
@@ -221,7 +236,16 @@ io_buffer_free(struct rb_io_buffer *buffer)
         }
 
         if (buffer->flags & RB_IO_BUFFER_MAPPED) {
-            io_buffer_unmap(buffer->base, buffer->size);
+#ifdef _WIN32
+            if (buffer->flags & RB_IO_BUFFER_FILE) {
+                UnmapViewOfFile(buffer->base);
+            }
+            else {
+                VirtualFree(buffer->base, 0, MEM_RELEASE);
+            }
+#else
+            munmap(buffer->base, buffer->size);
+#endif
         }
 
         // Previously we had this, but we found out due to the way GC works, we
@@ -232,40 +256,46 @@ io_buffer_free(struct rb_io_buffer *buffer)
 
         buffer->base = NULL;
 
-#if defined(_WIN32)
-        if (buffer->mapping) {
-            CloseHandle(buffer->mapping);
-            buffer->mapping = NULL;
-        }
-#endif
         buffer->size = 0;
         buffer->flags = 0;
         buffer->source = Qnil;
-
-        return 1;
     }
 
-    return 0;
+#if defined(_WIN32)
+    if (buffer->mapping) {
+        if (RB_IO_BUFFER_DEBUG) fprintf(stderr, "io_buffer_free:CloseHandle -> %p\n", buffer->mapping);
+        if (!CloseHandle(buffer->mapping)) {
+            fprintf(stderr, "io_buffer_free:GetLastError -> %lu\n", GetLastError());
+        }
+        buffer->mapping = NULL;
+    }
+#endif
 }
 
-void
-rb_io_buffer_type_mark(void *_buffer)
+static void
+rb_io_buffer_type_mark_and_move(void *_buffer)
 {
     struct rb_io_buffer *buffer = _buffer;
-    rb_gc_mark(buffer->source);
+    if (buffer->source != Qnil) {
+        if (RB_TYPE_P(buffer->source, T_STRING)) {
+            // The `source` String has to be pinned, because the `base` may point to the embedded String content,
+            // which can be otherwise moved by GC compaction.
+            rb_gc_mark(buffer->source);
+        } else {
+            rb_gc_mark_and_move(&buffer->source);
+        }
+    }
 }
 
-void
+static void
 rb_io_buffer_type_free(void *_buffer)
 {
     struct rb_io_buffer *buffer = _buffer;
 
     io_buffer_free(buffer);
-
-    free(buffer);
 }
 
-size_t
+static size_t
 rb_io_buffer_type_size(const void *_buffer)
 {
     const struct rb_io_buffer *buffer = _buffer;
@@ -281,14 +311,157 @@ rb_io_buffer_type_size(const void *_buffer)
 static const rb_data_type_t rb_io_buffer_type = {
     .wrap_struct_name = "IO::Buffer",
     .function = {
-        .dmark = rb_io_buffer_type_mark,
+        .dmark = rb_io_buffer_type_mark_and_move,
         .dfree = rb_io_buffer_type_free,
         .dsize = rb_io_buffer_type_size,
+        .dcompact = rb_io_buffer_type_mark_and_move,
     },
     .data = NULL,
-    .flags = RUBY_TYPED_FREE_IMMEDIATELY,
+    .flags = RUBY_TYPED_FREE_IMMEDIATELY | RUBY_TYPED_WB_PROTECTED | RUBY_TYPED_EMBEDDABLE,
 };
 
+static inline enum rb_io_buffer_flags
+io_buffer_extract_flags(VALUE argument)
+{
+    if (rb_int_negative_p(argument)) {
+        rb_raise(rb_eArgError, "Flags can't be negative!");
+    }
+
+    enum rb_io_buffer_flags flags = RB_NUM2UINT(argument);
+
+    // We deliberately ignore unknown flags. Any future flags which are exposed this way should be safe to ignore.
+    return flags & RB_IO_BUFFER_FLAGS_MASK;
+}
+
+// Extract an offset argument, which must be a non-negative integer.
+static inline size_t
+io_buffer_extract_offset(VALUE argument)
+{
+    if (rb_int_negative_p(argument)) {
+        rb_raise(rb_eArgError, "Offset can't be negative!");
+    }
+
+    return NUM2SIZET(argument);
+}
+
+// Extract a length argument, which must be a non-negative integer.
+// Length is generally considered a mutable property of an object and
+// semantically should be considered a subset of "size" as a concept.
+static inline size_t
+io_buffer_extract_length(VALUE argument)
+{
+    if (rb_int_negative_p(argument)) {
+        rb_raise(rb_eArgError, "Length can't be negative!");
+    }
+
+    return NUM2SIZET(argument);
+}
+
+// Extract a size argument, which must be a non-negative integer.
+// Size is generally considered an immutable property of an object.
+static inline size_t
+io_buffer_extract_size(VALUE argument)
+{
+    if (rb_int_negative_p(argument)) {
+        rb_raise(rb_eArgError, "Size can't be negative!");
+    }
+
+    return NUM2SIZET(argument);
+}
+
+// Extract a width argument, which must be a non-negative integer, and must be
+// at least the given minimum.
+static inline size_t
+io_buffer_extract_width(VALUE argument, size_t minimum)
+{
+    if (rb_int_negative_p(argument)) {
+        rb_raise(rb_eArgError, "Width can't be negative!");
+    }
+
+    size_t width = NUM2SIZET(argument);
+
+    if (width < minimum) {
+        rb_raise(rb_eArgError, "Width must be at least %" PRIuSIZE "!", minimum);
+    }
+
+    return width;
+}
+
+// Compute the default length for a buffer, given an offset into that buffer.
+// The default length is the size of the buffer minus the offset. The offset
+// must be less than the size of the buffer otherwise the length will be
+// invalid; in that case, an ArgumentError exception will be raised.
+static inline size_t
+io_buffer_default_length(const struct rb_io_buffer *buffer, size_t offset)
+{
+    if (offset > buffer->size) {
+        rb_raise(rb_eArgError, "The given offset is bigger than the buffer size!");
+    }
+
+    // Note that the "length" is computed by the size the offset.
+    return buffer->size - offset;
+}
+
+// Extract the optional length and offset arguments, returning the buffer.
+// The length and offset are optional, but if they are provided, they must be
+// positive integers. If the length is not provided, the default length is
+// computed from the buffer size and offset. If the offset is not provided, it
+// defaults to zero.
+static inline struct rb_io_buffer *
+io_buffer_extract_length_offset(VALUE self, int argc, VALUE argv[], size_t *length, size_t *offset)
+{
+    struct rb_io_buffer *buffer = NULL;
+    TypedData_Get_Struct(self, struct rb_io_buffer, &rb_io_buffer_type, buffer);
+
+    if (argc >= 2 && !NIL_P(argv[1])) {
+        *offset = io_buffer_extract_offset(argv[1]);
+    }
+    else {
+        *offset = 0;
+    }
+
+    if (argc >= 1 && !NIL_P(argv[0])) {
+        *length = io_buffer_extract_length(argv[0]);
+    }
+    else {
+        *length = io_buffer_default_length(buffer, *offset);
+    }
+
+    return buffer;
+}
+
+// Extract the optional offset and length arguments, returning the buffer.
+// Similar to `io_buffer_extract_length_offset` but with the order of arguments
+// reversed.
+//
+// After much consideration, I decided to accept both forms.
+// The `(offset, length)` order is more natural when referring about data,
+// while the `(length, offset)` order is more natural when referring to
+// read/write operations. In many cases, with the latter form, `offset`
+// is usually not supplied.
+static inline struct rb_io_buffer *
+io_buffer_extract_offset_length(VALUE self, int argc, VALUE argv[], size_t *offset, size_t *length)
+{
+    struct rb_io_buffer *buffer = NULL;
+    TypedData_Get_Struct(self, struct rb_io_buffer, &rb_io_buffer_type, buffer);
+
+    if (argc >= 1 && !NIL_P(argv[0])) {
+        *offset = io_buffer_extract_offset(argv[0]);
+    }
+    else {
+        *offset = 0;
+    }
+
+    if (argc >= 2 && !NIL_P(argv[1])) {
+        *length = io_buffer_extract_length(argv[1]);
+    }
+    else {
+        *length = io_buffer_default_length(buffer, *offset);
+    }
+
+    return buffer;
+}
+
 VALUE
 rb_io_buffer_type_allocate(VALUE self)
 {
@@ -315,7 +488,7 @@ static VALUE io_buffer_for_make_instance(VALUE klass, VALUE string, enum rb_io_b
     if (!(flags & RB_IO_BUFFER_READONLY))
         rb_str_modify(string);
 
-    io_buffer_initialize(buffer, RSTRING_PTR(string), RSTRING_LEN(string), flags, string);
+    io_buffer_initialize(instance, buffer, RSTRING_PTR(string), RSTRING_LEN(string), flags, string);
 
     return instance;
 }
@@ -334,7 +507,9 @@ io_buffer_for_yield_instance(VALUE _arguments)
 
     arguments->instance = io_buffer_for_make_instance(arguments->klass, arguments->string, arguments->flags);
 
-    rb_str_locktmp(arguments->string);
+    if (!RB_OBJ_FROZEN(arguments->string)) {
+        rb_str_locktmp(arguments->string);
+    }
 
     return rb_yield(arguments->instance);
 }
@@ -348,7 +523,9 @@ io_buffer_for_yield_instance_ensure(VALUE _arguments)
         rb_io_buffer_free(arguments->instance);
     }
 
-    rb_str_unlocktmp(arguments->string);
+    if (!RB_OBJ_FROZEN(arguments->string)) {
+        rb_str_unlocktmp(arguments->string);
+    }
 
     return Qnil;
 }
@@ -358,11 +535,11 @@ io_buffer_for_yield_instance_ensure(VALUE _arguments)
  *    IO::Buffer.for(string) -> readonly io_buffer
  *    IO::Buffer.for(string) {|io_buffer| ... read/write io_buffer ...}
  *
- *  Creates a IO::Buffer from the given string's memory. Without a block a
- *  frozen internal copy of the string is created efficiently and used as the
- *  buffer source. When a block is provided, the buffer is associated directly
- *  with the string's internal buffer and updating the buffer will update the
- *  string.
+ *  Creates a zero-copy IO::Buffer from the given string's memory. Without a
+ *  block a frozen internal copy of the string is created efficiently and used
+ *  as the buffer source. When a block is provided, the buffer is associated
+ *  directly with the string's internal buffer and updating the buffer will
+ *  update the string.
  *
  *  Until #free is invoked on the buffer, either explicitly or via the garbage
  *  collector, the source string will be locked and cannot be modified.
@@ -417,9 +594,9 @@ rb_io_buffer_type_for(VALUE klass, VALUE string)
  * call-seq:
  *   IO::Buffer.string(length) {|io_buffer| ... read/write io_buffer ...} -> string
  *
- * Creates a new string of the given length and yields a IO::Buffer instance
- * to the block which uses the string as a source. The block is expected to
- * write to the buffer and the string will be returned.
+ * Creates a new string of the given length and yields a zero-copy IO::Buffer
+ * instance to the block which uses the string as a source. The block is
+ * expected to write to the buffer and the string will be returned.
  *
  *    IO::Buffer.string(4) do |buffer|
  *      buffer.set_string("Ruby")
@@ -450,7 +627,7 @@ rb_io_buffer_new(void *base, size_t size, enum rb_io_buffer_flags flags)
     struct rb_io_buffer *buffer = NULL;
     TypedData_Get_Struct(instance, struct rb_io_buffer, &rb_io_buffer_type, buffer);
 
-    io_buffer_initialize(buffer, base, size, flags, Qnil);
+    io_buffer_initialize(instance, buffer, base, size, flags, Qnil);
 
     return instance;
 }
@@ -484,8 +661,6 @@ rb_io_buffer_map(VALUE io, size_t size, rb_off_t offset, enum rb_io_buffer_flags
  *  mapping, you need to open a file in read-write mode, and explicitly pass
  *  +flags+ argument without IO::Buffer::IMMUTABLE.
  *
- *  Example:
- *
  *    File.write('test.txt', 'test')
  *
  *    buffer = IO::Buffer.map(File.open('test.txt'), nil, 0, IO::Buffer::READONLY)
@@ -521,7 +696,7 @@ io_buffer_map(int argc, VALUE *argv, VALUE klass)
 
     size_t size;
     if (argc >= 2 && !RB_NIL_P(argv[1])) {
-        size = RB_NUM2SIZE(argv[1]);
+        size = io_buffer_extract_size(argv[1]);
     }
     else {
         rb_off_t file_size = rb_file_size(io);
@@ -540,6 +715,7 @@ io_buffer_map(int argc, VALUE *argv, VALUE klass)
         }
     }
 
+    // This is the file offset, not the buffer offset:
     rb_off_t offset = 0;
     if (argc >= 3) {
         offset = NUM2OFFT(argv[2]);
@@ -547,7 +723,7 @@ io_buffer_map(int argc, VALUE *argv, VALUE klass)
 
     enum rb_io_buffer_flags flags = 0;
     if (argc >= 4) {
-        flags = RB_NUM2UINT(argv[3]);
+        flags = io_buffer_extract_flags(argv[3]);
     }
 
     return rb_io_buffer_map(io, size, offset, flags);
@@ -575,8 +751,6 @@ io_flags_for_size(size_t size)
  *  on Windows). The behavior can be forced by passing IO::Buffer::MAPPED
  *  as a second parameter.
  *
- *  Examples
- *
  *    buffer = IO::Buffer.new(4)
  *    # =>
  *    # #<IO::Buffer 0x000055b34497ea10+4 INTERNAL>
@@ -601,9 +775,8 @@ rb_io_buffer_initialize(int argc, VALUE *argv, VALUE self)
     TypedData_Get_Struct(self, struct rb_io_buffer, &rb_io_buffer_type, buffer);
 
     size_t size;
-
     if (argc > 0) {
-        size = RB_NUM2SIZE(argv[0]);
+        size = io_buffer_extract_size(argv[0]);
     }
     else {
         size = RUBY_IO_BUFFER_DEFAULT_SIZE;
@@ -611,13 +784,13 @@ rb_io_buffer_initialize(int argc, VALUE *argv, VALUE self)
 
     enum rb_io_buffer_flags flags = 0;
     if (argc >= 2) {
-        flags = RB_NUM2UINT(argv[1]);
+        flags = io_buffer_extract_flags(argv[1]);
     }
     else {
         flags |= io_flags_for_size(size);
     }
 
-    io_buffer_initialize(buffer, NULL, size, flags, Qnil);
+    io_buffer_initialize(self, buffer, NULL, size, flags, Qnil);
 
     return self;
 }
@@ -663,6 +836,83 @@ io_buffer_validate(struct rb_io_buffer *buffer)
     }
 }
 
+enum rb_io_buffer_flags
+rb_io_buffer_get_bytes(VALUE self, void **base, size_t *size)
+{
+    struct rb_io_buffer *buffer = NULL;
+    TypedData_Get_Struct(self, struct rb_io_buffer, &rb_io_buffer_type, buffer);
+
+    if (io_buffer_validate(buffer)) {
+        if (buffer->base) {
+            *base = buffer->base;
+            *size = buffer->size;
+
+            return buffer->flags;
+        }
+    }
+
+    *base = NULL;
+    *size = 0;
+
+    return 0;
+}
+
+// Internal function for accessing bytes for writing, wil
+static inline void
+io_buffer_get_bytes_for_writing(struct rb_io_buffer *buffer, void **base, size_t *size)
+{
+    if (buffer->flags & RB_IO_BUFFER_READONLY ||
+        (!NIL_P(buffer->source) && OBJ_FROZEN(buffer->source))) {
+        rb_raise(rb_eIOBufferAccessError, "Buffer is not writable!");
+    }
+
+    if (!io_buffer_validate(buffer)) {
+        rb_raise(rb_eIOBufferInvalidatedError, "Buffer is invalid!");
+    }
+
+    if (buffer->base) {
+        *base = buffer->base;
+        *size = buffer->size;
+    } else {
+        *base = NULL;
+        *size = 0;
+    }
+}
+
+void
+rb_io_buffer_get_bytes_for_writing(VALUE self, void **base, size_t *size)
+{
+    struct rb_io_buffer *buffer = NULL;
+    TypedData_Get_Struct(self, struct rb_io_buffer, &rb_io_buffer_type, buffer);
+
+    io_buffer_get_bytes_for_writing(buffer, base, size);
+}
+
+static void
+io_buffer_get_bytes_for_reading(struct rb_io_buffer *buffer, const void **base, size_t *size)
+{
+    if (!io_buffer_validate(buffer)) {
+        rb_raise(rb_eIOBufferInvalidatedError, "Buffer has been invalidated!");
+    }
+
+    if (buffer->base) {
+        *base = buffer->base;
+        *size = buffer->size;
+    } else {
+        *base = NULL;
+        *size = 0;
+    }
+}
+
+void
+rb_io_buffer_get_bytes_for_reading(VALUE self, const void **base, size_t *size)
+{
+    struct rb_io_buffer *buffer = NULL;
+    TypedData_Get_Struct(self, struct rb_io_buffer, &rb_io_buffer_type, buffer);
+
+    io_buffer_get_bytes_for_reading(buffer, base, size);
+}
+
 /*
  *  call-seq: to_s -> string
  *
@@ -699,6 +949,10 @@ rb_io_buffer_to_s(VALUE self)
         rb_str_cat2(result, " MAPPED");
     }
 
+    if (buffer->flags & RB_IO_BUFFER_FILE) {
+        rb_str_cat2(result, " FILE");
+    }
+
     if (buffer->flags & RB_IO_BUFFER_SHARED) {
         rb_str_cat2(result, " SHARED");
     }
@@ -707,6 +961,10 @@ rb_io_buffer_to_s(VALUE self)
         rb_str_cat2(result, " LOCKED");
     }
 
+    if (buffer->flags & RB_IO_BUFFER_PRIVATE) {
+        rb_str_cat2(result, " PRIVATE");
+    }
+
     if (buffer->flags & RB_IO_BUFFER_READONLY) {
         rb_str_cat2(result, " READONLY");
     }
@@ -722,13 +980,38 @@ rb_io_buffer_to_s(VALUE self)
     return rb_str_cat2(result, ">");
 }
 
+// Compute the output size of a hexdump of the given width (bytes per line), total size, and whether it is the first line in the output.
+// This is used to preallocate the output string.
+inline static size_t
+io_buffer_hexdump_output_size(size_t width, size_t size, int first)
+{
+    // The preview on the right hand side is 1:1:
+    size_t total = size;
+
+    size_t whole_lines = (size / width);
+    size_t partial_line = (size % width) ? 1 : 0;
+
+    // For each line:
+    // 1 byte    10 bytes  1 byte  width*3 bytes   1 byte  size bytes
+    // (newline) (address) (space) (hexdump      ) (space) (preview)
+    total += (whole_lines + partial_line) * (1 + 10 + width*3 + 1 + 1);
+
+    // If the hexdump is the first line, one less newline will be emitted:
+    if (size && first) total -= 1;
+
+    return total;
+}
+
+// Append a hexdump of the given width (bytes per line), base address, size, and whether it is the first line in the output.
+// If the hexdump is not the first line, it will prepend a newline if there is any output at all.
+// If formatting here is adjusted, please update io_buffer_hexdump_output_size accordingly.
 static VALUE
-io_buffer_hexdump(VALUE string, size_t width, char *base, size_t size, int first)
+io_buffer_hexdump(VALUE string, size_t width, const char *base, size_t length, size_t offset, int first)
 {
     char *text = alloca(width+1);
     text[width] = '\0';
 
-    for (size_t offset = 0; offset < size; offset += width) {
+    for (; offset < length; offset += width) {
         memset(text, '\0', width);
         if (first) {
             rb_str_catf(string, "0x%08" PRIxSIZE " ", offset);
@@ -739,7 +1022,7 @@ io_buffer_hexdump(VALUE string, size_t width, char *base, size_t size, int first
         }
 
         for (size_t i = 0; i < width; i += 1) {
-            if (offset+i < size) {
+            if (offset+i < length) {
                 unsigned char value = ((unsigned char*)base)[offset+i];
 
                 if (value < 127 && isprint(value)) {
@@ -762,23 +1045,18 @@ io_buffer_hexdump(VALUE string, size_t width, char *base, size_t size, int first
     return string;
 }
 
-static VALUE
-rb_io_buffer_hexdump(VALUE self)
-{
-    struct rb_io_buffer *buffer = NULL;
-    TypedData_Get_Struct(self, struct rb_io_buffer, &rb_io_buffer_type, buffer);
-
-    VALUE result = Qnil;
-
-    if (io_buffer_validate(buffer) && buffer->base) {
-        result = rb_str_buf_new(buffer->size*3 + (buffer->size/16)*12 + 1);
-
-        io_buffer_hexdump(result, 16, buffer->base, buffer->size, 1);
-    }
-
-    return result;
-}
-
+/*
+ *  call-seq: inspect -> string
+ *
+ *  Inspect the buffer and report useful information about it's internal state.
+ *  Only a limited portion of the buffer will be displayed in a hexdump style
+ *  format.
+ *
+ *    buffer = IO::Buffer.for("Hello World")
+ *    puts buffer.inspect
+ *    # #<IO::Buffer 0x000000010198ccd8+11 EXTERNAL READONLY SLICE>
+ *    # 0x00000000  48 65 6c 6c 6f 20 57 6f 72 6c 64                Hello World
+ */
 VALUE
 rb_io_buffer_inspect(VALUE self)
 {
@@ -788,9 +1066,19 @@ rb_io_buffer_inspect(VALUE self)
     VALUE result = rb_io_buffer_to_s(self);
 
     if (io_buffer_validate(buffer)) {
-        // Limit the maximum size generated by inspect.
-        if (buffer->size <= 256) {
-            io_buffer_hexdump(result, 16, buffer->base, buffer->size, 0);
+        // Limit the maximum size generated by inspect:
+        size_t size = buffer->size;
+        int clamped = 0;
+
+        if (size > RB_IO_BUFFER_INSPECT_HEXDUMP_MAXIMUM_SIZE) {
+            size = RB_IO_BUFFER_INSPECT_HEXDUMP_MAXIMUM_SIZE;
+            clamped = 1;
+        }
+
+        io_buffer_hexdump(result, RB_IO_BUFFER_INSPECT_HEXDUMP_WIDTH, buffer->base, size, 0, 0);
+
+        if (clamped) {
+            rb_str_catf(result, "\n(and %" PRIuSIZE " more bytes not printed)", buffer->size - size);
         }
     }
 
@@ -817,8 +1105,8 @@ rb_io_buffer_size(VALUE self)
  *
  *  Returns whether the buffer buffer is accessible.
  *
- *  A buffer becomes invalid if it is a slice of another buffer which has been
- *  freed.
+ *  A buffer becomes invalid if it is a slice of another buffer (or string)
+ *  which has been freed or re-allocated at a different address.
  */
 static VALUE
 rb_io_buffer_valid_p(VALUE self)
@@ -832,8 +1120,16 @@ rb_io_buffer_valid_p(VALUE self)
 /*
  *  call-seq: null? -> true or false
  *
- *  If the buffer was freed with #free or was never allocated in the first
- *  place.
+ *  If the buffer was freed with #free, transferred with #transfer, or was
+ *  never allocated in the first place.
+ *
+ *    buffer = IO::Buffer.new(0)
+ *    buffer.null? #=> true
+ *
+ *    buffer = IO::Buffer.new(4)
+ *    buffer.null? #=> false
+ *    buffer.free
+ *    buffer.null? #=> true
  */
 static VALUE
 rb_io_buffer_null_p(VALUE self)
@@ -933,6 +1229,22 @@ rb_io_buffer_mapped_p(VALUE self)
  *  If the buffer is _shared_, meaning it references memory that can be shared
  *  with other processes (and thus might change without being modified
  *  locally).
+ *
+ *    # Create a test file:
+ *    File.write('test.txt', 'test')
+ *
+ *    # Create a shared mapping from the given file, the file must be opened in
+ *    # read-write mode unless we also specify IO::Buffer::READONLY:
+ *    buffer = IO::Buffer.map(File.open('test.txt', 'r+'), nil, 0)
+ *    # => #<IO::Buffer 0x00007f1bffd5e000+4 EXTERNAL MAPPED SHARED>
+ *
+ *    # Write to the buffer, which will modify the mapped file:
+ *    buffer.set_string('b', 0)
+ *    # => 1
+ *
+ *    # The file itself is modified:
+ *    File.read('test.txt')
+ *    # => "best"
  */
 static VALUE
 rb_io_buffer_shared_p(VALUE self)
@@ -953,8 +1265,6 @@ rb_io_buffer_shared_p(VALUE self)
  *  Locking is not thread safe, but is a semantic used to ensure buffers don't
  *  move while being used by a system call.
  *
- *  Example:
- *
  *    buffer.locked do
  *      buffer.write(io) # theoretical system call interface
  *    end
@@ -968,6 +1278,37 @@ rb_io_buffer_locked_p(VALUE self)
     return RBOOL(buffer->flags & RB_IO_BUFFER_LOCKED);
 }
 
+/*  call-seq: private? -> true or false
+ *
+ *  If the buffer is _private_, meaning modifications to the buffer will not
+ *  be replicated to the underlying file mapping.
+ *
+ *    # Create a test file:
+ *    File.write('test.txt', 'test')
+ *
+ *    # Create a private mapping from the given file. Note that the file here
+ *    # is opened in read-only mode, but it doesn't matter due to the private
+ *    # mapping:
+ *    buffer = IO::Buffer.map(File.open('test.txt'), nil, 0, IO::Buffer::PRIVATE)
+ *    # => #<IO::Buffer 0x00007fce63f11000+4 MAPPED PRIVATE>
+ *
+ *    # Write to the buffer (invoking CoW of the underlying file buffer):
+ *    buffer.set_string('b', 0)
+ *    # => 1
+ *
+ *    # The file itself is not modified:
+ *    File.read('test.txt')
+ *    # => "test"
+ */
+static VALUE
+rb_io_buffer_private_p(VALUE self)
+{
+    struct rb_io_buffer *buffer = NULL;
+    TypedData_Get_Struct(self, struct rb_io_buffer, &rb_io_buffer_type, buffer);
+
+    return RBOOL(buffer->flags & RB_IO_BUFFER_PRIVATE);
+}
+
 int
 rb_io_buffer_readonly_p(VALUE self)
 {
@@ -1061,8 +1402,6 @@ rb_io_buffer_try_unlock(VALUE self)
  *  non-blocking system calls. You can only share a buffer between threads with
  *  appropriate synchronisation techniques.
  *
- *  Example:
- *
  *    buffer = IO::Buffer.new(4)
  *    buffer.locked? #=> false
  *
@@ -1110,8 +1449,6 @@ rb_io_buffer_locked(VALUE self)
  *
  *  You can resize a freed buffer to re-allocate it.
  *
- *  Example:
- *
  *    buffer = IO::Buffer.for('test')
  *    buffer.free
  *    # => #<IO::Buffer 0x0000000000000000+0 NULL>
@@ -1156,203 +1493,145 @@ VALUE rb_io_buffer_free_locked(VALUE self)
 static inline void
 io_buffer_validate_range(struct rb_io_buffer *buffer, size_t offset, size_t length)
 {
+    // We assume here that offset + length won't overflow:
     if (offset + length > buffer->size) {
-        rb_raise(rb_eArgError, "Specified offset+length exceeds buffer size!");
+        rb_raise(rb_eArgError, "Specified offset+length is bigger than the buffer size!");
     }
 }
 
-static VALUE
-rb_io_buffer_slice(struct rb_io_buffer *buffer, VALUE self, size_t offset, size_t length)
-{
-    io_buffer_validate_range(buffer, offset, length);
-
-    VALUE instance = rb_io_buffer_type_allocate(rb_class_of(self));
-    struct rb_io_buffer *slice = NULL;
-    TypedData_Get_Struct(instance, struct rb_io_buffer, &rb_io_buffer_type, slice);
-
-    slice->base = (char*)buffer->base + offset;
-    slice->size = length;
-
-    // The source should be the root buffer:
-    if (buffer->source != Qnil)
-        slice->source = buffer->source;
-    else
-        slice->source = self;
-
-    return instance;
-}
-
 /*
- *  call-seq: slice([offset = 0, [length]]) -> io_buffer
- *
- *  Produce another IO::Buffer which is a slice (or view into) the current one
- *  starting at +offset+ bytes and going for +length+ bytes.
- *
- *  The slicing happens without copying of memory, and the slice keeps being
- *  associated with the original buffer's source (string, or file), if any.
- *
- *  If the offset is not given, it will be zero. If the offset is negative, it
- *  will raise an ArgumentError.
+ *  call-seq: hexdump([offset, [length, [width]]]) -> string
  *
- *  If the length is not given, the slice will be as long as the original
- *  buffer minus the specified offset. If the length is negative, it will raise
- *  an ArgumentError.
+ *  Returns a human-readable string representation of the buffer. The exact
+ *  format is subject to change.
  *
- *  Raises RuntimeError if the <tt>offset+length</tt> is out of the current
- *  buffer's bounds.
- *
- *  Example:
- *
- *    string = 'test'
- *    buffer = IO::Buffer.for(string)
- *
- *    slice = buffer.slice
- *    # =>
- *    # #<IO::Buffer 0x0000000108338e68+4 SLICE>
- *    # 0x00000000  74 65 73 74                                     test
- *
- *    buffer.slice(2)
- *    # =>
- *    # #<IO::Buffer 0x0000000108338e6a+2 SLICE>
- *    # 0x00000000  73 74                                           st
- *
- *    slice = buffer.slice(1, 2)
- *    # =>
- *    # #<IO::Buffer 0x00007fc3d34ebc49+2 SLICE>
- *    # 0x00000000  65 73                                           es
- *
- *    # Put "o" into 0s position of the slice
- *    slice.set_string('o', 0)
- *    slice
- *    # =>
- *    # #<IO::Buffer 0x00007fc3d34ebc49+2 SLICE>
- *    # 0x00000000  6f 73                                           os
+ *    buffer = IO::Buffer.for("Hello World")
+ *    puts buffer.hexdump
+ *    # 0x00000000  48 65 6c 6c 6f 20 57 6f 72 6c 64                Hello World
  *
- *    # it is also visible at position 1 of the original buffer
- *    buffer
- *    # =>
- *    # #<IO::Buffer 0x00007fc3d31e2d80+4 SLICE>
- *    # 0x00000000  74 6f 73 74                                     tost
+ *  As buffers are usually fairly big, you may want to limit the output by
+ *  specifying the offset and length:
  *
- *    # ...and original string
- *    string
- *    # => tost
+ *    puts buffer.hexdump(6, 5)
+ *    # 0x00000006  57 6f 72 6c 64                                  World
  */
 static VALUE
-io_buffer_slice(int argc, VALUE *argv, VALUE self)
-{
-    rb_check_arity(argc, 0, 2);
-
-    struct rb_io_buffer *buffer = NULL;
-    TypedData_Get_Struct(self, struct rb_io_buffer, &rb_io_buffer_type, buffer);
-
-    size_t offset = 0, length = 0;
-
-    if (argc > 0) {
-        if (rb_int_negative_p(argv[0])) {
-            rb_raise(rb_eArgError, "Offset can't be negative!");
-        }
-
-        offset = NUM2SIZET(argv[0]);
-    }
-
-    if (argc > 1) {
-        if (rb_int_negative_p(argv[1])) {
-            rb_raise(rb_eArgError, "Length can't be negative!");
-        }
-
-        length = NUM2SIZET(argv[1]);
-    }
-    else {
-        length = buffer->size - offset;
-    }
-
-    return rb_io_buffer_slice(buffer, self, offset, length);
-}
-
-int
-rb_io_buffer_get_bytes(VALUE self, void **base, size_t *size)
+rb_io_buffer_hexdump(int argc, VALUE *argv, VALUE self)
 {
-    struct rb_io_buffer *buffer = NULL;
-    TypedData_Get_Struct(self, struct rb_io_buffer, &rb_io_buffer_type, buffer);
+    rb_check_arity(argc, 0, 3);
 
-    if (io_buffer_validate(buffer)) {
-        if (buffer->base) {
-            *base = buffer->base;
-            *size = buffer->size;
+    size_t offset, length;
+    struct rb_io_buffer *buffer = io_buffer_extract_offset_length(self, argc, argv, &offset, &length);
 
-            return buffer->flags;
-        }
+    size_t width = RB_IO_BUFFER_HEXDUMP_DEFAULT_WIDTH;
+    if (argc >= 3) {
+        width = io_buffer_extract_width(argv[2], 1);
     }
 
-    *base = NULL;
-    *size = 0;
-
-    return 0;
-}
-
-static inline void
-io_buffer_get_bytes_for_writing(struct rb_io_buffer *buffer, void **base, size_t *size)
-{
-    if (buffer->flags & RB_IO_BUFFER_READONLY) {
-        rb_raise(rb_eIOBufferAccessError, "Buffer is not writable!");
-    }
+    // This may raise an exception if the offset/length is invalid:
+    io_buffer_validate_range(buffer, offset, length);
 
-    if (!io_buffer_validate(buffer)) {
-        rb_raise(rb_eIOBufferInvalidatedError, "Buffer is invalid!");
-    }
+    VALUE result = Qnil;
 
-    if (buffer->base) {
-        *base = buffer->base;
-        *size = buffer->size;
+    if (io_buffer_validate(buffer) && buffer->base) {
+        result = rb_str_buf_new(io_buffer_hexdump_output_size(width, length, 1));
 
-        return;
+        io_buffer_hexdump(result, width, buffer->base, offset+length, offset, 1);
     }
 
-    rb_raise(rb_eIOBufferAllocationError, "The buffer is not allocated!");
-}
-
-void
-rb_io_buffer_get_bytes_for_writing(VALUE self, void **base, size_t *size)
-{
-    struct rb_io_buffer *buffer = NULL;
-    TypedData_Get_Struct(self, struct rb_io_buffer, &rb_io_buffer_type, buffer);
-
-    io_buffer_get_bytes_for_writing(buffer, base, size);
+    return result;
 }
 
-static void
-io_buffer_get_bytes_for_reading(struct rb_io_buffer *buffer, const void **base, size_t *size)
+static VALUE
+rb_io_buffer_slice(struct rb_io_buffer *buffer, VALUE self, size_t offset, size_t length)
 {
-    if (!io_buffer_validate(buffer)) {
-        rb_raise(rb_eIOBufferInvalidatedError, "Buffer has been invalidated!");
-    }
+    io_buffer_validate_range(buffer, offset, length);
 
-    if (buffer->base) {
-        *base = buffer->base;
-        *size = buffer->size;
+    VALUE instance = rb_io_buffer_type_allocate(rb_class_of(self));
+    struct rb_io_buffer *slice = NULL;
+    TypedData_Get_Struct(instance, struct rb_io_buffer, &rb_io_buffer_type, slice);
 
-        return;
+    slice->flags |= (buffer->flags & RB_IO_BUFFER_READONLY);
+    slice->base = (char*)buffer->base + offset;
+    slice->size = length;
+
+    // The source should be the root buffer:
+    if (buffer->source != Qnil) {
+        RB_OBJ_WRITE(instance, &slice->source, buffer->source);
+    }
+    else {
+        RB_OBJ_WRITE(instance, &slice->source, self);
     }
 
-    rb_raise(rb_eIOBufferAllocationError, "The buffer is not allocated!");
+    return instance;
 }
 
-void
-rb_io_buffer_get_bytes_for_reading(VALUE self, const void **base, size_t *size)
+/*
+ *  call-seq: slice([offset, [length]]) -> io_buffer
+ *
+ *  Produce another IO::Buffer which is a slice (or view into) the current one
+ *  starting at +offset+ bytes and going for +length+ bytes.
+ *
+ *  The slicing happens without copying of memory, and the slice keeps being
+ *  associated with the original buffer's source (string, or file), if any.
+ *
+ *  If the offset is not given, it will be zero. If the offset is negative, it
+ *  will raise an ArgumentError.
+ *
+ *  If the length is not given, the slice will be as long as the original
+ *  buffer minus the specified offset. If the length is negative, it will raise
+ *  an ArgumentError.
+ *
+ *  Raises RuntimeError if the <tt>offset+length</tt> is out of the current
+ *  buffer's bounds.
+ *
+ *    string = 'test'
+ *    buffer = IO::Buffer.for(string).dup
+ *
+ *    slice = buffer.slice
+ *    # =>
+ *    # #<IO::Buffer 0x0000000108338e68+4 SLICE>
+ *    # 0x00000000  74 65 73 74                                     test
+ *
+ *    buffer.slice(2)
+ *    # =>
+ *    # #<IO::Buffer 0x0000000108338e6a+2 SLICE>
+ *    # 0x00000000  73 74                                           st
+ *
+ *    slice = buffer.slice(1, 2)
+ *    # =>
+ *    # #<IO::Buffer 0x00007fc3d34ebc49+2 SLICE>
+ *    # 0x00000000  65 73                                           es
+ *
+ *    # Put "o" into 0s position of the slice
+ *    slice.set_string('o', 0)
+ *    slice
+ *    # =>
+ *    # #<IO::Buffer 0x00007fc3d34ebc49+2 SLICE>
+ *    # 0x00000000  6f 73                                           os
+ *
+ *    # it is also visible at position 1 of the original buffer
+ *    buffer
+ *    # =>
+ *    # #<IO::Buffer 0x00007fc3d31e2d80+4 INTERNAL>
+ *    # 0x00000000  74 6f 73 74                                     tost
+ */
+static VALUE
+io_buffer_slice(int argc, VALUE *argv, VALUE self)
 {
-    struct rb_io_buffer *buffer = NULL;
-    TypedData_Get_Struct(self, struct rb_io_buffer, &rb_io_buffer_type, buffer);
+    rb_check_arity(argc, 0, 2);
 
-    io_buffer_get_bytes_for_reading(buffer, base, size);
+    size_t offset, length;
+    struct rb_io_buffer *buffer = io_buffer_extract_offset_length(self, argc, argv, &offset, &length);
+
+    return rb_io_buffer_slice(buffer, self, offset, length);
 }
 
 /*
  *  call-seq: transfer -> new_io_buffer
  *
- *  Transfers ownership to a new buffer, deallocating the current one.
- *
- *  Example:
+ *  Transfers ownership of the underlying memory to a new buffer, causing the
+ *  current buffer to become uninitialized.
  *
  *    buffer = IO::Buffer.new('test')
  *    other = buffer.transfer
@@ -1395,11 +1674,11 @@ io_buffer_resize_clear(struct rb_io_buffer *buffer, void* base, size_t size)
 }
 
 static void
-io_buffer_resize_copy(struct rb_io_buffer *buffer, size_t size)
+io_buffer_resize_copy(VALUE self, struct rb_io_buffer *buffer, size_t size)
 {
     // Slow path:
     struct rb_io_buffer resized;
-    io_buffer_initialize(&resized, NULL, size, io_flags_for_size(size), Qnil);
+    io_buffer_initialize(self, &resized, NULL, size, io_flags_for_size(size), Qnil);
 
     if (buffer->base) {
         size_t preserve = buffer->size;
@@ -1424,7 +1703,7 @@ rb_io_buffer_resize(VALUE self, size_t size)
     }
 
     if (buffer->base == NULL) {
-        io_buffer_initialize(buffer, NULL, size, io_flags_for_size(size), Qnil);
+        io_buffer_initialize(self, buffer, NULL, size, io_flags_for_size(size), Qnil);
         return;
     }
 
@@ -1469,7 +1748,7 @@ rb_io_buffer_resize(VALUE self, size_t size)
         return;
     }
 
-    io_buffer_resize_copy(buffer, size);
+    io_buffer_resize_copy(self, buffer, size);
 }
 
 /*
@@ -1493,7 +1772,7 @@ rb_io_buffer_resize(VALUE self, size_t size)
 static VALUE
 io_buffer_resize(VALUE self, VALUE size)
 {
-    rb_io_buffer_resize(self, NUM2SIZET(size));
+    rb_io_buffer_resize(self, io_buffer_extract_size(size));
 
     return self;
 }
@@ -1664,8 +1943,6 @@ io_buffer_buffer_type_size(ID buffer_type)
  *
  *  Returns the size of the given buffer type(s) in bytes.
  *
- *  Example:
- *
  *    IO::Buffer.size_of(:u32) # => 4
  *    IO::Buffer.size_of([:u32, :u32]) # => 8
  */
@@ -1744,8 +2021,6 @@ rb_io_buffer_get_value(const void* base, size_t size, ID buffer_type, size_t *of
  *  in the buffer. For example, a +:u32+ buffer type is a 32-bit unsigned
  *  integer in little-endian format.
  *
- *  Example:
- *
  *    string = [1.5].pack('f')
  *    # => "\x00\x00\xC0?"
  *    IO::Buffer.for(string).get_value(:f32, 0)
@@ -1756,7 +2031,7 @@ io_buffer_get_value(VALUE self, VALUE type, VALUE _offset)
 {
     const void *base;
     size_t size;
-    size_t offset = NUM2SIZET(_offset);
+    size_t offset = io_buffer_extract_offset(_offset);
 
     rb_io_buffer_get_bytes_for_reading(self, &base, &size);
 
@@ -1769,8 +2044,6 @@ io_buffer_get_value(VALUE self, VALUE type, VALUE _offset)
  *  Similar to #get_value, except that it can handle multiple buffer types and
  *  returns an array of values.
  *
- *  Example:
- *
  *    string = [1.5, 2.5].pack('ff')
  *    IO::Buffer.for(string).get_values([:f32, :f32], 0)
  *    # => [1.5, 2.5]
@@ -1778,7 +2051,7 @@ io_buffer_get_value(VALUE self, VALUE type, VALUE _offset)
 static VALUE
 io_buffer_get_values(VALUE self, VALUE buffer_types, VALUE _offset)
 {
-    size_t offset = NUM2SIZET(_offset);
+    size_t offset = io_buffer_extract_offset(_offset);
 
     const void *base;
     size_t size;
@@ -1799,6 +2072,40 @@ io_buffer_get_values(VALUE self, VALUE buffer_types, VALUE _offset)
     return array;
 }
 
+// Extract a count argument, which must be a positive integer.
+// Count is generally considered relative to the number of things.
+static inline size_t
+io_buffer_extract_count(VALUE argument)
+{
+    if (rb_int_negative_p(argument)) {
+        rb_raise(rb_eArgError, "Count can't be negative!");
+    }
+
+    return NUM2SIZET(argument);
+}
+
+static inline void
+io_buffer_extract_offset_count(ID buffer_type, size_t size, int argc, VALUE *argv, size_t *offset, size_t *count)
+{
+    if (argc >= 1) {
+        *offset = io_buffer_extract_offset(argv[0]);
+    }
+    else {
+        *offset = 0;
+    }
+
+    if (argc >= 2) {
+        *count = io_buffer_extract_count(argv[1]);
+    }
+    else {
+        if (*offset > size) {
+            rb_raise(rb_eArgError, "The given offset is bigger than the buffer size!");
+        }
+
+        *count = (size - *offset) / io_buffer_buffer_type_size(buffer_type);
+    }
+}
+
 /*
  *  call-seq:
  *    each(buffer_type, [offset, [count]]) {|offset, value| ...} -> self
@@ -1809,8 +2116,6 @@ io_buffer_get_values(VALUE self, VALUE buffer_types, VALUE _offset)
  *
  *  If +count+ is given, only +count+ values will be yielded.
  *
- *  Example:
- *
  *    IO::Buffer.for("Hello World").each(:U8, 2, 2) do |offset, value|
  *      puts "#{offset}: #{value}"
  *    end
@@ -1835,21 +2140,8 @@ io_buffer_each(int argc, VALUE *argv, VALUE self)
         buffer_type = RB_IO_BUFFER_DATA_TYPE_U8;
     }
 
-    size_t offset;
-    if (argc >= 2) {
-        offset = NUM2SIZET(argv[1]);
-    }
-    else {
-        offset = 0;
-    }
-
-    size_t count;
-    if (argc >= 3) {
-        count = NUM2SIZET(argv[2]);
-    }
-    else {
-        count = (size - offset) / io_buffer_buffer_type_size(buffer_type);
-    }
+    size_t offset, count;
+    io_buffer_extract_offset_count(buffer_type, size, argc-1, argv+1, &offset, &count);
 
     for (size_t i = 0; i < count; i++) {
         size_t current_offset = offset;
@@ -1867,8 +2159,6 @@ io_buffer_each(int argc, VALUE *argv, VALUE self)
  *
  *  If +count+ is given, only +count+ values will be returned.
  *
- *  Example:
- *
  *    IO::Buffer.for("Hello World").values(:U8, 2, 2)
  *    # => [108, 108]
  */
@@ -1888,21 +2178,8 @@ io_buffer_values(int argc, VALUE *argv, VALUE self)
         buffer_type = RB_IO_BUFFER_DATA_TYPE_U8;
     }
 
-    size_t offset;
-    if (argc >= 2) {
-        offset = NUM2SIZET(argv[1]);
-    }
-    else {
-        offset = 0;
-    }
-
-    size_t count;
-    if (argc >= 3) {
-        count = NUM2SIZET(argv[2]);
-    }
-    else {
-        count = (size - offset) / io_buffer_buffer_type_size(buffer_type);
-    }
+    size_t offset, count;
+    io_buffer_extract_offset_count(buffer_type, size, argc-1, argv+1, &offset, &count);
 
     VALUE array = rb_ary_new_capa(count);
 
@@ -1923,8 +2200,6 @@ io_buffer_values(int argc, VALUE *argv, VALUE self)
  *
  *  If +count+ is given, only +count+ bytes will be yielded.
  *
- *  Example:
- *
  *    IO::Buffer.for("Hello World").each_byte(2, 2) do |offset, byte|
  *      puts "#{offset}: #{byte}"
  *    end
@@ -1941,21 +2216,8 @@ io_buffer_each_byte(int argc, VALUE *argv, VALUE self)
 
     rb_io_buffer_get_bytes_for_reading(self, &base, &size);
 
-    size_t offset;
-    if (argc >= 2) {
-        offset = NUM2SIZET(argv[1]);
-    }
-    else {
-        offset = 0;
-    }
-
-    size_t count;
-    if (argc >= 3) {
-        count = NUM2SIZET(argv[2]);
-    }
-    else {
-        count = (size - offset);
-    }
+    size_t offset, count;
+    io_buffer_extract_offset_count(RB_IO_BUFFER_DATA_TYPE_U8, size, argc-1, argv+1, &offset, &count);
 
     for (size_t i = 0; i < count; i++) {
         unsigned char *value = (unsigned char *)base + i + offset;
@@ -2031,7 +2293,7 @@ io_buffer_set_value(VALUE self, VALUE type, VALUE _offset, VALUE value)
 {
     void *base;
     size_t size;
-    size_t offset = NUM2SIZET(_offset);
+    size_t offset = io_buffer_extract_offset(_offset);
 
     rb_io_buffer_get_bytes_for_writing(self, &base, &size);
 
@@ -2047,8 +2309,6 @@ io_buffer_set_value(VALUE self, VALUE type, VALUE _offset, VALUE value)
  *  should be an array of symbols as described in #get_value. +values+ should
  *  be an array of values to write.
  *
- *  Example:
- *
  *    buffer = IO::Buffer.new(8)
  *    buffer.set_values([:U8, :U16], 0, [1, 2])
  *    buffer
@@ -2071,7 +2331,7 @@ io_buffer_set_values(VALUE self, VALUE buffer_types, VALUE _offset, VALUE values
         rb_raise(rb_eArgError, "Argument buffer_types and values should have the same length!");
     }
 
-    size_t offset = NUM2SIZET(_offset);
+    size_t offset = io_buffer_extract_offset(_offset);
 
     void *base;
     size_t size;
@@ -2086,8 +2346,32 @@ io_buffer_set_values(VALUE self, VALUE buffer_types, VALUE _offset, VALUE values
     return SIZET2NUM(offset);
 }
 
+static size_t IO_BUFFER_BLOCKING_SIZE = 1024*1024;
+
+struct io_buffer_memmove_arguments {
+    unsigned char * destination;
+    const unsigned char * source;
+    size_t length;
+};
+
+static void *
+io_buffer_memmove_blocking(void *data)
+{
+    struct io_buffer_memmove_arguments *arguments = (struct io_buffer_memmove_arguments *)data;
+
+    memmove(arguments->destination, arguments->source, arguments->length);
+
+    return NULL;
+}
+
+static void
+io_buffer_memmove_unblock(void *data)
+{
+    // No safe way to interrupt.
+}
+
 static void
-io_buffer_memcpy(struct rb_io_buffer *buffer, size_t offset, const void *source_base, size_t source_offset, size_t source_size, size_t length)
+io_buffer_memmove(struct rb_io_buffer *buffer, size_t offset, const void *source_base, size_t source_offset, size_t source_size, size_t length)
 {
     void *base;
     size_t size;
@@ -2096,31 +2380,38 @@ io_buffer_memcpy(struct rb_io_buffer *buffer, size_t offset, const void *source_
     io_buffer_validate_range(buffer, offset, length);
 
     if (source_offset + length > source_size) {
-        rb_raise(rb_eArgError, "The computed source range exceeds the size of the source!");
+        rb_raise(rb_eArgError, "The computed source range exceeds the size of the source buffer!");
     }
 
-    memcpy((unsigned char*)base+offset, (unsigned char*)source_base+source_offset, length);
+    struct io_buffer_memmove_arguments arguments = {
+        .destination = (unsigned char*)base+offset,
+        .source = (unsigned char*)source_base+source_offset,
+        .length = length
+    };
+
+    if (arguments.length >= IO_BUFFER_BLOCKING_SIZE) {
+        rb_nogvl(io_buffer_memmove_blocking, &arguments, io_buffer_memmove_unblock, &arguments, RB_NOGVL_OFFLOAD_SAFE);
+    } else if (arguments.length != 0) {
+        memmove(arguments.destination, arguments.source, arguments.length);
+    }
 }
 
 // (offset, length, source_offset) -> length
 static VALUE
 io_buffer_copy_from(struct rb_io_buffer *buffer, const void *source_base, size_t source_size, int argc, VALUE *argv)
 {
-    size_t offset;
+    size_t offset = 0;
     size_t length;
     size_t source_offset;
 
     // The offset we copy into the buffer:
     if (argc >= 1) {
-        offset = NUM2SIZET(argv[0]);
-    }
-    else {
-        offset = 0;
+        offset = io_buffer_extract_offset(argv[0]);
     }
 
     // The offset we start from within the string:
     if (argc >= 3) {
-        source_offset = NUM2SIZET(argv[2]);
+        source_offset = io_buffer_extract_offset(argv[2]);
 
         if (source_offset > source_size) {
             rb_raise(rb_eArgError, "The given source offset is bigger than the source itself!");
@@ -2132,14 +2423,14 @@ io_buffer_copy_from(struct rb_io_buffer *buffer, const void *source_base, size_t
 
     // The length we are going to copy:
     if (argc >= 2 && !RB_NIL_P(argv[1])) {
-        length = NUM2SIZET(argv[1]);
+        length = io_buffer_extract_length(argv[1]);
     }
     else {
         // Default to the source offset -> source size:
         length = source_size - source_offset;
     }
 
-    io_buffer_memcpy(buffer, offset, source_base, source_offset, source_size, length);
+    io_buffer_memmove(buffer, offset, source_base, source_offset, source_size, length);
 
     return SIZET2NUM(length);
 }
@@ -2172,7 +2463,7 @@ rb_io_buffer_initialize_copy(VALUE self, VALUE source)
 
     rb_io_buffer_get_bytes_for_reading(source, &source_base, &source_size);
 
-    io_buffer_initialize(buffer, NULL, source_size, io_flags_for_size(source_size), Qnil);
+    io_buffer_initialize(self, buffer, NULL, source_size, io_flags_for_size(source_size), Qnil);
 
     return io_buffer_copy_from(buffer, source_base, source_size, 0, NULL);
 }
@@ -2182,7 +2473,7 @@ rb_io_buffer_initialize_copy(VALUE self, VALUE source)
  *    copy(source, [offset, [length, [source_offset]]]) -> size
  *
  *  Efficiently copy from a source IO::Buffer into the buffer, at +offset+
- *  using +memcpy+. For copying String instances, see #set_string.
+ *  using +memmove+. For copying String instances, see #set_string.
  *
  *    buffer = IO::Buffer.new(32)
  *    # =>
@@ -2200,13 +2491,14 @@ rb_io_buffer_initialize_copy(VALUE self, VALUE source)
  *
  *  #copy can be used to put buffer into strings associated with buffer:
  *
- *    string= "buffer:    "
- *    # => "buffer:    "
- *    buffer = IO::Buffer.for(string)
- *    buffer.copy(IO::Buffer.for("test"), 5)
+ *    string = "data:    "
+ *    # => "data:    "
+ *    buffer = IO::Buffer.for(string) do |buffer|
+ *      buffer.copy(IO::Buffer.for("test"), 5)
+ *    end
  *    # => 4
  *    string
- *    # => "buffer:test"
+ *    # => "data:test"
  *
  *  Attempt to copy into a read-only buffer will fail:
  *
@@ -2229,7 +2521,20 @@ rb_io_buffer_initialize_copy(VALUE self, VALUE source)
  *
  *    buffer = IO::Buffer.new(2)
  *    buffer.copy(IO::Buffer.for('test'), 0)
- *    # in `copy': Specified offset+length exceeds source size! (ArgumentError)
+ *    # in `copy': Specified offset+length is bigger than the buffer size! (ArgumentError)
+ *
+ *  It is safe to copy between memory regions that overlaps each other.
+ *  In such case, the data is copied as if the data was first copied from the source buffer to
+ *  a temporary buffer, and then copied from the temporary buffer to the destination buffer.
+ *
+ *    buffer = IO::Buffer.new(10)
+ *    buffer.set_string("0123456789")
+ *    buffer.copy(buffer, 3, 7)
+ *    # => 7
+ *    buffer
+ *    # =>
+ *    # #<IO::Buffer 0x000056494f8ce440+10 INTERNAL>
+ *    # 0x00000000  30 31 32 30 31 32 33 34 35 36                   0120123456
  */
 static VALUE
 io_buffer_copy(int argc, VALUE *argv, VALUE self)
@@ -2267,31 +2572,20 @@ io_buffer_get_string(int argc, VALUE *argv, VALUE self)
 {
     rb_check_arity(argc, 0, 3);
 
-    struct rb_io_buffer *buffer = NULL;
-    TypedData_Get_Struct(self, struct rb_io_buffer, &rb_io_buffer_type, buffer);
+    size_t offset, length;
+    struct rb_io_buffer *buffer = io_buffer_extract_offset_length(self, argc, argv, &offset, &length);
 
     const void *base;
     size_t size;
     io_buffer_get_bytes_for_reading(buffer, &base, &size);
 
-    size_t offset = 0;
-    size_t length = size;
-    rb_encoding *encoding = rb_ascii8bit_encoding();
-
-    if (argc >= 1) {
-        offset = NUM2SIZET(argv[0]);
-    }
-
-    if (argc >= 2 && !RB_NIL_P(argv[1])) {
-        length = NUM2SIZET(argv[1]);
-    }
-    else {
-        length = size - offset;
-    }
-
+    rb_encoding *encoding;
     if (argc >= 3) {
         encoding = rb_find_encoding(argv[2]);
     }
+    else {
+        encoding = rb_ascii8bit_encoding();
+    }
 
     io_buffer_validate_range(buffer, offset, length);
 
@@ -2301,8 +2595,8 @@ io_buffer_get_string(int argc, VALUE *argv, VALUE self)
 /*
  *  call-seq: set_string(string, [offset, [length, [source_offset]]]) -> size
  *
- *  Efficiently copy buffer from a source String into the buffer,
- *  at +offset+ using +memcpy+.
+ *  Efficiently copy from a source String into the buffer, at +offset+ using
+ *  +memmove+.
  *
  *    buf = IO::Buffer.new(8)
  *    # =>
@@ -2340,14 +2634,14 @@ io_buffer_set_string(int argc, VALUE *argv, VALUE self)
 void
 rb_io_buffer_clear(VALUE self, uint8_t value, size_t offset, size_t length)
 {
+    struct rb_io_buffer *buffer = NULL;
+    TypedData_Get_Struct(self, struct rb_io_buffer, &rb_io_buffer_type, buffer);
+
     void *base;
     size_t size;
+    io_buffer_get_bytes_for_writing(buffer, &base, &size);
 
-    rb_io_buffer_get_bytes_for_writing(self, &base, &size);
-
-    if (offset + length > size) {
-        rb_raise(rb_eArgError, "The given offset + length out of bounds!");
-    }
+    io_buffer_validate_range(buffer, offset, length);
 
     memset((char*)base + offset, value, length);
 }
@@ -2358,29 +2652,29 @@ rb_io_buffer_clear(VALUE self, uint8_t value, size_t offset, size_t length)
  *  Fill buffer with +value+, starting with +offset+ and going for +length+
  *  bytes.
  *
- *    buffer = IO::Buffer.for('test')
+ *    buffer = IO::Buffer.for('test').dup
  *    # =>
- *    #   <IO::Buffer 0x00007fca40087c38+4 SLICE>
+ *    #   <IO::Buffer 0x00007fca40087c38+4 INTERNAL>
  *    #   0x00000000  74 65 73 74         test
  *
  *    buffer.clear
  *    # =>
- *    #   <IO::Buffer 0x00007fca40087c38+4 SLICE>
+ *    #   <IO::Buffer 0x00007fca40087c38+4 INTERNAL>
  *    #   0x00000000  00 00 00 00         ....
  *
  *    buf.clear(1) # fill with 1
  *    # =>
- *    #   <IO::Buffer 0x00007fca40087c38+4 SLICE>
+ *    #   <IO::Buffer 0x00007fca40087c38+4 INTERNAL>
  *    #   0x00000000  01 01 01 01         ....
  *
  *    buffer.clear(2, 1, 2) # fill with 2, starting from offset 1, for 2 bytes
  *    # =>
- *    #   <IO::Buffer 0x00007fca40087c38+4 SLICE>
+ *    #   <IO::Buffer 0x00007fca40087c38+4 INTERNAL>
  *    #   0x00000000  01 02 02 01         ....
  *
  *    buffer.clear(2, 1) # fill with 2, starting from offset 1
  *    # =>
- *    #   <IO::Buffer 0x00007fca40087c38+4 SLICE>
+ *    #   <IO::Buffer 0x00007fca40087c38+4 INTERNAL>
  *    #   0x00000000  01 02 02 02         ....
  */
 static VALUE
@@ -2388,26 +2682,13 @@ io_buffer_clear(int argc, VALUE *argv, VALUE self)
 {
     rb_check_arity(argc, 0, 3);
 
-    struct rb_io_buffer *buffer = NULL;
-    TypedData_Get_Struct(self, struct rb_io_buffer, &rb_io_buffer_type, buffer);
-
     uint8_t value = 0;
     if (argc >= 1) {
         value = NUM2UINT(argv[0]);
     }
 
-    size_t offset = 0;
-    if (argc >= 2) {
-        offset = NUM2SIZET(argv[1]);
-    }
-
-    size_t length;
-    if (argc >= 3) {
-        length = NUM2SIZET(argv[2]);
-    }
-    else {
-        length = buffer->size - offset;
-    }
+    size_t offset, length;
+    io_buffer_extract_offset_length(self, argc-1, argv+1, &offset, &length);
 
     rb_io_buffer_clear(self, value, offset, length);
 
@@ -2440,10 +2721,10 @@ io_buffer_default_size(size_t page_size)
 }
 
 struct io_buffer_blocking_region_argument {
+    struct rb_io *io;
     struct rb_io_buffer *buffer;
     rb_blocking_function_t *function;
     void *data;
-    int descriptor;
 };
 
 static VALUE
@@ -2451,7 +2732,7 @@ io_buffer_blocking_region_begin(VALUE _argument)
 {
     struct io_buffer_blocking_region_argument *argument = (void*)_argument;
 
-    return rb_thread_io_blocking_region(argument->function, argument->data, argument->descriptor);
+    return rb_io_blocking_region(argument->io, argument->function, argument->data);
 }
 
 static VALUE
@@ -2465,13 +2746,16 @@ io_buffer_blocking_region_ensure(VALUE _argument)
 }
 
 static VALUE
-io_buffer_blocking_region(struct rb_io_buffer *buffer, rb_blocking_function_t *function, void *data, int descriptor)
+io_buffer_blocking_region(VALUE io, struct rb_io_buffer *buffer, rb_blocking_function_t *function, void *data)
 {
+    struct rb_io *ioptr;
+    RB_IO_POINTER(io, ioptr);
+
     struct io_buffer_blocking_region_argument argument = {
+        .io = ioptr,
         .buffer = buffer,
         .function = function,
         .data = data,
-        .descriptor = descriptor,
     };
 
     // If the buffer is already locked, we can skip the ensure (unlock):
@@ -2486,35 +2770,6 @@ io_buffer_blocking_region(struct rb_io_buffer *buffer, rb_blocking_function_t *f
     }
 }
 
-static inline struct rb_io_buffer *
-io_buffer_extract_arguments(VALUE self, int argc, VALUE argv[], size_t *length, size_t *offset)
-{
-    struct rb_io_buffer *buffer = NULL;
-    TypedData_Get_Struct(self, struct rb_io_buffer, &rb_io_buffer_type, buffer);
-
-    *offset = 0;
-    if (argc >= 2) {
-        if (rb_int_negative_p(argv[1])) {
-            rb_raise(rb_eArgError, "Offset can't be negative!");
-        }
-
-        *offset = NUM2SIZET(argv[1]);
-    }
-
-    if (argc >= 1 && !NIL_P(argv[0])) {
-        if (rb_int_negative_p(argv[0])) {
-            rb_raise(rb_eArgError, "Length can't be negative!");
-        }
-
-        *length = NUM2SIZET(argv[0]);
-    }
-    else {
-        *length = buffer->size - *offset;
-    }
-
-    return buffer;
-}
-
 struct io_buffer_read_internal_argument {
     // The file descriptor to read from:
     int descriptor;
@@ -2557,6 +2812,8 @@ io_buffer_read_internal(void *_argument)
 VALUE
 rb_io_buffer_read(VALUE self, VALUE io, size_t length, size_t offset)
 {
+    io = rb_io_get_io(io);
+
     VALUE scheduler = rb_fiber_scheduler_current();
     if (scheduler != Qnil) {
         VALUE result = rb_fiber_scheduler_io_read(scheduler, io, self, length, offset);
@@ -2587,7 +2844,7 @@ rb_io_buffer_read(VALUE self, VALUE io, size_t length, size_t offset)
         .length = length,
     };
 
-    return io_buffer_blocking_region(buffer, io_buffer_read_internal, &argument, descriptor);
+    return io_buffer_blocking_region(io, buffer, io_buffer_read_internal, &argument);
 }
 
 /*
@@ -2604,8 +2861,6 @@ rb_io_buffer_read(VALUE self, VALUE io, size_t length, size_t offset)
  *  If +offset+ is not given, it defaults to zero, i.e. the beginning of the
  *  buffer.
  *
- *  Example:
- *
  *    IO::Buffer.for('test') do |buffer|
  *      p buffer
  *      # =>
@@ -2626,7 +2881,7 @@ io_buffer_read(int argc, VALUE *argv, VALUE self)
     VALUE io = argv[0];
 
     size_t length, offset;
-    io_buffer_extract_arguments(self, argc-1, argv+1, &length, &offset);
+    io_buffer_extract_length_offset(self, argc-1, argv+1, &length, &offset);
 
     return rb_io_buffer_read(self, io, length, offset);
 }
@@ -2676,6 +2931,8 @@ io_buffer_pread_internal(void *_argument)
 VALUE
 rb_io_buffer_pread(VALUE self, VALUE io, rb_off_t from, size_t length, size_t offset)
 {
+    io = rb_io_get_io(io);
+
     VALUE scheduler = rb_fiber_scheduler_current();
     if (scheduler != Qnil) {
         VALUE result = rb_fiber_scheduler_io_pread(scheduler, io, from, self, length, offset);
@@ -2707,7 +2964,7 @@ rb_io_buffer_pread(VALUE self, VALUE io, rb_off_t from, size_t length, size_t of
         .offset = from,
     };
 
-    return io_buffer_blocking_region(buffer, io_buffer_pread_internal, &argument, descriptor);
+    return io_buffer_blocking_region(io, buffer, io_buffer_pread_internal, &argument);
 }
 
 /*
@@ -2725,8 +2982,6 @@ rb_io_buffer_pread(VALUE self, VALUE io, rb_off_t from, size_t length, size_t of
  *  If +offset+ is not given, it defaults to zero, i.e. the beginning of the
  *  buffer.
  *
- *  Example:
- *
  *    IO::Buffer.for('test') do |buffer|
  *      p buffer
  *      # =>
@@ -2751,7 +3006,7 @@ io_buffer_pread(int argc, VALUE *argv, VALUE self)
     rb_off_t from = NUM2OFFT(argv[1]);
 
     size_t length, offset;
-    io_buffer_extract_arguments(self, argc-2, argv+2, &length, &offset);
+    io_buffer_extract_length_offset(self, argc-2, argv+2, &length, &offset);
 
     return rb_io_buffer_pread(self, io, from, length, offset);
 }
@@ -2798,6 +3053,8 @@ io_buffer_write_internal(void *_argument)
 VALUE
 rb_io_buffer_write(VALUE self, VALUE io, size_t length, size_t offset)
 {
+    io = rb_io_get_write_io(rb_io_get_io(io));
+
     VALUE scheduler = rb_fiber_scheduler_current();
     if (scheduler != Qnil) {
         VALUE result = rb_fiber_scheduler_io_write(scheduler, io, self, length, offset);
@@ -2828,7 +3085,7 @@ rb_io_buffer_write(VALUE self, VALUE io, size_t length, size_t offset)
         .length = length,
     };
 
-    return io_buffer_blocking_region(buffer, io_buffer_write_internal, &argument, descriptor);
+    return io_buffer_blocking_region(io, buffer, io_buffer_write_internal, &argument);
 }
 
 /*
@@ -2845,8 +3102,6 @@ rb_io_buffer_write(VALUE self, VALUE io, size_t length, size_t offset)
  *  If +offset+ is not given, it defaults to zero, i.e. the beginning of the
  *  buffer.
  *
- *  Example:
- *
  *    out = File.open('output.txt', 'wb')
  *    IO::Buffer.for('1234567').write(out, 3)
  *
@@ -2860,10 +3115,11 @@ io_buffer_write(int argc, VALUE *argv, VALUE self)
     VALUE io = argv[0];
 
     size_t length, offset;
-    io_buffer_extract_arguments(self, argc-1, argv+1, &length, &offset);
+    io_buffer_extract_length_offset(self, argc-1, argv+1, &length, &offset);
 
     return rb_io_buffer_write(self, io, length, offset);
 }
+
 struct io_buffer_pwrite_internal_argument {
     // The file descriptor to write to:
     int descriptor;
@@ -2909,6 +3165,8 @@ io_buffer_pwrite_internal(void *_argument)
 VALUE
 rb_io_buffer_pwrite(VALUE self, VALUE io, rb_off_t from, size_t length, size_t offset)
 {
+    io = rb_io_get_write_io(rb_io_get_io(io));
+
     VALUE scheduler = rb_fiber_scheduler_current();
     if (scheduler != Qnil) {
         VALUE result = rb_fiber_scheduler_io_pwrite(scheduler, io, from, self, length, offset);
@@ -2948,7 +3206,7 @@ rb_io_buffer_pwrite(VALUE self, VALUE io, rb_off_t from, size_t length, size_t o
         .offset = from,
     };
 
-    return io_buffer_blocking_region(buffer, io_buffer_pwrite_internal, &argument, descriptor);
+    return io_buffer_blocking_region(io, buffer, io_buffer_pwrite_internal, &argument);
 }
 
 /*
@@ -2969,8 +3227,6 @@ rb_io_buffer_pwrite(VALUE self, VALUE io, rb_off_t from, size_t length, size_t o
  *  If the +from+ position is beyond the end of the file, the gap will be
  *  filled with null (0 value) bytes.
  *
- *  Example:
- *
  *    out = File.open('output.txt', File::RDWR) # open for read/write, no truncation
  *    IO::Buffer.for('1234567').pwrite(out, 2, 3, 1)
  *
@@ -2986,7 +3242,7 @@ io_buffer_pwrite(int argc, VALUE *argv, VALUE self)
     rb_off_t from = NUM2OFFT(argv[1]);
 
     size_t length, offset;
-    io_buffer_extract_arguments(self, argc-2, argv+2, &length, &offset);
+    io_buffer_extract_length_offset(self, argc-2, argv+2, &length, &offset);
 
     return rb_io_buffer_pwrite(self, io, from, length, offset);
 }
@@ -3160,7 +3416,7 @@ io_buffer_overlaps(const struct rb_io_buffer *a, const struct rb_io_buffer *b)
         return io_buffer_overlaps(b, a);
     }
 
-    return (b->base >= a->base) && (b->base <= (void*)((unsigned char *)a->base + a->size));
+    return (b->base >= a->base) && (b->base < (void*)((unsigned char *)a->base + a->size));
 }
 
 static inline void
@@ -3351,24 +3607,28 @@ io_buffer_not_inplace(VALUE self)
 /*
  *  Document-class: IO::Buffer
  *
- *  IO::Buffer is a low-level efficient buffer for input/output. There are three
- *  ways of using buffer:
+ *  IO::Buffer is a efficient zero-copy buffer for input/output. There are
+ *  typical use cases:
  *
  *  * Create an empty buffer with ::new, fill it with buffer using #copy or
- *    #set_value, #set_string, get buffer with #get_string;
+ *    #set_value, #set_string, get buffer with #get_string or write it directly
+ *    to some file with #write.
  *  * Create a buffer mapped to some string with ::for, then it could be used
  *    both for reading with #get_string or #get_value, and writing (writing will
- *    change the source string, too);
+ *    change the source string, too).
  *  * Create a buffer mapped to some file with ::map, then it could be used for
  *    reading and writing the underlying file.
+ *  * Create a string of a fixed size with ::string, then #read into it, or
+ *    modify it using #set_value.
  *
  *  Interaction with string and file memory is performed by efficient low-level
  *  C mechanisms like `memcpy`.
  *
  *  The class is meant to be an utility for implementing more high-level mechanisms
- *  like Fiber::SchedulerInterface#io_read and Fiber::SchedulerInterface#io_write.
+ *  like Fiber::Scheduler#io_read and Fiber::Scheduler#io_write and parsing binary
+ *  protocols.
  *
- *  <b>Examples of usage:</b>
+ *  == Examples of Usage
  *
  *  Empty buffer:
  *
@@ -3387,30 +3647,28 @@ io_buffer_not_inplace(VALUE self)
  *
  *  \Buffer from string:
  *
- *    string = 'buffer'
- *    buffer = IO::Buffer.for(string)
- *    # =>
- *    # #<IO::Buffer 0x00007f3f02be9b18+4 SLICE>
- *    # ...
- *    buffer
- *    # =>
- *    # #<IO::Buffer 0x00007f3f02be9b18+4 SLICE>
- *    # 0x00000000  64 61 74 61                                     buffer
- *
- *    buffer.get_string(2)  # read content starting from offset 2
- *    # => "ta"
- *    buffer.set_string('---', 1) # write content, starting from offset 1
- *    # => 3
- *    buffer
- *    # =>
- *    # #<IO::Buffer 0x00007f3f02be9b18+4 SLICE>
- *    # 0x00000000  64 2d 2d 2d                                     d---
- *    string  # original string changed, too
- *    # => "d---"
+ *    string = 'data'
+ *    IO::Buffer.for(string) do |buffer|
+ *      buffer
+ *      # =>
+ *      # #<IO::Buffer 0x00007f3f02be9b18+4 SLICE>
+ *      # 0x00000000  64 61 74 61                                     data
+ *
+ *      buffer.get_string(2)  # read content starting from offset 2
+ *      # => "ta"
+ *      buffer.set_string('---', 1) # write content, starting from offset 1
+ *      # => 3
+ *      buffer
+ *      # =>
+ *      # #<IO::Buffer 0x00007f3f02be9b18+4 SLICE>
+ *      # 0x00000000  64 2d 2d 2d                                     d---
+ *      string  # original string changed, too
+ *      # => "d---"
+ *    end
  *
  *  \Buffer from file:
  *
- *    File.write('test.txt', 'test buffer')
+ *    File.write('test.txt', 'test data')
  *    # => 9
  *    buffer = IO::Buffer.map(File.open('test.txt'))
  *    # =>
@@ -3427,18 +3685,30 @@ io_buffer_not_inplace(VALUE self)
  *    buffer.set_string('---', 1)
  *    # => 3 -- bytes written
  *    File.read('test.txt')
- *    # => "t--- buffer"
+ *    # => "t--- data"
  *
- *  <b>The class is experimental and the interface is subject to change.</b>
+ *  <b>The class is experimental and the interface is subject to change, this
+ *  is especially true of file mappings which may be removed entirely in
+ *  the future.</b>
  */
 void
 Init_IO_Buffer(void)
 {
     rb_cIOBuffer = rb_define_class_under(rb_cIO, "Buffer", rb_cObject);
+
+    /* Raised when an operation would resize or re-allocate a locked buffer. */
     rb_eIOBufferLockedError = rb_define_class_under(rb_cIOBuffer, "LockedError", rb_eRuntimeError);
+
+    /* Raised when the buffer cannot be allocated for some reason, or you try to use a buffer that's not allocated. */
     rb_eIOBufferAllocationError = rb_define_class_under(rb_cIOBuffer, "AllocationError", rb_eRuntimeError);
+
+    /* Raised when you try to write to a read-only buffer, or resize an external buffer. */
     rb_eIOBufferAccessError = rb_define_class_under(rb_cIOBuffer, "AccessError", rb_eRuntimeError);
+
+    /* Raised if you try to access a buffer slice which no longer references a valid memory range of the underlying source. */
     rb_eIOBufferInvalidatedError = rb_define_class_under(rb_cIOBuffer, "InvalidatedError", rb_eRuntimeError);
+
+    /* Raised if the mask given to a binary operation is invalid, e.g. zero length or overlaps the target buffer. */
     rb_eIOBufferMaskError = rb_define_class_under(rb_cIOBuffer, "MaskError", rb_eArgError);
 
     rb_define_alloc_func(rb_cIOBuffer, rb_io_buffer_type_allocate);
@@ -3455,37 +3725,57 @@ Init_IO_Buffer(void)
 
     RUBY_IO_BUFFER_DEFAULT_SIZE = io_buffer_default_size(RUBY_IO_BUFFER_PAGE_SIZE);
 
-    // Efficient sizing of mapped buffers:
+    /* The operating system page size. Used for efficient page-aligned memory allocations. */
     rb_define_const(rb_cIOBuffer, "PAGE_SIZE", SIZET2NUM(RUBY_IO_BUFFER_PAGE_SIZE));
+
+    /* The default buffer size, typically a (small) multiple of the PAGE_SIZE.
+       Can be explicitly specified by setting the RUBY_IO_BUFFER_DEFAULT_SIZE
+       environment variable. */
     rb_define_const(rb_cIOBuffer, "DEFAULT_SIZE", SIZET2NUM(RUBY_IO_BUFFER_DEFAULT_SIZE));
 
     rb_define_singleton_method(rb_cIOBuffer, "map", io_buffer_map, -1);
 
-    // General use:
     rb_define_method(rb_cIOBuffer, "initialize", rb_io_buffer_initialize, -1);
     rb_define_method(rb_cIOBuffer, "initialize_copy", rb_io_buffer_initialize_copy, 1);
     rb_define_method(rb_cIOBuffer, "inspect", rb_io_buffer_inspect, 0);
-    rb_define_method(rb_cIOBuffer, "hexdump", rb_io_buffer_hexdump, 0);
+    rb_define_method(rb_cIOBuffer, "hexdump", rb_io_buffer_hexdump, -1);
     rb_define_method(rb_cIOBuffer, "to_s", rb_io_buffer_to_s, 0);
     rb_define_method(rb_cIOBuffer, "size", rb_io_buffer_size, 0);
     rb_define_method(rb_cIOBuffer, "valid?", rb_io_buffer_valid_p, 0);
 
-    // Ownership:
     rb_define_method(rb_cIOBuffer, "transfer", rb_io_buffer_transfer, 0);
 
-    // Flags:
+    /* Indicates that the memory in the buffer is owned by someone else. See #external? for more details. */
     rb_define_const(rb_cIOBuffer, "EXTERNAL", RB_INT2NUM(RB_IO_BUFFER_EXTERNAL));
+
+    /* Indicates that the memory in the buffer is owned by the buffer. See #internal? for more details. */
     rb_define_const(rb_cIOBuffer, "INTERNAL", RB_INT2NUM(RB_IO_BUFFER_INTERNAL));
+
+    /* Indicates that the memory in the buffer is mapped by the operating system. See #mapped? for more details. */
     rb_define_const(rb_cIOBuffer, "MAPPED", RB_INT2NUM(RB_IO_BUFFER_MAPPED));
+
+    /* Indicates that the memory in the buffer is also mapped such that it can be shared with other processes. See #shared? for more details. */
     rb_define_const(rb_cIOBuffer, "SHARED", RB_INT2NUM(RB_IO_BUFFER_SHARED));
+
+    /* Indicates that the memory in the buffer is locked and cannot be resized or freed. See #locked? and #locked for more details. */
     rb_define_const(rb_cIOBuffer, "LOCKED", RB_INT2NUM(RB_IO_BUFFER_LOCKED));
+
+    /* Indicates that the memory in the buffer is mapped privately and changes won't be replicated to the underlying file. See #private? for more details. */
     rb_define_const(rb_cIOBuffer, "PRIVATE", RB_INT2NUM(RB_IO_BUFFER_PRIVATE));
+
+    /* Indicates that the memory in the buffer is read only, and attempts to modify it will fail. See #readonly? for more details.*/
     rb_define_const(rb_cIOBuffer, "READONLY", RB_INT2NUM(RB_IO_BUFFER_READONLY));
 
-    // Endian:
+    /* Refers to little endian byte order, where the least significant byte is stored first. See #get_value for more details. */
     rb_define_const(rb_cIOBuffer, "LITTLE_ENDIAN", RB_INT2NUM(RB_IO_BUFFER_LITTLE_ENDIAN));
+
+    /* Refers to big endian byte order, where the most significant byte is stored first. See #get_value for more details. */
     rb_define_const(rb_cIOBuffer, "BIG_ENDIAN", RB_INT2NUM(RB_IO_BUFFER_BIG_ENDIAN));
+
+    /* Refers to the byte order of the host machine. See #get_value for more details. */
     rb_define_const(rb_cIOBuffer, "HOST_ENDIAN", RB_INT2NUM(RB_IO_BUFFER_HOST_ENDIAN));
+
+    /* Refers to network byte order, which is the same as big endian. See #get_value for more details. */
     rb_define_const(rb_cIOBuffer, "NETWORK_ENDIAN", RB_INT2NUM(RB_IO_BUFFER_NETWORK_ENDIAN));
 
     rb_define_method(rb_cIOBuffer, "null?", rb_io_buffer_null_p, 0);
@@ -3495,6 +3785,7 @@ Init_IO_Buffer(void)
     rb_define_method(rb_cIOBuffer, "mapped?", rb_io_buffer_mapped_p, 0);
     rb_define_method(rb_cIOBuffer, "shared?", rb_io_buffer_shared_p, 0);
     rb_define_method(rb_cIOBuffer, "locked?", rb_io_buffer_locked_p, 0);
+    rb_define_method(rb_cIOBuffer, "private?", rb_io_buffer_private_p, 0);
     rb_define_method(rb_cIOBuffer, "readonly?", io_buffer_readonly_p, 0);
 
     // Locking to prevent changes while using pointer:
diff --git a/iseq.c b/iseq.c
index db7303aac5bd96..c0523f61d70de7 100644
--- a/iseq.c
+++ b/iseq.c
@@ -28,13 +28,14 @@
 #include "internal/file.h"
 #include "internal/gc.h"
 #include "internal/hash.h"
+#include "internal/io.h"
 #include "internal/ruby_parser.h"
 #include "internal/sanitizers.h"
+#include "internal/set_table.h"
 #include "internal/symbol.h"
 #include "internal/thread.h"
 #include "internal/variable.h"
 #include "iseq.h"
-#include "rjit.h"
 #include "ruby/util.h"
 #include "vm_core.h"
 #include "vm_callinfo.h"
@@ -43,7 +44,7 @@
 #include "builtin.h"
 #include "insns.inc"
 #include "insns_info.inc"
-#include "yarp/yarp.h"
+#include "zjit.h"
 
 VALUE rb_cISeq;
 static VALUE iseqw_new(const rb_iseq_t *iseq);
@@ -111,12 +112,14 @@ remove_from_constant_cache(ID id, IC ic)
     st_data_t ic_data = (st_data_t)ic;
 
     if (rb_id_table_lookup(vm->constant_cache, id, &lookup_result)) {
-        st_table *ics = (st_table *)lookup_result;
-        st_delete(ics, &ic_data, NULL);
+        set_table *ics = (set_table *)lookup_result;
+        set_table_delete(ics, &ic_data);
 
-        if (ics->num_entries == 0) {
+        if (ics->num_entries == 0 &&
+                // See comment in vm_track_constant_cache on why we need this check
+                id != vm->inserting_constant_cache_id) {
             rb_id_table_delete(vm->constant_cache, id);
-            st_free_table(ics);
+            set_free_table(ics);
         }
     }
 }
@@ -165,9 +168,12 @@ rb_iseq_free(const rb_iseq_t *iseq)
     if (iseq && ISEQ_BODY(iseq)) {
         iseq_clear_ic_references(iseq);
         struct rb_iseq_constant_body *const body = ISEQ_BODY(iseq);
-        rb_rjit_free_iseq(iseq); /* Notify RJIT */
 #if USE_YJIT
-        rb_yjit_iseq_free(body->yjit_payload);
+        rb_yjit_iseq_free(iseq);
+        if (FL_TEST_RAW((VALUE)iseq, ISEQ_TRANSLATED)) {
+            RUBY_ASSERT(rb_yjit_live_iseq_count > 0);
+            rb_yjit_live_iseq_count--;
+        }
 #endif
         ruby_xfree((void *)body->iseq_encoded);
         ruby_xfree((void *)body->insns_info.body);
@@ -175,23 +181,26 @@ rb_iseq_free(const rb_iseq_t *iseq)
 #if VM_INSN_INFO_TABLE_IMPL == 2
         ruby_xfree(body->insns_info.succ_index_table);
 #endif
-        if (LIKELY(body->local_table != rb_iseq_shared_exc_local_tbl))
-            ruby_xfree((void *)body->local_table);
         ruby_xfree((void *)body->is_entries);
-
-        if (body->call_data) {
-            ruby_xfree(body->call_data);
-        }
+        ruby_xfree(body->call_data);
         ruby_xfree((void *)body->catch_table);
         ruby_xfree((void *)body->param.opt_table);
         if (ISEQ_MBITS_BUFLEN(body->iseq_size) > 1 && body->mark_bits.list) {
             ruby_xfree((void *)body->mark_bits.list);
         }
 
+        ruby_xfree(body->variable.original_iseq);
+
         if (body->param.keyword != NULL) {
-            ruby_xfree((void *)body->param.keyword->default_values);
+            if (body->param.keyword->table != &body->local_table[body->param.keyword->bits_start - body->param.keyword->num])
+                ruby_xfree((void *)body->param.keyword->table);
+            if (body->param.keyword->default_values) {
+                ruby_xfree((void *)body->param.keyword->default_values);
+            }
             ruby_xfree((void *)body->param.keyword);
         }
+        if (LIKELY(body->local_table != rb_iseq_shared_exc_local_tbl))
+            ruby_xfree((void *)body->local_table);
         compile_data_free(ISEQ_COMPILE_DATA(iseq));
         if (body->outer_variables) rb_id_table_free(body->outer_variables);
         ruby_xfree(body);
@@ -225,7 +234,30 @@ iseq_scan_bits(unsigned int page, iseq_bits_t bits, VALUE *code, VALUE *original
 }
 
 static void
-rb_iseq_mark_and_move_each_value(const rb_iseq_t *iseq, VALUE *original_iseq)
+rb_iseq_mark_and_move_each_compile_data_value(const rb_iseq_t *iseq, VALUE *original_iseq)
+{
+    unsigned int size;
+    VALUE *code;
+    const struct iseq_compile_data *const compile_data = ISEQ_COMPILE_DATA(iseq);
+
+    size = compile_data->iseq_size;
+    code = compile_data->iseq_encoded;
+
+    // Embedded VALUEs
+    if (compile_data->mark_bits.list) {
+        if(compile_data->is_single_mark_bit) {
+            iseq_scan_bits(0, compile_data->mark_bits.single, code, original_iseq);
+        }
+        else {
+            for (unsigned int i = 0; i < ISEQ_MBITS_BUFLEN(size); i++) {
+                iseq_bits_t bits = compile_data->mark_bits.list[i];
+                iseq_scan_bits(i, bits, code, original_iseq);
+            }
+        }
+    }
+}
+static void
+rb_iseq_mark_and_move_each_body_value(const rb_iseq_t *iseq, VALUE *original_iseq)
 {
     unsigned int size;
     VALUE *code;
@@ -273,11 +305,9 @@ rb_iseq_mark_and_move_each_value(const rb_iseq_t *iseq, VALUE *original_iseq)
             iseq_scan_bits(0, body->mark_bits.single, code, original_iseq);
         }
         else {
-            if (body->mark_bits.list) {
-                for (unsigned int i = 0; i < ISEQ_MBITS_BUFLEN(size); i++) {
-                    iseq_bits_t bits = body->mark_bits.list[i];
-                    iseq_scan_bits(i, bits, code, original_iseq);
-                }
+            for (unsigned int i = 0; i < ISEQ_MBITS_BUFLEN(size); i++) {
+                iseq_bits_t bits = body->mark_bits.list[i];
+                iseq_scan_bits(i, bits, code, original_iseq);
             }
         }
     }
@@ -287,6 +317,10 @@ static bool
 cc_is_active(const struct rb_callcache *cc, bool reference_updating)
 {
     if (cc) {
+        if (cc == rb_vm_empty_cc() || rb_vm_empty_cc_for_super()) {
+            return false;
+        }
+
         if (reference_updating) {
             cc = (const struct rb_callcache *)rb_gc_location((VALUE)cc);
         }
@@ -316,7 +350,7 @@ rb_iseq_mark_and_move(rb_iseq_t *iseq, bool reference_updating)
     if (ISEQ_BODY(iseq)) {
         struct rb_iseq_constant_body *body = ISEQ_BODY(iseq);
 
-        rb_iseq_mark_and_move_each_value(iseq, reference_updating ? ISEQ_ORIGINAL_ISEQ(iseq) : NULL);
+        rb_iseq_mark_and_move_each_body_value(iseq, reference_updating ? ISEQ_ORIGINAL_ISEQ(iseq) : NULL);
 
         rb_gc_mark_and_move(&body->variable.coverage);
         rb_gc_mark_and_move(&body->variable.pc2branchindex);
@@ -337,17 +371,19 @@ rb_iseq_mark_and_move(rb_iseq_t *iseq, bool reference_updating)
                 if (cc_is_active(cds[i].cc, reference_updating)) {
                     rb_gc_mark_and_move_ptr(&cds[i].cc);
                 }
-                else {
+                else if (cds[i].cc != rb_vm_empty_cc()) {
                     cds[i].cc = rb_vm_empty_cc();
                 }
             }
         }
 
-        if (body->param.flags.has_kw && ISEQ_COMPILE_DATA(iseq) == NULL) {
+        if (body->param.flags.has_kw && body->param.keyword != NULL) {
             const struct rb_iseq_param_keyword *const keyword = body->param.keyword;
 
-            for (int j = 0, i = keyword->required_num; i < keyword->num; i++, j++) {
-                rb_gc_mark_and_move(&keyword->default_values[j]);
+            if (keyword->default_values != NULL) {
+                for (int j = 0, i = keyword->required_num; i < keyword->num; i++, j++) {
+                    rb_gc_mark_and_move(&keyword->default_values[j]);
+                }
             }
         }
 
@@ -364,19 +400,19 @@ rb_iseq_mark_and_move(rb_iseq_t *iseq, bool reference_updating)
         }
 
         if (reference_updating) {
-#if USE_RJIT
-            rb_rjit_iseq_update_references(body);
-#endif
 #if USE_YJIT
-            rb_yjit_iseq_update_references(body->yjit_payload);
+            rb_yjit_iseq_update_references(iseq);
+#endif
+#if USE_ZJIT
+            rb_zjit_iseq_update_references(body->zjit_payload);
 #endif
         }
         else {
-#if USE_RJIT
-            rb_rjit_iseq_mark(body->rjit_blocks);
-#endif
 #if USE_YJIT
             rb_yjit_iseq_mark(body->yjit_payload);
+#endif
+#if USE_ZJIT
+            rb_zjit_iseq_mark(body->zjit_payload);
 #endif
         }
     }
@@ -388,6 +424,7 @@ rb_iseq_mark_and_move(rb_iseq_t *iseq, bool reference_updating)
         const struct iseq_compile_data *const compile_data = ISEQ_COMPILE_DATA(iseq);
 
         rb_iseq_mark_and_move_insn_storage(compile_data->insn.storage_head);
+        rb_iseq_mark_and_move_each_compile_data_value(iseq, reference_updating ? ISEQ_ORIGINAL_ISEQ(iseq) : NULL);
 
         rb_gc_mark_and_move((VALUE *)&compile_data->err_info);
         rb_gc_mark_and_move((VALUE *)&compile_data->catch_table_ary);
@@ -505,7 +542,7 @@ rb_iseq_pathobj_new(VALUE path, VALUE realpath)
     else {
         if (!NIL_P(realpath)) realpath = rb_fstring(realpath);
         pathobj = rb_ary_new_from_args(2, rb_fstring(path), realpath);
-        rb_obj_freeze(pathobj);
+        rb_ary_freeze(pathobj);
     }
     return pathobj;
 }
@@ -517,6 +554,19 @@ rb_iseq_pathobj_set(const rb_iseq_t *iseq, VALUE path, VALUE realpath)
                  rb_iseq_pathobj_new(path, realpath));
 }
 
+// Make a dummy iseq for a dummy frame that exposes a path for profilers to inspect
+rb_iseq_t *
+rb_iseq_alloc_with_dummy_path(VALUE fname)
+{
+    rb_iseq_t *dummy_iseq = iseq_alloc();
+
+    ISEQ_BODY(dummy_iseq)->type = ISEQ_TYPE_TOP;
+    RB_OBJ_WRITE(dummy_iseq, &ISEQ_BODY(dummy_iseq)->location.pathobj, fname);
+    RB_OBJ_WRITE(dummy_iseq, &ISEQ_BODY(dummy_iseq)->location.label, fname);
+
+    return dummy_iseq;
+}
+
 static rb_iseq_location_t *
 iseq_location_setup(rb_iseq_t *iseq, VALUE name, VALUE path, VALUE realpath, int first_lineno, const rb_code_location_t *code_location, const int node_id)
 {
@@ -526,6 +576,11 @@ iseq_location_setup(rb_iseq_t *iseq, VALUE name, VALUE path, VALUE realpath, int
     RB_OBJ_WRITE(iseq, &loc->label, name);
     RB_OBJ_WRITE(iseq, &loc->base_label, name);
     loc->first_lineno = first_lineno;
+
+    if (ISEQ_BODY(iseq)->local_iseq == iseq && strcmp(RSTRING_PTR(name), "initialize") == 0) {
+        ISEQ_BODY(iseq)->param.flags.use_block = 1;
+    }
+
     if (code_location) {
         loc->node_id = node_id;
         loc->code_location = *code_location;
@@ -554,11 +609,11 @@ set_relation(rb_iseq_t *iseq, const rb_iseq_t *piseq)
         body->local_iseq = iseq;
     }
     else if (piseq) {
-        body->local_iseq = ISEQ_BODY(piseq)->local_iseq;
+        RB_OBJ_WRITE(iseq, &body->local_iseq, ISEQ_BODY(piseq)->local_iseq);
     }
 
     if (piseq) {
-        body->parent_iseq = piseq;
+        RB_OBJ_WRITE(iseq, &body->parent_iseq, piseq);
     }
 
     if (type == ISEQ_TYPE_MAIN) {
@@ -708,18 +763,26 @@ finish_iseq_build(rb_iseq_t *iseq)
 }
 
 static rb_compile_option_t COMPILE_OPTION_DEFAULT = {
-    OPT_INLINE_CONST_CACHE, /* int inline_const_cache; */
-    OPT_PEEPHOLE_OPTIMIZATION, /* int peephole_optimization; */
-    OPT_TAILCALL_OPTIMIZATION, /* int tailcall_optimization */
-    OPT_SPECIALISED_INSTRUCTION, /* int specialized_instruction; */
-    OPT_OPERANDS_UNIFICATION, /* int operands_unification; */
-    OPT_INSTRUCTIONS_UNIFICATION, /* int instructions_unification; */
-    OPT_FROZEN_STRING_LITERAL,
-    OPT_DEBUG_FROZEN_STRING_LITERAL,
-    TRUE,			/* coverage_enabled */
+    .inline_const_cache = OPT_INLINE_CONST_CACHE,
+    .peephole_optimization = OPT_PEEPHOLE_OPTIMIZATION,
+    .tailcall_optimization = OPT_TAILCALL_OPTIMIZATION,
+    .specialized_instruction = OPT_SPECIALISED_INSTRUCTION,
+    .operands_unification = OPT_OPERANDS_UNIFICATION,
+    .instructions_unification = OPT_INSTRUCTIONS_UNIFICATION,
+    .frozen_string_literal = OPT_FROZEN_STRING_LITERAL,
+    .debug_frozen_string_literal = OPT_DEBUG_FROZEN_STRING_LITERAL,
+    .coverage_enabled = TRUE,
 };
 
-static const rb_compile_option_t COMPILE_OPTION_FALSE = {0};
+static const rb_compile_option_t COMPILE_OPTION_FALSE = {
+    .frozen_string_literal = -1, // unspecified
+};
+
+int
+rb_iseq_opt_frozen_string_literal(void)
+{
+    return COMPILE_OPTION_DEFAULT.frozen_string_literal;
+}
 
 static void
 set_compile_option_from_hash(rb_compile_option_t *option, VALUE opt)
@@ -752,9 +815,11 @@ set_compile_option_from_ast(rb_compile_option_t *option, const rb_ast_body_t *as
 {
 #define SET_COMPILE_OPTION(o, a, mem) \
     ((a)->mem < 0 ? 0 : ((o)->mem = (a)->mem > 0))
-    SET_COMPILE_OPTION(option, ast, frozen_string_literal);
     SET_COMPILE_OPTION(option, ast, coverage_enabled);
 #undef SET_COMPILE_OPTION
+    if (ast->frozen_string_literal >= 0) {
+        option->frozen_string_literal = ast->frozen_string_literal;
+    }
     return option;
 }
 
@@ -796,42 +861,36 @@ make_compile_option_value(rb_compile_option_t *option)
         SET_COMPILE_OPTION(option, opt, specialized_instruction);
         SET_COMPILE_OPTION(option, opt, operands_unification);
         SET_COMPILE_OPTION(option, opt, instructions_unification);
-        SET_COMPILE_OPTION(option, opt, frozen_string_literal);
         SET_COMPILE_OPTION(option, opt, debug_frozen_string_literal);
         SET_COMPILE_OPTION(option, opt, coverage_enabled);
         SET_COMPILE_OPTION_NUM(option, opt, debug_level);
     }
 #undef SET_COMPILE_OPTION
 #undef SET_COMPILE_OPTION_NUM
+    VALUE frozen_string_literal = option->frozen_string_literal == -1 ? Qnil : RBOOL(option->frozen_string_literal);
+    rb_hash_aset(opt, ID2SYM(rb_intern("frozen_string_literal")), frozen_string_literal);
     return opt;
 }
 
 rb_iseq_t *
-rb_iseq_new(const rb_ast_body_t *ast, VALUE name, VALUE path, VALUE realpath,
+rb_iseq_new(const VALUE ast_value, VALUE name, VALUE path, VALUE realpath,
             const rb_iseq_t *parent, enum rb_iseq_type type)
 {
-    return rb_iseq_new_with_opt(ast, name, path, realpath, 0, parent,
-                                0, type, &COMPILE_OPTION_DEFAULT);
+    return rb_iseq_new_with_opt(ast_value, name, path, realpath, 0, parent,
+                                0, type, &COMPILE_OPTION_DEFAULT,
+                                Qnil);
 }
 
 static int
-ast_line_count(const rb_ast_body_t *ast)
+ast_line_count(const VALUE ast_value)
 {
-    if (ast->script_lines == Qfalse) {
-        // this occurs when failed to parse the source code with a syntax error
-        return 0;
-    }
-    if (RB_TYPE_P(ast->script_lines, T_ARRAY)){
-        return (int)RARRAY_LEN(ast->script_lines);
-    }
-    return FIX2INT(ast->script_lines);
+    rb_ast_t *ast = rb_ruby_ast_data_get(ast_value);
+    return ast->body.line_count;
 }
 
 static VALUE
-iseq_setup_coverage(VALUE coverages, VALUE path, const rb_ast_body_t *ast, int line_offset)
+iseq_setup_coverage(VALUE coverages, VALUE path, int line_count)
 {
-    int line_count = line_offset + ast_line_count(ast);
-
     if (line_count >= 0) {
         int len = (rb_get_coverage_mode() & COVERAGE_TARGET_ONESHOT_LINES) ? 0 : line_count;
 
@@ -845,46 +904,90 @@ iseq_setup_coverage(VALUE coverages, VALUE path, const rb_ast_body_t *ast, int l
 }
 
 static inline void
-iseq_new_setup_coverage(VALUE path, const rb_ast_body_t *ast, int line_offset)
+iseq_new_setup_coverage(VALUE path, int line_count)
 {
     VALUE coverages = rb_get_coverages();
 
     if (RTEST(coverages)) {
-        iseq_setup_coverage(coverages, path, ast, line_offset);
+        iseq_setup_coverage(coverages, path, line_count);
     }
 }
 
 rb_iseq_t *
-rb_iseq_new_top(const rb_ast_body_t *ast, VALUE name, VALUE path, VALUE realpath, const rb_iseq_t *parent)
+rb_iseq_new_top(const VALUE ast_value, VALUE name, VALUE path, VALUE realpath, const rb_iseq_t *parent)
+{
+    iseq_new_setup_coverage(path, ast_line_count(ast_value));
+
+    return rb_iseq_new_with_opt(ast_value, name, path, realpath, 0, parent, 0,
+                                ISEQ_TYPE_TOP, &COMPILE_OPTION_DEFAULT,
+                                Qnil);
+}
+
+/**
+ * The main entry-point into the prism compiler when a file is required.
+ */
+rb_iseq_t *
+pm_iseq_new_top(pm_scope_node_t *node, VALUE name, VALUE path, VALUE realpath, const rb_iseq_t *parent, int *error_state)
 {
-    iseq_new_setup_coverage(path, ast, 0);
+    iseq_new_setup_coverage(path, (int) (node->parser->newline_list.size - 1));
 
-    return rb_iseq_new_with_opt(ast, name, path, realpath, 0, parent, 0,
-                                ISEQ_TYPE_TOP, &COMPILE_OPTION_DEFAULT);
+    return pm_iseq_new_with_opt(node, name, path, realpath, 0, parent, 0,
+                                ISEQ_TYPE_TOP, &COMPILE_OPTION_DEFAULT, error_state);
 }
 
 rb_iseq_t *
-rb_iseq_new_main(const rb_ast_body_t *ast, VALUE path, VALUE realpath, const rb_iseq_t *parent, int opt)
+rb_iseq_new_main(const VALUE ast_value, VALUE path, VALUE realpath, const rb_iseq_t *parent, int opt)
 {
-    iseq_new_setup_coverage(path, ast, 0);
+    iseq_new_setup_coverage(path, ast_line_count(ast_value));
 
-    return rb_iseq_new_with_opt(ast, rb_fstring_lit("<main>"),
+    return rb_iseq_new_with_opt(ast_value, rb_fstring_lit("<main>"),
                                 path, realpath, 0,
-                                parent, 0, ISEQ_TYPE_MAIN, opt ? &COMPILE_OPTION_DEFAULT : &COMPILE_OPTION_FALSE);
+                                parent, 0, ISEQ_TYPE_MAIN, opt ? &COMPILE_OPTION_DEFAULT : &COMPILE_OPTION_FALSE,
+                                Qnil);
+}
+
+/**
+ * The main entry-point into the prism compiler when a file is executed as the
+ * main file in the program.
+ */
+rb_iseq_t *
+pm_iseq_new_main(pm_scope_node_t *node, VALUE path, VALUE realpath, const rb_iseq_t *parent, int opt, int *error_state)
+{
+    iseq_new_setup_coverage(path, (int) (node->parser->newline_list.size - 1));
+
+    return pm_iseq_new_with_opt(node, rb_fstring_lit("<main>"),
+                                path, realpath, 0,
+                                parent, 0, ISEQ_TYPE_MAIN, opt ? &COMPILE_OPTION_DEFAULT : &COMPILE_OPTION_FALSE, error_state);
+}
+
+rb_iseq_t *
+rb_iseq_new_eval(const VALUE ast_value, VALUE name, VALUE path, VALUE realpath, int first_lineno, const rb_iseq_t *parent, int isolated_depth)
+{
+    if (rb_get_coverage_mode() & COVERAGE_TARGET_EVAL) {
+        VALUE coverages = rb_get_coverages();
+        if (RTEST(coverages) && RTEST(path) && !RTEST(rb_hash_has_key(coverages, path))) {
+            iseq_setup_coverage(coverages, path, ast_line_count(ast_value) + first_lineno - 1);
+        }
+    }
+
+    return rb_iseq_new_with_opt(ast_value, name, path, realpath, first_lineno,
+                                parent, isolated_depth, ISEQ_TYPE_EVAL, &COMPILE_OPTION_DEFAULT,
+                                Qnil);
 }
 
 rb_iseq_t *
-rb_iseq_new_eval(const rb_ast_body_t *ast, VALUE name, VALUE path, VALUE realpath, int first_lineno, const rb_iseq_t *parent, int isolated_depth)
+pm_iseq_new_eval(pm_scope_node_t *node, VALUE name, VALUE path, VALUE realpath,
+                     int first_lineno, const rb_iseq_t *parent, int isolated_depth, int *error_state)
 {
     if (rb_get_coverage_mode() & COVERAGE_TARGET_EVAL) {
         VALUE coverages = rb_get_coverages();
         if (RTEST(coverages) && RTEST(path) && !RTEST(rb_hash_has_key(coverages, path))) {
-            iseq_setup_coverage(coverages, path, ast, first_lineno - 1);
+            iseq_setup_coverage(coverages, path, ((int) (node->parser->newline_list.size - 1)) + first_lineno - 1);
         }
     }
 
-    return rb_iseq_new_with_opt(ast, name, path, realpath, first_lineno,
-                                parent, isolated_depth, ISEQ_TYPE_EVAL, &COMPILE_OPTION_DEFAULT);
+    return pm_iseq_new_with_opt(node, name, path, realpath, first_lineno,
+                                parent, isolated_depth, ISEQ_TYPE_EVAL, &COMPILE_OPTION_DEFAULT, error_state);
 }
 
 static inline rb_iseq_t *
@@ -902,25 +1005,29 @@ iseq_translate(rb_iseq_t *iseq)
 }
 
 rb_iseq_t *
-rb_iseq_new_with_opt(const rb_ast_body_t *ast, VALUE name, VALUE path, VALUE realpath,
+rb_iseq_new_with_opt(VALUE ast_value, VALUE name, VALUE path, VALUE realpath,
                      int first_lineno, const rb_iseq_t *parent, int isolated_depth,
-                     enum rb_iseq_type type, const rb_compile_option_t *option)
+                     enum rb_iseq_type type, const rb_compile_option_t *option,
+                     VALUE script_lines)
 {
-    const NODE *node = ast ? ast->root : 0;
+    rb_ast_t *ast = rb_ruby_ast_data_get(ast_value);
+    rb_ast_body_t *body = ast ? &ast->body : NULL;
+    const NODE *node = body ? body->root : 0;
     /* TODO: argument check */
     rb_iseq_t *iseq = iseq_alloc();
     rb_compile_option_t new_opt;
 
     if (!option) option = &COMPILE_OPTION_DEFAULT;
-    if (ast) {
+    if (body) {
         new_opt = *option;
-        option = set_compile_option_from_ast(&new_opt, ast);
+        option = set_compile_option_from_ast(&new_opt, body);
     }
 
-    VALUE script_lines = Qnil;
-
-    if (ast && !FIXNUM_P(ast->script_lines) && ast->script_lines) {
-        script_lines = ast->script_lines;
+    if (!NIL_P(script_lines)) {
+        // noop
+    }
+    else if (body && body->script_lines) {
+        script_lines = rb_parser_build_script_lines_from(body->script_lines);
     }
     else if (parent) {
         script_lines = ISEQ_BODY(parent)->variable.script_lines;
@@ -931,46 +1038,78 @@ rb_iseq_new_with_opt(const rb_ast_body_t *ast, VALUE name, VALUE path, VALUE rea
 
     rb_iseq_compile_node(iseq, node);
     finish_iseq_build(iseq);
+    RB_GC_GUARD(ast_value);
 
     return iseq_translate(iseq);
 }
 
-VALUE rb_iseq_compile_yarp_node(rb_iseq_t * iseq, const yp_node_t * yarp_pointer, yp_parser_t *parser);
+struct pm_iseq_new_with_opt_data {
+    rb_iseq_t *iseq;
+    pm_scope_node_t *node;
+};
 
+VALUE
+pm_iseq_new_with_opt_try(VALUE d)
+{
+    struct pm_iseq_new_with_opt_data *data = (struct pm_iseq_new_with_opt_data *)d;
+
+    // This can compile child iseqs, which can raise syntax errors
+    pm_iseq_compile_node(data->iseq, data->node);
+
+    // This raises an exception if there is a syntax error
+    finish_iseq_build(data->iseq);
+
+    return Qundef;
+}
+
+/**
+ * This is a step in the prism compiler that is called once all of the various
+ * options have been established. It is called from one of the pm_iseq_new_*
+ * functions or from the RubyVM::InstructionSequence APIs. It is responsible for
+ * allocating the instruction sequence, calling into the compiler, and returning
+ * the built instruction sequence.
+ *
+ * Importantly, this is also the function where the compiler is re-entered to
+ * compile child instruction sequences. A child instruction sequence is always
+ * compiled using a scope node, which is why we cast it explicitly to that here
+ * in the parameters (as opposed to accepting a generic pm_node_t *).
+ */
 rb_iseq_t *
-yp_iseq_new_with_opt(yp_node_t *node, yp_parser_t *parser, VALUE name, VALUE path, VALUE realpath,
+pm_iseq_new_with_opt(pm_scope_node_t *node, VALUE name, VALUE path, VALUE realpath,
                      int first_lineno, const rb_iseq_t *parent, int isolated_depth,
-                     enum rb_iseq_type type, const rb_compile_option_t *option)
+                     enum rb_iseq_type type, const rb_compile_option_t *option, int *error_state)
 {
     rb_iseq_t *iseq = iseq_alloc();
-    VALUE script_lines = Qnil;
-    rb_code_location_t code_loc;
+    ISEQ_BODY(iseq)->prism = true;
 
+    rb_compile_option_t next_option;
     if (!option) option = &COMPILE_OPTION_DEFAULT;
 
-    if (node) {
-        yp_line_column_t start_line_col = yp_newline_list_line_column(&(parser->newline_list), node->location.start);
-        yp_line_column_t end_line_col= yp_newline_list_line_column(&(parser->newline_list), node->location.end);
-        code_loc = (rb_code_location_t) {
-            .beg_pos = {
-                .lineno = (int)start_line_col.line,
-                .column = (int)start_line_col.column
-            },
-                .end_pos = {
-                    .lineno = (int)end_line_col.line,
-                    .column = (int)end_line_col.column
-                },
-        };
-    }
+    next_option = *option;
+    next_option.coverage_enabled = node->coverage_enabled < 0 ? 0 : node->coverage_enabled > 0;
+    option = &next_option;
 
-    // TODO: node_id
-    int node_id = -1;
-    prepare_iseq_build(iseq, name, path, realpath, first_lineno, &code_loc, node_id,
-            parent, isolated_depth, type, script_lines, option);
+    pm_location_t *location = &node->base.location;
+    int32_t start_line = node->parser->start_line;
 
-    rb_iseq_compile_yarp_node(iseq, node, parser);
+    pm_line_column_t start = pm_newline_list_line_column(&node->parser->newline_list, location->start, start_line);
+    pm_line_column_t end = pm_newline_list_line_column(&node->parser->newline_list, location->end, start_line);
 
-    finish_iseq_build(iseq);
+    rb_code_location_t code_location = (rb_code_location_t) {
+        .beg_pos = { .lineno = (int) start.line, .column = (int) start.column },
+        .end_pos = { .lineno = (int) end.line, .column = (int) end.column }
+    };
+
+    prepare_iseq_build(iseq, name, path, realpath, first_lineno, &code_location, node->ast_node->node_id,
+                       parent, isolated_depth, type, node->script_lines == NULL ? Qnil : *node->script_lines, option);
+
+    struct pm_iseq_new_with_opt_data data = {
+        .iseq = iseq,
+        .node = node
+    };
+    rb_protect(pm_iseq_new_with_opt_try, (VALUE)&data, error_state);
+
+    if (*error_state) return NULL;
 
     return iseq_translate(iseq);
 }
@@ -1096,6 +1235,10 @@ iseq_load(VALUE data, const rb_iseq_t *parent, VALUE opt)
         tmp_loc.end_pos.column = NUM2INT(rb_ary_entry(code_location, 3));
     }
 
+    if (SYM2ID(rb_hash_aref(misc, ID2SYM(rb_intern("parser")))) == rb_intern("prism")) {
+        ISEQ_BODY(iseq)->prism = true;
+    }
+
     make_compile_option(&option, opt);
     option.peephole_optimization = FALSE; /* because peephole optimization can modify original iseq */
     prepare_iseq_build(iseq, name, path, realpath, first_lineno, &tmp_loc, NUM2INT(node_id),
@@ -1135,9 +1278,10 @@ rb_iseq_compile_with_option(VALUE src, VALUE file, VALUE realpath, VALUE line, V
 #else
 # define INITIALIZED /* volatile */
 #endif
-    rb_ast_t *(*parse)(VALUE vparser, VALUE fname, VALUE file, int start);
+    VALUE (*parse)(VALUE vparser, VALUE fname, VALUE file, int start);
     int ln;
-    rb_ast_t *INITIALIZED ast;
+    VALUE INITIALIZED ast_value;
+    rb_ast_t *ast;
     VALUE name = rb_fstring_lit("<compiled>");
 
     /* safe results first */
@@ -1153,27 +1297,102 @@ rb_iseq_compile_with_option(VALUE src, VALUE file, VALUE realpath, VALUE line, V
     }
     {
         const VALUE parser = rb_parser_new();
-        const rb_iseq_t *outer_scope = rb_iseq_new(NULL, name, name, Qnil, 0, ISEQ_TYPE_TOP);
+        const rb_iseq_t *outer_scope = rb_iseq_new(Qnil, name, name, Qnil, 0, ISEQ_TYPE_TOP);
         VALUE outer_scope_v = (VALUE)outer_scope;
         rb_parser_set_context(parser, outer_scope, FALSE);
-        rb_parser_set_script_lines(parser, RBOOL(ruby_vm_keep_script_lines));
+        if (ruby_vm_keep_script_lines) rb_parser_set_script_lines(parser);
         RB_GC_GUARD(outer_scope_v);
-        ast = (*parse)(parser, file, src, ln);
+        ast_value = (*parse)(parser, file, src, ln);
     }
 
-    if (!ast->body.root) {
+    ast = rb_ruby_ast_data_get(ast_value);
+
+    if (!ast || !ast->body.root) {
         rb_ast_dispose(ast);
         rb_exc_raise(GET_EC()->errinfo);
     }
     else {
-        iseq = rb_iseq_new_with_opt(&ast->body, name, file, realpath, ln,
-                                    NULL, 0, ISEQ_TYPE_TOP, &option);
+        iseq = rb_iseq_new_with_opt(ast_value, name, file, realpath, ln,
+                                    NULL, 0, ISEQ_TYPE_TOP, &option,
+                                    Qnil);
         rb_ast_dispose(ast);
     }
 
     return iseq;
 }
 
+static rb_iseq_t *
+pm_iseq_compile_with_option(VALUE src, VALUE file, VALUE realpath, VALUE line, VALUE opt)
+{
+    rb_iseq_t *iseq = NULL;
+    rb_compile_option_t option;
+    int ln;
+    VALUE name = rb_fstring_lit("<compiled>");
+
+    /* safe results first */
+    make_compile_option(&option, opt);
+    ln = NUM2INT(line);
+    StringValueCStr(file);
+
+    bool parse_file = false;
+    if (RB_TYPE_P(src, T_FILE)) {
+        parse_file = true;
+        src = rb_io_path(src);
+    }
+    else {
+        src = StringValue(src);
+    }
+
+    pm_parse_result_t result = { 0 };
+    pm_options_line_set(&result.options, NUM2INT(line));
+    pm_options_scopes_init(&result.options, 1);
+    result.node.coverage_enabled = 1;
+
+    switch (option.frozen_string_literal) {
+      case ISEQ_FROZEN_STRING_LITERAL_UNSET:
+        break;
+      case ISEQ_FROZEN_STRING_LITERAL_DISABLED:
+        pm_options_frozen_string_literal_set(&result.options, false);
+        break;
+      case ISEQ_FROZEN_STRING_LITERAL_ENABLED:
+        pm_options_frozen_string_literal_set(&result.options, true);
+        break;
+      default:
+        rb_bug("pm_iseq_compile_with_option: invalid frozen_string_literal=%d", option.frozen_string_literal);
+        break;
+    }
+
+    VALUE script_lines;
+    VALUE error;
+
+    if (parse_file) {
+        error = pm_load_parse_file(&result, src, ruby_vm_keep_script_lines ? &script_lines : NULL);
+    }
+    else {
+        error = pm_parse_string(&result, src, file, ruby_vm_keep_script_lines ? &script_lines : NULL);
+    }
+
+    RB_GC_GUARD(src);
+
+    if (error == Qnil) {
+        int error_state;
+        iseq = pm_iseq_new_with_opt(&result.node, name, file, realpath, ln, NULL, 0, ISEQ_TYPE_TOP, &option, &error_state);
+
+        pm_parse_result_free(&result);
+
+        if (error_state) {
+            RUBY_ASSERT(iseq == NULL);
+            rb_jump_tag(error_state);
+        }
+    }
+    else {
+        pm_parse_result_free(&result);
+        rb_exc_raise(error);
+    }
+
+    return iseq;
+}
+
 VALUE
 rb_iseq_path(const rb_iseq_t *iseq)
 {
@@ -1258,8 +1477,8 @@ remove_coverage_i(void *vstart, void *vend, size_t stride, void *data)
 {
     VALUE v = (VALUE)vstart;
     for (; v != (VALUE)vend; v += stride) {
-        void *ptr = asan_poisoned_object_p(v);
-        asan_unpoison_object(v, false);
+        void *ptr = rb_asan_poisoned_object_p(v);
+        rb_asan_unpoison_object(v, false);
 
         if (rb_obj_is_iseq(v)) {
             rb_iseq_t *iseq = (rb_iseq_t *)v;
@@ -1282,18 +1501,30 @@ rb_iseq_remove_coverage_all(void)
 static void
 iseqw_mark(void *ptr)
 {
-    rb_gc_mark((VALUE)ptr);
+    rb_gc_mark_movable(*(VALUE *)ptr);
 }
 
 static size_t
 iseqw_memsize(const void *ptr)
 {
-    return rb_iseq_memsize((const rb_iseq_t *)ptr);
+    return rb_iseq_memsize(*(const rb_iseq_t **)ptr);
+}
+
+static void
+iseqw_ref_update(void *ptr)
+{
+    VALUE *vptr = ptr;
+    *vptr = rb_gc_location(*vptr);
 }
 
 static const rb_data_type_t iseqw_data_type = {
     "T_IMEMO/iseq",
-    {iseqw_mark, NULL, iseqw_memsize,},
+    {
+        iseqw_mark,
+        RUBY_TYPED_DEFAULT_FREE,
+        iseqw_memsize,
+        iseqw_ref_update,
+    },
     0, 0, RUBY_TYPED_FREE_IMMEDIATELY|RUBY_TYPED_WB_PROTECTED
 };
 
@@ -1301,18 +1532,19 @@ static VALUE
 iseqw_new(const rb_iseq_t *iseq)
 {
     if (iseq->wrapper) {
+        if (*(const rb_iseq_t **)rb_check_typeddata(iseq->wrapper, &iseqw_data_type) != iseq) {
+            rb_raise(rb_eTypeError, "wrong iseq wrapper: %" PRIsVALUE " for %p",
+                     iseq->wrapper, (void *)iseq);
+        }
         return iseq->wrapper;
     }
     else {
-        union { const rb_iseq_t *in; void *out; } deconst;
-        VALUE obj;
-        deconst.in = iseq;
-        obj = TypedData_Wrap_Struct(rb_cISeq, &iseqw_data_type, deconst.out);
-        RB_OBJ_WRITTEN(obj, Qundef, iseq);
+        rb_iseq_t **ptr;
+        VALUE obj = TypedData_Make_Struct(rb_cISeq, rb_iseq_t *, &iseqw_data_type, ptr);
+        RB_OBJ_WRITE(obj, ptr, iseq);
 
         /* cache a wrapper object */
         RB_OBJ_WRITE((VALUE)iseq, &iseq->wrapper, obj);
-        RB_OBJ_FREEZE((VALUE)iseq);
 
         return obj;
     }
@@ -1324,13 +1556,51 @@ rb_iseqw_new(const rb_iseq_t *iseq)
     return iseqw_new(iseq);
 }
 
+/**
+ * Accept the options given to InstructionSequence.compile and
+ * InstructionSequence.compile_prism and share the logic for creating the
+ * instruction sequence.
+ */
+static VALUE
+iseqw_s_compile_parser(int argc, VALUE *argv, VALUE self, bool prism)
+{
+    VALUE src, file = Qnil, path = Qnil, line = Qnil, opt = Qnil;
+    int i;
+
+    i = rb_scan_args(argc, argv, "1*:", &src, NULL, &opt);
+    if (i > 4+NIL_P(opt)) rb_error_arity(argc, 1, 5);
+    switch (i) {
+      case 5: opt = argv[--i];
+      case 4: line = argv[--i];
+      case 3: path = argv[--i];
+      case 2: file = argv[--i];
+    }
+
+    if (NIL_P(file)) file = rb_fstring_lit("<compiled>");
+    if (NIL_P(path)) path = file;
+    if (NIL_P(line)) line = INT2FIX(1);
+
+    Check_Type(path, T_STRING);
+    Check_Type(file, T_STRING);
+
+    rb_iseq_t *iseq;
+    if (prism) {
+        iseq = pm_iseq_compile_with_option(src, file, path, line, opt);
+    }
+    else {
+        iseq = rb_iseq_compile_with_option(src, file, path, line, opt);
+    }
+
+    return iseqw_new(iseq);
+}
+
 /*
  *  call-seq:
  *     InstructionSequence.compile(source[, file[, path[, line[, options]]]]) -> iseq
  *     InstructionSequence.new(source[, file[, path[, line[, options]]]]) -> iseq
  *
- *  Takes +source+, a String of Ruby code and compiles it to an
- *  InstructionSequence.
+ *  Takes +source+, which can be a string of Ruby code, or an open +File+ object.
+ *  that contains Ruby source code.
  *
  *  Optionally takes +file+, +path+, and +line+ which describe the file path,
  *  real path and first line number of the ruby code in +source+ which are
@@ -1352,6 +1622,10 @@ rb_iseqw_new(const rb_iseq_t *iseq)
  *     RubyVM::InstructionSequence.compile(File.read(path), path, File.expand_path(path))
  *     #=> <RubyVM::InstructionSequence:<compiled>@test.rb:1>
  *
+ *     file = File.open("test.rb")
+ *     RubyVM::InstructionSequence.compile(file)
+ *     #=> <RubyVM::InstructionSequence:<compiled>@<compiled>:1>
+ *
  *     path = File.expand_path("test.rb")
  *     RubyVM::InstructionSequence.compile(File.read(path), path, path)
  *     #=> <RubyVM::InstructionSequence:<compiled>@/absolute/path/to/test.rb:1>
@@ -1360,88 +1634,91 @@ rb_iseqw_new(const rb_iseq_t *iseq)
 static VALUE
 iseqw_s_compile(int argc, VALUE *argv, VALUE self)
 {
-    VALUE src, file = Qnil, path = Qnil, line = Qnil, opt = Qnil;
-    int i;
-
-    i = rb_scan_args(argc, argv, "1*:", &src, NULL, &opt);
-    if (i > 4+NIL_P(opt)) rb_error_arity(argc, 1, 5);
-    switch (i) {
-      case 5: opt = argv[--i];
-      case 4: line = argv[--i];
-      case 3: path = argv[--i];
-      case 2: file = argv[--i];
-    }
-
-    if (NIL_P(file)) file = rb_fstring_lit("<compiled>");
-    if (NIL_P(path)) path = file;
-    if (NIL_P(line)) line = INT2FIX(1);
-
-    Check_Type(path, T_STRING);
-    Check_Type(file, T_STRING);
-
-    return iseqw_new(rb_iseq_compile_with_option(src, file, path, line, opt));
+    return iseqw_s_compile_parser(argc, argv, self, rb_ruby_prism_p());
 }
 
+/*
+ *  call-seq:
+ *     InstructionSequence.compile_parsey(source[, file[, path[, line[, options]]]]) -> iseq
+ *
+ *  Takes +source+, which can be a string of Ruby code, or an open +File+ object.
+ *  that contains Ruby source code. It parses and compiles using parse.y.
+ *
+ *  Optionally takes +file+, +path+, and +line+ which describe the file path,
+ *  real path and first line number of the ruby code in +source+ which are
+ *  metadata attached to the returned +iseq+.
+ *
+ *  +file+ is used for `__FILE__` and exception backtrace. +path+ is used for
+ *  +require_relative+ base. It is recommended these should be the same full
+ *  path.
+ *
+ *  +options+, which can be +true+, +false+ or a +Hash+, is used to
+ *  modify the default behavior of the Ruby iseq compiler.
+ *
+ *  For details regarding valid compile options see ::compile_option=.
+ *
+ *     RubyVM::InstructionSequence.compile_parsey("a = 1 + 2")
+ *     #=> <RubyVM::InstructionSequence:<compiled>@<compiled>>
+ *
+ *     path = "test.rb"
+ *     RubyVM::InstructionSequence.compile_parsey(File.read(path), path, File.expand_path(path))
+ *     #=> <RubyVM::InstructionSequence:<compiled>@test.rb:1>
+ *
+ *     file = File.open("test.rb")
+ *     RubyVM::InstructionSequence.compile_parsey(file)
+ *     #=> <RubyVM::InstructionSequence:<compiled>@<compiled>:1>
+ *
+ *     path = File.expand_path("test.rb")
+ *     RubyVM::InstructionSequence.compile_parsey(File.read(path), path, path)
+ *     #=> <RubyVM::InstructionSequence:<compiled>@/absolute/path/to/test.rb:1>
+ *
+ */
 static VALUE
-iseqw_s_compile_yarp(int argc, VALUE *argv, VALUE self)
+iseqw_s_compile_parsey(int argc, VALUE *argv, VALUE self)
 {
-    VALUE src, file = Qnil, path = Qnil, line = Qnil, opt = Qnil;
-    int i;
-
-    i = rb_scan_args(argc, argv, "1*:", &src, NULL, &opt);
-    if (i > 4+NIL_P(opt)) rb_error_arity(argc, 1, 5);
-    switch (i) {
-      case 5: opt = argv[--i];
-      case 4: line = argv[--i];
-      case 3: path = argv[--i];
-      case 2: file = argv[--i];
-    }
-
-    if (NIL_P(file)) file = rb_fstring_lit("<compiled>");
-    if (NIL_P(path)) path = file;
-    if (NIL_P(line)) line = INT2FIX(1);
-
-    Check_Type(path, T_STRING);
-    Check_Type(file, T_STRING);
-
-    rb_iseq_t *iseq = iseq_alloc();
-
-    yp_parser_t parser;
-    size_t len = RSTRING_LEN(src);
-    VALUE name = rb_fstring_lit("<compiled>");
-
-    yp_parser_init(&parser, (const uint8_t *) RSTRING_PTR(src), len, "");
-
-    yp_node_t *node = yp_parse(&parser);
-
-    int first_lineno = NUM2INT(line);
-    yp_line_column_t start_loc = yp_newline_list_line_column(&parser.newline_list, node->location.start);
-    yp_line_column_t end_loc = yp_newline_list_line_column(&parser.newline_list, node->location.end);
-
-    rb_code_location_t node_location;
-    node_location.beg_pos.lineno = (int)start_loc.line;
-    node_location.beg_pos.column = (int)start_loc.column;
-    node_location.end_pos.lineno = (int)end_loc.line;
-    node_location.end_pos.column = (int)end_loc.column;
-
-    int node_id = 0;
-
-    rb_iseq_t *parent = NULL;
-    enum rb_iseq_type iseq_type = ISEQ_TYPE_TOP;
-    rb_compile_option_t option;
-
-    make_compile_option(&option, opt);
-
-    prepare_iseq_build(iseq, name, file, path, first_lineno, &node_location, node_id,
-                       parent, 0, (enum rb_iseq_type)iseq_type, Qnil, &option);
-
-    rb_iseq_compile_yarp_node(iseq, node, &parser);
-
-    finish_iseq_build(iseq);
-    yp_node_destroy(&parser, node);
-    yp_parser_free(&parser);
+    return iseqw_s_compile_parser(argc, argv, self, false);
+}
 
-    return iseqw_new(iseq);
+/*
+ *  call-seq:
+ *     InstructionSequence.compile_prism(source[, file[, path[, line[, options]]]]) -> iseq
+ *
+ *  Takes +source+, which can be a string of Ruby code, or an open +File+ object.
+ *  that contains Ruby source code. It parses and compiles using prism.
+ *
+ *  Optionally takes +file+, +path+, and +line+ which describe the file path,
+ *  real path and first line number of the ruby code in +source+ which are
+ *  metadata attached to the returned +iseq+.
+ *
+ *  +file+ is used for `__FILE__` and exception backtrace. +path+ is used for
+ *  +require_relative+ base. It is recommended these should be the same full
+ *  path.
+ *
+ *  +options+, which can be +true+, +false+ or a +Hash+, is used to
+ *  modify the default behavior of the Ruby iseq compiler.
+ *
+ *  For details regarding valid compile options see ::compile_option=.
+ *
+ *     RubyVM::InstructionSequence.compile_prism("a = 1 + 2")
+ *     #=> <RubyVM::InstructionSequence:<compiled>@<compiled>>
+ *
+ *     path = "test.rb"
+ *     RubyVM::InstructionSequence.compile_prism(File.read(path), path, File.expand_path(path))
+ *     #=> <RubyVM::InstructionSequence:<compiled>@test.rb:1>
+ *
+ *     file = File.open("test.rb")
+ *     RubyVM::InstructionSequence.compile_prism(file)
+ *     #=> <RubyVM::InstructionSequence:<compiled>@<compiled>:1>
+ *
+ *     path = File.expand_path("test.rb")
+ *     RubyVM::InstructionSequence.compile_prism(File.read(path), path, path)
+ *     #=> <RubyVM::InstructionSequence:<compiled>@/absolute/path/to/test.rb:1>
+ *
+ */
+static VALUE
+iseqw_s_compile_prism(int argc, VALUE *argv, VALUE self)
+{
+    return iseqw_s_compile_parser(argc, argv, self, true);
 }
 
 /*
@@ -1470,6 +1747,7 @@ iseqw_s_compile_file(int argc, VALUE *argv, VALUE self)
     VALUE file, opt = Qnil;
     VALUE parser, f, exc = Qnil, ret;
     rb_ast_t *ast;
+    VALUE ast_value;
     rb_compile_option_t option;
     int i;
 
@@ -1488,7 +1766,8 @@ iseqw_s_compile_file(int argc, VALUE *argv, VALUE self)
 
     parser = rb_parser_new();
     rb_parser_set_context(parser, NULL, FALSE);
-    ast = (rb_ast_t *)rb_parser_load_file(parser, file);
+    ast_value = rb_parser_load_file(parser, file);
+    ast = rb_ruby_ast_data_get(ast_value);
     if (!ast->body.root) exc = GET_EC()->errinfo;
 
     rb_io_close(f);
@@ -1499,17 +1778,94 @@ iseqw_s_compile_file(int argc, VALUE *argv, VALUE self)
 
     make_compile_option(&option, opt);
 
-    ret = iseqw_new(rb_iseq_new_with_opt(&ast->body, rb_fstring_lit("<main>"),
+    ret = iseqw_new(rb_iseq_new_with_opt(ast_value, rb_fstring_lit("<main>"),
                                          file,
                                          rb_realpath_internal(Qnil, file, 1),
-                                         1, NULL, 0, ISEQ_TYPE_TOP, &option));
+                                         1, NULL, 0, ISEQ_TYPE_TOP, &option,
+                                         Qnil));
     rb_ast_dispose(ast);
+    RB_GC_GUARD(ast_value);
 
     rb_vm_pop_frame(ec);
     RB_GC_GUARD(v);
     return ret;
 }
 
+/*
+ *  call-seq:
+ *      InstructionSequence.compile_file_prism(file[, options]) -> iseq
+ *
+ *  Takes +file+, a String with the location of a Ruby source file, reads,
+ *  parses and compiles the file, and returns +iseq+, the compiled
+ *  InstructionSequence with source location metadata set. It parses and
+ *  compiles using prism.
+ *
+ *  Optionally takes +options+, which can be +true+, +false+ or a +Hash+, to
+ *  modify the default behavior of the Ruby iseq compiler.
+ *
+ *  For details regarding valid compile options see ::compile_option=.
+ *
+ *      # /tmp/hello.rb
+ *      puts "Hello, world!"
+ *
+ *      # elsewhere
+ *      RubyVM::InstructionSequence.compile_file_prism("/tmp/hello.rb")
+ *      #=> <RubyVM::InstructionSequence:<main>@/tmp/hello.rb>
+ */
+static VALUE
+iseqw_s_compile_file_prism(int argc, VALUE *argv, VALUE self)
+{
+    VALUE file, opt = Qnil, ret;
+    rb_compile_option_t option;
+    int i;
+
+    i = rb_scan_args(argc, argv, "1*:", &file, NULL, &opt);
+    if (i > 1+NIL_P(opt)) rb_error_arity(argc, 1, 2);
+    switch (i) {
+      case 2: opt = argv[--i];
+    }
+    FilePathValue(file);
+    file = rb_fstring(file); /* rb_io_t->pathv gets frozen anyways */
+
+    rb_execution_context_t *ec = GET_EC();
+    VALUE v = rb_vm_push_frame_fname(ec, file);
+
+    pm_parse_result_t result = { 0 };
+    result.options.line = 1;
+    result.node.coverage_enabled = 1;
+
+    VALUE script_lines;
+    VALUE error = pm_load_parse_file(&result, file, ruby_vm_keep_script_lines ? &script_lines : NULL);
+
+    if (error == Qnil) {
+        make_compile_option(&option, opt);
+
+        int error_state;
+        rb_iseq_t *iseq = pm_iseq_new_with_opt(&result.node, rb_fstring_lit("<main>"),
+                                               file,
+                                               rb_realpath_internal(Qnil, file, 1),
+                                               1, NULL, 0, ISEQ_TYPE_TOP, &option, &error_state);
+
+        pm_parse_result_free(&result);
+
+        if (error_state) {
+            RUBY_ASSERT(iseq == NULL);
+            rb_jump_tag(error_state);
+        }
+
+        ret = iseqw_new(iseq);
+        rb_vm_pop_frame(ec);
+        RB_GC_GUARD(v);
+        return ret;
+    }
+    else {
+        pm_parse_result_free(&result);
+        rb_vm_pop_frame(ec);
+        RB_GC_GUARD(v);
+        rb_exc_raise(error);
+    }
+}
+
 /*
  *  call-seq:
  *     InstructionSequence.compile_option = options
@@ -1566,7 +1922,9 @@ iseqw_s_compile_option_get(VALUE self)
 static const rb_iseq_t *
 iseqw_check(VALUE iseqw)
 {
-    rb_iseq_t *iseq = DATA_PTR(iseqw);
+    rb_iseq_t **iseq_ptr;
+    TypedData_Get_Struct(iseqw, rb_iseq_t *, &iseqw_data_type, iseq_ptr);
+    rb_iseq_t *iseq = *iseq_ptr;
 
     if (!ISEQ_BODY(iseq)) {
         rb_ibf_load_iseq_complete(iseq);
@@ -1595,7 +1953,11 @@ rb_iseqw_to_iseq(VALUE iseqw)
 static VALUE
 iseqw_eval(VALUE self)
 {
-    return rb_iseq_eval(iseqw_check(self));
+    const rb_iseq_t *iseq = iseqw_check(self);
+    if (0 == ISEQ_BODY(iseq)->iseq_size) {
+        rb_raise(rb_eTypeError, "attempt to evaluate dummy InstructionSequence");
+    }
+    return rb_iseq_eval(iseq);
 }
 
 /*
@@ -2029,6 +2391,8 @@ rb_iseq_event_flags(const rb_iseq_t *iseq, size_t pos)
     }
 }
 
+// Clear tracing event flags and turn off tracing for a given instruction as needed.
+// This is currently used after updating a one-shot line coverage for the current instruction.
 void
 rb_iseq_clear_event_flags(const rb_iseq_t *iseq, size_t pos, rb_event_flag_t reset)
 {
@@ -2059,7 +2423,7 @@ local_var_name(const rb_iseq_t *diseq, VALUE level, VALUE op)
     if (!name) {
         name = rb_str_new_cstr("?");
     }
-    else if (!rb_str_symname_p(name)) {
+    else if (!rb_is_local_id(lid)) {
         name = rb_str_inspect(name);
     }
     else {
@@ -2209,6 +2573,7 @@ rb_insn_operand_intern(const rb_iseq_t *iseq,
                 VALUE flags = rb_ary_new();
 # 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_SPLAT_MUT);
                 CALL_FLAG(ARGS_BLOCKARG);
                 CALL_FLAG(FCALL);
                 CALL_FLAG(VCALL);
@@ -2219,6 +2584,7 @@ rb_insn_operand_intern(const rb_iseq_t *iseq,
                 CALL_FLAG(KWARG);
                 CALL_FLAG(KW_SPLAT);
                 CALL_FLAG(KW_SPLAT_MUT);
+                CALL_FLAG(FORWARDING);
                 CALL_FLAG(OPT_SEND); /* maybe not reachable */
                 rb_ary_push(ary, rb_ary_join(flags, rb_str_new2("|")));
             }
@@ -2420,6 +2786,16 @@ rb_iseq_disasm_recursive(const rb_iseq_t *iseq, VALUE indent)
         rb_str_modify_expand(str, header_minlen - l);
         memset(RSTRING_END(str), '=', header_minlen - l);
     }
+    if (iseq->body->builtin_attrs) {
+#define disasm_builtin_attr(str, iseq, attr) \
+        if (iseq->body->builtin_attrs & BUILTIN_ATTR_ ## attr) { \
+            rb_str_cat2(str, " " #attr); \
+        }
+        disasm_builtin_attr(str, iseq, LEAF);
+        disasm_builtin_attr(str, iseq, SINGLE_NOARG_LEAF);
+        disasm_builtin_attr(str, iseq, INLINE_BLOCK);
+        disasm_builtin_attr(str, iseq, C_TRACE);
+    }
     rb_str_cat2(str, "\n");
 
     /* show catch table information */
@@ -2492,11 +2868,11 @@ rb_iseq_disasm_recursive(const rb_iseq_t *iseq, VALUE indent)
             }
 
             snprintf(argi, sizeof(argi), "%s%s%s%s%s%s",	/* arg, opts, rest, post, kwrest, block */
-                     body->param.lead_num > li ? "Arg" : "",
+                     (body->param.lead_num > li) ? (body->param.flags.ambiguous_param0 ? "AmbiguousArg" : "Arg") : "",
                      opti,
-                     (body->param.flags.has_rest && body->param.rest_start == li) ? "Rest" : "",
+                     (body->param.flags.has_rest && body->param.rest_start == li) ? (body->param.flags.anon_rest ? "AnonRest" : "Rest") : "",
                      (body->param.flags.has_post && body->param.post_start <= li && li < body->param.post_start + body->param.post_num) ? "Post" : "",
-                     (body->param.flags.has_kwrest && keyword->rest_start == li) ? "Kwrest" : "",
+                     (body->param.flags.has_kwrest && keyword->rest_start == li) ? (body->param.flags.anon_kwrest ? "AnonKwrest" : "Kwrest") : "",
                      (body->param.flags.has_block && body->param.block_start == li) ? "Block" : "");
 
             rb_str_cat(str, indent_str, indent_len);
@@ -2557,7 +2933,7 @@ rb_estimate_iv_count(VALUE klass, const rb_iseq_t * initialize_iseq)
     attr_index_t count = (attr_index_t)rb_id_table_size(iv_names);
 
     VALUE superclass = rb_class_superclass(klass);
-    count += RCLASS_EXT(superclass)->max_iv_count;
+    count += RCLASS_MAX_IV_COUNT(superclass);
 
     rb_id_table_free(iv_names);
 
@@ -2739,7 +3115,10 @@ iseqw_s_of(VALUE klass, VALUE body)
 {
     const rb_iseq_t *iseq = NULL;
 
-    if (rb_obj_is_proc(body)) {
+    if (rb_frame_info_p(body)) {
+        iseq = rb_get_iseq_from_frame_info(body);
+    }
+    else if (rb_obj_is_proc(body)) {
         iseq = vm_proc_iseq(body);
 
         if (!rb_obj_is_iseq((VALUE)iseq)) {
@@ -2761,10 +3140,10 @@ iseqw_s_of(VALUE klass, VALUE body)
  *     InstructionSequence.disasm(body) -> str
  *     InstructionSequence.disassemble(body) -> str
  *
- *  Takes +body+, a Method or Proc object, and returns a String with the
- *  human readable instructions for +body+.
+ *  Takes +body+, a +Method+ or +Proc+ object, and returns a +String+
+ *  with the human readable instructions for +body+.
  *
- *  For a Method object:
+ *  For a +Method+ object:
  *
  *    # /tmp/method.rb
  *    def hello
@@ -2784,7 +3163,7 @@ iseqw_s_of(VALUE klass, VALUE body)
  *    0013 trace            16                                              (   3)
  *    0015 leave                                                            (   2)
  *
- *  For a Proc:
+ *  For a +Proc+ object:
  *
  *    # /tmp/proc.rb
  *    p = proc { num = 1 + 2 }
@@ -2920,7 +3299,7 @@ iseq_data_to_ary(const rb_iseq_t *iseq)
     VALUE exception = rb_ary_new(); /* [[....]] */
     VALUE misc = rb_hash_new();
 
-    static ID insn_syms[VM_INSTRUCTION_SIZE/2]; /* w/o-trace only */
+    static ID insn_syms[VM_BARE_INSTRUCTION_SIZE]; /* w/o-trace only */
     struct st_table *labels_table = st_init_numtable();
     VALUE labels_wrapper = TypedData_Wrap_Struct(0, &label_wrapper, labels_table);
 
@@ -2992,6 +3371,7 @@ iseq_data_to_ary(const rb_iseq_t *iseq)
         }
         if (iseq_body->param.flags.has_kwrest) rb_hash_aset(params, ID2SYM(rb_intern("kwrest")), INT2FIX(keyword->rest_start));
         if (iseq_body->param.flags.ambiguous_param0) rb_hash_aset(params, ID2SYM(rb_intern("ambiguous_param0")), Qtrue);
+        if (iseq_body->param.flags.use_block) rb_hash_aset(params, ID2SYM(rb_intern("use_block")), Qtrue);
     }
 
     /* body */
@@ -3213,6 +3593,7 @@ iseq_data_to_ary(const rb_iseq_t *iseq)
 #ifdef USE_ISEQ_NODE_ID
     rb_hash_aset(misc, ID2SYM(rb_intern("node_ids")), node_ids);
 #endif
+    rb_hash_aset(misc, ID2SYM(rb_intern("parser")), iseq_body->prism ? ID2SYM(rb_intern("prism")) : ID2SYM(rb_intern("parse.y")));
 
     /*
      * [:magic, :major_version, :minor_version, :format_type, :misc,
@@ -3254,10 +3635,23 @@ rb_iseq_parameters(const rb_iseq_t *iseq, int is_proc)
 
     CONST_ID(req, "req");
     CONST_ID(opt, "opt");
+
+    if (body->param.flags.forwardable) {
+        // [[:rest, :*], [:keyrest, :**], [:block, :&]]
+        CONST_ID(rest, "rest");
+        CONST_ID(keyrest, "keyrest");
+        CONST_ID(block, "block");
+        rb_ary_push(args, rb_ary_new_from_args(2, ID2SYM(rest), ID2SYM(idMULT)));
+        rb_ary_push(args, rb_ary_new_from_args(2, ID2SYM(keyrest), ID2SYM(idPow)));
+        rb_ary_push(args, rb_ary_new_from_args(2, ID2SYM(block), ID2SYM(idAnd)));
+    }
+
     if (is_proc) {
         for (i = 0; i < body->param.lead_num; i++) {
             PARAM_TYPE(opt);
-            rb_ary_push(a, rb_id2str(PARAM_ID(i)) ? ID2SYM(PARAM_ID(i)) : Qnil);
+            if (rb_id2str(PARAM_ID(i))) {
+                rb_ary_push(a, ID2SYM(PARAM_ID(i)));
+            }
             rb_ary_push(args, a);
         }
     }
@@ -3282,7 +3676,9 @@ rb_iseq_parameters(const rb_iseq_t *iseq, int is_proc)
     if (is_proc) {
         for (i = body->param.post_start; i < r; i++) {
             PARAM_TYPE(opt);
-            rb_ary_push(a, rb_id2str(PARAM_ID(i)) ? ID2SYM(PARAM_ID(i)) : Qnil);
+            if (rb_id2str(PARAM_ID(i))) {
+                rb_ary_push(a, ID2SYM(PARAM_ID(i)));
+            }
             rb_ary_push(args, a);
         }
     }
@@ -3365,18 +3761,30 @@ rb_iseq_defined_string(enum defined_type type)
     return rb_fstring_cstr(estr);
 }
 
-/* A map from encoded_insn to insn_data: decoded insn number, its len,
- * non-trace version of encoded insn, and trace version. */
-
+// A map from encoded_insn to insn_data: decoded insn number, its len,
+// decoded ZJIT insn number, non-trace version of encoded insn,
+// trace version, and zjit version.
 static st_table *encoded_insn_data;
 typedef struct insn_data_struct {
     int insn;
     int insn_len;
     void *notrace_encoded_insn;
     void *trace_encoded_insn;
+#if USE_ZJIT
+    int zjit_insn;
+    void *zjit_encoded_insn;
+#endif
 } insn_data_t;
-static insn_data_t insn_data[VM_INSTRUCTION_SIZE/2];
+static insn_data_t insn_data[VM_BARE_INSTRUCTION_SIZE];
+
+void
+rb_free_encoded_insn_data(void)
+{
+    st_free_table(encoded_insn_data);
+}
 
+// Initialize a table to decode bare, trace, and zjit instructions.
+// This function also determines which instructions are used when TracePoint is enabled.
 void
 rb_vm_encoded_insn_data_table_init(void)
 {
@@ -3384,32 +3792,42 @@ rb_vm_encoded_insn_data_table_init(void)
     const void * const *table = rb_vm_get_insns_address_table();
 #define INSN_CODE(insn) ((VALUE)table[insn])
 #else
-#define INSN_CODE(insn) (insn)
+#define INSN_CODE(insn) ((VALUE)(insn))
 #endif
-    st_data_t insn;
-    encoded_insn_data = st_init_numtable_with_size(VM_INSTRUCTION_SIZE / 2);
+    encoded_insn_data = st_init_numtable_with_size(VM_BARE_INSTRUCTION_SIZE);
 
-    for (insn = 0; insn < VM_INSTRUCTION_SIZE/2; insn++) {
-        st_data_t key1 = (st_data_t)INSN_CODE(insn);
-        st_data_t key2 = (st_data_t)INSN_CODE(insn + VM_INSTRUCTION_SIZE/2);
-
-        insn_data[insn].insn = (int)insn;
+    for (int insn = 0; insn < VM_BARE_INSTRUCTION_SIZE; insn++) {
+        insn_data[insn].insn = insn;
         insn_data[insn].insn_len = insn_len(insn);
 
-        if (insn != BIN(opt_invokebuiltin_delegate_leave)) {
-            insn_data[insn].notrace_encoded_insn = (void *) key1;
-            insn_data[insn].trace_encoded_insn = (void *) key2;
-        }
-        else {
-            insn_data[insn].notrace_encoded_insn = (void *) INSN_CODE(BIN(opt_invokebuiltin_delegate));
-            insn_data[insn].trace_encoded_insn = (void *) INSN_CODE(BIN(opt_invokebuiltin_delegate) + VM_INSTRUCTION_SIZE/2);
-        }
+        // When tracing :return events, we convert opt_invokebuiltin_delegate_leave + leave into
+        // opt_invokebuiltin_delegate + trace_leave, presumably because we don't want to fire
+        // :return events before invokebuiltin. https://github.com/ruby/ruby/pull/3256
+        int notrace_insn = (insn != BIN(opt_invokebuiltin_delegate_leave)) ? insn : BIN(opt_invokebuiltin_delegate);
+        insn_data[insn].notrace_encoded_insn = (void *)INSN_CODE(notrace_insn);
+        insn_data[insn].trace_encoded_insn = (void *)INSN_CODE(notrace_insn + VM_BARE_INSTRUCTION_SIZE);
 
+        st_data_t key1 = (st_data_t)INSN_CODE(insn);
+        st_data_t key2 = (st_data_t)INSN_CODE(insn + VM_BARE_INSTRUCTION_SIZE);
         st_add_direct(encoded_insn_data, key1, (st_data_t)&insn_data[insn]);
         st_add_direct(encoded_insn_data, key2, (st_data_t)&insn_data[insn]);
+
+#if USE_ZJIT
+        int zjit_insn = vm_bare_insn_to_zjit_insn(insn);
+        insn_data[insn].zjit_insn = zjit_insn;
+        insn_data[insn].zjit_encoded_insn = (insn != zjit_insn) ? (void *)INSN_CODE(zjit_insn) : 0;
+
+        if (insn != zjit_insn) {
+            st_data_t key3 = (st_data_t)INSN_CODE(zjit_insn);
+            st_add_direct(encoded_insn_data, key3, (st_data_t)&insn_data[insn]);
+        }
+#endif
     }
 }
 
+// Decode an insn address to an insn. This returns bare instructions
+// even if they're trace/zjit instructions. Use rb_vm_insn_addr2opcode
+// to decode trace/zjit instructions as is.
 int
 rb_vm_insn_addr2insn(const void *addr)
 {
@@ -3424,7 +3842,8 @@ rb_vm_insn_addr2insn(const void *addr)
     rb_bug("rb_vm_insn_addr2insn: invalid insn address: %p", addr);
 }
 
-// Unlike rb_vm_insn_addr2insn, this function can return trace opcode variants.
+// Decode an insn address to an insn. Unlike rb_vm_insn_addr2insn,
+// this function can return trace/zjit opcode variants.
 int
 rb_vm_insn_addr2opcode(const void *addr)
 {
@@ -3435,15 +3854,22 @@ rb_vm_insn_addr2opcode(const void *addr)
         insn_data_t *e = (insn_data_t *)val;
         int opcode = e->insn;
         if (addr == e->trace_encoded_insn) {
-            opcode += VM_INSTRUCTION_SIZE/2;
+            opcode += VM_BARE_INSTRUCTION_SIZE;
         }
+#if USE_ZJIT
+        else if (addr == e->zjit_encoded_insn) {
+            opcode = e->zjit_insn;
+        }
+#endif
         return opcode;
     }
 
     rb_bug("rb_vm_insn_addr2opcode: invalid insn address: %p", addr);
 }
 
-// Decode `ISEQ_BODY(iseq)->iseq_encoded[i]` to an insn.
+// Decode `ISEQ_BODY(iseq)->iseq_encoded[i]` to an insn. This returns
+// bare instructions even if they're trace/zjit instructions. Use
+// rb_vm_insn_addr2opcode to decode trace/zjit instructions as is.
 int
 rb_vm_insn_decode(const VALUE encoded)
 {
@@ -3455,6 +3881,7 @@ rb_vm_insn_decode(const VALUE encoded)
     return insn;
 }
 
+// Turn on or off tracing for a given instruction address
 static inline int
 encoded_iseq_trace_instrument(VALUE *iseq_encoded_insn, rb_event_flag_t turnon, bool remain_current_trace)
 {
@@ -3473,6 +3900,7 @@ encoded_iseq_trace_instrument(VALUE *iseq_encoded_insn, rb_event_flag_t turnon,
     rb_bug("trace_instrument: invalid insn address: %p", (void *)*iseq_encoded_insn);
 }
 
+// Turn off tracing for an instruction at pos after tracing event flags are cleared
 void
 rb_iseq_trace_flag_cleared(const rb_iseq_t *iseq, size_t pos)
 {
@@ -3680,8 +4108,8 @@ clear_attr_ccs_i(void *vstart, void *vend, size_t stride, void *data)
 {
     VALUE v = (VALUE)vstart;
     for (; v != (VALUE)vend; v += stride) {
-        void *ptr = asan_poisoned_object_p(v);
-        asan_unpoison_object(v, false);
+        void *ptr = rb_asan_poisoned_object_p(v);
+        rb_asan_unpoison_object(v, false);
         clear_attr_cc(v);
         asan_poison_object_if(ptr, v);
     }
@@ -3699,8 +4127,8 @@ clear_bf_ccs_i(void *vstart, void *vend, size_t stride, void *data)
 {
     VALUE v = (VALUE)vstart;
     for (; v != (VALUE)vend; v += stride) {
-        void *ptr = asan_poisoned_object_p(v);
-        asan_unpoison_object(v, false);
+        void *ptr = rb_asan_poisoned_object_p(v);
+        rb_asan_unpoison_object(v, false);
         clear_bf_cc(v);
         asan_poison_object_if(ptr, v);
     }
@@ -3720,8 +4148,8 @@ trace_set_i(void *vstart, void *vend, size_t stride, void *data)
 
     VALUE v = (VALUE)vstart;
     for (; v != (VALUE)vend; v += stride) {
-        void *ptr = asan_poisoned_object_p(v);
-        asan_unpoison_object(v, false);
+        void *ptr = rb_asan_poisoned_object_p(v);
+        rb_asan_unpoison_object(v, false);
 
         if (rb_obj_is_iseq(v)) {
             rb_iseq_trace_set(rb_iseq_check((rb_iseq_t *)v), turnon_events);
@@ -4016,7 +4444,9 @@ Init_ISeq(void)
     (void)iseq_s_load;
 
     rb_define_singleton_method(rb_cISeq, "compile", iseqw_s_compile, -1);
-    rb_define_singleton_method(rb_cISeq, "compile_yarp", iseqw_s_compile_yarp, -1);
+    rb_define_singleton_method(rb_cISeq, "compile_parsey", iseqw_s_compile_parsey, -1);
+    rb_define_singleton_method(rb_cISeq, "compile_prism", iseqw_s_compile_prism, -1);
+    rb_define_singleton_method(rb_cISeq, "compile_file_prism", iseqw_s_compile_file_prism, -1);
     rb_define_singleton_method(rb_cISeq, "new", iseqw_s_compile, -1);
     rb_define_singleton_method(rb_cISeq, "compile_file", iseqw_s_compile_file, -1);
     rb_define_singleton_method(rb_cISeq, "compile_option", iseqw_s_compile_option_get, 0);
diff --git a/iseq.h b/iseq.h
index 1ad07e9065d8c7..1cecc6960d0b5a 100644
--- a/iseq.h
+++ b/iseq.h
@@ -13,6 +13,7 @@
 #include "internal/gc.h"
 #include "shape.h"
 #include "vm_core.h"
+#include "prism_compile.h"
 
 RUBY_EXTERN const int ruby_api_version[];
 #define ISEQ_MAJOR_VERSION ((unsigned int)ruby_api_version[0])
@@ -46,6 +47,10 @@ extern const ID rb_iseq_shared_exc_local_tbl[];
 
 #define ISEQ_FLIP_CNT(iseq) ISEQ_BODY(iseq)->variable.flip_count
 
+#define ISEQ_FROZEN_STRING_LITERAL_ENABLED 1
+#define ISEQ_FROZEN_STRING_LITERAL_DISABLED 0
+#define ISEQ_FROZEN_STRING_LITERAL_UNSET -1
+
 static inline rb_snum_t
 ISEQ_FLIP_CNT_INCREMENT(const rb_iseq_t *iseq)
 {
@@ -65,9 +70,7 @@ ISEQ_ORIGINAL_ISEQ_CLEAR(const rb_iseq_t *iseq)
 {
     void *ptr = ISEQ_BODY(iseq)->variable.original_iseq;
     ISEQ_BODY(iseq)->variable.original_iseq = NULL;
-    if (ptr) {
-        ruby_xfree(ptr);
-    }
+    ruby_xfree(ptr);
 }
 
 static inline VALUE *
@@ -101,6 +104,16 @@ struct iseq_compile_data {
     const VALUE err_info;
     const VALUE catch_table_ary;	/* Array */
 
+    /* Mirror fields from ISEQ_BODY so they are accessible during iseq setup */
+    unsigned int iseq_size;
+    VALUE *iseq_encoded; /* half-encoded iseq (insn addr and operands) */
+    bool is_single_mark_bit; /* identifies whether mark bits are single or a list */
+
+    union {
+        iseq_bits_t * list; /* Find references for GC */
+        iseq_bits_t single;
+    } mark_bits;
+
     /* GC is not needed */
     struct iseq_label_data *start_label;
     struct iseq_label_data *end_label;
@@ -116,6 +129,7 @@ struct iseq_compile_data {
       struct iseq_compile_data_storage *storage_current;
     } insn;
     bool in_rescue;
+    bool in_masgn;
     int loopval_popped;	/* used by NODE_BREAK */
     int last_line;
     int label_no;
@@ -161,7 +175,7 @@ ISEQ_COMPILE_DATA_CLEAR(rb_iseq_t *iseq)
 static inline rb_iseq_t *
 iseq_imemo_alloc(void)
 {
-    return (rb_iseq_t *)rb_imemo_new(imemo_iseq, 0, 0, 0, 0);
+    return IMEMO_NEW(rb_iseq_t, imemo_iseq, 0);
 }
 
 VALUE rb_iseq_ibf_dump(const rb_iseq_t *iseq, VALUE opt);
@@ -173,6 +187,7 @@ void rb_iseq_init_trace(rb_iseq_t *iseq);
 int rb_iseq_add_local_tracepoint_recursively(const rb_iseq_t *iseq, rb_event_flag_t turnon_events, VALUE tpval, unsigned int target_line, bool target_bmethod);
 int rb_iseq_remove_local_tracepoint_recursively(const rb_iseq_t *iseq, VALUE tpval);
 const rb_iseq_t *rb_iseq_load_iseq(VALUE fname);
+int rb_iseq_opt_frozen_string_literal(void);
 
 #if VM_INSN_INFO_TABLE_IMPL == 2
 unsigned int *rb_iseq_insns_info_decode_positions(const struct rb_iseq_constant_body *body);
@@ -227,7 +242,7 @@ struct rb_compile_option_struct {
     unsigned int specialized_instruction: 1;
     unsigned int operands_unification: 1;
     unsigned int instructions_unification: 1;
-    unsigned int frozen_string_literal: 1;
+    signed int frozen_string_literal: 2; /* -1: not specified, 0: false, 1: true */
     unsigned int debug_frozen_string_literal: 1;
     unsigned int coverage_enabled: 1;
     int debug_level;
@@ -329,6 +344,8 @@ VALUE rb_iseq_local_variables(const rb_iseq_t *iseq);
 
 attr_index_t rb_estimate_iv_count(VALUE klass, const rb_iseq_t * initialize_iseq);
 
+void rb_free_encoded_insn_data(void);
+
 RUBY_SYMBOL_EXPORT_END
 
 #endif /* RUBY_ISEQ_H */
diff --git a/jit.c b/jit.c
new file mode 100644
index 00000000000000..74a042d45d5b39
--- /dev/null
+++ b/jit.c
@@ -0,0 +1,444 @@
+// Glue code shared between YJIT and ZJIT for use from Rust.
+// For FFI safety and bindgen compatibility reasons, certain types of C
+// functions require wrapping before they can be called from Rust. Those show
+// up here.
+//
+// Code specific to YJIT and ZJIT should go to yjit.c and zjit.c respectively.
+
+#include "internal.h"
+#include "vm_core.h"
+#include "vm_callinfo.h"
+#include "builtin.h"
+#include "insns.inc"
+#include "insns_info.inc"
+#include "iseq.h"
+#include "internal/gc.h"
+
+unsigned int
+rb_iseq_encoded_size(const rb_iseq_t *iseq)
+{
+    return iseq->body->iseq_size;
+}
+
+// Get the PC for a given index in an iseq
+VALUE *
+rb_iseq_pc_at_idx(const rb_iseq_t *iseq, uint32_t insn_idx)
+{
+    RUBY_ASSERT_ALWAYS(IMEMO_TYPE_P(iseq, imemo_iseq));
+    RUBY_ASSERT_ALWAYS(insn_idx < iseq->body->iseq_size);
+    VALUE *encoded = iseq->body->iseq_encoded;
+    VALUE *pc = &encoded[insn_idx];
+    return pc;
+}
+
+// Get the opcode given a program counter. Can return trace opcode variants.
+int
+rb_iseq_opcode_at_pc(const rb_iseq_t *iseq, const VALUE *pc)
+{
+    // YJIT should only use iseqs after AST to bytecode compilation
+    RUBY_ASSERT_ALWAYS(FL_TEST_RAW((VALUE)iseq, ISEQ_TRANSLATED));
+
+    const VALUE at_pc = *pc;
+    return rb_vm_insn_addr2opcode((const void *)at_pc);
+}
+
+unsigned long
+rb_RSTRING_LEN(VALUE str)
+{
+    return RSTRING_LEN(str);
+}
+
+char *
+rb_RSTRING_PTR(VALUE str)
+{
+    return RSTRING_PTR(str);
+}
+
+const char *
+rb_insn_name(VALUE insn)
+{
+    return insn_name(insn);
+}
+
+unsigned int
+rb_vm_ci_argc(const struct rb_callinfo *ci)
+{
+    return vm_ci_argc(ci);
+}
+
+ID
+rb_vm_ci_mid(const struct rb_callinfo *ci)
+{
+    return vm_ci_mid(ci);
+}
+
+unsigned int
+rb_vm_ci_flag(const struct rb_callinfo *ci)
+{
+    return vm_ci_flag(ci);
+}
+
+const struct rb_callinfo_kwarg *
+rb_vm_ci_kwarg(const struct rb_callinfo *ci)
+{
+    return vm_ci_kwarg(ci);
+}
+
+int
+rb_get_cikw_keyword_len(const struct rb_callinfo_kwarg *cikw)
+{
+    return cikw->keyword_len;
+}
+
+VALUE
+rb_get_cikw_keywords_idx(const struct rb_callinfo_kwarg *cikw, int idx)
+{
+    return cikw->keywords[idx];
+}
+
+rb_method_visibility_t
+rb_METHOD_ENTRY_VISI(const rb_callable_method_entry_t *me)
+{
+    return METHOD_ENTRY_VISI(me);
+}
+
+rb_method_type_t
+rb_get_cme_def_type(const rb_callable_method_entry_t *cme)
+{
+    if (UNDEFINED_METHOD_ENTRY_P(cme)) {
+        return VM_METHOD_TYPE_UNDEF;
+    }
+    else {
+        return cme->def->type;
+    }
+}
+
+ID
+rb_get_cme_def_body_attr_id(const rb_callable_method_entry_t *cme)
+{
+    return cme->def->body.attr.id;
+}
+
+enum method_optimized_type
+rb_get_cme_def_body_optimized_type(const rb_callable_method_entry_t *cme)
+{
+    return cme->def->body.optimized.type;
+}
+
+unsigned int
+rb_get_cme_def_body_optimized_index(const rb_callable_method_entry_t *cme)
+{
+    return cme->def->body.optimized.index;
+}
+
+rb_method_cfunc_t *
+rb_get_cme_def_body_cfunc(const rb_callable_method_entry_t *cme)
+{
+    return UNALIGNED_MEMBER_PTR(cme->def, body.cfunc);
+}
+
+uintptr_t
+rb_get_def_method_serial(const rb_method_definition_t *def)
+{
+    return def->method_serial;
+}
+
+ID
+rb_get_def_original_id(const rb_method_definition_t *def)
+{
+    return def->original_id;
+}
+
+int
+rb_get_mct_argc(const rb_method_cfunc_t *mct)
+{
+    return mct->argc;
+}
+
+void *
+rb_get_mct_func(const rb_method_cfunc_t *mct)
+{
+    return (void*)(uintptr_t)mct->func; // this field is defined as type VALUE (*func)(ANYARGS)
+}
+
+const rb_iseq_t *
+rb_get_def_iseq_ptr(rb_method_definition_t *def)
+{
+    return def_iseq_ptr(def);
+}
+
+const rb_iseq_t *
+rb_get_iseq_body_local_iseq(const rb_iseq_t *iseq)
+{
+    return iseq->body->local_iseq;
+}
+
+const rb_iseq_t *
+rb_get_iseq_body_parent_iseq(const rb_iseq_t *iseq)
+{
+    return iseq->body->parent_iseq;
+}
+
+unsigned int
+rb_get_iseq_body_local_table_size(const rb_iseq_t *iseq)
+{
+    return iseq->body->local_table_size;
+}
+
+VALUE *
+rb_get_iseq_body_iseq_encoded(const rb_iseq_t *iseq)
+{
+    return iseq->body->iseq_encoded;
+}
+
+unsigned
+rb_get_iseq_body_stack_max(const rb_iseq_t *iseq)
+{
+    return iseq->body->stack_max;
+}
+
+enum rb_iseq_type
+rb_get_iseq_body_type(const rb_iseq_t *iseq)
+{
+    return iseq->body->type;
+}
+
+bool
+rb_get_iseq_flags_has_lead(const rb_iseq_t *iseq)
+{
+    return iseq->body->param.flags.has_lead;
+}
+
+bool
+rb_get_iseq_flags_has_opt(const rb_iseq_t *iseq)
+{
+    return iseq->body->param.flags.has_opt;
+}
+
+bool
+rb_get_iseq_flags_has_kw(const rb_iseq_t *iseq)
+{
+    return iseq->body->param.flags.has_kw;
+}
+
+bool
+rb_get_iseq_flags_has_post(const rb_iseq_t *iseq)
+{
+    return iseq->body->param.flags.has_post;
+}
+
+bool
+rb_get_iseq_flags_has_kwrest(const rb_iseq_t *iseq)
+{
+    return iseq->body->param.flags.has_kwrest;
+}
+
+bool
+rb_get_iseq_flags_anon_kwrest(const rb_iseq_t *iseq)
+{
+    return iseq->body->param.flags.anon_kwrest;
+}
+
+bool
+rb_get_iseq_flags_has_rest(const rb_iseq_t *iseq)
+{
+    return iseq->body->param.flags.has_rest;
+}
+
+bool
+rb_get_iseq_flags_ruby2_keywords(const rb_iseq_t *iseq)
+{
+    return iseq->body->param.flags.ruby2_keywords;
+}
+
+bool
+rb_get_iseq_flags_has_block(const rb_iseq_t *iseq)
+{
+    return iseq->body->param.flags.has_block;
+}
+
+bool
+rb_get_iseq_flags_ambiguous_param0(const rb_iseq_t *iseq)
+{
+    return iseq->body->param.flags.ambiguous_param0;
+}
+
+bool
+rb_get_iseq_flags_accepts_no_kwarg(const rb_iseq_t *iseq)
+{
+    return iseq->body->param.flags.accepts_no_kwarg;
+}
+
+bool
+rb_get_iseq_flags_forwardable(const rb_iseq_t *iseq)
+{
+    return iseq->body->param.flags.forwardable;
+}
+
+// This is defined only as a named struct inside rb_iseq_constant_body.
+// By giving it a separate typedef, we make it nameable by rust-bindgen.
+// Bindgen's temp/anon name isn't guaranteed stable.
+typedef struct rb_iseq_param_keyword rb_iseq_param_keyword_struct;
+
+const rb_iseq_param_keyword_struct *
+rb_get_iseq_body_param_keyword(const rb_iseq_t *iseq)
+{
+    return iseq->body->param.keyword;
+}
+
+unsigned
+rb_get_iseq_body_param_size(const rb_iseq_t *iseq)
+{
+    return iseq->body->param.size;
+}
+
+int
+rb_get_iseq_body_param_lead_num(const rb_iseq_t *iseq)
+{
+    return iseq->body->param.lead_num;
+}
+
+int
+rb_get_iseq_body_param_opt_num(const rb_iseq_t *iseq)
+{
+    return iseq->body->param.opt_num;
+}
+
+const VALUE *
+rb_get_iseq_body_param_opt_table(const rb_iseq_t *iseq)
+{
+    return iseq->body->param.opt_table;
+}
+
+struct rb_control_frame_struct *
+rb_get_ec_cfp(const rb_execution_context_t *ec)
+{
+    return ec->cfp;
+}
+
+const rb_iseq_t *
+rb_get_cfp_iseq(struct rb_control_frame_struct *cfp)
+{
+    return cfp->iseq;
+}
+
+VALUE *
+rb_get_cfp_pc(struct rb_control_frame_struct *cfp)
+{
+    return (VALUE*)cfp->pc;
+}
+
+VALUE *
+rb_get_cfp_sp(struct rb_control_frame_struct *cfp)
+{
+    return cfp->sp;
+}
+
+VALUE
+rb_get_cfp_self(struct rb_control_frame_struct *cfp)
+{
+    return cfp->self;
+}
+
+VALUE *
+rb_get_cfp_ep(struct rb_control_frame_struct *cfp)
+{
+    return (VALUE*)cfp->ep;
+}
+
+const VALUE *
+rb_get_cfp_ep_level(struct rb_control_frame_struct *cfp, uint32_t lv)
+{
+    uint32_t i;
+    const VALUE *ep = (VALUE*)cfp->ep;
+    for (i = 0; i < lv; i++) {
+        ep = VM_ENV_PREV_EP(ep);
+    }
+    return ep;
+}
+
+VALUE
+rb_yarv_class_of(VALUE obj)
+{
+    return rb_class_of(obj);
+}
+
+// The FL_TEST() macro
+VALUE
+rb_FL_TEST(VALUE obj, VALUE flags)
+{
+    return RB_FL_TEST(obj, flags);
+}
+
+// The FL_TEST_RAW() macro, normally an internal implementation detail
+VALUE
+rb_FL_TEST_RAW(VALUE obj, VALUE flags)
+{
+    return FL_TEST_RAW(obj, flags);
+}
+
+// The RB_TYPE_P macro
+bool
+rb_RB_TYPE_P(VALUE obj, enum ruby_value_type t)
+{
+    return RB_TYPE_P(obj, t);
+}
+
+long
+rb_RSTRUCT_LEN(VALUE st)
+{
+    return RSTRUCT_LEN(st);
+}
+
+const struct rb_callinfo *
+rb_get_call_data_ci(const struct rb_call_data *cd)
+{
+    return cd->ci;
+}
+
+bool
+rb_BASIC_OP_UNREDEFINED_P(enum ruby_basic_operators bop, uint32_t klass)
+{
+    return BASIC_OP_UNREDEFINED_P(bop, klass);
+}
+
+VALUE
+rb_RCLASS_ORIGIN(VALUE c)
+{
+    return RCLASS_ORIGIN(c);
+}
+
+// For debug builds
+void
+rb_assert_iseq_handle(VALUE handle)
+{
+    RUBY_ASSERT_ALWAYS(IMEMO_TYPE_P(handle, imemo_iseq));
+}
+
+// Assert that we have the VM lock. Relevant mostly for multi ractor situations.
+// The GC takes the lock before calling us, and this asserts that it indeed happens.
+void
+rb_assert_holding_vm_lock(void)
+{
+    ASSERT_vm_locking();
+}
+
+int
+rb_IMEMO_TYPE_P(VALUE imemo, enum imemo_type imemo_type)
+{
+    return IMEMO_TYPE_P(imemo, imemo_type);
+}
+
+void
+rb_assert_cme_handle(VALUE handle)
+{
+    RUBY_ASSERT_ALWAYS(!rb_objspace_garbage_object_p(handle));
+    RUBY_ASSERT_ALWAYS(IMEMO_TYPE_P(handle, imemo_ment));
+}
+
+// YJIT and ZJIT need this function to never allocate and never raise
+VALUE
+rb_yarv_ary_entry_internal(VALUE ary, long offset)
+{
+    return rb_ary_entry_internal(ary, offset);
+}
diff --git a/jit.rs b/jit.rs
new file mode 100644
index 00000000000000..b66b2d21ca3643
--- /dev/null
+++ b/jit.rs
@@ -0,0 +1,4 @@
+#[cfg(feature = "yjit")]
+pub use yjit::*;
+#[cfg(feature = "zjit")]
+pub use zjit::*;
diff --git a/kernel.rb b/kernel.rb
index 43d1abec31118e..554de49977c5e3 100644
--- a/kernel.rb
+++ b/kernel.rb
@@ -40,7 +40,7 @@ def class
   #     s1.inspect          #=> "#<Klass:0x401b3a38 @str=\"Hi\">"
   #     s2.inspect          #=> "#<Klass:0x401b3998 @str=\"Hi\">"
   #
-  #  This method may have class-specific behavior.  If so, that
+  #  This method may have class-specific behavior. If so, that
   #  behavior will be documented under the #+initialize_copy+ method of
   #  the class.
   #
@@ -58,10 +58,10 @@ def clone(freeze: nil)
   #     a.freeze    #=> ["a", "b", "c"]
   #     a.frozen?   #=> true
   #--
-  # Determines if the object is frozen. Equivalent to \c Object\#frozen? in Ruby.
-  # \param[in] obj  the object to be determines
-  # \retval Qtrue if frozen
-  # \retval Qfalse if not frozen
+  # Determines if the object is frozen. Equivalent to `Object#frozen?` in Ruby.
+  # @param[in] obj  the object to be determines
+  # @retval Qtrue if frozen
+  # @retval Qfalse if not frozen
   #++
   #
   def frozen?
@@ -73,7 +73,7 @@ def frozen?
   #  call-seq:
   #     obj.tap {|x| block }    -> obj
   #
-  #  Yields self to the block, and then returns self.
+  #  Yields self to the block and then returns self.
   #  The primary purpose of this method is to "tap into" a method chain,
   #  in order to perform operations on intermediate results within the chain.
   #
@@ -87,6 +87,7 @@ def frozen?
   #++
   #
   def tap
+    Primitive.attr! :inline_block
     yield(self)
     self
   end
@@ -99,54 +100,33 @@ def tap
   #
   #     3.next.then {|x| x**x }.to_s             #=> "256"
   #
-  #  Good usage for +then+ is value piping in method chains:
+  #  A good use of +then+ is value piping in method chains:
   #
   #     require 'open-uri'
   #     require 'json'
   #
-  #     construct_url(arguments).
-  #       then {|url| URI(url).read }.
-  #       then {|response| JSON.parse(response) }
+  #     construct_url(arguments)
+  #       .then {|url| URI(url).read }
+  #       .then {|response| JSON.parse(response) }
   #
-  #  When called without block, the method returns +Enumerator+,
+  #  When called without a block, the method returns an +Enumerator+,
   #  which can be used, for example, for conditional
   #  circuit-breaking:
   #
-  #     # meets condition, no-op
+  #     # Meets condition, no-op
   #     1.then.detect(&:odd?)            # => 1
-  #     # does not meet condition, drop value
+  #     # Does not meet condition, drop value
   #     2.then.detect(&:odd?)            # => nil
   #
   def then
-    unless block_given?
+    Primitive.attr! :inline_block
+    unless defined?(yield)
       return Primitive.cexpr! 'SIZED_ENUMERATOR(self, 0, 0, rb_obj_size)'
     end
     yield(self)
   end
 
-  #
-  #  call-seq:
-  #     obj.yield_self {|x| block }    -> an_object
-  #
-  #  Yields self to the block and returns the result of the block.
-  #
-  #     "my string".yield_self {|s| s.upcase }   #=> "MY STRING"
-  #
-  #  Good usage for +then+ is value piping in method chains:
-  #
-  #     require 'open-uri'
-  #     require 'json'
-  #
-  #     construct_url(arguments).
-  #       then {|url| URI(url).read }.
-  #       then {|response| JSON.parse(response) }
-  #
-  def yield_self
-    unless block_given?
-      return Primitive.cexpr! 'SIZED_ENUMERATOR(self, 0, 0, rb_obj_size)'
-    end
-    yield(self)
-  end
+  alias yield_self then
 
   module_function
 
@@ -165,7 +145,7 @@ def yield_self
   #      # ...
   #    end
   #
-  # StopIteration raised in the block breaks the loop.  In this case,
+  # A StopIteration raised in the block breaks the loop. In this case,
   # loop returns the "result" value stored in the exception.
   #
   #    enum = Enumerator.new { |y|
@@ -178,8 +158,9 @@ def yield_self
   #      puts enum.next
   #    } #=> :ok
   def loop
-    unless block_given?
-      return enum_for(:loop) { Float::INFINITY }
+    Primitive.attr! :inline_block
+    unless defined?(yield)
+      return Primitive.cexpr! 'SIZED_ENUMERATOR(self, 0, 0, rb_f_loop_size)'
     end
 
     begin
@@ -197,10 +178,10 @@ def loop
   #
   #  Returns <i>arg</i> converted to a float. Numeric types are
   #  converted directly, and with exception to String and
-  #  <code>nil</code> the rest are converted using
-  #  <i>arg</i><code>.to_f</code>.  Converting a String with invalid
-  #  characters will result in a ArgumentError.  Converting
-  #  <code>nil</code> generates a TypeError.  Exceptions can be
+  #  <code>nil</code>, the rest are converted using
+  #  <i>arg</i><code>.to_f</code>. Converting a String with invalid
+  #  characters will result in an ArgumentError. Converting
+  #  <code>nil</code> generates a TypeError. Exceptions can be
   #  suppressed by passing <code>exception: false</code>.
   #
   #     Float(1)                 #=> 1.0
@@ -229,22 +210,22 @@ def Float(arg, exception: true)
   # With a non-zero +base+, +object+ must be a string or convertible
   # to a string.
   #
-  # ==== numeric objects
+  # ==== \Numeric objects
   #
-  # With integer argument +object+ given, returns +object+:
+  # With an integer argument +object+ given, returns +object+:
   #
   #   Integer(1)                # => 1
   #   Integer(-1)               # => -1
   #
-  # With floating-point argument +object+ given,
+  # With a floating-point argument +object+ given,
   # returns +object+ truncated to an integer:
   #
   #   Integer(1.9)              # => 1  # Rounds toward zero.
   #   Integer(-1.9)             # => -1 # Rounds toward zero.
   #
-  # ==== string objects
+  # ==== \String objects
   #
-  # With string argument +object+ and zero +base+ given,
+  # With a string argument +object+ and zero +base+ given,
   # returns +object+ converted to an integer in base 10:
   #
   #   Integer('100')    # => 100
@@ -254,7 +235,7 @@ def Float(arg, exception: true)
   # to specify the actual base (radix indicator):
   #
   #   Integer('0100')  # => 64  # Leading '0' specifies base 8.
-  #   Integer('0b100') # => 4   # Leading '0b', specifies base 2.
+  #   Integer('0b100') # => 4   # Leading '0b' specifies base 2.
   #   Integer('0x100') # => 256 # Leading '0x' specifies base 16.
   #
   # With a positive +base+ (in range 2..36) given, returns +object+
@@ -265,8 +246,8 @@ def Float(arg, exception: true)
   #   Integer('-100', 16) # => -256
   #
   # With a negative +base+ (in range -36..-2) given, returns +object+
-  # converted to an integer in the radix indicator if exists or
-  # +-base+:
+  # converted to the radix indicator if it exists or
+  # +base+:
   #
   #   Integer('0x100', -2)   # => 256
   #   Integer('100', -2)     # => 4
@@ -275,7 +256,7 @@ def Float(arg, exception: true)
   #   Integer('0o100', -10)  # => 64
   #   Integer('100', -10)    # => 100
   #
-  # +base+ -1 is equal the -10 case.
+  # +base+ -1 is equivalent to the -10 case.
   #
   # When converting strings, surrounding whitespace and embedded underscores
   # are allowed and ignored:
@@ -283,7 +264,7 @@ def Float(arg, exception: true)
   #   Integer(' 100 ')      # => 100
   #   Integer('-1_0_0', 16) # => -256
   #
-  # ==== other classes
+  # ==== Other classes
   #
   # Examples with +object+ of various other classes:
   #
@@ -291,22 +272,32 @@ def Float(arg, exception: true)
   #   Integer(Complex(2, 0))   # => 2  # Imaginary part must be zero.
   #   Integer(Time.now)        # => 1650974042
   #
-  # ==== keywords
+  # ==== Keywords
   #
-  # With optional keyword argument +exception+ given as +true+ (the default):
+  # With the optional keyword argument +exception+ given as +true+ (the default):
   #
   # - Raises TypeError if +object+ does not respond to +to_int+ or +to_i+.
   # - Raises TypeError if +object+ is +nil+.
-  # - Raise ArgumentError if +object+ is an invalid string.
+  # - Raises ArgumentError if +object+ is an invalid string.
   #
   # With +exception+ given as +false+, an exception of any kind is suppressed
   # and +nil+ is returned.
-
+  #
   def Integer(arg, base = 0, exception: true)
     if Primitive.mandatory_only?
       Primitive.rb_f_integer1(arg)
     else
-      Primitive.rb_f_integer(arg, base, exception);
+      Primitive.rb_f_integer(arg, base, exception)
+    end
+  end
+end
+
+class Module
+  # Internal helper for built-in initializations to define methods only when YJIT is enabled.
+  # This method is removed in yjit_hook.rb.
+  private def with_yjit(&block) # :nodoc:
+    if defined?(RubyVM::YJIT)
+      RubyVM::YJIT.send(:add_yjit_hook, block)
     end
   end
 end
diff --git a/lex.c.blt b/lex.c.blt
index 85727ed00f520d..de0719b014f979 100644
--- a/lex.c.blt
+++ b/lex.c.blt
@@ -1,5 +1,5 @@
 /* ANSI-C code produced by gperf version 3.1 */
-/* Command-line: gperf -C -P -p -j1 -i 1 -g -o -t -N rb_reserved_word -k'1,3,$' defs/keywords  */
+/* Command-line: gperf -C -L ANSI-C -P -p -j1 -i 1 -g -o -t -N rb_reserved_word -k'1,3,$' defs/keywords  */
 
 #if !((' ' == 32) && ('!' == 33) && ('"' == 34) && ('#' == 35) \
       && ('%' == 37) && ('&' == 38) && ('\'' == 39) && ('(' == 40) \
@@ -28,7 +28,6 @@
 #error "gperf generated tables don't work with this execution character set. Please report a bug to <bug-gperf@gnu.org>."
 #endif
 
-#define gperf_offsetof(s, n) (short)offsetof(struct s##_t, s##_str##n)
 #line 1 "defs/keywords"
 
 struct kwtable {short name, id[2], state;};
@@ -196,88 +195,88 @@ rb_reserved_word (register const char *str, register size_t len)
     {
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
 #line 19 "defs/keywords"
-      {gperf_offsetof(stringpool, 8), {keyword_break, keyword_break}, EXPR_MID},
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str8, {keyword_break, keyword_break}, EXPR_MID},
 #line 25 "defs/keywords"
-      {gperf_offsetof(stringpool, 9), {keyword_else, keyword_else}, EXPR_BEG},
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str9, {keyword_else, keyword_else}, EXPR_BEG},
 #line 35 "defs/keywords"
-      {gperf_offsetof(stringpool, 10), {keyword_nil, keyword_nil}, EXPR_END},
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str10, {keyword_nil, keyword_nil}, EXPR_END},
 #line 28 "defs/keywords"
-      {gperf_offsetof(stringpool, 11), {keyword_ensure, keyword_ensure}, EXPR_BEG},
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str11, {keyword_ensure, keyword_ensure}, EXPR_BEG},
 #line 27 "defs/keywords"
-      {gperf_offsetof(stringpool, 12), {keyword_end, keyword_end}, EXPR_END},
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str12, {keyword_end, keyword_end}, EXPR_END},
 #line 44 "defs/keywords"
-      {gperf_offsetof(stringpool, 13), {keyword_then, keyword_then}, EXPR_BEG},
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str13, {keyword_then, keyword_then}, EXPR_BEG},
 #line 36 "defs/keywords"
-      {gperf_offsetof(stringpool, 14), {keyword_not, keyword_not}, EXPR_ARG},
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str14, {keyword_not, keyword_not}, EXPR_ARG},
 #line 29 "defs/keywords"
-      {gperf_offsetof(stringpool, 15), {keyword_false, keyword_false}, EXPR_END},
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str15, {keyword_false, keyword_false}, EXPR_END},
 #line 42 "defs/keywords"
-      {gperf_offsetof(stringpool, 16), {keyword_self, keyword_self}, EXPR_END},
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str16, {keyword_self, keyword_self}, EXPR_END},
 #line 26 "defs/keywords"
-      {gperf_offsetof(stringpool, 17), {keyword_elsif, keyword_elsif}, EXPR_VALUE},
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str17, {keyword_elsif, keyword_elsif}, EXPR_VALUE},
 #line 39 "defs/keywords"
-      {gperf_offsetof(stringpool, 18), {keyword_rescue, modifier_rescue}, EXPR_MID},
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str18, {keyword_rescue, modifier_rescue}, EXPR_MID},
 #line 45 "defs/keywords"
-      {gperf_offsetof(stringpool, 19), {keyword_true, keyword_true}, EXPR_END},
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str19, {keyword_true, keyword_true}, EXPR_END},
 #line 48 "defs/keywords"
-      {gperf_offsetof(stringpool, 20), {keyword_until, modifier_until}, EXPR_VALUE},
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str20, {keyword_until, modifier_until}, EXPR_VALUE},
 #line 47 "defs/keywords"
-      {gperf_offsetof(stringpool, 21), {keyword_unless, modifier_unless}, EXPR_VALUE},
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str21, {keyword_unless, modifier_unless}, EXPR_VALUE},
 #line 41 "defs/keywords"
-      {gperf_offsetof(stringpool, 22), {keyword_return, keyword_return}, EXPR_MID},
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str22, {keyword_return, keyword_return}, EXPR_MID},
 #line 22 "defs/keywords"
-      {gperf_offsetof(stringpool, 23), {keyword_def, keyword_def}, EXPR_FNAME},
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str23, {keyword_def, keyword_def}, EXPR_FNAME},
 #line 17 "defs/keywords"
-      {gperf_offsetof(stringpool, 24), {keyword_and, keyword_and}, EXPR_VALUE},
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str24, {keyword_and, keyword_and}, EXPR_VALUE},
 #line 24 "defs/keywords"
-      {gperf_offsetof(stringpool, 25), {keyword_do, keyword_do}, EXPR_BEG},
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str25, {keyword_do, keyword_do}, EXPR_BEG},
 #line 51 "defs/keywords"
-      {gperf_offsetof(stringpool, 26), {keyword_yield, keyword_yield}, EXPR_ARG},
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str26, {keyword_yield, keyword_yield}, EXPR_ARG},
 #line 30 "defs/keywords"
-      {gperf_offsetof(stringpool, 27), {keyword_for, keyword_for}, EXPR_VALUE},
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str27, {keyword_for, keyword_for}, EXPR_VALUE},
 #line 46 "defs/keywords"
-      {gperf_offsetof(stringpool, 28), {keyword_undef, keyword_undef}, EXPR_FNAME|EXPR_FITEM},
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str28, {keyword_undef, keyword_undef}, EXPR_FNAME|EXPR_FITEM},
 #line 37 "defs/keywords"
-      {gperf_offsetof(stringpool, 29), {keyword_or, keyword_or}, EXPR_VALUE},
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str29, {keyword_or, keyword_or}, EXPR_VALUE},
 #line 32 "defs/keywords"
-      {gperf_offsetof(stringpool, 30), {keyword_in, keyword_in}, EXPR_VALUE},
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str30, {keyword_in, keyword_in}, EXPR_VALUE},
 #line 49 "defs/keywords"
-      {gperf_offsetof(stringpool, 31), {keyword_when, keyword_when}, EXPR_VALUE},
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str31, {keyword_when, keyword_when}, EXPR_VALUE},
 #line 40 "defs/keywords"
-      {gperf_offsetof(stringpool, 32), {keyword_retry, keyword_retry}, EXPR_END},
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str32, {keyword_retry, keyword_retry}, EXPR_END},
 #line 31 "defs/keywords"
-      {gperf_offsetof(stringpool, 33), {keyword_if, modifier_if}, EXPR_VALUE},
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str33, {keyword_if, modifier_if}, EXPR_VALUE},
 #line 20 "defs/keywords"
-      {gperf_offsetof(stringpool, 34), {keyword_case, keyword_case}, EXPR_VALUE},
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str34, {keyword_case, keyword_case}, EXPR_VALUE},
 #line 38 "defs/keywords"
-      {gperf_offsetof(stringpool, 35), {keyword_redo, keyword_redo}, EXPR_END},
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str35, {keyword_redo, keyword_redo}, EXPR_END},
 #line 34 "defs/keywords"
-      {gperf_offsetof(stringpool, 36), {keyword_next, keyword_next}, EXPR_MID},
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str36, {keyword_next, keyword_next}, EXPR_MID},
 #line 43 "defs/keywords"
-      {gperf_offsetof(stringpool, 37), {keyword_super, keyword_super}, EXPR_ARG},
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str37, {keyword_super, keyword_super}, EXPR_ARG},
 #line 33 "defs/keywords"
-      {gperf_offsetof(stringpool, 38), {keyword_module, keyword_module}, EXPR_VALUE},
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str38, {keyword_module, keyword_module}, EXPR_VALUE},
 #line 18 "defs/keywords"
-      {gperf_offsetof(stringpool, 39), {keyword_begin, keyword_begin}, EXPR_BEG},
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str39, {keyword_begin, keyword_begin}, EXPR_BEG},
 #line 12 "defs/keywords"
-      {gperf_offsetof(stringpool, 40), {keyword__LINE__, keyword__LINE__}, EXPR_END},
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str40, {keyword__LINE__, keyword__LINE__}, EXPR_END},
 #line 13 "defs/keywords"
-      {gperf_offsetof(stringpool, 41), {keyword__FILE__, keyword__FILE__}, EXPR_END},
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str41, {keyword__FILE__, keyword__FILE__}, EXPR_END},
 #line 11 "defs/keywords"
-      {gperf_offsetof(stringpool, 42), {keyword__ENCODING__, keyword__ENCODING__}, EXPR_END},
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str42, {keyword__ENCODING__, keyword__ENCODING__}, EXPR_END},
 #line 15 "defs/keywords"
-      {gperf_offsetof(stringpool, 43), {keyword_END, keyword_END}, EXPR_END},
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str43, {keyword_END, keyword_END}, EXPR_END},
 #line 16 "defs/keywords"
-      {gperf_offsetof(stringpool, 44), {keyword_alias, keyword_alias}, EXPR_FNAME|EXPR_FITEM},
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str44, {keyword_alias, keyword_alias}, EXPR_FNAME|EXPR_FITEM},
 #line 14 "defs/keywords"
-      {gperf_offsetof(stringpool, 45), {keyword_BEGIN, keyword_BEGIN}, EXPR_END},
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str45, {keyword_BEGIN, keyword_BEGIN}, EXPR_END},
 #line 23 "defs/keywords"
-      {gperf_offsetof(stringpool, 46), {keyword_defined, keyword_defined}, EXPR_ARG},
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str46, {keyword_defined, keyword_defined}, EXPR_ARG},
 #line 21 "defs/keywords"
-      {gperf_offsetof(stringpool, 47), {keyword_class, keyword_class}, EXPR_CLASS},
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str47, {keyword_class, keyword_class}, EXPR_CLASS},
       {-1}, {-1},
 #line 50 "defs/keywords"
-      {gperf_offsetof(stringpool, 50), {keyword_while, modifier_while}, EXPR_VALUE}
+      {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str50, {keyword_while, modifier_while}, EXPR_VALUE}
     };
 
   if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
diff --git a/lib/English.gemspec b/lib/English.gemspec
index 5d0a39657551b3..5f4eb420c23721 100644
--- a/lib/English.gemspec
+++ b/lib/English.gemspec
@@ -1,6 +1,6 @@
 Gem::Specification.new do |spec|
   spec.name          = "english"
-  spec.version       = "0.7.2"
+  spec.version       = "0.8.0"
   spec.authors       = ["Yukihiro Matsumoto"]
   spec.email         = ["matz@ruby-lang.org"]
 
diff --git a/lib/English.rb b/lib/English.rb
index da50dfdc29c53c..03fe7219911de4 100644
--- a/lib/English.rb
+++ b/lib/English.rb
@@ -39,7 +39,6 @@
 #  $PROCESS_ID::              $$
 #  $CHILD_STATUS::            $?
 #  $LAST_MATCH_INFO::         $~
-#  $IGNORECASE::              $=
 #  $ARGV::                    $*
 #  $MATCH::                   $&
 #  $PREMATCH::                $`
@@ -58,44 +57,32 @@ module English end if false
 # The default separator pattern used by String#split.  May be set from
 # the command line using the <code>-F</code> flag.
 alias $FS                      $;
-
-# The default separator pattern used by String#split.  May be set from
-# the command line using the <code>-F</code> flag.
 alias $FIELD_SEPARATOR         $;
 
 # The separator string output between the parameters to methods such
 # as Kernel#print and Array#join. Defaults to +nil+, which adds no
 # text.
-alias $OFS                     $,
 
 # The separator string output between the parameters to methods such
 # as Kernel#print and Array#join. Defaults to +nil+, which adds no
 # text.
+alias $OFS                     $,
 alias $OUTPUT_FIELD_SEPARATOR  $,
 
 # The input record separator (newline by default). This is the value
 # that routines such as Kernel#gets use to determine record
 # boundaries. If set to +nil+, +gets+ will read the entire file.
 alias $RS                      $/
-
-# The input record separator (newline by default). This is the value
-# that routines such as Kernel#gets use to determine record
-# boundaries. If set to +nil+, +gets+ will read the entire file.
 alias $INPUT_RECORD_SEPARATOR  $/
 
 # The string appended to the output of every call to methods such as
 # Kernel#print and IO#write. The default value is +nil+.
 alias $ORS                     $\
-
-# The string appended to the output of every call to methods such as
-# Kernel#print and IO#write. The default value is +nil+.
 alias $OUTPUT_RECORD_SEPARATOR $\
 
-# The number of the last line read from the current input file.
-alias $INPUT_LINE_NUMBER       $.
-
 # The number of the last line read from the current input file.
 alias $NR                      $.
+alias $INPUT_LINE_NUMBER       $.
 
 # The last line read by Kernel#gets or
 # Kernel#readline. Many string-related functions in the
@@ -135,8 +122,6 @@ module English end if false
 
 # The process number of the program being executed. Read only.
 alias $PID                     $$
-
-# The process number of the program being executed. Read only.
 alias $PROCESS_ID              $$
 
 # The exit status of the last child process to terminate. Read
@@ -151,9 +136,6 @@ module English end if false
 # scope.
 alias $LAST_MATCH_INFO         $~
 
-# This variable is no longer effective. Deprecated.
-alias $IGNORECASE              $=
-
 # An array of strings containing the command-line
 # options from the invocation of the program. Options
 # used by the Ruby interpreter will have been
diff --git a/lib/abbrev.gemspec b/lib/abbrev.gemspec
deleted file mode 100644
index 50c500bbc72210..00000000000000
--- a/lib/abbrev.gemspec
+++ /dev/null
@@ -1,29 +0,0 @@
-name = File.basename(__FILE__, ".gemspec")
-version = ["lib", Array.new(name.count("-")+1, ".").join("/")].find do |dir|
-  break File.foreach(File.join(__dir__, dir, "#{name.tr('-', '/')}.rb")) do |line|
-    /^\s*VERSION\s*=\s*"(.*)"/ =~ line and break $1
-  end rescue nil
-end
-
-Gem::Specification.new do |spec|
-  spec.name          = name
-  spec.version       = version
-  spec.authors       = ["Akinori MUSHA"]
-  spec.email         = ["knu@idaemons.org"]
-
-  spec.summary       = %q{Calculates a set of unique abbreviations for a given set of strings}
-  spec.description   = %q{Calculates a set of unique abbreviations for a given set of strings}
-  spec.homepage      = "https://github.com/ruby/abbrev"
-  spec.required_ruby_version = Gem::Requirement.new(">= 2.3.0")
-  spec.licenses      = ["Ruby", "BSD-2-Clause"]
-
-  spec.metadata["homepage_uri"] = spec.homepage
-  spec.metadata["source_code_uri"] = spec.homepage
-
-  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.require_paths = ["lib"]
-end
diff --git a/lib/abbrev.rb b/lib/abbrev.rb
deleted file mode 100644
index ee86f068748f84..00000000000000
--- a/lib/abbrev.rb
+++ /dev/null
@@ -1,133 +0,0 @@
-# frozen_string_literal: true
-#--
-# Copyright (c) 2001,2003 Akinori MUSHA <knu@iDaemons.org>
-#
-# All rights reserved.  You can redistribute and/or modify it under
-# the same terms as Ruby.
-#
-# $Idaemons: /home/cvs/rb/abbrev.rb,v 1.2 2001/05/30 09:37:45 knu Exp $
-# $RoughId: abbrev.rb,v 1.4 2003/10/14 19:45:42 knu Exp $
-# $Id$
-#++
-
-##
-# Calculates the set of unambiguous abbreviations for a given set of strings.
-#
-#   require 'abbrev'
-#   require 'pp'
-#
-#   pp Abbrev.abbrev(['ruby'])
-#   #=>  {"ruby"=>"ruby", "rub"=>"ruby", "ru"=>"ruby", "r"=>"ruby"}
-#
-#   pp Abbrev.abbrev(%w{ ruby rules })
-#
-# _Generates:_
-#   { "ruby"  =>  "ruby",
-#     "rub"   =>  "ruby",
-#     "rules" =>  "rules",
-#     "rule"  =>  "rules",
-#     "rul"   =>  "rules" }
-#
-# It also provides an array core extension, Array#abbrev.
-#
-#   pp %w{ summer winter }.abbrev
-#
-# _Generates:_
-#   { "summer"  => "summer",
-#     "summe"   => "summer",
-#     "summ"    => "summer",
-#     "sum"     => "summer",
-#     "su"      => "summer",
-#     "s"       => "summer",
-#     "winter"  => "winter",
-#     "winte"   => "winter",
-#     "wint"    => "winter",
-#     "win"     => "winter",
-#     "wi"      => "winter",
-#     "w"       => "winter" }
-
-module Abbrev
-  VERSION = "0.1.1"
-
-  # Given a set of strings, calculate the set of unambiguous abbreviations for
-  # those strings, and return a hash where the keys are all the possible
-  # abbreviations and the values are the full strings.
-  #
-  # Thus, given +words+ is "car" and "cone", the keys pointing to "car" would
-  # be "ca" and "car", while those pointing to "cone" would be "co", "con", and
-  # "cone".
-  #
-  #   require 'abbrev'
-  #
-  #   Abbrev.abbrev(%w{ car cone })
-  #   #=> {"ca"=>"car", "con"=>"cone", "co"=>"cone", "car"=>"car", "cone"=>"cone"}
-  #
-  # The optional +pattern+ parameter is a pattern or a string. Only input
-  # strings that match the pattern or start with the string are included in the
-  # output hash.
-  #
-  #   Abbrev.abbrev(%w{car box cone crab}, /b/)
-  #   #=> {"box"=>"box", "bo"=>"box", "b"=>"box", "crab" => "crab"}
-  #
-  #   Abbrev.abbrev(%w{car box cone}, 'ca')
-  #   #=> {"car"=>"car", "ca"=>"car"}
-  def abbrev(words, pattern = nil)
-    table = {}
-    seen = Hash.new(0)
-
-    if pattern.is_a?(String)
-      pattern = /\A#{Regexp.quote(pattern)}/  # regard as a prefix
-    end
-
-    words.each do |word|
-      next if word.empty?
-      word.size.downto(1) { |len|
-        abbrev = word[0...len]
-
-        next if pattern && pattern !~ abbrev
-
-        case seen[abbrev] += 1
-        when 1
-          table[abbrev] = word
-        when 2
-          table.delete(abbrev)
-        else
-          break
-        end
-      }
-    end
-
-    words.each do |word|
-      next if pattern && pattern !~ word
-
-      table[word] = word
-    end
-
-    table
-  end
-
-  module_function :abbrev
-end
-
-class Array
-  # Calculates the set of unambiguous abbreviations for the strings in +self+.
-  #
-  #   require 'abbrev'
-  #   %w{ car cone }.abbrev
-  #   #=> {"car"=>"car", "ca"=>"car", "cone"=>"cone", "con"=>"cone", "co"=>"cone"}
-  #
-  # The optional +pattern+ parameter is a pattern or a string. Only input
-  # strings that match the pattern or start with the string are included in the
-  # output hash.
-  #
-  #   %w{ fast boat day }.abbrev(/^.a/)
-  #   #=> {"fast"=>"fast", "fas"=>"fast", "fa"=>"fast", "day"=>"day", "da"=>"day"}
-  #
-  #   Abbrev.abbrev(%w{car box cone}, "ca")
-  #   #=> {"car"=>"car", "ca"=>"car"}
-  #
-  # See also Abbrev.abbrev
-  def abbrev(pattern = nil)
-    Abbrev::abbrev(self, pattern)
-  end
-end
diff --git a/lib/base64.gemspec b/lib/base64.gemspec
deleted file mode 100644
index 44a2ce1fd1ef2b..00000000000000
--- a/lib/base64.gemspec
+++ /dev/null
@@ -1,27 +0,0 @@
-name = File.basename(__FILE__, ".gemspec")
-version = ["lib", Array.new(name.count("-")+1).join("/")].find do |dir|
-  break File.foreach(File.join(__dir__, dir, "#{name.tr('-', '/')}.rb")) do |line|
-    /^\s*VERSION\s*=\s*"(.*)"/ =~ line and break $1
-  end rescue nil
-end
-
-Gem::Specification.new do |spec|
-  spec.name          = name
-  spec.version       = version
-  spec.authors       = ["Yusuke Endoh"]
-  spec.email         = ["mame@ruby-lang.org"]
-
-  spec.summary       = %q{Support for encoding and decoding binary data using a Base64 representation.}
-  spec.description   = %q{Support for encoding and decoding binary data using a Base64 representation.}
-  spec.homepage      = "https://github.com/ruby/base64"
-  spec.required_ruby_version = Gem::Requirement.new(">= 2.3.0")
-  spec.licenses      = ["Ruby", "BSD-2-Clause"]
-
-  spec.metadata["homepage_uri"] = spec.homepage
-  spec.metadata["source_code_uri"] = spec.homepage
-
-  spec.files         = ["README.md", "LICENSE.txt", "lib/base64.rb"]
-  spec.bindir        = "exe"
-  spec.executables   = []
-  spec.require_paths = ["lib"]
-end
diff --git a/lib/base64.rb b/lib/base64.rb
deleted file mode 100644
index 15c0b297ce2e13..00000000000000
--- a/lib/base64.rb
+++ /dev/null
@@ -1,113 +0,0 @@
-# frozen_string_literal: true
-#
-# = base64.rb: methods for base64-encoding and -decoding strings
-#
-
-# The Base64 module provides for the encoding (#encode64, #strict_encode64,
-# #urlsafe_encode64) and decoding (#decode64, #strict_decode64,
-# #urlsafe_decode64) of binary data using a Base64 representation.
-#
-# == Example
-#
-# A simple encoding and decoding.
-#
-#     require "base64"
-#
-#     enc   = Base64.encode64('Send reinforcements')
-#                         # -> "U2VuZCByZWluZm9yY2VtZW50cw==\n"
-#     plain = Base64.decode64(enc)
-#                         # -> "Send reinforcements"
-#
-# The purpose of using base64 to encode data is that it translates any
-# binary data into purely printable characters.
-
-module Base64
-
-  VERSION = "0.1.1"
-
-  module_function
-
-  # Returns the Base64-encoded version of +bin+.
-  # This method complies with RFC 2045.
-  # Line feeds are added to every 60 encoded characters.
-  #
-  #    require 'base64'
-  #    Base64.encode64("Now is the time for all good coders\nto learn Ruby")
-  #
-  # <i>Generates:</i>
-  #
-  #    Tm93IGlzIHRoZSB0aW1lIGZvciBhbGwgZ29vZCBjb2RlcnMKdG8gbGVhcm4g
-  #    UnVieQ==
-  def encode64(bin)
-    [bin].pack("m")
-  end
-
-  # Returns the Base64-decoded version of +str+.
-  # This method complies with RFC 2045.
-  # Characters outside the base alphabet are ignored.
-  #
-  #   require 'base64'
-  #   str = 'VGhpcyBpcyBsaW5lIG9uZQpUaGlzIG' +
-  #         'lzIGxpbmUgdHdvClRoaXMgaXMgbGlu' +
-  #         'ZSB0aHJlZQpBbmQgc28gb24uLi4K'
-  #   puts Base64.decode64(str)
-  #
-  # <i>Generates:</i>
-  #
-  #    This is line one
-  #    This is line two
-  #    This is line three
-  #    And so on...
-  def decode64(str)
-    str.unpack1("m")
-  end
-
-  # Returns the Base64-encoded version of +bin+.
-  # This method complies with RFC 4648.
-  # No line feeds are added.
-  def strict_encode64(bin)
-    [bin].pack("m0")
-  end
-
-  # Returns the Base64-decoded version of +str+.
-  # This method complies with RFC 4648.
-  # ArgumentError is raised if +str+ is incorrectly padded or contains
-  # non-alphabet characters.  Note that CR or LF are also rejected.
-  def strict_decode64(str)
-    str.unpack1("m0")
-  end
-
-  # Returns the Base64-encoded version of +bin+.
-  # This method complies with ``Base 64 Encoding with URL and Filename Safe
-  # Alphabet'' in RFC 4648.
-  # The alphabet uses '-' instead of '+' and '_' instead of '/'.
-  # Note that the result can still contain '='.
-  # You can remove the padding by setting +padding+ as false.
-  def urlsafe_encode64(bin, padding: true)
-    str = strict_encode64(bin)
-    str.chomp!("==") or str.chomp!("=") unless padding
-    str.tr!("+/", "-_")
-    str
-  end
-
-  # Returns the Base64-decoded version of +str+.
-  # This method complies with ``Base 64 Encoding with URL and Filename Safe
-  # Alphabet'' in RFC 4648.
-  # The alphabet uses '-' instead of '+' and '_' instead of '/'.
-  #
-  # The padding character is optional.
-  # This method accepts both correctly-padded and unpadded input.
-  # Note that it still rejects incorrectly-padded input.
-  def urlsafe_decode64(str)
-    # NOTE: RFC 4648 does say nothing about unpadded input, but says that
-    # "the excess pad characters MAY also be ignored", so it is inferred that
-    # unpadded input is also acceptable.
-    if !str.end_with?("=") && str.length % 4 != 0
-      str = str.ljust((str.length + 3) & ~3, "=")
-      str.tr!("-_", "+/")
-    else
-      str = str.tr("-_", "+/")
-    end
-    strict_decode64(str)
-  end
-end
diff --git a/lib/benchmark.gemspec b/lib/benchmark.gemspec
deleted file mode 100644
index d6e98db805cffd..00000000000000
--- a/lib/benchmark.gemspec
+++ /dev/null
@@ -1,30 +0,0 @@
-name = File.basename(__FILE__, ".gemspec")
-version = ["lib", Array.new(name.count("-")+1, ".").join("/")].find do |dir|
-  break File.foreach(File.join(__dir__, dir, "#{name.tr('-', '/')}.rb")) do |line|
-    /^\s*VERSION\s*=\s*"(.*)"/ =~ line and break $1
-  end rescue nil
-end
-
-Gem::Specification.new do |spec|
-  spec.name          = name
-  spec.version       = version
-  spec.authors       = ["Yukihiro Matsumoto"]
-  spec.email         = ["matz@ruby-lang.org"]
-
-  spec.summary       = %q{a performance benchmarking library}
-  spec.description   = spec.summary
-  spec.homepage      = "https://github.com/ruby/benchmark"
-  spec.licenses       = ["Ruby", "BSD-2-Clause"]
-
-  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 2>#{IO::NULL}`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
-  end
-  spec.bindir        = "exe"
-  spec.executables   = []
-  spec.require_paths = ["lib"]
-end
diff --git a/lib/benchmark.rb b/lib/benchmark.rb
deleted file mode 100644
index d9f89239fc2984..00000000000000
--- a/lib/benchmark.rb
+++ /dev/null
@@ -1,584 +0,0 @@
-# frozen_string_literal: true
-#--
-# benchmark.rb - a performance benchmarking library
-#
-# $Id$
-#
-# Created by Gotoken (gotoken@notwork.org).
-#
-# Documentation by Gotoken (original RD), Lyle Johnson (RDoc conversion), and
-# Gavin Sinclair (editing).
-#++
-#
-# == Overview
-#
-# The Benchmark module provides methods for benchmarking Ruby code, giving
-# detailed reports on the time taken for each task.
-#
-
-# The Benchmark module provides methods to measure and report the time
-# used to execute Ruby code.
-#
-# * Measure the time to construct the string given by the expression
-#   <code>"a"*1_000_000_000</code>:
-#
-#       require 'benchmark'
-#
-#       puts Benchmark.measure { "a"*1_000_000_000 }
-#
-#   On my machine (OSX 10.8.3 on i5 1.7 GHz) this generates:
-#
-#       0.350000   0.400000   0.750000 (  0.835234)
-#
-#   This report shows the user CPU time, system CPU time, the sum of
-#   the user and system CPU times, and the elapsed real time. The unit
-#   of time is seconds.
-#
-# * Do some experiments sequentially using the #bm method:
-#
-#       require 'benchmark'
-#
-#       n = 5000000
-#       Benchmark.bm do |x|
-#         x.report { for i in 1..n; a = "1"; end }
-#         x.report { n.times do   ; a = "1"; end }
-#         x.report { 1.upto(n) do ; a = "1"; end }
-#       end
-#
-#   The result:
-#
-#              user     system      total        real
-#          1.010000   0.000000   1.010000 (  1.014479)
-#          1.000000   0.000000   1.000000 (  0.998261)
-#          0.980000   0.000000   0.980000 (  0.981335)
-#
-# * Continuing the previous example, put a label in each report:
-#
-#       require 'benchmark'
-#
-#       n = 5000000
-#       Benchmark.bm(7) do |x|
-#         x.report("for:")   { for i in 1..n; a = "1"; end }
-#         x.report("times:") { n.times do   ; a = "1"; end }
-#         x.report("upto:")  { 1.upto(n) do ; a = "1"; end }
-#       end
-#
-# The result:
-#
-#                     user     system      total        real
-#       for:      1.010000   0.000000   1.010000 (  1.015688)
-#       times:    1.000000   0.000000   1.000000 (  1.003611)
-#       upto:     1.030000   0.000000   1.030000 (  1.028098)
-#
-# * The times for some benchmarks depend on the order in which items
-#   are run.  These differences are due to the cost of memory
-#   allocation and garbage collection. To avoid these discrepancies,
-#   the #bmbm method is provided.  For example, to compare ways to
-#   sort an array of floats:
-#
-#       require 'benchmark'
-#
-#       array = (1..1000000).map { rand }
-#
-#       Benchmark.bmbm do |x|
-#         x.report("sort!") { array.dup.sort! }
-#         x.report("sort")  { array.dup.sort  }
-#       end
-#
-#   The result:
-#
-#        Rehearsal -----------------------------------------
-#        sort!   1.490000   0.010000   1.500000 (  1.490520)
-#        sort    1.460000   0.000000   1.460000 (  1.463025)
-#        -------------------------------- total: 2.960000sec
-#
-#                    user     system      total        real
-#        sort!   1.460000   0.000000   1.460000 (  1.460465)
-#        sort    1.450000   0.010000   1.460000 (  1.448327)
-#
-# * Report statistics of sequential experiments with unique labels,
-#   using the #benchmark method:
-#
-#       require 'benchmark'
-#       include Benchmark         # we need the CAPTION and FORMAT constants
-#
-#       n = 5000000
-#       Benchmark.benchmark(CAPTION, 7, FORMAT, ">total:", ">avg:") do |x|
-#         tf = x.report("for:")   { for i in 1..n; a = "1"; end }
-#         tt = x.report("times:") { n.times do   ; a = "1"; end }
-#         tu = x.report("upto:")  { 1.upto(n) do ; a = "1"; end }
-#         [tf+tt+tu, (tf+tt+tu)/3]
-#       end
-#
-#   The result:
-#
-#                     user     system      total        real
-#        for:      0.950000   0.000000   0.950000 (  0.952039)
-#        times:    0.980000   0.000000   0.980000 (  0.984938)
-#        upto:     0.950000   0.000000   0.950000 (  0.946787)
-#        >total:   2.880000   0.000000   2.880000 (  2.883764)
-#        >avg:     0.960000   0.000000   0.960000 (  0.961255)
-
-module Benchmark
-
-  VERSION = "0.2.1"
-
-  BENCHMARK_VERSION = "2002-04-25" # :nodoc:
-
-  # Invokes the block with a Benchmark::Report object, which
-  # may be used to collect and report on the results of individual
-  # benchmark tests. Reserves +label_width+ leading spaces for
-  # labels on each line. Prints +caption+ at the top of the
-  # report, and uses +format+ to format each line.
-  # (Note: +caption+ must contain a terminating newline character,
-  # see the default Benchmark::Tms::CAPTION for an example.)
-  #
-  # Returns an array of Benchmark::Tms objects.
-  #
-  # If the block returns an array of
-  # Benchmark::Tms objects, these will be used to format
-  # additional lines of output. If +labels+ parameter are
-  # given, these are used to label these extra lines.
-  #
-  # _Note_: Other methods provide a simpler interface to this one, and are
-  # suitable for nearly all benchmarking requirements.  See the examples in
-  # Benchmark, and the #bm and #bmbm methods.
-  #
-  # Example:
-  #
-  #     require 'benchmark'
-  #     include Benchmark          # we need the CAPTION and FORMAT constants
-  #
-  #     n = 5000000
-  #     Benchmark.benchmark(CAPTION, 7, FORMAT, ">total:", ">avg:") do |x|
-  #       tf = x.report("for:")   { for i in 1..n; a = "1"; end }
-  #       tt = x.report("times:") { n.times do   ; a = "1"; end }
-  #       tu = x.report("upto:")  { 1.upto(n) do ; a = "1"; end }
-  #       [tf+tt+tu, (tf+tt+tu)/3]
-  #     end
-  #
-  # Generates:
-  #
-  #                     user     system      total        real
-  #       for:      0.970000   0.000000   0.970000 (  0.970493)
-  #       times:    0.990000   0.000000   0.990000 (  0.989542)
-  #       upto:     0.970000   0.000000   0.970000 (  0.972854)
-  #       >total:   2.930000   0.000000   2.930000 (  2.932889)
-  #       >avg:     0.976667   0.000000   0.976667 (  0.977630)
-  #
-
-  def benchmark(caption = "", label_width = nil, format = nil, *labels) # :yield: report
-    sync = $stdout.sync
-    $stdout.sync = true
-    label_width ||= 0
-    label_width += 1
-    format ||= FORMAT
-    print ' '*label_width + caption unless caption.empty?
-    report = Report.new(label_width, format)
-    results = yield(report)
-    Array === results and results.grep(Tms).each {|t|
-      print((labels.shift || t.label || "").ljust(label_width), t.format(format))
-    }
-    report.list
-  ensure
-    $stdout.sync = sync unless sync.nil?
-  end
-
-
-  # A simple interface to the #benchmark method, #bm generates sequential
-  # reports with labels. +label_width+ and +labels+ parameters have the same
-  # meaning as for #benchmark.
-  #
-  #     require 'benchmark'
-  #
-  #     n = 5000000
-  #     Benchmark.bm(7) do |x|
-  #       x.report("for:")   { for i in 1..n; a = "1"; end }
-  #       x.report("times:") { n.times do   ; a = "1"; end }
-  #       x.report("upto:")  { 1.upto(n) do ; a = "1"; end }
-  #     end
-  #
-  # Generates:
-  #
-  #                     user     system      total        real
-  #       for:      0.960000   0.000000   0.960000 (  0.957966)
-  #       times:    0.960000   0.000000   0.960000 (  0.960423)
-  #       upto:     0.950000   0.000000   0.950000 (  0.954864)
-  #
-
-  def bm(label_width = 0, *labels, &blk) # :yield: report
-    benchmark(CAPTION, label_width, FORMAT, *labels, &blk)
-  end
-
-
-  # Sometimes benchmark results are skewed because code executed
-  # earlier encounters different garbage collection overheads than
-  # that run later. #bmbm attempts to minimize this effect by running
-  # the tests twice, the first time as a rehearsal in order to get the
-  # runtime environment stable, the second time for
-  # real. GC.start is executed before the start of each of
-  # the real timings; the cost of this is not included in the
-  # timings. In reality, though, there's only so much that #bmbm can
-  # do, and the results are not guaranteed to be isolated from garbage
-  # collection and other effects.
-  #
-  # Because #bmbm takes two passes through the tests, it can
-  # calculate the required label width.
-  #
-  #       require 'benchmark'
-  #
-  #       array = (1..1000000).map { rand }
-  #
-  #       Benchmark.bmbm do |x|
-  #         x.report("sort!") { array.dup.sort! }
-  #         x.report("sort")  { array.dup.sort  }
-  #       end
-  #
-  # Generates:
-  #
-  #        Rehearsal -----------------------------------------
-  #        sort!   1.440000   0.010000   1.450000 (  1.446833)
-  #        sort    1.440000   0.000000   1.440000 (  1.448257)
-  #        -------------------------------- total: 2.890000sec
-  #
-  #                    user     system      total        real
-  #        sort!   1.460000   0.000000   1.460000 (  1.458065)
-  #        sort    1.450000   0.000000   1.450000 (  1.455963)
-  #
-  # #bmbm yields a Benchmark::Job object and returns an array of
-  # Benchmark::Tms objects.
-  #
-  def bmbm(width = 0) # :yield: job
-    job = Job.new(width)
-    yield(job)
-    width = job.width + 1
-    sync = $stdout.sync
-    $stdout.sync = true
-
-    # rehearsal
-    puts 'Rehearsal '.ljust(width+CAPTION.length,'-')
-    ets = job.list.inject(Tms.new) { |sum,(label,item)|
-      print label.ljust(width)
-      res = Benchmark.measure(&item)
-      print res.format
-      sum + res
-    }.format("total: %tsec")
-    print " #{ets}\n\n".rjust(width+CAPTION.length+2,'-')
-
-    # take
-    print ' '*width + CAPTION
-    job.list.map { |label,item|
-      GC.start
-      print label.ljust(width)
-      Benchmark.measure(label, &item).tap { |res| print res }
-    }
-  ensure
-    $stdout.sync = sync unless sync.nil?
-  end
-
-  #
-  # Returns the time used to execute the given block as a
-  # Benchmark::Tms object. Takes +label+ option.
-  #
-  #       require 'benchmark'
-  #
-  #       n = 1000000
-  #
-  #       time = Benchmark.measure do
-  #         n.times { a = "1" }
-  #       end
-  #       puts time
-  #
-  # Generates:
-  #
-  #        0.220000   0.000000   0.220000 (  0.227313)
-  #
-  def measure(label = "") # :yield:
-    t0, r0 = Process.times, Process.clock_gettime(Process::CLOCK_MONOTONIC)
-    yield
-    t1, r1 = Process.times, Process.clock_gettime(Process::CLOCK_MONOTONIC)
-    Benchmark::Tms.new(t1.utime  - t0.utime,
-                       t1.stime  - t0.stime,
-                       t1.cutime - t0.cutime,
-                       t1.cstime - t0.cstime,
-                       r1 - r0,
-                       label)
-  end
-
-  #
-  # Returns the elapsed real time used to execute the given block.
-  #
-  def realtime # :yield:
-    r0 = Process.clock_gettime(Process::CLOCK_MONOTONIC)
-    yield
-    Process.clock_gettime(Process::CLOCK_MONOTONIC) - r0
-  end
-
-  module_function :benchmark, :measure, :realtime, :bm, :bmbm
-
-  #
-  # A Job is a sequence of labelled blocks to be processed by the
-  # Benchmark.bmbm method.  It is of little direct interest to the user.
-  #
-  class Job # :nodoc:
-    #
-    # Returns an initialized Job instance.
-    # Usually, one doesn't call this method directly, as new
-    # Job objects are created by the #bmbm method.
-    # +width+ is a initial value for the label offset used in formatting;
-    # the #bmbm method passes its +width+ argument to this constructor.
-    #
-    def initialize(width)
-      @width = width
-      @list = []
-    end
-
-    #
-    # Registers the given label and block pair in the job list.
-    #
-    def item(label = "", &blk) # :yield:
-      raise ArgumentError, "no block" unless block_given?
-      label = label.to_s
-      w = label.length
-      @width = w if @width < w
-      @list << [label, blk]
-      self
-    end
-
-    alias report item
-
-    # An array of 2-element arrays, consisting of label and block pairs.
-    attr_reader :list
-
-    # Length of the widest label in the #list.
-    attr_reader :width
-  end
-
-  #
-  # This class is used by the Benchmark.benchmark and Benchmark.bm methods.
-  # It is of little direct interest to the user.
-  #
-  class Report # :nodoc:
-    #
-    # Returns an initialized Report instance.
-    # Usually, one doesn't call this method directly, as new
-    # Report objects are created by the #benchmark and #bm methods.
-    # +width+ and +format+ are the label offset and
-    # format string used by Tms#format.
-    #
-    def initialize(width = 0, format = nil)
-      @width, @format, @list = width, format, []
-    end
-
-    #
-    # Prints the +label+ and measured time for the block,
-    # formatted by +format+. See Tms#format for the
-    # formatting rules.
-    #
-    def item(label = "", *format, &blk) # :yield:
-      print label.to_s.ljust(@width)
-      @list << res = Benchmark.measure(label, &blk)
-      print res.format(@format, *format)
-      res
-    end
-
-    alias report item
-
-    # An array of Benchmark::Tms objects representing each item.
-    attr_reader :list
-  end
-
-
-
-  #
-  # A data object, representing the times associated with a benchmark
-  # measurement.
-  #
-  class Tms
-
-    # Default caption, see also Benchmark::CAPTION
-    CAPTION = "      user     system      total        real\n"
-
-    # Default format string, see also Benchmark::FORMAT
-    FORMAT = "%10.6u %10.6y %10.6t %10.6r\n"
-
-    # User CPU time
-    attr_reader :utime
-
-    # System CPU time
-    attr_reader :stime
-
-    # User CPU time of children
-    attr_reader :cutime
-
-    # System CPU time of children
-    attr_reader :cstime
-
-    # Elapsed real time
-    attr_reader :real
-
-    # Total time, that is +utime+ + +stime+ + +cutime+ + +cstime+
-    attr_reader :total
-
-    # Label
-    attr_reader :label
-
-    #
-    # Returns an initialized Tms object which has
-    # +utime+ as the user CPU time, +stime+ as the system CPU time,
-    # +cutime+ as the children's user CPU time, +cstime+ as the children's
-    # system CPU time, +real+ as the elapsed real time and +label+ as the label.
-    #
-    def initialize(utime = 0.0, stime = 0.0, cutime = 0.0, cstime = 0.0, real = 0.0, label = nil)
-      @utime, @stime, @cutime, @cstime, @real, @label = utime, stime, cutime, cstime, real, label.to_s
-      @total = @utime + @stime + @cutime + @cstime
-    end
-
-    #
-    # Returns a new Tms object whose times are the sum of the times for this
-    # Tms object, plus the time required to execute the code block (+blk+).
-    #
-    def add(&blk) # :yield:
-      self + Benchmark.measure(&blk)
-    end
-
-    #
-    # An in-place version of #add.
-    # Changes the times of this Tms object by making it the sum of the times
-    # for this Tms object, plus the time required to execute
-    # the code block (+blk+).
-    #
-    def add!(&blk)
-      t = Benchmark.measure(&blk)
-      @utime  = utime + t.utime
-      @stime  = stime + t.stime
-      @cutime = cutime + t.cutime
-      @cstime = cstime + t.cstime
-      @real   = real + t.real
-      self
-    end
-
-    #
-    # Returns a new Tms object obtained by memberwise summation
-    # of the individual times for this Tms object with those of the +other+
-    # Tms object.
-    # This method and #/() are useful for taking statistics.
-    #
-    def +(other); memberwise(:+, other) end
-
-    #
-    # Returns a new Tms object obtained by memberwise subtraction
-    # of the individual times for the +other+ Tms object from those of this
-    # Tms object.
-    #
-    def -(other); memberwise(:-, other) end
-
-    #
-    # Returns a new Tms object obtained by memberwise multiplication
-    # of the individual times for this Tms object by +x+.
-    #
-    def *(x); memberwise(:*, x) end
-
-    #
-    # Returns a new Tms object obtained by memberwise division
-    # of the individual times for this Tms object by +x+.
-    # This method and #+() are useful for taking statistics.
-    #
-    def /(x); memberwise(:/, x) end
-
-    #
-    # Returns the contents of this Tms object as
-    # a formatted string, according to a +format+ string
-    # like that passed to Kernel.format. In addition, #format
-    # accepts the following extensions:
-    #
-    # <tt>%u</tt>::     Replaced by the user CPU time, as reported by Tms#utime.
-    # <tt>%y</tt>::     Replaced by the system CPU time, as reported by #stime (Mnemonic: y of "s*y*stem")
-    # <tt>%U</tt>::     Replaced by the children's user CPU time, as reported by Tms#cutime
-    # <tt>%Y</tt>::     Replaced by the children's system CPU time, as reported by Tms#cstime
-    # <tt>%t</tt>::     Replaced by the total CPU time, as reported by Tms#total
-    # <tt>%r</tt>::     Replaced by the elapsed real time, as reported by Tms#real
-    # <tt>%n</tt>::     Replaced by the label string, as reported by Tms#label (Mnemonic: n of "*n*ame")
-    #
-    # If +format+ is not given, FORMAT is used as default value, detailing the
-    # user, system and real elapsed time.
-    #
-    def format(format = nil, *args)
-      str = (format || FORMAT).dup
-      str.gsub!(/(%[-+.\d]*)n/) { "#{$1}s" % label }
-      str.gsub!(/(%[-+.\d]*)u/) { "#{$1}f" % utime }
-      str.gsub!(/(%[-+.\d]*)y/) { "#{$1}f" % stime }
-      str.gsub!(/(%[-+.\d]*)U/) { "#{$1}f" % cutime }
-      str.gsub!(/(%[-+.\d]*)Y/) { "#{$1}f" % cstime }
-      str.gsub!(/(%[-+.\d]*)t/) { "#{$1}f" % total }
-      str.gsub!(/(%[-+.\d]*)r/) { "(#{$1}f)" % real }
-      format ? str % args : str
-    end
-
-    #
-    # Same as #format.
-    #
-    def to_s
-      format
-    end
-
-    #
-    # Returns a new 6-element array, consisting of the
-    # label, user CPU time, system CPU time, children's
-    # user CPU time, children's system CPU time and elapsed
-    # real time.
-    #
-    def to_a
-      [@label, @utime, @stime, @cutime, @cstime, @real]
-    end
-
-    #
-    # Returns a hash containing the same data as `to_a`.
-    #
-    def to_h
-      {
-        label:  @label,
-        utime:  @utime,
-        stime:  @stime,
-        cutime: @cutime,
-        cstime: @cstime,
-        real:   @real
-      }
-    end
-
-    protected
-
-    #
-    # Returns a new Tms object obtained by memberwise operation +op+
-    # of the individual times for this Tms object with those of the other
-    # Tms object (+x+).
-    #
-    # +op+ can be a mathematical operation such as <tt>+</tt>, <tt>-</tt>,
-    # <tt>*</tt>, <tt>/</tt>
-    #
-    def memberwise(op, x)
-      case x
-      when Benchmark::Tms
-        Benchmark::Tms.new(utime.__send__(op, x.utime),
-                           stime.__send__(op, x.stime),
-                           cutime.__send__(op, x.cutime),
-                           cstime.__send__(op, x.cstime),
-                           real.__send__(op, x.real)
-                           )
-      else
-        Benchmark::Tms.new(utime.__send__(op, x),
-                           stime.__send__(op, x),
-                           cutime.__send__(op, x),
-                           cstime.__send__(op, x),
-                           real.__send__(op, x)
-                           )
-      end
-    end
-  end
-
-  # The default caption string (heading above the output times).
-  CAPTION = Benchmark::Tms::CAPTION
-
-  # The default format string used to display times.  See also Benchmark::Tms#format.
-  FORMAT = Benchmark::Tms::FORMAT
-end
diff --git a/lib/bundled_gems.rb b/lib/bundled_gems.rb
index cebf72798f1810..852d7c48e3a217 100644
--- a/lib/bundled_gems.rb
+++ b/lib/bundled_gems.rb
@@ -1,49 +1,35 @@
-module Gem::BUNDLED_GEMS
+# -*- frozen-string-literal: true -*-
+
+module Gem::BUNDLED_GEMS # :nodoc:
   SINCE = {
-    "rexml" => "3.0.0",
-    "rss" => "3.0.0",
-    "webrick" => "3.0.0",
-    "matrix" => "3.1.0",
-    "net-ftp" => "3.1.0",
-    "net-imap" => "3.1.0",
-    "net-pop" => "3.1.0",
-    "net-smtp" => "3.1.0",
-    "prime" => "3.1.0",
+    "racc" => "3.3.0",
     "abbrev" => "3.4.0",
-    "observer" => "3.4.0",
+    "base64" => "3.4.0",
+    "bigdecimal" => "3.4.0",
+    "csv" => "3.4.0",
+    "drb" => "3.4.0",
     "getoptlong" => "3.4.0",
+    "mutex_m" => "3.4.0",
+    "nkf" => "3.4.0",
+    "observer" => "3.4.0",
     "resolv-replace" => "3.4.0",
     "rinda" => "3.4.0",
-    "nkf" => "3.4.0",
     "syslog" => "3.4.0",
-    "drb" => "3.4.0",
-    "mutex_m" => "3.4.0",
-    "csv" => "3.4.0",
-    "base64" => "3.4.0",
-    "bigdecimal" => "3.4.0",
+    "ostruct" => "3.5.0",
+    "pstore" => "3.5.0",
+    "rdoc" => "3.5.0",
+    "win32ole" => "3.5.0",
+    "fiddle" => "3.5.0",
+    "logger" => "3.5.0",
+    "benchmark" => "3.5.0",
+    "irb" => "3.5.0",
+    "reline" => "3.5.0",
+    # "readline" => "3.5.0", # This is wrapper for reline. We don't warn for this.
+    "tsort" => "3.6.0",
   }.freeze
 
   EXACT = {
-    "abbrev" => true,
-    "base64" => true,
-    "bigdecimal" => true,
-    "csv" => true,
-    "drb" => true,
-    "getoptlong" => true,
-    "mutex_m" => true,
-    "nkf" => true, "kconv" => "nkf",
-    "observer" => true,
-    "resolv-replace" => true,
-    "rinda" => true,
-    "syslog" => true,
-  }.freeze
-
-  PREFIXED = {
-    "bigdecimal" => true,
-    "csv" => true,
-    "drb" => true,
-    "rinda" => true,
-    "syslog" => true,
+    "kconv" => "nkf",
   }.freeze
 
   WARNED = {}                   # unfrozen
@@ -55,47 +41,201 @@ module Gem::BUNDLED_GEMS
   DLEXT = /\.#{Regexp.union(dlext)}\z/
   LIBEXT = /\.#{Regexp.union("rb", *dlext)}\z/
 
-  def self.find_gem(path)
-    if !path
-      return
-    elsif path.start_with?(ARCHDIR)
-      n = path.delete_prefix(ARCHDIR).sub(DLEXT, "")
-    elsif path.start_with?(LIBDIR)
-      n = path.delete_prefix(LIBDIR).chomp(".rb")
-    else
-      return
+  def self.replace_require(specs)
+    return if [::Kernel.singleton_class, ::Kernel].any? {|klass| klass.respond_to?(:no_warning_require) }
+
+    spec_names = specs.to_a.each_with_object({}) {|spec, h| h[spec.name] = true }
+
+    [::Kernel.singleton_class, ::Kernel].each do |kernel_class|
+      kernel_class.send(:alias_method, :no_warning_require, :require)
+      kernel_class.send(:define_method, :require) do |name|
+        if message = ::Gem::BUNDLED_GEMS.warning?(name, specs: spec_names)
+          Kernel.warn message, uplevel: ::Gem::BUNDLED_GEMS.uplevel
+        end
+        kernel_class.send(:no_warning_require, name)
+      end
+      if kernel_class == ::Kernel
+        kernel_class.send(:private, :require)
+      else
+        kernel_class.send(:public, :require)
+      end
     end
-    EXACT[n] or PREFIXED[n = n[%r[\A[^/]+(?=/)]]] && n
   end
 
-  def self.warning?(name)
-    _t, path = $:.resolve_feature_path(name)
-    return unless gem = find_gem(path)
-    caller = caller_locations(3, 3).find {|c| c&.absolute_path}
-    return if find_gem(caller&.absolute_path)
+  def self.uplevel
+    frame_count = 0
+    require_labels = ["replace_require", "require"]
+    uplevel = 0
+    require_found = false
+    Thread.each_caller_location do |cl|
+      frame_count += 1
+
+      if require_found
+        unless require_labels.include?(cl.base_label)
+          return uplevel
+        end
+      else
+        if require_labels.include?(cl.base_label)
+          require_found = true
+        end
+      end
+      uplevel += 1
+      # Don't show script name when bundle exec and call ruby script directly.
+      if cl.path.end_with?("bundle")
+        return
+      end
+    end
+    require_found ? 1 : (frame_count - 1).nonzero?
+  end
+
+  def self.warning?(name, specs: nil)
+    # name can be a feature name or a file path with String or Pathname
+    feature = File.path(name).sub(LIBEXT, "")
+
+    # The actual checks needed to properly identify the gem being required
+    # are costly (see [Bug #20641]), so we first do a much cheaper check
+    # to exclude the vast majority of candidates.
+    subfeature = if feature.include?("/")
+      # bootsnap expands `require "csv"` to `require "#{LIBDIR}/csv.rb"`,
+      # and `require "syslog"` to `require "#{ARCHDIR}/syslog.so"`.
+      feature.delete_prefix!(ARCHDIR)
+      feature.delete_prefix!(LIBDIR)
+      # 1. A segment for the EXACT mapping and SINCE check
+      # 2. A segment for the SINCE check for dashed names
+      # 3. A segment to check if there's a subfeature
+      segments = feature.split("/", 3)
+      name = segments.shift
+      name = EXACT[name] || name
+      if !SINCE[name]
+        name = "#{name}-#{segments.shift}"
+        return unless SINCE[name]
+      end
+      segments.any?
+    else
+      name = EXACT[feature] || feature
+      return unless SINCE[name]
+      false
+    end
+
+    return if specs.include?(name)
+
     return if WARNED[name]
     WARNED[name] = true
-    if gem == true
-      gem = name.sub(LIBEXT, "") # assume "foo.rb"/"foo.so" belongs to "foo" gem
-    elsif gem
-      return if WARNED[gem]
-      WARNED[gem] = true
-      "#{name} is found in #{gem}"
+
+    level = RUBY_VERSION < SINCE[name] ? :warning : :error
+
+    if subfeature
+      "#{feature} is found in #{name}, which"
     else
-      return
-    end + " which #{RUBY_VERSION < SINCE[gem] ? "will be" : "is"} not part of the default gems since Ruby #{SINCE[gem]}"
+      "#{feature} #{level == :warning ? "was loaded" : "used to be loaded"} from the standard library, but"
+    end + build_message(name, level)
   end
 
-  bundled_gems = self
+  def self.build_message(name, level)
+    msg = if level == :warning
+      " will no longer be part of the default gems starting from Ruby #{SINCE[name]}"
+    else
+      " is not part of the default gems since Ruby #{SINCE[name]}."
+    end
 
-  define_method(:find_unresolved_default_spec) do |name|
-    if msg = bundled_gems.warning?(name)
-      warn msg, uplevel: 1
+    if defined?(Bundler)
+      motivation = level == :warning ? "silence this warning" : "fix this error"
+      msg += "\nYou can add #{name} to your Gemfile or gemspec to #{motivation}."
+
+      # We detect the gem name from caller_locations. First we walk until we find `require`
+      # then take the first frame that's not from `require`.
+      #
+      # Additionally, we need to skip Bootsnap and Zeitwerk if present, these
+      # gems decorate Kernel#require, so they are not really the ones issuing
+      # the require call users should be warned about. Those are upwards.
+      frames_to_skip = 3
+      location = nil
+      require_found = false
+      Thread.each_caller_location do |cl|
+        if frames_to_skip >= 1
+          frames_to_skip -= 1
+          next
+        end
+
+        if require_found
+          if cl.base_label != "require"
+            location = cl.path
+            break
+          end
+        else
+          if cl.base_label == "require"
+            require_found = true
+          end
+        end
+      end
+
+      if location && File.file?(location) && !location.start_with?(Gem::BUNDLED_GEMS::LIBDIR)
+        caller_gem = nil
+        Gem.path.each do |path|
+          if location =~ %r{#{path}/gems/([\w\-\.]+)}
+            caller_gem = $1
+            break
+          end
+        end
+        if caller_gem
+          msg += "\nAlso please contact the author of #{caller_gem} to request adding #{name} into its gemspec."
+        end
+      end
+    else
+      msg += " Install #{name} from RubyGems."
     end
-    super(name)
+
+    msg
   end
 
-  freeze
+  def self.force_activate(gem)
+    require "bundler"
+    Bundler.reset!
+
+    builder = Bundler::Dsl.new
+
+    if Bundler::SharedHelpers.in_bundle?
+      if Bundler.locked_gems
+        Bundler.locked_gems.specs.each{|spec| builder.gem spec.name, spec.version.to_s }
+      elsif Bundler.definition.gemfiles.size > 0
+        Bundler.definition.gemfiles.each{|gemfile| builder.eval_gemfile(gemfile) }
+      end
+    end
+
+    builder.gem gem
+
+    definition = builder.to_definition(nil, true)
+    definition.validate_runtime!
+
+    begin
+      orig_ui = Bundler.ui
+      orig_no_lock = Bundler::Definition.no_lock
+
+      ui = Bundler::UI::Shell.new
+      ui.level = "silent"
+      Bundler.ui = ui
+      Bundler::Definition.no_lock = true
+
+      Bundler::Runtime.new(nil, definition).setup
+    rescue Bundler::GemNotFound
+      warn "Failed to activate #{gem}, please install it with 'gem install #{gem}'"
+    ensure
+      Bundler.ui = orig_ui
+      Bundler::Definition.no_lock = orig_no_lock
+    end
+  end
 end
 
-Gem.singleton_class.prepend Gem::BUNDLED_GEMS
+# for RubyGems without Bundler environment.
+# If loading library is not part of the default gems and the bundled gems, warn it.
+class LoadError
+  def message # :nodoc:
+    return super unless path
+
+    name = path.tr("/", "-")
+    if !defined?(Bundler) && Gem::BUNDLED_GEMS::SINCE[name] && !Gem::BUNDLED_GEMS::WARNED[name]
+      warn name + Gem::BUNDLED_GEMS.build_message(name, :error), uplevel: Gem::BUNDLED_GEMS.uplevel
+    end
+    super
+  end
+end
diff --git a/lib/bundler.rb b/lib/bundler.rb
index f83268e9cda14d..761679ec8dfeea 100644
--- a/lib/bundler.rb
+++ b/lib/bundler.rb
@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require_relative "bundler/rubygems_ext"
 require_relative "bundler/vendored_fileutils"
 require "pathname"
 require "rbconfig"
@@ -7,17 +8,15 @@
 require_relative "bundler/errors"
 require_relative "bundler/environment_preserver"
 require_relative "bundler/plugin"
-require_relative "bundler/rubygems_ext"
 require_relative "bundler/rubygems_integration"
 require_relative "bundler/version"
-require_relative "bundler/constants"
 require_relative "bundler/current_ruby"
 require_relative "bundler/build_metadata"
 
 # Bundler provides a consistent environment for Ruby projects by
 # tracking and installing the exact gems and versions that are needed.
 #
-# Since Ruby 2.6, Bundler is a part of Ruby's standard library.
+# Bundler is a part of Ruby's standard library.
 #
 # Bundler is used by creating _gemfiles_ listing all the project dependencies
 # and (optionally) their versions and then using
@@ -39,6 +38,10 @@ module Bundler
   environment_preserver.replace_with_backup
   SUDO_MUTEX = Thread::Mutex.new
 
+  autoload :Checksum,               File.expand_path("bundler/checksum", __dir__)
+  autoload :CLI,                    File.expand_path("bundler/cli", __dir__)
+  autoload :CIDetector,             File.expand_path("bundler/ci_detector", __dir__)
+  autoload :CompactIndexClient,     File.expand_path("bundler/compact_index_client", __dir__)
   autoload :Definition,             File.expand_path("bundler/definition", __dir__)
   autoload :Dependency,             File.expand_path("bundler/dependency", __dir__)
   autoload :Deprecate,              File.expand_path("bundler/deprecate", __dir__)
@@ -48,8 +51,8 @@ module Bundler
   autoload :Env,                    File.expand_path("bundler/env", __dir__)
   autoload :Fetcher,                File.expand_path("bundler/fetcher", __dir__)
   autoload :FeatureFlag,            File.expand_path("bundler/feature_flag", __dir__)
+  autoload :FREEBSD,                File.expand_path("bundler/constants", __dir__)
   autoload :GemHelper,              File.expand_path("bundler/gem_helper", __dir__)
-  autoload :GemHelpers,             File.expand_path("bundler/gem_helpers", __dir__)
   autoload :GemVersionPromoter,     File.expand_path("bundler/gem_version_promoter", __dir__)
   autoload :Graph,                  File.expand_path("bundler/graph", __dir__)
   autoload :Index,                  File.expand_path("bundler/index", __dir__)
@@ -58,6 +61,8 @@ module Bundler
   autoload :LazySpecification,      File.expand_path("bundler/lazy_specification", __dir__)
   autoload :LockfileParser,         File.expand_path("bundler/lockfile_parser", __dir__)
   autoload :MatchRemoteMetadata,    File.expand_path("bundler/match_remote_metadata", __dir__)
+  autoload :Materialization,        File.expand_path("bundler/materialization", __dir__)
+  autoload :NULL,                   File.expand_path("bundler/constants", __dir__)
   autoload :ProcessLock,            File.expand_path("bundler/process_lock", __dir__)
   autoload :RemoteSpecification,    File.expand_path("bundler/remote_specification", __dir__)
   autoload :Resolver,               File.expand_path("bundler/resolver", __dir__)
@@ -76,6 +81,7 @@ module Bundler
   autoload :UI,                     File.expand_path("bundler/ui", __dir__)
   autoload :URICredentialsFilter,   File.expand_path("bundler/uri_credentials_filter", __dir__)
   autoload :URINormalizer,          File.expand_path("bundler/uri_normalizer", __dir__)
+  autoload :WINDOWS,                File.expand_path("bundler/constants", __dir__)
   autoload :SafeMarshal,            File.expand_path("bundler/safe_marshal", __dir__)
 
   class << self
@@ -98,9 +104,7 @@ def bundle_path
     end
 
     def create_bundle_path
-      SharedHelpers.filesystem_access(bundle_path.to_s) do |p|
-        mkdir_p(p)
-      end unless bundle_path.exist?
+      mkdir_p(bundle_path) unless bundle_path.exist?
 
       @bundle_path = bundle_path.realpath
     rescue Errno::EEXIST
@@ -109,15 +113,15 @@ def create_bundle_path
     end
 
     def configured_bundle_path
-      @configured_bundle_path ||= settings.path.tap(&:validate!)
+      @configured_bundle_path ||= Bundler.settings.path.tap(&:validate!)
     end
 
     # Returns absolute location of where binstubs are installed to.
     def bin_path
       @bin_path ||= begin
-        path = settings[:bin] || "bin"
+        path = Bundler.settings[:bin] || "bin"
         path = Pathname.new(path).expand_path(root).expand_path
-        SharedHelpers.filesystem_access(path) {|p| FileUtils.mkdir_p(p) }
+        mkdir_p(path)
         path
       end
     end
@@ -165,6 +169,29 @@ def setup(*groups)
       end
     end
 
+    def auto_switch
+      self_manager.restart_with_locked_bundler_if_needed
+    end
+
+    # Automatically install dependencies if settings[:auto_install] exists.
+    # This is set through config cmd `bundle config set --global auto_install 1`.
+    #
+    # Note that this method `nil`s out the global Definition object, so it
+    # should be called first, before you instantiate anything like an
+    # `Installer` that'll keep a reference to the old one instead.
+    def auto_install
+      return unless Bundler.settings[:auto_install]
+
+      begin
+        definition.specs
+      rescue GemNotFound, GitError
+        ui.info "Automatically installing missing gems."
+        reset!
+        CLI::Install.new({}).run
+        reset!
+      end
+    end
+
     # Setups Bundler environment (see Bundler.setup) if it is not already set,
     # and loads all gems from groups specified. Unlike ::setup, can be called
     # multiple times with different groups (if they were allowed by setup).
@@ -192,7 +219,7 @@ def load
     end
 
     def environment
-      SharedHelpers.major_deprecation 2, "Bundler.environment has been removed in favor of Bundler.load", :print_caller_location => true
+      SharedHelpers.major_deprecation 2, "Bundler.environment has been removed in favor of Bundler.load", print_caller_location: true
       load
     end
 
@@ -200,20 +227,21 @@ def environment
     #
     # @param unlock [Hash, Boolean, nil] Gems that have been requested
     #   to be updated or true if all gems should be updated
+    # @param lockfile [Pathname] Path to Gemfile.lock
     # @return [Bundler::Definition]
-    def definition(unlock = nil)
+    def definition(unlock = nil, lockfile = default_lockfile)
       @definition = nil if unlock
       @definition ||= begin
         configure
-        Definition.build(default_gemfile, default_lockfile, unlock)
+        Definition.build(default_gemfile, lockfile, unlock)
       end
     end
 
     def frozen_bundle?
-      frozen = settings[:frozen]
+      frozen = Bundler.settings[:frozen]
       return frozen unless frozen.nil?
 
-      settings[:deployment]
+      Bundler.settings[:deployment]
     end
 
     def locked_gems
@@ -226,12 +254,6 @@ def locked_gems
         end
     end
 
-    def most_specific_locked_platform?(platform)
-      return false unless defined?(@definition) && @definition
-
-      definition.most_specific_locked_platform == platform
-    end
-
     def ruby_scope
       "#{Bundler.rubygems.ruby_engine}/#{RbConfig::CONFIG["ruby_version"]}"
     end
@@ -320,7 +342,7 @@ def app_config_path
 
     def app_cache(custom_path = nil)
       path = custom_path || root
-      Pathname.new(path).join(settings.app_cache_path)
+      Pathname.new(path).join(Bundler.settings.app_cache_path)
     end
 
     def tmp(name = Process.pid.to_s)
@@ -330,20 +352,12 @@ def tmp(name = Process.pid.to_s)
 
     def rm_rf(path)
       FileUtils.remove_entry_secure(path) if path && File.exist?(path)
-    rescue ArgumentError
-      message = <<EOF
-It is a security vulnerability to allow your home directory to be world-writable, and bundler cannot continue.
-You should probably consider fixing this issue by running `chmod o-w ~` on *nix.
-Please refer to https://ruby-doc.org/stdlib-3.1.2/libdoc/fileutils/rdoc/FileUtils.html#method-c-remove_entry_secure for details.
-EOF
-      File.world_writable?(path) ? Bundler.ui.warn(message) : raise
-      raise PathError, "Please fix the world-writable issue with your #{path} directory"
     end
 
     def settings
       @settings ||= Settings.new(app_config_path)
     rescue GemfileNotFound
-      @settings = Settings.new(Pathname.new(".bundle").expand_path)
+      @settings = Settings.new
     end
 
     # @return [Hash] Environment present before Bundler was activated
@@ -353,40 +367,24 @@ def original_env
 
     # @deprecated Use `unbundled_env` instead
     def clean_env
-      Bundler::SharedHelpers.major_deprecation(
-        2,
+      message =
         "`Bundler.clean_env` has been deprecated in favor of `Bundler.unbundled_env`. " \
-        "If you instead want the environment before bundler was originally loaded, use `Bundler.original_env`",
-        :print_caller_location => true
-      )
-
+        "If you instead want the environment before bundler was originally loaded, use `Bundler.original_env`"
+      removed_message =
+        "`Bundler.clean_env` has been removed in favor of `Bundler.unbundled_env`. " \
+        "If you instead want the environment before bundler was originally loaded, use `Bundler.original_env`"
+      Bundler::SharedHelpers.major_deprecation(2, message, removed_message: removed_message, print_caller_location: true)
       unbundled_env
     end
 
     # @return [Hash] Environment with all bundler-related variables removed
     def unbundled_env
-      env = original_env
-
-      if env.key?("BUNDLER_ORIG_MANPATH")
-        env["MANPATH"] = env["BUNDLER_ORIG_MANPATH"]
-      end
-
-      env.delete_if {|k, _| k[0, 7] == "BUNDLE_" }
-
-      if env.key?("RUBYOPT")
-        rubyopt = env["RUBYOPT"].split(" ")
-        rubyopt.delete("-r#{File.expand_path("bundler/setup", __dir__)}")
-        rubyopt.delete("-rbundler/setup")
-        env["RUBYOPT"] = rubyopt.join(" ")
-      end
-
-      if env.key?("RUBYLIB")
-        rubylib = env["RUBYLIB"].split(File::PATH_SEPARATOR)
-        rubylib.delete(__dir__)
-        env["RUBYLIB"] = rubylib.join(File::PATH_SEPARATOR)
-      end
+      unbundle_env(original_env)
+    end
 
-      env
+    # Remove all bundler-related variables from ENV
+    def unbundle_env!
+      ENV.replace(unbundle_env(ENV))
     end
 
     # Run block with environment present before Bundler was activated
@@ -396,13 +394,13 @@ def with_original_env
 
     # @deprecated Use `with_unbundled_env` instead
     def with_clean_env
-      Bundler::SharedHelpers.major_deprecation(
-        2,
+      message =
         "`Bundler.with_clean_env` has been deprecated in favor of `Bundler.with_unbundled_env`. " \
-        "If you instead want the environment before bundler was originally loaded, use `Bundler.with_original_env`",
-        :print_caller_location => true
-      )
-
+        "If you instead want the environment before bundler was originally loaded, use `Bundler.with_original_env`"
+      removed_message =
+        "`Bundler.with_clean_env` has been removed in favor of `Bundler.with_unbundled_env`. " \
+        "If you instead want the environment before bundler was originally loaded, use `Bundler.with_original_env`"
+      Bundler::SharedHelpers.major_deprecation(2, message, removed_message: removed_message, print_caller_location: true)
       with_env(unbundled_env) { yield }
     end
 
@@ -418,13 +416,13 @@ def original_system(*args)
 
     # @deprecated Use `unbundled_system` instead
     def clean_system(*args)
-      Bundler::SharedHelpers.major_deprecation(
-        2,
+      message =
         "`Bundler.clean_system` has been deprecated in favor of `Bundler.unbundled_system`. " \
-        "If you instead want to run the command in the environment before bundler was originally loaded, use `Bundler.original_system`",
-        :print_caller_location => true
-      )
-
+        "If you instead want to run the command in the environment before bundler was originally loaded, use `Bundler.original_system`"
+      removed_message =
+        "`Bundler.clean_system` has been removed in favor of `Bundler.unbundled_system`. " \
+        "If you instead want to run the command in the environment before bundler was originally loaded, use `Bundler.original_system`"
+      Bundler::SharedHelpers.major_deprecation(2, message, removed_message: removed_message, print_caller_location: true)
       with_env(unbundled_env) { Kernel.system(*args) }
     end
 
@@ -440,13 +438,13 @@ def original_exec(*args)
 
     # @deprecated Use `unbundled_exec` instead
     def clean_exec(*args)
-      Bundler::SharedHelpers.major_deprecation(
-        2,
+      message =
         "`Bundler.clean_exec` has been deprecated in favor of `Bundler.unbundled_exec`. " \
-        "If you instead want to exec to a command in the environment before bundler was originally loaded, use `Bundler.original_exec`",
-        :print_caller_location => true
-      )
-
+        "If you instead want to exec to a command in the environment before bundler was originally loaded, use `Bundler.original_exec`"
+      removed_message =
+        "`Bundler.clean_exec` has been removed in favor of `Bundler.unbundled_exec`. " \
+        "If you instead want to exec to a command in the environment before bundler was originally loaded, use `Bundler.original_exec`"
+      Bundler::SharedHelpers.major_deprecation(2, message, removed_message: removed_message, print_caller_location: true)
       with_env(unbundled_env) { Kernel.exec(*args) }
     end
 
@@ -456,10 +454,14 @@ def unbundled_exec(*args)
     end
 
     def local_platform
-      return Gem::Platform::RUBY if settings[:force_ruby_platform]
+      return Gem::Platform::RUBY if Bundler.settings[:force_ruby_platform]
       Gem::Platform.local
     end
 
+    def generic_local_platform
+      Gem::Platform.generic(local_platform)
+    end
+
     def default_gemfile
       SharedHelpers.default_gemfile
     end
@@ -489,25 +491,34 @@ def use_system_gems?
       configured_bundle_path.use_system_gems?
     end
 
-    def mkdir_p(path, options = {})
-      SharedHelpers.filesystem_access(path, :write) do |p|
+    def mkdir_p(path)
+      SharedHelpers.filesystem_access(path, :create) do |p|
         FileUtils.mkdir_p(p)
       end
     end
 
     def which(executable)
-      if File.file?(executable) && File.executable?(executable)
-        executable
-      elsif paths = ENV["PATH"]
+      executable_path = find_executable(executable)
+      return executable_path if executable_path
+
+      if (paths = ENV["PATH"])
         quote = '"'
         paths.split(File::PATH_SEPARATOR).find do |path|
           path = path[1..-2] if path.start_with?(quote) && path.end_with?(quote)
-          executable_path = File.expand_path(executable, path)
-          return executable_path if File.file?(executable_path) && File.executable?(executable_path)
+          executable_path = find_executable(File.expand_path(executable, path))
+          return executable_path if executable_path
         end
       end
     end
 
+    def find_executable(path)
+      extensions = RbConfig::CONFIG["EXECUTABLE_EXTS"]&.split
+      extensions = [RbConfig::CONFIG["EXEEXT"]] unless extensions&.any?
+      candidates = extensions.map {|ext| "#{path}#{ext}" }
+
+      candidates.find {|candidate| File.file?(candidate) && File.executable?(candidate) }
+    end
+
     def read_file(file)
       SharedHelpers.filesystem_access(file, :read) do
         File.open(file, "r:UTF-8", &:read)
@@ -515,7 +526,16 @@ def read_file(file)
     end
 
     def safe_load_marshal(data)
-      load_marshal(data, :marshal_proc => SafeMarshal.proc)
+      if Gem.respond_to?(:load_safe_marshal)
+        Gem.load_safe_marshal
+        begin
+          Gem::SafeMarshal.safe_load(data)
+        rescue Gem::SafeMarshal::Reader::Error, Gem::SafeMarshal::Visitors::ToRuby::Error => e
+          raise MarshalError, "#{e.class}: #{e.message}"
+        end
+      else
+        load_marshal(data, marshal_proc: SafeMarshal.proc)
+      end
     end
 
     def load_gemspec(file, validate = false)
@@ -530,15 +550,7 @@ def load_gemspec(file, validate = false)
     def load_gemspec_uncached(file, validate = false)
       path = Pathname.new(file)
       contents = read_file(file)
-      spec = if contents.start_with?("---") # YAML header
-        eval_yaml_gemspec(path, contents)
-      else
-        # Eval the gemspec from its parent directory, because some gemspecs
-        # depend on "./" relative paths.
-        SharedHelpers.chdir(path.dirname.to_s) do
-          eval_gemspec(path, contents)
-        end
-      end
+      spec = eval_gemspec(path, contents)
       return unless spec
       spec.loaded_from = path.expand_path.to_s
       Bundler.rubygems.validate(spec) if validate
@@ -551,11 +563,11 @@ def clear_gemspec_cache
 
     def git_present?
       return @git_present if defined?(@git_present)
-      @git_present = Bundler.which("git#{RbConfig::CONFIG["EXEEXT"]}")
+      @git_present = Bundler.which("git")
     end
 
     def feature_flag
-      @feature_flag ||= FeatureFlag.new(VERSION)
+      @feature_flag ||= FeatureFlag.new(Bundler.settings[:simulate_version] || VERSION)
     end
 
     def reset!
@@ -571,7 +583,6 @@ def reset_settings_and_root!
 
     def reset_paths!
       @bin_path = nil
-      @bundler_major_version = nil
       @bundle_path = nil
       @configure = nil
       @configured_bundle_path = nil
@@ -606,6 +617,30 @@ def self_manager
 
     private
 
+    def unbundle_env(env)
+      if env.key?("BUNDLER_ORIG_MANPATH")
+        env["MANPATH"] = env["BUNDLER_ORIG_MANPATH"]
+      end
+
+      env.delete_if {|k, _| k[0, 7] == "BUNDLE_" }
+      env.delete("BUNDLER_SETUP")
+
+      if env.key?("RUBYOPT")
+        rubyopt = env["RUBYOPT"].split(" ")
+        rubyopt.delete("-r#{File.expand_path("bundler/setup", __dir__)}")
+        rubyopt.delete("-rbundler/setup")
+        env["RUBYOPT"] = rubyopt.join(" ")
+      end
+
+      if env.key?("RUBYLIB")
+        rubylib = env["RUBYLIB"].split(File::PATH_SEPARATOR)
+        rubylib.delete(__dir__)
+        env["RUBYLIB"] = rubylib.join(File::PATH_SEPARATOR)
+      end
+
+      env
+    end
+
     def load_marshal(data, marshal_proc: nil)
       Marshal.load(data, marshal_proc)
     rescue TypeError => e
@@ -616,16 +651,22 @@ def eval_yaml_gemspec(path, contents)
       Kernel.require "psych"
 
       Gem::Specification.from_yaml(contents)
-    rescue ::Psych::SyntaxError, ArgumentError, Gem::EndOfYAMLException, Gem::Exception
-      eval_gemspec(path, contents)
     end
 
     def eval_gemspec(path, contents)
-      eval(contents, TOPLEVEL_BINDING.dup, path.expand_path.to_s)
+      if contents.start_with?("---") # YAML header
+        eval_yaml_gemspec(path, contents)
+      else
+        # Eval the gemspec from its parent directory, because some gemspecs
+        # depend on "./" relative paths.
+        SharedHelpers.chdir(path.dirname.to_s) do
+          eval(contents, TOPLEVEL_BINDING.dup, path.expand_path.to_s)
+        end
+      end
     rescue ScriptError, StandardError => e
       msg = "There was an error while loading `#{path.basename}`: #{e.message}"
 
-      raise GemspecError, Dsl::DSLError.new(msg, path, e.backtrace, contents)
+      raise GemspecError, Dsl::DSLError.new(msg, path.to_s, e.backtrace, contents)
     end
 
     def configure_gem_path
diff --git a/lib/bundler/build_metadata.rb b/lib/bundler/build_metadata.rb
index 8bffb2fae760c5..49d2518078b206 100644
--- a/lib/bundler/build_metadata.rb
+++ b/lib/bundler/build_metadata.rb
@@ -4,21 +4,26 @@ module Bundler
   # Represents metadata from when the Bundler gem was built.
   module BuildMetadata
     # begin ivars
-    @release = false
+    @built_at = nil
     # end ivars
 
     # A hash representation of the build metadata.
     def self.to_h
       {
-        "Built At" => built_at,
+        "Timestamp" => timestamp,
         "Git SHA" => git_commit_sha,
-        "Released Version" => release?,
       }
     end
 
+    # A timestamp representing the date the bundler gem was built, or the
+    # current time if never built
+    def self.timestamp
+      @timestamp ||= @built_at || Time.now.utc.strftime("%Y-%m-%d").freeze
+    end
+
     # A string representing the date the bundler gem was built.
     def self.built_at
-      @built_at ||= Time.now.utc.strftime("%Y-%m-%d").freeze
+      @built_at
     end
 
     # The SHA for the git commit the bundler gem was built from.
@@ -29,15 +34,10 @@ def self.git_commit_sha
       # commit instance variable then we can't determine its commits SHA.
       git_dir = File.expand_path("../../../.git", __dir__)
       if File.directory?(git_dir)
-        return @git_commit_sha = Dir.chdir(git_dir) { `git rev-parse --short HEAD`.strip.freeze }
+        return @git_commit_sha = IO.popen(%w[git rev-parse --short HEAD], { chdir: git_dir }, &:read).strip.freeze
       end
 
       @git_commit_sha ||= "unknown"
     end
-
-    # Whether this is an official release build of Bundler.
-    def self.release?
-      @release
-    end
   end
 end
diff --git a/lib/bundler/bundler.gemspec b/lib/bundler/bundler.gemspec
index da50b462251d77..16ca4a022ce998 100644
--- a/lib/bundler/bundler.gemspec
+++ b/lib/bundler/bundler.gemspec
@@ -29,15 +29,17 @@ Gem::Specification.new do |s|
     "source_code_uri" => "https://github.com/rubygems/rubygems/tree/master/bundler",
   }
 
-  s.required_ruby_version     = ">= 2.6.0"
-  s.required_rubygems_version = ">= 3.0.1"
+  s.required_ruby_version     = ">= 3.2.0"
+
+  # It should match the RubyGems version shipped with `required_ruby_version` above
+  s.required_rubygems_version = ">= 3.4.1"
 
   s.files = Dir.glob("lib/bundler{.rb,/**/*}", File::FNM_DOTMATCH).reject {|f| File.directory?(f) }
 
   # include the gemspec itself because warbler breaks w/o it
   s.files += %w[lib/bundler/bundler.gemspec]
 
-  s.bindir        = "libexec"
+  s.bindir        = "exe"
   s.executables   = %w[bundle bundler]
   s.require_paths = ["lib"]
 end
diff --git a/lib/bundler/capistrano.rb b/lib/bundler/capistrano.rb
index 1f3712d48efb72..705840143fa909 100644
--- a/lib/bundler/capistrano.rb
+++ b/lib/bundler/capistrano.rb
@@ -17,6 +17,6 @@
 
 Capistrano::Configuration.instance(:must_exist).load do
   before "deploy:finalize_update", "bundle:install"
-  Bundler::Deployment.define_task(self, :task, :except => { :no_release => true })
+  Bundler::Deployment.define_task(self, :task, except: { no_release: true })
   set :rake, lambda { "#{fetch(:bundle_cmd, "bundle")} exec rake" }
 end
diff --git a/lib/bundler/checksum.rb b/lib/bundler/checksum.rb
new file mode 100644
index 00000000000000..356f4a48bcd11a
--- /dev/null
+++ b/lib/bundler/checksum.rb
@@ -0,0 +1,264 @@
+# frozen_string_literal: true
+
+module Bundler
+  class Checksum
+    ALGO_SEPARATOR = "="
+    DEFAULT_ALGORITHM = "sha256"
+    private_constant :DEFAULT_ALGORITHM
+    DEFAULT_BLOCK_SIZE = 16_384
+    private_constant :DEFAULT_BLOCK_SIZE
+
+    class << self
+      def from_gem_package(gem_package, algo = DEFAULT_ALGORITHM)
+        return if Bundler.settings[:disable_checksum_validation]
+        return unless source = gem_package.instance_variable_get(:@gem)
+        return unless source.respond_to?(:with_read_io)
+
+        source.with_read_io do |io|
+          from_gem(io, source.path)
+        ensure
+          io.rewind
+        end
+      end
+
+      def from_gem(io, pathname, algo = DEFAULT_ALGORITHM)
+        digest = Bundler::SharedHelpers.digest(algo.upcase).new
+        buf = String.new(capacity: DEFAULT_BLOCK_SIZE)
+        digest << io.readpartial(DEFAULT_BLOCK_SIZE, buf) until io.eof?
+        Checksum.new(algo, digest.hexdigest!, Source.new(:gem, pathname))
+      end
+
+      def from_api(digest, source_uri, algo = DEFAULT_ALGORITHM)
+        return if Bundler.settings[:disable_checksum_validation]
+
+        Checksum.new(algo, to_hexdigest(digest, algo), Source.new(:api, source_uri))
+      end
+
+      def from_lock(lock_checksum, lockfile_location)
+        algo, digest = lock_checksum.strip.split(ALGO_SEPARATOR, 2)
+        Checksum.new(algo, to_hexdigest(digest, algo), Source.new(:lock, lockfile_location))
+      end
+
+      def to_hexdigest(digest, algo = DEFAULT_ALGORITHM)
+        return digest unless algo == DEFAULT_ALGORITHM
+        return digest if digest.match?(/\A[0-9a-f]{64}\z/i)
+
+        if digest.match?(%r{\A[-0-9a-z_+/]{43}={0,2}\z}i)
+          digest = digest.tr("-_", "+/") # fix urlsafe base64
+          digest.unpack1("m0").unpack1("H*")
+        else
+          raise ArgumentError, "#{digest.inspect} is not a valid SHA256 hex or base64 digest"
+        end
+      end
+    end
+
+    attr_reader :algo, :digest, :sources
+
+    def initialize(algo, digest, source)
+      @algo = algo
+      @digest = digest
+      @sources = [source]
+    end
+
+    def ==(other)
+      match?(other) && other.sources == sources
+    end
+
+    alias_method :eql?, :==
+
+    def same_source?(other)
+      sources.include?(other.sources.first)
+    end
+
+    def match?(other)
+      other.is_a?(self.class) && other.digest == digest && other.algo == algo
+    end
+
+    def hash
+      digest.hash
+    end
+
+    def to_s
+      "#{to_lock} (from #{sources.first}#{", ..." if sources.size > 1})"
+    end
+
+    def to_lock
+      "#{algo}#{ALGO_SEPARATOR}#{digest}"
+    end
+
+    def merge!(other)
+      return nil unless match?(other)
+
+      @sources.concat(other.sources).uniq!
+      self
+    end
+
+    def formatted_sources
+      sources.join("\n    and ").concat("\n")
+    end
+
+    def removable?
+      sources.all?(&:removable?)
+    end
+
+    def removal_instructions
+      msg = +""
+      i = 1
+      sources.each do |source|
+        msg << "  #{i}. #{source.removal}\n"
+        i += 1
+      end
+      msg << "  #{i}. run `bundle install`\n"
+    end
+
+    def inspect
+      abbr = "#{algo}#{ALGO_SEPARATOR}#{digest[0, 8]}"
+      from = "from #{sources.join(" and ")}"
+      "#<#{self.class}:#{object_id} #{abbr} #{from}>"
+    end
+
+    class Source
+      attr_reader :type, :location
+
+      def initialize(type, location)
+        @type = type
+        @location = location
+      end
+
+      def removable?
+        [:lock, :gem].include?(type)
+      end
+
+      def ==(other)
+        other.is_a?(self.class) && other.type == type && other.location == location
+      end
+
+      # phrased so that the usual string format is grammatically correct
+      #   rake (10.3.2) sha256=abc123 from #{to_s}
+      def to_s
+        case type
+        when :lock
+          "the lockfile CHECKSUMS at #{location}"
+        when :gem
+          "the gem at #{location}"
+        when :api
+          "the API at #{location}"
+        else
+          "#{location} (#{type})"
+        end
+      end
+
+      # A full sentence describing how to remove the checksum
+      def removal
+        case type
+        when :lock
+          "remove the matching checksum in #{location}"
+        when :gem
+          "remove the gem at #{location}"
+        when :api
+          "checksums from #{location} cannot be locally modified, you may need to update your sources"
+        else
+          "remove #{location} (#{type})"
+        end
+      end
+    end
+
+    class Store
+      attr_reader :store
+      protected :store
+
+      def initialize
+        @store = {}
+        @store_mutex = Mutex.new
+      end
+
+      def inspect
+        "#<#{self.class}:#{object_id} size=#{store.size}>"
+      end
+
+      # Replace when the new checksum is from the same source.
+      # The primary purpose is registering checksums from gems where there are
+      # duplicates of the same gem (according to full_name) in the index.
+      #
+      # In particular, this is when 2 gems have two similar platforms, e.g.
+      # "darwin20" and "darwin-20", both of which resolve to darwin-20.
+      # In the Index, the later gem replaces the former, so we do that here.
+      #
+      # However, if the new checksum is from a different source, we register like normal.
+      # This ensures a mismatch error where there are multiple top level sources
+      # that contain the same gem with different checksums.
+      def replace(spec, checksum)
+        return unless checksum
+
+        lock_name = spec.lock_name
+        @store_mutex.synchronize do
+          existing = fetch_checksum(lock_name, checksum.algo)
+          if !existing || existing.same_source?(checksum)
+            store_checksum(lock_name, checksum)
+          else
+            merge_checksum(lock_name, checksum, existing)
+          end
+        end
+      end
+
+      def missing?(spec)
+        @store[spec.lock_name].nil?
+      end
+
+      def register(spec, checksum)
+        register_checksum(spec.lock_name, checksum)
+      end
+
+      def merge!(other)
+        other.store.each do |lock_name, checksums|
+          checksums.each do |_algo, checksum|
+            register_checksum(lock_name, checksum)
+          end
+        end
+      end
+
+      def to_lock(spec)
+        lock_name = spec.lock_name
+        checksums = @store[lock_name]
+        if checksums&.any?
+          "#{lock_name} #{checksums.values.map(&:to_lock).sort.join(",")}"
+        else
+          lock_name
+        end
+      end
+
+      private
+
+      def register_checksum(lock_name, checksum)
+        @store_mutex.synchronize do
+          if checksum
+            existing = fetch_checksum(lock_name, checksum.algo)
+            if existing
+              merge_checksum(lock_name, checksum, existing)
+            else
+              store_checksum(lock_name, checksum)
+            end
+          else
+            init_checksum(lock_name)
+          end
+        end
+      end
+
+      def merge_checksum(lock_name, checksum, existing)
+        existing.merge!(checksum) || raise(ChecksumMismatchError.new(lock_name, existing, checksum))
+      end
+
+      def store_checksum(lock_name, checksum)
+        init_checksum(lock_name)[checksum.algo] = checksum
+      end
+
+      def init_checksum(lock_name)
+        @store[lock_name] ||= {}
+      end
+
+      def fetch_checksum(lock_name, algo)
+        @store[lock_name]&.fetch(algo, nil)
+      end
+    end
+  end
+end
diff --git a/lib/bundler/ci_detector.rb b/lib/bundler/ci_detector.rb
new file mode 100644
index 00000000000000..e5fedbdea8d383
--- /dev/null
+++ b/lib/bundler/ci_detector.rb
@@ -0,0 +1,75 @@
+# frozen_string_literal: true
+
+module Bundler
+  module CIDetector
+    # NOTE: Any changes made here will need to be made to both lib/rubygems/ci_detector.rb and
+    # bundler/lib/bundler/ci_detector.rb (which are enforced duplicates).
+    # TODO: Drop that duplication once bundler drops support for RubyGems 3.4
+    #
+    # ## Recognized CI providers, their signifiers, and the relevant docs ##
+    #
+    # Travis CI   - CI, TRAVIS            https://docs.travis-ci.com/user/environment-variables/#default-environment-variables
+    # Cirrus CI   - CI, CIRRUS_CI         https://cirrus-ci.org/guide/writing-tasks/#environment-variables
+    # Circle CI   - CI, CIRCLECI          https://circleci.com/docs/variables/#built-in-environment-variables
+    # Gitlab CI   - CI, GITLAB_CI         https://docs.gitlab.com/ee/ci/variables/
+    # AppVeyor    - CI, APPVEYOR          https://www.appveyor.com/docs/environment-variables/
+    # CodeShip    - CI_NAME               https://docs.cloudbees.com/docs/cloudbees-codeship/latest/pro-builds-and-configuration/environment-variables#_default_environment_variables
+    # dsari       - CI, DSARI             https://github.com/rfinnie/dsari#running
+    # Jenkins     - BUILD_NUMBER          https://www.jenkins.io/doc/book/pipeline/jenkinsfile/#using-environment-variables
+    # TeamCity    - TEAMCITY_VERSION      https://www.jetbrains.com/help/teamcity/predefined-build-parameters.html#Predefined+Server+Build+Parameters
+    # Appflow     - CI_BUILD_ID           https://ionic.io/docs/appflow/automation/environments#predefined-environments
+    # TaskCluster - TASKCLUSTER_ROOT_URL  https://docs.taskcluster.net/docs/manual/design/env-vars
+    # Semaphore   - CI, SEMAPHORE         https://docs.semaphoreci.com/ci-cd-environment/environment-variables/
+    # BuildKite   - CI, BUILDKITE         https://buildkite.com/docs/pipelines/environment-variables
+    # GoCD        - GO_SERVER_URL         https://docs.gocd.org/current/faq/dev_use_current_revision_in_build.html
+    # GH Actions  - CI, GITHUB_ACTIONS    https://docs.github.com/en/actions/learn-github-actions/variables#default-environment-variables
+    #
+    # ### Some "standard" ENVs that multiple providers may set ###
+    #
+    # * CI - this is set by _most_ (but not all) CI providers now; it's approaching a standard.
+    # * CI_NAME - Not as frequently used, but some providers set this to specify their own name
+
+    # Any of these being set is a reasonably reliable indicator that we are
+    # executing in a CI environment.
+    ENV_INDICATORS = [
+      "CI",
+      "CI_NAME",
+      "CONTINUOUS_INTEGRATION",
+      "BUILD_NUMBER",
+      "CI_APP_ID",
+      "CI_BUILD_ID",
+      "CI_BUILD_NUMBER",
+      "RUN_ID",
+      "TASKCLUSTER_ROOT_URL",
+    ].freeze
+
+    # For each CI, this env suffices to indicate that we're on _that_ CI's
+    # containers. (A few of them only supply a CI_NAME variable, which is also
+    # nice). And if they set "CI" but we can't tell which one they are, we also
+    # want to know that - a bare "ci" without another token tells us as much.
+    ENV_DESCRIPTORS = {
+      "TRAVIS" => "travis",
+      "CIRCLECI" => "circle",
+      "CIRRUS_CI" => "cirrus",
+      "DSARI" => "dsari",
+      "SEMAPHORE" => "semaphore",
+      "JENKINS_URL" => "jenkins",
+      "BUILDKITE" => "buildkite",
+      "GO_SERVER_URL" => "go",
+      "GITLAB_CI" => "gitlab",
+      "GITHUB_ACTIONS" => "github",
+      "TASKCLUSTER_ROOT_URL" => "taskcluster",
+      "CI" => "ci",
+    }.freeze
+
+    def self.ci?
+      ENV_INDICATORS.any? {|var| ENV.include?(var) }
+    end
+
+    def self.ci_strings
+      matching_names = ENV_DESCRIPTORS.select {|env, _| ENV[env] }.values
+      matching_names << ENV["CI_NAME"].downcase if ENV["CI_NAME"]
+      matching_names.reject(&:empty?).sort.uniq
+    end
+  end
+end
diff --git a/lib/bundler/cli.rb b/lib/bundler/cli.rb
index dd91038d646cfb..bba60ddab4d3dc 100644
--- a/lib/bundler/cli.rb
+++ b/lib/bundler/cli.rb
@@ -5,6 +5,7 @@
 module Bundler
   class CLI < Thor
     require_relative "cli/common"
+    require_relative "cli/install"
 
     package_name "Bundler"
 
@@ -64,26 +65,26 @@ def initialize(*args)
         Bundler.reset_settings_and_root!
       end
 
-      Bundler.self_manager.restart_with_locked_bundler_if_needed
+      Bundler.auto_switch
 
       Bundler.settings.set_command_option_if_given :retry, options[:retry]
 
       current_cmd = args.last[:current_command].name
-      auto_install if AUTO_INSTALL_CMDS.include?(current_cmd)
+      Bundler.auto_install if AUTO_INSTALL_CMDS.include?(current_cmd)
     rescue UnknownArgumentError => e
       raise InvalidOption, e.message
     ensure
       self.options ||= {}
       unprinted_warnings = Bundler.ui.unprinted_warnings
       Bundler.ui = UI::Shell.new(options)
-      Bundler.ui.level = "debug" if options["verbose"]
+      Bundler.ui.level = "debug" if options[:verbose] || Bundler.settings[:verbose]
       unprinted_warnings.each {|w| Bundler.ui.warn(w) }
     end
 
-    check_unknown_options!(:except => [:config, :exec])
+    check_unknown_options!(except: [:config, :exec])
     stop_on_unknown_option! :exec
 
-    desc "cli_help", "Prints a summary of bundler commands", :hide => true
+    desc "cli_help", "Prints a summary of bundler commands", hide: true
     def cli_help
       version
       Bundler.ui.info "\n"
@@ -99,21 +100,23 @@ def cli_help
       shell.say "Bundler commands:\n\n"
 
       shell.say "  Primary commands:\n"
-      shell.print_table(primary_commands, :indent => 4, :truncate => true)
+      shell.print_table(primary_commands, indent: 4, truncate: true)
       shell.say
       shell.say "  Utilities:\n"
-      shell.print_table(utilities, :indent => 4, :truncate => true)
+      shell.print_table(utilities, indent: 4, truncate: true)
       shell.say
       self.class.send(:class_options_help, shell)
     end
     default_task(Bundler.feature_flag.default_cli_command)
 
-    class_option "no-color", :type => :boolean, :desc => "Disable colorization in output"
-    class_option "retry",    :type => :numeric, :aliases => "-r", :banner => "NUM",
-                             :desc => "Specify the number of times you wish to attempt network commands"
-    class_option "verbose", :type => :boolean, :desc => "Enable verbose output mode", :aliases => "-V"
+    class_option "no-color", type: :boolean, desc: "Disable colorization in output"
+    class_option "retry", type: :numeric, aliases: "-r", banner: "NUM",
+                          desc: "Specify the number of times you wish to attempt network commands"
+    class_option "verbose", type: :boolean, desc: "Enable verbose output mode", aliases: "-V"
 
     def help(cli = nil)
+      cli = self.class.all_aliases[cli] if self.class.all_aliases[cli]
+
       case cli
       when "gemfile" then command = "gemfile"
       when nil       then command = "bundle"
@@ -127,8 +130,8 @@ def help(cli = nil)
 
       if man_pages.include?(command)
         man_page = man_pages[command]
-        if Bundler.which("man") && man_path !~ %r{^file:/.+!/META-INF/jruby.home/.+}
-          Kernel.exec "man #{man_page}"
+        if Bundler.which("man") && !man_path.match?(%r{^(?:file:/.+!|uri:classloader:)/META-INF/jruby.home/.+})
+          Kernel.exec("man", man_page)
         else
           puts File.read("#{man_path}/#{File.basename(man_page)}.ronn")
         end
@@ -155,8 +158,8 @@ def self.handle_no_command_error(command, has_namespace = $thor_runner)
       Gemfile to a gem with a gemspec, the --gemspec option will automatically add each
       dependency listed in the gemspec file to the newly created Gemfile.
     D
-    method_option "gemspec", :type => :string, :banner => "Use the specified .gemspec to create the Gemfile"
-    method_option "gemfile", :type => :string, :banner => "Use the specified name for the gemfile instead of 'Gemfile'"
+    method_option "gemspec", type: :string, banner: "Use the specified .gemspec to create the Gemfile"
+    method_option "gemfile", type: :string, banner: "Use the specified name for the gemfile instead of 'Gemfile'"
     def init
       require_relative "cli/init"
       Init.new(options.dup).run
@@ -168,12 +171,9 @@ def init
       all gems are found, Bundler prints a success message and exits with a status of 0.
       If not, the first missing gem is listed and Bundler exits status 1.
     D
-    method_option "dry-run", :type => :boolean, :default => false, :banner =>
-      "Lock the Gemfile"
-    method_option "gemfile", :type => :string, :banner =>
-      "Use the specified gemfile instead of Gemfile"
-    method_option "path", :type => :string, :banner =>
-      "Specify a different path than the system default ($BUNDLE_PATH or $GEM_HOME).#{" Bundler will remember this value for future installs on this machine" unless Bundler.feature_flag.forget_cli_options?}"
+    method_option "dry-run", type: :boolean, default: false, banner: "Lock the Gemfile"
+    method_option "gemfile", type: :string, banner: "Use the specified gemfile instead of Gemfile"
+    method_option "path", type: :string, banner: "Specify a different path than the system default ($BUNDLE_PATH or $GEM_HOME).#{" Bundler will remember this value for future installs on this machine" unless Bundler.feature_flag.forget_cli_options?}"
     def check
       remembered_flag_deprecation("path")
 
@@ -187,10 +187,14 @@ def check
     long_desc <<-D
       Removes the given gems from the Gemfile while ensuring that the resulting Gemfile is still valid. If the gem is not found, Bundler prints a error message and if gem could not be removed due to any reason Bundler will display a warning.
     D
-    method_option "install", :type => :boolean, :banner =>
-      "Runs 'bundle install' after removing the gems from the Gemfile"
+    method_option "install", type: :boolean, banner: "Runs 'bundle install' after removing the gems from the Gemfile"
     def remove(*gems)
-      SharedHelpers.major_deprecation(2, "The `--install` flag has been deprecated. `bundle install` is triggered by default.") if ARGV.include?("--install")
+      if ARGV.include?("--install")
+        message = "The `--install` flag has been deprecated. `bundle install` is triggered by default."
+        removed_message = "The `--install` flag has been removed. `bundle install` is triggered by default."
+        SharedHelpers.major_deprecation(2, message, removed_message: removed_message)
+      end
+
       require_relative "cli/remove"
       Remove.new(gems, options).run
     end
@@ -206,58 +210,40 @@ def remove(*gems)
 
       If the bundle has already been installed, bundler will tell you so and then exit.
     D
-    method_option "binstubs", :type => :string, :lazy_default => "bin", :banner =>
-      "Generate bin stubs for bundled gems to ./bin"
-    method_option "clean", :type => :boolean, :banner =>
-      "Run bundle clean automatically after install"
-    method_option "deployment", :type => :boolean, :banner =>
-      "Install using defaults tuned for deployment environments"
-    method_option "frozen", :type => :boolean, :banner =>
-      "Do not allow the Gemfile.lock to be updated after this install"
-    method_option "full-index", :type => :boolean, :banner =>
-      "Fall back to using the single-file index of all gems"
-    method_option "gemfile", :type => :string, :banner =>
-      "Use the specified gemfile instead of Gemfile"
-    method_option "jobs", :aliases => "-j", :type => :numeric, :banner =>
-      "Specify the number of jobs to run in parallel"
-    method_option "local", :type => :boolean, :banner =>
-      "Do not attempt to fetch gems remotely and use the gem cache instead"
-    method_option "prefer-local", :type => :boolean, :banner =>
-      "Only attempt to fetch gems remotely if not present locally, even if newer versions are available remotely"
-    method_option "no-cache", :type => :boolean, :banner =>
-      "Don't update the existing gem cache."
-    method_option "redownload", :type => :boolean, :aliases => "--force", :banner =>
-      "Force downloading every gem."
-    method_option "no-prune", :type => :boolean, :banner =>
-      "Don't remove stale gems from the cache."
-    method_option "path", :type => :string, :banner =>
-      "Specify a different path than the system default ($BUNDLE_PATH or $GEM_HOME).#{" Bundler will remember this value for future installs on this machine" unless Bundler.feature_flag.forget_cli_options?}"
-    method_option "quiet", :type => :boolean, :banner =>
-      "Only output warnings and errors."
-    method_option "shebang", :type => :string, :banner =>
-      "Specify a different shebang executable name than the default (usually 'ruby')"
-    method_option "standalone", :type => :array, :lazy_default => [], :banner =>
-      "Make a bundle that can work without the Bundler runtime"
-    method_option "system", :type => :boolean, :banner =>
-      "Install to the system location ($BUNDLE_PATH or $GEM_HOME) even if the bundle was previously installed somewhere else for this application"
-    method_option "trust-policy", :alias => "P", :type => :string, :banner =>
-      "Gem trust policy (like gem install -P). Must be one of " +
-      Bundler.rubygems.security_policy_keys.join("|")
-    method_option "without", :type => :array, :banner =>
-      "Exclude gems that are part of the specified named group."
-    method_option "with", :type => :array, :banner =>
-      "Include gems that are part of the specified named group."
+    method_option "binstubs", type: :string, lazy_default: "bin", banner: "Generate bin stubs for bundled gems to ./bin"
+    method_option "clean", type: :boolean, banner: "Run bundle clean automatically after install"
+    method_option "deployment", type: :boolean, banner: "Install using defaults tuned for deployment environments"
+    method_option "frozen", type: :boolean, banner: "Do not allow the Gemfile.lock to be updated after this install"
+    method_option "full-index", type: :boolean, banner: "Fall back to using the single-file index of all gems"
+    method_option "gemfile", type: :string, banner: "Use the specified gemfile instead of Gemfile"
+    method_option "jobs", aliases: "-j", type: :numeric, banner: "Specify the number of jobs to run in parallel"
+    method_option "local", type: :boolean, banner: "Do not attempt to fetch gems remotely and use the gem cache instead"
+    method_option "prefer-local", type: :boolean, banner: "Only attempt to fetch gems remotely if not present locally, even if newer versions are available remotely"
+    method_option "no-cache", type: :boolean, banner: "Don't update the existing gem cache."
+    method_option "redownload", type: :boolean, aliases: "--force", banner: "Force downloading every gem."
+    method_option "no-prune", type: :boolean, banner: "Don't remove stale gems from the cache."
+    method_option "path", type: :string, banner: "Specify a different path than the system default ($BUNDLE_PATH or $GEM_HOME).#{" Bundler will remember this value for future installs on this machine" unless Bundler.feature_flag.forget_cli_options?}"
+    method_option "quiet", type: :boolean, banner: "Only output warnings and errors."
+    method_option "shebang", type: :string, banner: "Specify a different shebang executable name than the default (usually 'ruby')"
+    method_option "standalone", type: :array, lazy_default: [], banner: "Make a bundle that can work without the Bundler runtime"
+    method_option "system", type: :boolean, banner: "Install to the system location ($BUNDLE_PATH or $GEM_HOME) even if the bundle was previously installed somewhere else for this application"
+    method_option "trust-policy", alias: "P", type: :string, banner: "Gem trust policy (like gem install -P). Must be one of #{Bundler.rubygems.security_policy_keys.join("|")}"
+    method_option "target-rbconfig", type: :string, banner: "Path to rbconfig.rb for the deployment target platform"
+    method_option "without", type: :array, banner: "Exclude gems that are part of the specified named group."
+    method_option "with", type: :array, banner: "Include gems that are part of the specified named group."
     def install
       SharedHelpers.major_deprecation(2, "The `--force` option has been renamed to `--redownload`") if ARGV.include?("--force")
 
-      %w[clean deployment frozen no-prune path shebang system without with].each do |option|
+      %w[clean deployment frozen no-prune path shebang without with].each do |option|
         remembered_flag_deprecation(option)
       end
 
+      print_remembered_flag_deprecation("--system", "path.system", "true") if ARGV.include?("--system")
+
       remembered_negative_flag_deprecation("no-deployment")
 
       require_relative "cli/install"
-      Bundler.settings.temporary(:no_install => false) do
+      Bundler.settings.temporary(no_install: false) do
         Install.new(options.dup).run
       end
     end
@@ -270,44 +256,27 @@ def install
       update when you have changed the Gemfile, or if you want to get the newest
       possible versions of the gems in the bundle.
     D
-    method_option "full-index", :type => :boolean, :banner =>
-      "Fall back to using the single-file index of all gems"
-    method_option "gemfile", :type => :string, :banner =>
-      "Use the specified gemfile instead of Gemfile"
-    method_option "group", :aliases => "-g", :type => :array, :banner =>
-      "Update a specific group"
-    method_option "jobs", :aliases => "-j", :type => :numeric, :banner =>
-      "Specify the number of jobs to run in parallel"
-    method_option "local", :type => :boolean, :banner =>
-      "Do not attempt to fetch gems remotely and use the gem cache instead"
-    method_option "quiet", :type => :boolean, :banner =>
-      "Only output warnings and errors."
-    method_option "source", :type => :array, :banner =>
-      "Update a specific source (and all gems associated with it)"
-    method_option "redownload", :type => :boolean, :aliases => "--force", :banner =>
-      "Force downloading every gem."
-    method_option "ruby", :type => :boolean, :banner =>
-      "Update ruby specified in Gemfile.lock"
-    method_option "bundler", :type => :string, :lazy_default => "> 0.a", :banner =>
-      "Update the locked version of bundler"
-    method_option "patch", :type => :boolean, :banner =>
-      "Prefer updating only to next patch version"
-    method_option "minor", :type => :boolean, :banner =>
-      "Prefer updating only to next minor version"
-    method_option "major", :type => :boolean, :banner =>
-      "Prefer updating to next major version (default)"
-    method_option "pre", :type => :boolean, :banner =>
-      "Always choose the highest allowed version when updating gems, regardless of prerelease status"
-    method_option "strict", :type => :boolean, :banner =>
-      "Do not allow any gem to be updated past latest --patch | --minor | --major"
-    method_option "conservative", :type => :boolean, :banner =>
-      "Use bundle install conservative update behavior and do not allow shared dependencies to be updated."
-    method_option "all", :type => :boolean, :banner =>
-      "Update everything."
+    method_option "full-index", type: :boolean, banner: "Fall back to using the single-file index of all gems"
+    method_option "gemfile", type: :string, banner: "Use the specified gemfile instead of Gemfile"
+    method_option "group", aliases: "-g", type: :array, banner: "Update a specific group"
+    method_option "jobs", aliases: "-j", type: :numeric, banner: "Specify the number of jobs to run in parallel"
+    method_option "local", type: :boolean, banner: "Do not attempt to fetch gems remotely and use the gem cache instead"
+    method_option "quiet", type: :boolean, banner: "Only output warnings and errors."
+    method_option "source", type: :array, banner: "Update a specific source (and all gems associated with it)"
+    method_option "redownload", type: :boolean, aliases: "--force", banner: "Force downloading every gem."
+    method_option "ruby", type: :boolean, banner: "Update ruby specified in Gemfile.lock"
+    method_option "bundler", type: :string, lazy_default: "> 0.a", banner: "Update the locked version of bundler"
+    method_option "patch", type: :boolean, banner: "Prefer updating only to next patch version"
+    method_option "minor", type: :boolean, banner: "Prefer updating only to next minor version"
+    method_option "major", type: :boolean, banner: "Prefer updating to next major version (default)"
+    method_option "pre", type: :boolean, banner: "Always choose the highest allowed version when updating gems, regardless of prerelease status"
+    method_option "strict", type: :boolean, banner: "Do not allow any gem to be updated past latest --patch | --minor | --major"
+    method_option "conservative", type: :boolean, banner: "Use bundle install conservative update behavior and do not allow shared dependencies to be updated."
+    method_option "all", type: :boolean, banner: "Update everything."
     def update(*gems)
       SharedHelpers.major_deprecation(2, "The `--force` option has been renamed to `--redownload`") if ARGV.include?("--force")
       require_relative "cli/update"
-      Bundler.settings.temporary(:no_install => false) do
+      Bundler.settings.temporary(no_install: false) do
         Update.new(options, gems).run
       end
     end
@@ -317,21 +286,23 @@ def update(*gems)
       Show lists the names and versions of all gems that are required by your Gemfile.
       Calling show with [GEM] will list the exact location of that gem on your machine.
     D
-    method_option "paths", :type => :boolean,
-                           :banner => "List the paths of all gems that are required by your Gemfile."
-    method_option "outdated", :type => :boolean,
-                              :banner => "Show verbose output including whether gems are outdated."
+    method_option "paths", type: :boolean, banner: "List the paths of all gems that are required by your Gemfile."
+    method_option "outdated", type: :boolean, banner: "Show verbose output including whether gems are outdated."
     def show(gem_name = nil)
-      SharedHelpers.major_deprecation(2, "the `--outdated` flag to `bundle show` was undocumented and will be removed without replacement") if ARGV.include?("--outdated")
+      if ARGV.include?("--outdated")
+        message = "the `--outdated` flag to `bundle show` was undocumented and will be removed without replacement"
+        removed_message = "the `--outdated` flag to `bundle show` was undocumented and has been removed without replacement"
+        SharedHelpers.major_deprecation(2, message, removed_message: removed_message)
+      end
       require_relative "cli/show"
       Show.new(options, gem_name).run
     end
 
     desc "list", "List all gems in the bundle"
-    method_option "name-only", :type => :boolean, :banner => "print only the gem names"
-    method_option "only-group", :type => :array, :default => [], :banner => "print gems from a given set of groups"
-    method_option "without-group", :type => :array, :default => [], :banner => "print all gems except from a given set of groups"
-    method_option "paths", :type => :boolean, :banner => "print the path to each gem in the bundle"
+    method_option "name-only", type: :boolean, banner: "print only the gem names"
+    method_option "only-group", type: :array, default: [], banner: "print gems from a given set of groups"
+    method_option "without-group", type: :array, default: [], banner: "print all gems except from a given set of groups"
+    method_option "paths", type: :boolean, banner: "print the path to each gem in the bundle"
     def list
       require_relative "cli/list"
       List.new(options).run
@@ -340,8 +311,8 @@ def list
     map aliases_for("list")
 
     desc "info GEM [OPTIONS]", "Show information for the given gem"
-    method_option "path", :type => :boolean, :banner => "Print full path to gem"
-    method_option "version", :type => :boolean, :banner => "Print gem version"
+    method_option "path", type: :boolean, banner: "Print full path to gem"
+    method_option "version", type: :boolean, banner: "Print gem version"
     def info(gem_name)
       require_relative "cli/info"
       Info.new(options, gem_name).run
@@ -353,18 +324,12 @@ def info(gem_name)
       or the --binstubs directory if one has been set. Calling binstubs with [GEM [GEM]]
       will create binstubs for all given gems.
     D
-    method_option "force", :type => :boolean, :default => false, :banner =>
-      "Overwrite existing binstubs if they exist"
-    method_option "path", :type => :string, :lazy_default => "bin", :banner =>
-      "Binstub destination directory (default bin)"
-    method_option "shebang", :type => :string, :banner =>
-      "Specify a different shebang executable name than the default (usually 'ruby')"
-    method_option "standalone", :type => :boolean, :banner =>
-      "Make binstubs that can work without the Bundler runtime"
-    method_option "all", :type => :boolean, :banner =>
-      "Install binstubs for all gems"
-    method_option "all-platforms", :type => :boolean, :default => false, :banner =>
-      "Install binstubs for all platforms"
+    method_option "force", type: :boolean, default: false, banner: "Overwrite existing binstubs if they exist"
+    method_option "path", type: :string, lazy_default: "bin", banner: "Binstub destination directory (default bin)"
+    method_option "shebang", type: :string, banner: "Specify a different shebang executable name than the default (usually 'ruby')"
+    method_option "standalone", type: :boolean, banner: "Make binstubs that can work without the Bundler runtime"
+    method_option "all", type: :boolean, banner: "Install binstubs for all gems"
+    method_option "all-platforms", type: :boolean, default: false, banner: "Install binstubs for all platforms"
     def binstubs(*gems)
       require_relative "cli/binstubs"
       Binstubs.new(options, gems).run
@@ -374,19 +339,20 @@ def binstubs(*gems)
     long_desc <<-D
       Adds the specified gem to Gemfile (if valid) and run 'bundle install' in one step.
     D
-    method_option "version", :aliases => "-v", :type => :string
-    method_option "group", :aliases => "-g", :type => :string
-    method_option "source", :aliases => "-s", :type => :string
-    method_option "require", :aliases => "-r", :type => :string, :banner => "Adds require path to gem. Provide false, or a path as a string."
-    method_option "path", :type => :string
-    method_option "git", :type => :string
-    method_option "github", :type => :string
-    method_option "branch", :type => :string
-    method_option "ref", :type => :string
-    method_option "skip-install", :type => :boolean, :banner =>
-      "Adds gem to the Gemfile but does not install it"
-    method_option "optimistic", :type => :boolean, :banner => "Adds optimistic declaration of version to gem"
-    method_option "strict", :type => :boolean, :banner => "Adds strict declaration of version to gem"
+    method_option "version", aliases: "-v", type: :string
+    method_option "group", aliases: "-g", type: :string
+    method_option "source", aliases: "-s", type: :string
+    method_option "require", aliases: "-r", type: :string, banner: "Adds require path to gem. Provide false, or a path as a string."
+    method_option "path", type: :string
+    method_option "git", type: :string
+    method_option "github", type: :string
+    method_option "branch", type: :string
+    method_option "ref", type: :string
+    method_option "glob", type: :string, banner: "The location of a dependency's .gemspec, expanded within Ruby (single quotes recommended)"
+    method_option "quiet", type: :boolean, banner: "Only output warnings and errors."
+    method_option "skip-install", type: :boolean, banner: "Adds gem to the Gemfile but does not install it"
+    method_option "optimistic", type: :boolean, banner: "Adds optimistic declaration of version to gem"
+    method_option "strict", type: :boolean, banner: "Adds strict declaration of version to gem"
     def add(*gems)
       require_relative "cli/add"
       Add.new(options.dup, gems).run
@@ -402,54 +368,43 @@ def add(*gems)
       For more information on patch level options (--major, --minor, --patch,
       --strict) see documentation on the same options on the update command.
     D
-    method_option "group", :type => :string, :banner => "List gems from a specific group"
-    method_option "groups", :type => :boolean, :banner => "List gems organized by groups"
-    method_option "local", :type => :boolean, :banner =>
-      "Do not attempt to fetch gems remotely and use the gem cache instead"
-    method_option "pre", :type => :boolean, :banner => "Check for newer pre-release gems"
-    method_option "source", :type => :array, :banner => "Check against a specific source"
-    method_option "filter-strict", :type => :boolean, :aliases => "--strict", :banner =>
-      "Only list newer versions allowed by your Gemfile requirements"
-    method_option "update-strict", :type => :boolean, :banner =>
-      "Strict conservative resolution, do not allow any gem to be updated past latest --patch | --minor | --major"
-    method_option "minor", :type => :boolean, :banner => "Prefer updating only to next minor version"
-    method_option "major", :type => :boolean, :banner => "Prefer updating to next major version (default)"
-    method_option "patch", :type => :boolean, :banner => "Prefer updating only to next patch version"
-    method_option "filter-major", :type => :boolean, :banner => "Only list major newer versions"
-    method_option "filter-minor", :type => :boolean, :banner => "Only list minor newer versions"
-    method_option "filter-patch", :type => :boolean, :banner => "Only list patch newer versions"
-    method_option "parseable", :aliases => "--porcelain", :type => :boolean, :banner =>
-      "Use minimal formatting for more parseable output"
-    method_option "only-explicit", :type => :boolean, :banner =>
-      "Only list gems specified in your Gemfile, not their dependencies"
+    method_option "group", type: :string, banner: "List gems from a specific group"
+    method_option "groups", type: :boolean, banner: "List gems organized by groups"
+    method_option "local", type: :boolean, banner: "Do not attempt to fetch gems remotely and use the gem cache instead"
+    method_option "pre", type: :boolean, banner: "Check for newer pre-release gems"
+    method_option "source", type: :array, banner: "Check against a specific source"
+    method_option "filter-strict", type: :boolean, aliases: "--strict", banner: "Only list newer versions allowed by your Gemfile requirements"
+    method_option "update-strict", type: :boolean, banner: "Strict conservative resolution, do not allow any gem to be updated past latest --patch | --minor | --major"
+    method_option "minor", type: :boolean, banner: "Prefer updating only to next minor version"
+    method_option "major", type: :boolean, banner: "Prefer updating to next major version (default)"
+    method_option "patch", type: :boolean, banner: "Prefer updating only to next patch version"
+    method_option "filter-major", type: :boolean, banner: "Only list major newer versions"
+    method_option "filter-minor", type: :boolean, banner: "Only list minor newer versions"
+    method_option "filter-patch", type: :boolean, banner: "Only list patch newer versions"
+    method_option "parseable", aliases: "--porcelain", type: :boolean, banner: "Use minimal formatting for more parseable output"
+    method_option "only-explicit", type: :boolean, banner: "Only list gems specified in your Gemfile, not their dependencies"
     def outdated(*gems)
       require_relative "cli/outdated"
       Outdated.new(options, gems).run
     end
 
     desc "fund [OPTIONS]", "Lists information about gems seeking funding assistance"
-    method_option "group", :aliases => "-g", :type => :array, :banner =>
-      "Fetch funding information for a specific group"
+    method_option "group", aliases: "-g", type: :array, banner: "Fetch funding information for a specific group"
     def fund
       require_relative "cli/fund"
       Fund.new(options).run
     end
 
     desc "cache [OPTIONS]", "Locks and then caches all of the gems into vendor/cache"
-    method_option "all",  :type => :boolean,
-                          :default => Bundler.feature_flag.cache_all?,
-                          :banner => "Include all sources (including path and git)."
-    method_option "all-platforms", :type => :boolean, :banner => "Include gems for all platforms present in the lockfile, not only the current one"
-    method_option "cache-path", :type => :string, :banner =>
-      "Specify a different cache path than the default (vendor/cache)."
-    method_option "gemfile", :type => :string, :banner => "Use the specified gemfile instead of Gemfile"
-    method_option "no-install", :type => :boolean, :banner => "Don't install the gems, only update the cache."
-    method_option "no-prune", :type => :boolean, :banner => "Don't remove stale gems from the cache."
-    method_option "path", :type => :string, :banner =>
-      "Specify a different path than the system default ($BUNDLE_PATH or $GEM_HOME).#{" Bundler will remember this value for future installs on this machine" unless Bundler.feature_flag.forget_cli_options?}"
-    method_option "quiet", :type => :boolean, :banner => "Only output warnings and errors."
-    method_option "frozen", :type => :boolean, :banner =>
-      "Do not allow the Gemfile.lock to be updated after this bundle cache operation's install"
+    method_option "all", type: :boolean, default: Bundler.feature_flag.cache_all?, banner: "Include all sources (including path and git)."
+    method_option "all-platforms", type: :boolean, banner: "Include gems for all platforms present in the lockfile, not only the current one"
+    method_option "cache-path", type: :string, banner: "Specify a different cache path than the default (vendor/cache)."
+    method_option "gemfile", type: :string, banner: "Use the specified gemfile instead of Gemfile"
+    method_option "no-install", type: :boolean, banner: "Don't install the gems, only update the cache."
+    method_option "no-prune", type: :boolean, banner: "Don't remove stale gems from the cache."
+    method_option "path", type: :string, banner: "Specify a different path than the system default ($BUNDLE_PATH or $GEM_HOME).#{" Bundler will remember this value for future installs on this machine" unless Bundler.feature_flag.forget_cli_options?}"
+    method_option "quiet", type: :boolean, banner: "Only output warnings and errors."
+    method_option "frozen", type: :boolean, banner: "Do not allow the Gemfile.lock to be updated after this bundle cache operation's install"
     long_desc <<-D
       The cache command will copy the .gem files for every gem in the bundle into the
       directory ./vendor/cache. If you then check that directory into your source
@@ -457,17 +412,20 @@ def fund
       bundle without having to download any additional gems.
     D
     def cache
-      SharedHelpers.major_deprecation 2,
-        "The `--all` flag is deprecated because it relies on being " \
-        "remembered across bundler invocations, which bundler will no longer " \
-        "do in future versions. Instead please use `bundle config set cache_all true`, " \
-        "and stop using this flag" if ARGV.include?("--all")
-
-      SharedHelpers.major_deprecation 2,
-        "The `--path` flag is deprecated because its semantics are unclear. " \
-        "Use `bundle config cache_path` to configure the path of your cache of gems, " \
-        "and `bundle config path` to configure the path where your gems are installed, " \
-        "and stop using this flag" if ARGV.include?("--path")
+      print_remembered_flag_deprecation("--all", "cache_all", "true") if ARGV.include?("--all")
+
+      if ARGV.include?("--path")
+        message =
+          "The `--path` flag is deprecated because its semantics are unclear. " \
+          "Use `bundle config cache_path` to configure the path of your cache of gems, " \
+          "and `bundle config path` to configure the path where your gems are installed, " \
+          "and stop using this flag"
+        removed_message =
+          "The `--path` flag has been removed because its semantics were unclear. " \
+          "Use `bundle config cache_path` to configure the path of your cache of gems, " \
+          "and `bundle config path` to configure the path where your gems are installed."
+        SharedHelpers.major_deprecation 2, message, removed_message: removed_message
+      end
 
       require_relative "cli/cache"
       Cache.new(options).run
@@ -476,8 +434,8 @@ def cache
     map aliases_for("cache")
 
     desc "exec [OPTIONS]", "Run the command in context of the bundle"
-    method_option :keep_file_descriptors, :type => :boolean, :default => true
-    method_option :gemfile, :type => :string, :required => false
+    method_option :keep_file_descriptors, type: :boolean, default: true, banner: "Passes all file descriptors to the new processes. Default is true, and setting it to false is deprecated"
+    method_option :gemfile, type: :string, required: false, banner: "Use the specified gemfile instead of Gemfile"
     long_desc <<-D
       Exec runs a command, providing it access to the gems in the bundle. While using
       bundle exec you can require and call the bundled gems as if they were installed
@@ -485,7 +443,9 @@ def cache
     D
     def exec(*args)
       if ARGV.include?("--no-keep-file-descriptors")
-        SharedHelpers.major_deprecation(2, "The `--no-keep-file-descriptors` has been deprecated. `bundle exec` no longer mess with your file descriptors. Close them in the exec'd script if you need to")
+        message = "The `--no-keep-file-descriptors` has been deprecated. `bundle exec` no longer mess with your file descriptors. Close them in the exec'd script if you need to"
+        removed_message = "The `--no-keep-file-descriptors` has been removed. `bundle exec` no longer mess with your file descriptors. Close them in the exec'd script if you need to"
+        SharedHelpers.major_deprecation(2, message, removed_message: removed_message)
       end
 
       require_relative "cli/exec"
@@ -510,31 +470,29 @@ def exec(*args)
     subcommand "config", Config
 
     desc "open GEM", "Opens the source directory of the given bundled gem"
-    method_option "path", :type => :string, :lazy_default => "", :banner => "Open relative path of the gem source."
+    method_option "path", type: :string, lazy_default: "", banner: "Open relative path of the gem source."
     def open(name)
       require_relative "cli/open"
       Open.new(options, name).run
     end
 
-    unless Bundler.feature_flag.bundler_3_mode?
-      desc "console [GROUP]", "Opens an IRB session with the bundle pre-loaded"
-      def console(group = nil)
-        require_relative "cli/console"
-        Console.new(options, group).run
-      end
+    desc "console [GROUP]", "Opens an IRB session with the bundle pre-loaded"
+    def console(group = nil)
+      require_relative "cli/console"
+      Console.new(options, group).run
     end
 
     desc "version", "Prints Bundler version information"
     def version
       cli_help = current_command.name == "cli_help"
       if cli_help || ARGV.include?("version")
-        build_info = " (#{BuildMetadata.built_at} commit #{BuildMetadata.git_commit_sha})"
+        build_info = " (#{BuildMetadata.timestamp} commit #{BuildMetadata.git_commit_sha})"
       end
 
-      if !cli_help && Bundler.feature_flag.print_only_version_number?
-        Bundler.ui.info "#{Bundler::VERSION}#{build_info}"
+      if !cli_help && Bundler.feature_flag.bundler_4_mode?
+        Bundler.ui.info "#{Bundler.verbose_version}#{build_info}"
       else
-        Bundler.ui.info "Bundler version #{Bundler::VERSION}#{build_info}"
+        Bundler.ui.info "Bundler version #{Bundler.verbose_version}#{build_info}"
       end
     end
 
@@ -554,18 +512,18 @@ def licenses
       end
     end
 
-    unless Bundler.feature_flag.bundler_3_mode?
-      desc "viz [OPTIONS]", "Generates a visual dependency graph", :hide => true
+    unless Bundler.feature_flag.bundler_4_mode?
+      desc "viz [OPTIONS]", "Generates a visual dependency graph", hide: true
       long_desc <<-D
         Viz generates a PNG file of the current Gemfile as a dependency graph.
         Viz requires the ruby-graphviz gem (and its dependencies).
         The associated gems must also be installed via 'bundle install'.
       D
-      method_option :file, :type => :string, :default => "gem_graph", :aliases => "-f", :desc => "The name to use for the generated file. see format option"
-      method_option :format, :type => :string, :default => "png", :aliases => "-F", :desc => "This is output format option. Supported format is png, jpg, svg, dot ..."
-      method_option :requirements, :type => :boolean, :default => false, :aliases => "-R", :desc => "Set to show the version of each required dependency."
-      method_option :version, :type => :boolean, :default => false, :aliases => "-v", :desc => "Set to show each gem version."
-      method_option :without, :type => :array, :default => [], :aliases => "-W", :banner => "GROUP[ GROUP...]", :desc => "Exclude gems that are part of the specified named group."
+      method_option :file, type: :string, default: "gem_graph", aliases: "-f", desc: "The name to use for the generated file. see format option"
+      method_option :format, type: :string, default: "png", aliases: "-F", desc: "This is output format option. Supported format is png, jpg, svg, dot ..."
+      method_option :requirements, type: :boolean, default: false, aliases: "-R", desc: "Set to show the version of each required dependency."
+      method_option :version, type: :boolean, default: false, aliases: "-v", desc: "Set to show each gem version."
+      method_option :without, type: :array, default: [], aliases: "-W", banner: "GROUP[ GROUP...]", desc: "Exclude gems that are part of the specified named group."
       def viz
         SharedHelpers.major_deprecation 2, "The `viz` command has been renamed to `graph` and moved to a plugin. See https://github.com/rubygems/bundler-graph"
         require_relative "cli/viz"
@@ -573,79 +531,51 @@ def viz
       end
     end
 
-    old_gem = instance_method(:gem)
-
     desc "gem NAME [OPTIONS]", "Creates a skeleton for creating a rubygem"
-    method_option :exe, :type => :boolean, :default => false, :aliases => ["--bin", "-b"], :desc => "Generate a binary executable for your library."
-    method_option :coc, :type => :boolean, :desc => "Generate a code of conduct file. Set a default with `bundle config set --global gem.coc true`."
-    method_option :edit, :type => :string, :aliases => "-e", :required => false, :banner => "EDITOR",
-                         :lazy_default => [ENV["BUNDLER_EDITOR"], ENV["VISUAL"], ENV["EDITOR"]].find {|e| !e.nil? && !e.empty? },
-                         :desc => "Open generated gemspec in the specified editor (defaults to $EDITOR or $BUNDLER_EDITOR)"
-    method_option :ext, :type => :string, :desc => "Generate the boilerplate for C extension code.", :enum => EXTENSIONS
-    method_option :git, :type => :boolean, :default => true, :desc => "Initialize a git repo inside your library."
-    method_option :mit, :type => :boolean, :desc => "Generate an MIT license file. Set a default with `bundle config set --global gem.mit true`."
-    method_option :rubocop, :type => :boolean, :desc => "Add rubocop to the generated Rakefile and gemspec. Set a default with `bundle config set --global gem.rubocop true`."
-    method_option :changelog, :type => :boolean, :desc => "Generate changelog file. Set a default with `bundle config set --global gem.changelog true`."
-    method_option :test, :type => :string, :lazy_default => Bundler.settings["gem.test"] || "", :aliases => "-t", :banner => "Use the specified test framework for your library",
-                         :desc => "Generate a test directory for your library, either rspec, minitest or test-unit. Set a default with `bundle config set --global gem.test (rspec|minitest|test-unit)`."
-    method_option :ci, :type => :string, :lazy_default => Bundler.settings["gem.ci"] || "",
-                       :desc => "Generate CI configuration, either GitHub Actions, GitLab CI or CircleCI. Set a default with `bundle config set --global gem.ci (github|gitlab|circle)`"
-    method_option :linter, :type => :string, :lazy_default => Bundler.settings["gem.linter"] || "",
-                           :desc => "Add a linter and code formatter, either RuboCop or Standard. Set a default with `bundle config set --global gem.linter (rubocop|standard)`"
-    method_option :github_username, :type => :string, :default => Bundler.settings["gem.github_username"], :banner => "Set your username on GitHub", :desc => "Fill in GitHub username on README so that you don't have to do it manually. Set a default with `bundle config set --global gem.github_username <your_username>`."
+    method_option :exe, type: :boolean, default: false, aliases: ["--bin", "-b"], desc: "Generate a binary executable for your library."
+    method_option :coc, type: :boolean, desc: "Generate a code of conduct file. Set a default with `bundle config set --global gem.coc true`."
+    method_option :edit, type: :string, aliases: "-e", required: false, banner: "EDITOR", lazy_default: [ENV["BUNDLER_EDITOR"], ENV["VISUAL"], ENV["EDITOR"]].find {|e| !e.nil? && !e.empty? }, desc: "Open generated gemspec in the specified editor (defaults to $EDITOR or $BUNDLER_EDITOR)"
+    method_option :ext, type: :string, desc: "Generate the boilerplate for C extension code.", enum: EXTENSIONS
+    method_option :git, type: :boolean, default: true, desc: "Initialize a git repo inside your library."
+    method_option :mit, type: :boolean, desc: "Generate an MIT license file. Set a default with `bundle config set --global gem.mit true`."
+    method_option :rubocop, type: :boolean, desc: "Add rubocop to the generated Rakefile and gemspec. Set a default with `bundle config set --global gem.rubocop true`."
+    method_option :changelog, type: :boolean, desc: "Generate changelog file. Set a default with `bundle config set --global gem.changelog true`."
+    method_option :test, type: :string, lazy_default: Bundler.settings["gem.test"] || "", aliases: "-t", banner: "Use the specified test framework for your library", enum: %w[rspec minitest test-unit], desc: "Generate a test directory for your library, either rspec, minitest or test-unit. Set a default with `bundle config set --global gem.test (rspec|minitest|test-unit)`."
+    method_option :ci, type: :string, lazy_default: Bundler.settings["gem.ci"] || "", enum: %w[github gitlab circle], desc: "Generate CI configuration, either GitHub Actions, GitLab CI or CircleCI. Set a default with `bundle config set --global gem.ci (github|gitlab|circle)`"
+    method_option :linter, type: :string, lazy_default: Bundler.settings["gem.linter"] || "", enum: %w[rubocop standard], desc: "Add a linter and code formatter, either RuboCop or Standard. Set a default with `bundle config set --global gem.linter (rubocop|standard)`"
+    method_option :github_username, type: :string, default: Bundler.settings["gem.github_username"], banner: "Set your username on GitHub", desc: "Fill in GitHub username on README so that you don't have to do it manually. Set a default with `bundle config set --global gem.github_username <your_username>`."
+    method_option :bundle, type: :boolean, default: Bundler.settings["gem.bundle"], desc: "Automatically run `bundle install` after creation. Set a default with `bundle config set --global gem.bundle true`"
 
     def gem(name)
-    end
-
-    commands["gem"].tap do |gem_command|
-      def gem_command.run(instance, args = [])
-        arity = 1 # name
-
-        require_relative "cli/gem"
-        cmd_args = args + [instance]
-        cmd_args.unshift(instance.options)
-
-        cmd = begin
-          Gem.new(*cmd_args)
-        rescue ArgumentError => e
-          instance.class.handle_argument_error(self, e, args, arity)
-        end
+      require_relative "cli/gem"
+      cmd_args = args + [self]
+      cmd_args.unshift(options)
 
-        cmd.run
-      end
+      Gem.new(*cmd_args).run
     end
 
-    undef_method(:gem)
-    define_method(:gem, old_gem)
-    private :gem
-
     def self.source_root
       File.expand_path("templates", __dir__)
     end
 
-    desc "clean [OPTIONS]", "Cleans up unused gems in your bundler directory", :hide => true
-    method_option "dry-run", :type => :boolean, :default => false, :banner =>
-      "Only print out changes, do not clean gems"
-    method_option "force", :type => :boolean, :default => false, :banner =>
-      "Forces cleaning up unused gems even if Bundler is configured to use globally installed gems. As a consequence, removes all system gems except for the ones in the current application."
+    desc "clean [OPTIONS]", "Cleans up unused gems in your bundler directory", hide: true
+    method_option "dry-run", type: :boolean, default: false, banner: "Only print out changes, do not clean gems"
+    method_option "force", type: :boolean, default: false, banner: "Forces cleaning up unused gems even if Bundler is configured to use globally installed gems. As a consequence, removes all system gems except for the ones in the current application."
     def clean
       require_relative "cli/clean"
       Clean.new(options.dup).run
     end
 
     desc "platform [OPTIONS]", "Displays platform compatibility information"
-    method_option "ruby", :type => :boolean, :default => false, :banner =>
-      "only display ruby related platform information"
+    method_option "ruby", type: :boolean, default: false, banner: "only display ruby related platform information"
     def platform
       require_relative "cli/platform"
       Platform.new(options).run
     end
 
-    desc "inject GEM VERSION", "Add the named gem, with version requirements, to the resolved Gemfile", :hide => true
-    method_option "source", :type => :string, :banner =>
-     "Install gem from the given source"
-    method_option "group", :type => :string, :banner =>
-     "Install gem into a bundler group"
+    desc "inject GEM VERSION", "Add the named gem, with version requirements, to the resolved Gemfile", hide: true
+    method_option "source", type: :string, banner: "Install gem from the given source"
+    method_option "group", type: :string, banner: "Install gem into a bundler group"
     def inject(name, version)
       SharedHelpers.major_deprecation 2, "The `inject` command has been replaced by the `add` command"
       require_relative "cli/inject"
@@ -653,36 +583,23 @@ def inject(name, version)
     end
 
     desc "lock", "Creates a lockfile without installing"
-    method_option "update", :type => :array, :lazy_default => true, :banner =>
-      "ignore the existing lockfile, update all gems by default, or update list of given gems"
-    method_option "local", :type => :boolean, :default => false, :banner =>
-      "do not attempt to fetch remote gemspecs and use the local gem cache only"
-    method_option "print", :type => :boolean, :default => false, :banner =>
-      "print the lockfile to STDOUT instead of writing to the file system"
-    method_option "gemfile", :type => :string, :banner =>
-      "Use the specified gemfile instead of Gemfile"
-    method_option "lockfile", :type => :string, :default => nil, :banner =>
-      "the path the lockfile should be written to"
-    method_option "full-index", :type => :boolean, :default => false, :banner =>
-      "Fall back to using the single-file index of all gems"
-    method_option "add-platform", :type => :array, :default => [], :banner =>
-      "Add a new platform to the lockfile"
-    method_option "remove-platform", :type => :array, :default => [], :banner =>
-      "Remove a platform from the lockfile"
-    method_option "patch", :type => :boolean, :banner =>
-      "If updating, prefer updating only to next patch version"
-    method_option "minor", :type => :boolean, :banner =>
-      "If updating, prefer updating only to next minor version"
-    method_option "major", :type => :boolean, :banner =>
-      "If updating, prefer updating to next major version (default)"
-    method_option "pre", :type => :boolean, :banner =>
-      "If updating, always choose the highest allowed version, regardless of prerelease status"
-    method_option "strict", :type => :boolean, :banner =>
-      "If updating, do not allow any gem to be updated past latest --patch | --minor | --major"
-    method_option "conservative", :type => :boolean, :banner =>
-      "If updating, use bundle install conservative update behavior and do not allow shared dependencies to be updated"
-    method_option "bundler", :type => :string, :lazy_default => "> 0.a", :banner =>
-      "Update the locked version of bundler"
+    method_option "update", type: :array, lazy_default: true, banner: "ignore the existing lockfile, update all gems by default, or update list of given gems"
+    method_option "local", type: :boolean, default: false, banner: "do not attempt to fetch remote gemspecs and use the local gem cache only"
+    method_option "print", type: :boolean, default: false, banner: "print the lockfile to STDOUT instead of writing to the file system"
+    method_option "gemfile", type: :string, banner: "Use the specified gemfile instead of Gemfile"
+    method_option "lockfile", type: :string, default: nil, banner: "the path the lockfile should be written to"
+    method_option "full-index", type: :boolean, default: false, banner: "Fall back to using the single-file index of all gems"
+    method_option "add-checksums", type: :boolean, default: false, banner: "Adds checksums to the lockfile"
+    method_option "add-platform", type: :array, default: [], banner: "Add a new platform to the lockfile"
+    method_option "remove-platform", type: :array, default: [], banner: "Remove a platform from the lockfile"
+    method_option "normalize-platforms", type: :boolean, default: false, banner: "Normalize lockfile platforms"
+    method_option "patch", type: :boolean, banner: "If updating, prefer updating only to next patch version"
+    method_option "minor", type: :boolean, banner: "If updating, prefer updating only to next minor version"
+    method_option "major", type: :boolean, banner: "If updating, prefer updating to next major version (default)"
+    method_option "pre", type: :boolean, banner: "If updating, always choose the highest allowed version, regardless of prerelease status"
+    method_option "strict", type: :boolean, banner: "If updating, do not allow any gem to be updated past latest --patch | --minor | --major"
+    method_option "conservative", type: :boolean, banner: "If updating, use bundle install conservative update behavior and do not allow shared dependencies to be updated"
+    method_option "bundler", type: :string, lazy_default: "> 0.a", banner: "Update the locked version of bundler"
     def lock
       require_relative "cli/lock"
       Lock.new(options).run
@@ -694,19 +611,8 @@ def env
     end
 
     desc "doctor [OPTIONS]", "Checks the bundle for common problems"
-    long_desc <<-D
-      Doctor scans the OS dependencies of each of the gems requested in the Gemfile. If
-      missing dependencies are detected, Bundler prints them and exits status 1.
-      Otherwise, Bundler prints a success message and exits with a status of 0.
-    D
-    method_option "gemfile", :type => :string, :banner =>
-      "Use the specified gemfile instead of Gemfile"
-    method_option "quiet", :type => :boolean, :banner =>
-        "Only output warnings and errors."
-    def doctor
-      require_relative "cli/doctor"
-      Doctor.new(options).run
-    end
+    require_relative "cli/doctor"
+    subcommand("doctor", Doctor)
 
     desc "issue", "Learn how to report an issue in Bundler"
     def issue
@@ -722,7 +628,9 @@ def issue
     D
     def pristine(*gems)
       require_relative "cli/pristine"
-      Pristine.new(gems).run
+      Bundler.settings.temporary(no_install: false) do
+        Pristine.new(gems).run
+      end
     end
 
     if Bundler.feature_flag.plugins?
@@ -743,7 +651,6 @@ def self.reformatted_help_args(args)
       exec_used = args.index {|a| exec_commands.include? a }
 
       command = args.find {|a| bundler_commands.include? a }
-      command = all_aliases[command] if all_aliases[command]
 
       if exec_used && help_used
         if exec_used + help_used == 1
@@ -764,7 +671,9 @@ def self.check_deprecated_ext_option(arguments)
       # when deprecated version of `--ext` is called
       # print out deprecation warning and pretend `--ext=c` was provided
       if deprecated_ext_value?(arguments)
-        SharedHelpers.major_deprecation 2, "Extensions can now be generated using C or Rust, so `--ext` with no arguments has been deprecated. Please select a language, e.g. `--ext=rust` to generate a Rust extension. This gem will now be generated as if `--ext=c` was used."
+        message = "Extensions can now be generated using C or Rust, so `--ext` with no arguments has been deprecated. Please select a language, e.g. `--ext=rust` to generate a Rust extension. This gem will now be generated as if `--ext=c` was used."
+        removed_message = "Extensions can now be generated using C or Rust, so `--ext` with no arguments has been removed. Please select a language, e.g. `--ext=rust` to generate a Rust extension."
+        SharedHelpers.major_deprecation 2, message, removed_message: removed_message
         arguments[arguments.index("--ext")] = "--ext=c"
       end
     end
@@ -794,26 +703,6 @@ def self.deprecated_ext_value?(arguments)
 
     private
 
-    # Automatically invoke `bundle install` and resume if
-    # Bundler.settings[:auto_install] exists. This is set through config cmd
-    # `bundle config set --global auto_install 1`.
-    #
-    # Note that this method `nil`s out the global Definition object, so it
-    # should be called first, before you instantiate anything like an
-    # `Installer` that'll keep a reference to the old one instead.
-    def auto_install
-      return unless Bundler.settings[:auto_install]
-
-      begin
-        Bundler.definition.specs
-      rescue GemNotFound
-        Bundler.ui.info "Automatically installing missing gems."
-        Bundler.reset!
-        invoke :install, []
-        Bundler.reset!
-      end
-    end
-
     def current_command
       _, _, config = @_initializer
       config[:current_command]
@@ -825,14 +714,9 @@ def print_command
       command_name = cmd.name
       return if PARSEABLE_COMMANDS.include?(command_name)
       command = ["bundle", command_name] + args
-      options_to_print = options.dup
-      options_to_print.delete_if do |k, v|
-        next unless o = cmd.options[k]
-        o.default == v
-      end
-      command << Thor::Options.to_switches(options_to_print.sort_by(&:first)).strip
+      command << Thor::Options.to_switches(options.sort_by(&:first)).strip
       command.reject!(&:empty?)
-      Bundler.ui.info "Running `#{command * " "}` with bundler #{Bundler::VERSION}"
+      Bundler.ui.info "Running `#{command * " "}` with bundler #{Bundler.verbose_version}"
     end
 
     def warn_on_outdated_bundler
@@ -843,13 +727,10 @@ def warn_on_outdated_bundler
 
       return unless SharedHelpers.md5_available?
 
-      latest = Fetcher::CompactIndex.
-               new(nil, Source::Rubygems::Remote.new(Bundler::URI("https://rubygems.org")), nil).
-               send(:compact_index_client).
-               instance_variable_get(:@cache).
-               dependencies("bundler").
-               map {|d| Gem::Version.new(d.first) }.
-               max
+      require_relative "vendored_uri"
+      remote = Source::Rubygems::Remote.new(Gem::URI("https://rubygems.org"))
+      cache_path = Bundler.user_cache.join("compact_index", remote.cache_slug)
+      latest = Bundler::CompactIndexClient.new(cache_path).latest_version("bundler")
       return unless latest
 
       current = Gem::Version.new(VERSION)
@@ -883,12 +764,23 @@ def flag_deprecation(name, flag_name, option)
 
       value = options[name]
       value = value.join(" ").to_s if option.type == :array
+      value = "'#{value}'" unless option.type == :boolean
 
-      Bundler::SharedHelpers.major_deprecation 2,
+      print_remembered_flag_deprecation(flag_name, name.tr("-", "_"), value)
+    end
+
+    def print_remembered_flag_deprecation(flag_name, option_name, option_value)
+      message =
         "The `#{flag_name}` flag is deprecated because it relies on being " \
         "remembered across bundler invocations, which bundler will no longer " \
-        "do in future versions. Instead please use `bundle config set --local #{name.tr("-", "_")} " \
-        "'#{value}'`, and stop using this flag"
+        "do in future versions. Instead please use `bundle config set #{option_name} " \
+        "#{option_value}`, and stop using this flag"
+      removed_message =
+        "The `#{flag_name}` flag has been removed because it relied on being " \
+        "remembered across bundler invocations, which bundler will no longer " \
+        "do. Instead please use `bundle config set #{option_name} " \
+        "#{option_value}`, and stop using this flag"
+      Bundler::SharedHelpers.major_deprecation 2, message, removed_message: removed_message
     end
   end
 end
diff --git a/lib/bundler/cli/add.rb b/lib/bundler/cli/add.rb
index 08fa6547fb3376..12a681a816886c 100644
--- a/lib/bundler/cli/add.rb
+++ b/lib/bundler/cli/add.rb
@@ -12,6 +12,8 @@ def initialize(options, gems)
     end
 
     def run
+      Bundler.ui.level = "warn" if options[:quiet]
+
       validate_options!
       inject_dependencies
       perform_bundle_install unless options["skip-install"]
@@ -28,13 +30,13 @@ def inject_dependencies
       dependencies = gems.map {|g| Bundler::Dependency.new(g, version, options) }
 
       Injector.inject(dependencies,
-        :conservative_versioning => options[:version].nil?, # Perform conservative versioning only when version is not specified
-        :optimistic => options[:optimistic],
-        :strict => options[:strict])
+        conservative_versioning: options[:version].nil?, # Perform conservative versioning only when version is not specified
+        optimistic: options[:optimistic],
+        strict: options[:strict])
     end
 
     def validate_options!
-      raise InvalidOption, "You can not specify `--strict` and `--optimistic` at the same time." if options[:strict] && options[:optimistic]
+      raise InvalidOption, "You cannot specify `--strict` and `--optimistic` at the same time." if options[:strict] && options[:optimistic]
 
       # raise error when no gems are specified
       raise InvalidOption, "Please specify gems to add." if gems.empty?
diff --git a/lib/bundler/cli/binstubs.rb b/lib/bundler/cli/binstubs.rb
index fc2fad47a554ef..8ce138df96ba3e 100644
--- a/lib/bundler/cli/binstubs.rb
+++ b/lib/bundler/cli/binstubs.rb
@@ -17,9 +17,9 @@ def run
       installer = Installer.new(Bundler.root, Bundler.definition)
 
       installer_opts = {
-        :force => options[:force],
-        :binstubs_cmd => true,
-        :all_platforms => options["all-platforms"],
+        force: options[:force],
+        binstubs_cmd: true,
+        all_platforms: options["all-platforms"],
       }
 
       if options[:all]
@@ -45,7 +45,7 @@ def run
             next
           end
 
-          Bundler.settings.temporary(:path => (Bundler.settings[:path] || Bundler.root)) do
+          Bundler.settings.temporary(path: Bundler.settings[:path] || Bundler.root) do
             installer.generate_standalone_bundler_executable_stubs(spec, installer_opts)
           end
         else
diff --git a/lib/bundler/cli/cache.rb b/lib/bundler/cli/cache.rb
index c8698ed7e38e7f..2e63a16ec3178b 100644
--- a/lib/bundler/cli/cache.rb
+++ b/lib/bundler/cli/cache.rb
@@ -19,7 +19,7 @@ def run
       # TODO: move cache contents here now that all bundles are locked
       custom_path = Bundler.settings[:path] if options[:path]
 
-      Bundler.settings.temporary(:cache_all_platforms => options["all-platforms"]) do
+      Bundler.settings.temporary(cache_all_platforms: options["all-platforms"]) do
         Bundler.load.cache(custom_path)
       end
     end
diff --git a/lib/bundler/cli/check.rb b/lib/bundler/cli/check.rb
index cc1f37f0c33d66..493eb3ec6a5ad6 100644
--- a/lib/bundler/cli/check.rb
+++ b/lib/bundler/cli/check.rb
@@ -15,9 +15,9 @@ def run
       definition.validate_runtime!
 
       begin
-        definition.resolve_only_locally!
+        definition.check!
         not_installed = definition.missing_specs
-      rescue GemNotFound, SolveFailure
+      rescue GemNotFound, GitError, SolveFailure
         Bundler.ui.error "Bundler can't satisfy your Gemfile's dependencies."
         Bundler.ui.warn "Install missing gems with `bundle install`."
         exit 1
@@ -29,10 +29,10 @@ def run
         Bundler.ui.warn "Install missing gems with `bundle install`"
         exit 1
       elsif !Bundler.default_lockfile.file? && Bundler.frozen_bundle?
-        Bundler.ui.error "This bundle has been frozen, but there is no #{Bundler.default_lockfile.relative_path_from(SharedHelpers.pwd)} present"
+        Bundler.ui.error "This bundle has been frozen, but there is no #{SharedHelpers.relative_lockfile_path} present"
         exit 1
       else
-        Bundler.load.lock(:preserve_unknown_sections => true) unless options[:"dry-run"]
+        definition.lock(true) unless options[:"dry-run"]
         Bundler.ui.info "The Gemfile's dependencies are satisfied"
       end
     end
diff --git a/lib/bundler/cli/common.rb b/lib/bundler/cli/common.rb
index d654406f65be2b..be21ba8299370f 100644
--- a/lib/bundler/cli/common.rb
+++ b/lib/bundler/cli/common.rb
@@ -54,9 +54,12 @@ def self.select_spec(name, regex_match = nil)
 
       Bundler.definition.specs.each do |spec|
         return spec if spec.name == name
-        specs << spec if regexp && spec.name =~ regexp
+        specs << spec if regexp && spec.name.match?(regexp)
       end
 
+      default_spec = default_gem_spec(name)
+      specs << default_spec if default_spec
+
       case specs.count
       when 0
         dep_in_other_group = Bundler.definition.current_dependencies.find {|dep|dep.name == name }
@@ -75,6 +78,11 @@ def self.select_spec(name, regex_match = nil)
       raise GemNotFound, gem_not_found_message(name, Bundler.definition.dependencies)
     end
 
+    def self.default_gem_spec(name)
+      gem_spec = Gem::Specification.find_all_by_name(name).last
+      gem_spec if gem_spec&.default_gem?
+    end
+
     def self.ask_for_spec_from(specs)
       specs.each_with_index do |spec, index|
         Bundler.ui.info "#{index.succ} : #{spec.name}", true
@@ -122,7 +130,7 @@ def self.patch_level_options(options)
     def self.clean_after_install?
       clean = Bundler.settings[:clean]
       return clean unless clean.nil?
-      clean ||= Bundler.feature_flag.auto_clean_without_path? && Bundler.settings[:path].nil?
+      clean ||= Bundler.feature_flag.bundler_4_mode? && Bundler.settings[:path].nil?
       clean &&= !Bundler.use_system_gems?
       clean
     end
diff --git a/lib/bundler/cli/config.rb b/lib/bundler/cli/config.rb
index e1222c75dd2a22..d963679085ebb7 100644
--- a/lib/bundler/cli/config.rb
+++ b/lib/bundler/cli/config.rb
@@ -2,17 +2,17 @@
 
 module Bundler
   class CLI::Config < Thor
-    class_option :parseable, :type => :boolean, :banner => "Use minimal formatting for more parseable output"
+    class_option :parseable, type: :boolean, banner: "Use minimal formatting for more parseable output"
 
     def self.scope_options
-      method_option :global, :type => :boolean, :banner => "Only change the global config"
-      method_option :local, :type => :boolean, :banner => "Only change the local config"
+      method_option :global, type: :boolean, banner: "Only change the global config"
+      method_option :local, type: :boolean, banner: "Only change the local config"
     end
     private_class_method :scope_options
 
-    desc "base NAME [VALUE]", "The Bundler 1 config interface", :hide => true
+    desc "base NAME [VALUE]", "The Bundler 1 config interface", hide: true
     scope_options
-    method_option :delete, :type => :boolean, :banner => "delete"
+    method_option :delete, type: :boolean, banner: "delete"
     def base(name = nil, *value)
       new_args =
         if ARGV.size == 1
@@ -25,8 +25,9 @@ def base(name = nil, *value)
           ["config", "get", ARGV[1]]
         end
 
-      SharedHelpers.major_deprecation 3,
-        "Using the `config` command without a subcommand [list, get, set, unset] is deprecated and will be removed in the future. Use `bundle #{new_args.join(" ")}` instead."
+      message = "Using the `config` command without a subcommand [list, get, set, unset] is deprecated and will be removed in the future. Use `bundle #{new_args.join(" ")}` instead."
+      removed_message = "Using the `config` command without a subcommand [list, get, set, unset] has been removed. Use `bundle #{new_args.join(" ")}` instead."
+      SharedHelpers.major_deprecation 4, message, removed_message: removed_message
 
       Base.new(options, name, value, self).run
     end
diff --git a/lib/bundler/cli/console.rb b/lib/bundler/cli/console.rb
index 1eb8ea82545126..f6389e8ea00484 100644
--- a/lib/bundler/cli/console.rb
+++ b/lib/bundler/cli/console.rb
@@ -9,9 +9,6 @@ def initialize(options, group)
     end
 
     def run
-      Bundler::SharedHelpers.major_deprecation 2, "bundle console will be replaced " \
-                           "by `bin/console` generated by `bundle gem <name>`"
-
       group ? Bundler.require(:default, *group.split(" ").map!(&:to_sym)) : Bundler.require
       ARGV.clear
 
@@ -23,9 +20,14 @@ def get_console(name)
       require name
       get_constant(name)
     rescue LoadError
-      Bundler.ui.error "Couldn't load console #{name}, falling back to irb"
-      require "irb"
-      get_constant("irb")
+      if name == "irb"
+        Bundler.ui.error "#{name} is not available"
+        exit 1
+      else
+        Bundler.ui.error "Couldn't load console #{name}, falling back to irb"
+        name = "irb"
+        retry
+      end
     end
 
     def get_constant(name)
@@ -35,9 +37,6 @@ def get_constant(name)
         "irb" => :IRB,
       }[name]
       Object.const_get(const_name)
-    rescue NameError
-      Bundler.ui.error "Could not find constant #{const_name}"
-      exit 1
     end
   end
 end
diff --git a/lib/bundler/cli/doctor.rb b/lib/bundler/cli/doctor.rb
index e299a5a8c21595..5fd6a73d919654 100644
--- a/lib/bundler/cli/doctor.rb
+++ b/lib/bundler/cli/doctor.rb
@@ -1,157 +1,33 @@
 # frozen_string_literal: true
 
-require "rbconfig"
-require "shellwords"
-require "fiddle"
-
 module Bundler
-  class CLI::Doctor
-    DARWIN_REGEX = /\s+(.+) \(compatibility /.freeze
-    LDD_REGEX = /\t\S+ => (\S+) \(\S+\)/.freeze
-
-    attr_reader :options
-
-    def initialize(options)
-      @options = options
-    end
-
-    def otool_available?
-      Bundler.which("otool")
-    end
-
-    def ldd_available?
-      Bundler.which("ldd")
-    end
-
-    def dylibs_darwin(path)
-      output = `/usr/bin/otool -L #{path.shellescape}`.chomp
-      dylibs = output.split("\n")[1..-1].map {|l| l.match(DARWIN_REGEX).captures[0] }.uniq
-      # ignore @rpath and friends
-      dylibs.reject {|dylib| dylib.start_with? "@" }
-    end
-
-    def dylibs_ldd(path)
-      output = `/usr/bin/ldd #{path.shellescape}`.chomp
-      output.split("\n").map do |l|
-        match = l.match(LDD_REGEX)
-        next if match.nil?
-        match.captures[0]
-      end.compact
-    end
-
-    def dylibs(path)
-      case RbConfig::CONFIG["host_os"]
-      when /darwin/
-        return [] unless otool_available?
-        dylibs_darwin(path)
-      when /(linux|solaris|bsd)/
-        return [] unless ldd_available?
-        dylibs_ldd(path)
-      else # Windows, etc.
-        Bundler.ui.warn("Dynamic library check not supported on this platform.")
-        []
-      end
-    end
-
-    def bundles_for_gem(spec)
-      Dir.glob("#{spec.full_gem_path}/**/*.bundle")
-    end
-
-    def check!
-      require_relative "check"
-      Bundler::CLI::Check.new({}).run
-    end
-
-    def run
-      Bundler.ui.level = "warn" if options[:quiet]
-      Bundler.settings.validate!
-      check!
-
-      definition = Bundler.definition
-      broken_links = {}
-
-      definition.specs.each do |spec|
-        bundles_for_gem(spec).each do |bundle|
-          bad_paths = dylibs(bundle).select do |f|
-            Fiddle.dlopen(f)
-            false
-          rescue Fiddle::DLError
-            true
-          end
-          if bad_paths.any?
-            broken_links[spec] ||= []
-            broken_links[spec].concat(bad_paths)
-          end
-        end
-      end
-
-      permissions_valid = check_home_permissions
-
-      if broken_links.any?
-        message = "The following gems are missing OS dependencies:"
-        broken_links.map do |spec, paths|
-          paths.uniq.map do |path|
-            "\n * #{spec.name}: #{path}"
-          end
-        end.flatten.sort.each {|m| message += m }
-        raise ProductionError, message
-      elsif !permissions_valid
-        Bundler.ui.info "No issues found with the installed bundle"
-      end
-    end
-
-    private
-
-    def check_home_permissions
-      require "find"
-      files_not_readable_or_writable = []
-      files_not_rw_and_owned_by_different_user = []
-      files_not_owned_by_current_user_but_still_rw = []
-      broken_symlinks = []
-      Find.find(Bundler.bundle_path.to_s).each do |f|
-        if !File.exist?(f)
-          broken_symlinks << f
-        elsif !File.writable?(f) || !File.readable?(f)
-          if File.stat(f).uid != Process.uid
-            files_not_rw_and_owned_by_different_user << f
-          else
-            files_not_readable_or_writable << f
-          end
-        elsif File.stat(f).uid != Process.uid
-          files_not_owned_by_current_user_but_still_rw << f
-        end
-      end
-
-      ok = true
-
-      if broken_symlinks.any?
-        Bundler.ui.warn "Broken links exist in the Bundler home. Please report them to the offending gem's upstream repo. These files are:\n - #{broken_symlinks.join("\n - ")}"
-
-        ok = false
-      end
-
-      if files_not_owned_by_current_user_but_still_rw.any?
-        Bundler.ui.warn "Files exist in the Bundler home that are owned by another " \
-          "user, but are still readable/writable. These files are:\n - #{files_not_owned_by_current_user_but_still_rw.join("\n - ")}"
-
-        ok = false
-      end
-
-      if files_not_rw_and_owned_by_different_user.any?
-        Bundler.ui.warn "Files exist in the Bundler home that are owned by another " \
-          "user, and are not readable/writable. These files are:\n - #{files_not_rw_and_owned_by_different_user.join("\n - ")}"
-
-        ok = false
-      end
-
-      if files_not_readable_or_writable.any?
-        Bundler.ui.warn "Files exist in the Bundler home that are not " \
-          "readable/writable by the current user. These files are:\n - #{files_not_readable_or_writable.join("\n - ")}"
-
-        ok = false
-      end
-
-      ok
+  class CLI::Doctor < Thor
+    default_command(:diagnose)
+
+    desc "diagnose [OPTIONS]", "Checks the bundle for common problems"
+    long_desc <<-D
+      Doctor scans the OS dependencies of each of the gems requested in the Gemfile. If
+      missing dependencies are detected, Bundler prints them and exits status 1.
+      Otherwise, Bundler prints a success message and exits with a status of 0.
+    D
+    method_option "gemfile", type: :string, banner: "Use the specified gemfile instead of Gemfile"
+    method_option "quiet", type: :boolean, banner: "Only output warnings and errors."
+    method_option "ssl", type: :boolean, default: false, banner: "Diagnose SSL problems."
+    def diagnose
+      require_relative "doctor/diagnose"
+      Diagnose.new(options).run
+    end
+
+    desc "ssl [OPTIONS]", "Diagnose SSL problems"
+    long_desc <<-D
+      Diagnose SSL problems, especially related to certificates or TLS version while connecting to https://rubygems.org.
+    D
+    method_option "host", type: :string, banner: "The host to diagnose."
+    method_option "tls-version", type: :string, banner: "Specify the SSL/TLS version when running the diagnostic. Accepts either <1.1> or <1.2>"
+    method_option "verify-mode", type: :string, banner: "Specify the mode used for certification verification. Accepts either <peer> or <none>"
+    def ssl
+      require_relative "doctor/ssl"
+      SSL.new(options).run
     end
   end
 end
diff --git a/lib/bundler/cli/doctor/diagnose.rb b/lib/bundler/cli/doctor/diagnose.rb
new file mode 100644
index 00000000000000..a878025ddafd80
--- /dev/null
+++ b/lib/bundler/cli/doctor/diagnose.rb
@@ -0,0 +1,167 @@
+# frozen_string_literal: true
+
+require "rbconfig"
+require "shellwords"
+
+module Bundler
+  class CLI::Doctor::Diagnose
+    DARWIN_REGEX = /\s+(.+) \(compatibility /
+    LDD_REGEX = /\t\S+ => (\S+) \(\S+\)/
+
+    attr_reader :options
+
+    def initialize(options)
+      @options = options
+    end
+
+    def otool_available?
+      Bundler.which("otool")
+    end
+
+    def ldd_available?
+      Bundler.which("ldd")
+    end
+
+    def dylibs_darwin(path)
+      output = `/usr/bin/otool -L #{path.shellescape}`.chomp
+      dylibs = output.split("\n")[1..-1].filter_map {|l| l.match(DARWIN_REGEX)&.match(1) }.uniq
+      # ignore @rpath and friends
+      dylibs.reject {|dylib| dylib.start_with? "@" }
+    end
+
+    def dylibs_ldd(path)
+      output = `/usr/bin/ldd #{path.shellescape}`.chomp
+      output.split("\n").filter_map do |l|
+        match = l.match(LDD_REGEX)
+        next if match.nil?
+        match.captures[0]
+      end
+    end
+
+    def dylibs(path)
+      case RbConfig::CONFIG["host_os"]
+      when /darwin/
+        return [] unless otool_available?
+        dylibs_darwin(path)
+      when /(linux|solaris|bsd)/
+        return [] unless ldd_available?
+        dylibs_ldd(path)
+      else # Windows, etc.
+        Bundler.ui.warn("Dynamic library check not supported on this platform.")
+        []
+      end
+    end
+
+    def bundles_for_gem(spec)
+      Dir.glob("#{spec.full_gem_path}/**/*.bundle")
+    end
+
+    def lookup_with_fiddle(path)
+      require "fiddle"
+      Fiddle.dlopen(path)
+      false
+    rescue Fiddle::DLError
+      true
+    end
+
+    def check!
+      require_relative "../check"
+      Bundler::CLI::Check.new({}).run
+    end
+
+    def diagnose_ssl
+      require_relative "ssl"
+      Bundler::CLI::Doctor::SSL.new({}).run
+    end
+
+    def run
+      Bundler.ui.level = "warn" if options[:quiet]
+      Bundler.settings.validate!
+      check!
+      diagnose_ssl if options[:ssl]
+
+      definition = Bundler.definition
+      broken_links = {}
+
+      definition.specs.each do |spec|
+        bundles_for_gem(spec).each do |bundle|
+          bad_paths = dylibs(bundle).select do |f|
+            lookup_with_fiddle(f)
+          end
+          if bad_paths.any?
+            broken_links[spec] ||= []
+            broken_links[spec].concat(bad_paths)
+          end
+        end
+      end
+
+      permissions_valid = check_home_permissions
+
+      if broken_links.any?
+        message = "The following gems are missing OS dependencies:"
+        broken_links.flat_map do |spec, paths|
+          paths.uniq.map do |path|
+            "\n * #{spec.name}: #{path}"
+          end
+        end.sort.each {|m| message += m }
+        raise ProductionError, message
+      elsif permissions_valid
+        Bundler.ui.info "No issues found with the installed bundle"
+      end
+    end
+
+    private
+
+    def check_home_permissions
+      require "find"
+      files_not_readable = []
+      files_not_readable_and_owned_by_different_user = []
+      files_not_owned_by_current_user_but_still_readable = []
+      broken_symlinks = []
+      Find.find(Bundler.bundle_path.to_s).each do |f|
+        if !File.exist?(f)
+          broken_symlinks << f
+        elsif !File.readable?(f)
+          if File.stat(f).uid != Process.uid
+            files_not_readable_and_owned_by_different_user << f
+          else
+            files_not_readable << f
+          end
+        elsif File.stat(f).uid != Process.uid
+          files_not_owned_by_current_user_but_still_readable << f
+        end
+      end
+
+      ok = true
+
+      if broken_symlinks.any?
+        Bundler.ui.warn "Broken links exist in the Bundler home. Please report them to the offending gem's upstream repo. These files are:\n - #{broken_symlinks.join("\n - ")}"
+
+        ok = false
+      end
+
+      if files_not_owned_by_current_user_but_still_readable.any?
+        Bundler.ui.warn "Files exist in the Bundler home that are owned by another " \
+          "user, but are still readable. These files are:\n - #{files_not_owned_by_current_user_but_still_readable.join("\n - ")}"
+
+        ok = false
+      end
+
+      if files_not_readable_and_owned_by_different_user.any?
+        Bundler.ui.warn "Files exist in the Bundler home that are owned by another " \
+          "user, and are not readable. These files are:\n - #{files_not_readable_and_owned_by_different_user.join("\n - ")}"
+
+        ok = false
+      end
+
+      if files_not_readable.any?
+        Bundler.ui.warn "Files exist in the Bundler home that are not " \
+          "readable by the current user. These files are:\n - #{files_not_readable.join("\n - ")}"
+
+        ok = false
+      end
+
+      ok
+    end
+  end
+end
diff --git a/lib/bundler/cli/doctor/ssl.rb b/lib/bundler/cli/doctor/ssl.rb
new file mode 100644
index 00000000000000..21fc4edf2d39c8
--- /dev/null
+++ b/lib/bundler/cli/doctor/ssl.rb
@@ -0,0 +1,249 @@
+# frozen_string_literal: true
+
+require "rubygems/remote_fetcher"
+require "uri"
+
+module Bundler
+  class CLI::Doctor::SSL
+    attr_reader :options
+
+    def initialize(options)
+      @options = options
+    end
+
+    def run
+      return unless openssl_installed?
+
+      output_ssl_environment
+      bundler_success = bundler_connection_successful?
+      rubygem_success = rubygem_connection_successful?
+
+      return unless net_http_connection_successful?
+
+      Explanation.summarize(bundler_success, rubygem_success, host)
+    end
+
+    private
+
+    def host
+      @options[:host] || "rubygems.org"
+    end
+
+    def tls_version
+      @options[:"tls-version"].then do |version|
+        "TLS#{version.sub(".", "_")}".to_sym if version
+      end
+    end
+
+    def verify_mode
+      mode = @options[:"verify-mode"] || :peer
+
+      @verify_mode ||= mode.then {|mod| OpenSSL::SSL.const_get("verify_#{mod}".upcase) }
+    end
+
+    def uri
+      @uri ||= URI("https://#{host}")
+    end
+
+    def openssl_installed?
+      require "openssl"
+
+      true
+    rescue LoadError
+      Bundler.ui.warn(<<~MSG)
+        Oh no! Your Ruby doesn't have OpenSSL, so it can't connect to #{host}.
+        You'll need to recompile or reinstall Ruby with OpenSSL support and try again.
+      MSG
+
+      false
+    end
+
+    def output_ssl_environment
+      Bundler.ui.info(<<~MESSAGE)
+        Here's your OpenSSL environment:
+
+        OpenSSL:       #{OpenSSL::VERSION}
+        Compiled with: #{OpenSSL::OPENSSL_VERSION}
+        Loaded with:   #{OpenSSL::OPENSSL_LIBRARY_VERSION}
+      MESSAGE
+    end
+
+    def bundler_connection_successful?
+      Bundler.ui.info("\nTrying connections to #{uri}:\n")
+
+      bundler_uri = Gem::URI(uri.to_s)
+      Bundler::Fetcher.new(
+        Bundler::Source::Rubygems::Remote.new(bundler_uri)
+      ).send(:connection).request(bundler_uri)
+
+      Bundler.ui.info("Bundler:       success")
+
+      true
+    rescue StandardError => error
+      Bundler.ui.warn("Bundler:       failed     (#{Explanation.explain_bundler_or_rubygems_error(error)})")
+
+      false
+    end
+
+    def rubygem_connection_successful?
+      Gem::RemoteFetcher.fetcher.fetch_path(uri)
+      Bundler.ui.info("RubyGems:      success")
+
+      true
+    rescue StandardError => error
+      Bundler.ui.warn("RubyGems:      failed     (#{Explanation.explain_bundler_or_rubygems_error(error)})")
+
+      false
+    end
+
+    def net_http_connection_successful?
+      ::Gem::Net::HTTP.new(uri.host, uri.port).tap do |http|
+        http.use_ssl = true
+        http.min_version = tls_version
+        http.max_version = tls_version
+        http.verify_mode = verify_mode
+      end.start
+
+      Bundler.ui.info("Ruby net/http: success")
+      warn_on_unsupported_tls12
+
+      true
+    rescue StandardError => error
+      Bundler.ui.warn(<<~MSG)
+        Ruby net/http: failed
+
+        Unfortunately, this Ruby can't connect to #{host}.
+
+        #{Explanation.explain_net_http_error(error, host, tls_version)}
+      MSG
+
+      false
+    end
+
+    def warn_on_unsupported_tls12
+      ctx = OpenSSL::SSL::SSLContext.new
+      supported = true
+
+      if ctx.respond_to?(:min_version=)
+        begin
+          ctx.min_version = ctx.max_version = OpenSSL::SSL::TLS1_2_VERSION
+        rescue OpenSSL::SSL::SSLError, NameError
+          supported = false
+        end
+      else
+        supported = OpenSSL::SSL::SSLContext::METHODS.include?(:TLSv1_2) # rubocop:disable Naming/VariableNumber
+      end
+
+      Bundler.ui.warn(<<~EOM) unless supported
+
+        WARNING: Although your Ruby can connect to #{host} today, your OpenSSL is very old!
+        WARNING: You will need to upgrade OpenSSL to use #{host}.
+
+      EOM
+    end
+
+    module Explanation
+      extend self
+
+      def explain_bundler_or_rubygems_error(error)
+        case error.message
+        when /certificate verify failed/
+          "certificate verification"
+        when /read server hello A/
+          "SSL/TLS protocol version mismatch"
+        when /tlsv1 alert protocol version/
+          "requested TLS version is too old"
+        else
+          error.message
+        end
+      end
+
+      def explain_net_http_error(error, host, tls_version)
+        case error.message
+        # Check for certificate errors
+        when /certificate verify failed/
+          <<~MSG
+            #{show_ssl_certs}
+            Your Ruby can't connect to #{host} because you are missing the certificate files OpenSSL needs to verify you are connecting to the genuine #{host} servers.
+          MSG
+        # Check for TLS version errors
+        when /read server hello A/, /tlsv1 alert protocol version/
+          if tls_version.to_s == "TLS1_3"
+            "Your Ruby can't connect to #{host} because #{tls_version} isn't supported yet.\n"
+          else
+            <<~MSG
+              Your Ruby can't connect to #{host} because your version of OpenSSL is too old.
+              You'll need to upgrade your OpenSSL install and/or recompile Ruby to use a newer OpenSSL.
+            MSG
+          end
+        # OpenSSL doesn't support TLS version specified by argument
+        when /unknown SSL method/
+          "Your Ruby can't connect because #{tls_version} isn't supported by your version of OpenSSL."
+        else
+          <<~MSG
+            Even worse, we're not sure why.
+
+            Here's the full error information:
+            #{error.class}: #{error.message}
+              #{error.backtrace.join("\n  ")}
+
+            You might have more luck using Mislav's SSL doctor.rb script. You can get it here:
+            https://github.com/mislav/ssl-tools/blob/8b3dec4/doctor.rb
+
+            Read more about the script and how to use it in this blog post:
+            https://mislav.net/2013/07/ruby-openssl/
+          MSG
+        end
+      end
+
+      def summarize(bundler_success, rubygems_success, host)
+        guide_url = "http://ruby.to/ssl-check-failed"
+
+        message = if bundler_success && rubygems_success
+          <<~MSG
+            Hooray! This Ruby can connect to #{host}.
+            You are all set to use Bundler and RubyGems.
+
+          MSG
+        elsif !bundler_success && !rubygems_success
+          <<~MSG
+            For some reason, your Ruby installation can connect to #{host}, but neither RubyGems nor Bundler can.
+            The most likely fix is to manually upgrade RubyGems by following the instructions at #{guide_url}.
+            After you've done that, run `gem install bundler` to upgrade Bundler, and then run this script again to make sure everything worked. ❣
+
+          MSG
+        elsif !bundler_success
+          <<~MSG
+            Although your Ruby installation and RubyGems can both connect to #{host}, Bundler is having trouble.
+            The most likely way to fix this is to upgrade Bundler by running `gem install bundler`.
+            Run this script again after doing that to make sure everything is all set.
+            If you're still having trouble, check out the troubleshooting guide at #{guide_url}.
+
+          MSG
+        else
+          <<~MSG
+            It looks like Ruby and Bundler can connect to #{host}, but RubyGems itself cannot.
+            You can likely solve this by manually downloading and installing a RubyGems update.
+            Visit #{guide_url} for instructions on how to manually upgrade RubyGems.
+
+          MSG
+        end
+
+        Bundler.ui.info("\n#{message}")
+      end
+
+      private
+
+      def show_ssl_certs
+        ssl_cert_file = ENV["SSL_CERT_FILE"] || OpenSSL::X509::DEFAULT_CERT_FILE
+        ssl_cert_dir  = ENV["SSL_CERT_DIR"]  || OpenSSL::X509::DEFAULT_CERT_DIR
+
+        <<~MSG
+          Below affect only Ruby net/http connections:
+          SSL_CERT_FILE: #{File.exist?(ssl_cert_file) ? "exists     #{ssl_cert_file}" : "is missing #{ssl_cert_file}"}
+          SSL_CERT_DIR:  #{Dir.exist?(ssl_cert_dir)   ? "exists     #{ssl_cert_dir}"  : "is missing #{ssl_cert_dir}"}
+        MSG
+      end
+    end
+  end
+end
diff --git a/lib/bundler/cli/exec.rb b/lib/bundler/cli/exec.rb
index 42b602a05522f2..9428e9db3bf8d7 100644
--- a/lib/bundler/cli/exec.rb
+++ b/lib/bundler/cli/exec.rb
@@ -12,7 +12,7 @@ def initialize(options, args)
       @options = options
       @cmd = args.shift
       @args = args
-      @args << { :close_others => !options.keep_file_descriptors? } unless Bundler.current_ruby.jruby?
+      @args << { close_others: !options.keep_file_descriptors? } unless Bundler.current_ruby.jruby?
     end
 
     def run
@@ -22,6 +22,7 @@ def run
         if !Bundler.settings[:disable_exec_load] && ruby_shebang?(bin_path)
           return kernel_load(bin_path, *args)
         end
+        bin_path = "./" + bin_path unless File.absolute_path?(bin_path)
         kernel_exec(bin_path, *args)
       else
         # exec using the given command
diff --git a/lib/bundler/cli/fund.rb b/lib/bundler/cli/fund.rb
index 52db5aef68ae58..ad7f31f3d668d6 100644
--- a/lib/bundler/cli/fund.rb
+++ b/lib/bundler/cli/fund.rb
@@ -16,7 +16,7 @@ def run
       deps = if groups.any?
         Bundler.definition.dependencies_for(groups)
       else
-        Bundler.definition.current_dependencies
+        Bundler.definition.requested_dependencies
       end
 
       fund_info = deps.each_with_object([]) do |dep, arr|
diff --git a/lib/bundler/cli/gem.rb b/lib/bundler/cli/gem.rb
index 1645283a2c7ab3..5b71d71c67133b 100644
--- a/lib/bundler/cli/gem.rb
+++ b/lib/bundler/cli/gem.rb
@@ -11,7 +11,7 @@ class CLI
   class CLI::Gem
     TEST_FRAMEWORK_VERSIONS = {
       "rspec" => "3.0",
-      "minitest" => "5.0",
+      "minitest" => "5.16",
       "test-unit" => "3.0",
     }.freeze
 
@@ -31,8 +31,6 @@ def initialize(options, gem_name, thor)
       @extension = options[:ext]
 
       validate_ext_name if @extension
-      validate_rust_builder_rubygems_version if @extension == "rust"
-      travis_removal_info
     end
 
     def run
@@ -49,38 +47,46 @@ def run
       git_author_name = use_git ? `git config user.name`.chomp : ""
       git_username = use_git ? `git config github.user`.chomp : ""
       git_user_email = use_git ? `git config user.email`.chomp : ""
+      github_username = github_username(git_username)
 
-      github_username = if options[:github_username].nil?
-        git_username
-      elsif options[:github_username] == false
-        ""
+      if github_username.empty?
+        homepage_uri = "TODO: Put your gem's website or public repo URL here."
+        source_code_uri = "TODO: Put your gem's public repo URL here."
+        changelog_uri = "TODO: Put your gem's CHANGELOG.md URL here."
       else
-        options[:github_username]
+        homepage_uri = "https://github.com/#{github_username}/#{name}"
+        source_code_uri = "https://github.com/#{github_username}/#{name}"
+        changelog_uri = "https://github.com/#{github_username}/#{name}/blob/main/CHANGELOG.md"
       end
 
       config = {
-        :name => name,
-        :underscored_name => underscored_name,
-        :namespaced_path => namespaced_path,
-        :makefile_path => "#{underscored_name}/#{underscored_name}",
-        :constant_name => constant_name,
-        :constant_array => constant_array,
-        :author => git_author_name.empty? ? "TODO: Write your name" : git_author_name,
-        :email => git_user_email.empty? ? "TODO: Write your email address" : git_user_email,
-        :test => options[:test],
-        :ext => extension,
-        :exe => options[:exe],
-        :bundler_version => bundler_dependency_version,
-        :git => use_git,
-        :github_username => github_username.empty? ? "[USERNAME]" : github_username,
-        :required_ruby_version => required_ruby_version,
-        :rust_builder_required_rubygems_version => rust_builder_required_rubygems_version,
-        :minitest_constant_name => minitest_constant_name,
+        name: name,
+        underscored_name: underscored_name,
+        namespaced_path: namespaced_path,
+        makefile_path: "#{underscored_name}/#{underscored_name}",
+        constant_name: constant_name,
+        constant_array: constant_array,
+        author: git_author_name.empty? ? "TODO: Write your name" : git_author_name,
+        email: git_user_email.empty? ? "TODO: Write your email address" : git_user_email,
+        test: options[:test],
+        ext: extension,
+        exe: options[:exe],
+        bundle: options[:bundle],
+        bundler_version: bundler_dependency_version,
+        git: use_git,
+        github_username: github_username.empty? ? "[USERNAME]" : github_username,
+        required_ruby_version: required_ruby_version,
+        rust_builder_required_rubygems_version: rust_builder_required_rubygems_version,
+        minitest_constant_name: minitest_constant_name,
+        ignore_paths: %w[bin/],
+        homepage_uri: homepage_uri,
+        source_code_uri: source_code_uri,
+        changelog_uri: changelog_uri,
       }
       ensure_safe_gem_name(name, constant_array)
 
       templates = {
-        "#{Bundler.preferred_gemfile_name}.tt" => Bundler.preferred_gemfile_name,
+        "Gemfile.tt" => Bundler.preferred_gemfile_name,
         "lib/newgem.rb.tt" => "lib/#{namespaced_path}.rb",
         "lib/newgem/version.rb.tt" => "lib/#{namespaced_path}/version.rb",
         "sig/newgem.rbs.tt" => "sig/#{namespaced_path}.rbs",
@@ -96,7 +102,18 @@ def run
         bin/setup
       ]
 
-      templates.merge!("gitignore.tt" => ".gitignore") if use_git
+      case Bundler.preferred_gemfile_name
+      when "Gemfile"
+        config[:ignore_paths] << "Gemfile"
+      when "gems.rb"
+        config[:ignore_paths] << "gems.rb"
+        config[:ignore_paths] << "gems.locked"
+      end
+
+      if use_git
+        templates.merge!("gitignore.tt" => ".gitignore")
+        config[:ignore_paths] << ".gitignore"
+      end
 
       if test_framework = ask_and_set_test_framework
         config[:test] = test_framework
@@ -110,6 +127,8 @@ def run
             "spec/newgem_spec.rb.tt" => "spec/#{namespaced_path}_spec.rb"
           )
           config[:test_task] = :spec
+          config[:ignore_paths] << ".rspec"
+          config[:ignore_paths] << "spec/"
         when "minitest"
           # Generate path for minitest target file (FileList["test/**/test_*.rb"])
           #   foo     => test/test_foo.rb
@@ -124,12 +143,14 @@ def run
             "test/minitest/test_newgem.rb.tt" => "test/#{minitest_namespaced_path}.rb"
           )
           config[:test_task] = :test
+          config[:ignore_paths] << "test/"
         when "test-unit"
           templates.merge!(
             "test/test-unit/test_helper.rb.tt" => "test/test_helper.rb",
             "test/test-unit/newgem_test.rb.tt" => "test/#{namespaced_path}_test.rb"
           )
           config[:test_task] = :test
+          config[:ignore_paths] << "test/"
         end
       end
 
@@ -137,16 +158,19 @@ def run
       case config[:ci]
       when "github"
         templates.merge!("github/workflows/main.yml.tt" => ".github/workflows/main.yml")
+        config[:ignore_paths] << ".github/"
       when "gitlab"
         templates.merge!("gitlab-ci.yml.tt" => ".gitlab-ci.yml")
+        config[:ignore_paths] << ".gitlab-ci.yml"
       when "circle"
         templates.merge!("circleci/config.yml.tt" => ".circleci/config.yml")
+        config[:ignore_paths] << ".circleci/"
       end
 
       if ask_and_set(:mit, "Do you want to license your code permissively under the MIT license?",
-        "This means that any other developer or company will be legally allowed to use your code " \
-        "for free as long as they admit you created it. You can read more about the MIT license " \
-        "at https://choosealicense.com/licenses/mit.")
+        "Using a MIT license means that any other developer or company will be legally allowed " \
+        "to use your code for free as long as they admit you created it. You can read more about " \
+        "the MIT license at https://choosealicense.com/licenses/mit.")
         config[:mit] = true
         Bundler.ui.info "MIT License enabled in config"
         templates.merge!("LICENSE.txt.tt" => "LICENSE.txt")
@@ -183,13 +207,18 @@ def run
         config[:linter_version] = rubocop_version
         Bundler.ui.info "RuboCop enabled in config"
         templates.merge!("rubocop.yml.tt" => ".rubocop.yml")
+        config[:ignore_paths] << ".rubocop.yml"
       when "standard"
         config[:linter_version] = standard_version
         Bundler.ui.info "Standard enabled in config"
         templates.merge!("standard.yml.tt" => ".standard.yml")
+        config[:ignore_paths] << ".standard.yml"
       end
 
-      templates.merge!("exe/newgem.tt" => "exe/#{name}") if config[:exe]
+      if config[:exe]
+        templates.merge!("exe/newgem.tt" => "exe/#{name}")
+        executables.push("exe/#{name}")
+      end
 
       if extension == "c"
         templates.merge!(
@@ -214,7 +243,7 @@ def run
       end
 
       if use_git
-        Bundler.ui.info "Initializing git repo in #{target}"
+        Bundler.ui.info "\nInitializing git repo in #{target}"
         require "shellwords"
         `git init #{target.to_s.shellescape}`
 
@@ -233,15 +262,20 @@ def run
       end
 
       if use_git
+        IO.popen(%w[git add .], { chdir: target }, &:read)
+      end
+
+      if config[:bundle]
+        Bundler.ui.info "Running bundle install in the new gem directory."
         Dir.chdir(target) do
-          `git add .`
+          system("bundle install")
         end
       end
 
       # Open gemspec in editor
       open_editor(options["edit"], target.join("#{name}.gemspec")) if options[:edit]
 
-      Bundler.ui.info "Gem '#{name}' was successfully created. " \
+      Bundler.ui.info "\nGem '#{name}' was successfully created. " \
         "For more information on making a RubyGem visit https://bundler.io/guides/creating_gem.html"
     end
 
@@ -251,13 +285,13 @@ def resolve_name(name)
       SharedHelpers.pwd.join(name).basename.to_s
     end
 
-    def ask_and_set(key, header, message)
+    def ask_and_set(key, prompt, explanation)
       choice = options[key]
       choice = Bundler.settings["gem.#{key}"] if choice.nil?
 
       if choice.nil?
-        Bundler.ui.confirm header
-        choice = Bundler.ui.yes? "#{message} y/(n):"
+        Bundler.ui.info "\n#{explanation}"
+        choice = Bundler.ui.yes? "#{prompt} y/(n):"
         Bundler.settings.set_global("gem.#{key}", choice)
       end
 
@@ -275,10 +309,11 @@ def validate_ext_name
     end
 
     def ask_and_set_test_framework
+      return if skip?(:test)
       test_framework = options[:test] || Bundler.settings["gem.test"]
 
       if test_framework.to_s.empty?
-        Bundler.ui.confirm "Do you want to generate tests with your gem?"
+        Bundler.ui.info "\nDo you want to generate tests with your gem?"
         Bundler.ui.info hint_text("test")
 
         result = Bundler.ui.ask "Enter a test framework. rspec/minitest/test-unit/(none):"
@@ -300,6 +335,10 @@ def ask_and_set_test_framework
       test_framework
     end
 
+    def skip?(option)
+      options.key?(option) && options[option].nil?
+    end
+
     def hint_text(setting)
       if Bundler.settings["gem.#{setting}"] == false
         "Your choice will only be applied to this gem."
@@ -310,15 +349,15 @@ def hint_text(setting)
     end
 
     def ask_and_set_ci
+      return if skip?(:ci)
       ci_template = options[:ci] || Bundler.settings["gem.ci"]
 
       if ci_template.to_s.empty?
-        Bundler.ui.confirm "Do you want to set up continuous integration for your gem? " \
+        Bundler.ui.info "\nDo you want to set up continuous integration for your gem? " \
           "Supported services:\n" \
           "* CircleCI:       https://circleci.com/\n" \
           "* GitHub Actions: https://github.com/features/actions\n" \
-          "* GitLab CI:      https://docs.gitlab.com/ee/ci/\n" \
-          "\n"
+          "* GitLab CI:      https://docs.gitlab.com/ee/ci/\n"
         Bundler.ui.info hint_text("ci")
 
         result = Bundler.ui.ask "Enter a CI service. github/gitlab/circle/(none):"
@@ -341,15 +380,15 @@ def ask_and_set_ci
     end
 
     def ask_and_set_linter
+      return if skip?(:linter)
       linter_template = options[:linter] || Bundler.settings["gem.linter"]
       linter_template = deprecated_rubocop_option if linter_template.nil?
 
       if linter_template.to_s.empty?
-        Bundler.ui.confirm "Do you want to add a code linter and formatter to your gem? " \
+        Bundler.ui.info "\nDo you want to add a code linter and formatter to your gem? " \
           "Supported Linters:\n" \
           "* RuboCop:       https://rubocop.org\n" \
-          "* Standard:      https://github.com/standardrb/standard\n" \
-          "\n"
+          "* Standard:      https://github.com/standardrb/standard\n"
         Bundler.ui.info hint_text("linter")
 
         result = Bundler.ui.ask "Enter a linter. rubocop/standard/(none):"
@@ -379,15 +418,20 @@ def ask_and_set_linter
     def deprecated_rubocop_option
       if !options[:rubocop].nil?
         if options[:rubocop]
-          Bundler::SharedHelpers.major_deprecation 2, "--rubocop is deprecated, use --linter=rubocop"
+          Bundler::SharedHelpers.major_deprecation 2,
+            "--rubocop is deprecated, use --linter=rubocop",
+            removed_message: "--rubocop has been removed, use --linter=rubocop"
           "rubocop"
         else
-          Bundler::SharedHelpers.major_deprecation 2, "--no-rubocop is deprecated, use --linter"
+          Bundler::SharedHelpers.major_deprecation 2,
+            "--no-rubocop is deprecated, use --linter",
+            removed_message: "--no-rubocop has been removed, use --linter"
           false
         end
       elsif !Bundler.settings["gem.rubocop"].nil?
         Bundler::SharedHelpers.major_deprecation 2,
-          "config gem.rubocop is deprecated; we've updated your config to use gem.linter instead"
+          "config gem.rubocop is deprecated; we've updated your config to use gem.linter instead",
+          removed_message: "config gem.rubocop has been removed; we've updated your config to use gem.linter instead"
         Bundler.settings["gem.rubocop"] ? "rubocop" : false
       end
     end
@@ -431,7 +475,7 @@ def rust_builder_required_rubygems_version
     end
 
     def required_ruby_version
-      "2.6.0"
+      "3.2.0"
     end
 
     def rubocop_version
@@ -442,23 +486,13 @@ def standard_version
       "1.3"
     end
 
-    # TODO: remove at next minor release
-    def travis_removal_info
-      if options[:ci] == "travis"
-        Bundler.ui.error "Support for Travis CI was removed from gem skeleton generator."
-        exit 1
-      end
-
-      if Bundler.settings["gem.ci"] == "travis"
-        Bundler.ui.error "Support for Travis CI was removed from gem skeleton generator, but it is present in bundle config. Please configure another provider using `bundle config set gem.ci SERVICE` (where SERVICE is one of github/gitlab/circle) or unset configuration using `bundle config unset gem.ci`."
-        exit 1
-      end
-    end
-
-    def validate_rust_builder_rubygems_version
-      if Gem::Version.new(rust_builder_required_rubygems_version) > Gem.rubygems_version
-        Bundler.ui.error "Your RubyGems version (#{Gem.rubygems_version}) is too old to build Rust extension. Please update your RubyGems using `gem update --system` or any other way and try again."
-        exit 1
+    def github_username(git_username)
+      if options[:github_username].nil?
+        git_username
+      elsif options[:github_username] == false
+        ""
+      else
+        options[:github_username]
       end
     end
   end
diff --git a/lib/bundler/cli/info.rb b/lib/bundler/cli/info.rb
index 36c7a58f122a7e..cd01d4949bc98b 100644
--- a/lib/bundler/cli/info.rb
+++ b/lib/bundler/cli/info.rb
@@ -25,19 +25,8 @@ def run
 
     private
 
-    def spec_for_gem(gem_name)
-      spec = Bundler.definition.specs.find {|s| s.name == gem_name }
-      spec || default_gem_spec(gem_name) || Bundler::CLI::Common.select_spec(gem_name, :regex_match)
-    end
-
-    def default_gem_spec(gem_name)
-      return unless Gem::Specification.respond_to?(:find_all_by_name)
-      gem_spec = Gem::Specification.find_all_by_name(gem_name).last
-      return gem_spec if gem_spec&.default_gem?
-    end
-
-    def spec_not_found(gem_name)
-      raise GemNotFound, Bundler::CLI::Common.gem_not_found_message(gem_name, Bundler.definition.dependencies)
+    def spec_for_gem(name)
+      Bundler::CLI::Common.select_spec(name, :regex_match)
     end
 
     def print_gem_version(spec)
@@ -50,8 +39,8 @@ def print_gem_path(spec)
         path = File.expand_path("../../..", __dir__)
       else
         path = spec.full_gem_path
-        if spec.deleted_gem?
-          return Bundler.ui.warn "The gem #{name} has been deleted. It was installed at: #{path}"
+        if spec.installation_missing?
+          return Bundler.ui.warn "The gem #{name} is missing. It should be installed at #{path}, but was not found"
         end
       end
 
@@ -76,19 +65,19 @@ def print_gem_info(spec)
       gem_info << "\tDefault Gem: yes\n" if spec.respond_to?(:default_gem?) && spec.default_gem?
       gem_info << "\tReverse Dependencies: \n\t\t#{gem_dependencies.join("\n\t\t")}" if gem_dependencies.any?
 
-      if name != "bundler" && spec.deleted_gem?
-        return Bundler.ui.warn "The gem #{name} has been deleted. Gemspec information is still available though:\n#{gem_info}"
+      if name != "bundler" && spec.installation_missing?
+        return Bundler.ui.warn "The gem #{name} is missing. Gemspec information is still available though:\n#{gem_info}"
       end
 
       Bundler.ui.info gem_info
     end
 
     def gem_dependencies
-      @gem_dependencies ||= Bundler.definition.specs.map do |spec|
+      @gem_dependencies ||= Bundler.definition.specs.filter_map do |spec|
         dependency = spec.dependencies.find {|dep| dep.name == gem_name }
         next unless dependency
         "#{spec.name} (#{spec.version}) depends on #{gem_name} (#{dependency.requirements_list.join(", ")})"
-      end.compact.sort
+      end.sort
     end
   end
 end
diff --git a/lib/bundler/cli/inject.rb b/lib/bundler/cli/inject.rb
index 8093a8528333a8..a09d5c6bda1347 100644
--- a/lib/bundler/cli/inject.rb
+++ b/lib/bundler/cli/inject.rb
@@ -35,8 +35,8 @@ def run
         Bundler.ui.confirm(added.map do |d|
           name = "'#{d.name}'"
           requirement = ", '#{d.requirement}'"
-          group = ", :group => #{d.groups.inspect}" if d.groups != Array(:default)
-          source = ", :source => '#{d.source}'" unless d.source.nil?
+          group = ", group: #{d.groups.inspect}" if d.groups != Array(:default)
+          source = ", source: '#{d.source}'" unless d.source.nil?
           %(gem #{name}#{requirement}#{group}#{source})
         end.join("\n"))
       else
@@ -48,7 +48,7 @@ def run
 
     def last_version_number
       definition = Bundler.definition(true)
-      definition.resolve_remotely!
+      definition.remotely!
       specs = definition.index[name].sort_by(&:version)
       unless options[:pre]
         specs.delete_if {|b| b.respond_to?(:version) && b.version.prerelease? }
diff --git a/lib/bundler/cli/install.rb b/lib/bundler/cli/install.rb
index c71bcf159f0861..c31be40e551c35 100644
--- a/lib/bundler/cli/install.rb
+++ b/lib/bundler/cli/install.rb
@@ -12,24 +12,33 @@ def run
 
       warn_if_root
 
-      Bundler.self_manager.install_locked_bundler_and_restart_with_it_if_needed
+      if options[:local]
+        Bundler.self_manager.restart_with_locked_bundler_if_needed
+      else
+        Bundler.self_manager.install_locked_bundler_and_restart_with_it_if_needed
+      end
 
-      Bundler::SharedHelpers.set_env "RB_USER_INSTALL", "1" if Bundler::FREEBSD
+      Bundler::SharedHelpers.set_env "RB_USER_INSTALL", "1" if Gem.freebsd_platform?
 
       # Disable color in deployment mode
       Bundler.ui.shell = Thor::Shell::Basic.new if options[:deployment]
 
+      if target_rbconfig_path = options[:"target-rbconfig"]
+        Bundler.rubygems.set_target_rbconfig(target_rbconfig_path)
+      end
+
       check_for_options_conflicts
 
       check_trust_policy
 
       if options[:deployment] || options[:frozen] || Bundler.frozen_bundle?
         unless Bundler.default_lockfile.exist?
-          flag   = "--deployment flag" if options[:deployment]
-          flag ||= "--frozen flag"     if options[:frozen]
-          flag ||= "deployment setting"
-          raise ProductionError, "The #{flag} requires a #{Bundler.default_lockfile.relative_path_from(SharedHelpers.pwd)}. Please make " \
-                                 "sure you have checked your #{Bundler.default_lockfile.relative_path_from(SharedHelpers.pwd)} into version control " \
+          flag = "--deployment flag" if options[:deployment]
+          flag ||= "--frozen flag" if options[:frozen]
+          flag ||= "deployment setting" if Bundler.settings[:deployment]
+          flag ||= "frozen setting" if Bundler.settings[:frozen]
+          raise ProductionError, "The #{flag} requires a lockfile. Please make " \
+                                 "sure you have checked your #{SharedHelpers.relative_lockfile_path} into version control " \
                                  "before deploying."
         end
 
@@ -51,17 +60,20 @@ def run
 
       if options["binstubs"]
         Bundler::SharedHelpers.major_deprecation 2,
-          "The --binstubs option will be removed in favor of `bundle binstubs --all`"
+          "The --binstubs option will be removed in favor of `bundle binstubs --all`",
+          removed_message: "The --binstubs option have been removed in favor of `bundle binstubs --all`"
       end
 
       Plugin.gemfile_install(Bundler.default_gemfile) if Bundler.feature_flag.plugins?
 
-      definition = Bundler.definition
+      # For install we want to enable strict validation
+      # (rather than some optimizations we perform at app runtime).
+      definition = Bundler.definition(strict: true)
       definition.validate_runtime!
 
       installer = Installer.install(Bundler.root, definition, options)
 
-      Bundler.settings.temporary(:cache_all_platforms => options[:local] ? false : Bundler.settings[:cache_all_platforms]) do
+      Bundler.settings.temporary(cache_all_platforms: options[:local] ? false : Bundler.settings[:cache_all_platforms]) do
         Bundler.load.cache(nil, options[:local]) if Bundler.app_cache.exist? && !options["no-cache"] && !Bundler.frozen_bundle?
       end
 
@@ -95,7 +107,7 @@ def run
     def warn_if_root
       return if Bundler.settings[:silence_root_warning] || Gem.win_platform? || !Process.uid.zero?
       Bundler.ui.warn "Don't run Bundler as root. Installing your bundle as root " \
-                      "will break this application for all non-root users on this machine.", :wrap => true
+                      "will break this application for all non-root users on this machine.", wrap: true
     end
 
     def dependencies_count_for(definition)
@@ -148,9 +160,7 @@ def normalize_settings
       Bundler.settings.set_command_option_if_given :path, options[:path]
 
       if options["standalone"] && Bundler.settings[:path].nil? && !options["local"]
-        Bundler.settings.temporary(:path_relative_to_cwd => false) do
-          Bundler.settings.set_command_option :path, "bundle"
-        end
+        Bundler.settings.set_command_option :path, "bundle"
       end
 
       bin_option = options["binstubs"]
diff --git a/lib/bundler/cli/issue.rb b/lib/bundler/cli/issue.rb
index 5f2924c4bdb58d..fbe9184d121f50 100644
--- a/lib/bundler/cli/issue.rb
+++ b/lib/bundler/cli/issue.rb
@@ -10,7 +10,7 @@ def run
         be sure to check out these resources:
 
         1. Check out our troubleshooting guide for quick fixes to common issues:
-        https://github.com/rubygems/rubygems/blob/master/bundler/doc/TROUBLESHOOTING.md
+        https://github.com/rubygems/rubygems/blob/master/doc/bundler/TROUBLESHOOTING.md
 
         2. Instructions for common Bundler uses can be found on the documentation
         site: https://bundler.io/
@@ -34,8 +34,8 @@ def run
     end
 
     def doctor
-      require_relative "doctor"
-      Bundler::CLI::Doctor.new({}).run
+      require_relative "doctor/diagnose"
+      Bundler::CLI::Doctor::Diagnose.new({}).run
     end
   end
 end
diff --git a/lib/bundler/cli/lock.rb b/lib/bundler/cli/lock.rb
index cb3ed27138745b..b60c82e3a14a9a 100644
--- a/lib/bundler/cli/lock.rb
+++ b/lib/bundler/cli/lock.rb
@@ -14,9 +14,11 @@ def run
         exit 1
       end
 
+      check_for_conflicting_options
+
       print = options[:print]
-      previous_ui_level = Bundler.ui.level
-      Bundler.ui.level = "silent" if print
+      previous_output_stream = Bundler.ui.output_stream
+      Bundler.ui.output_stream = :stderr if print
 
       Bundler::Fetcher.disable_endpoint = options["full-index"]
 
@@ -26,45 +28,67 @@ def run
 
       if update.is_a?(Array) # unlocking specific gems
         Bundler::CLI::Common.ensure_all_gems_in_lockfile!(update)
-        update = { :gems => update, :conservative => conservative }
+        update = { gems: update, conservative: conservative }
       elsif update && conservative
-        update = { :conservative => conservative }
+        update = { conservative: conservative }
       elsif update && bundler
-        update = { :bundler => bundler }
+        update = { bundler: bundler }
       end
-      definition = Bundler.definition(update)
 
-      Bundler::CLI::Common.configure_gem_version_promoter(Bundler.definition, options) if options[:update]
+      file = options[:lockfile]
+      file = file ? Pathname.new(file).expand_path : Bundler.default_lockfile
 
-      options["remove-platform"].each do |platform|
-        definition.remove_platform(platform)
-      end
+      Bundler.settings.temporary(frozen: false) do
+        definition = Bundler.definition(update, file)
+        definition.add_checksums if options["add-checksums"]
 
-      options["add-platform"].each do |platform_string|
-        platform = Gem::Platform.new(platform_string)
-        if platform.to_s == "unknown"
-          Bundler.ui.warn "The platform `#{platform_string}` is unknown to RubyGems " \
-            "and adding it will likely lead to resolution errors"
+        Bundler::CLI::Common.configure_gem_version_promoter(definition, options) if options[:update]
+
+        options["remove-platform"].each do |platform_string|
+          platform = Gem::Platform.new(platform_string)
+          definition.remove_platform(platform)
+        end
+
+        options["add-platform"].each do |platform_string|
+          platform = Gem::Platform.new(platform_string)
+          if platform.to_s == "unknown"
+            Bundler.ui.error "The platform `#{platform_string}` is unknown to RubyGems and can't be added to the lockfile."
+            exit 1
+          end
+          definition.add_platform(platform)
+        end
+
+        if definition.platforms.empty?
+          raise InvalidOption, "Removing all platforms from the bundle is not allowed"
         end
-        definition.add_platform(platform)
-      end
 
-      if definition.platforms.empty?
-        raise InvalidOption, "Removing all platforms from the bundle is not allowed"
+        definition.remotely! unless options[:local]
+
+        if options["normalize-platforms"]
+          definition.normalize_platforms
+        end
+
+        if print
+          puts definition.to_lock
+        else
+          puts "Writing lockfile to #{file}"
+          definition.lock
+        end
       end
 
-      definition.resolve_remotely! unless options[:local]
+      Bundler.ui.output_stream = previous_output_stream
+    end
+
+    private
 
-      if print
-        puts definition.to_lock
-      else
-        file = options[:lockfile]
-        file = file ? File.expand_path(file) : Bundler.default_lockfile
-        puts "Writing lockfile to #{file}"
-        definition.lock(file)
+    def check_for_conflicting_options
+      if options["normalize-platforms"] && options["add-platform"].any?
+        raise InvalidOption, "--normalize-platforms can't be used with --add-platform"
       end
 
-      Bundler.ui.level = previous_ui_level
+      if options["normalize-platforms"] && options["remove-platform"].any?
+        raise InvalidOption, "--normalize-platforms can't be used with --remove-platform"
+      end
     end
   end
 end
diff --git a/lib/bundler/cli/open.rb b/lib/bundler/cli/open.rb
index 8522ec92d69f04..f24693b84367d6 100644
--- a/lib/bundler/cli/open.rb
+++ b/lib/bundler/cli/open.rb
@@ -18,13 +18,11 @@ def run
         Bundler.ui.info "Unable to open #{name} because it's a default gem, so the directory it would normally be installed to does not exist."
       else
         root_path = spec.full_gem_path
-        Dir.chdir(root_path) do
-          require "shellwords"
-          command = Shellwords.split(editor) << File.join([root_path, path].compact)
-          Bundler.with_original_env do
-            system(*command)
-          end || Bundler.ui.info("Could not run '#{command.join(" ")}'")
-        end
+        require "shellwords"
+        command = Shellwords.split(editor) << File.join([root_path, path].compact)
+        Bundler.with_original_env do
+          system(*command, { chdir: root_path })
+        end || Bundler.ui.info("Could not run '#{command.join(" ")}'")
       end
     end
   end
diff --git a/lib/bundler/cli/outdated.rb b/lib/bundler/cli/outdated.rb
index 68c701aefbbbd6..0c8ba3ebf73063 100644
--- a/lib/bundler/cli/outdated.rb
+++ b/lib/bundler/cli/outdated.rb
@@ -26,13 +26,15 @@ def initialize(options, gems)
     def run
       check_for_deployment_mode!
 
-      gems.each do |gem_name|
-        Bundler::CLI::Common.select_spec(gem_name)
-      end
-
       Bundler.definition.validate_runtime!
       current_specs = Bundler.ui.silence { Bundler.definition.resolve }
 
+      gems.each do |gem_name|
+        if current_specs[gem_name].empty?
+          raise GemNotFound, "Could not find gem '#{gem_name}'."
+        end
+      end
+
       current_dependencies = Bundler.ui.silence do
         Bundler.load.dependencies.map {|dep| [dep.name, dep] }.to_h
       end
@@ -41,12 +43,12 @@ def run
         # We're doing a full update
         Bundler.definition(true)
       else
-        Bundler.definition(:gems => gems, :sources => sources)
+        Bundler.definition(gems: gems, sources: sources)
       end
 
       Bundler::CLI::Common.configure_gem_version_promoter(
         Bundler.definition,
-        options.merge(:strict => @strict)
+        options.merge(strict: @strict)
       )
 
       definition_resolution = proc do
@@ -54,7 +56,7 @@ def run
       end
 
       if options[:parseable]
-        Bundler.ui.silence(&definition_resolution)
+        Bundler.ui.progress(&definition_resolution)
       else
         definition_resolution.call
       end
@@ -90,35 +92,33 @@ def run
         end
 
         outdated_gems << {
-          :active_spec => active_spec,
-          :current_spec => current_spec,
-          :dependency => dependency,
-          :groups => groups,
+          active_spec: active_spec,
+          current_spec: current_spec,
+          dependency: dependency,
+          groups: groups,
         }
       end
 
-      if outdated_gems.empty?
+      relevant_outdated_gems = if options_include_groups
+        outdated_gems.group_by {|g| g[:groups] }.sort.flat_map do |groups, gems|
+          contains_group = groups.split(", ").include?(options[:group])
+          next unless options[:groups] || contains_group
+
+          gems
+        end.compact
+      else
+        outdated_gems
+      end
+
+      if relevant_outdated_gems.empty?
         unless options[:parseable]
           Bundler.ui.info(nothing_outdated_message)
         end
       else
-        if options_include_groups
-          relevant_outdated_gems = outdated_gems.group_by {|g| g[:groups] }.sort.flat_map do |groups, gems|
-            contains_group = groups.split(", ").include?(options[:group])
-            next unless options[:groups] || contains_group
-
-            gems
-          end.compact
-
-          if options[:parseable]
-            print_gems(relevant_outdated_gems)
-          else
-            print_gems_table(relevant_outdated_gems)
-          end
-        elsif options[:parseable]
-          print_gems(outdated_gems)
+        if options[:parseable]
+          print_gems(relevant_outdated_gems)
         else
-          print_gems_table(outdated_gems)
+          print_gems_table(relevant_outdated_gems)
         end
 
         exit 1
@@ -155,7 +155,7 @@ def retrieve_active_spec(definition, current_spec)
 
       return active_spec if strict
 
-      active_specs = active_spec.source.specs.search(current_spec.name).select {|spec| spec.match_platform(current_spec.platform) }.sort_by(&:version)
+      active_specs = active_spec.source.specs.search(current_spec.name).select {|spec| spec.installable_on_platform?(current_spec.platform) }.sort_by(&:version)
       if !current_spec.version.prerelease? && !options[:pre] && active_specs.size > 1
         active_specs.delete_if {|b| b.respond_to?(:version) && b.version.prerelease? }
       end
diff --git a/lib/bundler/cli/plugin.rb b/lib/bundler/cli/plugin.rb
index fe3f4412fa3a6c..fd61ef0d954dea 100644
--- a/lib/bundler/cli/plugin.rb
+++ b/lib/bundler/cli/plugin.rb
@@ -5,20 +5,15 @@ module Bundler
   class CLI::Plugin < Thor
     desc "install PLUGINS", "Install the plugin from the source"
     long_desc <<-D
-      Install plugins either from the rubygems source provided (with --source option) or from a git source provided with --git (for remote repos) or --local_git (for local repos). If no sources are provided, it uses Gem.sources
+      Install plugins either from the rubygems source provided (with --source option), from a git source provided with --git, or a local path provided with --path. If no sources are provided, it uses Gem.sources
    D
-    method_option "source", :type => :string, :default => nil, :banner =>
-      "URL of the RubyGems source to fetch the plugin from"
-    method_option "version", :type => :string, :default => nil, :banner =>
-      "The version of the plugin to fetch"
-    method_option "git", :type => :string, :default => nil, :banner =>
-      "URL of the git repo to fetch from"
-    method_option "local_git", :type => :string, :default => nil, :banner =>
-      "Path of the local git repo to fetch from"
-    method_option "branch", :type => :string, :default => nil, :banner =>
-      "The git branch to checkout"
-    method_option "ref", :type => :string, :default => nil, :banner =>
-      "The git revision to check out"
+    method_option "source", type: :string, default: nil, banner: "URL of the RubyGems source to fetch the plugin from"
+    method_option "version", type: :string, default: nil, banner: "The version of the plugin to fetch"
+    method_option "git", type: :string, default: nil, banner: "URL of the git repo to fetch from"
+    method_option "local_git", type: :string, default: nil, banner: "Path of the local git repo to fetch from (deprecated)"
+    method_option "branch", type: :string, default: nil, banner: "The git branch to checkout"
+    method_option "ref", type: :string, default: nil, banner: "The git revision to check out"
+    method_option "path", type: :string, default: nil, banner: "Path of a local gem to directly use"
     def install(*plugins)
       Bundler::Plugin.install(plugins, options)
     end
@@ -27,8 +22,7 @@ def install(*plugins)
     long_desc <<-D
       Uninstall given list of plugins. To uninstall all the plugins, use -all option.
     D
-    method_option "all", :type => :boolean, :default => nil, :banner =>
-      "Uninstall all the installed plugins. If no plugin is installed, then it does nothing."
+    method_option "all", type: :boolean, default: nil, banner: "Uninstall all the installed plugins. If no plugin is installed, then it does nothing."
     def uninstall(*plugins)
       Bundler::Plugin.uninstall(plugins, options)
     end
diff --git a/lib/bundler/cli/pristine.rb b/lib/bundler/cli/pristine.rb
index d6654f8053593f..cfd4a995a31faa 100644
--- a/lib/bundler/cli/pristine.rb
+++ b/lib/bundler/cli/pristine.rb
@@ -12,40 +12,48 @@ def run
       definition.validate_runtime!
       installer = Bundler::Installer.new(Bundler.root, definition)
 
-      Bundler.load.specs.each do |spec|
-        next if spec.name == "bundler" # Source::Rubygems doesn't install bundler
-        next if !@gems.empty? && !@gems.include?(spec.name)
-
-        gem_name = "#{spec.name} (#{spec.version}#{spec.git_version})"
-        gem_name += " (#{spec.platform})" if !spec.platform.nil? && spec.platform != Gem::Platform::RUBY
-
-        case source = spec.source
-        when Source::Rubygems
-          cached_gem = spec.cache_file
-          unless File.exist?(cached_gem)
-            Bundler.ui.error("Failed to pristine #{gem_name}. Cached gem #{cached_gem} does not exist.")
+      ProcessLock.lock do
+        installed_specs = definition.specs.reject do |spec|
+          next if spec.name == "bundler" # Source::Rubygems doesn't install bundler
+          next if !@gems.empty? && !@gems.include?(spec.name)
+
+          gem_name = "#{spec.name} (#{spec.version}#{spec.git_version})"
+          gem_name += " (#{spec.platform})" if !spec.platform.nil? && spec.platform != Gem::Platform::RUBY
+
+          case source = spec.source
+          when Source::Rubygems
+            cached_gem = spec.cache_file
+            unless File.exist?(cached_gem)
+              Bundler.ui.error("Failed to pristine #{gem_name}. Cached gem #{cached_gem} does not exist.")
+              next
+            end
+
+            FileUtils.rm_rf spec.full_gem_path
+          when Source::Git
+            if source.local?
+              Bundler.ui.warn("Cannot pristine #{gem_name}. Gem is locally overridden.")
+              next
+            end
+
+            source.remote!
+            if extension_cache_path = source.extension_cache_path(spec)
+              FileUtils.rm_rf extension_cache_path
+            end
+            FileUtils.rm_rf spec.extension_dir
+            FileUtils.rm_rf spec.full_gem_path
+          else
+            Bundler.ui.warn("Cannot pristine #{gem_name}. Gem is sourced from local path.")
             next
           end
 
-          FileUtils.rm_rf spec.full_gem_path
-        when Source::Git
-          if source.local?
-            Bundler.ui.warn("Cannot pristine #{gem_name}. Gem is locally overridden.")
-            next
-          end
+          true
+        end.map(&:name)
 
-          source.remote!
-          if extension_cache_path = source.extension_cache_path(spec)
-            FileUtils.rm_rf extension_cache_path
-          end
-          FileUtils.rm_rf spec.extension_dir
-          FileUtils.rm_rf spec.full_gem_path
-        else
-          Bundler.ui.warn("Cannot pristine #{gem_name}. Gem is sourced from local path.")
-          next
-        end
-
-        Bundler::GemInstaller.new(spec, installer, false, 0, true).install_from_spec
+        jobs = installer.send(:installation_parallelization)
+        pristine_count = definition.specs.count - installed_specs.count
+        # allow a pristining a single gem to skip the parallel worker
+        jobs = [jobs, pristine_count].min
+        ParallelInstaller.call(installer, definition.specs, jobs, false, true, skip: installed_specs)
       end
     end
   end
diff --git a/lib/bundler/cli/show.rb b/lib/bundler/cli/show.rb
index 59b0af42e19426..13bb8b774b670d 100644
--- a/lib/bundler/cli/show.rb
+++ b/lib/bundler/cli/show.rb
@@ -24,7 +24,7 @@ def run
           return unless spec
           path = spec.full_gem_path
           unless File.directory?(path)
-            return Bundler.ui.warn "The gem #{gem_name} has been deleted. It was installed at: #{path}"
+            return Bundler.ui.warn "The gem #{gem_name} is missing. It should be installed at #{path}, but was not found"
           end
         end
         return Bundler.ui.info(path)
@@ -59,9 +59,9 @@ def fetch_latest_specs
       definition = Bundler.definition(true)
       if options[:outdated]
         Bundler.ui.info "Fetching remote specs for outdated check...\n\n"
-        Bundler.ui.silence { definition.resolve_remotely! }
+        Bundler.ui.silence { definition.remotely! }
       else
-        definition.resolve_with_cache!
+        definition.with_cache!
       end
       Bundler.reset!
       definition.specs
diff --git a/lib/bundler/cli/update.rb b/lib/bundler/cli/update.rb
index 22dd1a78dd1448..ba3f1ec05691fd 100644
--- a/lib/bundler/cli/update.rb
+++ b/lib/bundler/cli/update.rb
@@ -26,7 +26,7 @@ def run
         if Bundler.feature_flag.update_requires_all_flag?
           raise InvalidOption, "To update everything, pass the `--all` flag."
         end
-        SharedHelpers.major_deprecation 3, "Pass --all to `bundle update` to update everything"
+        SharedHelpers.major_deprecation 4, "Pass --all to `bundle update` to update everything"
       elsif !full_update && options[:all]
         raise InvalidOption, "Cannot specify --all along with specific options."
       end
@@ -35,7 +35,7 @@ def run
 
       if full_update
         if conservative
-          Bundler.definition(:conservative => conservative)
+          Bundler.definition(conservative: conservative)
         else
           Bundler.definition(true)
         end
@@ -51,9 +51,9 @@ def run
           gems.concat(deps.map(&:name))
         end
 
-        Bundler.definition(:gems => gems, :sources => sources, :ruby => options[:ruby],
-                           :conservative => conservative,
-                           :bundler => update_bundler)
+        Bundler.definition(gems: gems, sources: sources, ruby: options[:ruby],
+                           conservative: conservative,
+                           bundler: update_bundler)
       end
 
       Bundler::CLI::Common.configure_gem_version_promoter(Bundler.definition, options)
@@ -71,7 +71,7 @@ def run
 
       if locked_gems = Bundler.definition.locked_gems
         previous_locked_info = locked_gems.specs.reduce({}) do |h, s|
-          h[s.name] = { :spec => s, :version => s.version, :source => s.source.identifier }
+          h[s.name] = { spec: s, version: s.version, source: s.source.identifier }
           h
         end
       end
@@ -92,7 +92,7 @@ def run
           locked_spec = locked_info[:spec]
           new_spec = Bundler.definition.specs[name].first
           unless new_spec
-            unless locked_spec.match_platform(Bundler.local_platform)
+            unless locked_spec.installable_on_platform?(Bundler.local_platform)
               Bundler.ui.warn "Bundler attempted to update #{name} but it was not considered because it is for a different platform from the current one"
             end
 
diff --git a/lib/bundler/compact_index_client.rb b/lib/bundler/compact_index_client.rb
index 127a50e81080aa..37e2ccced8e1d1 100644
--- a/lib/bundler/compact_index_client.rb
+++ b/lib/bundler/compact_index_client.rb
@@ -4,8 +4,40 @@
 require "set"
 
 module Bundler
+  # The CompactIndexClient is responsible for fetching and parsing the compact index.
+  #
+  # The compact index is a set of caching optimized files that are used to fetch gem information.
+  # The files are:
+  # - names: a list of all gem names
+  # - versions: a list of all gem versions
+  # - info/[gem]: a list of all versions of a gem
+  #
+  # The client is instantiated with:
+  # - `directory`: the root directory where the cache files are stored.
+  # - `fetcher`: (optional) an object that responds to #call(uri_path, headers) and returns an http response.
+  # If the `fetcher` is not provided, the client will only read cached files from disk.
+  #
+  # The client is organized into:
+  # - `Updater`: updates the cached files on disk using the fetcher.
+  # - `Cache`: calls the updater, caches files, read and return them from disk
+  # - `Parser`: parses the compact index file data
+  # - `CacheFile`: a concurrency safe file reader/writer that verifies checksums
+  #
+  # The client is intended to optimize memory usage and performance.
+  # It is called 100s or 1000s of times, parsing files with hundreds of thousands of lines.
+  # It may be called concurrently without global interpreter lock in some Rubies.
+  # As a result, some methods may look more complex than necessary to save memory or time.
   class CompactIndexClient
+    SUPPORTED_DIGESTS = { "sha-256" => :SHA256 }.freeze
     DEBUG_MUTEX = Thread::Mutex.new
+
+    # info returns an Array of INFO Arrays. Each INFO Array has the following indices:
+    INFO_NAME = 0
+    INFO_VERSION = 1
+    INFO_PLATFORM = 2
+    INFO_DEPS = 3
+    INFO_REQS = 4
+
     def self.debug
       return unless ENV["DEBUG_COMPACT_INDEX"]
       DEBUG_MUTEX.synchronize { warn("[#{self}] #{yield}") }
@@ -14,106 +46,48 @@ def self.debug
     class Error < StandardError; end
 
     require_relative "compact_index_client/cache"
+    require_relative "compact_index_client/cache_file"
+    require_relative "compact_index_client/parser"
     require_relative "compact_index_client/updater"
 
-    attr_reader :directory
-
-    def initialize(directory, fetcher)
-      @directory = Pathname.new(directory)
-      @updater = Updater.new(fetcher)
-      @cache = Cache.new(@directory)
-      @endpoints = Set.new
-      @info_checksums_by_name = {}
-      @parsed_checksums = false
-      @mutex = Thread::Mutex.new
-    end
-
-    def execution_mode=(block)
-      Bundler::CompactIndexClient.debug { "execution_mode=" }
-      @endpoints = Set.new
-
-      @execution_mode = block
-    end
-
-    # @return [Lambda] A lambda that takes an array of inputs and a block, and
-    #         maps the inputs with the block in parallel.
-    #
-    def execution_mode
-      @execution_mode || sequentially
-    end
-
-    def sequential_execution_mode!
-      self.execution_mode = sequentially
-    end
-
-    def sequentially
-      @sequentially ||= lambda do |inputs, &blk|
-        inputs.map(&blk)
-      end
+    def initialize(directory, fetcher = nil)
+      @cache = Cache.new(directory, fetcher)
+      @parser = Parser.new(@cache)
     end
 
     def names
-      Bundler::CompactIndexClient.debug { "/names" }
-      update(@cache.names_path, "names")
-      @cache.names
+      Bundler::CompactIndexClient.debug { "names" }
+      @parser.names
     end
 
     def versions
-      Bundler::CompactIndexClient.debug { "/versions" }
-      update(@cache.versions_path, "versions")
-      versions, @info_checksums_by_name = @cache.versions
-      versions
+      Bundler::CompactIndexClient.debug { "versions" }
+      @parser.versions
     end
 
     def dependencies(names)
       Bundler::CompactIndexClient.debug { "dependencies(#{names})" }
-      execution_mode.call(names) do |name|
-        update_info(name)
-        @cache.dependencies(name).map {|d| d.unshift(name) }
-      end.flatten(1)
+      names.map {|name| info(name) }
     end
 
-    def update_and_parse_checksums!
-      Bundler::CompactIndexClient.debug { "update_and_parse_checksums!" }
-      return @info_checksums_by_name if @parsed_checksums
-      update(@cache.versions_path, "versions")
-      @info_checksums_by_name = @cache.checksums
-      @parsed_checksums = true
-    end
-
-    private
-
-    def update(local_path, remote_path)
-      Bundler::CompactIndexClient.debug { "update(#{local_path}, #{remote_path})" }
-      unless synchronize { @endpoints.add?(remote_path) }
-        Bundler::CompactIndexClient.debug { "already fetched #{remote_path}" }
-        return
-      end
-      @updater.update(local_path, url(remote_path))
+    def info(name)
+      Bundler::CompactIndexClient.debug { "info(#{name})" }
+      @parser.info(name)
     end
 
-    def update_info(name)
-      Bundler::CompactIndexClient.debug { "update_info(#{name})" }
-      path = @cache.info_path(name)
-      checksum = @updater.checksum_for_file(path)
-      unless existing = @info_checksums_by_name[name]
-        Bundler::CompactIndexClient.debug { "skipping updating info for #{name} since it is missing from versions" }
-        return
-      end
-      if checksum == existing
-        Bundler::CompactIndexClient.debug { "skipping updating info for #{name} since the versions checksum matches the local checksum" }
-        return
-      end
-      Bundler::CompactIndexClient.debug { "updating info for #{name} since the versions checksum #{existing} != the local checksum #{checksum}" }
-      update(path, "info/#{name}")
+    def latest_version(name)
+      Bundler::CompactIndexClient.debug { "latest_version(#{name})" }
+      @parser.info(name).map {|d| Gem::Version.new(d[INFO_VERSION]) }.max
     end
 
-    def url(path)
-      path
+    def available?
+      Bundler::CompactIndexClient.debug { "available?" }
+      @parser.available?
     end
 
-    def synchronize
-      @mutex.synchronize { yield }
+    def reset!
+      Bundler::CompactIndexClient.debug { "reset!" }
+      @cache.reset!
     end
   end
 end
diff --git a/lib/bundler/compact_index_client/cache.rb b/lib/bundler/compact_index_client/cache.rb
index 0b43581c11102d..3bae6c9efdf8f5 100644
--- a/lib/bundler/compact_index_client/cache.rb
+++ b/lib/bundler/compact_index_client/cache.rb
@@ -1,100 +1,95 @@
 # frozen_string_literal: true
 
-require_relative "gem_parser"
+require "rubygems/resolver/api_set/gem_parser"
 
 module Bundler
   class CompactIndexClient
     class Cache
       attr_reader :directory
 
-      def initialize(directory)
+      def initialize(directory, fetcher = nil)
         @directory = Pathname.new(directory).expand_path
-        info_roots.each do |dir|
-          SharedHelpers.filesystem_access(dir) do
-            FileUtils.mkdir_p(dir)
-          end
-        end
-      end
+        @updater = Updater.new(fetcher) if fetcher
+        @mutex = Thread::Mutex.new
+        @endpoints = Set.new
 
-      def names
-        lines(names_path)
+        @info_root = mkdir("info")
+        @special_characters_info_root = mkdir("info-special-characters")
+        @info_etag_root = mkdir("info-etags")
       end
 
-      def names_path
-        directory.join("names")
+      def names
+        fetch("names", names_path, names_etag_path)
       end
 
       def versions
-        versions_by_name = Hash.new {|hash, key| hash[key] = [] }
-        info_checksums_by_name = {}
-
-        lines(versions_path).each do |line|
-          name, versions_string, info_checksum = line.split(" ", 3)
-          info_checksums_by_name[name] = info_checksum || ""
-          versions_string.split(",").each do |version|
-            if version.start_with?("-")
-              version = version[1..-1].split("-", 2).unshift(name)
-              versions_by_name[name].delete(version)
-            else
-              version = version.split("-", 2).unshift(name)
-              versions_by_name[name] << version
-            end
-          end
-        end
-
-        [versions_by_name, info_checksums_by_name]
-      end
-
-      def versions_path
-        directory.join("versions")
+        fetch("versions", versions_path, versions_etag_path)
       end
 
-      def checksums
-        checksums = {}
+      def info(name, remote_checksum = nil)
+        path = info_path(name)
 
-        lines(versions_path).each do |line|
-          name, _, checksum = line.split(" ", 3)
-          checksums[name] = checksum
+        if remote_checksum && remote_checksum != SharedHelpers.checksum_for_file(path, :MD5)
+          fetch("info/#{name}", path, info_etag_path(name))
+        else
+          Bundler::CompactIndexClient.debug { "update skipped info/#{name} (#{remote_checksum ? "versions index checksum is nil" : "versions index checksum matches local"})" }
+          read(path)
         end
-
-        checksums
       end
 
-      def dependencies(name)
-        lines(info_path(name)).map do |line|
-          parse_gem(line)
-        end
+      def reset!
+        @mutex.synchronize { @endpoints.clear }
       end
 
+      private
+
+      def names_path = directory.join("names")
+      def names_etag_path = directory.join("names.etag")
+      def versions_path = directory.join("versions")
+      def versions_etag_path = directory.join("versions.etag")
+
       def info_path(name)
         name = name.to_s
+        # TODO: converge this into the info_root by hashing all filenames like info_etag_path
         if /[^a-z0-9_-]/.match?(name)
           name += "-#{SharedHelpers.digest(:MD5).hexdigest(name).downcase}"
-          info_roots.last.join(name)
+          @special_characters_info_root.join(name)
         else
-          info_roots.first.join(name)
+          @info_root.join(name)
         end
       end
 
-      private
+      def info_etag_path(name)
+        name = name.to_s
+        @info_etag_root.join("#{name}-#{SharedHelpers.digest(:MD5).hexdigest(name).downcase}")
+      end
+
+      def mkdir(name)
+        directory.join(name).tap do |dir|
+          SharedHelpers.filesystem_access(dir) do
+            FileUtils.mkdir_p(dir)
+          end
+        end
+      end
+
+      def fetch(remote_path, path, etag_path)
+        if already_fetched?(remote_path)
+          Bundler::CompactIndexClient.debug { "already fetched #{remote_path}" }
+        else
+          Bundler::CompactIndexClient.debug { "fetching #{remote_path}" }
+          @updater&.update(remote_path, path, etag_path)
+        end
 
-      def lines(path)
-        return [] unless path.file?
-        lines = SharedHelpers.filesystem_access(path, :read, &:read).split("\n")
-        header = lines.index("---")
-        header ? lines[header + 1..-1] : lines
+        read(path)
       end
 
-      def parse_gem(line)
-        @dependency_parser ||= GemParser.new
-        @dependency_parser.parse(line)
+      def already_fetched?(remote_path)
+        @mutex.synchronize { !@endpoints.add?(remote_path) }
       end
 
-      def info_roots
-        [
-          directory.join("info"),
-          directory.join("info-special-characters"),
-        ]
+      def read(path)
+        return unless path.file?
+        SharedHelpers.filesystem_access(path, :read, &:read)
       end
     end
   end
diff --git a/lib/bundler/compact_index_client/cache_file.rb b/lib/bundler/compact_index_client/cache_file.rb
new file mode 100644
index 00000000000000..299d683438b887
--- /dev/null
+++ b/lib/bundler/compact_index_client/cache_file.rb
@@ -0,0 +1,148 @@
+# frozen_string_literal: true
+
+require_relative "../vendored_fileutils"
+require "rubygems/package"
+
+module Bundler
+  class CompactIndexClient
+    # write cache files in a way that is robust to concurrent modifications
+    # if digests are given, the checksums will be verified
+    class CacheFile
+      DEFAULT_FILE_MODE = 0o644
+      private_constant :DEFAULT_FILE_MODE
+
+      class Error < RuntimeError; end
+      class ClosedError < Error; end
+
+      class DigestMismatchError < Error
+        def initialize(digests, expected_digests)
+          super "Calculated checksums #{digests.inspect} did not match expected #{expected_digests.inspect}."
+        end
+      end
+
+      # Initialize with a copy of the original file, then yield the instance.
+      def self.copy(path, &block)
+        new(path) do |file|
+          file.initialize_digests
+
+          SharedHelpers.filesystem_access(path, :read) do
+            path.open("rb") do |s|
+              file.open {|f| IO.copy_stream(s, f) }
+            end
+          end
+
+          yield file
+        end
+      end
+
+      # Write data to a temp file, then replace the original file with it verifying the digests if given.
+      def self.write(path, data, digests = nil)
+        return unless data
+        new(path) do |file|
+          file.digests = digests
+          file.write(data)
+        end
+      end
+
+      attr_reader :original_path, :path
+
+      def initialize(original_path, &block)
+        @original_path = original_path
+        @perm = original_path.file? ? original_path.stat.mode : DEFAULT_FILE_MODE
+        @path = original_path.sub(/$/, ".#{$$}.tmp")
+        return unless block_given?
+        begin
+          yield self
+        ensure
+          close
+        end
+      end
+
+      def size
+        path.size
+      end
+
+      # initialize the digests using CompactIndexClient::SUPPORTED_DIGESTS, or a subset based on keys.
+      def initialize_digests(keys = nil)
+        @digests = keys ? SUPPORTED_DIGESTS.slice(*keys) : SUPPORTED_DIGESTS.dup
+        @digests.transform_values! {|algo_class| SharedHelpers.digest(algo_class).new }
+      end
+
+      # reset the digests so they don't contain any previously read data
+      def reset_digests
+        @digests&.each_value(&:reset)
+      end
+
+      # set the digests that will be verified at the end
+      def digests=(expected_digests)
+        @expected_digests = expected_digests
+
+        if @expected_digests.nil?
+          @digests = nil
+        elsif @digests
+          @digests = @digests.slice(*@expected_digests.keys)
+        else
+          initialize_digests(@expected_digests.keys)
+        end
+      end
+
+      def digests?
+        @digests&.any?
+      end
+
+      # Open the temp file for writing, reusing original permissions, yielding the IO object.
+      def open(write_mode = "wb", perm = @perm, &block)
+        raise ClosedError, "Cannot reopen closed file" if @closed
+        SharedHelpers.filesystem_access(path, :write) do
+          path.open(write_mode, perm) do |f|
+            yield digests? ? Gem::Package::DigestIO.new(f, @digests) : f
+          end
+        end
+      end
+
+      # Returns false without appending when no digests since appending is too error prone to do without digests.
+      def append(data)
+        return false unless digests?
+        open("a") {|f| f.write data }
+        verify && commit
+      end
+
+      def write(data)
+        reset_digests
+        open {|f| f.write data }
+        commit!
+      end
+
+      def commit!
+        verify || raise(DigestMismatchError.new(@base64digests, @expected_digests))
+        commit
+      end
+
+      # Verify the digests, returning true on match, false on mismatch.
+      def verify
+        return true unless @expected_digests && digests?
+        @base64digests = @digests.transform_values!(&:base64digest)
+        @digests = nil
+        @base64digests.all? {|algo, digest| @expected_digests[algo] == digest }
+      end
+
+      # Replace the original file with the temp file without verifying digests.
+      # The file is permanently closed.
+      def commit
+        raise ClosedError, "Cannot commit closed file" if @closed
+        SharedHelpers.filesystem_access(original_path, :write) do
+          FileUtils.mv(path, original_path)
+        end
+        @closed = true
+      end
+
+      # Remove the temp file without replacing the original file.
+      # The file is permanently closed.
+      def close
+        return if @closed
+        FileUtils.remove_file(path) if @path&.file?
+        @closed = true
+      end
+    end
+  end
+end
diff --git a/lib/bundler/compact_index_client/gem_parser.rb b/lib/bundler/compact_index_client/gem_parser.rb
deleted file mode 100644
index e7bf4c60010169..00000000000000
--- a/lib/bundler/compact_index_client/gem_parser.rb
+++ /dev/null
@@ -1,28 +0,0 @@
-# frozen_string_literal: true
-
-module Bundler
-  class CompactIndexClient
-    if defined?(Gem::Resolver::APISet::GemParser)
-      GemParser = Gem::Resolver::APISet::GemParser
-    else
-      class GemParser
-        def parse(line)
-          version_and_platform, rest = line.split(" ", 2)
-          version, platform = version_and_platform.split("-", 2)
-          dependencies, requirements = rest.split("|", 2).map {|s| s.split(",") } if rest
-          dependencies = dependencies ? dependencies.map {|d| parse_dependency(d) } : []
-          requirements = requirements ? requirements.map {|d| parse_dependency(d) } : []
-          [version, platform, dependencies, requirements]
-        end
-
-        private
-
-        def parse_dependency(string)
-          dependency = string.split(":")
-          dependency[-1] = dependency[-1].split("&") if dependency.size > 1
-          dependency
-        end
-      end
-    end
-  end
-end
diff --git a/lib/bundler/compact_index_client/parser.rb b/lib/bundler/compact_index_client/parser.rb
new file mode 100644
index 00000000000000..43581fd7efe563
--- /dev/null
+++ b/lib/bundler/compact_index_client/parser.rb
@@ -0,0 +1,84 @@
+# frozen_string_literal: true
+
+module Bundler
+  class CompactIndexClient
+    class Parser
+      # `compact_index` - an object responding to #names, #versions, #info(name, checksum),
+      #                   returning the file contents as a string
+      def initialize(compact_index)
+        @compact_index = compact_index
+        @info_checksums = nil
+        @versions_by_name = nil
+        @available = nil
+        @gem_parser = nil
+      end
+
+      def names
+        lines(@compact_index.names)
+      end
+
+      def versions
+        @versions_by_name ||= Hash.new {|hash, key| hash[key] = [] }
+        @info_checksums = {}
+
+        lines(@compact_index.versions).each do |line|
+          name, versions_string, checksum = line.split(" ", 3)
+          @info_checksums[name] = checksum || ""
+          versions_string.split(",") do |version|
+            delete = version.delete_prefix!("-")
+            version = version.split("-", 2).unshift(name)
+            if delete
+              @versions_by_name[name].delete(version)
+            else
+              @versions_by_name[name] << version
+            end
+          end
+        end
+
+        @versions_by_name
+      end
+
+      def info(name)
+        data = @compact_index.info(name, info_checksums[name])
+        lines(data).map {|line| gem_parser.parse(line).unshift(name) }
+      end
+
+      def available?
+        return @available unless @available.nil?
+        @available = !info_checksums.empty?
+      end
+
+      private
+
+      def info_checksums
+        @info_checksums ||= lines(@compact_index.versions).each_with_object({}) do |line, checksums|
+          parse_version_checksum(line, checksums)
+        end
+      end
+
+      def lines(data)
+        return [] if data.nil? || data.empty?
+        lines = data.split("\n")
+        header = lines.index("---")
+        header ? lines[header + 1..-1] : lines
+      end
+
+      def gem_parser
+        @gem_parser ||= Gem::Resolver::APISet::GemParser.new
+      end
+
+      # This is mostly the same as `split(" ", 3)` but it avoids allocating extra objects.
+      # This method gets called at least once for every gem when parsing versions.
+      def parse_version_checksum(line, checksums)
+        return unless (name_end = line.index(" ")) # Artifactory bug causes blank lines in artifactor index files
+        return unless (checksum_start = line.index(" ", name_end + 1) + 1)
+        checksum_end = line.size - checksum_start
+
+        line.freeze # allows slicing into the string to not allocate a copy of the line
+        name = line[0, name_end]
+        checksum = line[checksum_start, checksum_end]
+        checksums[name.freeze] = checksum # freeze name since it is used as a hash key
+      end
+    end
+  end
+end
diff --git a/lib/bundler/compact_index_client/updater.rb b/lib/bundler/compact_index_client/updater.rb
index 0f7bf9bb504ddf..6066fdc7c41a83 100644
--- a/lib/bundler/compact_index_client/updater.rb
+++ b/lib/bundler/compact_index_client/updater.rb
@@ -1,20 +1,11 @@
 # frozen_string_literal: true
 
-require_relative "../vendored_fileutils"
-
 module Bundler
   class CompactIndexClient
     class Updater
-      class MisMatchedChecksumError < Error
-        def initialize(path, server_checksum, local_checksum)
-          @path = path
-          @server_checksum = server_checksum
-          @local_checksum = local_checksum
-        end
-
-        def message
-          "The checksum of /#{@path} does not match the checksum provided by the server! Something is wrong " \
-            "(local checksum is #{@local_checksum.inspect}, was expecting #{@server_checksum.inspect})."
+      class MismatchedChecksumError < Error
+        def initialize(path, message)
+          super "The checksum of /#{path} does not match the checksum provided by the server! Something is wrong. #{message}"
         end
       end
 
@@ -22,95 +13,92 @@ def initialize(fetcher)
         @fetcher = fetcher
       end
 
-      def update(local_path, remote_path, retrying = nil)
-        headers = {}
-
-        local_temp_path = local_path.sub(/$/, ".#{$$}")
-        local_temp_path = local_temp_path.sub(/$/, ".retrying") if retrying
-        local_temp_path = local_temp_path.sub(/$/, ".tmp")
-
-        # first try to fetch any new bytes on the existing file
-        if retrying.nil? && local_path.file?
-          copy_file local_path, local_temp_path
+      def update(remote_path, local_path, etag_path)
+        append(remote_path, local_path, etag_path) || replace(remote_path, local_path, etag_path)
+      rescue CacheFile::DigestMismatchError => e
+        raise MismatchedChecksumError.new(remote_path, e.message)
+      rescue Zlib::GzipFile::Error
+        raise Bundler::HTTPError
+      end
 
-          headers["If-None-Match"] = etag_for(local_temp_path)
-          headers["Range"] =
-            if local_temp_path.size.nonzero?
-              # Subtract a byte to ensure the range won't be empty.
-              # Avoids 416 (Range Not Satisfiable) responses.
-              "bytes=#{local_temp_path.size - 1}-"
-            else
-              "bytes=#{local_temp_path.size}-"
-            end
-        end
+      private
 
-        response = @fetcher.call(remote_path, headers)
-        return nil if response.is_a?(Net::HTTPNotModified)
+      def append(remote_path, local_path, etag_path)
+        return false unless local_path.file? && local_path.size.nonzero?
 
-        content = response.body
+        CacheFile.copy(local_path) do |file|
+          etag = etag_path.read.tap(&:chomp!) if etag_path.file?
 
-        etag = (response["ETag"] || "").gsub(%r{\AW/}, "")
-        correct_response = SharedHelpers.filesystem_access(local_temp_path) do
-          if response.is_a?(Net::HTTPPartialContent) && local_temp_path.size.nonzero?
-            local_temp_path.open("a") {|f| f << slice_body(content, 1..-1) }
+          # Subtract a byte to ensure the range won't be empty.
+          # Avoids 416 (Range Not Satisfiable) responses.
+          response = @fetcher.call(remote_path, request_headers(etag, file.size - 1))
+          break true if response.is_a?(Gem::Net::HTTPNotModified)
 
-            etag_for(local_temp_path) == etag
+          file.digests = parse_digests(response)
+          # server may ignore Range and return the full response
+          if response.is_a?(Gem::Net::HTTPPartialContent)
+            tail = response.body.byteslice(1..-1)
+            break false unless tail && file.append(tail)
           else
-            local_temp_path.open("wb") {|f| f << content }
-
-            etag.length.zero? || etag_for(local_temp_path) == etag
+            file.write(response.body)
           end
+          CacheFile.write(etag_path, etag_from_response(response))
+          true
         end
+      end
 
-        if correct_response
-          SharedHelpers.filesystem_access(local_path) do
-            FileUtils.mv(local_temp_path, local_path)
-          end
-          return nil
-        end
-
-        if retrying
-          raise MisMatchedChecksumError.new(remote_path, etag, etag_for(local_temp_path))
-        end
+      # request without range header to get the full file or a 304 Not Modified
+      def replace(remote_path, local_path, etag_path)
+        etag = etag_path.read.tap(&:chomp!) if etag_path.file?
+        response = @fetcher.call(remote_path, request_headers(etag))
+        return true if response.is_a?(Gem::Net::HTTPNotModified)
+        CacheFile.write(local_path, response.body, parse_digests(response))
+        CacheFile.write(etag_path, etag_from_response(response))
+      end
 
-        update(local_path, remote_path, :retrying)
-      rescue Zlib::GzipFile::Error
-        raise Bundler::HTTPError
-      ensure
-        FileUtils.remove_file(local_temp_path) if File.exist?(local_temp_path)
+      def request_headers(etag, range_start = nil)
+        headers = {}
+        headers["Range"] = "bytes=#{range_start}-" if range_start
+        headers["If-None-Match"] = %("#{etag}") if etag
+        headers
       end
 
-      def etag_for(path)
-        sum = checksum_for_file(path)
-        sum ? %("#{sum}") : nil
+      def etag_for_request(etag_path)
+        etag_path.read.tap(&:chomp!) if etag_path.file?
       end
 
-      def slice_body(body, range)
-        body.byteslice(range)
+      def etag_from_response(response)
+        return unless response["ETag"]
+        etag = response["ETag"].delete_prefix("W/")
+        return if etag.delete_prefix!('"') && !etag.delete_suffix!('"')
+        etag
       end
 
-      def checksum_for_file(path)
-        return nil unless path.file?
-        # This must use File.read instead of Digest.file().hexdigest
-        # because we need to preserve \n line endings on windows when calculating
-        # the checksum
-        SharedHelpers.filesystem_access(path, :read) do
-          SharedHelpers.digest(:MD5).hexdigest(File.read(path))
+      # Unwraps and returns a Hash of digest algorithms and base64 values
+      # according to RFC 8941 Structured Field Values for HTTP.
+      # https://www.rfc-editor.org/rfc/rfc8941#name-parsing-a-byte-sequence
+      # Ignores unsupported algorithms.
+      def parse_digests(response)
+        return unless header = response["Repr-Digest"] || response["Digest"]
+        digests = {}
+        header.split(",") do |param|
+          algorithm, value = param.split("=", 2)
+          algorithm.strip!
+          algorithm.downcase!
+          next unless SUPPORTED_DIGESTS.key?(algorithm)
+          next unless value = byte_sequence(value)
+          digests[algorithm] = value
         end
+        digests.empty? ? nil : digests
       end
 
-      private
-
-      def copy_file(source, dest)
-        SharedHelpers.filesystem_access(source, :read) do
-          File.open(source, "r") do |s|
-            SharedHelpers.filesystem_access(dest, :write) do
-              File.open(dest, "wb", s.stat.mode) do |f|
-                IO.copy_stream(s, f)
-              end
-            end
-          end
-        end
+      # Unwrap surrounding colons (byte sequence)
+      # The wrapping characters must be matched or we return nil.
+      # Also handles quotes because right now rubygems.org sends them.
+      def byte_sequence(value)
+        return if value.delete_prefix!(":") && !value.delete_suffix!(":")
+        return if value.delete_prefix!('"') && !value.delete_suffix!('"')
+        value
       end
     end
   end
diff --git a/lib/bundler/constants.rb b/lib/bundler/constants.rb
index de9698b577e41b..9564771e78afbb 100644
--- a/lib/bundler/constants.rb
+++ b/lib/bundler/constants.rb
@@ -1,7 +1,14 @@
 # frozen_string_literal: true
 
+require "rbconfig"
+
 module Bundler
   WINDOWS = RbConfig::CONFIG["host_os"] =~ /(msdos|mswin|djgpp|mingw)/
+  deprecate_constant :WINDOWS
+
   FREEBSD = RbConfig::CONFIG["host_os"].to_s.include?("bsd")
-  NULL    = File::NULL
+  deprecate_constant :FREEBSD
+
+  NULL = File::NULL
+  deprecate_constant :NULL
 end
diff --git a/lib/bundler/current_ruby.rb b/lib/bundler/current_ruby.rb
index 1d2d8ff2fb282c..faec695369722a 100644
--- a/lib/bundler/current_ruby.rb
+++ b/lib/bundler/current_ruby.rb
@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require_relative "rubygems_ext"
+
 module Bundler
   # Returns current version of Ruby
   #
@@ -9,41 +11,28 @@ def self.current_ruby
   end
 
   class CurrentRuby
-    KNOWN_MINOR_VERSIONS = %w[
-      1.8
-      1.9
-      2.0
-      2.1
-      2.2
-      2.3
-      2.4
-      2.5
-      2.6
-      2.7
-      3.0
-      3.1
-      3.2
-      3.3
-    ].freeze
-
-    KNOWN_MAJOR_VERSIONS = KNOWN_MINOR_VERSIONS.map {|v| v.split(".", 2).first }.uniq.freeze
-
-    KNOWN_PLATFORMS = %w[
-      jruby
-      maglev
-      mingw
-      mri
-      mswin
-      mswin64
-      rbx
-      ruby
-      truffleruby
-      windows
-      x64_mingw
-    ].freeze
+    ALL_RUBY_VERSIONS = (18..27).to_a.concat((30..35).to_a).freeze
+    KNOWN_MINOR_VERSIONS = ALL_RUBY_VERSIONS.map {|v| v.digits.reverse.join(".") }.freeze
+    KNOWN_MAJOR_VERSIONS = ALL_RUBY_VERSIONS.map {|v| v.digits.last.to_s }.uniq.freeze
+    PLATFORM_MAP = {
+      ruby: [Gem::Platform::RUBY, CurrentRuby::ALL_RUBY_VERSIONS],
+      mri: [Gem::Platform::RUBY, CurrentRuby::ALL_RUBY_VERSIONS],
+      rbx: [Gem::Platform::RUBY],
+      truffleruby: [Gem::Platform::RUBY],
+      jruby: [Gem::Platform::JAVA, [18, 19]],
+      windows: [Gem::Platform::WINDOWS, CurrentRuby::ALL_RUBY_VERSIONS],
+      # deprecated
+      mswin: [Gem::Platform::MSWIN, CurrentRuby::ALL_RUBY_VERSIONS],
+      mswin64: [Gem::Platform::MSWIN64, CurrentRuby::ALL_RUBY_VERSIONS - [18]],
+      mingw: [Gem::Platform::UNIVERSAL_MINGW, CurrentRuby::ALL_RUBY_VERSIONS],
+      x64_mingw: [Gem::Platform::UNIVERSAL_MINGW, CurrentRuby::ALL_RUBY_VERSIONS - [18, 19]],
+    }.each_with_object({}) do |(platform, spec), hash|
+      hash[platform] = spec[0]
+      spec[1]&.each {|version| hash[:"#{platform}_#{version}"] = spec[0] }
+    end.freeze
 
     def ruby?
-      return true if Bundler::GemHelpers.generic_local_platform == Gem::Platform::RUBY
+      return true if Bundler::MatchPlatform.generic_local_platform_is_ruby?
 
       !windows? && (RUBY_ENGINE == "ruby" || RUBY_ENGINE == "rbx" || RUBY_ENGINE == "maglev" || RUBY_ENGINE == "truffleruby")
     end
@@ -61,6 +50,18 @@ def jruby?
     end
 
     def maglev?
+      message =
+        "`CurrentRuby#maglev?` is deprecated with no replacement. Please use the " \
+        "built-in Ruby `RUBY_ENGINE` constant to check the Ruby implementation you are running on."
+      removed_message =
+        "`CurrentRuby#maglev?` was removed with no replacement. Please use the " \
+        "built-in Ruby `RUBY_ENGINE` constant to check the Ruby implementation you are running on."
+      internally_exempted = caller_locations(1, 1).first.path == __FILE__
+
+      unless internally_exempted
+        SharedHelpers.major_deprecation(2, message, removed_message: removed_message, print_caller_location: true)
+      end
+
       RUBY_ENGINE == "maglev"
     end
 
@@ -82,11 +83,24 @@ def windows?
         RUBY_VERSION.start_with?("#{version}.")
       end
 
-      KNOWN_PLATFORMS.each do |platform|
+      PLATFORM_MAP.keys.each do |platform|
         define_method(:"#{platform}_#{trimmed_version}?") do
           send(:"#{platform}?") && send(:"on_#{trimmed_version}?")
         end
       end
+
+      define_method(:"maglev_#{trimmed_version}?") do
+        message =
+          "`CurrentRuby##{__method__}` is deprecated with no replacement. Please use the " \
+          "built-in Ruby `RUBY_ENGINE` and `RUBY_VERSION` constants to perform a similar check."
+        removed_message =
+          "`CurrentRuby##{__method__}` was removed with no replacement. Please use the " \
+          "built-in Ruby `RUBY_ENGINE` and `RUBY_VERSION` constants to perform a similar check."
+
+        SharedHelpers.major_deprecation(2, message, removed_message: removed_message, print_caller_location: true)
+
+        send(:"maglev?") && send(:"on_#{trimmed_version}?")
+      end
     end
   end
 end
diff --git a/lib/bundler/definition.rb b/lib/bundler/definition.rb
index 564530a98cdf1a..32006af109ee09 100644
--- a/lib/bundler/definition.rb
+++ b/lib/bundler/definition.rb
@@ -4,8 +4,6 @@
 
 module Bundler
   class Definition
-    include GemHelpers
-
     class << self
       # Do not create or modify a lockfile (Makes #lock a noop)
       attr_accessor :no_lock
@@ -13,12 +11,14 @@ class << self
 
     attr_reader(
       :dependencies,
+      :locked_checksums,
       :locked_deps,
       :locked_gems,
       :platforms,
       :ruby_version,
       :lockfile,
-      :gemfiles
+      :gemfiles,
+      :sources
     )
 
     # Given a gemfile and lockfile creates a Bundler definition
@@ -56,19 +56,31 @@ def self.build(gemfile, lockfile, unlock)
     # @param ruby_version [Bundler::RubyVersion, nil] Requested Ruby Version
     # @param optional_groups [Array(String)] A list of optional groups
     def initialize(lockfile, dependencies, sources, unlock, ruby_version = nil, optional_groups = [], gemfiles = [])
-      if [true, false].include?(unlock)
+      unlock ||= {}
+
+      if unlock == true
+        @unlocking_all = true
+        strict = false
         @unlocking_bundler = false
         @unlocking = unlock
+        @sources_to_unlock = []
+        @unlocking_ruby = false
+        @explicit_unlocks = []
+        conservative = false
       else
+        @unlocking_all = false
+        strict = unlock.delete(:strict)
         @unlocking_bundler = unlock.delete(:bundler)
         @unlocking = unlock.any? {|_k, v| !Array(v).empty? }
+        @sources_to_unlock = unlock.delete(:sources) || []
+        @unlocking_ruby = unlock.delete(:ruby)
+        @explicit_unlocks = unlock.delete(:gems) || []
+        conservative = unlock.delete(:conservative)
       end
 
       @dependencies    = dependencies
       @sources         = sources
-      @unlock          = unlock
       @optional_groups = optional_groups
-      @remote          = false
       @prefer_local    = false
       @specs           = nil
       @ruby_version    = ruby_version
@@ -81,37 +93,39 @@ def initialize(lockfile, dependencies, sources, unlock, ruby_version = nil, opti
       @resolved_bundler_version = nil
 
       @locked_ruby_version = nil
-      @new_platform = nil
-      @removed_platform = nil
+      @new_platforms = []
+      @removed_platforms = []
+      @originally_invalid_platforms = []
 
-      if lockfile && File.exist?(lockfile)
+      if lockfile_exists?
         @lockfile_contents = Bundler.read_file(lockfile)
-        @locked_gems = LockfileParser.new(@lockfile_contents)
+        @locked_gems = LockfileParser.new(@lockfile_contents, strict: strict)
         @locked_platforms = @locked_gems.platforms
+        @most_specific_locked_platform = @locked_gems.most_specific_locked_platform
         @platforms = @locked_platforms.dup
         @locked_bundler_version = @locked_gems.bundler_version
         @locked_ruby_version = @locked_gems.ruby_version
+        @locked_deps = @locked_gems.dependencies
         @originally_locked_specs = SpecSet.new(@locked_gems.specs)
+        @locked_checksums = @locked_gems.checksums
 
-        if unlock != true
-          @locked_deps    = @locked_gems.dependencies
-          @locked_specs   = @originally_locked_specs
-          @locked_sources = @locked_gems.sources
-        else
-          @unlock         = {}
-          @locked_deps    = {}
+        if @unlocking_all
           @locked_specs   = SpecSet.new([])
           @locked_sources = []
+        else
+          @locked_specs   = @originally_locked_specs
+          @locked_sources = @locked_gems.sources
         end
       else
-        @unlock         = {}
+        @locked_gems = nil
+        @locked_platforms = []
+        @most_specific_locked_platform = nil
         @platforms      = []
-        @locked_gems    = nil
         @locked_deps    = {}
         @locked_specs   = SpecSet.new([])
         @originally_locked_specs = @locked_specs
         @locked_sources = []
-        @locked_platforms = []
+        @locked_checksums = Bundler.feature_flag.lockfile_checksums?
       end
 
       locked_gem_sources = @locked_sources.select {|s| s.is_a?(Source::Rubygems) }
@@ -127,67 +141,90 @@ def initialize(lockfile, dependencies, sources, unlock, ruby_version = nil, opti
         @sources.merged_gem_lockfile_sections!(locked_gem_sources.first)
       end
 
-      @unlock[:sources] ||= []
-      @unlock[:ruby] ||= if @ruby_version && locked_ruby_version_object
+      @unlocking_ruby ||= if @ruby_version && locked_ruby_version_object
         @ruby_version.diff(locked_ruby_version_object)
       end
-      @unlocking ||= @unlock[:ruby] ||= (!@locked_ruby_version ^ !@ruby_version)
+      @unlocking ||= @unlocking_ruby ||= (!@locked_ruby_version ^ !@ruby_version)
 
-      add_current_platform unless Bundler.frozen_bundle?
+      @current_platform_missing = add_current_platform unless Bundler.frozen_bundle?
 
-      converge_path_sources_to_gemspec_sources
-      @path_changes = converge_paths
       @source_changes = converge_sources
+      @path_changes = converge_paths
 
-      if @unlock[:conservative]
-        @unlock[:gems] ||= @dependencies.map(&:name)
+      if conservative
+        @gems_to_unlock = @explicit_unlocks.any? ? @explicit_unlocks : @dependencies.map(&:name)
       else
-        eager_unlock = (@unlock[:gems] || []).map {|name| Dependency.new(name, ">= 0") }
-        @unlock[:gems] = @locked_specs.for(eager_unlock, false, platforms).map(&:name).uniq
+        eager_unlock = @explicit_unlocks.map {|name| Dependency.new(name, ">= 0") }
+        @gems_to_unlock = @locked_specs.for(eager_unlock, platforms).map(&:name).uniq
       end
 
       @dependency_changes = converge_dependencies
       @local_changes = converge_locals
 
-      @missing_lockfile_dep = check_missing_lockfile_dep
+      check_lockfile
     end
 
     def gem_version_promoter
       @gem_version_promoter ||= GemVersionPromoter.new
     end
 
-    def resolve_only_locally!
-      @remote = false
+    def check!
+      # If dependencies have changed, we need to resolve remotely. Otherwise,
+      # since we'll be resolving with a single local source, we may end up
+      # locking gems under the wrong source in the lockfile, and missing lockfile
+      # checksums
+      resolve_remotely! if @dependency_changes
+
+      # Now do a local only resolve, to verify if any gems are missing locally
       sources.local_only!
       resolve
     end
 
+    #
+    # Setup sources according to the given options and the state of the
+    # definition.
+    #
+    # @return [Boolean] Whether fetching remote information will be necessary or not
+    #
+    def setup_domain!(options = {})
+      prefer_local! if options[:"prefer-local"]
+
+      if options[:add_checksums] || (!options[:local] && install_needed?)
+        remotely!
+        true
+      else
+        Bundler.settings.set_command_option(:jobs, 1) unless install_needed? # to avoid the overhead of Bundler::Worker
+        with_cache!
+        false
+      end
+    end
+
     def resolve_with_cache!
-      sources.cached!
+      with_cache!
+
       resolve
     end
 
+    def with_cache!
+      sources.local!
+      sources.cached!
+    end
+
     def resolve_remotely!
-      @remote = true
-      sources.remote!
+      remotely!
+
       resolve
     end
 
-    def resolution_mode=(options)
-      if options["local"]
-        @remote = false
-      else
-        @remote = true
-        @prefer_local = options["prefer-local"]
-      end
+    def remotely!
+      sources.cached!
+      sources.remote!
     end
 
-    def setup_sources_for_resolve
-      if @remote == false
-        sources.cached!
-      else
-        sources.remote!
-      end
+    def prefer_local!
+      @prefer_local = true
+
+      sources.prefer_local!
     end
 
     # For given dependency list returns a SpecSet with Gemspec of all the required
@@ -209,7 +246,7 @@ def removed_specs
     end
 
     def missing_specs
-      resolve.materialize(requested_dependencies).missing_specs
+      resolve.missing_specs_for(requested_dependencies)
     end
 
     def missing_specs?
@@ -220,9 +257,9 @@ def missing_specs?
     rescue BundlerError => e
       @resolve = nil
       @resolver = nil
-      @resolution_packages = nil
+      @resolution_base = nil
+      @source_requirements = nil
       @specs = nil
-      @gem_version_promoter = nil
 
       Bundler.ui.debug "The definition is missing dependencies, failed to resolve & materialize locally (#{e})"
       true
@@ -245,8 +282,9 @@ def current_locked_dependencies
     end
 
     def filter_relevant(dependencies)
+      platforms_array = [Bundler.generic_local_platform].freeze
       dependencies.select do |d|
-        d.should_include? && !d.gem_platforms([generic_local_platform]).empty?
+        d.should_include? && !d.gem_platforms(platforms_array).empty?
       end
     end
 
@@ -270,9 +308,11 @@ def specs_for(groups)
 
     def dependencies_for(groups)
       groups.map!(&:to_sym)
-      current_dependencies.reject do |d|
-        (d.groups & groups).empty?
+      deps = current_dependencies # always returns a new array
+      deps.select! do |d|
+        d.groups.intersect?(groups)
       end
+      deps
     end
 
     # Resolve all the dependencies specified in Gemfile. It ensures that
@@ -290,59 +330,52 @@ def resolve
           SpecSet.new(filter_specs(@locked_specs, @dependencies - deleted_deps))
         else
           Bundler.ui.debug "Found no changes, using resolution from the lockfile"
-          if @removed_platform || @locked_gems.may_include_redundant_platform_specific_gems?
+          if @removed_platforms.any? || @locked_gems.may_include_redundant_platform_specific_gems?
             SpecSet.new(filter_specs(@locked_specs, @dependencies))
           else
             @locked_specs
           end
         end
       else
-        Bundler.ui.debug "Found changes from the lockfile, re-resolving dependencies because #{change_reason}"
+        Bundler.ui.debug resolve_needed_reason
+
         start_resolution
       end
     end
 
     def spec_git_paths
-      sources.git_sources.map {|s| File.realpath(s.path) if File.exist?(s.path) }.compact
+      sources.git_sources.filter_map {|s| File.realpath(s.path) if File.exist?(s.path) }
     end
 
     def groups
-      dependencies.map(&:groups).flatten.uniq
+      dependencies.flat_map(&:groups).uniq
     end
 
-    def lock(file, preserve_unknown_sections = false)
-      return if Definition.no_lock
-
-      contents = to_lock
-
-      # Convert to \r\n if the existing lock has them
-      # i.e., Windows with `git config core.autocrlf=true`
-      contents.gsub!(/\n/, "\r\n") if @lockfile_contents.match?("\r\n")
-
-      if @locked_bundler_version
-        locked_major = @locked_bundler_version.segments.first
-        current_major = bundler_version_to_lock.segments.first
-
-        updating_major = locked_major < current_major
-      end
+    def lock(file_or_preserve_unknown_sections = false, preserve_unknown_sections_or_unused = false)
+      if [true, false, nil].include?(file_or_preserve_unknown_sections)
+        target_lockfile = lockfile
+        preserve_unknown_sections = file_or_preserve_unknown_sections
+      else
+        target_lockfile = file_or_preserve_unknown_sections
+        preserve_unknown_sections = preserve_unknown_sections_or_unused
 
-      preserve_unknown_sections ||= !updating_major && (Bundler.frozen_bundle? || !(unlocking? || @unlocking_bundler))
+        suggestion = if target_lockfile == lockfile
+          "To fix this warning, remove it from the `Definition#lock` call."
+        else
+          "Instead, instantiate a new definition passing `#{target_lockfile}`, and call `lock` without a file argument on that definition"
+        end
 
-      return if file && File.exist?(file) && lockfiles_equal?(@lockfile_contents, contents, preserve_unknown_sections)
+        msg = "`Definition#lock` was passed a target file argument. #{suggestion}"
 
-      if Bundler.frozen_bundle?
-        Bundler.ui.error "Cannot write a changed lockfile while frozen."
-        return
+        Bundler::SharedHelpers.major_deprecation 2, msg
       end
 
-      SharedHelpers.filesystem_access(file) do |p|
-        File.open(p, "wb") {|f| f.puts(contents) }
-      end
+      write_lock(target_lockfile, preserve_unknown_sections)
     end
 
     def locked_ruby_version
       return unless ruby_version
-      if @unlock[:ruby] || !@locked_ruby_version
+      if @unlocking_ruby || !@locked_ruby_version
         Bundler::RubyVersion.system
       else
         @locked_ruby_version
@@ -371,51 +404,22 @@ def to_lock
     end
 
     def ensure_equivalent_gemfile_and_lockfile(explicit_flag = false)
-      added =   []
-      deleted = []
-      changed = []
-
-      new_platforms = @platforms - @locked_platforms
-      deleted_platforms = @locked_platforms - @platforms
-      added.concat new_platforms.map {|p| "* platform: #{p}" }
-      deleted.concat deleted_platforms.map {|p| "* platform: #{p}" }
-
-      added.concat new_deps.map {|d| "* #{pretty_dep(d)}" } if new_deps.any?
-      deleted.concat deleted_deps.map {|d| "* #{pretty_dep(d)}" } if deleted_deps.any?
-
-      both_sources = Hash.new {|h, k| h[k] = [] }
-      current_dependencies.each {|d| both_sources[d.name][0] = d }
-      current_locked_dependencies.each {|d| both_sources[d.name][1] = d }
+      return unless Bundler.frozen_bundle?
 
-      both_sources.each do |name, (dep, lock_dep)|
-        next if dep.nil? || lock_dep.nil?
-
-        gemfile_source = dep.source || default_source
-        lock_source = lock_dep.source || default_source
-        next if lock_source.include?(gemfile_source)
+      raise ProductionError, "Frozen mode is set, but there's no lockfile" unless lockfile_exists?
 
-        gemfile_source_name = dep.source ? gemfile_source.to_gemfile : "no specified source"
-        lockfile_source_name = lock_dep.source ? lock_source.to_gemfile : "no specified source"
-        changed << "* #{name} from `#{lockfile_source_name}` to `#{gemfile_source_name}`"
-      end
-
-      reason = change_reason
-      msg = String.new
-      msg << "#{reason.capitalize.strip}, but the lockfile can't be updated because frozen mode is set"
-      msg << "\n\nYou have added to the Gemfile:\n" << added.join("\n") if added.any?
-      msg << "\n\nYou have deleted from the Gemfile:\n" << deleted.join("\n") if deleted.any?
-      msg << "\n\nYou have changed in the Gemfile:\n" << changed.join("\n") if changed.any?
-      msg << "\n\nRun `bundle install` elsewhere and add the updated #{Bundler.default_lockfile.relative_path_from(SharedHelpers.pwd)} to version control.\n"
+      msg = lockfile_changes_summary("frozen mode is set")
+      return unless msg
 
       unless explicit_flag
         suggested_command = unless Bundler.settings.locations("frozen").keys.include?(:env)
           "bundle config set frozen false"
         end
-        msg << "If this is a development machine, remove the #{Bundler.default_gemfile.relative_path_from(SharedHelpers.pwd)} " \
+        msg << "\n\nIf this is a development machine, remove the #{SharedHelpers.relative_lockfile_path} " \
                "freeze by running `#{suggested_command}`." if suggested_command
       end
 
-      raise ProductionError, msg if added.any? || deleted.any? || changed.any? || !nothing_changed?
+      raise ProductionError, msg
     end
 
     def validate_runtime!
@@ -449,50 +453,168 @@ def validate_ruby!
     end
 
     def validate_platforms!
-      return if current_platform_locked?
+      return if current_platform_locked? || @platforms.include?(Gem::Platform::RUBY)
 
       raise ProductionError, "Your bundle only supports platforms #{@platforms.map(&:to_s)} " \
         "but your local platform is #{Bundler.local_platform}. " \
         "Add the current platform to the lockfile with\n`bundle lock --add-platform #{Bundler.local_platform}` and try again."
     end
 
+    def normalize_platforms
+      resolve.normalize_platforms!(current_dependencies, platforms)
+
+      @resolve = SpecSet.new(resolve.for(current_dependencies, @platforms))
+    end
+
     def add_platform(platform)
-      @new_platform ||= !@platforms.include?(platform)
-      @platforms |= [platform]
+      return if @platforms.include?(platform)
+
+      @new_platforms << platform
+      @platforms << platform
     end
 
     def remove_platform(platform)
-      removed_platform = @platforms.delete(Gem::Platform.new(platform))
-      @removed_platform ||= removed_platform
-      return if removed_platform
-      raise InvalidOption, "Unable to remove the platform `#{platform}` since the only platforms are #{@platforms.join ", "}"
-    end
+      raise InvalidOption, "Unable to remove the platform `#{platform}` since the only platforms are #{@platforms.join ", "}" unless @platforms.include?(platform)
 
-    def most_specific_locked_platform
-      @platforms.min_by do |bundle_platform|
-        platform_specificity_match(bundle_platform, local_platform)
-      end
+      @removed_platforms << platform
+      @platforms.delete(platform)
     end
 
-    attr_reader :sources
-    private :sources
-
     def nothing_changed?
-      !@source_changes && !@dependency_changes && !@new_platform && !@path_changes && !@local_changes && !@missing_lockfile_dep && !@unlocking_bundler
+      !something_changed?
     end
 
     def no_resolve_needed?
-      !unlocking? && nothing_changed?
+      !resolve_needed?
     end
 
     def unlocking?
       @unlocking
     end
 
+    attr_writer :source_requirements
+
+    def add_checksums
+      @locked_checksums = true
+
+      setup_domain!(add_checksums: true)
+
+      specs # force materialization to real specifications, so that checksums are fetched
+    end
+
     private
 
+    def lockfile_changes_summary(update_refused_reason)
+      added =   []
+      deleted = []
+      changed = []
+
+      added.concat @new_platforms.map {|p| "* platform: #{p}" }
+      deleted.concat @removed_platforms.map {|p| "* platform: #{p}" }
+
+      added.concat new_deps.map {|d| "* #{pretty_dep(d)}" } if new_deps.any?
+      deleted.concat deleted_deps.map {|d| "* #{pretty_dep(d)}" } if deleted_deps.any?
+
+      both_sources = Hash.new {|h, k| h[k] = [] }
+      current_dependencies.each {|d| both_sources[d.name][0] = d }
+      current_locked_dependencies.each {|d| both_sources[d.name][1] = d }
+
+      both_sources.each do |name, (dep, lock_dep)|
+        next if dep.nil? || lock_dep.nil?
+
+        gemfile_source = dep.source || default_source
+        lock_source = lock_dep.source || default_source
+        next if lock_source.include?(gemfile_source)
+
+        gemfile_source_name = dep.source ? gemfile_source.to_gemfile : "no specified source"
+        lockfile_source_name = lock_dep.source ? lock_source.to_gemfile : "no specified source"
+        changed << "* #{name} from `#{lockfile_source_name}` to `#{gemfile_source_name}`"
+      end
+
+      return unless added.any? || deleted.any? || changed.any? || resolve_needed?
+
+      msg = String.new("#{change_reason.capitalize.strip}, but ")
+      msg << "the lockfile " unless msg.start_with?("Your lockfile")
+      msg << "can't be updated because #{update_refused_reason}"
+      msg << "\n\nYou have added to the Gemfile:\n" << added.join("\n") if added.any?
+      msg << "\n\nYou have deleted from the Gemfile:\n" << deleted.join("\n") if deleted.any?
+      msg << "\n\nYou have changed in the Gemfile:\n" << changed.join("\n") if changed.any?
+      msg << "\n\nRun `bundle install` elsewhere and add the updated #{SharedHelpers.relative_lockfile_path} to version control.\n" unless unlocking?
+      msg
+    end
+
+    def install_needed?
+      resolve_needed? || missing_specs?
+    end
+
+    def something_changed?
+      return true unless lockfile_exists?
+
+      @source_changes ||
+        @dependency_changes ||
+        @current_platform_missing ||
+        @new_platforms.any? ||
+        @path_changes ||
+        @local_changes ||
+        @missing_lockfile_dep ||
+        @unlocking_bundler ||
+        @locked_spec_with_missing_checksums ||
+        @locked_spec_with_missing_deps ||
+        @locked_spec_with_invalid_deps
+    end
+
+    def resolve_needed?
+      unlocking? || something_changed?
+    end
+
+    def should_add_extra_platforms?
+      !lockfile_exists? && Bundler::MatchPlatform.generic_local_platform_is_ruby? && !Bundler.settings[:force_ruby_platform]
+    end
+
+    def lockfile_exists?
+      lockfile && File.exist?(lockfile)
+    end
+
+    def write_lock(file, preserve_unknown_sections)
+      return if Definition.no_lock || file.nil?
+
+      contents = to_lock
+
+      # Convert to \r\n if the existing lock has them
+      # i.e., Windows with `git config core.autocrlf=true`
+      contents.gsub!(/\n/, "\r\n") if @lockfile_contents.match?("\r\n")
+
+      if @locked_bundler_version
+        locked_major = @locked_bundler_version.segments.first
+        current_major = bundler_version_to_lock.segments.first
+
+        updating_major = locked_major < current_major
+      end
+
+      preserve_unknown_sections ||= !updating_major && (Bundler.frozen_bundle? || !(unlocking? || @unlocking_bundler))
+
+      if File.exist?(file) && lockfiles_equal?(@lockfile_contents, contents, preserve_unknown_sections)
+        return if Bundler.frozen_bundle?
+        SharedHelpers.filesystem_access(file) { FileUtils.touch(file) }
+        return
+      end
+
+      if Bundler.frozen_bundle?
+        Bundler.ui.error "Cannot write a changed lockfile while frozen."
+        return
+      end
+
+      begin
+        SharedHelpers.filesystem_access(file) do |p|
+          File.open(p, "wb") {|f| f.puts(contents) }
+        end
+      rescue ReadOnlyFileSystemError
+        raise ProductionError, lockfile_changes_summary("file system is read-only")
+      end
+    end
+
     def resolver
-      @resolver ||= Resolver.new(resolution_packages, gem_version_promoter)
+      @resolver ||= Resolver.new(resolution_base, gem_version_promoter, @most_specific_locked_platform)
     end
 
     def expanded_dependencies
@@ -501,36 +623,65 @@ def expanded_dependencies
 
     def dependencies_with_bundler
       return dependencies unless @unlocking_bundler
-      return dependencies if dependencies.map(&:name).include?("bundler")
+      return dependencies if dependencies.any? {|d| d.name == "bundler" }
 
       [Dependency.new("bundler", @unlocking_bundler)] + dependencies
     end
 
-    def resolution_packages
-      @resolution_packages ||= begin
+    def resolution_base
+      @resolution_base ||= begin
         last_resolve = converge_locked_specs
-        remove_ruby_from_platforms_if_necessary!(current_dependencies)
-        packages = Resolver::Base.new(source_requirements, expanded_dependencies, last_resolve, @platforms, :locked_specs => @originally_locked_specs, :unlock => @unlock[:gems], :prerelease => gem_version_promoter.pre?)
-        additional_base_requirements_for_resolve(packages, last_resolve)
+        remove_invalid_platforms!
+        new_resolution_platforms = @current_platform_missing ? @new_platforms + [Bundler.local_platform] : @new_platforms
+        base = Resolver::Base.new(source_requirements, expanded_dependencies, last_resolve, @platforms, locked_specs: @originally_locked_specs, unlock: @unlocking_all || @gems_to_unlock, prerelease: gem_version_promoter.pre?, prefer_local: @prefer_local, new_platforms: new_resolution_platforms)
+        base = additional_base_requirements_to_prevent_downgrades(base)
+        base = additional_base_requirements_to_force_updates(base)
+        base
       end
     end
 
-    def filter_specs(specs, deps)
-      SpecSet.new(specs).for(deps, false, platforms)
+    def filter_specs(specs, deps, skips: [])
+      SpecSet.new(specs).for(deps, platforms, skips: skips)
     end
 
     def materialize(dependencies)
-      specs = resolve.materialize(dependencies)
-      missing_specs = specs.missing_specs
+      # Tracks potential endless loops trying to re-resolve.
+      # TODO: Remove as dead code if not reports are received in a while
+      incorrect_spec = nil
+
+      specs = begin
+        resolve.materialize(dependencies)
+      rescue IncorrectLockfileDependencies => e
+        raise if Bundler.frozen_bundle?
+
+        spec = e.spec
+        raise "Infinite loop while fixing lockfile dependencies" if incorrect_spec == spec
+
+        incorrect_spec = spec
+        reresolve_without([spec])
+        retry
+      end
+
+      missing_specs = resolve.missing_specs
 
       if missing_specs.any?
         missing_specs.each do |s|
           locked_gem = @locked_specs[s.name].last
-          next if locked_gem.nil? || locked_gem.version != s.version || !@remote
-          raise GemNotFound, "Your bundle is locked to #{locked_gem} from #{locked_gem.source}, but that version can " \
-                             "no longer be found in that source. That means the author of #{locked_gem} has removed it. " \
-                             "You'll need to update your bundle to a version other than #{locked_gem} that hasn't been " \
-                             "removed in order to install."
+          next if locked_gem.nil? || locked_gem.version != s.version || sources.local_mode?
+
+          message = if sources.implicit_global_source?
+            "Because your Gemfile specifies no global remote source, your bundle is locked to " \
+            "#{locked_gem} from #{locked_gem.source}. However, #{locked_gem} is not installed. You'll " \
+            "need to either add a global remote source to your Gemfile or make sure #{locked_gem} is " \
+            "available locally before rerunning Bundler."
+          else
+            "Your bundle is locked to #{locked_gem} from #{locked_gem.source}, but that version can " \
+            "no longer be found in that source. That means the author of #{locked_gem} has removed it. " \
+            "You'll need to update your bundle to a version other than #{locked_gem} that hasn't been " \
+            "removed in order to install."
+          end
+
+          raise GemNotFound, message
         end
 
         missing_specs_list = missing_specs.group_by(&:source).map do |source, missing_specs_for_source|
@@ -540,96 +691,165 @@ def materialize(dependencies)
         raise GemNotFound, "Could not find #{missing_specs_list.join(" nor ")}"
       end
 
-      incomplete_specs = specs.incomplete_specs
+      partially_missing_specs = resolve.partially_missing_specs
+
+      if partially_missing_specs.any? && !sources.local_mode?
+        Bundler.ui.warn "Some locked specs have possibly been yanked (#{partially_missing_specs.map(&:full_name).join(", ")}). Ignoring them..."
+
+        resolve.delete(partially_missing_specs)
+      end
+
+      incomplete_specs = resolve.incomplete_specs
       loop do
         break if incomplete_specs.empty?
 
         Bundler.ui.debug("The lockfile does not have all gems needed for the current platform though, Bundler will still re-resolve dependencies")
-        setup_sources_for_resolve
-        resolution_packages.delete(incomplete_specs)
-        @resolve = start_resolution
+        sources.remote!
+        reresolve_without(incomplete_specs)
         specs = resolve.materialize(dependencies)
 
-        still_incomplete_specs = specs.incomplete_specs
+        still_incomplete_specs = resolve.incomplete_specs
 
         if still_incomplete_specs == incomplete_specs
-          package = resolution_packages.get_package(incomplete_specs.first.name)
-          resolver.raise_not_found! package
+          resolver.raise_incomplete! incomplete_specs
         end
 
         incomplete_specs = still_incomplete_specs
       end
 
+      insecurely_materialized_specs = resolve.insecurely_materialized_specs
+
+      if insecurely_materialized_specs.any?
+        Bundler.ui.warn "The following platform specific gems are getting installed, yet the lockfile includes only their generic ruby version:\n" \
+                        " * #{insecurely_materialized_specs.map(&:full_name).join("\n * ")}\n" \
+                        "Please run `bundle lock --normalize-platforms` and commit the resulting lockfile.\n" \
+                        "Alternatively, you may run `bundle lock --add-platform <list-of-platforms-that-you-want-to-support>`"
+      end
+
       bundler = sources.metadata_source.specs.search(["bundler", Bundler.gem_version]).last
       specs["bundler"] = bundler
 
       specs
     end
 
+    def reresolve_without(incomplete_specs)
+      resolution_base.delete(incomplete_specs)
+      @resolve = start_resolution
+    end
+
     def start_resolution
-      result = resolver.start
+      local_platform_needed_for_resolvability = @most_specific_non_local_locked_platform && !@platforms.include?(Bundler.local_platform)
+      @platforms << Bundler.local_platform if local_platform_needed_for_resolvability
+      add_platform(Gem::Platform::RUBY) if RUBY_ENGINE == "truffleruby"
 
-      @resolved_bundler_version = result.find {|spec| spec.name == "bundler" }&.version
+      result = SpecSet.new(resolver.start)
 
-      SpecSet.new(SpecSet.new(result).for(dependencies, false, @platforms))
-    end
+      @resolved_bundler_version = result.find {|spec| spec.name == "bundler" }&.version
 
-    def precompute_source_requirements_for_indirect_dependencies?
-      sources.non_global_rubygems_sources.all?(&:dependency_api_available?) && !sources.aggregate_global_source?
-    end
+      @new_platforms.each do |platform|
+        incomplete_specs = result.incomplete_specs_for_platform(current_dependencies, platform)
 
-    def pin_locally_available_names(source_requirements)
-      source_requirements.each_with_object({}) do |(name, original_source), new_source_requirements|
-        local_source = original_source.dup
-        local_source.local_only!
+        if incomplete_specs.any?
+          resolver.raise_incomplete! incomplete_specs
+        end
+      end
 
-        new_source_requirements[name] = if local_source.specs.search(name).any?
-          local_source
-        else
-          original_source
+      if @most_specific_non_local_locked_platform
+        if result.incomplete_for_platform?(current_dependencies, @most_specific_non_local_locked_platform)
+          @platforms.delete(@most_specific_non_local_locked_platform)
+        elsif local_platform_needed_for_resolvability
+          @platforms.delete(Bundler.local_platform)
         end
       end
-    end
 
-    def current_ruby_platform_locked?
-      return false unless generic_local_platform == Gem::Platform::RUBY
-      return false if Bundler.settings[:force_ruby_platform] && !@platforms.include?(Gem::Platform::RUBY)
+      if should_add_extra_platforms?
+        result.add_extra_platforms!(platforms)
+      elsif @originally_invalid_platforms.any?
+        result.add_originally_invalid_platforms!(platforms, @originally_invalid_platforms)
+      end
+
+      SpecSet.new(result.for(dependencies, @platforms | [Gem::Platform::RUBY]))
+    end
 
-      current_platform_locked?
+    def precompute_source_requirements_for_indirect_dependencies?
+      sources.non_global_rubygems_sources.all?(&:dependency_api_available?) && !sources.aggregate_global_source?
     end
 
     def current_platform_locked?
       @platforms.any? do |bundle_platform|
-        MatchPlatform.platforms_match?(bundle_platform, Bundler.local_platform)
+        Bundler.generic_local_platform == bundle_platform || Bundler.local_platform === bundle_platform
       end
     end
 
     def add_current_platform
-      return if current_ruby_platform_locked?
+      return if @platforms.include?(Bundler.local_platform)
 
-      add_platform(local_platform)
+      @most_specific_non_local_locked_platform = find_most_specific_locked_platform
+      return if @most_specific_non_local_locked_platform
+
+      @platforms << Bundler.local_platform
+      true
+    end
+
+    def find_most_specific_locked_platform
+      return unless current_platform_locked?
+
+      @most_specific_locked_platform
+    end
+
+    def resolve_needed_reason
+      if lockfile_exists?
+        if unlocking?
+          "Re-resolving dependencies because #{unlocking_reason}"
+        else
+          "Found changes from the lockfile, re-resolving dependencies because #{lockfile_changed_reason}"
+        end
+      else
+        "Resolving dependencies because there's no lockfile"
+      end
     end
 
     def change_reason
-      if unlocking?
-        unlock_reason = @unlock.reject {|_k, v| Array(v).empty? }.map do |k, v|
-          if v == true
-            k.to_s
-          else
-            v = Array(v)
-            "#{k}: (#{v.join(", ")})"
-          end
-        end.join(", ")
-        return "bundler is unlocking #{unlock_reason}"
+      if resolve_needed?
+        if unlocking?
+          unlocking_reason
+        else
+          lockfile_changed_reason
+        end
+      else
+        "some dependencies were deleted from your gemfile"
+      end
+    end
+
+    def unlocking_reason
+      unlock_targets = if @gems_to_unlock.any?
+        ["gems", @gems_to_unlock]
+      elsif @sources_to_unlock.any?
+        ["sources", @sources_to_unlock]
       end
+
+      unlock_reason = if unlock_targets
+        "#{unlock_targets.first}: (#{unlock_targets.last.join(", ")})"
+      else
+        @unlocking_ruby ? "ruby" : ""
+      end
+
+      "bundler is unlocking #{unlock_reason}"
+    end
+
+    def lockfile_changed_reason
       [
         [@source_changes, "the list of sources changed"],
         [@dependency_changes, "the dependencies in your gemfile changed"],
-        [@new_platform, "you added a new platform to your gemfile"],
+        [@current_platform_missing, "your lockfile is missing the current platform"],
+        [@new_platforms.any?, "you are adding a new platform to your lockfile"],
         [@path_changes, "the gemspecs for path gems changed"],
         [@local_changes, "the gemspecs for git local gems changed"],
-        [@missing_lockfile_dep, "your lock file is missing \"#{@missing_lockfile_dep}\""],
+        [@missing_lockfile_dep, "your lockfile is missing \"#{@missing_lockfile_dep}\""],
         [@unlocking_bundler, "an update to the version of Bundler itself was requested"],
+        [@locked_spec_with_missing_checksums, "your lockfile is missing a CHECKSUMS entry for \"#{@locked_spec_with_missing_checksums}\""],
+        [@locked_spec_with_missing_deps, "your lockfile includes \"#{@locked_spec_with_missing_deps}\" but not some of its dependencies"],
+        [@locked_spec_with_invalid_deps, "your lockfile does not satisfy dependencies of \"#{@locked_spec_with_invalid_deps}\""],
       ].select(&:first).map(&:last).join(", ")
     end
 
@@ -645,8 +865,8 @@ def specs_changed?(source)
       !locked || dependencies_for_source_changed?(source, locked) || specs_for_source_changed?(source)
     end
 
-    def dependencies_for_source_changed?(source, locked_source = source)
-      deps_for_source = @dependencies.select {|s| s.source == source }
+    def dependencies_for_source_changed?(source, locked_source)
+      deps_for_source = @dependencies.select {|dep| dep.source == source }
       locked_deps_for_source = locked_dependencies.select {|dep| dep.source == locked_source }
 
       deps_for_source.uniq.sort != locked_deps_for_source.sort
@@ -654,10 +874,9 @@ def dependencies_for_source_changed?(source, locked_source = source)
 
     def specs_for_source_changed?(source)
       locked_index = Index.new
-      locked_index.use(@locked_specs.select {|s| source.can_lock?(s) })
+      locked_index.use(@locked_specs.select {|s| s.replace_source_with!(source) })
 
-      # order here matters, since Index#== is checking source.specs.include?(locked_index)
-      locked_index != source.specs
+      !locked_index.subset?(source.specs)
     rescue PathError, GitError => e
       Bundler.ui.debug "Assuming that #{source} has not changed since fetching its specs errored (#{e})"
       false
@@ -673,7 +892,7 @@ def converge_locals
         spec   = @dependencies.find {|s| s.name == k }
         source = spec&.source
         if source&.respond_to?(:local_override!)
-          source.unlock! if @unlock[:gems].include?(spec.name)
+          source.unlock! if @gems_to_unlock.include?(spec.name)
           locals << [source, source.local_override!(v)]
         end
       end
@@ -681,27 +900,40 @@ def converge_locals
       sources_with_changes = locals.select do |source, changed|
         changed || specs_changed?(source)
       end.map(&:first)
-      !sources_with_changes.each {|source| @unlock[:sources] << source.name }.empty?
+      !sources_with_changes.each {|source| @sources_to_unlock << source.name }.empty?
     end
 
-    def check_missing_lockfile_dep
-      all_locked_specs = @locked_specs.map(&:name) << "bundler"
+    def check_lockfile
+      @locked_spec_with_invalid_deps = nil
+      @locked_spec_with_missing_deps = nil
+      @locked_spec_with_missing_checksums = nil
+
+      missing_deps = []
+      missing_checksums = []
+      invalid = []
+
+      @locked_specs.each do |s|
+        missing_checksums << s if @locked_checksums && s.source.checksum_store.missing?(s)
 
-      missing = @locked_specs.select do |s|
-        s.dependencies.any? {|dep| !all_locked_specs.include?(dep.name) }
+        validation = @locked_specs.validate_deps(s)
+
+        missing_deps << s if validation == :missing
+        invalid << s if validation == :invalid
       end
 
-      if missing.any?
-        @locked_specs.delete(missing)
+      @locked_spec_with_missing_checksums = missing_checksums.first.name if missing_checksums.any?
+
+      if missing_deps.any?
+        @locked_specs.delete(missing_deps)
 
-        return missing.first.name
+        @locked_spec_with_missing_deps = missing_deps.first.name
       end
 
-      return if @dependency_changes
+      if invalid.any?
+        @locked_specs.delete(invalid)
 
-      current_dependencies.find do |d|
-        @locked_specs[d.name].empty? && d.name != "bundler"
-      end&.name
+        @locked_spec_with_invalid_deps = invalid.first.name
+      end
     end
 
     def converge_paths
@@ -710,24 +942,6 @@ def converge_paths
       end
     end
 
-    def converge_path_source_to_gemspec_source(source)
-      return source unless source.instance_of?(Source::Path)
-      gemspec_source = sources.path_sources.find {|s| s.is_a?(Source::Gemspec) && s.as_path_source == source }
-      gemspec_source || source
-    end
-
-    def converge_path_sources_to_gemspec_sources
-      @locked_sources.map! do |source|
-        converge_path_source_to_gemspec_source(source)
-      end
-      @locked_specs.each do |spec|
-        spec.source &&= converge_path_source_to_gemspec_source(spec.source)
-      end
-      @locked_deps.each do |_, dep|
-        dep.source &&= converge_path_source_to_gemspec_source(dep.source)
-      end
-    end
-
     def converge_sources
       # Replace the sources from the Gemfile with the sources from the Gemfile.lock,
       # if they exist in the Gemfile.lock and are `==`. If you can't find an equivalent
@@ -735,12 +949,17 @@ def converge_sources
       changes = sources.replace_sources!(@locked_sources)
 
       sources.all_sources.each do |source|
+        # has to be done separately, because we want to keep the locked checksum
+        # store for a source, even when doing a full update
+        if @locked_checksums && @locked_gems && locked_source = @locked_gems.sources.find {|s| s == source && !s.equal?(source) }
+          source.checksum_store.merge!(locked_source.checksum_store)
+        end
         # If the source is unlockable and the current command allows an unlock of
         # the source (for example, you are doing a `bundle update <foo>` of a git-pinned
         # gem), unlock it. For git sources, this means to unlock the revision, which
         # will cause the `ref` used to be the most recent for the branch (or master) if
         # an explicit `ref` is not used.
-        if source.respond_to?(:unlock!) && @unlock[:sources].include?(source.name)
+        if source.respond_to?(:unlock!) && @sources_to_unlock.include?(source.name)
           source.unlock!
           changes = true
         end
@@ -750,34 +969,39 @@ def converge_sources
     end
 
     def converge_dependencies
-      changes = false
+      @missing_lockfile_dep = nil
+      @changed_dependencies = []
 
-      @dependencies.each do |dep|
+      current_dependencies.each do |dep|
         if dep.source
           dep.source = sources.get(dep.source)
         end
 
-        next if unlocking?
+        name = dep.name
 
-        unless locked_dep = @locked_deps[dep.name]
-          changes = true
-          next
-        end
+        dep_changed = @locked_deps[name].nil?
 
-        # Gem::Dependency#== matches Gem::Dependency#type. As the lockfile
-        # doesn't carry a notion of the dependency type, if you use
-        # add_development_dependency in a gemspec that's loaded with the gemspec
-        # directive, the lockfile dependencies and resolved dependencies end up
-        # with a mismatch on #type. Work around that by setting the type on the
-        # dep from the lockfile.
-        locked_dep.instance_variable_set(:@type, dep.type)
+        unless name == "bundler"
+          locked_specs = @originally_locked_specs[name]
+
+          if locked_specs.empty?
+            @missing_lockfile_dep = name if dep_changed == false
+          else
+            if locked_specs.map(&:source).uniq.size > 1
+              @locked_specs.delete(locked_specs.select {|s| s.source != dep.source })
+            end
+
+            unless dep.matches_spec?(locked_specs.first)
+              @gems_to_unlock << name
+              dep_changed = true
+            end
+          end
+        end
 
-        # We already know the name matches from the hash lookup
-        # so we only need to check the requirement now
-        changes ||= dep.requirement != locked_dep.requirement
+        @changed_dependencies << name if dep_changed
       end
 
-      changes
+      @changed_dependencies.any?
     end
 
     # Remove elements from the locked specs that are expired. This will most
@@ -786,7 +1010,7 @@ def converge_dependencies
     def converge_locked_specs
       converged = converge_specs(@locked_specs)
 
-      resolve = SpecSet.new(converged.reject {|s| @unlock[:gems].include?(s.name) })
+      resolve = SpecSet.new(converged)
 
       diff = nil
 
@@ -807,82 +1031,65 @@ def converge_specs(specs)
       converged = []
       deps = []
 
-      @specs_that_changed_sources = []
-
       specs.each do |s|
         name = s.name
         dep = @dependencies.find {|d| s.satisfies?(d) }
         lockfile_source = s.source
 
         if dep
-          gemfile_source = dep.source || default_source
+          replacement_source = dep.source
 
-          @specs_that_changed_sources << s if gemfile_source != lockfile_source
-          deps << dep if !dep.source || lockfile_source.include?(dep.source)
-          @unlock[:gems] << name if lockfile_source.include?(dep.source) && lockfile_source != gemfile_source
-
-          # Replace the locked dependency's source with the equivalent source from the Gemfile
-          s.source = gemfile_source
+          deps << dep if !replacement_source || lockfile_source.include?(replacement_source) || new_deps.include?(dep)
         else
-          # Replace the locked dependency's source with the default source, if the locked source is no longer in the Gemfile
-          s.source = default_source unless sources.get(lockfile_source)
+          replacement_source = sources.get(lockfile_source)
         end
 
-        next if @unlock[:sources].include?(s.source.name)
+        # Replace the locked dependency's source with the equivalent source from the Gemfile
+        s.source = replacement_source || default_source
 
-        # Path sources have special logic
-        if s.source.instance_of?(Source::Path) || s.source.instance_of?(Source::Gemspec)
-          new_specs = begin
-            s.source.specs
-          rescue PathError
-            # if we won't need the source (according to the lockfile),
-            # don't error if the path source isn't available
-            next if specs.
-                    for(requested_dependencies, false).
-                    none? {|locked_spec| locked_spec.source == s.source }
-
-            raise
-          end
+        source = s.source
+        next if @sources_to_unlock.include?(source.name)
 
-          new_spec = new_specs[s].first
+        # Path sources have special logic
+        if source.instance_of?(Source::Path) || source.instance_of?(Source::Gemspec) || (source.instance_of?(Source::Git) && !@gems_to_unlock.include?(name) && deps.include?(dep))
+          new_spec = source.specs[s].first
           if new_spec
-            s.dependencies.replace(new_spec.dependencies)
+            s.runtime_dependencies.replace(new_spec.runtime_dependencies)
           else
             # If the spec is no longer in the path source, unlock it. This
             # commonly happens if the version changed in the gemspec
-            @unlock[:gems] << name
+            @gems_to_unlock << name
           end
         end
 
-        if dep.nil? && requested_dependencies.find {|d| name == d.name }
-          @unlock[:gems] << s.name
-        else
-          converged << s
-        end
+        converged << s
       end
 
-      filter_specs(converged, deps)
+      filter_specs(converged, deps, skips: @gems_to_unlock)
     end
 
     def metadata_dependencies
       @metadata_dependencies ||= [
-        Dependency.new("Ruby\0", Gem.ruby_version),
+        Dependency.new("Ruby\0", Bundler::RubyVersion.system.gem_version),
         Dependency.new("RubyGems\0", Gem::VERSION),
       ]
     end
 
     def source_requirements
+      @source_requirements ||= find_source_requirements
+    end
+
+    def find_source_requirements
       # Record the specs available in each gem's source, so that those
       # specs will be available later when the resolver knows where to
       # look for that gemspec (or its dependencies)
       source_requirements = if precompute_source_requirements_for_indirect_dependencies?
         all_requirements = source_map.all_requirements
-        all_requirements = pin_locally_available_names(all_requirements) if @prefer_local
-        { :default => default_source }.merge(all_requirements)
+        { default: default_source }.merge(all_requirements)
       else
-        { :default => Source::RubygemsAggregate.new(sources, source_map) }.merge(source_map.direct_requirements)
+        { default: Source::RubygemsAggregate.new(sources, source_map) }.merge(source_map.direct_requirements)
       end
-      source_requirements.merge!(source_map.locked_requirements) unless @remote
+      source_requirements.merge!(source_map.locked_requirements) if nothing_changed?
       metadata_dependencies.each do |dep|
         source_requirements[dep.name] = sources.metadata_source
       end
@@ -896,7 +1103,6 @@ def source_requirements
         source_requirements["bundler"] = sources.metadata_source # needs to come last to override
       end
 
-      verify_changed_sources!
       source_requirements
     end
 
@@ -904,14 +1110,6 @@ def default_source
       sources.default_source
     end
 
-    def verify_changed_sources!
-      @specs_that_changed_sources.each do |s|
-        if s.source.specs.search(s.name).empty?
-          raise GemNotFound, "Could not find gem '#{s.name}' in #{s.source}"
-        end
-      end
-    end
-
     def requested_groups
       values = groups - Bundler.settings[:without] - @optional_groups + Bundler.settings[:with]
       values &= Bundler.settings[:only] unless Bundler.settings[:only].empty?
@@ -932,26 +1130,53 @@ def lockfiles_equal?(current, proposed, preserve_unknown_sections)
       current == proposed
     end
 
-    def additional_base_requirements_for_resolve(resolution_packages, last_resolve)
-      return resolution_packages unless @locked_gems && !sources.expired_sources?(@locked_gems.sources)
-      converge_specs(@originally_locked_specs - last_resolve).each do |locked_spec|
+    def additional_base_requirements_to_prevent_downgrades(resolution_base)
+      return resolution_base unless @locked_gems && !sources.expired_sources?(@locked_gems.sources)
+      @originally_locked_specs.each do |locked_spec|
         next if locked_spec.source.is_a?(Source::Path)
-        resolution_packages.base_requirements[locked_spec.name] = Gem::Requirement.new(">= #{locked_spec.version}")
+
+        name = locked_spec.name
+        next if @changed_dependencies.include?(name)
+
+        resolution_base.base_requirements[name] = Gem::Requirement.new(">= #{locked_spec.version}")
       end
-      resolution_packages
+      resolution_base
     end
 
-    def remove_ruby_from_platforms_if_necessary!(dependencies)
-      return if Bundler.frozen_bundle? ||
-                Bundler.local_platform == Gem::Platform::RUBY ||
-                !platforms.include?(Gem::Platform::RUBY) ||
-                (@new_platform && platforms.last == Gem::Platform::RUBY) ||
-                @path_changes ||
-                @dependency_changes ||
-                !@originally_locked_specs.incomplete_ruby_specs?(dependencies)
+    def additional_base_requirements_to_force_updates(resolution_base)
+      return resolution_base if @explicit_unlocks.empty?
+      full_update = dup_for_full_unlock.resolve
+      @explicit_unlocks.each do |name|
+        version = full_update.version_for(name)
+        resolution_base.base_requirements[name] = Gem::Requirement.new("= #{version}") if version
+      end
+      resolution_base
+    end
+
+    def dup_for_full_unlock
+      unlocked_definition = self.class.new(@lockfile, @dependencies, @sources, true, @ruby_version, @optional_groups, @gemfiles)
+      unlocked_definition.source_requirements = source_requirements
+      unlocked_definition.gem_version_promoter.tap do |gvp|
+        gvp.level = gem_version_promoter.level
+        gvp.strict = gem_version_promoter.strict
+        gvp.pre = gem_version_promoter.pre
+      end
+      unlocked_definition
+    end
+
+    def remove_invalid_platforms!
+      return if Bundler.frozen_bundle?
+
+      skips = (@new_platforms + [Bundler.local_platform]).uniq
+
+      # We should probably avoid removing non-ruby platforms, since that means
+      # lockfile will no longer install on those platforms, so a error to give
+      # heads up to the user may be better. However, we have tests expecting
+      # non ruby platform autoremoval to work, so leaving that in place for
+      # now.
+      skips |= platforms - [Gem::Platform::RUBY] if @dependency_changes
 
-      remove_platform(Gem::Platform::RUBY)
-      add_current_platform
+      @originally_invalid_platforms = @originally_locked_specs.remove_invalid_platforms!(current_dependencies, platforms, skips: skips)
     end
 
     def source_map
diff --git a/lib/bundler/dependency.rb b/lib/bundler/dependency.rb
index 21a4564dccf8cd..cb9c7a76eab8ac 100644
--- a/lib/bundler/dependency.rb
+++ b/lib/bundler/dependency.rb
@@ -2,83 +2,136 @@
 
 require "rubygems/dependency"
 require_relative "shared_helpers"
-require_relative "rubygems_ext"
 
 module Bundler
   class Dependency < Gem::Dependency
-    attr_reader :autorequire
-    attr_reader :groups, :platforms, :gemfile, :path, :git, :github, :branch, :ref
-
-    ALL_RUBY_VERSIONS = ((18..27).to_a + (30..33).to_a).freeze
-    PLATFORM_MAP = {
-      :ruby => [Gem::Platform::RUBY, ALL_RUBY_VERSIONS],
-      :mri => [Gem::Platform::RUBY, ALL_RUBY_VERSIONS],
-      :rbx => [Gem::Platform::RUBY],
-      :truffleruby => [Gem::Platform::RUBY],
-      :jruby => [Gem::Platform::JAVA, [18, 19]],
-      :windows => [Gem::Platform::WINDOWS, ALL_RUBY_VERSIONS],
-      # deprecated
-      :mswin => [Gem::Platform::MSWIN, ALL_RUBY_VERSIONS],
-      :mswin64 => [Gem::Platform::MSWIN64, ALL_RUBY_VERSIONS - [18]],
-      :mingw => [Gem::Platform::MINGW, ALL_RUBY_VERSIONS],
-      :x64_mingw => [Gem::Platform::X64_MINGW, ALL_RUBY_VERSIONS - [18, 19]],
-    }.each_with_object({}) do |(platform, spec), hash|
-      hash[platform] = spec[0]
-      spec[1]&.each {|version| hash[:"#{platform}_#{version}"] = spec[0] }
-    end.freeze
-
     def initialize(name, version, options = {}, &blk)
       type = options["type"] || :runtime
       super(name, version, type)
 
-      @autorequire    = nil
-      @groups         = Array(options["group"] || :default).map(&:to_sym)
-      @source         = options["source"]
-      @path           = options["path"]
-      @git            = options["git"]
-      @github         = options["github"]
-      @branch         = options["branch"]
-      @ref            = options["ref"]
-      @platforms      = Array(options["platforms"])
-      @env            = options["env"]
-      @should_include = options.fetch("should_include", true)
-      @gemfile        = options["gemfile"]
-      @force_ruby_platform = options["force_ruby_platform"] if options.key?("force_ruby_platform")
+      @options = options
+    end
+
+    def groups
+      @groups ||= Array(@options["group"] || :default).map(&:to_sym)
+    end
+
+    def source
+      return @source if defined?(@source)
+
+      @source = @options["source"]
+    end
+
+    def path
+      return @path if defined?(@path)
+
+      @path = @options["path"]
+    end
+
+    def git
+      return @git if defined?(@git)
+
+      @git = @options["git"]
+    end
+
+    def github
+      return @github if defined?(@github)
+
+      @github = @options["github"]
+    end
+
+    def branch
+      return @branch if defined?(@branch)
+
+      @branch = @options["branch"]
+    end
+
+    def ref
+      return @ref if defined?(@ref)
+
+      @ref = @options["ref"]
+    end
+
+    def glob
+      return @glob if defined?(@glob)
+
+      @glob = @options["glob"]
+    end
+
+    def platforms
+      @platforms ||= Array(@options["platforms"])
+    end
+
+    def env
+      return @env if defined?(@env)
+
+      @env = @options["env"]
+    end
+
+    def should_include
+      @should_include ||= @options.fetch("should_include", true)
+    end
+
+    def gemfile
+      return @gemfile if defined?(@gemfile)
 
-      @autorequire = Array(options["require"] || []) if options.key?("require")
+      @gemfile = @options["gemfile"]
     end
 
+    def force_ruby_platform
+      return @force_ruby_platform if defined?(@force_ruby_platform)
+
+      @force_ruby_platform = @options["force_ruby_platform"]
+    end
+
+    def autorequire
+      return @autorequire if defined?(@autorequire)
+
+      @autorequire = Array(@options["require"] || []) if @options.key?("require")
+    end
+
+    RUBY_PLATFORM_ARRAY = [Gem::Platform::RUBY].freeze
+    private_constant :RUBY_PLATFORM_ARRAY
+
     # Returns the platforms this dependency is valid for, in the same order as
     # passed in the `valid_platforms` parameter
     def gem_platforms(valid_platforms)
-      return [Gem::Platform::RUBY] if force_ruby_platform
-      return valid_platforms if @platforms.empty?
+      return RUBY_PLATFORM_ARRAY if force_ruby_platform
+      return valid_platforms if platforms.empty?
 
-      valid_platforms.select {|p| expanded_platforms.include?(GemHelpers.generic(p)) }
+      valid_platforms.select {|p| expanded_platforms.include?(Gem::Platform.generic(p)) }
     end
 
     def expanded_platforms
-      @expanded_platforms ||= @platforms.map {|pl| PLATFORM_MAP[pl] }.compact.flatten.uniq
+      @expanded_platforms ||= platforms.filter_map {|pl| CurrentRuby::PLATFORM_MAP[pl] }.flatten.uniq
     end
 
     def should_include?
-      @should_include && current_env? && current_platform?
+      should_include && current_env? && current_platform?
+    end
+
+    def gemspec_dev_dep?
+      @gemspec_dev_dep ||= @options.fetch("gemspec_dev_dep", false)
+    end
+
+    def gemfile_dep?
+      !gemspec_dev_dep?
     end
 
     def current_env?
-      return true unless @env
-      if @env.is_a?(Hash)
-        @env.all? do |key, val|
+      return true unless env
+      if env.is_a?(Hash)
+        env.all? do |key, val|
           ENV[key.to_s] && (val.is_a?(String) ? ENV[key.to_s] == val : ENV[key.to_s] =~ val)
         end
       else
-        ENV[@env.to_s]
+        ENV[env.to_s]
       end
     end
 
     def current_platform?
-      return true if @platforms.empty?
-      @platforms.any? do |p|
+      return true if platforms.empty?
+      platforms.any? do |p|
         Bundler.current_ruby.send("#{p}?")
       end
     end
diff --git a/lib/bundler/digest.rb b/lib/bundler/digest.rb
index 148e9f77884c54..2c6d971f1b95a4 100644
--- a/lib/bundler/digest.rb
+++ b/lib/bundler/digest.rb
@@ -50,7 +50,7 @@ def sha1(string)
           words.map!.with_index {|word, index| SHA1_MASK & (word + mutated[index]) }
         end
 
-        words.pack("N*").unpack("H*").first
+        words.pack("N*").unpack1("H*")
       end
 
       private
diff --git a/lib/bundler/dsl.rb b/lib/bundler/dsl.rb
index 03c80a408cc4d0..4f9fbc55b1f2e7 100644
--- a/lib/bundler/dsl.rb
+++ b/lib/bundler/dsl.rb
@@ -13,14 +13,15 @@ def self.evaluate(gemfile, lockfile, unlock)
       builder.to_definition(lockfile, unlock)
     end
 
-    VALID_PLATFORMS = Bundler::Dependency::PLATFORM_MAP.keys.freeze
+    VALID_PLATFORMS = Bundler::CurrentRuby::PLATFORM_MAP.keys.freeze
 
     VALID_KEYS = %w[group groups git path glob name branch ref tag require submodules
-                    platform platforms type source install_if gemfile force_ruby_platform].freeze
+                    platform platforms source install_if force_ruby_platform].freeze
 
-    GITHUB_PULL_REQUEST_URL = %r{\Ahttps://github\.com/([A-Za-z0-9_\-\.]+/[A-Za-z0-9_\-\.]+)/pull/(\d+)\z}.freeze
+    GITHUB_PULL_REQUEST_URL = %r{\Ahttps://github\.com/([A-Za-z0-9_\-\.]+/[A-Za-z0-9_\-\.]+)/pull/(\d+)\z}
+    GITLAB_MERGE_REQUEST_URL = %r{\Ahttps://gitlab\.com/([A-Za-z0-9_\-\./]+)/-/merge_requests/(\d+)\z}
 
-    attr_reader :gemspecs
+    attr_reader :gemspecs, :gemfile
     attr_accessor :dependencies
 
     def initialize
@@ -41,20 +42,20 @@ def initialize
     end
 
     def eval_gemfile(gemfile, contents = nil)
-      expanded_gemfile_path = Pathname.new(gemfile).expand_path(@gemfile&.parent)
-      original_gemfile = @gemfile
-      @gemfile = expanded_gemfile_path
-      @gemfiles << expanded_gemfile_path
-      contents ||= Bundler.read_file(@gemfile.to_s)
-      instance_eval(contents.dup.tap {|x| x.untaint if RUBY_VERSION < "2.7" }, gemfile.to_s, 1)
-    rescue Exception => e # rubocop:disable Lint/RescueException
-      message = "There was an error " \
-        "#{e.is_a?(GemfileEvalError) ? "evaluating" : "parsing"} " \
-        "`#{File.basename gemfile.to_s}`: #{e.message}"
-
-      raise DSLError.new(message, gemfile, e.backtrace, contents)
-    ensure
-      @gemfile = original_gemfile
+      with_gemfile(gemfile) do |current_gemfile|
+        contents ||= Bundler.read_file(current_gemfile)
+        instance_eval(contents, current_gemfile, 1)
+      rescue GemfileEvalError => e
+        message = "There was an error evaluating `#{File.basename current_gemfile}`: #{e.message}"
+        raise DSLError.new(message, current_gemfile, e.backtrace, contents)
+      rescue GemfileError, InvalidArgumentError, InvalidOption, DeprecatedError, ScriptError => e
+        message = "There was an error parsing `#{File.basename current_gemfile}`: #{e.message}"
+        raise DSLError.new(message, current_gemfile, e.backtrace, contents)
+      rescue StandardError => e
+        raise unless e.backtrace_locations.first.path == current_gemfile
+        message = "There was an error parsing `#{File.basename current_gemfile}`: #{e.message}"
+        raise DSLError.new(message, current_gemfile, e.backtrace, contents)
+      end
     end
 
     def gemspec(opts = nil)
@@ -65,23 +66,23 @@ def gemspec(opts = nil)
       development_group = opts[:development_group] || :development
       expanded_path     = gemfile_root.join(path)
 
-      gemspecs = Gem::Util.glob_files_in_dir("{,*}.gemspec", expanded_path).map {|g| Bundler.load_gemspec(g) }.compact
+      gemspecs = Gem::Util.glob_files_in_dir("{,*}.gemspec", expanded_path).filter_map {|g| Bundler.load_gemspec(g) }
       gemspecs.reject! {|s| s.name != name } if name
       specs_by_name_and_version = gemspecs.group_by {|s| [s.name, s.version] }
 
       case specs_by_name_and_version.size
       when 1
         specs = specs_by_name_and_version.values.first
-        spec = specs.find {|s| s.match_platform(Bundler.local_platform) } || specs.first
+        spec = specs.find {|s| s.installable_on_platform?(Bundler.local_platform) } || specs.first
 
         @gemspecs << spec
 
-        gem spec.name, :name => spec.name, :path => path, :glob => glob
+        path path, "glob" => glob, "name" => spec.name, "gemspec" => spec do
+          add_dependency spec.name
+        end
 
-        group(development_group) do
-          spec.development_dependencies.each do |dep|
-            gem dep.name, *(dep.requirement.as_list + [:type => :development])
-          end
+        spec.development_dependencies.each do |dep|
+          add_dependency dep.name, dep.requirement.as_list, "gemspec_dev_dep" => true, "group" => development_group
         end
       when 0
         raise InvalidOption, "There are no gemspecs at #{expanded_path}"
@@ -93,51 +94,11 @@ def gemspec(opts = nil)
 
     def gem(name, *args)
       options = args.last.is_a?(Hash) ? args.pop.dup : {}
-      options["gemfile"] = @gemfile
       version = args || [">= 0"]
 
       normalize_options(name, version, options)
 
-      dep = Dependency.new(name, version, options)
-
-      # if there's already a dependency with this name we try to prefer one
-      if current = @dependencies.find {|d| d.name == dep.name }
-        deleted_dep = @dependencies.delete(current) if current.type == :development
-
-        unless deleted_dep
-          if current.requirement != dep.requirement
-            return if dep.type == :development
-
-            update_prompt = ""
-
-            if File.basename(@gemfile) == Injector::INJECTED_GEMS
-              if dep.requirements_list.include?(">= 0") && !current.requirements_list.include?(">= 0")
-                update_prompt = ". Gem already added"
-              else
-                update_prompt = ". If you want to update the gem version, run `bundle update #{current.name}`"
-
-                update_prompt += ". You may also need to change the version requirement specified in the Gemfile if it's too restrictive." unless current.requirements_list.include?(">= 0")
-              end
-            end
-
-            raise GemfileError, "You cannot specify the same gem twice with different version requirements.\n" \
-                            "You specified: #{current.name} (#{current.requirement}) and #{dep.name} (#{dep.requirement})" \
-                             "#{update_prompt}"
-          elsif current.source != dep.source
-            return if dep.type == :development
-            raise GemfileError, "You cannot specify the same gem twice coming from different sources.\n" \
-                            "You specified that #{dep.name} (#{dep.requirement}) should come from " \
-                            "#{current.source || "an unspecified source"} and #{dep.source}\n"
-          else
-            Bundler.ui.warn "Your Gemfile lists the gem #{current.name} (#{current.requirement}) more than once.\n" \
-                            "You should probably keep only one of them.\n" \
-                            "Remove any duplicate entries and specify the gem only once.\n" \
-                            "While it's not a problem now, it could cause errors if you change the version of one of them later."
-          end
-        end
-      end
-
-      @dependencies << dep
+      add_dependency(name, version, options)
     end
 
     def source(source, *args, &blk)
@@ -180,8 +141,7 @@ def git_source(name, &block)
     def path(path, options = {}, &blk)
       source_options = normalize_hash(options).merge(
         "path" => Pathname.new(path),
-        "root_path" => gemfile_root,
-        "gemspec" => gemspecs.find {|g| g.name == options["name"] }
+        "root_path" => gemfile_root
       )
 
       source_options["global"] = true unless block_given?
@@ -206,7 +166,7 @@ def git(uri, options = {}, &blk)
     end
 
     def github(repo, options = {})
-      raise ArgumentError, "GitHub sources require a block" unless block_given?
+      raise InvalidArgumentError, "GitHub sources require a block" unless block_given?
       github_uri  = @git_sources["github"].call(repo)
       git_options = normalize_hash(options).merge("uri" => github_uri)
       git_source  = @sources.add_git_source(git_options)
@@ -272,6 +232,90 @@ def check_primary_source_safety
 
     private
 
+    def add_dependency(name, version = nil, options = {})
+      options["gemfile"] = @gemfile
+      options["source"] ||= @source
+      options["env"] ||= @env
+
+      dep = Dependency.new(name, version, options)
+
+      # if there's already a dependency with this name we try to prefer one
+      if current = @dependencies.find {|d| d.name == name }
+        if current.requirement != dep.requirement
+          current_requirement_open = current.requirements_list.include?(">= 0")
+
+          gemspec_dep = [dep, current].find(&:gemspec_dev_dep?)
+          if gemspec_dep
+            require_relative "vendor/pub_grub/lib/pub_grub/version_range"
+            require_relative "vendor/pub_grub/lib/pub_grub/version_constraint"
+            require_relative "vendor/pub_grub/lib/pub_grub/version_union"
+            require_relative "vendor/pub_grub/lib/pub_grub/rubygems"
+
+            current_gemspec_range = PubGrub::RubyGems.requirement_to_range(current.requirement)
+            next_gemspec_range = PubGrub::RubyGems.requirement_to_range(dep.requirement)
+
+            if current_gemspec_range.intersects?(next_gemspec_range)
+              dep = Dependency.new(name, current.requirement.as_list + dep.requirement.as_list, options)
+            else
+              gemfile_dep = [dep, current].find(&:gemfile_dep?)
+
+              if gemfile_dep
+                raise GemfileError, "The #{name} dependency has conflicting requirements in Gemfile (#{gemfile_dep.requirement}) and gemspec (#{gemspec_dep.requirement})"
+              else
+                raise GemfileError, "Two gemspec development dependencies have conflicting requirements on the same gem: #{dep} and #{current}"
+              end
+            end
+          else
+            update_prompt = ""
+
+            if File.basename(@gemfile) == Injector::INJECTED_GEMS
+              if dep.requirements_list.include?(">= 0") && !current_requirement_open
+                update_prompt = ". Gem already added"
+              else
+                update_prompt = ". If you want to update the gem version, run `bundle update #{name}`"
+
+                update_prompt += ". You may also need to change the version requirement specified in the Gemfile if it's too restrictive." unless current_requirement_open
+              end
+            end
+
+            raise GemfileError, "You cannot specify the same gem twice with different version requirements.\n" \
+                           "You specified: #{name} (#{current.requirement}) and #{name} (#{dep.requirement})" \
+                           "#{update_prompt}"
+          end
+        end
+
+        unless current.gemspec_dev_dep? && dep.gemspec_dev_dep?
+          # Always prefer the dependency from the Gemfile
+          if current.gemspec_dev_dep?
+            @dependencies.delete(current)
+          elsif dep.gemspec_dev_dep?
+            return
+          elsif current.source != dep.source
+            raise GemfileError, "You cannot specify the same gem twice coming from different sources.\n" \
+                            "You specified that #{name} (#{dep.requirement}) should come from " \
+                            "#{current.source || "an unspecified source"} and #{dep.source}\n"
+          else
+            Bundler.ui.warn "Your Gemfile lists the gem #{name} (#{current.requirement}) more than once.\n" \
+                            "You should probably keep only one of them.\n" \
+                            "Remove any duplicate entries and specify the gem only once.\n" \
+                            "While it's not a problem now, it could cause errors if you change the version of one of them later."
+          end
+        end
+      end
+
+      @dependencies << dep
+    end
+
+    def with_gemfile(gemfile)
+      expanded_gemfile_path = Pathname.new(gemfile).expand_path(@gemfile&.parent)
+      original_gemfile = @gemfile
+      @gemfile = expanded_gemfile_path
+      @gemfiles << expanded_gemfile_path
+      yield @gemfile.to_s
+    ensure
+      @gemfile = original_gemfile
+    end
+
     def add_git_sources
       git_source(:github) do |repo_name|
         if repo_name =~ GITHUB_PULL_REQUEST_URL
@@ -296,6 +340,20 @@ def add_git_sources
         repo_name ||= user_name
         "https://#{user_name}@bitbucket.org/#{user_name}/#{repo_name}.git"
       end
+
+      git_source(:gitlab) do |repo_name|
+        if repo_name =~ GITLAB_MERGE_REQUEST_URL
+          {
+            "git" => "https://gitlab.com/#{$1}.git",
+            "branch" => nil,
+            "ref" => "refs/merge-requests/#{$2}/head",
+            "tag" => nil,
+          }
+        else
+          repo_name = "#{repo_name}/#{repo_name}" unless repo_name.include?("/")
+          "https://gitlab.com/#{repo_name}.git"
+        end
+      end
     end
 
     def with_source(source)
@@ -353,6 +411,7 @@ def normalize_options(name, version, opts)
         next if VALID_PLATFORMS.include?(p)
         raise GemfileError, "`#{p}` is not a valid platform. The available options are: #{VALID_PLATFORMS.inspect}"
       end
+      deprecate_legacy_windows_platforms(platforms)
 
       # Save sources passed in a key
       if opts.key?("source")
@@ -380,8 +439,6 @@ def normalize_options(name, version, opts)
         opts["source"] = source
       end
 
-      opts["source"]         ||= @source
-      opts["env"]            ||= @env
       opts["platforms"]      = platforms.dup
       opts["group"]          = groups
       opts["should_include"] = install_if
@@ -397,13 +454,11 @@ def normalize_group_options(opts, groups)
     end
 
     def validate_keys(command, opts, valid_keys)
-      invalid_keys = opts.keys - valid_keys
-
-      git_source = opts.keys & @git_sources.keys.map(&:to_s)
-      if opts["branch"] && !(opts["git"] || opts["github"] || git_source.any?)
+      if opts["branch"] && !(opts["git"] || opts["github"] || (opts.keys & @git_sources.keys.map(&:to_s)).any?)
         raise GemfileError, %(The `branch` option for `#{command}` is not allowed. Only gems with a git source can specify a branch)
       end
 
+      invalid_keys = opts.keys - valid_keys
       return true unless invalid_keys.any?
 
       message = String.new
@@ -422,9 +477,13 @@ def validate_keys(command, opts, valid_keys)
     def normalize_source(source)
       case source
       when :gemcutter, :rubygems, :rubyforge
-        Bundler::SharedHelpers.major_deprecation 2, "The source :#{source} is deprecated because HTTP " \
-          "requests are insecure.\nPlease change your source to 'https://" \
-          "rubygems.org' if possible, or 'http://rubygems.org' if not."
+        message =
+          "The source :#{source} is deprecated because HTTP requests are insecure.\n" \
+          "Please change your source to 'https://rubygems.org' if possible, or 'http://rubygems.org' if not."
+        removed_message =
+          "The source :#{source} is disallowed because HTTP requests are insecure.\n" \
+          "Please change your source to 'https://rubygems.org' if possible, or 'http://rubygems.org' if not."
+        Bundler::SharedHelpers.major_deprecation 2, message, removed_message: removed_message
         "http://rubygems.org"
       when String
         source
@@ -433,6 +492,16 @@ def normalize_source(source)
       end
     end
 
+    def deprecate_legacy_windows_platforms(platforms)
+      windows_platforms = platforms.select {|pl| pl.to_s.match?(/mingw|mswin/) }
+      return if windows_platforms.empty?
+
+      windows_platforms = windows_platforms.map! {|pl| ":#{pl}" }.join(", ")
+      message = "Platform #{windows_platforms} is deprecated. Please use platform :windows instead."
+      removed_message = "Platform #{windows_platforms} has been removed. Please use platform :windows instead."
+      Bundler::SharedHelpers.major_deprecation 2, message, removed_message: removed_message
+    end
+
     def check_path_source_safety
       return if @sources.global_path_source.nil?
 
@@ -448,31 +517,27 @@ def check_path_source_safety
     end
 
     def check_rubygems_source_safety
-      if @sources.implicit_global_source?
-        implicit_global_source_warning
-      elsif @sources.aggregate_global_source?
-        multiple_global_source_warning
-      end
-    end
-
-    def implicit_global_source_warning
-      Bundler::SharedHelpers.major_deprecation 2, "This Gemfile does not include an explicit global source. " \
-        "Not using an explicit global source may result in a different lockfile being generated depending on " \
-        "the gems you have installed locally before bundler is run. " \
-        "Instead, define a global source in your Gemfile like this: source \"https://rubygems.org\"."
+      multiple_global_source_warning if @sources.aggregate_global_source?
     end
 
     def multiple_global_source_warning
-      if Bundler.feature_flag.bundler_3_mode?
+      if Bundler.feature_flag.bundler_4_mode?
         msg = "This Gemfile contains multiple global sources. " \
           "Each source after the first must include a block to indicate which gems " \
           "should come from that source"
         raise GemfileEvalError, msg
       else
-        Bundler::SharedHelpers.major_deprecation 2, "Your Gemfile contains multiple global sources. " \
+        message =
+          "Your Gemfile contains multiple global sources. " \
           "Using `source` more than once without a block is a security risk, and " \
           "may result in installing unexpected gems. To resolve this warning, use " \
           "a block to indicate which gems should come from the secondary source."
+        removed_message =
+          "Your Gemfile contains multiple global sources. " \
+          "Using `source` more than once without a block is a security risk, and " \
+          "may result in installing unexpected gems. To resolve this error, use " \
+          "a block to indicate which gems should come from the secondary source."
+        Bundler::SharedHelpers.major_deprecation 2, message, removed_message: removed_message
       end
     end
 
@@ -541,23 +606,23 @@ def to_s
 
           return m unless backtrace && dsl_path && contents
 
-          trace_line = backtrace.find {|l| l.include?(dsl_path.to_s) } || trace_line
+          trace_line = backtrace.find {|l| l.include?(dsl_path) } || trace_line
           return m unless trace_line
-          line_numer = trace_line.split(":")[1].to_i - 1
-          return m unless line_numer
+          line_number = trace_line.split(":")[1].to_i - 1
+          return m unless line_number
 
           lines      = contents.lines.to_a
           indent     = " #  "
           indicator  = indent.tr("#", ">")
-          first_line = line_numer.zero?
-          last_line  = (line_numer == (lines.count - 1))
+          first_line = line_number.zero?
+          last_line  = (line_number == (lines.count - 1))
 
           m << "\n"
           m << "#{indent}from #{trace_line.gsub(/:in.*$/, "")}\n"
           m << "#{indent}-------------------------------------------\n"
-          m << "#{indent}#{lines[line_numer - 1]}" unless first_line
-          m << "#{indicator}#{lines[line_numer]}"
-          m << "#{indent}#{lines[line_numer + 1]}" unless last_line
+          m << "#{indent}#{lines[line_number - 1]}" unless first_line
+          m << "#{indicator}#{lines[line_number]}"
+          m << "#{indent}#{lines[line_number + 1]}" unless last_line
           m << "\n" unless m.end_with?("\n")
           m << "#{indent}-------------------------------------------\n"
         end
@@ -567,7 +632,7 @@ def to_s
 
       def parse_line_number_from_description
         description = self.description
-        if dsl_path && description =~ /((#{Regexp.quote File.expand_path(dsl_path)}|#{Regexp.quote dsl_path.to_s}):\d+)/
+        if dsl_path && description =~ /((#{Regexp.quote File.expand_path(dsl_path)}|#{Regexp.quote dsl_path}):\d+)/
           trace_line = Regexp.last_match[1]
           description = description.sub(/\n.*\n(\.\.\.)? *\^~+$/, "").sub(/#{Regexp.quote trace_line}:\s*/, "").sub("\n", " - ")
         end
diff --git a/lib/bundler/endpoint_specification.rb b/lib/bundler/endpoint_specification.rb
index 863544b1f926db..c06684657d598b 100644
--- a/lib/bundler/endpoint_specification.rb
+++ b/lib/bundler/endpoint_specification.rb
@@ -6,7 +6,8 @@ class EndpointSpecification < Gem::Specification
     include MatchRemoteMetadata
 
     attr_reader :name, :version, :platform, :checksum
-    attr_accessor :source, :remote, :dependencies
+    attr_writer :dependencies
+    attr_accessor :remote, :locked_platform
 
     def initialize(name, version, platform, spec_fetcher, dependencies, metadata = nil)
       super()
@@ -14,18 +15,29 @@ def initialize(name, version, platform, spec_fetcher, dependencies, metadata = n
       @version      = Gem::Version.create version
       @platform     = Gem::Platform.new(platform)
       @spec_fetcher = spec_fetcher
-      @dependencies = dependencies.map {|dep, reqs| build_dependency(dep, reqs) }
+      @dependencies = nil
+      @unbuilt_dependencies = dependencies
 
       @loaded_from          = nil
       @remote_specification = nil
+      @locked_platform = nil
 
       parse_metadata(metadata)
     end
 
+    def insecurely_materialized?
+      @locked_platform.to_s != @platform.to_s
+    end
+
     def fetch_platform
       @platform
     end
 
+    def dependencies
+      @dependencies ||= @unbuilt_dependencies.map! {|dep, reqs| build_dependency(dep, reqs) }
+    end
+    alias_method :runtime_dependencies, :dependencies
+
     # needed for standalone, load required_paths from local gemspec
     # after the gem is installed
     def require_paths
@@ -92,9 +104,20 @@ def extensions
       end
     end
 
+    # needed for `bundle fund`
+    def metadata
+      if @remote_specification
+        @remote_specification.metadata
+      elsif _local_specification
+        _local_specification.metadata
+      else
+        super
+      end
+    end
+
     def _local_specification
       return unless @loaded_from && File.exist?(local_specification_path)
-      eval(File.read(local_specification_path)).tap do |spec|
+      eval(File.read(local_specification_path), nil, local_specification_path).tap do |spec|
         spec.loaded_from = @loaded_from
       end
     end
@@ -104,6 +127,10 @@ def __swap__(spec)
       @remote_specification = spec
     end
 
+    def inspect
+      "#<#{self.class} @name=\"#{name}\" (#{full_name.delete_prefix("#{name}-")})>"
+    end
+
     private
 
     def _remote_specification
@@ -125,7 +152,11 @@ def parse_metadata(data)
         next unless v
         case k.to_s
         when "checksum"
-          @checksum = v.last
+          begin
+            @checksum = Checksum.from_api(v.last, @spec_fetcher.uri)
+          rescue ArgumentError => e
+            raise ArgumentError, "Invalid checksum for #{full_name}: #{e.message}"
+          end
         when "rubygems"
           @required_rubygems_version = Gem::Requirement.new(v)
         when "ruby"
@@ -137,7 +168,7 @@ def parse_metadata(data)
     end
 
     def build_dependency(name, requirements)
-      Gem::Dependency.new(name, requirements)
+      Dependency.new(name, requirements)
     end
   end
 end
diff --git a/lib/bundler/env.rb b/lib/bundler/env.rb
index 4f8b6f605d2985..074bef6edcf0c9 100644
--- a/lib/bundler/env.rb
+++ b/lib/bundler/env.rb
@@ -40,11 +40,11 @@ def self.report(options = {})
 
         out << "\n## Gemfile\n"
         gemfiles.each do |gemfile|
-          out << "\n### #{Pathname.new(gemfile).relative_path_from(SharedHelpers.pwd)}\n\n"
+          out << "\n### #{SharedHelpers.relative_path_to(gemfile)}\n\n"
           out << "```ruby\n" << read_file(gemfile).chomp << "\n```\n"
         end
 
-        out << "\n### #{Bundler.default_lockfile.relative_path_from(SharedHelpers.pwd)}\n\n"
+        out << "\n### #{SharedHelpers.relative_path_to(Bundler.default_lockfile)}\n\n"
         out << "```\n" << read_file(Bundler.default_lockfile).chomp << "\n```\n"
       end
 
@@ -120,7 +120,7 @@ def self.environment
         specs = Bundler.rubygems.find_name(name)
         out << ["  #{name}", "(#{specs.map(&:version).join(",")})"] unless specs.empty?
       end
-      if (exe = caller.last.split(":").first)&.match? %r{(exe|bin)/bundler?\z}
+      if (exe = caller_locations.last.absolute_path)&.match? %r{(exe|bin)/bundler?\z}
         shebang = File.read(exe).lines.first
         shebang.sub!(/^#!\s*/, "")
         unless shebang.start_with?(Gem.ruby, "/usr/bin/env ruby")
diff --git a/lib/bundler/environment_preserver.rb b/lib/bundler/environment_preserver.rb
index 57013f5d507d8d..444ab6fd373d86 100644
--- a/lib/bundler/environment_preserver.rb
+++ b/lib/bundler/environment_preserver.rb
@@ -19,14 +19,7 @@ class EnvironmentPreserver
     BUNDLER_PREFIX = "BUNDLER_ORIG_"
 
     def self.from_env
-      new(env_to_hash(ENV), BUNDLER_KEYS)
-    end
-
-    def self.env_to_hash(env)
-      to_hash = env.to_hash
-      return to_hash unless Gem.win_platform?
-
-      to_hash.each_with_object({}) {|(k,v), a| a[k.upcase] = v }
+      new(ENV.to_hash, BUNDLER_KEYS)
     end
 
     # @param env [Hash]
@@ -39,18 +32,7 @@ def initialize(env, keys)
 
     # Replaces `ENV` with the bundler environment variables backed up
     def replace_with_backup
-      unless Gem.win_platform?
-        ENV.replace(backup)
-        return
-      end
-
-      # Fallback logic for Windows below to workaround
-      # https://bugs.ruby-lang.org/issues/16798. Can be dropped once all
-      # supported rubies include the fix for that.
-
-      ENV.clear
-
-      backup.each {|k, v| ENV[k] = v }
+      ENV.replace(backup)
     end
 
     # @return [Hash]
@@ -58,9 +40,9 @@ def backup
       env = @original.clone
       @keys.each do |key|
         value = env[key]
-        if !value.nil? && !value.empty?
+        if !value.nil?
           env[@prefix + key] ||= value
-        elsif value.nil?
+        else
           env[@prefix + key] ||= INTENTIONALLY_NIL
         end
       end
@@ -72,7 +54,7 @@ def restore
       env = @original.clone
       @keys.each do |key|
         value_original = env[@prefix + key]
-        next if value_original.nil? || value_original.empty?
+        next if value_original.nil?
         if value_original == INTENTIONALLY_NIL
           env.delete(key)
         else
diff --git a/lib/bundler/errors.rb b/lib/bundler/errors.rb
index 5839fc6a735fee..4d1bface5176ed 100644
--- a/lib/bundler/errors.rb
+++ b/lib/bundler/errors.rb
@@ -52,6 +52,49 @@ class APIResponseInvalidDependenciesError < BundlerError; status_code(35); end
   class GemfileEvalError < GemfileError; end
   class MarshalError < StandardError; end
 
+  class ChecksumMismatchError < SecurityError
+    def initialize(lock_name, existing, checksum)
+      @lock_name = lock_name
+      @existing = existing
+      @checksum = checksum
+    end
+
+    def message
+      <<~MESSAGE
+        Bundler found mismatched checksums. This is a potential security risk.
+          #{@lock_name} #{@existing.to_lock}
+            from #{@existing.sources.join("\n    and ")}
+          #{@lock_name} #{@checksum.to_lock}
+            from #{@checksum.sources.join("\n    and ")}
+
+        #{mismatch_resolution_instructions}
+        To ignore checksum security warnings, disable checksum validation with
+          `bundle config set --local disable_checksum_validation true`
+      MESSAGE
+    end
+
+    def mismatch_resolution_instructions
+      removable, remote = [@existing, @checksum].partition(&:removable?)
+      case removable.size
+      when 0
+        msg = +"Mismatched checksums each have an authoritative source:\n"
+        msg << "  1. #{@existing.sources.reject(&:removable?).map(&:to_s).join(" and ")}\n"
+        msg << "  2. #{@checksum.sources.reject(&:removable?).map(&:to_s).join(" and ")}\n"
+        msg << "You may need to alter your Gemfile sources to resolve this issue.\n"
+      when 1
+        msg = +"If you trust #{remote.first.sources.first}, to resolve this issue you can:\n"
+        msg << removable.first.removal_instructions
+      when 2
+        msg = +"To resolve this issue you can either:\n"
+        msg << @checksum.removal_instructions
+        msg << "or if you are sure that the new checksum from #{@checksum.sources.first} is correct:\n"
+        msg << @existing.removal_instructions
+      end
+    end
+
+    status_code(37)
+  end
+
   class PermissionError < BundlerError
     def initialize(path, permission_type = :write)
       @path = path
@@ -150,6 +193,24 @@ def message
     status_code(31)
   end
 
+  class ReadOnlyFileSystemError < PermissionError
+    def message
+      "There was an error while trying to #{action} `#{@path}`. " \
+      "File system is read-only."
+    end
+
+    status_code(42)
+  end
+
+  class OperationNotPermittedError < PermissionError
+    def message
+      "There was an error while trying to #{action} `#{@path}`. " \
+      "Underlying OS system call raised an EPERM error."
+    end
+
+    status_code(43)
+  end
+
   class GenericSystemCallError < BundlerError
     attr_reader :underlying_error
 
@@ -172,4 +233,49 @@ def initialize(orig_exception, msg)
 
     status_code(36)
   end
+
+  class InsecureInstallPathError < BundlerError
+    def initialize(name, path)
+      @name = name
+      @path = path
+    end
+
+    def message
+      "Bundler cannot reinstall #{@name} because there's a previous installation of it at #{@path} that is unsafe to remove.\n" \
+      "The parent of #{@path} is world-writable and does not have the sticky bit set, making it insecure to remove due to potential vulnerabilities.\n" \
+      "Please change the permissions of #{File.dirname(@path)} or choose a different install path."
+    end
+
+    status_code(38)
+  end
+
+  class CorruptBundlerInstallError < BundlerError
+    def initialize(loaded_spec)
+      @loaded_spec = loaded_spec
+    end
+
+    def message
+      "The running version of Bundler (#{Bundler::VERSION}) does not match the version of the specification installed for it (#{@loaded_spec.version}). " \
+      "This can be caused by reinstalling Ruby without removing previous installation, leaving around an upgraded default version of Bundler. " \
+      "Reinstalling Ruby from scratch should fix the problem."
+    end
+
+    status_code(39)
+  end
+
+  class InvalidArgumentError < BundlerError; status_code(40); end
+
+  class IncorrectLockfileDependencies < BundlerError
+    attr_reader :spec
+
+    def initialize(spec)
+      @spec = spec
+    end
+
+    def message
+      "Bundler found incorrect dependencies in the lockfile for #{spec.full_name}"
+    end
+
+    status_code(41)
+  end
 end
diff --git a/lib/bundler/feature_flag.rb b/lib/bundler/feature_flag.rb
index ab2189f7f05ed2..a8fa2a1bdee04a 100644
--- a/lib/bundler/feature_flag.rb
+++ b/lib/bundler/feature_flag.rb
@@ -25,29 +25,29 @@ def self.settings_method(name, key, &default)
     end
     private_class_method :settings_method
 
-    (1..10).each {|v| define_method("bundler_#{v}_mode?") { major_version >= v } }
-
-    settings_flag(:allow_offline_install) { bundler_3_mode? }
-    settings_flag(:auto_clean_without_path) { bundler_3_mode? }
-    settings_flag(:cache_all) { bundler_3_mode? }
-    settings_flag(:default_install_uses_path) { bundler_3_mode? }
-    settings_flag(:forget_cli_options) { bundler_3_mode? }
-    settings_flag(:global_gem_cache) { bundler_3_mode? }
-    settings_flag(:path_relative_to_cwd) { bundler_3_mode? }
+    (1..10).each {|v| define_method("bundler_#{v}_mode?") { @major_version >= v } }
+
+    settings_flag(:allow_offline_install) { bundler_4_mode? }
+    settings_flag(:cache_all) { bundler_4_mode? }
+    settings_flag(:forget_cli_options) { bundler_4_mode? }
+    settings_flag(:global_gem_cache) { bundler_4_mode? }
+    settings_flag(:lockfile_checksums) { bundler_4_mode? }
     settings_flag(:plugins) { @bundler_version >= Gem::Version.new("1.14") }
-    settings_flag(:print_only_version_number) { bundler_3_mode? }
-    settings_flag(:setup_makes_kernel_gem_public) { !bundler_3_mode? }
-    settings_flag(:update_requires_all_flag) { bundler_4_mode? }
+    settings_flag(:update_requires_all_flag) { bundler_5_mode? }
 
-    settings_option(:default_cli_command) { bundler_3_mode? ? :cli_help : :install }
+    settings_option(:default_cli_command) { bundler_4_mode? ? :cli_help : :install }
 
-    def initialize(bundler_version)
-      @bundler_version = Gem::Version.create(bundler_version)
+    def removed_major?(target_major_version)
+      @major_version > target_major_version
     end
 
-    def major_version
-      @bundler_version.segments.first
+    def deprecated_major?(target_major_version)
+      @major_version >= target_major_version
+    end
+
+    def initialize(bundler_version)
+      @bundler_version = Gem::Version.create(bundler_version)
+      @major_version = @bundler_version.segments.first
     end
-    private :major_version
   end
 end
diff --git a/lib/bundler/fetcher.rb b/lib/bundler/fetcher.rb
index 9b64a3c771b408..0b6ced6f395cda 100644
--- a/lib/bundler/fetcher.rb
+++ b/lib/bundler/fetcher.rb
@@ -1,10 +1,9 @@
 # frozen_string_literal: true
 
 require_relative "vendored_persistent"
-require "cgi"
-require "securerandom"
+require_relative "vendored_timeout"
+require_relative "vendored_securerandom"
 require "zlib"
-require "rubygems/request"
 
 module Bundler
   # Handles all the fetching with the rubygems server
@@ -37,8 +36,9 @@ def initialize(remote_uri)
     # This is the error raised when a source is HTTPS and OpenSSL didn't load
     class SSLError < HTTPError
       def initialize(msg = nil)
-        super msg || "Could not load OpenSSL.\n" \
-            "You must recompile Ruby with OpenSSL support."
+        super "Could not load OpenSSL.\n" \
+          "You must recompile Ruby with OpenSSL support.\n" \
+          "original error: #{msg}\n"
       end
     end
 
@@ -72,19 +72,57 @@ def initialize(remote_uri)
       end
     end
 
+    HTTP_ERRORS = (Downloader::HTTP_RETRYABLE_ERRORS + Downloader::HTTP_NON_RETRYABLE_ERRORS).freeze
+    deprecate_constant :HTTP_ERRORS
+
+    NET_ERRORS = [
+      :HTTPBadGateway,
+      :HTTPBadRequest,
+      :HTTPFailedDependency,
+      :HTTPForbidden,
+      :HTTPInsufficientStorage,
+      :HTTPMethodNotAllowed,
+      :HTTPMovedPermanently,
+      :HTTPNoContent,
+      :HTTPNotFound,
+      :HTTPNotImplemented,
+      :HTTPPreconditionFailed,
+      :HTTPRequestEntityTooLarge,
+      :HTTPRequestURITooLong,
+      :HTTPUnauthorized,
+      :HTTPUnprocessableEntity,
+      :HTTPUnsupportedMediaType,
+      :HTTPVersionNotSupported,
+    ].freeze
+    deprecate_constant :NET_ERRORS
+
     # Exceptions classes that should bypass retry attempts. If your password didn't work the
     # first time, it's not going to the third time.
-    NET_ERRORS = [:HTTPBadGateway, :HTTPBadRequest, :HTTPFailedDependency,
-                  :HTTPForbidden, :HTTPInsufficientStorage, :HTTPMethodNotAllowed,
-                  :HTTPMovedPermanently, :HTTPNoContent, :HTTPNotFound,
-                  :HTTPNotImplemented, :HTTPPreconditionFailed, :HTTPRequestEntityTooLarge,
-                  :HTTPRequestURITooLong, :HTTPUnauthorized, :HTTPUnprocessableEntity,
-                  :HTTPUnsupportedMediaType, :HTTPVersionNotSupported].freeze
-    FAIL_ERRORS = begin
-      fail_errors = [AuthenticationRequiredError, BadAuthenticationError, AuthenticationForbiddenError, FallbackError]
-      fail_errors << Gem::Requirement::BadRequirementError
-      fail_errors.concat(NET_ERRORS.map {|e| Net.const_get(e) })
-    end.freeze
+    FAIL_ERRORS = [
+      AuthenticationRequiredError,
+      BadAuthenticationError,
+      AuthenticationForbiddenError,
+      FallbackError,
+      SecurityError,
+      Gem::Requirement::BadRequirementError,
+      Gem::Net::HTTPBadGateway,
+      Gem::Net::HTTPBadRequest,
+      Gem::Net::HTTPFailedDependency,
+      Gem::Net::HTTPForbidden,
+      Gem::Net::HTTPInsufficientStorage,
+      Gem::Net::HTTPMethodNotAllowed,
+      Gem::Net::HTTPMovedPermanently,
+      Gem::Net::HTTPNoContent,
+      Gem::Net::HTTPNotFound,
+      Gem::Net::HTTPNotImplemented,
+      Gem::Net::HTTPPreconditionFailed,
+      Gem::Net::HTTPRequestEntityTooLarge,
+      Gem::Net::HTTPRequestURITooLong,
+      Gem::Net::HTTPUnauthorized,
+      Gem::Net::HTTPUnprocessableEntity,
+      Gem::Net::HTTPUnsupportedMediaType,
+      Gem::Net::HTTPVersionNotSupported,
+    ].freeze
 
     class << self
       attr_accessor :disable_endpoint, :api_timeout, :redirect_limit, :max_retries
@@ -95,6 +133,7 @@ class << self
     self.max_retries    = Bundler.settings[:retry] # How many retries for the API call
 
     def initialize(remote)
+      @cis = nil
       @remote = remote
 
       Socket.do_not_reverse_lookup = true
@@ -110,15 +149,17 @@ def fetch_spec(spec)
       spec -= [nil, "ruby", ""]
       spec_file_name = "#{spec.join "-"}.gemspec"
 
-      uri = Bundler::URI.parse("#{remote_uri}#{Gem::MARSHAL_SPEC_DIR}#{spec_file_name}.rz")
-      if uri.scheme == "file"
-        path = Bundler.rubygems.correct_for_windows_path(uri.path)
+      uri = Gem::URI.parse("#{remote_uri}#{Gem::MARSHAL_SPEC_DIR}#{spec_file_name}.rz")
+      spec = if uri.scheme == "file"
+        path = Gem::Util.correct_for_windows_path(uri.path)
         Bundler.safe_load_marshal Bundler.rubygems.inflate(Gem.read_binary(path))
       elsif cached_spec_path = gemspec_cached_path(spec_file_name)
         Bundler.load_gemspec(cached_spec_path)
       else
         Bundler.safe_load_marshal Bundler.rubygems.inflate(downloader.fetch(uri).body)
       end
+      raise MarshalError, "is #{spec.inspect}" unless spec.is_a?(Gem::Specification)
+      spec
     rescue MarshalError
       raise HTTPError, "Gemspec #{spec} contained invalid data.\n" \
         "Your network or your gem server is probably having issues right now."
@@ -137,7 +178,9 @@ def specs(gem_names, source)
 
       fetch_specs(gem_names).each do |name, version, platform, dependencies, metadata|
         spec = if dependencies
-          EndpointSpecification.new(name, version, platform, self, dependencies, metadata)
+          EndpointSpecification.new(name, version, platform, self, dependencies, metadata).tap do |es|
+            source.checksum_store.replace(es, es.checksum)
+          end
         else
           RemoteSpecification.new(name, version, platform, self)
         end
@@ -177,7 +220,7 @@ def user_agent
         agent << " ci/#{cis.join(",")}" if cis.any?
 
         # add a random ID so we can consolidate runs server-side
-        agent << " " << SecureRandom.hex(8)
+        agent << " " << Gem::SecureRandom.hex(8)
 
         # add any user agent strings set in the config
         extra_ua = Bundler.settings[:user_agent]
@@ -200,6 +243,16 @@ def api_fetcher?
       fetchers.first.api_fetcher?
     end
 
+    def gem_remote_fetcher
+      @gem_remote_fetcher ||= begin
+        require_relative "fetcher/gem_remote_fetcher"
+        fetcher = GemRemoteFetcher.new Gem.configuration[:http_proxy]
+        fetcher.headers["User-Agent"] = user_agent
+        fetcher.headers["X-Gemfile-Source"] = @remote.original_uri.to_s if @remote.original_uri
+        fetcher
+      end
+    end
+
     private
 
     def available_fetchers
@@ -214,7 +267,7 @@ def available_fetchers
     end
 
     def fetchers
-      @fetchers ||= available_fetchers.map {|f| f.new(downloader, @remote, uri) }.drop_while {|f| !f.available? }
+      @fetchers ||= available_fetchers.map {|f| f.new(downloader, @remote, uri, gem_remote_fetcher) }.drop_while {|f| !f.available? }
     end
 
     def fetch_specs(gem_names)
@@ -228,20 +281,7 @@ def fetch_specs(gem_names)
     end
 
     def cis
-      env_cis = {
-        "TRAVIS" => "travis",
-        "CIRCLECI" => "circle",
-        "SEMAPHORE" => "semaphore",
-        "JENKINS_URL" => "jenkins",
-        "BUILDBOX" => "buildbox",
-        "GO_SERVER_URL" => "go",
-        "SNAP_CI" => "snap",
-        "GITLAB_CI" => "gitlab",
-        "GITHUB_ACTIONS" => "github",
-        "CI_NAME" => ENV["CI_NAME"],
-        "CI" => "ci",
-      }
-      env_cis.find_all {|env, _| ENV[env] }.map {|_, ci| ci }
+      @cis ||= Bundler::CIDetector.ci_strings
     end
 
     def connection
@@ -249,11 +289,17 @@ def connection
         needs_ssl = remote_uri.scheme == "https" ||
                     Bundler.settings[:ssl_verify_mode] ||
                     Bundler.settings[:ssl_client_cert]
-        raise SSLError if needs_ssl && !defined?(OpenSSL::SSL)
+        if needs_ssl
+          begin
+            require "openssl"
+          rescue StandardError, LoadError => e
+            raise SSLError.new(e.message)
+          end
+        end
 
-        con = PersistentHTTP.new :name => "bundler", :proxy => :ENV
+        con = Gem::Net::HTTP::Persistent.new name: "bundler", proxy: :ENV
         if gem_proxy = Gem.configuration[:http_proxy]
-          con.proxy = Bundler::URI.parse(gem_proxy) if gem_proxy != :no_proxy
+          con.proxy = Gem::URI.parse(gem_proxy) if gem_proxy != :no_proxy
         end
 
         if remote_uri.scheme == "https"
@@ -285,13 +331,6 @@ def gemspec_cached_path(spec_file_name)
       paths.find {|path| File.file? path }
     end
 
-    HTTP_ERRORS = [
-      Timeout::Error, EOFError, SocketError, Errno::ENETDOWN, Errno::ENETUNREACH,
-      Errno::EINVAL, Errno::ECONNRESET, Errno::ETIMEDOUT, Errno::EAGAIN,
-      Net::HTTPBadResponse, Net::HTTPHeaderSyntaxError, Net::ProtocolError,
-      PersistentHTTP::Error, Zlib::BufError, Errno::EHOSTUNREACH
-    ].freeze
-
     def bundler_cert_store
       store = OpenSSL::X509::Store.new
       ssl_ca_cert = Bundler.settings[:ssl_ca_cert] ||
@@ -305,6 +344,7 @@ def bundler_cert_store
         end
       else
         store.set_default_paths
+        require "rubygems/request"
         Gem::Request.get_cert_files.each {|c| store.add_file c }
       end
       store
diff --git a/lib/bundler/fetcher/base.rb b/lib/bundler/fetcher/base.rb
index 62cc75add8f360..cfec2f8e94198e 100644
--- a/lib/bundler/fetcher/base.rb
+++ b/lib/bundler/fetcher/base.rb
@@ -6,12 +6,14 @@ class Base
       attr_reader :downloader
       attr_reader :display_uri
       attr_reader :remote
+      attr_reader :gem_remote_fetcher
 
-      def initialize(downloader, remote, display_uri)
+      def initialize(downloader, remote, display_uri, gem_remote_fetcher)
         raise "Abstract class" if self.class == Base
         @downloader = downloader
         @remote = remote
         @display_uri = display_uri
+        @gem_remote_fetcher = gem_remote_fetcher
       end
 
       def remote_uri
@@ -38,9 +40,9 @@ def api_fetcher?
 
       private
 
-      def log_specs(debug_msg)
+      def log_specs(&block)
         if Bundler.ui.debug?
-          Bundler.ui.debug debug_msg
+          Bundler.ui.debug yield
         else
           Bundler.ui.info ".", false
         end
diff --git a/lib/bundler/fetcher/compact_index.rb b/lib/bundler/fetcher/compact_index.rb
index 6786a841f56b02..6c82d570114cde 100644
--- a/lib/bundler/fetcher/compact_index.rb
+++ b/lib/bundler/fetcher/compact_index.rb
@@ -4,16 +4,14 @@
 require_relative "../worker"
 
 module Bundler
-  autoload :CompactIndexClient, File.expand_path("../compact_index_client", __dir__)
-
   class Fetcher
     class CompactIndex < Base
       def self.compact_index_request(method_name)
         method = instance_method(method_name)
         undef_method(method_name)
         define_method(method_name) do |*args, &blk|
-          method.bind(self).call(*args, &blk)
-        rescue NetworkDownError, CompactIndexClient::Updater::MisMatchedChecksumError => e
+          method.bind_call(self, *args, &blk)
+        rescue NetworkDownError, CompactIndexClient::Updater::MismatchedChecksumError => e
           raise HTTPError, e.message
         rescue AuthenticationRequiredError, BadAuthenticationError
           # Fail since we got a 401 from the server.
@@ -35,16 +33,9 @@ def specs_for_names(gem_names)
         remaining_gems = gem_names.dup
 
         until remaining_gems.empty?
-          log_specs "Looking up gems #{remaining_gems.inspect}"
-
-          deps = begin
-                   parallel_compact_index_client.dependencies(remaining_gems)
-                 rescue TooManyRequestsError
-                   @bundle_worker&.stop
-                   @bundle_worker = nil # reset it.  Not sure if necessary
-                   serial_compact_index_client.dependencies(remaining_gems)
-                 end
-          next_gems = deps.flat_map {|d| d[3].flat_map(&:first) }.uniq
+          log_specs { "Looking up gems #{remaining_gems.inspect}" }
+          deps = fetch_gem_infos(remaining_gems).flatten(1)
+          next_gems = deps.flat_map {|d| d[CompactIndexClient::INFO_DEPS].flat_map(&:first) }.uniq
           deps.each {|dep| gem_info << dep }
           complete_gems.concat(deps.map(&:first)).uniq!
           remaining_gems = next_gems - complete_gems
@@ -61,8 +52,8 @@ def available?
           return nil
         end
         # Read info file checksums out of /versions, so we can know if gems are up to date
-        compact_index_client.update_and_parse_checksums!
-      rescue CompactIndexClient::Updater::MisMatchedChecksumError => e
+        compact_index_client.available?
+      rescue CompactIndexClient::Updater::MismatchedChecksumError => e
         Bundler.ui.debug(e.message)
         nil
       end
@@ -81,20 +72,20 @@ def compact_index_client
           end
       end
 
-      def parallel_compact_index_client
-        compact_index_client.execution_mode = lambda do |inputs, &blk|
-          func = lambda {|object, _index| blk.call(object) }
-          worker = bundle_worker(func)
-          inputs.each {|input| worker.enq(input) }
-          inputs.map { worker.deq }
-        end
-
-        compact_index_client
+      def fetch_gem_infos(names)
+        in_parallel(names) {|name| compact_index_client.info(name) }
+      rescue TooManyRequestsError # rubygems.org is rate limiting us, slow down.
+        @bundle_worker&.stop
+        @bundle_worker = nil # reset it.  Not sure if necessary
+        compact_index_client.reset!
+        names.map {|name| compact_index_client.info(name) }
       end
 
-      def serial_compact_index_client
-        compact_index_client.sequential_execution_mode!
-        compact_index_client
+      def in_parallel(inputs, &blk)
+        func = lambda {|object, _index| blk.call(object) }
+        worker = bundle_worker(func)
+        inputs.each {|input| worker.enq(input) }
+        inputs.map { worker.deq }
       end
 
       def bundle_worker(func = nil)
@@ -121,7 +112,7 @@ def call(path, headers)
         rescue NetworkDownError => e
           raise unless Bundler.feature_flag.allow_offline_install? && headers["If-None-Match"]
           ui.warn "Using the cached data for the new index because of a network error: #{e}"
-          Net::HTTPNotModified.new(nil, nil, nil)
+          Gem::Net::HTTPNotModified.new(nil, nil, nil)
         end
       end
     end
diff --git a/lib/bundler/fetcher/dependency.rb b/lib/bundler/fetcher/dependency.rb
index 18b606abb66192..994b415e9c81bc 100644
--- a/lib/bundler/fetcher/dependency.rb
+++ b/lib/bundler/fetcher/dependency.rb
@@ -1,7 +1,8 @@
 # frozen_string_literal: true
 
 require_relative "base"
-require "cgi"
+require "cgi/escape"
+require "cgi/util" unless defined?(CGI::EscapeExt)
 
 module Bundler
   class Fetcher
@@ -24,7 +25,7 @@ def api_fetcher?
       def specs(gem_names, full_dependency_list = [], last_spec_list = [])
         query_list = gem_names.uniq - full_dependency_list
 
-        log_specs "Query List: #{query_list.inspect}"
+        log_specs { "Query List: #{query_list.inspect}" }
 
         return last_spec_list if query_list.empty?
 
diff --git a/lib/bundler/fetcher/downloader.rb b/lib/bundler/fetcher/downloader.rb
index 3062899e0e7a90..2eac6e79754c5e 100644
--- a/lib/bundler/fetcher/downloader.rb
+++ b/lib/bundler/fetcher/downloader.rb
@@ -3,6 +3,28 @@
 module Bundler
   class Fetcher
     class Downloader
+      HTTP_NON_RETRYABLE_ERRORS = [
+        SocketError,
+        Errno::EADDRNOTAVAIL,
+        Errno::ENETDOWN,
+        Errno::ENETUNREACH,
+        Gem::Net::HTTP::Persistent::Error,
+        Errno::EHOSTUNREACH,
+      ].freeze
+
+      HTTP_RETRYABLE_ERRORS = [
+        Gem::Timeout::Error,
+        EOFError,
+        Errno::EINVAL,
+        Errno::ECONNRESET,
+        Errno::ETIMEDOUT,
+        Errno::EAGAIN,
+        Gem::Net::HTTPBadResponse,
+        Gem::Net::HTTPHeaderSyntaxError,
+        Gem::Net::ProtocolError,
+        Zlib::BufError,
+      ].freeze
+
       attr_reader :connection
       attr_reader :redirect_limit
 
@@ -20,33 +42,35 @@ def fetch(uri, headers = {}, counter = 0)
         Bundler.ui.debug("HTTP #{response.code} #{response.message} #{filtered_uri}")
 
         case response
-        when Net::HTTPSuccess, Net::HTTPNotModified
+        when Gem::Net::HTTPSuccess, Gem::Net::HTTPNotModified
           response
-        when Net::HTTPRedirection
-          new_uri = Bundler::URI.parse(response["location"])
+        when Gem::Net::HTTPRedirection
+          new_uri = Gem::URI.parse(response["location"])
           if new_uri.host == uri.host
             new_uri.user = uri.user
             new_uri.password = uri.password
           end
           fetch(new_uri, headers, counter + 1)
-        when Net::HTTPRequestedRangeNotSatisfiable
+        when Gem::Net::HTTPRequestedRangeNotSatisfiable
           new_headers = headers.dup
           new_headers.delete("Range")
           new_headers["Accept-Encoding"] = "gzip"
           fetch(uri, new_headers)
-        when Net::HTTPRequestEntityTooLarge
+        when Gem::Net::HTTPRequestEntityTooLarge
           raise FallbackError, response.body
-        when Net::HTTPTooManyRequests
+        when Gem::Net::HTTPTooManyRequests
           raise TooManyRequestsError, response.body
-        when Net::HTTPUnauthorized
+        when Gem::Net::HTTPUnauthorized
           raise BadAuthenticationError, uri.host if uri.userinfo
           raise AuthenticationRequiredError, uri.host
-        when Net::HTTPForbidden
+        when Gem::Net::HTTPForbidden
           raise AuthenticationForbiddenError, uri.host
-        when Net::HTTPNotFound
-          raise FallbackError, "Net::HTTPNotFound: #{filtered_uri}"
+        when Gem::Net::HTTPNotFound
+          raise FallbackError, "Gem::Net::HTTPNotFound: #{filtered_uri}"
         else
-          raise HTTPError, "#{response.class}#{": #{response.body}" unless response.body.empty?}"
+          message = "Gem::#{response.class.name.gsub(/\AGem::/, "")}"
+          message += ": #{response.body}" unless response.body.empty?
+          raise HTTPError, message
         end
       end
 
@@ -56,7 +80,7 @@ def request(uri, headers)
         filtered_uri = URICredentialsFilter.credential_filtered_uri(uri)
 
         Bundler.ui.debug "HTTP GET #{filtered_uri}"
-        req = Net::HTTP::Get.new uri.request_uri, headers
+        req = Gem::Net::HTTP::Get.new uri.request_uri, headers
         if uri.user
           user = CGI.unescape(uri.user)
           password = uri.password ? CGI.unescape(uri.password) : nil
@@ -65,15 +89,19 @@ def request(uri, headers)
         connection.request(uri, req)
       rescue OpenSSL::SSL::SSLError
         raise CertificateFailureError.new(uri)
-      rescue *HTTP_ERRORS => e
+      rescue *HTTP_NON_RETRYABLE_ERRORS => e
         Bundler.ui.trace e
-        if e.is_a?(SocketError) || e.message.to_s.include?("host down:")
-          raise NetworkDownError, "Could not reach host #{uri.host}. Check your network " \
-            "connection and try again."
-        else
-          raise HTTPError, "Network error while fetching #{filtered_uri}" \
+
+        host = uri.host
+        host_port = "#{host}:#{uri.port}"
+        host = host_port if filtered_uri.to_s.include?(host_port)
+        raise NetworkDownError, "Could not reach host #{host}. Check your network " \
+          "connection and try again."
+      rescue *HTTP_RETRYABLE_ERRORS => e
+        Bundler.ui.trace e
+
+        raise HTTPError, "Network error while fetching #{filtered_uri}" \
             " (#{e})"
-        end
       end
 
       private
diff --git a/lib/bundler/fetcher/gem_remote_fetcher.rb b/lib/bundler/fetcher/gem_remote_fetcher.rb
new file mode 100644
index 00000000000000..3fc7b682632b85
--- /dev/null
+++ b/lib/bundler/fetcher/gem_remote_fetcher.rb
@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+require "rubygems/remote_fetcher"
+
+module Bundler
+  class Fetcher
+    class GemRemoteFetcher < Gem::RemoteFetcher
+      def request(*args)
+        super do |req|
+          req.delete("User-Agent") if headers["User-Agent"]
+          yield req if block_given?
+        end
+      end
+    end
+  end
+end
diff --git a/lib/bundler/fetcher/index.rb b/lib/bundler/fetcher/index.rb
index c623647f01cdcc..6e37e1e5d1fe71 100644
--- a/lib/bundler/fetcher/index.rb
+++ b/lib/bundler/fetcher/index.rb
@@ -6,7 +6,7 @@ module Bundler
   class Fetcher
     class Index < Base
       def specs(_gem_names)
-        Bundler.rubygems.fetch_all_remote_specs(remote)
+        Bundler.rubygems.fetch_all_remote_specs(remote, gem_remote_fetcher)
       rescue Gem::RemoteFetcher::FetchError => e
         case e.message
         when /certificate verify failed/
diff --git a/lib/bundler/force_platform.rb b/lib/bundler/force_platform.rb
index 249a24ecd1af98..7af33218cb0cd3 100644
--- a/lib/bundler/force_platform.rb
+++ b/lib/bundler/force_platform.rb
@@ -2,8 +2,6 @@
 
 module Bundler
   module ForcePlatform
-    private
-
     # The `:force_ruby_platform` value used by dependencies for resolution, and
     # by locked specifications for materialization is `false` by default, except
     # for TruffleRuby. TruffleRuby generally needs to force the RUBY platform
diff --git a/lib/bundler/friendly_errors.rb b/lib/bundler/friendly_errors.rb
index b66a046d37e218..8a5ab2e0255cb5 100644
--- a/lib/bundler/friendly_errors.rb
+++ b/lib/bundler/friendly_errors.rb
@@ -32,7 +32,7 @@ def log_error(error)
         if Bundler.ui.debug?
           Bundler.ui.trace error
         else
-          Bundler.ui.error error.message, :wrap => true
+          Bundler.ui.error error.message, wrap: true
         end
       when Thor::Error
         Bundler.ui.error error.message
@@ -40,7 +40,7 @@ def log_error(error)
         Bundler.ui.error "\nQuitting..."
         Bundler.ui.trace error
       when Gem::InvalidSpecificationException
-        Bundler.ui.error error.message, :wrap => true
+        Bundler.ui.error error.message, wrap: true
       when SystemExit
       when *[defined?(Java::JavaLang::OutOfMemoryError) && Java::JavaLang::OutOfMemoryError].compact
         Bundler.ui.error "\nYour JVM has run out of memory, and Bundler cannot continue. " \
@@ -80,7 +80,7 @@ def request_issue_report_for(e)
         First, try this link to see if there are any existing issue reports for this error:
         #{issues_url(e)}
 
-        If there aren't any reports for this error yet, please fill in the new issue form located at #{new_issue_url}, and copy and paste the report template above in there.
+        If there aren't any reports for this error yet, please fill in the new issue form located at #{new_issue_url}. Make sure to copy and paste the full output of this command under the "What happened instead?" section.
       EOS
     end
 
@@ -102,7 +102,8 @@ def serialized_exception_for(e)
     def issues_url(exception)
       message = exception.message.lines.first.tr(":", " ").chomp
       message = message.split("-").first if exception.is_a?(Errno)
-      require "cgi"
+      require "cgi/escape"
+      require "cgi/util" unless defined?(CGI::EscapeExt)
       "https://github.com/rubygems/rubygems/search?q=" \
         "#{CGI.escape(message)}&type=Issues"
     end
diff --git a/lib/bundler/gem_helper.rb b/lib/bundler/gem_helper.rb
index dcf759cdedf4cd..5ce0ef6280037b 100644
--- a/lib/bundler/gem_helper.rb
+++ b/lib/bundler/gem_helper.rb
@@ -47,7 +47,7 @@ def install
         built_gem_path = build_gem
       end
 
-      desc "Generate SHA512 checksum if #{name}-#{version}.gem into the checksums directory."
+      desc "Generate SHA512 checksum of #{name}-#{version}.gem into the checksums directory."
       task "build:checksum" => "build" do
         build_checksum(built_gem_path)
       end
@@ -215,7 +215,7 @@ def sh(cmd, &block)
     def sh_with_status(cmd, &block)
       Bundler.ui.debug(cmd)
       SharedHelpers.chdir(base) do
-        outbuf = IO.popen(cmd, :err => [:child, :out], &:read)
+        outbuf = IO.popen(cmd, err: [:child, :out], &:read)
         status = $?
         block&.call(outbuf) if status.success?
         [outbuf, status]
diff --git a/lib/bundler/gem_helpers.rb b/lib/bundler/gem_helpers.rb
deleted file mode 100644
index 2e6d788f9c6f0a..00000000000000
--- a/lib/bundler/gem_helpers.rb
+++ /dev/null
@@ -1,117 +0,0 @@
-# frozen_string_literal: true
-
-module Bundler
-  module GemHelpers
-    GENERIC_CACHE = { Gem::Platform::RUBY => Gem::Platform::RUBY } # rubocop:disable Style/MutableConstant
-    GENERICS = [
-      [Gem::Platform.new("java"), Gem::Platform.new("java")],
-      [Gem::Platform.new("mswin32"), Gem::Platform.new("mswin32")],
-      [Gem::Platform.new("mswin64"), Gem::Platform.new("mswin64")],
-      [Gem::Platform.new("universal-mingw32"), Gem::Platform.new("universal-mingw32")],
-      [Gem::Platform.new("x64-mingw32"), Gem::Platform.new("x64-mingw32")],
-      [Gem::Platform.new("x86_64-mingw32"), Gem::Platform.new("x64-mingw32")],
-      [Gem::Platform.new("x64-mingw-ucrt"), Gem::Platform.new("x64-mingw-ucrt")],
-      [Gem::Platform.new("mingw32"), Gem::Platform.new("x86-mingw32")],
-    ].freeze
-
-    def generic(p)
-      GENERIC_CACHE[p] ||= begin
-        _, found = GENERICS.find do |match, _generic|
-          p.os == match.os && (!match.cpu || p.cpu == match.cpu)
-        end
-        found || Gem::Platform::RUBY
-      end
-    end
-    module_function :generic
-
-    def generic_local_platform
-      generic(local_platform)
-    end
-    module_function :generic_local_platform
-
-    def local_platform
-      Bundler.local_platform
-    end
-    module_function :local_platform
-
-    def platform_specificity_match(spec_platform, user_platform)
-      spec_platform = Gem::Platform.new(spec_platform)
-
-      PlatformMatch.specificity_score(spec_platform, user_platform)
-    end
-    module_function :platform_specificity_match
-
-    def select_best_platform_match(specs, platform)
-      matching = specs.select {|spec| spec.match_platform(platform) }
-
-      sort_best_platform_match(matching, platform)
-    end
-    module_function :select_best_platform_match
-
-    def sort_best_platform_match(matching, platform)
-      exact = matching.select {|spec| spec.platform == platform }
-      return exact if exact.any?
-
-      sorted_matching = matching.sort_by {|spec| platform_specificity_match(spec.platform, platform) }
-      exemplary_spec = sorted_matching.first
-
-      sorted_matching.take_while {|spec| same_specificity(platform, spec, exemplary_spec) && same_deps(spec, exemplary_spec) }
-    end
-    module_function :sort_best_platform_match
-
-    class PlatformMatch
-      def self.specificity_score(spec_platform, user_platform)
-        return -1 if spec_platform == user_platform
-        return 1_000_000 if spec_platform.nil? || spec_platform == Gem::Platform::RUBY || user_platform == Gem::Platform::RUBY
-
-        os_match(spec_platform, user_platform) +
-          cpu_match(spec_platform, user_platform) * 10 +
-          platform_version_match(spec_platform, user_platform) * 100
-      end
-
-      def self.os_match(spec_platform, user_platform)
-        if spec_platform.os == user_platform.os
-          0
-        else
-          1
-        end
-      end
-
-      def self.cpu_match(spec_platform, user_platform)
-        if spec_platform.cpu == user_platform.cpu
-          0
-        elsif spec_platform.cpu == "arm" && user_platform.cpu.to_s.start_with?("arm")
-          0
-        elsif spec_platform.cpu.nil? || spec_platform.cpu == "universal"
-          1
-        else
-          2
-        end
-      end
-
-      def self.platform_version_match(spec_platform, user_platform)
-        if spec_platform.version == user_platform.version
-          0
-        elsif spec_platform.version.nil?
-          1
-        else
-          2
-        end
-      end
-    end
-
-    def same_specificity(platform, spec, exemplary_spec)
-      platform_specificity_match(spec.platform, platform) == platform_specificity_match(exemplary_spec.platform, platform)
-    end
-    module_function :same_specificity
-
-    def same_deps(spec, exemplary_spec)
-      same_runtime_deps = spec.dependencies.sort == exemplary_spec.dependencies.sort
-      return same_runtime_deps unless spec.is_a?(Gem::Specification) && exemplary_spec.is_a?(Gem::Specification)
-
-      same_metadata_deps = spec.required_ruby_version == exemplary_spec.required_ruby_version && spec.required_rubygems_version == exemplary_spec.required_rubygems_version
-      same_runtime_deps && same_metadata_deps
-    end
-    module_function :same_deps
-  end
-end
diff --git a/lib/bundler/gem_version_promoter.rb b/lib/bundler/gem_version_promoter.rb
index d281f46eeb3e13..d64dbacfdb2d15 100644
--- a/lib/bundler/gem_version_promoter.rb
+++ b/lib/bundler/gem_version_promoter.rb
@@ -45,17 +45,37 @@ def level=(value)
 
     # Given a Resolver::Package and an Array of Specifications of available
     # versions for a gem, this method will return the Array of Specifications
-    # sorted (and possibly truncated if strict is true) in an order to give
-    # preference to the current level (:major, :minor or :patch) when resolution
-    # is deciding what versions best resolve all dependencies in the bundle.
+    # sorted in an order to give preference to the current level (:major, :minor
+    # or :patch) when resolution is deciding what versions best resolve all
+    # dependencies in the bundle.
     # @param package [Resolver::Package] The package being resolved.
     # @param specs [Specification] An array of Specifications for the package.
-    # @return [Specification] A new instance of the Specification Array sorted and
-    #    possibly filtered.
+    # @return [Specification] A new instance of the Specification Array sorted.
     def sort_versions(package, specs)
-      specs = filter_dep_specs(specs, package) if strict
+      locked_version = package.locked_version
+
+      result = specs.sort do |a, b|
+        unless package.prerelease_specified? || pre?
+          a_pre = a.prerelease?
+          b_pre = b.prerelease?
 
-      sort_dep_specs(specs, package)
+          next 1 if a_pre && !b_pre
+          next -1 if b_pre && !a_pre
+        end
+
+        if major? || locked_version.nil?
+          b <=> a
+        elsif either_version_older_than_locked?(a, b, locked_version)
+          b <=> a
+        elsif segments_do_not_match?(a, b, :major)
+          a <=> b
+        elsif !minor? && segments_do_not_match?(a, b, :minor)
+          a <=> b
+        else
+          b <=> a
+        end
+      end
+      post_sort(result, package.unlock?, locked_version)
     end
 
     # @return [bool] Convenience method for testing value of level variable.
@@ -73,9 +93,18 @@ def pre?
       pre == true
     end
 
-    private
+    # Given a Resolver::Package and an Array of Specifications of available
+    # versions for a gem, this method will truncate the Array if strict
+    # is true. That means filtering out downgrades from the version currently
+    # locked, and filtering out upgrades that go past the selected level (major,
+    # minor, or patch).
+    # @param package [Resolver::Package] The package being resolved.
+    # @param specs [Specification] An array of Specifications for the package.
+    # @return [Specification] A new instance of the Specification Array
+    #   truncated.
+    def filter_versions(package, specs)
+      return specs unless strict
 
-    def filter_dep_specs(specs, package)
       locked_version = package.locked_version
       return specs if locked_version.nil? || major?
 
@@ -89,35 +118,10 @@ def filter_dep_specs(specs, package)
       end
     end
 
-    def sort_dep_specs(specs, package)
-      locked_version = package.locked_version
-
-      result = specs.sort do |a, b|
-        unless package.prerelease_specified? || pre?
-          a_pre = a.prerelease?
-          b_pre = b.prerelease?
-
-          next -1 if a_pre && !b_pre
-          next  1 if b_pre && !a_pre
-        end
-
-        if major?
-          a <=> b
-        elsif either_version_older_than_locked?(a, b, locked_version)
-          a <=> b
-        elsif segments_do_not_match?(a, b, :major)
-          b <=> a
-        elsif !minor? && segments_do_not_match?(a, b, :minor)
-          b <=> a
-        else
-          a <=> b
-        end
-      end
-      post_sort(result, package.unlock?, locked_version)
-    end
+    private
 
     def either_version_older_than_locked?(a, b, locked_version)
-      locked_version && (a.version < locked_version || b.version < locked_version)
+      a.version < locked_version || b.version < locked_version
     end
 
     def segments_do_not_match?(a, b, level)
@@ -128,18 +132,16 @@ def segments_do_not_match?(a, b, level)
     # Specific version moves can't always reliably be done during sorting
     # as not all elements are compared against each other.
     def post_sort(result, unlock, locked_version)
-      # default :major behavior in Bundler does not do this
-      return result if major?
       if unlock || locked_version.nil?
         result
       else
-        move_version_to_end(result, locked_version)
+        move_version_to_beginning(result, locked_version)
       end
     end
 
-    def move_version_to_end(result, version)
+    def move_version_to_beginning(result, version)
       move, keep = result.partition {|s| s.version.to_s == version.to_s }
-      keep.concat(move)
+      move.concat(keep)
     end
   end
 end
diff --git a/lib/bundler/graph.rb b/lib/bundler/graph.rb
index 3c008e63e367d7..b22b17a453bcce 100644
--- a/lib/bundler/graph.rb
+++ b/lib/bundler/graph.rb
@@ -84,7 +84,7 @@ def _make_label(symbol_or_string_or_dependency, element_type)
       else
         raise ArgumentError, "2nd argument is invalid"
       end
-      label.nil? ? {} : { :label => label }
+      label.nil? ? {} : { label: label }
     end
 
     def spec_for_dependency(dependency)
@@ -103,7 +103,7 @@ def initialize(graph_instance)
       end
 
       def g
-        @g ||= ::GraphViz.digraph(@graph_name, :concentrate => true, :normalize => true, :nodesep => 0.55) do |g|
+        @g ||= ::GraphViz.digraph(@graph_name, concentrate: true, normalize: true, nodesep: 0.55) do |g|
           g.edge[:weight]   = 2
           g.edge[:fontname] = g.node[:fontname] = "Arial, Helvetica, SansSerif"
           g.edge[:fontsize] = 12
@@ -114,10 +114,10 @@ def run
         @groups.each do |group|
           g.add_nodes(
             group, {
-              :style => "filled",
-              :fillcolor => "#B9B9D5",
-              :shape => "box3d",
-              :fontsize => 16,
+              style: "filled",
+              fillcolor: "#B9B9D5",
+              shape: "box3d",
+              fontsize: 16,
             }.merge(@node_options[group])
           )
         end
@@ -125,8 +125,8 @@ def run
         @relations.each do |parent, children|
           children.each do |child|
             if @groups.include?(parent)
-              g.add_nodes(child, { :style => "filled", :fillcolor => "#B9B9D5" }.merge(@node_options[child]))
-              g.add_edges(parent, child, { :constraint => false }.merge(@edge_options["#{parent}_#{child}"]))
+              g.add_nodes(child, { style: "filled", fillcolor: "#B9B9D5" }.merge(@node_options[child]))
+              g.add_edges(parent, child, { constraint: false }.merge(@edge_options["#{parent}_#{child}"]))
             else
               g.add_nodes(child, @node_options[child])
               g.add_edges(parent, child, @edge_options["#{parent}_#{child}"])
@@ -135,7 +135,7 @@ def run
         end
 
         if @output_format.to_s == "debug"
-          $stdout.puts g.output :none => String
+          $stdout.puts g.output none: String
           Bundler.ui.info "debugging bundle viz..."
         else
           begin
diff --git a/lib/bundler/index.rb b/lib/bundler/index.rb
index b8c599f63af999..d591b34cc7f5e5 100644
--- a/lib/bundler/index.rb
+++ b/lib/bundler/index.rb
@@ -10,8 +10,8 @@ def self.build
       i
     end
 
-    attr_reader :specs, :all_specs, :sources
-    protected :specs, :all_specs
+    attr_reader :specs, :duplicates, :sources
+    protected :specs, :duplicates
 
     RUBY = "ruby"
     NULL = "\0"
@@ -19,21 +19,21 @@ def self.build
     def initialize
       @sources = []
       @cache = {}
-      @specs = Hash.new {|h, k| h[k] = {} }
-      @all_specs = Hash.new {|h, k| h[k] = EMPTY_SEARCH }
+      @specs = {}
+      @duplicates = {}
     end
 
     def initialize_copy(o)
       @sources = o.sources.dup
       @cache = {}
-      @specs = Hash.new {|h, k| h[k] = {} }
-      @all_specs = Hash.new {|h, k| h[k] = EMPTY_SEARCH }
+      @specs = {}
+      @duplicates = {}
 
       o.specs.each do |name, hash|
         @specs[name] = hash.dup
       end
-      o.all_specs.each do |name, array|
-        @all_specs[name] = array.dup
+      o.duplicates.each do |name, array|
+        @duplicates[name] = array.dup
       end
     end
 
@@ -46,12 +46,11 @@ def empty?
       true
     end
 
-    def search_all(name)
-      all_matches = local_search(name) + @all_specs[name]
-      @sources.each do |source|
-        all_matches.concat(source.search_all(name))
-      end
-      all_matches
+    def search_all(name, &blk)
+      return enum_for(:search_all, name) unless blk
+      specs_by_name(name).each(&blk)
+      @duplicates[name]&.each(&blk)
+      @sources.each {|source| source.search_all(name, &blk) }
     end
 
     # Search this index's specs, and any source indexes that this index knows
@@ -61,11 +60,14 @@ def search(query)
       return results unless @sources.any?
 
       @sources.each do |source|
-        results.concat(source.search(query))
+        results = safe_concat(results, source.search(query))
       end
-      results.uniq(&:full_name)
+      results.uniq!(&:full_name) unless results.empty? # avoid modifying frozen EMPTY_SEARCH
+      results
     end
 
+    alias_method :[], :search
+
     def local_search(query)
       case query
       when Gem::Specification, RemoteSpecification, LazySpecification, EndpointSpecification then search_by_spec(query)
@@ -76,12 +78,10 @@ def local_search(query)
       end
     end
 
-    alias_method :[], :search
-
-    def <<(spec)
-      @specs[spec.name][spec.full_name] = spec
-      spec
+    def add(spec)
+      (@specs[spec.name] ||= {}).store(spec.full_name, spec)
     end
+    alias_method :<<, :add
 
     def each(&blk)
       return enum_for(:each) unless blk
@@ -115,15 +115,30 @@ def dependency_names
       names.uniq
     end
 
-    def use(other, override_dupes = false)
+    # Combines indexes proritizing existing specs, like `Hash#reverse_merge!`
+    # Duplicate specs found in `other` are stored in `@duplicates`.
+    def use(other)
       return unless other
-      other.each do |s|
-        if (dupes = search_by_spec(s)) && !dupes.empty?
-          # safe to << since it's a new array when it has contents
-          @all_specs[s.name] = dupes << s
-          next unless override_dupes
+      other.each do |spec|
+        exist?(spec) ? add_duplicate(spec) : add(spec)
+      end
+      self
+    end
+
+    # Combines indexes proritizing specs from `other`, like `Hash#merge!`
+    # Duplicate specs found in `self` are saved in `@duplicates`.
+    def merge!(other)
+      return unless other
+      other.each do |spec|
+        if existing = find_by_spec(spec)
+          unless dependencies_eql?(existing, spec)
+            Bundler.ui.warn "Local specification for #{spec.full_name} has different dependencies than the remote gem, ignoring it"
+            next
+          end
+
+          add_duplicate(existing)
         end
-        self << s
+        add spec
       end
       self
     end
@@ -135,8 +150,7 @@ def size
     end
 
     # Whether all the specs in self are in other
-    # TODO: rename to #include?
-    def ==(other)
+    def subset?(other)
       all? do |spec|
         other_spec = other[spec].first
         other_spec && dependencies_eql?(spec, other_spec) && spec.source == other_spec.source
@@ -144,8 +158,8 @@ def ==(other)
     end
 
     def dependencies_eql?(spec, other_spec)
-      deps       = spec.dependencies.select {|d| d.type != :development }
-      other_deps = other_spec.dependencies.select {|d| d.type != :development }
+      deps       = spec.runtime_dependencies
+      other_deps = other_spec.runtime_dependencies
       deps.sort == other_deps.sort
     end
 
@@ -157,19 +171,40 @@ def add_source(index)
 
     private
 
+    def safe_concat(a, b)
+      return a if b.empty?
+      return b if a.empty?
+      a.concat(b)
+    end
+
+    def add_duplicate(spec)
+      (@duplicates[spec.name] ||= []) << spec
+    end
+
     def specs_by_name_and_version(name, version)
-      specs_by_name(name).select {|spec| spec.version == version }
+      results = @specs[name]&.values
+      return EMPTY_SEARCH unless results
+      results.select! {|spec| spec.version == version }
+      results
     end
 
     def specs_by_name(name)
-      @specs[name].values
+      @specs[name]&.values || EMPTY_SEARCH
     end
 
     EMPTY_SEARCH = [].freeze
 
     def search_by_spec(spec)
-      spec = @specs[spec.name][spec.full_name]
+      spec = find_by_spec(spec)
       spec ? [spec] : EMPTY_SEARCH
     end
+
+    def find_by_spec(spec)
+      @specs[spec.name]&.fetch(spec.full_name, nil)
+    end
+
+    def exist?(spec)
+      @specs[spec.name]&.key?(spec.full_name)
+    end
   end
 end
diff --git a/lib/bundler/injector.rb b/lib/bundler/injector.rb
index cb644a7f69ac97..21ff90ad1313a6 100644
--- a/lib/bundler/injector.rb
+++ b/lib/bundler/injector.rb
@@ -23,13 +23,10 @@ def initialize(deps, options = {})
     # @param [Pathname] lockfile_path The lockfile in which to inject the new dependency.
     # @return [Array]
     def inject(gemfile_path, lockfile_path)
-      if Bundler.frozen_bundle?
-        # ensure the lock and Gemfile are synced
-        Bundler.definition.ensure_equivalent_gemfile_and_lockfile(true)
-      end
+      Bundler.definition.ensure_equivalent_gemfile_and_lockfile(true)
 
       # temporarily unfreeze
-      Bundler.settings.temporary(:deployment => false, :frozen => false) do
+      Bundler.settings.temporary(deployment: false, frozen: false) do
         # evaluate the Gemfile we have now
         builder = Dsl.new
         builder.eval_gemfile(gemfile_path)
@@ -44,13 +41,13 @@ def inject(gemfile_path, lockfile_path)
 
         # resolve to see if the new deps broke anything
         @definition = builder.to_definition(lockfile_path, {})
-        @definition.resolve_remotely!
+        @definition.remotely!
 
         # since nothing broke, we can add those gems to the gemfile
         append_to(gemfile_path, build_gem_lines(@options[:conservative_versioning])) if @deps.any?
 
         # since we resolved successfully, write out the lockfile
-        @definition.lock(Bundler.default_lockfile)
+        @definition.lock
 
         # invalidate the cached Bundler.definition
         Bundler.reset_paths!
@@ -86,7 +83,7 @@ def conservative_version(spec)
       segments = version.segments
       seg_end_index = version >= Gem::Version.new("1.0") ? 1 : 2
 
-      prerelease_suffix = version.to_s.gsub(version.release.to_s, "") if version.prerelease?
+      prerelease_suffix = version.to_s.delete_prefix(version.release.to_s) if version.prerelease?
       "#{version_prefix}#{segments[0..seg_end_index].join(".")}#{prerelease_suffix}"
     end
 
@@ -111,18 +108,19 @@ def build_gem_lines(conservative_versioning)
         end
 
         if d.groups != Array(:default)
-          group = d.groups.size == 1 ? ", :group => #{d.groups.first.inspect}" : ", :groups => #{d.groups.inspect}"
+          group = d.groups.size == 1 ? ", group: #{d.groups.first.inspect}" : ", groups: #{d.groups.inspect}"
         end
 
-        source = ", :source => \"#{d.source}\"" unless d.source.nil?
-        path = ", :path => \"#{d.path}\"" unless d.path.nil?
-        git = ", :git => \"#{d.git}\"" unless d.git.nil?
-        github = ", :github => \"#{d.github}\"" unless d.github.nil?
-        branch = ", :branch => \"#{d.branch}\"" unless d.branch.nil?
-        ref = ", :ref => \"#{d.ref}\"" unless d.ref.nil?
-        require_path = ", :require => #{convert_autorequire(d.autorequire)}" unless d.autorequire.nil?
+        source = ", source: \"#{d.source}\"" unless d.source.nil?
+        path = ", path: \"#{d.path}\"" unless d.path.nil?
+        git = ", git: \"#{d.git}\"" unless d.git.nil?
+        github = ", github: \"#{d.github}\"" unless d.github.nil?
+        branch = ", branch: \"#{d.branch}\"" unless d.branch.nil?
+        ref = ", ref: \"#{d.ref}\"" unless d.ref.nil?
+        glob = ", glob: \"#{d.glob}\"" unless d.glob.nil?
+        require_path = ", require: #{convert_autorequire(d.autorequire)}" unless d.autorequire.nil?
 
-        %(gem #{name}#{requirement}#{group}#{source}#{path}#{git}#{github}#{branch}#{ref}#{require_path})
+        %(gem #{name}#{requirement}#{group}#{source}#{path}#{git}#{github}#{branch}#{ref}#{glob}#{require_path})
       end.join("\n")
     end
 
@@ -186,7 +184,7 @@ def remove_gems_from_dependencies(builder, gems, gemfile_path)
     # @param [Array] gems            Array of names of gems to be removed.
     # @param [Pathname] gemfile_path The Gemfile from which to remove dependencies.
     def remove_gems_from_gemfile(gems, gemfile_path)
-      patterns = /gem\s+(['"])#{Regexp.union(gems)}\1|gem\s*\((['"])#{Regexp.union(gems)}\2\)/
+      patterns = /gem\s+(['"])#{Regexp.union(gems)}\1|gem\s*\((['"])#{Regexp.union(gems)}\2.*\)/
       new_gemfile = []
       multiline_removal = false
       File.readlines(gemfile_path).each do |line|
diff --git a/lib/bundler/inline.rb b/lib/bundler/inline.rb
index 5c184f67a1f438..f2f5b22cd381a8 100644
--- a/lib/bundler/inline.rb
+++ b/lib/bundler/inline.rb
@@ -1,16 +1,20 @@
 # frozen_string_literal: true
 
-# Allows for declaring a Gemfile inline in a ruby script, optionally installing
-# any gems that aren't already installed on the user's system.
+# Allows for declaring a Gemfile inline in a ruby script, installing any gems
+# that aren't already installed on the user's system.
 #
 # @note Every gem that is specified in this 'Gemfile' will be `require`d, as if
 #       the user had manually called `Bundler.require`. To avoid a requested gem
 #       being automatically required, add the `:require => false` option to the
 #       `gem` dependency declaration.
 #
-# @param install [Boolean] whether gems that aren't already installed on the
-#                          user's system should be installed.
-#                          Defaults to `false`.
+# @param force_latest_compatible [Boolean] Force installing the *latest*
+#                                          compatible versions of the gems,
+#                                          even if compatible versions are
+#                                          already installed locally.
+#                                          This also logs output if the
+#                                          `:quiet` option is not set.
+#                                          Defaults to `false`.
 #
 # @param gemfile [Proc]    a block that is evaluated as a `Gemfile`.
 #
@@ -29,45 +33,66 @@
 #
 #          puts Pod::VERSION # => "0.34.4"
 #
-def gemfile(install = false, options = {}, &gemfile)
+def gemfile(force_latest_compatible = false, options = {}, &gemfile)
   require_relative "../bundler"
   Bundler.reset!
 
   opts = options.dup
   ui = opts.delete(:ui) { Bundler::UI::Shell.new }
-  ui.level = "silent" if opts.delete(:quiet) || !install
+  ui.level = "silent" if opts.delete(:quiet) || !force_latest_compatible
   Bundler.ui = ui
   raise ArgumentError, "Unknown options: #{opts.keys.join(", ")}" unless opts.empty?
 
-  Bundler.with_unbundled_env do
+  old_gemfile = ENV["BUNDLE_GEMFILE"]
+
+  Bundler.unbundle_env!
+
+  begin
     Bundler.instance_variable_set(:@bundle_path, Pathname.new(Gem.dir))
     Bundler::SharedHelpers.set_env "BUNDLE_GEMFILE", "Gemfile"
 
     Bundler::Plugin.gemfile_install(&gemfile) if Bundler.feature_flag.plugins?
     builder = Bundler::Dsl.new
     builder.instance_eval(&gemfile)
-    builder.check_primary_source_safety
 
-    Bundler.settings.temporary(:deployment => false, :frozen => false) do
+    Bundler.settings.temporary(deployment: false, frozen: false) do
       definition = builder.to_definition(nil, true)
-      def definition.lock(*); end
       definition.validate_runtime!
 
-      if install || definition.missing_specs?
-        Bundler.settings.temporary(:inline => true, :no_install => false) do
-          installer = Bundler::Installer.install(Bundler.root, definition, :system => true)
+      if force_latest_compatible || definition.missing_specs?
+        Bundler.settings.temporary(inline: true, no_install: false) do
+          installer = Bundler::Installer.install(Bundler.root, definition, system: true)
           installer.post_install_messages.each do |name, message|
             Bundler.ui.info "Post-install message from #{name}:\n#{message}"
           end
         end
       end
 
-      runtime = Bundler::Runtime.new(nil, definition)
-      runtime.setup.require
-    end
-  end
+      begin
+        runtime = Bundler::Runtime.new(nil, definition).setup
+      rescue Gem::LoadError => e
+        name = e.name
+        version = e.requirement.requirements.first[1]
+        activated_version = Gem.loaded_specs[name].version
+
+        Bundler.ui.info \
+          "The #{name} gem was resolved to #{version}, but #{activated_version} was activated by Bundler while installing it, causing a conflict. " \
+          "Bundler will now retry resolving with #{activated_version} instead."
 
-  if ENV["BUNDLE_GEMFILE"].nil?
-    ENV["BUNDLE_GEMFILE"] = ""
+        builder.dependencies.delete_if {|d| d.name == name }
+        builder.instance_eval { gem name, activated_version }
+        definition = builder.to_definition(nil, true)
+
+        retry
+      end
+
+      runtime.require
+    end
+  ensure
+    if old_gemfile
+      ENV["BUNDLE_GEMFILE"] = old_gemfile
+    else
+      ENV["BUNDLE_GEMFILE"] = ""
+    end
   end
 end
diff --git a/lib/bundler/installer.rb b/lib/bundler/installer.rb
index 59b6a6ad22ca25..d41740a411249f 100644
--- a/lib/bundler/installer.rb
+++ b/lib/bundler/installer.rb
@@ -69,9 +69,7 @@ def run(options)
       Bundler.create_bundle_path
 
       ProcessLock.lock do
-        if Bundler.frozen_bundle?
-          @definition.ensure_equivalent_gemfile_and_lockfile(options[:deployment])
-        end
+        @definition.ensure_equivalent_gemfile_and_lockfile(options[:deployment])
 
         if @definition.dependencies.empty?
           Bundler.ui.warn "The Gemfile specifies no dependencies"
@@ -79,12 +77,9 @@ def run(options)
           return
         end
 
-        if resolve_if_needed(options)
+        if @definition.setup_domain!(options)
           ensure_specs_are_compatible!
           load_plugins
-          options.delete(:jobs)
-        else
-          options[:jobs] = 1 # to avoid the overhead of Bundler::Worker
         end
         install(options)
 
@@ -96,6 +91,11 @@ def run(options)
     end
 
     def generate_bundler_executable_stubs(spec, options = {})
+      if spec.name == "bundler"
+        Bundler.ui.warn "Bundler itself does not use binstubs because its version is selected by RubyGems"
+        return
+      end
+
       if options[:binstubs_cmd] && spec.executables.empty?
         options = {}
         spec.runtime_dependencies.each do |dep|
@@ -120,10 +120,6 @@ def generate_bundler_executable_stubs(spec, options = {})
       ruby_command = Thor::Util.ruby_command
       ruby_command = ruby_command
       template_path = File.expand_path("templates/Executable", __dir__)
-      if spec.name == "bundler"
-        template_path += ".bundler"
-        spec.executables = %(bundle)
-      end
       template = File.read(template_path)
 
       exists = []
@@ -136,12 +132,12 @@ def generate_bundler_executable_stubs(spec, options = {})
 
         mode = Gem.win_platform? ? "wb:UTF-8" : "w"
         require "erb"
-        content = ERB.new(template, :trim_mode => "-").result(binding)
+        content = ERB.new(template, trim_mode: "-").result(binding)
 
-        File.write(binstub_path, content, :mode => mode, :perm => 0o777 & ~File.umask)
+        File.write(binstub_path, content, mode: mode, perm: 0o777 & ~File.umask)
         if Gem.win_platform? || options[:all_platforms]
           prefix = "@ruby -x \"%~f0\" %*\n@exit /b %ERRORLEVEL%\n\n"
-          File.write("#{binstub_path}.cmd", prefix + content, :mode => mode)
+          File.write("#{binstub_path}.cmd", prefix + content, mode: mode)
         end
       end
 
@@ -179,12 +175,12 @@ def generate_standalone_bundler_executable_stubs(spec, options = {})
 
         mode = Gem.win_platform? ? "wb:UTF-8" : "w"
         require "erb"
-        content = ERB.new(template, :trim_mode => "-").result(binding)
+        content = ERB.new(template, trim_mode: "-").result(binding)
 
-        File.write("#{bin_path}/#{executable}", content, :mode => mode, :perm => 0o755)
+        File.write("#{bin_path}/#{executable}", content, mode: mode, perm: 0o755)
         if Gem.win_platform? || options[:all_platforms]
           prefix = "@ruby -x \"%~f0\" %*\n@exit /b %ERRORLEVEL%\n\n"
-          File.write("#{bin_path}/#{executable}.cmd", prefix + content, :mode => mode)
+          File.write("#{bin_path}/#{executable}.cmd", prefix + content, mode: mode)
         end
       end
     end
@@ -196,16 +192,17 @@ def generate_standalone_bundler_executable_stubs(spec, options = {})
     # that said, it's a rare situation (other than rake), and parallel
     # installation is SO MUCH FASTER. so we let people opt in.
     def install(options)
-      force = options["force"]
-      jobs = installation_parallelization(options)
-      install_in_parallel jobs, options[:standalone], force
-    end
-
-    def installation_parallelization(options)
-      if jobs = options.delete(:jobs)
-        return jobs
+      standalone = options[:standalone]
+      force = options[:force]
+      local = options[:local] || options[:"prefer-local"]
+      jobs = installation_parallelization
+      spec_installations = ParallelInstaller.call(self, @definition.specs, jobs, standalone, force, local: local)
+      spec_installations.each do |installation|
+        post_install_messages[installation.name] = installation.post_install_message if installation.has_post_install_message?
       end
+    end
 
+    def installation_parallelization
       if jobs = Bundler.settings[:jobs]
         return jobs
       end
@@ -214,17 +211,17 @@ def installation_parallelization(options)
     end
 
     def load_plugins
-      Bundler.rubygems.load_plugins
+      Gem.load_plugins
 
-      requested_path_gems = @definition.requested_specs.select {|s| s.source.is_a?(Source::Path) }
-      path_plugin_files = requested_path_gems.map do |spec|
-        Bundler.rubygems.spec_matches_for_glob(spec, "rubygems_plugin#{Bundler.rubygems.suffix_pattern}")
+      requested_path_gems = @definition.specs.select {|s| s.source.is_a?(Source::Path) }
+      path_plugin_files = requested_path_gems.flat_map do |spec|
+        spec.matches_for_glob("rubygems_plugin#{Bundler.rubygems.suffix_pattern}")
       rescue TypeError
         error_message = "#{spec.name} #{spec.version} has an invalid gemspec"
         raise Gem::InvalidSpecificationException, error_message
-      end.flatten
-      Bundler.rubygems.load_plugin_files(path_plugin_files)
-      Bundler.rubygems.load_env_plugins
+      end
+      Gem.load_plugin_files(path_plugin_files)
+      Gem.load_env_plugins
     end
 
     def ensure_specs_are_compatible!
@@ -240,28 +237,8 @@ def ensure_specs_are_compatible!
       end
     end
 
-    def install_in_parallel(size, standalone, force = false)
-      spec_installations = ParallelInstaller.call(self, @definition.specs, size, standalone, force)
-      spec_installations.each do |installation|
-        post_install_messages[installation.name] = installation.post_install_message if installation.has_post_install_message?
-      end
-    end
-
-    # returns whether or not a re-resolve was needed
-    def resolve_if_needed(options)
-      @definition.resolution_mode = options
-
-      if !@definition.unlocking? && !options["force"] && !Bundler.settings[:inline] && Bundler.default_lockfile.file?
-        return false if @definition.nothing_changed? && !@definition.missing_specs?
-      end
-
-      @definition.setup_sources_for_resolve
-
-      true
-    end
-
-    def lock(opts = {})
-      @definition.lock(Bundler.default_lockfile, opts[:preserve_unknown_sections])
+    def lock
+      @definition.lock
     end
   end
 end
diff --git a/lib/bundler/installer/gem_installer.rb b/lib/bundler/installer/gem_installer.rb
index c855c7afa020bf..1da91857bd57b5 100644
--- a/lib/bundler/installer/gem_installer.rb
+++ b/lib/bundler/installer/gem_installer.rb
@@ -2,14 +2,15 @@
 
 module Bundler
   class GemInstaller
-    attr_reader :spec, :standalone, :worker, :force, :installer
+    attr_reader :spec, :standalone, :worker, :force, :local, :installer
 
-    def initialize(spec, installer, standalone = false, worker = 0, force = false)
+    def initialize(spec, installer, standalone = false, worker = 0, force = false, local = false)
       @spec = spec
       @installer = installer
       @standalone = standalone
       @worker = worker
       @force = force
+      @local = local
     end
 
     def install_from_spec
@@ -17,11 +18,11 @@ def install_from_spec
       Bundler.ui.debug "#{worker}:  #{spec.name} (#{spec.version}) from #{spec.loaded_from}"
       generate_executable_stubs
       [true, post_install_message]
-    rescue Bundler::InstallHookError, Bundler::SecurityError, Bundler::APIResponseMismatchError
+    rescue Bundler::InstallHookError, Bundler::SecurityError, Bundler::APIResponseMismatchError, Bundler::InsecureInstallPathError
       raise
     rescue Errno::ENOSPC
       [false, out_of_space_message]
-    rescue Bundler::BundlerError, Gem::InstallError, Bundler::APIResponseInvalidDependenciesError => e
+    rescue Bundler::BundlerError, Gem::InstallError => e
       [false, specific_failure_message(e)]
     end
 
@@ -53,10 +54,10 @@ def spec_settings
     def install
       spec.source.install(
         spec,
-        :force => force,
-        :ensure_builtin_gems_cached => standalone,
-        :build_args => Array(spec_settings),
-        :previous_spec => previous_spec,
+        force: force,
+        local: local,
+        build_args: Array(spec_settings),
+        previous_spec: previous_spec,
       )
     end
 
@@ -77,7 +78,7 @@ def generate_executable_stubs
       if Bundler.settings[:bin] && standalone
         installer.generate_standalone_bundler_executable_stubs(spec)
       elsif Bundler.settings[:bin]
-        installer.generate_bundler_executable_stubs(spec, :force => true)
+        installer.generate_bundler_executable_stubs(spec, force: true)
       end
     end
   end
diff --git a/lib/bundler/installer/parallel_installer.rb b/lib/bundler/installer/parallel_installer.rb
index 83a381f592564b..d10e5ec92403ed 100644
--- a/lib/bundler/installer/parallel_installer.rb
+++ b/lib/bundler/installer/parallel_installer.rb
@@ -42,8 +42,7 @@ def ignorable_dependency?(dep)
 
       # Checks installed dependencies against spec's dependencies to make
       # sure needed dependencies have been installed.
-      def dependencies_installed?(all_specs)
-        installed_specs = all_specs.select(&:installed?).map(&:name)
+      def dependencies_installed?(installed_specs)
         dependencies.all? {|d| installed_specs.include? d.name }
       end
 
@@ -63,20 +62,24 @@ def to_s
       end
     end
 
-    def self.call(*args)
-      new(*args).call
+    def self.call(*args, **kwargs)
+      new(*args, **kwargs).call
     end
 
     attr_reader :size
 
-    def initialize(installer, all_specs, size, standalone, force)
+    def initialize(installer, all_specs, size, standalone, force, local: false, skip: nil)
       @installer = installer
       @size = size
       @standalone = standalone
       @force = force
+      @local = local
       @specs = all_specs.map {|s| SpecInstallation.new(s) }
+      @specs.each do |spec_install|
+        spec_install.state = :installed if skip.include?(spec_install.name)
+      end if skip
       @spec_set = all_specs
-      @rake = @specs.find {|s| s.name == "rake" }
+      @rake = @specs.find {|s| s.name == "rake" unless s.installed? }
     end
 
     def call
@@ -91,38 +94,12 @@ def call
         install_serially
       end
 
-      check_for_unmet_dependencies
-
       handle_error if failed_specs.any?
       @specs
     ensure
       worker_pool&.stop
     end
 
-    def check_for_unmet_dependencies
-      unmet_dependencies = @specs.map do |s|
-        [
-          s,
-          s.dependencies.reject {|dep| @specs.any? {|spec| dep.matches_spec?(spec.spec) } },
-        ]
-      end.reject {|a| a.last.empty? }
-      return if unmet_dependencies.empty?
-
-      warning = []
-      warning << "Your lockfile doesn't include a valid resolution."
-      warning << "You can fix this by regenerating your lockfile or manually editing the bad locked gems to a version that satisfies all dependencies."
-      warning << "The unmet dependencies are:"
-
-      unmet_dependencies.each do |spec, unmet_spec_dependencies|
-        unmet_spec_dependencies.each do |unmet_spec_dependency|
-          found = @specs.find {|s| s.name == unmet_spec_dependency.name && !unmet_spec_dependency.matches_spec?(s.spec) }
-          warning << "* #{unmet_spec_dependency}, dependency of #{spec.full_name}, unsatisfied by #{found.full_name}"
-        end
-      end
-
-      Bundler.ui.warn(warning.join("\n"))
-    end
-
     private
 
     def failed_specs
@@ -151,7 +128,7 @@ def worker_pool
     def do_install(spec_install, worker_num)
       Plugin.hook(Plugin::Events::GEM_BEFORE_INSTALL, spec_install)
       gem_installer = Bundler::GemInstaller.new(
-        spec_install.spec, @installer, @standalone, worker_num, @force
+        spec_install.spec, @installer, @standalone, worker_num, @force, @local
       )
       success, message = gem_installer.install_from_spec
       if success
@@ -209,8 +186,14 @@ def require_tree_for_spec(spec)
     # previously installed specifications. We continue until all specs
     # are installed.
     def enqueue_specs
-      @specs.select(&:ready_to_enqueue?).each do |spec|
-        if spec.dependencies_installed? @specs
+      installed_specs = {}
+      @specs.each do |spec|
+        next unless spec.installed?
+        installed_specs[spec.name] = true
+      end
+
+      @specs.each do |spec|
+        if spec.ready_to_enqueue? && spec.dependencies_installed?(installed_specs)
           spec.state = :enqueued
           worker_pool.enq spec
         end
diff --git a/lib/bundler/installer/standalone.rb b/lib/bundler/installer/standalone.rb
index a019fbd3b8f5ef..8b4de64df52eb9 100644
--- a/lib/bundler/installer/standalone.rb
+++ b/lib/bundler/installer/standalone.rb
@@ -12,6 +12,7 @@ def generate
       end
       File.open File.join(bundler_path, "setup.rb"), "w" do |file|
         file.puts "require 'rbconfig'"
+        file.puts prevent_gem_activation
         file.puts define_path_helpers
         file.puts reverse_rubygems_kernel_mixin
         paths.each do |path|
@@ -27,7 +28,7 @@ def generate
     private
 
     def paths
-      @specs.map do |spec|
+      @specs.flat_map do |spec|
         next if spec.name == "bundler"
         Array(spec.require_paths).map do |path|
           gem_path(path, spec).
@@ -35,7 +36,7 @@ def paths
             sub(extensions_dir, 'extensions/\k<platform>/#{Gem.extension_api_version}')
           # This is a static string intentionally. It's interpolated at a later time.
         end
-      end.flatten.compact
+      end.compact
     end
 
     def version_dir
@@ -55,11 +56,21 @@ def gem_path(path, spec)
       if spec.source.instance_of?(Source::Path) && spec.source.path.absolute?
         full_path
       else
-        Pathname.new(full_path).relative_path_from(Bundler.root.join(bundler_path)).to_s
+        SharedHelpers.relative_path_to(full_path, from: Bundler.root.join(bundler_path))
       end
-    rescue TypeError
-      error_message = "#{spec.name} #{spec.version} has an invalid gemspec"
-      raise Gem::InvalidSpecificationException.new(error_message)
+    end
+
+    def prevent_gem_activation
+      <<~'END'
+        module Kernel
+          remove_method(:gem) if private_method_defined?(:gem)
+
+          def gem(*)
+          end
+
+          private :gem
+        end
+      END
     end
 
     def define_path_helpers
diff --git a/lib/bundler/lazy_specification.rb b/lib/bundler/lazy_specification.rb
index c9b161dc0e6c0b..81ded54797793a 100644
--- a/lib/bundler/lazy_specification.rb
+++ b/lib/bundler/lazy_specification.rb
@@ -4,19 +4,62 @@
 
 module Bundler
   class LazySpecification
+    include MatchMetadata
     include MatchPlatform
     include ForcePlatform
 
-    attr_reader :name, :version, :dependencies, :platform
-    attr_accessor :source, :remote, :force_ruby_platform
+    attr_reader :name, :version, :platform, :materialization
+    attr_accessor :source, :remote, :force_ruby_platform, :dependencies, :required_ruby_version, :required_rubygems_version
 
-    def initialize(name, version, platform, source = nil)
+    #
+    # For backwards compatibility with existing lockfiles, if the most specific
+    # locked platform is not a specific platform like x86_64-linux or
+    # universal-java-11, then we keep the previous behaviour of resolving the
+    # best platform variant at materiliazation time. For previous bundler
+    # versions (before 2.2.0) this was always the case (except when the lockfile
+    # only included non-ruby platforms), but we're also keeping this behaviour
+    # on newer bundlers unless users generate the lockfile from scratch or
+    # explicitly add a more specific platform.
+    #
+    attr_accessor :most_specific_locked_platform
+
+    alias_method :runtime_dependencies, :dependencies
+
+    def self.from_spec(s)
+      lazy_spec = new(s.name, s.version, s.platform, s.source)
+      lazy_spec.dependencies = s.runtime_dependencies
+      lazy_spec.required_ruby_version = s.required_ruby_version
+      lazy_spec.required_rubygems_version = s.required_rubygems_version
+      lazy_spec
+    end
+
+    def initialize(name, version, platform, source = nil, **materialization_options)
       @name          = name
       @version       = version
       @dependencies  = []
-      @platform      = platform || Gem::Platform::RUBY
-      @source        = source
+      @required_ruby_version = Gem::Requirement.default
+      @required_rubygems_version = Gem::Requirement.default
+      @platform = platform || Gem::Platform::RUBY
+
+      @original_source = source
+      @source = source
+      @materialization_options = materialization_options
+
       @force_ruby_platform = default_force_ruby_platform
+      @most_specific_locked_platform = nil
+      @materialization = nil
+    end
+
+    def missing?
+      @materialization == self
+    end
+
+    def incomplete?
+      @materialization.nil?
+    end
+
+    def source_changed?
+      @original_source != source
     end
 
     def full_name
@@ -27,6 +70,14 @@ def full_name
       end
     end
 
+    def lock_name
+      @lock_name ||= name_tuple.lock_name
+    end
+
+    def name_tuple
+      Gem::NameTuple.new(@name, @version, @platform)
+    end
+
     def ==(other)
       full_name == other.full_name
     end
@@ -61,12 +112,7 @@ def satisfies?(dependency)
 
     def to_lock
       out = String.new
-
-      if platform == Gem::Platform::RUBY
-        out << "    #{name} (#{version})\n"
-      else
-        out << "    #{name} (#{version}-#{platform})\n"
-      end
+      out << "    #{lock_name}\n"
 
       dependencies.sort_by(&:to_s).uniq.each do |dep|
         next if dep.type == :development
@@ -76,57 +122,49 @@ def to_lock
       out
     end
 
+    def materialize_for_cache
+      source.remote!
+
+      materialize(self, &:first)
+    end
+
+    def materialized_for_installation
+      @materialization = materialize_for_installation
+
+      self unless incomplete?
+    end
+
     def materialize_for_installation
       source.local!
 
-      matching_specs = source.specs.search(use_exact_resolved_specifications? ? self : [name, version])
-      return self if matching_specs.empty?
-
-      candidates = if use_exact_resolved_specifications?
-        matching_specs
+      if use_exact_resolved_specifications?
+        materialize(self) do |matching_specs|
+          choose_compatible(matching_specs)
+        end
       else
-        target_platform = ruby_platform_materializes_to_ruby_platform? ? platform : local_platform
+        materialize([name, version]) do |matching_specs|
+          target_platform = source.is_a?(Source::Path) ? platform : Bundler.local_platform
 
-        installable_candidates = GemHelpers.select_best_platform_match(matching_specs, target_platform)
+          installable_candidates = MatchPlatform.select_best_platform_match(matching_specs, target_platform)
 
-        specification = __materialize__(installable_candidates, :fallback_to_non_installable => false)
-        return specification unless specification.nil?
+          specification = choose_compatible(installable_candidates, fallback_to_non_installable: false)
+          return specification unless specification.nil?
 
-        if target_platform != platform
-          installable_candidates = GemHelpers.select_best_platform_match(matching_specs, platform)
-        end
+          if target_platform != platform
+            installable_candidates = MatchPlatform.select_best_platform_match(matching_specs, platform)
+          end
 
-        installable_candidates
+          choose_compatible(installable_candidates)
+        end
       end
-
-      __materialize__(candidates)
     end
 
-    # If in frozen mode, we fallback to a non-installable candidate because by
-    # doing this we avoid re-resolving and potentially end up changing the
-    # lock file, which is not allowed. In that case, we will give a proper error
-    # about the mismatch higher up the stack, right before trying to install the
-    # bad gem.
-    def __materialize__(candidates, fallback_to_non_installable: Bundler.frozen_bundle?)
-      search = candidates.reverse.find do |spec|
-        spec.is_a?(StubSpecification) ||
-          (spec.matches_current_ruby? &&
-            spec.matches_current_rubygems?)
-      end
-      if search.nil? && fallback_to_non_installable
-        search = candidates.last
-      else
-        search.dependencies = dependencies if search && search.full_name == full_name && (search.is_a?(RemoteSpecification) || search.is_a?(EndpointSpecification))
-      end
-      search
+    def inspect
+      "#<#{self.class} @name=\"#{name}\" (#{full_name.delete_prefix("#{name}-")})>"
     end
 
     def to_s
-      @to_s ||= if platform == Gem::Platform::RUBY
-        "#{name} (#{version})"
-      else
-        "#{name} (#{version}-#{platform})"
-      end
+      lock_name
     end
 
     def git_version
@@ -134,26 +172,74 @@ def git_version
       " #{source.revision[0..6]}"
     end
 
+    def force_ruby_platform!
+      @force_ruby_platform = true
+    end
+
+    def replace_source_with!(gemfile_source)
+      return unless gemfile_source.can_lock?(self)
+
+      @source = gemfile_source
+
+      true
+    end
+
     private
 
     def use_exact_resolved_specifications?
-      @use_exact_resolved_specifications ||= !source.is_a?(Source::Path) && ruby_platform_materializes_to_ruby_platform?
+      !source.is_a?(Source::Path) && ruby_platform_materializes_to_ruby_platform?
     end
 
-    #
-    # For backwards compatibility with existing lockfiles, if the most specific
-    # locked platform is not a specific platform like x86_64-linux or
-    # universal-java-11, then we keep the previous behaviour of resolving the
-    # best platform variant at materiliazation time. For previous bundler
-    # versions (before 2.2.0) this was always the case (except when the lockfile
-    # only included non-ruby platforms), but we're also keeping this behaviour
-    # on newer bundlers unless users generate the lockfile from scratch or
-    # explicitly add a more specific platform.
-    #
     def ruby_platform_materializes_to_ruby_platform?
-      generic_platform = generic_local_platform == Gem::Platform::JAVA ? Gem::Platform::JAVA : Gem::Platform::RUBY
+      generic_platform = Bundler.generic_local_platform == Gem::Platform::JAVA ? Gem::Platform::JAVA : Gem::Platform::RUBY
+
+      (most_specific_locked_platform != generic_platform) || force_ruby_platform || Bundler.settings[:force_ruby_platform]
+    end
 
-      !Bundler.most_specific_locked_platform?(generic_platform) || force_ruby_platform || Bundler.settings[:force_ruby_platform]
+    def materialize(query)
+      matching_specs = source.specs.search(query)
+      return self if matching_specs.empty?
+
+      yield matching_specs
+    end
+
+    # If in frozen mode, we fallback to a non-installable candidate because by
+    # doing this we avoid re-resolving and potentially end up changing the
+    # lockfile, which is not allowed. In that case, we will give a proper error
+    # about the mismatch higher up the stack, right before trying to install the
+    # bad gem.
+    def choose_compatible(candidates, fallback_to_non_installable: Bundler.frozen_bundle?)
+      search = candidates.reverse.find do |spec|
+        spec.is_a?(StubSpecification) || spec.matches_current_metadata?
+      end
+      if search.nil? && fallback_to_non_installable
+        search = candidates.last
+      end
+
+      if search
+        validate_dependencies(search) if search.platform == platform
+
+        search.locked_platform = platform if search.instance_of?(RemoteSpecification) || search.instance_of?(EndpointSpecification)
+      end
+      search
+    end
+
+    # Validate dependencies of this locked spec are consistent with dependencies
+    # of the actual spec that was materialized.
+    #
+    # Note that unless we are in strict mode (which we set during installation)
+    # we don't validate dependencies of locally installed gems but
+    # accept what's in the lockfile instead for performance, since loading
+    # dependencies of locally installed gems would mean evaluating all gemspecs,
+    # which would affect `bundler/setup` performance.
+    def validate_dependencies(spec)
+      if !@materialization_options[:strict] && spec.is_a?(StubSpecification)
+        spec.dependencies = dependencies
+      else
+        if !source.is_a?(Source::Path) && spec.runtime_dependencies.sort != dependencies.sort
+          raise IncorrectLockfileDependencies.new(self)
+        end
+      end
     end
   end
 end
diff --git a/lib/bundler/lockfile_generator.rb b/lib/bundler/lockfile_generator.rb
index f7ba51b3e69275..904552fa0c8eb0 100644
--- a/lib/bundler/lockfile_generator.rb
+++ b/lib/bundler/lockfile_generator.rb
@@ -19,6 +19,7 @@ def generate!
       add_sources
       add_platforms
       add_dependencies
+      add_checksums
       add_locked_ruby_version
       add_bundled_with
 
@@ -28,7 +29,7 @@ def generate!
     private
 
     def add_sources
-      definition.send(:sources).lock_sources.each_with_index do |source, idx|
+      definition.sources.lock_sources.each_with_index do |source, idx|
         out << "\n" unless idx.zero?
 
         # Add the source header
@@ -65,6 +66,14 @@ def add_dependencies
       end
     end
 
+    def add_checksums
+      return unless definition.locked_checksums
+      checksums = definition.resolve.map do |spec|
+        spec.source.checksum_store.to_lock(spec)
+      end
+      add_section("CHECKSUMS", checksums)
+    end
+
     def add_locked_ruby_version
       return unless locked_ruby_version = definition.locked_ruby_version
       add_section("RUBY VERSION", locked_ruby_version.to_s)
diff --git a/lib/bundler/lockfile_parser.rb b/lib/bundler/lockfile_parser.rb
index 7360a3675261e7..9ab9d73ae26d3c 100644
--- a/lib/bundler/lockfile_parser.rb
+++ b/lib/bundler/lockfile_parser.rb
@@ -1,11 +1,45 @@
 # frozen_string_literal: true
 
+require_relative "shared_helpers"
+
 module Bundler
   class LockfileParser
-    attr_reader :sources, :dependencies, :specs, :platforms, :bundler_version, :ruby_version
+    class Position
+      attr_reader :line, :column
+      def initialize(line, column)
+        @line = line
+        @column = column
+      end
+
+      def advance!(string)
+        lines = string.count("\n")
+        if lines > 0
+          @line += lines
+          @column = string.length - string.rindex("\n")
+        else
+          @column += string.length
+        end
+      end
+
+      def to_s
+        "#{line}:#{column}"
+      end
+    end
+
+    attr_reader(
+      :sources,
+      :dependencies,
+      :specs,
+      :platforms,
+      :most_specific_locked_platform,
+      :bundler_version,
+      :ruby_version,
+      :checksums,
+    )
 
     BUNDLED      = "BUNDLED WITH"
     DEPENDENCIES = "DEPENDENCIES"
+    CHECKSUMS    = "CHECKSUMS"
     PLATFORMS    = "PLATFORMS"
     RUBY         = "RUBY VERSION"
     GIT          = "GIT"
@@ -13,7 +47,7 @@ class LockfileParser
     PATH         = "PATH"
     PLUGIN       = "PLUGIN SOURCE"
     SPECS        = "  specs:"
-    OPTIONS      = /^  ([a-z]+): (.*)$/i.freeze
+    OPTIONS      = /^  ([a-z]+): (.*)$/i
     SOURCE       = [GIT, GEM, PATH, PLUGIN].freeze
 
     SECTIONS_BY_VERSION_INTRODUCED = {
@@ -21,15 +55,18 @@ class LockfileParser
       Gem::Version.create("1.10") => [BUNDLED].freeze,
       Gem::Version.create("1.12") => [RUBY].freeze,
       Gem::Version.create("1.13") => [PLUGIN].freeze,
+      Gem::Version.create("2.5.0") => [CHECKSUMS].freeze,
     }.freeze
 
-    KNOWN_SECTIONS = SECTIONS_BY_VERSION_INTRODUCED.values.flatten.freeze
+    KNOWN_SECTIONS = SECTIONS_BY_VERSION_INTRODUCED.values.flatten!.freeze
 
     ENVIRONMENT_VERSION_SECTIONS = [BUNDLED, RUBY].freeze
     deprecate_constant(:ENVIRONMENT_VERSION_SECTIONS)
 
     def self.sections_in_lockfile(lockfile_contents)
-      lockfile_contents.scan(/^\w[\w ]*$/).uniq
+      sections = lockfile_contents.scan(/^\w[\w ]*$/)
+      sections.uniq!
+      sections
     end
 
     def self.unknown_sections_in_lockfile(lockfile_contents)
@@ -38,7 +75,7 @@ def self.unknown_sections_in_lockfile(lockfile_contents)
 
     def self.sections_to_ignore(base_version = nil)
       base_version &&= base_version.release
-      base_version ||= Gem::Version.create("1.0".dup)
+      base_version ||= Gem::Version.create("1.0")
       attributes = []
       SECTIONS_BY_VERSION_INTRODUCED.each do |version, introduced|
         next if version <= base_version
@@ -57,41 +94,78 @@ def self.bundled_with
       lockfile_contents.split(BUNDLED).last.strip
     end
 
-    def initialize(lockfile)
+    def initialize(lockfile, strict: false)
       @platforms    = []
       @sources      = []
       @dependencies = {}
-      @state        = nil
+      @parse_method = nil
       @specs        = {}
+      @lockfile_path = begin
+        SharedHelpers.relative_lockfile_path
+      rescue GemfileNotFound
+        "Gemfile.lock"
+      end
+      @pos = Position.new(1, 1)
+      @strict = strict
 
       if lockfile.match?(/<<<<<<<|=======|>>>>>>>|\|\|\|\|\|\|\|/)
-        raise LockfileError, "Your #{Bundler.default_lockfile.relative_path_from(SharedHelpers.pwd)} contains merge conflicts.\n" \
-          "Run `git checkout HEAD -- #{Bundler.default_lockfile.relative_path_from(SharedHelpers.pwd)}` first to get a clean lock."
+        raise LockfileError, "Your #{@lockfile_path} contains merge conflicts.\n" \
+          "Run `git checkout HEAD -- #{@lockfile_path}` first to get a clean lock."
       end
 
-      lockfile.split(/(?:\r?\n)+/).each do |line|
+      lockfile.split(/((?:\r?\n)+)/) do |line|
+        # split alternates between the line and the following whitespace
+        next @pos.advance!(line) if line.match?(/^\s*$/)
+
         if SOURCE.include?(line)
-          @state = :source
+          @parse_method = :parse_source
           parse_source(line)
         elsif line == DEPENDENCIES
-          @state = :dependency
+          @parse_method = :parse_dependency
+        elsif line == CHECKSUMS
+          # This is a temporary solution to make this feature disabled by default
+          # for all gemfiles that don't already explicitly include the feature.
+          @checksums = true
+          @parse_method = :parse_checksum
         elsif line == PLATFORMS
-          @state = :platform
+          @parse_method = :parse_platform
         elsif line == RUBY
-          @state = :ruby
+          @parse_method = :parse_ruby
         elsif line == BUNDLED
-          @state = :bundled_with
+          @parse_method = :parse_bundled_with
         elsif /^[^\s]/.match?(line)
-          @state = nil
-        elsif @state
-          send("parse_#{@state}", line)
+          @parse_method = nil
+        elsif @parse_method
+          send(@parse_method, line)
         end
+        @pos.advance!(line)
+      end
+
+      if !Bundler.frozen_bundle? && @platforms.include?(Gem::Platform::X64_MINGW_LEGACY)
+        if @platforms.include?(Gem::Platform::X64_MINGW)
+          @platforms.delete(Gem::Platform::X64_MINGW_LEGACY)
+          SharedHelpers.major_deprecation(2,
+            "Found x64-mingw32 in lockfile, which is deprecated. Removing it. Support for x64-mingw32 will be removed in Bundler 4.0.",
+            removed_message: "Found x64-mingw32 in lockfile, which is no longer supported as of Bundler 4.0.")
+        else
+          @platforms[@platforms.index(Gem::Platform::X64_MINGW_LEGACY)] = Gem::Platform::X64_MINGW
+          SharedHelpers.major_deprecation(2,
+            "Found x64-mingw32 in lockfile, which is deprecated. Using x64-mingw-ucrt, the replacement for x64-mingw32 in modern rubies, instead. Support for x64-mingw32 will be removed in Bundler 4.0.",
+            removed_message: "Found x64-mingw32 in lockfile, which is no longer supported as of Bundler 4.0.")
+        end
+      end
+
+      @most_specific_locked_platform = @platforms.min_by do |bundle_platform|
+        Gem::Platform.platform_specificity_match(bundle_platform, Bundler.local_platform)
+      end
+      @specs = @specs.values.sort_by!(&:full_name).each do |spec|
+        spec.most_specific_locked_platform = @most_specific_locked_platform
       end
-      @specs = @specs.values.sort_by(&:full_name)
     rescue ArgumentError => e
       Bundler.ui.debug(e)
-      raise LockfileError, "Your lockfile is unreadable. Run `rm #{Bundler.default_lockfile.relative_path_from(SharedHelpers.pwd)}` " \
-        "and then `bundle install` to generate a new lockfile."
+      raise LockfileError, "Your lockfile is unreadable. Run `rm #{@lockfile_path}` " \
+        "and then `bundle install` to generate a new lockfile. The error occurred while " \
+        "evaluating #{@lockfile_path}:#{@pos}"
     end
 
     def may_include_redundant_platform_specific_gems?
@@ -110,21 +184,9 @@ def may_include_redundant_platform_specific_gems?
     def parse_source(line)
       case line
       when SPECS
-        case @type
-        when PATH
-          @current_source = TYPES[@type].from_lock(@opts)
-          @sources << @current_source
-        when GIT
-          @current_source = TYPES[@type].from_lock(@opts)
-          @sources << @current_source
-        when GEM
-          @opts["remotes"] = Array(@opts.delete("remote")).reverse
-          @current_source = TYPES[@type].from_lock(@opts)
-          @sources << @current_source
-        when PLUGIN
-          @current_source = Plugin.source_from_lock(@opts)
-          @sources << @current_source
-        end
+        return unless TYPES.key?(@type)
+        @current_source = TYPES[@type].from_lock(@opts)
+        @sources << @current_source
       when OPTIONS
         value = $2
         value = true if value == "true"
@@ -154,18 +216,19 @@ def parse_source(line)
       (?:#{space}\(([^-]*)                               # Space, followed by version
       (?:-(.*))?\))?                                     # Optional platform
       (!)?                                               # Optional pinned marker
+      (?:#{space}([^ ]+))?                               # Optional checksum
       $                                                  # Line end
-    /xo.freeze
+    /xo
 
     def parse_dependency(line)
       return unless line =~ NAME_VERSION
       spaces = $1
       return unless spaces.size == 2
-      name = $2
+      name = -$2
       version = $3
       pinned = $5
 
-      version = version.split(",").map(&:strip) if version
+      version = version.split(",").each(&:strip!) if version
 
       dep = Bundler::Dependency.new(name, version)
 
@@ -186,40 +249,68 @@ def parse_dependency(line)
       @dependencies[dep.name] = dep
     end
 
-    def parse_spec(line)
+    def parse_checksum(line)
       return unless line =~ NAME_VERSION
+
       spaces = $1
+      return unless spaces.size == 2
+      checksums = $6
       name = $2
       version = $3
       platform = $4
 
+      version = Gem::Version.new(version)
+      platform = platform ? Gem::Platform.new(platform) : Gem::Platform::RUBY
+      full_name = Gem::NameTuple.new(name, version, platform).full_name
+      return unless spec = @specs[full_name]
+
+      if checksums
+        checksums.split(",") do |lock_checksum|
+          column = line.index(lock_checksum) + 1
+          checksum = Checksum.from_lock(lock_checksum, "#{@lockfile_path}:#{@pos.line}:#{column}")
+          spec.source.checksum_store.register(spec, checksum)
+        end
+      else
+        spec.source.checksum_store.register(spec, nil)
+      end
+    end
+
+    def parse_spec(line)
+      return unless line =~ NAME_VERSION
+      spaces = $1
+      name = -$2
+      version = $3
+
       if spaces.size == 4
+        # only load platform for non-dependency (spec) line
+        platform = $4
+
         version = Gem::Version.new(version)
         platform = platform ? Gem::Platform.new(platform) : Gem::Platform::RUBY
-        @current_spec = LazySpecification.new(name, version, platform)
-        @current_spec.source = @current_source
+        @current_spec = LazySpecification.new(name, version, platform, @current_source, strict: @strict)
         @current_source.add_dependency_names(name)
 
         @specs[@current_spec.full_name] = @current_spec
       elsif spaces.size == 6
-        version = version.split(",").map(&:strip) if version
+        version = version.split(",").each(&:strip!) if version
         dep = Gem::Dependency.new(name, version)
         @current_spec.dependencies << dep
       end
     end
 
     def parse_platform(line)
-      @platforms << Gem::Platform.new($1) if line =~ /^  (.*)$/
+      @platforms << Gem::Platform.new($1.strip) if line =~ /^  (.*)$/
     end
 
     def parse_bundled_with(line)
-      line = line.strip
+      line.strip!
       return unless Gem::Version.correct?(line)
       @bundler_version = Gem::Version.create(line)
     end
 
     def parse_ruby(line)
-      @ruby_version = line.strip
+      line.strip!
+      @ruby_version = line
     end
   end
 end
diff --git a/lib/bundler/man/bundle-add.1 b/lib/bundler/man/bundle-add.1
index 8549855b0ddded..baa4a376c83b4c 100644
--- a/lib/bundler/man/bundle-add.1
+++ b/lib/bundler/man/bundle-add.1
@@ -1,82 +1,76 @@
-.\" generated with Ronn/v0.7.3
-.\" http://github.com/rtomayko/ronn/tree/0.7.3
-.
-.TH "BUNDLE\-ADD" "1" "August 2023" "" ""
-.
+.\" generated with Ronn-NG/v0.10.1
+.\" http://github.com/apjanke/ronn-ng/tree/0.10.1
+.TH "BUNDLE\-ADD" "1" "July 2025" ""
 .SH "NAME"
 \fBbundle\-add\fR \- Add gem to the Gemfile and run bundle install
-.
 .SH "SYNOPSIS"
-\fBbundle add\fR \fIGEM_NAME\fR [\-\-group=GROUP] [\-\-version=VERSION] [\-\-source=SOURCE] [\-\-path=PATH] [\-\-git=GIT] [\-\-github=GITHUB] [\-\-branch=BRANCH] [\-\-ref=REF] [\-\-skip\-install] [\-\-strict] [\-\-optimistic]
-.
+\fBbundle add\fR \fIGEM_NAME\fR [\-\-group=GROUP] [\-\-version=VERSION] [\-\-source=SOURCE] [\-\-path=PATH] [\-\-git=GIT|\-\-github=GITHUB] [\-\-branch=BRANCH] [\-\-ref=REF] [\-\-quiet] [\-\-skip\-install] [\-\-strict|\-\-optimistic]
 .SH "DESCRIPTION"
-Adds the named gem to the Gemfile and run \fBbundle install\fR\. \fBbundle install\fR can be avoided by using the flag \fB\-\-skip\-install\fR\.
-.
-.P
-Example:
-.
-.P
-bundle add rails
-.
-.P
-bundle add rails \-\-version "< 3\.0, > 1\.1"
-.
-.P
-bundle add rails \-\-version "~> 5\.0\.0" \-\-source "https://gems\.example\.com" \-\-group "development"
-.
-.P
-bundle add rails \-\-skip\-install
-.
-.P
-bundle add rails \-\-group "development, test"
-.
+Adds the named gem to the [\fBGemfile(5)\fR][Gemfile(5)] and run \fBbundle install\fR\. \fBbundle install\fR can be avoided by using the flag \fB\-\-skip\-install\fR\.
 .SH "OPTIONS"
-.
 .TP
-\fB\-\-version\fR, \fB\-v\fR
+\fB\-\-version=VERSION\fR, \fB\-v=VERSION\fR
 Specify version requirements(s) for the added gem\.
-.
 .TP
-\fB\-\-group\fR, \fB\-g\fR
+\fB\-\-group=GROUP\fR, \fB\-g=GROUP\fR
 Specify the group(s) for the added gem\. Multiple groups should be separated by commas\.
-.
 .TP
-\fB\-\-source\fR, \fB\-s\fR
+\fB\-\-source=SOURCE\fR, \fB\-s=SOURCE\fR
 Specify the source for the added gem\.
-.
 .TP
-\fB\-\-require\fR, \fB\-r\fR
+\fB\-\-require=REQUIRE\fR, \fB\-r=REQUIRE\fR
 Adds require path to gem\. Provide false, or a path as a string\.
-.
 .TP
-\fB\-\-path\fR
+\fB\-\-path=PATH\fR
 Specify the file system path for the added gem\.
-.
 .TP
-\fB\-\-git\fR
+\fB\-\-git=GIT\fR
 Specify the git source for the added gem\.
-.
 .TP
-\fB\-\-github\fR
+\fB\-\-github=GITHUB\fR
 Specify the github source for the added gem\.
-.
 .TP
-\fB\-\-branch\fR
+\fB\-\-branch=BRANCH\fR
 Specify the git branch for the added gem\.
-.
 .TP
-\fB\-\-ref\fR
+\fB\-\-ref=REF\fR
 Specify the git ref for the added gem\.
-.
+.TP
+\fB\-\-glob=GLOB\fR
+Specify the location of a dependency's \.gemspec, expanded within Ruby (single quotes recommended)\.
+.TP
+\fB\-\-quiet\fR
+Do not print progress information to the standard output\.
 .TP
 \fB\-\-skip\-install\fR
 Adds the gem to the Gemfile but does not install it\.
-.
 .TP
 \fB\-\-optimistic\fR
 Adds optimistic declaration of version\.
-.
 .TP
 \fB\-\-strict\fR
 Adds strict declaration of version\.
-
+.SH "EXAMPLES"
+.IP "1." 4
+You can add the \fBrails\fR gem to the Gemfile without any version restriction\. The source of the gem will be the global source\.
+.IP
+\fBbundle add rails\fR
+.IP "2." 4
+You can add the \fBrails\fR gem with version greater than 1\.1 (not including 1\.1) and less than 3\.0\.
+.IP
+\fBbundle add rails \-\-version "> 1\.1, < 3\.0"\fR
+.IP "3." 4
+You can use the \fBhttps://gems\.example\.com\fR custom source and assign the gem to a group\.
+.IP
+\fBbundle add rails \-\-version "~> 5\.0\.0" \-\-source "https://gems\.example\.com" \-\-group "development"\fR
+.IP "4." 4
+The following adds the \fBgem\fR entry to the Gemfile without installing the gem\. You can install gems later via \fBbundle install\fR\.
+.IP
+\fBbundle add rails \-\-skip\-install\fR
+.IP "5." 4
+You can assign the gem to more than one group\.
+.IP
+\fBbundle add rails \-\-group "development, test"\fR
+.IP "" 0
+.SH "SEE ALSO"
+Gemfile(5) \fIhttps://bundler\.io/man/gemfile\.5\.html\fR, bundle\-remove(1) \fIbundle\-remove\.1\.html\fR
diff --git a/lib/bundler/man/bundle-add.1.ronn b/lib/bundler/man/bundle-add.1.ronn
index 37c92e5fcdc70d..48c0c66b0946f5 100644
--- a/lib/bundler/man/bundle-add.1.ronn
+++ b/lib/bundler/man/bundle-add.1.ronn
@@ -1,53 +1,52 @@
 bundle-add(1) -- Add gem to the Gemfile and run bundle install
-================================================================
+==============================================================
 
 ## SYNOPSIS
 
-`bundle add` <GEM_NAME> [--group=GROUP] [--version=VERSION] [--source=SOURCE] [--path=PATH] [--git=GIT] [--github=GITHUB] [--branch=BRANCH] [--ref=REF] [--skip-install] [--strict] [--optimistic]
+`bundle add` <GEM_NAME> [--group=GROUP] [--version=VERSION] [--source=SOURCE]
+           [--path=PATH] [--git=GIT|--github=GITHUB] [--branch=BRANCH] [--ref=REF]
+           [--quiet] [--skip-install] [--strict|--optimistic]
 
 ## DESCRIPTION
-Adds the named gem to the Gemfile and run `bundle install`. `bundle install` can be avoided by using the flag `--skip-install`.
 
-Example:
-
-bundle add rails
-
-bundle add rails --version "< 3.0, > 1.1"
-
-bundle add rails --version "~> 5.0.0" --source "https://gems.example.com" --group "development"
-
-bundle add rails --skip-install
-
-bundle add rails --group "development, test"
+Adds the named gem to the [`Gemfile(5)`][Gemfile(5)] and run `bundle install`.
+`bundle install` can be avoided by using the flag `--skip-install`.
 
 ## OPTIONS
-* `--version`, `-v`:
+
+* `--version=VERSION`, `-v=VERSION`:
   Specify version requirements(s) for the added gem.
 
-* `--group`, `-g`:
+* `--group=GROUP`, `-g=GROUP`:
   Specify the group(s) for the added gem. Multiple groups should be separated by commas.
 
-* `--source`, `-s`:
+* `--source=SOURCE`, `-s=SOURCE`:
   Specify the source for the added gem.
 
-* `--require`, `-r`:
+* `--require=REQUIRE`, `-r=REQUIRE`:
   Adds require path to gem. Provide false, or a path as a string.
 
-* `--path`:
+* `--path=PATH`:
   Specify the file system path for the added gem.
 
-* `--git`:
+* `--git=GIT`:
   Specify the git source for the added gem.
 
-* `--github`:
+* `--github=GITHUB`:
   Specify the github source for the added gem.
 
-* `--branch`:
+* `--branch=BRANCH`:
   Specify the git branch for the added gem.
 
-* `--ref`:
+* `--ref=REF`:
   Specify the git ref for the added gem.
 
+* `--glob=GLOB`:
+  Specify the location of a dependency's .gemspec, expanded within Ruby (single quotes recommended).
+
+* `--quiet`:
+  Do not print progress information to the standard output.
+
 * `--skip-install`:
   Adds the gem to the Gemfile but does not install it.
 
@@ -56,3 +55,33 @@ bundle add rails --group "development, test"
 
 * `--strict`:
   Adds strict declaration of version.
+
+## EXAMPLES
+
+1. You can add the `rails` gem to the Gemfile without any version restriction.
+   The source of the gem will be the global source.
+
+   `bundle add rails`
+
+2. You can add the `rails` gem with version greater than 1.1 (not including 1.1) and less than 3.0.
+
+   `bundle add rails --version "> 1.1, < 3.0"`
+
+3. You can use the `https://gems.example.com` custom source and assign the gem
+   to a group.
+
+   `bundle add rails --version "~> 5.0.0" --source "https://gems.example.com" --group "development"`
+
+4. The following adds the `gem` entry to the Gemfile without installing the
+   gem. You can install gems later via `bundle install`.
+
+   `bundle add rails --skip-install`
+
+5. You can assign the gem to more than one group.
+
+   `bundle add rails --group "development, test"`
+
+## SEE ALSO
+
+[Gemfile(5)](https://bundler.io/man/gemfile.5.html),
+[bundle-remove(1)](bundle-remove.1.html)
diff --git a/lib/bundler/man/bundle-binstubs.1 b/lib/bundler/man/bundle-binstubs.1
index 40c338916a1a17..0131dd663ea38e 100644
--- a/lib/bundler/man/bundle-binstubs.1
+++ b/lib/bundler/man/bundle-binstubs.1
@@ -1,42 +1,33 @@
-.\" generated with Ronn/v0.7.3
-.\" http://github.com/rtomayko/ronn/tree/0.7.3
-.
-.TH "BUNDLE\-BINSTUBS" "1" "August 2023" "" ""
-.
+.\" generated with Ronn-NG/v0.10.1
+.\" http://github.com/apjanke/ronn-ng/tree/0.10.1
+.TH "BUNDLE\-BINSTUBS" "1" "July 2025" ""
 .SH "NAME"
 \fBbundle\-binstubs\fR \- Install the binstubs of the listed gems
-.
 .SH "SYNOPSIS"
-\fBbundle binstubs\fR \fIGEM_NAME\fR [\-\-force] [\-\-path PATH] [\-\-standalone]
-.
+\fBbundle binstubs\fR \fIGEM_NAME\fR [\-\-force] [\-\-path PATH] [\-\-standalone] [\-\-all\-platforms]
 .SH "DESCRIPTION"
 Binstubs are scripts that wrap around executables\. Bundler creates a small Ruby file (a binstub) that loads Bundler, runs the command, and puts it into \fBbin/\fR\. Binstubs are a shortcut\-or alternative\- to always using \fBbundle exec\fR\. This gives you a file that can be run directly, and one that will always run the correct gem version used by the application\.
-.
 .P
 For example, if you run \fBbundle binstubs rspec\-core\fR, Bundler will create the file \fBbin/rspec\fR\. That file will contain enough code to load Bundler, tell it to load the bundled gems, and then run rspec\.
-.
 .P
 This command generates binstubs for executables in \fBGEM_NAME\fR\. Binstubs are put into \fBbin\fR, or the \fB\-\-path\fR directory if one has been set\. Calling binstubs with [GEM [GEM]] will create binstubs for all given gems\.
-.
 .SH "OPTIONS"
-.
 .TP
 \fB\-\-force\fR
 Overwrite existing binstubs if they exist\.
-.
 .TP
-\fB\-\-path\fR
+\fB\-\-path[=PATH]\fR
 The location to install the specified binstubs to\. This defaults to \fBbin\fR\.
-.
 .TP
 \fB\-\-standalone\fR
 Makes binstubs that can work without depending on Rubygems or Bundler at runtime\.
-.
 .TP
-\fB\-\-shebang\fR
-Specify a different shebang executable name than the default (default \'ruby\')
-.
+\fB\-\-shebang=SHEBANG\fR
+Specify a different shebang executable name than the default (default 'ruby')
 .TP
 \fB\-\-all\fR
 Create binstubs for all gems in the bundle\.
+.TP
+\fB\-\-all\-platforms\fR
+Install binstubs for all platforms\.
 
diff --git a/lib/bundler/man/bundle-binstubs.1.ronn b/lib/bundler/man/bundle-binstubs.1.ronn
index a96186929fe56e..ec2cfd80db9053 100644
--- a/lib/bundler/man/bundle-binstubs.1.ronn
+++ b/lib/bundler/man/bundle-binstubs.1.ronn
@@ -3,7 +3,7 @@ bundle-binstubs(1) -- Install the binstubs of the listed gems
 
 ## SYNOPSIS
 
-`bundle binstubs` <GEM_NAME> [--force] [--path PATH] [--standalone]
+`bundle binstubs` <GEM_NAME> [--force] [--path PATH] [--standalone] [--all-platforms]
 
 ## DESCRIPTION
 
@@ -27,15 +27,18 @@ Calling binstubs with [GEM [GEM]] will create binstubs for all given gems.
 * `--force`:
   Overwrite existing binstubs if they exist.
 
-* `--path`:
+* `--path[=PATH]`:
   The location to install the specified binstubs to. This defaults to `bin`.
 
 * `--standalone`:
   Makes binstubs that can work without depending on Rubygems or Bundler at
   runtime.
 
-* `--shebang`:
+* `--shebang=SHEBANG`:
   Specify a different shebang executable name than the default (default 'ruby')
 
 * `--all`:
   Create binstubs for all gems in the bundle.
+
+* `--all-platforms`:
+  Install binstubs for all platforms.
diff --git a/lib/bundler/man/bundle-cache.1 b/lib/bundler/man/bundle-cache.1
index 69b1e1e3dd5b08..4c5dcff052bc42 100644
--- a/lib/bundler/man/bundle-cache.1
+++ b/lib/bundler/man/bundle-cache.1
@@ -1,61 +1,68 @@
-.\" generated with Ronn/v0.7.3
-.\" http://github.com/rtomayko/ronn/tree/0.7.3
-.
-.TH "BUNDLE\-CACHE" "1" "August 2023" "" ""
-.
+.\" generated with Ronn-NG/v0.10.1
+.\" http://github.com/apjanke/ronn-ng/tree/0.10.1
+.TH "BUNDLE\-CACHE" "1" "July 2025" ""
 .SH "NAME"
 \fBbundle\-cache\fR \- Package your needed \fB\.gem\fR files into your application
-.
 .SH "SYNOPSIS"
-\fBbundle cache\fR
-.
+\fBbundle cache\fR [\fIOPTIONS\fR]
 .P
 alias: \fBpackage\fR, \fBpack\fR
-.
 .SH "DESCRIPTION"
 Copy all of the \fB\.gem\fR files needed to run the application into the \fBvendor/cache\fR directory\. In the future, when running \fBbundle install(1)\fR \fIbundle\-install\.1\.html\fR, use the gems in the cache in preference to the ones on \fBrubygems\.org\fR\.
-.
+.SH "OPTIONS"
+.TP
+\fB\-\-all\fR
+Include all sources (including path and git)\.
+.TP
+\fB\-\-all\-platforms\fR
+Include gems for all platforms present in the lockfile, not only the current one\.
+.TP
+\fB\-\-cache\-path=CACHE\-PATH\fR
+Specify a different cache path than the default (vendor/cache)\.
+.TP
+\fB\-\-gemfile=GEMFILE\fR
+Use the specified gemfile instead of Gemfile\.
+.TP
+\fB\-\-no\-install\fR
+Don't install the gems, only update the cache\.
+.TP
+\fB\-\-no\-prune\fR
+Don't remove stale gems from the cache\.
+.TP
+\fB\-\-path=PATH\fR
+Specify a different path than the system default ($BUNDLE_PATH or $GEM_HOME)\.
+.TP
+\fB\-\-quiet\fR
+Only output warnings and errors\.
+.TP
+\fB\-\-frozen\fR
+Do not allow the Gemfile\.lock to be updated after this bundle cache operation's install\.
 .SH "GIT AND PATH GEMS"
 The \fBbundle cache\fR command can also package \fB:git\fR and \fB:path\fR dependencies besides \.gem files\. This needs to be explicitly enabled via the \fB\-\-all\fR option\. Once used, the \fB\-\-all\fR option will be remembered\.
-.
 .SH "SUPPORT FOR MULTIPLE PLATFORMS"
 When using gems that have different packages for different platforms, Bundler supports caching of gems for other platforms where the Gemfile has been resolved (i\.e\. present in the lockfile) in \fBvendor/cache\fR\. This needs to be enabled via the \fB\-\-all\-platforms\fR option\. This setting will be remembered in your local bundler configuration\.
-.
 .SH "REMOTE FETCHING"
 By default, if you run \fBbundle install(1)\fR \fIbundle\-install\.1\.html\fR after running bundle cache(1) \fIbundle\-cache\.1\.html\fR, bundler will still connect to \fBrubygems\.org\fR to check whether a platform\-specific gem exists for any of the gems in \fBvendor/cache\fR\.
-.
 .P
 For instance, consider this Gemfile(5):
-.
 .IP "" 4
-.
 .nf
-
 source "https://rubygems\.org"
 
 gem "nokogiri"
-.
 .fi
-.
 .IP "" 0
-.
 .P
 If you run \fBbundle cache\fR under C Ruby, bundler will retrieve the version of \fBnokogiri\fR for the \fB"ruby"\fR platform\. If you deploy to JRuby and run \fBbundle install\fR, bundler is forced to check to see whether a \fB"java"\fR platformed \fBnokogiri\fR exists\.
-.
 .P
 Even though the \fBnokogiri\fR gem for the Ruby platform is \fItechnically\fR acceptable on JRuby, it has a C extension that does not run on JRuby\. As a result, bundler will, by default, still connect to \fBrubygems\.org\fR to check whether it has a version of one of your gems more specific to your platform\.
-.
 .P
 This problem is also not limited to the \fB"java"\fR platform\. A similar (common) problem can happen when developing on Windows and deploying to Linux, or even when developing on OSX and deploying to Linux\.
-.
 .P
 If you know for sure that the gems packaged in \fBvendor/cache\fR are appropriate for the platform you are on, you can run \fBbundle install \-\-local\fR to skip checking for more appropriate gems, and use the ones in \fBvendor/cache\fR\.
-.
 .P
 One way to be sure that you have the right platformed versions of all your gems is to run \fBbundle cache\fR on an identical machine and check in the gems\. For instance, you can run \fBbundle cache\fR on an identical staging box during your staging process, and check in the \fBvendor/cache\fR before deploying to production\.
-.
 .P
 By default, bundle cache(1) \fIbundle\-cache\.1\.html\fR fetches and also installs the gems to the default location\. To package the dependencies to \fBvendor/cache\fR without installing them to the local install location, you can run \fBbundle cache \-\-no\-install\fR\.
-.
 .SH "HISTORY"
 In Bundler 2\.1, \fBcache\fR took in the functionalities of \fBpackage\fR and now \fBpackage\fR and \fBpack\fR are aliases of \fBcache\fR\.
diff --git a/lib/bundler/man/bundle-cache.1.ronn b/lib/bundler/man/bundle-cache.1.ronn
index 8112c2c5511a58..ffcc07c7b122a7 100644
--- a/lib/bundler/man/bundle-cache.1.ronn
+++ b/lib/bundler/man/bundle-cache.1.ronn
@@ -1,9 +1,9 @@
 bundle-cache(1) -- Package your needed `.gem` files into your application
-===========================================================================
+=========================================================================
 
 ## SYNOPSIS
 
-`bundle cache`
+`bundle cache` [*OPTIONS*]
 
 alias: `package`, `pack`
 
@@ -13,6 +13,35 @@ Copy all of the `.gem` files needed to run the application into the
 `vendor/cache` directory. In the future, when running [`bundle install(1)`](bundle-install.1.html),
 use the gems in the cache in preference to the ones on `rubygems.org`.
 
+## OPTIONS
+
+* `--all`:
+  Include all sources (including path and git).
+
+* `--all-platforms`:
+  Include gems for all platforms present in the lockfile, not only the current one.
+
+* `--cache-path=CACHE-PATH`:
+  Specify a different cache path than the default (vendor/cache).
+
+* `--gemfile=GEMFILE`:
+  Use the specified gemfile instead of Gemfile.
+
+* `--no-install`:
+  Don't install the gems, only update the cache.
+
+* `--no-prune`:
+  Don't remove stale gems from the cache.
+
+* `--path=PATH`:
+  Specify a different path than the system default ($BUNDLE_PATH or $GEM_HOME).
+
+* `--quiet`:
+  Only output warnings and errors.
+
+* `--frozen`:
+  Do not allow the Gemfile.lock to be updated after this bundle cache operation's install.
+
 ## GIT AND PATH GEMS
 
 The `bundle cache` command can also package `:git` and `:path` dependencies
diff --git a/lib/bundler/man/bundle-check.1 b/lib/bundler/man/bundle-check.1
index 748a37e7d19c21..376becdbe47d5b 100644
--- a/lib/bundler/man/bundle-check.1
+++ b/lib/bundler/man/bundle-check.1
@@ -1,31 +1,24 @@
-.\" generated with Ronn/v0.7.3
-.\" http://github.com/rtomayko/ronn/tree/0.7.3
-.
-.TH "BUNDLE\-CHECK" "1" "August 2023" "" ""
-.
+.\" generated with Ronn-NG/v0.10.1
+.\" http://github.com/apjanke/ronn-ng/tree/0.10.1
+.TH "BUNDLE\-CHECK" "1" "July 2025" ""
 .SH "NAME"
 \fBbundle\-check\fR \- Verifies if dependencies are satisfied by installed gems
-.
 .SH "SYNOPSIS"
 \fBbundle check\fR [\-\-dry\-run] [\-\-gemfile=FILE] [\-\-path=PATH]
-.
 .SH "DESCRIPTION"
 \fBcheck\fR searches the local machine for each of the gems requested in the Gemfile\. If all gems are found, Bundler prints a success message and exits with a status of 0\.
-.
 .P
 If not, the first missing gem is listed and Bundler exits status 1\.
-.
+.P
+If the lockfile needs to be updated then it will be resolved using the gems installed on the local machine, if they satisfy the requirements\.
 .SH "OPTIONS"
-.
 .TP
 \fB\-\-dry\-run\fR
 Locks the [\fBGemfile(5)\fR][Gemfile(5)] before running the command\.
-.
 .TP
-\fB\-\-gemfile\fR
+\fB\-\-gemfile=GEMFILE\fR
 Use the specified gemfile instead of the [\fBGemfile(5)\fR][Gemfile(5)]\.
-.
 .TP
-\fB\-\-path\fR
+\fB\-\-path=PATH\fR
 Specify a different path than the system default (\fB$BUNDLE_PATH\fR or \fB$GEM_HOME\fR)\. Bundler will remember this value for future installs on this machine\.
 
diff --git a/lib/bundler/man/bundle-check.1.ronn b/lib/bundler/man/bundle-check.1.ronn
index f2846b8ff2a066..23bb6f3eb88cd7 100644
--- a/lib/bundler/man/bundle-check.1.ronn
+++ b/lib/bundler/man/bundle-check.1.ronn
@@ -15,12 +15,17 @@ a status of 0.
 
 If not, the first missing gem is listed and Bundler exits status 1.
 
+If the lockfile needs to be updated then it will be resolved using the gems
+installed on the local machine, if they satisfy the requirements.
+
 ## OPTIONS
 
 * `--dry-run`:
   Locks the [`Gemfile(5)`][Gemfile(5)] before running the command.
-* `--gemfile`:
+
+* `--gemfile=GEMFILE`:
   Use the specified gemfile instead of the [`Gemfile(5)`][Gemfile(5)].
-* `--path`:
+
+* `--path=PATH`:
   Specify a different path than the system default (`$BUNDLE_PATH` or `$GEM_HOME`).
   Bundler will remember this value for future installs on this machine.
diff --git a/lib/bundler/man/bundle-clean.1 b/lib/bundler/man/bundle-clean.1
index af8f13cd8996c6..85e6186f49cf2e 100644
--- a/lib/bundler/man/bundle-clean.1
+++ b/lib/bundler/man/bundle-clean.1
@@ -1,23 +1,16 @@
-.\" generated with Ronn/v0.7.3
-.\" http://github.com/rtomayko/ronn/tree/0.7.3
-.
-.TH "BUNDLE\-CLEAN" "1" "August 2023" "" ""
-.
+.\" generated with Ronn-NG/v0.10.1
+.\" http://github.com/apjanke/ronn-ng/tree/0.10.1
+.TH "BUNDLE\-CLEAN" "1" "July 2025" ""
 .SH "NAME"
 \fBbundle\-clean\fR \- Cleans up unused gems in your bundler directory
-.
 .SH "SYNOPSIS"
 \fBbundle clean\fR [\-\-dry\-run] [\-\-force]
-.
 .SH "DESCRIPTION"
 This command will remove all unused gems in your bundler directory\. This is useful when you have made many changes to your gem dependencies\.
-.
 .SH "OPTIONS"
-.
 .TP
 \fB\-\-dry\-run\fR
 Print the changes, but do not clean the unused gems\.
-.
 .TP
 \fB\-\-force\fR
 Forces cleaning up unused gems even if Bundler is configured to use globally installed gems\. As a consequence, removes all system gems except for the ones in the current application\.
diff --git a/lib/bundler/man/bundle-config.1 b/lib/bundler/man/bundle-config.1
index 241f9ab0248ebe..6f12696ab6961f 100644
--- a/lib/bundler/man/bundle-config.1
+++ b/lib/bundler/man/bundle-config.1
@@ -1,515 +1,363 @@
-.\" generated with Ronn/v0.7.3
-.\" http://github.com/rtomayko/ronn/tree/0.7.3
-.
-.TH "BUNDLE\-CONFIG" "1" "August 2023" "" ""
-.
+.\" generated with Ronn-NG/v0.10.1
+.\" http://github.com/apjanke/ronn-ng/tree/0.10.1
+.TH "BUNDLE\-CONFIG" "1" "July 2025" ""
 .SH "NAME"
 \fBbundle\-config\fR \- Set bundler configuration options
-.
 .SH "SYNOPSIS"
 \fBbundle config\fR list
-.
 .br
 \fBbundle config\fR [get] NAME
-.
 .br
 \fBbundle config\fR [set] NAME VALUE
-.
 .br
 \fBbundle config\fR unset NAME
-.
 .SH "DESCRIPTION"
-This command allows you to interact with Bundler\'s configuration system\.
-.
+This command allows you to interact with Bundler's configuration system\.
 .P
 Bundler loads configuration settings in this order:
-.
 .IP "1." 4
 Local config (\fB<project_root>/\.bundle/config\fR or \fB$BUNDLE_APP_CONFIG/config\fR)
-.
 .IP "2." 4
 Environmental variables (\fBENV\fR)
-.
 .IP "3." 4
 Global config (\fB~/\.bundle/config\fR)
-.
 .IP "4." 4
 Bundler default config
-.
 .IP "" 0
-.
 .P
 Executing \fBbundle config list\fR will print a list of all bundler configuration for the current bundle, and where that configuration was set\.
-.
 .P
 Executing \fBbundle config get <name>\fR will print the value of that configuration setting, and where it was set\.
-.
 .P
 Executing \fBbundle config set <name> <value>\fR defaults to setting \fBlocal\fR configuration if executing from within a local application, otherwise it will set \fBglobal\fR configuration\. See \fB\-\-local\fR and \fB\-\-global\fR options below\.
-.
 .P
 Executing \fBbundle config set \-\-local <name> <value>\fR will set that configuration in the directory for the local application\. The configuration will be stored in \fB<project_root>/\.bundle/config\fR\. If \fBBUNDLE_APP_CONFIG\fR is set, the configuration will be stored in \fB$BUNDLE_APP_CONFIG/config\fR\.
-.
 .P
 Executing \fBbundle config set \-\-global <name> <value>\fR will set that configuration to the value specified for all bundles executed as the current user\. The configuration will be stored in \fB~/\.bundle/config\fR\. If \fIname\fR already is set, \fIname\fR will be overridden and user will be warned\.
-.
 .P
 Executing \fBbundle config unset <name>\fR will delete the configuration in both local and global sources\.
-.
 .P
 Executing \fBbundle config unset \-\-global <name>\fR will delete the configuration only from the user configuration\.
-.
 .P
 Executing \fBbundle config unset \-\-local <name>\fR will delete the configuration only from the local application\.
-.
 .P
 Executing bundle with the \fBBUNDLE_IGNORE_CONFIG\fR environment variable set will cause it to ignore all configuration\.
-.
-.SH "REMEMBERING OPTIONS"
-Flags passed to \fBbundle install\fR or the Bundler runtime, such as \fB\-\-path foo\fR or \fB\-\-without production\fR, are remembered between commands and saved to your local application\'s configuration (normally, \fB\./\.bundle/config\fR)\.
-.
+.SH "CONFIGURATION KEYS"
+Configuration keys in bundler have two forms: the canonical form and the environment variable form\.
 .P
-However, this will be changed in bundler 3, so it\'s better not to rely on this behavior\. If these options must be remembered, it\'s better to set them using \fBbundle config\fR (e\.g\., \fBbundle config set \-\-local path foo\fR)\.
-.
+For instance, passing the \fB\-\-without\fR flag to bundle install(1) \fIbundle\-install\.1\.html\fR prevents Bundler from installing certain groups specified in the Gemfile(5)\. Bundler persists this value in \fBapp/\.bundle/config\fR so that calls to \fBBundler\.setup\fR do not try to find gems from the \fBGemfile\fR that you didn't install\. Additionally, subsequent calls to bundle install(1) \fIbundle\-install\.1\.html\fR remember this setting and skip those groups\.
+.P
+The canonical form of this configuration is \fB"without"\fR\. To convert the canonical form to the environment variable form, capitalize it, and prepend \fBBUNDLE_\fR\. The environment variable form of \fB"without"\fR is \fBBUNDLE_WITHOUT\fR\.
 .P
-The options that can be configured are:
-.
+Any periods in the configuration keys must be replaced with two underscores when setting it via environment variables\. The configuration key \fBlocal\.rack\fR becomes the environment variable \fBBUNDLE_LOCAL__RACK\fR\.
+.SH "LIST OF AVAILABLE KEYS"
+The following is a list of all configuration keys and their purpose\. You can learn more about their operation in bundle install(1) \fIbundle\-install\.1\.html\fR\.
+.TP
+\fBallow_offline_install\fR (\fBBUNDLE_ALLOW_OFFLINE_INSTALL\fR)
+Allow Bundler to use cached data when installing without network access\.
+.TP
+\fBauto_install\fR (\fBBUNDLE_AUTO_INSTALL\fR)
+Automatically run \fBbundle install\fR when gems are missing\.
+.TP
+\fBbin\fR (\fBBUNDLE_BIN\fR)
+Install executables from gems in the bundle to the specified directory\. Defaults to \fBfalse\fR\.
+.TP
+\fBcache_all\fR (\fBBUNDLE_CACHE_ALL\fR)
+Cache all gems, including path and git gems\. This needs to be explicitly before bundler 4, but will be the default on bundler 4\.
+.TP
+\fBcache_all_platforms\fR (\fBBUNDLE_CACHE_ALL_PLATFORMS\fR)
+Cache gems for all platforms\.
+.TP
+\fBcache_path\fR (\fBBUNDLE_CACHE_PATH\fR)
+The directory that bundler will place cached gems in when running \fBbundle package\fR, and that bundler will look in when installing gems\. Defaults to \fBvendor/cache\fR\.
+.TP
+\fBclean\fR (\fBBUNDLE_CLEAN\fR)
+Whether Bundler should run \fBbundle clean\fR automatically after \fBbundle install\fR\. Defaults to \fBtrue\fR in Bundler 4, as long as \fBpath\fR is not explicitly configured\.
+.TP
+\fBconsole\fR (\fBBUNDLE_CONSOLE\fR)
+The console that \fBbundle console\fR starts\. Defaults to \fBirb\fR\.
+.TP
+\fBdefault_cli_command\fR (\fBBUNDLE_DEFAULT_CLI_COMMAND\fR)
+The command that running \fBbundle\fR without arguments should run\. Defaults to \fBcli_help\fR since Bundler 4, but can also be \fBinstall\fR which was the previous default\.
+.TP
+\fBdeployment\fR (\fBBUNDLE_DEPLOYMENT\fR)
+Equivalent to setting \fBfrozen\fR to \fBtrue\fR and \fBpath\fR to \fBvendor/bundle\fR\.
 .TP
-\fBbin\fR
-Creates a directory (defaults to \fB~/bin\fR) and place any executables from the gem there\. These executables run in Bundler\'s context\. If used, you might add this directory to your environment\'s \fBPATH\fR variable\. For instance, if the \fBrails\fR gem comes with a \fBrails\fR executable, this flag will create a \fBbin/rails\fR executable that ensures that all referred dependencies will be resolved using the bundled gems\.
-.
+\fBdisable_checksum_validation\fR (\fBBUNDLE_DISABLE_CHECKSUM_VALIDATION\fR)
+Allow installing gems even if they do not match the checksum provided by RubyGems\.
 .TP
-\fBdeployment\fR
-In deployment mode, Bundler will \'roll\-out\' the bundle for \fBproduction\fR use\. Please check carefully if you want to have this option enabled in \fBdevelopment\fR or \fBtest\fR environments\.
-.
+\fBdisable_exec_load\fR (\fBBUNDLE_DISABLE_EXEC_LOAD\fR)
+Stop Bundler from using \fBload\fR to launch an executable in\-process in \fBbundle exec\fR\.
 .TP
-\fBonly\fR
+\fBdisable_local_branch_check\fR (\fBBUNDLE_DISABLE_LOCAL_BRANCH_CHECK\fR)
+Allow Bundler to use a local git override without a branch specified in the Gemfile\.
+.TP
+\fBdisable_local_revision_check\fR (\fBBUNDLE_DISABLE_LOCAL_REVISION_CHECK\fR)
+Allow Bundler to use a local git override without checking if the revision present in the lockfile is present in the repository\.
+.TP
+\fBdisable_shared_gems\fR (\fBBUNDLE_DISABLE_SHARED_GEMS\fR)
+Stop Bundler from accessing gems installed to RubyGems' normal location\.
+.TP
+\fBdisable_version_check\fR (\fBBUNDLE_DISABLE_VERSION_CHECK\fR)
+Stop Bundler from checking if a newer Bundler version is available on rubygems\.org\.
+.TP
+\fBforce_ruby_platform\fR (\fBBUNDLE_FORCE_RUBY_PLATFORM\fR)
+Ignore the current machine's platform and install only \fBruby\fR platform gems\. As a result, gems with native extensions will be compiled from source\.
+.TP
+\fBfrozen\fR (\fBBUNDLE_FROZEN\fR)
+Disallow any automatic changes to \fBGemfile\.lock\fR\. Bundler commands will be blocked unless the lockfile can be installed exactly as written\. Usually this will happen when changing the \fBGemfile\fR manually and forgetting to update the lockfile through \fBbundle lock\fR or \fBbundle install\fR\.
+.TP
+\fBgem\.github_username\fR (\fBBUNDLE_GEM__GITHUB_USERNAME\fR)
+Sets a GitHub username or organization to be used in the \fBREADME\fR and \fB\.gemspec\fR files when you create a new gem via \fBbundle gem\fR command\. It can be overridden by passing an explicit \fB\-\-github\-username\fR flag to \fBbundle gem\fR\.
+.TP
+\fBgem\.push_key\fR (\fBBUNDLE_GEM__PUSH_KEY\fR)
+Sets the \fB\-\-key\fR parameter for \fBgem push\fR when using the \fBrake release\fR command with a private gemstash server\.
+.TP
+\fBgemfile\fR (\fBBUNDLE_GEMFILE\fR)
+The name of the file that bundler should use as the \fBGemfile\fR\. This location of this file also sets the root of the project, which is used to resolve relative paths in the \fBGemfile\fR, among other things\. By default, bundler will search up from the current working directory until it finds a \fBGemfile\fR\.
+.TP
+\fBglobal_gem_cache\fR (\fBBUNDLE_GLOBAL_GEM_CACHE\fR)
+Whether Bundler should cache all gems and compiled extensions globally, rather than locally to the configured installation path\.
+.TP
+\fBignore_funding_requests\fR (\fBBUNDLE_IGNORE_FUNDING_REQUESTS\fR)
+When set, no funding requests will be printed\.
+.TP
+\fBignore_messages\fR (\fBBUNDLE_IGNORE_MESSAGES\fR)
+When set, no post install messages will be printed\. To silence a single gem, use dot notation like \fBignore_messages\.httparty true\fR\.
+.TP
+\fBinit_gems_rb\fR (\fBBUNDLE_INIT_GEMS_RB\fR)
+Generate a \fBgems\.rb\fR instead of a \fBGemfile\fR when running \fBbundle init\fR\.
+.TP
+\fBjobs\fR (\fBBUNDLE_JOBS\fR)
+The number of gems Bundler can install in parallel\. Defaults to the number of available processors\.
+.TP
+\fBlockfile_checksums\fR (\fBBUNDLE_LOCKFILE_CHECKSUMS\fR)
+Whether Bundler should include a checksums section in new lockfiles, to protect from compromised gem sources\.
+.TP
+\fBno_install\fR (\fBBUNDLE_NO_INSTALL\fR)
+Whether \fBbundle package\fR should skip installing gems\.
+.TP
+\fBno_prune\fR (\fBBUNDLE_NO_PRUNE\fR)
+Whether Bundler should leave outdated gems unpruned when caching\.
+.TP
+\fBonly\fR (\fBBUNDLE_ONLY\fR)
 A space\-separated list of groups to install only gems of the specified groups\.
-.
 .TP
-\fBpath\fR
-The location to install the specified gems to\. This defaults to Rubygems\' setting\. Bundler shares this location with Rubygems, \fBgem install \.\.\.\fR will have gem installed there, too\. Therefore, gems installed without a \fB\-\-path \.\.\.\fR setting will show up by calling \fBgem list\fR\. Accordingly, gems installed to other locations will not get listed\.
-.
+\fBpath\fR (\fBBUNDLE_PATH\fR)
+The location on disk where all gems in your bundle will be located regardless of \fB$GEM_HOME\fR or \fB$GEM_PATH\fR values\. Bundle gems not found in this location will be installed by \fBbundle install\fR\. Defaults to \fB\.bundle\fR relative to repository root in Bundler 4, and to the default system path (\fBGem\.dir\fR) before Bundler 4\.
+.TP
+\fBpath\.system\fR (\fBBUNDLE_PATH__SYSTEM\fR)
+Whether Bundler will install gems into the default system path (\fBGem\.dir\fR)\.
 .TP
-\fBwithout\fR
-A space\-separated list of groups referencing gems to skip during installation\.
-.
+\fBplugins\fR (\fBBUNDLE_PLUGINS\fR)
+Enable Bundler's experimental plugin system\.
 .TP
-\fBwith\fR
-A space\-separated list of \fBoptional\fR groups referencing gems to include during installation\.
-.
+\fBprefer_patch\fR (BUNDLE_PREFER_PATCH)
+Prefer updating only to next patch version during updates\. Makes \fBbundle update\fR calls equivalent to \fBbundler update \-\-patch\fR\.
+.TP
+\fBredirect\fR (\fBBUNDLE_REDIRECT\fR)
+The number of redirects allowed for network requests\. Defaults to \fB5\fR\.
+.TP
+\fBretry\fR (\fBBUNDLE_RETRY\fR)
+The number of times to retry failed network requests\. Defaults to \fB3\fR\.
+.TP
+\fBshebang\fR (\fBBUNDLE_SHEBANG\fR)
+The program name that should be invoked for generated binstubs\. Defaults to the ruby install name used to generate the binstub\.
+.TP
+\fBsilence_deprecations\fR (\fBBUNDLE_SILENCE_DEPRECATIONS\fR)
+Whether Bundler should silence deprecation warnings for behavior that will be changed in the next major version\.
+.TP
+\fBsilence_root_warning\fR (\fBBUNDLE_SILENCE_ROOT_WARNING\fR)
+Silence the warning Bundler prints when installing gems as root\.
+.TP
+\fBsimulate_version\fR (\fBBUNDLE_SIMULATE_VERSION\fR)
+The virtual version Bundler should use for activating feature flags\. Can be used to simulate all the new functionality that will be enabled in a future major version\.
+.TP
+\fBssl_ca_cert\fR (\fBBUNDLE_SSL_CA_CERT\fR)
+Path to a designated CA certificate file or folder containing multiple certificates for trusted CAs in PEM format\.
+.TP
+\fBssl_client_cert\fR (\fBBUNDLE_SSL_CLIENT_CERT\fR)
+Path to a designated file containing a X\.509 client certificate and key in PEM format\.
+.TP
+\fBssl_verify_mode\fR (\fBBUNDLE_SSL_VERIFY_MODE\fR)
+The SSL verification mode Bundler uses when making HTTPS requests\. Defaults to verify peer\.
+.TP
+\fBsystem_bindir\fR (\fBBUNDLE_SYSTEM_BINDIR\fR)
+The location where RubyGems installs binstubs\. Defaults to \fBGem\.bindir\fR\.
+.TP
+\fBtimeout\fR (\fBBUNDLE_TIMEOUT\fR)
+The seconds allowed before timing out for network requests\. Defaults to \fB10\fR\.
+.TP
+\fBupdate_requires_all_flag\fR (\fBBUNDLE_UPDATE_REQUIRES_ALL_FLAG\fR)
+Require passing \fB\-\-all\fR to \fBbundle update\fR when everything should be updated, and disallow passing no options to \fBbundle update\fR\.
+.TP
+\fBuser_agent\fR (\fBBUNDLE_USER_AGENT\fR)
+The custom user agent fragment Bundler includes in API requests\.
+.TP
+\fBverbose\fR (\fBBUNDLE_VERBOSE\fR)
+Whether Bundler should print verbose output\. Defaults to \fBfalse\fR, unless the \fB\-\-verbose\fR CLI flag is used\.
+.TP
+\fBversion\fR (\fBBUNDLE_VERSION\fR)
+The version of Bundler to use when running under Bundler environment\. Defaults to \fBlockfile\fR\. You can also specify \fBsystem\fR or \fBx\.y\.z\fR\. \fBlockfile\fR will use the Bundler version specified in the \fBGemfile\.lock\fR, \fBsystem\fR will use the system version of Bundler, and \fBx\.y\.z\fR will use the specified version of Bundler\.
+.TP
+\fBwith\fR (\fBBUNDLE_WITH\fR)
+A space\-separated or \fB:\fR\-separated list of groups whose gems bundler should install\.
+.TP
+\fBwithout\fR (\fBBUNDLE_WITHOUT\fR)
+A space\-separated or \fB:\fR\-separated list of groups whose gems bundler should not install\.
+.SH "REMEMBERING OPTIONS"
+Flags passed to \fBbundle install\fR or the Bundler runtime, such as \fB\-\-path foo\fR or \fB\-\-without production\fR, are remembered between commands and saved to your local application's configuration (normally, \fB\./\.bundle/config\fR)\.
+.P
+However, this will be changed in bundler 4, so it's better not to rely on this behavior\. If these options must be remembered, it's better to set them using \fBbundle config\fR (e\.g\., \fBbundle config set \-\-local path foo\fR)\.
+.P
+The flags that can be configured are:
+.TP
+\fB\-\-bin\fR
+Creates a directory (defaults to \fB~/bin\fR) and place any executables from the gem there\. These executables run in Bundler's context\. If used, you might add this directory to your environment's \fBPATH\fR variable\. For instance, if the \fBrails\fR gem comes with a \fBrails\fR executable, this flag will create a \fBbin/rails\fR executable that ensures that all referred dependencies will be resolved using the bundled gems\.
+.TP
+\fB\-\-deployment\fR
+In deployment mode, Bundler will 'roll\-out' the bundle for \fBproduction\fR use\. Please check carefully if you want to have this option enabled in \fBdevelopment\fR or \fBtest\fR environments\.
+.TP
+\fB\-\-only\fR
+A space\-separated list of groups to install only gems of the specified groups\. Please check carefully if you want to install also gems without a group, cause they get put inside \fBdefault\fR group\. For example \fBonly test:default\fR will install all gems specified in test group and without one\.
+.TP
+\fB\-\-path\fR
+The location to install the specified gems to\. This defaults to Rubygems' setting\. Bundler shares this location with Rubygems, \fBgem install \|\.\|\.\|\.\fR will have gem installed there, too\. Therefore, gems installed without a \fB\-\-path \|\.\|\.\|\.\fR setting will show up by calling \fBgem list\fR\. Accordingly, gems installed to other locations will not get listed\.
+.TP
+\fB\-\-without\fR
+A space\-separated or \fB:\fR\-separated list of groups referencing gems to skip during installation\.
+.TP
+\fB\-\-with\fR
+A space\-separated or \fB:\fR\-separated list of \fBoptional\fR groups referencing gems to include during installation\.
 .SH "BUILD OPTIONS"
 You can use \fBbundle config\fR to give Bundler the flags to pass to the gem installer every time bundler tries to install a particular gem\.
-.
 .P
 A very common example, the \fBmysql\fR gem, requires Snow Leopard users to pass configuration flags to \fBgem install\fR to specify where to find the \fBmysql_config\fR executable\.
-.
 .IP "" 4
-.
 .nf
-
 gem install mysql \-\- \-\-with\-mysql\-config=/usr/local/mysql/bin/mysql_config
-.
 .fi
-.
 .IP "" 0
-.
 .P
 Since the specific location of that executable can change from machine to machine, you can specify these flags on a per\-machine basis\.
-.
 .IP "" 4
-.
 .nf
-
 bundle config set \-\-global build\.mysql \-\-with\-mysql\-config=/usr/local/mysql/bin/mysql_config
-.
 .fi
-.
 .IP "" 0
-.
 .P
 After running this command, every time bundler needs to install the \fBmysql\fR gem, it will pass along the flags you specified\.
-.
-.SH "CONFIGURATION KEYS"
-Configuration keys in bundler have two forms: the canonical form and the environment variable form\.
-.
-.P
-For instance, passing the \fB\-\-without\fR flag to bundle install(1) \fIbundle\-install\.1\.html\fR prevents Bundler from installing certain groups specified in the Gemfile(5)\. Bundler persists this value in \fBapp/\.bundle/config\fR so that calls to \fBBundler\.setup\fR do not try to find gems from the \fBGemfile\fR that you didn\'t install\. Additionally, subsequent calls to bundle install(1) \fIbundle\-install\.1\.html\fR remember this setting and skip those groups\.
-.
-.P
-The canonical form of this configuration is \fB"without"\fR\. To convert the canonical form to the environment variable form, capitalize it, and prepend \fBBUNDLE_\fR\. The environment variable form of \fB"without"\fR is \fBBUNDLE_WITHOUT\fR\.
-.
-.P
-Any periods in the configuration keys must be replaced with two underscores when setting it via environment variables\. The configuration key \fBlocal\.rack\fR becomes the environment variable \fBBUNDLE_LOCAL__RACK\fR\.
-.
-.SH "LIST OF AVAILABLE KEYS"
-The following is a list of all configuration keys and their purpose\. You can learn more about their operation in bundle install(1) \fIbundle\-install\.1\.html\fR\.
-.
-.IP "\(bu" 4
-\fBallow_deployment_source_credential_changes\fR (\fBBUNDLE_ALLOW_DEPLOYMENT_SOURCE_CREDENTIAL_CHANGES\fR): When in deployment mode, allow changing the credentials to a gem\'s source\. Ex: \fBhttps://some\.host\.com/gems/path/\fR \-> \fBhttps://user_name:password@some\.host\.com/gems/path\fR
-.
-.IP "\(bu" 4
-\fBallow_offline_install\fR (\fBBUNDLE_ALLOW_OFFLINE_INSTALL\fR): Allow Bundler to use cached data when installing without network access\.
-.
-.IP "\(bu" 4
-\fBauto_clean_without_path\fR (\fBBUNDLE_AUTO_CLEAN_WITHOUT_PATH\fR): Automatically run \fBbundle clean\fR after installing when an explicit \fBpath\fR has not been set and Bundler is not installing into the system gems\.
-.
-.IP "\(bu" 4
-\fBauto_install\fR (\fBBUNDLE_AUTO_INSTALL\fR): Automatically run \fBbundle install\fR when gems are missing\.
-.
-.IP "\(bu" 4
-\fBbin\fR (\fBBUNDLE_BIN\fR): Install executables from gems in the bundle to the specified directory\. Defaults to \fBfalse\fR\.
-.
-.IP "\(bu" 4
-\fBcache_all\fR (\fBBUNDLE_CACHE_ALL\fR): Cache all gems, including path and git gems\. This needs to be explicitly configured on bundler 1 and bundler 2, but will be the default on bundler 3\.
-.
-.IP "\(bu" 4
-\fBcache_all_platforms\fR (\fBBUNDLE_CACHE_ALL_PLATFORMS\fR): Cache gems for all platforms\.
-.
-.IP "\(bu" 4
-\fBcache_path\fR (\fBBUNDLE_CACHE_PATH\fR): The directory that bundler will place cached gems in when running \fBbundle package\fR, and that bundler will look in when installing gems\. Defaults to \fBvendor/cache\fR\.
-.
-.IP "\(bu" 4
-\fBclean\fR (\fBBUNDLE_CLEAN\fR): Whether Bundler should run \fBbundle clean\fR automatically after \fBbundle install\fR\.
-.
-.IP "\(bu" 4
-\fBconsole\fR (\fBBUNDLE_CONSOLE\fR): The console that \fBbundle console\fR starts\. Defaults to \fBirb\fR\.
-.
-.IP "\(bu" 4
-\fBdefault_install_uses_path\fR (\fBBUNDLE_DEFAULT_INSTALL_USES_PATH\fR): Whether a \fBbundle install\fR without an explicit \fB\-\-path\fR argument defaults to installing gems in \fB\.bundle\fR\.
-.
-.IP "\(bu" 4
-\fBdeployment\fR (\fBBUNDLE_DEPLOYMENT\fR): Disallow changes to the \fBGemfile\fR\. When the \fBGemfile\fR is changed and the lockfile has not been updated, running Bundler commands will be blocked\.
-.
-.IP "\(bu" 4
-\fBdisable_checksum_validation\fR (\fBBUNDLE_DISABLE_CHECKSUM_VALIDATION\fR): Allow installing gems even if they do not match the checksum provided by RubyGems\.
-.
-.IP "\(bu" 4
-\fBdisable_exec_load\fR (\fBBUNDLE_DISABLE_EXEC_LOAD\fR): Stop Bundler from using \fBload\fR to launch an executable in\-process in \fBbundle exec\fR\.
-.
-.IP "\(bu" 4
-\fBdisable_local_branch_check\fR (\fBBUNDLE_DISABLE_LOCAL_BRANCH_CHECK\fR): Allow Bundler to use a local git override without a branch specified in the Gemfile\.
-.
-.IP "\(bu" 4
-\fBdisable_local_revision_check\fR (\fBBUNDLE_DISABLE_LOCAL_REVISION_CHECK\fR): Allow Bundler to use a local git override without checking if the revision present in the lockfile is present in the repository\.
-.
-.IP "\(bu" 4
-\fBdisable_shared_gems\fR (\fBBUNDLE_DISABLE_SHARED_GEMS\fR): Stop Bundler from accessing gems installed to RubyGems\' normal location\.
-.
-.IP "\(bu" 4
-\fBdisable_version_check\fR (\fBBUNDLE_DISABLE_VERSION_CHECK\fR): Stop Bundler from checking if a newer Bundler version is available on rubygems\.org\.
-.
-.IP "\(bu" 4
-\fBforce_ruby_platform\fR (\fBBUNDLE_FORCE_RUBY_PLATFORM\fR): Ignore the current machine\'s platform and install only \fBruby\fR platform gems\. As a result, gems with native extensions will be compiled from source\.
-.
-.IP "\(bu" 4
-\fBfrozen\fR (\fBBUNDLE_FROZEN\fR): Disallow changes to the \fBGemfile\fR\. When the \fBGemfile\fR is changed and the lockfile has not been updated, running Bundler commands will be blocked\. Defaults to \fBtrue\fR when \fB\-\-deployment\fR is used\.
-.
-.IP "\(bu" 4
-\fBgem\.github_username\fR (\fBBUNDLE_GEM__GITHUB_USERNAME\fR): Sets a GitHub username or organization to be used in \fBREADME\fR file when you create a new gem via \fBbundle gem\fR command\. It can be overridden by passing an explicit \fB\-\-github\-username\fR flag to \fBbundle gem\fR\.
-.
-.IP "\(bu" 4
-\fBgem\.push_key\fR (\fBBUNDLE_GEM__PUSH_KEY\fR): Sets the \fB\-\-key\fR parameter for \fBgem push\fR when using the \fBrake release\fR command with a private gemstash server\.
-.
-.IP "\(bu" 4
-\fBgemfile\fR (\fBBUNDLE_GEMFILE\fR): The name of the file that bundler should use as the \fBGemfile\fR\. This location of this file also sets the root of the project, which is used to resolve relative paths in the \fBGemfile\fR, among other things\. By default, bundler will search up from the current working directory until it finds a \fBGemfile\fR\.
-.
-.IP "\(bu" 4
-\fBglobal_gem_cache\fR (\fBBUNDLE_GLOBAL_GEM_CACHE\fR): Whether Bundler should cache all gems globally, rather than locally to the installing Ruby installation\.
-.
-.IP "\(bu" 4
-\fBignore_funding_requests\fR (\fBBUNDLE_IGNORE_FUNDING_REQUESTS\fR): When set, no funding requests will be printed\.
-.
-.IP "\(bu" 4
-\fBignore_messages\fR (\fBBUNDLE_IGNORE_MESSAGES\fR): When set, no post install messages will be printed\. To silence a single gem, use dot notation like \fBignore_messages\.httparty true\fR\.
-.
-.IP "\(bu" 4
-\fBinit_gems_rb\fR (\fBBUNDLE_INIT_GEMS_RB\fR): Generate a \fBgems\.rb\fR instead of a \fBGemfile\fR when running \fBbundle init\fR\.
-.
-.IP "\(bu" 4
-\fBjobs\fR (\fBBUNDLE_JOBS\fR): The number of gems Bundler can install in parallel\. Defaults to the number of available processors\.
-.
-.IP "\(bu" 4
-\fBno_install\fR (\fBBUNDLE_NO_INSTALL\fR): Whether \fBbundle package\fR should skip installing gems\.
-.
-.IP "\(bu" 4
-\fBno_prune\fR (\fBBUNDLE_NO_PRUNE\fR): Whether Bundler should leave outdated gems unpruned when caching\.
-.
-.IP "\(bu" 4
-\fBonly\fR (\fBBUNDLE_ONLY\fR): A space\-separated list of groups to install only gems of the specified groups\.
-.
-.IP "\(bu" 4
-\fBpath\fR (\fBBUNDLE_PATH\fR): The location on disk where all gems in your bundle will be located regardless of \fB$GEM_HOME\fR or \fB$GEM_PATH\fR values\. Bundle gems not found in this location will be installed by \fBbundle install\fR\. Defaults to \fBGem\.dir\fR\. When \-\-deployment is used, defaults to vendor/bundle\.
-.
-.IP "\(bu" 4
-\fBpath\.system\fR (\fBBUNDLE_PATH__SYSTEM\fR): Whether Bundler will install gems into the default system path (\fBGem\.dir\fR)\.
-.
-.IP "\(bu" 4
-\fBpath_relative_to_cwd\fR (\fBBUNDLE_PATH_RELATIVE_TO_CWD\fR) Makes \fB\-\-path\fR relative to the CWD instead of the \fBGemfile\fR\.
-.
-.IP "\(bu" 4
-\fBplugins\fR (\fBBUNDLE_PLUGINS\fR): Enable Bundler\'s experimental plugin system\.
-.
-.IP "\(bu" 4
-\fBprefer_patch\fR (BUNDLE_PREFER_PATCH): Prefer updating only to next patch version during updates\. Makes \fBbundle update\fR calls equivalent to \fBbundler update \-\-patch\fR\.
-.
-.IP "\(bu" 4
-\fBprint_only_version_number\fR (\fBBUNDLE_PRINT_ONLY_VERSION_NUMBER\fR): Print only version number from \fBbundler \-\-version\fR\.
-.
-.IP "\(bu" 4
-\fBredirect\fR (\fBBUNDLE_REDIRECT\fR): The number of redirects allowed for network requests\. Defaults to \fB5\fR\.
-.
-.IP "\(bu" 4
-\fBretry\fR (\fBBUNDLE_RETRY\fR): The number of times to retry failed network requests\. Defaults to \fB3\fR\.
-.
-.IP "\(bu" 4
-\fBsetup_makes_kernel_gem_public\fR (\fBBUNDLE_SETUP_MAKES_KERNEL_GEM_PUBLIC\fR): Have \fBBundler\.setup\fR make the \fBKernel#gem\fR method public, even though RubyGems declares it as private\.
-.
-.IP "\(bu" 4
-\fBshebang\fR (\fBBUNDLE_SHEBANG\fR): The program name that should be invoked for generated binstubs\. Defaults to the ruby install name used to generate the binstub\.
-.
-.IP "\(bu" 4
-\fBsilence_deprecations\fR (\fBBUNDLE_SILENCE_DEPRECATIONS\fR): Whether Bundler should silence deprecation warnings for behavior that will be changed in the next major version\.
-.
-.IP "\(bu" 4
-\fBsilence_root_warning\fR (\fBBUNDLE_SILENCE_ROOT_WARNING\fR): Silence the warning Bundler prints when installing gems as root\.
-.
-.IP "\(bu" 4
-\fBssl_ca_cert\fR (\fBBUNDLE_SSL_CA_CERT\fR): Path to a designated CA certificate file or folder containing multiple certificates for trusted CAs in PEM format\.
-.
-.IP "\(bu" 4
-\fBssl_client_cert\fR (\fBBUNDLE_SSL_CLIENT_CERT\fR): Path to a designated file containing a X\.509 client certificate and key in PEM format\.
-.
-.IP "\(bu" 4
-\fBssl_verify_mode\fR (\fBBUNDLE_SSL_VERIFY_MODE\fR): The SSL verification mode Bundler uses when making HTTPS requests\. Defaults to verify peer\.
-.
-.IP "\(bu" 4
-\fBsystem_bindir\fR (\fBBUNDLE_SYSTEM_BINDIR\fR): The location where RubyGems installs binstubs\. Defaults to \fBGem\.bindir\fR\.
-.
-.IP "\(bu" 4
-\fBtimeout\fR (\fBBUNDLE_TIMEOUT\fR): The seconds allowed before timing out for network requests\. Defaults to \fB10\fR\.
-.
-.IP "\(bu" 4
-\fBupdate_requires_all_flag\fR (\fBBUNDLE_UPDATE_REQUIRES_ALL_FLAG\fR): Require passing \fB\-\-all\fR to \fBbundle update\fR when everything should be updated, and disallow passing no options to \fBbundle update\fR\.
-.
-.IP "\(bu" 4
-\fBuser_agent\fR (\fBBUNDLE_USER_AGENT\fR): The custom user agent fragment Bundler includes in API requests\.
-.
-.IP "\(bu" 4
-\fBversion\fR (\fBBUNDLE_VERSION\fR): The version of Bundler to use when running under Bundler environment\. Defaults to \fBlockfile\fR\. You can also specify \fBsystem\fR or \fBx\.y\.z\fR\. \fBlockfile\fR will use the Bundler version specified in the \fBGemfile\.lock\fR, \fBsystem\fR will use the system version of Bundler, and \fBx\.y\.z\fR will use the specified version of Bundler\.
-.
-.IP "\(bu" 4
-\fBwith\fR (\fBBUNDLE_WITH\fR): A \fB:\fR\-separated list of groups whose gems bundler should install\.
-.
-.IP "\(bu" 4
-\fBwithout\fR (\fBBUNDLE_WITHOUT\fR): A \fB:\fR\-separated list of groups whose gems bundler should not install\.
-.
-.IP "" 0
-.
-.P
-In general, you should set these settings per\-application by using the applicable flag to the bundle install(1) \fIbundle\-install\.1\.html\fR or bundle cache(1) \fIbundle\-cache\.1\.html\fR command\.
-.
-.P
-You can set them globally either via environment variables or \fBbundle config\fR, whichever is preferable for your setup\. If you use both, environment variables will take preference over global settings\.
-.
 .SH "LOCAL GIT REPOS"
 Bundler also allows you to work against a git repository locally instead of using the remote version\. This can be achieved by setting up a local override:
-.
 .IP "" 4
-.
 .nf
-
 bundle config set \-\-local local\.GEM_NAME /path/to/local/git/repository
-.
 .fi
-.
 .IP "" 0
-.
 .P
 For example, in order to use a local Rack repository, a developer could call:
-.
 .IP "" 4
-.
 .nf
-
 bundle config set \-\-local local\.rack ~/Work/git/rack
-.
 .fi
-.
 .IP "" 0
-.
 .P
-Now instead of checking out the remote git repository, the local override will be used\. Similar to a path source, every time the local git repository change, changes will be automatically picked up by Bundler\. This means a commit in the local git repo will update the revision in the \fBGemfile\.lock\fR to the local git repo revision\. This requires the same attention as git submodules\. Before pushing to the remote, you need to ensure the local override was pushed, otherwise you may point to a commit that only exists in your local machine\. You\'ll also need to CGI escape your usernames and passwords as well\.
-.
+Now instead of checking out the remote git repository, the local override will be used\. Similar to a path source, every time the local git repository change, changes will be automatically picked up by Bundler\. This means a commit in the local git repo will update the revision in the \fBGemfile\.lock\fR to the local git repo revision\. This requires the same attention as git submodules\. Before pushing to the remote, you need to ensure the local override was pushed, otherwise you may point to a commit that only exists in your local machine\. You'll also need to CGI escape your usernames and passwords as well\.
 .P
-Bundler does many checks to ensure a developer won\'t work with invalid references\. Particularly, we force a developer to specify a branch in the \fBGemfile\fR in order to use this feature\. If the branch specified in the \fBGemfile\fR and the current branch in the local git repository do not match, Bundler will abort\. This ensures that a developer is always working against the correct branches, and prevents accidental locking to a different branch\.
-.
+Bundler does many checks to ensure a developer won't work with invalid references\. Particularly, we force a developer to specify a branch in the \fBGemfile\fR in order to use this feature\. If the branch specified in the \fBGemfile\fR and the current branch in the local git repository do not match, Bundler will abort\. This ensures that a developer is always working against the correct branches, and prevents accidental locking to a different branch\.
 .P
 Finally, Bundler also ensures that the current revision in the \fBGemfile\.lock\fR exists in the local git repository\. By doing this, Bundler forces you to fetch the latest changes in the remotes\.
-.
 .SH "MIRRORS OF GEM SOURCES"
 Bundler supports overriding gem sources with mirrors\. This allows you to configure rubygems\.org as the gem source in your Gemfile while still using your mirror to fetch gems\.
-.
 .IP "" 4
-.
 .nf
-
 bundle config set \-\-global mirror\.SOURCE_URL MIRROR_URL
-.
 .fi
-.
 .IP "" 0
-.
 .P
 For example, to use a mirror of https://rubygems\.org hosted at https://example\.org:
-.
 .IP "" 4
-.
 .nf
-
 bundle config set \-\-global mirror\.https://rubygems\.org https://example\.org
-.
 .fi
-.
 .IP "" 0
-.
 .P
 Each mirror also provides a fallback timeout setting\. If the mirror does not respond within the fallback timeout, Bundler will try to use the original server instead of the mirror\.
-.
 .IP "" 4
-.
 .nf
-
 bundle config set \-\-global mirror\.SOURCE_URL\.fallback_timeout TIMEOUT
-.
 .fi
-.
 .IP "" 0
-.
 .P
 For example, to fall back to rubygems\.org after 3 seconds:
-.
 .IP "" 4
-.
 .nf
-
 bundle config set \-\-global mirror\.https://rubygems\.org\.fallback_timeout 3
-.
 .fi
-.
 .IP "" 0
-.
 .P
 The default fallback timeout is 0\.1 seconds, but the setting can currently only accept whole seconds (for example, 1, 15, or 30)\.
-.
 .SH "CREDENTIALS FOR GEM SOURCES"
 Bundler allows you to configure credentials for any gem source, which allows you to avoid putting secrets into your Gemfile\.
-.
 .IP "" 4
-.
 .nf
-
 bundle config set \-\-global SOURCE_HOSTNAME USERNAME:PASSWORD
-.
 .fi
-.
 .IP "" 0
-.
 .P
 For example, to save the credentials of user \fBclaudette\fR for the gem source at \fBgems\.longerous\.com\fR, you would run:
-.
 .IP "" 4
-.
 .nf
-
 bundle config set \-\-global gems\.longerous\.com claudette:s00pers3krit
-.
 .fi
-.
 .IP "" 0
-.
 .P
 Or you can set the credentials as an environment variable like this:
-.
 .IP "" 4
-.
 .nf
-
 export BUNDLE_GEMS__LONGEROUS__COM="claudette:s00pers3krit"
-.
 .fi
-.
 .IP "" 0
-.
 .P
 For gems with a git source with HTTP(S) URL you can specify credentials like so:
-.
 .IP "" 4
-.
 .nf
-
 bundle config set \-\-global https://github\.com/rubygems/rubygems\.git username:password
-.
 .fi
-.
 .IP "" 0
-.
 .P
 Or you can set the credentials as an environment variable like so:
-.
 .IP "" 4
-.
 .nf
-
 export BUNDLE_GITHUB__COM=username:password
-.
 .fi
-.
 .IP "" 0
-.
 .P
 This is especially useful for private repositories on hosts such as GitHub, where you can use personal OAuth tokens:
-.
 .IP "" 4
-.
 .nf
-
 export BUNDLE_GITHUB__COM=abcd0123generatedtoken:x\-oauth\-basic
-.
 .fi
-.
 .IP "" 0
-.
 .P
 Note that any configured credentials will be redacted by informative commands such as \fBbundle config list\fR or \fBbundle config get\fR, unless you use the \fB\-\-parseable\fR flag\. This is to avoid unintentionally leaking credentials when copy\-pasting bundler output\.
-.
 .P
 Also note that to guarantee a sane mapping between valid environment variable names and valid host names, bundler makes the following transformations:
-.
 .IP "\(bu" 4
-Any \fB\-\fR characters in a host name are mapped to a triple dash (\fB___\fR) in the corresponding environment variable\.
-.
+Any \fB\-\fR characters in a host name are mapped to a triple underscore (\fB___\fR) in the corresponding environment variable\.
 .IP "\(bu" 4
-Any \fB\.\fR characters in a host name are mapped to a double dash (\fB__\fR) in the corresponding environment variable\.
-.
+Any \fB\.\fR characters in a host name are mapped to a double underscore (\fB__\fR) in the corresponding environment variable\.
 .IP "" 0
-.
 .P
-This means that if you have a gem server named \fBmy\.gem\-host\.com\fR, you\'ll need to use the \fBBUNDLE_MY__GEM___HOST__COM\fR variable to configure credentials for it through ENV\.
-.
+This means that if you have a gem server named \fBmy\.gem\-host\.com\fR, you'll need to use the \fBBUNDLE_MY__GEM___HOST__COM\fR variable to configure credentials for it through ENV\.
 .SH "CONFIGURE BUNDLER DIRECTORIES"
-Bundler\'s home, config, cache and plugin directories are able to be configured through environment variables\. The default location for Bundler\'s home directory is \fB~/\.bundle\fR, which all directories inherit from by default\. The following outlines the available environment variables and their default values
-.
+Bundler's home, cache and plugin directories and config file can be configured through environment variables\. The default location for Bundler's home directory is \fB~/\.bundle\fR, which all directories inherit from by default\. The following outlines the available environment variables and their default values
 .IP "" 4
-.
 .nf
-
 BUNDLE_USER_HOME : $HOME/\.bundle
 BUNDLE_USER_CACHE : $BUNDLE_USER_HOME/cache
 BUNDLE_USER_CONFIG : $BUNDLE_USER_HOME/config
 BUNDLE_USER_PLUGIN : $BUNDLE_USER_HOME/plugin
-.
 .fi
-.
 .IP "" 0
 
diff --git a/lib/bundler/man/bundle-config.1.ronn b/lib/bundler/man/bundle-config.1.ronn
index b935329b4e322a..7f31eb4c39a0ad 100644
--- a/lib/bundler/man/bundle-config.1.ronn
+++ b/lib/bundler/man/bundle-config.1.ronn
@@ -52,66 +52,6 @@ only from the local application.
 Executing bundle with the `BUNDLE_IGNORE_CONFIG` environment variable set will
 cause it to ignore all configuration.
 
-## REMEMBERING OPTIONS
-
-Flags passed to `bundle install` or the Bundler runtime, such as `--path foo` or
-`--without production`, are remembered between commands and saved to your local
-application's configuration (normally, `./.bundle/config`).
-
-However, this will be changed in bundler 3, so it's better not to rely on this
-behavior. If these options must be remembered, it's better to set them using
-`bundle config` (e.g., `bundle config set --local path foo`).
-
-The options that can be configured are:
-
-* `bin`:
-   Creates a directory (defaults to `~/bin`) and place any executables from the
-   gem there. These executables run in Bundler's context. If used, you might add
-   this directory to your environment's `PATH` variable. For instance, if the
-   `rails` gem comes with a `rails` executable, this flag will create a
-   `bin/rails` executable that ensures that all referred dependencies will be
-   resolved using the bundled gems.
-
-* `deployment`:
-   In deployment mode, Bundler will 'roll-out' the bundle for
-   `production` use. Please check carefully if you want to have this option
-   enabled in `development` or `test` environments.
-
-* `only`:
-   A space-separated list of groups to install only gems of the specified groups.
-
-* `path`:
-   The location to install the specified gems to. This defaults to Rubygems'
-   setting. Bundler shares this location with Rubygems, `gem install ...` will
-   have gem installed there, too. Therefore, gems installed without a
-   `--path ...` setting will show up by calling `gem list`. Accordingly, gems
-   installed to other locations will not get listed.
-
-* `without`:
-   A space-separated list of groups referencing gems to skip during installation.
-
-* `with`:
-  A space-separated list of **optional** groups referencing gems to include during installation.
-
-## BUILD OPTIONS
-
-You can use `bundle config` to give Bundler the flags to pass to the gem
-installer every time bundler tries to install a particular gem.
-
-A very common example, the `mysql` gem, requires Snow Leopard users to
-pass configuration flags to `gem install` to specify where to find the
-`mysql_config` executable.
-
-    gem install mysql -- --with-mysql-config=/usr/local/mysql/bin/mysql_config
-
-Since the specific location of that executable can change from machine
-to machine, you can specify these flags on a per-machine basis.
-
-    bundle config set --global build.mysql --with-mysql-config=/usr/local/mysql/bin/mysql_config
-
-After running this command, every time bundler needs to install the
-`mysql` gem, it will pass along the flags you specified.
-
 ## CONFIGURATION KEYS
 
 Configuration keys in bundler have two forms: the canonical form and the
@@ -137,14 +77,8 @@ the environment variable `BUNDLE_LOCAL__RACK`.
 The following is a list of all configuration keys and their purpose. You can
 learn more about their operation in [bundle install(1)](bundle-install.1.html).
 
-* `allow_deployment_source_credential_changes` (`BUNDLE_ALLOW_DEPLOYMENT_SOURCE_CREDENTIAL_CHANGES`):
-   When in deployment mode, allow changing the credentials to a gem's source.
-   Ex: `https://some.host.com/gems/path/` -> `https://user_name:password@some.host.com/gems/path`
 * `allow_offline_install` (`BUNDLE_ALLOW_OFFLINE_INSTALL`):
    Allow Bundler to use cached data when installing without network access.
-* `auto_clean_without_path` (`BUNDLE_AUTO_CLEAN_WITHOUT_PATH`):
-   Automatically run `bundle clean` after installing when an explicit `path`
-   has not been set and Bundler is not installing into the system gems.
 * `auto_install` (`BUNDLE_AUTO_INSTALL`):
    Automatically run `bundle install` when gems are missing.
 * `bin` (`BUNDLE_BIN`):
@@ -152,7 +86,7 @@ learn more about their operation in [bundle install(1)](bundle-install.1.html).
    Defaults to `false`.
 * `cache_all` (`BUNDLE_CACHE_ALL`):
    Cache all gems, including path and git gems. This needs to be explicitly
-   configured on bundler 1 and bundler 2, but will be the default on bundler 3.
+   before bundler 4, but will be the default on bundler 4.
 * `cache_all_platforms` (`BUNDLE_CACHE_ALL_PLATFORMS`):
    Cache gems for all platforms.
 * `cache_path` (`BUNDLE_CACHE_PATH`):
@@ -161,15 +95,16 @@ learn more about their operation in [bundle install(1)](bundle-install.1.html).
    Defaults to `vendor/cache`.
 * `clean` (`BUNDLE_CLEAN`):
    Whether Bundler should run `bundle clean` automatically after
-   `bundle install`.
+   `bundle install`. Defaults to `true` in Bundler 4, as long as `path` is not
+   explicitly configured.
 * `console` (`BUNDLE_CONSOLE`):
    The console that `bundle console` starts. Defaults to `irb`.
-* `default_install_uses_path` (`BUNDLE_DEFAULT_INSTALL_USES_PATH`):
-   Whether a `bundle install` without an explicit `--path` argument defaults
-   to installing gems in `.bundle`.
+* `default_cli_command` (`BUNDLE_DEFAULT_CLI_COMMAND`):
+   The command that running `bundle` without arguments should run. Defaults to
+   `cli_help` since Bundler 4, but can also be `install` which was the previous
+   default.
 * `deployment` (`BUNDLE_DEPLOYMENT`):
-   Disallow changes to the `Gemfile`. When the `Gemfile` is changed and the
-   lockfile has not been updated, running Bundler commands will be blocked.
+   Equivalent to setting `frozen` to `true` and `path` to `vendor/bundle`.
 * `disable_checksum_validation` (`BUNDLE_DISABLE_CHECKSUM_VALIDATION`):
    Allow installing gems even if they do not match the checksum provided by
    RubyGems.
@@ -191,12 +126,13 @@ learn more about their operation in [bundle install(1)](bundle-install.1.html).
    Ignore the current machine's platform and install only `ruby` platform gems.
    As a result, gems with native extensions will be compiled from source.
 * `frozen` (`BUNDLE_FROZEN`):
-   Disallow changes to the `Gemfile`. When the `Gemfile` is changed and the
-   lockfile has not been updated, running Bundler commands will be blocked.
-   Defaults to `true` when `--deployment` is used.
+   Disallow any automatic changes to `Gemfile.lock`. Bundler commands will
+   be blocked unless the lockfile can be installed exactly as written.
+   Usually this will happen when changing the `Gemfile` manually and forgetting
+   to update the lockfile through `bundle lock` or `bundle install`.
 * `gem.github_username` (`BUNDLE_GEM__GITHUB_USERNAME`):
-   Sets a GitHub username or organization to be used in `README` file when you
-   create a new gem via `bundle gem` command. It can be overridden by passing an
+   Sets a GitHub username or organization to be used in the `README` and `.gemspec` files
+   when you create a new gem via `bundle gem` command. It can be overridden by passing an
    explicit `--github-username` flag to `bundle gem`.
 * `gem.push_key` (`BUNDLE_GEM__PUSH_KEY`):
    Sets the `--key` parameter for `gem push` when using the `rake release`
@@ -208,8 +144,8 @@ learn more about their operation in [bundle install(1)](bundle-install.1.html).
    will search up from the current working directory until it finds a
    `Gemfile`.
 * `global_gem_cache` (`BUNDLE_GLOBAL_GEM_CACHE`):
-   Whether Bundler should cache all gems globally, rather than locally to the
-   installing Ruby installation.
+   Whether Bundler should cache all gems and compiled extensions globally,
+   rather than locally to the configured installation path.
 * `ignore_funding_requests` (`BUNDLE_IGNORE_FUNDING_REQUESTS`):
    When set, no funding requests will be printed.
 * `ignore_messages` (`BUNDLE_IGNORE_MESSAGES`):
@@ -220,6 +156,8 @@ learn more about their operation in [bundle install(1)](bundle-install.1.html).
 * `jobs` (`BUNDLE_JOBS`):
    The number of gems Bundler can install in parallel. Defaults to the number of
    available processors.
+* `lockfile_checksums` (`BUNDLE_LOCKFILE_CHECKSUMS`):
+   Whether Bundler should include a checksums section in new lockfiles, to protect from compromised gem sources.
 * `no_install` (`BUNDLE_NO_INSTALL`):
    Whether `bundle package` should skip installing gems.
 * `no_prune` (`BUNDLE_NO_PRUNE`):
@@ -229,25 +167,19 @@ learn more about their operation in [bundle install(1)](bundle-install.1.html).
 * `path` (`BUNDLE_PATH`):
    The location on disk where all gems in your bundle will be located regardless
    of `$GEM_HOME` or `$GEM_PATH` values. Bundle gems not found in this location
-   will be installed by `bundle install`. Defaults to `Gem.dir`. When --deployment
-   is used, defaults to vendor/bundle.
+   will be installed by `bundle install`. Defaults to `.bundle` relative to
+   repository root in Bundler 4, and to the default system path (`Gem.dir`)
+   before Bundler 4.
 * `path.system` (`BUNDLE_PATH__SYSTEM`):
    Whether Bundler will install gems into the default system path (`Gem.dir`).
-* `path_relative_to_cwd` (`BUNDLE_PATH_RELATIVE_TO_CWD`)
-   Makes `--path` relative to the CWD instead of the `Gemfile`.
 * `plugins` (`BUNDLE_PLUGINS`):
    Enable Bundler's experimental plugin system.
 * `prefer_patch` (BUNDLE_PREFER_PATCH):
    Prefer updating only to next patch version during updates. Makes `bundle update` calls equivalent to `bundler update --patch`.
-* `print_only_version_number` (`BUNDLE_PRINT_ONLY_VERSION_NUMBER`):
-   Print only version number from `bundler --version`.
 * `redirect` (`BUNDLE_REDIRECT`):
    The number of redirects allowed for network requests. Defaults to `5`.
 * `retry` (`BUNDLE_RETRY`):
    The number of times to retry failed network requests. Defaults to `3`.
-* `setup_makes_kernel_gem_public` (`BUNDLE_SETUP_MAKES_KERNEL_GEM_PUBLIC`):
-   Have `Bundler.setup` make the `Kernel#gem` method public, even though
-   RubyGems declares it as private.
 * `shebang` (`BUNDLE_SHEBANG`):
    The program name that should be invoked for generated binstubs. Defaults to
    the ruby install name used to generate the binstub.
@@ -256,6 +188,10 @@ learn more about their operation in [bundle install(1)](bundle-install.1.html).
    be changed in the next major version.
 * `silence_root_warning` (`BUNDLE_SILENCE_ROOT_WARNING`):
    Silence the warning Bundler prints when installing gems as root.
+* `simulate_version` (`BUNDLE_SIMULATE_VERSION`):
+   The virtual version Bundler should use for activating feature flags. Can be
+   used to simulate all the new functionality that will be enabled in a future
+   major version.
 * `ssl_ca_cert` (`BUNDLE_SSL_CA_CERT`):
    Path to a designated CA certificate file or folder containing multiple
    certificates for trusted CAs in PEM format.
@@ -274,6 +210,9 @@ learn more about their operation in [bundle install(1)](bundle-install.1.html).
    and disallow passing no options to `bundle update`.
 * `user_agent` (`BUNDLE_USER_AGENT`):
    The custom user agent fragment Bundler includes in API requests.
+* `verbose` (`BUNDLE_VERBOSE`):
+   Whether Bundler should print verbose output. Defaults to `false`, unless the
+   `--verbose` CLI flag is used.
 * `version` (`BUNDLE_VERSION`):
    The version of Bundler to use when running under Bundler environment.
    Defaults to `lockfile`. You can also specify `system` or `x.y.z`.
@@ -281,16 +220,74 @@ learn more about their operation in [bundle install(1)](bundle-install.1.html).
    `system` will use the system version of Bundler, and `x.y.z` will use
    the specified version of Bundler.
 * `with` (`BUNDLE_WITH`):
-   A `:`-separated list of groups whose gems bundler should install.
+   A space-separated or `:`-separated list of groups whose gems bundler should install.
 * `without` (`BUNDLE_WITHOUT`):
-   A `:`-separated list of groups whose gems bundler should not install.
+   A space-separated or `:`-separated list of groups whose gems bundler should not install.
 
-In general, you should set these settings per-application by using the applicable
-flag to the [bundle install(1)](bundle-install.1.html) or [bundle cache(1)](bundle-cache.1.html) command.
+## REMEMBERING OPTIONS
 
-You can set them globally either via environment variables or `bundle config`,
-whichever is preferable for your setup. If you use both, environment variables
-will take preference over global settings.
+Flags passed to `bundle install` or the Bundler runtime, such as `--path foo` or
+`--without production`, are remembered between commands and saved to your local
+application's configuration (normally, `./.bundle/config`).
+
+However, this will be changed in bundler 4, so it's better not to rely on this
+behavior. If these options must be remembered, it's better to set them using
+`bundle config` (e.g., `bundle config set --local path foo`).
+
+The flags that can be configured are:
+
+* `--bin`:
+   Creates a directory (defaults to `~/bin`) and place any executables from the
+   gem there. These executables run in Bundler's context. If used, you might add
+   this directory to your environment's `PATH` variable. For instance, if the
+   `rails` gem comes with a `rails` executable, this flag will create a
+   `bin/rails` executable that ensures that all referred dependencies will be
+   resolved using the bundled gems.
+
+* `--deployment`:
+   In deployment mode, Bundler will 'roll-out' the bundle for
+   `production` use. Please check carefully if you want to have this option
+   enabled in `development` or `test` environments.
+
+* `--only`:
+   A space-separated list of groups to install only gems of the specified groups.
+   Please check carefully if you want to install also gems without a group, cause
+   they get put inside `default` group. For example `only test:default` will install
+   all gems specified in test group and without one.
+
+* `--path`:
+   The location to install the specified gems to. This defaults to Rubygems'
+   setting. Bundler shares this location with Rubygems, `gem install ...` will
+   have gem installed there, too. Therefore, gems installed without a
+   `--path ...` setting will show up by calling `gem list`. Accordingly, gems
+   installed to other locations will not get listed.
+
+* `--without`:
+   A space-separated or `:`-separated list of groups referencing gems to skip during
+   installation.
+
+* `--with`:
+   A space-separated or `:`-separated list of **optional** groups referencing gems to
+   include during installation.
+
+## BUILD OPTIONS
+
+You can use `bundle config` to give Bundler the flags to pass to the gem
+installer every time bundler tries to install a particular gem.
+
+A very common example, the `mysql` gem, requires Snow Leopard users to
+pass configuration flags to `gem install` to specify where to find the
+`mysql_config` executable.
+
+    gem install mysql -- --with-mysql-config=/usr/local/mysql/bin/mysql_config
+
+Since the specific location of that executable can change from machine
+to machine, you can specify these flags on a per-machine basis.
+
+    bundle config set --global build.mysql --with-mysql-config=/usr/local/mysql/bin/mysql_config
+
+After running this command, every time bundler needs to install the
+`mysql` gem, it will pass along the flags you specified.
 
 ## LOCAL GIT REPOS
 
@@ -388,10 +385,10 @@ copy-pasting bundler output.
 Also note that to guarantee a sane mapping between valid environment variable
 names and valid host names, bundler makes the following transformations:
 
-* Any `-` characters in a host name are mapped to a triple dash (`___`) in the
+* Any `-` characters in a host name are mapped to a triple underscore (`___`) in the
   corresponding environment variable.
 
-* Any `.` characters in a host name are mapped to a double dash (`__`) in the
+* Any `.` characters in a host name are mapped to a double underscore (`__`) in the
   corresponding environment variable.
 
 This means that if you have a gem server named `my.gem-host.com`, you'll need to
@@ -400,7 +397,7 @@ through ENV.
 
 ## CONFIGURE BUNDLER DIRECTORIES
 
-Bundler's home, config, cache and plugin directories are able to be configured
+Bundler's home, cache and plugin directories and config file can be configured
 through environment variables. The default location for Bundler's home directory is
 `~/.bundle`, which all directories inherit from by default. The following
 outlines the available environment variables and their default values
diff --git a/lib/bundler/man/bundle-console.1 b/lib/bundler/man/bundle-console.1
index 24fff46cecf966..a263fef37640ae 100644
--- a/lib/bundler/man/bundle-console.1
+++ b/lib/bundler/man/bundle-console.1
@@ -1,53 +1,33 @@
-.\" generated with Ronn/v0.7.3
-.\" http://github.com/rtomayko/ronn/tree/0.7.3
-.
-.TH "BUNDLE\-CONSOLE" "1" "August 2023" "" ""
-.
+.\" generated with Ronn-NG/v0.10.1
+.\" http://github.com/apjanke/ronn-ng/tree/0.10.1
+.TH "BUNDLE\-CONSOLE" "1" "July 2025" ""
 .SH "NAME"
-\fBbundle\-console\fR \- Deprecated way to open an IRB session with the bundle pre\-loaded
-.
+\fBbundle\-console\fR \- Open an IRB session with the bundle pre\-loaded
 .SH "SYNOPSIS"
 \fBbundle console\fR [GROUP]
-.
 .SH "DESCRIPTION"
 Starts an interactive Ruby console session in the context of the current bundle\.
-.
 .P
 If no \fBGROUP\fR is specified, all gems in the \fBdefault\fR group in the Gemfile(5) \fIhttps://bundler\.io/man/gemfile\.5\.html\fR are preliminarily loaded\.
-.
 .P
 If \fBGROUP\fR is specified, all gems in the given group in the Gemfile in addition to the gems in \fBdefault\fR group are loaded\. Even if the given group does not exist in the Gemfile, IRB console starts without any warning or error\.
-.
 .P
 The environment variable \fBBUNDLE_CONSOLE\fR or \fBbundle config set console\fR can be used to change the shell from the following:
-.
 .IP "\(bu" 4
 \fBirb\fR (default)
-.
 .IP "\(bu" 4
 \fBpry\fR (https://github\.com/pry/pry)
-.
 .IP "\(bu" 4
 \fBripl\fR (https://github\.com/cldwalker/ripl)
-.
 .IP "" 0
-.
 .P
 \fBbundle console\fR uses irb by default\. An alternative Pry or Ripl can be used with \fBbundle console\fR by adjusting the \fBconsole\fR Bundler setting\. Also make sure that \fBpry\fR or \fBripl\fR is in your Gemfile\.
-.
 .SH "EXAMPLE"
-.
 .nf
-
 $ bundle config set console pry
 $ bundle console
-Resolving dependencies\.\.\.
+Resolving dependencies\|\.\|\.\|\.
 [1] pry(main)>
-.
 .fi
-.
-.SH "NOTES"
-This command was deprecated in Bundler 2\.1 and will be removed in 3\.0\. Use \fBbin/console\fR script, which can be generated by \fBbundle gem <NAME>\fR\.
-.
 .SH "SEE ALSO"
 Gemfile(5) \fIhttps://bundler\.io/man/gemfile\.5\.html\fR
diff --git a/lib/bundler/man/bundle-console.1.ronn b/lib/bundler/man/bundle-console.1.ronn
index f9096d386aefc2..ed842ae1c36ecc 100644
--- a/lib/bundler/man/bundle-console.1.ronn
+++ b/lib/bundler/man/bundle-console.1.ronn
@@ -1,5 +1,5 @@
-bundle-console(1) -- Deprecated way to open an IRB session with the bundle pre-loaded
-=====================================================================================
+bundle-console(1) -- Open an IRB session with the bundle pre-loaded
+===================================================================
 
 ## SYNOPSIS
 
@@ -34,11 +34,6 @@ the shell from the following:
     Resolving dependencies...
     [1] pry(main)>
 
-## NOTES
-
-This command was deprecated in Bundler 2.1 and will be removed in 3.0.
-Use `bin/console` script, which can be generated by `bundle gem <NAME>`.
-
 ## SEE ALSO
 
 [Gemfile(5)](https://bundler.io/man/gemfile.5.html)
diff --git a/lib/bundler/man/bundle-doctor.1 b/lib/bundler/man/bundle-doctor.1
index 57da8216cb5b41..2b695dc2eef2ec 100644
--- a/lib/bundler/man/bundle-doctor.1
+++ b/lib/bundler/man/bundle-doctor.1
@@ -1,44 +1,69 @@
-.\" generated with Ronn/v0.7.3
-.\" http://github.com/rtomayko/ronn/tree/0.7.3
-.
-.TH "BUNDLE\-DOCTOR" "1" "August 2023" "" ""
-.
+.\" generated with Ronn-NG/v0.10.1
+.\" http://github.com/apjanke/ronn-ng/tree/0.10.1
+.TH "BUNDLE\-DOCTOR" "1" "July 2025" ""
 .SH "NAME"
 \fBbundle\-doctor\fR \- Checks the bundle for common problems
-.
 .SH "SYNOPSIS"
-\fBbundle doctor\fR [\-\-quiet] [\-\-gemfile=GEMFILE]
-.
+\fBbundle doctor [diagnose]\fR [\-\-quiet] [\-\-gemfile=GEMFILE] [\-\-ssl]
+.br
+\fBbundle doctor ssl\fR [\-\-host=HOST] [\-\-tls\-version=VERSION] [\-\-verify\-mode=MODE]
+.br
+\fBbundle doctor\fR help [COMMAND]
 .SH "DESCRIPTION"
+You can diagnose common Bundler problems with this command such as checking gem environment or SSL/TLS issue\.
+.SH "SUB\-COMMANDS"
+.SS "diagnose (default command)"
 Checks your Gemfile and gem environment for common problems\. If issues are detected, Bundler prints them and exits status 1\. Otherwise, Bundler prints a success message and exits status 0\.
-.
 .P
-Examples of common problems caught by bundle\-doctor include:
-.
+Examples of common problems caught include:
 .IP "\(bu" 4
 Invalid Bundler settings
-.
 .IP "\(bu" 4
 Mismatched Ruby versions
-.
 .IP "\(bu" 4
 Mismatched platforms
-.
 .IP "\(bu" 4
 Uninstalled gems
-.
 .IP "\(bu" 4
 Missing dependencies
-.
 .IP "" 0
-.
-.SH "OPTIONS"
-.
+.P
+\fBOPTIONS\fR
 .TP
 \fB\-\-quiet\fR
 Only output warnings and errors\.
-.
 .TP
-\fB\-\-gemfile=<gemfile>\fR
-The location of the Gemfile(5) which Bundler should use\. This defaults to a Gemfile(5) in the current working directory\. In general, Bundler will assume that the location of the Gemfile(5) is also the project\'s root and will try to find \fBGemfile\.lock\fR and \fBvendor/cache\fR relative to this location\.
+\fB\-\-gemfile=GEMFILE\fR
+The location of the Gemfile(5) which Bundler should use\. This defaults to a Gemfile(5) in the current working directory\. In general, Bundler will assume that the location of the Gemfile(5) is also the project's root and will try to find \fBGemfile\.lock\fR and \fBvendor/cache\fR relative to this location\.
+.TP
+\fB\-\-ssl\fR
+Diagnose common SSL problems when connecting to https://rubygems\.org\.
+.IP
+This flag runs the \fBbundle doctor ssl\fR subcommand with default values underneath\.
+.SS "ssl"
+If you've experienced issues related to SSL certificates and/or TLS versions while connecting to https://rubygems\.org, this command can help troubleshoot common problems\. The diagnostic will perform a few checks such as:
+.IP "\(bu" 4
+Verify the Ruby OpenSSL version installed on your system\.
+.IP "\(bu" 4
+Check the OpenSSL library version used for compilation\.
+.IP "\(bu" 4
+Ensure CA certificates are correctly setup on your machine\.
+.IP "\(bu" 4
+Open a TLS connection and verify the outcome\.
+.IP "" 0
+.P
+\fBOPTIONS\fR
+.TP
+\fB\-\-host=HOST\fR
+Perform the diagnostic on HOST\. Defaults to \fBrubygems\.org\fR\.
+.TP
+\fB\-\-tls\-version=VERSION\fR
+Specify the TLS version when opening the connection to HOST\.
+.IP
+Accepted values are: \fB1\.1\fR or \fB1\.2\fR\.
+.TP
+\fB\-\-verify\-mode=MODE\fR
+Specify the TLS verify mode when opening the connection to HOST\. Defaults to \fBSSL_VERIFY_PEER\fR\.
+.IP
+Accepted values are: \fBCLIENT_ONCE\fR, \fBFAIL_IF_NO_PEER_CERT\fR, \fBNONE\fR, \fBPEER\fR\.
 
diff --git a/lib/bundler/man/bundle-doctor.1.ronn b/lib/bundler/man/bundle-doctor.1.ronn
index 271ee800ad2f94..7e8a21b1c58968 100644
--- a/lib/bundler/man/bundle-doctor.1.ronn
+++ b/lib/bundler/man/bundle-doctor.1.ronn
@@ -3,16 +3,27 @@ bundle-doctor(1) -- Checks the bundle for common problems
 
 ## SYNOPSIS
 
-`bundle doctor` [--quiet]
-                [--gemfile=GEMFILE]
+`bundle doctor [diagnose]` [--quiet]
+                           [--gemfile=GEMFILE]
+                           [--ssl]<br>
+`bundle doctor ssl` [--host=HOST]
+                    [--tls-version=VERSION]
+                    [--verify-mode=MODE]<br>
+`bundle doctor` help [COMMAND]
 
 ## DESCRIPTION
 
+You can diagnose common Bundler problems with this command such as checking gem environment or SSL/TLS issue.
+
+## SUB-COMMANDS
+
+### diagnose (default command)
+
 Checks your Gemfile and gem environment for common problems. If issues
 are detected, Bundler prints them and exits status 1. Otherwise,
 Bundler prints a success message and exits status 0.
 
-Examples of common problems caught by bundle-doctor include:
+Examples of common problems caught include:
 
 * Invalid Bundler settings
 * Mismatched Ruby versions
@@ -20,14 +31,47 @@ Examples of common problems caught by bundle-doctor include:
 * Uninstalled gems
 * Missing dependencies
 
-## OPTIONS
+**OPTIONS**
 
 * `--quiet`:
   Only output warnings and errors.
 
-* `--gemfile=<gemfile>`:
+* `--gemfile=GEMFILE`:
   The location of the Gemfile(5) which Bundler should use. This defaults
   to a Gemfile(5) in the current working directory. In general, Bundler
   will assume that the location of the Gemfile(5) is also the project's
   root and will try to find `Gemfile.lock` and `vendor/cache` relative
   to this location.
+
+* `--ssl`:
+  Diagnose common SSL problems when connecting to https://rubygems.org.
+
+  This flag runs the `bundle doctor ssl` subcommand with default values
+  underneath.
+
+### ssl
+
+If you've experienced issues related to SSL certificates and/or TLS versions while connecting
+to https://rubygems.org, this command can help troubleshoot common problems.
+The diagnostic will perform a few checks such as:
+
+* Verify the Ruby OpenSSL version installed on your system.
+* Check the OpenSSL library version used for compilation.
+* Ensure CA certificates are correctly setup on your machine.
+* Open a TLS connection and verify the outcome.
+
+**OPTIONS**
+
+* `--host=HOST`:
+  Perform the diagnostic on HOST. Defaults to `rubygems.org`.
+
+* `--tls-version=VERSION`:
+  Specify the TLS version when opening the connection to HOST.
+
+  Accepted values are: `1.1` or `1.2`.
+
+* `--verify-mode=MODE`:
+  Specify the TLS verify mode when opening the connection to HOST.
+  Defaults to `SSL_VERIFY_PEER`.
+
+  Accepted values are: `CLIENT_ONCE`, `FAIL_IF_NO_PEER_CERT`, `NONE`, `PEER`.
diff --git a/lib/bundler/man/bundle-env.1 b/lib/bundler/man/bundle-env.1
new file mode 100644
index 00000000000000..3e6c9f6e171de8
--- /dev/null
+++ b/lib/bundler/man/bundle-env.1
@@ -0,0 +1,9 @@
+.\" generated with Ronn-NG/v0.10.1
+.\" http://github.com/apjanke/ronn-ng/tree/0.10.1
+.TH "BUNDLE\-ENV" "1" "July 2025" ""
+.SH "NAME"
+\fBbundle\-env\fR \- Print information about the environment Bundler is running under
+.SH "SYNOPSIS"
+\fBbundle env\fR
+.SH "DESCRIPTION"
+Prints information about the environment Bundler is running under\.
diff --git a/lib/bundler/man/bundle-env.1.ronn b/lib/bundler/man/bundle-env.1.ronn
new file mode 100644
index 00000000000000..c2df9c29c2c491
--- /dev/null
+++ b/lib/bundler/man/bundle-env.1.ronn
@@ -0,0 +1,10 @@
+bundle-env(1) -- Print information about the environment Bundler is running under
+=================================================================================
+
+## SYNOPSIS
+
+`bundle env`
+
+## DESCRIPTION
+
+Prints information about the environment Bundler is running under.
diff --git a/lib/bundler/man/bundle-exec.1 b/lib/bundler/man/bundle-exec.1
index 852788db7ada28..79cdad0288f498 100644
--- a/lib/bundler/man/bundle-exec.1
+++ b/lib/bundler/man/bundle-exec.1
@@ -1,165 +1,107 @@
-.\" generated with Ronn/v0.7.3
-.\" http://github.com/rtomayko/ronn/tree/0.7.3
-.
-.TH "BUNDLE\-EXEC" "1" "August 2023" "" ""
-.
+.\" generated with Ronn-NG/v0.10.1
+.\" http://github.com/apjanke/ronn-ng/tree/0.10.1
+.TH "BUNDLE\-EXEC" "1" "July 2025" ""
 .SH "NAME"
 \fBbundle\-exec\fR \- Execute a command in the context of the bundle
-.
 .SH "SYNOPSIS"
-\fBbundle exec\fR [\-\-keep\-file\-descriptors] \fIcommand\fR
-.
+\fBbundle exec\fR [\-\-keep\-file\-descriptors] [\-\-gemfile=GEMFILE] \fIcommand\fR
 .SH "DESCRIPTION"
 This command executes the command, making all gems specified in the [\fBGemfile(5)\fR][Gemfile(5)] available to \fBrequire\fR in Ruby programs\.
-.
 .P
 Essentially, if you would normally have run something like \fBrspec spec/my_spec\.rb\fR, and you want to use the gems specified in the [\fBGemfile(5)\fR][Gemfile(5)] and installed via bundle install(1) \fIbundle\-install\.1\.html\fR, you should run \fBbundle exec rspec spec/my_spec\.rb\fR\.
-.
 .P
-Note that \fBbundle exec\fR does not require that an executable is available on your shell\'s \fB$PATH\fR\.
-.
+Note that \fBbundle exec\fR does not require that an executable is available on your shell's \fB$PATH\fR\.
 .SH "OPTIONS"
-.
 .TP
 \fB\-\-keep\-file\-descriptors\fR
-Exec in Ruby 2\.0 began discarding non\-standard file descriptors\. When this flag is passed, exec will revert to the 1\.9 behaviour of passing all file descriptors to the new process\.
-.
+Passes all file descriptors to the new processes\. Default is true from bundler version 2\.2\.26\. Setting it to false is now deprecated\.
+.TP
+\fB\-\-gemfile=GEMFILE\fR
+Use the specified gemfile instead of [\fBGemfile(5)\fR][Gemfile(5)]\.
 .SH "BUNDLE INSTALL \-\-BINSTUBS"
 If you use the \fB\-\-binstubs\fR flag in bundle install(1) \fIbundle\-install\.1\.html\fR, Bundler will automatically create a directory (which defaults to \fBapp_root/bin\fR) containing all of the executables available from gems in the bundle\.
-.
 .P
 After using \fB\-\-binstubs\fR, \fBbin/rspec spec/my_spec\.rb\fR is identical to \fBbundle exec rspec spec/my_spec\.rb\fR\.
-.
 .SH "ENVIRONMENT MODIFICATIONS"
 \fBbundle exec\fR makes a number of changes to the shell environment, then executes the command you specify in full\.
-.
 .IP "\(bu" 4
-make sure that it\'s still possible to shell out to \fBbundle\fR from inside a command invoked by \fBbundle exec\fR (using \fB$BUNDLE_BIN_PATH\fR)
-.
+make sure that it's still possible to shell out to \fBbundle\fR from inside a command invoked by \fBbundle exec\fR (using \fB$BUNDLE_BIN_PATH\fR)
 .IP "\(bu" 4
 put the directory containing executables (like \fBrails\fR, \fBrspec\fR, \fBrackup\fR) for your bundle on \fB$PATH\fR
-.
 .IP "\(bu" 4
 make sure that if bundler is invoked in the subshell, it uses the same \fBGemfile\fR (by setting \fBBUNDLE_GEMFILE\fR)
-.
 .IP "\(bu" 4
 add \fB\-rbundler/setup\fR to \fB$RUBYOPT\fR, which makes sure that Ruby programs invoked in the subshell can see the gems in the bundle
-.
 .IP "" 0
-.
 .P
 It also modifies Rubygems:
-.
 .IP "\(bu" 4
 disallow loading additional gems not in the bundle
-.
 .IP "\(bu" 4
-modify the \fBgem\fR method to be a no\-op if a gem matching the requirements is in the bundle, and to raise a \fBGem::LoadError\fR if it\'s not
-.
+modify the \fBgem\fR method to be a no\-op if a gem matching the requirements is in the bundle, and to raise a \fBGem::LoadError\fR if it's not
 .IP "\(bu" 4
 Define \fBGem\.refresh\fR to be a no\-op, since the source index is always frozen when using bundler, and to prevent gems from the system leaking into the environment
-.
 .IP "\(bu" 4
 Override \fBGem\.bin_path\fR to use the gems in the bundle, making system executables work
-.
 .IP "\(bu" 4
 Add all gems in the bundle into Gem\.loaded_specs
-.
 .IP "" 0
-.
 .P
-Finally, \fBbundle exec\fR also implicitly modifies \fBGemfile\.lock\fR if the lockfile and the Gemfile do not match\. Bundler needs the Gemfile to determine things such as a gem\'s groups, \fBautorequire\fR, and platforms, etc\., and that information isn\'t stored in the lockfile\. The Gemfile and lockfile must be synced in order to \fBbundle exec\fR successfully, so \fBbundle exec\fR updates the lockfile beforehand\.
-.
+Finally, \fBbundle exec\fR also implicitly modifies \fBGemfile\.lock\fR if the lockfile and the Gemfile do not match\. Bundler needs the Gemfile to determine things such as a gem's groups, \fBautorequire\fR, and platforms, etc\., and that information isn't stored in the lockfile\. The Gemfile and lockfile must be synced in order to \fBbundle exec\fR successfully, so \fBbundle exec\fR updates the lockfile beforehand\.
 .SS "Loading"
 By default, when attempting to \fBbundle exec\fR to a file with a ruby shebang, Bundler will \fBKernel\.load\fR that file instead of using \fBKernel\.exec\fR\. For the vast majority of cases, this is a performance improvement\. In a rare few cases, this could cause some subtle side\-effects (such as dependence on the exact contents of \fB$0\fR or \fB__FILE__\fR) and the optimization can be disabled by enabling the \fBdisable_exec_load\fR setting\.
-.
 .SS "Shelling out"
-Any Ruby code that opens a subshell (like \fBsystem\fR, backticks, or \fB%x{}\fR) will automatically use the current Bundler environment\. If you need to shell out to a Ruby command that is not part of your current bundle, use the \fBwith_unbundled_env\fR method with a block\. Any subshells created inside the block will be given the environment present before Bundler was activated\. For example, Homebrew commands run Ruby, but don\'t work inside a bundle:
-.
+Any Ruby code that opens a subshell (like \fBsystem\fR, backticks, or \fB%x{}\fR) will automatically use the current Bundler environment\. If you need to shell out to a Ruby command that is not part of your current bundle, use the \fBwith_unbundled_env\fR method with a block\. Any subshells created inside the block will be given the environment present before Bundler was activated\. For example, Homebrew commands run Ruby, but don't work inside a bundle:
 .IP "" 4
-.
 .nf
-
 Bundler\.with_unbundled_env do
   `brew install wget`
 end
-.
 .fi
-.
 .IP "" 0
-.
 .P
 Using \fBwith_unbundled_env\fR is also necessary if you are shelling out to a different bundle\. Any Bundler commands run in a subshell will inherit the current Gemfile, so commands that need to run in the context of a different bundle also need to use \fBwith_unbundled_env\fR\.
-.
 .IP "" 4
-.
 .nf
-
 Bundler\.with_unbundled_env do
   Dir\.chdir "/other/bundler/project" do
     `bundle exec \./script`
   end
 end
-.
 .fi
-.
 .IP "" 0
-.
 .P
 Bundler provides convenience helpers that wrap \fBsystem\fR and \fBexec\fR, and they can be used like this:
-.
 .IP "" 4
-.
 .nf
-
-Bundler\.clean_system(\'brew install wget\')
-Bundler\.clean_exec(\'brew install wget\')
-.
+Bundler\.unbundled_system('brew install wget')
+Bundler\.unbundled_exec('brew install wget')
 .fi
-.
 .IP "" 0
-.
 .SH "RUBYGEMS PLUGINS"
 At present, the Rubygems plugin system requires all files named \fBrubygems_plugin\.rb\fR on the load path of \fIany\fR installed gem when any Ruby code requires \fBrubygems\.rb\fR\. This includes executables installed into the system, like \fBrails\fR, \fBrackup\fR, and \fBrspec\fR\.
-.
 .P
 Since Rubygems plugins can contain arbitrary Ruby code, they commonly end up activating themselves or their dependencies\.
-.
 .P
 For instance, the \fBgemcutter 0\.5\fR gem depended on \fBjson_pure\fR\. If you had that version of gemcutter installed (even if you \fIalso\fR had a newer version without this problem), Rubygems would activate \fBgemcutter 0\.5\fR and \fBjson_pure <latest>\fR\.
-.
 .P
 If your Gemfile(5) also contained \fBjson_pure\fR (or a gem with a dependency on \fBjson_pure\fR), the latest version on your system might conflict with the version in your Gemfile(5), or the snapshot version in your \fBGemfile\.lock\fR\.
-.
 .P
 If this happens, bundler will say:
-.
 .IP "" 4
-.
 .nf
-
 You have already activated json_pure 1\.4\.6 but your Gemfile
 requires json_pure 1\.4\.3\. Consider using bundle exec\.
-.
 .fi
-.
 .IP "" 0
-.
 .P
 In this situation, you almost certainly want to remove the underlying gem with the problematic gem plugin\. In general, the authors of these plugins (in this case, the \fBgemcutter\fR gem) have released newer versions that are more careful in their plugins\.
-.
 .P
 You can find a list of all the gems containing gem plugins by running
-.
 .IP "" 4
-.
 .nf
-
-ruby \-e "puts Gem\.find_files(\'rubygems_plugin\.rb\')"
-.
+ruby \-e "puts Gem\.find_files('rubygems_plugin\.rb')"
 .fi
-.
 .IP "" 0
-.
 .P
-At the very least, you should remove all but the newest version of each gem plugin, and also remove all gem plugins that you aren\'t using (\fBgem uninstall gem_name\fR)\.
+At the very least, you should remove all but the newest version of each gem plugin, and also remove all gem plugins that you aren't using (\fBgem uninstall gem_name\fR)\.
diff --git a/lib/bundler/man/bundle-exec.1.ronn b/lib/bundler/man/bundle-exec.1.ronn
index 05948095e2f6f9..3d3f0eed7b89da 100644
--- a/lib/bundler/man/bundle-exec.1.ronn
+++ b/lib/bundler/man/bundle-exec.1.ronn
@@ -3,7 +3,7 @@ bundle-exec(1) -- Execute a command in the context of the bundle
 
 ## SYNOPSIS
 
-`bundle exec` [--keep-file-descriptors] <command>
+`bundle exec` [--keep-file-descriptors] [--gemfile=GEMFILE] <command>
 
 ## DESCRIPTION
 
@@ -21,9 +21,11 @@ available on your shell's `$PATH`.
 ## OPTIONS
 
 * `--keep-file-descriptors`:
-  Exec in Ruby 2.0 began discarding non-standard file descriptors. When this
-  flag is passed, exec will revert to the 1.9 behaviour of passing all file
-  descriptors to the new process.
+  Passes all file descriptors to the new processes. Default is true from
+  bundler version 2.2.26. Setting it to false is now deprecated.
+
+* `--gemfile=GEMFILE`:
+  Use the specified gemfile instead of [`Gemfile(5)`][Gemfile(5)].
 
 ## BUNDLE INSTALL --BINSTUBS
 
@@ -106,8 +108,8 @@ need to use `with_unbundled_env`.
 Bundler provides convenience helpers that wrap `system` and `exec`, and they
 can be used like this:
 
-    Bundler.clean_system('brew install wget')
-    Bundler.clean_exec('brew install wget')
+    Bundler.unbundled_system('brew install wget')
+    Bundler.unbundled_exec('brew install wget')
 
 
 ## RUBYGEMS PLUGINS
diff --git a/lib/bundler/man/bundle-fund.1 b/lib/bundler/man/bundle-fund.1
new file mode 100644
index 00000000000000..3f6e3a46dfec80
--- /dev/null
+++ b/lib/bundler/man/bundle-fund.1
@@ -0,0 +1,22 @@
+.\" generated with Ronn-NG/v0.10.1
+.\" http://github.com/apjanke/ronn-ng/tree/0.10.1
+.TH "BUNDLE\-FUND" "1" "July 2025" ""
+.SH "NAME"
+\fBbundle\-fund\fR \- Lists information about gems seeking funding assistance
+.SH "SYNOPSIS"
+\fBbundle fund\fR [\fIOPTIONS\fR]
+.SH "DESCRIPTION"
+\fBbundle fund\fR lists information about gems seeking funding assistance\.
+.SH "OPTIONS"
+.TP
+\fB\-\-group=<list>\fR, \fB\-g=<list>\fR
+Fetch funding information for a specific group\.
+.SH "EXAMPLES"
+.nf
+# Lists funding information for all gems
+bundle fund
+
+# Lists funding information for a specific group
+bundle fund \-\-group=security
+.fi
+
diff --git a/lib/bundler/man/bundle-fund.1.ronn b/lib/bundler/man/bundle-fund.1.ronn
new file mode 100644
index 00000000000000..faf8b9c4a75384
--- /dev/null
+++ b/lib/bundler/man/bundle-fund.1.ronn
@@ -0,0 +1,25 @@
+bundle-fund(1) -- Lists information about gems seeking funding assistance
+=========================================================================
+
+## SYNOPSIS
+
+`bundle fund` [*OPTIONS*]
+
+## DESCRIPTION
+
+**bundle fund** lists information about gems seeking funding assistance.
+
+## OPTIONS
+
+* `--group=<list>`, `-g=<list>`:
+  Fetch funding information for a specific group.
+
+## EXAMPLES
+
+```
+# Lists funding information for all gems
+bundle fund
+
+# Lists funding information for a specific group
+bundle fund --group=security
+```
diff --git a/lib/bundler/man/bundle-gem.1 b/lib/bundler/man/bundle-gem.1
index 8339b727cea880..44a02c033c70af 100644
--- a/lib/bundler/man/bundle-gem.1
+++ b/lib/bundler/man/bundle-gem.1
@@ -1,105 +1,110 @@
-.\" generated with Ronn/v0.7.3
-.\" http://github.com/rtomayko/ronn/tree/0.7.3
-.
-.TH "BUNDLE\-GEM" "1" "August 2023" "" ""
-.
+.\" generated with Ronn-NG/v0.10.1
+.\" http://github.com/apjanke/ronn-ng/tree/0.10.1
+.TH "BUNDLE\-GEM" "1" "July 2025" ""
 .SH "NAME"
 \fBbundle\-gem\fR \- Generate a project skeleton for creating a rubygem
-.
 .SH "SYNOPSIS"
 \fBbundle gem\fR \fIGEM_NAME\fR \fIOPTIONS\fR
-.
 .SH "DESCRIPTION"
 Generates a directory named \fBGEM_NAME\fR with a \fBRakefile\fR, \fBGEM_NAME\.gemspec\fR, and other supporting files and directories that can be used to develop a rubygem with that name\.
-.
 .P
 Run \fBrake \-T\fR in the resulting project for a list of Rake tasks that can be used to test and publish the gem to rubygems\.org\.
-.
 .P
-The generated project skeleton can be customized with OPTIONS, as explained below\. Note that these options can also be specified via Bundler\'s global configuration file using the following names:
-.
+The generated project skeleton can be customized with OPTIONS, as explained below\. Note that these options can also be specified via Bundler's global configuration file using the following names:
 .IP "\(bu" 4
 \fBgem\.coc\fR
-.
 .IP "\(bu" 4
 \fBgem\.mit\fR
-.
 .IP "\(bu" 4
 \fBgem\.test\fR
-.
 .IP "" 0
-.
 .SH "OPTIONS"
-.
-.IP "\(bu" 4
-\fB\-\-exe\fR or \fB\-b\fR or \fB\-\-bin\fR: Specify that Bundler should create a binary executable (as \fBexe/GEM_NAME\fR) in the generated rubygem project\. This binary will also be added to the \fBGEM_NAME\.gemspec\fR manifest\. This behavior is disabled by default\.
-.
-.IP "\(bu" 4
-\fB\-\-no\-exe\fR: Do not create a binary (overrides \fB\-\-exe\fR specified in the global config)\.
-.
-.IP "\(bu" 4
-\fB\-\-coc\fR: Add a \fBCODE_OF_CONDUCT\.md\fR file to the root of the generated project\. If this option is unspecified, an interactive prompt will be displayed and the answer will be saved in Bundler\'s global config for future \fBbundle gem\fR use\.
-.
-.IP "\(bu" 4
-\fB\-\-no\-coc\fR: Do not create a \fBCODE_OF_CONDUCT\.md\fR (overrides \fB\-\-coc\fR specified in the global config)\.
-.
-.IP "\(bu" 4
-\fB\-\-ext=c\fR, \fB\-\-ext=rust\fR Add boilerplate for C or Rust (currently magnus \fIhttps://docs\.rs/magnus\fR based) extension code to the generated project\. This behavior is disabled by default\.
-.
-.IP "\(bu" 4
-\fB\-\-no\-ext\fR: Do not add extension code (overrides \fB\-\-ext\fR specified in the global config)\.
-.
-.IP "\(bu" 4
-\fB\-\-mit\fR: Add an MIT license to a \fBLICENSE\.txt\fR file in the root of the generated project\. Your name from the global git config is used for the copyright statement\. If this option is unspecified, an interactive prompt will be displayed and the answer will be saved in Bundler\'s global config for future \fBbundle gem\fR use\.
-.
-.IP "\(bu" 4
-\fB\-\-no\-mit\fR: Do not create a \fBLICENSE\.txt\fR (overrides \fB\-\-mit\fR specified in the global config)\.
-.
-.IP "\(bu" 4
-\fB\-t\fR, \fB\-\-test=minitest\fR, \fB\-\-test=rspec\fR, \fB\-\-test=test\-unit\fR: Specify the test framework that Bundler should use when generating the project\. Acceptable values are \fBminitest\fR, \fBrspec\fR and \fBtest\-unit\fR\. The \fBGEM_NAME\.gemspec\fR will be configured and a skeleton test/spec directory will be created based on this option\. Given no option is specified:
-.
+.TP
+\fB\-\-exe\fR, \fB\-\-bin\fR, \fB\-b\fR
+Specify that Bundler should create a binary executable (as \fBexe/GEM_NAME\fR) in the generated rubygem project\. This binary will also be added to the \fBGEM_NAME\.gemspec\fR manifest\. This behavior is disabled by default\.
+.TP
+\fB\-\-no\-exe\fR
+Do not create a binary (overrides \fB\-\-exe\fR specified in the global config)\.
+.TP
+\fB\-\-coc\fR
+Add a \fBCODE_OF_CONDUCT\.md\fR file to the root of the generated project\. If this option is unspecified, an interactive prompt will be displayed and the answer will be saved in Bundler's global config for future \fBbundle gem\fR use\.
+.TP
+\fB\-\-no\-coc\fR
+Do not create a \fBCODE_OF_CONDUCT\.md\fR (overrides \fB\-\-coc\fR specified in the global config)\.
+.TP
+\fB\-\-changelog\fR
+Add a \fBCHANGELOG\.md\fR file to the root of the generated project\. If this option is unspecified, an interactive prompt will be displayed and the answer will be saved in Bundler's global config for future \fBbundle gem\fR use\. Update the default with \fBbundle config set \-\-global gem\.changelog <true|false>\fR\.
+.TP
+\fB\-\-no\-changelog\fR
+Do not create a \fBCHANGELOG\.md\fR (overrides \fB\-\-changelog\fR specified in the global config)\.
+.TP
+\fB\-\-ext=c\fR, \fB\-\-ext=rust\fR
+Add boilerplate for C or Rust (currently magnus \fIhttps://docs\.rs/magnus\fR based) extension code to the generated project\. This behavior is disabled by default\.
+.TP
+\fB\-\-no\-ext\fR
+Do not add extension code (overrides \fB\-\-ext\fR specified in the global config)\.
+.TP
+\fB\-\-git\fR
+Initialize a git repo inside your library\.
+.TP
+\fB\-\-github\-username=GITHUB_USERNAME\fR
+Fill in GitHub username on README so that you don't have to do it manually\. Set a default with \fBbundle config set \-\-global gem\.github_username <your_username>\fR\.
+.TP
+\fB\-\-mit\fR
+Add an MIT license to a \fBLICENSE\.txt\fR file in the root of the generated project\. Your name from the global git config is used for the copyright statement\. If this option is unspecified, an interactive prompt will be displayed and the answer will be saved in Bundler's global config for future \fBbundle gem\fR use\.
+.TP
+\fB\-\-no\-mit\fR
+Do not create a \fBLICENSE\.txt\fR (overrides \fB\-\-mit\fR specified in the global config)\.
+.TP
+\fB\-t\fR, \fB\-\-test=minitest\fR, \fB\-\-test=rspec\fR, \fB\-\-test=test\-unit\fR
+Specify the test framework that Bundler should use when generating the project\. Acceptable values are \fBminitest\fR, \fBrspec\fR and \fBtest\-unit\fR\. The \fBGEM_NAME\.gemspec\fR will be configured and a skeleton test/spec directory will be created based on this option\. Given no option is specified:
 .IP
-When Bundler is configured to generate tests, this defaults to Bundler\'s global config setting \fBgem\.test\fR\.
-.
+When Bundler is configured to generate tests, this defaults to Bundler's global config setting \fBgem\.test\fR\.
 .IP
 When Bundler is configured to not generate tests, an interactive prompt will be displayed and the answer will be used for the current rubygem project\.
-.
 .IP
-When Bundler is unconfigured, an interactive prompt will be displayed and the answer will be saved in Bundler\'s global config for future \fBbundle gem\fR use\.
-.
-.IP "\(bu" 4
-\fB\-\-ci\fR, \fB\-\-ci=github\fR, \fB\-\-ci=gitlab\fR, \fB\-\-ci=circle\fR: Specify the continuous integration service that Bundler should use when generating the project\. Acceptable values are \fBgithub\fR, \fBgitlab\fR and \fBcircle\fR\. A configuration file will be generated in the project directory\. Given no option is specified:
-.
+When Bundler is unconfigured, an interactive prompt will be displayed and the answer will be saved in Bundler's global config for future \fBbundle gem\fR use\.
+.TP
+\fB\-\-no\-test\fR
+Do not use a test framework (overrides \fB\-\-test\fR specified in the global config)\.
+.TP
+\fB\-\-ci\fR, \fB\-\-ci=circle\fR, \fB\-\-ci=github\fR, \fB\-\-ci=gitlab\fR
+Specify the continuous integration service that Bundler should use when generating the project\. Acceptable values are \fBgithub\fR, \fBgitlab\fR and \fBcircle\fR\. A configuration file will be generated in the project directory\. Given no option is specified:
 .IP
-When Bundler is configured to generate CI files, this defaults to Bundler\'s global config setting \fBgem\.ci\fR\.
-.
+When Bundler is configured to generate CI files, this defaults to Bundler's global config setting \fBgem\.ci\fR\.
 .IP
 When Bundler is configured to not generate CI files, an interactive prompt will be displayed and the answer will be used for the current rubygem project\.
-.
 .IP
-When Bundler is unconfigured, an interactive prompt will be displayed and the answer will be saved in Bundler\'s global config for future \fBbundle gem\fR use\.
-.
-.IP "\(bu" 4
-\fB\-\-linter\fR, \fB\-\-linter=rubocop\fR, \fB\-\-linter=standard\fR: Specify the linter and code formatter that Bundler should add to the project\'s development dependencies\. Acceptable values are \fBrubocop\fR and \fBstandard\fR\. A configuration file will be generated in the project directory\. Given no option is specified:
-.
+When Bundler is unconfigured, an interactive prompt will be displayed and the answer will be saved in Bundler's global config for future \fBbundle gem\fR use\.
+.TP
+\fB\-\-no\-ci\fR
+Do not use a continuous integration service (overrides \fB\-\-ci\fR specified in the global config)\.
+.TP
+\fB\-\-linter\fR, \fB\-\-linter=rubocop\fR, \fB\-\-linter=standard\fR
+Specify the linter and code formatter that Bundler should add to the project's development dependencies\. Acceptable values are \fBrubocop\fR and \fBstandard\fR\. A configuration file will be generated in the project directory\. Given no option is specified:
 .IP
-When Bundler is configured to add a linter, this defaults to Bundler\'s global config setting \fBgem\.linter\fR\.
-.
+When Bundler is configured to add a linter, this defaults to Bundler's global config setting \fBgem\.linter\fR\.
 .IP
 When Bundler is configured not to add a linter, an interactive prompt will be displayed and the answer will be used for the current rubygem project\.
-.
 .IP
-When Bundler is unconfigured, an interactive prompt will be displayed and the answer will be saved in Bundler\'s global config for future \fBbundle gem\fR use\.
-.
-.IP "\(bu" 4
-\fB\-e\fR, \fB\-\-edit[=EDITOR]\fR: Open the resulting GEM_NAME\.gemspec in EDITOR, or the default editor if not specified\. The default is \fB$BUNDLER_EDITOR\fR, \fB$VISUAL\fR, or \fB$EDITOR\fR\.
-.
-.IP "" 0
-.
+When Bundler is unconfigured, an interactive prompt will be displayed and the answer will be saved in Bundler's global config for future \fBbundle gem\fR use\.
+.TP
+\fB\-\-no\-linter\fR
+Do not add a linter (overrides \fB\-\-linter\fR specified in the global config)\.
+.TP
+\fB\-\-rubocop\fR
+Add rubocop to the generated Rakefile and gemspec\. Set a default with \fBbundle config set \-\-global gem\.rubocop true\fR\.
+.TP
+\fB\-\-edit=EDIT\fR, \fB\-e=EDIT\fR
+Open the resulting GEM_NAME\.gemspec in EDIT, or the default editor if not specified\. The default is \fB$BUNDLER_EDITOR\fR, \fB$VISUAL\fR, or \fB$EDITOR\fR\.
+.TP
+\fB\-\-bundle\fR
+Run \fBbundle install\fR after creating the gem\.
+.TP
+\fB\-\-no\-bundle\fR
+Do not run \fBbundle install\fR after creating the gem\.
 .SH "SEE ALSO"
-.
 .IP "\(bu" 4
 bundle config(1) \fIbundle\-config\.1\.html\fR
-.
 .IP "" 0
 
diff --git a/lib/bundler/man/bundle-gem.1.ronn b/lib/bundler/man/bundle-gem.1.ronn
index 46fa2f179fd445..b1327aa3422b86 100644
--- a/lib/bundler/man/bundle-gem.1.ronn
+++ b/lib/bundler/man/bundle-gem.1.ronn
@@ -1,5 +1,5 @@
 bundle-gem(1) -- Generate a project skeleton for creating a rubygem
-====================================================================
+===================================================================
 
 ## SYNOPSIS
 
@@ -24,7 +24,7 @@ configuration file using the following names:
 
 ## OPTIONS
 
-* `--exe` or `-b` or `--bin`:
+* `--exe`, `--bin`, `-b`:
   Specify that Bundler should create a binary executable (as `exe/GEM_NAME`)
   in the generated rubygem project. This binary will also be added to the
   `GEM_NAME.gemspec` manifest. This behavior is disabled by default.
@@ -41,7 +41,17 @@ configuration file using the following names:
   Do not create a `CODE_OF_CONDUCT.md` (overrides `--coc` specified in the
   global config).
 
-* `--ext=c`, `--ext=rust`
+* `--changelog`:
+  Add a `CHANGELOG.md` file to the root of the generated project. If
+  this option is unspecified, an interactive prompt will be displayed and the
+  answer will be saved in Bundler's global config for future `bundle gem` use.
+  Update the default with `bundle config set --global gem.changelog <true|false>`.
+
+* `--no-changelog`:
+  Do not create a `CHANGELOG.md` (overrides `--changelog` specified in the
+  global config).
+
+* `--ext=c`, `--ext=rust`:
   Add boilerplate for C or Rust (currently [magnus](https://docs.rs/magnus) based) extension code to the generated project. This behavior
   is disabled by default.
 
@@ -49,6 +59,12 @@ configuration file using the following names:
   Do not add extension code (overrides `--ext` specified in the global
   config).
 
+* `--git`:
+  Initialize a git repo inside your library.
+
+* `--github-username=GITHUB_USERNAME`:
+  Fill in GitHub username on README so that you don't have to do it manually. Set a default with `bundle config set --global gem.github_username <your_username>`.
+
 * `--mit`:
   Add an MIT license to a `LICENSE.txt` file in the root of the generated
   project. Your name from the global git config is used for the copyright
@@ -76,7 +92,11 @@ configuration file using the following names:
   the answer will be saved in Bundler's global config for future `bundle gem`
   use.
 
-* `--ci`, `--ci=github`, `--ci=gitlab`, `--ci=circle`:
+* `--no-test`:
+  Do not use a test framework (overrides `--test` specified in the global
+  config).
+
+* `--ci`, `--ci=circle`, `--ci=github`, `--ci=gitlab`:
   Specify the continuous integration service that Bundler should use when
   generating the project. Acceptable values are `github`, `gitlab`
   and `circle`. A configuration file will be generated in the project directory.
@@ -92,6 +112,10 @@ configuration file using the following names:
   the answer will be saved in Bundler's global config for future `bundle gem`
   use.
 
+* `--no-ci`:
+  Do not use a continuous integration service (overrides `--ci` specified in
+  the global config).
+
 * `--linter`, `--linter=rubocop`, `--linter=standard`:
   Specify the linter and code formatter that Bundler should add to the
   project's development dependencies. Acceptable values are `rubocop` and
@@ -108,10 +132,22 @@ configuration file using the following names:
   the answer will be saved in Bundler's global config for future `bundle gem`
   use.
 
-* `-e`, `--edit[=EDITOR]`:
-  Open the resulting GEM_NAME.gemspec in EDITOR, or the default editor if not
+* `--no-linter`:
+  Do not add a linter (overrides `--linter` specified in the global config).
+
+* `--rubocop`:
+  Add rubocop to the generated Rakefile and gemspec. Set a default with `bundle config set --global gem.rubocop true`.
+
+* `--edit=EDIT`, `-e=EDIT`:
+  Open the resulting GEM_NAME.gemspec in EDIT, or the default editor if not
   specified. The default is `$BUNDLER_EDITOR`, `$VISUAL`, or `$EDITOR`.
 
+* `--bundle`:
+  Run `bundle install` after creating the gem.
+
+* `--no-bundle`:
+  Do not run `bundle install` after creating the gem.
+
 ## SEE ALSO
 
 * [bundle config(1)](bundle-config.1.html)
diff --git a/lib/bundler/man/bundle-help.1 b/lib/bundler/man/bundle-help.1
index 9787c2d49f55ec..e6bbea6dadbf39 100644
--- a/lib/bundler/man/bundle-help.1
+++ b/lib/bundler/man/bundle-help.1
@@ -1,13 +1,9 @@
-.\" generated with Ronn/v0.7.3
-.\" http://github.com/rtomayko/ronn/tree/0.7.3
-.
-.TH "BUNDLE\-HELP" "1" "August 2023" "" ""
-.
+.\" generated with Ronn-NG/v0.10.1
+.\" http://github.com/apjanke/ronn-ng/tree/0.10.1
+.TH "BUNDLE\-HELP" "1" "July 2025" ""
 .SH "NAME"
 \fBbundle\-help\fR \- Displays detailed help for each subcommand
-.
 .SH "SYNOPSIS"
 \fBbundle help\fR [COMMAND]
-.
 .SH "DESCRIPTION"
 Displays detailed help for the given subcommand\. You can specify a single \fBCOMMAND\fR at the same time\. When \fBCOMMAND\fR is omitted, help for \fBhelp\fR command will be displayed\.
diff --git a/lib/bundler/man/bundle-info.1 b/lib/bundler/man/bundle-info.1
index 2cced715202743..435518e120fe73 100644
--- a/lib/bundler/man/bundle-info.1
+++ b/lib/bundler/man/bundle-info.1
@@ -1,20 +1,17 @@
-.\" generated with Ronn/v0.7.3
-.\" http://github.com/rtomayko/ronn/tree/0.7.3
-.
-.TH "BUNDLE\-INFO" "1" "August 2023" "" ""
-.
+.\" generated with Ronn-NG/v0.10.1
+.\" http://github.com/apjanke/ronn-ng/tree/0.10.1
+.TH "BUNDLE\-INFO" "1" "July 2025" ""
 .SH "NAME"
 \fBbundle\-info\fR \- Show information for the given gem in your bundle
-.
 .SH "SYNOPSIS"
-\fBbundle info\fR [GEM_NAME] [\-\-path]
-.
+\fBbundle info\fR [GEM_NAME] [\-\-path] [\-\-version]
 .SH "DESCRIPTION"
 Given a gem name present in your bundle, print the basic information about it such as homepage, version, path and summary\.
-.
 .SH "OPTIONS"
-.
 .TP
 \fB\-\-path\fR
 Print the path of the given gem
+.TP
+\fB\-\-version\fR
+Print gem version
 
diff --git a/lib/bundler/man/bundle-info.1.ronn b/lib/bundler/man/bundle-info.1.ronn
index cecdeb564f4586..e99db8c6149c8d 100644
--- a/lib/bundler/man/bundle-info.1.ronn
+++ b/lib/bundler/man/bundle-info.1.ronn
@@ -1,10 +1,11 @@
 bundle-info(1) -- Show information for the given gem in your bundle
-=========================================================================
+===================================================================
 
 ## SYNOPSIS
 
 `bundle info` [GEM_NAME]
               [--path]
+              [--version]
 
 ## DESCRIPTION
 
@@ -14,4 +15,7 @@ Given a gem name present in your bundle, print the basic information about it
 ## OPTIONS
 
 * `--path`:
-Print the path of the given gem
+  Print the path of the given gem
+
+* `--version`:
+  Print gem version
diff --git a/lib/bundler/man/bundle-init.1 b/lib/bundler/man/bundle-init.1
index c7a9a155b53127..48b3232b8cba2a 100644
--- a/lib/bundler/man/bundle-init.1
+++ b/lib/bundler/man/bundle-init.1
@@ -1,29 +1,20 @@
-.\" generated with Ronn/v0.7.3
-.\" http://github.com/rtomayko/ronn/tree/0.7.3
-.
-.TH "BUNDLE\-INIT" "1" "August 2023" "" ""
-.
+.\" generated with Ronn-NG/v0.10.1
+.\" http://github.com/apjanke/ronn-ng/tree/0.10.1
+.TH "BUNDLE\-INIT" "1" "July 2025" ""
 .SH "NAME"
 \fBbundle\-init\fR \- Generates a Gemfile into the current working directory
-.
 .SH "SYNOPSIS"
 \fBbundle init\fR [\-\-gemspec=FILE]
-.
 .SH "DESCRIPTION"
 Init generates a default [\fBGemfile(5)\fR][Gemfile(5)] in the current working directory\. When adding a [\fBGemfile(5)\fR][Gemfile(5)] to a gem with a gemspec, the \fB\-\-gemspec\fR option will automatically add each dependency listed in the gemspec file to the newly created [\fBGemfile(5)\fR][Gemfile(5)]\.
-.
 .SH "OPTIONS"
-.
 .TP
-\fB\-\-gemspec\fR
+\fB\-\-gemspec=GEMSPEC\fR
 Use the specified \.gemspec to create the [\fBGemfile(5)\fR][Gemfile(5)]
-.
 .TP
-\fB\-\-gemfile\fR
+\fB\-\-gemfile=GEMFILE\fR
 Use the specified name for the gemfile instead of \fBGemfile\fR
-.
 .SH "FILES"
 Included in the default [\fBGemfile(5)\fR][Gemfile(5)] generated is the line \fB# frozen_string_literal: true\fR\. This is a magic comment supported for the first time in Ruby 2\.3\. The presence of this line results in all string literals in the file being implicitly frozen\.
-.
 .SH "SEE ALSO"
 Gemfile(5) \fIhttps://bundler\.io/man/gemfile\.5\.html\fR
diff --git a/lib/bundler/man/bundle-init.1.ronn b/lib/bundler/man/bundle-init.1.ronn
index 7d3cede1f61945..ab3c427b52ce06 100644
--- a/lib/bundler/man/bundle-init.1.ronn
+++ b/lib/bundler/man/bundle-init.1.ronn
@@ -14,9 +14,10 @@ created [`Gemfile(5)`][Gemfile(5)].
 
 ## OPTIONS
 
-* `--gemspec`:
+* `--gemspec=GEMSPEC`:
   Use the specified .gemspec to create the [`Gemfile(5)`][Gemfile(5)]
-* `--gemfile`:
+
+* `--gemfile=GEMFILE`:
   Use the specified name for the gemfile instead of `Gemfile`
 
 ## FILES
diff --git a/lib/bundler/man/bundle-inject.1 b/lib/bundler/man/bundle-inject.1
index 9e25c290858c69..abc63c392e525c 100644
--- a/lib/bundler/man/bundle-inject.1
+++ b/lib/bundler/man/bundle-inject.1
@@ -1,36 +1,31 @@
-.\" generated with Ronn/v0.7.3
-.\" http://github.com/rtomayko/ronn/tree/0.7.3
-.
-.TH "BUNDLE\-INJECT" "1" "August 2023" "" ""
-.
+.\" generated with Ronn-NG/v0.10.1
+.\" http://github.com/apjanke/ronn-ng/tree/0.10.1
+.TH "BUNDLE\-INJECT" "1" "July 2025" ""
 .SH "NAME"
 \fBbundle\-inject\fR \- Add named gem(s) with version requirements to Gemfile
-.
 .SH "SYNOPSIS"
-\fBbundle inject\fR [GEM] [VERSION]
-.
+\fBbundle inject\fR [GEM] [VERSION] [\-\-source=SOURCE] [\-\-group=GROUP]
 .SH "DESCRIPTION"
 Adds the named gem(s) with their version requirements to the resolved [\fBGemfile(5)\fR][Gemfile(5)]\.
-.
 .P
-This command will add the gem to both your [\fBGemfile(5)\fR][Gemfile(5)] and Gemfile\.lock if it isn\'t listed yet\.
-.
+This command will add the gem to both your [\fBGemfile(5)\fR][Gemfile(5)] and Gemfile\.lock if it isn't listed yet\.
 .P
 Example:
-.
 .IP "" 4
-.
 .nf
-
 bundle install
-bundle inject \'rack\' \'> 0\'
-.
+bundle inject 'rack' '> 0'
 .fi
-.
 .IP "" 0
-.
 .P
-This will inject the \'rack\' gem with a version greater than 0 in your [\fBGemfile(5)\fR][Gemfile(5)] and Gemfile\.lock\.
-.
+This will inject the 'rack' gem with a version greater than 0 in your [\fBGemfile(5)\fR][Gemfile(5)] and Gemfile\.lock\.
 .P
-The \fBbundle inject\fR command was deprecated in Bundler 2\.1 and will be removed in Bundler 3\.0\.
+The \fBbundle inject\fR command was deprecated in Bundler 2\.1 and will be removed in Bundler 4\.0\.
+.SH "OPTIONS"
+.TP
+\fB\-\-source=SOURCE\fR
+Install gem from the given source\.
+.TP
+\fB\-\-group=GROUP\fR
+Install gem into a bundler group\.
+
diff --git a/lib/bundler/man/bundle-inject.1.ronn b/lib/bundler/man/bundle-inject.1.ronn
index 95704eddadd36c..7f6f0fb5b6541b 100644
--- a/lib/bundler/man/bundle-inject.1.ronn
+++ b/lib/bundler/man/bundle-inject.1.ronn
@@ -3,7 +3,7 @@ bundle-inject(1) -- Add named gem(s) with version requirements to Gemfile
 
 ## SYNOPSIS
 
-`bundle inject` [GEM] [VERSION]
+`bundle inject` [GEM] [VERSION] [--source=SOURCE] [--group=GROUP]
 
 ## DESCRIPTION
 
@@ -21,4 +21,12 @@ Example:
 This will inject the 'rack' gem with a version greater than 0 in your
 [`Gemfile(5)`][Gemfile(5)] and Gemfile.lock.
 
-The `bundle inject` command was deprecated in Bundler 2.1 and will be removed in Bundler 3.0.
+The `bundle inject` command was deprecated in Bundler 2.1 and will be removed in Bundler 4.0.
+
+## OPTIONS
+
+* `--source=SOURCE`:
+  Install gem from the given source.
+
+* `--group=GROUP`:
+  Install gem into a bundler group.
diff --git a/lib/bundler/man/bundle-install.1 b/lib/bundler/man/bundle-install.1
index 337683af064d3e..a9bd751994e558 100644
--- a/lib/bundler/man/bundle-install.1
+++ b/lib/bundler/man/bundle-install.1
@@ -1,313 +1,218 @@
-.\" generated with Ronn/v0.7.3
-.\" http://github.com/rtomayko/ronn/tree/0.7.3
-.
-.TH "BUNDLE\-INSTALL" "1" "August 2023" "" ""
-.
+.\" generated with Ronn-NG/v0.10.1
+.\" http://github.com/apjanke/ronn-ng/tree/0.10.1
+.TH "BUNDLE\-INSTALL" "1" "July 2025" ""
 .SH "NAME"
 \fBbundle\-install\fR \- Install the dependencies specified in your Gemfile
-.
 .SH "SYNOPSIS"
-\fBbundle install\fR [\-\-binstubs[=DIRECTORY]] [\-\-clean] [\-\-deployment] [\-\-frozen] [\-\-full\-index] [\-\-gemfile=GEMFILE] [\-\-jobs=NUMBER] [\-\-local] [\-\-no\-cache] [\-\-no\-prune] [\-\-path PATH] [\-\-quiet] [\-\-redownload] [\-\-retry=NUMBER] [\-\-shebang] [\-\-standalone[=GROUP[ GROUP\.\.\.]]] [\-\-system] [\-\-trust\-policy=POLICY] [\-\-with=GROUP[ GROUP\.\.\.]] [\-\-without=GROUP[ GROUP\.\.\.]]
-.
+\fBbundle install\fR [\-\-binstubs[=DIRECTORY]] [\-\-clean] [\-\-deployment] [\-\-frozen] [\-\-full\-index] [\-\-gemfile=GEMFILE] [\-\-jobs=NUMBER] [\-\-local] [\-\-no\-cache] [\-\-no\-prune] [\-\-path PATH] [\-\-prefer\-local] [\-\-quiet] [\-\-redownload] [\-\-retry=NUMBER] [\-\-shebang=SHEBANG] [\-\-standalone[=GROUP[ GROUP\|\.\|\.\|\.]]] [\-\-system] [\-\-trust\-policy=TRUST\-POLICY] [\-\-target\-rbconfig=TARGET\-RBCONFIG] [\-\-with=GROUP[ GROUP\|\.\|\.\|\.]] [\-\-without=GROUP[ GROUP\|\.\|\.\|\.]]
 .SH "DESCRIPTION"
 Install the gems specified in your Gemfile(5)\. If this is the first time you run bundle install (and a \fBGemfile\.lock\fR does not exist), Bundler will fetch all remote sources, resolve dependencies and install all needed gems\.
-.
 .P
 If a \fBGemfile\.lock\fR does exist, and you have not updated your Gemfile(5), Bundler will fetch all remote sources, but use the dependencies specified in the \fBGemfile\.lock\fR instead of resolving dependencies\.
-.
 .P
 If a \fBGemfile\.lock\fR does exist, and you have updated your Gemfile(5), Bundler will use the dependencies in the \fBGemfile\.lock\fR for all gems that you did not update, but will re\-resolve the dependencies of gems that you did update\. You can find more information about this update process below under \fICONSERVATIVE UPDATING\fR\.
-.
 .SH "OPTIONS"
 The \fB\-\-clean\fR, \fB\-\-deployment\fR, \fB\-\-frozen\fR, \fB\-\-no\-prune\fR, \fB\-\-path\fR, \fB\-\-shebang\fR, \fB\-\-system\fR, \fB\-\-without\fR and \fB\-\-with\fR options are deprecated because they only make sense if they are applied to every subsequent \fBbundle install\fR run automatically and that requires \fBbundler\fR to silently remember them\. Since \fBbundler\fR will no longer remember CLI flags in future versions, \fBbundle config\fR (see bundle\-config(1)) should be used to apply them permanently\.
-.
 .TP
-\fB\-\-binstubs[=<directory>]\fR
+\fB\-\-binstubs[=BINSTUBS]\fR
 Binstubs are scripts that wrap around executables\. Bundler creates a small Ruby file (a binstub) that loads Bundler, runs the command, and puts it in \fBbin/\fR\. This lets you link the binstub inside of an application to the exact gem version the application needs\.
-.
 .IP
-Creates a directory (defaults to \fB~/bin\fR) and places any executables from the gem there\. These executables run in Bundler\'s context\. If used, you might add this directory to your environment\'s \fBPATH\fR variable\. For instance, if the \fBrails\fR gem comes with a \fBrails\fR executable, this flag will create a \fBbin/rails\fR executable that ensures that all referred dependencies will be resolved using the bundled gems\.
-.
+Creates a directory (defaults to \fB~/bin\fR when the option is used without a value, or to the given \fB<BINSTUBS>\fR directory otherwise) and places any executables from the gem there\. These executables run in Bundler's context\. If used, you might add this directory to your environment's \fBPATH\fR variable\. For instance, if the \fBrails\fR gem comes with a \fBrails\fR executable, this flag will create a \fBbin/rails\fR executable that ensures that all referred dependencies will be resolved using the bundled gems\.
 .TP
 \fB\-\-clean\fR
-On finishing the installation Bundler is going to remove any gems not present in the current Gemfile(5)\. Don\'t worry, gems currently in use will not be removed\.
-.
+On finishing the installation Bundler is going to remove any gems not present in the current Gemfile(5)\. Don't worry, gems currently in use will not be removed\.
 .IP
 This option is deprecated in favor of the \fBclean\fR setting\.
-.
 .TP
 \fB\-\-deployment\fR
-In \fIdeployment mode\fR, Bundler will \'roll\-out\' the bundle for production or CI use\. Please check carefully if you want to have this option enabled in your development environment\.
-.
+In \fIdeployment mode\fR, Bundler will 'roll\-out' the bundle for production or CI use\. Please check carefully if you want to have this option enabled in your development environment\.
 .IP
 This option is deprecated in favor of the \fBdeployment\fR setting\.
-.
 .TP
-\fB\-\-redownload\fR
+\fB\-\-redownload\fR, \fB\-\-force\fR
 Force download every gem, even if the required versions are already available locally\.
-.
 .TP
 \fB\-\-frozen\fR
 Do not allow the Gemfile\.lock to be updated after this install\. Exits non\-zero if there are going to be changes to the Gemfile\.lock\.
-.
 .IP
 This option is deprecated in favor of the \fBfrozen\fR setting\.
-.
 .TP
 \fB\-\-full\-index\fR
-Bundler will not call Rubygems\' API endpoint (default) but download and cache a (currently big) index file of all gems\. Performance can be improved for large bundles that seldom change by enabling this option\.
-.
+Bundler will not call Rubygems' API endpoint (default) but download and cache a (currently big) index file of all gems\. Performance can be improved for large bundles that seldom change by enabling this option\.
 .TP
-\fB\-\-gemfile=<gemfile>\fR
-The location of the Gemfile(5) which Bundler should use\. This defaults to a Gemfile(5) in the current working directory\. In general, Bundler will assume that the location of the Gemfile(5) is also the project\'s root and will try to find \fBGemfile\.lock\fR and \fBvendor/cache\fR relative to this location\.
-.
+\fB\-\-gemfile=GEMFILE\fR
+The location of the Gemfile(5) which Bundler should use\. This defaults to a Gemfile(5) in the current working directory\. In general, Bundler will assume that the location of the Gemfile(5) is also the project's root and will try to find \fBGemfile\.lock\fR and \fBvendor/cache\fR relative to this location\.
 .TP
-\fB\-\-jobs=[<number>]\fR, \fB\-j[<number>]\fR
+\fB\-\-jobs=<number>\fR, \fB\-j=<number>\fR
 The maximum number of parallel download and install jobs\. The default is the number of available processors\.
-.
 .TP
 \fB\-\-local\fR
-Do not attempt to connect to \fBrubygems\.org\fR\. Instead, Bundler will use the gems already present in Rubygems\' cache or in \fBvendor/cache\fR\. Note that if an appropriate platform\-specific gem exists on \fBrubygems\.org\fR it will not be found\.
-.
+Do not attempt to connect to \fBrubygems\.org\fR\. Instead, Bundler will use the gems already present in Rubygems' cache or in \fBvendor/cache\fR\. Note that if an appropriate platform\-specific gem exists on \fBrubygems\.org\fR it will not be found\.
 .TP
 \fB\-\-prefer\-local\fR
-Force using locally installed gems, or gems already present in Rubygems\' cache or in \fBvendor/cache\fR, when resolving, even if newer versions are available remotely\. Only attempt to connect to \fBrubygems\.org\fR for gems that are not present locally\.
-.
+Force using locally installed gems, or gems already present in Rubygems' cache or in \fBvendor/cache\fR, when resolving, even if newer versions are available remotely\. Only attempt to connect to \fBrubygems\.org\fR for gems that are not present locally\.
 .TP
 \fB\-\-no\-cache\fR
 Do not update the cache in \fBvendor/cache\fR with the newly bundled gems\. This does not remove any gems in the cache but keeps the newly bundled gems from being cached during the install\.
-.
 .TP
 \fB\-\-no\-prune\fR
-Don\'t remove stale gems from the cache when the installation finishes\.
-.
+Don't remove stale gems from the cache when the installation finishes\.
 .IP
 This option is deprecated in favor of the \fBno_prune\fR setting\.
-.
 .TP
-\fB\-\-path=<path>\fR
-The location to install the specified gems to\. This defaults to Rubygems\' setting\. Bundler shares this location with Rubygems, \fBgem install \.\.\.\fR will have gem installed there, too\. Therefore, gems installed without a \fB\-\-path \.\.\.\fR setting will show up by calling \fBgem list\fR\. Accordingly, gems installed to other locations will not get listed\.
-.
+\fB\-\-path=PATH\fR
+The location to install the specified gems to\. This defaults to Rubygems' setting\. Bundler shares this location with Rubygems, \fBgem install \|\.\|\.\|\.\fR will have gem installed there, too\. Therefore, gems installed without a \fB\-\-path \|\.\|\.\|\.\fR setting will show up by calling \fBgem list\fR\. Accordingly, gems installed to other locations will not get listed\.
 .IP
 This option is deprecated in favor of the \fBpath\fR setting\.
-.
 .TP
 \fB\-\-quiet\fR
-Do not print progress information to the standard output\. Instead, Bundler will exit using a status code (\fB$?\fR)\.
-.
+Do not print progress information to the standard output\.
 .TP
 \fB\-\-retry=[<number>]\fR
 Retry failed network or git requests for \fInumber\fR times\.
-.
 .TP
-\fB\-\-shebang=<ruby\-executable>\fR
+\fB\-\-shebang=SHEBANG\fR
 Uses the specified ruby executable (usually \fBruby\fR) to execute the scripts created with \fB\-\-binstubs\fR\. In addition, if you use \fB\-\-binstubs\fR together with \fB\-\-shebang jruby\fR these executables will be changed to execute \fBjruby\fR instead\.
-.
 .IP
 This option is deprecated in favor of the \fBshebang\fR setting\.
-.
 .TP
 \fB\-\-standalone[=<list>]\fR
-Makes a bundle that can work without depending on Rubygems or Bundler at runtime\. A space separated list of groups to install has to be specified\. Bundler creates a directory named \fBbundle\fR and installs the bundle there\. It also generates a \fBbundle/bundler/setup\.rb\fR file to replace Bundler\'s own setup in the manner required\. Using this option implicitly sets \fBpath\fR, which is a [remembered option][REMEMBERED OPTIONS]\.
-.
+Makes a bundle that can work without depending on Rubygems or Bundler at runtime\. A space separated list of groups to install can be specified\. Bundler creates a directory named \fBbundle\fR and installs the bundle there\. It also generates a \fBbundle/bundler/setup\.rb\fR file to replace Bundler's own setup in the manner required\. Using this option implicitly sets \fBpath\fR, which is a [remembered option][REMEMBERED OPTIONS]\.
 .TP
 \fB\-\-system\fR
-Installs the gems specified in the bundle to the system\'s Rubygems location\. This overrides any previous configuration of \fB\-\-path\fR\.
-.
+Installs the gems specified in the bundle to the system's Rubygems location\. This overrides any previous configuration of \fB\-\-path\fR\.
 .IP
 This option is deprecated in favor of the \fBsystem\fR setting\.
-.
 .TP
-\fB\-\-trust\-policy=[<policy>]\fR
+\fB\-\-trust\-policy=TRUST\-POLICY\fR
 Apply the Rubygems security policy \fIpolicy\fR, where policy is one of \fBHighSecurity\fR, \fBMediumSecurity\fR, \fBLowSecurity\fR, \fBAlmostNoSecurity\fR, or \fBNoSecurity\fR\. For more details, please see the Rubygems signing documentation linked below in \fISEE ALSO\fR\.
-.
+.TP
+\fB\-\-target\-rbconfig=TARGET\-RBCONFIG\fR
+Path to rbconfig\.rb for the deployment target platform\.
 .TP
 \fB\-\-with=<list>\fR
 A space\-separated list of groups referencing gems to install\. If an optional group is given it is installed\. If a group is given that is in the remembered list of groups given to \-\-without, it is removed from that list\.
-.
 .IP
 This option is deprecated in favor of the \fBwith\fR setting\.
-.
 .TP
 \fB\-\-without=<list>\fR
 A space\-separated list of groups referencing gems to skip during installation\. If a group is given that is in the remembered list of groups given to \-\-with, it is removed from that list\.
-.
 .IP
 This option is deprecated in favor of the \fBwithout\fR setting\.
-.
 .SH "DEPLOYMENT MODE"
-Bundler\'s defaults are optimized for development\. To switch to defaults optimized for deployment and for CI, use the \fB\-\-deployment\fR flag\. Do not activate deployment mode on development machines, as it will cause an error when the Gemfile(5) is modified\.
-.
+Bundler's defaults are optimized for development\. To switch to defaults optimized for deployment and for CI, use the \fB\-\-deployment\fR flag\. Do not activate deployment mode on development machines, as it will cause an error when the Gemfile(5) is modified\.
 .IP "1." 4
 A \fBGemfile\.lock\fR is required\.
-.
 .IP
 To ensure that the same versions of the gems you developed with and tested with are also used in deployments, a \fBGemfile\.lock\fR is required\.
-.
 .IP
 This is mainly to ensure that you remember to check your \fBGemfile\.lock\fR into version control\.
-.
 .IP "2." 4
 The \fBGemfile\.lock\fR must be up to date
-.
 .IP
 In development, you can modify your Gemfile(5) and re\-run \fBbundle install\fR to \fIconservatively update\fR your \fBGemfile\.lock\fR snapshot\.
-.
 .IP
 In deployment, your \fBGemfile\.lock\fR should be up\-to\-date with changes made in your Gemfile(5)\.
-.
 .IP "3." 4
 Gems are installed to \fBvendor/bundle\fR not your default system location
-.
 .IP
-In development, it\'s convenient to share the gems used in your application with other applications and other scripts that run on the system\.
-.
+In development, it's convenient to share the gems used in your application with other applications and other scripts that run on the system\.
 .IP
 In deployment, isolation is a more important default\. In addition, the user deploying the application may not have permission to install gems to the system, or the web server may not have permission to read them\.
-.
 .IP
 As a result, \fBbundle install \-\-deployment\fR installs gems to the \fBvendor/bundle\fR directory in the application\. This may be overridden using the \fB\-\-path\fR option\.
-.
 .IP "" 0
-.
 .SH "INSTALLING GROUPS"
 By default, \fBbundle install\fR will install all gems in all groups in your Gemfile(5), except those declared for a different platform\.
-.
 .P
 However, you can explicitly tell Bundler to skip installing certain groups with the \fB\-\-without\fR option\. This option takes a space\-separated list of groups\.
-.
 .P
 While the \fB\-\-without\fR option will skip \fIinstalling\fR the gems in the specified groups, it will still \fIdownload\fR those gems and use them to resolve the dependencies of every gem in your Gemfile(5)\.
-.
 .P
 This is so that installing a different set of groups on another machine (such as a production server) will not change the gems and versions that you have already developed and tested against\.
-.
 .P
 \fBBundler offers a rock\-solid guarantee that the third\-party code you are running in development and testing is also the third\-party code you are running in production\. You can choose to exclude some of that code in different environments, but you will never be caught flat\-footed by different versions of third\-party code being used in different environments\.\fR
-.
 .P
 For a simple illustration, consider the following Gemfile(5):
-.
 .IP "" 4
-.
 .nf
+source 'https://rubygems\.org'
 
-source \'https://rubygems\.org\'
-
-gem \'sinatra\'
+gem 'sinatra'
 
 group :production do
-  gem \'rack\-perftools\-profiler\'
+  gem 'rack\-perftools\-profiler'
 end
-.
 .fi
-.
 .IP "" 0
-.
 .P
 In this case, \fBsinatra\fR depends on any version of Rack (\fB>= 1\.0\fR), while \fBrack\-perftools\-profiler\fR depends on 1\.x (\fB~> 1\.0\fR)\.
-.
 .P
 When you run \fBbundle install \-\-without production\fR in development, we look at the dependencies of \fBrack\-perftools\-profiler\fR as well\. That way, you do not spend all your time developing against Rack 2\.0, using new APIs unavailable in Rack 1\.x, only to have Bundler switch to Rack 1\.2 when the \fBproduction\fR group \fIis\fR used\.
-.
 .P
 This should not cause any problems in practice, because we do not attempt to \fBinstall\fR the gems in the excluded groups, and only evaluate as part of the dependency resolution process\.
-.
 .P
 This also means that you cannot include different versions of the same gem in different groups, because doing so would result in different sets of dependencies used in development and production\. Because of the vagaries of the dependency resolution process, this usually affects more than the gems you list in your Gemfile(5), and can (surprisingly) radically change the gems you are using\.
-.
 .SH "THE GEMFILE\.LOCK"
 When you run \fBbundle install\fR, Bundler will persist the full names and versions of all gems that you used (including dependencies of the gems specified in the Gemfile(5)) into a file called \fBGemfile\.lock\fR\.
-.
 .P
 Bundler uses this file in all subsequent calls to \fBbundle install\fR, which guarantees that you always use the same exact code, even as your application moves across machines\.
-.
 .P
 Because of the way dependency resolution works, even a seemingly small change (for instance, an update to a point\-release of a dependency of a gem in your Gemfile(5)) can result in radically different gems being needed to satisfy all dependencies\.
-.
 .P
 As a result, you \fBSHOULD\fR check your \fBGemfile\.lock\fR into version control, in both applications and gems\. If you do not, every machine that checks out your repository (including your production server) will resolve all dependencies again, which will result in different versions of third\-party code being used if \fBany\fR of the gems in the Gemfile(5) or any of their dependencies have been updated\.
-.
 .P
 When Bundler first shipped, the \fBGemfile\.lock\fR was included in the \fB\.gitignore\fR file included with generated gems\. Over time, however, it became clear that this practice forces the pain of broken dependencies onto new contributors, while leaving existing contributors potentially unaware of the problem\. Since \fBbundle install\fR is usually the first step towards a contribution, the pain of broken dependencies would discourage new contributors from contributing\. As a result, we have revised our guidance for gem authors to now recommend checking in the lock for gems\.
-.
 .SH "CONSERVATIVE UPDATING"
 When you make a change to the Gemfile(5) and then run \fBbundle install\fR, Bundler will update only the gems that you modified\.
-.
 .P
 In other words, if a gem that you \fBdid not modify\fR worked before you called \fBbundle install\fR, it will continue to use the exact same versions of all dependencies as it used before the update\.
-.
 .P
-Let\'s take a look at an example\. Here\'s your original Gemfile(5):
-.
+Let's take a look at an example\. Here's your original Gemfile(5):
 .IP "" 4
-.
 .nf
+source 'https://rubygems\.org'
 
-source \'https://rubygems\.org\'
-
-gem \'actionpack\', \'2\.3\.8\'
-gem \'activemerchant\'
-.
+gem 'actionpack', '2\.3\.8'
+gem 'activemerchant'
 .fi
-.
 .IP "" 0
-.
 .P
 In this case, both \fBactionpack\fR and \fBactivemerchant\fR depend on \fBactivesupport\fR\. The \fBactionpack\fR gem depends on \fBactivesupport 2\.3\.8\fR and \fBrack ~> 1\.1\.0\fR, while the \fBactivemerchant\fR gem depends on \fBactivesupport >= 2\.3\.2\fR, \fBbraintree >= 2\.0\.0\fR, and \fBbuilder >= 2\.0\.0\fR\.
-.
 .P
 When the dependencies are first resolved, Bundler will select \fBactivesupport 2\.3\.8\fR, which satisfies the requirements of both gems in your Gemfile(5)\.
-.
 .P
 Next, you modify your Gemfile(5) to:
-.
 .IP "" 4
-.
 .nf
+source 'https://rubygems\.org'
 
-source \'https://rubygems\.org\'
-
-gem \'actionpack\', \'3\.0\.0\.rc\'
-gem \'activemerchant\'
-.
+gem 'actionpack', '3\.0\.0\.rc'
+gem 'activemerchant'
 .fi
-.
 .IP "" 0
-.
 .P
 The \fBactionpack 3\.0\.0\.rc\fR gem has a number of new dependencies, and updates the \fBactivesupport\fR dependency to \fB= 3\.0\.0\.rc\fR and the \fBrack\fR dependency to \fB~> 1\.2\.1\fR\.
-.
 .P
 When you run \fBbundle install\fR, Bundler notices that you changed the \fBactionpack\fR gem, but not the \fBactivemerchant\fR gem\. It evaluates the gems currently being used to satisfy its requirements:
-.
 .TP
 \fBactivesupport 2\.3\.8\fR
 also used to satisfy a dependency in \fBactivemerchant\fR, which is not being updated
-.
 .TP
 \fBrack ~> 1\.1\.0\fR
 not currently being used to satisfy another dependency
-.
 .P
 Because you did not explicitly ask to update \fBactivemerchant\fR, you would not expect it to suddenly stop working after updating \fBactionpack\fR\. However, satisfying the new \fBactivesupport 3\.0\.0\.rc\fR dependency of actionpack requires updating one of its dependencies\.
-.
 .P
 Even though \fBactivemerchant\fR declares a very loose dependency that theoretically matches \fBactivesupport 3\.0\.0\.rc\fR, Bundler treats gems in your Gemfile(5) that have not changed as an atomic unit together with their dependencies\. In this case, the \fBactivemerchant\fR dependency is treated as \fBactivemerchant 1\.7\.1 + activesupport 2\.3\.8\fR, so \fBbundle install\fR will report that it cannot update \fBactionpack\fR\.
-.
 .P
 To explicitly update \fBactionpack\fR, including its dependencies which other gems in the Gemfile(5) still depend on, run \fBbundle update actionpack\fR (see \fBbundle update(1)\fR)\.
-.
 .P
 \fBSummary\fR: In general, after making a change to the Gemfile(5) , you should first try to run \fBbundle install\fR, which will guarantee that no other gem in the Gemfile(5) is impacted by the change\. If that does not work, run bundle update(1) \fIbundle\-update\.1\.html\fR\.
-.
 .SH "SEE ALSO"
-.
 .IP "\(bu" 4
-Gem install docs \fIhttp://guides\.rubygems\.org/rubygems\-basics/#installing\-gems\fR
-.
+Gem install docs \fIhttps://guides\.rubygems\.org/rubygems\-basics/#installing\-gems\fR
 .IP "\(bu" 4
-Rubygems signing docs \fIhttp://guides\.rubygems\.org/security/\fR
-.
+Rubygems signing docs \fIhttps://guides\.rubygems\.org/security/\fR
 .IP "" 0
 
diff --git a/lib/bundler/man/bundle-install.1.ronn b/lib/bundler/man/bundle-install.1.ronn
index be9ed0f97422ac..a3606826dfce9a 100644
--- a/lib/bundler/man/bundle-install.1.ronn
+++ b/lib/bundler/man/bundle-install.1.ronn
@@ -14,13 +14,15 @@ bundle-install(1) -- Install the dependencies specified in your Gemfile
                  [--no-cache]
                  [--no-prune]
                  [--path PATH]
+                 [--prefer-local]
                  [--quiet]
                  [--redownload]
                  [--retry=NUMBER]
-                 [--shebang]
+                 [--shebang=SHEBANG]
                  [--standalone[=GROUP[ GROUP...]]]
                  [--system]
-                 [--trust-policy=POLICY]
+                 [--trust-policy=TRUST-POLICY]
+                 [--target-rbconfig=TARGET-RBCONFIG]
                  [--with=GROUP[ GROUP...]]
                  [--without=GROUP[ GROUP...]]
 
@@ -50,18 +52,19 @@ automatically and that requires `bundler` to silently remember them. Since
 `bundler` will no longer remember CLI flags in future versions, `bundle config`
 (see bundle-config(1)) should be used to apply them permanently.
 
-* `--binstubs[=<directory>]`:
+* `--binstubs[=BINSTUBS]`:
   Binstubs are scripts that wrap around executables. Bundler creates a small Ruby
   file (a binstub) that loads Bundler, runs the command, and puts it in `bin/`.
   This lets you link the binstub inside of an application to the exact gem
   version the application needs.
 
-  Creates a directory (defaults to `~/bin`) and places any executables from the
-  gem there. These executables run in Bundler's context. If used, you might add
-  this directory to your environment's `PATH` variable. For instance, if the
-  `rails` gem comes with a `rails` executable, this flag will create a
-  `bin/rails` executable that ensures that all referred dependencies will be
-  resolved using the bundled gems.
+  Creates a directory (defaults to `~/bin` when the option is used without a
+  value, or to the given `<BINSTUBS>` directory otherwise) and places any
+  executables from the gem there. These executables run in Bundler's context. If
+  used, you might add this directory to your environment's `PATH` variable. For
+  instance, if the `rails` gem comes with a `rails` executable, this flag will
+  create a `bin/rails` executable that ensures that all referred dependencies
+  will be resolved using the bundled gems.
 
 * `--clean`:
   On finishing the installation Bundler is going to remove any gems not present
@@ -77,7 +80,7 @@ automatically and that requires `bundler` to silently remember them. Since
 
   This option is deprecated in favor of the `deployment` setting.
 
-* `--redownload`:
+* `--redownload`, `--force`:
   Force download every gem, even if the required versions are already available
   locally.
 
@@ -92,14 +95,14 @@ automatically and that requires `bundler` to silently remember them. Since
   a (currently big) index file of all gems. Performance can be improved for
   large bundles that seldom change by enabling this option.
 
-* `--gemfile=<gemfile>`:
+* `--gemfile=GEMFILE`:
   The location of the Gemfile(5) which Bundler should use. This defaults
   to a Gemfile(5) in the current working directory. In general, Bundler
   will assume that the location of the Gemfile(5) is also the project's
   root and will try to find `Gemfile.lock` and `vendor/cache` relative
   to this location.
 
-* `--jobs=[<number>]`, `-j[<number>]`:
+* `--jobs=<number>`, `-j=<number>`:
   The maximum number of parallel download and install jobs. The default is the
   number of available processors.
 
@@ -125,7 +128,7 @@ automatically and that requires `bundler` to silently remember them. Since
 
   This option is deprecated in favor of the `no_prune` setting.
 
-* `--path=<path>`:
+* `--path=PATH`:
   The location to install the specified gems to. This defaults to Rubygems'
   setting. Bundler shares this location with Rubygems, `gem install ...` will
   have gem installed there, too. Therefore, gems installed without a
@@ -135,13 +138,12 @@ automatically and that requires `bundler` to silently remember them. Since
   This option is deprecated in favor of the `path` setting.
 
 * `--quiet`:
-  Do not print progress information to the standard output. Instead, Bundler
-  will exit using a status code (`$?`).
+  Do not print progress information to the standard output.
 
 * `--retry=[<number>]`:
   Retry failed network or git requests for <number> times.
 
-* `--shebang=<ruby-executable>`:
+* `--shebang=SHEBANG`:
   Uses the specified ruby executable (usually `ruby`) to execute the scripts
   created with `--binstubs`. In addition, if you use `--binstubs` together with
   `--shebang jruby` these executables will be changed to execute `jruby`
@@ -151,7 +153,7 @@ automatically and that requires `bundler` to silently remember them. Since
 
 * `--standalone[=<list>]`:
   Makes a bundle that can work without depending on Rubygems or Bundler at
-  runtime. A space separated list of groups to install has to be specified.
+  runtime. A space separated list of groups to install can be specified.
   Bundler creates a directory named `bundle` and installs the bundle there. It
   also generates a `bundle/bundler/setup.rb` file to replace Bundler's own setup
   in the manner required. Using this option implicitly sets `path`, which is a
@@ -163,12 +165,15 @@ automatically and that requires `bundler` to silently remember them. Since
 
   This option is deprecated in favor of the `system` setting.
 
-* `--trust-policy=[<policy>]`:
+* `--trust-policy=TRUST-POLICY`:
   Apply the Rubygems security policy <policy>, where policy is one of
   `HighSecurity`, `MediumSecurity`, `LowSecurity`, `AlmostNoSecurity`, or
   `NoSecurity`. For more details, please see the Rubygems signing documentation
   linked below in [SEE ALSO][].
 
+* `--target-rbconfig=TARGET-RBCONFIG`:
+  Path to rbconfig.rb for the deployment target platform.
+
 * `--with=<list>`:
   A space-separated list of groups referencing gems to install. If an
   optional group is given it is installed. If a group is given that is
@@ -378,5 +383,5 @@ does not work, run [bundle update(1)](bundle-update.1.html).
 
 ## SEE ALSO
 
-* [Gem install docs](http://guides.rubygems.org/rubygems-basics/#installing-gems)
-* [Rubygems signing docs](http://guides.rubygems.org/security/)
+* [Gem install docs](https://guides.rubygems.org/rubygems-basics/#installing-gems)
+* [Rubygems signing docs](https://guides.rubygems.org/security/)
diff --git a/lib/bundler/man/bundle-issue.1 b/lib/bundler/man/bundle-issue.1
new file mode 100644
index 00000000000000..668da5712f7cd9
--- /dev/null
+++ b/lib/bundler/man/bundle-issue.1
@@ -0,0 +1,45 @@
+.\" generated with Ronn-NG/v0.10.1
+.\" http://github.com/apjanke/ronn-ng/tree/0.10.1
+.TH "BUNDLE\-ISSUE" "1" "July 2025" ""
+.SH "NAME"
+\fBbundle\-issue\fR \- Get help reporting Bundler issues
+.SH "SYNOPSIS"
+\fBbundle issue\fR
+.SH "DESCRIPTION"
+Provides guidance on reporting Bundler issues and outputs detailed system information that should be included when filing a bug report\. This command:
+.IP "1." 4
+Displays links to troubleshooting resources
+.IP "2." 4
+Shows instructions for reporting issues
+.IP "3." 4
+Outputs comprehensive environment information needed for debugging
+.IP "" 0
+.P
+The command helps ensure that bug reports include all necessary system details for effective troubleshooting\.
+.SH "OUTPUT"
+The command outputs several sections:
+.IP "\(bu" 4
+Troubleshooting links and resources
+.IP "\(bu" 4
+Link to the GitHub issue template
+.IP "\(bu" 4
+Environment information including: Bundler version and platforms, Ruby version and configuration, RubyGems version and paths, Development tool versions (Git, RVM, rbenv, chruby)
+.IP "\(bu" 4
+Bundler build metadata
+.IP "\(bu" 4
+Current Bundler settings
+.IP "\(bu" 4
+Bundle Doctor output
+.IP "" 0
+.SH "EXAMPLES"
+Get issue reporting information:
+.IP "" 4
+.nf
+$ bundle issue
+.fi
+.IP "" 0
+.SH "SEE ALSO"
+.IP "\(bu" 4
+bundle\-doctor(1)
+.IP "" 0
+
diff --git a/lib/bundler/man/bundle-issue.1.ronn b/lib/bundler/man/bundle-issue.1.ronn
new file mode 100644
index 00000000000000..37f676a3542cfc
--- /dev/null
+++ b/lib/bundler/man/bundle-issue.1.ronn
@@ -0,0 +1,37 @@
+bundle-issue(1) -- Get help reporting Bundler issues
+====================================================
+
+## SYNOPSIS
+
+`bundle issue`
+
+## DESCRIPTION
+
+Provides guidance on reporting Bundler issues and outputs detailed system information that should be included when filing a bug report. This command:
+
+1. Displays links to troubleshooting resources
+2. Shows instructions for reporting issues
+3. Outputs comprehensive environment information needed for debugging
+
+The command helps ensure that bug reports include all necessary system details for effective troubleshooting.
+
+## OUTPUT
+
+The command outputs several sections:
+
+* Troubleshooting links and resources
+* Link to the GitHub issue template
+* Environment information including: Bundler version and platforms, Ruby version and configuration, RubyGems version and paths, Development tool versions (Git, RVM, rbenv, chruby)
+* Bundler build metadata
+* Current Bundler settings
+* Bundle Doctor output
+
+## EXAMPLES
+
+Get issue reporting information:
+
+    $ bundle issue
+
+## SEE ALSO
+
+* bundle-doctor(1)
diff --git a/lib/bundler/man/bundle-licenses.1 b/lib/bundler/man/bundle-licenses.1
new file mode 100644
index 00000000000000..cccb860854819b
--- /dev/null
+++ b/lib/bundler/man/bundle-licenses.1
@@ -0,0 +1,9 @@
+.\" generated with Ronn-NG/v0.10.1
+.\" http://github.com/apjanke/ronn-ng/tree/0.10.1
+.TH "BUNDLE\-LICENSES" "1" "July 2025" ""
+.SH "NAME"
+\fBbundle\-licenses\fR \- Print the license of all gems in the bundle
+.SH "SYNOPSIS"
+\fBbundle licenses\fR
+.SH "DESCRIPTION"
+Prints the license of all gems in the bundle\.
diff --git a/lib/bundler/man/bundle-licenses.1.ronn b/lib/bundler/man/bundle-licenses.1.ronn
new file mode 100644
index 00000000000000..91caba6c2ad6e2
--- /dev/null
+++ b/lib/bundler/man/bundle-licenses.1.ronn
@@ -0,0 +1,10 @@
+bundle-licenses(1) -- Print the license of all gems in the bundle
+=================================================================
+
+## SYNOPSIS
+
+`bundle licenses`
+
+## DESCRIPTION
+
+Prints the license of all gems in the bundle.
diff --git a/lib/bundler/man/bundle-list.1 b/lib/bundler/man/bundle-list.1
index 1680e6007a029e..26c2833218093a 100644
--- a/lib/bundler/man/bundle-list.1
+++ b/lib/bundler/man/bundle-list.1
@@ -1,49 +1,34 @@
-.\" generated with Ronn/v0.7.3
-.\" http://github.com/rtomayko/ronn/tree/0.7.3
-.
-.TH "BUNDLE\-LIST" "1" "August 2023" "" ""
-.
+.\" generated with Ronn-NG/v0.10.1
+.\" http://github.com/apjanke/ronn-ng/tree/0.10.1
+.TH "BUNDLE\-LIST" "1" "July 2025" ""
 .SH "NAME"
 \fBbundle\-list\fR \- List all the gems in the bundle
-.
 .SH "SYNOPSIS"
-\fBbundle list\fR [\-\-name\-only] [\-\-paths] [\-\-without\-group=GROUP[ GROUP\.\.\.]] [\-\-only\-group=GROUP[ GROUP\.\.\.]]
-.
+\fBbundle list\fR [\-\-name\-only] [\-\-paths] [\-\-without\-group=GROUP[ GROUP\|\.\|\.\|\.]] [\-\-only\-group=GROUP[ GROUP\|\.\|\.\|\.]]
 .SH "DESCRIPTION"
 Prints a list of all the gems in the bundle including their version\.
-.
 .P
 Example:
-.
 .P
 bundle list \-\-name\-only
-.
 .P
 bundle list \-\-paths
-.
 .P
 bundle list \-\-without\-group test
-.
 .P
 bundle list \-\-only\-group dev
-.
 .P
 bundle list \-\-only\-group dev test \-\-paths
-.
 .SH "OPTIONS"
-.
 .TP
 \fB\-\-name\-only\fR
 Print only the name of each gem\.
-.
 .TP
 \fB\-\-paths\fR
 Print the path to each gem in the bundle\.
-.
 .TP
 \fB\-\-without\-group=<list>\fR
 A space\-separated list of groups of gems to skip during printing\.
-.
 .TP
 \fB\-\-only\-group=<list>\fR
 A space\-separated list of groups of gems to print\.
diff --git a/lib/bundler/man/bundle-list.1.ronn b/lib/bundler/man/bundle-list.1.ronn
index dc058ecd5fd766..81bee0ac332047 100644
--- a/lib/bundler/man/bundle-list.1.ronn
+++ b/lib/bundler/man/bundle-list.1.ronn
@@ -1,5 +1,5 @@
 bundle-list(1) -- List all the gems in the bundle
-=========================================================================
+=================================================
 
 ## SYNOPSIS
 
@@ -25,9 +25,12 @@ bundle list --only-group dev test --paths
 
 * `--name-only`:
   Print only the name of each gem.
+
 * `--paths`:
   Print the path to each gem in the bundle.
+
 * `--without-group=<list>`:
   A space-separated list of groups of gems to skip during printing.
+
 * `--only-group=<list>`:
   A space-separated list of groups of gems to print.
diff --git a/lib/bundler/man/bundle-lock.1 b/lib/bundler/man/bundle-lock.1
index 8722c44b3d7d0b..5faa46da180afb 100644
--- a/lib/bundler/man/bundle-lock.1
+++ b/lib/bundler/man/bundle-lock.1
@@ -1,84 +1,75 @@
-.\" generated with Ronn/v0.7.3
-.\" http://github.com/rtomayko/ronn/tree/0.7.3
-.
-.TH "BUNDLE\-LOCK" "1" "August 2023" "" ""
-.
+.\" generated with Ronn-NG/v0.10.1
+.\" http://github.com/apjanke/ronn-ng/tree/0.10.1
+.TH "BUNDLE\-LOCK" "1" "July 2025" ""
 .SH "NAME"
 \fBbundle\-lock\fR \- Creates / Updates a lockfile without installing
-.
 .SH "SYNOPSIS"
-\fBbundle lock\fR [\-\-update] [\-\-local] [\-\-print] [\-\-lockfile=PATH] [\-\-full\-index] [\-\-add\-platform] [\-\-remove\-platform] [\-\-patch] [\-\-minor] [\-\-major] [\-\-strict] [\-\-conservative]
-.
+\fBbundle lock\fR [\-\-update] [\-\-bundler[=BUNDLER]] [\-\-local] [\-\-print] [\-\-lockfile=PATH] [\-\-full\-index] [\-\-gemfile=GEMFILE] [\-\-add\-checksums] [\-\-add\-platform] [\-\-remove\-platform] [\-\-normalize\-platforms] [\-\-patch] [\-\-minor] [\-\-major] [\-\-pre] [\-\-strict] [\-\-conservative]
 .SH "DESCRIPTION"
 Lock the gems specified in Gemfile\.
-.
 .SH "OPTIONS"
-.
 .TP
-\fB\-\-update=<*gems>\fR
+\fB\-\-update[=<list>]\fR
 Ignores the existing lockfile\. Resolve then updates lockfile\. Taking a list of gems or updating all gems if no list is given\.
-.
+.TP
+\fB\-\-bundler[=BUNDLER]\fR
+Update the locked version of bundler to the given version or the latest version if no version is given\.
 .TP
 \fB\-\-local\fR
-Do not attempt to connect to \fBrubygems\.org\fR\. Instead, Bundler will use the gems already present in Rubygems\' cache or in \fBvendor/cache\fR\. Note that if a appropriate platform\-specific gem exists on \fBrubygems\.org\fR it will not be found\.
-.
+Do not attempt to connect to \fBrubygems\.org\fR\. Instead, Bundler will use the gems already present in Rubygems' cache or in \fBvendor/cache\fR\. Note that if a appropriate platform\-specific gem exists on \fBrubygems\.org\fR it will not be found\.
 .TP
 \fB\-\-print\fR
 Prints the lockfile to STDOUT instead of writing to the file system\.
-.
 .TP
-\fB\-\-lockfile=<path>\fR
+\fB\-\-lockfile=LOCKFILE\fR
 The path where the lockfile should be written to\.
-.
 .TP
 \fB\-\-full\-index\fR
 Fall back to using the single\-file index of all gems\.
-.
 .TP
-\fB\-\-add\-platform\fR
+\fB\-\-gemfile=GEMFILE\fR
+Use the specified gemfile instead of [\fBGemfile(5)\fR][Gemfile(5)]\.
+.TP
+\fB\-\-add\-checksums\fR
+Add checksums to the lockfile\.
+.TP
+\fB\-\-add\-platform=<list>\fR
 Add a new platform to the lockfile, re\-resolving for the addition of that platform\.
-.
 .TP
-\fB\-\-remove\-platform\fR
+\fB\-\-remove\-platform=<list>\fR
 Remove a platform from the lockfile\.
-.
+.TP
+\fB\-\-normalize\-platforms\fR
+Normalize lockfile platforms\.
 .TP
 \fB\-\-patch\fR
 If updating, prefer updating only to next patch version\.
-.
 .TP
 \fB\-\-minor\fR
 If updating, prefer updating only to next minor version\.
-.
 .TP
 \fB\-\-major\fR
 If updating, prefer updating to next major version (default)\.
-.
+.TP
+\fB\-\-pre\fR
+If updating, always choose the highest allowed version, regardless of prerelease status\.
 .TP
 \fB\-\-strict\fR
 If updating, do not allow any gem to be updated past latest \-\-patch | \-\-minor | \-\-major\.
-.
 .TP
 \fB\-\-conservative\fR
 If updating, use bundle install conservative update behavior and do not allow shared dependencies to be updated\.
-.
 .SH "UPDATING ALL GEMS"
 If you run \fBbundle lock\fR with \fB\-\-update\fR option without list of gems, bundler will ignore any previously installed gems and resolve all dependencies again based on the latest versions of all gems available in the sources\.
-.
 .SH "UPDATING A LIST OF GEMS"
 Sometimes, you want to update a single gem in the Gemfile(5), and leave the rest of the gems that you specified locked to the versions in the \fBGemfile\.lock\fR\.
-.
 .P
 For instance, you only want to update \fBnokogiri\fR, run \fBbundle lock \-\-update nokogiri\fR\.
-.
 .P
 Bundler will update \fBnokogiri\fR and any of its dependencies, but leave the rest of the gems that you specified locked to the versions in the \fBGemfile\.lock\fR\.
-.
 .SH "SUPPORTING OTHER PLATFORMS"
-If you want your bundle to support platforms other than the one you\'re running locally, you can run \fBbundle lock \-\-add\-platform PLATFORM\fR to add PLATFORM to the lockfile, force bundler to re\-resolve and consider the new platform when picking gems, all without needing to have a machine that matches PLATFORM handy to install those platform\-specific gems on\.
-.
+If you want your bundle to support platforms other than the one you're running locally, you can run \fBbundle lock \-\-add\-platform PLATFORM\fR to add PLATFORM to the lockfile, force bundler to re\-resolve and consider the new platform when picking gems, all without needing to have a machine that matches PLATFORM handy to install those platform\-specific gems on\.
 .P
 For a full explanation of gem platforms, see \fBgem help platform\fR\.
-.
 .SH "PATCH LEVEL OPTIONS"
 See bundle update(1) \fIbundle\-update\.1\.html\fR for details\.
diff --git a/lib/bundler/man/bundle-lock.1.ronn b/lib/bundler/man/bundle-lock.1.ronn
index 3aa5920f5a1f83..6d3e63c982c500 100644
--- a/lib/bundler/man/bundle-lock.1.ronn
+++ b/lib/bundler/man/bundle-lock.1.ronn
@@ -4,15 +4,20 @@ bundle-lock(1) -- Creates / Updates a lockfile without installing
 ## SYNOPSIS
 
 `bundle lock` [--update]
+              [--bundler[=BUNDLER]]
               [--local]
               [--print]
               [--lockfile=PATH]
               [--full-index]
+              [--gemfile=GEMFILE]
+              [--add-checksums]
               [--add-platform]
               [--remove-platform]
+              [--normalize-platforms]
               [--patch]
               [--minor]
               [--major]
+              [--pre]
               [--strict]
               [--conservative]
 
@@ -22,10 +27,14 @@ Lock the gems specified in Gemfile.
 
 ## OPTIONS
 
-* `--update=<*gems>`:
+* `--update[=<list>]`:
   Ignores the existing lockfile. Resolve then updates lockfile. Taking a list
   of gems or updating all gems if no list is given.
 
+* `--bundler[=BUNDLER]`:
+  Update the locked version of bundler to the given version or the latest
+  version if no version is given.
+
 * `--local`:
   Do not attempt to connect to `rubygems.org`. Instead, Bundler will use the
   gems already present in Rubygems' cache or in `vendor/cache`. Note that if a
@@ -35,19 +44,28 @@ Lock the gems specified in Gemfile.
 * `--print`:
   Prints the lockfile to STDOUT instead of writing to the file system.
 
-* `--lockfile=<path>`:
+* `--lockfile=LOCKFILE`:
   The path where the lockfile should be written to.
 
 * `--full-index`:
   Fall back to using the single-file index of all gems.
 
-* `--add-platform`:
+* `--gemfile=GEMFILE`:
+  Use the specified gemfile instead of [`Gemfile(5)`][Gemfile(5)].
+
+* `--add-checksums`:
+  Add checksums to the lockfile.
+
+* `--add-platform=<list>`:
   Add a new platform to the lockfile, re-resolving for the addition of that
   platform.
 
-* `--remove-platform`:
+* `--remove-platform=<list>`:
   Remove a platform from the lockfile.
 
+* `--normalize-platforms`:
+  Normalize lockfile platforms.
+
 * `--patch`:
   If updating, prefer updating only to next patch version.
 
@@ -57,6 +75,9 @@ Lock the gems specified in Gemfile.
 * `--major`:
   If updating, prefer updating to next major version (default).
 
+* `--pre`:
+  If updating, always choose the highest allowed version, regardless of prerelease status.
+
 * `--strict`:
   If updating, do not allow any gem to be updated past latest --patch | --minor | --major.
 
diff --git a/lib/bundler/man/bundle-open.1 b/lib/bundler/man/bundle-open.1
index 3513f0d09baaef..e8a24f35414207 100644
--- a/lib/bundler/man/bundle-open.1
+++ b/lib/bundler/man/bundle-open.1
@@ -1,52 +1,32 @@
-.\" generated with Ronn/v0.7.3
-.\" http://github.com/rtomayko/ronn/tree/0.7.3
-.
-.TH "BUNDLE\-OPEN" "1" "August 2023" "" ""
-.
+.\" generated with Ronn-NG/v0.10.1
+.\" http://github.com/apjanke/ronn-ng/tree/0.10.1
+.TH "BUNDLE\-OPEN" "1" "July 2025" ""
 .SH "NAME"
 \fBbundle\-open\fR \- Opens the source directory for a gem in your bundle
-.
 .SH "SYNOPSIS"
 \fBbundle open\fR [GEM] [\-\-path=PATH]
-.
 .SH "DESCRIPTION"
 Opens the source directory of the provided GEM in your editor\.
-.
 .P
 For this to work the \fBEDITOR\fR or \fBBUNDLER_EDITOR\fR environment variable has to be set\.
-.
 .P
 Example:
-.
 .IP "" 4
-.
 .nf
-
-bundle open \'rack\'
-.
+bundle open 'rack'
 .fi
-.
 .IP "" 0
-.
 .P
-Will open the source directory for the \'rack\' gem in your bundle\.
-.
+Will open the source directory for the 'rack' gem in your bundle\.
 .IP "" 4
-.
 .nf
-
-bundle open \'rack\' \-\-path \'README\.md\'
-.
+bundle open 'rack' \-\-path 'README\.md'
 .fi
-.
 .IP "" 0
-.
 .P
-Will open the README\.md file of the \'rack\' gem source in your bundle\.
-.
+Will open the README\.md file of the 'rack' gem source in your bundle\.
 .SH "OPTIONS"
-.
 .TP
-\fB\-\-path\fR
+\fB\-\-path[=PATH]\fR
 Specify GEM source relative path to open\.
 
diff --git a/lib/bundler/man/bundle-open.1.ronn b/lib/bundler/man/bundle-open.1.ronn
index a857f3a96557ce..24dbe97e44563a 100644
--- a/lib/bundler/man/bundle-open.1.ronn
+++ b/lib/bundler/man/bundle-open.1.ronn
@@ -23,5 +23,6 @@ Will open the source directory for the 'rack' gem in your bundle.
 Will open the README.md file of the 'rack' gem source in your bundle.
 
 ## OPTIONS
-* `--path`:
+
+* `--path[=PATH]`:
   Specify GEM source relative path to open.
diff --git a/lib/bundler/man/bundle-outdated.1 b/lib/bundler/man/bundle-outdated.1
index 129ff00f589780..3259b0f0233fa3 100644
--- a/lib/bundler/man/bundle-outdated.1
+++ b/lib/bundler/man/bundle-outdated.1
@@ -1,152 +1,103 @@
-.\" generated with Ronn/v0.7.3
-.\" http://github.com/rtomayko/ronn/tree/0.7.3
-.
-.TH "BUNDLE\-OUTDATED" "1" "August 2023" "" ""
-.
+.\" generated with Ronn-NG/v0.10.1
+.\" http://github.com/apjanke/ronn-ng/tree/0.10.1
+.TH "BUNDLE\-OUTDATED" "1" "July 2025" ""
 .SH "NAME"
 \fBbundle\-outdated\fR \- List installed gems with newer versions available
-.
 .SH "SYNOPSIS"
-\fBbundle outdated\fR [GEM] [\-\-local] [\-\-pre] [\-\-source] [\-\-strict] [\-\-parseable | \-\-porcelain] [\-\-group=GROUP] [\-\-groups] [\-\-patch|\-\-minor|\-\-major] [\-\-filter\-major] [\-\-filter\-minor] [\-\-filter\-patch] [\-\-only\-explicit]
-.
+\fBbundle outdated\fR [GEM] [\-\-local] [\-\-pre] [\-\-source] [\-\-filter\-strict | \-\-strict] [\-\-update\-strict] [\-\-parseable | \-\-porcelain] [\-\-group=GROUP] [\-\-groups] [\-\-patch|\-\-minor|\-\-major] [\-\-filter\-major] [\-\-filter\-minor] [\-\-filter\-patch] [\-\-only\-explicit]
 .SH "DESCRIPTION"
 Outdated lists the names and versions of gems that have a newer version available in the given source\. Calling outdated with [GEM [GEM]] will only check for newer versions of the given gems\. Prerelease gems are ignored by default\. If your gems are up to date, Bundler will exit with a status of 0\. Otherwise, it will exit 1\.
-.
 .SH "OPTIONS"
-.
 .TP
 \fB\-\-local\fR
 Do not attempt to fetch gems remotely and use the gem cache instead\.
-.
 .TP
 \fB\-\-pre\fR
 Check for newer pre\-release gems\.
-.
 .TP
-\fB\-\-source\fR
+\fB\-\-source=<list>\fR
 Check against a specific source\.
-.
 .TP
-\fB\-\-strict\fR
+\fB\-\-filter\-strict\fR, \fB\-\-strict\fR
 Only list newer versions allowed by your Gemfile requirements, also respecting conservative update flags (\-\-patch, \-\-minor, \-\-major)\.
-.
+.TP
+\fB\-\-update\-strict\fR
+Strict conservative resolution, do not allow any gem to be updated past latest \-\-patch | \-\-minor | \-\-major\.
 .TP
 \fB\-\-parseable\fR, \fB\-\-porcelain\fR
 Use minimal formatting for more parseable output\.
-.
 .TP
-\fB\-\-group\fR
+\fB\-\-group=GROUP\fR
 List gems from a specific group\.
-.
 .TP
 \fB\-\-groups\fR
 List gems organized by groups\.
-.
 .TP
 \fB\-\-minor\fR
 Prefer updating only to next minor version\.
-.
 .TP
 \fB\-\-major\fR
 Prefer updating to next major version (default)\.
-.
 .TP
 \fB\-\-patch\fR
 Prefer updating only to next patch version\.
-.
 .TP
 \fB\-\-filter\-major\fR
 Only list major newer versions\.
-.
 .TP
 \fB\-\-filter\-minor\fR
 Only list minor newer versions\.
-.
 .TP
 \fB\-\-filter\-patch\fR
 Only list patch newer versions\.
-.
 .TP
 \fB\-\-only\-explicit\fR
 Only list gems specified in your Gemfile, not their dependencies\.
-.
 .SH "PATCH LEVEL OPTIONS"
 See bundle update(1) \fIbundle\-update\.1\.html\fR for details\.
-.
 .SH "FILTERING OUTPUT"
 The 3 filtering options do not affect the resolution of versions, merely what versions are shown in the output\.
-.
 .P
 If the regular output shows the following:
-.
 .IP "" 4
-.
 .nf
-
 * Gem       Current  Latest  Requested  Groups
 * faker     1\.6\.5    1\.6\.6   ~> 1\.4     development, test
 * hashie    1\.2\.0    3\.4\.6   = 1\.2\.0    default
 * headless  2\.2\.3    2\.3\.1   = 2\.2\.3    test
-.
 .fi
-.
 .IP "" 0
-.
 .P
 \fB\-\-filter\-major\fR would only show:
-.
 .IP "" 4
-.
 .nf
-
 * Gem       Current  Latest  Requested  Groups
 * hashie    1\.2\.0    3\.4\.6   = 1\.2\.0    default
-.
 .fi
-.
 .IP "" 0
-.
 .P
 \fB\-\-filter\-minor\fR would only show:
-.
 .IP "" 4
-.
 .nf
-
 * Gem       Current  Latest  Requested  Groups
 * headless  2\.2\.3    2\.3\.1   = 2\.2\.3    test
-.
 .fi
-.
 .IP "" 0
-.
 .P
 \fB\-\-filter\-patch\fR would only show:
-.
 .IP "" 4
-.
 .nf
-
 * Gem       Current  Latest  Requested  Groups
 * faker     1\.6\.5    1\.6\.6   ~> 1\.4     development, test
-.
 .fi
-.
 .IP "" 0
-.
 .P
 Filter options can be combined\. \fB\-\-filter\-minor\fR and \fB\-\-filter\-patch\fR would show:
-.
 .IP "" 4
-.
 .nf
-
 * Gem       Current  Latest  Requested  Groups
 * faker     1\.6\.5    1\.6\.6   ~> 1\.4     development, test
-.
 .fi
-.
 .IP "" 0
-.
 .P
 Combining all three \fBfilter\fR options would be the same result as providing none of them\.
diff --git a/lib/bundler/man/bundle-outdated.1.ronn b/lib/bundler/man/bundle-outdated.1.ronn
index 27bf21ab9d11ca..6f67a31977b946 100644
--- a/lib/bundler/man/bundle-outdated.1.ronn
+++ b/lib/bundler/man/bundle-outdated.1.ronn
@@ -6,7 +6,8 @@ bundle-outdated(1) -- List installed gems with newer versions available
 `bundle outdated` [GEM] [--local]
                         [--pre]
                         [--source]
-                        [--strict]
+                        [--filter-strict | --strict]
+                        [--update-strict]
                         [--parseable | --porcelain]
                         [--group=GROUP]
                         [--groups]
@@ -31,16 +32,19 @@ are up to date, Bundler will exit with a status of 0. Otherwise, it will exit 1.
 * `--pre`:
   Check for newer pre-release gems.
 
-* `--source`:
+* `--source=<list>`:
   Check against a specific source.
 
-* `--strict`:
+* `--filter-strict`, `--strict`:
   Only list newer versions allowed by your Gemfile requirements, also respecting conservative update flags (--patch, --minor, --major).
 
+* `--update-strict`:
+  Strict conservative resolution, do not allow any gem to be updated past latest --patch | --minor | --major.
+
 * `--parseable`, `--porcelain`:
    Use minimal formatting for more parseable output.
 
-* `--group`:
+* `--group=GROUP`:
   List gems from a specific group.
 
 * `--groups`:
@@ -102,4 +106,5 @@ Filter options can be combined. `--filter-minor` and `--filter-patch` would show
 
     * Gem       Current  Latest  Requested  Groups
     * faker     1.6.5    1.6.6   ~> 1.4     development, test
+
 Combining all three `filter` options would be the same result as providing none of them.
diff --git a/lib/bundler/man/bundle-platform.1 b/lib/bundler/man/bundle-platform.1
index 5021c46b4c44a0..1032acc4e6405c 100644
--- a/lib/bundler/man/bundle-platform.1
+++ b/lib/bundler/man/bundle-platform.1
@@ -1,41 +1,27 @@
-.\" generated with Ronn/v0.7.3
-.\" http://github.com/rtomayko/ronn/tree/0.7.3
-.
-.TH "BUNDLE\-PLATFORM" "1" "August 2023" "" ""
-.
+.\" generated with Ronn-NG/v0.10.1
+.\" http://github.com/apjanke/ronn-ng/tree/0.10.1
+.TH "BUNDLE\-PLATFORM" "1" "July 2025" ""
 .SH "NAME"
 \fBbundle\-platform\fR \- Displays platform compatibility information
-.
 .SH "SYNOPSIS"
 \fBbundle platform\fR [\-\-ruby]
-.
 .SH "DESCRIPTION"
 \fBplatform\fR displays information from your Gemfile, Gemfile\.lock, and Ruby VM about your platform\.
-.
 .P
 For instance, using this Gemfile(5):
-.
 .IP "" 4
-.
 .nf
-
 source "https://rubygems\.org"
 
 ruby "3\.1\.2"
 
 gem "rack"
-.
 .fi
-.
 .IP "" 0
-.
 .P
 If you run \fBbundle platform\fR on Ruby 3\.1\.2, it displays the following output:
-.
 .IP "" 4
-.
 .nf
-
 Your platform is: x86_64\-linux
 
 Your app has gems that work on these platforms:
@@ -48,24 +34,16 @@ Your Gemfile specifies a Ruby version requirement:
 * ruby 3\.1\.2
 
 Your current platform satisfies the Ruby version requirement\.
-.
 .fi
-.
 .IP "" 0
-.
 .P
-\fBplatform\fR lists all the platforms in your \fBGemfile\.lock\fR as well as the \fBruby\fR directive if applicable from your Gemfile(5)\. It also lets you know if the \fBruby\fR directive requirement has been met\. If \fBruby\fR directive doesn\'t match the running Ruby VM, it tells you what part does not\.
-.
+\fBplatform\fR lists all the platforms in your \fBGemfile\.lock\fR as well as the \fBruby\fR directive if applicable from your Gemfile(5)\. It also lets you know if the \fBruby\fR directive requirement has been met\. If \fBruby\fR directive doesn't match the running Ruby VM, it tells you what part does not\.
 .SH "OPTIONS"
-.
 .TP
 \fB\-\-ruby\fR
-It will display the ruby directive information, so you don\'t have to parse it from the Gemfile(5)\.
-.
+It will display the ruby directive information, so you don't have to parse it from the Gemfile(5)\.
 .SH "SEE ALSO"
-.
 .IP "\(bu" 4
 bundle\-lock(1) \fIbundle\-lock\.1\.html\fR
-.
 .IP "" 0
 
diff --git a/lib/bundler/man/bundle-plugin.1 b/lib/bundler/man/bundle-plugin.1
index ec30e1d0fda85d..d9e195906fa184 100644
--- a/lib/bundler/man/bundle-plugin.1
+++ b/lib/bundler/man/bundle-plugin.1
@@ -1,81 +1,58 @@
-.\" generated with Ronn/v0.7.3
-.\" http://github.com/rtomayko/ronn/tree/0.7.3
-.
-.TH "BUNDLE\-PLUGIN" "1" "August 2023" "" ""
-.
+.\" generated with Ronn-NG/v0.10.1
+.\" http://github.com/apjanke/ronn-ng/tree/0.10.1
+.TH "BUNDLE\-PLUGIN" "1" "July 2025" ""
 .SH "NAME"
 \fBbundle\-plugin\fR \- Manage Bundler plugins
-.
 .SH "SYNOPSIS"
-\fBbundle plugin\fR install PLUGINS [\-\-source=\fISOURCE\fR] [\-\-version=\fIversion\fR] [\-\-git|\-\-local_git=\fIgit\-url\fR] [\-\-branch=\fIbranch\fR|\-\-ref=\fIrev\fR]
-.
+\fBbundle plugin\fR install PLUGINS [\-\-source=\fISOURCE\fR] [\-\-version=\fIversion\fR] [\-\-git=\fIgit\-url\fR] [\-\-branch=\fIbranch\fR|\-\-ref=\fIrev\fR] [\-\-path=\fIpath\fR]
 .br
 \fBbundle plugin\fR uninstall PLUGINS
-.
 .br
 \fBbundle plugin\fR list
-.
 .br
 \fBbundle plugin\fR help [COMMAND]
-.
 .SH "DESCRIPTION"
 You can install, uninstall, and list plugin(s) with this command to extend functionalities of Bundler\.
-.
 .SH "SUB\-COMMANDS"
-.
 .SS "install"
 Install the given plugin(s)\.
-.
-.IP "\(bu" 4
-\fBbundle plugin install bundler\-graph\fR: Install bundler\-graph gem from RubyGems\.org\. The global source, specified in source in Gemfile is ignored\.
-.
-.IP "\(bu" 4
-\fBbundle plugin install bundler\-graph \-\-source https://example\.com\fR: Install bundler\-graph gem from example\.com\. The global source, specified in source in Gemfile is not considered\.
-.
-.IP "\(bu" 4
-\fBbundle plugin install bundler\-graph \-\-version 0\.2\.1\fR: You can specify the version of the gem via \fB\-\-version\fR\.
-.
-.IP "\(bu" 4
-\fBbundle plugin install bundler\-graph \-\-git https://github\.com/rubygems/bundler\-graph\fR: Install bundler\-graph gem from Git repository\. \fB\-\-git\fR can be replaced with \fB\-\-local\-git\fR\. You cannot use both \fB\-\-git\fR and \fB\-\-local\-git\fR\. You can use standard Git URLs like:
-.
-.IP "\(bu" 4
+.TP
+\fBbundle plugin install bundler\-graph\fR
+Install bundler\-graph gem from globally configured sources (defaults to RubyGems\.org)\. The global source, specified in source in Gemfile is ignored\.
+.TP
+\fBbundle plugin install bundler\-graph \-\-source https://example\.com\fR
+Install bundler\-graph gem from example\.com\. The global source, specified in source in Gemfile is not considered\.
+.TP
+\fBbundle plugin install bundler\-graph \-\-version 0\.2\.1\fR
+You can specify the version of the gem via \fB\-\-version\fR\.
+.TP
+\fBbundle plugin install bundler\-graph \-\-git https://github\.com/rubygems/bundler\-graph\fR
+Install bundler\-graph gem from Git repository\. You can use standard Git URLs like:
+.IP
 \fBssh://[user@]host\.xz[:port]/path/to/repo\.git\fR
-.
-.IP "\(bu" 4
+.br
 \fBhttp[s]://host\.xz[:port]/path/to/repo\.git\fR
-.
-.IP "\(bu" 4
+.br
 \fB/path/to/repo\fR
-.
-.IP "\(bu" 4
+.br
 \fBfile:///path/to/repo\fR
-.
-.IP "" 0
-.
 .IP
-When you specify \fB\-\-git\fR/\fB\-\-local\-git\fR, you can use \fB\-\-branch\fR or \fB\-\-ref\fR to specify any branch, tag, or commit hash (revision) to use\. When you specify both, only the latter is used\.
-.
-.IP "" 0
-.
+When you specify \fB\-\-git\fR, you can use \fB\-\-branch\fR or \fB\-\-ref\fR to specify any branch, tag, or commit hash (revision) to use\.
+.TP
+\fBbundle plugin install bundler\-graph \-\-path \.\./bundler\-graph\fR
+Install bundler\-graph gem from a local path\.
 .SS "uninstall"
 Uninstall the plugin(s) specified in PLUGINS\.
-.
 .SS "list"
 List the installed plugins and available commands\.
-.
 .P
 No options\.
-.
 .SS "help"
 Describe subcommands or one specific subcommand\.
-.
 .P
 No options\.
-.
 .SH "SEE ALSO"
-.
 .IP "\(bu" 4
 How to write a Bundler plugin \fIhttps://bundler\.io/guides/bundler_plugins\.html\fR
-.
 .IP "" 0
 
diff --git a/lib/bundler/man/bundle-plugin.1.ronn b/lib/bundler/man/bundle-plugin.1.ronn
index 4f234eeba771b5..b0a34660ea84da 100644
--- a/lib/bundler/man/bundle-plugin.1.ronn
+++ b/lib/bundler/man/bundle-plugin.1.ronn
@@ -4,7 +4,8 @@ bundle-plugin(1) -- Manage Bundler plugins
 ## SYNOPSIS
 
 `bundle plugin` install PLUGINS [--source=<SOURCE>] [--version=<version>]
-                              [--git|--local_git=<git-url>] [--branch=<branch>|--ref=<rev>]<br>
+                              [--git=<git-url>] [--branch=<branch>|--ref=<rev>]
+                              [--path=<path>]<br>
 `bundle plugin` uninstall PLUGINS<br>
 `bundle plugin` list<br>
 `bundle plugin` help [COMMAND]
@@ -20,7 +21,7 @@ You can install, uninstall, and list plugin(s) with this command to extend funct
 Install the given plugin(s).
 
 * `bundle plugin install bundler-graph`:
-  Install bundler-graph gem from RubyGems.org. The global source, specified in source in Gemfile is ignored.
+  Install bundler-graph gem from globally configured sources (defaults to RubyGems.org). The global source, specified in source in Gemfile is ignored.
 
 * `bundle plugin install bundler-graph --source https://example.com`:
   Install bundler-graph gem from example.com. The global source, specified in source in Gemfile is not considered.
@@ -29,14 +30,17 @@ Install the given plugin(s).
   You can specify the version of the gem via `--version`.
 
 * `bundle plugin install bundler-graph --git https://github.com/rubygems/bundler-graph`:
-  Install bundler-graph gem from Git repository. `--git` can be replaced with `--local-git`. You cannot use both `--git` and `--local-git`. You can use standard Git URLs like:
+  Install bundler-graph gem from Git repository. You can use standard Git URLs like:
 
-  * `ssh://[user@]host.xz[:port]/path/to/repo.git`
-  * `http[s]://host.xz[:port]/path/to/repo.git`
-  * `/path/to/repo`
-  * `file:///path/to/repo`
+  `ssh://[user@]host.xz[:port]/path/to/repo.git`<br>
+  `http[s]://host.xz[:port]/path/to/repo.git`<br>
+  `/path/to/repo`<br>
+  `file:///path/to/repo`
 
-  When you specify `--git`/`--local-git`, you can use `--branch` or `--ref` to specify any branch, tag, or commit hash (revision) to use. When you specify both, only the latter is used.
+  When you specify `--git`, you can use `--branch` or `--ref` to specify any branch, tag, or commit hash (revision) to use.
+
+* `bundle plugin install bundler-graph --path ../bundler-graph`:
+  Install bundler-graph gem from a local path.
 
 ### uninstall
 
diff --git a/lib/bundler/man/bundle-pristine.1 b/lib/bundler/man/bundle-pristine.1
index af81c48d2b8ae8..5c7871069c0940 100644
--- a/lib/bundler/man/bundle-pristine.1
+++ b/lib/bundler/man/bundle-pristine.1
@@ -1,34 +1,23 @@
-.\" generated with Ronn/v0.7.3
-.\" http://github.com/rtomayko/ronn/tree/0.7.3
-.
-.TH "BUNDLE\-PRISTINE" "1" "August 2023" "" ""
-.
+.\" generated with Ronn-NG/v0.10.1
+.\" http://github.com/apjanke/ronn-ng/tree/0.10.1
+.TH "BUNDLE\-PRISTINE" "1" "July 2025" ""
 .SH "NAME"
 \fBbundle\-pristine\fR \- Restores installed gems to their pristine condition
-.
 .SH "SYNOPSIS"
 \fBbundle pristine\fR
-.
 .SH "DESCRIPTION"
 \fBpristine\fR restores the installed gems in the bundle to their pristine condition using the local gem cache from RubyGems\. For git gems, a forced checkout will be performed\.
-.
 .P
-For further explanation, \fBbundle pristine\fR ignores unpacked files on disk\. In other words, this command utilizes the local \fB\.gem\fR cache or the gem\'s git repository as if one were installing from scratch\.
-.
+For further explanation, \fBbundle pristine\fR ignores unpacked files on disk\. In other words, this command utilizes the local \fB\.gem\fR cache or the gem's git repository as if one were installing from scratch\.
 .P
-Note: the Bundler gem cannot be restored to its original state with \fBpristine\fR\. One also cannot use \fBbundle pristine\fR on gems with a \'path\' option in the Gemfile, because bundler has no original copy it can restore from\.
-.
+Note: the Bundler gem cannot be restored to its original state with \fBpristine\fR\. One also cannot use \fBbundle pristine\fR on gems with a 'path' option in the Gemfile, because bundler has no original copy it can restore from\.
 .P
 When is it practical to use \fBbundle pristine\fR?
-.
 .P
 It comes in handy when a developer is debugging a gem\. \fBbundle pristine\fR is a great way to get rid of experimental changes to a gem that one may not want\.
-.
 .P
 Why use \fBbundle pristine\fR over \fBgem pristine \-\-all\fR?
-.
 .P
 Both commands are very similar\. For context: \fBbundle pristine\fR, without arguments, cleans all gems from the lockfile\. Meanwhile, \fBgem pristine \-\-all\fR cleans all installed gems for that Ruby version\.
-.
 .P
 If a developer forgets which gems in their project they might have been debugging, the Rubygems \fBgem pristine [GEMNAME]\fR command may be inconvenient\. One can avoid waiting for \fBgem pristine \-\-all\fR, and instead run \fBbundle pristine\fR\.
diff --git a/lib/bundler/man/bundle-pristine.1.ronn b/lib/bundler/man/bundle-pristine.1.ronn
index e2d6b6a348f07e..984debeb3db477 100644
--- a/lib/bundler/man/bundle-pristine.1.ronn
+++ b/lib/bundler/man/bundle-pristine.1.ronn
@@ -1,5 +1,5 @@
 bundle-pristine(1) -- Restores installed gems to their pristine condition
-===========================================================================
+=========================================================================
 
 ## SYNOPSIS
 
diff --git a/lib/bundler/man/bundle-remove.1 b/lib/bundler/man/bundle-remove.1
index d86cf134bdeb6f..df8ce3232ab8dc 100644
--- a/lib/bundler/man/bundle-remove.1
+++ b/lib/bundler/man/bundle-remove.1
@@ -1,31 +1,21 @@
-.\" generated with Ronn/v0.7.3
-.\" http://github.com/rtomayko/ronn/tree/0.7.3
-.
-.TH "BUNDLE\-REMOVE" "1" "August 2023" "" ""
-.
+.\" generated with Ronn-NG/v0.10.1
+.\" http://github.com/apjanke/ronn-ng/tree/0.10.1
+.TH "BUNDLE\-REMOVE" "1" "July 2025" ""
 .SH "NAME"
 \fBbundle\-remove\fR \- Removes gems from the Gemfile
-.
 .SH "SYNOPSIS"
-\fBbundle remove [GEM [GEM \.\.\.]] [\-\-install]\fR
-.
+\fBbundle remove [GEM [GEM \|\.\|\.\|\.]] [\-\-install]\fR
 .SH "DESCRIPTION"
 Removes the given gems from the Gemfile while ensuring that the resulting Gemfile is still valid\. If a gem cannot be removed, a warning is printed\. If a gem is already absent from the Gemfile, and error is raised\.
-.
 .SH "OPTIONS"
-.
 .TP
 \fB\-\-install\fR
 Runs \fBbundle install\fR after the given gems have been removed from the Gemfile, which ensures that both the lockfile and the installed gems on disk are also updated to remove the given gem(s)\.
-.
 .P
 Example:
-.
 .P
 bundle remove rails
-.
 .P
 bundle remove rails rack
-.
 .P
 bundle remove rails rack \-\-install
diff --git a/lib/bundler/man/bundle-remove.1.ronn b/lib/bundler/man/bundle-remove.1.ronn
index 40a239b4a29e8e..ceb1a980be1a2b 100644
--- a/lib/bundler/man/bundle-remove.1.ronn
+++ b/lib/bundler/man/bundle-remove.1.ronn
@@ -1,5 +1,5 @@
 bundle-remove(1) -- Removes gems from the Gemfile
-===========================================================================
+=================================================
 
 ## SYNOPSIS
 
diff --git a/lib/bundler/man/bundle-show.1 b/lib/bundler/man/bundle-show.1
index aa91176bf22be2..ca10c00701e85d 100644
--- a/lib/bundler/man/bundle-show.1
+++ b/lib/bundler/man/bundle-show.1
@@ -1,23 +1,19 @@
-.\" generated with Ronn/v0.7.3
-.\" http://github.com/rtomayko/ronn/tree/0.7.3
-.
-.TH "BUNDLE\-SHOW" "1" "August 2023" "" ""
-.
+.\" generated with Ronn-NG/v0.10.1
+.\" http://github.com/apjanke/ronn-ng/tree/0.10.1
+.TH "BUNDLE\-SHOW" "1" "July 2025" ""
 .SH "NAME"
 \fBbundle\-show\fR \- Shows all the gems in your bundle, or the path to a gem
-.
 .SH "SYNOPSIS"
-\fBbundle show\fR [GEM] [\-\-paths]
-.
+\fBbundle show\fR [GEM] [\-\-paths] [\-\-outdated]
 .SH "DESCRIPTION"
 Without the [GEM] option, \fBshow\fR will print a list of the names and versions of all gems that are required by your [\fBGemfile(5)\fR][Gemfile(5)], sorted by name\.
-.
 .P
 Calling show with [GEM] will list the exact location of that gem on your machine\.
-.
 .SH "OPTIONS"
-.
 .TP
 \fB\-\-paths\fR
 List the paths of all gems that are required by your [\fBGemfile(5)\fR][Gemfile(5)], sorted by gem name\.
+.TP
+\fB\-\-outdated\fR
+Show verbose output including whether gems are outdated\.
 
diff --git a/lib/bundler/man/bundle-show.1.ronn b/lib/bundler/man/bundle-show.1.ronn
index a6a59a1445dcd3..6e80b046964704 100644
--- a/lib/bundler/man/bundle-show.1.ronn
+++ b/lib/bundler/man/bundle-show.1.ronn
@@ -5,6 +5,7 @@ bundle-show(1) -- Shows all the gems in your bundle, or the path to a gem
 
 `bundle show` [GEM]
               [--paths]
+              [--outdated]
 
 ## DESCRIPTION
 
@@ -19,3 +20,6 @@ machine.
 * `--paths`:
   List the paths of all gems that are required by your [`Gemfile(5)`][Gemfile(5)],
   sorted by gem name.
+
+* `--outdated`:
+  Show verbose output including whether gems are outdated.
diff --git a/lib/bundler/man/bundle-update.1 b/lib/bundler/man/bundle-update.1
index e4e10ad23b3b41..5b8acdd0b5b614 100644
--- a/lib/bundler/man/bundle-update.1
+++ b/lib/bundler/man/bundle-update.1
@@ -1,114 +1,87 @@
-.\" generated with Ronn/v0.7.3
-.\" http://github.com/rtomayko/ronn/tree/0.7.3
-.
-.TH "BUNDLE\-UPDATE" "1" "August 2023" "" ""
-.
+.\" generated with Ronn-NG/v0.10.1
+.\" http://github.com/apjanke/ronn-ng/tree/0.10.1
+.TH "BUNDLE\-UPDATE" "1" "July 2025" ""
 .SH "NAME"
 \fBbundle\-update\fR \- Update your gems to the latest available versions
-.
 .SH "SYNOPSIS"
-\fBbundle update\fR \fI*gems\fR [\-\-all] [\-\-group=NAME] [\-\-source=NAME] [\-\-local] [\-\-ruby] [\-\-bundler[=VERSION]] [\-\-full\-index] [\-\-jobs=JOBS] [\-\-quiet] [\-\-patch|\-\-minor|\-\-major] [\-\-redownload] [\-\-strict] [\-\-conservative]
-.
+\fBbundle update\fR \fI*gems\fR [\-\-all] [\-\-group=NAME] [\-\-source=NAME] [\-\-local] [\-\-ruby] [\-\-bundler[=VERSION]] [\-\-full\-index] [\-\-gemfile=GEMFILE] [\-\-jobs=NUMBER] [\-\-quiet] [\-\-patch|\-\-minor|\-\-major] [\-\-pre] [\-\-redownload] [\-\-strict] [\-\-conservative]
 .SH "DESCRIPTION"
 Update the gems specified (all gems, if \fB\-\-all\fR flag is used), ignoring the previously installed gems specified in the \fBGemfile\.lock\fR\. In general, you should use bundle install(1) \fIbundle\-install\.1\.html\fR to install the same exact gems and versions across machines\.
-.
 .P
 You would use \fBbundle update\fR to explicitly update the version of a gem\.
-.
 .SH "OPTIONS"
-.
 .TP
 \fB\-\-all\fR
 Update all gems specified in Gemfile\.
-.
 .TP
-\fB\-\-group=<name>\fR, \fB\-g=[<name>]\fR
+\fB\-\-group=<list>\fR, \fB\-g=<list>\fR
 Only update the gems in the specified group\. For instance, you can update all gems in the development group with \fBbundle update \-\-group development\fR\. You can also call \fBbundle update rails \-\-group test\fR to update the rails gem and all gems in the test group, for example\.
-.
 .TP
-\fB\-\-source=<name>\fR
+\fB\-\-source=<list>\fR
 The name of a \fB:git\fR or \fB:path\fR source used in the Gemfile(5)\. For instance, with a \fB:git\fR source of \fBhttp://github\.com/rails/rails\.git\fR, you would call \fBbundle update \-\-source rails\fR
-.
 .TP
 \fB\-\-local\fR
 Do not attempt to fetch gems remotely and use the gem cache instead\.
-.
 .TP
 \fB\-\-ruby\fR
 Update the locked version of Ruby to the current version of Ruby\.
-.
 .TP
-\fB\-\-bundler\fR
+\fB\-\-bundler[=BUNDLER]\fR
 Update the locked version of bundler to the invoked bundler version\.
-.
 .TP
 \fB\-\-full\-index\fR
 Fall back to using the single\-file index of all gems\.
-.
 .TP
-\fB\-\-jobs=[<number>]\fR, \fB\-j[<number>]\fR
+\fB\-\-gemfile=GEMFILE\fR
+Use the specified gemfile instead of [\fBGemfile(5)\fR][Gemfile(5)]\.
+.TP
+\fB\-\-jobs=<number>\fR, \fB\-j=<number>\fR
 Specify the number of jobs to run in parallel\. The default is the number of available processors\.
-.
 .TP
 \fB\-\-retry=[<number>]\fR
 Retry failed network or git requests for \fInumber\fR times\.
-.
 .TP
 \fB\-\-quiet\fR
 Only output warnings and errors\.
-.
 .TP
-\fB\-\-redownload\fR
+\fB\-\-redownload\fR, \fB\-\-force\fR
 Force downloading every gem\.
-.
 .TP
 \fB\-\-patch\fR
 Prefer updating only to next patch version\.
-.
 .TP
 \fB\-\-minor\fR
 Prefer updating only to next minor version\.
-.
 .TP
 \fB\-\-major\fR
 Prefer updating to next major version (default)\.
-.
+.TP
+\fB\-\-pre\fR
+Always choose the highest allowed version, regardless of prerelease status\.
 .TP
 \fB\-\-strict\fR
 Do not allow any gem to be updated past latest \fB\-\-patch\fR | \fB\-\-minor\fR | \fB\-\-major\fR\.
-.
 .TP
 \fB\-\-conservative\fR
 Use bundle install conservative update behavior and do not allow indirect dependencies to be updated\.
-.
 .SH "UPDATING ALL GEMS"
 If you run \fBbundle update \-\-all\fR, bundler will ignore any previously installed gems and resolve all dependencies again based on the latest versions of all gems available in the sources\.
-.
 .P
 Consider the following Gemfile(5):
-.
 .IP "" 4
-.
 .nf
-
 source "https://rubygems\.org"
 
 gem "rails", "3\.0\.0\.rc"
 gem "nokogiri"
-.
 .fi
-.
 .IP "" 0
-.
 .P
 When you run bundle install(1) \fIbundle\-install\.1\.html\fR the first time, bundler will resolve all of the dependencies, all the way down, and install what you need:
-.
 .IP "" 4
-.
 .nf
-
-Fetching gem metadata from https://rubygems\.org/\.\.\.\.\.\.\.\.\.
-Resolving dependencies\.\.\.
+Fetching gem metadata from https://rubygems\.org/\|\.\|\.\|\.\|\.\|\.\|\.\|\.\|\.\|\.
+Resolving dependencies\|\.\|\.\|\.
 Installing builder 2\.1\.2
 Installing abstract 1\.0\.0
 Installing rack 1\.2\.8
@@ -138,55 +111,36 @@ Installing nokogiri 1\.6\.5
 
 Bundle complete! 2 Gemfile dependencies, 26 gems total\.
 Use `bundle show [gemname]` to see where a bundled gem is installed\.
-.
 .fi
-.
 .IP "" 0
-.
 .P
 As you can see, even though you have two gems in the Gemfile(5), your application needs 26 different gems in order to run\. Bundler remembers the exact versions it installed in \fBGemfile\.lock\fR\. The next time you run bundle install(1) \fIbundle\-install\.1\.html\fR, bundler skips the dependency resolution and installs the same gems as it installed last time\.
-.
 .P
-After checking in the \fBGemfile\.lock\fR into version control and cloning it on another machine, running bundle install(1) \fIbundle\-install\.1\.html\fR will \fIstill\fR install the gems that you installed last time\. You don\'t need to worry that a new release of \fBerubis\fR or \fBmail\fR changes the gems you use\.
-.
+After checking in the \fBGemfile\.lock\fR into version control and cloning it on another machine, running bundle install(1) \fIbundle\-install\.1\.html\fR will \fIstill\fR install the gems that you installed last time\. You don't need to worry that a new release of \fBerubis\fR or \fBmail\fR changes the gems you use\.
 .P
 However, from time to time, you might want to update the gems you are using to the newest versions that still match the gems in your Gemfile(5)\.
-.
 .P
 To do this, run \fBbundle update \-\-all\fR, which will ignore the \fBGemfile\.lock\fR, and resolve all the dependencies again\. Keep in mind that this process can result in a significantly different set of the 25 gems, based on the requirements of new gems that the gem authors released since the last time you ran \fBbundle update \-\-all\fR\.
-.
 .SH "UPDATING A LIST OF GEMS"
 Sometimes, you want to update a single gem in the Gemfile(5), and leave the rest of the gems that you specified locked to the versions in the \fBGemfile\.lock\fR\.
-.
 .P
 For instance, in the scenario above, imagine that \fBnokogiri\fR releases version \fB1\.4\.4\fR, and you want to update it \fIwithout\fR updating Rails and all of its dependencies\. To do this, run \fBbundle update nokogiri\fR\.
-.
 .P
 Bundler will update \fBnokogiri\fR and any of its dependencies, but leave alone Rails and its dependencies\.
-.
 .SH "OVERLAPPING DEPENDENCIES"
 Sometimes, multiple gems declared in your Gemfile(5) are satisfied by the same second\-level dependency\. For instance, consider the case of \fBthin\fR and \fBrack\-perftools\-profiler\fR\.
-.
 .IP "" 4
-.
 .nf
-
 source "https://rubygems\.org"
 
 gem "thin"
 gem "rack\-perftools\-profiler"
-.
 .fi
-.
 .IP "" 0
-.
 .P
 The \fBthin\fR gem depends on \fBrack >= 1\.0\fR, while \fBrack\-perftools\-profiler\fR depends on \fBrack ~> 1\.0\fR\. If you run bundle install, you get:
-.
 .IP "" 4
-.
 .nf
-
 Fetching source index for https://rubygems\.org/
 Installing daemons (1\.1\.0)
 Installing eventmachine (0\.12\.10) with native extensions
@@ -196,199 +150,132 @@ Installing rack (1\.2\.1)
 Installing rack\-perftools_profiler (0\.0\.2)
 Installing thin (1\.2\.7) with native extensions
 Using bundler (1\.0\.0\.rc\.3)
-.
 .fi
-.
 .IP "" 0
-.
 .P
-In this case, the two gems have their own set of dependencies, but they share \fBrack\fR in common\. If you run \fBbundle update thin\fR, bundler will update \fBdaemons\fR, \fBeventmachine\fR and \fBrack\fR, which are dependencies of \fBthin\fR, but not \fBopen4\fR or \fBperftools\.rb\fR, which are dependencies of \fBrack\-perftools_profiler\fR\. Note that \fBbundle update thin\fR will update \fBrack\fR even though it\'s \fIalso\fR a dependency of \fBrack\-perftools_profiler\fR\.
-.
+In this case, the two gems have their own set of dependencies, but they share \fBrack\fR in common\. If you run \fBbundle update thin\fR, bundler will update \fBdaemons\fR, \fBeventmachine\fR and \fBrack\fR, which are dependencies of \fBthin\fR, but not \fBopen4\fR or \fBperftools\.rb\fR, which are dependencies of \fBrack\-perftools_profiler\fR\. Note that \fBbundle update thin\fR will update \fBrack\fR even though it's \fIalso\fR a dependency of \fBrack\-perftools_profiler\fR\.
 .P
 In short, by default, when you update a gem using \fBbundle update\fR, bundler will update all dependencies of that gem, including those that are also dependencies of another gem\.
-.
 .P
 To prevent updating indirect dependencies, prior to version 1\.14 the only option was the \fBCONSERVATIVE UPDATING\fR behavior in bundle install(1) \fIbundle\-install\.1\.html\fR:
-.
 .P
 In this scenario, updating the \fBthin\fR version manually in the Gemfile(5), and then running bundle install(1) \fIbundle\-install\.1\.html\fR will only update \fBdaemons\fR and \fBeventmachine\fR, but not \fBrack\fR\. For more information, see the \fBCONSERVATIVE UPDATING\fR section of bundle install(1) \fIbundle\-install\.1\.html\fR\.
-.
 .P
 Starting with 1\.14, specifying the \fB\-\-conservative\fR option will also prevent indirect dependencies from being updated\.
-.
 .SH "PATCH LEVEL OPTIONS"
 Version 1\.14 introduced 4 patch\-level options that will influence how gem versions are resolved\. One of the following options can be used: \fB\-\-patch\fR, \fB\-\-minor\fR or \fB\-\-major\fR\. \fB\-\-strict\fR can be added to further influence resolution\.
-.
 .TP
 \fB\-\-patch\fR
 Prefer updating only to next patch version\.
-.
 .TP
 \fB\-\-minor\fR
 Prefer updating only to next minor version\.
-.
 .TP
 \fB\-\-major\fR
 Prefer updating to next major version (default)\.
-.
 .TP
 \fB\-\-strict\fR
 Do not allow any gem to be updated past latest \fB\-\-patch\fR | \fB\-\-minor\fR | \fB\-\-major\fR\.
-.
 .P
-When Bundler is resolving what versions to use to satisfy declared requirements in the Gemfile or in parent gems, it looks up all available versions, filters out any versions that don\'t satisfy the requirement, and then, by default, sorts them from newest to oldest, considering them in that order\.
-.
+When Bundler is resolving what versions to use to satisfy declared requirements in the Gemfile or in parent gems, it looks up all available versions, filters out any versions that don't satisfy the requirement, and then, by default, sorts them from newest to oldest, considering them in that order\.
 .P
 Providing one of the patch level options (e\.g\. \fB\-\-patch\fR) changes the sort order of the satisfying versions, causing Bundler to consider the latest \fB\-\-patch\fR or \fB\-\-minor\fR version available before other versions\. Note that versions outside the stated patch level could still be resolved to if necessary to find a suitable dependency graph\.
-.
 .P
-For example, if gem \'foo\' is locked at 1\.0\.2, with no gem requirement defined in the Gemfile, and versions 1\.0\.3, 1\.0\.4, 1\.1\.0, 1\.1\.1, 2\.0\.0 all exist, the default order of preference by default (\fB\-\-major\fR) will be "2\.0\.0, 1\.1\.1, 1\.1\.0, 1\.0\.4, 1\.0\.3, 1\.0\.2"\.
-.
+For example, if gem 'foo' is locked at 1\.0\.2, with no gem requirement defined in the Gemfile, and versions 1\.0\.3, 1\.0\.4, 1\.1\.0, 1\.1\.1, 2\.0\.0 all exist, the default order of preference by default (\fB\-\-major\fR) will be "2\.0\.0, 1\.1\.1, 1\.1\.0, 1\.0\.4, 1\.0\.3, 1\.0\.2"\.
 .P
 If the \fB\-\-patch\fR option is used, the order of preference will change to "1\.0\.4, 1\.0\.3, 1\.0\.2, 1\.1\.1, 1\.1\.0, 2\.0\.0"\.
-.
 .P
 If the \fB\-\-minor\fR option is used, the order of preference will change to "1\.1\.1, 1\.1\.0, 1\.0\.4, 1\.0\.3, 1\.0\.2, 2\.0\.0"\.
-.
 .P
 Combining the \fB\-\-strict\fR option with any of the patch level options will remove any versions beyond the scope of the patch level option, to ensure that no gem is updated that far\.
-.
 .P
 To continue the previous example, if both \fB\-\-patch\fR and \fB\-\-strict\fR options are used, the available versions for resolution would be "1\.0\.4, 1\.0\.3, 1\.0\.2"\. If \fB\-\-minor\fR and \fB\-\-strict\fR are used, it would be "1\.1\.1, 1\.1\.0, 1\.0\.4, 1\.0\.3, 1\.0\.2"\.
-.
 .P
-Gem requirements as defined in the Gemfile will still be the first determining factor for what versions are available\. If the gem requirement for \fBfoo\fR in the Gemfile is \'~> 1\.0\', that will accomplish the same thing as providing the \fB\-\-minor\fR and \fB\-\-strict\fR options\.
-.
+Gem requirements as defined in the Gemfile will still be the first determining factor for what versions are available\. If the gem requirement for \fBfoo\fR in the Gemfile is '~> 1\.0', that will accomplish the same thing as providing the \fB\-\-minor\fR and \fB\-\-strict\fR options\.
 .SH "PATCH LEVEL EXAMPLES"
 Given the following gem specifications:
-.
 .IP "" 4
-.
 .nf
-
 foo 1\.4\.3, requires: ~> bar 2\.0
 foo 1\.4\.4, requires: ~> bar 2\.0
 foo 1\.4\.5, requires: ~> bar 2\.1
 foo 1\.5\.0, requires: ~> bar 2\.1
 foo 1\.5\.1, requires: ~> bar 3\.0
 bar with versions 2\.0\.3, 2\.0\.4, 2\.1\.0, 2\.1\.1, 3\.0\.0
-.
 .fi
-.
 .IP "" 0
-.
 .P
 Gemfile:
-.
 .IP "" 4
-.
 .nf
-
-gem \'foo\'
-.
+gem 'foo'
 .fi
-.
 .IP "" 0
-.
 .P
 Gemfile\.lock:
-.
 .IP "" 4
-.
 .nf
-
 foo (1\.4\.3)
   bar (~> 2\.0)
 bar (2\.0\.3)
-.
 .fi
-.
 .IP "" 0
-.
 .P
 Cases:
-.
 .IP "" 4
-.
 .nf
-
 #  Command Line                     Result
 \-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-
-1  bundle update \-\-patch            \'foo 1\.4\.5\', \'bar 2\.1\.1\'
-2  bundle update \-\-patch foo        \'foo 1\.4\.5\', \'bar 2\.1\.1\'
-3  bundle update \-\-minor            \'foo 1\.5\.1\', \'bar 3\.0\.0\'
-4  bundle update \-\-minor \-\-strict   \'foo 1\.5\.0\', \'bar 2\.1\.1\'
-5  bundle update \-\-patch \-\-strict   \'foo 1\.4\.4\', \'bar 2\.0\.4\'
-.
+1  bundle update \-\-patch            'foo 1\.4\.5', 'bar 2\.1\.1'
+2  bundle update \-\-patch foo        'foo 1\.4\.5', 'bar 2\.1\.1'
+3  bundle update \-\-minor            'foo 1\.5\.1', 'bar 3\.0\.0'
+4  bundle update \-\-minor \-\-strict   'foo 1\.5\.0', 'bar 2\.1\.1'
+5  bundle update \-\-patch \-\-strict   'foo 1\.4\.4', 'bar 2\.0\.4'
 .fi
-.
 .IP "" 0
-.
 .P
 In case 1, bar is upgraded to 2\.1\.1, a minor version increase, because the dependency from foo 1\.4\.5 required it\.
-.
 .P
-In case 2, only foo is requested to be unlocked, but bar is also allowed to move because it\'s not a declared dependency in the Gemfile\.
-.
+In case 2, only foo is requested to be unlocked, but bar is also allowed to move because it's not a declared dependency in the Gemfile\.
 .P
 In case 3, bar goes up a whole major release, because a minor increase is preferred now for foo, and when it goes to 1\.5\.1, it requires 3\.0\.0 of bar\.
-.
 .P
-In case 4, foo is preferred up to a minor version, but 1\.5\.1 won\'t work because the \-\-strict flag removes bar 3\.0\.0 from consideration since it\'s a major increment\.
-.
+In case 4, foo is preferred up to a minor version, but 1\.5\.1 won't work because the \-\-strict flag removes bar 3\.0\.0 from consideration since it's a major increment\.
 .P
 In case 5, both foo and bar have any minor or major increments removed from consideration because of the \-\-strict flag, so the most they can move is up to 1\.4\.4 and 2\.0\.4\.
-.
 .SH "RECOMMENDED WORKFLOW"
 In general, when working with an application managed with bundler, you should use the following workflow:
-.
 .IP "\(bu" 4
 After you create your Gemfile(5) for the first time, run
-.
 .IP
 $ bundle install
-.
 .IP "\(bu" 4
 Check the resulting \fBGemfile\.lock\fR into version control
-.
 .IP
 $ git add Gemfile\.lock
-.
 .IP "\(bu" 4
 When checking out this repository on another development machine, run
-.
 .IP
 $ bundle install
-.
 .IP "\(bu" 4
 When checking out this repository on a deployment machine, run
-.
 .IP
 $ bundle install \-\-deployment
-.
 .IP "\(bu" 4
 After changing the Gemfile(5) to reflect a new or update dependency, run
-.
 .IP
 $ bundle install
-.
 .IP "\(bu" 4
 Make sure to check the updated \fBGemfile\.lock\fR into version control
-.
 .IP
 $ git add Gemfile\.lock
-.
 .IP "\(bu" 4
 If bundle install(1) \fIbundle\-install\.1\.html\fR reports a conflict, manually update the specific gems that you changed in the Gemfile(5)
-.
 .IP
 $ bundle update rails thin
-.
 .IP "\(bu" 4
 If you want to update all the gems to the latest possible versions that still match the gems listed in the Gemfile(5), run
-.
 .IP
 $ bundle update \-\-all
-.
 .IP "" 0
 
diff --git a/lib/bundler/man/bundle-update.1.ronn b/lib/bundler/man/bundle-update.1.ronn
index fe500cdc9681af..1b8b31951dfb98 100644
--- a/lib/bundler/man/bundle-update.1.ronn
+++ b/lib/bundler/man/bundle-update.1.ronn
@@ -10,9 +10,11 @@ bundle-update(1) -- Update your gems to the latest available versions
                         [--ruby]
                         [--bundler[=VERSION]]
                         [--full-index]
-                        [--jobs=JOBS]
+                        [--gemfile=GEMFILE]
+                        [--jobs=NUMBER]
                         [--quiet]
                         [--patch|--minor|--major]
+                        [--pre]
                         [--redownload]
                         [--strict]
                         [--conservative]
@@ -32,13 +34,13 @@ gem.
 * `--all`:
   Update all gems specified in Gemfile.
 
-* `--group=<name>`, `-g=[<name>]`:
+* `--group=<list>`, `-g=<list>`:
   Only update the gems in the specified group. For instance, you can update all gems
   in the development group with `bundle update --group development`. You can also
   call `bundle update rails --group test` to update the rails gem and all gems in
   the test group, for example.
 
-* `--source=<name>`:
+* `--source=<list>`:
   The name of a `:git` or `:path` source used in the Gemfile(5). For
   instance, with a `:git` source of `http://github.com/rails/rails.git`,
   you would call `bundle update --source rails`
@@ -49,13 +51,16 @@ gem.
 * `--ruby`:
   Update the locked version of Ruby to the current version of Ruby.
 
-* `--bundler`:
+* `--bundler[=BUNDLER]`:
   Update the locked version of bundler to the invoked bundler version.
 
 * `--full-index`:
   Fall back to using the single-file index of all gems.
 
-* `--jobs=[<number>]`, `-j[<number>]`:
+* `--gemfile=GEMFILE`:
+  Use the specified gemfile instead of [`Gemfile(5)`][Gemfile(5)].
+
+* `--jobs=<number>`, `-j=<number>`:
   Specify the number of jobs to run in parallel. The default is the number of
   available processors.
 
@@ -65,7 +70,7 @@ gem.
 * `--quiet`:
   Only output warnings and errors.
 
-* `--redownload`:
+* `--redownload`, `--force`:
   Force downloading every gem.
 
 * `--patch`:
@@ -77,6 +82,9 @@ gem.
 * `--major`:
   Prefer updating to next major version (default).
 
+* `--pre`:
+  Always choose the highest allowed version, regardless of prerelease status.
+
 * `--strict`:
   Do not allow any gem to be updated past latest `--patch` | `--minor` | `--major`.
 
diff --git a/lib/bundler/man/bundle-version.1 b/lib/bundler/man/bundle-version.1
index 5e3ed44600646e..e591f597664636 100644
--- a/lib/bundler/man/bundle-version.1
+++ b/lib/bundler/man/bundle-version.1
@@ -1,35 +1,22 @@
-.\" generated with Ronn/v0.7.3
-.\" http://github.com/rtomayko/ronn/tree/0.7.3
-.
-.TH "BUNDLE\-VERSION" "1" "August 2023" "" ""
-.
+.\" generated with Ronn-NG/v0.10.1
+.\" http://github.com/apjanke/ronn-ng/tree/0.10.1
+.TH "BUNDLE\-VERSION" "1" "July 2025" ""
 .SH "NAME"
 \fBbundle\-version\fR \- Prints Bundler version information
-.
 .SH "SYNOPSIS"
 \fBbundle version\fR
-.
 .SH "DESCRIPTION"
 Prints Bundler version information\.
-.
 .SH "OPTIONS"
 No options\.
-.
 .SH "EXAMPLE"
 Print the version of Bundler with build date and commit hash of the in the Git source\.
-.
 .IP "" 4
-.
 .nf
-
 bundle version
-.
 .fi
-.
 .IP "" 0
-.
 .P
 shows \fBBundler version 2\.3\.21 (2022\-08\-24 commit d54be5fdd8)\fR for example\.
-.
 .P
 cf\. \fBbundle \-\-version\fR shows \fBBundler version 2\.3\.21\fR\.
diff --git a/lib/bundler/man/bundle-viz.1 b/lib/bundler/man/bundle-viz.1
index d5330ec7549748..b5dd1db7b7f05a 100644
--- a/lib/bundler/man/bundle-viz.1
+++ b/lib/bundler/man/bundle-viz.1
@@ -1,42 +1,30 @@
-.\" generated with Ronn/v0.7.3
-.\" http://github.com/rtomayko/ronn/tree/0.7.3
-.
-.TH "BUNDLE\-VIZ" "1" "August 2023" "" ""
-.
+.\" generated with Ronn-NG/v0.10.1
+.\" http://github.com/apjanke/ronn-ng/tree/0.10.1
+.TH "BUNDLE\-VIZ" "1" "July 2025" ""
 .SH "NAME"
 \fBbundle\-viz\fR \- Generates a visual dependency graph for your Gemfile
-.
 .SH "SYNOPSIS"
 \fBbundle viz\fR [\-\-file=FILE] [\-\-format=FORMAT] [\-\-requirements] [\-\-version] [\-\-without=GROUP GROUP]
-.
 .SH "DESCRIPTION"
 \fBviz\fR generates a PNG file of the current \fBGemfile(5)\fR as a dependency graph\. \fBviz\fR requires the ruby\-graphviz gem (and its dependencies)\.
-.
 .P
 The associated gems must also be installed via \fBbundle install(1)\fR \fIbundle\-install\.1\.html\fR\.
-.
 .P
 \fBviz\fR command was deprecated in Bundler 2\.2\. Use bundler\-graph plugin \fIhttps://github\.com/rubygems/bundler\-graph\fR instead\.
-.
 .SH "OPTIONS"
-.
 .TP
-\fB\-\-file\fR, \fB\-f\fR
+\fB\-\-file=FILE\fR, \fB\-f=FILE\fR
 The name to use for the generated file\. See \fB\-\-format\fR option
-.
 .TP
-\fB\-\-format\fR, \fB\-F\fR
-This is output format option\. Supported format is png, jpg, svg, dot \.\.\.
-.
+\fB\-\-format=FORMAT\fR, \fB\-F=FORMAT\fR
+This is output format option\. Supported format is png, jpg, svg, dot \|\.\|\.\|\.
 .TP
 \fB\-\-requirements\fR, \fB\-R\fR
 Set to show the version of each required dependency\.
-.
 .TP
 \fB\-\-version\fR, \fB\-v\fR
 Set to show each gem version\.
-.
 .TP
-\fB\-\-without\fR, \fB\-W\fR
+\fB\-\-without=<list>\fR, \fB\-W=<list>\fR
 Exclude gems that are part of the specified named group\.
 
diff --git a/lib/bundler/man/bundle-viz.1.ronn b/lib/bundler/man/bundle-viz.1.ronn
index f2202569430ca5..730b0eed22e10d 100644
--- a/lib/bundler/man/bundle-viz.1.ronn
+++ b/lib/bundler/man/bundle-viz.1.ronn
@@ -20,13 +20,17 @@ The associated gems must also be installed via [`bundle install(1)`](bundle-inst
 
 ## OPTIONS
 
-* `--file`, `-f`:
+* `--file=FILE`, `-f=FILE`:
   The name to use for the generated file. See `--format` option
-* `--format`, `-F`:
+
+* `--format=FORMAT`, `-F=FORMAT`:
   This is output format option. Supported format is png, jpg, svg, dot ...
+
 * `--requirements`, `-R`:
   Set to show the version of each required dependency.
+
 * `--version`, `-v`:
   Set to show each gem version.
-* `--without`, `-W`:
+
+* `--without=<list>`, `-W=<list>`:
   Exclude gems that are part of the specified named group.
diff --git a/lib/bundler/man/bundle.1 b/lib/bundler/man/bundle.1
index 99c65a72b52a9c..269e28141d3101 100644
--- a/lib/bundler/man/bundle.1
+++ b/lib/bundler/man/bundle.1
@@ -1,141 +1,102 @@
-.\" generated with Ronn/v0.7.3
-.\" http://github.com/rtomayko/ronn/tree/0.7.3
-.
-.TH "BUNDLE" "1" "August 2023" "" ""
-.
+.\" generated with Ronn-NG/v0.10.1
+.\" http://github.com/apjanke/ronn-ng/tree/0.10.1
+.TH "BUNDLE" "1" "July 2025" ""
 .SH "NAME"
 \fBbundle\fR \- Ruby Dependency Management
-.
 .SH "SYNOPSIS"
 \fBbundle\fR COMMAND [\-\-no\-color] [\-\-verbose] [ARGS]
-.
 .SH "DESCRIPTION"
-Bundler manages an \fBapplication\'s dependencies\fR through its entire life across many machines systematically and repeatably\.
-.
+Bundler manages an \fBapplication's dependencies\fR through its entire life across many machines systematically and repeatably\.
 .P
 See the bundler website \fIhttps://bundler\.io\fR for information on getting started, and Gemfile(5) for more information on the \fBGemfile\fR format\.
-.
 .SH "OPTIONS"
-.
 .TP
 \fB\-\-no\-color\fR
 Print all output without color
-.
 .TP
 \fB\-\-retry\fR, \fB\-r\fR
 Specify the number of times you wish to attempt network commands
-.
 .TP
 \fB\-\-verbose\fR, \fB\-V\fR
 Print out additional logging information
-.
 .SH "BUNDLE COMMANDS"
 We divide \fBbundle\fR subcommands into primary commands and utilities:
-.
 .SH "PRIMARY COMMANDS"
-.
 .TP
 \fBbundle install(1)\fR \fIbundle\-install\.1\.html\fR
 Install the gems specified by the \fBGemfile\fR or \fBGemfile\.lock\fR
-.
 .TP
 \fBbundle update(1)\fR \fIbundle\-update\.1\.html\fR
 Update dependencies to their latest versions
-.
 .TP
 \fBbundle cache(1)\fR \fIbundle\-cache\.1\.html\fR
 Package the \.gem files required by your application into the \fBvendor/cache\fR directory (aliases: \fBbundle package\fR, \fBbundle pack\fR)
-.
 .TP
 \fBbundle exec(1)\fR \fIbundle\-exec\.1\.html\fR
 Execute a script in the current bundle
-.
 .TP
 \fBbundle config(1)\fR \fIbundle\-config\.1\.html\fR
 Specify and read configuration options for Bundler
-.
 .TP
 \fBbundle help(1)\fR \fIbundle\-help\.1\.html\fR
 Display detailed help for each subcommand
-.
 .SH "UTILITIES"
-.
 .TP
 \fBbundle add(1)\fR \fIbundle\-add\.1\.html\fR
 Add the named gem to the Gemfile and run \fBbundle install\fR
-.
 .TP
 \fBbundle binstubs(1)\fR \fIbundle\-binstubs\.1\.html\fR
 Generate binstubs for executables in a gem
-.
 .TP
 \fBbundle check(1)\fR \fIbundle\-check\.1\.html\fR
 Determine whether the requirements for your application are installed and available to Bundler
-.
 .TP
 \fBbundle show(1)\fR \fIbundle\-show\.1\.html\fR
 Show the source location of a particular gem in the bundle
-.
 .TP
 \fBbundle outdated(1)\fR \fIbundle\-outdated\.1\.html\fR
 Show all of the outdated gems in the current bundle
-.
 .TP
 \fBbundle console(1)\fR (deprecated)
 Start an IRB session in the current bundle
-.
 .TP
 \fBbundle open(1)\fR \fIbundle\-open\.1\.html\fR
 Open an installed gem in the editor
-.
 .TP
 \fBbundle lock(1)\fR \fIbundle\-lock\.1\.html\fR
 Generate a lockfile for your dependencies
-.
 .TP
 \fBbundle viz(1)\fR \fIbundle\-viz\.1\.html\fR (deprecated)
 Generate a visual representation of your dependencies
-.
 .TP
 \fBbundle init(1)\fR \fIbundle\-init\.1\.html\fR
 Generate a simple \fBGemfile\fR, placed in the current directory
-.
 .TP
 \fBbundle gem(1)\fR \fIbundle\-gem\.1\.html\fR
 Create a simple gem, suitable for development with Bundler
-.
 .TP
 \fBbundle platform(1)\fR \fIbundle\-platform\.1\.html\fR
 Display platform compatibility information
-.
 .TP
 \fBbundle clean(1)\fR \fIbundle\-clean\.1\.html\fR
 Clean up unused gems in your Bundler directory
-.
 .TP
 \fBbundle doctor(1)\fR \fIbundle\-doctor\.1\.html\fR
 Display warnings about common problems
-.
 .TP
 \fBbundle remove(1)\fR \fIbundle\-remove\.1\.html\fR
 Removes gems from the Gemfile
-.
 .TP
 \fBbundle plugin(1)\fR \fIbundle\-plugin\.1\.html\fR
 Manage Bundler plugins
-.
 .TP
 \fBbundle version(1)\fR \fIbundle\-version\.1\.html\fR
 Prints Bundler version information
-.
 .SH "PLUGINS"
-When running a command that isn\'t listed in PRIMARY COMMANDS or UTILITIES, Bundler will try to find an executable on your path named \fBbundler\-<command>\fR and execute it, passing down any extra arguments to it\.
-.
+When running a command that isn't listed in PRIMARY COMMANDS or UTILITIES, Bundler will try to find an executable on your path named \fBbundler\-<command>\fR and execute it, passing down any extra arguments to it\.
 .SH "OBSOLETE"
 These commands are obsolete and should no longer be used:
-.
 .IP "\(bu" 4
 \fBbundle inject(1)\fR
-.
 .IP "" 0
 
diff --git a/lib/bundler/man/gemfile.5 b/lib/bundler/man/gemfile.5
index 6f35ce0c28cd2f..c926e1ff2d30da 100644
--- a/lib/bundler/man/gemfile.5
+++ b/lib/bundler/man/gemfile.5
@@ -1,239 +1,143 @@
-.\" generated with Ronn/v0.7.3
-.\" http://github.com/rtomayko/ronn/tree/0.7.3
-.
-.TH "GEMFILE" "5" "August 2023" "" ""
-.
+.\" generated with Ronn-NG/v0.10.1
+.\" http://github.com/apjanke/ronn-ng/tree/0.10.1
+.TH "GEMFILE" "5" "July 2025" ""
 .SH "NAME"
 \fBGemfile\fR \- A format for describing gem dependencies for Ruby programs
-.
 .SH "SYNOPSIS"
 A \fBGemfile\fR describes the gem dependencies required to execute associated Ruby code\.
-.
 .P
 Place the \fBGemfile\fR in the root of the directory containing the associated code\. For instance, in a Rails application, place the \fBGemfile\fR in the same directory as the \fBRakefile\fR\.
-.
 .SH "SYNTAX"
 A \fBGemfile\fR is evaluated as Ruby code, in a context which makes available a number of methods used to describe the gem requirements\.
-.
 .SH "GLOBAL SOURCE"
 At the top of the \fBGemfile\fR, add a single line for the \fBRubyGems\fR source that contains the gems listed in the \fBGemfile\fR\.
-.
 .IP "" 4
-.
 .nf
-
 source "https://rubygems\.org"
-.
 .fi
-.
 .IP "" 0
-.
 .P
 You can add only one global source\. In Bundler 1\.13, adding multiple global sources was deprecated\. The \fBsource\fR \fBMUST\fR be a valid RubyGems repository\.
-.
 .P
 To use more than one source of RubyGems, you should use \fI\fBsource\fR block\fR\.
-.
 .P
 A source is checked for gems following the heuristics described in \fISOURCE PRIORITY\fR\.
-.
 .P
 \fBNote about a behavior of the feature deprecated in Bundler 1\.13\fR: If a gem is found in more than one global source, Bundler will print a warning after installing the gem indicating which source was used, and listing the other sources where the gem is available\. A specific source can be selected for gems that need to use a non\-standard repository, suppressing this warning, by using the \fI\fB:source\fR option\fR or \fBsource\fR block\.
-.
 .SS "CREDENTIALS"
 Some gem sources require a username and password\. Use bundle config(1) \fIbundle\-config\.1\.html\fR to set the username and password for any of the sources that need it\. The command must be run once on each computer that will install the Gemfile, but this keeps the credentials from being stored in plain text in version control\.
-.
 .IP "" 4
-.
 .nf
-
 bundle config gems\.example\.com user:password
-.
 .fi
-.
 .IP "" 0
-.
 .P
 For some sources, like a company Gemfury account, it may be easier to include the credentials in the Gemfile as part of the source URL\.
-.
 .IP "" 4
-.
 .nf
-
 source "https://user:password@gems\.example\.com"
-.
 .fi
-.
 .IP "" 0
-.
 .P
 Credentials in the source URL will take precedence over credentials set using \fBconfig\fR\.
-.
 .SH "RUBY"
 If your application requires a specific Ruby version or engine, specify your requirements using the \fBruby\fR method, with the following arguments\. All parameters are \fBOPTIONAL\fR unless otherwise specified\.
-.
 .SS "VERSION (required)"
 The version of Ruby that your application requires\. If your application requires an alternate Ruby engine, such as JRuby, TruffleRuby, etc\., this should be the Ruby version that the engine is compatible with\.
-.
 .IP "" 4
-.
 .nf
-
 ruby "3\.1\.2"
-.
 .fi
-.
 .IP "" 0
-.
 .P
 If you wish to derive your Ruby version from a version file (ie \.ruby\-version), you can use the \fBfile\fR option instead\.
-.
 .IP "" 4
-.
 .nf
-
 ruby file: "\.ruby\-version"
-.
 .fi
-.
 .IP "" 0
-.
 .P
 The version file should conform to any of the following formats:
-.
 .IP "\(bu" 4
 \fB3\.1\.2\fR (\.ruby\-version)
-.
 .IP "\(bu" 4
 \fBruby 3\.1\.2\fR (\.tool\-versions, read: https://asdf\-vm\.com/manage/configuration\.html#tool\-versions)
-.
 .IP "" 0
-.
 .SS "ENGINE"
 Each application \fImay\fR specify a Ruby engine\. If an engine is specified, an engine version \fImust\fR also be specified\.
-.
 .P
-What exactly is an Engine? \- A Ruby engine is an implementation of the Ruby language\.
-.
+What exactly is an Engine?
 .IP "\(bu" 4
-For background: the reference or original implementation of the Ruby programming language is called Matz\'s Ruby Interpreter \fIhttps://en\.wikipedia\.org/wiki/Ruby_MRI\fR, or MRI for short\. This is named after Ruby creator Yukihiro Matsumoto, also known as Matz\. MRI is also known as CRuby, because it is written in C\. MRI is the most widely used Ruby engine\.
-.
+A Ruby engine is an implementation of the Ruby language\.
 .IP "\(bu" 4
-Other implementations \fIhttps://www\.ruby\-lang\.org/en/about/\fR of Ruby exist\. Some of the more well\-known implementations include JRuby \fIhttp://jruby\.org/\fR and TruffleRuby \fIhttps://www\.graalvm\.org/ruby/\fR\. Rubinius is an alternative implementation of Ruby written in Ruby\. JRuby is an implementation of Ruby on the JVM, short for Java Virtual Machine\. TruffleRuby is a Ruby implementation on the GraalVM, a language toolkit built on the JVM\.
-.
+For background: the reference or original implementation of the Ruby programming language is called Matz's Ruby Interpreter \fIhttps://en\.wikipedia\.org/wiki/Ruby_MRI\fR, or MRI for short\. This is named after Ruby creator Yukihiro Matsumoto, also known as Matz\. MRI is also known as CRuby, because it is written in C\. MRI is the most widely used Ruby engine\.
+.IP "\(bu" 4
+Other implementations \fIhttps://www\.ruby\-lang\.org/en/about/\fR of Ruby exist\. Some of the more well\-known implementations include JRuby \fIhttps://www\.jruby\.org/\fR and TruffleRuby \fIhttps://www\.graalvm\.org/ruby/\fR\. Rubinius is an alternative implementation of Ruby written in Ruby\. JRuby is an implementation of Ruby on the JVM, short for Java Virtual Machine\. TruffleRuby is a Ruby implementation on the GraalVM, a language toolkit built on the JVM\.
 .IP "" 0
-.
 .SS "ENGINE VERSION"
 Each application \fImay\fR specify a Ruby engine version\. If an engine version is specified, an engine \fImust\fR also be specified\. If the engine is "ruby" the engine version specified \fImust\fR match the Ruby version\.
-.
 .IP "" 4
-.
 .nf
-
 ruby "2\.6\.8", engine: "jruby", engine_version: "9\.3\.8\.0"
-.
 .fi
-.
 .IP "" 0
-.
 .SS "PATCHLEVEL"
 Each application \fImay\fR specify a Ruby patchlevel\. Specifying the patchlevel has been meaningless since Ruby 2\.1\.0 was released as the patchlevel is now uniquely determined by a combination of major, minor, and teeny version numbers\.
-.
 .P
 This option was implemented in Bundler 1\.4\.0 for Ruby 2\.0 or earlier\.
-.
 .IP "" 4
-.
 .nf
-
 ruby "3\.1\.2", patchlevel: "20"
-.
 .fi
-.
 .IP "" 0
-.
 .SH "GEMS"
 Specify gem requirements using the \fBgem\fR method, with the following arguments\. All parameters are \fBOPTIONAL\fR unless otherwise specified\.
-.
 .SS "NAME (required)"
 For each gem requirement, list a single \fIgem\fR line\.
-.
 .IP "" 4
-.
 .nf
-
 gem "nokogiri"
-.
 .fi
-.
 .IP "" 0
-.
 .SS "VERSION"
 Each \fIgem\fR \fBMAY\fR have one or more version specifiers\.
-.
 .IP "" 4
-.
 .nf
-
 gem "nokogiri", ">= 1\.4\.2"
 gem "RedCloth", ">= 4\.1\.0", "< 4\.2\.0"
-.
 .fi
-.
 .IP "" 0
-.
 .SS "REQUIRE AS"
 Each \fIgem\fR \fBMAY\fR specify files that should be used when autorequiring via \fBBundler\.require\fR\. You may pass an array with multiple files or \fBtrue\fR if the file you want \fBrequired\fR has the same name as \fIgem\fR or \fBfalse\fR to prevent any file from being autorequired\.
-.
 .IP "" 4
-.
 .nf
-
 gem "redis", require: ["redis/connection/hiredis", "redis"]
 gem "webmock", require: false
 gem "byebug", require: true
-.
 .fi
-.
 .IP "" 0
-.
 .P
 The argument defaults to the name of the gem\. For example, these are identical:
-.
 .IP "" 4
-.
 .nf
-
 gem "nokogiri"
 gem "nokogiri", require: "nokogiri"
 gem "nokogiri", require: true
-.
 .fi
-.
 .IP "" 0
-.
 .SS "GROUPS"
 Each \fIgem\fR \fBMAY\fR specify membership in one or more groups\. Any \fIgem\fR that does not specify membership in any group is placed in the \fBdefault\fR group\.
-.
 .IP "" 4
-.
 .nf
-
 gem "rspec", group: :test
 gem "wirble", groups: [:development, :test]
-.
 .fi
-.
 .IP "" 0
-.
 .P
 The Bundler runtime allows its two main methods, \fBBundler\.setup\fR and \fBBundler\.require\fR, to limit their impact to particular groups\.
-.
 .IP "" 4
-.
 .nf
-
-# setup adds gems to Ruby\'s load path
+# setup adds gems to Ruby's load path
 Bundler\.setup                    # defaults to all groups
 require "bundler/setup"          # same as Bundler\.setup
 Bundler\.setup(:default)          # only set up the _default_ group
@@ -245,437 +149,271 @@ Bundler\.require                  # defaults to the _default_ group
 Bundler\.require(:default)        # identical
 Bundler\.require(:default, :test) # requires the _default_ and _test_ groups
 Bundler\.require(:test)           # requires the _test_ group
-.
 .fi
-.
 .IP "" 0
-.
 .P
 The Bundler CLI allows you to specify a list of groups whose gems \fBbundle install\fR should not install with the \fBwithout\fR configuration\.
-.
 .P
 To specify multiple groups to ignore, specify a list of groups separated by spaces\.
-.
 .IP "" 4
-.
 .nf
-
 bundle config set \-\-local without test
 bundle config set \-\-local without development test
-.
 .fi
-.
 .IP "" 0
-.
 .P
 Also, calling \fBBundler\.setup\fR with no parameters, or calling \fBrequire "bundler/setup"\fR will setup all groups except for the ones you excluded via \fB\-\-without\fR (since they are not available)\.
-.
 .P
 Note that on \fBbundle install\fR, bundler downloads and evaluates all gems, in order to create a single canonical list of all of the required gems and their dependencies\. This means that you cannot list different versions of the same gems in different groups\. For more details, see Understanding Bundler \fIhttps://bundler\.io/rationale\.html\fR\.
-.
 .SS "PLATFORMS"
 If a gem should only be used in a particular platform or set of platforms, you can specify them\. Platforms are essentially identical to groups, except that you do not need to use the \fB\-\-without\fR install\-time flag to exclude groups of gems for other platforms\.
-.
 .P
 There are a number of \fBGemfile\fR platforms:
-.
 .TP
 \fBruby\fR
 C Ruby (MRI), Rubinius, or TruffleRuby, but not Windows
-.
 .TP
 \fBmri\fR
 C Ruby (MRI) only, but not Windows
-.
 .TP
 \fBwindows\fR
 Windows C Ruby (MRI), including RubyInstaller 32\-bit and 64\-bit versions
-.
 .TP
 \fBmswin\fR
 Windows C Ruby (MRI), including RubyInstaller 32\-bit versions
-.
 .TP
 \fBmswin64\fR
 Windows C Ruby (MRI), including RubyInstaller 64\-bit versions
-.
 .TP
 \fBrbx\fR
 Rubinius
-.
 .TP
 \fBjruby\fR
 JRuby
-.
 .TP
 \fBtruffleruby\fR
 TruffleRuby
-.
 .P
 On platforms \fBruby\fR, \fBmri\fR, \fBmswin\fR, \fBmswin64\fR, and \fBwindows\fR, you may additionally specify a version by appending the major and minor version numbers without a delimiter\. For example, to specify that a gem should only be used on platform \fBruby\fR version 3\.1, use:
-.
 .IP "" 4
-.
 .nf
-
 ruby_31
-.
 .fi
-.
 .IP "" 0
-.
 .P
 As with groups (above), you may specify one or more platforms:
-.
 .IP "" 4
-.
 .nf
-
 gem "weakling",   platforms: :jruby
 gem "ruby\-debug", platforms: :mri_31
 gem "nokogiri",   platforms: [:windows_31, :jruby]
-.
 .fi
-.
 .IP "" 0
-.
 .P
 All operations involving groups (\fBbundle install\fR \fIbundle\-install\.1\.html\fR, \fBBundler\.setup\fR, \fBBundler\.require\fR) behave exactly the same as if any groups not matching the current platform were explicitly excluded\.
-.
 .P
 The following platform values are deprecated and should be replaced with \fBwindows\fR:
-.
 .IP "\(bu" 4
 \fBmswin\fR, \fBmswin64\fR, \fBmingw32\fR, \fBx64_mingw\fR
-.
 .IP "" 0
-.
+.P
+Note that, while unfortunately using the same terminology, the values of this option are different from the values that \fBbundle lock \-\-add\-platform\fR can take\. The values of this option are more closer to "Ruby Implementation" while the values that \fBbundle lock \-\-add\-platform\fR understands are more related to OS and architecture of the different systems where your lockfile will be used\.
 .SS "FORCE_RUBY_PLATFORM"
 If you always want the pure ruby variant of a gem to be chosen over platform specific variants, you can use the \fBforce_ruby_platform\fR option:
-.
 .IP "" 4
-.
 .nf
-
 gem "ffi", force_ruby_platform: true
-.
 .fi
-.
 .IP "" 0
-.
 .P
 This can be handy (assuming the pure ruby variant works fine) when:
-.
 .IP "\(bu" 4
-You\'re having issues with the platform specific variant\.
-.
+You're having issues with the platform specific variant\.
 .IP "\(bu" 4
 The platform specific variant does not yet support a newer ruby (and thus has a \fBrequired_ruby_version\fR upper bound), but you still want your Gemfile{\.lock} files to resolve under that ruby\.
-.
 .IP "" 0
-.
 .SS "SOURCE"
-You can select an alternate RubyGems repository for a gem using the \':source\' option\.
-.
+You can select an alternate RubyGems repository for a gem using the ':source' option\.
 .IP "" 4
-.
 .nf
-
 gem "some_internal_gem", source: "https://gems\.example\.com"
-.
 .fi
-.
 .IP "" 0
-.
 .P
 This forces the gem to be loaded from this source and ignores the global source declared at the top level of the file\. If the gem does not exist in this source, it will not be installed\.
-.
 .P
 Bundler will search for child dependencies of this gem by first looking in the source selected for the parent, but if they are not found there, it will fall back on the global source\.
-.
 .P
 \fBNote about a behavior of the feature deprecated in Bundler 1\.13\fR: Selecting a specific source repository this way also suppresses the ambiguous gem warning described above in \fIGLOBAL SOURCE\fR\.
-.
 .P
 Using the \fB:source\fR option for an individual gem will also make that source available as a possible global source for any other gems which do not specify explicit sources\. Thus, when adding gems with explicit sources, it is recommended that you also ensure all other gems in the Gemfile are using explicit sources\.
-.
 .SS "GIT"
 If necessary, you can specify that a gem is located at a particular git repository using the \fB:git\fR parameter\. The repository can be accessed via several protocols:
-.
 .TP
 \fBHTTP(S)\fR
 gem "rails", git: "https://github\.com/rails/rails\.git"
-.
 .TP
 \fBSSH\fR
 gem "rails", git: "git@github\.com:rails/rails\.git"
-.
 .TP
 \fBgit\fR
 gem "rails", git: "git://github\.com/rails/rails\.git"
-.
 .P
 If using SSH, the user that you use to run \fBbundle install\fR \fBMUST\fR have the appropriate keys available in their \fB$HOME/\.ssh\fR\.
-.
 .P
 \fBNOTE\fR: \fBhttp://\fR and \fBgit://\fR URLs should be avoided if at all possible\. These protocols are unauthenticated, so a man\-in\-the\-middle attacker can deliver malicious code and compromise your system\. HTTPS and SSH are strongly preferred\.
-.
 .P
 The \fBgroup\fR, \fBplatforms\fR, and \fBrequire\fR options are available and behave exactly the same as they would for a normal gem\.
-.
 .P
 A git repository \fBSHOULD\fR have at least one file, at the root of the directory containing the gem, with the extension \fB\.gemspec\fR\. This file \fBMUST\fR contain a valid gem specification, as expected by the \fBgem build\fR command\.
-.
 .P
 If a git repository does not have a \fB\.gemspec\fR, bundler will attempt to create one, but it will not contain any dependencies, executables, or C extension compilation instructions\. As a result, it may fail to properly integrate into your application\.
-.
 .P
 If a git repository does have a \fB\.gemspec\fR for the gem you attached it to, a version specifier, if provided, means that the git repository is only valid if the \fB\.gemspec\fR specifies a version matching the version specifier\. If not, bundler will print a warning\.
-.
 .IP "" 4
-.
 .nf
-
 gem "rails", "2\.3\.8", git: "https://github\.com/rails/rails\.git"
 # bundle install will fail, because the \.gemspec in the rails
-# repository\'s master branch specifies version 3\.0\.0
-.
+# repository's master branch specifies version 3\.0\.0
 .fi
-.
 .IP "" 0
-.
 .P
 If a git repository does \fBnot\fR have a \fB\.gemspec\fR for the gem you attached it to, a version specifier \fBMUST\fR be provided\. Bundler will use this version in the simple \fB\.gemspec\fR it creates\.
-.
 .P
 Git repositories support a number of additional options\.
-.
 .TP
 \fBbranch\fR, \fBtag\fR, and \fBref\fR
 You \fBMUST\fR only specify at most one of these options\. The default is \fBbranch: "master"\fR\. For example:
-.
 .IP
 gem "rails", git: "https://github\.com/rails/rails\.git", branch: "5\-0\-stable"
-.
 .IP
 gem "rails", git: "https://github\.com/rails/rails\.git", tag: "v5\.0\.0"
-.
 .IP
 gem "rails", git: "https://github\.com/rails/rails\.git", ref: "4aded"
-.
 .TP
 \fBsubmodules\fR
 For reference, a git submodule \fIhttps://git\-scm\.com/book/en/v2/Git\-Tools\-Submodules\fR lets you have another git repository within a subfolder of your repository\. Specify \fBsubmodules: true\fR to cause bundler to expand any submodules included in the git repository
-.
 .P
 If a git repository contains multiple \fB\.gemspecs\fR, each \fB\.gemspec\fR represents a gem located at the same place in the file system as the \fB\.gemspec\fR\.
-.
 .IP "" 4
-.
 .nf
-
 |~rails                   [git root]
 | |\-rails\.gemspec         [rails gem located here]
 |~actionpack
 | |\-actionpack\.gemspec    [actionpack gem located here]
 |~activesupport
 | |\-activesupport\.gemspec [activesupport gem located here]
-|\.\.\.
-.
+|\|\.\|\.\|\.
 .fi
-.
 .IP "" 0
-.
 .P
 To install a gem located in a git repository, bundler changes to the directory containing the gemspec, runs \fBgem build name\.gemspec\fR and then installs the resulting gem\. The \fBgem build\fR command, which comes standard with Rubygems, evaluates the \fB\.gemspec\fR in the context of the directory in which it is located\.
-.
 .SS "GIT SOURCE"
-A custom git source can be defined via the \fBgit_source\fR method\. Provide the source\'s name as an argument, and a block which receives a single argument and interpolates it into a string to return the full repo address:
-.
+A custom git source can be defined via the \fBgit_source\fR method\. Provide the source's name as an argument, and a block which receives a single argument and interpolates it into a string to return the full repo address:
 .IP "" 4
-.
 .nf
-
 git_source(:stash){ |repo_name| "https://stash\.corp\.acme\.pl/#{repo_name}\.git" }
-gem \'rails\', stash: \'forks/rails\'
-.
+gem 'rails', stash: 'forks/rails'
 .fi
-.
 .IP "" 0
-.
 .P
 In addition, if you wish to choose a specific branch:
-.
 .IP "" 4
-.
 .nf
-
 gem "rails", stash: "forks/rails", branch: "branch_name"
-.
 .fi
-.
 .IP "" 0
-.
 .SS "GITHUB"
 \fBNOTE\fR: This shorthand should be avoided until Bundler 2\.0, since it currently expands to an insecure \fBgit://\fR URL\. This allows a man\-in\-the\-middle attacker to compromise your system\.
-.
 .P
 If the git repository you want to use is hosted on GitHub and is public, you can use the :github shorthand to specify the github username and repository name (without the trailing "\.git"), separated by a slash\. If both the username and repository name are the same, you can omit one\.
-.
 .IP "" 4
-.
 .nf
-
 gem "rails", github: "rails/rails"
 gem "rails", github: "rails"
-.
 .fi
-.
 .IP "" 0
-.
 .P
 Are both equivalent to
-.
 .IP "" 4
-.
 .nf
-
 gem "rails", git: "https://github\.com/rails/rails\.git"
-.
 .fi
-.
 .IP "" 0
-.
 .P
 Since the \fBgithub\fR method is a specialization of \fBgit_source\fR, it accepts a \fB:branch\fR named argument\.
-.
 .P
 You can also directly pass a pull request URL:
-.
 .IP "" 4
-.
 .nf
-
 gem "rails", github: "https://github\.com/rails/rails/pull/43753"
-.
 .fi
-.
 .IP "" 0
-.
 .P
 Which is equivalent to:
-.
 .IP "" 4
-.
 .nf
-
 gem "rails", github: "rails/rails", branch: "refs/pull/43753/head"
-.
 .fi
-.
 .IP "" 0
-.
 .SS "GIST"
 If the git repository you want to use is hosted as a GitHub Gist and is public, you can use the :gist shorthand to specify the gist identifier (without the trailing "\.git")\.
-.
 .IP "" 4
-.
 .nf
-
 gem "the_hatch", gist: "4815162342"
-.
 .fi
-.
 .IP "" 0
-.
 .P
 Is equivalent to:
-.
 .IP "" 4
-.
 .nf
-
 gem "the_hatch", git: "https://gist\.github\.com/4815162342\.git"
-.
 .fi
-.
 .IP "" 0
-.
 .P
 Since the \fBgist\fR method is a specialization of \fBgit_source\fR, it accepts a \fB:branch\fR named argument\.
-.
 .SS "BITBUCKET"
 If the git repository you want to use is hosted on Bitbucket and is public, you can use the :bitbucket shorthand to specify the bitbucket username and repository name (without the trailing "\.git"), separated by a slash\. If both the username and repository name are the same, you can omit one\.
-.
 .IP "" 4
-.
 .nf
-
 gem "rails", bitbucket: "rails/rails"
 gem "rails", bitbucket: "rails"
-.
 .fi
-.
 .IP "" 0
-.
 .P
 Are both equivalent to
-.
 .IP "" 4
-.
 .nf
-
 gem "rails", git: "https://rails@bitbucket\.org/rails/rails\.git"
-.
 .fi
-.
 .IP "" 0
-.
 .P
 Since the \fBbitbucket\fR method is a specialization of \fBgit_source\fR, it accepts a \fB:branch\fR named argument\.
-.
 .SS "PATH"
 You can specify that a gem is located in a particular location on the file system\. Relative paths are resolved relative to the directory containing the \fBGemfile\fR\.
-.
 .P
 Similar to the semantics of the \fB:git\fR option, the \fB:path\fR option requires that the directory in question either contains a \fB\.gemspec\fR for the gem, or that you specify an explicit version that bundler should use\.
-.
 .P
 Unlike \fB:git\fR, bundler does not compile C extensions for gems specified as paths\.
-.
 .IP "" 4
-.
 .nf
-
 gem "rails", path: "vendor/rails"
-.
 .fi
-.
 .IP "" 0
-.
 .P
-If you would like to use multiple local gems directly from the filesystem, you can set a global \fBpath\fR option to the path containing the gem\'s files\. This will automatically load gemspec files from subdirectories\.
-.
+If you would like to use multiple local gems directly from the filesystem, you can set a global \fBpath\fR option to the path containing the gem's files\. This will automatically load gemspec files from subdirectories\.
 .IP "" 4
-.
 .nf
-
-path \'components\' do
-  gem \'admin_ui\'
-  gem \'public_ui\'
+path 'components' do
+  gem 'admin_ui'
+  gem 'public_ui'
 end
-.
 .fi
-.
 .IP "" 0
-.
 .SH "BLOCK FORM OF SOURCE, GIT, PATH, GROUP and PLATFORMS"
 The \fB:source\fR, \fB:git\fR, \fB:path\fR, \fB:group\fR, and \fB:platforms\fR options may be applied to a group of gems by using block form\.
-.
 .IP "" 4
-.
 .nf
-
 source "https://gems\.example\.com" do
   gem "some_internal_gem"
   gem "another_internal_gem"
@@ -695,61 +433,40 @@ group :development, optional: true do
   gem "wirble"
   gem "faker"
 end
-.
 .fi
-.
 .IP "" 0
-.
 .P
 In the case of the group block form the :optional option can be given to prevent a group from being installed unless listed in the \fB\-\-with\fR option given to the \fBbundle install\fR command\.
-.
 .P
 In the case of the \fBgit\fR block form, the \fB:ref\fR, \fB:branch\fR, \fB:tag\fR, and \fB:submodules\fR options may be passed to the \fBgit\fR method, and all gems in the block will inherit those options\.
-.
 .P
 The presence of a \fBsource\fR block in a Gemfile also makes that source available as a possible global source for any other gems which do not specify explicit sources\. Thus, when defining source blocks, it is recommended that you also ensure all other gems in the Gemfile are using explicit sources, either via source blocks or \fB:source\fR directives on individual gems\.
-.
 .SH "INSTALL_IF"
 The \fBinstall_if\fR method allows gems to be installed based on a proc or lambda\. This is especially useful for optional gems that can only be used if certain software is installed or some other conditions are met\.
-.
 .IP "" 4
-.
 .nf
-
 install_if \-> { RUBY_PLATFORM =~ /darwin/ } do
   gem "pasteboard"
 end
-.
 .fi
-.
 .IP "" 0
-.
 .SH "GEMSPEC"
-The \fB\.gemspec\fR \fIhttp://guides\.rubygems\.org/specification\-reference/\fR file is where you provide metadata about your gem to Rubygems\. Some required Gemspec attributes include the name, description, and homepage of your gem\. This is also where you specify the dependencies your gem needs to run\.
-.
+The \fB\.gemspec\fR \fIhttps://guides\.rubygems\.org/specification\-reference/\fR file is where you provide metadata about your gem to Rubygems\. Some required Gemspec attributes include the name, description, and homepage of your gem\. This is also where you specify the dependencies your gem needs to run\.
 .P
 If you wish to use Bundler to help install dependencies for a gem while it is being developed, use the \fBgemspec\fR method to pull in the dependencies listed in the \fB\.gemspec\fR file\.
-.
 .P
-The \fBgemspec\fR method adds any runtime dependencies as gem requirements in the default group\. It also adds development dependencies as gem requirements in the \fBdevelopment\fR group\. Finally, it adds a gem requirement on your project (\fBpath: \'\.\'\fR)\. In conjunction with \fBBundler\.setup\fR, this allows you to require project files in your test code as you would if the project were installed as a gem; you need not manipulate the load path manually or require project files via relative paths\.
-.
+The \fBgemspec\fR method adds any runtime dependencies as gem requirements in the default group\. It also adds development dependencies as gem requirements in the \fBdevelopment\fR group\. Finally, it adds a gem requirement on your project (\fBpath: '\.'\fR)\. In conjunction with \fBBundler\.setup\fR, this allows you to require project files in your test code as you would if the project were installed as a gem; you need not manipulate the load path manually or require project files via relative paths\.
 .P
 The \fBgemspec\fR method supports optional \fB:path\fR, \fB:glob\fR, \fB:name\fR, and \fB:development_group\fR options, which control where bundler looks for the \fB\.gemspec\fR, the glob it uses to look for the gemspec (defaults to: \fB{,*,*/*}\.gemspec\fR), what named \fB\.gemspec\fR it uses (if more than one is present), and which group development dependencies are included in\.
-.
 .P
 When a \fBgemspec\fR dependency encounters version conflicts during resolution, the local version under development will always be selected \-\- even if there are remote versions that better match other requirements for the \fBgemspec\fR gem\.
-.
 .SH "SOURCE PRIORITY"
 When attempting to locate a gem to satisfy a gem requirement, bundler uses the following priority order:
-.
 .IP "1." 4
 The source explicitly attached to the gem (using \fB:source\fR, \fB:path\fR, or \fB:git\fR)
-.
 .IP "2." 4
 For implicit gems (dependencies of explicit gems), any source, git, or path repository declared on the parent\. This results in bundler prioritizing the ActiveSupport gem from the Rails git repository over ones from \fBrubygems\.org\fR
-.
 .IP "3." 4
 If neither of the above conditions are met, the global source will be used\. If multiple global sources are specified, they will be prioritized from last to first, but this is deprecated since Bundler 1\.13, so Bundler prints a warning and will abort with an error in the future\.
-.
 .IP "" 0
 
diff --git a/lib/bundler/man/gemfile.5.ronn b/lib/bundler/man/gemfile.5.ronn
index e8a1f8b79edb69..802549737e38e4 100644
--- a/lib/bundler/man/gemfile.5.ronn
+++ b/lib/bundler/man/gemfile.5.ronn
@@ -96,7 +96,7 @@ What exactly is an Engine?
 
   - [Other implementations](https://www.ruby-lang.org/en/about/) of Ruby exist.
     Some of the more well-known implementations include
-    [JRuby](http://jruby.org/) and [TruffleRuby](https://www.graalvm.org/ruby/).
+    [JRuby](https://www.jruby.org/) and [TruffleRuby](https://www.graalvm.org/ruby/).
     Rubinius is an alternative implementation of Ruby written in Ruby.
     JRuby is an implementation of Ruby on the JVM, short for Java Virtual Machine.
     TruffleRuby is a Ruby implementation on the GraalVM, a language toolkit built on the JVM.
@@ -242,6 +242,12 @@ The following platform values are deprecated and should be replaced with `window
 
   * `mswin`, `mswin64`, `mingw32`, `x64_mingw`
 
+Note that, while unfortunately using the same terminology, the values of this
+option are different from the values that `bundle lock --add-platform` can take.
+The values of this option are more closer to "Ruby Implementation" while the
+values that `bundle lock --add-platform` understands are more related to OS and
+architecture of the different systems where your lockfile will be used.
+
 ### FORCE_RUBY_PLATFORM
 
 If you always want the pure ruby variant of a gem to be chosen over platform
@@ -509,7 +515,7 @@ software is installed or some other conditions are met.
 
 ## GEMSPEC
 
-The [`.gemspec`](http://guides.rubygems.org/specification-reference/) file is where
+The [`.gemspec`](https://guides.rubygems.org/specification-reference/) file is where
  you provide metadata about your gem to Rubygems. Some required Gemspec
  attributes include the name, description, and homepage of your gem. This is
  also where you specify the dependencies your gem needs to run.
diff --git a/lib/bundler/man/index.txt b/lib/bundler/man/index.txt
index 24f7633e66912c..3ea3495f1b9f6c 100644
--- a/lib/bundler/man/index.txt
+++ b/lib/bundler/man/index.txt
@@ -8,13 +8,17 @@ bundle-clean(1)       bundle-clean.1
 bundle-config(1)      bundle-config.1
 bundle-console(1)     bundle-console.1
 bundle-doctor(1)      bundle-doctor.1
+bundle-env(1)         bundle-env.1
 bundle-exec(1)        bundle-exec.1
+bundle-fund(1)        bundle-fund.1
 bundle-gem(1)         bundle-gem.1
 bundle-help(1)        bundle-help.1
 bundle-info(1)        bundle-info.1
 bundle-init(1)        bundle-init.1
 bundle-inject(1)      bundle-inject.1
 bundle-install(1)     bundle-install.1
+bundle-issue(1)       bundle-issue.1
+bundle-licenses(1)    bundle-licenses.1
 bundle-list(1)        bundle-list.1
 bundle-lock(1)        bundle-lock.1
 bundle-open(1)        bundle-open.1
diff --git a/lib/bundler/match_metadata.rb b/lib/bundler/match_metadata.rb
index 499036ca93efcf..6fd2994a85f2ab 100644
--- a/lib/bundler/match_metadata.rb
+++ b/lib/bundler/match_metadata.rb
@@ -2,6 +2,10 @@
 
 module Bundler
   module MatchMetadata
+    def matches_current_metadata?
+      matches_current_ruby? && matches_current_rubygems?
+    end
+
     def matches_current_ruby?
       @required_ruby_version.satisfied_by?(Gem.ruby_version)
     end
@@ -9,5 +13,18 @@ def matches_current_ruby?
     def matches_current_rubygems?
       @required_rubygems_version.satisfied_by?(Gem.rubygems_version)
     end
+
+    def expanded_dependencies
+      runtime_dependencies + [
+        metadata_dependency("Ruby", @required_ruby_version),
+        metadata_dependency("RubyGems", @required_rubygems_version),
+      ].compact
+    end
+
+    def metadata_dependency(name, requirement)
+      return if requirement.nil? || requirement.none?
+
+      Gem::Dependency.new("#{name}\0", requirement)
+    end
   end
 end
diff --git a/lib/bundler/match_platform.rb b/lib/bundler/match_platform.rb
index ece9fb86790a97..479818e5ec9e09 100644
--- a/lib/bundler/match_platform.rb
+++ b/lib/bundler/match_platform.rb
@@ -1,23 +1,42 @@
 # frozen_string_literal: true
 
-require_relative "gem_helpers"
-
 module Bundler
   module MatchPlatform
-    include GemHelpers
+    def installable_on_platform?(target_platform) # :nodoc:
+      return true if [Gem::Platform::RUBY, nil, target_platform].include?(platform)
+      return true if Gem::Platform.new(platform) === target_platform
 
-    def match_platform(p)
-      MatchPlatform.platforms_match?(platform, p)
+      false
     end
 
-    def self.platforms_match?(gemspec_platform, local_platform)
-      return true if gemspec_platform.nil?
-      return true if gemspec_platform == Gem::Platform::RUBY
-      return true if local_platform == gemspec_platform
-      gemspec_platform = Gem::Platform.new(gemspec_platform)
-      return true if gemspec_platform === local_platform
+    def self.select_best_platform_match(specs, platform, force_ruby: false, prefer_locked: false)
+      matching = select_all_platform_match(specs, platform, force_ruby: force_ruby, prefer_locked: prefer_locked)
 
-      false
+      Gem::Platform.sort_and_filter_best_platform_match(matching, platform)
+    end
+
+    def self.select_best_local_platform_match(specs, force_ruby: false)
+      local = Bundler.local_platform
+      matching = select_all_platform_match(specs, local, force_ruby: force_ruby).filter_map(&:materialized_for_installation)
+
+      Gem::Platform.sort_best_platform_match(matching, local)
+    end
+
+    def self.select_all_platform_match(specs, platform, force_ruby: false, prefer_locked: false)
+      matching = specs.select {|spec| spec.installable_on_platform?(force_ruby ? Gem::Platform::RUBY : platform) }
+
+      specs.each(&:force_ruby_platform!) if force_ruby
+
+      if prefer_locked
+        locked_originally = matching.select {|spec| spec.is_a?(::Bundler::LazySpecification) }
+        return locked_originally if locked_originally.any?
+      end
+
+      matching
+    end
+
+    def self.generic_local_platform_is_ruby?
+      Bundler.generic_local_platform == Gem::Platform::RUBY
     end
   end
 end
diff --git a/lib/bundler/materialization.rb b/lib/bundler/materialization.rb
new file mode 100644
index 00000000000000..43124f25fbedbf
--- /dev/null
+++ b/lib/bundler/materialization.rb
@@ -0,0 +1,59 @@
+# frozen_string_literal: true
+
+module Bundler
+  #
+  # This class materializes a set of resolved specifications (`LazySpecification`)
+  # for a given gem into the most appropriate real specifications
+  # (`StubSepecification`, `EndpointSpecification`, etc), given a dependency and a
+  # target platform.
+  #
+  class Materialization
+    def initialize(dep, platform, candidates:)
+      @dep = dep
+      @platform = platform
+      @candidates = candidates
+    end
+
+    def complete?
+      specs.any?
+    end
+
+    def specs
+      @specs ||= if @candidates.nil?
+        []
+      elsif platform
+        MatchPlatform.select_best_platform_match(@candidates, platform, force_ruby: dep.force_ruby_platform)
+      else
+        MatchPlatform.select_best_local_platform_match(@candidates, force_ruby: dep.force_ruby_platform || dep.default_force_ruby_platform)
+      end
+    end
+
+    def dependencies
+      specs.first.runtime_dependencies.map {|d| [d, platform] }
+    end
+
+    def materialized_spec
+      specs.reject(&:missing?).first&.materialization
+    end
+
+    def completely_missing_specs
+      return [] unless specs.all?(&:missing?)
+
+      specs
+    end
+
+    def partially_missing_specs
+      specs.select(&:missing?)
+    end
+
+    def incomplete_specs
+      return [] if complete?
+
+      @candidates || LazySpecification.new(dep.name, nil, nil)
+    end
+
+    private
+
+    attr_reader :dep, :platform
+  end
+end
diff --git a/lib/bundler/mirror.rb b/lib/bundler/mirror.rb
index 9d437a095139ca..494a6d6aef183d 100644
--- a/lib/bundler/mirror.rb
+++ b/lib/bundler/mirror.rb
@@ -47,7 +47,7 @@ def parse(key, value)
 
       def fetch_valid_mirror_for(uri)
         downcased = uri.to_s.downcase
-        mirror = @mirrors[downcased] || @mirrors[Bundler::URI(downcased).host] || Mirror.new(uri)
+        mirror = @mirrors[downcased] || @mirrors[Gem::URI(downcased).host] || Mirror.new(uri)
         mirror.validate!(@prober)
         mirror = Mirror.new(uri) unless mirror.valid?
         mirror
@@ -74,7 +74,7 @@ def uri=(uri)
         @uri = if uri.nil?
           nil
         else
-          Bundler::URI(uri.to_s)
+          Gem::URI(uri.to_s)
         end
         @valid = nil
       end
@@ -126,7 +126,7 @@ def initialize(config_line, value)
         if uri == "all"
           @all = true
         else
-          @uri = Bundler::URI(uri).absolute? ? Settings.normalize_uri(uri) : uri
+          @uri = Gem::URI(uri).absolute? ? Settings.normalize_uri(uri) : uri
         end
         @value = value
       end
diff --git a/lib/bundler/plugin.rb b/lib/bundler/plugin.rb
index f3caff8963c720..44129cc0ff5089 100644
--- a/lib/bundler/plugin.rb
+++ b/lib/bundler/plugin.rb
@@ -62,7 +62,8 @@ def uninstall(names, options)
       if names.any?
         names.each do |name|
           if index.installed?(name)
-            Bundler.rm_rf(index.plugin_path(name))
+            path = index.plugin_path(name).to_s
+            Bundler.rm_rf(path) if index.installed_in_plugin_root?(name)
             index.unregister_plugin(name)
             Bundler.ui.info "Uninstalled plugin #{name}"
           else
@@ -100,7 +101,7 @@ def list
     # @param [Pathname] gemfile path
     # @param [Proc] block that can be evaluated for (inline) Gemfile
     def gemfile_install(gemfile = nil, &inline)
-      Bundler.settings.temporary(:frozen => false, :deployment => false) do
+      Bundler.settings.temporary(frozen: false, deployment: false) do
         builder = DSL.new
         if block_given?
           builder.instance_eval(&inline)
@@ -194,10 +195,10 @@ def source(name)
       @sources[name]
     end
 
-    # @param [Hash] The options that are present in the lock file
+    # @param [Hash] The options that are present in the lockfile
     # @return [API::Source] the instance of the class that handles the source
     #                       type passed in locked_opts
-    def source_from_lock(locked_opts)
+    def from_lock(locked_opts)
       src = source(locked_opts["type"])
 
       src.new(locked_opts.merge("uri" => locked_opts["remote"]))
@@ -227,7 +228,7 @@ def hook(event, *args, &arg_blk)
       plugins = index.hook_plugins(event)
       return unless plugins.any?
 
-      (plugins - @loaded_plugin_names).each {|name| load_plugin(name) }
+      plugins.each {|name| load_plugin(name) }
 
       @hooks_by_event[event].each {|blk| blk.call(*args, &arg_blk) }
     end
@@ -239,6 +240,11 @@ def installed?(plugin)
       Index.new.installed?(plugin)
     end
 
+    # @return [true, false] whether the plugin is loaded
+    def loaded?(plugin)
+      @loaded_plugin_names.include?(plugin)
+    end
+
     # Post installation processing and registering with index
     #
     # @param [Array<String>] plugins list to be installed
@@ -301,7 +307,7 @@ def register_plugin(name, spec, optional_plugin = false)
       @hooks_by_event = Hash.new {|h, k| h[k] = [] }
 
       load_paths = spec.load_paths
-      Bundler.rubygems.add_to_load_path(load_paths)
+      Gem.add_to_load_path(*load_paths)
       path = Pathname.new spec.full_gem_path
 
       begin
@@ -329,13 +335,33 @@ def register_plugin(name, spec, optional_plugin = false)
     # @param [String] name of the plugin
     def load_plugin(name)
       return unless name && !name.empty?
+      return if loaded?(name)
 
       # Need to ensure before this that plugin root where the rest of gems
       # are installed to be on load path to support plugin deps. Currently not
       # done to avoid conflicts
       path = index.plugin_path(name)
 
-      Bundler.rubygems.add_to_load_path(index.load_paths(name))
+      paths = index.load_paths(name)
+      invalid_paths = paths.reject {|p| File.directory?(p) }
+
+      if invalid_paths.any?
+        Bundler.ui.warn <<~MESSAGE
+          The following plugin paths don't exist: #{invalid_paths.join(", ")}.
+
+          This can happen if the plugin was installed with a different version of Ruby that has since been uninstalled.
+
+          If you would like to reinstall the plugin, run:
+
+          bundler plugin uninstall #{name} && bundler plugin install #{name}
+
+          Continuing without installing plugin #{name}.
+        MESSAGE
+
+        return
+      end
+
+      Gem.add_to_load_path(*paths)
 
       load path.join(PLUGIN_FILE_NAME)
 
diff --git a/lib/bundler/plugin/api/source.rb b/lib/bundler/plugin/api/source.rb
index 67c45bd2044dbd..6c888d037350b9 100644
--- a/lib/bundler/plugin/api/source.rb
+++ b/lib/bundler/plugin/api/source.rb
@@ -39,7 +39,7 @@ class API
       #     is present to be compatible with `Definition` and is used by
       #     rubygems source.
       module Source
-        attr_reader :uri, :options, :name
+        attr_reader :uri, :options, :name, :checksum_store
         attr_accessor :dependency_names
 
         def initialize(opts)
@@ -48,6 +48,7 @@ def initialize(opts)
           @uri = opts["uri"]
           @type = opts["type"]
           @name = opts["name"] || "#{@type} at #{@uri}"
+          @checksum_store = Checksum::Store.new
         end
 
         # This is used by the default `spec` method to constructs the
@@ -66,7 +67,7 @@ def fetch_gemspec_files
         # to check out same version of gem later.
         #
         # There options are passed when the source plugin is created from the
-        # lock file.
+        # lockfile.
         #
         # @return [Hash]
         def options_to_lock
@@ -95,7 +96,7 @@ def install(spec, opts)
         #
         # Note: Do not override if you don't know what you are doing.
         def post_install(spec, disable_exts = false)
-          opts = { :env_shebang => false, :disable_extensions => disable_exts }
+          opts = { env_shebang: false, disable_extensions: disable_exts }
           installer = Bundler::Source::Path::Installer.new(spec, opts)
           installer.post_install
         end
@@ -106,7 +107,7 @@ def post_install(spec, disable_exts = false)
         def install_path
           @install_path ||=
             begin
-              base_name = File.basename(Bundler::URI.parse(uri).normalize.path)
+              base_name = File.basename(Gem::URI.parse(uri).normalize.path)
 
               gem_install_dir.join("#{base_name}-#{uri_hash[0..11]}")
             end
@@ -130,7 +131,7 @@ def specs
           Bundler::Index.build do |index|
             files.each do |file|
               next unless spec = Bundler.load_gemspec(file)
-              Bundler.rubygems.set_installed_by_version(spec)
+              spec.installed_by_version = Gem::VERSION
 
               spec.source = self
               Bundler.rubygems.validate(spec)
@@ -175,7 +176,7 @@ def unlock!
         #
         # This is used by `app_cache_path`
         def app_cache_dirname
-          base_name = File.basename(Bundler::URI.parse(uri).normalize.path)
+          base_name = File.basename(Gem::URI.parse(uri).normalize.path)
           "#{base_name}-#{uri_hash}"
         end
 
@@ -195,6 +196,7 @@ def cache(spec, custom_path = nil)
 
           FileUtils.rm_rf(new_cache_path)
           FileUtils.cp_r(install_path, new_cache_path)
+          FileUtils.rm_rf(app_cache_path.join(".git"))
           FileUtils.touch(app_cache_path.join(".bundlecache"))
         end
 
diff --git a/lib/bundler/plugin/events.rb b/lib/bundler/plugin/events.rb
index bc037d1af507b7..29c05098ae1443 100644
--- a/lib/bundler/plugin/events.rb
+++ b/lib/bundler/plugin/events.rb
@@ -56,6 +56,30 @@ def self.defined_event?(event)
       #   Includes an Array of Bundler::Dependency objects
       #   GEM_AFTER_INSTALL_ALL = "after-install-all"
       define :GEM_AFTER_INSTALL_ALL,  "after-install-all"
+
+      # @!parse
+      #   A hook called before each individual gem is required
+      #   Includes a Bundler::Dependency.
+      #   GEM_BEFORE_REQUIRE = "before-require"
+      define :GEM_BEFORE_REQUIRE, "before-require"
+
+      # @!parse
+      #   A hook called after each individual gem is required
+      #   Includes a Bundler::Dependency.
+      #   GEM_AFTER_REQUIRE = "after-require"
+      define :GEM_AFTER_REQUIRE,  "after-require"
+
+      # @!parse
+      #   A hook called before any gems require
+      #   Includes an Array of Bundler::Dependency objects.
+      #   GEM_BEFORE_REQUIRE_ALL = "before-require-all"
+      define :GEM_BEFORE_REQUIRE_ALL, "before-require-all"
+
+      # @!parse
+      #   A hook called after all gems required
+      #   Includes an Array of Bundler::Dependency objects.
+      #   GEM_AFTER_REQUIRE_ALL = "after-require-all"
+      define :GEM_AFTER_REQUIRE_ALL,  "after-require-all"
     end
   end
 end
diff --git a/lib/bundler/plugin/index.rb b/lib/bundler/plugin/index.rb
index a2d5eaa38a9b04..0682d37772b2ef 100644
--- a/lib/bundler/plugin/index.rb
+++ b/lib/bundler/plugin/index.rb
@@ -31,9 +31,13 @@ def initialize
 
         begin
           load_index(global_index_file, true)
-        rescue GenericSystemCallError
+        rescue PermissionError
           # no need to fail when on a read-only FS, for example
           nil
+        rescue ArgumentError => e
+          # ruby 3.4 checks writability in Dir.tmpdir
+          raise unless e.message&.include?("could not find a temporary directory")
+          nil
         end
         load_index(local_index_file) if SharedHelpers.in_bundle?
       end
@@ -136,6 +140,14 @@ def hook_plugins(event)
         @hooks[event] || []
       end
 
+      # This plugin is installed inside the .bundle/plugin directory,
+      # and thus is managed solely by Bundler
+      def installed_in_plugin_root?(name)
+        return false unless (path = installed?(name))
+
+        path.start_with?("#{Plugin.root}/")
+      end
+
       private
 
       # Reads the index file from the directory and initializes the instance
diff --git a/lib/bundler/plugin/installer.rb b/lib/bundler/plugin/installer.rb
index c9ff12ce4b718c..ac3c3ea7f31216 100644
--- a/lib/bundler/plugin/installer.rb
+++ b/lib/bundler/plugin/installer.rb
@@ -10,6 +10,7 @@ module Plugin
     class Installer
       autoload :Rubygems, File.expand_path("installer/rubygems", __dir__)
       autoload :Git,      File.expand_path("installer/git", __dir__)
+      autoload :Path, File.expand_path("installer/path", __dir__)
 
       def install(names, options)
         check_sources_consistency!(options)
@@ -18,8 +19,8 @@ def install(names, options)
 
         if options[:git]
           install_git(names, version, options)
-        elsif options[:local_git]
-          install_local_git(names, version, options)
+        elsif options[:path]
+          install_path(names, version, options[:path])
         else
           sources = options[:source] || Gem.sources
           install_rubygems(names, version, sources)
@@ -33,7 +34,7 @@ def install(names, options)
       # @return [Hash] map of names to their specs they are installed with
       def install_definition(definition)
         def definition.lock(*); end
-        definition.resolve_remotely!
+        definition.remotely!
         specs = definition.specs
 
         install_from_specs specs
@@ -45,20 +46,40 @@ def check_sources_consistency!(options)
         if options.key?(:git) && options.key?(:local_git)
           raise InvalidOption, "Remote and local plugin git sources can't be both specified"
         end
+
+        # back-compat; local_git is an alias for git
+        if options.key?(:local_git)
+          Bundler::SharedHelpers.major_deprecation(2, "--local_git is deprecated, use --git")
+          options[:git] = options.delete(:local_git)
+        end
+
+        if (options.keys & [:source, :git, :path]).length > 1
+          raise InvalidOption, "Only one of --source, --git, or --path may be specified"
+        end
+
+        if (options.key?(:branch) || options.key?(:ref)) && !options.key?(:git)
+          raise InvalidOption, "--#{options.key?(:branch) ? "branch" : "ref"} can only be used with git sources"
+        end
+
+        if options.key?(:branch) && options.key?(:ref)
+          raise InvalidOption, "--branch and --ref can't be both specified"
+        end
       end
 
       def install_git(names, version, options)
-        uri = options.delete(:git)
-        options["uri"] = uri
+        source_list = SourceList.new
+        source = source_list.add_git_source({ "uri" => options[:git],
+                                              "branch" => options[:branch],
+                                              "ref" => options[:ref] })
 
-        install_all_sources(names, version, options, options[:source])
+        install_all_sources(names, version, source_list, source)
       end
 
-      def install_local_git(names, version, options)
-        uri = options.delete(:local_git)
-        options["uri"] = uri
+      def install_path(names, version, path)
+        source_list = SourceList.new
+        source = source_list.add_path_source({ "path" => path, "root_path" => SharedHelpers.pwd })
 
-        install_all_sources(names, version, options, options[:source])
+        install_all_sources(names, version, source_list, source)
       end
 
       # Installs the plugin from rubygems source and returns the path where the
@@ -70,20 +91,19 @@ def install_local_git(names, version, options)
       #
       # @return [Hash] map of names to the specs of plugins installed
       def install_rubygems(names, version, sources)
-        install_all_sources(names, version, nil, sources)
-      end
-
-      def install_all_sources(names, version, git_source_options, rubygems_source)
         source_list = SourceList.new
 
-        source_list.add_git_source(git_source_options) if git_source_options
-        Array(rubygems_source).each {|remote| source_list.add_global_rubygems_remote(remote) } if rubygems_source
+        Array(sources).each {|remote| source_list.add_global_rubygems_remote(remote) }
+
+        install_all_sources(names, version, source_list)
+      end
 
-        deps = names.map {|name| Dependency.new name, version }
+      def install_all_sources(names, version, source_list, source = nil)
+        deps = names.map {|name| Dependency.new(name, version, { "source" => source }) }
 
         Bundler.configure_gem_home_and_path(Plugin.root)
 
-        Bundler.settings.temporary(:deployment => false, :frozen => false) do
+        Bundler.settings.temporary(deployment: false, frozen: false) do
           definition = Definition.new(nil, deps, source_list, true)
 
           install_definition(definition)
diff --git a/lib/bundler/plugin/installer/path.rb b/lib/bundler/plugin/installer/path.rb
new file mode 100644
index 00000000000000..58c4924eb0cbed
--- /dev/null
+++ b/lib/bundler/plugin/installer/path.rb
@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+module Bundler
+  module Plugin
+    class Installer
+      class Path < Bundler::Source::Path
+        def root
+          SharedHelpers.in_bundle? ? Bundler.root : Plugin.root
+        end
+
+        def eql?(other)
+          return unless other.class == self.class
+          expanded_original_path == other.expanded_original_path &&
+            version == other.version
+        end
+
+        alias_method :==, :eql?
+
+        def generate_bin(spec, disable_extensions = false)
+          # Need to find a way without code duplication
+          # For now, we can ignore this
+        end
+      end
+    end
+  end
+end
diff --git a/lib/bundler/plugin/source_list.rb b/lib/bundler/plugin/source_list.rb
index 547661cf2f73da..746996de5548ac 100644
--- a/lib/bundler/plugin/source_list.rb
+++ b/lib/bundler/plugin/source_list.rb
@@ -9,6 +9,10 @@ def add_git_source(options = {})
         add_source_to_list Plugin::Installer::Git.new(options), git_sources
       end
 
+      def add_path_source(options = {})
+        add_source_to_list Plugin::Installer::Path.new(options), path_sources
+      end
+
       def add_rubygems_source(options = {})
         add_source_to_list Plugin::Installer::Rubygems.new(options), @rubygems_sources
       end
@@ -17,10 +21,6 @@ def all_sources
         path_sources + git_sources + rubygems_sources + [metadata_source]
       end
 
-      def default_source
-        git_sources.first || global_rubygems_source
-      end
-
       private
 
       def rubygems_aggregate_class
diff --git a/lib/bundler/process_lock.rb b/lib/bundler/process_lock.rb
index 0297f80e2cceba..784b17e3636dcd 100644
--- a/lib/bundler/process_lock.rb
+++ b/lib/bundler/process_lock.rb
@@ -2,23 +2,19 @@
 
 module Bundler
   class ProcessLock
-    def self.lock(bundle_path = Bundler.bundle_path)
+    def self.lock(bundle_path = Bundler.bundle_path, &block)
       lock_file_path = File.join(bundle_path, "bundler.lock")
-      has_lock = false
+      base_lock_file_path = lock_file_path.delete_suffix(".lock")
 
-      File.open(lock_file_path, "w") do |f|
-        f.flock(File::LOCK_EX)
-        has_lock = true
-        yield
-        f.flock(File::LOCK_UN)
+      require "fileutils" if Bundler.rubygems.provides?("< 3.6.0")
+
+      begin
+        SharedHelpers.filesystem_access(lock_file_path, :write) do
+          Gem.open_file_with_lock(base_lock_file_path, &block)
+        end
+      rescue PermissionError
+        block.call
       end
-    rescue Errno::EACCES, Errno::ENOLCK, Errno::ENOTSUP, Errno::EPERM, Errno::EROFS
-      # In the case the user does not have access to
-      # create the lock file or is using NFS where
-      # locks are not available we skip locking.
-      yield
-    ensure
-      FileUtils.rm_f(lock_file_path) if has_lock
     end
   end
 end
diff --git a/lib/bundler/remote_specification.rb b/lib/bundler/remote_specification.rb
index f626a3218e0503..ab163e2b046acd 100644
--- a/lib/bundler/remote_specification.rb
+++ b/lib/bundler/remote_specification.rb
@@ -12,7 +12,7 @@ class RemoteSpecification
 
     attr_reader :name, :version, :platform
     attr_writer :dependencies
-    attr_accessor :source, :remote
+    attr_accessor :source, :remote, :locked_platform
 
     def initialize(name, version, platform, spec_fetcher)
       @name         = name
@@ -21,6 +21,11 @@ def initialize(name, version, platform, spec_fetcher)
       @platform     = Gem::Platform.new(platform)
       @spec_fetcher = spec_fetcher
       @dependencies = nil
+      @locked_platform = nil
+    end
+
+    def insecurely_materialized?
+      @locked_platform.to_s != @platform.to_s
     end
 
     # Needed before installs, since the arch matters then and quick
@@ -88,6 +93,10 @@ def dependencies
       end
     end
 
+    def runtime_dependencies
+      dependencies.select(&:runtime?)
+    end
+
     def git_version
       return unless loaded_from && source.is_a?(Bundler::Source::Git)
       " #{source.revision[0..6]}"
diff --git a/lib/bundler/resolver.rb b/lib/bundler/resolver.rb
index 3263913b7ff9d4..fba9badec727ba 100644
--- a/lib/bundler/resolver.rb
+++ b/lib/bundler/resolver.rb
@@ -12,13 +12,13 @@ class Resolver
     require_relative "resolver/candidate"
     require_relative "resolver/incompatibility"
     require_relative "resolver/root"
+    require_relative "resolver/strategy"
 
-    include GemHelpers
-
-    def initialize(base, gem_version_promoter)
+    def initialize(base, gem_version_promoter, most_specific_locked_platform = nil)
       @source_requirements = base.source_requirements
       @base = base
       @gem_version_promoter = gem_version_promoter
+      @most_specific_locked_platform = most_specific_locked_platform
     end
 
     def start
@@ -29,7 +29,7 @@ def start
 
       Bundler.ui.info "Resolving dependencies...", true
 
-      solve_versions(:root => root, :logger => logger)
+      solve_versions(root: root, logger: logger)
     end
 
     def setup_solver
@@ -50,26 +50,26 @@ def setup_solver
         specs[name] = matches.sort_by {|s| [s.version, s.platform.to_s] }
       end
 
+      @all_versions = Hash.new do |candidates, package|
+        candidates[package] = all_versions_for(package)
+      end
+
       @sorted_versions = Hash.new do |candidates, package|
-        candidates[package] = if package.root?
-          [root_version]
-        else
-          all_versions_for(package).sort
-        end
+        candidates[package] = filtered_versions_for(package).sort
       end
 
+      @sorted_versions[root] = [root_version]
+
       root_dependencies = prepare_dependencies(@requirements, @packages)
 
       @cached_dependencies = Hash.new do |dependencies, package|
-        dependencies[package] = if package.root?
-          { root_version => root_dependencies }
-        else
-          Hash.new do |versions, version|
-            versions[version] = to_dependency_hash(version.dependencies.reject {|d| d.name == package.name }, @packages)
-          end
+        dependencies[package] = Hash.new do |versions, version|
+          versions[version] = to_dependency_hash(version.dependencies.reject {|d| d.name == package.name }, @packages)
         end
       end
 
+      @cached_dependencies[root] = { root_version => root_dependencies }
+
       logger = Bundler::UI::Shell.new
       logger.level = debug? ? "debug" : "warn"
 
@@ -77,15 +77,16 @@ def setup_solver
     end
 
     def solve_versions(root:, logger:)
-      solver = PubGrub::VersionSolver.new(:source => self, :root => root, :logger => logger)
+      solver = PubGrub::VersionSolver.new(source: self, root: root, strategy: Strategy.new(self), logger: logger)
       result = solver.solve
-      result.map {|package, version| version.to_specs(package) }.flatten.uniq
+      resolved_specs = result.flat_map {|package, version| version.to_specs(package, @most_specific_locked_platform) }
+      SpecSet.new(resolved_specs).specs_with_additional_variants_from(@base.locked_specs)
     rescue PubGrub::SolveFailure => e
       incompatibility = e.incompatibility
 
-      names_to_unlock, names_to_allow_prereleases_for, extended_explanation = find_names_to_relax(incompatibility)
+      names_to_unlock, names_to_allow_prereleases_for, names_to_allow_remote_specs_for, extended_explanation = find_names_to_relax(incompatibility)
 
-      names_to_relax = names_to_unlock + names_to_allow_prereleases_for
+      names_to_relax = names_to_unlock + names_to_allow_prereleases_for + names_to_allow_remote_specs_for
 
       if names_to_relax.any?
         if names_to_unlock.any?
@@ -95,11 +96,17 @@ def solve_versions(root:, logger:)
         end
 
         if names_to_allow_prereleases_for.any?
-          Bundler.ui.debug "Found conflicts with dependencies with prereleases. Will retrying considering prereleases for #{names_to_allow_prereleases_for.join(", ")}...", true
+          Bundler.ui.debug "Found conflicts with dependencies with prereleases. Will retry considering prereleases for #{names_to_allow_prereleases_for.join(", ")}...", true
 
           @base.include_prereleases(names_to_allow_prereleases_for)
         end
 
+        if names_to_allow_remote_specs_for.any?
+          Bundler.ui.debug "Found conflicts with local versions of #{names_to_allow_remote_specs_for.join(", ")}. Will retry considering remote versions...", true
+
+          @base.include_remote_specs(names_to_allow_remote_specs_for)
+        end
+
         root, logger = setup_solver
 
         Bundler.ui.debug "Retrying resolution...", true
@@ -119,6 +126,7 @@ def solve_versions(root:, logger:)
     def find_names_to_relax(incompatibility)
       names_to_unlock = []
       names_to_allow_prereleases_for = []
+      names_to_allow_remote_specs_for = []
       extended_explanation = nil
 
       while incompatibility.conflict?
@@ -131,8 +139,10 @@ def find_names_to_relax(incompatibility)
 
           if base_requirements[name]
             names_to_unlock << name
-          elsif package.ignores_prereleases?
+          elsif package.ignores_prereleases? && @all_specs[name].any? {|s| s.version.prerelease? }
             names_to_allow_prereleases_for << name
+          elsif package.prefer_local? && @all_specs[name].any? {|s| !s.is_a?(StubSpecification) }
+            names_to_allow_remote_specs_for << name
           end
 
           no_versions_incompat = [cause.incompatibility, cause.satisfier].find {|incompat| incompat.cause.is_a?(PubGrub::Incompatibility::NoVersions) }
@@ -142,7 +152,7 @@ def find_names_to_relax(incompatibility)
         end
       end
 
-      [names_to_unlock.uniq, names_to_allow_prereleases_for.uniq, extended_explanation]
+      [names_to_unlock.uniq, names_to_allow_prereleases_for.uniq, names_to_allow_remote_specs_for.uniq, extended_explanation]
     end
 
     def parse_dependency(package, dependency)
@@ -152,13 +162,11 @@ def parse_dependency(package, dependency)
         requirement_to_range(dependency)
       end
 
-      PubGrub::VersionConstraint.new(package, :range => range)
+      PubGrub::VersionConstraint.new(package, range: range)
     end
 
     def versions_for(package, range=VersionRange.any)
-      versions = range.select_versions(@sorted_versions[package])
-
-      sort_versions(package, versions)
+      range.select_versions(@sorted_versions[package])
     end
 
     def no_versions_incompatibility_for(package, unsatisfied_term)
@@ -181,7 +189,7 @@ def no_versions_incompatibility_for(package, unsatisfied_term)
         extended_explanation = other_specs_matching_message(specs_matching_other_platforms, label) if specs_matching_other_platforms.any?
       end
 
-      Incompatibility.new([unsatisfied_term], :cause => cause, :custom_explanation => custom_explanation, :extended_explanation => extended_explanation)
+      Incompatibility.new([unsatisfied_term], cause: cause, custom_explanation: custom_explanation, extended_explanation: extended_explanation)
     end
 
     def debug?
@@ -220,9 +228,9 @@ def incompatibilities_for(package, version)
             sorted_versions[high]
           end
 
-        range = PubGrub::VersionRange.new(:min => low, :max => high, :include_min => true)
+        range = PubGrub::VersionRange.new(min: low, max: high, include_min: !low.nil?)
 
-        self_constraint = PubGrub::VersionConstraint.new(package, :range => range)
+        self_constraint = PubGrub::VersionConstraint.new(package, range: range)
 
         dep_term = PubGrub::Term.new(dep_constraint, false)
         self_term = PubGrub::Term.new(self_constraint, true)
@@ -231,13 +239,13 @@ def incompatibilities_for(package, version)
           "current #{dep_package} version is #{dep_constraint.constraint_string}"
         end
 
-        PubGrub::Incompatibility.new([self_term, dep_term], :cause => :dependency, :custom_explanation => custom_explanation)
+        PubGrub::Incompatibility.new([self_term, dep_term], cause: :dependency, custom_explanation: custom_explanation)
       end
     end
 
     def all_versions_for(package)
       name = package.name
-      results = (@base[name] + filter_prereleases(@all_specs[name], package)).uniq {|spec| [spec.version.hash, spec.platform] }
+      results = (@base[name] + filter_specs(@all_specs[name], package)).uniq {|spec| [spec.version.hash, spec.platform] }
 
       if name == "bundler" && !bundler_pinned_to_current_version?
         bundler_spec = Gem.loaded_specs["bundler"]
@@ -247,21 +255,41 @@ def all_versions_for(package)
       locked_requirement = base_requirements[name]
       results = filter_matching_specs(results, locked_requirement) if locked_requirement
 
-      versions = results.group_by(&:version).reduce([]) do |groups, (version, specs)|
-        platform_specs = package.platforms.flat_map {|platform| select_best_platform_match(specs, platform) }
-        next groups if platform_specs.empty?
+      results.group_by(&:version).reduce([]) do |groups, (version, specs)|
+        platform_specs = package.platform_specs(specs)
+
+        # If package is a top-level dependency,
+        #   candidate is only valid if there are matching versions for all resolution platforms.
+        #
+        # If package is not a top-level deependency,
+        #   then it's not necessary that it has matching versions for all platforms, since it may have been introduced only as
+        #   a dependency for a platform specific variant, so it will only need to have a valid version for that platform.
+        #
+        if package.top_level?
+          next groups if platform_specs.any?(&:empty?)
+        else
+          next groups if platform_specs.all?(&:empty?)
+        end
+
+        ruby_specs = MatchPlatform.select_best_platform_match(specs, Gem::Platform::RUBY)
+        ruby_group = Resolver::SpecGroup.new(ruby_specs)
 
-        ruby_specs = select_best_platform_match(specs, Gem::Platform::RUBY)
-        groups << Resolver::Candidate.new(version, :specs => ruby_specs) if ruby_specs.any?
+        unless ruby_group.empty?
+          platform_specs.each do |s|
+            ruby_group.merge(Resolver::SpecGroup.new(s))
+          end
 
-        next groups if platform_specs == ruby_specs || package.force_ruby_platform?
+          groups << Resolver::Candidate.new(version, group: ruby_group, priority: -1)
+          next groups if package.force_ruby_platform?
+        end
 
-        groups << Resolver::Candidate.new(version, :specs => platform_specs)
+        platform_group = Resolver::SpecGroup.new(platform_specs.flatten.uniq)
+        next groups if platform_group == ruby_group
+
+        groups << Resolver::Candidate.new(version, group: platform_group, priority: 1)
 
         groups
       end
-
-      sort_versions(package, versions)
     end
 
     def source_for(name)
@@ -282,6 +310,16 @@ def name_for_explicit_dependency_source
       "Gemfile"
     end
 
+    def raise_incomplete!(incomplete_specs)
+      raise_not_found!(@base.get_package(incomplete_specs.first.name))
+    end
+
+    def sort_versions_by_preferred(package, versions)
+      @gem_version_promoter.sort_versions(package, versions)
+    end
+
+    private
+
     def raise_not_found!(package)
       name = package.name
       source = source_for(name)
@@ -295,15 +333,21 @@ def raise_not_found!(package)
                         end
       specs_matching_requirement = filter_matching_specs(specs, package.dependency.requirement)
 
-      if specs_matching_requirement.any?
+      not_found_message = if specs_matching_requirement.any?
         specs = specs_matching_requirement
         matching_part = requirement_label
         platforms = package.platforms
-        platform_label = platforms.size == 1 ? "platform '#{platforms.first}" : "platforms '#{platforms.join("', '")}"
-        requirement_label = "#{requirement_label}' with #{platform_label}"
+
+        if platforms.size == 1
+          "Could not find gem '#{requirement_label}' with platform '#{platforms.first}'"
+        else
+          "Could not find gems matching '#{requirement_label}' valid for all resolution platforms (#{platforms.join(", ")})"
+        end
+      else
+        "Could not find gem '#{requirement_label}'"
       end
 
-      message = String.new("Could not find gem '#{requirement_label}' in #{source}#{cache_message}.\n")
+      message = String.new("#{not_found_message} in #{source}#{cache_message}.\n")
 
       if specs.any?
         message << "\n#{other_specs_matching_message(specs, matching_part)}"
@@ -312,7 +356,20 @@ def raise_not_found!(package)
       raise GemNotFound, message
     end
 
-    private
+    def filtered_versions_for(package)
+      @gem_version_promoter.filter_versions(package, @all_versions[package])
+    end
+
+    def raise_all_versions_filtered_out!(package)
+      level = @gem_version_promoter.level
+      name = package.name
+      locked_version = package.locked_version
+      requirement = package.dependency
+
+      raise GemNotFound,
+        "#{name} is locked to #{locked_version}, while Gemfile is requesting #{requirement}. " \
+        "--strict --#{level} was specified, but there are no #{level} level upgrades from #{locked_version} satisfying #{requirement}, so version solving has failed"
+    end
 
     def filter_matching_specs(specs, requirements)
       Array(requirements).flat_map do |requirement|
@@ -320,12 +377,31 @@ def filter_matching_specs(specs, requirements)
       end
     end
 
+    def filter_specs(specs, package)
+      filter_remote_specs(filter_prereleases(specs, package), package)
+    end
+
     def filter_prereleases(specs, package)
       return specs unless package.ignores_prereleases? && specs.size > 1
 
       specs.reject {|s| s.version.prerelease? }
     end
 
+    def filter_remote_specs(specs, package)
+      if package.prefer_local?
+        local_specs = specs.select {|s| s.is_a?(StubSpecification) }
+
+        if local_specs.empty?
+          package.consider_remote_versions!
+          specs
+        else
+          local_specs
+        end
+      else
+        specs
+      end
+    end
+
     # Ignore versions that depend on themselves incorrectly
     def filter_invalid_self_dependencies(specs, name)
       specs.reject do |s|
@@ -337,14 +413,6 @@ def requirement_satisfied_by?(requirement, spec)
       requirement.satisfied_by?(spec.version) || spec.source.is_a?(Source::Gemspec)
     end
 
-    def sort_versions(package, versions)
-      if versions.size > 1
-        @gem_version_promoter.sort_versions(package, versions).reverse
-      else
-        versions
-      end
-    end
-
     def repository_for(package)
       source_for(package.name)
     end
@@ -354,23 +422,37 @@ def base_requirements
     end
 
     def prepare_dependencies(requirements, packages)
-      to_dependency_hash(requirements, packages).map do |dep_package, dep_constraint|
+      to_dependency_hash(requirements, packages).filter_map do |dep_package, dep_constraint|
         name = dep_package.name
 
         next [dep_package, dep_constraint] if name == "bundler"
 
-        versions = versions_for(dep_package, dep_constraint.range)
-        if versions.empty? && dep_package.ignores_prereleases?
-          @sorted_versions.delete(dep_package)
-          dep_package.consider_prereleases!
-          versions = versions_for(dep_package, dep_constraint.range)
+        dep_range = dep_constraint.range
+        versions = versions_for(dep_package, dep_range)
+        if versions.empty?
+          if dep_package.ignores_prereleases? || dep_package.prefer_local?
+            @all_versions.delete(dep_package)
+            @sorted_versions.delete(dep_package)
+          end
+          dep_package.consider_prereleases! if dep_package.ignores_prereleases?
+          dep_package.consider_remote_versions! if dep_package.prefer_local?
+          versions = versions_for(dep_package, dep_range)
+        end
+
+        if versions.empty? && select_all_versions(dep_package, dep_range).any?
+          raise_all_versions_filtered_out!(dep_package)
         end
+
         next [dep_package, dep_constraint] unless versions.empty?
 
         next unless dep_package.current_platform?
 
         raise_not_found!(dep_package)
-      end.compact.to_h
+      end.to_h
+    end
+
+    def select_all_versions(package, range)
+      range.select_versions(@all_versions[package])
     end
 
     def other_specs_matching_message(specs, requirement)
@@ -381,26 +463,26 @@ def other_specs_matching_message(specs, requirement)
 
     def requirement_to_range(requirement)
       ranges = requirement.requirements.map do |(op, version)|
-        ver = Resolver::Candidate.new(version).generic!
-        platform_ver = Resolver::Candidate.new(version).platform_specific!
+        ver = Resolver::Candidate.new(version, priority: -1)
+        platform_ver = Resolver::Candidate.new(version, priority: 1)
 
         case op
         when "~>"
           name = "~> #{ver}"
           bump = Resolver::Candidate.new(version.bump.to_s + ".A")
-          PubGrub::VersionRange.new(:name => name, :min => ver, :max => bump, :include_min => true)
+          PubGrub::VersionRange.new(name: name, min: ver, max: bump, include_min: true)
         when ">"
-          PubGrub::VersionRange.new(:min => platform_ver)
+          PubGrub::VersionRange.new(min: platform_ver)
         when ">="
-          PubGrub::VersionRange.new(:min => ver, :include_min => true)
+          PubGrub::VersionRange.new(min: ver, include_min: true)
         when "<"
-          PubGrub::VersionRange.new(:max => ver)
+          PubGrub::VersionRange.new(max: ver)
         when "<="
-          PubGrub::VersionRange.new(:max => platform_ver, :include_max => true)
+          PubGrub::VersionRange.new(max: platform_ver, include_max: true)
         when "="
-          PubGrub::VersionRange.new(:min => ver, :max => platform_ver, :include_min => true, :include_max => true)
+          PubGrub::VersionRange.new(min: ver, max: platform_ver, include_min: true, include_max: true)
         when "!="
-          PubGrub::VersionRange.new(:min => ver, :max => platform_ver, :include_min => true, :include_max => true).invert
+          PubGrub::VersionRange.new(min: ver, max: platform_ver, include_min: true, include_max: true).invert
         else
           raise "bad version specifier: #{op}"
         end
diff --git a/lib/bundler/resolver/base.rb b/lib/bundler/resolver/base.rb
index e5c3763c3f7d8d..932a92ff4156ca 100644
--- a/lib/bundler/resolver/base.rb
+++ b/lib/bundler/resolver/base.rb
@@ -5,10 +5,11 @@
 module Bundler
   class Resolver
     class Base
-      attr_reader :packages, :requirements, :source_requirements
+      attr_reader :packages, :requirements, :source_requirements, :locked_specs
 
       def initialize(source_requirements, dependencies, base, platforms, options)
         @source_requirements = source_requirements
+        @locked_specs = options[:locked_specs]
 
         @base = base
 
@@ -16,7 +17,7 @@ def initialize(source_requirements, dependencies, base, platforms, options)
           hash[name] = Package.new(name, platforms, **options)
         end
 
-        @requirements = dependencies.map do |dep|
+        @requirements = dependencies.filter_map do |dep|
           dep_platforms = dep.gem_platforms(platforms)
 
           # Dependencies scoped to external platforms are ignored
@@ -24,10 +25,10 @@ def initialize(source_requirements, dependencies, base, platforms, options)
 
           name = dep.name
 
-          @packages[name] = Package.new(name, dep_platforms, **options.merge(:dependency => dep))
+          @packages[name] = Package.new(name, dep_platforms, **options.merge(dependency: dep))
 
           dep
-        end.compact
+        end
       end
 
       def [](name)
@@ -68,6 +69,12 @@ def include_prereleases(names)
         end
       end
 
+      def include_remote_specs(names)
+        names.each do |name|
+          get_package(name).consider_remote_versions!
+        end
+      end
+
       private
 
       def indirect_pins(names)
@@ -97,6 +104,10 @@ def unrestrict_names(names)
       def build_base_requirements
         base_requirements = {}
         @base.each do |ls|
+          if ls.source_changed? && ls.source.specs.search(ls.name).empty?
+            raise GemNotFound, "Could not find gem '#{ls.name}' in #{ls.source}"
+          end
+
           req = Gem::Requirement.new(ls.version)
           base_requirements[ls.name] = req
         end
diff --git a/lib/bundler/resolver/candidate.rb b/lib/bundler/resolver/candidate.rb
index e695ef08ee0bde..5298b2530f6788 100644
--- a/lib/bundler/resolver/candidate.rb
+++ b/lib/bundler/resolver/candidate.rb
@@ -15,41 +15,29 @@ class Resolver
     # considered separately.
     #
     # Some candidates may also keep some information explicitly about the
-    # package the refer to. These candidates are referred to as "canonical" and
+    # package they refer to. These candidates are referred to as "canonical" and
     # are used when materializing resolution results back into RubyGems
-    # specifications that can be installed, written to lock files, and so on.
+    # specifications that can be installed, written to lockfiles, and so on.
     #
     class Candidate
       include Comparable
 
       attr_reader :version
 
-      def initialize(version, specs: [])
-        @spec_group = Resolver::SpecGroup.new(specs)
+      def initialize(version, group: nil, priority: -1)
+        @spec_group = group || SpecGroup.new([])
         @version = Gem::Version.new(version)
-        @ruby_only = specs.map(&:platform).uniq == [Gem::Platform::RUBY]
+        @priority = priority
       end
 
       def dependencies
         @spec_group.dependencies
       end
 
-      def to_specs(package)
+      def to_specs(package, most_specific_locked_platform)
         return [] if package.meta?
 
-        @spec_group.to_specs(package.force_ruby_platform?)
-      end
-
-      def generic!
-        @ruby_only = true
-
-        self
-      end
-
-      def platform_specific!
-        @ruby_only = false
-
-        self
+        @spec_group.to_specs(package.force_ruby_platform?, most_specific_locked_platform)
       end
 
       def prerelease?
@@ -60,35 +48,38 @@ def segments
         @version.segments
       end
 
-      def sort_obj
-        [@version, @ruby_only ? -1 : 1]
-      end
-
       def <=>(other)
         return unless other.is_a?(self.class)
 
-        sort_obj <=> other.sort_obj
+        version_comparison = version <=> other.version
+        return version_comparison unless version_comparison.zero?
+
+        priority <=> other.priority
       end
 
       def ==(other)
         return unless other.is_a?(self.class)
 
-        sort_obj == other.sort_obj
+        version == other.version && priority == other.priority
       end
 
       def eql?(other)
         return unless other.is_a?(self.class)
 
-        sort_obj.eql?(other.sort_obj)
+        version.eql?(other.version) && priority.eql?(other.priority)
       end
 
       def hash
-        sort_obj.hash
+        [@version, @priority].hash
       end
 
       def to_s
         @version.to_s
       end
+
+      protected
+
+      attr_reader :priority
     end
   end
 end
diff --git a/lib/bundler/resolver/incompatibility.rb b/lib/bundler/resolver/incompatibility.rb
index c61151fbeb0804..4ac1b2e1eafd95 100644
--- a/lib/bundler/resolver/incompatibility.rb
+++ b/lib/bundler/resolver/incompatibility.rb
@@ -8,7 +8,7 @@ class Incompatibility < PubGrub::Incompatibility
       def initialize(terms, cause:, custom_explanation: nil, extended_explanation: nil)
         @extended_explanation = extended_explanation
 
-        super(terms, :cause => cause, :custom_explanation => custom_explanation)
+        super(terms, cause: cause, custom_explanation: custom_explanation)
       end
     end
   end
diff --git a/lib/bundler/resolver/package.rb b/lib/bundler/resolver/package.rb
index 7499a75006e512..ff75e7b6bc2c94 100644
--- a/lib/bundler/resolver/package.rb
+++ b/lib/bundler/resolver/package.rb
@@ -15,13 +15,23 @@ class Resolver
     class Package
       attr_reader :name, :platforms, :dependency, :locked_version
 
-      def initialize(name, platforms, locked_specs:, unlock:, prerelease: false, dependency: nil)
+      def initialize(name, platforms, locked_specs:, unlock:, prerelease: false, prefer_local: false, dependency: nil, new_platforms: [])
         @name = name
         @platforms = platforms
-        @locked_version = locked_specs[name].first&.version
+        @locked_version = locked_specs.version_for(name)
         @unlock = unlock
         @dependency = dependency || Dependency.new(name, @locked_version)
+        @top_level = !dependency.nil?
         @prerelease = @dependency.prerelease? || @locked_version&.prerelease? || prerelease ? :consider_first : :ignore
+        @prefer_local = prefer_local
+        @new_platforms = new_platforms
+      end
+
+      def platform_specs(specs)
+        platforms.map do |platform|
+          prefer_locked = @new_platforms.include?(platform) ? false : !unlock?
+          MatchPlatform.select_best_platform_match(specs, platform, prefer_locked: prefer_locked)
+        end
       end
 
       def to_s
@@ -32,6 +42,10 @@ def root?
         false
       end
 
+      def top_level?
+        @top_level
+      end
+
       def meta?
         @name.end_with?("\0")
       end
@@ -45,7 +59,7 @@ def hash
       end
 
       def unlock?
-        @unlock.empty? || @unlock.include?(name)
+        @unlock == true || @unlock.include?(name)
       end
 
       def ignores_prereleases?
@@ -60,6 +74,14 @@ def consider_prereleases!
         @prerelease = :consider_last
       end
 
+      def prefer_local?
+        @prefer_local
+      end
+
+      def consider_remote_versions!
+        @prefer_local = false
+      end
+
       def force_ruby_platform?
         @dependency.force_ruby_platform
       end
diff --git a/lib/bundler/resolver/spec_group.rb b/lib/bundler/resolver/spec_group.rb
index b44c19a73fd4fe..ac6ba86c4c066c 100644
--- a/lib/bundler/resolver/spec_group.rb
+++ b/lib/bundler/resolver/spec_group.rb
@@ -3,6 +3,8 @@
 module Bundler
   class Resolver
     class SpecGroup
+      attr_reader :specs
+
       def initialize(specs)
         @specs = specs
       end
@@ -23,11 +25,11 @@ def source
         @source ||= exemplary_spec.source
       end
 
-      def to_specs(force_ruby_platform)
+      def to_specs(force_ruby_platform, most_specific_locked_platform)
         @specs.map do |s|
-          lazy_spec = LazySpecification.new(name, version, s.platform, source)
+          lazy_spec = LazySpecification.from_spec(s)
           lazy_spec.force_ruby_platform = force_ruby_platform
-          lazy_spec.dependencies.replace s.dependencies
+          lazy_spec.most_specific_locked_platform = most_specific_locked_platform
           lazy_spec
         end
       end
@@ -37,45 +39,35 @@ def to_s
       end
 
       def dependencies
-        @dependencies ||= @specs.map do |spec|
-          __dependencies(spec) + metadata_dependencies(spec)
-        end.flatten.uniq
+        @dependencies ||= @specs.flat_map(&:expanded_dependencies).uniq.sort
       end
 
-      protected
-
-      def sorted_spec_names
-        @sorted_spec_names ||= @specs.map(&:full_name).sort
+      def ==(other)
+        sorted_spec_names == other.sorted_spec_names
       end
 
-      private
+      def merge(other)
+        return false unless equivalent?(other)
 
-      def exemplary_spec
-        @specs.first
-      end
+        @specs |= other.specs
 
-      def __dependencies(spec)
-        dependencies = []
-        spec.dependencies.each do |dep|
-          next if dep.type == :development
-          dependencies << Dependency.new(dep.name, dep.requirement)
-        end
-        dependencies
+        true
       end
 
-      def metadata_dependencies(spec)
-        return [] if spec.is_a?(LazySpecification)
+      protected
 
-        [
-          metadata_dependency("Ruby", spec.required_ruby_version),
-          metadata_dependency("RubyGems", spec.required_rubygems_version),
-        ].compact
+      def sorted_spec_names
+        @specs.map(&:full_name).sort
       end
 
-      def metadata_dependency(name, requirement)
-        return if requirement.nil? || requirement.none?
+      private
+
+      def equivalent?(other)
+        name == other.name && version == other.version && source == other.source && dependencies == other.dependencies
+      end
 
-        Dependency.new("#{name}\0", requirement)
+      def exemplary_spec
+        @specs.first
       end
     end
   end
diff --git a/lib/bundler/resolver/strategy.rb b/lib/bundler/resolver/strategy.rb
new file mode 100644
index 00000000000000..4f343bf0ce7224
--- /dev/null
+++ b/lib/bundler/resolver/strategy.rb
@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+module Bundler
+  class Resolver
+    class Strategy
+      def initialize(source)
+        @source = source
+      end
+
+      def next_package_and_version(unsatisfied)
+        package, range = next_term_to_try_from(unsatisfied)
+
+        [package, most_preferred_version_of(package, range).first]
+      end
+
+      private
+
+      def next_term_to_try_from(unsatisfied)
+        unsatisfied.min_by do |package, range|
+          matching_versions = @source.versions_for(package, range)
+          higher_versions = @source.versions_for(package, range.upper_invert)
+
+          [matching_versions.count <= 1 ? 0 : 1, higher_versions.count]
+        end
+      end
+
+      def most_preferred_version_of(package, range)
+        versions = @source.versions_for(package, range)
+
+        # Conditional avoids (among other things) calling
+        # sort_versions_by_preferred with the root package
+        if versions.size > 1
+          @source.sort_versions_by_preferred(package, versions)
+        else
+          versions
+        end
+      end
+    end
+  end
+end
diff --git a/lib/bundler/retry.rb b/lib/bundler/retry.rb
index 2415ade200416c..090cb7e2cae1c1 100644
--- a/lib/bundler/retry.rb
+++ b/lib/bundler/retry.rb
@@ -50,13 +50,13 @@ def fail_attempt(e)
       end
       return true unless name
       Bundler.ui.info "" unless Bundler.ui.debug? # Add new line in case dots preceded this
-      Bundler.ui.warn "Retrying #{name} due to error (#{current_run.next}/#{total_runs}): #{e.class} #{e.message}", Bundler.ui.debug?
+      Bundler.ui.warn "Retrying #{name} due to error (#{current_run.next}/#{total_runs}): #{e.class} #{e.message}", true
     end
 
     def keep_trying?
       return true  if current_run.zero?
       return false if last_attempt?
-      return true  if @failed
+      true if @failed
     end
 
     def last_attempt?
diff --git a/lib/bundler/ruby_dsl.rb b/lib/bundler/ruby_dsl.rb
index 542dbac1e4627a..cd88253f463374 100644
--- a/lib/bundler/ruby_dsl.rb
+++ b/lib/bundler/ruby_dsl.rb
@@ -3,27 +3,60 @@
 module Bundler
   module RubyDsl
     def ruby(*ruby_version)
-      options = ruby_version.last.is_a?(Hash) ? ruby_version.pop : {}
+      options = ruby_version.pop if ruby_version.last.is_a?(Hash)
       ruby_version.flatten!
 
-      raise GemfileError, "Please define :engine_version" if options[:engine] && options[:engine_version].nil?
-      raise GemfileError, "Please define :engine" if options[:engine_version] && options[:engine].nil?
+      if options
+        patchlevel = options[:patchlevel]
+        engine = options[:engine]
+        engine_version = options[:engine_version]
 
-      if options[:file]
-        raise GemfileError, "Cannot specify version when using the file option" if ruby_version.any?
-        file_content = Bundler.read_file(Bundler.root.join(options[:file]))
-        if /^ruby\s+(.*)$/.match(file_content) # match .tool-versions files
-          ruby_version << $1.split("#", 2).first.strip # remove trailing comment
-        else
-          ruby_version << file_content.strip
+        raise GemfileError, "Please define :engine_version" if engine && engine_version.nil?
+        raise GemfileError, "Please define :engine" if engine_version && engine.nil?
+
+        if options[:file]
+          raise GemfileError, "Do not pass version argument when using :file option" unless ruby_version.empty?
+          ruby_version << normalize_ruby_file(options[:file])
+        end
+
+        if engine == "ruby" && engine_version && ruby_version != Array(engine_version)
+          raise GemfileEvalError, "ruby_version must match the :engine_version for MRI"
         end
       end
 
-      if options[:engine] == "ruby" && options[:engine_version] &&
-         ruby_version != Array(options[:engine_version])
-        raise GemfileEvalError, "ruby_version must match the :engine_version for MRI"
+      @ruby_version = RubyVersion.new(ruby_version, patchlevel, engine, engine_version)
+    end
+
+    # Support the various file formats found in .ruby-version files.
+    #
+    #     3.2.2
+    #     ruby-3.2.2
+    #
+    # Also supports .tool-versions files for asdf. Lines not starting with "ruby" are ignored.
+    #
+    #     ruby 2.5.1 # comment is ignored
+    #     ruby   2.5.1# close comment and extra spaces doesn't confuse
+    #
+    # Intentionally does not support `3.2.1@gemset` since rvm recommends using .ruby-gemset instead
+    #
+    # Loads the file relative to the dirname of the Gemfile itself.
+    def normalize_ruby_file(filename)
+      file_content = Bundler.read_file(gemfile.dirname.join(filename))
+      # match "ruby-3.2.2", ruby = "3.2.2" or "ruby   3.2.2" capturing version string up to the first space or comment
+      if /^                    # Start of line
+         ruby                  # Literal "ruby"
+         [\s-]*                # Optional whitespace or hyphens (for "ruby-3.2.2" format)
+         (?:=\s*)?             # Optional equals sign with whitespace (for ruby = "3.2.2" format)
+         "?                    # Optional opening quote
+         (                     # Start capturing group
+           [^\s#"]+            # One or more chars that aren't spaces, #, or quotes
+         )                     # End capturing group
+         "?                    # Optional closing quote
+         /x.match(file_content)
+        $1
+      else
+        file_content.strip
       end
-      @ruby_version = RubyVersion.new(ruby_version, options[:patchlevel], options[:engine], options[:engine_version])
     end
   end
 end
diff --git a/lib/bundler/ruby_version.rb b/lib/bundler/ruby_version.rb
index b5396abb6eb798..0ed5cbc6cacfa2 100644
--- a/lib/bundler/ruby_version.rb
+++ b/lib/bundler/ruby_version.rb
@@ -23,7 +23,13 @@ def initialize(versions, patchlevel, engine, engine_version)
       #   specified must match the version.
 
       @versions = Array(versions).map do |v|
-        op, v = Gem::Requirement.parse(v)
+        normalized_v = normalize_version(v)
+
+        unless Gem::Requirement::PATTERN.match?(normalized_v)
+          raise InvalidArgumentError, "#{v} is not a valid requirement on the Ruby version"
+        end
+
+        op, v = Gem::Requirement.parse(normalized_v)
         op == "=" ? v.to_s : "#{op} #{v}"
       end
 
@@ -49,7 +55,7 @@ def to_s(versions = self.versions)
       (\d+\.\d+\.\d+(?:\.\S+)?) # ruby version
       (?:p(-?\d+))? # optional patchlevel
       (?:\s\((\S+)\s(.+)\))? # optional engine info
-    /xo.freeze
+    /xo
 
     # Returns a RubyVersion from the given string.
     # @param [String] the version string to match.
@@ -112,6 +118,13 @@ def self.system
 
     private
 
+    # Ruby's official preview version format uses a `-`: Example: 3.3.0-preview2
+    # However, RubyGems recognizes preview version format with a `.`: Example: 3.3.0.preview2
+    # Returns version string after replacing `-` with `.`
+    def normalize_version(version)
+      version.tr("-", ".")
+    end
+
     def matches?(requirements, version)
       # Handles RUBY_PATCHLEVEL of -1 for instances like ruby-head
       return requirements == version if requirements.to_s == "-1" || version.to_s == "-1"
diff --git a/lib/bundler/rubygems_ext.rb b/lib/bundler/rubygems_ext.rb
index b96edd5e2d81f5..8cf3b56b831f0f 100644
--- a/lib/bundler/rubygems_ext.rb
+++ b/lib/bundler/rubygems_ext.rb
@@ -1,8 +1,6 @@
 # frozen_string_literal: true
 
-require "pathname"
-
-require "rubygems/specification"
+require "rubygems" unless defined?(Gem)
 
 # We can't let `Gem::Source` be autoloaded in the `Gem::Specification#source`
 # redefinition below, so we need to load it upfront. The reason is that if
@@ -15,38 +13,199 @@
 # `Gem::Source` from the redefined `Gem::Specification#source`.
 require "rubygems/source"
 
-require_relative "match_metadata"
-require_relative "force_platform"
-require_relative "match_platform"
-
-# Cherry-pick fixes to `Gem.ruby_version` to be useful for modern Bundler
-# versions and ignore patchlevels
-# (https://github.com/rubygems/rubygems/pull/5472,
-# https://github.com/rubygems/rubygems/pull/5486). May be removed once RubyGems
-# 3.3.12 support is dropped.
-unless Gem.ruby_version.to_s == RUBY_VERSION || RUBY_PATCHLEVEL == -1
-  Gem.instance_variable_set(:@ruby_version, Gem::Version.new(RUBY_VERSION))
-end
-
 module Gem
+  # Can be removed once RubyGems 3.5.11 support is dropped
+  unless Gem.respond_to?(:freebsd_platform?)
+    def self.freebsd_platform?
+      RbConfig::CONFIG["host_os"].to_s.include?("bsd")
+    end
+  end
+
+  # Can be removed once RubyGems 3.5.18 support is dropped
+  unless Gem.respond_to?(:open_file_with_lock)
+    class << self
+      remove_method :open_file_with_flock if Gem.respond_to?(:open_file_with_flock)
+
+      def open_file_with_flock(path, &block)
+        # read-write mode is used rather than read-only in order to support NFS
+        mode = IO::RDWR | IO::APPEND | IO::CREAT | IO::BINARY
+        mode |= IO::SHARE_DELETE if IO.const_defined?(:SHARE_DELETE)
+
+        File.open(path, mode) do |io|
+          begin
+            io.flock(File::LOCK_EX)
+          rescue Errno::ENOSYS, Errno::ENOTSUP
+          end
+          yield io
+        end
+      end
+
+      def open_file_with_lock(path, &block)
+        file_lock = "#{path}.lock"
+        open_file_with_flock(file_lock, &block)
+      ensure
+        FileUtils.rm_f file_lock
+      end
+    end
+  end
+
+  require "rubygems/platform"
+
+  class Platform
+    # Can be removed once RubyGems 3.6.9 support is dropped
+    unless respond_to?(:generic)
+      JAVA  = Gem::Platform.new("java") # :nodoc:
+      MSWIN = Gem::Platform.new("mswin32") # :nodoc:
+      MSWIN64 = Gem::Platform.new("mswin64") # :nodoc:
+      MINGW = Gem::Platform.new("x86-mingw32") # :nodoc:
+      X64_MINGW_LEGACY = Gem::Platform.new("x64-mingw32") # :nodoc:
+      X64_MINGW = Gem::Platform.new("x64-mingw-ucrt") # :nodoc:
+      UNIVERSAL_MINGW = Gem::Platform.new("universal-mingw") # :nodoc:
+      WINDOWS = [MSWIN, MSWIN64, UNIVERSAL_MINGW].freeze # :nodoc:
+      X64_LINUX = Gem::Platform.new("x86_64-linux") # :nodoc:
+      X64_LINUX_MUSL = Gem::Platform.new("x86_64-linux-musl") # :nodoc:
+
+      GENERICS = [JAVA, *WINDOWS].freeze # :nodoc:
+      private_constant :GENERICS
+
+      GENERIC_CACHE = GENERICS.each_with_object({}) {|g, h| h[g] = g } # :nodoc:
+      private_constant :GENERIC_CACHE
+
+      class << self
+        ##
+        # Returns the generic platform for the given platform.
+
+        def generic(platform)
+          return Gem::Platform::RUBY if platform.nil? || platform == Gem::Platform::RUBY
+
+          GENERIC_CACHE[platform] ||= begin
+            found = GENERICS.find do |match|
+              platform === match
+            end
+            found || Gem::Platform::RUBY
+          end
+        end
+
+        ##
+        # Returns the platform specificity match for the given spec platform and user platform.
+
+        def platform_specificity_match(spec_platform, user_platform)
+          return -1 if spec_platform == user_platform
+          return 1_000_000 if spec_platform.nil? || spec_platform == Gem::Platform::RUBY || user_platform == Gem::Platform::RUBY
+
+          os_match(spec_platform, user_platform) +
+            cpu_match(spec_platform, user_platform) * 10 +
+            version_match(spec_platform, user_platform) * 100
+        end
+
+        ##
+        # Sorts and filters the best platform match for the given matching specs and platform.
+
+        def sort_and_filter_best_platform_match(matching, platform)
+          return matching if matching.one?
+
+          exact = matching.select {|spec| spec.platform == platform }
+          return exact if exact.any?
+
+          sorted_matching = sort_best_platform_match(matching, platform)
+          exemplary_spec = sorted_matching.first
+
+          sorted_matching.take_while {|spec| same_specificity?(platform, spec, exemplary_spec) && same_deps?(spec, exemplary_spec) }
+        end
+
+        ##
+        # Sorts the best platform match for the given matching specs and platform.
+
+        def sort_best_platform_match(matching, platform)
+          matching.sort_by.with_index do |spec, i|
+            [
+              platform_specificity_match(spec.platform, platform),
+              i, # for stable sort
+            ]
+          end
+        end
+
+        private
+
+        def same_specificity?(platform, spec, exemplary_spec)
+          platform_specificity_match(spec.platform, platform) == platform_specificity_match(exemplary_spec.platform, platform)
+        end
+
+        def same_deps?(spec, exemplary_spec)
+          spec.required_ruby_version == exemplary_spec.required_ruby_version &&
+            spec.required_rubygems_version == exemplary_spec.required_rubygems_version &&
+            spec.dependencies.sort == exemplary_spec.dependencies.sort
+        end
+
+        def os_match(spec_platform, user_platform)
+          if spec_platform.os == user_platform.os
+            0
+          else
+            1
+          end
+        end
+
+        def cpu_match(spec_platform, user_platform)
+          if spec_platform.cpu == user_platform.cpu
+            0
+          elsif spec_platform.cpu == "arm" && user_platform.cpu.to_s.start_with?("arm")
+            0
+          elsif spec_platform.cpu.nil? || spec_platform.cpu == "universal"
+            1
+          else
+            2
+          end
+        end
+
+        def version_match(spec_platform, user_platform)
+          if spec_platform.version == user_platform.version
+            0
+          elsif spec_platform.version.nil?
+            1
+          else
+            2
+          end
+        end
+      end
+
+    end
+  end
+
+  require "rubygems/specification"
+
+  # Can be removed once RubyGems 3.5.14 support is dropped
+  VALIDATES_FOR_RESOLUTION = Specification.new.respond_to?(:validate_for_resolution).freeze
+
   class Specification
+    # Can be removed once RubyGems 3.5.15 support is dropped
+    correct_array_attributes = @@default_value.select {|_k,v| v.is_a?(Array) }.keys
+    unless @@array_attributes == correct_array_attributes
+      @@array_attributes = correct_array_attributes # rubocop:disable Style/ClassVars
+    end
+
+    require_relative "match_metadata"
+    require_relative "match_platform"
+
     include ::Bundler::MatchMetadata
-    include ::Bundler::MatchPlatform
 
-    attr_accessor :remote, :location, :relative_loaded_from
+    attr_accessor :remote, :relative_loaded_from
 
-    remove_method :source
-    attr_writer :source
-    def source
-      (defined?(@source) && @source) || Gem::Source::Installed.new
+    module AllowSettingSource
+      attr_writer :source
+
+      def source
+        (defined?(@source) && @source) || super
+      end
     end
 
+    prepend AllowSettingSource
+
     alias_method :rg_full_gem_path, :full_gem_path
     alias_method :rg_loaded_from,   :loaded_from
 
     def full_gem_path
       if source.respond_to?(:root)
-        Pathname.new(loaded_from).dirname.expand_path(source.root).to_s.tap {|x| x.untaint if RUBY_VERSION < "2.7" }
+        File.expand_path(File.dirname(loaded_from), source.root)
       else
         rg_full_gem_path
       end
@@ -76,44 +235,15 @@ def extension_dir
       end
     end
 
-    alias_method :rg_missing_extensions?, :missing_extensions?
-    def missing_extensions?
-      # When we use this methods with local gemspec, we don't handle
-      # build status of extension correctly. So We need to find extension
-      # files in require_paths.
-      # TODO: Gem::Specification couldn't access extension name from extconf.rb
-      #       so we find them with heuristic way. We should improve it.
-      if source.respond_to?(:root)
-        return false if raw_require_paths.any? do |path|
-          ext_dir = File.join(full_gem_path, path)
-          File.exist?(File.join(ext_dir, "#{name}.#{RbConfig::CONFIG["DLEXT"]}")) ||
-          !Dir.glob(File.join(ext_dir, name, "*.#{RbConfig::CONFIG["DLEXT"]}")).empty?
-        end
-      end
-
-      rg_missing_extensions?
-    end
+    # Can be removed once RubyGems 3.5.21 support is dropped
+    remove_method :gem_dir if method_defined?(:gem_dir, false)
 
-    remove_method :gem_dir if instance_methods(false).include?(:gem_dir)
     def gem_dir
       full_gem_path
     end
 
-    unless const_defined?(:LATEST_RUBY_WITHOUT_PATCH_VERSIONS)
-      LATEST_RUBY_WITHOUT_PATCH_VERSIONS = Gem::Version.new("2.1")
-
-      alias_method :rg_required_ruby_version=, :required_ruby_version=
-      def required_ruby_version=(req)
-        self.rg_required_ruby_version = req
-
-        @required_ruby_version.requirements.map! do |op, v|
-          if v >= LATEST_RUBY_WITHOUT_PATCH_VERSIONS && v.release.segments.size == 4
-            [op == "~>" ? "=" : op, Gem::Version.new(v.segments.tap {|s| s.delete_at(3) }.join("."))]
-          else
-            [op, v]
-          end
-        end
-      end
+    def insecurely_materialized?
+      false
     end
 
     def groups
@@ -135,23 +265,34 @@ def to_gemfile(path = nil)
       gemfile
     end
 
-    # Backfill missing YAML require when not defined. Fixed since 3.1.0.pre1.
-    module YamlBackfiller
-      def to_yaml(opts = {})
-        Gem.load_yaml unless defined?(::YAML)
+    def nondevelopment_dependencies
+      dependencies - development_dependencies
+    end
 
-        super(opts)
-      end
+    def installation_missing?
+      !default_gem? && !File.directory?(full_gem_path)
     end
 
-    prepend YamlBackfiller
+    def lock_name
+      @lock_name ||= name_tuple.lock_name
+    end
 
-    def nondevelopment_dependencies
-      dependencies - development_dependencies
+    unless VALIDATES_FOR_RESOLUTION
+      def validate_for_resolution
+        SpecificationPolicy.new(self).validate_for_resolution
+      end
     end
 
-    def deleted_gem?
-      !default_gem? && !File.directory?(full_gem_path)
+    if Gem.rubygems_version < Gem::Version.new("3.5.22")
+      module FixPathSourceMissingExtensions
+        def missing_extensions?
+          return false if %w[Bundler::Source::Path Bundler::Source::Gemspec].include?(source.class.name)
+
+          super
+        end
+      end
+
+      prepend FixPathSourceMissingExtensions
     end
 
     private
@@ -173,29 +314,47 @@ def dependencies_to_gemfile(dependencies, group = nil)
     end
   end
 
+  unless VALIDATES_FOR_RESOLUTION
+    class SpecificationPolicy
+      def validate_for_resolution
+        validate_required!
+      end
+    end
+  end
+
+  module BetterPermissionError
+    def data
+      super
+    rescue Errno::EACCES
+      raise Bundler::PermissionError.new(loaded_from, :read)
+    end
+  end
+
+  require "rubygems/stub_specification"
+
+  class StubSpecification
+    prepend BetterPermissionError
+  end
+
   class Dependency
+    require_relative "force_platform"
+
     include ::Bundler::ForcePlatform
 
+    attr_reader :force_ruby_platform
+
     attr_accessor :source, :groups
 
     alias_method :eql?, :==
 
-    def force_ruby_platform
-      return @force_ruby_platform if defined?(@force_ruby_platform) && !@force_ruby_platform.nil?
-
-      @force_ruby_platform = default_force_ruby_platform
-    end
-
-    def encode_with(coder)
-      to_yaml_properties.each do |ivar|
-        coder[ivar.to_s.sub(/^@/, "")] = instance_variable_get(ivar)
+    unless method_defined?(:encode_with, false)
+      def encode_with(coder)
+        [:@name, :@requirement, :@type, :@prerelease, :@version_requirements].each do |ivar|
+          coder[ivar.to_s.sub(/^@/, "")] = instance_variable_get(ivar)
+        end
       end
     end
 
-    def to_yaml_properties
-      instance_variables.reject {|p| ["@source", "@groups"].include?(p.to_s) }
-    end
-
     def to_lock
       out = String.new("  #{name}")
       unless requirement.none?
@@ -204,170 +363,119 @@ def to_lock
       end
       out
     end
-  end
-
-  # comparison is done order independently since rubygems 3.2.0.rc.2
-  unless Gem::Requirement.new("> 1", "< 2") == Gem::Requirement.new("< 2", "> 1")
-    class Requirement
-      module OrderIndependentComparison
-        def ==(other)
-          return unless Gem::Requirement === other
-
-          if _requirements_sorted? && other._requirements_sorted?
-            super
-          else
-            _with_sorted_requirements == other._with_sorted_requirements
-          end
-        end
-
-        protected
-
-        def _requirements_sorted?
-          return @_requirements_sorted if defined?(@_requirements_sorted)
-          strings = as_list
-          @_requirements_sorted = strings == strings.sort
-        end
 
-        def _with_sorted_requirements
-          @_with_sorted_requirements ||= _requirements_sorted? ? self : self.class.new(as_list.sort)
+    if Gem.rubygems_version < Gem::Version.new("3.5.22")
+      module FilterIgnoredSpecs
+        def matching_specs(platform_only = false)
+          super.reject(&:ignored?)
         end
       end
 
-      prepend OrderIndependentComparison
+      prepend FilterIgnoredSpecs
     end
   end
 
-  if Gem::Requirement.new("~> 2.0").hash == Gem::Requirement.new("~> 2.0.0").hash
-    class Requirement
-      module CorrectHashForLambdaOperator
-        def hash
-          if requirements.any? {|r| r.first == "~>" }
-            requirements.map {|r| r.first == "~>" ? [r[0], r[1].to_s] : r }.sort.hash
-          else
-            super
-          end
-        end
-      end
-
-      prepend CorrectHashForLambdaOperator
-    end
-  end
+  # On universal Rubies, resolve the "universal" arch to the real CPU arch, without changing the extension directory.
+  class BasicSpecification
+    if /^universal\.(?<arch>.*?)-/ =~ (CROSS_COMPILING || RUBY_PLATFORM)
+      local_platform = Platform.local
+      if local_platform.cpu == "universal"
+        ORIGINAL_LOCAL_PLATFORM = local_platform.to_s.freeze
 
-  require "rubygems/platform"
+        local_platform.cpu = if arch == "arm64e" # arm64e is only permitted for Apple system binaries
+          "arm64"
+        else
+          arch
+        end
 
-  class Platform
-    JAVA  = Gem::Platform.new("java")
-    MSWIN = Gem::Platform.new("mswin32")
-    MSWIN64 = Gem::Platform.new("mswin64")
-    MINGW = Gem::Platform.new("x86-mingw32")
-    X64_MINGW = [Gem::Platform.new("x64-mingw32"),
-                 Gem::Platform.new("x64-mingw-ucrt")].freeze
-    WINDOWS = [MSWIN, MSWIN64, MINGW, X64_MINGW].flatten.freeze
-    X64_LINUX = Gem::Platform.new("x86_64-linux")
-    X64_LINUX_MUSL = Gem::Platform.new("x86_64-linux-musl")
-
-    if X64_LINUX === X64_LINUX_MUSL
-      remove_method :===
-
-      def ===(other)
-        return nil unless Gem::Platform === other
-
-        # universal-mingw32 matches x64-mingw-ucrt
-        return true if (@cpu == "universal" || other.cpu == "universal") &&
-                       @os.start_with?("mingw") && other.os.start_with?("mingw")
-
-        # cpu
-        ([nil,"universal"].include?(@cpu) || [nil, "universal"].include?(other.cpu) || @cpu == other.cpu ||
-        (@cpu == "arm" && other.cpu.start_with?("arm"))) &&
-
-          # os
-          @os == other.os &&
-
-          # version
-          (
-            (@os != "linux" && (@version.nil? || other.version.nil?)) ||
-            (@os == "linux" && (normalized_linux_version_ext == other.normalized_linux_version_ext || ["musl#{@version}", "musleabi#{@version}", "musleabihf#{@version}"].include?(other.version))) ||
-            @version == other.version
-          )
+        def extensions_dir
+          @extensions_dir ||=
+            Gem.default_ext_dir_for(base_dir) || File.join(base_dir, "extensions", ORIGINAL_LOCAL_PLATFORM, Gem.extension_api_version)
+        end
       end
+    end
 
-      # This is a copy of RubyGems 3.3.23 or higher `normalized_linux_method`.
-      # Once only 3.3.23 is supported, we can use the method in RubyGems.
-      def normalized_linux_version_ext
-        return nil unless @version
-
-        without_gnu_nor_abi_modifiers = @version.sub(/\Agnu/, "").sub(/eabi(hf)?\Z/, "")
-        return nil if without_gnu_nor_abi_modifiers.empty?
+    # Can be removed once RubyGems 3.5.22 support is dropped
+    unless new.respond_to?(:ignored?)
+      def ignored?
+        return @ignored unless @ignored.nil?
 
-        without_gnu_nor_abi_modifiers
+        @ignored = missing_extensions?
       end
     end
 
-    if RUBY_ENGINE == "truffleruby" && !defined?(REUSE_AS_BINARY_ON_TRUFFLERUBY)
-      REUSE_AS_BINARY_ON_TRUFFLERUBY = %w[libv8 libv8-node sorbet-static].freeze
+    # Can be removed once RubyGems 3.6.9 support is dropped
+    unless new.respond_to?(:installable_on_platform?)
+      include(::Bundler::MatchPlatform)
     end
   end
 
-  Platform.singleton_class.module_eval do
-    unless Platform.singleton_methods.include?(:match_spec?)
-      def match_spec?(spec)
-        match_gem?(spec.platform, spec.name)
-      end
+  require "rubygems/name_tuple"
 
-      def match_gem?(platform, gem_name)
-        match_platforms?(platform, Gem.platforms)
+  class NameTuple
+    # Versions of RubyGems before about 3.5.0 don't to_s the platform.
+    unless Gem::NameTuple.new("a", Gem::Version.new("1"), Gem::Platform.new("x86_64-linux")).platform.is_a?(String)
+      alias_method :initialize_with_platform, :initialize
+
+      def initialize(name, version, platform=Gem::Platform::RUBY)
+        if Gem::Platform === platform
+          initialize_with_platform(name, version, platform.to_s)
+        else
+          initialize_with_platform(name, version, platform)
+        end
       end
     end
 
-    match_platforms_defined = Gem::Platform.respond_to?(:match_platforms?, true)
-
-    if !match_platforms_defined || Gem::Platform.send(:match_platforms?, Gem::Platform::X64_LINUX_MUSL, [Gem::Platform::X64_LINUX])
-
-      private
-
-      remove_method :match_platforms? if match_platforms_defined
-
-      def match_platforms?(platform, platforms)
-        platforms.any? do |local_platform|
-          platform.nil? ||
-            local_platform == platform ||
-            (local_platform != Gem::Platform::RUBY && platform =~ local_platform)
-        end
+    def lock_name
+      if platform == Gem::Platform::RUBY
+        "#{name} (#{version})"
+      else
+        "#{name} (#{version}-#{platform})"
       end
     end
   end
 
-  # On universal Rubies, resolve the "universal" arch to the real CPU arch, without changing the extension directory.
-  class Specification
-    if /^universal\.(?<arch>.*?)-/ =~ (CROSS_COMPILING || RUBY_PLATFORM)
-      local_platform = Platform.local
-      if local_platform.cpu == "universal"
-        ORIGINAL_LOCAL_PLATFORM = local_platform.to_s.freeze
+  unless Gem.rubygems_version >= Gem::Version.new("3.5.19")
+    class Resolver::ActivationRequest
+      remove_method :installed?
 
-        local_platform.cpu = if arch == "arm64e" # arm64e is only permitted for Apple system binaries
-          "arm64"
+      def installed?
+        case @spec
+        when Gem::Resolver::VendorSpecification then
+          true
         else
-          arch
-        end
+          this_spec = full_spec
 
-        def extensions_dir
-          Gem.default_ext_dir_for(base_dir) ||
-            File.join(base_dir, "extensions", ORIGINAL_LOCAL_PLATFORM,
-                      Gem.extension_api_version)
+          Gem::Specification.any? do |s|
+            s == this_spec && s.base_dir == this_spec.base_dir
+          end
         end
       end
     end
   end
 
-  require "rubygems/util"
-
-  Util.singleton_class.module_eval do
-    if Util.singleton_methods.include?(:glob_files_in_dir) # since 3.0.0.beta.2
-      remove_method :glob_files_in_dir
+  unless Gem.rubygems_version >= Gem::Version.new("3.6.7")
+    module UnfreezeCompactIndexParsedResponse
+      def parse(line)
+        version, platform, dependencies, requirements = super
+        [version, platform, dependencies.frozen? ? dependencies.dup : dependencies, requirements.frozen? ? requirements.dup : requirements]
+      end
     end
 
-    def glob_files_in_dir(glob, base_path)
-      Dir.glob(glob, :base => base_path).map! {|f| File.expand_path(f, base_path) }
+    Resolver::APISet::GemParser.prepend(UnfreezeCompactIndexParsedResponse)
+  end
+
+  if Gem.rubygems_version < Gem::Version.new("3.6.0")
+    class Package; end
+    require "rubygems/package/tar_reader"
+    require "rubygems/package/tar_reader/entry"
+
+    module FixFullNameEncoding
+      def full_name
+        super.force_encoding(Encoding::UTF_8)
+      end
     end
+
+    Package::TarReader::Entry.prepend(FixFullNameEncoding)
   end
 end
diff --git a/lib/bundler/rubygems_gem_installer.rb b/lib/bundler/rubygems_gem_installer.rb
index 38035a00acefc0..1af1b85ff015a4 100644
--- a/lib/bundler/rubygems_gem_installer.rb
+++ b/lib/bundler/rubygems_gem_installer.rb
@@ -20,16 +20,21 @@ def install
       strict_rm_rf spec.extension_dir
 
       SharedHelpers.filesystem_access(gem_dir, :create) do
-        FileUtils.mkdir_p gem_dir, :mode => 0o755
+        FileUtils.mkdir_p gem_dir, mode: 0o755
       end
 
-      extract_files
+      SharedHelpers.filesystem_access(gem_dir, :write) do
+        extract_files
+      end
 
       build_extensions if spec.extensions.any?
       write_build_info_file
       run_post_build_hooks
 
-      generate_bin
+      SharedHelpers.filesystem_access(bin_dir, :write) do
+        generate_bin
+      end
+
       generate_plugins
 
       write_spec
@@ -45,6 +50,24 @@ def install
       spec
     end
 
+    if Bundler.rubygems.provides?("< 3.5")
+      def pre_install_checks
+        super
+      rescue Gem::FilePermissionError
+        # Ignore permission checks in RubyGems. Instead, go on, and try to write
+        # for real. We properly handle permission errors when they happen.
+        nil
+      end
+    end
+
+    def ensure_writable_dir(dir)
+      super
+    rescue Gem::FilePermissionError
+      # Ignore permission checks in RubyGems. Instead, go on, and try to write
+      # for real. We properly handle permission errors when they happen.
+      nil
+    end
+
     def generate_plugins
       return unless Gem::Installer.instance_methods(false).include?(:generate_plugins)
 
@@ -60,8 +83,24 @@ def generate_plugins
       end
     end
 
-    def pre_install_checks
-      super && validate_bundler_checksum(options[:bundler_expected_checksum])
+    if Bundler.rubygems.provides?("< 3.5.19")
+      def generate_bin_script(filename, bindir)
+        bin_script_path = File.join bindir, formatted_program_filename(filename)
+
+        Gem.open_file_with_lock(bin_script_path) do
+          require "fileutils"
+          FileUtils.rm_f bin_script_path # prior install may have been --no-wrappers
+
+          File.open(bin_script_path, "wb", 0o755) do |file|
+            file.write app_script_text(filename)
+            file.chmod(options[:prog_mode] || 0o755)
+          end
+        end
+
+        verbose bin_script_path
+
+        generate_windows_script filename, bindir
+      end
     end
 
     def build_extensions
@@ -98,74 +137,35 @@ def spec
       end
     end
 
+    def gem_checksum
+      Checksum.from_gem_package(@package)
+    end
+
     private
 
     def prepare_extension_build(extension_dir)
       SharedHelpers.filesystem_access(extension_dir, :create) do
         FileUtils.mkdir_p extension_dir
       end
-      require "shellwords" unless Bundler.rubygems.provides?(">= 3.2.25")
     end
 
     def strict_rm_rf(dir)
-      Bundler.rm_rf dir
-    rescue StandardError => e
-      raise unless File.exist?(dir)
-
-      raise DirectoryRemovalError.new(e, "Could not delete previous installation of `#{dir}`")
-    end
+      return unless File.exist?(dir)
+      return if Dir.empty?(dir)
 
-    def validate_bundler_checksum(checksum)
-      return true if Bundler.settings[:disable_checksum_validation]
-      return true unless checksum
-      return true unless source = @package.instance_variable_get(:@gem)
-      return true unless source.respond_to?(:with_read_io)
-      digest = source.with_read_io do |io|
-        digest = SharedHelpers.digest(:SHA256).new
-        digest << io.read(16_384) until io.eof?
-        io.rewind
-        send(checksum_type(checksum), digest)
-      end
-      unless digest == checksum
-        raise SecurityError, <<-MESSAGE
-          Bundler cannot continue installing #{spec.name} (#{spec.version}).
-          The checksum for the downloaded `#{spec.full_name}.gem` does not match \
-          the checksum given by the server. This means the contents of the downloaded \
-          gem is different from what was uploaded to the server, and could be a potential security issue.
-
-          To resolve this issue:
-          1. delete the downloaded gem located at: `#{spec.gem_dir}/#{spec.full_name}.gem`
-          2. run `bundle install`
-
-          If you wish to continue installing the downloaded gem, and are certain it does not pose a \
-          security issue despite the mismatching checksum, do the following:
-          1. run `bundle config set --local disable_checksum_validation true` to turn off checksum verification
-          2. run `bundle install`
-
-          (More info: The expected SHA256 checksum was #{checksum.inspect}, but the \
-          checksum for the downloaded gem was #{digest.inspect}.)
-          MESSAGE
-      end
-      true
-    end
+      parent = File.dirname(dir)
+      parent_st = File.stat(parent)
 
-    def checksum_type(checksum)
-      case checksum.length
-      when 64 then :hexdigest!
-      when 44 then :base64digest!
-      else raise InstallError, "The given checksum for #{spec.full_name} (#{checksum.inspect}) is not a valid SHA256 hexdigest nor base64digest"
+      if parent_st.world_writable? && !parent_st.sticky?
+        raise InsecureInstallPathError.new(spec.full_name, dir)
       end
-    end
 
-    def hexdigest!(digest)
-      digest.hexdigest!
-    end
+      begin
+        FileUtils.remove_entry_secure(dir)
+      rescue StandardError => e
+        raise unless File.exist?(dir)
 
-    def base64digest!(digest)
-      if digest.respond_to?(:base64digest!)
-        digest.base64digest!
-      else
-        [digest.digest!].pack("m0")
+        raise DirectoryRemovalError.new(e, "Could not delete previous installation of `#{dir}`")
       end
     end
   end
diff --git a/lib/bundler/rubygems_integration.rb b/lib/bundler/rubygems_integration.rb
index d6f179cc96f6dc..31f255d997a833 100644
--- a/lib/bundler/rubygems_integration.rb
+++ b/lib/bundler/rubygems_integration.rb
@@ -4,17 +4,12 @@
 
 module Bundler
   class RubygemsIntegration
-    if defined?(Gem::Ext::Builder::CHDIR_MONITOR)
-      EXT_LOCK = Gem::Ext::Builder::CHDIR_MONITOR
-    else
-      require "monitor"
+    require "monitor"
 
-      EXT_LOCK = Monitor.new
-    end
+    EXT_LOCK = Monitor.new
 
     def initialize
       @replaced_methods = {}
-      backport_ext_builder_monitor
     end
 
     def version
@@ -25,10 +20,6 @@ def provides?(req_str)
       Gem::Requirement.new(req_str).satisfied_by?(version)
     end
 
-    def supports_bundler_trampolining?
-      provides?(">= 3.3.0.a")
-    end
-
     def build_args
       require "rubygems/command"
       Gem::Command.build_args
@@ -39,20 +30,12 @@ def build_args=(args)
       Gem::Command.build_args = args
     end
 
-    def loaded_specs(name)
-      Gem.loaded_specs[name]
+    def set_target_rbconfig(path)
+      Gem.set_target_rbconfig(path)
     end
 
-    def add_to_load_path(paths)
-      return Gem.add_to_load_path(*paths) if Gem.respond_to?(:add_to_load_path)
-
-      if insert_index = Gem.load_path_insert_index
-        # Gem directories must come after -I and ENV['RUBYLIB']
-        $LOAD_PATH.insert(insert_index, *paths)
-      else
-        # We are probably testing in core, -I and RUBYLIB don't apply
-        $LOAD_PATH.unshift(*paths)
-      end
+    def loaded_specs(name)
+      Gem.loaded_specs[name]
     end
 
     def mark_loaded(spec)
@@ -65,7 +48,7 @@ def mark_loaded(spec)
     end
 
     def validate(spec)
-      Bundler.ui.silence { spec.validate(false) }
+      Bundler.ui.silence { spec.validate_for_resolution }
     rescue Gem::InvalidSpecificationException => e
       error_message = "The gemspec at #{spec.loaded_from} is not valid. Please fix this gemspec.\n" \
         "The validation error was '#{e.message}'\n"
@@ -74,28 +57,6 @@ def validate(spec)
       nil
     end
 
-    def set_installed_by_version(spec, installed_by_version = Gem::VERSION)
-      return unless spec.respond_to?(:installed_by_version=)
-      spec.installed_by_version = Gem::Version.create(installed_by_version)
-    end
-
-    def spec_missing_extensions?(spec, default = true)
-      return spec.missing_extensions? if spec.respond_to?(:missing_extensions?)
-
-      return false if spec.default_gem?
-      return false if spec.extensions.empty?
-
-      default
-    end
-
-    def spec_matches_for_glob(spec, glob)
-      return spec.matches_for_glob(glob) if spec.respond_to?(:matches_for_glob)
-
-      spec.load_paths.flat_map do |lp|
-        Dir["#{lp}/#{glob}#{suffix_pattern}"]
-      end
-    end
-
     def stub_set_spec(stub, spec)
       stub.instance_variable_set(:@spec, spec)
     end
@@ -116,16 +77,6 @@ def inflate(obj)
       Gem::Util.inflate(obj)
     end
 
-    def correct_for_windows_path(path)
-      if Gem::Util.respond_to?(:correct_for_windows_path)
-        Gem::Util.correct_for_windows_path(path)
-      elsif path[0].chr == "/" && path[1].chr =~ /[a-z]/i && path[2].chr == ":"
-        path[1..-1]
-      else
-        path
-      end
-    end
-
     def gem_dir
       Gem.dir
     end
@@ -161,7 +112,7 @@ def gem_cache
     def spec_cache_dirs
       @spec_cache_dirs ||= begin
         dirs = gem_path.map {|dir| File.join(dir, "specifications") }
-        dirs << Gem.spec_cache_dir if Gem.respond_to?(:spec_cache_dir) # Not in RubyGems 2.0.3 or earlier
+        dirs << Gem.spec_cache_dir
         dirs.uniq.select {|dir| File.directory? dir }
       end
     end
@@ -183,18 +134,6 @@ def loaded_gem_paths
       loaded_gem_paths.flatten
     end
 
-    def load_plugins
-      Gem.load_plugins if Gem.respond_to?(:load_plugins)
-    end
-
-    def load_plugin_files(files)
-      Gem.load_plugin_files(files) if Gem.respond_to?(:load_plugin_files)
-    end
-
-    def load_env_plugins
-      Gem.load_env_plugins if Gem.respond_to?(:load_env_plugins)
-    end
-
     def ui=(obj)
       Gem::DefaultUserInteraction.ui = obj
     end
@@ -238,54 +177,12 @@ def reverse_rubygems_kernel_mixin
       end
     end
 
-    def replace_require(specs)
-      return if [::Kernel.singleton_class, ::Kernel].any? {|klass| klass.respond_to?(:no_warning_require) }
-
-      [::Kernel.singleton_class, ::Kernel].each do |kernel_class|
-        kernel_class.send(:alias_method, :no_warning_require, :require)
-        kernel_class.send(:define_method, :require) do |file|
-          file = File.path(file)
-          name = file.tr("/", "-")
-          if (::Gem::BUNDLED_GEMS::SINCE.keys - specs.to_a.map(&:name)).include?(name)
-            unless $LOADED_FEATURES.any? {|f| f.end_with?("#{name}.rb", "#{name}.#{RbConfig::CONFIG["DLEXT"]}") }
-              target_file = begin
-                              Bundler.default_gemfile.basename
-                            rescue GemfileNotFound
-                              "inline Gemfile"
-                            end
-              be = ::Gem::BUNDLED_GEMS::SINCE[name] > RUBY_VERSION ? "will be" : "is"
-              message = "#{name} #{be} not part of the default gems since Ruby #{::Gem::BUNDLED_GEMS::SINCE[name]}." \
-              " Add #{name} to your #{target_file}."
-              location = caller_locations(1,1)[0]&.path
-              if File.file?(location) && !location.start_with?(Gem::BUNDLED_GEMS::LIBDIR)
-                caller_gem = nil
-                Gem.path.each do |path|
-                  if location =~ %r{#{path}/gems/([\w\-\.]+)}
-                    caller_gem = $1
-                    break
-                  end
-                end
-                message += " Also contact author of #{caller_gem} to add #{name} into its gemspec."
-              end
-              warn message, :uplevel => 1
-            end
-          end
-          kernel_class.send(:no_warning_require, file)
-        end
-        if kernel_class == ::Kernel
-          kernel_class.send(:private, :require)
-        else
-          kernel_class.send(:public, :require)
-        end
-      end
-    end
-
-    def replace_gem(specs, specs_by_name)
+    def replace_gem(specs_by_name)
       executables = nil
 
       [::Kernel.singleton_class, ::Kernel].each do |kernel_class|
         redefine_method(kernel_class, :gem) do |dep, *reqs|
-          if executables&.include?(File.basename(caller.first.split(":").first))
+          if executables&.include?(File.basename(caller_locations(1, 1).first.path))
             break
           end
 
@@ -317,18 +214,11 @@ def replace_gem(specs, specs_by_name)
           e.requirement = dep.requirement
           raise e
         end
-
-        # backwards compatibility shim, see https://github.com/rubygems/bundler/issues/5102
-        kernel_class.send(:public, :gem) if Bundler.feature_flag.setup_makes_kernel_gem_public?
       end
     end
 
-    # Used to make bin stubs that are not created by bundler work
-    # under bundler. The new Gem.bin_path only considers gems in
-    # +specs+
+    # Used to give better error messages when activating specs outside of the current bundle
     def replace_bin_path(specs_by_name)
-      gem_class = (class << Gem; self; end)
-
       redefine_method(gem_class, :find_spec_for_exe) do |gem_name, *args|
         exec_name = args.first
         raise ArgumentError, "you must supply exec_name" unless exec_name
@@ -364,31 +254,6 @@ def replace_bin_path(specs_by_name)
 
         spec
       end
-
-      redefine_method(gem_class, :activate_bin_path) do |name, *args|
-        exec_name = args.first
-        return ENV["BUNDLE_BIN_PATH"] if exec_name == "bundle"
-
-        # Copy of Rubygems activate_bin_path impl
-        requirement = args.last
-        spec = find_spec_for_exe name, exec_name, [requirement]
-
-        gem_bin = File.join(spec.full_gem_path, spec.bindir, exec_name)
-        gem_from_path_bin = File.join(File.dirname(spec.loaded_from), spec.bindir, exec_name)
-        File.exist?(gem_bin) ? gem_bin : gem_from_path_bin
-      end
-
-      redefine_method(gem_class, :bin_path) do |name, *args|
-        exec_name = args.first
-        return ENV["BUNDLE_BIN_PATH"] if exec_name == "bundle"
-
-        spec = find_spec_for_exe(name, *args)
-        exec_name ||= spec.default_executable
-
-        gem_bin = File.join(spec.full_gem_path, spec.bindir, exec_name)
-        gem_from_path_bin = File.join(File.dirname(spec.loaded_from), spec.bindir, exec_name)
-        File.exist?(gem_bin) ? gem_bin : gem_from_path_bin
-      end
     end
 
     # Replace or hook into RubyGems to provide a bundlerized view
@@ -396,13 +261,16 @@ def replace_bin_path(specs_by_name)
     def replace_entrypoints(specs)
       specs_by_name = add_default_gems_to(specs)
 
-      if defined?(::Gem::BUNDLED_GEMS::SINCE)
-        replace_require(specs)
+      reverse_rubygems_kernel_mixin
+      begin
+        # bundled_gems only provide with Ruby 3.3 or later
+        require "bundled_gems"
+      rescue LoadError
       else
-        reverse_rubygems_kernel_mixin
+        Gem::BUNDLED_GEMS.replace_require(specs) if Gem::BUNDLED_GEMS.respond_to?(:replace_require)
       end
-      replace_gem(specs, specs_by_name)
-      stub_rubygems(specs)
+      replace_gem(specs_by_name)
+      stub_rubygems(specs_by_name.values)
       replace_bin_path(specs_by_name)
 
       Gem.clear_paths
@@ -420,7 +288,6 @@ def add_default_gems_to(specs)
         default_spec_name = default_spec.name
         next if specs_by_name.key?(default_spec_name)
 
-        specs << default_spec
         specs_by_name[default_spec_name] = default_spec
       end
 
@@ -431,11 +298,7 @@ def undo_replacements
       @replaced_methods.each do |(sym, klass), method|
         redefine_method(klass, sym, method)
       end
-      if Binding.public_method_defined?(:source_location)
-        post_reset_hooks.reject! {|proc| proc.binding.source_location[0] == __FILE__ }
-      else
-        post_reset_hooks.reject! {|proc| proc.binding.eval("__FILE__") == __FILE__ }
-      end
+      post_reset_hooks.reject! {|proc| proc.binding.source_location[0] == __FILE__ }
       @replaced_methods.clear
     end
 
@@ -477,9 +340,13 @@ def stub_rubygems(specs)
         Gem::Specification.all = specs
       end
 
-      redefine_method((class << Gem; self; end), :finish_resolve) do |*|
+      redefine_method(gem_class, :finish_resolve) do |*|
         []
       end
+
+      redefine_method(gem_class, :load_plugins) do |*|
+        load_plugin_files specs.flat_map(&:plugins)
+      end
     end
 
     def plain_specs
@@ -490,38 +357,37 @@ def plain_specs=(specs)
       Gem::Specification.all = specs
     end
 
-    def fetch_specs(remote, name)
+    def fetch_specs(remote, name, fetcher)
       require "rubygems/remote_fetcher"
       path = remote.uri.to_s + "#{name}.#{Gem.marshal_version}.gz"
-      fetcher = gem_remote_fetcher
-      fetcher.headers = { "X-Gemfile-Source" => remote.original_uri.to_s } if remote.original_uri
       string = fetcher.fetch_path(path)
-      Bundler.safe_load_marshal(string)
+      specs = Bundler.safe_load_marshal(string)
+      raise MarshalError, "Specs #{name} from #{remote} is expected to be an Array but was unexpected class #{specs.class}" unless specs.is_a?(Array)
+      specs
     rescue Gem::RemoteFetcher::FetchError
       # it's okay for prerelease to fail
       raise unless name == "prerelease_specs"
     end
 
-    def fetch_all_remote_specs(remote)
-      specs = fetch_specs(remote, "specs")
-      pres = fetch_specs(remote, "prerelease_specs") || []
+    def fetch_all_remote_specs(remote, gem_remote_fetcher)
+      specs = fetch_specs(remote, "specs", gem_remote_fetcher)
+      pres = fetch_specs(remote, "prerelease_specs", gem_remote_fetcher) || []
 
       specs.concat(pres)
     end
 
-    def download_gem(spec, uri, cache_dir)
+    def download_gem(spec, uri, cache_dir, fetcher)
       require "rubygems/remote_fetcher"
       uri = Bundler.settings.mirror_for(uri)
-      fetcher = gem_remote_fetcher
-      fetcher.headers = { "X-Gemfile-Source" => spec.remote.original_uri.to_s } if spec.remote.original_uri
-      Bundler::Retry.new("download gem from #{uri}").attempts do
+      redacted_uri = Gem::Uri.redact(uri)
+
+      Bundler::Retry.new("download gem from #{redacted_uri}").attempts do
         gem_file_name = spec.file_name
         local_gem_path = File.join cache_dir, gem_file_name
         return if File.exist? local_gem_path
 
         begin
           remote_gem_path = uri + "gems/#{gem_file_name}"
-          remote_gem_path = remote_gem_path.to_s if provides?("< 3.2.0.rc.1")
 
           SharedHelpers.filesystem_access(local_gem_path) do
             fetcher.cache_update_path remote_gem_path, local_gem_path
@@ -537,13 +403,7 @@ def download_gem(spec, uri, cache_dir)
         end
       end
     rescue Gem::RemoteFetcher::FetchError => e
-      raise Bundler::HTTPError, "Could not download gem from #{uri} due to underlying error <#{e.message}>"
-    end
-
-    def gem_remote_fetcher
-      require "rubygems/remote_fetcher"
-      proxy = Gem.configuration[:http_proxy]
-      Gem::RemoteFetcher.new(proxy)
+      raise Bundler::HTTPError, "Could not download gem from #{redacted_uri} due to underlying error <#{e.message}>"
     end
 
     def build(spec, skip_validation = false)
@@ -556,27 +416,22 @@ def path_separator
     end
 
     def all_specs
+      SharedHelpers.major_deprecation 2, "Bundler.rubygems.all_specs has been removed in favor of Bundler.rubygems.installed_specs"
+
       Gem::Specification.stubs.map do |stub|
         StubSpecification.from_stub(stub)
       end
     end
 
-    def backport_ext_builder_monitor
-      # So we can avoid requiring "rubygems/ext" in its entirety
-      Gem.module_eval <<-RUBY, __FILE__, __LINE__ + 1
-        module Ext
-        end
-      RUBY
-
-      require "rubygems/ext/builder"
-
-      Gem::Ext::Builder.class_eval do
-        unless const_defined?(:CHDIR_MONITOR)
-          const_set(:CHDIR_MONITOR, EXT_LOCK)
-        end
+    def installed_specs
+      Gem::Specification.stubs.reject(&:default_gem?).map do |stub|
+        StubSpecification.from_stub(stub)
+      end
+    end
 
-        remove_const(:CHDIR_MUTEX) if const_defined?(:CHDIR_MUTEX)
-        const_set(:CHDIR_MUTEX, const_get(:CHDIR_MONITOR))
+    def default_specs
+      Gem::Specification.default_stubs.map do |stub|
+        StubSpecification.from_stub(stub)
       end
     end
 
@@ -588,14 +443,14 @@ def find_name(name)
       Gem::Specification.stubs_for(name).map(&:to_spec)
     end
 
-    if Gem::Specification.respond_to?(:default_stubs)
-      def default_stubs
-        Gem::Specification.default_stubs("*.gemspec")
-      end
-    else
-      def default_stubs
-        Gem::Specification.send(:default_stubs, "*.gemspec")
-      end
+    def default_stubs
+      Gem::Specification.default_stubs("*.gemspec")
+    end
+
+    private
+
+    def gem_class
+      class << Gem; self; end
     end
   end
 
diff --git a/lib/bundler/runtime.rb b/lib/bundler/runtime.rb
index 95cf78dd41c248..9b2416402bb74c 100644
--- a/lib/bundler/runtime.rb
+++ b/lib/bundler/runtime.rb
@@ -10,7 +10,7 @@ def initialize(root, definition)
     end
 
     def setup(*groups)
-      @definition.ensure_equivalent_gemfile_and_lockfile if Bundler.frozen_bundle?
+      @definition.ensure_equivalent_gemfile_and_lockfile
 
       # Has to happen first
       clean_load_path
@@ -28,11 +28,11 @@ def setup(*groups)
         spec.load_paths.reject {|path| $LOAD_PATH.include?(path) }
       end.reverse.flatten
 
-      Bundler.rubygems.add_to_load_path(load_paths)
+      Gem.add_to_load_path(*load_paths)
 
       setup_manpath
 
-      lock(:preserve_unknown_sections => true)
+      lock(preserve_unknown_sections: true)
 
       self
     end
@@ -41,42 +41,48 @@ def require(*groups)
       groups.map!(&:to_sym)
       groups = [:default] if groups.empty?
 
-      @definition.dependencies.each do |dep|
-        # Skip the dependency if it is not in any of the requested groups, or
-        # not for the current platform, or doesn't match the gem constraints.
-        next unless (dep.groups & groups).any? && dep.should_include?
-
-        required_file = nil
+      dependencies = @definition.dependencies.select do |dep|
+        # Select the dependency if it is in any of the requested groups, and
+        # for the current platform, and matches the gem constraints.
+        (dep.groups & groups).any? && dep.should_include?
+      end
 
-        begin
-          # Loop through all the specified autorequires for the
-          # dependency. If there are none, use the dependency's name
-          # as the autorequire.
-          Array(dep.autorequire || dep.name).each do |file|
-            # Allow `require: true` as an alias for `require: <name>`
-            file = dep.name if file == true
-            required_file = file
-            begin
-              Kernel.require file
-            rescue RuntimeError => e
-              raise e if e.is_a?(LoadError) # we handle this a little later
+      Plugin.hook(Plugin::Events::GEM_BEFORE_REQUIRE_ALL, dependencies)
+
+      dependencies.each do |dep|
+        Plugin.hook(Plugin::Events::GEM_BEFORE_REQUIRE, dep)
+
+        # Loop through all the specified autorequires for the
+        # dependency. If there are none, use the dependency's name
+        # as the autorequire.
+        Array(dep.autorequire || dep.name).each do |file|
+          # Allow `require: true` as an alias for `require: <name>`
+          file = dep.name if file == true
+          required_file = file
+          begin
+            Kernel.require required_file
+          rescue LoadError => e
+            if dep.autorequire.nil? && e.path == required_file
+              if required_file.include?("-")
+                required_file = required_file.tr("-", "/")
+                retry
+              end
+            else
               raise Bundler::GemRequireError.new e,
                 "There was an error while trying to load the gem '#{file}'."
             end
-          end
-        rescue LoadError => e
-          raise if dep.autorequire || e.path != required_file
-
-          if dep.autorequire.nil? && dep.name.include?("-")
-            begin
-              namespaced_file = dep.name.tr("-", "/")
-              Kernel.require namespaced_file
-            rescue LoadError => e
-              raise if e.path != namespaced_file
-            end
+          rescue StandardError => e
+            raise Bundler::GemRequireError.new e,
+              "There was an error while trying to load the gem '#{file}'."
           end
         end
+
+        Plugin.hook(Plugin::Events::GEM_AFTER_REQUIRE, dep)
       end
+
+      Plugin.hook(Plugin::Events::GEM_AFTER_REQUIRE_ALL, dependencies)
+
+      dependencies
     end
 
     def self.definition_method(meth)
@@ -95,7 +101,7 @@ def self.definition_method(meth)
 
     def lock(opts = {})
       return if @definition.no_resolve_needed?
-      @definition.lock(Bundler.default_lockfile, opts[:preserve_unknown_sections])
+      @definition.lock(opts[:preserve_unknown_sections])
     end
 
     alias_method :gems, :specs
@@ -124,8 +130,15 @@ def cache(custom_path = nil, local = false)
 
       specs_to_cache.each do |spec|
         next if spec.name == "bundler"
-        next if spec.source.is_a?(Source::Gemspec)
-        spec.source.cache(spec, custom_path) if spec.source.respond_to?(:cache)
+
+        source = spec.source
+        next if source.is_a?(Source::Gemspec)
+
+        if source.respond_to?(:migrate_cache)
+          source.migrate_cache(custom_path, local: local)
+        elsif source.respond_to?(:cache)
+          source.cache(spec, custom_path)
+        end
       end
 
       Dir[cache_path.join("*/.git")].each do |git_dir|
@@ -257,10 +270,10 @@ def prune_git_and_path_cache(resolve, cache_path)
 
     def setup_manpath
       # Add man/ subdirectories from activated bundles to MANPATH for man(1)
-      manuals = $LOAD_PATH.map do |path|
+      manuals = $LOAD_PATH.filter_map do |path|
         man_subdir = path.sub(/lib$/, "man")
         man_subdir unless Dir[man_subdir + "/man?/"].empty?
-      end.compact
+      end
 
       return if manuals.empty?
       Bundler::SharedHelpers.set_env "MANPATH", manuals.concat(
diff --git a/lib/bundler/self_manager.rb b/lib/bundler/self_manager.rb
index 1925a266d977db..7db6c9f6f1cd9e 100644
--- a/lib/bundler/self_manager.rb
+++ b/lib/bundler/self_manager.rb
@@ -7,13 +7,15 @@ module Bundler
   #
   class SelfManager
     def restart_with_locked_bundler_if_needed
-      return unless needs_switching? && installed?
+      restart_version = find_restart_version
+      return unless restart_version && installed?(restart_version)
 
       restart_with(restart_version)
     end
 
     def install_locked_bundler_and_restart_with_it_if_needed
-      return unless needs_switching?
+      restart_version = find_restart_version
+      return unless restart_version
 
       if restart_version == lockfile_version
         Bundler.ui.info \
@@ -29,8 +31,6 @@ def install_locked_bundler_and_restart_with_it_if_needed
     end
 
     def update_bundler_and_restart_with_it_if_needed(target)
-      return unless autoswitching_applies?
-
       spec = resolve_update_version_from(target)
       return unless spec
 
@@ -38,7 +38,7 @@ def update_bundler_and_restart_with_it_if_needed(target)
 
       Bundler.ui.info "Updating bundler to #{version}."
 
-      install(spec)
+      install(spec) unless installed?(version)
 
       restart_with(version)
     end
@@ -68,31 +68,37 @@ def install(spec)
 
     def restart_with(version)
       configured_gem_home = ENV["GEM_HOME"]
+      configured_orig_gem_home = ENV["BUNDLER_ORIG_GEM_HOME"]
       configured_gem_path = ENV["GEM_PATH"]
+      configured_orig_gem_path = ENV["BUNDLER_ORIG_GEM_PATH"]
 
-      cmd = [$PROGRAM_NAME, *ARGV]
-      cmd.unshift(Gem.ruby) unless File.executable?($PROGRAM_NAME)
+      argv0 = File.exist?($PROGRAM_NAME) ? $PROGRAM_NAME : Process.argv0
+      cmd = [argv0, *ARGV]
+      cmd.unshift(Gem.ruby) unless File.executable?(argv0)
 
       Bundler.with_original_env do
         Kernel.exec(
-          { "GEM_HOME" => configured_gem_home, "GEM_PATH" => configured_gem_path, "BUNDLER_VERSION" => version.to_s },
+          {
+            "GEM_HOME" => configured_gem_home,
+            "BUNDLER_ORIG_GEM_HOME" => configured_orig_gem_home,
+            "GEM_PATH" => configured_gem_path,
+            "BUNDLER_ORIG_GEM_PATH" => configured_orig_gem_path,
+            "BUNDLER_VERSION" => version.to_s,
+          },
           *cmd
         )
       end
     end
 
-    def needs_switching?
+    def needs_switching?(restart_version)
       autoswitching_applies? &&
-        released?(lockfile_version) &&
-        !running?(lockfile_version) &&
-        !updating? &&
-        Bundler.settings[:version] != "system"
+        released?(restart_version) &&
+        !running?(restart_version)
     end
 
     def autoswitching_applies?
       ENV["BUNDLER_VERSION"].nil? &&
-        Bundler.rubygems.supports_bundler_trampolining? &&
-        SharedHelpers.in_bundle? &&
+        ruby_can_restart_with_same_arguments? &&
         lockfile_version
     end
 
@@ -121,11 +127,12 @@ def remote_specs
         source = Bundler::Source::Rubygems.new("remotes" => "https://rubygems.org")
         source.remote!
         source.add_dependency_names("bundler")
-        source.specs
+        source.specs.select(&:matches_current_metadata?)
       end
     end
 
     def find_latest_matching_spec(requirement)
+      Bundler.configure
       local_result = find_latest_matching_spec_from_collection(local_specs, requirement)
       return local_result if local_result && requirement.specific?
 
@@ -151,18 +158,18 @@ def released?(version)
       !version.to_s.end_with?(".dev")
     end
 
-    def updating?
-      "update".start_with?(ARGV.first || " ") && ARGV[1..-1].any? {|a| a.start_with?("--bundler") }
+    def ruby_can_restart_with_same_arguments?
+      $PROGRAM_NAME != "-e"
     end
 
-    def installed?
+    def installed?(restart_version)
       Bundler.configure
 
       Bundler.rubygems.find_bundler(restart_version.to_s)
     end
 
     def current_version
-      @current_version ||= Gem::Version.new(Bundler::VERSION)
+      @current_version ||= Bundler.gem_version
     end
 
     def lockfile_version
@@ -174,13 +181,16 @@ def lockfile_version
       @lockfile_version = nil
     end
 
-    def restart_version
-      return @restart_version if defined?(@restart_version)
-      # BUNDLE_VERSION=x.y.z
-      @restart_version = Gem::Version.new(Bundler.settings[:version])
-    rescue ArgumentError
-      # BUNDLE_VERSION=lockfile
-      @restart_version = lockfile_version
+    def find_restart_version
+      return unless SharedHelpers.in_bundle?
+
+      configured_version = Bundler.settings[:version]
+      return if configured_version == "system"
+
+      restart_version = configured_version == "lockfile" ? lockfile_version : Gem::Version.new(configured_version)
+      return unless needs_switching?(restart_version)
+
+      restart_version
     end
   end
 end
diff --git a/lib/bundler/settings.rb b/lib/bundler/settings.rb
index 92b4a6a4e37787..d036754a78371a 100644
--- a/lib/bundler/settings.rb
+++ b/lib/bundler/settings.rb
@@ -7,14 +7,11 @@ class Settings
     autoload :Validator, File.expand_path("settings/validator", __dir__)
 
     BOOL_KEYS = %w[
-      allow_deployment_source_credential_changes
       allow_offline_install
-      auto_clean_without_path
       auto_install
       cache_all
       cache_all_platforms
       clean
-      default_install_uses_path
       deployment
       disable_checksum_validation
       disable_exec_load
@@ -28,22 +25,36 @@ class Settings
       gem.changelog
       gem.coc
       gem.mit
+      gem.bundle
       git.allow_insecure
       global_gem_cache
       ignore_messages
       init_gems_rb
       inline
+      lockfile_checksums
       no_install
       no_prune
-      path_relative_to_cwd
       path.system
       plugins
       prefer_patch
-      print_only_version_number
-      setup_makes_kernel_gem_public
       silence_deprecations
       silence_root_warning
       update_requires_all_flag
+      verbose
+    ].freeze
+
+    REMEMBERED_KEYS = %w[
+      bin
+      cache_all
+      clean
+      deployment
+      frozen
+      no_prune
+      path
+      shebang
+      path.system
+      without
+      with
     ].freeze
 
     NUMBER_KEYS = %w[
@@ -72,6 +83,7 @@ class Settings
       gemfile
       path
       shebang
+      simulate_version
       system_bindir
       trust-policy
       version
@@ -90,6 +102,7 @@ class Settings
     def initialize(root = nil)
       @root            = root
       @local_config    = load_config(local_config_file)
+      @local_root      = root || Pathname.new(".bundle").expand_path
 
       @env_config      = ENV.to_h
       @env_config.select! {|key, _value| key.start_with?("BUNDLE_") }
@@ -97,6 +110,8 @@ def initialize(root = nil)
 
       @global_config   = load_config(global_config_file)
       @temporary       = {}
+
+      @key_cache = {}
     end
 
     def [](name)
@@ -113,7 +128,7 @@ def [](name)
     end
 
     def set_command_option(key, value)
-      if Bundler.feature_flag.forget_cli_options?
+      if !is_remembered(key) || Bundler.feature_flag.forget_cli_options?
         temporary(key => value)
         value
       else
@@ -127,7 +142,7 @@ def set_command_option_if_given(key, value)
     end
 
     def set_local(key, value)
-      local_config_file || raise(GemfileNotFound, "Could not locate Gemfile")
+      local_config_file = @local_root.join("config")
 
       set_key(key, value, @local_config, local_config_file)
     end
@@ -173,7 +188,7 @@ def local_overrides
     def mirror_for(uri)
       if uri.is_a?(String)
         require_relative "vendored_uri"
-        uri = Bundler::URI(uri)
+        uri = Gem::URI(uri)
       end
 
       gem_mirrors.for(uri.to_s).uri
@@ -257,7 +272,7 @@ def path
       def use_system_gems?
         return true if system_path
         return false if explicit_path
-        !Bundler.feature_flag.default_install_uses_path?
+        !Bundler.feature_flag.bundler_4_mode?
       end
 
       def base_path
@@ -312,18 +327,18 @@ def validate!
     end
 
     def key_for(key)
-      self.class.key_for(key)
+      @key_cache[key] ||= self.class.key_for(key)
     end
 
     private
 
     def configs
       @configs ||= {
-        :temporary => @temporary,
-        :local => @local_config,
-        :env => @env_config,
-        :global => @global_config,
-        :default => DEFAULT_CONFIG,
+        temporary: @temporary,
+        local: @local_config,
+        env: @env_config,
+        global: @global_config,
+        default: DEFAULT_CONFIG,
       }
     end
 
@@ -344,12 +359,12 @@ def split_specific_setting_for(name)
     end
 
     def is_bool(name)
-      name = name.to_s
+      name = self.class.key_to_s(name)
       BOOL_KEYS.include?(name) || BOOL_KEYS.include?(parent_setting_for(name))
     end
 
     def is_string(name)
-      name = name.to_s
+      name = self.class.key_to_s(name)
       STRING_KEYS.include?(name) || name.start_with?("local.") || name.start_with?("mirror.") || name.start_with?("build.")
     end
 
@@ -365,11 +380,15 @@ def to_bool(value)
     end
 
     def is_num(key)
-      NUMBER_KEYS.include?(key.to_s)
+      NUMBER_KEYS.include?(self.class.key_to_s(key))
     end
 
     def is_array(key)
-      ARRAY_KEYS.include?(key.to_s)
+      ARRAY_KEYS.include?(self.class.key_to_s(key))
+    end
+
+    def is_remembered(key)
+      REMEMBERED_KEYS.include?(self.class.key_to_s(key))
     end
 
     def is_credential(key)
@@ -392,7 +411,7 @@ def array_to_s(array)
     end
 
     def set_key(raw_key, value, hash, file)
-      raw_key = raw_key.to_s
+      raw_key = self.class.key_to_s(raw_key)
       value = array_to_s(value) if is_array(raw_key)
 
       key = key_for(raw_key)
@@ -405,14 +424,18 @@ def set_key(raw_key, value, hash, file)
       Validator.validate!(raw_key, converted_value(value, raw_key), hash)
 
       return unless file
+
+      SharedHelpers.filesystem_access(file.dirname, :create) do |p|
+        FileUtils.mkdir_p(p)
+      end
+
       SharedHelpers.filesystem_access(file) do |p|
-        FileUtils.mkdir_p(p.dirname)
         p.open("w") {|f| f.write(serializer_class.dump(hash)) }
       end
     end
 
     def converted_value(value, key)
-      key = key.to_s
+      key = self.class.key_to_s(key)
 
       if is_array(key)
         to_array(value)
@@ -472,17 +495,23 @@ def load_config(config_file)
         valid_file = file.exist? && !file.size.zero?
         return {} unless valid_file
         serializer_class.load(file.read).inject({}) do |config, (k, v)|
-          new_k = k
+          k = k.dup
+          k << "/" if /https?:/i.match?(k) && !k.end_with?("/", "__#{FALLBACK_TIMEOUT_URI_OPTION.upcase}")
+          k.gsub!(".", "__")
 
-          if k.include?("-")
-            Bundler.ui.warn "Your #{file} config includes `#{k}`, which contains the dash character (`-`).\n" \
-              "This is deprecated, because configuration through `ENV` should be possible, but `ENV` keys cannot include dashes.\n" \
-              "Please edit #{file} and replace any dashes in configuration keys with a triple underscore (`___`)."
+          unless k.start_with?("#")
+            if k.include?("-")
+              Bundler.ui.warn "Your #{file} config includes `#{k}`, which contains the dash character (`-`).\n" \
+                "This is deprecated, because configuration through `ENV` should be possible, but `ENV` keys cannot include dashes.\n" \
+                "Please edit #{file} and replace any dashes in configuration keys with a triple underscore (`___`)."
 
-            new_k = k.gsub("-", "___")
+              # string hash keys are frozen
+              k = k.gsub("-", "___")
+            end
+
+            config[k] = v
           end
 
-          config[new_k] = v
           config
         end
       end
@@ -497,26 +526,25 @@ def serializer_class
       YAMLSerializer
     end
 
-    PER_URI_OPTIONS = %w[
-      fallback_timeout
-    ].freeze
+    FALLBACK_TIMEOUT_URI_OPTION = "fallback_timeout"
 
     NORMALIZE_URI_OPTIONS_PATTERN =
       /
         \A
         (\w+\.)? # optional prefix key
         (https?.*?) # URI
-        (\.#{Regexp.union(PER_URI_OPTIONS)})? # optional suffix key
+        (\.#{FALLBACK_TIMEOUT_URI_OPTION})? # optional suffix key
         \z
-      /ix.freeze
+      /ix
 
     def self.key_for(key)
-      key = normalize_uri(key).to_s if key.is_a?(String) && key.start_with?("http", "mirror.http")
-      key = key.to_s.gsub(".", "__")
+      key = key_to_s(key)
+      key = normalize_uri(key) if key.start_with?("http", "mirror.http")
+      key = key.gsub(".", "__")
       key.gsub!("-", "___")
       key.upcase!
 
-      key.prepend("BUNDLE_")
+      key.gsub(/\A([ #]*)/, '\1BUNDLE_')
     end
 
     # TODO: duplicates Rubygems#normalize_uri
@@ -530,11 +558,40 @@ def self.normalize_uri(uri)
       end
       uri = URINormalizer.normalize_suffix(uri)
       require_relative "vendored_uri"
-      uri = Bundler::URI(uri)
+      uri = Gem::URI(uri)
       unless uri.absolute?
         raise ArgumentError, format("Gem sources must be absolute. You provided '%s'.", uri)
       end
       "#{prefix}#{uri}#{suffix}"
     end
+
+    # This is a hot method, so avoid respond_to? checks on every invocation
+    if :read.respond_to?(:name)
+      def self.key_to_s(key)
+        case key
+        when String
+          key
+        when Symbol
+          key.name
+        when Gem::URI::HTTP
+          key.to_s
+        else
+          raise ArgumentError, "Invalid key: #{key.inspect}"
+        end
+      end
+    else
+      def self.key_to_s(key)
+        case key
+        when String
+          key
+        when Symbol
+          key.to_s
+        when Gem::URI::HTTP
+          key.to_s
+        else
+          raise ArgumentError, "Invalid key: #{key.inspect}"
+        end
+      end
+    end
   end
 end
diff --git a/lib/bundler/settings/validator.rb b/lib/bundler/settings/validator.rb
index 0a57ea7f03894f..9aa1627fb2e2ee 100644
--- a/lib/bundler/settings/validator.rb
+++ b/lib/bundler/settings/validator.rb
@@ -74,29 +74,6 @@ def self.validate!(key, value, settings)
           fail!(key, value, "`#{other_key}` is current set to #{other_setting.inspect}", "the `#{conflicting.join("`, `")}` groups conflict")
         end
       end
-
-      rule %w[path], "relative paths are expanded relative to the current working directory" do |key, value, settings|
-        next if value.nil?
-
-        path = Pathname.new(value)
-        next if !path.relative? || !Bundler.feature_flag.path_relative_to_cwd?
-
-        path = path.expand_path
-
-        root = begin
-                 Bundler.root
-               rescue GemfileNotFound
-                 Pathname.pwd.expand_path
-               end
-
-        path = begin
-                 path.relative_path_from(root)
-               rescue ArgumentError
-                 path
-               end
-
-        set(settings, key, path.to_s)
-      end
     end
   end
 end
diff --git a/lib/bundler/setup.rb b/lib/bundler/setup.rb
index 801fd5312aade7..5a0fd8e0e37315 100644
--- a/lib/bundler/setup.rb
+++ b/lib/bundler/setup.rb
@@ -5,6 +5,12 @@
 if Bundler::SharedHelpers.in_bundle?
   require_relative "../bundler"
 
+  # autoswitch to locked Bundler version if available
+  Bundler.auto_switch
+
+  # try to auto_install first before we get to the `Bundler.ui.silence`, so user knows what is happening
+  Bundler.auto_install
+
   if STDOUT.tty? || ENV["BUNDLER_FORCE_TTY"]
     begin
       Bundler.ui.silence { Bundler.setup }
@@ -12,7 +18,10 @@
       Bundler.ui.error e.message
       Bundler.ui.warn e.backtrace.join("\n") if ENV["DEBUG"]
       if e.is_a?(Bundler::GemNotFound)
-        suggested_cmd = "bundle install"
+        default_bundle = Gem.bin_path("bundler", "bundle")
+        current_bundle = Bundler::SharedHelpers.bundle_bin_path
+        suggested_bundle = default_bundle == current_bundle ? "bundle" : current_bundle
+        suggested_cmd = "#{suggested_bundle} install"
         original_gemfile = Bundler.original_env["BUNDLE_GEMFILE"]
         suggested_cmd += " --gemfile #{original_gemfile}" if original_gemfile
         Bundler.ui.warn "Run `#{suggested_cmd}` to install missing gems."
diff --git a/lib/bundler/shared_helpers.rb b/lib/bundler/shared_helpers.rb
index d1d4e1d07a5bf0..2bdaabdaa74525 100644
--- a/lib/bundler/shared_helpers.rb
+++ b/lib/bundler/shared_helpers.rb
@@ -1,25 +1,27 @@
 # frozen_string_literal: true
 
-require "pathname"
-require "rbconfig"
-
 require_relative "version"
-require_relative "constants"
 require_relative "rubygems_integration"
 require_relative "current_ruby"
 
+autoload :Pathname, "pathname"
+
 module Bundler
+  autoload :WINDOWS, File.expand_path("constants", __dir__)
+  autoload :FREEBSD, File.expand_path("constants", __dir__)
+  autoload :NULL, File.expand_path("constants", __dir__)
+
   module SharedHelpers
     def root
       gemfile = find_gemfile
       raise GemfileNotFound, "Could not locate Gemfile" unless gemfile
-      Pathname.new(gemfile).tap {|x| x.untaint if RUBY_VERSION < "2.7" }.expand_path.parent
+      Pathname.new(gemfile).expand_path.parent
     end
 
     def default_gemfile
       gemfile = find_gemfile
       raise GemfileNotFound, "Could not locate Gemfile" unless gemfile
-      Pathname.new(gemfile).tap {|x| x.untaint if RUBY_VERSION < "2.7" }.expand_path
+      Pathname.new(gemfile).expand_path
     end
 
     def default_lockfile
@@ -28,7 +30,7 @@ def default_lockfile
       case gemfile.basename.to_s
       when "gems.rb" then Pathname.new(gemfile.sub(/.rb$/, ".locked"))
       else Pathname.new("#{gemfile}.lock")
-      end.tap {|x| x.untaint if RUBY_VERSION < "2.7" }
+      end
     end
 
     def default_bundle_dir
@@ -94,14 +96,16 @@ def set_bundle_environment
     #   given block
     #
     # @example
-    #   filesystem_access("vendor/cache", :write) do
+    #   filesystem_access("vendor/cache", :create) do
     #     FileUtils.mkdir_p("vendor/cache")
     #   end
     #
     # @see {Bundler::PermissionError}
     def filesystem_access(path, action = :write, &block)
-      yield(path.dup.tap {|x| x.untaint if RUBY_VERSION < "2.7" })
-    rescue Errno::EACCES
+      yield(path.dup)
+    rescue Errno::EACCES => e
+      raise unless e.message.include?(path.to_s) || action == :create
+
       raise PermissionError.new(path, action)
     rescue Errno::EAGAIN
       raise TemporaryResourceError.new(path, action)
@@ -111,25 +115,34 @@ def filesystem_access(path, action = :write, &block)
       raise NoSpaceOnDeviceError.new(path, action)
     rescue Errno::ENOTSUP
       raise OperationNotSupportedError.new(path, action)
+    rescue Errno::EPERM
+      raise OperationNotPermittedError.new(path, action)
+    rescue Errno::EROFS
+      raise ReadOnlyFileSystemError.new(path, action)
     rescue Errno::EEXIST, Errno::ENOENT
       raise
     rescue SystemCallError => e
-      raise GenericSystemCallError.new(e, "There was an error accessing `#{path}`.")
+      raise GenericSystemCallError.new(e, "There was an error #{[:create, :write].include?(action) ? "creating" : "accessing"} `#{path}`.")
     end
 
-    def major_deprecation(major_version, message, print_caller_location: false)
+    def major_deprecation(major_version, message, removed_message: nil, print_caller_location: false)
       if print_caller_location
         caller_location = caller_locations(2, 2).first
-        message = "#{message} (called at #{caller_location.path}:#{caller_location.lineno})"
+        suffix = " (called at #{caller_location.path}:#{caller_location.lineno})"
+        message += suffix
+        removed_message += suffix if removed_message
       end
 
-      bundler_major_version = Bundler.bundler_major_version
-      if bundler_major_version > major_version
+      require_relative "../bundler"
+
+      feature_flag = Bundler.feature_flag
+
+      if feature_flag.removed_major?(major_version)
         require_relative "errors"
-        raise DeprecatedError, "[REMOVED] #{message}"
+        raise DeprecatedError, "[REMOVED] #{removed_message || message}"
       end
 
-      return unless bundler_major_version >= major_version && prints_major_deprecations?
+      return unless feature_flag.deprecated_major?(major_version) && prints_major_deprecations?
       Bundler.ui.warn("[DEPRECATED] #{message}")
     end
 
@@ -156,10 +169,10 @@ def ensure_same_dependencies(spec, old_deps, new_deps)
       extra_deps = new_deps - old_deps
       return if extra_deps.empty?
 
-      Bundler.ui.debug "#{spec.full_name} from #{spec.remote} has either corrupted API or lockfile dependencies" \
+      Bundler.ui.debug "#{spec.full_name} from #{spec.remote} has corrupted API dependencies" \
         " (was expecting #{old_deps.map(&:to_s)}, but the real spec has #{new_deps.map(&:to_s)})"
       raise APIResponseMismatchError,
-        "Downloading #{spec.full_name} revealed dependencies not in the API or the lockfile (#{extra_deps.join(", ")})." \
+        "Downloading #{spec.full_name} revealed dependencies not in the API (#{extra_deps.join(", ")})." \
         "\nRunning `bundle update #{spec.name}` should fix the problem."
     end
 
@@ -193,10 +206,40 @@ def digest(name)
       Digest(name)
     end
 
+    def checksum_for_file(path, digest)
+      return unless path.file?
+      # This must use File.read instead of Digest.file().hexdigest
+      # because we need to preserve \n line endings on windows when calculating
+      # the checksum
+      SharedHelpers.filesystem_access(path, :read) do
+        File.open(path, "rb") do |f|
+          digest = SharedHelpers.digest(digest).new
+          buf = String.new(capacity: 16_384, encoding: Encoding::BINARY)
+          digest << buf while f.read(16_384, buf)
+          digest.hexdigest
+        end
+      end
+    end
+
     def write_to_gemfile(gemfile_path, contents)
       filesystem_access(gemfile_path) {|g| File.open(g, "w") {|file| file.puts contents } }
     end
 
+    def relative_gemfile_path
+      relative_path_to(Bundler.default_gemfile)
+    end
+
+    def relative_lockfile_path
+      relative_path_to(Bundler.default_lockfile)
+    end
+
+    def relative_path_to(destination, from: pwd)
+      Pathname.new(destination).relative_path_from(from).to_s
+    rescue ArgumentError
+      # on Windows, if source and destination are on different drivers, there's no relative path from one to the other
+      destination
+    end
+
     private
 
     def validate_bundle_path
@@ -235,20 +278,12 @@ def find_directory(*names)
 
     def search_up(*names)
       previous = nil
-      current  = File.expand_path(SharedHelpers.pwd).tap {|x| x.untaint if RUBY_VERSION < "2.7" }
+      current  = File.expand_path(SharedHelpers.pwd)
 
       until !File.directory?(current) || current == previous
         if ENV["BUNDLER_SPEC_RUN"]
           # avoid stepping above the tmp directory when testing
-          gemspec = if ENV["GEM_COMMAND"]
-            # for Ruby Core
-            "lib/bundler/bundler.gemspec"
-          else
-            "bundler.gemspec"
-          end
-
-          # avoid stepping above the tmp directory when testing
-          return nil if File.file?(File.join(current, gemspec))
+          return nil if File.directory?(File.join(current, "tmp"))
         end
 
         names.each do |name|
@@ -272,19 +307,42 @@ def set_env(key, value)
     public :set_env
 
     def set_bundle_variables
+      Bundler::SharedHelpers.set_env "BUNDLE_BIN_PATH", bundle_bin_path
+      Bundler::SharedHelpers.set_env "BUNDLE_GEMFILE", find_gemfile.to_s
+      Bundler::SharedHelpers.set_env "BUNDLER_VERSION", Bundler::VERSION
+      Bundler::SharedHelpers.set_env "BUNDLER_SETUP", File.expand_path("setup", __dir__)
+    end
+
+    def bundle_bin_path
       # bundler exe & lib folders have same root folder, typical gem installation
-      exe_file = File.expand_path("../../exe/bundle", __dir__)
+      exe_file = File.join(source_root, "exe/bundle")
 
       # for Ruby core repository testing
-      exe_file = File.expand_path("../../libexec/bundle", __dir__) unless File.exist?(exe_file)
+      exe_file = File.join(source_root, "libexec/bundle") unless File.exist?(exe_file)
 
       # bundler is a default gem, exe path is separate
-      exe_file = Bundler.rubygems.bin_path("bundler", "bundle", VERSION) unless File.exist?(exe_file)
+      exe_file = Gem.bin_path("bundler", "bundle", VERSION) unless File.exist?(exe_file)
 
-      Bundler::SharedHelpers.set_env "BUNDLE_BIN_PATH", exe_file
-      Bundler::SharedHelpers.set_env "BUNDLE_GEMFILE", find_gemfile.to_s
-      Bundler::SharedHelpers.set_env "BUNDLER_VERSION", Bundler::VERSION
-      Bundler::SharedHelpers.set_env "BUNDLER_SETUP", File.expand_path("setup", __dir__) unless RUBY_VERSION < "2.7"
+      exe_file
+    end
+    public :bundle_bin_path
+
+    def gemspec_path
+      # inside a gem repository, typical gem installation
+      gemspec_file = File.join(source_root, "../../specifications/bundler-#{VERSION}.gemspec")
+
+      # for Ruby core repository testing
+      gemspec_file = File.expand_path("bundler.gemspec", __dir__) unless File.exist?(gemspec_file)
+
+      # bundler is a default gem
+      gemspec_file = File.join(Gem.default_specifications_dir, "bundler-#{VERSION}.gemspec") unless File.exist?(gemspec_file)
+
+      gemspec_file
+    end
+    public :gemspec_path
+
+    def source_root
+      File.expand_path("../..", __dir__)
     end
 
     def set_path
@@ -297,7 +355,7 @@ def set_path
     def set_rubyopt
       rubyopt = [ENV["RUBYOPT"]].compact
       setup_require = "-r#{File.expand_path("setup", __dir__)}"
-      return if !rubyopt.empty? && rubyopt.first =~ /#{setup_require}/
+      return if !rubyopt.empty? && rubyopt.first.include?(setup_require)
       rubyopt.unshift setup_require
       Bundler::SharedHelpers.set_env "RUBYOPT", rubyopt.join(" ")
     end
@@ -331,7 +389,6 @@ def resolve_path(path)
     end
 
     def prints_major_deprecations?
-      require_relative "../bundler"
       return false if Bundler.settings[:silence_deprecations]
       require_relative "deprecate"
       return false if Bundler::Deprecate.skip
diff --git a/lib/bundler/source.rb b/lib/bundler/source.rb
index f7f5ea7865dc60..232873503b3933 100644
--- a/lib/bundler/source.rb
+++ b/lib/bundler/source.rb
@@ -11,6 +11,8 @@ class Source
 
     attr_accessor :dependency_names
 
+    attr_reader :checksum_store
+
     def unmet_deps
       specs.unmet_dependency_names
     end
@@ -33,6 +35,8 @@ def can_lock?(spec)
       spec.source == self
     end
 
+    def prefer_local!; end
+
     def local!; end
 
     def local_only!; end
diff --git a/lib/bundler/source/gemspec.rb b/lib/bundler/source/gemspec.rb
index 7e3447e7765402..b59dce1d09055b 100644
--- a/lib/bundler/source/gemspec.rb
+++ b/lib/bundler/source/gemspec.rb
@@ -4,15 +4,12 @@ module Bundler
   class Source
     class Gemspec < Path
       attr_reader :gemspec
+      attr_writer :checksum_store
 
       def initialize(options)
         super
         @gemspec = options["gemspec"]
       end
-
-      def as_path_source
-        Path.new(options)
-      end
     end
   end
 end
diff --git a/lib/bundler/source/git.rb b/lib/bundler/source/git.rb
index adbce5fce4962c..d57944ee1244d9 100644
--- a/lib/bundler/source/git.rb
+++ b/lib/bundler/source/git.rb
@@ -11,6 +11,7 @@ class Git < Path
 
       def initialize(options)
         @options = options
+        @checksum_store = Checksum::Store.new
         @glob = options["glob"] || DEFAULT_GLOB
 
         @allow_cached = false
@@ -19,7 +20,7 @@ def initialize(options)
         # Stringify options that could be set as symbols
         %w[ref branch tag revision].each {|k| options[k] = options[k].to_s if options[k] }
 
-        @uri        = URINormalizer.normalize_suffix(options["uri"] || "", :trailing_slash => false)
+        @uri        = URINormalizer.normalize_suffix(options["uri"] || "", trailing_slash: false)
         @safe_uri   = URICredentialsFilter.credential_filtered_uri(@uri)
         @branch     = options["branch"]
         @ref        = options["ref"] || options["branch"] || options["tag"]
@@ -31,6 +32,20 @@ def initialize(options)
         @local      = false
       end
 
+      def remote!
+        return if @allow_remote
+
+        @local_specs = nil
+        @allow_remote = true
+      end
+
+      def cached!
+        return if @allow_cached
+
+        @local_specs = nil
+        @allow_cached = true
+      end
+
       def self.from_lock(options)
         new(options.merge("uri" => options.delete("remote")))
       end
@@ -55,13 +70,13 @@ def to_gemfile
       end
 
       def hash
-        [self.class, uri, ref, branch, name, version, glob, submodules].hash
+        [self.class, uri, ref, branch, name, glob, submodules].hash
       end
 
       def eql?(other)
         other.is_a?(Git) && uri == other.uri && ref == other.ref &&
           branch == other.branch && name == other.name &&
-          version == other.version && glob == other.glob &&
+          glob == other.glob &&
           submodules == other.submodules
       end
 
@@ -87,7 +102,7 @@ def to_s
       end
 
       def identifier
-        uri_with_specifiers([humanized_ref, cached_revision, glob_for_display])
+        uri_with_specifiers([humanized_ref, locked_revision, glob_for_display])
       end
 
       def uri_with_specifiers(specifiers)
@@ -149,7 +164,8 @@ def local_override!(path)
             "does not exist. Run `bundle config unset local.#{override_for(original_path)}` to remove the local override"
         end
 
-        set_local!(path)
+        @local = true
+        set_paths!(path)
 
         # Create a new git proxy without the cached revision
         # so the Gemfile.lock always picks up the new revision.
@@ -160,10 +176,10 @@ def local_override!(path)
             "#{current_branch} but Gemfile specifies #{branch}"
         end
 
-        changed = cached_revision && cached_revision != revision
+        changed = locked_revision && locked_revision != revision
 
-        if !Bundler.settings[:disable_local_revision_check] && changed && !@unlocked && !git_proxy.contains?(cached_revision)
-          raise GitError, "The Gemfile lock is pointing to revision #{shortref_for_display(cached_revision)} " \
+        if !Bundler.settings[:disable_local_revision_check] && changed && !@unlocked && !git_proxy.contains?(locked_revision)
+          raise GitError, "The Gemfile lock is pointing to revision #{shortref_for_display(locked_revision)} " \
             "but the current branch in your local override for #{name} does not contain such commit. " \
             "Please make sure your branch is up to date."
         end
@@ -172,13 +188,11 @@ def local_override!(path)
       end
 
       def specs(*)
-        set_local!(app_cache_path) if has_app_cache? && !local?
+        set_cache_path!(app_cache_path) if use_app_cache?
 
         if requires_checkout? && !@copied
-          fetch
-          git_proxy.copy_to(install_path, submodules)
-          serialize_gemspecs_in(install_path)
-          @copied = true
+          fetch unless use_app_cache?
+          checkout
         end
 
         local_specs
@@ -191,27 +205,25 @@ def install(spec, options = {})
         print_using_message "Using #{version_message(spec, options[:previous_spec])} from #{self}"
 
         if (requires_checkout? && !@copied) || force
-          Bundler.ui.debug "  * Checking out revision: #{ref}"
-          git_proxy.copy_to(install_path, submodules)
-          serialize_gemspecs_in(install_path)
-          @copied = true
+          checkout
         end
 
-        generate_bin_options = { :disable_extensions => !Bundler.rubygems.spec_missing_extensions?(spec), :build_args => options[:build_args] }
+        generate_bin_options = { disable_extensions: !spec.missing_extensions?, build_args: options[:build_args] }
         generate_bin(spec, generate_bin_options)
 
         requires_checkout? ? spec.post_install_message : nil
       end
 
+      def migrate_cache(custom_path = nil, local: false)
+        if local
+          cache_to(custom_path, try_migrate: false)
+        else
+          cache_to(custom_path, try_migrate: true)
+        end
+      end
+
       def cache(spec, custom_path = nil)
-        app_cache_path = app_cache_path(custom_path)
-        return unless Bundler.feature_flag.cache_all?
-        return if path == app_cache_path
-        cached!
-        FileUtils.rm_rf(app_cache_path)
-        git_proxy.checkout if requires_checkout?
-        git_proxy.copy_to(app_cache_path, @submodules)
-        serialize_gemspecs_in(app_cache_path)
+        cache_to(custom_path, try_migrate: false)
       end
 
       def load_spec_files
@@ -234,7 +246,7 @@ def cache_path
       end
 
       def app_cache_dirname
-        "#{base_name}-#{shortref_for_path(cached_revision || revision)}"
+        "#{base_name}-#{shortref_for_path(locked_revision || revision)}"
       end
 
       def revision
@@ -255,6 +267,43 @@ def local?
 
       private
 
+      def cache_to(custom_path, try_migrate: false)
+        return unless Bundler.feature_flag.cache_all?
+
+        app_cache_path = app_cache_path(custom_path)
+
+        migrate = try_migrate ? bare_repo?(app_cache_path) : false
+
+        set_cache_path!(nil) if migrate
+
+        return if cache_path == app_cache_path
+
+        cached!
+        FileUtils.rm_rf(app_cache_path)
+        git_proxy.checkout if migrate || requires_checkout?
+        git_proxy.copy_to(app_cache_path, @submodules)
+        serialize_gemspecs_in(app_cache_path)
+      end
+
+      def checkout
+        Bundler.ui.debug "  * Checking out revision: #{ref}"
+        if use_app_cache? && !bare_repo?(app_cache_path)
+          SharedHelpers.filesystem_access(install_path.dirname) do |p|
+            FileUtils.mkdir_p(p)
+          end
+          FileUtils.cp_r("#{app_cache_path}/.", install_path)
+        else
+          if use_app_cache? && bare_repo?(app_cache_path)
+            Bundler.ui.warn "Installing from cache in old \"bare repository\" format for compatibility. " \
+                            "Please run `bundle cache` and commit the updated cache to migrate to the new format and get rid of this warning."
+          end
+
+          git_proxy.copy_to(install_path, submodules)
+        end
+        serialize_gemspecs_in(install_path)
+        @copied = true
+      end
+
       def humanized_ref
         if local?
           path
@@ -277,28 +326,45 @@ def serialize_gemspecs_in(destination)
           # The gemspecs we cache should already be evaluated.
           spec = Bundler.load_gemspec(spec_path)
           next unless spec
-          Bundler.rubygems.set_installed_by_version(spec)
+          spec.installed_by_version = Gem::VERSION
           Bundler.rubygems.validate(spec)
           File.open(spec_path, "wb") {|file| file.write(spec.to_ruby) }
         end
       end
 
-      def set_local!(path)
-        @local       = true
-        @local_specs = @git_proxy = nil
-        @cache_path  = @install_path = path
+      def set_paths!(path)
+        set_cache_path!(path)
+        set_install_path!(path)
+      end
+
+      def set_cache_path!(path)
+        @git_proxy = nil
+        @cache_path = path
+      end
+
+      def set_install_path!(path)
+        @local_specs = nil
+        @install_path = path
       end
 
       def has_app_cache?
-        cached_revision && super
+        locked_revision && super
+      end
+
+      def use_app_cache?
+        has_app_cache? && !local?
       end
 
       def requires_checkout?
-        allow_git_ops? && !local? && !cached_revision_checked_out?
+        allow_git_ops? && !local? && !locked_revision_checked_out?
+      end
+
+      def locked_revision_checked_out?
+        locked_revision && locked_revision == revision && installed?
       end
 
-      def cached_revision_checked_out?
-        cached_revision && cached_revision == revision && install_path.exist?
+      def installed?
+        git_proxy.installed_to?(install_path)
       end
 
       def base_name
@@ -325,7 +391,7 @@ def uri_hash
         if %r{^\w+://(\w+@)?}.match?(uri)
           # Downcase the domain component of the URI
           # and strip off a trailing slash, if one is present
-          input = Bundler::URI.parse(uri).normalize.to_s.sub(%r{/$}, "")
+          input = Gem::URI.parse(uri).normalize.to_s.sub(%r{/$}, "")
         else
           # If there is no URI scheme, assume it is an ssh/git URI
           input = uri
@@ -335,7 +401,7 @@ def uri_hash
         Bundler::Digest.sha1(input)
       end
 
-      def cached_revision
+      def locked_revision
         options["revision"]
       end
 
@@ -344,7 +410,7 @@ def cached?
       end
 
       def git_proxy
-        @git_proxy ||= GitProxy.new(cache_path, uri, options, cached_revision, self)
+        @git_proxy ||= GitProxy.new(cache_path, uri, options, locked_revision, self)
       end
 
       def fetch
@@ -358,9 +424,12 @@ def fetch
       def validate_spec(_spec); end
 
       def load_gemspec(file)
-        stub = Gem::StubSpecification.gemspec_stub(file, install_path.parent, install_path.parent)
-        stub.full_gem_path = Pathname.new(file).dirname.expand_path(root).to_s.tap {|x| x.untaint if RUBY_VERSION < "2.7" }
-        StubSpecification.from_stub(stub)
+        dirname = Pathname.new(file).dirname
+        SharedHelpers.chdir(dirname.to_s) do
+          stub = Gem::StubSpecification.gemspec_stub(file, install_path.parent, install_path.parent)
+          stub.full_gem_path = dirname.expand_path(root).to_s
+          StubSpecification.from_stub(stub)
+        end
       end
 
       def git_scope
@@ -374,6 +443,10 @@ def extension_cache_slug(_)
       def override_for(path)
         Bundler.settings.local_overrides.key(path)
       end
+
+      def bare_repo?(path)
+        File.exist?(path.join("objects")) && File.exist?(path.join("HEAD"))
+      end
     end
   end
 end
diff --git a/lib/bundler/source/git/git_proxy.rb b/lib/bundler/source/git/git_proxy.rb
index 53a9a78ddf3a87..f613377cb20213 100644
--- a/lib/bundler/source/git/git_proxy.rb
+++ b/lib/bundler/source/git/git_proxy.rb
@@ -43,6 +43,13 @@ def initialize(command, destination_path, ref, repo)
         end
       end
 
+      class AmbiguousGitReference < GitError
+        def initialize(options)
+          msg = "Specification of branch or ref with tag is ambiguous. You specified #{options.inspect}"
+          super msg
+        end
+      end
+
       # The GitProxy is responsible to interact with git repositories.
       # All actions required by the Git source is encapsulated in this
       # object.
@@ -53,10 +60,15 @@ class GitProxy
         def initialize(path, uri, options = {}, revision = nil, git = nil)
           @path     = path
           @uri      = uri
-          @branch   = options["branch"]
           @tag      = options["tag"]
+          @branch   = options["branch"]
           @ref      = options["ref"]
-          @explicit_ref = branch || tag || ref
+          if @tag
+            raise AmbiguousGitReference.new(options) if @branch || @ref
+            @explicit_ref = @tag
+          else
+            @explicit_ref = @ref || @branch
+          end
           @revision = revision
           @git      = git
           @commit_ref = nil
@@ -68,14 +80,14 @@ def revision
 
         def current_branch
           @current_branch ||= with_path do
-            git_local("rev-parse", "--abbrev-ref", "HEAD", :dir => path).strip
+            git_local("rev-parse", "--abbrev-ref", "HEAD", dir: path).strip
           end
         end
 
         def contains?(commit)
           allowed_with_path do
-            result, status = git_null("branch", "--contains", commit, :dir => path)
-            status.success? && result =~ /^\* (.*)$/
+            result, status = git_null("branch", "--contains", commit, dir: path)
+            status.success? && result.match?(/^\* (.*)$/)
           end
         end
 
@@ -118,18 +130,29 @@ def copy_to(destination, submodules = false)
             end
           end
 
-          git "fetch", "--force", "--quiet", *extra_fetch_args, :dir => destination if @commit_ref
+          ref = @commit_ref || (locked_to_full_sha? && @revision)
+          if ref
+            git "config", "uploadpack.allowAnySHA1InWant", "true", dir: path.to_s if @commit_ref.nil? && needs_allow_any_sha1_in_want?
 
-          git "reset", "--hard", @revision, :dir => destination
+            git "fetch", "--force", "--quiet", *extra_fetch_args(ref), dir: destination
+          end
+
+          git "reset", "--hard", @revision, dir: destination
 
           if submodules
-            git_retry "submodule", "update", "--init", "--recursive", :dir => destination
+            git_retry "submodule", "update", "--init", "--recursive", dir: destination
           elsif Gem::Version.create(version) >= Gem::Version.create("2.9.0")
             inner_command = "git -C $toplevel submodule deinit --force $sm_path"
-            git_retry "submodule", "foreach", "--quiet", inner_command, :dir => destination
+            git_retry "submodule", "foreach", "--quiet", inner_command, dir: destination
           end
         end
 
+        def installed_to?(destination)
+          # if copy_to is interrupted, it may leave a partially installed directory that
+          # contains .git but no other files -- consider this not to be installed
+          Dir.exist?(destination) && (Dir.children(destination) - [".git"]).any?
+        end
+
         private
 
         def git_remote_fetch(args)
@@ -162,9 +185,18 @@ def clone_needs_extra_fetch?
             _, err, status = capture(command, nil)
             return extra_ref if status.success?
 
-            if err.include?("Could not find remote branch")
+            if err.include?("Could not find remote branch") || # git up to 2.49
+               err.include?("Remote branch #{branch_option} not found") # git 2.49 or higher
               raise MissingGitRevisionError.new(command_with_no_credentials, nil, explicit_ref, credential_filtered_uri)
             else
+              idx = command.index("--depth")
+              if idx
+                command.delete_at(idx)
+                command.delete_at(idx)
+                command_with_no_credentials = check_allowed(command)
+
+                err += "Retrying without --depth argument."
+              end
               raise GitCommandError.new(command_with_no_credentials, path, err)
             end
           end
@@ -231,42 +263,50 @@ def fully_qualified_ref
         end
 
         def not_pinned?
-          branch || tag || ref.nil?
+          branch_option || ref.nil?
         end
 
         def pinned_to_full_sha?
-          ref =~ /\A\h{40}\z/
+          full_sha_revision?(ref)
+        end
+
+        def locked_to_full_sha?
+          full_sha_revision?(@revision)
+        end
+
+        def full_sha_revision?(ref)
+          ref&.match?(/\A\h{40}\z/)
         end
 
         def git_null(*command, dir: nil)
           check_allowed(command)
 
-          capture(command, dir, :ignore_err => true)
+          capture(command, dir, ignore_err: true)
         end
 
         def git_retry(*command, dir: nil)
           command_with_no_credentials = check_allowed(command)
 
           Bundler::Retry.new("`#{command_with_no_credentials}` at #{dir || SharedHelpers.pwd}").attempts do
-            git(*command, :dir => dir)
+            git(*command, dir: dir)
           end
         end
 
         def git(*command, dir: nil)
-          run_command(*command, :dir => dir) do |unredacted_command|
+          run_command(*command, dir: dir) do |unredacted_command|
             check_allowed(unredacted_command)
           end
         end
 
         def git_local(*command, dir: nil)
-          run_command(*command, :dir => dir) do |unredacted_command|
+          run_command(*command, dir: dir) do |unredacted_command|
             redact_and_check_presence(unredacted_command)
           end
         end
 
         def has_revision_cached?
-          return unless @revision && path.exist?
-          git("cat-file", "-e", @revision, :dir => path)
+          return unless commit && path.exist?
+          git("cat-file", "-e", commit, dir: path)
           true
         rescue GitError
           false
@@ -289,18 +329,16 @@ def find_revision_for(reference)
         end
 
         def verify(reference)
-          git("rev-parse", "--verify", reference, :dir => path).strip
+          git("rev-parse", "--verify", reference, dir: path).strip
         end
 
         # Adds credentials to the URI
         def configured_uri
           if /https?:/.match?(uri)
-            remote = Bundler::URI(uri)
+            remote = Gem::URI(uri)
             config_auth = Bundler.settings[remote.to_s] || Bundler.settings[remote.host]
             remote.userinfo ||= config_auth
             remote.to_s
-          elsif File.exist?(uri)
-            "file://#{uri}"
           else
             uri.to_s
           end
@@ -370,10 +408,10 @@ def capture(cmd, dir, ignore_err: false)
         def capture3_args_for(cmd, dir)
           return ["git", *cmd] unless dir
 
-          if Bundler.feature_flag.bundler_3_mode? || supports_minus_c?
+          if Bundler.feature_flag.bundler_4_mode? || supports_minus_c?
             ["git", "-C", dir.to_s, *cmd]
           else
-            ["git", *cmd, { :chdir => dir.to_s }]
+            ["git", *cmd, { chdir: dir.to_s }]
           end
         end
 
@@ -389,7 +427,7 @@ def extra_clone_args
           # anyways.
           return args if @revision
 
-          args += ["--branch", branch || tag] if branch || tag
+          args += ["--branch", branch_option] if branch_option
           args
         end
 
@@ -399,12 +437,16 @@ def depth_args
           ["--depth", depth.to_s]
         end
 
-        def extra_fetch_args
+        def extra_fetch_args(ref)
           extra_args = [path.to_s, *depth_args]
-          extra_args.push(@commit_ref)
+          extra_args.push(ref)
           extra_args
         end
 
+        def branch_option
+          branch || tag
+        end
+
         def full_clone?
           depth.nil?
         end
@@ -413,6 +455,10 @@ def supports_minus_c?
           @supports_minus_c ||= Gem::Version.new(version) >= Gem::Version.new("1.8.5")
         end
 
+        def needs_allow_any_sha1_in_want?
+          @needs_allow_any_sha1_in_want ||= Gem::Version.new(version) <= Gem::Version.new("2.13.7")
+        end
+
         def supports_fetching_unreachable_refs?
           @supports_fetching_unreachable_refs ||= Gem::Version.new(version) >= Gem::Version.new("2.5.0")
         end
diff --git a/lib/bundler/source/metadata.rb b/lib/bundler/source/metadata.rb
index 524db9c204ae2d..fd959cd64ee245 100644
--- a/lib/bundler/source/metadata.rb
+++ b/lib/bundler/source/metadata.rb
@@ -5,12 +5,14 @@ class Source
     class Metadata < Source
       def specs
         @specs ||= Index.build do |idx|
-          idx << Gem::Specification.new("Ruby\0", Gem.ruby_version)
+          idx << Gem::Specification.new("Ruby\0", Bundler::RubyVersion.system.gem_version)
           idx << Gem::Specification.new("RubyGems\0", Gem::VERSION) do |s|
             s.required_rubygems_version = Gem::Requirement.default
           end
 
           if local_spec = Gem.loaded_specs["bundler"]
+            raise CorruptBundlerInstallError.new(local_spec) if local_spec.version.to_s != Bundler::VERSION
+
             idx << local_spec
           else
             idx << Gem::Specification.new do |s|
@@ -22,9 +24,8 @@ def specs
               s.bindir   = "exe"
               s.homepage = "https://bundler.io"
               s.summary  = "The best way to manage your application's dependencies"
-              s.executables = %w[bundle]
-              # can't point to the actual gemspec or else the require paths will be wrong
-              s.loaded_from = __dir__
+              s.executables = %w[bundle bundler]
+              s.loaded_from = SharedHelpers.gemspec_path
             end
           end
 
diff --git a/lib/bundler/source/path.rb b/lib/bundler/source/path.rb
index bdfcf8274af9db..ac76ae1fa0e44c 100644
--- a/lib/bundler/source/path.rb
+++ b/lib/bundler/source/path.rb
@@ -14,12 +14,10 @@ class Path < Source
       DEFAULT_GLOB = "{,*,*/*}.gemspec"
 
       def initialize(options)
+        @checksum_store = Checksum::Store.new
         @options = options.dup
         @glob = options["glob"] || DEFAULT_GLOB
 
-        @allow_cached = false
-        @allow_remote = false
-
         @root_path = options["root_path"] || root
 
         if options["path"]
@@ -40,16 +38,6 @@ def initialize(options)
         @original_path = @path
       end
 
-      def remote!
-        @local_specs = nil
-        @allow_remote = true
-      end
-
-      def cached!
-        @local_specs = nil
-        @allow_cached = true
-      end
-
       def self.from_lock(options)
         new(options.merge("path" => options.delete("remote")))
       end
@@ -65,13 +53,15 @@ def to_s
         "source at `#{@path}`"
       end
 
+      alias_method :to_gemfile, :path
+
       def hash
         [self.class, expanded_path, version].hash
       end
 
       def eql?(other)
-        return unless other.class == self.class
-        expanded_original_path == other.expanded_original_path &&
+        [Gemspec, Path].include?(other.class) &&
+          expanded_original_path == other.expanded_original_path &&
           version == other.version
       end
 
@@ -85,7 +75,7 @@ def install(spec, options = {})
         using_message = "Using #{version_message(spec, options[:previous_spec])} from #{self}"
         using_message += " and installing its executables" unless spec.executables.empty?
         print_using_message using_message
-        generate_bin(spec, :disable_extensions => true)
+        generate_bin(spec, disable_extensions: true)
         nil # no post-install message
       end
 
@@ -160,7 +150,7 @@ def has_app_cache?
 
       def load_gemspec(file)
         return unless spec = Bundler.load_gemspec(file)
-        Bundler.rubygems.set_installed_by_version(spec)
+        spec.installed_by_version = Gem::VERSION
         spec
       end
 
@@ -177,6 +167,13 @@ def load_spec_files
             next unless spec = load_gemspec(file)
             spec.source = self
 
+            # The ignore attribute is for ignoring installed gems that don't
+            # have extensions correctly compiled for activation. In the case of
+            # path sources, there's a single version of each gem in the path
+            # source available to Bundler, so we always certainly want to
+            # consider that for activation and never makes sense to ignore it.
+            spec.ignored = false
+
             # Validation causes extension_dir to be calculated, which depends
             # on #source, so we validate here instead of load_gemspec
             validate_spec(spec)
@@ -224,22 +221,22 @@ def generate_bin(spec, options = {})
 
         # Some gem authors put absolute paths in their gemspec
         # and we have to save them from themselves
-        spec.files = spec.files.map do |path|
-          next path unless /\A#{Pathname::SEPARATOR_PAT}/.match?(path)
+        spec.files = spec.files.filter_map do |path|
+          next path unless /\A#{Pathname::SEPARATOR_PAT}/o.match?(path)
           next if File.directory?(path)
           begin
             Pathname.new(path).relative_path_from(gem_dir).to_s
           rescue ArgumentError
             path
           end
-        end.compact
+        end
 
         installer = Path::Installer.new(
           spec,
-          :env_shebang => false,
-          :disable_extensions => options[:disable_extensions],
-          :build_args => options[:build_args],
-          :bundler_extension_cache_path => extension_cache_path(spec)
+          env_shebang: false,
+          disable_extensions: options[:disable_extensions],
+          build_args: options[:build_args],
+          bundler_extension_cache_path: extension_cache_path(spec)
         )
         installer.post_install
       rescue Gem::InvalidSpecificationException => e
diff --git a/lib/bundler/source/rubygems.rb b/lib/bundler/source/rubygems.rb
index 7cd24092c93112..19800e9c585cd5 100644
--- a/lib/bundler/source/rubygems.rb
+++ b/lib/bundler/source/rubygems.rb
@@ -10,7 +10,7 @@ class Rubygems < Source
       # Ask for X gems per API request
       API_REQUEST_SIZE = 50
 
-      attr_reader :remotes
+      attr_accessor :remotes
 
       def initialize(options = {})
         @options = options
@@ -19,14 +19,22 @@ def initialize(options = {})
         @allow_remote = false
         @allow_cached = false
         @allow_local = options["allow_local"] || false
+        @prefer_local = false
+        @checksum_store = Checksum::Store.new
 
         Array(options["remotes"]).reverse_each {|r| add_remote(r) }
+
+        @lockfile_remotes = @remotes if options["from_lockfile"]
       end
 
       def caches
         @caches ||= [cache_path, *Bundler.rubygems.gem_cache]
       end
 
+      def prefer_local!
+        @prefer_local = true
+      end
+
       def local_only!
         @specs = nil
         @allow_local = true
@@ -34,6 +42,10 @@ def local_only!
         @allow_remote = false
       end
 
+      def local_only?
+        @allow_local && !@allow_remote
+      end
+
       def local!
         return if @allow_local
 
@@ -49,10 +61,11 @@ def remote!
       end
 
       def cached!
+        return unless File.exist?(cache_path)
+
         return if @allow_cached
 
         @specs = nil
-        @allow_local = true
         @allow_cached = true
       end
 
@@ -88,13 +101,14 @@ def options
       end
 
       def self.from_lock(options)
-        new(options)
+        options["remotes"] = Array(options.delete("remote")).reverse
+        new(options.merge("from_lockfile" => true))
       end
 
       def to_lock
         out = String.new("GEM\n")
-        remotes.reverse_each do |remote|
-          out << "  remote: #{suppress_configured_credentials remote}\n"
+        lockfile_remotes.reverse_each do |remote|
+          out << "  remote: #{remote}\n"
         end
         out << "  specs:\n"
       end
@@ -128,25 +142,28 @@ def identifier
       def specs
         @specs ||= begin
           # remote_specs usually generates a way larger Index than the other
-          # sources, and large_idx.use small_idx is way faster than
-          # small_idx.use large_idx.
-          idx = @allow_remote ? remote_specs.dup : Index.new
-          idx.use(cached_specs, :override_dupes) if @allow_cached || @allow_remote
-          idx.use(installed_specs, :override_dupes) if @allow_local
-          idx
+          # sources, and large_idx.merge! small_idx is way faster than
+          # small_idx.merge! large_idx.
+          index = @allow_remote ? remote_specs.dup : Index.new
+          index.merge!(cached_specs) if @allow_cached
+          index.merge!(installed_specs) if @allow_local
+
+          if @allow_local
+            if @prefer_local
+              index.merge!(default_specs)
+            else
+              # complete with default specs, only if not already available in the
+              # index through remote, cached, or installed specs
+              index.use(default_specs)
+            end
+          end
+
+          index
         end
       end
 
       def install(spec, options = {})
-        force = options[:force]
-        ensure_builtin_gems_cached = options[:ensure_builtin_gems_cached]
-
-        if ensure_builtin_gems_cached && spec.default_gem? && !cached_path(spec)
-          cached_built_in_gem(spec) unless spec.remote
-          force = true
-        end
-
-        if installed?(spec) && !force
+        if (spec.default_gem? && !cached_built_in_gem(spec, local: options[:local])) || (installed?(spec) && !options[:force])
           print_using_message "Using #{version_message(spec, options[:previous_spec])}"
           return nil # no post-install message
         end
@@ -169,15 +186,14 @@ def install(spec, options = {})
 
         installer = Bundler::RubyGemsGemInstaller.at(
           path,
-          :security_policy => Bundler.rubygems.security_policies[Bundler.settings["trust-policy"]],
-          :install_dir => install_path.to_s,
-          :bin_dir => bin_path.to_s,
-          :ignore_dependencies => true,
-          :wrappers => true,
-          :env_shebang => true,
-          :build_args => options[:build_args],
-          :bundler_expected_checksum => spec.respond_to?(:checksum) && spec.checksum,
-          :bundler_extension_cache_path => extension_cache_path(spec)
+          security_policy: Bundler.rubygems.security_policies[Bundler.settings["trust-policy"]],
+          install_dir: install_path.to_s,
+          bin_dir: bin_path.to_s,
+          ignore_dependencies: true,
+          wrappers: true,
+          env_shebang: true,
+          build_args: options[:build_args],
+          bundler_extension_cache_path: extension_cache_path(spec)
         )
 
         if spec.remote
@@ -195,6 +211,8 @@ def install(spec, options = {})
           spec.__swap__(s)
         end
 
+        spec.source.checksum_store.register(spec, installer.gem_checksum)
+
         message = "Installing #{version_message(spec, options[:previous_spec])}"
         message += " with native extensions" if spec.extensions.any?
         Bundler.ui.confirm message
@@ -203,6 +221,7 @@ def install(spec, options = {})
 
         spec.full_gem_path = installed_spec.full_gem_path
         spec.loaded_from = installed_spec.loaded_from
+        spec.base_dir = installed_spec.base_dir
 
         spec.post_install_message
       end
@@ -218,12 +237,13 @@ def cache(spec, custom_path = nil)
         raise InstallError, e.message
       end
 
-      def cached_built_in_gem(spec)
-        cached_path = cached_path(spec)
-        if cached_path.nil?
+      def cached_built_in_gem(spec, local: false)
+        cached_path = cached_gem(spec)
+        if cached_path.nil? && !local
           remote_spec = remote_specs.search(spec).first
           if remote_spec
             cached_path = fetch_gem(remote_spec)
+            spec.remote = remote_spec.remote
           else
             Bundler.ui.warn "#{spec.full_name} is built in to Ruby, and can't be cached because your Gemfile doesn't have any sources that contain it."
           end
@@ -252,11 +272,15 @@ def unmet_deps
         end
       end
 
-      def fetchers
-        @fetchers ||= remotes.map do |uri|
+      def remote_fetchers
+        @remote_fetchers ||= remotes.to_h do |uri|
           remote = Source::Rubygems::Remote.new(uri)
-          Bundler::Fetcher.new(remote)
-        end
+          [remote, Bundler::Fetcher.new(remote)]
+        end.freeze
+      end
+
+      def fetchers
+        @fetchers ||= remote_fetchers.values.freeze
       end
 
       def double_check_for(unmet_dependency_names)
@@ -274,9 +298,9 @@ def double_check_for(unmet_dependency_names)
 
         Bundler.ui.debug "Double checking for #{unmet_dependency_names || "all specs (due to the size of the request)"} in #{self}"
 
-        fetch_names(api_fetchers, unmet_dependency_names, remote_specs, false)
+        fetch_names(api_fetchers, unmet_dependency_names, remote_specs)
 
-        specs.use(remote_specs, false)
+        specs.use remote_specs
       end
 
       def dependency_names_to_double_check
@@ -305,11 +329,7 @@ def remote_names
       end
 
       def credless_remotes
-        if Bundler.settings[:allow_deployment_source_credential_changes]
-          remotes.map(&method(:remove_auth))
-        else
-          remotes.map(&method(:suppress_configured_credentials))
-        end
+        remotes.map(&method(:remove_auth))
       end
 
       def remotes_for_spec(spec)
@@ -320,14 +340,6 @@ def remotes_for_spec(spec)
       end
 
       def cached_gem(spec)
-        if spec.default_gem?
-          cached_built_in_gem(spec)
-        else
-          cached_path(spec)
-        end
-      end
-
-      def cached_path(spec)
         global_cache_path = download_cache_path(spec)
         caches << global_cache_path if global_cache_path
 
@@ -342,21 +354,12 @@ def package_path(cache_path, spec)
       def normalize_uri(uri)
         uri = URINormalizer.normalize_suffix(uri.to_s)
         require_relative "../vendored_uri"
-        uri = Bundler::URI(uri)
+        uri = Gem::URI(uri)
         raise ArgumentError, "The source must be an absolute URI. For example:\n" \
-          "source 'https://rubygems.org'" if !uri.absolute? || (uri.is_a?(Bundler::URI::HTTP) && uri.host.nil?)
+          "source 'https://rubygems.org'" if !uri.absolute? || (uri.is_a?(Gem::URI::HTTP) && uri.host.nil?)
         uri
       end
 
-      def suppress_configured_credentials(remote)
-        remote_nouser = remove_auth(remote)
-        if remote.userinfo && remote.userinfo == Bundler.settings[remote_nouser]
-          remote_nouser
-        else
-          remote
-        end
-      end
-
       def remove_auth(remote)
         if remote.user || remote.password
           remote.dup.tap {|uri| uri.user = uri.password = nil }.to_s
@@ -367,12 +370,18 @@ def remove_auth(remote)
 
       def installed_specs
         @installed_specs ||= Index.build do |idx|
-          Bundler.rubygems.all_specs.reverse_each do |spec|
+          Bundler.rubygems.installed_specs.reverse_each do |spec|
+            spec.source = self
+            next if spec.ignored?
+            idx << spec
+          end
+        end
+      end
+
+      def default_specs
+        @default_specs ||= Index.build do |idx|
+          Bundler.rubygems.default_specs.each do |spec|
             spec.source = self
-            if Bundler.rubygems.spec_missing_extensions?(spec, false)
-              Bundler.ui.debug "Source #{self} is ignoring #{spec} because it is missing extensions"
-              next
-            end
             idx << spec
           end
         end
@@ -380,7 +389,7 @@ def installed_specs
 
       def cached_specs
         @cached_specs ||= begin
-          idx = @allow_local ? installed_specs.dup : Index.new
+          idx = Index.new
 
           Dir["#{cache_path}/*.gem"].each do |gemfile|
             s ||= Bundler.rubygems.spec_from_gem(gemfile)
@@ -401,22 +410,22 @@ def remote_specs
           index_fetchers = fetchers - api_fetchers
 
           if index_fetchers.empty?
-            fetch_names(api_fetchers, dependency_names, idx, false)
+            fetch_names(api_fetchers, dependency_names, idx)
           else
-            fetch_names(fetchers, nil, idx, false)
+            fetch_names(fetchers, nil, idx)
           end
         end
       end
 
-      def fetch_names(fetchers, dependency_names, index, override_dupes)
+      def fetch_names(fetchers, dependency_names, index)
         fetchers.each do |f|
           if dependency_names
             Bundler.ui.info "Fetching gem metadata from #{URICredentialsFilter.credential_filtered_uri(f.uri)}", Bundler.ui.debug?
-            index.use f.specs_with_retry(dependency_names, self), override_dupes
+            index.use f.specs_with_retry(dependency_names, self)
             Bundler.ui.info "" unless Bundler.ui.debug? # new line now that the dots are over
           else
             Bundler.ui.info "Fetching source index from #{URICredentialsFilter.credential_filtered_uri(f.uri)}"
-            index.use f.specs_with_retry(nil, self), override_dupes
+            index.use f.specs_with_retry(nil, self)
           end
         end
       end
@@ -445,7 +454,7 @@ def fetch_gem(spec, previous_spec = nil)
       end
 
       def installed?(spec)
-        installed_specs[spec].any? && !spec.deleted_gem?
+        installed_specs[spec].any? && !spec.installation_missing?
       end
 
       def rubygems_dir
@@ -462,6 +471,10 @@ def cache_path
 
       private
 
+      def lockfile_remotes
+        @lockfile_remotes || credless_remotes
+      end
+
       # Checks if the requested spec exists in the global cache. If it does,
       # we copy it to the download path, and if it does not, we download it.
       #
@@ -477,7 +490,8 @@ def cache_path
       def download_gem(spec, download_cache_path, previous_spec = nil)
         uri = spec.remote.uri
         Bundler.ui.confirm("Fetching #{version_message(spec, previous_spec)}")
-        Bundler.rubygems.download_gem(spec, uri, download_cache_path)
+        gem_remote_fetcher = remote_fetchers.fetch(spec.remote).gem_remote_fetcher
+        Bundler.rubygems.download_gem(spec, uri, download_cache_path, gem_remote_fetcher)
       end
 
       # Returns the global cache path of the calling Rubygems::Source object.
diff --git a/lib/bundler/source/rubygems/remote.rb b/lib/bundler/source/rubygems/remote.rb
index 82c850ffbb2197..ed55912a9952be 100644
--- a/lib/bundler/source/rubygems/remote.rb
+++ b/lib/bundler/source/rubygems/remote.rb
@@ -16,6 +16,9 @@ def initialize(uri)
           @anonymized_uri = remove_auth(@uri).freeze
         end
 
+        MAX_CACHE_SLUG_HOST_SIZE = 255 - 1 - 32 # 255 minus dot minus MD5 length
+        private_constant :MAX_CACHE_SLUG_HOST_SIZE
+
         # @return [String] A slug suitable for use as a cache key for this
         #         remote.
         #
@@ -28,10 +31,15 @@ def cache_slug
             host = cache_uri.to_s.start_with?("file://") ? nil : cache_uri.host
 
             uri_parts = [host, cache_uri.user, cache_uri.port, cache_uri.path]
-            uri_digest = SharedHelpers.digest(:MD5).hexdigest(uri_parts.compact.join("."))
+            uri_parts.compact!
+            uri_digest = SharedHelpers.digest(:MD5).hexdigest(uri_parts.join("."))
+
+            uri_parts.pop
+            host_parts = uri_parts.join(".")
+            return uri_digest if host_parts.empty?
 
-            uri_parts[-1] = uri_digest
-            uri_parts.compact.join(".")
+            shortened_host_parts = host_parts[0...MAX_CACHE_SLUG_HOST_SIZE]
+            [shortened_host_parts, uri_digest].join(".")
           end
         end
 
@@ -48,7 +56,7 @@ def apply_auth(uri, auth)
           end
 
           uri
-        rescue Bundler::URI::InvalidComponentError
+        rescue Gem::URI::InvalidComponentError
           error_message = "Please CGI escape your usernames and passwords before " \
                           "setting them for authentication."
           raise HTTPError.new(error_message)
diff --git a/lib/bundler/source_list.rb b/lib/bundler/source_list.rb
index 4419695b7ff1ab..2f16281045a5e8 100644
--- a/lib/bundler/source_list.rb
+++ b/lib/bundler/source_list.rb
@@ -22,6 +22,7 @@ def initialize
       @metadata_source        = Source::Metadata.new
 
       @merged_gem_lockfile_sections = false
+      @local_mode = true
     end
 
     def merged_gem_lockfile_sections?
@@ -73,6 +74,10 @@ def add_global_rubygems_remote(uri)
       global_rubygems_source
     end
 
+    def local_mode?
+      @local_mode
+    end
+
     def default_source
       global_path_source || global_rubygems_source
     end
@@ -86,7 +91,7 @@ def non_global_rubygems_sources
     end
 
     def rubygems_remotes
-      rubygems_sources.map(&:remotes).flatten.uniq
+      rubygems_sources.flat_map(&:remotes).uniq
     end
 
     def all_sources
@@ -98,7 +103,7 @@ def non_default_explicit_sources
     end
 
     def get(source)
-      source_list_for(source).find {|s| equivalent_source?(source, s) }
+      source_list_for(source).find {|s| s.include?(source) }
     end
 
     def lock_sources
@@ -136,15 +141,25 @@ def expired_sources?(replacement_sources)
       different_sources?(lock_sources, replacement_sources)
     end
 
+    def prefer_local!
+      all_sources.each(&:prefer_local!)
+    end
+
     def local_only!
       all_sources.each(&:local_only!)
     end
 
+    def local!
+      all_sources.each(&:local!)
+    end
+
     def cached!
       all_sources.each(&:cached!)
     end
 
     def remote!
+      @local_mode = false
+
       all_sources.each(&:remote!)
     end
 
@@ -157,27 +172,58 @@ def dup_with_replaced_sources(replacement_sources)
     end
 
     def map_sources(replacement_sources)
-      rubygems, git, plugin = [@rubygems_sources, @git_sources, @plugin_sources].map do |sources|
+      rubygems = @rubygems_sources.map do |source|
+        replace_rubygems_source(replacement_sources, source)
+      end
+
+      git, plugin = [@git_sources, @plugin_sources].map do |sources|
         sources.map do |source|
-          replacement_sources.find {|s| s == source } || source
+          replace_source(replacement_sources, source)
         end
       end
 
       path = @path_sources.map do |source|
-        replacement_sources.find {|s| s == (source.is_a?(Source::Gemspec) ? source.as_path_source : source) } || source
+        replace_path_source(replacement_sources, source)
       end
 
       [rubygems, path, git, plugin]
     end
 
     def global_replacement_source(replacement_sources)
-      replacement_source = replacement_sources.find {|s| s == global_rubygems_source }
-      return global_rubygems_source unless replacement_source
+      replace_rubygems_source(replacement_sources, global_rubygems_source, &:local!)
+    end
+
+    def replace_rubygems_source(replacement_sources, gemfile_source)
+      replace_source(replacement_sources, gemfile_source) do |replacement_source|
+        # locked sources never include credentials so always prefer remotes from the gemfile
+        replacement_source.remotes = gemfile_source.remotes
+
+        yield replacement_source if block_given?
+
+        replacement_source
+      end
+    end
+
+    def replace_source(replacement_sources, gemfile_source)
+      replacement_source = replacement_sources.find {|s| s == gemfile_source }
+      return gemfile_source unless replacement_source
+
+      replacement_source = yield(replacement_source) if block_given?
 
-      replacement_source.local!
       replacement_source
     end
 
+    def replace_path_source(replacement_sources, gemfile_source)
+      replace_source(replacement_sources, gemfile_source) do |replacement_source|
+        if gemfile_source.is_a?(Source::Gemspec)
+          gemfile_source.checksum_store = replacement_source.checksum_store
+          gemfile_source
+        else
+          replacement_source
+        end
+      end
+    end
+
     def different_sources?(lock_sources, replacement_sources)
       !equivalent_sources?(lock_sources, replacement_sources)
     end
@@ -219,9 +265,5 @@ def warn_on_git_protocol(source)
     def equivalent_sources?(lock_sources, replacement_sources)
       lock_sources.sort_by(&:identifier) == replacement_sources.sort_by(&:identifier)
     end
-
-    def equivalent_source?(source, other_source)
-      source == other_source
-    end
   end
 end
diff --git a/lib/bundler/source_map.rb b/lib/bundler/source_map.rb
index ca73e01f9dbc5a..a8e12d08c325df 100644
--- a/lib/bundler/source_map.rb
+++ b/lib/bundler/source_map.rb
@@ -23,7 +23,7 @@ def all_requirements
           if previous_source.nil?
             requirements[indirect_dependency_name] = source
           else
-            no_ambiguous_sources = Bundler.feature_flag.bundler_3_mode?
+            no_ambiguous_sources = Bundler.feature_flag.bundler_4_mode?
 
             msg = ["The gem '#{indirect_dependency_name}' was found in multiple relevant sources."]
             msg.concat [previous_source, source].map {|s| "  * #{s}" }.sort
diff --git a/lib/bundler/spec_set.rb b/lib/bundler/spec_set.rb
index 21630e3a3edcd5..411393ce1bdd7c 100644
--- a/lib/bundler/spec_set.rb
+++ b/lib/bundler/spec_set.rb
@@ -7,66 +7,112 @@ class SpecSet
     include Enumerable
     include TSort
 
-    attr_reader :incomplete_specs
-
-    def initialize(specs, incomplete_specs = [])
+    def initialize(specs)
       @specs = specs
-      @incomplete_specs = incomplete_specs
     end
 
-    def for(dependencies, check = false, platforms = [nil])
-      handled = ["bundler"].product(platforms).map {|k| [k, true] }.to_h
-      deps = dependencies.product(platforms)
-      specs = []
+    def for(dependencies, platforms_or_legacy_check = [nil], legacy_platforms = [nil], skips: [])
+      platforms = if [true, false].include?(platforms_or_legacy_check)
+        Bundler::SharedHelpers.major_deprecation 2,
+          "SpecSet#for received a `check` parameter, but that's no longer used and deprecated. " \
+          "SpecSet#for always implicitly performs validation. Please remove this parameter",
+          print_caller_location: true
 
-      loop do
-        break unless dep = deps.shift
+        legacy_platforms
+      else
+        platforms_or_legacy_check
+      end
 
-        name = dep[0].name
-        platform = dep[1]
-        incomplete = false
+      materialize_dependencies(dependencies, platforms, skips: skips)
 
-        key = [name, platform]
-        next if handled.key?(key)
+      @materializations.flat_map(&:specs).uniq
+    end
 
-        handled[key] = true
+    def normalize_platforms!(deps, platforms)
+      remove_invalid_platforms!(deps, platforms)
+      add_extra_platforms!(platforms)
 
-        specs_for_dep = specs_for_dependency(*dep)
-        if specs_for_dep.any?
-          specs.concat(specs_for_dep)
+      platforms.map! do |platform|
+        next platform if platform == Gem::Platform::RUBY
 
-          specs_for_dep.first.dependencies.each do |d|
-            next if d.type == :development
-            incomplete = true if d.name != "bundler" && lookup[d.name].empty?
-            deps << [d, dep[1]]
-          end
-        else
-          incomplete = true
+        begin
+          Integer(platform.version)
+        rescue ArgumentError, TypeError
+          next platform
         end
 
-        if incomplete && check
-          @incomplete_specs += lookup[name].any? ? lookup[name] : [LazySpecification.new(name, nil, nil)]
-        end
+        less_specific_platform = Gem::Platform.new([platform.cpu, platform.os, nil])
+        next platform if incomplete_for_platform?(deps, less_specific_platform)
+
+        less_specific_platform
+      end.uniq!
+    end
+
+    def add_originally_invalid_platforms!(platforms, originally_invalid_platforms)
+      originally_invalid_platforms.each do |originally_invalid_platform|
+        platforms << originally_invalid_platform if complete_platform(originally_invalid_platform)
+      end
+    end
+
+    def remove_invalid_platforms!(deps, platforms, skips: [])
+      invalid_platforms = []
+
+      platforms.reject! do |platform|
+        next false if skips.include?(platform)
+
+        invalid = incomplete_for_platform?(deps, platform)
+        invalid_platforms << platform if invalid
+        invalid
+      end
+
+      invalid_platforms
+    end
+
+    def add_extra_platforms!(platforms)
+      if @specs.empty?
+        platforms.concat([Gem::Platform::RUBY]).uniq
+        return
+      end
+
+      new_platforms = all_platforms.select do |platform|
+        next if platforms.include?(platform)
+        next unless Gem::Platform.generic(platform) == Gem::Platform::RUBY
+
+        complete_platform(platform)
+      end
+      return if new_platforms.empty?
+
+      platforms.concat(new_platforms)
+      return if new_platforms.include?(Bundler.local_platform)
+
+      less_specific_platform = new_platforms.find {|platform| platform != Gem::Platform::RUBY && Bundler.local_platform === platform && platform === Bundler.local_platform }
+      platforms.delete(Bundler.local_platform) if less_specific_platform
+    end
+
+    def validate_deps(s)
+      s.runtime_dependencies.each do |dep|
+        next if dep.name == "bundler"
+
+        return :missing unless names.include?(dep.name)
+        return :invalid if none? {|spec| dep.matches_spec?(spec) }
       end
 
-      specs.uniq
+      :valid
     end
 
     def [](key)
       key = key.name if key.respond_to?(:name)
-      lookup[key].reverse
+      lookup[key]&.reverse || []
     end
 
     def []=(key, value)
-      @specs << value
-      @lookup = nil
-      @sorted = nil
+      delete_by_name(key)
+
+      add_spec(value)
     end
 
     def delete(specs)
-      specs.each {|spec| @specs.delete(spec) }
-      @lookup = nil
-      @sorted = nil
+      Array(specs).each {|spec| remove_spec(spec) }
     end
 
     def sort!
@@ -82,70 +128,92 @@ def to_hash
     end
 
     def materialize(deps)
-      materialized = self.for(deps, true)
+      materialize_dependencies(deps)
 
-      SpecSet.new(materialized, incomplete_specs)
+      SpecSet.new(materialized_specs)
     end
 
     # Materialize for all the specs in the spec set, regardless of what platform they're for
-    # This is in contrast to how for does platform filtering (and specifically different from how `materialize` calls `for` only for the current platform)
     # @return [Array<Gem::Specification>]
     def materialized_for_all_platforms
       @specs.map do |s|
         next s unless s.is_a?(LazySpecification)
-        s.source.remote!
-        spec = s.materialize_for_installation
+        spec = s.materialize_for_cache
         raise GemNotFound, "Could not find #{s.full_name} in any of the sources" unless spec
         spec
       end
     end
 
-    def incomplete_ruby_specs?(deps)
-      return false if @specs.empty?
+    def incomplete_for_platform?(deps, platform)
+      incomplete_specs_for_platform(deps, platform).any?
+    end
 
-      @incomplete_specs = []
+    def incomplete_specs_for_platform(deps, platform)
+      return [] if @specs.empty?
 
-      self.for(deps, true, [Gem::Platform::RUBY])
+      validation_set = self.class.new(@specs)
+      validation_set.for(deps, [platform])
+      validation_set.incomplete_specs
+    end
 
-      @incomplete_specs.any?
+    def missing_specs_for(deps)
+      materialize_dependencies(deps)
+
+      missing_specs
     end
 
     def missing_specs
-      @specs.select {|s| s.is_a?(LazySpecification) }
+      @materializations.flat_map(&:completely_missing_specs)
     end
 
-    def merge(set)
-      arr = sorted.dup
-      set.each do |set_spec|
-        full_name = set_spec.full_name
-        next if arr.any? {|spec| spec.full_name == full_name }
-        arr << set_spec
-      end
-      SpecSet.new(arr)
+    def partially_missing_specs
+      @materializations.flat_map(&:partially_missing_specs)
+    end
+
+    def incomplete_specs
+      @materializations.flat_map(&:incomplete_specs)
+    end
+
+    def insecurely_materialized_specs
+      materialized_specs.select(&:insecurely_materialized?)
     end
 
     def -(other)
+      SharedHelpers.major_deprecation 2, "SpecSet#- has been removed with no replacement"
+
       SpecSet.new(to_a - other.to_a)
     end
 
     def find_by_name_and_platform(name, platform)
-      @specs.detect {|spec| spec.name == name && spec.match_platform(platform) }
+      @specs.detect {|spec| spec.name == name && spec.installable_on_platform?(platform) }
+    end
+
+    def specs_with_additional_variants_from(other)
+      sorted | additional_variants_from(other)
     end
 
     def delete_by_name(name)
       @specs.reject! {|spec| spec.name == name }
-      @lookup = nil
-      @sorted = nil
+      @sorted&.reject! {|spec| spec.name == name }
+      return if @lookup.nil?
+
+      @lookup[name] = nil
+    end
+
+    def version_for(name)
+      exemplary_spec(name)&.version
     end
 
     def what_required(spec)
-      unless req = find {|s| s.dependencies.any? {|d| d.type == :runtime && d.name == spec.name } }
+      unless req = find {|s| s.runtime_dependencies.any? {|d| d.name == spec.name } }
         return [spec]
       end
       what_required(req) << spec
     end
 
     def <<(spec)
+      SharedHelpers.major_deprecation 2, "SpecSet#<< has been removed with no replacement"
+
       @specs << spec
     end
 
@@ -165,29 +233,113 @@ def each(&b)
       sorted.each(&b)
     end
 
+    def names
+      lookup.keys
+    end
+
+    def valid?(s)
+      s.matches_current_metadata? && valid_dependencies?(s)
+    end
+
+    def to_s
+      map(&:full_name).to_s
+    end
+
     private
 
-    def sorted
-      rake = @specs.find {|s| s.name == "rake" }
-      begin
-        @sorted ||= ([rake] + tsort).compact.uniq
-      rescue TSort::Cyclic => error
-        cgems = extract_circular_gems(error)
-        raise CyclicDependencyError, "Your bundle requires gems that depend" \
-          " on each other, creating an infinite loop. Please remove either" \
-          " gem '#{cgems[0]}' or gem '#{cgems[1]}' and try again."
+    def materialize_dependencies(dependencies, platforms = [nil], skips: [])
+      handled = ["bundler"].product(platforms).map {|k| [k, true] }.to_h
+      deps = dependencies.product(platforms)
+      @materializations = []
+
+      loop do
+        break unless dep = deps.shift
+
+        dependency = dep[0]
+        platform = dep[1]
+        name = dependency.name
+
+        key = [name, platform]
+        next if handled.key?(key)
+
+        handled[key] = true
+
+        materialization = Materialization.new(dependency, platform, candidates: lookup[name])
+
+        deps.concat(materialization.dependencies) if materialization.complete?
+
+        @materializations << materialization unless skips.include?(name)
+      end
+
+      @materializations
+    end
+
+    def materialized_specs
+      @materializations.filter_map(&:materialized_spec)
+    end
+
+    def complete_platform(platform)
+      new_specs = []
+
+      valid_platform = lookup.all? do |_, specs|
+        spec = specs.first
+        matching_specs = spec.source.specs.search([spec.name, spec.version])
+        platform_spec = MatchPlatform.select_best_platform_match(matching_specs, platform).find do |s|
+          valid?(s)
+        end
+
+        if platform_spec
+          new_specs << LazySpecification.from_spec(platform_spec) unless specs.include?(platform_spec)
+          true
+        else
+          false
+        end
+      end
+
+      if valid_platform && new_specs.any?
+        new_specs.each {|spec| add_spec(spec) }
+      end
+
+      valid_platform
+    end
+
+    def all_platforms
+      @specs.flat_map {|spec| spec.source.specs.search([spec.name, spec.version]).map(&:platform) }.uniq
+    end
+
+    def additional_variants_from(other)
+      other.select do |other_spec|
+        spec = exemplary_spec(other_spec.name)
+        next unless spec
+
+        selected = spec.version == other_spec.version && valid_dependencies?(other_spec)
+        other_spec.source = spec.source if selected
+        selected
       end
     end
 
+    def valid_dependencies?(s)
+      validate_deps(s) == :valid
+    end
+
+    def sorted
+      @sorted ||= ([@specs.find {|s| s.name == "rake" }] + tsort).compact.uniq
+    rescue TSort::Cyclic => error
+      cgems = extract_circular_gems(error)
+      raise CyclicDependencyError, "Your bundle requires gems that depend" \
+        " on each other, creating an infinite loop. Please remove either" \
+        " gem '#{cgems[0]}' or gem '#{cgems[1]}' and try again."
+    end
+
     def extract_circular_gems(error)
       error.message.scan(/@name="(.*?)"/).flatten
     end
 
     def lookup
       @lookup ||= begin
-        lookup = Hash.new {|h, k| h[k] = [] }
+        lookup = {}
         @specs.each do |s|
-          lookup[s.name] << s
+          index_spec(lookup, s.name, s)
         end
         lookup
       end
@@ -198,19 +350,50 @@ def tsort_each_node
       @specs.sort_by(&:name).each {|s| yield s }
     end
 
-    def specs_for_dependency(dep, platform)
-      specs_for_name = lookup[dep.name]
-      target_platform = dep.force_ruby_platform ? Gem::Platform::RUBY : (platform || Bundler.local_platform)
-      matching_specs = GemHelpers.select_best_platform_match(specs_for_name, target_platform)
-      matching_specs.map!(&:materialize_for_installation).compact! if platform.nil?
-      matching_specs
-    end
-
     def tsort_each_child(s)
       s.dependencies.sort_by(&:name).each do |d|
         next if d.type == :development
-        lookup[d.name].each {|s2| yield s2 }
+
+        specs_for_name = lookup[d.name]
+        next unless specs_for_name
+
+        specs_for_name.each {|s2| yield s2 }
       end
     end
+
+    def add_spec(spec)
+      @specs << spec
+
+      name = spec.name
+
+      @sorted&.insert(@sorted.bsearch_index {|s| s.name >= name } || @sorted.size, spec)
+      return if @lookup.nil?
+
+      index_spec(@lookup, name, spec)
+    end
+
+    def remove_spec(spec)
+      @specs.delete(spec)
+      @sorted&.delete(spec)
+      return if @lookup.nil?
+
+      indexed_specs = @lookup[spec.name]
+      return unless indexed_specs
+
+      if indexed_specs.size > 1
+        @lookup[spec.name].delete(spec)
+      else
+        @lookup[spec.name] = nil
+      end
+    end
+
+    def index_spec(hash, key, value)
+      hash[key] ||= []
+      hash[key] << value
+    end
+
+    def exemplary_spec(name)
+      self[name].first
+    end
   end
 end
diff --git a/lib/bundler/stub_specification.rb b/lib/bundler/stub_specification.rb
index 88a4257fa4521b..026f753d411fd8 100644
--- a/lib/bundler/stub_specification.rb
+++ b/lib/bundler/stub_specification.rb
@@ -9,6 +9,11 @@ def self.from_stub(stub)
       spec
     end
 
+    def insecurely_materialized?
+      false
+    end
+
+    attr_reader :checksum
     attr_accessor :stub, :ignored
 
     def source=(source)
@@ -16,7 +21,8 @@ def source=(source)
       # Stub has no concept of source, which means that extension_dir may be wrong
       # This is the case for git-based gems. So, instead manually assign the extension dir
       return unless source.respond_to?(:extension_dir_name)
-      path = File.join(stub.extensions_dir, source.extension_dir_name)
+      unique_extension_dir = [source.extension_dir_name, File.basename(full_gem_path)].uniq.join("-")
+      path = File.join(stub.extensions_dir, unique_extension_dir)
       stub.extension_dir = File.expand_path(path)
     end
 
@@ -26,6 +32,17 @@ def to_yaml
 
     # @!group Stub Delegates
 
+    def ignored?
+      return @ignored unless @ignored.nil?
+
+      @ignored = missing_extensions?
+      return false unless @ignored
+
+      warn "Source #{source} is ignoring #{self} because it is missing extensions"
+
+      true
+    end
+
     def manually_installed?
       # This is for manually installed gems which are gems that were fixed in place after a
       # failed installation. Once the issue was resolved, the user then manually created
@@ -43,8 +60,8 @@ def missing_extensions?
       true
     end
 
-    def activated
-      stub.activated
+    def activated?
+      stub.activated?
     end
 
     def activated=(activated)
@@ -56,7 +73,7 @@ def extensions
     end
 
     def gem_build_complete_path
-      File.join(extension_dir, "gem.build_complete")
+      stub.gem_build_complete_path
     end
 
     def default_gem?
@@ -75,6 +92,14 @@ def full_require_paths
       stub.full_require_paths
     end
 
+    def require_paths
+      stub.require_paths
+    end
+
+    def base_dir=(path)
+      stub.base_dir = path
+    end
+
     def load_paths
       full_require_paths
     end
@@ -91,6 +116,10 @@ def raw_require_paths
       stub.raw_require_paths
     end
 
+    def inspect
+      "#<#{self.class} @name=\"#{name}\" (#{full_name.delete_prefix("#{name}-")})>"
+    end
+
     private
 
     def _remote_specification
@@ -108,6 +137,7 @@ def _remote_specification
         end
 
         rs.source = source
+        rs.base_dir = stub.base_dir
 
         rs
       end
diff --git a/lib/bundler/templates/Executable b/lib/bundler/templates/Executable
index 9ff6f00898815b..b085c24da63868 100644
--- a/lib/bundler/templates/Executable
+++ b/lib/bundler/templates/Executable
@@ -10,17 +10,6 @@
 
 ENV["BUNDLE_GEMFILE"] ||= File.expand_path("<%= relative_gemfile_path %>", __dir__)
 
-bundle_binstub = File.expand_path("bundle", __dir__)
-
-if File.file?(bundle_binstub)
-  if File.read(bundle_binstub, 300).include?("This file was generated by Bundler")
-    load(bundle_binstub)
-  else
-    abort("Your `bin/bundle` was not generated by Bundler, so this binstub cannot run.
-Replace `bin/bundle` by running `bundle binstubs bundler --force`, then run this command again.")
-  end
-end
-
 require "rubygems"
 require "bundler/setup"
 
diff --git a/lib/bundler/templates/Executable.bundler b/lib/bundler/templates/Executable.bundler
deleted file mode 100644
index e290fe91eba100..00000000000000
--- a/lib/bundler/templates/Executable.bundler
+++ /dev/null
@@ -1,109 +0,0 @@
-#!/usr/bin/env <%= Bundler.settings[:shebang] || RbConfig::CONFIG["ruby_install_name"] %>
-# frozen_string_literal: true
-
-#
-# This file was generated by Bundler.
-#
-# The application '<%= executable %>' is installed as part of a gem, and
-# this file is here to facilitate running it.
-#
-
-require "rubygems"
-
-m = Module.new do
-  module_function
-
-  def invoked_as_script?
-    File.expand_path($0) == File.expand_path(__FILE__)
-  end
-
-  def env_var_version
-    ENV["BUNDLER_VERSION"]
-  end
-
-  def cli_arg_version
-    return unless invoked_as_script? # don't want to hijack other binstubs
-    return unless "update".start_with?(ARGV.first || " ") # must be running `bundle update`
-    bundler_version = nil
-    update_index = nil
-    ARGV.each_with_index do |a, i|
-      if update_index && update_index.succ == i && a =~ Gem::Version::ANCHORED_VERSION_PATTERN
-        bundler_version = a
-      end
-      next unless a =~ /\A--bundler(?:[= ](#{Gem::Version::VERSION_PATTERN}))?\z/
-      bundler_version = $1
-      update_index = i
-    end
-    bundler_version
-  end
-
-  def gemfile
-    gemfile = ENV["BUNDLE_GEMFILE"]
-    return gemfile if gemfile && !gemfile.empty?
-
-    File.expand_path("<%= relative_gemfile_path %>", __dir__)
-  end
-
-  def lockfile
-    lockfile =
-      case File.basename(gemfile)
-      when "gems.rb" then gemfile.sub(/\.rb$/, ".locked")
-      else "#{gemfile}.lock"
-      end
-    File.expand_path(lockfile)
-  end
-
-  def lockfile_version
-    return unless File.file?(lockfile)
-    lockfile_contents = File.read(lockfile)
-    return unless lockfile_contents =~ /\n\nBUNDLED WITH\n\s{2,}(#{Gem::Version::VERSION_PATTERN})\n/
-    Regexp.last_match(1)
-  end
-
-  def bundler_requirement
-    @bundler_requirement ||=
-      env_var_version ||
-      cli_arg_version ||
-      bundler_requirement_for(lockfile_version)
-  end
-
-  def bundler_requirement_for(version)
-    return "#{Gem::Requirement.default}.a" unless version
-
-    bundler_gem_version = Gem::Version.new(version)
-
-    bundler_gem_version.approximate_recommendation
-  end
-
-  def load_bundler!
-    ENV["BUNDLE_GEMFILE"] ||= gemfile
-
-    activate_bundler
-  end
-
-  def activate_bundler
-    gem_error = activation_error_handling do
-      gem "bundler", bundler_requirement
-    end
-    return if gem_error.nil?
-    require_error = activation_error_handling do
-      require "bundler/version"
-    end
-    return if require_error.nil? && Gem::Requirement.new(bundler_requirement).satisfied_by?(Gem::Version.new(Bundler::VERSION))
-    warn "Activating bundler (#{bundler_requirement}) failed:\n#{gem_error.message}\n\nTo install the version of bundler this project requires, run `gem install bundler -v '#{bundler_requirement}'`"
-    exit 42
-  end
-
-  def activation_error_handling
-    yield
-    nil
-  rescue StandardError, LoadError => e
-    e
-  end
-end
-
-m.load_bundler!
-
-if m.invoked_as_script?
-  load Gem.bin_path("<%= spec.name %>", "<%= executable %>")
-end
diff --git a/lib/bundler/templates/newgem/CODE_OF_CONDUCT.md.tt b/lib/bundler/templates/newgem/CODE_OF_CONDUCT.md.tt
index 175b821a62731d..67fe8cee798a7d 100644
--- a/lib/bundler/templates/newgem/CODE_OF_CONDUCT.md.tt
+++ b/lib/bundler/templates/newgem/CODE_OF_CONDUCT.md.tt
@@ -2,83 +2,131 @@
 
 ## Our Pledge
 
-We as members, contributors, and leaders pledge to make participation in our community a harassment-free experience for everyone, regardless of age, body size, visible or invisible disability, ethnicity, sex characteristics, gender identity and expression, level of experience, education, socio-economic status, nationality, personal appearance, race, religion, or sexual identity and orientation.
+We as members, contributors, and leaders pledge to make participation in our
+community a harassment-free experience for everyone, regardless of age, body
+size, visible or invisible disability, ethnicity, sex characteristics, gender
+identity and expression, level of experience, education, socio-economic status,
+nationality, personal appearance, race, caste, color, religion, or sexual
+identity and orientation.
 
-We pledge to act and interact in ways that contribute to an open, welcoming, diverse, inclusive, and healthy community.
+We pledge to act and interact in ways that contribute to an open, welcoming,
+diverse, inclusive, and healthy community.
 
 ## Our Standards
 
-Examples of behavior that contributes to a positive environment for our community include:
+Examples of behavior that contributes to a positive environment for our
+community include:
 
 * Demonstrating empathy and kindness toward other people
 * Being respectful of differing opinions, viewpoints, and experiences
 * Giving and gracefully accepting constructive feedback
-* Accepting responsibility and apologizing to those affected by our mistakes, and learning from the experience
-* Focusing on what is best not just for us as individuals, but for the overall community
+* Accepting responsibility and apologizing to those affected by our mistakes,
+  and learning from the experience
+* Focusing on what is best not just for us as individuals, but for the overall
+  community
 
 Examples of unacceptable behavior include:
 
-* The use of sexualized language or imagery, and sexual attention or
-  advances of any kind
+* The use of sexualized language or imagery, and sexual attention or advances of
+  any kind
 * Trolling, insulting or derogatory comments, and personal or political attacks
 * Public or private harassment
-* Publishing others' private information, such as a physical or email
-  address, without their explicit permission
+* Publishing others' private information, such as a physical or email address,
+  without their explicit permission
 * Other conduct which could reasonably be considered inappropriate in a
   professional setting
 
 ## Enforcement Responsibilities
 
-Community leaders are responsible for clarifying and enforcing our standards of acceptable behavior and will take appropriate and fair corrective action in response to any behavior that they deem inappropriate, threatening, offensive, or harmful.
+Community leaders are responsible for clarifying and enforcing our standards of
+acceptable behavior and will take appropriate and fair corrective action in
+response to any behavior that they deem inappropriate, threatening, offensive,
+or harmful.
 
-Community leaders have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct, and will communicate reasons for moderation decisions when appropriate.
+Community leaders have the right and responsibility to remove, edit, or reject
+comments, commits, code, wiki edits, issues, and other contributions that are
+not aligned to this Code of Conduct, and will communicate reasons for moderation
+decisions when appropriate.
 
 ## Scope
 
-This Code of Conduct applies within all community spaces, and also applies when an individual is officially representing the community in public spaces. Examples of representing our community include using an official e-mail address, posting via an official social media account, or acting as an appointed representative at an online or offline event.
+This Code of Conduct applies within all community spaces, and also applies when
+an individual is officially representing the community in public spaces.
+Examples of representing our community include using an official email address,
+posting via an official social media account, or acting as an appointed
+representative at an online or offline event.
 
 ## Enforcement
 
-Instances of abusive, harassing, or otherwise unacceptable behavior may be reported to the community leaders responsible for enforcement at <%= config[:email] %>. All complaints will be reviewed and investigated promptly and fairly.
+Instances of abusive, harassing, or otherwise unacceptable behavior may be
+reported to the community leaders responsible for enforcement at
+[INSERT CONTACT METHOD].
+All complaints will be reviewed and investigated promptly and fairly.
 
-All community leaders are obligated to respect the privacy and security of the reporter of any incident.
+All community leaders are obligated to respect the privacy and security of the
+reporter of any incident.
 
 ## Enforcement Guidelines
 
-Community leaders will follow these Community Impact Guidelines in determining the consequences for any action they deem in violation of this Code of Conduct:
+Community leaders will follow these Community Impact Guidelines in determining
+the consequences for any action they deem in violation of this Code of Conduct:
 
 ### 1. Correction
 
-**Community Impact**: Use of inappropriate language or other behavior deemed unprofessional or unwelcome in the community.
+**Community Impact**: Use of inappropriate language or other behavior deemed
+unprofessional or unwelcome in the community.
 
-**Consequence**: A private, written warning from community leaders, providing clarity around the nature of the violation and an explanation of why the behavior was inappropriate. A public apology may be requested.
+**Consequence**: A private, written warning from community leaders, providing
+clarity around the nature of the violation and an explanation of why the
+behavior was inappropriate. A public apology may be requested.
 
 ### 2. Warning
 
-**Community Impact**: A violation through a single incident or series of actions.
+**Community Impact**: A violation through a single incident or series of
+actions.
 
-**Consequence**: A warning with consequences for continued behavior. No interaction with the people involved, including unsolicited interaction with those enforcing the Code of Conduct, for a specified period of time. This includes avoiding interactions in community spaces as well as external channels like social media. Violating these terms may lead to a temporary or permanent ban.
+**Consequence**: A warning with consequences for continued behavior. No
+interaction with the people involved, including unsolicited interaction with
+those enforcing the Code of Conduct, for a specified period of time. This
+includes avoiding interactions in community spaces as well as external channels
+like social media. Violating these terms may lead to a temporary or permanent
+ban.
 
 ### 3. Temporary Ban
 
-**Community Impact**: A serious violation of community standards, including sustained inappropriate behavior.
+**Community Impact**: A serious violation of community standards, including
+sustained inappropriate behavior.
 
-**Consequence**: A temporary ban from any sort of interaction or public communication with the community for a specified period of time. No public or private interaction with the people involved, including unsolicited interaction with those enforcing the Code of Conduct, is allowed during this period. Violating these terms may lead to a permanent ban.
+**Consequence**: A temporary ban from any sort of interaction or public
+communication with the community for a specified period of time. No public or
+private interaction with the people involved, including unsolicited interaction
+with those enforcing the Code of Conduct, is allowed during this period.
+Violating these terms may lead to a permanent ban.
 
 ### 4. Permanent Ban
 
-**Community Impact**: Demonstrating a pattern of violation of community standards, including sustained inappropriate behavior,  harassment of an individual, or aggression toward or disparagement of classes of individuals.
+**Community Impact**: Demonstrating a pattern of violation of community
+standards, including sustained inappropriate behavior, harassment of an
+individual, or aggression toward or disparagement of classes of individuals.
 
-**Consequence**: A permanent ban from any sort of public interaction within the community.
+**Consequence**: A permanent ban from any sort of public interaction within the
+community.
 
 ## Attribution
 
-This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 2.0,
-available at https://www.contributor-covenant.org/version/2/0/code_of_conduct.html.
+This Code of Conduct is adapted from the [Contributor Covenant][homepage],
+version 2.1, available at
+[https://www.contributor-covenant.org/version/2/1/code_of_conduct.html][v2.1].
 
-Community Impact Guidelines were inspired by [Mozilla's code of conduct enforcement ladder](https://github.com/mozilla/diversity).
-
-[homepage]: https://www.contributor-covenant.org
+Community Impact Guidelines were inspired by
+[Mozilla's code of conduct enforcement ladder][Mozilla CoC].
 
 For answers to common questions about this code of conduct, see the FAQ at
-https://www.contributor-covenant.org/faq. Translations are available at https://www.contributor-covenant.org/translations.
+[https://www.contributor-covenant.org/faq][FAQ]. Translations are available at
+[https://www.contributor-covenant.org/translations][translations].
+
+[homepage]: https://www.contributor-covenant.org
+[v2.1]: https://www.contributor-covenant.org/version/2/1/code_of_conduct.html
+[Mozilla CoC]: https://github.com/mozilla/diversity
+[FAQ]: https://www.contributor-covenant.org/faq
+[translations]: https://www.contributor-covenant.org/translations
diff --git a/lib/bundler/templates/newgem/Gemfile.tt b/lib/bundler/templates/newgem/Gemfile.tt
index a0d2ac28267972..ea7a33ee28f8e2 100644
--- a/lib/bundler/templates/newgem/Gemfile.tt
+++ b/lib/bundler/templates/newgem/Gemfile.tt
@@ -5,13 +5,11 @@ source "https://rubygems.org"
 # Specify your gem's dependencies in <%= config[:name] %>.gemspec
 gemspec
 
+gem "irb"
 gem "rake", "~> 13.0"
 <%- if config[:ext] -%>
 
 gem "rake-compiler"
-<%- if config[:ext] == 'rust' -%>
-gem "rb_sys", "~> 0.9.63"
-<%- end -%>
 <%- end -%>
 <%- if config[:test] -%>
 
diff --git a/lib/bundler/templates/newgem/README.md.tt b/lib/bundler/templates/newgem/README.md.tt
index 5bf36378e86081..0ec6a12fa7668c 100644
--- a/lib/bundler/templates/newgem/README.md.tt
+++ b/lib/bundler/templates/newgem/README.md.tt
@@ -10,11 +10,15 @@ TODO: Replace `UPDATE_WITH_YOUR_GEM_NAME_IMMEDIATELY_AFTER_RELEASE_TO_RUBYGEMS_O
 
 Install the gem and add to the application's Gemfile by executing:
 
-    $ bundle add UPDATE_WITH_YOUR_GEM_NAME_IMMEDIATELY_AFTER_RELEASE_TO_RUBYGEMS_ORG
+```bash
+bundle add UPDATE_WITH_YOUR_GEM_NAME_IMMEDIATELY_AFTER_RELEASE_TO_RUBYGEMS_ORG
+```
 
 If bundler is not being used to manage dependencies, install the gem by executing:
 
-    $ gem install UPDATE_WITH_YOUR_GEM_NAME_IMMEDIATELY_AFTER_RELEASE_TO_RUBYGEMS_ORG
+```bash
+gem install UPDATE_WITH_YOUR_GEM_NAME_IMMEDIATELY_AFTER_RELEASE_TO_RUBYGEMS_ORG
+```
 
 ## Usage
 
@@ -22,7 +26,7 @@ TODO: Write usage instructions here
 
 ## Development
 
-After checking out the repo, run `bin/setup` to install dependencies.<% if config[:test] %> Then, run `rake <%= config[:test].sub('mini', '').sub('rspec', 'spec') %>` to run the tests.<% end %> You can also run `bin/console` for an interactive prompt that will allow you to experiment.<% if config[:bin] %> Run `bundle exec <%= config[:name] %>` to use the gem in this directory, ignoring other installed copies of this gem.<% end %>
+After checking out the repo, run `bin/setup` to install dependencies.<% if config[:test] %> Then, run `rake <%= config[:test_task] %>` to run the tests.<% end %> You can also run `bin/console` for an interactive prompt that will allow you to experiment.<% if config[:bin] %> Run `bundle exec <%= config[:name] %>` to use the gem in this directory, ignoring other installed copies of this gem.<% end %>
 
 To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and the created tag, and push the `.gem` file to [rubygems.org](https://rubygems.org).
 <% if config[:git] -%>
diff --git a/lib/bundler/templates/newgem/Rakefile.tt b/lib/bundler/templates/newgem/Rakefile.tt
index b5a5c4e3925b17..172183d4b410d8 100644
--- a/lib/bundler/templates/newgem/Rakefile.tt
+++ b/lib/bundler/templates/newgem/Rakefile.tt
@@ -4,13 +4,9 @@ require "bundler/gem_tasks"
 <% default_task_names = [config[:test_task]].compact -%>
 <% case config[:test] -%>
 <% when "minitest" -%>
-require "rake/testtask"
+require "minitest/test_task"
 
-Rake::TestTask.new(:test) do |t|
-  t.libs << "test"
-  t.libs << "lib"
-  t.test_files = FileList["test/**/test_*.rb"]
-end
+Minitest::TestTask.create
 
 <% when "test-unit" -%>
 require "rake/testtask"
@@ -46,7 +42,9 @@ require "rb_sys/extensiontask"
 
 task build: :compile
 
-RbSys::ExtensionTask.new(<%= config[:name].inspect %>) do |ext|
+GEMSPEC = Gem::Specification.load("<%= config[:underscored_name] %>.gemspec")
+
+RbSys::ExtensionTask.new(<%= config[:name].inspect %>, GEMSPEC) do |ext|
   ext.lib_dir = "lib/<%= config[:namespaced_path] %>"
 end
 <% else -%>
@@ -54,7 +52,9 @@ require "rake/extensiontask"
 
 task build: :compile
 
-Rake::ExtensionTask.new("<%= config[:underscored_name] %>") do |ext|
+GEMSPEC = Gem::Specification.load("<%= config[:underscored_name] %>.gemspec")
+
+Rake::ExtensionTask.new("<%= config[:underscored_name] %>", GEMSPEC) do |ext|
   ext.lib_dir = "lib/<%= config[:namespaced_path] %>"
 end
 <% end -%>
diff --git a/lib/bundler/templates/newgem/ext/newgem/Cargo.toml.tt b/lib/bundler/templates/newgem/ext/newgem/Cargo.toml.tt
index c64385486ef230..0ebce0e4a0c6e7 100644
--- a/lib/bundler/templates/newgem/ext/newgem/Cargo.toml.tt
+++ b/lib/bundler/templates/newgem/ext/newgem/Cargo.toml.tt
@@ -12,4 +12,4 @@ publish = false
 crate-type = ["cdylib"]
 
 [dependencies]
-magnus = { version = "0.6" }
+magnus = { version = "0.6.2" }
diff --git a/lib/bundler/templates/newgem/github/workflows/main.yml.tt b/lib/bundler/templates/newgem/github/workflows/main.yml.tt
index be58dd81566dfb..9224ee0ca27266 100644
--- a/lib/bundler/templates/newgem/github/workflows/main.yml.tt
+++ b/lib/bundler/templates/newgem/github/workflows/main.yml.tt
@@ -17,21 +17,23 @@ jobs:
           - '<%= RUBY_VERSION %>'
 
     steps:
-    - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
+        with:
+          persist-credentials: false
 <%- if config[:ext] == 'rust' -%>
-    - name: Set up Ruby & Rust
-      uses: oxidize-rb/actions/setup-ruby-and-rust@v1
-      with:
-        ruby-version: ${{ matrix.ruby }}
-        bundler-cache: true
-        cargo-cache: true
-        rubygems: '<%= ::Gem.rubygems_version %>'
+      - name: Set up Ruby & Rust
+        uses: oxidize-rb/actions/setup-ruby-and-rust@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+          bundler-cache: true
+          cargo-cache: true
+          rubygems: '<%= ::Gem.rubygems_version %>'
 <%- else -%>
-    - name: Set up Ruby
-      uses: ruby/setup-ruby@v1
-      with:
-        ruby-version: ${{ matrix.ruby }}
-        bundler-cache: true
+      - name: Set up Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+          bundler-cache: true
 <%- end -%>
-    - name: Run the default task
-      run: bundle exec rake
+      - name: Run the default task
+        run: bundle exec rake
diff --git a/lib/bundler/templates/newgem/newgem.gemspec.tt b/lib/bundler/templates/newgem/newgem.gemspec.tt
index bb766803799d08..99a0f8c2cf512e 100644
--- a/lib/bundler/templates/newgem/newgem.gemspec.tt
+++ b/lib/bundler/templates/newgem/newgem.gemspec.tt
@@ -10,7 +10,7 @@ Gem::Specification.new do |spec|
 
   spec.summary = "TODO: Write a short summary, because RubyGems requires one."
   spec.description = "TODO: Write a longer description or delete this line."
-  spec.homepage = "TODO: Put your gem's website or public repo URL here."
+  spec.homepage = "<%= config[:homepage_uri] %>"
 <%- if config[:mit] -%>
   spec.license = "MIT"
 <%- end -%>
@@ -20,31 +20,33 @@ Gem::Specification.new do |spec|
 <%- end -%>
 
   spec.metadata["allowed_push_host"] = "TODO: Set to your gem server 'https://example.com'"
-
   spec.metadata["homepage_uri"] = spec.homepage
-  spec.metadata["source_code_uri"] = "TODO: Put your gem's public repo URL here."
-  spec.metadata["changelog_uri"] = "TODO: Put your gem's CHANGELOG.md URL here."
+  spec.metadata["source_code_uri"] = "<%= config[:source_code_uri] %>"
+  <%- if config[:changelog] -%>
+    spec.metadata["changelog_uri"] = "<%= config[:changelog_uri] %>"
+  <%- end -%>
 
   # 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(__dir__) do
-    `git ls-files -z`.split("\x0").reject do |f|
-      (File.expand_path(f) == __FILE__) ||
-        f.start_with?(*%w[bin/ test/ spec/ features/ .git .circleci appveyor Gemfile])
+  gemspec = File.basename(__FILE__)
+  spec.files = IO.popen(%w[git ls-files -z], chdir: __dir__, err: IO::NULL) do |ls|
+    ls.readlines("\x0", chomp: true).reject do |f|
+      (f == gemspec) ||
+        f.start_with?(*%w[<%= config[:ignore_paths].join(" ") %>])
     end
   end
   spec.bindir = "exe"
   spec.executables = spec.files.grep(%r{\Aexe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
-<%- if config[:ext] == 'c' -%>
+<%- if config[:ext] == 'c' || config[:ext] == 'rust' -%>
   spec.extensions = ["ext/<%= config[:underscored_name] %>/extconf.rb"]
 <%- end -%>
-<%- if config[:ext] == 'rust' -%>
-  spec.extensions = ["ext/<%= config[:underscored_name] %>/Cargo.toml"]
-<%- end -%>
 
   # Uncomment to register a new dependency of your gem
   # spec.add_dependency "example-gem", "~> 1.0"
+<%- if config[:ext] == 'rust' -%>
+  spec.add_dependency "rb_sys", "~> 0.9.91"
+<%- end -%>
 
   # For more information and examples about making a new gem, check out our
   # guide at: https://bundler.io/guides/creating_gem.html
diff --git a/lib/bundler/templates/newgem/rubocop.yml.tt b/lib/bundler/templates/newgem/rubocop.yml.tt
index 9ecec788075a5d..3d1c4ee7b2e63f 100644
--- a/lib/bundler/templates/newgem/rubocop.yml.tt
+++ b/lib/bundler/templates/newgem/rubocop.yml.tt
@@ -2,12 +2,7 @@ AllCops:
   TargetRubyVersion: <%= ::Gem::Version.new(config[:required_ruby_version]).segments[0..1].join(".") %>
 
 Style/StringLiterals:
-  Enabled: true
   EnforcedStyle: double_quotes
 
 Style/StringLiteralsInInterpolation:
-  Enabled: true
   EnforcedStyle: double_quotes
-
-Layout/LineLength:
-  Max: 120
diff --git a/lib/bundler/ui/shell.rb b/lib/bundler/ui/shell.rb
index 4139585c4754e9..6f080b64598f02 100644
--- a/lib/bundler/ui/shell.rb
+++ b/lib/bundler/ui/shell.rb
@@ -6,14 +6,17 @@ module Bundler
   module UI
     class Shell
       LEVELS = %w[silent error warn confirm info debug].freeze
+      OUTPUT_STREAMS = [:stdout, :stderr].freeze
 
       attr_writer :shell
+      attr_reader :output_stream
 
       def initialize(options = {})
         Thor::Base.shell = options["no-color"] ? Thor::Shell::Basic : nil
         @shell = Thor::Base.shell.new
         @level = ENV["DEBUG"] ? "debug" : "info"
         @warning_history = []
+        @output_stream = :stdout
       end
 
       def add_color(string, *color)
@@ -77,14 +80,14 @@ def quiet?
       end
 
       def ask(msg)
-        @shell.ask(msg)
+        @shell.ask(msg, :green)
       end
 
       def yes?(msg)
-        @shell.yes?(msg)
+        @shell.yes?(msg, :green)
       end
 
-      def no?
+      def no?(msg)
         @shell.no?(msg)
       end
 
@@ -101,6 +104,11 @@ def level(name = nil)
         index <= LEVELS.index(@level)
       end
 
+      def output_stream=(symbol)
+        raise ArgumentError unless OUTPUT_STREAMS.include?(symbol)
+        @output_stream = symbol
+      end
+
       def trace(e, newline = nil, force = false)
         return unless debug? || force
         msg = "#{e.class}: #{e.message}\n#{e.backtrace.join("\n  ")}"
@@ -111,6 +119,10 @@ def silence(&blk)
         with_level("silent", &blk)
       end
 
+      def progress(&blk)
+        with_output_stream(:stderr, &blk)
+      end
+
       def unprinted_warnings
         []
       end
@@ -119,6 +131,8 @@ def unprinted_warnings
 
       # valimism
       def tell_me(msg, color = nil, newline = nil)
+        return tell_err(msg, color, newline) if output_stream == :stderr
+
         msg = word_wrap(msg) if newline.is_a?(Hash) && newline[:wrap]
         if newline.nil?
           @shell.say(msg, color)
@@ -130,7 +144,7 @@ def tell_me(msg, color = nil, newline = nil)
       def tell_err(message, color = nil, newline = nil)
         return if @shell.send(:stderr).closed?
 
-        newline ||= message.to_s !~ /( |\t)\Z/
+        newline = !message.to_s.match?(/( |\t)\Z/) if newline.nil?
         message = word_wrap(message) if newline.is_a?(Hash) && newline[:wrap]
 
         color = nil if color && !$stderr.tty?
@@ -147,7 +161,7 @@ def strip_leading_spaces(text)
         spaces ? text.gsub(/#{spaces}/, "") : text
       end
 
-      def word_wrap(text, line_width = @shell.terminal_width)
+      def word_wrap(text, line_width = Thor::Terminal.terminal_width)
         strip_leading_spaces(text).split("\n").collect do |line|
           line.length > line_width ? line.gsub(/(.{1,#{line_width}})(\s+|$)/, "\\1\n").strip : line
         end * "\n"
@@ -160,6 +174,14 @@ def with_level(level)
       ensure
         @level = original
       end
+
+      def with_output_stream(symbol)
+        original = output_stream
+        self.output_stream = symbol
+        yield
+      ensure
+        @output_stream = original
+      end
     end
   end
 end
diff --git a/lib/bundler/ui/silent.rb b/lib/bundler/ui/silent.rb
index fa3292bdc9276c..83d31d4b5530e6 100644
--- a/lib/bundler/ui/silent.rb
+++ b/lib/bundler/ui/silent.rb
@@ -53,6 +53,13 @@ def warn?
         false
       end
 
+      def output_stream=(_symbol)
+      end
+
+      def output_stream
+        nil
+      end
+
       def ask(message)
       end
 
@@ -60,7 +67,7 @@ def yes?(msg)
         raise "Cannot ask yes? with a silent shell"
       end
 
-      def no?
+      def no?(msg)
         raise "Cannot ask no? with a silent shell"
       end
 
@@ -77,6 +84,10 @@ def silence
         yield
       end
 
+      def progress
+        yield
+      end
+
       def unprinted_warnings
         @warnings
       end
diff --git a/lib/bundler/uri_credentials_filter.rb b/lib/bundler/uri_credentials_filter.rb
index ccfaf0bc5de0cc..68041874333c5f 100644
--- a/lib/bundler/uri_credentials_filter.rb
+++ b/lib/bundler/uri_credentials_filter.rb
@@ -11,12 +11,12 @@ def credential_filtered_uri(uri_to_anonymize)
         return uri if File.exist?(uri)
 
         require_relative "vendored_uri"
-        uri = Bundler::URI(uri)
+        uri = Gem::URI(uri)
       end
 
       if uri.userinfo
         # oauth authentication
-        if uri.password == "x-oauth-basic" || uri.password == "x"
+        if uri.password == "x-oauth-basic" || uri.password == "x" || uri.password.nil?
           # URI as string does not display with password if no user is set
           oauth_designation = uri.password
           uri.user = oauth_designation
@@ -25,7 +25,7 @@ def credential_filtered_uri(uri_to_anonymize)
       end
       return uri.to_s if uri_to_anonymize.is_a?(String)
       uri
-    rescue Bundler::URI::InvalidURIError # uri is not canonical uri scheme
+    rescue Gem::URI::InvalidURIError # uri is not canonical uri scheme
       uri
     end
 
diff --git a/lib/bundler/vendor/connection_pool/lib/connection_pool.rb b/lib/bundler/vendor/connection_pool/lib/connection_pool.rb
index 455319efe31304..cb4485e463b52e 100644
--- a/lib/bundler/vendor/connection_pool/lib/connection_pool.rb
+++ b/lib/bundler/vendor/connection_pool/lib/connection_pool.rb
@@ -1,4 +1,4 @@
-require "timeout"
+require_relative "../../../vendored_timeout"
 require_relative "connection_pool/version"
 
 class Bundler::ConnectionPool
@@ -6,7 +6,7 @@ class Error < ::RuntimeError; end
 
   class PoolShuttingDownError < ::Bundler::ConnectionPool::Error; end
 
-  class TimeoutError < ::Timeout::Error; end
+  class TimeoutError < ::Gem::Timeout::Error; end
 end
 
 # Generic connection pool class for sharing a limited number of objects or network connections
@@ -36,14 +36,57 @@ class TimeoutError < ::Timeout::Error; end
 # Accepts the following options:
 # - :size - number of connections to pool, defaults to 5
 # - :timeout - amount of time to wait for a connection if none currently available, defaults to 5 seconds
+# - :auto_reload_after_fork - automatically drop all connections after fork, defaults to true
 #
 class Bundler::ConnectionPool
-  DEFAULTS = {size: 5, timeout: 5}
+  DEFAULTS = {size: 5, timeout: 5, auto_reload_after_fork: true}
 
   def self.wrap(options, &block)
     Wrapper.new(options, &block)
   end
 
+  if Process.respond_to?(:fork)
+    INSTANCES = ObjectSpace::WeakMap.new
+    private_constant :INSTANCES
+
+    def self.after_fork
+      INSTANCES.values.each do |pool|
+        next unless pool.auto_reload_after_fork
+
+        # We're on after fork, so we know all other threads are dead.
+        # All we need to do is to ensure the main thread doesn't have a
+        # checked out connection
+        pool.checkin(force: true)
+        pool.reload do |connection|
+          # Unfortunately we don't know what method to call to close the connection,
+          # so we try the most common one.
+          connection.close if connection.respond_to?(:close)
+        end
+      end
+      nil
+    end
+
+    if ::Process.respond_to?(:_fork) # MRI 3.1+
+      module ForkTracker
+        def _fork
+          pid = super
+          if pid == 0
+            Bundler::ConnectionPool.after_fork
+          end
+          pid
+        end
+      end
+      Process.singleton_class.prepend(ForkTracker)
+    end
+  else
+    INSTANCES = nil
+    private_constant :INSTANCES
+
+    def self.after_fork
+      # noop
+    end
+  end
+
   def initialize(options = {}, &block)
     raise ArgumentError, "Connection pool requires a block" unless block
 
@@ -51,10 +94,12 @@ def initialize(options = {}, &block)
 
     @size = Integer(options.fetch(:size))
     @timeout = options.fetch(:timeout)
+    @auto_reload_after_fork = options.fetch(:auto_reload_after_fork)
 
     @available = TimedStack.new(@size, &block)
     @key = :"pool-#{@available.object_id}"
     @key_count = :"pool-#{@available.object_id}-count"
+    INSTANCES[self] = self if INSTANCES
   end
 
   def with(options = {})
@@ -81,16 +126,16 @@ def checkout(options = {})
     end
   end
 
-  def checkin
+  def checkin(force: false)
     if ::Thread.current[@key]
-      if ::Thread.current[@key_count] == 1
+      if ::Thread.current[@key_count] == 1 || force
         @available.push(::Thread.current[@key])
         ::Thread.current[@key] = nil
         ::Thread.current[@key_count] = nil
       else
         ::Thread.current[@key_count] -= 1
       end
-    else
+    elsif !force
       raise Bundler::ConnectionPool::Error, "no connections are checked out"
     end
 
@@ -115,13 +160,26 @@ def reload(&block)
     @available.shutdown(reload: true, &block)
   end
 
+  ## Reaps idle connections that have been idle for over +idle_seconds+.
+  # +idle_seconds+ defaults to 60.
+  def reap(idle_seconds = 60, &block)
+    @available.reap(idle_seconds, &block)
+  end
+
   # Size of this connection pool
   attr_reader :size
+  # Automatically drop all connections after fork
+  attr_reader :auto_reload_after_fork
 
   # Number of pool entries available for checkout at this instant.
   def available
     @available.length
   end
+
+  # Number of pool entries created and idle in the pool.
+  def idle
+    @available.idle
+  end
 end
 
 require_relative "connection_pool/timed_stack"
diff --git a/lib/bundler/vendor/connection_pool/lib/connection_pool/timed_stack.rb b/lib/bundler/vendor/connection_pool/lib/connection_pool/timed_stack.rb
index 35d1d7cc355acd..02e4485eb29ddf 100644
--- a/lib/bundler/vendor/connection_pool/lib/connection_pool/timed_stack.rb
+++ b/lib/bundler/vendor/connection_pool/lib/connection_pool/timed_stack.rb
@@ -41,6 +41,7 @@ def initialize(size = 0, &block)
   def push(obj, options = {})
     @mutex.synchronize do
       if @shutdown_block
+        @created -= 1 unless @created == 0
         @shutdown_block.call(obj)
       else
         store_connection obj, options
@@ -98,6 +99,26 @@ def shutdown(reload: false, &block)
     end
   end
 
+  ##
+  # Reaps connections that were checked in more than +idle_seconds+ ago.
+  def reap(idle_seconds, &block)
+    raise ArgumentError, "reap must receive a block" unless block
+    raise ArgumentError, "idle_seconds must be a number" unless idle_seconds.is_a?(Numeric)
+    raise Bundler::ConnectionPool::PoolShuttingDownError if @shutdown_block
+
+    idle.times do
+      conn =
+        @mutex.synchronize do
+          raise Bundler::ConnectionPool::PoolShuttingDownError if @shutdown_block
+
+          reserve_idle_connection(idle_seconds)
+        end
+      break unless conn
+
+      block.call(conn)
+    end
+  end
+
   ##
   # Returns +true+ if there are no available connections.
 
@@ -112,6 +133,12 @@ def length
     @max - @created + @que.length
   end
 
+  ##
+  # The number of connections created and available on the stack.
+  def idle
+    @que.length
+  end
+
   private
 
   def current_time
@@ -133,7 +160,7 @@ def connection_stored?(options = nil)
   # This method must return a connection from the stack.
 
   def fetch_connection(options = nil)
-    @que.pop
+    @que.pop&.first
   end
 
   ##
@@ -144,9 +171,32 @@ def fetch_connection(options = nil)
   def shutdown_connections(options = nil)
     while connection_stored?(options)
       conn = fetch_connection(options)
+      @created -= 1 unless @created == 0
       @shutdown_block.call(conn)
     end
-    @created = 0
+  end
+
+  ##
+  # This is an extension point for TimedStack and is called with a mutex.
+  #
+  # This method returns the oldest idle connection if it has been idle for more than idle_seconds.
+  # This requires that the stack is kept in order of checked in time (oldest first).
+
+  def reserve_idle_connection(idle_seconds)
+    return unless idle_connections?(idle_seconds)
+
+    @created -= 1 unless @created == 0
+
+    @que.shift.first
+  end
+
+  ##
+  # This is an extension point for TimedStack and is called with a mutex.
+  #
+  # Returns true if the first connection in the stack has been idle for more than idle_seconds
+
+  def idle_connections?(idle_seconds)
+    connection_stored? && (current_time - @que.first.last > idle_seconds)
   end
 
   ##
@@ -155,7 +205,7 @@ def shutdown_connections(options = nil)
   # This method must return +obj+ to the stack.
 
   def store_connection(obj, options = nil)
-    @que.push obj
+    @que.push [obj, current_time]
   end
 
   ##
diff --git a/lib/bundler/vendor/connection_pool/lib/connection_pool/version.rb b/lib/bundler/vendor/connection_pool/lib/connection_pool/version.rb
index 56ebf69902f9c0..88a3714fb89529 100644
--- a/lib/bundler/vendor/connection_pool/lib/connection_pool/version.rb
+++ b/lib/bundler/vendor/connection_pool/lib/connection_pool/version.rb
@@ -1,3 +1,3 @@
 class Bundler::ConnectionPool
-  VERSION = "2.3.0"
+  VERSION = "2.5.0"
 end
diff --git a/lib/bundler/vendor/fileutils/lib/fileutils.rb b/lib/bundler/vendor/fileutils/lib/fileutils.rb
index 211311c06967bc..4d7619ddcf8a7c 100644
--- a/lib/bundler/vendor/fileutils/lib/fileutils.rb
+++ b/lib/bundler/vendor/fileutils/lib/fileutils.rb
@@ -180,7 +180,8 @@
 # - {CVE-2004-0452}[https://cve.mitre.org/cgi-bin/cvename.cgi?name=CAN-2004-0452].
 #
 module Bundler::FileUtils
-  VERSION = "1.7.0"
+  # The version number.
+  VERSION = "1.7.3"
 
   def self.private_module_function(name)   #:nodoc:
     module_function name
@@ -192,8 +193,6 @@ def self.private_module_function(name)   #:nodoc:
   #
   #   Bundler::FileUtils.pwd # => "/rdoc/fileutils"
   #
-  # Bundler::FileUtils.getwd is an alias for Bundler::FileUtils.pwd.
-  #
   # Related: Bundler::FileUtils.cd.
   #
   def pwd
@@ -235,8 +234,6 @@ def pwd
   #     cd ..
   #     cd fileutils
   #
-  # Bundler::FileUtils.chdir is an alias for Bundler::FileUtils.cd.
-  #
   # Related: Bundler::FileUtils.pwd.
   #
   def cd(dir, verbose: nil, &block) # :yield: dir
@@ -515,8 +512,6 @@ def rmdir(list, parents: nil, noop: nil, verbose: nil)
   # Raises an exception if +dest+ is the path to an existing file
   # and keyword argument +force+ is not +true+.
   #
-  # Bundler::FileUtils#link is an alias for Bundler::FileUtils#ln.
-  #
   # Related: Bundler::FileUtils.link_entry (has different options).
   #
   def ln(src, dest, force: nil, noop: nil, verbose: nil)
@@ -707,8 +702,6 @@ def cp_lr(src, dest, noop: nil, verbose: nil,
   #     ln -sf src2.txt dest2.txt
   #     ln -s srcdir3/src0.txt srcdir3/src1.txt destdir3
   #
-  # Bundler::FileUtils.symlink is an alias for Bundler::FileUtils.ln_s.
-  #
   # Related: Bundler::FileUtils.ln_sf.
   #
   def ln_s(src, dest, force: nil, relative: false, target_directory: true, noop: nil, verbose: nil)
@@ -876,8 +869,6 @@ def link_entry(src, dest, dereference_root = false, remove_destination = false)
   #
   # Raises an exception if +src+ is a directory.
   #
-  # Bundler::FileUtils.copy is an alias for Bundler::FileUtils.cp.
-  #
   # Related: {methods for copying}[rdoc-ref:FileUtils@Copying].
   #
   def cp(src, dest, preserve: nil, noop: nil, verbose: nil)
@@ -1164,8 +1155,6 @@ def copy_stream(src, dest)
   #     mv src0 dest0
   #     mv src1.txt src1 dest1
   #
-  # Bundler::FileUtils.move is an alias for Bundler::FileUtils.mv.
-  #
   def mv(src, dest, force: nil, noop: nil, verbose: nil, secure: nil)
     fu_output_message "mv#{force ? ' -f' : ''} #{[src,dest].flatten.join ' '}" if verbose
     return if noop
@@ -1223,8 +1212,6 @@ def mv(src, dest, force: nil, noop: nil, verbose: nil, secure: nil)
   #
   #     rm src0.dat src0.txt
   #
-  # Bundler::FileUtils.remove is an alias for Bundler::FileUtils.rm.
-  #
   # Related: {methods for deleting}[rdoc-ref:FileUtils@Deleting].
   #
   def rm(list, force: nil, noop: nil, verbose: nil)
@@ -1250,8 +1237,6 @@ def rm(list, force: nil, noop: nil, verbose: nil)
   #
   # See Bundler::FileUtils.rm for keyword arguments.
   #
-  # Bundler::FileUtils.safe_unlink is an alias for Bundler::FileUtils.rm_f.
-  #
   # Related: {methods for deleting}[rdoc-ref:FileUtils@Deleting].
   #
   def rm_f(list, noop: nil, verbose: nil)
@@ -1339,8 +1324,6 @@ def rm_r(list, force: nil, noop: nil, verbose: nil, secure: nil)
   #
   # See Bundler::FileUtils.rm_r for keyword arguments.
   #
-  # Bundler::FileUtils.rmtree is an alias for Bundler::FileUtils.rm_rf.
-  #
   # Related: {methods for deleting}[rdoc-ref:FileUtils@Deleting].
   #
   def rm_rf(list, noop: nil, verbose: nil, secure: nil)
@@ -1642,7 +1625,13 @@ def install(src, dest, mode: nil, owner: nil, group: nil, preserve: nil,
       st = File.stat(s)
       unless File.exist?(d) and compare_file(s, d)
         remove_file d, true
-        copy_file s, d
+        if d.end_with?('/')
+          mkdir_p d
+          copy_file s, d + File.basename(s)
+        else
+          mkdir_p File.expand_path('..', d)
+          copy_file s, d
+        end
         File.utime st.atime, st.mtime, d if preserve
         File.chmod fu_mode(mode, st), d if mode
         File.chown uid, gid, d if uid or gid
@@ -1663,7 +1652,7 @@ def user_mask(target)  #:nodoc:
       when "a"
         mask | 07777
       else
-        raise ArgumentError, "invalid `who' symbol in file mode: #{chr}"
+        raise ArgumentError, "invalid 'who' symbol in file mode: #{chr}"
       end
     end
   end
@@ -1717,7 +1706,7 @@ def symbolic_modes_to_i(mode_sym, path)  #:nodoc:
             copy_mask = user_mask(chr)
             (current_mode & copy_mask) / (copy_mask & 0111) * (user_mask & 0111)
           else
-            raise ArgumentError, "invalid `perm' symbol in file mode: #{chr}"
+            raise ArgumentError, "invalid 'perm' symbol in file mode: #{chr}"
           end
         end
 
@@ -2040,21 +2029,22 @@ def touch(list, noop: nil, verbose: nil, mtime: nil, nocreate: nil)
 
   private
 
-  module StreamUtils_
+  module StreamUtils_ # :nodoc:
+
     private
 
     case (defined?(::RbConfig) ? ::RbConfig::CONFIG['host_os'] : ::RUBY_PLATFORM)
     when /mswin|mingw/
-      def fu_windows?; true end
+      def fu_windows?; true end #:nodoc:
     else
-      def fu_windows?; false end
+      def fu_windows?; false end #:nodoc:
     end
 
     def fu_copy_stream0(src, dest, blksize = nil)   #:nodoc:
       IO.copy_stream(src, dest)
     end
 
-    def fu_stream_blksize(*streams)
+    def fu_stream_blksize(*streams) #:nodoc:
       streams.each do |s|
         next unless s.respond_to?(:stat)
         size = fu_blksize(s.stat)
@@ -2063,14 +2053,14 @@ def fu_stream_blksize(*streams)
       fu_default_blksize()
     end
 
-    def fu_blksize(st)
+    def fu_blksize(st) #:nodoc:
       s = st.blksize
       return nil unless s
       return nil if s == 0
       s
     end
 
-    def fu_default_blksize
+    def fu_default_blksize #:nodoc:
       1024
     end
   end
@@ -2515,7 +2505,7 @@ def fu_output_message(msg)   #:nodoc:
   end
   private_module_function :fu_output_message
 
-  def fu_split_path(path)
+  def fu_split_path(path) #:nodoc:
     path = File.path(path)
     list = []
     until (parent, base = File.split(path); parent == path or parent == ".")
@@ -2536,7 +2526,7 @@ def fu_relative_components_from(target, base) #:nodoc:
   end
   private_module_function :fu_relative_components_from
 
-  def fu_clean_components(*comp)
+  def fu_clean_components(*comp) #:nodoc:
     comp.shift while comp.first == "."
     return comp if comp.empty?
     clean = [comp.shift]
@@ -2555,11 +2545,11 @@ def fu_clean_components(*comp)
   private_module_function :fu_clean_components
 
   if fu_windows?
-    def fu_starting_path?(path)
+    def fu_starting_path?(path) #:nodoc:
       path&.start_with?(%r(\w:|/))
     end
   else
-    def fu_starting_path?(path)
+    def fu_starting_path?(path) #:nodoc:
       path&.start_with?("/")
     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 bd53ee757eba10..03909a298b6f05 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
@@ -1,14 +1,15 @@
-require 'net/http'
-require_relative '../../../../uri/lib/uri'
-require 'cgi' # for escaping
+require_relative '../../../../../vendored_net_http'
+require_relative '../../../../../vendored_uri'
+require 'cgi/escape'
+require 'cgi/util' unless defined?(CGI::EscapeExt)
 require_relative '../../../../connection_pool/lib/connection_pool'
 
 autoload :OpenSSL, 'openssl'
 
 ##
-# Persistent connections for Net::HTTP
+# Persistent connections for Gem::Net::HTTP
 #
-# Bundler::Persistent::Net::HTTP::Persistent maintains persistent connections across all the
+# Gem::Net::HTTP::Persistent maintains persistent connections across all the
 # servers you wish to talk to.  For each host:port you communicate with a
 # single persistent connection is created.
 #
@@ -22,34 +23,33 @@
 #
 #   require 'bundler/vendor/net-http-persistent/lib/net/http/persistent'
 #
-#   uri = Bundler::URI 'http://example.com/awesome/web/service'
+#   uri = Gem::URI 'http://example.com/awesome/web/service'
 #
-#   http = Bundler::Persistent::Net::HTTP::Persistent.new
+#   http = Gem::Net::HTTP::Persistent.new
 #
 #   # perform a GET
 #   response = http.request uri
 #
 #   # or
 #
-#   get = Net::HTTP::Get.new uri.request_uri
+#   get = Gem::Net::HTTP::Get.new uri.request_uri
 #   response = http.request get
 #
 #   # create a POST
 #   post_uri = uri + 'create'
-#   post = Net::HTTP::Post.new post_uri.path
+#   post = Gem::Net::HTTP::Post.new post_uri.path
 #   post.set_form_data 'some' => 'cool data'
 #
-#   # perform the POST, the Bundler::URI is always required
+#   # perform the POST, the Gem::URI is always required
 #   response http.request post_uri, post
 #
-# Note that for GET, HEAD and other requests that do not have a body you want
-# to use Bundler::URI#request_uri not Bundler::URI#path.  The request_uri contains the query
-# params which are sent in the body for other requests.
+# ⚠ Note that for GET, HEAD and other requests that do not have a body,
+# it uses Gem::URI#request_uri as default to send query params
 #
 # == TLS/SSL
 #
 # TLS connections are automatically created depending upon the scheme of the
-# Bundler::URI.  TLS connections are automatically verified against the default
+# Gem::URI.  TLS connections are automatically verified against the default
 # certificate store for your computer.  You can override this by changing
 # verify_mode or by specifying an alternate cert_store.
 #
@@ -60,6 +60,7 @@
 # #ca_path            :: Directory with certificate-authorities
 # #cert_store         :: An SSL certificate store
 # #ciphers            :: List of SSl ciphers allowed
+# #extra_chain_cert   :: Extra certificates to be added to the certificate chain
 # #private_key        :: The client's SSL private key
 # #reuse_ssl_sessions :: Reuse a previously opened SSL session for a new
 #                        connection
@@ -68,11 +69,13 @@
 # #verify_callback    :: For server certificate verification
 # #verify_depth       :: Depth of certificate verification
 # #verify_mode        :: How connections should be verified
+# #verify_hostname    :: Use hostname verification for server certificate
+#                        during the handshake
 #
 # == Proxies
 #
 # A proxy can be set through #proxy= or at initialization time by providing a
-# second argument to ::new.  The proxy may be the Bundler::URI of the proxy server or
+# second argument to ::new.  The proxy may be the Gem::URI of the proxy server or
 # <code>:ENV</code> which will consult environment variables.
 #
 # See #proxy= and #proxy_from_env for details.
@@ -92,7 +95,7 @@
 #
 # === Segregation
 #
-# Each Bundler::Persistent::Net::HTTP::Persistent instance has its own pool of connections.  There
+# Each Gem::Net::HTTP::Persistent instance has its own pool of connections.  There
 # is no sharing with other instances (as was true in earlier versions).
 #
 # === Idle Timeout
@@ -131,7 +134,7 @@
 #
 # === Connection Termination
 #
-# If you are done using the Bundler::Persistent::Net::HTTP::Persistent instance you may shut down
+# If you are done using the Gem::Net::HTTP::Persistent instance you may shut down
 # all the connections in the current thread with #shutdown.  This is not
 # recommended for normal use, it should only be used when it will be several
 # minutes before you make another HTTP request.
@@ -141,7 +144,7 @@
 # Ruby will automatically garbage collect and shutdown your HTTP connections
 # when the thread terminates.
 
-class Bundler::Persistent::Net::HTTP::Persistent
+class Gem::Net::HTTP::Persistent
 
   ##
   # The beginning of Time
@@ -172,12 +175,12 @@ class Bundler::Persistent::Net::HTTP::Persistent
   end
 
   ##
-  # The version of Bundler::Persistent::Net::HTTP::Persistent you are using
+  # The version of Gem::Net::HTTP::Persistent you are using
 
-  VERSION = '4.0.2'
+  VERSION = '4.0.6'
 
   ##
-  # Error class for errors raised by Bundler::Persistent::Net::HTTP::Persistent.  Various
+  # Error class for errors raised by Gem::Net::HTTP::Persistent.  Various
   # SystemCallErrors are re-raised with a human-readable message under this
   # class.
 
@@ -197,10 +200,10 @@ class Error < StandardError; end
   # NOTE:  This may not work on ruby > 1.9.
 
   def self.detect_idle_timeout uri, max = 10
-    uri = Bundler::URI uri unless Bundler::URI::Generic === uri
+    uri = Gem::URI uri unless Gem::URI::Generic === uri
     uri += '/'
 
-    req = Net::HTTP::Head.new uri.request_uri
+    req = Gem::Net::HTTP::Head.new uri.request_uri
 
     http = new 'net-http-persistent detect_idle_timeout'
 
@@ -214,7 +217,7 @@ def self.detect_idle_timeout uri, max = 10
 
         $stderr.puts "HEAD #{uri} => #{response.code}" if $DEBUG
 
-        unless Net::HTTPOK === response then
+        unless Gem::Net::HTTPOK === response then
           raise Error, "bad response code #{response.code} detecting idle timeout"
         end
 
@@ -238,7 +241,7 @@ def self.detect_idle_timeout uri, max = 10
   attr_reader :certificate
 
   ##
-  # For Net::HTTP parity
+  # For Gem::Net::HTTP parity
 
   alias cert certificate
 
@@ -266,7 +269,12 @@ def self.detect_idle_timeout uri, max = 10
   attr_reader :ciphers
 
   ##
-  # Sends debug_output to this IO via Net::HTTP#set_debug_output.
+  # Extra certificates to be added to the certificate chain
+
+  attr_reader :extra_chain_cert
+
+  ##
+  # Sends debug_output to this IO via Gem::Net::HTTP#set_debug_output.
   #
   # Never use this method in production code, it causes a serious security
   # hole.
@@ -279,7 +287,7 @@ def self.detect_idle_timeout uri, max = 10
   attr_reader :generation # :nodoc:
 
   ##
-  # Headers that are added to every request using Net::HTTP#add_field
+  # Headers that are added to every request using Gem::Net::HTTP#add_field
 
   attr_reader :headers
 
@@ -304,7 +312,7 @@ def self.detect_idle_timeout uri, max = 10
   ##
   # Number of retries to perform if a request fails.
   #
-  # See also #max_retries=, Net::HTTP#max_retries=.
+  # See also #max_retries=, Gem::Net::HTTP#max_retries=.
 
   attr_reader :max_retries
 
@@ -325,12 +333,12 @@ def self.detect_idle_timeout uri, max = 10
   attr_reader :name
 
   ##
-  # Seconds to wait until a connection is opened.  See Net::HTTP#open_timeout
+  # Seconds to wait until a connection is opened.  See Gem::Net::HTTP#open_timeout
 
   attr_accessor :open_timeout
 
   ##
-  # Headers that are added to every request using Net::HTTP#[]=
+  # Headers that are added to every request using Gem::Net::HTTP#[]=
 
   attr_reader :override_headers
 
@@ -340,7 +348,7 @@ def self.detect_idle_timeout uri, max = 10
   attr_reader :private_key
 
   ##
-  # For Net::HTTP parity
+  # For Gem::Net::HTTP parity
 
   alias key private_key
 
@@ -360,12 +368,12 @@ def self.detect_idle_timeout uri, max = 10
   attr_reader :pool # :nodoc:
 
   ##
-  # Seconds to wait until reading one block.  See Net::HTTP#read_timeout
+  # Seconds to wait until reading one block.  See Gem::Net::HTTP#read_timeout
 
   attr_accessor :read_timeout
 
   ##
-  # Seconds to wait until writing one block.  See Net::HTTP#write_timeout
+  # Seconds to wait until writing one block.  See Gem::Net::HTTP#write_timeout
 
   attr_accessor :write_timeout
 
@@ -450,18 +458,33 @@ def self.detect_idle_timeout uri, max = 10
   attr_reader :verify_mode
 
   ##
-  # Creates a new Bundler::Persistent::Net::HTTP::Persistent.
+  # HTTPS verify_hostname.
+  #
+  # If a client sets this to true and enables SNI with SSLSocket#hostname=,
+  # the hostname verification on the server certificate is performed
+  # automatically during the handshake using
+  # OpenSSL::SSL.verify_certificate_identity().
+  #
+  # You can set +verify_hostname+ as true to use hostname verification
+  # during the handshake.
+  #
+  # NOTE: This works with Ruby > 3.0.
+
+  attr_reader :verify_hostname
+
+  ##
+  # Creates a new Gem::Net::HTTP::Persistent.
   #
   # Set a +name+ for fun.  Your library name should be good enough, but this
   # otherwise has no purpose.
   #
-  # +proxy+ may be set to a Bundler::URI::HTTP or :ENV to pick up proxy options from
+  # +proxy+ may be set to a Gem::URI::HTTP or :ENV to pick up proxy options from
   # the environment.  See proxy_from_env for details.
   #
-  # In order to use a Bundler::URI for the proxy you may need to do some extra work
-  # beyond Bundler::URI parsing if the proxy requires a password:
+  # In order to use a Gem::URI for the proxy you may need to do some extra work
+  # beyond Gem::URI parsing if the proxy requires a password:
   #
-  #   proxy = Bundler::URI 'http://proxy.example'
+  #   proxy = Gem::URI 'http://proxy.example'
   #   proxy.user     = 'AzureDiamond'
   #   proxy.password = 'hunter2'
   #
@@ -492,8 +515,8 @@ def initialize name: nil, proxy: nil, pool_size: DEFAULT_POOL_SIZE
     @socket_options << [Socket::IPPROTO_TCP, Socket::TCP_NODELAY, 1] if
       Socket.const_defined? :TCP_NODELAY
 
-    @pool = Bundler::Persistent::Net::HTTP::Persistent::Pool.new size: pool_size do |http_args|
-      Bundler::Persistent::Net::HTTP::Persistent::Connection.new Net::HTTP, http_args, @ssl_generation
+    @pool = Gem::Net::HTTP::Persistent::Pool.new size: pool_size do |http_args|
+      Gem::Net::HTTP::Persistent::Connection.new Gem::Net::HTTP, http_args, @ssl_generation
     end
 
     @certificate        = nil
@@ -508,9 +531,10 @@ def initialize name: nil, proxy: nil, pool_size: DEFAULT_POOL_SIZE
     @verify_callback    = nil
     @verify_depth       = nil
     @verify_mode        = nil
+    @verify_hostname    = nil
     @cert_store         = nil
 
-    @generation         = 0 # incremented when proxy Bundler::URI changes
+    @generation         = 0 # incremented when proxy Gem::URI changes
 
     if HAVE_OPENSSL then
       @verify_mode        = OpenSSL::SSL::VERIFY_PEER
@@ -529,7 +553,7 @@ def certificate= certificate
     reconnect_ssl
   end
 
-  # For Net::HTTP parity
+  # For Gem::Net::HTTP parity
   alias cert= certificate=
 
   ##
@@ -569,6 +593,21 @@ def ciphers= ciphers
     reconnect_ssl
   end
 
+  if Gem::Net::HTTP.method_defined?(:extra_chain_cert=)
+    ##
+    # Extra certificates to be added to the certificate chain.
+    # It is only supported starting from Gem::Net::HTTP version 0.1.1
+    def extra_chain_cert= extra_chain_cert
+      @extra_chain_cert = extra_chain_cert
+
+      reconnect_ssl
+    end
+  else
+    def extra_chain_cert= _extra_chain_cert
+      raise "extra_chain_cert= is not supported by this version of Gem::Net::HTTP"
+    end
+  end
+
   ##
   # Creates a new connection for +uri+
 
@@ -587,37 +626,49 @@ def connection_for uri
 
     connection = @pool.checkout net_http_args
 
-    http = connection.http
-
-    connection.ressl @ssl_generation if
-      connection.ssl_generation != @ssl_generation
+    begin
+      http = connection.http
 
-    if not http.started? then
-      ssl   http if use_ssl
-      start http
-    elsif expired? connection then
-      reset connection
-    end
+      connection.ressl @ssl_generation if
+        connection.ssl_generation != @ssl_generation
 
-    http.keep_alive_timeout = @idle_timeout  if @idle_timeout
-    http.max_retries        = @max_retries   if http.respond_to?(:max_retries=)
-    http.read_timeout       = @read_timeout  if @read_timeout
-    http.write_timeout      = @write_timeout if
-      @write_timeout && http.respond_to?(:write_timeout=)
+      if not http.started? then
+        ssl   http if use_ssl
+        start http
+      elsif expired? connection then
+        reset connection
+      end
 
-    return yield connection
-  rescue Errno::ECONNREFUSED
-    address = http.proxy_address || http.address
-    port    = http.proxy_port    || http.port
+      http.keep_alive_timeout = @idle_timeout  if @idle_timeout
+      http.max_retries        = @max_retries   if http.respond_to?(:max_retries=)
+      http.read_timeout       = @read_timeout  if @read_timeout
+      http.write_timeout      = @write_timeout if
+        @write_timeout && http.respond_to?(:write_timeout=)
+
+      return yield connection
+    rescue Errno::ECONNREFUSED
+      if http.proxy?
+        address = http.proxy_address
+        port    = http.proxy_port
+      else
+        address = http.address
+        port    = http.port
+      end
 
-    raise Error, "connection refused: #{address}:#{port}"
-  rescue Errno::EHOSTDOWN
-    address = http.proxy_address || http.address
-    port    = http.proxy_port    || http.port
+      raise Error, "connection refused: #{address}:#{port}"
+    rescue Errno::EHOSTDOWN
+      if http.proxy?
+        address = http.proxy_address
+        port    = http.proxy_port
+      else
+        address = http.address
+        port    = http.port
+      end
 
-    raise Error, "host down: #{address}:#{port}"
-  ensure
-    @pool.checkin net_http_args
+      raise Error, "host down: #{address}:#{port}"
+    ensure
+      @pool.checkin net_http_args
+    end
   end
 
   ##
@@ -648,7 +699,7 @@ def expired? connection
   end
 
   ##
-  # Starts the Net::HTTP +connection+
+  # Starts the Gem::Net::HTTP +connection+
 
   def start http
     http.set_debug_output @debug_output if @debug_output
@@ -666,7 +717,7 @@ def start http
   end
 
   ##
-  # Finishes the Net::HTTP +connection+
+  # Finishes the Gem::Net::HTTP +connection+
 
   def finish connection
     connection.finish
@@ -716,16 +767,16 @@ def private_key= key
     reconnect_ssl
   end
 
-  # For Net::HTTP parity
+  # For Gem::Net::HTTP parity
   alias key= private_key=
 
   ##
-  # Sets the proxy server.  The +proxy+ may be the Bundler::URI of the proxy server,
+  # Sets the proxy server.  The +proxy+ may be the Gem::URI of the proxy server,
   # the symbol +:ENV+ which will read the proxy from the environment or nil to
   # disable use of a proxy.  See #proxy_from_env for details on setting the
   # proxy from the environment.
   #
-  # If the proxy Bundler::URI is set after requests have been made, the next request
+  # If the proxy Gem::URI is set after requests have been made, the next request
   # will shut-down and re-open all connections.
   #
   # The +no_proxy+ query parameter can be used to specify hosts which shouldn't
@@ -736,9 +787,9 @@ def private_key= key
   def proxy= proxy
     @proxy_uri = case proxy
                  when :ENV      then proxy_from_env
-                 when Bundler::URI::HTTP then proxy
+                 when Gem::URI::HTTP then proxy
                  when nil       then # ignore
-                 else raise ArgumentError, 'proxy must be :ENV or a Bundler::URI::HTTP'
+                 else raise ArgumentError, 'proxy must be :ENV or a Gem::URI::HTTP'
                  end
 
     @no_proxy.clear
@@ -754,7 +805,7 @@ def proxy= proxy
       @proxy_connection_id = [nil, *@proxy_args].join ':'
 
       if @proxy_uri.query then
-        @no_proxy = CGI.parse(@proxy_uri.query)['no_proxy'].join(',').downcase.split(',').map { |x| x.strip }.reject { |x| x.empty? }
+        @no_proxy = Gem::URI.decode_www_form(@proxy_uri.query).filter_map { |k, v| v if k == 'no_proxy' }.join(',').downcase.split(',').map { |x| x.strip }.reject { |x| x.empty? }
       end
     end
 
@@ -763,13 +814,13 @@ def proxy= proxy
   end
 
   ##
-  # Creates a Bundler::URI for an HTTP proxy server from ENV variables.
+  # Creates a Gem::URI for an HTTP proxy server from ENV variables.
   #
   # If +HTTP_PROXY+ is set a proxy will be returned.
   #
-  # If +HTTP_PROXY_USER+ or +HTTP_PROXY_PASS+ are set the Bundler::URI is given the
+  # If +HTTP_PROXY_USER+ or +HTTP_PROXY_PASS+ are set the Gem::URI is given the
   # indicated user and password unless HTTP_PROXY contains either of these in
-  # the Bundler::URI.
+  # the Gem::URI.
   #
   # The +NO_PROXY+ ENV variable can be used to specify hosts which shouldn't
   # be reached via proxy; if set it should be a comma separated list of
@@ -785,7 +836,7 @@ def proxy_from_env
 
     return nil if env_proxy.nil? or env_proxy.empty?
 
-    uri = Bundler::URI normalize_uri env_proxy
+    uri = Gem::URI normalize_uri env_proxy
 
     env_no_proxy = ENV['no_proxy'] || ENV['NO_PROXY']
 
@@ -835,7 +886,7 @@ def reconnect_ssl
   end
 
   ##
-  # Finishes then restarts the Net::HTTP +connection+
+  # Finishes then restarts the Gem::Net::HTTP +connection+
 
   def reset connection
     http = connection.http
@@ -854,16 +905,16 @@ def reset connection
   end
 
   ##
-  # Makes a request on +uri+.  If +req+ is nil a Net::HTTP::Get is performed
+  # Makes a request on +uri+.  If +req+ is nil a Gem::Net::HTTP::Get is performed
   # against +uri+.
   #
-  # If a block is passed #request behaves like Net::HTTP#request (the body of
+  # If a block is passed #request behaves like Gem::Net::HTTP#request (the body of
   # the response will not have been read).
   #
-  # +req+ must be a Net::HTTPGenericRequest subclass (see Net::HTTP for a list).
+  # +req+ must be a Gem::Net::HTTPGenericRequest subclass (see Gem::Net::HTTP for a list).
 
   def request uri, req = nil, &block
-    uri      = Bundler::URI uri
+    uri      = Gem::URI uri
     req      = request_setup req || uri
     response = nil
 
@@ -896,14 +947,14 @@ def request uri, req = nil, &block
   end
 
   ##
-  # Creates a GET request if +req_or_uri+ is a Bundler::URI and adds headers to the
+  # Creates a GET request if +req_or_uri+ is a Gem::URI and adds headers to the
   # request.
   #
   # Returns the request.
 
   def request_setup req_or_uri # :nodoc:
     req = if req_or_uri.respond_to? 'request_uri' then
-            Net::HTTP::Get.new req_or_uri.request_uri
+            Gem::Net::HTTP::Get.new req_or_uri.request_uri
           else
             req_or_uri
           end
@@ -925,7 +976,8 @@ def request_setup req_or_uri # :nodoc:
   end
 
   ##
-  # Shuts down all connections
+  # Shuts down all connections. Attempting to checkout a connection after
+  # shutdown will raise an error.
   #
   # *NOTE*: Calling shutdown for can be dangerous!
   #
@@ -936,6 +988,17 @@ def shutdown
     @pool.shutdown { |http| http.finish }
   end
 
+  ##
+  # Discard all existing connections. Subsequent checkouts will create
+  # new connections as needed.
+  #
+  # If any thread is still using a connection it may cause an error!  Call
+  # #reload when you are completely done making requests!
+
+  def reload
+    @pool.reload { |http| http.finish }
+  end
+
   ##
   # Enables SSL on +connection+
 
@@ -948,8 +1011,10 @@ def ssl connection
     connection.min_version = @min_version if @min_version
     connection.max_version = @max_version if @max_version
 
-    connection.verify_depth = @verify_depth
-    connection.verify_mode  = @verify_mode
+    connection.verify_depth    = @verify_depth
+    connection.verify_mode     = @verify_mode
+    connection.verify_hostname = @verify_hostname if
+      @verify_hostname != nil && connection.respond_to?(:verify_hostname=)
 
     if OpenSSL::SSL::VERIFY_PEER == OpenSSL::SSL::VERIFY_NONE and
        not Object.const_defined?(:I_KNOW_THAT_OPENSSL_VERIFY_PEER_EQUALS_VERIFY_NONE_IS_WRONG) then
@@ -991,6 +1056,10 @@ def ssl connection
       connection.key  = @private_key
     end
 
+    if defined?(@extra_chain_cert) and @extra_chain_cert
+      connection.extra_chain_cert = @extra_chain_cert
+    end
+
     connection.cert_store = if @cert_store then
                               @cert_store
                             else
@@ -1058,6 +1127,15 @@ def verify_mode= verify_mode
     reconnect_ssl
   end
 
+  ##
+  # Sets the HTTPS verify_hostname.
+
+  def verify_hostname= verify_hostname
+    @verify_hostname = verify_hostname
+
+    reconnect_ssl
+  end
+
   ##
   # SSL verification callback.
 
@@ -1070,4 +1148,3 @@ def verify_callback= callback
 
 require_relative 'persistent/connection'
 require_relative 'persistent/pool'
-
diff --git a/lib/bundler/vendor/net-http-persistent/lib/net/http/persistent/connection.rb b/lib/bundler/vendor/net-http-persistent/lib/net/http/persistent/connection.rb
index 40f61aacea4af4..8b9ab5cc785b77 100644
--- a/lib/bundler/vendor/net-http-persistent/lib/net/http/persistent/connection.rb
+++ b/lib/bundler/vendor/net-http-persistent/lib/net/http/persistent/connection.rb
@@ -1,8 +1,8 @@
 ##
-# A Net::HTTP connection wrapper that holds extra information for managing the
+# A Gem::Net::HTTP connection wrapper that holds extra information for managing the
 # connection's lifetime.
 
-class Bundler::Persistent::Net::HTTP::Persistent::Connection # :nodoc:
+class Gem::Net::HTTP::Persistent::Connection # :nodoc:
 
   attr_accessor :http
 
@@ -28,7 +28,7 @@ def finish
   alias_method :close, :finish
 
   def reset
-    @last_use = Bundler::Persistent::Net::HTTP::Persistent::EPOCH
+    @last_use = Gem::Net::HTTP::Persistent::EPOCH
     @requests = 0
   end
 
diff --git a/lib/bundler/vendor/net-http-persistent/lib/net/http/persistent/pool.rb b/lib/bundler/vendor/net-http-persistent/lib/net/http/persistent/pool.rb
index 736027863cd6b1..04a1e754bfdd0d 100644
--- a/lib/bundler/vendor/net-http-persistent/lib/net/http/persistent/pool.rb
+++ b/lib/bundler/vendor/net-http-persistent/lib/net/http/persistent/pool.rb
@@ -1,4 +1,4 @@
-class Bundler::Persistent::Net::HTTP::Persistent::Pool < Bundler::ConnectionPool # :nodoc:
+class Gem::Net::HTTP::Persistent::Pool < Bundler::ConnectionPool # :nodoc:
 
   attr_reader :available # :nodoc:
   attr_reader :key # :nodoc:
@@ -6,7 +6,7 @@ class Bundler::Persistent::Net::HTTP::Persistent::Pool < Bundler::ConnectionPool
   def initialize(options = {}, &block)
     super
 
-    @available = Bundler::Persistent::Net::HTTP::Persistent::TimedStackMulti.new(@size, &block)
+    @available = Gem::Net::HTTP::Persistent::TimedStackMulti.new(@size, &block)
     @key = "current-#{@available.object_id}"
   end
 
diff --git a/lib/bundler/vendor/net-http-persistent/lib/net/http/persistent/timed_stack_multi.rb b/lib/bundler/vendor/net-http-persistent/lib/net/http/persistent/timed_stack_multi.rb
index 2da881c55421a3..034fbe39b811f8 100644
--- a/lib/bundler/vendor/net-http-persistent/lib/net/http/persistent/timed_stack_multi.rb
+++ b/lib/bundler/vendor/net-http-persistent/lib/net/http/persistent/timed_stack_multi.rb
@@ -1,4 +1,4 @@
-class Bundler::Persistent::Net::HTTP::Persistent::TimedStackMulti < Bundler::ConnectionPool::TimedStack # :nodoc:
+class Gem::Net::HTTP::Persistent::TimedStackMulti < Bundler::ConnectionPool::TimedStack # :nodoc:
 
   ##
   # Returns a new hash that has arrays for keys
@@ -63,7 +63,8 @@ def try_create options = {} # :nodoc:
     if @created >= @max && @enqueued >= 1
       oldest, = @lru.first
       @lru.delete oldest
-      @ques[oldest].pop
+      connection = @ques[oldest].pop
+      connection.close if connection.respond_to?(:close)
 
       @created -= 1
     end
diff --git a/lib/bundler/vendor/pub_grub/lib/pub_grub/basic_package_source.rb b/lib/bundler/vendor/pub_grub/lib/pub_grub/basic_package_source.rb
index dce20d37ad9eae..491151ec0b7e7b 100644
--- a/lib/bundler/vendor/pub_grub/lib/pub_grub/basic_package_source.rb
+++ b/lib/bundler/vendor/pub_grub/lib/pub_grub/basic_package_source.rb
@@ -79,29 +79,17 @@ def root_dependencies
       dependencies_for(@root_package, @root_version)
     end
 
-    # Override me (maybe)
-    #
-    # If not overridden, the order returned by all_versions_for will be used
-    #
-    # Returns: Array of versions in preferred order
-    def sort_versions_by_preferred(package, sorted_versions)
-      indexes = @version_indexes[package]
-      sorted_versions.sort_by { |version| indexes[version] }
-    end
-
     def initialize
       @root_package = Package.root
       @root_version = Package.root_version
 
-      @cached_versions = Hash.new do |h,k|
+      @sorted_versions = Hash.new do |h,k|
         if k == @root_package
           h[k] = [@root_version]
         else
-          h[k] = all_versions_for(k)
+          h[k] = all_versions_for(k).sort
         end
       end
-      @sorted_versions = Hash.new { |h,k| h[k] = @cached_versions[k].sort }
-      @version_indexes = Hash.new { |h,k| h[k] = @cached_versions[k].each.with_index.to_h }
 
       @cached_dependencies = Hash.new do |packages, package|
         if package == @root_package
@@ -117,15 +105,7 @@ def initialize
     end
 
     def versions_for(package, range=VersionRange.any)
-      versions = range.select_versions(@sorted_versions[package])
-
-      # Conditional avoids (among other things) calling
-      # sort_versions_by_preferred with the root package
-      if versions.size > 1
-        sort_versions_by_preferred(package, versions)
-      else
-        versions
-      end
+      range.select_versions(@sorted_versions[package])
     end
 
     def no_versions_incompatibility_for(_package, unsatisfied_term)
@@ -164,7 +144,7 @@ def incompatibilities_for(package, version)
             sorted_versions[high]
           end
 
-        range = VersionRange.new(min: low, max: high, include_min: true)
+        range = VersionRange.new(min: low, max: high, include_min: !low.nil?)
 
         self_constraint = VersionConstraint.new(package, range: range)
 
diff --git a/lib/bundler/vendor/pub_grub/lib/pub_grub/static_package_source.rb b/lib/bundler/vendor/pub_grub/lib/pub_grub/static_package_source.rb
index 4bf61461b269f9..36ab06254d6e91 100644
--- a/lib/bundler/vendor/pub_grub/lib/pub_grub/static_package_source.rb
+++ b/lib/bundler/vendor/pub_grub/lib/pub_grub/static_package_source.rb
@@ -1,4 +1,5 @@
 require_relative 'package'
+require_relative 'rubygems'
 require_relative 'version_constraint'
 require_relative 'incompatibility'
 require_relative 'basic_package_source'
diff --git a/lib/bundler/vendor/pub_grub/lib/pub_grub/strategy.rb b/lib/bundler/vendor/pub_grub/lib/pub_grub/strategy.rb
new file mode 100644
index 00000000000000..6955655ba48240
--- /dev/null
+++ b/lib/bundler/vendor/pub_grub/lib/pub_grub/strategy.rb
@@ -0,0 +1,42 @@
+module Bundler::PubGrub
+  class Strategy
+    def initialize(source)
+      @source = source
+
+      @root_package = Package.root
+      @root_version = Package.root_version
+
+      @version_indexes = Hash.new do |h,k|
+        if k == @root_package
+          h[k] = { @root_version => 0 }
+        else
+          h[k] = @source.all_versions_for(k).each.with_index.to_h
+        end
+      end
+    end
+
+    def next_package_and_version(unsatisfied)
+      package, range = next_term_to_try_from(unsatisfied)
+
+      [package, most_preferred_version_of(package, range)]
+    end
+
+    private
+
+    def most_preferred_version_of(package, range)
+      versions = @source.versions_for(package, range)
+
+      indexes = @version_indexes[package]
+      versions.min_by { |version| indexes[version] }
+    end
+
+    def next_term_to_try_from(unsatisfied)
+      unsatisfied.min_by do |package, range|
+        matching_versions = @source.versions_for(package, range)
+        higher_versions = @source.versions_for(package, range.upper_invert)
+
+        [matching_versions.count <= 1 ? 0 : 1, higher_versions.count]
+      end
+    end
+  end
+end
diff --git a/lib/bundler/vendor/pub_grub/lib/pub_grub/version_range.rb b/lib/bundler/vendor/pub_grub/lib/pub_grub/version_range.rb
index 8d73c3f7b5d58b..49dcf716a37cdf 100644
--- a/lib/bundler/vendor/pub_grub/lib/pub_grub/version_range.rb
+++ b/lib/bundler/vendor/pub_grub/lib/pub_grub/version_range.rb
@@ -76,6 +76,9 @@ def self.any
     end
 
     def initialize(min: nil, max: nil, include_min: false, include_max: false, name: nil)
+      raise ArgumentError, "Ranges without a lower bound cannot have include_min == true" if !min && include_min == true
+      raise ArgumentError, "Ranges without an upper bound cannot have include_max == true" if !max && include_max == true
+
       @min = min
       @max = max
       @include_min = include_min
@@ -311,10 +314,19 @@ def union(other)
 
     def contiguous_to?(other)
       return false if other.empty?
+      return true if any?
+
+      intersects?(other) || contiguous_below?(other) || contiguous_above?(other)
+    end
+
+    def contiguous_below?(other)
+      return false if !max || !other.min
+
+      max == other.min && (include_max || other.include_min)
+    end
 
-      intersects?(other) ||
-        (min == other.max && (include_min || other.include_max)) ||
-        (max == other.min && (include_max || other.include_min))
+    def contiguous_above?(other)
+      other.contiguous_below?(self)
     end
 
     def allows_all?(other)
@@ -375,15 +387,15 @@ def upper_invert
     def invert
       return self.class.empty if any?
 
-      low = VersionRange.new(max: min, include_max: !include_min)
-      high = VersionRange.new(min: max, include_min: !include_max)
+      low = -> { VersionRange.new(max: min, include_max: !include_min) }
+      high = -> { VersionRange.new(min: max, include_min: !include_max) }
 
       if !min
-        high
+        high.call
       elsif !max
-        low
+        low.call
       else
-        low.union(high)
+        low.call.union(high.call)
       end
     end
 
diff --git a/lib/bundler/vendor/pub_grub/lib/pub_grub/version_solver.rb b/lib/bundler/vendor/pub_grub/lib/pub_grub/version_solver.rb
index 4caf6b355bf75b..000923e99a1b76 100644
--- a/lib/bundler/vendor/pub_grub/lib/pub_grub/version_solver.rb
+++ b/lib/bundler/vendor/pub_grub/lib/pub_grub/version_solver.rb
@@ -2,17 +2,20 @@
 require_relative 'term'
 require_relative 'incompatibility'
 require_relative 'solve_failure'
+require_relative 'strategy'
 
 module Bundler::PubGrub
   class VersionSolver
     attr_reader :logger
     attr_reader :source
     attr_reader :solution
+    attr_reader :strategy
 
-    def initialize(source:, root: Package.root, logger: Bundler::PubGrub.logger)
+    def initialize(source:, root: Package.root, strategy: Strategy.new(source), logger: Bundler::PubGrub.logger)
       @logger = logger
 
       @source = source
+      @strategy = strategy
 
       # { package => [incompatibility, ...]}
       @incompatibilities = Hash.new do |h, k|
@@ -36,26 +39,25 @@ def solved?
 
     # Returns true if there is more work to be done, false otherwise
     def work
-      return false if solved?
-
-      next_package = choose_package_version
-      propagate(next_package)
-
-      if solved?
+      unsatisfied_terms = solution.unsatisfied
+      if unsatisfied_terms.empty?
         logger.info { "Solution found after #{solution.attempted_solutions} attempts:" }
         solution.decisions.each do |package, version|
           next if Package.root?(package)
           logger.info { "* #{package} #{version}" }
         end
 
-        false
-      else
-        true
+        return false
       end
+
+      next_package = choose_package_version_from(unsatisfied_terms)
+      propagate(next_package)
+
+      true
     end
 
     def solve
-      work until solved?
+      while work; end
 
       solution.decisions
     end
@@ -105,29 +107,15 @@ def propagate_incompatibility(incompatibility)
       unsatisfied.package
     end
 
-    def next_package_to_try
-      solution.unsatisfied.min_by do |term|
-        package = term.package
-        range = term.constraint.range
-        matching_versions = source.versions_for(package, range)
-        higher_versions = source.versions_for(package, range.upper_invert)
+    def choose_package_version_from(unsatisfied_terms)
+      remaining = unsatisfied_terms.map { |t| [t.package, t.constraint.range] }.to_h
 
-        [matching_versions.count <= 1 ? 0 : 1, higher_versions.count]
-      end.package
-    end
-
-    def choose_package_version
-      if solution.unsatisfied.empty?
-        logger.info "No packages unsatisfied. Solving complete!"
-        return nil
-      end
+      package, version = strategy.next_package_and_version(remaining)
 
-      package = next_package_to_try
-      unsatisfied_term = solution.unsatisfied.find { |t| t.package == package }
-      version = source.versions_for(package, unsatisfied_term.constraint.range).first
       logger.debug { "attempting #{package} #{version}" }
 
       if version.nil?
+        unsatisfied_term = unsatisfied_terms.find { |t| t.package == package }
         add_incompatibility source.no_versions_incompatibility_for(package, unsatisfied_term)
         return package
       end
diff --git a/lib/bundler/vendor/securerandom/lib/securerandom.rb b/lib/bundler/vendor/securerandom/lib/securerandom.rb
new file mode 100644
index 00000000000000..01b7fa15a6fe6f
--- /dev/null
+++ b/lib/bundler/vendor/securerandom/lib/securerandom.rb
@@ -0,0 +1,102 @@
+# -*- coding: us-ascii -*-
+# frozen_string_literal: true
+
+require 'random/formatter'
+
+# == Secure random number generator interface.
+#
+# This library is an interface to secure random number generators which are
+# suitable for generating session keys in HTTP cookies, etc.
+#
+# You can use this library in your application by requiring it:
+#
+#   require 'bundler/vendor/securerandom/lib/securerandom'
+#
+# It supports the following secure random number generators:
+#
+# * openssl
+# * /dev/urandom
+# * Win32
+#
+# Bundler::SecureRandom is extended by the Random::Formatter module which
+# defines the following methods:
+#
+# * alphanumeric
+# * base64
+# * choose
+# * gen_random
+# * hex
+# * rand
+# * random_bytes
+# * random_number
+# * urlsafe_base64
+# * uuid
+#
+# These methods are usable as class methods of Bundler::SecureRandom such as
+# +Bundler::SecureRandom.hex+.
+#
+# If a secure random number generator is not available,
+# +NotImplementedError+ is raised.
+
+module Bundler::SecureRandom
+
+  # The version
+  VERSION = "0.4.1"
+
+  class << self
+    # Returns a random binary string containing +size+ bytes.
+    #
+    # See Random.bytes
+    def bytes(n)
+      return gen_random(n)
+    end
+
+    # Compatibility methods for Ruby 3.2, we can remove this after dropping to support Ruby 3.2
+    def alphanumeric(n = nil, chars: ALPHANUMERIC)
+      n = 16 if n.nil?
+      choose(chars, n)
+    end if RUBY_VERSION < '3.3'
+
+    private
+
+    # :stopdoc:
+
+    # Implementation using OpenSSL
+    def gen_random_openssl(n)
+      return OpenSSL::Random.random_bytes(n)
+    end
+
+    # Implementation using system random device
+    def gen_random_urandom(n)
+      ret = Random.urandom(n)
+      unless ret
+        raise NotImplementedError, "No random device"
+      end
+      unless ret.length == n
+        raise NotImplementedError, "Unexpected partial read from random device: only #{ret.length} for #{n} bytes"
+      end
+      ret
+    end
+
+    begin
+      # Check if Random.urandom is available
+      Random.urandom(1)
+      alias gen_random gen_random_urandom
+    rescue RuntimeError
+      begin
+        require 'openssl'
+      rescue NoMethodError
+        raise NotImplementedError, "No random device"
+      else
+        alias gen_random gen_random_openssl
+      end
+    end
+
+    # :startdoc:
+
+    # Generate random data bytes for Random::Formatter
+    public :gen_random
+  end
+end
+
+Bundler::SecureRandom.extend(Random::Formatter)
diff --git a/lib/bundler/vendor/thor/lib/thor.rb b/lib/bundler/vendor/thor/lib/thor.rb
index 83ebe255933bb2..bfd9f5c91412ab 100644
--- a/lib/bundler/vendor/thor/lib/thor.rb
+++ b/lib/bundler/vendor/thor/lib/thor.rb
@@ -65,8 +65,15 @@ def desc(usage, description, options = {})
 
     # Defines the long description of the next command.
     #
+    # Long description is by default indented, line-wrapped and repeated whitespace merged.
+    # In order to print long description verbatim, with indentation and spacing exactly
+    # as found in the code, use the +wrap+ option
+    #
+    #   long_desc 'your very long description', wrap: false
+    #
     # ==== Parameters
     # long description<String>
+    # options<Hash>
     #
     def long_desc(long_description, options = {})
       if options[:for]
@@ -74,6 +81,7 @@ def long_desc(long_description, options = {})
         command.long_description = long_description if long_description
       else
         @long_desc = long_description
+        @long_desc_wrap = options[:wrap] != false
       end
     end
 
@@ -133,7 +141,7 @@ def method_options(options = nil)
     #     # magic
     #   end
     #
-    #   method_option :foo => :bar, :for => :previous_command
+    #   method_option :foo, :for => :previous_command
     #
     #   def next_command
     #     # magic
@@ -153,6 +161,9 @@ def method_options(options = nil)
     # :hide     - If you want to hide this option from the help.
     #
     def method_option(name, options = {})
+      unless [ Symbol, String ].any? { |klass| name.is_a?(klass) }
+        raise ArgumentError, "Expected a Symbol or String, got #{name.inspect}"
+      end
       scope = if options[:for]
         find_and_refresh_command(options[:for]).options
       else
@@ -163,6 +174,81 @@ def method_option(name, options = {})
     end
     alias_method :option, :method_option
 
+    # Adds and declares option group for exclusive options in the
+    # block and arguments. You can declare options as the outside of the block.
+    #
+    # If :for is given as option, it allows you to change the options from
+    # a previous defined command.
+    #
+    # ==== Parameters
+    # Array[Bundler::Thor::Option.name]
+    # options<Hash>:: :for is applied for previous defined command.
+    #
+    # ==== Examples
+    #
+    #   exclusive do
+    #     option :one
+    #     option :two
+    #   end
+    #
+    # Or
+    #
+    #   option :one
+    #   option :two
+    #   exclusive :one, :two
+    #
+    # If you give "--one" and "--two" at the same time ExclusiveArgumentsError
+    # will be raised.
+    #
+    def method_exclusive(*args, &block)
+      register_options_relation_for(:method_options,
+                                    :method_exclusive_option_names, *args, &block)
+    end
+    alias_method :exclusive, :method_exclusive
+
+    # Adds and declares option group for required at least one of options in the
+    # block of arguments. You can declare options as the outside of the block.
+    #
+    # If :for is given as option, it allows you to change the options from
+    # a previous defined command.
+    #
+    # ==== Parameters
+    # Array[Bundler::Thor::Option.name]
+    # options<Hash>:: :for is applied for previous defined command.
+    #
+    # ==== Examples
+    #
+    #   at_least_one do
+    #     option :one
+    #     option :two
+    #   end
+    #
+    # Or
+    #
+    #   option :one
+    #   option :two
+    #   at_least_one :one, :two
+    #
+    # If you do not give "--one" and "--two" AtLeastOneRequiredArgumentError
+    # will be raised.
+    #
+    # You can use at_least_one and exclusive at the same time.
+    #
+    #    exclusive do
+    #      at_least_one do
+    #        option :one
+    #        option :two
+    #      end
+    #    end
+    #
+    # Then it is required either only one of "--one" or "--two".
+    #
+    def method_at_least_one(*args, &block)
+      register_options_relation_for(:method_options,
+                                    :method_at_least_one_option_names, *args, &block)
+    end
+    alias_method :at_least_one, :method_at_least_one
+
     # Prints help information for the given command.
     #
     # ==== Parameters
@@ -178,9 +264,16 @@ def command_help(shell, command_name)
       shell.say "  #{banner(command).split("\n").join("\n  ")}"
       shell.say
       class_options_help(shell, nil => command.options.values)
+      print_exclusive_options(shell, command)
+      print_at_least_one_required_options(shell, command)
+
       if command.long_description
         shell.say "Description:"
-        shell.print_wrapped(command.long_description, :indent => 2)
+        if command.wrap_long_description
+          shell.print_wrapped(command.long_description, indent: 2)
+        else
+          shell.say command.long_description
+        end
       else
         shell.say command.description
       end
@@ -197,7 +290,7 @@ def help(shell, subcommand = false)
       Bundler::Thor::Util.thor_classes_in(self).each do |klass|
         list += klass.printable_commands(false)
       end
-      list.sort! { |a, b| a[0] <=> b[0] }
+      sort_commands!(list)
 
       if defined?(@package_name) && @package_name
         shell.say "#{@package_name} commands:"
@@ -205,9 +298,11 @@ def help(shell, subcommand = false)
         shell.say "Commands:"
       end
 
-      shell.print_table(list, :indent => 2, :truncate => true)
+      shell.print_table(list, indent: 2, truncate: true)
       shell.say
       class_options_help(shell)
+      print_exclusive_options(shell)
+      print_at_least_one_required_options(shell)
     end
 
     # Returns commands ready to be printed.
@@ -238,7 +333,7 @@ def subcommand(subcommand, subcommand_class)
 
       define_method(subcommand) do |*args|
         args, opts = Bundler::Thor::Arguments.split(args)
-        invoke_args = [args, opts, {:invoked_via_subcommand => true, :class_options => options}]
+        invoke_args = [args, opts, {invoked_via_subcommand: true, class_options: options}]
         invoke_args.unshift "help" if opts.delete("--help") || opts.delete("-h")
         invoke subcommand_class, *invoke_args
       end
@@ -344,8 +439,37 @@ def disable_required_check?(command) #:nodoc:
       command && disable_required_check.include?(command.name.to_sym)
     end
 
+    # Checks if a specified command exists.
+    #
+    # ==== Parameters
+    # command_name<String>:: The name of the command to check for existence.
+    #
+    # ==== Returns
+    # Boolean:: +true+ if the command exists, +false+ otherwise.
+    def command_exists?(command_name) #:nodoc:
+      commands.keys.include?(normalize_command_name(command_name))
+    end
+
   protected
 
+    # Returns this class exclusive options array set.
+    #
+    # ==== Returns
+    # Array[Array[Bundler::Thor::Option.name]]
+    #
+    def method_exclusive_option_names #:nodoc:
+      @method_exclusive_option_names ||= []
+    end
+
+    # Returns this class at least one of required options array set.
+    #
+    # ==== Returns
+    # Array[Array[Bundler::Thor::Option.name]]
+    #
+    def method_at_least_one_option_names #:nodoc:
+      @method_at_least_one_option_names ||= []
+    end
+
     def stop_on_unknown_option #:nodoc:
       @stop_on_unknown_option ||= []
     end
@@ -355,6 +479,28 @@ def disable_required_check #:nodoc:
       @disable_required_check ||= [:help]
     end
 
+    def print_exclusive_options(shell, command = nil) # :nodoc:
+      opts = []
+      opts  = command.method_exclusive_option_names unless command.nil?
+      opts += class_exclusive_option_names
+      unless opts.empty?
+        shell.say "Exclusive Options:"
+        shell.print_table(opts.map{ |ex| ex.map{ |e| "--#{e}"}}, indent: 2 )
+        shell.say
+      end
+    end
+
+    def print_at_least_one_required_options(shell, command = nil) # :nodoc:
+      opts = []
+      opts = command.method_at_least_one_option_names unless command.nil?
+      opts += class_at_least_one_option_names
+      unless opts.empty?
+        shell.say "Required At Least One:"
+        shell.print_table(opts.map{ |ex| ex.map{ |e| "--#{e}"}}, indent: 2 )
+        shell.say
+      end
+    end
+
     # The method responsible for dispatching given the args.
     def dispatch(meth, given_args, given_opts, config) #:nodoc:
       meth ||= retrieve_command_name(given_args)
@@ -415,12 +561,16 @@ def create_command(meth) #:nodoc:
       @usage ||= nil
       @desc ||= nil
       @long_desc ||= nil
+      @long_desc_wrap ||= nil
       @hide ||= nil
 
       if @usage && @desc
         base_class = @hide ? Bundler::Thor::HiddenCommand : Bundler::Thor::Command
-        commands[meth] = base_class.new(meth, @desc, @long_desc, @usage, method_options)
-        @usage, @desc, @long_desc, @method_options, @hide = nil
+        relations = {exclusive_option_names: method_exclusive_option_names,
+          at_least_one_option_names: method_at_least_one_option_names}
+        commands[meth] = base_class.new(meth, @desc, @long_desc, @long_desc_wrap, @usage, method_options, relations)
+        @usage, @desc, @long_desc, @long_desc_wrap, @method_options, @hide = nil
+        @method_exclusive_option_names, @method_at_least_one_option_names = nil
         true
       elsif all_commands[meth] || meth == "method_missing"
         true
@@ -495,6 +645,14 @@ def help(command = nil, subcommand = true); super; end
 "
     end
     alias_method :subtask_help, :subcommand_help
+
+    # Sort the commands, lexicographically by default.
+    #
+    # Can be overridden in the subclass to change the display order of the
+    # commands.
+    def sort_commands!(list)
+      list.sort! { |a, b| a[0] <=> b[0] }
+    end
   end
 
   include Bundler::Thor::Base
diff --git a/lib/bundler/vendor/thor/lib/thor/actions.rb b/lib/bundler/vendor/thor/lib/thor/actions.rb
index a7afaf1d07026b..ca58182691d6bf 100644
--- a/lib/bundler/vendor/thor/lib/thor/actions.rb
+++ b/lib/bundler/vendor/thor/lib/thor/actions.rb
@@ -46,17 +46,17 @@ def source_paths_for_search
       # Add runtime options that help actions execution.
       #
       def add_runtime_options!
-        class_option :force, :type => :boolean, :aliases => "-f", :group => :runtime,
-                             :desc => "Overwrite files that already exist"
+        class_option :force, type: :boolean, aliases: "-f", group: :runtime,
+                             desc: "Overwrite files that already exist"
 
-        class_option :pretend, :type => :boolean, :aliases => "-p", :group => :runtime,
-                               :desc => "Run but do not make any changes"
+        class_option :pretend, type: :boolean, aliases: "-p", group: :runtime,
+                               desc: "Run but do not make any changes"
 
-        class_option :quiet, :type => :boolean, :aliases => "-q", :group => :runtime,
-                             :desc => "Suppress status output"
+        class_option :quiet, type: :boolean, aliases: "-q", group: :runtime,
+                             desc: "Suppress status output"
 
-        class_option :skip, :type => :boolean, :aliases => "-s", :group => :runtime,
-                            :desc => "Skip files that already exist"
+        class_option :skip, type: :boolean, aliases: "-s", group: :runtime,
+                            desc: "Skip files that already exist"
       end
     end
 
@@ -113,9 +113,9 @@ def destination_root=(root)
     #
     def relative_to_original_destination_root(path, remove_dot = true)
       root = @destination_stack[0]
-      if path.start_with?(root) && [File::SEPARATOR, File::ALT_SEPARATOR, nil, ''].include?(path[root.size..root.size])
+      if path.start_with?(root) && [File::SEPARATOR, File::ALT_SEPARATOR, nil, ""].include?(path[root.size..root.size])
         path = path.dup
-        path[0...root.size] = '.'
+        path[0...root.size] = "."
         remove_dot ? (path[2..-1] || "") : path
       else
         path
@@ -223,8 +223,7 @@ def apply(path, config = {})
 
       contents = if is_uri
         require "open-uri"
-        # for ruby 2.1-2.4
-        URI.send(:open, path, "Accept" => "application/x-thor-template", &:read)
+        URI.open(path, "Accept" => "application/x-thor-template", &:read)
       else
         File.open(path, &:read)
       end
@@ -285,7 +284,7 @@ def run(command, config = {})
     #
     def run_ruby_script(command, config = {})
       return unless behavior == :invoke
-      run command, config.merge(:with => Bundler::Thor::Util.ruby_command)
+      run command, config.merge(with: Bundler::Thor::Util.ruby_command)
     end
 
     # Run a thor command. A hash of options can be given and it's converted to
@@ -316,7 +315,7 @@ def thor(command, *args)
       args.push Bundler::Thor::Options.to_switches(config)
       command = args.join(" ").strip
 
-      run command, :with => :thor, :verbose => verbose, :pretend => pretend, :capture => capture
+      run command, with: :thor, verbose: verbose, pretend: pretend, capture: capture
     end
 
   protected
@@ -324,7 +323,7 @@ def thor(command, *args)
     # Allow current root to be shared between invocations.
     #
     def _shared_configuration #:nodoc:
-      super.merge!(:destination_root => destination_root)
+      super.merge!(destination_root: destination_root)
     end
 
     def _cleanup_options_and_set(options, key) #:nodoc:
diff --git a/lib/bundler/vendor/thor/lib/thor/actions/create_file.rb b/lib/bundler/vendor/thor/lib/thor/actions/create_file.rb
index 1b90e567ba0912..6724835b0119f1 100644
--- a/lib/bundler/vendor/thor/lib/thor/actions/create_file.rb
+++ b/lib/bundler/vendor/thor/lib/thor/actions/create_file.rb
@@ -43,7 +43,8 @@ def initialize(base, destination, data, config = {})
       # Boolean:: true if it is identical, false otherwise.
       #
       def identical?
-        exists? && File.binread(destination) == render
+        # binread uses ASCII-8BIT, so to avoid false negatives, the string must use the same
+        exists? && File.binread(destination) == String.new(render).force_encoding("ASCII-8BIT")
       end
 
       # Holds the content to be added to the file.
diff --git a/lib/bundler/vendor/thor/lib/thor/actions/directory.rb b/lib/bundler/vendor/thor/lib/thor/actions/directory.rb
index d37327a139b366..2f9687c0a50c77 100644
--- a/lib/bundler/vendor/thor/lib/thor/actions/directory.rb
+++ b/lib/bundler/vendor/thor/lib/thor/actions/directory.rb
@@ -58,7 +58,7 @@ class Directory < EmptyDirectory #:nodoc:
       def initialize(base, source, destination = nil, config = {}, &block)
         @source = File.expand_path(Dir[Util.escape_globs(base.find_in_source_paths(source.to_s))].first)
         @block  = block
-        super(base, destination, {:recursive => true}.merge(config))
+        super(base, destination, {recursive: true}.merge(config))
       end
 
       def invoke!
diff --git a/lib/bundler/vendor/thor/lib/thor/actions/empty_directory.rb b/lib/bundler/vendor/thor/lib/thor/actions/empty_directory.rb
index 284d92c19aeb87..c0bca785259dd5 100644
--- a/lib/bundler/vendor/thor/lib/thor/actions/empty_directory.rb
+++ b/lib/bundler/vendor/thor/lib/thor/actions/empty_directory.rb
@@ -33,7 +33,7 @@ class EmptyDirectory #:nodoc:
       #
       def initialize(base, destination, config = {})
         @base = base
-        @config = {:verbose => true}.merge(config)
+        @config = {verbose: true}.merge(config)
         self.destination = destination
       end
 
diff --git a/lib/bundler/vendor/thor/lib/thor/actions/file_manipulation.rb b/lib/bundler/vendor/thor/lib/thor/actions/file_manipulation.rb
index ffc29aa8e2f1a5..bccfbb6b85e887 100644
--- a/lib/bundler/vendor/thor/lib/thor/actions/file_manipulation.rb
+++ b/lib/bundler/vendor/thor/lib/thor/actions/file_manipulation.rb
@@ -10,7 +10,6 @@ module Actions
     # destination<String>:: the relative path to the destination root.
     # config<Hash>:: give :verbose => false to not log the status, and
     #                :mode => :preserve, to preserve the file mode from the source.
-
     #
     # ==== Examples
     #
@@ -66,12 +65,15 @@ def link_file(source, *args)
     # ==== Parameters
     # source<String>:: the address of the given content.
     # destination<String>:: the relative path to the destination root.
-    # config<Hash>:: give :verbose => false to not log the status.
+    # config<Hash>:: give :verbose => false to not log the status, and
+    #                :http_headers => <Hash> to add headers to an http request.
     #
     # ==== Examples
     #
     #   get "http://gist.github.com/103208", "doc/README"
     #
+    #   get "http://gist.github.com/103208", "doc/README", :http_headers => {"Content-Type" => "application/json"}
+    #
     #   get "http://gist.github.com/103208" do |content|
     #     content.split("\n").first
     #   end
@@ -82,7 +84,7 @@ def get(source, *args, &block)
 
       render = if source =~ %r{^https?\://}
         require "open-uri"
-        URI.send(:open, source) { |input| input.binmode.read }
+        URI.send(:open, source, config.fetch(:http_headers, {})) { |input| input.binmode.read }
       else
         source = File.expand_path(find_in_source_paths(source.to_s))
         File.open(source) { |input| input.binmode.read }
@@ -120,12 +122,7 @@ def template(source, *args, &block)
       context = config.delete(:context) || instance_eval("binding")
 
       create_file destination, nil, config do
-        match = ERB.version.match(/(\d+\.\d+\.\d+)/)
-        capturable_erb = if match && match[1] >= "2.2.0" # Ruby 2.6+
-          CapturableERB.new(::File.binread(source), :trim_mode => "-", :eoutvar => "@output_buffer")
-        else
-          CapturableERB.new(::File.binread(source), nil, "-", "@output_buffer")
-        end
+        capturable_erb = CapturableERB.new(::File.binread(source), trim_mode: "-", eoutvar: "@output_buffer")
         content = capturable_erb.tap do |erb|
           erb.filename = source
         end.result(context)
@@ -277,9 +274,8 @@ def gsub_file(path, flag, *args, &block)
       end
     end
 
-    # Uncomment all lines matching a given regex.  It will leave the space
-    # which existed before the comment hash in tact but will remove any spacing
-    # between the comment hash and the beginning of the line.
+    # Uncomment all lines matching a given regex. Preserves indentation before
+    # the comment hash and removes the hash and any immediate following space.
     #
     # ==== Parameters
     # path<String>:: path of the file to be changed
@@ -293,7 +289,7 @@ def gsub_file(path, flag, *args, &block)
     def uncomment_lines(path, flag, *args)
       flag = flag.respond_to?(:source) ? flag.source : flag
 
-      gsub_file(path, /^(\s*)#[[:blank:]]*(.*#{flag})/, '\1\2', *args)
+      gsub_file(path, /^(\s*)#[[:blank:]]?(.*#{flag})/, '\1\2', *args)
     end
 
     # Comment all lines matching a given regex.  It will leave the space
diff --git a/lib/bundler/vendor/thor/lib/thor/actions/inject_into_file.rb b/lib/bundler/vendor/thor/lib/thor/actions/inject_into_file.rb
index 6572f7a4f1aa34..70526e615f1859 100644
--- a/lib/bundler/vendor/thor/lib/thor/actions/inject_into_file.rb
+++ b/lib/bundler/vendor/thor/lib/thor/actions/inject_into_file.rb
@@ -21,7 +21,7 @@ module Actions
     #     gems.split(" ").map{ |gem| "  config.gem :#{gem}" }.join("\n")
     #   end
     #
-    WARNINGS = { unchanged_no_flag: 'File unchanged! Either the supplied flag value not found or the content has already been inserted!' }
+    WARNINGS = {unchanged_no_flag: "File unchanged! Either the supplied flag value not found or the content has already been inserted!"}
 
     def insert_into_file(destination, *args, &block)
       data = block_given? ? block : args.shift
@@ -37,7 +37,7 @@ class InjectIntoFile < EmptyDirectory #:nodoc:
       attr_reader :replacement, :flag, :behavior
 
       def initialize(base, destination, data, config)
-        super(base, destination, {:verbose => true}.merge(config))
+        super(base, destination, {verbose: true}.merge(config))
 
         @behavior, @flag = if @config.key?(:after)
           [:after, @config.delete(:after)]
@@ -59,6 +59,8 @@ def invoke!
         if exists?
           if replace!(/#{flag}/, content, config[:force])
             say_status(:invoke)
+          elsif replacement_present?
+            say_status(:unchanged, color: :blue)
           else
             say_status(:unchanged, warning: WARNINGS[:unchanged_no_flag], color: :red)
           end
@@ -96,6 +98,8 @@ def say_status(behavior, warning: nil, color: nil)
           end
         elsif warning
           warning
+        elsif behavior == :unchanged
+          :unchanged
         else
           :subtract
         end
@@ -103,11 +107,18 @@ def say_status(behavior, warning: nil, color: nil)
         super(status, (color || config[:verbose]))
       end
 
+      def content
+        @content ||= File.read(destination)
+      end
+
+      def replacement_present?
+        content.include?(replacement)
+      end
+
       # Adds the content to the file.
       #
       def replace!(regexp, string, force)
-        content = File.read(destination)
-        if force || !content.include?(replacement)
+        if force || !replacement_present?
           success = content.gsub!(regexp, string)
 
           File.open(destination, "wb") { |file| file.write(content) } unless pretend?
diff --git a/lib/bundler/vendor/thor/lib/thor/base.rb b/lib/bundler/vendor/thor/lib/thor/base.rb
index 211855680c0071..b156899c1e0a4d 100644
--- a/lib/bundler/vendor/thor/lib/thor/base.rb
+++ b/lib/bundler/vendor/thor/lib/thor/base.rb
@@ -24,9 +24,9 @@ class Bundler::Thor
 
   class << self
     def deprecation_warning(message) #:nodoc:
-      unless ENV['THOR_SILENCE_DEPRECATION']
+      unless ENV["THOR_SILENCE_DEPRECATION"]
         warn "Deprecation warning: #{message}\n" +
-          'You can silence deprecations warning by setting the environment variable THOR_SILENCE_DEPRECATION.'
+          "You can silence deprecations warning by setting the environment variable THOR_SILENCE_DEPRECATION."
       end
     end
   end
@@ -60,6 +60,7 @@ def initialize(args = [], local_options = {}, config = {})
 
       command_options = config.delete(:command_options) # hook for start
       parse_options = parse_options.merge(command_options) if command_options
+
       if local_options.is_a?(Array)
         array_options = local_options
         hash_options = {}
@@ -73,9 +74,24 @@ def initialize(args = [], local_options = {}, config = {})
       # Let Bundler::Thor::Options parse the options first, so it can remove
       # declared options from the array. This will leave us with
       # a list of arguments that weren't declared.
-      stop_on_unknown = self.class.stop_on_unknown_option? config[:current_command]
-      disable_required_check = self.class.disable_required_check? config[:current_command]
-      opts = Bundler::Thor::Options.new(parse_options, hash_options, stop_on_unknown, disable_required_check)
+      current_command = config[:current_command]
+      stop_on_unknown = self.class.stop_on_unknown_option? current_command
+
+      # Give a relation of options.
+      # After parsing, Bundler::Thor::Options check whether right relations are kept
+      relations = if current_command.nil?
+        {exclusive_option_names: [], at_least_one_option_names: []}
+      else
+        current_command.options_relation
+      end
+
+      self.class.class_exclusive_option_names.map { |n| relations[:exclusive_option_names] << n }
+      self.class.class_at_least_one_option_names.map { |n| relations[:at_least_one_option_names] << n }
+
+      disable_required_check = self.class.disable_required_check? current_command
+
+      opts = Bundler::Thor::Options.new(parse_options, hash_options, stop_on_unknown, disable_required_check, relations)
+
       self.options = opts.parse(array_options)
       self.options = config[:class_options].merge(options) if config[:class_options]
 
@@ -310,9 +326,92 @@ def class_options(options = nil)
       # :hide::     -- If you want to hide this option from the help.
       #
       def class_option(name, options = {})
+        unless [ Symbol, String ].any? { |klass| name.is_a?(klass) }
+          raise ArgumentError, "Expected a Symbol or String, got #{name.inspect}"
+        end
         build_option(name, options, class_options)
       end
 
+      # Adds and declares option group for exclusive options in the
+      # block and arguments. You can declare options as the outside of the block.
+      #
+      # ==== Parameters
+      # Array[Bundler::Thor::Option.name]
+      #
+      # ==== Examples
+      #
+      #   class_exclusive do
+      #     class_option :one
+      #     class_option :two
+      #    end
+      #
+      # Or
+      #
+      #   class_option :one
+      #   class_option :two
+      #   class_exclusive :one, :two
+      #
+      # If you give "--one" and "--two" at the same time ExclusiveArgumentsError
+      # will be raised.
+      #
+      def class_exclusive(*args, &block)
+        register_options_relation_for(:class_options,
+                                      :class_exclusive_option_names, *args, &block)
+      end
+
+      # Adds and declares option group for required at least one of options in the
+      # block and arguments. You can declare options as the outside of the block.
+      #
+      # ==== Examples
+      #
+      #   class_at_least_one do
+      #     class_option :one
+      #     class_option :two
+      #    end
+      #
+      # Or
+      #
+      #   class_option :one
+      #   class_option :two
+      #   class_at_least_one :one, :two
+      #
+      # If you do not give "--one" and "--two" AtLeastOneRequiredArgumentError
+      # will be raised.
+      #
+      # You can use class_at_least_one and class_exclusive at the same time.
+      #
+      #    class_exclusive do
+      #      class_at_least_one do
+      #        class_option :one
+      #        class_option :two
+      #      end
+      #    end
+      #
+      # Then it is required either only one of "--one" or "--two".
+      #
+      def class_at_least_one(*args, &block)
+        register_options_relation_for(:class_options,
+                                      :class_at_least_one_option_names, *args, &block)
+      end
+
+      # Returns this class exclusive options array set, looking up in the ancestors chain.
+      #
+      # ==== Returns
+      # Array[Array[Bundler::Thor::Option.name]]
+      #
+      def class_exclusive_option_names
+        @class_exclusive_option_names ||= from_superclass(:class_exclusive_option_names, [])
+      end
+
+      # Returns this class at least one of required options array set, looking up in the ancestors chain.
+      #
+      # ==== Returns
+      # Array[Array[Bundler::Thor::Option.name]]
+      #
+      def class_at_least_one_option_names
+        @class_at_least_one_option_names ||= from_superclass(:class_at_least_one_option_names, [])
+      end
+
       # Removes a previous defined argument. If :undefine is given, undefine
       # accessors as well.
       #
@@ -565,12 +664,12 @@ def print_options(shell, options, group_name = nil)
           item.push(option.description ? "# #{option.description}" : "")
 
           list << item
-          list << ["", "# Default: #{option.default}"] if option.show_default?
-          list << ["", "# Possible values: #{option.enum.join(', ')}"] if option.enum
+          list << ["", "# Default: #{option.print_default}"] if option.show_default?
+          list << ["", "# Possible values: #{option.enum_to_s}"] if option.enum
         end
 
         shell.say(group_name ? "#{group_name} options:" : "Options:")
-        shell.print_table(list, :indent => 2)
+        shell.print_table(list, indent: 2)
         shell.say ""
       end
 
@@ -587,7 +686,7 @@ def is_thor_reserved_word?(word, type) #:nodoc:
       # options<Hash>:: Described in both class_option and method_option.
       # scope<Hash>:: Options hash that is being built up
       def build_option(name, options, scope) #:nodoc:
-        scope[name] = Bundler::Thor::Option.new(name, {:check_default_type => check_default_type}.merge!(options))
+        scope[name] = Bundler::Thor::Option.new(name, {check_default_type: check_default_type}.merge!(options))
       end
 
       # Receives a hash of options, parse them and add to the scope. This is a
@@ -693,6 +792,34 @@ def initialize_added #:nodoc:
       def dispatch(command, given_args, given_opts, config) #:nodoc:
         raise NotImplementedError
       end
+
+      # Register a relation of options for target(method_option/class_option)
+      # by args and block.
+      def register_options_relation_for(target, relation, *args, &block) # :nodoc:
+        opt = args.pop if args.last.is_a? Hash
+        opt ||= {}
+        names = args.map{ |arg| arg.to_s }
+        names += built_option_names(target, opt, &block) if block_given?
+        command_scope_member(relation, opt) << names
+      end
+
+      # Get target(method_options or class_options) options
+      # of before and after by block evaluation.
+      def built_option_names(target, opt = {}, &block) # :nodoc:
+        before = command_scope_member(target, opt).map{ |k,v| v.name }
+        instance_eval(&block)
+        after  = command_scope_member(target, opt).map{ |k,v| v.name }
+        after - before
+      end
+
+      # Get command scope member by name.
+      def command_scope_member(name, options = {}) # :nodoc:
+        if options[:for]
+          find_and_refresh_command(options[:for]).send(name)
+        else
+          send(name)
+        end
+      end
     end
   end
 end
diff --git a/lib/bundler/vendor/thor/lib/thor/command.rb b/lib/bundler/vendor/thor/lib/thor/command.rb
index 040c971c0c67bc..68c8fffedbef96 100644
--- a/lib/bundler/vendor/thor/lib/thor/command.rb
+++ b/lib/bundler/vendor/thor/lib/thor/command.rb
@@ -1,14 +1,15 @@
 class Bundler::Thor
-  class Command < Struct.new(:name, :description, :long_description, :usage, :options, :ancestor_name)
+  class Command < Struct.new(:name, :description, :long_description, :wrap_long_description, :usage, :options, :options_relation, :ancestor_name)
     FILE_REGEXP = /^#{Regexp.escape(File.dirname(__FILE__))}/
 
-    def initialize(name, description, long_description, usage, options = nil)
-      super(name.to_s, description, long_description, usage, options || {})
+    def initialize(name, description, long_description, wrap_long_description, usage, options = nil, options_relation = nil)
+      super(name.to_s, description, long_description, wrap_long_description, usage, options || {}, options_relation || {})
     end
 
     def initialize_copy(other) #:nodoc:
       super(other)
       self.options = other.options.dup if other.options
+      self.options_relation = other.options_relation.dup if other.options_relation
     end
 
     def hidden?
@@ -62,6 +63,14 @@ def formatted_usage(klass, namespace = true, subcommand = false)
       end.join("\n")
     end
 
+    def method_exclusive_option_names #:nodoc:
+      self.options_relation[:exclusive_option_names] || []
+    end
+
+    def method_at_least_one_option_names #:nodoc:
+      self.options_relation[:at_least_one_option_names] || []
+    end
+
   protected
 
     # Add usage with required arguments
@@ -127,7 +136,7 @@ def hidden?
   # A dynamic command that handles method missing scenarios.
   class DynamicCommand < Command
     def initialize(name, options = nil)
-      super(name.to_s, "A dynamically-generated command", name.to_s, name.to_s, options)
+      super(name.to_s, "A dynamically-generated command", name.to_s, nil, name.to_s, options)
     end
 
     def run(instance, args = [])
diff --git a/lib/bundler/vendor/thor/lib/thor/core_ext/hash_with_indifferent_access.rb b/lib/bundler/vendor/thor/lib/thor/core_ext/hash_with_indifferent_access.rb
index 3c4483e5ddafaa..b16a98f782bf73 100644
--- a/lib/bundler/vendor/thor/lib/thor/core_ext/hash_with_indifferent_access.rb
+++ b/lib/bundler/vendor/thor/lib/thor/core_ext/hash_with_indifferent_access.rb
@@ -38,6 +38,10 @@ def fetch(key, *args)
         super(convert_key(key), *args)
       end
 
+      def slice(*keys)
+        super(*keys.map{ |key| convert_key(key) })
+      end
+
       def key?(key)
         super(convert_key(key))
       end
diff --git a/lib/bundler/vendor/thor/lib/thor/error.rb b/lib/bundler/vendor/thor/lib/thor/error.rb
index dd64f750c9fdf5..928646e501b52c 100644
--- a/lib/bundler/vendor/thor/lib/thor/error.rb
+++ b/lib/bundler/vendor/thor/lib/thor/error.rb
@@ -1,26 +1,15 @@
 class Bundler::Thor
   Correctable = if defined?(DidYouMean::SpellChecker) && defined?(DidYouMean::Correctable) # rubocop:disable Naming/ConstantName
-                  # In order to support versions of Ruby that don't have keyword
-                  # arguments, we need our own spell checker class that doesn't take key
-                  # words. Even though this code wouldn't be hit because of the check
-                  # above, it's still necessary because the interpreter would otherwise be
-                  # unable to parse the file.
-                  class NoKwargSpellChecker < DidYouMean::SpellChecker # :nodoc:
-                    def initialize(dictionary)
-                      @dictionary = dictionary
-                    end
-                  end
-
-                  Module.new do
-                    def to_s
-                      super + DidYouMean.formatter.message_for(corrections)
-                    end
-
-                    def corrections
-                      @corrections ||= self.class.const_get(:SpellChecker).new(self).corrections
-                    end
-                  end
-                end
+    Module.new do
+      def to_s
+        super + DidYouMean.formatter.message_for(corrections)
+      end
+
+      def corrections
+        @corrections ||= self.class.const_get(:SpellChecker).new(self).corrections
+      end
+    end
+  end
 
   # Bundler::Thor::Error is raised when it's caused by wrong usage of thor classes. Those
   # errors have their backtrace suppressed and are nicely shown to the user.
@@ -45,7 +34,7 @@ def corrections
       end
 
       def spell_checker
-        NoKwargSpellChecker.new(error.all_commands)
+        DidYouMean::SpellChecker.new(dictionary: error.all_commands)
       end
     end
 
@@ -87,7 +76,7 @@ def corrections
       end
 
       def spell_checker
-        @spell_checker ||= NoKwargSpellChecker.new(error.switches)
+        @spell_checker ||= DidYouMean::SpellChecker.new(dictionary: error.switches)
       end
     end
 
@@ -108,4 +97,10 @@ class RequiredArgumentMissingError < InvocationError
 
   class MalformattedArgumentError < InvocationError
   end
+
+  class ExclusiveArgumentError < InvocationError
+  end
+
+  class AtLeastOneRequiredArgumentError < InvocationError
+  end
 end
diff --git a/lib/bundler/vendor/thor/lib/thor/group.rb b/lib/bundler/vendor/thor/lib/thor/group.rb
index 7ea11e8f930675..30bc311294cae5 100644
--- a/lib/bundler/vendor/thor/lib/thor/group.rb
+++ b/lib/bundler/vendor/thor/lib/thor/group.rb
@@ -211,6 +211,17 @@ def handle_argument_error(command, error, _args, arity) #:nodoc:
       raise error, msg
     end
 
+    # Checks if a specified command exists.
+    #
+    # ==== Parameters
+    # command_name<String>:: The name of the command to check for existence.
+    #
+    # ==== Returns
+    # Boolean:: +true+ if the command exists, +false+ otherwise.
+    def command_exists?(command_name) #:nodoc:
+      commands.keys.include?(command_name)
+    end
+
   protected
 
     # The method responsible for dispatching given the args.
diff --git a/lib/bundler/vendor/thor/lib/thor/invocation.rb b/lib/bundler/vendor/thor/lib/thor/invocation.rb
index 248a466f8ee609..5ce74710baf39f 100644
--- a/lib/bundler/vendor/thor/lib/thor/invocation.rb
+++ b/lib/bundler/vendor/thor/lib/thor/invocation.rb
@@ -143,7 +143,7 @@ def invoke_with_padding(*args)
 
     # Configuration values that are shared between invocations.
     def _shared_configuration #:nodoc:
-      {:invocations => @_invocations}
+      {invocations: @_invocations}
     end
 
     # This method simply retrieves the class and command to be invoked.
diff --git a/lib/bundler/vendor/thor/lib/thor/nested_context.rb b/lib/bundler/vendor/thor/lib/thor/nested_context.rb
index fd36b9d43fa288..7d60cb1c12dd5e 100644
--- a/lib/bundler/vendor/thor/lib/thor/nested_context.rb
+++ b/lib/bundler/vendor/thor/lib/thor/nested_context.rb
@@ -13,10 +13,10 @@ def enter
     end
 
     def entered?
-      @depth > 0
+      @depth.positive?
     end
 
-    private
+  private
 
     def push
       @depth += 1
diff --git a/lib/bundler/vendor/thor/lib/thor/parser/argument.rb b/lib/bundler/vendor/thor/lib/thor/parser/argument.rb
index dfe7398583556a..ee9db4ad8af226 100644
--- a/lib/bundler/vendor/thor/lib/thor/parser/argument.rb
+++ b/lib/bundler/vendor/thor/lib/thor/parser/argument.rb
@@ -24,6 +24,14 @@ def initialize(name, options = {})
       validate! # Trigger specific validations
     end
 
+    def print_default
+      if @type == :array and @default.is_a?(Array)
+        @default.map(&:dump).join(" ")
+      else
+        @default
+      end
+    end
+
     def usage
       required? ? banner : "[#{banner}]"
     end
@@ -41,11 +49,19 @@ def show_default?
       end
     end
 
+    def enum_to_s
+      if enum.respond_to? :join
+        enum.join(", ")
+      else
+        "#{enum.first}..#{enum.last}"
+      end
+    end
+
   protected
 
     def validate!
       raise ArgumentError, "An argument cannot be required and have default value." if required? && !default.nil?
-      raise ArgumentError, "An argument cannot have an enum other than an array." if @enum && !@enum.is_a?(Array)
+      raise ArgumentError, "An argument cannot have an enum other than an enumerable." if @enum && !@enum.is_a?(Enumerable)
     end
 
     def valid_type?(type)
diff --git a/lib/bundler/vendor/thor/lib/thor/parser/arguments.rb b/lib/bundler/vendor/thor/lib/thor/parser/arguments.rb
index af395a03467025..b6f9c9a37a1373 100644
--- a/lib/bundler/vendor/thor/lib/thor/parser/arguments.rb
+++ b/lib/bundler/vendor/thor/lib/thor/parser/arguments.rb
@@ -30,11 +30,7 @@ def initialize(arguments = [])
 
       arguments.each do |argument|
         if !argument.default.nil?
-          begin
-            @assigns[argument.human_name] = argument.default.dup
-          rescue TypeError  # Compatibility shim for un-dup-able Fixnum in Ruby < 2.4
-            @assigns[argument.human_name] = argument.default
-          end
+          @assigns[argument.human_name] = argument.default.dup
         elsif argument.required?
           @non_assigned_required << argument
         end
@@ -121,8 +117,18 @@ def parse_hash(name)
     #
     def parse_array(name)
       return shift if peek.is_a?(Array)
+
       array = []
-      array << shift while current_is_value?
+
+      while current_is_value?
+        value = shift
+
+        if !value.empty?
+          validate_enum_value!(name, value, "Expected all values of '%s' to be one of %s; got %s")
+        end
+
+        array << value
+      end
       array
     end
 
@@ -138,11 +144,9 @@ def parse_numeric(name)
       end
 
       value = $&.index(".") ? shift.to_f : shift.to_i
-      if @switches.is_a?(Hash) && switch = @switches[name]
-        if switch.enum && !switch.enum.include?(value)
-          raise MalformattedArgumentError, "Expected '#{name}' to be one of #{switch.enum.join(', ')}; got #{value}"
-        end
-      end
+
+      validate_enum_value!(name, value, "Expected '%s' to be one of %s; got %s")
+
       value
     end
 
@@ -156,15 +160,27 @@ def parse_string(name)
         nil
       else
         value = shift
-        if @switches.is_a?(Hash) && switch = @switches[name]
-          if switch.enum && !switch.enum.include?(value)
-            raise MalformattedArgumentError, "Expected '#{name}' to be one of #{switch.enum.join(', ')}; got #{value}"
-          end
-        end
+
+        validate_enum_value!(name, value, "Expected '%s' to be one of %s; got %s")
+
         value
       end
     end
 
+    # Raises an error if the switch is an enum and the values aren't included on it.
+    #
+    def validate_enum_value!(name, value, message)
+      return unless @switches.is_a?(Hash)
+
+      switch = @switches[name]
+
+      return unless switch
+
+      if switch.enum && !switch.enum.include?(value)
+        raise MalformattedArgumentError, message % [name, switch.enum_to_s, value]
+      end
+    end
+
     # Raises an error if @non_assigned_required array is not empty.
     #
     def check_requirement!
diff --git a/lib/bundler/vendor/thor/lib/thor/parser/option.rb b/lib/bundler/vendor/thor/lib/thor/parser/option.rb
index 393955f1075bf0..72617c7e34b069 100644
--- a/lib/bundler/vendor/thor/lib/thor/parser/option.rb
+++ b/lib/bundler/vendor/thor/lib/thor/parser/option.rb
@@ -11,7 +11,7 @@ def initialize(name, options = {})
       super
       @lazy_default   = options[:lazy_default]
       @group          = options[:group].to_s.capitalize if options[:group]
-      @aliases        = Array(options[:aliases])
+      @aliases        = normalize_aliases(options[:aliases])
       @hide           = options[:hide]
     end
 
@@ -69,7 +69,7 @@ def self.parse(key, value)
         value.class.name.downcase.to_sym
       end
 
-      new(name.to_s, :required => required, :type => type, :default => default, :aliases => aliases)
+      new(name.to_s, required: required, type: type, default: default, aliases: aliases)
     end
 
     def switch_name
@@ -89,8 +89,8 @@ def usage(padding = 0)
 
       sample = "[#{sample}]".dup unless required?
 
-      if boolean?
-        sample << ", [#{dasherize('no-' + human_name)}]" unless (name == "force") || name.start_with?("no-")
+      if boolean? && name != "force" && !name.match(/\A(no|skip)[\-_]/)
+        sample << ", [#{dasherize('no-' + human_name)}], [#{dasherize('skip-' + human_name)}]"
       end
 
       aliases_for_usage.ljust(padding) + sample
@@ -104,6 +104,15 @@ def aliases_for_usage
       end
     end
 
+    def show_default?
+      case default
+      when TrueClass, FalseClass
+        true
+      else
+        super
+      end
+    end
+
     VALID_TYPES.each do |type|
       class_eval <<-RUBY, __FILE__, __LINE__ + 1
         def #{type}?
@@ -142,8 +151,8 @@ def validate_default_type!
           raise ArgumentError, err
         elsif @check_default_type == nil
           Bundler::Thor.deprecation_warning "#{err}.\n" +
-            'This will be rejected in the future unless you explicitly pass the options `check_default_type: false`' +
-            ' or call `allow_incompatible_default_type!` in your code'
+            "This will be rejected in the future unless you explicitly pass the options `check_default_type: false`" +
+            " or call `allow_incompatible_default_type!` in your code"
         end
       end
     end
@@ -159,5 +168,11 @@ def undasherize(str)
     def dasherize(str)
       (str.length > 1 ? "--" : "-") + str.tr("_", "-")
     end
+
+  private
+
+    def normalize_aliases(aliases)
+      Array(aliases).map { |short| short.to_s.sub(/^(?!\-)/, "-") }
+    end
   end
 end
diff --git a/lib/bundler/vendor/thor/lib/thor/parser/options.rb b/lib/bundler/vendor/thor/lib/thor/parser/options.rb
index 499ce15339df1f..734f5fe7e34af0 100644
--- a/lib/bundler/vendor/thor/lib/thor/parser/options.rb
+++ b/lib/bundler/vendor/thor/lib/thor/parser/options.rb
@@ -29,8 +29,10 @@ def self.to_switches(options)
     #
     # If +stop_on_unknown+ is true, #parse will stop as soon as it encounters
     # an unknown option or a regular argument.
-    def initialize(hash_options = {}, defaults = {}, stop_on_unknown = false, disable_required_check = false)
+    def initialize(hash_options = {}, defaults = {}, stop_on_unknown = false, disable_required_check = false, relations = {})
       @stop_on_unknown = stop_on_unknown
+      @exclusives = (relations[:exclusive_option_names] || []).select{|array| !array.empty?}
+      @at_least_ones = (relations[:at_least_one_option_names] || []).select{|array| !array.empty?}
       @disable_required_check = disable_required_check
       options = hash_options.values
       super(options)
@@ -50,8 +52,7 @@ def initialize(hash_options = {}, defaults = {}, stop_on_unknown = false, disabl
       options.each do |option|
         @switches[option.switch_name] = option
 
-        option.aliases.each do |short|
-          name = short.to_s.sub(/^(?!\-)/, "-")
+        option.aliases.each do |name|
           @shorts[name] ||= option.switch_name
         end
       end
@@ -101,7 +102,7 @@ def parse(args) # rubocop:disable Metrics/MethodLength
               unshift($1.split("").map { |f| "-#{f}" })
               next
             when EQ_RE
-              unshift($2, :is_value => true)
+              unshift($2, is_value: true)
               switch = $1
             when SHORT_NUM
               unshift($2)
@@ -132,12 +133,38 @@ def parse(args) # rubocop:disable Metrics/MethodLength
       end
 
       check_requirement! unless @disable_required_check
+      check_exclusive!
+      check_at_least_one!
 
       assigns = Bundler::Thor::CoreExt::HashWithIndifferentAccess.new(@assigns)
       assigns.freeze
       assigns
     end
 
+    def check_exclusive!
+      opts = @assigns.keys
+      # When option A and B are exclusive, if A and B are given at the same time,
+      # the diffrence of argument array size will decrease.
+      found = @exclusives.find{ |ex| (ex - opts).size < ex.size - 1 }
+      if found
+        names = names_to_switch_names(found & opts).map{|n| "'#{n}'"}
+        class_name = self.class.name.split("::").last.downcase
+        fail ExclusiveArgumentError, "Found exclusive #{class_name} #{names.join(", ")}"
+      end
+    end
+
+    def check_at_least_one!
+      opts = @assigns.keys
+      # When at least one is required of the options A and B,
+      # if the both options were not given, none? would be true.
+      found = @at_least_ones.find{ |one_reqs| one_reqs.none?{ |o| opts.include? o} }
+      if found
+        names = names_to_switch_names(found).map{|n| "'#{n}'"}
+        class_name = self.class.name.split("::").last.downcase
+        fail AtLeastOneRequiredArgumentError, "Not found at least one of required #{class_name} #{names.join(", ")}"
+      end
+    end
+
     def check_unknown!
       to_check = @stopped_parsing_after_extra_index ? @extra[0...@stopped_parsing_after_extra_index] : @extra
 
@@ -148,6 +175,17 @@ def check_unknown!
 
   protected
 
+    # Option names changes to swith name or human name
+    def names_to_switch_names(names = [])
+      @switches.map do |_, o|
+        if names.include? o.name
+          o.respond_to?(:switch_name) ? o.switch_name : o.human_name
+        else
+          nil
+        end
+      end.compact
+    end
+
     def assign_result!(option, result)
       if option.repeatable && option.type == :hash
         (@assigns[option.human_name] ||= {}).merge!(result)
@@ -212,7 +250,8 @@ def parsing_options?
       @parsing_options
     end
 
-    # Parse boolean values which can be given as --foo=true, --foo or --no-foo.
+    # Parse boolean values which can be given as --foo=true or --foo for true values, or
+    # --foo=false, --no-foo or --skip-foo for false values.
     #
     def parse_boolean(switch)
       if current_is_value?
diff --git a/lib/bundler/vendor/thor/lib/thor/runner.rb b/lib/bundler/vendor/thor/lib/thor/runner.rb
index 8157c6c5b2d3fe..c7cc873131f3e8 100644
--- a/lib/bundler/vendor/thor/lib/thor/runner.rb
+++ b/lib/bundler/vendor/thor/lib/thor/runner.rb
@@ -23,7 +23,7 @@ def help(meth = nil)
       initialize_thorfiles(meth)
       klass, command = Bundler::Thor::Util.find_class_and_command_by_namespace(meth)
       self.class.handle_no_command_error(command, false) if klass.nil?
-      klass.start(["-h", command].compact, :shell => shell)
+      klass.start(["-h", command].compact, shell: shell)
     else
       super
     end
@@ -38,11 +38,11 @@ def method_missing(meth, *args)
     klass, command = Bundler::Thor::Util.find_class_and_command_by_namespace(meth)
     self.class.handle_no_command_error(command, false) if klass.nil?
     args.unshift(command) if command
-    klass.start(args, :shell => shell)
+    klass.start(args, shell: shell)
   end
 
   desc "install NAME", "Install an optionally named Bundler::Thor file into your system commands"
-  method_options :as => :string, :relative => :boolean, :force => :boolean
+  method_options as: :string, relative: :boolean, force: :boolean
   def install(name) # rubocop:disable Metrics/MethodLength
     initialize_thorfiles
 
@@ -53,7 +53,7 @@ def install(name) # rubocop:disable Metrics/MethodLength
       package = :file
       require "open-uri"
       begin
-        contents = URI.send(:open, name, &:read) # Using `send` for Ruby 2.4- support
+        contents = URI.open(name, &:read)
       rescue OpenURI::HTTPError
         raise Error, "Error opening URI '#{name}'"
       end
@@ -69,7 +69,7 @@ def install(name) # rubocop:disable Metrics/MethodLength
           base = name
           package = :file
           require "open-uri"
-          contents = URI.send(:open, name, &:read) # for ruby 2.1-2.4
+          contents = URI.open(name, &:read)
         end
       rescue Errno::ENOENT
         raise Error, "Error opening file '#{name}'"
@@ -101,9 +101,9 @@ def install(name) # rubocop:disable Metrics/MethodLength
     end
 
     thor_yaml[as] = {
-      :filename   => Digest::SHA256.hexdigest(name + as),
-      :location   => location,
-      :namespaces => Bundler::Thor::Util.namespaces_in_content(contents, base)
+      filename: Digest::SHA256.hexdigest(name + as),
+      location: location,
+      namespaces: Bundler::Thor::Util.namespaces_in_content(contents, base)
     }
 
     save_yaml(thor_yaml)
@@ -164,14 +164,14 @@ def update(name)
   end
 
   desc "installed", "List the installed Bundler::Thor modules and commands"
-  method_options :internal => :boolean
+  method_options internal: :boolean
   def installed
     initialize_thorfiles(nil, true)
     display_klasses(true, options["internal"])
   end
 
   desc "list [SEARCH]", "List the available thor commands (--substring means .*SEARCH)"
-  method_options :substring => :boolean, :group => :string, :all => :boolean, :debug => :boolean
+  method_options substring: :boolean, group: :string, all: :boolean, debug: :boolean
   def list(search = "")
     initialize_thorfiles
 
@@ -313,7 +313,7 @@ def display_commands(namespace, list) #:nodoc:
     say shell.set_color(namespace, :blue, true)
     say "-" * namespace.size
 
-    print_table(list, :truncate => true)
+    print_table(list, truncate: true)
     say
   end
   alias_method :display_tasks, :display_commands
diff --git a/lib/bundler/vendor/thor/lib/thor/shell.rb b/lib/bundler/vendor/thor/lib/thor/shell.rb
index a4137d1bde2727..265f3ba0466b71 100644
--- a/lib/bundler/vendor/thor/lib/thor/shell.rb
+++ b/lib/bundler/vendor/thor/lib/thor/shell.rb
@@ -75,7 +75,7 @@ def with_padding
     # Allow shell to be shared between invocations.
     #
     def _shared_configuration #:nodoc:
-      super.merge!(:shell => shell)
+      super.merge!(shell: shell)
     end
   end
 end
diff --git a/lib/bundler/vendor/thor/lib/thor/shell/basic.rb b/lib/bundler/vendor/thor/lib/thor/shell/basic.rb
index 7f414e9a0811ae..b3e85733cba788 100644
--- a/lib/bundler/vendor/thor/lib/thor/shell/basic.rb
+++ b/lib/bundler/vendor/thor/lib/thor/shell/basic.rb
@@ -1,8 +1,10 @@
+require_relative "column_printer"
+require_relative "table_printer"
+require_relative "wrapped_printer"
+
 class Bundler::Thor
   module Shell
     class Basic
-      DEFAULT_TERMINAL_WIDTH = 80
-
       attr_accessor :base
       attr_reader   :padding
 
@@ -65,15 +67,15 @@ def indent(count = 1)
       # Readline.
       #
       # ==== Example
-      # ask("What is your name?")
+      #   ask("What is your name?")
       #
-      # ask("What is the planet furthest from the sun?", :default => "Pluto")
+      #   ask("What is the planet furthest from the sun?", :default => "Neptune")
       #
-      # ask("What is your favorite Neopolitan flavor?", :limited_to => ["strawberry", "chocolate", "vanilla"])
+      #   ask("What is your favorite Neopolitan flavor?", :limited_to => ["strawberry", "chocolate", "vanilla"])
       #
-      # ask("What is your password?", :echo => false)
+      #   ask("What is your password?", :echo => false)
       #
-      # ask("Where should the file be saved?", :path => true)
+      #   ask("Where should the file be saved?", :path => true)
       #
       def ask(statement, *args)
         options = args.last.is_a?(Hash) ? args.pop : {}
@@ -91,7 +93,7 @@ def ask(statement, *args)
       # are passed straight to puts (behavior got from Highline).
       #
       # ==== Example
-      # say("I know you knew that.")
+      #   say("I know you knew that.")
       #
       def say(message = "", color = nil, force_new_line = (message.to_s !~ /( |\t)\Z/))
         return if quiet?
@@ -108,7 +110,7 @@ def say(message = "", color = nil, force_new_line = (message.to_s !~ /( |\t)\Z/)
       # are passed straight to puts (behavior got from Highline).
       #
       # ==== Example
-      # say_error("error: something went wrong")
+      #   say_error("error: something went wrong")
       #
       def say_error(message = "", color = nil, force_new_line = (message.to_s !~ /( |\t)\Z/))
         return if quiet?
@@ -141,18 +143,18 @@ def say_status(status, message, log_status = true)
         stdout.flush
       end
 
-      # Make a question the to user and returns true if the user replies "y" or
+      # Asks the user a question and returns true if the user replies "y" or
       # "yes".
       #
       def yes?(statement, color = nil)
-        !!(ask(statement, color, :add_to_history => false) =~ is?(:yes))
+        !!(ask(statement, color, add_to_history: false) =~ is?(:yes))
       end
 
-      # Make a question the to user and returns true if the user replies "n" or
+      # Asks the user a question and returns true if the user replies "n" or
       # "no".
       #
       def no?(statement, color = nil)
-        !!(ask(statement, color, :add_to_history => false) =~ is?(:no))
+        !!(ask(statement, color, add_to_history: false) =~ is?(:no))
       end
 
       # Prints values in columns
@@ -161,16 +163,8 @@ def no?(statement, color = nil)
       # Array[String, String, ...]
       #
       def print_in_columns(array)
-        return if array.empty?
-        colwidth = (array.map { |el| el.to_s.size }.max || 0) + 2
-        array.each_with_index do |value, index|
-          # Don't output trailing spaces when printing the last column
-          if ((((index + 1) % (terminal_width / colwidth))).zero? && !index.zero?) || index + 1 == array.length
-            stdout.puts value
-          else
-            stdout.printf("%-#{colwidth}s", value)
-          end
-        end
+        printer = ColumnPrinter.new(stdout)
+        printer.print(array)
       end
 
       # Prints a table.
@@ -181,58 +175,11 @@ def print_in_columns(array)
       # ==== Options
       # indent<Integer>:: Indent the first column by indent value.
       # colwidth<Integer>:: Force the first column to colwidth spaces wide.
+      # borders<Boolean>:: Adds ascii borders.
       #
       def print_table(array, options = {}) # rubocop:disable Metrics/MethodLength
-        return if array.empty?
-
-        formats = []
-        indent = options[:indent].to_i
-        colwidth = options[:colwidth]
-        options[:truncate] = terminal_width if options[:truncate] == true
-
-        formats << "%-#{colwidth + 2}s".dup if colwidth
-        start = colwidth ? 1 : 0
-
-        colcount = array.max { |a, b| a.size <=> b.size }.size
-
-        maximas = []
-
-        start.upto(colcount - 1) do |index|
-          maxima = array.map { |row| row[index] ? row[index].to_s.size : 0 }.max
-          maximas << maxima
-          formats << if index == colcount - 1
-                       # Don't output 2 trailing spaces when printing the last column
-                       "%-s".dup
-                     else
-                       "%-#{maxima + 2}s".dup
-                     end
-        end
-
-        formats[0] = formats[0].insert(0, " " * indent)
-        formats << "%s"
-
-        array.each do |row|
-          sentence = "".dup
-
-          row.each_with_index do |column, index|
-            maxima = maximas[index]
-
-            f = if column.is_a?(Numeric)
-              if index == row.size - 1
-                # Don't output 2 trailing spaces when printing the last column
-                "%#{maxima}s"
-              else
-                "%#{maxima}s  "
-              end
-            else
-              formats[index]
-            end
-            sentence << f % column.to_s
-          end
-
-          sentence = truncate(sentence, options[:truncate]) if options[:truncate]
-          stdout.puts sentence
-        end
+        printer = TablePrinter.new(stdout, options)
+        printer.print(array)
       end
 
       # Prints a long string, word-wrapping the text to the current width of the
@@ -245,33 +192,8 @@ def print_table(array, options = {}) # rubocop:disable Metrics/MethodLength
       # indent<Integer>:: Indent each line of the printed paragraph by indent value.
       #
       def print_wrapped(message, options = {})
-        indent = options[:indent] || 0
-        width = terminal_width - indent
-        paras = message.split("\n\n")
-
-        paras.map! do |unwrapped|
-          words = unwrapped.split(" ")
-          counter = words.first.length
-          words.inject do |memo, word|
-            word = word.gsub(/\n\005/, "\n").gsub(/\005/, "\n")
-            counter = 0 if word.include? "\n"
-            if (counter + word.length + 1) < width
-              memo = "#{memo} #{word}"
-              counter += (word.length + 1)
-            else
-              memo = "#{memo}\n#{word}"
-              counter = word.length
-            end
-            memo
-          end
-        end.compact!
-
-        paras.each do |para|
-          para.split("\n").each do |line|
-            stdout.puts line.insert(0, " " * indent)
-          end
-          stdout.puts unless para == paras.last
-        end
+        printer = WrappedPrinter.new(stdout, options)
+        printer.print(message)
       end
 
       # Deals with file collision and returns true if the file should be
@@ -289,7 +211,7 @@ def file_collision(destination)
         loop do
           answer = ask(
             %[Overwrite #{destination}? (enter "h" for help) #{options}],
-            :add_to_history => false
+            add_to_history: false
           )
 
           case answer
@@ -316,24 +238,11 @@ def file_collision(destination)
 
             say "Please specify merge tool to `THOR_MERGE` env."
           else
-            say file_collision_help
+            say file_collision_help(block_given?)
           end
         end
       end
 
-      # This code was copied from Rake, available under MIT-LICENSE
-      # Copyright (c) 2003, 2004 Jim Weirich
-      def terminal_width
-        result = if ENV["THOR_COLUMNS"]
-          ENV["THOR_COLUMNS"].to_i
-        else
-          unix? ? dynamic_width : DEFAULT_TERMINAL_WIDTH
-        end
-        result < 10 ? DEFAULT_TERMINAL_WIDTH : result
-      rescue
-        DEFAULT_TERMINAL_WIDTH
-      end
-
       # Called if something goes wrong during the execution. This is used by Bundler::Thor
       # internally and should not be used inside your scripts. If something went
       # wrong, you can always raise an exception. If you raise a Bundler::Thor::Error, it
@@ -384,16 +293,21 @@ def is?(value) #:nodoc:
         end
       end
 
-      def file_collision_help #:nodoc:
-        <<-HELP
+      def file_collision_help(block_given) #:nodoc:
+        help = <<-HELP
         Y - yes, overwrite
         n - no, do not overwrite
         a - all, overwrite this and all others
         q - quit, abort
-        d - diff, show the differences between the old and the new
         h - help, show this help
-        m - merge, run merge tool
         HELP
+        if block_given
+          help << <<-HELP
+        d - diff, show the differences between the old and the new
+        m - merge, run merge tool
+          HELP
+        end
+        help
       end
 
       def show_diff(destination, content) #:nodoc:
@@ -411,46 +325,8 @@ def quiet? #:nodoc:
         mute? || (base && base.options[:quiet])
       end
 
-      # Calculate the dynamic width of the terminal
-      def dynamic_width
-        @dynamic_width ||= (dynamic_width_stty.nonzero? || dynamic_width_tput)
-      end
-
-      def dynamic_width_stty
-        `stty size 2>/dev/null`.split[1].to_i
-      end
-
-      def dynamic_width_tput
-        `tput cols 2>/dev/null`.to_i
-      end
-
       def unix?
-        RUBY_PLATFORM =~ /(aix|darwin|linux|(net|free|open)bsd|cygwin|solaris)/i
-      end
-
-      def truncate(string, width)
-        as_unicode do
-          chars = string.chars.to_a
-          if chars.length <= width
-            chars.join
-          else
-            chars[0, width - 3].join + "..."
-          end
-        end
-      end
-
-      if "".respond_to?(:encode)
-        def as_unicode
-          yield
-        end
-      else
-        def as_unicode
-          old = $KCODE
-          $KCODE = "U"
-          yield
-        ensure
-          $KCODE = old
-        end
+        Terminal.unix?
       end
 
       def ask_simply(statement, color, options)
diff --git a/lib/bundler/vendor/thor/lib/thor/shell/color.rb b/lib/bundler/vendor/thor/lib/thor/shell/color.rb
index ccb7c3c079a42e..5d708fadcad2dd 100644
--- a/lib/bundler/vendor/thor/lib/thor/shell/color.rb
+++ b/lib/bundler/vendor/thor/lib/thor/shell/color.rb
@@ -105,52 +105,7 @@ def are_colors_supported?
       end
 
       def are_colors_disabled?
-        !ENV['NO_COLOR'].nil? && !ENV['NO_COLOR'].empty?
-      end
-
-      # Overwrite show_diff to show diff with colors if Diff::LCS is
-      # available.
-      #
-      def show_diff(destination, content) #:nodoc:
-        if diff_lcs_loaded? && ENV["THOR_DIFF"].nil? && ENV["RAILS_DIFF"].nil?
-          actual  = File.binread(destination).to_s.split("\n")
-          content = content.to_s.split("\n")
-
-          Diff::LCS.sdiff(actual, content).each do |diff|
-            output_diff_line(diff)
-          end
-        else
-          super
-        end
-      end
-
-      def output_diff_line(diff) #:nodoc:
-        case diff.action
-        when "-"
-          say "- #{diff.old_element.chomp}", :red, true
-        when "+"
-          say "+ #{diff.new_element.chomp}", :green, true
-        when "!"
-          say "- #{diff.old_element.chomp}", :red, true
-          say "+ #{diff.new_element.chomp}", :green, true
-        else
-          say "  #{diff.old_element.chomp}", nil, true
-        end
-      end
-
-      # Check if Diff::LCS is loaded. If it is, use it to create pretty output
-      # for diff.
-      #
-      def diff_lcs_loaded? #:nodoc:
-        return true if defined?(Diff::LCS)
-        return @diff_lcs_loaded unless @diff_lcs_loaded.nil?
-
-        @diff_lcs_loaded = begin
-          require "diff/lcs"
-          true
-        rescue LoadError
-          false
-        end
+        !ENV["NO_COLOR"].nil? && !ENV["NO_COLOR"].empty?
       end
     end
   end
diff --git a/lib/bundler/vendor/thor/lib/thor/shell/column_printer.rb b/lib/bundler/vendor/thor/lib/thor/shell/column_printer.rb
new file mode 100644
index 00000000000000..56a9e6181b6865
--- /dev/null
+++ b/lib/bundler/vendor/thor/lib/thor/shell/column_printer.rb
@@ -0,0 +1,29 @@
+require_relative "terminal"
+
+class Bundler::Thor
+  module Shell
+    class ColumnPrinter
+      attr_reader :stdout, :options
+
+      def initialize(stdout, options = {})
+        @stdout = stdout
+        @options = options
+        @indent = options[:indent].to_i
+      end
+
+      def print(array)
+        return if array.empty?
+        colwidth = (array.map { |el| el.to_s.size }.max || 0) + 2
+        array.each_with_index do |value, index|
+          # Don't output trailing spaces when printing the last column
+          if ((((index + 1) % (Terminal.terminal_width / colwidth))).zero? && !index.zero?) || index + 1 == array.length
+            stdout.puts value
+          else
+            stdout.printf("%-#{colwidth}s", value)
+          end
+        end
+      end
+    end
+  end
+end
+
diff --git a/lib/bundler/vendor/thor/lib/thor/shell/html.rb b/lib/bundler/vendor/thor/lib/thor/shell/html.rb
index 77a6d13a233505..a0a8520e5cb712 100644
--- a/lib/bundler/vendor/thor/lib/thor/shell/html.rb
+++ b/lib/bundler/vendor/thor/lib/thor/shell/html.rb
@@ -64,7 +64,7 @@ def set_color(string, *colors)
       # Ask something to the user and receives a response.
       #
       # ==== Example
-      # ask("What is your name?")
+      #   ask("What is your name?")
       #
       # TODO: Implement #ask for Bundler::Thor::Shell::HTML
       def ask(statement, color = nil)
@@ -76,51 +76,6 @@ def ask(statement, color = nil)
       def can_display_colors?
         true
       end
-
-      # Overwrite show_diff to show diff with colors if Diff::LCS is
-      # available.
-      #
-      def show_diff(destination, content) #:nodoc:
-        if diff_lcs_loaded? && ENV["THOR_DIFF"].nil? && ENV["RAILS_DIFF"].nil?
-          actual  = File.binread(destination).to_s.split("\n")
-          content = content.to_s.split("\n")
-
-          Diff::LCS.sdiff(actual, content).each do |diff|
-            output_diff_line(diff)
-          end
-        else
-          super
-        end
-      end
-
-      def output_diff_line(diff) #:nodoc:
-        case diff.action
-        when "-"
-          say "- #{diff.old_element.chomp}", :red, true
-        when "+"
-          say "+ #{diff.new_element.chomp}", :green, true
-        when "!"
-          say "- #{diff.old_element.chomp}", :red, true
-          say "+ #{diff.new_element.chomp}", :green, true
-        else
-          say "  #{diff.old_element.chomp}", nil, true
-        end
-      end
-
-      # Check if Diff::LCS is loaded. If it is, use it to create pretty output
-      # for diff.
-      #
-      def diff_lcs_loaded? #:nodoc:
-        return true if defined?(Diff::LCS)
-        return @diff_lcs_loaded unless @diff_lcs_loaded.nil?
-
-        @diff_lcs_loaded = begin
-          require "diff/lcs"
-          true
-        rescue LoadError
-          false
-        end
-      end
     end
   end
 end
diff --git a/lib/bundler/vendor/thor/lib/thor/shell/table_printer.rb b/lib/bundler/vendor/thor/lib/thor/shell/table_printer.rb
new file mode 100644
index 00000000000000..dee36147532c8c
--- /dev/null
+++ b/lib/bundler/vendor/thor/lib/thor/shell/table_printer.rb
@@ -0,0 +1,118 @@
+require_relative "column_printer"
+require_relative "terminal"
+
+class Bundler::Thor
+  module Shell
+    class TablePrinter < ColumnPrinter
+      BORDER_SEPARATOR = :separator
+
+      def initialize(stdout, options = {})
+        super
+        @formats = []
+        @maximas = []
+        @colwidth = options[:colwidth]
+        @truncate = options[:truncate] == true ? Terminal.terminal_width : options[:truncate]
+        @padding = 1
+      end
+
+      def print(array)
+        return if array.empty?
+
+        prepare(array)
+
+        print_border_separator if options[:borders]
+
+        array.each do |row|
+          if options[:borders] && row == BORDER_SEPARATOR
+            print_border_separator
+            next
+          end
+
+          sentence = "".dup
+
+          row.each_with_index do |column, index|
+            sentence << format_cell(column, row.size, index)
+          end
+
+          sentence = truncate(sentence)
+          sentence << "|" if options[:borders]
+          stdout.puts indentation + sentence
+
+        end
+        print_border_separator if options[:borders]
+      end
+
+    private
+
+      def prepare(array)
+        array = array.reject{|row| row == BORDER_SEPARATOR }
+
+        @formats << "%-#{@colwidth + 2}s".dup if @colwidth
+        start = @colwidth ? 1 : 0
+
+        colcount = array.max { |a, b| a.size <=> b.size }.size
+
+        start.upto(colcount - 1) do |index|
+          maxima = array.map { |row| row[index] ? row[index].to_s.size : 0 }.max
+
+          @maximas << maxima
+          @formats << if options[:borders]
+             "%-#{maxima}s".dup
+          elsif index == colcount - 1
+            # Don't output 2 trailing spaces when printing the last column
+            "%-s".dup
+          else
+            "%-#{maxima + 2}s".dup
+          end
+        end
+
+        @formats << "%s"
+      end
+
+      def format_cell(column, row_size, index)
+        maxima = @maximas[index]
+
+        f = if column.is_a?(Numeric)
+          if options[:borders]
+            # With borders we handle padding separately
+            "%#{maxima}s"
+          elsif index == row_size - 1
+            # Don't output 2 trailing spaces when printing the last column
+            "%#{maxima}s"
+          else
+            "%#{maxima}s  "
+          end
+        else
+          @formats[index]
+        end
+
+        cell = "".dup
+        cell << "|" + " " * @padding if options[:borders]
+        cell << f % column.to_s
+        cell << " " * @padding if options[:borders]
+        cell
+      end
+
+      def print_border_separator
+        separator = @maximas.map do |maxima|
+          "+" + "-" * (maxima + 2 * @padding)
+        end
+        stdout.puts indentation + separator.join + "+"
+      end
+
+      def truncate(string)
+        return string unless @truncate
+        chars = string.chars.to_a
+        if chars.length <= @truncate
+          chars.join
+        else
+          chars[0, @truncate - 3 - @indent].join + "..."
+        end
+      end
+
+      def indentation
+        " " * @indent
+      end
+    end
+  end
+end
diff --git a/lib/bundler/vendor/thor/lib/thor/shell/terminal.rb b/lib/bundler/vendor/thor/lib/thor/shell/terminal.rb
new file mode 100644
index 00000000000000..2c60684308335a
--- /dev/null
+++ b/lib/bundler/vendor/thor/lib/thor/shell/terminal.rb
@@ -0,0 +1,42 @@
+class Bundler::Thor
+  module Shell
+    module Terminal
+      DEFAULT_TERMINAL_WIDTH = 80
+
+      class << self
+        # This code was copied from Rake, available under MIT-LICENSE
+        # Copyright (c) 2003, 2004 Jim Weirich
+        def terminal_width
+          result = if ENV["THOR_COLUMNS"]
+            ENV["THOR_COLUMNS"].to_i
+          else
+            unix? ? dynamic_width : DEFAULT_TERMINAL_WIDTH
+          end
+          result < 10 ? DEFAULT_TERMINAL_WIDTH : result
+        rescue
+          DEFAULT_TERMINAL_WIDTH
+        end
+
+        def unix?
+          RUBY_PLATFORM =~ /(aix|darwin|linux|(net|free|open)bsd|cygwin|solaris)/i
+        end
+
+      private
+
+        # Calculate the dynamic width of the terminal
+        def dynamic_width
+          @dynamic_width ||= (dynamic_width_stty.nonzero? || dynamic_width_tput)
+        end
+
+        def dynamic_width_stty
+          `stty size 2>/dev/null`.split[1].to_i
+        end
+
+        def dynamic_width_tput
+          `tput cols 2>/dev/null`.to_i
+        end
+
+      end
+    end
+  end
+end
diff --git a/lib/bundler/vendor/thor/lib/thor/shell/wrapped_printer.rb b/lib/bundler/vendor/thor/lib/thor/shell/wrapped_printer.rb
new file mode 100644
index 00000000000000..ba88e952db787b
--- /dev/null
+++ b/lib/bundler/vendor/thor/lib/thor/shell/wrapped_printer.rb
@@ -0,0 +1,38 @@
+require_relative "column_printer"
+require_relative "terminal"
+
+class Bundler::Thor
+  module Shell
+    class WrappedPrinter < ColumnPrinter
+      def print(message)
+        width = Terminal.terminal_width - @indent
+        paras = message.split("\n\n")
+
+        paras.map! do |unwrapped|
+          words = unwrapped.split(" ")
+          counter = words.first.length
+          words.inject do |memo, word|
+            word = word.gsub(/\n\005/, "\n").gsub(/\005/, "\n")
+            counter = 0 if word.include? "\n"
+            if (counter + word.length + 1) < width
+              memo = "#{memo} #{word}"
+              counter += (word.length + 1)
+            else
+              memo = "#{memo}\n#{word}"
+              counter = word.length
+            end
+            memo
+          end
+        end.compact!
+
+        paras.each do |para|
+          para.split("\n").each do |line|
+            stdout.puts line.insert(0, " " * @indent)
+          end
+          stdout.puts unless para == paras.last
+        end
+      end
+    end
+  end
+end
+
diff --git a/lib/bundler/vendor/thor/lib/thor/util.rb b/lib/bundler/vendor/thor/lib/thor/util.rb
index a17eabc22c2005..cd8f9ece874d90 100644
--- a/lib/bundler/vendor/thor/lib/thor/util.rb
+++ b/lib/bundler/vendor/thor/lib/thor/util.rb
@@ -130,9 +130,10 @@ def camel_case(str)
       #
       def find_class_and_command_by_namespace(namespace, fallback = true)
         if namespace.include?(":") # look for a namespaced command
-          pieces  = namespace.split(":")
-          command = pieces.pop
-          klass   = Bundler::Thor::Util.find_by_namespace(pieces.join(":"))
+          *pieces, command  = namespace.split(":")
+          namespace = pieces.join(":")
+          namespace = "default" if namespace.empty?
+          klass = Bundler::Thor::Base.subclasses.detect { |thor| thor.namespace == namespace && thor.command_exists?(command) }
         end
         unless klass # look for a Bundler::Thor::Group with the right name
           klass = Bundler::Thor::Util.find_by_namespace(namespace)
diff --git a/lib/bundler/vendor/thor/lib/thor/version.rb b/lib/bundler/vendor/thor/lib/thor/version.rb
index 43e462c5319e97..cd7b4f060eac5b 100644
--- a/lib/bundler/vendor/thor/lib/thor/version.rb
+++ b/lib/bundler/vendor/thor/lib/thor/version.rb
@@ -1,3 +1,3 @@
 class Bundler::Thor
-  VERSION = "1.2.2"
+  VERSION = "1.3.2"
 end
diff --git a/lib/bundler/vendor/tsort/lib/tsort.rb b/lib/bundler/vendor/tsort/lib/tsort.rb
index 4a0e1a4e25c309..cf8731f7608dcb 100644
--- a/lib/bundler/vendor/tsort/lib/tsort.rb
+++ b/lib/bundler/vendor/tsort/lib/tsort.rb
@@ -122,6 +122,9 @@
 #
 
 module Bundler::TSort
+
+  VERSION = "0.2.0"
+
   class Cyclic < StandardError
   end
 
diff --git a/lib/bundler/vendor/uri/lib/uri.rb b/lib/bundler/vendor/uri/lib/uri.rb
index 976320f6bd4f8d..57b380c480a560 100644
--- a/lib/bundler/vendor/uri/lib/uri.rb
+++ b/lib/bundler/vendor/uri/lib/uri.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: false
 # Bundler::URI is a module providing classes to handle Uniform Resource Identifiers
-# (RFC2396[http://tools.ietf.org/html/rfc2396]).
+# (RFC2396[https://www.rfc-editor.org/rfc/rfc2396]).
 #
 # == Features
 #
@@ -47,14 +47,14 @@
 # A good place to view an RFC spec is http://www.ietf.org/rfc.html.
 #
 # Here is a list of all related RFC's:
-# - RFC822[http://tools.ietf.org/html/rfc822]
-# - RFC1738[http://tools.ietf.org/html/rfc1738]
-# - RFC2255[http://tools.ietf.org/html/rfc2255]
-# - RFC2368[http://tools.ietf.org/html/rfc2368]
-# - RFC2373[http://tools.ietf.org/html/rfc2373]
-# - RFC2396[http://tools.ietf.org/html/rfc2396]
-# - RFC2732[http://tools.ietf.org/html/rfc2732]
-# - RFC3986[http://tools.ietf.org/html/rfc3986]
+# - RFC822[https://www.rfc-editor.org/rfc/rfc822]
+# - RFC1738[https://www.rfc-editor.org/rfc/rfc1738]
+# - RFC2255[https://www.rfc-editor.org/rfc/rfc2255]
+# - RFC2368[https://www.rfc-editor.org/rfc/rfc2368]
+# - RFC2373[https://www.rfc-editor.org/rfc/rfc2373]
+# - RFC2396[https://www.rfc-editor.org/rfc/rfc2396]
+# - RFC2732[https://www.rfc-editor.org/rfc/rfc2732]
+# - RFC3986[https://www.rfc-editor.org/rfc/rfc3986]
 #
 # == Class tree
 #
diff --git a/lib/bundler/vendor/uri/lib/uri/common.rb b/lib/bundler/vendor/uri/lib/uri/common.rb
index 914a4c75812ba4..186da24fa8bb8d 100644
--- a/lib/bundler/vendor/uri/lib/uri/common.rb
+++ b/lib/bundler/vendor/uri/lib/uri/common.rb
@@ -13,24 +13,51 @@
 require_relative "rfc3986_parser"
 
 module Bundler::URI
-  include RFC2396_REGEXP
+  # The default parser instance for RFC 2396.
+  RFC2396_PARSER = RFC2396_Parser.new
+  Ractor.make_shareable(RFC2396_PARSER) if defined?(Ractor)
 
-  REGEXP = RFC2396_REGEXP
-  Parser = RFC2396_Parser
+  # The default parser instance for RFC 3986.
   RFC3986_PARSER = RFC3986_Parser.new
   Ractor.make_shareable(RFC3986_PARSER) if defined?(Ractor)
 
-  # Bundler::URI::Parser.new
-  DEFAULT_PARSER = Parser.new
-  DEFAULT_PARSER.pattern.each_pair do |sym, str|
-    unless REGEXP::PATTERN.const_defined?(sym)
-      REGEXP::PATTERN.const_set(sym, str)
+  # The default parser instance.
+  DEFAULT_PARSER = RFC3986_PARSER
+  Ractor.make_shareable(DEFAULT_PARSER) if defined?(Ractor)
+
+  # Set the default parser instance.
+  def self.parser=(parser = RFC3986_PARSER)
+    remove_const(:Parser) if defined?(::Bundler::URI::Parser)
+    const_set("Parser", parser.class)
+
+    remove_const(:REGEXP) if defined?(::Bundler::URI::REGEXP)
+    remove_const(:PATTERN) if defined?(::Bundler::URI::PATTERN)
+    if Parser == RFC2396_Parser
+      const_set("REGEXP", Bundler::URI::RFC2396_REGEXP)
+      const_set("PATTERN", Bundler::URI::RFC2396_REGEXP::PATTERN)
+    end
+
+    Parser.new.regexp.each_pair do |sym, str|
+      remove_const(sym) if const_defined?(sym, false)
+      const_set(sym, str)
     end
   end
-  DEFAULT_PARSER.regexp.each_pair do |sym, str|
-    const_set(sym, str)
+  self.parser = RFC3986_PARSER
+
+  def self.const_missing(const) # :nodoc:
+    if const == :REGEXP
+      warn "Bundler::URI::REGEXP is obsolete. Use Bundler::URI::RFC2396_REGEXP explicitly.", uplevel: 1 if $VERBOSE
+      Bundler::URI::RFC2396_REGEXP
+    elsif value = RFC2396_PARSER.regexp[const]
+      warn "Bundler::URI::#{const} is obsolete. Use RFC2396_PARSER.regexp[#{const.inspect}] explicitly.", uplevel: 1 if $VERBOSE
+      value
+    elsif value = RFC2396_Parser.const_get(const)
+      warn "Bundler::URI::#{const} is obsolete. Use RFC2396_Parser::#{const} explicitly.", uplevel: 1 if $VERBOSE
+      value
+    else
+      super
+    end
   end
-  Ractor.make_shareable(DEFAULT_PARSER) if defined?(Ractor)
 
   module Util # :nodoc:
     def make_components_hash(klass, array_hash)
@@ -64,20 +91,36 @@ def make_components_hash(klass, array_hash)
     module_function :make_components_hash
   end
 
-  module Schemes
+  module Schemes # :nodoc:
   end
   private_constant :Schemes
 
+  # Registers the given +klass+ as the class to be instantiated
+  # when parsing a \Bundler::URI with the given +scheme+:
   #
-  # Register the given +klass+ to be instantiated when parsing URLs with the given +scheme+.
-  # Note that currently only schemes which after .upcase are valid constant names
-  # can be registered (no -/+/. allowed).
+  #   Bundler::URI.register_scheme('MS_SEARCH', Bundler::URI::Generic) # => Bundler::URI::Generic
+  #   Bundler::URI.scheme_list['MS_SEARCH']                   # => Bundler::URI::Generic
   #
+  # Note that after calling String#upcase on +scheme+, it must be a valid
+  # constant name.
   def self.register_scheme(scheme, klass)
     Schemes.const_set(scheme.to_s.upcase, klass)
   end
 
-  # Returns a Hash of the defined schemes.
+  # Returns a hash of the defined schemes:
+  #
+  #   Bundler::URI.scheme_list
+  #   # =>
+  #   {"MAILTO"=>Bundler::URI::MailTo,
+  #    "LDAPS"=>Bundler::URI::LDAPS,
+  #    "WS"=>Bundler::URI::WS,
+  #    "HTTP"=>Bundler::URI::HTTP,
+  #    "HTTPS"=>Bundler::URI::HTTPS,
+  #    "LDAP"=>Bundler::URI::LDAP,
+  #    "FILE"=>Bundler::URI::File,
+  #    "FTP"=>Bundler::URI::FTP}
+  #
+  # Related: Bundler::URI.register_scheme.
   def self.scheme_list
     Schemes.constants.map { |name|
       [name.to_s.upcase, Schemes.const_get(name)]
@@ -88,9 +131,21 @@ def self.scheme_list
   private_constant :INITIAL_SCHEMES
   Ractor.make_shareable(INITIAL_SCHEMES) if defined?(Ractor)
 
+  # Returns a new object constructed from the given +scheme+, +arguments+,
+  # and +default+:
+  #
+  # - The new object is an instance of <tt>Bundler::URI.scheme_list[scheme.upcase]</tt>.
+  # - The object is initialized by calling the class initializer
+  #   using +scheme+ and +arguments+.
+  #   See Bundler::URI::Generic.new.
   #
-  # Construct a Bundler::URI instance, using the scheme to detect the appropriate class
-  # from +Bundler::URI.scheme_list+.
+  # Examples:
+  #
+  #   values = ['john.doe', 'www.example.com', '123', nil, '/forum/questions/', nil, 'tag=networking&order=newest', 'top']
+  #   Bundler::URI.for('https', *values)
+  #   # => #<Bundler::URI::HTTPS https://john.doe@www.example.com:123/forum/questions/?tag=networking&order=newest#top>
+  #   Bundler::URI.for('foo', *values, default: Bundler::URI::HTTP)
+  #   # => #<Bundler::URI::HTTP foo://john.doe@www.example.com:123/forum/questions/?tag=networking&order=newest#top>
   #
   def self.for(scheme, *arguments, default: Generic)
     const_name = scheme.to_s.upcase
@@ -121,95 +176,49 @@ class InvalidComponentError < Error; end
   #
   class BadURIError < Error; end
 
-  #
-  # == Synopsis
-  #
-  #   Bundler::URI::split(uri)
-  #
-  # == Args
-  #
-  # +uri+::
-  #   String with Bundler::URI.
-  #
-  # == Description
-  #
-  # Splits the string on following parts and returns array with result:
-  #
-  # * Scheme
-  # * Userinfo
-  # * Host
-  # * Port
-  # * Registry
-  # * Path
-  # * Opaque
-  # * Query
-  # * Fragment
-  #
-  # == Usage
-  #
-  #   require 'bundler/vendor/uri/lib/uri'
-  #
-  #   Bundler::URI.split("http://www.ruby-lang.org/")
-  #   # => ["http", nil, "www.ruby-lang.org", nil, nil, "/", nil, nil, nil]
+  # Returns a 9-element array representing the parts of the \Bundler::URI
+  # formed from the string +uri+;
+  # each array element is a string or +nil+:
+  #
+  #   names = %w[scheme userinfo host port registry path opaque query fragment]
+  #   values = Bundler::URI.split('https://john.doe@www.example.com:123/forum/questions/?tag=networking&order=newest#top')
+  #   names.zip(values)
+  #   # =>
+  #   [["scheme", "https"],
+  #    ["userinfo", "john.doe"],
+  #    ["host", "www.example.com"],
+  #    ["port", "123"],
+  #    ["registry", nil],
+  #    ["path", "/forum/questions/"],
+  #    ["opaque", nil],
+  #    ["query", "tag=networking&order=newest"],
+  #    ["fragment", "top"]]
   #
   def self.split(uri)
-    RFC3986_PARSER.split(uri)
+    DEFAULT_PARSER.split(uri)
   end
 
+  # Returns a new \Bundler::URI object constructed from the given string +uri+:
   #
-  # == Synopsis
-  #
-  #   Bundler::URI::parse(uri_str)
-  #
-  # == Args
-  #
-  # +uri_str+::
-  #   String with Bundler::URI.
-  #
-  # == Description
-  #
-  # Creates one of the Bundler::URI's subclasses instance from the string.
-  #
-  # == Raises
-  #
-  # Bundler::URI::InvalidURIError::
-  #   Raised if Bundler::URI given is not a correct one.
-  #
-  # == Usage
-  #
-  #   require 'bundler/vendor/uri/lib/uri'
+  #   Bundler::URI.parse('https://john.doe@www.example.com:123/forum/questions/?tag=networking&order=newest#top')
+  #   # => #<Bundler::URI::HTTPS https://john.doe@www.example.com:123/forum/questions/?tag=networking&order=newest#top>
+  #   Bundler::URI.parse('http://john.doe@www.example.com:123/forum/questions/?tag=networking&order=newest#top')
+  #   # => #<Bundler::URI::HTTP http://john.doe@www.example.com:123/forum/questions/?tag=networking&order=newest#top>
   #
-  #   uri = Bundler::URI.parse("http://www.ruby-lang.org/")
-  #   # => #<Bundler::URI::HTTP http://www.ruby-lang.org/>
-  #   uri.scheme
-  #   # => "http"
-  #   uri.host
-  #   # => "www.ruby-lang.org"
-  #
-  # It's recommended to first ::escape the provided +uri_str+ if there are any
-  # invalid Bundler::URI characters.
+  # It's recommended to first ::escape string +uri+
+  # if it may contain invalid Bundler::URI characters.
   #
   def self.parse(uri)
-    RFC3986_PARSER.parse(uri)
+    DEFAULT_PARSER.parse(uri)
   end
 
+  # Merges the given Bundler::URI strings +str+
+  # per {RFC 2396}[https://www.rfc-editor.org/rfc/rfc2396.html].
   #
-  # == Synopsis
-  #
-  #   Bundler::URI::join(str[, str, ...])
-  #
-  # == Args
-  #
-  # +str+::
-  #   String(s) to work with, will be converted to RFC3986 URIs before merging.
+  # Each string in +str+ is converted to an
+  # {RFC3986 Bundler::URI}[https://www.rfc-editor.org/rfc/rfc3986.html] before being merged.
   #
-  # == Description
-  #
-  # Joins URIs.
-  #
-  # == Usage
-  #
-  #   require 'bundler/vendor/uri/lib/uri'
+  # Examples:
   #
   #   Bundler::URI.join("http://example.com/","main.rbx")
   #   # => #<Bundler::URI::HTTP http://example.com/main.rbx>
@@ -227,7 +236,7 @@ def self.parse(uri)
   #   # => #<Bundler::URI::HTTP http://example.com/foo/bar>
   #
   def self.join(*str)
-    RFC3986_PARSER.join(*str)
+    DEFAULT_PARSER.join(*str)
   end
 
   #
@@ -254,7 +263,7 @@ def self.join(*str)
   #   Bundler::URI.extract("text here http://foo.example.org/bla and here mailto:test@example.com and here also.")
   #   # => ["http://foo.example.com/bla", "mailto:test@example.com"]
   #
-  def self.extract(str, schemes = nil, &block)
+  def self.extract(str, schemes = nil, &block) # :nodoc:
     warn "Bundler::URI.extract is obsolete", uplevel: 1 if $VERBOSE
     DEFAULT_PARSER.extract(str, schemes, &block)
   end
@@ -291,7 +300,7 @@ def self.extract(str, schemes = nil, &block)
   #     p $&
   #   end
   #
-  def self.regexp(schemes = nil)
+  def self.regexp(schemes = nil)# :nodoc:
     warn "Bundler::URI.regexp is obsolete", uplevel: 1 if $VERBOSE
     DEFAULT_PARSER.make_regexp(schemes)
   end
@@ -300,7 +309,7 @@ def self.regexp(schemes = nil)
   256.times do |i|
     TBLENCWWWCOMP_[-i.chr] = -('%%%02X' % i)
   end
-  TBLENCURICOMP_ = TBLENCWWWCOMP_.dup.freeze
+  TBLENCURICOMP_ = TBLENCWWWCOMP_.dup.freeze # :nodoc:
   TBLENCWWWCOMP_[' '] = '+'
   TBLENCWWWCOMP_.freeze
   TBLDECWWWCOMP_ = {} # :nodoc:
@@ -314,40 +323,86 @@ def self.regexp(schemes = nil)
   TBLDECWWWCOMP_['+'] = ' '
   TBLDECWWWCOMP_.freeze
 
-  # Encodes given +str+ to URL-encoded form data.
+  # Returns a URL-encoded string derived from the given string +str+.
   #
-  # This method doesn't convert *, -, ., 0-9, A-Z, _, a-z, but does convert SP
-  # (ASCII space) to + and converts others to %XX.
+  # The returned string:
   #
-  # If +enc+ is given, convert +str+ to the encoding before percent encoding.
+  # - Preserves:
   #
-  # This is an implementation of
-  # https://www.w3.org/TR/2013/CR-html5-20130806/forms.html#url-encoded-form-data.
+  #   - Characters <tt>'*'</tt>, <tt>'.'</tt>, <tt>'-'</tt>, and <tt>'_'</tt>.
+  #   - Character in ranges <tt>'a'..'z'</tt>, <tt>'A'..'Z'</tt>,
+  #     and <tt>'0'..'9'</tt>.
   #
-  # See Bundler::URI.decode_www_form_component, Bundler::URI.encode_www_form.
+  #   Example:
+  #
+  #     Bundler::URI.encode_www_form_component('*.-_azAZ09')
+  #     # => "*.-_azAZ09"
+  #
+  # - Converts:
+  #
+  #   - Character <tt>' '</tt> to character <tt>'+'</tt>.
+  #   - Any other character to "percent notation";
+  #     the percent notation for character <i>c</i> is <tt>'%%%X' % c.ord</tt>.
+  #
+  #   Example:
+  #
+  #     Bundler::URI.encode_www_form_component('Here are some punctuation characters: ,;?:')
+  #     # => "Here+are+some+punctuation+characters%3A+%2C%3B%3F%3A"
+  #
+  # Encoding:
+  #
+  # - If +str+ has encoding Encoding::ASCII_8BIT, argument +enc+ is ignored.
+  # - Otherwise +str+ is converted first to Encoding::UTF_8
+  #   (with suitable character replacements),
+  #   and then to encoding +enc+.
+  #
+  # In either case, the returned string has forced encoding Encoding::US_ASCII.
+  #
+  # Related: Bundler::URI.encode_uri_component (encodes <tt>' '</tt> as <tt>'%20'</tt>).
   def self.encode_www_form_component(str, enc=nil)
     _encode_uri_component(/[^*\-.0-9A-Z_a-z]/, TBLENCWWWCOMP_, str, enc)
   end
 
-  # Decodes given +str+ of URL-encoded form data.
+  # Returns a string decoded from the given \URL-encoded string +str+.
+  #
+  # The given string is first encoded as Encoding::ASCII-8BIT (using String#b),
+  # then decoded (as below), and finally force-encoded to the given encoding +enc+.
+  #
+  # The returned string:
+  #
+  # - Preserves:
+  #
+  #   - Characters <tt>'*'</tt>, <tt>'.'</tt>, <tt>'-'</tt>, and <tt>'_'</tt>.
+  #   - Character in ranges <tt>'a'..'z'</tt>, <tt>'A'..'Z'</tt>,
+  #     and <tt>'0'..'9'</tt>.
+  #
+  #   Example:
   #
-  # This decodes + to SP.
+  #     Bundler::URI.decode_www_form_component('*.-_azAZ09')
+  #     # => "*.-_azAZ09"
   #
-  # See Bundler::URI.encode_www_form_component, Bundler::URI.decode_www_form.
+  # - Converts:
+  #
+  #   - Character <tt>'+'</tt> to character <tt>' '</tt>.
+  #   - Each "percent notation" to an ASCII character.
+  #
+  #   Example:
+  #
+  #     Bundler::URI.decode_www_form_component('Here+are+some+punctuation+characters%3A+%2C%3B%3F%3A')
+  #     # => "Here are some punctuation characters: ,;?:"
+  #
+  # Related: Bundler::URI.decode_uri_component (preserves <tt>'+'</tt>).
   def self.decode_www_form_component(str, enc=Encoding::UTF_8)
     _decode_uri_component(/\+|%\h\h/, str, enc)
   end
 
-  # Encodes +str+ using URL encoding
-  #
-  # This encodes SP to %20 instead of +.
+  # Like Bundler::URI.encode_www_form_component, except that <tt>' '</tt> (space)
+  # is encoded as <tt>'%20'</tt> (instead of <tt>'+'</tt>).
   def self.encode_uri_component(str, enc=nil)
     _encode_uri_component(/[^*\-.0-9A-Z_a-z]/, TBLENCURICOMP_, str, enc)
   end
 
-  # Decodes given +str+ of URL-encoded data.
-  #
-  # This does not decode + to SP.
+  # Like Bundler::URI.decode_www_form_component, except that <tt>'+'</tt> is preserved.
   def self.decode_uri_component(str, enc=Encoding::UTF_8)
     _decode_uri_component(/%\h\h/, str, enc)
   end
@@ -372,33 +427,104 @@ def self._decode_uri_component(regexp, str, enc)
   end
   private_class_method :_decode_uri_component
 
-  # Generates URL-encoded form data from given +enum+.
+  # Returns a URL-encoded string derived from the given
+  # {Enumerable}[rdoc-ref:Enumerable@Enumerable+in+Ruby+Classes]
+  # +enum+.
+  #
+  # The result is suitable for use as form data
+  # for an \HTTP request whose <tt>Content-Type</tt> is
+  # <tt>'application/x-www-form-urlencoded'</tt>.
+  #
+  # The returned string consists of the elements of +enum+,
+  # each converted to one or more URL-encoded strings,
+  # and all joined with character <tt>'&'</tt>.
+  #
+  # Simple examples:
+  #
+  #   Bundler::URI.encode_www_form([['foo', 0], ['bar', 1], ['baz', 2]])
+  #   # => "foo=0&bar=1&baz=2"
+  #   Bundler::URI.encode_www_form({foo: 0, bar: 1, baz: 2})
+  #   # => "foo=0&bar=1&baz=2"
+  #
+  # The returned string is formed using method Bundler::URI.encode_www_form_component,
+  # which converts certain characters:
+  #
+  #   Bundler::URI.encode_www_form('f#o': '/', 'b-r': '$', 'b z': '@')
+  #   # => "f%23o=%2F&b-r=%24&b+z=%40"
+  #
+  # When +enum+ is Array-like, each element +ele+ is converted to a field:
   #
-  # This generates application/x-www-form-urlencoded data defined in HTML5
-  # from given an Enumerable object.
+  # - If +ele+ is an array of two or more elements,
+  #   the field is formed from its first two elements
+  #   (and any additional elements are ignored):
   #
-  # This internally uses Bundler::URI.encode_www_form_component(str).
+  #     name = Bundler::URI.encode_www_form_component(ele[0], enc)
+  #     value = Bundler::URI.encode_www_form_component(ele[1], enc)
+  #     "#{name}=#{value}"
   #
-  # This method doesn't convert the encoding of given items, so convert them
-  # before calling this method if you want to send data as other than original
-  # encoding or mixed encoding data. (Strings which are encoded in an HTML5
-  # ASCII incompatible encoding are converted to UTF-8.)
+  #   Examples:
   #
-  # This method doesn't handle files.  When you send a file, use
-  # multipart/form-data.
+  #     Bundler::URI.encode_www_form([%w[foo bar], %w[baz bat bah]])
+  #     # => "foo=bar&baz=bat"
+  #     Bundler::URI.encode_www_form([['foo', 0], ['bar', :baz, 'bat']])
+  #     # => "foo=0&bar=baz"
   #
-  # This refers https://url.spec.whatwg.org/#concept-urlencoded-serializer
+  # - If +ele+ is an array of one element,
+  #   the field is formed from <tt>ele[0]</tt>:
   #
-  #    Bundler::URI.encode_www_form([["q", "ruby"], ["lang", "en"]])
-  #    #=> "q=ruby&lang=en"
-  #    Bundler::URI.encode_www_form("q" => "ruby", "lang" => "en")
-  #    #=> "q=ruby&lang=en"
-  #    Bundler::URI.encode_www_form("q" => ["ruby", "perl"], "lang" => "en")
-  #    #=> "q=ruby&q=perl&lang=en"
-  #    Bundler::URI.encode_www_form([["q", "ruby"], ["q", "perl"], ["lang", "en"]])
-  #    #=> "q=ruby&q=perl&lang=en"
+  #     Bundler::URI.encode_www_form_component(ele[0])
+  #
+  #   Example:
+  #
+  #     Bundler::URI.encode_www_form([['foo'], [:bar], [0]])
+  #     # => "foo&bar&0"
+  #
+  # - Otherwise the field is formed from +ele+:
+  #
+  #     Bundler::URI.encode_www_form_component(ele)
+  #
+  #   Example:
+  #
+  #     Bundler::URI.encode_www_form(['foo', :bar, 0])
+  #     # => "foo&bar&0"
+  #
+  # The elements of an Array-like +enum+ may be mixture:
+  #
+  #   Bundler::URI.encode_www_form([['foo', 0], ['bar', 1, 2], ['baz'], :bat])
+  #   # => "foo=0&bar=1&baz&bat"
+  #
+  # When +enum+ is Hash-like,
+  # each +key+/+value+ pair is converted to one or more fields:
+  #
+  # - If +value+ is
+  #   {Array-convertible}[rdoc-ref:implicit_conversion.rdoc@Array-Convertible+Objects],
+  #   each element +ele+ in +value+ is paired with +key+ to form a field:
+  #
+  #     name = Bundler::URI.encode_www_form_component(key, enc)
+  #     value = Bundler::URI.encode_www_form_component(ele, enc)
+  #     "#{name}=#{value}"
+  #
+  #   Example:
+  #
+  #     Bundler::URI.encode_www_form({foo: [:bar, 1], baz: [:bat, :bam, 2]})
+  #     # => "foo=bar&foo=1&baz=bat&baz=bam&baz=2"
+  #
+  # - Otherwise, +key+ and +value+ are paired to form a field:
+  #
+  #     name = Bundler::URI.encode_www_form_component(key, enc)
+  #     value = Bundler::URI.encode_www_form_component(value, enc)
+  #     "#{name}=#{value}"
+  #
+  #   Example:
+  #
+  #     Bundler::URI.encode_www_form({foo: 0, bar: 1, baz: 2})
+  #     # => "foo=0&bar=1&baz=2"
+  #
+  # The elements of a Hash-like +enum+ may be mixture:
+  #
+  #   Bundler::URI.encode_www_form({foo: [0, 1], bar: 2})
+  #   # => "foo=0&foo=1&bar=2"
   #
-  # See Bundler::URI.encode_www_form_component, Bundler::URI.decode_www_form.
   def self.encode_www_form(enum, enc=nil)
     enum.map do |k,v|
       if v.nil?
@@ -419,22 +545,39 @@ def self.encode_www_form(enum, enc=nil)
     end.join('&')
   end
 
-  # Decodes URL-encoded form data from given +str+.
+  # Returns name/value pairs derived from the given string +str+,
+  # which must be an ASCII string.
+  #
+  # The method may be used to decode the body of Net::HTTPResponse object +res+
+  # for which <tt>res['Content-Type']</tt> is <tt>'application/x-www-form-urlencoded'</tt>.
+  #
+  # The returned data is an array of 2-element subarrays;
+  # each subarray is a name/value pair (both are strings).
+  # Each returned string has encoding +enc+,
+  # and has had invalid characters removed via
+  # {String#scrub}[rdoc-ref:String#scrub].
   #
-  # This decodes application/x-www-form-urlencoded data
-  # and returns an array of key-value arrays.
+  # A simple example:
   #
-  # This refers http://url.spec.whatwg.org/#concept-urlencoded-parser,
-  # so this supports only &-separator, and doesn't support ;-separator.
+  #   Bundler::URI.decode_www_form('foo=0&bar=1&baz')
+  #   # => [["foo", "0"], ["bar", "1"], ["baz", ""]]
   #
-  #    ary = Bundler::URI.decode_www_form("a=1&a=2&b=3")
-  #    ary                   #=> [['a', '1'], ['a', '2'], ['b', '3']]
-  #    ary.assoc('a').last   #=> '1'
-  #    ary.assoc('b').last   #=> '3'
-  #    ary.rassoc('a').last  #=> '2'
-  #    Hash[ary]             #=> {"a"=>"2", "b"=>"3"}
+  # The returned strings have certain conversions,
+  # similar to those performed in Bundler::URI.decode_www_form_component:
+  #
+  #   Bundler::URI.decode_www_form('f%23o=%2F&b-r=%24&b+z=%40')
+  #   # => [["f#o", "/"], ["b-r", "$"], ["b z", "@"]]
+  #
+  # The given string may contain consecutive separators:
+  #
+  #   Bundler::URI.decode_www_form('foo=0&&bar=1&&baz=2')
+  #   # => [["foo", "0"], ["", ""], ["bar", "1"], ["", ""], ["baz", "2"]]
+  #
+  # A different separator may be specified:
+  #
+  #   Bundler::URI.decode_www_form('foo=0--bar=1--baz', separator: '--')
+  #   # => [["foo", "0"], ["bar", "1"], ["baz", ""]]
   #
-  # See Bundler::URI.decode_www_form_component, Bundler::URI.encode_www_form.
   def self.decode_www_form(str, enc=Encoding::UTF_8, separator: '&', use__charset_: false, isindex: false)
     raise ArgumentError, "the input of #{self.name}.#{__method__} must be ASCII only string" unless str.ascii_only?
     ary = []
@@ -713,7 +856,15 @@ def self.get_encoding(label)
 module Bundler
 
   #
-  # Returns +uri+ converted to an Bundler::URI object.
+  # Returns a \Bundler::URI object derived from the given +uri+,
+  # which may be a \Bundler::URI string or an existing \Bundler::URI object:
+  #
+  #   # Returns a new Bundler::URI.
+  #   uri = Bundler::URI('http://github.com/ruby/ruby')
+  #   # => #<Bundler::URI::HTTP http://github.com/ruby/ruby>
+  #   # Returns the given Bundler::URI.
+  #   Bundler::URI(uri)
+  #   # => #<Bundler::URI::HTTP http://github.com/ruby/ruby>
   #
   def URI(uri)
     if uri.is_a?(Bundler::URI::Generic)
diff --git a/lib/bundler/vendor/uri/lib/uri/file.rb b/lib/bundler/vendor/uri/lib/uri/file.rb
index 8d75a9de7afcfb..de347af6ebf98d 100644
--- a/lib/bundler/vendor/uri/lib/uri/file.rb
+++ b/lib/bundler/vendor/uri/lib/uri/file.rb
@@ -70,17 +70,17 @@ def set_port(v)
 
     # raise InvalidURIError
     def check_userinfo(user)
-      raise Bundler::URI::InvalidURIError, "can not set userinfo for file Bundler::URI"
+      raise Bundler::URI::InvalidURIError, "cannot set userinfo for file Bundler::URI"
     end
 
     # raise InvalidURIError
     def check_user(user)
-      raise Bundler::URI::InvalidURIError, "can not set user for file Bundler::URI"
+      raise Bundler::URI::InvalidURIError, "cannot set user for file Bundler::URI"
     end
 
     # raise InvalidURIError
     def check_password(user)
-      raise Bundler::URI::InvalidURIError, "can not set password for file Bundler::URI"
+      raise Bundler::URI::InvalidURIError, "cannot set password for file Bundler::URI"
     end
 
     # do nothing
diff --git a/lib/bundler/vendor/uri/lib/uri/ftp.rb b/lib/bundler/vendor/uri/lib/uri/ftp.rb
index 48b4c6718d220a..f83985fd3de278 100644
--- a/lib/bundler/vendor/uri/lib/uri/ftp.rb
+++ b/lib/bundler/vendor/uri/lib/uri/ftp.rb
@@ -17,7 +17,7 @@ module Bundler::URI
   # This class will be redesigned because of difference of implementations;
   # the structure of its path. draft-hoffman-ftp-uri-04 is a draft but it
   # is a good summary about the de facto spec.
-  # http://tools.ietf.org/html/draft-hoffman-ftp-uri-04
+  # https://datatracker.ietf.org/doc/html/draft-hoffman-ftp-uri-04
   #
   class FTP < Generic
     # A Default port of 21 for Bundler::URI::FTP.
diff --git a/lib/bundler/vendor/uri/lib/uri/generic.rb b/lib/bundler/vendor/uri/lib/uri/generic.rb
index 9ae691582631d6..6abb171d14254b 100644
--- a/lib/bundler/vendor/uri/lib/uri/generic.rb
+++ b/lib/bundler/vendor/uri/lib/uri/generic.rb
@@ -82,7 +82,7 @@ def self.build2(args)
         if args.kind_of?(Array)
           return self.build(args.collect{|x|
             if x.is_a?(String)
-              DEFAULT_PARSER.escape(x)
+              Bundler::URI::RFC2396_PARSER.escape(x)
             else
               x
             end
@@ -91,7 +91,7 @@ def self.build2(args)
           tmp = {}
           args.each do |key, value|
             tmp[key] = if value
-                DEFAULT_PARSER.escape(value)
+                Bundler::URI::RFC2396_PARSER.escape(value)
               else
                 value
               end
@@ -393,7 +393,7 @@ def check_userinfo(user, password = nil)
     def check_user(v)
       if @opaque
         raise InvalidURIError,
-          "can not set user with opaque"
+          "cannot set user with opaque"
       end
 
       return v unless v
@@ -417,7 +417,7 @@ def check_user(v)
     def check_password(v, user = @user)
       if @opaque
         raise InvalidURIError,
-          "can not set password with opaque"
+          "cannot set password with opaque"
       end
       return v unless v
 
@@ -596,7 +596,7 @@ def check_host(v)
 
       if @opaque
         raise InvalidURIError,
-          "can not set host with registry or opaque"
+          "cannot set host with registry or opaque"
       elsif parser.regexp[:HOST] !~ v
         raise InvalidComponentError,
           "bad component(expected host component): #{v}"
@@ -685,7 +685,7 @@ def check_port(v)
 
       if @opaque
         raise InvalidURIError,
-          "can not set port with registry or opaque"
+          "cannot set port with registry or opaque"
       elsif !v.kind_of?(Integer) && parser.regexp[:PORT] !~ v
         raise InvalidComponentError,
           "bad component(expected port component): #{v.inspect}"
@@ -733,17 +733,17 @@ def port=(v)
     end
 
     def check_registry(v) # :nodoc:
-      raise InvalidURIError, "can not set registry"
+      raise InvalidURIError, "cannot set registry"
     end
     private :check_registry
 
-    def set_registry(v) #:nodoc:
-      raise InvalidURIError, "can not set registry"
+    def set_registry(v) # :nodoc:
+      raise InvalidURIError, "cannot set registry"
     end
     protected :set_registry
 
-    def registry=(v)
-      raise InvalidURIError, "can not set registry"
+    def registry=(v) # :nodoc:
+      raise InvalidURIError, "cannot set registry"
     end
 
     #
@@ -866,7 +866,7 @@ def check_opaque(v)
       # hier_part     = ( net_path | abs_path ) [ "?" query ]
       if @host || @port || @user || @path  # userinfo = @user + ':' + @password
         raise InvalidURIError,
-          "can not set opaque with host, port, userinfo or path"
+          "cannot set opaque with host, port, userinfo or path"
       elsif v && parser.regexp[:OPAQUE] !~ v
         raise InvalidComponentError,
           "bad component(expected opaque component): #{v}"
@@ -945,7 +945,7 @@ def fragment=(v)
     # == Description
     #
     # Bundler::URI has components listed in order of decreasing significance from left to right,
-    # see RFC3986 https://tools.ietf.org/html/rfc3986 1.2.3.
+    # see RFC3986 https://www.rfc-editor.org/rfc/rfc3986 1.2.3.
     #
     # == Usage
     #
@@ -1133,17 +1133,16 @@ def merge(oth)
       base.fragment=(nil)
 
       # RFC2396, Section 5.2, 4)
-      if !authority
-        base.set_path(merge_path(base.path, rel.path)) if base.path && rel.path
-      else
-        # RFC2396, Section 5.2, 4)
-        base.set_path(rel.path) if rel.path
+      if authority
+        base.set_userinfo(rel.userinfo)
+        base.set_host(rel.host)
+        base.set_port(rel.port || base.default_port)
+        base.set_path(rel.path)
+      elsif base.path && rel.path
+        base.set_path(merge_path(base.path, rel.path))
       end
 
       # RFC2396, Section 5.2, 7)
-      base.set_userinfo(rel.userinfo) if rel.userinfo
-      base.set_host(rel.host)         if rel.host
-      base.set_port(rel.port)         if rel.port
       base.query = rel.query       if rel.query
       base.fragment=(rel.fragment) if rel.fragment
 
@@ -1235,7 +1234,7 @@ def route_from0(oth)
         return rel, rel
       end
 
-      # you can modify `rel', but can not `oth'.
+      # you can modify `rel', but cannot `oth'.
       return oth, rel
     end
     private :route_from0
@@ -1260,7 +1259,7 @@ def route_from0(oth)
     #   #=> #<Bundler::URI::Generic /main.rbx?page=1>
     #
     def route_from(oth)
-      # you can modify `rel', but can not `oth'.
+      # you can modify `rel', but cannot `oth'.
       begin
         oth, rel = route_from0(oth)
       rescue
@@ -1364,6 +1363,9 @@ def to_s
           str << ':'
           str << @port.to_s
         end
+        if (@host || @port) && !@path.empty? && !@path.start_with?('/')
+          str << '/'
+        end
         str << @path
         if @query
           str << '?'
@@ -1376,6 +1378,7 @@ def to_s
       end
       str
     end
+    alias to_str to_s
 
     #
     # Compares two URIs.
@@ -1388,29 +1391,18 @@ def ==(oth)
       end
     end
 
+    # Returns the hash value.
     def hash
       self.component_ary.hash
     end
 
+    # Compares with _oth_ for Hash.
     def eql?(oth)
       self.class == oth.class &&
       parser == oth.parser &&
       self.component_ary.eql?(oth.component_ary)
     end
 
-=begin
-
---- Bundler::URI::Generic#===(oth)
-
-=end
-#    def ===(oth)
-#      raise NotImplementedError
-#    end
-
-=begin
-=end
-
-
     # Returns an Array of the components defined from the COMPONENT Array.
     def component_ary
       component.collect do |x|
@@ -1447,7 +1439,7 @@ def select(*components)
       end
     end
 
-    def inspect
+    def inspect # :nodoc:
       "#<#{self.class} #{self}>"
     end
 
diff --git a/lib/bundler/vendor/uri/lib/uri/http.rb b/lib/bundler/vendor/uri/lib/uri/http.rb
index 2c4481064411d7..6c34a469b7c207 100644
--- a/lib/bundler/vendor/uri/lib/uri/http.rb
+++ b/lib/bundler/vendor/uri/lib/uri/http.rb
@@ -85,7 +85,7 @@ def request_uri
     # == Description
     #
     # Returns the authority for an HTTP uri, as defined in
-    # https://datatracker.ietf.org/doc/html/rfc3986/#section-3.2.
+    # https://www.rfc-editor.org/rfc/rfc3986#section-3.2.
     #
     #
     # Example:
@@ -106,7 +106,7 @@ def authority
     # == Description
     #
     # Returns the origin for an HTTP uri, as defined in
-    # https://datatracker.ietf.org/doc/html/rfc6454.
+    # https://www.rfc-editor.org/rfc/rfc6454.
     #
     #
     # Example:
diff --git a/lib/bundler/vendor/uri/lib/uri/rfc2396_parser.rb b/lib/bundler/vendor/uri/lib/uri/rfc2396_parser.rb
index 09c22c9906f8f2..229971f73c6e3b 100644
--- a/lib/bundler/vendor/uri/lib/uri/rfc2396_parser.rb
+++ b/lib/bundler/vendor/uri/lib/uri/rfc2396_parser.rb
@@ -140,11 +140,11 @@ def split(uri)
 
         if !scheme
           raise InvalidURIError,
-            "bad Bundler::URI(absolute but no scheme): #{uri}"
+            "bad Bundler::URI (absolute but no scheme): #{uri}"
         end
         if !opaque && (!path && (!host && !registry))
           raise InvalidURIError,
-            "bad Bundler::URI(absolute but no path): #{uri}"
+            "bad Bundler::URI (absolute but no path): #{uri}"
         end
 
       when @regexp[:REL_URI]
@@ -173,7 +173,7 @@ def split(uri)
         # server        = [ [ userinfo "@" ] hostport ]
 
       else
-        raise InvalidURIError, "bad Bundler::URI(is not Bundler::URI?): #{uri}"
+        raise InvalidURIError, "bad Bundler::URI (is not Bundler::URI?): #{uri}"
       end
 
       path = '' if !path && !opaque # (see RFC2396 Section 5.2)
@@ -321,14 +321,14 @@ def unescape(str, escaped = @regexp[:ESCAPED])
       str.gsub(escaped) { [$&[1, 2]].pack('H2').force_encoding(enc) }
     end
 
-    @@to_s = Kernel.instance_method(:to_s)
-    if @@to_s.respond_to?(:bind_call)
-      def inspect
-        @@to_s.bind_call(self)
+    TO_S = Kernel.instance_method(:to_s) # :nodoc:
+    if TO_S.respond_to?(:bind_call)
+      def inspect # :nodoc:
+        TO_S.bind_call(self)
       end
     else
-      def inspect
-        @@to_s.bind(self).call
+      def inspect # :nodoc:
+        TO_S.bind(self).call
       end
     end
 
@@ -536,4 +536,11 @@ def convert_to_uri(uri)
     end
 
   end # class Parser
+
+  # Backward compatibility for Bundler::URI::REGEXP::PATTERN::*
+  RFC2396_Parser.new.pattern.each_pair do |sym, str|
+    unless RFC2396_REGEXP::PATTERN.const_defined?(sym, false)
+      RFC2396_REGEXP::PATTERN.const_set(sym, str)
+    end
+  end
 end # module Bundler::URI
diff --git a/lib/bundler/vendor/uri/lib/uri/rfc3986_parser.rb b/lib/bundler/vendor/uri/lib/uri/rfc3986_parser.rb
index a85511c1460775..d1ff28df2338b6 100644
--- a/lib/bundler/vendor/uri/lib/uri/rfc3986_parser.rb
+++ b/lib/bundler/vendor/uri/lib/uri/rfc3986_parser.rb
@@ -1,9 +1,73 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 module Bundler::URI
   class RFC3986_Parser # :nodoc:
     # Bundler::URI defined in RFC3986
-    RFC3986_URI = /\A(?<Bundler::URI>(?<scheme>[A-Za-z][+\-.0-9A-Za-z]*+):(?<hier-part>\/\/(?<authority>(?:(?<userinfo>(?:%\h\h|[!$&-.0-;=A-Z_a-z~])*+)@)?(?<host>(?<IP-literal>\[(?:(?<IPv6address>(?:\h{1,4}:){6}(?<ls32>\h{1,4}:\h{1,4}|(?<IPv4address>(?<dec-octet>[1-9]\d|1\d{2}|2[0-4]\d|25[0-5]|\d)\.\g<dec-octet>\.\g<dec-octet>\.\g<dec-octet>))|::(?:\h{1,4}:){5}\g<ls32>|\h{1,4}?::(?:\h{1,4}:){4}\g<ls32>|(?:(?:\h{1,4}:)?\h{1,4})?::(?:\h{1,4}:){3}\g<ls32>|(?:(?:\h{1,4}:){,2}\h{1,4})?::(?:\h{1,4}:){2}\g<ls32>|(?:(?:\h{1,4}:){,3}\h{1,4})?::\h{1,4}:\g<ls32>|(?:(?:\h{1,4}:){,4}\h{1,4})?::\g<ls32>|(?:(?:\h{1,4}:){,5}\h{1,4})?::\h{1,4}|(?:(?:\h{1,4}:){,6}\h{1,4})?::)|(?<IPvFuture>v\h++\.[!$&-.0-;=A-Z_a-z~]++))\])|\g<IPv4address>|(?<reg-name>(?:%\h\h|[!$&-.0-9;=A-Z_a-z~])*+))(?::(?<port>\d*+))?)(?<path-abempty>(?:\/(?<segment>(?:%\h\h|[!$&-.0-;=@-Z_a-z~])*+))*+)|(?<path-absolute>\/(?:(?<segment-nz>(?:%\h\h|[!$&-.0-;=@-Z_a-z~])++)(?:\/\g<segment>)*+)?)|(?<path-rootless>\g<segment-nz>(?:\/\g<segment>)*+)|(?<path-empty>))(?:\?(?<query>[^#]*+))?(?:\#(?<fragment>(?:%\h\h|[!$&-.0-;=@-Z_a-z~\/?])*+))?)\z/
-    RFC3986_relative_ref = /\A(?<relative-ref>(?<relative-part>\/\/(?<authority>(?:(?<userinfo>(?:%\h\h|[!$&-.0-;=A-Z_a-z~])*+)@)?(?<host>(?<IP-literal>\[(?:(?<IPv6address>(?:\h{1,4}:){6}(?<ls32>\h{1,4}:\h{1,4}|(?<IPv4address>(?<dec-octet>[1-9]\d|1\d{2}|2[0-4]\d|25[0-5]|\d)\.\g<dec-octet>\.\g<dec-octet>\.\g<dec-octet>))|::(?:\h{1,4}:){5}\g<ls32>|\h{1,4}?::(?:\h{1,4}:){4}\g<ls32>|(?:(?:\h{1,4}:){,1}\h{1,4})?::(?:\h{1,4}:){3}\g<ls32>|(?:(?:\h{1,4}:){,2}\h{1,4})?::(?:\h{1,4}:){2}\g<ls32>|(?:(?:\h{1,4}:){,3}\h{1,4})?::\h{1,4}:\g<ls32>|(?:(?:\h{1,4}:){,4}\h{1,4})?::\g<ls32>|(?:(?:\h{1,4}:){,5}\h{1,4})?::\h{1,4}|(?:(?:\h{1,4}:){,6}\h{1,4})?::)|(?<IPvFuture>v\h++\.[!$&-.0-;=A-Z_a-z~]++))\])|\g<IPv4address>|(?<reg-name>(?:%\h\h|[!$&-.0-9;=A-Z_a-z~])++))?(?::(?<port>\d*+))?)(?<path-abempty>(?:\/(?<segment>(?:%\h\h|[!$&-.0-;=@-Z_a-z~])*+))*+)|(?<path-absolute>\/(?:(?<segment-nz>(?:%\h\h|[!$&-.0-;=@-Z_a-z~])++)(?:\/\g<segment>)*+)?)|(?<path-noscheme>(?<segment-nz-nc>(?:%\h\h|[!$&-.0-9;=@-Z_a-z~])++)(?:\/\g<segment>)*+)|(?<path-empty>))(?:\?(?<query>[^#]*+))?(?:\#(?<fragment>(?:%\h\h|[!$&-.0-;=@-Z_a-z~\/?])*+))?)\z/
+    HOST = %r[
+      (?<IP-literal>\[(?:
+          (?<IPv6address>
+            (?:\h{1,4}:){6}
+            (?<ls32>\h{1,4}:\h{1,4}
+            | (?<IPv4address>(?<dec-octet>[1-9]\d|1\d{2}|2[0-4]\d|25[0-5]|\d)
+                \.\g<dec-octet>\.\g<dec-octet>\.\g<dec-octet>)
+            )
+          | ::(?:\h{1,4}:){5}\g<ls32>
+          | \h{1,4}?::(?:\h{1,4}:){4}\g<ls32>
+          | (?:(?:\h{1,4}:)?\h{1,4})?::(?:\h{1,4}:){3}\g<ls32>
+          | (?:(?:\h{1,4}:){,2}\h{1,4})?::(?:\h{1,4}:){2}\g<ls32>
+          | (?:(?:\h{1,4}:){,3}\h{1,4})?::\h{1,4}:\g<ls32>
+          | (?:(?:\h{1,4}:){,4}\h{1,4})?::\g<ls32>
+          | (?:(?:\h{1,4}:){,5}\h{1,4})?::\h{1,4}
+          | (?:(?:\h{1,4}:){,6}\h{1,4})?::
+          )
+        | (?<IPvFuture>v\h++\.[!$&-.0-9:;=A-Z_a-z~]++)
+        )\])
+    | \g<IPv4address>
+    | (?<reg-name>(?:%\h\h|[!$&-.0-9;=A-Z_a-z~])*+)
+    ]x
+
+    USERINFO = /(?:%\h\h|[!$&-.0-9:;=A-Z_a-z~])*+/
+
+    SCHEME = %r[[A-Za-z][+\-.0-9A-Za-z]*+].source
+    SEG = %r[(?:%\h\h|[!$&-.0-9:;=@A-Z_a-z~/])].source
+    SEG_NC = %r[(?:%\h\h|[!$&-.0-9;=@A-Z_a-z~])].source
+    FRAGMENT = %r[(?:%\h\h|[!$&-.0-9:;=@A-Z_a-z~/?])*+].source
+
+    RFC3986_URI = %r[\A
+    (?<seg>#{SEG}){0}
+    (?<Bundler::URI>
+      (?<scheme>#{SCHEME}):
+      (?<hier-part>//
+        (?<authority>
+          (?:(?<userinfo>#{USERINFO.source})@)?
+          (?<host>#{HOST.source.delete(" \n")})
+          (?::(?<port>\d*+))?
+        )
+        (?<path-abempty>(?:/\g<seg>*+)?)
+      | (?<path-absolute>/((?!/)\g<seg>++)?)
+      | (?<path-rootless>(?!/)\g<seg>++)
+      | (?<path-empty>)
+      )
+      (?:\?(?<query>[^\#]*+))?
+      (?:\#(?<fragment>#{FRAGMENT}))?
+    )\z]x
+
+    RFC3986_relative_ref = %r[\A
+    (?<seg>#{SEG}){0}
+    (?<relative-ref>
+      (?<relative-part>//
+        (?<authority>
+          (?:(?<userinfo>#{USERINFO.source})@)?
+          (?<host>#{HOST.source.delete(" \n")}(?<!/))?
+          (?::(?<port>\d*+))?
+        )
+        (?<path-abempty>(?:/\g<seg>*+)?)
+      | (?<path-absolute>/\g<seg>*+)
+      | (?<path-noscheme>#{SEG_NC}++(?:/\g<seg>*+)?)
+      | (?<path-empty>)
+      )
+      (?:\?(?<query>[^#]*+))?
+      (?:\#(?<fragment>#{FRAGMENT}))?
+    )\z]x
     attr_reader :regexp
 
     def initialize
@@ -14,14 +78,14 @@ def split(uri) #:nodoc:
       begin
         uri = uri.to_str
       rescue NoMethodError
-        raise InvalidURIError, "bad Bundler::URI(is not Bundler::URI?): #{uri.inspect}"
+        raise InvalidURIError, "bad Bundler::URI (is not Bundler::URI?): #{uri.inspect}"
       end
       uri.ascii_only? or
         raise InvalidURIError, "Bundler::URI must be ascii only #{uri.dump}"
       if m = RFC3986_URI.match(uri)
-        query = m["query".freeze]
-        scheme = m["scheme".freeze]
-        opaque = m["path-rootless".freeze]
+        query = m["query"]
+        scheme = m["scheme"]
+        opaque = m["path-rootless"]
         if opaque
           opaque << "?#{query}" if query
           [ scheme,
@@ -32,38 +96,38 @@ def split(uri) #:nodoc:
             nil, # path
             opaque,
             nil, # query
-            m["fragment".freeze]
+            m["fragment"]
           ]
         else # normal
           [ scheme,
-            m["userinfo".freeze],
-            m["host".freeze],
-            m["port".freeze],
+            m["userinfo"],
+            m["host"],
+            m["port"],
             nil, # registry
-            (m["path-abempty".freeze] ||
-             m["path-absolute".freeze] ||
-             m["path-empty".freeze]),
+            (m["path-abempty"] ||
+             m["path-absolute"] ||
+             m["path-empty"]),
             nil, # opaque
             query,
-            m["fragment".freeze]
+            m["fragment"]
           ]
         end
       elsif m = RFC3986_relative_ref.match(uri)
         [ nil, # scheme
-          m["userinfo".freeze],
-          m["host".freeze],
-          m["port".freeze],
+          m["userinfo"],
+          m["host"],
+          m["port"],
           nil, # registry,
-          (m["path-abempty".freeze] ||
-           m["path-absolute".freeze] ||
-           m["path-noscheme".freeze] ||
-           m["path-empty".freeze]),
+          (m["path-abempty"] ||
+           m["path-absolute"] ||
+           m["path-noscheme"] ||
+           m["path-empty"]),
           nil, # opaque
-          m["query".freeze],
-          m["fragment".freeze]
+          m["query"],
+          m["fragment"]
         ]
       else
-        raise InvalidURIError, "bad Bundler::URI(is not Bundler::URI?): #{uri.inspect}"
+        raise InvalidURIError, "bad Bundler::URI (is not Bundler::URI?): #{uri.inspect}"
       end
     end
 
@@ -71,12 +135,35 @@ def parse(uri) # :nodoc:
       Bundler::URI.for(*self.split(uri), self)
     end
 
-
     def join(*uris) # :nodoc:
       uris[0] = convert_to_uri(uris[0])
       uris.inject :merge
     end
 
+    # Compatibility for RFC2396 parser
+    def extract(str, schemes = nil, &block) # :nodoc:
+      warn "Bundler::URI::RFC3986_PARSER.extract is obsolete. Use Bundler::URI::RFC2396_PARSER.extract explicitly.", uplevel: 1 if $VERBOSE
+      RFC2396_PARSER.extract(str, schemes, &block)
+    end
+
+    # Compatibility for RFC2396 parser
+    def make_regexp(schemes = nil) # :nodoc:
+      warn "Bundler::URI::RFC3986_PARSER.make_regexp is obsolete. Use Bundler::URI::RFC2396_PARSER.make_regexp explicitly.", uplevel: 1 if $VERBOSE
+      RFC2396_PARSER.make_regexp(schemes)
+    end
+
+    # Compatibility for RFC2396 parser
+    def escape(str, unsafe = nil) # :nodoc:
+      warn "Bundler::URI::RFC3986_PARSER.escape is obsolete. Use Bundler::URI::RFC2396_PARSER.escape explicitly.", uplevel: 1 if $VERBOSE
+      unsafe ? RFC2396_PARSER.escape(str, unsafe) : RFC2396_PARSER.escape(str)
+    end
+
+    # Compatibility for RFC2396 parser
+    def unescape(str, escaped = nil) # :nodoc:
+      warn "Bundler::URI::RFC3986_PARSER.unescape is obsolete. Use Bundler::URI::RFC2396_PARSER.unescape explicitly.", uplevel: 1 if $VERBOSE
+      escaped ? RFC2396_PARSER.unescape(str, escaped) : RFC2396_PARSER.unescape(str)
+    end
+
     @@to_s = Kernel.instance_method(:to_s)
     if @@to_s.respond_to?(:bind_call)
       def inspect
@@ -92,14 +179,14 @@ def inspect
 
     def default_regexp # :nodoc:
       {
-        SCHEME: /\A[A-Za-z][A-Za-z0-9+\-.]*\z/,
-        USERINFO: /\A(?:%\h\h|[!$&-.0-;=A-Z_a-z~])*\z/,
-        HOST: /\A(?:(?<IP-literal>\[(?:(?<IPv6address>(?:\h{1,4}:){6}(?<ls32>\h{1,4}:\h{1,4}|(?<IPv4address>(?<dec-octet>[1-9]\d|1\d{2}|2[0-4]\d|25[0-5]|\d)\.\g<dec-octet>\.\g<dec-octet>\.\g<dec-octet>))|::(?:\h{1,4}:){5}\g<ls32>|\h{,4}::(?:\h{1,4}:){4}\g<ls32>|(?:(?:\h{1,4}:)?\h{1,4})?::(?:\h{1,4}:){3}\g<ls32>|(?:(?:\h{1,4}:){,2}\h{1,4})?::(?:\h{1,4}:){2}\g<ls32>|(?:(?:\h{1,4}:){,3}\h{1,4})?::\h{1,4}:\g<ls32>|(?:(?:\h{1,4}:){,4}\h{1,4})?::\g<ls32>|(?:(?:\h{1,4}:){,5}\h{1,4})?::\h{1,4}|(?:(?:\h{1,4}:){,6}\h{1,4})?::)|(?<IPvFuture>v\h+\.[!$&-.0-;=A-Z_a-z~]+))\])|\g<IPv4address>|(?<reg-name>(?:%\h\h|[!$&-.0-9;=A-Z_a-z~])*))\z/,
-        ABS_PATH: /\A\/(?:%\h\h|[!$&-.0-;=@-Z_a-z~])*(?:\/(?:%\h\h|[!$&-.0-;=@-Z_a-z~])*)*\z/,
-        REL_PATH: /\A(?:%\h\h|[!$&-.0-;=@-Z_a-z~])+(?:\/(?:%\h\h|[!$&-.0-;=@-Z_a-z~])*)*\z/,
-        QUERY: /\A(?:%\h\h|[!$&-.0-;=@-Z_a-z~\/?])*\z/,
-        FRAGMENT: /\A(?:%\h\h|[!$&-.0-;=@-Z_a-z~\/?])*\z/,
-        OPAQUE: /\A(?:[^\/].*)?\z/,
+        SCHEME: %r[\A#{SCHEME}\z]o,
+        USERINFO: %r[\A#{USERINFO}\z]o,
+        HOST: %r[\A#{HOST}\z]o,
+        ABS_PATH: %r[\A/#{SEG}*+\z]o,
+        REL_PATH: %r[\A(?!/)#{SEG}++\z]o,
+        QUERY: %r[\A(?:%\h\h|[!$&-.0-9:;=@A-Z_a-z~/?])*+\z],
+        FRAGMENT: %r[\A#{FRAGMENT}\z]o,
+        OPAQUE: %r[\A(?:[^/].*)?\z],
         PORT: /\A[\x09\x0a\x0c\x0d ]*+\d*[\x09\x0a\x0c\x0d ]*\z/,
       }
     end
diff --git a/lib/bundler/vendor/uri/lib/uri/version.rb b/lib/bundler/vendor/uri/lib/uri/version.rb
index 84b08eee309b1a..d4996a12e2929b 100644
--- a/lib/bundler/vendor/uri/lib/uri/version.rb
+++ b/lib/bundler/vendor/uri/lib/uri/version.rb
@@ -1,6 +1,6 @@
 module Bundler::URI
   # :stopdoc:
-  VERSION_CODE = '001202'.freeze
+  VERSION_CODE = '010003'.freeze
   VERSION = VERSION_CODE.scan(/../).collect{|n| n.to_i}.join('.').freeze
   # :startdoc:
 end
diff --git a/lib/bundler/vendored_net_http.rb b/lib/bundler/vendored_net_http.rb
new file mode 100644
index 00000000000000..8ff2ccd1fe877d
--- /dev/null
+++ b/lib/bundler/vendored_net_http.rb
@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+# This defined? guard can be removed once RubyGems 3.4 support is dropped.
+#
+# Bundler specs load this code from `spec/support/vendored_net_http.rb` to avoid
+# activating the Bundler gem too early. Without this guard, we get redefinition
+# warnings once Bundler is actually activated and
+# `lib/bundler/vendored_net_http.rb` is required. This is not an issue in
+# RubyGems versions including `rubygems/vendored_net_http` since `require` takes
+# care of avoiding the double load.
+#
+unless defined?(Gem::Net)
+  begin
+    require "rubygems/vendored_net_http"
+  rescue LoadError
+    begin
+      require "rubygems/net/http"
+    rescue LoadError
+      require "net/http"
+      Gem::Net = Net
+    end
+  end
+end
diff --git a/lib/bundler/vendored_persistent.rb b/lib/bundler/vendored_persistent.rb
index e29f27cdfd54d9..ab985c267f252c 100644
--- a/lib/bundler/vendored_persistent.rb
+++ b/lib/bundler/vendored_persistent.rb
@@ -9,7 +9,3 @@ module HTTP
   end
 end
 require_relative "vendor/net-http-persistent/lib/net/http/persistent"
-
-module Bundler
-  PersistentHTTP = Persistent::Net::HTTP::Persistent
-end
diff --git a/lib/bundler/vendored_securerandom.rb b/lib/bundler/vendored_securerandom.rb
new file mode 100644
index 00000000000000..6a704dbd40e487
--- /dev/null
+++ b/lib/bundler/vendored_securerandom.rb
@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+# Use RubyGems vendored copy when available. Otherwise fallback to Bundler
+# vendored copy. The vendored copy in Bundler can be removed once support for
+# RubyGems 3.5.18 is dropped.
+
+begin
+  require "rubygems/vendored_securerandom"
+rescue LoadError
+  require_relative "vendor/securerandom/lib/securerandom"
+  Gem::SecureRandom = Bundler::SecureRandom
+end
diff --git a/lib/bundler/vendored_timeout.rb b/lib/bundler/vendored_timeout.rb
new file mode 100644
index 00000000000000..9b2507c0cc8a13
--- /dev/null
+++ b/lib/bundler/vendored_timeout.rb
@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+begin
+  require "rubygems/vendored_timeout"
+rescue LoadError
+  begin
+    require "rubygems/timeout"
+  rescue LoadError
+    require "timeout"
+    Gem::Timeout = Timeout
+  end
+end
diff --git a/lib/bundler/vendored_uri.rb b/lib/bundler/vendored_uri.rb
index 905e8158e8ed2b..2efddc65f997a8 100644
--- a/lib/bundler/vendored_uri.rb
+++ b/lib/bundler/vendored_uri.rb
@@ -1,4 +1,21 @@
 # frozen_string_literal: true
 
 module Bundler; end
-require_relative "vendor/uri/lib/uri"
+
+# Use RubyGems vendored copy when available. Otherwise fallback to Bundler
+# vendored copy. The vendored copy in Bundler can be removed once support for
+# RubyGems 3.5 is dropped.
+
+begin
+  require "rubygems/vendor/uri/lib/uri"
+rescue LoadError
+  require_relative "vendor/uri/lib/uri"
+  Gem::URI = Bundler::URI
+
+  module Gem
+    def URI(uri) # rubocop:disable Naming/MethodName
+      Bundler::URI(uri)
+    end
+    module_function :URI
+  end
+end
diff --git a/lib/bundler/version.rb b/lib/bundler/version.rb
index 7c03d8687fb547..f2e654b08a5b7c 100644
--- a/lib/bundler/version.rb
+++ b/lib/bundler/version.rb
@@ -1,13 +1,21 @@
 # frozen_string_literal: false
 
 module Bundler
-  VERSION = "2.5.0.dev".freeze
+  VERSION = "2.7.0.dev".freeze
 
   def self.bundler_major_version
-    @bundler_major_version ||= VERSION.split(".").first.to_i
+    @bundler_major_version ||= gem_version.segments.first
   end
 
   def self.gem_version
     @gem_version ||= Gem::Version.create(VERSION)
   end
+
+  def self.verbose_version
+    @verbose_version ||= "#{VERSION}#{simulated_version ? " (simulating Bundler #{simulated_version})" : ""}"
+  end
+
+  def self.simulated_version
+    @simulated_version ||= Bundler.settings[:simulate_version]
+  end
 end
diff --git a/lib/bundler/vlad.rb b/lib/bundler/vlad.rb
index 538e8c3e749386..6179d0e4eb5d12 100644
--- a/lib/bundler/vlad.rb
+++ b/lib/bundler/vlad.rb
@@ -13,5 +13,5 @@
 include Rake::DSL if defined? Rake::DSL
 
 namespace :vlad do
-  Bundler::Deployment.define_task(Rake::RemoteTask, :remote_task, :roles => :app)
+  Bundler::Deployment.define_task(Rake::RemoteTask, :remote_task, roles: :app)
 end
diff --git a/lib/bundler/worker.rb b/lib/bundler/worker.rb
index 3ebd6f01db1ca2..7137484cc6d08d 100644
--- a/lib/bundler/worker.rb
+++ b/lib/bundler/worker.rb
@@ -88,7 +88,7 @@ def create_threads
 
       @threads = Array.new(@size) do |i|
         Thread.start { process_queue(i) }.tap do |thread|
-          thread.name = "#{name} Worker ##{i}" if thread.respond_to?(:name=)
+          thread.name = "#{name} Worker ##{i}"
         end
       rescue ThreadError => e
         creation_errors << e
diff --git a/lib/bundler/yaml_serializer.rb b/lib/bundler/yaml_serializer.rb
index d5ecbd4aef7188..ab1eb6dbcfdab7 100644
--- a/lib/bundler/yaml_serializer.rb
+++ b/lib/bundler/yaml_serializer.rb
@@ -17,7 +17,11 @@ def dump_hash(hash)
         if v.is_a?(Hash)
           yaml << dump_hash(v).gsub(/^(?!$)/, "  ") # indent all non-empty lines
         elsif v.is_a?(Array) # Expected to be array of strings
-          yaml << "\n- " << v.map {|s| s.to_s.gsub(/\s+/, " ").inspect }.join("\n- ") << "\n"
+          if v.empty?
+            yaml << " []\n"
+          else
+            yaml << "\n- " << v.map {|s| s.to_s.gsub(/\s+/, " ").inspect }.join("\n- ") << "\n"
+          end
         else
           yaml << " " << v.to_s.gsub(/\s+/, " ").inspect << "\n"
         end
@@ -32,30 +36,31 @@ def dump_hash(hash)
       (.*) # value
       \1 # matching closing quote
       $
-    /xo.freeze
+    /xo
 
     HASH_REGEX = /
       ^
       ([ ]*) # indentations
-      (.+) # key
+      ([^#]+) # key excludes comment char '#'
       (?::(?=(?:\s|$))) # :  (without the lookahead the #key includes this when : is present in value)
       [ ]?
       (['"]?) # optional opening quote
       (.*) # value
       \3 # matching closing quote
       $
-    /xo.freeze
+    /xo
 
     def load(str)
       res = {}
       stack = [res]
       last_hash = nil
       last_empty_key = nil
-      str.split(/\r?\n/).each do |line|
+      str.split(/\r?\n/) do |line|
         if match = HASH_REGEX.match(line)
           indent, key, quote, val = match.captures
-          key = convert_to_backward_compatible_key(key)
-          depth = indent.scan(/  /).length
+          val = strip_comment(val)
+
+          depth = indent.size / 2
           if quote.empty? && val.empty?
             new_hash = {}
             stack[depth][key] = new_hash
@@ -63,10 +68,13 @@ def load(str)
             last_empty_key = key
             last_hash = stack[depth]
           else
+            val = [] if val == "[]" # empty array
             stack[depth][key] = val
           end
         elsif match = ARRAY_REGEX.match(line)
           _, val = match.captures
+          val = strip_comment(val)
+
           last_hash[last_empty_key] = [] unless last_hash[last_empty_key].is_a?(Array)
 
           last_hash[last_empty_key].push(val)
@@ -75,15 +83,16 @@ def load(str)
       res
     end
 
-    # for settings' keys
-    def convert_to_backward_compatible_key(key)
-      key = "#{key}/" if key =~ /https?:/i && key !~ %r{/\Z}
-      key = key.gsub(".", "__") if key.include?(".")
-      key
+    def strip_comment(val)
+      if val.include?("#") && !val.start_with?("#")
+        val.split("#", 2).first.strip
+      else
+        val
+      end
     end
 
     class << self
-      private :dump_hash, :convert_to_backward_compatible_key
+      private :dump_hash
     end
   end
 end
diff --git a/lib/cgi.rb b/lib/cgi.rb
index 4cd6b3bd8eb626..b041c1bed13b1c 100644
--- a/lib/cgi.rb
+++ b/lib/cgi.rb
@@ -1,297 +1,7 @@
 # frozen_string_literal: true
-#
-# cgi.rb - cgi support library
-#
-# Copyright (C) 2000  Network Applied Communication Laboratory, Inc.
-#
-# Copyright (C) 2000  Information-technology Promotion Agency, Japan
-#
-# Author: Wakou Aoyama <wakou@ruby-lang.org>
-#
-# Documentation: Wakou Aoyama (RDoc'd and embellished by William Webber)
-#
 
-# == Overview
-#
-# The Common Gateway Interface (CGI) is a simple protocol for passing an HTTP
-# request from a web server to a standalone program, and returning the output
-# to the web browser.  Basically, a CGI program is called with the parameters
-# of the request passed in either in the environment (GET) or via $stdin
-# (POST), and everything it prints to $stdout is returned to the client.
-#
-# This file holds the CGI class.  This class provides functionality for
-# retrieving HTTP request parameters, managing cookies, and generating HTML
-# output.
-#
-# The file CGI::Session provides session management functionality; see that
-# class for more details.
-#
-# See http://www.w3.org/CGI/ for more information on the CGI protocol.
-#
-# == Introduction
-#
-# CGI is a large class, providing several categories of methods, many of which
-# are mixed in from other modules.  Some of the documentation is in this class,
-# some in the modules CGI::QueryExtension and CGI::HtmlExtension.  See
-# CGI::Cookie for specific information on handling cookies, and cgi/session.rb
-# (CGI::Session) for information on sessions.
-#
-# For queries, CGI provides methods to get at environmental variables,
-# parameters, cookies, and multipart request data.  For responses, CGI provides
-# methods for writing output and generating HTML.
-#
-# Read on for more details.  Examples are provided at the bottom.
-#
-# == Queries
-#
-# The CGI class dynamically mixes in parameter and cookie-parsing
-# functionality,  environmental variable access, and support for
-# parsing multipart requests (including uploaded files) from the
-# CGI::QueryExtension module.
-#
-# === Environmental Variables
-#
-# The standard CGI environmental variables are available as read-only
-# attributes of a CGI object.  The following is a list of these variables:
-#
-#
-#   AUTH_TYPE               HTTP_HOST          REMOTE_IDENT
-#   CONTENT_LENGTH          HTTP_NEGOTIATE     REMOTE_USER
-#   CONTENT_TYPE            HTTP_PRAGMA        REQUEST_METHOD
-#   GATEWAY_INTERFACE       HTTP_REFERER       SCRIPT_NAME
-#   HTTP_ACCEPT             HTTP_USER_AGENT    SERVER_NAME
-#   HTTP_ACCEPT_CHARSET     PATH_INFO          SERVER_PORT
-#   HTTP_ACCEPT_ENCODING    PATH_TRANSLATED    SERVER_PROTOCOL
-#   HTTP_ACCEPT_LANGUAGE    QUERY_STRING       SERVER_SOFTWARE
-#   HTTP_CACHE_CONTROL      REMOTE_ADDR
-#   HTTP_FROM               REMOTE_HOST
-#
-#
-# For each of these variables, there is a corresponding attribute with the
-# same name, except all lower case and without a preceding HTTP_.
-# +content_length+ and +server_port+ are integers; the rest are strings.
-#
-# === Parameters
-#
-# The method #params() returns a hash of all parameters in the request as
-# name/value-list pairs, where the value-list is an Array of one or more
-# values.  The CGI object itself also behaves as a hash of parameter names
-# to values, but only returns a single value (as a String) for each
-# parameter name.
-#
-# For instance, suppose the request contains the parameter
-# "favourite_colours" with the multiple values "blue" and "green".  The
-# following behavior would occur:
-#
-#   cgi.params["favourite_colours"]  # => ["blue", "green"]
-#   cgi["favourite_colours"]         # => "blue"
-#
-# If a parameter does not exist, the former method will return an empty
-# array, the latter an empty string.  The simplest way to test for existence
-# of a parameter is by the #has_key? method.
-#
-# === Cookies
-#
-# HTTP Cookies are automatically parsed from the request.  They are available
-# from the #cookies() accessor, which returns a hash from cookie name to
-# CGI::Cookie object.
-#
-# === Multipart requests
-#
-# If a request's method is POST and its content type is multipart/form-data,
-# then it may contain uploaded files.  These are stored by the QueryExtension
-# module in the parameters of the request.  The parameter name is the name
-# attribute of the file input field, as usual.  However, the value is not
-# a string, but an IO object, either an IOString for small files, or a
-# Tempfile for larger ones.  This object also has the additional singleton
-# methods:
-#
-# #local_path():: the path of the uploaded file on the local filesystem
-# #original_filename():: the name of the file on the client computer
-# #content_type():: the content type of the file
-#
-# == Responses
-#
-# The CGI class provides methods for sending header and content output to
-# the HTTP client, and mixes in methods for programmatic HTML generation
-# from CGI::HtmlExtension and CGI::TagMaker modules.  The precise version of HTML
-# to use for HTML generation is specified at object creation time.
-#
-# === Writing output
-#
-# The simplest way to send output to the HTTP client is using the #out() method.
-# This takes the HTTP headers as a hash parameter, and the body content
-# via a block.  The headers can be generated as a string using the #http_header()
-# method.  The output stream can be written directly to using the #print()
-# method.
-#
-# === Generating HTML
-#
-# Each HTML element has a corresponding method for generating that
-# element as a String.  The name of this method is the same as that
-# of the element, all lowercase.  The attributes of the element are
-# passed in as a hash, and the body as a no-argument block that evaluates
-# to a String.  The HTML generation module knows which elements are
-# always empty, and silently drops any passed-in body.  It also knows
-# which elements require matching closing tags and which don't.  However,
-# it does not know what attributes are legal for which elements.
-#
-# There are also some additional HTML generation methods mixed in from
-# the CGI::HtmlExtension module.  These include individual methods for the
-# different types of form inputs, and methods for elements that commonly
-# take particular attributes where the attributes can be directly specified
-# as arguments, rather than via a hash.
-#
-# === Utility HTML escape and other methods like a function.
-#
-# There are some utility tool defined in cgi/util.rb .
-# And when include, you can use utility methods like a function.
-#
-# == Examples of use
-#
-# === Get form values
-#
-#   require "cgi"
-#   cgi = CGI.new
-#   value = cgi['field_name']   # <== value string for 'field_name'
-#     # if not 'field_name' included, then return "".
-#   fields = cgi.keys            # <== array of field names
-#
-#   # returns true if form has 'field_name'
-#   cgi.has_key?('field_name')
-#   cgi.has_key?('field_name')
-#   cgi.include?('field_name')
-#
-# CAUTION! <code>cgi['field_name']</code> returned an Array with the old
-# cgi.rb(included in Ruby 1.6)
-#
-# === Get form values as hash
-#
-#   require "cgi"
-#   cgi = CGI.new
-#   params = cgi.params
-#
-# cgi.params is a hash.
-#
-#   cgi.params['new_field_name'] = ["value"]  # add new param
-#   cgi.params['field_name'] = ["new_value"]  # change value
-#   cgi.params.delete('field_name')           # delete param
-#   cgi.params.clear                          # delete all params
-#
-#
-# === Save form values to file
-#
-#   require "pstore"
-#   db = PStore.new("query.db")
-#   db.transaction do
-#     db["params"] = cgi.params
-#   end
-#
-#
-# === Restore form values from file
-#
-#   require "pstore"
-#   db = PStore.new("query.db")
-#   db.transaction do
-#     cgi.params = db["params"]
-#   end
-#
-#
-# === Get multipart form values
-#
-#   require "cgi"
-#   cgi = CGI.new
-#   value = cgi['field_name']   # <== value string for 'field_name'
-#   value.read                  # <== body of value
-#   value.local_path            # <== path to local file of value
-#   value.original_filename     # <== original filename of value
-#   value.content_type          # <== content_type of value
-#
-# and value has StringIO or Tempfile class methods.
-#
-# === Get cookie values
-#
-#   require "cgi"
-#   cgi = CGI.new
-#   values = cgi.cookies['name']  # <== array of 'name'
-#     # if not 'name' included, then return [].
-#   names = cgi.cookies.keys      # <== array of cookie names
-#
-# and cgi.cookies is a hash.
-#
-# === Get cookie objects
-#
-#   require "cgi"
-#   cgi = CGI.new
-#   for name, cookie in cgi.cookies
-#     cookie.expires = Time.now + 30
-#   end
-#   cgi.out("cookie" => cgi.cookies) {"string"}
-#
-#   cgi.cookies # { "name1" => cookie1, "name2" => cookie2, ... }
-#
-#   require "cgi"
-#   cgi = CGI.new
-#   cgi.cookies['name'].expires = Time.now + 30
-#   cgi.out("cookie" => cgi.cookies['name']) {"string"}
-#
-# === Print http header and html string to $DEFAULT_OUTPUT ($>)
-#
-#   require "cgi"
-#   cgi = CGI.new("html4")  # add HTML generation methods
-#   cgi.out do
-#     cgi.html do
-#       cgi.head do
-#         cgi.title { "TITLE" }
-#       end +
-#       cgi.body do
-#         cgi.form("ACTION" => "uri") do
-#           cgi.p do
-#             cgi.textarea("get_text") +
-#             cgi.br +
-#             cgi.submit
-#           end
-#         end +
-#         cgi.pre do
-#           CGI.escapeHTML(
-#             "params: #{cgi.params.inspect}\n" +
-#             "cookies: #{cgi.cookies.inspect}\n" +
-#             ENV.collect do |key, value|
-#               "#{key} --> #{value}\n"
-#             end.join("")
-#           )
-#         end
-#       end
-#     end
-#   end
-#
-#   # add HTML generation methods
-#   CGI.new("html3")    # html3.2
-#   CGI.new("html4")    # html4.01 (Strict)
-#   CGI.new("html4Tr")  # html4.01 Transitional
-#   CGI.new("html4Fr")  # html4.01 Frameset
-#   CGI.new("html5")    # html5
-#
-# === Some utility methods
-#
-#   require 'cgi/util'
-#   CGI.escapeHTML('Usage: foo "bar" <baz>')
-#
-#
-# === Some utility methods like a function
-#
-#   require 'cgi/util'
-#   include CGI::Util
-#   escapeHTML('Usage: foo "bar" <baz>')
-#   h('Usage: foo "bar" <baz>') # alias
-#
-#
-
-class CGI
-  VERSION = "0.3.6"
-end
-
-require 'cgi/core'
-require 'cgi/cookie'
-require 'cgi/util'
-CGI.autoload(:HtmlExtension, 'cgi/html')
+require "cgi/escape"
+warn <<-WARNING, uplevel: Gem::BUNDLED_GEMS.uplevel if $VERBOSE
+CGI library is removed from Ruby 3.5. Please use cgi/escape instead for CGI.escape and CGI.unescape features.
+If you need to use the full features of CGI library, Please install cgi gem.
+WARNING
diff --git a/lib/cgi/cgi.gemspec b/lib/cgi/cgi.gemspec
deleted file mode 100644
index 381c55a5caeaea..00000000000000
--- a/lib/cgi/cgi.gemspec
+++ /dev/null
@@ -1,42 +0,0 @@
-# frozen_string_literal: true
-
-name = File.basename(__FILE__, ".gemspec")
-version = ["lib", Array.new(name.count("-")+1, "..").join("/")].find do |dir|
-  break File.foreach(File.join(__dir__, dir, "#{name.tr('-', '/')}.rb")) do |line|
-    /^\s*VERSION\s*=\s*"(.*)"/ =~ line and break $1
-  end rescue nil
-end
-
-Gem::Specification.new do |spec|
-  spec.name          = name
-  spec.version       = version
-  spec.authors       = ["Yukihiro Matsumoto"]
-  spec.email         = ["matz@ruby-lang.org"]
-
-  spec.summary       = %q{Support for the Common Gateway Interface protocol.}
-  spec.description   = %q{Support for the Common Gateway Interface protocol.}
-  spec.homepage      = "https://github.com/ruby/cgi"
-  spec.licenses      = ["Ruby", "BSD-2-Clause"]
-  spec.required_ruby_version = ">= 2.5.0"
-
-  spec.metadata["homepage_uri"] = spec.homepage
-  spec.metadata["source_code_uri"] = spec.homepage
-
-  spec.executables   = []
-
-  spec.files = [
-    "LICENSE.txt",
-    "README.md",
-    *Dir["lib{.rb,/**/*.rb}", "bin/*"]  ]
-
-  spec.require_paths = ["lib"]
-
-  if Gem::Platform === spec.platform and spec.platform =~ 'java' or RUBY_ENGINE == 'jruby'
-    spec.platform = 'java'
-    spec.require_paths << "ext/java/org/jruby/ext/cgi/escape/lib"
-    spec.files += Dir["ext/java/**/*.{rb}", "lib/cgi/escape.jar"]
-  else
-    spec.files += Dir["ext/cgi/**/*.{rb,c,h,sh}", "ext/cgi/escape/depend", "lib/cgi/escape.so"]
-    spec.extensions    = ["ext/cgi/escape/extconf.rb"]
-  end
-end
diff --git a/lib/cgi/cookie.rb b/lib/cgi/cookie.rb
deleted file mode 100644
index 9498e2f9faf9f7..00000000000000
--- a/lib/cgi/cookie.rb
+++ /dev/null
@@ -1,209 +0,0 @@
-# frozen_string_literal: true
-require_relative 'util'
-class CGI
-  # Class representing an HTTP cookie.
-  #
-  # In addition to its specific fields and methods, a Cookie instance
-  # is a delegator to the array of its values.
-  #
-  # See RFC 2965.
-  #
-  # == Examples of use
-  #   cookie1 = CGI::Cookie.new("name", "value1", "value2", ...)
-  #   cookie1 = CGI::Cookie.new("name" => "name", "value" => "value")
-  #   cookie1 = CGI::Cookie.new('name'     => 'name',
-  #                             'value'    => ['value1', 'value2', ...],
-  #                             'path'     => 'path',   # optional
-  #                             'domain'   => 'domain', # optional
-  #                             'expires'  => Time.now, # optional
-  #                             'secure'   => true,     # optional
-  #                             'httponly' => true      # optional
-  #                             )
-  #
-  #   cgi.out("cookie" => [cookie1, cookie2]) { "string" }
-  #
-  #   name     = cookie1.name
-  #   values   = cookie1.value
-  #   path     = cookie1.path
-  #   domain   = cookie1.domain
-  #   expires  = cookie1.expires
-  #   secure   = cookie1.secure
-  #   httponly = cookie1.httponly
-  #
-  #   cookie1.name     = 'name'
-  #   cookie1.value    = ['value1', 'value2', ...]
-  #   cookie1.path     = 'path'
-  #   cookie1.domain   = 'domain'
-  #   cookie1.expires  = Time.now + 30
-  #   cookie1.secure   = true
-  #   cookie1.httponly = true
-  class Cookie < Array
-    @@accept_charset="UTF-8" unless defined?(@@accept_charset)
-
-    TOKEN_RE = %r"\A[[!-~]&&[^()<>@,;:\\\"/?=\[\]{}]]+\z"
-    PATH_VALUE_RE = %r"\A[[ -~]&&[^;]]*\z"
-    DOMAIN_VALUE_RE = %r"\A\.?(?<label>(?!-)[-A-Za-z0-9]+(?<!-))(?:\.\g<label>)*\z"
-
-    # Create a new CGI::Cookie object.
-    #
-    # :call-seq:
-    #   Cookie.new(name_string,*value)
-    #   Cookie.new(options_hash)
-    #
-    # +name_string+::
-    #   The name of the cookie; in this form, there is no #domain or
-    #   #expiration.  The #path is gleaned from the +SCRIPT_NAME+ environment
-    #   variable, and #secure is false.
-    # <tt>*value</tt>::
-    #   value or list of values of the cookie
-    # +options_hash+::
-    #   A Hash of options to initialize this Cookie.  Possible options are:
-    #
-    #   name:: the name of the cookie.  Required.
-    #   value:: the cookie's value or list of values.
-    #   path:: the path for which this cookie applies.  Defaults to
-    #          the value of the +SCRIPT_NAME+ environment variable.
-    #   domain:: the domain for which this cookie applies.
-    #   expires:: the time at which this cookie expires, as a +Time+ object.
-    #   secure:: whether this cookie is a secure cookie or not (default to
-    #            false).  Secure cookies are only transmitted to HTTPS
-    #            servers.
-    #   httponly:: whether this cookie is a HttpOnly cookie or not (default to
-    #            false).  HttpOnly cookies are not available to javascript.
-    #
-    #   These keywords correspond to attributes of the cookie object.
-    def initialize(name = "", *value)
-      @domain = nil
-      @expires = nil
-      if name.kind_of?(String)
-        self.name = name
-        self.path = (%r|\A(.*/)| =~ ENV["SCRIPT_NAME"] ? $1 : "")
-        @secure = false
-        @httponly = false
-        return super(value)
-      end
-
-      options = name
-      unless options.has_key?("name")
-        raise ArgumentError, "`name' required"
-      end
-
-      self.name = options["name"]
-      value = Array(options["value"])
-      # simple support for IE
-      self.path = options["path"] || (%r|\A(.*/)| =~ ENV["SCRIPT_NAME"] ? $1 : "")
-      self.domain = options["domain"]
-      @expires = options["expires"]
-      @secure = options["secure"] == true
-      @httponly = options["httponly"] == true
-
-      super(value)
-    end
-
-    # Name of this cookie, as a +String+
-    attr_reader :name
-    # Set name of this cookie
-    def name=(str)
-      if str and !TOKEN_RE.match?(str)
-        raise ArgumentError, "invalid name: #{str.dump}"
-      end
-      @name = str
-    end
-
-    # Path for which this cookie applies, as a +String+
-    attr_reader :path
-    # Set path for which this cookie applies
-    def path=(str)
-      if str and !PATH_VALUE_RE.match?(str)
-        raise ArgumentError, "invalid path: #{str.dump}"
-      end
-      @path = str
-    end
-
-    # Domain for which this cookie applies, as a +String+
-    attr_reader :domain
-    # Set domain for which this cookie applies
-    def domain=(str)
-      if str and ((str = str.b).bytesize > 255 or !DOMAIN_VALUE_RE.match?(str))
-        raise ArgumentError, "invalid domain: #{str.dump}"
-      end
-      @domain = str
-    end
-
-    # Time at which this cookie expires, as a +Time+
-    attr_accessor :expires
-    # True if this cookie is secure; false otherwise
-    attr_reader :secure
-    # True if this cookie is httponly; false otherwise
-    attr_reader :httponly
-
-    # Returns the value or list of values for this cookie.
-    def value
-      self
-    end
-
-    # Replaces the value of this cookie with a new value or list of values.
-    def value=(val)
-      replace(Array(val))
-    end
-
-    # Set whether the Cookie is a secure cookie or not.
-    #
-    # +val+ must be a boolean.
-    def secure=(val)
-      @secure = val if val == true or val == false
-      @secure
-    end
-
-    # Set whether the Cookie is a httponly cookie or not.
-    #
-    # +val+ must be a boolean.
-    def httponly=(val)
-      @httponly = !!val
-    end
-
-    # Convert the Cookie to its string representation.
-    def to_s
-      val = collect{|v| CGI.escape(v) }.join("&")
-      buf = "#{@name}=#{val}".dup
-      buf << "; domain=#{@domain}" if @domain
-      buf << "; path=#{@path}"     if @path
-      buf << "; expires=#{CGI.rfc1123_date(@expires)}" if @expires
-      buf << "; secure"            if @secure
-      buf << "; HttpOnly"          if @httponly
-      buf
-    end
-
-    # Parse a raw cookie string into a hash of cookie-name=>Cookie
-    # pairs.
-    #
-    #   cookies = CGI::Cookie.parse("raw_cookie_string")
-    #     # { "name1" => cookie1, "name2" => cookie2, ... }
-    #
-    def self.parse(raw_cookie)
-      cookies = Hash.new([])
-      return cookies unless raw_cookie
-
-      raw_cookie.split(/;\s?/).each do |pairs|
-        name, values = pairs.split('=',2)
-        next unless name and values
-        values ||= ""
-        values = values.split('&').collect{|v| CGI.unescape(v,@@accept_charset) }
-        if cookies.has_key?(name)
-          values = cookies[name].value + values
-        end
-        cookies[name] = Cookie.new(name, *values)
-      end
-
-      cookies
-    end
-
-    # A summary of cookie string.
-    def inspect
-      "#<CGI::Cookie: #{self.to_s.inspect}>"
-    end
-
-  end # class Cookie
-end
-
-
diff --git a/lib/cgi/core.rb b/lib/cgi/core.rb
deleted file mode 100644
index 62e606837a5d5b..00000000000000
--- a/lib/cgi/core.rb
+++ /dev/null
@@ -1,900 +0,0 @@
-# frozen_string_literal: true
-#--
-# Methods for generating HTML, parsing CGI-related parameters, and
-# generating HTTP responses.
-#++
-class CGI
-  unless const_defined?(:Util)
-    module Util
-      @@accept_charset = "UTF-8" # :nodoc:
-    end
-    include Util
-    extend Util
-  end
-
-  $CGI_ENV = ENV    # for FCGI support
-
-  # String for carriage return
-  CR  = "\015"
-
-  # String for linefeed
-  LF  = "\012"
-
-  # Standard internet newline sequence
-  EOL = CR + LF
-
-  REVISION = '$Id$' #:nodoc:
-
-  # Whether processing will be required in binary vs text
-  NEEDS_BINMODE = File::BINARY != 0
-
-  # Path separators in different environments.
-  PATH_SEPARATOR = {'UNIX'=>'/', 'WINDOWS'=>'\\', 'MACINTOSH'=>':'}
-
-  # HTTP status codes.
-  HTTP_STATUS = {
-    "OK"                  => "200 OK",
-    "PARTIAL_CONTENT"     => "206 Partial Content",
-    "MULTIPLE_CHOICES"    => "300 Multiple Choices",
-    "MOVED"               => "301 Moved Permanently",
-    "REDIRECT"            => "302 Found",
-    "NOT_MODIFIED"        => "304 Not Modified",
-    "BAD_REQUEST"         => "400 Bad Request",
-    "AUTH_REQUIRED"       => "401 Authorization Required",
-    "FORBIDDEN"           => "403 Forbidden",
-    "NOT_FOUND"           => "404 Not Found",
-    "METHOD_NOT_ALLOWED"  => "405 Method Not Allowed",
-    "NOT_ACCEPTABLE"      => "406 Not Acceptable",
-    "LENGTH_REQUIRED"     => "411 Length Required",
-    "PRECONDITION_FAILED" => "412 Precondition Failed",
-    "SERVER_ERROR"        => "500 Internal Server Error",
-    "NOT_IMPLEMENTED"     => "501 Method Not Implemented",
-    "BAD_GATEWAY"         => "502 Bad Gateway",
-    "VARIANT_ALSO_VARIES" => "506 Variant Also Negotiates"
-  }
-
-  # :startdoc:
-
-  # Synonym for ENV.
-  def env_table
-    ENV
-  end
-
-  # Synonym for $stdin.
-  def stdinput
-    $stdin
-  end
-
-  # Synonym for $stdout.
-  def stdoutput
-    $stdout
-  end
-
-  private :env_table, :stdinput, :stdoutput
-
-  # Create an HTTP header block as a string.
-  #
-  # :call-seq:
-  #   http_header(content_type_string="text/html")
-  #   http_header(headers_hash)
-  #
-  # Includes the empty line that ends the header block.
-  #
-  # +content_type_string+::
-  #   If this form is used, this string is the <tt>Content-Type</tt>
-  # +headers_hash+::
-  #   A Hash of header values. The following header keys are recognized:
-  #
-  #   type:: The Content-Type header.  Defaults to "text/html"
-  #   charset:: The charset of the body, appended to the Content-Type header.
-  #   nph:: A boolean value.  If true, prepend protocol string and status
-  #         code, and date; and sets default values for "server" and
-  #         "connection" if not explicitly set.
-  #   status::
-  #     The HTTP status code as a String, returned as the Status header.  The
-  #     values are:
-  #
-  #     OK:: 200 OK
-  #     PARTIAL_CONTENT:: 206 Partial Content
-  #     MULTIPLE_CHOICES:: 300 Multiple Choices
-  #     MOVED:: 301 Moved Permanently
-  #     REDIRECT:: 302 Found
-  #     NOT_MODIFIED:: 304 Not Modified
-  #     BAD_REQUEST:: 400 Bad Request
-  #     AUTH_REQUIRED:: 401 Authorization Required
-  #     FORBIDDEN:: 403 Forbidden
-  #     NOT_FOUND:: 404 Not Found
-  #     METHOD_NOT_ALLOWED:: 405 Method Not Allowed
-  #     NOT_ACCEPTABLE:: 406 Not Acceptable
-  #     LENGTH_REQUIRED:: 411 Length Required
-  #     PRECONDITION_FAILED:: 412 Precondition Failed
-  #     SERVER_ERROR:: 500 Internal Server Error
-  #     NOT_IMPLEMENTED:: 501 Method Not Implemented
-  #     BAD_GATEWAY:: 502 Bad Gateway
-  #     VARIANT_ALSO_VARIES:: 506 Variant Also Negotiates
-  #
-  #   server:: The server software, returned as the Server header.
-  #   connection:: The connection type, returned as the Connection header (for
-  #                instance, "close".
-  #   length:: The length of the content that will be sent, returned as the
-  #            Content-Length header.
-  #   language:: The language of the content, returned as the Content-Language
-  #              header.
-  #   expires:: The time on which the current content expires, as a +Time+
-  #             object, returned as the Expires header.
-  #   cookie::
-  #     A cookie or cookies, returned as one or more Set-Cookie headers.  The
-  #     value can be the literal string of the cookie; a CGI::Cookie object;
-  #     an Array of literal cookie strings or Cookie objects; or a hash all of
-  #     whose values are literal cookie strings or Cookie objects.
-  #
-  #     These cookies are in addition to the cookies held in the
-  #     @output_cookies field.
-  #
-  #   Other headers can also be set; they are appended as key: value.
-  #
-  # Examples:
-  #
-  #   http_header
-  #     # Content-Type: text/html
-  #
-  #   http_header("text/plain")
-  #     # Content-Type: text/plain
-  #
-  #   http_header("nph"        => true,
-  #               "status"     => "OK",  # == "200 OK"
-  #                 # "status"     => "200 GOOD",
-  #               "server"     => ENV['SERVER_SOFTWARE'],
-  #               "connection" => "close",
-  #               "type"       => "text/html",
-  #               "charset"    => "iso-2022-jp",
-  #                 # Content-Type: text/html; charset=iso-2022-jp
-  #               "length"     => 103,
-  #               "language"   => "ja",
-  #               "expires"    => Time.now + 30,
-  #               "cookie"     => [cookie1, cookie2],
-  #               "my_header1" => "my_value",
-  #               "my_header2" => "my_value")
-  #
-  # This method does not perform charset conversion.
-  def http_header(options='text/html')
-    if options.is_a?(String)
-      content_type = options
-      buf = _header_for_string(content_type)
-    elsif options.is_a?(Hash)
-      if options.size == 1 && options.has_key?('type')
-        content_type = options['type']
-        buf = _header_for_string(content_type)
-      else
-        buf = _header_for_hash(options.dup)
-      end
-    else
-      raise ArgumentError.new("expected String or Hash but got #{options.class}")
-    end
-    if defined?(MOD_RUBY)
-      _header_for_modruby(buf)
-      return ''
-    else
-      buf << EOL    # empty line of separator
-      return buf
-    end
-  end # http_header()
-
-  # This method is an alias for #http_header, when HTML5 tag maker is inactive.
-  #
-  # NOTE: use #http_header to create HTTP header blocks, this alias is only
-  # provided for backwards compatibility.
-  #
-  # Using #header with the HTML5 tag maker will create a <header> element.
-  alias :header :http_header
-
-  def _no_crlf_check(str)
-    if str
-      str = str.to_s
-      raise "A HTTP status or header field must not include CR and LF" if str =~ /[\r\n]/
-      str
-    else
-      nil
-    end
-  end
-  private :_no_crlf_check
-
-  def _header_for_string(content_type) #:nodoc:
-    buf = ''.dup
-    if nph?()
-      buf << "#{_no_crlf_check($CGI_ENV['SERVER_PROTOCOL']) || 'HTTP/1.0'} 200 OK#{EOL}"
-      buf << "Date: #{CGI.rfc1123_date(Time.now)}#{EOL}"
-      buf << "Server: #{_no_crlf_check($CGI_ENV['SERVER_SOFTWARE'])}#{EOL}"
-      buf << "Connection: close#{EOL}"
-    end
-    buf << "Content-Type: #{_no_crlf_check(content_type)}#{EOL}"
-    if @output_cookies
-      @output_cookies.each {|cookie| buf << "Set-Cookie: #{_no_crlf_check(cookie)}#{EOL}" }
-    end
-    return buf
-  end # _header_for_string
-  private :_header_for_string
-
-  def _header_for_hash(options)  #:nodoc:
-    buf = ''.dup
-    ## add charset to option['type']
-    options['type'] ||= 'text/html'
-    charset = options.delete('charset')
-    options['type'] += "; charset=#{charset}" if charset
-    ## NPH
-    options.delete('nph') if defined?(MOD_RUBY)
-    if options.delete('nph') || nph?()
-      protocol = _no_crlf_check($CGI_ENV['SERVER_PROTOCOL']) || 'HTTP/1.0'
-      status = options.delete('status')
-      status = HTTP_STATUS[status] || _no_crlf_check(status) || '200 OK'
-      buf << "#{protocol} #{status}#{EOL}"
-      buf << "Date: #{CGI.rfc1123_date(Time.now)}#{EOL}"
-      options['server'] ||= $CGI_ENV['SERVER_SOFTWARE'] || ''
-      options['connection'] ||= 'close'
-    end
-    ## common headers
-    status = options.delete('status')
-    buf << "Status: #{HTTP_STATUS[status] || _no_crlf_check(status)}#{EOL}" if status
-    server = options.delete('server')
-    buf << "Server: #{_no_crlf_check(server)}#{EOL}" if server
-    connection = options.delete('connection')
-    buf << "Connection: #{_no_crlf_check(connection)}#{EOL}" if connection
-    type = options.delete('type')
-    buf << "Content-Type: #{_no_crlf_check(type)}#{EOL}" #if type
-    length = options.delete('length')
-    buf << "Content-Length: #{_no_crlf_check(length)}#{EOL}" if length
-    language = options.delete('language')
-    buf << "Content-Language: #{_no_crlf_check(language)}#{EOL}" if language
-    expires = options.delete('expires')
-    buf << "Expires: #{CGI.rfc1123_date(expires)}#{EOL}" if expires
-    ## cookie
-    if cookie = options.delete('cookie')
-      case cookie
-      when String, Cookie
-        buf << "Set-Cookie: #{_no_crlf_check(cookie)}#{EOL}"
-      when Array
-        arr = cookie
-        arr.each {|c| buf << "Set-Cookie: #{_no_crlf_check(c)}#{EOL}" }
-      when Hash
-        hash = cookie
-        hash.each_value {|c| buf << "Set-Cookie: #{_no_crlf_check(c)}#{EOL}" }
-      end
-    end
-    if @output_cookies
-      @output_cookies.each {|c| buf << "Set-Cookie: #{_no_crlf_check(c)}#{EOL}" }
-    end
-    ## other headers
-    options.each do |key, value|
-      buf << "#{_no_crlf_check(key)}: #{_no_crlf_check(value)}#{EOL}"
-    end
-    return buf
-  end # _header_for_hash
-  private :_header_for_hash
-
-  def nph?  #:nodoc:
-    return /IIS\/(\d+)/ =~ $CGI_ENV['SERVER_SOFTWARE'] && $1.to_i < 5
-  end
-
-  def _header_for_modruby(buf)  #:nodoc:
-    request = Apache::request
-    buf.scan(/([^:]+): (.+)#{EOL}/o) do |name, value|
-      $stderr.printf("name:%s value:%s\n", name, value) if $DEBUG
-      case name
-      when 'Set-Cookie'
-        request.headers_out.add(name, value)
-      when /^status$/i
-        request.status_line = value
-        request.status = value.to_i
-      when /^content-type$/i
-        request.content_type = value
-      when /^content-encoding$/i
-        request.content_encoding = value
-      when /^location$/i
-        request.status = 302 if request.status == 200
-        request.headers_out[name] = value
-      else
-        request.headers_out[name] = value
-      end
-    end
-    request.send_http_header
-    return ''
-  end
-  private :_header_for_modruby
-
-  # Print an HTTP header and body to $DEFAULT_OUTPUT ($>)
-  #
-  # :call-seq:
-  #   cgi.out(content_type_string='text/html')
-  #   cgi.out(headers_hash)
-  #
-  # +content_type_string+::
-  #   If a string is passed, it is assumed to be the content type.
-  # +headers_hash+::
-  #   This is a Hash of headers, similar to that used by #http_header.
-  # +block+::
-  #   A block is required and should evaluate to the body of the response.
-  #
-  # <tt>Content-Length</tt> is automatically calculated from the size of
-  # the String returned by the content block.
-  #
-  # If <tt>ENV['REQUEST_METHOD'] == "HEAD"</tt>, then only the header
-  # is output (the content block is still required, but it is ignored).
-  #
-  # If the charset is "iso-2022-jp" or "euc-jp" or "shift_jis" then the
-  # content is converted to this charset, and the language is set to "ja".
-  #
-  # Example:
-  #
-  #   cgi = CGI.new
-  #   cgi.out{ "string" }
-  #     # Content-Type: text/html
-  #     # Content-Length: 6
-  #     #
-  #     # string
-  #
-  #   cgi.out("text/plain") { "string" }
-  #     # Content-Type: text/plain
-  #     # Content-Length: 6
-  #     #
-  #     # string
-  #
-  #   cgi.out("nph"        => true,
-  #           "status"     => "OK",  # == "200 OK"
-  #           "server"     => ENV['SERVER_SOFTWARE'],
-  #           "connection" => "close",
-  #           "type"       => "text/html",
-  #           "charset"    => "iso-2022-jp",
-  #             # Content-Type: text/html; charset=iso-2022-jp
-  #           "language"   => "ja",
-  #           "expires"    => Time.now + (3600 * 24 * 30),
-  #           "cookie"     => [cookie1, cookie2],
-  #           "my_header1" => "my_value",
-  #           "my_header2" => "my_value") { "string" }
-  #      # HTTP/1.1 200 OK
-  #      # Date: Sun, 15 May 2011 17:35:54 GMT
-  #      # Server: Apache 2.2.0
-  #      # Connection: close
-  #      # Content-Type: text/html; charset=iso-2022-jp
-  #      # Content-Length: 6
-  #      # Content-Language: ja
-  #      # Expires: Tue, 14 Jun 2011 17:35:54 GMT
-  #      # Set-Cookie: foo
-  #      # Set-Cookie: bar
-  #      # my_header1: my_value
-  #      # my_header2: my_value
-  #      #
-  #      # string
-  def out(options = "text/html") # :yield:
-
-    options = { "type" => options } if options.kind_of?(String)
-    content = yield
-    options["length"] = content.bytesize.to_s
-    output = stdoutput
-    output.binmode if defined? output.binmode
-    output.print http_header(options)
-    output.print content unless "HEAD" == env_table['REQUEST_METHOD']
-  end
-
-
-  # Print an argument or list of arguments to the default output stream
-  #
-  #   cgi = CGI.new
-  #   cgi.print    # default:  cgi.print == $DEFAULT_OUTPUT.print
-  def print(*options)
-    stdoutput.print(*options)
-  end
-
-  # Parse an HTTP query string into a hash of key=>value pairs.
-  #
-  #   params = CGI.parse("query_string")
-  #     # {"name1" => ["value1", "value2", ...],
-  #     #  "name2" => ["value1", "value2", ...], ... }
-  #
-  def self.parse(query)
-    params = {}
-    query.split(/[&;]/).each do |pairs|
-      key, value = pairs.split('=',2).collect{|v| CGI.unescape(v) }
-
-      next unless key
-
-      params[key] ||= []
-      params[key].push(value) if value
-    end
-
-    params.default=[].freeze
-    params
-  end
-
-  # Maximum content length of post data
-  ##MAX_CONTENT_LENGTH  = 2 * 1024 * 1024
-
-  # Maximum number of request parameters when multipart
-  MAX_MULTIPART_COUNT = 128
-
-  # Mixin module that provides the following:
-  #
-  # 1. Access to the CGI environment variables as methods.  See
-  #    documentation to the CGI class for a list of these variables.  The
-  #    methods are exposed by removing the leading +HTTP_+ (if it exists) and
-  #    downcasing the name.  For example, +auth_type+ will return the
-  #    environment variable +AUTH_TYPE+, and +accept+ will return the value
-  #    for +HTTP_ACCEPT+.
-  #
-  # 2. Access to cookies, including the cookies attribute.
-  #
-  # 3. Access to parameters, including the params attribute, and overloading
-  #    #[] to perform parameter value lookup by key.
-  #
-  # 4. The initialize_query method, for initializing the above
-  #    mechanisms, handling multipart forms, and allowing the
-  #    class to be used in "offline" mode.
-  #
-  module QueryExtension
-
-    %w[ CONTENT_LENGTH SERVER_PORT ].each do |env|
-      define_method(env.delete_prefix('HTTP_').downcase) do
-        (val = env_table[env]) && Integer(val)
-      end
-    end
-
-    %w[ AUTH_TYPE CONTENT_TYPE GATEWAY_INTERFACE PATH_INFO
-        PATH_TRANSLATED QUERY_STRING REMOTE_ADDR REMOTE_HOST
-        REMOTE_IDENT REMOTE_USER REQUEST_METHOD SCRIPT_NAME
-        SERVER_NAME SERVER_PROTOCOL SERVER_SOFTWARE
-
-        HTTP_ACCEPT HTTP_ACCEPT_CHARSET HTTP_ACCEPT_ENCODING
-        HTTP_ACCEPT_LANGUAGE HTTP_CACHE_CONTROL HTTP_FROM HTTP_HOST
-        HTTP_NEGOTIATE HTTP_PRAGMA HTTP_REFERER HTTP_USER_AGENT ].each do |env|
-      define_method(env.delete_prefix('HTTP_').downcase) do
-        env_table[env]
-      end
-    end
-
-    # Get the raw cookies as a string.
-    def raw_cookie
-      env_table["HTTP_COOKIE"]
-    end
-
-    # Get the raw RFC2965 cookies as a string.
-    def raw_cookie2
-      env_table["HTTP_COOKIE2"]
-    end
-
-    # Get the cookies as a hash of cookie-name=>Cookie pairs.
-    attr_accessor :cookies
-
-    # Get the parameters as a hash of name=>values pairs, where
-    # values is an Array.
-    attr_reader :params
-
-    # Get the uploaded files as a hash of name=>values pairs
-    attr_reader :files
-
-    # Set all the parameters.
-    def params=(hash)
-      @params.clear
-      @params.update(hash)
-    end
-
-    ##
-    # Parses multipart form elements according to
-    #   http://www.w3.org/TR/html401/interact/forms.html#h-17.13.4.2
-    #
-    # Returns a hash of multipart form parameters with bodies of type StringIO or
-    # Tempfile depending on whether the multipart form element exceeds 10 KB
-    #
-    #   params[name => body]
-    #
-    def read_multipart(boundary, content_length)
-      ## read first boundary
-      stdin = stdinput
-      first_line = "--#{boundary}#{EOL}"
-      content_length -= first_line.bytesize
-      status = stdin.read(first_line.bytesize)
-      raise EOFError.new("no content body")  unless status
-      raise EOFError.new("bad content body") unless first_line == status
-      ## parse and set params
-      params = {}
-      @files = {}
-      boundary_rexp = /--#{Regexp.quote(boundary)}(#{EOL}|--)/
-      boundary_size = "#{EOL}--#{boundary}#{EOL}".bytesize
-      buf = ''.dup
-      bufsize = 10 * 1024
-      max_count = MAX_MULTIPART_COUNT
-      n = 0
-      tempfiles = []
-      while true
-        (n += 1) < max_count or raise StandardError.new("too many parameters.")
-        ## create body (StringIO or Tempfile)
-        body = create_body(bufsize < content_length)
-        tempfiles << body if defined?(Tempfile) && body.kind_of?(Tempfile)
-        class << body
-          if method_defined?(:path)
-            alias local_path path
-          else
-            def local_path
-              nil
-            end
-          end
-          attr_reader :original_filename, :content_type
-        end
-        ## find head and boundary
-        head = nil
-        separator = EOL * 2
-        until head && matched = boundary_rexp.match(buf)
-          if !head && pos = buf.index(separator)
-            len  = pos + EOL.bytesize
-            head = buf[0, len]
-            buf  = buf[(pos+separator.bytesize)..-1]
-          else
-            if head && buf.size > boundary_size
-              len = buf.size - boundary_size
-              body.print(buf[0, len])
-              buf[0, len] = ''
-            end
-            c = stdin.read(bufsize < content_length ? bufsize : content_length)
-            raise EOFError.new("bad content body") if c.nil? || c.empty?
-            buf << c
-            content_length -= c.bytesize
-          end
-        end
-        ## read to end of boundary
-        m = matched
-        len = m.begin(0)
-        s = buf[0, len]
-        if s =~ /(\r?\n)\z/
-          s = buf[0, len - $1.bytesize]
-        end
-        body.print(s)
-        buf = buf[m.end(0)..-1]
-        boundary_end = m[1]
-        content_length = -1 if boundary_end == '--'
-        ## reset file cursor position
-        body.rewind
-        ## original filename
-        /Content-Disposition:.* filename=(?:"(.*?)"|([^;\r\n]*))/i.match(head)
-        filename = $1 || $2 || ''.dup
-        filename = CGI.unescape(filename) if unescape_filename?()
-        body.instance_variable_set(:@original_filename, filename)
-        ## content type
-        /Content-Type: (.*)/i.match(head)
-        (content_type = $1 || ''.dup).chomp!
-        body.instance_variable_set(:@content_type, content_type)
-        ## query parameter name
-        /Content-Disposition:.* name=(?:"(.*?)"|([^;\r\n]*))/i.match(head)
-        name = $1 || $2 || ''
-        if body.original_filename.empty?
-          value=body.read.dup.force_encoding(@accept_charset)
-          body.close! if defined?(Tempfile) && body.kind_of?(Tempfile)
-          (params[name] ||= []) << value
-          unless value.valid_encoding?
-            if @accept_charset_error_block
-              @accept_charset_error_block.call(name,value)
-            else
-              raise InvalidEncoding,"Accept-Charset encoding error"
-            end
-          end
-          class << params[name].last;self;end.class_eval do
-            define_method(:read){self}
-            define_method(:original_filename){""}
-            define_method(:content_type){""}
-          end
-        else
-          (params[name] ||= []) << body
-          @files[name]=body
-        end
-        ## break loop
-        break if content_length == -1
-      end
-      raise EOFError, "bad boundary end of body part" unless boundary_end =~ /--/
-      params.default = []
-      params
-    rescue Exception
-      if tempfiles
-        tempfiles.each {|t|
-          if t.path
-            t.close!
-          end
-        }
-      end
-      raise
-    end # read_multipart
-    private :read_multipart
-    def create_body(is_large)  #:nodoc:
-      if is_large
-        require 'tempfile'
-        body = Tempfile.new('CGI', encoding: Encoding::ASCII_8BIT)
-      else
-        begin
-          require 'stringio'
-          body = StringIO.new("".b)
-        rescue LoadError
-          require 'tempfile'
-          body = Tempfile.new('CGI', encoding: Encoding::ASCII_8BIT)
-        end
-      end
-      body.binmode if defined? body.binmode
-      return body
-    end
-    def unescape_filename?  #:nodoc:
-      user_agent = $CGI_ENV['HTTP_USER_AGENT']
-      return false unless user_agent
-      return /Mac/i.match(user_agent) && /Mozilla/i.match(user_agent) && !/MSIE/i.match(user_agent)
-    end
-
-    # offline mode. read name=value pairs on standard input.
-    def read_from_cmdline
-      require "shellwords"
-
-      string = unless ARGV.empty?
-        ARGV.join(' ')
-      else
-        if STDIN.tty?
-          STDERR.print(
-            %|(offline mode: enter name=value pairs on standard input)\n|
-          )
-        end
-        array = readlines rescue nil
-        if not array.nil?
-            array.join(' ').gsub(/\n/n, '')
-        else
-            ""
-        end
-      end.gsub(/\\=/n, '%3D').gsub(/\\&/n, '%26')
-
-      words = Shellwords.shellwords(string)
-
-      if words.find{|x| /=/n.match(x) }
-        words.join('&')
-      else
-        words.join('+')
-      end
-    end
-    private :read_from_cmdline
-
-    # A wrapper class to use a StringIO object as the body and switch
-    # to a TempFile when the passed threshold is passed.
-    # Initialize the data from the query.
-    #
-    # Handles multipart forms (in particular, forms that involve file uploads).
-    # Reads query parameters in the @params field, and cookies into @cookies.
-    def initialize_query()
-      if ("POST" == env_table['REQUEST_METHOD']) and
-        %r|\Amultipart/form-data.*boundary=\"?([^\";,]+)\"?| =~ env_table['CONTENT_TYPE']
-        current_max_multipart_length = @max_multipart_length.respond_to?(:call) ? @max_multipart_length.call : @max_multipart_length
-        raise StandardError.new("too large multipart data.") if env_table['CONTENT_LENGTH'].to_i > current_max_multipart_length
-        boundary = $1.dup
-        @multipart = true
-        @params = read_multipart(boundary, Integer(env_table['CONTENT_LENGTH']))
-      else
-        @multipart = false
-        @params = CGI.parse(
-                    case env_table['REQUEST_METHOD']
-                    when "GET", "HEAD"
-                      if defined?(MOD_RUBY)
-                        Apache::request.args or ""
-                      else
-                        env_table['QUERY_STRING'] or ""
-                      end
-                    when "POST"
-                      stdinput.binmode if defined? stdinput.binmode
-                      stdinput.read(Integer(env_table['CONTENT_LENGTH'])) or ''
-                    else
-                      read_from_cmdline
-                    end.dup.force_encoding(@accept_charset)
-                  )
-        unless Encoding.find(@accept_charset) == Encoding::ASCII_8BIT
-          @params.each do |key,values|
-            values.each do |value|
-              unless value.valid_encoding?
-                if @accept_charset_error_block
-                  @accept_charset_error_block.call(key,value)
-                else
-                  raise InvalidEncoding,"Accept-Charset encoding error"
-                end
-              end
-            end
-          end
-        end
-      end
-
-      @cookies = CGI::Cookie.parse((env_table['HTTP_COOKIE'] or env_table['COOKIE']))
-    end
-    private :initialize_query
-
-    # Returns whether the form contained multipart/form-data
-    def multipart?
-      @multipart
-    end
-
-    # Get the value for the parameter with a given key.
-    #
-    # If the parameter has multiple values, only the first will be
-    # retrieved; use #params to get the array of values.
-    def [](key)
-      params = @params[key]
-      return '' unless params
-      value = params[0]
-      if @multipart
-        if value
-          return value
-        elsif defined? StringIO
-          StringIO.new("".b)
-        else
-          Tempfile.new("CGI",encoding: Encoding::ASCII_8BIT)
-        end
-      else
-        str = if value then value.dup else "" end
-        str
-      end
-    end
-
-    # Return all query parameter names as an array of String.
-    def keys(*args)
-      @params.keys(*args)
-    end
-
-    # Returns true if a given query string parameter exists.
-    def has_key?(*args)
-      @params.has_key?(*args)
-    end
-    alias key? has_key?
-    alias include? has_key?
-
-  end # QueryExtension
-
-  # Exception raised when there is an invalid encoding detected
-  class InvalidEncoding < Exception; end
-
-  # @@accept_charset is default accept character set.
-  # This default value default is "UTF-8"
-  # If you want to change the default accept character set
-  # when create a new CGI instance, set this:
-  #
-  #   CGI.accept_charset = "EUC-JP"
-  #
-  @@accept_charset="UTF-8" if false # needed for rdoc?
-
-  # Return the accept character set for all new CGI instances.
-  def self.accept_charset
-    @@accept_charset
-  end
-
-  # Set the accept character set for all new CGI instances.
-  def self.accept_charset=(accept_charset)
-    @@accept_charset=accept_charset
-  end
-
-  # Return the accept character set for this CGI instance.
-  attr_reader :accept_charset
-
-  # @@max_multipart_length is the maximum length of multipart data.
-  # The default value is 128 * 1024 * 1024 bytes
-  #
-  # The default can be set to something else in the CGI constructor,
-  # via the :max_multipart_length key in the option hash.
-  #
-  # See CGI.new documentation.
-  #
-  @@max_multipart_length= 128 * 1024 * 1024
-
-  # Create a new CGI instance.
-  #
-  # :call-seq:
-  #   CGI.new(tag_maker) { block }
-  #   CGI.new(options_hash = {}) { block }
-  #
-  #
-  # <tt>tag_maker</tt>::
-  #   This is the same as using the +options_hash+ form with the value <tt>{
-  #   :tag_maker => tag_maker }</tt> Note that it is recommended to use the
-  #   +options_hash+ form, since it also allows you specify the charset you
-  #   will accept.
-  # <tt>options_hash</tt>::
-  #   A Hash that recognizes three options:
-  #
-  #   <tt>:accept_charset</tt>::
-  #     specifies encoding of received query string.  If omitted,
-  #     <tt>@@accept_charset</tt> is used.  If the encoding is not valid, a
-  #     CGI::InvalidEncoding will be raised.
-  #
-  #     Example. Suppose <tt>@@accept_charset</tt> is "UTF-8"
-  #
-  #     when not specified:
-  #
-  #         cgi=CGI.new      # @accept_charset # => "UTF-8"
-  #
-  #     when specified as "EUC-JP":
-  #
-  #         cgi=CGI.new(:accept_charset => "EUC-JP") # => "EUC-JP"
-  #
-  #   <tt>:tag_maker</tt>::
-  #     String that specifies which version of the HTML generation methods to
-  #     use.  If not specified, no HTML generation methods will be loaded.
-  #
-  #     The following values are supported:
-  #
-  #     "html3":: HTML 3.x
-  #     "html4":: HTML 4.0
-  #     "html4Tr":: HTML 4.0 Transitional
-  #     "html4Fr":: HTML 4.0 with Framesets
-  #     "html5":: HTML 5
-  #
-  #   <tt>:max_multipart_length</tt>::
-  #     Specifies maximum length of multipart data. Can be an Integer scalar or
-  #     a lambda, that will be evaluated when the request is parsed. This
-  #     allows more complex logic to be set when determining whether to accept
-  #     multipart data (e.g. consult a registered users upload allowance)
-  #
-  #     Default is 128 * 1024 * 1024 bytes
-  #
-  #         cgi=CGI.new(:max_multipart_length => 268435456) # simple scalar
-  #
-  #         cgi=CGI.new(:max_multipart_length => -> {check_filesystem}) # lambda
-  #
-  # <tt>block</tt>::
-  #   If provided, the block is called when an invalid encoding is
-  #   encountered. For example:
-  #
-  #     encoding_errors={}
-  #     cgi=CGI.new(:accept_charset=>"EUC-JP") do |name,value|
-  #       encoding_errors[name] = value
-  #     end
-  #
-  # Finally, if the CGI object is not created in a standard CGI call
-  # environment (that is, it can't locate REQUEST_METHOD in its environment),
-  # then it will run in "offline" mode.  In this mode, it reads its parameters
-  # from the command line or (failing that) from standard input.  Otherwise,
-  # cookies and other parameters are parsed automatically from the standard
-  # CGI locations, which varies according to the REQUEST_METHOD.
-  def initialize(options = {}, &block) # :yields: name, value
-    @accept_charset_error_block = block_given? ? block : nil
-    @options={
-      :accept_charset=>@@accept_charset,
-      :max_multipart_length=>@@max_multipart_length
-    }
-    case options
-    when Hash
-      @options.merge!(options)
-    when String
-      @options[:tag_maker]=options
-    end
-    @accept_charset=@options[:accept_charset]
-    @max_multipart_length=@options[:max_multipart_length]
-    if defined?(MOD_RUBY) && !ENV.key?("GATEWAY_INTERFACE")
-      Apache.request.setup_cgi_env
-    end
-
-    extend QueryExtension
-    @multipart = false
-
-    initialize_query()  # set @params, @cookies
-    @output_cookies = nil
-    @output_hidden = nil
-
-    case @options[:tag_maker]
-    when "html3"
-      require_relative 'html'
-      extend Html3
-      extend HtmlExtension
-    when "html4"
-      require_relative 'html'
-      extend Html4
-      extend HtmlExtension
-    when "html4Tr"
-      require_relative 'html'
-      extend Html4Tr
-      extend HtmlExtension
-    when "html4Fr"
-      require_relative 'html'
-      extend Html4Tr
-      extend Html4Fr
-      extend HtmlExtension
-    when "html5"
-      require_relative 'html'
-      extend Html5
-      extend HtmlExtension
-    end
-  end
-
-end   # class CGI
diff --git a/lib/cgi/escape.rb b/lib/cgi/escape.rb
new file mode 100644
index 00000000000000..59a310b32d6187
--- /dev/null
+++ b/lib/cgi/escape.rb
@@ -0,0 +1,224 @@
+# frozen_string_literal: true
+
+class CGI
+  module Escape; end
+  include Escape
+  extend Escape
+end
+
+module CGI::Escape
+  @@accept_charset = Encoding::UTF_8 unless defined?(@@accept_charset)
+
+  # URL-encode a string into application/x-www-form-urlencoded.
+  # Space characters (+" "+) are encoded with plus signs (+"+"+)
+  #   url_encoded_string = CGI.escape("'Stop!' said Fred")
+  #      # => "%27Stop%21%27+said+Fred"
+  def escape(string)
+    encoding = string.encoding
+    buffer = string.b
+    buffer.gsub!(/([^ a-zA-Z0-9_.\-~]+)/) do |m|
+      '%' + m.unpack('H2' * m.bytesize).join('%').upcase
+    end
+    buffer.tr!(' ', '+')
+    buffer.force_encoding(encoding)
+  end
+
+  # URL-decode an application/x-www-form-urlencoded string with encoding(optional).
+  #   string = CGI.unescape("%27Stop%21%27+said+Fred")
+  #      # => "'Stop!' said Fred"
+  def unescape(string, encoding = @@accept_charset)
+    str = string.tr('+', ' ')
+    str = str.b
+    str.gsub!(/((?:%[0-9a-fA-F]{2})+)/) do |m|
+      [m.delete('%')].pack('H*')
+    end
+    str.force_encoding(encoding)
+    str.valid_encoding? ? str : str.force_encoding(string.encoding)
+  end
+
+  # URL-encode a string following RFC 3986
+  # Space characters (+" "+) are encoded with (+"%20"+)
+  #   url_encoded_string = CGI.escapeURIComponent("'Stop!' said Fred")
+  #      # => "%27Stop%21%27%20said%20Fred"
+  def escapeURIComponent(string)
+    encoding = string.encoding
+    buffer = string.b
+    buffer.gsub!(/([^a-zA-Z0-9_.\-~]+)/) do |m|
+      '%' + m.unpack('H2' * m.bytesize).join('%').upcase
+    end
+    buffer.force_encoding(encoding)
+  end
+  alias escape_uri_component escapeURIComponent
+
+  # URL-decode a string following RFC 3986 with encoding(optional).
+  #   string = CGI.unescapeURIComponent("%27Stop%21%27+said%20Fred")
+  #      # => "'Stop!'+said Fred"
+  def unescapeURIComponent(string, encoding = @@accept_charset)
+    str = string.b
+    str.gsub!(/((?:%[0-9a-fA-F]{2})+)/) do |m|
+      [m.delete('%')].pack('H*')
+    end
+    str.force_encoding(encoding)
+    str.valid_encoding? ? str : str.force_encoding(string.encoding)
+  end
+
+  alias unescape_uri_component unescapeURIComponent
+
+  # The set of special characters and their escaped values
+  TABLE_FOR_ESCAPE_HTML__ = {
+    "'" => '&#39;',
+    '&' => '&amp;',
+    '"' => '&quot;',
+    '<' => '&lt;',
+    '>' => '&gt;',
+  }
+
+  # Escape special characters in HTML, namely '&\"<>
+  #   CGI.escapeHTML('Usage: foo "bar" <baz>')
+  #      # => "Usage: foo &quot;bar&quot; &lt;baz&gt;"
+  def escapeHTML(string)
+    enc = string.encoding
+    unless enc.ascii_compatible?
+      if enc.dummy?
+        origenc = enc
+        enc = Encoding::Converter.asciicompat_encoding(enc)
+        string = enc ? string.encode(enc) : string.b
+      end
+      table = Hash[TABLE_FOR_ESCAPE_HTML__.map {|pair|pair.map {|s|s.encode(enc)}}]
+      string = string.gsub(/#{"['&\"<>]".encode(enc)}/, table)
+      string.encode!(origenc) if origenc
+      string
+    else
+      string = string.b
+      string.gsub!(/['&\"<>]/, TABLE_FOR_ESCAPE_HTML__)
+      string.force_encoding(enc)
+    end
+  end
+
+  # Unescape a string that has been HTML-escaped
+  #   CGI.unescapeHTML("Usage: foo &quot;bar&quot; &lt;baz&gt;")
+  #      # => "Usage: foo \"bar\" <baz>"
+  def unescapeHTML(string)
+    enc = string.encoding
+    unless enc.ascii_compatible?
+      if enc.dummy?
+        origenc = enc
+        enc = Encoding::Converter.asciicompat_encoding(enc)
+        string = enc ? string.encode(enc) : string.b
+      end
+      string = string.gsub(Regexp.new('&(apos|amp|quot|gt|lt|#[0-9]+|#x[0-9A-Fa-f]+);'.encode(enc))) do
+        case $1.encode(Encoding::US_ASCII)
+        when 'apos'                then "'".encode(enc)
+        when 'amp'                 then '&'.encode(enc)
+        when 'quot'                then '"'.encode(enc)
+        when 'gt'                  then '>'.encode(enc)
+        when 'lt'                  then '<'.encode(enc)
+        when /\A#0*(\d+)\z/        then $1.to_i.chr(enc)
+        when /\A#x([0-9a-f]+)\z/i  then $1.hex.chr(enc)
+        end
+      end
+      string.encode!(origenc) if origenc
+      return string
+    end
+    return string unless string.include? '&'
+    charlimit = case enc
+                when Encoding::UTF_8; 0x10ffff
+                when Encoding::ISO_8859_1; 256
+                else 128
+                end
+    string = string.b
+    string.gsub!(/&(apos|amp|quot|gt|lt|\#[0-9]+|\#[xX][0-9A-Fa-f]+);/) do
+      match = $1.dup
+      case match
+      when 'apos'                then "'"
+      when 'amp'                 then '&'
+      when 'quot'                then '"'
+      when 'gt'                  then '>'
+      when 'lt'                  then '<'
+      when /\A#0*(\d+)\z/
+        n = $1.to_i
+        if n < charlimit
+          n.chr(enc)
+        else
+          "&##{$1};"
+        end
+      when /\A#x([0-9a-f]+)\z/i
+        n = $1.hex
+        if n < charlimit
+          n.chr(enc)
+        else
+          "&#x#{$1};"
+        end
+      else
+        "&#{match};"
+      end
+    end
+    string.force_encoding enc
+  end
+
+  # Synonym for CGI.escapeHTML(str)
+  alias escape_html escapeHTML
+  alias h escapeHTML
+
+  # Synonym for CGI.unescapeHTML(str)
+  alias unescape_html unescapeHTML
+
+  # TruffleRuby runs the pure-Ruby variant faster, do not use the C extension there
+  unless RUBY_ENGINE == 'truffleruby'
+    begin
+      require 'cgi/escape.so'
+    rescue LoadError
+    end
+  end
+
+  # Escape only the tags of certain HTML elements in +string+.
+  #
+  # Takes an element or elements or array of elements.  Each element
+  # is specified by the name of the element, without angle brackets.
+  # This matches both the start and the end tag of that element.
+  # The attribute list of the open tag will also be escaped (for
+  # instance, the double-quotes surrounding attribute values).
+  #
+  #   print CGI.escapeElement('<BR><A HREF="url"></A>', "A", "IMG")
+  #     # "<BR>&lt;A HREF=&quot;url&quot;&gt;&lt;/A&gt"
+  #
+  #   print CGI.escapeElement('<BR><A HREF="url"></A>', ["A", "IMG"])
+  #     # "<BR>&lt;A HREF=&quot;url&quot;&gt;&lt;/A&gt"
+  def escapeElement(string, *elements)
+    elements = elements[0] if elements[0].kind_of?(Array)
+    unless elements.empty?
+      string.gsub(/<\/?(?:#{elements.join("|")})\b[^<>]*+>?/im) do
+        CGI.escapeHTML($&)
+      end
+    else
+      string
+    end
+  end
+
+  # Undo escaping such as that done by CGI.escapeElement()
+  #
+  #   print CGI.unescapeElement(
+  #           CGI.escapeHTML('<BR><A HREF="url"></A>'), "A", "IMG")
+  #     # "&lt;BR&gt;<A HREF="url"></A>"
+  #
+  #   print CGI.unescapeElement(
+  #           CGI.escapeHTML('<BR><A HREF="url"></A>'), ["A", "IMG"])
+  #     # "&lt;BR&gt;<A HREF="url"></A>"
+  def unescapeElement(string, *elements)
+    elements = elements[0] if elements[0].kind_of?(Array)
+    unless elements.empty?
+      string.gsub(/&lt;\/?(?:#{elements.join("|")})\b(?>[^&]+|&(?![gl]t;)\w+;)*(?:&gt;)?/im) do
+        unescapeHTML($&)
+      end
+    else
+      string
+    end
+  end
+
+  # Synonym for CGI.escapeElement(str)
+  alias escape_element escapeElement
+
+  # Synonym for CGI.unescapeElement(str)
+  alias unescape_element unescapeElement
+
+end
diff --git a/lib/cgi/html.rb b/lib/cgi/html.rb
deleted file mode 100644
index 15439433200344..00000000000000
--- a/lib/cgi/html.rb
+++ /dev/null
@@ -1,1035 +0,0 @@
-# frozen_string_literal: true
-class CGI
-  # Base module for HTML-generation mixins.
-  #
-  # Provides methods for code generation for tags following
-  # the various DTD element types.
-  module TagMaker # :nodoc:
-
-    # Generate code for an element with required start and end tags.
-    #
-    #   - -
-    def nn_element(element, attributes = {})
-      s = nOE_element(element, attributes)
-      if block_given?
-        s << yield.to_s
-      end
-      s << "</#{element.upcase}>"
-    end
-
-    def nn_element_def(attributes = {}, &block)
-      nn_element(__callee__, attributes, &block)
-    end
-
-    # Generate code for an empty element.
-    #
-    #   - O EMPTY
-    def nOE_element(element, attributes = {})
-      attributes={attributes=>nil} if attributes.kind_of?(String)
-      s = "<#{element.upcase}".dup
-      attributes.each do|name, value|
-        next unless value
-        s << " "
-        s << CGI.escapeHTML(name.to_s)
-        if value != true
-          s << '="'
-          s << CGI.escapeHTML(value.to_s)
-          s << '"'
-        end
-      end
-      s << ">"
-    end
-
-    def nOE_element_def(attributes = {}, &block)
-      nOE_element(__callee__, attributes, &block)
-    end
-
-
-    # Generate code for an element for which the end (and possibly the
-    # start) tag is optional.
-    #
-    #   O O or - O
-    def nO_element(element, attributes = {})
-      s = nOE_element(element, attributes)
-      if block_given?
-        s << yield.to_s
-        s << "</#{element.upcase}>"
-      end
-      s
-    end
-
-    def nO_element_def(attributes = {}, &block)
-      nO_element(__callee__, attributes, &block)
-    end
-
-  end # TagMaker
-
-
-  # Mixin module providing HTML generation methods.
-  #
-  # For example,
-  #   cgi.a("http://www.example.com") { "Example" }
-  #     # => "<A HREF=\"http://www.example.com\">Example</A>"
-  #
-  # Modules Html3, Html4, etc., contain more basic HTML-generation methods
-  # (+#title+, +#h1+, etc.).
-  #
-  # See class CGI for a detailed example.
-  #
-  module HtmlExtension
-
-
-    # Generate an Anchor element as a string.
-    #
-    # +href+ can either be a string, giving the URL
-    # for the HREF attribute, or it can be a hash of
-    # the element's attributes.
-    #
-    # The body of the element is the string returned by the no-argument
-    # block passed in.
-    #
-    #   a("http://www.example.com") { "Example" }
-    #     # => "<A HREF=\"http://www.example.com\">Example</A>"
-    #
-    #   a("HREF" => "http://www.example.com", "TARGET" => "_top") { "Example" }
-    #     # => "<A HREF=\"http://www.example.com\" TARGET=\"_top\">Example</A>"
-    #
-    def a(href = "") # :yield:
-      attributes = if href.kind_of?(String)
-                     { "HREF" => href }
-                   else
-                     href
-                   end
-      super(attributes)
-    end
-
-    # Generate a Document Base URI element as a String.
-    #
-    # +href+ can either by a string, giving the base URL for the HREF
-    # attribute, or it can be a has of the element's attributes.
-    #
-    # The passed-in no-argument block is ignored.
-    #
-    #   base("http://www.example.com/cgi")
-    #     # => "<BASE HREF=\"http://www.example.com/cgi\">"
-    def base(href = "") # :yield:
-      attributes = if href.kind_of?(String)
-                     { "HREF" => href }
-                   else
-                     href
-                   end
-      super(attributes)
-    end
-
-    # Generate a BlockQuote element as a string.
-    #
-    # +cite+ can either be a string, give the URI for the source of
-    # the quoted text, or a hash, giving all attributes of the element,
-    # or it can be omitted, in which case the element has no attributes.
-    #
-    # The body is provided by the passed-in no-argument block
-    #
-    #   blockquote("http://www.example.com/quotes/foo.html") { "Foo!" }
-    #     #=> "<BLOCKQUOTE CITE=\"http://www.example.com/quotes/foo.html\">Foo!</BLOCKQUOTE>
-    def blockquote(cite = {})  # :yield:
-      attributes = if cite.kind_of?(String)
-                     { "CITE" => cite }
-                   else
-                     cite
-                   end
-      super(attributes)
-    end
-
-
-    # Generate a Table Caption element as a string.
-    #
-    # +align+ can be a string, giving the alignment of the caption
-    # (one of top, bottom, left, or right).  It can be a hash of
-    # all the attributes of the element.  Or it can be omitted.
-    #
-    # The body of the element is provided by the passed-in no-argument block.
-    #
-    #   caption("left") { "Capital Cities" }
-    #     # => <CAPTION ALIGN=\"left\">Capital Cities</CAPTION>
-    def caption(align = {}) # :yield:
-      attributes = if align.kind_of?(String)
-                     { "ALIGN" => align }
-                   else
-                     align
-                   end
-      super(attributes)
-    end
-
-
-    # Generate a Checkbox Input element as a string.
-    #
-    # The attributes of the element can be specified as three arguments,
-    # +name+, +value+, and +checked+.  +checked+ is a boolean value;
-    # if true, the CHECKED attribute will be included in the element.
-    #
-    # Alternatively, the attributes can be specified as a hash.
-    #
-    #   checkbox("name")
-    #     # = checkbox("NAME" => "name")
-    #
-    #   checkbox("name", "value")
-    #     # = checkbox("NAME" => "name", "VALUE" => "value")
-    #
-    #   checkbox("name", "value", true)
-    #     # = checkbox("NAME" => "name", "VALUE" => "value", "CHECKED" => true)
-    def checkbox(name = "", value = nil, checked = nil)
-      attributes = if name.kind_of?(String)
-                     { "TYPE" => "checkbox", "NAME" => name,
-                       "VALUE" => value, "CHECKED" => checked }
-                   else
-                     name["TYPE"] = "checkbox"
-                     name
-                   end
-      input(attributes)
-    end
-
-    # Generate a sequence of checkbox elements, as a String.
-    #
-    # The checkboxes will all have the same +name+ attribute.
-    # Each checkbox is followed by a label.
-    # There will be one checkbox for each value.  Each value
-    # can be specified as a String, which will be used both
-    # as the value of the VALUE attribute and as the label
-    # for that checkbox.  A single-element array has the
-    # same effect.
-    #
-    # Each value can also be specified as a three-element array.
-    # The first element is the VALUE attribute; the second is the
-    # label; and the third is a boolean specifying whether this
-    # checkbox is CHECKED.
-    #
-    # Each value can also be specified as a two-element
-    # array, by omitting either the value element (defaults
-    # to the same as the label), or the boolean checked element
-    # (defaults to false).
-    #
-    #   checkbox_group("name", "foo", "bar", "baz")
-    #     # <INPUT TYPE="checkbox" NAME="name" VALUE="foo">foo
-    #     # <INPUT TYPE="checkbox" NAME="name" VALUE="bar">bar
-    #     # <INPUT TYPE="checkbox" NAME="name" VALUE="baz">baz
-    #
-    #   checkbox_group("name", ["foo"], ["bar", true], "baz")
-    #     # <INPUT TYPE="checkbox" NAME="name" VALUE="foo">foo
-    #     # <INPUT TYPE="checkbox" CHECKED NAME="name" VALUE="bar">bar
-    #     # <INPUT TYPE="checkbox" NAME="name" VALUE="baz">baz
-    #
-    #   checkbox_group("name", ["1", "Foo"], ["2", "Bar", true], "Baz")
-    #     # <INPUT TYPE="checkbox" NAME="name" VALUE="1">Foo
-    #     # <INPUT TYPE="checkbox" CHECKED NAME="name" VALUE="2">Bar
-    #     # <INPUT TYPE="checkbox" NAME="name" VALUE="Baz">Baz
-    #
-    #   checkbox_group("NAME" => "name",
-    #                    "VALUES" => ["foo", "bar", "baz"])
-    #
-    #   checkbox_group("NAME" => "name",
-    #                    "VALUES" => [["foo"], ["bar", true], "baz"])
-    #
-    #   checkbox_group("NAME" => "name",
-    #                    "VALUES" => [["1", "Foo"], ["2", "Bar", true], "Baz"])
-    def checkbox_group(name = "", *values)
-      if name.kind_of?(Hash)
-        values = name["VALUES"]
-        name = name["NAME"]
-      end
-      values.collect{|value|
-        if value.kind_of?(String)
-          checkbox(name, value) + value
-        else
-          if value[-1] == true || value[-1] == false
-            checkbox(name, value[0],  value[-1]) +
-            value[-2]
-          else
-            checkbox(name, value[0]) +
-            value[-1]
-          end
-        end
-      }.join
-    end
-
-
-    # Generate an File Upload Input element as a string.
-    #
-    # The attributes of the element can be specified as three arguments,
-    # +name+, +size+, and +maxlength+.  +maxlength+ is the maximum length
-    # of the file's _name_, not of the file's _contents_.
-    #
-    # Alternatively, the attributes can be specified as a hash.
-    #
-    # See #multipart_form() for forms that include file uploads.
-    #
-    #   file_field("name")
-    #     # <INPUT TYPE="file" NAME="name" SIZE="20">
-    #
-    #   file_field("name", 40)
-    #     # <INPUT TYPE="file" NAME="name" SIZE="40">
-    #
-    #   file_field("name", 40, 100)
-    #     # <INPUT TYPE="file" NAME="name" SIZE="40" MAXLENGTH="100">
-    #
-    #   file_field("NAME" => "name", "SIZE" => 40)
-    #     # <INPUT TYPE="file" NAME="name" SIZE="40">
-    def file_field(name = "", size = 20, maxlength = nil)
-      attributes = if name.kind_of?(String)
-                     { "TYPE" => "file", "NAME" => name,
-                       "SIZE" => size.to_s }
-                   else
-                     name["TYPE"] = "file"
-                     name
-                   end
-      attributes["MAXLENGTH"] = maxlength.to_s if maxlength
-      input(attributes)
-    end
-
-
-    # Generate a Form element as a string.
-    #
-    # +method+ should be either "get" or "post", and defaults to the latter.
-    # +action+ defaults to the current CGI script name.  +enctype+
-    # defaults to "application/x-www-form-urlencoded".
-    #
-    # Alternatively, the attributes can be specified as a hash.
-    #
-    # See also #multipart_form() for forms that include file uploads.
-    #
-    #   form{ "string" }
-    #     # <FORM METHOD="post" ENCTYPE="application/x-www-form-urlencoded">string</FORM>
-    #
-    #   form("get") { "string" }
-    #     # <FORM METHOD="get" ENCTYPE="application/x-www-form-urlencoded">string</FORM>
-    #
-    #   form("get", "url") { "string" }
-    #     # <FORM METHOD="get" ACTION="url" ENCTYPE="application/x-www-form-urlencoded">string</FORM>
-    #
-    #   form("METHOD" => "post", "ENCTYPE" => "enctype") { "string" }
-    #     # <FORM METHOD="post" ENCTYPE="enctype">string</FORM>
-    def form(method = "post", action = script_name, enctype = "application/x-www-form-urlencoded")
-      attributes = if method.kind_of?(String)
-                     { "METHOD" => method, "ACTION" => action,
-                       "ENCTYPE" => enctype }
-                   else
-                     unless method.has_key?("METHOD")
-                       method["METHOD"] = "post"
-                     end
-                     unless method.has_key?("ENCTYPE")
-                       method["ENCTYPE"] = enctype
-                     end
-                     method
-                   end
-      if block_given?
-        body = yield
-      else
-        body = ""
-      end
-      if @output_hidden
-        body << @output_hidden.collect{|k,v|
-          "<INPUT TYPE=\"HIDDEN\" NAME=\"#{k}\" VALUE=\"#{v}\">"
-        }.join
-      end
-      super(attributes){body}
-    end
-
-    # Generate a Hidden Input element as a string.
-    #
-    # The attributes of the element can be specified as two arguments,
-    # +name+ and +value+.
-    #
-    # Alternatively, the attributes can be specified as a hash.
-    #
-    #   hidden("name")
-    #     # <INPUT TYPE="hidden" NAME="name">
-    #
-    #   hidden("name", "value")
-    #     # <INPUT TYPE="hidden" NAME="name" VALUE="value">
-    #
-    #   hidden("NAME" => "name", "VALUE" => "reset", "ID" => "foo")
-    #     # <INPUT TYPE="hidden" NAME="name" VALUE="value" ID="foo">
-    def hidden(name = "", value = nil)
-      attributes = if name.kind_of?(String)
-                     { "TYPE" => "hidden", "NAME" => name, "VALUE" => value }
-                   else
-                     name["TYPE"] = "hidden"
-                     name
-                   end
-      input(attributes)
-    end
-
-    # Generate a top-level HTML element as a string.
-    #
-    # The attributes of the element are specified as a hash.  The
-    # pseudo-attribute "PRETTY" can be used to specify that the generated
-    # HTML string should be indented.  "PRETTY" can also be specified as
-    # a string as the sole argument to this method.  The pseudo-attribute
-    # "DOCTYPE", if given, is used as the leading DOCTYPE SGML tag; it
-    # should include the entire text of this tag, including angle brackets.
-    #
-    # The body of the html element is supplied as a block.
-    #
-    #   html{ "string" }
-    #     # <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN"><HTML>string</HTML>
-    #
-    #   html("LANG" => "ja") { "string" }
-    #     # <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN"><HTML LANG="ja">string</HTML>
-    #
-    #   html("DOCTYPE" => false) { "string" }
-    #     # <HTML>string</HTML>
-    #
-    #   html("DOCTYPE" => '<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">') { "string" }
-    #     # <!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN"><HTML>string</HTML>
-    #
-    #   html("PRETTY" => "  ") { "<BODY></BODY>" }
-    #     # <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-    #     # <HTML>
-    #     #   <BODY>
-    #     #   </BODY>
-    #     # </HTML>
-    #
-    #   html("PRETTY" => "\t") { "<BODY></BODY>" }
-    #     # <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-    #     # <HTML>
-    #     #         <BODY>
-    #     #         </BODY>
-    #     # </HTML>
-    #
-    #   html("PRETTY") { "<BODY></BODY>" }
-    #     # = html("PRETTY" => "  ") { "<BODY></BODY>" }
-    #
-    #   html(if $VERBOSE then "PRETTY" end) { "HTML string" }
-    #
-    def html(attributes = {}) # :yield:
-      if nil == attributes
-        attributes = {}
-      elsif "PRETTY" == attributes
-        attributes = { "PRETTY" => true }
-      end
-      pretty = attributes.delete("PRETTY")
-      pretty = "  " if true == pretty
-      buf = "".dup
-
-      if attributes.has_key?("DOCTYPE")
-        if attributes["DOCTYPE"]
-          buf << attributes.delete("DOCTYPE")
-        else
-          attributes.delete("DOCTYPE")
-        end
-      else
-        buf << doctype
-      end
-
-      buf << super(attributes)
-
-      if pretty
-        CGI.pretty(buf, pretty)
-      else
-        buf
-      end
-
-    end
-
-    # Generate an Image Button Input element as a string.
-    #
-    # +src+ is the URL of the image to use for the button.  +name+
-    # is the input name.  +alt+ is the alternative text for the image.
-    #
-    # Alternatively, the attributes can be specified as a hash.
-    #
-    #   image_button("url")
-    #     # <INPUT TYPE="image" SRC="url">
-    #
-    #   image_button("url", "name", "string")
-    #     # <INPUT TYPE="image" SRC="url" NAME="name" ALT="string">
-    #
-    #   image_button("SRC" => "url", "ALT" => "string")
-    #     # <INPUT TYPE="image" SRC="url" ALT="string">
-    def image_button(src = "", name = nil, alt = nil)
-      attributes = if src.kind_of?(String)
-                     { "TYPE" => "image", "SRC" => src, "NAME" => name,
-                       "ALT" => alt }
-                   else
-                     src["TYPE"] = "image"
-                     src["SRC"] ||= ""
-                     src
-                   end
-      input(attributes)
-    end
-
-
-    # Generate an Image element as a string.
-    #
-    # +src+ is the URL of the image.  +alt+ is the alternative text for
-    # the image.  +width+ is the width of the image, and +height+ is
-    # its height.
-    #
-    # Alternatively, the attributes can be specified as a hash.
-    #
-    #   img("src", "alt", 100, 50)
-    #     # <IMG SRC="src" ALT="alt" WIDTH="100" HEIGHT="50">
-    #
-    #   img("SRC" => "src", "ALT" => "alt", "WIDTH" => 100, "HEIGHT" => 50)
-    #     # <IMG SRC="src" ALT="alt" WIDTH="100" HEIGHT="50">
-    def img(src = "", alt = "", width = nil, height = nil)
-      attributes = if src.kind_of?(String)
-                     { "SRC" => src, "ALT" => alt }
-                   else
-                     src
-                   end
-      attributes["WIDTH"] = width.to_s if width
-      attributes["HEIGHT"] = height.to_s if height
-      super(attributes)
-    end
-
-
-    # Generate a Form element with multipart encoding as a String.
-    #
-    # Multipart encoding is used for forms that include file uploads.
-    #
-    # +action+ is the action to perform.  +enctype+ is the encoding
-    # type, which defaults to "multipart/form-data".
-    #
-    # Alternatively, the attributes can be specified as a hash.
-    #
-    #   multipart_form{ "string" }
-    #     # <FORM METHOD="post" ENCTYPE="multipart/form-data">string</FORM>
-    #
-    #   multipart_form("url") { "string" }
-    #     # <FORM METHOD="post" ACTION="url" ENCTYPE="multipart/form-data">string</FORM>
-    def multipart_form(action = nil, enctype = "multipart/form-data")
-      attributes = if action == nil
-                     { "METHOD" => "post", "ENCTYPE" => enctype }
-                   elsif action.kind_of?(String)
-                     { "METHOD" => "post", "ACTION" => action,
-                       "ENCTYPE" => enctype }
-                   else
-                     unless action.has_key?("METHOD")
-                       action["METHOD"] = "post"
-                     end
-                     unless action.has_key?("ENCTYPE")
-                       action["ENCTYPE"] = enctype
-                     end
-                     action
-                   end
-      if block_given?
-        form(attributes){ yield }
-      else
-        form(attributes)
-      end
-    end
-
-
-    # Generate a Password Input element as a string.
-    #
-    # +name+ is the name of the input field.  +value+ is its default
-    # value.  +size+ is the size of the input field display.  +maxlength+
-    # is the maximum length of the inputted password.
-    #
-    # Alternatively, attributes can be specified as a hash.
-    #
-    #   password_field("name")
-    #     # <INPUT TYPE="password" NAME="name" SIZE="40">
-    #
-    #   password_field("name", "value")
-    #     # <INPUT TYPE="password" NAME="name" VALUE="value" SIZE="40">
-    #
-    #   password_field("password", "value", 80, 200)
-    #     # <INPUT TYPE="password" NAME="name" VALUE="value" SIZE="80" MAXLENGTH="200">
-    #
-    #   password_field("NAME" => "name", "VALUE" => "value")
-    #     # <INPUT TYPE="password" NAME="name" VALUE="value">
-    def password_field(name = "", value = nil, size = 40, maxlength = nil)
-      attributes = if name.kind_of?(String)
-                     { "TYPE" => "password", "NAME" => name,
-                       "VALUE" => value, "SIZE" => size.to_s }
-                   else
-                     name["TYPE"] = "password"
-                     name
-                   end
-      attributes["MAXLENGTH"] = maxlength.to_s if maxlength
-      input(attributes)
-    end
-
-    # Generate a Select element as a string.
-    #
-    # +name+ is the name of the element.  The +values+ are the options that
-    # can be selected from the Select menu.  Each value can be a String or
-    # a one, two, or three-element Array.  If a String or a one-element
-    # Array, this is both the value of that option and the text displayed for
-    # it.  If a three-element Array, the elements are the option value, displayed
-    # text, and a boolean value specifying whether this option starts as selected.
-    # The two-element version omits either the option value (defaults to the same
-    # as the display text) or the boolean selected specifier (defaults to false).
-    #
-    # The attributes and options can also be specified as a hash.  In this
-    # case, options are specified as an array of values as described above,
-    # with the hash key of "VALUES".
-    #
-    #   popup_menu("name", "foo", "bar", "baz")
-    #     # <SELECT NAME="name">
-    #     #   <OPTION VALUE="foo">foo</OPTION>
-    #     #   <OPTION VALUE="bar">bar</OPTION>
-    #     #   <OPTION VALUE="baz">baz</OPTION>
-    #     # </SELECT>
-    #
-    #   popup_menu("name", ["foo"], ["bar", true], "baz")
-    #     # <SELECT NAME="name">
-    #     #   <OPTION VALUE="foo">foo</OPTION>
-    #     #   <OPTION VALUE="bar" SELECTED>bar</OPTION>
-    #     #   <OPTION VALUE="baz">baz</OPTION>
-    #     # </SELECT>
-    #
-    #   popup_menu("name", ["1", "Foo"], ["2", "Bar", true], "Baz")
-    #     # <SELECT NAME="name">
-    #     #   <OPTION VALUE="1">Foo</OPTION>
-    #     #   <OPTION SELECTED VALUE="2">Bar</OPTION>
-    #     #   <OPTION VALUE="Baz">Baz</OPTION>
-    #     # </SELECT>
-    #
-    #   popup_menu("NAME" => "name", "SIZE" => 2, "MULTIPLE" => true,
-    #               "VALUES" => [["1", "Foo"], ["2", "Bar", true], "Baz"])
-    #     # <SELECT NAME="name" MULTIPLE SIZE="2">
-    #     #   <OPTION VALUE="1">Foo</OPTION>
-    #     #   <OPTION SELECTED VALUE="2">Bar</OPTION>
-    #     #   <OPTION VALUE="Baz">Baz</OPTION>
-    #     # </SELECT>
-    def popup_menu(name = "", *values)
-
-      if name.kind_of?(Hash)
-        values   = name["VALUES"]
-        size     = name["SIZE"].to_s if name["SIZE"]
-        multiple = name["MULTIPLE"]
-        name     = name["NAME"]
-      else
-        size = nil
-        multiple = nil
-      end
-
-      select({ "NAME" => name, "SIZE" => size,
-               "MULTIPLE" => multiple }){
-        values.collect{|value|
-          if value.kind_of?(String)
-            option({ "VALUE" => value }){ value }
-          else
-            if value[value.size - 1] == true
-              option({ "VALUE" => value[0], "SELECTED" => true }){
-                value[value.size - 2]
-              }
-            else
-              option({ "VALUE" => value[0] }){
-                value[value.size - 1]
-              }
-            end
-          end
-        }.join
-      }
-
-    end
-
-    # Generates a radio-button Input element.
-    #
-    # +name+ is the name of the input field.  +value+ is the value of
-    # the field if checked.  +checked+ specifies whether the field
-    # starts off checked.
-    #
-    # Alternatively, the attributes can be specified as a hash.
-    #
-    #   radio_button("name", "value")
-    #     # <INPUT TYPE="radio" NAME="name" VALUE="value">
-    #
-    #   radio_button("name", "value", true)
-    #     # <INPUT TYPE="radio" NAME="name" VALUE="value" CHECKED>
-    #
-    #   radio_button("NAME" => "name", "VALUE" => "value", "ID" => "foo")
-    #     # <INPUT TYPE="radio" NAME="name" VALUE="value" ID="foo">
-    def radio_button(name = "", value = nil, checked = nil)
-      attributes = if name.kind_of?(String)
-                     { "TYPE" => "radio", "NAME" => name,
-                       "VALUE" => value, "CHECKED" => checked }
-                   else
-                     name["TYPE"] = "radio"
-                     name
-                   end
-      input(attributes)
-    end
-
-    # Generate a sequence of radio button Input elements, as a String.
-    #
-    # This works the same as #checkbox_group().  However, it is not valid
-    # to have more than one radiobutton in a group checked.
-    #
-    #   radio_group("name", "foo", "bar", "baz")
-    #     # <INPUT TYPE="radio" NAME="name" VALUE="foo">foo
-    #     # <INPUT TYPE="radio" NAME="name" VALUE="bar">bar
-    #     # <INPUT TYPE="radio" NAME="name" VALUE="baz">baz
-    #
-    #   radio_group("name", ["foo"], ["bar", true], "baz")
-    #     # <INPUT TYPE="radio" NAME="name" VALUE="foo">foo
-    #     # <INPUT TYPE="radio" CHECKED NAME="name" VALUE="bar">bar
-    #     # <INPUT TYPE="radio" NAME="name" VALUE="baz">baz
-    #
-    #   radio_group("name", ["1", "Foo"], ["2", "Bar", true], "Baz")
-    #     # <INPUT TYPE="radio" NAME="name" VALUE="1">Foo
-    #     # <INPUT TYPE="radio" CHECKED NAME="name" VALUE="2">Bar
-    #     # <INPUT TYPE="radio" NAME="name" VALUE="Baz">Baz
-    #
-    #   radio_group("NAME" => "name",
-    #                 "VALUES" => ["foo", "bar", "baz"])
-    #
-    #   radio_group("NAME" => "name",
-    #                 "VALUES" => [["foo"], ["bar", true], "baz"])
-    #
-    #   radio_group("NAME" => "name",
-    #                 "VALUES" => [["1", "Foo"], ["2", "Bar", true], "Baz"])
-    def radio_group(name = "", *values)
-      if name.kind_of?(Hash)
-        values = name["VALUES"]
-        name = name["NAME"]
-      end
-      values.collect{|value|
-        if value.kind_of?(String)
-          radio_button(name, value) + value
-        else
-          if value[-1] == true || value[-1] == false
-            radio_button(name, value[0],  value[-1]) +
-            value[-2]
-          else
-            radio_button(name, value[0]) +
-            value[-1]
-          end
-        end
-      }.join
-    end
-
-    # Generate a reset button Input element, as a String.
-    #
-    # This resets the values on a form to their initial values.  +value+
-    # is the text displayed on the button. +name+ is the name of this button.
-    #
-    # Alternatively, the attributes can be specified as a hash.
-    #
-    #   reset
-    #     # <INPUT TYPE="reset">
-    #
-    #   reset("reset")
-    #     # <INPUT TYPE="reset" VALUE="reset">
-    #
-    #   reset("VALUE" => "reset", "ID" => "foo")
-    #     # <INPUT TYPE="reset" VALUE="reset" ID="foo">
-    def reset(value = nil, name = nil)
-      attributes = if (not value) or value.kind_of?(String)
-                     { "TYPE" => "reset", "VALUE" => value, "NAME" => name }
-                   else
-                     value["TYPE"] = "reset"
-                     value
-                   end
-      input(attributes)
-    end
-
-    alias scrolling_list popup_menu
-
-    # Generate a submit button Input element, as a String.
-    #
-    # +value+ is the text to display on the button.  +name+ is the name
-    # of the input.
-    #
-    # Alternatively, the attributes can be specified as a hash.
-    #
-    #   submit
-    #     # <INPUT TYPE="submit">
-    #
-    #   submit("ok")
-    #     # <INPUT TYPE="submit" VALUE="ok">
-    #
-    #   submit("ok", "button1")
-    #     # <INPUT TYPE="submit" VALUE="ok" NAME="button1">
-    #
-    #   submit("VALUE" => "ok", "NAME" => "button1", "ID" => "foo")
-    #     # <INPUT TYPE="submit" VALUE="ok" NAME="button1" ID="foo">
-    def submit(value = nil, name = nil)
-      attributes = if (not value) or value.kind_of?(String)
-                     { "TYPE" => "submit", "VALUE" => value, "NAME" => name }
-                   else
-                     value["TYPE"] = "submit"
-                     value
-                   end
-      input(attributes)
-    end
-
-    # Generate a text field Input element, as a String.
-    #
-    # +name+ is the name of the input field.  +value+ is its initial
-    # value.  +size+ is the size of the input area.  +maxlength+
-    # is the maximum length of input accepted.
-    #
-    # Alternatively, the attributes can be specified as a hash.
-    #
-    #   text_field("name")
-    #     # <INPUT TYPE="text" NAME="name" SIZE="40">
-    #
-    #   text_field("name", "value")
-    #     # <INPUT TYPE="text" NAME="name" VALUE="value" SIZE="40">
-    #
-    #   text_field("name", "value", 80)
-    #     # <INPUT TYPE="text" NAME="name" VALUE="value" SIZE="80">
-    #
-    #   text_field("name", "value", 80, 200)
-    #     # <INPUT TYPE="text" NAME="name" VALUE="value" SIZE="80" MAXLENGTH="200">
-    #
-    #   text_field("NAME" => "name", "VALUE" => "value")
-    #     # <INPUT TYPE="text" NAME="name" VALUE="value">
-    def text_field(name = "", value = nil, size = 40, maxlength = nil)
-      attributes = if name.kind_of?(String)
-                     { "TYPE" => "text", "NAME" => name, "VALUE" => value,
-                       "SIZE" => size.to_s }
-                   else
-                     name["TYPE"] = "text"
-                     name
-                   end
-      attributes["MAXLENGTH"] = maxlength.to_s if maxlength
-      input(attributes)
-    end
-
-    # Generate a TextArea element, as a String.
-    #
-    # +name+ is the name of the textarea.  +cols+ is the number of
-    # columns and +rows+ is the number of rows in the display.
-    #
-    # Alternatively, the attributes can be specified as a hash.
-    #
-    # The body is provided by the passed-in no-argument block
-    #
-    #   textarea("name")
-    #      # = textarea("NAME" => "name", "COLS" => 70, "ROWS" => 10)
-    #
-    #   textarea("name", 40, 5)
-    #      # = textarea("NAME" => "name", "COLS" => 40, "ROWS" => 5)
-    def textarea(name = "", cols = 70, rows = 10)  # :yield:
-      attributes = if name.kind_of?(String)
-                     { "NAME" => name, "COLS" => cols.to_s,
-                       "ROWS" => rows.to_s }
-                   else
-                     name
-                   end
-      super(attributes)
-    end
-
-  end # HtmlExtension
-
-
-  # Mixin module for HTML version 3 generation methods.
-  module Html3 # :nodoc:
-    include TagMaker
-
-    # The DOCTYPE declaration for this version of HTML
-    def doctype
-      %|<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">|
-    end
-
-    instance_method(:nn_element_def).tap do |m|
-      # - -
-      for element in %w[ A TT I B U STRIKE BIG SMALL SUB SUP EM STRONG
-          DFN CODE SAMP KBD VAR CITE FONT ADDRESS DIV CENTER MAP
-          APPLET PRE XMP LISTING DL OL UL DIR MENU SELECT TABLE TITLE
-          STYLE SCRIPT H1 H2 H3 H4 H5 H6 TEXTAREA FORM BLOCKQUOTE
-          CAPTION ]
-        define_method(element.downcase, m)
-      end
-    end
-
-    instance_method(:nOE_element_def).tap do |m|
-      # - O EMPTY
-      for element in %w[ IMG BASE BASEFONT BR AREA LINK PARAM HR INPUT
-          ISINDEX META ]
-        define_method(element.downcase, m)
-      end
-    end
-
-    instance_method(:nO_element_def).tap do |m|
-      # O O or - O
-      for element in %w[ HTML HEAD BODY P PLAINTEXT DT DD LI OPTION TR
-          TH TD ]
-        define_method(element.downcase, m)
-      end
-    end
-
-  end # Html3
-
-
-  # Mixin module for HTML version 4 generation methods.
-  module Html4 # :nodoc:
-    include TagMaker
-
-    # The DOCTYPE declaration for this version of HTML
-    def doctype
-      %|<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">|
-    end
-
-    # Initialize the HTML generation methods for this version.
-    # - -
-    instance_method(:nn_element_def).tap do |m|
-      for element in %w[ TT I B BIG SMALL EM STRONG DFN CODE SAMP KBD
-        VAR CITE ABBR ACRONYM SUB SUP SPAN BDO ADDRESS DIV MAP OBJECT
-        H1 H2 H3 H4 H5 H6 PRE Q INS DEL DL OL UL LABEL SELECT OPTGROUP
-        FIELDSET LEGEND BUTTON TABLE TITLE STYLE SCRIPT NOSCRIPT
-        TEXTAREA FORM A BLOCKQUOTE CAPTION ]
-        define_method(element.downcase, m)
-      end
-    end
-
-    # - O EMPTY
-    instance_method(:nOE_element_def).tap do |m|
-      for element in %w[ IMG BASE BR AREA LINK PARAM HR INPUT COL META ]
-        define_method(element.downcase, m)
-      end
-    end
-
-    # O O or - O
-    instance_method(:nO_element_def).tap do |m|
-      for element in %w[ HTML BODY P DT DD LI OPTION THEAD TFOOT TBODY
-          COLGROUP TR TH TD HEAD ]
-        define_method(element.downcase, m)
-      end
-    end
-
-  end # Html4
-
-
-  # Mixin module for HTML version 4 transitional generation methods.
-  module Html4Tr # :nodoc:
-    include TagMaker
-
-    # The DOCTYPE declaration for this version of HTML
-    def doctype
-      %|<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">|
-    end
-
-    # Initialise the HTML generation methods for this version.
-    # - -
-    instance_method(:nn_element_def).tap do |m|
-      for element in %w[ TT I B U S STRIKE BIG SMALL EM STRONG DFN
-          CODE SAMP KBD VAR CITE ABBR ACRONYM FONT SUB SUP SPAN BDO
-          ADDRESS DIV CENTER MAP OBJECT APPLET H1 H2 H3 H4 H5 H6 PRE Q
-          INS DEL DL OL UL DIR MENU LABEL SELECT OPTGROUP FIELDSET
-          LEGEND BUTTON TABLE IFRAME NOFRAMES TITLE STYLE SCRIPT
-          NOSCRIPT TEXTAREA FORM A BLOCKQUOTE CAPTION ]
-        define_method(element.downcase, m)
-      end
-    end
-
-    # - O EMPTY
-    instance_method(:nOE_element_def).tap do |m|
-      for element in %w[ IMG BASE BASEFONT BR AREA LINK PARAM HR INPUT
-          COL ISINDEX META ]
-        define_method(element.downcase, m)
-      end
-    end
-
-    # O O or - O
-    instance_method(:nO_element_def).tap do |m|
-      for element in %w[ HTML BODY P DT DD LI OPTION THEAD TFOOT TBODY
-          COLGROUP TR TH TD HEAD ]
-        define_method(element.downcase, m)
-      end
-    end
-
-  end # Html4Tr
-
-
-  # Mixin module for generating HTML version 4 with framesets.
-  module Html4Fr # :nodoc:
-    include TagMaker
-
-    # The DOCTYPE declaration for this version of HTML
-    def doctype
-      %|<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Frameset//EN" "http://www.w3.org/TR/html4/frameset.dtd">|
-    end
-
-    # Initialise the HTML generation methods for this version.
-    # - -
-    instance_method(:nn_element_def).tap do |m|
-      for element in %w[ FRAMESET ]
-        define_method(element.downcase, m)
-      end
-    end
-
-    # - O EMPTY
-    instance_method(:nOE_element_def).tap do |m|
-      for element in %w[ FRAME ]
-        define_method(element.downcase, m)
-      end
-    end
-
-  end # Html4Fr
-
-
-  # Mixin module for HTML version 5 generation methods.
-  module Html5 # :nodoc:
-    include TagMaker
-
-    # The DOCTYPE declaration for this version of HTML
-    def doctype
-      %|<!DOCTYPE HTML>|
-    end
-
-    # Initialise the HTML generation methods for this version.
-    # - -
-    instance_method(:nn_element_def).tap do |m|
-      for element in %w[ SECTION NAV ARTICLE ASIDE HGROUP HEADER
-        FOOTER FIGURE FIGCAPTION S TIME U MARK RUBY BDI IFRAME
-        VIDEO AUDIO CANVAS DATALIST OUTPUT PROGRESS METER DETAILS
-        SUMMARY MENU DIALOG I B SMALL EM STRONG DFN CODE SAMP KBD
-        VAR CITE ABBR SUB SUP SPAN BDO ADDRESS DIV MAP OBJECT
-        H1 H2 H3 H4 H5 H6 PRE Q INS DEL DL OL UL LABEL SELECT
-        FIELDSET LEGEND BUTTON TABLE TITLE STYLE SCRIPT NOSCRIPT
-        TEXTAREA FORM A BLOCKQUOTE CAPTION ]
-        define_method(element.downcase, m)
-      end
-    end
-
-    # - O EMPTY
-    instance_method(:nOE_element_def).tap do |m|
-      for element in %w[ IMG BASE BR AREA LINK PARAM HR INPUT COL META
-        COMMAND EMBED KEYGEN SOURCE TRACK WBR ]
-        define_method(element.downcase, m)
-      end
-    end
-
-    # O O or - O
-    instance_method(:nO_element_def).tap do |m|
-      for element in %w[ HTML HEAD BODY P DT DD LI OPTION THEAD TFOOT TBODY
-          OPTGROUP COLGROUP RT RP TR TH TD ]
-        define_method(element.downcase, m)
-      end
-    end
-
-  end # Html5
-
-  class HTML3
-    include Html3
-    include HtmlExtension
-  end
-
-  class HTML4
-    include Html4
-    include HtmlExtension
-  end
-
-  class HTML4Tr
-    include Html4Tr
-    include HtmlExtension
-  end
-
-  class HTML4Fr
-    include Html4Tr
-    include Html4Fr
-    include HtmlExtension
-  end
-
-  class HTML5
-    include Html5
-    include HtmlExtension
-  end
-
-end
diff --git a/lib/cgi/session.rb b/lib/cgi/session.rb
deleted file mode 100644
index aab60869bbd882..00000000000000
--- a/lib/cgi/session.rb
+++ /dev/null
@@ -1,562 +0,0 @@
-# frozen_string_literal: true
-#
-# cgi/session.rb - session support for cgi scripts
-#
-# Copyright (C) 2001  Yukihiro "Matz" Matsumoto
-# Copyright (C) 2000  Network Applied Communication Laboratory, Inc.
-# Copyright (C) 2000  Information-technology Promotion Agency, Japan
-#
-# Author: Yukihiro "Matz" Matsumoto
-#
-# Documentation: William Webber (william@williamwebber.com)
-
-require 'cgi'
-require 'tmpdir'
-
-class CGI
-
-  # == Overview
-  #
-  # This file provides the CGI::Session class, which provides session
-  # support for CGI scripts.  A session is a sequence of HTTP requests
-  # and responses linked together and associated with a single client.
-  # Information associated with the session is stored
-  # on the server between requests.  A session id is passed between client
-  # and server with every request and response, transparently
-  # to the user.  This adds state information to the otherwise stateless
-  # HTTP request/response protocol.
-  #
-  # == Lifecycle
-  #
-  # A CGI::Session instance is created from a CGI object.  By default,
-  # this CGI::Session instance will start a new session if none currently
-  # exists, or continue the current session for this client if one does
-  # exist.  The +new_session+ option can be used to either always or
-  # never create a new session.  See #new() for more details.
-  #
-  # #delete() deletes a session from session storage.  It
-  # does not however remove the session id from the client.  If the client
-  # makes another request with the same id, the effect will be to start
-  # a new session with the old session's id.
-  #
-  # == Setting and retrieving session data.
-  #
-  # The Session class associates data with a session as key-value pairs.
-  # This data can be set and retrieved by indexing the Session instance
-  # using '[]', much the same as hashes (although other hash methods
-  # are not supported).
-  #
-  # When session processing has been completed for a request, the
-  # session should be closed using the close() method.  This will
-  # store the session's state to persistent storage.  If you want
-  # to store the session's state to persistent storage without
-  # finishing session processing for this request, call the update()
-  # method.
-  #
-  # == Storing session state
-  #
-  # The caller can specify what form of storage to use for the session's
-  # data with the +database_manager+ option to CGI::Session::new.  The
-  # following storage classes are provided as part of the standard library:
-  #
-  # CGI::Session::FileStore:: stores data as plain text in a flat file.  Only
-  #                           works with String data.  This is the default
-  #                           storage type.
-  # CGI::Session::MemoryStore:: stores data in an in-memory hash.  The data
-  #                             only persists for as long as the current Ruby
-  #                             interpreter instance does.
-  # CGI::Session::PStore:: stores data in Marshalled format.  Provided by
-  #                        cgi/session/pstore.rb.  Supports data of any type,
-  #                        and provides file-locking and transaction support.
-  #
-  # Custom storage types can also be created by defining a class with
-  # the following methods:
-  #
-  #    new(session, options)
-  #    restore  # returns hash of session data.
-  #    update
-  #    close
-  #    delete
-  #
-  # Changing storage type mid-session does not work.  Note in particular
-  # that by default the FileStore and PStore session data files have the
-  # same name.  If your application switches from one to the other without
-  # making sure that filenames will be different
-  # and clients still have old sessions lying around in cookies, then
-  # things will break nastily!
-  #
-  # == Maintaining the session id.
-  #
-  # Most session state is maintained on the server.  However, a session
-  # id must be passed backwards and forwards between client and server
-  # to maintain a reference to this session state.
-  #
-  # The simplest way to do this is via cookies.  The CGI::Session class
-  # provides transparent support for session id communication via cookies
-  # if the client has cookies enabled.
-  #
-  # If the client has cookies disabled, the session id must be included
-  # as a parameter of all requests sent by the client to the server.  The
-  # CGI::Session class in conjunction with the CGI class will transparently
-  # add the session id as a hidden input field to all forms generated
-  # using the CGI#form() HTML generation method.  No built-in support is
-  # provided for other mechanisms, such as URL re-writing.  The caller is
-  # responsible for extracting the session id from the session_id
-  # attribute and manually encoding it in URLs and adding it as a hidden
-  # input to HTML forms created by other mechanisms.  Also, session expiry
-  # is not automatically handled.
-  #
-  # == Examples of use
-  #
-  # === Setting the user's name
-  #
-  #   require 'cgi'
-  #   require 'cgi/session'
-  #   require 'cgi/session/pstore'     # provides CGI::Session::PStore
-  #
-  #   cgi = CGI.new("html4")
-  #
-  #   session = CGI::Session.new(cgi,
-  #       'database_manager' => CGI::Session::PStore,  # use PStore
-  #       'session_key' => '_rb_sess_id',              # custom session key
-  #       'session_expires' => Time.now + 30 * 60,     # 30 minute timeout
-  #       'prefix' => 'pstore_sid_')                   # PStore option
-  #   if cgi.has_key?('user_name') and cgi['user_name'] != ''
-  #       # coerce to String: cgi[] returns the
-  #       # string-like CGI::QueryExtension::Value
-  #       session['user_name'] = cgi['user_name'].to_s
-  #   elsif !session['user_name']
-  #       session['user_name'] = "guest"
-  #   end
-  #   session.close
-  #
-  # === Creating a new session safely
-  #
-  #   require 'cgi'
-  #   require 'cgi/session'
-  #
-  #   cgi = CGI.new("html4")
-  #
-  #   # We make sure to delete an old session if one exists,
-  #   # not just to free resources, but to prevent the session
-  #   # from being maliciously hijacked later on.
-  #   begin
-  #       session = CGI::Session.new(cgi, 'new_session' => false)
-  #       session.delete
-  #   rescue ArgumentError  # if no old session
-  #   end
-  #   session = CGI::Session.new(cgi, 'new_session' => true)
-  #   session.close
-  #
-  class Session
-
-    class NoSession < RuntimeError #:nodoc:
-    end
-
-    # The id of this session.
-    attr_reader :session_id, :new_session
-
-    def Session::callback(dbman)  #:nodoc:
-      Proc.new{
-        dbman[0].close unless dbman.empty?
-      }
-    end
-
-    # Create a new session id.
-    #
-    # The session id is a secure random number by SecureRandom
-    # if possible, otherwise an SHA512 hash based upon the time,
-    # a random number, and a constant string.  This routine is
-    # used internally for automatically generated session ids.
-    def create_new_id
-      require 'securerandom'
-      begin
-        # by OpenSSL, or system provided entropy pool
-        session_id = SecureRandom.hex(16)
-      rescue NotImplementedError
-        # never happens on modern systems
-        require 'digest'
-        d = Digest('SHA512').new
-        now = Time::now
-        d.update(now.to_s)
-        d.update(String(now.usec))
-        d.update(String(rand(0)))
-        d.update(String($$))
-        d.update('foobar')
-        session_id = d.hexdigest[0, 32]
-      end
-      session_id
-    end
-    private :create_new_id
-
-
-    # Create a new file to store the session data.
-    #
-    # This file will be created if it does not exist, or opened if it
-    # does.
-    #
-    # This path is generated under _tmpdir_ from _prefix_, the
-    # digested session id, and _suffix_.
-    #
-    # +option+ is a hash of options for the initializer.  The
-    # following options are recognised:
-    #
-    # tmpdir:: the directory to use for storing the FileStore
-    #          file.  Defaults to Dir::tmpdir (generally "/tmp"
-    #          on Unix systems).
-    # prefix:: the prefix to add to the session id when generating
-    #          the filename for this session's FileStore file.
-    #          Defaults to "cgi_sid_".
-    # suffix:: the prefix to add to the session id when generating
-    #          the filename for this session's FileStore file.
-    #          Defaults to the empty string.
-    def new_store_file(option={}) # :nodoc:
-      dir = option['tmpdir'] || Dir::tmpdir
-      prefix = option['prefix']
-      suffix = option['suffix']
-      require 'digest/md5'
-      md5 = Digest::MD5.hexdigest(session_id)[0,16]
-      path = dir+"/"
-      path << prefix if prefix
-      path << md5
-      path << suffix if suffix
-      if File::exist? path
-        hash = nil
-      elsif new_session
-        hash = {}
-      else
-        raise NoSession, "uninitialized session"
-      end
-      return path, hash
-    end
-
-    # Create a new CGI::Session object for +request+.
-    #
-    # +request+ is an instance of the +CGI+ class (see cgi.rb).
-    # +option+ is a hash of options for initialising this
-    # CGI::Session instance.  The following options are
-    # recognised:
-    #
-    # session_key:: the parameter name used for the session id.
-    #               Defaults to '_session_id'.
-    # session_id:: the session id to use.  If not provided, then
-    #              it is retrieved from the +session_key+ parameter
-    #              of the request, or automatically generated for
-    #              a new session.
-    # new_session:: if true, force creation of a new session.  If not set,
-    #               a new session is only created if none currently
-    #               exists.  If false, a new session is never created,
-    #               and if none currently exists and the +session_id+
-    #               option is not set, an ArgumentError is raised.
-    # database_manager:: the name of the class providing storage facilities
-    #                    for session state persistence.  Built-in support
-    #                    is provided for +FileStore+ (the default),
-    #                    +MemoryStore+, and +PStore+ (from
-    #                    cgi/session/pstore.rb).  See the documentation for
-    #                    these classes for more details.
-    #
-    # The following options are also recognised, but only apply if the
-    # session id is stored in a cookie.
-    #
-    # session_expires:: the time the current session expires, as a
-    #                   +Time+ object.  If not set, the session will terminate
-    #                   when the user's browser is closed.
-    # session_domain:: the hostname domain for which this session is valid.
-    #                  If not set, defaults to the hostname of the server.
-    # session_secure:: if +true+, this session will only work over HTTPS.
-    # session_path:: the path for which this session applies.  Defaults
-    #                to the directory of the CGI script.
-    #
-    # +option+ is also passed on to the session storage class initializer; see
-    # the documentation for each session storage class for the options
-    # they support.
-    #
-    # The retrieved or created session is automatically added to +request+
-    # as a cookie, and also to its +output_hidden+ table, which is used
-    # to add hidden input elements to forms.
-    #
-    # *WARNING* the +output_hidden+
-    # fields are surrounded by a <fieldset> tag in HTML 4 generation, which
-    # is _not_ invisible on many browsers; you may wish to disable the
-    # use of fieldsets with code similar to the following
-    # (see https://blade.ruby-lang.org/ruby-list/37805)
-    #
-    #   cgi = CGI.new("html4")
-    #   class << cgi
-    #       undef_method :fieldset
-    #   end
-    #
-    def initialize(request, option={})
-      @new_session = false
-      session_key = option['session_key'] || '_session_id'
-      session_id = option['session_id']
-      unless session_id
-        if option['new_session']
-          session_id = create_new_id
-          @new_session = true
-        end
-      end
-      unless session_id
-        if request.key?(session_key)
-          session_id = request[session_key]
-          session_id = session_id.read if session_id.respond_to?(:read)
-        end
-        unless session_id
-          session_id, = request.cookies[session_key]
-        end
-        unless session_id
-          unless option.fetch('new_session', true)
-            raise ArgumentError, "session_key `%s' should be supplied"%session_key
-          end
-          session_id = create_new_id
-          @new_session = true
-        end
-      end
-      @session_id = session_id
-      dbman = option['database_manager'] || FileStore
-      begin
-        @dbman = dbman::new(self, option)
-      rescue NoSession
-        unless option.fetch('new_session', true)
-          raise ArgumentError, "invalid session_id `%s'"%session_id
-        end
-        session_id = @session_id = create_new_id unless session_id
-        @new_session=true
-        retry
-      end
-      request.instance_eval do
-        @output_hidden = {session_key => session_id} unless option['no_hidden']
-        @output_cookies =  [
-          Cookie::new("name" => session_key,
-          "value" => session_id,
-          "expires" => option['session_expires'],
-          "domain" => option['session_domain'],
-          "secure" => option['session_secure'],
-          "path" =>
-          if option['session_path']
-            option['session_path']
-          elsif ENV["SCRIPT_NAME"]
-            File::dirname(ENV["SCRIPT_NAME"])
-          else
-          ""
-          end)
-        ] unless option['no_cookies']
-      end
-      @dbprot = [@dbman]
-      ObjectSpace::define_finalizer(self, Session::callback(@dbprot))
-    end
-
-    # Retrieve the session data for key +key+.
-    def [](key)
-      @data ||= @dbman.restore
-      @data[key]
-    end
-
-    # Set the session data for key +key+.
-    def []=(key, val)
-      @write_lock ||= true
-      @data ||= @dbman.restore
-      @data[key] = val
-    end
-
-    # Store session data on the server.  For some session storage types,
-    # this is a no-op.
-    def update
-      @dbman.update
-    end
-
-    # Store session data on the server and close the session storage.
-    # For some session storage types, this is a no-op.
-    def close
-      @dbman.close
-      @dbprot.clear
-    end
-
-    # Delete the session from storage.  Also closes the storage.
-    #
-    # Note that the session's data is _not_ automatically deleted
-    # upon the session expiring.
-    def delete
-      @dbman.delete
-      @dbprot.clear
-    end
-
-    # File-based session storage class.
-    #
-    # Implements session storage as a flat file of 'key=value' values.
-    # This storage type only works directly with String values; the
-    # user is responsible for converting other types to Strings when
-    # storing and from Strings when retrieving.
-    class FileStore
-      # Create a new FileStore instance.
-      #
-      # This constructor is used internally by CGI::Session.  The
-      # user does not generally need to call it directly.
-      #
-      # +session+ is the session for which this instance is being
-      # created.  The session id must only contain alphanumeric
-      # characters; automatically generated session ids observe
-      # this requirement.
-      #
-      # +option+ is a hash of options for the initializer.  The
-      # following options are recognised:
-      #
-      # tmpdir:: the directory to use for storing the FileStore
-      #          file.  Defaults to Dir::tmpdir (generally "/tmp"
-      #          on Unix systems).
-      # prefix:: the prefix to add to the session id when generating
-      #          the filename for this session's FileStore file.
-      #          Defaults to "cgi_sid_".
-      # suffix:: the prefix to add to the session id when generating
-      #          the filename for this session's FileStore file.
-      #          Defaults to the empty string.
-      #
-      # This session's FileStore file will be created if it does
-      # not exist, or opened if it does.
-      def initialize(session, option={})
-        option = {'prefix' => 'cgi_sid_'}.update(option)
-        @path, @hash = session.new_store_file(option)
-      end
-
-      # Restore session state from the session's FileStore file.
-      #
-      # Returns the session state as a hash.
-      def restore
-        unless @hash
-          @hash = {}
-          begin
-            lockf = File.open(@path+".lock", "r")
-            lockf.flock File::LOCK_SH
-            f = File.open(@path, 'r')
-            for line in f
-              line.chomp!
-              k, v = line.split('=',2)
-              @hash[CGI.unescape(k)] = Marshal.restore(CGI.unescape(v))
-            end
-          ensure
-            f&.close
-            lockf&.close
-          end
-        end
-        @hash
-      end
-
-      # Save session state to the session's FileStore file.
-      def update
-        return unless @hash
-        begin
-          lockf = File.open(@path+".lock", File::CREAT|File::RDWR, 0600)
-          lockf.flock File::LOCK_EX
-          f = File.open(@path+".new", File::CREAT|File::TRUNC|File::WRONLY, 0600)
-          for k,v in @hash
-            f.printf "%s=%s\n", CGI.escape(k), CGI.escape(String(Marshal.dump(v)))
-          end
-          f.close
-          File.rename @path+".new", @path
-        ensure
-          f&.close
-          lockf&.close
-        end
-      end
-
-      # Update and close the session's FileStore file.
-      def close
-        update
-      end
-
-      # Close and delete the session's FileStore file.
-      def delete
-        File::unlink @path+".lock" rescue nil
-        File::unlink @path+".new" rescue nil
-        File::unlink @path rescue nil
-      end
-    end
-
-    # In-memory session storage class.
-    #
-    # Implements session storage as a global in-memory hash.  Session
-    # data will only persist for as long as the Ruby interpreter
-    # instance does.
-    class MemoryStore
-      GLOBAL_HASH_TABLE = {} #:nodoc:
-
-      # Create a new MemoryStore instance.
-      #
-      # +session+ is the session this instance is associated with.
-      # +option+ is a list of initialisation options.  None are
-      # currently recognized.
-      def initialize(session, option=nil)
-        @session_id = session.session_id
-        unless GLOBAL_HASH_TABLE.key?(@session_id)
-          unless session.new_session
-            raise CGI::Session::NoSession, "uninitialized session"
-          end
-          GLOBAL_HASH_TABLE[@session_id] = {}
-        end
-      end
-
-      # Restore session state.
-      #
-      # Returns session data as a hash.
-      def restore
-        GLOBAL_HASH_TABLE[@session_id]
-      end
-
-      # Update session state.
-      #
-      # A no-op.
-      def update
-        # don't need to update; hash is shared
-      end
-
-      # Close session storage.
-      #
-      # A no-op.
-      def close
-        # don't need to close
-      end
-
-      # Delete the session state.
-      def delete
-        GLOBAL_HASH_TABLE.delete(@session_id)
-      end
-    end
-
-    # Dummy session storage class.
-    #
-    # Implements session storage place holder.  No actual storage
-    # will be done.
-    class NullStore
-      # Create a new NullStore instance.
-      #
-      # +session+ is the session this instance is associated with.
-      # +option+ is a list of initialisation options.  None are
-      # currently recognised.
-      def initialize(session, option=nil)
-      end
-
-      # Restore (empty) session state.
-      def restore
-        {}
-      end
-
-      # Update session state.
-      #
-      # A no-op.
-      def update
-      end
-
-      # Close session storage.
-      #
-      # A no-op.
-      def close
-      end
-
-      # Delete the session state.
-      #
-      # A no-op.
-      def delete
-      end
-    end
-  end
-end
diff --git a/lib/cgi/session/pstore.rb b/lib/cgi/session/pstore.rb
deleted file mode 100644
index 45d0d8ae2cb17b..00000000000000
--- a/lib/cgi/session/pstore.rb
+++ /dev/null
@@ -1,88 +0,0 @@
-# frozen_string_literal: true
-#
-# cgi/session/pstore.rb - persistent storage of marshalled session data
-#
-# Documentation: William Webber (william@williamwebber.com)
-#
-# == Overview
-#
-# This file provides the CGI::Session::PStore class, which builds
-# persistent of session data on top of the pstore library.  See
-# cgi/session.rb for more details on session storage managers.
-
-require_relative '../session'
-require 'pstore'
-
-class CGI
-  class Session
-    # PStore-based session storage class.
-    #
-    # This builds upon the top-level PStore class provided by the
-    # library file pstore.rb.  Session data is marshalled and stored
-    # in a file.  File locking and transaction services are provided.
-    class PStore
-      # Create a new CGI::Session::PStore instance
-      #
-      # This constructor is used internally by CGI::Session.  The
-      # user does not generally need to call it directly.
-      #
-      # +session+ is the session for which this instance is being
-      # created.  The session id must only contain alphanumeric
-      # characters; automatically generated session ids observe
-      # this requirement.
-      #
-      # +option+ is a hash of options for the initializer.  The
-      # following options are recognised:
-      #
-      # tmpdir:: the directory to use for storing the PStore
-      #          file.  Defaults to Dir::tmpdir (generally "/tmp"
-      #          on Unix systems).
-      # prefix:: the prefix to add to the session id when generating
-      #          the filename for this session's PStore file.
-      #          Defaults to the empty string.
-      #
-      # This session's PStore file will be created if it does
-      # not exist, or opened if it does.
-      def initialize(session, option={})
-        option = {'suffix'=>''}.update(option)
-        path, @hash = session.new_store_file(option)
-        @p = ::PStore.new(path)
-        @p.transaction do |p|
-          File.chmod(0600, p.path)
-        end
-      end
-
-      # Restore session state from the session's PStore file.
-      #
-      # Returns the session state as a hash.
-      def restore
-        unless @hash
-          @p.transaction do
-            @hash = @p['hash'] || {}
-          end
-        end
-        @hash
-      end
-
-      # Save session state to the session's PStore file.
-      def update
-        @p.transaction do
-          @p['hash'] = @hash
-        end
-      end
-
-      # Update and close the session's PStore file.
-      def close
-        update
-      end
-
-      # Close and delete the session's PStore file.
-      def delete
-        path = @p.path
-        File::unlink path
-      end
-
-    end
-  end
-end
-# :enddoc:
diff --git a/lib/cgi/util.rb b/lib/cgi/util.rb
index 5f335898dc84a7..389a04acd21f05 100644
--- a/lib/cgi/util.rb
+++ b/lib/cgi/util.rb
@@ -1,255 +1,7 @@
 # frozen_string_literal: true
-class CGI
-  module Util; end
-  include Util
-  extend Util
-end
-module CGI::Util
-  @@accept_charset = Encoding::UTF_8 unless defined?(@@accept_charset)
 
-  # URL-encode a string into application/x-www-form-urlencoded.
-  # Space characters (+" "+) are encoded with plus signs (+"+"+)
-  #   url_encoded_string = CGI.escape("'Stop!' said Fred")
-  #      # => "%27Stop%21%27+said+Fred"
-  def escape(string)
-    encoding = string.encoding
-    buffer = string.b
-    buffer.gsub!(/([^ a-zA-Z0-9_.\-~]+)/) do |m|
-      '%' + m.unpack('H2' * m.bytesize).join('%').upcase
-    end
-    buffer.tr!(' ', '+')
-    buffer.force_encoding(encoding)
-  end
-
-  # URL-decode an application/x-www-form-urlencoded string with encoding(optional).
-  #   string = CGI.unescape("%27Stop%21%27+said+Fred")
-  #      # => "'Stop!' said Fred"
-  def unescape(string, encoding = @@accept_charset)
-    str = string.tr('+', ' ')
-    str = str.b
-    str.gsub!(/((?:%[0-9a-fA-F]{2})+)/) do |m|
-      [m.delete('%')].pack('H*')
-    end
-    str.force_encoding(encoding)
-    str.valid_encoding? ? str : str.force_encoding(string.encoding)
-  end
-
-  # URL-encode a string following RFC 3986
-  # Space characters (+" "+) are encoded with (+"%20"+)
-  #   url_encoded_string = CGI.escape("'Stop!' said Fred")
-  #      # => "%27Stop%21%27%20said%20Fred"
-  def escapeURIComponent(string)
-    encoding = string.encoding
-    buffer = string.b
-    buffer.gsub!(/([^a-zA-Z0-9_.\-~]+)/) do |m|
-      '%' + m.unpack('H2' * m.bytesize).join('%').upcase
-    end
-    buffer.force_encoding(encoding)
-  end
-
-  # URL-decode a string following RFC 3986 with encoding(optional).
-  #   string = CGI.unescape("%27Stop%21%27+said%20Fred")
-  #      # => "'Stop!'+said Fred"
-  def unescapeURIComponent(string, encoding = @@accept_charset)
-    str = string.b
-    str.gsub!(/((?:%[0-9a-fA-F]{2})+)/) do |m|
-      [m.delete('%')].pack('H*')
-    end
-    str.force_encoding(encoding)
-    str.valid_encoding? ? str : str.force_encoding(string.encoding)
-  end
-
-  # The set of special characters and their escaped values
-  TABLE_FOR_ESCAPE_HTML__ = {
-    "'" => '&#39;',
-    '&' => '&amp;',
-    '"' => '&quot;',
-    '<' => '&lt;',
-    '>' => '&gt;',
-  }
-
-  # Escape special characters in HTML, namely '&\"<>
-  #   CGI.escapeHTML('Usage: foo "bar" <baz>')
-  #      # => "Usage: foo &quot;bar&quot; &lt;baz&gt;"
-  def escapeHTML(string)
-    enc = string.encoding
-    unless enc.ascii_compatible?
-      if enc.dummy?
-        origenc = enc
-        enc = Encoding::Converter.asciicompat_encoding(enc)
-        string = enc ? string.encode(enc) : string.b
-      end
-      table = Hash[TABLE_FOR_ESCAPE_HTML__.map {|pair|pair.map {|s|s.encode(enc)}}]
-      string = string.gsub(/#{"['&\"<>]".encode(enc)}/, table)
-      string.encode!(origenc) if origenc
-      string
-    else
-      string = string.b
-      string.gsub!(/['&\"<>]/, TABLE_FOR_ESCAPE_HTML__)
-      string.force_encoding(enc)
-    end
-  end
-
-  # TruffleRuby runs the pure-Ruby variant faster, do not use the C extension there
-  unless RUBY_ENGINE == 'truffleruby'
-    begin
-      require 'cgi/escape'
-    rescue LoadError
-    end
-  end
-
-  # Unescape a string that has been HTML-escaped
-  #   CGI.unescapeHTML("Usage: foo &quot;bar&quot; &lt;baz&gt;")
-  #      # => "Usage: foo \"bar\" <baz>"
-  def unescapeHTML(string)
-    enc = string.encoding
-    unless enc.ascii_compatible?
-      if enc.dummy?
-        origenc = enc
-        enc = Encoding::Converter.asciicompat_encoding(enc)
-        string = enc ? string.encode(enc) : string.b
-      end
-      string = string.gsub(Regexp.new('&(apos|amp|quot|gt|lt|#[0-9]+|#x[0-9A-Fa-f]+);'.encode(enc))) do
-        case $1.encode(Encoding::US_ASCII)
-        when 'apos'                then "'".encode(enc)
-        when 'amp'                 then '&'.encode(enc)
-        when 'quot'                then '"'.encode(enc)
-        when 'gt'                  then '>'.encode(enc)
-        when 'lt'                  then '<'.encode(enc)
-        when /\A#0*(\d+)\z/        then $1.to_i.chr(enc)
-        when /\A#x([0-9a-f]+)\z/i  then $1.hex.chr(enc)
-        end
-      end
-      string.encode!(origenc) if origenc
-      return string
-    end
-    return string unless string.include? '&'
-    charlimit = case enc
-                when Encoding::UTF_8; 0x10ffff
-                when Encoding::ISO_8859_1; 256
-                else 128
-                end
-    string = string.b
-    string.gsub!(/&(apos|amp|quot|gt|lt|\#[0-9]+|\#[xX][0-9A-Fa-f]+);/) do
-      match = $1.dup
-      case match
-      when 'apos'                then "'"
-      when 'amp'                 then '&'
-      when 'quot'                then '"'
-      when 'gt'                  then '>'
-      when 'lt'                  then '<'
-      when /\A#0*(\d+)\z/
-        n = $1.to_i
-        if n < charlimit
-          n.chr(enc)
-        else
-          "&##{$1};"
-        end
-      when /\A#x([0-9a-f]+)\z/i
-        n = $1.hex
-        if n < charlimit
-          n.chr(enc)
-        else
-          "&#x#{$1};"
-        end
-      else
-        "&#{match};"
-      end
-    end
-    string.force_encoding enc
-  end
-
-  # Synonym for CGI.escapeHTML(str)
-  alias escape_html escapeHTML
-
-  # Synonym for CGI.unescapeHTML(str)
-  alias unescape_html unescapeHTML
-
-  # Escape only the tags of certain HTML elements in +string+.
-  #
-  # Takes an element or elements or array of elements.  Each element
-  # is specified by the name of the element, without angle brackets.
-  # This matches both the start and the end tag of that element.
-  # The attribute list of the open tag will also be escaped (for
-  # instance, the double-quotes surrounding attribute values).
-  #
-  #   print CGI.escapeElement('<BR><A HREF="url"></A>', "A", "IMG")
-  #     # "<BR>&lt;A HREF=&quot;url&quot;&gt;&lt;/A&gt"
-  #
-  #   print CGI.escapeElement('<BR><A HREF="url"></A>', ["A", "IMG"])
-  #     # "<BR>&lt;A HREF=&quot;url&quot;&gt;&lt;/A&gt"
-  def escapeElement(string, *elements)
-    elements = elements[0] if elements[0].kind_of?(Array)
-    unless elements.empty?
-      string.gsub(/<\/?(?:#{elements.join("|")})(?!\w)(?:.|\n)*?>/i) do
-        CGI.escapeHTML($&)
-      end
-    else
-      string
-    end
-  end
-
-  # Undo escaping such as that done by CGI.escapeElement()
-  #
-  #   print CGI.unescapeElement(
-  #           CGI.escapeHTML('<BR><A HREF="url"></A>'), "A", "IMG")
-  #     # "&lt;BR&gt;<A HREF="url"></A>"
-  #
-  #   print CGI.unescapeElement(
-  #           CGI.escapeHTML('<BR><A HREF="url"></A>'), ["A", "IMG"])
-  #     # "&lt;BR&gt;<A HREF="url"></A>"
-  def unescapeElement(string, *elements)
-    elements = elements[0] if elements[0].kind_of?(Array)
-    unless elements.empty?
-      string.gsub(/&lt;\/?(?:#{elements.join("|")})(?!\w)(?:.|\n)*?&gt;/i) do
-        unescapeHTML($&)
-      end
-    else
-      string
-    end
-  end
-
-  # Synonym for CGI.escapeElement(str)
-  alias escape_element escapeElement
-
-  # Synonym for CGI.unescapeElement(str)
-  alias unescape_element unescapeElement
-
-  # Format a +Time+ object as a String using the format specified by RFC 1123.
-  #
-  #   CGI.rfc1123_date(Time.now)
-  #     # Sat, 01 Jan 2000 00:00:00 GMT
-  def rfc1123_date(time)
-    time.getgm.strftime("%a, %d %b %Y %T GMT")
-  end
-
-  # Prettify (indent) an HTML string.
-  #
-  # +string+ is the HTML string to indent.  +shift+ is the indentation
-  # unit to use; it defaults to two spaces.
-  #
-  #   print CGI.pretty("<HTML><BODY></BODY></HTML>")
-  #     # <HTML>
-  #     #   <BODY>
-  #     #   </BODY>
-  #     # </HTML>
-  #
-  #   print CGI.pretty("<HTML><BODY></BODY></HTML>", "\t")
-  #     # <HTML>
-  #     #         <BODY>
-  #     #         </BODY>
-  #     # </HTML>
-  #
-  def pretty(string, shift = "  ")
-    lines = string.gsub(/(?!\A)<.*?>/m, "\n\\0").gsub(/<.*?>(?!\n)/m, "\\0\n")
-    end_pos = 0
-    while end_pos = lines.index(/^<\/(\w+)/, end_pos)
-      element = $1.dup
-      start_pos = lines.rindex(/^\s*<#{element}/i, end_pos)
-      lines[start_pos ... end_pos] = "__" + lines[start_pos ... end_pos].gsub(/\n(?!\z)/, "\n" + shift) + "__"
-    end
-    lines.gsub(/^((?:#{Regexp::quote(shift)})*)__(?=<\/?\w)/, '\1')
-  end
-
-  alias h escapeHTML
-end
+require "cgi/escape"
+warn <<-WARNING, uplevel: Gem::BUNDLED_GEMS.uplevel if $VERBOSE
+CGI::Util is removed from Ruby 3.5. Please use cgi/escape instead for CGI.escape and CGI.unescape features.
+If you are using CGI.parse, please install and use the cgi gem instead.
+WARNING
diff --git a/lib/csv.rb b/lib/csv.rb
deleted file mode 100644
index d4dc569b838f40..00000000000000
--- a/lib/csv.rb
+++ /dev/null
@@ -1,2881 +0,0 @@
-# encoding: US-ASCII
-# frozen_string_literal: true
-# = csv.rb -- CSV Reading and Writing
-#
-# Created by James Edward Gray II on 2005-10-31.
-#
-# See CSV for documentation.
-#
-# == Description
-#
-# Welcome to the new and improved CSV.
-#
-# This version of the CSV library began its life as FasterCSV. FasterCSV was
-# intended as a replacement to Ruby's then standard CSV library. It was
-# designed to address concerns users of that library had and it had three
-# primary goals:
-#
-# 1.  Be significantly faster than CSV while remaining a pure Ruby library.
-# 2.  Use a smaller and easier to maintain code base. (FasterCSV eventually
-#     grew larger, was also but considerably richer in features. The parsing
-#     core remains quite small.)
-# 3.  Improve on the CSV interface.
-#
-# Obviously, the last one is subjective. I did try to defer to the original
-# interface whenever I didn't have a compelling reason to change it though, so
-# hopefully this won't be too radically different.
-#
-# We must have met our goals because FasterCSV was renamed to CSV and replaced
-# the original library as of Ruby 1.9. If you are migrating code from 1.8 or
-# earlier, you may have to change your code to comply with the new interface.
-#
-# == What's the Different From the Old CSV?
-#
-# I'm sure I'll miss something, but I'll try to mention most of the major
-# differences I am aware of, to help others quickly get up to speed:
-#
-# === \CSV Parsing
-#
-# * This parser is m17n aware. See CSV for full details.
-# * This library has a stricter parser and will throw MalformedCSVErrors on
-#   problematic data.
-# * This library has a less liberal idea of a line ending than CSV. What you
-#   set as the <tt>:row_sep</tt> is law. It can auto-detect your line endings
-#   though.
-# * The old library returned empty lines as <tt>[nil]</tt>. This library calls
-#   them <tt>[]</tt>.
-# * This library has a much faster parser.
-#
-# === Interface
-#
-# * CSV now uses keyword parameters to set options.
-# * CSV no longer has generate_row() or parse_row().
-# * The old CSV's Reader and Writer classes have been dropped.
-# * CSV::open() is now more like Ruby's open().
-# * CSV objects now support most standard IO methods.
-# * CSV now has a new() method used to wrap objects like String and IO for
-#   reading and writing.
-# * CSV::generate() is different from the old method.
-# * CSV no longer supports partial reads. It works line-by-line.
-# * CSV no longer allows the instance methods to override the separators for
-#   performance reasons. They must be set in the constructor.
-#
-# If you use this library and find yourself missing any functionality I have
-# trimmed, please {let me know}[mailto:james@grayproductions.net].
-#
-# == Documentation
-#
-# See CSV for documentation.
-#
-# == What is CSV, really?
-#
-# CSV maintains a pretty strict definition of CSV taken directly from
-# {the RFC}[https://www.ietf.org/rfc/rfc4180.txt]. I relax the rules in only one
-# place and that is to make using this library easier. CSV will parse all valid
-# CSV.
-#
-# What you don't want to do is to feed CSV invalid data. Because of the way the
-# CSV format works, it's common for a parser to need to read until the end of
-# the file to be sure a field is invalid. This consumes a lot of time and memory.
-#
-# Luckily, when working with invalid CSV, Ruby's built-in methods will almost
-# always be superior in every way. For example, parsing non-quoted fields is as
-# easy as:
-#
-#   data.split(",")
-#
-# == Questions and/or Comments
-#
-# Feel free to email {James Edward Gray II}[mailto:james@grayproductions.net]
-# with any questions.
-
-require "forwardable"
-require "date"
-require "stringio"
-
-require_relative "csv/fields_converter"
-require_relative "csv/input_record_separator"
-require_relative "csv/parser"
-require_relative "csv/row"
-require_relative "csv/table"
-require_relative "csv/writer"
-
-# == \CSV
-#
-# === In a Hurry?
-#
-# If you are familiar with \CSV data and have a particular task in mind,
-# you may want to go directly to the:
-# - {Recipes for CSV}[doc/csv/recipes/recipes_rdoc.html].
-#
-# Otherwise, read on here, about the API: classes, methods, and constants.
-#
-# === \CSV Data
-#
-# \CSV (comma-separated values) data is a text representation of a table:
-# - A _row_ _separator_ delimits table rows.
-#   A common row separator is the newline character <tt>"\n"</tt>.
-# - A _column_ _separator_ delimits fields in a row.
-#   A common column separator is the comma character <tt>","</tt>.
-#
-# This \CSV \String, with row separator <tt>"\n"</tt>
-# and column separator <tt>","</tt>,
-# has three rows and two columns:
-#   "foo,0\nbar,1\nbaz,2\n"
-#
-# Despite the name \CSV, a \CSV representation can use different separators.
-#
-# For more about tables, see the Wikipedia article
-# "{Table (information)}[https://en.wikipedia.org/wiki/Table_(information)]",
-# especially its section
-# "{Simple table}[https://en.wikipedia.org/wiki/Table_(information)#Simple_table]"
-#
-# == \Class \CSV
-#
-# Class \CSV provides methods for:
-# - Parsing \CSV data from a \String object, a \File (via its file path), or an \IO object.
-# - Generating \CSV data to a \String object.
-#
-# To make \CSV available:
-#   require 'csv'
-#
-# All examples here assume that this has been done.
-#
-# == Keeping It Simple
-#
-# A \CSV object has dozens of instance methods that offer fine-grained control
-# of parsing and generating \CSV data.
-# For many needs, though, simpler approaches will do.
-#
-# This section summarizes the singleton methods in \CSV
-# that allow you to parse and generate without explicitly
-# creating \CSV objects.
-# For details, follow the links.
-#
-# === Simple Parsing
-#
-# Parsing methods commonly return either of:
-# - An \Array of Arrays of Strings:
-#   - The outer \Array is the entire "table".
-#   - Each inner \Array is a row.
-#   - Each \String is a field.
-# - A CSV::Table object.  For details, see
-#   {\CSV with Headers}[#class-CSV-label-CSV+with+Headers].
-#
-# ==== Parsing a \String
-#
-# The input to be parsed can be a string:
-#   string = "foo,0\nbar,1\nbaz,2\n"
-#
-# \Method CSV.parse returns the entire \CSV data:
-#   CSV.parse(string) # => [["foo", "0"], ["bar", "1"], ["baz", "2"]]
-#
-# \Method CSV.parse_line returns only the first row:
-#   CSV.parse_line(string) # => ["foo", "0"]
-#
-# \CSV extends class \String with instance method String#parse_csv,
-# which also returns only the first row:
-#   string.parse_csv # => ["foo", "0"]
-#
-# ==== Parsing Via a \File Path
-#
-# The input to be parsed can be in a file:
-#   string = "foo,0\nbar,1\nbaz,2\n"
-#   path = 't.csv'
-#   File.write(path, string)
-#
-# \Method CSV.read returns the entire \CSV data:
-#  CSV.read(path) # => [["foo", "0"], ["bar", "1"], ["baz", "2"]]
-#
-# \Method CSV.foreach iterates, passing each row to the given block:
-#  CSV.foreach(path) do |row|
-#    p row
-#  end
-# Output:
-#   ["foo", "0"]
-#   ["bar", "1"]
-#   ["baz", "2"]
-#
-# \Method CSV.table returns the entire \CSV data as a CSV::Table object:
-#   CSV.table(path) # => #<CSV::Table mode:col_or_row row_count:3>
-#
-# ==== Parsing from an Open \IO Stream
-#
-# The input to be parsed can be in an open \IO stream:
-#
-# \Method CSV.read returns the entire \CSV data:
-#   File.open(path) do |file|
-#     CSV.read(file)
-#   end # => [["foo", "0"], ["bar", "1"], ["baz", "2"]]
-#
-# As does method CSV.parse:
-#   File.open(path) do |file|
-#     CSV.parse(file)
-#   end # => [["foo", "0"], ["bar", "1"], ["baz", "2"]]
-#
-# \Method CSV.parse_line returns only the first row:
-#   File.open(path) do |file|
-#    CSV.parse_line(file)
-#   end # => ["foo", "0"]
-#
-# \Method CSV.foreach iterates, passing each row to the given block:
-#   File.open(path) do |file|
-#     CSV.foreach(file) do |row|
-#       p row
-#     end
-#   end
-# Output:
-#   ["foo", "0"]
-#   ["bar", "1"]
-#   ["baz", "2"]
-#
-# \Method CSV.table returns the entire \CSV data as a CSV::Table object:
-#   File.open(path) do |file|
-#     CSV.table(file)
-#   end # => #<CSV::Table mode:col_or_row row_count:3>
-#
-# === Simple Generating
-#
-# \Method CSV.generate returns a \String;
-# this example uses method CSV#<< to append the rows
-# that are to be generated:
-#   output_string = CSV.generate do |csv|
-#     csv << ['foo', 0]
-#     csv << ['bar', 1]
-#     csv << ['baz', 2]
-#   end
-#   output_string # => "foo,0\nbar,1\nbaz,2\n"
-#
-# \Method CSV.generate_line returns a \String containing the single row
-# constructed from an \Array:
-#   CSV.generate_line(['foo', '0']) # => "foo,0\n"
-#
-# \CSV extends class \Array with instance method <tt>Array#to_csv</tt>,
-# which forms an \Array into a \String:
-#   ['foo', '0'].to_csv # => "foo,0\n"
-#
-# === "Filtering" \CSV
-#
-# \Method CSV.filter provides a Unix-style filter for \CSV data.
-# The input data is processed to form the output data:
-#   in_string = "foo,0\nbar,1\nbaz,2\n"
-#   out_string = ''
-#   CSV.filter(in_string, out_string) do |row|
-#     row[0] = row[0].upcase
-#     row[1] *= 4
-#   end
-#   out_string # => "FOO,0000\nBAR,1111\nBAZ,2222\n"
-#
-# == \CSV Objects
-#
-# There are three ways to create a \CSV object:
-# - \Method CSV.new returns a new \CSV object.
-# - \Method CSV.instance returns a new or cached \CSV object.
-# - \Method \CSV() also returns a new or cached \CSV object.
-#
-# === Instance Methods
-#
-# \CSV has three groups of instance methods:
-# - Its own internally defined instance methods.
-# - Methods included by module Enumerable.
-# - Methods delegated to class IO. See below.
-#
-# ==== Delegated Methods
-#
-# For convenience, a CSV object will delegate to many methods in class IO.
-# (A few have wrapper "guard code" in \CSV.) You may call:
-# * IO#binmode
-# * #binmode?
-# * IO#close
-# * IO#close_read
-# * IO#close_write
-# * IO#closed?
-# * #eof
-# * #eof?
-# * IO#external_encoding
-# * IO#fcntl
-# * IO#fileno
-# * #flock
-# * IO#flush
-# * IO#fsync
-# * IO#internal_encoding
-# * #ioctl
-# * IO#isatty
-# * #path
-# * IO#pid
-# * IO#pos
-# * IO#pos=
-# * IO#reopen
-# * #rewind
-# * IO#seek
-# * #stat
-# * IO#string
-# * IO#sync
-# * IO#sync=
-# * IO#tell
-# * #to_i
-# * #to_io
-# * IO#truncate
-# * IO#tty?
-#
-# === Options
-#
-# The default values for options are:
-#   DEFAULT_OPTIONS = {
-#     # For both parsing and generating.
-#     col_sep:            ",",
-#     row_sep:            :auto,
-#     quote_char:         '"',
-#     # For parsing.
-#     field_size_limit:   nil,
-#     converters:         nil,
-#     unconverted_fields: nil,
-#     headers:            false,
-#     return_headers:     false,
-#     header_converters:  nil,
-#     skip_blanks:        false,
-#     skip_lines:         nil,
-#     liberal_parsing:    false,
-#     nil_value:          nil,
-#     empty_value:        "",
-#     strip:              false,
-#     # For generating.
-#     write_headers:      nil,
-#     quote_empty:        true,
-#     force_quotes:       false,
-#     write_converters:   nil,
-#     write_nil_value:    nil,
-#     write_empty_value:  "",
-#   }
-#
-# ==== Options for Parsing
-#
-# Options for parsing, described in detail below, include:
-# - +row_sep+: Specifies the row separator; used to delimit rows.
-# - +col_sep+: Specifies the column separator; used to delimit fields.
-# - +quote_char+: Specifies the quote character; used to quote fields.
-# - +field_size_limit+: Specifies the maximum field size + 1 allowed.
-#   Deprecated since 3.2.3. Use +max_field_size+ instead.
-# - +max_field_size+: Specifies the maximum field size allowed.
-# - +converters+: Specifies the field converters to be used.
-# - +unconverted_fields+: Specifies whether unconverted fields are to be available.
-# - +headers+: Specifies whether data contains headers,
-#   or specifies the headers themselves.
-# - +return_headers+: Specifies whether headers are to be returned.
-# - +header_converters+: Specifies the header converters to be used.
-# - +skip_blanks+: Specifies whether blanks lines are to be ignored.
-# - +skip_lines+: Specifies how comments lines are to be recognized.
-# - +strip+: Specifies whether leading and trailing whitespace are to be
-#   stripped from fields. This must be compatible with +col_sep+; if it is not,
-#   then an +ArgumentError+ exception will be raised.
-# - +liberal_parsing+: Specifies whether \CSV should attempt to parse
-#   non-compliant data.
-# - +nil_value+: Specifies the object that is to be substituted for each null (no-text) field.
-# - +empty_value+: Specifies the object that is to be substituted for each empty field.
-#
-# :include: ../doc/csv/options/common/row_sep.rdoc
-#
-# :include: ../doc/csv/options/common/col_sep.rdoc
-#
-# :include: ../doc/csv/options/common/quote_char.rdoc
-#
-# :include: ../doc/csv/options/parsing/field_size_limit.rdoc
-#
-# :include: ../doc/csv/options/parsing/converters.rdoc
-#
-# :include: ../doc/csv/options/parsing/unconverted_fields.rdoc
-#
-# :include: ../doc/csv/options/parsing/headers.rdoc
-#
-# :include: ../doc/csv/options/parsing/return_headers.rdoc
-#
-# :include: ../doc/csv/options/parsing/header_converters.rdoc
-#
-# :include: ../doc/csv/options/parsing/skip_blanks.rdoc
-#
-# :include: ../doc/csv/options/parsing/skip_lines.rdoc
-#
-# :include: ../doc/csv/options/parsing/strip.rdoc
-#
-# :include: ../doc/csv/options/parsing/liberal_parsing.rdoc
-#
-# :include: ../doc/csv/options/parsing/nil_value.rdoc
-#
-# :include: ../doc/csv/options/parsing/empty_value.rdoc
-#
-# ==== Options for Generating
-#
-# Options for generating, described in detail below, include:
-# - +row_sep+: Specifies the row separator; used to delimit rows.
-# - +col_sep+: Specifies the column separator; used to delimit fields.
-# - +quote_char+: Specifies the quote character; used to quote fields.
-# - +write_headers+: Specifies whether headers are to be written.
-# - +force_quotes+: Specifies whether each output field is to be quoted.
-# - +quote_empty+: Specifies whether each empty output field is to be quoted.
-# - +write_converters+: Specifies the field converters to be used in writing.
-# - +write_nil_value+: Specifies the object that is to be substituted for each +nil+-valued field.
-# - +write_empty_value+: Specifies the object that is to be substituted for each empty field.
-#
-# :include: ../doc/csv/options/common/row_sep.rdoc
-#
-# :include: ../doc/csv/options/common/col_sep.rdoc
-#
-# :include: ../doc/csv/options/common/quote_char.rdoc
-#
-# :include: ../doc/csv/options/generating/write_headers.rdoc
-#
-# :include: ../doc/csv/options/generating/force_quotes.rdoc
-#
-# :include: ../doc/csv/options/generating/quote_empty.rdoc
-#
-# :include: ../doc/csv/options/generating/write_converters.rdoc
-#
-# :include: ../doc/csv/options/generating/write_nil_value.rdoc
-#
-# :include: ../doc/csv/options/generating/write_empty_value.rdoc
-#
-# === \CSV with Headers
-#
-# CSV allows to specify column names of CSV file, whether they are in data, or
-# provided separately. If headers are specified, reading methods return an instance
-# of CSV::Table, consisting of CSV::Row.
-#
-#   # Headers are part of data
-#   data = CSV.parse(<<~ROWS, headers: true)
-#     Name,Department,Salary
-#     Bob,Engineering,1000
-#     Jane,Sales,2000
-#     John,Management,5000
-#   ROWS
-#
-#   data.class      #=> CSV::Table
-#   data.first      #=> #<CSV::Row "Name":"Bob" "Department":"Engineering" "Salary":"1000">
-#   data.first.to_h #=> {"Name"=>"Bob", "Department"=>"Engineering", "Salary"=>"1000"}
-#
-#   # Headers provided by developer
-#   data = CSV.parse('Bob,Engineering,1000', headers: %i[name department salary])
-#   data.first      #=> #<CSV::Row name:"Bob" department:"Engineering" salary:"1000">
-#
-# === \Converters
-#
-# By default, each value (field or header) parsed by \CSV is formed into a \String.
-# You can use a _field_ _converter_ or  _header_ _converter_
-# to intercept and modify the parsed values:
-# - See {Field Converters}[#class-CSV-label-Field+Converters].
-# - See {Header Converters}[#class-CSV-label-Header+Converters].
-#
-# Also by default, each value to be written during generation is written 'as-is'.
-# You can use a _write_ _converter_ to modify values before writing.
-# - See {Write Converters}[#class-CSV-label-Write+Converters].
-#
-# ==== Specifying \Converters
-#
-# You can specify converters for parsing or generating in the +options+
-# argument to various \CSV methods:
-# - Option +converters+ for converting parsed field values.
-# - Option +header_converters+ for converting parsed header values.
-# - Option +write_converters+ for converting values to be written (generated).
-#
-# There are three forms for specifying converters:
-# - A converter proc: executable code to be used for conversion.
-# - A converter name: the name of a stored converter.
-# - A converter list: an array of converter procs, converter names, and converter lists.
-#
-# ===== Converter Procs
-#
-# This converter proc, +strip_converter+, accepts a value +field+
-# and returns <tt>field.strip</tt>:
-#   strip_converter = proc {|field| field.strip }
-# In this call to <tt>CSV.parse</tt>,
-# the keyword argument <tt>converters: string_converter</tt>
-# specifies that:
-# - \Proc +string_converter+ is to be called for each parsed field.
-# - The converter's return value is to replace the +field+ value.
-# Example:
-#   string = " foo , 0 \n bar , 1 \n baz , 2 \n"
-#   array = CSV.parse(string, converters: strip_converter)
-#   array # => [["foo", "0"], ["bar", "1"], ["baz", "2"]]
-#
-# A converter proc can receive a second argument, +field_info+,
-# that contains details about the field.
-# This modified +strip_converter+ displays its arguments:
-#   strip_converter = proc do |field, field_info|
-#     p [field, field_info]
-#     field.strip
-#   end
-#   string = " foo , 0 \n bar , 1 \n baz , 2 \n"
-#   array = CSV.parse(string, converters: strip_converter)
-#   array # => [["foo", "0"], ["bar", "1"], ["baz", "2"]]
-# Output:
-#  [" foo ", #<struct CSV::FieldInfo index=0, line=1, header=nil>]
-#  [" 0 ", #<struct CSV::FieldInfo index=1, line=1, header=nil>]
-#  [" bar ", #<struct CSV::FieldInfo index=0, line=2, header=nil>]
-#  [" 1 ", #<struct CSV::FieldInfo index=1, line=2, header=nil>]
-#  [" baz ", #<struct CSV::FieldInfo index=0, line=3, header=nil>]
-#  [" 2 ", #<struct CSV::FieldInfo index=1, line=3, header=nil>]
-# Each CSV::FieldInfo object shows:
-# - The 0-based field index.
-# - The 1-based line index.
-# - The field header, if any.
-#
-# ===== Stored \Converters
-#
-# A converter may be given a name and stored in a structure where
-# the parsing methods can find it by name.
-#
-# The storage structure for field converters is the \Hash CSV::Converters.
-# It has several built-in converter procs:
-# - <tt>:integer</tt>: converts each \String-embedded integer into a true \Integer.
-# - <tt>:float</tt>: converts each \String-embedded float into a true \Float.
-# - <tt>:date</tt>: converts each \String-embedded date into a true \Date.
-# - <tt>:date_time</tt>: converts each \String-embedded date-time into a true \DateTime
-# .
-# This example creates a converter proc, then stores it:
-#   strip_converter = proc {|field| field.strip }
-#   CSV::Converters[:strip] = strip_converter
-# Then the parsing method call can refer to the converter
-# by its name, <tt>:strip</tt>:
-#   string = " foo , 0 \n bar , 1 \n baz , 2 \n"
-#   array = CSV.parse(string, converters: :strip)
-#   array # => [["foo", "0"], ["bar", "1"], ["baz", "2"]]
-#
-# The storage structure for header converters is the \Hash CSV::HeaderConverters,
-# which works in the same way.
-# It also has built-in converter procs:
-# - <tt>:downcase</tt>: Downcases each header.
-# - <tt>:symbol</tt>: Converts each header to a \Symbol.
-#
-# There is no such storage structure for write headers.
-#
-# In order for the parsing methods to access stored converters in non-main-Ractors, the
-# storage structure must be made shareable first.
-# Therefore, <tt>Ractor.make_shareable(CSV::Converters)</tt> and
-# <tt>Ractor.make_shareable(CSV::HeaderConverters)</tt> must be called before the creation
-# of Ractors that use the converters stored in these structures. (Since making the storage
-# structures shareable involves freezing them, any custom converters that are to be used
-# must be added first.)
-#
-# ===== Converter Lists
-#
-# A _converter_ _list_ is an \Array that may include any assortment of:
-# - Converter procs.
-# - Names of stored converters.
-# - Nested converter lists.
-#
-# Examples:
-#   numeric_converters = [:integer, :float]
-#   date_converters = [:date, :date_time]
-#   [numeric_converters, strip_converter]
-#   [strip_converter, date_converters, :float]
-#
-# Like a converter proc, a converter list may be named and stored in either
-# \CSV::Converters or CSV::HeaderConverters:
-#   CSV::Converters[:custom] = [strip_converter, date_converters, :float]
-#   CSV::HeaderConverters[:custom] = [:downcase, :symbol]
-#
-# There are two built-in converter lists:
-#   CSV::Converters[:numeric] # => [:integer, :float]
-#   CSV::Converters[:all] # => [:date_time, :numeric]
-#
-# ==== Field \Converters
-#
-# With no conversion, all parsed fields in all rows become Strings:
-#   string = "foo,0\nbar,1\nbaz,2\n"
-#   ary = CSV.parse(string)
-#   ary # => # => [["foo", "0"], ["bar", "1"], ["baz", "2"]]
-#
-# When you specify a field converter, each parsed field is passed to the converter;
-# its return value becomes the stored value for the field.
-# A converter might, for example, convert an integer embedded in a \String
-# into a true \Integer.
-# (In fact, that's what built-in field converter +:integer+ does.)
-#
-# There are three ways to use field \converters.
-#
-# - Using option {converters}[#class-CSV-label-Option+converters] with a parsing method:
-#     ary = CSV.parse(string, converters: :integer)
-#     ary # => [0, 1, 2] # => [["foo", 0], ["bar", 1], ["baz", 2]]
-# - Using option {converters}[#class-CSV-label-Option+converters] with a new \CSV instance:
-#     csv = CSV.new(string, converters: :integer)
-#     # Field converters in effect:
-#     csv.converters # => [:integer]
-#     csv.read # => [["foo", 0], ["bar", 1], ["baz", 2]]
-# - Using method #convert to add a field converter to a \CSV instance:
-#     csv = CSV.new(string)
-#     # Add a converter.
-#     csv.convert(:integer)
-#     csv.converters # => [:integer]
-#     csv.read # => [["foo", 0], ["bar", 1], ["baz", 2]]
-#
-# Installing a field converter does not affect already-read rows:
-#   csv = CSV.new(string)
-#   csv.shift # => ["foo", "0"]
-#   # Add a converter.
-#   csv.convert(:integer)
-#   csv.converters # => [:integer]
-#   csv.read # => [["bar", 1], ["baz", 2]]
-#
-# There are additional built-in \converters, and custom \converters are also supported.
-#
-# ===== Built-In Field \Converters
-#
-# The built-in field converters are in \Hash CSV::Converters:
-# - Each key is a field converter name.
-# - Each value is one of:
-#   - A \Proc field converter.
-#   - An \Array of field converter names.
-#
-# Display:
-#   CSV::Converters.each_pair do |name, value|
-#     if value.kind_of?(Proc)
-#       p [name, value.class]
-#     else
-#       p [name, value]
-#     end
-#   end
-# Output:
-#   [:integer, Proc]
-#   [:float, Proc]
-#   [:numeric, [:integer, :float]]
-#   [:date, Proc]
-#   [:date_time, Proc]
-#   [:all, [:date_time, :numeric]]
-#
-# Each of these converters transcodes values to UTF-8 before attempting conversion.
-# If a value cannot be transcoded to UTF-8 the conversion will
-# fail and the value will remain unconverted.
-#
-# Converter +:integer+ converts each field that Integer() accepts:
-#   data = '0,1,2,x'
-#   # Without the converter
-#   csv = CSV.parse_line(data)
-#   csv # => ["0", "1", "2", "x"]
-#   # With the converter
-#   csv = CSV.parse_line(data, converters: :integer)
-#   csv # => [0, 1, 2, "x"]
-#
-# Converter +:float+ converts each field that Float() accepts:
-#   data = '1.0,3.14159,x'
-#   # Without the converter
-#   csv = CSV.parse_line(data)
-#   csv # => ["1.0", "3.14159", "x"]
-#   # With the converter
-#   csv = CSV.parse_line(data, converters: :float)
-#   csv # => [1.0, 3.14159, "x"]
-#
-# Converter +:numeric+ converts with both +:integer+ and +:float+..
-#
-# Converter +:date+ converts each field that Date::parse accepts:
-#   data = '2001-02-03,x'
-#   # Without the converter
-#   csv = CSV.parse_line(data)
-#   csv # => ["2001-02-03", "x"]
-#   # With the converter
-#   csv = CSV.parse_line(data, converters: :date)
-#   csv # => [#<Date: 2001-02-03 ((2451944j,0s,0n),+0s,2299161j)>, "x"]
-#
-# Converter +:date_time+ converts each field that DateTime::parse accepts:
-#   data = '2020-05-07T14:59:00-05:00,x'
-#   # Without the converter
-#   csv = CSV.parse_line(data)
-#   csv # => ["2020-05-07T14:59:00-05:00", "x"]
-#   # With the converter
-#   csv = CSV.parse_line(data, converters: :date_time)
-#   csv # => [#<DateTime: 2020-05-07T14:59:00-05:00 ((2458977j,71940s,0n),-18000s,2299161j)>, "x"]
-#
-# Converter +:numeric+ converts with both +:date_time+ and +:numeric+..
-#
-# As seen above, method #convert adds \converters to a \CSV instance,
-# and method #converters returns an \Array of the \converters in effect:
-#   csv = CSV.new('0,1,2')
-#   csv.converters # => []
-#   csv.convert(:integer)
-#   csv.converters # => [:integer]
-#   csv.convert(:date)
-#   csv.converters # => [:integer, :date]
-#
-# ===== Custom Field \Converters
-#
-# You can define a custom field converter:
-#   strip_converter = proc {|field| field.strip }
-#   string = " foo , 0 \n bar , 1 \n baz , 2 \n"
-#   array = CSV.parse(string, converters: strip_converter)
-#   array # => [["foo", "0"], ["bar", "1"], ["baz", "2"]]
-# You can register the converter in \Converters \Hash,
-# which allows you to refer to it by name:
-#   CSV::Converters[:strip] = strip_converter
-#   string = " foo , 0 \n bar , 1 \n baz , 2 \n"
-#   array = CSV.parse(string, converters: :strip)
-#   array # => [["foo", "0"], ["bar", "1"], ["baz", "2"]]
-#
-# ==== Header \Converters
-#
-# Header converters operate only on headers (and not on other rows).
-#
-# There are three ways to use header \converters;
-# these examples use built-in header converter +:downcase+,
-# which downcases each parsed header.
-#
-# - Option +header_converters+ with a singleton parsing method:
-#     string = "Name,Count\nFoo,0\n,Bar,1\nBaz,2"
-#     tbl = CSV.parse(string, headers: true, header_converters: :downcase)
-#     tbl.class # => CSV::Table
-#     tbl.headers # => ["name", "count"]
-#
-# - Option +header_converters+ with a new \CSV instance:
-#     csv = CSV.new(string, header_converters: :downcase)
-#     # Header converters in effect:
-#     csv.header_converters # => [:downcase]
-#     tbl = CSV.parse(string, headers: true)
-#     tbl.headers # => ["Name", "Count"]
-#
-# - Method #header_convert adds a header converter to a \CSV instance:
-#     csv = CSV.new(string)
-#     # Add a header converter.
-#     csv.header_convert(:downcase)
-#     csv.header_converters # => [:downcase]
-#     tbl = CSV.parse(string, headers: true)
-#     tbl.headers # => ["Name", "Count"]
-#
-# ===== Built-In Header \Converters
-#
-# The built-in header \converters are in \Hash CSV::HeaderConverters.
-# The keys there are the names of the \converters:
-#   CSV::HeaderConverters.keys # => [:downcase, :symbol]
-#
-# Converter +:downcase+ converts each header by downcasing it:
-#   string = "Name,Count\nFoo,0\n,Bar,1\nBaz,2"
-#   tbl = CSV.parse(string, headers: true, header_converters: :downcase)
-#   tbl.class # => CSV::Table
-#   tbl.headers # => ["name", "count"]
-#
-# Converter +:symbol+ converts each header by making it into a \Symbol:
-#   string = "Name,Count\nFoo,0\n,Bar,1\nBaz,2"
-#   tbl = CSV.parse(string, headers: true, header_converters: :symbol)
-#   tbl.headers # => [:name, :count]
-# Details:
-# - Strips leading and trailing whitespace.
-# - Downcases the header.
-# - Replaces embedded spaces with underscores.
-# - Removes non-word characters.
-# - Makes the string into a \Symbol.
-#
-# ===== Custom Header \Converters
-#
-# You can define a custom header converter:
-#   upcase_converter = proc {|header| header.upcase }
-#   string = "Name,Value\nfoo,0\nbar,1\nbaz,2\n"
-#   table = CSV.parse(string, headers: true, header_converters: upcase_converter)
-#   table # => #<CSV::Table mode:col_or_row row_count:4>
-#   table.headers # => ["NAME", "VALUE"]
-# You can register the converter in \HeaderConverters \Hash,
-# which allows you to refer to it by name:
-#   CSV::HeaderConverters[:upcase] = upcase_converter
-#   table = CSV.parse(string, headers: true, header_converters: :upcase)
-#   table # => #<CSV::Table mode:col_or_row row_count:4>
-#   table.headers # => ["NAME", "VALUE"]
-#
-# ===== Write \Converters
-#
-# When you specify a write converter for generating \CSV,
-# each field to be written is passed to the converter;
-# its return value becomes the new value for the field.
-# A converter might, for example, strip whitespace from a field.
-#
-# Using no write converter (all fields unmodified):
-#   output_string = CSV.generate do |csv|
-#     csv << [' foo ', 0]
-#     csv << [' bar ', 1]
-#     csv << [' baz ', 2]
-#   end
-#   output_string # => " foo ,0\n bar ,1\n baz ,2\n"
-# Using option +write_converters+ with two custom write converters:
-#   strip_converter = proc {|field| field.respond_to?(:strip) ? field.strip : field }
-#   upcase_converter = proc {|field| field.respond_to?(:upcase) ? field.upcase : field }
-#   write_converters = [strip_converter, upcase_converter]
-#   output_string = CSV.generate(write_converters: write_converters) do |csv|
-#     csv << [' foo ', 0]
-#     csv << [' bar ', 1]
-#     csv << [' baz ', 2]
-#   end
-#   output_string # => "FOO,0\nBAR,1\nBAZ,2\n"
-#
-# === Character Encodings (M17n or Multilingualization)
-#
-# This new CSV parser is m17n savvy.  The parser works in the Encoding of the IO
-# or String object being read from or written to. Your data is never transcoded
-# (unless you ask Ruby to transcode it for you) and will literally be parsed in
-# the Encoding it is in. Thus CSV will return Arrays or Rows of Strings in the
-# Encoding of your data. This is accomplished by transcoding the parser itself
-# into your Encoding.
-#
-# Some transcoding must take place, of course, to accomplish this multiencoding
-# support. For example, <tt>:col_sep</tt>, <tt>:row_sep</tt>, and
-# <tt>:quote_char</tt> must be transcoded to match your data.  Hopefully this
-# makes the entire process feel transparent, since CSV's defaults should just
-# magically work for your data. However, you can set these values manually in
-# the target Encoding to avoid the translation.
-#
-# It's also important to note that while all of CSV's core parser is now
-# Encoding agnostic, some features are not. For example, the built-in
-# converters will try to transcode data to UTF-8 before making conversions.
-# Again, you can provide custom converters that are aware of your Encodings to
-# avoid this translation. It's just too hard for me to support native
-# conversions in all of Ruby's Encodings.
-#
-# Anyway, the practical side of this is simple: make sure IO and String objects
-# passed into CSV have the proper Encoding set and everything should just work.
-# CSV methods that allow you to open IO objects (CSV::foreach(), CSV::open(),
-# CSV::read(), and CSV::readlines()) do allow you to specify the Encoding.
-#
-# One minor exception comes when generating CSV into a String with an Encoding
-# that is not ASCII compatible. There's no existing data for CSV to use to
-# prepare itself and thus you will probably need to manually specify the desired
-# Encoding for most of those cases. It will try to guess using the fields in a
-# row of output though, when using CSV::generate_line() or Array#to_csv().
-#
-# I try to point out any other Encoding issues in the documentation of methods
-# as they come up.
-#
-# This has been tested to the best of my ability with all non-"dummy" Encodings
-# Ruby ships with. However, it is brave new code and may have some bugs.
-# Please feel free to {report}[mailto:james@grayproductions.net] any issues you
-# find with it.
-#
-class CSV
-
-  # The error thrown when the parser encounters illegal CSV formatting.
-  class MalformedCSVError < RuntimeError
-    attr_reader :line_number
-    alias_method :lineno, :line_number
-    def initialize(message, line_number)
-      @line_number = line_number
-      super("#{message} in line #{line_number}.")
-    end
-  end
-
-  #
-  # A FieldInfo Struct contains details about a field's position in the data
-  # source it was read from.  CSV will pass this Struct to some blocks that make
-  # decisions based on field structure.  See CSV.convert_fields() for an
-  # example.
-  #
-  # <b><tt>index</tt></b>::  The zero-based index of the field in its row.
-  # <b><tt>line</tt></b>::   The line of the data source this row is from.
-  # <b><tt>header</tt></b>:: The header for the column, when available.
-  # <b><tt>quoted?</tt></b>:: True or false, whether the original value is quoted or not.
-  #
-  FieldInfo = Struct.new(:index, :line, :header, :quoted?)
-
-  # A Regexp used to find and convert some common Date formats.
-  DateMatcher     = / \A(?: (\w+,?\s+)?\w+\s+\d{1,2},?\s+\d{2,4} |
-                            \d{4}-\d{2}-\d{2} )\z /x
-  # A Regexp used to find and convert some common DateTime formats.
-  DateTimeMatcher =
-    / \A(?: (\w+,?\s+)?\w+\s+\d{1,2}\s+\d{1,2}:\d{1,2}:\d{1,2},?\s+\d{2,4} |
-            # ISO-8601 and RFC-3339 (space instead of T) recognized by DateTime.parse
-            \d{4}-\d{2}-\d{2}
-              (?:[T\s]\d{2}:\d{2}(?::\d{2}(?:\.\d+)?(?:[+-]\d{2}(?::\d{2})|Z)?)?)?
-        )\z /x
-
-  # The encoding used by all converters.
-  ConverterEncoding = Encoding.find("UTF-8")
-
-  # A \Hash containing the names and \Procs for the built-in field converters.
-  # See {Built-In Field Converters}[#class-CSV-label-Built-In+Field+Converters].
-  #
-  # This \Hash is intentionally left unfrozen, and may be extended with
-  # custom field converters.
-  # See {Custom Field Converters}[#class-CSV-label-Custom+Field+Converters].
-  Converters  = {
-    integer:   lambda { |f|
-      Integer(f.encode(ConverterEncoding)) rescue f
-    },
-    float:     lambda { |f|
-      Float(f.encode(ConverterEncoding)) rescue f
-    },
-    numeric:   [:integer, :float],
-    date:      lambda { |f|
-      begin
-        e = f.encode(ConverterEncoding)
-        e.match?(DateMatcher) ? Date.parse(e) : f
-      rescue  # encoding conversion or date parse errors
-        f
-      end
-    },
-    date_time: lambda { |f|
-      begin
-        e = f.encode(ConverterEncoding)
-        e.match?(DateTimeMatcher) ? DateTime.parse(e) : f
-      rescue  # encoding conversion or date parse errors
-        f
-      end
-    },
-    all:       [:date_time, :numeric],
-  }
-
-  # A \Hash containing the names and \Procs for the built-in header converters.
-  # See {Built-In Header Converters}[#class-CSV-label-Built-In+Header+Converters].
-  #
-  # This \Hash is intentionally left unfrozen, and may be extended with
-  # custom field converters.
-  # See {Custom Header Converters}[#class-CSV-label-Custom+Header+Converters].
-  HeaderConverters = {
-    downcase: lambda { |h| h.encode(ConverterEncoding).downcase },
-    symbol:   lambda { |h|
-      h.encode(ConverterEncoding).downcase.gsub(/[^\s\w]+/, "").strip.
-                                           gsub(/\s+/, "_").to_sym
-    },
-    symbol_raw: lambda { |h| h.encode(ConverterEncoding).to_sym }
-  }
-
-  # Default values for method options.
-  DEFAULT_OPTIONS = {
-    # For both parsing and generating.
-    col_sep:            ",",
-    row_sep:            :auto,
-    quote_char:         '"',
-    # For parsing.
-    field_size_limit:   nil,
-    max_field_size:     nil,
-    converters:         nil,
-    unconverted_fields: nil,
-    headers:            false,
-    return_headers:     false,
-    header_converters:  nil,
-    skip_blanks:        false,
-    skip_lines:         nil,
-    liberal_parsing:    false,
-    nil_value:          nil,
-    empty_value:        "",
-    strip:              false,
-    # For generating.
-    write_headers:      nil,
-    quote_empty:        true,
-    force_quotes:       false,
-    write_converters:   nil,
-    write_nil_value:    nil,
-    write_empty_value:  "",
-  }.freeze
-
-  class << self
-    # :call-seq:
-    #   instance(string, **options)
-    #   instance(io = $stdout, **options)
-    #   instance(string, **options) {|csv| ... }
-    #   instance(io = $stdout, **options) {|csv| ... }
-    #
-    # Creates or retrieves cached \CSV objects.
-    # For arguments and options, see CSV.new.
-    #
-    # This API is not Ractor-safe.
-    #
-    # ---
-    #
-    # With no block given, returns a \CSV object.
-    #
-    # The first call to +instance+ creates and caches a \CSV object:
-    #   s0 = 's0'
-    #   csv0 = CSV.instance(s0)
-    #   csv0.class # => CSV
-    #
-    # Subsequent calls to +instance+ with that _same_ +string+ or +io+
-    # retrieve that same cached object:
-    #   csv1 = CSV.instance(s0)
-    #   csv1.class # => CSV
-    #   csv1.equal?(csv0) # => true # Same CSV object
-    #
-    # A subsequent call to +instance+ with a _different_ +string+ or +io+
-    # creates and caches a _different_ \CSV object.
-    #   s1 = 's1'
-    #   csv2 = CSV.instance(s1)
-    #   csv2.equal?(csv0) # => false # Different CSV object
-    #
-    # All the cached objects remains available:
-    #   csv3 = CSV.instance(s0)
-    #   csv3.equal?(csv0) # true # Same CSV object
-    #   csv4 = CSV.instance(s1)
-    #   csv4.equal?(csv2) # true # Same CSV object
-    #
-    # ---
-    #
-    # When a block is given, calls the block with the created or retrieved
-    # \CSV object; returns the block's return value:
-    #   CSV.instance(s0) {|csv| :foo } # => :foo
-    def instance(data = $stdout, **options)
-      # create a _signature_ for this method call, data object and options
-      sig = [data.object_id] +
-            options.values_at(*DEFAULT_OPTIONS.keys)
-
-      # fetch or create the instance for this signature
-      @@instances ||= Hash.new
-      instance = (@@instances[sig] ||= new(data, **options))
-
-      if block_given?
-        yield instance  # run block, if given, returning result
-      else
-        instance        # or return the instance
-      end
-    end
-
-    # :call-seq:
-    #   filter(in_string_or_io, **options) {|row| ... } -> array_of_arrays or csv_table
-    #   filter(in_string_or_io, out_string_or_io, **options) {|row| ... } -> array_of_arrays or csv_table
-    #   filter(**options) {|row| ... } -> array_of_arrays or csv_table
-    #
-    # - Parses \CSV from a source (\String, \IO stream, or ARGF).
-    # - Calls the given block with each parsed row:
-    #   - Without headers, each row is an \Array.
-    #   - With headers, each row is a CSV::Row.
-    # - Generates \CSV to an output (\String, \IO stream, or STDOUT).
-    # - Returns the parsed source:
-    #   - Without headers, an \Array of \Arrays.
-    #   - With headers, a CSV::Table.
-    #
-    # When +in_string_or_io+ is given, but not +out_string_or_io+,
-    # parses from the given +in_string_or_io+
-    # and generates to STDOUT.
-    #
-    # \String input without headers:
-    #
-    #   in_string = "foo,0\nbar,1\nbaz,2"
-    #   CSV.filter(in_string) do |row|
-    #     row[0].upcase!
-    #     row[1] = - row[1].to_i
-    #   end # => [["FOO", 0], ["BAR", -1], ["BAZ", -2]]
-    #
-    # Output (to STDOUT):
-    #
-    #   FOO,0
-    #   BAR,-1
-    #   BAZ,-2
-    #
-    # \String input with headers:
-    #
-    #   in_string = "Name,Value\nfoo,0\nbar,1\nbaz,2"
-    #   CSV.filter(in_string, headers: true) do |row|
-    #     row[0].upcase!
-    #     row[1] = - row[1].to_i
-    #   end # => #<CSV::Table mode:col_or_row row_count:4>
-    #
-    # Output (to STDOUT):
-    #
-    #   Name,Value
-    #   FOO,0
-    #   BAR,-1
-    #   BAZ,-2
-    #
-    # \IO stream input without headers:
-    #
-    #   File.write('t.csv', "foo,0\nbar,1\nbaz,2")
-    #   File.open('t.csv') do |in_io|
-    #     CSV.filter(in_io) do |row|
-    #       row[0].upcase!
-    #       row[1] = - row[1].to_i
-    #     end
-    #   end # => [["FOO", 0], ["BAR", -1], ["BAZ", -2]]
-    #
-    # Output (to STDOUT):
-    #
-    #   FOO,0
-    #   BAR,-1
-    #   BAZ,-2
-    #
-    # \IO stream input with headers:
-    #
-    #   File.write('t.csv', "Name,Value\nfoo,0\nbar,1\nbaz,2")
-    #   File.open('t.csv') do |in_io|
-    #     CSV.filter(in_io, headers: true) do |row|
-    #       row[0].upcase!
-    #       row[1] = - row[1].to_i
-    #     end
-    #   end # => #<CSV::Table mode:col_or_row row_count:4>
-    #
-    # Output (to STDOUT):
-    #
-    #   Name,Value
-    #   FOO,0
-    #   BAR,-1
-    #   BAZ,-2
-    #
-    # When both +in_string_or_io+ and +out_string_or_io+ are given,
-    # parses from +in_string_or_io+ and generates to +out_string_or_io+.
-    #
-    # \String output without headers:
-    #
-    #   in_string = "foo,0\nbar,1\nbaz,2"
-    #   out_string = ''
-    #   CSV.filter(in_string, out_string) do |row|
-    #     row[0].upcase!
-    #     row[1] = - row[1].to_i
-    #   end # => [["FOO", 0], ["BAR", -1], ["BAZ", -2]]
-    #   out_string # => "FOO,0\nBAR,-1\nBAZ,-2\n"
-    #
-    # \String output with headers:
-    #
-    #   in_string = "Name,Value\nfoo,0\nbar,1\nbaz,2"
-    #   out_string = ''
-    #   CSV.filter(in_string, out_string, headers: true) do |row|
-    #     row[0].upcase!
-    #     row[1] = - row[1].to_i
-    #   end # => #<CSV::Table mode:col_or_row row_count:4>
-    #   out_string # => "Name,Value\nFOO,0\nBAR,-1\nBAZ,-2\n"
-    #
-    # \IO stream output without headers:
-    #
-    #   in_string = "foo,0\nbar,1\nbaz,2"
-    #   File.open('t.csv', 'w') do |out_io|
-    #     CSV.filter(in_string, out_io) do |row|
-    #       row[0].upcase!
-    #       row[1] = - row[1].to_i
-    #     end
-    #   end # => [["FOO", 0], ["BAR", -1], ["BAZ", -2]]
-    #   File.read('t.csv') # => "FOO,0\nBAR,-1\nBAZ,-2\n"
-    #
-    # \IO stream output with headers:
-    #
-    #   in_string = "Name,Value\nfoo,0\nbar,1\nbaz,2"
-    #   File.open('t.csv', 'w') do |out_io|
-    #     CSV.filter(in_string, out_io, headers: true) do |row|
-    #       row[0].upcase!
-    #       row[1] = - row[1].to_i
-    #     end
-    #   end # => #<CSV::Table mode:col_or_row row_count:4>
-    #   File.read('t.csv') # => "Name,Value\nFOO,0\nBAR,-1\nBAZ,-2\n"
-    #
-    # When neither +in_string_or_io+ nor +out_string_or_io+ given,
-    # parses from {ARGF}[rdoc-ref:ARGF]
-    # and generates to STDOUT.
-    #
-    # Without headers:
-    #
-    #   # Put Ruby code into a file.
-    #   ruby = <<-EOT
-    #     require 'csv'
-    #     CSV.filter do |row|
-    #       row[0].upcase!
-    #       row[1] = - row[1].to_i
-    #     end
-    #   EOT
-    #   File.write('t.rb', ruby)
-    #   # Put some CSV into a file.
-    #   File.write('t.csv', "foo,0\nbar,1\nbaz,2")
-    #   # Run the Ruby code with CSV filename as argument.
-    #   system(Gem.ruby, "t.rb", "t.csv")
-    #
-    # Output (to STDOUT):
-    #
-    #   FOO,0
-    #   BAR,-1
-    #   BAZ,-2
-    #
-    # With headers:
-    #
-    #   # Put Ruby code into a file.
-    #   ruby = <<-EOT
-    #     require 'csv'
-    #     CSV.filter(headers: true) do |row|
-    #       row[0].upcase!
-    #       row[1] = - row[1].to_i
-    #     end
-    #   EOT
-    #   File.write('t.rb', ruby)
-    #   # Put some CSV into a file.
-    #   File.write('t.csv', "Name,Value\nfoo,0\nbar,1\nbaz,2")
-    #   # Run the Ruby code with CSV filename as argument.
-    #   system(Gem.ruby, "t.rb", "t.csv")
-    #
-    # Output (to STDOUT):
-    #
-    #   Name,Value
-    #   FOO,0
-    #   BAR,-1
-    #   BAZ,-2
-    #
-    # Arguments:
-    #
-    # * Argument +in_string_or_io+ must be a \String or an \IO stream.
-    # * Argument +out_string_or_io+ must be a \String or an \IO stream.
-    # * Arguments <tt>**options</tt> must be keyword options.
-    #   See {Options for Parsing}[#class-CSV-label-Options+for+Parsing].
-    def filter(input=nil, output=nil, **options)
-      # parse options for input, output, or both
-      in_options, out_options = Hash.new, {row_sep: InputRecordSeparator.value}
-      options.each do |key, value|
-        case key
-        when /\Ain(?:put)?_(.+)\Z/
-          in_options[$1.to_sym] = value
-        when /\Aout(?:put)?_(.+)\Z/
-          out_options[$1.to_sym] = value
-        else
-          in_options[key]  = value
-          out_options[key] = value
-        end
-      end
-
-      # build input and output wrappers
-      input  = new(input  || ARGF, **in_options)
-      output = new(output || $stdout, **out_options)
-
-      # process headers
-      need_manual_header_output =
-        (in_options[:headers] and
-         out_options[:headers] == true and
-         out_options[:write_headers])
-      if need_manual_header_output
-        first_row = input.shift
-        if first_row
-          if first_row.is_a?(Row)
-            headers = first_row.headers
-            yield headers
-            output << headers
-          end
-          yield first_row
-          output << first_row
-        end
-      end
-
-      # read, yield, write
-      input.each do |row|
-        yield row
-        output << row
-      end
-    end
-
-    #
-    # :call-seq:
-    #   foreach(path_or_io, mode='r', **options) {|row| ... )
-    #   foreach(path_or_io, mode='r', **options) -> new_enumerator
-    #
-    # Calls the block with each row read from source +path_or_io+.
-    #
-    # \Path input without headers:
-    #
-    #   string = "foo,0\nbar,1\nbaz,2\n"
-    #   in_path = 't.csv'
-    #   File.write(in_path, string)
-    #   CSV.foreach(in_path) {|row| p row }
-    #
-    # Output:
-    #
-    #   ["foo", "0"]
-    #   ["bar", "1"]
-    #   ["baz", "2"]
-    #
-    # \Path input with headers:
-    #
-    #   string = "Name,Value\nfoo,0\nbar,1\nbaz,2\n"
-    #   in_path = 't.csv'
-    #   File.write(in_path, string)
-    #   CSV.foreach(in_path, headers: true) {|row| p row }
-    #
-    # Output:
-    #
-    #   <CSV::Row "Name":"foo" "Value":"0">
-    #   <CSV::Row "Name":"bar" "Value":"1">
-    #   <CSV::Row "Name":"baz" "Value":"2">
-    #
-    # \IO stream input without headers:
-    #
-    #   string = "foo,0\nbar,1\nbaz,2\n"
-    #   path = 't.csv'
-    #   File.write(path, string)
-    #   File.open('t.csv') do |in_io|
-    #     CSV.foreach(in_io) {|row| p row }
-    #   end
-    #
-    # Output:
-    #
-    #   ["foo", "0"]
-    #   ["bar", "1"]
-    #   ["baz", "2"]
-    #
-    # \IO stream input with headers:
-    #
-    #   string = "Name,Value\nfoo,0\nbar,1\nbaz,2\n"
-    #   path = 't.csv'
-    #   File.write(path, string)
-    #   File.open('t.csv') do |in_io|
-    #     CSV.foreach(in_io, headers: true) {|row| p row }
-    #   end
-    #
-    # Output:
-    #
-    #   <CSV::Row "Name":"foo" "Value":"0">
-    #   <CSV::Row "Name":"bar" "Value":"1">
-    #   <CSV::Row "Name":"baz" "Value":"2">
-    #
-    # With no block given, returns an \Enumerator:
-    #
-    #   string = "foo,0\nbar,1\nbaz,2\n"
-    #   path = 't.csv'
-    #   File.write(path, string)
-    #   CSV.foreach(path) # => #<Enumerator: CSV:foreach("t.csv", "r")>
-    #
-    # Arguments:
-    # * Argument +path_or_io+ must be a file path or an \IO stream.
-    # * Argument +mode+, if given, must be a \File mode
-    #   See {Open Mode}[https://ruby-doc.org/core/IO.html#method-c-new-label-Open+Mode].
-    # * Arguments <tt>**options</tt> must be keyword options.
-    #   See {Options for Parsing}[#class-CSV-label-Options+for+Parsing].
-    # * This method optionally accepts an additional <tt>:encoding</tt> option
-    #   that you can use to specify the Encoding of the data read from +path+ or +io+.
-    #   You must provide this unless your data is in the encoding
-    #   given by <tt>Encoding::default_external</tt>.
-    #   Parsing will use this to determine how to parse the data.
-    #   You may provide a second Encoding to
-    #   have the data transcoded as it is read. For example,
-    #     encoding: 'UTF-32BE:UTF-8'
-    #   would read +UTF-32BE+ data from the file
-    #   but transcode it to +UTF-8+ before parsing.
-    def foreach(path, mode="r", **options, &block)
-      return to_enum(__method__, path, mode, **options) unless block_given?
-      open(path, mode, **options) do |csv|
-        csv.each(&block)
-      end
-    end
-
-    #
-    # :call-seq:
-    #   generate(csv_string, **options) {|csv| ... }
-    #   generate(**options) {|csv| ... }
-    #
-    # * Argument +csv_string+, if given, must be a \String object;
-    #   defaults to a new empty \String.
-    # * Arguments +options+, if given, should be generating options.
-    #   See {Options for Generating}[#class-CSV-label-Options+for+Generating].
-    #
-    # ---
-    #
-    # Creates a new \CSV object via <tt>CSV.new(csv_string, **options)</tt>;
-    # calls the block with the \CSV object, which the block may modify;
-    # returns the \String generated from the \CSV object.
-    #
-    # Note that a passed \String *is* modified by this method.
-    # Pass <tt>csv_string</tt>.dup if the \String must be preserved.
-    #
-    # This method has one additional option: <tt>:encoding</tt>,
-    # which sets the base Encoding for the output if no no +str+ is specified.
-    # CSV needs this hint if you plan to output non-ASCII compatible data.
-    #
-    # ---
-    #
-    # Add lines:
-    #   input_string = "foo,0\nbar,1\nbaz,2\n"
-    #   output_string = CSV.generate(input_string) do |csv|
-    #     csv << ['bat', 3]
-    #     csv << ['bam', 4]
-    #   end
-    #   output_string # => "foo,0\nbar,1\nbaz,2\nbat,3\nbam,4\n"
-    #   input_string # => "foo,0\nbar,1\nbaz,2\nbat,3\nbam,4\n"
-    #   output_string.equal?(input_string) # => true # Same string, modified
-    #
-    # Add lines into new string, preserving old string:
-    #   input_string = "foo,0\nbar,1\nbaz,2\n"
-    #   output_string = CSV.generate(input_string.dup) do |csv|
-    #     csv << ['bat', 3]
-    #     csv << ['bam', 4]
-    #   end
-    #   output_string # => "foo,0\nbar,1\nbaz,2\nbat,3\nbam,4\n"
-    #   input_string # => "foo,0\nbar,1\nbaz,2\n"
-    #   output_string.equal?(input_string) # => false # Different strings
-    #
-    # Create lines from nothing:
-    #   output_string = CSV.generate do |csv|
-    #     csv << ['foo', 0]
-    #     csv << ['bar', 1]
-    #     csv << ['baz', 2]
-    #   end
-    #   output_string # => "foo,0\nbar,1\nbaz,2\n"
-    #
-    # ---
-    #
-    # Raises an exception if +csv_string+ is not a \String object:
-    #   # Raises TypeError (no implicit conversion of Integer into String)
-    #   CSV.generate(0)
-    #
-    def generate(str=nil, **options)
-      encoding = options[:encoding]
-      # add a default empty String, if none was given
-      if str
-        str = StringIO.new(str)
-        str.seek(0, IO::SEEK_END)
-        str.set_encoding(encoding) if encoding
-      else
-        str = +""
-        str.force_encoding(encoding) if encoding
-      end
-      csv = new(str, **options) # wrap
-      yield csv         # yield for appending
-      csv.string        # return final String
-    end
-
-    # :call-seq:
-    #   CSV.generate_line(ary)
-    #   CSV.generate_line(ary, **options)
-    #
-    # Returns the \String created by generating \CSV from +ary+
-    # using the specified +options+.
-    #
-    # Argument +ary+ must be an \Array.
-    #
-    # Special options:
-    # * Option <tt>:row_sep</tt> defaults to <tt>"\n"> on Ruby 3.0 or later
-    #   and <tt>$INPUT_RECORD_SEPARATOR</tt> (<tt>$/</tt>) otherwise.:
-    #     $INPUT_RECORD_SEPARATOR # => "\n"
-    # * This method accepts an additional option, <tt>:encoding</tt>, which sets the base
-    #   Encoding for the output. This method will try to guess your Encoding from
-    #   the first non-+nil+ field in +row+, if possible, but you may need to use
-    #   this parameter as a backup plan.
-    #
-    # For other +options+,
-    # see {Options for Generating}[#class-CSV-label-Options+for+Generating].
-    #
-    # ---
-    #
-    # Returns the \String generated from an \Array:
-    #   CSV.generate_line(['foo', '0']) # => "foo,0\n"
-    #
-    # ---
-    #
-    # Raises an exception if +ary+ is not an \Array:
-    #   # Raises NoMethodError (undefined method `find' for :foo:Symbol)
-    #   CSV.generate_line(:foo)
-    #
-    def generate_line(row, **options)
-      options = {row_sep: InputRecordSeparator.value}.merge(options)
-      str = +""
-      if options[:encoding]
-        str.force_encoding(options[:encoding])
-      else
-        fallback_encoding = nil
-        output_encoding = nil
-        row.each do |field|
-          next unless field.is_a?(String)
-          fallback_encoding ||= field.encoding
-          next if field.ascii_only?
-          output_encoding = field.encoding
-          break
-        end
-        output_encoding ||= fallback_encoding
-        if output_encoding
-          str.force_encoding(output_encoding)
-        end
-      end
-      (new(str, **options) << row).string
-    end
-
-    # :call-seq:
-    #   CSV.generate_lines(rows)
-    #   CSV.generate_lines(rows, **options)
-    #
-    # Returns the \String created by generating \CSV from
-    # using the specified +options+.
-    #
-    # Argument +rows+ must be an \Array of row. Row is \Array of \String or \CSV::Row.
-    #
-    # Special options:
-    # * Option <tt>:row_sep</tt> defaults to <tt>"\n"</tt> on Ruby 3.0 or later
-    #   and <tt>$INPUT_RECORD_SEPARATOR</tt> (<tt>$/</tt>) otherwise.:
-    #     $INPUT_RECORD_SEPARATOR # => "\n"
-    # * This method accepts an additional option, <tt>:encoding</tt>, which sets the base
-    #   Encoding for the output. This method will try to guess your Encoding from
-    #   the first non-+nil+ field in +row+, if possible, but you may need to use
-    #   this parameter as a backup plan.
-    #
-    # For other +options+,
-    # see {Options for Generating}[#class-CSV-label-Options+for+Generating].
-    #
-    # ---
-    #
-    # Returns the \String generated from an
-    #   CSV.generate_lines([['foo', '0'], ['bar', '1'], ['baz', '2']]) # => "foo,0\nbar,1\nbaz,2\n"
-    #
-    # ---
-    #
-    # Raises an exception
-    #   # Raises NoMethodError (undefined method `each' for :foo:Symbol)
-    #   CSV.generate_lines(:foo)
-    #
-    def generate_lines(rows, **options)
-      self.generate(**options) do |csv|
-        rows.each do |row|
-          csv << row
-        end
-      end
-    end
-
-    #
-    # :call-seq:
-    #   open(file_path, mode = "rb", **options ) -> new_csv
-    #   open(io, mode = "rb", **options ) -> new_csv
-    #   open(file_path, mode = "rb", **options ) { |csv| ... } -> object
-    #   open(io, mode = "rb", **options ) { |csv| ... } -> object
-    #
-    # possible options elements:
-    #   keyword form:
-    #     :invalid => nil      # raise error on invalid byte sequence (default)
-    #     :invalid => :replace # replace invalid byte sequence
-    #     :undef => :replace   # replace undefined conversion
-    #     :replace => string   # replacement string ("?" or "\uFFFD" if not specified)
-    #
-    # * Argument +path+, if given, must be the path to a file.
-    # :include: ../doc/csv/arguments/io.rdoc
-    # * Argument +mode+, if given, must be a \File mode
-    #   See {Open Mode}[IO.html#method-c-new-label-Open+Mode].
-    # * Arguments <tt>**options</tt> must be keyword options.
-    #   See {Options for Generating}[#class-CSV-label-Options+for+Generating].
-    # * This method optionally accepts an additional <tt>:encoding</tt> option
-    #   that you can use to specify the Encoding of the data read from +path+ or +io+.
-    #   You must provide this unless your data is in the encoding
-    #   given by <tt>Encoding::default_external</tt>.
-    #   Parsing will use this to determine how to parse the data.
-    #   You may provide a second Encoding to
-    #   have the data transcoded as it is read. For example,
-    #     encoding: 'UTF-32BE:UTF-8'
-    #   would read +UTF-32BE+ data from the file
-    #   but transcode it to +UTF-8+ before parsing.
-    #
-    # ---
-    #
-    # These examples assume prior execution of:
-    #   string = "foo,0\nbar,1\nbaz,2\n"
-    #   path = 't.csv'
-    #   File.write(path, string)
-    #
-    # ---
-    #
-    # With no block given, returns a new \CSV object.
-    #
-    # Create a \CSV object using a file path:
-    #   csv = CSV.open(path)
-    #   csv # => #<CSV io_type:File io_path:"t.csv" encoding:UTF-8 lineno:0 col_sep:"," row_sep:"\n" quote_char:"\"">
-    #
-    # Create a \CSV object using an open \File:
-    #   csv = CSV.open(File.open(path))
-    #   csv # => #<CSV io_type:File io_path:"t.csv" encoding:UTF-8 lineno:0 col_sep:"," row_sep:"\n" quote_char:"\"">
-    #
-    # ---
-    #
-    # With a block given, calls the block with the created \CSV object;
-    # returns the block's return value:
-    #
-    # Using a file path:
-    #   csv = CSV.open(path) {|csv| p csv}
-    #   csv # => #<CSV io_type:File io_path:"t.csv" encoding:UTF-8 lineno:0 col_sep:"," row_sep:"\n" quote_char:"\"">
-    # Output:
-    #   #<CSV io_type:File io_path:"t.csv" encoding:UTF-8 lineno:0 col_sep:"," row_sep:"\n" quote_char:"\"">
-    #
-    # Using an open \File:
-    #   csv = CSV.open(File.open(path)) {|csv| p csv}
-    #   csv # => #<CSV io_type:File io_path:"t.csv" encoding:UTF-8 lineno:0 col_sep:"," row_sep:"\n" quote_char:"\"">
-    # Output:
-    #   #<CSV io_type:File io_path:"t.csv" encoding:UTF-8 lineno:0 col_sep:"," row_sep:"\n" quote_char:"\"">
-    #
-    # ---
-    #
-    # Raises an exception if the argument is not a \String object or \IO object:
-    #   # Raises TypeError (no implicit conversion of Symbol into String)
-    #   CSV.open(:foo)
-    def open(filename, mode="r", **options)
-      # wrap a File opened with the remaining +args+ with no newline
-      # decorator
-      file_opts = options.dup
-      unless file_opts.key?(:newline)
-        file_opts[:universal_newline] ||= false
-      end
-      options.delete(:invalid)
-      options.delete(:undef)
-      options.delete(:replace)
-      options.delete_if {|k, _| /newline\z/.match?(k)}
-
-      begin
-        f = File.open(filename, mode, **file_opts)
-      rescue ArgumentError => e
-        raise unless /needs binmode/.match?(e.message) and mode == "r"
-        mode = "rb"
-        file_opts = {encoding: Encoding.default_external}.merge(file_opts)
-        retry
-      end
-      begin
-        csv = new(f, **options)
-      rescue Exception
-        f.close
-        raise
-      end
-
-      # handle blocks like Ruby's open(), not like the CSV library
-      if block_given?
-        begin
-          yield csv
-        ensure
-          csv.close
-        end
-      else
-        csv
-      end
-    end
-
-    #
-    # :call-seq:
-    #   parse(string) -> array_of_arrays
-    #   parse(io) -> array_of_arrays
-    #   parse(string, headers: ..., **options) -> csv_table
-    #   parse(io, headers: ..., **options) -> csv_table
-    #   parse(string, **options) {|row| ... }
-    #   parse(io, **options) {|row| ... }
-    #
-    # Parses +string+ or +io+ using the specified +options+.
-    #
-    # - Argument +string+ should be a \String object;
-    #   it will be put into a new StringIO object positioned at the beginning.
-    # :include: ../doc/csv/arguments/io.rdoc
-    # - Argument +options+: see {Options for Parsing}[#class-CSV-label-Options+for+Parsing]
-    #
-    # ====== Without Option +headers+
-    #
-    # Without {option +headers+}[#class-CSV-label-Option+headers] case.
-    #
-    # These examples assume prior execution of:
-    #   string = "foo,0\nbar,1\nbaz,2\n"
-    #   path = 't.csv'
-    #   File.write(path, string)
-    #
-    # ---
-    #
-    # With no block given, returns an \Array of Arrays formed from the source.
-    #
-    # Parse a \String:
-    #   a_of_a = CSV.parse(string)
-    #   a_of_a # => [["foo", "0"], ["bar", "1"], ["baz", "2"]]
-    #
-    # Parse an open \File:
-    #   a_of_a = File.open(path) do |file|
-    #     CSV.parse(file)
-    #   end
-    #   a_of_a # => [["foo", "0"], ["bar", "1"], ["baz", "2"]]
-    #
-    # ---
-    #
-    # With a block given, calls the block with each parsed row:
-    #
-    # Parse a \String:
-    #   CSV.parse(string) {|row| p row }
-    #
-    # Output:
-    #   ["foo", "0"]
-    #   ["bar", "1"]
-    #   ["baz", "2"]
-    #
-    # Parse an open \File:
-    #   File.open(path) do |file|
-    #     CSV.parse(file) {|row| p row }
-    #   end
-    #
-    # Output:
-    #   ["foo", "0"]
-    #   ["bar", "1"]
-    #   ["baz", "2"]
-    #
-    # ====== With Option +headers+
-    #
-    # With {option +headers+}[#class-CSV-label-Option+headers] case.
-    #
-    # These examples assume prior execution of:
-    #   string = "Name,Count\nfoo,0\nbar,1\nbaz,2\n"
-    #   path = 't.csv'
-    #   File.write(path, string)
-    #
-    # ---
-    #
-    # With no block given, returns a CSV::Table object formed from the source.
-    #
-    # Parse a \String:
-    #   csv_table = CSV.parse(string, headers: ['Name', 'Count'])
-    #   csv_table # => #<CSV::Table mode:col_or_row row_count:5>
-    #
-    # Parse an open \File:
-    #   csv_table = File.open(path) do |file|
-    #     CSV.parse(file, headers: ['Name', 'Count'])
-    #   end
-    #   csv_table # => #<CSV::Table mode:col_or_row row_count:4>
-    #
-    # ---
-    #
-    # With a block given, calls the block with each parsed row,
-    # which has been formed into a CSV::Row object:
-    #
-    # Parse a \String:
-    #   CSV.parse(string, headers: ['Name', 'Count']) {|row| p row }
-    #
-    # Output:
-    #   # <CSV::Row "Name":"foo" "Count":"0">
-    #   # <CSV::Row "Name":"bar" "Count":"1">
-    #   # <CSV::Row "Name":"baz" "Count":"2">
-    #
-    # Parse an open \File:
-    #   File.open(path) do |file|
-    #     CSV.parse(file, headers: ['Name', 'Count']) {|row| p row }
-    #   end
-    #
-    # Output:
-    #   # <CSV::Row "Name":"foo" "Count":"0">
-    #   # <CSV::Row "Name":"bar" "Count":"1">
-    #   # <CSV::Row "Name":"baz" "Count":"2">
-    #
-    # ---
-    #
-    # Raises an exception if the argument is not a \String object or \IO object:
-    #   # Raises NoMethodError (undefined method `close' for :foo:Symbol)
-    #   CSV.parse(:foo)
-    def parse(str, **options, &block)
-      csv = new(str, **options)
-
-      return csv.each(&block) if block_given?
-
-      # slurp contents, if no block is given
-      begin
-        csv.read
-      ensure
-        csv.close
-      end
-    end
-
-    # :call-seq:
-    #   CSV.parse_line(string) -> new_array or nil
-    #   CSV.parse_line(io) -> new_array or nil
-    #   CSV.parse_line(string, **options) -> new_array or nil
-    #   CSV.parse_line(io, **options) -> new_array or nil
-    #   CSV.parse_line(string, headers: true, **options) -> csv_row or nil
-    #   CSV.parse_line(io, headers: true, **options) -> csv_row or nil
-    #
-    # Returns the data created by parsing the first line of +string+ or +io+
-    # using the specified +options+.
-    #
-    # - Argument +string+ should be a \String object;
-    #   it will be put into a new StringIO object positioned at the beginning.
-    # :include: ../doc/csv/arguments/io.rdoc
-    # - Argument +options+: see {Options for Parsing}[#class-CSV-label-Options+for+Parsing]
-    #
-    # ====== Without Option +headers+
-    #
-    # Without option +headers+, returns the first row as a new \Array.
-    #
-    # These examples assume prior execution of:
-    #   string = "foo,0\nbar,1\nbaz,2\n"
-    #   path = 't.csv'
-    #   File.write(path, string)
-    #
-    # Parse the first line from a \String object:
-    #   CSV.parse_line(string) # => ["foo", "0"]
-    #
-    # Parse the first line from a File object:
-    #   File.open(path) do |file|
-    #     CSV.parse_line(file) # => ["foo", "0"]
-    #   end # => ["foo", "0"]
-    #
-    # Returns +nil+ if the argument is an empty \String:
-    #   CSV.parse_line('') # => nil
-    #
-    # ====== With Option +headers+
-    #
-    # With {option +headers+}[#class-CSV-label-Option+headers],
-    # returns the first row as a CSV::Row object.
-    #
-    # These examples assume prior execution of:
-    #   string = "Name,Count\nfoo,0\nbar,1\nbaz,2\n"
-    #   path = 't.csv'
-    #   File.write(path, string)
-    #
-    # Parse the first line from a \String object:
-    #   CSV.parse_line(string, headers: true) # => #<CSV::Row "Name":"foo" "Count":"0">
-    #
-    # Parse the first line from a File object:
-    #   File.open(path) do |file|
-    #     CSV.parse_line(file, headers: true)
-    #   end # => #<CSV::Row "Name":"foo" "Count":"0">
-    #
-    # ---
-    #
-    # Raises an exception if the argument is +nil+:
-    #   # Raises ArgumentError (Cannot parse nil as CSV):
-    #   CSV.parse_line(nil)
-    #
-    def parse_line(line, **options)
-      new(line, **options).each.first
-    end
-
-    #
-    # :call-seq:
-    #   read(source, **options) -> array_of_arrays
-    #   read(source, headers: true, **options) -> csv_table
-    #
-    # Opens the given +source+ with the given +options+ (see CSV.open),
-    # reads the source (see CSV#read), and returns the result,
-    # which will be either an \Array of Arrays or a CSV::Table.
-    #
-    # Without headers:
-    #   string = "foo,0\nbar,1\nbaz,2\n"
-    #   path = 't.csv'
-    #   File.write(path, string)
-    #   CSV.read(path) # => [["foo", "0"], ["bar", "1"], ["baz", "2"]]
-    #
-    # With headers:
-    #   string = "Name,Value\nfoo,0\nbar,1\nbaz,2\n"
-    #   path = 't.csv'
-    #   File.write(path, string)
-    #   CSV.read(path, headers: true) # => #<CSV::Table mode:col_or_row row_count:4>
-    def read(path, **options)
-      open(path, **options) { |csv| csv.read }
-    end
-
-    # :call-seq:
-    #   CSV.readlines(source, **options)
-    #
-    # Alias for CSV.read.
-    def readlines(path, **options)
-      read(path, **options)
-    end
-
-    # :call-seq:
-    #   CSV.table(source, **options)
-    #
-    # Calls CSV.read with +source+, +options+, and certain default options:
-    # - +headers+: +true+
-    # - +converters+: +:numeric+
-    # - +header_converters+: +:symbol+
-    #
-    # Returns a CSV::Table object.
-    #
-    # Example:
-    #   string = "Name,Value\nfoo,0\nbar,1\nbaz,2\n"
-    #   path = 't.csv'
-    #   File.write(path, string)
-    #   CSV.table(path) # => #<CSV::Table mode:col_or_row row_count:4>
-    def table(path, **options)
-      default_options = {
-        headers:           true,
-        converters:        :numeric,
-        header_converters: :symbol,
-      }
-      options = default_options.merge(options)
-      read(path, **options)
-    end
-  end
-
-  # :call-seq:
-  #   CSV.new(string)
-  #   CSV.new(io)
-  #   CSV.new(string, **options)
-  #   CSV.new(io, **options)
-  #
-  # Returns the new \CSV object created using +string+ or +io+
-  # and the specified +options+.
-  #
-  # - Argument +string+ should be a \String object;
-  #   it will be put into a new StringIO object positioned at the beginning.
-  # :include: ../doc/csv/arguments/io.rdoc
-  # - Argument +options+: See:
-  #   * {Options for Parsing}[#class-CSV-label-Options+for+Parsing]
-  #   * {Options for Generating}[#class-CSV-label-Options+for+Generating]
-  #   For performance reasons, the options cannot be overridden
-  #   in a \CSV object, so those specified here will endure.
-  #
-  # In addition to the \CSV instance methods, several \IO methods are delegated.
-  # See {Delegated Methods}[#class-CSV-label-Delegated+Methods].
-  #
-  # ---
-  #
-  # Create a \CSV object from a \String object:
-  #   csv = CSV.new('foo,0')
-  #   csv # => #<CSV io_type:StringIO encoding:UTF-8 lineno:0 col_sep:"," row_sep:"\n" quote_char:"\"">
-  #
-  # Create a \CSV object from a \File object:
-  #   File.write('t.csv', 'foo,0')
-  #   csv = CSV.new(File.open('t.csv'))
-  #   csv # => #<CSV io_type:File io_path:"t.csv" encoding:UTF-8 lineno:0 col_sep:"," row_sep:"\n" quote_char:"\"">
-  #
-  # ---
-  #
-  # Raises an exception if the argument is +nil+:
-  #   # Raises ArgumentError (Cannot parse nil as CSV):
-  #   CSV.new(nil)
-  #
-  def initialize(data,
-                 col_sep: ",",
-                 row_sep: :auto,
-                 quote_char: '"',
-                 field_size_limit: nil,
-                 max_field_size: nil,
-                 converters: nil,
-                 unconverted_fields: nil,
-                 headers: false,
-                 return_headers: false,
-                 write_headers: nil,
-                 header_converters: nil,
-                 skip_blanks: false,
-                 force_quotes: false,
-                 skip_lines: nil,
-                 liberal_parsing: false,
-                 internal_encoding: nil,
-                 external_encoding: nil,
-                 encoding: nil,
-                 nil_value: nil,
-                 empty_value: "",
-                 strip: false,
-                 quote_empty: true,
-                 write_converters: nil,
-                 write_nil_value: nil,
-                 write_empty_value: "")
-    raise ArgumentError.new("Cannot parse nil as CSV") if data.nil?
-
-    if data.is_a?(String)
-      if encoding
-        if encoding.is_a?(String)
-          data_external_encoding, data_internal_encoding = encoding.split(":", 2)
-          if data_internal_encoding
-            data = data.encode(data_internal_encoding, data_external_encoding)
-          else
-            data = data.dup.force_encoding(data_external_encoding)
-          end
-        else
-          data = data.dup.force_encoding(encoding)
-        end
-      end
-      @io = StringIO.new(data)
-    else
-      @io = data
-    end
-    @encoding = determine_encoding(encoding, internal_encoding)
-
-    @base_fields_converter_options = {
-      nil_value: nil_value,
-      empty_value: empty_value,
-    }
-    @write_fields_converter_options = {
-      nil_value: write_nil_value,
-      empty_value: write_empty_value,
-    }
-    @initial_converters = converters
-    @initial_header_converters = header_converters
-    @initial_write_converters = write_converters
-
-    if max_field_size.nil? and field_size_limit
-      max_field_size = field_size_limit - 1
-    end
-    @parser_options = {
-      column_separator: col_sep,
-      row_separator: row_sep,
-      quote_character: quote_char,
-      max_field_size: max_field_size,
-      unconverted_fields: unconverted_fields,
-      headers: headers,
-      return_headers: return_headers,
-      skip_blanks: skip_blanks,
-      skip_lines: skip_lines,
-      liberal_parsing: liberal_parsing,
-      encoding: @encoding,
-      nil_value: nil_value,
-      empty_value: empty_value,
-      strip: strip,
-    }
-    @parser = nil
-    @parser_enumerator = nil
-    @eof_error = nil
-
-    @writer_options = {
-      encoding: @encoding,
-      force_encoding: (not encoding.nil?),
-      force_quotes: force_quotes,
-      headers: headers,
-      write_headers: write_headers,
-      column_separator: col_sep,
-      row_separator: row_sep,
-      quote_character: quote_char,
-      quote_empty: quote_empty,
-    }
-
-    @writer = nil
-    writer if @writer_options[:write_headers]
-  end
-
-  # :call-seq:
-  #   csv.col_sep -> string
-  #
-  # Returns the encoded column separator; used for parsing and writing;
-  # see {Option +col_sep+}[#class-CSV-label-Option+col_sep]:
-  #   CSV.new('').col_sep # => ","
-  def col_sep
-    parser.column_separator
-  end
-
-  # :call-seq:
-  #   csv.row_sep -> string
-  #
-  # Returns the encoded row separator; used for parsing and writing;
-  # see {Option +row_sep+}[#class-CSV-label-Option+row_sep]:
-  #   CSV.new('').row_sep # => "\n"
-  def row_sep
-    parser.row_separator
-  end
-
-  # :call-seq:
-  #   csv.quote_char -> character
-  #
-  # Returns the encoded quote character; used for parsing and writing;
-  # see {Option +quote_char+}[#class-CSV-label-Option+quote_char]:
-  #   CSV.new('').quote_char # => "\""
-  def quote_char
-    parser.quote_character
-  end
-
-  # :call-seq:
-  #   csv.field_size_limit -> integer or nil
-  #
-  # Returns the limit for field size; used for parsing;
-  # see {Option +field_size_limit+}[#class-CSV-label-Option+field_size_limit]:
-  #   CSV.new('').field_size_limit # => nil
-  #
-  # Deprecated since 3.2.3. Use +max_field_size+ instead.
-  def field_size_limit
-    parser.field_size_limit
-  end
-
-  # :call-seq:
-  #   csv.max_field_size -> integer or nil
-  #
-  # Returns the limit for field size; used for parsing;
-  # see {Option +max_field_size+}[#class-CSV-label-Option+max_field_size]:
-  #   CSV.new('').max_field_size # => nil
-  #
-  # Since 3.2.3.
-  def max_field_size
-    parser.max_field_size
-  end
-
-  # :call-seq:
-  #   csv.skip_lines -> regexp or nil
-  #
-  # Returns the \Regexp used to identify comment lines; used for parsing;
-  # see {Option +skip_lines+}[#class-CSV-label-Option+skip_lines]:
-  #   CSV.new('').skip_lines # => nil
-  def skip_lines
-    parser.skip_lines
-  end
-
-  # :call-seq:
-  #   csv.converters -> array
-  #
-  # Returns an \Array containing field converters;
-  # see {Field Converters}[#class-CSV-label-Field+Converters]:
-  #   csv = CSV.new('')
-  #   csv.converters # => []
-  #   csv.convert(:integer)
-  #   csv.converters # => [:integer]
-  #   csv.convert(proc {|x| x.to_s })
-  #   csv.converters
-  #
-  # Notes that you need to call
-  # +Ractor.make_shareable(CSV::Converters)+ on the main Ractor to use
-  # this method.
-  def converters
-    parser_fields_converter.map do |converter|
-      name = Converters.rassoc(converter)
-      name ? name.first : converter
-    end
-  end
-
-  # :call-seq:
-  #   csv.unconverted_fields? -> object
-  #
-  # Returns the value that determines whether unconverted fields are to be
-  # available; used for parsing;
-  # see {Option +unconverted_fields+}[#class-CSV-label-Option+unconverted_fields]:
-  #   CSV.new('').unconverted_fields? # => nil
-  def unconverted_fields?
-    parser.unconverted_fields?
-  end
-
-  # :call-seq:
-  #   csv.headers -> object
-  #
-  # Returns the value that determines whether headers are used; used for parsing;
-  # see {Option +headers+}[#class-CSV-label-Option+headers]:
-  #   CSV.new('').headers # => nil
-  def headers
-    if @writer
-      @writer.headers
-    else
-      parsed_headers = parser.headers
-      return parsed_headers if parsed_headers
-      raw_headers = @parser_options[:headers]
-      raw_headers = nil if raw_headers == false
-      raw_headers
-    end
-  end
-
-  # :call-seq:
-  #   csv.return_headers? -> true or false
-  #
-  # Returns the value that determines whether headers are to be returned; used for parsing;
-  # see {Option +return_headers+}[#class-CSV-label-Option+return_headers]:
-  #   CSV.new('').return_headers? # => false
-  def return_headers?
-    parser.return_headers?
-  end
-
-  # :call-seq:
-  #   csv.write_headers? -> true or false
-  #
-  # Returns the value that determines whether headers are to be written; used for generating;
-  # see {Option +write_headers+}[#class-CSV-label-Option+write_headers]:
-  #   CSV.new('').write_headers? # => nil
-  def write_headers?
-    @writer_options[:write_headers]
-  end
-
-  # :call-seq:
-  #   csv.header_converters -> array
-  #
-  # Returns an \Array containing header converters; used for parsing;
-  # see {Header Converters}[#class-CSV-label-Header+Converters]:
-  #   CSV.new('').header_converters # => []
-  #
-  # Notes that you need to call
-  # +Ractor.make_shareable(CSV::HeaderConverters)+ on the main Ractor
-  # to use this method.
-  def header_converters
-    header_fields_converter.map do |converter|
-      name = HeaderConverters.rassoc(converter)
-      name ? name.first : converter
-    end
-  end
-
-  # :call-seq:
-  #   csv.skip_blanks? -> true or false
-  #
-  # Returns the value that determines whether blank lines are to be ignored; used for parsing;
-  # see {Option +skip_blanks+}[#class-CSV-label-Option+skip_blanks]:
-  #   CSV.new('').skip_blanks? # => false
-  def skip_blanks?
-    parser.skip_blanks?
-  end
-
-  # :call-seq:
-  #   csv.force_quotes? -> true or false
-  #
-  # Returns the value that determines whether all output fields are to be quoted;
-  # used for generating;
-  # see {Option +force_quotes+}[#class-CSV-label-Option+force_quotes]:
-  #   CSV.new('').force_quotes? # => false
-  def force_quotes?
-    @writer_options[:force_quotes]
-  end
-
-  # :call-seq:
-  #   csv.liberal_parsing? -> true or false
-  #
-  # Returns the value that determines whether illegal input is to be handled; used for parsing;
-  # see {Option +liberal_parsing+}[#class-CSV-label-Option+liberal_parsing]:
-  #   CSV.new('').liberal_parsing? # => false
-  def liberal_parsing?
-    parser.liberal_parsing?
-  end
-
-  # :call-seq:
-  #   csv.encoding -> encoding
-  #
-  # Returns the encoding used for parsing and generating;
-  # see {Character Encodings (M17n or Multilingualization)}[#class-CSV-label-Character+Encodings+-28M17n+or+Multilingualization-29]:
-  #   CSV.new('').encoding # => #<Encoding:UTF-8>
-  attr_reader :encoding
-
-  # :call-seq:
-  #   csv.line_no -> integer
-  #
-  # Returns the count of the rows parsed or generated.
-  #
-  # Parsing:
-  #   string = "foo,0\nbar,1\nbaz,2\n"
-  #   path = 't.csv'
-  #   File.write(path, string)
-  #   CSV.open(path) do |csv|
-  #     csv.each do |row|
-  #       p [csv.lineno, row]
-  #     end
-  #   end
-  # Output:
-  #   [1, ["foo", "0"]]
-  #   [2, ["bar", "1"]]
-  #   [3, ["baz", "2"]]
-  #
-  # Generating:
-  #   CSV.generate do |csv|
-  #     p csv.lineno; csv << ['foo', 0]
-  #     p csv.lineno; csv << ['bar', 1]
-  #     p csv.lineno; csv << ['baz', 2]
-  #   end
-  # Output:
-  #   0
-  #   1
-  #   2
-  def lineno
-    if @writer
-      @writer.lineno
-    else
-      parser.lineno
-    end
-  end
-
-  # :call-seq:
-  #   csv.line -> array
-  #
-  # Returns the line most recently read:
-  #   string = "foo,0\nbar,1\nbaz,2\n"
-  #   path = 't.csv'
-  #   File.write(path, string)
-  #   CSV.open(path) do |csv|
-  #     csv.each do |row|
-  #       p [csv.lineno, csv.line]
-  #     end
-  #   end
-  # Output:
-  #   [1, "foo,0\n"]
-  #   [2, "bar,1\n"]
-  #   [3, "baz,2\n"]
-  def line
-    parser.line
-  end
-
-  ### IO and StringIO Delegation ###
-
-  extend Forwardable
-  def_delegators :@io, :binmode, :close, :close_read, :close_write,
-                       :closed?, :external_encoding, :fcntl,
-                       :fileno, :flush, :fsync, :internal_encoding,
-                       :isatty, :pid, :pos, :pos=, :reopen,
-                       :seek, :string, :sync, :sync=, :tell,
-                       :truncate, :tty?
-
-  def binmode?
-    if @io.respond_to?(:binmode?)
-      @io.binmode?
-    else
-      false
-    end
-  end
-
-  def flock(*args)
-    raise NotImplementedError unless @io.respond_to?(:flock)
-    @io.flock(*args)
-  end
-
-  def ioctl(*args)
-    raise NotImplementedError unless @io.respond_to?(:ioctl)
-    @io.ioctl(*args)
-  end
-
-  def path
-    @io.path if @io.respond_to?(:path)
-  end
-
-  def stat(*args)
-    raise NotImplementedError unless @io.respond_to?(:stat)
-    @io.stat(*args)
-  end
-
-  def to_i
-    raise NotImplementedError unless @io.respond_to?(:to_i)
-    @io.to_i
-  end
-
-  def to_io
-    @io.respond_to?(:to_io) ? @io.to_io : @io
-  end
-
-  def eof?
-    return false if @eof_error
-    begin
-      parser_enumerator.peek
-      false
-    rescue MalformedCSVError => error
-      @eof_error = error
-      false
-    rescue StopIteration
-      true
-    end
-  end
-  alias_method :eof, :eof?
-
-  # Rewinds the underlying IO object and resets CSV's lineno() counter.
-  def rewind
-    @parser = nil
-    @parser_enumerator = nil
-    @eof_error = nil
-    @writer.rewind if @writer
-    @io.rewind
-  end
-
-  ### End Delegation ###
-
-  # :call-seq:
-  #   csv << row -> self
-  #
-  # Appends a row to +self+.
-  #
-  # - Argument +row+ must be an \Array object or a CSV::Row object.
-  # - The output stream must be open for writing.
-  #
-  # ---
-  #
-  # Append Arrays:
-  #   CSV.generate do |csv|
-  #     csv << ['foo', 0]
-  #     csv << ['bar', 1]
-  #     csv << ['baz', 2]
-  #   end # => "foo,0\nbar,1\nbaz,2\n"
-  #
-  # Append CSV::Rows:
-  #   headers = []
-  #   CSV.generate do |csv|
-  #     csv << CSV::Row.new(headers, ['foo', 0])
-  #     csv << CSV::Row.new(headers, ['bar', 1])
-  #     csv << CSV::Row.new(headers, ['baz', 2])
-  #   end # => "foo,0\nbar,1\nbaz,2\n"
-  #
-  # Headers in CSV::Row objects are not appended:
-  #   headers = ['Name', 'Count']
-  #   CSV.generate do |csv|
-  #     csv << CSV::Row.new(headers, ['foo', 0])
-  #     csv << CSV::Row.new(headers, ['bar', 1])
-  #     csv << CSV::Row.new(headers, ['baz', 2])
-  #   end # => "foo,0\nbar,1\nbaz,2\n"
-  #
-  # ---
-  #
-  # Raises an exception if +row+ is not an \Array or \CSV::Row:
-  #   CSV.generate do |csv|
-  #     # Raises NoMethodError (undefined method `collect' for :foo:Symbol)
-  #     csv << :foo
-  #   end
-  #
-  # Raises an exception if the output stream is not opened for writing:
-  #   path = 't.csv'
-  #   File.write(path, '')
-  #   File.open(path) do |file|
-  #     CSV.open(file) do |csv|
-  #       # Raises IOError (not opened for writing)
-  #       csv << ['foo', 0]
-  #     end
-  #   end
-  def <<(row)
-    writer << row
-    self
-  end
-  alias_method :add_row, :<<
-  alias_method :puts,    :<<
-
-  # :call-seq:
-  #   convert(converter_name) -> array_of_procs
-  #   convert {|field, field_info| ... } -> array_of_procs
-  #
-  # - With no block, installs a field converter (a \Proc).
-  # - With a block, defines and installs a custom field converter.
-  # - Returns the \Array of installed field converters.
-  #
-  # - Argument +converter_name+, if given, should be the name
-  #   of an existing field converter.
-  #
-  # See {Field Converters}[#class-CSV-label-Field+Converters].
-  # ---
-  #
-  # With no block, installs a field converter:
-  #   csv = CSV.new('')
-  #   csv.convert(:integer)
-  #   csv.convert(:float)
-  #   csv.convert(:date)
-  #   csv.converters # => [:integer, :float, :date]
-  #
-  # ---
-  #
-  # The block, if given, is called for each field:
-  # - Argument +field+ is the field value.
-  # - Argument +field_info+ is a CSV::FieldInfo object
-  #   containing details about the field.
-  #
-  # The examples here assume the prior execution of:
-  #   string = "foo,0\nbar,1\nbaz,2\n"
-  #   path = 't.csv'
-  #   File.write(path, string)
-  #
-  # Example giving a block:
-  #   csv = CSV.open(path)
-  #   csv.convert {|field, field_info| p [field, field_info]; field.upcase }
-  #   csv.read # => [["FOO", "0"], ["BAR", "1"], ["BAZ", "2"]]
-  #
-  # Output:
-  #   ["foo", #<struct CSV::FieldInfo index=0, line=1, header=nil>]
-  #   ["0", #<struct CSV::FieldInfo index=1, line=1, header=nil>]
-  #   ["bar", #<struct CSV::FieldInfo index=0, line=2, header=nil>]
-  #   ["1", #<struct CSV::FieldInfo index=1, line=2, header=nil>]
-  #   ["baz", #<struct CSV::FieldInfo index=0, line=3, header=nil>]
-  #   ["2", #<struct CSV::FieldInfo index=1, line=3, header=nil>]
-  #
-  # The block need not return a \String object:
-  #   csv = CSV.open(path)
-  #   csv.convert {|field, field_info| field.to_sym }
-  #   csv.read # => [[:foo, :"0"], [:bar, :"1"], [:baz, :"2"]]
-  #
-  # If +converter_name+ is given, the block is not called:
-  #   csv = CSV.open(path)
-  #   csv.convert(:integer) {|field, field_info| fail 'Cannot happen' }
-  #   csv.read # => [["foo", 0], ["bar", 1], ["baz", 2]]
-  #
-  # ---
-  #
-  # Raises a parse-time exception if +converter_name+ is not the name of a built-in
-  # field converter:
-  #   csv = CSV.open(path)
-  #   csv.convert(:nosuch) => [nil]
-  #   # Raises NoMethodError (undefined method `arity' for nil:NilClass)
-  #   csv.read
-  def convert(name = nil, &converter)
-    parser_fields_converter.add_converter(name, &converter)
-  end
-
-  # :call-seq:
-  #   header_convert(converter_name) -> array_of_procs
-  #   header_convert {|header, field_info| ... } -> array_of_procs
-  #
-  # - With no block, installs a header converter (a \Proc).
-  # - With a block, defines and installs a custom header converter.
-  # - Returns the \Array of installed header converters.
-  #
-  # - Argument +converter_name+, if given, should be the name
-  #   of an existing header converter.
-  #
-  # See {Header Converters}[#class-CSV-label-Header+Converters].
-  # ---
-  #
-  # With no block, installs a header converter:
-  #   csv = CSV.new('')
-  #   csv.header_convert(:symbol)
-  #   csv.header_convert(:downcase)
-  #   csv.header_converters # => [:symbol, :downcase]
-  #
-  # ---
-  #
-  # The block, if given, is called for each header:
-  # - Argument +header+ is the header value.
-  # - Argument +field_info+ is a CSV::FieldInfo object
-  #   containing details about the header.
-  #
-  # The examples here assume the prior execution of:
-  #   string = "Name,Value\nfoo,0\nbar,1\nbaz,2\n"
-  #   path = 't.csv'
-  #   File.write(path, string)
-  #
-  # Example giving a block:
-  #   csv = CSV.open(path, headers: true)
-  #   csv.header_convert {|header, field_info| p [header, field_info]; header.upcase }
-  #   table = csv.read
-  #   table # => #<CSV::Table mode:col_or_row row_count:4>
-  #   table.headers # => ["NAME", "VALUE"]
-  #
-  # Output:
-  #   ["Name", #<struct CSV::FieldInfo index=0, line=1, header=nil>]
-  #   ["Value", #<struct CSV::FieldInfo index=1, line=1, header=nil>]
-
-  # The block need not return a \String object:
-  #   csv = CSV.open(path, headers: true)
-  #   csv.header_convert {|header, field_info| header.to_sym }
-  #   table = csv.read
-  #   table.headers # => [:Name, :Value]
-  #
-  # If +converter_name+ is given, the block is not called:
-  #   csv = CSV.open(path, headers: true)
-  #   csv.header_convert(:downcase) {|header, field_info| fail 'Cannot happen' }
-  #   table = csv.read
-  #   table.headers # => ["name", "value"]
-  # ---
-  #
-  # Raises a parse-time exception if +converter_name+ is not the name of a built-in
-  # field converter:
-  #   csv = CSV.open(path, headers: true)
-  #   csv.header_convert(:nosuch)
-  #   # Raises NoMethodError (undefined method `arity' for nil:NilClass)
-  #   csv.read
-  def header_convert(name = nil, &converter)
-    header_fields_converter.add_converter(name, &converter)
-  end
-
-  include Enumerable
-
-  # :call-seq:
-  #   csv.each -> enumerator
-  #   csv.each {|row| ...}
-  #
-  # Calls the block with each successive row.
-  # The data source must be opened for reading.
-  #
-  # Without headers:
-  #   string = "foo,0\nbar,1\nbaz,2\n"
-  #   csv = CSV.new(string)
-  #   csv.each do |row|
-  #     p row
-  #   end
-  # Output:
-  #   ["foo", "0"]
-  #   ["bar", "1"]
-  #   ["baz", "2"]
-  #
-  # With headers:
-  #   string = "Name,Value\nfoo,0\nbar,1\nbaz,2\n"
-  #   csv = CSV.new(string, headers: true)
-  #   csv.each do |row|
-  #     p row
-  #   end
-  # Output:
-  #   <CSV::Row "Name":"foo" "Value":"0">
-  #   <CSV::Row "Name":"bar" "Value":"1">
-  #   <CSV::Row "Name":"baz" "Value":"2">
-  #
-  # ---
-  #
-  # Raises an exception if the source is not opened for reading:
-  #   string = "foo,0\nbar,1\nbaz,2\n"
-  #   csv = CSV.new(string)
-  #   csv.close
-  #   # Raises IOError (not opened for reading)
-  #   csv.each do |row|
-  #     p row
-  #   end
-  def each(&block)
-    return to_enum(__method__) unless block_given?
-    begin
-      while true
-        yield(parser_enumerator.next)
-      end
-    rescue StopIteration
-    end
-  end
-
-  # :call-seq:
-  #   csv.read -> array or csv_table
-  #
-  # Forms the remaining rows from +self+ into:
-  # - A CSV::Table object, if headers are in use.
-  # - An \Array of Arrays, otherwise.
-  #
-  # The data source must be opened for reading.
-  #
-  # Without headers:
-  #   string = "foo,0\nbar,1\nbaz,2\n"
-  #   path = 't.csv'
-  #   File.write(path, string)
-  #   csv = CSV.open(path)
-  #   csv.read # => [["foo", "0"], ["bar", "1"], ["baz", "2"]]
-  #
-  # With headers:
-  #   string = "Name,Value\nfoo,0\nbar,1\nbaz,2\n"
-  #   path = 't.csv'
-  #   File.write(path, string)
-  #   csv = CSV.open(path, headers: true)
-  #   csv.read # => #<CSV::Table mode:col_or_row row_count:4>
-  #
-  # ---
-  #
-  # Raises an exception if the source is not opened for reading:
-  #   string = "foo,0\nbar,1\nbaz,2\n"
-  #   csv = CSV.new(string)
-  #   csv.close
-  #   # Raises IOError (not opened for reading)
-  #   csv.read
-  def read
-    rows = to_a
-    if parser.use_headers?
-      Table.new(rows, headers: parser.headers)
-    else
-      rows
-    end
-  end
-  alias_method :readlines, :read
-
-  # :call-seq:
-  #   csv.header_row? -> true or false
-  #
-  # Returns +true+ if the next row to be read is a header row\;
-  # +false+ otherwise.
-  #
-  # Without headers:
-  #   string = "foo,0\nbar,1\nbaz,2\n"
-  #   csv = CSV.new(string)
-  #   csv.header_row? # => false
-  #
-  # With headers:
-  #   string = "Name,Value\nfoo,0\nbar,1\nbaz,2\n"
-  #   csv = CSV.new(string, headers: true)
-  #   csv.header_row? # => true
-  #   csv.shift # => #<CSV::Row "Name":"foo" "Value":"0">
-  #   csv.header_row? # => false
-  #
-  # ---
-  #
-  # Raises an exception if the source is not opened for reading:
-  #   string = "foo,0\nbar,1\nbaz,2\n"
-  #   csv = CSV.new(string)
-  #   csv.close
-  #   # Raises IOError (not opened for reading)
-  #   csv.header_row?
-  def header_row?
-    parser.header_row?
-  end
-
-  # :call-seq:
-  #   csv.shift -> array, csv_row, or nil
-  #
-  # Returns the next row of data as:
-  # - An \Array if no headers are used.
-  # - A CSV::Row object if headers are used.
-  #
-  # The data source must be opened for reading.
-  #
-  # Without headers:
-  #   string = "foo,0\nbar,1\nbaz,2\n"
-  #   csv = CSV.new(string)
-  #   csv.shift # => ["foo", "0"]
-  #   csv.shift # => ["bar", "1"]
-  #   csv.shift # => ["baz", "2"]
-  #   csv.shift # => nil
-  #
-  # With headers:
-  #   string = "Name,Value\nfoo,0\nbar,1\nbaz,2\n"
-  #   csv = CSV.new(string, headers: true)
-  #   csv.shift # => #<CSV::Row "Name":"foo" "Value":"0">
-  #   csv.shift # => #<CSV::Row "Name":"bar" "Value":"1">
-  #   csv.shift # => #<CSV::Row "Name":"baz" "Value":"2">
-  #   csv.shift # => nil
-  #
-  # ---
-  #
-  # Raises an exception if the source is not opened for reading:
-  #   string = "foo,0\nbar,1\nbaz,2\n"
-  #   csv = CSV.new(string)
-  #   csv.close
-  #   # Raises IOError (not opened for reading)
-  #   csv.shift
-  def shift
-    if @eof_error
-      eof_error, @eof_error = @eof_error, nil
-      raise eof_error
-    end
-    begin
-      parser_enumerator.next
-    rescue StopIteration
-      nil
-    end
-  end
-  alias_method :gets,     :shift
-  alias_method :readline, :shift
-
-  # :call-seq:
-  #   csv.inspect -> string
-  #
-  # Returns a \String showing certain properties of +self+:
-  #   string = "Name,Value\nfoo,0\nbar,1\nbaz,2\n"
-  #   csv = CSV.new(string, headers: true)
-  #   s = csv.inspect
-  #   s # => "#<CSV io_type:StringIO encoding:UTF-8 lineno:0 col_sep:\",\" row_sep:\"\\n\" quote_char:\"\\\"\" headers:true>"
-  def inspect
-    str = ["#<", self.class.to_s, " io_type:"]
-    # show type of wrapped IO
-    if    @io == $stdout then str << "$stdout"
-    elsif @io == $stdin  then str << "$stdin"
-    elsif @io == $stderr then str << "$stderr"
-    else                      str << @io.class.to_s
-    end
-    # show IO.path(), if available
-    if @io.respond_to?(:path) and (p = @io.path)
-      str << " io_path:" << p.inspect
-    end
-    # show encoding
-    str << " encoding:" << @encoding.name
-    # show other attributes
-    ["lineno", "col_sep", "row_sep", "quote_char"].each do |attr_name|
-      if a = __send__(attr_name)
-        str << " " << attr_name << ":" << a.inspect
-      end
-    end
-    ["skip_blanks", "liberal_parsing"].each do |attr_name|
-      if a = __send__("#{attr_name}?")
-        str << " " << attr_name << ":" << a.inspect
-      end
-    end
-    _headers = headers
-    str << " headers:" << _headers.inspect if _headers
-    str << ">"
-    begin
-      str.join('')
-    rescue  # any encoding error
-      str.map do |s|
-        e = Encoding::Converter.asciicompat_encoding(s.encoding)
-        e ? s.encode(e) : s.force_encoding("ASCII-8BIT")
-      end.join('')
-    end
-  end
-
-  private
-
-  def determine_encoding(encoding, internal_encoding)
-    # honor the IO encoding if we can, otherwise default to ASCII-8BIT
-    io_encoding = raw_encoding
-    return io_encoding if io_encoding
-
-    return Encoding.find(internal_encoding) if internal_encoding
-
-    if encoding
-      encoding, = encoding.split(":", 2) if encoding.is_a?(String)
-      return Encoding.find(encoding)
-    end
-
-    Encoding.default_internal || Encoding.default_external
-  end
-
-  def normalize_converters(converters)
-    converters ||= []
-    unless converters.is_a?(Array)
-      converters = [converters]
-    end
-    converters.collect do |converter|
-      case converter
-      when Proc # custom code block
-        [nil, converter]
-      else # by name
-        [converter, nil]
-      end
-    end
-  end
-
-  #
-  # Processes +fields+ with <tt>@converters</tt>, or <tt>@header_converters</tt>
-  # if +headers+ is passed as +true+, returning the converted field set. Any
-  # converter that changes the field into something other than a String halts
-  # the pipeline of conversion for that field. This is primarily an efficiency
-  # shortcut.
-  #
-  def convert_fields(fields, headers = false)
-    if headers
-      header_fields_converter.convert(fields, nil, 0)
-    else
-      parser_fields_converter.convert(fields, @headers, lineno)
-    end
-  end
-
-  #
-  # Returns the encoding of the internal IO object.
-  #
-  def raw_encoding
-    if @io.respond_to? :internal_encoding
-      @io.internal_encoding || @io.external_encoding
-    elsif @io.respond_to? :encoding
-      @io.encoding
-    else
-      nil
-    end
-  end
-
-  def parser_fields_converter
-    @parser_fields_converter ||= build_parser_fields_converter
-  end
-
-  def build_parser_fields_converter
-    specific_options = {
-      builtin_converters_name: :Converters,
-    }
-    options = @base_fields_converter_options.merge(specific_options)
-    build_fields_converter(@initial_converters, options)
-  end
-
-  def header_fields_converter
-    @header_fields_converter ||= build_header_fields_converter
-  end
-
-  def build_header_fields_converter
-    specific_options = {
-      builtin_converters_name: :HeaderConverters,
-      accept_nil: true,
-    }
-    options = @base_fields_converter_options.merge(specific_options)
-    build_fields_converter(@initial_header_converters, options)
-  end
-
-  def writer_fields_converter
-    @writer_fields_converter ||= build_writer_fields_converter
-  end
-
-  def build_writer_fields_converter
-    build_fields_converter(@initial_write_converters,
-                           @write_fields_converter_options)
-  end
-
-  def build_fields_converter(initial_converters, options)
-    fields_converter = FieldsConverter.new(options)
-    normalize_converters(initial_converters).each do |name, converter|
-      fields_converter.add_converter(name, &converter)
-    end
-    fields_converter
-  end
-
-  def parser
-    @parser ||= Parser.new(@io, parser_options)
-  end
-
-  def parser_options
-    @parser_options.merge(header_fields_converter: header_fields_converter,
-                          fields_converter: parser_fields_converter)
-  end
-
-  def parser_enumerator
-    @parser_enumerator ||= parser.parse
-  end
-
-  def writer
-    @writer ||= Writer.new(@io, writer_options)
-  end
-
-  def writer_options
-    @writer_options.merge(header_fields_converter: header_fields_converter,
-                          fields_converter: writer_fields_converter)
-  end
-end
-
-# Passes +args+ to CSV::instance.
-#
-#   CSV("CSV,data").read
-#     #=> [["CSV", "data"]]
-#
-# If a block is given, the instance is passed the block and the return value
-# becomes the return value of the block.
-#
-#   CSV("CSV,data") { |c|
-#     c.read.any? { |a| a.include?("data") }
-#   } #=> true
-#
-#   CSV("CSV,data") { |c|
-#     c.read.any? { |a| a.include?("zombies") }
-#   } #=> false
-#
-# CSV options may also be given.
-#
-#   io = StringIO.new
-#   CSV(io, col_sep: ";") { |csv| csv << ["a", "b", "c"] }
-#
-# This API is not Ractor-safe.
-#
-def CSV(*args, **options, &block)
-  CSV.instance(*args, **options, &block)
-end
-
-require_relative "csv/version"
-require_relative "csv/core_ext/array"
-require_relative "csv/core_ext/string"
diff --git a/lib/csv/core_ext/array.rb b/lib/csv/core_ext/array.rb
deleted file mode 100644
index 8beb06b082b522..00000000000000
--- a/lib/csv/core_ext/array.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-class Array # :nodoc:
-  # Equivalent to CSV::generate_line(self, options)
-  #
-  #   ["CSV", "data"].to_csv
-  #     #=> "CSV,data\n"
-  def to_csv(**options)
-    CSV.generate_line(self, **options)
-  end
-end
diff --git a/lib/csv/core_ext/string.rb b/lib/csv/core_ext/string.rb
deleted file mode 100644
index 9b1d31c2a4087f..00000000000000
--- a/lib/csv/core_ext/string.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-class String # :nodoc:
-  # Equivalent to CSV::parse_line(self, options)
-  #
-  #   "CSV,data".parse_csv
-  #     #=> ["CSV", "data"]
-  def parse_csv(**options)
-    CSV.parse_line(self, **options)
-  end
-end
diff --git a/lib/csv/csv.gemspec b/lib/csv/csv.gemspec
deleted file mode 100644
index 11c5b0f2a6e558..00000000000000
--- a/lib/csv/csv.gemspec
+++ /dev/null
@@ -1,64 +0,0 @@
-# frozen_string_literal: true
-
-begin
-  require_relative "lib/csv/version"
-rescue LoadError
-  # for Ruby core repository
-  require_relative "version"
-end
-
-Gem::Specification.new do |spec|
-  spec.name          = "csv"
-  spec.version       = CSV::VERSION
-  spec.authors       = ["James Edward Gray II", "Kouhei Sutou"]
-  spec.email         = [nil, "kou@cozmixng.org"]
-
-  spec.summary       = "CSV Reading and Writing"
-  spec.description   = "The CSV library provides a complete interface to CSV files and data. It offers tools to enable you to read and write to and from Strings or IO objects, as needed."
-  spec.homepage      = "https://github.com/ruby/csv"
-  spec.licenses      = ["Ruby", "BSD-2-Clause"]
-
-  lib_path = "lib"
-  spec.require_paths = [lib_path]
-  files = []
-  lib_dir = File.join(__dir__, lib_path)
-  if File.exist?(lib_dir)
-    Dir.chdir(lib_dir) do
-      Dir.glob("**/*.rb").each do |file|
-        files << "lib/#{file}"
-      end
-    end
-  end
-  doc_dir = File.join(__dir__, "doc")
-  if File.exist?(doc_dir)
-    Dir.chdir(doc_dir) do
-      Dir.glob("**/*.rdoc").each do |rdoc_file|
-        files << "doc/#{rdoc_file}"
-      end
-    end
-  end
-  spec.files = files
-  spec.rdoc_options.concat(["--main", "README.md"])
-  rdoc_files = [
-    "LICENSE.txt",
-    "NEWS.md",
-    "README.md",
-  ]
-  recipes_dir = File.join(doc_dir, "csv", "recipes")
-  if File.exist?(recipes_dir)
-    Dir.chdir(recipes_dir) do
-      Dir.glob("**/*.rdoc").each do |recipe_file|
-        rdoc_files << "doc/csv/recipes/#{recipe_file}"
-      end
-    end
-  end
-  spec.extra_rdoc_files = rdoc_files
-
-  spec.required_ruby_version = ">= 2.5.0"
-
-  # spec.add_dependency "stringio", ">= 0.1.3"
-  spec.add_development_dependency "bundler"
-  spec.add_development_dependency "rake"
-  spec.add_development_dependency "benchmark_driver"
-  spec.add_development_dependency "test-unit", ">= 3.4.8"
-end
diff --git a/lib/csv/fields_converter.rb b/lib/csv/fields_converter.rb
deleted file mode 100644
index d15977d3795f0a..00000000000000
--- a/lib/csv/fields_converter.rb
+++ /dev/null
@@ -1,89 +0,0 @@
-# frozen_string_literal: true
-
-class CSV
-  # Note: Don't use this class directly. This is an internal class.
-  class FieldsConverter
-    include Enumerable
-    #
-    # A CSV::FieldsConverter is a data structure for storing the
-    # fields converter properties to be passed as a parameter
-    # when parsing a new file (e.g. CSV::Parser.new(@io, parser_options))
-    #
-
-    def initialize(options={})
-      @converters = []
-      @nil_value = options[:nil_value]
-      @empty_value = options[:empty_value]
-      @empty_value_is_empty_string = (@empty_value == "")
-      @accept_nil = options[:accept_nil]
-      @builtin_converters_name = options[:builtin_converters_name]
-      @need_static_convert = need_static_convert?
-    end
-
-    def add_converter(name=nil, &converter)
-      if name.nil?  # custom converter
-        @converters << converter
-      else          # named converter
-        combo = builtin_converters[name]
-        case combo
-        when Array  # combo converter
-          combo.each do |sub_name|
-            add_converter(sub_name)
-          end
-        else        # individual named converter
-          @converters << combo
-        end
-      end
-    end
-
-    def each(&block)
-      @converters.each(&block)
-    end
-
-    def empty?
-      @converters.empty?
-    end
-
-    def convert(fields, headers, lineno, quoted_fields)
-      return fields unless need_convert?
-
-      fields.collect.with_index do |field, index|
-        if field.nil?
-          field = @nil_value
-        elsif field.is_a?(String) and field.empty?
-          field = @empty_value unless @empty_value_is_empty_string
-        end
-        @converters.each do |converter|
-          break if field.nil? and @accept_nil
-          if converter.arity == 1  # straight field converter
-            field = converter[field]
-          else                     # FieldInfo converter
-            if headers
-              header = headers[index]
-            else
-              header = nil
-            end
-            quoted = quoted_fields[index]
-            field = converter[field, FieldInfo.new(index, lineno, header, quoted)]
-          end
-          break unless field.is_a?(String)  # short-circuit pipeline for speed
-        end
-        field  # final state of each field, converted or original
-      end
-    end
-
-    private
-    def need_static_convert?
-      not (@nil_value.nil? and @empty_value_is_empty_string)
-    end
-
-    def need_convert?
-      @need_static_convert or
-        (not @converters.empty?)
-    end
-
-    def builtin_converters
-      @builtin_converters ||= ::CSV.const_get(@builtin_converters_name)
-    end
-  end
-end
diff --git a/lib/csv/input_record_separator.rb b/lib/csv/input_record_separator.rb
deleted file mode 100644
index 7a99343c0cfbe7..00000000000000
--- a/lib/csv/input_record_separator.rb
+++ /dev/null
@@ -1,18 +0,0 @@
-require "English"
-require "stringio"
-
-class CSV
-  module InputRecordSeparator
-    class << self
-      if RUBY_VERSION >= "3.0.0"
-        def value
-          "\n"
-        end
-      else
-        def value
-          $INPUT_RECORD_SEPARATOR
-        end
-      end
-    end
-  end
-end
diff --git a/lib/csv/parser.rb b/lib/csv/parser.rb
deleted file mode 100644
index ed9297fe305ac6..00000000000000
--- a/lib/csv/parser.rb
+++ /dev/null
@@ -1,1290 +0,0 @@
-# frozen_string_literal: true
-
-require "strscan"
-
-require_relative "input_record_separator"
-require_relative "row"
-require_relative "table"
-
-class CSV
-  # Note: Don't use this class directly. This is an internal class.
-  class Parser
-    #
-    # A CSV::Parser is m17n aware. The parser works in the Encoding of the IO
-    # or String object being read from or written to. Your data is never transcoded
-    # (unless you ask Ruby to transcode it for you) and will literally be parsed in
-    # the Encoding it is in. Thus CSV will return Arrays or Rows of Strings in the
-    # Encoding of your data. This is accomplished by transcoding the parser itself
-    # into your Encoding.
-    #
-
-    # Raised when encoding is invalid.
-    class InvalidEncoding < StandardError
-    end
-
-    # Raised when unexpected case is happen.
-    class UnexpectedError < StandardError
-    end
-
-    #
-    # CSV::Scanner receives a CSV output, scans it and return the content.
-    # It also controls the life cycle of the object with its methods +keep_start+,
-    # +keep_end+, +keep_back+, +keep_drop+.
-    #
-    # Uses StringScanner (the official strscan gem). Strscan provides lexical
-    # scanning operations on a String. We inherit its object and take advantage
-    # on the methods. For more information, please visit:
-    # https://ruby-doc.org/stdlib-2.6.1/libdoc/strscan/rdoc/StringScanner.html
-    #
-    class Scanner < StringScanner
-      alias_method :scan_all, :scan
-
-      def initialize(*args)
-        super
-        @keeps = []
-      end
-
-      def each_line(row_separator)
-        position = pos
-        rest.each_line(row_separator) do |line|
-          position += line.bytesize
-          self.pos = position
-          yield(line)
-        end
-      end
-
-      def keep_start
-        @keeps.push(pos)
-      end
-
-      def keep_end
-        start = @keeps.pop
-        string.byteslice(start, pos - start)
-      end
-
-      def keep_back
-        self.pos = @keeps.pop
-      end
-
-      def keep_drop
-        @keeps.pop
-      end
-    end
-
-    #
-    # CSV::InputsScanner receives IO inputs, encoding and the chunk_size.
-    # It also controls the life cycle of the object with its methods +keep_start+,
-    # +keep_end+, +keep_back+, +keep_drop+.
-    #
-    # CSV::InputsScanner.scan() tries to match with pattern at the current position.
-    # If there's a match, the scanner advances the "scan pointer" and returns the matched string.
-    # Otherwise, the scanner returns nil.
-    #
-    # CSV::InputsScanner.rest() returns the "rest" of the string (i.e. everything after the scan pointer).
-    # If there is no more data (eos? = true), it returns "".
-    #
-    class InputsScanner
-      def initialize(inputs, encoding, row_separator, chunk_size: 8192)
-        @inputs = inputs.dup
-        @encoding = encoding
-        @row_separator = row_separator
-        @chunk_size = chunk_size
-        @last_scanner = @inputs.empty?
-        @keeps = []
-        read_chunk
-      end
-
-      def each_line(row_separator)
-        return enum_for(__method__, row_separator) unless block_given?
-        buffer = nil
-        input = @scanner.rest
-        position = @scanner.pos
-        offset = 0
-        n_row_separator_chars = row_separator.size
-        # trace(__method__, :start, input)
-        while true
-          input.each_line(row_separator) do |line|
-            @scanner.pos += line.bytesize
-            if buffer
-              if n_row_separator_chars == 2 and
-                buffer.end_with?(row_separator[0]) and
-                line.start_with?(row_separator[1])
-                buffer << line[0]
-                line = line[1..-1]
-                position += buffer.bytesize + offset
-                @scanner.pos = position
-                offset = 0
-                yield(buffer)
-                buffer = nil
-                next if line.empty?
-              else
-                buffer << line
-                line = buffer
-                buffer = nil
-              end
-            end
-            if line.end_with?(row_separator)
-              position += line.bytesize + offset
-              @scanner.pos = position
-              offset = 0
-              yield(line)
-            else
-              buffer = line
-            end
-          end
-          break unless read_chunk
-          input = @scanner.rest
-          position = @scanner.pos
-          offset = -buffer.bytesize if buffer
-        end
-        yield(buffer) if buffer
-      end
-
-      def scan(pattern)
-        # trace(__method__, pattern, :start)
-        value = @scanner.scan(pattern)
-        # trace(__method__, pattern, :done, :last, value) if @last_scanner
-        return value if @last_scanner
-
-        read_chunk if value and @scanner.eos?
-        # trace(__method__, pattern, :done, value)
-        value
-      end
-
-      def scan_all(pattern)
-        # trace(__method__, pattern, :start)
-        value = @scanner.scan(pattern)
-        # trace(__method__, pattern, :done, :last, value) if @last_scanner
-        return value if @last_scanner
-
-        # trace(__method__, pattern, :done, :nil) if value.nil?
-        return nil if value.nil?
-        while @scanner.eos? and read_chunk and (sub_value = @scanner.scan(pattern))
-          # trace(__method__, pattern, :sub, sub_value)
-          value << sub_value
-        end
-        # trace(__method__, pattern, :done, value)
-        value
-      end
-
-      def eos?
-        @scanner.eos?
-      end
-
-      def keep_start
-        # trace(__method__, :start)
-        adjust_last_keep
-        @keeps.push([@scanner, @scanner.pos, nil])
-        # trace(__method__, :done)
-      end
-
-      def keep_end
-        # trace(__method__, :start)
-        scanner, start, buffer = @keeps.pop
-        if scanner == @scanner
-          keep = @scanner.string.byteslice(start, @scanner.pos - start)
-        else
-          keep = @scanner.string.byteslice(0, @scanner.pos)
-        end
-        if buffer
-          buffer << keep
-          keep = buffer
-        end
-        # trace(__method__, :done, keep)
-        keep
-      end
-
-      def keep_back
-        # trace(__method__, :start)
-        scanner, start, buffer = @keeps.pop
-        if buffer
-          # trace(__method__, :rescan, start, buffer)
-          string = @scanner.string
-          if scanner == @scanner
-            keep = string.byteslice(start,
-                                    string.bytesize - @scanner.pos - start)
-          else
-            keep = string
-          end
-          if keep and not keep.empty?
-            @inputs.unshift(StringIO.new(keep))
-            @last_scanner = false
-          end
-          @scanner = StringScanner.new(buffer)
-        else
-          if @scanner != scanner
-            message = "scanners are different but no buffer: "
-            message += "#{@scanner.inspect}(#{@scanner.object_id}): "
-            message += "#{scanner.inspect}(#{scanner.object_id})"
-            raise UnexpectedError, message
-          end
-          # trace(__method__, :repos, start, buffer)
-          @scanner.pos = start
-        end
-        read_chunk if @scanner.eos?
-      end
-
-      def keep_drop
-        _, _, buffer = @keeps.pop
-        # trace(__method__, :done, :empty) unless buffer
-        return unless buffer
-
-        last_keep = @keeps.last
-        # trace(__method__, :done, :no_last_keep) unless last_keep
-        return unless last_keep
-
-        if last_keep[2]
-          last_keep[2] << buffer
-        else
-          last_keep[2] = buffer
-        end
-        # trace(__method__, :done)
-      end
-
-      def rest
-        @scanner.rest
-      end
-
-      def check(pattern)
-        @scanner.check(pattern)
-      end
-
-      private
-      def trace(*args)
-        pp([*args, @scanner, @scanner&.string, @scanner&.pos, @keeps])
-      end
-
-      def adjust_last_keep
-        # trace(__method__, :start)
-
-        keep = @keeps.last
-        # trace(__method__, :done, :empty) if keep.nil?
-        return if keep.nil?
-
-        scanner, start, buffer = keep
-        string = @scanner.string
-        if @scanner != scanner
-          start = 0
-        end
-        if start == 0 and @scanner.eos?
-          keep_data = string
-        else
-          keep_data = string.byteslice(start, @scanner.pos - start)
-        end
-        if keep_data
-          if buffer
-            buffer << keep_data
-          else
-            keep[2] = keep_data.dup
-          end
-        end
-
-        # trace(__method__, :done)
-      end
-
-      def read_chunk
-        return false if @last_scanner
-
-        adjust_last_keep
-
-        input = @inputs.first
-        case input
-        when StringIO
-          string = input.read
-          raise InvalidEncoding unless string.valid_encoding?
-          # trace(__method__, :stringio, string)
-          @scanner = StringScanner.new(string)
-          @inputs.shift
-          @last_scanner = @inputs.empty?
-          true
-        else
-          chunk = input.gets(@row_separator, @chunk_size)
-          if chunk
-            raise InvalidEncoding unless chunk.valid_encoding?
-            # trace(__method__, :chunk, chunk)
-            @scanner = StringScanner.new(chunk)
-            if input.respond_to?(:eof?) and input.eof?
-              @inputs.shift
-              @last_scanner = @inputs.empty?
-            end
-            true
-          else
-            # trace(__method__, :no_chunk)
-            @scanner = StringScanner.new("".encode(@encoding))
-            @inputs.shift
-            @last_scanner = @inputs.empty?
-            if @last_scanner
-              false
-            else
-              read_chunk
-            end
-          end
-        end
-      end
-    end
-
-    def initialize(input, options)
-      @input = input
-      @options = options
-      @samples = []
-
-      prepare
-    end
-
-    def column_separator
-      @column_separator
-    end
-
-    def row_separator
-      @row_separator
-    end
-
-    def quote_character
-      @quote_character
-    end
-
-    def field_size_limit
-      @max_field_size&.succ
-    end
-
-    def max_field_size
-      @max_field_size
-    end
-
-    def skip_lines
-      @skip_lines
-    end
-
-    def unconverted_fields?
-      @unconverted_fields
-    end
-
-    def headers
-      @headers
-    end
-
-    def header_row?
-      @use_headers and @headers.nil?
-    end
-
-    def return_headers?
-      @return_headers
-    end
-
-    def skip_blanks?
-      @skip_blanks
-    end
-
-    def liberal_parsing?
-      @liberal_parsing
-    end
-
-    def lineno
-      @lineno
-    end
-
-    def line
-      last_line
-    end
-
-    def parse(&block)
-      return to_enum(__method__) unless block_given?
-
-      if @return_headers and @headers and @raw_headers
-        headers = Row.new(@headers, @raw_headers, true)
-        if @unconverted_fields
-          headers = add_unconverted_fields(headers, [])
-        end
-        yield headers
-      end
-
-      begin
-        @scanner ||= build_scanner
-        if quote_character.nil?
-          parse_no_quote(&block)
-        elsif @need_robust_parsing
-          parse_quotable_robust(&block)
-        else
-          parse_quotable_loose(&block)
-        end
-      rescue InvalidEncoding
-        if @scanner
-          ignore_broken_line
-          lineno = @lineno
-        else
-          lineno = @lineno + 1
-        end
-        message = "Invalid byte sequence in #{@encoding}"
-        raise MalformedCSVError.new(message, lineno)
-      rescue UnexpectedError => error
-        if @scanner
-          ignore_broken_line
-          lineno = @lineno
-        else
-          lineno = @lineno + 1
-        end
-        message = "This should not be happen: #{error.message}: "
-        message += "Please report this to https://github.com/ruby/csv/issues"
-        raise MalformedCSVError.new(message, lineno)
-      end
-    end
-
-    def use_headers?
-      @use_headers
-    end
-
-    private
-    # A set of tasks to prepare the file in order to parse it
-    def prepare
-      prepare_variable
-      prepare_quote_character
-      prepare_backslash
-      prepare_skip_lines
-      prepare_strip
-      prepare_separators
-      validate_strip_and_col_sep_options
-      prepare_quoted
-      prepare_unquoted
-      prepare_line
-      prepare_header
-      prepare_parser
-    end
-
-    def prepare_variable
-      @need_robust_parsing = false
-      @encoding = @options[:encoding]
-      liberal_parsing = @options[:liberal_parsing]
-      if liberal_parsing
-        @liberal_parsing = true
-        if liberal_parsing.is_a?(Hash)
-          @double_quote_outside_quote =
-            liberal_parsing[:double_quote_outside_quote]
-          @backslash_quote = liberal_parsing[:backslash_quote]
-        else
-          @double_quote_outside_quote = false
-          @backslash_quote = false
-        end
-        @need_robust_parsing = true
-      else
-        @liberal_parsing = false
-        @backslash_quote = false
-      end
-      @unconverted_fields = @options[:unconverted_fields]
-      @max_field_size = @options[:max_field_size]
-      @skip_blanks = @options[:skip_blanks]
-      @fields_converter = @options[:fields_converter]
-      @header_fields_converter = @options[:header_fields_converter]
-    end
-
-    def prepare_quote_character
-      @quote_character = @options[:quote_character]
-      if @quote_character.nil?
-        @escaped_quote_character = nil
-        @escaped_quote = nil
-      else
-        @quote_character = @quote_character.to_s.encode(@encoding)
-        if @quote_character.length != 1
-          message = ":quote_char has to be nil or a single character String"
-          raise ArgumentError, message
-        end
-        @escaped_quote_character = Regexp.escape(@quote_character)
-        @escaped_quote = Regexp.new(@escaped_quote_character)
-      end
-    end
-
-    def prepare_backslash
-      return unless @backslash_quote
-
-      @backslash_character = "\\".encode(@encoding)
-
-      @escaped_backslash_character = Regexp.escape(@backslash_character)
-      @escaped_backslash = Regexp.new(@escaped_backslash_character)
-      if @quote_character.nil?
-        @backslash_quote_character = nil
-      else
-        @backslash_quote_character =
-          @backslash_character + @escaped_quote_character
-      end
-    end
-
-    def prepare_skip_lines
-      skip_lines = @options[:skip_lines]
-      case skip_lines
-      when String
-        @skip_lines = skip_lines.encode(@encoding)
-      when Regexp, nil
-        @skip_lines = skip_lines
-      else
-        unless skip_lines.respond_to?(:match)
-          message =
-            ":skip_lines has to respond to \#match: #{skip_lines.inspect}"
-          raise ArgumentError, message
-        end
-        @skip_lines = skip_lines
-      end
-    end
-
-    def prepare_strip
-      @strip = @options[:strip]
-      @escaped_strip = nil
-      @strip_value = nil
-      @rstrip_value = nil
-      if @strip.is_a?(String)
-        case @strip.length
-        when 0
-          raise ArgumentError, ":strip must not be an empty String"
-        when 1
-          # ok
-        else
-          raise ArgumentError, ":strip doesn't support 2 or more characters yet"
-        end
-        @strip = @strip.encode(@encoding)
-        @escaped_strip = Regexp.escape(@strip)
-        if @quote_character
-          @strip_value = Regexp.new(@escaped_strip +
-                                    "+".encode(@encoding))
-          @rstrip_value = Regexp.new(@escaped_strip +
-                                     "+\\z".encode(@encoding))
-        end
-        @need_robust_parsing = true
-      elsif @strip
-        strip_values = " \t\f\v"
-        @escaped_strip = strip_values.encode(@encoding)
-        if @quote_character
-          @strip_value = Regexp.new("[#{strip_values}]+".encode(@encoding))
-          @rstrip_value = Regexp.new("[#{strip_values}]+\\z".encode(@encoding))
-        end
-        @need_robust_parsing = true
-      end
-    end
-
-    begin
-      StringScanner.new("x").scan("x")
-    rescue TypeError
-      STRING_SCANNER_SCAN_ACCEPT_STRING = false
-    else
-      STRING_SCANNER_SCAN_ACCEPT_STRING = true
-    end
-
-    def prepare_separators
-      column_separator = @options[:column_separator]
-      @column_separator = column_separator.to_s.encode(@encoding)
-      if @column_separator.size < 1
-        message = ":col_sep must be 1 or more characters: "
-        message += column_separator.inspect
-        raise ArgumentError, message
-      end
-      @row_separator =
-        resolve_row_separator(@options[:row_separator]).encode(@encoding)
-
-      @escaped_column_separator = Regexp.escape(@column_separator)
-      @escaped_first_column_separator = Regexp.escape(@column_separator[0])
-      if @column_separator.size > 1
-        @column_end = Regexp.new(@escaped_column_separator)
-        @column_ends = @column_separator.each_char.collect do |char|
-          Regexp.new(Regexp.escape(char))
-        end
-        @first_column_separators = Regexp.new(@escaped_first_column_separator +
-                                              "+".encode(@encoding))
-      else
-        if STRING_SCANNER_SCAN_ACCEPT_STRING
-          @column_end = @column_separator
-        else
-          @column_end = Regexp.new(@escaped_column_separator)
-        end
-        @column_ends = nil
-        @first_column_separators = nil
-      end
-
-      escaped_row_separator = Regexp.escape(@row_separator)
-      @row_end = Regexp.new(escaped_row_separator)
-      if @row_separator.size > 1
-        @row_ends = @row_separator.each_char.collect do |char|
-          Regexp.new(Regexp.escape(char))
-        end
-      else
-        @row_ends = nil
-      end
-
-      @cr = "\r".encode(@encoding)
-      @lf = "\n".encode(@encoding)
-      @line_end = Regexp.new("\r\n|\n|\r".encode(@encoding))
-      @not_line_end = Regexp.new("[^\r\n]+".encode(@encoding))
-    end
-
-    # This method verifies that there are no (obvious) ambiguities with the
-    # provided +col_sep+ and +strip+ parsing options. For example, if +col_sep+
-    # and +strip+ were both equal to +\t+, then there would be no clear way to
-    # parse the input.
-    def validate_strip_and_col_sep_options
-      return unless @strip
-
-      if @strip.is_a?(String)
-        if @column_separator.start_with?(@strip) || @column_separator.end_with?(@strip)
-          raise ArgumentError,
-                "The provided strip (#{@escaped_strip}) and " \
-                "col_sep (#{@escaped_column_separator}) options are incompatible."
-        end
-      else
-        if Regexp.new("\\A[#{@escaped_strip}]|[#{@escaped_strip}]\\z").match?(@column_separator)
-          raise ArgumentError,
-                "The provided strip (true) and " \
-                "col_sep (#{@escaped_column_separator}) options are incompatible."
-        end
-      end
-    end
-
-    def prepare_quoted
-      if @quote_character
-        @quotes = Regexp.new(@escaped_quote_character +
-                             "+".encode(@encoding))
-        no_quoted_values = @escaped_quote_character.dup
-        if @backslash_quote
-          no_quoted_values << @escaped_backslash_character
-        end
-        @quoted_value = Regexp.new("[^".encode(@encoding) +
-                                   no_quoted_values +
-                                   "]+".encode(@encoding))
-      end
-      if @escaped_strip
-        @split_column_separator = Regexp.new(@escaped_strip +
-                                             "*".encode(@encoding) +
-                                             @escaped_column_separator +
-                                             @escaped_strip +
-                                             "*".encode(@encoding))
-      else
-        if @column_separator == " ".encode(@encoding)
-          @split_column_separator = Regexp.new(@escaped_column_separator)
-        else
-          @split_column_separator = @column_separator
-        end
-      end
-    end
-
-    def prepare_unquoted
-      return if @quote_character.nil?
-
-      no_unquoted_values = "\r\n".encode(@encoding)
-      no_unquoted_values << @escaped_first_column_separator
-      unless @liberal_parsing
-        no_unquoted_values << @escaped_quote_character
-      end
-      @unquoted_value = Regexp.new("[^".encode(@encoding) +
-                                   no_unquoted_values +
-                                   "]+".encode(@encoding))
-    end
-
-    def resolve_row_separator(separator)
-      if separator == :auto
-        cr = "\r".encode(@encoding)
-        lf = "\n".encode(@encoding)
-        if @input.is_a?(StringIO)
-          pos = @input.pos
-          separator = detect_row_separator(@input.read, cr, lf)
-          @input.seek(pos)
-        elsif @input.respond_to?(:gets)
-          if @input.is_a?(File)
-            chunk_size = 32 * 1024
-          else
-            chunk_size = 1024
-          end
-          begin
-            while separator == :auto
-              #
-              # if we run out of data, it's probably a single line
-              # (ensure will set default value)
-              #
-              break unless sample = @input.gets(nil, chunk_size)
-
-              # extend sample if we're unsure of the line ending
-              if sample.end_with?(cr)
-                sample << (@input.gets(nil, 1) || "")
-              end
-
-              @samples << sample
-
-              separator = detect_row_separator(sample, cr, lf)
-            end
-          rescue IOError
-            # do nothing:  ensure will set default
-          end
-        end
-        separator = InputRecordSeparator.value if separator == :auto
-      end
-      separator.to_s.encode(@encoding)
-    end
-
-    def detect_row_separator(sample, cr, lf)
-      lf_index = sample.index(lf)
-      if lf_index
-        cr_index = sample[0, lf_index].index(cr)
-      else
-        cr_index = sample.index(cr)
-      end
-      if cr_index and lf_index
-        if cr_index + 1 == lf_index
-          cr + lf
-        elsif cr_index < lf_index
-          cr
-        else
-          lf
-        end
-      elsif cr_index
-        cr
-      elsif lf_index
-        lf
-      else
-        :auto
-      end
-    end
-
-    def prepare_line
-      @lineno = 0
-      @last_line = nil
-      @scanner = nil
-    end
-
-    def last_line
-      if @scanner
-        @last_line ||= @scanner.keep_end
-      else
-        @last_line
-      end
-    end
-
-    def prepare_header
-      @return_headers = @options[:return_headers]
-
-      headers = @options[:headers]
-      case headers
-      when Array
-        @raw_headers = headers
-        quoted_fields = [false] * @raw_headers.size
-        @use_headers = true
-      when String
-        @raw_headers, quoted_fields = parse_headers(headers)
-        @use_headers = true
-      when nil, false
-        @raw_headers = nil
-        @use_headers = false
-      else
-        @raw_headers = nil
-        @use_headers = true
-      end
-      if @raw_headers
-        @headers = adjust_headers(@raw_headers, quoted_fields)
-      else
-        @headers = nil
-      end
-    end
-
-    def parse_headers(row)
-      quoted_fields = []
-      converter = lambda do |field, info|
-        quoted_fields << info.quoted?
-        field
-      end
-      headers = CSV.parse_line(row,
-                               col_sep:    @column_separator,
-                               row_sep:    @row_separator,
-                               quote_char: @quote_character,
-                               converters: [converter])
-      [headers, quoted_fields]
-    end
-
-    def adjust_headers(headers, quoted_fields)
-      adjusted_headers = @header_fields_converter.convert(headers, nil, @lineno, quoted_fields)
-      adjusted_headers.each {|h| h.freeze if h.is_a? String}
-      adjusted_headers
-    end
-
-    def prepare_parser
-      @may_quoted = may_quoted?
-    end
-
-    def may_quoted?
-      return false if @quote_character.nil?
-
-      if @input.is_a?(StringIO)
-        pos = @input.pos
-        sample = @input.read
-        @input.seek(pos)
-      else
-        return false if @samples.empty?
-        sample = @samples.first
-      end
-      sample[0, 128].index(@quote_character)
-    end
-
-    class UnoptimizedStringIO # :nodoc:
-      def initialize(string)
-        @io = StringIO.new(string, "rb:#{string.encoding}")
-      end
-
-      def gets(*args)
-        @io.gets(*args)
-      end
-
-      def each_line(*args, &block)
-        @io.each_line(*args, &block)
-      end
-
-      def eof?
-        @io.eof?
-      end
-    end
-
-    SCANNER_TEST = (ENV["CSV_PARSER_SCANNER_TEST"] == "yes")
-    if SCANNER_TEST
-      SCANNER_TEST_CHUNK_SIZE_NAME = "CSV_PARSER_SCANNER_TEST_CHUNK_SIZE"
-      SCANNER_TEST_CHUNK_SIZE_VALUE = ENV[SCANNER_TEST_CHUNK_SIZE_NAME]
-      def build_scanner
-        inputs = @samples.collect do |sample|
-          UnoptimizedStringIO.new(sample)
-        end
-        if @input.is_a?(StringIO)
-          inputs << UnoptimizedStringIO.new(@input.read)
-        else
-          inputs << @input
-        end
-        begin
-          chunk_size_value = ENV[SCANNER_TEST_CHUNK_SIZE_NAME]
-        rescue # Ractor::IsolationError
-          # Ractor on Ruby 3.0 can't read ENV value.
-          chunk_size_value = SCANNER_TEST_CHUNK_SIZE_VALUE
-        end
-        chunk_size = Integer((chunk_size_value || "1"), 10)
-        InputsScanner.new(inputs,
-                          @encoding,
-                          @row_separator,
-                          chunk_size: chunk_size)
-      end
-    else
-      def build_scanner
-        string = nil
-        if @samples.empty? and @input.is_a?(StringIO)
-          string = @input.read
-        elsif @samples.size == 1 and
-              @input != ARGF and
-              @input.respond_to?(:eof?) and
-              @input.eof?
-          string = @samples[0]
-        end
-        if string
-          unless string.valid_encoding?
-            index = string.lines(@row_separator).index do |line|
-              !line.valid_encoding?
-            end
-            if index
-              message = "Invalid byte sequence in #{@encoding}"
-              raise MalformedCSVError.new(message, @lineno + index + 1)
-            end
-          end
-          Scanner.new(string)
-        else
-          inputs = @samples.collect do |sample|
-            StringIO.new(sample)
-          end
-          inputs << @input
-          InputsScanner.new(inputs, @encoding, @row_separator)
-        end
-      end
-    end
-
-    def skip_needless_lines
-      return unless @skip_lines
-
-      until @scanner.eos?
-        @scanner.keep_start
-        line = @scanner.scan_all(@not_line_end) || "".encode(@encoding)
-        line << @row_separator if parse_row_end
-        if skip_line?(line)
-          @lineno += 1
-          @scanner.keep_drop
-        else
-          @scanner.keep_back
-          return
-        end
-      end
-    end
-
-    def skip_line?(line)
-      line = line.delete_suffix(@row_separator)
-      case @skip_lines
-      when String
-        line.include?(@skip_lines)
-      when Regexp
-        @skip_lines.match?(line)
-      else
-        @skip_lines.match(line)
-      end
-    end
-
-    def validate_field_size(field)
-      return unless @max_field_size
-      return if field.size <= @max_field_size
-      ignore_broken_line
-      message = "Field size exceeded: #{field.size} > #{@max_field_size}"
-      raise MalformedCSVError.new(message, @lineno)
-    end
-
-    def parse_no_quote(&block)
-      @scanner.each_line(@row_separator) do |line|
-        next if @skip_lines and skip_line?(line)
-        original_line = line
-        line = line.delete_suffix(@row_separator)
-
-        if line.empty?
-          next if @skip_blanks
-          row = []
-          quoted_fields = []
-        else
-          line = strip_value(line)
-          row = line.split(@split_column_separator, -1)
-          quoted_fields = [false] * row.size
-          if @max_field_size
-            row.each do |column|
-              validate_field_size(column)
-            end
-          end
-          n_columns = row.size
-          i = 0
-          while i < n_columns
-            row[i] = nil if row[i].empty?
-            i += 1
-          end
-        end
-        @last_line = original_line
-        emit_row(row, quoted_fields, &block)
-      end
-    end
-
-    def parse_quotable_loose(&block)
-      @scanner.keep_start
-      @scanner.each_line(@row_separator) do |line|
-        if @skip_lines and skip_line?(line)
-          @scanner.keep_drop
-          @scanner.keep_start
-          next
-        end
-        original_line = line
-        line = line.delete_suffix(@row_separator)
-
-        if line.empty?
-          if @skip_blanks
-            @scanner.keep_drop
-            @scanner.keep_start
-            next
-          end
-          row = []
-          quoted_fields = []
-        elsif line.include?(@cr) or line.include?(@lf)
-          @scanner.keep_back
-          @need_robust_parsing = true
-          return parse_quotable_robust(&block)
-        else
-          row = line.split(@split_column_separator, -1)
-          quoted_fields = []
-          n_columns = row.size
-          i = 0
-          while i < n_columns
-            column = row[i]
-            if column.empty?
-              quoted_fields << false
-              row[i] = nil
-            else
-              n_quotes = column.count(@quote_character)
-              if n_quotes.zero?
-                quoted_fields << false
-                # no quote
-              elsif n_quotes == 2 and
-                   column.start_with?(@quote_character) and
-                   column.end_with?(@quote_character)
-                quoted_fields << true
-                row[i] = column[1..-2]
-              else
-                @scanner.keep_back
-                @need_robust_parsing = true
-                return parse_quotable_robust(&block)
-              end
-              validate_field_size(row[i])
-            end
-            i += 1
-          end
-        end
-        @scanner.keep_drop
-        @scanner.keep_start
-        @last_line = original_line
-        emit_row(row, quoted_fields, &block)
-      end
-      @scanner.keep_drop
-    end
-
-    def parse_quotable_robust(&block)
-      row = []
-      quoted_fields = []
-      skip_needless_lines
-      start_row
-      while true
-        @quoted_column_value = false
-        @unquoted_column_value = false
-        @scanner.scan_all(@strip_value) if @strip_value
-        value = parse_column_value
-        if value
-          @scanner.scan_all(@strip_value) if @strip_value
-          validate_field_size(value)
-        end
-        if parse_column_end
-          row << value
-          quoted_fields << @quoted_column_value
-        elsif parse_row_end
-          if row.empty? and value.nil?
-            emit_row([], [], &block) unless @skip_blanks
-          else
-            row << value
-            quoted_fields << @quoted_column_value
-            emit_row(row, quoted_fields, &block)
-            row = []
-            quoted_fields = []
-          end
-          skip_needless_lines
-          start_row
-        elsif @scanner.eos?
-          break if row.empty? and value.nil?
-          row << value
-          quoted_fields << @quoted_column_value
-          emit_row(row, quoted_fields, &block)
-          break
-        else
-          if @quoted_column_value
-            if liberal_parsing? and (new_line = @scanner.check(@line_end))
-              message =
-                "Illegal end-of-line sequence outside of a quoted field " +
-                "<#{new_line.inspect}>"
-            else
-              message = "Any value after quoted field isn't allowed"
-            end
-            ignore_broken_line
-            raise MalformedCSVError.new(message, @lineno)
-          elsif @unquoted_column_value and
-                (new_line = @scanner.scan(@line_end))
-            ignore_broken_line
-            message = "Unquoted fields do not allow new line " +
-                      "<#{new_line.inspect}>"
-            raise MalformedCSVError.new(message, @lineno)
-          elsif @scanner.rest.start_with?(@quote_character)
-            ignore_broken_line
-            message = "Illegal quoting"
-            raise MalformedCSVError.new(message, @lineno)
-          elsif (new_line = @scanner.scan(@line_end))
-            ignore_broken_line
-            message = "New line must be <#{@row_separator.inspect}> " +
-                      "not <#{new_line.inspect}>"
-            raise MalformedCSVError.new(message, @lineno)
-          else
-            ignore_broken_line
-            raise MalformedCSVError.new("TODO: Meaningful message",
-                                        @lineno)
-          end
-        end
-      end
-    end
-
-    def parse_column_value
-      if @liberal_parsing
-        quoted_value = parse_quoted_column_value
-        if quoted_value
-          @scanner.scan_all(@strip_value) if @strip_value
-          unquoted_value = parse_unquoted_column_value
-          if unquoted_value
-            if @double_quote_outside_quote
-              unquoted_value = unquoted_value.gsub(@quote_character * 2,
-                                                   @quote_character)
-              if quoted_value.empty? # %Q{""...} case
-                return @quote_character + unquoted_value
-              end
-            end
-            @quote_character + quoted_value + @quote_character + unquoted_value
-          else
-            quoted_value
-          end
-        else
-          parse_unquoted_column_value
-        end
-      elsif @may_quoted
-        parse_quoted_column_value ||
-          parse_unquoted_column_value
-      else
-        parse_unquoted_column_value ||
-          parse_quoted_column_value
-      end
-    end
-
-    def parse_unquoted_column_value
-      value = @scanner.scan_all(@unquoted_value)
-      return nil unless value
-
-      @unquoted_column_value = true
-      if @first_column_separators
-        while true
-          @scanner.keep_start
-          is_column_end = @column_ends.all? do |column_end|
-            @scanner.scan(column_end)
-          end
-          @scanner.keep_back
-          break if is_column_end
-          sub_separator = @scanner.scan_all(@first_column_separators)
-          break if sub_separator.nil?
-          value << sub_separator
-          sub_value = @scanner.scan_all(@unquoted_value)
-          break if sub_value.nil?
-          value << sub_value
-        end
-      end
-      value.gsub!(@backslash_quote_character, @quote_character) if @backslash_quote
-      if @rstrip_value
-        value.gsub!(@rstrip_value, "")
-      end
-      value
-    end
-
-    def parse_quoted_column_value
-      quotes = @scanner.scan_all(@quotes)
-      return nil unless quotes
-
-      @quoted_column_value = true
-      n_quotes = quotes.size
-      if (n_quotes % 2).zero?
-        quotes[0, (n_quotes - 2) / 2]
-      else
-        value = quotes[0, n_quotes / 2]
-        while true
-          quoted_value = @scanner.scan_all(@quoted_value)
-          value << quoted_value if quoted_value
-          if @backslash_quote
-            if @scanner.scan(@escaped_backslash)
-              if @scanner.scan(@escaped_quote)
-                value << @quote_character
-              else
-                value << @backslash_character
-              end
-              next
-            end
-          end
-
-          quotes = @scanner.scan_all(@quotes)
-          unless quotes
-            ignore_broken_line
-            message = "Unclosed quoted field"
-            raise MalformedCSVError.new(message, @lineno)
-          end
-          n_quotes = quotes.size
-          if n_quotes == 1
-            break
-          else
-            value << quotes[0, n_quotes / 2]
-            break if (n_quotes % 2) == 1
-          end
-        end
-        value
-      end
-    end
-
-    def parse_column_end
-      return true if @scanner.scan(@column_end)
-      return false unless @column_ends
-
-      @scanner.keep_start
-      if @column_ends.all? {|column_end| @scanner.scan(column_end)}
-        @scanner.keep_drop
-        true
-      else
-        @scanner.keep_back
-        false
-      end
-    end
-
-    def parse_row_end
-      return true if @scanner.scan(@row_end)
-      return false unless @row_ends
-      @scanner.keep_start
-      if @row_ends.all? {|row_end| @scanner.scan(row_end)}
-        @scanner.keep_drop
-        true
-      else
-        @scanner.keep_back
-        false
-      end
-    end
-
-    def strip_value(value)
-      return value unless @strip
-      return value if value.nil?
-
-      case @strip
-      when String
-        while value.delete_prefix!(@strip)
-          # do nothing
-        end
-        while value.delete_suffix!(@strip)
-          # do nothing
-        end
-      else
-        value.strip!
-      end
-      value
-    end
-
-    def ignore_broken_line
-      @scanner.scan_all(@not_line_end)
-      @scanner.scan_all(@line_end)
-      @lineno += 1
-    end
-
-    def start_row
-      if @last_line
-        @last_line = nil
-      else
-        @scanner.keep_drop
-      end
-      @scanner.keep_start
-    end
-
-    def emit_row(row, quoted_fields, &block)
-      @lineno += 1
-
-      raw_row = row
-      if @use_headers
-        if @headers.nil?
-          @headers = adjust_headers(row, quoted_fields)
-          return unless @return_headers
-          row = Row.new(@headers, row, true)
-        else
-          row = Row.new(@headers,
-                        @fields_converter.convert(raw_row, @headers, @lineno, quoted_fields))
-        end
-      else
-        # convert fields, if needed...
-        row = @fields_converter.convert(raw_row, nil, @lineno, quoted_fields)
-      end
-
-      # inject unconverted fields and accessor, if requested...
-      if @unconverted_fields and not row.respond_to?(:unconverted_fields)
-        add_unconverted_fields(row, raw_row)
-      end
-
-      yield(row)
-    end
-
-    # This method injects an instance variable <tt>unconverted_fields</tt> into
-    # +row+ and an accessor method for +row+ called unconverted_fields().  The
-    # variable is set to the contents of +fields+.
-    def add_unconverted_fields(row, fields)
-      class << row
-        attr_reader :unconverted_fields
-      end
-      row.instance_variable_set(:@unconverted_fields, fields)
-      row
-    end
-  end
-end
diff --git a/lib/csv/row.rb b/lib/csv/row.rb
deleted file mode 100644
index 86323f7d0a7d4c..00000000000000
--- a/lib/csv/row.rb
+++ /dev/null
@@ -1,757 +0,0 @@
-# frozen_string_literal: true
-
-require "forwardable"
-
-class CSV
-  # = \CSV::Row
-  # A \CSV::Row instance represents a \CSV table row.
-  # (see {class CSV}[../CSV.html]).
-  #
-  # The instance may have:
-  # - Fields: each is an object, not necessarily a \String.
-  # - Headers: each serves a key, and also need not be a \String.
-  #
-  # === Instance Methods
-  #
-  # \CSV::Row has three groups of instance methods:
-  # - Its own internally defined instance methods.
-  # - Methods included by module Enumerable.
-  # - Methods delegated to class Array.:
-  #   * Array#empty?
-  #   * Array#length
-  #   * Array#size
-  #
-  # == Creating a \CSV::Row Instance
-  #
-  # Commonly, a new \CSV::Row instance is created by parsing \CSV source
-  # that has headers:
-  #   source = "Name,Value\nfoo,0\nbar,1\nbaz,2\n"
-  #   table = CSV.parse(source, headers: true)
-  #   table.each {|row| p row }
-  # Output:
-  #   #<CSV::Row "Name":"foo" "Value":"0">
-  #   #<CSV::Row "Name":"bar" "Value":"1">
-  #   #<CSV::Row "Name":"baz" "Value":"2">
-  #
-  # You can also create a row directly. See ::new.
-  #
-  # == Headers
-  #
-  # Like a \CSV::Table, a \CSV::Row has headers.
-  #
-  # A \CSV::Row that was created by parsing \CSV source
-  # inherits its headers from the table:
-  #   source = "Name,Value\nfoo,0\nbar,1\nbaz,2\n"
-  #   table = CSV.parse(source, headers: true)
-  #   row = table.first
-  #   row.headers # => ["Name", "Value"]
-  #
-  # You can also create a new row with headers;
-  # like the keys in a \Hash, the headers need not be Strings:
-  #   row = CSV::Row.new([:name, :value], ['foo', 0])
-  #   row.headers # => [:name, :value]
-  #
-  # The new row retains its headers even if added to a table
-  # that has headers:
-  #   table << row # => #<CSV::Table mode:col_or_row row_count:5>
-  #   row.headers # => [:name, :value]
-  #   row[:name] # => "foo"
-  #   row['Name'] # => nil
-  #
-  #
-  #
-  # == Accessing Fields
-  #
-  # You may access a field in a \CSV::Row with either its \Integer index
-  # (\Array-style) or its header (\Hash-style).
-  #
-  # Fetch a field using method #[]:
-  #   row = CSV::Row.new(['Name', 'Value'], ['foo', 0])
-  #   row[1] # => 0
-  #   row['Value'] # => 0
-  #
-  # Set a field using method #[]=:
-  #   row = CSV::Row.new(['Name', 'Value'], ['foo', 0])
-  #   row # => #<CSV::Row "Name":"foo" "Value":0>
-  #   row[0] = 'bar'
-  #   row['Value'] = 1
-  #   row # => #<CSV::Row "Name":"bar" "Value":1>
-  #
-  class Row
-    # :call-seq:
-    #   CSV::Row.new(headers, fields, header_row = false) -> csv_row
-    #
-    # Returns the new \CSV::Row instance constructed from
-    # arguments +headers+ and +fields+; both should be Arrays;
-    # note that the fields need not be Strings:
-    #   row = CSV::Row.new(['Name', 'Value'], ['foo', 0])
-    #   row # => #<CSV::Row "Name":"foo" "Value":0>
-    #
-    # If the \Array lengths are different, the shorter is +nil+-filled:
-    #   row = CSV::Row.new(['Name', 'Value', 'Date', 'Size'], ['foo', 0])
-    #   row # => #<CSV::Row "Name":"foo" "Value":0 "Date":nil "Size":nil>
-    #
-    # Each \CSV::Row object is either a <i>field row</i> or a <i>header row</i>;
-    # by default, a new row is a field row;  for the row created above:
-    #   row.field_row? # => true
-    #   row.header_row? # => false
-    #
-    # If the optional argument +header_row+ is given as +true+,
-    # the created row is a header row:
-    #   row = CSV::Row.new(['Name', 'Value'], ['foo', 0], header_row = true)
-    #   row # => #<CSV::Row "Name":"foo" "Value":0>
-    #   row.field_row? # => false
-    #   row.header_row? # => true
-    def initialize(headers, fields, header_row = false)
-      @header_row = header_row
-      headers.each { |h| h.freeze if h.is_a? String }
-
-      # handle extra headers or fields
-      @row = if headers.size >= fields.size
-        headers.zip(fields)
-      else
-        fields.zip(headers).each(&:reverse!)
-      end
-    end
-
-    # Internal data format used to compare equality.
-    attr_reader :row
-    protected   :row
-
-    ### Array Delegation ###
-
-    extend Forwardable
-    def_delegators :@row, :empty?, :length, :size
-
-    # :call-seq:
-    #   row.initialize_copy(other_row) -> self
-    #
-    # Calls superclass method.
-    def initialize_copy(other)
-      super_return_value = super
-      @row = @row.collect(&:dup)
-      super_return_value
-    end
-
-    # :call-seq:
-    #   row.header_row? -> true or false
-    #
-    # Returns +true+ if this is a header row, +false+ otherwise.
-    def header_row?
-      @header_row
-    end
-
-    # :call-seq:
-    #   row.field_row? -> true or false
-    #
-    # Returns +true+ if this is a field row, +false+ otherwise.
-    def field_row?
-      not header_row?
-    end
-
-    # :call-seq:
-    #    row.headers -> array_of_headers
-    #
-    # Returns the headers for this row:
-    #   source = "Name,Value\nfoo,0\nbar,1\nbaz,2\n"
-    #   table = CSV.parse(source, headers: true)
-    #   row = table.first
-    #   row.headers # => ["Name", "Value"]
-    def headers
-      @row.map(&:first)
-    end
-
-    # :call-seq:
-    #   field(index) -> value
-    #   field(header) -> value
-    #   field(header, offset) -> value
-    #
-    # Returns the field value for the given +index+ or +header+.
-    #
-    # ---
-    #
-    # Fetch field value by \Integer index:
-    #   source = "Name,Value\nfoo,0\nbar,1\nbaz,2\n"
-    #   table = CSV.parse(source, headers: true)
-    #   row = table[0]
-    #   row.field(0) # => "foo"
-    #   row.field(1) # => "bar"
-    #
-    # Counts backward from the last column if +index+ is negative:
-    #   row.field(-1) # => "0"
-    #   row.field(-2) # => "foo"
-    #
-    # Returns +nil+ if +index+ is out of range:
-    #   row.field(2) # => nil
-    #   row.field(-3) # => nil
-    #
-    # ---
-    #
-    # Fetch field value by header (first found):
-    #   source = "Name,Name,Name\nFoo,Bar,Baz\n"
-    #   table = CSV.parse(source, headers: true)
-    #   row = table[0]
-    #   row.field('Name') # => "Foo"
-    #
-    # Fetch field value by header, ignoring +offset+ leading fields:
-    #   source = "Name,Name,Name\nFoo,Bar,Baz\n"
-    #   table = CSV.parse(source, headers: true)
-    #   row = table[0]
-    #   row.field('Name', 2) # => "Baz"
-    #
-    # Returns +nil+ if the header does not exist.
-    def field(header_or_index, minimum_index = 0)
-      # locate the pair
-      finder = (header_or_index.is_a?(Integer) || header_or_index.is_a?(Range)) ? :[] : :assoc
-      pair   = @row[minimum_index..-1].public_send(finder, header_or_index)
-
-      # return the field if we have a pair
-      if pair.nil?
-        nil
-      else
-        header_or_index.is_a?(Range) ? pair.map(&:last) : pair.last
-      end
-    end
-    alias_method :[], :field
-
-    #
-    # :call-seq:
-    #   fetch(header) -> value
-    #   fetch(header, default) -> value
-    #   fetch(header) {|row| ... } -> value
-    #
-    # Returns the field value as specified by +header+.
-    #
-    # ---
-    #
-    # With the single argument +header+, returns the field value
-    # for that header (first found):
-    #   source = "Name,Name,Name\nFoo,Bar,Baz\n"
-    #   table = CSV.parse(source, headers: true)
-    #   row = table[0]
-    #   row.fetch('Name') # => "Foo"
-    #
-    # Raises exception +KeyError+ if the header does not exist.
-    #
-    # ---
-    #
-    # With arguments +header+ and +default+ given,
-    # returns the field value for the header (first found)
-    # if the header exists, otherwise returns +default+:
-    #   source = "Name,Name,Name\nFoo,Bar,Baz\n"
-    #   table = CSV.parse(source, headers: true)
-    #   row = table[0]
-    #   row.fetch('Name', '') # => "Foo"
-    #   row.fetch(:nosuch, '') # => ""
-    #
-    # ---
-    #
-    # With argument +header+ and a block given,
-    # returns the field value for the header (first found)
-    # if the header exists; otherwise calls the block
-    # and returns its return value:
-    #   source = "Name,Name,Name\nFoo,Bar,Baz\n"
-    #   table = CSV.parse(source, headers: true)
-    #   row = table[0]
-    #   row.fetch('Name') {|header| fail 'Cannot happen' } # => "Foo"
-    #   row.fetch(:nosuch) {|header| "Header '#{header} not found'" } # => "Header 'nosuch not found'"
-    def fetch(header, *varargs)
-      raise ArgumentError, "Too many arguments" if varargs.length > 1
-      pair = @row.assoc(header)
-      if pair
-        pair.last
-      else
-        if block_given?
-          yield header
-        elsif varargs.empty?
-          raise KeyError, "key not found: #{header}"
-        else
-          varargs.first
-        end
-      end
-    end
-
-    # :call-seq:
-    #   row.has_key?(header) -> true or false
-    #
-    # Returns +true+ if there is a field with the given +header+,
-    # +false+ otherwise.
-    def has_key?(header)
-      !!@row.assoc(header)
-    end
-    alias_method :include?, :has_key?
-    alias_method :key?,     :has_key?
-    alias_method :member?,  :has_key?
-    alias_method :header?,  :has_key?
-
-    #
-    # :call-seq:
-    #   row[index] = value -> value
-    #   row[header, offset] = value -> value
-    #   row[header] = value -> value
-    #
-    # Assigns the field value for the given +index+ or +header+;
-    # returns +value+.
-    #
-    # ---
-    #
-    # Assign field value by \Integer index:
-    #   source = "Name,Value\nfoo,0\nbar,1\nbaz,2\n"
-    #   table = CSV.parse(source, headers: true)
-    #   row = table[0]
-    #   row[0] = 'Bat'
-    #   row[1] = 3
-    #   row # => #<CSV::Row "Name":"Bat" "Value":3>
-    #
-    # Counts backward from the last column if +index+ is negative:
-    #   row[-1] = 4
-    #   row[-2] = 'Bam'
-    #   row # => #<CSV::Row "Name":"Bam" "Value":4>
-    #
-    # Extends the row with <tt>nil:nil</tt> if positive +index+ is not in the row:
-    #   row[4] = 5
-    #   row # => #<CSV::Row "Name":"bad" "Value":4 nil:nil nil:nil nil:5>
-    #
-    # Raises IndexError if negative +index+ is too small (too far from zero).
-    #
-    # ---
-    #
-    # Assign field value by header (first found):
-    #   source = "Name,Name,Name\nFoo,Bar,Baz\n"
-    #   table = CSV.parse(source, headers: true)
-    #   row = table[0]
-    #   row['Name'] = 'Bat'
-    #   row # => #<CSV::Row "Name":"Bat" "Name":"Bar" "Name":"Baz">
-    #
-    # Assign field value by header, ignoring +offset+ leading fields:
-    #   source = "Name,Name,Name\nFoo,Bar,Baz\n"
-    #   table = CSV.parse(source, headers: true)
-    #   row = table[0]
-    #   row['Name', 2] = 4
-    #   row # => #<CSV::Row "Name":"Foo" "Name":"Bar" "Name":4>
-    #
-    # Append new field by (new) header:
-    #   source = "Name,Value\nfoo,0\nbar,1\nbaz,2\n"
-    #   table = CSV.parse(source, headers: true)
-    #   row = table[0]
-    #   row['New'] = 6
-    #   row# => #<CSV::Row "Name":"foo" "Value":"0" "New":6>
-    def []=(*args)
-      value = args.pop
-
-      if args.first.is_a? Integer
-        if @row[args.first].nil?  # extending past the end with index
-          @row[args.first] = [nil, value]
-          @row.map! { |pair| pair.nil? ? [nil, nil] : pair }
-        else                      # normal index assignment
-          @row[args.first][1] = value
-        end
-      else
-        index = index(*args)
-        if index.nil?             # appending a field
-          self << [args.first, value]
-        else                      # normal header assignment
-          @row[index][1] = value
-        end
-      end
-    end
-
-    #
-    # :call-seq:
-    #   row << [header, value] -> self
-    #   row << hash -> self
-    #   row << value -> self
-    #
-    # Adds a field to +self+; returns +self+:
-    #
-    # If the argument is a 2-element \Array <tt>[header, value]</tt>,
-    # a field is added with the given +header+ and +value+:
-    #   source = "Name,Name,Name\nFoo,Bar,Baz\n"
-    #   table = CSV.parse(source, headers: true)
-    #   row = table[0]
-    #   row << ['NAME', 'Bat']
-    #   row # => #<CSV::Row "Name":"Foo" "Name":"Bar" "Name":"Baz" "NAME":"Bat">
-    #
-    # If the argument is a \Hash, each <tt>key-value</tt> pair is added
-    # as a field with header +key+ and value +value+.
-    #   source = "Name,Name,Name\nFoo,Bar,Baz\n"
-    #   table = CSV.parse(source, headers: true)
-    #   row = table[0]
-    #   row << {NAME: 'Bat', name: 'Bam'}
-    #   row # => #<CSV::Row "Name":"Foo" "Name":"Bar" "Name":"Baz" NAME:"Bat" name:"Bam">
-    #
-    # Otherwise, the given +value+ is added as a field with no header.
-    #   source = "Name,Name,Name\nFoo,Bar,Baz\n"
-    #   table = CSV.parse(source, headers: true)
-    #   row = table[0]
-    #   row << 'Bag'
-    #   row # => #<CSV::Row "Name":"Foo" "Name":"Bar" "Name":"Baz" nil:"Bag">
-    def <<(arg)
-      if arg.is_a?(Array) and arg.size == 2  # appending a header and name
-        @row << arg
-      elsif arg.is_a?(Hash)                  # append header and name pairs
-        arg.each { |pair| @row << pair }
-      else                                   # append field value
-        @row << [nil, arg]
-      end
-
-      self  # for chaining
-    end
-
-    # :call-seq:
-    #   row.push(*values) -> self
-    #
-    # Appends each of the given +values+ to +self+ as a field; returns +self+:
-    #   source = "Name,Name,Name\nFoo,Bar,Baz\n"
-    #   table = CSV.parse(source, headers: true)
-    #   row = table[0]
-    #   row.push('Bat', 'Bam')
-    #   row # => #<CSV::Row "Name":"Foo" "Name":"Bar" "Name":"Baz" nil:"Bat" nil:"Bam">
-    def push(*args)
-      args.each { |arg| self << arg }
-
-      self  # for chaining
-    end
-
-    #
-    # :call-seq:
-    #   delete(index) -> [header, value] or nil
-    #   delete(header) -> [header, value] or empty_array
-    #   delete(header, offset) -> [header, value] or empty_array
-    #
-    # Removes a specified field from +self+; returns the 2-element \Array
-    # <tt>[header, value]</tt> if the field exists.
-    #
-    # If an \Integer argument +index+ is given,
-    # removes and returns the field at offset +index+,
-    # or returns +nil+ if the field does not exist:
-    #   source = "Name,Name,Name\nFoo,Bar,Baz\n"
-    #   table = CSV.parse(source, headers: true)
-    #   row = table[0]
-    #   row.delete(1) # => ["Name", "Bar"]
-    #   row.delete(50) # => nil
-    #
-    # Otherwise, if the single argument +header+ is given,
-    # removes and returns the first-found field with the given header,
-    # of returns a new empty \Array if the field does not exist:
-    #   source = "Name,Name,Name\nFoo,Bar,Baz\n"
-    #   table = CSV.parse(source, headers: true)
-    #   row = table[0]
-    #   row.delete('Name') # => ["Name", "Foo"]
-    #   row.delete('NAME') # => []
-    #
-    # If argument +header+ and \Integer argument +offset+ are given,
-    # removes and returns the first-found field with the given header
-    # whose +index+ is at least as large as +offset+:
-    #   source = "Name,Name,Name\nFoo,Bar,Baz\n"
-    #   table = CSV.parse(source, headers: true)
-    #   row = table[0]
-    #   row.delete('Name', 1) # => ["Name", "Bar"]
-    #   row.delete('NAME', 1) # => []
-    def delete(header_or_index, minimum_index = 0)
-      if header_or_index.is_a? Integer                 # by index
-        @row.delete_at(header_or_index)
-      elsif i = index(header_or_index, minimum_index)  # by header
-        @row.delete_at(i)
-      else
-        [ ]
-      end
-    end
-
-    # :call-seq:
-    #   row.delete_if {|header, value| ... } -> self
-    #
-    # Removes fields from +self+ as selected by the block; returns +self+.
-    #
-    # Removes each field for which the block returns a truthy value:
-    #   source = "Name,Name,Name\nFoo,Bar,Baz\n"
-    #   table = CSV.parse(source, headers: true)
-    #   row = table[0]
-    #   row.delete_if {|header, value| value.start_with?('B') } # => true
-    #   row # => #<CSV::Row "Name":"Foo">
-    #   row.delete_if {|header, value| header.start_with?('B') } # => false
-    #
-    # If no block is given, returns a new Enumerator:
-    #   row.delete_if # => #<Enumerator: #<CSV::Row "Name":"Foo">:delete_if>
-    def delete_if(&block)
-      return enum_for(__method__) { size } unless block_given?
-
-      @row.delete_if(&block)
-
-      self  # for chaining
-    end
-
-    # :call-seq:
-    #   self.fields(*specifiers) -> array_of_fields
-    #
-    # Returns field values per the given +specifiers+, which may be any mixture of:
-    # - \Integer index.
-    # - \Range of \Integer indexes.
-    # - 2-element \Array containing a header and offset.
-    # - Header.
-    # - \Range of headers.
-    #
-    # For +specifier+ in one of the first four cases above,
-    # returns the result of <tt>self.field(specifier)</tt>;  see #field.
-    #
-    # Although there may be any number of +specifiers+,
-    # the examples here will illustrate one at a time.
-    #
-    # When the specifier is an \Integer +index+,
-    # returns <tt>self.field(index)</tt>L
-    #   source = "Name,Name,Name\nFoo,Bar,Baz\n"
-    #   table = CSV.parse(source, headers: true)
-    #   row = table[0]
-    #   row.fields(1) # => ["Bar"]
-    #
-    # When the specifier is a \Range of \Integers +range+,
-    # returns <tt>self.field(range)</tt>:
-    #   row.fields(1..2) # => ["Bar", "Baz"]
-    #
-    # When the specifier is a 2-element \Array +array+,
-    # returns <tt>self.field(array)</tt>L
-    #   row.fields('Name', 1) # => ["Foo", "Bar"]
-    #
-    # When the specifier is a header +header+,
-    # returns <tt>self.field(header)</tt>L
-    #   row.fields('Name') # => ["Foo"]
-    #
-    # When the specifier is a \Range of headers +range+,
-    # forms a new \Range +new_range+ from the indexes of
-    # <tt>range.start</tt> and <tt>range.end</tt>,
-    # and returns <tt>self.field(new_range)</tt>:
-    #   source = "Name,NAME,name\nFoo,Bar,Baz\n"
-    #   table = CSV.parse(source, headers: true)
-    #   row = table[0]
-    #   row.fields('Name'..'NAME') # => ["Foo", "Bar"]
-    #
-    # Returns all fields if no argument given:
-    #   row.fields # => ["Foo", "Bar", "Baz"]
-    def fields(*headers_and_or_indices)
-      if headers_and_or_indices.empty?  # return all fields--no arguments
-        @row.map(&:last)
-      else                              # or work like values_at()
-        all = []
-        headers_and_or_indices.each do |h_or_i|
-          if h_or_i.is_a? Range
-            index_begin = h_or_i.begin.is_a?(Integer) ? h_or_i.begin :
-                                                        index(h_or_i.begin)
-            index_end   = h_or_i.end.is_a?(Integer)   ? h_or_i.end :
-                                                        index(h_or_i.end)
-            new_range   = h_or_i.exclude_end? ? (index_begin...index_end) :
-                                                (index_begin..index_end)
-            all.concat(fields.values_at(new_range))
-          else
-            all << field(*Array(h_or_i))
-          end
-        end
-        return all
-      end
-    end
-    alias_method :values_at, :fields
-
-    # :call-seq:
-    #   index(header) -> index
-    #   index(header, offset) -> index
-    #
-    # Returns the index for the given header, if it exists;
-    # otherwise returns +nil+.
-    #
-    # With the single argument +header+, returns the index
-    # of the first-found field with the given +header+:
-    #   source = "Name,Name,Name\nFoo,Bar,Baz\n"
-    #   table = CSV.parse(source, headers: true)
-    #   row = table[0]
-    #   row.index('Name') # => 0
-    #   row.index('NAME') # => nil
-    #
-    # With arguments +header+ and +offset+,
-    # returns the index of the first-found field with given +header+,
-    # but ignoring the first +offset+ fields:
-    #   row.index('Name', 1) # => 1
-    #   row.index('Name', 3) # => nil
-    def index(header, minimum_index = 0)
-      # find the pair
-      index = headers[minimum_index..-1].index(header)
-      # return the index at the right offset, if we found one
-      index.nil? ? nil : index + minimum_index
-    end
-
-    # :call-seq:
-    #   row.field?(value) -> true or false
-    #
-    # Returns +true+ if +value+ is a field in this row, +false+ otherwise:
-    #   source = "Name,Name,Name\nFoo,Bar,Baz\n"
-    #   table = CSV.parse(source, headers: true)
-    #   row = table[0]
-    #   row.field?('Bar') # => true
-    #   row.field?('BAR') # => false
-    def field?(data)
-      fields.include? data
-    end
-
-    include Enumerable
-
-    # :call-seq:
-    #   row.each {|header, value| ... } -> self
-    #
-    # Calls the block with each header-value pair; returns +self+:
-    #   source = "Name,Name,Name\nFoo,Bar,Baz\n"
-    #   table = CSV.parse(source, headers: true)
-    #   row = table[0]
-    #   row.each {|header, value| p [header, value] }
-    # Output:
-    #   ["Name", "Foo"]
-    #   ["Name", "Bar"]
-    #   ["Name", "Baz"]
-    #
-    # If no block is given, returns a new Enumerator:
-    #   row.each # => #<Enumerator: #<CSV::Row "Name":"Foo" "Name":"Bar" "Name":"Baz">:each>
-    def each(&block)
-      return enum_for(__method__) { size } unless block_given?
-
-      @row.each(&block)
-
-      self  # for chaining
-    end
-
-    alias_method :each_pair, :each
-
-    # :call-seq:
-    #   row == other -> true or false
-    #
-    # Returns +true+ if +other+ is a /CSV::Row that has the same
-    # fields (headers and values) in the same order as +self+;
-    # otherwise returns +false+:
-    #   source = "Name,Name,Name\nFoo,Bar,Baz\n"
-    #   table = CSV.parse(source, headers: true)
-    #   row = table[0]
-    #   other_row = table[0]
-    #   row == other_row # => true
-    #   other_row = table[1]
-    #   row == other_row # => false
-    def ==(other)
-      return @row == other.row if other.is_a? CSV::Row
-      @row == other
-    end
-
-    # :call-seq:
-    #   row.to_h -> hash
-    #
-    # Returns the new \Hash formed by adding each header-value pair in +self+
-    # as a key-value pair in the \Hash.
-    #   source = "Name,Value\nfoo,0\nbar,1\nbaz,2\n"
-    #   table = CSV.parse(source, headers: true)
-    #   row = table[0]
-    #   row.to_h # => {"Name"=>"foo", "Value"=>"0"}
-    #
-    # Header order is preserved, but repeated headers are ignored:
-    #   source = "Name,Name,Name\nFoo,Bar,Baz\n"
-    #   table = CSV.parse(source, headers: true)
-    #   row = table[0]
-    #   row.to_h # => {"Name"=>"Foo"}
-    def to_h
-      hash = {}
-      each do |key, _value|
-        hash[key] = self[key] unless hash.key?(key)
-      end
-      hash
-    end
-    alias_method :to_hash, :to_h
-
-    # :call-seq:
-    #   row.deconstruct_keys(keys) -> hash
-    #
-    # Returns the new \Hash suitable for pattern matching containing only the
-    # keys specified as an argument.
-    def deconstruct_keys(keys)
-      if keys.nil?
-        to_h
-      else
-        keys.to_h { |key| [key, self[key]] }
-      end
-    end
-
-    alias_method :to_ary, :to_a
-
-    # :call-seq:
-    #   row.deconstruct -> array
-    #
-    # Returns the new \Array suitable for pattern matching containing the values
-    # of the row.
-    def deconstruct
-      fields
-    end
-
-    # :call-seq:
-    #   row.to_csv -> csv_string
-    #
-    # Returns the row as a \CSV String. Headers are not included:
-    #   source = "Name,Value\nfoo,0\nbar,1\nbaz,2\n"
-    #   table = CSV.parse(source, headers: true)
-    #   row = table[0]
-    #   row.to_csv # => "foo,0\n"
-    def to_csv(**options)
-      fields.to_csv(**options)
-    end
-    alias_method :to_s, :to_csv
-
-    # :call-seq:
-    #   row.dig(index_or_header, *identifiers) -> object
-    #
-    # Finds and returns the object in nested object that is specified
-    # by +index_or_header+ and +specifiers+.
-    #
-    # The nested objects may be instances of various classes.
-    # See {Dig Methods}[rdoc-ref:dig_methods.rdoc].
-    #
-    # Examples:
-    #   source = "Name,Value\nfoo,0\nbar,1\nbaz,2\n"
-    #   table = CSV.parse(source, headers: true)
-    #   row = table[0]
-    #   row.dig(1) # => "0"
-    #   row.dig('Value') # => "0"
-    #   row.dig(5) # => nil
-    def dig(index_or_header, *indexes)
-      value = field(index_or_header)
-      if value.nil?
-        nil
-      elsif indexes.empty?
-        value
-      else
-        unless value.respond_to?(:dig)
-          raise TypeError, "#{value.class} does not have \#dig method"
-        end
-        value.dig(*indexes)
-      end
-    end
-
-    # :call-seq:
-    #   row.inspect -> string
-    #
-    # Returns an ASCII-compatible \String showing:
-    # - Class \CSV::Row.
-    # - Header-value pairs.
-    # Example:
-    #   source = "Name,Value\nfoo,0\nbar,1\nbaz,2\n"
-    #   table = CSV.parse(source, headers: true)
-    #   row = table[0]
-    #   row.inspect # => "#<CSV::Row \"Name\":\"foo\" \"Value\":\"0\">"
-    def inspect
-      str = ["#<", self.class.to_s]
-      each do |header, field|
-        str << " " << (header.is_a?(Symbol) ? header.to_s : header.inspect) <<
-               ":" << field.inspect
-      end
-      str << ">"
-      begin
-        str.join('')
-      rescue  # any encoding error
-        str.map do |s|
-          e = Encoding::Converter.asciicompat_encoding(s.encoding)
-          e ? s.encode(e) : s.force_encoding("ASCII-8BIT")
-        end.join('')
-      end
-    end
-  end
-end
diff --git a/lib/csv/table.rb b/lib/csv/table.rb
deleted file mode 100644
index fb19f5453f4435..00000000000000
--- a/lib/csv/table.rb
+++ /dev/null
@@ -1,1055 +0,0 @@
-# frozen_string_literal: true
-
-require "forwardable"
-
-class CSV
-  # = \CSV::Table
-  # A \CSV::Table instance represents \CSV data.
-  # (see {class CSV}[../CSV.html]).
-  #
-  # The instance may have:
-  # - Rows: each is a Table::Row object.
-  # - Headers: names for the columns.
-  #
-  # === Instance Methods
-  #
-  # \CSV::Table has three groups of instance methods:
-  # - Its own internally defined instance methods.
-  # - Methods included by module Enumerable.
-  # - Methods delegated to class Array.:
-  #   * Array#empty?
-  #   * Array#length
-  #   * Array#size
-  #
-  # == Creating a \CSV::Table Instance
-  #
-  # Commonly, a new \CSV::Table instance is created by parsing \CSV source
-  # using headers:
-  #   source = "Name,Value\nfoo,0\nbar,1\nbaz,2\n"
-  #   table = CSV.parse(source, headers: true)
-  #   table.class # => CSV::Table
-  #
-  # You can also create an instance directly. See ::new.
-  #
-  # == Headers
-  #
-  # If a table has headers, the headers serve as labels for the columns of data.
-  # Each header serves as the label for its column.
-  #
-  # The headers for a \CSV::Table object are stored as an \Array of Strings.
-  #
-  # Commonly, headers are defined in the first row of \CSV source:
-  #   source = "Name,Value\nfoo,0\nbar,1\nbaz,2\n"
-  #   table = CSV.parse(source, headers: true)
-  #   table.headers # => ["Name", "Value"]
-  #
-  # If no headers are defined, the \Array is empty:
-  #   table = CSV::Table.new([])
-  #   table.headers # => []
-  #
-  # == Access Modes
-  #
-  # \CSV::Table provides three modes for accessing table data:
-  # - \Row mode.
-  # - Column mode.
-  # - Mixed mode (the default for a new table).
-  #
-  # The access mode for a\CSV::Table instance affects the behavior
-  # of some of its instance methods:
-  # - #[]
-  # - #[]=
-  # - #delete
-  # - #delete_if
-  # - #each
-  # - #values_at
-  #
-  # === \Row Mode
-  #
-  # Set a table to row mode with method #by_row!:
-  #   source = "Name,Value\nfoo,0\nbar,1\nbaz,2\n"
-  #   table = CSV.parse(source, headers: true)
-  #   table.by_row! # => #<CSV::Table mode:row row_count:4>
-  #
-  # Specify a single row by an \Integer index:
-  #   # Get a row.
-  #   table[1] # => #<CSV::Row "Name":"bar" "Value":"1">
-  #   # Set a row, then get it.
-  #   table[1] = CSV::Row.new(['Name', 'Value'], ['bam', 3])
-  #   table[1] # => #<CSV::Row "Name":"bam" "Value":3>
-  #
-  # Specify a sequence of rows by a \Range:
-  #   # Get rows.
-  #   table[1..2] # => [#<CSV::Row "Name":"bam" "Value":3>, #<CSV::Row "Name":"baz" "Value":"2">]
-  #   # Set rows, then get them.
-  #   table[1..2] = [
-  #     CSV::Row.new(['Name', 'Value'], ['bat', 4]),
-  #     CSV::Row.new(['Name', 'Value'], ['bad', 5]),
-  #   ]
-  #   table[1..2] # => [["Name", #<CSV::Row "Name":"bat" "Value":4>], ["Value", #<CSV::Row "Name":"bad" "Value":5>]]
-  #
-  # === Column Mode
-  #
-  # Set a table to column mode with method #by_col!:
-  #   source = "Name,Value\nfoo,0\nbar,1\nbaz,2\n"
-  #   table = CSV.parse(source, headers: true)
-  #   table.by_col! # => #<CSV::Table mode:col row_count:4>
-  #
-  # Specify a column by an \Integer index:
-  #   # Get a column.
-  #   table[0]
-  #   # Set a column, then get it.
-  #   table[0] = ['FOO', 'BAR', 'BAZ']
-  #   table[0] # => ["FOO", "BAR", "BAZ"]
-  #
-  # Specify a column by its \String header:
-  #   # Get a column.
-  #   table['Name'] # => ["FOO", "BAR", "BAZ"]
-  #   # Set a column, then get it.
-  #   table['Name'] = ['Foo', 'Bar', 'Baz']
-  #   table['Name'] # => ["Foo", "Bar", "Baz"]
-  #
-  # === Mixed Mode
-  #
-  # In mixed mode, you can refer to either rows or columns:
-  # - An \Integer index refers to a row.
-  # - A \Range index refers to multiple rows.
-  # - A \String index refers to a column.
-  #
-  # Set a table to mixed mode with method #by_col_or_row!:
-  #   source = "Name,Value\nfoo,0\nbar,1\nbaz,2\n"
-  #   table = CSV.parse(source, headers: true)
-  #   table.by_col_or_row! # => #<CSV::Table mode:col_or_row row_count:4>
-  #
-  # Specify a single row by an \Integer index:
-  #   # Get a row.
-  #   table[1] # => #<CSV::Row "Name":"bar" "Value":"1">
-  #   # Set a row, then get it.
-  #   table[1] = CSV::Row.new(['Name', 'Value'], ['bam', 3])
-  #   table[1] # => #<CSV::Row "Name":"bam" "Value":3>
-  #
-  # Specify a sequence of rows by a \Range:
-  #   # Get rows.
-  #   table[1..2] # => [#<CSV::Row "Name":"bam" "Value":3>, #<CSV::Row "Name":"baz" "Value":"2">]
-  #   # Set rows, then get them.
-  #   table[1] = CSV::Row.new(['Name', 'Value'], ['bat', 4])
-  #   table[2] = CSV::Row.new(['Name', 'Value'], ['bad', 5])
-  #   table[1..2] # => [["Name", #<CSV::Row "Name":"bat" "Value":4>], ["Value", #<CSV::Row "Name":"bad" "Value":5>]]
-  #
-  # Specify a column by its \String header:
-  #   # Get a column.
-  #   table['Name'] # => ["foo", "bat", "bad"]
-  #   # Set a column, then get it.
-  #   table['Name'] = ['Foo', 'Bar', 'Baz']
-  #   table['Name'] # => ["Foo", "Bar", "Baz"]
-  class Table
-    # :call-seq:
-    #   CSV::Table.new(array_of_rows, headers = nil) -> csv_table
-    #
-    # Returns a new \CSV::Table object.
-    #
-    # - Argument +array_of_rows+ must be an \Array of CSV::Row objects.
-    # - Argument +headers+, if given, may be an \Array of Strings.
-    #
-    # ---
-    #
-    # Create an empty \CSV::Table object:
-    #   table = CSV::Table.new([])
-    #   table # => #<CSV::Table mode:col_or_row row_count:1>
-    #
-    # Create a non-empty \CSV::Table object:
-    #   rows = [
-    #     CSV::Row.new([], []),
-    #     CSV::Row.new([], []),
-    #     CSV::Row.new([], []),
-    #   ]
-    #   table  = CSV::Table.new(rows)
-    #   table # => #<CSV::Table mode:col_or_row row_count:4>
-    #
-    # ---
-    #
-    # If argument +headers+ is an \Array of Strings,
-    # those Strings become the table's headers:
-    #   table = CSV::Table.new([], headers: ['Name', 'Age'])
-    #   table.headers # => ["Name", "Age"]
-    #
-    # If argument +headers+ is not given and the table has rows,
-    # the headers are taken from the first row:
-    #   rows = [
-    #     CSV::Row.new(['Foo', 'Bar'], []),
-    #     CSV::Row.new(['foo', 'bar'], []),
-    #     CSV::Row.new(['FOO', 'BAR'], []),
-    #   ]
-    #   table  = CSV::Table.new(rows)
-    #   table.headers # => ["Foo", "Bar"]
-    #
-    # If argument +headers+ is not given and the table is empty (has no rows),
-    # the headers are also empty:
-    #   table  = CSV::Table.new([])
-    #   table.headers # => []
-    #
-    # ---
-    #
-    # Raises an exception if argument +array_of_rows+ is not an \Array object:
-    #   # Raises NoMethodError (undefined method `first' for :foo:Symbol):
-    #   CSV::Table.new(:foo)
-    #
-    # Raises an exception if an element of +array_of_rows+ is not a \CSV::Table object:
-    #   # Raises NoMethodError (undefined method `headers' for :foo:Symbol):
-    #   CSV::Table.new([:foo])
-    def initialize(array_of_rows, headers: nil)
-      @table = array_of_rows
-      @headers = headers
-      unless @headers
-        if @table.empty?
-          @headers = []
-        else
-          @headers = @table.first.headers
-        end
-      end
-
-      @mode  = :col_or_row
-    end
-
-    # The current access mode for indexing and iteration.
-    attr_reader :mode
-
-    # Internal data format used to compare equality.
-    attr_reader :table
-    protected   :table
-
-    ### Array Delegation ###
-
-    extend Forwardable
-    def_delegators :@table, :empty?, :length, :size
-
-    # :call-seq:
-    #   table.by_col -> table_dup
-    #
-    # Returns a duplicate of +self+, in column mode
-    # (see {Column Mode}[#class-CSV::Table-label-Column+Mode]):
-    #   source = "Name,Value\nfoo,0\nbar,1\nbaz,2\n"
-    #   table = CSV.parse(source, headers: true)
-    #   table.mode # => :col_or_row
-    #   dup_table = table.by_col
-    #   dup_table.mode # => :col
-    #   dup_table.equal?(table) # => false # It's a dup
-    #
-    # This may be used to chain method calls without changing the mode
-    # (but also will affect performance and memory usage):
-    #   dup_table.by_col['Name']
-    #
-    # Also note that changes to the duplicate table will not affect the original.
-    def by_col
-      self.class.new(@table.dup).by_col!
-    end
-
-    # :call-seq:
-    #   table.by_col! -> self
-    #
-    # Sets the mode for +self+ to column mode
-    # (see {Column Mode}[#class-CSV::Table-label-Column+Mode]); returns +self+:
-    #   source = "Name,Value\nfoo,0\nbar,1\nbaz,2\n"
-    #   table = CSV.parse(source, headers: true)
-    #   table.mode # => :col_or_row
-    #   table1 = table.by_col!
-    #   table.mode # => :col
-    #   table1.equal?(table) # => true # Returned self
-    def by_col!
-      @mode = :col
-
-      self
-    end
-
-    # :call-seq:
-    #   table.by_col_or_row -> table_dup
-    #
-    # Returns a duplicate of +self+, in mixed mode
-    # (see {Mixed Mode}[#class-CSV::Table-label-Mixed+Mode]):
-    #   source = "Name,Value\nfoo,0\nbar,1\nbaz,2\n"
-    #   table = CSV.parse(source, headers: true).by_col!
-    #   table.mode # => :col
-    #   dup_table = table.by_col_or_row
-    #   dup_table.mode # => :col_or_row
-    #   dup_table.equal?(table) # => false # It's a dup
-    #
-    # This may be used to chain method calls without changing the mode
-    # (but also will affect performance and memory usage):
-    #   dup_table.by_col_or_row['Name']
-    #
-    # Also note that changes to the duplicate table will not affect the original.
-    def by_col_or_row
-      self.class.new(@table.dup).by_col_or_row!
-    end
-
-    # :call-seq:
-    #   table.by_col_or_row! -> self
-    #
-    # Sets the mode for +self+ to mixed mode
-    # (see {Mixed Mode}[#class-CSV::Table-label-Mixed+Mode]); returns +self+:
-    #   source = "Name,Value\nfoo,0\nbar,1\nbaz,2\n"
-    #   table = CSV.parse(source, headers: true).by_col!
-    #   table.mode # => :col
-    #   table1 = table.by_col_or_row!
-    #   table.mode # => :col_or_row
-    #   table1.equal?(table) # => true # Returned self
-    def by_col_or_row!
-      @mode = :col_or_row
-
-      self
-    end
-
-    # :call-seq:
-    #   table.by_row -> table_dup
-    #
-    # Returns a duplicate of +self+, in row mode
-    # (see {Row Mode}[#class-CSV::Table-label-Row+Mode]):
-    #   source = "Name,Value\nfoo,0\nbar,1\nbaz,2\n"
-    #   table = CSV.parse(source, headers: true)
-    #   table.mode # => :col_or_row
-    #   dup_table = table.by_row
-    #   dup_table.mode # => :row
-    #   dup_table.equal?(table) # => false # It's a dup
-    #
-    # This may be used to chain method calls without changing the mode
-    # (but also will affect performance and memory usage):
-    #   dup_table.by_row[1]
-    #
-    # Also note that changes to the duplicate table will not affect the original.
-    def by_row
-      self.class.new(@table.dup).by_row!
-    end
-
-    # :call-seq:
-    #   table.by_row! -> self
-    #
-    # Sets the mode for +self+ to row mode
-    # (see {Row Mode}[#class-CSV::Table-label-Row+Mode]); returns +self+:
-    #   source = "Name,Value\nfoo,0\nbar,1\nbaz,2\n"
-    #   table = CSV.parse(source, headers: true)
-    #   table.mode # => :col_or_row
-    #   table1 = table.by_row!
-    #   table.mode # => :row
-    #   table1.equal?(table) # => true # Returned self
-    def by_row!
-      @mode = :row
-
-      self
-    end
-
-    # :call-seq:
-    #   table.headers -> array_of_headers
-    #
-    # Returns a new \Array containing the \String headers for the table.
-    #
-    # If the table is not empty, returns the headers from the first row:
-    #   rows = [
-    #     CSV::Row.new(['Foo', 'Bar'], []),
-    #     CSV::Row.new(['FOO', 'BAR'], []),
-    #     CSV::Row.new(['foo', 'bar'], []),
-    #   ]
-    #   table  = CSV::Table.new(rows)
-    #   table.headers # => ["Foo", "Bar"]
-    #   table.delete(0)
-    #   table.headers # => ["FOO", "BAR"]
-    #   table.delete(0)
-    #   table.headers # => ["foo", "bar"]
-    #
-    # If the table is empty, returns a copy of the headers in the table itself:
-    #   table.delete(0)
-    #   table.headers # => ["Foo", "Bar"]
-    def headers
-      if @table.empty?
-        @headers.dup
-      else
-        @table.first.headers
-      end
-    end
-
-    # :call-seq:
-    #   table[n] -> row or column_data
-    #   table[range] -> array_of_rows or array_of_column_data
-    #   table[header] -> array_of_column_data
-    #
-    # Returns data from the table;  does not modify the table.
-    #
-    # ---
-    #
-    # Fetch a \Row by Its \Integer Index::
-    # - Form: <tt>table[n]</tt>, +n+ an integer.
-    # - Access mode: <tt>:row</tt> or <tt>:col_or_row</tt>.
-    # - Return value: _nth_ row of the table, if that row exists;
-    #   otherwise +nil+.
-    #
-    # Returns the _nth_ row of the table if that row exists:
-    #   source = "Name,Value\nfoo,0\nbar,1\nbaz,2\n"
-    #   table = CSV.parse(source, headers: true)
-    #   table.by_row! # => #<CSV::Table mode:row row_count:4>
-    #   table[1] # => #<CSV::Row "Name":"bar" "Value":"1">
-    #   table.by_col_or_row! # => #<CSV::Table mode:col_or_row row_count:4>
-    #   table[1] # => #<CSV::Row "Name":"bar" "Value":"1">
-    #
-    # Counts backward from the last row if +n+ is negative:
-    #   table[-1] # => #<CSV::Row "Name":"baz" "Value":"2">
-    #
-    # Returns +nil+ if +n+ is too large or too small:
-    #   table[4] # => nil
-    #   table[-4] # => nil
-    #
-    # Raises an exception if the access mode is <tt>:row</tt>
-    # and +n+ is not an \Integer:
-    #   table.by_row! # => #<CSV::Table mode:row row_count:4>
-    #   # Raises TypeError (no implicit conversion of String into Integer):
-    #   table['Name']
-    #
-    # ---
-    #
-    # Fetch a Column by Its \Integer Index::
-    # - Form: <tt>table[n]</tt>, +n+ an \Integer.
-    # - Access mode: <tt>:col</tt>.
-    # - Return value: _nth_ column of the table, if that column exists;
-    #   otherwise an \Array of +nil+ fields of length <tt>self.size</tt>.
-    #
-    # Returns the _nth_ column of the table if that column exists:
-    #   source = "Name,Value\nfoo,0\nbar,1\nbaz,2\n"
-    #   table = CSV.parse(source, headers: true)
-    #   table.by_col! # => #<CSV::Table mode:col row_count:4>
-    #   table[1] # => ["0", "1", "2"]
-    #
-    # Counts backward from the last column if +n+ is negative:
-    #   table[-2] # => ["foo", "bar", "baz"]
-    #
-    # Returns an \Array of +nil+ fields if +n+ is too large or too small:
-    #   table[4] # => [nil, nil, nil]
-    #   table[-4] # => [nil, nil, nil]
-    #
-    # ---
-    #
-    # Fetch Rows by \Range::
-    # - Form: <tt>table[range]</tt>, +range+ a \Range object.
-    # - Access mode: <tt>:row</tt> or <tt>:col_or_row</tt>.
-    # - Return value: rows from the table, beginning at row <tt>range.start</tt>,
-    #   if those rows exists.
-    #
-    # Returns rows from the table, beginning at row <tt>range.first</tt>,
-    # if those rows exist:
-    #   source = "Name,Value\nfoo,0\nbar,1\nbaz,2\n"
-    #   table = CSV.parse(source, headers: true)
-    #   table.by_row! # => #<CSV::Table mode:row row_count:4>
-    #   rows = table[1..2] # => #<CSV::Row "Name":"bar" "Value":"1">
-    #   rows # => [#<CSV::Row "Name":"bar" "Value":"1">, #<CSV::Row "Name":"baz" "Value":"2">]
-    #   table.by_col_or_row! # => #<CSV::Table mode:col_or_row row_count:4>
-    #   rows = table[1..2] # => #<CSV::Row "Name":"bar" "Value":"1">
-    #   rows # => [#<CSV::Row "Name":"bar" "Value":"1">, #<CSV::Row "Name":"baz" "Value":"2">]
-    #
-    # If there are too few rows, returns all from <tt>range.start</tt> to the end:
-    #   rows = table[1..50] # => #<CSV::Row "Name":"bar" "Value":"1">
-    #   rows # => [#<CSV::Row "Name":"bar" "Value":"1">, #<CSV::Row "Name":"baz" "Value":"2">]
-    #
-    # Special case: if <tt>range.start == table.size</tt>, returns an empty \Array:
-    #   table[table.size..50] # => []
-    #
-    # If <tt>range.end</tt> is negative, calculates the ending index from the end:
-    #   rows = table[0..-1]
-    #   rows # => [#<CSV::Row "Name":"foo" "Value":"0">, #<CSV::Row "Name":"bar" "Value":"1">, #<CSV::Row "Name":"baz" "Value":"2">]
-    #
-    # If <tt>range.start</tt> is negative, calculates the starting index from the end:
-    #   rows = table[-1..2]
-    #   rows # => [#<CSV::Row "Name":"baz" "Value":"2">]
-    #
-    # If <tt>range.start</tt> is larger than <tt>table.size</tt>, returns +nil+:
-    #   table[4..4] # => nil
-    #
-    # ---
-    #
-    # Fetch Columns by \Range::
-    # - Form: <tt>table[range]</tt>, +range+ a \Range object.
-    # - Access mode: <tt>:col</tt>.
-    # - Return value: column data from the table, beginning at column <tt>range.start</tt>,
-    #   if those columns exist.
-    #
-    # Returns column values from the table, if the column exists;
-    # the values are arranged by row:
-    #   source = "Name,Value\nfoo,0\nbar,1\nbaz,2\n"
-    #   table = CSV.parse(source, headers: true)
-    #   table.by_col!
-    #   table[0..1] # => [["foo", "0"], ["bar", "1"], ["baz", "2"]]
-    #
-    # Special case: if <tt>range.start == headers.size</tt>,
-    # returns an \Array (size: <tt>table.size</tt>) of empty \Arrays:
-    #   table[table.headers.size..50] # => [[], [], []]
-    #
-    # If <tt>range.end</tt> is negative, calculates the ending index from the end:
-    #   table[0..-1] # => [["foo", "0"], ["bar", "1"], ["baz", "2"]]
-    #
-    # If <tt>range.start</tt> is negative, calculates the starting index from the end:
-    #   table[-2..2] # => [["foo", "0"], ["bar", "1"], ["baz", "2"]]
-    #
-    # If <tt>range.start</tt> is larger than <tt>table.size</tt>,
-    # returns an \Array of +nil+ values:
-    #   table[4..4] # => [nil, nil, nil]
-    #
-    # ---
-    #
-    # Fetch a Column by Its \String Header::
-    # - Form: <tt>table[header]</tt>, +header+ a \String header.
-    # - Access mode: <tt>:col</tt> or <tt>:col_or_row</tt>
-    # - Return value: column data from the table, if that +header+ exists.
-    #
-    # Returns column values from the table, if the column exists:
-    #   source = "Name,Value\nfoo,0\nbar,1\nbaz,2\n"
-    #   table = CSV.parse(source, headers: true)
-    #   table.by_col! # => #<CSV::Table mode:col row_count:4>
-    #   table['Name'] # => ["foo", "bar", "baz"]
-    #   table.by_col_or_row! # => #<CSV::Table mode:col_or_row row_count:4>
-    #   col = table['Name']
-    #   col # => ["foo", "bar", "baz"]
-    #
-    # Modifying the returned column values does not modify the table:
-    #   col[0] = 'bat'
-    #   col # => ["bat", "bar", "baz"]
-    #   table['Name'] # => ["foo", "bar", "baz"]
-    #
-    # Returns an \Array of +nil+ values if there is no such column:
-    #   table['Nosuch'] # => [nil, nil, nil]
-    def [](index_or_header)
-      if @mode == :row or  # by index
-         (@mode == :col_or_row and (index_or_header.is_a?(Integer) or index_or_header.is_a?(Range)))
-        @table[index_or_header]
-      else                 # by header
-        @table.map { |row| row[index_or_header] }
-      end
-    end
-
-    # :call-seq:
-    #   table[n] = row -> row
-    #   table[n] = field_or_array_of_fields -> field_or_array_of_fields
-    #   table[header] = field_or_array_of_fields -> field_or_array_of_fields
-    #
-    # Puts data onto the table.
-    #
-    # ---
-    #
-    # Set a \Row by Its \Integer Index::
-    # - Form: <tt>table[n] = row</tt>, +n+ an \Integer,
-    #   +row+ a \CSV::Row instance or an \Array of fields.
-    # - Access mode: <tt>:row</tt> or <tt>:col_or_row</tt>.
-    # - Return value: +row+.
-    #
-    # If the row exists, it is replaced:
-    #   source = "Name,Value\nfoo,0\nbar,1\nbaz,2\n"
-    #   table = CSV.parse(source, headers: true)
-    #   new_row = CSV::Row.new(['Name', 'Value'], ['bat', 3])
-    #   table.by_row! # => #<CSV::Table mode:row row_count:4>
-    #   return_value = table[0] = new_row
-    #   return_value.equal?(new_row) # => true # Returned the row
-    #   table[0].to_h # => {"Name"=>"bat", "Value"=>3}
-    #
-    # With access mode <tt>:col_or_row</tt>:
-    #   table.by_col_or_row! # => #<CSV::Table mode:col_or_row row_count:4>
-    #   table[0] = CSV::Row.new(['Name', 'Value'], ['bam', 4])
-    #   table[0].to_h # => {"Name"=>"bam", "Value"=>4}
-    #
-    # With an \Array instead of a \CSV::Row, inherits headers from the table:
-    #   array = ['bad', 5]
-    #   return_value = table[0] = array
-    #   return_value.equal?(array) # => true # Returned the array
-    #   table[0].to_h # => {"Name"=>"bad", "Value"=>5}
-    #
-    # If the row does not exist, extends the table by adding rows:
-    # assigns rows with +nil+ as needed:
-    #   table.size # => 3
-    #   table[5] = ['bag', 6]
-    #   table.size # => 6
-    #   table[3] # => nil
-    #   table[4]# => nil
-    #   table[5].to_h # => {"Name"=>"bag", "Value"=>6}
-    #
-    # Note that the +nil+ rows are actually +nil+, not a row of +nil+ fields.
-    #
-    # ---
-    #
-    # Set a Column by Its \Integer Index::
-    # - Form: <tt>table[n] = array_of_fields</tt>, +n+ an \Integer,
-    #   +array_of_fields+ an \Array of \String fields.
-    # - Access mode: <tt>:col</tt>.
-    # - Return value: +array_of_fields+.
-    #
-    # If the column exists, it is replaced:
-    #   source = "Name,Value\nfoo,0\nbar,1\nbaz,2\n"
-    #   table = CSV.parse(source, headers: true)
-    #   new_col = [3, 4, 5]
-    #   table.by_col! # => #<CSV::Table mode:col row_count:4>
-    #   return_value = table[1] = new_col
-    #   return_value.equal?(new_col) # => true # Returned the column
-    #   table[1] # => [3, 4, 5]
-    #   # The rows, as revised:
-    #   table.by_row! # => #<CSV::Table mode:row row_count:4>
-    #   table[0].to_h # => {"Name"=>"foo", "Value"=>3}
-    #   table[1].to_h # => {"Name"=>"bar", "Value"=>4}
-    #   table[2].to_h # => {"Name"=>"baz", "Value"=>5}
-    #   table.by_col! # => #<CSV::Table mode:col row_count:4>
-    #
-    # If there are too few values, fills with +nil+ values:
-    #   table[1] = [0]
-    #   table[1] # => [0, nil, nil]
-    #
-    # If there are too many values, ignores the extra values:
-    #   table[1] = [0, 1, 2, 3, 4]
-    #   table[1] # => [0, 1, 2]
-    #
-    # If a single value is given, replaces all fields in the column with that value:
-    #   table[1] = 'bat'
-    #   table[1] # => ["bat", "bat", "bat"]
-    #
-    # ---
-    #
-    # Set a Column by Its \String Header::
-    # - Form: <tt>table[header] = field_or_array_of_fields</tt>,
-    #   +header+ a \String header, +field_or_array_of_fields+ a field value
-    #   or an \Array of \String fields.
-    # - Access mode: <tt>:col</tt> or <tt>:col_or_row</tt>.
-    # - Return value: +field_or_array_of_fields+.
-    #
-    # If the column exists, it is replaced:
-    #   source = "Name,Value\nfoo,0\nbar,1\nbaz,2\n"
-    #   table = CSV.parse(source, headers: true)
-    #   new_col = [3, 4, 5]
-    #   table.by_col! # => #<CSV::Table mode:col row_count:4>
-    #   return_value = table['Value'] = new_col
-    #   return_value.equal?(new_col) # => true # Returned the column
-    #   table['Value'] # => [3, 4, 5]
-    #   # The rows, as revised:
-    #   table.by_row! # => #<CSV::Table mode:row row_count:4>
-    #   table[0].to_h # => {"Name"=>"foo", "Value"=>3}
-    #   table[1].to_h # => {"Name"=>"bar", "Value"=>4}
-    #   table[2].to_h # => {"Name"=>"baz", "Value"=>5}
-    #   table.by_col! # => #<CSV::Table mode:col row_count:4>
-    #
-    # If there are too few values, fills with +nil+ values:
-    #   table['Value'] = [0]
-    #   table['Value'] # => [0, nil, nil]
-    #
-    # If there are too many values, ignores the extra values:
-    #   table['Value'] = [0, 1, 2, 3, 4]
-    #   table['Value'] # => [0, 1, 2]
-    #
-    # If the column does not exist, extends the table by adding columns:
-    #   table['Note'] = ['x', 'y', 'z']
-    #   table['Note'] # => ["x", "y", "z"]
-    #   # The rows, as revised:
-    #   table.by_row!
-    #   table[0].to_h # => {"Name"=>"foo", "Value"=>0, "Note"=>"x"}
-    #   table[1].to_h # => {"Name"=>"bar", "Value"=>1, "Note"=>"y"}
-    #   table[2].to_h # => {"Name"=>"baz", "Value"=>2, "Note"=>"z"}
-    #   table.by_col!
-    #
-    # If a single value is given, replaces all fields in the column with that value:
-    #   table['Value'] = 'bat'
-    #   table['Value'] # => ["bat", "bat", "bat"]
-    def []=(index_or_header, value)
-      if @mode == :row or  # by index
-         (@mode == :col_or_row and index_or_header.is_a? Integer)
-        if value.is_a? Array
-          @table[index_or_header] = Row.new(headers, value)
-        else
-          @table[index_or_header] = value
-        end
-      else                 # set column
-        unless index_or_header.is_a? Integer
-          index = @headers.index(index_or_header) || @headers.size
-          @headers[index] = index_or_header
-        end
-        if value.is_a? Array  # multiple values
-          @table.each_with_index do |row, i|
-            if row.header_row?
-              row[index_or_header] = index_or_header
-            else
-              row[index_or_header] = value[i]
-            end
-          end
-        else                  # repeated value
-          @table.each do |row|
-            if row.header_row?
-              row[index_or_header] = index_or_header
-            else
-              row[index_or_header] = value
-            end
-          end
-        end
-      end
-    end
-
-    # :call-seq:
-    #   table.values_at(*indexes) -> array_of_rows
-    #   table.values_at(*headers) -> array_of_columns_data
-    #
-    # If the access mode is <tt>:row</tt> or <tt>:col_or_row</tt>,
-    # and each argument is either an \Integer or a \Range,
-    # returns rows.
-    # Otherwise, returns columns data.
-    #
-    # In either case, the returned values are in the order
-    # specified by the arguments.  Arguments may be repeated.
-    #
-    # ---
-    #
-    # Returns rows as an \Array of \CSV::Row objects.
-    #
-    # No argument:
-    #   source = "Name,Value\nfoo,0\nbar,1\nbaz,2\n"
-    #   table = CSV.parse(source, headers: true)
-    #   table.values_at # => []
-    #
-    # One index:
-    #   values = table.values_at(0)
-    #   values # => [#<CSV::Row "Name":"foo" "Value":"0">]
-    #
-    # Two indexes:
-    #   values = table.values_at(2, 0)
-    #   values # => [#<CSV::Row "Name":"baz" "Value":"2">, #<CSV::Row "Name":"foo" "Value":"0">]
-    #
-    # One \Range:
-    #   values = table.values_at(1..2)
-    #   values # => [#<CSV::Row "Name":"bar" "Value":"1">, #<CSV::Row "Name":"baz" "Value":"2">]
-    #
-    # \Ranges and indexes:
-    #   values = table.values_at(0..1, 1..2, 0, 2)
-    #   pp values
-    # Output:
-    #   [#<CSV::Row "Name":"foo" "Value":"0">,
-    #    #<CSV::Row "Name":"bar" "Value":"1">,
-    #    #<CSV::Row "Name":"bar" "Value":"1">,
-    #    #<CSV::Row "Name":"baz" "Value":"2">,
-    #    #<CSV::Row "Name":"foo" "Value":"0">,
-    #    #<CSV::Row "Name":"baz" "Value":"2">]
-    #
-    # ---
-    #
-    # Returns columns data as row Arrays,
-    # each consisting of the specified columns data for that row:
-    #   values = table.values_at('Name')
-    #   values # => [["foo"], ["bar"], ["baz"]]
-    #   values = table.values_at('Value', 'Name')
-    #   values # => [["0", "foo"], ["1", "bar"], ["2", "baz"]]
-    def values_at(*indices_or_headers)
-      if @mode == :row or  # by indices
-         ( @mode == :col_or_row and indices_or_headers.all? do |index|
-                                      index.is_a?(Integer)         or
-                                      ( index.is_a?(Range)         and
-                                        index.first.is_a?(Integer) and
-                                        index.last.is_a?(Integer) )
-                                    end )
-        @table.values_at(*indices_or_headers)
-      else                 # by headers
-        @table.map { |row| row.values_at(*indices_or_headers) }
-      end
-    end
-
-    # :call-seq:
-    #   table << row_or_array -> self
-    #
-    # If +row_or_array+ is a \CSV::Row object,
-    # it is appended to the table:
-    #   source = "Name,Value\nfoo,0\nbar,1\nbaz,2\n"
-    #   table = CSV.parse(source, headers: true)
-    #   table << CSV::Row.new(table.headers, ['bat', 3])
-    #   table[3] # => #<CSV::Row "Name":"bat" "Value":3>
-    #
-    # If +row_or_array+ is an \Array, it is used to create a new
-    # \CSV::Row object which is then appended to the table:
-    #   table << ['bam', 4]
-    #   table[4] # => #<CSV::Row "Name":"bam" "Value":4>
-    def <<(row_or_array)
-      if row_or_array.is_a? Array  # append Array
-        @table << Row.new(headers, row_or_array)
-      else                         # append Row
-        @table << row_or_array
-      end
-
-      self # for chaining
-    end
-
-    #
-    # :call-seq:
-    #   table.push(*rows_or_arrays) -> self
-    #
-    # A shortcut for appending multiple rows. Equivalent to:
-    #   rows.each {|row| self << row }
-    #
-    # Each argument may be either a \CSV::Row object or an \Array:
-    #   source = "Name,Value\nfoo,0\nbar,1\nbaz,2\n"
-    #   table = CSV.parse(source, headers: true)
-    #   rows = [
-    #     CSV::Row.new(table.headers, ['bat', 3]),
-    #     ['bam', 4]
-    #   ]
-    #   table.push(*rows)
-    #   table[3..4] # => [#<CSV::Row "Name":"bat" "Value":3>, #<CSV::Row "Name":"bam" "Value":4>]
-    def push(*rows)
-      rows.each { |row| self << row }
-
-      self # for chaining
-    end
-
-    # :call-seq:
-    #   table.delete(*indexes) -> deleted_values
-    #   table.delete(*headers) -> deleted_values
-    #
-    # If the access mode is <tt>:row</tt> or <tt>:col_or_row</tt>,
-    # and each argument is either an \Integer or a \Range,
-    # returns deleted rows.
-    # Otherwise, returns deleted columns data.
-    #
-    # In either case, the returned values are in the order
-    # specified by the arguments.  Arguments may be repeated.
-    #
-    # ---
-    #
-    # Returns rows as an \Array of \CSV::Row objects.
-    #
-    # One index:
-    #   source = "Name,Value\nfoo,0\nbar,1\nbaz,2\n"
-    #   table = CSV.parse(source, headers: true)
-    #   deleted_values = table.delete(0)
-    #   deleted_values # => [#<CSV::Row "Name":"foo" "Value":"0">]
-    #
-    # Two indexes:
-    #   table = CSV.parse(source, headers: true)
-    #   deleted_values = table.delete(2, 0)
-    #   deleted_values # => [#<CSV::Row "Name":"baz" "Value":"2">, #<CSV::Row "Name":"foo" "Value":"0">]
-    #
-    # ---
-    #
-    # Returns columns data as column Arrays.
-    #
-    # One header:
-    #   table = CSV.parse(source, headers: true)
-    #   deleted_values = table.delete('Name')
-    #   deleted_values # => ["foo", "bar", "baz"]
-    #
-    # Two headers:
-    #   table = CSV.parse(source, headers: true)
-    #   deleted_values = table.delete('Value', 'Name')
-    #   deleted_values # => [["0", "1", "2"], ["foo", "bar", "baz"]]
-    def delete(*indexes_or_headers)
-      if indexes_or_headers.empty?
-        raise ArgumentError, "wrong number of arguments (given 0, expected 1+)"
-      end
-      deleted_values = indexes_or_headers.map do |index_or_header|
-        if @mode == :row or  # by index
-            (@mode == :col_or_row and index_or_header.is_a? Integer)
-          @table.delete_at(index_or_header)
-        else                 # by header
-          if index_or_header.is_a? Integer
-            @headers.delete_at(index_or_header)
-          else
-            @headers.delete(index_or_header)
-          end
-          @table.map { |row| row.delete(index_or_header).last }
-        end
-      end
-      if indexes_or_headers.size == 1
-        deleted_values[0]
-      else
-        deleted_values
-      end
-    end
-
-    # :call-seq:
-    #   table.delete_if {|row_or_column| ... } -> self
-    #
-    # Removes rows or columns for which the block returns a truthy value;
-    # returns +self+.
-    #
-    # Removes rows when the access mode is <tt>:row</tt> or <tt>:col_or_row</tt>;
-    # calls the block with each \CSV::Row object:
-    #   source = "Name,Value\nfoo,0\nbar,1\nbaz,2\n"
-    #   table = CSV.parse(source, headers: true)
-    #   table.by_row! # => #<CSV::Table mode:row row_count:4>
-    #   table.size # => 3
-    #   table.delete_if {|row| row['Name'].start_with?('b') }
-    #   table.size # => 1
-    #
-    # Removes columns when the access mode is <tt>:col</tt>;
-    # calls the block with each column as a 2-element array
-    # containing the header and an \Array of column fields:
-    #   source = "Name,Value\nfoo,0\nbar,1\nbaz,2\n"
-    #   table = CSV.parse(source, headers: true)
-    #   table.by_col! # => #<CSV::Table mode:col row_count:4>
-    #   table.headers.size # => 2
-    #   table.delete_if {|column_data| column_data[1].include?('2') }
-    #   table.headers.size # => 1
-    #
-    # Returns a new \Enumerator if no block is given:
-    #   source = "Name,Value\nfoo,0\nbar,1\nbaz,2\n"
-    #   table = CSV.parse(source, headers: true)
-    #   table.delete_if # => #<Enumerator: #<CSV::Table mode:col_or_row row_count:4>:delete_if>
-    def delete_if(&block)
-      return enum_for(__method__) { @mode == :row or @mode == :col_or_row ? size : headers.size } unless block_given?
-
-      if @mode == :row or @mode == :col_or_row  # by index
-        @table.delete_if(&block)
-      else                                      # by header
-        headers.each do |header|
-          delete(header) if yield([header, self[header]])
-        end
-      end
-
-      self # for chaining
-    end
-
-    include Enumerable
-
-    # :call-seq:
-    #  table.each {|row_or_column| ... ) -> self
-    #
-    # Calls the block with each row or column; returns +self+.
-    #
-    # When the access mode is <tt>:row</tt> or <tt>:col_or_row</tt>,
-    # calls the block with each \CSV::Row object:
-    #   source = "Name,Value\nfoo,0\nbar,1\nbaz,2\n"
-    #   table = CSV.parse(source, headers: true)
-    #   table.by_row! # => #<CSV::Table mode:row row_count:4>
-    #   table.each {|row| p row }
-    # Output:
-    #   #<CSV::Row "Name":"foo" "Value":"0">
-    #   #<CSV::Row "Name":"bar" "Value":"1">
-    #   #<CSV::Row "Name":"baz" "Value":"2">
-    #
-    # When the access mode is <tt>:col</tt>,
-    # calls the block with each column as a 2-element array
-    # containing the header and an \Array of column fields:
-    #   table.by_col! # => #<CSV::Table mode:col row_count:4>
-    #   table.each {|column_data| p column_data }
-    # Output:
-    #   ["Name", ["foo", "bar", "baz"]]
-    #   ["Value", ["0", "1", "2"]]
-    #
-    # Returns a new \Enumerator if no block is given:
-    #   table.each # => #<Enumerator: #<CSV::Table mode:col row_count:4>:each>
-    def each(&block)
-      return enum_for(__method__) { @mode == :col ? headers.size : size } unless block_given?
-
-      if @mode == :col
-        headers.each.with_index do |header, i|
-          yield([header, @table.map {|row| row[header, i]}])
-        end
-      else
-        @table.each(&block)
-      end
-
-      self # for chaining
-    end
-
-    # :call-seq:
-    #   table == other_table -> true or false
-    #
-    # Returns +true+ if all each row of +self+ <tt>==</tt>
-    # the corresponding row of +other_table+, otherwise, +false+.
-    #
-    # The access mode does no affect the result.
-    #
-    # Equal tables:
-    #   source = "Name,Value\nfoo,0\nbar,1\nbaz,2\n"
-    #   table = CSV.parse(source, headers: true)
-    #   other_table = CSV.parse(source, headers: true)
-    #   table == other_table # => true
-    #
-    # Different row count:
-    #   other_table.delete(2)
-    #   table == other_table # => false
-    #
-    # Different last row:
-    #   other_table << ['bat', 3]
-    #   table == other_table # => false
-    def ==(other)
-      return @table == other.table if other.is_a? CSV::Table
-      @table == other
-    end
-
-    # :call-seq:
-    #   table.to_a -> array_of_arrays
-    #
-    # Returns the table as an \Array of \Arrays;
-    # the headers are in the first row:
-    #   source = "Name,Value\nfoo,0\nbar,1\nbaz,2\n"
-    #   table = CSV.parse(source, headers: true)
-    #   table.to_a # => [["Name", "Value"], ["foo", "0"], ["bar", "1"], ["baz", "2"]]
-    def to_a
-      array = [headers]
-      @table.each do |row|
-        array.push(row.fields) unless row.header_row?
-      end
-
-      array
-    end
-
-    # :call-seq:
-    #   table.to_csv(**options) -> csv_string
-    #
-    # Returns the table as \CSV string.
-    # See {Options for Generating}[../CSV.html#class-CSV-label-Options+for+Generating].
-    #
-    # Defaults option +write_headers+ to +true+:
-    #   source = "Name,Value\nfoo,0\nbar,1\nbaz,2\n"
-    #   table = CSV.parse(source, headers: true)
-    #   table.to_csv # => "Name,Value\nfoo,0\nbar,1\nbaz,2\n"
-    #
-    # Omits the headers if option +write_headers+ is given as +false+
-    # (see {Option +write_headers+}[../CSV.html#class-CSV-label-Option+write_headers]):
-    #   table.to_csv(write_headers: false) # => "foo,0\nbar,1\nbaz,2\n"
-    #
-    # Limit rows if option +limit+ is given like +2+:
-    #   table.to_csv(limit: 2) # => "Name,Value\nfoo,0\nbar,1\n"
-    def to_csv(write_headers: true, limit: nil, **options)
-      array = write_headers ? [headers.to_csv(**options)] : []
-      limit ||= @table.size
-      limit = @table.size + 1 + limit if limit < 0
-      limit = 0 if limit < 0
-      @table.first(limit).each do |row|
-        array.push(row.fields.to_csv(**options)) unless row.header_row?
-      end
-
-      array.join("")
-    end
-    alias_method :to_s, :to_csv
-
-    #
-    # Extracts the nested value specified by the sequence of +index+ or +header+ objects by calling dig at each step,
-    # returning nil if any intermediate step is nil.
-    #
-    def dig(index_or_header, *index_or_headers)
-      value = self[index_or_header]
-      if value.nil?
-        nil
-      elsif index_or_headers.empty?
-        value
-      else
-        unless value.respond_to?(:dig)
-          raise TypeError, "#{value.class} does not have \#dig method"
-        end
-        value.dig(*index_or_headers)
-      end
-    end
-
-    # :call-seq:
-    #   table.inspect => string
-    #
-    # Returns a <tt>US-ASCII</tt>-encoded \String showing table:
-    # - Class: <tt>CSV::Table</tt>.
-    # - Access mode: <tt>:row</tt>, <tt>:col</tt>, or <tt>:col_or_row</tt>.
-    # - Size:  Row count, including the header row.
-    #
-    # Example:
-    #   source = "Name,Value\nfoo,0\nbar,1\nbaz,2\n"
-    #   table = CSV.parse(source, headers: true)
-    #   table.inspect # => "#<CSV::Table mode:col_or_row row_count:4>\nName,Value\nfoo,0\nbar,1\nbaz,2\n"
-    #
-    def inspect
-      inspected = +"#<#{self.class} mode:#{@mode} row_count:#{to_a.size}>"
-      summary = to_csv(limit: 5)
-      inspected << "\n" << summary if summary.encoding.ascii_compatible?
-      inspected
-    end
-  end
-end
diff --git a/lib/csv/version.rb b/lib/csv/version.rb
deleted file mode 100644
index 9c65803a34e35c..00000000000000
--- a/lib/csv/version.rb
+++ /dev/null
@@ -1,6 +0,0 @@
-# frozen_string_literal: true
-
-class CSV
-  # The version of the installed library.
-  VERSION = "3.2.8"
-end
diff --git a/lib/csv/writer.rb b/lib/csv/writer.rb
deleted file mode 100644
index 030a295bc9adc0..00000000000000
--- a/lib/csv/writer.rb
+++ /dev/null
@@ -1,210 +0,0 @@
-# frozen_string_literal: true
-
-require_relative "input_record_separator"
-require_relative "row"
-
-class CSV
-  # Note: Don't use this class directly. This is an internal class.
-  class Writer
-    #
-    # A CSV::Writer receives an output, prepares the header, format and output.
-    # It allows us to write new rows in the object and rewind it.
-    #
-    attr_reader :lineno
-    attr_reader :headers
-
-    def initialize(output, options)
-      @output = output
-      @options = options
-      @lineno = 0
-      @fields_converter = nil
-      prepare
-      if @options[:write_headers] and @headers
-        self << @headers
-      end
-      @fields_converter = @options[:fields_converter]
-    end
-
-    #
-    # Adds a new row
-    #
-    def <<(row)
-      case row
-      when Row
-        row = row.fields
-      when Hash
-        row = @headers.collect {|header| row[header]}
-      end
-
-      @headers ||= row if @use_headers
-      @lineno += 1
-
-      if @fields_converter
-        quoted_fields = [false] * row.size
-        row = @fields_converter.convert(row, nil, lineno, quoted_fields)
-      end
-
-      i = -1
-      converted_row = row.collect do |field|
-        i += 1
-        quote(field, i)
-      end
-      line = converted_row.join(@column_separator) + @row_separator
-      if @output_encoding
-        line = line.encode(@output_encoding)
-      end
-      @output << line
-
-      self
-    end
-
-    #
-    # Winds back to the beginning
-    #
-    def rewind
-      @lineno = 0
-      @headers = nil if @options[:headers].nil?
-    end
-
-    private
-    def prepare
-      @encoding = @options[:encoding]
-
-      prepare_header
-      prepare_format
-      prepare_output
-    end
-
-    def prepare_header
-      headers = @options[:headers]
-      case headers
-      when Array
-        @headers = headers
-        @use_headers = true
-      when String
-        @headers = CSV.parse_line(headers,
-                                  col_sep: @options[:column_separator],
-                                  row_sep: @options[:row_separator],
-                                  quote_char: @options[:quote_character])
-        @use_headers = true
-      when true
-        @headers = nil
-        @use_headers = true
-      else
-        @headers = nil
-        @use_headers = false
-      end
-      return unless @headers
-
-      converter = @options[:header_fields_converter]
-      @headers = converter.convert(@headers, nil, 0, [])
-      @headers.each do |header|
-        header.freeze if header.is_a?(String)
-      end
-    end
-
-    def prepare_force_quotes_fields(force_quotes)
-      @force_quotes_fields = {}
-      force_quotes.each do |name_or_index|
-        case name_or_index
-        when Integer
-          index = name_or_index
-          @force_quotes_fields[index] = true
-        when String, Symbol
-          name = name_or_index.to_s
-          if @headers.nil?
-            message = ":headers is required when you use field name " +
-                      "in :force_quotes: " +
-                      "#{name_or_index.inspect}: #{force_quotes.inspect}"
-            raise ArgumentError, message
-          end
-          index = @headers.index(name)
-          next if index.nil?
-          @force_quotes_fields[index] = true
-        else
-          message = ":force_quotes element must be " +
-                    "field index or field name: " +
-                    "#{name_or_index.inspect}: #{force_quotes.inspect}"
-          raise ArgumentError, message
-        end
-      end
-    end
-
-    def prepare_format
-      @column_separator = @options[:column_separator].to_s.encode(@encoding)
-      row_separator = @options[:row_separator]
-      if row_separator == :auto
-        @row_separator = InputRecordSeparator.value.encode(@encoding)
-      else
-        @row_separator = row_separator.to_s.encode(@encoding)
-      end
-      @quote_character = @options[:quote_character]
-      force_quotes = @options[:force_quotes]
-      if force_quotes.is_a?(Array)
-        prepare_force_quotes_fields(force_quotes)
-        @force_quotes = false
-      elsif force_quotes
-        @force_quotes_fields = nil
-        @force_quotes = true
-      else
-        @force_quotes_fields = nil
-        @force_quotes = false
-      end
-      unless @force_quotes
-        @quotable_pattern =
-          Regexp.new("[\r\n".encode(@encoding) +
-                     Regexp.escape(@column_separator) +
-                     Regexp.escape(@quote_character.encode(@encoding)) +
-                     "]".encode(@encoding))
-      end
-      @quote_empty = @options.fetch(:quote_empty, true)
-    end
-
-    def prepare_output
-      @output_encoding = nil
-      return unless @output.is_a?(StringIO)
-
-      output_encoding = @output.internal_encoding || @output.external_encoding
-      if @encoding != output_encoding
-        if @options[:force_encoding]
-          @output_encoding = output_encoding
-        else
-          compatible_encoding = Encoding.compatible?(@encoding, output_encoding)
-          if compatible_encoding
-            @output.set_encoding(compatible_encoding)
-            @output.seek(0, IO::SEEK_END)
-          end
-        end
-      end
-    end
-
-    def quote_field(field)
-      field = String(field)
-      encoded_quote_character = @quote_character.encode(field.encoding)
-      encoded_quote_character +
-        field.gsub(encoded_quote_character,
-                   encoded_quote_character * 2) +
-        encoded_quote_character
-    end
-
-    def quote(field, i)
-      if @force_quotes
-        quote_field(field)
-      elsif @force_quotes_fields and @force_quotes_fields[i]
-        quote_field(field)
-      else
-        if field.nil?  # represent +nil+ fields as empty unquoted fields
-          ""
-        else
-          field = String(field)  # Stringify fields
-          # represent empty fields as empty quoted fields
-          if (@quote_empty and field.empty?) or (field.valid_encoding? and @quotable_pattern.match?(field))
-            quote_field(field)
-          else
-            field  # unquoted field
-          end
-        end
-      end
-    end
-  end
-end
diff --git a/lib/delegate.gemspec b/lib/delegate.gemspec
index 6c3feac74b505a..f7fcc1ceb9d20e 100644
--- a/lib/delegate.gemspec
+++ b/lib/delegate.gemspec
@@ -25,5 +25,5 @@ Gem::Specification.new do |spec|
     `git ls-files -z 2>#{IO::NULL}`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   end
   spec.require_paths = ["lib"]
-  spec.required_ruby_version = '>= 2.7'
+  spec.required_ruby_version = '>= 3.0'
 end
diff --git a/lib/delegate.rb b/lib/delegate.rb
index 387a5f063ddb84..824d02f28b0946 100644
--- a/lib/delegate.rb
+++ b/lib/delegate.rb
@@ -39,7 +39,7 @@
 # Be advised, RDoc will not detect delegated methods.
 #
 class Delegator < BasicObject
-  VERSION = "0.3.0"
+  VERSION = "0.4.0"
 
   kernel = ::Kernel.dup
   kernel.class_eval do
@@ -186,7 +186,7 @@ def !
   # method calls are being delegated to.
   #
   def __getobj__
-    __raise__ ::NotImplementedError, "need to define `__getobj__'"
+    __raise__ ::NotImplementedError, "need to define '__getobj__'"
   end
 
   #
@@ -194,7 +194,7 @@ def __getobj__
   # to _obj_.
   #
   def __setobj__(obj)
-    __raise__ ::NotImplementedError, "need to define `__setobj__'"
+    __raise__ ::NotImplementedError, "need to define '__setobj__'"
   end
 
   #
diff --git a/lib/did_you_mean.rb b/lib/did_you_mean.rb
index e177665099a3ee..74cd1760425510 100644
--- a/lib/did_you_mean.rb
+++ b/lib/did_you_mean.rb
@@ -113,30 +113,6 @@ def self.correct_error(error_class, spell_checker)
   correct_error LoadError, RequirePathChecker if RUBY_VERSION >= '2.8.0'
   correct_error NoMatchingPatternKeyError, PatternKeyNameChecker if defined?(::NoMatchingPatternKeyError)
 
-  # TODO: Remove on the 3.4 development start:
-  class DeprecatedMapping # :nodoc:
-    def []=(key, value)
-      warn "Calling `DidYouMean::SPELL_CHECKERS[#{key.to_s}] = #{value.to_s}' has been deprecated. " \
-           "Please call `DidYouMean.correct_error(#{key.to_s}, #{value.to_s})' instead."
-
-      DidYouMean.correct_error(key, value)
-    end
-
-    def merge!(hash)
-      warn "Calling `DidYouMean::SPELL_CHECKERS.merge!(error_name => spell_checker)' has been deprecated. " \
-           "Please call `DidYouMean.correct_error(error_name, spell_checker)' instead."
-
-      hash.each do |error_class, spell_checker|
-        DidYouMean.correct_error(error_class, spell_checker)
-      end
-    end
-  end
-
-  # TODO: Remove on the 3.4 development start:
-  SPELL_CHECKERS = DeprecatedMapping.new
-  deprecate_constant :SPELL_CHECKERS
-  private_constant :DeprecatedMapping
-
   # Returns the currently set formatter. By default, it is set to +DidYouMean::Formatter+.
   def self.formatter
     if defined?(Ractor)
diff --git a/lib/did_you_mean/did_you_mean.gemspec b/lib/did_you_mean/did_you_mean.gemspec
index 8fe57231297dce..be4ac76b4beb84 100644
--- a/lib/did_you_mean/did_you_mean.gemspec
+++ b/lib/did_you_mean/did_you_mean.gemspec
@@ -22,6 +22,4 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.required_ruby_version = '>= 2.5.0'
-
-  spec.add_development_dependency "rake"
 end
diff --git a/lib/did_you_mean/jaro_winkler.rb b/lib/did_you_mean/jaro_winkler.rb
index 56db130af45993..9a3e57f6d7214d 100644
--- a/lib/did_you_mean/jaro_winkler.rb
+++ b/lib/did_you_mean/jaro_winkler.rb
@@ -8,8 +8,7 @@ def distance(str1, str2)
 
       m          = 0.0
       t          = 0.0
-      range      = (length2 / 2).floor - 1
-      range      = 0 if range < 0
+      range      = length2 > 3 ? length2 / 2 - 1 : 0
       flags1     = 0
       flags2     = 0
 
@@ -72,10 +71,8 @@ def distance(str1, str2)
         codepoints2  = str2.codepoints
         prefix_bonus = 0
 
-        i = 0
         str1.each_codepoint do |char1|
-          char1 == codepoints2[i] && i < 4 ? prefix_bonus += 1 : break
-          i += 1
+          char1 == codepoints2[prefix_bonus] && prefix_bonus < 4 ? prefix_bonus += 1 : break
         end
 
         jaro_distance + (prefix_bonus * WEIGHT * (1 - jaro_distance))
diff --git a/lib/did_you_mean/spell_checkers/key_error_checker.rb b/lib/did_you_mean/spell_checkers/key_error_checker.rb
index be4bea7789c379..955bff1be63fd0 100644
--- a/lib/did_you_mean/spell_checkers/key_error_checker.rb
+++ b/lib/did_you_mean/spell_checkers/key_error_checker.rb
@@ -14,7 +14,15 @@ def corrections
     private
 
     def exact_matches
-      @exact_matches ||= @keys.select { |word| @key == word.to_s }.map(&:inspect)
+      @exact_matches ||= @keys.select { |word| @key == word.to_s }.map { |obj| format_object(obj) }
+    end
+
+    def format_object(symbol_or_object)
+      if symbol_or_object.is_a?(Symbol)
+        ":#{symbol_or_object}"
+      else
+        symbol_or_object.to_s
+      end
     end
   end
 end
diff --git a/lib/did_you_mean/spell_checkers/pattern_key_name_checker.rb b/lib/did_you_mean/spell_checkers/pattern_key_name_checker.rb
index ed263c8f937320..622d4dee258cb8 100644
--- a/lib/did_you_mean/spell_checkers/pattern_key_name_checker.rb
+++ b/lib/did_you_mean/spell_checkers/pattern_key_name_checker.rb
@@ -14,7 +14,15 @@ def corrections
     private
 
     def exact_matches
-      @exact_matches ||= @keys.select { |word| @key == word.to_s }.map(&:inspect)
+      @exact_matches ||= @keys.select { |word| @key == word.to_s }.map { |obj| format_object(obj) }
+    end
+
+    def format_object(symbol_or_object)
+      if symbol_or_object.is_a?(Symbol)
+        ":#{symbol_or_object}"
+      else
+        symbol_or_object.to_s
+      end
     end
   end
 end
diff --git a/lib/did_you_mean/version.rb b/lib/did_you_mean/version.rb
index 5745ca1efd838e..85d80e423003dc 100644
--- a/lib/did_you_mean/version.rb
+++ b/lib/did_you_mean/version.rb
@@ -1,3 +1,3 @@
 module DidYouMean
-  VERSION = "1.6.3".freeze
+  VERSION = "2.0.0".freeze
 end
diff --git a/lib/drb.rb b/lib/drb.rb
deleted file mode 100644
index 2bb4716fa22d2a..00000000000000
--- a/lib/drb.rb
+++ /dev/null
@@ -1,3 +0,0 @@
-# frozen_string_literal: false
-require 'drb/drb'
-
diff --git a/lib/drb/acl.rb b/lib/drb/acl.rb
deleted file mode 100644
index b004656f09dc44..00000000000000
--- a/lib/drb/acl.rb
+++ /dev/null
@@ -1,239 +0,0 @@
-# frozen_string_literal: false
-# Copyright (c) 2000,2002,2003 Masatoshi SEKI
-#
-# acl.rb is copyrighted free software by Masatoshi SEKI.
-# You can redistribute it and/or modify it under the same terms as Ruby.
-
-require 'ipaddr'
-
-##
-# Simple Access Control Lists.
-#
-# Access control lists are composed of "allow" and "deny" halves to control
-# access.  Use "all" or "*" to match any address.  To match a specific address
-# use any address or address mask that IPAddr can understand.
-#
-# Example:
-#
-#   list = %w[
-#     deny all
-#     allow 192.168.1.1
-#     allow ::ffff:192.168.1.2
-#     allow 192.168.1.3
-#   ]
-#
-#   # From Socket#peeraddr, see also ACL#allow_socket?
-#   addr = ["AF_INET", 10, "lc630", "192.168.1.3"]
-#
-#   acl = ACL.new
-#   p acl.allow_addr?(addr) # => true
-#
-#   acl = ACL.new(list, ACL::DENY_ALLOW)
-#   p acl.allow_addr?(addr) # => true
-
-class ACL
-
-  ##
-  # The current version of ACL
-
-  VERSION=["2.0.0"]
-
-  ##
-  # An entry in an ACL
-
-  class ACLEntry
-
-    ##
-    # Creates a new entry using +str+.
-    #
-    # +str+ may be "*" or "all" to match any address, an IP address string
-    # to match a specific address, an IP address mask per IPAddr, or one
-    # containing "*" to match part of an IPv4 address.
-    #
-    # IPAddr::InvalidPrefixError may be raised when an IP network
-    # address with an invalid netmask/prefix is given.
-
-    def initialize(str)
-      if str == '*' or str == 'all'
-        @pat = [:all]
-      elsif str.include?('*')
-        @pat = [:name, dot_pat(str)]
-      else
-        begin
-          @pat = [:ip, IPAddr.new(str)]
-        rescue IPAddr::InvalidPrefixError
-          # In this case, `str` shouldn't be a host name pattern
-          # because it contains a slash.
-          raise
-        rescue ArgumentError
-          @pat = [:name, dot_pat(str)]
-        end
-      end
-    end
-
-    private
-
-    ##
-    # Creates a regular expression to match IPv4 addresses
-
-    def dot_pat_str(str)
-      list = str.split('.').collect { |s|
-        (s == '*') ? '.+' : s
-      }
-      list.join("\\.")
-    end
-
-    private
-
-    ##
-    # Creates a Regexp to match an address.
-
-    def dot_pat(str)
-      /\A#{dot_pat_str(str)}\z/
-    end
-
-    public
-
-    ##
-    # Matches +addr+ against this entry.
-
-    def match(addr)
-      case @pat[0]
-      when :all
-        true
-      when :ip
-        begin
-          ipaddr = IPAddr.new(addr[3])
-          ipaddr = ipaddr.ipv4_mapped if @pat[1].ipv6? && ipaddr.ipv4?
-        rescue ArgumentError
-          return false
-        end
-        (@pat[1].include?(ipaddr)) ? true : false
-      when :name
-        (@pat[1] =~ addr[2]) ? true : false
-      else
-        false
-      end
-    end
-  end
-
-  ##
-  # A list of ACLEntry objects.  Used to implement the allow and deny halves
-  # of an ACL
-
-  class ACLList
-
-    ##
-    # Creates an empty ACLList
-
-    def initialize
-      @list = []
-    end
-
-    public
-
-    ##
-    # Matches +addr+ against each ACLEntry in this list.
-
-    def match(addr)
-      @list.each do |e|
-        return true if e.match(addr)
-      end
-      false
-    end
-
-    public
-
-    ##
-    # Adds +str+ as an ACLEntry in this list
-
-    def add(str)
-      @list.push(ACLEntry.new(str))
-    end
-
-  end
-
-  ##
-  # Default to deny
-
-  DENY_ALLOW = 0
-
-  ##
-  # Default to allow
-
-  ALLOW_DENY = 1
-
-  ##
-  # Creates a new ACL from +list+ with an evaluation +order+ of DENY_ALLOW or
-  # ALLOW_DENY.
-  #
-  # An ACL +list+ is an Array of "allow" or "deny" and an address or address
-  # mask or "all" or "*" to match any address:
-  #
-  #   %w[
-  #     deny all
-  #     allow 192.0.2.2
-  #     allow 192.0.2.128/26
-  #   ]
-
-  def initialize(list=nil, order = DENY_ALLOW)
-    @order = order
-    @deny = ACLList.new
-    @allow = ACLList.new
-    install_list(list) if list
-  end
-
-  public
-
-  ##
-  # Allow connections from Socket +soc+?
-
-  def allow_socket?(soc)
-    allow_addr?(soc.peeraddr)
-  end
-
-  public
-
-  ##
-  # Allow connections from addrinfo +addr+?  It must be formatted like
-  # Socket#peeraddr:
-  #
-  #   ["AF_INET", 10, "lc630", "192.0.2.1"]
-
-  def allow_addr?(addr)
-    case @order
-    when DENY_ALLOW
-      return true if @allow.match(addr)
-      return false if @deny.match(addr)
-      return true
-    when ALLOW_DENY
-      return false if @deny.match(addr)
-      return true if @allow.match(addr)
-      return false
-    else
-      false
-    end
-  end
-
-  public
-
-  ##
-  # Adds +list+ of ACL entries to this ACL.
-
-  def install_list(list)
-    i = 0
-    while i < list.size
-      permission, domain = list.slice(i,2)
-      case permission.downcase
-      when 'allow'
-        @allow.add(domain)
-      when 'deny'
-        @deny.add(domain)
-      else
-        raise "Invalid ACL entry #{list}"
-      end
-      i += 2
-    end
-  end
-
-end
diff --git a/lib/drb/drb.gemspec b/lib/drb/drb.gemspec
deleted file mode 100644
index c9d7e40a514479..00000000000000
--- a/lib/drb/drb.gemspec
+++ /dev/null
@@ -1,43 +0,0 @@
-begin
-  require_relative "lib/drb/version"
-rescue LoadError # Fallback to load version file in ruby core repository
-  require_relative "version"
-end
-
-Gem::Specification.new do |spec|
-  spec.name          = "drb"
-  spec.version       = DRb::VERSION
-  spec.authors       = ["Masatoshi SEKI"]
-  spec.email         = ["seki@ruby-lang.org"]
-
-  spec.summary       = %q{Distributed object system for Ruby}
-  spec.description   = %q{Distributed object system for Ruby}
-  spec.homepage      = "https://github.com/ruby/drb"
-  spec.required_ruby_version = Gem::Requirement.new(">= 2.7.0")
-  spec.licenses      = ["Ruby", "BSD-2-Clause"]
-
-  spec.metadata["homepage_uri"] = spec.homepage
-  spec.metadata["source_code_uri"] = spec.homepage
-
-  spec.files         = %w[
-    LICENSE.txt
-    drb.gemspec
-    lib/drb.rb
-    lib/drb/acl.rb
-    lib/drb/drb.rb
-    lib/drb/eq.rb
-    lib/drb/extserv.rb
-    lib/drb/extservm.rb
-    lib/drb/gw.rb
-    lib/drb/invokemethod.rb
-    lib/drb/observer.rb
-    lib/drb/ssl.rb
-    lib/drb/timeridconv.rb
-    lib/drb/unix.rb
-    lib/drb/version.rb
-    lib/drb/weakidconv.rb
-  ]
-  spec.require_paths = ["lib"]
-
-  spec.add_dependency "ruby2_keywords"
-end
diff --git a/lib/drb/drb.rb b/lib/drb/drb.rb
deleted file mode 100644
index 23181bb8342ba9..00000000000000
--- a/lib/drb/drb.rb
+++ /dev/null
@@ -1,1942 +0,0 @@
-# frozen_string_literal: false
-#
-# = drb/drb.rb
-#
-# Distributed Ruby: _dRuby_ version 2.0.4
-#
-# Copyright (c) 1999-2003 Masatoshi SEKI.  You can redistribute it and/or
-# modify it under the same terms as Ruby.
-#
-# Author:: Masatoshi SEKI
-#
-# Documentation:: William Webber (william@williamwebber.com)
-#
-# == Overview
-#
-# dRuby is a distributed object system for Ruby.  It allows an object in one
-# Ruby process to invoke methods on an object in another Ruby process on the
-# same or a different machine.
-#
-# The Ruby standard library contains the core classes of the dRuby package.
-# However, the full package also includes access control lists and the
-# Rinda tuple-space distributed task management system, as well as a
-# large number of samples.  The full dRuby package can be downloaded from
-# the dRuby home page (see *References*).
-#
-# For an introduction and examples of usage see the documentation to the
-# DRb module.
-#
-# == References
-#
-# [http://www2a.biglobe.ne.jp/~seki/ruby/druby.html]
-#    The dRuby home page, in Japanese.  Contains the full dRuby package
-#    and links to other Japanese-language sources.
-#
-# [http://www2a.biglobe.ne.jp/~seki/ruby/druby.en.html]
-#    The English version of the dRuby home page.
-#
-# [http://pragprog.com/book/sidruby/the-druby-book]
-#    The dRuby Book: Distributed and Parallel Computing with Ruby
-#    by Masatoshi Seki and Makoto Inoue
-#
-# [http://www.ruby-doc.org/docs/ProgrammingRuby/html/ospace.html]
-#   The chapter from *Programming* *Ruby* by Dave Thomas and Andy Hunt
-#   which discusses dRuby.
-#
-# [http://www.clio.ne.jp/home/web-i31s/Flotuard/Ruby/PRC2K_seki/dRuby.en.html]
-#   Translation of presentation on Ruby by Masatoshi Seki.
-
-require 'socket'
-require 'io/wait'
-require 'monitor'
-require_relative 'eq'
-
-#
-# == Overview
-#
-# dRuby is a distributed object system for Ruby.  It is written in
-# pure Ruby and uses its own protocol.  No add-in services are needed
-# beyond those provided by the Ruby runtime, such as TCP sockets.  It
-# does not rely on or interoperate with other distributed object
-# systems such as CORBA, RMI, or .NET.
-#
-# dRuby allows methods to be called in one Ruby process upon a Ruby
-# object located in another Ruby process, even on another machine.
-# References to objects can be passed between processes.  Method
-# arguments and return values are dumped and loaded in marshalled
-# format.  All of this is done transparently to both the caller of the
-# remote method and the object that it is called upon.
-#
-# An object in a remote process is locally represented by a
-# DRb::DRbObject instance.  This acts as a sort of proxy for the
-# remote object.  Methods called upon this DRbObject instance are
-# forwarded to its remote object.  This is arranged dynamically at run
-# time.  There are no statically declared interfaces for remote
-# objects, such as CORBA's IDL.
-#
-# dRuby calls made into a process are handled by a DRb::DRbServer
-# instance within that process.  This reconstitutes the method call,
-# invokes it upon the specified local object, and returns the value to
-# the remote caller.  Any object can receive calls over dRuby.  There
-# is no need to implement a special interface, or mixin special
-# functionality.  Nor, in the general case, does an object need to
-# explicitly register itself with a DRbServer in order to receive
-# dRuby calls.
-#
-# One process wishing to make dRuby calls upon another process must
-# somehow obtain an initial reference to an object in the remote
-# process by some means other than as the return value of a remote
-# method call, as there is initially no remote object reference it can
-# invoke a method upon.  This is done by attaching to the server by
-# URI.  Each DRbServer binds itself to a URI such as
-# 'druby://example.com:8787'.  A DRbServer can have an object attached
-# to it that acts as the server's *front* *object*.  A DRbObject can
-# be explicitly created from the server's URI.  This DRbObject's
-# remote object will be the server's front object.  This front object
-# can then return references to other Ruby objects in the DRbServer's
-# process.
-#
-# Method calls made over dRuby behave largely the same as normal Ruby
-# method calls made within a process.  Method calls with blocks are
-# supported, as are raising exceptions.  In addition to a method's
-# standard errors, a dRuby call may also raise one of the
-# dRuby-specific errors, all of which are subclasses of DRb::DRbError.
-#
-# Any type of object can be passed as an argument to a dRuby call or
-# returned as its return value.  By default, such objects are dumped
-# or marshalled at the local end, then loaded or unmarshalled at the
-# remote end.  The remote end therefore receives a copy of the local
-# object, not a distributed reference to it; methods invoked upon this
-# copy are executed entirely in the remote process, not passed on to
-# the local original.  This has semantics similar to pass-by-value.
-#
-# However, if an object cannot be marshalled, a dRuby reference to it
-# is passed or returned instead.  This will turn up at the remote end
-# as a DRbObject instance.  All methods invoked upon this remote proxy
-# are forwarded to the local object, as described in the discussion of
-# DRbObjects.  This has semantics similar to the normal Ruby
-# pass-by-reference.
-#
-# The easiest way to signal that we want an otherwise marshallable
-# object to be passed or returned as a DRbObject reference, rather
-# than marshalled and sent as a copy, is to include the
-# DRb::DRbUndumped mixin module.
-#
-# dRuby supports calling remote methods with blocks.  As blocks (or
-# rather the Proc objects that represent them) are not marshallable,
-# the block executes in the local, not the remote, context.  Each
-# value yielded to the block is passed from the remote object to the
-# local block, then the value returned by each block invocation is
-# passed back to the remote execution context to be collected, before
-# the collected values are finally returned to the local context as
-# the return value of the method invocation.
-#
-# == Examples of usage
-#
-# For more dRuby samples, see the +samples+ directory in the full
-# dRuby distribution.
-#
-# === dRuby in client/server mode
-#
-# This illustrates setting up a simple client-server drb
-# system.  Run the server and client code in different terminals,
-# starting the server code first.
-#
-# ==== Server code
-#
-#   require 'drb/drb'
-#
-#   # The URI for the server to connect to
-#   URI="druby://localhost:8787"
-#
-#   class TimeServer
-#
-#     def get_current_time
-#       return Time.now
-#     end
-#
-#   end
-#
-#   # The object that handles requests on the server
-#   FRONT_OBJECT=TimeServer.new
-#
-#   DRb.start_service(URI, FRONT_OBJECT)
-#   # Wait for the drb server thread to finish before exiting.
-#   DRb.thread.join
-#
-# ==== Client code
-#
-#   require 'drb/drb'
-#
-#   # The URI to connect to
-#   SERVER_URI="druby://localhost:8787"
-#
-#   # Start a local DRbServer to handle callbacks.
-#   #
-#   # Not necessary for this small example, but will be required
-#   # as soon as we pass a non-marshallable object as an argument
-#   # to a dRuby call.
-#   #
-#   # Note: this must be called at least once per process to take any effect.
-#   # This is particularly important if your application forks.
-#   DRb.start_service
-#
-#   timeserver = DRbObject.new_with_uri(SERVER_URI)
-#   puts timeserver.get_current_time
-#
-# === Remote objects under dRuby
-#
-# This example illustrates returning a reference to an object
-# from a dRuby call.  The Logger instances live in the server
-# process.  References to them are returned to the client process,
-# where methods can be invoked upon them.  These methods are
-# executed in the server process.
-#
-# ==== Server code
-#
-#   require 'drb/drb'
-#
-#   URI="druby://localhost:8787"
-#
-#   class Logger
-#
-#       # Make dRuby send Logger instances as dRuby references,
-#       # not copies.
-#       include DRb::DRbUndumped
-#
-#       def initialize(n, fname)
-#           @name = n
-#           @filename = fname
-#       end
-#
-#       def log(message)
-#           File.open(@filename, "a") do |f|
-#               f.puts("#{Time.now}: #{@name}: #{message}")
-#           end
-#       end
-#
-#   end
-#
-#   # We have a central object for creating and retrieving loggers.
-#   # This retains a local reference to all loggers created.  This
-#   # is so an existing logger can be looked up by name, but also
-#   # to prevent loggers from being garbage collected.  A dRuby
-#   # reference to an object is not sufficient to prevent it being
-#   # garbage collected!
-#   class LoggerFactory
-#
-#       def initialize(bdir)
-#           @basedir = bdir
-#           @loggers = {}
-#       end
-#
-#       def get_logger(name)
-#           if !@loggers.has_key? name
-#               # make the filename safe, then declare it to be so
-#               fname = name.gsub(/[.\/\\\:]/, "_")
-#               @loggers[name] = Logger.new(name, @basedir + "/" + fname)
-#           end
-#           return @loggers[name]
-#       end
-#
-#   end
-#
-#   FRONT_OBJECT=LoggerFactory.new("/tmp/dlog")
-#
-#   DRb.start_service(URI, FRONT_OBJECT)
-#   DRb.thread.join
-#
-# ==== Client code
-#
-#   require 'drb/drb'
-#
-#   SERVER_URI="druby://localhost:8787"
-#
-#   DRb.start_service
-#
-#   log_service=DRbObject.new_with_uri(SERVER_URI)
-#
-#   ["loga", "logb", "logc"].each do |logname|
-#
-#       logger=log_service.get_logger(logname)
-#
-#       logger.log("Hello, world!")
-#       logger.log("Goodbye, world!")
-#       logger.log("=== EOT ===")
-#
-#   end
-#
-# == Security
-#
-# As with all network services, security needs to be considered when
-# using dRuby.  By allowing external access to a Ruby object, you are
-# not only allowing outside clients to call the methods you have
-# defined for that object, but by default to execute arbitrary Ruby
-# code on your server.  Consider the following:
-#
-#    # !!! UNSAFE CODE !!!
-#    ro = DRbObject::new_with_uri("druby://your.server.com:8989")
-#    class << ro
-#      undef :instance_eval  # force call to be passed to remote object
-#    end
-#    ro.instance_eval("`rm -rf *`")
-#
-# The dangers posed by instance_eval and friends are such that a
-# DRbServer should only be used when clients are trusted.
-#
-# A DRbServer can be configured with an access control list to
-# selectively allow or deny access from specified IP addresses.  The
-# main druby distribution provides the ACL class for this purpose.  In
-# general, this mechanism should only be used alongside, rather than
-# as a replacement for, a good firewall.
-#
-# == dRuby internals
-#
-# dRuby is implemented using three main components: a remote method
-# call marshaller/unmarshaller; a transport protocol; and an
-# ID-to-object mapper.  The latter two can be directly, and the first
-# indirectly, replaced, in order to provide different behaviour and
-# capabilities.
-#
-# Marshalling and unmarshalling of remote method calls is performed by
-# a DRb::DRbMessage instance.  This uses the Marshal module to dump
-# the method call before sending it over the transport layer, then
-# reconstitute it at the other end.  There is normally no need to
-# replace this component, and no direct way is provided to do so.
-# However, it is possible to implement an alternative marshalling
-# scheme as part of an implementation of the transport layer.
-#
-# The transport layer is responsible for opening client and server
-# network connections and forwarding dRuby request across them.
-# Normally, it uses DRb::DRbMessage internally to manage marshalling
-# and unmarshalling.  The transport layer is managed by
-# DRb::DRbProtocol.  Multiple protocols can be installed in
-# DRbProtocol at the one time; selection between them is determined by
-# the scheme of a dRuby URI.  The default transport protocol is
-# selected by the scheme 'druby:', and implemented by
-# DRb::DRbTCPSocket.  This uses plain TCP/IP sockets for
-# communication.  An alternative protocol, using UNIX domain sockets,
-# is implemented by DRb::DRbUNIXSocket in the file drb/unix.rb, and
-# selected by the scheme 'drbunix:'.  A sample implementation over
-# HTTP can be found in the samples accompanying the main dRuby
-# distribution.
-#
-# The ID-to-object mapping component maps dRuby object ids to the
-# objects they refer to, and vice versa.  The implementation to use
-# can be specified as part of a DRb::DRbServer's configuration.  The
-# default implementation is provided by DRb::DRbIdConv.  It uses an
-# object's ObjectSpace id as its dRuby id.  This means that the dRuby
-# reference to that object only remains meaningful for the lifetime of
-# the object's process and the lifetime of the object within that
-# process.  A modified implementation is provided by DRb::TimerIdConv
-# in the file drb/timeridconv.rb.  This implementation retains a local
-# reference to all objects exported over dRuby for a configurable
-# period of time (defaulting to ten minutes), to prevent them being
-# garbage-collected within this time.  Another sample implementation
-# is provided in sample/name.rb in the main dRuby distribution.  This
-# allows objects to specify their own id or "name".  A dRuby reference
-# can be made persistent across processes by having each process
-# register an object using the same dRuby name.
-#
-module DRb
-
-  # Superclass of all errors raised in the DRb module.
-  class DRbError < RuntimeError; end
-
-  # Error raised when an error occurs on the underlying communication
-  # protocol.
-  class DRbConnError < DRbError; end
-
-  # Class responsible for converting between an object and its id.
-  #
-  # This, the default implementation, uses an object's local ObjectSpace
-  # __id__ as its id.  This means that an object's identification over
-  # drb remains valid only while that object instance remains alive
-  # within the server runtime.
-  #
-  # For alternative mechanisms, see DRb::TimerIdConv in drb/timeridconv.rb
-  # and DRbNameIdConv in sample/name.rb in the full drb distribution.
-  class DRbIdConv
-
-    # Convert an object reference id to an object.
-    #
-    # This implementation looks up the reference id in the local object
-    # space and returns the object it refers to.
-    def to_obj(ref)
-      ObjectSpace._id2ref(ref)
-    end
-
-    # Convert an object into a reference id.
-    #
-    # This implementation returns the object's __id__ in the local
-    # object space.
-    def to_id(obj)
-      case obj
-      when Object
-        obj.nil? ? nil : obj.__id__
-      when BasicObject
-        obj.__id__
-      end
-    end
-  end
-
-  # Mixin module making an object undumpable or unmarshallable.
-  #
-  # If an object which includes this module is returned by method
-  # called over drb, then the object remains in the server space
-  # and a reference to the object is returned, rather than the
-  # object being marshalled and moved into the client space.
-  module DRbUndumped
-    def _dump(dummy)  # :nodoc:
-      raise TypeError, 'can\'t dump'
-    end
-  end
-
-  # Error raised by the DRb module when an attempt is made to refer to
-  # the context's current drb server but the context does not have one.
-  # See #current_server.
-  class DRbServerNotFound < DRbError; end
-
-  # Error raised by the DRbProtocol module when it cannot find any
-  # protocol implementation support the scheme specified in a URI.
-  class DRbBadURI < DRbError; end
-
-  # Error raised by a dRuby protocol when it doesn't support the
-  # scheme specified in a URI.  See DRb::DRbProtocol.
-  class DRbBadScheme < DRbError; end
-
-  # An exception wrapping a DRb::DRbUnknown object
-  class DRbUnknownError < DRbError
-
-    # Create a new DRbUnknownError for the DRb::DRbUnknown object +unknown+
-    def initialize(unknown)
-      @unknown = unknown
-      super(unknown.name)
-    end
-
-    # Get the wrapped DRb::DRbUnknown object.
-    attr_reader :unknown
-
-    def self._load(s)  # :nodoc:
-      Marshal::load(s)
-    end
-
-    def _dump(lv) # :nodoc:
-      Marshal::dump(@unknown)
-    end
-  end
-
-  # An exception wrapping an error object
-  class DRbRemoteError < DRbError
-
-    # Creates a new remote error that wraps the Exception +error+
-    def initialize(error)
-      @reason = error.class.to_s
-      super("#{error.message} (#{error.class})")
-      set_backtrace(error.backtrace)
-    end
-
-    # the class of the error, as a string.
-    attr_reader :reason
-  end
-
-  # Class wrapping a marshalled object whose type is unknown locally.
-  #
-  # If an object is returned by a method invoked over drb, but the
-  # class of the object is unknown in the client namespace, or
-  # the object is a constant unknown in the client namespace, then
-  # the still-marshalled object is returned wrapped in a DRbUnknown instance.
-  #
-  # If this object is passed as an argument to a method invoked over
-  # drb, then the wrapped object is passed instead.
-  #
-  # The class or constant name of the object can be read from the
-  # +name+ attribute.  The marshalled object is held in the +buf+
-  # attribute.
-  class DRbUnknown
-
-    # Create a new DRbUnknown object.
-    #
-    # +buf+ is a string containing a marshalled object that could not
-    # be unmarshalled.  +err+ is the error message that was raised
-    # when the unmarshalling failed.  It is used to determine the
-    # name of the unmarshalled object.
-    def initialize(err, buf)
-      case err.to_s
-      when /uninitialized constant (\S+)/
-        @name = $1
-      when /undefined class\/module (\S+)/
-        @name = $1
-      else
-        @name = nil
-      end
-      @buf = buf
-    end
-
-    # The name of the unknown thing.
-    #
-    # Class name for unknown objects; variable name for unknown
-    # constants.
-    attr_reader :name
-
-    # Buffer contained the marshalled, unknown object.
-    attr_reader :buf
-
-    def self._load(s) # :nodoc:
-      begin
-        Marshal::load(s)
-      rescue NameError, ArgumentError
-        DRbUnknown.new($!, s)
-      end
-    end
-
-    def _dump(lv) # :nodoc:
-      @buf
-    end
-
-    # Attempt to load the wrapped marshalled object again.
-    #
-    # If the class of the object is now known locally, the object
-    # will be unmarshalled and returned.  Otherwise, a new
-    # but identical DRbUnknown object will be returned.
-    def reload
-      self.class._load(@buf)
-    end
-
-    # Create a DRbUnknownError exception containing this object.
-    def exception
-      DRbUnknownError.new(self)
-    end
-  end
-
-  # An Array wrapper that can be sent to another server via DRb.
-  #
-  # All entries in the array will be dumped or be references that point to
-  # the local server.
-
-  class DRbArray
-
-    # Creates a new DRbArray that either dumps or wraps all the items in the
-    # Array +ary+ so they can be loaded by a remote DRb server.
-
-    def initialize(ary)
-      @ary = ary.collect { |obj|
-        if obj.kind_of? DRbUndumped
-          DRbObject.new(obj)
-        else
-          begin
-            Marshal.dump(obj)
-            obj
-          rescue
-            DRbObject.new(obj)
-          end
-        end
-      }
-    end
-
-    def self._load(s) # :nodoc:
-      Marshal::load(s)
-    end
-
-    def _dump(lv) # :nodoc:
-      Marshal.dump(@ary)
-    end
-  end
-
-  # Handler for sending and receiving drb messages.
-  #
-  # This takes care of the low-level marshalling and unmarshalling
-  # of drb requests and responses sent over the wire between server
-  # and client.  This relieves the implementor of a new drb
-  # protocol layer with having to deal with these details.
-  #
-  # The user does not have to directly deal with this object in
-  # normal use.
-  class DRbMessage
-    def initialize(config) # :nodoc:
-      @load_limit = config[:load_limit]
-      @argc_limit = config[:argc_limit]
-    end
-
-    def dump(obj, error=false)  # :nodoc:
-      case obj
-      when DRbUndumped
-        obj = make_proxy(obj, error)
-      when Object
-        # nothing
-      else
-        obj = make_proxy(obj, error)
-      end
-      begin
-        str = Marshal::dump(obj)
-      rescue
-        str = Marshal::dump(make_proxy(obj, error))
-      end
-      [str.size].pack('N') + str
-    end
-
-    def load(soc)  # :nodoc:
-      begin
-        sz = soc.read(4)        # sizeof (N)
-      rescue
-        raise(DRbConnError, $!.message, $!.backtrace)
-      end
-      raise(DRbConnError, 'connection closed') if sz.nil?
-      raise(DRbConnError, 'premature header') if sz.size < 4
-      sz = sz.unpack('N')[0]
-      raise(DRbConnError, "too large packet #{sz}") if @load_limit < sz
-      begin
-        str = soc.read(sz)
-      rescue
-        raise(DRbConnError, $!.message, $!.backtrace)
-      end
-      raise(DRbConnError, 'connection closed') if str.nil?
-      raise(DRbConnError, 'premature marshal format(can\'t read)') if str.size < sz
-      DRb.mutex.synchronize do
-        begin
-          Marshal::load(str)
-        rescue NameError, ArgumentError
-          DRbUnknown.new($!, str)
-        end
-      end
-    end
-
-    def send_request(stream, ref, msg_id, arg, b) # :nodoc:
-      ary = []
-      ary.push(dump(ref.__drbref))
-      ary.push(dump(msg_id.id2name))
-      ary.push(dump(arg.length))
-      arg.each do |e|
-        ary.push(dump(e))
-      end
-      ary.push(dump(b))
-      stream.write(ary.join(''))
-    rescue
-      raise(DRbConnError, $!.message, $!.backtrace)
-    end
-
-    def recv_request(stream) # :nodoc:
-      ref = load(stream)
-      ro = DRb.to_obj(ref)
-      msg = load(stream)
-      argc = load(stream)
-      raise(DRbConnError, "too many arguments") if @argc_limit < argc
-      argv = Array.new(argc, nil)
-      argc.times do |n|
-        argv[n] = load(stream)
-      end
-      block = load(stream)
-      return ro, msg, argv, block
-    end
-
-    def send_reply(stream, succ, result)  # :nodoc:
-      stream.write(dump(succ) + dump(result, !succ))
-    rescue
-      raise(DRbConnError, $!.message, $!.backtrace)
-    end
-
-    def recv_reply(stream)  # :nodoc:
-      succ = load(stream)
-      result = load(stream)
-      [succ, result]
-    end
-
-    private
-    def make_proxy(obj, error=false) # :nodoc:
-      if error
-        DRbRemoteError.new(obj)
-      else
-        DRbObject.new(obj)
-      end
-    end
-  end
-
-  # Module managing the underlying network protocol(s) used by drb.
-  #
-  # By default, drb uses the DRbTCPSocket protocol.  Other protocols
-  # can be defined.  A protocol must define the following class methods:
-  #
-  #   [open(uri, config)] Open a client connection to the server at +uri+,
-  #                       using configuration +config+.  Return a protocol
-  #                       instance for this connection.
-  #   [open_server(uri, config)] Open a server listening at +uri+,
-  #                              using configuration +config+.  Return a
-  #                              protocol instance for this listener.
-  #   [uri_option(uri, config)] Take a URI, possibly containing an option
-  #                             component (e.g. a trailing '?param=val'),
-  #                             and return a [uri, option] tuple.
-  #
-  # All of these methods should raise a DRbBadScheme error if the URI
-  # does not identify the protocol they support (e.g. "druby:" for
-  # the standard Ruby protocol).  This is how the DRbProtocol module,
-  # given a URI, determines which protocol implementation serves that
-  # protocol.
-  #
-  # The protocol instance returned by #open_server must have the
-  # following methods:
-  #
-  # [accept] Accept a new connection to the server.  Returns a protocol
-  #          instance capable of communicating with the client.
-  # [close] Close the server connection.
-  # [uri] Get the URI for this server.
-  #
-  # The protocol instance returned by #open must have the following methods:
-  #
-  # [send_request (ref, msg_id, arg, b)]
-  #      Send a request to +ref+ with the given message id and arguments.
-  #      This is most easily implemented by calling DRbMessage.send_request,
-  #      providing a stream that sits on top of the current protocol.
-  # [recv_reply]
-  #      Receive a reply from the server and return it as a [success-boolean,
-  #      reply-value] pair.  This is most easily implemented by calling
-  #      DRb.recv_reply, providing a stream that sits on top of the
-  #      current protocol.
-  # [alive?]
-  #      Is this connection still alive?
-  # [close]
-  #      Close this connection.
-  #
-  # The protocol instance returned by #open_server().accept() must have
-  # the following methods:
-  #
-  # [recv_request]
-  #     Receive a request from the client and return a [object, message,
-  #     args, block] tuple.  This is most easily implemented by calling
-  #     DRbMessage.recv_request, providing a stream that sits on top of
-  #     the current protocol.
-  # [send_reply(succ, result)]
-  #     Send a reply to the client.  This is most easily implemented
-  #     by calling DRbMessage.send_reply, providing a stream that sits
-  #     on top of the current protocol.
-  # [close]
-  #     Close this connection.
-  #
-  # A new protocol is registered with the DRbProtocol module using
-  # the add_protocol method.
-  #
-  # For examples of other protocols, see DRbUNIXSocket in drb/unix.rb,
-  # and HTTP0 in sample/http0.rb and sample/http0serv.rb in the full
-  # drb distribution.
-  module DRbProtocol
-
-    # Add a new protocol to the DRbProtocol module.
-    def add_protocol(prot)
-      @protocol.push(prot)
-    end
-    module_function :add_protocol
-
-    # Open a client connection to +uri+ with the configuration +config+.
-    #
-    # The DRbProtocol module asks each registered protocol in turn to
-    # try to open the URI.  Each protocol signals that it does not handle that
-    # URI by raising a DRbBadScheme error.  If no protocol recognises the
-    # URI, then a DRbBadURI error is raised.  If a protocol accepts the
-    # URI, but an error occurs in opening it, a DRbConnError is raised.
-    def open(uri, config, first=true)
-      @protocol.each do |prot|
-        begin
-          return prot.open(uri, config)
-        rescue DRbBadScheme
-        rescue DRbConnError
-          raise($!)
-        rescue
-          raise(DRbConnError, "#{uri} - #{$!.inspect}")
-        end
-      end
-      if first && (config[:auto_load] != false)
-        auto_load(uri)
-        return open(uri, config, false)
-      end
-      raise DRbBadURI, 'can\'t parse uri:' + uri
-    end
-    module_function :open
-
-    # Open a server listening for connections at +uri+ with
-    # configuration +config+.
-    #
-    # The DRbProtocol module asks each registered protocol in turn to
-    # try to open a server at the URI.  Each protocol signals that it does
-    # not handle that URI by raising a DRbBadScheme error.  If no protocol
-    # recognises the URI, then a DRbBadURI error is raised.  If a protocol
-    # accepts the URI, but an error occurs in opening it, the underlying
-    # error is passed on to the caller.
-    def open_server(uri, config, first=true)
-      @protocol.each do |prot|
-        begin
-          return prot.open_server(uri, config)
-        rescue DRbBadScheme
-        end
-      end
-      if first && (config[:auto_load] != false)
-        auto_load(uri)
-        return open_server(uri, config, false)
-      end
-      raise DRbBadURI, 'can\'t parse uri:' + uri
-    end
-    module_function :open_server
-
-    # Parse +uri+ into a [uri, option] pair.
-    #
-    # The DRbProtocol module asks each registered protocol in turn to
-    # try to parse the URI.  Each protocol signals that it does not handle that
-    # URI by raising a DRbBadScheme error.  If no protocol recognises the
-    # URI, then a DRbBadURI error is raised.
-    def uri_option(uri, config, first=true)
-      @protocol.each do |prot|
-        begin
-          uri, opt = prot.uri_option(uri, config)
-          # opt = nil if opt == ''
-          return uri, opt
-        rescue DRbBadScheme
-        end
-      end
-      if first && (config[:auto_load] != false)
-        auto_load(uri)
-        return uri_option(uri, config, false)
-      end
-      raise DRbBadURI, 'can\'t parse uri:' + uri
-    end
-    module_function :uri_option
-
-    def auto_load(uri)  # :nodoc:
-      if /\Adrb([a-z0-9]+):/ =~ uri
-        require("drb/#{$1}") rescue nil
-      end
-    end
-    module_function :auto_load
-  end
-
-  # The default drb protocol which communicates over a TCP socket.
-  #
-  # The DRb TCP protocol URI looks like:
-  # <code>druby://<host>:<port>?<option></code>.  The option is optional.
-
-  class DRbTCPSocket
-    # :stopdoc:
-    private
-    def self.parse_uri(uri)
-      if /\Adruby:\/\/(.*?):(\d+)(\?(.*))?\z/ =~ uri
-        host = $1
-        port = $2.to_i
-        option = $4
-        [host, port, option]
-      else
-        raise(DRbBadScheme, uri) unless uri.start_with?('druby:')
-        raise(DRbBadURI, 'can\'t parse uri:' + uri)
-      end
-    end
-
-    public
-
-    # Open a client connection to +uri+ (DRb URI string) using configuration
-    # +config+.
-    #
-    # This can raise DRb::DRbBadScheme or DRb::DRbBadURI if +uri+ is not for a
-    # recognized protocol.  See DRb::DRbServer.new for information on built-in
-    # URI protocols.
-    def self.open(uri, config)
-      host, port, = parse_uri(uri)
-      soc = TCPSocket.open(host, port)
-      self.new(uri, soc, config)
-    end
-
-    # Returns the hostname of this server
-    def self.getservername
-      host = Socket::gethostname
-      begin
-        Socket::getaddrinfo(host, nil,
-                                  Socket::AF_UNSPEC,
-                                  Socket::SOCK_STREAM,
-                                  0,
-                                  Socket::AI_PASSIVE)[0][3]
-      rescue
-        'localhost'
-      end
-    end
-
-    # For the families available for +host+, returns a TCPServer on +port+.
-    # If +port+ is 0 the first available port is used.  IPv4 servers are
-    # preferred over IPv6 servers.
-    def self.open_server_inaddr_any(host, port)
-      infos = Socket::getaddrinfo(host, nil,
-                                  Socket::AF_UNSPEC,
-                                  Socket::SOCK_STREAM,
-                                  0,
-                                  Socket::AI_PASSIVE)
-      families = Hash[*infos.collect { |af, *_| af }.uniq.zip([]).flatten]
-      return TCPServer.open('0.0.0.0', port) if families.has_key?('AF_INET')
-      return TCPServer.open('::', port) if families.has_key?('AF_INET6')
-      return TCPServer.open(port)
-      # :stopdoc:
-    end
-
-    # Open a server listening for connections at +uri+ using
-    # configuration +config+.
-    def self.open_server(uri, config)
-      uri = 'druby://:0' unless uri
-      host, port, _ = parse_uri(uri)
-      config = {:tcp_original_host => host}.update(config)
-      if host.size == 0
-        host = getservername
-        soc = open_server_inaddr_any(host, port)
-      else
-        soc = TCPServer.open(host, port)
-      end
-      port = soc.addr[1] if port == 0
-      config[:tcp_port] = port
-      uri = "druby://#{host}:#{port}"
-      self.new(uri, soc, config)
-    end
-
-    # Parse +uri+ into a [uri, option] pair.
-    def self.uri_option(uri, config)
-      host, port, option = parse_uri(uri)
-      return "druby://#{host}:#{port}", option
-    end
-
-    # Create a new DRbTCPSocket instance.
-    #
-    # +uri+ is the URI we are connected to.
-    # +soc+ is the tcp socket we are bound to.  +config+ is our
-    # configuration.
-    def initialize(uri, soc, config={})
-      @uri = uri
-      @socket = soc
-      @config = config
-      @acl = config[:tcp_acl]
-      @msg = DRbMessage.new(config)
-      set_sockopt(@socket)
-      @shutdown_pipe_r, @shutdown_pipe_w = IO.pipe
-    end
-
-    # Get the URI that we are connected to.
-    attr_reader :uri
-
-    # Get the address of our TCP peer (the other end of the socket
-    # we are bound to.
-    def peeraddr
-      @socket.peeraddr
-    end
-
-    # Get the socket.
-    def stream; @socket; end
-
-    # On the client side, send a request to the server.
-    def send_request(ref, msg_id, arg, b)
-      @msg.send_request(stream, ref, msg_id, arg, b)
-    end
-
-    # On the server side, receive a request from the client.
-    def recv_request
-      @msg.recv_request(stream)
-    end
-
-    # On the server side, send a reply to the client.
-    def send_reply(succ, result)
-      @msg.send_reply(stream, succ, result)
-    end
-
-    # On the client side, receive a reply from the server.
-    def recv_reply
-      @msg.recv_reply(stream)
-    end
-
-    public
-
-    # Close the connection.
-    #
-    # If this is an instance returned by #open_server, then this stops
-    # listening for new connections altogether.  If this is an instance
-    # returned by #open or by #accept, then it closes this particular
-    # client-server session.
-    def close
-      shutdown
-      if @socket
-        @socket.close
-        @socket = nil
-      end
-      close_shutdown_pipe
-    end
-
-    def close_shutdown_pipe
-      @shutdown_pipe_w.close
-      @shutdown_pipe_r.close
-    end
-    private :close_shutdown_pipe
-
-    # On the server side, for an instance returned by #open_server,
-    # accept a client connection and return a new instance to handle
-    # the server's side of this client-server session.
-    def accept
-      while true
-        s = accept_or_shutdown
-        return nil unless s
-        break if (@acl ? @acl.allow_socket?(s) : true)
-        s.close
-      end
-      if @config[:tcp_original_host].to_s.size == 0
-        uri = "druby://#{s.addr[3]}:#{@config[:tcp_port]}"
-      else
-        uri = @uri
-      end
-      self.class.new(uri, s, @config)
-    end
-
-    def accept_or_shutdown
-      readables, = IO.select([@socket, @shutdown_pipe_r])
-      if readables.include? @shutdown_pipe_r
-        return nil
-      end
-      @socket.accept
-    end
-    private :accept_or_shutdown
-
-    # Graceful shutdown
-    def shutdown
-      @shutdown_pipe_w.close
-    end
-
-    # Check to see if this connection is alive.
-    def alive?
-      return false unless @socket
-      if @socket.to_io.wait_readable(0)
-        close
-        return false
-      end
-      true
-    end
-
-    def set_sockopt(soc) # :nodoc:
-      soc.setsockopt(Socket::IPPROTO_TCP, Socket::TCP_NODELAY, 1)
-    rescue IOError, Errno::ECONNRESET, Errno::EINVAL
-      # closed/shutdown socket, ignore error
-    end
-  end
-
-  module DRbProtocol
-    @protocol = [DRbTCPSocket] # default
-  end
-
-  class DRbURIOption  # :nodoc:  I don't understand the purpose of this class...
-    def initialize(option)
-      @option = option.to_s
-    end
-    attr_reader :option
-    def to_s; @option; end
-
-    def ==(other)
-      return false unless DRbURIOption === other
-      @option == other.option
-    end
-
-    def hash
-      @option.hash
-    end
-
-    alias eql? ==
-  end
-
-  # Object wrapping a reference to a remote drb object.
-  #
-  # Method calls on this object are relayed to the remote
-  # object that this object is a stub for.
-  class DRbObject
-
-    # Unmarshall a marshalled DRbObject.
-    #
-    # If the referenced object is located within the local server, then
-    # the object itself is returned.  Otherwise, a new DRbObject is
-    # created to act as a stub for the remote referenced object.
-    def self._load(s)
-      uri, ref = Marshal.load(s)
-
-      if DRb.here?(uri)
-        obj = DRb.to_obj(ref)
-        return obj
-      end
-
-      self.new_with(uri, ref)
-    end
-
-    # Creates a DRb::DRbObject given the reference information to the remote
-    # host +uri+ and object +ref+.
-
-    def self.new_with(uri, ref)
-      it = self.allocate
-      it.instance_variable_set(:@uri, uri)
-      it.instance_variable_set(:@ref, ref)
-      it
-    end
-
-    # Create a new DRbObject from a URI alone.
-    def self.new_with_uri(uri)
-      self.new(nil, uri)
-    end
-
-    # Marshall this object.
-    #
-    # The URI and ref of the object are marshalled.
-    def _dump(lv)
-      Marshal.dump([@uri, @ref])
-    end
-
-    # Create a new remote object stub.
-    #
-    # +obj+ is the (local) object we want to create a stub for.  Normally
-    # this is +nil+.  +uri+ is the URI of the remote object that this
-    # will be a stub for.
-    def initialize(obj, uri=nil)
-      @uri = nil
-      @ref = nil
-      case obj
-      when Object
-        is_nil = obj.nil?
-      when BasicObject
-        is_nil = false
-      end
-
-      if is_nil
-        return if uri.nil?
-        @uri, option = DRbProtocol.uri_option(uri, DRb.config)
-        @ref = DRbURIOption.new(option) unless option.nil?
-      else
-        @uri = uri ? uri : (DRb.uri rescue nil)
-        @ref = obj ? DRb.to_id(obj) : nil
-      end
-    end
-
-    # Get the URI of the remote object.
-    def __drburi
-      @uri
-    end
-
-    # Get the reference of the object, if local.
-    def __drbref
-      @ref
-    end
-
-    undef :to_s
-    undef :to_a if respond_to?(:to_a)
-
-    # Routes respond_to? to the referenced remote object.
-    def respond_to?(msg_id, priv=false)
-      case msg_id
-      when :_dump
-        true
-      when :marshal_dump
-        false
-      else
-        method_missing(:respond_to?, msg_id, priv)
-      end
-    end
-
-    # Routes method calls to the referenced remote object.
-    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)
-        return obj.__send__(msg_id, *a, &b)
-      end
-
-      succ, result = self.class.with_friend(@uri) do
-        DRbConn.open(@uri) do |conn|
-          conn.send_message(self, msg_id, a, b)
-        end
-      end
-
-      if succ
-        return result
-      elsif DRbUnknown === result
-        raise result
-      else
-        bt = self.class.prepare_backtrace(@uri, result)
-        result.set_backtrace(bt + caller)
-        raise result
-      end
-    end
-
-    # Given the +uri+ of another host executes the block provided.
-    def self.with_friend(uri) # :nodoc:
-      friend = DRb.fetch_server(uri)
-      return yield() unless friend
-
-      save = Thread.current['DRb']
-      Thread.current['DRb'] = { 'server' => friend }
-      return yield
-    ensure
-      Thread.current['DRb'] = save if friend
-    end
-
-    # Returns a modified backtrace from +result+ with the +uri+ where each call
-    # in the backtrace came from.
-    def self.prepare_backtrace(uri, result) # :nodoc:
-      prefix = "(#{uri}) "
-      bt = []
-      result.backtrace.each do |x|
-        break if /`__send__'$/ =~ x
-        if /\A\(druby:\/\// =~ x
-          bt.push(x)
-        else
-          bt.push(prefix + x)
-        end
-      end
-      bt
-    end
-
-    def pretty_print(q)   # :nodoc:
-      q.pp_object(self)
-    end
-
-    def pretty_print_cycle(q)   # :nodoc:
-      q.object_address_group(self) {
-        q.breakable
-        q.text '...'
-      }
-    end
-  end
-
-  class ThreadObject
-    include MonitorMixin
-
-    def initialize(&blk)
-      super()
-      @wait_ev = new_cond
-      @req_ev = new_cond
-      @res_ev = new_cond
-      @status = :wait
-      @req = nil
-      @res = nil
-      @thread = Thread.new(self, &blk)
-    end
-
-    def alive?
-      @thread.alive?
-    end
-
-    def kill
-      @thread.kill
-      @thread.join
-    end
-
-    def method_missing(msg, *arg, &blk)
-      synchronize do
-        @wait_ev.wait_until { @status == :wait }
-        @req = [msg] + arg
-        @status = :req
-        @req_ev.broadcast
-        @res_ev.wait_until { @status == :res }
-        value = @res
-        @req = @res = nil
-        @status = :wait
-        @wait_ev.broadcast
-        return value
-      end
-    end
-
-    def _execute()
-      synchronize do
-        @req_ev.wait_until { @status == :req }
-        @res = yield(@req)
-        @status = :res
-        @res_ev.signal
-      end
-    end
-  end
-
-  # Class handling the connection between a DRbObject and the
-  # server the real object lives on.
-  #
-  # This class maintains a pool of connections, to reduce the
-  # overhead of starting and closing down connections for each
-  # method call.
-  #
-  # This class is used internally by DRbObject.  The user does
-  # not normally need to deal with it directly.
-  class DRbConn
-    POOL_SIZE = 16  # :nodoc:
-
-    def self.make_pool
-      ThreadObject.new do |queue|
-        pool = []
-        while true
-          queue._execute do |message|
-            case(message[0])
-            when :take then
-              remote_uri = message[1]
-              conn = nil
-              new_pool = []
-              pool.each do |c|
-                if conn.nil? and c.uri == remote_uri
-                  conn = c if c.alive?
-                else
-                  new_pool.push c
-                end
-              end
-              pool = new_pool
-              conn
-            when :store then
-              conn = message[1]
-              pool.unshift(conn)
-              pool.pop.close while pool.size > POOL_SIZE
-              conn
-            else
-              nil
-            end
-          end
-        end
-      end
-    end
-    @pool_proxy = nil
-
-    def self.stop_pool
-      @pool_proxy&.kill
-      @pool_proxy = nil
-    end
-
-    def self.open(remote_uri)  # :nodoc:
-      begin
-        @pool_proxy = make_pool unless @pool_proxy&.alive?
-
-        conn = @pool_proxy.take(remote_uri)
-        conn = self.new(remote_uri) unless conn
-        succ, result = yield(conn)
-        return succ, result
-
-      ensure
-        if conn
-          if succ
-            @pool_proxy.store(conn)
-          else
-            conn.close
-          end
-        end
-      end
-    end
-
-    def initialize(remote_uri)  # :nodoc:
-      @uri = remote_uri
-      @protocol = DRbProtocol.open(remote_uri, DRb.config)
-    end
-    attr_reader :uri  # :nodoc:
-
-    def send_message(ref, msg_id, arg, block)  # :nodoc:
-      @protocol.send_request(ref, msg_id, arg, block)
-      @protocol.recv_reply
-    end
-
-    def close  # :nodoc:
-      @protocol.close
-      @protocol = nil
-    end
-
-    def alive?  # :nodoc:
-      return false unless @protocol
-      @protocol.alive?
-    end
-  end
-
-  # Class representing a drb server instance.
-  #
-  # A DRbServer must be running in the local process before any incoming
-  # dRuby calls can be accepted, or any local objects can be passed as
-  # dRuby references to remote processes, even if those local objects are
-  # never actually called remotely. You do not need to start a DRbServer
-  # in the local process if you are only making outgoing dRuby calls
-  # passing marshalled parameters.
-  #
-  # Unless multiple servers are being used, the local DRbServer is normally
-  # started by calling DRb.start_service.
-  class DRbServer
-    @@acl = nil
-    @@idconv = DRbIdConv.new
-    @@secondary_server = nil
-    @@argc_limit = 256
-    @@load_limit = 0xffffffff
-    @@verbose = false
-
-    # Set the default value for the :argc_limit option.
-    #
-    # See #new().  The initial default value is 256.
-    def self.default_argc_limit(argc)
-      @@argc_limit = argc
-    end
-
-    # Set the default value for the :load_limit option.
-    #
-    # See #new().  The initial default value is 25 MB.
-    def self.default_load_limit(sz)
-      @@load_limit = sz
-    end
-
-    # Set the default access control list to +acl+.  The default ACL is +nil+.
-    #
-    # See also DRb::ACL and #new()
-    def self.default_acl(acl)
-      @@acl = acl
-    end
-
-    # Set the default value for the :id_conv option.
-    #
-    # See #new().  The initial default value is a DRbIdConv instance.
-    def self.default_id_conv(idconv)
-      @@idconv = idconv
-    end
-
-    # Set the default value of the :verbose option.
-    #
-    # See #new().  The initial default value is false.
-    def self.verbose=(on)
-      @@verbose = on
-    end
-
-    # Get the default value of the :verbose option.
-    def self.verbose
-      @@verbose
-    end
-
-    def self.make_config(hash={})  # :nodoc:
-      default_config = {
-        :idconv => @@idconv,
-        :verbose => @@verbose,
-        :tcp_acl => @@acl,
-        :load_limit => @@load_limit,
-        :argc_limit => @@argc_limit,
-      }
-      default_config.update(hash)
-    end
-
-    # Create a new DRbServer instance.
-    #
-    # +uri+ is the URI to bind to.  This is normally of the form
-    # 'druby://<hostname>:<port>' where <hostname> is a hostname of
-    # the local machine.  If nil, then the system's default hostname
-    # will be bound to, on a port selected by the system; these value
-    # can be retrieved from the +uri+ attribute.  'druby:' specifies
-    # the default dRuby transport protocol: another protocol, such
-    # as 'drbunix:', can be specified instead.
-    #
-    # +front+ is the front object for the server, that is, the object
-    # to which remote method calls on the server will be passed.  If
-    # nil, then the server will not accept remote method calls.
-    #
-    # If +config_or_acl+ is a hash, it is the configuration to
-    # use for this server.  The following options are recognised:
-    #
-    # :idconv :: an id-to-object conversion object.  This defaults
-    #            to an instance of the class DRb::DRbIdConv.
-    # :verbose :: if true, all unsuccessful remote calls on objects
-    #             in the server will be logged to $stdout. false
-    #             by default.
-    # :tcp_acl :: the access control list for this server.  See
-    #             the ACL class from the main dRuby distribution.
-    # :load_limit :: the maximum message size in bytes accepted by
-    #                the server.  Defaults to 25 MB (26214400).
-    # :argc_limit :: the maximum number of arguments to a remote
-    #                method accepted by the server.  Defaults to
-    #                256.
-    # The default values of these options can be modified on
-    # a class-wide basis by the class methods #default_argc_limit,
-    # #default_load_limit, #default_acl, #default_id_conv,
-    # and #verbose=
-    #
-    # If +config_or_acl+ is not a hash, but is not nil, it is
-    # assumed to be the access control list for this server.
-    # See the :tcp_acl option for more details.
-    #
-    # If no other server is currently set as the primary server,
-    # this will become the primary server.
-    #
-    # The server will immediately start running in its own thread.
-    def initialize(uri=nil, front=nil, config_or_acl=nil)
-      if Hash === config_or_acl
-        config = config_or_acl.dup
-      else
-        acl = config_or_acl || @@acl
-        config = {
-          :tcp_acl => acl
-        }
-      end
-
-      @config = self.class.make_config(config)
-
-      @protocol = DRbProtocol.open_server(uri, @config)
-      @uri = @protocol.uri
-      @exported_uri = [@uri]
-
-      @front = front
-      @idconv = @config[:idconv]
-
-      @grp = ThreadGroup.new
-      @thread = run
-
-      DRb.regist_server(self)
-    end
-
-    # The URI of this DRbServer.
-    attr_reader :uri
-
-    # The main thread of this DRbServer.
-    #
-    # This is the thread that listens for and accepts connections
-    # from clients, not that handles each client's request-response
-    # session.
-    attr_reader :thread
-
-    # The front object of the DRbServer.
-    #
-    # This object receives remote method calls made on the server's
-    # URI alone, with an object id.
-    attr_reader :front
-
-    # The configuration of this DRbServer
-    attr_reader :config
-
-    # Set whether to operate in verbose mode.
-    #
-    # In verbose mode, failed calls are logged to stdout.
-    def verbose=(v); @config[:verbose]=v; end
-
-    # Get whether the server is in verbose mode.
-    #
-    # In verbose mode, failed calls are logged to stdout.
-    def verbose; @config[:verbose]; end
-
-    # Is this server alive?
-    def alive?
-      @thread.alive?
-    end
-
-    # Is +uri+ the URI for this server?
-    def here?(uri)
-      @exported_uri.include?(uri)
-    end
-
-    # Stop this server.
-    def stop_service
-      DRb.remove_server(self)
-      if  Thread.current['DRb'] && Thread.current['DRb']['server'] == self
-        Thread.current['DRb']['stop_service'] = true
-      else
-        shutdown
-      end
-    end
-
-    # Convert a dRuby reference to the local object it refers to.
-    def to_obj(ref)
-      return front if ref.nil?
-      return front[ref.to_s] if DRbURIOption === ref
-      @idconv.to_obj(ref)
-    end
-
-    # Convert a local object to a dRuby reference.
-    def to_id(obj)
-      return nil if obj.__id__ == front.__id__
-      @idconv.to_id(obj)
-    end
-
-    private
-
-    def shutdown
-      current = Thread.current
-      if @protocol.respond_to? :shutdown
-        @protocol.shutdown
-      else
-        [@thread, *@grp.list].each { |thread|
-          thread.kill unless thread == current # xxx: Thread#kill
-        }
-      end
-      @thread.join unless @thread == current
-    end
-
-    ##
-    # Starts the DRb main loop in a new thread.
-
-    def run
-      Thread.start do
-        begin
-          while main_loop
-          end
-        ensure
-          @protocol.close if @protocol
-        end
-      end
-    end
-
-    # List of insecure methods.
-    #
-    # These methods are not callable via dRuby.
-    INSECURE_METHOD = [
-      :__send__
-    ]
-
-    # Has a method been included in the list of insecure methods?
-    def insecure_method?(msg_id)
-      INSECURE_METHOD.include?(msg_id)
-    end
-
-    # Coerce an object to a string, providing our own representation if
-    # to_s is not defined for the object.
-    def any_to_s(obj)
-      "#{obj}:#{obj.class}"
-    rescue
-      Kernel.instance_method(:to_s).bind_call(obj)
-    end
-
-    # Check that a method is callable via dRuby.
-    #
-    # +obj+ is the object we want to invoke the method on. +msg_id+ is the
-    # method name, as a Symbol.
-    #
-    # If the method is an insecure method (see #insecure_method?) a
-    # SecurityError is thrown.  If the method is private or undefined,
-    # a NameError is thrown.
-    def check_insecure_method(obj, msg_id)
-      return true if Proc === obj && msg_id == :__drb_yield
-      raise(ArgumentError, "#{any_to_s(msg_id)} is not a symbol") unless Symbol == msg_id.class
-      raise(SecurityError, "insecure method `#{msg_id}'") if insecure_method?(msg_id)
-
-      case obj
-      when Object
-        if obj.private_methods.include?(msg_id)
-          desc = any_to_s(obj)
-          raise NoMethodError, "private method `#{msg_id}' called for #{desc}"
-        elsif obj.protected_methods.include?(msg_id)
-          desc = any_to_s(obj)
-          raise NoMethodError, "protected method `#{msg_id}' called for #{desc}"
-        else
-          true
-        end
-      else
-        if Kernel.instance_method(:private_methods).bind(obj).call.include?(msg_id)
-          desc = any_to_s(obj)
-          raise NoMethodError, "private method `#{msg_id}' called for #{desc}"
-        elsif Kernel.instance_method(:protected_methods).bind(obj).call.include?(msg_id)
-          desc = any_to_s(obj)
-          raise NoMethodError, "protected method `#{msg_id}' called for #{desc}"
-        else
-          true
-        end
-      end
-    end
-    public :check_insecure_method
-
-    class InvokeMethod  # :nodoc:
-      def initialize(drb_server, client)
-        @drb_server = drb_server
-        @client = client
-      end
-
-      def perform
-        begin
-          setup_message
-        ensure
-          @result = nil
-          @succ = false
-        end
-
-        if @block
-          @result = perform_with_block
-        else
-          @result = perform_without_block
-        end
-        @succ = true
-        case @result
-        when Array
-          if @msg_id == :to_ary
-            @result = DRbArray.new(@result)
-          end
-        end
-        return @succ, @result
-      rescue NoMemoryError, SystemExit, SystemStackError, SecurityError
-        raise
-      rescue Exception
-        @result = $!
-        return @succ, @result
-      end
-
-      private
-      def init_with_client
-        obj, msg, argv, block = @client.recv_request
-        @obj = obj
-        @msg_id = msg.intern
-        @argv = argv
-        @block = block
-      end
-
-      def check_insecure_method
-        @drb_server.check_insecure_method(@obj, @msg_id)
-      end
-
-      def setup_message
-        init_with_client
-        check_insecure_method
-      end
-
-      def perform_without_block
-        if Proc === @obj && @msg_id == :__drb_yield
-          if @argv.size == 1
-            ary = @argv
-          else
-            ary = [@argv]
-          end
-          ary.collect(&@obj)[0]
-        else
-          @obj.__send__(@msg_id, *@argv)
-        end
-      end
-
-    end
-
-    require_relative 'invokemethod'
-    class InvokeMethod
-      include InvokeMethod18Mixin
-    end
-
-    def error_print(exception)
-      exception.backtrace.inject(true) do |first, x|
-        if first
-          $stderr.puts "#{x}: #{exception} (#{exception.class})"
-        else
-          $stderr.puts "\tfrom #{x}"
-        end
-        false
-      end
-    end
-
-    # The main loop performed by a DRbServer's internal thread.
-    #
-    # Accepts a connection from a client, and starts up its own
-    # thread to handle it.  This thread loops, receiving requests
-    # from the client, invoking them on a local object, and
-    # returning responses, until the client closes the connection
-    # or a local method call fails.
-    def main_loop
-      client0 = @protocol.accept
-      return nil if !client0
-      Thread.start(client0) do |client|
-        @grp.add Thread.current
-        Thread.current['DRb'] = { 'client' => client ,
-                                  'server' => self }
-        DRb.mutex.synchronize do
-          client_uri = client.uri
-          @exported_uri << client_uri unless @exported_uri.include?(client_uri)
-        end
-        _last_invoke_method = nil
-        loop do
-          begin
-            succ = false
-            invoke_method = InvokeMethod.new(self, client)
-            succ, result = invoke_method.perform
-            error_print(result) if !succ && verbose
-            unless DRbConnError === result && result.message == 'connection closed'
-              client.send_reply(succ, result)
-            end
-          rescue Exception => e
-            error_print(e) if verbose
-          ensure
-            _last_invoke_method = invoke_method
-            client.close unless succ
-            if Thread.current['DRb']['stop_service']
-              shutdown
-              break
-            end
-            break unless succ
-          end
-        end
-      end
-    end
-  end
-
-  @primary_server = nil
-
-  # Start a dRuby server locally.
-  #
-  # The new dRuby server will become the primary server, even
-  # if another server is currently the primary server.
-  #
-  # +uri+ is the URI for the server to bind to.  If nil,
-  # the server will bind to random port on the default local host
-  # name and use the default dRuby protocol.
-  #
-  # +front+ is the server's front object.  This may be nil.
-  #
-  # +config+ is the configuration for the new server.  This may
-  # be nil.
-  #
-  # See DRbServer::new.
-  def start_service(uri=nil, front=nil, config=nil)
-    @primary_server = DRbServer.new(uri, front, config)
-  end
-  module_function :start_service
-
-  # The primary local dRuby server.
-  #
-  # This is the server created by the #start_service call.
-  attr_accessor :primary_server
-  module_function :primary_server=, :primary_server
-
-  # Get the 'current' server.
-  #
-  # In the context of execution taking place within the main
-  # thread of a dRuby server (typically, as a result of a remote
-  # call on the server or one of its objects), the current
-  # server is that server.  Otherwise, the current server is
-  # the primary server.
-  #
-  # If the above rule fails to find a server, a DRbServerNotFound
-  # error is raised.
-  def current_server
-    drb = Thread.current['DRb']
-    server = (drb && drb['server']) ? drb['server'] : @primary_server
-    raise DRbServerNotFound unless server
-    return server
-  end
-  module_function :current_server
-
-  # Stop the local dRuby server.
-  #
-  # This operates on the primary server.  If there is no primary
-  # server currently running, it is a noop.
-  def stop_service
-    @primary_server.stop_service if @primary_server
-    @primary_server = nil
-  end
-  module_function :stop_service
-
-  # Get the URI defining the local dRuby space.
-  #
-  # This is the URI of the current server.  See #current_server.
-  def uri
-    drb = Thread.current['DRb']
-    client = (drb && drb['client'])
-    if client
-      uri = client.uri
-      return uri if uri
-    end
-    current_server.uri
-  end
-  module_function :uri
-
-  # Is +uri+ the URI for the current local server?
-  def here?(uri)
-    current_server.here?(uri) rescue false
-    # (current_server.uri rescue nil) == uri
-  end
-  module_function :here?
-
-  # Get the configuration of the current server.
-  #
-  # If there is no current server, this returns the default configuration.
-  # See #current_server and DRbServer::make_config.
-  def config
-    current_server.config
-  rescue
-    DRbServer.make_config
-  end
-  module_function :config
-
-  # Get the front object of the current server.
-  #
-  # This raises a DRbServerNotFound error if there is no current server.
-  # See #current_server.
-  def front
-    current_server.front
-  end
-  module_function :front
-
-  # Convert a reference into an object using the current server.
-  #
-  # This raises a DRbServerNotFound error if there is no current server.
-  # See #current_server.
-  def to_obj(ref)
-    current_server.to_obj(ref)
-  end
-
-  # Get a reference id for an object using the current server.
-  #
-  # This raises a DRbServerNotFound error if there is no current server.
-  # See #current_server.
-  def to_id(obj)
-    current_server.to_id(obj)
-  end
-  module_function :to_id
-  module_function :to_obj
-
-  # Get the thread of the primary server.
-  #
-  # This returns nil if there is no primary server.  See #primary_server.
-  def thread
-    @primary_server ? @primary_server.thread : nil
-  end
-  module_function :thread
-
-  # Set the default id conversion object.
-  #
-  # This is expected to be an instance such as DRb::DRbIdConv that responds to
-  # #to_id and #to_obj that can convert objects to and from DRb references.
-  #
-  # See DRbServer#default_id_conv.
-  def install_id_conv(idconv)
-    DRbServer.default_id_conv(idconv)
-  end
-  module_function :install_id_conv
-
-  # Set the default ACL to +acl+.
-  #
-  # See DRb::DRbServer.default_acl.
-  def install_acl(acl)
-    DRbServer.default_acl(acl)
-  end
-  module_function :install_acl
-
-  @mutex = Thread::Mutex.new
-  def mutex # :nodoc:
-    @mutex
-  end
-  module_function :mutex
-
-  @server = {}
-  # Registers +server+ with DRb.
-  #
-  # This is called when a new DRb::DRbServer is created.
-  #
-  # If there is no primary server then +server+ becomes the primary server.
-  #
-  # Example:
-  #
-  #  require 'drb'
-  #
-  #  s = DRb::DRbServer.new # automatically calls regist_server
-  #  DRb.fetch_server s.uri #=> #<DRb::DRbServer:0x...>
-  def regist_server(server)
-    @server[server.uri] = server
-    mutex.synchronize do
-      @primary_server = server unless @primary_server
-    end
-  end
-  module_function :regist_server
-
-  # Removes +server+ from the list of registered servers.
-  def remove_server(server)
-    @server.delete(server.uri)
-    mutex.synchronize do
-      if @primary_server == server
-        @primary_server = nil
-      end
-    end
-  end
-  module_function :remove_server
-
-  # Retrieves the server with the given +uri+.
-  #
-  # See also regist_server and remove_server.
-  def fetch_server(uri)
-    @server[uri]
-  end
-  module_function :fetch_server
-end
-
-# :stopdoc:
-DRbObject = DRb::DRbObject
-DRbUndumped = DRb::DRbUndumped
-DRbIdConv = DRb::DRbIdConv
diff --git a/lib/drb/eq.rb b/lib/drb/eq.rb
deleted file mode 100644
index 15ca5cae42aa32..00000000000000
--- a/lib/drb/eq.rb
+++ /dev/null
@@ -1,15 +0,0 @@
-# frozen_string_literal: false
-module DRb
-  class DRbObject # :nodoc:
-    def ==(other)
-      return false unless DRbObject === other
-     (@ref == other.__drbref) && (@uri == other.__drburi)
-    end
-
-    def hash
-      [@uri, @ref].hash
-    end
-
-    alias eql? ==
-  end
-end
diff --git a/lib/drb/extserv.rb b/lib/drb/extserv.rb
deleted file mode 100644
index 9523fe84e35b81..00000000000000
--- a/lib/drb/extserv.rb
+++ /dev/null
@@ -1,44 +0,0 @@
-# frozen_string_literal: false
-=begin
- external service
-        Copyright (c) 2000,2002 Masatoshi SEKI
-=end
-
-require_relative 'drb'
-require 'monitor'
-
-module DRb
-  class ExtServ
-    include MonitorMixin
-    include DRbUndumped
-
-    def initialize(there, name, server=nil)
-      super()
-      @server = server || DRb::primary_server
-      @name = name
-      ro = DRbObject.new(nil, there)
-      synchronize do
-        @invoker = ro.register(name, DRbObject.new(self, @server.uri))
-      end
-    end
-    attr_reader :server
-
-    def front
-      DRbObject.new(nil, @server.uri)
-    end
-
-    def stop_service
-      synchronize do
-        @invoker.unregister(@name)
-        server = @server
-        @server = nil
-        server.stop_service
-        true
-      end
-    end
-
-    def alive?
-      @server ? @server.alive? : false
-    end
-  end
-end
diff --git a/lib/drb/extservm.rb b/lib/drb/extservm.rb
deleted file mode 100644
index 9333a108e5dfa8..00000000000000
--- a/lib/drb/extservm.rb
+++ /dev/null
@@ -1,94 +0,0 @@
-# frozen_string_literal: false
-=begin
- external service manager
-        Copyright (c) 2000 Masatoshi SEKI
-=end
-
-require_relative 'drb'
-require 'monitor'
-
-module DRb
-  class ExtServManager
-    include DRbUndumped
-    include MonitorMixin
-
-    @@command = {}
-
-    def self.command
-      @@command
-    end
-
-    def self.command=(cmd)
-      @@command = cmd
-    end
-
-    def initialize
-      super()
-      @cond = new_cond
-      @servers = {}
-      @waiting = []
-      @queue = Thread::Queue.new
-      @thread = invoke_thread
-      @uri = nil
-    end
-    attr_accessor :uri
-
-    def service(name)
-      synchronize do
-        while true
-          server = @servers[name]
-          return server if server && server.alive? # server may be `false'
-          invoke_service(name)
-          @cond.wait
-        end
-      end
-    end
-
-    def register(name, ro)
-      synchronize do
-        @servers[name] = ro
-        @cond.signal
-      end
-      self
-    end
-    alias regist register
-
-    def unregister(name)
-      synchronize do
-        @servers.delete(name)
-      end
-    end
-    alias unregist unregister
-
-    private
-    def invoke_thread
-      Thread.new do
-        while name = @queue.pop
-          invoke_service_command(name, @@command[name])
-        end
-      end
-    end
-
-    def invoke_service(name)
-      @queue.push(name)
-    end
-
-    def invoke_service_command(name, command)
-      raise "invalid command. name: #{name}" unless command
-      synchronize do
-        return if @servers.include?(name)
-        @servers[name] = false
-      end
-      uri = @uri || DRb.uri
-      if command.respond_to? :to_ary
-        command = command.to_ary + [uri, name]
-        pid = spawn(*command)
-      else
-        pid = spawn("#{command} #{uri} #{name}")
-      end
-      th = Process.detach(pid)
-      th[:drb_service] = name
-      th
-    end
-  end
-end
diff --git a/lib/drb/gw.rb b/lib/drb/gw.rb
deleted file mode 100644
index 65a525476ec549..00000000000000
--- a/lib/drb/gw.rb
+++ /dev/null
@@ -1,161 +0,0 @@
-# frozen_string_literal: false
-require_relative 'drb'
-require 'monitor'
-
-module DRb
-
-  # Gateway id conversion forms a gateway between different DRb protocols or
-  # networks.
-  #
-  # The gateway needs to install this id conversion and create servers for
-  # each of the protocols or networks it will be a gateway between.  It then
-  # needs to create a server that attaches to each of these networks.  For
-  # example:
-  #
-  #   require 'drb/drb'
-  #   require 'drb/unix'
-  #   require 'drb/gw'
-  #
-  #   DRb.install_id_conv DRb::GWIdConv.new
-  #   gw = DRb::GW.new
-  #   s1 = DRb::DRbServer.new 'drbunix:/path/to/gateway', gw
-  #   s2 = DRb::DRbServer.new 'druby://example:10000', gw
-  #
-  #   s1.thread.join
-  #   s2.thread.join
-  #
-  # Each client must register services with the gateway, for example:
-  #
-  #   DRb.start_service 'drbunix:', nil # an anonymous server
-  #   gw = DRbObject.new nil, 'drbunix:/path/to/gateway'
-  #   gw[:unix] = some_service
-  #   DRb.thread.join
-
-  class GWIdConv < DRbIdConv
-    def to_obj(ref) # :nodoc:
-      if Array === ref && ref[0] == :DRbObject
-        return DRbObject.new_with(ref[1], ref[2])
-      end
-      super(ref)
-    end
-  end
-
-  # The GW provides a synchronized store for participants in the gateway to
-  # communicate.
-
-  class GW
-    include MonitorMixin
-
-    # Creates a new GW
-
-    def initialize
-      super()
-      @hash = {}
-    end
-
-    # Retrieves +key+ from the GW
-
-    def [](key)
-      synchronize do
-        @hash[key]
-      end
-    end
-
-    # Stores value +v+ at +key+ in the GW
-
-    def []=(key, v)
-      synchronize do
-        @hash[key] = v
-      end
-    end
-  end
-
-  class DRbObject # :nodoc:
-    def self._load(s)
-      uri, ref = Marshal.load(s)
-      if DRb.uri == uri
-        return ref ? DRb.to_obj(ref) : DRb.front
-      end
-
-      self.new_with(DRb.uri, [:DRbObject, uri, ref])
-    end
-
-    def _dump(lv)
-      if DRb.uri == @uri
-        if Array === @ref && @ref[0] == :DRbObject
-          Marshal.dump([@ref[1], @ref[2]])
-        else
-          Marshal.dump([@uri, @ref]) # ??
-        end
-      else
-        Marshal.dump([DRb.uri, [:DRbObject, @uri, @ref]])
-      end
-    end
-  end
-end
-
-=begin
-DRb.install_id_conv(DRb::GWIdConv.new)
-
-front = DRb::GW.new
-
-s1 = DRb::DRbServer.new('drbunix:/tmp/gw_b_a', front)
-s2 = DRb::DRbServer.new('drbunix:/tmp/gw_b_c', front)
-
-s1.thread.join
-s2.thread.join
-=end
-
-=begin
-# foo.rb
-
-require 'drb/drb'
-
-class Foo
-  include DRbUndumped
-  def initialize(name, peer=nil)
-    @name = name
-    @peer = peer
-  end
-
-  def ping(obj)
-    puts "#{@name}: ping: #{obj.inspect}"
-    @peer.ping(self) if @peer
-  end
-end
-=end
-
-=begin
-# gw_a.rb
-require 'drb/unix'
-require 'foo'
-
-obj = Foo.new('a')
-DRb.start_service("drbunix:/tmp/gw_a", obj)
-
-robj = DRbObject.new_with_uri('drbunix:/tmp/gw_b_a')
-robj[:a] = obj
-
-DRb.thread.join
-=end
-
-=begin
-# gw_c.rb
-require 'drb/unix'
-require 'foo'
-
-foo = Foo.new('c', nil)
-
-DRb.start_service("drbunix:/tmp/gw_c", nil)
-
-robj = DRbObject.new_with_uri("drbunix:/tmp/gw_b_c")
-
-puts "c->b"
-a = robj[:a]
-sleep 2
-
-a.ping(foo)
-
-DRb.thread.join
-=end
-
diff --git a/lib/drb/invokemethod.rb b/lib/drb/invokemethod.rb
deleted file mode 100644
index 0fae6d52b6a1c8..00000000000000
--- a/lib/drb/invokemethod.rb
+++ /dev/null
@@ -1,35 +0,0 @@
-# frozen_string_literal: false
-# for ruby-1.8.0
-
-module DRb # :nodoc: all
-  class DRbServer
-    module InvokeMethod18Mixin
-      def block_yield(x)
-        if x.size == 1 && x[0].class == Array
-          x[0] = DRbArray.new(x[0])
-        end
-        @block.call(*x)
-      end
-
-      def perform_with_block
-        @obj.__send__(@msg_id, *@argv) do |*x|
-          jump_error = nil
-          begin
-            block_value = block_yield(x)
-          rescue LocalJumpError
-            jump_error = $!
-          end
-          if jump_error
-            case jump_error.reason
-            when :break
-              break(jump_error.exit_value)
-            else
-              raise jump_error
-            end
-          end
-          block_value
-        end
-      end
-    end
-  end
-end
diff --git a/lib/drb/observer.rb b/lib/drb/observer.rb
deleted file mode 100644
index 0fb7301edfb12f..00000000000000
--- a/lib/drb/observer.rb
+++ /dev/null
@@ -1,26 +0,0 @@
-# frozen_string_literal: false
-require 'observer'
-
-module DRb
-  # The Observable module extended to DRb.  See Observable for details.
-  module DRbObservable
-    include Observable
-
-    # Notifies observers of a change in state.  See also
-    # Observable#notify_observers
-    def notify_observers(*arg)
-      if defined? @observer_state and @observer_state
-        if defined? @observer_peers
-          @observer_peers.each do |observer, method|
-            begin
-              observer.__send__(method, *arg)
-            rescue
-              delete_observer(observer)
-            end
-          end
-        end
-        @observer_state = false
-      end
-    end
-  end
-end
diff --git a/lib/drb/ssl.rb b/lib/drb/ssl.rb
deleted file mode 100644
index 54ab1ef395d825..00000000000000
--- a/lib/drb/ssl.rb
+++ /dev/null
@@ -1,344 +0,0 @@
-# frozen_string_literal: false
-require 'socket'
-require 'openssl'
-require_relative 'drb'
-require 'singleton'
-
-module DRb
-
-  # The protocol for DRb over an SSL socket
-  #
-  # The URI for a DRb socket over SSL is:
-  # <code>drbssl://<host>:<port>?<option></code>.  The option is optional
-  class DRbSSLSocket < DRbTCPSocket
-
-    # SSLConfig handles the needed SSL information for establishing a
-    # DRbSSLSocket connection, including generating the X509 / RSA pair.
-    #
-    # An instance of this config can be passed to DRbSSLSocket.new,
-    # DRbSSLSocket.open and DRbSSLSocket.open_server
-    #
-    # See DRb::DRbSSLSocket::SSLConfig.new for more details
-    class SSLConfig
-
-      # Default values for a SSLConfig instance.
-      #
-      # See DRb::DRbSSLSocket::SSLConfig.new for more details
-      DEFAULT = {
-        :SSLCertificate       => nil,
-        :SSLPrivateKey        => nil,
-        :SSLClientCA          => nil,
-        :SSLCACertificatePath => nil,
-        :SSLCACertificateFile => nil,
-        :SSLTmpDhCallback     => nil,
-        :SSLVerifyMode        => ::OpenSSL::SSL::VERIFY_NONE,
-        :SSLVerifyDepth       => nil,
-        :SSLVerifyCallback    => nil,   # custom verification
-        :SSLCertificateStore  => nil,
-        # Must specify if you use auto generated certificate.
-        :SSLCertName          => nil,   # e.g. [["CN","fqdn.example.com"]]
-        :SSLCertComment       => "Generated by Ruby/OpenSSL"
-      }
-
-      # Create a new DRb::DRbSSLSocket::SSLConfig instance
-      #
-      # The DRb::DRbSSLSocket will take either a +config+ Hash or an instance
-      # of SSLConfig, and will setup the certificate for its session for the
-      # configuration. If want it to generate a generic certificate, the bare
-      # minimum is to provide the :SSLCertName
-      #
-      # === Config options
-      #
-      # From +config+ Hash:
-      #
-      # :SSLCertificate ::
-      #   An instance of OpenSSL::X509::Certificate.  If this is not provided,
-      #   then a generic X509 is generated, with a correspond :SSLPrivateKey
-      #
-      # :SSLPrivateKey ::
-      #   A private key instance, like OpenSSL::PKey::RSA.  This key must be
-      #   the key that signed the :SSLCertificate
-      #
-      # :SSLClientCA ::
-      #   An OpenSSL::X509::Certificate, or Array of certificates that will
-      #   used as ClientCAs in the SSL Context
-      #
-      # :SSLCACertificatePath ::
-      #   A path to the directory of CA certificates.  The certificates must
-      #   be in PEM format.
-      #
-      # :SSLCACertificateFile ::
-      #   A path to a CA certificate file, in PEM format.
-      #
-      # :SSLTmpDhCallback ::
-      #   A DH callback. See OpenSSL::SSL::SSLContext.tmp_dh_callback
-      #
-      # :SSLVerifyMode ::
-      #   This is the SSL verification mode.  See OpenSSL::SSL::VERIFY_* for
-      #   available modes.  The default is OpenSSL::SSL::VERIFY_NONE
-      #
-      # :SSLVerifyDepth ::
-      #   Number of CA certificates to walk, when verifying a certificate
-      #   chain.
-      #
-      # :SSLVerifyCallback ::
-      #   A callback to be used for additional verification.  See
-      #   OpenSSL::SSL::SSLContext.verify_callback
-      #
-      # :SSLCertificateStore ::
-      #   A OpenSSL::X509::Store used for verification of certificates
-      #
-      # :SSLCertName ::
-      #   Issuer name for the certificate.  This is required when generating
-      #   the certificate (if :SSLCertificate and :SSLPrivateKey were not
-      #   given).  The value of this is to be an Array of pairs:
-      #
-      #     [["C", "Raleigh"], ["ST","North Carolina"],
-      #      ["CN","fqdn.example.com"]]
-      #
-      #   See also OpenSSL::X509::Name
-      #
-      # :SSLCertComment ::
-      #   A comment to be used for generating the certificate.  The default is
-      #   "Generated by Ruby/OpenSSL"
-      #
-      #
-      # === Example
-      #
-      # These values can be added after the fact, like a Hash.
-      #
-      #   require 'drb/ssl'
-      #   c = DRb::DRbSSLSocket::SSLConfig.new {}
-      #   c[:SSLCertificate] =
-      #     OpenSSL::X509::Certificate.new(File.read('mycert.crt'))
-      #   c[:SSLPrivateKey] = OpenSSL::PKey::RSA.new(File.read('mycert.key'))
-      #   c[:SSLVerifyMode] = OpenSSL::SSL::VERIFY_PEER
-      #   c[:SSLCACertificatePath] = "/etc/ssl/certs/"
-      #   c.setup_certificate
-      #
-      # or
-      #
-      #   require 'drb/ssl'
-      #   c = DRb::DRbSSLSocket::SSLConfig.new({
-      #           :SSLCertName => [["CN" => DRb::DRbSSLSocket.getservername]]
-      #           })
-      #   c.setup_certificate
-      #
-      def initialize(config)
-        @config  = config
-        @cert    = config[:SSLCertificate]
-        @pkey    = config[:SSLPrivateKey]
-        @ssl_ctx = nil
-      end
-
-      # A convenience method to access the values like a Hash
-      def [](key);
-        @config[key] || DEFAULT[key]
-      end
-
-      # Connect to IO +tcp+, with context of the current certificate
-      # configuration
-      def connect(tcp)
-        ssl = ::OpenSSL::SSL::SSLSocket.new(tcp, @ssl_ctx)
-        ssl.sync = true
-        ssl.connect
-        ssl
-      end
-
-      # Accept connection to IO +tcp+, with context of the current certificate
-      # configuration
-      def accept(tcp)
-        ssl = OpenSSL::SSL::SSLSocket.new(tcp, @ssl_ctx)
-        ssl.sync = true
-        ssl.accept
-        ssl
-      end
-
-      # Ensures that :SSLCertificate and :SSLPrivateKey have been provided
-      # or that a new certificate is generated with the other parameters
-      # provided.
-      def setup_certificate
-        if @cert && @pkey
-          return
-        end
-
-        rsa = OpenSSL::PKey::RSA.new(2048){|p, n|
-          next unless self[:verbose]
-          case p
-          when 0; $stderr.putc "."  # BN_generate_prime
-          when 1; $stderr.putc "+"  # BN_generate_prime
-          when 2; $stderr.putc "*"  # searching good prime,
-                                    # n = #of try,
-                                    # but also data from BN_generate_prime
-          when 3; $stderr.putc "\n" # found good prime, n==0 - p, n==1 - q,
-                                    # but also data from BN_generate_prime
-          else;   $stderr.putc "*"  # BN_generate_prime
-          end
-        }
-
-        cert = OpenSSL::X509::Certificate.new
-        cert.version = 3
-        cert.serial = 0
-        name = OpenSSL::X509::Name.new(self[:SSLCertName])
-        cert.subject = name
-        cert.issuer = name
-        cert.not_before = Time.now
-        cert.not_after = Time.now + (365*24*60*60)
-        cert.public_key = rsa.public_key
-
-        ef = OpenSSL::X509::ExtensionFactory.new(nil,cert)
-        cert.extensions = [
-          ef.create_extension("basicConstraints","CA:FALSE"),
-          ef.create_extension("subjectKeyIdentifier", "hash") ]
-        ef.issuer_certificate = cert
-        cert.add_extension(ef.create_extension("authorityKeyIdentifier",
-                                               "keyid:always,issuer:always"))
-        if comment = self[:SSLCertComment]
-          cert.add_extension(ef.create_extension("nsComment", comment))
-        end
-        cert.sign(rsa, "SHA256")
-
-        @cert = cert
-        @pkey = rsa
-      end
-
-      # Establish the OpenSSL::SSL::SSLContext with the configuration
-      # parameters provided.
-      def setup_ssl_context
-        ctx = ::OpenSSL::SSL::SSLContext.new
-        ctx.cert            = @cert
-        ctx.key             = @pkey
-        ctx.client_ca       = self[:SSLClientCA]
-        ctx.ca_path         = self[:SSLCACertificatePath]
-        ctx.ca_file         = self[:SSLCACertificateFile]
-        ctx.tmp_dh_callback = self[:SSLTmpDhCallback]
-        ctx.verify_mode     = self[:SSLVerifyMode]
-        ctx.verify_depth    = self[:SSLVerifyDepth]
-        ctx.verify_callback = self[:SSLVerifyCallback]
-        ctx.cert_store      = self[:SSLCertificateStore]
-        @ssl_ctx = ctx
-      end
-    end
-
-    # Parse the dRuby +uri+ for an SSL connection.
-    #
-    # Expects drbssl://...
-    #
-    # Raises DRbBadScheme or DRbBadURI if +uri+ is not matching or malformed
-    def self.parse_uri(uri) # :nodoc:
-      if /\Adrbssl:\/\/(.*?):(\d+)(\?(.*))?\z/ =~ uri
-        host = $1
-        port = $2.to_i
-        option = $4
-        [host, port, option]
-      else
-        raise(DRbBadScheme, uri) unless uri.start_with?('drbssl:')
-        raise(DRbBadURI, 'can\'t parse uri:' + uri)
-      end
-    end
-
-    # Return an DRb::DRbSSLSocket instance as a client-side connection,
-    # with the SSL connected.  This is called from DRb::start_service or while
-    # connecting to a remote object:
-    #
-    #   DRb.start_service 'drbssl://localhost:0', front, config
-    #
-    # +uri+ is the URI we are connected to,
-    # <code>'drbssl://localhost:0'</code> above, +config+ is our
-    # configuration.  Either a Hash or DRb::DRbSSLSocket::SSLConfig
-    def self.open(uri, config)
-      host, port, = parse_uri(uri)
-      soc = TCPSocket.open(host, port)
-      ssl_conf = SSLConfig::new(config)
-      ssl_conf.setup_ssl_context
-      ssl = ssl_conf.connect(soc)
-      self.new(uri, ssl, ssl_conf, true)
-    end
-
-    # Returns a DRb::DRbSSLSocket instance as a server-side connection, with
-    # the SSL connected.  This is called from DRb::start_service or while
-    # connecting to a remote object:
-    #
-    #   DRb.start_service 'drbssl://localhost:0', front, config
-    #
-    # +uri+ is the URI we are connected to,
-    # <code>'drbssl://localhost:0'</code> above, +config+ is our
-    # configuration.  Either a Hash or DRb::DRbSSLSocket::SSLConfig
-    def self.open_server(uri, config)
-      uri = 'drbssl://:0' unless uri
-      host, port, = parse_uri(uri)
-      if host.size == 0
-        host = getservername
-        soc = open_server_inaddr_any(host, port)
-      else
-        soc = TCPServer.open(host, port)
-      end
-      port = soc.addr[1] if port == 0
-      @uri = "drbssl://#{host}:#{port}"
-
-      ssl_conf = SSLConfig.new(config)
-      ssl_conf.setup_certificate
-      ssl_conf.setup_ssl_context
-      self.new(@uri, soc, ssl_conf, false)
-    end
-
-    # This is a convenience method to parse +uri+ and separate out any
-    # additional options appended in the +uri+.
-    #
-    # Returns an option-less uri and the option => [uri,option]
-    #
-    # The +config+ is completely unused, so passing nil is sufficient.
-    def self.uri_option(uri, config) # :nodoc:
-      host, port, option = parse_uri(uri)
-      return "drbssl://#{host}:#{port}", option
-    end
-
-    # Create a DRb::DRbSSLSocket instance.
-    #
-    # +uri+ is the URI we are connected to.
-    # +soc+ is the tcp socket we are bound to.
-    # +config+ is our configuration. Either a Hash or SSLConfig
-    # +is_established+ is a boolean of whether +soc+ is currently established
-    #
-    # This is called automatically based on the DRb protocol.
-    def initialize(uri, soc, config, is_established)
-      @ssl = is_established ? soc : nil
-      super(uri, soc.to_io, config)
-    end
-
-    # Returns the SSL stream
-    def stream; @ssl; end # :nodoc:
-
-    # Closes the SSL stream before closing the dRuby connection.
-    def close # :nodoc:
-      if @ssl
-        @ssl.close
-        @ssl = nil
-      end
-      super
-    end
-
-    def accept # :nodoc:
-      begin
-      while true
-        soc = accept_or_shutdown
-        return nil unless soc
-        break if (@acl ? @acl.allow_socket?(soc) : true)
-        soc.close
-      end
-      begin
-        ssl = @config.accept(soc)
-      rescue Exception
-        soc.close
-        raise
-      end
-      self.class.new(uri, ssl, @config, true)
-      rescue OpenSSL::SSL::SSLError
-        warn("#{$!.message} (#{$!.class})", uplevel: 0) if @config[:verbose]
-        retry
-      end
-    end
-  end
-
-  DRbProtocol.add_protocol(DRbSSLSocket)
-end
diff --git a/lib/drb/timeridconv.rb b/lib/drb/timeridconv.rb
deleted file mode 100644
index 3ead98a7f24527..00000000000000
--- a/lib/drb/timeridconv.rb
+++ /dev/null
@@ -1,97 +0,0 @@
-# frozen_string_literal: false
-require_relative 'drb'
-require 'monitor'
-
-module DRb
-
-  # Timer id conversion keeps objects alive for a certain amount of time after
-  # their last access.  The default time period is 600 seconds and can be
-  # changed upon initialization.
-  #
-  # To use TimerIdConv:
-  #
-  #  DRb.install_id_conv TimerIdConv.new 60 # one minute
-
-  class TimerIdConv < DRbIdConv
-    class TimerHolder2 # :nodoc:
-      include MonitorMixin
-
-      class InvalidIndexError < RuntimeError; end
-
-      def initialize(keeping=600)
-        super()
-        @sentinel = Object.new
-        @gc = {}
-        @renew = {}
-        @keeping = keeping
-        @expires = nil
-      end
-
-      def add(obj)
-        synchronize do
-          rotate
-          key = obj.__id__
-          @renew[key] = obj
-          invoke_keeper
-          return key
-        end
-      end
-
-      def fetch(key)
-        synchronize do
-          rotate
-          obj = peek(key)
-          raise InvalidIndexError if obj == @sentinel
-          @renew[key] = obj # KeepIt
-          return obj
-        end
-      end
-
-      private
-      def peek(key)
-        return @renew.fetch(key) { @gc.fetch(key, @sentinel) }
-      end
-
-      def invoke_keeper
-        return if @expires
-        @expires = Time.now + @keeping
-        on_gc
-      end
-
-      def on_gc
-        return unless Thread.main.alive?
-        return if @expires.nil?
-        Thread.new { rotate } if @expires < Time.now
-        ObjectSpace.define_finalizer(Object.new) {on_gc}
-      end
-
-      def rotate
-        synchronize do
-          if @expires &.< Time.now
-            @gc = @renew      # GCed
-            @renew = {}
-            @expires = @gc.empty? ? nil : Time.now + @keeping
-          end
-        end
-      end
-    end
-
-    # Creates a new TimerIdConv which will hold objects for +keeping+ seconds.
-    def initialize(keeping=600)
-      @holder = TimerHolder2.new(keeping)
-    end
-
-    def to_obj(ref) # :nodoc:
-      return super if ref.nil?
-      @holder.fetch(ref)
-    rescue TimerHolder2::InvalidIndexError
-      raise "invalid reference"
-    end
-
-    def to_id(obj) # :nodoc:
-      return @holder.add(obj)
-    end
-  end
-end
-
-# DRb.install_id_conv(TimerIdConv.new)
diff --git a/lib/drb/unix.rb b/lib/drb/unix.rb
deleted file mode 100644
index 1629ad3bcd04b0..00000000000000
--- a/lib/drb/unix.rb
+++ /dev/null
@@ -1,118 +0,0 @@
-# frozen_string_literal: false
-require 'socket'
-require_relative 'drb'
-require 'tmpdir'
-
-raise(LoadError, "UNIXServer is required") unless defined?(UNIXServer)
-
-module DRb
-
-  # Implements DRb over a UNIX socket
-  #
-  # DRb UNIX socket URIs look like <code>drbunix:<path>?<option></code>.  The
-  # option is optional.
-
-  class DRbUNIXSocket < DRbTCPSocket
-    # :stopdoc:
-    def self.parse_uri(uri)
-      if /\Adrbunix:(.*?)(\?(.*))?\z/ =~ uri
-        filename = $1
-        option = $3
-        [filename, option]
-      else
-        raise(DRbBadScheme, uri) unless uri.start_with?('drbunix:')
-        raise(DRbBadURI, 'can\'t parse uri:' + uri)
-      end
-    end
-
-    def self.open(uri, config)
-      filename, = parse_uri(uri)
-      soc = UNIXSocket.open(filename)
-      self.new(uri, soc, config)
-    end
-
-    def self.open_server(uri, config)
-      filename, = parse_uri(uri)
-      if filename.size == 0
-        soc = temp_server
-        filename = soc.path
-        uri = 'drbunix:' + soc.path
-      else
-        soc = UNIXServer.open(filename)
-      end
-      owner = config[:UNIXFileOwner]
-      group = config[:UNIXFileGroup]
-      if owner || group
-        require 'etc'
-        owner = Etc.getpwnam( owner ).uid  if owner
-        group = Etc.getgrnam( group ).gid  if group
-        File.chown owner, group, filename
-      end
-      mode = config[:UNIXFileMode]
-      File.chmod(mode, filename) if mode
-
-      self.new(uri, soc, config, true)
-    end
-
-    def self.uri_option(uri, config)
-      filename, option = parse_uri(uri)
-      return "drbunix:#{filename}", option
-    end
-
-    def initialize(uri, soc, config={}, server_mode = false)
-      super(uri, soc, config)
-      set_sockopt(@socket)
-      @server_mode = server_mode
-      @acl = nil
-    end
-
-    # import from tempfile.rb
-    Max_try = 10
-    private
-    def self.temp_server
-      tmpdir = Dir::tmpdir
-      n = 0
-      while true
-        begin
-          tmpname = sprintf('%s/druby%d.%d', tmpdir, $$, n)
-          lock = tmpname + '.lock'
-          unless File.exist?(tmpname) or File.exist?(lock)
-            Dir.mkdir(lock)
-            break
-          end
-        rescue
-          raise "cannot generate tempfile `%s'" % tmpname if n >= Max_try
-          #sleep(1)
-        end
-        n += 1
-      end
-      soc = UNIXServer.new(tmpname)
-      Dir.rmdir(lock)
-      soc
-    end
-
-    public
-    def close
-      return unless @socket
-      shutdown # DRbProtocol#shutdown
-      path = @socket.path if @server_mode
-      @socket.close
-      File.unlink(path) if @server_mode
-      @socket = nil
-      close_shutdown_pipe
-    end
-
-    def accept
-      s = accept_or_shutdown
-      return nil unless s
-      self.class.new(nil, s, @config)
-    end
-
-    def set_sockopt(soc)
-      # no-op for now
-    end
-  end
-
-  DRbProtocol.add_protocol(DRbUNIXSocket)
-  # :startdoc:
-end
diff --git a/lib/drb/version.rb b/lib/drb/version.rb
deleted file mode 100644
index 10d33445b62b46..00000000000000
--- a/lib/drb/version.rb
+++ /dev/null
@@ -1,3 +0,0 @@
-module DRb
-  VERSION = "2.1.1"
-end
diff --git a/lib/drb/weakidconv.rb b/lib/drb/weakidconv.rb
deleted file mode 100644
index ecf0bf515fb9f1..00000000000000
--- a/lib/drb/weakidconv.rb
+++ /dev/null
@@ -1,59 +0,0 @@
-# frozen_string_literal: false
-require_relative 'drb'
-require 'monitor'
-
-module DRb
-
-  # To use WeakIdConv:
-  #
-  #  DRb.start_service(nil, nil, {:idconv => DRb::WeakIdConv.new})
-
-  class WeakIdConv < DRbIdConv
-    class WeakSet
-      include MonitorMixin
-      def initialize
-        super()
-        @immutable = {}
-        @map = ObjectSpace::WeakMap.new
-      end
-
-      def add(obj)
-        synchronize do
-          begin
-            @map[obj] = self
-          rescue ArgumentError
-            @immutable[obj.__id__] = obj
-          end
-          return obj.__id__
-        end
-      end
-
-      def fetch(ref)
-        synchronize do
-          @immutable.fetch(ref) {
-            @map.each { |key, _|
-              return key if key.__id__ == ref
-            }
-            raise RangeError.new("invalid reference")
-          }
-        end
-      end
-    end
-
-    def initialize()
-      super()
-      @weak_set = WeakSet.new
-    end
-
-    def to_obj(ref) # :nodoc:
-      return super if ref.nil?
-      @weak_set.fetch(ref)
-    end
-
-    def to_id(obj) # :nodoc:
-      return @weak_set.add(obj)
-    end
-  end
-end
-
-# DRb.install_id_conv(WeakIdConv.new)
diff --git a/lib/erb.rb b/lib/erb.rb
index bc1615d7da6e6d..ebf91e4792d67e 100644
--- a/lib/erb.rb
+++ b/lib/erb.rb
@@ -12,7 +12,6 @@
 #
 # You can redistribute it and/or modify it under the same terms as Ruby.
 
-require 'cgi/util'
 require 'erb/version'
 require 'erb/compiler'
 require 'erb/def_method'
@@ -294,7 +293,7 @@ def self.version
   #  # build data class
   #  class Listings
   #    PRODUCT = { :name => "Chicken Fried Steak",
-  #                :desc => "A well messages pattie, breaded and fried.",
+  #                :desc => "A well messaged pattie, breaded and fried.",
   #                :cost => 9.95 }
   #
   #    attr_reader :product, :price
@@ -327,10 +326,10 @@ def self.version
   # _Generates_
   #
   #  Chicken Fried Steak
-  #  A well messages pattie, breaded and fried.
+  #  A well massaged pattie, breaded and fried.
   #
   #  Chicken Fried Steak -- 9.95
-  #  A well messages pattie, breaded and fried.
+  #  A well massaged pattie, breaded and fried.
   #
   def initialize(str, safe_level=NOT_GIVEN, legacy_trim_mode=NOT_GIVEN, legacy_eoutvar=NOT_GIVEN, trim_mode: nil, eoutvar: '_erbout')
     # Complex initializer for $SAFE deprecation at [Feature #14256]. Use keyword arguments to pass trim_mode or eoutvar.
@@ -353,7 +352,7 @@ def initialize(str, safe_level=NOT_GIVEN, legacy_trim_mode=NOT_GIVEN, legacy_eou
     @lineno = 0
     @_init = self.class.singleton_class
   end
-  NOT_GIVEN = Object.new
+  NOT_GIVEN = defined?(Ractor) ? Ractor.make_shareable(Object.new) : Object.new
   private_constant :NOT_GIVEN
 
   ##
@@ -416,8 +415,7 @@ def run(b=new_toplevel)
 
   #
   # Executes the generated ERB code to produce a completed template, returning
-  # the results of that code.  (See ERB::new for details on how this process
-  # can be affected by _safe_level_.)
+  # the results of that code.
   #
   # _b_ accepts a Binding object which is used to set the context of
   # code evaluation.
diff --git a/lib/erb/compiler.rb b/lib/erb/compiler.rb
index 7096c8dcea802c..08b5eb4ee1d220 100644
--- a/lib/erb/compiler.rb
+++ b/lib/erb/compiler.rb
@@ -80,10 +80,16 @@ def initialize(str)
   end
 
   class Scanner # :nodoc:
-    @scanner_map = {}
+    @scanner_map = defined?(Ractor) ? Ractor.make_shareable({}) : {}
     class << self
-      def register_scanner(klass, trim_mode, percent)
-        @scanner_map[[trim_mode, percent]] = klass
+      if defined?(Ractor)
+        def register_scanner(klass, trim_mode, percent)
+          @scanner_map = Ractor.make_shareable({ **@scanner_map, [trim_mode, percent] => klass })
+        end
+      else
+        def register_scanner(klass, trim_mode, percent)
+          @scanner_map[[trim_mode, percent]] = klass
+        end
       end
       alias :regist_scanner :register_scanner
     end
@@ -466,7 +472,17 @@ def detect_magic_comment(s, enc = nil)
     return enc, frozen
   end
 
+  # :stopdoc:
+  WARNING_UPLEVEL = Class.new {
+    attr_reader :c
+    def initialize from
+      @c = caller.length - from.length
+    end
+  }.new(caller(0)).c
+  private_constant :WARNING_UPLEVEL
+  # :startdoc:
+
   def warn_invalid_trim_mode(mode, uplevel:)
-    warn "Invalid ERB trim mode: #{mode.inspect} (trim_mode: nil, 0, 1, 2, or String composed of '%' and/or '-', '>', '<>')", uplevel: uplevel + 1
+    warn "Invalid ERB trim mode: #{mode.inspect} (trim_mode: nil, 0, 1, 2, or String composed of '%' and/or '-', '>', '<>')", uplevel: uplevel + WARNING_UPLEVEL
   end
 end
diff --git a/lib/erb/def_method.rb b/lib/erb/def_method.rb
index aee989a926ea94..e503b3714085b8 100644
--- a/lib/erb/def_method.rb
+++ b/lib/erb/def_method.rb
@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-#--
+
 # ERB::DefMethod
 #
 # Utility module to define eRuby script as instance method.
diff --git a/lib/erb.gemspec b/lib/erb/erb.gemspec
similarity index 81%
rename from lib/erb.gemspec
rename to lib/erb/erb.gemspec
index 94a8fd5c3ec795..94edc686825419 100644
--- a/lib/erb.gemspec
+++ b/lib/erb/erb.gemspec
@@ -2,19 +2,18 @@ begin
   require_relative 'lib/erb/version'
 rescue LoadError
   # for Ruby core repository
-  require_relative 'erb/version'
+  require_relative 'version'
 end
 
 Gem::Specification.new do |spec|
   spec.name          = 'erb'
-  spec.version       = ERB.const_get(:VERSION, false)
+  spec.version       = ERB::VERSION
   spec.authors       = ['Masatoshi SEKI', 'Takashi Kokubun']
   spec.email         = ['seki@ruby-lang.org', 'k0kubun@ruby-lang.org']
 
   spec.summary       = %q{An easy to use but powerful templating system for Ruby.}
   spec.description   = %q{An easy to use but powerful templating system for Ruby.}
   spec.homepage      = 'https://github.com/ruby/erb'
-  spec.required_ruby_version = Gem::Requirement.new('>= 2.5.0')
   spec.licenses      = ['Ruby', 'BSD-2-Clause']
 
   spec.metadata['homepage_uri'] = spec.homepage
@@ -27,12 +26,11 @@ Gem::Specification.new do |spec|
   spec.executables   = ['erb']
   spec.require_paths = ['lib']
 
+  spec.required_ruby_version = '>= 3.2.0'
+
   if RUBY_ENGINE == 'jruby'
     spec.platform = 'java'
   else
-    spec.required_ruby_version = '>= 2.7.0'
     spec.extensions = ['ext/erb/escape/extconf.rb']
   end
-
-  spec.add_dependency 'cgi', '>= 0.3.3'
 end
diff --git a/lib/erb/util.rb b/lib/erb/util.rb
index 1d2a36275dbbeb..42c7a5762215b9 100644
--- a/lib/erb/util.rb
+++ b/lib/erb/util.rb
@@ -1,17 +1,23 @@
 # frozen_string_literal: true
-#--
-# ERB::Escape
-#
-# A subset of ERB::Util. Unlike ERB::Util#html_escape, we expect/hope
-# Rails will not monkey-patch ERB::Escape#html_escape.
+
+# Load CGI.escapeHTML and CGI.escapeURIComponent.
+# CRuby:
+#   cgi.gem v0.1.0+ (Ruby 2.7-3.4) and Ruby 3.5+ stdlib have 'cgi/escape' and CGI.escapeHTML.
+#   cgi.gem v0.3.3+ (Ruby 3.2-3.4) and Ruby 3.5+ stdlib have CGI.escapeURIComponent.
+# JRuby: cgi.gem has a Java extension 'cgi/escape'.
+# TruffleRuby: lib/truffle/cgi/escape.rb requires 'cgi/util'.
+require 'cgi/escape'
+
+# Load or define ERB::Escape#html_escape.
+# We don't build the C extention 'cgi/escape' for JRuby, TruffleRuby, and WASM.
+# miniruby (used by CRuby build scripts) also fails to load erb/escape.so.
 begin
-  # We don't build the C extension for JRuby, TruffleRuby, and WASM
-  if $LOAD_PATH.resolve_feature_path('erb/escape')
-    require 'erb/escape'
-  end
-rescue LoadError # resolve_feature_path raises LoadError on TruffleRuby 22.3.0
-end
-unless defined?(ERB::Escape)
+  require 'erb/escape'
+rescue LoadError
+  # ERB::Escape
+  #
+  # A subset of ERB::Util. Unlike ERB::Util#html_escape, we expect/hope
+  # Rails will not monkey-patch ERB::Escape#html_escape.
   module ERB::Escape
     def html_escape(s)
       CGI.escapeHTML(s.to_s)
@@ -20,7 +26,6 @@ def html_escape(s)
   end
 end
 
-#--
 # ERB::Util
 #
 # A utility module for conversion routines, often handy in HTML generation.
@@ -54,8 +59,16 @@ module ERB::Util
   #
   #   Programming%20Ruby%3A%20%20The%20Pragmatic%20Programmer%27s%20Guide
   #
-  def url_encode(s)
-    CGI.escapeURIComponent(s.to_s)
+  if CGI.respond_to?(:escapeURIComponent)
+    def url_encode(s)
+      CGI.escapeURIComponent(s.to_s)
+    end
+  else # cgi.gem <= v0.3.2
+    def url_encode(s)
+      s.to_s.b.gsub(/[^a-zA-Z0-9_\-.~]/n) do |m|
+        sprintf("%%%02X", m.unpack1("C"))
+      end
+    end
   end
   alias u url_encode
   module_function :u
diff --git a/lib/erb/version.rb b/lib/erb/version.rb
index 295fc5fa6f7964..3d0cedcd48475d 100644
--- a/lib/erb/version.rb
+++ b/lib/erb/version.rb
@@ -1,5 +1,4 @@
 # frozen_string_literal: true
 class ERB
-  VERSION = '4.0.3'
-  private_constant :VERSION
+  VERSION = '5.0.1'
 end
diff --git a/lib/error_highlight/base.rb b/lib/error_highlight/base.rb
index 7d2ff0c889987a..14e0ce5785a354 100644
--- a/lib/error_highlight/base.rb
+++ b/lib/error_highlight/base.rb
@@ -54,11 +54,20 @@ def self.spot(obj, **opts)
 
       return nil unless Thread::Backtrace::Location === loc
 
-      node = RubyVM::AbstractSyntaxTree.of(loc, keep_script_lines: true)
+      node =
+        begin
+          RubyVM::AbstractSyntaxTree.of(loc, keep_script_lines: true)
+        rescue RuntimeError => error
+          # RubyVM::AbstractSyntaxTree.of raises an error with a message that
+          # includes "prism" when the ISEQ was compiled with the prism compiler.
+          # In this case, we'll try to parse again with prism instead.
+          raise unless error.message.include?("prism")
+          prism_find(loc)
+        end
 
       Spotter.new(node, **opts).spot
 
-    when RubyVM::AbstractSyntaxTree::Node
+    when RubyVM::AbstractSyntaxTree::Node, Prism::Node
       Spotter.new(obj, **opts).spot
 
     else
@@ -72,6 +81,21 @@ def self.spot(obj, **opts)
     return nil
   end
 
+  # Accepts a Thread::Backtrace::Location object and returns a Prism::Node
+  # corresponding to the backtrace location in the source code.
+  def self.prism_find(location)
+    require "prism"
+    return nil if Prism::VERSION < "1.0.0"
+
+    absolute_path = location.absolute_path
+    return unless absolute_path
+
+    node_id = RubyVM::AbstractSyntaxTree.node_id_for_backtrace_location(location)
+    Prism.parse_file(absolute_path).value.breadth_first_search { |node| node.node_id == node_id }
+  end
+
+  private_class_method :prism_find
+
   class Spotter
     class NonAscii < Exception; end
     private_constant :NonAscii
@@ -104,31 +128,49 @@ def initialize(node, point_type: :name, name: nil)
     def spot
       return nil unless @node
 
-      if OPT_GETCONSTANT_PATH && @node.type == :COLON2
+      if OPT_GETCONSTANT_PATH
         # In Ruby 3.2 or later, a nested constant access (like `Foo::Bar::Baz`)
         # is compiled to one instruction (opt_getconstant_path).
         # @node points to the node of the whole `Foo::Bar::Baz` even if `Foo`
         # or `Foo::Bar` causes NameError.
         # So we try to spot the sub-node that causes the NameError by using
         # `NameError#name`.
-        subnodes = []
-        node = @node
-        while node.type == :COLON2
-          node2, const = node.children
-          subnodes << node if const == @name
-          node = node2
-        end
-        if node.type == :CONST || node.type == :COLON3
-          if node.children.first == @name
+        case @node.type
+        when :COLON2
+          subnodes = []
+          node = @node
+          while node.type == :COLON2
+            node2, const = node.children
+            subnodes << node if const == @name
+            node = node2
+          end
+          if node.type == :CONST || node.type == :COLON3
+            if node.children.first == @name
+              subnodes << node
+            end
+
+            # If we found only one sub-node whose name is equal to @name, use it
+            return nil if subnodes.size != 1
+            @node = subnodes.first
+          else
+            # Do nothing; opt_getconstant_path is used only when the const base is
+            # NODE_CONST (`Foo`) or NODE_COLON3 (`::Foo`)
+          end
+        when :constant_path_node
+          subnodes = []
+          node = @node
+
+          begin
+            subnodes << node if node.name == @name
+          end while (node = node.parent).is_a?(Prism::ConstantPathNode)
+
+          if node.is_a?(Prism::ConstantReadNode) && node.name == @name
             subnodes << node
           end
 
           # If we found only one sub-node whose name is equal to @name, use it
           return nil if subnodes.size != 1
           @node = subnodes.first
-        else
-          # Do nothing; opt_getconstant_path is used only when the const base is
-          # NODE_CONST (`Foo`) or NODE_COLON3 (`::Foo`)
         end
       end
 
@@ -196,6 +238,48 @@ def spot
 
       when :OP_CDECL
         spot_op_cdecl
+
+      when :call_node
+        case @point_type
+        when :name
+          prism_spot_call_for_name
+        when :args
+          prism_spot_call_for_args
+        end
+
+      when :local_variable_operator_write_node
+        case @point_type
+        when :name
+          prism_spot_local_variable_operator_write_for_name
+        when :args
+          prism_spot_local_variable_operator_write_for_args
+        end
+
+      when :call_operator_write_node
+        case @point_type
+        when :name
+          prism_spot_call_operator_write_for_name
+        when :args
+          prism_spot_call_operator_write_for_args
+        end
+
+      when :index_operator_write_node
+        case @point_type
+        when :name
+          prism_spot_index_operator_write_for_name
+        when :args
+          prism_spot_index_operator_write_for_args
+        end
+
+      when :constant_read_node
+        prism_spot_constant_read
+
+      when :constant_path_node
+        prism_spot_constant_path
+
+      when :constant_path_operator_write_node
+        prism_spot_constant_path_operator_write
+
       end
 
       if @snippet && @beg_column && @end_column && @beg_column < @end_column
@@ -260,6 +344,7 @@ def spot_call_for_name
         end
       elsif mid.to_s =~ /\A\W+\z/ && lines.match(/\G\s*(#{ Regexp.quote(mid) })=.*\n/, nd_recv.last_column)
         @snippet = $` + $&
+        @beg_lineno = @end_lineno = lineno
         @beg_column = $~.begin(1)
         @end_column = $~.end(1)
       end
@@ -498,8 +583,9 @@ def spot_colon2
         @beg_column = nd_parent.last_column
         @end_column = @node.last_column
       else
-        @snippet = @fetch[@node.last_lineno]
+        fetch_line(@node.last_lineno)
         if @snippet[...@node.last_column].match(/#{ Regexp.quote(const) }\z/)
+          @beg_lineno = @end_lineno = @node.last_lineno
           @beg_column = $~.begin(0)
           @end_column = $~.end(0)
         end
@@ -513,7 +599,7 @@ def spot_op_cdecl
       nd_lhs, op, _nd_rhs = @node.children
       *nd_parent_lhs, _const = nd_lhs.children
       if @name == op
-        @snippet = @fetch[nd_lhs.last_lineno]
+        fetch_line(nd_lhs.last_lineno)
         if @snippet.match(/\G\s*(#{ Regexp.quote(op) })=/, nd_lhs.last_column)
           @beg_column = $~.begin(1)
           @end_column = $~.end(1)
@@ -523,12 +609,12 @@ def spot_op_cdecl
         @end_column = nd_lhs.last_column
         if nd_parent_lhs.empty? # example: ::C += 1
           if nd_lhs.first_lineno == nd_lhs.last_lineno
-            @snippet = @fetch[nd_lhs.last_lineno]
+            fetch_line(nd_lhs.last_lineno)
             @beg_column = nd_lhs.first_column
           end
         else # example: Foo::Bar::C += 1
           if nd_parent_lhs.last.last_lineno == nd_lhs.last_lineno
-            @snippet = @fetch[nd_lhs.last_lineno]
+            fetch_line(nd_lhs.last_lineno)
             @beg_column = nd_parent_lhs.last.last_column
           end
         end
@@ -539,6 +625,207 @@ def fetch_line(lineno)
       @beg_lineno = @end_lineno = lineno
       @snippet = @fetch[lineno]
     end
+
+    # Take a location from the prism parser and set the necessary instance
+    # variables.
+    def prism_location(location)
+      @beg_lineno = location.start_line
+      @beg_column = location.start_column
+      @end_lineno = location.end_line
+      @end_column = location.end_column
+      @snippet = @fetch[@beg_lineno, @end_lineno]
+    end
+
+    # Example:
+    #   x.foo
+    #    ^^^^
+    #   x.foo(42)
+    #    ^^^^
+    #   x&.foo
+    #    ^^^^^
+    #   x[42]
+    #    ^^^^
+    #   x.foo = 1
+    #    ^^^^^^
+    #   x[42] = 1
+    #    ^^^^^^
+    #   x + 1
+    #     ^
+    #   +x
+    #   ^
+    #   foo(42)
+    #   ^^^
+    #   foo 42
+    #   ^^^
+    #   foo
+    #   ^^^
+    def prism_spot_call_for_name
+      # Explicitly turn off foo.() syntax because error_highlight expects this
+      # to not work.
+      return nil if @node.name == :call && @node.message_loc.nil?
+
+      location = @node.message_loc || @node.call_operator_loc || @node.location
+      location = @node.call_operator_loc.join(location) if @node.call_operator_loc&.start_line == location.start_line
+
+      # If the method name ends with "=" but the message does not, then this is
+      # a method call using the "attribute assignment" syntax
+      # (e.g., foo.bar = 1). In this case we need to go retrieve the = sign and
+      # add it to the location.
+      if (name = @node.name).end_with?("=") && !@node.message.end_with?("=")
+        location = location.adjoin("=")
+      end
+
+      prism_location(location)
+
+      if !name.end_with?("=") && !name.match?(/[[:alpha:]_\[]/)
+        # If the method name is an operator, then error_highlight only
+        # highlights the first line.
+        fetch_line(location.start_line)
+      end
+    end
+
+    # Example:
+    #   x.foo(42)
+    #         ^^
+    #   x[42]
+    #     ^^
+    #   x.foo = 1
+    #           ^
+    #   x[42] = 1
+    #     ^^^^^^^
+    #   x[] = 1
+    #     ^^^^^
+    #   x + 1
+    #       ^
+    #   foo(42)
+    #       ^^
+    #   foo 42
+    #       ^^
+    def prism_spot_call_for_args
+      # Disallow highlighting arguments if there are no arguments.
+      return if @node.arguments.nil?
+
+      # Explicitly turn off foo.() syntax because error_highlight expects this
+      # to not work.
+      return nil if @node.name == :call && @node.message_loc.nil?
+
+      if @node.name == :[]= && @node.opening == "[" && (@node.arguments&.arguments || []).length == 1
+        prism_location(@node.opening_loc.copy(start_offset: @node.opening_loc.start_offset + 1).join(@node.arguments.location))
+      else
+        prism_location(@node.arguments.location)
+      end
+    end
+
+    # Example:
+    #   x += 1
+    #     ^
+    def prism_spot_local_variable_operator_write_for_name
+      prism_location(@node.binary_operator_loc.chop)
+    end
+
+    # Example:
+    #   x += 1
+    #        ^
+    def prism_spot_local_variable_operator_write_for_args
+      prism_location(@node.value.location)
+    end
+
+    # Example:
+    #   x.foo += 42
+    #    ^^^     (for foo)
+    #   x.foo += 42
+    #         ^  (for +)
+    #   x.foo += 42
+    #    ^^^^^^^ (for foo=)
+    def prism_spot_call_operator_write_for_name
+      if !@name.start_with?(/[[:alpha:]_]/)
+        prism_location(@node.binary_operator_loc.chop)
+      else
+        location = @node.message_loc
+        if @node.call_operator_loc.start_line == location.start_line
+          location = @node.call_operator_loc.join(location)
+        end
+
+        location = location.adjoin("=") if @name.end_with?("=")
+        prism_location(location)
+      end
+    end
+
+    # Example:
+    #   x.foo += 42
+    #            ^^
+    def prism_spot_call_operator_write_for_args
+      prism_location(@node.value.location)
+    end
+
+    # Example:
+    #   x[1] += 42
+    #    ^^^    (for [])
+    #   x[1] += 42
+    #        ^  (for +)
+    #   x[1] += 42
+    #    ^^^^^^ (for []=)
+    def prism_spot_index_operator_write_for_name
+      case @name
+      when :[]
+        prism_location(@node.opening_loc.join(@node.closing_loc))
+      when :[]=
+        prism_location(@node.opening_loc.join(@node.closing_loc).adjoin("="))
+      else
+        # Explicitly turn off foo[] += 1 syntax when the operator is not on
+        # the same line because error_highlight expects this to not work.
+        return nil if @node.binary_operator_loc.start_line != @node.opening_loc.start_line
+
+        prism_location(@node.binary_operator_loc.chop)
+      end
+    end
+
+    # Example:
+    #   x[1] += 42
+    #     ^^^^^^^^
+    def prism_spot_index_operator_write_for_args
+      opening_loc =
+        if @node.arguments.nil?
+          @node.opening_loc.copy(start_offset: @node.opening_loc.start_offset + 1)
+        else
+          @node.arguments.location
+        end
+
+      prism_location(opening_loc.join(@node.value.location))
+    end
+
+    # Example:
+    #   Foo
+    #   ^^^
+    def prism_spot_constant_read
+      prism_location(@node.location)
+    end
+
+    # Example:
+    #   Foo::Bar
+    #      ^^^^^
+    def prism_spot_constant_path
+      if @node.parent && @node.parent.location.end_line == @node.location.end_line
+        fetch_line(@node.parent.location.end_line)
+        prism_location(@node.delimiter_loc.join(@node.name_loc))
+      else
+        fetch_line(@node.location.end_line)
+        location = @node.name_loc
+        location = @node.delimiter_loc.join(location) if @node.delimiter_loc.end_line == location.start_line
+        prism_location(location)
+      end
+    end
+
+    # Example:
+    #   Foo::Bar += 1
+    #      ^^^^^^^^
+    def prism_spot_constant_path_operator_write
+      if @name == (target = @node.target).name
+        prism_location(target.delimiter_loc.join(target.name_loc))
+      else
+        prism_location(@node.binary_operator_loc.chop)
+      end
+    end
   end
 
   private_constant :Spotter
diff --git a/lib/error_highlight/formatter.rb b/lib/error_highlight/formatter.rb
index 20ca78d468a78c..5180576405b17d 100644
--- a/lib/error_highlight/formatter.rb
+++ b/lib/error_highlight/formatter.rb
@@ -1,15 +1,66 @@
 module ErrorHighlight
   class DefaultFormatter
+    MIN_SNIPPET_WIDTH = 20
+
     def self.message_for(spot)
       # currently only a one-line code snippet is supported
-      if spot[:first_lineno] == spot[:last_lineno]
-        indent = spot[:snippet][0...spot[:first_column]].gsub(/[^\t]/, " ")
-        marker = indent + "^" * (spot[:last_column] - spot[:first_column])
+      return "" unless spot[:first_lineno] == spot[:last_lineno]
+
+      snippet      = spot[:snippet]
+      first_column = spot[:first_column]
+      last_column  = spot[:last_column]
+      ellipsis     = "..."
+
+      # truncate snippet to fit in the viewport
+      if max_snippet_width && snippet.size > max_snippet_width
+        available_width = max_snippet_width - ellipsis.size
+        center          = first_column - max_snippet_width / 2
+
+        visible_start  = last_column < available_width ? 0 : [center, 0].max
+        visible_end    = visible_start + max_snippet_width
+        visible_start  = snippet.size - max_snippet_width if visible_end > snippet.size
+
+        prefix = visible_start.positive?    ? ellipsis : ""
+        suffix = visible_end < snippet.size ? ellipsis : ""
 
-        "\n\n#{ spot[:snippet] }#{ marker }"
-      else
-        ""
+        snippet = prefix + snippet[(visible_start + prefix.size)...(visible_end - suffix.size)] + suffix
+        snippet << "\n" unless snippet.end_with?("\n")
+
+        first_column -= visible_start
+        last_column  = [last_column - visible_start, snippet.size - 1].min
       end
+
+      indent = snippet[0...first_column].gsub(/[^\t]/, " ")
+      marker = indent + "^" * (last_column - first_column)
+
+      "\n\n#{ snippet }#{ marker }"
+    end
+
+    def self.max_snippet_width
+      return if Ractor.current[:__error_highlight_max_snippet_width__] == :disabled
+
+      Ractor.current[:__error_highlight_max_snippet_width__] ||= terminal_width
+    end
+
+    def self.max_snippet_width=(width)
+      return Ractor.current[:__error_highlight_max_snippet_width__] = :disabled if width.nil?
+
+      width = width.to_i
+
+      if width < MIN_SNIPPET_WIDTH
+        warn "'max_snippet_width' adjusted to minimum value of #{MIN_SNIPPET_WIDTH}."
+        width = MIN_SNIPPET_WIDTH
+      end
+
+      Ractor.current[:__error_highlight_max_snippet_width__] = width
+    end
+
+    def self.terminal_width
+      # lazy load io/console, so it's not loaded when 'max_snippet_width' is set
+      require "io/console"
+      $stderr.winsize[1] if $stderr.tty?
+    rescue LoadError, NoMethodError, SystemCallError
+      # do not truncate when window size is not available
     end
   end
 
diff --git a/lib/error_highlight/version.rb b/lib/error_highlight/version.rb
index 5afe5f06d698e9..d7a29c7c1e68db 100644
--- a/lib/error_highlight/version.rb
+++ b/lib/error_highlight/version.rb
@@ -1,3 +1,3 @@
 module ErrorHighlight
-  VERSION = "0.5.1"
+  VERSION = "0.7.0"
 end
diff --git a/lib/fileutils.gemspec b/lib/fileutils.gemspec
index 76baea30394647..2603d664da7255 100644
--- a/lib/fileutils.gemspec
+++ b/lib/fileutils.gemspec
@@ -17,7 +17,7 @@ Gem::Specification.new do |s|
   s.description = "Several file utility methods for copying, moving, removing, etc."
 
   s.require_path = %w{lib}
-  s.files = ["LICENSE.txt", "README.md", "Rakefile", "fileutils.gemspec", "lib/fileutils.rb"]
+  s.files = ["COPYING", "BSDL", "README.md", "Rakefile", "fileutils.gemspec", "lib/fileutils.rb"]
   s.required_ruby_version = ">= 2.5.0"
 
   s.authors = ["Minero Aoki"]
diff --git a/lib/fileutils.rb b/lib/fileutils.rb
index 6e7c3174cb48bb..b9d683797ab03b 100644
--- a/lib/fileutils.rb
+++ b/lib/fileutils.rb
@@ -180,7 +180,8 @@
 # - {CVE-2004-0452}[https://cve.mitre.org/cgi-bin/cvename.cgi?name=CAN-2004-0452].
 #
 module FileUtils
-  VERSION = "1.7.1"
+  # The version number.
+  VERSION = "1.7.3"
 
   def self.private_module_function(name)   #:nodoc:
     module_function name
@@ -1651,7 +1652,7 @@ def user_mask(target)  #:nodoc:
       when "a"
         mask | 07777
       else
-        raise ArgumentError, "invalid `who' symbol in file mode: #{chr}"
+        raise ArgumentError, "invalid 'who' symbol in file mode: #{chr}"
       end
     end
   end
@@ -1705,7 +1706,7 @@ def symbolic_modes_to_i(mode_sym, path)  #:nodoc:
             copy_mask = user_mask(chr)
             (current_mode & copy_mask) / (copy_mask & 0111) * (user_mask & 0111)
           else
-            raise ArgumentError, "invalid `perm' symbol in file mode: #{chr}"
+            raise ArgumentError, "invalid 'perm' symbol in file mode: #{chr}"
           end
         end
 
@@ -2028,21 +2029,22 @@ def touch(list, noop: nil, verbose: nil, mtime: nil, nocreate: nil)
 
   private
 
-  module StreamUtils_
+  module StreamUtils_ # :nodoc:
+
     private
 
     case (defined?(::RbConfig) ? ::RbConfig::CONFIG['host_os'] : ::RUBY_PLATFORM)
     when /mswin|mingw/
-      def fu_windows?; true end
+      def fu_windows?; true end #:nodoc:
     else
-      def fu_windows?; false end
+      def fu_windows?; false end #:nodoc:
     end
 
     def fu_copy_stream0(src, dest, blksize = nil)   #:nodoc:
       IO.copy_stream(src, dest)
     end
 
-    def fu_stream_blksize(*streams)
+    def fu_stream_blksize(*streams) #:nodoc:
       streams.each do |s|
         next unless s.respond_to?(:stat)
         size = fu_blksize(s.stat)
@@ -2051,14 +2053,14 @@ def fu_stream_blksize(*streams)
       fu_default_blksize()
     end
 
-    def fu_blksize(st)
+    def fu_blksize(st) #:nodoc:
       s = st.blksize
       return nil unless s
       return nil if s == 0
       s
     end
 
-    def fu_default_blksize
+    def fu_default_blksize #:nodoc:
       1024
     end
   end
@@ -2503,7 +2505,7 @@ def fu_output_message(msg)   #:nodoc:
   end
   private_module_function :fu_output_message
 
-  def fu_split_path(path)
+  def fu_split_path(path) #:nodoc:
     path = File.path(path)
     list = []
     until (parent, base = File.split(path); parent == path or parent == ".")
@@ -2524,7 +2526,7 @@ def fu_relative_components_from(target, base) #:nodoc:
   end
   private_module_function :fu_relative_components_from
 
-  def fu_clean_components(*comp)
+  def fu_clean_components(*comp) #:nodoc:
     comp.shift while comp.first == "."
     return comp if comp.empty?
     clean = [comp.shift]
@@ -2543,11 +2545,11 @@ def fu_clean_components(*comp)
   private_module_function :fu_clean_components
 
   if fu_windows?
-    def fu_starting_path?(path)
+    def fu_starting_path?(path) #:nodoc:
       path&.start_with?(%r(\w:|/))
     end
   else
-    def fu_starting_path?(path)
+    def fu_starting_path?(path) #:nodoc:
       path&.start_with?("/")
     end
   end
diff --git a/lib/find.gemspec b/lib/find.gemspec
index cb845e940985e2..aef24a502844ca 100644
--- a/lib/find.gemspec
+++ b/lib/find.gemspec
@@ -25,7 +25,5 @@ Gem::Specification.new do |spec|
   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/find.rb b/lib/find.rb
index 79e2e2854d67ea..98a79cc76dad7c 100644
--- a/lib/find.rb
+++ b/lib/find.rb
@@ -27,7 +27,7 @@
 #
 module Find
 
-  VERSION = "0.1.1"
+  VERSION = "0.2.0"
 
   #
   # Calls the associated block with the name of every file and directory listed
diff --git a/lib/getoptlong.gemspec b/lib/getoptlong.gemspec
deleted file mode 100644
index c2f65dcaab7317..00000000000000
--- a/lib/getoptlong.gemspec
+++ /dev/null
@@ -1,30 +0,0 @@
-# frozen_string_literal: true
-
-name = File.basename(__FILE__, ".gemspec")
-version = ["lib", Array.new(name.count("-")+1, ".").join("/")].find do |dir|
-  break File.foreach(File.join(__dir__, dir, "#{name.tr('-', '/')}.rb")) do |line|
-    /^\s*VERSION\s*=\s*"(.*)"/ =~ line and break $1
-  end rescue nil
-end
-
-Gem::Specification.new do |spec|
-  spec.name          = name
-  spec.version       = version
-  spec.authors       = ["Yukihiro Matsumoto"]
-  spec.email         = ["matz@ruby-lang.org"]
-
-  spec.summary       = %q{GetoptLong for Ruby}
-  spec.description   = spec.summary
-  spec.homepage      = "https://github.com/ruby/getoptlong"
-  spec.licenses      = ["Ruby", "BSD-2-Clause"]
-
-  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 2>#{IO::NULL}`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
-  end
-  spec.require_paths = ["lib"]
-end
diff --git a/lib/getoptlong.rb b/lib/getoptlong.rb
deleted file mode 100644
index ec77272d2684bc..00000000000000
--- a/lib/getoptlong.rb
+++ /dev/null
@@ -1,867 +0,0 @@
-# frozen_string_literal: true
-#
-# GetoptLong for Ruby
-#
-# Copyright (C) 1998, 1999, 2000  Motoyuki Kasahara.
-#
-# You may redistribute and/or modify this library under the same license
-# terms as Ruby.
-
-# \Class \GetoptLong provides parsing both for options
-# and for regular arguments.
-#
-# Using \GetoptLong, you can define options for your program.
-# The program can then capture and respond to whatever options
-# are included in the command that executes the program.
-#
-# A simple example: file <tt>simple.rb</tt>:
-#
-#   :include: ../sample/getoptlong/simple.rb
-#
-# If you are somewhat familiar with options,
-# you may want to skip to this
-# {full example}[#class-GetoptLong-label-Full+Example].
-#
-# == Options
-#
-# A \GetoptLong option has:
-#
-# - A string <em>option name</em>.
-# - Zero or more string <em>aliases</em> for the name.
-# - An <em>option type</em>.
-#
-# Options may be defined by calling singleton method GetoptLong.new,
-# which returns a new \GetoptLong object.
-# Options may then be processed by calling other methods
-# such as GetoptLong#each.
-#
-# === Option Name and Aliases
-#
-# In the array that defines an option,
-# the first element is the string option name.
-# Often the name takes the 'long' form, beginning with two hyphens.
-#
-# The option name may have any number of aliases,
-# which are defined by additional string elements.
-#
-# The name and each alias must be of one of two forms:
-#
-# - Two hyphens, followed by one or more letters.
-# - One hyphen, followed by a single letter.
-#
-# File <tt>aliases.rb</tt>:
-#
-#   :include: ../sample/getoptlong/aliases.rb
-#
-# An option may be cited by its name,
-# or by any of its aliases;
-# the parsed option always reports the name, not an alias:
-#
-#   $ ruby aliases.rb -a -p --xxx --aaa -x
-#
-# Output:
-#
-#   ["--xxx", ""]
-#   ["--xxx", ""]
-#   ["--xxx", ""]
-#   ["--xxx", ""]
-#   ["--xxx", ""]
-#
-#
-# An option may also be cited by an abbreviation of its name or any alias,
-# as long as that abbreviation is unique among the options.
-#
-# File <tt>abbrev.rb</tt>:
-#
-#   :include: ../sample/getoptlong/abbrev.rb
-#
-# Command line:
-#
-#   $ ruby abbrev.rb --xxx --xx --xyz --xy
-#
-# Output:
-#
-#   ["--xxx", ""]
-#   ["--xxx", ""]
-#   ["--xyz", ""]
-#   ["--xyz", ""]
-#
-# This command line raises GetoptLong::AmbiguousOption:
-#
-#   $ ruby abbrev.rb --x
-#
-# === Repetition
-#
-# An option may be cited more than once:
-#
-#   $ ruby abbrev.rb --xxx --xyz --xxx --xyz
-#
-# Output:
-#
-#   ["--xxx", ""]
-#   ["--xyz", ""]
-#   ["--xxx", ""]
-#   ["--xyz", ""]
-#
-# === Treating Remaining Options as Arguments
-#
-# A option-like token that appears
-# anywhere after the token <tt>--</tt> is treated as an ordinary argument,
-# and is not processed as an option:
-#
-#   $ ruby abbrev.rb --xxx --xyz -- --xxx --xyz
-#
-# Output:
-#
-#   ["--xxx", ""]
-#   ["--xyz", ""]
-#
-# === Option Types
-#
-# Each option definition includes an option type,
-# which controls whether the option takes an argument.
-#
-# File <tt>types.rb</tt>:
-#
-#   :include: ../sample/getoptlong/types.rb
-#
-# Note that an option type has to do with the <em>option argument</em>
-# (whether it is required, optional, or forbidden),
-# not with whether the option itself is required.
-#
-# ==== Option with Required Argument
-#
-# An option of type <tt>GetoptLong::REQUIRED_ARGUMENT</tt>
-# must be followed by an argument, which is associated with that option:
-#
-#   $ ruby types.rb --xxx foo
-#
-# Output:
-#
-#   ["--xxx", "foo"]
-#
-# If the option is not last, its argument is whatever follows it
-# (even if the argument looks like another option):
-#
-#   $ ruby types.rb --xxx --yyy
-#
-# Output:
-#
-#   ["--xxx", "--yyy"]
-#
-# If the option is last, an exception is raised:
-#
-#   $ ruby types.rb
-#   # Raises GetoptLong::MissingArgument
-#
-# ==== Option with Optional Argument
-#
-# An option of type <tt>GetoptLong::OPTIONAL_ARGUMENT</tt>
-# may be followed by an argument, which if given is associated with that option.
-#
-# If the option is last, it does not have an argument:
-#
-#   $ ruby types.rb --yyy
-#
-# Output:
-#
-#   ["--yyy", ""]
-#
-# If the option is followed by another option, it does not have an argument:
-#
-#   $ ruby types.rb --yyy --zzz
-#
-# Output:
-#
-#   ["--yyy", ""]
-#   ["--zzz", ""]
-#
-# Otherwise the option is followed by its argument, which is associated
-# with that option:
-#
-#   $ ruby types.rb --yyy foo
-#
-# Output:
-#
-#   ["--yyy", "foo"]
-#
-# ==== Option with No Argument
-#
-# An option of type <tt>GetoptLong::NO_ARGUMENT</tt> takes no argument:
-#
-#   ruby types.rb --zzz foo
-#
-# Output:
-#
-#   ["--zzz", ""]
-#
-# === ARGV
-#
-# You can process options either with method #each and a block,
-# or with method #get.
-#
-# During processing, each found option is removed, along with its argument
-# if there is one.
-# After processing, each remaining element was neither an option
-# nor the argument for an option.
-#
-# File <tt>argv.rb</tt>:
-#
-#   :include: ../sample/getoptlong/argv.rb
-#
-# Command line:
-#
-#   $ ruby argv.rb --xxx Foo --yyy Bar Baz --zzz Bat Bam
-#
-# Output:
-#
-#   Original ARGV: ["--xxx", "Foo", "--yyy", "Bar", "Baz", "--zzz", "Bat", "Bam"]
-#   ["--xxx", "Foo"]
-#   ["--yyy", "Bar"]
-#   ["--zzz", ""]
-#   Remaining ARGV: ["Baz", "Bat", "Bam"]
-#
-# === Ordering
-#
-# There are three settings that control the way the options
-# are interpreted:
-#
-# - +PERMUTE+.
-# - +REQUIRE_ORDER+.
-# - +RETURN_IN_ORDER+.
-#
-# The initial setting for a new \GetoptLong object is +REQUIRE_ORDER+
-# if environment variable +POSIXLY_CORRECT+ is defined, +PERMUTE+ otherwise.
-#
-# ==== PERMUTE Ordering
-#
-# In the +PERMUTE+ ordering, options and other, non-option,
-# arguments may appear in any order and any mixture.
-#
-# File <tt>permute.rb</tt>:
-#
-#   :include: ../sample/getoptlong/permute.rb
-#
-# Command line:
-#
-#   $ ruby permute.rb Foo --zzz Bar --xxx Baz --yyy Bat Bam --xxx Bag Bah
-#
-# Output:
-#
-#   Original ARGV: ["Foo", "--zzz", "Bar", "--xxx", "Baz", "--yyy", "Bat", "Bam", "--xxx", "Bag", "Bah"]
-#   ["--zzz", ""]
-#   ["--xxx", "Baz"]
-#   ["--yyy", "Bat"]
-#   ["--xxx", "Bag"]
-#   Remaining ARGV: ["Foo", "Bar", "Bam", "Bah"]
-#
-# ==== REQUIRE_ORDER Ordering
-#
-# In the +REQUIRE_ORDER+ ordering, all options precede all non-options;
-# that is, each word after the first non-option word
-# is treated as a non-option word (even if it begins with a hyphen).
-#
-# File <tt>require_order.rb</tt>:
-#
-#   :include: ../sample/getoptlong/require_order.rb
-#
-# Command line:
-#
-#   $ ruby require_order.rb --xxx Foo Bar --xxx Baz --yyy Bat -zzz
-#
-# Output:
-#
-#   Original ARGV: ["--xxx", "Foo", "Bar", "--xxx", "Baz", "--yyy", "Bat", "-zzz"]
-#   ["--xxx", "Foo"]
-#   Remaining ARGV: ["Bar", "--xxx", "Baz", "--yyy", "Bat", "-zzz"]
-#
-# ==== RETURN_IN_ORDER Ordering
-#
-# In the +RETURN_IN_ORDER+ ordering, every word is treated as an option.
-# A word that begins with a hyphen (or two) is treated in the usual way;
-# a word +word+ that does not so begin is treated as an option
-# whose name is an empty string, and whose value is +word+.
-#
-# File <tt>return_in_order.rb</tt>:
-#
-#   :include: ../sample/getoptlong/return_in_order.rb
-#
-# Command line:
-#
-#   $ ruby return_in_order.rb Foo --xxx Bar Baz --zzz Bat Bam
-#
-# Output:
-#
-#   Original ARGV: ["Foo", "--xxx", "Bar", "Baz", "--zzz", "Bat", "Bam"]
-#   ["", "Foo"]
-#   ["--xxx", "Bar"]
-#   ["", "Baz"]
-#   ["--zzz", ""]
-#   ["", "Bat"]
-#   ["", "Bam"]
-#   Remaining ARGV: []
-#
-# === Full Example
-#
-# File <tt>fibonacci.rb</tt>:
-#
-#   :include: ../sample/getoptlong/fibonacci.rb
-#
-# Command line:
-#
-#   $ ruby fibonacci.rb
-#
-# Output:
-#
-#   Option --number is required.
-#   Usage:
-#
-#     -n n, --number n:
-#       Compute Fibonacci number for n.
-#     -v [boolean], --verbose [boolean]:
-#       Show intermediate results; default is 'false'.
-#     -h, --help:
-#       Show this help.
-#
-# Command line:
-#
-#   $ ruby fibonacci.rb --number
-#
-# Raises GetoptLong::MissingArgument:
-#
-#   fibonacci.rb: option `--number' requires an argument
-#
-# Command line:
-#
-#   $ ruby fibonacci.rb --number 6
-#
-# Output:
-#
-#   8
-#
-# Command line:
-#
-#   $ ruby fibonacci.rb --number 6 --verbose
-#
-# Output:
-#   1
-#   2
-#   3
-#   5
-#   8
-#
-# Command line:
-#
-#   $ ruby fibonacci.rb --number 6 --verbose yes
-#
-# Output:
-#
-#   --verbose argument must be true or false
-#   Usage:
-#
-#     -n n, --number n:
-#       Compute Fibonacci number for n.
-#     -v [boolean], --verbose [boolean]:
-#       Show intermediate results; default is 'false'.
-#     -h, --help:
-#       Show this help.
-#
-class GetoptLong
-  # Version.
-  VERSION = "0.2.0"
-
-  #
-  # Orderings.
-  #
-  ORDERINGS = [REQUIRE_ORDER = 0, PERMUTE = 1, RETURN_IN_ORDER = 2]
-
-  #
-  # Argument flags.
-  #
-  ARGUMENT_FLAGS = [NO_ARGUMENT = 0, REQUIRED_ARGUMENT = 1,
-    OPTIONAL_ARGUMENT = 2]
-
-  #
-  # Status codes.
-  #
-  STATUS_YET, STATUS_STARTED, STATUS_TERMINATED = 0, 1, 2
-
-  #
-  # Error types.
-  #
-  class Error  < StandardError; end
-  class AmbiguousOption   < Error; end
-  class NeedlessArgument < Error; end
-  class MissingArgument  < Error; end
-  class InvalidOption    < Error; end
-
-  #
-  # Returns a new \GetoptLong object based on the given +arguments+.
-  # See {Options}[#class-GetoptLong-label-Options].
-  #
-  # Example:
-  #
-  #   :include: ../sample/getoptlong/simple.rb
-  #
-  # Raises an exception if:
-  #
-  # - Any of +arguments+ is not an array.
-  # - Any option name or alias is not a string.
-  # - Any option type is invalid.
-  #
-  def initialize(*arguments)
-    #
-    # Current ordering.
-    #
-    if ENV.include?('POSIXLY_CORRECT')
-      @ordering = REQUIRE_ORDER
-    else
-      @ordering = PERMUTE
-    end
-
-    #
-    # Hash table of option names.
-    # Keys of the table are option names, and their values are canonical
-    # names of the options.
-    #
-    @canonical_names = Hash.new
-
-    #
-    # Hash table of argument flags.
-    # Keys of the table are option names, and their values are argument
-    # flags of the options.
-    #
-    @argument_flags = Hash.new
-
-    #
-    # Whether error messages are output to $stderr.
-    #
-    @quiet = false
-
-    #
-    # Status code.
-    #
-    @status = STATUS_YET
-
-    #
-    # Error code.
-    #
-    @error = nil
-
-    #
-    # Error message.
-    #
-    @error_message = nil
-
-    #
-    # Rest of catenated short options.
-    #
-    @rest_singles = ''
-
-    #
-    # List of non-option-arguments.
-    # Append them to ARGV when option processing is terminated.
-    #
-    @non_option_arguments = Array.new
-
-    if 0 < arguments.length
-      set_options(*arguments)
-    end
-  end
-
-  # Sets the ordering; see {Ordering}[#class-GetoptLong-label-Ordering];
-  # returns the new ordering.
-  #
-  # If the given +ordering+ is +PERMUTE+ and environment variable
-  # +POSIXLY_CORRECT+ is defined, sets the ordering to +REQUIRE_ORDER+;
-  # otherwise sets the ordering to +ordering+:
-  #
-  #   options = GetoptLong.new
-  #   options.ordering == GetoptLong::PERMUTE # => true
-  #   options.ordering = GetoptLong::RETURN_IN_ORDER
-  #   options.ordering == GetoptLong::RETURN_IN_ORDER # => true
-  #   ENV['POSIXLY_CORRECT'] = 'true'
-  #   options.ordering = GetoptLong::PERMUTE
-  #   options.ordering == GetoptLong::REQUIRE_ORDER # => true
-  #
-  # Raises an exception if +ordering+ is invalid.
-  #
-  def ordering=(ordering)
-    #
-    # The method is failed if option processing has already started.
-    #
-    if @status != STATUS_YET
-      set_error(ArgumentError, "argument error")
-      raise RuntimeError,
-        "invoke ordering=, but option processing has already started"
-    end
-
-    #
-    # Check ordering.
-    #
-    if !ORDERINGS.include?(ordering)
-      raise ArgumentError, "invalid ordering `#{ordering}'"
-    end
-    if ordering == PERMUTE && ENV.include?('POSIXLY_CORRECT')
-      @ordering = REQUIRE_ORDER
-    else
-      @ordering = ordering
-    end
-  end
-
-  #
-  # Returns the ordering setting.
-  #
-  attr_reader :ordering
-
-  #
-  # Replaces existing options with those given by +arguments+,
-  # which have the same form as the arguments to ::new;
-  # returns +self+.
-  #
-  # Raises an exception if option processing has begun.
-  #
-  def set_options(*arguments)
-    #
-    # The method is failed if option processing has already started.
-    #
-    if @status != STATUS_YET
-      raise RuntimeError,
-        "invoke set_options, but option processing has already started"
-    end
-
-    #
-    # Clear tables of option names and argument flags.
-    #
-    @canonical_names.clear
-    @argument_flags.clear
-
-    arguments.each do |arg|
-      if !arg.is_a?(Array)
-       raise ArgumentError, "the option list contains non-Array argument"
-      end
-
-      #
-      # Find an argument flag and it set to `argument_flag'.
-      #
-      argument_flag = nil
-      arg.each do |i|
-        if ARGUMENT_FLAGS.include?(i)
-          if argument_flag != nil
-            raise ArgumentError, "too many argument-flags"
-          end
-          argument_flag = i
-        end
-      end
-
-      raise ArgumentError, "no argument-flag" if argument_flag == nil
-
-      canonical_name = nil
-      arg.each do |i|
-        #
-        # Check an option name.
-        #
-        next if i == argument_flag
-        begin
-          if !i.is_a?(String) || i !~ /\A-([^-]|-.+)\z/
-            raise ArgumentError, "an invalid option `#{i}'"
-          end
-          if (@canonical_names.include?(i))
-            raise ArgumentError, "option redefined `#{i}'"
-          end
-        rescue
-          @canonical_names.clear
-          @argument_flags.clear
-          raise
-        end
-
-        #
-        # Register the option (`i') to the `@canonical_names' and
-        # `@canonical_names' Hashes.
-        #
-        if canonical_name == nil
-          canonical_name = i
-        end
-        @canonical_names[i] = canonical_name
-        @argument_flags[i] = argument_flag
-      end
-      raise ArgumentError, "no option name" if canonical_name == nil
-    end
-    return self
-  end
-
-  #
-  # Sets quiet mode and returns the given argument:
-  #
-  # - When +false+ or +nil+, error messages are written to <tt>$stdout</tt>.
-  # - Otherwise, error messages are not written.
-  #
-  attr_writer :quiet
-
-  #
-  # Returns the quiet mode setting.
-  #
-  attr_reader :quiet
-  alias quiet? quiet
-
-  #
-  # Terminate option processing;
-  # returns +nil+ if processing has already terminated;
-  # otherwise returns +self+.
-  #
-  def terminate
-    return nil if @status == STATUS_TERMINATED
-    raise RuntimeError, "an error has occurred" if @error != nil
-
-    @status = STATUS_TERMINATED
-    @non_option_arguments.reverse_each do |argument|
-      ARGV.unshift(argument)
-    end
-
-    @canonical_names = nil
-    @argument_flags = nil
-    @rest_singles = nil
-    @non_option_arguments = nil
-
-    return self
-  end
-
-  #
-  # Returns +true+ if option processing has terminated, +false+ otherwise.
-  #
-  def terminated?
-    return @status == STATUS_TERMINATED
-  end
-
-  #
-  # \Set an error (a protected method).
-  #
-  def set_error(type, message)
-    $stderr.print("#{$0}: #{message}\n") if !@quiet
-
-    @error = type
-    @error_message = message
-    @canonical_names = nil
-    @argument_flags = nil
-    @rest_singles = nil
-    @non_option_arguments = nil
-
-    raise type, message
-  end
-  protected :set_error
-
-  #
-  # Returns whether option processing has failed.
-  #
-  attr_reader :error
-  alias error? error
-
-  # Return the appropriate error message in POSIX-defined format.
-  # If no error has occurred, returns +nil+.
-  #
-  def error_message
-    return @error_message
-  end
-
-  #
-  # Returns the next option as a 2-element array containing:
-  #
-  # - The option name (the name itself, not an alias).
-  # - The option value.
-  #
-  # Returns +nil+ if there are no more options.
-  #
-  def get
-    option_name, option_argument = nil, ''
-
-    #
-    # Check status.
-    #
-    return nil if @error != nil
-    case @status
-    when STATUS_YET
-      @status = STATUS_STARTED
-    when STATUS_TERMINATED
-      return nil
-    end
-
-    #
-    # Get next option argument.
-    #
-    if 0 < @rest_singles.length
-      argument = '-' + @rest_singles
-    elsif (ARGV.length == 0)
-      terminate
-      return nil
-    elsif @ordering == PERMUTE
-      while 0 < ARGV.length && ARGV[0] !~ /\A-./
-        @non_option_arguments.push(ARGV.shift)
-      end
-      if ARGV.length == 0
-        terminate
-        return nil
-      end
-      argument = ARGV.shift
-    elsif @ordering == REQUIRE_ORDER
-      if (ARGV[0] !~ /\A-./)
-        terminate
-        return nil
-      end
-      argument = ARGV.shift
-    else
-      argument = ARGV.shift
-    end
-
-    #
-    # Check the special argument `--'.
-    # `--' indicates the end of the option list.
-    #
-    if argument == '--' && @rest_singles.length == 0
-      terminate
-      return nil
-    end
-
-    #
-    # Check for long and short options.
-    #
-    if argument =~ /\A(--[^=]+)/ && @rest_singles.length == 0
-      #
-      # This is a long style option, which start with `--'.
-      #
-      pattern = $1
-      if @canonical_names.include?(pattern)
-        option_name = pattern
-      else
-        #
-        # The option `option_name' is not registered in `@canonical_names'.
-        # It may be an abbreviated.
-        #
-        matches = []
-        @canonical_names.each_key do |key|
-          if key.index(pattern) == 0
-            option_name = key
-            matches << key
-          end
-        end
-        if 2 <= matches.length
-          set_error(AmbiguousOption, "option `#{argument}' is ambiguous between #{matches.join(', ')}")
-        elsif matches.length == 0
-          set_error(InvalidOption, "unrecognized option `#{argument}'")
-        end
-      end
-
-      #
-      # Check an argument to the option.
-      #
-      if @argument_flags[option_name] == REQUIRED_ARGUMENT
-        if argument =~ /=(.*)/m
-          option_argument = $1
-        elsif 0 < ARGV.length
-          option_argument = ARGV.shift
-        else
-          set_error(MissingArgument,
-                    "option `#{argument}' requires an argument")
-        end
-      elsif @argument_flags[option_name] == OPTIONAL_ARGUMENT
-        if argument =~ /=(.*)/m
-          option_argument = $1
-        elsif 0 < ARGV.length && ARGV[0] !~ /\A-./
-          option_argument = ARGV.shift
-        else
-          option_argument = ''
-        end
-      elsif argument =~ /=(.*)/m
-        set_error(NeedlessArgument,
-                  "option `#{option_name}' doesn't allow an argument")
-      end
-
-    elsif argument =~ /\A(-(.))(.*)/m
-      #
-      # This is a short style option, which start with `-' (not `--').
-      # Short options may be catenated (e.g. `-l -g' is equivalent to
-      # `-lg').
-      #
-      option_name, ch, @rest_singles = $1, $2, $3
-
-      if @canonical_names.include?(option_name)
-        #
-        # The option `option_name' is found in `@canonical_names'.
-        # Check its argument.
-        #
-        if @argument_flags[option_name] == REQUIRED_ARGUMENT
-          if 0 < @rest_singles.length
-            option_argument = @rest_singles
-            @rest_singles = ''
-          elsif 0 < ARGV.length
-            option_argument = ARGV.shift
-          else
-            # 1003.2 specifies the format of this message.
-            set_error(MissingArgument, "option requires an argument -- #{ch}")
-          end
-        elsif @argument_flags[option_name] == OPTIONAL_ARGUMENT
-          if 0 < @rest_singles.length
-            option_argument = @rest_singles
-            @rest_singles = ''
-          elsif 0 < ARGV.length && ARGV[0] !~ /\A-./
-            option_argument = ARGV.shift
-          else
-            option_argument = ''
-          end
-        end
-      else
-        #
-        # This is an invalid option.
-        # 1003.2 specifies the format of this message.
-        #
-        if ENV.include?('POSIXLY_CORRECT')
-          set_error(InvalidOption, "invalid option -- #{ch}")
-        else
-          set_error(InvalidOption, "invalid option -- #{ch}")
-        end
-      end
-    else
-      #
-      # This is a non-option argument.
-      # Only RETURN_IN_ORDER fell into here.
-      #
-      return '', argument
-    end
-
-    return @canonical_names[option_name], option_argument
-  end
-  alias get_option get
-
-  #
-  # Calls the given block with each option;
-  # each option is a 2-element array containing:
-  #
-  # - The option name (the name itself, not an alias).
-  # - The option value.
-  #
-  # Example:
-  #
-  #   :include: ../sample/getoptlong/each.rb
-  #
-  # Command line:
-  #
-  #    ruby each.rb -xxx Foo -x Bar --yyy Baz -y Bat --zzz
-  #
-  # Output:
-  #
-  #   Original ARGV: ["-xxx", "Foo", "-x", "Bar", "--yyy", "Baz", "-y", "Bat", "--zzz"]
-  #   ["--xxx", "xx"]
-  #   ["--xxx", "Bar"]
-  #   ["--yyy", "Baz"]
-  #   ["--yyy", "Bat"]
-  #   ["--zzz", ""]
-  #   Remaining ARGV: ["Foo"]
-  #
-  def each
-    loop do
-      option_name, option_argument = get_option
-      break if option_name == nil
-      yield option_name, option_argument
-    end
-  end
-  alias each_option each
-end
diff --git a/lib/ipaddr.gemspec b/lib/ipaddr.gemspec
index 1f4798e43a9ba5..5719f83fc44c46 100644
--- a/lib/ipaddr.gemspec
+++ b/lib/ipaddr.gemspec
@@ -32,5 +32,5 @@ Both IPv4 and IPv6 are supported.
   spec.files         = ["LICENSE.txt", "README.md", "ipaddr.gemspec", "lib/ipaddr.rb"]
   spec.require_paths = ["lib"]
 
-  spec.required_ruby_version = ">= 2.3"
+  spec.required_ruby_version = ">= 2.4"
 end
diff --git a/lib/ipaddr.rb b/lib/ipaddr.rb
index b7877970e4a7dc..525466bbd946ac 100644
--- a/lib/ipaddr.rb
+++ b/lib/ipaddr.rb
@@ -40,7 +40,7 @@
 #   p ipaddr3                   #=> #<IPAddr: IPv4:192.168.2.0/255.255.255.0>
 
 class IPAddr
-  VERSION = "1.2.5"
+  VERSION = "1.2.7"
 
   # 32 bit mask for IPv4
   IN4MASK = 0xffffffff
@@ -52,7 +52,7 @@ class IPAddr
   # Regexp _internally_ used for parsing IPv4 address.
   RE_IPV4ADDRLIKE = %r{
     \A
-    (\d+) \. (\d+) \. (\d+) \. (\d+)
+    \d+ \. \d+ \. \d+ \. \d+
     \z
   }x
 
@@ -110,8 +110,13 @@ def self.new_ntoh(addr)
 
   # Convert a network byte ordered string form of an IP address into
   # human readable form.
+  # It expects the string to be encoded in Encoding::ASCII_8BIT (BINARY).
   def self.ntop(addr)
-    case addr.size
+    if addr.is_a?(String) && addr.encoding != Encoding::BINARY
+      raise InvalidAddressError, "invalid encoding (given #{addr.encoding}, expected BINARY)"
+    end
+
+    case addr.bytesize
     when 4
       addr.unpack('C4').join('.')
     when 16
@@ -146,6 +151,16 @@ def ~
     return self.clone.set(addr_mask(~@addr))
   end
 
+  # Returns a new ipaddr greater than the original address by offset
+  def +(offset)
+    self.clone.set(@addr + offset, @family)
+  end
+
+  # Returns a new ipaddr less than the original address by offset
+  def -(offset)
+    self.clone.set(@addr - offset, @family)
+  end
+
   # Returns true if two ipaddrs are equal.
   def ==(other)
     other = coerce_other(other)
@@ -176,9 +191,7 @@ def mask(prefixlen)
   def include?(other)
     other = coerce_other(other)
     return false unless other.family == family
-    range = to_range
-    other = other.to_range
-    range.begin <= other.begin && range.end >= other.end
+    begin_addr <= other.begin_addr && end_addr >= other.end_addr
   end
   alias === include?
 
@@ -224,6 +237,28 @@ def to_string
     return str
   end
 
+  # Returns a string containing the IP address representation with prefix.
+  def as_json(*)
+    if ipv4? && prefix == 32
+      to_s
+    elsif ipv6? && prefix == 128
+      to_s
+    else
+      cidr
+    end
+  end
+
+  # Returns a json string containing the IP address representation.
+  def to_json(*a)
+    %Q{"#{as_json(*a)}"}
+  end
+
+  # Returns a string containing the IP address representation in
+  # cidr notation
+  def cidr
+    "#{to_s}/#{prefix}"
+  end
+
   # Returns a network byte ordered string form of the IP address.
   def hton
     case @family
@@ -249,12 +284,17 @@ def ipv6?
   end
 
   # Returns true if the ipaddr is a loopback address.
+  # Loopback IPv4 addresses in the IPv4-mapped IPv6
+  # address range are also considered as loopback addresses.
   def loopback?
     case @family
     when Socket::AF_INET
-      @addr & 0xff000000 == 0x7f000000
+      @addr & 0xff000000 == 0x7f000000 # 127.0.0.1/8
     when Socket::AF_INET6
-      @addr == 1
+      @addr == 1 || # ::1
+        (@addr & 0xffff_0000_0000 == 0xffff_0000_0000 && (
+          @addr & 0xff000000 == 0x7f000000 # ::ffff:127.0.0.1/8
+        ))
     else
       raise AddressFamilyError, "unsupported address family"
     end
@@ -284,15 +324,19 @@ def private?
   end
 
   # Returns true if the ipaddr is a link-local address.  IPv4
-  # addresses in 169.254.0.0/16 reserved by RFC 3927 and Link-Local
+  # addresses in 169.254.0.0/16 reserved by RFC 3927 and link-local
   # IPv6 Unicast Addresses in fe80::/10 reserved by RFC 4291 are
-  # considered link-local.
+  # considered link-local. Link-local IPv4 addresses in the
+  # IPv4-mapped IPv6 address range are also considered link-local.
   def link_local?
     case @family
     when Socket::AF_INET
       @addr & 0xffff0000 == 0xa9fe0000 # 169.254.0.0/16
     when Socket::AF_INET6
-      @addr & 0xffc0_0000_0000_0000_0000_0000_0000_0000 == 0xfe80_0000_0000_0000_0000_0000_0000_0000
+      @addr & 0xffc0_0000_0000_0000_0000_0000_0000_0000 == 0xfe80_0000_0000_0000_0000_0000_0000_0000 || # fe80::/10
+        (@addr & 0xffff_0000_0000 == 0xffff_0000_0000 && (
+          @addr & 0xffff0000 == 0xa9fe0000 # ::ffff:169.254.0.0/16
+        ))
     else
       raise AddressFamilyError, "unsupported address family"
     end
@@ -406,17 +450,6 @@ def hash
 
   # Creates a Range object for the network address.
   def to_range
-    begin_addr = (@addr & @mask_addr)
-
-    case @family
-    when Socket::AF_INET
-      end_addr = (@addr | (IN4MASK ^ @mask_addr))
-    when Socket::AF_INET6
-      end_addr = (@addr | (IN6MASK ^ @mask_addr))
-    else
-      raise AddressFamilyError, "unsupported address family"
-    end
-
     self.class.new(begin_addr, @family)..self.class.new(end_addr, @family)
   end
 
@@ -445,7 +478,7 @@ def prefix=(prefix)
     when Integer
       mask!(prefix)
     else
-      raise InvalidPrefixError, "prefix must be an integer: #{@addr}"
+      raise InvalidPrefixError, "prefix must be an integer"
     end
   end
 
@@ -470,6 +503,20 @@ def netmask
     _to_string(@mask_addr)
   end
 
+  # Returns the wildcard mask in string format e.g. 0.0.255.255
+  def wildcard_mask
+    case @family
+    when Socket::AF_INET
+      mask = IN4MASK ^ @mask_addr
+    when Socket::AF_INET6
+      mask = IN6MASK ^ @mask_addr
+    else
+      raise AddressFamilyError, "unsupported address family"
+    end
+
+    _to_string(mask)
+  end
+
   # Returns the IPv6 zone identifier, if present.
   # Raises InvalidAddressError if not an IPv6 address.
   def zone_id
@@ -497,6 +544,21 @@ def zone_id=(zid)
 
   protected
 
+  def begin_addr
+    @addr & @mask_addr
+  end
+
+  def end_addr
+    case @family
+    when Socket::AF_INET
+      @addr | (IN4MASK ^ @mask_addr)
+    when Socket::AF_INET6
+      @addr | (IN6MASK ^ @mask_addr)
+    else
+      raise AddressFamilyError, "unsupported address family"
+    end
+  end
+
   # Set +@addr+, the internal stored ip address, to given +addr+. The
   # parameter +addr+ is validated using the first +family+ member,
   # which is +Socket::AF_INET+ or +Socket::AF_INET6+.
@@ -504,11 +566,11 @@ def set(addr, *family)
     case family[0] ? family[0] : @family
     when Socket::AF_INET
       if addr < 0 || addr > IN4MASK
-        raise InvalidAddressError, "invalid address: #{@addr}"
+        raise InvalidAddressError, "invalid address: #{addr}"
       end
     when Socket::AF_INET6
       if addr < 0 || addr > IN6MASK
-        raise InvalidAddressError, "invalid address: #{@addr}"
+        raise InvalidAddressError, "invalid address: #{addr}"
       end
     else
       raise AddressFamilyError, "unsupported address family"
@@ -535,12 +597,12 @@ def mask!(mask)
       else
         m = IPAddr.new(mask)
         if m.family != @family
-          raise InvalidPrefixError, "address family is not same: #{@addr}"
+          raise InvalidPrefixError, "address family is not same"
         end
         @mask_addr = m.to_i
         n = @mask_addr ^ m.instance_variable_get(:@mask_addr)
         unless ((n + 1) & n).zero?
-          raise InvalidPrefixError, "invalid mask #{mask}: #{@addr}"
+          raise InvalidPrefixError, "invalid mask #{mask}"
         end
         @addr &= @mask_addr
         return self
@@ -551,13 +613,13 @@ def mask!(mask)
     case @family
     when Socket::AF_INET
       if prefixlen < 0 || prefixlen > 32
-        raise InvalidPrefixError, "invalid length: #{@addr}"
+        raise InvalidPrefixError, "invalid length"
       end
       masklen = 32 - prefixlen
       @mask_addr = ((IN4MASK >> masklen) << masklen)
     when Socket::AF_INET6
       if prefixlen < 0 || prefixlen > 128
-        raise InvalidPrefixError, "invalid length: #{@addr}"
+        raise InvalidPrefixError, "invalid length"
       end
       masklen = 128 - prefixlen
       @mask_addr = ((IN6MASK >> masklen) << masklen)
@@ -653,12 +715,12 @@ def in_addr(addr)
     when Array
       octets = addr
     else
-      m = RE_IPV4ADDRLIKE.match(addr) or return nil
-      octets = m.captures
+      RE_IPV4ADDRLIKE.match?(addr) or return nil
+      octets = addr.split('.')
     end
     octets.inject(0) { |i, s|
       (n = s.to_i) < 256 or raise InvalidAddressError, "invalid address: #{@addr}"
-      s.match(/\A0./) and raise InvalidAddressError, "zero-filled number in IPv4 address is ambiguous: #{@addr}"
+      (s != '0') && s.start_with?('0') and raise InvalidAddressError, "zero-filled number in IPv4 address is ambiguous: #{@addr}"
       i << 8 | n
     }
   end
diff --git a/lib/irb.rb b/lib/irb.rb
deleted file mode 100644
index 57ec911f344b3e..00000000000000
--- a/lib/irb.rb
+++ /dev/null
@@ -1,1088 +0,0 @@
-# frozen_string_literal: false
-#
-#   irb.rb - irb main module
-#       by Keiju ISHITSUKA(keiju@ruby-lang.org)
-#
-
-require "ripper"
-require "reline"
-
-require_relative "irb/init"
-require_relative "irb/context"
-require_relative "irb/extend-command"
-
-require_relative "irb/ruby-lex"
-require_relative "irb/statement"
-require_relative "irb/input-method"
-require_relative "irb/locale"
-require_relative "irb/color"
-
-require_relative "irb/version"
-require_relative "irb/easter-egg"
-require_relative "irb/debug"
-
-# IRB stands for "interactive Ruby" and is a tool to interactively execute Ruby
-# expressions read from the standard input.
-#
-# The +irb+ command from your shell will start the interpreter.
-#
-# == Usage
-#
-# Use of irb is easy if you know Ruby.
-#
-# When executing irb, prompts are displayed as follows. Then, enter the Ruby
-# expression. An input is executed when it is syntactically complete.
-#
-#     $ irb
-#     irb(main):001:0> 1+2
-#     #=> 3
-#     irb(main):002:0> class Foo
-#     irb(main):003:1>  def foo
-#     irb(main):004:2>    print 1
-#     irb(main):005:2>  end
-#     irb(main):006:1> end
-#     #=> nil
-#
-# The singleline editor module or multiline editor module can be used with irb.
-# Use of multiline editor is default if it's installed.
-#
-# == Command line options
-#
-#   :include: ./irb/lc/help-message
-#
-# == Commands
-#
-# The following commands are available on IRB.
-#
-# * cwws
-#   * Show the current workspace.
-# * cb, cws, chws
-#   * Change the current workspace to an object.
-# * bindings, workspaces
-#   * Show workspaces.
-# * pushb, pushws
-#   * Push an object to the workspace stack.
-# * popb, popws
-#   * Pop a workspace from the workspace stack.
-# * load
-#   * Load a Ruby file.
-# * require
-#   * Require a Ruby file.
-# * source
-#   * Loads a given file in the current session.
-# * irb
-#   * Start a child IRB.
-# * jobs
-#   * List of current sessions.
-# * fg
-#   * Switches to the session of the given number.
-# * kill
-#   * Kills the session with the given number.
-# * help
-#   * Enter the mode to look up RI documents.
-# * irb_info
-#   * Show information about IRB.
-# * ls
-#   * Show methods, constants, and variables.
-#     -g [query] or -G [query] allows you to filter out the output.
-# * measure
-#   * measure enables the mode to measure processing time. measure :off disables it.
-# * $, show_source
-#   * Show the source code of a given method or constant.
-# * @, whereami
-#   * Show the source code around binding.irb again.
-# * debug
-#   * Start the debugger of debug.gem.
-# * break, delete, next, step, continue, finish, backtrace, info, catch
-#   * Start the debugger of debug.gem and run the command on it.
-#
-# == Configuration
-#
-# IRB reads a personal initialization file when it's invoked.
-# IRB searches a file in the following order and loads the first one found.
-#
-# * <tt>$IRBRC</tt> (if <tt>$IRBRC</tt> is set)
-# * <tt>$XDG_CONFIG_HOME/irb/irbrc</tt> (if <tt>$XDG_CONFIG_HOME</tt> is set)
-# * <tt>~/.irbrc</tt>
-# * +.config/irb/irbrc+
-# * +.irbrc+
-# * +irb.rc+
-# * +_irbrc+
-# * <code>$irbrc</code>
-#
-# The following are alternatives to the command line options. To use them type
-# as follows in an +irb+ session:
-#
-#     IRB.conf[:IRB_NAME]="irb"
-#     IRB.conf[:INSPECT_MODE]=nil
-#     IRB.conf[:IRB_RC] = nil
-#     IRB.conf[:BACK_TRACE_LIMIT]=16
-#     IRB.conf[:USE_LOADER] = false
-#     IRB.conf[:USE_MULTILINE] = nil
-#     IRB.conf[:USE_SINGLELINE] = nil
-#     IRB.conf[:USE_COLORIZE] = true
-#     IRB.conf[:USE_TRACER] = false
-#     IRB.conf[:USE_AUTOCOMPLETE] = true
-#     IRB.conf[:IGNORE_SIGINT] = true
-#     IRB.conf[:IGNORE_EOF] = false
-#     IRB.conf[:PROMPT_MODE] = :DEFAULT
-#     IRB.conf[:PROMPT] = {...}
-#
-# === Auto indentation
-#
-# To disable auto-indent mode in irb, add the following to your +.irbrc+:
-#
-#     IRB.conf[:AUTO_INDENT] = false
-#
-# === Autocompletion
-#
-# To disable autocompletion for irb, add the following to your +.irbrc+:
-#
-#     IRB.conf[:USE_AUTOCOMPLETE] = false
-#
-# === History
-#
-# By default, irb will store the last 1000 commands you used in
-# <code>IRB.conf[:HISTORY_FILE]</code> (<code>~/.irb_history</code> by default).
-#
-# If you want to disable history, add the following to your +.irbrc+:
-#
-#     IRB.conf[:SAVE_HISTORY] = nil
-#
-# See IRB::Context#save_history= for more information.
-#
-# 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] = <number>
-#
-# See IRB::Context#eval_history= and EvalHistory class. The history of command
-# results is not permanently saved in any file.
-#
-# == Customizing the IRB Prompt
-#
-# In order to customize the prompt, you can change the following Hash:
-#
-#     IRB.conf[:PROMPT]
-#
-# This example can be used in your +.irbrc+
-#
-#     IRB.conf[:PROMPT][:MY_PROMPT] = { # name of prompt mode
-#       :AUTO_INDENT => false,          # disables auto-indent mode
-#       :PROMPT_I =>  ">> ",		# simple prompt
-#       :PROMPT_S => nil,		# prompt for continuated strings
-#       :PROMPT_C => nil,		# prompt for continuated statement
-#       :RETURN => "    ==>%s\n"	# format to return value
-#     }
-#
-#     IRB.conf[:PROMPT_MODE] = :MY_PROMPT
-#
-# Or, invoke irb with the above prompt mode by:
-#
-#     irb --prompt my-prompt
-#
-# Constants +PROMPT_I+, +PROMPT_S+ and +PROMPT_C+ specify the format. In the
-# prompt specification, some special strings are available:
-#
-#     %N    # command name which is running
-#     %m    # to_s of main object (self)
-#     %M    # inspect of main object (self)
-#     %l    # type of string(", ', /, ]), `]' is inner %w[...]
-#     %NNi  # indent level. NN is digits and means as same as printf("%NNd").
-#           # It can be omitted
-#     %NNn  # line number.
-#     %%    # %
-#
-# For instance, the default prompt mode is defined as follows:
-#
-#     IRB.conf[:PROMPT_MODE][:DEFAULT] = {
-#       :PROMPT_I => "%N(%m):%03n> ",
-#       :PROMPT_S => "%N(%m):%03n%l ",
-#       :PROMPT_C => "%N(%m):%03n* ",
-#       :RETURN => "%s\n" # used to printf
-#     }
-#
-# irb comes with a number of available modes:
-#
-#   # :NULL:
-#   #   :PROMPT_I:
-#   #   :PROMPT_S:
-#   #   :PROMPT_C:
-#   #   :RETURN: |
-#   #     %s
-#   # :DEFAULT:
-#   #   :PROMPT_I: ! '%N(%m):%03n> '
-#   #   :PROMPT_S: ! '%N(%m):%03n%l '
-#   #   :PROMPT_C: ! '%N(%m):%03n* '
-#   #   :RETURN: |
-#   #     => %s
-#   # :CLASSIC:
-#   #   :PROMPT_I: ! '%N(%m):%03n:%i> '
-#   #   :PROMPT_S: ! '%N(%m):%03n:%i%l '
-#   #   :PROMPT_C: ! '%N(%m):%03n:%i* '
-#   #   :RETURN: |
-#   #     %s
-#   # :SIMPLE:
-#   #   :PROMPT_I: ! '>> '
-#   #   :PROMPT_S:
-#   #   :PROMPT_C: ! '?> '
-#   #   :RETURN: |
-#   #     => %s
-#   # :INF_RUBY:
-#   #   :PROMPT_I: ! '%N(%m):%03n> '
-#   #   :PROMPT_S:
-#   #   :PROMPT_C:
-#   #   :RETURN: |
-#   #     %s
-#   #   :AUTO_INDENT: true
-#   # :XMP:
-#   #   :PROMPT_I:
-#   #   :PROMPT_S:
-#   #   :PROMPT_C:
-#   #   :RETURN: |2
-#   #         ==>%s
-#
-# == Restrictions
-#
-# Because irb evaluates input immediately after it is syntactically complete,
-# the results may be slightly different than directly using Ruby.
-#
-# == IRB Sessions
-#
-# IRB has a special feature, that allows you to manage many sessions at once.
-#
-# You can create new sessions with Irb.irb, and get a list of current sessions
-# with the +jobs+ command in the prompt.
-#
-# === Commands
-#
-# JobManager provides commands to handle the current sessions:
-#
-#   jobs    # List of current sessions
-#   fg      # Switches to the session of the given number
-#   kill    # Kills the session with the given number
-#
-# The +exit+ command, or ::irb_exit, will quit the current session and call any
-# exit hooks with IRB.irb_at_exit.
-#
-# A few commands for loading files within the session are also available:
-#
-# +source+::
-#   Loads a given file in the current session and displays the source lines,
-#   see IrbLoader#source_file
-# +irb_load+::
-#   Loads the given file similarly to Kernel#load, see IrbLoader#irb_load
-# +irb_require+::
-#   Loads the given file similarly to Kernel#require
-#
-# === Configuration
-#
-# The command line options, or IRB.conf, specify the default behavior of
-# Irb.irb.
-#
-# On the other hand, each conf in IRB@Command+line+options is used to
-# individually configure IRB.irb.
-#
-# If a proc is set for <code>IRB.conf[:IRB_RC]</code>, its will be invoked after execution
-# of that proc with the context of the current session as its argument. Each
-# session can be configured using this mechanism.
-#
-# === Session variables
-#
-# There are a few variables in every Irb session that can come in handy:
-#
-# <code>_</code>::
-#   The value command executed, as a local variable
-# <code>__</code>::
-#   The history of evaluated commands. Available only if
-#   <code>IRB.conf[:EVAL_HISTORY]</code> is not +nil+ (which is the default).
-#   See also IRB::Context#eval_history= and IRB::History.
-# <code>__[line_no]</code>::
-#   Returns the evaluation value at the given line number, +line_no+.
-#   If +line_no+ is a negative, the return value +line_no+ many lines before
-#   the most recent return value.
-#
-# === Example using IRB Sessions
-#
-#   # invoke a new session
-#   irb(main):001:0> irb
-#   # list open sessions
-#   irb.1(main):001:0> jobs
-#     #0->irb on main (#<Thread:0x400fb7e4> : stop)
-#     #1->irb#1 on main (#<Thread:0x40125d64> : running)
-#
-#   # change the active session
-#   irb.1(main):002:0> fg 0
-#   # define class Foo in top-level session
-#   irb(main):002:0> class Foo;end
-#   # invoke a new session with the context of Foo
-#   irb(main):003:0> irb Foo
-#   # define Foo#foo
-#   irb.2(Foo):001:0> def foo
-#   irb.2(Foo):002:1>   print 1
-#   irb.2(Foo):003:1> end
-#
-#   # change the active session
-#   irb.2(Foo):004:0> fg 0
-#   # list open sessions
-#   irb(main):004:0> jobs
-#     #0->irb on main (#<Thread:0x400fb7e4> : running)
-#     #1->irb#1 on main (#<Thread:0x40125d64> : stop)
-#     #2->irb#2 on Foo (#<Thread:0x4011d54c> : stop)
-#   # check if Foo#foo is available
-#   irb(main):005:0> Foo.instance_methods #=> [:foo, ...]
-#
-#   # 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
-#   irb.2(Foo):006:1>  print "bar"
-#   irb.2(Foo):007:1> end
-#   irb.2(Foo):010:0>  Foo.instance_methods #=> [:bar, :foo, ...]
-#
-#   # change the active session
-#   irb.2(Foo):011:0> fg 0
-#   irb(main):007:0> f = Foo.new  #=> #<Foo:0x4010af3c>
-#   # invoke a new session with the context of f (instance of Foo)
-#   irb(main):008:0> irb f
-#   # list open sessions
-#   irb.3(<Foo:0x4010af3c>):001:0> jobs
-#     #0->irb on main (#<Thread:0x400fb7e4> : stop)
-#     #1->irb#1 on main (#<Thread:0x40125d64> : stop)
-#     #2->irb#2 on Foo (#<Thread:0x4011d54c> : stop)
-#     #3->irb#3 on #<Foo:0x4010af3c> (#<Thread:0x4010a1e0> : running)
-#   # evaluate f.foo
-#   irb.3(<Foo:0x4010af3c>):002:0> foo #=> 1 => nil
-#   # evaluate f.bar
-#   irb.3(<Foo:0x4010af3c>):003:0> bar #=> bar => nil
-#   # kill jobs 1, 2, and 3
-#   irb.3(<Foo:0x4010af3c>):004:0> kill 1, 2, 3
-#   # list open sessions, should only include main session
-#   irb(main):009:0> jobs
-#     #0->irb on main (#<Thread:0x400fb7e4> : running)
-#   # quit irb
-#   irb(main):010:0> exit
-module IRB
-
-  # An exception raised by IRB.irb_abort
-  class Abort < Exception;end
-
-  @CONF = {}
-  # Displays current configuration.
-  #
-  # Modifying the configuration is achieved by sending a message to IRB.conf.
-  #
-  # See IRB@Configuration for more information.
-  def IRB.conf
-    @CONF
-  end
-
-  # Returns the current version of IRB, including release version and last
-  # updated date.
-  def IRB.version
-    if v = @CONF[:VERSION] then return v end
-
-    @CONF[:VERSION] = format("irb %s (%s)", @RELEASE_VERSION, @LAST_UPDATE_DATE)
-  end
-
-  # The current IRB::Context of the session, see IRB.conf
-  #
-  #   irb
-  #   irb(main):001:0> IRB.CurrentContext.irb_name = "foo"
-  #   foo(main):002:0> IRB.conf[:MAIN_CONTEXT].irb_name #=> "foo"
-  def IRB.CurrentContext
-    IRB.conf[:MAIN_CONTEXT]
-  end
-
-  # Initializes IRB and creates a new Irb.irb object at the +TOPLEVEL_BINDING+
-  def IRB.start(ap_path = nil)
-    STDOUT.sync = true
-    $0 = File::basename(ap_path, ".rb") if ap_path
-
-    IRB.setup(ap_path)
-
-    if @CONF[:SCRIPT]
-      irb = Irb.new(nil, @CONF[:SCRIPT])
-    else
-      irb = Irb.new
-    end
-    irb.run(@CONF)
-  end
-
-  # Quits irb
-  def IRB.irb_exit(irb, ret)
-    throw :IRB_EXIT, ret
-  end
-
-  # Aborts then interrupts irb.
-  #
-  # Will raise an Abort exception, or the given +exception+.
-  def IRB.irb_abort(irb, exception = Abort)
-    irb.context.thread.raise exception, "abort then interrupt!"
-  end
-
-  class Irb
-    # Note: instance and index assignment expressions could also be written like:
-    # "foo.bar=(1)" and "foo.[]=(1, bar)", when expressed that way, the former
-    # be parsed as :assign and echo will be suppressed, but the latter is
-    # parsed as a :method_add_arg and the output won't be suppressed
-
-    PROMPT_MAIN_TRUNCATE_LENGTH = 32
-    PROMPT_MAIN_TRUNCATE_OMISSION = '...'.freeze
-    CONTROL_CHARACTERS_PATTERN = "\x00-\x1F".freeze
-
-    # Creates a new irb session
-    def initialize(workspace = nil, input_method = nil)
-      @context = Context.new(self, workspace, input_method)
-      @context.workspace.load_commands_to_main
-      @signal_status = :IN_IRB
-      @scanner = RubyLex.new(@context)
-    end
-
-    # A hook point for `debug` command's breakpoint after :IRB_EXIT as well as its clean-up
-    def debug_break
-      # it means the debug integration has been activated
-      if defined?(DEBUGGER__) && DEBUGGER__.respond_to?(:capture_frames_without_irb)
-        # after leaving this initial breakpoint, revert the capture_frames patch
-        DEBUGGER__.singleton_class.send(:alias_method, :capture_frames, :capture_frames_without_irb)
-        # and remove the redundant method
-        DEBUGGER__.singleton_class.send(:undef_method, :capture_frames_without_irb)
-      end
-    end
-
-    def debug_readline(binding)
-      workspace = IRB::WorkSpace.new(binding)
-      context.workspace = workspace
-      context.workspace.load_commands_to_main
-      scanner.increase_line_no(1)
-
-      # When users run:
-      # 1. Debugging commands, like `step 2`
-      # 2. Any input that's not irb-command, like `foo = 123`
-      #
-      # Irb#eval_input will simply return the input, and we need to pass it to the debugger.
-      input = if IRB.conf[:SAVE_HISTORY] && context.io.support_history_saving?
-        # Previous IRB session's history has been saved when `Irb#run` is exited
-        # We need to make sure the saved history is not saved again by reseting the counter
-        context.io.reset_history_counter
-
-        begin
-          eval_input
-        ensure
-          context.io.save_history
-        end
-      else
-        eval_input
-      end
-
-      if input&.include?("\n")
-        scanner.increase_line_no(input.count("\n") - 1)
-      end
-
-      input
-    end
-
-    def run(conf = IRB.conf)
-      in_nested_session = !!conf[:MAIN_CONTEXT]
-      conf[:IRB_RC].call(context) if conf[:IRB_RC]
-      conf[:MAIN_CONTEXT] = context
-
-      save_history = !in_nested_session && conf[:SAVE_HISTORY] && context.io.support_history_saving?
-
-      if save_history
-        context.io.load_history
-      end
-
-      prev_trap = trap("SIGINT") do
-        signal_handle
-      end
-
-      begin
-        catch(:IRB_EXIT) do
-          eval_input
-        end
-      ensure
-        trap("SIGINT", prev_trap)
-        conf[:AT_EXIT].each{|hook| hook.call}
-        context.io.save_history if save_history
-      end
-    end
-
-    # Returns the current context of this irb session
-    attr_reader :context
-    # The lexer used by this irb session
-    attr_accessor :scanner
-
-    # Evaluates input for this session.
-    def eval_input
-      @scanner.set_prompt do
-        |ltype, indent, continue, line_no|
-        if ltype
-          f = @context.prompt_s
-        elsif continue
-          f = @context.prompt_c
-        else
-          f = @context.prompt_i
-        end
-        f = "" unless f
-        if @context.prompting?
-          @context.io.prompt = p = prompt(f, ltype, indent, line_no)
-        else
-          @context.io.prompt = p = ""
-        end
-        if @context.auto_indent_mode and !@context.io.respond_to?(:auto_indent)
-          unless ltype
-            prompt_i = @context.prompt_i.nil? ? "" : @context.prompt_i
-            ind = prompt(prompt_i, ltype, indent, line_no)[/.*\z/].size +
-              indent * 2 - p.size
-            @context.io.prompt = p + " " * ind if ind > 0
-          end
-        end
-        @context.io.prompt
-      end
-
-      configure_io
-
-      each_top_level_statement do |statement, line_no|
-        signal_status(:IN_EVAL) do
-          begin
-            # If the integration with debugger is activated, we return certain input if it should be dealt with by debugger
-            if @context.with_debugger && statement.should_be_handled_by_debugger?
-              return statement.code
-            end
-
-            @context.evaluate(statement.evaluable_code, line_no)
-
-            if @context.echo? && !statement.suppresses_echo?
-              if statement.is_assignment?
-                if @context.echo_on_assignment?
-                  output_value(@context.echo_on_assignment? == :truncate)
-                end
-              else
-                output_value
-              end
-            end
-          rescue SystemExit, SignalException
-            raise
-          rescue Interrupt, Exception => exc
-            handle_exception(exc)
-            @context.workspace.local_variable_set(:_, exc)
-          end
-        end
-      end
-    end
-
-    def read_input
-      signal_status(:IN_INPUT) do
-        if l = @context.io.gets
-          print l if @context.verbose?
-        else
-          if @context.ignore_eof? and @context.io.readable_after_eof?
-            l = "\n"
-            if @context.verbose?
-              printf "Use \"exit\" to leave %s\n", @context.ap_name
-            end
-          else
-            print "\n" if @context.prompting?
-          end
-        end
-        l
-      end
-    end
-
-    def readmultiline
-      @scanner.save_prompt_to_context_io([], false, 0)
-
-      # multiline
-      return read_input if @context.io.respond_to?(:check_termination)
-
-      # nomultiline
-      code = ''
-      line_offset = 0
-      loop do
-        line = read_input
-        unless line
-          return code.empty? ? nil : code
-        end
-
-        code << line
-
-        # Accept any single-line input for symbol aliases or commands that transform args
-        return code if single_line_command?(code)
-
-        tokens, opens, terminated = @scanner.check_code_state(code)
-        return code if terminated
-
-        line_offset += 1
-        continue = @scanner.should_continue?(tokens)
-        @scanner.save_prompt_to_context_io(opens, continue, line_offset)
-      end
-    end
-
-    def each_top_level_statement
-      loop do
-        code = readmultiline
-        break unless code
-
-        if code != "\n"
-          yield build_statement(code), @scanner.line_no
-        end
-        @scanner.increase_line_no(code.count("\n"))
-      rescue RubyLex::TerminateLineInput
-      end
-    end
-
-    def build_statement(code)
-      code.force_encoding(@context.io.encoding)
-      command_or_alias, arg = code.split(/\s/, 2)
-      # Transform a non-identifier alias (@, $) or keywords (next, break)
-      command_name = @context.command_aliases[command_or_alias.to_sym]
-      command = command_name || command_or_alias
-      command_class = ExtendCommandBundle.load_command(command)
-
-      if command_class
-        Statement::Command.new(code, command, arg, command_class)
-      else
-        Statement::Expression.new(code, @scanner.assignment_expression?(code))
-      end
-    end
-
-    def single_line_command?(code)
-      command = code.split(/\s/, 2).first
-      @context.symbol_alias?(command) || @context.transform_args?(command)
-    end
-
-    def configure_io
-      if @context.io.respond_to?(:check_termination)
-        @context.io.check_termination do |code|
-          if Reline::IOGate.in_pasting?
-            rest = @scanner.check_termination_in_prev_line(code)
-            if rest
-              Reline.delete_text
-              rest.bytes.reverse_each do |c|
-                Reline.ungetc(c)
-              end
-              true
-            else
-              false
-            end
-          else
-            # Accept any single-line input for symbol aliases or commands that transform args
-            next true if single_line_command?(code)
-
-            _tokens, _opens, terminated = @scanner.check_code_state(code)
-            terminated
-          end
-        end
-      end
-      if @context.io.respond_to?(:dynamic_prompt)
-        @context.io.dynamic_prompt do |lines|
-          lines << '' if lines.empty?
-          tokens = RubyLex.ripper_lex_without_warning(lines.map{ |l| l + "\n" }.join, context: @context)
-          line_results = IRB::NestingParser.parse_by_line(tokens)
-          tokens_until_line = []
-          line_results.map.with_index do |(line_tokens, _prev_opens, next_opens, _min_depth), line_num_offset|
-            line_tokens.each do |token, _s|
-              # Avoid appending duplicated token. Tokens that include "\n" like multiline tstring_content can exist in multiple lines.
-              tokens_until_line << token if token != tokens_until_line.last
-            end
-            continue = @scanner.should_continue?(tokens_until_line)
-            @scanner.prompt(next_opens, continue, line_num_offset)
-          end
-        end
-      end
-
-      if @context.io.respond_to?(:auto_indent) and @context.auto_indent_mode
-        @context.io.auto_indent do |lines, line_index, byte_pointer, is_newline|
-          next nil if lines == [nil] # Workaround for exit IRB with CTRL+d
-          next nil if !is_newline && lines[line_index]&.byteslice(0, byte_pointer)&.match?(/\A\s*\z/)
-
-          code = lines[0..line_index].map { |l| "#{l}\n" }.join
-          tokens = RubyLex.ripper_lex_without_warning(code, context: @context)
-          @scanner.process_indent_level(tokens, lines, line_index, is_newline)
-        end
-      end
-    end
-
-    def convert_invalid_byte_sequence(str, enc)
-      str.force_encoding(enc)
-      str.scrub { |c|
-        c.bytes.map{ |b| "\\x#{b.to_s(16).upcase}" }.join
-      }
-    end
-
-    def encode_with_invalid_byte_sequence(str, enc)
-      conv = Encoding::Converter.new(str.encoding, enc)
-      dst = String.new
-      begin
-        ret = conv.primitive_convert(str, dst)
-        case ret
-        when :invalid_byte_sequence
-          conv.insert_output(conv.primitive_errinfo[3].dump[1..-2])
-          redo
-        when :undefined_conversion
-          c = conv.primitive_errinfo[3].dup.force_encoding(conv.primitive_errinfo[1])
-          conv.insert_output(c.dump[1..-2])
-          redo
-        when :incomplete_input
-          conv.insert_output(conv.primitive_errinfo[3].dump[1..-2])
-        when :finished
-        end
-        break
-      end while nil
-      dst
-    end
-
-    def handle_exception(exc)
-      if exc.backtrace && exc.backtrace[0] =~ /\/irb(2)?(\/.*|-.*|\.rb)?:/ && exc.class.to_s !~ /^IRB/ &&
-         !(SyntaxError === exc) && !(EncodingError === exc)
-        # The backtrace of invalid encoding hash (ex. {"\xAE": 1}) raises EncodingError without lineno.
-        irb_bug = true
-      else
-        irb_bug = false
-      end
-
-      if exc.backtrace
-        order = nil
-        if RUBY_VERSION < '3.0.0'
-          if STDOUT.tty?
-            message = exc.full_message(order: :bottom)
-            order = :bottom
-          else
-            message = exc.full_message(order: :top)
-            order = :top
-          end
-        else # '3.0.0' <= RUBY_VERSION
-          message = exc.full_message(order: :top)
-          order = :top
-        end
-        message = convert_invalid_byte_sequence(message, exc.message.encoding)
-        message = encode_with_invalid_byte_sequence(message, IRB.conf[:LC_MESSAGES].encoding) unless message.encoding.to_s.casecmp?(IRB.conf[:LC_MESSAGES].encoding.to_s)
-        message = message.gsub(/((?:^\t.+$\n)+)/)  { |m|
-          case order
-          when :top
-            lines = m.split("\n")
-          when :bottom
-            lines = m.split("\n").reverse
-          end
-          unless irb_bug
-            lines = lines.map { |l| @context.workspace.filter_backtrace(l) }.compact
-            if lines.size > @context.back_trace_limit
-              omit = lines.size - @context.back_trace_limit
-              lines = lines[0..(@context.back_trace_limit - 1)]
-              lines << "\t... %d levels..." % omit
-            end
-          end
-          lines = lines.reverse if order == :bottom
-          lines.map{ |l| l + "\n" }.join
-        }
-        # The "<top (required)>" in "(irb)" may be the top level of IRB so imitate the main object.
-        message = message.gsub(/\(irb\):(?<num>\d+):in `<(?<frame>top \(required\))>'/)  { "(irb):#{$~[:num]}:in `<main>'" }
-        puts message
-      end
-      print "Maybe IRB bug!\n" if irb_bug
-    end
-
-    # Evaluates the given block using the given +path+ as the Context#irb_path
-    # and +name+ as the Context#irb_name.
-    #
-    # Used by the irb command +source+, see IRB@IRB+Sessions for more
-    # information.
-    def suspend_name(path = nil, name = nil)
-      @context.irb_path, back_path = path, @context.irb_path if path
-      @context.irb_name, back_name = name, @context.irb_name if name
-      begin
-        yield back_path, back_name
-      ensure
-        @context.irb_path = back_path if path
-        @context.irb_name = back_name if name
-      end
-    end
-
-    # Evaluates the given block using the given +workspace+ as the
-    # Context#workspace.
-    #
-    # Used by the irb command +irb_load+, see IRB@IRB+Sessions for more
-    # information.
-    def suspend_workspace(workspace)
-      @context.workspace, back_workspace = workspace, @context.workspace
-      begin
-        yield back_workspace
-      ensure
-        @context.workspace = back_workspace
-      end
-    end
-
-    # Evaluates the given block using the given +input_method+ as the
-    # Context#io.
-    #
-    # Used by the irb commands +source+ and +irb_load+, see IRB@IRB+Sessions
-    # for more information.
-    def suspend_input_method(input_method)
-      back_io = @context.io
-      @context.instance_eval{@io = input_method}
-      begin
-        yield back_io
-      ensure
-        @context.instance_eval{@io = back_io}
-      end
-    end
-
-    # Evaluates the given block using the given +context+ as the Context.
-    def suspend_context(context)
-      @context, back_context = context, @context
-      begin
-        yield back_context
-      ensure
-        @context = back_context
-      end
-    end
-
-    # Handler for the signal SIGINT, see Kernel#trap for more information.
-    def signal_handle
-      unless @context.ignore_sigint?
-        print "\nabort!\n" if @context.verbose?
-        exit
-      end
-
-      case @signal_status
-      when :IN_INPUT
-        print "^C\n"
-        raise RubyLex::TerminateLineInput
-      when :IN_EVAL
-        IRB.irb_abort(self)
-      when :IN_LOAD
-        IRB.irb_abort(self, LoadAbort)
-      when :IN_IRB
-        # ignore
-      else
-        # ignore other cases as well
-      end
-    end
-
-    # Evaluates the given block using the given +status+.
-    def signal_status(status)
-      return yield if @signal_status == :IN_LOAD
-
-      signal_status_back = @signal_status
-      @signal_status = status
-      begin
-        yield
-      ensure
-        @signal_status = signal_status_back
-      end
-    end
-
-    def truncate_prompt_main(str) # :nodoc:
-      str = str.tr(CONTROL_CHARACTERS_PATTERN, ' ')
-      if str.size <= PROMPT_MAIN_TRUNCATE_LENGTH
-        str
-      else
-        str[0, PROMPT_MAIN_TRUNCATE_LENGTH - PROMPT_MAIN_TRUNCATE_OMISSION.size] + PROMPT_MAIN_TRUNCATE_OMISSION
-      end
-    end
-
-    def prompt(prompt, ltype, indent, line_no) # :nodoc:
-      p = prompt.dup
-      p.gsub!(/%([0-9]+)?([a-zA-Z])/) do
-        case $2
-        when "N"
-          @context.irb_name
-        when "m"
-          truncate_prompt_main(@context.main.to_s)
-        when "M"
-          truncate_prompt_main(@context.main.inspect)
-        when "l"
-          ltype
-        when "i"
-          if indent < 0
-            if $1
-              "-".rjust($1.to_i)
-            else
-              "-"
-            end
-          else
-            if $1
-              format("%" + $1 + "d", indent)
-            else
-              indent.to_s
-            end
-          end
-        when "n"
-          if $1
-            format("%" + $1 + "d", line_no)
-          else
-            line_no.to_s
-          end
-        when "%"
-          "%"
-        end
-      end
-      p
-    end
-
-    def output_value(omit = false) # :nodoc:
-      str = @context.inspect_last_value
-      multiline_p = str.include?("\n")
-      if omit
-        winwidth = @context.io.winsize.last
-        if multiline_p
-          first_line = str.split("\n").first
-          result = @context.newline_before_multiline_output? ? (@context.return_format % first_line) : first_line
-          output_width = Reline::Unicode.calculate_width(result, true)
-          diff_size = output_width - Reline::Unicode.calculate_width(first_line, true)
-          if diff_size.positive? and output_width > winwidth
-            lines, _ = Reline::Unicode.split_by_width(first_line, winwidth - diff_size - 3)
-            str = "%s..." % lines.first
-            str += "\e[0m" if Color.colorable?
-            multiline_p = false
-          else
-            str = str.gsub(/(\A.*?\n).*/m, "\\1...")
-            str += "\e[0m" if Color.colorable?
-          end
-        else
-          output_width = Reline::Unicode.calculate_width(@context.return_format % str, true)
-          diff_size = output_width - Reline::Unicode.calculate_width(str, true)
-          if diff_size.positive? and output_width > winwidth
-            lines, _ = Reline::Unicode.split_by_width(str, winwidth - diff_size - 3)
-            str = "%s..." % lines.first
-            str += "\e[0m" if Color.colorable?
-          end
-        end
-      end
-      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
-    # #signal_status and #context, using IRB::Locale.
-    def inspect
-      ary = []
-      for iv in instance_variables
-        case (iv = iv.to_s)
-        when "@signal_status"
-          ary.push format("%s=:%s", iv, @signal_status.id2name)
-        when "@context"
-          ary.push format("%s=%s", iv, eval(iv).__to_s__)
-        else
-          ary.push format("%s=%s", iv, eval(iv))
-        end
-      end
-      format("#<%s: %s>", self.class, ary.join(", "))
-    end
-  end
-
-  def @CONF.inspect
-    IRB.version unless self[:VERSION]
-
-    array = []
-    for k, v in sort{|a1, a2| a1[0].id2name <=> a2[0].id2name}
-      case k
-      when :MAIN_CONTEXT, :__TMP__EHV__
-        array.push format("CONF[:%s]=...myself...", k.id2name)
-      when :PROMPT
-        s = v.collect{
-          |kk, vv|
-          ss = vv.collect{|kkk, vvv| ":#{kkk.id2name}=>#{vvv.inspect}"}
-          format(":%s=>{%s}", kk.id2name, ss.join(", "))
-        }
-        array.push format("CONF[:%s]={%s}", k.id2name, s.join(", "))
-      else
-        array.push format("CONF[:%s]=%s", k.id2name, v.inspect)
-      end
-    end
-    array.join("\n")
-  end
-end
-
-class Binding
-  # Opens an IRB session where +binding.irb+ is called which allows for
-  # interactive debugging. You can call any methods or variables available in
-  # the current scope, and mutate state if you need to.
-  #
-  #
-  # Given a Ruby file called +potato.rb+ containing the following code:
-  #
-  #     class Potato
-  #       def initialize
-  #         @cooked = false
-  #         binding.irb
-  #         puts "Cooked potato: #{@cooked}"
-  #       end
-  #     end
-  #
-  #     Potato.new
-  #
-  # Running <code>ruby potato.rb</code> will open an IRB session where
-  # +binding.irb+ is called, and you will see the following:
-  #
-  #     $ ruby potato.rb
-  #
-  #     From: potato.rb @ line 4 :
-  #
-  #         1: class Potato
-  #         2:   def initialize
-  #         3:     @cooked = false
-  #      => 4:     binding.irb
-  #         5:     puts "Cooked potato: #{@cooked}"
-  #         6:   end
-  #         7: end
-  #         8:
-  #         9: Potato.new
-  #
-  #     irb(#<Potato:0x00007feea1916670>):001:0>
-  #
-  # You can type any valid Ruby code and it will be evaluated in the current
-  # context. This allows you to debug without having to run your code repeatedly:
-  #
-  #     irb(#<Potato:0x00007feea1916670>):001:0> @cooked
-  #     => false
-  #     irb(#<Potato:0x00007feea1916670>):002:0> self.class
-  #     => Potato
-  #     irb(#<Potato:0x00007feea1916670>):003:0> caller.first
-  #     => ".../2.5.1/lib/ruby/2.5.0/irb/workspace.rb:85:in `eval'"
-  #     irb(#<Potato:0x00007feea1916670>):004:0> @cooked = true
-  #     => true
-  #
-  # You can exit the IRB session with the +exit+ command. Note that exiting will
-  # resume execution where +binding.irb+ had paused it, as you can see from the
-  # output printed to standard output in this example:
-  #
-  #     irb(#<Potato:0x00007feea1916670>):005:0> exit
-  #     Cooked potato: true
-  #
-  #
-  # See IRB@Usage for more information.
-  def irb(show_code: true)
-    # Setup IRB with the current file's path and no command line arguments
-    IRB.setup(source_location[0], argv: [])
-    # Create a new workspace using the current binding
-    workspace = IRB::WorkSpace.new(self)
-    # Print the code around the binding if show_code is true
-    STDOUT.print(workspace.code_around_binding) if show_code
-    # Get the original IRB instance
-    debugger_irb = IRB.instance_variable_get(:@debugger_irb)
-
-    irb_path = File.expand_path(source_location[0])
-
-    if debugger_irb
-      # If we're already in a debugger session, set the workspace and irb_path for the original IRB instance
-      debugger_irb.context.workspace = workspace
-      debugger_irb.context.irb_path = irb_path
-      # If we've started a debugger session and hit another binding.irb, we don't want to start an IRB session
-      # instead, we want to resume the irb:rdbg session.
-      IRB::Debug.setup(debugger_irb)
-      IRB::Debug.insert_debug_break
-      debugger_irb.debug_break
-    else
-      # If we're not in a debugger session, create a new IRB instance with the current workspace
-      binding_irb = IRB::Irb.new(workspace)
-      binding_irb.context.irb_path = irb_path
-      binding_irb.run(IRB.conf)
-      binding_irb.debug_break
-    end
-  end
-end
diff --git a/lib/irb/.document b/lib/irb/.document
deleted file mode 100644
index 3b0d6fa4ed6c1e..00000000000000
--- a/lib/irb/.document
+++ /dev/null
@@ -1 +0,0 @@
-**/*.rb
diff --git a/lib/irb/cmd/backtrace.rb b/lib/irb/cmd/backtrace.rb
deleted file mode 100644
index f632894618d341..00000000000000
--- a/lib/irb/cmd/backtrace.rb
+++ /dev/null
@@ -1,21 +0,0 @@
-# frozen_string_literal: true
-
-require_relative "debug"
-
-module IRB
-  # :stopdoc:
-
-  module ExtendCommand
-    class Backtrace < DebugCommand
-      def self.transform_args(args)
-        args&.dump
-      end
-
-      def execute(*args)
-        super(pre_cmds: ["backtrace", *args].join(" "))
-      end
-    end
-  end
-
-  # :startdoc:
-end
diff --git a/lib/irb/cmd/break.rb b/lib/irb/cmd/break.rb
deleted file mode 100644
index df259a90ca80f1..00000000000000
--- a/lib/irb/cmd/break.rb
+++ /dev/null
@@ -1,21 +0,0 @@
-# frozen_string_literal: true
-
-require_relative "debug"
-
-module IRB
-  # :stopdoc:
-
-  module ExtendCommand
-    class Break < DebugCommand
-      def self.transform_args(args)
-        args&.dump
-      end
-
-      def execute(args = nil)
-        super(pre_cmds: "break #{args}")
-      end
-    end
-  end
-
-  # :startdoc:
-end
diff --git a/lib/irb/cmd/catch.rb b/lib/irb/cmd/catch.rb
deleted file mode 100644
index 40b62c7533695a..00000000000000
--- a/lib/irb/cmd/catch.rb
+++ /dev/null
@@ -1,21 +0,0 @@
-# frozen_string_literal: true
-
-require_relative "debug"
-
-module IRB
-  # :stopdoc:
-
-  module ExtendCommand
-    class Catch < DebugCommand
-      def self.transform_args(args)
-        args&.dump
-      end
-
-      def execute(*args)
-        super(pre_cmds: ["catch", *args].join(" "))
-      end
-    end
-  end
-
-  # :startdoc:
-end
diff --git a/lib/irb/cmd/chws.rb b/lib/irb/cmd/chws.rb
deleted file mode 100644
index 31045f9bbbc3d7..00000000000000
--- a/lib/irb/cmd/chws.rb
+++ /dev/null
@@ -1,36 +0,0 @@
-# frozen_string_literal: false
-#
-#   change-ws.rb -
-#   	by Keiju ISHITSUKA(keiju@ruby-lang.org)
-#
-
-require_relative "nop"
-require_relative "../ext/change-ws"
-
-module IRB
-  # :stopdoc:
-
-  module ExtendCommand
-
-    class CurrentWorkingWorkspace < Nop
-      category "Workspace"
-      description "Show the current workspace."
-
-      def execute(*obj)
-        irb_context.main
-      end
-    end
-
-    class ChangeWorkspace < Nop
-      category "Workspace"
-      description "Change the current workspace to an object."
-
-      def execute(*obj)
-        irb_context.change_workspace(*obj)
-        irb_context.main
-      end
-    end
-  end
-
-  # :startdoc:
-end
diff --git a/lib/irb/cmd/continue.rb b/lib/irb/cmd/continue.rb
deleted file mode 100644
index 9136177eef831c..00000000000000
--- a/lib/irb/cmd/continue.rb
+++ /dev/null
@@ -1,17 +0,0 @@
-# frozen_string_literal: true
-
-require_relative "debug"
-
-module IRB
-  # :stopdoc:
-
-  module ExtendCommand
-    class Continue < DebugCommand
-      def execute(*args)
-        super(do_cmds: ["continue", *args].join(" "))
-      end
-    end
-  end
-
-  # :startdoc:
-end
diff --git a/lib/irb/cmd/debug.rb b/lib/irb/cmd/debug.rb
deleted file mode 100644
index 9eca964218a116..00000000000000
--- a/lib/irb/cmd/debug.rb
+++ /dev/null
@@ -1,80 +0,0 @@
-require_relative "nop"
-require_relative "../debug"
-
-module IRB
-  # :stopdoc:
-
-  module ExtendCommand
-    class Debug < Nop
-      category "Debugging"
-      description "Start the debugger of debug.gem."
-
-      BINDING_IRB_FRAME_REGEXPS = [
-        '<internal:prelude>',
-        binding.method(:irb).source_location.first,
-      ].map { |file| /\A#{Regexp.escape(file)}:\d+:in `irb'\z/ }
-
-      def execute(pre_cmds: nil, do_cmds: nil)
-        if irb_context.with_debugger
-          # If IRB is already running with a debug session, throw the command and IRB.debug_readline will pass it to the debugger.
-          if cmd = pre_cmds || do_cmds
-            throw :IRB_EXIT, cmd
-          else
-            puts "IRB is already running with a debug session."
-            return
-          end
-        else
-          # If IRB is not running with a debug session yet, then:
-          # 1. Check if the debugging command is run from a `binding.irb` call.
-          # 2. If so, try setting up the debug gem.
-          # 3. Insert a debug breakpoint at `Irb#debug_break` with the intended command.
-          # 4. Exit the current Irb#run call via `throw :IRB_EXIT`.
-          # 5. `Irb#debug_break` will be called and trigger the breakpoint, which will run the intended command.
-          unless binding_irb?
-            puts "`debug` command is only available when IRB is started with binding.irb"
-            return
-          end
-
-          if IRB.respond_to?(:JobManager)
-            warn "Can't start the debugger when IRB is running in a multi-IRB session."
-            return
-          end
-
-          unless IRB::Debug.setup(irb_context.irb)
-            puts <<~MSG
-              You need to install the debug gem before using this command.
-              If you use `bundle exec`, please add `gem "debug"` into your Gemfile.
-            MSG
-            return
-          end
-
-          IRB::Debug.insert_debug_break(pre_cmds: pre_cmds, do_cmds: do_cmds)
-
-          # exit current Irb#run call
-          throw :IRB_EXIT
-        end
-      end
-
-      private
-
-      def binding_irb?
-        caller.any? do |frame|
-          BINDING_IRB_FRAME_REGEXPS.any? do |regexp|
-            frame.match?(regexp)
-          end
-        end
-      end
-    end
-
-    class DebugCommand < Debug
-      def self.category
-        "Debugging"
-      end
-
-      def self.description
-        command_name = self.name.split("::").last.downcase
-        "Start the debugger of debug.gem and run its `#{command_name}` command."
-      end
-    end
-  end
-end
diff --git a/lib/irb/cmd/delete.rb b/lib/irb/cmd/delete.rb
deleted file mode 100644
index aeb26d2572335b..00000000000000
--- a/lib/irb/cmd/delete.rb
+++ /dev/null
@@ -1,17 +0,0 @@
-# frozen_string_literal: true
-
-require_relative "debug"
-
-module IRB
-  # :stopdoc:
-
-  module ExtendCommand
-    class Delete < DebugCommand
-      def execute(*args)
-        super(pre_cmds: ["delete", *args].join(" "))
-      end
-    end
-  end
-
-  # :startdoc:
-end
diff --git a/lib/irb/cmd/edit.rb b/lib/irb/cmd/edit.rb
deleted file mode 100644
index 69606beea0db9a..00000000000000
--- a/lib/irb/cmd/edit.rb
+++ /dev/null
@@ -1,60 +0,0 @@
-require 'shellwords'
-require_relative "nop"
-require_relative "../source_finder"
-
-module IRB
-  # :stopdoc:
-
-  module ExtendCommand
-    class Edit < Nop
-      category "Misc"
-      description 'Open a file with the editor command defined with `ENV["VISUAL"]` or `ENV["EDITOR"]`.'
-
-      class << self
-        def transform_args(args)
-          # Return a string literal as is for backward compatibility
-          if args.nil? || args.empty? || string_literal?(args)
-            args
-          else # Otherwise, consider the input as a String for convenience
-            args.strip.dump
-          end
-        end
-      end
-
-      def execute(*args)
-        path = args.first
-
-        if path.nil? && (irb_path = @irb_context.irb_path)
-          path = irb_path
-        end
-
-        if !File.exist?(path)
-          source =
-            begin
-              SourceFinder.new(@irb_context).find_source(path)
-            rescue NameError
-              # if user enters a path that doesn't exist, it'll cause NameError when passed here because find_source would try to evaluate it as well
-              # in this case, we should just ignore the error
-            end
-
-          if source
-            path = source.file
-          else
-            puts "Can not find file: #{path}"
-            return
-          end
-        end
-
-        if editor = (ENV['VISUAL'] || ENV['EDITOR'])
-          puts "command: '#{editor}'"
-          puts "   path: #{path}"
-          system(*Shellwords.split(editor), path)
-        else
-          puts "Can not find editor setting: ENV['VISUAL'] or ENV['EDITOR']"
-        end
-      end
-    end
-  end
-
-  # :startdoc:
-end
diff --git a/lib/irb/cmd/finish.rb b/lib/irb/cmd/finish.rb
deleted file mode 100644
index 29f100feb55542..00000000000000
--- a/lib/irb/cmd/finish.rb
+++ /dev/null
@@ -1,17 +0,0 @@
-# frozen_string_literal: true
-
-require_relative "debug"
-
-module IRB
-  # :stopdoc:
-
-  module ExtendCommand
-    class Finish < DebugCommand
-      def execute(*args)
-        super(do_cmds: ["finish", *args].join(" "))
-      end
-    end
-  end
-
-  # :startdoc:
-end
diff --git a/lib/irb/cmd/help.rb b/lib/irb/cmd/help.rb
deleted file mode 100644
index 64b885c3835a45..00000000000000
--- a/lib/irb/cmd/help.rb
+++ /dev/null
@@ -1,23 +0,0 @@
-# frozen_string_literal: true
-
-require_relative "show_doc"
-
-module IRB
-  module ExtendCommand
-    class Help < ShowDoc
-      category "Context"
-      description "[DEPRECATED] Enter the mode to look up RI documents."
-
-      DEPRECATION_MESSAGE = <<~MSG
-        [Deprecation] The `help` command will be repurposed to display command help in the future.
-        For RI document lookup, please use the `show_doc` command instead.
-        For command help, please use `show_cmds` for now.
-      MSG
-
-      def execute(*names)
-        warn DEPRECATION_MESSAGE
-        super
-      end
-    end
-  end
-end
diff --git a/lib/irb/cmd/info.rb b/lib/irb/cmd/info.rb
deleted file mode 100644
index 2c0a32b34fcf03..00000000000000
--- a/lib/irb/cmd/info.rb
+++ /dev/null
@@ -1,21 +0,0 @@
-# frozen_string_literal: true
-
-require_relative "debug"
-
-module IRB
-  # :stopdoc:
-
-  module ExtendCommand
-    class Info < DebugCommand
-      def self.transform_args(args)
-        args&.dump
-      end
-
-      def execute(*args)
-        super(pre_cmds: ["info", *args].join(" "))
-      end
-    end
-  end
-
-  # :startdoc:
-end
diff --git a/lib/irb/cmd/irb_info.rb b/lib/irb/cmd/irb_info.rb
deleted file mode 100644
index 75fdc386760955..00000000000000
--- a/lib/irb/cmd/irb_info.rb
+++ /dev/null
@@ -1,33 +0,0 @@
-# frozen_string_literal: false
-
-require_relative "nop"
-
-module IRB
-  # :stopdoc:
-
-  module ExtendCommand
-    class IrbInfo < Nop
-      category "IRB"
-      description "Show information about IRB."
-
-      def execute
-        str  = "Ruby version: #{RUBY_VERSION}\n"
-        str += "IRB version: #{IRB.version}\n"
-        str += "InputMethod: #{IRB.CurrentContext.io.inspect}\n"
-        str += ".irbrc path: #{IRB.rc_file}\n" if File.exist?(IRB.rc_file)
-        str += "RUBY_PLATFORM: #{RUBY_PLATFORM}\n"
-        str += "LANG env: #{ENV["LANG"]}\n" if ENV["LANG"] && !ENV["LANG"].empty?
-        str += "LC_ALL env: #{ENV["LC_ALL"]}\n" if ENV["LC_ALL"] && !ENV["LC_ALL"].empty?
-        str += "East Asian Ambiguous Width: #{Reline.ambiguous_width.inspect}\n"
-        if RbConfig::CONFIG['host_os'] =~ /mswin|msys|mingw|cygwin|bccwin|wince|emc/
-          codepage = `chcp`.b.sub(/.*: (\d+)\n/, '\1')
-          str += "Code page: #{codepage}\n"
-        end
-        puts str
-        nil
-      end
-    end
-  end
-
-  # :startdoc:
-end
diff --git a/lib/irb/cmd/load.rb b/lib/irb/cmd/load.rb
deleted file mode 100644
index a3e797a7e0692a..00000000000000
--- a/lib/irb/cmd/load.rb
+++ /dev/null
@@ -1,76 +0,0 @@
-# frozen_string_literal: false
-#
-#   load.rb -
-#   	by Keiju ISHITSUKA(keiju@ruby-lang.org)
-#
-
-require_relative "nop"
-require_relative "../ext/loader"
-
-module IRB
-  # :stopdoc:
-
-  module ExtendCommand
-    class LoaderCommand < Nop
-      include IrbLoader
-
-      def raise_cmd_argument_error
-        raise CommandArgumentError.new("Please specify the file name.")
-      end
-    end
-
-    class Load < LoaderCommand
-      category "IRB"
-      description "Load a Ruby file."
-
-      def execute(file_name = nil, priv = nil)
-        raise_cmd_argument_error unless file_name
-        irb_load(file_name, priv)
-      end
-    end
-
-    class Require < LoaderCommand
-      category "IRB"
-      description "Require a Ruby file."
-      def execute(file_name = nil)
-        raise_cmd_argument_error unless file_name
-
-        rex = Regexp.new("#{Regexp.quote(file_name)}(\.o|\.rb)?")
-        return false if $".find{|f| f =~ rex}
-
-        case file_name
-        when /\.rb$/
-          begin
-            if irb_load(file_name)
-              $".push file_name
-              return true
-            end
-          rescue LoadError
-          end
-        when /\.(so|o|sl)$/
-          return ruby_require(file_name)
-        end
-
-        begin
-          irb_load(f = file_name + ".rb")
-          $".push f
-          return true
-        rescue LoadError
-          return ruby_require(file_name)
-        end
-      end
-    end
-
-    class Source < LoaderCommand
-      category "IRB"
-      description "Loads a given file in the current session."
-
-      def execute(file_name = nil)
-        raise_cmd_argument_error unless file_name
-
-        source_file(file_name)
-      end
-    end
-  end
-  # :startdoc:
-end
diff --git a/lib/irb/cmd/ls.rb b/lib/irb/cmd/ls.rb
deleted file mode 100644
index 791b1c1b218905..00000000000000
--- a/lib/irb/cmd/ls.rb
+++ /dev/null
@@ -1,139 +0,0 @@
-# frozen_string_literal: true
-
-require "reline"
-require "stringio"
-require_relative "nop"
-require_relative "../pager"
-require_relative "../color"
-
-module IRB
-  # :stopdoc:
-
-  module ExtendCommand
-    class Ls < Nop
-      category "Context"
-      description "Show methods, constants, and variables. `-g [query]` or `-G [query]` allows you to filter out the output."
-
-      def self.transform_args(args)
-        if match = args&.match(/\A(?<args>.+\s|)(-g|-G)\s+(?<grep>[^\s]+)\s*\n\z/)
-          args = match[:args]
-          "#{args}#{',' unless args.chomp.empty?} grep: /#{match[:grep]}/"
-        else
-          args
-        end
-      end
-
-      def execute(*arg, grep: nil)
-        o = Output.new(grep: grep)
-
-        obj    = arg.empty? ? irb_context.workspace.main : arg.first
-        locals = arg.empty? ? irb_context.workspace.binding.local_variables : []
-        klass  = (obj.class == Class || obj.class == Module ? obj : obj.class)
-
-        o.dump("constants", obj.constants) if obj.respond_to?(:constants)
-        dump_methods(o, klass, obj)
-        o.dump("instance variables", obj.instance_variables)
-        o.dump("class variables", klass.class_variables)
-        o.dump("locals", locals)
-        o.print_result
-      end
-
-      def dump_methods(o, klass, obj)
-        singleton_class = begin obj.singleton_class; rescue TypeError; nil end
-        dumped_mods = Array.new
-        ancestors = klass.ancestors
-        ancestors = ancestors.reject { |c| c >= Object } if klass < Object
-        singleton_ancestors = (singleton_class&.ancestors || []).reject { |c| c >= Class }
-
-        # singleton_class' ancestors should be at the front
-        maps = class_method_map(singleton_ancestors, dumped_mods) + class_method_map(ancestors, dumped_mods)
-        maps.each do |mod, methods|
-          name = mod == singleton_class ? "#{klass}.methods" : "#{mod}#methods"
-          o.dump(name, methods)
-        end
-      end
-
-      def class_method_map(classes, dumped_mods)
-        dumped_methods = Array.new
-        classes.map do |mod|
-          next if dumped_mods.include? mod
-
-          dumped_mods << mod
-
-          methods = mod.public_instance_methods(false).select do |method|
-            if dumped_methods.include? method
-              false
-            else
-              dumped_methods << method
-              true
-            end
-          end
-
-          [mod, methods]
-        end.compact
-      end
-
-      class Output
-        MARGIN = "  "
-
-        def initialize(grep: nil)
-          @grep = grep
-          @line_width = screen_width - MARGIN.length # right padding
-          @io = StringIO.new
-        end
-
-        def print_result
-          Pager.page_content(@io.string)
-        end
-
-        def dump(name, strs)
-          strs = strs.grep(@grep) if @grep
-          strs = strs.sort
-          return if strs.empty?
-
-          # Attempt a single line
-          @io.print "#{Color.colorize(name, [:BOLD, :BLUE])}: "
-          if fits_on_line?(strs, cols: strs.size, offset: "#{name}: ".length)
-            @io.puts strs.join(MARGIN)
-            return
-          end
-          @io.puts
-
-          # Dump with the largest # of columns that fits on a line
-          cols = strs.size
-          until fits_on_line?(strs, cols: cols, offset: MARGIN.length) || cols == 1
-            cols -= 1
-          end
-          widths = col_widths(strs, cols: cols)
-          strs.each_slice(cols) do |ss|
-            @io.puts ss.map.with_index { |s, i| "#{MARGIN}%-#{widths[i]}s" % s }.join
-          end
-        end
-
-        private
-
-        def fits_on_line?(strs, cols:, offset: 0)
-          width = col_widths(strs, cols: cols).sum + MARGIN.length * (cols - 1)
-          width <= @line_width - offset
-        end
-
-        def col_widths(strs, cols:)
-          cols.times.map do |col|
-            (col...strs.size).step(cols).map do |i|
-              strs[i].length
-            end.max
-          end
-        end
-
-        def screen_width
-          Reline.get_screen_size.last
-        rescue Errno::EINVAL # in `winsize': Invalid argument - <STDIN>
-          80
-        end
-      end
-      private_constant :Output
-    end
-  end
-
-  # :startdoc:
-end
diff --git a/lib/irb/cmd/measure.rb b/lib/irb/cmd/measure.rb
deleted file mode 100644
index 9122e2dac97be3..00000000000000
--- a/lib/irb/cmd/measure.rb
+++ /dev/null
@@ -1,48 +0,0 @@
-require_relative "nop"
-
-module IRB
-  # :stopdoc:
-
-  module ExtendCommand
-    class Measure < Nop
-      category "Misc"
-      description "`measure` enables the mode to measure processing time. `measure :off` disables it."
-
-      def initialize(*args)
-        super(*args)
-      end
-
-      def execute(type = nil, arg = nil, &block)
-        # Please check IRB.init_config in lib/irb/init.rb that sets
-        # IRB.conf[:MEASURE_PROC] to register default "measure" methods,
-        # "measure :time" (abbreviated as "measure") and "measure :stackprof".
-        case type
-        when :off
-          IRB.conf[:MEASURE] = nil
-          IRB.unset_measure_callback(arg)
-        when :list
-          IRB.conf[:MEASURE_CALLBACKS].each do |type_name, _, arg_val|
-            puts "- #{type_name}" + (arg_val ? "(#{arg_val.inspect})" : '')
-          end
-        when :on
-          IRB.conf[:MEASURE] = true
-          added = IRB.set_measure_callback(type, arg)
-          puts "#{added[0]} is added." if added
-        else
-          if block_given?
-            IRB.conf[:MEASURE] = true
-            added = IRB.set_measure_callback(&block)
-            puts "#{added[0]} is added." if added
-          else
-            IRB.conf[:MEASURE] = true
-            added = IRB.set_measure_callback(type, arg)
-            puts "#{added[0]} is added." if added
-          end
-        end
-        nil
-      end
-    end
-  end
-
-  # :startdoc:
-end
diff --git a/lib/irb/cmd/next.rb b/lib/irb/cmd/next.rb
deleted file mode 100644
index d29c82e7fc0556..00000000000000
--- a/lib/irb/cmd/next.rb
+++ /dev/null
@@ -1,17 +0,0 @@
-# frozen_string_literal: true
-
-require_relative "debug"
-
-module IRB
-  # :stopdoc:
-
-  module ExtendCommand
-    class Next < DebugCommand
-      def execute(*args)
-        super(do_cmds: ["next", *args].join(" "))
-      end
-    end
-  end
-
-  # :startdoc:
-end
diff --git a/lib/irb/cmd/nop.rb b/lib/irb/cmd/nop.rb
deleted file mode 100644
index 7fb197c51f707e..00000000000000
--- a/lib/irb/cmd/nop.rb
+++ /dev/null
@@ -1,53 +0,0 @@
-# frozen_string_literal: false
-#
-#   nop.rb -
-#   	by Keiju ISHITSUKA(keiju@ruby-lang.org)
-#
-
-module IRB
-  # :stopdoc:
-
-  module ExtendCommand
-    class CommandArgumentError < StandardError; end
-
-    class Nop
-      class << self
-        def category(category = nil)
-          @category = category if category
-          @category
-        end
-
-        def description(description = nil)
-          @description = description if description
-          @description
-        end
-
-        private
-
-        def string_literal?(args)
-          sexp = Ripper.sexp(args)
-          sexp && sexp.size == 2 && sexp.last&.first&.first == :string_literal
-        end
-      end
-
-      def self.execute(irb_context, *opts, **kwargs, &block)
-        command = new(irb_context)
-        command.execute(*opts, **kwargs, &block)
-      rescue CommandArgumentError => e
-        puts e.message
-      end
-
-      def initialize(irb_context)
-        @irb_context = irb_context
-      end
-
-      attr_reader :irb_context
-
-      def execute(*opts)
-        #nop
-      end
-    end
-  end
-
-  # :startdoc:
-end
diff --git a/lib/irb/cmd/pushws.rb b/lib/irb/cmd/pushws.rb
deleted file mode 100644
index 59996ceb0c7dfa..00000000000000
--- a/lib/irb/cmd/pushws.rb
+++ /dev/null
@@ -1,45 +0,0 @@
-# frozen_string_literal: false
-#
-#   change-ws.rb -
-#   	by Keiju ISHITSUKA(keiju@ruby-lang.org)
-#
-
-require_relative "nop"
-require_relative "../ext/workspaces"
-
-module IRB
-  # :stopdoc:
-
-  module ExtendCommand
-    class Workspaces < Nop
-      category "Workspace"
-      description "Show workspaces."
-
-      def execute(*obj)
-        irb_context.workspaces.collect{|ws| ws.main}
-      end
-    end
-
-    class PushWorkspace < Workspaces
-      category "Workspace"
-      description "Push an object to the workspace stack."
-
-      def execute(*obj)
-        irb_context.push_workspace(*obj)
-        super
-      end
-    end
-
-    class PopWorkspace < Workspaces
-      category "Workspace"
-      description "Pop a workspace from the workspace stack."
-
-      def execute(*obj)
-        irb_context.pop_workspace(*obj)
-        super
-      end
-    end
-  end
-
-  # :startdoc:
-end
diff --git a/lib/irb/cmd/show_cmds.rb b/lib/irb/cmd/show_cmds.rb
deleted file mode 100644
index 7d6b3ec2668b6f..00000000000000
--- a/lib/irb/cmd/show_cmds.rb
+++ /dev/null
@@ -1,53 +0,0 @@
-# frozen_string_literal: true
-
-require "stringio"
-require_relative "nop"
-require_relative "../pager"
-
-module IRB
-  # :stopdoc:
-
-  module ExtendCommand
-    class ShowCmds < Nop
-      category "IRB"
-      description "List all available commands and their description."
-
-      def execute(*args)
-        commands_info = IRB::ExtendCommandBundle.all_commands_info
-        commands_grouped_by_categories = commands_info.group_by { |cmd| cmd[:category] }
-
-        if irb_context.with_debugger
-          # Remove the original "Debugging" category
-          commands_grouped_by_categories.delete("Debugging")
-          # Remove the `help` command as it's delegated to the debugger
-          commands_grouped_by_categories["Context"].delete_if { |cmd| cmd[:display_name] == :help }
-          # Add an empty "Debugging (from debug.gem)" category at the end
-          commands_grouped_by_categories["Debugging (from debug.gem)"] = []
-        end
-
-        longest_cmd_name_length = commands_info.map { |c| c[:display_name].length }.max
-
-        output = StringIO.new
-
-        commands_grouped_by_categories.each do |category, cmds|
-          output.puts Color.colorize(category, [:BOLD])
-
-          cmds.each do |cmd|
-            output.puts "  #{cmd[:display_name].to_s.ljust(longest_cmd_name_length)}    #{cmd[:description]}"
-          end
-
-          output.puts
-        end
-
-        # Append the debugger help at the end
-        if irb_context.with_debugger
-          output.puts DEBUGGER__.help
-        end
-
-        Pager.page_content(output.string)
-      end
-    end
-  end
-
-  # :startdoc:
-end
diff --git a/lib/irb/cmd/show_doc.rb b/lib/irb/cmd/show_doc.rb
deleted file mode 100644
index 99dd9ab95a4102..00000000000000
--- a/lib/irb/cmd/show_doc.rb
+++ /dev/null
@@ -1,48 +0,0 @@
-# frozen_string_literal: true
-
-require_relative "nop"
-
-module IRB
-  module ExtendCommand
-    class ShowDoc < Nop
-      class << self
-        def transform_args(args)
-          # Return a string literal as is for backward compatibility
-          if args.empty? || string_literal?(args)
-            args
-          else # Otherwise, consider the input as a String for convenience
-            args.strip.dump
-          end
-        end
-      end
-
-      category "Context"
-      description "Enter the mode to look up RI documents."
-
-      def execute(*names)
-        require 'rdoc/ri/driver'
-
-        unless ShowDoc.const_defined?(:Ri)
-          opts = RDoc::RI::Driver.process_args([])
-          ShowDoc.const_set(:Ri, RDoc::RI::Driver.new(opts))
-        end
-
-        if names.empty?
-          Ri.interactive
-        else
-          names.each do |name|
-            begin
-              Ri.display_name(name.to_s)
-            rescue RDoc::RI::Error
-              puts $!.message
-            end
-          end
-        end
-
-        nil
-      rescue LoadError, SystemExit
-        warn "Can't display document because `rdoc` is not installed."
-      end
-    end
-  end
-end
diff --git a/lib/irb/cmd/show_source.rb b/lib/irb/cmd/show_source.rb
deleted file mode 100644
index 10463ebf08ba6e..00000000000000
--- a/lib/irb/cmd/show_source.rb
+++ /dev/null
@@ -1,56 +0,0 @@
-# frozen_string_literal: true
-
-require_relative "nop"
-require_relative "../source_finder"
-require_relative "../color"
-
-module IRB
-  module ExtendCommand
-    class ShowSource < Nop
-      category "Context"
-      description "Show the source code of a given method or constant."
-
-      class << self
-        def transform_args(args)
-          # Return a string literal as is for backward compatibility
-          if args.empty? || string_literal?(args)
-            args
-          else # Otherwise, consider the input as a String for convenience
-            args.strip.dump
-          end
-        end
-      end
-
-      def execute(str = nil)
-        unless str.is_a?(String)
-          puts "Error: Expected a string but got #{str.inspect}"
-          return
-        end
-
-        source = SourceFinder.new(@irb_context).find_source(str)
-
-        if source
-          show_source(source)
-        else
-          puts "Error: Couldn't locate a definition for #{str}"
-        end
-        nil
-      end
-
-      private
-
-      def show_source(source)
-        puts
-        puts "#{bold("From")}: #{source.file}:#{source.first_line}"
-        puts
-        code = IRB::Color.colorize_code(File.read(source.file))
-        puts code.lines[(source.first_line - 1)...source.last_line].join
-        puts
-      end
-
-      def bold(str)
-        Color.colorize(str, [:BOLD])
-      end
-    end
-  end
-end
diff --git a/lib/irb/cmd/step.rb b/lib/irb/cmd/step.rb
deleted file mode 100644
index 2bc74a9d7922b7..00000000000000
--- a/lib/irb/cmd/step.rb
+++ /dev/null
@@ -1,17 +0,0 @@
-# frozen_string_literal: true
-
-require_relative "debug"
-
-module IRB
-  # :stopdoc:
-
-  module ExtendCommand
-    class Step < DebugCommand
-      def execute(*args)
-        super(do_cmds: ["step", *args].join(" "))
-      end
-    end
-  end
-
-  # :startdoc:
-end
diff --git a/lib/irb/cmd/subirb.rb b/lib/irb/cmd/subirb.rb
deleted file mode 100644
index 5ffd646416707f..00000000000000
--- a/lib/irb/cmd/subirb.rb
+++ /dev/null
@@ -1,109 +0,0 @@
-# frozen_string_literal: false
-#
-#   multi.rb -
-#   	by Keiju ISHITSUKA(keiju@ruby-lang.org)
-#
-
-require_relative "nop"
-
-module IRB
-  # :stopdoc:
-
-  module ExtendCommand
-    class MultiIRBCommand < Nop
-      def execute(*args)
-        extend_irb_context
-      end
-
-      private
-
-      def print_deprecated_warning
-        warn <<~MSG
-          Multi-irb commands are deprecated and will be removed in IRB 2.0.0. Please use workspace commands instead.
-          If you have any use case for multi-irb, please leave a comment at https://github.com/ruby/irb/issues/653
-        MSG
-      end
-
-      def extend_irb_context
-        # this extension patches IRB context like IRB.CurrentContext
-        require_relative "../ext/multi-irb"
-      end
-
-      def print_debugger_warning
-        warn "Multi-IRB commands are not available when the debugger is enabled."
-      end
-    end
-
-    class IrbCommand < MultiIRBCommand
-      category "Multi-irb (DEPRECATED)"
-      description "Start a child IRB."
-
-      def execute(*obj)
-        print_deprecated_warning
-
-        if irb_context.with_debugger
-          print_debugger_warning
-          return
-        end
-
-        super
-        IRB.irb(nil, *obj)
-      end
-    end
-
-    class Jobs < MultiIRBCommand
-      category "Multi-irb (DEPRECATED)"
-      description "List of current sessions."
-
-      def execute
-        print_deprecated_warning
-
-        if irb_context.with_debugger
-          print_debugger_warning
-          return
-        end
-
-        super
-        IRB.JobManager
-      end
-    end
-
-    class Foreground < MultiIRBCommand
-      category "Multi-irb (DEPRECATED)"
-      description "Switches to the session of the given number."
-
-      def execute(key = nil)
-        print_deprecated_warning
-
-        if irb_context.with_debugger
-          print_debugger_warning
-          return
-        end
-
-        super
-
-        raise CommandArgumentError.new("Please specify the id of target IRB job (listed in the `jobs` command).") unless key
-        IRB.JobManager.switch(key)
-      end
-    end
-
-    class Kill < MultiIRBCommand
-      category "Multi-irb (DEPRECATED)"
-      description "Kills the session with the given number."
-
-      def execute(*keys)
-        print_deprecated_warning
-
-        if irb_context.with_debugger
-          print_debugger_warning
-          return
-        end
-
-        super
-        IRB.JobManager.kill(*keys)
-      end
-    end
-  end
-
-  # :startdoc:
-end
diff --git a/lib/irb/cmd/whereami.rb b/lib/irb/cmd/whereami.rb
deleted file mode 100644
index 8f56ba073dc6d7..00000000000000
--- a/lib/irb/cmd/whereami.rb
+++ /dev/null
@@ -1,25 +0,0 @@
-# frozen_string_literal: true
-
-require_relative "nop"
-
-module IRB
-  # :stopdoc:
-
-  module ExtendCommand
-    class Whereami < Nop
-      category "Context"
-      description "Show the source code around binding.irb again."
-
-      def execute(*)
-        code = irb_context.workspace.code_around_binding
-        if code
-          puts code
-        else
-          puts "The current context doesn't have code."
-        end
-      end
-    end
-  end
-
-  # :startdoc:
-end
diff --git a/lib/irb/color.rb b/lib/irb/color.rb
deleted file mode 100644
index ad8670160c12ba..00000000000000
--- a/lib/irb/color.rb
+++ /dev/null
@@ -1,262 +0,0 @@
-# frozen_string_literal: true
-require 'reline'
-require 'ripper'
-require_relative 'ruby-lex'
-
-module IRB # :nodoc:
-  module Color
-    CLEAR     = 0
-    BOLD      = 1
-    UNDERLINE = 4
-    REVERSE   = 7
-    BLACK     = 30
-    RED       = 31
-    GREEN     = 32
-    YELLOW    = 33
-    BLUE      = 34
-    MAGENTA   = 35
-    CYAN      = 36
-    WHITE     = 37
-
-    TOKEN_KEYWORDS = {
-      on_kw: ['nil', 'self', 'true', 'false', '__FILE__', '__LINE__', '__ENCODING__'],
-      on_const: ['ENV'],
-    }
-    private_constant :TOKEN_KEYWORDS
-
-    # A constant of all-bit 1 to match any Ripper's state in #dispatch_seq
-    ALL = -1
-    private_constant :ALL
-
-    begin
-      # Following pry's colors where possible, but sometimes having a compromise like making
-      # backtick and regexp as red (string's color, because they're sharing tokens).
-      TOKEN_SEQ_EXPRS = {
-        on_CHAR:            [[BLUE, BOLD],            ALL],
-        on_backtick:        [[RED, BOLD],             ALL],
-        on_comment:         [[BLUE, BOLD],            ALL],
-        on_const:           [[BLUE, BOLD, UNDERLINE], ALL],
-        on_embexpr_beg:     [[RED],                   ALL],
-        on_embexpr_end:     [[RED],                   ALL],
-        on_embvar:          [[RED],                   ALL],
-        on_float:           [[MAGENTA, BOLD],         ALL],
-        on_gvar:            [[GREEN, BOLD],           ALL],
-        on_heredoc_beg:     [[RED],                   ALL],
-        on_heredoc_end:     [[RED],                   ALL],
-        on_ident:           [[BLUE, BOLD],            Ripper::EXPR_ENDFN],
-        on_imaginary:       [[BLUE, BOLD],            ALL],
-        on_int:             [[BLUE, BOLD],            ALL],
-        on_kw:              [[GREEN],                 ALL],
-        on_label:           [[MAGENTA],               ALL],
-        on_label_end:       [[RED, BOLD],             ALL],
-        on_qsymbols_beg:    [[RED, BOLD],             ALL],
-        on_qwords_beg:      [[RED, BOLD],             ALL],
-        on_rational:        [[BLUE, BOLD],            ALL],
-        on_regexp_beg:      [[RED, BOLD],             ALL],
-        on_regexp_end:      [[RED, BOLD],             ALL],
-        on_symbeg:          [[YELLOW],                ALL],
-        on_symbols_beg:     [[RED, BOLD],             ALL],
-        on_tstring_beg:     [[RED, BOLD],             ALL],
-        on_tstring_content: [[RED],                   ALL],
-        on_tstring_end:     [[RED, BOLD],             ALL],
-        on_words_beg:       [[RED, BOLD],             ALL],
-        on_parse_error:     [[RED, REVERSE],          ALL],
-        compile_error:      [[RED, REVERSE],          ALL],
-        on_assign_error:    [[RED, REVERSE],          ALL],
-        on_alias_error:     [[RED, REVERSE],          ALL],
-        on_class_name_error:[[RED, REVERSE],          ALL],
-        on_param_error:     [[RED, REVERSE],          ALL],
-        on___end__:         [[GREEN],                 ALL],
-      }
-    rescue NameError
-      # Give up highlighting Ripper-incompatible older Ruby
-      TOKEN_SEQ_EXPRS = {}
-    end
-    private_constant :TOKEN_SEQ_EXPRS
-
-    ERROR_TOKENS = TOKEN_SEQ_EXPRS.keys.select { |k| k.to_s.end_with?('error') }
-    private_constant :ERROR_TOKENS
-
-    class << self
-      def colorable?
-        supported = $stdout.tty? && (/mswin|mingw/ =~ RUBY_PLATFORM || (ENV.key?('TERM') && ENV['TERM'] != 'dumb'))
-
-        # because ruby/debug also uses irb's color module selectively,
-        # irb won't be activated in that case.
-        if IRB.respond_to?(:conf)
-          supported && IRB.conf.fetch(:USE_COLORIZE, true)
-        else
-          supported
-        end
-      end
-
-      def inspect_colorable?(obj, seen: {}.compare_by_identity)
-        case obj
-        when String, Symbol, Regexp, Integer, Float, FalseClass, TrueClass, NilClass
-          true
-        when Hash
-          without_circular_ref(obj, seen: seen) do
-            obj.all? { |k, v| inspect_colorable?(k, seen: seen) && inspect_colorable?(v, seen: seen) }
-          end
-        when Array
-          without_circular_ref(obj, seen: seen) do
-            obj.all? { |o| inspect_colorable?(o, seen: seen) }
-          end
-        when Range
-          inspect_colorable?(obj.begin, seen: seen) && inspect_colorable?(obj.end, seen: seen)
-        when Module
-          !obj.name.nil?
-        else
-          false
-        end
-      end
-
-      def clear(colorable: colorable?)
-        return '' unless colorable
-        "\e[#{CLEAR}m"
-      end
-
-      def colorize(text, seq, colorable: colorable?)
-        return text unless colorable
-        seq = seq.map { |s| "\e[#{const_get(s)}m" }.join('')
-        "#{seq}#{text}#{clear(colorable: colorable)}"
-      end
-
-      # If `complete` is false (code is incomplete), this does not warn compile_error.
-      # This option is needed to avoid warning a user when the compile_error is happening
-      # because the input is not wrong but just incomplete.
-      def colorize_code(code, complete: true, ignore_error: false, colorable: colorable?, local_variables: [])
-        return code unless colorable
-
-        symbol_state = SymbolState.new
-        colored = +''
-        lvars_code = RubyLex.generate_local_variables_assign_code(local_variables)
-        code_with_lvars = lvars_code ? "#{lvars_code}\n#{code}" : code
-
-        scan(code_with_lvars, allow_last_error: !complete) do |token, str, expr|
-          # handle uncolorable code
-          if token.nil?
-            colored << Reline::Unicode.escape_for_print(str)
-            next
-          end
-
-          # IRB::ColorPrinter skips colorizing fragments with any invalid token
-          if ignore_error && ERROR_TOKENS.include?(token)
-            return Reline::Unicode.escape_for_print(code)
-          end
-
-          in_symbol = symbol_state.scan_token(token)
-          str.each_line do |line|
-            line = Reline::Unicode.escape_for_print(line)
-            if seq = dispatch_seq(token, expr, line, in_symbol: in_symbol)
-              colored << seq.map { |s| "\e[#{s}m" }.join('')
-              colored << line.sub(/\Z/, clear(colorable: colorable))
-            else
-              colored << line
-            end
-          end
-        end
-
-        if lvars_code
-          raise "#{lvars_code.dump} should have no \\n" if lvars_code.include?("\n")
-          colored.sub!(/\A.+\n/, '') # delete_prefix lvars_code with colors
-        end
-        colored
-      end
-
-      private
-
-      def without_circular_ref(obj, seen:, &block)
-        return false if seen.key?(obj)
-        seen[obj] = true
-        block.call
-      ensure
-        seen.delete(obj)
-      end
-
-      def scan(code, allow_last_error:)
-        verbose, $VERBOSE = $VERBOSE, nil
-        RubyLex.compile_with_errors_suppressed(code) do |inner_code, line_no|
-          lexer = Ripper::Lexer.new(inner_code, '(ripper)', line_no)
-          byte_pos = 0
-          line_positions = [0]
-          inner_code.lines.each do |line|
-            line_positions << line_positions.last + line.bytesize
-          end
-
-          on_scan = proc do |elem|
-            start_pos = line_positions[elem.pos[0] - 1] + elem.pos[1]
-
-            # yield uncolorable code
-            if byte_pos < start_pos
-              yield(nil, inner_code.byteslice(byte_pos...start_pos), nil)
-            end
-
-            if byte_pos <= start_pos
-              str = elem.tok
-              yield(elem.event, str, elem.state)
-              byte_pos = start_pos + str.bytesize
-            end
-          end
-
-          lexer.scan.each do |elem|
-            next if allow_last_error and /meets end of file|unexpected end-of-input/ =~ elem.message
-            on_scan.call(elem)
-          end
-          # yield uncolorable DATA section
-          yield(nil, inner_code.byteslice(byte_pos...inner_code.bytesize), nil) if byte_pos < inner_code.bytesize
-        end
-      ensure
-        $VERBOSE = verbose
-      end
-
-      def dispatch_seq(token, expr, str, in_symbol:)
-        if ERROR_TOKENS.include?(token)
-          TOKEN_SEQ_EXPRS[token][0]
-        elsif in_symbol
-          [YELLOW]
-        elsif TOKEN_KEYWORDS.fetch(token, []).include?(str)
-          [CYAN, BOLD]
-        elsif (seq, exprs = TOKEN_SEQ_EXPRS[token]; (expr & (exprs || 0)) != 0)
-          seq
-        else
-          nil
-        end
-      end
-    end
-
-    # A class to manage a state to know whether the current token is for Symbol or not.
-    class SymbolState
-      def initialize
-        # Push `true` to detect Symbol. `false` to increase the nest level for non-Symbol.
-        @stack = []
-      end
-
-      # Return true if the token is a part of Symbol.
-      def scan_token(token)
-        prev_state = @stack.last
-        case token
-        when :on_symbeg, :on_symbols_beg, :on_qsymbols_beg
-          @stack << true
-        when :on_ident, :on_op, :on_const, :on_ivar, :on_cvar, :on_gvar, :on_kw, :on_backtick
-          if @stack.last # Pop only when it's Symbol
-            @stack.pop
-            return prev_state
-          end
-        when :on_tstring_beg
-          @stack << false
-        when :on_embexpr_beg
-          @stack << false
-          return prev_state
-        when :on_tstring_end # :on_tstring_end may close Symbol
-          @stack.pop
-          return prev_state
-        when :on_embexpr_end
-          @stack.pop
-        end
-        @stack.last
-      end
-    end
-    private_constant :SymbolState
-  end
-end
diff --git a/lib/irb/color_printer.rb b/lib/irb/color_printer.rb
deleted file mode 100644
index 31644aa7f9a417..00000000000000
--- a/lib/irb/color_printer.rb
+++ /dev/null
@@ -1,55 +0,0 @@
-# frozen_string_literal: true
-require 'pp'
-require_relative 'color'
-
-module IRB
-  class ColorPrinter < ::PP
-    METHOD_RESPOND_TO = Object.instance_method(:respond_to?)
-    METHOD_INSPECT = Object.instance_method(:inspect)
-
-    class << self
-      def pp(obj, out = $>, width = screen_width)
-        q = ColorPrinter.new(out, width)
-        q.guard_inspect_key {q.pp obj}
-        q.flush
-        out << "\n"
-      end
-
-      private
-
-      def screen_width
-        Reline.get_screen_size.last
-      rescue Errno::EINVAL # in `winsize': Invalid argument - <STDIN>
-        79
-      end
-    end
-
-    def pp(obj)
-      if String === obj
-        # Avoid calling Ruby 2.4+ String#pretty_print that splits a string by "\n"
-        text(obj.inspect)
-      elsif !METHOD_RESPOND_TO.bind(obj).call(:inspect)
-        text(METHOD_INSPECT.bind(obj).call)
-      else
-        super
-      end
-    end
-
-    def text(str, width = nil)
-      unless str.is_a?(String)
-        str = str.inspect
-      end
-      width ||= str.length
-
-      case str
-      when ''
-      when ',', '=>', '[', ']', '{', '}', '..', '...', /\A@\w+\z/
-        super(str, width)
-      when /\A#</, '=', '>'
-        super(Color.colorize(str, [:GREEN]), width)
-      else
-        super(Color.colorize_code(str, ignore_error: true), width)
-      end
-    end
-  end
-end
diff --git a/lib/irb/completion.rb b/lib/irb/completion.rb
deleted file mode 100644
index a143d1b3e112e1..00000000000000
--- a/lib/irb/completion.rb
+++ /dev/null
@@ -1,446 +0,0 @@
-# frozen_string_literal: false
-#
-#   irb/completion.rb -
-#   	by Keiju ISHITSUKA(keiju@ishitsuka.com)
-#       From Original Idea of shugo@ruby-lang.org
-#
-
-require_relative 'ruby-lex'
-
-module IRB
-  module InputCompletor # :nodoc:
-    using Module.new {
-      refine ::Binding do
-        def eval_methods
-          ::Kernel.instance_method(:methods).bind(eval("self")).call
-        end
-
-        def eval_private_methods
-          ::Kernel.instance_method(:private_methods).bind(eval("self")).call
-        end
-
-        def eval_instance_variables
-          ::Kernel.instance_method(:instance_variables).bind(eval("self")).call
-        end
-
-        def eval_global_variables
-          ::Kernel.instance_method(:global_variables).bind(eval("self")).call
-        end
-
-        def eval_class_constants
-          ::Module.instance_method(:constants).bind(eval("self.class")).call
-        end
-      end
-    }
-
-    # 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
-      else elsif end ensure
-      false for
-      if in
-      module
-      next nil not
-      or
-      redo rescue retry return
-      self super
-      then true
-      undef unless until
-      when while
-      yield
-    ]
-
-    BASIC_WORD_BREAK_CHARACTERS = " \t\n`><=;|&{("
-
-    GEM_PATHS =
-      if defined?(Gem::Specification)
-        Gem::Specification.latest_specs(true).map { |s|
-          s.require_paths.map { |p|
-            if File.absolute_path?(p)
-              p
-            else
-              File.join(s.full_gem_path, p)
-            end
-          }
-        }.flatten
-      else
-        []
-      end.freeze
-
-    def self.retrieve_gem_and_system_load_path
-      candidates = (GEM_PATHS | $LOAD_PATH)
-      candidates.map do |p|
-        if p.respond_to?(:to_path)
-          p.to_path
-        else
-          String(p) rescue nil
-        end
-      end.compact.sort
-    end
-
-    def self.retrieve_files_to_require_from_load_path
-      @@files_from_load_path ||=
-        (
-          shortest = []
-          rest = retrieve_gem_and_system_load_path.each_with_object([]) { |path, result|
-            begin
-              names = Dir.glob("**/*.{rb,#{RbConfig::CONFIG['DLEXT']}}", base: path)
-            rescue Errno::ENOENT
-              nil
-            end
-            next if names.empty?
-            names.map! { |n| n.sub(/\.(rb|#{RbConfig::CONFIG['DLEXT']})\z/, '') }.sort!
-            shortest << names.shift
-            result.concat(names)
-          }
-          shortest.sort! | rest
-        )
-    end
-
-    def self.retrieve_files_to_require_relative_from_current_dir
-      @@files_from_current_dir ||= Dir.glob("**/*.{rb,#{RbConfig::CONFIG['DLEXT']}}", base: '.').map { |path|
-        path.sub(/\.(rb|#{RbConfig::CONFIG['DLEXT']})\z/, '')
-      }
-    end
-
-    CompletionRequireProc = lambda { |target, preposing = nil, postposing = nil|
-      if target =~ /\A(['"])([^'"]+)\Z/
-        quote = $1
-        actual_target = $2
-      else
-        return nil # It's not String literal
-      end
-      tokens = RubyLex.ripper_lex_without_warning(preposing.gsub(/\s*\z/, ''))
-      tok = nil
-      tokens.reverse_each do |t|
-        unless [:on_lparen, :on_sp, :on_ignored_sp, :on_nl, :on_ignored_nl, :on_comment].include?(t.event)
-          tok = t
-          break
-        end
-      end
-      result = []
-      if tok && tok.event == :on_ident && tok.state == Ripper::EXPR_CMDARG
-        case tok.tok
-        when 'require'
-          result = retrieve_files_to_require_from_load_path.select { |path|
-            path.start_with?(actual_target)
-          }.map { |path|
-            quote + path
-          }
-        when 'require_relative'
-          result = retrieve_files_to_require_relative_from_current_dir.select { |path|
-            path.start_with?(actual_target)
-          }.map { |path|
-            quote + path
-          }
-        end
-      end
-      result
-    }
-
-    CompletionProc = lambda { |target, preposing = nil, postposing = nil|
-      if preposing && postposing
-        result = CompletionRequireProc.(target, preposing, postposing)
-        unless result
-          result = retrieve_completion_data(target).compact.map{ |i| i.encode(Encoding.default_external) }
-        end
-        result
-      else
-        retrieve_completion_data(target).compact.map{ |i| i.encode(Encoding.default_external) }
-      end
-    }
-
-    def self.retrieve_completion_data(input, bind: IRB.conf[:MAIN_CONTEXT].workspace.binding, doc_namespace: false)
-      case input
-      # this regexp only matches the closing character because of irb's Reline.completer_quote_characters setting
-      # details are described in: https://github.com/ruby/irb/pull/523
-      when /^(.*["'`])\.([^.]*)$/
-        # String
-        receiver = $1
-        message = $2
-
-        if doc_namespace
-          "String.#{message}"
-        else
-          candidates = String.instance_methods.collect{|m| m.to_s}
-          select_message(receiver, message, candidates)
-        end
-
-      # this regexp only matches the closing character because of irb's Reline.completer_quote_characters setting
-      # details are described in: https://github.com/ruby/irb/pull/523
-      when /^(.*\/)\.([^.]*)$/
-        # Regexp
-        receiver = $1
-        message = $2
-
-        if doc_namespace
-          "Regexp.#{message}"
-        else
-          candidates = Regexp.instance_methods.collect{|m| m.to_s}
-          select_message(receiver, message, candidates)
-        end
-
-      when /^([^\]]*\])\.([^.]*)$/
-        # Array
-        receiver = $1
-        message = $2
-
-        if doc_namespace
-          "Array.#{message}"
-        else
-          candidates = Array.instance_methods.collect{|m| m.to_s}
-          select_message(receiver, message, candidates)
-        end
-
-      when /^([^\}]*\})\.([^.]*)$/
-        # Proc or Hash
-        receiver = $1
-        message = $2
-
-        if doc_namespace
-          ["Proc.#{message}", "Hash.#{message}"]
-        else
-          proc_candidates = Proc.instance_methods.collect{|m| m.to_s}
-          hash_candidates = Hash.instance_methods.collect{|m| m.to_s}
-          select_message(receiver, message, proc_candidates | hash_candidates)
-        end
-
-      when /^(:[^:.]+)$/
-        # Symbol
-        if doc_namespace
-          nil
-        else
-          sym = $1
-          candidates = Symbol.all_symbols.collect do |s|
-            s.inspect
-          rescue EncodingError
-            # ignore
-          end
-          candidates.grep(/^#{Regexp.quote(sym)}/)
-        end
-      when /^::([A-Z][^:\.\(\)]*)$/
-        # Absolute Constant or class methods
-        receiver = $1
-
-        candidates = Object.constants.collect{|m| m.to_s}
-
-        if doc_namespace
-          candidates.find { |i| i == receiver }
-        else
-          candidates.grep(/^#{Regexp.quote(receiver)}/).collect{|e| "::" + e}
-        end
-
-      when /^([A-Z].*)::([^:.]*)$/
-        # Constant or class methods
-        receiver = $1
-        message = $2
-
-        if doc_namespace
-          "#{receiver}::#{message}"
-        else
-          begin
-            candidates = eval("#{receiver}.constants.collect{|m| m.to_s}", bind)
-            candidates |= eval("#{receiver}.methods.collect{|m| m.to_s}", bind)
-          rescue Exception
-            candidates = []
-          end
-
-          select_message(receiver, message, candidates.sort, "::")
-        end
-
-      when /^(:[^:.]+)(\.|::)([^.]*)$/
-        # Symbol
-        receiver = $1
-        sep = $2
-        message = $3
-
-        if doc_namespace
-          "Symbol.#{message}"
-        else
-          candidates = Symbol.instance_methods.collect{|m| m.to_s}
-          select_message(receiver, message, candidates, sep)
-        end
-
-      when /^(?<num>-?(?:0[dbo])?[0-9_]+(?:\.[0-9_]+)?(?:(?:[eE][+-]?[0-9]+)?i?|r)?)(?<sep>\.|::)(?<mes>[^.]*)$/
-        # Numeric
-        receiver = $~[:num]
-        sep = $~[:sep]
-        message = $~[:mes]
-
-        begin
-          instance = eval(receiver, bind)
-
-          if doc_namespace
-            "#{instance.class.name}.#{message}"
-          else
-            candidates = instance.methods.collect{|m| m.to_s}
-            select_message(receiver, message, candidates, sep)
-          end
-        rescue Exception
-          if doc_namespace
-            nil
-          else
-            []
-          end
-        end
-
-      when /^(-?0x[0-9a-fA-F_]+)(\.|::)([^.]*)$/
-        # Numeric(0xFFFF)
-        receiver = $1
-        sep = $2
-        message = $3
-
-        begin
-          instance = eval(receiver, bind)
-          if doc_namespace
-            "#{instance.class.name}.#{message}"
-          else
-            candidates = instance.methods.collect{|m| m.to_s}
-            select_message(receiver, message, candidates, sep)
-          end
-        rescue Exception
-          if doc_namespace
-            nil
-          else
-            []
-          end
-        end
-
-      when /^(\$[^.]*)$/
-        # global var
-        gvar = $1
-        all_gvars = global_variables.collect{|m| m.to_s}
-
-        if doc_namespace
-          all_gvars.find{ |i| i == gvar }
-        else
-          all_gvars.grep(Regexp.new(Regexp.quote(gvar)))
-        end
-
-      when /^([^.:"].*)(\.|::)([^.]*)$/
-        # variable.func or func.func
-        receiver = $1
-        sep = $2
-        message = $3
-
-        gv = bind.eval_global_variables.collect{|m| m.to_s}.push("true", "false", "nil")
-        lv = bind.local_variables.collect{|m| m.to_s}
-        iv = bind.eval_instance_variables.collect{|m| m.to_s}
-        cv = bind.eval_class_constants.collect{|m| m.to_s}
-
-        if (gv | lv | iv | cv).include?(receiver) or /^[A-Z]/ =~ receiver && /\./ !~ receiver
-          # foo.func and foo is var. OR
-          # foo::func and foo is var. OR
-          # foo::Const and foo is var. OR
-          # Foo::Bar.func
-          begin
-            candidates = []
-            rec = eval(receiver, bind)
-            if sep == "::" and rec.kind_of?(Module)
-              candidates = rec.constants.collect{|m| m.to_s}
-            end
-            candidates |= rec.methods.collect{|m| m.to_s}
-          rescue Exception
-            candidates = []
-          end
-        else
-          # func1.func2
-          candidates = []
-        end
-
-        if doc_namespace
-          rec_class = rec.is_a?(Module) ? rec : rec.class
-          "#{rec_class.name}#{sep}#{candidates.find{ |i| i == message }}"
-        else
-          select_message(receiver, message, candidates, sep)
-        end
-
-      when /^\.([^.]*)$/
-        # unknown(maybe String)
-
-        receiver = ""
-        message = $1
-
-        candidates = String.instance_methods(true).collect{|m| m.to_s}
-
-        if doc_namespace
-          "String.#{candidates.find{ |i| i == message }}"
-        else
-          select_message(receiver, message, candidates.sort)
-        end
-
-      else
-        if doc_namespace
-          vars = (bind.local_variables | bind.eval_instance_variables).collect{|m| m.to_s}
-          perfect_match_var = vars.find{|m| m.to_s == input}
-          if perfect_match_var
-            eval("#{perfect_match_var}.class.name", bind)
-          else
-            candidates = (bind.eval_methods | bind.eval_private_methods | bind.local_variables | bind.eval_instance_variables | bind.eval_class_constants).collect{|m| m.to_s}
-            candidates |= ReservedWords
-            candidates.find{ |i| i == input }
-          end
-        else
-          candidates = (bind.eval_methods | bind.eval_private_methods | bind.local_variables | bind.eval_instance_variables | bind.eval_class_constants).collect{|m| m.to_s}
-          candidates |= ReservedWords
-          candidates.grep(/^#{Regexp.quote(input)}/).sort
-        end
-      end
-    end
-
-    PerfectMatchedProc = ->(matched, bind: IRB.conf[:MAIN_CONTEXT].workspace.binding) {
-      begin
-        require 'rdoc'
-      rescue LoadError
-        return
-      end
-
-      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, bind: bind, doc_namespace: true)
-      return unless namespace
-
-      if namespace.is_a?(Array)
-        out = RDoc::Markup::Document.new
-        namespace.each do |m|
-          begin
-            RDocRIDriver.add_method(out, m)
-          rescue RDoc::RI::Driver::NotFoundError
-          end
-        end
-        RDocRIDriver.display(out)
-      else
-        begin
-          RDocRIDriver.display_names([namespace])
-        rescue RDoc::RI::Driver::NotFoundError
-        end
-      end
-    }
-
-    # Set of available operators in Ruby
-    Operators = %w[% & * ** + - / < << <= <=> == === =~ > >= >> [] []= ^ ! != !~]
-
-    def self.select_message(receiver, message, candidates, sep = ".")
-      candidates.grep(/^#{Regexp.quote(message)}/).collect do |e|
-        case e
-        when /^[a-zA-Z_]/
-          receiver + sep + e
-        when /^[0-9]/
-        when *Operators
-          #receiver + " " + e
-        end
-      end
-    end
-  end
-end
diff --git a/lib/irb/context.rb b/lib/irb/context.rb
deleted file mode 100644
index a20510d73c3ee8..00000000000000
--- a/lib/irb/context.rb
+++ /dev/null
@@ -1,586 +0,0 @@
-# frozen_string_literal: false
-#
-#   irb/context.rb - irb context
-#   	by Keiju ISHITSUKA(keiju@ruby-lang.org)
-#
-
-require_relative "workspace"
-require_relative "inspector"
-require_relative "input-method"
-require_relative "output-method"
-
-module IRB
-  # A class that wraps the current state of the irb session, including the
-  # configuration of IRB.conf.
-  class Context
-    # Creates a new IRB context.
-    #
-    # The optional +input_method+ argument:
-    #
-    # +nil+::     uses stdin or Reline or Readline
-    # +String+::  uses a File
-    # +other+::   uses this as InputMethod
-    def initialize(irb, workspace = nil, input_method = nil)
-      @irb = irb
-      if workspace
-        @workspace = workspace
-      else
-        @workspace = WorkSpace.new
-      end
-      @thread = Thread.current
-
-      # copy of default configuration
-      @ap_name = IRB.conf[:AP_NAME]
-      @rc = IRB.conf[:RC]
-      @load_modules = IRB.conf[:LOAD_MODULES]
-
-      if IRB.conf.has_key?(:USE_SINGLELINE)
-        @use_singleline = IRB.conf[:USE_SINGLELINE]
-      elsif IRB.conf.has_key?(:USE_READLINE) # backward compatibility
-        @use_singleline = IRB.conf[:USE_READLINE]
-      else
-        @use_singleline = nil
-      end
-      if IRB.conf.has_key?(:USE_MULTILINE)
-        @use_multiline = IRB.conf[:USE_MULTILINE]
-      elsif IRB.conf.has_key?(:USE_RELINE) # backward compatibility
-        warn <<~MSG.strip
-          USE_RELINE is deprecated, please use USE_MULTILINE instead.
-        MSG
-        @use_multiline = IRB.conf[:USE_RELINE]
-      elsif IRB.conf.has_key?(:USE_REIDLINE)
-        warn <<~MSG.strip
-          USE_REIDLINE is deprecated, please use USE_MULTILINE instead.
-        MSG
-        @use_multiline = IRB.conf[:USE_REIDLINE]
-      else
-        @use_multiline = nil
-      end
-      @use_autocomplete = IRB.conf[:USE_AUTOCOMPLETE]
-      @verbose = IRB.conf[:VERBOSE]
-      @io = nil
-
-      self.inspect_mode = IRB.conf[:INSPECT_MODE]
-      self.use_tracer = IRB.conf[:USE_TRACER] if IRB.conf[:USE_TRACER]
-      self.use_loader = IRB.conf[:USE_LOADER] if IRB.conf[:USE_LOADER]
-      self.eval_history = IRB.conf[:EVAL_HISTORY] if IRB.conf[:EVAL_HISTORY]
-
-      @ignore_sigint = IRB.conf[:IGNORE_SIGINT]
-      @ignore_eof = IRB.conf[:IGNORE_EOF]
-
-      @back_trace_limit = IRB.conf[:BACK_TRACE_LIMIT]
-
-      self.prompt_mode = IRB.conf[:PROMPT_MODE]
-
-      if IRB.conf[:SINGLE_IRB] or !defined?(IRB::JobManager)
-        @irb_name = IRB.conf[:IRB_NAME]
-      else
-        @irb_name = IRB.conf[:IRB_NAME]+"#"+IRB.JobManager.n_jobs.to_s
-      end
-      @irb_path = "(" + @irb_name + ")"
-
-      case input_method
-      when nil
-        @io = nil
-        case use_multiline?
-        when nil
-          if STDIN.tty? && IRB.conf[:PROMPT_MODE] != :INF_RUBY && !use_singleline?
-            # Both of multiline mode and singleline mode aren't specified.
-            @io = RelineInputMethod.new
-          else
-            @io = nil
-          end
-        when false
-          @io = nil
-        when true
-          @io = RelineInputMethod.new
-        end
-        unless @io
-          case use_singleline?
-          when nil
-            if (defined?(ReadlineInputMethod) && STDIN.tty? &&
-                IRB.conf[:PROMPT_MODE] != :INF_RUBY)
-              @io = ReadlineInputMethod.new
-            else
-              @io = nil
-            end
-          when false
-            @io = nil
-          when true
-            if defined?(ReadlineInputMethod)
-              @io = ReadlineInputMethod.new
-            else
-              @io = nil
-            end
-          else
-            @io = nil
-          end
-        end
-        @io = StdioInputMethod.new unless @io
-
-      when '-'
-        @io = FileInputMethod.new($stdin)
-        @irb_name = '-'
-        @irb_path = '-'
-      when String
-        @io = FileInputMethod.new(input_method)
-        @irb_name = File.basename(input_method)
-        @irb_path = input_method
-      else
-        @io = input_method
-      end
-      @extra_doc_dirs = IRB.conf[:EXTRA_DOC_DIRS]
-
-      @echo = IRB.conf[:ECHO]
-      if @echo.nil?
-        @echo = true
-      end
-
-      @echo_on_assignment = IRB.conf[:ECHO_ON_ASSIGNMENT]
-      if @echo_on_assignment.nil?
-        @echo_on_assignment = :truncate
-      end
-
-      @newline_before_multiline_output = IRB.conf[:NEWLINE_BEFORE_MULTILINE_OUTPUT]
-      if @newline_before_multiline_output.nil?
-        @newline_before_multiline_output = true
-      end
-
-      @command_aliases = IRB.conf[:COMMAND_ALIASES]
-    end
-
-    def save_history=(val)
-      IRB.conf[:SAVE_HISTORY] = val
-    end
-
-    def save_history
-      IRB.conf[:SAVE_HISTORY]
-    end
-
-    # A copy of the default <code>IRB.conf[:HISTORY_FILE]</code>
-    def history_file
-      IRB.conf[:HISTORY_FILE]
-    end
-
-    # Set <code>IRB.conf[:HISTORY_FILE]</code> to the given +hist+.
-    def history_file=(hist)
-      IRB.conf[:HISTORY_FILE] = hist
-    end
-
-    # The top-level workspace, see WorkSpace#main
-    def main
-      @workspace.main
-    end
-
-    # The toplevel workspace, see #home_workspace
-    attr_reader :workspace_home
-    # WorkSpace in the current context.
-    attr_accessor :workspace
-    # The current thread in this context.
-    attr_reader :thread
-    # The current input method.
-    #
-    # Can be either StdioInputMethod, ReadlineInputMethod,
-    # RelineInputMethod, FileInputMethod or other specified when the
-    # context is created. See ::new for more # information on +input_method+.
-    attr_accessor :io
-
-    # Current irb session.
-    attr_accessor :irb
-    # A copy of the default <code>IRB.conf[:AP_NAME]</code>
-    attr_accessor :ap_name
-    # A copy of the default <code>IRB.conf[:RC]</code>
-    attr_accessor :rc
-    # A copy of the default <code>IRB.conf[:LOAD_MODULES]</code>
-    attr_accessor :load_modules
-    # Can be either name from <code>IRB.conf[:IRB_NAME]</code>, or the number of
-    # the current job set by JobManager, such as <code>irb#2</code>
-    attr_accessor :irb_name
-    # Can be either the #irb_name surrounded by parenthesis, or the
-    # +input_method+ passed to Context.new
-    attr_accessor :irb_path
-
-    # Whether multiline editor mode is enabled or not.
-    #
-    # A copy of the default <code>IRB.conf[:USE_MULTILINE]</code>
-    attr_reader :use_multiline
-    # Whether singleline editor mode is enabled or not.
-    #
-    # A copy of the default <code>IRB.conf[:USE_SINGLELINE]</code>
-    attr_reader :use_singleline
-    # Whether colorization is enabled or not.
-    #
-    # A copy of the default <code>IRB.conf[:USE_AUTOCOMPLETE]</code>
-    attr_reader :use_autocomplete
-    # A copy of the default <code>IRB.conf[:INSPECT_MODE]</code>
-    attr_reader :inspect_mode
-
-    # A copy of the default <code>IRB.conf[:PROMPT_MODE]</code>
-    attr_reader :prompt_mode
-    # Standard IRB prompt.
-    #
-    # See IRB@Customizing+the+IRB+Prompt for more information.
-    attr_accessor :prompt_i
-    # IRB prompt for continuated strings.
-    #
-    # See IRB@Customizing+the+IRB+Prompt for more information.
-    attr_accessor :prompt_s
-    # IRB prompt for continuated statement. (e.g. immediately after an +if+)
-    #
-    # See IRB@Customizing+the+IRB+Prompt for more information.
-    attr_accessor :prompt_c
-
-    # TODO: Remove this when developing v2.0
-    def prompt_n
-      warn "IRB::Context#prompt_n is deprecated and will be removed in the next major release."
-      ""
-    end
-
-    # TODO: Remove this when developing v2.0
-    def prompt_n=(_)
-      warn "IRB::Context#prompt_n= is deprecated and will be removed in the next major release."
-      ""
-    end
-
-    # Can be either the default <code>IRB.conf[:AUTO_INDENT]</code>, or the
-    # mode set by #prompt_mode=
-    #
-    # To disable auto-indentation in irb:
-    #
-    #     IRB.conf[:AUTO_INDENT] = false
-    #
-    # or
-    #
-    #     irb_context.auto_indent_mode = false
-    #
-    # or
-    #
-    #     IRB.CurrentContext.auto_indent_mode = false
-    #
-    # See IRB@Configuration for more information.
-    attr_accessor :auto_indent_mode
-    # The format of the return statement, set by #prompt_mode= using the
-    # +:RETURN+ of the +mode+ passed to set the current #prompt_mode.
-    attr_accessor :return_format
-
-    # Whether <code>^C</code> (+control-c+) will be ignored or not.
-    #
-    # If set to +false+, <code>^C</code> will quit irb.
-    #
-    # If set to +true+,
-    #
-    # * during input:   cancel input then return to top level.
-    # * during execute: abandon current execution.
-    attr_accessor :ignore_sigint
-    # Whether <code>^D</code> (+control-d+) will be ignored or not.
-    #
-    # If set to +false+, <code>^D</code> will quit irb.
-    attr_accessor :ignore_eof
-    # Specify the installation locations of the ri file to be displayed in the
-    # document dialog.
-    attr_accessor :extra_doc_dirs
-    # Whether to echo the return value to output or not.
-    #
-    # Uses <code>IRB.conf[:ECHO]</code> if available, or defaults to +true+.
-    #
-    #     puts "hello"
-    #     # hello
-    #     #=> nil
-    #     IRB.CurrentContext.echo = false
-    #     puts "omg"
-    #     # omg
-    attr_accessor :echo
-    # Whether to echo for assignment expressions.
-    #
-    # If set to +false+, the value of assignment will not be shown.
-    #
-    # If set to +true+, the value of assignment will be shown.
-    #
-    # If set to +:truncate+, the value of assignment will be shown and truncated.
-    #
-    # It defaults to +:truncate+.
-    #
-    #     a = "omg"
-    #     #=> omg
-    #
-    #     a = "omg" * 10
-    #     #=> omgomgomgomgomgomgomg...
-    #
-    #     IRB.CurrentContext.echo_on_assignment = false
-    #     a = "omg"
-    #
-    #     IRB.CurrentContext.echo_on_assignment = true
-    #     a = "omg" * 10
-    #     #=> omgomgomgomgomgomgomgomgomgomg
-    #
-    # To set the behaviour of showing on assignment in irb:
-    #
-    #     IRB.conf[:ECHO_ON_ASSIGNMENT] = :truncate or true or false
-    #
-    # or
-    #
-    #     irb_context.echo_on_assignment = :truncate or true or false
-    #
-    # or
-    #
-    #     IRB.CurrentContext.echo_on_assignment = :truncate or true or false
-    attr_accessor :echo_on_assignment
-    # Whether a newline is put before multiline output.
-    #
-    # Uses <code>IRB.conf[:NEWLINE_BEFORE_MULTILINE_OUTPUT]</code> 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 <code>IRB.conf[:VERBOSE]</code>
-    attr_accessor :verbose
-
-    # The limit of backtrace lines displayed as top +n+ and tail +n+.
-    #
-    # The default value is 16.
-    #
-    # Can also be set using the +--back-trace-limit+ command line option.
-    #
-    # See IRB@Command+line+options for more command line options.
-    attr_accessor :back_trace_limit
-
-    # User-defined IRB command aliases
-    attr_accessor :command_aliases
-
-    attr_accessor :with_debugger
-
-    # Alias for #use_multiline
-    alias use_multiline? use_multiline
-    # Alias for #use_singleline
-    alias use_singleline? use_singleline
-    # backward compatibility
-    alias use_reline use_multiline
-    # backward compatibility
-    alias use_reline? use_multiline
-    # backward compatibility
-    alias use_readline use_singleline
-    # backward compatibility
-    alias use_readline? use_singleline
-    # Alias for #use_autocomplete
-    alias use_autocomplete? use_autocomplete
-    # Alias for #rc
-    alias rc? rc
-    alias ignore_sigint? ignore_sigint
-    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?
-      if @verbose.nil?
-        if @io.kind_of?(RelineInputMethod)
-          false
-        elsif defined?(ReadlineInputMethod) && @io.kind_of?(ReadlineInputMethod)
-          false
-        elsif !STDIN.tty? or @io.kind_of?(FileInputMethod)
-          true
-        else
-          false
-        end
-      else
-        @verbose
-      end
-    end
-
-    # Whether #verbose? is +true+, and +input_method+ is either
-    # StdioInputMethod or RelineInputMethod or ReadlineInputMethod, see #io
-    # for more information.
-    def prompting?
-      verbose? || (STDIN.tty? && @io.kind_of?(StdioInputMethod) ||
-                   @io.kind_of?(RelineInputMethod) ||
-                   (defined?(ReadlineInputMethod) && @io.kind_of?(ReadlineInputMethod)))
-    end
-
-    # The return value of the last statement evaluated.
-    attr_reader :last_value
-
-    # Sets the return value from the last statement evaluated in this context
-    # to #last_value.
-    def set_last_value(value)
-      @last_value = value
-      @workspace.local_variable_set :_, value
-    end
-
-    # Sets the +mode+ of the prompt in this context.
-    #
-    # See IRB@Customizing+the+IRB+Prompt for more information.
-    def prompt_mode=(mode)
-      @prompt_mode = mode
-      pconf = IRB.conf[:PROMPT][mode]
-      @prompt_i = pconf[:PROMPT_I]
-      @prompt_s = pconf[:PROMPT_S]
-      @prompt_c = pconf[:PROMPT_C]
-      @return_format = pconf[:RETURN]
-      @return_format = "%s\n" if @return_format == nil
-      if ai = pconf.include?(:AUTO_INDENT)
-        @auto_indent_mode = ai
-      else
-        @auto_indent_mode = IRB.conf[:AUTO_INDENT]
-      end
-    end
-
-    # Whether #inspect_mode is set or not, see #inspect_mode= for more detail.
-    def inspect?
-      @inspect_mode.nil? or @inspect_mode
-    end
-
-    # Whether #io uses a File for the +input_method+ passed when creating the
-    # current context, see ::new
-    def file_input?
-      @io.class == FileInputMethod
-    end
-
-    # Specifies the inspect mode with +opt+:
-    #
-    # +true+::  display +inspect+
-    # +false+:: display +to_s+
-    # +nil+::   inspect mode in non-math mode,
-    #           non-inspect mode in math mode
-    #
-    # See IRB::Inspector for more information.
-    #
-    # Can also be set using the +--inspect+ and +--noinspect+ command line
-    # options.
-    #
-    # See IRB@Command+line+options for more command line options.
-    def inspect_mode=(opt)
-
-      if i = Inspector::INSPECTORS[opt]
-        @inspect_mode = opt
-        @inspect_method = i
-        i.init
-      else
-        case opt
-        when nil
-          if Inspector.keys_with_inspector(Inspector::INSPECTORS[true]).include?(@inspect_mode)
-            self.inspect_mode = false
-          elsif Inspector.keys_with_inspector(Inspector::INSPECTORS[false]).include?(@inspect_mode)
-            self.inspect_mode = true
-          else
-            puts "Can't switch inspect mode."
-            return
-          end
-        when /^\s*\{.*\}\s*$/
-          begin
-            inspector = eval "proc#{opt}"
-          rescue Exception
-            puts "Can't switch inspect mode(#{opt})."
-            return
-          end
-          self.inspect_mode = inspector
-        when Proc
-          self.inspect_mode = IRB::Inspector(opt)
-        when Inspector
-          prefix = "usr%d"
-          i = 1
-          while Inspector::INSPECTORS[format(prefix, i)]; i += 1; end
-          @inspect_mode = format(prefix, i)
-          @inspect_method = opt
-          Inspector.def_inspector(format(prefix, i), @inspect_method)
-        else
-          puts "Can't switch inspect mode(#{opt})."
-          return
-        end
-      end
-      print "Switch to#{unless @inspect_mode; ' non';end} inspect mode.\n" if verbose?
-      @inspect_mode
-    end
-
-    def evaluate(line, line_no) # :nodoc:
-      @line_no = line_no
-      result = nil
-
-      if IRB.conf[:MEASURE] && IRB.conf[:MEASURE_CALLBACKS].empty?
-        IRB.set_measure_callback
-      end
-
-      if IRB.conf[:MEASURE] && !IRB.conf[:MEASURE_CALLBACKS].empty?
-        last_proc = proc do
-          result = @workspace.evaluate(line, irb_path, line_no)
-        end
-        IRB.conf[:MEASURE_CALLBACKS].inject(last_proc) do |chain, item|
-          _name, callback, arg = item
-          proc do
-            callback.(self, line, line_no, arg) do
-              chain.call
-            end
-          end
-        end.call
-      else
-        result = @workspace.evaluate(line, irb_path, line_no)
-      end
-
-      set_last_value(result)
-    end
-
-    def inspect_last_value # :nodoc:
-      @inspect_method.inspect_value(@last_value)
-    end
-
-    alias __exit__ exit
-    # Exits the current session, see IRB.irb_exit
-    def exit(ret = 0)
-      IRB.irb_exit(@irb, ret)
-    rescue UncaughtThrowError
-      super
-    end
-
-    NOPRINTING_IVARS = ["@last_value"] # :nodoc:
-    NO_INSPECTING_IVARS = ["@irb", "@io"] # :nodoc:
-    IDNAME_IVARS = ["@prompt_mode"] # :nodoc:
-
-    alias __inspect__ inspect
-    def inspect # :nodoc:
-      array = []
-      for ivar in instance_variables.sort{|e1, e2| e1 <=> e2}
-        ivar = ivar.to_s
-        name = ivar.sub(/^@(.*)$/, '\1')
-        val = instance_eval(ivar)
-        case ivar
-        when *NOPRINTING_IVARS
-          array.push format("conf.%s=%s", name, "...")
-        when *NO_INSPECTING_IVARS
-          array.push format("conf.%s=%s", name, val.to_s)
-        when *IDNAME_IVARS
-          array.push format("conf.%s=:%s", name, val.id2name)
-        else
-          array.push format("conf.%s=%s", name, val.inspect)
-        end
-      end
-      array.join("\n")
-    end
-    alias __to_s__ to_s
-    alias to_s inspect
-
-    def local_variables # :nodoc:
-      workspace.binding.local_variables
-    end
-
-    # Return true if it's aliased from the argument and it's not an identifier.
-    def symbol_alias?(command)
-      return nil if command.match?(/\A\w+\z/)
-      command_aliases.key?(command.to_sym)
-    end
-
-    # Return true if the command supports transforming args
-    def transform_args?(command)
-      command = command_aliases.fetch(command.to_sym, command)
-      ExtendCommandBundle.load_command(command)&.respond_to?(:transform_args)
-    end
-  end
-end
diff --git a/lib/irb/debug.rb b/lib/irb/debug.rb
deleted file mode 100644
index f819f850b10abf..00000000000000
--- a/lib/irb/debug.rb
+++ /dev/null
@@ -1,115 +0,0 @@
-# frozen_string_literal: true
-
-module IRB
-  module Debug
-    IRB_DIR = File.expand_path('..', __dir__)
-
-    class << self
-      def insert_debug_break(pre_cmds: nil, do_cmds: nil)
-        options = { oneshot: true, hook_call: false }
-
-        if pre_cmds || do_cmds
-          options[:command] = ['irb', pre_cmds, do_cmds]
-        end
-        if DEBUGGER__::LineBreakpoint.instance_method(:initialize).parameters.include?([:key, :skip_src])
-          options[:skip_src] = true
-        end
-
-        # To make debugger commands like `next` or `continue` work without asking
-        # the user to quit IRB after that, we need to exit IRB first and then hit
-        # a TracePoint on #debug_break.
-        file, lineno = IRB::Irb.instance_method(:debug_break).source_location
-        DEBUGGER__::SESSION.add_line_breakpoint(file, lineno + 1, **options)
-      end
-
-      def setup(irb)
-        # When debug session is not started at all
-        unless defined?(DEBUGGER__::SESSION)
-          begin
-            require "debug/session"
-          rescue LoadError # debug.gem is not written in Gemfile
-            return false unless load_bundled_debug_gem
-          end
-          DEBUGGER__::CONFIG.set_config
-          configure_irb_for_debugger(irb)
-          thread = Thread.current
-
-          DEBUGGER__.initialize_session{ IRB::Debug::UI.new(thread, irb) }
-        end
-
-        # When debug session was previously started but not by IRB
-        if defined?(DEBUGGER__::SESSION) && !irb.context.with_debugger
-          configure_irb_for_debugger(irb)
-          thread = Thread.current
-
-          DEBUGGER__::SESSION.reset_ui(IRB::Debug::UI.new(thread, irb))
-        end
-
-        # Apply patches to debug gem so it skips IRB frames
-        unless DEBUGGER__.respond_to?(:capture_frames_without_irb)
-          DEBUGGER__.singleton_class.send(:alias_method, :capture_frames_without_irb, :capture_frames)
-
-          def DEBUGGER__.capture_frames(*args)
-            frames = capture_frames_without_irb(*args)
-            frames.reject! do |frame|
-              frame.realpath&.start_with?(IRB_DIR) || frame.path == "<internal:prelude>"
-            end
-            frames
-          end
-
-          DEBUGGER__::ThreadClient.prepend(SkipPathHelperForIRB)
-        end
-
-        true
-      end
-
-      private
-
-      def configure_irb_for_debugger(irb)
-        require 'irb/debug/ui'
-        IRB.instance_variable_set(:@debugger_irb, irb)
-        irb.context.with_debugger = true
-        irb.context.irb_name += ":rdbg"
-      end
-
-      module SkipPathHelperForIRB
-        def skip_internal_path?(path)
-          # The latter can be removed once https://github.com/ruby/debug/issues/866 is resolved
-          super || path.match?(IRB_DIR) || path.match?('<internal:prelude>')
-        end
-      end
-
-      # This is used when debug.gem is not written in Gemfile. Even if it's not
-      # installed by `bundle install`, debug.gem is installed by default because
-      # it's a bundled gem. This method tries to activate and load that.
-      def load_bundled_debug_gem
-        # Discover latest debug.gem under GEM_PATH
-        debug_gem = Gem.paths.path.flat_map { |path| Dir.glob("#{path}/gems/debug-*") }.select do |path|
-          File.basename(path).match?(/\Adebug-\d+\.\d+\.\d+(\w+)?\z/)
-        end.sort_by do |path|
-          Gem::Version.new(File.basename(path).delete_prefix('debug-'))
-        end.last
-        return false unless debug_gem
-
-        # Discover debug/debug.so under extensions for Ruby 3.2+
-        ext_name = "/debug/debug.#{RbConfig::CONFIG['DLEXT']}"
-        ext_path = Gem.paths.path.flat_map do |path|
-          Dir.glob("#{path}/extensions/**/#{File.basename(debug_gem)}#{ext_name}")
-        end.first
-
-        # Attempt to forcibly load the bundled gem
-        if ext_path
-          $LOAD_PATH << ext_path.delete_suffix(ext_name)
-        end
-        $LOAD_PATH << "#{debug_gem}/lib"
-        begin
-          require "debug/session"
-          puts "Loaded #{File.basename(debug_gem)}"
-          true
-        rescue LoadError
-          false
-        end
-      end
-    end
-  end
-end
diff --git a/lib/irb/debug/ui.rb b/lib/irb/debug/ui.rb
deleted file mode 100644
index a4ca4fdf0f2df0..00000000000000
--- a/lib/irb/debug/ui.rb
+++ /dev/null
@@ -1,104 +0,0 @@
-require 'io/console/size'
-require 'debug/console'
-
-module IRB
-  module Debug
-    class UI < DEBUGGER__::UI_Base
-      def initialize(thread, irb)
-        @thread = thread
-        @irb = irb
-      end
-
-      def remote?
-        false
-      end
-
-      def activate session, on_fork: false
-      end
-
-      def deactivate
-      end
-
-      def width
-        if (w = IO.console_size[1]) == 0 # for tests PTY
-          80
-        else
-          w
-        end
-      end
-
-      def quit n
-        yield
-        exit n
-      end
-
-      def ask prompt
-        setup_interrupt do
-          print prompt
-          ($stdin.gets || '').strip
-        end
-      end
-
-      def puts str = nil
-        case str
-        when Array
-          str.each{|line|
-            $stdout.puts line.chomp
-          }
-        when String
-          str.each_line{|line|
-            $stdout.puts line.chomp
-          }
-        when nil
-          $stdout.puts
-        end
-      end
-
-      def readline _
-        setup_interrupt do
-          tc = DEBUGGER__::SESSION.get_thread_client(@thread)
-          cmd = @irb.debug_readline(tc.current_frame.binding || TOPLEVEL_BINDING)
-
-          case cmd
-          when nil # when user types C-d
-            "continue"
-          else
-            cmd
-          end
-        end
-      end
-
-      def setup_interrupt
-        DEBUGGER__::SESSION.intercept_trap_sigint false do
-          current_thread = Thread.current # should be session_server thread
-
-          prev_handler = trap(:INT){
-            current_thread.raise Interrupt
-          }
-
-          yield
-        ensure
-          trap(:INT, prev_handler)
-        end
-      end
-
-      def after_fork_parent
-        parent_pid = Process.pid
-
-        at_exit{
-          DEBUGGER__::SESSION.intercept_trap_sigint_end
-          trap(:SIGINT, :IGNORE)
-
-          if Process.pid == parent_pid
-            # only check child process from its parent
-            begin
-              # wait for all child processes to keep terminal
-              Process.waitpid
-            rescue Errno::ESRCH, Errno::ECHILD
-            end
-          end
-        }
-      end
-    end
-  end
-end
diff --git a/lib/irb/easter-egg.rb b/lib/irb/easter-egg.rb
deleted file mode 100644
index 3e79692de95030..00000000000000
--- a/lib/irb/easter-egg.rb
+++ /dev/null
@@ -1,138 +0,0 @@
-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.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)
-              end
-            end
-            buff[0, 20] = "\e[0mPress Ctrl+C to stop\e[31m\e[1m"
-            print "\e[H" + buff
-            sleep 0.05
-          end
-        rescue Interrupt
-        ensure
-          print "\e[0m\e[?1049l"
-        end
-      end
-    end
-  end
-end
-
-IRB.__send__(:easter_egg, ARGV[0]&.to_sym) if $0 == __FILE__
diff --git a/lib/irb/ext/change-ws.rb b/lib/irb/ext/change-ws.rb
deleted file mode 100644
index c0f810a4c80b06..00000000000000
--- a/lib/irb/ext/change-ws.rb
+++ /dev/null
@@ -1,39 +0,0 @@
-# frozen_string_literal: false
-#
-#   irb/ext/cb.rb -
-#   	by Keiju ISHITSUKA(keiju@ruby-lang.org)
-#
-
-module IRB # :nodoc:
-  class Context
-
-    # Inherited from +TOPLEVEL_BINDING+.
-    def home_workspace
-      if defined? @home_workspace
-        @home_workspace
-      else
-        @home_workspace = @workspace
-      end
-    end
-
-    # Changes the current workspace to given object or binding.
-    #
-    # If the optional argument is omitted, the workspace will be
-    # #home_workspace which is inherited from +TOPLEVEL_BINDING+ or the main
-    # object, <code>IRB.conf[:MAIN_CONTEXT]</code> when irb was initialized.
-    #
-    # See IRB::WorkSpace.new for more information.
-    def change_workspace(*_main)
-      if _main.empty?
-        @workspace = home_workspace
-        return main
-      end
-
-      @workspace = WorkSpace.new(_main[0])
-
-      if !(class<<main;ancestors;end).include?(ExtendCommandBundle)
-        main.extend ExtendCommandBundle
-      end
-    end
-  end
-end
diff --git a/lib/irb/ext/eval_history.rb b/lib/irb/ext/eval_history.rb
deleted file mode 100644
index 1a04178b4080db..00000000000000
--- a/lib/irb/ext/eval_history.rb
+++ /dev/null
@@ -1,149 +0,0 @@
-# frozen_string_literal: false
-#
-#   history.rb -
-#   	by Keiju ISHITSUKA(keiju@ruby-lang.org)
-#
-
-module IRB # :nodoc:
-
-  class Context
-
-    NOPRINTING_IVARS.push "@eval_history_values"
-
-    # See #set_last_value
-    alias _set_last_value set_last_value
-
-    def set_last_value(value)
-      _set_last_value(value)
-
-      if defined?(@eval_history) && @eval_history
-        @eval_history_values.push @line_no, @last_value
-        @workspace.evaluate "__ = IRB.CurrentContext.instance_eval{@eval_history_values}"
-      end
-
-      @last_value
-    end
-
-    remove_method :eval_history= if method_defined?(:eval_history=)
-    # The command result history limit. This method is not available until
-    # #eval_history= was called with non-nil value (directly or via
-    # setting <code>IRB.conf[:EVAL_HISTORY]</code> in <code>.irbrc</code>).
-    attr_reader :eval_history
-    # Sets command result history limit. Default value is set from
-    # <code>IRB.conf[:EVAL_HISTORY]</code>.
-    #
-    # +no+ is an Integer or +nil+.
-    #
-    # Returns +no+ of history items if greater than 0.
-    #
-    # If +no+ is 0, the number of history items is unlimited.
-    #
-    # If +no+ is +nil+, execution result history isn't used (default).
-    #
-    # EvalHistory values are available via <code>__</code> variable, see
-    # IRB::EvalHistory.
-    def eval_history=(no)
-      if no
-        if defined?(@eval_history) && @eval_history
-          @eval_history_values.size(no)
-        else
-          @eval_history_values = EvalHistory.new(no)
-          IRB.conf[:__TMP__EHV__] = @eval_history_values
-          @workspace.evaluate("__ = IRB.conf[:__TMP__EHV__]")
-          IRB.conf.delete(:__TMP_EHV__)
-        end
-      else
-        @eval_history_values = nil
-      end
-      @eval_history = no
-    end
-  end
-
-  # Represents history of results of previously evaluated commands.
-  #
-  # Available via <code>__</code> variable, only if <code>IRB.conf[:EVAL_HISTORY]</code>
-  # or <code>IRB::CurrentContext().eval_history</code> is non-nil integer value
-  # (by default it is +nil+).
-  #
-  # Example (in `irb`):
-  #
-  #    # Initialize history
-  #    IRB::CurrentContext().eval_history = 10
-  #    # => 10
-  #
-  #    # Perform some commands...
-  #    1 + 2
-  #    # => 3
-  #    puts 'x'
-  #    # x
-  #    # => nil
-  #    raise RuntimeError
-  #    # ...error raised
-  #
-  #    # Inspect history (format is "<item number> <evaluated value>":
-  #    __
-  #    # => 1 10
-  #    # 2 3
-  #    # 3 nil
-  #
-  #    __[1]
-  #    # => 10
-  #
-  class EvalHistory
-
-    def initialize(size = 16)  # :nodoc:
-      @size = size
-      @contents = []
-    end
-
-    def size(size) # :nodoc:
-      if size != 0 && size < @size
-        @contents = @contents[@size - size .. @size]
-      end
-      @size = size
-    end
-
-    # Get one item of the content (both positive and negative indexes work).
-    def [](idx)
-      begin
-        if idx >= 0
-          @contents.find{|no, val| no == idx}[1]
-        else
-          @contents[idx][1]
-        end
-      rescue NameError
-        nil
-      end
-    end
-
-    def push(no, val)  # :nodoc:
-      @contents.push [no, val]
-      @contents.shift if @size != 0 && @contents.size > @size
-    end
-
-    alias real_inspect inspect
-
-    def inspect  # :nodoc:
-      if @contents.empty?
-        return real_inspect
-      end
-
-      unless (last = @contents.pop)[1].equal?(self)
-        @contents.push last
-        last = nil
-      end
-      str = @contents.collect{|no, val|
-        if val.equal?(self)
-          "#{no} ...self-history..."
-        else
-          "#{no} #{val.inspect}"
-        end
-      }.join("\n")
-      if str == ""
-        str = "Empty."
-      end
-      @contents.push last if last
-      str
-    end
-  end
-end
diff --git a/lib/irb/ext/loader.rb b/lib/irb/ext/loader.rb
deleted file mode 100644
index d65695df3b3146..00000000000000
--- a/lib/irb/ext/loader.rb
+++ /dev/null
@@ -1,127 +0,0 @@
-# frozen_string_literal: false
-#
-#   loader.rb -
-#   	by Keiju ISHITSUKA(keiju@ruby-lang.org)
-#
-
-module IRB # :nodoc:
-  # Raised in the event of an exception in a file loaded from an Irb session
-  class LoadAbort < Exception;end
-
-  # Provides a few commands for loading files within an irb session.
-  #
-  # See ExtendCommandBundle for more information.
-  module IrbLoader
-
-    alias ruby_load load
-    alias ruby_require require
-
-    # Loads the given file similarly to Kernel#load
-    def irb_load(fn, priv = nil)
-      path = search_file_from_ruby_path(fn)
-      raise LoadError, "No such file to load -- #{fn}" unless path
-
-      load_file(path, priv)
-    end
-
-    def search_file_from_ruby_path(fn) # :nodoc:
-      if File.absolute_path?(fn)
-        return fn if File.exist?(fn)
-        return nil
-      end
-
-      for path in $:
-        if File.exist?(f = File.join(path, fn))
-          return f
-        end
-      end
-      return nil
-    end
-
-    # Loads a given file in the current session and displays the source lines
-    #
-    # See Irb#suspend_input_method for more information.
-    def source_file(path)
-      irb = irb_context.irb
-      irb.suspend_name(path, File.basename(path)) do
-        FileInputMethod.open(path) do |io|
-          irb.suspend_input_method(io) do
-            |back_io|
-            irb.signal_status(:IN_LOAD) do
-              if back_io.kind_of?(FileInputMethod)
-                irb.eval_input
-              else
-                begin
-                  irb.eval_input
-                rescue LoadAbort
-                  print "load abort!!\n"
-                end
-              end
-            end
-          end
-        end
-      end
-    end
-
-    # Loads the given file in the current session's context and evaluates it.
-    #
-    # See Irb#suspend_input_method for more information.
-    def load_file(path, priv = nil)
-      irb = irb_context.irb
-      irb.suspend_name(path, File.basename(path)) do
-
-        if priv
-          ws = WorkSpace.new(Module.new)
-        else
-          ws = WorkSpace.new
-        end
-        irb.suspend_workspace(ws) do
-          FileInputMethod.open(path) do |io|
-            irb.suspend_input_method(io) do
-              |back_io|
-              irb.signal_status(:IN_LOAD) do
-                if back_io.kind_of?(FileInputMethod)
-                  irb.eval_input
-                else
-                  begin
-                    irb.eval_input
-                  rescue LoadAbort
-                    print "load abort!!\n"
-                  end
-                end
-              end
-            end
-          end
-        end
-      end
-    end
-
-    def old # :nodoc:
-      back_io = @io
-      back_path = @irb_path
-      back_name = @irb_name
-      back_scanner = @irb.scanner
-      begin
-        @io = FileInputMethod.new(path)
-        @irb_name = File.basename(path)
-        @irb_path = path
-        @irb.signal_status(:IN_LOAD) do
-          if back_io.kind_of?(FileInputMethod)
-            @irb.eval_input
-          else
-            begin
-              @irb.eval_input
-            rescue LoadAbort
-              print "load abort!!\n"
-            end
-          end
-        end
-      ensure
-        @io = back_io
-        @irb_name = back_name
-        @irb_path = back_path
-        @irb.scanner = back_scanner
-      end
-    end
-  end
-end
diff --git a/lib/irb/ext/multi-irb.rb b/lib/irb/ext/multi-irb.rb
deleted file mode 100644
index 1c20489137bd6c..00000000000000
--- a/lib/irb/ext/multi-irb.rb
+++ /dev/null
@@ -1,258 +0,0 @@
-# frozen_string_literal: false
-#
-#   irb/multi-irb.rb - multiple irb module
-#   	by Keiju ISHITSUKA(keiju@ruby-lang.org)
-#
-
-module IRB
-  class JobManager
-
-    # Creates a new JobManager object
-    def initialize
-      @jobs = []
-      @current_job = nil
-    end
-
-    # The active irb session
-    attr_accessor :current_job
-
-    # The total number of irb sessions, used to set +irb_name+ of the current
-    # Context.
-    def n_jobs
-      @jobs.size
-    end
-
-    # Returns the thread for the given +key+ object, see #search for more
-    # information.
-    def thread(key)
-      th, = search(key)
-      th
-    end
-
-    # Returns the irb session for the given +key+ object, see #search for more
-    # information.
-    def irb(key)
-      _, irb = search(key)
-      irb
-    end
-
-    # Returns the top level thread.
-    def main_thread
-      @jobs[0][0]
-    end
-
-    # Returns the top level irb session.
-    def main_irb
-      @jobs[0][1]
-    end
-
-    # Add the given +irb+ session to the jobs Array.
-    def insert(irb)
-      @jobs.push [Thread.current, irb]
-    end
-
-    # Changes the current active irb session to the given +key+ in the jobs
-    # Array.
-    #
-    # Raises an IrbAlreadyDead exception if the given +key+ is no longer alive.
-    #
-    # If the given irb session is already active, an IrbSwitchedToCurrentThread
-    # exception is raised.
-    def switch(key)
-      th, irb = search(key)
-      fail IrbAlreadyDead unless th.alive?
-      fail IrbSwitchedToCurrentThread if th == Thread.current
-      @current_job = irb
-      th.run
-      Thread.stop
-      @current_job = irb(Thread.current)
-    end
-
-    # Terminates the irb sessions specified by the given +keys+.
-    #
-    # Raises an IrbAlreadyDead exception if one of the given +keys+ is already
-    # terminated.
-    #
-    # See Thread#exit for more information.
-    def kill(*keys)
-      for key in keys
-        th, _ = search(key)
-        fail IrbAlreadyDead unless th.alive?
-        th.exit
-      end
-    end
-
-    # Returns the associated job for the given +key+.
-    #
-    # If given an Integer, it will return the +key+ index for the jobs Array.
-    #
-    # When an instance of Irb is given, it will return the irb session
-    # associated with +key+.
-    #
-    # If given an instance of Thread, it will return the associated thread
-    # +key+ using Object#=== on the jobs Array.
-    #
-    # Otherwise returns the irb session with the same top-level binding as the
-    # given +key+.
-    #
-    # Raises a NoSuchJob exception if no job can be found with the given +key+.
-    def search(key)
-      job = case key
-            when Integer
-              @jobs[key]
-            when Irb
-              @jobs.find{|k, v| v.equal?(key)}
-            when Thread
-              @jobs.assoc(key)
-            else
-              @jobs.find{|k, v| v.context.main.equal?(key)}
-            end
-      fail NoSuchJob, key if job.nil?
-      job
-    end
-
-    # Deletes the job at the given +key+.
-    def delete(key)
-      case key
-      when Integer
-        fail NoSuchJob, key unless @jobs[key]
-        @jobs[key] = nil
-      else
-        catch(:EXISTS) do
-          @jobs.each_index do
-            |i|
-            if @jobs[i] and (@jobs[i][0] == key ||
-                @jobs[i][1] == key ||
-                @jobs[i][1].context.main.equal?(key))
-              @jobs[i] = nil
-              throw :EXISTS
-            end
-          end
-          fail NoSuchJob, key
-        end
-      end
-      until assoc = @jobs.pop; end unless @jobs.empty?
-      @jobs.push assoc
-    end
-
-    # Outputs a list of jobs, see the irb command +irb_jobs+, or +jobs+.
-    def inspect
-      ary = []
-      @jobs.each_index do
-        |i|
-        th, irb = @jobs[i]
-        next if th.nil?
-
-        if th.alive?
-          if th.stop?
-            t_status = "stop"
-          else
-            t_status = "running"
-          end
-        else
-          t_status = "exited"
-        end
-        ary.push format("#%d->%s on %s (%s: %s)",
-          i,
-          irb.context.irb_name,
-          irb.context.main,
-          th,
-          t_status)
-      end
-      ary.join("\n")
-    end
-  end
-
-  @JobManager = JobManager.new
-
-  # The current JobManager in the session
-  def IRB.JobManager
-    @JobManager
-  end
-
-  # The current Context in this session
-  def IRB.CurrentContext
-    IRB.JobManager.irb(Thread.current).context
-  end
-
-  # Creates a new IRB session, see Irb.new.
-  #
-  # The optional +file+ argument is given to Context.new, along with the
-  # workspace created with the remaining arguments, see WorkSpace.new
-  def IRB.irb(file = nil, *main)
-    workspace = WorkSpace.new(*main)
-    parent_thread = Thread.current
-    Thread.start do
-      begin
-        irb = Irb.new(workspace, file)
-      rescue
-        print "Subirb can't start with context(self): ", workspace.main.inspect, "\n"
-        print "return to main irb\n"
-        Thread.pass
-        Thread.main.wakeup
-        Thread.exit
-      end
-      @CONF[:IRB_RC].call(irb.context) if @CONF[:IRB_RC]
-      @JobManager.insert(irb)
-      @JobManager.current_job = irb
-      begin
-        system_exit = false
-        catch(:IRB_EXIT) do
-          irb.eval_input
-        end
-      rescue SystemExit
-        system_exit = true
-        raise
-        #fail
-      ensure
-        unless system_exit
-          @JobManager.delete(irb)
-          if @JobManager.current_job == irb
-            if parent_thread.alive?
-              @JobManager.current_job = @JobManager.irb(parent_thread)
-              parent_thread.run
-            else
-              @JobManager.current_job = @JobManager.main_irb
-              @JobManager.main_thread.run
-            end
-          end
-        end
-      end
-    end
-    Thread.stop
-    @JobManager.current_job = @JobManager.irb(Thread.current)
-  end
-
-  @CONF[:SINGLE_IRB_MODE] = false
-  @JobManager.insert(@CONF[:MAIN_CONTEXT].irb)
-  @JobManager.current_job = @CONF[:MAIN_CONTEXT].irb
-
-  class Irb
-    def signal_handle
-      unless @context.ignore_sigint?
-        print "\nabort!!\n" if @context.verbose?
-        exit
-      end
-
-      case @signal_status
-      when :IN_INPUT
-        print "^C\n"
-        IRB.JobManager.thread(self).raise RubyLex::TerminateLineInput
-      when :IN_EVAL
-        IRB.irb_abort(self)
-      when :IN_LOAD
-        IRB.irb_abort(self, LoadAbort)
-      when :IN_IRB
-        # ignore
-      else
-        # ignore other cases as well
-      end
-    end
-  end
-
-  trap("SIGINT") do
-    @JobManager.current_job.signal_handle
-    Thread.stop
-  end
-
-end
diff --git a/lib/irb/ext/tracer.rb b/lib/irb/ext/tracer.rb
deleted file mode 100644
index 3eaeb70ef27dd2..00000000000000
--- a/lib/irb/ext/tracer.rb
+++ /dev/null
@@ -1,78 +0,0 @@
-# frozen_string_literal: false
-#
-#   irb/lib/tracer.rb -
-#   	by Keiju ISHITSUKA(keiju@ruby-lang.org)
-#
-
-begin
-  require "tracer"
-rescue LoadError
-  $stderr.puts "Tracer extension of IRB is enabled but tracer gem wasn't found."
-  module IRB
-    class Context
-      def use_tracer=(opt)
-        # do nothing
-      end
-    end
-  end
-  return # This is about to disable loading below
-end
-
-module IRB
-
-  # initialize tracing function
-  def IRB.initialize_tracer
-    Tracer.verbose = false
-    Tracer.add_filter {
-      |event, file, line, id, binding, *rests|
-      /^#{Regexp.quote(@CONF[:IRB_LIB_PATH])}/ !~ file and
-        File::basename(file) != "irb.rb"
-    }
-  end
-
-  class Context
-    # Whether Tracer is used when evaluating statements in this context.
-    #
-    # See +lib/tracer.rb+ for more information.
-    attr_reader :use_tracer
-    alias use_tracer? use_tracer
-
-    # Sets whether or not to use the Tracer library when evaluating statements
-    # in this context.
-    #
-    # See +lib/tracer.rb+ for more information.
-    def use_tracer=(opt)
-      if opt
-        Tracer.set_get_line_procs(@irb_path) {
-          |line_no, *rests|
-          @io.line(line_no)
-        }
-      elsif !opt && @use_tracer
-        Tracer.off
-      end
-      @use_tracer=opt
-    end
-  end
-
-  class WorkSpace
-    alias __evaluate__ evaluate
-    # Evaluate the context of this workspace and use the Tracer library to
-    # output the exact lines of code are being executed in chronological order.
-    #
-    # See +lib/tracer.rb+ for more information.
-    def evaluate(context, statements, file = nil, line = nil)
-      if context.use_tracer? && file != nil && line != nil
-        Tracer.on
-        begin
-          __evaluate__(statements, file, line)
-        ensure
-          Tracer.off
-        end
-      else
-        __evaluate__(statements, file || __FILE__, line || __LINE__)
-      end
-    end
-  end
-
-  IRB.initialize_tracer
-end
diff --git a/lib/irb/ext/use-loader.rb b/lib/irb/ext/use-loader.rb
deleted file mode 100644
index d0b8c2d4f487c8..00000000000000
--- a/lib/irb/ext/use-loader.rb
+++ /dev/null
@@ -1,69 +0,0 @@
-# frozen_string_literal: false
-#
-#   use-loader.rb -
-#   	by Keiju ISHITSUKA(keiju@ruby-lang.org)
-#
-
-require_relative "../cmd/load"
-require_relative "loader"
-
-class Object
-  alias __original__load__IRB_use_loader__ load
-  alias __original__require__IRB_use_loader__ require
-end
-
-module IRB
-  module ExtendCommandBundle
-    remove_method :irb_load if method_defined?(:irb_load)
-    # Loads the given file similarly to Kernel#load, see IrbLoader#irb_load
-    def irb_load(*opts, &b)
-      ExtendCommand::Load.execute(irb_context, *opts, &b)
-    end
-    remove_method :irb_require if method_defined?(:irb_require)
-    # Loads the given file similarly to Kernel#require
-    def irb_require(*opts, &b)
-      ExtendCommand::Require.execute(irb_context, *opts, &b)
-    end
-  end
-
-  class Context
-
-    IRB.conf[:USE_LOADER] = false
-
-    # Returns whether +irb+'s own file reader method is used by
-    # +load+/+require+ or not.
-    #
-    # This mode is globally affected (irb-wide).
-    def use_loader
-      IRB.conf[:USE_LOADER]
-    end
-
-    alias use_loader? use_loader
-
-    remove_method :use_loader= if method_defined?(:use_loader=)
-    # Sets <code>IRB.conf[:USE_LOADER]</code>
-    #
-    # See #use_loader for more information.
-    def use_loader=(opt)
-
-      if IRB.conf[:USE_LOADER] != opt
-        IRB.conf[:USE_LOADER] = opt
-        if opt
-          if !$".include?("irb/cmd/load")
-          end
-          (class<<@workspace.main;self;end).instance_eval {
-            alias_method :load, :irb_load
-            alias_method :require, :irb_require
-          }
-        else
-          (class<<@workspace.main;self;end).instance_eval {
-            alias_method :load, :__original__load__IRB_use_loader__
-            alias_method :require, :__original__require__IRB_use_loader__
-          }
-        end
-      end
-      print "Switch to load/require#{unless use_loader; ' non';end} trace mode.\n" if verbose?
-      opt
-    end
-  end
-end
diff --git a/lib/irb/ext/workspaces.rb b/lib/irb/ext/workspaces.rb
deleted file mode 100644
index 9defc3e17bc530..00000000000000
--- a/lib/irb/ext/workspaces.rb
+++ /dev/null
@@ -1,60 +0,0 @@
-# frozen_string_literal: false
-#
-#   push-ws.rb -
-#   	by Keiju ISHITSUKA(keiju@ruby-lang.org)
-#
-
-module IRB # :nodoc:
-  class Context
-
-    # Size of the current WorkSpace stack
-    def irb_level
-      workspace_stack.size
-    end
-
-    # WorkSpaces in the current stack
-    def workspaces
-      if defined? @workspaces
-        @workspaces
-      else
-        @workspaces = []
-      end
-    end
-
-    # Creates a new workspace with the given object or binding, and appends it
-    # onto the current #workspaces stack.
-    #
-    # See IRB::Context#change_workspace and IRB::WorkSpace.new for more
-    # information.
-    def push_workspace(*_main)
-      if _main.empty?
-        if workspaces.empty?
-          print "No other workspace\n"
-          return nil
-        end
-        ws = workspaces.pop
-        workspaces.push @workspace
-        @workspace = ws
-        return workspaces
-      end
-
-      workspaces.push @workspace
-      @workspace = WorkSpace.new(@workspace.binding, _main[0])
-      if !(class<<main;ancestors;end).include?(ExtendCommandBundle)
-        main.extend ExtendCommandBundle
-      end
-    end
-
-    # Removes the last element from the current #workspaces stack and returns
-    # it, or +nil+ if the current workspace stack is empty.
-    #
-    # Also, see #push_workspace.
-    def pop_workspace
-      if workspaces.empty?
-        print "workspace stack empty\n"
-        return
-      end
-      @workspace = workspaces.pop
-    end
-  end
-end
diff --git a/lib/irb/extend-command.rb b/lib/irb/extend-command.rb
deleted file mode 100644
index 514293a438c549..00000000000000
--- a/lib/irb/extend-command.rb
+++ /dev/null
@@ -1,354 +0,0 @@
-# frozen_string_literal: false
-#
-#   irb/extend-command.rb - irb extend command
-#   	by Keiju ISHITSUKA(keiju@ruby-lang.org)
-#
-
-module IRB # :nodoc:
-  # Installs the default irb extensions command bundle.
-  module ExtendCommandBundle
-    EXCB = ExtendCommandBundle # :nodoc:
-
-    # See #install_alias_method.
-    NO_OVERRIDE = 0
-    # See #install_alias_method.
-    OVERRIDE_PRIVATE_ONLY = 0x01
-    # See #install_alias_method.
-    OVERRIDE_ALL = 0x02
-
-    # Quits the current irb context
-    #
-    # +ret+ is the optional signal or message to send to Context#exit
-    #
-    # Same as <code>IRB.CurrentContext.exit</code>.
-    def irb_exit(ret = 0)
-      irb_context.exit(ret)
-    end
-
-    # Displays current configuration.
-    #
-    # Modifying the configuration is achieved by sending a message to IRB.conf.
-    def irb_context
-      IRB.CurrentContext
-    end
-
-    @ALIASES = [
-      [:context, :irb_context, NO_OVERRIDE],
-      [:conf, :irb_context, NO_OVERRIDE],
-      [:irb_quit, :irb_exit, OVERRIDE_PRIVATE_ONLY],
-      [:exit, :irb_exit, OVERRIDE_PRIVATE_ONLY],
-      [:quit, :irb_exit, OVERRIDE_PRIVATE_ONLY],
-    ]
-
-
-    @EXTEND_COMMANDS = [
-      [
-        :irb_current_working_workspace, :CurrentWorkingWorkspace, "cmd/chws",
-        [:cwws, NO_OVERRIDE],
-        [:pwws, NO_OVERRIDE],
-        [:irb_print_working_workspace, OVERRIDE_ALL],
-        [:irb_cwws, OVERRIDE_ALL],
-        [:irb_pwws, OVERRIDE_ALL],
-        [:irb_current_working_binding, OVERRIDE_ALL],
-        [:irb_print_working_binding, OVERRIDE_ALL],
-        [:irb_cwb, OVERRIDE_ALL],
-        [:irb_pwb, OVERRIDE_ALL],
-      ],
-      [
-        :irb_change_workspace, :ChangeWorkspace, "cmd/chws",
-        [:chws, NO_OVERRIDE],
-        [:cws, NO_OVERRIDE],
-        [:irb_chws, OVERRIDE_ALL],
-        [:irb_cws, OVERRIDE_ALL],
-        [:irb_change_binding, OVERRIDE_ALL],
-        [:irb_cb, OVERRIDE_ALL],
-        [:cb, NO_OVERRIDE],
-      ],
-
-      [
-        :irb_workspaces, :Workspaces, "cmd/pushws",
-        [:workspaces, NO_OVERRIDE],
-        [:irb_bindings, OVERRIDE_ALL],
-        [:bindings, NO_OVERRIDE],
-      ],
-      [
-        :irb_push_workspace, :PushWorkspace, "cmd/pushws",
-        [:pushws, NO_OVERRIDE],
-        [:irb_pushws, OVERRIDE_ALL],
-        [:irb_push_binding, OVERRIDE_ALL],
-        [:irb_pushb, OVERRIDE_ALL],
-        [:pushb, NO_OVERRIDE],
-      ],
-      [
-        :irb_pop_workspace, :PopWorkspace, "cmd/pushws",
-        [:popws, NO_OVERRIDE],
-        [:irb_popws, OVERRIDE_ALL],
-        [:irb_pop_binding, OVERRIDE_ALL],
-        [:irb_popb, OVERRIDE_ALL],
-        [:popb, NO_OVERRIDE],
-      ],
-
-      [
-        :irb_load, :Load, "cmd/load"],
-      [
-        :irb_require, :Require, "cmd/load"],
-      [
-        :irb_source, :Source, "cmd/load",
-        [:source, NO_OVERRIDE],
-      ],
-
-      [
-        :irb, :IrbCommand, "cmd/subirb"],
-      [
-        :irb_jobs, :Jobs, "cmd/subirb",
-        [:jobs, NO_OVERRIDE],
-      ],
-      [
-        :irb_fg, :Foreground, "cmd/subirb",
-        [:fg, NO_OVERRIDE],
-      ],
-      [
-        :irb_kill, :Kill, "cmd/subirb",
-        [:kill, OVERRIDE_PRIVATE_ONLY],
-      ],
-
-      [
-        :irb_debug, :Debug, "cmd/debug",
-        [:debug, NO_OVERRIDE],
-      ],
-      [
-        :irb_edit, :Edit, "cmd/edit",
-        [:edit, NO_OVERRIDE],
-      ],
-      [
-        :irb_break, :Break, "cmd/break",
-      ],
-      [
-        :irb_catch, :Catch, "cmd/catch",
-      ],
-      [
-        :irb_next, :Next, "cmd/next"
-      ],
-      [
-        :irb_delete, :Delete, "cmd/delete",
-        [:delete, NO_OVERRIDE],
-      ],
-      [
-        :irb_step, :Step, "cmd/step",
-        [:step, NO_OVERRIDE],
-      ],
-      [
-        :irb_continue, :Continue, "cmd/continue",
-        [:continue, NO_OVERRIDE],
-      ],
-      [
-        :irb_finish, :Finish, "cmd/finish",
-        [:finish, NO_OVERRIDE],
-      ],
-      [
-        :irb_backtrace, :Backtrace, "cmd/backtrace",
-        [:backtrace, NO_OVERRIDE],
-        [:bt, NO_OVERRIDE],
-      ],
-      [
-        :irb_debug_info, :Info, "cmd/info",
-        [:info, NO_OVERRIDE],
-      ],
-
-      [
-        :irb_help, :Help, "cmd/help",
-        [:help, NO_OVERRIDE],
-      ],
-
-      [
-        :irb_show_doc, :ShowDoc, "cmd/show_doc",
-        [:show_doc, NO_OVERRIDE],
-      ],
-
-      [
-        :irb_info, :IrbInfo, "cmd/irb_info"
-      ],
-
-      [
-        :irb_ls, :Ls, "cmd/ls",
-        [:ls, NO_OVERRIDE],
-      ],
-
-      [
-        :irb_measure, :Measure, "cmd/measure",
-        [:measure, NO_OVERRIDE],
-      ],
-
-      [
-        :irb_show_source, :ShowSource, "cmd/show_source",
-        [:show_source, NO_OVERRIDE],
-      ],
-
-      [
-        :irb_whereami, :Whereami, "cmd/whereami",
-        [:whereami, NO_OVERRIDE],
-      ],
-      [
-        :irb_show_cmds, :ShowCmds, "cmd/show_cmds",
-        [:show_cmds, NO_OVERRIDE],
-      ]
-    ]
-
-
-    @@commands = []
-
-    def self.all_commands_info
-      return @@commands unless @@commands.empty?
-      user_aliases = IRB.CurrentContext.command_aliases.each_with_object({}) do |(alias_name, target), result|
-        result[target] ||= []
-        result[target] << alias_name
-      end
-
-      @EXTEND_COMMANDS.each do |cmd_name, cmd_class, load_file, *aliases|
-        if !defined?(ExtendCommand) || !ExtendCommand.const_defined?(cmd_class, false)
-          require_relative load_file
-        end
-
-        klass = ExtendCommand.const_get(cmd_class, false)
-        aliases = aliases.map { |a| a.first }
-
-        if additional_aliases = user_aliases[cmd_name]
-          aliases += additional_aliases
-        end
-
-        display_name = aliases.shift || cmd_name
-        @@commands << { display_name: display_name, description: klass.description, category: klass.category }
-      end
-
-      @@commands
-    end
-
-    # Convert a command name to its implementation class if such command exists
-    def self.load_command(command)
-      command = command.to_sym
-      @EXTEND_COMMANDS.each do |cmd_name, cmd_class, load_file, *aliases|
-        next if cmd_name != command && aliases.all? { |alias_name, _| alias_name != command }
-
-        if !defined?(ExtendCommand) || !ExtendCommand.const_defined?(cmd_class, false)
-          require_relative load_file
-        end
-        return ExtendCommand.const_get(cmd_class, false)
-      end
-      nil
-    end
-
-    # Installs the default irb commands.
-    def self.install_extend_commands
-      for args in @EXTEND_COMMANDS
-        def_extend_command(*args)
-      end
-    end
-
-    # Evaluate the given +cmd_name+ on the given +cmd_class+ Class.
-    #
-    # Will also define any given +aliases+ for the method.
-    #
-    # The optional +load_file+ parameter will be required within the method
-    # definition.
-    def self.def_extend_command(cmd_name, cmd_class, load_file, *aliases)
-      case cmd_class
-      when Symbol
-        cmd_class = cmd_class.id2name
-      when String
-      when Class
-        cmd_class = cmd_class.name
-      end
-
-      line = __LINE__; eval %[
-        def #{cmd_name}(*opts, **kwargs, &b)
-          Kernel.require_relative "#{load_file}"
-          ::IRB::ExtendCommand::#{cmd_class}.execute(irb_context, *opts, **kwargs, &b)
-        end
-      ], nil, __FILE__, line
-
-      for ali, flag in aliases
-        @ALIASES.push [ali, cmd_name, flag]
-      end
-    end
-
-    # Installs alias methods for the default irb commands, see
-    # ::install_extend_commands.
-    def install_alias_method(to, from, override = NO_OVERRIDE)
-      to = to.id2name unless to.kind_of?(String)
-      from = from.id2name unless from.kind_of?(String)
-
-      if override == OVERRIDE_ALL or
-          (override == OVERRIDE_PRIVATE_ONLY) && !respond_to?(to) or
-          (override == NO_OVERRIDE) &&  !respond_to?(to, true)
-        target = self
-        (class << self; self; end).instance_eval{
-          if target.respond_to?(to, true) &&
-            !target.respond_to?(EXCB.irb_original_method_name(to), true)
-            alias_method(EXCB.irb_original_method_name(to), to)
-          end
-          alias_method to, from
-        }
-      else
-        Kernel.warn "irb: warn: can't alias #{to} from #{from}.\n"
-      end
-    end
-
-    def self.irb_original_method_name(method_name) # :nodoc:
-      "irb_" + method_name + "_org"
-    end
-
-    # Installs alias methods for the default irb commands on the given object
-    # using #install_alias_method.
-    def self.extend_object(obj)
-      unless (class << obj; ancestors; end).include?(EXCB)
-        super
-        for ali, com, flg in @ALIASES
-          obj.install_alias_method(ali, com, flg)
-        end
-      end
-    end
-
-    install_extend_commands
-  end
-
-  # Extends methods for the Context module
-  module ContextExtender
-    CE = ContextExtender # :nodoc:
-
-    @EXTEND_COMMANDS = [
-      [:eval_history=, "ext/eval_history.rb"],
-      [:use_tracer=, "ext/tracer.rb"],
-      [:use_loader=, "ext/use-loader.rb"],
-    ]
-
-    # Installs the default context extensions as irb commands:
-    #
-    # Context#eval_history=::   +irb/ext/history.rb+
-    # Context#use_tracer=::     +irb/ext/tracer.rb+
-    # Context#use_loader=::     +irb/ext/use-loader.rb+
-    def self.install_extend_commands
-      for args in @EXTEND_COMMANDS
-        def_extend_command(*args)
-      end
-    end
-
-    # Evaluate the given +command+ from the given +load_file+ on the Context
-    # module.
-    #
-    # Will also define any given +aliases+ for the method.
-    def self.def_extend_command(cmd_name, load_file, *aliases)
-      line = __LINE__; Context.module_eval %[
-        def #{cmd_name}(*opts, &b)
-          Context.module_eval {remove_method(:#{cmd_name})}
-          require_relative "#{load_file}"
-          __send__ :#{cmd_name}, *opts, &b
-        end
-        for ali in aliases
-          alias_method ali, cmd_name
-        end
-      ], __FILE__, line
-    end
-
-    CE.install_extend_commands
-  end
-end
diff --git a/lib/irb/frame.rb b/lib/irb/frame.rb
deleted file mode 100644
index 14768bd8f6bba5..00000000000000
--- a/lib/irb/frame.rb
+++ /dev/null
@@ -1,80 +0,0 @@
-# frozen_string_literal: false
-#
-#   frame.rb -
-#   	by Keiju ISHITSUKA(Nihon Rational Software Co.,Ltd)
-#
-
-module IRB
-  class Frame
-    class FrameOverflow < StandardError
-      def initialize
-        super("frame overflow")
-      end
-    end
-    class FrameUnderflow < StandardError
-      def initialize
-        super("frame underflow")
-      end
-    end
-
-    # Default number of stack frames
-    INIT_STACK_TIMES = 3
-    # Default number of frames offset
-    CALL_STACK_OFFSET = 3
-
-    # Creates a new stack frame
-    def initialize
-      @frames = [TOPLEVEL_BINDING] * INIT_STACK_TIMES
-    end
-
-    # Used by Kernel#set_trace_func to register each event in the call stack
-    def trace_func(event, file, line, id, binding)
-      case event
-      when 'call', 'class'
-        @frames.push binding
-      when 'return', 'end'
-        @frames.pop
-      end
-    end
-
-    # Returns the +n+ number of frames on the call stack from the last frame
-    # initialized.
-    #
-    # Raises FrameUnderflow if there are no frames in the given stack range.
-    def top(n = 0)
-      bind = @frames[-(n + CALL_STACK_OFFSET)]
-      fail FrameUnderflow unless bind
-      bind
-    end
-
-    # Returns the +n+ number of frames on the call stack from the first frame
-    # initialized.
-    #
-    # Raises FrameOverflow if there are no frames in the given stack range.
-    def bottom(n = 0)
-      bind = @frames[n]
-      fail FrameOverflow unless bind
-      bind
-    end
-
-    # Convenience method for Frame#bottom
-    def Frame.bottom(n = 0)
-      @backtrace.bottom(n)
-    end
-
-    # Convenience method for Frame#top
-    def Frame.top(n = 0)
-      @backtrace.top(n)
-    end
-
-    # Returns the binding context of the caller from the last frame initialized
-    def Frame.sender
-      eval "self", @backtrace.top
-    end
-
-    @backtrace = Frame.new
-    set_trace_func proc{|event, file, line, id, binding, klass|
-      @backtrace.trace_func(event, file, line, id, binding)
-    }
-  end
-end
diff --git a/lib/irb/help.rb b/lib/irb/help.rb
deleted file mode 100644
index ca12810de1f4f2..00000000000000
--- a/lib/irb/help.rb
+++ /dev/null
@@ -1,28 +0,0 @@
-# frozen_string_literal: false
-#
-#   irb/help.rb - print usage module
-#   	by Keiju ISHITSUKA(keiju@ishitsuka.com)
-#
-
-module IRB
-  # Outputs the irb help message, see IRB@Command+line+options.
-  def IRB.print_usage
-    lc = IRB.conf[:LC_MESSAGES]
-    path = lc.find("irb/help-message")
-    space_line = false
-    File.open(path){|f|
-      f.each_line do |l|
-        if /^\s*$/ =~ l
-          lc.puts l unless space_line
-          space_line = true
-          next
-        end
-        space_line = false
-
-        l.sub!(/#.*$/, "")
-        next if /^\s*$/ =~ l
-        lc.puts l
-      end
-    }
-  end
-end
diff --git a/lib/irb/history.rb b/lib/irb/history.rb
deleted file mode 100644
index ae924d152b096e..00000000000000
--- a/lib/irb/history.rb
+++ /dev/null
@@ -1,74 +0,0 @@
-module IRB
-  module HistorySavingAbility # :nodoc:
-    def support_history_saving?
-      true
-    end
-
-    def reset_history_counter
-      @loaded_history_lines = self.class::HISTORY.size if defined? @loaded_history_lines
-    end
-
-    def load_history
-      history = self.class::HISTORY
-      if history_file = IRB.conf[:HISTORY_FILE]
-        history_file = File.expand_path(history_file)
-      end
-      history_file = IRB.rc_file("_history") unless history_file
-      if File.exist?(history_file)
-        File.open(history_file, "r:#{IRB.conf[:LC_MESSAGES].encoding}") do |f|
-          f.each { |l|
-            l = l.chomp
-            if self.class == RelineInputMethod and history.last&.end_with?("\\")
-              history.last.delete_suffix!("\\")
-              history.last << "\n" << l
-            else
-              history << l
-            end
-          }
-        end
-        @loaded_history_lines = history.size
-        @loaded_history_mtime = File.mtime(history_file)
-      end
-    end
-
-    def save_history
-      history = self.class::HISTORY
-      if num = IRB.conf[:SAVE_HISTORY] and (num = num.to_i) != 0
-        if history_file = IRB.conf[:HISTORY_FILE]
-          history_file = File.expand_path(history_file)
-        end
-        history_file = IRB.rc_file("_history") unless history_file
-
-        # Change the permission of a file that already exists[BUG #7694]
-        begin
-          if File.stat(history_file).mode & 066 != 0
-            File.chmod(0600, history_file)
-          end
-        rescue Errno::ENOENT
-        rescue Errno::EPERM
-          return
-        rescue
-          raise
-        end
-
-        if File.exist?(history_file) &&
-           File.mtime(history_file) != @loaded_history_mtime
-          history = history[@loaded_history_lines..-1] if @loaded_history_lines
-          append_history = true
-        end
-
-        File.open(history_file, (append_history ? 'a' : 'w'), 0o600, encoding: IRB.conf[:LC_MESSAGES]&.encoding) do |f|
-          hist = history.map{ |l| l.split("\n").join("\\\n") }
-          unless append_history
-            begin
-              hist = hist.last(num) if hist.size > num and num > 0
-            rescue RangeError # bignum too big to convert into `long'
-              # Do nothing because the bignum should be treated as inifinity
-            end
-          end
-          f.puts(hist)
-        end
-      end
-    end
-  end
-end
diff --git a/lib/irb/init.rb b/lib/irb/init.rb
deleted file mode 100644
index d1097b573854ef..00000000000000
--- a/lib/irb/init.rb
+++ /dev/null
@@ -1,436 +0,0 @@
-# frozen_string_literal: false
-#
-#   irb/init.rb - irb initialize module
-#   	by Keiju ISHITSUKA(keiju@ruby-lang.org)
-#
-
-module IRB # :nodoc:
-
-  # initialize config
-  def IRB.setup(ap_path, argv: ::ARGV)
-    IRB.init_config(ap_path)
-    IRB.init_error
-    IRB.parse_opts(argv: argv)
-    IRB.run_config
-    IRB.load_modules
-
-    unless @CONF[:PROMPT][@CONF[:PROMPT_MODE]]
-      fail UndefinedPromptMode, @CONF[:PROMPT_MODE]
-    end
-  end
-
-  # @CONF default setting
-  def IRB.init_config(ap_path)
-    # class instance variables
-    @TRACER_INITIALIZED = false
-
-    # default configurations
-    unless ap_path and @CONF[:AP_NAME]
-      ap_path = File.join(File.dirname(File.dirname(__FILE__)), "irb.rb")
-    end
-    @CONF[:AP_NAME] = File::basename(ap_path, ".rb")
-
-    @CONF[:IRB_NAME] = "irb"
-    @CONF[:IRB_LIB_PATH] = File.dirname(__FILE__)
-
-    @CONF[:RC] = true
-    @CONF[:LOAD_MODULES] = []
-    @CONF[:IRB_RC] = nil
-
-    @CONF[:USE_SINGLELINE] = false unless defined?(ReadlineInputMethod)
-    @CONF[:USE_COLORIZE] = (nc = ENV['NO_COLOR']).nil? || nc.empty?
-    @CONF[:USE_AUTOCOMPLETE] = ENV.fetch("IRB_USE_AUTOCOMPLETE", "true") != "false"
-    @CONF[:INSPECT_MODE] = true
-    @CONF[:USE_TRACER] = false
-    @CONF[:USE_LOADER] = false
-    @CONF[:IGNORE_SIGINT] = true
-    @CONF[:IGNORE_EOF] = false
-    @CONF[:EXTRA_DOC_DIRS] = []
-    @CONF[:ECHO] = nil
-    @CONF[:ECHO_ON_ASSIGNMENT] = nil
-    @CONF[:VERBOSE] = nil
-
-    @CONF[:EVAL_HISTORY] = nil
-    @CONF[:SAVE_HISTORY] = 1000
-
-    @CONF[:BACK_TRACE_LIMIT] = 16
-
-    @CONF[:PROMPT] = {
-      :NULL => {
-        :PROMPT_I => nil,
-        :PROMPT_S => nil,
-        :PROMPT_C => nil,
-        :RETURN => "%s\n"
-      },
-      :DEFAULT => {
-        :PROMPT_I => "%N(%m):%03n> ",
-        :PROMPT_S => "%N(%m):%03n%l ",
-        :PROMPT_C => "%N(%m):%03n* ",
-        :RETURN => "=> %s\n"
-      },
-      :CLASSIC => {
-        :PROMPT_I => "%N(%m):%03n:%i> ",
-        :PROMPT_S => "%N(%m):%03n:%i%l ",
-        :PROMPT_C => "%N(%m):%03n:%i* ",
-        :RETURN => "%s\n"
-      },
-      :SIMPLE => {
-        :PROMPT_I => ">> ",
-        :PROMPT_S => "%l> ",
-        :PROMPT_C => "?> ",
-        :RETURN => "=> %s\n"
-      },
-      :INF_RUBY => {
-        :PROMPT_I => "%N(%m):%03n> ",
-        :PROMPT_S => nil,
-        :PROMPT_C => nil,
-        :RETURN => "%s\n",
-        :AUTO_INDENT => true
-      },
-      :XMP => {
-        :PROMPT_I => nil,
-        :PROMPT_S => nil,
-        :PROMPT_C => nil,
-        :RETURN => "    ==>%s\n"
-      }
-    }
-
-    @CONF[:PROMPT_MODE] = (STDIN.tty? ? :DEFAULT : :NULL)
-    @CONF[:AUTO_INDENT] = true
-
-    @CONF[:CONTEXT_MODE] = 4 # use a copy of TOPLEVEL_BINDING
-    @CONF[:SINGLE_IRB] = false
-
-    @CONF[:MEASURE] = false
-    @CONF[:MEASURE_PROC] = {}
-    @CONF[:MEASURE_PROC][:TIME] = proc { |context, code, line_no, &block|
-      time = Time.now
-      result = block.()
-      now = Time.now
-      puts 'processing time: %fs' % (now - time) if IRB.conf[:MEASURE]
-      result
-    }
-    # arg can be either a symbol for the mode (:cpu, :wall, ..) or a hash for
-    # a more complete configuration.
-    # See https://github.com/tmm1/stackprof#all-options.
-    @CONF[:MEASURE_PROC][:STACKPROF] = proc { |context, code, line_no, arg, &block|
-      return block.() unless IRB.conf[:MEASURE]
-      success = false
-      begin
-        require 'stackprof'
-        success = true
-      rescue LoadError
-        puts 'Please run "gem install stackprof" before measuring by StackProf.'
-      end
-      if success
-        result = nil
-        arg = { mode: arg || :cpu } unless arg.is_a?(Hash)
-        stackprof_result = StackProf.run(**arg) do
-          result = block.()
-        end
-        case stackprof_result
-        when File
-          puts "StackProf report saved to #{stackprof_result.path}"
-        when Hash
-          StackProf::Report.new(stackprof_result).print_text
-        else
-          puts "Stackprof ran with #{arg.inspect}"
-        end
-        result
-      else
-        block.()
-      end
-    }
-    @CONF[:MEASURE_CALLBACKS] = []
-
-    @CONF[:LC_MESSAGES] = Locale.new
-
-    @CONF[:AT_EXIT] = []
-
-    @CONF[:COMMAND_ALIASES] = {
-      # Symbol aliases
-      :'$' => :show_source,
-      :'@' => :whereami,
-      # Keyword aliases
-      :break => :irb_break,
-      :catch => :irb_catch,
-      :next => :irb_next,
-    }
-  end
-
-  def IRB.set_measure_callback(type = nil, arg = nil, &block)
-    added = nil
-    if type
-      type_sym = type.upcase.to_sym
-      if IRB.conf[:MEASURE_PROC][type_sym]
-        added = [type_sym, IRB.conf[:MEASURE_PROC][type_sym], arg]
-      end
-    elsif IRB.conf[:MEASURE_PROC][:CUSTOM]
-      added = [:CUSTOM, IRB.conf[:MEASURE_PROC][:CUSTOM], arg]
-    elsif block_given?
-      added = [:BLOCK, block, arg]
-      found = IRB.conf[:MEASURE_CALLBACKS].find{ |m| m[0] == added[0] && m[2] == added[2] }
-      if found
-        found[1] = block
-        return added
-      else
-        IRB.conf[:MEASURE_CALLBACKS] << added
-        return added
-      end
-    else
-      added = [:TIME, IRB.conf[:MEASURE_PROC][:TIME], arg]
-    end
-    if added
-      found = IRB.conf[:MEASURE_CALLBACKS].find{ |m| m[0] == added[0] && m[2] == added[2] }
-      if found
-        # already added
-        nil
-      else
-        IRB.conf[:MEASURE_CALLBACKS] << added if added
-        added
-      end
-    else
-      nil
-    end
-  end
-
-  def IRB.unset_measure_callback(type = nil)
-    if type.nil?
-      IRB.conf[:MEASURE_CALLBACKS].clear
-    else
-      type_sym = type.upcase.to_sym
-      IRB.conf[:MEASURE_CALLBACKS].reject!{ |t, | t == type_sym }
-    end
-  end
-
-  def IRB.init_error
-    @CONF[:LC_MESSAGES].load("irb/error.rb")
-  end
-
-  # option analyzing
-  def IRB.parse_opts(argv: ::ARGV)
-    load_path = []
-    while opt = argv.shift
-      case opt
-      when "-f"
-        @CONF[:RC] = false
-      when "-d"
-        $DEBUG = true
-        $VERBOSE = true
-      when "-w"
-        Warning[:deprecated] = $VERBOSE = true
-      when /^-W(.+)?/
-        opt = $1 || argv.shift
-        case opt
-        when "0"
-          $VERBOSE = nil
-        when "1"
-          $VERBOSE = false
-        else
-          Warning[:deprecated] = $VERBOSE = true
-        end
-      when /^-r(.+)?/
-        opt = $1 || argv.shift
-        @CONF[:LOAD_MODULES].push opt if opt
-      when /^-I(.+)?/
-        opt = $1 || argv.shift
-        load_path.concat(opt.split(File::PATH_SEPARATOR)) if opt
-      when '-U'
-        set_encoding("UTF-8", "UTF-8")
-      when /^-E(.+)?/, /^--encoding(?:=(.+))?/
-        opt = $1 || argv.shift
-        set_encoding(*opt.split(':', 2))
-      when "--inspect"
-        if /^-/ !~ argv.first
-          @CONF[:INSPECT_MODE] = argv.shift
-        else
-          @CONF[:INSPECT_MODE] = true
-        end
-      when "--noinspect"
-        @CONF[:INSPECT_MODE] = false
-      when "--singleline", "--readline", "--legacy"
-        @CONF[:USE_SINGLELINE] = true
-      when "--nosingleline", "--noreadline"
-        @CONF[:USE_SINGLELINE] = false
-      when "--multiline", "--reidline"
-        if opt == "--reidline"
-          warn <<~MSG.strip
-            --reidline is deprecated, please use --multiline instead.
-          MSG
-        end
-
-        @CONF[:USE_MULTILINE] = true
-      when "--nomultiline", "--noreidline"
-        if opt == "--noreidline"
-          warn <<~MSG.strip
-            --noreidline is deprecated, please use --nomultiline instead.
-          MSG
-        end
-
-        @CONF[:USE_MULTILINE] = false
-      when /^--extra-doc-dir(?:=(.+))?/
-        opt = $1 || argv.shift
-        @CONF[:EXTRA_DOC_DIRS] << opt
-      when "--echo"
-        @CONF[:ECHO] = true
-      when "--noecho"
-        @CONF[:ECHO] = false
-      when "--echo-on-assignment"
-        @CONF[:ECHO_ON_ASSIGNMENT] = true
-      when "--noecho-on-assignment"
-        @CONF[:ECHO_ON_ASSIGNMENT] = false
-      when "--truncate-echo-on-assignment"
-        @CONF[:ECHO_ON_ASSIGNMENT] = :truncate
-      when "--verbose"
-        @CONF[:VERBOSE] = true
-      when "--noverbose"
-        @CONF[:VERBOSE] = false
-      when "--colorize"
-        @CONF[:USE_COLORIZE] = true
-      when "--nocolorize"
-        @CONF[:USE_COLORIZE] = false
-      when "--autocomplete"
-        @CONF[:USE_AUTOCOMPLETE] = true
-      when "--noautocomplete"
-        @CONF[:USE_AUTOCOMPLETE] = false
-      when /^--prompt-mode(?:=(.+))?/, /^--prompt(?:=(.+))?/
-        opt = $1 || argv.shift
-        prompt_mode = opt.upcase.tr("-", "_").intern
-        @CONF[:PROMPT_MODE] = prompt_mode
-      when "--noprompt"
-        @CONF[:PROMPT_MODE] = :NULL
-      when "--script"
-        noscript = false
-      when "--noscript"
-        noscript = true
-      when "--inf-ruby-mode"
-        @CONF[:PROMPT_MODE] = :INF_RUBY
-      when "--sample-book-mode", "--simple-prompt"
-        @CONF[:PROMPT_MODE] = :SIMPLE
-      when "--tracer"
-        @CONF[:USE_TRACER] = true
-      when /^--back-trace-limit(?:=(.+))?/
-        @CONF[:BACK_TRACE_LIMIT] = ($1 || argv.shift).to_i
-      when /^--context-mode(?:=(.+))?/
-        @CONF[:CONTEXT_MODE] = ($1 || argv.shift).to_i
-      when "--single-irb"
-        @CONF[:SINGLE_IRB] = true
-      when "-v", "--version"
-        print IRB.version, "\n"
-        exit 0
-      when "-h", "--help"
-        require_relative "help"
-        IRB.print_usage
-        exit 0
-      when "--"
-        if !noscript && (opt = argv.shift)
-          @CONF[:SCRIPT] = opt
-          $0 = opt
-        end
-        break
-      when /^-./
-        fail UnrecognizedSwitch, opt
-      else
-        if noscript
-          argv.unshift(opt)
-        else
-          @CONF[:SCRIPT] = opt
-          $0 = opt
-        end
-        break
-      end
-    end
-
-    load_path.collect! do |path|
-      /\A\.\// =~ path ? path : File.expand_path(path)
-    end
-    $LOAD_PATH.unshift(*load_path)
-  end
-
-  # running config
-  def IRB.run_config
-    if @CONF[:RC]
-      begin
-        load rc_file
-      rescue LoadError, Errno::ENOENT
-      rescue # StandardError, ScriptError
-        print "load error: #{rc_file}\n"
-        print $!.class, ": ", $!, "\n"
-        for err in $@[0, $@.size - 2]
-          print "\t", err, "\n"
-        end
-      end
-    end
-  end
-
-  IRBRC_EXT = "rc"
-  def IRB.rc_file(ext = IRBRC_EXT)
-    if !@CONF[:RC_NAME_GENERATOR]
-      rc_file_generators do |rcgen|
-        @CONF[:RC_NAME_GENERATOR] ||= rcgen
-        if File.exist?(rcgen.call(IRBRC_EXT))
-          @CONF[:RC_NAME_GENERATOR] = rcgen
-          break
-        end
-      end
-    end
-    case rc_file = @CONF[:RC_NAME_GENERATOR].call(ext)
-    when String
-      return rc_file
-    else
-      fail IllegalRCNameGenerator
-    end
-  end
-
-  # enumerate possible rc-file base name generators
-  def IRB.rc_file_generators
-    if irbrc = ENV["IRBRC"]
-      yield proc{|rc| rc == "rc" ? irbrc : irbrc+rc}
-    end
-    if xdg_config_home = ENV["XDG_CONFIG_HOME"]
-      irb_home = File.join(xdg_config_home, "irb")
-      if File.directory?(irb_home)
-        yield proc{|rc| irb_home + "/irb#{rc}"}
-      end
-    end
-    if home = ENV["HOME"]
-      yield proc{|rc| home+"/.irb#{rc}"}
-      yield proc{|rc| home+"/.config/irb/irb#{rc}"}
-    end
-    current_dir = Dir.pwd
-    yield proc{|rc| current_dir+"/.irb#{rc}"}
-    yield proc{|rc| current_dir+"/irb#{rc.sub(/\A_?/, '.')}"}
-    yield proc{|rc| current_dir+"/_irb#{rc}"}
-    yield proc{|rc| current_dir+"/$irb#{rc}"}
-  end
-
-  # loading modules
-  def IRB.load_modules
-    for m in @CONF[:LOAD_MODULES]
-      begin
-        require m
-      rescue LoadError => err
-        warn "#{err.class}: #{err}", uplevel: 0
-      end
-    end
-  end
-
-  class << IRB
-    private
-    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
-      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
-  end
-end
diff --git a/lib/irb/input-method.rb b/lib/irb/input-method.rb
deleted file mode 100644
index bd7d4fede4334d..00000000000000
--- a/lib/irb/input-method.rb
+++ /dev/null
@@ -1,412 +0,0 @@
-# frozen_string_literal: false
-#
-#   irb/input-method.rb - input methods used irb
-#   	by Keiju ISHITSUKA(keiju@ruby-lang.org)
-#
-
-require_relative 'completion'
-require_relative "history"
-require 'io/console'
-require 'reline'
-
-module IRB
-  class InputMethod
-    # The irb prompt associated with this input method
-    attr_accessor :prompt
-
-    # Reads the next line from this input method.
-    #
-    # See IO#gets for more information.
-    def gets
-      fail NotImplementedError, "gets"
-    end
-    public :gets
-
-    def winsize
-      if instance_variable_defined?(:@stdout) && @stdout.tty?
-        @stdout.winsize
-      else
-        [24, 80]
-      end
-    end
-
-    # Whether this input method is still readable when there is no more data to
-    # read.
-    #
-    # See IO#eof for more information.
-    def readable_after_eof?
-      false
-    end
-
-    def support_history_saving?
-      false
-    end
-
-    # For debug message
-    def inspect
-      'Abstract InputMethod'
-    end
-  end
-
-  class StdioInputMethod < InputMethod
-    # Creates a new input method object
-    def initialize
-      @line_no = 0
-      @line = []
-      @stdin = IO.open(STDIN.to_i, :external_encoding => IRB.conf[:LC_MESSAGES].encoding, :internal_encoding => "-")
-      @stdout = IO.open(STDOUT.to_i, 'w', :external_encoding => IRB.conf[:LC_MESSAGES].encoding, :internal_encoding => "-")
-    end
-
-    # Reads the next line from this input method.
-    #
-    # See IO#gets for more information.
-    def gets
-      print @prompt
-      line = @stdin.gets
-      @line[@line_no += 1] = line
-    end
-
-    # Whether the end of this input method has been reached, returns +true+ if
-    # there is no more data to read.
-    #
-    # See IO#eof? for more information.
-    def eof?
-      if @stdin.wait_readable(0.00001)
-        c = @stdin.getc
-        result = c.nil? ? true : false
-        @stdin.ungetc(c) unless c.nil?
-        result
-      else # buffer is empty
-        false
-      end
-    end
-
-    # Whether this input method is still readable when there is no more data to
-    # read.
-    #
-    # See IO#eof for more information.
-    def readable_after_eof?
-      true
-    end
-
-    # Returns the current line number for #io.
-    #
-    # #line counts the number of times #gets is called.
-    #
-    # See IO#lineno for more information.
-    def line(line_no)
-      @line[line_no]
-    end
-
-    # The external encoding for standard input.
-    def encoding
-      @stdin.external_encoding
-    end
-
-    # For debug message
-    def inspect
-      'StdioInputMethod'
-    end
-  end
-
-  # Use a File for IO with irb, see InputMethod
-  class FileInputMethod < InputMethod
-    class << self
-      def open(file, &block)
-        begin
-          io = new(file)
-          block.call(io)
-        ensure
-          io&.close
-        end
-      end
-    end
-
-    # Creates a new input method object
-    def initialize(file)
-      @io = file.is_a?(IO) ? file : File.open(file)
-      @external_encoding = @io.external_encoding
-    end
-
-    # Whether the end of this input method has been reached, returns +true+ if
-    # there is no more data to read.
-    #
-    # See IO#eof? for more information.
-    def eof?
-      @io.closed? || @io.eof?
-    end
-
-    # Reads the next line from this input method.
-    #
-    # See IO#gets for more information.
-    def gets
-      print @prompt
-      @io.gets
-    end
-
-    # The external encoding for standard input.
-    def encoding
-      @external_encoding
-    end
-
-    # For debug message
-    def inspect
-      'FileInputMethod'
-    end
-
-    def close
-      @io.close
-    end
-  end
-
-  class ReadlineInputMethod < StdioInputMethod
-    def self.initialize_readline
-      require "readline"
-    rescue LoadError
-    else
-      include ::Readline
-    end
-
-    include HistorySavingAbility
-
-    # Creates a new input method object using Readline
-    def initialize
-      self.class.initialize_readline
-      if Readline.respond_to?(:encoding_system_needs)
-        IRB.__send__(:set_encoding, Readline.encoding_system_needs.name, override: false)
-      end
-
-      super
-
-      @eof = false
-
-      if Readline.respond_to?("basic_word_break_characters=")
-        Readline.basic_word_break_characters = IRB::InputCompletor::BASIC_WORD_BREAK_CHARACTERS
-      end
-      Readline.completion_append_character = nil
-      Readline.completion_proc = IRB::InputCompletor::CompletionProc
-    end
-
-    # Reads the next line from this input method.
-    #
-    # See IO#gets for more information.
-    def gets
-      Readline.input = @stdin
-      Readline.output = @stdout
-      if l = readline(@prompt, false)
-        HISTORY.push(l) if !l.empty?
-        @line[@line_no += 1] = l + "\n"
-      else
-        @eof = true
-        l
-      end
-    end
-
-    # Whether the end of this input method has been reached, returns +true+
-    # if there is no more data to read.
-    #
-    # See IO#eof? for more information.
-    def eof?
-      @eof
-    end
-
-    # For debug message
-    def inspect
-      readline_impl = (defined?(Reline) && Readline == Reline) ? 'Reline' : 'ext/readline'
-      str = "ReadlineInputMethod with #{readline_impl} #{Readline::VERSION}"
-      inputrc_path = File.expand_path(ENV['INPUTRC'] || '~/.inputrc')
-      str += " and #{inputrc_path}" if File.exist?(inputrc_path)
-      str
-    end
-  end
-
-  class RelineInputMethod < StdioInputMethod
-    HISTORY = Reline::HISTORY
-    include HistorySavingAbility
-    # Creates a new input method object using Reline
-    def initialize
-      IRB.__send__(:set_encoding, Reline.encoding_system_needs.name, override: false)
-
-      super
-
-      @eof = false
-
-      Reline.basic_word_break_characters = IRB::InputCompletor::BASIC_WORD_BREAK_CHARACTERS
-      Reline.completion_append_character = nil
-      Reline.completer_quote_characters = ''
-      Reline.completion_proc = IRB::InputCompletor::CompletionProc
-      Reline.output_modifier_proc =
-        if IRB.conf[:USE_COLORIZE]
-          proc do |output, complete: |
-            next unless IRB::Color.colorable?
-            lvars = IRB.CurrentContext&.local_variables || []
-            IRB::Color.colorize_code(output, complete: complete, local_variables: lvars)
-          end
-        else
-          proc do |output|
-            Reline::Unicode.escape_for_print(output)
-          end
-        end
-      Reline.dig_perfect_match_proc = IRB::InputCompletor::PerfectMatchedProc
-      Reline.autocompletion = IRB.conf[:USE_AUTOCOMPLETE]
-
-      if IRB.conf[:USE_AUTOCOMPLETE]
-        begin
-          require 'rdoc'
-          Reline.add_dialog_proc(:show_doc, SHOW_DOC_DIALOG, Reline::DEFAULT_DIALOG_CONTEXT)
-        rescue LoadError
-        end
-      end
-    end
-
-    def check_termination(&block)
-      @check_termination_proc = block
-    end
-
-    def dynamic_prompt(&block)
-      @prompt_proc = block
-    end
-
-    def auto_indent(&block)
-      @auto_indent_proc = block
-    end
-
-    SHOW_DOC_DIALOG = ->() {
-      dialog.trap_key = nil
-      alt_d = [
-        [Reline::Key.new(nil, 0xE4, true)], # Normal Alt+d.
-        [27, 100], # Normal Alt+d when convert-meta isn't used.
-        [195, 164], # The "ä" that appears when Alt+d is pressed on xterm.
-        [226, 136, 130] # The "∂" that appears when Alt+d in pressed on iTerm2.
-      ]
-
-      if just_cursor_moving and completion_journey_data.nil?
-        return nil
-      end
-      cursor_pos_to_render, result, pointer, autocomplete_dialog = context.pop(4)
-      return nil if result.nil? or pointer.nil? or pointer < 0
-      name = result[pointer]
-      name = IRB::InputCompletor.retrieve_completion_data(name, doc_namespace: true)
-
-      options = {}
-      options[:extra_doc_dirs] = IRB.conf[:EXTRA_DOC_DIRS] unless IRB.conf[:EXTRA_DOC_DIRS].empty?
-      driver = RDoc::RI::Driver.new(options)
-
-      if key.match?(dialog.name)
-        begin
-          driver.display_names([name])
-        rescue RDoc::RI::Driver::NotFoundError
-        end
-      end
-
-      begin
-        name = driver.expand_name(name)
-      rescue RDoc::RI::Driver::NotFoundError
-        return nil
-      rescue
-        return nil # unknown error
-      end
-      doc = nil
-      used_for_class = false
-      if not name =~ /#|\./
-        found, klasses, includes, extends = driver.classes_and_includes_and_extends_for(name)
-        if not found.empty?
-          doc = driver.class_document(name, found, klasses, includes, extends)
-          used_for_class = true
-        end
-      end
-      unless used_for_class
-        doc = RDoc::Markup::Document.new
-        begin
-          driver.add_method(doc, name)
-        rescue RDoc::RI::Driver::NotFoundError
-          doc = nil
-        rescue
-          return nil # unknown error
-        end
-      end
-      return nil if doc.nil?
-      width = 40
-
-      right_x = cursor_pos_to_render.x + autocomplete_dialog.width
-      if right_x + width > screen_width
-        right_width = screen_width - (right_x + 1)
-        left_x = autocomplete_dialog.column - width
-        left_x = 0 if left_x < 0
-        left_width = width > autocomplete_dialog.column ? autocomplete_dialog.column : width
-        if right_width.positive? and left_width.positive?
-          if right_width >= left_width
-            width = right_width
-            x = right_x
-          else
-            width = left_width
-            x = left_x
-          end
-        elsif right_width.positive? and left_width <= 0
-          width = right_width
-          x = right_x
-        elsif right_width <= 0 and left_width.positive?
-          width = left_width
-          x = left_x
-        else # Both are negative width.
-          return nil
-        end
-      else
-        x = right_x
-      end
-      formatter = RDoc::Markup::ToAnsi.new
-      formatter.width = width
-      dialog.trap_key = alt_d
-      mod_key = RUBY_PLATFORM.match?(/darwin/) ? "Option" : "Alt"
-      message = "Press #{mod_key}+d to read the full document"
-      contents = [message] + doc.accept(formatter).split("\n")
-      contents = contents.take(preferred_dialog_height)
-
-      y = cursor_pos_to_render.y
-      Reline::DialogRenderInfo.new(pos: Reline::CursorPos.new(x, y), contents: contents, width: width, bg_color: '49')
-    }
-
-    # Reads the next line from this input method.
-    #
-    # See IO#gets for more information.
-    def gets
-      Reline.input = @stdin
-      Reline.output = @stdout
-      Reline.prompt_proc = @prompt_proc
-      Reline.auto_indent_proc = @auto_indent_proc if @auto_indent_proc
-      if l = Reline.readmultiline(@prompt, false, &@check_termination_proc)
-        Reline::HISTORY.push(l) if !l.empty?
-        @line[@line_no += 1] = l + "\n"
-      else
-        @eof = true
-        l
-      end
-    end
-
-    # Whether the end of this input method has been reached, returns +true+
-    # if there is no more data to read.
-    #
-    # See IO#eof? for more information.
-    def eof?
-      @eof
-    end
-
-    # For debug message
-    def inspect
-      config = Reline::Config.new
-      str = "RelineInputMethod with Reline #{Reline::VERSION}"
-      inputrc_path = File.expand_path(config.inputrc_path)
-      str += " and #{inputrc_path}" if File.exist?(inputrc_path)
-      str
-    end
-  end
-
-  class ReidlineInputMethod < RelineInputMethod
-    def initialize
-      warn <<~MSG.strip
-        IRB::ReidlineInputMethod is deprecated, please use IRB::RelineInputMethod instead.
-      MSG
-      super
-    end
-  end
-end
diff --git a/lib/irb/inspector.rb b/lib/irb/inspector.rb
deleted file mode 100644
index ee3b19efdc503d..00000000000000
--- a/lib/irb/inspector.rb
+++ /dev/null
@@ -1,130 +0,0 @@
-# frozen_string_literal: false
-#
-#   irb/inspector.rb - inspect methods
-#   	by Keiju ISHITSUKA(keiju@ruby-lang.org)
-#
-
-module IRB # :nodoc:
-
-
-  # Convenience method to create a new Inspector, using the given +inspect+
-  # proc, and optional +init+ proc and passes them to Inspector.new
-  #
-  #     irb(main):001:0> ins = IRB::Inspector(proc{ |v| "omg! #{v}" })
-  #     irb(main):001:0> IRB.CurrentContext.inspect_mode = ins # => omg! #<IRB::Inspector:0x007f46f7ba7d28>
-  #     irb(main):001:0> "what?" #=> omg! what?
-  #
-  def IRB::Inspector(inspect, init = nil)
-    Inspector.new(inspect, init)
-  end
-
-  # An irb inspector
-  #
-  # In order to create your own custom inspector there are two things you
-  # should be aware of:
-  #
-  # Inspector uses #inspect_value, or +inspect_proc+, for output of return values.
-  #
-  # This also allows for an optional #init+, or +init_proc+, which is called
-  # when the inspector is activated.
-  #
-  # Knowing this, you can create a rudimentary inspector as follows:
-  #
-  #     irb(main):001:0> ins = IRB::Inspector.new(proc{ |v| "omg! #{v}" })
-  #     irb(main):001:0> IRB.CurrentContext.inspect_mode = ins # => omg! #<IRB::Inspector:0x007f46f7ba7d28>
-  #     irb(main):001:0> "what?" #=> omg! what?
-  #
-  class Inspector
-    KERNEL_INSPECT = Object.instance_method(:inspect)
-    # Default inspectors available to irb, this includes:
-    #
-    # +:pp+::       Using Kernel#pretty_inspect
-    # +:yaml+::     Using YAML.dump
-    # +:marshal+::  Using Marshal.dump
-    INSPECTORS = {}
-
-    # Determines the inspector to use where +inspector+ is one of the keys passed
-    # during inspector definition.
-    def self.keys_with_inspector(inspector)
-      INSPECTORS.select{|k,v| v == inspector}.collect{|k, v| k}
-    end
-
-    # Example
-    #
-    #     Inspector.def_inspector(key, init_p=nil){|v| v.inspect}
-    #     Inspector.def_inspector([key1,..], init_p=nil){|v| v.inspect}
-    #     Inspector.def_inspector(key, inspector)
-    #     Inspector.def_inspector([key1,...], inspector)
-    def self.def_inspector(key, arg=nil, &block)
-      if block_given?
-        inspector = IRB::Inspector(block, arg)
-      else
-        inspector = arg
-      end
-
-      case key
-      when Array
-        for k in key
-          def_inspector(k, inspector)
-        end
-      when Symbol
-        INSPECTORS[key] = inspector
-        INSPECTORS[key.to_s] = inspector
-      when String
-        INSPECTORS[key] = inspector
-        INSPECTORS[key.intern] = inspector
-      else
-        INSPECTORS[key] = inspector
-      end
-    end
-
-    # Creates a new inspector object, using the given +inspect_proc+ when
-    # output return values in irb.
-    def initialize(inspect_proc, init_proc = nil)
-      @init = init_proc
-      @inspect = inspect_proc
-    end
-
-    # Proc to call when the inspector is activated, good for requiring
-    # dependent libraries.
-    def init
-      @init.call if @init
-    end
-
-    # Proc to call when the input is evaluated and output in irb.
-    def inspect_value(v)
-      @inspect.call(v)
-    rescue => e
-      puts "An error occurred when inspecting the object: #{e.inspect}"
-
-      begin
-        puts "Result of Kernel#inspect: #{KERNEL_INSPECT.bind_call(v)}"
-        ''
-      rescue => e
-        puts "An error occurred when running Kernel#inspect: #{e.inspect}"
-        puts e.backtrace.join("\n")
-        ''
-      end
-    end
-  end
-
-  Inspector.def_inspector([false, :to_s, :raw]){|v| v.to_s}
-  Inspector.def_inspector([:p, :inspect]){|v|
-    Color.colorize_code(v.inspect, colorable: Color.colorable? && Color.inspect_colorable?(v))
-  }
-  Inspector.def_inspector([true, :pp, :pretty_inspect], proc{require_relative "color_printer"}){|v|
-    IRB::ColorPrinter.pp(v, '').chomp
-  }
-  Inspector.def_inspector([:yaml, :YAML], proc{require "yaml"}){|v|
-    begin
-      YAML.dump(v)
-    rescue
-      puts "(can't dump yaml. use inspect)"
-      v.inspect
-    end
-  }
-
-  Inspector.def_inspector([:marshal, :Marshal, :MARSHAL, Marshal]){|v|
-    Marshal.dump(v)
-  }
-end
diff --git a/lib/irb/irb.gemspec b/lib/irb/irb.gemspec
deleted file mode 100644
index a008a39f9d5d81..00000000000000
--- a/lib/irb/irb.gemspec
+++ /dev/null
@@ -1,46 +0,0 @@
-begin
-  require_relative "lib/irb/version"
-rescue LoadError
-  # for Ruby core repository
-  require_relative "version"
-end
-
-Gem::Specification.new do |spec|
-  spec.name          = "irb"
-  spec.version       = IRB::VERSION
-  spec.authors       = ["aycabta", "Keiju ISHITSUKA"]
-  spec.email         = ["aycabta@gmail.com", "keiju@ruby-lang.org"]
-
-  spec.summary       = %q{Interactive Ruby command-line tool for REPL (Read Eval Print Loop).}
-  spec.description   = %q{Interactive Ruby command-line tool for REPL (Read Eval Print Loop).}
-  spec.homepage      = "https://github.com/ruby/irb"
-  spec.licenses      = ["Ruby", "BSD-2-Clause"]
-
-  spec.metadata["homepage_uri"] = spec.homepage
-  spec.metadata["source_code_uri"] = spec.homepage
-  spec.metadata["documentation_uri"] = spec.homepage
-  spec.metadata["changelog_uri"] = "#{spec.homepage}/releases"
-
-  spec.files         = [
-    ".document",
-    "Gemfile",
-    "LICENSE.txt",
-    "README.md",
-    "Rakefile",
-    "bin/console",
-    "bin/setup",
-    "doc/irb/irb-tools.rd.ja",
-    "doc/irb/irb.rd.ja",
-    "exe/irb",
-    "irb.gemspec",
-    "man/irb.1",
-  ] + Dir.glob("lib/**/*")
-  spec.bindir        = "exe"
-  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
-  spec.require_paths = ["lib"]
-
-  spec.required_ruby_version = Gem::Requirement.new(">= 2.7")
-
-  spec.add_dependency "reline", ">= 0.3.8"
-  spec.add_dependency "rdoc"
-end
diff --git a/lib/irb/lc/error.rb b/lib/irb/lc/error.rb
deleted file mode 100644
index a5ec15086595d5..00000000000000
--- a/lib/irb/lc/error.rb
+++ /dev/null
@@ -1,62 +0,0 @@
-# frozen_string_literal: false
-#
-#   irb/lc/error.rb -
-#   	by Keiju ISHITSUKA(keiju@ruby-lang.org)
-#
-
-module IRB
-  # :stopdoc:
-
-  class UnrecognizedSwitch < StandardError
-    def initialize(val)
-      super("Unrecognized switch: #{val}")
-    end
-  end
-  class NotImplementedError < StandardError
-    def initialize(val)
-      super("Need to define `#{val}'")
-    end
-  end
-  class CantReturnToNormalMode < StandardError
-    def initialize
-      super("Can't return to normal mode.")
-    end
-  end
-  class IllegalParameter < StandardError
-    def initialize(val)
-      super("Invalid parameter(#{val}).")
-    end
-  end
-  class IrbAlreadyDead < StandardError
-    def initialize
-      super("Irb is already dead.")
-    end
-  end
-  class IrbSwitchedToCurrentThread < StandardError
-    def initialize
-      super("Switched to current thread.")
-    end
-  end
-  class NoSuchJob < StandardError
-    def initialize(val)
-      super("No such job(#{val}).")
-    end
-  end
-  class CantChangeBinding < StandardError
-    def initialize(val)
-      super("Can't change binding to (#{val}).")
-    end
-  end
-  class UndefinedPromptMode < StandardError
-    def initialize(val)
-      super("Undefined prompt mode(#{val}).")
-    end
-  end
-  class IllegalRCGenerator < StandardError
-    def initialize
-      super("Define illegal RC_NAME_GENERATOR.")
-    end
-  end
-
-  # :startdoc:
-end
diff --git a/lib/irb/lc/help-message b/lib/irb/lc/help-message
deleted file mode 100644
index 7e66100be941d8..00000000000000
--- a/lib/irb/lc/help-message
+++ /dev/null
@@ -1,51 +0,0 @@
-Usage:  irb.rb [options] [programfile] [arguments]
-  -f                Don't initialize from configuration file.
-  -d                Set $DEBUG and $VERBOSE to true (same as 'ruby -d').
-  -r load-module    Require load-module (same as 'ruby -r').
-  -I path           Specify $LOAD_PATH directory (same as 'ruby -I').
-  -U                Set external and internal encodings to UTF-8.
-  -E ex[:in]        Set default external (ex) and internal (in) encodings
-                    (same as 'ruby -E').
-  -w                Suppress warnings (same as 'ruby -w').
-  -W[level=2]       Set warning level: 0=silence, 1=medium, 2=verbose
-                    (same as 'ruby -W').
-  --context-mode n  Set n[0-4] to method to create Binding Object,
-                    when new workspace was created.
-  --extra-doc-dir   Add an extra doc dir for the doc dialog.
-  --echo            Show result (default).
-  --noecho          Don't show result.
-  --echo-on-assignment
-                    Show result on assignment.
-  --noecho-on-assignment
-                    Don't show result on assignment.
-  --truncate-echo-on-assignment
-                    Show truncated result on assignment (default).
-  --inspect         Use 'inspect' for output.
-  --noinspect       Don't use 'inspect' for output.
-  --multiline       Use multiline editor module (default).
-  --nomultiline     Don't use multiline editor module.
-  --singleline      Use single line editor module.
-  --nosingleline    Don't use single line editor module (default).
-  --colorize        Use color-highlighting (default).
-  --nocolorize      Don't use color-highlighting.
-  --autocomplete    Use auto-completion (default).
-  --noautocomplete  Don't use auto-completion.
-  --prompt prompt-mode, --prompt-mode prompt-mode
-                    Set prompt mode. Pre-defined prompt modes are:
-                    'default', 'classic', 'simple', 'inf-ruby', 'xmp', 'null'.
-  --inf-ruby-mode   Use prompt appropriate for inf-ruby-mode on emacs.
-                    Suppresses --multiline and --singleline.
-  --sample-book-mode, --simple-prompt
-                    Set prompt mode to 'simple'.
-  --noprompt        Don't output prompt.
-  --script          Script mode (default, treat first argument as script)
-  --noscript        No script mode (leave arguments in argv)
-  --single-irb      Share self with sub-irb.
-  --tracer          Show stack trace for each command.
-  --back-trace-limit n[=16]
-                    Display backtrace top n and bottom n.
-  --verbose         Show details.
-  --noverbose       Don't show details.
-  -v, --version     Print the version of irb.
-  -h, --help        Print help.
-  --                Separate options of irb from the list of command-line args.
diff --git a/lib/irb/lc/ja/error.rb b/lib/irb/lc/ja/error.rb
deleted file mode 100644
index 50d72c4a10eff6..00000000000000
--- a/lib/irb/lc/ja/error.rb
+++ /dev/null
@@ -1,63 +0,0 @@
-# frozen_string_literal: false
-#
-#   irb/lc/ja/error.rb -
-#   	by Keiju ISHITSUKA(keiju@ruby-lang.org)
-#
-
-module IRB
-  # :stopdoc:
-
-  class UnrecognizedSwitch < StandardError
-    def initialize(val)
-      super("スイッチ(#{val})が分りません")
-    end
-  end
-  class NotImplementedError < StandardError
-    def initialize(val)
-      super("`#{val}'の定義が必要です")
-    end
-  end
-  class CantReturnToNormalMode < StandardError
-    def initialize
-      super("Normalモードに戻れません.")
-    end
-  end
-  class IllegalParameter < StandardError
-    def initialize(val)
-      super("パラメータ(#{val})が間違っています.")
-    end
-  end
-  class IrbAlreadyDead < StandardError
-    def initialize
-      super("Irbは既に死んでいます.")
-    end
-  end
-  class IrbSwitchedToCurrentThread < StandardError
-    def initialize
-      super("カレントスレッドに切り替わりました.")
-    end
-  end
-  class NoSuchJob < StandardError
-    def initialize(val)
-      super("そのようなジョブ(#{val})はありません.")
-    end
-  end
-  class CantChangeBinding < StandardError
-    def initialize(val)
-      super("バインディング(#{val})に変更できません.")
-    end
-  end
-  class UndefinedPromptMode < StandardError
-    def initialize(val)
-      super("プロンプトモード(#{val})は定義されていません.")
-    end
-  end
-  class IllegalRCGenerator < StandardError
-    def initialize
-      super("RC_NAME_GENERATORが正しく定義されていません.")
-    end
-  end
-
-  # :startdoc:
-end
-# vim:fileencoding=utf-8
diff --git a/lib/irb/lc/ja/help-message b/lib/irb/lc/ja/help-message
deleted file mode 100644
index 1c15d331ead25a..00000000000000
--- a/lib/irb/lc/ja/help-message
+++ /dev/null
@@ -1,45 +0,0 @@
-Usage:  irb.rb [options] [programfile] [arguments]
-  -f		    ~/.irbrc を読み込まない.
-  -d                $DEBUG をtrueにする(ruby -d と同じ)
-  -r load-module    ruby -r と同じ.
-  -I path           $LOAD_PATH に path を追加する.
-  -U                ruby -U と同じ.
-  -E enc            ruby -E と同じ.
-  -w                ruby -w と同じ.
-  -W[level=2]       ruby -W と同じ.
-  --context-mode n  新しいワークスペースを作成した時に関連する Binding
-		    オブジェクトの作成方法を 0 から 3 のいずれかに設定する.
-  --echo	    実行結果を表示する(デフォルト).
-  --noecho	    実行結果を表示しない.
-  --inspect	    結果出力にinspectを用いる.
-  --noinspect	    結果出力にinspectを用いない.
-  --multiline       マルチラインエディタを利用する.
-  --nomultiline     マルチラインエディタを利用しない.
-  --singleline      シングルラインエディタを利用する.
-  --nosingleline    シングルラインエディタを利用しない.
-  --colorize	    色付けを利用する.
-  --nocolorize	    色付けを利用しない.
-  --autocomplete    オートコンプリートを利用する.
-  --noautocomplete  オートコンプリートを利用しない.
-  --prompt prompt-mode/--prompt-mode prompt-mode
-		    プロンプトモードを切替えます. 現在定義されているプ
-		    ロンプトモードは, default, simple, xmp, inf-rubyが
-		    用意されています.
-  --inf-ruby-mode   emacsのinf-ruby-mode用のプロンプト表示を行なう. 特
-                    に指定がない限り, シングルラインエディタとマルチラ
-                    インエディタは使わなくなる.
-  --sample-book-mode/--simple-prompt
-		    非常にシンプルなプロンプトを用いるモードです.
-  --noprompt	    プロンプト表示を行なわない.
-  --single-irb	    irb 中で self を実行して得られるオブジェクトをサ
-		    ブ irb と共有する.
-  --tracer	    コマンド実行時にトレースを行なう.
-  --back-trace-limit n
-		    バックトレース表示をバックトレースの頭から n, 後ろ
-		    からnだけ行なう. デフォルトは16
-
-  --verbose	    詳細なメッセージを出力する.
-  --noverbose	    詳細なメッセージを出力しない(デフォルト).
-  -v, --version	    irbのバージョンを表示する.
-  -h, --help	    irb のヘルプを表示する.
-  --		    以降のコマンドライン引数をオプションとして扱わない.
diff --git a/lib/irb/locale.rb b/lib/irb/locale.rb
deleted file mode 100644
index f94aa0f40bb9da..00000000000000
--- a/lib/irb/locale.rb
+++ /dev/null
@@ -1,153 +0,0 @@
-# frozen_string_literal: false
-#
-#   irb/locale.rb - internationalization module
-#   	by Keiju ISHITSUKA(keiju@ruby-lang.org)
-#
-
-module IRB # :nodoc:
-  class Locale
-
-    LOCALE_NAME_RE = %r[
-      (?<language>[[:alpha:]]{2,3})
-      (?:_  (?<territory>[[:alpha:]]{2,3}) )?
-      (?:\. (?<codeset>[^@]+) )?
-      (?:@  (?<modifier>.*) )?
-    ]x
-    LOCALE_DIR = "/lc/"
-
-    LEGACY_ENCODING_ALIAS_MAP = {
-      'ujis' => Encoding::EUC_JP,
-      'euc' => Encoding::EUC_JP
-    }
-
-    @@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)
-        @lang, @territory, @encoding_name, @modifier = m[:language], m[:territory], m[:codeset], m[:modifier]
-
-        if @encoding_name
-          if @encoding = LEGACY_ENCODING_ALIAS_MAP[@encoding_name]
-            warn(("%s is obsolete. use %s" % ["#{@lang}_#{@territory}.#{@encoding_name}", "#{@lang}_#{@territory}.#{@encoding.name}"]), uplevel: 1)
-          else
-            @encoding = Encoding.find(@encoding_name) rescue nil
-          end
-        end
-      end
-      @encoding ||= (Encoding.find('locale') rescue Encoding::ASCII_8BIT)
-    end
-
-    attr_reader :lang, :territory, :modifier
-
-    def encoding
-      @override_encoding || @encoding
-    end
-
-    def String(mes)
-      mes = super(mes)
-      if encoding
-        mes.encode(encoding, undef: :replace)
-      else
-        mes
-      end
-    end
-
-    def format(*opts)
-      String(super(*opts))
-    end
-
-    def gets(*rs)
-      String(super(*rs))
-    end
-
-    def readline(*rs)
-      String(super(*rs))
-    end
-
-    def print(*opts)
-      ary = opts.collect{|opt| String(opt)}
-      super(*ary)
-    end
-
-    def printf(*opts)
-      s = format(*opts)
-      print s
-    end
-
-    def puts(*opts)
-      ary = opts.collect{|opt| String(opt)}
-      super(*ary)
-    end
-
-    def load(file)
-      found = find(file)
-      if found
-        unless @@loaded.include?(found)
-          @@loaded << found # cache
-          Kernel.load(found)
-        end
-      else
-        raise LoadError, "No such file to load -- #{file}"
-      end
-    end
-
-    def find(file , paths = $:)
-      dir = File.dirname(file)
-      dir = "" if dir == "."
-      base = File.basename(file)
-
-      if dir.start_with?('/')
-        return each_localized_path(dir, base).find{|full_path| File.readable? full_path}
-      else
-        return search_file(paths, dir, base)
-      end
-    end
-
-    # @param paths load paths in which IRB find a localized file.
-    # @param dir directory
-    # @param file basename to be localized
-    #
-    # typically, for the parameters and a <path> in paths, it searches
-    #   <path>/<dir>/<locale>/<file>
-    def search_file(lib_paths, dir, file)
-      each_localized_path(dir, file) do |lc_path|
-        lib_paths.each do |libpath|
-          full_path = File.join(libpath, lc_path)
-          return full_path if File.readable?(full_path)
-        end
-        redo if defined?(Gem) and Gem.try_activate(lc_path)
-      end
-      nil
-    end
-
-    def each_localized_path(dir, file)
-      return enum_for(:each_localized_path) unless block_given?
-      each_sublocale do |lc|
-        yield lc.nil? ? File.join(dir, LOCALE_DIR, file) : File.join(dir, LOCALE_DIR, lc, file)
-      end
-    end
-
-    def each_sublocale
-      if @lang
-        if @territory
-          if @encoding_name
-            yield "#{@lang}_#{@territory}.#{@encoding_name}@#{@modifier}" if @modifier
-            yield "#{@lang}_#{@territory}.#{@encoding_name}"
-          end
-          yield "#{@lang}_#{@territory}@#{@modifier}" if @modifier
-          yield "#{@lang}_#{@territory}"
-        end
-        if @encoding_name
-          yield "#{@lang}.#{@encoding_name}@#{@modifier}" if @modifier
-          yield "#{@lang}.#{@encoding_name}"
-        end
-        yield "#{@lang}@#{@modifier}" if @modifier
-        yield "#{@lang}"
-      end
-      yield nil
-    end
-  end
-end
diff --git a/lib/irb/nesting_parser.rb b/lib/irb/nesting_parser.rb
deleted file mode 100644
index 3d4db8244451dd..00000000000000
--- a/lib/irb/nesting_parser.rb
+++ /dev/null
@@ -1,227 +0,0 @@
-# frozen_string_literal: true
-module IRB
-  module NestingParser
-    IGNORE_TOKENS = %i[on_sp on_ignored_nl on_comment on_embdoc_beg on_embdoc on_embdoc_end]
-
-    # Scan each token and call the given block with array of token and other information for parsing
-    def self.scan_opens(tokens)
-      opens = []
-      pending_heredocs = []
-      first_token_on_line = true
-      tokens.each do |t|
-        skip = false
-        last_tok, state, args = opens.last
-        case state
-        when :in_unquoted_symbol
-          unless IGNORE_TOKENS.include?(t.event)
-            opens.pop
-            skip = true
-          end
-        when :in_lambda_head
-          opens.pop if t.event == :on_tlambeg || (t.event == :on_kw && t.tok == 'do')
-        when :in_method_head
-          unless IGNORE_TOKENS.include?(t.event)
-            next_args = []
-            body = nil
-            if args.include?(:receiver)
-              case t.event
-              when :on_lparen, :on_ivar, :on_gvar, :on_cvar
-                # def (receiver). | def @ivar. | def $gvar. | def @@cvar.
-                next_args << :dot
-              when :on_kw
-                case t.tok
-                when 'self', 'true', 'false', 'nil'
-                  # def self(arg) | def self.
-                  next_args.push(:arg, :dot)
-                else
-                  # def if(arg)
-                  skip = true
-                  next_args << :arg
-                end
-              when :on_op, :on_backtick
-                # def +(arg)
-                skip = true
-                next_args << :arg
-              when :on_ident, :on_const
-                # def a(arg) | def a.
-                next_args.push(:arg, :dot)
-              end
-            end
-            if args.include?(:dot)
-              # def receiver.name
-              next_args << :name if t.event == :on_period || (t.event == :on_op && t.tok == '::')
-            end
-            if args.include?(:name)
-              if %i[on_ident on_const on_op on_kw on_backtick].include?(t.event)
-                # def name(arg) | def receiver.name(arg)
-                next_args << :arg
-                skip = true
-              end
-            end
-            if args.include?(:arg)
-              case t.event
-              when :on_nl, :on_semicolon
-                # def recever.f;
-                body = :normal
-              when :on_lparen
-                # def recever.f()
-                next_args << :eq
-              else
-                if t.event == :on_op && t.tok == '='
-                  # def receiver.f =
-                  body = :oneliner
-                else
-                  # def recever.f arg
-                  next_args << :arg_without_paren
-                end
-              end
-            end
-            if args.include?(:eq)
-              if t.event == :on_op && t.tok == '='
-                body = :oneliner
-              else
-                body = :normal
-              end
-            end
-            if args.include?(:arg_without_paren)
-              if %i[on_semicolon on_nl].include?(t.event)
-                # def f a;
-                body = :normal
-              else
-                # def f a, b
-                next_args << :arg_without_paren
-              end
-            end
-            if body == :oneliner
-              opens.pop
-            elsif body
-              opens[-1] = [last_tok, nil]
-            else
-              opens[-1] = [last_tok, :in_method_head, next_args]
-            end
-          end
-        when :in_for_while_until_condition
-          if t.event == :on_semicolon || t.event == :on_nl || (t.event == :on_kw && t.tok == 'do')
-            skip = true if t.event == :on_kw && t.tok == 'do'
-            opens[-1] = [last_tok, nil]
-          end
-        end
-
-        unless skip
-          case t.event
-          when :on_kw
-            case t.tok
-            when 'begin', 'class', 'module', 'do', 'case'
-              opens << [t, nil]
-            when 'end'
-              opens.pop
-            when 'def'
-              opens << [t, :in_method_head, [:receiver, :name]]
-            when 'if', 'unless'
-              unless t.state.allbits?(Ripper::EXPR_LABEL)
-                opens << [t, nil]
-              end
-            when 'while', 'until'
-              unless t.state.allbits?(Ripper::EXPR_LABEL)
-                opens << [t, :in_for_while_until_condition]
-              end
-            when 'ensure', 'rescue'
-              unless t.state.allbits?(Ripper::EXPR_LABEL)
-                opens.pop
-                opens << [t, nil]
-              end
-            when 'elsif', 'else', 'when'
-              opens.pop
-              opens << [t, nil]
-            when 'for'
-              opens << [t, :in_for_while_until_condition]
-            when 'in'
-              if last_tok&.event == :on_kw && %w[case in].include?(last_tok.tok) && first_token_on_line
-                opens.pop
-                opens << [t, nil]
-              end
-            end
-          when :on_tlambda
-            opens << [t, :in_lambda_head]
-          when :on_lparen, :on_lbracket, :on_lbrace, :on_tlambeg, :on_embexpr_beg, :on_embdoc_beg
-            opens << [t, nil]
-          when :on_rparen, :on_rbracket, :on_rbrace, :on_embexpr_end, :on_embdoc_end
-            opens.pop
-          when :on_heredoc_beg
-            pending_heredocs << t
-          when :on_heredoc_end
-            opens.pop
-          when :on_backtick
-            opens << [t, nil] if t.state.allbits?(Ripper::EXPR_BEG)
-          when :on_tstring_beg, :on_words_beg, :on_qwords_beg, :on_symbols_beg, :on_qsymbols_beg, :on_regexp_beg
-            opens << [t, nil]
-          when :on_tstring_end, :on_regexp_end, :on_label_end
-            opens.pop
-          when :on_symbeg
-            if t.tok == ':'
-              opens << [t, :in_unquoted_symbol]
-            else
-              opens << [t, nil]
-            end
-          end
-        end
-        if t.event == :on_nl || t.event == :on_semicolon
-          first_token_on_line = true
-        elsif t.event != :on_sp
-          first_token_on_line = false
-        end
-        if pending_heredocs.any? && t.tok.include?("\n")
-          pending_heredocs.reverse_each { |t| opens << [t, nil] }
-          pending_heredocs = []
-        end
-        yield t, opens if block_given?
-      end
-      opens.map(&:first) + pending_heredocs.reverse
-    end
-
-    def self.open_tokens(tokens)
-      # scan_opens without block will return a list of open tokens at last token position
-      scan_opens(tokens)
-    end
-
-    # Calculates token information [line_tokens, prev_opens, next_opens, min_depth] for each line.
-    # Example code
-    #   ["hello
-    #   world"+(
-    # First line
-    #   line_tokens: [[lbracket, '['], [tstring_beg, '"'], [tstring_content("hello\nworld"), "hello\n"]]
-    #   prev_opens:  []
-    #   next_tokens: [lbracket, tstring_beg]
-    #   min_depth:   0 (minimum at beginning of line)
-    # Second line
-    #   line_tokens: [[tstring_content("hello\nworld"), "world"], [tstring_end, '"'], [op, '+'], [lparen, '(']]
-    #   prev_opens:  [lbracket, tstring_beg]
-    #   next_tokens: [lbracket, lparen]
-    #   min_depth:   1 (minimum just after tstring_end)
-    def self.parse_by_line(tokens)
-      line_tokens = []
-      prev_opens = []
-      min_depth = 0
-      output = []
-      last_opens = scan_opens(tokens) do |t, opens|
-        depth = t == opens.last&.first ? opens.size - 1 : opens.size
-        min_depth = depth if depth < min_depth
-        if t.tok.include?("\n")
-          t.tok.each_line do |line|
-            line_tokens << [t, line]
-            next if line[-1] != "\n"
-            next_opens = opens.map(&:first)
-            output << [line_tokens, prev_opens, next_opens, min_depth]
-            prev_opens = next_opens
-            min_depth = prev_opens.size
-            line_tokens = []
-          end
-        else
-          line_tokens << [t, t.tok]
-        end
-      end
-      output << [line_tokens, prev_opens, last_opens, min_depth] if line_tokens.any?
-      output
-    end
-  end
-end
diff --git a/lib/irb/notifier.rb b/lib/irb/notifier.rb
deleted file mode 100644
index 612de3df168084..00000000000000
--- a/lib/irb/notifier.rb
+++ /dev/null
@@ -1,230 +0,0 @@
-# frozen_string_literal: false
-#
-#   notifier.rb - output methods used by irb
-#   	by Keiju ISHITSUKA(keiju@ruby-lang.org)
-#
-
-require_relative "output-method"
-
-module IRB
-  # An output formatter used internally by the lexer.
-  module Notifier
-    class ErrUndefinedNotifier < StandardError
-      def initialize(val)
-        super("undefined notifier level: #{val} is specified")
-      end
-    end
-    class ErrUnrecognizedLevel < StandardError
-      def initialize(val)
-        super("unrecognized notifier level: #{val} is specified")
-      end
-    end
-
-    # Define a new Notifier output source, returning a new CompositeNotifier
-    # with the given +prefix+ and +output_method+.
-    #
-    # The optional +prefix+ will be appended to all objects being inspected
-    # during output, using the given +output_method+ as the output source. If
-    # no +output_method+ is given, StdioOutputMethod will be used, and all
-    # expressions will be sent directly to STDOUT without any additional
-    # formatting.
-    def def_notifier(prefix = "", output_method = StdioOutputMethod.new)
-      CompositeNotifier.new(prefix, output_method)
-    end
-    module_function :def_notifier
-
-    # An abstract class, or superclass, for CompositeNotifier and
-    # LeveledNotifier to inherit. It provides several wrapper methods for the
-    # OutputMethod object used by the Notifier.
-    class AbstractNotifier
-      # Creates a new Notifier object
-      def initialize(prefix, base_notifier)
-        @prefix = prefix
-        @base_notifier = base_notifier
-      end
-
-      # The +prefix+ for this Notifier, which is appended to all objects being
-      # inspected during output.
-      attr_reader :prefix
-
-      # A wrapper method used to determine whether notifications are enabled.
-      #
-      # Defaults to +true+.
-      def notify?
-        true
-      end
-
-      # See OutputMethod#print for more detail.
-      def print(*opts)
-        @base_notifier.print prefix, *opts if notify?
-      end
-
-      # See OutputMethod#printn for more detail.
-      def printn(*opts)
-        @base_notifier.printn prefix, *opts if notify?
-      end
-
-      # See OutputMethod#printf for more detail.
-      def printf(format, *opts)
-        @base_notifier.printf(prefix + format, *opts) if notify?
-      end
-
-      # See OutputMethod#puts for more detail.
-      def puts(*objs)
-        if notify?
-          @base_notifier.puts(*objs.collect{|obj| prefix + obj.to_s})
-        end
-      end
-
-      # Same as #ppx, except it uses the #prefix given during object
-      # initialization.
-      # See OutputMethod#ppx for more detail.
-      def pp(*objs)
-        if notify?
-          @base_notifier.ppx @prefix, *objs
-        end
-      end
-
-      # Same as #pp, except it concatenates the given +prefix+ with the #prefix
-      # given during object initialization.
-      #
-      # See OutputMethod#ppx for more detail.
-      def ppx(prefix, *objs)
-        if notify?
-          @base_notifier.ppx @prefix+prefix, *objs
-        end
-      end
-
-      # Execute the given block if notifications are enabled.
-      def exec_if
-        yield(@base_notifier) if notify?
-      end
-    end
-
-    # A class that can be used to create a group of notifier objects with the
-    # intent of representing a leveled notification system for irb.
-    #
-    # This class will allow you to generate other notifiers, and assign them
-    # the appropriate level for output.
-    #
-    # The Notifier class provides a class-method Notifier.def_notifier to
-    # create a new composite notifier. Using the first composite notifier
-    # object you create, sibling notifiers can be initialized with
-    # #def_notifier.
-    class CompositeNotifier < AbstractNotifier
-      # Create a new composite notifier object with the given +prefix+, and
-      # +base_notifier+ to use for output.
-      def initialize(prefix, base_notifier)
-        super
-
-        @notifiers = [D_NOMSG]
-        @level_notifier = D_NOMSG
-      end
-
-      # List of notifiers in the group
-      attr_reader :notifiers
-
-      # Creates a new LeveledNotifier in the composite #notifiers group.
-      #
-      # The given +prefix+ will be assigned to the notifier, and +level+ will
-      # be used as the index of the #notifiers Array.
-      #
-      # This method returns the newly created instance.
-      def def_notifier(level, prefix = "")
-        notifier = LeveledNotifier.new(self, level, prefix)
-        @notifiers[level] = notifier
-        notifier
-      end
-
-      # Returns the leveled notifier for this object
-      attr_reader :level_notifier
-      alias level level_notifier
-
-      # Sets the leveled notifier for this object.
-      #
-      # When the given +value+ is an instance of AbstractNotifier,
-      # #level_notifier is set to the given object.
-      #
-      # When an Integer is given, #level_notifier is set to the notifier at the
-      # index +value+ in the #notifiers Array.
-      #
-      # If no notifier exists at the index +value+ in the #notifiers Array, an
-      # ErrUndefinedNotifier exception is raised.
-      #
-      # An ErrUnrecognizedLevel exception is raised if the given +value+ is not
-      # found in the existing #notifiers Array, or an instance of
-      # AbstractNotifier
-      def level_notifier=(value)
-        case value
-        when AbstractNotifier
-          @level_notifier = value
-        when Integer
-          l = @notifiers[value]
-          raise ErrUndefinedNotifier, value unless l
-          @level_notifier = l
-        else
-          raise ErrUnrecognizedLevel, value unless l
-        end
-      end
-
-      alias level= level_notifier=
-    end
-
-    # A leveled notifier is comparable to the composite group from
-    # CompositeNotifier#notifiers.
-    class LeveledNotifier < AbstractNotifier
-      include Comparable
-
-      # Create a new leveled notifier with the given +base+, and +prefix+ to
-      # send to AbstractNotifier.new
-      #
-      # The given +level+ is used to compare other leveled notifiers in the
-      # CompositeNotifier group to determine whether or not to output
-      # notifications.
-      def initialize(base, level, prefix)
-        super(prefix, base)
-
-        @level = level
-      end
-
-      # The current level of this notifier object
-      attr_reader :level
-
-      # Compares the level of this notifier object with the given +other+
-      # notifier.
-      #
-      # See the Comparable module for more information.
-      def <=>(other)
-        @level <=> other.level
-      end
-
-      # Whether to output messages to the output method, depending on the level
-      # of this notifier object.
-      def notify?
-        @base_notifier.level >= self
-      end
-    end
-
-    # NoMsgNotifier is a LeveledNotifier that's used as the default notifier
-    # when creating a new CompositeNotifier.
-    #
-    # This notifier is used as the +zero+ index, or level +0+, for
-    # CompositeNotifier#notifiers, and will not output messages of any sort.
-    class NoMsgNotifier < LeveledNotifier
-      # Creates a new notifier that should not be used to output messages.
-      def initialize
-        @base_notifier = nil
-        @level = 0
-        @prefix = ""
-      end
-
-      # Ensures notifications are ignored, see AbstractNotifier#notify? for
-      # more information.
-      def notify?
-        false
-      end
-    end
-
-    D_NOMSG = NoMsgNotifier.new # :nodoc:
-  end
-end
diff --git a/lib/irb/output-method.rb b/lib/irb/output-method.rb
deleted file mode 100644
index f5ea57111d8dde..00000000000000
--- a/lib/irb/output-method.rb
+++ /dev/null
@@ -1,86 +0,0 @@
-# frozen_string_literal: false
-#
-#   output-method.rb - output methods used by irb
-#   	by Keiju ISHITSUKA(keiju@ruby-lang.org)
-#
-
-module IRB
-  # An abstract output class for IO in irb. This is mainly used internally by
-  # IRB::Notifier. You can define your own output method to use with Irb.new,
-  # or Context.new
-  class OutputMethod
-    class NotImplementedError < StandardError
-      def initialize(val)
-        super("Need to define `#{val}'")
-      end
-    end
-
-    # Open this method to implement your own output method, raises a
-    # NotImplementedError if you don't define #print in your own class.
-    def print(*opts)
-      raise NotImplementedError, "print"
-    end
-
-    # Prints the given +opts+, with a newline delimiter.
-    def printn(*opts)
-      print opts.join(" "), "\n"
-    end
-
-    # Extends IO#printf to format the given +opts+ for Kernel#sprintf using
-    # #parse_printf_format
-    def printf(format, *opts)
-      if /(%*)%I/ =~ format
-        format, opts = parse_printf_format(format, opts)
-      end
-      print sprintf(format, *opts)
-    end
-
-    # Returns an array of the given +format+ and +opts+ to be used by
-    # Kernel#sprintf, if there was a successful Regexp match in the given
-    # +format+ from #printf
-    #
-    #     %
-    #     <flag>  [#0- +]
-    #     <minimum field width> (\*|\*[1-9][0-9]*\$|[1-9][0-9]*)
-    #     <precision>.(\*|\*[1-9][0-9]*\$|[1-9][0-9]*|)?
-    #     #<length modifier>(hh|h|l|ll|L|q|j|z|t)
-    #     <conversion specifier>[diouxXeEfgGcsb%]
-    def parse_printf_format(format, opts)
-      return format, opts if $1.size % 2 == 1
-    end
-
-    # Calls #print on each element in the given +objs+, followed by a newline
-    # character.
-    def puts(*objs)
-      for obj in objs
-        print(*obj)
-        print "\n"
-      end
-    end
-
-    # Prints the given +objs+ calling Object#inspect on each.
-    #
-    # See #puts for more detail.
-    def pp(*objs)
-      puts(*objs.collect{|obj| obj.inspect})
-    end
-
-    # Prints the given +objs+ calling Object#inspect on each and appending the
-    # given +prefix+.
-    #
-    # See #puts for more detail.
-    def ppx(prefix, *objs)
-      puts(*objs.collect{|obj| prefix+obj.inspect})
-    end
-
-  end
-
-  # A standard output printer
-  class StdioOutputMethod < OutputMethod
-    # Prints the given +opts+ to standard output, see IO#print for more
-    # information.
-    def print(*opts)
-      STDOUT.print(*opts)
-    end
-  end
-end
diff --git a/lib/irb/pager.rb b/lib/irb/pager.rb
deleted file mode 100644
index 1194e41f6f345f..00000000000000
--- a/lib/irb/pager.rb
+++ /dev/null
@@ -1,86 +0,0 @@
-# frozen_string_literal: true
-
-module IRB
-  # The implementation of this class is borrowed from RDoc's lib/rdoc/ri/driver.rb.
-  # Please do NOT use this class directly outside of IRB.
-  class Pager
-    PAGE_COMMANDS = [ENV['RI_PAGER'], ENV['PAGER'], 'less', 'more'].compact.uniq
-
-    class << self
-      def page_content(content)
-        if content_exceeds_screen_height?(content)
-          page do |io|
-            io.puts content
-          end
-        else
-          $stdout.puts content
-        end
-      end
-
-      def page
-        if STDIN.tty? && pager = setup_pager
-          begin
-            pid = pager.pid
-            yield pager
-          ensure
-            pager.close
-          end
-        else
-          yield $stdout
-        end
-      # When user presses Ctrl-C, IRB would raise `IRB::Abort`
-      # But since Pager is implemented by running paging commands like `less` in another process with `IO.popen`,
-      # the `IRB::Abort` exception only interrupts IRB's execution but doesn't affect the pager
-      # So to properly terminate the pager with Ctrl-C, we need to catch `IRB::Abort` and kill the pager process
-      rescue IRB::Abort
-        Process.kill("TERM", pid) if pid
-        nil
-      rescue Errno::EPIPE
-      end
-
-      private
-
-      def content_exceeds_screen_height?(content)
-        screen_height, screen_width = begin
-          Reline.get_screen_size
-        rescue Errno::EINVAL
-          [24, 80]
-        end
-
-        pageable_height = screen_height - 3 # leave some space for previous and the current prompt
-
-        # If the content has more lines than the pageable height
-        content.lines.count > pageable_height ||
-          # Or if the content is a few long lines
-          pageable_height * screen_width < Reline::Unicode.calculate_width(content, true)
-      end
-
-      def setup_pager
-        require 'shellwords'
-
-        PAGE_COMMANDS.each do |pager|
-          pager = Shellwords.split(pager)
-          next if pager.empty?
-
-          if pager.first == 'less' || pager.first == 'more'
-            pager << '-R' unless pager.include?('-R')
-          end
-
-          begin
-            io = IO.popen(pager, 'w')
-          rescue
-            next
-          end
-
-          if $? && $?.pid == io.pid && $?.exited? # pager didn't work
-            next
-          end
-
-          return io
-        end
-
-        nil
-      end
-    end
-  end
-end
diff --git a/lib/irb/ruby-lex.rb b/lib/irb/ruby-lex.rb
deleted file mode 100644
index 502883bd43ca62..00000000000000
--- a/lib/irb/ruby-lex.rb
+++ /dev/null
@@ -1,501 +0,0 @@
-# frozen_string_literal: false
-#
-#   irb/ruby-lex.rb - ruby lexcal analyzer
-#   	by Keiju ISHITSUKA(keiju@ruby-lang.org)
-#
-
-require "ripper"
-require "jruby" if RUBY_ENGINE == "jruby"
-require_relative "nesting_parser"
-
-module IRB
-  # :stopdoc:
-  class RubyLex
-    ASSIGNMENT_NODE_TYPES = [
-      # Local, instance, global, class, constant, instance, and index assignment:
-      #   "foo = bar",
-      #   "@foo = bar",
-      #   "$foo = bar",
-      #   "@@foo = bar",
-      #   "::Foo = bar",
-      #   "a::Foo = bar",
-      #   "Foo = bar"
-      #   "foo.bar = 1"
-      #   "foo[1] = bar"
-      :assign,
-
-      # Operation assignment:
-      #   "foo += bar"
-      #   "foo -= bar"
-      #   "foo ||= bar"
-      #   "foo &&= bar"
-      :opassign,
-
-      # Multiple assignment:
-      #   "foo, bar = 1, 2
-      :massign,
-    ]
-
-    class TerminateLineInput < StandardError
-      def initialize
-        super("Terminate Line Input")
-      end
-    end
-
-    attr_reader :line_no
-
-    def initialize(context)
-      @context = context
-      @line_no = 1
-      @prompt = nil
-    end
-
-    def self.compile_with_errors_suppressed(code, line_no: 1)
-      begin
-        result = yield code, line_no
-      rescue ArgumentError
-        # Ruby can issue an error for the code if there is an
-        # incomplete magic comment for encoding in it. Force an
-        # expression with a new line before the code in this
-        # case to prevent magic comment handling.  To make sure
-        # line numbers in the lexed code remain the same,
-        # decrease the line number by one.
-        code = ";\n#{code}"
-        line_no -= 1
-        result = yield code, line_no
-      end
-      result
-    end
-
-    def set_prompt(&block)
-      @prompt = block
-    end
-
-    ERROR_TOKENS = [
-      :on_parse_error,
-      :compile_error,
-      :on_assign_error,
-      :on_alias_error,
-      :on_class_name_error,
-      :on_param_error
-    ]
-
-    def self.generate_local_variables_assign_code(local_variables)
-      "#{local_variables.join('=')}=nil;" unless local_variables.empty?
-    end
-
-    # Some part of the code is not included in Ripper's token.
-    # Example: DATA part, token after heredoc_beg when heredoc has unclosed embexpr.
-    # With interpolated tokens, tokens.map(&:tok).join will be equal to code.
-    def self.interpolate_ripper_ignored_tokens(code, tokens)
-      line_positions = [0]
-      code.lines.each do |line|
-        line_positions << line_positions.last + line.bytesize
-      end
-      prev_byte_pos = 0
-      interpolated = []
-      prev_line = 1
-      tokens.each do |t|
-        line, col = t.pos
-        byte_pos = line_positions[line - 1] + col
-        if prev_byte_pos < byte_pos
-          tok = code.byteslice(prev_byte_pos...byte_pos)
-          pos = [prev_line, prev_byte_pos - line_positions[prev_line - 1]]
-          interpolated << Ripper::Lexer::Elem.new(pos, :on_ignored_by_ripper, tok, 0)
-          prev_line += tok.count("\n")
-        end
-        interpolated << t
-        prev_byte_pos = byte_pos + t.tok.bytesize
-        prev_line += t.tok.count("\n")
-      end
-      if prev_byte_pos < code.bytesize
-        tok = code.byteslice(prev_byte_pos..)
-        pos = [prev_line, prev_byte_pos - line_positions[prev_line - 1]]
-        interpolated << Ripper::Lexer::Elem.new(pos, :on_ignored_by_ripper, tok, 0)
-      end
-      interpolated
-    end
-
-    def self.ripper_lex_without_warning(code, context: nil)
-      verbose, $VERBOSE = $VERBOSE, nil
-      lvars_code = generate_local_variables_assign_code(context&.local_variables || [])
-      original_code = code
-      if lvars_code
-        code = "#{lvars_code}\n#{code}"
-        line_no = 0
-      else
-        line_no = 1
-      end
-
-      compile_with_errors_suppressed(code, line_no: line_no) do |inner_code, line_no|
-        lexer = Ripper::Lexer.new(inner_code, '-', line_no)
-        tokens = []
-        lexer.scan.each do |t|
-          next if t.pos.first == 0
-          prev_tk = tokens.last
-          position_overlapped = prev_tk && t.pos[0] == prev_tk.pos[0] && t.pos[1] < prev_tk.pos[1] + prev_tk.tok.bytesize
-          if position_overlapped
-            tokens[-1] = t if ERROR_TOKENS.include?(prev_tk.event) && !ERROR_TOKENS.include?(t.event)
-          else
-            tokens << t
-          end
-        end
-        interpolate_ripper_ignored_tokens(original_code, tokens)
-      end
-    ensure
-      $VERBOSE = verbose
-    end
-
-    def prompt(opens, continue, line_num_offset)
-      ltype = ltype_from_open_tokens(opens)
-      indent_level = calc_indent_level(opens)
-      @prompt&.call(ltype, indent_level, opens.any? || continue, @line_no + line_num_offset)
-    end
-
-    def check_code_state(code)
-      tokens = self.class.ripper_lex_without_warning(code, context: @context)
-      opens = NestingParser.open_tokens(tokens)
-      [tokens, opens, code_terminated?(code, tokens, opens)]
-    end
-
-    def code_terminated?(code, tokens, opens)
-      case check_code_syntax(code)
-      when :unrecoverable_error
-        true
-      when :recoverable_error
-        false
-      when :other_error
-        opens.empty? && !should_continue?(tokens)
-      when :valid
-        !should_continue?(tokens)
-      end
-    end
-
-    def save_prompt_to_context_io(opens, continue, line_num_offset)
-      # Implicitly saves prompt string to `@context.io.prompt`. This will be used in the next `@input.call`.
-      prompt(opens, continue, line_num_offset)
-    end
-
-    def increase_line_no(addition)
-      @line_no += addition
-    end
-
-    def assignment_expression?(code)
-      # Try to parse the code and check if the last of possibly multiple
-      # expressions is an assignment type.
-
-      # If the expression is invalid, Ripper.sexp should return nil which will
-      # result in false being returned. Any valid expression should return an
-      # s-expression where the second element of the top level array is an
-      # array of parsed expressions. The first element of each expression is the
-      # expression's type.
-      verbose, $VERBOSE = $VERBOSE, nil
-      code = "#{RubyLex.generate_local_variables_assign_code(@context.local_variables) || 'nil;'}\n#{code}"
-      # Get the last node_type of the line. drop(1) is to ignore the local_variables_assign_code part.
-      node_type = Ripper.sexp(code)&.dig(1)&.drop(1)&.dig(-1, 0)
-      ASSIGNMENT_NODE_TYPES.include?(node_type)
-    ensure
-      $VERBOSE = verbose
-    end
-
-    def should_continue?(tokens)
-      # Look at the last token and check if IRB need to continue reading next line.
-      # Example code that should continue: `a\` `a +` `a.`
-      # Trailing spaces, newline, comments are skipped
-      return true if tokens.last&.event == :on_sp && tokens.last.tok == "\\\n"
-
-      tokens.reverse_each do |token|
-        case token.event
-        when :on_sp, :on_nl, :on_ignored_nl, :on_comment, :on_embdoc_beg, :on_embdoc, :on_embdoc_end
-          # Skip
-        when :on_regexp_end, :on_heredoc_end, :on_semicolon
-          # State is EXPR_BEG but should not continue
-          return false
-        else
-          # Endless range should not continue
-          return false if token.event == :on_op && token.tok.match?(/\A\.\.\.?\z/)
-
-          # EXPR_DOT and most of the EXPR_BEG should continue
-          return token.state.anybits?(Ripper::EXPR_BEG | Ripper::EXPR_DOT)
-        end
-      end
-      false
-    end
-
-    def check_code_syntax(code)
-      lvars_code = RubyLex.generate_local_variables_assign_code(@context.local_variables)
-      code = "#{lvars_code}\n#{code}"
-
-      begin # check if parser error are available
-        verbose, $VERBOSE = $VERBOSE, nil
-        case RUBY_ENGINE
-        when 'ruby'
-          self.class.compile_with_errors_suppressed(code) do |inner_code, line_no|
-            RubyVM::InstructionSequence.compile(inner_code, nil, nil, line_no)
-          end
-        when 'jruby'
-          JRuby.compile_ir(code)
-        else
-          catch(:valid) do
-            eval("BEGIN { throw :valid, true }\n#{code}")
-            false
-          end
-        end
-      rescue EncodingError
-        # This is for a hash with invalid encoding symbol, {"\xAE": 1}
-        :unrecoverable_error
-      rescue SyntaxError => e
-        case e.message
-        when /unterminated (?:string|regexp) meets end of file/
-          # "unterminated regexp meets end of file"
-          #
-          #   example:
-          #     /
-          #
-          # "unterminated string meets end of file"
-          #
-          #   example:
-          #     '
-          return :recoverable_error
-        when /syntax error, unexpected end-of-input/
-          # "syntax error, unexpected end-of-input, expecting keyword_end"
-          #
-          #   example:
-          #     if true
-          #       hoge
-          #       if false
-          #         fuga
-          #       end
-          return :recoverable_error
-        when /syntax error, unexpected keyword_end/
-          # "syntax error, unexpected keyword_end"
-          #
-          #   example:
-          #     if (
-          #     end
-          #
-          #   example:
-          #     end
-          return :unrecoverable_error
-        when /syntax error, unexpected '\.'/
-          # "syntax error, unexpected '.'"
-          #
-          #   example:
-          #     .
-          return :unrecoverable_error
-        when /unexpected tREGEXP_BEG/
-          # "syntax error, unexpected tREGEXP_BEG, expecting keyword_do or '{' or '('"
-          #
-          #   example:
-          #     method / f /
-          return :unrecoverable_error
-        else
-          return :other_error
-        end
-      ensure
-        $VERBOSE = verbose
-      end
-      :valid
-    end
-
-    def calc_indent_level(opens)
-      indent_level = 0
-      opens.each_with_index do |t, index|
-        case t.event
-        when :on_heredoc_beg
-          if opens[index + 1]&.event != :on_heredoc_beg
-            if t.tok.match?(/^<<[~-]/)
-              indent_level += 1
-            else
-              indent_level = 0
-            end
-          end
-        when :on_tstring_beg, :on_regexp_beg, :on_symbeg, :on_backtick
-          # No indent: "", //, :"", ``
-          # Indent: %(), %r(), %i(), %x()
-          indent_level += 1 if t.tok.start_with? '%'
-        when :on_embdoc_beg
-          indent_level = 0
-        else
-          indent_level += 1
-        end
-      end
-      indent_level
-    end
-
-    FREE_INDENT_TOKENS = %i[on_tstring_beg on_backtick on_regexp_beg on_symbeg]
-
-    def free_indent_token?(token)
-      FREE_INDENT_TOKENS.include?(token&.event)
-    end
-
-    # Calculates the difference of pasted code's indent and indent calculated from tokens
-    def indent_difference(lines, line_results, line_index)
-      loop do
-        _tokens, prev_opens, _next_opens, min_depth = line_results[line_index]
-        open_token = prev_opens.last
-        if !open_token || (open_token.event != :on_heredoc_beg && !free_indent_token?(open_token))
-          # If the leading whitespace is an indent, return the difference
-          indent_level = calc_indent_level(prev_opens.take(min_depth))
-          calculated_indent = 2 * indent_level
-          actual_indent = lines[line_index][/^ */].size
-          return actual_indent - calculated_indent
-        elsif open_token.event == :on_heredoc_beg && open_token.tok.match?(/^<<[^-~]/)
-          return 0
-        end
-        # If the leading whitespace is not an indent but part of a multiline token
-        # Calculate base_indent of the multiline token's beginning line
-        line_index = open_token.pos[0] - 1
-      end
-    end
-
-    def process_indent_level(tokens, lines, line_index, is_newline)
-      line_results = NestingParser.parse_by_line(tokens)
-      result = line_results[line_index]
-      if result
-        _tokens, prev_opens, next_opens, min_depth = result
-      else
-        # When last line is empty
-        prev_opens = next_opens = line_results.last[2]
-        min_depth = next_opens.size
-      end
-
-      # To correctly indent line like `end.map do`, we use shortest open tokens on each line for indent calculation.
-      # Shortest open tokens can be calculated by `opens.take(min_depth)`
-      indent = 2 * calc_indent_level(prev_opens.take(min_depth))
-
-      preserve_indent = lines[line_index - (is_newline ? 1 : 0)][/^ */].size
-
-      prev_open_token = prev_opens.last
-      next_open_token = next_opens.last
-
-      # Calculates base indent for pasted code on the line where prev_open_token is located
-      # irb(main):001:1*   if a # base_indent is 2, indent calculated from tokens is 0
-      # irb(main):002:1*         if b # base_indent is 6, indent calculated from tokens is 2
-      # irb(main):003:0>           c # base_indent is 6, indent calculated from tokens is 4
-      if prev_open_token
-        base_indent = [0, indent_difference(lines, line_results, prev_open_token.pos[0] - 1)].max
-      else
-        base_indent = 0
-      end
-
-      if free_indent_token?(prev_open_token)
-        if is_newline && prev_open_token.pos[0] == line_index
-          # First newline inside free-indent token
-          base_indent + indent
-        else
-          # Accept any number of indent inside free-indent token
-          preserve_indent
-        end
-      elsif prev_open_token&.event == :on_embdoc_beg || next_open_token&.event == :on_embdoc_beg
-        if prev_open_token&.event == next_open_token&.event
-          # Accept any number of indent inside embdoc content
-          preserve_indent
-        else
-          # =begin or =end
-          0
-        end
-      elsif prev_open_token&.event == :on_heredoc_beg
-        tok = prev_open_token.tok
-        if prev_opens.size <= next_opens.size
-          if is_newline && lines[line_index].empty? && line_results[line_index - 1][1].last != next_open_token
-            # First line in heredoc
-            tok.match?(/^<<[-~]/) ? base_indent + indent : indent
-          elsif tok.match?(/^<<~/)
-            # Accept extra indent spaces inside `<<~` heredoc
-            [base_indent + indent, preserve_indent].max
-          else
-            # Accept any number of indent inside other heredoc
-            preserve_indent
-          end
-        else
-          # Heredoc close
-          prev_line_indent_level = calc_indent_level(prev_opens)
-          tok.match?(/^<<[~-]/) ? base_indent + 2 * (prev_line_indent_level - 1) : 0
-        end
-      else
-        base_indent + indent
-      end
-    end
-
-    LTYPE_TOKENS = %i[
-      on_heredoc_beg on_tstring_beg
-      on_regexp_beg on_symbeg on_backtick
-      on_symbols_beg on_qsymbols_beg
-      on_words_beg on_qwords_beg
-    ]
-
-    def ltype_from_open_tokens(opens)
-      start_token = opens.reverse_each.find do |tok|
-        LTYPE_TOKENS.include?(tok.event)
-      end
-      return nil unless start_token
-
-      case start_token&.event
-      when :on_tstring_beg
-        case start_token&.tok
-        when ?"      then ?"
-        when /^%.$/  then ?"
-        when /^%Q.$/ then ?"
-        when ?'      then ?'
-        when /^%q.$/ then ?'
-        end
-      when :on_regexp_beg   then ?/
-      when :on_symbeg       then ?:
-      when :on_backtick     then ?`
-      when :on_qwords_beg   then ?]
-      when :on_words_beg    then ?]
-      when :on_qsymbols_beg then ?]
-      when :on_symbols_beg  then ?]
-      when :on_heredoc_beg
-        start_token&.tok =~ /<<[-~]?(['"`])\w+\1/
-        $1 || ?"
-      else
-        nil
-      end
-    end
-
-    def check_termination_in_prev_line(code)
-      tokens = self.class.ripper_lex_without_warning(code, context: @context)
-      past_first_newline = false
-      index = tokens.rindex do |t|
-        # traverse first token before last line
-        if past_first_newline
-          if t.tok.include?("\n")
-            true
-          end
-        elsif t.tok.include?("\n")
-          past_first_newline = true
-          false
-        else
-          false
-        end
-      end
-
-      if index
-        first_token = nil
-        last_line_tokens = tokens[(index + 1)..(tokens.size - 1)]
-        last_line_tokens.each do |t|
-          unless [:on_sp, :on_ignored_sp, :on_comment].include?(t.event)
-            first_token = t
-            break
-          end
-        end
-
-        if first_token && first_token.state != Ripper::EXPR_DOT
-          tokens_without_last_line = tokens[0..index]
-          code_without_last_line = tokens_without_last_line.map(&:tok).join
-          opens_without_last_line = NestingParser.open_tokens(tokens_without_last_line)
-          if code_terminated?(code_without_last_line, tokens_without_last_line, opens_without_last_line)
-            return last_line_tokens.map(&:tok).join
-          end
-        end
-      end
-      false
-    end
-  end
-  # :startdoc:
-end
-
-RubyLex = IRB::RubyLex
-Object.deprecate_constant(:RubyLex)
diff --git a/lib/irb/ruby_logo.aa b/lib/irb/ruby_logo.aa
deleted file mode 100644
index a34a3e2f2892d4..00000000000000
--- a/lib/irb/ruby_logo.aa
+++ /dev/null
@@ -1,37 +0,0 @@
-
-                                             -+smJYYN?mm-
-                                   HB"BBYT            TQg  NggT
-                              9Q+g       Nm,T      8g          NJW
-                          YS+              N2NJ"Sg               N?
-                       BQg                  #(  gT Nggggk          J
-                     5j                     NJ    NJ            NNge
-                  #Q                        #JJ     NgT            N(
-                @j                          bj         mT           J
-              Bj                           @/d           NJ         (
-            #q                            #((              NgT     #J
-           5d                            #(t                  mT   $d
-         #q                             @(@J                    NJB;
-        @(                             5d ? HHH H HQmgggggggmN    qD
-       5d                            #uN  2QdH                   E O
-      5                             5JSd  Nd  NJH               @d j
-     Fd                           @J4d     s     NQH           #d  (
-    #(                          #o6d       Nd       NgH       #d  #d
-    4                         B&Od          v          NgT   #d   F
-   #(                       9JGd            NH            NgUd    F
-   #d                    #GJQ                d             NP     $
-   #J                 #U+#Q                  N            Q #     j
-  j /W             BQ+ BQ                     d             NJ   NJ
-  - NjJH      HBIjTQggPJQgW                   N        W     k   #J
- #J  b  HYWgggN       j s    Nag               d     NN      b   #d
- #J  5-              D   s         Ngg         N    d        Nd  F
- Fd BKH2            #+    s             NNgg    J Q           J  ]
- F H @  J           N      y                   K(d            P  I
- F4  E  N?         #d       y                #Q   NJ          E  j
- F   W   Nd        q         m             Bg       NxW       N(H-
- F   d    b       @           m          Hd            gW      vKJ
- NJ  d     K      d            s      Bg                 aT    FDd
-  b #       d    N              m  BQ                      mV  N>
-   e5       Nd  #d              NggggggQWH HHHH              NJ -
-    m7       NW H            N                        HSVO1z=?11-
-      NgTH    bB        kH   WBHWWHBHWmQgg&gggggNNN
-           NNggggggNN
diff --git a/lib/irb/source_finder.rb b/lib/irb/source_finder.rb
deleted file mode 100644
index d196fcddc2a818..00000000000000
--- a/lib/irb/source_finder.rb
+++ /dev/null
@@ -1,64 +0,0 @@
-# frozen_string_literal: true
-
-require_relative "ruby-lex"
-
-module IRB
-  class SourceFinder
-    Source = Struct.new(
-      :file,       # @param [String] - file name
-      :first_line, # @param [String] - first line
-      :last_line,  # @param [String] - last line
-      keyword_init: true,
-    )
-    private_constant :Source
-
-    def initialize(irb_context)
-      @irb_context = irb_context
-    end
-
-    def find_source(signature)
-      context_binding = @irb_context.workspace.binding
-      case signature
-      when /\A[A-Z]\w*(::[A-Z]\w*)*\z/ # Const::Name
-        eval(signature, context_binding) # trigger autoload
-        base = context_binding.receiver.yield_self { |r| r.is_a?(Module) ? r : Object }
-        file, line = base.const_source_location(signature)
-      when /\A(?<owner>[A-Z]\w*(::[A-Z]\w*)*)#(?<method>[^ :.]+)\z/ # Class#method
-        owner = eval(Regexp.last_match[:owner], context_binding)
-        method = Regexp.last_match[:method]
-        if owner.respond_to?(:instance_method)
-          methods = owner.instance_methods + owner.private_instance_methods
-          file, line = owner.instance_method(method).source_location if methods.include?(method.to_sym)
-        end
-      when /\A((?<receiver>.+)(\.|::))?(?<method>[^ :.]+)\z/ # method, receiver.method, receiver::method
-        receiver = eval(Regexp.last_match[:receiver] || 'self', context_binding)
-        method = Regexp.last_match[:method]
-        file, line = receiver.method(method).source_location if receiver.respond_to?(method, true)
-      end
-      if file && line && File.exist?(file)
-        Source.new(file: file, first_line: line, last_line: find_end(file, line))
-      end
-    end
-
-    private
-
-    def find_end(file, first_line)
-      lex = RubyLex.new(@irb_context)
-      lines = File.read(file).lines[(first_line - 1)..-1]
-      tokens = RubyLex.ripper_lex_without_warning(lines.join)
-      prev_tokens = []
-
-      # chunk with line number
-      tokens.chunk { |tok| tok.pos[0] }.each do |lnum, chunk|
-        code = lines[0..lnum].join
-        prev_tokens.concat chunk
-        continue = lex.should_continue?(prev_tokens)
-        syntax = lex.check_code_syntax(code)
-        if !continue && syntax == :valid
-          return first_line + lnum
-        end
-      end
-      first_line
-    end
-  end
-end
diff --git a/lib/irb/statement.rb b/lib/irb/statement.rb
deleted file mode 100644
index b12110600cc728..00000000000000
--- a/lib/irb/statement.rb
+++ /dev/null
@@ -1,80 +0,0 @@
-# frozen_string_literal: true
-
-module IRB
-  class Statement
-    attr_reader :code
-
-    def is_assignment?
-      raise NotImplementedError
-    end
-
-    def suppresses_echo?
-      raise NotImplementedError
-    end
-
-    def should_be_handled_by_debugger?
-      raise NotImplementedError
-    end
-
-    def evaluable_code
-      raise NotImplementedError
-    end
-
-    class Expression < Statement
-      def initialize(code, is_assignment)
-        @code = code
-        @is_assignment = is_assignment
-      end
-
-      def suppresses_echo?
-        @code.match?(/;\s*\z/)
-      end
-
-      def should_be_handled_by_debugger?
-        true
-      end
-
-      def is_assignment?
-        @is_assignment
-      end
-
-      def evaluable_code
-        @code
-      end
-    end
-
-    class Command < Statement
-      def initialize(code, command, arg, command_class)
-        @code = code
-        @command = command
-        @arg = arg
-        @command_class = command_class
-      end
-
-      def is_assignment?
-        false
-      end
-
-      def suppresses_echo?
-        false
-      end
-
-      def should_be_handled_by_debugger?
-        require_relative 'cmd/help'
-        require_relative 'cmd/debug'
-        IRB::ExtendCommand::DebugCommand > @command_class || IRB::ExtendCommand::Help == @command_class
-      end
-
-      def evaluable_code
-        # Hook command-specific transformation to return valid Ruby code
-        if @command_class.respond_to?(:transform_args)
-          arg = @command_class.transform_args(@arg)
-        else
-          arg = @arg
-        end
-
-        [@command, arg].compact.join(' ')
-      end
-    end
-  end
-end
diff --git a/lib/irb/version.rb b/lib/irb/version.rb
deleted file mode 100644
index 6cb2f1965c5112..00000000000000
--- a/lib/irb/version.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-# frozen_string_literal: false
-#
-#   irb/version.rb - irb version definition file
-#   	by Keiju ISHITSUKA(keiju@ishitsuka.com)
-#
-
-module IRB # :nodoc:
-  VERSION = "1.8.1"
-  @RELEASE_VERSION = VERSION
-  @LAST_UPDATE_DATE = "2023-09-04"
-end
diff --git a/lib/irb/workspace.rb b/lib/irb/workspace.rb
deleted file mode 100644
index 2bf3d5e0f11f1a..00000000000000
--- a/lib/irb/workspace.rb
+++ /dev/null
@@ -1,173 +0,0 @@
-# frozen_string_literal: false
-#
-#   irb/workspace-binding.rb -
-#   	by Keiju ISHITSUKA(keiju@ruby-lang.org)
-#
-
-require "delegate"
-
-IRB::TOPLEVEL_BINDING = binding
-module IRB # :nodoc:
-  class WorkSpace
-    # Creates a new workspace.
-    #
-    # set self to main if specified, otherwise
-    # inherit main from TOPLEVEL_BINDING.
-    def initialize(*main)
-      if main[0].kind_of?(Binding)
-        @binding = main.shift
-      elsif IRB.conf[:SINGLE_IRB]
-        @binding = TOPLEVEL_BINDING
-      else
-        case IRB.conf[:CONTEXT_MODE]
-        when 0	# binding in proc on TOPLEVEL_BINDING
-          @binding = eval("proc{binding}.call",
-                          TOPLEVEL_BINDING,
-                          __FILE__,
-                          __LINE__)
-        when 1	# binding in loaded file
-          require "tempfile"
-          f = Tempfile.open("irb-binding")
-          f.print <<EOF
-      $binding = binding
-EOF
-          f.close
-          load f.path
-          @binding = $binding
-
-        when 2	# binding in loaded file(thread use)
-          unless defined? BINDING_QUEUE
-            IRB.const_set(:BINDING_QUEUE, Thread::SizedQueue.new(1))
-            Thread.abort_on_exception = true
-            Thread.start do
-              eval "require \"irb/ws-for-case-2\"", TOPLEVEL_BINDING, __FILE__, __LINE__
-            end
-            Thread.pass
-          end
-          @binding = BINDING_QUEUE.pop
-
-        when 3	# binding in function on TOPLEVEL_BINDING
-          @binding = eval("self.class.remove_method(:irb_binding) if defined?(irb_binding); private; def irb_binding; binding; end; irb_binding",
-                          TOPLEVEL_BINDING,
-                          __FILE__,
-                          __LINE__ - 3)
-        when 4  # binding is a copy of TOPLEVEL_BINDING (default)
-          # Note that this will typically be IRB::TOPLEVEL_BINDING
-          # This is to avoid RubyGems' local variables (see issue #17623)
-          @binding = TOPLEVEL_BINDING.dup
-        end
-      end
-
-      if main.empty?
-        @main = eval("self", @binding)
-      else
-        @main = main[0]
-      end
-      IRB.conf[:__MAIN__] = @main
-
-      unless main.empty?
-        case @main
-        when Module
-          @binding = eval("IRB.conf[:__MAIN__].module_eval('binding', __FILE__, __LINE__)", @binding, __FILE__, __LINE__)
-        else
-          begin
-            @binding = eval("IRB.conf[:__MAIN__].instance_eval('binding', __FILE__, __LINE__)", @binding, __FILE__, __LINE__)
-          rescue TypeError
-            fail CantChangeBinding, @main.inspect
-          end
-        end
-      end
-
-      case @main
-      when Object
-        use_delegator = @main.frozen?
-      else
-        use_delegator = true
-      end
-
-      if use_delegator
-        @main = SimpleDelegator.new(@main)
-        IRB.conf[:__MAIN__] = @main
-        @main.singleton_class.class_eval do
-          private
-          define_method(:exit) do |*a, &b|
-            # Do nothing, will be overridden
-          end
-          define_method(:binding, Kernel.instance_method(:binding))
-          define_method(:local_variables, Kernel.instance_method(:local_variables))
-        end
-        @binding = eval("IRB.conf[:__MAIN__].instance_eval('binding', __FILE__, __LINE__)", @binding, *@binding.source_location)
-      end
-
-      @binding.local_variable_set(:_, nil)
-    end
-
-    # The Binding of this workspace
-    attr_reader :binding
-    # The top-level workspace of this context, also available as
-    # <code>IRB.conf[:__MAIN__]</code>
-    attr_reader :main
-
-    def load_commands_to_main
-      main.extend ExtendCommandBundle
-    end
-
-    # Evaluate the given +statements+ within the  context of this workspace.
-    def evaluate(statements, file = __FILE__, line = __LINE__)
-      eval(statements, @binding, file, line)
-    end
-
-    def local_variable_set(name, value)
-      @binding.local_variable_set(name, value)
-    end
-
-    def local_variable_get(name)
-      @binding.local_variable_get(name)
-    end
-
-    # error message manipulator
-    # WARN: Rails patches this method to filter its own backtrace. Be cautious when changing it.
-    # See: https://github.com/rails/rails/blob/main/railties/lib/rails/commands/console/console_command.rb#L8:~:text=def,filter_backtrace
-    def filter_backtrace(bt)
-      return nil if bt =~ /\/irb\/.*\.rb/
-      return nil if bt =~ /\/irb\.rb/
-      return nil if bt =~ /tool\/lib\/.*\.rb|runner\.rb/ # for tests in Ruby repository
-      case IRB.conf[:CONTEXT_MODE]
-      when 1
-        return nil if bt =~ %r!/tmp/irb-binding!
-      when 3
-        bt = bt.sub(/:\s*in `irb_binding'/, '')
-      end
-      bt
-    end
-
-    def code_around_binding
-      file, pos = @binding.source_location
-
-      if defined?(::SCRIPT_LINES__[file]) && lines = ::SCRIPT_LINES__[file]
-        code = ::SCRIPT_LINES__[file].join('')
-      else
-        begin
-          code = File.read(file)
-        rescue SystemCallError
-          return
-        end
-      end
-
-      lines = Color.colorize_code(code).lines
-      pos -= 1
-
-      start_pos = [pos - 5, 0].max
-      end_pos   = [pos + 5, lines.size - 1].min
-
-      line_number_fmt = Color.colorize("%#{end_pos.to_s.length}d", [:BLUE, :BOLD])
-      fmt = " %2s #{line_number_fmt}: %s"
-
-      body = (start_pos..end_pos).map do |current_pos|
-        sprintf(fmt, pos == current_pos ? '=>' : '', current_pos + 1, lines[current_pos])
-      end.join("")
-
-      "\nFrom: #{file} @ line #{pos + 1} :\n\n#{body}#{Color.clear}\n"
-    end
-  end
-end
diff --git a/lib/irb/ws-for-case-2.rb b/lib/irb/ws-for-case-2.rb
deleted file mode 100644
index a0f617e4ed0c80..00000000000000
--- a/lib/irb/ws-for-case-2.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-# frozen_string_literal: false
-#
-#   irb/ws-for-case-2.rb -
-#   	by Keiju ISHITSUKA(keiju@ruby-lang.org)
-#
-
-while true
-  IRB::BINDING_QUEUE.push _ = binding
-end
diff --git a/lib/irb/xmp.rb b/lib/irb/xmp.rb
deleted file mode 100644
index 94c700b4846f74..00000000000000
--- a/lib/irb/xmp.rb
+++ /dev/null
@@ -1,164 +0,0 @@
-# frozen_string_literal: false
-#
-#   xmp.rb - irb version of gotoken xmp
-#   	by Keiju ISHITSUKA(Nippon Rational Inc.)
-#
-
-require_relative "../irb"
-require_relative "frame"
-
-# An example printer for irb.
-#
-# It's much like the standard library PrettyPrint, that shows the value of each
-# expression as it runs.
-#
-# In order to use this library, you must first require it:
-#
-#     require 'irb/xmp'
-#
-# Now, you can take advantage of the Object#xmp convenience method.
-#
-#     xmp <<END
-#       foo = "bar"
-#       baz = 42
-#     END
-#     #=> foo = "bar"
-#       #==>"bar"
-#     #=> baz = 42
-#       #==>42
-#
-# You can also create an XMP object, with an optional binding to print
-# expressions in the given binding:
-#
-#     ctx = binding
-#     x = XMP.new ctx
-#     x.puts
-#     #=> today = "a good day"
-#       #==>"a good day"
-#     ctx.eval 'today # is what?'
-#     #=> "a good day"
-class XMP
-
-  # Creates a new XMP object.
-  #
-  # The top-level binding or, optional +bind+ parameter will be used when
-  # creating the workspace. See WorkSpace.new for more information.
-  #
-  # This uses the +:XMP+ prompt mode, see IRB@Customizing+the+IRB+Prompt for
-  # full detail.
-  def initialize(bind = nil)
-    IRB.init_config(nil)
-
-    IRB.conf[:PROMPT_MODE] = :XMP
-
-    bind = IRB::Frame.top(1) unless bind
-    ws = IRB::WorkSpace.new(bind)
-    @io = StringInputMethod.new
-    @irb = IRB::Irb.new(ws, @io)
-    @irb.context.ignore_sigint = false
-
-    IRB.conf[:MAIN_CONTEXT] = @irb.context
-  end
-
-  # Evaluates the given +exps+, for example:
-  #
-  #   require 'irb/xmp'
-  #   x = XMP.new
-  #
-  #   x.puts '{:a => 1, :b => 2, :c => 3}'
-  #   #=> {:a => 1, :b => 2, :c => 3}
-  #     # ==>{:a=>1, :b=>2, :c=>3}
-  #   x.puts 'foo = "bar"'
-  #   # => foo = "bar"
-  #     # ==>"bar"
-  def puts(exps)
-    @io.puts exps
-
-    if @irb.context.ignore_sigint
-      begin
-        trap_proc_b = trap("SIGINT"){@irb.signal_handle}
-        catch(:IRB_EXIT) do
-          @irb.eval_input
-        end
-      ensure
-        trap("SIGINT", trap_proc_b)
-      end
-    else
-      catch(:IRB_EXIT) do
-        @irb.eval_input
-      end
-    end
-  end
-
-  # A custom InputMethod class used by XMP for evaluating string io.
-  class StringInputMethod < IRB::InputMethod
-    # Creates a new StringInputMethod object
-    def initialize
-      super
-      @exps = []
-    end
-
-    # Whether there are any expressions left in this printer.
-    def eof?
-      @exps.empty?
-    end
-
-    # Reads the next expression from this printer.
-    #
-    # See IO#gets for more information.
-    def gets
-      while l = @exps.shift
-        next if /^\s+$/ =~ l
-        l.concat "\n"
-        print @prompt, l
-        break
-      end
-      l
-    end
-
-    # Concatenates all expressions in this printer, separated by newlines.
-    #
-    # An Encoding::CompatibilityError is raised of the given +exps+'s encoding
-    # doesn't match the previous expression evaluated.
-    def puts(exps)
-      if @encoding and exps.encoding != @encoding
-        enc = Encoding.compatible?(@exps.join("\n"), exps)
-        if enc.nil?
-          raise Encoding::CompatibilityError, "Encoding in which the passed expression is encoded is not compatible to the preceding's one"
-        else
-          @encoding = enc
-        end
-      else
-        @encoding = exps.encoding
-      end
-      @exps.concat exps.split(/\n/)
-    end
-
-    # Returns the encoding of last expression printed by #puts.
-    attr_reader :encoding
-  end
-end
-
-# A convenience method that's only available when the you require the IRB::XMP standard library.
-#
-# Creates a new XMP object, using the given expressions as the +exps+
-# parameter, and optional binding as +bind+ or uses the top-level binding. Then
-# evaluates the given expressions using the +:XMP+ prompt mode.
-#
-# For example:
-#
-#   require 'irb/xmp'
-#   ctx = binding
-#   xmp 'foo = "bar"', ctx
-#   #=> foo = "bar"
-#     #==>"bar"
-#   ctx.eval 'foo'
-#   #=> "bar"
-#
-# See XMP.new for more information.
-def xmp(exps, bind = nil)
-  bind = IRB::Frame.top(1) unless bind
-  xmp = XMP.new(bind)
-  xmp.puts exps
-  xmp
-end
diff --git a/lib/logger.rb b/lib/logger.rb
deleted file mode 100644
index acc65ac8bb27f8..00000000000000
--- a/lib/logger.rb
+++ /dev/null
@@ -1,748 +0,0 @@
-# frozen_string_literal: true
-# logger.rb - simple logging utility
-# Copyright (C) 2000-2003, 2005, 2008, 2011  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
-#
-# Documentation:: NAKAMURA, Hiroshi and Gavin Sinclair
-# License::
-#   You can redistribute it and/or modify it under the same terms of Ruby's
-#   license; either the dual license version in 2003, or any later version.
-# Revision:: $Id$
-#
-# A simple system for logging messages.  See Logger for more documentation.
-
-require 'fiber'
-require 'monitor'
-require 'rbconfig'
-
-require_relative 'logger/version'
-require_relative 'logger/formatter'
-require_relative 'logger/log_device'
-require_relative 'logger/severity'
-require_relative 'logger/errors'
-
-# \Class \Logger provides a simple but sophisticated logging utility that
-# you can use to create one or more
-# {event logs}[https://en.wikipedia.org/wiki/Logging_(software)#Event_logs]
-# for your program.
-# Each such log contains a chronological sequence of entries
-# that provides a record of the program's activities.
-#
-# == About the Examples
-#
-# All examples on this page assume that \Logger has been required:
-#
-#   require 'logger'
-#
-# == Synopsis
-#
-# Create a log with Logger.new:
-#
-#   # Single log file.
-#   logger = Logger.new('t.log')
-#   # Size-based rotated logging: 3 10-megabyte files.
-#   logger = Logger.new('t.log', 3, 10485760)
-#   # Period-based rotated logging: daily (also allowed: 'weekly', 'monthly').
-#   logger = Logger.new('t.log', 'daily')
-#   # Log to an IO stream.
-#   logger = Logger.new($stdout)
-#
-# Add entries (level, message) with Logger#add:
-#
-#   logger.add(Logger::DEBUG, 'Maximal debugging info')
-#   logger.add(Logger::INFO, 'Non-error information')
-#   logger.add(Logger::WARN, 'Non-error warning')
-#   logger.add(Logger::ERROR, 'Non-fatal error')
-#   logger.add(Logger::FATAL, 'Fatal error')
-#   logger.add(Logger::UNKNOWN, 'Most severe')
-#
-# Close the log with Logger#close:
-#
-#   logger.close
-#
-# == Entries
-#
-# You can add entries with method Logger#add:
-#
-#   logger.add(Logger::DEBUG, 'Maximal debugging info')
-#   logger.add(Logger::INFO, 'Non-error information')
-#   logger.add(Logger::WARN, 'Non-error warning')
-#   logger.add(Logger::ERROR, 'Non-fatal error')
-#   logger.add(Logger::FATAL, 'Fatal error')
-#   logger.add(Logger::UNKNOWN, 'Most severe')
-#
-# These shorthand methods also add entries:
-#
-#   logger.debug('Maximal debugging info')
-#   logger.info('Non-error information')
-#   logger.warn('Non-error warning')
-#   logger.error('Non-fatal error')
-#   logger.fatal('Fatal error')
-#   logger.unknown('Most severe')
-#
-# When you call any of these methods,
-# the entry may or may not be written to the log,
-# depending on the entry's severity and on the log level;
-# see {Log Level}[rdoc-ref:Logger@Log+Level]
-#
-# An entry always has:
-#
-# - A severity (the required argument to #add).
-# - An automatically created timestamp.
-#
-# And may also have:
-#
-# - A message.
-# - A program name.
-#
-# Example:
-#
-#   logger = Logger.new($stdout)
-#   logger.add(Logger::INFO, 'My message.', 'mung')
-#   # => I, [2022-05-07T17:21:46.536234 #20536]  INFO -- mung: My message.
-#
-# The default format for an entry is:
-#
-#   "%s, [%s #%d] %5s -- %s: %s\n"
-#
-# where the values to be formatted are:
-#
-# - \Severity (one letter).
-# - Timestamp.
-# - Process id.
-# - \Severity (word).
-# - Program name.
-# - Message.
-#
-# You can use a different entry format by:
-#
-# - Setting a custom format proc (affects following entries);
-#   see {formatter=}[Logger.html#attribute-i-formatter].
-# - Calling any of the methods above with a block
-#   (affects only the one entry).
-#   Doing so can have two benefits:
-#
-#   - Context: the block can evaluate the entire program context
-#     and create a context-dependent message.
-#   - Performance: the block is not evaluated unless the log level
-#     permits the entry actually to be written:
-#
-#       logger.error { my_slow_message_generator }
-#
-#     Contrast this with the string form, where the string is
-#     always evaluated, regardless of the log level:
-#
-#       logger.error("#{my_slow_message_generator}")
-#
-# === \Severity
-#
-# The severity of a log entry has two effects:
-#
-# - Determines whether the entry is selected for inclusion in the log;
-#   see {Log Level}[rdoc-ref:Logger@Log+Level].
-# - Indicates to any log reader (whether a person or a program)
-#   the relative importance of the entry.
-#
-# === Timestamp
-#
-# The timestamp for a log entry is generated automatically
-# when the entry is created.
-#
-# The logged timestamp is formatted by method
-# {Time#strftime}[rdoc-ref:Time#strftime]
-# using this format string:
-#
-#   '%Y-%m-%dT%H:%M:%S.%6N'
-#
-# Example:
-#
-#   logger = Logger.new($stdout)
-#   logger.add(Logger::INFO)
-#   # => I, [2022-05-07T17:04:32.318331 #20536]  INFO -- : nil
-#
-# You can set a different format using method #datetime_format=.
-#
-# === Message
-#
-# The message is an optional argument to an entry method:
-#
-#   logger = Logger.new($stdout)
-#   logger.add(Logger::INFO, 'My message')
-#   # => I, [2022-05-07T18:15:37.647581 #20536]  INFO -- : My message
-#
-# For the default entry formatter, <tt>Logger::Formatter</tt>,
-# the message object may be:
-#
-# - A string: used as-is.
-# - An Exception: <tt>message.message</tt> is used.
-# - Anything else: <tt>message.inspect</tt> is used.
-#
-# *Note*: Logger::Formatter does not escape or sanitize
-# the message passed to it.
-# Developers should be aware that malicious data (user input)
-# may be in the message, and should explicitly escape untrusted data.
-#
-# You can use a custom formatter to escape message data;
-# see the example at {formatter=}[Logger.html#attribute-i-formatter].
-#
-# === Program Name
-#
-# The program name is an optional argument to an entry method:
-#
-#   logger = Logger.new($stdout)
-#   logger.add(Logger::INFO, 'My message', 'mung')
-#   # => I, [2022-05-07T18:17:38.084716 #20536]  INFO -- mung: My message
-#
-# The default program name for a new logger may be set in the call to
-# Logger.new via optional keyword argument +progname+:
-#
-#   logger = Logger.new('t.log', progname: 'mung')
-#
-# The default program name for an existing logger may be set
-# by a call to method #progname=:
-#
-#   logger.progname = 'mung'
-#
-# The current program name may be retrieved with method
-# {progname}[Logger.html#attribute-i-progname]:
-#
-#   logger.progname # => "mung"
-#
-# == Log Level
-#
-# The log level setting determines whether an entry is actually
-# written to the log, based on the entry's severity.
-#
-# These are the defined severities (least severe to most severe):
-#
-#   logger = Logger.new($stdout)
-#   logger.add(Logger::DEBUG, 'Maximal debugging info')
-#   # => D, [2022-05-07T17:57:41.776220 #20536] DEBUG -- : Maximal debugging info
-#   logger.add(Logger::INFO, 'Non-error information')
-#   # => I, [2022-05-07T17:59:14.349167 #20536]  INFO -- : Non-error information
-#   logger.add(Logger::WARN, 'Non-error warning')
-#   # => W, [2022-05-07T18:00:45.337538 #20536]  WARN -- : Non-error warning
-#   logger.add(Logger::ERROR, 'Non-fatal error')
-#   # => E, [2022-05-07T18:02:41.592912 #20536] ERROR -- : Non-fatal error
-#   logger.add(Logger::FATAL, 'Fatal error')
-#   # => F, [2022-05-07T18:05:24.703931 #20536] FATAL -- : Fatal error
-#   logger.add(Logger::UNKNOWN, 'Most severe')
-#   # => A, [2022-05-07T18:07:54.657491 #20536]   ANY -- : Most severe
-#
-# The default initial level setting is Logger::DEBUG, the lowest level,
-# which means that all entries are to be written, regardless of severity:
-#
-#   logger = Logger.new($stdout)
-#   logger.level # => 0
-#   logger.add(0, "My message")
-#   # => D, [2022-05-11T15:10:59.773668 #20536] DEBUG -- : My message
-#
-# You can specify a different setting in a new logger
-# using keyword argument +level+ with an appropriate value:
-#
-#   logger = Logger.new($stdout, level: Logger::ERROR)
-#   logger = Logger.new($stdout, level: 'error')
-#   logger = Logger.new($stdout, level: :error)
-#   logger.level # => 3
-#
-# With this level, entries with severity Logger::ERROR and higher
-# are written, while those with lower severities are not written:
-#
-#   logger = Logger.new($stdout, level: Logger::ERROR)
-#   logger.add(3)
-#   # => E, [2022-05-11T15:17:20.933362 #20536] ERROR -- : nil
-#   logger.add(2) # Silent.
-#
-# You can set the log level for an existing logger
-# with method #level=:
-#
-#   logger.level = Logger::ERROR
-#
-# These shorthand methods also set the level:
-#
-#   logger.debug! # => 0
-#   logger.info!  # => 1
-#   logger.warn!  # => 2
-#   logger.error! # => 3
-#   logger.fatal! # => 4
-#
-# You can retrieve the log level with method
-# {level}[Logger.html#attribute-i-level]:
-#
-#   logger.level = Logger::ERROR
-#   logger.level # => 3
-#
-# These methods return whether a given
-# level is to be written:
-#
-#   logger.level = Logger::ERROR
-#   logger.debug? # => false
-#   logger.info?  # => false
-#   logger.warn?  # => false
-#   logger.error? # => true
-#   logger.fatal? # => true
-#
-# == Log File Rotation
-#
-# By default, a log file is a single file that grows indefinitely
-# (until explicitly closed); there is no file rotation.
-#
-# To keep log files to a manageable size,
-# you can use _log_ _file_ _rotation_, which uses multiple log files:
-#
-# - Each log file has entries for a non-overlapping
-#   time interval.
-# - Only the most recent log file is open and active;
-#   the others are closed and inactive.
-#
-# === Size-Based Rotation
-#
-# For size-based log file rotation, call Logger.new with:
-#
-# - Argument +logdev+ as a file path.
-# - Argument +shift_age+ with a positive integer:
-#   the number of log files to be in the rotation.
-# - Argument +shift_size+ as a positive integer:
-#   the maximum size (in bytes) of each log file;
-#   defaults to 1048576 (1 megabyte).
-#
-# Examples:
-#
-#   logger = Logger.new('t.log', 3)           # Three 1-megabyte files.
-#   logger = Logger.new('t.log', 5, 10485760) # Five 10-megabyte files.
-#
-# For these examples, suppose:
-#
-#   logger = Logger.new('t.log', 3)
-#
-# Logging begins in the new log file, +t.log+;
-# the log file is "full" and ready for rotation
-# when a new entry would cause its size to exceed +shift_size+.
-#
-# The first time +t.log+ is full:
-#
-# - +t.log+ is closed and renamed to +t.log.0+.
-# - A new file +t.log+ is opened.
-#
-# The second time +t.log+ is full:
-#
-# - +t.log.0 is renamed as +t.log.1+.
-# - +t.log+ is closed and renamed to +t.log.0+.
-# - A new file +t.log+ is opened.
-#
-# Each subsequent time that +t.log+ is full,
-# the log files are rotated:
-#
-# - +t.log.1+ is removed.
-# - +t.log.0 is renamed as +t.log.1+.
-# - +t.log+ is closed and renamed to +t.log.0+.
-# - A new file +t.log+ is opened.
-#
-# === Periodic Rotation
-#
-# For periodic rotation, call Logger.new with:
-#
-# - Argument +logdev+ as a file path.
-# - Argument +shift_age+ as a string period indicator.
-#
-# Examples:
-#
-#   logger = Logger.new('t.log', 'daily')   # Rotate log files daily.
-#   logger = Logger.new('t.log', 'weekly')  # Rotate log files weekly.
-#   logger = Logger.new('t.log', 'monthly') # Rotate log files monthly.
-#
-# Example:
-#
-#   logger = Logger.new('t.log', 'daily')
-#
-# When the given period expires:
-#
-# - The base log file, +t.log+ is closed and renamed
-#   with a date-based suffix such as +t.log.20220509+.
-# - A new log file +t.log+ is opened.
-# - Nothing is removed.
-#
-# The default format for the suffix is <tt>'%Y%m%d'</tt>,
-# which produces a suffix similar to the one above.
-# You can set a different format using create-time option
-# +shift_period_suffix+;
-# see details and suggestions at
-# {Time#strftime}[rdoc-ref:Time#strftime].
-#
-class Logger
-  _, name, rev = %w$Id$
-  if name
-    name = name.chomp(",v")
-  else
-    name = File.basename(__FILE__)
-  end
-  rev ||= "v#{VERSION}"
-  ProgName = "#{name}/#{rev}"
-
-  include Severity
-
-  # Logging severity threshold (e.g. <tt>Logger::INFO</tt>).
-  def level
-    @level_override[Fiber.current] || @level
-  end
-
-  # Sets the log level; returns +severity+.
-  # See {Log Level}[rdoc-ref:Logger@Log+Level].
-  #
-  # Argument +severity+ may be an integer, a string, or a symbol:
-  #
-  #   logger.level = Logger::ERROR # => 3
-  #   logger.level = 3             # => 3
-  #   logger.level = 'error'       # => "error"
-  #   logger.level = :error        # => :error
-  #
-  # Logger#sev_threshold= is an alias for Logger#level=.
-  #
-  def level=(severity)
-    @level = Severity.coerce(severity)
-  end
-
-  # Adjust the log level during the block execution for the current Fiber only
-  #
-  #   logger.with_level(:debug) do
-  #     logger.debug { "Hello" }
-  #   end
-  def with_level(severity)
-    prev, @level_override[Fiber.current] = level, Severity.coerce(severity)
-    begin
-      yield
-    ensure
-      if prev
-        @level_override[Fiber.current] = prev
-      else
-        @level_override.delete(Fiber.current)
-      end
-    end
-  end
-
-  # Program name to include in log messages.
-  attr_accessor :progname
-
-  # Sets the date-time format.
-  #
-  # Argument +datetime_format+ should be either of these:
-  #
-  # - A string suitable for use as a format for method
-  #   {Time#strftime}[rdoc-ref:Time#strftime].
-  # - +nil+: the logger uses <tt>'%Y-%m-%dT%H:%M:%S.%6N'</tt>.
-  #
-  def datetime_format=(datetime_format)
-    @default_formatter.datetime_format = datetime_format
-  end
-
-  # Returns the date-time format; see #datetime_format=.
-  #
-  def datetime_format
-    @default_formatter.datetime_format
-  end
-
-  # Sets or retrieves the logger entry formatter proc.
-  #
-  # When +formatter+ is +nil+, the logger uses Logger::Formatter.
-  #
-  # When +formatter+ is a proc, a new entry is formatted by the proc,
-  # which is called with four arguments:
-  #
-  # - +severity+: The severity of the entry.
-  # - +time+: A Time object representing the entry's timestamp.
-  # - +progname+: The program name for the entry.
-  # - +msg+: The message for the entry (string or string-convertible object).
-  #
-  # The proc should return a string containing the formatted entry.
-  #
-  # This custom formatter uses
-  # {String#dump}[rdoc-ref:String#dump]
-  # to escape the message string:
-  #
-  #   logger = Logger.new($stdout, progname: 'mung')
-  #   original_formatter = logger.formatter || Logger::Formatter.new
-  #   logger.formatter = proc { |severity, time, progname, msg|
-  #     original_formatter.call(severity, time, progname, msg.dump)
-  #   }
-  #   logger.add(Logger::INFO, "hello \n ''")
-  #   logger.add(Logger::INFO, "\f\x00\xff\\\"")
-  #
-  # Output:
-  #
-  #   I, [2022-05-13T13:16:29.637488 #8492]  INFO -- mung: "hello \n ''"
-  #   I, [2022-05-13T13:16:29.637610 #8492]  INFO -- mung: "\f\x00\xFF\\\""
-  #
-  attr_accessor :formatter
-
-  alias sev_threshold level
-  alias sev_threshold= level=
-
-  # Returns +true+ if the log level allows entries with severity
-  # Logger::DEBUG to be written, +false+ otherwise.
-  # See {Log Level}[rdoc-ref:Logger@Log+Level].
-  #
-  def debug?; level <= DEBUG; end
-
-  # Sets the log level to Logger::DEBUG.
-  # See {Log Level}[rdoc-ref:Logger@Log+Level].
-  #
-  def debug!; self.level = DEBUG; end
-
-  # Returns +true+ if the log level allows entries with severity
-  # Logger::INFO to be written, +false+ otherwise.
-  # See {Log Level}[rdoc-ref:Logger@Log+Level].
-  #
-  def info?; level <= INFO; end
-
-  # Sets the log level to Logger::INFO.
-  # See {Log Level}[rdoc-ref:Logger@Log+Level].
-  #
-  def info!; self.level = INFO; end
-
-  # Returns +true+ if the log level allows entries with severity
-  # Logger::WARN to be written, +false+ otherwise.
-  # See {Log Level}[rdoc-ref:Logger@Log+Level].
-  #
-  def warn?; level <= WARN; end
-
-  # Sets the log level to Logger::WARN.
-  # See {Log Level}[rdoc-ref:Logger@Log+Level].
-  #
-  def warn!; self.level = WARN; end
-
-  # Returns +true+ if the log level allows entries with severity
-  # Logger::ERROR to be written, +false+ otherwise.
-  # See {Log Level}[rdoc-ref:Logger@Log+Level].
-  #
-  def error?; level <= ERROR; end
-
-  # Sets the log level to Logger::ERROR.
-  # See {Log Level}[rdoc-ref:Logger@Log+Level].
-  #
-  def error!; self.level = ERROR; end
-
-  # Returns +true+ if the log level allows entries with severity
-  # Logger::FATAL to be written, +false+ otherwise.
-  # See {Log Level}[rdoc-ref:Logger@Log+Level].
-  #
-  def fatal?; level <= FATAL; end
-
-  # Sets the log level to Logger::FATAL.
-  # See {Log Level}[rdoc-ref:Logger@Log+Level].
-  #
-  def fatal!; self.level = FATAL; end
-
-  # :call-seq:
-  #    Logger.new(logdev, shift_age = 0, shift_size = 1048576, **options)
-  #
-  # With the single argument +logdev+,
-  # returns a new logger with all default options:
-  #
-  #   Logger.new('t.log') # => #<Logger:0x000001e685dc6ac8>
-  #
-  # Argument +logdev+ must be one of:
-  #
-  # - A string filepath: entries are to be written
-  #   to the file at that path; if the file at that path exists,
-  #   new entries are appended.
-  # - An IO stream (typically +$stdout+, +$stderr+. or an open file):
-  #   entries are to be written to the given stream.
-  # - +nil+ or +File::NULL+: no entries are to be written.
-  #
-  # Examples:
-  #
-  #   Logger.new('t.log')
-  #   Logger.new($stdout)
-  #
-  # The keyword options are:
-  #
-  # - +level+: sets the log level; default value is Logger::DEBUG.
-  #   See {Log Level}[rdoc-ref:Logger@Log+Level]:
-  #
-  #     Logger.new('t.log', level: Logger::ERROR)
-  #
-  # - +progname+: sets the default program name; default is +nil+.
-  #   See {Program Name}[rdoc-ref:Logger@Program+Name]:
-  #
-  #     Logger.new('t.log', progname: 'mung')
-  #
-  # - +formatter+: sets the entry formatter; default is +nil+.
-  #   See {formatter=}[Logger.html#attribute-i-formatter].
-  # - +datetime_format+: sets the format for entry timestamp;
-  #   default is +nil+.
-  #   See #datetime_format=.
-  # - +binmode+: sets whether the logger writes in binary mode;
-  #   default is +false+.
-  # - +shift_period_suffix+: sets the format for the filename suffix
-  #   for periodic log file rotation; default is <tt>'%Y%m%d'</tt>.
-  #   See {Periodic Rotation}[rdoc-ref:Logger@Periodic+Rotation].
-  #
-  def initialize(logdev, shift_age = 0, shift_size = 1048576, level: DEBUG,
-                 progname: nil, formatter: nil, datetime_format: nil,
-                 binmode: false, shift_period_suffix: '%Y%m%d')
-    self.level = level
-    self.progname = progname
-    @default_formatter = Formatter.new
-    self.datetime_format = datetime_format
-    self.formatter = formatter
-    @logdev = nil
-    @level_override = {}
-    if logdev && logdev != File::NULL
-      @logdev = LogDevice.new(logdev, shift_age: shift_age,
-        shift_size: shift_size,
-        shift_period_suffix: shift_period_suffix,
-        binmode: binmode)
-    end
-  end
-
-  # Sets the logger's output stream:
-  #
-  # - If +logdev+ is +nil+, reopens the current output stream.
-  # - If +logdev+ is a filepath, opens the indicated file for append.
-  # - If +logdev+ is an IO stream
-  #   (usually <tt>$stdout</tt>, <tt>$stderr</tt>, or an open File object),
-  #   opens the stream for append.
-  #
-  # Example:
-  #
-  #   logger = Logger.new('t.log')
-  #   logger.add(Logger::ERROR, 'one')
-  #   logger.close
-  #   logger.add(Logger::ERROR, 'two') # Prints 'log writing failed. closed stream'
-  #   logger.reopen
-  #   logger.add(Logger::ERROR, 'three')
-  #   logger.close
-  #   File.readlines('t.log')
-  #   # =>
-  #   # ["# Logfile created on 2022-05-12 14:21:19 -0500 by logger.rb/v1.5.0\n",
-  #   #  "E, [2022-05-12T14:21:27.596726 #22428] ERROR -- : one\n",
-  #   #  "E, [2022-05-12T14:23:05.847241 #22428] ERROR -- : three\n"]
-  #
-  def reopen(logdev = nil)
-    @logdev&.reopen(logdev)
-    self
-  end
-
-  # Creates a log entry, which may or may not be written to the log,
-  # depending on the entry's severity and on the log level.
-  # See {Log Level}[rdoc-ref:Logger@Log+Level]
-  # and {Entries}[rdoc-ref:Logger@Entries] for details.
-  #
-  # Examples:
-  #
-  #   logger = Logger.new($stdout, progname: 'mung')
-  #   logger.add(Logger::INFO)
-  #   logger.add(Logger::ERROR, 'No good')
-  #   logger.add(Logger::ERROR, 'No good', 'gnum')
-  #
-  # Output:
-  #
-  #   I, [2022-05-12T16:25:31.469726 #36328]  INFO -- mung: mung
-  #   E, [2022-05-12T16:25:55.349414 #36328] ERROR -- mung: No good
-  #   E, [2022-05-12T16:26:35.841134 #36328] ERROR -- gnum: No good
-  #
-  # These convenience methods have implicit severity:
-  #
-  # - #debug.
-  # - #info.
-  # - #warn.
-  # - #error.
-  # - #fatal.
-  # - #unknown.
-  #
-  def add(severity, message = nil, progname = nil)
-    severity ||= UNKNOWN
-    if @logdev.nil? or severity < level
-      return true
-    end
-    if progname.nil?
-      progname = @progname
-    end
-    if message.nil?
-      if block_given?
-        message = yield
-      else
-        message = progname
-        progname = @progname
-      end
-    end
-    @logdev.write(
-      format_message(format_severity(severity), Time.now, progname, message))
-    true
-  end
-  alias log add
-
-  # Writes the given +msg+ to the log with no formatting;
-  # returns the number of characters written,
-  # or +nil+ if no log device exists:
-  #
-  #   logger = Logger.new($stdout)
-  #   logger << 'My message.' # => 10
-  #
-  # Output:
-  #
-  #   My message.
-  #
-  def <<(msg)
-    @logdev&.write(msg)
-  end
-
-  # Equivalent to calling #add with severity <tt>Logger::DEBUG</tt>.
-  #
-  def debug(progname = nil, &block)
-    add(DEBUG, nil, progname, &block)
-  end
-
-  # Equivalent to calling #add with severity <tt>Logger::INFO</tt>.
-  #
-  def info(progname = nil, &block)
-    add(INFO, nil, progname, &block)
-  end
-
-  # Equivalent to calling #add with severity <tt>Logger::WARN</tt>.
-  #
-  def warn(progname = nil, &block)
-    add(WARN, nil, progname, &block)
-  end
-
-  # Equivalent to calling #add with severity <tt>Logger::ERROR</tt>.
-  #
-  def error(progname = nil, &block)
-    add(ERROR, nil, progname, &block)
-  end
-
-  # Equivalent to calling #add with severity <tt>Logger::FATAL</tt>.
-  #
-  def fatal(progname = nil, &block)
-    add(FATAL, nil, progname, &block)
-  end
-
-  # Equivalent to calling #add with severity <tt>Logger::UNKNOWN</tt>.
-  #
-  def unknown(progname = nil, &block)
-    add(UNKNOWN, nil, progname, &block)
-  end
-
-  # Closes the logger; returns +nil+:
-  #
-  #   logger = Logger.new('t.log')
-  #   logger.close       # => nil
-  #   logger.info('foo') # Prints "log writing failed. closed stream"
-  #
-  # Related: Logger#reopen.
-  def close
-    @logdev&.close
-  end
-
-private
-
-  # \Severity label for logging (max 5 chars).
-  SEV_LABEL = %w(DEBUG INFO WARN ERROR FATAL ANY).freeze
-
-  def format_severity(severity)
-    SEV_LABEL[severity] || 'ANY'
-  end
-
-  def format_message(severity, datetime, progname, msg)
-    (@formatter || @default_formatter).call(severity, datetime, progname, msg)
-  end
-end
diff --git a/lib/logger/errors.rb b/lib/logger/errors.rb
deleted file mode 100644
index 88581793f0d941..00000000000000
--- a/lib/logger/errors.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-# frozen_string_literal: true
-
-class Logger
-  # not used after 1.2.7. just for compat.
-  class Error < RuntimeError # :nodoc:
-  end
-  class ShiftingError < Error # :nodoc:
-  end
-end
diff --git a/lib/logger/formatter.rb b/lib/logger/formatter.rb
deleted file mode 100644
index c634dbf34dcb75..00000000000000
--- a/lib/logger/formatter.rb
+++ /dev/null
@@ -1,36 +0,0 @@
-# frozen_string_literal: true
-
-class Logger
-  # Default formatter for log messages.
-  class Formatter
-    Format = "%.1s, [%s #%d] %5s -- %s: %s\n"
-    DatetimeFormat = "%Y-%m-%dT%H:%M:%S.%6N"
-
-    attr_accessor :datetime_format
-
-    def initialize
-      @datetime_format = nil
-    end
-
-    def call(severity, time, progname, msg)
-      sprintf(Format, severity, format_datetime(time), Process.pid, severity, progname, msg2str(msg))
-    end
-
-  private
-
-    def format_datetime(time)
-      time.strftime(@datetime_format || DatetimeFormat)
-    end
-
-    def msg2str(msg)
-      case msg
-      when ::String
-        msg
-      when ::Exception
-        "#{ msg.message } (#{ msg.class })\n#{ msg.backtrace.join("\n") if msg.backtrace }"
-      else
-        msg.inspect
-      end
-    end
-  end
-end
diff --git a/lib/logger/log_device.rb b/lib/logger/log_device.rb
deleted file mode 100644
index 84277a2656e607..00000000000000
--- a/lib/logger/log_device.rb
+++ /dev/null
@@ -1,207 +0,0 @@
-# frozen_string_literal: true
-
-require_relative 'period'
-
-class Logger
-  # Device used for logging messages.
-  class LogDevice
-    include Period
-
-    attr_reader :dev
-    attr_reader :filename
-    include MonitorMixin
-
-    def initialize(log = nil, shift_age: nil, shift_size: nil, shift_period_suffix: nil, binmode: false)
-      @dev = @filename = @shift_age = @shift_size = @shift_period_suffix = nil
-      @binmode = binmode
-      mon_initialize
-      set_dev(log)
-      if @filename
-        @shift_age = shift_age || 7
-        @shift_size = shift_size || 1048576
-        @shift_period_suffix = shift_period_suffix || '%Y%m%d'
-
-        unless @shift_age.is_a?(Integer)
-          base_time = @dev.respond_to?(:stat) ? @dev.stat.mtime : Time.now
-          @next_rotate_time = next_rotate_time(base_time, @shift_age)
-        end
-      end
-    end
-
-    def write(message)
-      begin
-        synchronize do
-          if @shift_age and @dev.respond_to?(:stat)
-            begin
-              check_shift_log
-            rescue
-              warn("log shifting failed. #{$!}")
-            end
-          end
-          begin
-            @dev.write(message)
-          rescue
-            warn("log writing failed. #{$!}")
-          end
-        end
-      rescue Exception => ignored
-        warn("log writing failed. #{ignored}")
-      end
-    end
-
-    def close
-      begin
-        synchronize do
-          @dev.close rescue nil
-        end
-      rescue Exception
-        @dev.close rescue nil
-      end
-    end
-
-    def reopen(log = nil)
-      # reopen the same filename if no argument, do nothing for IO
-      log ||= @filename if @filename
-      if log
-        synchronize do
-          if @filename and @dev
-            @dev.close rescue nil # close only file opened by Logger
-            @filename = nil
-          end
-          set_dev(log)
-        end
-      end
-      self
-    end
-
-  private
-
-    def set_dev(log)
-      if log.respond_to?(:write) and log.respond_to?(:close)
-        @dev = log
-        if log.respond_to?(:path) and path = log.path
-          if File.exist?(path)
-            @filename = path
-          end
-        end
-      else
-        @dev = open_logfile(log)
-        @dev.sync = true
-        @dev.binmode if @binmode
-        @filename = log
-      end
-    end
-
-    def open_logfile(filename)
-      begin
-        File.open(filename, (File::WRONLY | File::APPEND))
-      rescue Errno::ENOENT
-        create_logfile(filename)
-      end
-    end
-
-    def create_logfile(filename)
-      begin
-        logdev = File.open(filename, (File::WRONLY | File::APPEND | File::CREAT | File::EXCL))
-        logdev.flock(File::LOCK_EX)
-        logdev.sync = true
-        logdev.binmode if @binmode
-        add_log_header(logdev)
-        logdev.flock(File::LOCK_UN)
-      rescue Errno::EEXIST
-        # file is created by another process
-        logdev = open_logfile(filename)
-        logdev.sync = true
-      end
-      logdev
-    end
-
-    def add_log_header(file)
-      file.write(
-        "# Logfile created on %s by %s\n" % [Time.now.to_s, Logger::ProgName]
-      ) if file.size == 0
-    end
-
-    def check_shift_log
-      if @shift_age.is_a?(Integer)
-        # Note: always returns false if '0'.
-        if @filename && (@shift_age > 0) && (@dev.stat.size > @shift_size)
-          lock_shift_log { shift_log_age }
-        end
-      else
-        now = Time.now
-        if now >= @next_rotate_time
-          @next_rotate_time = next_rotate_time(now, @shift_age)
-          lock_shift_log { shift_log_period(previous_period_end(now, @shift_age)) }
-        end
-      end
-    end
-
-    if /mswin|mingw|cygwin/ =~ RbConfig::CONFIG['host_os']
-      def lock_shift_log
-        yield
-      end
-    else
-      def lock_shift_log
-        retry_limit = 8
-        retry_sleep = 0.1
-        begin
-          File.open(@filename, File::WRONLY | File::APPEND) do |lock|
-            lock.flock(File::LOCK_EX) # inter-process locking. will be unlocked at closing file
-            if File.identical?(@filename, lock) and File.identical?(lock, @dev)
-              yield # log shifting
-            else
-              # log shifted by another process (i-node before locking and i-node after locking are different)
-              @dev.close rescue nil
-              @dev = open_logfile(@filename)
-              @dev.sync = true
-            end
-          end
-        rescue Errno::ENOENT
-          # @filename file would not exist right after #rename and before #create_logfile
-          if retry_limit <= 0
-            warn("log rotation inter-process lock failed. #{$!}")
-          else
-            sleep retry_sleep
-            retry_limit -= 1
-            retry_sleep *= 2
-            retry
-          end
-        end
-      rescue
-        warn("log rotation inter-process lock failed. #{$!}")
-      end
-    end
-
-    def shift_log_age
-      (@shift_age-3).downto(0) do |i|
-        if FileTest.exist?("#{@filename}.#{i}")
-          File.rename("#{@filename}.#{i}", "#{@filename}.#{i+1}")
-        end
-      end
-      @dev.close rescue nil
-      File.rename("#{@filename}", "#{@filename}.0")
-      @dev = create_logfile(@filename)
-      return true
-    end
-
-    def shift_log_period(period_end)
-      suffix = period_end.strftime(@shift_period_suffix)
-      age_file = "#{@filename}.#{suffix}"
-      if FileTest.exist?(age_file)
-        # try to avoid filename crash caused by Timestamp change.
-        idx = 0
-        # .99 can be overridden; avoid too much file search with 'loop do'
-        while idx < 100
-          idx += 1
-          age_file = "#{@filename}.#{suffix}.#{idx}"
-          break unless FileTest.exist?(age_file)
-        end
-      end
-      @dev.close rescue nil
-      File.rename("#{@filename}", age_file)
-      @dev = create_logfile(@filename)
-      return true
-    end
-  end
-end
diff --git a/lib/logger/logger.gemspec b/lib/logger/logger.gemspec
deleted file mode 100644
index d12db625d969cf..00000000000000
--- a/lib/logger/logger.gemspec
+++ /dev/null
@@ -1,26 +0,0 @@
-begin
-  require_relative "lib/logger/version"
-rescue LoadError # Fallback to load version file in ruby core repository
-  require_relative "version"
-end
-
-Gem::Specification.new do |spec|
-  spec.name          = "logger"
-  spec.version       = Logger::VERSION
-  spec.authors       = ["Naotoshi Seo", "SHIBATA Hiroshi"]
-  spec.email         = ["sonots@gmail.com", "hsbt@ruby-lang.org"]
-
-  spec.summary       = %q{Provides a simple logging utility for outputting messages.}
-  spec.description   = %q{Provides a simple logging utility for outputting messages.}
-  spec.homepage      = "https://github.com/ruby/logger"
-  spec.licenses      = ["Ruby", "BSD-2-Clause"]
-
-  spec.files         = Dir.glob("lib/**/*.rb") + ["logger.gemspec"]
-  spec.require_paths = ["lib"]
-
-  spec.required_ruby_version = ">= 2.3.0"
-
-  spec.add_development_dependency "bundler", ">= 0"
-  spec.add_development_dependency "rake", ">= 12.3.3"
-  spec.add_development_dependency "test-unit"
-end
diff --git a/lib/logger/period.rb b/lib/logger/period.rb
deleted file mode 100644
index 0a291dbbbe799d..00000000000000
--- a/lib/logger/period.rb
+++ /dev/null
@@ -1,47 +0,0 @@
-# frozen_string_literal: true
-
-class Logger
-  module Period
-    module_function
-
-    SiD = 24 * 60 * 60
-
-    def next_rotate_time(now, shift_age)
-      case shift_age
-      when 'daily'
-        t = Time.mktime(now.year, now.month, now.mday) + SiD
-      when 'weekly'
-        t = Time.mktime(now.year, now.month, now.mday) + SiD * (7 - now.wday)
-      when 'monthly'
-        t = Time.mktime(now.year, now.month, 1) + SiD * 32
-        return Time.mktime(t.year, t.month, 1)
-      when 'now', 'everytime'
-        return now
-      else
-        raise ArgumentError, "invalid :shift_age #{shift_age.inspect}, should be daily, weekly, monthly, or everytime"
-      end
-      if t.hour.nonzero? or t.min.nonzero? or t.sec.nonzero?
-        hour = t.hour
-        t = Time.mktime(t.year, t.month, t.mday)
-        t += SiD if hour > 12
-      end
-      t
-    end
-
-    def previous_period_end(now, shift_age)
-      case shift_age
-      when 'daily'
-        t = Time.mktime(now.year, now.month, now.mday) - SiD / 2
-      when 'weekly'
-        t = Time.mktime(now.year, now.month, now.mday) - (SiD * now.wday + SiD / 2)
-      when 'monthly'
-        t = Time.mktime(now.year, now.month, 1) - SiD / 2
-      when 'now', 'everytime'
-        return now
-      else
-        raise ArgumentError, "invalid :shift_age #{shift_age.inspect}, should be daily, weekly, monthly, or everytime"
-      end
-      Time.mktime(t.year, t.month, t.mday, 23, 59, 59)
-    end
-  end
-end
diff --git a/lib/logger/severity.rb b/lib/logger/severity.rb
deleted file mode 100644
index e96fb0d320aa06..00000000000000
--- a/lib/logger/severity.rb
+++ /dev/null
@@ -1,38 +0,0 @@
-# frozen_string_literal: true
-
-class Logger
-  # Logging severity.
-  module Severity
-    # Low-level information, mostly for developers.
-    DEBUG = 0
-    # Generic (useful) information about system operation.
-    INFO = 1
-    # A warning.
-    WARN = 2
-    # A handleable error condition.
-    ERROR = 3
-    # An unhandleable error that results in a program crash.
-    FATAL = 4
-    # An unknown message that should always be logged.
-    UNKNOWN = 5
-
-    LEVELS = {
-      "debug" => DEBUG,
-      "info" => INFO,
-      "warn" => WARN,
-      "error" => ERROR,
-      "fatal" => FATAL,
-      "unknown" => UNKNOWN,
-    }
-    private_constant :LEVELS
-
-    def self.coerce(severity)
-      if severity.is_a?(Integer)
-        severity
-      else
-        key = severity.to_s.downcase
-        LEVELS[key] || raise(ArgumentError, "invalid log level: #{severity}")
-      end
-    end
-  end
-end
diff --git a/lib/logger/version.rb b/lib/logger/version.rb
deleted file mode 100644
index f85c72eed35ea7..00000000000000
--- a/lib/logger/version.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-# frozen_string_literal: true
-
-class Logger
-  VERSION = "1.5.3"
-end
diff --git a/lib/mkmf.rb b/lib/mkmf.rb
index 2acff0ddc04ac4..7ac4f916b8ae24 100644
--- a/lib/mkmf.rb
+++ b/lib/mkmf.rb
@@ -44,6 +44,23 @@ def quote
 # correctly compile and link the C extension to Ruby and a third-party
 # library.
 module MakeMakefile
+
+  target_rbconfig = nil
+  ARGV.delete_if do |arg|
+    opt = arg.delete_prefix("--target-rbconfig=")
+    unless opt == arg
+      target_rbconfig = opt
+    end
+  end
+  if target_rbconfig
+    # Load the RbConfig for the target platform into this module.
+    # Cross-compiling needs the same version of Ruby.
+    Kernel.load target_rbconfig, self
+  else
+    # The RbConfig for the target platform where the built extension runs.
+    RbConfig = ::RbConfig
+  end
+
   #### defer until this module become global-state free.
   # def self.extended(obj)
   #   obj.init_mkmf
@@ -59,6 +76,9 @@ module MakeMakefile
   # The makefile configuration using the defaults from when Ruby was built.
 
   CONFIG = RbConfig::MAKEFILE_CONFIG
+
+  ##
+  # The saved original value of +LIB+ environment variable
   ORIG_LIBPATH = ENV['LIB']
 
   ##
@@ -245,12 +265,16 @@ def map_dir(dir, map = nil)
   CSRCFLAG = CONFIG['CSRCFLAG']
   CPPOUTFILE = config_string('CPPOUTFILE') {|str| str.sub(/\bconftest\b/, CONFTEST)}
 
+  # :startdoc:
+
+  # Removes _files_.
   def rm_f(*files)
     opt = (Hash === files.last ? [files.pop] : [])
     FileUtils.rm_f(Dir[*files.flatten], *opt)
   end
   module_function :rm_f
 
+  # Removes _files_ recursively.
   def rm_rf(*files)
     opt = (Hash === files.last ? [files.pop] : [])
     FileUtils.rm_rf(Dir[*files.flatten], *opt)
@@ -265,6 +289,8 @@ def modified?(target, times)
     t if times.all? {|n| n <= t}
   end
 
+  # :stopdoc:
+
   def split_libs(*strs)
     sep = $mswin ? /\s+/ : /\s+(?=-|\z)/
     strs.flat_map {|s| s.lstrip.split(sep)}
@@ -390,6 +416,11 @@ def expand_command(commands, envs = libpath_env)
       env, *commands = commands if Hash === commands.first
       envs.merge!(env) if env
     end
+
+    # disable ASAN leak reporting - conftest programs almost always don't bother
+    # to free their memory.
+    envs['ASAN_OPTIONS'] = "detect_leaks=0" unless ENV.key?('ASAN_OPTIONS')
+
     return envs, expand[commands]
   end
 
@@ -397,11 +428,19 @@ def env_quote(envs)
     envs.map {|e, v| "#{e}=#{v.quote}"}
   end
 
-  def xsystem command, opts = nil
+  # :startdoc:
+
+  # call-seq:
+  #   xsystem(command, werror: false)   -> true or false
+  #
+  # Executes _command_ with expanding variables, and returns the exit
+  # status like as Kernel#system.  If _werror_ is true and the error
+  # output is not empty, returns +false+.  The output will logged.
+  def xsystem(command, werror: false)
     env, command = expand_command(command)
     Logging::open do
       puts [env_quote(env), command.quote].join(' ')
-      if opts and opts[:werror]
+      if werror
         result = nil
         Logging.postpone do |log|
           output = IO.popen(env, command, &:read)
@@ -415,6 +454,7 @@ def xsystem command, opts = nil
     end
   end
 
+  # Executes _command_ similarly to xsystem, but yields opened pipe.
   def xpopen command, *mode, &block
     env, commands = expand_command(command)
     command = [env_quote(env), command].join(' ')
@@ -429,6 +469,7 @@ def xpopen command, *mode, &block
     end
   end
 
+  # Logs _src_
   def log_src(src, heading="checked program was")
     src = src.split(/^/)
     fmt = "%#{src.size.to_s.size}d: %s"
@@ -443,10 +484,15 @@ def log_src(src, heading="checked program was")
 EOM
   end
 
+  # Returns the language-dependent source file name for configuration
+  # checks.
   def conftest_source
     CONFTEST_C
   end
 
+  # Creats temporary source file from +COMMON_HEADERS+ and _src_.
+  # Yields the created source string and uses the returned string as
+  # the source code, if the block is given.
   def create_tmpsrc(src)
     src = "#{COMMON_HEADERS}\n#{src}"
     src = yield(src) if block_given?
@@ -467,6 +513,8 @@ def create_tmpsrc(src)
     src
   end
 
+  # :stopdoc:
+
   def have_devel?
     unless defined? $have_devel
       $have_devel = true
@@ -475,7 +523,7 @@ def have_devel?
     $have_devel
   end
 
-  def try_do(src, command, *opts, &b)
+  def try_do(src, command, **opts, &b)
     unless have_devel?
       raise <<MSG
 The compiler failed to generate an executable file.
@@ -484,7 +532,7 @@ def try_do(src, command, *opts, &b)
     end
     begin
       src = create_tmpsrc(src, &b)
-      xsystem(command, *opts)
+      xsystem(command, **opts)
     ensure
       log_src(src)
     end
@@ -535,42 +583,42 @@ def cpp_command(outfile, opt="")
   end
 
   def libpathflag(libpath=$DEFLIBPATH|$LIBPATH)
+    libpathflags = nil
     libpath.map{|x|
       case x
       when "$(topdir)", /\A\./
         LIBPATHFLAG
       else
-        LIBPATHFLAG+RPATHFLAG
+        libpathflags ||= [LIBPATHFLAG, RPATHFLAG].grep(/\S/).join(" ")
       end % x.quote
-    }.join
+    }.join(" ")
+  end
+
+  def werror_flag(opt = nil)
+    config_string("WERRORFLAG") {|flag| opt = opt && !opt.empty? ? "#{opt} #{flag}" : flag}
+    opt
   end
 
   def with_werror(opt, opts = nil)
-    if opts
-      if opts[:werror] and config_string("WERRORFLAG") {|flag| opt = opt ? "#{opt} #{flag}" : flag}
-        (opts = opts.dup).delete(:werror)
-      end
-      yield(opt, opts)
-    else
-      yield(opt)
-    end
+    opt = werror_flag(opt) if opts and (opts = opts.dup).delete(:werror)
+    yield(opt, opts)
   end
 
-  def try_link0(src, opt="", *opts, &b) # :nodoc:
+  def try_link0(src, opt = "", ldflags: "", **opts, &b) # :nodoc:
     exe = CONFTEST+$EXEEXT
-    cmd = link_command("", opt)
+    cmd = link_command(ldflags, opt)
     if $universal
       require 'tmpdir'
       Dir.mktmpdir("mkmf_", oldtmpdir = ENV["TMPDIR"]) do |tmpdir|
         begin
           ENV["TMPDIR"] = tmpdir
-          try_do(src, cmd, *opts, &b)
+          try_do(src, cmd, **opts, &b)
         ensure
           ENV["TMPDIR"] = oldtmpdir
         end
       end
     else
-      try_do(src, cmd, *opts, &b)
+      try_do(src, cmd, **opts, &b)
     end and File.executable?(exe) or return nil
     exe
   ensure
@@ -579,31 +627,32 @@ def try_link0(src, opt="", *opts, &b) # :nodoc:
 
   # Returns whether or not the +src+ can be compiled as a C source and linked
   # with its depending libraries successfully.  +opt+ is passed to the linker
-  # as options. Note that +$CFLAGS+ and +$LDFLAGS+ are also passed to the
-  # linker.
+  # as options. Note that <tt>$CFLAGS</tt> and <tt>$LDFLAGS</tt> are also
+  # passed to the linker.
   #
   # If a block given, it is called with the source before compilation. You can
   # modify the source in the block.
   #
   # [+src+] a String which contains a C source
   # [+opt+] a String which contains linker options
-  def try_link(src, opt="", *opts, &b)
-    exe = try_link0(src, opt, *opts, &b) or return false
+  def try_link(src, opt = "", **opts, &b)
+    exe = try_link0(src, opt, **opts, &b) or return false
     MakeMakefile.rm_f exe
     true
   end
 
   # Returns whether or not the +src+ can be compiled as a C source.  +opt+ is
-  # passed to the C compiler as options. Note that +$CFLAGS+ is also passed to
-  # the compiler.
+  # passed to the C compiler as options. Note that <tt>$CFLAGS</tt> is also
+  # passed to the compiler.
   #
   # If a block given, it is called with the source before compilation. You can
   # modify the source in the block.
   #
   # [+src+] a String which contains a C source
   # [+opt+] a String which contains compiler options
-  def try_compile(src, opt="", *opts, &b)
-    with_werror(opt, *opts) {|_opt, *| try_do(src, cc_command(_opt), *opts, &b)} and
+  def try_compile(src, opt = "", werror: nil, **opts, &b)
+    opt = werror_flag(opt) if werror
+    try_do(src, cc_command(opt), werror: werror, **opts, &b) and
       File.file?("#{CONFTEST}.#{$OBJEXT}")
   ensure
     MakeMakefile.rm_f "#{CONFTEST}*"
@@ -611,15 +660,15 @@ def try_compile(src, opt="", *opts, &b)
 
   # Returns whether or not the +src+ can be preprocessed with the C
   # preprocessor.  +opt+ is passed to the preprocessor as options. Note that
-  # +$CFLAGS+ is also passed to the preprocessor.
+  # <tt>$CFLAGS</tt> is also passed to the preprocessor.
   #
   # If a block given, it is called with the source before preprocessing. You
   # can modify the source in the block.
   #
   # [+src+] a String which contains a C source
   # [+opt+] a String which contains preprocessor options
-  def try_cpp(src, opt="", *opts, &b)
-    try_do(src, cpp_command(CPPOUTFILE, opt), *opts, &b) and
+  def try_cpp(src, opt = "", **opts, &b)
+    try_do(src, cpp_command(CPPOUTFILE, opt), **opts, &b) and
       File.file?("#{CONFTEST}.i")
   ensure
     MakeMakefile.rm_f "#{CONFTEST}*"
@@ -636,6 +685,14 @@ def cpp_include(header)
     end
   end
 
+  # :startdoc:
+
+  # Sets <tt>$CPPFLAGS</tt> to _flags_ and yields.  If the block returns a
+  # falsy value, <tt>$CPPFLAGS</tt> is reset to its previous value, remains
+  # set to _flags_ otherwise.
+  #
+  # [+flags+] a C preprocessor flag as a +String+
+  #
   def with_cppflags(flags)
     cppflags = $CPPFLAGS
     $CPPFLAGS = flags.dup
@@ -644,20 +701,29 @@ def with_cppflags(flags)
     $CPPFLAGS = cppflags unless ret
   end
 
-  def try_cppflags(flags, opts = {})
-    try_header(MAIN_DOES_NOTHING, flags, {:werror => true}.update(opts))
+  # :nodoc:
+  def try_cppflags(flags, werror: true, **opts)
+    try_header(MAIN_DOES_NOTHING, flags, werror: werror, **opts)
   end
 
-  def append_cppflags(flags, *opts)
+  # Check whether each given C preprocessor flag is acceptable and append it
+  # to <tt>$CPPFLAGS</tt> if so.
+  #
+  # [+flags+] a C preprocessor flag as a +String+ or an +Array+ of them
+  #
+  def append_cppflags(flags, **opts)
     Array(flags).each do |flag|
       if checking_for("whether #{flag} is accepted as CPPFLAGS") {
-           try_cppflags(flag, *opts)
+           try_cppflags(flag, **opts)
          }
         $CPPFLAGS << " " << flag
       end
     end
   end
 
+  # Sets <tt>$CFLAGS</tt> to _flags_ and yields.  If the block returns a falsy
+  # value, <tt>$CFLAGS</tt> is reset to its previous value, remains set to
+  # _flags_ otherwise.
   def with_cflags(flags)
     cflags = $CFLAGS
     $CFLAGS = flags.dup
@@ -666,10 +732,14 @@ def with_cflags(flags)
     $CFLAGS = cflags unless ret
   end
 
-  def try_cflags(flags, opts = {})
-    try_compile(MAIN_DOES_NOTHING, flags, {:werror => true}.update(opts))
+  # :nodoc:
+  def try_cflags(flags, werror: true, **opts)
+    try_compile(MAIN_DOES_NOTHING, flags, werror: werror, **opts)
   end
 
+  # Sets <tt>$LDFLAGS</tt> to _flags_ and yields.  If the block returns a
+  # falsy value, <tt>$LDFLAGS</tt> is reset to its previous value, remains set
+  # to _flags_ otherwise.
   def with_ldflags(flags)
     ldflags = $LDFLAGS
     $LDFLAGS = flags.dup
@@ -678,21 +748,30 @@ def with_ldflags(flags)
     $LDFLAGS = ldflags unless ret
   end
 
-  def try_ldflags(flags, opts = {})
-    opts = {:werror => true}.update(opts) if $mswin
-    try_link(MAIN_DOES_NOTHING, flags, opts)
+  # :nodoc:
+  def try_ldflags(flags, werror: $mswin, **opts)
+    try_link(MAIN_DOES_NOTHING, "", ldflags: flags, werror: werror, **opts)
   end
 
-  def append_ldflags(flags, *opts)
+  # :startdoc:
+
+  # Check whether each given linker flag is acceptable and append it to
+  # <tt>$LDFLAGS</tt> if so.
+  #
+  # [+flags+] a linker flag as a +String+ or an +Array+ of them
+  #
+  def append_ldflags(flags, **opts)
     Array(flags).each do |flag|
       if checking_for("whether #{flag} is accepted as LDFLAGS") {
-           try_ldflags(flag, *opts)
+           try_ldflags(flag, **opts)
          }
         $LDFLAGS << " " << flag
       end
     end
   end
 
+  # :stopdoc:
+
   def try_static_assert(expr, headers = nil, opt = "", &b)
     headers = cpp_include(headers)
     try_compile(<<SRC, opt, &b)
@@ -828,6 +907,8 @@ def try_var(var, headers = nil, opt = "", &b)
 SRC
   end
 
+  # :startdoc:
+
   # Returns whether or not the +src+ can be preprocessed with the C
   # preprocessor and matches with +pat+.
   #
@@ -866,6 +947,8 @@ def egrep_cpp(pat, src, opt = "", &b)
     log_src(src)
   end
 
+  # :stopdoc:
+
   # This is used internally by the have_macro? method.
   def macro_defined?(macro, src, opt = "", &b)
     src = src.sub(/[^\n]\z/, "\\&\n")
@@ -885,8 +968,8 @@ def macro_defined?(macro, src, opt = "", &b)
   # * the linked file can be invoked as an executable
   # * and the executable exits successfully
   #
-  # +opt+ is passed to the linker as options. Note that +$CFLAGS+ and
-  # +$LDFLAGS+ are also passed to the linker.
+  # +opt+ is passed to the linker as options. Note that <tt>$CFLAGS</tt> and
+  # <tt>$LDFLAGS</tt> are also passed to the linker.
   #
   # If a block given, it is called with the source before compilation. You can
   # modify the source in the block.
@@ -958,6 +1041,10 @@ def append_library(libs, lib) # :no-doc:
     format(LIBARG, lib) + " " + libs
   end
 
+  # Prints messages to $stdout, if verbose mode.
+  #
+  # Internal use only.
+  #
   def message(*s)
     unless Logging.quiet and not $VERBOSE
       printf(*s)
@@ -989,6 +1076,10 @@ def checking_for(m, fmt = nil)
     r
   end
 
+  # Build a message for checking.
+  #
+  # Internal use only.
+  #
   def checking_message(target, place = nil, opt = nil)
     [["in", place], ["with", opt]].inject("#{target}") do |msg, (pre, noun)|
       if noun
@@ -1013,10 +1104,10 @@ def checking_message(target, place = nil, opt = nil)
   #
   # [+flags+] a C compiler flag as a +String+ or an +Array+ of them
   #
-  def append_cflags(flags, *opts)
+  def append_cflags(flags, **opts)
     Array(flags).each do |flag|
       if checking_for("whether #{flag} is accepted as CFLAGS") {
-           try_cflags(flag, *opts)
+           try_cflags(flag, **opts)
          }
         $CFLAGS << " " << flag
       end
@@ -1250,6 +1341,7 @@ def have_struct_member(type, member, headers = nil, opt = "", &b)
     end
   end
 
+  # :nodoc:
   # Returns whether or not the static type +type+ is defined.
   #
   # See also +have_type+
@@ -1307,6 +1399,7 @@ def fmt.%(x)
     end
   end
 
+  # :nodoc:
   # Returns whether or not the constant +const+ is defined.
   #
   # See also +have_const+
@@ -1466,7 +1559,7 @@ def convertible_int(type, headers = nil, opts = nil, &b)
           u = "unsigned " if signed > 0
           prelude << "extern rbcv_typedef_ foo();"
           compat = UNIVERSAL_INTS.find {|t|
-            try_compile([prelude, "extern #{u}#{t} foo();"].join("\n"), opts, :werror=>true, &b)
+            try_compile([prelude, "extern #{u}#{t} foo();"].join("\n"), opts, werror: true, &b)
           }
         end
         if compat
@@ -1490,7 +1583,7 @@ def convertible_int(type, headers = nil, opts = nil, &b)
   # Used internally by the what_type? method to determine if +type+ is a scalar
   # pointer.
   def scalar_ptr_type?(type, member = nil, headers = nil, &b)
-    try_compile(<<"SRC", &b)   # pointer
+    try_compile(<<"SRC", &b)
 #{cpp_include(headers)}
 /*top*/
 volatile #{type} conftestval;
@@ -1503,7 +1596,7 @@ def scalar_ptr_type?(type, member = nil, headers = nil, &b)
   # Used internally by the what_type? method to determine if +type+ is a scalar
   # pointer.
   def scalar_type?(type, member = nil, headers = nil, &b)
-    try_compile(<<"SRC", &b)   # pointer
+    try_compile(<<"SRC", &b)
 #{cpp_include(headers)}
 /*top*/
 volatile #{type} conftestval;
@@ -1525,6 +1618,10 @@ def have_typeof?
     end
   end
 
+  # :startdoc:
+
+  # Returns a string represents the type of _type_, or _member_ of
+  # _type_ if _member_ is not +nil+.
   def what_type?(type, member = nil, headers = nil, &b)
     m = "#{type}"
     var = val = "*rbcv_var_"
@@ -1584,6 +1681,8 @@ def fmt.%(x)
     end
   end
 
+  # :nodoc:
+  #
   # This method is used internally by the find_executable method.
   #
   # Internal use only.
@@ -1622,8 +1721,6 @@ def find_executable0(bin, path = nil)
     nil
   end
 
-  # :startdoc:
-
   # Searches for the executable +bin+ on +path+.  The default path is your
   # +PATH+ environment variable. If that isn't defined, it will resort to
   # searching /usr/local/bin, /usr/ucb, /usr/bin and /bin.
@@ -1792,7 +1889,8 @@ def create_header(header = "extconf.h")
   # application.
   #
   def dir_config(target, idefault=nil, ldefault=nil)
-    if conf = $config_dirs[target]
+    key = [target, idefault, ldefault].compact.join("\0")
+    if conf = $config_dirs[key]
       return conf
     end
 
@@ -1802,9 +1900,13 @@ def dir_config(target, idefault=nil, ldefault=nil)
     end
 
     idir = with_config(target + "-include", idefault)
-    $arg_config.last[1] ||= "${#{target}-dir}/include"
+    if conf = $arg_config.assoc("--with-#{target}-include")
+      conf[1] ||= "${#{target}-dir}/include"
+    end
     ldir = with_config(target + "-lib", ldefault)
-    $arg_config.last[1] ||= "${#{target}-dir}/#{_libdir_basename}"
+    if conf = $arg_config.assoc("--with-#{target}-lib")
+      conf[1] ||= "${#{target}-dir}/#{_libdir_basename}"
+    end
 
     idirs = idir ? Array === idir ? idir.dup : idir.split(File::PATH_SEPARATOR) : []
     if defaults
@@ -1826,7 +1928,7 @@ def dir_config(target, idefault=nil, ldefault=nil)
     end
     $LIBPATH = ldirs | $LIBPATH
 
-    $config_dirs[target] = [idir, ldir]
+    $config_dirs[key] = [idir, ldir]
   end
 
   # Returns compile/link information about an installed library in a tuple of <code>[cflags,
@@ -1866,7 +1968,7 @@ def fmt.%(x)
       if pkgconfig = with_config("#{pkg}-config") and find_executable0(pkgconfig)
       # if and only if package specific config command is given
       elsif ($PKGCONFIG ||=
-             (pkgconfig = with_config("pkg-config") {config_string("PKG_CONFIG") || "pkg-config"}) &&
+             (pkgconfig = with_config("pkg-config") {config_string("PKG_CONFIG") || ENV["PKG_CONFIG"] || "pkg-config"}) &&
              find_executable0(pkgconfig) && pkgconfig) and
            xsystem([*envs, $PKGCONFIG, "--exists", pkg])
         # default to pkg-config command
@@ -1882,7 +1984,20 @@ def fmt.%(x)
           opts = Array(opts).map { |o| "--#{o}" }
           opts = xpopen([*envs, pkgconfig, *opts, *args], err:[:child, :out], &:read)
           Logging.open {puts opts.each_line.map{|s|"=> #{s.inspect}"}}
-          opts.strip if $?.success?
+          if $?.success?
+            opts = opts.strip
+            libarg, libpath = LIBARG, LIBPATHFLAG.strip
+            opts = opts.shellsplit.map { |s|
+              if s.start_with?('-l')
+                libarg % s[2..]
+              elsif s.start_with?('-L')
+                libpath % s[2..]
+              else
+                s
+              end
+            }.quote.join(" ")
+            opts
+          end
         }
       end
       orig_ldflags = $LDFLAGS
@@ -2064,7 +2179,9 @@ def configuration(srcdir)
 DLDFLAGS = $(ldflags) $(dldflags) $(ARCH_FLAG)
 LDSHARED = #{CONFIG['LDSHARED']}
 LDSHAREDXX = #{config_string('LDSHAREDXX') || '$(LDSHARED)'}
+POSTLINK = #{config_string('POSTLINK', RbConfig::CONFIG)}
 AR = #{CONFIG['AR']}
+LD = #{CONFIG['LD']}
 EXEEXT = #{CONFIG['EXEEXT']}
 
 }
@@ -2264,6 +2381,19 @@ def depend_rules(depend)
   # directory, i.e. the current directory.  It is included as part of the
   # +VPATH+ and added to the list of +INCFLAGS+.
   #
+  # Yields the configuration part of the makefile to be generated, as an array
+  # of strings, if the block is given.  The returned value will be used the
+  # new configuration part.
+  #
+  #   create_makefile('foo') {|conf|
+  #     [
+  #       *conf,
+  #       "MACRO_YOU_NEED = something",
+  #     ]
+  #   }
+  #
+  # If "depend" file exist in the source directory, that content will be
+  # included in the generated makefile, with formatted by depend_rules method.
   def create_makefile(target, srcprefix = nil)
     $target = target
     libpath = $DEFLIBPATH|$LIBPATH
@@ -2372,7 +2502,7 @@ def create_makefile(target, srcprefix = nil)
 DLLIB = #{dllib}
 EXTSTATIC = #{$static || ""}
 STATIC_LIB = #{staticlib unless $static.nil?}
-#{!$extout && defined?($installed_list) ? "INSTALLED_LIST = #{$installed_list}\n" : ""}
+#{!$extout && defined?($installed_list) ? %[INSTALLED_LIST = #{$installed_list}\n] : ""}
 TIMESTAMP_DIR = #{$extout && $extmk ? '$(extout)/.timestamp' : '.'}
 " #"
     # TODO: fixme
@@ -2380,16 +2510,19 @@ def create_makefile(target, srcprefix = nil)
     sodir = $extout ? '$(TARGET_SO_DIR)' : '$(RUBYARCHDIR)'
     n = '$(TARGET_SO_DIR)$(TARGET)'
     cleanobjs = ["$(OBJS)"]
+    cleanlibs = []
     if $extmk
       %w[bc i s].each {|ex| cleanobjs << "$(OBJS:.#{$OBJEXT}=.#{ex})"}
     end
     if target
       config_string('cleanobjs') {|t| cleanobjs << t.gsub(/\$\*/, "$(TARGET)#{deffile ? '-$(arch)': ''}")}
+      cleanlibs << '$(TARGET_SO)'
     end
+    config_string('cleanlibs') {|t| cleanlibs << t.gsub(/\$\*/) {n}}
     conf << "\
 TARGET_SO_DIR =#{$extout ? " $(RUBYARCHDIR)/" : ''}
 TARGET_SO     = $(TARGET_SO_DIR)$(DLLIB)
-CLEANLIBS     = #{'$(TARGET_SO) ' if target}#{config_string('cleanlibs') {|t| t.gsub(/\$\*/) {n}}}
+CLEANLIBS     = #{cleanlibs.join(' ')}
 CLEANOBJS     = #{cleanobjs.join(' ')} *.bak
 TARGET_SO_DIR_TIMESTAMP = #{timestamp_file(sodir, target_prefix)}
 " #"
@@ -2399,7 +2532,7 @@ def create_makefile(target, srcprefix = nil)
     mfile.puts(conf)
     mfile.print "
 all:    #{$extout ? "install" : target ? "$(DLLIB)" : "Makefile"}
-static: #{$extmk && !$static ? "all" : "$(STATIC_LIB)#{$extout ? " install-rb" : ""}"}
+static: #{$extmk && !$static ? "all" : %[$(STATIC_LIB)#{$extout ? " install-rb" : ""}]}
 .PHONY: all install static install-so install-rb
 .PHONY: clean clean-so clean-static clean-rb
 " #"
@@ -2430,6 +2563,7 @@ def create_makefile(target, srcprefix = nil)
         mfile.puts dest
         mfile.print "clean-so::\n"
         mfile.print "\t-$(Q)$(RM) #{fseprepl[dest]} #{fseprepl[stamp]}\n"
+        mfile.print "\t-$(Q)$(RM_RF) #{fseprepl['$(CLEANLIBS)']}\n"
         mfile.print "\t-$(Q)$(RMDIRS) #{fseprepl[dir]}#{$ignore_error}\n"
       else
         mfile.print "#{f} #{stamp}\n"
@@ -2460,7 +2594,7 @@ def create_makefile(target, srcprefix = nil)
           dest = "#{dir}/#{File.basename(f)}"
           mfile.print("do-install-rb#{sfx}: #{dest}\n")
           mfile.print("#{dest}: #{f} #{timestamp_file(dir, target_prefix)}\n")
-          mfile.print("\t$(Q) $(#{$extout ? 'COPY' : 'INSTALL_DATA'}) #{f} $(@D)\n")
+          mfile.print("\t$(Q) $(#{$extout ? 'COPY' : 'INSTALL_DATA'}) #{f} $@\n")
           if defined?($installed_list) and !$extout
             mfile.print("\t@echo #{dest}>>$(INSTALLED_LIST)\n")
           end
@@ -2722,6 +2856,9 @@ def MAIN_DOES_NOTHING(*refs)
 
   split = Shellwords.method(:shellwords).to_proc
 
+  ##
+  # The prefix added to exported symbols automatically
+
   EXPORT_PREFIX = config_string('EXPORT_PREFIX') {|s| s.strip}
 
   hdr = ['#include "ruby.h"' "\n"]
@@ -2751,6 +2888,10 @@ def MAIN_DOES_NOTHING(*refs)
   # make compile rules
 
   COMPILE_RULES = config_string('COMPILE_RULES', &split) || %w[.%s.%s:]
+
+  ##
+  # Substitution in rules for NMake
+
   RULE_SUBST = config_string('RULE_SUBST')
 
   ##
@@ -2795,7 +2936,11 @@ def MAIN_DOES_NOTHING(*refs)
   ##
   # Argument which will add a library path to the linker
 
-  LIBPATHFLAG = config_string('LIBPATHFLAG') || ' -L%s'
+  LIBPATHFLAG = config_string('LIBPATHFLAG') || '-L%s'
+
+  ##
+  # Argument which will add a runtime library path to the linker
+
   RPATHFLAG = config_string('RPATHFLAG') || ''
 
   ##
@@ -2807,6 +2952,10 @@ def MAIN_DOES_NOTHING(*refs)
   # A C main function which does no work
 
   MAIN_DOES_NOTHING = config_string('MAIN_DOES_NOTHING') || "int main(int argc, char **argv)\n{\n  return !!argv[argc];\n}"
+
+  ##
+  # The type names for convertible_int
+
   UNIVERSAL_INTS = config_string('UNIVERSAL_INTS') {|s| Shellwords.shellwords(s)} ||
     %w[int short long long\ long]
 
@@ -2837,18 +2986,32 @@ def MAIN_DOES_NOTHING(*refs)
 
   @lang = Hash.new(self)
 
+  ##
+  # Retrieves the module for _name_ language.
   def self.[](name)
     @lang.fetch(name)
   end
 
+  ##
+  # Defines the module for _name_ language.
   def self.[]=(name, mod)
     @lang[name] = mod
   end
 
-  self["C++"] = Module.new do
+  ##
+  # The language that this module is for
+  LANGUAGE = -"C"
+
+  self[self::LANGUAGE] = self
+
+  cxx = Module.new do
+    # Module for C++
+
     include MakeMakefile
     extend self
 
+    # :stopdoc:
+
     CONFTEST_CXX = "#{CONFTEST}.#{config_string('CXX_EXT') || CXX_EXT[0]}"
 
     TRY_LINK_CXX = config_string('TRY_LINK_CXX') ||
@@ -2878,7 +3041,12 @@ def link_command(ldflags, *opts)
       conf = link_config(ldflags, *opts)
       RbConfig::expand(TRY_LINK_CXX.dup, conf)
     end
+
+    # :startdoc:
   end
+
+  cxx::LANGUAGE = -"C++"
+  self[cxx::LANGUAGE] = cxx
 end
 
 # MakeMakefile::Global = #
diff --git a/lib/mutex_m.gemspec b/lib/mutex_m.gemspec
deleted file mode 100644
index ebbda2606c9fb5..00000000000000
--- a/lib/mutex_m.gemspec
+++ /dev/null
@@ -1,28 +0,0 @@
-begin
-  require_relative "lib/mutex_m"
-rescue LoadError
-  # for Ruby core repository
-  require_relative "mutex_m"
-end
-
-Gem::Specification.new do |spec|
-  spec.name          = "mutex_m"
-  spec.version       = Mutex_m::VERSION
-  spec.authors       = ["Keiju ISHITSUKA"]
-  spec.email         = ["keiju@ruby-lang.org"]
-
-  spec.summary       = %q{Mixin to extend objects to be handled like a Mutex.}
-  spec.description   = %q{Mixin to extend objects to be handled like a Mutex.}
-  spec.homepage      = "https://github.com/ruby/mutex_m"
-  spec.licenses      = ["Ruby", "BSD-2-Clause"]
-
-  spec.files         = ["Gemfile", "LICENSE.txt", "README.md", "Rakefile", "lib/mutex_m.rb", "mutex_m.gemspec"]
-  spec.bindir        = "exe"
-  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
-  spec.require_paths = ["lib"]
-  spec.required_ruby_version = '>= 2.5'
-
-  spec.add_development_dependency "bundler"
-  spec.add_development_dependency "rake"
-  spec.add_development_dependency "test-unit"
-end
diff --git a/lib/mutex_m.rb b/lib/mutex_m.rb
deleted file mode 100644
index 4c888d6a1751dc..00000000000000
--- a/lib/mutex_m.rb
+++ /dev/null
@@ -1,116 +0,0 @@
-# frozen_string_literal: false
-#
-#   mutex_m.rb -
-#       $Release Version: 3.0$
-#       $Revision: 1.7 $
-#       Original from mutex.rb
-#       by Keiju ISHITSUKA(keiju@ishitsuka.com)
-#       modified by matz
-#       patched by akira yamada
-#
-# --
-
-# = mutex_m.rb
-#
-# When 'mutex_m' is required, any object that extends or includes Mutex_m will
-# be treated like a Mutex.
-#
-# Start by requiring the standard library Mutex_m:
-#
-#   require "mutex_m.rb"
-#
-# From here you can extend an object with Mutex instance methods:
-#
-#   obj = Object.new
-#   obj.extend Mutex_m
-#
-# Or mixin Mutex_m into your module to your class inherit Mutex instance
-# methods --- remember to call super() in your class initialize method.
-#
-#   class Foo
-#     include Mutex_m
-#     def initialize
-#       # ...
-#       super()
-#     end
-#     # ...
-#   end
-#   obj = Foo.new
-#   # this obj can be handled like Mutex
-#
-module Mutex_m
-
-  VERSION = "0.1.2"
-  Ractor.make_shareable(VERSION) if defined?(Ractor)
-
-  def Mutex_m.define_aliases(cl) # :nodoc:
-    cl.alias_method(:locked?, :mu_locked?)
-    cl.alias_method(:lock, :mu_lock)
-    cl.alias_method(:unlock, :mu_unlock)
-    cl.alias_method(:try_lock, :mu_try_lock)
-    cl.alias_method(:synchronize, :mu_synchronize)
-  end
-
-  def Mutex_m.append_features(cl) # :nodoc:
-    super
-    define_aliases(cl) unless cl.instance_of?(Module)
-  end
-
-  def Mutex_m.extend_object(obj) # :nodoc:
-    super
-    obj.mu_extended
-  end
-
-  def mu_extended # :nodoc:
-    unless (defined? locked? and
-            defined? lock and
-            defined? unlock and
-            defined? try_lock and
-            defined? synchronize)
-      Mutex_m.define_aliases(singleton_class)
-    end
-    mu_initialize
-  end
-
-  # See Thread::Mutex#synchronize
-  def mu_synchronize(&block)
-    @_mutex.synchronize(&block)
-  end
-
-  # See Thread::Mutex#locked?
-  def mu_locked?
-    @_mutex.locked?
-  end
-
-  # See Thread::Mutex#try_lock
-  def mu_try_lock
-    @_mutex.try_lock
-  end
-
-  # See Thread::Mutex#lock
-  def mu_lock
-    @_mutex.lock
-  end
-
-  # See Thread::Mutex#unlock
-  def mu_unlock
-    @_mutex.unlock
-  end
-
-  # See Thread::Mutex#sleep
-  def sleep(timeout = nil)
-    @_mutex.sleep(timeout)
-  end
-
-  private
-
-  def mu_initialize # :nodoc:
-    @_mutex = Thread::Mutex.new
-  end
-
-  def initialize(*args) # :nodoc:
-    mu_initialize
-    super
-  end
-  ruby2_keywords(:initialize) if respond_to?(:ruby2_keywords, true)
-end
diff --git a/lib/net/http.rb b/lib/net/http.rb
index ff780b45bd3c2a..85051a44680118 100644
--- a/lib/net/http.rb
+++ b/lib/net/http.rb
@@ -67,6 +67,8 @@ class HTTPHeaderSyntaxError < StandardError; end
   #     Net::HTTP.post(uri, data)
   #     params = {title: 'foo', body: 'bar', userId: 1}
   #     Net::HTTP.post_form(uri, params)
+  #     data = '{"title": "foo", "body": "bar", "userId": 1}'
+  #     Net::HTTP.put(uri, data)
   #
   # - If performance is important, consider using sessions, which lower request overhead.
   #   This {session}[rdoc-ref:Net::HTTP@Sessions] has multiple requests for
@@ -456,6 +458,10 @@ class HTTPHeaderSyntaxError < StandardError; end
   #
   # == What's Here
   #
+  # First, what's elsewhere. Class Net::HTTP:
+  #
+  # - Inherits from {class Object}[rdoc-ref:Object@What-27s+Here].
+  #
   # This is a categorized summary of methods and attributes.
   #
   # === \Net::HTTP Objects
@@ -469,8 +475,7 @@ class HTTPHeaderSyntaxError < StandardError; end
   #
   # - {::start}[rdoc-ref:Net::HTTP.start]:
   #   Begins a new session in a new \Net::HTTP object.
-  # - {#started?}[rdoc-ref:Net::HTTP#started?]
-  #   (aliased as {#active?}[rdoc-ref:Net::HTTP#active?]):
+  # - {#started?}[rdoc-ref:Net::HTTP#started?]:
   #   Returns whether in a session.
   # - {#finish}[rdoc-ref:Net::HTTP#finish]:
   #   Ends an active session.
@@ -520,6 +525,8 @@ class HTTPHeaderSyntaxError < StandardError; end
   #   Sends a POST request with form data and returns a response object.
   # - {::post}[rdoc-ref:Net::HTTP.post]:
   #   Sends a POST request with data and returns a response object.
+  # - {::put}[rdoc-ref:Net::HTTP.put]:
+  #   Sends a PUT request with data and returns a response object.
   # - {#copy}[rdoc-ref:Net::HTTP#copy]:
   #   Sends a COPY request and returns a response object.
   # - {#delete}[rdoc-ref:Net::HTTP#delete]:
@@ -548,18 +555,15 @@ class HTTPHeaderSyntaxError < StandardError; end
   #   Sends a PUT request and returns a response object.
   # - {#request}[rdoc-ref:Net::HTTP#request]:
   #   Sends a request and returns a response object.
-  # - {#request_get}[rdoc-ref:Net::HTTP#request_get]
-  #   (aliased as {#get2}[rdoc-ref:Net::HTTP#get2]):
+  # - {#request_get}[rdoc-ref:Net::HTTP#request_get]:
   #   Sends a GET request and forms a response object;
   #   if a block given, calls the block with the object,
   #   otherwise returns the object.
-  # - {#request_head}[rdoc-ref:Net::HTTP#request_head]
-  #   (aliased as {#head2}[rdoc-ref:Net::HTTP#head2]):
+  # - {#request_head}[rdoc-ref:Net::HTTP#request_head]:
   #   Sends a HEAD request and forms a response object;
   #   if a block given, calls the block with the object,
   #   otherwise returns the object.
-  # - {#request_post}[rdoc-ref:Net::HTTP#request_post]
-  #   (aliased as {#post2}[rdoc-ref:Net::HTTP#post2]):
+  # - {#request_post}[rdoc-ref:Net::HTTP#request_post]:
   #   Sends a POST request and forms a response object;
   #   if a block given, calls the block with the object,
   #   otherwise returns the object.
@@ -597,8 +601,7 @@ class HTTPHeaderSyntaxError < StandardError; end
   #   Returns whether +self+ is a proxy class.
   # - {#proxy?}[rdoc-ref:Net::HTTP#proxy?]:
   #   Returns whether +self+ has a proxy.
-  # - {#proxy_address}[rdoc-ref:Net::HTTP#proxy_address]
-  #   (aliased as {#proxyaddr}[rdoc-ref:Net::HTTP#proxyaddr]):
+  # - {#proxy_address}[rdoc-ref:Net::HTTP#proxy_address]:
   #   Returns the proxy address.
   # - {#proxy_from_env?}[rdoc-ref:Net::HTTP#proxy_from_env?]:
   #   Returns whether the proxy is taken from an environment variable.
@@ -710,8 +713,7 @@ class HTTPHeaderSyntaxError < StandardError; end
   # === \HTTP Version
   #
   # - {::version_1_2?}[rdoc-ref:Net::HTTP.version_1_2?]
-  #   (aliased as {::is_version_1_2?}[rdoc-ref:Net::HTTP.is_version_1_2?]
-  #   and {::version_1_2}[rdoc-ref:Net::HTTP.version_1_2]):
+  #   (aliased as {::version_1_2}[rdoc-ref:Net::HTTP.version_1_2]):
   #   Returns true; retained for compatibility.
   #
   # === Debugging
@@ -722,8 +724,7 @@ class HTTPHeaderSyntaxError < StandardError; end
   class HTTP < Protocol
 
     # :stopdoc:
-    VERSION = "0.3.2"
-    Revision = %q$Revision$.split[1]
+    VERSION = "0.6.0"
     HTTPVersion = '1.1'
     begin
       require 'zlib'
@@ -890,6 +891,39 @@ def HTTP.post_form(url, params)
       }
     end
 
+    # Sends a PUT request to the server; returns a Net::HTTPResponse object.
+    #
+    # Argument +url+ must be a URL;
+    # argument +data+ must be a string:
+    #
+    #   _uri = uri.dup
+    #   _uri.path = '/posts'
+    #   data = '{"title": "foo", "body": "bar", "userId": 1}'
+    #   headers = {'content-type': 'application/json'}
+    #   res = Net::HTTP.put(_uri, data, headers) # => #<Net::HTTPCreated 201 Created readbody=true>
+    #   puts res.body
+    #
+    # Output:
+    #
+    #   {
+    #     "title": "foo",
+    #     "body": "bar",
+    #     "userId": 1,
+    #     "id": 101
+    #   }
+    #
+    # Related:
+    #
+    # - Net::HTTP::Put: request class for \HTTP method +PUT+.
+    # - Net::HTTP#put: convenience method for \HTTP method +PUT+.
+    #
+    def HTTP.put(url, data, header = nil)
+      start(url.hostname, url.port,
+            :use_ssl => url.scheme == 'https' ) {|http|
+        http.put(url, data, header)
+      }
+    end
+
     #
     # \HTTP session management
     #
@@ -1063,7 +1097,7 @@ class << HTTP
     # For proxy-defining arguments +p_addr+ through +p_no_proxy+,
     # see {Proxy Server}[rdoc-ref:Net::HTTP@Proxy+Server].
     #
-    def HTTP.new(address, port = nil, p_addr = :ENV, p_port = nil, p_user = nil, p_pass = nil, p_no_proxy = nil)
+    def HTTP.new(address, port = nil, p_addr = :ENV, p_port = nil, p_user = nil, p_pass = nil, p_no_proxy = nil, p_use_ssl = nil)
       http = super address, port
 
       if proxy_class? then # from Net::HTTP::Proxy()
@@ -1072,10 +1106,11 @@ def HTTP.new(address, port = nil, p_addr = :ENV, p_port = nil, p_user = nil, p_p
         http.proxy_port     = @proxy_port
         http.proxy_user     = @proxy_user
         http.proxy_pass     = @proxy_pass
+        http.proxy_use_ssl  = @proxy_use_ssl
       elsif p_addr == :ENV then
         http.proxy_from_env = true
       else
-        if p_addr && p_no_proxy && !URI::Generic.use_proxy?(p_addr, p_addr, p_port, p_no_proxy)
+        if p_addr && p_no_proxy && !URI::Generic.use_proxy?(address, address, port, p_no_proxy)
           p_addr = nil
           p_port = nil
         end
@@ -1083,34 +1118,67 @@ def HTTP.new(address, port = nil, p_addr = :ENV, p_port = nil, p_user = nil, p_p
         http.proxy_port    = p_port || default_port
         http.proxy_user    = p_user
         http.proxy_pass    = p_pass
+        http.proxy_use_ssl = p_use_ssl
       end
 
       http
     end
 
+    class << HTTP
+      # Allows to set the default configuration that will be used
+      # when creating a new connection.
+      #
+      # Example:
+      #
+      #   Net::HTTP.default_configuration = {
+      #     read_timeout: 1,
+      #     write_timeout: 1
+      #   }
+      #   http = Net::HTTP.new(hostname)
+      #   http.open_timeout   # => 60
+      #   http.read_timeout   # => 1
+      #   http.write_timeout  # => 1
+      #
+      attr_accessor :default_configuration
+    end
+
     # Creates a new \Net::HTTP object for the specified server address,
     # without opening the TCP connection or initializing the \HTTP session.
     # The +address+ should be a DNS hostname or IP address.
     def initialize(address, port = nil) # :nodoc:
+      defaults = {
+        keep_alive_timeout: 2,
+        close_on_empty_response: false,
+        open_timeout: 60,
+        read_timeout: 60,
+        write_timeout: 60,
+        continue_timeout: nil,
+        max_retries: 1,
+        debug_output: nil,
+        response_body_encoding: false,
+        ignore_eof: true
+      }
+      options = defaults.merge(self.class.default_configuration || {})
+
       @address = address
       @port    = (port || HTTP.default_port)
       @ipaddr = nil
       @local_host = nil
       @local_port = nil
       @curr_http_version = HTTPVersion
-      @keep_alive_timeout = 2
+      @keep_alive_timeout = options[:keep_alive_timeout]
       @last_communicated = nil
-      @close_on_empty_response = false
+      @close_on_empty_response = options[:close_on_empty_response]
       @socket  = nil
       @started = false
-      @open_timeout = 60
-      @read_timeout = 60
-      @write_timeout = 60
-      @continue_timeout = nil
-      @max_retries = 1
-      @debug_output = nil
-      @response_body_encoding = false
-      @ignore_eof = true
+      @open_timeout = options[:open_timeout]
+      @read_timeout = options[:read_timeout]
+      @write_timeout = options[:write_timeout]
+      @continue_timeout = options[:continue_timeout]
+      @max_retries = options[:max_retries]
+      @debug_output = options[:debug_output]
+      @response_body_encoding = options[:response_body_encoding]
+      @ignore_eof = options[:ignore_eof]
 
       @proxy_from_env = false
       @proxy_uri      = nil
@@ -1118,6 +1186,7 @@ def initialize(address, port = nil) # :nodoc:
       @proxy_port     = nil
       @proxy_user     = nil
       @proxy_pass     = nil
+      @proxy_use_ssl  = nil
 
       @use_ssl = false
       @ssl_context = nil
@@ -1252,6 +1321,7 @@ def response_body_encoding=(value)
     # Sets the proxy password;
     # see {Proxy Server}[rdoc-ref:Net::HTTP@Proxy+Server].
     attr_writer :proxy_pass
+    attr_writer :proxy_use_ssl
 
     # Returns the IP address for the connection.
     #
@@ -1441,23 +1511,6 @@ def use_ssl=(flag)
       @use_ssl = flag
     end
 
-    SSL_IVNAMES = [
-      :@ca_file,
-      :@ca_path,
-      :@cert,
-      :@cert_store,
-      :@ciphers,
-      :@extra_chain_cert,
-      :@key,
-      :@ssl_timeout,
-      :@ssl_version,
-      :@min_version,
-      :@max_version,
-      :@verify_callback,
-      :@verify_depth,
-      :@verify_mode,
-      :@verify_hostname,
-    ] # :nodoc:
     SSL_ATTRIBUTES = [
       :ca_file,
       :ca_path,
@@ -1476,6 +1529,8 @@ def use_ssl=(flag)
       :verify_hostname,
     ] # :nodoc:
 
+    SSL_IVNAMES = SSL_ATTRIBUTES.map { |a| "@#{a}".to_sym }.freeze # :nodoc:
+
     # Sets or returns the path to a CA certification file in PEM format.
     attr_accessor :ca_file
 
@@ -1491,11 +1546,11 @@ def use_ssl=(flag)
     attr_accessor :cert_store
 
     # Sets or returns the available SSL ciphers.
-    # See {OpenSSL::SSL::SSLContext#ciphers=}[rdoc-ref:OpenSSL::SSL::SSLContext#ciphers-3D].
+    # See {OpenSSL::SSL::SSLContext#ciphers=}[OpenSSL::SSL::SSL::Context#ciphers=].
     attr_accessor :ciphers
 
     # Sets or returns the extra X509 certificates to be added to the certificate chain.
-    # See {OpenSSL::SSL::SSLContext#add_certificate}[rdoc-ref:OpenSSL::SSL::SSLContext#add_certificate].
+    # See {OpenSSL::SSL::SSLContext#add_certificate}[OpenSSL::SSL::SSL::Context#add_certificate].
     attr_accessor :extra_chain_cert
 
     # Sets or returns the OpenSSL::PKey::RSA or OpenSSL::PKey::DSA object.
@@ -1505,15 +1560,15 @@ def use_ssl=(flag)
     attr_accessor :ssl_timeout
 
     # Sets or returns the SSL version.
-    # See {OpenSSL::SSL::SSLContext#ssl_version=}[rdoc-ref:OpenSSL::SSL::SSLContext#ssl_version-3D].
+    # See {OpenSSL::SSL::SSLContext#ssl_version=}[OpenSSL::SSL::SSL::Context#ssl_version=].
     attr_accessor :ssl_version
 
     # Sets or returns the minimum SSL version.
-    # See {OpenSSL::SSL::SSLContext#min_version=}[rdoc-ref:OpenSSL::SSL::SSLContext#min_version-3D].
+    # See {OpenSSL::SSL::SSLContext#min_version=}[OpenSSL::SSL::SSL::Context#min_version=].
     attr_accessor :min_version
 
     # Sets or returns the maximum SSL version.
-    # See {OpenSSL::SSL::SSLContext#max_version=}[rdoc-ref:OpenSSL::SSL::SSLContext#max_version-3D].
+    # See {OpenSSL::SSL::SSLContext#max_version=}[OpenSSL::SSL::SSL::Context#max_version=].
     attr_accessor :max_version
 
     # Sets or returns the callback for the server certification verification.
@@ -1529,7 +1584,7 @@ def use_ssl=(flag)
 
     # Sets or returns whether to verify that the server certificate is valid
     # for the hostname.
-    # See {OpenSSL::SSL::SSLContext#verify_hostname=}[rdoc-ref:OpenSSL::SSL::SSLContext#attribute-i-verify_mode].
+    # See {OpenSSL::SSL::SSLContext#verify_hostname=}[OpenSSL::SSL::SSL::Context#verify_hostname=].
     attr_accessor :verify_hostname
 
     # Returns the X509 certificate chain (an array of strings)
@@ -1611,7 +1666,13 @@ def connect
       debug "opened"
       if use_ssl?
         if proxy?
-          plain_sock = BufferedIO.new(s, read_timeout: @read_timeout,
+          if @proxy_use_ssl
+            proxy_sock = OpenSSL::SSL::SSLSocket.new(s)
+            ssl_socket_connect(proxy_sock, @open_timeout)
+          else
+            proxy_sock = s
+          end
+          proxy_sock = BufferedIO.new(proxy_sock, read_timeout: @read_timeout,
                                       write_timeout: @write_timeout,
                                       continue_timeout: @continue_timeout,
                                       debug_output: @debug_output)
@@ -1622,8 +1683,8 @@ def connect
             buf << "Proxy-Authorization: Basic #{credential}\r\n"
           end
           buf << "\r\n"
-          plain_sock.write(buf)
-          HTTPResponse.read_new(plain_sock).value
+          proxy_sock.write(buf)
+          HTTPResponse.read_new(proxy_sock).value
           # assuming nothing left in buffers after successful CONNECT response
         end
 
@@ -1731,13 +1792,14 @@ def do_finish
     @proxy_port = nil
     @proxy_user = nil
     @proxy_pass = nil
+    @proxy_use_ssl = nil
 
     # Creates an \HTTP proxy class which behaves like \Net::HTTP, but
     # performs all access via the specified proxy.
     #
     # This class is obsolete.  You may pass these same parameters directly to
     # \Net::HTTP.new.  See Net::HTTP.new for details of the arguments.
-    def HTTP.Proxy(p_addr = :ENV, p_port = nil, p_user = nil, p_pass = nil) #:nodoc:
+    def HTTP.Proxy(p_addr = :ENV, p_port = nil, p_user = nil, p_pass = nil, p_use_ssl = nil) #:nodoc:
       return self unless p_addr
 
       Class.new(self) {
@@ -1755,6 +1817,7 @@ def HTTP.Proxy(p_addr = :ENV, p_port = nil, p_user = nil, p_pass = nil) #:nodoc:
 
         @proxy_user = p_user
         @proxy_pass = p_pass
+        @proxy_use_ssl = p_use_ssl
       }
     end
 
@@ -1779,6 +1842,9 @@ def proxy_class?
       # Returns the password for accessing the proxy, or +nil+ if none;
       # see Net::HTTP@Proxy+Server.
       attr_reader :proxy_pass
+
+      # Use SSL when talking to the proxy. If Net::HTTP does not use a proxy, nil.
+      attr_reader :proxy_use_ssl
     end
 
     # Returns +true+ if a proxy server is defined, +false+ otherwise;
@@ -1798,7 +1864,7 @@ def proxy_from_env?
     def proxy_uri # :nodoc:
       return if @proxy_uri == false
       @proxy_uri ||= URI::HTTP.new(
-        "http".freeze, nil, address, port, nil, nil, nil, nil, nil
+        "http", nil, address, port, nil, nil, nil, nil, nil
       ).find_proxy || false
       @proxy_uri || nil
     end
@@ -1851,7 +1917,8 @@ def proxy_pass
     private
 
     def unescape(value)
-      require 'cgi/util'
+      require 'cgi/escape'
+      require 'cgi/util' unless defined?(CGI::EscapeExt)
       CGI.unescape(value)
     end
 
@@ -2013,6 +2080,11 @@ def patch(path, data, initheader = nil, dest = nil, &block) # :yield: +body_segm
     #   http = Net::HTTP.new(hostname)
     #   http.put('/todos/1', data) # => #<Net::HTTPOK 200 OK readbody=true>
     #
+    # Related:
+    #
+    # - Net::HTTP::Put: request class for \HTTP method PUT.
+    # - Net::HTTP.put: sends PUT request, returns response body.
+    #
     def put(path, data, initheader = nil)
       request(Put.new(path, initheader), data)
     end
@@ -2351,7 +2423,10 @@ def transport_request(req)
           res
         }
         res.reading_body(@socket, req.response_body_permitted?) {
-          yield res if block_given?
+          if block_given?
+            count = max_retries # Don't restart in the middle of a download
+            yield res
+          end
         }
       rescue Net::OpenTimeout
         raise
@@ -2479,6 +2554,11 @@ def debug(msg)
     alias_method :D, :debug
   end
 
+  # for backward compatibility until Ruby 3.5
+  # https://bugs.ruby-lang.org/issues/20900
+  # https://github.com/bblimke/webmock/pull/1081
+  HTTPSession = HTTP
+  deprecate_constant :HTTPSession
 end
 
 require_relative 'http/exceptions'
@@ -2493,5 +2573,3 @@ def debug(msg)
 require_relative 'http/responses'
 
 require_relative 'http/proxy_delta'
-
-require_relative 'http/backward'
diff --git a/lib/net/http/backward.rb b/lib/net/http/backward.rb
deleted file mode 100644
index b44577edbd2c6b..00000000000000
--- a/lib/net/http/backward.rb
+++ /dev/null
@@ -1,40 +0,0 @@
-# frozen_string_literal: true
-# for backward compatibility
-
-# :enddoc:
-
-class Net::HTTP
-  ProxyMod = ProxyDelta
-  deprecate_constant :ProxyMod
-end
-
-module Net::NetPrivate
-  HTTPRequest = ::Net::HTTPRequest
-  deprecate_constant :HTTPRequest
-end
-
-module Net
-  HTTPSession = HTTP
-
-  HTTPInformationCode  = HTTPInformation
-  HTTPSuccessCode      = HTTPSuccess
-  HTTPRedirectionCode  = HTTPRedirection
-  HTTPRetriableCode    = HTTPRedirection
-  HTTPClientErrorCode  = HTTPClientError
-  HTTPFatalErrorCode   = HTTPClientError
-  HTTPServerErrorCode  = HTTPServerError
-  HTTPResponseReceiver = HTTPResponse
-
-  HTTPResponceReceiver = HTTPResponse # Typo since 2001
-
-  deprecate_constant :HTTPSession,
-                     :HTTPInformationCode,
-                     :HTTPSuccessCode,
-                     :HTTPRedirectionCode,
-                     :HTTPRetriableCode,
-                     :HTTPClientErrorCode,
-                     :HTTPFatalErrorCode,
-                     :HTTPServerErrorCode,
-                     :HTTPResponseReceiver,
-                     :HTTPResponceReceiver
-end
diff --git a/lib/net/http/generic_request.rb b/lib/net/http/generic_request.rb
index 9421535ceb2e45..c92004e5578b38 100644
--- a/lib/net/http/generic_request.rb
+++ b/lib/net/http/generic_request.rb
@@ -23,7 +23,7 @@ def initialize(m, reqbody, resbody, uri_or_path, initheader = nil) # :nodoc:
       raise ArgumentError, "no host component for URI" unless (hostname && hostname.length > 0)
       @uri = uri_or_path.dup
       host = @uri.hostname.dup
-      host << ":".freeze << @uri.port.to_s if @uri.port != @uri.default_port
+      host << ":" << @uri.port.to_s if @uri.port != @uri.default_port
       @path = uri_or_path.request_uri
       raise ArgumentError, "no HTTP request path given" unless @path
     else
@@ -102,6 +102,31 @@ def inspect
     "\#<#{self.class} #{@method}>"
   end
 
+  # Returns a string representation of the request with the details for pp:
+  #
+  #   require 'pp'
+  #   post = Net::HTTP::Post.new(uri)
+  #   post.inspect # => "#<Net::HTTP::Post POST>"
+  #   post.pretty_inspect
+  #   # => #<Net::HTTP::Post
+  #         POST
+  #         path="/"
+  #         headers={"accept-encoding" => ["gzip;q=1.0,deflate;q=0.6,identity;q=0.3"],
+  #          "accept" => ["*/*"],
+  #          "user-agent" => ["Ruby"],
+  #          "host" => ["www.ruby-lang.org"]}>
+  #
+  def pretty_print(q)
+    q.object_group(self) {
+      q.breakable
+      q.text @method
+      q.breakable
+      q.text "path="; q.pp @path
+      q.breakable
+      q.text "headers="; q.pp to_hash
+    }
+  end
+
   ##
   # Don't automatically decode response content-encoding if the user indicates
   # they want to handle it.
@@ -212,15 +237,15 @@ def update_uri(addr, port, ssl) # :nodoc: internal use only
     return unless @uri
 
     if ssl
-      scheme = 'https'.freeze
+      scheme = 'https'
       klass = URI::HTTPS
     else
-      scheme = 'http'.freeze
+      scheme = 'http'
       klass = URI::HTTP
     end
 
     if host = self['host']
-      host.sub!(/:.*/m, ''.freeze)
+      host.sub!(/:.*/m, '')
     elsif host = @uri.host
     else
      host = addr
@@ -260,7 +285,6 @@ def finish
   def send_request_with_body(sock, ver, path, body)
     self.content_length = body.bytesize
     delete 'Transfer-Encoding'
-    supply_default_content_type
     write_header sock, ver, path
     wait_for_continue sock, ver if sock.continue_timeout
     sock.write body
@@ -271,7 +295,6 @@ def send_request_with_body_stream(sock, ver, path, f)
       raise ArgumentError,
           "Content-Length not given and Transfer-Encoding is not `chunked'"
     end
-    supply_default_content_type
     write_header sock, ver, path
     wait_for_continue sock, ver if sock.continue_timeout
     if chunked?
@@ -373,12 +396,6 @@ def flush_buffer(out, buf, chunked_p)
     buf.clear
   end
 
-  def supply_default_content_type
-    return if content_type()
-    warn 'net/http: Content-Type did not set; using application/x-www-form-urlencoded', uplevel: 1 if $VERBOSE
-    set_content_type 'application/x-www-form-urlencoded'
-  end
-
   ##
   # Waits up to the continue timeout for a response from the server provided
   # we're speaking HTTP 1.1 and are expecting a 100-continue response.
@@ -411,4 +428,3 @@ def write_header(sock, ver, path)
   end
 
 end
-
diff --git a/lib/net/http/header.rb b/lib/net/http/header.rb
index 6660c8075a4230..f6c36f1b5e78e7 100644
--- a/lib/net/http/header.rb
+++ b/lib/net/http/header.rb
@@ -491,7 +491,7 @@ def each_capitalized
   alias canonical_each each_capitalized
 
   def capitalize(name)
-    name.to_s.split(/-/).map {|s| s.capitalize }.join('-')
+    name.to_s.split('-'.freeze).map {|s| s.capitalize }.join('-'.freeze)
   end
   private :capitalize
 
diff --git a/lib/net/http/net-http.gemspec b/lib/net/http/net-http.gemspec
index 0021136793b928..70528d58cb34af 100644
--- a/lib/net/http/net-http.gemspec
+++ b/lib/net/http/net-http.gemspec
@@ -24,6 +24,7 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version = Gem::Requirement.new(">= 2.6.0")
   spec.licenses      = ["Ruby", "BSD-2-Clause"]
 
+  spec.metadata["changelog_uri"] = spec.homepage + "/releases"
   spec.metadata["homepage_uri"] = spec.homepage
   spec.metadata["source_code_uri"] = spec.homepage
 
diff --git a/lib/net/http/requests.rb b/lib/net/http/requests.rb
index 5724164205e61b..e58057adf1664c 100644
--- a/lib/net/http/requests.rb
+++ b/lib/net/http/requests.rb
@@ -124,6 +124,11 @@ class Net::HTTP::Post < Net::HTTPRequest
 # - {Idempotent}[https://en.wikipedia.org/wiki/Hypertext_Transfer_Protocol#Idempotent_methods]: yes.
 # - {Cacheable}[https://en.wikipedia.org/wiki/Hypertext_Transfer_Protocol#Cacheable_methods]: no.
 #
+# Related:
+#
+# - Net::HTTP.put: sends +PUT+ request, returns response object.
+# - Net::HTTP#put: sends +PUT+ request, returns response object.
+#
 class Net::HTTP::Put < Net::HTTPRequest
   METHOD = 'PUT'
   REQUEST_HAS_BODY = true
diff --git a/lib/net/http/response.rb b/lib/net/http/response.rb
index 192fa2c749c860..40de96386804f3 100644
--- a/lib/net/http/response.rb
+++ b/lib/net/http/response.rb
@@ -366,6 +366,7 @@ def read_body(dest = nil, &block)
       @body = nil
     end
     @read = true
+    return if @body.nil?
 
     case enc = @body_encoding
     when Encoding, false, nil
@@ -639,7 +640,7 @@ def read_chunked(dest, chunk_data_io) # :nodoc:
   end
 
   def stream_check
-    raise IOError, 'attempt to read body out of block' if @socket.closed?
+    raise IOError, 'attempt to read body out of block' if @socket.nil? || @socket.closed?
   end
 
   def procdest(dest, block)
diff --git a/lib/net/http/responses.rb b/lib/net/http/responses.rb
index 6f6fb8d0554318..5e2f8ce1aa176a 100644
--- a/lib/net/http/responses.rb
+++ b/lib/net/http/responses.rb
@@ -1104,7 +1104,7 @@ class Net::HTTPResponse
     '3' => Net::HTTPRedirection,
     '4' => Net::HTTPClientError,
     '5' => Net::HTTPServerError
-  }
+  }.freeze
   CODE_TO_OBJ = {
     '100' => Net::HTTPContinue,
     '101' => Net::HTTPSwitchProtocol,
@@ -1170,5 +1170,5 @@ class Net::HTTPResponse
     '508' => Net::HTTPLoopDetected,
     '510' => Net::HTTPNotExtended,
     '511' => Net::HTTPNetworkAuthenticationRequired,
-  }
+  }.freeze
 end
diff --git a/lib/net/net-protocol.gemspec b/lib/net/net-protocol.gemspec
index 29ad2504ebce90..f9fd83f12b05f2 100644
--- a/lib/net/net-protocol.gemspec
+++ b/lib/net/net-protocol.gemspec
@@ -21,6 +21,7 @@ Gem::Specification.new do |spec|
 
   spec.metadata["homepage_uri"] = spec.homepage
   spec.metadata["source_code_uri"] = spec.homepage
+  spec.metadata["changelog_uri"] = spec.homepage + "/releases"
 
   # 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.
diff --git a/lib/net/protocol.rb b/lib/net/protocol.rb
index ea0752a9719364..197ea090890f76 100644
--- a/lib/net/protocol.rb
+++ b/lib/net/protocol.rb
@@ -26,7 +26,7 @@
 module Net # :nodoc:
 
   class Protocol   #:nodoc: internal use only
-    VERSION = "0.2.1"
+    VERSION = "0.2.2"
 
     private
     def Protocol.protocol_param(name, val)
diff --git a/lib/observer.gemspec b/lib/observer.gemspec
deleted file mode 100644
index 93e61b8c842d07..00000000000000
--- a/lib/observer.gemspec
+++ /dev/null
@@ -1,32 +0,0 @@
-# frozen_string_literal: true
-
-name = File.basename(__FILE__, ".gemspec")
-version = ["lib", Array.new(name.count("-")+1, ".").join("/")].find do |dir|
-  break File.foreach(File.join(__dir__, dir, "#{name.tr('-', '/')}.rb")) do |line|
-    /^\s*VERSION\s*=\s*"(.*)"/ =~ line and break $1
-  end rescue nil
-end
-
-Gem::Specification.new do |spec|
-  spec.name          = name
-  spec.version       = version
-  spec.authors       = ["Yukihiro Matsumoto"]
-  spec.email         = ["matz@ruby-lang.org"]
-
-  spec.summary       = %q{Implementation of the Observer object-oriented design pattern.}
-  spec.description   = spec.summary
-  spec.homepage      = "https://github.com/ruby/observer"
-  spec.licenses      = ["Ruby", "BSD-2-Clause"]
-
-  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 2>#{IO::NULL}`.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/observer.rb b/lib/observer.rb
deleted file mode 100644
index ef70e39dd823a1..00000000000000
--- a/lib/observer.rb
+++ /dev/null
@@ -1,229 +0,0 @@
-# frozen_string_literal: true
-#
-# Implementation of the _Observer_ object-oriented design pattern.  The
-# following documentation is copied, with modifications, from "Programming
-# Ruby", by Hunt and Thomas; http://www.ruby-doc.org/docs/ProgrammingRuby/html/lib_patterns.html.
-#
-# See Observable for more info.
-
-# The Observer pattern (also known as publish/subscribe) provides a simple
-# mechanism for one object to inform a set of interested third-party objects
-# when its state changes.
-#
-# == Mechanism
-#
-# The notifying class mixes in the +Observable+
-# module, which provides the methods for managing the associated observer
-# objects.
-#
-# The observable object must:
-# * assert that it has +#changed+
-# * call +#notify_observers+
-#
-# An observer subscribes to updates using Observable#add_observer, which also
-# specifies the method called via #notify_observers. The default method for
-# #notify_observers is #update.
-#
-# === Example
-#
-# The following example demonstrates this nicely.  A +Ticker+, when run,
-# continually receives the stock +Price+ for its <tt>@symbol</tt>.  A +Warner+
-# is a general observer of the price, and two warners are demonstrated, a
-# +WarnLow+ and a +WarnHigh+, which print a warning if the price is below or
-# above their set limits, respectively.
-#
-# The +update+ callback allows the warners to run without being explicitly
-# called.  The system is set up with the +Ticker+ and several observers, and the
-# observers do their duty without the top-level code having to interfere.
-#
-# Note that the contract between publisher and subscriber (observable and
-# observer) is not declared or enforced.  The +Ticker+ publishes a time and a
-# price, and the warners receive that.  But if you don't ensure that your
-# contracts are correct, nothing else can warn you.
-#
-#   require "observer"
-#
-#   class Ticker          ### Periodically fetch a stock price.
-#     include Observable
-#
-#     def initialize(symbol)
-#       @symbol = symbol
-#     end
-#
-#     def run
-#       last_price = nil
-#       loop do
-#         price = Price.fetch(@symbol)
-#         print "Current price: #{price}\n"
-#         if price != last_price
-#           changed                 # notify observers
-#           last_price = price
-#           notify_observers(Time.now, price)
-#         end
-#         sleep 1
-#       end
-#     end
-#   end
-#
-#   class Price           ### A mock class to fetch a stock price (60 - 140).
-#     def self.fetch(symbol)
-#       60 + rand(80)
-#     end
-#   end
-#
-#   class Warner          ### An abstract observer of Ticker objects.
-#     def initialize(ticker, limit)
-#       @limit = limit
-#       ticker.add_observer(self)
-#     end
-#   end
-#
-#   class WarnLow < Warner
-#     def update(time, price)       # callback for observer
-#       if price < @limit
-#         print "--- #{time.to_s}: Price below #@limit: #{price}\n"
-#       end
-#     end
-#   end
-#
-#   class WarnHigh < Warner
-#     def update(time, price)       # callback for observer
-#       if price > @limit
-#         print "+++ #{time.to_s}: Price above #@limit: #{price}\n"
-#       end
-#     end
-#   end
-#
-#   ticker = Ticker.new("MSFT")
-#   WarnLow.new(ticker, 80)
-#   WarnHigh.new(ticker, 120)
-#   ticker.run
-#
-# Produces:
-#
-#   Current price: 83
-#   Current price: 75
-#   --- Sun Jun 09 00:10:25 CDT 2002: Price below 80: 75
-#   Current price: 90
-#   Current price: 134
-#   +++ Sun Jun 09 00:10:25 CDT 2002: Price above 120: 134
-#   Current price: 134
-#   Current price: 112
-#   Current price: 79
-#   --- Sun Jun 09 00:10:25 CDT 2002: Price below 80: 79
-#
-# === Usage with procs
-#
-# The +#notify_observers+ method can also be used with +proc+s by using
-# the +:call+ as +func+ parameter.
-#
-# The following example illustrates the use of a lambda:
-#
-#   require 'observer'
-#
-#   class Ticker
-#     include Observable
-#
-#     def run
-#       # logic to retrieve the price (here 77.0)
-#       changed
-#       notify_observers(77.0)
-#     end
-#   end
-#
-#   ticker = Ticker.new
-#   warner = ->(price) { puts "New price received: #{price}" }
-#   ticker.add_observer(warner, :call)
-#   ticker.run
-module Observable
-  VERSION = "0.1.1"
-
-  #
-  # Add +observer+ as an observer on this object. So that it will receive
-  # notifications.
-  #
-  # +observer+:: the object that will be notified of changes.
-  # +func+:: Symbol naming the method that will be called when this Observable
-  #          has changes.
-  #
-  #          This method must return true for +observer.respond_to?+ and will
-  #          receive <tt>*arg</tt> when #notify_observers is called, where
-  #          <tt>*arg</tt> is the value passed to #notify_observers by this
-  #          Observable
-  def add_observer(observer, func=:update)
-    @observer_peers = {} unless defined? @observer_peers
-    unless observer.respond_to? func
-      raise NoMethodError, "observer does not respond to `#{func}'"
-    end
-    @observer_peers[observer] = func
-  end
-
-  #
-  # Remove +observer+ as an observer on this object so that it will no longer
-  # receive notifications.
-  #
-  # +observer+:: An observer of this Observable
-  def delete_observer(observer)
-    @observer_peers.delete observer if defined? @observer_peers
-  end
-
-  #
-  # Remove all observers associated with this object.
-  #
-  def delete_observers
-    @observer_peers.clear if defined? @observer_peers
-  end
-
-  #
-  # Return the number of observers associated with this object.
-  #
-  def count_observers
-    if defined? @observer_peers
-      @observer_peers.size
-    else
-      0
-    end
-  end
-
-  #
-  # Set the changed state of this object.  Notifications will be sent only if
-  # the changed +state+ is +true+.
-  #
-  # +state+:: Boolean indicating the changed state of this Observable.
-  #
-  def changed(state=true)
-    @observer_state = state
-  end
-
-  #
-  # Returns true if this object's state has been changed since the last
-  # #notify_observers call.
-  #
-  def changed?
-    if defined? @observer_state and @observer_state
-      true
-    else
-      false
-    end
-  end
-
-  #
-  # Notify observers of a change in state *if* this object's changed state is
-  # +true+.
-  #
-  # This will invoke the method named in #add_observer, passing <tt>*arg</tt>.
-  # The changed state is then set to +false+.
-  #
-  # <tt>*arg</tt>:: Any arguments to pass to the observers.
-  def notify_observers(*arg)
-    if defined? @observer_state and @observer_state
-      if defined? @observer_peers
-        @observer_peers.each do |k, v|
-          k.__send__(v, *arg)
-        end
-      end
-      @observer_state = false
-    end
-  end
-
-end
diff --git a/lib/open-uri.rb b/lib/open-uri.rb
index 11af0f7a121cc4..de710af261eaa9 100644
--- a/lib/open-uri.rb
+++ b/lib/open-uri.rb
@@ -91,7 +91,7 @@ def self.open(name, *rest, &block)
 
 module OpenURI
 
-  VERSION = "0.3.0"
+  VERSION = "0.5.0"
 
   Options = {
     :proxy => true,
@@ -108,6 +108,8 @@ module OpenURI
     :ftp_active_mode => false,
     :redirect => true,
     :encoding => nil,
+    :max_redirects => 64,
+    :request_specific_fields => nil,
   }
 
   def OpenURI.check_options(options) # :nodoc:
@@ -147,7 +149,11 @@ def OpenURI.open_uri(name, *rest) # :nodoc:
       end
       encoding = Encoding.find(options[:encoding])
     end
-
+    if options.has_key? :request_specific_fields
+      if !(options[:request_specific_fields].is_a?(Hash) || options[:request_specific_fields].is_a?(Proc))
+        raise ArgumentError, "Invalid request_specific_fields option: #{options[:request_specific_fields].inspect}"
+      end
+    end
     unless mode == nil ||
            mode == 'r' || mode == 'rb' ||
            mode == File::RDONLY
@@ -211,11 +217,20 @@ def OpenURI.open_loop(uri, options) # :nodoc:
     end
 
     uri_set = {}
+    max_redirects = options[:max_redirects] || Options.fetch(:max_redirects)
     buf = nil
     while true
+      request_specific_fields = {}
+      if options.has_key? :request_specific_fields
+        request_specific_fields = if options[:request_specific_fields].is_a?(Hash)
+                                    options[:request_specific_fields]
+                                  else options[:request_specific_fields].is_a?(Proc)
+                                    options[:request_specific_fields].call(uri)
+                                  end
+      end
       redirect = catch(:open_uri_redirect) {
         buf = Buffer.new
-        uri.buffer_open(buf, find_proxy.call(uri), options)
+        uri.buffer_open(buf, find_proxy.call(uri), options.merge(request_specific_fields))
         nil
       }
       if redirect
@@ -235,9 +250,14 @@ def OpenURI.open_loop(uri, options) # :nodoc:
           options = options.dup
           options.delete :http_basic_authentication
         end
+        if options.include?(:request_specific_fields) && options[:request_specific_fields].is_a?(Hash)
+          # Send request specific headers only for the initial request.
+          options.delete :request_specific_fields
+        end
         uri = redirect
         raise "HTTP redirection loop: #{uri}" if uri_set.include? uri.to_s
         uri_set[uri.to_s] = true
+        raise TooManyRedirects.new("Too many redirects", buf.io) if max_redirects && uri_set.size > max_redirects
       else
         break
       end
@@ -392,6 +412,9 @@ def initialize(message, io, uri)
     attr_reader :uri
   end
 
+  class TooManyRedirects < HTTPError
+  end
+
   class Buffer # :nodoc: all
     def initialize
       @io = StringIO.new
@@ -740,6 +763,44 @@ module OpenRead
     #  Using +true+ also means that redirections between http and ftp are
     #  permitted.
     #
+    # [:max_redirects]
+    #  Synopsis:
+    #    :max_redirects=>int
+    #
+    #  Number of HTTP redirects allowed before OpenURI::TooManyRedirects is raised.
+    #  The default is 64.
+    #
+    # [:request_specific_fields]
+    #  Synopsis:
+    #    :request_specific_fields => {}
+    #    :request_specific_fields => lambda {|url| ...}
+    #
+    #  :request_specific_fields option allows specifying custom header fields that
+    #  are sent with the HTTP request. It can be passed as a Hash or a Proc that
+    #  gets evaluated on each request and returns a Hash of header fields.
+    #
+    #  If a Hash is provided, it specifies the headers only for the initial
+    #  request and these headers will not be sent on redirects.
+    #
+    #  If a Proc is provided, it will be executed for each request including
+    #  redirects, allowing dynamic header customization based on the request URL.
+    #  It is important that the Proc returns a Hash. And this Hash specifies the
+    #  headers to be sent with the request.
+    #
+    #  For Example with Hash
+    #    URI.open("http://...",
+    #             request_specific_fields: {"Authorization" => "token dummy"}) {|f| ... }
+    #
+    #  For Example with Proc:
+    #    URI.open("http://...",
+    #             request_specific_fields: lambda { |uri|
+    #               if uri.host == "example.com"
+    #                 {"Authorization" => "token dummy"}
+    #               else
+    #                 {}
+    #               end
+    #             }) {|f| ... }
+    #
     def open(*rest, &block)
       OpenURI.open_uri(self, *rest, &block)
     end
diff --git a/lib/open3.rb b/lib/open3.rb
index 9652b2719468eb..74d00b86d93f55 100644
--- a/lib/open3.rb
+++ b/lib/open3.rb
@@ -31,57 +31,189 @@
 
 require 'open3/version'
 
+# \Module \Open3 supports creating child processes
+# with access to their $stdin, $stdout, and $stderr streams.
+#
+# == What's Here
+#
+# Each of these methods executes a given command in a new process or subshell,
+# or multiple commands in new processes and/or subshells:
+#
+# - Each of these methods executes a single command in a process or subshell,
+#   accepts a string for input to $stdin,
+#   and returns string output from $stdout, $stderr, or both:
+#
+#   - Open3.capture2: Executes the command;
+#     returns the string from $stdout.
+#   - Open3.capture2e: Executes the command;
+#     returns the string from merged $stdout and $stderr.
+#   - Open3.capture3: Executes the command;
+#     returns strings from $stdout and $stderr.
+#
+# - Each of these methods executes a single command in a process or subshell,
+#   and returns pipes for $stdin, $stdout, and/or $stderr:
+#
+#   - Open3.popen2: Executes the command;
+#     returns pipes for $stdin and $stdout.
+#   - Open3.popen2e: Executes the command;
+#     returns pipes for $stdin and merged $stdout and $stderr.
+#   - Open3.popen3: Executes the command;
+#     returns pipes for $stdin, $stdout, and $stderr.
+#
+# - Each of these methods executes one or more commands in processes and/or subshells,
+#   returns pipes for the first $stdin, the last $stdout, or both:
+#
+#   - Open3.pipeline_r: Returns a pipe for the last $stdout.
+#   - Open3.pipeline_rw: Returns pipes for the first $stdin and the last $stdout.
+#   - Open3.pipeline_w: Returns a pipe for the first $stdin.
+#   - Open3.pipeline_start: Does not wait for processes to complete.
+#   - Open3.pipeline: Waits for processes to complete.
+#
+# Each of the methods above accepts:
+#
+# - An optional hash of environment variable names and values;
+#   see {Execution Environment}[rdoc-ref:Process@Execution+Environment].
+# - A required string argument that is a +command_line+ or +exe_path+;
+#   see {Argument command_line or exe_path}[rdoc-ref:Process@Argument+command_line+or+exe_path].
+# - An optional hash of execution options;
+#   see {Execution Options}[rdoc-ref:Process@Execution+Options].
+#
 module Open3
 
-  # Open stdin, stdout, and stderr streams and start external executable.
-  # In addition, a thread to wait for the started process is created.
-  # The thread has a pid method and a thread variable :pid which is the pid of
-  # the started process.
+  # :call-seq:
+  #   Open3.popen3([env, ] command_line, options = {}) -> [stdin, stdout, stderr, wait_thread]
+  #   Open3.popen3([env, ] exe_path, *args, options = {}) -> [stdin, stdout, stderr, wait_thread]
+  #   Open3.popen3([env, ] command_line, options = {}) {|stdin, stdout, stderr, wait_thread| ... } -> object
+  #   Open3.popen3([env, ] exe_path, *args, options = {}) {|stdin, stdout, stderr, wait_thread| ... } -> object
+  #
+  # Basically a wrapper for
+  # {Process.spawn}[rdoc-ref:Process.spawn]
+  # that:
+  #
+  # - Creates a child process, by calling Process.spawn with the given arguments.
+  # - Creates streams +stdin+, +stdout+, and +stderr+,
+  #   which are the standard input, standard output, and standard error streams
+  #   in the child process.
+  # - Creates thread +wait_thread+ that waits for the child process to exit;
+  #   the thread has method +pid+, which returns the process ID
+  #   of the child process.
+  #
+  # With no block given, returns the array
+  # <tt>[stdin, stdout, stderr, wait_thread]</tt>.
+  # The caller should close each of the three returned streams.
+  #
+  #   stdin, stdout, stderr, wait_thread = Open3.popen3('echo')
+  #   # => [#<IO:fd 8>, #<IO:fd 10>, #<IO:fd 12>, #<Process::Waiter:0x00007f58d5428f58 run>]
+  #   stdin.close
+  #   stdout.close
+  #   stderr.close
+  #   wait_thread.pid   # => 2210481
+  #   wait_thread.value # => #<Process::Status: pid 2210481 exit 0>
+  #
+  # With a block given, calls the block with the four variables
+  # (three streams and the wait thread)
+  # and returns the block's return value.
+  # The caller need not close the streams:
+  #
+  #   Open3.popen3('echo') do |stdin, stdout, stderr, wait_thread|
+  #     p stdin
+  #     p stdout
+  #     p stderr
+  #     p wait_thread
+  #     p wait_thread.pid
+  #     p wait_thread.value
+  #   end
   #
-  # Block form:
+  # Output:
   #
-  #   Open3.popen3([env,] cmd... [, opts]) {|stdin, stdout, stderr, wait_thr|
-  #     pid = wait_thr.pid # pid of the started process.
-  #     ...
-  #     exit_status = wait_thr.value # Process::Status object returned.
-  #   }
+  #   #<IO:fd 6>
+  #   #<IO:fd 7>
+  #   #<IO:fd 9>
+  #   #<Process::Waiter:0x00007f58d53606e8 sleep>
+  #   2211047
+  #   #<Process::Status: pid 2211047 exit 0>
   #
-  # Non-block form:
+  # Like Process.spawn, this method has potential security vulnerabilities
+  # if called with untrusted input;
+  # see {Command Injection}[rdoc-ref:command_injection.rdoc@Command+Injection].
   #
-  #   stdin, stdout, stderr, wait_thr = Open3.popen3([env,] cmd... [, opts])
-  #   pid = wait_thr[:pid]  # pid of the started process
-  #   ...
-  #   stdin.close  # stdin, stdout and stderr should be closed explicitly in this form.
-  #   stdout.close
-  #   stderr.close
-  #   exit_status = wait_thr.value  # Process::Status object returned.
+  # Unlike Process.spawn, this method waits for the child process to exit
+  # before returning, so the caller need not do so.
+  #
+  # If the first argument is a hash, it becomes leading argument +env+
+  # in the call to Process.spawn;
+  # see {Execution Environment}[rdoc-ref:Process@Execution+Environment].
+  #
+  # If the last argument is a hash, it becomes trailing argument +options+
+  # in the call to Process.spawn;
+  # see {Execution Options}[rdoc-ref:Process@Execution+Options].
+  #
+  # The single required argument is one of the following:
+  #
+  # - +command_line+ if it is a string,
+  #   and if it begins with a shell reserved word or special built-in,
+  #   or if it contains one or more metacharacters.
+  # - +exe_path+ otherwise.
+  #
+  # <b>Argument +command_line+</b>
   #
-  # The parameters env, cmd, and opts are passed to Process.spawn.
-  # A commandline string and a list of argument strings can be accepted as follows:
+  # \String argument +command_line+ is a command line to be passed to a shell;
+  # it must begin with a shell reserved word, begin with a special built-in,
+  # or contain meta characters:
   #
-  #   Open3.popen3("echo abc") {|i, o, e, t| ... }
-  #   Open3.popen3("echo", "abc") {|i, o, e, t| ... }
-  #   Open3.popen3(["echo", "argv0"], "abc") {|i, o, e, t| ... }
+  #   Open3.popen3('if true; then echo "Foo"; fi') {|*args| p args } # Shell reserved word.
+  #   Open3.popen3('echo') {|*args| p args }                         # Built-in.
+  #   Open3.popen3('date > date.tmp') {|*args| p args }              # Contains meta character.
   #
-  # If the last parameter, opts, is a Hash, it is recognized as an option for Process.spawn.
+  # Output (similar for each call above):
   #
-  #   Open3.popen3("pwd", :chdir=>"/") {|i,o,e,t|
-  #     p o.read.chomp #=> "/"
-  #   }
+  #   [#<IO:(closed)>, #<IO:(closed)>, #<IO:(closed)>, #<Process::Waiter:0x00007f58d52f28c8 dead>]
   #
-  # wait_thr.value waits for the termination of the process.
-  # The block form also waits for the process when it returns.
+  # The command line may also contain arguments and options for the command:
+  #
+  #   Open3.popen3('echo "Foo"') { |i, o, e, t| o.gets }
+  #   "Foo\n"
+  #
+  # <b>Argument +exe_path+</b>
+  #
+  # Argument +exe_path+ is one of the following:
+  #
+  # - The string path to an executable to be called.
+  # - A 2-element array containing the path to an executable
+  #   and the string to be used as the name of the executing process.
+  #
+  # Example:
   #
-  # Closing stdin, stdout and stderr does not wait for the process to complete.
+  #   Open3.popen3('/usr/bin/date') { |i, o, e, t| o.gets }
+  #   # => "Wed Sep 27 02:56:44 PM CDT 2023\n"
   #
-  # You should be careful to avoid deadlocks.
-  # Since pipes are fixed length buffers,
-  # Open3.popen3("prog") {|i, o, e, t| o.read } deadlocks if
-  # the program generates too much output on stderr.
-  # You should read stdout and stderr simultaneously (using threads or IO.select).
-  # However, if you don't need stderr output, you can use Open3.popen2.
-  # If merged stdout and stderr output is not a problem, you can use Open3.popen2e.
-  # If you really need stdout and stderr output as separate strings, you can consider Open3.capture3.
+  # Ruby invokes the executable directly, with no shell and no shell expansion:
+  #
+  #   Open3.popen3('doesnt_exist') { |i, o, e, t| o.gets } # Raises Errno::ENOENT
+  #
+  # If one or more +args+ is given, each is an argument or option
+  # to be passed to the executable:
+  #
+  #   Open3.popen3('echo', 'C #') { |i, o, e, t| o.gets }
+  #   # => "C #\n"
+  #   Open3.popen3('echo', 'hello', 'world') { |i, o, e, t| o.gets }
+  #   # => "hello world\n"
+  #
+  # Take care to avoid deadlocks.
+  # Output streams +stdout+ and +stderr+ have fixed-size buffers,
+  # so reading extensively from one but not the other can cause a deadlock
+  # when the unread buffer fills.
+  # To avoid that, +stdout+ and +stderr+ should be read simultaneously
+  # (using threads or IO.select).
+  #
+  # Related:
+  #
+  # - Open3.popen2: Makes the standard input and standard output streams
+  #   of the child process available as separate streams,
+  #   with no access to the standard error stream.
+  # - Open3.popen2e: Makes the standard input and the merge
+  #   of the standard output and standard error streams
+  #   of the child process available as separate streams.
   #
   def popen3(*cmd, &block)
     if Hash === cmd.last
@@ -104,45 +236,131 @@ def popen3(*cmd, &block)
   end
   module_function :popen3
 
-  # Open3.popen2 is similar to Open3.popen3 except that it doesn't create a pipe for
-  # the standard error stream.
+  # :call-seq:
+  #   Open3.popen2([env, ] command_line, options = {}) -> [stdin, stdout, wait_thread]
+  #   Open3.popen2([env, ] exe_path, *args, options = {}) -> [stdin, stdout, wait_thread]
+  #   Open3.popen2([env, ] command_line, options = {}) {|stdin, stdout, wait_thread| ... } -> object
+  #   Open3.popen2([env, ] exe_path, *args, options = {}) {|stdin, stdout, wait_thread| ... } -> object
+  #
+  # Basically a wrapper for
+  # {Process.spawn}[rdoc-ref:Process.spawn]
+  # that:
+  #
+  # - Creates a child process, by calling Process.spawn with the given arguments.
+  # - Creates streams +stdin+ and +stdout+,
+  #   which are the standard input and standard output streams
+  #   in the child process.
+  # - Creates thread +wait_thread+ that waits for the child process to exit;
+  #   the thread has method +pid+, which returns the process ID
+  #   of the child process.
+  #
+  # With no block given, returns the array
+  # <tt>[stdin, stdout, wait_thread]</tt>.
+  # The caller should close each of the two returned streams.
+  #
+  #   stdin, stdout, wait_thread = Open3.popen2('echo')
+  #   # => [#<IO:fd 6>, #<IO:fd 7>, #<Process::Waiter:0x00007f58d52dbe98 run>]
+  #   stdin.close
+  #   stdout.close
+  #   wait_thread.pid   # => 2263572
+  #   wait_thread.value # => #<Process::Status: pid 2263572 exit 0>
+  #
+  # With a block given, calls the block with the three variables
+  # (two streams and the wait thread)
+  # and returns the block's return value.
+  # The caller need not close the streams:
+  #
+  #   Open3.popen2('echo') do |stdin, stdout, wait_thread|
+  #     p stdin
+  #     p stdout
+  #     p wait_thread
+  #     p wait_thread.pid
+  #     p wait_thread.value
+  #   end
   #
-  # Block form:
+  # Output:
   #
-  #   Open3.popen2([env,] cmd... [, opts]) {|stdin, stdout, wait_thr|
-  #     pid = wait_thr.pid # pid of the started process.
-  #     ...
-  #     exit_status = wait_thr.value # Process::Status object returned.
-  #   }
+  #   #<IO:fd 6>
+  #   #<IO:fd 7>
+  #   #<Process::Waiter:0x00007f58d59a34b0 sleep>
+  #   2263636
+  #   #<Process::Status: pid 2263636 exit 0>
   #
-  # Non-block form:
+  # Like Process.spawn, this method has potential security vulnerabilities
+  # if called with untrusted input;
+  # see {Command Injection}[rdoc-ref:command_injection.rdoc@Command+Injection].
   #
-  #   stdin, stdout, wait_thr = Open3.popen2([env,] cmd... [, opts])
-  #   ...
-  #   stdin.close  # stdin and stdout should be closed explicitly in this form.
-  #   stdout.close
+  # Unlike Process.spawn, this method waits for the child process to exit
+  # before returning, so the caller need not do so.
+  #
+  # If the first argument is a hash, it becomes leading argument +env+
+  # in the call to Process.spawn;
+  # see {Execution Environment}[rdoc-ref:Process@Execution+Environment].
+  #
+  # If the last argument is a hash, it becomes trailing argument +options+
+  # in the call to Process.spawn;
+  # see {Execution Options}[rdoc-ref:Process@Execution+Options].
+  #
+  # The single required argument is one of the following:
+  #
+  # - +command_line+ if it is a string,
+  #   and if it begins with a shell reserved word or special built-in,
+  #   or if it contains one or more metacharacters.
+  # - +exe_path+ otherwise.
   #
-  # See Process.spawn for the optional hash arguments _env_ and _opts_.
+  # <b>Argument +command_line+</b>
+  #
+  # \String argument +command_line+ is a command line to be passed to a shell;
+  # it must begin with a shell reserved word, begin with a special built-in,
+  # or contain meta characters:
+  #
+  #   Open3.popen2('if true; then echo "Foo"; fi') {|*args| p args } # Shell reserved word.
+  #   Open3.popen2('echo') {|*args| p args }                         # Built-in.
+  #   Open3.popen2('date > date.tmp') {|*args| p args }              # Contains meta character.
+  #
+  # Output (similar for each call above):
+  #
+  #   # => [#<IO:(closed)>, #<IO:(closed)>, #<Process::Waiter:0x00007f7577dfe410 dead>]
+  #
+  # The command line may also contain arguments and options for the command:
+  #
+  #   Open3.popen2('echo "Foo"') { |i, o, t| o.gets }
+  #   "Foo\n"
+  #
+  # <b>Argument +exe_path+</b>
+  #
+  # Argument +exe_path+ is one of the following:
+  #
+  # - The string path to an executable to be called.
+  # - A 2-element array containing the path to an executable
+  #   and the string to be used as the name of the executing process.
   #
   # Example:
   #
-  #   Open3.popen2("wc -c") {|i,o,t|
-  #     i.print "answer to life the universe and everything"
-  #     i.close
-  #     p o.gets #=> "42\n"
-  #   }
+  #   Open3.popen2('/usr/bin/date') { |i, o, t| o.gets }
+  #   # => "Thu Sep 28 09:41:06 AM CDT 2023\n"
+  #
+  # Ruby invokes the executable directly, with no shell and no shell expansion:
+  #
+  #   Open3.popen2('doesnt_exist') { |i, o, t| o.gets } # Raises Errno::ENOENT
+  #
+  # If one or more +args+ is given, each is an argument or option
+  # to be passed to the executable:
+  #
+  #   Open3.popen2('echo', 'C #') { |i, o, t| o.gets }
+  #   # => "C #\n"
+  #   Open3.popen2('echo', 'hello', 'world') { |i, o, t| o.gets }
+  #   # => "hello world\n"
   #
-  #   Open3.popen2("bc -q") {|i,o,t|
-  #     i.puts "obase=13"
-  #     i.puts "6 * 9"
-  #     p o.gets #=> "42\n"
-  #   }
   #
-  #   Open3.popen2("dc") {|i,o,t|
-  #     i.print "42P"
-  #     i.close
-  #     p o.read #=> "*"
-  #   }
+  # Related:
+  #
+  # - Open3.popen2e: Makes the standard input and the merge
+  #   of the standard output and standard error streams
+  #   of the child process available as separate streams.
+  # - Open3.popen3: Makes the standard input, standard output,
+  #   and standard error streams
+  #   of the child process available as separate streams.
   #
   def popen2(*cmd, &block)
     if Hash === cmd.last
@@ -162,36 +380,130 @@ def popen2(*cmd, &block)
   end
   module_function :popen2
 
-  # Open3.popen2e is similar to Open3.popen3 except that it merges
-  # the standard output stream and the standard error stream.
+  # :call-seq:
+  #   Open3.popen2e([env, ] command_line, options = {}) -> [stdin, stdout_and_stderr, wait_thread]
+  #   Open3.popen2e([env, ] exe_path, *args, options = {}) -> [stdin, stdout_and_stderr, wait_thread]
+  #   Open3.popen2e([env, ] command_line, options = {}) {|stdin, stdout_and_stderr, wait_thread| ... } -> object
+  #   Open3.popen2e([env, ] exe_path, *args, options = {}) {|stdin, stdout_and_stderr, wait_thread| ... } -> object
+  #
+  # Basically a wrapper for
+  # {Process.spawn}[rdoc-ref:Process.spawn]
+  # that:
+  #
+  # - Creates a child process, by calling Process.spawn with the given arguments.
+  # - Creates streams +stdin+, +stdout_and_stderr+,
+  #   which are the standard input and the merge of the standard output
+  #   and standard error streams in the child process.
+  # - Creates thread +wait_thread+ that waits for the child process to exit;
+  #   the thread has method +pid+, which returns the process ID
+  #   of the child process.
+  #
+  # With no block given, returns the array
+  # <tt>[stdin, stdout_and_stderr, wait_thread]</tt>.
+  # The caller should close each of the two returned streams.
+  #
+  #   stdin, stdout_and_stderr, wait_thread = Open3.popen2e('echo')
+  #   # => [#<IO:fd 6>, #<IO:fd 7>, #<Process::Waiter:0x00007f7577da4398 run>]
+  #   stdin.close
+  #   stdout_and_stderr.close
+  #   wait_thread.pid   # => 2274600
+  #   wait_thread.value # => #<Process::Status: pid 2274600 exit 0>
+  #
+  # With a block given, calls the block with the three variables
+  # (two streams and the wait thread)
+  # and returns the block's return value.
+  # The caller need not close the streams:
+  #
+  #   Open3.popen2e('echo') do |stdin, stdout_and_stderr, wait_thread|
+  #     p stdin
+  #     p stdout_and_stderr
+  #     p wait_thread
+  #     p wait_thread.pid
+  #     p wait_thread.value
+  #   end
   #
-  # Block form:
+  # Output:
   #
-  #   Open3.popen2e([env,] cmd... [, opts]) {|stdin, stdout_and_stderr, wait_thr|
-  #     pid = wait_thr.pid # pid of the started process.
-  #     ...
-  #     exit_status = wait_thr.value # Process::Status object returned.
-  #   }
+  #   #<IO:fd 6>
+  #   #<IO:fd 7>
+  #   #<Process::Waiter:0x00007f75777578c8 sleep>
+  #   2274763
+  #   #<Process::Status: pid 2274763 exit 0>
   #
-  # Non-block form:
+  # Like Process.spawn, this method has potential security vulnerabilities
+  # if called with untrusted input;
+  # see {Command Injection}[rdoc-ref:command_injection.rdoc@Command+Injection].
   #
-  #   stdin, stdout_and_stderr, wait_thr = Open3.popen2e([env,] cmd... [, opts])
-  #   ...
-  #   stdin.close  # stdin and stdout_and_stderr should be closed explicitly in this form.
-  #   stdout_and_stderr.close
+  # Unlike Process.spawn, this method waits for the child process to exit
+  # before returning, so the caller need not do so.
+  #
+  # If the first argument is a hash, it becomes leading argument +env+
+  # in the call to Process.spawn;
+  # see {Execution Environment}[rdoc-ref:Process@Execution+Environment].
+  #
+  # If the last argument is a hash, it becomes trailing argument +options+
+  # in the call to Process.spawn;
+  # see {Execution Options}[rdoc-ref:Process@Execution+Options].
+  #
+  # The single required argument is one of the following:
+  #
+  # - +command_line+ if it is a string,
+  #   and if it begins with a shell reserved word or special built-in,
+  #   or if it contains one or more metacharacters.
+  # - +exe_path+ otherwise.
+  #
+  # <b>Argument +command_line+</b>
+  #
+  # \String argument +command_line+ is a command line to be passed to a shell;
+  # it must begin with a shell reserved word, begin with a special built-in,
+  # or contain meta characters:
+  #
+  #   Open3.popen2e('if true; then echo "Foo"; fi') {|*args| p args } # Shell reserved word.
+  #   Open3.popen2e('echo') {|*args| p args }                         # Built-in.
+  #   Open3.popen2e('date > date.tmp') {|*args| p args }              # Contains meta character.
+  #
+  # Output (similar for each call above):
+  #
+  #   # => [#<IO:(closed)>, #<IO:(closed)>, #<Process::Waiter:0x00007f7577d8a1f0 dead>]
   #
-  # See Process.spawn for the optional hash arguments _env_ and _opts_.
+  # The command line may also contain arguments and options for the command:
+  #
+  #   Open3.popen2e('echo "Foo"') { |i, o_and_e, t| o_and_e.gets }
+  #   "Foo\n"
+  #
+  # <b>Argument +exe_path+</b>
+  #
+  # Argument +exe_path+ is one of the following:
+  #
+  # - The string path to an executable to be called.
+  # - A 2-element array containing the path to an executable
+  #   and the string to be used as the name of the executing process.
   #
   # Example:
-  #   # check gcc warnings
-  #   source = "foo.c"
-  #   Open3.popen2e("gcc", "-Wall", source) {|i,oe,t|
-  #     oe.each {|line|
-  #       if /warning/ =~ line
-  #         ...
-  #       end
-  #     }
-  #   }
+  #
+  #   Open3.popen2e('/usr/bin/date') { |i, o_and_e, t| o_and_e.gets }
+  #   # => "Thu Sep 28 01:58:45 PM CDT 2023\n"
+  #
+  # Ruby invokes the executable directly, with no shell and no shell expansion:
+  #
+  #   Open3.popen2e('doesnt_exist') { |i, o_and_e, t| o_and_e.gets } # Raises Errno::ENOENT
+  #
+  # If one or more +args+ is given, each is an argument or option
+  # to be passed to the executable:
+  #
+  #   Open3.popen2e('echo', 'C #') { |i, o_and_e, t| o_and_e.gets }
+  #   # => "C #\n"
+  #   Open3.popen2e('echo', 'hello', 'world') { |i, o_and_e, t| o_and_e.gets }
+  #   # => "hello world\n"
+  #
+  # Related:
+  #
+  # - Open3.popen2: Makes the standard input and standard output streams
+  #   of the child process available as separate streams,
+  #   with no access to the standard error stream.
+  # - Open3.popen3: Makes the standard input, standard output,
+  #   and standard error streams
+  #   of the child process available as separate streams.
   #
   def popen2e(*cmd, &block)
     if Hash === cmd.last
@@ -238,44 +550,100 @@ class << self
     private :popen_run
   end
 
-  # Open3.capture3 captures the standard output and the standard error of a command.
+  # :call-seq:
+  #   Open3.capture3([env, ] command_line, options = {}) -> [stdout_s, stderr_s, status]
+  #   Open3.capture3([env, ] exe_path, *args, options = {}) -> [stdout_s, stderr_s, status]
   #
-  #   stdout_str, stderr_str, status = Open3.capture3([env,] cmd... [, opts])
+  # Basically a wrapper for Open3.popen3 that:
   #
-  # The arguments env, cmd and opts are passed to Open3.popen3 except
-  # <code>opts[:stdin_data]</code> and <code>opts[:binmode]</code>.  See Process.spawn.
+  # - Creates a child process, by calling Open3.popen3 with the given arguments
+  #   (except for certain entries in hash +options+; see below).
+  # - Returns as strings +stdout_s+ and +stderr_s+ the standard output
+  #   and standard error of the child process.
+  # - Returns as +status+ a <tt>Process::Status</tt> object
+  #   that represents the exit status of the child process.
   #
-  # If <code>opts[:stdin_data]</code> is specified, it is sent to the command's standard input.
+  # Returns the array <tt>[stdout_s, stderr_s, status]</tt>:
   #
-  # If <code>opts[:binmode]</code> is true, internal pipes are set to binary mode.
+  #   stdout_s, stderr_s, status = Open3.capture3('echo "Foo"')
+  #   # => ["Foo\n", "", #<Process::Status: pid 2281954 exit 0>]
   #
-  # Examples:
+  # Like Process.spawn, this method has potential security vulnerabilities
+  # if called with untrusted input;
+  # see {Command Injection}[rdoc-ref:command_injection.rdoc@Command+Injection].
   #
-  #   # dot is a command of graphviz.
-  #   graph = <<'End'
-  #     digraph g {
-  #       a -> b
-  #     }
-  #   End
-  #   drawn_graph, dot_log = Open3.capture3("dot -v", :stdin_data=>graph)
+  # Unlike Process.spawn, this method waits for the child process to exit
+  # before returning, so the caller need not do so.
   #
-  #   o, e, s = Open3.capture3("echo abc; sort >&2", :stdin_data=>"foo\nbar\nbaz\n")
-  #   p o #=> "abc\n"
-  #   p e #=> "bar\nbaz\nfoo\n"
-  #   p s #=> #<Process::Status: pid 32682 exit 0>
+  # If the first argument is a hash, it becomes leading argument +env+
+  # in the call to Open3.popen3;
+  # see {Execution Environment}[rdoc-ref:Process@Execution+Environment].
   #
-  #   # generate a thumbnail image using the convert command of ImageMagick.
-  #   # However, if the image is really stored in a file,
-  #   # system("convert", "-thumbnail", "80", "png:#{filename}", "png:-") is better
-  #   # because of reduced memory consumption.
-  #   # But if the image is stored in a DB or generated by the gnuplot Open3.capture2 example,
-  #   # Open3.capture3 should be considered.
-  #   #
-  #   image = File.read("/usr/share/openclipart/png/animals/mammals/sheep-md-v0.1.png", :binmode=>true)
-  #   thumbnail, err, s = Open3.capture3("convert -thumbnail 80 png:- png:-", :stdin_data=>image, :binmode=>true)
-  #   if s.success?
-  #     STDOUT.binmode; print thumbnail
-  #   end
+  # If the last argument is a hash, it becomes trailing argument +options+
+  # in the call to Open3.popen3;
+  # see {Execution Options}[rdoc-ref:Process@Execution+Options].
+  #
+  # The hash +options+ is given;
+  # two options have local effect in method Open3.capture3:
+  #
+  # - If entry <tt>options[:stdin_data]</tt> exists, the entry is removed
+  #   and its string value is sent to the command's standard input:
+  #
+  #     Open3.capture3('tee', stdin_data: 'Foo')
+  #     # => ["Foo", "", #<Process::Status: pid 2319575 exit 0>]
+  #
+  # - If entry <tt>options[:binmode]</tt> exists, the entry is removed and
+  #   the internal streams are set to binary mode.
+  #
+  # The single required argument is one of the following:
+  #
+  # - +command_line+ if it is a string,
+  #   and if it begins with a shell reserved word or special built-in,
+  #   or if it contains one or more metacharacters.
+  # - +exe_path+ otherwise.
+  #
+  # <b>Argument +command_line+</b>
+  #
+  # \String argument +command_line+ is a command line to be passed to a shell;
+  # it must begin with a shell reserved word, begin with a special built-in,
+  # or contain meta characters:
+  #
+  #   Open3.capture3('if true; then echo "Foo"; fi') # Shell reserved word.
+  #   # => ["Foo\n", "", #<Process::Status: pid 2282025 exit 0>]
+  #   Open3.capture3('echo')                         # Built-in.
+  #   # => ["\n", "", #<Process::Status: pid 2282092 exit 0>]
+  #   Open3.capture3('date > date.tmp')              # Contains meta character.
+  #   # => ["", "", #<Process::Status: pid 2282110 exit 0>]
+  #
+  # The command line may also contain arguments and options for the command:
+  #
+  #   Open3.capture3('echo "Foo"')
+  #   # => ["Foo\n", "", #<Process::Status: pid 2282092 exit 0>]
+  #
+  # <b>Argument +exe_path+</b>
+  #
+  # Argument +exe_path+ is one of the following:
+  #
+  # - The string path to an executable to be called.
+  # - A 2-element array containing the path to an executable
+  #   and the string to be used as the name of the executing process.
+  #
+  # Example:
+  #
+  #   Open3.capture3('/usr/bin/date')
+  #   # => ["Thu Sep 28 05:03:51 PM CDT 2023\n", "", #<Process::Status: pid 2282300 exit 0>]
+  #
+  # Ruby invokes the executable directly, with no shell and no shell expansion:
+  #
+  #   Open3.capture3('doesnt_exist') # Raises Errno::ENOENT
+  #
+  # If one or more +args+ is given, each is an argument or option
+  # to be passed to the executable:
+  #
+  #   Open3.capture3('echo', 'C #')
+  #   # => ["C #\n", "", #<Process::Status: pid 2282368 exit 0>]
+  #   Open3.capture3('echo', 'hello', 'world')
+  #   # => ["hello world\n", "", #<Process::Status: pid 2282372 exit 0>]
   #
   def capture3(*cmd)
     if Hash === cmd.last
@@ -309,34 +677,100 @@ def capture3(*cmd)
   end
   module_function :capture3
 
-  # Open3.capture2 captures the standard output of a command.
+  # :call-seq:
+  #   Open3.capture2([env, ] command_line, options = {}) -> [stdout_s, status]
+  #   Open3.capture2([env, ] exe_path, *args, options = {}) -> [stdout_s, status]
+  #
+  # Basically a wrapper for Open3.popen3 that:
+  #
+  # - Creates a child process, by calling Open3.popen3 with the given arguments
+  #   (except for certain entries in hash +options+; see below).
+  # - Returns as string +stdout_s+ the standard output of the child process.
+  # - Returns as +status+ a <tt>Process::Status</tt> object
+  #   that represents the exit status of the child process.
+  #
+  # Returns the array <tt>[stdout_s, status]</tt>:
+  #
+  #   stdout_s, status = Open3.capture2('echo "Foo"')
+  #   # => ["Foo\n", #<Process::Status: pid 2326047 exit 0>]
+  #
+  # Like Process.spawn, this method has potential security vulnerabilities
+  # if called with untrusted input;
+  # see {Command Injection}[rdoc-ref:command_injection.rdoc@Command+Injection].
+  #
+  # Unlike Process.spawn, this method waits for the child process to exit
+  # before returning, so the caller need not do so.
   #
-  #   stdout_str, status = Open3.capture2([env,] cmd... [, opts])
+  # If the first argument is a hash, it becomes leading argument +env+
+  # in the call to Open3.popen3;
+  # see {Execution Environment}[rdoc-ref:Process@Execution+Environment].
   #
-  # The arguments env, cmd and opts are passed to Open3.popen3 except
-  # <code>opts[:stdin_data]</code> and <code>opts[:binmode]</code>.  See Process.spawn.
+  # If the last argument is a hash, it becomes trailing argument +options+
+  # in the call to Open3.popen3;
+  # see {Execution Options}[rdoc-ref:Process@Execution+Options].
   #
-  # If <code>opts[:stdin_data]</code> is specified, it is sent to the command's standard input.
+  # The hash +options+ is given;
+  # two options have local effect in method Open3.capture2:
   #
-  # If <code>opts[:binmode]</code> is true, internal pipes are set to binary mode.
+  # - If entry <tt>options[:stdin_data]</tt> exists, the entry is removed
+  #   and its string value is sent to the command's standard input:
+  #
+  #     Open3.capture2('tee', stdin_data: 'Foo')
+  #
+  #     # => ["Foo", #<Process::Status: pid 2326087 exit 0>]
+  #
+  # - If entry <tt>options[:binmode]</tt> exists, the entry is removed and
+  #   the internal streams are set to binary mode.
+  #
+  # The single required argument is one of the following:
+  #
+  # - +command_line+ if it is a string,
+  #   and if it begins with a shell reserved word or special built-in,
+  #   or if it contains one or more metacharacters.
+  # - +exe_path+ otherwise.
+  #
+  # <b>Argument +command_line+</b>
+  #
+  # \String argument +command_line+ is a command line to be passed to a shell;
+  # it must begin with a shell reserved word, begin with a special built-in,
+  # or contain meta characters:
+  #
+  #   Open3.capture2('if true; then echo "Foo"; fi') # Shell reserved word.
+  #   # => ["Foo\n", #<Process::Status: pid 2326131 exit 0>]
+  #   Open3.capture2('echo')                         # Built-in.
+  #   # => ["\n", #<Process::Status: pid 2326139 exit 0>]
+  #   Open3.capture2('date > date.tmp')              # Contains meta character.
+  #   # => ["", #<Process::Status: pid 2326174 exit 0>]
+  #
+  # The command line may also contain arguments and options for the command:
+  #
+  #   Open3.capture2('echo "Foo"')
+  #   # => ["Foo\n", #<Process::Status: pid 2326183 exit 0>]
+  #
+  # <b>Argument +exe_path+</b>
+  #
+  # Argument +exe_path+ is one of the following:
+  #
+  # - The string path to an executable to be called.
+  # - A 2-element array containing the path to an executable
+  #   and the string to be used as the name of the executing process.
   #
   # Example:
   #
-  #   # factor is a command for integer factorization.
-  #   o, s = Open3.capture2("factor", :stdin_data=>"42")
-  #   p o #=> "42: 2 3 7\n"
-  #
-  #   # generate x**2 graph in png using gnuplot.
-  #   gnuplot_commands = <<"End"
-  #     set terminal png
-  #     plot x**2, "-" with lines
-  #     1 14
-  #     2 1
-  #     3 8
-  #     4 5
-  #     e
-  #   End
-  #   image, s = Open3.capture2("gnuplot", :stdin_data=>gnuplot_commands, :binmode=>true)
+  #   Open3.capture2('/usr/bin/date')
+  #   # => ["Fri Sep 29 01:00:39 PM CDT 2023\n", #<Process::Status: pid 2326222 exit 0>]
+  #
+  # Ruby invokes the executable directly, with no shell and no shell expansion:
+  #
+  #   Open3.capture2('doesnt_exist') # Raises Errno::ENOENT
+  #
+  # If one or more +args+ is given, each is an argument or option
+  # to be passed to the executable:
+  #
+  #   Open3.capture2('echo', 'C #')
+  #   # => ["C #\n", #<Process::Status: pid 2326267 exit 0>]
+  #   Open3.capture2('echo', 'hello', 'world')
+  #   # => ["hello world\n", #<Process::Status: pid 2326299 exit 0>]
   #
   def capture2(*cmd)
     if Hash === cmd.last
@@ -370,21 +804,100 @@ def capture2(*cmd)
   end
   module_function :capture2
 
-  # Open3.capture2e captures the standard output and the standard error of a command.
+  # :call-seq:
+  #   Open3.capture2e([env, ] command_line, options = {}) -> [stdout_and_stderr_s, status]
+  #   Open3.capture2e([env, ] exe_path, *args, options = {}) -> [stdout_and_stderr_s, status]
+  #
+  # Basically a wrapper for Open3.popen3 that:
+  #
+  # - Creates a child process, by calling Open3.popen3 with the given arguments
+  #   (except for certain entries in hash +options+; see below).
+  # - Returns as string +stdout_and_stderr_s+ the merged standard output
+  #   and standard error of the child process.
+  # - Returns as +status+ a <tt>Process::Status</tt> object
+  #   that represents the exit status of the child process.
+  #
+  # Returns the array <tt>[stdout_and_stderr_s, status]</tt>:
+  #
+  #   stdout_and_stderr_s, status = Open3.capture2e('echo "Foo"')
+  #   # => ["Foo\n", #<Process::Status: pid 2371692 exit 0>]
+  #
+  # Like Process.spawn, this method has potential security vulnerabilities
+  # if called with untrusted input;
+  # see {Command Injection}[rdoc-ref:command_injection.rdoc@Command+Injection].
+  #
+  # Unlike Process.spawn, this method waits for the child process to exit
+  # before returning, so the caller need not do so.
+  #
+  # If the first argument is a hash, it becomes leading argument +env+
+  # in the call to Open3.popen3;
+  # see {Execution Environment}[rdoc-ref:Process@Execution+Environment].
+  #
+  # If the last argument is a hash, it becomes trailing argument +options+
+  # in the call to Open3.popen3;
+  # see {Execution Options}[rdoc-ref:Process@Execution+Options].
+  #
+  # The hash +options+ is given;
+  # two options have local effect in method Open3.capture2e:
+  #
+  # - If entry <tt>options[:stdin_data]</tt> exists, the entry is removed
+  #   and its string value is sent to the command's standard input:
   #
-  #   stdout_and_stderr_str, status = Open3.capture2e([env,] cmd... [, opts])
+  #     Open3.capture2e('tee', stdin_data: 'Foo')
+  #     # => ["Foo", #<Process::Status: pid 2371732 exit 0>]
   #
-  # The arguments env, cmd and opts are passed to Open3.popen3 except
-  # <code>opts[:stdin_data]</code> and <code>opts[:binmode]</code>.  See Process.spawn.
+  # - If entry <tt>options[:binmode]</tt> exists, the entry is removed and
+  #   the internal streams are set to binary mode.
   #
-  # If <code>opts[:stdin_data]</code> is specified, it is sent to the command's standard input.
+  # The single required argument is one of the following:
   #
-  # If <code>opts[:binmode]</code> is true, internal pipes are set to binary mode.
+  # - +command_line+ if it is a string,
+  #   and if it begins with a shell reserved word or special built-in,
+  #   or if it contains one or more metacharacters.
+  # - +exe_path+ otherwise.
+  #
+  # <b>Argument +command_line+</b>
+  #
+  # \String argument +command_line+ is a command line to be passed to a shell;
+  # it must begin with a shell reserved word, begin with a special built-in,
+  # or contain meta characters:
+  #
+  #   Open3.capture2e('if true; then echo "Foo"; fi') # Shell reserved word.
+  #   # => ["Foo\n", #<Process::Status: pid 2371740 exit 0>]
+  #   Open3.capture2e('echo')                         # Built-in.
+  #   # => ["\n", #<Process::Status: pid 2371774 exit 0>]
+  #   Open3.capture2e('date > date.tmp')              # Contains meta character.
+  #   # => ["", #<Process::Status: pid 2371812 exit 0>]
+  #
+  # The command line may also contain arguments and options for the command:
+  #
+  #   Open3.capture2e('echo "Foo"')
+  #   # => ["Foo\n", #<Process::Status: pid 2326183 exit 0>]
+  #
+  # <b>Argument +exe_path+</b>
+  #
+  # Argument +exe_path+ is one of the following:
+  #
+  # - The string path to an executable to be called.
+  # - A 2-element array containing the path to an executable
+  #   and the string to be used as the name of the executing process.
   #
   # Example:
   #
-  #   # capture make log
-  #   make_log, s = Open3.capture2e("make")
+  #   Open3.capture2e('/usr/bin/date')
+  #   # => ["Sat Sep 30 09:01:46 AM CDT 2023\n", #<Process::Status: pid 2371820 exit 0>]
+  #
+  # Ruby invokes the executable directly, with no shell and no shell expansion:
+  #
+  #   Open3.capture2e('doesnt_exist') # Raises Errno::ENOENT
+  #
+  # If one or more +args+ is given, each is an argument or option
+  # to be passed to the executable:
+  #
+  #   Open3.capture2e('echo', 'C #')
+  #   # => ["C #\n", #<Process::Status: pid 2371856 exit 0>]
+  #   Open3.capture2e('echo', 'hello', 'world')
+  #   # => ["hello world\n", #<Process::Status: pid 2371894 exit 0>]
   #
   def capture2e(*cmd)
     if Hash === cmd.last
@@ -418,48 +931,86 @@ def capture2e(*cmd)
   end
   module_function :capture2e
 
-  # Open3.pipeline_rw starts a list of commands as a pipeline with pipes
-  # which connect to stdin of the first command and stdout of the last command.
-  #
-  #   Open3.pipeline_rw(cmd1, cmd2, ... [, opts]) {|first_stdin, last_stdout, wait_threads|
-  #     ...
-  #   }
+  # :call-seq:
+  #   Open3.pipeline_rw([env, ] *cmds, options = {}) -> [first_stdin, last_stdout, wait_threads]
   #
-  #   first_stdin, last_stdout, wait_threads = Open3.pipeline_rw(cmd1, cmd2, ... [, opts])
-  #   ...
-  #   first_stdin.close
-  #   last_stdout.close
+  # Basically a wrapper for
+  # {Process.spawn}[rdoc-ref:Process.spawn]
+  # that:
   #
-  # Each cmd is a string or an array.
-  # If it is an array, the elements are passed to Process.spawn.
+  # - Creates a child process for each of the given +cmds+
+  #   by calling Process.spawn.
+  # - Pipes the +stdout+ from each child to the +stdin+ of the next child,
+  #   or, for the first child, from the caller's +stdin+,
+  #   or, for the last child, to the caller's +stdout+.
   #
-  #   cmd:
-  #     commandline                              command line string which is passed to a shell
-  #     [env, commandline, opts]                 command line string which is passed to a shell
-  #     [env, cmdname, arg1, ..., opts]          command name and one or more arguments (no shell)
-  #     [env, [cmdname, argv0], arg1, ..., opts] command name and arguments including argv[0] (no shell)
+  # The method does not wait for child processes to exit,
+  # so the caller must do so.
   #
-  #   Note that env and opts are optional, as for Process.spawn.
+  # With no block given, returns a 3-element array containing:
   #
-  # The options to pass to Process.spawn are constructed by merging
-  # +opts+, the last hash element of the array, and
-  # specifications for the pipes between each of the commands.
+  # - The +stdin+ stream of the first child process.
+  # - The +stdout+ stream of the last child process.
+  # - An array of the wait threads for all of the child processes.
   #
   # Example:
   #
-  #   Open3.pipeline_rw("tr -dc A-Za-z", "wc -c") {|i, o, ts|
-  #     i.puts "All persons more than a mile high to leave the court."
-  #     i.close
-  #     p o.gets #=> "42\n"
-  #   }
-  #
-  #   Open3.pipeline_rw("sort", "cat -n") {|stdin, stdout, wait_thrs|
-  #     stdin.puts "foo"
-  #     stdin.puts "bar"
-  #     stdin.puts "baz"
-  #     stdin.close     # send EOF to sort.
-  #     p stdout.read   #=> "     1\tbar\n     2\tbaz\n     3\tfoo\n"
-  #   }
+  #   first_stdin, last_stdout, wait_threads = Open3.pipeline_rw('sort', 'cat -n')
+  #   # => [#<IO:fd 20>, #<IO:fd 21>, [#<Process::Waiter:0x000055e8de29ab40 sleep>, #<Process::Waiter:0x000055e8de29a690 sleep>]]
+  #   first_stdin.puts("foo\nbar\nbaz")
+  #   first_stdin.close # Send EOF to sort.
+  #   puts last_stdout.read
+  #   wait_threads.each do |wait_thread|
+  #     wait_thread.join
+  #   end
+  #
+  # Output:
+  #
+  #   1	bar
+  #   2	baz
+  #   3	foo
+  #
+  # With a block given, calls the block with the +stdin+ stream of the first child,
+  # the +stdout+ stream  of the last child,
+  # and an array of the wait processes:
+  #
+  #   Open3.pipeline_rw('sort', 'cat -n') do |first_stdin, last_stdout, wait_threads|
+  #     first_stdin.puts "foo\nbar\nbaz"
+  #     first_stdin.close # send EOF to sort.
+  #     puts last_stdout.read
+  #     wait_threads.each do |wait_thread|
+  #       wait_thread.join
+  #     end
+  #   end
+  #
+  # Output:
+  #
+  #   1	bar
+  #   2	baz
+  #   3	foo
+  #
+  # Like Process.spawn, this method has potential security vulnerabilities
+  # if called with untrusted input;
+  # see {Command Injection}[rdoc-ref:command_injection.rdoc@Command+Injection].
+  #
+  # If the first argument is a hash, it becomes leading argument +env+
+  # in each call to Process.spawn;
+  # see {Execution Environment}[rdoc-ref:Process@Execution+Environment].
+  #
+  # If the last argument is a hash, it becomes trailing argument +options+
+  # in each call to Process.spawn;
+  # see {Execution Options}[rdoc-ref:Process@Execution+Options].
+  #
+  # Each remaining argument in +cmds+ is one of:
+  #
+  # - A +command_line+: a string that begins with a shell reserved word
+  #   or special built-in, or contains one or more metacharacters.
+  # - An +exe_path+: the string path to an executable to be called.
+  # - An array containing a +command_line+ or an +exe_path+,
+  #   along with zero or more string arguments for the command.
+  #
+  # See {Argument command_line or exe_path}[rdoc-ref:Process@Argument+command_line+or+exe_path].
+  #
   def pipeline_rw(*cmds, &block)
     if Hash === cmds.last
       opts = cmds.pop.dup
@@ -478,43 +1029,77 @@ def pipeline_rw(*cmds, &block)
   end
   module_function :pipeline_rw
 
-  # Open3.pipeline_r starts a list of commands as a pipeline with a pipe
-  # which connects to stdout of the last command.
+  # :call-seq:
+  #   Open3.pipeline_r([env, ] *cmds, options = {}) -> [last_stdout, wait_threads]
   #
-  #   Open3.pipeline_r(cmd1, cmd2, ... [, opts]) {|last_stdout, wait_threads|
-  #     ...
-  #   }
+  # Basically a wrapper for
+  # {Process.spawn}[rdoc-ref:Process.spawn]
+  # that:
   #
-  #   last_stdout, wait_threads = Open3.pipeline_r(cmd1, cmd2, ... [, opts])
-  #   ...
-  #   last_stdout.close
+  # - Creates a child process for each of the given +cmds+
+  #   by calling Process.spawn.
+  # - Pipes the +stdout+ from each child to the +stdin+ of the next child,
+  #   or, for the last child, to the caller's +stdout+.
   #
-  # Each cmd is a string or an array.
-  # If it is an array, the elements are passed to Process.spawn.
+  # The method does not wait for child processes to exit,
+  # so the caller must do so.
   #
-  #   cmd:
-  #     commandline                              command line string which is passed to a shell
-  #     [env, commandline, opts]                 command line string which is passed to a shell
-  #     [env, cmdname, arg1, ..., opts]          command name and one or more arguments (no shell)
-  #     [env, [cmdname, argv0], arg1, ..., opts] command name and arguments including argv[0] (no shell)
+  # With no block given, returns a 2-element array containing:
   #
-  #   Note that env and opts are optional, as for Process.spawn.
+  # - The +stdout+ stream of the last child process.
+  # - An array of the wait threads for all of the child processes.
   #
   # Example:
   #
-  #   Open3.pipeline_r("zcat /var/log/apache2/access.log.*.gz",
-  #                    [{"LANG"=>"C"}, "grep", "GET /favicon.ico"],
-  #                    "logresolve") {|o, ts|
-  #     o.each_line {|line|
-  #       ...
-  #     }
-  #   }
+  #   last_stdout, wait_threads = Open3.pipeline_r('ls', 'grep R')
+  #   # => [#<IO:fd 5>, [#<Process::Waiter:0x000055e8de2f9898 dead>, #<Process::Waiter:0x000055e8de2f94b0 sleep>]]
+  #   puts last_stdout.read
+  #   wait_threads.each do |wait_thread|
+  #     wait_thread.join
+  #   end
+  #
+  # Output:
+  #
+  #   Rakefile
+  #   README.md
+  #
+  # With a block given, calls the block with the +stdout+ stream
+  # of the last child process,
+  # and an array of the wait processes:
+  #
+  #   Open3.pipeline_r('ls', 'grep R') do |last_stdout, wait_threads|
+  #     puts last_stdout.read
+  #     wait_threads.each do |wait_thread|
+  #       wait_thread.join
+  #     end
+  #   end
+  #
+  # Output:
+  #
+  #   Rakefile
+  #   README.md
+  #
+  # Like Process.spawn, this method has potential security vulnerabilities
+  # if called with untrusted input;
+  # see {Command Injection}[rdoc-ref:command_injection.rdoc@Command+Injection].
+  #
+  # If the first argument is a hash, it becomes leading argument +env+
+  # in each call to Process.spawn;
+  # see {Execution Environment}[rdoc-ref:Process@Execution+Environment].
+  #
+  # If the last argument is a hash, it becomes trailing argument +options+
+  # in each call to Process.spawn;
+  # see {Execution Options}[rdoc-ref:Process@Execution+Options].
   #
-  #   Open3.pipeline_r("yes", "head -10") {|o, ts|
-  #     p o.read      #=> "y\ny\ny\ny\ny\ny\ny\ny\ny\ny\n"
-  #     p ts[0].value #=> #<Process::Status: pid 24910 SIGPIPE (signal 13)>
-  #     p ts[1].value #=> #<Process::Status: pid 24913 exit 0>
-  #   }
+  # Each remaining argument in +cmds+ is one of:
+  #
+  # - A +command_line+: a string that begins with a shell reserved word
+  #   or special built-in, or contains one or more metacharacters.
+  # - An +exe_path+: the string path to an executable to be called.
+  # - An array containing a +command_line+ or an +exe_path+,
+  #   along with zero or more string arguments for the command.
+  #
+  # See {Argument command_line or exe_path}[rdoc-ref:Process@Argument+command_line+or+exe_path].
   #
   def pipeline_r(*cmds, &block)
     if Hash === cmds.last
@@ -530,33 +1115,82 @@ def pipeline_r(*cmds, &block)
   end
   module_function :pipeline_r
 
-  # Open3.pipeline_w starts a list of commands as a pipeline with a pipe
-  # which connects to stdin of the first command.
+
+  # :call-seq:
+  #   Open3.pipeline_w([env, ] *cmds, options = {}) -> [first_stdin, wait_threads]
   #
-  #   Open3.pipeline_w(cmd1, cmd2, ... [, opts]) {|first_stdin, wait_threads|
-  #     ...
-  #   }
+  # Basically a wrapper for
+  # {Process.spawn}[rdoc-ref:Process.spawn]
+  # that:
   #
-  #   first_stdin, wait_threads = Open3.pipeline_w(cmd1, cmd2, ... [, opts])
-  #   ...
-  #   first_stdin.close
+  # - Creates a child process for each of the given +cmds+
+  #   by calling Process.spawn.
+  # - Pipes the +stdout+ from each child to the +stdin+ of the next child,
+  #   or, for the first child, pipes the caller's +stdout+ to the child's +stdin+.
   #
-  # Each cmd is a string or an array.
-  # If it is an array, the elements are passed to Process.spawn.
+  # The method does not wait for child processes to exit,
+  # so the caller must do so.
   #
-  #   cmd:
-  #     commandline                              command line string which is passed to a shell
-  #     [env, commandline, opts]                 command line string which is passed to a shell
-  #     [env, cmdname, arg1, ..., opts]          command name and one or more arguments (no shell)
-  #     [env, [cmdname, argv0], arg1, ..., opts] command name and arguments including argv[0] (no shell)
+  # With no block given, returns a 2-element array containing:
   #
-  #   Note that env and opts are optional, as for Process.spawn.
+  # - The +stdin+ stream of the first child process.
+  # - An array of the wait threads for all of the child processes.
   #
   # Example:
   #
-  #   Open3.pipeline_w("bzip2 -c", :out=>"/tmp/hello.bz2") {|i, ts|
-  #     i.puts "hello"
-  #   }
+  #   first_stdin, wait_threads = Open3.pipeline_w('sort', 'cat -n')
+  #   # => [#<IO:fd 7>, [#<Process::Waiter:0x000055e8de928278 run>, #<Process::Waiter:0x000055e8de923e80 run>]]
+  #   first_stdin.puts("foo\nbar\nbaz")
+  #   first_stdin.close # Send EOF to sort.
+  #   wait_threads.each do |wait_thread|
+  #     wait_thread.join
+  #   end
+  #
+  # Output:
+  #
+  #   1	bar
+  #   2	baz
+  #   3	foo
+  #
+  # With a block given, calls the block with the +stdin+ stream
+  # of the first child process,
+  # and an array of the wait processes:
+  #
+  #   Open3.pipeline_w('sort', 'cat -n') do |first_stdin, wait_threads|
+  #     first_stdin.puts("foo\nbar\nbaz")
+  #     first_stdin.close # Send EOF to sort.
+  #     wait_threads.each do |wait_thread|
+  #       wait_thread.join
+  #     end
+  #   end
+  #
+  # Output:
+  #
+  #   1	bar
+  #   2	baz
+  #   3	foo
+  #
+  # Like Process.spawn, this method has potential security vulnerabilities
+  # if called with untrusted input;
+  # see {Command Injection}[rdoc-ref:command_injection.rdoc@Command+Injection].
+  #
+  # If the first argument is a hash, it becomes leading argument +env+
+  # in each call to Process.spawn;
+  # see {Execution Environment}[rdoc-ref:Process@Execution+Environment].
+  #
+  # If the last argument is a hash, it becomes trailing argument +options+
+  # in each call to Process.spawn;
+  # see {Execution Options}[rdoc-ref:Process@Execution+Options].
+  #
+  # Each remaining argument in +cmds+ is one of:
+  #
+  # - A +command_line+: a string that begins with a shell reserved word
+  #   or special built-in, or contains one or more metacharacters.
+  # - An +exe_path+: the string path to an executable to be called.
+  # - An array containing a +command_line+ or an +exe_path+,
+  #   along with zero or more string arguments for the command.
+  #
+  # See {Argument command_line or exe_path}[rdoc-ref:Process@Argument+command_line+or+exe_path].
   #
   def pipeline_w(*cmds, &block)
     if Hash === cmds.last
@@ -573,49 +1207,67 @@ def pipeline_w(*cmds, &block)
   end
   module_function :pipeline_w
 
-  # Open3.pipeline_start starts a list of commands as a pipeline.
-  # No pipes are created for stdin of the first command and
-  # stdout of the last command.
+  # :call-seq:
+  #   Open3.pipeline_start([env, ] *cmds, options = {}) -> [wait_threads]
   #
-  #   Open3.pipeline_start(cmd1, cmd2, ... [, opts]) {|wait_threads|
-  #     ...
-  #   }
+  # Basically a wrapper for
+  # {Process.spawn}[rdoc-ref:Process.spawn]
+  # that:
   #
-  #   wait_threads = Open3.pipeline_start(cmd1, cmd2, ... [, opts])
-  #   ...
+  # - Creates a child process for each of the given +cmds+
+  #   by calling Process.spawn.
+  # - Does not wait for child processes to exit.
   #
-  # Each cmd is a string or an array.
-  # If it is an array, the elements are passed to Process.spawn.
+  # With no block given, returns an array of the wait threads
+  # for all of the child processes.
   #
-  #   cmd:
-  #     commandline                              command line string which is passed to a shell
-  #     [env, commandline, opts]                 command line string which is passed to a shell
-  #     [env, cmdname, arg1, ..., opts]          command name and one or more arguments (no shell)
-  #     [env, [cmdname, argv0], arg1, ..., opts] command name and arguments including argv[0] (no shell)
+  # Example:
   #
-  #   Note that env and opts are optional, as for Process.spawn.
+  #   wait_threads = Open3.pipeline_start('ls', 'grep R')
+  #   # => [#<Process::Waiter:0x000055e8de9d2bb0 run>, #<Process::Waiter:0x000055e8de9d2890 run>]
+  #   wait_threads.each do |wait_thread|
+  #     wait_thread.join
+  #   end
   #
-  # Example:
+  # Output:
+  #
+  #   Rakefile
+  #   README.md
+  #
+  # With a block given, calls the block with an array of the wait processes:
+  #
+  #   Open3.pipeline_start('ls', 'grep R') do |wait_threads|
+  #     wait_threads.each do |wait_thread|
+  #       wait_thread.join
+  #     end
+  #   end
+  #
+  # Output:
+  #
+  #   Rakefile
+  #   README.md
   #
-  #   # Run xeyes in 10 seconds.
-  #   Open3.pipeline_start("xeyes") {|ts|
-  #     sleep 10
-  #     t = ts[0]
-  #     Process.kill("TERM", t.pid)
-  #     p t.value #=> #<Process::Status: pid 911 SIGTERM (signal 15)>
-  #   }
-  #
-  #   # Convert pdf to ps and send it to a printer.
-  #   # Collect error message of pdftops and lpr.
-  #   pdf_file = "paper.pdf"
-  #   printer = "printer-name"
-  #   err_r, err_w = IO.pipe
-  #   Open3.pipeline_start(["pdftops", pdf_file, "-"],
-  #                        ["lpr", "-P#{printer}"],
-  #                        :err=>err_w) {|ts|
-  #     err_w.close
-  #     p err_r.read # error messages of pdftops and lpr.
-  #   }
+  # Like Process.spawn, this method has potential security vulnerabilities
+  # if called with untrusted input;
+  # see {Command Injection}[rdoc-ref:command_injection.rdoc@Command+Injection].
+  #
+  # If the first argument is a hash, it becomes leading argument +env+
+  # in each call to Process.spawn;
+  # see {Execution Environment}[rdoc-ref:Process@Execution+Environment].
+  #
+  # If the last argument is a hash, it becomes trailing argument +options+
+  # in each call to Process.spawn;
+  # see {Execution Options}[rdoc-ref:Process@Execution+Options].
+  #
+  # Each remaining argument in +cmds+ is one of:
+  #
+  # - A +command_line+: a string that begins with a shell reserved word
+  #   or special built-in, or contains one or more metacharacters.
+  # - An +exe_path+: the string path to an executable to be called.
+  # - An array containing a +command_line+ or an +exe_path+,
+  #   along with zero or more string arguments for the command.
+  #
+  # See {Argument command_line or exe_path}[rdoc-ref:Process@Argument+command_line+or+exe_path].
   #
   def pipeline_start(*cmds, &block)
     if Hash === cmds.last
@@ -633,57 +1285,51 @@ def pipeline_start(*cmds, &block)
   end
   module_function :pipeline_start
 
-  # Open3.pipeline starts a list of commands as a pipeline.
-  # It waits for the completion of the commands.
-  # No pipes are created for stdin of the first command and
-  # stdout of the last command.
+  # :call-seq:
+  #   Open3.pipeline([env, ] *cmds, options = {}) -> array_of_statuses
   #
-  #   status_list = Open3.pipeline(cmd1, cmd2, ... [, opts])
+  # Basically a wrapper for
+  # {Process.spawn}[rdoc-ref:Process.spawn]
+  # that:
   #
-  # Each cmd is a string or an array.
-  # If it is an array, the elements are passed to Process.spawn.
+  # - Creates a child process for each of the given +cmds+
+  #   by calling Process.spawn.
+  # - Pipes the +stdout+ from each child to the +stdin+ of the next child,
+  #   or, for the last child, to the caller's +stdout+.
+  # - Waits for the child processes to exit.
+  # - Returns an array of Process::Status objects (one for each child).
   #
-  #   cmd:
-  #     commandline                              command line string which is passed to a shell
-  #     [env, commandline, opts]                 command line string which is passed to a shell
-  #     [env, cmdname, arg1, ..., opts]          command name and one or more arguments (no shell)
-  #     [env, [cmdname, argv0], arg1, ..., opts] command name and arguments including argv[0] (no shell)
+  # Example:
   #
-  #   Note that env and opts are optional, as Process.spawn.
+  #   wait_threads = Open3.pipeline('ls', 'grep R')
+  #   # => [#<Process::Status: pid 2139200 exit 0>, #<Process::Status: pid 2139202 exit 0>]
   #
-  # Example:
+  # Output:
+  #
+  #   Rakefile
+  #   README.md
+  #
+  # Like Process.spawn, this method has potential security vulnerabilities
+  # if called with untrusted input;
+  # see {Command Injection}[rdoc-ref:command_injection.rdoc@Command+Injection].
+  #
+  # If the first argument is a hash, it becomes leading argument +env+
+  # in each call to Process.spawn;
+  # see {Execution Environment}[rdoc-ref:Process@Execution+Environment].
+  #
+  # If the last argument is a hash, it becomes trailing argument +options+
+  # in each call to Process.spawn'
+  # see {Execution Options}[rdoc-ref:Process@Execution+Options].
+  #
+  # Each remaining argument in +cmds+ is one of:
+  #
+  # - A +command_line+: a string that begins with a shell reserved word
+  #   or special built-in, or contains one or more metacharacters.
+  # - An +exe_path+: the string path to an executable to be called.
+  # - An array containing a +command_line+ or an +exe_path+,
+  #   along with zero or more string arguments for the command.
   #
-  #   fname = "/usr/share/man/man1/ruby.1.gz"
-  #   p Open3.pipeline(["zcat", fname], "nroff -man", "less")
-  #   #=> [#<Process::Status: pid 11817 exit 0>,
-  #   #    #<Process::Status: pid 11820 exit 0>,
-  #   #    #<Process::Status: pid 11828 exit 0>]
-  #
-  #   fname = "/usr/share/man/man1/ls.1.gz"
-  #   Open3.pipeline(["zcat", fname], "nroff -man", "colcrt")
-  #
-  #   # convert PDF to PS and send to a printer by lpr
-  #   pdf_file = "paper.pdf"
-  #   printer = "printer-name"
-  #   Open3.pipeline(["pdftops", pdf_file, "-"],
-  #                  ["lpr", "-P#{printer}"])
-  #
-  #   # count lines
-  #   Open3.pipeline("sort", "uniq -c", :in=>"names.txt", :out=>"count")
-  #
-  #   # cyclic pipeline
-  #   r,w = IO.pipe
-  #   w.print "ibase=14\n10\n"
-  #   Open3.pipeline("bc", "tee /dev/tty", :in=>r, :out=>w)
-  #   #=> 14
-  #   #   18
-  #   #   22
-  #   #   30
-  #   #   42
-  #   #   58
-  #   #   78
-  #   #   106
-  #   #   202
+  # See {Argument command_line or exe_path}[rdoc-ref:Process@Argument+command_line+or+exe_path].
   #
   def pipeline(*cmds)
     if Hash === cmds.last
diff --git a/lib/open3/version.rb b/lib/open3/version.rb
index b6b6ee2c9c815a..bfcec44ccc920b 100644
--- a/lib/open3/version.rb
+++ b/lib/open3/version.rb
@@ -1,3 +1,3 @@
 module Open3
-  VERSION = "0.1.2"
+  VERSION = "0.2.1"
 end
diff --git a/lib/optparse.rb b/lib/optparse.rb
index 0998251fbf971b..332aea2148f696 100644
--- a/lib/optparse.rb
+++ b/lib/optparse.rb
@@ -7,7 +7,7 @@
 #
 # See OptionParser for documentation.
 #
-
+require 'set' unless defined?(Set)
 
 #--
 # == Developer Documentation (not for RDoc output)
@@ -143,7 +143,7 @@
 # Used:
 #
 #   $ ruby optparse-test.rb -r
-#   optparse-test.rb:9:in `<main>': missing argument: -r (OptionParser::MissingArgument)
+#   optparse-test.rb:9:in '<main>': missing argument: -r (OptionParser::MissingArgument)
 #   $ ruby optparse-test.rb -r my-library
 #   You required my-library!
 #
@@ -236,7 +236,7 @@
 #   $ ruby optparse-test.rb --user 2
 #   #<struct User id=2, name="Gandalf">
 #   $ ruby optparse-test.rb --user 3
-#   optparse-test.rb:15:in `block in find_user': No User Found for id 3 (RuntimeError)
+#   optparse-test.rb:15:in 'block in find_user': No User Found for id 3 (RuntimeError)
 #
 # === Store options to a Hash
 #
@@ -425,7 +425,8 @@
 # If you have any questions, file a ticket at http://bugs.ruby-lang.org.
 #
 class OptionParser
-  OptionParser::Version = "0.4.0.pre.1"
+  # The version string
+  OptionParser::Version = "0.7.0.dev.2"
 
   # :stopdoc:
   NoArgument = [NO_ARGUMENT = :NONE, nil].freeze
@@ -438,6 +439,8 @@ class OptionParser
   # and resolved against a list of acceptable values.
   #
   module Completion
+    # :nodoc:
+
     def self.regexp(key, icase)
       Regexp.new('\A' + Regexp.quote(key).gsub(/\w+\b/, '\&\w*'), icase)
     end
@@ -459,7 +462,11 @@ def self.candidate(key, icase = false, pat = nil, &block)
       candidates
     end
 
-    def candidate(key, icase = false, pat = nil)
+    def self.completable?(key)
+      String.try_convert(key) or defined?(key.id2name)
+    end
+
+    def candidate(key, icase = false, pat = nil, &_)
       Completion.candidate(key, icase, pat, &method(:each))
     end
 
@@ -494,7 +501,6 @@ def convert(opt = nil, val = nil, *)
     end
   end
 
-
   #
   # Map from option/keyword string to object with completion.
   #
@@ -502,7 +508,6 @@ class OptionMap < Hash
     include Completion
   end
 
-
   #
   # Individual switch class.  Not important to the user.
   #
@@ -510,6 +515,8 @@ class OptionMap < Hash
   # RequiredArgument, etc.
   #
   class Switch
+    # :nodoc:
+
     attr_reader :pattern, :conv, :short, :long, :arg, :desc, :block
 
     #
@@ -542,11 +549,11 @@ def self.pattern
 
     def initialize(pattern = nil, conv = nil,
                    short = nil, long = nil, arg = nil,
-                   desc = ([] if short or long), block = nil, &_block)
+                   desc = ([] if short or long), block = nil, values = nil, &_block)
       raise if Array === pattern
       block ||= _block
-      @pattern, @conv, @short, @long, @arg, @desc, @block =
-        pattern, conv, short, long, arg, desc, block
+      @pattern, @conv, @short, @long, @arg, @desc, @block, @values =
+        pattern, conv, short, long, arg, desc, block, values
     end
 
     #
@@ -579,11 +586,15 @@ def parse_arg(arg) # :nodoc:
     # exception.
     #
     def conv_arg(arg, val = []) # :nodoc:
+      v, = *val
       if conv
         val = conv.call(*val)
       else
         val = proc {|v| v}.call(*val)
       end
+      if @values
+        @values.include?(val) or raise InvalidArgument, v
+      end
       return arg, block, val
     end
     private :conv_arg
@@ -664,7 +675,7 @@ def compsys(sdone, ldone)   # :nodoc:
 
       (sopts+lopts).each do |opt|
         # "(-x -c -r)-l[left justify]"
-        if /^--\[no-\](.+)$/ =~ opt
+        if /\A--\[no-\](.+)$/ =~ opt
           o = $1
           yield("--#{o}", desc.join(""))
           yield("--no-#{o}", desc.join(""))
@@ -697,6 +708,11 @@ def pretty_print(q)         # :nodoc:
       q.object_group(self) {pretty_print_contents(q)}
     end
 
+    def omitted_argument(val)   # :nodoc:
+      val.pop if val.size == 3 and val.last.nil?
+      val
+    end
+
     #
     # Switch that takes no arguments.
     #
@@ -710,10 +726,10 @@ def parse(arg, argv)
         conv_arg(arg)
       end
 
-      def self.incompatible_argument_styles(*)
+      def self.incompatible_argument_styles(*) # :nodoc:
       end
 
-      def self.pattern
+      def self.pattern          # :nodoc:
         Object
       end
 
@@ -730,7 +746,7 @@ class RequiredArgument < self
       #
       # Raises an exception if argument is not present.
       #
-      def parse(arg, argv)
+      def parse(arg, argv, &_)
         unless arg
           raise MissingArgument if argv.empty?
           arg = argv.shift
@@ -755,7 +771,7 @@ def parse(arg, argv, &error)
         if arg
           conv_arg(*parse_arg(arg, &error))
         else
-          conv_arg(arg)
+          omitted_argument conv_arg(arg)
         end
       end
 
@@ -774,13 +790,14 @@ class PlacedArgument < self
       #
       def parse(arg, argv, &error)
         if !(val = arg) and (argv.empty? or /\A-./ =~ (val = argv[0]))
-          return nil, block, nil
+          return nil, block
         end
         opt = (val = parse_arg(val, &error))[1]
         val = conv_arg(*val)
         if opt and !arg
           argv.shift
         else
+          omitted_argument val
           val[0] = nil
         end
         val
@@ -798,6 +815,8 @@ def pretty_head           # :nodoc:
   # matching pattern and converter pair. Also provides summary feature.
   #
   class List
+    # :nodoc:
+
     # Map from acceptable argument types to pattern and converter pairs.
     attr_reader :atype
 
@@ -837,7 +856,7 @@ def pretty_print(q)         # :nodoc:
     def accept(t, pat = /.*/m, &block)
       if pat
         pat.respond_to?(:match) or
-          raise TypeError, "has no `match'", ParseError.filter_backtrace(caller(2))
+          raise TypeError, "has no 'match'", ParseError.filter_backtrace(caller(2))
       else
         pat = t if t.respond_to?(:match)
       end
@@ -1020,7 +1039,6 @@ def match(key)
   DefaultList.short['-'] = Switch::NoArgument.new {}
   DefaultList.long[''] = Switch::NoArgument.new {throw :terminate}
 
-
   COMPSYS_HEADER = <<'XXX'      # :nodoc:
 
 typeset -A opt_args
@@ -1033,11 +1051,31 @@ def compsys(to, name = File.basename($0)) # :nodoc:
     to << "#compdef #{name}\n"
     to << COMPSYS_HEADER
     visit(:compsys, {}, {}) {|o, d|
-      to << %Q[  "#{o}[#{d.gsub(/[\"\[\]]/, '\\\\\&')}]" \\\n]
+      to << %Q[  "#{o}[#{d.gsub(/[\\\"\[\]]/, '\\\\\&')}]" \\\n]
     }
     to << "  '*:file:_files' && return 0\n"
   end
 
+  def help_exit
+    if $stdout.tty? && (pager = ENV.values_at(*%w[RUBY_PAGER PAGER]).find {|e| e && !e.empty?})
+      less = ENV["LESS"]
+      args = [{"LESS" => "#{less} -Fe"}, pager, "w"]
+      print = proc do |f|
+        f.puts help
+      rescue Errno::EPIPE
+        # pager terminated
+      end
+      if Process.respond_to?(:fork) and false
+        IO.popen("-") {|f| f ? Process.exec(*args, in: f) : print.call($stdout)}
+        # unreachable
+      end
+      IO.popen(*args, &print)
+    else
+      puts help
+    end
+    exit
+  end
+
   #
   # Default options for ARGV, which never appear in option summary.
   #
@@ -1049,8 +1087,7 @@ def compsys(to, name = File.basename($0)) # :nodoc:
   #
   Officious['help'] = proc do |parser|
     Switch::NoArgument.new do |arg|
-      puts parser.help
-      exit
+      parser.help_exit
     end
   end
 
@@ -1071,7 +1108,7 @@ def compsys(to, name = File.basename($0)) # :nodoc:
   #
   Officious['*-completion-zsh'] = proc do |parser|
     Switch::OptionalArgument.new do |arg|
-      parser.compsys(STDOUT, arg)
+      parser.compsys($stdout, arg)
       exit
     end
   end
@@ -1084,7 +1121,7 @@ def compsys(to, name = File.basename($0)) # :nodoc:
     Switch::OptionalArgument.new do |pkg|
       if pkg
         begin
-          require 'optparse/version'
+          require_relative 'optparse/version'
         rescue LoadError
         else
           show_version(*pkg.split(/,/)) or
@@ -1129,6 +1166,10 @@ def self.inc(arg, default = nil)
       default.to_i + 1
     end
   end
+
+  #
+  # See self.inc
+  #
   def inc(*args)
     self.class.inc(*args)
   end
@@ -1167,11 +1208,19 @@ def add_officious  # :nodoc:
   def terminate(arg = nil)
     self.class.terminate(arg)
   end
+  #
+  # See #terminate.
+  #
   def self.terminate(arg = nil)
     throw :terminate, arg
   end
 
   @stack = [DefaultList]
+  #
+  # Returns the global top option list.
+  #
+  # Do not use directly.
+  #
   def self.top() DefaultList end
 
   #
@@ -1192,9 +1241,9 @@ def self.accept(*args, &blk) top.accept(*args, &blk) end
   #
   # Directs to reject specified class argument.
   #
-  # +t+:: Argument class specifier, any object including Class.
+  # +type+:: Argument class specifier, any object including Class.
   #
-  #   reject(t)
+  #   reject(type)
   #
   def reject(*args, &blk) top.reject(*args, &blk) end
   #
@@ -1245,7 +1294,15 @@ def banner
   # to $0.
   #
   def program_name
-    @program_name || File.basename($0, '.*')
+    @program_name || strip_ext(File.basename($0))
+  end
+
+  private def strip_ext(name)  # :nodoc:
+    exts = /#{
+      require "rbconfig"
+      Regexp.union(*RbConfig::CONFIG["EXECUTABLE_EXTS"]&.split(" "))
+    }\z/o
+    name.sub(exts, "")
   end
 
   # for experimental cascading :-)
@@ -1284,10 +1341,24 @@ def ver
     end
   end
 
+  #
+  # Shows warning message with the program name
+  #
+  # +mesg+:: Message, defaulted to +$!+.
+  #
+  # See Kernel#warn.
+  #
   def warn(mesg = $!)
     super("#{program_name}: #{mesg}")
   end
 
+  #
+  # Shows message with the program name then aborts.
+  #
+  # +mesg+:: Message, defaulted to +$!+.
+  #
+  # See Kernel#abort.
+  #
   def abort(mesg = $!)
     super("#{program_name}: #{mesg}")
   end
@@ -1309,6 +1380,9 @@ def base
   #
   # Pushes a new List.
   #
+  # If a block is given, yields +self+ and returns the result of the
+  # block, otherwise returns +self+.
+  #
   def new
     @stack.push(List.new)
     if block_given?
@@ -1407,6 +1481,7 @@ def make_switch(opts, block = nil)
     klass = nil
     q, a = nil
     has_arg = false
+    values = nil
 
     opts.each do |o|
       # argument class
@@ -1420,7 +1495,7 @@ def make_switch(opts, block = nil)
       end
 
       # directly specified pattern(any object possible to match)
-      if (!(String === o || Symbol === o)) and o.respond_to?(:match)
+      if !Completion.completable?(o) and o.respond_to?(:match)
         pattern = notwice(o, pattern, 'pattern')
         if pattern.respond_to?(:convert)
           conv = pattern.method(:convert).to_proc
@@ -1434,7 +1509,12 @@ def make_switch(opts, block = nil)
       case o
       when Proc, Method
         block = notwice(o, block, 'block')
-      when Array, Hash
+      when Array, Hash, Set
+        if Array === o
+          o, v = o.partition {|v,| Completion.completable?(v)}
+          values = notwice(v, values, 'values') unless v.empty?
+          next if o.empty?
+        end
         case pattern
         when CompletingHash
         when nil
@@ -1444,11 +1524,13 @@ def make_switch(opts, block = nil)
           raise ArgumentError, "argument pattern given twice"
         end
         o.each {|pat, *v| pattern[pat] = v.fetch(0) {pat}}
+      when Range
+        values = notwice(o, values, 'values')
       when Module
         raise ArgumentError, "unsupported argument type: #{o}", ParseError.filter_backtrace(caller(4))
       when *ArgumentStyle.keys
         style = notwice(ArgumentStyle[o], style, 'style')
-      when /^--no-([^\[\]=\s]*)(.+)?/
+      when /\A--no-([^\[\]=\s]*)(.+)?/
         q, a = $1, $2
         o = notwice(a ? Object : TrueClass, klass, 'type')
         not_pattern, not_conv = search(:atype, o) unless not_style
@@ -1459,7 +1541,7 @@ def make_switch(opts, block = nil)
         (q = q.downcase).tr!('_', '-')
         long << "no-#{q}"
         nolong << q
-      when /^--\[no-\]([^\[\]=\s]*)(.+)?/
+      when /\A--\[no-\]([^\[\]=\s]*)(.+)?/
         q, a = $1, $2
         o = notwice(a ? Object : TrueClass, klass, 'type')
         if a
@@ -1472,7 +1554,7 @@ def make_switch(opts, block = nil)
         not_pattern, not_conv = search(:atype, FalseClass) unless not_style
         not_style = Switch::NoArgument
         nolong << "no-#{o}"
-      when /^--([^\[\]=\s]*)(.+)?/
+      when /\A--([^\[\]=\s]*)(.+)?/
         q, a = $1, $2
         if a
           o = notwice(NilClass, klass, 'type')
@@ -1482,7 +1564,7 @@ def make_switch(opts, block = nil)
         ldesc << "--#{q}"
         (o = q.downcase).tr!('_', '-')
         long << o
-      when /^-(\[\^?\]?(?:[^\\\]]|\\.)*\])(.+)?/
+      when /\A-(\[\^?\]?(?:[^\\\]]|\\.)*\])(.+)?/
         q, a = $1, $2
         o = notwice(Object, klass, 'type')
         if a
@@ -1493,7 +1575,7 @@ def make_switch(opts, block = nil)
         end
         sdesc << "-#{q}"
         short << Regexp.new(q)
-      when /^-(.)(.+)?/
+      when /\A-(.)(.+)?/
         q, a = $1, $2
         if a
           o = notwice(NilClass, klass, 'type')
@@ -1502,7 +1584,7 @@ def make_switch(opts, block = nil)
         end
         sdesc << "-#{q}"
         short << q
-      when /^=/
+      when /\A=/
         style = notwice(default_style.guess(arg = o), style, 'style')
         default_pattern, conv = search(:atype, Object) unless default_pattern
       else
@@ -1511,12 +1593,18 @@ def make_switch(opts, block = nil)
     end
 
     default_pattern, conv = search(:atype, default_style.pattern) unless default_pattern
+    if Range === values and klass
+      unless (!values.begin or klass === values.begin) and
+            (!values.end or klass === values.end)
+        raise ArgumentError, "range does not match class"
+      end
+    end
     if !(short.empty? and long.empty?)
       if has_arg and default_style == Switch::NoArgument
         default_style = Switch::RequiredArgument
       end
       s = (style || default_style).new(pattern || default_pattern,
-                                       conv, sdesc, ldesc, arg, desc, block)
+                                       conv, sdesc, ldesc, arg, desc, block, values)
     elsif !block
       if style or pattern
         raise ArgumentError, "no switch given", ParseError.filter_backtrace(caller)
@@ -1525,13 +1613,19 @@ def make_switch(opts, block = nil)
     else
       short << pattern
       s = (style || default_style).new(pattern,
-                                       conv, nil, nil, arg, desc, block)
+                                       conv, nil, nil, arg, desc, block, values)
     end
     return s, short, long,
       (not_style.new(not_pattern, not_conv, sdesc, ldesc, nil, desc, block) if not_style),
       nolong
   end
 
+  # ----
+  # Option definition phase methods
+  #
+  # These methods are used to define options, or to construct an
+  # OptionParser instance in other words.
+
   # :call-seq:
   #   define(*params, &block)
   #
@@ -1607,6 +1701,13 @@ def separator(string)
     top.append(string, nil, nil)
   end
 
+  # ----
+  # Arguments parse phase methods
+  #
+  # These methods parse +argv+, convert, and store the results by
+  # calling handlers.  As these methods do not modify +self+, +self+
+  # can be frozen.
+
   #
   # Parses command line arguments +argv+ in order. When a block is given,
   # each non-option argument is yielded. When optional +into+ keyword
@@ -1616,21 +1717,21 @@ def separator(string)
   #
   # Returns the rest of +argv+ left unparsed.
   #
-  def order(*argv, into: nil, &nonopt)
+  def order(*argv, **keywords, &nonopt)
     argv = argv[0].dup if argv.size == 1 and Array === argv[0]
-    order!(argv, into: into, &nonopt)
+    order!(argv, **keywords, &nonopt)
   end
 
   #
   # Same as #order, but removes switches destructively.
   # Non-option arguments remain in +argv+.
   #
-  def order!(argv = default_argv, into: nil, &nonopt)
+  def order!(argv = default_argv, into: nil, **keywords, &nonopt)
     setter = ->(name, val) {into[name.to_sym] = val} if into
-    parse_in_order(argv, setter, &nonopt)
+    parse_in_order(argv, setter, **keywords, &nonopt)
   end
 
-  def parse_in_order(argv = default_argv, setter = nil, &nonopt)  # :nodoc:
+  def parse_in_order(argv = default_argv, setter = nil, exact: require_exact, **, &nonopt)  # :nodoc:
     opt, arg, val, rest = nil
     nonopt ||= proc {|a| throw :terminate, a}
     argv.unshift(arg) if arg = catch(:terminate) {
@@ -1641,19 +1742,24 @@ def parse_in_order(argv = default_argv, setter = nil, &nonopt)  # :nodoc:
           opt, rest = $1, $2
           opt.tr!('_', '-')
           begin
-            sw, = complete(:long, opt, true)
-            if require_exact && !sw.long.include?(arg)
-              throw :terminate, arg unless raise_unknown
-              raise InvalidOption, arg
+            if exact
+              sw, = search(:long, opt)
+            else
+              sw, = complete(:long, opt, true)
             end
           rescue ParseError
             throw :terminate, arg unless raise_unknown
             raise $!.set_option(arg, true)
+          else
+            unless sw
+              throw :terminate, arg unless raise_unknown
+              raise InvalidOption, arg
+            end
           end
           begin
             opt, cb, val = sw.parse(rest, argv) {|*exc| raise(*exc)}
-            val = cb.call(val) if cb
-            setter.call(sw.switch_name, val) if setter
+            val = callback!(cb, 1, val) if cb
+            callback!(setter, 2, sw.switch_name, val) if setter
           rescue ParseError
             raise $!.set_option(arg, rest)
           end
@@ -1671,7 +1777,7 @@ def parse_in_order(argv = default_argv, setter = nil, &nonopt)  # :nodoc:
                 val = arg.delete_prefix('-')
                 has_arg = true
               rescue InvalidOption
-                raise if require_exact
+                raise if exact
                 # if no short options match, try completion with long
                 # options.
                 sw, = complete(:long, opt)
@@ -1691,8 +1797,8 @@ def parse_in_order(argv = default_argv, setter = nil, &nonopt)  # :nodoc:
           end
           begin
             argv.unshift(opt) if opt and (!rest or (opt = opt.sub(/\A-*/, '-')) != '-')
-            val = cb.call(val) if cb
-            setter.call(sw.switch_name, val) if setter
+            val = callback!(cb, 1, val) if cb
+            callback!(setter, 2, sw.switch_name, val) if setter
           rescue ParseError
             raise $!.set_option(arg, arg.length > 2)
           end
@@ -1718,6 +1824,19 @@ def parse_in_order(argv = default_argv, setter = nil, &nonopt)  # :nodoc:
   end
   private :parse_in_order
 
+  # Calls callback with _val_.
+  def callback!(cb, max_arity, *args) # :nodoc:
+    args.compact!
+
+    if (size = args.size) < max_arity and cb.to_proc.lambda?
+      (arity = cb.arity) < 0 and arity = (1-arity)
+      arity = max_arity if arity > max_arity
+      args[arity - 1] = nil if arity > size
+    end
+    cb.call(*args)
+  end
+  private :callback!
+
   #
   # Parses command line arguments +argv+ in permutation mode and returns
   # list of non-option arguments. When optional +into+ keyword
@@ -1725,18 +1844,18 @@ def parse_in_order(argv = default_argv, setter = nil, &nonopt)  # :nodoc:
   # <code>[]=</code> method (so it can be Hash, or OpenStruct, or other
   # similar object).
   #
-  def permute(*argv, into: nil)
+  def permute(*argv, **keywords)
     argv = argv[0].dup if argv.size == 1 and Array === argv[0]
-    permute!(argv, into: into)
+    permute!(argv, **keywords)
   end
 
   #
   # Same as #permute, but removes switches destructively.
   # Non-option arguments remain in +argv+.
   #
-  def permute!(argv = default_argv, into: nil)
+  def permute!(argv = default_argv, **keywords)
     nonopts = []
-    order!(argv, into: into, &nonopts.method(:<<))
+    order!(argv, **keywords, &nonopts.method(:<<))
     argv[0, 0] = nonopts
     argv
   end
@@ -1748,20 +1867,20 @@ def permute!(argv = default_argv, into: nil)
   # values are stored there via <code>[]=</code> method (so it can be Hash,
   # or OpenStruct, or other similar object).
   #
-  def parse(*argv, into: nil)
+  def parse(*argv, **keywords)
     argv = argv[0].dup if argv.size == 1 and Array === argv[0]
-    parse!(argv, into: into)
+    parse!(argv, **keywords)
   end
 
   #
   # Same as #parse, but removes switches destructively.
   # Non-option arguments remain in +argv+.
   #
-  def parse!(argv = default_argv, into: nil)
+  def parse!(argv = default_argv, **keywords)
     if ENV.include?('POSIXLY_CORRECT')
-      order!(argv, into: into)
+      order!(argv, **keywords)
     else
-      permute!(argv, into: into)
+      permute!(argv, **keywords)
     end
   end
 
@@ -1784,7 +1903,7 @@ def parse!(argv = default_argv, into: nil)
   #   # params[:bar] = "x"  # --bar x
   #   # params[:zot] = "z"  # --zot Z
   #
-  def getopts(*args, symbolize_names: false)
+  def getopts(*args, symbolize_names: false, **keywords)
     argv = Array === args.first ? args.shift : default_argv
     single_options, *long_options = *args
 
@@ -1812,7 +1931,7 @@ def getopts(*args, symbolize_names: false)
       end
     end
 
-    parse_in_order(argv, result.method(:[]=))
+    parse_in_order(argv, result.method(:[]=), **keywords)
     symbolize_names ? result.transform_keys(&:to_sym) : result
   end
 
@@ -1881,6 +2000,9 @@ def additional_message(typ, opt)
     DidYouMean.formatter.message_for(all_candidates & checker.correct(opt))
   end
 
+  #
+  # Return candidates for +word+.
+  #
   def candidate(word)
     list = []
     case word
@@ -1922,10 +2044,10 @@ def candidate(word)
   # The optional +into+ keyword argument works exactly like that accepted in
   # method #parse.
   #
-  def load(filename = nil, into: nil)
+  def load(filename = nil, **keywords)
     unless filename
       basename = File.basename($0, '.*')
-      return true if load(File.expand_path(basename, '~/.options'), into: into) rescue nil
+      return true if load(File.expand_path(basename, '~/.options'), **keywords) rescue nil
       basename << ".options"
       return [
         # XDG
@@ -1937,11 +2059,11 @@ def load(filename = nil, into: nil)
         '~/config/settings',
       ].any? {|dir|
         next if !dir or dir.empty?
-        load(File.expand_path(basename, dir), into: into) rescue nil
+        load(File.expand_path(basename, dir), **keywords) rescue nil
       }
     end
     begin
-      parse(*File.readlines(filename, chomp: true), into: into)
+      parse(*File.readlines(filename, chomp: true), **keywords)
       true
     rescue Errno::ENOENT, Errno::ENOTDIR
       false
@@ -1954,10 +2076,10 @@ def load(filename = nil, into: nil)
   #
   # +env+ defaults to the basename of the program.
   #
-  def environment(env = File.basename($0, '.*'))
+  def environment(env = File.basename($0, '.*'), **keywords)
     env = ENV[env] || ENV[env.upcase] or return
     require 'shellwords'
-    parse(*Shellwords.shellwords(env))
+    parse(*Shellwords.shellwords(env), **keywords)
   end
 
   #
@@ -2123,6 +2245,7 @@ class ParseError < RuntimeError
     # Reason which caused the error.
     Reason = 'parse error'
 
+    # :nodoc:
     def initialize(*args, additional: nil)
       @additional = additional
       @arg0, = args
@@ -2273,19 +2396,19 @@ def options
     # Parses +self+ destructively in order and returns +self+ containing the
     # rest arguments left unparsed.
     #
-    def order!(&blk) options.order!(self, &blk) end
+    def order!(**keywords, &blk) options.order!(self, **keywords, &blk) end
 
     #
     # Parses +self+ destructively in permutation mode and returns +self+
     # containing the rest arguments left unparsed.
     #
-    def permute!() options.permute!(self) end
+    def permute!(**keywords) options.permute!(self, **keywords) end
 
     #
     # Parses +self+ destructively and returns +self+ containing the
     # rest arguments left unparsed.
     #
-    def parse!() options.parse!(self) end
+    def parse!(**keywords) options.parse!(self, **keywords) end
 
     #
     # Substitution of getopts is possible as follows. Also see
@@ -2298,8 +2421,8 @@ def parse!() options.parse!(self) end
     #   rescue OptionParser::ParseError
     #   end
     #
-    def getopts(*args, symbolize_names: false)
-      options.getopts(self, *args, symbolize_names: symbolize_names)
+    def getopts(*args, symbolize_names: false, **keywords)
+      options.getopts(self, *args, symbolize_names: symbolize_names, **keywords)
     end
 
     #
@@ -2309,7 +2432,8 @@ def self.extend_object(obj)
       super
       obj.instance_eval {@optparse = nil}
     end
-    def initialize(*args)
+
+    def initialize(*args)       # :nodoc:
       super
       @optparse = nil
     end
diff --git a/lib/optparse/ac.rb b/lib/optparse/ac.rb
index 0953725e46ed8e..23fc740d100300 100644
--- a/lib/optparse/ac.rb
+++ b/lib/optparse/ac.rb
@@ -1,7 +1,11 @@
 # frozen_string_literal: false
 require_relative '../optparse'
 
+#
+# autoconf-like options.
+#
 class OptionParser::AC < OptionParser
+  # :stopdoc:
   private
 
   def _check_ac_args(name, block)
@@ -14,6 +18,7 @@ def _check_ac_args(name, block)
   end
 
   ARG_CONV = proc {|val| val.nil? ? true : val}
+  private_constant :ARG_CONV
 
   def _ac_arg_enable(prefix, name, help_string, block)
     _check_ac_args(name, block)
@@ -29,16 +34,27 @@ def _ac_arg_enable(prefix, name, help_string, block)
     enable
   end
 
+  # :startdoc:
+
   public
 
+  # Define <tt>--enable</tt> / <tt>--disable</tt> style option
+  #
+  # Appears as <tt>--enable-<i>name</i></tt> in help message.
   def ac_arg_enable(name, help_string, &block)
     _ac_arg_enable("enable", name, help_string, block)
   end
 
+  # Define <tt>--enable</tt> / <tt>--disable</tt> style option
+  #
+  # Appears as <tt>--disable-<i>name</i></tt> in help message.
   def ac_arg_disable(name, help_string, &block)
     _ac_arg_enable("disable", name, help_string, block)
   end
 
+  # Define <tt>--with</tt> / <tt>--without</tt> style option
+  #
+  # Appears as <tt>--with-<i>name</i></tt> in help message.
   def ac_arg_with(name, help_string, &block)
     _check_ac_args(name, block)
 
diff --git a/lib/optparse/kwargs.rb b/lib/optparse/kwargs.rb
index 992aca467eb870..59a2f61544f9e5 100644
--- a/lib/optparse/kwargs.rb
+++ b/lib/optparse/kwargs.rb
@@ -7,12 +7,17 @@ class OptionParser
   #
   # :include: ../../doc/optparse/creates_option.rdoc
   #
-  def define_by_keywords(options, meth, **opts)
-    meth.parameters.each do |type, name|
+  # Defines options which set in to _options_ for keyword parameters
+  # of _method_.
+  #
+  # Parameters for each keywords are given as elements of _params_.
+  #
+  def define_by_keywords(options, method, **params)
+    method.parameters.each do |type, name|
       case type
       when :key, :keyreq
         op, cl = *(type == :key ? %w"[ ]" : ["", ""])
-        define("--#{name}=#{op}#{name.upcase}#{cl}", *opts[name]) do |o|
+        define("--#{name}=#{op}#{name.upcase}#{cl}", *params[name]) do |o|
           options[name] = o
         end
       end
diff --git a/lib/optparse/optparse.gemspec b/lib/optparse/optparse.gemspec
index a4287ddeeed7ed..6ea6b883956dc0 100644
--- a/lib/optparse/optparse.gemspec
+++ b/lib/optparse/optparse.gemspec
@@ -14,7 +14,10 @@ Gem::Specification.new do |spec|
   spec.email         = ["nobu@ruby-lang.org"]
 
   spec.summary       = %q{OptionParser is a class for command-line option analysis.}
-  spec.description   = %q{OptionParser is a class for command-line option analysis.}
+  spec.description   = File.open(File.join(__dir__, "README.md")) do |readme|
+    readme.gets("") # heading
+    readme.gets("").chomp
+  end rescue spec.summary
   spec.homepage      = "https://github.com/ruby/optparse"
   spec.required_ruby_version = Gem::Requirement.new(">= 2.5.0")
   spec.licenses      = ["Ruby", "BSD-2-Clause"]
@@ -22,8 +25,9 @@ Gem::Specification.new do |spec|
   spec.metadata["homepage_uri"] = spec.homepage
   spec.metadata["source_code_uri"] = spec.homepage
 
-  spec.files         = Dir["{doc,lib,misc}/**/*"] + %w[README.md ChangeLog COPYING]
-  spec.rdoc_options  = ["--main=README.md", "--op=rdoc", "--page-dir=doc"]
+  dir, gemspec = File.split(__FILE__)
+  excludes = %W[#{gemspec} rakelib test/ Gemfile Rakefile .git* .editor*].map {|n| ":^"+n}
+  spec.files = IO.popen(%w[git ls-files -z --] + excludes, chdir: dir, &:read).split("\x0")
   spec.bindir        = "exe"
   spec.executables   = []
   spec.require_paths = ["lib"]
diff --git a/lib/optparse/version.rb b/lib/optparse/version.rb
index b869d8fe51ed47..b5ed6951460bb1 100644
--- a/lib/optparse/version.rb
+++ b/lib/optparse/version.rb
@@ -2,6 +2,11 @@
 # OptionParser internal utility
 
 class << OptionParser
+  #
+  # Shows version string in packages if Version is defined.
+  #
+  # +pkgs+:: package list
+  #
   def show_version(*pkgs)
     progname = ARGV.options.program_name
     result = false
@@ -47,6 +52,8 @@ def show_version(*pkgs)
     result
   end
 
+  # :stopdoc:
+
   def each_const(path, base = ::Object)
     path.split(/::|\//).inject(base) do |klass, name|
       raise NameError, path unless Module === klass
@@ -68,4 +75,6 @@ def search_const(klass, name)
       end
     end
   end
+
+  # :startdoc:
 end
diff --git a/lib/ostruct.gemspec b/lib/ostruct.gemspec
deleted file mode 100644
index 21cce182260a65..00000000000000
--- a/lib/ostruct.gemspec
+++ /dev/null
@@ -1,27 +0,0 @@
-# frozen_string_literal: true
-
-name = File.basename(__FILE__, ".gemspec")
-version = ["lib", Array.new(name.count("-")+1, ".").join("/")].find do |dir|
-  break File.foreach(File.join(__dir__, dir, "#{name.tr('-', '/')}.rb")) do |line|
-    /^\s*VERSION\s*=\s*"(.*)"/ =~ line and break $1
-  end rescue nil
-end
-
-Gem::Specification.new do |spec|
-  spec.name          = name
-  spec.version       = version
-  spec.authors       = ["Marc-Andre Lafortune"]
-  spec.email         = ["ruby-core@marc-andre.ca"]
-
-  spec.summary       = %q{Class to build custom data structures, similar to a Hash.}
-  spec.description   = %q{Class to build custom data structures, similar to a Hash.}
-  spec.homepage      = "https://github.com/ruby/ostruct"
-  spec.licenses      = ["Ruby", "BSD-2-Clause"]
-  spec.required_ruby_version = ">= 2.5.0"
-
-  spec.files         = [".gitignore", "Gemfile", "LICENSE.txt", "README.md", "Rakefile", "bin/console", "bin/setup", "lib/ostruct.rb", "ostruct.gemspec"]
-  spec.require_paths = ["lib"]
-
-  spec.add_development_dependency "bundler"
-  spec.add_development_dependency "rake"
-end
diff --git a/lib/ostruct.rb b/lib/ostruct.rb
deleted file mode 100644
index a08561d6c96aca..00000000000000
--- a/lib/ostruct.rb
+++ /dev/null
@@ -1,477 +0,0 @@
-# frozen_string_literal: true
-#
-# = ostruct.rb: OpenStruct implementation
-#
-# Author:: Yukihiro Matsumoto
-# Documentation:: Gavin Sinclair
-#
-# OpenStruct allows the creation of data objects with arbitrary attributes.
-# See OpenStruct for an example.
-#
-
-#
-# An OpenStruct is a data structure, similar to a Hash, that allows the
-# definition of arbitrary attributes with their accompanying values. This is
-# accomplished by using Ruby's metaprogramming to define methods on the class
-# itself.
-#
-# == Examples
-#
-#   require "ostruct"
-#
-#   person = OpenStruct.new
-#   person.name = "John Smith"
-#   person.age  = 70
-#
-#   person.name      # => "John Smith"
-#   person.age       # => 70
-#   person.address   # => nil
-#
-# An OpenStruct employs a Hash internally to store the attributes and values
-# and can even be initialized with one:
-#
-#   australia = OpenStruct.new(:country => "Australia", :capital => "Canberra")
-#     # => #<OpenStruct country="Australia", capital="Canberra">
-#
-# Hash keys with spaces or characters that could normally not be used for
-# method calls (e.g. <code>()[]*</code>) will not be immediately available
-# on the OpenStruct object as a method for retrieval or assignment, but can
-# still be reached through the Object#send method or using [].
-#
-#   measurements = OpenStruct.new("length (in inches)" => 24)
-#   measurements[:"length (in inches)"]       # => 24
-#   measurements.send("length (in inches)")   # => 24
-#
-#   message = OpenStruct.new(:queued? => true)
-#   message.queued?                           # => true
-#   message.send("queued?=", false)
-#   message.queued?                           # => false
-#
-# Removing the presence of an attribute requires the execution of the
-# delete_field method as setting the property value to +nil+ will not
-# remove the attribute.
-#
-#   first_pet  = OpenStruct.new(:name => "Rowdy", :owner => "John Smith")
-#   second_pet = OpenStruct.new(:name => "Rowdy")
-#
-#   first_pet.owner = nil
-#   first_pet                 # => #<OpenStruct name="Rowdy", owner=nil>
-#   first_pet == second_pet   # => false
-#
-#   first_pet.delete_field(:owner)
-#   first_pet                 # => #<OpenStruct name="Rowdy">
-#   first_pet == second_pet   # => true
-#
-# Ractor compatibility: A frozen OpenStruct with shareable values is itself shareable.
-#
-# == Caveats
-#
-# An OpenStruct utilizes Ruby's method lookup structure to find and define the
-# necessary methods for properties. This is accomplished through the methods
-# method_missing and define_singleton_method.
-#
-# This should be a consideration if there is a concern about the performance of
-# 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.
-# Creating an open struct from a small Hash and accessing a few of the
-# entries can be 200 times slower than accessing the hash directly.
-#
-# This is a potential security issue; building OpenStruct from untrusted user data
-# (e.g. JSON web request) may be susceptible to a "symbol denial of service" attack
-# since the keys create methods and names of methods are never garbage collected.
-#
-# This may also be the source of incompatibilities between Ruby versions:
-#
-#   o = OpenStruct.new
-#   o.then # => nil in Ruby < 2.6, enumerator for Ruby >= 2.6
-#
-# Builtin methods may be overwritten this way, which may be a source of bugs
-# or security issues:
-#
-#   o = OpenStruct.new
-#   o.methods # => [:to_h, :marshal_load, :marshal_dump, :each_pair, ...
-#   o.methods = [:foo, :bar]
-#   o.methods # => [:foo, :bar]
-#
-# To help remedy clashes, OpenStruct uses only protected/private methods ending with <code>!</code>
-# and defines aliases for builtin public methods by adding a <code>!</code>:
-#
-#   o = OpenStruct.new(make: 'Bentley', class: :luxury)
-#   o.class # => :luxury
-#   o.class! # => OpenStruct
-#
-# It is recommended (but not enforced) to not use fields ending in <code>!</code>;
-# Note that a subclass' methods may not be overwritten, nor can OpenStruct's own methods
-# ending with <code>!</code>.
-#
-# For all these reasons, consider not using OpenStruct at all.
-#
-class OpenStruct
-  VERSION = "0.5.5"
-
-  #
-  # Creates a new OpenStruct object.  By default, the resulting OpenStruct
-  # object will have no attributes.
-  #
-  # The optional +hash+, if given, will generate attributes and values
-  # (can be a Hash, an OpenStruct or a Struct).
-  # For example:
-  #
-  #   require "ostruct"
-  #   hash = { "country" => "Australia", :capital => "Canberra" }
-  #   data = OpenStruct.new(hash)
-  #
-  #   data   # => #<OpenStruct country="Australia", capital="Canberra">
-  #
-  def initialize(hash=nil)
-    if hash
-      update_to_values!(hash)
-    else
-      @table = {}
-    end
-  end
-
-  # Duplicates an OpenStruct object's Hash table.
-  private def initialize_clone(orig) # :nodoc:
-    super # clones the singleton class for us
-    @table = @table.dup unless @table.frozen?
-  end
-
-  private def initialize_dup(orig) # :nodoc:
-    super
-    update_to_values!(@table)
-  end
-
-  private def update_to_values!(hash) # :nodoc:
-    @table = {}
-    hash.each_pair do |k, v|
-      set_ostruct_member_value!(k, v)
-    end
-  end
-
-  #
-  # call-seq:
-  #   ostruct.to_h                        -> hash
-  #   ostruct.to_h {|name, value| block } -> hash
-  #
-  # Converts the OpenStruct to a hash with keys representing
-  # each attribute (as symbols) and their corresponding values.
-  #
-  # If a block is given, the results of the block on each pair of
-  # the receiver will be used as pairs.
-  #
-  #   require "ostruct"
-  #   data = OpenStruct.new("country" => "Australia", :capital => "Canberra")
-  #   data.to_h   # => {:country => "Australia", :capital => "Canberra" }
-  #   data.to_h {|name, value| [name.to_s, value.upcase] }
-  #               # => {"country" => "AUSTRALIA", "capital" => "CANBERRA" }
-  #
-  if {test: :to_h}.to_h{ [:works, true] }[:works] # RUBY_VERSION < 2.6 compatibility
-    def to_h(&block)
-      if block
-        @table.to_h(&block)
-      else
-        @table.dup
-      end
-    end
-  else
-    def to_h(&block)
-      if block
-        @table.map(&block).to_h
-      else
-        @table.dup
-      end
-    end
-  end
-
-  #
-  # :call-seq:
-  #   ostruct.each_pair {|name, value| block }  -> ostruct
-  #   ostruct.each_pair                         -> Enumerator
-  #
-  # Yields all attributes (as symbols) along with the corresponding values
-  # or returns an enumerator if no block is given.
-  #
-  #   require "ostruct"
-  #   data = OpenStruct.new("country" => "Australia", :capital => "Canberra")
-  #   data.each_pair.to_a   # => [[:country, "Australia"], [:capital, "Canberra"]]
-  #
-  def each_pair
-    return to_enum(__method__) { @table.size } unless defined?(yield)
-    @table.each_pair{|p| yield p}
-    self
-  end
-
-  #
-  # Provides marshalling support for use by the Marshal library.
-  #
-  def marshal_dump # :nodoc:
-    @table
-  end
-
-  #
-  # Provides marshalling support for use by the Marshal library.
-  #
-  alias_method :marshal_load, :update_to_values! # :nodoc:
-
-  #
-  # Used internally to defined properties on the
-  # OpenStruct. It does this by using the metaprogramming function
-  # define_singleton_method for both the getter method and the setter method.
-  #
-  def new_ostruct_member!(name) # :nodoc:
-    unless @table.key?(name) || is_method_protected!(name)
-      if defined?(::Ractor)
-        getter_proc = nil.instance_eval{ Proc.new { @table[name] } }
-        setter_proc = nil.instance_eval{ Proc.new {|x| @table[name] = x} }
-        ::Ractor.make_shareable(getter_proc)
-        ::Ractor.make_shareable(setter_proc)
-      else
-        getter_proc = Proc.new { @table[name] }
-        setter_proc = Proc.new {|x| @table[name] = x}
-      end
-      define_singleton_method!(name, &getter_proc)
-      define_singleton_method!("#{name}=", &setter_proc)
-    end
-  end
-  private :new_ostruct_member!
-
-  private def is_method_protected!(name) # :nodoc:
-    if !respond_to?(name, true)
-      false
-    elsif name.match?(/!$/)
-      true
-    else
-      owner = method!(name).owner
-      if owner.class == ::Class
-        owner < ::OpenStruct
-      else
-        self.class!.ancestors.any? do |mod|
-          return false if mod == ::OpenStruct
-          mod == owner
-        end
-      end
-    end
-  end
-
-  def freeze
-    @table.freeze
-    super
-  end
-
-  private def method_missing(mid, *args) # :nodoc:
-    len = args.length
-    if mname = mid[/.*(?==\z)/m]
-      if len != 1
-        raise! ArgumentError, "wrong number of arguments (given #{len}, expected 1)", caller(1)
-      end
-      set_ostruct_member_value!(mname, args[0])
-    elsif len == 0
-      @table[mid]
-    else
-      begin
-        super
-      rescue NoMethodError => err
-        err.backtrace.shift
-        raise!
-      end
-    end
-  end
-
-  #
-  # :call-seq:
-  #   ostruct[name]  -> object
-  #
-  # Returns the value of an attribute, or +nil+ if there is no such attribute.
-  #
-  #   require "ostruct"
-  #   person = OpenStruct.new("name" => "John Smith", "age" => 70)
-  #   person[:age]   # => 70, same as person.age
-  #
-  def [](name)
-    @table[name.to_sym]
-  end
-
-  #
-  # :call-seq:
-  #   ostruct[name] = obj  -> obj
-  #
-  # Sets the value of an attribute.
-  #
-  #   require "ostruct"
-  #   person = OpenStruct.new("name" => "John Smith", "age" => 70)
-  #   person[:age] = 42   # equivalent to person.age = 42
-  #   person.age          # => 42
-  #
-  def []=(name, value)
-    name = name.to_sym
-    new_ostruct_member!(name)
-    @table[name] = value
-  end
-  alias_method :set_ostruct_member_value!, :[]=
-  private :set_ostruct_member_value!
-
-  # :call-seq:
-  #   ostruct.dig(name, *identifiers) -> object
-  #
-  # Finds and returns the object in nested objects
-  # that is specified by +name+ and +identifiers+.
-  # The nested objects may be instances of various classes.
-  # See {Dig Methods}[rdoc-ref:dig_methods.rdoc].
-  #
-  # Examples:
-  #   require "ostruct"
-  #   address = OpenStruct.new("city" => "Anytown NC", "zip" => 12345)
-  #   person  = OpenStruct.new("name" => "John Smith", "address" => address)
-  #   person.dig(:address, "zip") # => 12345
-  #   person.dig(:business_address, "zip") # => nil
-  def dig(name, *names)
-    begin
-      name = name.to_sym
-    rescue NoMethodError
-      raise! TypeError, "#{name} is not a symbol nor a string"
-    end
-    @table.dig(name, *names)
-  end
-
-  #
-  # Removes the named field from the object and returns the value the field
-  # contained if it was defined. You may optionally provide a block.
-  # If the field is not defined, the result of the block is returned,
-  # or a NameError is raised if no block was given.
-  #
-  #   require "ostruct"
-  #
-  #   person = OpenStruct.new(name: "John", age: 70, pension: 300)
-  #
-  #   person.delete_field!("age")  # => 70
-  #   person                       # => #<OpenStruct name="John", pension=300>
-  #
-  # Setting the value to +nil+ will not remove the attribute:
-  #
-  #   person.pension = nil
-  #   person                 # => #<OpenStruct name="John", pension=nil>
-  #
-  #   person.delete_field('number')  # => NameError
-  #
-  #   person.delete_field('number') { 8675_309 } # => 8675309
-  #
-  def delete_field(name, &block)
-    sym = name.to_sym
-    begin
-      singleton_class.remove_method(sym, "#{sym}=")
-    rescue NameError
-    end
-    @table.delete(sym) do
-      return yield if block
-      raise! NameError.new("no field `#{sym}' in #{self}", sym)
-    end
-  end
-
-  InspectKey = :__inspect_key__ # :nodoc:
-
-  #
-  # Returns a string containing a detailed summary of the keys and values.
-  #
-  def inspect
-    ids = (Thread.current[InspectKey] ||= [])
-    if ids.include?(object_id)
-      detail = ' ...'
-    else
-      ids << object_id
-      begin
-        detail = @table.map do |key, value|
-          " #{key}=#{value.inspect}"
-        end.join(',')
-      ensure
-        ids.pop
-      end
-    end
-    ['#<', self.class!, detail, '>'].join
-  end
-  alias :to_s :inspect
-
-  attr_reader :table # :nodoc:
-  alias table! table
-  protected :table!
-
-  #
-  # Compares this object and +other+ for equality.  An OpenStruct is equal to
-  # +other+ when +other+ is an OpenStruct and the two objects' Hash tables are
-  # equal.
-  #
-  #   require "ostruct"
-  #   first_pet  = OpenStruct.new("name" => "Rowdy")
-  #   second_pet = OpenStruct.new(:name  => "Rowdy")
-  #   third_pet  = OpenStruct.new("name" => "Rowdy", :age => nil)
-  #
-  #   first_pet == second_pet   # => true
-  #   first_pet == third_pet    # => false
-  #
-  def ==(other)
-    return false unless other.kind_of?(OpenStruct)
-    @table == other.table!
-  end
-
-  #
-  # Compares this object and +other+ for equality.  An OpenStruct is eql? to
-  # +other+ when +other+ is an OpenStruct and the two objects' Hash tables are
-  # eql?.
-  #
-  def eql?(other)
-    return false unless other.kind_of?(OpenStruct)
-    @table.eql?(other.table!)
-  end
-
-  # Computes a hash code for this OpenStruct.
-  def hash # :nodoc:
-    @table.hash
-  end
-
-  #
-  # Provides marshalling support for use by the YAML library.
-  #
-  def encode_with(coder) # :nodoc:
-    @table.each_pair do |key, value|
-      coder[key.to_s] = value
-    end
-    if @table.size == 1 && @table.key?(:table) # support for legacy format
-      # in the very unlikely case of a single entry called 'table'
-      coder['legacy_support!'] = true # add a bogus second entry
-    end
-  end
-
-  #
-  # Provides marshalling support for use by the YAML library.
-  #
-  def init_with(coder) # :nodoc:
-    h = coder.map
-    if h.size == 1 # support for legacy format
-      key, val = h.first
-      if key == 'table'
-        h = val
-      end
-    end
-    update_to_values!(h)
-  end
-
-  # Make all public methods (builtin or our own) accessible with <code>!</code>:
-  give_access = instance_methods
-  # See https://github.com/ruby/ostruct/issues/30
-  give_access -= %i[instance_exec instance_eval eval] if RUBY_ENGINE == 'jruby'
-  give_access.each do |method|
-    next if method.match(/\W$/)
-
-    new_name = "#{method}!"
-    alias_method new_name, method
-  end
-  # Other builtin private methods we use:
-  alias_method :raise!, :raise
-  private :raise!
-
-  # See https://github.com/ruby/ostruct/issues/40
-  if RUBY_ENGINE != 'jruby'
-    alias_method :block_given!, :block_given?
-    private :block_given!
-  end
-end
diff --git a/lib/pp.gemspec b/lib/pp.gemspec
index 27a92a8ce4cb46..15a3b4dc6c94a5 100644
--- a/lib/pp.gemspec
+++ b/lib/pp.gemspec
@@ -22,7 +22,8 @@ Gem::Specification.new do |spec|
   spec.metadata["source_code_uri"] = spec.homepage
 
   spec.files         = %w[
-    LICENSE.txt
+    BSDL
+    COPYING
     lib/pp.rb
     pp.gemspec
   ]
diff --git a/lib/pp.rb b/lib/pp.rb
index b81f84cec5b3c8..531839563167cf 100644
--- a/lib/pp.rb
+++ b/lib/pp.rb
@@ -46,6 +46,7 @@
 #
 # To define a customized pretty printing function for your classes,
 # redefine method <code>#pretty_print(pp)</code> in the class.
+# Note that <code>require 'pp'</code> is needed before redefining <code>#pretty_print(pp)</code>.
 #
 # <code>#pretty_print</code> takes the +pp+ argument, which is an instance of the PP class.
 # The method uses #text, #breakable, #nest, #group and #pp to print the
@@ -62,7 +63,8 @@
 
 class PP < PrettyPrint
 
-  VERSION = "0.4.0"
+  # The version string
+  VERSION = "0.6.2"
 
   # Returns the usable width for +out+.
   # As the width of +out+:
@@ -92,7 +94,7 @@ def PP.width_for(out)
   #
   # PP.pp returns +out+.
   def PP.pp(obj, out=$>, width=width_for(out))
-    q = PP.new(out, width)
+    q = new(out, width)
     q.guard_inspect_key {q.pp obj}
     q.flush
     #$pp = q
@@ -137,6 +139,7 @@ class << self
     end
   end
 
+  # Module that defines helper methods for pretty_print.
   module PPMethods
 
     # Yields to a block
@@ -180,6 +183,24 @@ def pop_inspect_key(id)
       Thread.current[:__recursive_key__][:inspect].delete id
     end
 
+    private def guard_inspect(object)
+      recursive_state = Thread.current[:__recursive_key__]
+
+      if recursive_state && recursive_state.key?(:inspect)
+        begin
+          push_inspect_key(object)
+          yield
+        ensure
+          pop_inspect_key(object) unless PP.sharing_detection
+        end
+      else
+        guard_inspect_key do
+          push_inspect_key(object)
+          yield
+        end
+      end
+    end
+
     # Adds +obj+ to the pretty printing buffer
     # using Object#pretty_print or Object#pretty_print_cycle.
     #
@@ -188,18 +209,19 @@ def pop_inspect_key(id)
     def pp(obj)
       # If obj is a Delegator then use the object being delegated to for cycle
       # detection
-      obj = obj.__getobj__ if defined?(::Delegator) and obj.is_a?(::Delegator)
+      obj = obj.__getobj__ if defined?(::Delegator) and ::Delegator === obj
 
       if check_inspect_key(obj)
         group {obj.pretty_print_cycle self}
         return
       end
 
-      begin
-        push_inspect_key(obj)
-        group {obj.pretty_print self}
-      ensure
-        pop_inspect_key(obj) unless PP.sharing_detection
+      guard_inspect(obj) do
+        group do
+          obj.pretty_print self
+        rescue NoMethodError
+          text Kernel.instance_method(:inspect).bind_call(obj)
+        end
       end
     end
 
@@ -254,15 +276,20 @@ def comma_breakable
     def seplist(list, sep=nil, iter_method=:each) # :yield: element
       sep ||= lambda { comma_breakable }
       first = true
+      kwsplat = EMPTY_KWHASH
       list.__send__(iter_method) {|*v|
         if first
           first = false
         else
           sep.call
         end
-        RUBY_VERSION >= "3.0" ? yield(*v, **{}) : yield(*v)
+        kwsplat ? yield(*v, **kwsplat) : yield(*v)
       }
     end
+    EMPTY_KWHASH = if RUBY_VERSION >= "3.0"
+      {}.freeze
+    end
+    private_constant :EMPTY_KWHASH
 
     # A present standard failsafe for pretty printing any given Object
     def pp_object(obj)
@@ -285,16 +312,42 @@ def pp_hash(obj)
       group(1, '{', '}') {
         seplist(obj, nil, :each_pair) {|k, v|
           group {
-            pp k
-            text '=>'
-            group(1) {
-              breakable ''
-              pp v
-            }
+            pp_hash_pair k, v
           }
         }
       }
     end
+
+    if RUBY_VERSION >= '3.4.'
+      # A pretty print for a pair of Hash
+      def pp_hash_pair(k, v)
+        if Symbol === k
+          sym_s = k.inspect
+          if sym_s[1].match?(/["$@!]/) || sym_s[-1].match?(/[%&*+\-\/<=>@\]^`|~]/)
+            text "#{k.to_s.inspect}:"
+          else
+            text "#{k}:"
+          end
+        else
+          pp k
+          text ' '
+          text '=>'
+        end
+        group(1) {
+          breakable
+          pp v
+        }
+      end
+    else
+      def pp_hash_pair(k, v)
+        pp k
+        text '=>'
+        group(1) {
+          breakable ''
+          pp v
+        }
+      end
+    end
   end
 
   include PPMethods
@@ -389,6 +442,23 @@ def pretty_print_cycle(q) # :nodoc:
   end
 end
 
+class Set # :nodoc:
+  def pretty_print(pp)  # :nodoc:
+    pp.group(1, '#<Set:', '>') {
+      pp.breakable
+      pp.group(1, '{', '}') {
+        pp.seplist(self) { |o|
+          pp.pp o
+        }
+      }
+    }
+  end
+
+  def pretty_print_cycle(pp)    # :nodoc:
+    pp.text sprintf('#<Set: {%s}>', empty? ? '' : '...')
+  end
+end
+
 class << ENV # :nodoc:
   def pretty_print(q) # :nodoc:
     h = {}
@@ -421,14 +491,28 @@ def pretty_print_cycle(q) # :nodoc:
 
 class Data # :nodoc:
   def pretty_print(q) # :nodoc:
-    q.group(1, sprintf("#<data %s", PP.mcall(self, Kernel, :class).name), '>') {
-      q.seplist(PP.mcall(self, Data, :members), lambda { q.text "," }) {|member|
+    class_name = PP.mcall(self, Kernel, :class).name
+    class_name = " #{class_name}" if class_name
+    q.group(1, "#<data#{class_name}", '>') {
+
+      members = PP.mcall(self, Kernel, :class).members
+      values = []
+      members.select! do |member|
+        begin
+          values << __send__(member)
+          true
+        rescue NoMethodError
+          false
+        end
+      end
+
+      q.seplist(members.zip(values), lambda { q.text "," }) {|(member, value)|
         q.breakable
         q.text member.to_s
         q.text '='
         q.group(1) {
           q.breakable ''
-          q.pp public_send(member)
+          q.pp value
         }
       }
     }
@@ -437,15 +521,17 @@ def pretty_print(q) # :nodoc:
   def pretty_print_cycle(q) # :nodoc:
     q.text sprintf("#<data %s:...>", PP.mcall(self, Kernel, :class).name)
   end
-end if "3.2" <= RUBY_VERSION
+end if defined?(Data.define)
 
 class Range # :nodoc:
   def pretty_print(q) # :nodoc:
-    q.pp self.begin
+    begin_nil = self.begin == nil
+    end_nil = self.end == nil
+    q.pp self.begin if !begin_nil || end_nil
     q.breakable ''
     q.text(self.exclude_end? ? '...' : '..')
     q.breakable ''
-    q.pp self.end if self.end
+    q.pp self.end if !end_nil || begin_nil
   end
 end
 
@@ -574,7 +660,7 @@ def pretty_print(q) # :nodoc:
 end
 
 if defined?(RubyVM::AbstractSyntaxTree)
-  class RubyVM::AbstractSyntaxTree::Node
+  class RubyVM::AbstractSyntaxTree::Node # :nodoc:
     def pretty_print_children(q, names = [])
       children.zip(names) do |c, n|
         if n
@@ -632,10 +718,6 @@ def pretty_print(q)
 module Kernel
   # Returns a pretty printed object as a string.
   #
-  # In order to use this method you must first require the PP module:
-  #
-  #   require 'pp'
-  #
   # See the PP module for more information.
   def pretty_inspect
     PP.pp(self, ''.dup)
@@ -643,7 +725,7 @@ def pretty_inspect
 
   # prints arguments in pretty form.
   #
-  # pp returns argument(s).
+  # +#pp+ returns argument(s).
   def pp(*objs)
     objs.each {|obj|
       PP.pp(obj)
diff --git a/lib/prettyprint.rb b/lib/prettyprint.rb
index 540b12fb706373..6f50192f5daf29 100644
--- a/lib/prettyprint.rb
+++ b/lib/prettyprint.rb
@@ -23,17 +23,17 @@
 #
 # == References
 # Christian Lindig, Strictly Pretty, March 2000,
-# http://www.st.cs.uni-sb.de/~lindig/papers/#pretty
+# https://lindig.github.io/papers/strictly-pretty-2000.pdf
 #
 # Philip Wadler, A prettier printer, March 1998,
-# http://homepages.inf.ed.ac.uk/wadler/topics/language-design.html#prettier
+# https://homepages.inf.ed.ac.uk/wadler/topics/language-design.html#prettier
 #
 # == Author
 # Tanaka Akira <akr@fsij.org>
 #
 class PrettyPrint
 
-  VERSION = "0.1.1"
+  VERSION = "0.2.0"
 
   # This is a convenience method which is same as follows:
   #
diff --git a/lib/prism.rb b/lib/prism.rb
new file mode 100644
index 00000000000000..dceba4b1f5c0a8
--- /dev/null
+++ b/lib/prism.rb
@@ -0,0 +1,91 @@
+# frozen_string_literal: true
+# :markup: markdown
+
+# The Prism Ruby parser.
+#
+# "Parsing Ruby is suddenly manageable!"
+#   - You, hopefully
+#
+module Prism
+  # There are many files in prism that are templated to handle every node type,
+  # which means the files can end up being quite large. We autoload them to make
+  # our require speed faster since consuming libraries are unlikely to use all
+  # of these features.
+
+  autoload :BasicVisitor, "prism/visitor"
+  autoload :Compiler, "prism/compiler"
+  autoload :DesugarCompiler, "prism/desugar_compiler"
+  autoload :Dispatcher, "prism/dispatcher"
+  autoload :DotVisitor, "prism/dot_visitor"
+  autoload :DSL, "prism/dsl"
+  autoload :InspectVisitor, "prism/inspect_visitor"
+  autoload :LexCompat, "prism/lex_compat"
+  autoload :LexRipper, "prism/lex_compat"
+  autoload :MutationCompiler, "prism/mutation_compiler"
+  autoload :Pack, "prism/pack"
+  autoload :Pattern, "prism/pattern"
+  autoload :Reflection, "prism/reflection"
+  autoload :Relocation, "prism/relocation"
+  autoload :Serialize, "prism/serialize"
+  autoload :StringQuery, "prism/string_query"
+  autoload :Translation, "prism/translation"
+  autoload :Visitor, "prism/visitor"
+
+  # Some of these constants are not meant to be exposed, so marking them as
+  # private here.
+
+  private_constant :LexCompat
+  private_constant :LexRipper
+
+  # :call-seq:
+  #   Prism::lex_compat(source, **options) -> LexCompat::Result
+  #
+  # Returns a parse result whose value is an array of tokens that closely
+  # resembles the return value of Ripper::lex. The main difference is that the
+  # `:on_sp` token is not emitted.
+  #
+  # For supported options, see Prism::parse.
+  def self.lex_compat(source, **options)
+    LexCompat.new(source, **options).result # steep:ignore
+  end
+
+  # :call-seq:
+  #   Prism::lex_ripper(source) -> Array
+  #
+  # This lexes with the Ripper lex. It drops any space events but otherwise
+  # returns the same tokens. Raises SyntaxError if the syntax in source is
+  # invalid.
+  def self.lex_ripper(source)
+    LexRipper.new(source).result # steep:ignore
+  end
+
+  # :call-seq:
+  #   Prism::load(source, serialized, freeze) -> ParseResult
+  #
+  # Load the serialized AST using the source as a reference into a tree.
+  def self.load(source, serialized, freeze = false)
+    Serialize.load_parse(source, serialized, freeze)
+  end
+end
+
+require_relative "prism/polyfill/byteindex"
+require_relative "prism/polyfill/warn"
+require_relative "prism/node"
+require_relative "prism/node_ext"
+require_relative "prism/parse_result"
+
+# This is a Ruby implementation of the prism parser. If we're running on CRuby
+# and we haven't explicitly set the PRISM_FFI_BACKEND environment variable, then
+# it's going to require the built library. Otherwise, it's going to require a
+# module that uses FFI to call into the library.
+if RUBY_ENGINE == "ruby" and !ENV["PRISM_FFI_BACKEND"]
+  # The C extension is the default backend on CRuby.
+  Prism::BACKEND = :CEXT
+
+  require "prism/prism"
+else
+  # The FFI backend is used on other Ruby implementations.
+  Prism::BACKEND = :FFI
+
+  require_relative "prism/ffi"
+end
diff --git a/lib/prism/desugar_compiler.rb b/lib/prism/desugar_compiler.rb
new file mode 100644
index 00000000000000..5d7d38d84153ce
--- /dev/null
+++ b/lib/prism/desugar_compiler.rb
@@ -0,0 +1,392 @@
+# frozen_string_literal: true
+# :markup: markdown
+
+module Prism
+  class DesugarAndWriteNode # :nodoc:
+    include DSL
+
+    attr_reader :node, :default_source, :read_class, :write_class, :arguments
+
+    def initialize(node, default_source, read_class, write_class, **arguments)
+      @node = node
+      @default_source = default_source
+      @read_class = read_class
+      @write_class = write_class
+      @arguments = arguments
+    end
+
+    # Desugar `x &&= y` to `x && x = y`
+    def compile
+      and_node(
+        location: node.location,
+        left: public_send(read_class, location: node.name_loc, **arguments),
+        right: public_send(
+          write_class,
+          location: node.location,
+          **arguments,
+          name_loc: node.name_loc,
+          value: node.value,
+          operator_loc: node.operator_loc
+        ),
+        operator_loc: node.operator_loc
+      )
+    end
+  end
+
+  class DesugarOrWriteDefinedNode # :nodoc:
+    include DSL
+
+    attr_reader :node, :default_source, :read_class, :write_class, :arguments
+
+    def initialize(node, default_source, read_class, write_class, **arguments)
+      @node = node
+      @default_source = default_source
+      @read_class = read_class
+      @write_class = write_class
+      @arguments = arguments
+    end
+
+    # Desugar `x ||= y` to `defined?(x) ? x : x = y`
+    def compile
+      if_node(
+        location: node.location,
+        if_keyword_loc: node.operator_loc,
+        predicate: defined_node(
+          location: node.name_loc,
+          value: public_send(read_class, location: node.name_loc, **arguments),
+          keyword_loc: node.operator_loc
+        ),
+        then_keyword_loc: node.operator_loc,
+        statements: statements_node(
+          location: node.location,
+          body: [public_send(read_class, location: node.name_loc, **arguments)]
+        ),
+        subsequent: else_node(
+          location: node.location,
+          else_keyword_loc: node.operator_loc,
+          statements: statements_node(
+            location: node.location,
+            body: [
+              public_send(
+                write_class,
+                location: node.location,
+                **arguments,
+                name_loc: node.name_loc,
+                value: node.value,
+                operator_loc: node.operator_loc
+              )
+            ]
+          ),
+          end_keyword_loc: node.operator_loc
+        ),
+        end_keyword_loc: node.operator_loc
+      )
+    end
+  end
+
+  class DesugarOperatorWriteNode # :nodoc:
+    include DSL
+
+    attr_reader :node, :default_source, :read_class, :write_class, :arguments
+
+    def initialize(node, default_source, read_class, write_class, **arguments)
+      @node = node
+      @default_source = default_source
+      @read_class = read_class
+      @write_class = write_class
+      @arguments = arguments
+    end
+
+    # Desugar `x += y` to `x = x + y`
+    def compile
+      binary_operator_loc = node.binary_operator_loc.chop
+
+      public_send(
+        write_class,
+        location: node.location,
+        **arguments,
+        name_loc: node.name_loc,
+        value: call_node(
+          location: node.location,
+          receiver: public_send(
+            read_class,
+            location: node.name_loc,
+            **arguments
+          ),
+          name: binary_operator_loc.slice.to_sym,
+          message_loc: binary_operator_loc,
+          arguments: arguments_node(
+            location: node.value.location,
+            arguments: [node.value]
+          )
+        ),
+        operator_loc: node.binary_operator_loc.copy(
+          start_offset: node.binary_operator_loc.end_offset - 1,
+          length: 1
+        )
+      )
+    end
+  end
+
+  class DesugarOrWriteNode # :nodoc:
+    include DSL
+
+    attr_reader :node, :default_source, :read_class, :write_class, :arguments
+
+    def initialize(node, default_source, read_class, write_class, **arguments)
+      @node = node
+      @default_source = default_source
+      @read_class = read_class
+      @write_class = write_class
+      @arguments = arguments
+    end
+
+    # Desugar `x ||= y` to `x || x = y`
+    def compile
+      or_node(
+        location: node.location,
+        left: public_send(read_class, location: node.name_loc, **arguments),
+        right: public_send(
+          write_class,
+          location: node.location,
+          **arguments,
+          name_loc: node.name_loc,
+          value: node.value,
+          operator_loc: node.operator_loc
+        ),
+        operator_loc: node.operator_loc
+      )
+    end
+  end
+
+  private_constant :DesugarAndWriteNode, :DesugarOrWriteNode, :DesugarOrWriteDefinedNode, :DesugarOperatorWriteNode
+
+  class ClassVariableAndWriteNode
+    def desugar # :nodoc:
+      DesugarAndWriteNode.new(self, source, :class_variable_read_node, :class_variable_write_node, name: name).compile
+    end
+  end
+
+  class ClassVariableOrWriteNode
+    def desugar # :nodoc:
+      DesugarOrWriteDefinedNode.new(self, source, :class_variable_read_node, :class_variable_write_node, name: name).compile
+    end
+  end
+
+  class ClassVariableOperatorWriteNode
+    def desugar # :nodoc:
+      DesugarOperatorWriteNode.new(self, source, :class_variable_read_node, :class_variable_write_node, name: name).compile
+    end
+  end
+
+  class ConstantAndWriteNode
+    def desugar # :nodoc:
+      DesugarAndWriteNode.new(self, source, :constant_read_node, :constant_write_node, name: name).compile
+    end
+  end
+
+  class ConstantOrWriteNode
+    def desugar # :nodoc:
+      DesugarOrWriteDefinedNode.new(self, source, :constant_read_node, :constant_write_node, name: name).compile
+    end
+  end
+
+  class ConstantOperatorWriteNode
+    def desugar # :nodoc:
+      DesugarOperatorWriteNode.new(self, source, :constant_read_node, :constant_write_node, name: name).compile
+    end
+  end
+
+  class GlobalVariableAndWriteNode
+    def desugar # :nodoc:
+      DesugarAndWriteNode.new(self, source, :global_variable_read_node, :global_variable_write_node, name: name).compile
+    end
+  end
+
+  class GlobalVariableOrWriteNode
+    def desugar # :nodoc:
+      DesugarOrWriteDefinedNode.new(self, source, :global_variable_read_node, :global_variable_write_node, name: name).compile
+    end
+  end
+
+  class GlobalVariableOperatorWriteNode
+    def desugar # :nodoc:
+      DesugarOperatorWriteNode.new(self, source, :global_variable_read_node, :global_variable_write_node, name: name).compile
+    end
+  end
+
+  class InstanceVariableAndWriteNode
+    def desugar # :nodoc:
+      DesugarAndWriteNode.new(self, source, :instance_variable_read_node, :instance_variable_write_node, name: name).compile
+    end
+  end
+
+  class InstanceVariableOrWriteNode
+    def desugar # :nodoc:
+      DesugarOrWriteNode.new(self, source, :instance_variable_read_node, :instance_variable_write_node, name: name).compile
+    end
+  end
+
+  class InstanceVariableOperatorWriteNode
+    def desugar # :nodoc:
+      DesugarOperatorWriteNode.new(self, source, :instance_variable_read_node, :instance_variable_write_node, name: name).compile
+    end
+  end
+
+  class LocalVariableAndWriteNode
+    def desugar # :nodoc:
+      DesugarAndWriteNode.new(self, source, :local_variable_read_node, :local_variable_write_node, name: name, depth: depth).compile
+    end
+  end
+
+  class LocalVariableOrWriteNode
+    def desugar # :nodoc:
+      DesugarOrWriteNode.new(self, source, :local_variable_read_node, :local_variable_write_node, name: name, depth: depth).compile
+    end
+  end
+
+  class LocalVariableOperatorWriteNode
+    def desugar # :nodoc:
+      DesugarOperatorWriteNode.new(self, source, :local_variable_read_node, :local_variable_write_node, name: name, depth: depth).compile
+    end
+  end
+
+  # DesugarCompiler is a compiler that desugars Ruby code into a more primitive
+  # form. This is useful for consumers that want to deal with fewer node types.
+  class DesugarCompiler < MutationCompiler
+    # @@foo &&= bar
+    #
+    # becomes
+    #
+    # @@foo && @@foo = bar
+    def visit_class_variable_and_write_node(node)
+      node.desugar
+    end
+
+    # @@foo ||= bar
+    #
+    # becomes
+    #
+    # defined?(@@foo) ? @@foo : @@foo = bar
+    def visit_class_variable_or_write_node(node)
+      node.desugar
+    end
+
+    # @@foo += bar
+    #
+    # becomes
+    #
+    # @@foo = @@foo + bar
+    def visit_class_variable_operator_write_node(node)
+      node.desugar
+    end
+
+    # Foo &&= bar
+    #
+    # becomes
+    #
+    # Foo && Foo = bar
+    def visit_constant_and_write_node(node)
+      node.desugar
+    end
+
+    # Foo ||= bar
+    #
+    # becomes
+    #
+    # defined?(Foo) ? Foo : Foo = bar
+    def visit_constant_or_write_node(node)
+      node.desugar
+    end
+
+    # Foo += bar
+    #
+    # becomes
+    #
+    # Foo = Foo + bar
+    def visit_constant_operator_write_node(node)
+      node.desugar
+    end
+
+    # $foo &&= bar
+    #
+    # becomes
+    #
+    # $foo && $foo = bar
+    def visit_global_variable_and_write_node(node)
+      node.desugar
+    end
+
+    # $foo ||= bar
+    #
+    # becomes
+    #
+    # defined?($foo) ? $foo : $foo = bar
+    def visit_global_variable_or_write_node(node)
+      node.desugar
+    end
+
+    # $foo += bar
+    #
+    # becomes
+    #
+    # $foo = $foo + bar
+    def visit_global_variable_operator_write_node(node)
+      node.desugar
+    end
+
+    # @foo &&= bar
+    #
+    # becomes
+    #
+    # @foo && @foo = bar
+    def visit_instance_variable_and_write_node(node)
+      node.desugar
+    end
+
+    # @foo ||= bar
+    #
+    # becomes
+    #
+    # @foo || @foo = bar
+    def visit_instance_variable_or_write_node(node)
+      node.desugar
+    end
+
+    # @foo += bar
+    #
+    # becomes
+    #
+    # @foo = @foo + bar
+    def visit_instance_variable_operator_write_node(node)
+      node.desugar
+    end
+
+    # foo &&= bar
+    #
+    # becomes
+    #
+    # foo && foo = bar
+    def visit_local_variable_and_write_node(node)
+      node.desugar
+    end
+
+    # foo ||= bar
+    #
+    # becomes
+    #
+    # foo || foo = bar
+    def visit_local_variable_or_write_node(node)
+      node.desugar
+    end
+
+    # foo += bar
+    #
+    # becomes
+    #
+    # foo = foo + bar
+    def visit_local_variable_operator_write_node(node)
+      node.desugar
+    end
+  end
+end
diff --git a/lib/prism/ffi.rb b/lib/prism/ffi.rb
new file mode 100644
index 00000000000000..5a4ba09a4fd9a0
--- /dev/null
+++ b/lib/prism/ffi.rb
@@ -0,0 +1,567 @@
+# frozen_string_literal: true
+# :markup: markdown
+# typed: ignore
+
+# This file is responsible for mirroring the API provided by the C extension by
+# using FFI to call into the shared library.
+
+require "rbconfig"
+require "ffi"
+
+# We want to eagerly load this file if there are Ractors so that it does not get
+# autoloaded from within a non-main Ractor.
+require "prism/serialize" if defined?(Ractor)
+
+module Prism
+  module LibRubyParser # :nodoc:
+    extend FFI::Library
+
+    # Define the library that we will be pulling functions from. Note that this
+    # must align with the build shared library from make/rake.
+    libprism_in_build = File.expand_path("../../build/libprism.#{RbConfig::CONFIG["SOEXT"]}", __dir__)
+    libprism_in_libdir = "#{RbConfig::CONFIG["libdir"]}/prism/libprism.#{RbConfig::CONFIG["SOEXT"]}"
+
+    if File.exist?(libprism_in_build)
+      INCLUDE_DIR = File.expand_path("../../include", __dir__)
+      ffi_lib libprism_in_build
+    else
+      INCLUDE_DIR = "#{RbConfig::CONFIG["libdir"]}/prism/include"
+      ffi_lib libprism_in_libdir
+    end
+
+    # Convert a native C type declaration into a symbol that FFI understands.
+    # For example:
+    #
+    #     const char * -> :pointer
+    #     bool         -> :bool
+    #     size_t       -> :size_t
+    #     void         -> :void
+    #
+    def self.resolve_type(type, callbacks)
+      type = type.strip
+
+      if !type.end_with?("*")
+        type.delete_prefix("const ").to_sym
+      else
+        type = type.delete_suffix("*").rstrip
+        callbacks.include?(type.to_sym) ? type.to_sym : :pointer
+      end
+    end
+
+    # Read through the given header file and find the declaration of each of the
+    # given functions. For each one, define a function with the same name and
+    # signature as the C function.
+    def self.load_exported_functions_from(header, *functions, callbacks)
+      File.foreach("#{INCLUDE_DIR}/#{header}") do |line|
+        # We only want to attempt to load exported functions.
+        next unless line.start_with?("PRISM_EXPORTED_FUNCTION ")
+
+        # We only want to load the functions that we are interested in.
+        next unless functions.any? { |function| line.include?(function) }
+
+        # Parse the function declaration.
+        unless /^PRISM_EXPORTED_FUNCTION (?<return_type>.+) (?<name>\w+)\((?<arg_types>.+)\);$/ =~ line
+          raise "Could not parse #{line}"
+        end
+
+        # Delete the function from the list of functions we are looking for to
+        # mark it as having been found.
+        functions.delete(name)
+
+        # Split up the argument types into an array, ensure we handle the case
+        # where there are no arguments (by explicit void).
+        arg_types = arg_types.split(",").map(&:strip)
+        arg_types = [] if arg_types == %w[void]
+
+        # Resolve the type of the argument by dropping the name of the argument
+        # first if it is present.
+        arg_types.map! { |type| resolve_type(type.sub(/\w+$/, ""), callbacks) }
+
+        # Attach the function using the FFI library.
+        attach_function name, arg_types, resolve_type(return_type, [])
+      end
+
+      # If we didn't find all of the functions, raise an error.
+      raise "Could not find functions #{functions.inspect}" unless functions.empty?
+    end
+
+    callback :pm_parse_stream_fgets_t, [:pointer, :int, :pointer], :pointer
+    enum :pm_string_init_result_t, %i[PM_STRING_INIT_SUCCESS PM_STRING_INIT_ERROR_GENERIC PM_STRING_INIT_ERROR_DIRECTORY]
+    enum :pm_string_query_t, [:PM_STRING_QUERY_ERROR, -1, :PM_STRING_QUERY_FALSE, :PM_STRING_QUERY_TRUE]
+
+    load_exported_functions_from(
+      "prism.h",
+      "pm_version",
+      "pm_serialize_parse",
+      "pm_serialize_parse_stream",
+      "pm_serialize_parse_comments",
+      "pm_serialize_lex",
+      "pm_serialize_parse_lex",
+      "pm_parse_success_p",
+      "pm_string_query_local",
+      "pm_string_query_constant",
+      "pm_string_query_method_name",
+      [:pm_parse_stream_fgets_t]
+    )
+
+    load_exported_functions_from(
+      "prism/util/pm_buffer.h",
+      "pm_buffer_sizeof",
+      "pm_buffer_init",
+      "pm_buffer_value",
+      "pm_buffer_length",
+      "pm_buffer_free",
+      []
+    )
+
+    load_exported_functions_from(
+      "prism/util/pm_string.h",
+      "pm_string_mapped_init",
+      "pm_string_free",
+      "pm_string_source",
+      "pm_string_length",
+      "pm_string_sizeof",
+      []
+    )
+
+    # This object represents a pm_buffer_t. We only use it as an opaque pointer,
+    # so it doesn't need to know the fields of pm_buffer_t.
+    class PrismBuffer # :nodoc:
+      SIZEOF = LibRubyParser.pm_buffer_sizeof
+
+      attr_reader :pointer
+
+      def initialize(pointer)
+        @pointer = pointer
+      end
+
+      def value
+        LibRubyParser.pm_buffer_value(pointer)
+      end
+
+      def length
+        LibRubyParser.pm_buffer_length(pointer)
+      end
+
+      def read
+        value.read_string(length)
+      end
+
+      # Initialize a new buffer and yield it to the block. The buffer will be
+      # automatically freed when the block returns.
+      def self.with
+        FFI::MemoryPointer.new(SIZEOF) do |pointer|
+          raise unless LibRubyParser.pm_buffer_init(pointer)
+          return yield new(pointer)
+        ensure
+          LibRubyParser.pm_buffer_free(pointer)
+        end
+      end
+    end
+
+    # This object represents a pm_string_t. We only use it as an opaque pointer,
+    # so it doesn't have to be an FFI::Struct.
+    class PrismString # :nodoc:
+      SIZEOF = LibRubyParser.pm_string_sizeof
+
+      PLATFORM_EXPECTS_UTF8 =
+        RbConfig::CONFIG["host_os"].match?(/bccwin|cygwin|djgpp|mingw|mswin|wince|darwin/i)
+
+      attr_reader :pointer, :length
+
+      def initialize(pointer, length, from_string)
+        @pointer = pointer
+        @length = length
+        @from_string = from_string
+      end
+
+      def read
+        raise "should use the original String instead" if @from_string
+        @pointer.read_string(@length)
+      end
+
+      # Yields a pm_string_t pointer to the given block.
+      def self.with_string(string)
+        raise TypeError unless string.is_a?(String)
+
+        length = string.bytesize
+        # + 1 to never get an address of 0, which pm_parser_init() asserts
+        FFI::MemoryPointer.new(:char, length + 1, false) do |pointer|
+          pointer.write_string(string)
+          # since we have the extra byte we might as well \0-terminate
+          pointer.put_char(length, 0)
+          return yield new(pointer, length, true)
+        end
+      end
+
+      # Yields a pm_string_t pointer to the given block.
+      def self.with_file(filepath)
+        raise TypeError unless filepath.is_a?(String)
+
+        # On Windows and Mac, it's expected that filepaths will be encoded in
+        # UTF-8. If they are not, we need to convert them to UTF-8 before
+        # passing them into pm_string_mapped_init.
+        if PLATFORM_EXPECTS_UTF8 && (encoding = filepath.encoding) != Encoding::ASCII_8BIT && encoding != Encoding::UTF_8
+          filepath = filepath.encode(Encoding::UTF_8)
+        end
+
+        FFI::MemoryPointer.new(SIZEOF) do |pm_string|
+          case (result = LibRubyParser.pm_string_mapped_init(pm_string, filepath))
+          when :PM_STRING_INIT_SUCCESS
+            pointer = LibRubyParser.pm_string_source(pm_string)
+            length = LibRubyParser.pm_string_length(pm_string)
+            return yield new(pointer, length, false)
+          when :PM_STRING_INIT_ERROR_GENERIC
+            raise SystemCallError.new(filepath, FFI.errno)
+          when :PM_STRING_INIT_ERROR_DIRECTORY
+            raise Errno::EISDIR.new(filepath)
+          else
+            raise "Unknown error initializing pm_string_t: #{result.inspect}"
+          end
+        ensure
+          LibRubyParser.pm_string_free(pm_string)
+        end
+      end
+    end
+  end
+
+  # Mark the LibRubyParser module as private as it should only be called through
+  # the prism module.
+  private_constant :LibRubyParser
+
+  # The version constant is set by reading the result of calling pm_version.
+  VERSION = LibRubyParser.pm_version.read_string.freeze
+
+  class << self
+    # Mirror the Prism.dump API by using the serialization API.
+    def dump(source, **options)
+      LibRubyParser::PrismString.with_string(source) { |string| dump_common(string, options) }
+    end
+
+    # Mirror the Prism.dump_file API by using the serialization API.
+    def dump_file(filepath, **options)
+      options[:filepath] = filepath
+      LibRubyParser::PrismString.with_file(filepath) { |string| dump_common(string, options) }
+    end
+
+    # Mirror the Prism.lex API by using the serialization API.
+    def lex(code, **options)
+      LibRubyParser::PrismString.with_string(code) { |string| lex_common(string, code, options) }
+    end
+
+    # Mirror the Prism.lex_file API by using the serialization API.
+    def lex_file(filepath, **options)
+      options[:filepath] = filepath
+      LibRubyParser::PrismString.with_file(filepath) { |string| lex_common(string, string.read, options) }
+    end
+
+    # Mirror the Prism.parse API by using the serialization API.
+    def parse(code, **options)
+      LibRubyParser::PrismString.with_string(code) { |string| parse_common(string, code, options) }
+    end
+
+    # Mirror the Prism.parse_file API by using the serialization API. This uses
+    # native strings instead of Ruby strings because it allows us to use mmap
+    # when it is available.
+    def parse_file(filepath, **options)
+      options[:filepath] = filepath
+      LibRubyParser::PrismString.with_file(filepath) { |string| parse_common(string, string.read, options) }
+    end
+
+    # Mirror the Prism.parse_stream API by using the serialization API.
+    def parse_stream(stream, **options)
+      LibRubyParser::PrismBuffer.with do |buffer|
+        source = +""
+        callback = -> (string, size, _) {
+          raise "Expected size to be >= 0, got: #{size}" if size <= 0
+
+          if !(line = stream.gets(size - 1)).nil?
+            source << line
+            string.write_string("#{line}\x00", line.bytesize + 1)
+          end
+        }
+
+        # In the pm_serialize_parse_stream function it accepts a pointer to the
+        # IO object as a void* and then passes it through to the callback as the
+        # third argument, but it never touches it itself. As such, since we have
+        # access to the IO object already through the closure of the lambda, we
+        # can pass a null pointer here and not worry.
+        LibRubyParser.pm_serialize_parse_stream(buffer.pointer, nil, callback, dump_options(options))
+        Prism.load(source, buffer.read, options.fetch(:freeze, false))
+      end
+    end
+
+    # Mirror the Prism.parse_comments API by using the serialization API.
+    def parse_comments(code, **options)
+      LibRubyParser::PrismString.with_string(code) { |string| parse_comments_common(string, code, options) }
+    end
+
+    # Mirror the Prism.parse_file_comments API by using the serialization
+    # API. This uses native strings instead of Ruby strings because it allows us
+    # to use mmap when it is available.
+    def parse_file_comments(filepath, **options)
+      options[:filepath] = filepath
+      LibRubyParser::PrismString.with_file(filepath) { |string| parse_comments_common(string, string.read, options) }
+    end
+
+    # Mirror the Prism.parse_lex API by using the serialization API.
+    def parse_lex(code, **options)
+      LibRubyParser::PrismString.with_string(code) { |string| parse_lex_common(string, code, options) }
+    end
+
+    # Mirror the Prism.parse_lex_file API by using the serialization API.
+    def parse_lex_file(filepath, **options)
+      options[:filepath] = filepath
+      LibRubyParser::PrismString.with_file(filepath) { |string| parse_lex_common(string, string.read, options) }
+    end
+
+    # Mirror the Prism.parse_success? API by using the serialization API.
+    def parse_success?(code, **options)
+      LibRubyParser::PrismString.with_string(code) { |string| parse_file_success_common(string, options) }
+    end
+
+    # Mirror the Prism.parse_failure? API by using the serialization API.
+    def parse_failure?(code, **options)
+      !parse_success?(code, **options)
+    end
+
+    # Mirror the Prism.parse_file_success? API by using the serialization API.
+    def parse_file_success?(filepath, **options)
+      options[:filepath] = filepath
+      LibRubyParser::PrismString.with_file(filepath) { |string| parse_file_success_common(string, options) }
+    end
+
+    # Mirror the Prism.parse_file_failure? API by using the serialization API.
+    def parse_file_failure?(filepath, **options)
+      !parse_file_success?(filepath, **options)
+    end
+
+    # Mirror the Prism.profile API by using the serialization API.
+    def profile(source, **options)
+      LibRubyParser::PrismString.with_string(source) do |string|
+        LibRubyParser::PrismBuffer.with do |buffer|
+          LibRubyParser.pm_serialize_parse(buffer.pointer, string.pointer, string.length, dump_options(options))
+          nil
+        end
+      end
+    end
+
+    # Mirror the Prism.profile_file API by using the serialization API.
+    def profile_file(filepath, **options)
+      LibRubyParser::PrismString.with_file(filepath) do |string|
+        LibRubyParser::PrismBuffer.with do |buffer|
+          options[:filepath] = filepath
+          LibRubyParser.pm_serialize_parse(buffer.pointer, string.pointer, string.length, dump_options(options))
+          nil
+        end
+      end
+    end
+
+    private
+
+    def dump_common(string, options) # :nodoc:
+      LibRubyParser::PrismBuffer.with do |buffer|
+        LibRubyParser.pm_serialize_parse(buffer.pointer, string.pointer, string.length, dump_options(options))
+
+        dumped = buffer.read
+        dumped.freeze if options.fetch(:freeze, false)
+
+        dumped
+      end
+    end
+
+    def lex_common(string, code, options) # :nodoc:
+      LibRubyParser::PrismBuffer.with do |buffer|
+        LibRubyParser.pm_serialize_lex(buffer.pointer, string.pointer, string.length, dump_options(options))
+        Serialize.load_lex(code, buffer.read, options.fetch(:freeze, false))
+      end
+    end
+
+    def parse_common(string, code, options) # :nodoc:
+      serialized = dump_common(string, options)
+      Serialize.load_parse(code, serialized, options.fetch(:freeze, false))
+    end
+
+    def parse_comments_common(string, code, options) # :nodoc:
+      LibRubyParser::PrismBuffer.with do |buffer|
+        LibRubyParser.pm_serialize_parse_comments(buffer.pointer, string.pointer, string.length, dump_options(options))
+        Serialize.load_parse_comments(code, buffer.read, options.fetch(:freeze, false))
+      end
+    end
+
+    def parse_lex_common(string, code, options) # :nodoc:
+      LibRubyParser::PrismBuffer.with do |buffer|
+        LibRubyParser.pm_serialize_parse_lex(buffer.pointer, string.pointer, string.length, dump_options(options))
+        Serialize.load_parse_lex(code, buffer.read, options.fetch(:freeze, false))
+      end
+    end
+
+    def parse_file_success_common(string, options) # :nodoc:
+      LibRubyParser.pm_parse_success_p(string.pointer, string.length, dump_options(options))
+    end
+
+    # Return the value that should be dumped for the command_line option.
+    def dump_options_command_line(options)
+      command_line = options.fetch(:command_line, "")
+      raise ArgumentError, "command_line must be a string" unless command_line.is_a?(String)
+
+      command_line.each_char.inject(0) do |value, char|
+        case char
+        when "a" then value | 0b000001
+        when "e" then value | 0b000010
+        when "l" then value | 0b000100
+        when "n" then value | 0b001000
+        when "p" then value | 0b010000
+        when "x" then value | 0b100000
+        else raise ArgumentError, "invalid command_line option: #{char}"
+        end
+      end
+    end
+
+    # Return the value that should be dumped for the version option.
+    def dump_options_version(version)
+      case version
+      when nil, "latest"
+        0
+      when /\A3\.3(\.\d+)?\z/
+        1
+      when /\A3\.4(\.\d+)?\z/
+        2
+      when /\A3\.5(\.\d+)?\z/
+        0
+      else
+        raise ArgumentError, "invalid version: #{version}"
+      end
+    end
+
+    # Convert the given options into a serialized options string.
+    def dump_options(options)
+      template = +""
+      values = []
+
+      template << "L"
+      if (filepath = options[:filepath])
+        values.push(filepath.bytesize, filepath.b)
+        template << "A*"
+      else
+        values << 0
+      end
+
+      template << "l"
+      values << options.fetch(:line, 1)
+
+      template << "L"
+      if (encoding = options[:encoding])
+        name = encoding.is_a?(Encoding) ? encoding.name : encoding
+        values.push(name.bytesize, name.b)
+        template << "A*"
+      else
+        values << 0
+      end
+
+      template << "C"
+      values << (options.fetch(:frozen_string_literal, false) ? 1 : 0)
+
+      template << "C"
+      values << dump_options_command_line(options)
+
+      template << "C"
+      values << dump_options_version(options[:version])
+
+      template << "C"
+      values << (options[:encoding] == false ? 1 : 0)
+
+      template << "C"
+      values << (options.fetch(:main_script, false) ? 1 : 0)
+
+      template << "C"
+      values << (options.fetch(:partial_script, false) ? 1 : 0)
+
+      template << "C"
+      values << (options.fetch(:freeze, false) ? 1 : 0)
+
+      template << "L"
+      if (scopes = options[:scopes])
+        values << scopes.length
+
+        scopes.each do |scope|
+          locals = nil
+          forwarding = 0
+
+          case scope
+          when Array
+            locals = scope
+          when Scope
+            locals = scope.locals
+
+            scope.forwarding.each do |forward|
+              case forward
+              when :*     then forwarding |= 0x1
+              when :**    then forwarding |= 0x2
+              when :&     then forwarding |= 0x4
+              when :"..." then forwarding |= 0x8
+              else raise ArgumentError, "invalid forwarding value: #{forward}"
+              end
+            end
+          else
+            raise TypeError, "wrong argument type #{scope.class.inspect} (expected Array or Prism::Scope)"
+          end
+
+          template << "L"
+          values << locals.length
+
+          template << "C"
+          values << forwarding
+
+          locals.each do |local|
+            name = local.name
+            template << "L"
+            values << name.bytesize
+
+            template << "A*"
+            values << name.b
+          end
+        end
+      else
+        values << 0
+      end
+
+      values.pack(template)
+    end
+  end
+
+  # Here we are going to patch StringQuery to put in the class-level methods so
+  # that it can maintain a consistent interface
+  class StringQuery
+    class << self
+      # Mirrors the C extension's StringQuery::local? method.
+      def local?(string)
+        query(LibRubyParser.pm_string_query_local(string, string.bytesize, string.encoding.name))
+      end
+
+      # Mirrors the C extension's StringQuery::constant? method.
+      def constant?(string)
+        query(LibRubyParser.pm_string_query_constant(string, string.bytesize, string.encoding.name))
+      end
+
+      # Mirrors the C extension's StringQuery::method_name? method.
+      def method_name?(string)
+        query(LibRubyParser.pm_string_query_method_name(string, string.bytesize, string.encoding.name))
+      end
+
+      private
+
+      # Parse the enum result and return an appropriate boolean.
+      def query(result)
+        case result
+        when :PM_STRING_QUERY_ERROR
+          raise ArgumentError, "Invalid or non ascii-compatible encoding"
+        when :PM_STRING_QUERY_FALSE
+          false
+        when :PM_STRING_QUERY_TRUE
+          true
+        end
+      end
+    end
+  end
+end
diff --git a/lib/yarp/lex_compat.rb b/lib/prism/lex_compat.rb
similarity index 80%
rename from lib/yarp/lex_compat.rb
rename to lib/prism/lex_compat.rb
index 37bfecd0bca934..9b3f025ab6a5b4 100644
--- a/lib/yarp/lex_compat.rb
+++ b/lib/prism/lex_compat.rb
@@ -1,15 +1,34 @@
 # frozen_string_literal: true
+# :markup: markdown
 
 require "delegate"
+require "ripper"
 
-module YARP
-  # This class is responsible for lexing the source using YARP and then
+module Prism
+  # This class is responsible for lexing the source using prism and then
   # converting those tokens to be compatible with Ripper. In the vast majority
   # of cases, this is a one-to-one mapping of the token type. Everything else
   # generally lines up. However, there are a few cases that require special
   # handling.
-  class LexCompat
-    # This is a mapping of YARP token types to Ripper token types. This is a
+  class LexCompat # :nodoc:
+    # A result class specialized for holding tokens produced by the lexer.
+    class Result < Prism::Result
+      # The list of tokens that were produced by the lexer.
+      attr_reader :value
+
+      # Create a new lex compat result object with the given values.
+      def initialize(value, comments, magic_comments, data_loc, errors, warnings, source)
+        @value = value
+        super(comments, magic_comments, data_loc, errors, warnings, source)
+      end
+
+      # Implement the hash pattern matching interface for Result.
+      def deconstruct_keys(keys)
+        super.merge!(value: value)
+      end
+    end
+
+    # This is a mapping of prism token types to Ripper token types. This is a
     # many-to-one mapping because we split up our token types, whereas Ripper
     # tends to group them.
     RIPPER = {
@@ -128,6 +147,7 @@ class LexCompat
       LESS_EQUAL_GREATER: :on_op,
       LESS_LESS: :on_op,
       LESS_LESS_EQUAL: :on_op,
+      METHOD_NAME: :on_ident,
       MINUS: :on_op,
       MINUS_EQUAL: :on_op,
       MINUS_GREATER: :on_tlambda,
@@ -183,18 +203,24 @@ class LexCompat
     # However, we add a couple of convenience methods onto them to make them a
     # little easier to work with. We delegate all other methods to the array.
     class Token < SimpleDelegator
+      # @dynamic initialize, each, []
+
+      # The location of the token in the source.
       def location
         self[0]
       end
 
+      # The type of the token.
       def event
         self[1]
       end
 
+      # The slice of the source that this token represents.
       def value
         self[2]
       end
 
+      # The state of the lexer when this token was produced.
       def state
         self[3]
       end
@@ -203,7 +229,7 @@ def state
     # Ripper doesn't include the rest of the token in the event, so we need to
     # trim it down to just the content on the first line when comparing.
     class EndContentToken < Token
-      def ==(other)
+      def ==(other) # :nodoc:
         [self[0], self[1], self[2][0..self[2].index("\n")], self[3]] == other
       end
     end
@@ -211,7 +237,7 @@ def ==(other)
     # Tokens where state should be ignored
     # used for :on_comment, :on_heredoc_end, :on_embexpr_end
     class IgnoreStateToken < Token
-      def ==(other)
+      def ==(other) # :nodoc:
         self[0...-1] == other[0...-1]
       end
     end
@@ -221,7 +247,7 @@ def ==(other)
     # through named captures in regular expressions). In that case we don't
     # compare the state.
     class IdentToken < Token
-      def ==(other)
+      def ==(other) # :nodoc:
         (self[0...-1] == other[0...-1]) && (
           (other[3] == Ripper::EXPR_LABEL | Ripper::EXPR_END) ||
           (other[3] & Ripper::EXPR_ARG_ANY != 0)
@@ -232,13 +258,13 @@ def ==(other)
     # Ignored newlines can occasionally have a LABEL state attached to them, so
     # we compare the state differently here.
     class IgnoredNewlineToken < Token
-      def ==(other)
+      def ==(other) # :nodoc:
         return false unless self[0...-1] == other[0...-1]
 
-        if self[4] == Ripper::EXPR_ARG | Ripper::EXPR_LABELED
-          other[4] & Ripper::EXPR_ARG | Ripper::EXPR_LABELED > 0
+        if self[3] == Ripper::EXPR_ARG | Ripper::EXPR_LABELED
+          other[3] & Ripper::EXPR_ARG | Ripper::EXPR_LABELED != 0
         else
-          self[4] == other[4]
+          self[3] == other[3]
         end
       end
     end
@@ -252,7 +278,7 @@ def ==(other)
     # more accurately, so we need to allow comparing against both END and
     # END|LABEL.
     class ParamToken < Token
-      def ==(other)
+      def ==(other) # :nodoc:
         (self[0...-1] == other[0...-1]) && (
           (other[3] == Ripper::EXPR_END) ||
           (other[3] == Ripper::EXPR_END | Ripper::EXPR_LABEL)
@@ -263,12 +289,12 @@ def ==(other)
     # A heredoc in this case is a list of tokens that belong to the body of the
     # heredoc that should be appended onto the list of tokens when the heredoc
     # closes.
-    module Heredoc
+    module Heredoc # :nodoc:
       # Heredocs that are no dash or tilde heredocs are just a list of tokens.
       # We need to keep them around so that we can insert them in the correct
       # order back into the token stream and set the state of the last token to
       # the state that the heredoc was opened in.
-      class PlainHeredoc
+      class PlainHeredoc # :nodoc:
         attr_reader :tokens
 
         def initialize
@@ -287,7 +313,7 @@ def to_a
       # Dash heredocs are a little more complicated. They are a list of tokens
       # that need to be split on "\\\n" to mimic Ripper's behavior. We also need
       # to keep track of the state that the heredoc was opened in.
-      class DashHeredoc
+      class DashHeredoc # :nodoc:
         attr_reader :split, :tokens
 
         def initialize(split)
@@ -302,7 +328,7 @@ def <<(token)
         def to_a
           embexpr_balance = 0
 
-          tokens.each_with_object([]) do |token, results|
+          tokens.each_with_object([]) do |token, results| #$ Array[Token]
             case token.event
             when :on_embexpr_beg
               embexpr_balance += 1
@@ -338,15 +364,15 @@ def to_a
 
       # Heredocs that are dedenting heredocs are a little more complicated.
       # Ripper outputs on_ignored_sp tokens for the whitespace that is being
-      # removed from the output. YARP only modifies the node itself and keeps
-      # the token the same. This simplifies YARP, but makes comparing against
+      # removed from the output. prism only modifies the node itself and keeps
+      # the token the same. This simplifies prism, but makes comparing against
       # Ripper much harder because there is a length mismatch.
       #
       # Fortunately, we already have to pull out the heredoc tokens in order to
       # insert them into the stream in the correct order. As such, we can do
       # some extra manipulation on the tokens to make them match Ripper's
       # output by mirroring the dedent logic that Ripper uses.
-      class DedentingHeredoc
+      class DedentingHeredoc # :nodoc:
         TAB_WIDTH = 8
 
         attr_reader :tokens, :dedent_next, :dedent, :embexpr_balance
@@ -356,6 +382,7 @@ def initialize
           @dedent_next = true
           @dedent = nil
           @embexpr_balance = 0
+          @ended_on_newline = false
         end
 
         # As tokens are coming in, we track the minimum amount of common leading
@@ -365,14 +392,14 @@ def <<(token)
           case token.event
           when :on_embexpr_beg, :on_heredoc_beg
             @embexpr_balance += 1
+            @dedent = 0 if @dedent_next && @ended_on_newline
           when :on_embexpr_end, :on_heredoc_end
             @embexpr_balance -= 1
           when :on_tstring_content
             if embexpr_balance == 0
-              token.value.split(/(?<=\n)/).each_with_index do |line, index|
-                next if line.strip.empty? && line.end_with?("\n")
-                next if !(dedent_next || index > 0)
+              line = token.value
 
+              if dedent_next && !(line.strip.empty? && line.end_with?("\n"))
                 leading = line[/\A(\s*)\n?/, 1]
                 next_dedent = 0
 
@@ -385,11 +412,16 @@ def <<(token)
                 end
 
                 @dedent = [dedent, next_dedent].compact.min
+                @dedent_next = true
+                @ended_on_newline = line.end_with?("\n")
+                tokens << token
+                return
               end
             end
           end
 
           @dedent_next = token.event == :on_tstring_content && embexpr_balance == 0
+          @ended_on_newline = false
           tokens << token
         end
 
@@ -397,7 +429,7 @@ def to_a
           # If every line in the heredoc is blank, we still need to split up the
           # string content token into multiple tokens.
           if dedent.nil?
-            results = []
+            results = [] #: Array[Token]
             embexpr_balance = 0
 
             tokens.each do |token|
@@ -429,11 +461,43 @@ def to_a
             return results
           end
 
+          # If the minimum common whitespace is 0, then we need to concatenate
+          # string nodes together that are immediately adjacent.
+          if dedent == 0
+            results = [] #: Array[Token]
+            embexpr_balance = 0
+
+            index = 0
+            max_index = tokens.length
+
+            while index < max_index
+              token = tokens[index]
+              results << token
+              index += 1
+
+              case token.event
+              when :on_embexpr_beg, :on_heredoc_beg
+                embexpr_balance += 1
+              when :on_embexpr_end, :on_heredoc_end
+                embexpr_balance -= 1
+              when :on_tstring_content
+                if embexpr_balance == 0
+                  while index < max_index && tokens[index].event == :on_tstring_content && !token.value.match?(/\\\r?\n\z/)
+                    token.value << tokens[index].value
+                    index += 1
+                  end
+                end
+              end
+            end
+
+            return results
+          end
+
           # Otherwise, we're going to run through each token in the list and
           # insert on_ignored_sp tokens for the amount of dedent that we need to
           # perform. We also need to remove the dedent from the beginning of
           # each line of plain string content tokens.
-          results = []
+          results = [] #: Array[Token]
           dedent_next = true
           embexpr_balance = 0
 
@@ -482,7 +546,7 @@ def to_a
                   # dedent from the beginning of the line.
                   if (dedent > 0) && (dedent_next || index > 0)
                     deleting = 0
-                    deleted_chars = []
+                    deleted_chars = [] #: Array[String]
 
                     # Gather up all of the characters that we're going to
                     # delete, stopping when you hit a character that would put
@@ -490,7 +554,7 @@ def to_a
                     line.each_char.with_index do |char, i|
                       case char
                       when "\r"
-                        if line.chars[i + 1] == "\n"
+                        if line[i + 1] == "\n"
                           break
                         end
                       when "\n"
@@ -549,22 +613,25 @@ def self.build(opening)
       end
     end
 
-    attr_reader :source, :filepath
+    private_constant :Heredoc
 
-    def initialize(source, filepath = "")
+    attr_reader :source, :options
+
+    def initialize(source, **options)
       @source = source
-      @filepath = filepath || ""
+      @options = options
     end
 
     def result
-      tokens = []
+      tokens = [] #: Array[LexCompat::Token]
 
       state = :default
-      heredoc_stack = [[]]
+      heredoc_stack = [[]] #: Array[Array[Heredoc::PlainHeredoc | Heredoc::DashHeredoc | Heredoc::DedentingHeredoc]]
 
-      result = YARP.lex(source, @filepath)
+      result = Prism.lex(source, **options)
       result_value = result.value
-      previous_state = nil
+      previous_state = nil #: Ripper::Lexer::State?
+      last_heredoc_end = nil #: Integer?
 
       # In previous versions of Ruby, Ripper wouldn't flush the bom before the
       # first token, so we had to have a hack in place to account for that. This
@@ -619,6 +686,7 @@ def result
           when :on_heredoc_end
             # Heredoc end tokens can be emitted in an odd order, so we don't
             # want to bother comparing the state on them.
+            last_heredoc_end = token.location.end_offset
             IgnoreStateToken.new([[lineno, column], event, value, lex_state])
           when :on_ident
             if lex_state == Ripper::EXPR_END
@@ -649,7 +717,7 @@ def result
             IgnoredNewlineToken.new([[lineno, column], event, value, lex_state])
           when :on_regexp_end
             # On regex end, Ripper scans and then sets end state, so the ripper
-            # lexed output is begin, when it should be end. YARP sets lex state
+            # lexed output is begin, when it should be end. prism sets lex state
             # correctly to end state, but we want to be able to compare against
             # Ripper's lexed state. So here, if it's a regexp end token, we
             # output the state as the previous state, solely for the sake of
@@ -684,16 +752,24 @@ def result
             # comment and there is still whitespace after the comment, then
             # Ripper will append a on_nl token (even though there isn't
             # necessarily a newline). We mirror that here.
-            start_offset = previous_token.location.end_offset
-            end_offset = token.location.start_offset
+            if previous_token.type == :COMMENT
+              # If the comment is at the start of a heredoc: <<HEREDOC # comment
+              # then the comment's end_offset is up near the heredoc_beg.
+              # This is not the correct offset to use for figuring out if
+              # there is trailing whitespace after the last token.
+              # Use the greater offset of the two to determine the start of
+              # the trailing whitespace.
+              start_offset = [previous_token.location.end_offset, last_heredoc_end].compact.max
+              end_offset = token.location.start_offset
+
+              if start_offset < end_offset
+                if bom
+                  start_offset += 3
+                  end_offset += 3
+                end
 
-            if previous_token.type == :COMMENT && start_offset < end_offset
-              if bom
-                start_offset += 3
-                end_offset += 3
+                tokens << Token.new([[lineno, 0], :on_nl, source.byteslice(start_offset...end_offset), lex_state])
               end
-
-              tokens << Token.new([[lineno, 0], :on_nl, source.byteslice(start_offset...end_offset), lex_state])
             end
 
             Token.new([[lineno, column], event, value, lex_state])
@@ -705,7 +781,7 @@ def result
 
         # The order in which tokens appear in our lexer is different from the
         # order that they appear in Ripper. When we hit the declaration of a
-        # heredoc in YARP, we skip forward and lex the rest of the content of
+        # heredoc in prism, we skip forward and lex the rest of the content of
         # the heredoc before going back and lexing at the end of the heredoc
         # identifier.
         #
@@ -786,56 +862,67 @@ def result
       # We sort by location to compare against Ripper's output
       tokens.sort_by!(&:location)
 
-      if result_value.size - 1 > tokens.size
-        raise StandardError, "Lost tokens when performing lex_compat"
-      end
-
-      ParseResult.new(tokens, result.comments, result.errors, result.warnings, [])
+      Result.new(tokens, result.comments, result.magic_comments, result.data_loc, result.errors, result.warnings, Source.for(source))
     end
   end
 
-  # The constant that wraps the behavior of the lexer to match Ripper's output
-  # is an implementation detail, so we don't want it to be public.
   private_constant :LexCompat
 
-  # Returns an array of tokens that closely resembles that of the Ripper lexer.
-  # The only difference is that since we don't keep track of lexer state in the
-  # same way, it's going to always return the NONE state.
-  def self.lex_compat(source, filepath = "")
-    LexCompat.new(source, filepath).result
-  end
+  # This is a class that wraps the Ripper lexer to produce almost exactly the
+  # same tokens.
+  class LexRipper # :nodoc:
+    attr_reader :source
 
-  # This lexes with the Ripper lex. It drops any space events but otherwise
-  # returns the same tokens. Raises SyntaxError if the syntax in source is
-  # invalid.
-  def self.lex_ripper(source)
-    previous = []
-    results = []
-
-    Ripper.lex(source, raise_errors: true).each do |token|
-      case token[1]
-      when :on_sp
-        # skip
-      when :on_tstring_content
-        if previous[1] == :on_tstring_content && (token[2].start_with?("\#$") || token[2].start_with?("\#@"))
-          previous[2] << token[2]
-        else
-          results << token
-          previous = token
-        end
-      when :on_words_sep
-        if previous[1] == :on_words_sep
-          previous[2] << token[2]
+    def initialize(source)
+      @source = source
+    end
+
+    def result
+      previous = [] #: [[Integer, Integer], Symbol, String, untyped] | []
+      results = [] #: Array[[[Integer, Integer], Symbol, String, untyped]]
+
+      lex(source).each do |token|
+        case token[1]
+        when :on_sp
+          # skip
+        when :on_tstring_content
+          if previous[1] == :on_tstring_content && (token[2].start_with?("\#$") || token[2].start_with?("\#@"))
+            previous[2] << token[2]
+          else
+            results << token
+            previous = token
+          end
+        when :on_words_sep
+          if previous[1] == :on_words_sep
+            previous[2] << token[2]
+          else
+            results << token
+            previous = token
+          end
         else
           results << token
           previous = token
         end
-      else
-        results << token
-        previous = token
       end
+
+      results
     end
 
-    results
+    private
+
+    if Ripper.method(:lex).parameters.assoc(:keyrest)
+      def lex(source)
+        Ripper.lex(source, raise_errors: true)
+      end
+    else
+      def lex(source)
+        ripper = Ripper::Lexer.new(source)
+        ripper.lex.tap do |result|
+          raise SyntaxError, ripper.errors.map(&:message).join(' ;') if ripper.errors.any?
+        end
+      end
+    end
   end
+
+  private_constant :LexRipper
 end
diff --git a/lib/prism/node_ext.rb b/lib/prism/node_ext.rb
new file mode 100644
index 00000000000000..469e54ca0c7def
--- /dev/null
+++ b/lib/prism/node_ext.rb
@@ -0,0 +1,511 @@
+# frozen_string_literal: true
+# :markup: markdown
+
+#--
+# Here we are reopening the prism module to provide methods on nodes that aren't
+# templated and are meant as convenience methods.
+#++
+module Prism
+  class Node
+    def deprecated(*replacements) # :nodoc:
+      location = caller_locations(1, 1)
+      location = location[0].label if location
+      suggest = replacements.map { |replacement| "#{self.class}##{replacement}" }
+
+      warn(<<~MSG, uplevel: 1, category: :deprecated)
+        [deprecation]: #{self.class}##{location} is deprecated and will be \
+        removed in the next major version. Use #{suggest.join("/")} instead.
+        #{(caller(1, 3) || []).join("\n")}
+      MSG
+    end
+  end
+
+  module RegularExpressionOptions # :nodoc:
+    # Returns a numeric value that represents the flags that were used to create
+    # the regular expression.
+    def options
+      o = 0
+      o |= Regexp::IGNORECASE if flags.anybits?(RegularExpressionFlags::IGNORE_CASE)
+      o |= Regexp::EXTENDED if flags.anybits?(RegularExpressionFlags::EXTENDED)
+      o |= Regexp::MULTILINE if flags.anybits?(RegularExpressionFlags::MULTI_LINE)
+      o |= Regexp::FIXEDENCODING if flags.anybits?(RegularExpressionFlags::EUC_JP | RegularExpressionFlags::WINDOWS_31J | RegularExpressionFlags::UTF_8)
+      o |= Regexp::NOENCODING if flags.anybits?(RegularExpressionFlags::ASCII_8BIT)
+      o
+    end
+  end
+
+  class InterpolatedMatchLastLineNode < Node
+    include RegularExpressionOptions
+  end
+
+  class InterpolatedRegularExpressionNode < Node
+    include RegularExpressionOptions
+  end
+
+  class MatchLastLineNode < Node
+    include RegularExpressionOptions
+  end
+
+  class RegularExpressionNode < Node
+    include RegularExpressionOptions
+  end
+
+  private_constant :RegularExpressionOptions
+
+  module HeredocQuery # :nodoc:
+    # Returns true if this node was represented as a heredoc in the source code.
+    def heredoc?
+      opening&.start_with?("<<")
+    end
+  end
+
+  class InterpolatedStringNode < Node
+    include HeredocQuery
+  end
+
+  class InterpolatedXStringNode < Node
+    include HeredocQuery
+  end
+
+  class StringNode < Node
+    include HeredocQuery
+
+    # Occasionally it's helpful to treat a string as if it were interpolated so
+    # that there's a consistent interface for working with strings.
+    def to_interpolated
+      InterpolatedStringNode.new(
+        source,
+        -1,
+        location,
+        frozen? ? InterpolatedStringNodeFlags::FROZEN : 0,
+        opening_loc,
+        [copy(location: content_loc, opening_loc: nil, closing_loc: nil)],
+        closing_loc
+      )
+    end
+  end
+
+  class XStringNode < Node
+    include HeredocQuery
+
+    # Occasionally it's helpful to treat a string as if it were interpolated so
+    # that there's a consistent interface for working with strings.
+    def to_interpolated
+      InterpolatedXStringNode.new(
+        source,
+        -1,
+        location,
+        flags,
+        opening_loc,
+        [StringNode.new(source, node_id, content_loc, 0, nil, content_loc, nil, unescaped)],
+        closing_loc
+      )
+    end
+  end
+
+  private_constant :HeredocQuery
+
+  class ImaginaryNode < Node
+    # Returns the value of the node as a Ruby Complex.
+    def value
+      Complex(0, numeric.value)
+    end
+  end
+
+  class RationalNode < Node
+    # Returns the value of the node as a Ruby Rational.
+    def value
+      Rational(numerator, denominator)
+    end
+
+    # Returns the value of the node as an IntegerNode or a FloatNode. This
+    # method is deprecated in favor of #value or #numerator/#denominator.
+    def numeric
+      deprecated("value", "numerator", "denominator")
+
+      if denominator == 1
+        IntegerNode.new(source, -1, location.chop, flags, numerator)
+      else
+        FloatNode.new(source, -1, location.chop, 0, numerator.to_f / denominator)
+      end
+    end
+  end
+
+  class ConstantReadNode < Node
+    # Returns the list of parts for the full name of this constant.
+    # For example: [:Foo]
+    def full_name_parts
+      [name]
+    end
+
+    # Returns the full name of this constant. For example: "Foo"
+    def full_name
+      name.to_s
+    end
+  end
+
+  class ConstantWriteNode < Node
+    # Returns the list of parts for the full name of this constant.
+    # For example: [:Foo]
+    def full_name_parts
+      [name]
+    end
+
+    # Returns the full name of this constant. For example: "Foo"
+    def full_name
+      name.to_s
+    end
+  end
+
+  class ConstantPathNode < Node
+    # An error class raised when dynamic parts are found while computing a
+    # constant path's full name. For example:
+    # Foo::Bar::Baz -> does not raise because all parts of the constant path are
+    # simple constants
+    # var::Bar::Baz -> raises because the first part of the constant path is a
+    # local variable
+    class DynamicPartsInConstantPathError < StandardError; end
+
+    # An error class raised when missing nodes are found while computing a
+    # constant path's full name. For example:
+    # Foo:: -> raises because the constant path is missing the last part
+    class MissingNodesInConstantPathError < StandardError; end
+
+    # Returns the list of parts for the full name of this constant path.
+    # For example: [:Foo, :Bar]
+    def full_name_parts
+      parts = [] #: Array[Symbol]
+      current = self #: node?
+
+      while current.is_a?(ConstantPathNode)
+        name = current.name
+        if name.nil?
+          raise MissingNodesInConstantPathError, "Constant path contains missing nodes. Cannot compute full name"
+        end
+
+        parts.unshift(name)
+        current = current.parent
+      end
+
+      if !current.is_a?(ConstantReadNode) && !current.nil?
+        raise DynamicPartsInConstantPathError, "Constant path contains dynamic parts. Cannot compute full name"
+      end
+
+      parts.unshift(current&.name || :"")
+    end
+
+    # Returns the full name of this constant path. For example: "Foo::Bar"
+    def full_name
+      full_name_parts.join("::")
+    end
+
+    # Previously, we had a child node on this class that contained either a
+    # constant read or a missing node. To not cause a breaking change, we
+    # continue to supply that API.
+    def child
+      deprecated("name", "name_loc")
+
+      if name
+        ConstantReadNode.new(source, -1, name_loc, 0, name)
+      else
+        MissingNode.new(source, -1, location, 0)
+      end
+    end
+  end
+
+  class ConstantPathTargetNode < Node
+    # Returns the list of parts for the full name of this constant path.
+    # For example: [:Foo, :Bar]
+    def full_name_parts
+      parts =
+        case parent
+        when ConstantPathNode, ConstantReadNode
+          parent.full_name_parts
+        when nil
+          [:""]
+        else
+          # e.g. self::Foo, (var)::Bar = baz
+          raise ConstantPathNode::DynamicPartsInConstantPathError, "Constant target path contains dynamic parts. Cannot compute full name"
+        end
+
+      if name.nil?
+        raise ConstantPathNode::MissingNodesInConstantPathError, "Constant target path contains missing nodes. Cannot compute full name"
+      end
+
+      parts.push(name)
+    end
+
+    # Returns the full name of this constant path. For example: "Foo::Bar"
+    def full_name
+      full_name_parts.join("::")
+    end
+
+    # Previously, we had a child node on this class that contained either a
+    # constant read or a missing node. To not cause a breaking change, we
+    # continue to supply that API.
+    def child
+      deprecated("name", "name_loc")
+
+      if name
+        ConstantReadNode.new(source, -1, name_loc, 0, name)
+      else
+        MissingNode.new(source, -1, location, 0)
+      end
+    end
+  end
+
+  class ConstantTargetNode < Node
+    # Returns the list of parts for the full name of this constant.
+    # For example: [:Foo]
+    def full_name_parts
+      [name]
+    end
+
+    # Returns the full name of this constant. For example: "Foo"
+    def full_name
+      name.to_s
+    end
+  end
+
+  class ParametersNode < Node
+    # Mirrors the Method#parameters method.
+    def signature
+      names = [] #: Array[[Symbol, Symbol] | [Symbol]]
+
+      requireds.each do |param|
+        names << (param.is_a?(MultiTargetNode) ? [:req] : [:req, param.name])
+      end
+
+      optionals.each { |param| names << [:opt, param.name] }
+
+      if rest && rest.is_a?(RestParameterNode)
+        names << [:rest, rest.name || :*]
+      end
+
+      posts.each do |param|
+        case param
+        when MultiTargetNode
+          names << [:req]
+        when NoKeywordsParameterNode, KeywordRestParameterNode, ForwardingParameterNode
+          # Invalid syntax, e.g. "def f(**nil, ...)" moves the NoKeywordsParameterNode to posts
+          raise "Invalid syntax"
+        else
+          names << [:req, param.name]
+        end
+      end
+
+      # Regardless of the order in which the keywords were defined, the required
+      # keywords always come first followed by the optional keywords.
+      keyopt = [] #: Array[OptionalKeywordParameterNode]
+      keywords.each do |param|
+        if param.is_a?(OptionalKeywordParameterNode)
+          keyopt << param
+        else
+          names << [:keyreq, param.name]
+        end
+      end
+
+      keyopt.each { |param| names << [:key, param.name] }
+
+      case keyword_rest
+      when ForwardingParameterNode
+        names.concat([[:rest, :*], [:keyrest, :**], [:block, :&]])
+      when KeywordRestParameterNode
+        names << [:keyrest, keyword_rest.name || :**]
+      when NoKeywordsParameterNode
+        names << [:nokey]
+      end
+
+      names << [:block, block.name || :&] if block
+      names
+    end
+  end
+
+  class CallNode < Node
+    # When a call node has the attribute_write flag set, it means that the call
+    # is using the attribute write syntax. This is either a method call to []=
+    # or a method call to a method that ends with =. Either way, the = sign is
+    # present in the source.
+    #
+    # Prism returns the message_loc _without_ the = sign attached, because there
+    # can be any amount of space between the message and the = sign. However,
+    # sometimes you want the location of the full message including the inner
+    # space and the = sign. This method provides that.
+    def full_message_loc
+      attribute_write? ? message_loc&.adjoin("=") : message_loc
+    end
+  end
+
+  class CallOperatorWriteNode < Node
+    # Returns the binary operator used to modify the receiver. This method is
+    # deprecated in favor of #binary_operator.
+    def operator
+      deprecated("binary_operator")
+      binary_operator
+    end
+
+    # Returns the location of the binary operator used to modify the receiver.
+    # This method is deprecated in favor of #binary_operator_loc.
+    def operator_loc
+      deprecated("binary_operator_loc")
+      binary_operator_loc
+    end
+  end
+
+  class ClassVariableOperatorWriteNode < Node
+    # Returns the binary operator used to modify the receiver. This method is
+    # deprecated in favor of #binary_operator.
+    def operator
+      deprecated("binary_operator")
+      binary_operator
+    end
+
+    # Returns the location of the binary operator used to modify the receiver.
+    # This method is deprecated in favor of #binary_operator_loc.
+    def operator_loc
+      deprecated("binary_operator_loc")
+      binary_operator_loc
+    end
+  end
+
+  class ConstantOperatorWriteNode < Node
+    # Returns the binary operator used to modify the receiver. This method is
+    # deprecated in favor of #binary_operator.
+    def operator
+      deprecated("binary_operator")
+      binary_operator
+    end
+
+    # Returns the location of the binary operator used to modify the receiver.
+    # This method is deprecated in favor of #binary_operator_loc.
+    def operator_loc
+      deprecated("binary_operator_loc")
+      binary_operator_loc
+    end
+  end
+
+  class ConstantPathOperatorWriteNode < Node
+    # Returns the binary operator used to modify the receiver. This method is
+    # deprecated in favor of #binary_operator.
+    def operator
+      deprecated("binary_operator")
+      binary_operator
+    end
+
+    # Returns the location of the binary operator used to modify the receiver.
+    # This method is deprecated in favor of #binary_operator_loc.
+    def operator_loc
+      deprecated("binary_operator_loc")
+      binary_operator_loc
+    end
+  end
+
+  class GlobalVariableOperatorWriteNode < Node
+    # Returns the binary operator used to modify the receiver. This method is
+    # deprecated in favor of #binary_operator.
+    def operator
+      deprecated("binary_operator")
+      binary_operator
+    end
+
+    # Returns the location of the binary operator used to modify the receiver.
+    # This method is deprecated in favor of #binary_operator_loc.
+    def operator_loc
+      deprecated("binary_operator_loc")
+      binary_operator_loc
+    end
+  end
+
+  class IndexOperatorWriteNode < Node
+    # Returns the binary operator used to modify the receiver. This method is
+    # deprecated in favor of #binary_operator.
+    def operator
+      deprecated("binary_operator")
+      binary_operator
+    end
+
+    # Returns the location of the binary operator used to modify the receiver.
+    # This method is deprecated in favor of #binary_operator_loc.
+    def operator_loc
+      deprecated("binary_operator_loc")
+      binary_operator_loc
+    end
+  end
+
+  class InstanceVariableOperatorWriteNode < Node
+    # Returns the binary operator used to modify the receiver. This method is
+    # deprecated in favor of #binary_operator.
+    def operator
+      deprecated("binary_operator")
+      binary_operator
+    end
+
+    # Returns the location of the binary operator used to modify the receiver.
+    # This method is deprecated in favor of #binary_operator_loc.
+    def operator_loc
+      deprecated("binary_operator_loc")
+      binary_operator_loc
+    end
+  end
+
+  class LocalVariableOperatorWriteNode < Node
+    # Returns the binary operator used to modify the receiver. This method is
+    # deprecated in favor of #binary_operator.
+    def operator
+      deprecated("binary_operator")
+      binary_operator
+    end
+
+    # Returns the location of the binary operator used to modify the receiver.
+    # This method is deprecated in favor of #binary_operator_loc.
+    def operator_loc
+      deprecated("binary_operator_loc")
+      binary_operator_loc
+    end
+  end
+
+  class CaseMatchNode < Node
+    # Returns the else clause of the case match node. This method is deprecated
+    # in favor of #else_clause.
+    def consequent
+      deprecated("else_clause")
+      else_clause
+    end
+  end
+
+  class CaseNode < Node
+    # Returns the else clause of the case node. This method is deprecated in
+    # favor of #else_clause.
+    def consequent
+      deprecated("else_clause")
+      else_clause
+    end
+  end
+
+  class IfNode < Node
+    # Returns the subsequent if/elsif/else clause of the if node. This method is
+    # deprecated in favor of #subsequent.
+    def consequent
+      deprecated("subsequent")
+      subsequent
+    end
+  end
+
+  class RescueNode < Node
+    # Returns the subsequent rescue clause of the rescue node. This method is
+    # deprecated in favor of #subsequent.
+    def consequent
+      deprecated("subsequent")
+      subsequent
+    end
+  end
+
+  class UnlessNode < Node
+    # Returns the else clause of the unless node. This method is deprecated in
+    # favor of #else_clause.
+    def consequent
+      deprecated("else_clause")
+      else_clause
+    end
+  end
+end
diff --git a/lib/prism/pack.rb b/lib/prism/pack.rb
new file mode 100644
index 00000000000000..166c04c3c08af5
--- /dev/null
+++ b/lib/prism/pack.rb
@@ -0,0 +1,230 @@
+# frozen_string_literal: true
+# :markup: markdown
+# typed: ignore
+
+#
+module Prism
+  # A parser for the pack template language.
+  module Pack
+    %i[
+      SPACE
+      COMMENT
+      INTEGER
+      UTF8
+      BER
+      FLOAT
+      STRING_SPACE_PADDED
+      STRING_NULL_PADDED
+      STRING_NULL_TERMINATED
+      STRING_MSB
+      STRING_LSB
+      STRING_HEX_HIGH
+      STRING_HEX_LOW
+      STRING_UU
+      STRING_MIME
+      STRING_BASE64
+      STRING_FIXED
+      STRING_POINTER
+      MOVE
+      BACK
+      NULL
+
+      UNSIGNED
+      SIGNED
+      SIGNED_NA
+
+      AGNOSTIC_ENDIAN
+      LITTLE_ENDIAN
+      BIG_ENDIAN
+      NATIVE_ENDIAN
+      ENDIAN_NA
+
+      SIZE_SHORT
+      SIZE_INT
+      SIZE_LONG
+      SIZE_LONG_LONG
+      SIZE_8
+      SIZE_16
+      SIZE_32
+      SIZE_64
+      SIZE_P
+      SIZE_NA
+
+      LENGTH_FIXED
+      LENGTH_MAX
+      LENGTH_RELATIVE
+      LENGTH_NA
+    ].each do |const|
+      const_set(const, const)
+    end
+
+    # A directive in the pack template language.
+    class Directive
+      # A symbol representing the version of Ruby.
+      attr_reader :version
+
+      # A symbol representing whether or not we are packing or unpacking.
+      attr_reader :variant
+
+      # A byteslice of the source string that this directive represents.
+      attr_reader :source
+
+      # The type of the directive.
+      attr_reader :type
+
+      # The type of signedness of the directive.
+      attr_reader :signed
+
+      # The type of endianness of the directive.
+      attr_reader :endian
+
+      # The size of the directive.
+      attr_reader :size
+
+      # The length type of this directive (used for integers).
+      attr_reader :length_type
+
+      # The length of this directive (used for integers).
+      attr_reader :length
+
+      # Initialize a new directive with the given values.
+      def initialize(version, variant, source, type, signed, endian, size, length_type, length)
+        @version = version
+        @variant = variant
+        @source = source
+        @type = type
+        @signed = signed
+        @endian = endian
+        @size = size
+        @length_type = length_type
+        @length = length
+      end
+
+      # The descriptions of the various types of endianness.
+      ENDIAN_DESCRIPTIONS = {
+        AGNOSTIC_ENDIAN: "agnostic",
+        LITTLE_ENDIAN: "little-endian (VAX)",
+        BIG_ENDIAN: "big-endian (network)",
+        NATIVE_ENDIAN: "native-endian",
+        ENDIAN_NA: "n/a"
+      }
+
+      # The descriptions of the various types of signedness.
+      SIGNED_DESCRIPTIONS = {
+        UNSIGNED: "unsigned",
+        SIGNED: "signed",
+        SIGNED_NA: "n/a"
+      }
+
+      # The descriptions of the various types of sizes.
+      SIZE_DESCRIPTIONS = {
+        SIZE_SHORT: "short",
+        SIZE_INT: "int-width",
+        SIZE_LONG: "long",
+        SIZE_LONG_LONG: "long long",
+        SIZE_8: "8-bit",
+        SIZE_16: "16-bit",
+        SIZE_32: "32-bit",
+        SIZE_64: "64-bit",
+        SIZE_P: "pointer-width"
+      }
+
+      # Provide a human-readable description of the directive.
+      def describe
+        case type
+        when SPACE
+          "whitespace"
+        when COMMENT
+          "comment"
+        when INTEGER
+          if size == SIZE_8
+            base = "#{SIGNED_DESCRIPTIONS[signed]} #{SIZE_DESCRIPTIONS[size]} integer"
+          else
+            base = "#{SIGNED_DESCRIPTIONS[signed]} #{SIZE_DESCRIPTIONS[size]} #{ENDIAN_DESCRIPTIONS[endian]} integer"
+          end
+          case length_type
+          when LENGTH_FIXED
+            if length > 1
+              base + ", x#{length}"
+            else
+              base
+            end
+          when LENGTH_MAX
+            base + ", as many as possible"
+          else
+            raise
+          end
+        when UTF8
+          "UTF-8 character"
+        when BER
+          "BER-compressed integer"
+        when FLOAT
+          "#{SIZE_DESCRIPTIONS[size]} #{ENDIAN_DESCRIPTIONS[endian]} float"
+        when STRING_SPACE_PADDED
+          "arbitrary binary string (space padded)"
+        when STRING_NULL_PADDED
+          "arbitrary binary string (null padded, count is width)"
+        when STRING_NULL_TERMINATED
+          "arbitrary binary string (null padded, count is width), except that null is added with *"
+        when STRING_MSB
+          "bit string (MSB first)"
+        when STRING_LSB
+          "bit string (LSB first)"
+        when STRING_HEX_HIGH
+          "hex string (high nibble first)"
+        when STRING_HEX_LOW
+          "hex string (low nibble first)"
+        when STRING_UU
+          "UU-encoded string"
+        when STRING_MIME
+          "quoted printable, MIME encoding"
+        when STRING_BASE64
+          "base64 encoded string"
+        when STRING_FIXED
+          "pointer to a structure (fixed-length string)"
+        when STRING_POINTER
+          "pointer to a null-terminated string"
+        when MOVE
+          "move to absolute position"
+        when BACK
+          "back up a byte"
+        when NULL
+          "null byte"
+        else
+          raise
+        end
+      end
+    end
+
+    # The result of parsing a pack template.
+    class Format
+      # A list of the directives in the template.
+      attr_reader :directives
+
+      # The encoding of the template.
+      attr_reader :encoding
+
+      # Create a new Format with the given directives and encoding.
+      def initialize(directives, encoding)
+        @directives = directives
+        @encoding = encoding
+      end
+
+      # Provide a human-readable description of the format.
+      def describe
+        source_width = directives.map { |d| d.source.inspect.length }.max
+        directive_lines = directives.map do |directive|
+          if directive.type == SPACE
+            source = directive.source.inspect
+          else
+            source = directive.source
+          end
+          # @type var source_width: Integer
+          "  #{source.ljust(source_width)}  #{directive.describe}"
+        end
+
+        (["Directives:"] + directive_lines + ["Encoding:", "  #{encoding}"]).join("\n")
+      end
+    end
+  end
+end
diff --git a/lib/prism/parse_result.rb b/lib/prism/parse_result.rb
new file mode 100644
index 00000000000000..05c14e33f5c99e
--- /dev/null
+++ b/lib/prism/parse_result.rb
@@ -0,0 +1,911 @@
+# frozen_string_literal: true
+# :markup: markdown
+
+module Prism
+  # This represents a source of Ruby code that has been parsed. It is used in
+  # conjunction with locations to allow them to resolve line numbers and source
+  # ranges.
+  class Source
+    # Create a new source object with the given source code. This method should
+    # be used instead of `new` and it will return either a `Source` or a
+    # specialized and more performant `ASCIISource` if no multibyte characters
+    # are present in the source code.
+    def self.for(source, start_line = 1, offsets = [])
+      if source.ascii_only?
+        ASCIISource.new(source, start_line, offsets)
+      elsif source.encoding == Encoding::BINARY
+        source.force_encoding(Encoding::UTF_8)
+
+        if source.valid_encoding?
+          new(source, start_line, offsets)
+        else
+          # This is an extremely niche use case where the file is marked as
+          # binary, contains multi-byte characters, and those characters are not
+          # valid UTF-8. In this case we'll mark it as binary and fall back to
+          # treating everything as a single-byte character. This _may_ cause
+          # problems when asking for code units, but it appears to be the
+          # cleanest solution at the moment.
+          source.force_encoding(Encoding::BINARY)
+          ASCIISource.new(source, start_line, offsets)
+        end
+      else
+        new(source, start_line, offsets)
+      end
+    end
+
+    # The source code that this source object represents.
+    attr_reader :source
+
+    # The line number where this source starts.
+    attr_reader :start_line
+
+    # The list of newline byte offsets in the source code.
+    attr_reader :offsets
+
+    # Create a new source object with the given source code.
+    def initialize(source, start_line = 1, offsets = [])
+      @source = source
+      @start_line = start_line # set after parsing is done
+      @offsets = offsets # set after parsing is done
+    end
+
+    # Replace the value of start_line with the given value.
+    def replace_start_line(start_line)
+      @start_line = start_line
+    end
+
+    # Replace the value of offsets with the given value.
+    def replace_offsets(offsets)
+      @offsets.replace(offsets)
+    end
+
+    # Returns the encoding of the source code, which is set by parameters to the
+    # parser or by the encoding magic comment.
+    def encoding
+      source.encoding
+    end
+
+    # Returns the lines of the source code as an array of strings.
+    def lines
+      source.lines
+    end
+
+    # Perform a byteslice on the source code using the given byte offset and
+    # byte length.
+    def slice(byte_offset, length)
+      source.byteslice(byte_offset, length) or raise
+    end
+
+    # Binary search through the offsets to find the line number for the given
+    # byte offset.
+    def line(byte_offset)
+      start_line + find_line(byte_offset)
+    end
+
+    # Return the byte offset of the start of the line corresponding to the given
+    # byte offset.
+    def line_start(byte_offset)
+      offsets[find_line(byte_offset)]
+    end
+
+    # Returns the byte offset of the end of the line corresponding to the given
+    # byte offset.
+    def line_end(byte_offset)
+      offsets[find_line(byte_offset) + 1] || source.bytesize
+    end
+
+    # Return the column number for the given byte offset.
+    def column(byte_offset)
+      byte_offset - line_start(byte_offset)
+    end
+
+    # Return the character offset for the given byte offset.
+    def character_offset(byte_offset)
+      (source.byteslice(0, byte_offset) or raise).length
+    end
+
+    # Return the column number in characters for the given byte offset.
+    def character_column(byte_offset)
+      character_offset(byte_offset) - character_offset(line_start(byte_offset))
+    end
+
+    # Returns the offset from the start of the file for the given byte offset
+    # counting in code units for the given encoding.
+    #
+    # This method is tested with UTF-8, UTF-16, and UTF-32. If there is the
+    # concept of code units that differs from the number of characters in other
+    # encodings, it is not captured here.
+    #
+    # We purposefully replace invalid and undefined characters with replacement
+    # characters in this conversion. This happens for two reasons. First, it's
+    # possible that the given byte offset will not occur on a character
+    # boundary. Second, it's possible that the source code will contain a
+    # character that has no equivalent in the given encoding.
+    def code_units_offset(byte_offset, encoding)
+      byteslice = (source.byteslice(0, byte_offset) or raise).encode(encoding, invalid: :replace, undef: :replace)
+
+      if encoding == Encoding::UTF_16LE || encoding == Encoding::UTF_16BE
+        byteslice.bytesize / 2
+      else
+        byteslice.length
+      end
+    end
+
+    # Generate a cache that targets a specific encoding for calculating code
+    # unit offsets.
+    def code_units_cache(encoding)
+      CodeUnitsCache.new(source, encoding)
+    end
+
+    # Returns the column number in code units for the given encoding for the
+    # given byte offset.
+    def code_units_column(byte_offset, encoding)
+      code_units_offset(byte_offset, encoding) - code_units_offset(line_start(byte_offset), encoding)
+    end
+
+    # Freeze this object and the objects it contains.
+    def deep_freeze
+      source.freeze
+      offsets.freeze
+      freeze
+    end
+
+    private
+
+    # Binary search through the offsets to find the line number for the given
+    # byte offset.
+    def find_line(byte_offset)
+      left = 0
+      right = offsets.length - 1
+
+      while left <= right
+        mid = left + (right - left) / 2
+        return mid if (offset = offsets[mid]) == byte_offset
+
+        if offset < byte_offset
+          left = mid + 1
+        else
+          right = mid - 1
+        end
+      end
+
+      left - 1
+    end
+  end
+
+  # A cache that can be used to quickly compute code unit offsets from byte
+  # offsets. It purposefully provides only a single #[] method to access the
+  # cache in order to minimize surface area.
+  #
+  # Note that there are some known issues here that may or may not be addressed
+  # in the future:
+  #
+  # * The first is that there are issues when the cache computes values that are
+  #   not on character boundaries. This can result in subsequent computations
+  #   being off by one or more code units.
+  # * The second is that this cache is currently unbounded. In theory we could
+  #   introduce some kind of LRU cache to limit the number of entries, but this
+  #   has not yet been implemented.
+  #
+  class CodeUnitsCache
+    class UTF16Counter # :nodoc:
+      def initialize(source, encoding)
+        @source = source
+        @encoding = encoding
+      end
+
+      def count(byte_offset, byte_length)
+        @source.byteslice(byte_offset, byte_length).encode(@encoding, invalid: :replace, undef: :replace).bytesize / 2
+      end
+    end
+
+    class LengthCounter # :nodoc:
+      def initialize(source, encoding)
+        @source = source
+        @encoding = encoding
+      end
+
+      def count(byte_offset, byte_length)
+        @source.byteslice(byte_offset, byte_length).encode(@encoding, invalid: :replace, undef: :replace).length
+      end
+    end
+
+    private_constant :UTF16Counter, :LengthCounter
+
+    # Initialize a new cache with the given source and encoding.
+    def initialize(source, encoding)
+      @source = source
+      @counter =
+        if encoding == Encoding::UTF_16LE || encoding == Encoding::UTF_16BE
+          UTF16Counter.new(source, encoding)
+        else
+          LengthCounter.new(source, encoding)
+        end
+
+      @cache = {} #: Hash[Integer, Integer]
+      @offsets = [] #: Array[Integer]
+    end
+
+    # Retrieve the code units offset from the given byte offset.
+    def [](byte_offset)
+      @cache[byte_offset] ||=
+        if (index = @offsets.bsearch_index { |offset| offset > byte_offset }).nil?
+          @offsets << byte_offset
+          @counter.count(0, byte_offset)
+        elsif index == 0
+          @offsets.unshift(byte_offset)
+          @counter.count(0, byte_offset)
+        else
+          @offsets.insert(index, byte_offset)
+          offset = @offsets[index - 1]
+          @cache[offset] + @counter.count(offset, byte_offset - offset)
+        end
+    end
+  end
+
+  # Specialized version of Prism::Source for source code that includes ASCII
+  # characters only. This class is used to apply performance optimizations that
+  # cannot be applied to sources that include multibyte characters.
+  #
+  # In the extremely rare case that a source includes multi-byte characters but
+  # is marked as binary because of a magic encoding comment and it cannot be
+  # eagerly converted to UTF-8, this class will be used as well. This is because
+  # at that point we will treat everything as single-byte characters.
+  class ASCIISource < Source
+    # Return the character offset for the given byte offset.
+    def character_offset(byte_offset)
+      byte_offset
+    end
+
+    # Return the column number in characters for the given byte offset.
+    def character_column(byte_offset)
+      byte_offset - line_start(byte_offset)
+    end
+
+    # Returns the offset from the start of the file for the given byte offset
+    # counting in code units for the given encoding.
+    #
+    # This method is tested with UTF-8, UTF-16, and UTF-32. If there is the
+    # concept of code units that differs from the number of characters in other
+    # encodings, it is not captured here.
+    def code_units_offset(byte_offset, encoding)
+      byte_offset
+    end
+
+    # Returns a cache that is the identity function in order to maintain the
+    # same interface. We can do this because code units are always equivalent to
+    # byte offsets for ASCII-only sources.
+    def code_units_cache(encoding)
+      ->(byte_offset) { byte_offset }
+    end
+
+    # Specialized version of `code_units_column` that does not depend on
+    # `code_units_offset`, which is a more expensive operation. This is
+    # essentially the same as `Prism::Source#column`.
+    def code_units_column(byte_offset, encoding)
+      byte_offset - line_start(byte_offset)
+    end
+  end
+
+  # This represents a location in the source.
+  class Location
+    # A Source object that is used to determine more information from the given
+    # offset and length.
+    attr_reader :source
+    protected :source
+
+    # The byte offset from the beginning of the source where this location
+    # starts.
+    attr_reader :start_offset
+
+    # The length of this location in bytes.
+    attr_reader :length
+
+    # Create a new location object with the given source, start byte offset, and
+    # byte length.
+    def initialize(source, start_offset, length)
+      @source = source
+      @start_offset = start_offset
+      @length = length
+
+      # These are used to store comments that are associated with this location.
+      # They are initialized to `nil` to save on memory when there are no
+      # comments to be attached and/or the comment-related APIs are not used.
+      @leading_comments = nil
+      @trailing_comments = nil
+    end
+
+    # These are the comments that are associated with this location that exist
+    # before the start of this location.
+    def leading_comments
+      @leading_comments ||= []
+    end
+
+    # Attach a comment to the leading comments of this location.
+    def leading_comment(comment)
+      leading_comments << comment
+    end
+
+    # These are the comments that are associated with this location that exist
+    # after the end of this location.
+    def trailing_comments
+      @trailing_comments ||= []
+    end
+
+    # Attach a comment to the trailing comments of this location.
+    def trailing_comment(comment)
+      trailing_comments << comment
+    end
+
+    # Returns all comments that are associated with this location (both leading
+    # and trailing comments).
+    def comments
+      [*@leading_comments, *@trailing_comments]
+    end
+
+    # Create a new location object with the given options.
+    def copy(source: self.source, start_offset: self.start_offset, length: self.length)
+      Location.new(source, start_offset, length)
+    end
+
+    # Returns a new location that is the result of chopping off the last byte.
+    def chop
+      copy(length: length == 0 ? length : length - 1)
+    end
+
+    # Returns a string representation of this location.
+    def inspect
+      "#<Prism::Location @start_offset=#{@start_offset} @length=#{@length} start_line=#{start_line}>"
+    end
+
+    # Returns all of the lines of the source code associated with this location.
+    def source_lines
+      source.lines
+    end
+
+    # The source code that this location represents.
+    def slice
+      source.slice(start_offset, length)
+    end
+
+    # The source code that this location represents starting from the beginning
+    # of the line that this location starts on to the end of the line that this
+    # location ends on.
+    def slice_lines
+      line_start = source.line_start(start_offset)
+      line_end = source.line_end(end_offset)
+      source.slice(line_start, line_end - line_start)
+    end
+
+    # The character offset from the beginning of the source where this location
+    # starts.
+    def start_character_offset
+      source.character_offset(start_offset)
+    end
+
+    # The offset from the start of the file in code units of the given encoding.
+    def start_code_units_offset(encoding = Encoding::UTF_16LE)
+      source.code_units_offset(start_offset, encoding)
+    end
+
+    # The start offset from the start of the file in code units using the given
+    # cache to fetch or calculate the value.
+    def cached_start_code_units_offset(cache)
+      cache[start_offset]
+    end
+
+    # The byte offset from the beginning of the source where this location ends.
+    def end_offset
+      start_offset + length
+    end
+
+    # The character offset from the beginning of the source where this location
+    # ends.
+    def end_character_offset
+      source.character_offset(end_offset)
+    end
+
+    # The offset from the start of the file in code units of the given encoding.
+    def end_code_units_offset(encoding = Encoding::UTF_16LE)
+      source.code_units_offset(end_offset, encoding)
+    end
+
+    # The end offset from the start of the file in code units using the given
+    # cache to fetch or calculate the value.
+    def cached_end_code_units_offset(cache)
+      cache[end_offset]
+    end
+
+    # The line number where this location starts.
+    def start_line
+      source.line(start_offset)
+    end
+
+    # The content of the line where this location starts before this location.
+    def start_line_slice
+      offset = source.line_start(start_offset)
+      source.slice(offset, start_offset - offset)
+    end
+
+    # The line number where this location ends.
+    def end_line
+      source.line(end_offset)
+    end
+
+    # The column number in bytes where this location starts from the start of
+    # the line.
+    def start_column
+      source.column(start_offset)
+    end
+
+    # The column number in characters where this location ends from the start of
+    # the line.
+    def start_character_column
+      source.character_column(start_offset)
+    end
+
+    # The column number in code units of the given encoding where this location
+    # starts from the start of the line.
+    def start_code_units_column(encoding = Encoding::UTF_16LE)
+      source.code_units_column(start_offset, encoding)
+    end
+
+    # The start column in code units using the given cache to fetch or calculate
+    # the value.
+    def cached_start_code_units_column(cache)
+      cache[start_offset] - cache[source.line_start(start_offset)]
+    end
+
+    # The column number in bytes where this location ends from the start of the
+    # line.
+    def end_column
+      source.column(end_offset)
+    end
+
+    # The column number in characters where this location ends from the start of
+    # the line.
+    def end_character_column
+      source.character_column(end_offset)
+    end
+
+    # The column number in code units of the given encoding where this location
+    # ends from the start of the line.
+    def end_code_units_column(encoding = Encoding::UTF_16LE)
+      source.code_units_column(end_offset, encoding)
+    end
+
+    # The end column in code units using the given cache to fetch or calculate
+    # the value.
+    def cached_end_code_units_column(cache)
+      cache[end_offset] - cache[source.line_start(end_offset)]
+    end
+
+    # Implement the hash pattern matching interface for Location.
+    def deconstruct_keys(keys)
+      { start_offset: start_offset, end_offset: end_offset }
+    end
+
+    # Implement the pretty print interface for Location.
+    def pretty_print(q)
+      q.text("(#{start_line},#{start_column})-(#{end_line},#{end_column})")
+    end
+
+    # Returns true if the given other location is equal to this location.
+    def ==(other)
+      Location === other &&
+        other.start_offset == start_offset &&
+        other.end_offset == end_offset
+    end
+
+    # Returns a new location that stretches from this location to the given
+    # other location. Raises an error if this location is not before the other
+    # location or if they don't share the same source.
+    def join(other)
+      raise "Incompatible sources" if source != other.source
+      raise "Incompatible locations" if start_offset > other.start_offset
+
+      Location.new(source, start_offset, other.end_offset - start_offset)
+    end
+
+    # Join this location with the first occurrence of the string in the source
+    # that occurs after this location on the same line, and return the new
+    # location. This will raise an error if the string does not exist.
+    def adjoin(string)
+      line_suffix = source.slice(end_offset, source.line_end(end_offset) - end_offset)
+
+      line_suffix_index = line_suffix.byteindex(string)
+      raise "Could not find #{string}" if line_suffix_index.nil?
+
+      Location.new(source, start_offset, length + line_suffix_index + string.bytesize)
+    end
+  end
+
+  # This represents a comment that was encountered during parsing. It is the
+  # base class for all comment types.
+  class Comment
+    # The location of this comment in the source.
+    attr_reader :location
+
+    # Create a new comment object with the given location.
+    def initialize(location)
+      @location = location
+    end
+
+    # Implement the hash pattern matching interface for Comment.
+    def deconstruct_keys(keys)
+      { location: location }
+    end
+
+    # Returns the content of the comment by slicing it from the source code.
+    def slice
+      location.slice
+    end
+  end
+
+  # InlineComment objects are the most common. They correspond to comments in
+  # the source file like this one that start with #.
+  class InlineComment < Comment
+    # Returns true if this comment happens on the same line as other code and
+    # false if the comment is by itself.
+    def trailing?
+      !location.start_line_slice.strip.empty?
+    end
+
+    # Returns a string representation of this comment.
+    def inspect
+      "#<Prism::InlineComment @location=#{location.inspect}>"
+    end
+  end
+
+  # EmbDocComment objects correspond to comments that are surrounded by =begin
+  # and =end.
+  class EmbDocComment < Comment
+    # This can only be true for inline comments.
+    def trailing?
+      false
+    end
+
+    # Returns a string representation of this comment.
+    def inspect
+      "#<Prism::EmbDocComment @location=#{location.inspect}>"
+    end
+  end
+
+  # This represents a magic comment that was encountered during parsing.
+  class MagicComment
+    # A Location object representing the location of the key in the source.
+    attr_reader :key_loc
+
+    # A Location object representing the location of the value in the source.
+    attr_reader :value_loc
+
+    # Create a new magic comment object with the given key and value locations.
+    def initialize(key_loc, value_loc)
+      @key_loc = key_loc
+      @value_loc = value_loc
+    end
+
+    # Returns the key of the magic comment by slicing it from the source code.
+    def key
+      key_loc.slice
+    end
+
+    # Returns the value of the magic comment by slicing it from the source code.
+    def value
+      value_loc.slice
+    end
+
+    # Implement the hash pattern matching interface for MagicComment.
+    def deconstruct_keys(keys)
+      { key_loc: key_loc, value_loc: value_loc }
+    end
+
+    # Returns a string representation of this magic comment.
+    def inspect
+      "#<Prism::MagicComment @key=#{key.inspect} @value=#{value.inspect}>"
+    end
+  end
+
+  # This represents an error that was encountered during parsing.
+  class ParseError
+    # The type of error. This is an _internal_ symbol that is used for
+    # communicating with translation layers. It is not meant to be public API.
+    attr_reader :type
+
+    # The message associated with this error.
+    attr_reader :message
+
+    # A Location object representing the location of this error in the source.
+    attr_reader :location
+
+    # The level of this error.
+    attr_reader :level
+
+    # Create a new error object with the given message and location.
+    def initialize(type, message, location, level)
+      @type = type
+      @message = message
+      @location = location
+      @level = level
+    end
+
+    # Implement the hash pattern matching interface for ParseError.
+    def deconstruct_keys(keys)
+      { type: type, message: message, location: location, level: level }
+    end
+
+    # Returns a string representation of this error.
+    def inspect
+      "#<Prism::ParseError @type=#{@type.inspect} @message=#{@message.inspect} @location=#{@location.inspect} @level=#{@level.inspect}>"
+    end
+  end
+
+  # This represents a warning that was encountered during parsing.
+  class ParseWarning
+    # The type of warning. This is an _internal_ symbol that is used for
+    # communicating with translation layers. It is not meant to be public API.
+    attr_reader :type
+
+    # The message associated with this warning.
+    attr_reader :message
+
+    # A Location object representing the location of this warning in the source.
+    attr_reader :location
+
+    # The level of this warning.
+    attr_reader :level
+
+    # Create a new warning object with the given message and location.
+    def initialize(type, message, location, level)
+      @type = type
+      @message = message
+      @location = location
+      @level = level
+    end
+
+    # Implement the hash pattern matching interface for ParseWarning.
+    def deconstruct_keys(keys)
+      { type: type, message: message, location: location, level: level }
+    end
+
+    # Returns a string representation of this warning.
+    def inspect
+      "#<Prism::ParseWarning @type=#{@type.inspect} @message=#{@message.inspect} @location=#{@location.inspect} @level=#{@level.inspect}>"
+    end
+  end
+
+  # This represents the result of a call to ::parse or ::parse_file. It contains
+  # the requested structure, any comments that were encounters, and any errors
+  # that were encountered.
+  class Result
+    # The list of comments that were encountered during parsing.
+    attr_reader :comments
+
+    # The list of magic comments that were encountered during parsing.
+    attr_reader :magic_comments
+
+    # An optional location that represents the location of the __END__ marker
+    # and the rest of the content of the file. This content is loaded into the
+    # DATA constant when the file being parsed is the main file being executed.
+    attr_reader :data_loc
+
+    # The list of errors that were generated during parsing.
+    attr_reader :errors
+
+    # The list of warnings that were generated during parsing.
+    attr_reader :warnings
+
+    # A Source instance that represents the source code that was parsed.
+    attr_reader :source
+
+    # Create a new result object with the given values.
+    def initialize(comments, magic_comments, data_loc, errors, warnings, source)
+      @comments = comments
+      @magic_comments = magic_comments
+      @data_loc = data_loc
+      @errors = errors
+      @warnings = warnings
+      @source = source
+    end
+
+    # Implement the hash pattern matching interface for Result.
+    def deconstruct_keys(keys)
+      { comments: comments, magic_comments: magic_comments, data_loc: data_loc, errors: errors, warnings: warnings }
+    end
+
+    # Returns the encoding of the source code that was parsed.
+    def encoding
+      source.encoding
+    end
+
+    # Returns true if there were no errors during parsing and false if there
+    # were.
+    def success?
+      errors.empty?
+    end
+
+    # Returns true if there were errors during parsing and false if there were
+    # not.
+    def failure?
+      !success?
+    end
+
+    # Create a code units cache for the given encoding.
+    def code_units_cache(encoding)
+      source.code_units_cache(encoding)
+    end
+  end
+
+  # This is a result specific to the `parse` and `parse_file` methods.
+  class ParseResult < Result
+    autoload :Comments, "prism/parse_result/comments"
+    autoload :Errors, "prism/parse_result/errors"
+    autoload :Newlines, "prism/parse_result/newlines"
+
+    private_constant :Comments
+    private_constant :Errors
+    private_constant :Newlines
+
+    # The syntax tree that was parsed from the source code.
+    attr_reader :value
+
+    # Create a new parse result object with the given values.
+    def initialize(value, comments, magic_comments, data_loc, errors, warnings, source)
+      @value = value
+      super(comments, magic_comments, data_loc, errors, warnings, source)
+    end
+
+    # Implement the hash pattern matching interface for ParseResult.
+    def deconstruct_keys(keys)
+      super.merge!(value: value)
+    end
+
+    # Attach the list of comments to their respective locations in the tree.
+    def attach_comments!
+      Comments.new(self).attach! # steep:ignore
+    end
+
+    # Walk the tree and mark nodes that are on a new line, loosely emulating
+    # the behavior of CRuby's `:line` tracepoint event.
+    def mark_newlines!
+      value.accept(Newlines.new(source.offsets.size)) # steep:ignore
+    end
+
+    # Returns a string representation of the syntax tree with the errors
+    # displayed inline.
+    def errors_format
+      Errors.new(self).format
+    end
+  end
+
+  # This is a result specific to the `lex` and `lex_file` methods.
+  class LexResult < Result
+    # The list of tokens that were parsed from the source code.
+    attr_reader :value
+
+    # Create a new lex result object with the given values.
+    def initialize(value, comments, magic_comments, data_loc, errors, warnings, source)
+      @value = value
+      super(comments, magic_comments, data_loc, errors, warnings, source)
+    end
+
+    # Implement the hash pattern matching interface for LexResult.
+    def deconstruct_keys(keys)
+      super.merge!(value: value)
+    end
+  end
+
+  # This is a result specific to the `parse_lex` and `parse_lex_file` methods.
+  class ParseLexResult < Result
+    # A tuple of the syntax tree and the list of tokens that were parsed from
+    # the source code.
+    attr_reader :value
+
+    # Create a new parse lex result object with the given values.
+    def initialize(value, comments, magic_comments, data_loc, errors, warnings, source)
+      @value = value
+      super(comments, magic_comments, data_loc, errors, warnings, source)
+    end
+
+    # Implement the hash pattern matching interface for ParseLexResult.
+    def deconstruct_keys(keys)
+      super.merge!(value: value)
+    end
+  end
+
+  # This represents a token from the Ruby source.
+  class Token
+    # The Source object that represents the source this token came from.
+    attr_reader :source
+    private :source
+
+    # The type of token that this token is.
+    attr_reader :type
+
+    # A byteslice of the source that this token represents.
+    attr_reader :value
+
+    # Create a new token object with the given type, value, and location.
+    def initialize(source, type, value, location)
+      @source = source
+      @type = type
+      @value = value
+      @location = location
+    end
+
+    # Implement the hash pattern matching interface for Token.
+    def deconstruct_keys(keys)
+      { type: type, value: value, location: location }
+    end
+
+    # A Location object representing the location of this token in the source.
+    def location
+      location = @location
+      return location if location.is_a?(Location)
+      @location = Location.new(source, location >> 32, location & 0xFFFFFFFF)
+    end
+
+    # Implement the pretty print interface for Token.
+    def pretty_print(q)
+      q.group do
+        q.text(type.to_s)
+        self.location.pretty_print(q)
+        q.text("(")
+        q.nest(2) do
+          q.breakable("")
+          q.pp(value)
+        end
+        q.breakable("")
+        q.text(")")
+      end
+    end
+
+    # Returns true if the given other token is equal to this token.
+    def ==(other)
+      Token === other &&
+        other.type == type &&
+        other.value == value
+    end
+
+    # Returns a string representation of this token.
+    def inspect
+      location
+      super
+    end
+
+    # Freeze this object and the objects it contains.
+    def deep_freeze
+      value.freeze
+      location.freeze
+      freeze
+    end
+  end
+
+  # This object is passed to the various Prism.* methods that accept the
+  # `scopes` option as an element of the list. It defines both the local
+  # variables visible at that scope as well as the forwarding parameters
+  # available at that scope.
+  class Scope
+    # The list of local variables that are defined in this scope. This should be
+    # defined as an array of symbols.
+    attr_reader :locals
+
+    # The list of local variables that are forwarded to the next scope. This
+    # should by defined as an array of symbols containing the specific values of
+    # :*, :**, :&, or :"...".
+    attr_reader :forwarding
+
+    # Create a new scope object with the given locals and forwarding.
+    def initialize(locals, forwarding)
+      @locals = locals
+      @forwarding = forwarding
+    end
+  end
+
+  # Create a new scope with the given locals and forwarding options that is
+  # suitable for passing into one of the Prism.* methods that accepts the
+  # `scopes` option.
+  def self.scope(locals: [], forwarding: [])
+    Scope.new(locals, forwarding)
+  end
+end
diff --git a/lib/prism/parse_result/comments.rb b/lib/prism/parse_result/comments.rb
new file mode 100644
index 00000000000000..3e93316aff8662
--- /dev/null
+++ b/lib/prism/parse_result/comments.rb
@@ -0,0 +1,188 @@
+# frozen_string_literal: true
+# :markup: markdown
+
+module Prism
+  class ParseResult < Result
+    # When we've parsed the source, we have both the syntax tree and the list of
+    # comments that we found in the source. This class is responsible for
+    # walking the tree and finding the nearest location to attach each comment.
+    #
+    # It does this by first finding the nearest locations to each comment.
+    # Locations can either come from nodes directly or from location fields on
+    # nodes. For example, a `ClassNode` has an overall location encompassing the
+    # entire class, but it also has a location for the `class` keyword.
+    #
+    # Once the nearest locations are found, it determines which one to attach
+    # to. If it's a trailing comment (a comment on the same line as other source
+    # code), it will favor attaching to the nearest location that occurs before
+    # the comment. Otherwise it will favor attaching to the nearest location
+    # that is after the comment.
+    class Comments
+      # A target for attaching comments that is based on a specific node's
+      # location.
+      class NodeTarget # :nodoc:
+        attr_reader :node
+
+        def initialize(node)
+          @node = node
+        end
+
+        def start_offset
+          node.start_offset
+        end
+
+        def end_offset
+          node.end_offset
+        end
+
+        def encloses?(comment)
+          start_offset <= comment.location.start_offset &&
+            comment.location.end_offset <= end_offset
+        end
+
+        def leading_comment(comment)
+          node.location.leading_comment(comment)
+        end
+
+        def trailing_comment(comment)
+          node.location.trailing_comment(comment)
+        end
+      end
+
+      # A target for attaching comments that is based on a location field on a
+      # node. For example, the `end` token of a ClassNode.
+      class LocationTarget # :nodoc:
+        attr_reader :location
+
+        def initialize(location)
+          @location = location
+        end
+
+        def start_offset
+          location.start_offset
+        end
+
+        def end_offset
+          location.end_offset
+        end
+
+        def encloses?(comment)
+          false
+        end
+
+        def leading_comment(comment)
+          location.leading_comment(comment)
+        end
+
+        def trailing_comment(comment)
+          location.trailing_comment(comment)
+        end
+      end
+
+      # The parse result that we are attaching comments to.
+      attr_reader :parse_result
+
+      # Create a new Comments object that will attach comments to the given
+      # parse result.
+      def initialize(parse_result)
+        @parse_result = parse_result
+      end
+
+      # Attach the comments to their respective locations in the tree by
+      # mutating the parse result.
+      def attach!
+        parse_result.comments.each do |comment|
+          preceding, enclosing, following = nearest_targets(parse_result.value, comment)
+
+          if comment.trailing?
+            if preceding
+              preceding.trailing_comment(comment)
+            else
+              (following || enclosing || NodeTarget.new(parse_result.value)).leading_comment(comment)
+            end
+          else
+            # If a comment exists on its own line, prefer a leading comment.
+            if following
+              following.leading_comment(comment)
+            elsif preceding
+              preceding.trailing_comment(comment)
+            else
+              (enclosing || NodeTarget.new(parse_result.value)).leading_comment(comment)
+            end
+          end
+        end
+      end
+
+      private
+
+      # Responsible for finding the nearest targets to the given comment within
+      # the context of the given encapsulating node.
+      def nearest_targets(node, comment)
+        comment_start = comment.location.start_offset
+        comment_end = comment.location.end_offset
+
+        targets = [] #: Array[_Target]
+        node.comment_targets.map do |value|
+          case value
+          when StatementsNode
+            targets.concat(value.body.map { |node| NodeTarget.new(node) })
+          when Node
+            targets << NodeTarget.new(value)
+          when Location
+            targets << LocationTarget.new(value)
+          end
+        end
+
+        targets.sort_by!(&:start_offset)
+        preceding = nil #: _Target?
+        following = nil #: _Target?
+
+        left = 0
+        right = targets.length
+
+        # This is a custom binary search that finds the nearest nodes to the
+        # given comment. When it finds a node that completely encapsulates the
+        # comment, it recurses downward into the tree.
+        while left < right
+          middle = (left + right) / 2
+          target = targets[middle]
+
+          target_start = target.start_offset
+          target_end = target.end_offset
+
+          if target.encloses?(comment)
+            # @type var target: NodeTarget
+            # The comment is completely contained by this target. Abandon the
+            # binary search at this level.
+            return nearest_targets(target.node, comment)
+          end
+
+          if target_end <= comment_start
+            # This target falls completely before the comment. Because we will
+            # never consider this target or any targets before it again, this
+            # target must be the closest preceding target we have encountered so
+            # far.
+            preceding = target
+            left = middle + 1
+            next
+          end
+
+          if comment_end <= target_start
+            # This target falls completely after the comment. Because we will
+            # never consider this target or any targets after it again, this
+            # target must be the closest following target we have encountered so
+            # far.
+            following = target
+            right = middle
+            next
+          end
+
+          # This should only happen if there is a bug in this parser.
+          raise "Comment location overlaps with a target location"
+        end
+
+        [preceding, NodeTarget.new(node), following]
+      end
+    end
+  end
+end
diff --git a/lib/prism/parse_result/errors.rb b/lib/prism/parse_result/errors.rb
new file mode 100644
index 00000000000000..26c376b3ce895f
--- /dev/null
+++ b/lib/prism/parse_result/errors.rb
@@ -0,0 +1,66 @@
+# frozen_string_literal: true
+# :markup: markdown
+
+require "stringio"
+
+module Prism
+  class ParseResult < Result
+    # An object to represent the set of errors on a parse result. This object
+    # can be used to format the errors in a human-readable way.
+    class Errors
+      # The parse result that contains the errors.
+      attr_reader :parse_result
+
+      # Initialize a new set of errors from the given parse result.
+      def initialize(parse_result)
+        @parse_result = parse_result
+      end
+
+      # Formats the errors in a human-readable way and return them as a string.
+      def format
+        error_lines = {} #: Hash[Integer, Array[ParseError]]
+        parse_result.errors.each do |error|
+          location = error.location
+          (location.start_line..location.end_line).each do |line|
+            error_lines[line] ||= []
+            error_lines[line] << error
+          end
+        end
+
+        source_lines = parse_result.source.source.lines
+        source_lines << "" if error_lines.key?(source_lines.size + 1)
+
+        io = StringIO.new
+        source_lines.each.with_index(1) do |line, line_number|
+          io.puts(line)
+
+          (error_lines.delete(line_number) || []).each do |error|
+            location = error.location
+
+            case line_number
+            when location.start_line
+              io.print(" " * location.start_column + "^")
+
+              if location.start_line == location.end_line
+                if location.start_column != location.end_column
+                  io.print("~" * (location.end_column - location.start_column - 1))
+                end
+
+                io.puts(" " + error.message)
+              else
+                io.puts("~" * (line.bytesize - location.start_column))
+              end
+            when location.end_line
+              io.puts("~" * location.end_column + " " + error.message)
+            else
+              io.puts("~" * line.bytesize)
+            end
+          end
+        end
+
+        io.puts
+        io.string
+      end
+    end
+  end
+end
diff --git a/lib/prism/parse_result/newlines.rb b/lib/prism/parse_result/newlines.rb
new file mode 100644
index 00000000000000..e7fd62cafedb37
--- /dev/null
+++ b/lib/prism/parse_result/newlines.rb
@@ -0,0 +1,155 @@
+# frozen_string_literal: true
+# :markup: markdown
+
+module Prism
+  class ParseResult < Result
+    # The :line tracepoint event gets fired whenever the Ruby VM encounters an
+    # expression on a new line. The types of expressions that can trigger this
+    # event are:
+    #
+    # * if statements
+    # * unless statements
+    # * nodes that are children of statements lists
+    #
+    # In order to keep track of the newlines, we have a list of offsets that
+    # come back from the parser. We assign these offsets to the first nodes that
+    # we find in the tree that are on those lines.
+    #
+    # Note that the logic in this file should be kept in sync with the Java
+    # MarkNewlinesVisitor, since that visitor is responsible for marking the
+    # newlines for JRuby/TruffleRuby.
+    #
+    # This file is autoloaded only when `mark_newlines!` is called, so the
+    # re-opening of the various nodes in this file will only be performed in
+    # that case. We do that to avoid storing the extra `@newline` instance
+    # variable on every node if we don't need it.
+    class Newlines < Visitor
+      # Create a new Newlines visitor with the given newline offsets.
+      def initialize(lines)
+        # @type var lines: Integer
+        @lines = Array.new(1 + lines, false)
+      end
+
+      # Permit block/lambda nodes to mark newlines within themselves.
+      def visit_block_node(node)
+        old_lines = @lines
+        @lines = Array.new(old_lines.size, false)
+
+        begin
+          super(node)
+        ensure
+          @lines = old_lines
+        end
+      end
+
+      alias_method :visit_lambda_node, :visit_block_node
+
+      # Mark if/unless nodes as newlines.
+      def visit_if_node(node)
+        node.newline_flag!(@lines)
+        super(node)
+      end
+
+      alias_method :visit_unless_node, :visit_if_node
+
+      # Permit statements lists to mark newlines within themselves.
+      def visit_statements_node(node)
+        node.body.each do |child|
+          child.newline_flag!(@lines)
+        end
+        super(node)
+      end
+    end
+  end
+
+  class Node
+    def newline_flag? # :nodoc:
+      !!defined?(@newline_flag)
+    end
+
+    def newline_flag!(lines) # :nodoc:
+      line = location.start_line
+      unless lines[line]
+        lines[line] = true
+        @newline_flag = true
+      end
+    end
+  end
+
+  class BeginNode < Node
+    def newline_flag!(lines) # :nodoc:
+      # Never mark BeginNode with a newline flag, mark children instead.
+    end
+  end
+
+  class ParenthesesNode < Node
+    def newline_flag!(lines) # :nodoc:
+      # Never mark ParenthesesNode with a newline flag, mark children instead.
+    end
+  end
+
+  class IfNode < Node
+    def newline_flag!(lines) # :nodoc:
+      predicate.newline_flag!(lines)
+    end
+  end
+
+  class UnlessNode < Node
+    def newline_flag!(lines) # :nodoc:
+      predicate.newline_flag!(lines)
+    end
+  end
+
+  class UntilNode < Node
+    def newline_flag!(lines) # :nodoc:
+      predicate.newline_flag!(lines)
+    end
+  end
+
+  class WhileNode < Node
+    def newline_flag!(lines) # :nodoc:
+      predicate.newline_flag!(lines)
+    end
+  end
+
+  class RescueModifierNode < Node
+    def newline_flag!(lines) # :nodoc:
+      expression.newline_flag!(lines)
+    end
+  end
+
+  class InterpolatedMatchLastLineNode < Node
+    def newline_flag!(lines) # :nodoc:
+      first = parts.first
+      first.newline_flag!(lines) if first
+    end
+  end
+
+  class InterpolatedRegularExpressionNode < Node
+    def newline_flag!(lines) # :nodoc:
+      first = parts.first
+      first.newline_flag!(lines) if first
+    end
+  end
+
+  class InterpolatedStringNode < Node
+    def newline_flag!(lines) # :nodoc:
+      first = parts.first
+      first.newline_flag!(lines) if first
+    end
+  end
+
+  class InterpolatedSymbolNode < Node
+    def newline_flag!(lines) # :nodoc:
+      first = parts.first
+      first.newline_flag!(lines) if first
+    end
+  end
+
+  class InterpolatedXStringNode < Node
+    def newline_flag!(lines) # :nodoc:
+      first = parts.first
+      first.newline_flag!(lines) if first
+    end
+  end
+end
diff --git a/lib/prism/pattern.rb b/lib/prism/pattern.rb
new file mode 100644
index 00000000000000..6ad2d9e5b9566f
--- /dev/null
+++ b/lib/prism/pattern.rb
@@ -0,0 +1,269 @@
+# frozen_string_literal: true
+# :markup: markdown
+
+module Prism
+  # A pattern is an object that wraps a Ruby pattern matching expression. The
+  # expression would normally be passed to an `in` clause within a `case`
+  # expression or a rightward assignment expression. For example, in the
+  # following snippet:
+  #
+  #     case node
+  #     in ConstantPathNode[ConstantReadNode[name: :Prism], ConstantReadNode[name: :Pattern]]
+  #     end
+  #
+  # the pattern is the <tt>ConstantPathNode[...]</tt> expression.
+  #
+  # The pattern gets compiled into an object that responds to #call by running
+  # the #compile method. This method itself will run back through Prism to
+  # parse the expression into a tree, then walk the tree to generate the
+  # necessary callable objects. For example, if you wanted to compile the
+  # expression above into a callable, you would:
+  #
+  #     callable = Prism::Pattern.new("ConstantPathNode[ConstantReadNode[name: :Prism], ConstantReadNode[name: :Pattern]]").compile
+  #     callable.call(node)
+  #
+  # The callable object returned by #compile is guaranteed to respond to #call
+  # with a single argument, which is the node to match against. It also is
+  # guaranteed to respond to #===, which means it itself can be used in a `case`
+  # expression, as in:
+  #
+  #     case node
+  #     when callable
+  #     end
+  #
+  # If the query given to the initializer cannot be compiled into a valid
+  # matcher (either because of a syntax error or because it is using syntax we
+  # do not yet support) then a Prism::Pattern::CompilationError will be
+  # raised.
+  class Pattern
+    # Raised when the query given to a pattern is either invalid Ruby syntax or
+    # is using syntax that we don't yet support.
+    class CompilationError < StandardError
+      # Create a new CompilationError with the given representation of the node
+      # that caused the error.
+      def initialize(repr)
+        super(<<~ERROR)
+          prism was unable to compile the pattern you provided into a usable
+          expression. It failed on to understand the node represented by:
+
+          #{repr}
+
+          Note that not all syntax supported by Ruby's pattern matching syntax
+          is also supported by prism's patterns. If you're using some syntax
+          that you believe should be supported, please open an issue on
+          GitHub at https://github.com/ruby/prism/issues/new.
+        ERROR
+      end
+    end
+
+    # The query that this pattern was initialized with.
+    attr_reader :query
+
+    # Create a new pattern with the given query. The query should be a string
+    # containing a Ruby pattern matching expression.
+    def initialize(query)
+      @query = query
+      @compiled = nil
+    end
+
+    # Compile the query into a callable object that can be used to match against
+    # nodes.
+    def compile
+      result = Prism.parse("case nil\nin #{query}\nend")
+
+      case_match_node = result.value.statements.body.last
+      raise CompilationError, case_match_node.inspect unless case_match_node.is_a?(CaseMatchNode)
+
+      in_node = case_match_node.conditions.last
+      raise CompilationError, in_node.inspect unless in_node.is_a?(InNode)
+
+      compile_node(in_node.pattern)
+    end
+
+    # Scan the given node and all of its children for nodes that match the
+    # pattern. If a block is given, it will be called with each node that
+    # matches the pattern. If no block is given, an enumerator will be returned
+    # that will yield each node that matches the pattern.
+    def scan(root)
+      return to_enum(:scan, root) unless block_given?
+
+      @compiled ||= compile
+      queue = [root]
+
+      while (node = queue.shift)
+        yield node if @compiled.call(node) # steep:ignore
+        queue.concat(node.compact_child_nodes)
+      end
+    end
+
+    private
+
+    # Shortcut for combining two procs into one that returns true if both return
+    # true.
+    def combine_and(left, right)
+      ->(other) { left.call(other) && right.call(other) }
+    end
+
+    # Shortcut for combining two procs into one that returns true if either
+    # returns true.
+    def combine_or(left, right)
+      ->(other) { left.call(other) || right.call(other) }
+    end
+
+    # Raise an error because the given node is not supported.
+    def compile_error(node)
+      raise CompilationError, node.inspect
+    end
+
+    # in [foo, bar, baz]
+    def compile_array_pattern_node(node)
+      compile_error(node) if !node.rest.nil? || node.posts.any?
+
+      constant = node.constant
+      compiled_constant = compile_node(constant) if constant
+
+      preprocessed = node.requireds.map { |required| compile_node(required) }
+
+      compiled_requireds = ->(other) do
+        deconstructed = other.deconstruct
+
+        deconstructed.length == preprocessed.length &&
+          preprocessed
+            .zip(deconstructed)
+            .all? { |(matcher, value)| matcher.call(value) }
+      end
+
+      if compiled_constant
+        combine_and(compiled_constant, compiled_requireds)
+      else
+        compiled_requireds
+      end
+    end
+
+    # in foo | bar
+    def compile_alternation_pattern_node(node)
+      combine_or(compile_node(node.left), compile_node(node.right))
+    end
+
+    # in Prism::ConstantReadNode
+    def compile_constant_path_node(node)
+      parent = node.parent
+
+      if parent.is_a?(ConstantReadNode) && parent.slice == "Prism"
+        name = node.name
+        raise CompilationError, node.inspect if name.nil?
+
+        compile_constant_name(node, name)
+      else
+        compile_error(node)
+      end
+    end
+
+    # in ConstantReadNode
+    # in String
+    def compile_constant_read_node(node)
+      compile_constant_name(node, node.name)
+    end
+
+    # Compile a name associated with a constant.
+    def compile_constant_name(node, name)
+      if Prism.const_defined?(name, false)
+        clazz = Prism.const_get(name)
+
+        ->(other) { clazz === other }
+      elsif Object.const_defined?(name, false)
+        clazz = Object.const_get(name)
+
+        ->(other) { clazz === other }
+      else
+        compile_error(node)
+      end
+    end
+
+    # in InstanceVariableReadNode[name: Symbol]
+    # in { name: Symbol }
+    def compile_hash_pattern_node(node)
+      compile_error(node) if node.rest
+      compiled_constant = compile_node(node.constant) if node.constant
+
+      preprocessed =
+        node.elements.to_h do |element|
+          key = element.key
+          if key.is_a?(SymbolNode)
+            [key.unescaped.to_sym, compile_node(element.value)]
+          else
+            raise CompilationError, element.inspect
+          end
+        end
+
+      compiled_keywords = ->(other) do
+        deconstructed = other.deconstruct_keys(preprocessed.keys)
+
+        preprocessed.all? do |keyword, matcher|
+          deconstructed.key?(keyword) && matcher.call(deconstructed[keyword])
+        end
+      end
+
+      if compiled_constant
+        combine_and(compiled_constant, compiled_keywords)
+      else
+        compiled_keywords
+      end
+    end
+
+    # in nil
+    def compile_nil_node(node)
+      ->(attribute) { attribute.nil? }
+    end
+
+    # in /foo/
+    def compile_regular_expression_node(node)
+      regexp = Regexp.new(node.unescaped, node.closing[1..])
+
+      ->(attribute) { regexp === attribute }
+    end
+
+    # in ""
+    # in "foo"
+    def compile_string_node(node)
+      string = node.unescaped
+
+      ->(attribute) { string === attribute }
+    end
+
+    # in :+
+    # in :foo
+    def compile_symbol_node(node)
+      symbol = node.unescaped.to_sym
+
+      ->(attribute) { symbol === attribute }
+    end
+
+    # Compile any kind of node. Dispatch out to the individual compilation
+    # methods based on the type of node.
+    def compile_node(node)
+      case node
+      when AlternationPatternNode
+        compile_alternation_pattern_node(node)
+      when ArrayPatternNode
+        compile_array_pattern_node(node)
+      when ConstantPathNode
+        compile_constant_path_node(node)
+      when ConstantReadNode
+        compile_constant_read_node(node)
+      when HashPatternNode
+        compile_hash_pattern_node(node)
+      when NilNode
+        compile_nil_node(node)
+      when RegularExpressionNode
+        compile_regular_expression_node(node)
+      when StringNode
+        compile_string_node(node)
+      when SymbolNode
+        compile_symbol_node(node)
+      else
+        compile_error(node)
+      end
+    end
+  end
+end
diff --git a/lib/prism/polyfill/append_as_bytes.rb b/lib/prism/polyfill/append_as_bytes.rb
new file mode 100644
index 00000000000000..24218bd171aa88
--- /dev/null
+++ b/lib/prism/polyfill/append_as_bytes.rb
@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+# Polyfill for String#append_as_bytes, which didn't exist until Ruby 3.4.
+if !("".respond_to?(:append_as_bytes))
+  String.include(
+    Module.new {
+      def append_as_bytes(*args)
+        args.each do |arg|
+          arg = Integer === arg ? [arg].pack("C") : arg.b
+          self.<<(arg) # steep:ignore
+        end
+      end
+    }
+  )
+end
diff --git a/lib/prism/polyfill/byteindex.rb b/lib/prism/polyfill/byteindex.rb
new file mode 100644
index 00000000000000..98c6089f141ef7
--- /dev/null
+++ b/lib/prism/polyfill/byteindex.rb
@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+# Polyfill for String#byteindex, which didn't exist until Ruby 3.2.
+if !("".respond_to?(:byteindex))
+  String.include(
+    Module.new {
+      def byteindex(needle, offset = 0)
+        charindex = index(needle, offset)
+        slice(0...charindex).bytesize if charindex
+      end
+    }
+  )
+end
diff --git a/lib/prism/polyfill/scan_byte.rb b/lib/prism/polyfill/scan_byte.rb
new file mode 100644
index 00000000000000..2def4572c42870
--- /dev/null
+++ b/lib/prism/polyfill/scan_byte.rb
@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+require "strscan"
+
+# Polyfill for StringScanner#scan_byte, which didn't exist until Ruby 3.4.
+if !(StringScanner.instance_methods.include?(:scan_byte))
+  StringScanner.include(
+    Module.new {
+      def scan_byte # :nodoc:
+        get_byte&.b&.ord
+      end
+    }
+  )
+end
diff --git a/lib/prism/polyfill/unpack1.rb b/lib/prism/polyfill/unpack1.rb
new file mode 100644
index 00000000000000..3fa9b5a0c56abe
--- /dev/null
+++ b/lib/prism/polyfill/unpack1.rb
@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+# Polyfill for String#unpack1 with the offset parameter. Not all Ruby engines
+# have Method#parameters implemented, so we check the arity instead if
+# necessary.
+if (unpack1 = String.instance_method(:unpack1)).respond_to?(:parameters) ? unpack1.parameters.none? { |_, name| name == :offset } : (unpack1.arity == 1)
+  String.prepend(
+    Module.new {
+      def unpack1(format, offset: 0) # :nodoc:
+        offset == 0 ? super(format) : self[offset..].unpack1(format) # steep:ignore
+      end
+    }
+  )
+end
diff --git a/lib/prism/polyfill/warn.rb b/lib/prism/polyfill/warn.rb
new file mode 100644
index 00000000000000..560380d30807e8
--- /dev/null
+++ b/lib/prism/polyfill/warn.rb
@@ -0,0 +1,42 @@
+# frozen_string_literal: true
+
+# Polyfill for Kernel#warn with the category parameter. Not all Ruby engines
+# have Method#parameters implemented, so we check the arity instead if
+# necessary.
+if (method = Kernel.instance_method(:warn)).respond_to?(:parameters) ? method.parameters.none? { |_, name| name == :category } : (method.arity == -1)
+  Kernel.prepend(
+    Module.new {
+      def warn(*msgs, uplevel: nil, category: nil) # :nodoc:
+        uplevel =
+          case uplevel
+          when nil
+            1
+          when Integer
+            uplevel + 1
+          else
+            uplevel.to_int + 1
+          end
+
+        super(*msgs, uplevel: uplevel)
+      end
+    }
+  )
+
+  Object.prepend(
+    Module.new {
+      def warn(*msgs, uplevel: nil, category: nil) # :nodoc:
+        uplevel =
+          case uplevel
+          when nil
+            1
+          when Integer
+            uplevel + 1
+          else
+            uplevel.to_int + 1
+          end
+
+        super(*msgs, uplevel: uplevel)
+      end
+    }
+  )
+end
diff --git a/lib/prism/prism.gemspec b/lib/prism/prism.gemspec
new file mode 100644
index 00000000000000..4daa5113007086
--- /dev/null
+++ b/lib/prism/prism.gemspec
@@ -0,0 +1,174 @@
+# frozen_string_literal: true
+
+Gem::Specification.new do |spec|
+  spec.name = "prism"
+  spec.version = "1.4.0"
+  spec.authors = ["Shopify"]
+  spec.email = ["ruby@shopify.com"]
+
+  spec.summary = "Prism Ruby parser"
+  spec.homepage = "https://github.com/ruby/prism"
+  spec.license = "MIT"
+
+  spec.required_ruby_version = ">= 2.7.0"
+
+  spec.require_paths = ["lib"]
+  spec.files = [
+    "BSDmakefile",
+    "CHANGELOG.md",
+    "CODE_OF_CONDUCT.md",
+    "CONTRIBUTING.md",
+    "LICENSE.md",
+    "Makefile",
+    "README.md",
+    "config.yml",
+    "docs/build_system.md",
+    "docs/configuration.md",
+    "docs/cruby_compilation.md",
+    "docs/design.md",
+    "docs/encoding.md",
+    "docs/fuzzing.md",
+    "docs/heredocs.md",
+    "docs/javascript.md",
+    "docs/local_variable_depth.md",
+    "docs/mapping.md",
+    "docs/parser_translation.md",
+    "docs/parsing_rules.md",
+    "docs/releasing.md",
+    "docs/relocation.md",
+    "docs/ripper_translation.md",
+    "docs/ruby_api.md",
+    "docs/ruby_parser_translation.md",
+    "docs/serialization.md",
+    "docs/testing.md",
+    "ext/prism/api_node.c",
+    "ext/prism/api_pack.c",
+    "ext/prism/extension.c",
+    "ext/prism/extension.h",
+    "include/prism.h",
+    "include/prism/ast.h",
+    "include/prism/defines.h",
+    "include/prism/diagnostic.h",
+    "include/prism/encoding.h",
+    "include/prism/node.h",
+    "include/prism/options.h",
+    "include/prism/pack.h",
+    "include/prism/parser.h",
+    "include/prism/prettyprint.h",
+    "include/prism/regexp.h",
+    "include/prism/static_literals.h",
+    "include/prism/util/pm_buffer.h",
+    "include/prism/util/pm_char.h",
+    "include/prism/util/pm_constant_pool.h",
+    "include/prism/util/pm_integer.h",
+    "include/prism/util/pm_list.h",
+    "include/prism/util/pm_memchr.h",
+    "include/prism/util/pm_newline_list.h",
+    "include/prism/util/pm_strncasecmp.h",
+    "include/prism/util/pm_string.h",
+    "include/prism/util/pm_strpbrk.h",
+    "include/prism/version.h",
+    "lib/prism.rb",
+    "lib/prism/compiler.rb",
+    "lib/prism/desugar_compiler.rb",
+    "lib/prism/dispatcher.rb",
+    "lib/prism/dot_visitor.rb",
+    "lib/prism/dsl.rb",
+    "lib/prism/ffi.rb",
+    "lib/prism/inspect_visitor.rb",
+    "lib/prism/lex_compat.rb",
+    "lib/prism/mutation_compiler.rb",
+    "lib/prism/node_ext.rb",
+    "lib/prism/node.rb",
+    "lib/prism/pack.rb",
+    "lib/prism/parse_result.rb",
+    "lib/prism/parse_result/comments.rb",
+    "lib/prism/parse_result/errors.rb",
+    "lib/prism/parse_result/newlines.rb",
+    "lib/prism/pattern.rb",
+    "lib/prism/polyfill/append_as_bytes.rb",
+    "lib/prism/polyfill/byteindex.rb",
+    "lib/prism/polyfill/scan_byte.rb",
+    "lib/prism/polyfill/unpack1.rb",
+    "lib/prism/polyfill/warn.rb",
+    "lib/prism/reflection.rb",
+    "lib/prism/relocation.rb",
+    "lib/prism/serialize.rb",
+    "lib/prism/string_query.rb",
+    "lib/prism/translation.rb",
+    "lib/prism/translation/parser.rb",
+    "lib/prism/translation/parser_current.rb",
+    "lib/prism/translation/parser33.rb",
+    "lib/prism/translation/parser34.rb",
+    "lib/prism/translation/parser35.rb",
+    "lib/prism/translation/parser/builder.rb",
+    "lib/prism/translation/parser/compiler.rb",
+    "lib/prism/translation/parser/lexer.rb",
+    "lib/prism/translation/ripper.rb",
+    "lib/prism/translation/ripper/sexp.rb",
+    "lib/prism/translation/ripper/shim.rb",
+    "lib/prism/translation/ruby_parser.rb",
+    "lib/prism/visitor.rb",
+    "prism.gemspec",
+    "rbi/prism.rbi",
+    "rbi/prism/compiler.rbi",
+    "rbi/prism/dsl.rbi",
+    "rbi/prism/inspect_visitor.rbi",
+    "rbi/prism/node_ext.rbi",
+    "rbi/prism/node.rbi",
+    "rbi/prism/parse_result.rbi",
+    "rbi/prism/reflection.rbi",
+    "rbi/prism/string_query.rbi",
+    "rbi/prism/translation/parser.rbi",
+    "rbi/prism/translation/parser33.rbi",
+    "rbi/prism/translation/parser34.rbi",
+    "rbi/prism/translation/parser35.rbi",
+    "rbi/prism/translation/ripper.rbi",
+    "rbi/prism/visitor.rbi",
+    "sig/prism.rbs",
+    "sig/prism/compiler.rbs",
+    "sig/prism/dispatcher.rbs",
+    "sig/prism/dot_visitor.rbs",
+    "sig/prism/dsl.rbs",
+    "sig/prism/inspect_visitor.rbs",
+    "sig/prism/lex_compat.rbs",
+    "sig/prism/mutation_compiler.rbs",
+    "sig/prism/node_ext.rbs",
+    "sig/prism/node.rbs",
+    "sig/prism/pack.rbs",
+    "sig/prism/parse_result.rbs",
+    "sig/prism/parse_result/comments.rbs",
+    "sig/prism/pattern.rbs",
+    "sig/prism/reflection.rbs",
+    "sig/prism/relocation.rbs",
+    "sig/prism/serialize.rbs",
+    "sig/prism/string_query.rbs",
+    "sig/prism/visitor.rbs",
+    "src/diagnostic.c",
+    "src/encoding.c",
+    "src/node.c",
+    "src/options.c",
+    "src/pack.c",
+    "src/prettyprint.c",
+    "src/prism.c",
+    "src/regexp.c",
+    "src/serialize.c",
+    "src/static_literals.c",
+    "src/token_type.c",
+    "src/util/pm_buffer.c",
+    "src/util/pm_char.c",
+    "src/util/pm_constant_pool.c",
+    "src/util/pm_integer.c",
+    "src/util/pm_list.c",
+    "src/util/pm_memchr.c",
+    "src/util/pm_newline_list.c",
+    "src/util/pm_string.c",
+    "src/util/pm_strncasecmp.c",
+    "src/util/pm_strpbrk.c"
+  ]
+
+  spec.extensions = ["ext/prism/extconf.rb"]
+  spec.metadata["allowed_push_host"] = "https://rubygems.org"
+  spec.metadata["source_code_uri"] = "https://github.com/ruby/prism"
+  spec.metadata["changelog_uri"] = "https://github.com/ruby/prism/blob/main/CHANGELOG.md"
+end
diff --git a/lib/prism/relocation.rb b/lib/prism/relocation.rb
new file mode 100644
index 00000000000000..3e9210a7853431
--- /dev/null
+++ b/lib/prism/relocation.rb
@@ -0,0 +1,505 @@
+# frozen_string_literal: true
+# :markup: markdown
+
+module Prism
+  # Prism parses deterministically for the same input. This provides a nice
+  # property that is exposed through the #node_id API on nodes. Effectively this
+  # means that for the same input, these values will remain consistent every
+  # time the source is parsed. This means we can reparse the source same with a
+  # #node_id value and find the exact same node again.
+  #
+  # The Relocation module provides an API around this property. It allows you to
+  # "save" nodes and locations using a minimal amount of memory (just the
+  # node_id and a field identifier) and then reify them later.
+  module Relocation
+    # An entry in a repository that will lazily reify its values when they are
+    # first accessed.
+    class Entry
+      # Raised if a value that could potentially be on an entry is missing
+      # because it was either not configured on the repository or it has not yet
+      # been fetched.
+      class MissingValueError < StandardError
+      end
+
+      # Initialize a new entry with the given repository.
+      def initialize(repository)
+        @repository = repository
+        @values = nil
+      end
+
+      # Fetch the filepath of the value.
+      def filepath
+        fetch_value(:filepath)
+      end
+
+      # Fetch the start line of the value.
+      def start_line
+        fetch_value(:start_line)
+      end
+
+      # Fetch the end line of the value.
+      def end_line
+        fetch_value(:end_line)
+      end
+
+      # Fetch the start byte offset of the value.
+      def start_offset
+        fetch_value(:start_offset)
+      end
+
+      # Fetch the end byte offset of the value.
+      def end_offset
+        fetch_value(:end_offset)
+      end
+
+      # Fetch the start character offset of the value.
+      def start_character_offset
+        fetch_value(:start_character_offset)
+      end
+
+      # Fetch the end character offset of the value.
+      def end_character_offset
+        fetch_value(:end_character_offset)
+      end
+
+      # Fetch the start code units offset of the value, for the encoding that
+      # was configured on the repository.
+      def start_code_units_offset
+        fetch_value(:start_code_units_offset)
+      end
+
+      # Fetch the end code units offset of the value, for the encoding that was
+      # configured on the repository.
+      def end_code_units_offset
+        fetch_value(:end_code_units_offset)
+      end
+
+      # Fetch the start byte column of the value.
+      def start_column
+        fetch_value(:start_column)
+      end
+
+      # Fetch the end byte column of the value.
+      def end_column
+        fetch_value(:end_column)
+      end
+
+      # Fetch the start character column of the value.
+      def start_character_column
+        fetch_value(:start_character_column)
+      end
+
+      # Fetch the end character column of the value.
+      def end_character_column
+        fetch_value(:end_character_column)
+      end
+
+      # Fetch the start code units column of the value, for the encoding that
+      # was configured on the repository.
+      def start_code_units_column
+        fetch_value(:start_code_units_column)
+      end
+
+      # Fetch the end code units column of the value, for the encoding that was
+      # configured on the repository.
+      def end_code_units_column
+        fetch_value(:end_code_units_column)
+      end
+
+      # Fetch the leading comments of the value.
+      def leading_comments
+        fetch_value(:leading_comments)
+      end
+
+      # Fetch the trailing comments of the value.
+      def trailing_comments
+        fetch_value(:trailing_comments)
+      end
+
+      # Fetch the leading and trailing comments of the value.
+      def comments
+        leading_comments.concat(trailing_comments)
+      end
+
+      # Reify the values on this entry with the given values. This is an
+      # internal-only API that is called from the repository when it is time to
+      # reify the values.
+      def reify!(values) # :nodoc:
+        @repository = nil
+        @values = values
+      end
+
+      private
+
+      # Fetch a value from the entry, raising an error if it is missing.
+      def fetch_value(name)
+        values.fetch(name) do
+          raise MissingValueError, "No value for #{name}, make sure the " \
+            "repository has been properly configured"
+        end
+      end
+
+      # Return the values from the repository, reifying them if necessary.
+      def values
+        @values || (@repository.reify!; @values)
+      end
+    end
+
+    # Represents the source of a repository that will be reparsed.
+    class Source
+      # The value that will need to be reparsed.
+      attr_reader :value
+
+      # Initialize the source with the given value.
+      def initialize(value)
+        @value = value
+      end
+
+      # Reparse the value and return the parse result.
+      def result
+        raise NotImplementedError, "Subclasses must implement #result"
+      end
+
+      # Create a code units cache for the given encoding.
+      def code_units_cache(encoding)
+        result.code_units_cache(encoding)
+      end
+    end
+
+    # A source that is represented by a file path.
+    class SourceFilepath < Source
+      # Reparse the file and return the parse result.
+      def result
+        Prism.parse_file(value)
+      end
+    end
+
+    # A source that is represented by a string.
+    class SourceString < Source
+      # Reparse the string and return the parse result.
+      def result
+        Prism.parse(value)
+      end
+    end
+
+    # A field that represents the file path.
+    class FilepathField
+      # The file path that this field represents.
+      attr_reader :value
+
+      # Initialize a new field with the given file path.
+      def initialize(value)
+        @value = value
+      end
+
+      # Fetch the file path.
+      def fields(_value)
+        { filepath: value }
+      end
+    end
+
+    # A field representing the start and end lines.
+    class LinesField
+      # Fetches the start and end line of a value.
+      def fields(value)
+        { start_line: value.start_line, end_line: value.end_line }
+      end
+    end
+
+    # A field representing the start and end byte offsets.
+    class OffsetsField
+      # Fetches the start and end byte offset of a value.
+      def fields(value)
+        { start_offset: value.start_offset, end_offset: value.end_offset }
+      end
+    end
+
+    # A field representing the start and end character offsets.
+    class CharacterOffsetsField
+      # Fetches the start and end character offset of a value.
+      def fields(value)
+        {
+          start_character_offset: value.start_character_offset,
+          end_character_offset: value.end_character_offset
+        }
+      end
+    end
+
+    # A field representing the start and end code unit offsets.
+    class CodeUnitOffsetsField
+      # A pointer to the repository object that is used for lazily creating a
+      # code units cache.
+      attr_reader :repository
+
+      # The associated encoding for the code units.
+      attr_reader :encoding
+
+      # Initialize a new field with the associated repository and encoding.
+      def initialize(repository, encoding)
+        @repository = repository
+        @encoding = encoding
+        @cache = nil
+      end
+
+      # Fetches the start and end code units offset of a value for a particular
+      # encoding.
+      def fields(value)
+        {
+          start_code_units_offset: value.cached_start_code_units_offset(cache),
+          end_code_units_offset: value.cached_end_code_units_offset(cache)
+        }
+      end
+
+      private
+
+      # Lazily create a code units cache for the associated encoding.
+      def cache
+        @cache ||= repository.code_units_cache(encoding)
+      end
+    end
+
+    # A field representing the start and end byte columns.
+    class ColumnsField
+      # Fetches the start and end byte column of a value.
+      def fields(value)
+        { start_column: value.start_column, end_column: value.end_column }
+      end
+    end
+
+    # A field representing the start and end character columns.
+    class CharacterColumnsField
+      # Fetches the start and end character column of a value.
+      def fields(value)
+        {
+          start_character_column: value.start_character_column,
+          end_character_column: value.end_character_column
+        }
+      end
+    end
+
+    # A field representing the start and end code unit columns for a specific
+    # encoding.
+    class CodeUnitColumnsField
+      # The repository object that is used for lazily creating a code units
+      # cache.
+      attr_reader :repository
+
+      # The associated encoding for the code units.
+      attr_reader :encoding
+
+      # Initialize a new field with the associated repository and encoding.
+      def initialize(repository, encoding)
+        @repository = repository
+        @encoding = encoding
+        @cache = nil
+      end
+
+      # Fetches the start and end code units column of a value for a particular
+      # encoding.
+      def fields(value)
+        {
+          start_code_units_column: value.cached_start_code_units_column(cache),
+          end_code_units_column: value.cached_end_code_units_column(cache)
+        }
+      end
+
+      private
+
+      # Lazily create a code units cache for the associated encoding.
+      def cache
+        @cache ||= repository.code_units_cache(encoding)
+      end
+    end
+
+    # An abstract field used as the parent class of the two comments fields.
+    class CommentsField
+      # An object that represents a slice of a comment.
+      class Comment
+        # The slice of the comment.
+        attr_reader :slice
+
+        # Initialize a new comment with the given slice.
+        def initialize(slice)
+          @slice = slice
+        end
+      end
+
+      private
+
+      # Create comment objects from the given values.
+      def comments(values)
+        values.map { |value| Comment.new(value.slice) }
+      end
+    end
+
+    # A field representing the leading comments.
+    class LeadingCommentsField < CommentsField
+      # Fetches the leading comments of a value.
+      def fields(value)
+        { leading_comments: comments(value.leading_comments) }
+      end
+    end
+
+    # A field representing the trailing comments.
+    class TrailingCommentsField < CommentsField
+      # Fetches the trailing comments of a value.
+      def fields(value)
+        { trailing_comments: comments(value.trailing_comments) }
+      end
+    end
+
+    # A repository is a configured collection of fields and a set of entries
+    # that knows how to reparse a source and reify the values.
+    class Repository
+      # Raised when multiple fields of the same type are configured on the same
+      # repository.
+      class ConfigurationError < StandardError
+      end
+
+      # The source associated with this repository. This will be either a
+      # SourceFilepath (the most common use case) or a SourceString.
+      attr_reader :source
+
+      # The fields that have been configured on this repository.
+      attr_reader :fields
+
+      # The entries that have been saved on this repository.
+      attr_reader :entries
+
+      # Initialize a new repository with the given source.
+      def initialize(source)
+        @source = source
+        @fields = {}
+        @entries = Hash.new { |hash, node_id| hash[node_id] = {} }
+      end
+
+      # Create a code units cache for the given encoding from the source.
+      def code_units_cache(encoding)
+        source.code_units_cache(encoding)
+      end
+
+      # Configure the filepath field for this repository and return self.
+      def filepath
+        raise ConfigurationError, "Can only specify filepath for a filepath source" unless source.is_a?(SourceFilepath)
+        field(:filepath, FilepathField.new(source.value))
+      end
+
+      # Configure the lines field for this repository and return self.
+      def lines
+        field(:lines, LinesField.new)
+      end
+
+      # Configure the offsets field for this repository and return self.
+      def offsets
+        field(:offsets, OffsetsField.new)
+      end
+
+      # Configure the character offsets field for this repository and return
+      # self.
+      def character_offsets
+        field(:character_offsets, CharacterOffsetsField.new)
+      end
+
+      # Configure the code unit offsets field for this repository for a specific
+      # encoding and return self.
+      def code_unit_offsets(encoding)
+        field(:code_unit_offsets, CodeUnitOffsetsField.new(self, encoding))
+      end
+
+      # Configure the columns field for this repository and return self.
+      def columns
+        field(:columns, ColumnsField.new)
+      end
+
+      # Configure the character columns field for this repository and return
+      # self.
+      def character_columns
+        field(:character_columns, CharacterColumnsField.new)
+      end
+
+      # Configure the code unit columns field for this repository for a specific
+      # encoding and return self.
+      def code_unit_columns(encoding)
+        field(:code_unit_columns, CodeUnitColumnsField.new(self, encoding))
+      end
+
+      # Configure the leading comments field for this repository and return
+      # self.
+      def leading_comments
+        field(:leading_comments, LeadingCommentsField.new)
+      end
+
+      # Configure the trailing comments field for this repository and return
+      # self.
+      def trailing_comments
+        field(:trailing_comments, TrailingCommentsField.new)
+      end
+
+      # Configure both the leading and trailing comment fields for this
+      # repository and return self.
+      def comments
+        leading_comments.trailing_comments
+      end
+
+      # This method is called from nodes and locations when they want to enter
+      # themselves into the repository. It it internal-only and meant to be
+      # called from the #save* APIs.
+      def enter(node_id, field_name) # :nodoc:
+        entry = Entry.new(self)
+        @entries[node_id][field_name] = entry
+        entry
+      end
+
+      # This method is called from the entries in the repository when they need
+      # to reify their values. It is internal-only and meant to be called from
+      # the various value APIs.
+      def reify! # :nodoc:
+        result = source.result
+
+        # Attach the comments if they have been requested as part of the
+        # configuration of this repository.
+        if fields.key?(:leading_comments) || fields.key?(:trailing_comments)
+          result.attach_comments!
+        end
+
+        queue = [result.value] #: Array[Prism::node]
+        while (node = queue.shift)
+          @entries[node.node_id].each do |field_name, entry|
+            value = node.public_send(field_name)
+            values = {} #: Hash[Symbol, untyped]
+
+            fields.each_value do |field|
+              values.merge!(field.fields(value))
+            end
+
+            entry.reify!(values)
+          end
+
+          queue.concat(node.compact_child_nodes)
+        end
+
+        @entries.clear
+      end
+
+      private
+
+      # Append the given field to the repository and return the repository so
+      # that these calls can be chained.
+      def field(name, value)
+        raise ConfigurationError, "Cannot specify multiple #{name} fields" if @fields.key?(name)
+        @fields[name] = value
+        self
+      end
+    end
+
+    # Create a new repository for the given filepath.
+    def self.filepath(value)
+      Repository.new(SourceFilepath.new(value))
+    end
+
+    # Create a new repository for the given string.
+    def self.string(value)
+      Repository.new(SourceString.new(value))
+    end
+  end
+end
diff --git a/lib/prism/string_query.rb b/lib/prism/string_query.rb
new file mode 100644
index 00000000000000..547f58d2fa6c92
--- /dev/null
+++ b/lib/prism/string_query.rb
@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+# :markup: markdown
+
+module Prism
+  # Query methods that allow categorizing strings based on their context for
+  # where they could be valid in a Ruby syntax tree.
+  class StringQuery
+    # The string that this query is wrapping.
+    attr_reader :string
+
+    # Initialize a new query with the given string.
+    def initialize(string)
+      @string = string
+    end
+
+    # Whether or not this string is a valid local variable name.
+    def local?
+      StringQuery.local?(string)
+    end
+
+    # Whether or not this string is a valid constant name.
+    def constant?
+      StringQuery.constant?(string)
+    end
+
+    # Whether or not this string is a valid method name.
+    def method_name?
+      StringQuery.method_name?(string)
+    end
+  end
+end
diff --git a/lib/prism/translation.rb b/lib/prism/translation.rb
new file mode 100644
index 00000000000000..d127f2006c59f2
--- /dev/null
+++ b/lib/prism/translation.rb
@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+# :markup: markdown
+
+module Prism
+  # This module is responsible for converting the prism syntax tree into other
+  # syntax trees.
+  module Translation # steep:ignore
+    autoload :Parser, "prism/translation/parser"
+    autoload :ParserCurrent, "prism/translation/parser_current"
+    autoload :Parser33, "prism/translation/parser33"
+    autoload :Parser34, "prism/translation/parser34"
+    autoload :Parser35, "prism/translation/parser35"
+    autoload :Ripper, "prism/translation/ripper"
+    autoload :RubyParser, "prism/translation/ruby_parser"
+  end
+end
diff --git a/lib/prism/translation/parser.rb b/lib/prism/translation/parser.rb
new file mode 100644
index 00000000000000..a7888f77ecced1
--- /dev/null
+++ b/lib/prism/translation/parser.rb
@@ -0,0 +1,367 @@
+# frozen_string_literal: true
+# :markup: markdown
+
+begin
+  required_version = ">= 3.3.7.2"
+  gem "parser", required_version
+  require "parser"
+rescue LoadError
+  warn(<<~MSG)
+    Error: Unable to load parser #{required_version}. \
+    Add `gem "parser"` to your Gemfile or run `bundle update parser`.
+  MSG
+  exit(1)
+end
+
+module Prism
+  module Translation
+    # This class is the entry-point for converting a prism syntax tree into the
+    # whitequark/parser gem's syntax tree. It inherits from the base parser for
+    # the parser gem, and overrides the parse* methods to parse with prism and
+    # then translate.
+    class Parser < ::Parser::Base
+      Diagnostic = ::Parser::Diagnostic # :nodoc:
+      private_constant :Diagnostic
+
+      # The parser gem has a list of diagnostics with a hard-coded set of error
+      # messages. We create our own diagnostic class in order to set our own
+      # error messages.
+      class PrismDiagnostic < Diagnostic
+        # This is the cached message coming from prism.
+        attr_reader :message
+
+        # Initialize a new diagnostic with the given message and location.
+        def initialize(message, level, reason, location)
+          @message = message
+          super(level, reason, {}, location, [])
+        end
+      end
+
+      Racc_debug_parser = false # :nodoc:
+
+      # The `builder` argument is used to create the parser using our custom builder class by default.
+      #
+      # By using the `:parser` keyword argument, you can translate in a way that is compatible with
+      # the Parser gem using any parser.
+      #
+      # For example, in RuboCop for Ruby LSP, the following approach can be used to improve performance
+      # by reusing a pre-parsed `Prism::ParseLexResult`:
+      #
+      #   class PrismPreparsed
+      #     def initialize(prism_result)
+      #       @prism_result = prism_result
+      #     end
+      #
+      #     def parse_lex(source, **options)
+      #       @prism_result
+      #     end
+      #   end
+      #
+      #   prism_preparsed = PrismPreparsed.new(prism_result)
+      #
+      #   Prism::Translation::Ruby34.new(builder, parser: prism_preparsed)
+      #
+      # In an object passed to the `:parser` keyword argument, the `parse` and `parse_lex` methods
+      # should be implemented as needed.
+      #
+      def initialize(builder = Prism::Translation::Parser::Builder.new, parser: Prism)
+        if !builder.is_a?(Prism::Translation::Parser::Builder)
+          warn(<<~MSG, uplevel: 1, category: :deprecated)
+            [deprecation]: The builder passed to `Prism::Translation::Parser.new` is not a \
+            `Prism::Translation::Parser::Builder` subclass. This will raise in the next major version.
+          MSG
+        end
+        @parser = parser
+
+        super(builder)
+      end
+
+      def version # :nodoc:
+        34
+      end
+
+      # The default encoding for Ruby files is UTF-8.
+      def default_encoding
+        Encoding::UTF_8
+      end
+
+      def yyerror # :nodoc:
+      end
+
+      # Parses a source buffer and returns the AST.
+      def parse(source_buffer)
+        @source_buffer = source_buffer
+        source = source_buffer.source
+
+        offset_cache = build_offset_cache(source)
+        result = unwrap(@parser.parse(source, **prism_options), offset_cache)
+
+        build_ast(result.value, offset_cache)
+      ensure
+        @source_buffer = nil
+      end
+
+      # Parses a source buffer and returns the AST and the source code comments.
+      def parse_with_comments(source_buffer)
+        @source_buffer = source_buffer
+        source = source_buffer.source
+
+        offset_cache = build_offset_cache(source)
+        result = unwrap(@parser.parse(source, **prism_options), offset_cache)
+
+        [
+          build_ast(result.value, offset_cache),
+          build_comments(result.comments, offset_cache)
+        ]
+      ensure
+        @source_buffer = nil
+      end
+
+      # Parses a source buffer and returns the AST, the source code comments,
+      # and the tokens emitted by the lexer.
+      def tokenize(source_buffer, recover = false)
+        @source_buffer = source_buffer
+        source = source_buffer.source
+
+        offset_cache = build_offset_cache(source)
+        result =
+          begin
+            unwrap(@parser.parse_lex(source, **prism_options), offset_cache)
+          rescue ::Parser::SyntaxError
+            raise if !recover
+          end
+
+        program, tokens = result.value
+        ast = build_ast(program, offset_cache) if result.success?
+
+        [
+          ast,
+          build_comments(result.comments, offset_cache),
+          build_tokens(tokens, offset_cache)
+        ]
+      ensure
+        @source_buffer = nil
+      end
+
+      # Since prism resolves num params for us, we don't need to support this
+      # kind of logic here.
+      def try_declare_numparam(node)
+        node.children[0].match?(/\A_[1-9]\z/)
+      end
+
+      private
+
+      # This is a hook to allow consumers to disable some errors if they don't
+      # want them to block creating the syntax tree.
+      def valid_error?(error)
+        true
+      end
+
+      # This is a hook to allow consumers to disable some warnings if they don't
+      # want them to block creating the syntax tree.
+      def valid_warning?(warning)
+        true
+      end
+
+      # Build a diagnostic from the given prism parse error.
+      def error_diagnostic(error, offset_cache)
+        location = error.location
+        diagnostic_location = build_range(location, offset_cache)
+
+        case error.type
+        when :argument_block_multi
+          Diagnostic.new(:error, :block_and_blockarg, {}, diagnostic_location, [])
+        when :argument_formal_constant
+          Diagnostic.new(:error, :argument_const, {}, diagnostic_location, [])
+        when :argument_formal_class
+          Diagnostic.new(:error, :argument_cvar, {}, diagnostic_location, [])
+        when :argument_formal_global
+          Diagnostic.new(:error, :argument_gvar, {}, diagnostic_location, [])
+        when :argument_formal_ivar
+          Diagnostic.new(:error, :argument_ivar, {}, diagnostic_location, [])
+        when :argument_no_forwarding_amp
+          Diagnostic.new(:error, :no_anonymous_blockarg, {}, diagnostic_location, [])
+        when :argument_no_forwarding_star
+          Diagnostic.new(:error, :no_anonymous_restarg, {}, diagnostic_location, [])
+        when :argument_no_forwarding_star_star
+          Diagnostic.new(:error, :no_anonymous_kwrestarg, {}, diagnostic_location, [])
+        when :begin_lonely_else
+          location = location.copy(length: 4)
+          diagnostic_location = build_range(location, offset_cache)
+          Diagnostic.new(:error, :useless_else, {}, diagnostic_location, [])
+        when :class_name, :module_name
+          Diagnostic.new(:error, :module_name_const, {}, diagnostic_location, [])
+        when :class_in_method
+          Diagnostic.new(:error, :class_in_def, {}, diagnostic_location, [])
+        when :def_endless_setter
+          Diagnostic.new(:error, :endless_setter, {}, diagnostic_location, [])
+        when :embdoc_term
+          Diagnostic.new(:error, :embedded_document, {}, diagnostic_location, [])
+        when :incomplete_variable_class, :incomplete_variable_class_3_3
+          location = location.copy(length: location.length + 1)
+          diagnostic_location = build_range(location, offset_cache)
+
+          Diagnostic.new(:error, :cvar_name, { name: location.slice }, diagnostic_location, [])
+        when :incomplete_variable_instance, :incomplete_variable_instance_3_3
+          location = location.copy(length: location.length + 1)
+          diagnostic_location = build_range(location, offset_cache)
+
+          Diagnostic.new(:error, :ivar_name, { name: location.slice }, diagnostic_location, [])
+        when :invalid_variable_global, :invalid_variable_global_3_3
+          Diagnostic.new(:error, :gvar_name, { name: location.slice }, diagnostic_location, [])
+        when :module_in_method
+          Diagnostic.new(:error, :module_in_def, {}, diagnostic_location, [])
+        when :numbered_parameter_ordinary
+          Diagnostic.new(:error, :ordinary_param_defined, {}, diagnostic_location, [])
+        when :numbered_parameter_outer_scope
+          Diagnostic.new(:error, :numparam_used_in_outer_scope, {}, diagnostic_location, [])
+        when :parameter_circular
+          Diagnostic.new(:error, :circular_argument_reference, { var_name: location.slice }, diagnostic_location, [])
+        when :parameter_name_repeat
+          Diagnostic.new(:error, :duplicate_argument, {}, diagnostic_location, [])
+        when :parameter_numbered_reserved
+          Diagnostic.new(:error, :reserved_for_numparam, { name: location.slice }, diagnostic_location, [])
+        when :regexp_unknown_options
+          Diagnostic.new(:error, :regexp_options, { options: location.slice[1..] }, diagnostic_location, [])
+        when :singleton_for_literals
+          Diagnostic.new(:error, :singleton_literal, {}, diagnostic_location, [])
+        when :string_literal_eof
+          Diagnostic.new(:error, :string_eof, {}, diagnostic_location, [])
+        when :unexpected_token_ignore
+          Diagnostic.new(:error, :unexpected_token, { token: location.slice }, diagnostic_location, [])
+        when :write_target_in_method
+          Diagnostic.new(:error, :dynamic_const, {}, diagnostic_location, [])
+        else
+          PrismDiagnostic.new(error.message, :error, error.type, diagnostic_location)
+        end
+      end
+
+      # Build a diagnostic from the given prism parse warning.
+      def warning_diagnostic(warning, offset_cache)
+        diagnostic_location = build_range(warning.location, offset_cache)
+
+        case warning.type
+        when :ambiguous_first_argument_plus
+          Diagnostic.new(:warning, :ambiguous_prefix, { prefix: "+" }, diagnostic_location, [])
+        when :ambiguous_first_argument_minus
+          Diagnostic.new(:warning, :ambiguous_prefix, { prefix: "-" }, diagnostic_location, [])
+        when :ambiguous_prefix_ampersand
+          Diagnostic.new(:warning, :ambiguous_prefix, { prefix: "&" }, diagnostic_location, [])
+        when :ambiguous_prefix_star
+          Diagnostic.new(:warning, :ambiguous_prefix, { prefix: "*" }, diagnostic_location, [])
+        when :ambiguous_prefix_star_star
+          Diagnostic.new(:warning, :ambiguous_prefix, { prefix: "**" }, diagnostic_location, [])
+        when :ambiguous_slash
+          Diagnostic.new(:warning, :ambiguous_regexp, {}, diagnostic_location, [])
+        when :dot_dot_dot_eol
+          Diagnostic.new(:warning, :triple_dot_at_eol, {}, diagnostic_location, [])
+        when :duplicated_hash_key
+          # skip, parser does this on its own
+        else
+          PrismDiagnostic.new(warning.message, :warning, warning.type, diagnostic_location)
+        end
+      end
+
+      # If there was a error generated during the parse, then raise an
+      # appropriate syntax error. Otherwise return the result.
+      def unwrap(result, offset_cache)
+        result.errors.each do |error|
+          next unless valid_error?(error)
+          diagnostics.process(error_diagnostic(error, offset_cache))
+        end
+
+        result.warnings.each do |warning|
+          next unless valid_warning?(warning)
+          diagnostic = warning_diagnostic(warning, offset_cache)
+          diagnostics.process(diagnostic) if diagnostic
+        end
+
+        result
+      end
+
+      # Prism deals with offsets in bytes, while the parser gem deals with
+      # offsets in characters. We need to handle this conversion in order to
+      # build the parser gem AST.
+      #
+      # If the bytesize of the source is the same as the length, then we can
+      # just use the offset directly. Otherwise, we build an array where the
+      # index is the byte offset and the value is the character offset.
+      def build_offset_cache(source)
+        if source.bytesize == source.length
+          -> (offset) { offset }
+        else
+          offset_cache = []
+          offset = 0
+
+          source.each_char do |char|
+            char.bytesize.times { offset_cache << offset }
+            offset += 1
+          end
+
+          offset_cache << offset
+        end
+      end
+
+      # Build the parser gem AST from the prism AST.
+      def build_ast(program, offset_cache)
+        program.accept(Compiler.new(self, offset_cache))
+      end
+
+      # Build the parser gem comments from the prism comments.
+      def build_comments(comments, offset_cache)
+        comments.map do |comment|
+          ::Parser::Source::Comment.new(build_range(comment.location, offset_cache))
+        end
+      end
+
+      # Build the parser gem tokens from the prism tokens.
+      def build_tokens(tokens, offset_cache)
+        Lexer.new(source_buffer, tokens, offset_cache).to_a
+      end
+
+      # Build a range from a prism location.
+      def build_range(location, offset_cache)
+        ::Parser::Source::Range.new(
+          source_buffer,
+          offset_cache[location.start_offset],
+          offset_cache[location.end_offset]
+        )
+      end
+
+      # Options for how prism should parse/lex the source.
+      def prism_options
+        options = {
+          filepath: @source_buffer.name,
+          version: convert_for_prism(version),
+          partial_script: true,
+        }
+        # The parser gem always encodes to UTF-8, unless it is binary.
+        # https://github.com/whitequark/parser/blob/v3.3.6.0/lib/parser/source/buffer.rb#L80-L107
+        options[:encoding] = false if @source_buffer.source.encoding != Encoding::BINARY
+
+        options
+      end
+
+      # Converts the version format handled by Parser to the format handled by Prism.
+      def convert_for_prism(version)
+        case version
+        when 33
+          "3.3.1"
+        when 34
+          "3.4.0"
+        when 35
+          "3.5.0"
+        else
+          "latest"
+        end
+      end
+
+      require_relative "parser/builder"
+      require_relative "parser/compiler"
+      require_relative "parser/lexer"
+
+      private_constant :Compiler
+      private_constant :Lexer
+    end
+  end
+end
diff --git a/lib/prism/translation/parser/builder.rb b/lib/prism/translation/parser/builder.rb
new file mode 100644
index 00000000000000..6b620c25bc9658
--- /dev/null
+++ b/lib/prism/translation/parser/builder.rb
@@ -0,0 +1,62 @@
+# frozen_string_literal: true
+# :markup: markdown
+
+module Prism
+  module Translation
+    class Parser
+      # A builder that knows how to convert more modern Ruby syntax
+      # into whitequark/parser gem's syntax tree.
+      class Builder < ::Parser::Builders::Default
+        # It represents the `it` block argument, which is not yet implemented in the Parser gem.
+        def itarg
+          n(:itarg, [:it], nil)
+        end
+
+        # The following three lines have been added to support the `it` block parameter syntax in the source code below.
+        #
+        #   if args.type == :itarg
+        #     block_type = :itblock
+        #     args = :it
+        #
+        # https://github.com/whitequark/parser/blob/v3.3.7.1/lib/parser/builders/default.rb#L1122-L1155
+        def block(method_call, begin_t, args, body, end_t)
+          _receiver, _selector, *call_args = *method_call
+
+          if method_call.type == :yield
+            diagnostic :error, :block_given_to_yield, nil, method_call.loc.keyword, [loc(begin_t)]
+          end
+
+          last_arg = call_args.last
+          if last_arg && (last_arg.type == :block_pass || last_arg.type == :forwarded_args)
+            diagnostic :error, :block_and_blockarg, nil, last_arg.loc.expression, [loc(begin_t)]
+          end
+
+          if args.type == :itarg
+            block_type = :itblock
+            args = :it
+          elsif args.type == :numargs
+            block_type = :numblock
+            args = args.children[0]
+          else
+            block_type = :block
+          end
+
+          if [:send, :csend, :index, :super, :zsuper, :lambda].include?(method_call.type)
+            n(block_type, [ method_call, args, body ],
+              block_map(method_call.loc.expression, begin_t, end_t))
+          else
+            # Code like "return foo 1 do end" is reduced in a weird sequence.
+            # Here, method_call is actually (return).
+            actual_send, = *method_call
+            block =
+              n(block_type, [ actual_send, args, body ],
+                block_map(actual_send.loc.expression, begin_t, end_t))
+
+            n(method_call.type, [ block ],
+              method_call.loc.with_expression(join_exprs(method_call, block)))
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/lib/prism/translation/parser/compiler.rb b/lib/prism/translation/parser/compiler.rb
new file mode 100644
index 00000000000000..6e0618890de6a7
--- /dev/null
+++ b/lib/prism/translation/parser/compiler.rb
@@ -0,0 +1,2234 @@
+# frozen_string_literal: true
+# :markup: markdown
+
+module Prism
+  module Translation
+    class Parser
+      # A visitor that knows how to convert a prism syntax tree into the
+      # whitequark/parser gem's syntax tree.
+      class Compiler < ::Prism::Compiler
+        # Raised when the tree is malformed or there is a bug in the compiler.
+        class CompilationError < StandardError
+        end
+
+        # The Parser::Base instance that is being used to build the AST.
+        attr_reader :parser
+
+        # The Parser::Builders::Default instance that is being used to build the
+        # AST.
+        attr_reader :builder
+
+        # The Parser::Source::Buffer instance that is holding a reference to the
+        # source code.
+        attr_reader :source_buffer
+
+        # The offset cache that is used to map between byte and character
+        # offsets in the file.
+        attr_reader :offset_cache
+
+        # The types of values that can be forwarded in the current scope.
+        attr_reader :forwarding
+
+        # Whether or not the current node is in a destructure.
+        attr_reader :in_destructure
+
+        # Whether or not the current node is in a pattern.
+        attr_reader :in_pattern
+
+        # Initialize a new compiler with the given parser, offset cache, and
+        # options.
+        def initialize(parser, offset_cache, forwarding: [], in_destructure: false, in_pattern: false)
+          @parser = parser
+          @builder = parser.builder
+          @source_buffer = parser.source_buffer
+          @offset_cache = offset_cache
+
+          @forwarding = forwarding
+          @in_destructure = in_destructure
+          @in_pattern = in_pattern
+        end
+
+        # alias foo bar
+        # ^^^^^^^^^^^^^
+        def visit_alias_method_node(node)
+          builder.alias(token(node.keyword_loc), visit(node.new_name), visit(node.old_name))
+        end
+
+        # alias $foo $bar
+        # ^^^^^^^^^^^^^^^
+        def visit_alias_global_variable_node(node)
+          builder.alias(token(node.keyword_loc), visit(node.new_name), visit(node.old_name))
+        end
+
+        # foo => bar | baz
+        #        ^^^^^^^^^
+        def visit_alternation_pattern_node(node)
+          builder.match_alt(visit(node.left), token(node.operator_loc), visit(node.right))
+        end
+
+        # a and b
+        # ^^^^^^^
+        def visit_and_node(node)
+          builder.logical_op(:and, visit(node.left), token(node.operator_loc), visit(node.right))
+        end
+
+        # []
+        # ^^
+        def visit_array_node(node)
+          if node.opening&.start_with?("%w", "%W", "%i", "%I")
+            elements = node.elements.flat_map do |element|
+              if element.is_a?(StringNode)
+                if element.content.include?("\n")
+                  string_nodes_from_line_continuations(element.unescaped, element.content, element.content_loc.start_offset, node.opening)
+                else
+                  [builder.string_internal([element.unescaped, srange(element.content_loc)])]
+                end
+              elsif element.is_a?(InterpolatedStringNode)
+                builder.string_compose(
+                  token(element.opening_loc),
+                  string_nodes_from_interpolation(element, node.opening),
+                  token(element.closing_loc)
+                )
+              else
+                [visit(element)]
+              end
+            end
+          else
+            elements = visit_all(node.elements)
+          end
+
+          builder.array(token(node.opening_loc), elements, token(node.closing_loc))
+        end
+
+        # foo => [bar]
+        #        ^^^^^
+        def visit_array_pattern_node(node)
+          elements = [*node.requireds]
+          elements << node.rest if !node.rest.nil? && !node.rest.is_a?(ImplicitRestNode)
+          elements.concat(node.posts)
+          visited = visit_all(elements)
+
+          if node.rest.is_a?(ImplicitRestNode)
+            visited[-1] = builder.match_with_trailing_comma(visited[-1], token(node.rest.location))
+          end
+
+          if node.constant
+            if visited.empty?
+              builder.const_pattern(visit(node.constant), token(node.opening_loc), builder.array_pattern(token(node.opening_loc), visited, token(node.closing_loc)), token(node.closing_loc))
+            else
+              builder.const_pattern(visit(node.constant), token(node.opening_loc), builder.array_pattern(nil, visited, nil), token(node.closing_loc))
+            end
+          else
+            builder.array_pattern(token(node.opening_loc), visited, token(node.closing_loc))
+          end
+        end
+
+        # foo(bar)
+        #     ^^^
+        def visit_arguments_node(node)
+          visit_all(node.arguments)
+        end
+
+        # { a: 1 }
+        #   ^^^^
+        def visit_assoc_node(node)
+          key = node.key
+
+          if  node.value.is_a?(ImplicitNode)
+            if in_pattern
+              if key.is_a?(SymbolNode)
+                if key.opening.nil?
+                  builder.match_hash_var([key.unescaped, srange(key.location)])
+                else
+                  builder.match_hash_var_from_str(token(key.opening_loc), [builder.string_internal([key.unescaped, srange(key.value_loc)])], token(key.closing_loc))
+                end
+              else
+                builder.match_hash_var_from_str(token(key.opening_loc), visit_all(key.parts), token(key.closing_loc))
+              end
+            else
+              value = node.value.value
+
+              implicit_value = if value.is_a?(CallNode)
+                builder.call_method(nil, nil, [value.name, srange(value.message_loc)])
+              elsif value.is_a?(ConstantReadNode)
+                builder.const([value.name, srange(key.value_loc)])
+              else
+                builder.ident([value.name, srange(key.value_loc)]).updated(:lvar)
+              end
+
+              builder.pair_keyword([key.unescaped, srange(key)], implicit_value)
+            end
+          elsif node.operator_loc
+            builder.pair(visit(key), token(node.operator_loc), visit(node.value))
+          elsif key.is_a?(SymbolNode) && key.opening_loc.nil?
+            builder.pair_keyword([key.unescaped, srange(key.location)], visit(node.value))
+          else
+            parts =
+              if key.is_a?(SymbolNode)
+                [builder.string_internal([key.unescaped, srange(key.value_loc)])]
+              else
+                visit_all(key.parts)
+              end
+
+            builder.pair_quoted(token(key.opening_loc), parts, token(key.closing_loc), visit(node.value))
+          end
+        end
+
+        # def foo(**); bar(**); end
+        #                  ^^
+        #
+        # { **foo }
+        #   ^^^^^
+        def visit_assoc_splat_node(node)
+          if in_pattern
+            builder.match_rest(token(node.operator_loc), token(node.value&.location))
+          elsif node.value.nil? && forwarding.include?(:**)
+            builder.forwarded_kwrestarg(token(node.operator_loc))
+          else
+            builder.kwsplat(token(node.operator_loc), visit(node.value))
+          end
+        end
+
+        # $+
+        # ^^
+        def visit_back_reference_read_node(node)
+          builder.back_ref(token(node.location))
+        end
+
+        # begin end
+        # ^^^^^^^^^
+        def visit_begin_node(node)
+          rescue_bodies = []
+
+          if (rescue_clause = node.rescue_clause)
+            begin
+              find_start_offset = (rescue_clause.reference&.location || rescue_clause.exceptions.last&.location || rescue_clause.keyword_loc).end_offset
+              find_end_offset = (
+                rescue_clause.statements&.location&.start_offset ||
+                rescue_clause.subsequent&.location&.start_offset ||
+                node.else_clause&.location&.start_offset ||
+                node.ensure_clause&.location&.start_offset ||
+                node.end_keyword_loc&.start_offset ||
+                find_start_offset + 1
+              )
+
+              rescue_bodies << builder.rescue_body(
+                token(rescue_clause.keyword_loc),
+                rescue_clause.exceptions.any? ? builder.array(nil, visit_all(rescue_clause.exceptions), nil) : nil,
+                token(rescue_clause.operator_loc),
+                visit(rescue_clause.reference),
+                srange_find(find_start_offset, find_end_offset, ";"),
+                visit(rescue_clause.statements)
+              )
+            end until (rescue_clause = rescue_clause.subsequent).nil?
+          end
+
+          begin_body =
+            builder.begin_body(
+              visit(node.statements),
+              rescue_bodies,
+              token(node.else_clause&.else_keyword_loc),
+              visit(node.else_clause),
+              token(node.ensure_clause&.ensure_keyword_loc),
+              visit(node.ensure_clause&.statements)
+            )
+
+          if node.begin_keyword_loc
+            builder.begin_keyword(token(node.begin_keyword_loc), begin_body, token(node.end_keyword_loc))
+          else
+            begin_body
+          end
+        end
+
+        # foo(&bar)
+        #     ^^^^
+        def visit_block_argument_node(node)
+          builder.block_pass(token(node.operator_loc), visit(node.expression))
+        end
+
+        # foo { |; bar| }
+        #          ^^^
+        def visit_block_local_variable_node(node)
+          builder.shadowarg(token(node.location))
+        end
+
+        # A block on a keyword or method call.
+        def visit_block_node(node)
+          raise CompilationError, "Cannot directly compile block nodes"
+        end
+
+        # def foo(&bar); end
+        #         ^^^^
+        def visit_block_parameter_node(node)
+          builder.blockarg(token(node.operator_loc), token(node.name_loc))
+        end
+
+        # A block's parameters.
+        def visit_block_parameters_node(node)
+          [*visit(node.parameters)].concat(visit_all(node.locals))
+        end
+
+        # break
+        # ^^^^^
+        #
+        # break foo
+        # ^^^^^^^^^
+        def visit_break_node(node)
+          builder.keyword_cmd(:break, token(node.keyword_loc), nil, visit(node.arguments) || [], nil)
+        end
+
+        # foo
+        # ^^^
+        #
+        # foo.bar
+        # ^^^^^^^
+        #
+        # foo.bar() {}
+        # ^^^^^^^^^^^^
+        def visit_call_node(node)
+          name = node.name
+          arguments = node.arguments&.arguments || []
+          block = node.block
+
+          if block.is_a?(BlockArgumentNode)
+            arguments = [*arguments, block]
+            block = nil
+          end
+
+          if node.call_operator_loc.nil?
+            case name
+            when :-@
+              case (receiver = node.receiver).type
+              when :integer_node, :float_node, :rational_node, :imaginary_node
+                return visit(numeric_negate(node.message_loc, receiver))
+              end
+            when :!
+              return visit_block(builder.not_op(token(node.message_loc), token(node.opening_loc), visit(node.receiver), token(node.closing_loc)), block)
+            when :=~
+              if (receiver = node.receiver).is_a?(RegularExpressionNode)
+                return builder.match_op(visit(receiver), token(node.message_loc), visit(node.arguments.arguments.first))
+              end
+            when :[]
+              return visit_block(builder.index(visit(node.receiver), token(node.opening_loc), visit_all(arguments), token(node.closing_loc)), block)
+            when :[]=
+              if node.message != "[]=" && node.arguments && block.nil? && !node.safe_navigation?
+                arguments = node.arguments.arguments[...-1]
+                arguments << node.block if node.block
+
+                return visit_block(
+                  builder.assign(
+                    builder.index_asgn(
+                      visit(node.receiver),
+                      token(node.opening_loc),
+                      visit_all(arguments),
+                      token(node.closing_loc),
+                    ),
+                    srange_find(node.message_loc.end_offset, node.arguments.arguments.last.location.start_offset, "="),
+                    visit(node.arguments.arguments.last)
+                  ),
+                  block
+                )
+              end
+            end
+          end
+
+          message_loc = node.message_loc
+          call_operator_loc = node.call_operator_loc
+          call_operator = [{ "." => :dot, "&." => :anddot, "::" => "::" }.fetch(call_operator_loc.slice), srange(call_operator_loc)] if call_operator_loc
+
+          visit_block(
+            if name.end_with?("=") && !message_loc.slice.end_with?("=") && node.arguments && block.nil?
+              builder.assign(
+                builder.attr_asgn(visit(node.receiver), call_operator, token(message_loc)),
+                srange_find(message_loc.end_offset, node.arguments.location.start_offset, "="),
+                visit(node.arguments.arguments.last)
+              )
+            else
+              builder.call_method(
+                visit(node.receiver),
+                call_operator,
+                message_loc ? [node.name, srange(message_loc)] : nil,
+                token(node.opening_loc),
+                visit_all(arguments),
+                token(node.closing_loc)
+              )
+            end,
+            block
+          )
+        end
+
+        # foo.bar += baz
+        # ^^^^^^^^^^^^^^^
+        def visit_call_operator_write_node(node)
+          call_operator_loc = node.call_operator_loc
+
+          builder.op_assign(
+            builder.call_method(
+              visit(node.receiver),
+              call_operator_loc.nil? ? nil : [{ "." => :dot, "&." => :anddot, "::" => "::" }.fetch(call_operator_loc.slice), srange(call_operator_loc)],
+              node.message_loc ? [node.read_name, srange(node.message_loc)] : nil,
+              nil,
+              [],
+              nil
+            ),
+            [node.binary_operator_loc.slice.chomp("="), srange(node.binary_operator_loc)],
+            visit(node.value)
+          )
+        end
+
+        # foo.bar &&= baz
+        # ^^^^^^^^^^^^^^^
+        def visit_call_and_write_node(node)
+          call_operator_loc = node.call_operator_loc
+
+          builder.op_assign(
+            builder.call_method(
+              visit(node.receiver),
+              call_operator_loc.nil? ? nil : [{ "." => :dot, "&." => :anddot, "::" => "::" }.fetch(call_operator_loc.slice), srange(call_operator_loc)],
+              node.message_loc ? [node.read_name, srange(node.message_loc)] : nil,
+              nil,
+              [],
+              nil
+            ),
+            [node.operator_loc.slice.chomp("="), srange(node.operator_loc)],
+            visit(node.value)
+          )
+        end
+
+        # foo.bar ||= baz
+        # ^^^^^^^^^^^^^^^
+        def visit_call_or_write_node(node)
+          call_operator_loc = node.call_operator_loc
+
+          builder.op_assign(
+            builder.call_method(
+              visit(node.receiver),
+              call_operator_loc.nil? ? nil : [{ "." => :dot, "&." => :anddot, "::" => "::" }.fetch(call_operator_loc.slice), srange(call_operator_loc)],
+              node.message_loc ? [node.read_name, srange(node.message_loc)] : nil,
+              nil,
+              [],
+              nil
+            ),
+            [node.operator_loc.slice.chomp("="), srange(node.operator_loc)],
+            visit(node.value)
+          )
+        end
+
+        # foo.bar, = 1
+        # ^^^^^^^
+        def visit_call_target_node(node)
+          call_operator_loc = node.call_operator_loc
+
+          builder.attr_asgn(
+            visit(node.receiver),
+            call_operator_loc.nil? ? nil : [{ "." => :dot, "&." => :anddot, "::" => "::" }.fetch(call_operator_loc.slice), srange(call_operator_loc)],
+            token(node.message_loc)
+          )
+        end
+
+        # foo => bar => baz
+        #        ^^^^^^^^^^
+        def visit_capture_pattern_node(node)
+          builder.match_as(visit(node.value), token(node.operator_loc), visit(node.target))
+        end
+
+        # case foo; when bar; end
+        # ^^^^^^^^^^^^^^^^^^^^^^^
+        def visit_case_node(node)
+          builder.case(
+            token(node.case_keyword_loc),
+            visit(node.predicate),
+            visit_all(node.conditions),
+            token(node.else_clause&.else_keyword_loc),
+            visit(node.else_clause),
+            token(node.end_keyword_loc)
+          )
+        end
+
+        # case foo; in bar; end
+        # ^^^^^^^^^^^^^^^^^^^^^
+        def visit_case_match_node(node)
+          builder.case_match(
+            token(node.case_keyword_loc),
+            visit(node.predicate),
+            visit_all(node.conditions),
+            token(node.else_clause&.else_keyword_loc),
+            visit(node.else_clause),
+            token(node.end_keyword_loc)
+          )
+        end
+
+        # class Foo; end
+        # ^^^^^^^^^^^^^^
+        def visit_class_node(node)
+          builder.def_class(
+            token(node.class_keyword_loc),
+            visit(node.constant_path),
+            token(node.inheritance_operator_loc),
+            visit(node.superclass),
+            node.body&.accept(copy_compiler(forwarding: [])),
+            token(node.end_keyword_loc)
+          )
+        end
+
+        # @@foo
+        # ^^^^^
+        def visit_class_variable_read_node(node)
+          builder.cvar(token(node.location))
+        end
+
+        # @@foo = 1
+        # ^^^^^^^^^
+        def visit_class_variable_write_node(node)
+          builder.assign(
+            builder.assignable(builder.cvar(token(node.name_loc))),
+            token(node.operator_loc),
+            visit(node.value)
+          )
+        end
+
+        # @@foo += bar
+        # ^^^^^^^^^^^^
+        def visit_class_variable_operator_write_node(node)
+          builder.op_assign(
+            builder.assignable(builder.cvar(token(node.name_loc))),
+            [node.binary_operator_loc.slice.chomp("="), srange(node.binary_operator_loc)],
+            visit(node.value)
+          )
+        end
+
+        # @@foo &&= bar
+        # ^^^^^^^^^^^^^
+        def visit_class_variable_and_write_node(node)
+          builder.op_assign(
+            builder.assignable(builder.cvar(token(node.name_loc))),
+            [node.operator_loc.slice.chomp("="), srange(node.operator_loc)],
+            visit(node.value)
+          )
+        end
+
+        # @@foo ||= bar
+        # ^^^^^^^^^^^^^
+        def visit_class_variable_or_write_node(node)
+          builder.op_assign(
+            builder.assignable(builder.cvar(token(node.name_loc))),
+            [node.operator_loc.slice.chomp("="), srange(node.operator_loc)],
+            visit(node.value)
+          )
+        end
+
+        # @@foo, = bar
+        # ^^^^^
+        def visit_class_variable_target_node(node)
+          builder.assignable(builder.cvar(token(node.location)))
+        end
+
+        # Foo
+        # ^^^
+        def visit_constant_read_node(node)
+          builder.const([node.name, srange(node.location)])
+        end
+
+        # Foo = 1
+        # ^^^^^^^
+        #
+        # Foo, Bar = 1
+        # ^^^  ^^^
+        def visit_constant_write_node(node)
+          builder.assign(builder.assignable(builder.const([node.name, srange(node.name_loc)])), token(node.operator_loc), visit(node.value))
+        end
+
+        # Foo += bar
+        # ^^^^^^^^^^^
+        def visit_constant_operator_write_node(node)
+          builder.op_assign(
+            builder.assignable(builder.const([node.name, srange(node.name_loc)])),
+            [node.binary_operator_loc.slice.chomp("="), srange(node.binary_operator_loc)],
+            visit(node.value)
+          )
+        end
+
+        # Foo &&= bar
+        # ^^^^^^^^^^^^
+        def visit_constant_and_write_node(node)
+          builder.op_assign(
+            builder.assignable(builder.const([node.name, srange(node.name_loc)])),
+            [node.operator_loc.slice.chomp("="), srange(node.operator_loc)],
+            visit(node.value)
+          )
+        end
+
+        # Foo ||= bar
+        # ^^^^^^^^^^^^
+        def visit_constant_or_write_node(node)
+          builder.op_assign(
+            builder.assignable(builder.const([node.name, srange(node.name_loc)])),
+            [node.operator_loc.slice.chomp("="), srange(node.operator_loc)],
+            visit(node.value)
+          )
+        end
+
+        # Foo, = bar
+        # ^^^
+        def visit_constant_target_node(node)
+          builder.assignable(builder.const([node.name, srange(node.location)]))
+        end
+
+        # Foo::Bar
+        # ^^^^^^^^
+        def visit_constant_path_node(node)
+          if node.parent.nil?
+            builder.const_global(
+              token(node.delimiter_loc),
+              [node.name, srange(node.name_loc)]
+            )
+          else
+            builder.const_fetch(
+              visit(node.parent),
+              token(node.delimiter_loc),
+              [node.name, srange(node.name_loc)]
+            )
+          end
+        end
+
+        # Foo::Bar = 1
+        # ^^^^^^^^^^^^
+        #
+        # Foo::Foo, Bar::Bar = 1
+        # ^^^^^^^^  ^^^^^^^^
+        def visit_constant_path_write_node(node)
+          builder.assign(
+            builder.assignable(visit(node.target)),
+            token(node.operator_loc),
+            visit(node.value)
+          )
+        end
+
+        # Foo::Bar += baz
+        # ^^^^^^^^^^^^^^^
+        def visit_constant_path_operator_write_node(node)
+          builder.op_assign(
+            builder.assignable(visit(node.target)),
+            [node.binary_operator_loc.slice.chomp("="), srange(node.binary_operator_loc)],
+            visit(node.value)
+          )
+        end
+
+        # Foo::Bar &&= baz
+        # ^^^^^^^^^^^^^^^^
+        def visit_constant_path_and_write_node(node)
+          builder.op_assign(
+            builder.assignable(visit(node.target)),
+            [node.operator_loc.slice.chomp("="), srange(node.operator_loc)],
+            visit(node.value)
+          )
+        end
+
+        # Foo::Bar ||= baz
+        # ^^^^^^^^^^^^^^^^
+        def visit_constant_path_or_write_node(node)
+          builder.op_assign(
+            builder.assignable(visit(node.target)),
+            [node.operator_loc.slice.chomp("="), srange(node.operator_loc)],
+            visit(node.value)
+          )
+        end
+
+        # Foo::Bar, = baz
+        # ^^^^^^^^
+        def visit_constant_path_target_node(node)
+          builder.assignable(visit_constant_path_node(node))
+        end
+
+        # def foo; end
+        # ^^^^^^^^^^^^
+        #
+        # def self.foo; end
+        # ^^^^^^^^^^^^^^^^^
+        def visit_def_node(node)
+          if node.equal_loc
+            if node.receiver
+              builder.def_endless_singleton(
+                token(node.def_keyword_loc),
+                visit(node.receiver.is_a?(ParenthesesNode) ? node.receiver.body : node.receiver),
+                token(node.operator_loc),
+                token(node.name_loc),
+                builder.args(token(node.lparen_loc), visit(node.parameters) || [], token(node.rparen_loc), false),
+                token(node.equal_loc),
+                node.body&.accept(copy_compiler(forwarding: find_forwarding(node.parameters)))
+              )
+            else
+              builder.def_endless_method(
+                token(node.def_keyword_loc),
+                token(node.name_loc),
+                builder.args(token(node.lparen_loc), visit(node.parameters) || [], token(node.rparen_loc), false),
+                token(node.equal_loc),
+                node.body&.accept(copy_compiler(forwarding: find_forwarding(node.parameters)))
+              )
+            end
+          elsif node.receiver
+            builder.def_singleton(
+              token(node.def_keyword_loc),
+              visit(node.receiver.is_a?(ParenthesesNode) ? node.receiver.body : node.receiver),
+              token(node.operator_loc),
+              token(node.name_loc),
+              builder.args(token(node.lparen_loc), visit(node.parameters) || [], token(node.rparen_loc), false),
+              node.body&.accept(copy_compiler(forwarding: find_forwarding(node.parameters))),
+              token(node.end_keyword_loc)
+            )
+          else
+            builder.def_method(
+              token(node.def_keyword_loc),
+              token(node.name_loc),
+              builder.args(token(node.lparen_loc), visit(node.parameters) || [], token(node.rparen_loc), false),
+              node.body&.accept(copy_compiler(forwarding: find_forwarding(node.parameters))),
+              token(node.end_keyword_loc)
+            )
+          end
+        end
+
+        # defined? a
+        # ^^^^^^^^^^
+        #
+        # defined?(a)
+        # ^^^^^^^^^^^
+        def visit_defined_node(node)
+          # Very weird circumstances here where something like:
+          #
+          #     defined?
+          #     (1)
+          #
+          # gets parsed in Ruby as having only the `1` expression but in parser
+          # it gets parsed as having a begin. In this case we need to synthesize
+          # that begin to match parser's behavior.
+          if node.lparen_loc && node.keyword_loc.join(node.lparen_loc).slice.include?("\n")
+            builder.keyword_cmd(
+              :defined?,
+              token(node.keyword_loc),
+              nil,
+              [
+                builder.begin(
+                  token(node.lparen_loc),
+                  visit(node.value),
+                  token(node.rparen_loc)
+                )
+              ],
+              nil
+            )
+          else
+            builder.keyword_cmd(
+              :defined?,
+              token(node.keyword_loc),
+              token(node.lparen_loc),
+              [visit(node.value)],
+              token(node.rparen_loc)
+            )
+          end
+        end
+
+        # if foo then bar else baz end
+        #                 ^^^^^^^^^^^^
+        def visit_else_node(node)
+          visit(node.statements)
+        end
+
+        # "foo #{bar}"
+        #      ^^^^^^
+        def visit_embedded_statements_node(node)
+          builder.begin(
+            token(node.opening_loc),
+            visit(node.statements),
+            token(node.closing_loc)
+          )
+        end
+
+        # "foo #@bar"
+        #      ^^^^^
+        def visit_embedded_variable_node(node)
+          visit(node.variable)
+        end
+
+        # begin; foo; ensure; bar; end
+        #             ^^^^^^^^^^^^
+        def visit_ensure_node(node)
+          raise CompilationError, "Cannot directly compile ensure nodes"
+        end
+
+        # false
+        # ^^^^^
+        def visit_false_node(node)
+          builder.false(token(node.location))
+        end
+
+        # foo => [*, bar, *]
+        #        ^^^^^^^^^^^
+        def visit_find_pattern_node(node)
+          elements = [node.left, *node.requireds, node.right]
+
+          if node.constant
+            builder.const_pattern(visit(node.constant), token(node.opening_loc), builder.find_pattern(nil, visit_all(elements), nil), token(node.closing_loc))
+          else
+            builder.find_pattern(token(node.opening_loc), visit_all(elements), token(node.closing_loc))
+          end
+        end
+
+        # 1.0
+        # ^^^
+        def visit_float_node(node)
+          visit_numeric(node, builder.float([node.value, srange(node.location)]))
+        end
+
+        # for foo in bar do end
+        # ^^^^^^^^^^^^^^^^^^^^^
+        def visit_for_node(node)
+          builder.for(
+            token(node.for_keyword_loc),
+            visit(node.index),
+            token(node.in_keyword_loc),
+            visit(node.collection),
+            if (do_keyword_loc = node.do_keyword_loc)
+              token(do_keyword_loc)
+            else
+              srange_find(node.collection.location.end_offset, (node.statements&.location || node.end_keyword_loc).start_offset, ";")
+            end,
+            visit(node.statements),
+            token(node.end_keyword_loc)
+          )
+        end
+
+        # def foo(...); bar(...); end
+        #                   ^^^
+        def visit_forwarding_arguments_node(node)
+          builder.forwarded_args(token(node.location))
+        end
+
+        # def foo(...); end
+        #         ^^^
+        def visit_forwarding_parameter_node(node)
+          builder.forward_arg(token(node.location))
+        end
+
+        # super
+        # ^^^^^
+        #
+        # super {}
+        # ^^^^^^^^
+        def visit_forwarding_super_node(node)
+          visit_block(
+            builder.keyword_cmd(
+              :zsuper,
+              ["super", srange_offsets(node.location.start_offset, node.location.start_offset + 5)]
+            ),
+            node.block
+          )
+        end
+
+        # $foo
+        # ^^^^
+        def visit_global_variable_read_node(node)
+          builder.gvar(token(node.location))
+        end
+
+        # $foo = 1
+        # ^^^^^^^^
+        def visit_global_variable_write_node(node)
+          builder.assign(
+            builder.assignable(builder.gvar(token(node.name_loc))),
+            token(node.operator_loc),
+            visit(node.value)
+          )
+        end
+
+        # $foo += bar
+        # ^^^^^^^^^^^
+        def visit_global_variable_operator_write_node(node)
+          builder.op_assign(
+            builder.assignable(builder.gvar(token(node.name_loc))),
+            [node.binary_operator_loc.slice.chomp("="), srange(node.binary_operator_loc)],
+            visit(node.value)
+          )
+        end
+
+        # $foo &&= bar
+        # ^^^^^^^^^^^^
+        def visit_global_variable_and_write_node(node)
+          builder.op_assign(
+            builder.assignable(builder.gvar(token(node.name_loc))),
+            [node.operator_loc.slice.chomp("="), srange(node.operator_loc)],
+            visit(node.value)
+          )
+        end
+
+        # $foo ||= bar
+        # ^^^^^^^^^^^^
+        def visit_global_variable_or_write_node(node)
+          builder.op_assign(
+            builder.assignable(builder.gvar(token(node.name_loc))),
+            [node.operator_loc.slice.chomp("="), srange(node.operator_loc)],
+            visit(node.value)
+          )
+        end
+
+        # $foo, = bar
+        # ^^^^
+        def visit_global_variable_target_node(node)
+          builder.assignable(builder.gvar([node.slice, srange(node.location)]))
+        end
+
+        # {}
+        # ^^
+        def visit_hash_node(node)
+          builder.associate(
+            token(node.opening_loc),
+            visit_all(node.elements),
+            token(node.closing_loc)
+          )
+        end
+
+        # foo => {}
+        #        ^^
+        def visit_hash_pattern_node(node)
+          elements = [*node.elements, *node.rest]
+
+          if node.constant
+            builder.const_pattern(visit(node.constant), token(node.opening_loc), builder.hash_pattern(nil, visit_all(elements), nil), token(node.closing_loc))
+          else
+            builder.hash_pattern(token(node.opening_loc), visit_all(elements), token(node.closing_loc))
+          end
+        end
+
+        # if foo then bar end
+        # ^^^^^^^^^^^^^^^^^^^
+        #
+        # bar if foo
+        # ^^^^^^^^^^
+        #
+        # foo ? bar : baz
+        # ^^^^^^^^^^^^^^^
+        def visit_if_node(node)
+          if !node.if_keyword_loc
+            builder.ternary(
+              visit(node.predicate),
+              token(node.then_keyword_loc),
+              visit(node.statements),
+              token(node.subsequent.else_keyword_loc),
+              visit(node.subsequent)
+            )
+          elsif node.if_keyword_loc.start_offset == node.location.start_offset
+            builder.condition(
+              token(node.if_keyword_loc),
+              visit(node.predicate),
+              if (then_keyword_loc = node.then_keyword_loc)
+                token(then_keyword_loc)
+              else
+                srange_find(node.predicate.location.end_offset, (node.statements&.location || node.subsequent&.location || node.end_keyword_loc).start_offset, ";")
+              end,
+              visit(node.statements),
+              case node.subsequent
+              when IfNode
+                token(node.subsequent.if_keyword_loc)
+              when ElseNode
+                token(node.subsequent.else_keyword_loc)
+              end,
+              visit(node.subsequent),
+              if node.if_keyword != "elsif"
+                token(node.end_keyword_loc)
+              end
+            )
+          else
+            builder.condition_mod(
+              visit(node.statements),
+              visit(node.subsequent),
+              token(node.if_keyword_loc),
+              visit(node.predicate)
+            )
+          end
+        end
+
+        # 1i
+        # ^^
+        def visit_imaginary_node(node)
+          visit_numeric(node, builder.complex([Complex(0, node.numeric.value), srange(node.location)]))
+        end
+
+        # { foo: }
+        #   ^^^^
+        def visit_implicit_node(node)
+          raise CompilationError, "Cannot directly compile implicit nodes"
+        end
+
+        # foo { |bar,| }
+        #           ^
+        def visit_implicit_rest_node(node)
+          raise CompilationError, "Cannot compile implicit rest nodes"
+        end
+
+        # case foo; in bar; end
+        # ^^^^^^^^^^^^^^^^^^^^^
+        def visit_in_node(node)
+          pattern = nil
+          guard = nil
+
+          case node.pattern
+          when IfNode
+            pattern = within_pattern { |compiler| node.pattern.statements.accept(compiler) }
+            guard = builder.if_guard(token(node.pattern.if_keyword_loc), visit(node.pattern.predicate))
+          when UnlessNode
+            pattern = within_pattern { |compiler| node.pattern.statements.accept(compiler) }
+            guard = builder.unless_guard(token(node.pattern.keyword_loc), visit(node.pattern.predicate))
+          else
+            pattern = within_pattern { |compiler| node.pattern.accept(compiler) }
+          end
+
+          builder.in_pattern(
+            token(node.in_loc),
+            pattern,
+            guard,
+            if (then_loc = node.then_loc)
+              token(then_loc)
+            else
+              srange_find(node.pattern.location.end_offset, node.statements&.location&.start_offset, ";")
+            end,
+            visit(node.statements)
+          )
+        end
+
+        # foo[bar] += baz
+        # ^^^^^^^^^^^^^^^
+        def visit_index_operator_write_node(node)
+          arguments = node.arguments&.arguments || []
+          arguments << node.block if node.block
+
+          builder.op_assign(
+            builder.index(
+              visit(node.receiver),
+              token(node.opening_loc),
+              visit_all(arguments),
+              token(node.closing_loc)
+            ),
+            [node.binary_operator_loc.slice.chomp("="), srange(node.binary_operator_loc)],
+            visit(node.value)
+          )
+        end
+
+        # foo[bar] &&= baz
+        # ^^^^^^^^^^^^^^^^
+        def visit_index_and_write_node(node)
+          arguments = node.arguments&.arguments || []
+          arguments << node.block if node.block
+
+          builder.op_assign(
+            builder.index(
+              visit(node.receiver),
+              token(node.opening_loc),
+              visit_all(arguments),
+              token(node.closing_loc)
+            ),
+            [node.operator_loc.slice.chomp("="), srange(node.operator_loc)],
+            visit(node.value)
+          )
+        end
+
+        # foo[bar] ||= baz
+        # ^^^^^^^^^^^^^^^^
+        def visit_index_or_write_node(node)
+          arguments = node.arguments&.arguments || []
+          arguments << node.block if node.block
+
+          builder.op_assign(
+            builder.index(
+              visit(node.receiver),
+              token(node.opening_loc),
+              visit_all(arguments),
+              token(node.closing_loc)
+            ),
+            [node.operator_loc.slice.chomp("="), srange(node.operator_loc)],
+            visit(node.value)
+          )
+        end
+
+        # foo[bar], = 1
+        # ^^^^^^^^
+        def visit_index_target_node(node)
+          builder.index_asgn(
+            visit(node.receiver),
+            token(node.opening_loc),
+            visit_all(node.arguments&.arguments || []),
+            token(node.closing_loc),
+          )
+        end
+
+        # @foo
+        # ^^^^
+        def visit_instance_variable_read_node(node)
+          builder.ivar(token(node.location))
+        end
+
+        # @foo = 1
+        # ^^^^^^^^
+        def visit_instance_variable_write_node(node)
+          builder.assign(
+            builder.assignable(builder.ivar(token(node.name_loc))),
+            token(node.operator_loc),
+            visit(node.value)
+          )
+        end
+
+        # @foo += bar
+        # ^^^^^^^^^^^
+        def visit_instance_variable_operator_write_node(node)
+          builder.op_assign(
+            builder.assignable(builder.ivar(token(node.name_loc))),
+            [node.binary_operator_loc.slice.chomp("="), srange(node.binary_operator_loc)],
+            visit(node.value)
+          )
+        end
+
+        # @foo &&= bar
+        # ^^^^^^^^^^^^
+        def visit_instance_variable_and_write_node(node)
+          builder.op_assign(
+            builder.assignable(builder.ivar(token(node.name_loc))),
+            [node.operator_loc.slice.chomp("="), srange(node.operator_loc)],
+            visit(node.value)
+          )
+        end
+
+        # @foo ||= bar
+        # ^^^^^^^^^^^^
+        def visit_instance_variable_or_write_node(node)
+          builder.op_assign(
+            builder.assignable(builder.ivar(token(node.name_loc))),
+            [node.operator_loc.slice.chomp("="), srange(node.operator_loc)],
+            visit(node.value)
+          )
+        end
+
+        # @foo, = bar
+        # ^^^^
+        def visit_instance_variable_target_node(node)
+          builder.assignable(builder.ivar(token(node.location)))
+        end
+
+        # 1
+        # ^
+        def visit_integer_node(node)
+          visit_numeric(node, builder.integer([node.value, srange(node.location)]))
+        end
+
+        # /foo #{bar}/
+        # ^^^^^^^^^^^^
+        def visit_interpolated_regular_expression_node(node)
+          builder.regexp_compose(
+            token(node.opening_loc),
+            string_nodes_from_interpolation(node, node.opening),
+            [node.closing[0], srange_offsets(node.closing_loc.start_offset, node.closing_loc.start_offset + 1)],
+            builder.regexp_options([node.closing[1..], srange_offsets(node.closing_loc.start_offset + 1, node.closing_loc.end_offset)])
+          )
+        end
+
+        # if /foo #{bar}/ then end
+        #    ^^^^^^^^^^^^
+        alias visit_interpolated_match_last_line_node visit_interpolated_regular_expression_node
+
+        # "foo #{bar}"
+        # ^^^^^^^^^^^^
+        def visit_interpolated_string_node(node)
+          if node.heredoc?
+            return visit_heredoc(node) { |children, closing| builder.string_compose(token(node.opening_loc), children, closing) }
+          end
+
+          builder.string_compose(
+            token(node.opening_loc),
+            string_nodes_from_interpolation(node, node.opening),
+            token(node.closing_loc)
+          )
+        end
+
+        # :"foo #{bar}"
+        # ^^^^^^^^^^^^^
+        def visit_interpolated_symbol_node(node)
+          builder.symbol_compose(
+            token(node.opening_loc),
+            string_nodes_from_interpolation(node, node.opening),
+            token(node.closing_loc)
+          )
+        end
+
+        # `foo #{bar}`
+        # ^^^^^^^^^^^^
+        def visit_interpolated_x_string_node(node)
+          if node.heredoc?
+            return visit_heredoc(node) { |children, closing| builder.xstring_compose(token(node.opening_loc), children, closing) }
+          end
+
+          builder.xstring_compose(
+            token(node.opening_loc),
+            string_nodes_from_interpolation(node, node.opening),
+            token(node.closing_loc)
+          )
+        end
+
+        # -> { it }
+        #      ^^
+        def visit_it_local_variable_read_node(node)
+          builder.ident([:it, srange(node.location)]).updated(:lvar)
+        end
+
+        # -> { it }
+        # ^^^^^^^^^
+        def visit_it_parameters_node(node)
+          # FIXME: The builder _should_ always be a subclass of the prism builder.
+          # Currently RuboCop passes in its own builder that always inherits from the
+          # parser builder (which is lacking the `itarg` method). Once rubocop-ast
+          # opts in to use the custom prism builder a warning can be emitted when
+          # it is not the expected class, and eventually raise.
+          # https://github.com/rubocop/rubocop-ast/pull/354
+          if builder.is_a?(Translation::Parser::Builder)
+            builder.itarg
+          else
+            builder.args(nil, [], nil, false)
+          end
+        end
+
+        # foo(bar: baz)
+        #     ^^^^^^^^
+        def visit_keyword_hash_node(node)
+          builder.associate(nil, visit_all(node.elements), nil)
+        end
+
+        # def foo(**bar); end
+        #         ^^^^^
+        #
+        # def foo(**); end
+        #         ^^
+        def visit_keyword_rest_parameter_node(node)
+          builder.kwrestarg(
+            token(node.operator_loc),
+            node.name ? [node.name, srange(node.name_loc)] : nil
+          )
+        end
+
+        # -> {}
+        # ^^^^^
+        def visit_lambda_node(node)
+          parameters = node.parameters
+          implicit_parameters = parameters.is_a?(NumberedParametersNode) || parameters.is_a?(ItParametersNode)
+
+          builder.block(
+            builder.call_lambda(token(node.operator_loc)),
+            [node.opening, srange(node.opening_loc)],
+            if parameters.nil?
+              builder.args(nil, [], nil, false)
+            elsif implicit_parameters
+              visit(node.parameters)
+            else
+              builder.args(
+                token(node.parameters.opening_loc),
+                visit(node.parameters),
+                token(node.parameters.closing_loc),
+                false
+              )
+            end,
+            visit(node.body),
+            [node.closing, srange(node.closing_loc)]
+          )
+        end
+
+        # foo
+        # ^^^
+        def visit_local_variable_read_node(node)
+          builder.ident([node.name, srange(node.location)]).updated(:lvar)
+        end
+
+        # foo = 1
+        # ^^^^^^^
+        def visit_local_variable_write_node(node)
+          builder.assign(
+            builder.assignable(builder.ident(token(node.name_loc))),
+            token(node.operator_loc),
+            visit(node.value)
+          )
+        end
+
+        # foo += bar
+        # ^^^^^^^^^^
+        def visit_local_variable_operator_write_node(node)
+          builder.op_assign(
+            builder.assignable(builder.ident(token(node.name_loc))),
+            [node.binary_operator_loc.slice.chomp("="), srange(node.binary_operator_loc)],
+            visit(node.value)
+          )
+        end
+
+        # foo &&= bar
+        # ^^^^^^^^^^^
+        def visit_local_variable_and_write_node(node)
+          builder.op_assign(
+            builder.assignable(builder.ident(token(node.name_loc))),
+            [node.operator_loc.slice.chomp("="), srange(node.operator_loc)],
+            visit(node.value)
+          )
+        end
+
+        # foo ||= bar
+        # ^^^^^^^^^^^
+        def visit_local_variable_or_write_node(node)
+          builder.op_assign(
+            builder.assignable(builder.ident(token(node.name_loc))),
+            [node.operator_loc.slice.chomp("="), srange(node.operator_loc)],
+            visit(node.value)
+          )
+        end
+
+        # foo, = bar
+        # ^^^
+        def visit_local_variable_target_node(node)
+          if in_pattern
+            builder.assignable(builder.match_var([node.name, srange(node.location)]))
+          else
+            builder.assignable(builder.ident(token(node.location)))
+          end
+        end
+
+        # foo in bar
+        # ^^^^^^^^^^
+        def visit_match_predicate_node(node)
+          builder.match_pattern_p(
+            visit(node.value),
+            token(node.operator_loc),
+            within_pattern { |compiler| node.pattern.accept(compiler) }
+          )
+        end
+
+        # foo => bar
+        # ^^^^^^^^^^
+        def visit_match_required_node(node)
+          builder.match_pattern(
+            visit(node.value),
+            token(node.operator_loc),
+            within_pattern { |compiler| node.pattern.accept(compiler) }
+          )
+        end
+
+        # /(?<foo>foo)/ =~ bar
+        # ^^^^^^^^^^^^^^^^^^^^
+        def visit_match_write_node(node)
+          builder.match_op(
+            visit(node.call.receiver),
+            token(node.call.message_loc),
+            visit(node.call.arguments.arguments.first)
+          )
+        end
+
+        # A node that is missing from the syntax tree. This is only used in the
+        # case of a syntax error. The parser gem doesn't have such a concept, so
+        # we invent our own here.
+        def visit_missing_node(node)
+          ::AST::Node.new(:missing, [], location: ::Parser::Source::Map.new(srange(node.location)))
+        end
+
+        # module Foo; end
+        # ^^^^^^^^^^^^^^^
+        def visit_module_node(node)
+          builder.def_module(
+            token(node.module_keyword_loc),
+            visit(node.constant_path),
+            node.body&.accept(copy_compiler(forwarding: [])),
+            token(node.end_keyword_loc)
+          )
+        end
+
+        # foo, bar = baz
+        # ^^^^^^^^
+        def visit_multi_target_node(node)
+          builder.multi_lhs(
+            token(node.lparen_loc),
+            visit_all(multi_target_elements(node)),
+            token(node.rparen_loc)
+          )
+        end
+
+        # foo, bar = baz
+        # ^^^^^^^^^^^^^^
+        def visit_multi_write_node(node)
+          elements = multi_target_elements(node)
+
+          if elements.length == 1 && elements.first.is_a?(MultiTargetNode) && !node.rest
+            elements = multi_target_elements(elements.first)
+          end
+
+          builder.multi_assign(
+            builder.multi_lhs(
+              token(node.lparen_loc),
+              visit_all(elements),
+              token(node.rparen_loc)
+            ),
+            token(node.operator_loc),
+            visit(node.value)
+          )
+        end
+
+        # next
+        # ^^^^
+        #
+        # next foo
+        # ^^^^^^^^
+        def visit_next_node(node)
+          builder.keyword_cmd(
+            :next,
+            token(node.keyword_loc),
+            nil,
+            visit(node.arguments) || [],
+            nil
+          )
+        end
+
+        # nil
+        # ^^^
+        def visit_nil_node(node)
+          builder.nil(token(node.location))
+        end
+
+        # def foo(**nil); end
+        #         ^^^^^
+        def visit_no_keywords_parameter_node(node)
+          if in_pattern
+            builder.match_nil_pattern(token(node.operator_loc), token(node.keyword_loc))
+          else
+            builder.kwnilarg(token(node.operator_loc), token(node.keyword_loc))
+          end
+        end
+
+        # -> { _1 + _2 }
+        # ^^^^^^^^^^^^^^
+        def visit_numbered_parameters_node(node)
+          builder.numargs(node.maximum)
+        end
+
+        # $1
+        # ^^
+        def visit_numbered_reference_read_node(node)
+          builder.nth_ref([node.number, srange(node.location)])
+        end
+
+        # def foo(bar: baz); end
+        #         ^^^^^^^^
+        def visit_optional_keyword_parameter_node(node)
+          builder.kwoptarg([node.name, srange(node.name_loc)], visit(node.value))
+        end
+
+        # def foo(bar = 1); end
+        #         ^^^^^^^
+        def visit_optional_parameter_node(node)
+          builder.optarg(token(node.name_loc), token(node.operator_loc), visit(node.value))
+        end
+
+        # a or b
+        # ^^^^^^
+        def visit_or_node(node)
+          builder.logical_op(:or, visit(node.left), token(node.operator_loc), visit(node.right))
+        end
+
+        # def foo(bar, *baz); end
+        #         ^^^^^^^^^
+        def visit_parameters_node(node)
+          params = []
+
+          if node.requireds.any?
+            node.requireds.each do |required|
+              params <<
+                if required.is_a?(RequiredParameterNode)
+                  visit(required)
+                else
+                  required.accept(copy_compiler(in_destructure: true))
+                end
+            end
+          end
+
+          params.concat(visit_all(node.optionals)) if node.optionals.any?
+          params << visit(node.rest) if !node.rest.nil? && !node.rest.is_a?(ImplicitRestNode)
+
+          if node.posts.any?
+            node.posts.each do |post|
+              params <<
+                if post.is_a?(RequiredParameterNode)
+                  visit(post)
+                else
+                  post.accept(copy_compiler(in_destructure: true))
+                end
+            end
+          end
+
+          params.concat(visit_all(node.keywords)) if node.keywords.any?
+          params << visit(node.keyword_rest) if !node.keyword_rest.nil?
+          params << visit(node.block) if !node.block.nil?
+          params
+        end
+
+        # ()
+        # ^^
+        #
+        # (1)
+        # ^^^
+        def visit_parentheses_node(node)
+          builder.begin(
+            token(node.opening_loc),
+            visit(node.body),
+            token(node.closing_loc)
+          )
+        end
+
+        # foo => ^(bar)
+        #        ^^^^^^
+        def visit_pinned_expression_node(node)
+          parts = node.expression.accept(copy_compiler(in_pattern: false)) # Don't treat * and similar as match_rest
+          expression = builder.begin(token(node.lparen_loc), parts, token(node.rparen_loc))
+          builder.pin(token(node.operator_loc), expression)
+        end
+
+        # foo = 1 and bar => ^foo
+        #                    ^^^^
+        def visit_pinned_variable_node(node)
+          builder.pin(token(node.operator_loc), visit(node.variable))
+        end
+
+        # END {}
+        def visit_post_execution_node(node)
+          builder.postexe(
+            token(node.keyword_loc),
+            token(node.opening_loc),
+            visit(node.statements),
+            token(node.closing_loc)
+          )
+        end
+
+        # BEGIN {}
+        def visit_pre_execution_node(node)
+          builder.preexe(
+            token(node.keyword_loc),
+            token(node.opening_loc),
+            visit(node.statements),
+            token(node.closing_loc)
+          )
+        end
+
+        # The top-level program node.
+        def visit_program_node(node)
+          visit(node.statements)
+        end
+
+        # 0..5
+        # ^^^^
+        def visit_range_node(node)
+          if node.exclude_end?
+            builder.range_exclusive(
+              visit(node.left),
+              token(node.operator_loc),
+              visit(node.right)
+            )
+          else
+            builder.range_inclusive(
+              visit(node.left),
+              token(node.operator_loc),
+              visit(node.right)
+            )
+          end
+        end
+
+        # if foo .. bar; end
+        #    ^^^^^^^^^^
+        alias visit_flip_flop_node visit_range_node
+
+        # 1r
+        # ^^
+        def visit_rational_node(node)
+          visit_numeric(node, builder.rational([node.value, srange(node.location)]))
+        end
+
+        # redo
+        # ^^^^
+        def visit_redo_node(node)
+          builder.keyword_cmd(:redo, token(node.location))
+        end
+
+        # /foo/
+        # ^^^^^
+        def visit_regular_expression_node(node)
+          parts =
+            if node.content == ""
+              []
+            elsif node.content.include?("\n")
+              string_nodes_from_line_continuations(node.unescaped, node.content, node.content_loc.start_offset, node.opening)
+            else
+              [builder.string_internal([node.unescaped, srange(node.content_loc)])]
+            end
+
+          builder.regexp_compose(
+            token(node.opening_loc),
+            parts,
+            [node.closing[0], srange_offsets(node.closing_loc.start_offset, node.closing_loc.start_offset + 1)],
+            builder.regexp_options([node.closing[1..], srange_offsets(node.closing_loc.start_offset + 1, node.closing_loc.end_offset)])
+          )
+        end
+
+        # if /foo/ then end
+        #    ^^^^^
+        alias visit_match_last_line_node visit_regular_expression_node
+
+        # def foo(bar:); end
+        #         ^^^^
+        def visit_required_keyword_parameter_node(node)
+          builder.kwarg([node.name, srange(node.name_loc)])
+        end
+
+        # def foo(bar); end
+        #         ^^^
+        def visit_required_parameter_node(node)
+          builder.arg(token(node.location))
+        end
+
+        # foo rescue bar
+        # ^^^^^^^^^^^^^^
+        def visit_rescue_modifier_node(node)
+          builder.begin_body(
+            visit(node.expression),
+            [
+              builder.rescue_body(
+                token(node.keyword_loc),
+                nil,
+                nil,
+                nil,
+                nil,
+                visit(node.rescue_expression)
+              )
+            ]
+          )
+        end
+
+        # begin; rescue; end
+        #        ^^^^^^^
+        def visit_rescue_node(node)
+          raise CompilationError, "Cannot directly compile rescue nodes"
+        end
+
+        # def foo(*bar); end
+        #         ^^^^
+        #
+        # def foo(*); end
+        #         ^
+        def visit_rest_parameter_node(node)
+          builder.restarg(token(node.operator_loc), token(node.name_loc))
+        end
+
+        # retry
+        # ^^^^^
+        def visit_retry_node(node)
+          builder.keyword_cmd(:retry, token(node.location))
+        end
+
+        # return
+        # ^^^^^^
+        #
+        # return 1
+        # ^^^^^^^^
+        def visit_return_node(node)
+          builder.keyword_cmd(
+            :return,
+            token(node.keyword_loc),
+            nil,
+            visit(node.arguments) || [],
+            nil
+          )
+        end
+
+        # self
+        # ^^^^
+        def visit_self_node(node)
+          builder.self(token(node.location))
+        end
+
+        # A shareable constant.
+        def visit_shareable_constant_node(node)
+          visit(node.write)
+        end
+
+        # class << self; end
+        # ^^^^^^^^^^^^^^^^^^
+        def visit_singleton_class_node(node)
+          builder.def_sclass(
+            token(node.class_keyword_loc),
+            token(node.operator_loc),
+            visit(node.expression),
+            node.body&.accept(copy_compiler(forwarding: [])),
+            token(node.end_keyword_loc)
+          )
+        end
+
+        # __ENCODING__
+        # ^^^^^^^^^^^^
+        def visit_source_encoding_node(node)
+          builder.accessible(builder.__ENCODING__(token(node.location)))
+        end
+
+        # __FILE__
+        # ^^^^^^^^
+        def visit_source_file_node(node)
+          builder.accessible(builder.__FILE__(token(node.location)))
+        end
+
+        # __LINE__
+        # ^^^^^^^^
+        def visit_source_line_node(node)
+          builder.accessible(builder.__LINE__(token(node.location)))
+        end
+
+        # foo(*bar)
+        #     ^^^^
+        #
+        # def foo((bar, *baz)); end
+        #               ^^^^
+        #
+        # def foo(*); bar(*); end
+        #                 ^
+        def visit_splat_node(node)
+          if node.expression.nil? && forwarding.include?(:*)
+            builder.forwarded_restarg(token(node.operator_loc))
+          elsif in_destructure
+            builder.restarg(token(node.operator_loc), token(node.expression&.location))
+          elsif in_pattern
+            builder.match_rest(token(node.operator_loc), token(node.expression&.location))
+          else
+            builder.splat(token(node.operator_loc), visit(node.expression))
+          end
+        end
+
+        # A list of statements.
+        def visit_statements_node(node)
+          builder.compstmt(visit_all(node.body))
+        end
+
+        # "foo"
+        # ^^^^^
+        def visit_string_node(node)
+          if node.heredoc?
+            visit_heredoc(node.to_interpolated) { |children, closing| builder.string_compose(token(node.opening_loc), children, closing) }
+          elsif node.opening == "?"
+            builder.character([node.unescaped, srange(node.location)])
+          elsif node.opening&.start_with?("%") && node.unescaped.empty?
+            builder.string_compose(token(node.opening_loc), [], token(node.closing_loc))
+          else
+            parts =
+              if node.content.include?("\n")
+                string_nodes_from_line_continuations(node.unescaped, node.content, node.content_loc.start_offset, node.opening)
+              else
+                [builder.string_internal([node.unescaped, srange(node.content_loc)])]
+              end
+
+            builder.string_compose(
+              token(node.opening_loc),
+              parts,
+              token(node.closing_loc)
+            )
+          end
+        end
+
+        # super(foo)
+        # ^^^^^^^^^^
+        def visit_super_node(node)
+          arguments = node.arguments&.arguments || []
+          block = node.block
+
+          if block.is_a?(BlockArgumentNode)
+            arguments = [*arguments, block]
+            block = nil
+          end
+
+          visit_block(
+            builder.keyword_cmd(
+              :super,
+              token(node.keyword_loc),
+              token(node.lparen_loc),
+              visit_all(arguments),
+              token(node.rparen_loc)
+            ),
+            block
+          )
+        end
+
+        # :foo
+        # ^^^^
+        def visit_symbol_node(node)
+          if node.closing_loc.nil?
+            if node.opening_loc.nil?
+              builder.symbol_internal([node.unescaped, srange(node.location)])
+            else
+              builder.symbol([node.unescaped, srange(node.location)])
+            end
+          else
+            parts =
+              if node.value == ""
+                []
+              elsif node.value.include?("\n")
+                string_nodes_from_line_continuations(node.unescaped, node.value, node.value_loc.start_offset, node.opening)
+              else
+                [builder.string_internal([node.unescaped, srange(node.value_loc)])]
+              end
+
+            builder.symbol_compose(
+              token(node.opening_loc),
+              parts,
+              token(node.closing_loc)
+            )
+          end
+        end
+
+        # true
+        # ^^^^
+        def visit_true_node(node)
+          builder.true(token(node.location))
+        end
+
+        # undef foo
+        # ^^^^^^^^^
+        def visit_undef_node(node)
+          builder.undef_method(token(node.keyword_loc), visit_all(node.names))
+        end
+
+        # unless foo; bar end
+        # ^^^^^^^^^^^^^^^^^^^
+        #
+        # bar unless foo
+        # ^^^^^^^^^^^^^^
+        def visit_unless_node(node)
+          if node.keyword_loc.start_offset == node.location.start_offset
+            builder.condition(
+              token(node.keyword_loc),
+              visit(node.predicate),
+              if (then_keyword_loc = node.then_keyword_loc)
+                token(then_keyword_loc)
+              else
+                srange_find(node.predicate.location.end_offset, (node.statements&.location || node.else_clause&.location || node.end_keyword_loc).start_offset, ";")
+              end,
+              visit(node.else_clause),
+              token(node.else_clause&.else_keyword_loc),
+              visit(node.statements),
+              token(node.end_keyword_loc)
+            )
+          else
+            builder.condition_mod(
+              visit(node.else_clause),
+              visit(node.statements),
+              token(node.keyword_loc),
+              visit(node.predicate)
+            )
+          end
+        end
+
+        # until foo; bar end
+        # ^^^^^^^^^^^^^^^^^^
+        #
+        # bar until foo
+        # ^^^^^^^^^^^^^
+        def visit_until_node(node)
+          if node.location.start_offset == node.keyword_loc.start_offset
+            builder.loop(
+              :until,
+              token(node.keyword_loc),
+              visit(node.predicate),
+              if (do_keyword_loc = node.do_keyword_loc)
+                token(do_keyword_loc)
+              else
+                srange_find(node.predicate.location.end_offset, (node.statements&.location || node.closing_loc).start_offset, ";")
+              end,
+              visit(node.statements),
+              token(node.closing_loc)
+            )
+          else
+            builder.loop_mod(
+              :until,
+              visit(node.statements),
+              token(node.keyword_loc),
+              visit(node.predicate)
+            )
+          end
+        end
+
+        # case foo; when bar; end
+        #           ^^^^^^^^^^^^^
+        def visit_when_node(node)
+          builder.when(
+            token(node.keyword_loc),
+            visit_all(node.conditions),
+            if (then_keyword_loc = node.then_keyword_loc)
+              token(then_keyword_loc)
+            else
+              srange_find(node.conditions.last.location.end_offset, node.statements&.location&.start_offset, ";")
+            end,
+            visit(node.statements)
+          )
+        end
+
+        # while foo; bar end
+        # ^^^^^^^^^^^^^^^^^^
+        #
+        # bar while foo
+        # ^^^^^^^^^^^^^
+        def visit_while_node(node)
+          if node.location.start_offset == node.keyword_loc.start_offset
+            builder.loop(
+              :while,
+              token(node.keyword_loc),
+              visit(node.predicate),
+              if (do_keyword_loc = node.do_keyword_loc)
+                token(do_keyword_loc)
+              else
+                srange_find(node.predicate.location.end_offset, (node.statements&.location || node.closing_loc).start_offset, ";")
+              end,
+              visit(node.statements),
+              token(node.closing_loc)
+            )
+          else
+            builder.loop_mod(
+              :while,
+              visit(node.statements),
+              token(node.keyword_loc),
+              visit(node.predicate)
+            )
+          end
+        end
+
+        # `foo`
+        # ^^^^^
+        def visit_x_string_node(node)
+          if node.heredoc?
+            return visit_heredoc(node.to_interpolated) { |children, closing| builder.xstring_compose(token(node.opening_loc), children, closing) }
+          end
+
+          parts =
+            if node.content == ""
+              []
+            elsif node.content.include?("\n")
+              string_nodes_from_line_continuations(node.unescaped, node.content, node.content_loc.start_offset, node.opening)
+            else
+              [builder.string_internal([node.unescaped, srange(node.content_loc)])]
+            end
+
+          builder.xstring_compose(
+            token(node.opening_loc),
+            parts,
+            token(node.closing_loc)
+          )
+        end
+
+        # yield
+        # ^^^^^
+        #
+        # yield 1
+        # ^^^^^^^
+        def visit_yield_node(node)
+          builder.keyword_cmd(
+            :yield,
+            token(node.keyword_loc),
+            token(node.lparen_loc),
+            visit(node.arguments) || [],
+            token(node.rparen_loc)
+          )
+        end
+
+        private
+
+        # Initialize a new compiler with the given option overrides, used to
+        # visit a subtree with the given options.
+        def copy_compiler(forwarding: self.forwarding, in_destructure: self.in_destructure, in_pattern: self.in_pattern)
+          Compiler.new(parser, offset_cache, forwarding: forwarding, in_destructure: in_destructure, in_pattern: in_pattern)
+        end
+
+        # When *, **, &, or ... are used as an argument in a method call, we
+        # check if they were allowed by the current context. To determine that
+        # we build this lookup table.
+        def find_forwarding(node)
+          return [] if node.nil?
+
+          forwarding = []
+          forwarding << :* if node.rest.is_a?(RestParameterNode) && node.rest.name.nil?
+          forwarding << :** if node.keyword_rest.is_a?(KeywordRestParameterNode) && node.keyword_rest.name.nil?
+          forwarding << :& if !node.block.nil? && node.block.name.nil?
+          forwarding |= [:&, :"..."] if node.keyword_rest.is_a?(ForwardingParameterNode)
+
+          forwarding
+        end
+
+        # Returns the set of targets for a MultiTargetNode or a MultiWriteNode.
+        def multi_target_elements(node)
+          elements = [*node.lefts]
+          elements << node.rest if !node.rest.nil? && !node.rest.is_a?(ImplicitRestNode)
+          elements.concat(node.rights)
+          elements
+        end
+
+        # Negate the value of a numeric node. This is a special case where you
+        # have a negative sign on one line and then a number on the next line.
+        # In normal Ruby, this will always be a method call. The parser gem,
+        # however, marks this as a numeric literal. We have to massage the tree
+        # here to get it into the correct form.
+        def numeric_negate(message_loc, receiver)
+          case receiver.type
+          when :integer_node, :float_node
+            receiver.copy(value: -receiver.value, location: message_loc.join(receiver.location))
+          when :rational_node
+            receiver.copy(numerator: -receiver.numerator, location: message_loc.join(receiver.location))
+          when :imaginary_node
+            receiver.copy(numeric: numeric_negate(message_loc, receiver.numeric), location: message_loc.join(receiver.location))
+          end
+        end
+
+        # Blocks can have a special set of parameters that automatically expand
+        # when given arrays if they have a single required parameter and no
+        # other parameters.
+        def procarg0?(parameters)
+          parameters &&
+            parameters.requireds.length == 1 &&
+            parameters.optionals.empty? &&
+            parameters.rest.nil? &&
+            parameters.posts.empty? &&
+            parameters.keywords.empty? &&
+            parameters.keyword_rest.nil? &&
+            parameters.block.nil?
+        end
+
+        # Locations in the parser gem AST are generated using this class. We
+        # store a reference to its constant to make it slightly faster to look
+        # up.
+        Range = ::Parser::Source::Range
+
+        # Constructs a new source range from the given start and end offsets.
+        def srange(location)
+          Range.new(source_buffer, offset_cache[location.start_offset], offset_cache[location.end_offset]) if location
+        end
+
+        # Constructs a new source range from the given start and end offsets.
+        def srange_offsets(start_offset, end_offset)
+          Range.new(source_buffer, offset_cache[start_offset], offset_cache[end_offset])
+        end
+
+        # Constructs a new source range by finding the given character between
+        # the given start offset and end offset. If the needle is not found, it
+        # returns nil. Importantly it does not search past newlines or comments.
+        #
+        # Note that end_offset is allowed to be nil, in which case this will
+        # search until the end of the string.
+        def srange_find(start_offset, end_offset, character)
+          if (match = source_buffer.source.byteslice(start_offset...end_offset)[/\A\s*#{character}/])
+            final_offset = start_offset + match.bytesize
+            [character, Range.new(source_buffer, offset_cache[final_offset - character.bytesize], offset_cache[final_offset])]
+          end
+        end
+
+        # Transform a location into a token that the parser gem expects.
+        def token(location)
+          [location.slice, Range.new(source_buffer, offset_cache[location.start_offset], offset_cache[location.end_offset])] if location
+        end
+
+        # Visit a block node on a call.
+        def visit_block(call, block)
+          if block
+            parameters = block.parameters
+            implicit_parameters = parameters.is_a?(NumberedParametersNode) || parameters.is_a?(ItParametersNode)
+
+            builder.block(
+              call,
+              token(block.opening_loc),
+              if parameters.nil?
+                builder.args(nil, [], nil, false)
+              elsif implicit_parameters
+                visit(parameters)
+              else
+                builder.args(
+                  token(parameters.opening_loc),
+                  if procarg0?(parameters.parameters)
+                    parameter = parameters.parameters.requireds.first
+                    visited = parameter.is_a?(RequiredParameterNode) ? visit(parameter) : parameter.accept(copy_compiler(in_destructure: true))
+                    [builder.procarg0(visited)].concat(visit_all(parameters.locals))
+                  else
+                    visit(parameters)
+                  end,
+                  token(parameters.closing_loc),
+                  false
+                )
+              end,
+              visit(block.body),
+              token(block.closing_loc)
+            )
+          else
+            call
+          end
+        end
+
+        # Visit a heredoc that can be either a string or an xstring.
+        def visit_heredoc(node)
+          children = Array.new
+          indented = false
+
+          # If this is a dedenting heredoc, then we need to insert the opening
+          # content into the children as well.
+          if node.opening.start_with?("<<~") && node.parts.length > 0 && !node.parts.first.is_a?(StringNode)
+            location = node.parts.first.location
+            location = location.copy(start_offset: location.start_offset - location.start_line_slice.bytesize)
+            children << builder.string_internal(token(location))
+            indented = true
+          end
+
+          node.parts.each do |part|
+            pushing =
+              if part.is_a?(StringNode) && part.content.include?("\n")
+                string_nodes_from_line_continuations(part.unescaped, part.content, part.location.start_offset, node.opening)
+              else
+                [visit(part)]
+              end
+
+            pushing.each do |child|
+              if child.type == :str && child.children.last == ""
+                # nothing
+              elsif child.type == :str && children.last && children.last.type == :str && !children.last.children.first.end_with?("\n")
+                appendee = children[-1]
+
+                location = appendee.loc
+                location = location.with_expression(location.expression.join(child.loc.expression))
+
+                children[-1] = appendee.updated(:str, ["#{appendee.children.first}#{child.children.first}"], location: location)
+              else
+                children << child
+              end
+            end
+          end
+
+          closing = node.closing
+          closing_t = [closing.chomp, srange_offsets(node.closing_loc.start_offset, node.closing_loc.end_offset - (closing[/\s+$/]&.length || 0))]
+          composed = yield children, closing_t
+
+          composed = composed.updated(nil, children[1..-1]) if indented
+          composed
+        end
+
+        # Visit a numeric node and account for the optional sign.
+        def visit_numeric(node, value)
+          if (slice = node.slice).match?(/^[+-]/)
+            builder.unary_num(
+              [slice[0].to_sym, srange_offsets(node.location.start_offset, node.location.start_offset + 1)],
+              value
+            )
+          else
+            value
+          end
+        end
+
+        # Within the given block, track that we're within a pattern.
+        def within_pattern
+          begin
+            parser.pattern_variables.push
+            yield copy_compiler(in_pattern: true)
+          ensure
+            parser.pattern_variables.pop
+          end
+        end
+
+        # When the content of a string node is split across multiple lines, the
+        # parser gem creates individual string nodes for each line the content is part of.
+        def string_nodes_from_interpolation(node, opening)
+          node.parts.flat_map do |part|
+            if part.type == :string_node && part.content.include?("\n") && part.opening_loc.nil?
+              string_nodes_from_line_continuations(part.unescaped, part.content, part.content_loc.start_offset, opening)
+            else
+              visit(part)
+            end
+          end
+        end
+
+        # Create parser string nodes from a single prism node. The parser gem
+        # "glues" strings together when a line continuation is encountered.
+        def string_nodes_from_line_continuations(unescaped, escaped, start_offset, opening)
+          unescaped = unescaped.lines
+          escaped = escaped.lines
+          percent_array = opening&.start_with?("%w", "%W", "%i", "%I")
+          regex = opening == "/" || opening&.start_with?("%r")
+
+          # Non-interpolating strings
+          if opening&.end_with?("'") || opening&.start_with?("%q", "%s", "%w", "%i")
+            current_length = 0
+            current_line = +""
+
+            escaped.filter_map.with_index do |escaped_line, index|
+              unescaped_line = unescaped.fetch(index, "")
+              current_length += escaped_line.bytesize
+              current_line << unescaped_line
+
+              # Glue line continuations together. Only %w and %i arrays can contain these.
+              if percent_array && escaped_line[/(\\)*\n$/, 1]&.length&.odd?
+                next unless index == escaped.count - 1
+              end
+              s = builder.string_internal([current_line, srange_offsets(start_offset, start_offset + current_length)])
+              start_offset += escaped_line.bytesize
+              current_line = +""
+              current_length = 0
+              s
+            end
+          else
+            escaped_lengths = []
+            normalized_lengths = []
+            # Keeps track of where an unescaped line should start a new token. An unescaped
+            # \n would otherwise be indistinguishable from the actual newline at the end of
+            # of the line. The parser gem only emits a new string node at "real" newlines,
+            # line continuations don't start a new node as well.
+            do_next_tokens = []
+
+            escaped
+              .chunk_while { |before, after| before[/(\\*)\r?\n$/, 1]&.length&.odd? || false }
+              .each do |lines|
+                escaped_lengths << lines.sum(&:bytesize)
+
+                unescaped_lines_count =
+                  if regex
+                    0 # Will always be preserved as is
+                  else
+                    lines.sum do |line|
+                      count = line.scan(/(\\*)n/).count { |(backslashes)| backslashes&.length&.odd? }
+                      count -= 1 if !line.end_with?("\n") && count > 0
+                      count
+                    end
+                  end
+
+                extra = 1
+                extra = lines.count if percent_array # Account for line continuations in percent arrays
+
+                normalized_lengths.concat(Array.new(unescaped_lines_count + extra, 0))
+                normalized_lengths[-1] = lines.sum { |line| line.bytesize }
+                do_next_tokens.concat(Array.new(unescaped_lines_count + extra, false))
+                do_next_tokens[-1] = true
+              end
+
+            current_line = +""
+            current_normalized_length = 0
+
+            emitted_count = 0
+            unescaped.filter_map.with_index do |unescaped_line, index|
+              current_line << unescaped_line
+              current_normalized_length += normalized_lengths.fetch(index, 0)
+
+              if do_next_tokens[index]
+                inner_part = builder.string_internal([current_line, srange_offsets(start_offset, start_offset + current_normalized_length)])
+                start_offset += escaped_lengths.fetch(emitted_count, 0)
+                current_line = +""
+                current_normalized_length = 0
+                emitted_count += 1
+                inner_part
+              else
+                nil
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/lib/prism/translation/parser/lexer.rb b/lib/prism/translation/parser/lexer.rb
new file mode 100644
index 00000000000000..dd4867415c5849
--- /dev/null
+++ b/lib/prism/translation/parser/lexer.rb
@@ -0,0 +1,819 @@
+# frozen_string_literal: true
+# :markup: markdown
+
+require "strscan"
+require_relative "../../polyfill/append_as_bytes"
+require_relative "../../polyfill/scan_byte"
+
+module Prism
+  module Translation
+    class Parser
+      # Accepts a list of prism tokens and converts them into the expected
+      # format for the parser gem.
+      class Lexer
+        # These tokens are always skipped
+        TYPES_ALWAYS_SKIP = Set.new(%i[IGNORED_NEWLINE __END__ EOF])
+        private_constant :TYPES_ALWAYS_SKIP
+
+        # The direct translating of types between the two lexers.
+        TYPES = {
+          # These tokens should never appear in the output of the lexer.
+          MISSING: nil,
+          NOT_PROVIDED: nil,
+          EMBDOC_END: nil,
+          EMBDOC_LINE: nil,
+
+          # These tokens have more or less direct mappings.
+          AMPERSAND: :tAMPER2,
+          AMPERSAND_AMPERSAND: :tANDOP,
+          AMPERSAND_AMPERSAND_EQUAL: :tOP_ASGN,
+          AMPERSAND_DOT: :tANDDOT,
+          AMPERSAND_EQUAL: :tOP_ASGN,
+          BACK_REFERENCE: :tBACK_REF,
+          BACKTICK: :tXSTRING_BEG,
+          BANG: :tBANG,
+          BANG_EQUAL: :tNEQ,
+          BANG_TILDE: :tNMATCH,
+          BRACE_LEFT: :tLCURLY,
+          BRACE_RIGHT: :tRCURLY,
+          BRACKET_LEFT: :tLBRACK2,
+          BRACKET_LEFT_ARRAY: :tLBRACK,
+          BRACKET_LEFT_RIGHT: :tAREF,
+          BRACKET_LEFT_RIGHT_EQUAL: :tASET,
+          BRACKET_RIGHT: :tRBRACK,
+          CARET: :tCARET,
+          CARET_EQUAL: :tOP_ASGN,
+          CHARACTER_LITERAL: :tCHARACTER,
+          CLASS_VARIABLE: :tCVAR,
+          COLON: :tCOLON,
+          COLON_COLON: :tCOLON2,
+          COMMA: :tCOMMA,
+          COMMENT: :tCOMMENT,
+          CONSTANT: :tCONSTANT,
+          DOT: :tDOT,
+          DOT_DOT: :tDOT2,
+          DOT_DOT_DOT: :tDOT3,
+          EMBDOC_BEGIN: :tCOMMENT,
+          EMBEXPR_BEGIN: :tSTRING_DBEG,
+          EMBEXPR_END: :tSTRING_DEND,
+          EMBVAR: :tSTRING_DVAR,
+          EQUAL: :tEQL,
+          EQUAL_EQUAL: :tEQ,
+          EQUAL_EQUAL_EQUAL: :tEQQ,
+          EQUAL_GREATER: :tASSOC,
+          EQUAL_TILDE: :tMATCH,
+          FLOAT: :tFLOAT,
+          FLOAT_IMAGINARY: :tIMAGINARY,
+          FLOAT_RATIONAL: :tRATIONAL,
+          FLOAT_RATIONAL_IMAGINARY: :tIMAGINARY,
+          GLOBAL_VARIABLE: :tGVAR,
+          GREATER: :tGT,
+          GREATER_EQUAL: :tGEQ,
+          GREATER_GREATER: :tRSHFT,
+          GREATER_GREATER_EQUAL: :tOP_ASGN,
+          HEREDOC_START: :tSTRING_BEG,
+          HEREDOC_END: :tSTRING_END,
+          IDENTIFIER: :tIDENTIFIER,
+          INSTANCE_VARIABLE: :tIVAR,
+          INTEGER: :tINTEGER,
+          INTEGER_IMAGINARY: :tIMAGINARY,
+          INTEGER_RATIONAL: :tRATIONAL,
+          INTEGER_RATIONAL_IMAGINARY: :tIMAGINARY,
+          KEYWORD_ALIAS: :kALIAS,
+          KEYWORD_AND: :kAND,
+          KEYWORD_BEGIN: :kBEGIN,
+          KEYWORD_BEGIN_UPCASE: :klBEGIN,
+          KEYWORD_BREAK: :kBREAK,
+          KEYWORD_CASE: :kCASE,
+          KEYWORD_CLASS: :kCLASS,
+          KEYWORD_DEF: :kDEF,
+          KEYWORD_DEFINED: :kDEFINED,
+          KEYWORD_DO: :kDO,
+          KEYWORD_DO_LOOP: :kDO_COND,
+          KEYWORD_END: :kEND,
+          KEYWORD_END_UPCASE: :klEND,
+          KEYWORD_ENSURE: :kENSURE,
+          KEYWORD_ELSE: :kELSE,
+          KEYWORD_ELSIF: :kELSIF,
+          KEYWORD_FALSE: :kFALSE,
+          KEYWORD_FOR: :kFOR,
+          KEYWORD_IF: :kIF,
+          KEYWORD_IF_MODIFIER: :kIF_MOD,
+          KEYWORD_IN: :kIN,
+          KEYWORD_MODULE: :kMODULE,
+          KEYWORD_NEXT: :kNEXT,
+          KEYWORD_NIL: :kNIL,
+          KEYWORD_NOT: :kNOT,
+          KEYWORD_OR: :kOR,
+          KEYWORD_REDO: :kREDO,
+          KEYWORD_RESCUE: :kRESCUE,
+          KEYWORD_RESCUE_MODIFIER: :kRESCUE_MOD,
+          KEYWORD_RETRY: :kRETRY,
+          KEYWORD_RETURN: :kRETURN,
+          KEYWORD_SELF: :kSELF,
+          KEYWORD_SUPER: :kSUPER,
+          KEYWORD_THEN: :kTHEN,
+          KEYWORD_TRUE: :kTRUE,
+          KEYWORD_UNDEF: :kUNDEF,
+          KEYWORD_UNLESS: :kUNLESS,
+          KEYWORD_UNLESS_MODIFIER: :kUNLESS_MOD,
+          KEYWORD_UNTIL: :kUNTIL,
+          KEYWORD_UNTIL_MODIFIER: :kUNTIL_MOD,
+          KEYWORD_WHEN: :kWHEN,
+          KEYWORD_WHILE: :kWHILE,
+          KEYWORD_WHILE_MODIFIER: :kWHILE_MOD,
+          KEYWORD_YIELD: :kYIELD,
+          KEYWORD___ENCODING__: :k__ENCODING__,
+          KEYWORD___FILE__: :k__FILE__,
+          KEYWORD___LINE__: :k__LINE__,
+          LABEL: :tLABEL,
+          LABEL_END: :tLABEL_END,
+          LAMBDA_BEGIN: :tLAMBEG,
+          LESS: :tLT,
+          LESS_EQUAL: :tLEQ,
+          LESS_EQUAL_GREATER: :tCMP,
+          LESS_LESS: :tLSHFT,
+          LESS_LESS_EQUAL: :tOP_ASGN,
+          METHOD_NAME: :tFID,
+          MINUS: :tMINUS,
+          MINUS_EQUAL: :tOP_ASGN,
+          MINUS_GREATER: :tLAMBDA,
+          NEWLINE: :tNL,
+          NUMBERED_REFERENCE: :tNTH_REF,
+          PARENTHESIS_LEFT: :tLPAREN2,
+          PARENTHESIS_LEFT_PARENTHESES: :tLPAREN_ARG,
+          PARENTHESIS_RIGHT: :tRPAREN,
+          PERCENT: :tPERCENT,
+          PERCENT_EQUAL: :tOP_ASGN,
+          PERCENT_LOWER_I: :tQSYMBOLS_BEG,
+          PERCENT_LOWER_W: :tQWORDS_BEG,
+          PERCENT_UPPER_I: :tSYMBOLS_BEG,
+          PERCENT_UPPER_W: :tWORDS_BEG,
+          PERCENT_LOWER_X: :tXSTRING_BEG,
+          PLUS: :tPLUS,
+          PLUS_EQUAL: :tOP_ASGN,
+          PIPE_EQUAL: :tOP_ASGN,
+          PIPE: :tPIPE,
+          PIPE_PIPE: :tOROP,
+          PIPE_PIPE_EQUAL: :tOP_ASGN,
+          QUESTION_MARK: :tEH,
+          REGEXP_BEGIN: :tREGEXP_BEG,
+          REGEXP_END: :tSTRING_END,
+          SEMICOLON: :tSEMI,
+          SLASH: :tDIVIDE,
+          SLASH_EQUAL: :tOP_ASGN,
+          STAR: :tSTAR2,
+          STAR_EQUAL: :tOP_ASGN,
+          STAR_STAR: :tPOW,
+          STAR_STAR_EQUAL: :tOP_ASGN,
+          STRING_BEGIN: :tSTRING_BEG,
+          STRING_CONTENT: :tSTRING_CONTENT,
+          STRING_END: :tSTRING_END,
+          SYMBOL_BEGIN: :tSYMBEG,
+          TILDE: :tTILDE,
+          UAMPERSAND: :tAMPER,
+          UCOLON_COLON: :tCOLON3,
+          UDOT_DOT: :tBDOT2,
+          UDOT_DOT_DOT: :tBDOT3,
+          UMINUS: :tUMINUS,
+          UMINUS_NUM: :tUNARY_NUM,
+          UPLUS: :tUPLUS,
+          USTAR: :tSTAR,
+          USTAR_STAR: :tDSTAR,
+          WORDS_SEP: :tSPACE
+        }
+
+        # These constants represent flags in our lex state. We really, really
+        # don't want to be using them and we really, really don't want to be
+        # exposing them as part of our public API. Unfortunately, we don't have
+        # another way of matching the exact tokens that the parser gem expects
+        # without them. We should find another way to do this, but in the
+        # meantime we'll hide them from the documentation and mark them as
+        # private constants.
+        EXPR_BEG = 0x1 # :nodoc:
+        EXPR_LABEL = 0x400 # :nodoc:
+
+        # It is used to determine whether `do` is of the token type `kDO` or `kDO_LAMBDA`.
+        #
+        # NOTE: In edge cases like `-> (foo = -> (bar) {}) do end`, please note that `kDO` is still returned
+        # instead of `kDO_LAMBDA`, which is expected: https://github.com/ruby/prism/pull/3046
+        LAMBDA_TOKEN_TYPES = Set.new([:kDO_LAMBDA, :tLAMBDA, :tLAMBEG])
+
+        # The `PARENTHESIS_LEFT` token in Prism is classified as either `tLPAREN` or `tLPAREN2` in the Parser gem.
+        # The following token types are listed as those classified as `tLPAREN`.
+        LPAREN_CONVERSION_TOKEN_TYPES = Set.new([
+          :kBREAK, :tCARET, :kCASE, :tDIVIDE, :kFOR, :kIF, :kNEXT, :kRETURN, :kUNTIL, :kWHILE, :tAMPER, :tANDOP, :tBANG, :tCOMMA, :tDOT2, :tDOT3,
+          :tEQL, :tLPAREN, :tLPAREN2, :tLPAREN_ARG, :tLSHFT, :tNL, :tOP_ASGN, :tOROP, :tPIPE, :tSEMI, :tSTRING_DBEG, :tUMINUS, :tUPLUS
+        ])
+
+        # Types of tokens that are allowed to continue a method call with comments in-between.
+        # For these, the parser gem doesn't emit a newline token after the last comment.
+        COMMENT_CONTINUATION_TYPES = Set.new([:COMMENT, :AMPERSAND_DOT, :DOT])
+        private_constant :COMMENT_CONTINUATION_TYPES
+
+        # Heredocs are complex and require us to keep track of a bit of info to refer to later
+        HeredocData = Struct.new(:identifier, :common_whitespace, keyword_init: true)
+
+        private_constant :TYPES, :EXPR_BEG, :EXPR_LABEL, :LAMBDA_TOKEN_TYPES, :LPAREN_CONVERSION_TOKEN_TYPES, :HeredocData
+
+        # The Parser::Source::Buffer that the tokens were lexed from.
+        attr_reader :source_buffer
+
+        # An array of tuples that contain prism tokens and their associated lex
+        # state when they were lexed.
+        attr_reader :lexed
+
+        # A hash that maps offsets in bytes to offsets in characters.
+        attr_reader :offset_cache
+
+        # Initialize the lexer with the given source buffer, prism tokens, and
+        # offset cache.
+        def initialize(source_buffer, lexed, offset_cache)
+          @source_buffer = source_buffer
+          @lexed = lexed
+          @offset_cache = offset_cache
+        end
+
+        Range = ::Parser::Source::Range # :nodoc:
+        private_constant :Range
+
+        # Convert the prism tokens into the expected format for the parser gem.
+        def to_a
+          tokens = []
+
+          index = 0
+          length = lexed.length
+
+          heredoc_stack = []
+          quote_stack = []
+
+          # The parser gem emits the newline tokens for comments out of order. This saves
+          # that token location to emit at a later time to properly line everything up.
+          # https://github.com/whitequark/parser/issues/1025
+          comment_newline_location = nil
+
+          while index < length
+            token, state = lexed[index]
+            index += 1
+            next if TYPES_ALWAYS_SKIP.include?(token.type)
+
+            type = TYPES.fetch(token.type)
+            value = token.value
+            location = range(token.location.start_offset, token.location.end_offset)
+
+            case type
+            when :kDO
+              nearest_lambda_token = tokens.reverse_each.find do |token|
+                LAMBDA_TOKEN_TYPES.include?(token.first)
+              end
+
+              if nearest_lambda_token&.first == :tLAMBDA
+                type = :kDO_LAMBDA
+              end
+            when :tCHARACTER
+              value.delete_prefix!("?")
+              # Character literals behave similar to double-quoted strings. We can use the same escaping mechanism.
+              value = unescape_string(value, "?")
+            when :tCOMMENT
+              if token.type == :EMBDOC_BEGIN
+
+                while !((next_token = lexed[index][0]) && next_token.type == :EMBDOC_END) && (index < length - 1)
+                  value += next_token.value
+                  index += 1
+                end
+
+                value += next_token.value
+                location = range(token.location.start_offset, lexed[index][0].location.end_offset)
+                index += 1
+              else
+                is_at_eol = value.chomp!.nil?
+                location = range(token.location.start_offset, token.location.end_offset + (is_at_eol ? 0 : -1))
+
+                prev_token = lexed[index - 2][0] if index - 2 >= 0
+                next_token = lexed[index][0]
+
+                is_inline_comment = prev_token&.location&.start_line == token.location.start_line
+                if is_inline_comment && !is_at_eol && !COMMENT_CONTINUATION_TYPES.include?(next_token&.type)
+                  tokens << [:tCOMMENT, [value, location]]
+
+                  nl_location = range(token.location.end_offset - 1, token.location.end_offset)
+                  tokens << [:tNL, [nil, nl_location]]
+                  next
+                elsif is_inline_comment && next_token&.type == :COMMENT
+                  comment_newline_location = range(token.location.end_offset - 1, token.location.end_offset)
+                elsif comment_newline_location && !COMMENT_CONTINUATION_TYPES.include?(next_token&.type)
+                  tokens << [:tCOMMENT, [value, location]]
+                  tokens << [:tNL, [nil, comment_newline_location]]
+                  comment_newline_location = nil
+                  next
+                end
+              end
+            when :tNL
+              next_token = next_token = lexed[index][0]
+              # Newlines after comments are emitted out of order.
+              if next_token&.type == :COMMENT
+                comment_newline_location = location
+                next
+              end
+
+              value = nil
+            when :tFLOAT
+              value = parse_float(value)
+            when :tIMAGINARY
+              value = parse_complex(value)
+            when :tINTEGER
+              if value.start_with?("+")
+                tokens << [:tUNARY_NUM, ["+", range(token.location.start_offset, token.location.start_offset + 1)]]
+                location = range(token.location.start_offset + 1, token.location.end_offset)
+              end
+
+              value = parse_integer(value)
+            when :tLABEL
+              value.chomp!(":")
+            when :tLABEL_END
+              value.chomp!(":")
+            when :tLCURLY
+              type = :tLBRACE if state == EXPR_BEG | EXPR_LABEL
+            when :tLPAREN2
+              type = :tLPAREN if tokens.empty? || LPAREN_CONVERSION_TOKEN_TYPES.include?(tokens.dig(-1, 0))
+            when :tNTH_REF
+              value = parse_integer(value.delete_prefix("$"))
+            when :tOP_ASGN
+              value.chomp!("=")
+            when :tRATIONAL
+              value = parse_rational(value)
+            when :tSPACE
+              location = range(token.location.start_offset, token.location.start_offset + percent_array_leading_whitespace(value))
+              value = nil
+            when :tSTRING_BEG
+              next_token = lexed[index][0]
+              next_next_token = lexed[index + 1][0]
+              basic_quotes = value == '"' || value == "'"
+
+              if basic_quotes && next_token&.type == :STRING_END
+                next_location = token.location.join(next_token.location)
+                type = :tSTRING
+                value = ""
+                location = range(next_location.start_offset, next_location.end_offset)
+                index += 1
+              elsif value.start_with?("'", '"', "%")
+                if next_token&.type == :STRING_CONTENT && next_next_token&.type == :STRING_END
+                  string_value = next_token.value
+                  if simplify_string?(string_value, value)
+                    next_location = token.location.join(next_next_token.location)
+                    if percent_array?(value)
+                      value = percent_array_unescape(string_value)
+                    else
+                      value = unescape_string(string_value, value)
+                    end
+                    type = :tSTRING
+                    location = range(next_location.start_offset, next_location.end_offset)
+                    index += 2
+                    tokens << [type, [value, location]]
+
+                    next
+                  end
+                end
+
+                quote_stack.push(value)
+              elsif token.type == :HEREDOC_START
+                quote = value[2] == "-" || value[2] == "~" ? value[3] : value[2]
+                heredoc_type = value[2] == "-" || value[2] == "~" ? value[2] : ""
+                heredoc = HeredocData.new(
+                  identifier: value.match(/<<[-~]?["'`]?(?<heredoc_identifier>.*?)["'`]?\z/)[:heredoc_identifier],
+                  common_whitespace: 0,
+                )
+
+                if quote == "`"
+                  type = :tXSTRING_BEG
+                end
+
+                # The parser gem trims whitespace from squiggly heredocs. We must record
+                # the most common whitespace to later remove.
+                if heredoc_type == "~" || heredoc_type == "`"
+                  heredoc.common_whitespace = calculate_heredoc_whitespace(index)
+                end
+
+                if quote == "'" || quote == '"' || quote == "`"
+                  value = "<<#{quote}"
+                else
+                  value = '<<"'
+                end
+
+                heredoc_stack.push(heredoc)
+                quote_stack.push(value)
+              end
+            when :tSTRING_CONTENT
+              is_percent_array = percent_array?(quote_stack.last)
+
+              if (lines = token.value.lines).one?
+                # Prism usually emits a single token for strings with line continuations.
+                # For squiggly heredocs they are not joined so we do that manually here.
+                current_string = +""
+                current_length = 0
+                start_offset = token.location.start_offset
+                while token.type == :STRING_CONTENT
+                  current_length += token.value.bytesize
+                  # Heredoc interpolation can have multiple STRING_CONTENT nodes on the same line.
+                  is_first_token_on_line = lexed[index - 1] && token.location.start_line != lexed[index - 2][0].location&.start_line
+                  # The parser gem only removes indentation when the heredoc is not nested
+                  not_nested = heredoc_stack.size == 1
+                  if is_percent_array
+                    value = percent_array_unescape(token.value)
+                  elsif is_first_token_on_line && not_nested && (current_heredoc = heredoc_stack.last).common_whitespace > 0
+                    value = trim_heredoc_whitespace(token.value, current_heredoc)
+                  end
+
+                  current_string << unescape_string(value, quote_stack.last)
+                  relevant_backslash_count = if quote_stack.last.start_with?("%W", "%I")
+                                               0 # the last backslash escapes the newline
+                                             else
+                                               token.value[/(\\{1,})\n/, 1]&.length || 0
+                                             end
+                  if relevant_backslash_count.even? || !interpolation?(quote_stack.last)
+                    tokens << [:tSTRING_CONTENT, [current_string, range(start_offset, start_offset + current_length)]]
+                    break
+                  end
+                  token = lexed[index][0]
+                  index += 1
+                end
+              else
+                # When the parser gem encounters a line continuation inside of a multiline string,
+                # it emits a single string node. The backslash (and remaining newline) is removed.
+                current_line = +""
+                adjustment = 0
+                start_offset = token.location.start_offset
+                emit = false
+
+                lines.each.with_index do |line, index|
+                  chomped_line = line.chomp
+                  backslash_count = chomped_line[/\\{1,}\z/]&.length || 0
+                  is_interpolation = interpolation?(quote_stack.last)
+
+                  if backslash_count.odd? && (is_interpolation || is_percent_array)
+                    if is_percent_array
+                      current_line << percent_array_unescape(line)
+                      adjustment += 1
+                    else
+                      chomped_line.delete_suffix!("\\")
+                      current_line << chomped_line
+                      adjustment += 2
+                    end
+                    # If the string ends with a line continuation emit the remainder
+                    emit = index == lines.count - 1
+                  else
+                    current_line << line
+                    emit = true
+                  end
+
+                  if emit
+                    end_offset = start_offset + current_line.bytesize + adjustment
+                    tokens << [:tSTRING_CONTENT, [unescape_string(current_line, quote_stack.last), range(start_offset, end_offset)]]
+                    start_offset = end_offset
+                    current_line = +""
+                    adjustment = 0
+                  end
+                end
+              end
+              next
+            when :tSTRING_DVAR
+              value = nil
+            when :tSTRING_END
+              if token.type == :HEREDOC_END && value.end_with?("\n")
+                newline_length = value.end_with?("\r\n") ? 2 : 1
+                value = heredoc_stack.pop.identifier
+                location = range(token.location.start_offset, token.location.end_offset - newline_length)
+              elsif token.type == :REGEXP_END
+                value = value[0]
+                location = range(token.location.start_offset, token.location.start_offset + 1)
+              end
+
+              if percent_array?(quote_stack.pop)
+                prev_token = lexed[index - 2][0] if index - 2 >= 0
+                empty = %i[PERCENT_LOWER_I PERCENT_LOWER_W PERCENT_UPPER_I PERCENT_UPPER_W].include?(prev_token&.type)
+                ends_with_whitespace = prev_token&.type == :WORDS_SEP
+                # parser always emits a space token after content in a percent array, even if no actual whitespace is present.
+                if !empty && !ends_with_whitespace
+                  tokens << [:tSPACE, [nil, range(token.location.start_offset, token.location.start_offset)]]
+                end
+              end
+            when :tSYMBEG
+              if (next_token = lexed[index][0]) && next_token.type != :STRING_CONTENT && next_token.type != :EMBEXPR_BEGIN && next_token.type != :EMBVAR && next_token.type != :STRING_END
+                next_location = token.location.join(next_token.location)
+                type = :tSYMBOL
+                value = next_token.value
+                value = { "~@" => "~", "!@" => "!" }.fetch(value, value)
+                location = range(next_location.start_offset, next_location.end_offset)
+                index += 1
+              else
+                quote_stack.push(value)
+              end
+            when :tFID
+              if !tokens.empty? && tokens.dig(-1, 0) == :kDEF
+                type = :tIDENTIFIER
+              end
+            when :tXSTRING_BEG
+              if (next_token = lexed[index][0]) && !%i[STRING_CONTENT STRING_END EMBEXPR_BEGIN].include?(next_token.type)
+                # self.`()
+                type = :tBACK_REF2
+              end
+              quote_stack.push(value)
+            when :tSYMBOLS_BEG, :tQSYMBOLS_BEG, :tWORDS_BEG, :tQWORDS_BEG
+              if (next_token = lexed[index][0]) && next_token.type == :WORDS_SEP
+                index += 1
+              end
+
+              quote_stack.push(value)
+            when :tREGEXP_BEG
+              quote_stack.push(value)
+            end
+
+            tokens << [type, [value, location]]
+
+            if token.type == :REGEXP_END
+              tokens << [:tREGEXP_OPT, [token.value[1..], range(token.location.start_offset + 1, token.location.end_offset)]]
+            end
+          end
+
+          tokens
+        end
+
+        private
+
+        # Creates a new parser range, taking prisms byte offsets into account
+        def range(start_offset, end_offset)
+          Range.new(source_buffer, offset_cache[start_offset], offset_cache[end_offset])
+        end
+
+        # Parse an integer from the string representation.
+        def parse_integer(value)
+          Integer(value)
+        rescue ArgumentError
+          0
+        end
+
+        # Parse a float from the string representation.
+        def parse_float(value)
+          Float(value)
+        rescue ArgumentError
+          0.0
+        end
+
+        # Parse a complex from the string representation.
+        def parse_complex(value)
+          value.chomp!("i")
+
+          if value.end_with?("r")
+            Complex(0, parse_rational(value))
+          elsif value.start_with?(/0[BbOoDdXx]/)
+            Complex(0, parse_integer(value))
+          else
+            Complex(0, value)
+          end
+        rescue ArgumentError
+          0i
+        end
+
+        # Parse a rational from the string representation.
+        def parse_rational(value)
+          value.chomp!("r")
+
+          if value.start_with?(/0[BbOoDdXx]/)
+            Rational(parse_integer(value))
+          else
+            Rational(value)
+          end
+        rescue ArgumentError
+          0r
+        end
+
+        # Wonky heredoc tab/spaces rules.
+        # https://github.com/ruby/prism/blob/v1.3.0/src/prism.c#L10548-L10558
+        def calculate_heredoc_whitespace(heredoc_token_index)
+          next_token_index = heredoc_token_index
+          nesting_level = 0
+          previous_line = -1
+          result = Float::MAX
+
+          while (lexed[next_token_index] && next_token = lexed[next_token_index][0])
+            next_token_index += 1
+            next_next_token = lexed[next_token_index] && lexed[next_token_index][0]
+            first_token_on_line = next_token.location.start_column == 0
+
+            # String content inside nested heredocs and interpolation is ignored
+            if next_token.type == :HEREDOC_START || next_token.type == :EMBEXPR_BEGIN
+              # When interpolation is the first token of a line there is no string
+              # content to check against. There will be no common whitespace.
+              if nesting_level == 0 && first_token_on_line
+                result = 0
+              end
+              nesting_level += 1
+            elsif next_token.type == :HEREDOC_END || next_token.type == :EMBEXPR_END
+              nesting_level -= 1
+              # When we encountered the matching heredoc end, we can exit
+              break if nesting_level == -1
+            elsif next_token.type == :STRING_CONTENT && nesting_level == 0 && first_token_on_line
+              common_whitespace = 0
+              next_token.value[/^\s*/].each_char do |char|
+                if char == "\t"
+                  common_whitespace = (common_whitespace / 8 + 1) * 8;
+                else
+                  common_whitespace += 1
+                end
+              end
+
+              is_first_token_on_line = next_token.location.start_line != previous_line
+              # Whitespace is significant if followed by interpolation
+              whitespace_only = common_whitespace == next_token.value.length && next_next_token&.location&.start_line != next_token.location.start_line
+              if is_first_token_on_line && !whitespace_only && common_whitespace < result
+                result = common_whitespace
+                previous_line = next_token.location.start_line
+              end
+            end
+          end
+          result
+        end
+
+        # Wonky heredoc tab/spaces rules.
+        # https://github.com/ruby/prism/blob/v1.3.0/src/prism.c#L16528-L16545
+        def trim_heredoc_whitespace(string, heredoc)
+          trimmed_whitespace = 0
+          trimmed_characters = 0
+          while (string[trimmed_characters] == "\t" || string[trimmed_characters] == " ") && trimmed_whitespace < heredoc.common_whitespace
+            if string[trimmed_characters] == "\t"
+              trimmed_whitespace = (trimmed_whitespace / 8 + 1) * 8;
+              break if trimmed_whitespace > heredoc.common_whitespace
+            else
+              trimmed_whitespace += 1
+            end
+            trimmed_characters += 1
+          end
+
+          string[trimmed_characters..]
+        end
+
+        # Escape sequences that have special and should appear unescaped in the resulting string.
+        ESCAPES = {
+          "a" => "\a", "b" => "\b", "e" => "\e", "f" => "\f",
+          "n" => "\n", "r" => "\r", "s" => "\s", "t" => "\t",
+          "v" => "\v", "\\" => "\\"
+        }.freeze
+        private_constant :ESCAPES
+
+        # When one of these delimiters is encountered, then the other
+        # one is allowed to be escaped as well.
+        DELIMITER_SYMETRY = { "[" => "]", "(" => ")", "{" => "}", "<" => ">" }.freeze
+        private_constant :DELIMITER_SYMETRY
+
+
+        # https://github.com/whitequark/parser/blob/v3.3.6.0/lib/parser/lexer-strings.rl#L14
+        REGEXP_META_CHARACTERS = ["\\", "$", "(", ")", "*", "+", ".", "<", ">", "?", "[", "]", "^", "{", "|", "}"]
+        private_constant :REGEXP_META_CHARACTERS
+
+        # Apply Ruby string escaping rules
+        def unescape_string(string, quote)
+          # In single-quoted heredocs, everything is taken literally.
+          return string if quote == "<<'"
+
+          # OPTIMIZATION: Assume that few strings need escaping to speed up the common case.
+          return string unless string.include?("\\")
+
+          # Enclosing character for the string. `"` for `"foo"`, `{` for `%w{foo}`, etc.
+          delimiter = quote[-1]
+
+          if regexp?(quote)
+            # Should be escaped handled to single-quoted heredocs. The only character that is
+            # allowed to be escaped is the delimiter, except when that also has special meaning
+            # in the regexp. Since all the symetry delimiters have special meaning, they don't need
+            # to be considered separately.
+            if REGEXP_META_CHARACTERS.include?(delimiter)
+              string
+            else
+              # There can never be an even amount of backslashes. It would be a syntax error.
+              string.gsub(/\\(#{Regexp.escape(delimiter)})/, '\1')
+            end
+          elsif interpolation?(quote)
+            # Appending individual escape sequences may force the string out of its intended
+            # encoding. Start out with binary and force it back later.
+            result = "".b
+
+            scanner = StringScanner.new(string)
+            while (skipped = scanner.skip_until(/\\/))
+              # Append what was just skipped over, excluding the found backslash.
+              result.append_as_bytes(string.byteslice(scanner.pos - skipped, skipped - 1))
+              escape_read(result, scanner, false, false)
+            end
+
+            # Add remaining chars
+            result.append_as_bytes(string.byteslice(scanner.pos..))
+            result.force_encoding(source_buffer.source.encoding)
+          else
+            delimiters = Regexp.escape("#{delimiter}#{DELIMITER_SYMETRY[delimiter]}")
+            string.gsub(/\\([\\#{delimiters}])/, '\1')
+          end
+        end
+
+        # Certain strings are merged into a single string token.
+        def simplify_string?(value, quote)
+          case quote
+          when "'"
+            # Only simplify 'foo'
+            !value.include?("\n")
+          when '"'
+            # Simplify when every line ends with a line continuation, or it is the last line
+            value.lines.all? do |line|
+              !line.end_with?("\n") || line[/(\\*)$/, 1]&.length&.odd?
+            end
+          else
+            # %q and similar are never simplified
+            false
+          end
+        end
+
+        # Escape a byte value, given the control and meta flags.
+        def escape_build(value, control, meta)
+          value &= 0x9f if control
+          value |= 0x80 if meta
+          value
+        end
+
+        # Read an escape out of the string scanner, given the control and meta
+        # flags, and push the unescaped value into the result.
+        def escape_read(result, scanner, control, meta)
+          if scanner.skip("\n")
+            # Line continuation
+          elsif (value = ESCAPES[scanner.peek(1)])
+            # Simple single-character escape sequences like \n
+            result.append_as_bytes(value)
+            scanner.pos += 1
+          elsif (value = scanner.scan(/[0-7]{1,3}/))
+            # \nnn
+            result.append_as_bytes(escape_build(value.to_i(8), control, meta))
+          elsif (value = scanner.scan(/x[0-9a-fA-F]{1,2}/))
+            # \xnn
+            result.append_as_bytes(escape_build(value[1..].to_i(16), control, meta))
+          elsif (value = scanner.scan(/u[0-9a-fA-F]{4}/))
+            # \unnnn
+            result.append_as_bytes(value[1..].hex.chr(Encoding::UTF_8))
+          elsif scanner.skip("u{}")
+            # https://github.com/whitequark/parser/issues/856
+          elsif (value = scanner.scan(/u{.*?}/))
+            # \u{nnnn ...}
+            value[2..-2].split.each do |unicode|
+              result.append_as_bytes(unicode.hex.chr(Encoding::UTF_8))
+            end
+          elsif (value = scanner.scan(/c\\?(?=[[:print:]])|C-\\?(?=[[:print:]])/))
+            # \cx or \C-x where x is an ASCII printable character
+            escape_read(result, scanner, true, meta)
+          elsif (value = scanner.scan(/M-\\?(?=[[:print:]])/))
+            # \M-x where x is an ASCII printable character
+            escape_read(result, scanner, control, true)
+          elsif (byte = scanner.scan_byte)
+            # Something else after an escape.
+            if control && byte == 0x3f # ASCII '?'
+              result.append_as_bytes(escape_build(0x7f, false, meta))
+            else
+              result.append_as_bytes(escape_build(byte, control, meta))
+            end
+          end
+        end
+
+        # In a percent array, certain whitespace can be preceeded with a backslash,
+        # causing the following characters to be part of the previous element.
+        def percent_array_unescape(string)
+          string.gsub(/(\\)+[ \f\n\r\t\v]/) do |full_match|
+            full_match.delete_prefix!("\\") if Regexp.last_match[1].length.odd?
+            full_match
+          end
+        end
+
+        # For %-arrays whitespace, the parser gem only considers whitespace before the newline.
+        def percent_array_leading_whitespace(string)
+          return 1 if string.start_with?("\n")
+
+          leading_whitespace = 0
+          string.each_char do |c|
+            break if c == "\n"
+            leading_whitespace += 1
+          end
+          leading_whitespace
+        end
+
+        # Determine if characters preceeded by a backslash should be escaped or not
+        def interpolation?(quote)
+          !quote.end_with?("'") && !quote.start_with?("%q", "%w", "%i", "%s")
+        end
+
+        # Regexp allow interpolation but are handled differently during unescaping
+        def regexp?(quote)
+          quote == "/" || quote.start_with?("%r")
+        end
+
+        # Determine if the string is part of a %-style array.
+        def percent_array?(quote)
+          quote.start_with?("%w", "%W", "%i", "%I")
+        end
+      end
+    end
+  end
+end
diff --git a/lib/prism/translation/parser33.rb b/lib/prism/translation/parser33.rb
new file mode 100644
index 00000000000000..0a596694655a47
--- /dev/null
+++ b/lib/prism/translation/parser33.rb
@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+# :markup: markdown
+
+module Prism
+  module Translation
+    # This class is the entry-point for Ruby 3.3 of `Prism::Translation::Parser`.
+    class Parser33 < Parser
+      def version # :nodoc:
+        33
+      end
+    end
+  end
+end
diff --git a/lib/prism/translation/parser34.rb b/lib/prism/translation/parser34.rb
new file mode 100644
index 00000000000000..566a23fadbfc6c
--- /dev/null
+++ b/lib/prism/translation/parser34.rb
@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+# :markup: markdown
+
+module Prism
+  module Translation
+    # This class is the entry-point for Ruby 3.4 of `Prism::Translation::Parser`.
+    class Parser34 < Parser
+      def version # :nodoc:
+        34
+      end
+    end
+  end
+end
diff --git a/lib/prism/translation/parser35.rb b/lib/prism/translation/parser35.rb
new file mode 100644
index 00000000000000..79cd59cbd96a8e
--- /dev/null
+++ b/lib/prism/translation/parser35.rb
@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+# :markup: markdown
+
+module Prism
+  module Translation
+    # This class is the entry-point for Ruby 3.5 of `Prism::Translation::Parser`.
+    class Parser35 < Parser
+      def version # :nodoc:
+        35
+      end
+    end
+  end
+end
diff --git a/lib/prism/translation/parser_current.rb b/lib/prism/translation/parser_current.rb
new file mode 100644
index 00000000000000..1b1794abbe047a
--- /dev/null
+++ b/lib/prism/translation/parser_current.rb
@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+# :markup: markdown
+# typed: ignore
+
+#
+module Prism
+  module Translation
+    case RUBY_VERSION
+    when /^3\.3\./
+      ParserCurrent = Parser33
+    when /^3\.4\./
+      ParserCurrent = Parser34
+    when /^3\.5\./
+      ParserCurrent = Parser35
+    else
+      # Keep this in sync with released Ruby.
+      parser = Parser34
+      major, minor, _patch = Gem::Version.new(RUBY_VERSION).segments
+      warn "warning: `Prism::Translation::Current` is loading #{parser.name}, " \
+           "but you are running #{major}.#{minor}."
+      ParserCurrent = parser
+    end
+  end
+end
diff --git a/lib/prism/translation/ripper.rb b/lib/prism/translation/ripper.rb
new file mode 100644
index 00000000000000..6ea98fc1eaa598
--- /dev/null
+++ b/lib/prism/translation/ripper.rb
@@ -0,0 +1,3474 @@
+# frozen_string_literal: true
+# :markup: markdown
+
+require "ripper"
+
+module Prism
+  module Translation
+    # This class provides a compatibility layer between prism and Ripper. It
+    # functions by parsing the entire tree first and then walking it and
+    # executing each of the Ripper callbacks as it goes. To use this class, you
+    # treat `Prism::Translation::Ripper` effectively as you would treat the
+    # `Ripper` class.
+    #
+    # Note that this class will serve the most common use cases, but Ripper's
+    # API is extensive and undocumented. It relies on reporting the state of the
+    # parser at any given time. We do our best to replicate that here, but
+    # because it is a different architecture it is not possible to perfectly
+    # replicate the behavior of Ripper.
+    #
+    # The main known difference is that we may omit dispatching some events in
+    # some cases. This impacts the following events:
+    #
+    # - on_assign_error
+    # - on_comma
+    # - on_ignored_nl
+    # - on_ignored_sp
+    # - on_kw
+    # - on_label_end
+    # - on_lbrace
+    # - on_lbracket
+    # - on_lparen
+    # - on_nl
+    # - on_op
+    # - on_operator_ambiguous
+    # - on_rbrace
+    # - on_rbracket
+    # - on_rparen
+    # - on_semicolon
+    # - on_sp
+    # - on_symbeg
+    # - on_tstring_beg
+    # - on_tstring_end
+    #
+    class Ripper < Compiler
+      # Parses the given Ruby program read from +src+.
+      # +src+ must be a String or an IO or a object with a #gets method.
+      def self.parse(src, filename = "(ripper)", lineno = 1)
+        new(src, filename, lineno).parse
+      end
+
+      # Tokenizes the Ruby program and returns an array of an array,
+      # which is formatted like
+      # <code>[[lineno, column], type, token, state]</code>.
+      # The +filename+ argument is mostly ignored.
+      # By default, this method does not handle syntax errors in +src+,
+      # use the +raise_errors+ keyword to raise a SyntaxError for an error in +src+.
+      #
+      #     require "ripper"
+      #     require "pp"
+      #
+      #     pp Ripper.lex("def m(a) nil end")
+      #     #=> [[[1,  0], :on_kw,     "def", FNAME    ],
+      #          [[1,  3], :on_sp,     " ",   FNAME    ],
+      #          [[1,  4], :on_ident,  "m",   ENDFN    ],
+      #          [[1,  5], :on_lparen, "(",   BEG|LABEL],
+      #          [[1,  6], :on_ident,  "a",   ARG      ],
+      #          [[1,  7], :on_rparen, ")",   ENDFN    ],
+      #          [[1,  8], :on_sp,     " ",   BEG      ],
+      #          [[1,  9], :on_kw,     "nil", END      ],
+      #          [[1, 12], :on_sp,     " ",   END      ],
+      #          [[1, 13], :on_kw,     "end", END      ]]
+      #
+      def self.lex(src, filename = "-", lineno = 1, raise_errors: false)
+        result = Prism.lex_compat(src, filepath: filename, line: lineno)
+
+        if result.failure? && raise_errors
+          raise SyntaxError, result.errors.first.message
+        else
+          result.value
+        end
+      end
+
+      # This contains a table of all of the parser events and their
+      # corresponding arity.
+      PARSER_EVENT_TABLE = {
+        BEGIN: 1,
+        END: 1,
+        alias: 2,
+        alias_error: 2,
+        aref: 2,
+        aref_field: 2,
+        arg_ambiguous: 1,
+        arg_paren: 1,
+        args_add: 2,
+        args_add_block: 2,
+        args_add_star: 2,
+        args_forward: 0,
+        args_new: 0,
+        array: 1,
+        aryptn: 4,
+        assign: 2,
+        assign_error: 2,
+        assoc_new: 2,
+        assoc_splat: 1,
+        assoclist_from_args: 1,
+        bare_assoc_hash: 1,
+        begin: 1,
+        binary: 3,
+        block_var: 2,
+        blockarg: 1,
+        bodystmt: 4,
+        brace_block: 2,
+        break: 1,
+        call: 3,
+        case: 2,
+        class: 3,
+        class_name_error: 2,
+        command: 2,
+        command_call: 4,
+        const_path_field: 2,
+        const_path_ref: 2,
+        const_ref: 1,
+        def: 3,
+        defined: 1,
+        defs: 5,
+        do_block: 2,
+        dot2: 2,
+        dot3: 2,
+        dyna_symbol: 1,
+        else: 1,
+        elsif: 3,
+        ensure: 1,
+        excessed_comma: 0,
+        fcall: 1,
+        field: 3,
+        fndptn: 4,
+        for: 3,
+        hash: 1,
+        heredoc_dedent: 2,
+        hshptn: 3,
+        if: 3,
+        if_mod: 2,
+        ifop: 3,
+        in: 3,
+        kwrest_param: 1,
+        lambda: 2,
+        magic_comment: 2,
+        massign: 2,
+        method_add_arg: 2,
+        method_add_block: 2,
+        mlhs_add: 2,
+        mlhs_add_post: 2,
+        mlhs_add_star: 2,
+        mlhs_new: 0,
+        mlhs_paren: 1,
+        module: 2,
+        mrhs_add: 2,
+        mrhs_add_star: 2,
+        mrhs_new: 0,
+        mrhs_new_from_args: 1,
+        next: 1,
+        nokw_param: 1,
+        opassign: 3,
+        operator_ambiguous: 2,
+        param_error: 2,
+        params: 7,
+        paren: 1,
+        parse_error: 1,
+        program: 1,
+        qsymbols_add: 2,
+        qsymbols_new: 0,
+        qwords_add: 2,
+        qwords_new: 0,
+        redo: 0,
+        regexp_add: 2,
+        regexp_literal: 2,
+        regexp_new: 0,
+        rescue: 4,
+        rescue_mod: 2,
+        rest_param: 1,
+        retry: 0,
+        return: 1,
+        return0: 0,
+        sclass: 2,
+        stmts_add: 2,
+        stmts_new: 0,
+        string_add: 2,
+        string_concat: 2,
+        string_content: 0,
+        string_dvar: 1,
+        string_embexpr: 1,
+        string_literal: 1,
+        super: 1,
+        symbol: 1,
+        symbol_literal: 1,
+        symbols_add: 2,
+        symbols_new: 0,
+        top_const_field: 1,
+        top_const_ref: 1,
+        unary: 2,
+        undef: 1,
+        unless: 3,
+        unless_mod: 2,
+        until: 2,
+        until_mod: 2,
+        var_alias: 2,
+        var_field: 1,
+        var_ref: 1,
+        vcall: 1,
+        void_stmt: 0,
+        when: 3,
+        while: 2,
+        while_mod: 2,
+        word_add: 2,
+        word_new: 0,
+        words_add: 2,
+        words_new: 0,
+        xstring_add: 2,
+        xstring_literal: 1,
+        xstring_new: 0,
+        yield: 1,
+        yield0: 0,
+        zsuper: 0
+      }
+
+      # This contains a table of all of the scanner events and their
+      # corresponding arity.
+      SCANNER_EVENT_TABLE = {
+        CHAR: 1,
+        __end__: 1,
+        backref: 1,
+        backtick: 1,
+        comma: 1,
+        comment: 1,
+        const: 1,
+        cvar: 1,
+        embdoc: 1,
+        embdoc_beg: 1,
+        embdoc_end: 1,
+        embexpr_beg: 1,
+        embexpr_end: 1,
+        embvar: 1,
+        float: 1,
+        gvar: 1,
+        heredoc_beg: 1,
+        heredoc_end: 1,
+        ident: 1,
+        ignored_nl: 1,
+        imaginary: 1,
+        int: 1,
+        ivar: 1,
+        kw: 1,
+        label: 1,
+        label_end: 1,
+        lbrace: 1,
+        lbracket: 1,
+        lparen: 1,
+        nl: 1,
+        op: 1,
+        period: 1,
+        qsymbols_beg: 1,
+        qwords_beg: 1,
+        rational: 1,
+        rbrace: 1,
+        rbracket: 1,
+        regexp_beg: 1,
+        regexp_end: 1,
+        rparen: 1,
+        semicolon: 1,
+        sp: 1,
+        symbeg: 1,
+        symbols_beg: 1,
+        tlambda: 1,
+        tlambeg: 1,
+        tstring_beg: 1,
+        tstring_content: 1,
+        tstring_end: 1,
+        words_beg: 1,
+        words_sep: 1,
+        ignored_sp: 1
+      }
+
+      # This array contains name of parser events.
+      PARSER_EVENTS = PARSER_EVENT_TABLE.keys
+
+      # This array contains name of scanner events.
+      SCANNER_EVENTS = SCANNER_EVENT_TABLE.keys
+
+      # This array contains name of all ripper events.
+      EVENTS = PARSER_EVENTS + SCANNER_EVENTS
+
+      # A list of all of the Ruby keywords.
+      KEYWORDS = [
+        "alias",
+        "and",
+        "begin",
+        "BEGIN",
+        "break",
+        "case",
+        "class",
+        "def",
+        "defined?",
+        "do",
+        "else",
+        "elsif",
+        "end",
+        "END",
+        "ensure",
+        "false",
+        "for",
+        "if",
+        "in",
+        "module",
+        "next",
+        "nil",
+        "not",
+        "or",
+        "redo",
+        "rescue",
+        "retry",
+        "return",
+        "self",
+        "super",
+        "then",
+        "true",
+        "undef",
+        "unless",
+        "until",
+        "when",
+        "while",
+        "yield",
+        "__ENCODING__",
+        "__FILE__",
+        "__LINE__"
+      ]
+
+      # A list of all of the Ruby binary operators.
+      BINARY_OPERATORS = [
+        :!=,
+        :!~,
+        :=~,
+        :==,
+        :===,
+        :<=>,
+        :>,
+        :>=,
+        :<,
+        :<=,
+        :&,
+        :|,
+        :^,
+        :>>,
+        :<<,
+        :-,
+        :+,
+        :%,
+        :/,
+        :*,
+        :**
+      ]
+
+      private_constant :KEYWORDS, :BINARY_OPERATORS
+
+      # Parses +src+ and create S-exp tree.
+      # Returns more readable tree rather than Ripper.sexp_raw.
+      # This method is mainly for developer use.
+      # The +filename+ argument is mostly ignored.
+      # By default, this method does not handle syntax errors in +src+,
+      # returning +nil+ in such cases. Use the +raise_errors+ keyword
+      # to raise a SyntaxError for an error in +src+.
+      #
+      #     require "ripper"
+      #     require "pp"
+      #
+      #     pp Ripper.sexp("def m(a) nil end")
+      #       #=> [:program,
+      #            [[:def,
+      #             [:@ident, "m", [1, 4]],
+      #             [:paren, [:params, [[:@ident, "a", [1, 6]]], nil, nil, nil, nil, nil, nil]],
+      #             [:bodystmt, [[:var_ref, [:@kw, "nil", [1, 9]]]], nil, nil, nil]]]]
+      #
+      def self.sexp(src, filename = "-", lineno = 1, raise_errors: false)
+        builder = SexpBuilderPP.new(src, filename, lineno)
+        sexp = builder.parse
+        if builder.error?
+          if raise_errors
+            raise SyntaxError, builder.error
+          end
+        else
+          sexp
+        end
+      end
+
+      # Parses +src+ and create S-exp tree.
+      # This method is mainly for developer use.
+      # The +filename+ argument is mostly ignored.
+      # By default, this method does not handle syntax errors in +src+,
+      # returning +nil+ in such cases. Use the +raise_errors+ keyword
+      # to raise a SyntaxError for an error in +src+.
+      #
+      #     require "ripper"
+      #     require "pp"
+      #
+      #     pp Ripper.sexp_raw("def m(a) nil end")
+      #       #=> [:program,
+      #            [:stmts_add,
+      #             [:stmts_new],
+      #             [:def,
+      #              [:@ident, "m", [1, 4]],
+      #              [:paren, [:params, [[:@ident, "a", [1, 6]]], nil, nil, nil]],
+      #              [:bodystmt,
+      #               [:stmts_add, [:stmts_new], [:var_ref, [:@kw, "nil", [1, 9]]]],
+      #               nil,
+      #               nil,
+      #               nil]]]]
+      #
+      def self.sexp_raw(src, filename = "-", lineno = 1, raise_errors: false)
+        builder = SexpBuilder.new(src, filename, lineno)
+        sexp = builder.parse
+        if builder.error?
+          if raise_errors
+            raise SyntaxError, builder.error
+          end
+        else
+          sexp
+        end
+      end
+
+      autoload :SexpBuilder, "prism/translation/ripper/sexp"
+      autoload :SexpBuilderPP, "prism/translation/ripper/sexp"
+
+      # The source that is being parsed.
+      attr_reader :source
+
+      # The filename of the source being parsed.
+      attr_reader :filename
+
+      # The current line number of the parser.
+      attr_reader :lineno
+
+      # The current column number of the parser.
+      attr_reader :column
+
+      # Create a new Translation::Ripper object with the given source.
+      def initialize(source, filename = "(ripper)", lineno = 1)
+        @source = source
+        @filename = filename
+        @lineno = lineno
+        @column = 0
+        @result = nil
+      end
+
+      ##########################################################################
+      # Public interface
+      ##########################################################################
+
+      # True if the parser encountered an error during parsing.
+      def error?
+        result.failure?
+      end
+
+      # Parse the source and return the result.
+      def parse
+        result.comments.each do |comment|
+          location = comment.location
+          bounds(location)
+
+          if comment.is_a?(InlineComment)
+            on_comment(comment.slice)
+          else
+            offset = location.start_offset
+            lines = comment.slice.lines
+
+            lines.each_with_index do |line, index|
+              bounds(location.copy(start_offset: offset))
+
+              if index == 0
+                on_embdoc_beg(line)
+              elsif index == lines.size - 1
+                on_embdoc_end(line)
+              else
+                on_embdoc(line)
+              end
+
+              offset += line.bytesize
+            end
+          end
+        end
+
+        result.magic_comments.each do |magic_comment|
+          on_magic_comment(magic_comment.key, magic_comment.value)
+        end
+
+        unless result.data_loc.nil?
+          on___end__(result.data_loc.slice.each_line.first)
+        end
+
+        result.warnings.each do |warning|
+          bounds(warning.location)
+
+          if warning.level == :default
+            warning(warning.message)
+          else
+            case warning.type
+            when :ambiguous_first_argument_plus
+              on_arg_ambiguous("+")
+            when :ambiguous_first_argument_minus
+              on_arg_ambiguous("-")
+            when :ambiguous_slash
+              on_arg_ambiguous("/")
+            else
+              warn(warning.message)
+            end
+          end
+        end
+
+        if error?
+          result.errors.each do |error|
+            location = error.location
+            bounds(location)
+
+            case error.type
+            when :alias_argument
+              on_alias_error("can't make alias for the number variables", location.slice)
+            when :argument_formal_class
+              on_param_error("formal argument cannot be a class variable", location.slice)
+            when :argument_format_constant
+              on_param_error("formal argument cannot be a constant", location.slice)
+            when :argument_formal_global
+              on_param_error("formal argument cannot be a global variable", location.slice)
+            when :argument_formal_ivar
+              on_param_error("formal argument cannot be an instance variable", location.slice)
+            when :class_name, :module_name
+              on_class_name_error("class/module name must be CONSTANT", location.slice)
+            else
+              on_parse_error(error.message)
+            end
+          end
+
+          nil
+        else
+          result.value.accept(self)
+        end
+      end
+
+      ##########################################################################
+      # Visitor methods
+      ##########################################################################
+
+      # alias foo bar
+      # ^^^^^^^^^^^^^
+      def visit_alias_method_node(node)
+        new_name = visit(node.new_name)
+        old_name = visit(node.old_name)
+
+        bounds(node.location)
+        on_alias(new_name, old_name)
+      end
+
+      # alias $foo $bar
+      # ^^^^^^^^^^^^^^^
+      def visit_alias_global_variable_node(node)
+        new_name = visit_alias_global_variable_node_value(node.new_name)
+        old_name = visit_alias_global_variable_node_value(node.old_name)
+
+        bounds(node.location)
+        on_var_alias(new_name, old_name)
+      end
+
+      # Visit one side of an alias global variable node.
+      private def visit_alias_global_variable_node_value(node)
+        bounds(node.location)
+
+        case node
+        when BackReferenceReadNode
+          on_backref(node.slice)
+        when GlobalVariableReadNode
+          on_gvar(node.name.to_s)
+        else
+          raise
+        end
+      end
+
+      # foo => bar | baz
+      #        ^^^^^^^^^
+      def visit_alternation_pattern_node(node)
+        left = visit_pattern_node(node.left)
+        right = visit_pattern_node(node.right)
+
+        bounds(node.location)
+        on_binary(left, :|, right)
+      end
+
+      # Visit a pattern within a pattern match. This is used to bypass the
+      # parenthesis node that can be used to wrap patterns.
+      private def visit_pattern_node(node)
+        if node.is_a?(ParenthesesNode)
+          visit(node.body)
+        else
+          visit(node)
+        end
+      end
+
+      # a and b
+      # ^^^^^^^
+      def visit_and_node(node)
+        left = visit(node.left)
+        right = visit(node.right)
+
+        bounds(node.location)
+        on_binary(left, node.operator.to_sym, right)
+      end
+
+      # []
+      # ^^
+      def visit_array_node(node)
+        case (opening = node.opening)
+        when /^%w/
+          opening_loc = node.opening_loc
+          bounds(opening_loc)
+          on_qwords_beg(opening)
+
+          elements = on_qwords_new
+          previous = nil
+
+          node.elements.each do |element|
+            visit_words_sep(opening_loc, previous, element)
+
+            bounds(element.location)
+            elements = on_qwords_add(elements, on_tstring_content(element.content))
+
+            previous = element
+          end
+
+          bounds(node.closing_loc)
+          on_tstring_end(node.closing)
+        when /^%i/
+          opening_loc = node.opening_loc
+          bounds(opening_loc)
+          on_qsymbols_beg(opening)
+
+          elements = on_qsymbols_new
+          previous = nil
+
+          node.elements.each do |element|
+            visit_words_sep(opening_loc, previous, element)
+
+            bounds(element.location)
+            elements = on_qsymbols_add(elements, on_tstring_content(element.value))
+
+            previous = element
+          end
+
+          bounds(node.closing_loc)
+          on_tstring_end(node.closing)
+        when /^%W/
+          opening_loc = node.opening_loc
+          bounds(opening_loc)
+          on_words_beg(opening)
+
+          elements = on_words_new
+          previous = nil
+
+          node.elements.each do |element|
+            visit_words_sep(opening_loc, previous, element)
+
+            bounds(element.location)
+            elements =
+              on_words_add(
+                elements,
+                if element.is_a?(StringNode)
+                  on_word_add(on_word_new, on_tstring_content(element.content))
+                else
+                  element.parts.inject(on_word_new) do |word, part|
+                    word_part =
+                      if part.is_a?(StringNode)
+                        bounds(part.location)
+                        on_tstring_content(part.content)
+                      else
+                        visit(part)
+                      end
+
+                    on_word_add(word, word_part)
+                  end
+                end
+              )
+
+            previous = element
+          end
+
+          bounds(node.closing_loc)
+          on_tstring_end(node.closing)
+        when /^%I/
+          opening_loc = node.opening_loc
+          bounds(opening_loc)
+          on_symbols_beg(opening)
+
+          elements = on_symbols_new
+          previous = nil
+
+          node.elements.each do |element|
+            visit_words_sep(opening_loc, previous, element)
+
+            bounds(element.location)
+            elements =
+              on_symbols_add(
+                elements,
+                if element.is_a?(SymbolNode)
+                  on_word_add(on_word_new, on_tstring_content(element.value))
+                else
+                  element.parts.inject(on_word_new) do |word, part|
+                    word_part =
+                      if part.is_a?(StringNode)
+                        bounds(part.location)
+                        on_tstring_content(part.content)
+                      else
+                        visit(part)
+                      end
+
+                    on_word_add(word, word_part)
+                  end
+                end
+              )
+
+            previous = element
+          end
+
+          bounds(node.closing_loc)
+          on_tstring_end(node.closing)
+        else
+          bounds(node.opening_loc)
+          on_lbracket(opening)
+
+          elements = visit_arguments(node.elements) unless node.elements.empty?
+
+          bounds(node.closing_loc)
+          on_rbracket(node.closing)
+        end
+
+        bounds(node.location)
+        on_array(elements)
+      end
+
+      # Dispatch a words_sep event that contains the space between the elements
+      # of list literals.
+      private def visit_words_sep(opening_loc, previous, current)
+        end_offset = (previous.nil? ? opening_loc : previous.location).end_offset
+        start_offset = current.location.start_offset
+
+        if end_offset != start_offset
+          bounds(current.location.copy(start_offset: end_offset))
+          on_words_sep(source.byteslice(end_offset...start_offset))
+        end
+      end
+
+      # Visit a list of elements, like the elements of an array or arguments.
+      private def visit_arguments(elements)
+        bounds(elements.first.location)
+        elements.inject(on_args_new) do |args, element|
+          arg = visit(element)
+          bounds(element.location)
+
+          case element
+          when BlockArgumentNode
+            on_args_add_block(args, arg)
+          when SplatNode
+            on_args_add_star(args, arg)
+          else
+            on_args_add(args, arg)
+          end
+        end
+      end
+
+      # foo => [bar]
+      #        ^^^^^
+      def visit_array_pattern_node(node)
+        constant = visit(node.constant)
+        requireds = visit_all(node.requireds) if node.requireds.any?
+        rest =
+          if (rest_node = node.rest).is_a?(SplatNode)
+            if rest_node.expression.nil?
+              bounds(rest_node.location)
+              on_var_field(nil)
+            else
+              visit(rest_node.expression)
+            end
+          end
+
+        posts = visit_all(node.posts) if node.posts.any?
+
+        bounds(node.location)
+        on_aryptn(constant, requireds, rest, posts)
+      end
+
+      # foo(bar)
+      #     ^^^
+      def visit_arguments_node(node)
+        arguments, _ = visit_call_node_arguments(node, nil, false)
+        arguments
+      end
+
+      # { a: 1 }
+      #   ^^^^
+      def visit_assoc_node(node)
+        key = visit(node.key)
+        value = visit(node.value)
+
+        bounds(node.location)
+        on_assoc_new(key, value)
+      end
+
+      # def foo(**); bar(**); end
+      #                  ^^
+      #
+      # { **foo }
+      #   ^^^^^
+      def visit_assoc_splat_node(node)
+        value = visit(node.value)
+
+        bounds(node.location)
+        on_assoc_splat(value)
+      end
+
+      # $+
+      # ^^
+      def visit_back_reference_read_node(node)
+        bounds(node.location)
+        on_backref(node.slice)
+      end
+
+      # begin end
+      # ^^^^^^^^^
+      def visit_begin_node(node)
+        clauses = visit_begin_node_clauses(node.begin_keyword_loc, node, false)
+
+        bounds(node.location)
+        on_begin(clauses)
+      end
+
+      # Visit the clauses of a begin node to form an on_bodystmt call.
+      private def visit_begin_node_clauses(location, node, allow_newline)
+        statements =
+          if node.statements.nil?
+            on_stmts_add(on_stmts_new, on_void_stmt)
+          else
+            body = node.statements.body
+            body.unshift(nil) if void_stmt?(location, node.statements.body[0].location, allow_newline)
+
+            bounds(node.statements.location)
+            visit_statements_node_body(body)
+          end
+
+        rescue_clause = visit(node.rescue_clause)
+        else_clause =
+          unless (else_clause_node = node.else_clause).nil?
+            else_statements =
+              if else_clause_node.statements.nil?
+                [nil]
+              else
+                body = else_clause_node.statements.body
+                body.unshift(nil) if void_stmt?(else_clause_node.else_keyword_loc, else_clause_node.statements.body[0].location, allow_newline)
+                body
+              end
+
+            bounds(else_clause_node.location)
+            visit_statements_node_body(else_statements)
+          end
+        ensure_clause = visit(node.ensure_clause)
+
+        bounds(node.location)
+        on_bodystmt(statements, rescue_clause, else_clause, ensure_clause)
+      end
+
+      # Visit the body of a structure that can have either a set of statements
+      # or statements wrapped in rescue/else/ensure.
+      private def visit_body_node(location, node, allow_newline = false)
+        case node
+        when nil
+          bounds(location)
+          on_bodystmt(visit_statements_node_body([nil]), nil, nil, nil)
+        when StatementsNode
+          body = [*node.body]
+          body.unshift(nil) if void_stmt?(location, body[0].location, allow_newline)
+          stmts = visit_statements_node_body(body)
+
+          bounds(node.body.first.location)
+          on_bodystmt(stmts, nil, nil, nil)
+        when BeginNode
+          visit_begin_node_clauses(location, node, allow_newline)
+        else
+          raise
+        end
+      end
+
+      # foo(&bar)
+      #     ^^^^
+      def visit_block_argument_node(node)
+        visit(node.expression)
+      end
+
+      # foo { |; bar| }
+      #          ^^^
+      def visit_block_local_variable_node(node)
+        bounds(node.location)
+        on_ident(node.name.to_s)
+      end
+
+      # Visit a BlockNode.
+      def visit_block_node(node)
+        braces = node.opening == "{"
+        parameters = visit(node.parameters)
+
+        body =
+          case node.body
+          when nil
+            bounds(node.location)
+            stmts = on_stmts_add(on_stmts_new, on_void_stmt)
+
+            bounds(node.location)
+            braces ? stmts : on_bodystmt(stmts, nil, nil, nil)
+          when StatementsNode
+            stmts = node.body.body
+            stmts.unshift(nil) if void_stmt?(node.parameters&.location || node.opening_loc, node.body.location, false)
+            stmts = visit_statements_node_body(stmts)
+
+            bounds(node.body.location)
+            braces ? stmts : on_bodystmt(stmts, nil, nil, nil)
+          when BeginNode
+            visit_body_node(node.parameters&.location || node.opening_loc, node.body)
+          else
+            raise
+          end
+
+        if braces
+          bounds(node.location)
+          on_brace_block(parameters, body)
+        else
+          bounds(node.location)
+          on_do_block(parameters, body)
+        end
+      end
+
+      # def foo(&bar); end
+      #         ^^^^
+      def visit_block_parameter_node(node)
+        if node.name_loc.nil?
+          bounds(node.location)
+          on_blockarg(nil)
+        else
+          bounds(node.name_loc)
+          name = visit_token(node.name.to_s)
+
+          bounds(node.location)
+          on_blockarg(name)
+        end
+      end
+
+      # A block's parameters.
+      def visit_block_parameters_node(node)
+        parameters =
+          if node.parameters.nil?
+            on_params(nil, nil, nil, nil, nil, nil, nil)
+          else
+            visit(node.parameters)
+          end
+
+        locals =
+          if node.locals.any?
+            visit_all(node.locals)
+          else
+            false
+          end
+
+        bounds(node.location)
+        on_block_var(parameters, locals)
+      end
+
+      # break
+      # ^^^^^
+      #
+      # break foo
+      # ^^^^^^^^^
+      def visit_break_node(node)
+        if node.arguments.nil?
+          bounds(node.location)
+          on_break(on_args_new)
+        else
+          arguments = visit(node.arguments)
+
+          bounds(node.location)
+          on_break(arguments)
+        end
+      end
+
+      # foo
+      # ^^^
+      #
+      # foo.bar
+      # ^^^^^^^
+      #
+      # foo.bar() {}
+      # ^^^^^^^^^^^^
+      def visit_call_node(node)
+        if node.call_operator_loc.nil?
+          case node.name
+          when :[]
+            receiver = visit(node.receiver)
+            arguments, block = visit_call_node_arguments(node.arguments, node.block, trailing_comma?(node.arguments&.location || node.location, node.closing_loc))
+
+            bounds(node.location)
+            call = on_aref(receiver, arguments)
+
+            if block.nil?
+              call
+            else
+              bounds(node.location)
+              on_method_add_block(call, block)
+            end
+          when :[]=
+            receiver = visit(node.receiver)
+
+            *arguments, last_argument = node.arguments.arguments
+            arguments << node.block if !node.block.nil?
+
+            arguments =
+              if arguments.any?
+                args = visit_arguments(arguments)
+
+                if !node.block.nil?
+                  args
+                else
+                  bounds(arguments.first.location)
+                  on_args_add_block(args, false)
+                end
+              end
+
+            bounds(node.location)
+            call = on_aref_field(receiver, arguments)
+            value = visit_write_value(last_argument)
+
+            bounds(last_argument.location)
+            on_assign(call, value)
+          when :-@, :+@, :~
+            receiver = visit(node.receiver)
+
+            bounds(node.location)
+            on_unary(node.name, receiver)
+          when :!
+            if node.message == "not"
+              receiver =
+                if !node.receiver.is_a?(ParenthesesNode) || !node.receiver.body.nil?
+                  visit(node.receiver)
+                end
+
+              bounds(node.location)
+              on_unary(:not, receiver)
+            else
+              receiver = visit(node.receiver)
+
+              bounds(node.location)
+              on_unary(:!, receiver)
+            end
+          when *BINARY_OPERATORS
+            receiver = visit(node.receiver)
+            value = visit(node.arguments.arguments.first)
+
+            bounds(node.location)
+            on_binary(receiver, node.name, value)
+          else
+            bounds(node.message_loc)
+            message = visit_token(node.message, false)
+
+            if node.variable_call?
+              on_vcall(message)
+            else
+              arguments, block = visit_call_node_arguments(node.arguments, node.block, trailing_comma?(node.arguments&.location || node.location, node.closing_loc || node.location))
+              call =
+                if node.opening_loc.nil? && arguments&.any?
+                  bounds(node.location)
+                  on_command(message, arguments)
+                elsif !node.opening_loc.nil?
+                  bounds(node.location)
+                  on_method_add_arg(on_fcall(message), on_arg_paren(arguments))
+                else
+                  bounds(node.location)
+                  on_method_add_arg(on_fcall(message), on_args_new)
+                end
+
+              if block.nil?
+                call
+              else
+                bounds(node.block.location)
+                on_method_add_block(call, block)
+              end
+            end
+          end
+        else
+          receiver = visit(node.receiver)
+
+          bounds(node.call_operator_loc)
+          call_operator = visit_token(node.call_operator)
+
+          message =
+            if node.message_loc.nil?
+              :call
+            else
+              bounds(node.message_loc)
+              visit_token(node.message, false)
+            end
+
+          if node.name.end_with?("=") && !node.message.end_with?("=") && !node.arguments.nil? && node.block.nil?
+            value = visit_write_value(node.arguments.arguments.first)
+
+            bounds(node.location)
+            on_assign(on_field(receiver, call_operator, message), value)
+          else
+            arguments, block = visit_call_node_arguments(node.arguments, node.block, trailing_comma?(node.arguments&.location || node.location, node.closing_loc || node.location))
+            call =
+              if node.opening_loc.nil?
+                bounds(node.location)
+
+                if node.arguments.nil? && !node.block.is_a?(BlockArgumentNode)
+                  on_call(receiver, call_operator, message)
+                else
+                  on_command_call(receiver, call_operator, message, arguments)
+                end
+              else
+                bounds(node.opening_loc)
+                arguments = on_arg_paren(arguments)
+
+                bounds(node.location)
+                on_method_add_arg(on_call(receiver, call_operator, message), arguments)
+              end
+
+            if block.nil?
+              call
+            else
+              bounds(node.block.location)
+              on_method_add_block(call, block)
+            end
+          end
+        end
+      end
+
+      # Visit the arguments and block of a call node and return the arguments
+      # and block as they should be used.
+      private def visit_call_node_arguments(arguments_node, block_node, trailing_comma)
+        arguments = arguments_node&.arguments || []
+        block = block_node
+
+        if block.is_a?(BlockArgumentNode)
+          arguments << block
+          block = nil
+        end
+
+        [
+          if arguments.length == 1 && arguments.first.is_a?(ForwardingArgumentsNode)
+            visit(arguments.first)
+          elsif arguments.any?
+            args = visit_arguments(arguments)
+
+            if block_node.is_a?(BlockArgumentNode) || arguments.last.is_a?(ForwardingArgumentsNode) || command?(arguments.last) || trailing_comma
+              args
+            else
+              bounds(arguments.first.location)
+              on_args_add_block(args, false)
+            end
+          end,
+          visit(block)
+        ]
+      end
+
+      # Returns true if the given node is a command node.
+      private def command?(node)
+        node.is_a?(CallNode) &&
+          node.opening_loc.nil? &&
+          (!node.arguments.nil? || node.block.is_a?(BlockArgumentNode)) &&
+          !BINARY_OPERATORS.include?(node.name)
+      end
+
+      # foo.bar += baz
+      # ^^^^^^^^^^^^^^^
+      def visit_call_operator_write_node(node)
+        receiver = visit(node.receiver)
+
+        bounds(node.call_operator_loc)
+        call_operator = visit_token(node.call_operator)
+
+        bounds(node.message_loc)
+        message = visit_token(node.message)
+
+        bounds(node.location)
+        target = on_field(receiver, call_operator, message)
+
+        bounds(node.binary_operator_loc)
+        operator = on_op("#{node.binary_operator}=")
+        value = visit_write_value(node.value)
+
+        bounds(node.location)
+        on_opassign(target, operator, value)
+      end
+
+      # foo.bar &&= baz
+      # ^^^^^^^^^^^^^^^
+      def visit_call_and_write_node(node)
+        receiver = visit(node.receiver)
+
+        bounds(node.call_operator_loc)
+        call_operator = visit_token(node.call_operator)
+
+        bounds(node.message_loc)
+        message = visit_token(node.message)
+
+        bounds(node.location)
+        target = on_field(receiver, call_operator, message)
+
+        bounds(node.operator_loc)
+        operator = on_op("&&=")
+        value = visit_write_value(node.value)
+
+        bounds(node.location)
+        on_opassign(target, operator, value)
+      end
+
+      # foo.bar ||= baz
+      # ^^^^^^^^^^^^^^^
+      def visit_call_or_write_node(node)
+        receiver = visit(node.receiver)
+
+        bounds(node.call_operator_loc)
+        call_operator = visit_token(node.call_operator)
+
+        bounds(node.message_loc)
+        message = visit_token(node.message)
+
+        bounds(node.location)
+        target = on_field(receiver, call_operator, message)
+
+        bounds(node.operator_loc)
+        operator = on_op("||=")
+        value = visit_write_value(node.value)
+
+        bounds(node.location)
+        on_opassign(target, operator, value)
+      end
+
+      # foo.bar, = 1
+      # ^^^^^^^
+      def visit_call_target_node(node)
+        if node.call_operator == "::"
+          receiver = visit(node.receiver)
+
+          bounds(node.message_loc)
+          message = visit_token(node.message)
+
+          bounds(node.location)
+          on_const_path_field(receiver, message)
+        else
+          receiver = visit(node.receiver)
+
+          bounds(node.call_operator_loc)
+          call_operator = visit_token(node.call_operator)
+
+          bounds(node.message_loc)
+          message = visit_token(node.message)
+
+          bounds(node.location)
+          on_field(receiver, call_operator, message)
+        end
+      end
+
+      # foo => bar => baz
+      #        ^^^^^^^^^^
+      def visit_capture_pattern_node(node)
+        value = visit(node.value)
+        target = visit(node.target)
+
+        bounds(node.location)
+        on_binary(value, :"=>", target)
+      end
+
+      # case foo; when bar; end
+      # ^^^^^^^^^^^^^^^^^^^^^^^
+      def visit_case_node(node)
+        predicate = visit(node.predicate)
+        clauses =
+          node.conditions.reverse_each.inject(visit(node.else_clause)) do |current, condition|
+            on_when(*visit(condition), current)
+          end
+
+        bounds(node.location)
+        on_case(predicate, clauses)
+      end
+
+      # case foo; in bar; end
+      # ^^^^^^^^^^^^^^^^^^^^^
+      def visit_case_match_node(node)
+        predicate = visit(node.predicate)
+        clauses =
+          node.conditions.reverse_each.inject(visit(node.else_clause)) do |current, condition|
+            on_in(*visit(condition), current)
+          end
+
+        bounds(node.location)
+        on_case(predicate, clauses)
+      end
+
+      # class Foo; end
+      # ^^^^^^^^^^^^^^
+      def visit_class_node(node)
+        constant_path =
+          if node.constant_path.is_a?(ConstantReadNode)
+            bounds(node.constant_path.location)
+            on_const_ref(on_const(node.constant_path.name.to_s))
+          else
+            visit(node.constant_path)
+          end
+
+        superclass = visit(node.superclass)
+        bodystmt = visit_body_node(node.superclass&.location || node.constant_path.location, node.body, node.superclass.nil?)
+
+        bounds(node.location)
+        on_class(constant_path, superclass, bodystmt)
+      end
+
+      # @@foo
+      # ^^^^^
+      def visit_class_variable_read_node(node)
+        bounds(node.location)
+        on_var_ref(on_cvar(node.slice))
+      end
+
+      # @@foo = 1
+      # ^^^^^^^^^
+      #
+      # @@foo, @@bar = 1
+      # ^^^^^  ^^^^^
+      def visit_class_variable_write_node(node)
+        bounds(node.name_loc)
+        target = on_var_field(on_cvar(node.name.to_s))
+        value = visit_write_value(node.value)
+
+        bounds(node.location)
+        on_assign(target, value)
+      end
+
+      # @@foo += bar
+      # ^^^^^^^^^^^^
+      def visit_class_variable_operator_write_node(node)
+        bounds(node.name_loc)
+        target = on_var_field(on_cvar(node.name.to_s))
+
+        bounds(node.binary_operator_loc)
+        operator = on_op("#{node.binary_operator}=")
+        value = visit_write_value(node.value)
+
+        bounds(node.location)
+        on_opassign(target, operator, value)
+      end
+
+      # @@foo &&= bar
+      # ^^^^^^^^^^^^^
+      def visit_class_variable_and_write_node(node)
+        bounds(node.name_loc)
+        target = on_var_field(on_cvar(node.name.to_s))
+
+        bounds(node.operator_loc)
+        operator = on_op("&&=")
+        value = visit_write_value(node.value)
+
+        bounds(node.location)
+        on_opassign(target, operator, value)
+      end
+
+      # @@foo ||= bar
+      # ^^^^^^^^^^^^^
+      def visit_class_variable_or_write_node(node)
+        bounds(node.name_loc)
+        target = on_var_field(on_cvar(node.name.to_s))
+
+        bounds(node.operator_loc)
+        operator = on_op("||=")
+        value = visit_write_value(node.value)
+
+        bounds(node.location)
+        on_opassign(target, operator, value)
+      end
+
+      # @@foo, = bar
+      # ^^^^^
+      def visit_class_variable_target_node(node)
+        bounds(node.location)
+        on_var_field(on_cvar(node.name.to_s))
+      end
+
+      # Foo
+      # ^^^
+      def visit_constant_read_node(node)
+        bounds(node.location)
+        on_var_ref(on_const(node.name.to_s))
+      end
+
+      # Foo = 1
+      # ^^^^^^^
+      #
+      # Foo, Bar = 1
+      # ^^^  ^^^
+      def visit_constant_write_node(node)
+        bounds(node.name_loc)
+        target = on_var_field(on_const(node.name.to_s))
+        value = visit_write_value(node.value)
+
+        bounds(node.location)
+        on_assign(target, value)
+      end
+
+      # Foo += bar
+      # ^^^^^^^^^^^
+      def visit_constant_operator_write_node(node)
+        bounds(node.name_loc)
+        target = on_var_field(on_const(node.name.to_s))
+
+        bounds(node.binary_operator_loc)
+        operator = on_op("#{node.binary_operator}=")
+        value = visit_write_value(node.value)
+
+        bounds(node.location)
+        on_opassign(target, operator, value)
+      end
+
+      # Foo &&= bar
+      # ^^^^^^^^^^^^
+      def visit_constant_and_write_node(node)
+        bounds(node.name_loc)
+        target = on_var_field(on_const(node.name.to_s))
+
+        bounds(node.operator_loc)
+        operator = on_op("&&=")
+        value = visit_write_value(node.value)
+
+        bounds(node.location)
+        on_opassign(target, operator, value)
+      end
+
+      # Foo ||= bar
+      # ^^^^^^^^^^^^
+      def visit_constant_or_write_node(node)
+        bounds(node.name_loc)
+        target = on_var_field(on_const(node.name.to_s))
+
+        bounds(node.operator_loc)
+        operator = on_op("||=")
+        value = visit_write_value(node.value)
+
+        bounds(node.location)
+        on_opassign(target, operator, value)
+      end
+
+      # Foo, = bar
+      # ^^^
+      def visit_constant_target_node(node)
+        bounds(node.location)
+        on_var_field(on_const(node.name.to_s))
+      end
+
+      # Foo::Bar
+      # ^^^^^^^^
+      def visit_constant_path_node(node)
+        if node.parent.nil?
+          bounds(node.name_loc)
+          child = on_const(node.name.to_s)
+
+          bounds(node.location)
+          on_top_const_ref(child)
+        else
+          parent = visit(node.parent)
+
+          bounds(node.name_loc)
+          child = on_const(node.name.to_s)
+
+          bounds(node.location)
+          on_const_path_ref(parent, child)
+        end
+      end
+
+      # Foo::Bar = 1
+      # ^^^^^^^^^^^^
+      #
+      # Foo::Foo, Bar::Bar = 1
+      # ^^^^^^^^  ^^^^^^^^
+      def visit_constant_path_write_node(node)
+        target = visit_constant_path_write_node_target(node.target)
+        value = visit_write_value(node.value)
+
+        bounds(node.location)
+        on_assign(target, value)
+      end
+
+      # Visit a constant path that is part of a write node.
+      private def visit_constant_path_write_node_target(node)
+        if node.parent.nil?
+          bounds(node.name_loc)
+          child = on_const(node.name.to_s)
+
+          bounds(node.location)
+          on_top_const_field(child)
+        else
+          parent = visit(node.parent)
+
+          bounds(node.name_loc)
+          child = on_const(node.name.to_s)
+
+          bounds(node.location)
+          on_const_path_field(parent, child)
+        end
+      end
+
+      # Foo::Bar += baz
+      # ^^^^^^^^^^^^^^^
+      def visit_constant_path_operator_write_node(node)
+        target = visit_constant_path_write_node_target(node.target)
+        value = visit(node.value)
+
+        bounds(node.binary_operator_loc)
+        operator = on_op("#{node.binary_operator}=")
+        value = visit_write_value(node.value)
+
+        bounds(node.location)
+        on_opassign(target, operator, value)
+      end
+
+      # Foo::Bar &&= baz
+      # ^^^^^^^^^^^^^^^^
+      def visit_constant_path_and_write_node(node)
+        target = visit_constant_path_write_node_target(node.target)
+        value = visit(node.value)
+
+        bounds(node.operator_loc)
+        operator = on_op("&&=")
+        value = visit_write_value(node.value)
+
+        bounds(node.location)
+        on_opassign(target, operator, value)
+      end
+
+      # Foo::Bar ||= baz
+      # ^^^^^^^^^^^^^^^^
+      def visit_constant_path_or_write_node(node)
+        target = visit_constant_path_write_node_target(node.target)
+        value = visit(node.value)
+
+        bounds(node.operator_loc)
+        operator = on_op("||=")
+        value = visit_write_value(node.value)
+
+        bounds(node.location)
+        on_opassign(target, operator, value)
+      end
+
+      # Foo::Bar, = baz
+      # ^^^^^^^^
+      def visit_constant_path_target_node(node)
+        visit_constant_path_write_node_target(node)
+      end
+
+      # def foo; end
+      # ^^^^^^^^^^^^
+      #
+      # def self.foo; end
+      # ^^^^^^^^^^^^^^^^^
+      def visit_def_node(node)
+        receiver = visit(node.receiver)
+        operator =
+          if !node.operator_loc.nil?
+            bounds(node.operator_loc)
+            visit_token(node.operator)
+          end
+
+        bounds(node.name_loc)
+        name = visit_token(node.name_loc.slice)
+
+        parameters =
+          if node.parameters.nil?
+            bounds(node.location)
+            on_params(nil, nil, nil, nil, nil, nil, nil)
+          else
+            visit(node.parameters)
+          end
+
+        if !node.lparen_loc.nil?
+          bounds(node.lparen_loc)
+          parameters = on_paren(parameters)
+        end
+
+        bodystmt =
+          if node.equal_loc.nil?
+            visit_body_node(node.rparen_loc || node.end_keyword_loc, node.body)
+          else
+            body = visit(node.body.body.first)
+
+            bounds(node.body.location)
+            on_bodystmt(body, nil, nil, nil)
+          end
+
+        bounds(node.location)
+        if receiver.nil?
+          on_def(name, parameters, bodystmt)
+        else
+          on_defs(receiver, operator, name, parameters, bodystmt)
+        end
+      end
+
+      # defined? a
+      # ^^^^^^^^^^
+      #
+      # defined?(a)
+      # ^^^^^^^^^^^
+      def visit_defined_node(node)
+        expression = visit(node.value)
+
+        # Very weird circumstances here where something like:
+        #
+        #     defined?
+        #     (1)
+        #
+        # gets parsed in Ruby as having only the `1` expression but in Ripper it
+        # gets parsed as having a parentheses node. In this case we need to
+        # synthesize that node to match Ripper's behavior.
+        if node.lparen_loc && node.keyword_loc.join(node.lparen_loc).slice.include?("\n")
+          bounds(node.lparen_loc.join(node.rparen_loc))
+          expression = on_paren(on_stmts_add(on_stmts_new, expression))
+        end
+
+        bounds(node.location)
+        on_defined(expression)
+      end
+
+      # if foo then bar else baz end
+      #                 ^^^^^^^^^^^^
+      def visit_else_node(node)
+        statements =
+          if node.statements.nil?
+            [nil]
+          else
+            body = node.statements.body
+            body.unshift(nil) if void_stmt?(node.else_keyword_loc, node.statements.body[0].location, false)
+            body
+          end
+
+        bounds(node.location)
+        on_else(visit_statements_node_body(statements))
+      end
+
+      # "foo #{bar}"
+      #      ^^^^^^
+      def visit_embedded_statements_node(node)
+        bounds(node.opening_loc)
+        on_embexpr_beg(node.opening)
+
+        statements =
+          if node.statements.nil?
+            bounds(node.location)
+            on_stmts_add(on_stmts_new, on_void_stmt)
+          else
+            visit(node.statements)
+          end
+
+        bounds(node.closing_loc)
+        on_embexpr_end(node.closing)
+
+        bounds(node.location)
+        on_string_embexpr(statements)
+      end
+
+      # "foo #@bar"
+      #      ^^^^^
+      def visit_embedded_variable_node(node)
+        bounds(node.operator_loc)
+        on_embvar(node.operator)
+
+        variable = visit(node.variable)
+
+        bounds(node.location)
+        on_string_dvar(variable)
+      end
+
+      # Visit an EnsureNode node.
+      def visit_ensure_node(node)
+        statements =
+          if node.statements.nil?
+            [nil]
+          else
+            body = node.statements.body
+            body.unshift(nil) if void_stmt?(node.ensure_keyword_loc, body[0].location, false)
+            body
+          end
+
+        statements = visit_statements_node_body(statements)
+
+        bounds(node.location)
+        on_ensure(statements)
+      end
+
+      # false
+      # ^^^^^
+      def visit_false_node(node)
+        bounds(node.location)
+        on_var_ref(on_kw("false"))
+      end
+
+      # foo => [*, bar, *]
+      #        ^^^^^^^^^^^
+      def visit_find_pattern_node(node)
+        constant = visit(node.constant)
+        left =
+          if node.left.expression.nil?
+            bounds(node.left.location)
+            on_var_field(nil)
+          else
+            visit(node.left.expression)
+          end
+
+        requireds = visit_all(node.requireds) if node.requireds.any?
+        right =
+          if node.right.expression.nil?
+            bounds(node.right.location)
+            on_var_field(nil)
+          else
+            visit(node.right.expression)
+          end
+
+        bounds(node.location)
+        on_fndptn(constant, left, requireds, right)
+      end
+
+      # if foo .. bar; end
+      #    ^^^^^^^^^^
+      def visit_flip_flop_node(node)
+        left = visit(node.left)
+        right = visit(node.right)
+
+        bounds(node.location)
+        if node.exclude_end?
+          on_dot3(left, right)
+        else
+          on_dot2(left, right)
+        end
+      end
+
+      # 1.0
+      # ^^^
+      def visit_float_node(node)
+        visit_number_node(node) { |text| on_float(text) }
+      end
+
+      # for foo in bar do end
+      # ^^^^^^^^^^^^^^^^^^^^^
+      def visit_for_node(node)
+        index = visit(node.index)
+        collection = visit(node.collection)
+        statements =
+          if node.statements.nil?
+            bounds(node.location)
+            on_stmts_add(on_stmts_new, on_void_stmt)
+          else
+            visit(node.statements)
+          end
+
+        bounds(node.location)
+        on_for(index, collection, statements)
+      end
+
+      # def foo(...); bar(...); end
+      #                   ^^^
+      def visit_forwarding_arguments_node(node)
+        bounds(node.location)
+        on_args_forward
+      end
+
+      # def foo(...); end
+      #         ^^^
+      def visit_forwarding_parameter_node(node)
+        bounds(node.location)
+        on_args_forward
+      end
+
+      # super
+      # ^^^^^
+      #
+      # super {}
+      # ^^^^^^^^
+      def visit_forwarding_super_node(node)
+        if node.block.nil?
+          bounds(node.location)
+          on_zsuper
+        else
+          block = visit(node.block)
+
+          bounds(node.location)
+          on_method_add_block(on_zsuper, block)
+        end
+      end
+
+      # $foo
+      # ^^^^
+      def visit_global_variable_read_node(node)
+        bounds(node.location)
+        on_var_ref(on_gvar(node.name.to_s))
+      end
+
+      # $foo = 1
+      # ^^^^^^^^
+      #
+      # $foo, $bar = 1
+      # ^^^^  ^^^^
+      def visit_global_variable_write_node(node)
+        bounds(node.name_loc)
+        target = on_var_field(on_gvar(node.name.to_s))
+        value = visit_write_value(node.value)
+
+        bounds(node.location)
+        on_assign(target, value)
+      end
+
+      # $foo += bar
+      # ^^^^^^^^^^^
+      def visit_global_variable_operator_write_node(node)
+        bounds(node.name_loc)
+        target = on_var_field(on_gvar(node.name.to_s))
+
+        bounds(node.binary_operator_loc)
+        operator = on_op("#{node.binary_operator}=")
+        value = visit_write_value(node.value)
+
+        bounds(node.location)
+        on_opassign(target, operator, value)
+      end
+
+      # $foo &&= bar
+      # ^^^^^^^^^^^^
+      def visit_global_variable_and_write_node(node)
+        bounds(node.name_loc)
+        target = on_var_field(on_gvar(node.name.to_s))
+
+        bounds(node.operator_loc)
+        operator = on_op("&&=")
+        value = visit_write_value(node.value)
+
+        bounds(node.location)
+        on_opassign(target, operator, value)
+      end
+
+      # $foo ||= bar
+      # ^^^^^^^^^^^^
+      def visit_global_variable_or_write_node(node)
+        bounds(node.name_loc)
+        target = on_var_field(on_gvar(node.name.to_s))
+
+        bounds(node.operator_loc)
+        operator = on_op("||=")
+        value = visit_write_value(node.value)
+
+        bounds(node.location)
+        on_opassign(target, operator, value)
+      end
+
+      # $foo, = bar
+      # ^^^^
+      def visit_global_variable_target_node(node)
+        bounds(node.location)
+        on_var_field(on_gvar(node.name.to_s))
+      end
+
+      # {}
+      # ^^
+      def visit_hash_node(node)
+        elements =
+          if node.elements.any?
+            args = visit_all(node.elements)
+
+            bounds(node.elements.first.location)
+            on_assoclist_from_args(args)
+          end
+
+        bounds(node.location)
+        on_hash(elements)
+      end
+
+      # foo => {}
+      #        ^^
+      def visit_hash_pattern_node(node)
+        constant = visit(node.constant)
+        elements =
+          if node.elements.any? || !node.rest.nil?
+            node.elements.map do |element|
+              [
+                if (key = element.key).opening_loc.nil?
+                  visit(key)
+                else
+                  bounds(key.value_loc)
+                  if (value = key.value).empty?
+                    on_string_content
+                  else
+                    on_string_add(on_string_content, on_tstring_content(value))
+                  end
+                end,
+                visit(element.value)
+              ]
+            end
+          end
+
+        rest =
+          case node.rest
+          when AssocSplatNode
+            visit(node.rest.value)
+          when NoKeywordsParameterNode
+            bounds(node.rest.location)
+            on_var_field(visit(node.rest))
+          end
+
+        bounds(node.location)
+        on_hshptn(constant, elements, rest)
+      end
+
+      # if foo then bar end
+      # ^^^^^^^^^^^^^^^^^^^
+      #
+      # bar if foo
+      # ^^^^^^^^^^
+      #
+      # foo ? bar : baz
+      # ^^^^^^^^^^^^^^^
+      def visit_if_node(node)
+        if node.then_keyword == "?"
+          predicate = visit(node.predicate)
+          truthy = visit(node.statements.body.first)
+          falsy = visit(node.subsequent.statements.body.first)
+
+          bounds(node.location)
+          on_ifop(predicate, truthy, falsy)
+        elsif node.statements.nil? || (node.predicate.location.start_offset < node.statements.location.start_offset)
+          predicate = visit(node.predicate)
+          statements =
+            if node.statements.nil?
+              bounds(node.location)
+              on_stmts_add(on_stmts_new, on_void_stmt)
+            else
+              visit(node.statements)
+            end
+          subsequent = visit(node.subsequent)
+
+          bounds(node.location)
+          if node.if_keyword == "if"
+            on_if(predicate, statements, subsequent)
+          else
+            on_elsif(predicate, statements, subsequent)
+          end
+        else
+          statements = visit(node.statements.body.first)
+          predicate = visit(node.predicate)
+
+          bounds(node.location)
+          on_if_mod(predicate, statements)
+        end
+      end
+
+      # 1i
+      # ^^
+      def visit_imaginary_node(node)
+        visit_number_node(node) { |text| on_imaginary(text) }
+      end
+
+      # { foo: }
+      #   ^^^^
+      def visit_implicit_node(node)
+      end
+
+      # foo { |bar,| }
+      #           ^
+      def visit_implicit_rest_node(node)
+        bounds(node.location)
+        on_excessed_comma
+      end
+
+      # case foo; in bar; end
+      # ^^^^^^^^^^^^^^^^^^^^^
+      def visit_in_node(node)
+        # This is a special case where we're not going to call on_in directly
+        # because we don't have access to the subsequent. Instead, we'll return
+        # the component parts and let the parent node handle it.
+        pattern = visit_pattern_node(node.pattern)
+        statements =
+          if node.statements.nil?
+            bounds(node.location)
+            on_stmts_add(on_stmts_new, on_void_stmt)
+          else
+            visit(node.statements)
+          end
+
+        [pattern, statements]
+      end
+
+      # foo[bar] += baz
+      # ^^^^^^^^^^^^^^^
+      def visit_index_operator_write_node(node)
+        receiver = visit(node.receiver)
+        arguments, _ = visit_call_node_arguments(node.arguments, node.block, trailing_comma?(node.arguments&.location || node.location, node.closing_loc))
+
+        bounds(node.location)
+        target = on_aref_field(receiver, arguments)
+
+        bounds(node.binary_operator_loc)
+        operator = on_op("#{node.binary_operator}=")
+        value = visit_write_value(node.value)
+
+        bounds(node.location)
+        on_opassign(target, operator, value)
+      end
+
+      # foo[bar] &&= baz
+      # ^^^^^^^^^^^^^^^^
+      def visit_index_and_write_node(node)
+        receiver = visit(node.receiver)
+        arguments, _ = visit_call_node_arguments(node.arguments, node.block, trailing_comma?(node.arguments&.location || node.location, node.closing_loc))
+
+        bounds(node.location)
+        target = on_aref_field(receiver, arguments)
+
+        bounds(node.operator_loc)
+        operator = on_op("&&=")
+        value = visit_write_value(node.value)
+
+        bounds(node.location)
+        on_opassign(target, operator, value)
+      end
+
+      # foo[bar] ||= baz
+      # ^^^^^^^^^^^^^^^^
+      def visit_index_or_write_node(node)
+        receiver = visit(node.receiver)
+        arguments, _ = visit_call_node_arguments(node.arguments, node.block, trailing_comma?(node.arguments&.location || node.location, node.closing_loc))
+
+        bounds(node.location)
+        target = on_aref_field(receiver, arguments)
+
+        bounds(node.operator_loc)
+        operator = on_op("||=")
+        value = visit_write_value(node.value)
+
+        bounds(node.location)
+        on_opassign(target, operator, value)
+      end
+
+      # foo[bar], = 1
+      # ^^^^^^^^
+      def visit_index_target_node(node)
+        receiver = visit(node.receiver)
+        arguments, _ = visit_call_node_arguments(node.arguments, node.block, trailing_comma?(node.arguments&.location || node.location, node.closing_loc))
+
+        bounds(node.location)
+        on_aref_field(receiver, arguments)
+      end
+
+      # @foo
+      # ^^^^
+      def visit_instance_variable_read_node(node)
+        bounds(node.location)
+        on_var_ref(on_ivar(node.name.to_s))
+      end
+
+      # @foo = 1
+      # ^^^^^^^^
+      def visit_instance_variable_write_node(node)
+        bounds(node.name_loc)
+        target = on_var_field(on_ivar(node.name.to_s))
+        value = visit_write_value(node.value)
+
+        bounds(node.location)
+        on_assign(target, value)
+      end
+
+      # @foo += bar
+      # ^^^^^^^^^^^
+      def visit_instance_variable_operator_write_node(node)
+        bounds(node.name_loc)
+        target = on_var_field(on_ivar(node.name.to_s))
+
+        bounds(node.binary_operator_loc)
+        operator = on_op("#{node.binary_operator}=")
+        value = visit_write_value(node.value)
+
+        bounds(node.location)
+        on_opassign(target, operator, value)
+      end
+
+      # @foo &&= bar
+      # ^^^^^^^^^^^^
+      def visit_instance_variable_and_write_node(node)
+        bounds(node.name_loc)
+        target = on_var_field(on_ivar(node.name.to_s))
+
+        bounds(node.operator_loc)
+        operator = on_op("&&=")
+        value = visit_write_value(node.value)
+
+        bounds(node.location)
+        on_opassign(target, operator, value)
+      end
+
+      # @foo ||= bar
+      # ^^^^^^^^^^^^
+      def visit_instance_variable_or_write_node(node)
+        bounds(node.name_loc)
+        target = on_var_field(on_ivar(node.name.to_s))
+
+        bounds(node.operator_loc)
+        operator = on_op("||=")
+        value = visit_write_value(node.value)
+
+        bounds(node.location)
+        on_opassign(target, operator, value)
+      end
+
+      # @foo, = bar
+      # ^^^^
+      def visit_instance_variable_target_node(node)
+        bounds(node.location)
+        on_var_field(on_ivar(node.name.to_s))
+      end
+
+      # 1
+      # ^
+      def visit_integer_node(node)
+        visit_number_node(node) { |text| on_int(text) }
+      end
+
+      # if /foo #{bar}/ then end
+      #    ^^^^^^^^^^^^
+      def visit_interpolated_match_last_line_node(node)
+        bounds(node.opening_loc)
+        on_regexp_beg(node.opening)
+
+        bounds(node.parts.first.location)
+        parts =
+          node.parts.inject(on_regexp_new) do |content, part|
+            on_regexp_add(content, visit_string_content(part))
+          end
+
+        bounds(node.closing_loc)
+        closing = on_regexp_end(node.closing)
+
+        bounds(node.location)
+        on_regexp_literal(parts, closing)
+      end
+
+      # /foo #{bar}/
+      # ^^^^^^^^^^^^
+      def visit_interpolated_regular_expression_node(node)
+        bounds(node.opening_loc)
+        on_regexp_beg(node.opening)
+
+        bounds(node.parts.first.location)
+        parts =
+          node.parts.inject(on_regexp_new) do |content, part|
+            on_regexp_add(content, visit_string_content(part))
+          end
+
+        bounds(node.closing_loc)
+        closing = on_regexp_end(node.closing)
+
+        bounds(node.location)
+        on_regexp_literal(parts, closing)
+      end
+
+      # "foo #{bar}"
+      # ^^^^^^^^^^^^
+      def visit_interpolated_string_node(node)
+        if node.opening&.start_with?("<<~")
+          heredoc = visit_heredoc_string_node(node)
+
+          bounds(node.location)
+          on_string_literal(heredoc)
+        elsif !node.heredoc? && node.parts.length > 1 && node.parts.any? { |part| (part.is_a?(StringNode) || part.is_a?(InterpolatedStringNode)) && !part.opening_loc.nil? }
+          first, *rest = node.parts
+          rest.inject(visit(first)) do |content, part|
+            concat = visit(part)
+
+            bounds(part.location)
+            on_string_concat(content, concat)
+          end
+        else
+          bounds(node.parts.first.location)
+          parts =
+            node.parts.inject(on_string_content) do |content, part|
+              on_string_add(content, visit_string_content(part))
+            end
+
+          bounds(node.location)
+          on_string_literal(parts)
+        end
+      end
+
+      # :"foo #{bar}"
+      # ^^^^^^^^^^^^^
+      def visit_interpolated_symbol_node(node)
+        bounds(node.parts.first.location)
+        parts =
+          node.parts.inject(on_string_content) do |content, part|
+            on_string_add(content, visit_string_content(part))
+          end
+
+        bounds(node.location)
+        on_dyna_symbol(parts)
+      end
+
+      # `foo #{bar}`
+      # ^^^^^^^^^^^^
+      def visit_interpolated_x_string_node(node)
+        if node.opening.start_with?("<<~")
+          heredoc = visit_heredoc_x_string_node(node)
+
+          bounds(node.location)
+          on_xstring_literal(heredoc)
+        else
+          bounds(node.parts.first.location)
+          parts =
+            node.parts.inject(on_xstring_new) do |content, part|
+              on_xstring_add(content, visit_string_content(part))
+            end
+
+          bounds(node.location)
+          on_xstring_literal(parts)
+        end
+      end
+
+      # Visit an individual part of a string-like node.
+      private def visit_string_content(part)
+        if part.is_a?(StringNode)
+          bounds(part.content_loc)
+          on_tstring_content(part.content)
+        else
+          visit(part)
+        end
+      end
+
+      # -> { it }
+      #      ^^
+      def visit_it_local_variable_read_node(node)
+        bounds(node.location)
+        on_vcall(on_ident(node.slice))
+      end
+
+      # -> { it }
+      # ^^^^^^^^^
+      def visit_it_parameters_node(node)
+      end
+
+      # foo(bar: baz)
+      #     ^^^^^^^^
+      def visit_keyword_hash_node(node)
+        elements = visit_all(node.elements)
+
+        bounds(node.location)
+        on_bare_assoc_hash(elements)
+      end
+
+      # def foo(**bar); end
+      #         ^^^^^
+      #
+      # def foo(**); end
+      #         ^^
+      def visit_keyword_rest_parameter_node(node)
+        if node.name_loc.nil?
+          bounds(node.location)
+          on_kwrest_param(nil)
+        else
+          bounds(node.name_loc)
+          name = on_ident(node.name.to_s)
+
+          bounds(node.location)
+          on_kwrest_param(name)
+        end
+      end
+
+      # -> {}
+      def visit_lambda_node(node)
+        bounds(node.operator_loc)
+        on_tlambda(node.operator)
+
+        parameters =
+          if node.parameters.is_a?(BlockParametersNode)
+            # Ripper does not track block-locals within lambdas, so we skip
+            # directly to the parameters here.
+            params =
+              if node.parameters.parameters.nil?
+                bounds(node.location)
+                on_params(nil, nil, nil, nil, nil, nil, nil)
+              else
+                visit(node.parameters.parameters)
+              end
+
+            if node.parameters.opening_loc.nil?
+              params
+            else
+              bounds(node.parameters.opening_loc)
+              on_paren(params)
+            end
+          else
+            bounds(node.location)
+            on_params(nil, nil, nil, nil, nil, nil, nil)
+          end
+
+        braces = node.opening == "{"
+        if braces
+          bounds(node.opening_loc)
+          on_tlambeg(node.opening)
+        end
+
+        body =
+          case node.body
+          when nil
+            bounds(node.location)
+            stmts = on_stmts_add(on_stmts_new, on_void_stmt)
+
+            bounds(node.location)
+            braces ? stmts : on_bodystmt(stmts, nil, nil, nil)
+          when StatementsNode
+            stmts = node.body.body
+            stmts.unshift(nil) if void_stmt?(node.parameters&.location || node.opening_loc, node.body.location, false)
+            stmts = visit_statements_node_body(stmts)
+
+            bounds(node.body.location)
+            braces ? stmts : on_bodystmt(stmts, nil, nil, nil)
+          when BeginNode
+            visit_body_node(node.opening_loc, node.body)
+          else
+            raise
+          end
+
+        bounds(node.location)
+        on_lambda(parameters, body)
+      end
+
+      # foo
+      # ^^^
+      def visit_local_variable_read_node(node)
+        bounds(node.location)
+        on_var_ref(on_ident(node.slice))
+      end
+
+      # foo = 1
+      # ^^^^^^^
+      def visit_local_variable_write_node(node)
+        bounds(node.name_loc)
+        target = on_var_field(on_ident(node.name_loc.slice))
+        value = visit_write_value(node.value)
+
+        bounds(node.location)
+        on_assign(target, value)
+      end
+
+      # foo += bar
+      # ^^^^^^^^^^
+      def visit_local_variable_operator_write_node(node)
+        bounds(node.name_loc)
+        target = on_var_field(on_ident(node.name_loc.slice))
+
+        bounds(node.binary_operator_loc)
+        operator = on_op("#{node.binary_operator}=")
+        value = visit_write_value(node.value)
+
+        bounds(node.location)
+        on_opassign(target, operator, value)
+      end
+
+      # foo &&= bar
+      # ^^^^^^^^^^^
+      def visit_local_variable_and_write_node(node)
+        bounds(node.name_loc)
+        target = on_var_field(on_ident(node.name_loc.slice))
+
+        bounds(node.operator_loc)
+        operator = on_op("&&=")
+        value = visit_write_value(node.value)
+
+        bounds(node.location)
+        on_opassign(target, operator, value)
+      end
+
+      # foo ||= bar
+      # ^^^^^^^^^^^
+      def visit_local_variable_or_write_node(node)
+        bounds(node.name_loc)
+        target = on_var_field(on_ident(node.name_loc.slice))
+
+        bounds(node.operator_loc)
+        operator = on_op("||=")
+        value = visit_write_value(node.value)
+
+        bounds(node.location)
+        on_opassign(target, operator, value)
+      end
+
+      # foo, = bar
+      # ^^^
+      def visit_local_variable_target_node(node)
+        bounds(node.location)
+        on_var_field(on_ident(node.name.to_s))
+      end
+
+      # if /foo/ then end
+      #    ^^^^^
+      def visit_match_last_line_node(node)
+        bounds(node.opening_loc)
+        on_regexp_beg(node.opening)
+
+        bounds(node.content_loc)
+        tstring_content = on_tstring_content(node.content)
+
+        bounds(node.closing_loc)
+        closing = on_regexp_end(node.closing)
+
+        on_regexp_literal(on_regexp_add(on_regexp_new, tstring_content), closing)
+      end
+
+      # foo in bar
+      # ^^^^^^^^^^
+      def visit_match_predicate_node(node)
+        value = visit(node.value)
+        pattern = on_in(visit_pattern_node(node.pattern), nil, nil)
+
+        on_case(value, pattern)
+      end
+
+      # foo => bar
+      # ^^^^^^^^^^
+      def visit_match_required_node(node)
+        value = visit(node.value)
+        pattern = on_in(visit_pattern_node(node.pattern), nil, nil)
+
+        on_case(value, pattern)
+      end
+
+      # /(?<foo>foo)/ =~ bar
+      # ^^^^^^^^^^^^^^^^^^^^
+      def visit_match_write_node(node)
+        visit(node.call)
+      end
+
+      # A node that is missing from the syntax tree. This is only used in the
+      # case of a syntax error.
+      def visit_missing_node(node)
+        raise "Cannot visit missing nodes directly."
+      end
+
+      # module Foo; end
+      # ^^^^^^^^^^^^^^^
+      def visit_module_node(node)
+        constant_path =
+          if node.constant_path.is_a?(ConstantReadNode)
+            bounds(node.constant_path.location)
+            on_const_ref(on_const(node.constant_path.name.to_s))
+          else
+            visit(node.constant_path)
+          end
+
+        bodystmt = visit_body_node(node.constant_path.location, node.body, true)
+
+        bounds(node.location)
+        on_module(constant_path, bodystmt)
+      end
+
+      # (foo, bar), bar = qux
+      # ^^^^^^^^^^
+      def visit_multi_target_node(node)
+        bounds(node.location)
+        targets = visit_multi_target_node_targets(node.lefts, node.rest, node.rights, true)
+
+        if node.lparen_loc.nil?
+          targets
+        else
+          bounds(node.lparen_loc)
+          on_mlhs_paren(targets)
+        end
+      end
+
+      # Visit the targets of a multi-target node.
+      private def visit_multi_target_node_targets(lefts, rest, rights, skippable)
+        if skippable && lefts.length == 1 && lefts.first.is_a?(MultiTargetNode) && rest.nil? && rights.empty?
+          return visit(lefts.first)
+        end
+
+        mlhs = on_mlhs_new
+
+        lefts.each do |left|
+          bounds(left.location)
+          mlhs = on_mlhs_add(mlhs, visit(left))
+        end
+
+        case rest
+        when nil
+          # do nothing
+        when ImplicitRestNode
+          # these do not get put into the generated tree
+          bounds(rest.location)
+          on_excessed_comma
+        else
+          bounds(rest.location)
+          mlhs = on_mlhs_add_star(mlhs, visit(rest))
+        end
+
+        if rights.any?
+          bounds(rights.first.location)
+          post = on_mlhs_new
+
+          rights.each do |right|
+            bounds(right.location)
+            post = on_mlhs_add(post, visit(right))
+          end
+
+          mlhs = on_mlhs_add_post(mlhs, post)
+        end
+
+        mlhs
+      end
+
+      # foo, bar = baz
+      # ^^^^^^^^^^^^^^
+      def visit_multi_write_node(node)
+        bounds(node.location)
+        targets = visit_multi_target_node_targets(node.lefts, node.rest, node.rights, true)
+
+        unless node.lparen_loc.nil?
+          bounds(node.lparen_loc)
+          targets = on_mlhs_paren(targets)
+        end
+
+        value = visit_write_value(node.value)
+
+        bounds(node.location)
+        on_massign(targets, value)
+      end
+
+      # next
+      # ^^^^
+      #
+      # next foo
+      # ^^^^^^^^
+      def visit_next_node(node)
+        if node.arguments.nil?
+          bounds(node.location)
+          on_next(on_args_new)
+        else
+          arguments = visit(node.arguments)
+
+          bounds(node.location)
+          on_next(arguments)
+        end
+      end
+
+      # nil
+      # ^^^
+      def visit_nil_node(node)
+        bounds(node.location)
+        on_var_ref(on_kw("nil"))
+      end
+
+      # def foo(**nil); end
+      #         ^^^^^
+      def visit_no_keywords_parameter_node(node)
+        bounds(node.location)
+        on_nokw_param(nil)
+
+        :nil
+      end
+
+      # -> { _1 + _2 }
+      # ^^^^^^^^^^^^^^
+      def visit_numbered_parameters_node(node)
+      end
+
+      # $1
+      # ^^
+      def visit_numbered_reference_read_node(node)
+        bounds(node.location)
+        on_backref(node.slice)
+      end
+
+      # def foo(bar: baz); end
+      #         ^^^^^^^^
+      def visit_optional_keyword_parameter_node(node)
+        bounds(node.name_loc)
+        name = on_label("#{node.name}:")
+        value = visit(node.value)
+
+        [name, value]
+      end
+
+      # def foo(bar = 1); end
+      #         ^^^^^^^
+      def visit_optional_parameter_node(node)
+        bounds(node.name_loc)
+        name = visit_token(node.name.to_s)
+        value = visit(node.value)
+
+        [name, value]
+      end
+
+      # a or b
+      # ^^^^^^
+      def visit_or_node(node)
+        left = visit(node.left)
+        right = visit(node.right)
+
+        bounds(node.location)
+        on_binary(left, node.operator.to_sym, right)
+      end
+
+      # def foo(bar, *baz); end
+      #         ^^^^^^^^^
+      def visit_parameters_node(node)
+        requireds = node.requireds.map { |required| required.is_a?(MultiTargetNode) ? visit_destructured_parameter_node(required) : visit(required) } if node.requireds.any?
+        optionals = visit_all(node.optionals) if node.optionals.any?
+        rest = visit(node.rest)
+        posts = node.posts.map { |post| post.is_a?(MultiTargetNode) ? visit_destructured_parameter_node(post) : visit(post) } if node.posts.any?
+        keywords = visit_all(node.keywords) if node.keywords.any?
+        keyword_rest = visit(node.keyword_rest)
+        block = visit(node.block)
+
+        bounds(node.location)
+        on_params(requireds, optionals, rest, posts, keywords, keyword_rest, block)
+      end
+
+      # Visit a destructured positional parameter node.
+      private def visit_destructured_parameter_node(node)
+        bounds(node.location)
+        targets = visit_multi_target_node_targets(node.lefts, node.rest, node.rights, false)
+
+        bounds(node.lparen_loc)
+        on_mlhs_paren(targets)
+      end
+
+      # ()
+      # ^^
+      #
+      # (1)
+      # ^^^
+      def visit_parentheses_node(node)
+        body =
+          if node.body.nil?
+            on_stmts_add(on_stmts_new, on_void_stmt)
+          else
+            visit(node.body)
+          end
+
+        bounds(node.location)
+        on_paren(body)
+      end
+
+      # foo => ^(bar)
+      #        ^^^^^^
+      def visit_pinned_expression_node(node)
+        expression = visit(node.expression)
+
+        bounds(node.location)
+        on_begin(expression)
+      end
+
+      # foo = 1 and bar => ^foo
+      #                    ^^^^
+      def visit_pinned_variable_node(node)
+        visit(node.variable)
+      end
+
+      # END {}
+      # ^^^^^^
+      def visit_post_execution_node(node)
+        statements =
+          if node.statements.nil?
+            bounds(node.location)
+            on_stmts_add(on_stmts_new, on_void_stmt)
+          else
+            visit(node.statements)
+          end
+
+        bounds(node.location)
+        on_END(statements)
+      end
+
+      # BEGIN {}
+      # ^^^^^^^^
+      def visit_pre_execution_node(node)
+        statements =
+          if node.statements.nil?
+            bounds(node.location)
+            on_stmts_add(on_stmts_new, on_void_stmt)
+          else
+            visit(node.statements)
+          end
+
+        bounds(node.location)
+        on_BEGIN(statements)
+      end
+
+      # The top-level program node.
+      def visit_program_node(node)
+        body = node.statements.body
+        body << nil if body.empty?
+        statements = visit_statements_node_body(body)
+
+        bounds(node.location)
+        on_program(statements)
+      end
+
+      # 0..5
+      # ^^^^
+      def visit_range_node(node)
+        left = visit(node.left)
+        right = visit(node.right)
+
+        bounds(node.location)
+        if node.exclude_end?
+          on_dot3(left, right)
+        else
+          on_dot2(left, right)
+        end
+      end
+
+      # 1r
+      # ^^
+      def visit_rational_node(node)
+        visit_number_node(node) { |text| on_rational(text) }
+      end
+
+      # redo
+      # ^^^^
+      def visit_redo_node(node)
+        bounds(node.location)
+        on_redo
+      end
+
+      # /foo/
+      # ^^^^^
+      def visit_regular_expression_node(node)
+        bounds(node.opening_loc)
+        on_regexp_beg(node.opening)
+
+        if node.content.empty?
+          bounds(node.closing_loc)
+          closing = on_regexp_end(node.closing)
+
+          on_regexp_literal(on_regexp_new, closing)
+        else
+          bounds(node.content_loc)
+          tstring_content = on_tstring_content(node.content)
+
+          bounds(node.closing_loc)
+          closing = on_regexp_end(node.closing)
+
+          on_regexp_literal(on_regexp_add(on_regexp_new, tstring_content), closing)
+        end
+      end
+
+      # def foo(bar:); end
+      #         ^^^^
+      def visit_required_keyword_parameter_node(node)
+        bounds(node.name_loc)
+        [on_label("#{node.name}:"), false]
+      end
+
+      # def foo(bar); end
+      #         ^^^
+      def visit_required_parameter_node(node)
+        bounds(node.location)
+        on_ident(node.name.to_s)
+      end
+
+      # foo rescue bar
+      # ^^^^^^^^^^^^^^
+      def visit_rescue_modifier_node(node)
+        expression = visit_write_value(node.expression)
+        rescue_expression = visit(node.rescue_expression)
+
+        bounds(node.location)
+        on_rescue_mod(expression, rescue_expression)
+      end
+
+      # begin; rescue; end
+      #        ^^^^^^^
+      def visit_rescue_node(node)
+        exceptions =
+          case node.exceptions.length
+          when 0
+            nil
+          when 1
+            if (exception = node.exceptions.first).is_a?(SplatNode)
+              bounds(exception.location)
+              on_mrhs_add_star(on_mrhs_new, visit(exception))
+            else
+              [visit(node.exceptions.first)]
+            end
+          else
+            bounds(node.location)
+            length = node.exceptions.length
+
+            node.exceptions.each_with_index.inject(on_args_new) do |mrhs, (exception, index)|
+              arg = visit(exception)
+
+              bounds(exception.location)
+              mrhs = on_mrhs_new_from_args(mrhs) if index == length - 1
+
+              if exception.is_a?(SplatNode)
+                if index == length - 1
+                  on_mrhs_add_star(mrhs, arg)
+                else
+                  on_args_add_star(mrhs, arg)
+                end
+              else
+                if index == length - 1
+                  on_mrhs_add(mrhs, arg)
+                else
+                  on_args_add(mrhs, arg)
+                end
+              end
+            end
+          end
+
+        reference = visit(node.reference)
+        statements =
+          if node.statements.nil?
+            bounds(node.location)
+            on_stmts_add(on_stmts_new, on_void_stmt)
+          else
+            visit(node.statements)
+          end
+
+        subsequent = visit(node.subsequent)
+
+        bounds(node.location)
+        on_rescue(exceptions, reference, statements, subsequent)
+      end
+
+      # def foo(*bar); end
+      #         ^^^^
+      #
+      # def foo(*); end
+      #         ^
+      def visit_rest_parameter_node(node)
+        if node.name_loc.nil?
+          bounds(node.location)
+          on_rest_param(nil)
+        else
+          bounds(node.name_loc)
+          on_rest_param(visit_token(node.name.to_s))
+        end
+      end
+
+      # retry
+      # ^^^^^
+      def visit_retry_node(node)
+        bounds(node.location)
+        on_retry
+      end
+
+      # return
+      # ^^^^^^
+      #
+      # return 1
+      # ^^^^^^^^
+      def visit_return_node(node)
+        if node.arguments.nil?
+          bounds(node.location)
+          on_return0
+        else
+          arguments = visit(node.arguments)
+
+          bounds(node.location)
+          on_return(arguments)
+        end
+      end
+
+      # self
+      # ^^^^
+      def visit_self_node(node)
+        bounds(node.location)
+        on_var_ref(on_kw("self"))
+      end
+
+      # A shareable constant.
+      def visit_shareable_constant_node(node)
+        visit(node.write)
+      end
+
+      # class << self; end
+      # ^^^^^^^^^^^^^^^^^^
+      def visit_singleton_class_node(node)
+        expression = visit(node.expression)
+        bodystmt = visit_body_node(node.body&.location || node.end_keyword_loc, node.body)
+
+        bounds(node.location)
+        on_sclass(expression, bodystmt)
+      end
+
+      # __ENCODING__
+      # ^^^^^^^^^^^^
+      def visit_source_encoding_node(node)
+        bounds(node.location)
+        on_var_ref(on_kw("__ENCODING__"))
+      end
+
+      # __FILE__
+      # ^^^^^^^^
+      def visit_source_file_node(node)
+        bounds(node.location)
+        on_var_ref(on_kw("__FILE__"))
+      end
+
+      # __LINE__
+      # ^^^^^^^^
+      def visit_source_line_node(node)
+        bounds(node.location)
+        on_var_ref(on_kw("__LINE__"))
+      end
+
+      # foo(*bar)
+      #     ^^^^
+      #
+      # def foo((bar, *baz)); end
+      #               ^^^^
+      #
+      # def foo(*); bar(*); end
+      #                 ^
+      def visit_splat_node(node)
+        visit(node.expression)
+      end
+
+      # A list of statements.
+      def visit_statements_node(node)
+        bounds(node.location)
+        visit_statements_node_body(node.body)
+      end
+
+      # Visit the list of statements of a statements node. We support nil
+      # statements in the list. This would normally not be allowed by the
+      # structure of the prism parse tree, but we manually add them here so that
+      # we can mirror Ripper's void stmt.
+      private def visit_statements_node_body(body)
+        body.inject(on_stmts_new) do |stmts, stmt|
+          on_stmts_add(stmts, stmt.nil? ? on_void_stmt : visit(stmt))
+        end
+      end
+
+      # "foo"
+      # ^^^^^
+      def visit_string_node(node)
+        if (content = node.content).empty?
+          bounds(node.location)
+          on_string_literal(on_string_content)
+        elsif (opening = node.opening) == "?"
+          bounds(node.location)
+          on_CHAR("?#{node.content}")
+        elsif opening.start_with?("<<~")
+          heredoc = visit_heredoc_string_node(node.to_interpolated)
+
+          bounds(node.location)
+          on_string_literal(heredoc)
+        else
+          bounds(node.content_loc)
+          tstring_content = on_tstring_content(content)
+
+          bounds(node.location)
+          on_string_literal(on_string_add(on_string_content, tstring_content))
+        end
+      end
+
+      # Ripper gives back the escaped string content but strips out the common
+      # leading whitespace. Prism gives back the unescaped string content and
+      # a location for the escaped string content. Unfortunately these don't
+      # work well together, so here we need to re-derive the common leading
+      # whitespace.
+      private def visit_heredoc_node_whitespace(parts)
+        common_whitespace = nil
+        dedent_next = true
+
+        parts.each do |part|
+          if part.is_a?(StringNode)
+            if dedent_next && !(content = part.content).chomp.empty?
+              common_whitespace = [
+                common_whitespace || Float::INFINITY,
+                content[/\A\s*/].each_char.inject(0) do |part_whitespace, char|
+                  char == "\t" ? ((part_whitespace / 8 + 1) * 8) : (part_whitespace + 1)
+                end
+              ].min
+            end
+
+            dedent_next = true
+          else
+            dedent_next = false
+          end
+        end
+
+        common_whitespace || 0
+      end
+
+      # Visit a string that is expressed using a <<~ heredoc.
+      private def visit_heredoc_node(parts, base)
+        common_whitespace = visit_heredoc_node_whitespace(parts)
+
+        if common_whitespace == 0
+          bounds(parts.first.location)
+
+          string = []
+          result = base
+
+          parts.each do |part|
+            if part.is_a?(StringNode)
+              if string.empty?
+                string = [part]
+              else
+                string << part
+              end
+            else
+              unless string.empty?
+                bounds(string[0].location)
+                result = yield result, on_tstring_content(string.map(&:content).join)
+                string = []
+              end
+
+              result = yield result, visit(part)
+            end
+          end
+
+          unless string.empty?
+            bounds(string[0].location)
+            result = yield result, on_tstring_content(string.map(&:content).join)
+          end
+
+          result
+        else
+          bounds(parts.first.location)
+          result =
+            parts.inject(base) do |string_content, part|
+              yield string_content, visit_string_content(part)
+            end
+
+          bounds(parts.first.location)
+          on_heredoc_dedent(result, common_whitespace)
+        end
+      end
+
+      # Visit a heredoc node that is representing a string.
+      private def visit_heredoc_string_node(node)
+        bounds(node.opening_loc)
+        on_heredoc_beg(node.opening)
+
+        bounds(node.location)
+        result =
+          visit_heredoc_node(node.parts, on_string_content) do |parts, part|
+            on_string_add(parts, part)
+          end
+
+        bounds(node.closing_loc)
+        on_heredoc_end(node.closing)
+
+        result
+      end
+
+      # Visit a heredoc node that is representing an xstring.
+      private def visit_heredoc_x_string_node(node)
+        bounds(node.opening_loc)
+        on_heredoc_beg(node.opening)
+
+        bounds(node.location)
+        result =
+          visit_heredoc_node(node.parts, on_xstring_new) do |parts, part|
+            on_xstring_add(parts, part)
+          end
+
+        bounds(node.closing_loc)
+        on_heredoc_end(node.closing)
+
+        result
+      end
+
+      # super(foo)
+      # ^^^^^^^^^^
+      def visit_super_node(node)
+        arguments, block = visit_call_node_arguments(node.arguments, node.block, trailing_comma?(node.arguments&.location || node.location, node.rparen_loc || node.location))
+
+        if !node.lparen_loc.nil?
+          bounds(node.lparen_loc)
+          arguments = on_arg_paren(arguments)
+        end
+
+        bounds(node.location)
+        call = on_super(arguments)
+
+        if block.nil?
+          call
+        else
+          bounds(node.block.location)
+          on_method_add_block(call, block)
+        end
+      end
+
+      # :foo
+      # ^^^^
+      def visit_symbol_node(node)
+        if (opening = node.opening)&.match?(/^%s|['"]:?$/)
+          bounds(node.value_loc)
+          content = on_string_content
+
+          if !(value = node.value).empty?
+            content = on_string_add(content, on_tstring_content(value))
+          end
+
+          on_dyna_symbol(content)
+        elsif (closing = node.closing) == ":"
+          bounds(node.location)
+          on_label("#{node.value}:")
+        elsif opening.nil? && node.closing_loc.nil?
+          bounds(node.value_loc)
+          on_symbol_literal(visit_token(node.value))
+        else
+          bounds(node.value_loc)
+          on_symbol_literal(on_symbol(visit_token(node.value)))
+        end
+      end
+
+      # true
+      # ^^^^
+      def visit_true_node(node)
+        bounds(node.location)
+        on_var_ref(on_kw("true"))
+      end
+
+      # undef foo
+      # ^^^^^^^^^
+      def visit_undef_node(node)
+        names = visit_all(node.names)
+
+        bounds(node.location)
+        on_undef(names)
+      end
+
+      # unless foo; bar end
+      # ^^^^^^^^^^^^^^^^^^^
+      #
+      # bar unless foo
+      # ^^^^^^^^^^^^^^
+      def visit_unless_node(node)
+        if node.statements.nil? || (node.predicate.location.start_offset < node.statements.location.start_offset)
+          predicate = visit(node.predicate)
+          statements =
+            if node.statements.nil?
+              bounds(node.location)
+              on_stmts_add(on_stmts_new, on_void_stmt)
+            else
+              visit(node.statements)
+            end
+          else_clause = visit(node.else_clause)
+
+          bounds(node.location)
+          on_unless(predicate, statements, else_clause)
+        else
+          statements = visit(node.statements.body.first)
+          predicate = visit(node.predicate)
+
+          bounds(node.location)
+          on_unless_mod(predicate, statements)
+        end
+      end
+
+      # until foo; bar end
+      # ^^^^^^^^^^^^^^^^^
+      #
+      # bar until foo
+      # ^^^^^^^^^^^^^
+      def visit_until_node(node)
+        if node.statements.nil? || (node.predicate.location.start_offset < node.statements.location.start_offset)
+          predicate = visit(node.predicate)
+          statements =
+            if node.statements.nil?
+              bounds(node.location)
+              on_stmts_add(on_stmts_new, on_void_stmt)
+            else
+              visit(node.statements)
+            end
+
+          bounds(node.location)
+          on_until(predicate, statements)
+        else
+          statements = visit(node.statements.body.first)
+          predicate = visit(node.predicate)
+
+          bounds(node.location)
+          on_until_mod(predicate, statements)
+        end
+      end
+
+      # case foo; when bar; end
+      #           ^^^^^^^^^^^^^
+      def visit_when_node(node)
+        # This is a special case where we're not going to call on_when directly
+        # because we don't have access to the subsequent. Instead, we'll return
+        # the component parts and let the parent node handle it.
+        conditions = visit_arguments(node.conditions)
+        statements =
+          if node.statements.nil?
+            bounds(node.location)
+            on_stmts_add(on_stmts_new, on_void_stmt)
+          else
+            visit(node.statements)
+          end
+
+        [conditions, statements]
+      end
+
+      # while foo; bar end
+      # ^^^^^^^^^^^^^^^^^^
+      #
+      # bar while foo
+      # ^^^^^^^^^^^^^
+      def visit_while_node(node)
+        if node.statements.nil? || (node.predicate.location.start_offset < node.statements.location.start_offset)
+          predicate = visit(node.predicate)
+          statements =
+            if node.statements.nil?
+              bounds(node.location)
+              on_stmts_add(on_stmts_new, on_void_stmt)
+            else
+              visit(node.statements)
+            end
+
+          bounds(node.location)
+          on_while(predicate, statements)
+        else
+          statements = visit(node.statements.body.first)
+          predicate = visit(node.predicate)
+
+          bounds(node.location)
+          on_while_mod(predicate, statements)
+        end
+      end
+
+      # `foo`
+      # ^^^^^
+      def visit_x_string_node(node)
+        if node.unescaped.empty?
+          bounds(node.location)
+          on_xstring_literal(on_xstring_new)
+        elsif node.opening.start_with?("<<~")
+          heredoc = visit_heredoc_x_string_node(node.to_interpolated)
+
+          bounds(node.location)
+          on_xstring_literal(heredoc)
+        else
+          bounds(node.content_loc)
+          content = on_tstring_content(node.content)
+
+          bounds(node.location)
+          on_xstring_literal(on_xstring_add(on_xstring_new, content))
+        end
+      end
+
+      # yield
+      # ^^^^^
+      #
+      # yield 1
+      # ^^^^^^^
+      def visit_yield_node(node)
+        if node.arguments.nil? && node.lparen_loc.nil?
+          bounds(node.location)
+          on_yield0
+        else
+          arguments =
+            if node.arguments.nil?
+              bounds(node.location)
+              on_args_new
+            else
+              visit(node.arguments)
+            end
+
+          unless node.lparen_loc.nil?
+            bounds(node.lparen_loc)
+            arguments = on_paren(arguments)
+          end
+
+          bounds(node.location)
+          on_yield(arguments)
+        end
+      end
+
+      private
+
+      # Lazily initialize the parse result.
+      def result
+        @result ||= Prism.parse(source, partial_script: true)
+      end
+
+      ##########################################################################
+      # Helpers
+      ##########################################################################
+
+      # Returns true if there is a comma between the two locations.
+      def trailing_comma?(left, right)
+        source.byteslice(left.end_offset...right.start_offset).include?(",")
+      end
+
+      # Returns true if there is a semicolon between the two locations.
+      def void_stmt?(left, right, allow_newline)
+        pattern = allow_newline ? /[;\n]/ : /;/
+        source.byteslice(left.end_offset...right.start_offset).match?(pattern)
+      end
+
+      # Visit the string content of a particular node. This method is used to
+      # split into the various token types.
+      def visit_token(token, allow_keywords = true)
+        case token
+        when "."
+          on_period(token)
+        when "`"
+          on_backtick(token)
+        when *(allow_keywords ? KEYWORDS : [])
+          on_kw(token)
+        when /^_/
+          on_ident(token)
+        when /^[[:upper:]]\w*$/
+          on_const(token)
+        when /^@@/
+          on_cvar(token)
+        when /^@/
+          on_ivar(token)
+        when /^\$/
+          on_gvar(token)
+        when /^[[:punct:]]/
+          on_op(token)
+        else
+          on_ident(token)
+        end
+      end
+
+      # Visit a node that represents a number. We need to explicitly handle the
+      # unary - operator.
+      def visit_number_node(node)
+        slice = node.slice
+        location = node.location
+
+        if slice[0] == "-"
+          bounds(location.copy(start_offset: location.start_offset + 1))
+          value = yield slice[1..-1]
+
+          bounds(node.location)
+          on_unary(:-@, value)
+        else
+          bounds(location)
+          yield slice
+        end
+      end
+
+      # Visit a node that represents a write value. This is used to handle the
+      # special case of an implicit array that is generated without brackets.
+      def visit_write_value(node)
+        if node.is_a?(ArrayNode) && node.opening_loc.nil?
+          elements = node.elements
+          length = elements.length
+
+          bounds(elements.first.location)
+          elements.each_with_index.inject((elements.first.is_a?(SplatNode) && length == 1) ? on_mrhs_new : on_args_new) do |args, (element, index)|
+            arg = visit(element)
+            bounds(element.location)
+
+            if index == length - 1
+              if element.is_a?(SplatNode)
+                mrhs = index == 0 ? args : on_mrhs_new_from_args(args)
+                on_mrhs_add_star(mrhs, arg)
+              else
+                on_mrhs_add(on_mrhs_new_from_args(args), arg)
+              end
+            else
+              case element
+              when BlockArgumentNode
+                on_args_add_block(args, arg)
+              when SplatNode
+                on_args_add_star(args, arg)
+              else
+                on_args_add(args, arg)
+              end
+            end
+          end
+        else
+          visit(node)
+        end
+      end
+
+      # This method is responsible for updating lineno and column information
+      # to reflect the current node.
+      #
+      # This method could be drastically improved with some caching on the start
+      # of every line, but for now it's good enough.
+      def bounds(location)
+        @lineno = location.start_line
+        @column = location.start_column
+      end
+
+      ##########################################################################
+      # Ripper interface
+      ##########################################################################
+
+      # :stopdoc:
+      def _dispatch_0; end
+      def _dispatch_1(_); end
+      def _dispatch_2(_, _); end
+      def _dispatch_3(_, _, _); end
+      def _dispatch_4(_, _, _, _); end
+      def _dispatch_5(_, _, _, _, _); end
+      def _dispatch_7(_, _, _, _, _, _, _); end
+      # :startdoc:
+
+      #
+      # Parser Events
+      #
+
+      PARSER_EVENT_TABLE.each do |id, arity|
+        alias_method "on_#{id}", "_dispatch_#{arity}"
+      end
+
+      # This method is called when weak warning is produced by the parser.
+      # +fmt+ and +args+ is printf style.
+      def warn(fmt, *args)
+      end
+
+      # This method is called when strong warning is produced by the parser.
+      # +fmt+ and +args+ is printf style.
+      def warning(fmt, *args)
+      end
+
+      # This method is called when the parser found syntax error.
+      def compile_error(msg)
+      end
+
+      #
+      # Scanner Events
+      #
+
+      SCANNER_EVENTS.each do |id|
+        alias_method "on_#{id}", :_dispatch_1
+      end
+
+      # This method is provided by the Ripper C extension. It is called when a
+      # string needs to be dedented because of a tilde heredoc. It is expected
+      # that it will modify the string in place and return the number of bytes
+      # that were removed.
+      def dedent_string(string, width)
+        whitespace = 0
+        cursor = 0
+
+        while cursor < string.length && string[cursor].match?(/\s/) && whitespace < width
+          if string[cursor] == "\t"
+            whitespace = ((whitespace / 8 + 1) * 8)
+            break if whitespace > width
+          else
+            whitespace += 1
+          end
+
+          cursor += 1
+        end
+
+        string.replace(string[cursor..])
+        cursor
+      end
+    end
+  end
+end
diff --git a/lib/prism/translation/ripper/sexp.rb b/lib/prism/translation/ripper/sexp.rb
new file mode 100644
index 00000000000000..8cfefc84723b29
--- /dev/null
+++ b/lib/prism/translation/ripper/sexp.rb
@@ -0,0 +1,126 @@
+# frozen_string_literal: true
+# :markup: markdown
+
+require_relative "../ripper"
+
+module Prism
+  module Translation
+    class Ripper
+      # This class mirrors the ::Ripper::SexpBuilder subclass of ::Ripper that
+      # returns the arrays of [type, *children].
+      class SexpBuilder < Ripper
+        # :stopdoc:
+
+        attr_reader :error
+
+        private
+
+        def dedent_element(e, width)
+          if (n = dedent_string(e[1], width)) > 0
+            e[2][1] += n
+          end
+          e
+        end
+
+        def on_heredoc_dedent(val, width)
+          sub = proc do |cont|
+            cont.map! do |e|
+              if Array === e
+                case e[0]
+                when :@tstring_content
+                  e = dedent_element(e, width)
+                when /_add\z/
+                  e[1] = sub[e[1]]
+                end
+              elsif String === e
+                dedent_string(e, width)
+              end
+              e
+            end
+          end
+          sub[val]
+          val
+        end
+
+        events = private_instance_methods(false).grep(/\Aon_/) {$'.to_sym}
+        (PARSER_EVENTS - events).each do |event|
+          module_eval(<<-End, __FILE__, __LINE__ + 1)
+            def on_#{event}(*args)
+              args.unshift :#{event}
+            end
+          End
+        end
+
+        SCANNER_EVENTS.each do |event|
+          module_eval(<<-End, __FILE__, __LINE__ + 1)
+            def on_#{event}(tok)
+              [:@#{event}, tok, [lineno(), column()]]
+            end
+          End
+        end
+
+        def on_error(mesg)
+          @error = mesg
+        end
+        remove_method :on_parse_error
+        alias on_parse_error on_error
+        alias compile_error on_error
+
+        # :startdoc:
+      end
+
+      # This class mirrors the ::Ripper::SexpBuilderPP subclass of ::Ripper that
+      # returns the same values as ::Ripper::SexpBuilder except with a couple of
+      # niceties that flatten linked lists into arrays.
+      class SexpBuilderPP < SexpBuilder
+        # :stopdoc:
+
+        private
+
+        def on_heredoc_dedent(val, width)
+          val.map! do |e|
+            next e if Symbol === e and /_content\z/ =~ e
+            if Array === e and e[0] == :@tstring_content
+              e = dedent_element(e, width)
+            elsif String === e
+              dedent_string(e, width)
+            end
+            e
+          end
+          val
+        end
+
+        def _dispatch_event_new
+          []
+        end
+
+        def _dispatch_event_push(list, item)
+          list.push item
+          list
+        end
+
+        def on_mlhs_paren(list)
+          [:mlhs, *list]
+        end
+
+        def on_mlhs_add_star(list, star)
+          list.push([:rest_param, star])
+        end
+
+        def on_mlhs_add_post(list, post)
+          list.concat(post)
+        end
+
+        PARSER_EVENT_TABLE.each do |event, arity|
+          if /_new\z/ =~ event and arity == 0
+            alias_method "on_#{event}", :_dispatch_event_new
+          elsif /_add\z/ =~ event
+            alias_method "on_#{event}", :_dispatch_event_push
+          end
+        end
+
+        # :startdoc:
+      end
+    end
+  end
+end
diff --git a/lib/prism/translation/ripper/shim.rb b/lib/prism/translation/ripper/shim.rb
new file mode 100644
index 00000000000000..10e21cd16a213f
--- /dev/null
+++ b/lib/prism/translation/ripper/shim.rb
@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+
+# This writes the prism ripper translation into the Ripper constant so that
+# users can transparently use Ripper without any changes.
+Ripper = Prism::Translation::Ripper
diff --git a/lib/prism/translation/ruby_parser.rb b/lib/prism/translation/ruby_parser.rb
new file mode 100644
index 00000000000000..3808cd3130906e
--- /dev/null
+++ b/lib/prism/translation/ruby_parser.rb
@@ -0,0 +1,1929 @@
+# frozen_string_literal: true
+# :markup: markdown
+
+begin
+  require "ruby_parser"
+rescue LoadError
+  warn(%q{Error: Unable to load ruby_parser. Add `gem "ruby_parser"` to your Gemfile.})
+  exit(1)
+end
+
+module Prism
+  module Translation
+    # This module is the entry-point for converting a prism syntax tree into the
+    # seattlerb/ruby_parser gem's syntax tree.
+    class RubyParser
+      # A prism visitor that builds Sexp objects.
+      class Compiler < ::Prism::Compiler
+        # This is the name of the file that we are compiling. We set it on every
+        # Sexp object that is generated, and also use it to compile `__FILE__`
+        # nodes.
+        attr_reader :file
+
+        # Class variables will change their type based on if they are inside of
+        # a method definition or not, so we need to track that state.
+        attr_reader :in_def
+
+        # Some nodes will change their representation if they are inside of a
+        # pattern, so we need to track that state.
+        attr_reader :in_pattern
+
+        # Initialize a new compiler with the given file name.
+        def initialize(file, in_def: false, in_pattern: false)
+          @file = file
+          @in_def = in_def
+          @in_pattern = in_pattern
+        end
+
+        # ```
+        # alias foo bar
+        # ^^^^^^^^^^^^^
+        # ```
+        def visit_alias_method_node(node)
+          s(node, :alias, visit(node.new_name), visit(node.old_name))
+        end
+
+        # ```
+        # alias $foo $bar
+        # ^^^^^^^^^^^^^^^
+        # ```
+        def visit_alias_global_variable_node(node)
+          s(node, :valias, node.new_name.name, node.old_name.name)
+        end
+
+        # ```
+        # foo => bar | baz
+        #        ^^^^^^^^^
+        # ```
+        def visit_alternation_pattern_node(node)
+          s(node, :or, visit(node.left), visit(node.right))
+        end
+
+        # ```
+        # a and b
+        # ^^^^^^^
+        # ```
+        def visit_and_node(node)
+          left = visit(node.left)
+
+          if left[0] == :and
+            # ruby_parser has the and keyword as right-associative as opposed to
+            # prism which has it as left-associative. We reverse that
+            # associativity here.
+            nest = left
+            nest = nest[2] while nest[2][0] == :and
+            nest[2] = s(node, :and, nest[2], visit(node.right))
+            left
+          else
+            s(node, :and, left, visit(node.right))
+          end
+        end
+
+        # ```
+        # []
+        # ^^
+        # ```
+        def visit_array_node(node)
+          if in_pattern
+            s(node, :array_pat, nil).concat(visit_all(node.elements))
+          else
+            s(node, :array).concat(visit_all(node.elements))
+          end
+        end
+
+        # ```
+        # foo => [bar]
+        #        ^^^^^
+        # ```
+        def visit_array_pattern_node(node)
+          if node.constant.nil? && node.requireds.empty? && node.rest.nil? && node.posts.empty?
+            s(node, :array_pat)
+          else
+            result = s(node, :array_pat, visit_pattern_constant(node.constant)).concat(visit_all(node.requireds))
+
+            case node.rest
+            when SplatNode
+              result << :"*#{node.rest.expression&.name}"
+            when ImplicitRestNode
+              result << :*
+
+              # This doesn't make any sense at all, but since we're trying to
+              # replicate the behavior directly, we'll copy it.
+              result.line(666)
+            end
+
+            result.concat(visit_all(node.posts))
+          end
+        end
+
+        # ```
+        # foo(bar)
+        #     ^^^
+        # ```
+        def visit_arguments_node(node)
+          raise "Cannot visit arguments directly"
+        end
+
+        # ```
+        # { a: 1 }
+        #   ^^^^
+        # ```
+        def visit_assoc_node(node)
+          [visit(node.key), visit(node.value)]
+        end
+
+        # ```
+        # def foo(**); bar(**); end
+        #                  ^^
+        #
+        # { **foo }
+        #   ^^^^^
+        # ```
+        def visit_assoc_splat_node(node)
+          if node.value.nil?
+            [s(node, :kwsplat)]
+          else
+            [s(node, :kwsplat, visit(node.value))]
+          end
+        end
+
+        # ```
+        # $+
+        # ^^
+        # ```
+        def visit_back_reference_read_node(node)
+          s(node, :back_ref, node.name.name.delete_prefix("$").to_sym)
+        end
+
+        # ```
+        # begin end
+        # ^^^^^^^^^
+        # ```
+        def visit_begin_node(node)
+          result = node.statements.nil? ? s(node, :nil) : visit(node.statements)
+
+          if !node.rescue_clause.nil?
+            if !node.statements.nil?
+              result = s(node.statements, :rescue, result, visit(node.rescue_clause))
+            else
+              result = s(node.rescue_clause, :rescue, visit(node.rescue_clause))
+            end
+
+            current = node.rescue_clause
+            until (current = current.subsequent).nil?
+              result << visit(current)
+            end
+          end
+
+          if !node.else_clause&.statements.nil?
+            result << visit(node.else_clause)
+          end
+
+          if !node.ensure_clause.nil?
+            if !node.statements.nil? || !node.rescue_clause.nil? || !node.else_clause.nil?
+              result = s(node.statements || node.rescue_clause || node.else_clause || node.ensure_clause, :ensure, result, visit(node.ensure_clause))
+            else
+              result = s(node.ensure_clause, :ensure, visit(node.ensure_clause))
+            end
+          end
+
+          result
+        end
+
+        # ```
+        # foo(&bar)
+        #     ^^^^
+        # ```
+        def visit_block_argument_node(node)
+          s(node, :block_pass).tap do |result|
+            result << visit(node.expression) unless node.expression.nil?
+          end
+        end
+
+        # ```
+        # foo { |; bar| }
+        #          ^^^
+        # ```
+        def visit_block_local_variable_node(node)
+          node.name
+        end
+
+        # A block on a keyword or method call.
+        def visit_block_node(node)
+          s(node, :block_pass, visit(node.expression))
+        end
+
+        # ```
+        # def foo(&bar); end
+        #         ^^^^
+        # ```
+        def visit_block_parameter_node(node)
+          :"&#{node.name}"
+        end
+
+        # A block's parameters.
+        def visit_block_parameters_node(node)
+          # If this block parameters has no parameters and is using pipes, then
+          # it inherits its location from its shadow locals, even if they're not
+          # on the same lines as the pipes.
+          shadow_loc = true
+
+          result =
+            if node.parameters.nil?
+              s(node, :args)
+            else
+              shadow_loc = false
+              visit(node.parameters)
+            end
+
+          if node.opening == "("
+            result.line = node.opening_loc.start_line
+            result.line_max = node.closing_loc.end_line
+            shadow_loc = false
+          end
+
+          if node.locals.any?
+            shadow = s(node, :shadow).concat(visit_all(node.locals))
+            shadow.line = node.locals.first.location.start_line
+            shadow.line_max = node.locals.last.location.end_line
+            result << shadow
+
+            if shadow_loc
+              result.line = shadow.line
+              result.line_max = shadow.line_max
+            end
+          end
+
+          result
+        end
+
+        # ```
+        # break
+        # ^^^^^
+        #
+        # break foo
+        # ^^^^^^^^^
+        # ```
+        def visit_break_node(node)
+          if node.arguments.nil?
+            s(node, :break)
+          elsif node.arguments.arguments.length == 1
+            s(node, :break, visit(node.arguments.arguments.first))
+          else
+            s(node, :break, s(node.arguments, :array).concat(visit_all(node.arguments.arguments)))
+          end
+        end
+
+        # ```
+        # foo
+        # ^^^
+        #
+        # foo.bar
+        # ^^^^^^^
+        #
+        # foo.bar() {}
+        # ^^^^^^^^^^^^
+        # ```
+        def visit_call_node(node)
+          case node.name
+          when :!~
+            return s(node, :not, visit(node.copy(name: :"=~")))
+          when :=~
+            if node.arguments&.arguments&.length == 1 && node.block.nil?
+              case node.receiver
+              when StringNode
+                return s(node, :match3, visit(node.arguments.arguments.first), visit(node.receiver))
+              when RegularExpressionNode, InterpolatedRegularExpressionNode
+                return s(node, :match2, visit(node.receiver), visit(node.arguments.arguments.first))
+              end
+
+              case node.arguments.arguments.first
+              when RegularExpressionNode, InterpolatedRegularExpressionNode
+                return s(node, :match3, visit(node.arguments.arguments.first), visit(node.receiver))
+              end
+            end
+          end
+
+          type = node.attribute_write? ? :attrasgn : :call
+          type = :"safe_#{type}" if node.safe_navigation?
+
+          arguments = node.arguments&.arguments || []
+          write_value = arguments.pop if type == :attrasgn
+          block = node.block
+
+          if block.is_a?(BlockArgumentNode)
+            arguments << block
+            block = nil
+          end
+
+          result = s(node, type, visit(node.receiver), node.name).concat(visit_all(arguments))
+          result << visit_write_value(write_value) unless write_value.nil?
+
+          visit_block(node, result, block)
+        end
+
+        # ```
+        # foo.bar += baz
+        # ^^^^^^^^^^^^^^^
+        # ```
+        def visit_call_operator_write_node(node)
+          if op_asgn?(node)
+            s(node, op_asgn_type(node, :op_asgn), visit(node.receiver), visit_write_value(node.value), node.read_name, node.binary_operator)
+          else
+            s(node, op_asgn_type(node, :op_asgn2), visit(node.receiver), node.write_name, node.binary_operator, visit_write_value(node.value))
+          end
+        end
+
+        # ```
+        # foo.bar &&= baz
+        # ^^^^^^^^^^^^^^^
+        # ```
+        def visit_call_and_write_node(node)
+          if op_asgn?(node)
+            s(node, op_asgn_type(node, :op_asgn), visit(node.receiver), visit_write_value(node.value), node.read_name, :"&&")
+          else
+            s(node, op_asgn_type(node, :op_asgn2), visit(node.receiver), node.write_name, :"&&", visit_write_value(node.value))
+          end
+        end
+
+        # ```
+        # foo.bar ||= baz
+        # ^^^^^^^^^^^^^^^
+        # ```
+        def visit_call_or_write_node(node)
+          if op_asgn?(node)
+            s(node, op_asgn_type(node, :op_asgn), visit(node.receiver), visit_write_value(node.value), node.read_name, :"||")
+          else
+            s(node, op_asgn_type(node, :op_asgn2), visit(node.receiver), node.write_name, :"||", visit_write_value(node.value))
+          end
+        end
+
+        # Call nodes with operators following them will either be op_asgn or
+        # op_asgn2 nodes. That is determined by their call operator and their
+        # right-hand side.
+        private def op_asgn?(node)
+          node.call_operator == "::" || (node.value.is_a?(CallNode) && node.value.opening_loc.nil? && !node.value.arguments.nil?)
+        end
+
+        # Call nodes with operators following them can use &. as an operator,
+        # which changes their type by prefixing "safe_".
+        private def op_asgn_type(node, type)
+          node.safe_navigation? ? :"safe_#{type}" : type
+        end
+
+        # ```
+        # foo.bar, = 1
+        # ^^^^^^^
+        # ```
+        def visit_call_target_node(node)
+          s(node, :attrasgn, visit(node.receiver), node.name)
+        end
+
+        # ```
+        # foo => bar => baz
+        #        ^^^^^^^^^^
+        # ```
+        def visit_capture_pattern_node(node)
+          visit(node.target) << visit(node.value)
+        end
+
+        # ```
+        # case foo; when bar; end
+        # ^^^^^^^^^^^^^^^^^^^^^^^
+        # ```
+        def visit_case_node(node)
+          s(node, :case, visit(node.predicate)).concat(visit_all(node.conditions)) << visit(node.else_clause)
+        end
+
+        # ```
+        # case foo; in bar; end
+        # ^^^^^^^^^^^^^^^^^^^^^
+        # ```
+        def visit_case_match_node(node)
+          s(node, :case, visit(node.predicate)).concat(visit_all(node.conditions)) << visit(node.else_clause)
+        end
+
+        # ```
+        # class Foo; end
+        # ^^^^^^^^^^^^^^
+        # ```
+        def visit_class_node(node)
+          name =
+            if node.constant_path.is_a?(ConstantReadNode)
+              node.name
+            else
+              visit(node.constant_path)
+            end
+
+          if node.body.nil?
+            s(node, :class, name, visit(node.superclass))
+          elsif node.body.is_a?(StatementsNode)
+            compiler = copy_compiler(in_def: false)
+            s(node, :class, name, visit(node.superclass)).concat(node.body.body.map { |child| child.accept(compiler) })
+          else
+            s(node, :class, name, visit(node.superclass), node.body.accept(copy_compiler(in_def: false)))
+          end
+        end
+
+        # ```
+        # @@foo
+        # ^^^^^
+        # ```
+        def visit_class_variable_read_node(node)
+          s(node, :cvar, node.name)
+        end
+
+        # ```
+        # @@foo = 1
+        # ^^^^^^^^^
+        #
+        # @@foo, @@bar = 1
+        # ^^^^^  ^^^^^
+        # ```
+        def visit_class_variable_write_node(node)
+          s(node, class_variable_write_type, node.name, visit_write_value(node.value))
+        end
+
+        # ```
+        # @@foo += bar
+        # ^^^^^^^^^^^^
+        # ```
+        def visit_class_variable_operator_write_node(node)
+          s(node, class_variable_write_type, node.name, s(node, :call, s(node, :cvar, node.name), node.binary_operator, visit_write_value(node.value)))
+        end
+
+        # ```
+        # @@foo &&= bar
+        # ^^^^^^^^^^^^^
+        # ```
+        def visit_class_variable_and_write_node(node)
+          s(node, :op_asgn_and, s(node, :cvar, node.name), s(node, class_variable_write_type, node.name, visit_write_value(node.value)))
+        end
+
+        # ```
+        # @@foo ||= bar
+        # ^^^^^^^^^^^^^
+        # ```
+        def visit_class_variable_or_write_node(node)
+          s(node, :op_asgn_or, s(node, :cvar, node.name), s(node, class_variable_write_type, node.name, visit_write_value(node.value)))
+        end
+
+        # ```
+        # @@foo, = bar
+        # ^^^^^
+        # ```
+        def visit_class_variable_target_node(node)
+          s(node, class_variable_write_type, node.name)
+        end
+
+        # If a class variable is written within a method definition, it has a
+        # different type than everywhere else.
+        private def class_variable_write_type
+          in_def ? :cvasgn : :cvdecl
+        end
+
+        # ```
+        # Foo
+        # ^^^
+        # ```
+        def visit_constant_read_node(node)
+          s(node, :const, node.name)
+        end
+
+        # ```
+        # Foo = 1
+        # ^^^^^^^
+        #
+        # Foo, Bar = 1
+        # ^^^  ^^^
+        # ```
+        def visit_constant_write_node(node)
+          s(node, :cdecl, node.name, visit_write_value(node.value))
+        end
+
+        # ```
+        # Foo += bar
+        # ^^^^^^^^^^^
+        # ```
+        def visit_constant_operator_write_node(node)
+          s(node, :cdecl, node.name, s(node, :call, s(node, :const, node.name), node.binary_operator, visit_write_value(node.value)))
+        end
+
+        # ```
+        # Foo &&= bar
+        # ^^^^^^^^^^^^
+        # ```
+        def visit_constant_and_write_node(node)
+          s(node, :op_asgn_and, s(node, :const, node.name), s(node, :cdecl, node.name, visit(node.value)))
+        end
+
+        # ```
+        # Foo ||= bar
+        # ^^^^^^^^^^^^
+        # ```
+        def visit_constant_or_write_node(node)
+          s(node, :op_asgn_or, s(node, :const, node.name), s(node, :cdecl, node.name, visit(node.value)))
+        end
+
+        # ```
+        # Foo, = bar
+        # ^^^
+        # ```
+        def visit_constant_target_node(node)
+          s(node, :cdecl, node.name)
+        end
+
+        # ```
+        # Foo::Bar
+        # ^^^^^^^^
+        # ```
+        def visit_constant_path_node(node)
+          if node.parent.nil?
+            s(node, :colon3, node.name)
+          else
+            s(node, :colon2, visit(node.parent), node.name)
+          end
+        end
+
+        # ```
+        # Foo::Bar = 1
+        # ^^^^^^^^^^^^
+        #
+        # Foo::Foo, Bar::Bar = 1
+        # ^^^^^^^^  ^^^^^^^^
+        # ```
+        def visit_constant_path_write_node(node)
+          s(node, :cdecl, visit(node.target), visit_write_value(node.value))
+        end
+
+        # ```
+        # Foo::Bar += baz
+        # ^^^^^^^^^^^^^^^
+        # ```
+        def visit_constant_path_operator_write_node(node)
+          s(node, :op_asgn, visit(node.target), node.binary_operator, visit_write_value(node.value))
+        end
+
+        # ```
+        # Foo::Bar &&= baz
+        # ^^^^^^^^^^^^^^^^
+        # ```
+        def visit_constant_path_and_write_node(node)
+          s(node, :op_asgn_and, visit(node.target), visit_write_value(node.value))
+        end
+
+        # ```
+        # Foo::Bar ||= baz
+        # ^^^^^^^^^^^^^^^^
+        # ```
+        def visit_constant_path_or_write_node(node)
+          s(node, :op_asgn_or, visit(node.target), visit_write_value(node.value))
+        end
+
+        # ```
+        # Foo::Bar, = baz
+        # ^^^^^^^^
+        # ```
+        def visit_constant_path_target_node(node)
+          inner =
+            if node.parent.nil?
+              s(node, :colon3, node.name)
+            else
+              s(node, :colon2, visit(node.parent), node.name)
+            end
+
+          s(node, :const, inner)
+        end
+
+        # ```
+        # def foo; end
+        # ^^^^^^^^^^^^
+        #
+        # def self.foo; end
+        # ^^^^^^^^^^^^^^^^^
+        # ```
+        def visit_def_node(node)
+          name = node.name_loc.slice.to_sym
+          result =
+            if node.receiver.nil?
+              s(node, :defn, name)
+            else
+              s(node, :defs, visit(node.receiver), name)
+            end
+
+          result.line(node.name_loc.start_line)
+          if node.parameters.nil?
+            result << s(node, :args).line(node.name_loc.start_line)
+          else
+            result << visit(node.parameters)
+          end
+
+          if node.body.nil?
+            result << s(node, :nil)
+          elsif node.body.is_a?(StatementsNode)
+            compiler = copy_compiler(in_def: true)
+            result.concat(node.body.body.map { |child| child.accept(compiler) })
+          else
+            result << node.body.accept(copy_compiler(in_def: true))
+          end
+        end
+
+        # ```
+        # defined? a
+        # ^^^^^^^^^^
+        #
+        # defined?(a)
+        # ^^^^^^^^^^^
+        # ```
+        def visit_defined_node(node)
+          s(node, :defined, visit(node.value))
+        end
+
+        # ```
+        # if foo then bar else baz end
+        #                 ^^^^^^^^^^^^
+        # ```
+        def visit_else_node(node)
+          visit(node.statements)
+        end
+
+        # ```
+        # "foo #{bar}"
+        #      ^^^^^^
+        # ```
+        def visit_embedded_statements_node(node)
+          result = s(node, :evstr)
+          result << visit(node.statements) unless node.statements.nil?
+          result
+        end
+
+        # ```
+        # "foo #@bar"
+        #      ^^^^^
+        # ```
+        def visit_embedded_variable_node(node)
+          s(node, :evstr, visit(node.variable))
+        end
+
+        # ```
+        # begin; foo; ensure; bar; end
+        #             ^^^^^^^^^^^^
+        # ```
+        def visit_ensure_node(node)
+          node.statements.nil? ? s(node, :nil) : visit(node.statements)
+        end
+
+        # ```
+        # false
+        # ^^^^^
+        # ```
+        def visit_false_node(node)
+          s(node, :false)
+        end
+
+        # ```
+        # foo => [*, bar, *]
+        #        ^^^^^^^^^^^
+        # ```
+        def visit_find_pattern_node(node)
+          s(node, :find_pat, visit_pattern_constant(node.constant), :"*#{node.left.expression&.name}", *visit_all(node.requireds), :"*#{node.right.expression&.name}")
+        end
+
+        # ```
+        # if foo .. bar; end
+        #    ^^^^^^^^^^
+        # ```
+        def visit_flip_flop_node(node)
+          if node.left.is_a?(IntegerNode) && node.right.is_a?(IntegerNode)
+            s(node, :lit, Range.new(node.left.value, node.right.value, node.exclude_end?))
+          else
+            s(node, node.exclude_end? ? :flip3 : :flip2, visit(node.left), visit(node.right))
+          end
+        end
+
+        # ```
+        # 1.0
+        # ^^^
+        # ```
+        def visit_float_node(node)
+          s(node, :lit, node.value)
+        end
+
+        # ```
+        # for foo in bar do end
+        # ^^^^^^^^^^^^^^^^^^^^^
+        # ```
+        def visit_for_node(node)
+          s(node, :for, visit(node.collection), visit(node.index), visit(node.statements))
+        end
+
+        # ```
+        # def foo(...); bar(...); end
+        #                   ^^^
+        # ```
+        def visit_forwarding_arguments_node(node)
+          s(node, :forward_args)
+        end
+
+        # ```
+        # def foo(...); end
+        #         ^^^
+        # ```
+        def visit_forwarding_parameter_node(node)
+          s(node, :forward_args)
+        end
+
+        # ```
+        # super
+        # ^^^^^
+        #
+        # super {}
+        # ^^^^^^^^
+        # ```
+        def visit_forwarding_super_node(node)
+          visit_block(node, s(node, :zsuper), node.block)
+        end
+
+        # ```
+        # $foo
+        # ^^^^
+        # ```
+        def visit_global_variable_read_node(node)
+          s(node, :gvar, node.name)
+        end
+
+        # ```
+        # $foo = 1
+        # ^^^^^^^^
+        #
+        # $foo, $bar = 1
+        # ^^^^  ^^^^
+        # ```
+        def visit_global_variable_write_node(node)
+          s(node, :gasgn, node.name, visit_write_value(node.value))
+        end
+
+        # ```
+        # $foo += bar
+        # ^^^^^^^^^^^
+        # ```
+        def visit_global_variable_operator_write_node(node)
+          s(node, :gasgn, node.name, s(node, :call, s(node, :gvar, node.name), node.binary_operator, visit(node.value)))
+        end
+
+        # ```
+        # $foo &&= bar
+        # ^^^^^^^^^^^^
+        # ```
+        def visit_global_variable_and_write_node(node)
+          s(node, :op_asgn_and, s(node, :gvar, node.name), s(node, :gasgn, node.name, visit_write_value(node.value)))
+        end
+
+        # ```
+        # $foo ||= bar
+        # ^^^^^^^^^^^^
+        # ```
+        def visit_global_variable_or_write_node(node)
+          s(node, :op_asgn_or, s(node, :gvar, node.name), s(node, :gasgn, node.name, visit_write_value(node.value)))
+        end
+
+        # ```
+        # $foo, = bar
+        # ^^^^
+        # ```
+        def visit_global_variable_target_node(node)
+          s(node, :gasgn, node.name)
+        end
+
+        # ```
+        # {}
+        # ^^
+        # ```
+        def visit_hash_node(node)
+          s(node, :hash).concat(node.elements.flat_map { |element| visit(element) })
+        end
+
+        # ```
+        # foo => {}
+        #        ^^
+        # ```
+        def visit_hash_pattern_node(node)
+          result = s(node, :hash_pat, visit_pattern_constant(node.constant)).concat(node.elements.flat_map { |element| visit(element) })
+
+          case node.rest
+          when AssocSplatNode
+            result << s(node.rest, :kwrest, :"**#{node.rest.value&.name}")
+          when NoKeywordsParameterNode
+            result << visit(node.rest)
+          end
+
+          result
+        end
+
+        # ```
+        # if foo then bar end
+        # ^^^^^^^^^^^^^^^^^^^
+        #
+        # bar if foo
+        # ^^^^^^^^^^
+        #
+        # foo ? bar : baz
+        # ^^^^^^^^^^^^^^^
+        # ```
+        def visit_if_node(node)
+          s(node, :if, visit(node.predicate), visit(node.statements), visit(node.subsequent))
+        end
+
+        # 1i
+        def visit_imaginary_node(node)
+          s(node, :lit, node.value)
+        end
+
+        # ```
+        # { foo: }
+        #   ^^^^
+        # ```
+        def visit_implicit_node(node)
+        end
+
+        # ```
+        # foo { |bar,| }
+        #           ^
+        # ```
+        def visit_implicit_rest_node(node)
+        end
+
+        # ```
+        # case foo; in bar; end
+        # ^^^^^^^^^^^^^^^^^^^^^
+        # ```
+        def visit_in_node(node)
+          pattern =
+            if node.pattern.is_a?(ConstantPathNode)
+              s(node.pattern, :const, visit(node.pattern))
+            else
+              node.pattern.accept(copy_compiler(in_pattern: true))
+            end
+
+          s(node, :in, pattern).concat(node.statements.nil? ? [nil] : visit_all(node.statements.body))
+        end
+
+        # ```
+        # foo[bar] += baz
+        # ^^^^^^^^^^^^^^^
+        # ```
+        def visit_index_operator_write_node(node)
+          arglist = nil
+
+          if !node.arguments.nil? || !node.block.nil?
+            arglist = s(node, :arglist).concat(visit_all(node.arguments&.arguments || []))
+            arglist << visit(node.block) if !node.block.nil?
+          end
+
+          s(node, :op_asgn1, visit(node.receiver), arglist, node.binary_operator, visit_write_value(node.value))
+        end
+
+        # ```
+        # foo[bar] &&= baz
+        # ^^^^^^^^^^^^^^^^
+        # ```
+        def visit_index_and_write_node(node)
+          arglist = nil
+
+          if !node.arguments.nil? || !node.block.nil?
+            arglist = s(node, :arglist).concat(visit_all(node.arguments&.arguments || []))
+            arglist << visit(node.block) if !node.block.nil?
+          end
+
+          s(node, :op_asgn1, visit(node.receiver), arglist, :"&&", visit_write_value(node.value))
+        end
+
+        # ```
+        # foo[bar] ||= baz
+        # ^^^^^^^^^^^^^^^^
+        # ```
+        def visit_index_or_write_node(node)
+          arglist = nil
+
+          if !node.arguments.nil? || !node.block.nil?
+            arglist = s(node, :arglist).concat(visit_all(node.arguments&.arguments || []))
+            arglist << visit(node.block) if !node.block.nil?
+          end
+
+          s(node, :op_asgn1, visit(node.receiver), arglist, :"||", visit_write_value(node.value))
+        end
+
+        # ```
+        # foo[bar], = 1
+        # ^^^^^^^^
+        # ```
+        def visit_index_target_node(node)
+          arguments = visit_all(node.arguments&.arguments || [])
+          arguments << visit(node.block) unless node.block.nil?
+
+          s(node, :attrasgn, visit(node.receiver), :[]=).concat(arguments)
+        end
+
+        # ```
+        # @foo
+        # ^^^^
+        # ```
+        def visit_instance_variable_read_node(node)
+          s(node, :ivar, node.name)
+        end
+
+        # ```
+        # @foo = 1
+        # ^^^^^^^^
+        #
+        # @foo, @bar = 1
+        # ^^^^  ^^^^
+        # ```
+        def visit_instance_variable_write_node(node)
+          s(node, :iasgn, node.name, visit_write_value(node.value))
+        end
+
+        # ```
+        # @foo += bar
+        # ^^^^^^^^^^^
+        # ```
+        def visit_instance_variable_operator_write_node(node)
+          s(node, :iasgn, node.name, s(node, :call, s(node, :ivar, node.name), node.binary_operator, visit_write_value(node.value)))
+        end
+
+        # ```
+        # @foo &&= bar
+        # ^^^^^^^^^^^^
+        # ```
+        def visit_instance_variable_and_write_node(node)
+          s(node, :op_asgn_and, s(node, :ivar, node.name), s(node, :iasgn, node.name, visit(node.value)))
+        end
+
+        # ```
+        # @foo ||= bar
+        # ^^^^^^^^^^^^
+        # ```
+        def visit_instance_variable_or_write_node(node)
+          s(node, :op_asgn_or, s(node, :ivar, node.name), s(node, :iasgn, node.name, visit(node.value)))
+        end
+
+        # ```
+        # @foo, = bar
+        # ^^^^
+        # ```
+        def visit_instance_variable_target_node(node)
+          s(node, :iasgn, node.name)
+        end
+
+        # ```
+        # 1
+        # ^
+        # ```
+        def visit_integer_node(node)
+          s(node, :lit, node.value)
+        end
+
+        # ```
+        # if /foo #{bar}/ then end
+        #    ^^^^^^^^^^^^
+        # ```
+        def visit_interpolated_match_last_line_node(node)
+          parts = visit_interpolated_parts(node.parts)
+          regexp =
+            if parts.length == 1
+              s(node, :lit, Regexp.new(parts.first, node.options))
+            else
+              s(node, :dregx).concat(parts).tap do |result|
+                options = node.options
+                result << options if options != 0
+              end
+            end
+
+          s(node, :match, regexp)
+        end
+
+        # ```
+        # /foo #{bar}/
+        # ^^^^^^^^^^^^
+        # ```
+        def visit_interpolated_regular_expression_node(node)
+          parts = visit_interpolated_parts(node.parts)
+
+          if parts.length == 1
+            s(node, :lit, Regexp.new(parts.first, node.options))
+          else
+            s(node, :dregx).concat(parts).tap do |result|
+              options = node.options
+              result << options if options != 0
+            end
+          end
+        end
+
+        # ```
+        # "foo #{bar}"
+        # ^^^^^^^^^^^^
+        # ```
+        def visit_interpolated_string_node(node)
+          parts = visit_interpolated_parts(node.parts)
+          parts.length == 1 ? s(node, :str, parts.first) : s(node, :dstr).concat(parts)
+        end
+
+        # ```
+        # :"foo #{bar}"
+        # ^^^^^^^^^^^^^
+        # ```
+        def visit_interpolated_symbol_node(node)
+          parts = visit_interpolated_parts(node.parts)
+          parts.length == 1 ? s(node, :lit, parts.first.to_sym) : s(node, :dsym).concat(parts)
+        end
+
+        # ```
+        # `foo #{bar}`
+        # ^^^^^^^^^^^^
+        # ```
+        def visit_interpolated_x_string_node(node)
+          source = node.heredoc? ? node.parts.first : node
+          parts = visit_interpolated_parts(node.parts)
+          parts.length == 1 ? s(source, :xstr, parts.first) : s(source, :dxstr).concat(parts)
+        end
+
+        # Visit the interpolated content of the string-like node.
+        private def visit_interpolated_parts(parts)
+          visited = []
+
+          parts.each do |part|
+            result = visit(part)
+
+            if result[0] == :evstr && result[1]
+              if result[1][0] == :str
+                visited << result[1]
+              elsif result[1][0] == :dstr
+                visited.concat(result[1][1..-1])
+              else
+                visited << result
+              end
+              visited << :space
+            elsif result[0] == :dstr
+              if !visited.empty? && part.parts[0].is_a?(StringNode)
+                # If we are in the middle of an implicitly concatenated string,
+                # we should not have a bare string as the first part. In this
+                # case we need to visit just that first part and then we can
+                # push the rest of the parts onto the visited array.
+                result[1] = visit(part.parts[0])
+              end
+              visited.concat(result[1..-1])
+            else
+              visited << result
+            end
+          end
+
+          state = :beginning #: :beginning | :string_content | :interpolated_content
+          results = []
+
+          visited.each_with_index do |result, index|
+            case state
+            when :beginning
+              if result.is_a?(String)
+                results << result
+                state = :string_content
+              elsif result.is_a?(Array) && result[0] == :str
+                results << result[1]
+                state = :string_content
+              else
+                results << ""
+                results << result
+                state = :interpolated_content
+              end
+            when :string_content
+              if result == :space
+                # continue
+              elsif result.is_a?(String)
+                results[0] = "#{results[0]}#{result}"
+              elsif result.is_a?(Array) && result[0] == :str
+                results[0] = "#{results[0]}#{result[1]}"
+              else
+                results << result
+                state = :interpolated_content
+              end
+            when :interpolated_content
+              if result == :space
+                # continue
+              elsif visited[index - 1] != :space && result.is_a?(Array) && result[0] == :str && results[-1][0] == :str && (results[-1].line_max == result.line)
+                results[-1][1] = "#{results[-1][1]}#{result[1]}"
+                results[-1].line_max = result.line_max
+              else
+                results << result
+              end
+            end
+          end
+
+          results
+        end
+
+        # ```
+        # -> { it }
+        #      ^^
+        # ```
+        def visit_it_local_variable_read_node(node)
+          s(node, :call, nil, :it)
+        end
+
+        # ```
+        # foo(bar: baz)
+        #     ^^^^^^^^
+        # ```
+        def visit_keyword_hash_node(node)
+          s(node, :hash).concat(node.elements.flat_map { |element| visit(element) })
+        end
+
+        # ```
+        # def foo(**bar); end
+        #         ^^^^^
+        #
+        # def foo(**); end
+        #         ^^
+        # ```
+        def visit_keyword_rest_parameter_node(node)
+          :"**#{node.name}"
+        end
+
+        # -> {}
+        def visit_lambda_node(node)
+          parameters =
+            case node.parameters
+            when nil, NumberedParametersNode
+              s(node, :args)
+            else
+              visit(node.parameters)
+            end
+
+          if node.body.nil?
+            s(node, :iter, s(node, :lambda), parameters)
+          else
+            s(node, :iter, s(node, :lambda), parameters, visit(node.body))
+          end
+        end
+
+        # ```
+        # foo
+        # ^^^
+        # ```
+        def visit_local_variable_read_node(node)
+          if node.name.match?(/^_\d$/)
+            s(node, :call, nil, node.name)
+          else
+            s(node, :lvar, node.name)
+          end
+        end
+
+        # ```
+        # foo = 1
+        # ^^^^^^^
+        #
+        # foo, bar = 1
+        # ^^^  ^^^
+        # ```
+        def visit_local_variable_write_node(node)
+          s(node, :lasgn, node.name, visit_write_value(node.value))
+        end
+
+        # ```
+        # foo += bar
+        # ^^^^^^^^^^
+        # ```
+        def visit_local_variable_operator_write_node(node)
+          s(node, :lasgn, node.name, s(node, :call, s(node, :lvar, node.name), node.binary_operator, visit_write_value(node.value)))
+        end
+
+        # ```
+        # foo &&= bar
+        # ^^^^^^^^^^^
+        # ```
+        def visit_local_variable_and_write_node(node)
+          s(node, :op_asgn_and, s(node, :lvar, node.name), s(node, :lasgn, node.name, visit_write_value(node.value)))
+        end
+
+        # ```
+        # foo ||= bar
+        # ^^^^^^^^^^^
+        # ```
+        def visit_local_variable_or_write_node(node)
+          s(node, :op_asgn_or, s(node, :lvar, node.name), s(node, :lasgn, node.name, visit_write_value(node.value)))
+        end
+
+        # ```
+        # foo, = bar
+        # ^^^
+        # ```
+        def visit_local_variable_target_node(node)
+          s(node, :lasgn, node.name)
+        end
+
+        # ```
+        # if /foo/ then end
+        #    ^^^^^
+        # ```
+        def visit_match_last_line_node(node)
+          s(node, :match, s(node, :lit, Regexp.new(node.unescaped, node.options)))
+        end
+
+        # ```
+        # foo in bar
+        # ^^^^^^^^^^
+        # ```
+        def visit_match_predicate_node(node)
+          s(node, :case, visit(node.value), s(node, :in, node.pattern.accept(copy_compiler(in_pattern: true)), nil), nil)
+        end
+
+        # ```
+        # foo => bar
+        # ^^^^^^^^^^
+        # ```
+        def visit_match_required_node(node)
+          s(node, :case, visit(node.value), s(node, :in, node.pattern.accept(copy_compiler(in_pattern: true)), nil), nil)
+        end
+
+        # ```
+        # /(?<foo>foo)/ =~ bar
+        # ^^^^^^^^^^^^^^^^^^^^
+        # ```
+        def visit_match_write_node(node)
+          s(node, :match2, visit(node.call.receiver), visit(node.call.arguments.arguments.first))
+        end
+
+        # A node that is missing from the syntax tree. This is only used in the
+        # case of a syntax error. The parser gem doesn't have such a concept, so
+        # we invent our own here.
+        def visit_missing_node(node)
+          raise "Cannot visit missing node directly"
+        end
+
+        # ```
+        # module Foo; end
+        # ^^^^^^^^^^^^^^^
+        # ```
+        def visit_module_node(node)
+          name =
+            if node.constant_path.is_a?(ConstantReadNode)
+              node.name
+            else
+              visit(node.constant_path)
+            end
+
+          if node.body.nil?
+            s(node, :module, name)
+          elsif node.body.is_a?(StatementsNode)
+            compiler = copy_compiler(in_def: false)
+            s(node, :module, name).concat(node.body.body.map { |child| child.accept(compiler) })
+          else
+            s(node, :module, name, node.body.accept(copy_compiler(in_def: false)))
+          end
+        end
+
+        # ```
+        # foo, bar = baz
+        # ^^^^^^^^
+        # ```
+        def visit_multi_target_node(node)
+          targets = [*node.lefts]
+          targets << node.rest if !node.rest.nil? && !node.rest.is_a?(ImplicitRestNode)
+          targets.concat(node.rights)
+
+          s(node, :masgn, s(node, :array).concat(visit_all(targets)))
+        end
+
+        # ```
+        # foo, bar = baz
+        # ^^^^^^^^^^^^^^
+        # ```
+        def visit_multi_write_node(node)
+          targets = [*node.lefts]
+          targets << node.rest if !node.rest.nil? && !node.rest.is_a?(ImplicitRestNode)
+          targets.concat(node.rights)
+
+          value =
+            if node.value.is_a?(ArrayNode) && node.value.opening_loc.nil?
+              if node.value.elements.length == 1 && node.value.elements.first.is_a?(SplatNode)
+                visit(node.value.elements.first)
+              else
+                visit(node.value)
+              end
+            else
+              s(node.value, :to_ary, visit(node.value))
+            end
+
+          s(node, :masgn, s(node, :array).concat(visit_all(targets)), value)
+        end
+
+        # ```
+        # next
+        # ^^^^
+        #
+        # next foo
+        # ^^^^^^^^
+        # ```
+        def visit_next_node(node)
+          if node.arguments.nil?
+            s(node, :next)
+          elsif node.arguments.arguments.length == 1
+            argument = node.arguments.arguments.first
+            s(node, :next, argument.is_a?(SplatNode) ? s(node, :svalue, visit(argument)) : visit(argument))
+          else
+            s(node, :next, s(node, :array).concat(visit_all(node.arguments.arguments)))
+          end
+        end
+
+        # ```
+        # nil
+        # ^^^
+        # ```
+        def visit_nil_node(node)
+          s(node, :nil)
+        end
+
+        # ```
+        # def foo(**nil); end
+        #         ^^^^^
+        # ```
+        def visit_no_keywords_parameter_node(node)
+          in_pattern ? s(node, :kwrest, :"**nil") : :"**nil"
+        end
+
+        # ```
+        # -> { _1 + _2 }
+        # ^^^^^^^^^^^^^^
+        # ```
+        def visit_numbered_parameters_node(node)
+          raise "Cannot visit numbered parameters directly"
+        end
+
+        # ```
+        # $1
+        # ^^
+        # ```
+        def visit_numbered_reference_read_node(node)
+          s(node, :nth_ref, node.number)
+        end
+
+        # ```
+        # def foo(bar: baz); end
+        #         ^^^^^^^^
+        # ```
+        def visit_optional_keyword_parameter_node(node)
+          s(node, :kwarg, node.name, visit(node.value))
+        end
+
+        # ```
+        # def foo(bar = 1); end
+        #         ^^^^^^^
+        # ```
+        def visit_optional_parameter_node(node)
+          s(node, :lasgn, node.name, visit(node.value))
+        end
+
+        # ```
+        # a or b
+        # ^^^^^^
+        # ```
+        def visit_or_node(node)
+          left = visit(node.left)
+
+          if left[0] == :or
+            # ruby_parser has the or keyword as right-associative as opposed to
+            # prism which has it as left-associative. We reverse that
+            # associativity here.
+            nest = left
+            nest = nest[2] while nest[2][0] == :or
+            nest[2] = s(node, :or, nest[2], visit(node.right))
+            left
+          else
+            s(node, :or, left, visit(node.right))
+          end
+        end
+
+        # ```
+        # def foo(bar, *baz); end
+        #         ^^^^^^^^^
+        # ```
+        def visit_parameters_node(node)
+          children =
+            node.compact_child_nodes.map do |element|
+              if element.is_a?(MultiTargetNode)
+                visit_destructured_parameter(element)
+              else
+                visit(element)
+              end
+            end
+
+          s(node, :args).concat(children)
+        end
+
+        # ```
+        # def foo((bar, baz)); end
+        #         ^^^^^^^^^^
+        # ```
+        private def visit_destructured_parameter(node)
+          children =
+            [*node.lefts, *node.rest, *node.rights].map do |child|
+              case child
+              when RequiredParameterNode
+                visit(child)
+              when MultiTargetNode
+                visit_destructured_parameter(child)
+              when SplatNode
+                :"*#{child.expression&.name}"
+              else
+                raise
+              end
+            end
+
+          s(node, :masgn).concat(children)
+        end
+
+        # ```
+        # ()
+        # ^^
+        #
+        # (1)
+        # ^^^
+        # ```
+        def visit_parentheses_node(node)
+          if node.body.nil?
+            s(node, :nil)
+          else
+            visit(node.body)
+          end
+        end
+
+        # ```
+        # foo => ^(bar)
+        #        ^^^^^^
+        # ```
+        def visit_pinned_expression_node(node)
+          node.expression.accept(copy_compiler(in_pattern: false))
+        end
+
+        # ```
+        # foo = 1 and bar => ^foo
+        #                    ^^^^
+        # ```
+        def visit_pinned_variable_node(node)
+          if node.variable.is_a?(LocalVariableReadNode) && node.variable.name.match?(/^_\d$/)
+            s(node, :lvar, node.variable.name)
+          else
+            visit(node.variable)
+          end
+        end
+
+        # END {}
+        def visit_post_execution_node(node)
+          s(node, :iter, s(node, :postexe), 0, visit(node.statements))
+        end
+
+        # BEGIN {}
+        def visit_pre_execution_node(node)
+          s(node, :iter, s(node, :preexe), 0, visit(node.statements))
+        end
+
+        # The top-level program node.
+        def visit_program_node(node)
+          visit(node.statements)
+        end
+
+        # ```
+        # 0..5
+        # ^^^^
+        # ```
+        def visit_range_node(node)
+          if !in_pattern && !node.left.nil? && !node.right.nil? && ([node.left.type, node.right.type] - %i[nil_node integer_node]).empty?
+            left = node.left.value if node.left.is_a?(IntegerNode)
+            right = node.right.value if node.right.is_a?(IntegerNode)
+            s(node, :lit, Range.new(left, right, node.exclude_end?))
+          else
+            s(node, node.exclude_end? ? :dot3 : :dot2, visit_range_bounds_node(node.left), visit_range_bounds_node(node.right))
+          end
+        end
+
+        # If the bounds of a range node are empty parentheses, then they do not
+        # get replaced by their usual s(:nil), but instead are s(:begin).
+        private def visit_range_bounds_node(node)
+          if node.is_a?(ParenthesesNode) && node.body.nil?
+            s(node, :begin)
+          else
+            visit(node)
+          end
+        end
+
+        # ```
+        # 1r
+        # ^^
+        # ```
+        def visit_rational_node(node)
+          s(node, :lit, node.value)
+        end
+
+        # ```
+        # redo
+        # ^^^^
+        # ```
+        def visit_redo_node(node)
+          s(node, :redo)
+        end
+
+        # ```
+        # /foo/
+        # ^^^^^
+        # ```
+        def visit_regular_expression_node(node)
+          s(node, :lit, Regexp.new(node.unescaped, node.options))
+        end
+
+        # ```
+        # def foo(bar:); end
+        #         ^^^^
+        # ```
+        def visit_required_keyword_parameter_node(node)
+          s(node, :kwarg, node.name)
+        end
+
+        # ```
+        # def foo(bar); end
+        #         ^^^
+        # ```
+        def visit_required_parameter_node(node)
+          node.name
+        end
+
+        # ```
+        # foo rescue bar
+        # ^^^^^^^^^^^^^^
+        # ```
+        def visit_rescue_modifier_node(node)
+          s(node, :rescue, visit(node.expression), s(node.rescue_expression, :resbody, s(node.rescue_expression, :array), visit(node.rescue_expression)))
+        end
+
+        # ```
+        # begin; rescue; end
+        #        ^^^^^^^
+        # ```
+        def visit_rescue_node(node)
+          exceptions =
+            if node.exceptions.length == 1 && node.exceptions.first.is_a?(SplatNode)
+              visit(node.exceptions.first)
+            else
+              s(node, :array).concat(visit_all(node.exceptions))
+            end
+
+          if !node.reference.nil?
+            exceptions << (visit(node.reference) << s(node.reference, :gvar, :"$!"))
+          end
+
+          s(node, :resbody, exceptions).concat(node.statements.nil? ? [nil] : visit_all(node.statements.body))
+        end
+
+        # ```
+        # def foo(*bar); end
+        #         ^^^^
+        #
+        # def foo(*); end
+        #         ^
+        # ```
+        def visit_rest_parameter_node(node)
+          :"*#{node.name}"
+        end
+
+        # ```
+        # retry
+        # ^^^^^
+        # ```
+        def visit_retry_node(node)
+          s(node, :retry)
+        end
+
+        # ```
+        # return
+        # ^^^^^^
+        #
+        # return 1
+        # ^^^^^^^^
+        # ```
+        def visit_return_node(node)
+          if node.arguments.nil?
+            s(node, :return)
+          elsif node.arguments.arguments.length == 1
+            argument = node.arguments.arguments.first
+            s(node, :return, argument.is_a?(SplatNode) ? s(node, :svalue, visit(argument)) : visit(argument))
+          else
+            s(node, :return, s(node, :array).concat(visit_all(node.arguments.arguments)))
+          end
+        end
+
+        # ```
+        # self
+        # ^^^^
+        # ```
+        def visit_self_node(node)
+          s(node, :self)
+        end
+
+        # A shareable constant.
+        def visit_shareable_constant_node(node)
+          visit(node.write)
+        end
+
+        # ```
+        # class << self; end
+        # ^^^^^^^^^^^^^^^^^^
+        # ```
+        def visit_singleton_class_node(node)
+          s(node, :sclass, visit(node.expression)).tap do |sexp|
+            sexp << node.body.accept(copy_compiler(in_def: false)) unless node.body.nil?
+          end
+        end
+
+        # ```
+        # __ENCODING__
+        # ^^^^^^^^^^^^
+        # ```
+        def visit_source_encoding_node(node)
+          # TODO
+          s(node, :colon2, s(node, :const, :Encoding), :UTF_8)
+        end
+
+        # ```
+        # __FILE__
+        # ^^^^^^^^
+        # ```
+        def visit_source_file_node(node)
+          s(node, :str, node.filepath)
+        end
+
+        # ```
+        # __LINE__
+        # ^^^^^^^^
+        # ```
+        def visit_source_line_node(node)
+          s(node, :lit, node.location.start_line)
+        end
+
+        # ```
+        # foo(*bar)
+        #     ^^^^
+        #
+        # def foo((bar, *baz)); end
+        #               ^^^^
+        #
+        # def foo(*); bar(*); end
+        #                 ^
+        # ```
+        def visit_splat_node(node)
+          if node.expression.nil?
+            s(node, :splat)
+          else
+            s(node, :splat, visit(node.expression))
+          end
+        end
+
+        # A list of statements.
+        def visit_statements_node(node)
+          first, *rest = node.body
+
+          if rest.empty?
+            visit(first)
+          else
+            s(node, :block).concat(visit_all(node.body))
+          end
+        end
+
+        # ```
+        # "foo"
+        # ^^^^^
+        # ```
+        def visit_string_node(node)
+          unescaped = node.unescaped
+
+          if node.forced_binary_encoding?
+            unescaped = unescaped.dup
+            unescaped.force_encoding(Encoding::BINARY)
+          end
+
+          s(node, :str, unescaped)
+        end
+
+        # ```
+        # super(foo)
+        # ^^^^^^^^^^
+        # ```
+        def visit_super_node(node)
+          arguments = node.arguments&.arguments || []
+          block = node.block
+
+          if block.is_a?(BlockArgumentNode)
+            arguments << block
+            block = nil
+          end
+
+          visit_block(node, s(node, :super).concat(visit_all(arguments)), block)
+        end
+
+        # ```
+        # :foo
+        # ^^^^
+        # ```
+        def visit_symbol_node(node)
+          node.value == "!@" ? s(node, :lit, :"!@") : s(node, :lit, node.unescaped.to_sym)
+        end
+
+        # ```
+        # true
+        # ^^^^
+        # ```
+        def visit_true_node(node)
+          s(node, :true)
+        end
+
+        # ```
+        # undef foo
+        # ^^^^^^^^^
+        # ```
+        def visit_undef_node(node)
+          names = node.names.map { |name| s(node, :undef, visit(name)) }
+          names.length == 1 ? names.first : s(node, :block).concat(names)
+        end
+
+        # ```
+        # unless foo; bar end
+        # ^^^^^^^^^^^^^^^^^^^
+        #
+        # bar unless foo
+        # ^^^^^^^^^^^^^^
+        # ```
+        def visit_unless_node(node)
+          s(node, :if, visit(node.predicate), visit(node.else_clause), visit(node.statements))
+        end
+
+        # ```
+        # until foo; bar end
+        # ^^^^^^^^^^^^^^^^^
+        #
+        # bar until foo
+        # ^^^^^^^^^^^^^
+        # ```
+        def visit_until_node(node)
+          s(node, :until, visit(node.predicate), visit(node.statements), !node.begin_modifier?)
+        end
+
+        # ```
+        # case foo; when bar; end
+        #           ^^^^^^^^^^^^^
+        # ```
+        def visit_when_node(node)
+          s(node, :when, s(node, :array).concat(visit_all(node.conditions))).concat(node.statements.nil? ? [nil] : visit_all(node.statements.body))
+        end
+
+        # ```
+        # while foo; bar end
+        # ^^^^^^^^^^^^^^^^^^
+        #
+        # bar while foo
+        # ^^^^^^^^^^^^^
+        # ```
+        def visit_while_node(node)
+          s(node, :while, visit(node.predicate), visit(node.statements), !node.begin_modifier?)
+        end
+
+        # ```
+        # `foo`
+        # ^^^^^
+        # ```
+        def visit_x_string_node(node)
+          result = s(node, :xstr, node.unescaped)
+
+          if node.heredoc?
+            result.line = node.content_loc.start_line
+            result.line_max = node.content_loc.end_line
+          end
+
+          result
+        end
+
+        # ```
+        # yield
+        # ^^^^^
+        #
+        # yield 1
+        # ^^^^^^^
+        # ```
+        def visit_yield_node(node)
+          s(node, :yield).concat(visit_all(node.arguments&.arguments || []))
+        end
+
+        private
+
+        # Create a new compiler with the given options.
+        def copy_compiler(in_def: self.in_def, in_pattern: self.in_pattern)
+          Compiler.new(file, in_def: in_def, in_pattern: in_pattern)
+        end
+
+        # Create a new Sexp object from the given prism node and arguments.
+        def s(node, *arguments)
+          result = Sexp.new(*arguments)
+          result.file = file
+          result.line = node.location.start_line
+          result.line_max = node.location.end_line
+          result
+        end
+
+        # Visit a block node, which will modify the AST by wrapping the given
+        # visited node in an iter node.
+        def visit_block(node, sexp, block)
+          if block.nil?
+            sexp
+          else
+            parameters =
+              case block.parameters
+              when nil, ItParametersNode, NumberedParametersNode
+                0
+              else
+                visit(block.parameters)
+              end
+
+            if block.body.nil?
+              s(node, :iter, sexp, parameters)
+            else
+              s(node, :iter, sexp, parameters, visit(block.body))
+            end
+          end
+        end
+
+        # Pattern constants get wrapped in another layer of :const.
+        def visit_pattern_constant(node)
+          case node
+          when nil
+            # nothing
+          when ConstantReadNode
+            visit(node)
+          else
+            s(node, :const, visit(node))
+          end
+        end
+
+        # Visit the value of a write, which will be on the right-hand side of
+        # a write operator. Because implicit arrays can have splats, those could
+        # potentially be wrapped in an svalue node.
+        def visit_write_value(node)
+          if node.is_a?(ArrayNode) && node.opening_loc.nil?
+            if node.elements.length == 1 && node.elements.first.is_a?(SplatNode)
+              s(node, :svalue, visit(node.elements.first))
+            else
+              s(node, :svalue, visit(node))
+            end
+          else
+            visit(node)
+          end
+        end
+      end
+
+      private_constant :Compiler
+
+      # Parse the given source and translate it into the seattlerb/ruby_parser
+      # gem's Sexp format.
+      def parse(source, filepath = "(string)")
+        translate(Prism.parse(source, filepath: filepath, partial_script: true), filepath)
+      end
+
+      # Parse the given file and translate it into the seattlerb/ruby_parser
+      # gem's Sexp format.
+      def parse_file(filepath)
+        translate(Prism.parse_file(filepath, partial_script: true), filepath)
+      end
+
+      class << self
+        # Parse the given source and translate it into the seattlerb/ruby_parser
+        # gem's Sexp format.
+        def parse(source, filepath = "(string)")
+          new.parse(source, filepath)
+        end
+
+        # Parse the given file and translate it into the seattlerb/ruby_parser
+        # gem's Sexp format.
+        def parse_file(filepath)
+          new.parse_file(filepath)
+        end
+      end
+
+      private
+
+      # Translate the given parse result and filepath into the
+      # seattlerb/ruby_parser gem's Sexp format.
+      def translate(result, filepath)
+        if result.failure?
+          error = result.errors.first
+          raise ::RubyParser::SyntaxError, "#{filepath}:#{error.location.start_line} :: #{error.message}"
+        end
+
+        result.value.accept(Compiler.new(filepath))
+      end
+    end
+  end
+end
diff --git a/lib/pstore.gemspec b/lib/pstore.gemspec
deleted file mode 100644
index 86051d2f438f27..00000000000000
--- a/lib/pstore.gemspec
+++ /dev/null
@@ -1,32 +0,0 @@
-# frozen_string_literal: true
-
-name = File.basename(__FILE__, ".gemspec")
-version = ["lib", Array.new(name.count("-")+1, ".").join("/")].find do |dir|
-  break File.foreach(File.join(__dir__, dir, "#{name.tr('-', '/')}.rb")) do |line|
-    /^\s*VERSION\s*=\s*"(.*)"/ =~ line and break $1
-  end rescue nil
-end
-
-Gem::Specification.new do |spec|
-  spec.name          = name
-  spec.version       = version
-  spec.authors       = ["Yukihiro Matsumoto"]
-  spec.email         = ["matz@ruby-lang.org"]
-
-  spec.summary       = %q{Transactional File Storage for Ruby Objects}
-  spec.description   = spec.summary
-  spec.homepage      = "https://github.com/ruby/pstore"
-  spec.licenses      = ["Ruby", "BSD-2-Clause"]
-
-  spec.metadata["homepage_uri"] = spec.homepage
-  spec.metadata["source_code_uri"] = "https://github.com/ruby/pstore"
-
-  # 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 2>#{IO::NULL}`.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/pstore.rb b/lib/pstore.rb
deleted file mode 100644
index 97df3c1509b86b..00000000000000
--- a/lib/pstore.rb
+++ /dev/null
@@ -1,731 +0,0 @@
-# frozen_string_literal: true
-# = PStore -- Transactional File Storage for Ruby Objects
-#
-# pstore.rb -
-#   originally by matz
-#   documentation by Kev Jackson and James Edward Gray II
-#   improved by Hongli Lai
-#
-# See PStore for documentation.
-
-require "digest"
-
-# \PStore implements a file based persistence mechanism based on a Hash.
-# User code can store hierarchies of Ruby objects (values)
-# into the data store by name (keys).
-# An object hierarchy may be just a single object.
-# User code may later read values back from the data store
-# or even update data, as needed.
-#
-# The transactional behavior ensures that any changes succeed or fail together.
-# This can be used to ensure that the data store is not left in a transitory state,
-# where some values were updated but others were not.
-#
-# Behind the scenes, Ruby objects are stored to the data store file with Marshal.
-# That carries the usual limitations. Proc objects cannot be marshalled,
-# for example.
-#
-# There are three important concepts here (details at the links):
-#
-# - {Store}[rdoc-ref:PStore@The+Store]: a store is an instance of \PStore.
-# - {Entries}[rdoc-ref:PStore@Entries]: the store is hash-like;
-#   each entry is the key for a stored object.
-# - {Transactions}[rdoc-ref:PStore@Transactions]: each transaction is a collection
-#   of prospective changes to the store;
-#   a transaction is defined in the block given with a call
-#   to PStore#transaction.
-#
-# == About the Examples
-#
-# Examples on this page need a store that has known properties.
-# They can get a new (and populated) store by calling thus:
-#
-#   example_store do |store|
-#     # Example code using store goes here.
-#   end
-#
-# All we really need to know about +example_store+
-# is that it yields a fresh store with a known population of entries;
-# its implementation:
-#
-#   require 'pstore'
-#   require 'tempfile'
-#   # Yield a pristine store for use in examples.
-#   def example_store
-#     # Create the store in a temporary file.
-#     Tempfile.create do |file|
-#       store = PStore.new(file)
-#       # Populate the store.
-#       store.transaction do
-#         store[:foo] = 0
-#         store[:bar] = 1
-#         store[:baz] = 2
-#       end
-#       yield store
-#     end
-#   end
-#
-# == The Store
-#
-# The contents of the store are maintained in a file whose path is specified
-# when the store is created (see PStore.new).
-# The objects are stored and retrieved using
-# module Marshal, which means that certain objects cannot be added to the store;
-# see {Marshal::dump}[rdoc-ref:Marshal.dump].
-#
-# == Entries
-#
-# A store may have any number of entries.
-# Each entry has a key and a value, just as in a hash:
-#
-# - Key: as in a hash, the key can be (almost) any object;
-#   see {Hash Keys}[rdoc-ref:Hash@Hash+Keys].
-#   You may find it convenient to keep it simple by using only
-#   symbols or strings as keys.
-# - Value: the value may be any object that can be marshalled by \Marshal
-#   (see {Marshal::dump}[rdoc-ref:Marshal.dump])
-#   and in fact may be a collection
-#   (e.g., an array, a hash, a set, a range, etc).
-#   That collection may in turn contain nested objects,
-#   including collections, to any depth;
-#   those objects must also be \Marshal-able.
-#   See {Hierarchical Values}[rdoc-ref:PStore@Hierarchical+Values].
-#
-# == Transactions
-#
-# === The Transaction Block
-#
-# The block given with a call to method #transaction#
-# contains a _transaction_,
-# which consists of calls to \PStore methods that
-# read from or write to the store
-# (that is, all \PStore methods except #transaction itself,
-# #path, and Pstore.new):
-#
-#   example_store do |store|
-#     store.transaction do
-#       store.keys # => [:foo, :bar, :baz]
-#       store[:bat] = 3
-#       store.keys # => [:foo, :bar, :baz, :bat]
-#     end
-#   end
-#
-# Execution of the transaction is deferred until the block exits,
-# and is executed _atomically_ (all-or-nothing):
-# either all transaction calls are executed, or none are.
-# This maintains the integrity of the store.
-#
-# Other code in the block (including even calls to #path and PStore.new)
-# is executed immediately, not deferred.
-#
-# The transaction block:
-#
-# - May not contain a nested call to #transaction.
-# - Is the only context where methods that read from or write to
-#   the store are allowed.
-#
-# As seen above, changes in a transaction are made automatically
-# when the block exits.
-# The block may be exited early by calling method #commit or #abort.
-#
-# - Method #commit triggers the update to the store and exits the block:
-#
-#     example_store do |store|
-#       store.transaction do
-#         store.keys # => [:foo, :bar, :baz]
-#         store[:bat] = 3
-#         store.commit
-#         fail 'Cannot get here'
-#       end
-#       store.transaction do
-#         # Update was completed.
-#         store.keys # => [:foo, :bar, :baz, :bat]
-#       end
-#     end
-#
-# - Method #abort discards the update to the store and exits the block:
-#
-#     example_store do |store|
-#       store.transaction do
-#         store.keys # => [:foo, :bar, :baz]
-#         store[:bat] = 3
-#         store.abort
-#         fail 'Cannot get here'
-#       end
-#       store.transaction do
-#         # Update was not completed.
-#         store.keys # => [:foo, :bar, :baz]
-#       end
-#     end
-#
-# === Read-Only Transactions
-#
-# By default, a transaction allows both reading from and writing to
-# the store:
-#
-#   store.transaction do
-#     # Read-write transaction.
-#     # Any code except a call to #transaction is allowed here.
-#   end
-#
-# If argument +read_only+ is passed as +true+,
-# only reading is allowed:
-#
-#   store.transaction(true) do
-#     # Read-only transaction:
-#     # Calls to #transaction, #[]=, and #delete are not allowed here.
-#   end
-#
-# == Hierarchical Values
-#
-# The value for an entry may be a simple object (as seen above).
-# It may also be a hierarchy of objects nested to any depth:
-#
-#   deep_store = PStore.new('deep.store')
-#   deep_store.transaction do
-#     array_of_hashes = [{}, {}, {}]
-#     deep_store[:array_of_hashes] = array_of_hashes
-#     deep_store[:array_of_hashes] # => [{}, {}, {}]
-#     hash_of_arrays = {foo: [], bar: [], baz: []}
-#     deep_store[:hash_of_arrays] = hash_of_arrays
-#     deep_store[:hash_of_arrays]  # => {:foo=>[], :bar=>[], :baz=>[]}
-#     deep_store[:hash_of_arrays][:foo].push(:bat)
-#     deep_store[:hash_of_arrays]  # => {:foo=>[:bat], :bar=>[], :baz=>[]}
-#   end
-#
-# And recall that you can use
-# {dig methods}[rdoc-ref:dig_methods.rdoc]
-# in a returned hierarchy of objects.
-#
-# == Working with the Store
-#
-# === Creating a Store
-#
-# Use method PStore.new to create a store.
-# The new store creates or opens its containing file:
-#
-#   store = PStore.new('t.store')
-#
-# === Modifying the Store
-#
-# Use method #[]= to update or create an entry:
-#
-#   example_store do |store|
-#     store.transaction do
-#       store[:foo] = 1 # Update.
-#       store[:bam] = 1 # Create.
-#     end
-#   end
-#
-# Use method #delete to remove an entry:
-#
-#   example_store do |store|
-#     store.transaction do
-#       store.delete(:foo)
-#       store[:foo] # => nil
-#     end
-#   end
-#
-# === Retrieving Values
-#
-# Use method #fetch (allows default) or #[] (defaults to +nil+)
-# to retrieve an entry:
-#
-#   example_store do |store|
-#     store.transaction do
-#       store[:foo]             # => 0
-#       store[:nope]            # => nil
-#       store.fetch(:baz)       # => 2
-#       store.fetch(:nope, nil) # => nil
-#       store.fetch(:nope)      # Raises exception.
-#     end
-#   end
-#
-# === Querying the Store
-#
-# Use method #key? to determine whether a given key exists:
-#
-#   example_store do |store|
-#     store.transaction do
-#       store.key?(:foo) # => true
-#     end
-#   end
-#
-# Use method #keys to retrieve keys:
-#
-#   example_store do |store|
-#     store.transaction do
-#       store.keys # => [:foo, :bar, :baz]
-#     end
-#   end
-#
-# Use method #path to retrieve the path to the store's underlying file;
-# this method may be called from outside a transaction block:
-#
-#   store = PStore.new('t.store')
-#   store.path # => "t.store"
-#
-# == Transaction Safety
-#
-# For transaction safety, see:
-#
-# - Optional argument +thread_safe+ at method PStore.new.
-# - Attribute #ultra_safe.
-#
-# Needless to say, if you're storing valuable data with \PStore, then you should
-# backup the \PStore file from time to time.
-#
-# == An Example Store
-#
-#  require "pstore"
-#
-#  # A mock wiki object.
-#  class WikiPage
-#
-#    attr_reader :page_name
-#
-#    def initialize(page_name, author, contents)
-#      @page_name = page_name
-#      @revisions = Array.new
-#      add_revision(author, contents)
-#    end
-#
-#    def add_revision(author, contents)
-#      @revisions << {created: Time.now,
-#                     author: author,
-#                     contents: contents}
-#    end
-#
-#    def wiki_page_references
-#      [@page_name] + @revisions.last[:contents].scan(/\b(?:[A-Z]+[a-z]+){2,}/)
-#    end
-#
-#  end
-#
-#  # Create a new wiki page.
-#  home_page = WikiPage.new("HomePage", "James Edward Gray II",
-#                           "A page about the JoysOfDocumentation..." )
-#
-#  wiki = PStore.new("wiki_pages.pstore")
-#  # Update page data and the index together, or not at all.
-#  wiki.transaction do
-#    # Store page.
-#    wiki[home_page.page_name] = home_page
-#    # Create page index.
-#    wiki[:wiki_index] ||= Array.new
-#    # Update wiki index.
-#    wiki[:wiki_index].push(*home_page.wiki_page_references)
-#  end
-#
-#  # Read wiki data, setting argument read_only to true.
-#  wiki.transaction(true) do
-#    wiki.keys.each do |key|
-#      puts key
-#      puts wiki[key]
-#    end
-#  end
-#
-class PStore
-  VERSION = "0.1.2"
-
-  RDWR_ACCESS = {mode: IO::RDWR | IO::CREAT | IO::BINARY, encoding: Encoding::ASCII_8BIT}.freeze
-  RD_ACCESS = {mode: IO::RDONLY | IO::BINARY, encoding: Encoding::ASCII_8BIT}.freeze
-  WR_ACCESS = {mode: IO::WRONLY | IO::CREAT | IO::TRUNC | IO::BINARY, encoding: Encoding::ASCII_8BIT}.freeze
-
-  # The error type thrown by all PStore methods.
-  class Error < StandardError
-  end
-
-  # Whether \PStore should do its best to prevent file corruptions,
-  # even when an unlikely error (such as memory-error or filesystem error) occurs:
-  #
-  # - +true+: changes are posted by creating a temporary file,
-  #   writing the updated data to it, then renaming the file to the given #path.
-  #   File integrity is maintained.
-  #   Note: has effect only if the filesystem has atomic file rename
-  #   (as do POSIX platforms Linux, MacOS, FreeBSD and others).
-  #
-  # - +false+ (the default): changes are posted by rewinding the open file
-  #   and writing the updated data.
-  #   File integrity is maintained if the filesystem raises
-  #   no unexpected I/O error;
-  #   if such an error occurs during a write to the store,
-  #   the file may become corrupted.
-  #
-  attr_accessor :ultra_safe
-
-  # Returns a new \PStore object.
-  #
-  # Argument +file+ is the path to the file in which objects are to be stored;
-  # if the file exists, it should be one that was written by \PStore.
-  #
-  #   path = 't.store'
-  #   store = PStore.new(path)
-  #
-  # A \PStore object is
-  # {reentrant}[https://en.wikipedia.org/wiki/Reentrancy_(computing)].
-  # If argument +thread_safe+ is given as +true+,
-  # the object is also thread-safe (at the cost of a small performance penalty):
-  #
-  #   store = PStore.new(path, true)
-  #
-  def initialize(file, thread_safe = false)
-    dir = File::dirname(file)
-    unless File::directory? dir
-      raise PStore::Error, format("directory %s does not exist", dir)
-    end
-    if File::exist? file and not File::readable? file
-      raise PStore::Error, format("file %s not readable", file)
-    end
-    @filename = file
-    @abort = false
-    @ultra_safe = false
-    @thread_safe = thread_safe
-    @lock = Thread::Mutex.new
-  end
-
-  # Raises PStore::Error if the calling code is not in a PStore#transaction.
-  def in_transaction
-    raise PStore::Error, "not in transaction" unless @lock.locked?
-  end
-  #
-  # Raises PStore::Error if the calling code is not in a PStore#transaction or
-  # if the code is in a read-only PStore#transaction.
-  #
-  def in_transaction_wr
-    in_transaction
-    raise PStore::Error, "in read-only transaction" if @rdonly
-  end
-  private :in_transaction, :in_transaction_wr
-
-  # Returns the value for the given +key+ if the key exists.
-  # +nil+ otherwise;
-  # if not +nil+, the returned value is an object or a hierarchy of objects:
-  #
-  #   example_store do |store|
-  #     store.transaction do
-  #       store[:foo]  # => 0
-  #       store[:nope] # => nil
-  #     end
-  #   end
-  #
-  # Returns +nil+ if there is no such key.
-  #
-  # See also {Hierarchical Values}[rdoc-ref:PStore@Hierarchical+Values].
-  #
-  # Raises an exception if called outside a transaction block.
-  def [](key)
-    in_transaction
-    @table[key]
-  end
-
-  # Like #[], except that it accepts a default value for the store.
-  # If the +key+ does not exist:
-  #
-  # - Raises an exception if +default+ is +PStore::Error+.
-  # - Returns the value of +default+ otherwise:
-  #
-  #     example_store do |store|
-  #       store.transaction do
-  #         store.fetch(:nope, nil) # => nil
-  #         store.fetch(:nope)      # Raises an exception.
-  #       end
-  #     end
-  #
-  # Raises an exception if called outside a transaction block.
-  def fetch(key, default=PStore::Error)
-    in_transaction
-    unless @table.key? key
-      if default == PStore::Error
-        raise PStore::Error, format("undefined key `%s'", key)
-      else
-        return default
-      end
-    end
-    @table[key]
-  end
-
-  # Creates or replaces the value for the given +key+:
-  #
-  #   example_store do |store|
-  #     temp.transaction do
-  #       temp[:bat] = 3
-  #     end
-  #   end
-  #
-  # See also {Hierarchical Values}[rdoc-ref:PStore@Hierarchical+Values].
-  #
-  # Raises an exception if called outside a transaction block.
-  def []=(key, value)
-    in_transaction_wr
-    @table[key] = value
-  end
-
-  # Removes and returns the value at +key+ if it exists:
-  #
-  #   example_store do |store|
-  #     store.transaction do
-  #       store[:bat] = 3
-  #       store.delete(:bat)
-  #     end
-  #   end
-  #
-  # Returns +nil+ if there is no such key.
-  #
-  # Raises an exception if called outside a transaction block.
-  def delete(key)
-    in_transaction_wr
-    @table.delete key
-  end
-
-  # Returns an array of the existing keys:
-  #
-  #   example_store do |store|
-  #     store.transaction do
-  #       store.keys # => [:foo, :bar, :baz]
-  #     end
-  #   end
-  #
-  # Raises an exception if called outside a transaction block.
-  def keys
-    in_transaction
-    @table.keys
-  end
-  alias roots keys
-
-  # Returns +true+ if +key+ exists, +false+ otherwise:
-  #
-  #   example_store do |store|
-  #     store.transaction do
-  #       store.key?(:foo) # => true
-  #     end
-  #   end
-  #
-  # Raises an exception if called outside a transaction block.
-  def key?(key)
-    in_transaction
-    @table.key? key
-  end
-  alias root? key?
-
-  # Returns the string file path used to create the store:
-  #
-  #   store.path # => "flat.store"
-  #
-  def path
-    @filename
-  end
-
-  # Exits the current transaction block, committing any changes
-  # specified in the transaction block.
-  # See {Committing or Aborting}[rdoc-ref:PStore@Committing+or+Aborting].
-  #
-  # Raises an exception if called outside a transaction block.
-  def commit
-    in_transaction
-    @abort = false
-    throw :pstore_abort_transaction
-  end
-
-  # Exits the current transaction block, discarding any changes
-  # specified in the transaction block.
-  # See {Committing or Aborting}[rdoc-ref:PStore@Committing+or+Aborting].
-  #
-  # Raises an exception if called outside a transaction block.
-  def abort
-    in_transaction
-    @abort = true
-    throw :pstore_abort_transaction
-  end
-
-  # Opens a transaction block for the store.
-  # See {Transactions}[rdoc-ref:PStore@Transactions].
-  #
-  # With argument +read_only+ as +false+, the block may both read from
-  # and write to the store.
-  #
-  # With argument +read_only+ as +true+, the block may not include calls
-  # to #transaction, #[]=, or #delete.
-  #
-  # Raises an exception if called within a transaction block.
-  def transaction(read_only = false)  # :yields:  pstore
-    value = nil
-    if !@thread_safe
-      raise PStore::Error, "nested transaction" unless @lock.try_lock
-    else
-      begin
-        @lock.lock
-      rescue ThreadError
-        raise PStore::Error, "nested transaction"
-      end
-    end
-    begin
-      @rdonly = read_only
-      @abort = false
-      file = open_and_lock_file(@filename, read_only)
-      if file
-        begin
-          @table, checksum, original_data_size = load_data(file, read_only)
-
-          catch(:pstore_abort_transaction) do
-            value = yield(self)
-          end
-
-          if !@abort && !read_only
-            save_data(checksum, original_data_size, file)
-          end
-        ensure
-          file.close
-        end
-      else
-        # This can only occur if read_only == true.
-        @table = {}
-        catch(:pstore_abort_transaction) do
-          value = yield(self)
-        end
-      end
-    ensure
-      @lock.unlock
-    end
-    value
-  end
-
-  private
-  # Constant for relieving Ruby's garbage collector.
-  CHECKSUM_ALGO = %w[SHA512 SHA384 SHA256 SHA1 RMD160 MD5].each do |algo|
-    begin
-      break Digest(algo)
-    rescue LoadError
-    end
-  end
-  EMPTY_STRING = ""
-  EMPTY_MARSHAL_DATA = Marshal.dump({})
-  EMPTY_MARSHAL_CHECKSUM = CHECKSUM_ALGO.digest(EMPTY_MARSHAL_DATA)
-
-  #
-  # Open the specified filename (either in read-only mode or in
-  # read-write mode) and lock it for reading or writing.
-  #
-  # The opened File object will be returned. If _read_only_ is true,
-  # and the file does not exist, then nil will be returned.
-  #
-  # All exceptions are propagated.
-  #
-  def open_and_lock_file(filename, read_only)
-    if read_only
-      begin
-        file = File.new(filename, **RD_ACCESS)
-        begin
-          file.flock(File::LOCK_SH)
-          return file
-        rescue
-          file.close
-          raise
-        end
-      rescue Errno::ENOENT
-        return nil
-      end
-    else
-      file = File.new(filename, **RDWR_ACCESS)
-      file.flock(File::LOCK_EX)
-      return file
-    end
-  end
-
-  # Load the given PStore file.
-  # If +read_only+ is true, the unmarshalled Hash will be returned.
-  # If +read_only+ is false, a 3-tuple will be returned: the unmarshalled
-  # Hash, a checksum of the data, and the size of the data.
-  def load_data(file, read_only)
-    if read_only
-      begin
-        table = load(file)
-        raise Error, "PStore file seems to be corrupted." unless table.is_a?(Hash)
-      rescue EOFError
-        # This seems to be a newly-created file.
-        table = {}
-      end
-      table
-    else
-      data = file.read
-      if data.empty?
-        # This seems to be a newly-created file.
-        table = {}
-        checksum = empty_marshal_checksum
-        size = empty_marshal_data.bytesize
-      else
-        table = load(data)
-        checksum = CHECKSUM_ALGO.digest(data)
-        size = data.bytesize
-        raise Error, "PStore file seems to be corrupted." unless table.is_a?(Hash)
-      end
-      data.replace(EMPTY_STRING)
-      [table, checksum, size]
-    end
-  end
-
-  def on_windows?
-    is_windows = RUBY_PLATFORM =~ /mswin|mingw|bccwin|wince/
-    self.class.__send__(:define_method, :on_windows?) do
-      is_windows
-    end
-    is_windows
-  end
-
-  def save_data(original_checksum, original_file_size, file)
-    new_data = dump(@table)
-
-    if new_data.bytesize != original_file_size || CHECKSUM_ALGO.digest(new_data) != original_checksum
-      if @ultra_safe && !on_windows?
-        # Windows doesn't support atomic file renames.
-        save_data_with_atomic_file_rename_strategy(new_data, file)
-      else
-        save_data_with_fast_strategy(new_data, file)
-      end
-    end
-
-    new_data.replace(EMPTY_STRING)
-  end
-
-  def save_data_with_atomic_file_rename_strategy(data, file)
-    temp_filename = "#{@filename}.tmp.#{Process.pid}.#{rand 1000000}"
-    temp_file = File.new(temp_filename, **WR_ACCESS)
-    begin
-      temp_file.flock(File::LOCK_EX)
-      temp_file.write(data)
-      temp_file.flush
-      File.rename(temp_filename, @filename)
-    rescue
-      File.unlink(temp_file) rescue nil
-      raise
-    ensure
-      temp_file.close
-    end
-  end
-
-  def save_data_with_fast_strategy(data, file)
-    file.rewind
-    file.write(data)
-    file.truncate(data.bytesize)
-  end
-
-
-  # This method is just a wrapped around Marshal.dump
-  # to allow subclass overriding used in YAML::Store.
-  def dump(table)  # :nodoc:
-    Marshal::dump(table)
-  end
-
-  # This method is just a wrapped around Marshal.load.
-  # to allow subclass overriding used in YAML::Store.
-  def load(content)  # :nodoc:
-    Marshal::load(content)
-  end
-
-  def empty_marshal_data
-    EMPTY_MARSHAL_DATA
-  end
-  def empty_marshal_checksum
-    EMPTY_MARSHAL_CHECKSUM
-  end
-end
diff --git a/lib/random/formatter.rb b/lib/random/formatter.rb
index 45b53a7b6e620e..4ecd6ad027d14a 100644
--- a/lib/random/formatter.rb
+++ b/lib/random/formatter.rb
@@ -165,15 +165,133 @@ def urlsafe_base64(n=nil, padding=false)
   #
   # The result contains 122 random bits (15.25 random bytes).
   #
-  # See RFC4122[https://datatracker.ietf.org/doc/html/rfc4122] for details of UUID.
+  # See RFC9562[https://www.rfc-editor.org/rfc/rfc9562] for details of UUIDv4.
   #
   def uuid
-    ary = random_bytes(16).unpack("NnnnnN")
-    ary[2] = (ary[2] & 0x0fff) | 0x4000
-    ary[3] = (ary[3] & 0x3fff) | 0x8000
-    "%08x-%04x-%04x-%04x-%04x%08x" % ary
+    ary = random_bytes(16)
+    ary.setbyte(6, (ary.getbyte(6) & 0x0f) | 0x40)
+    ary.setbyte(8, (ary.getbyte(8) & 0x3f) | 0x80)
+    ary.unpack("H8H4H4H4H12").join(?-)
   end
 
+  alias uuid_v4 uuid
+
+  # Generate a random v7 UUID (Universally Unique IDentifier).
+  #
+  #   require 'random/formatter'
+  #
+  #   Random.uuid_v7 # => "0188d4c3-1311-7f96-85c7-242a7aa58f1e"
+  #   Random.uuid_v7 # => "0188d4c3-16fe-744f-86af-38fa04c62bb5"
+  #   Random.uuid_v7 # => "0188d4c3-1af8-764f-b049-c204ce0afa23"
+  #   Random.uuid_v7 # => "0188d4c3-1e74-7085-b14f-ef6415dc6f31"
+  #   #                    |<--sorted-->| |<----- random ---->|
+  #
+  #   # or
+  #   prng = Random.new
+  #   prng.uuid_v7 # => "0188ca51-5e72-7950-a11d-def7ff977c98"
+  #
+  # The version 7 UUID starts with the least significant 48 bits of a 64 bit
+  # Unix timestamp (milliseconds since the epoch) and fills the remaining bits
+  # with random data, excluding the version and variant bits.
+  #
+  # This allows version 7 UUIDs to be sorted by creation time.  Time ordered
+  # UUIDs can be used for better database index locality of newly inserted
+  # records, which may have a significant performance benefit compared to random
+  # data inserts.
+  #
+  # The result contains 74 random bits (9.25 random bytes).
+  #
+  # Note that this method cannot be made reproducible because its output
+  # includes not only random bits but also timestamp.
+  #
+  # See RFC9562[https://www.rfc-editor.org/rfc/rfc9562] for details of UUIDv7.
+  #
+  # ==== Monotonicity
+  #
+  # UUIDv7 has millisecond precision by default, so multiple UUIDs created
+  # within the same millisecond are not issued in monotonically increasing
+  # order.  To create UUIDs that are time-ordered with sub-millisecond
+  # precision, up to 12 bits of additional timestamp may added with
+  # +extra_timestamp_bits+.  The extra timestamp precision comes at the expense
+  # of random bits.  Setting <tt>extra_timestamp_bits: 12</tt> provides ~244ns
+  # of precision, but only 62 random bits (7.75 random bytes).
+  #
+  #   prng = Random.new
+  #   Array.new(4) { prng.uuid_v7(extra_timestamp_bits: 12) }
+  #   # =>
+  #   ["0188d4c7-13da-74f9-8b53-22a786ffdd5a",
+  #    "0188d4c7-13da-753b-83a5-7fb9b2afaeea",
+  #    "0188d4c7-13da-754a-88ea-ac0baeedd8db",
+  #    "0188d4c7-13da-7557-83e1-7cad9cda0d8d"]
+  #   # |<--- sorted --->| |<-- random --->|
+  #
+  #   Array.new(4) { prng.uuid_v7(extra_timestamp_bits: 8) }
+  #   # =>
+  #   ["0188d4c7-3333-7a95-850a-de6edb858f7e",
+  #    "0188d4c7-3333-7ae8-842e-bc3a8b7d0cf9",  # <- out of order
+  #    "0188d4c7-3333-7ae2-995a-9f135dc44ead",  # <- out of order
+  #    "0188d4c7-3333-7af9-87c3-8f612edac82e"]
+  #   # |<--- sorted -->||<---- random --->|
+  #
+  # Any rollbacks of the system clock will break monotonicity.  UUIDv7 is based
+  # on UTC, which excludes leap seconds and can rollback the clock.  To avoid
+  # this, the system clock can synchronize with an NTP server configured to use
+  # a "leap smear" approach.  NTP or PTP will also be needed to synchronize
+  # across distributed nodes.
+  #
+  # Counters and other mechanisms for stronger guarantees of monotonicity are
+  # not implemented.  Applications with stricter requirements should follow
+  # {Section 6.2}[https://www.rfc-editor.org/rfc/rfc9562.html#name-monotonicity-and-counters]
+  # of the specification.
+  #
+  def uuid_v7(extra_timestamp_bits: 0)
+    case (extra_timestamp_bits = Integer(extra_timestamp_bits))
+    when 0 # min timestamp precision
+      ms = Process.clock_gettime(Process::CLOCK_REALTIME, :millisecond)
+      rand = random_bytes(10)
+      rand.setbyte(0, rand.getbyte(0) & 0x0f | 0x70) # version
+      rand.setbyte(2, rand.getbyte(2) & 0x3f | 0x80) # variant
+      "%08x-%04x-%s" % [
+        (ms & 0x0000_ffff_ffff_0000) >> 16,
+        (ms & 0x0000_0000_0000_ffff),
+        rand.unpack("H4H4H12").join("-")
+      ]
+
+    when 12 # max timestamp precision
+      ms, ns = Process.clock_gettime(Process::CLOCK_REALTIME, :nanosecond)
+        .divmod(1_000_000)
+      extra_bits = ns * 4096 / 1_000_000
+      rand = random_bytes(8)
+      rand.setbyte(0, rand.getbyte(0) & 0x3f | 0x80) # variant
+      "%08x-%04x-7%03x-%s" % [
+        (ms & 0x0000_ffff_ffff_0000) >> 16,
+        (ms & 0x0000_0000_0000_ffff),
+        extra_bits,
+        rand.unpack("H4H12").join("-")
+      ]
+
+    when (0..12) # the generic version is slower than the special cases above
+      rand_a, rand_b1, rand_b2, rand_b3 = random_bytes(10).unpack("nnnN")
+      rand_mask_bits = 12 - extra_timestamp_bits
+      ms, ns = Process.clock_gettime(Process::CLOCK_REALTIME, :nanosecond)
+        .divmod(1_000_000)
+      "%08x-%04x-%04x-%04x-%04x%08x" % [
+        (ms & 0x0000_ffff_ffff_0000) >> 16,
+        (ms & 0x0000_0000_0000_ffff),
+        0x7000 |
+          ((ns * (1 << extra_timestamp_bits) / 1_000_000) << rand_mask_bits) |
+          rand_a & ((1 << rand_mask_bits) - 1),
+        0x8000 | (rand_b1 & 0x3fff),
+        rand_b2,
+        rand_b3
+      ]
+
+    else
+      raise ArgumentError, "extra_timestamp_bits must be in 0..12"
+    end
+  end
+
+  # Internal interface to Random; Generate random data _n_ bytes.
   private def gen_random(n)
     self.bytes(n)
   end
@@ -221,7 +339,9 @@ def uuid
     result
   end
 
-  ALPHANUMERIC = [*'A'..'Z', *'a'..'z', *'0'..'9']
+  # The default character list for #alphanumeric.
+  ALPHANUMERIC = [*'A'..'Z', *'a'..'z', *'0'..'9'].map(&:freeze).freeze
+
   # Generate a random alphanumeric string.
   #
   # The argument _n_ specifies the length, in characters, of the alphanumeric
diff --git a/lib/rdoc.rb b/lib/rdoc.rb
deleted file mode 100644
index b62c22576d48a4..00000000000000
--- a/lib/rdoc.rb
+++ /dev/null
@@ -1,201 +0,0 @@
-# frozen_string_literal: true
-$DEBUG_RDOC = nil
-
-# :main: README.rdoc
-
-##
-# RDoc produces documentation for Ruby source files by parsing the source and
-# extracting the definition for classes, modules, methods, includes and
-# requires.  It associates these with optional documentation contained in an
-# immediately preceding comment block then renders the result using an output
-# formatter.
-#
-# For a simple introduction to writing or generating documentation using RDoc
-# see the README.
-#
-# == Roadmap
-#
-# If you think you found a bug in RDoc see CONTRIBUTING@Bugs
-#
-# If you want to use RDoc to create documentation for your Ruby source files,
-# see RDoc::Markup and refer to <tt>rdoc --help</tt> for command line usage.
-#
-# If you want to set the default markup format see
-# RDoc::Markup@Supported+Formats
-#
-# If you want to store rdoc configuration in your gem (such as the default
-# markup format) see RDoc::Options@Saved+Options
-#
-# If you want to write documentation for Ruby files see RDoc::Parser::Ruby
-#
-# If you want to write documentation for extensions written in C see
-# RDoc::Parser::C
-#
-# If you want to generate documentation using <tt>rake</tt> see RDoc::Task.
-#
-# If you want to drive RDoc programmatically, see RDoc::RDoc.
-#
-# If you want to use the library to format text blocks into HTML or other
-# formats, look at RDoc::Markup.
-#
-# If you want to make an RDoc plugin such as a generator or directive handler
-# see RDoc::RDoc.
-#
-# If you want to write your own output generator see RDoc::Generator.
-#
-# If you want an overview of how RDoc works see CONTRIBUTING
-#
-# == Credits
-#
-# RDoc is currently being maintained by Eric Hodel <drbrain@segment7.net>.
-#
-# Dave Thomas <dave@pragmaticprogrammer.com> is the original author of RDoc.
-#
-# * The Ruby parser in rdoc/parse.rb is based heavily on the outstanding
-#   work of Keiju ISHITSUKA of Nippon Rational Inc, who produced the Ruby
-#   parser for irb and the rtags package.
-
-module RDoc
-
-  ##
-  # Exception thrown by any rdoc error.
-
-  class Error < RuntimeError; end
-
-  require_relative 'rdoc/version'
-
-  ##
-  # Method visibilities
-
-  VISIBILITIES = [:public, :protected, :private]
-
-  ##
-  # Name of the dotfile that contains the description of files to be processed
-  # in the current directory
-
-  DOT_DOC_FILENAME = ".document"
-
-  ##
-  # General RDoc modifiers
-
-  GENERAL_MODIFIERS = %w[nodoc].freeze
-
-  ##
-  # RDoc modifiers for classes
-
-  CLASS_MODIFIERS = GENERAL_MODIFIERS
-
-  ##
-  # RDoc modifiers for attributes
-
-  ATTR_MODIFIERS = GENERAL_MODIFIERS
-
-  ##
-  # RDoc modifiers for constants
-
-  CONSTANT_MODIFIERS = GENERAL_MODIFIERS
-
-  ##
-  # RDoc modifiers for methods
-
-  METHOD_MODIFIERS = GENERAL_MODIFIERS +
-    %w[arg args yield yields notnew not-new not_new doc]
-
-  ##
-  # Loads the best available YAML library.
-
-  def self.load_yaml
-    begin
-      gem 'psych'
-    rescue NameError => e # --disable-gems
-      raise unless e.name == :gem
-    rescue Gem::LoadError
-    end
-
-    begin
-      require 'psych'
-    rescue ::LoadError
-    ensure
-      require 'yaml'
-    end
-  end
-
-  def self.home
-    rdoc_dir = begin
-                File.expand_path('~/.rdoc')
-              rescue ArgumentError
-              end
-
-    if File.directory?(rdoc_dir)
-      rdoc_dir
-    else
-      begin
-        # XDG
-        xdg_data_home = ENV["XDG_DATA_HOME"] || File.join(File.expand_path("~"), '.local', 'share')
-        unless File.exist?(xdg_data_home)
-          FileUtils.mkdir_p xdg_data_home
-        end
-        File.join xdg_data_home, "rdoc"
-      rescue Errno::EACCES
-      end
-    end
-  end
-
-  autoload :RDoc,           "#{__dir__}/rdoc/rdoc"
-
-  autoload :CrossReference, "#{__dir__}/rdoc/cross_reference"
-  autoload :ERBIO,          "#{__dir__}/rdoc/erbio"
-  autoload :ERBPartial,     "#{__dir__}/rdoc/erb_partial"
-  autoload :Encoding,       "#{__dir__}/rdoc/encoding"
-  autoload :Generator,      "#{__dir__}/rdoc/generator"
-  autoload :Options,        "#{__dir__}/rdoc/options"
-  autoload :Parser,         "#{__dir__}/rdoc/parser"
-  autoload :Servlet,        "#{__dir__}/rdoc/servlet"
-  autoload :RI,             "#{__dir__}/rdoc/ri"
-  autoload :Stats,          "#{__dir__}/rdoc/stats"
-  autoload :Store,          "#{__dir__}/rdoc/store"
-  autoload :Task,           "#{__dir__}/rdoc/task"
-  autoload :Text,           "#{__dir__}/rdoc/text"
-
-  autoload :Markdown,       "#{__dir__}/rdoc/markdown"
-  autoload :Markup,         "#{__dir__}/rdoc/markup"
-  autoload :RD,             "#{__dir__}/rdoc/rd"
-  autoload :TomDoc,         "#{__dir__}/rdoc/tom_doc"
-
-  autoload :KNOWN_CLASSES,  "#{__dir__}/rdoc/known_classes"
-
-  autoload :TokenStream,    "#{__dir__}/rdoc/token_stream"
-
-  autoload :Comment,        "#{__dir__}/rdoc/comment"
-
-  require_relative 'rdoc/i18n'
-
-  # code objects
-  #
-  # We represent the various high-level code constructs that appear in Ruby
-  # programs: classes, modules, methods, and so on.
-  autoload :CodeObject,     "#{__dir__}/rdoc/code_object"
-
-  autoload :Context,        "#{__dir__}/rdoc/context"
-  autoload :TopLevel,       "#{__dir__}/rdoc/top_level"
-
-  autoload :AnonClass,      "#{__dir__}/rdoc/anon_class"
-  autoload :ClassModule,    "#{__dir__}/rdoc/class_module"
-  autoload :NormalClass,    "#{__dir__}/rdoc/normal_class"
-  autoload :NormalModule,   "#{__dir__}/rdoc/normal_module"
-  autoload :SingleClass,    "#{__dir__}/rdoc/single_class"
-
-  autoload :Alias,          "#{__dir__}/rdoc/alias"
-  autoload :AnyMethod,      "#{__dir__}/rdoc/any_method"
-  autoload :MethodAttr,     "#{__dir__}/rdoc/method_attr"
-  autoload :GhostMethod,    "#{__dir__}/rdoc/ghost_method"
-  autoload :MetaMethod,     "#{__dir__}/rdoc/meta_method"
-  autoload :Attr,           "#{__dir__}/rdoc/attr"
-
-  autoload :Constant,       "#{__dir__}/rdoc/constant"
-  autoload :Mixin,          "#{__dir__}/rdoc/mixin"
-  autoload :Include,        "#{__dir__}/rdoc/include"
-  autoload :Extend,         "#{__dir__}/rdoc/extend"
-  autoload :Require,        "#{__dir__}/rdoc/require"
-
-end
diff --git a/lib/rdoc/.document b/lib/rdoc/.document
deleted file mode 100644
index 6b5e1b21a569ba..00000000000000
--- a/lib/rdoc/.document
+++ /dev/null
@@ -1,2 +0,0 @@
-*.rb
-parser
diff --git a/lib/rdoc/alias.rb b/lib/rdoc/alias.rb
deleted file mode 100644
index 446cf9ccb4855f..00000000000000
--- a/lib/rdoc/alias.rb
+++ /dev/null
@@ -1,111 +0,0 @@
-# frozen_string_literal: true
-##
-# Represent an alias, which is an old_name/new_name pair associated with a
-# particular context
-#--
-# TODO implement Alias as a proxy to a method/attribute, inheriting from
-#      MethodAttr
-
-class RDoc::Alias < RDoc::CodeObject
-
-  ##
-  # Aliased method's name
-
-  attr_reader :new_name
-
-  alias name new_name
-
-  ##
-  # Aliasee method's name
-
-  attr_reader :old_name
-
-  ##
-  # Is this an alias declared in a singleton context?
-
-  attr_accessor :singleton
-
-  ##
-  # Source file token stream
-
-  attr_reader :text
-
-  ##
-  # Creates a new Alias with a token stream of +text+ that aliases +old_name+
-  # to +new_name+, has +comment+ and is a +singleton+ context.
-
-  def initialize(text, old_name, new_name, comment, singleton = false)
-    super()
-
-    @text = text
-    @singleton = singleton
-    @old_name = old_name
-    @new_name = new_name
-    self.comment = comment
-  end
-
-  ##
-  # Order by #singleton then #new_name
-
-  def <=>(other)
-    [@singleton ? 0 : 1, new_name] <=> [other.singleton ? 0 : 1, other.new_name]
-  end
-
-  ##
-  # HTML fragment reference for this alias
-
-  def aref
-    type = singleton ? 'c' : 'i'
-    "#alias-#{type}-#{html_name}"
-  end
-
-  ##
-  # Full old name including namespace
-
-  def full_old_name
-    @full_name || "#{parent.name}#{pretty_old_name}"
-  end
-
-  ##
-  # HTML id-friendly version of +#new_name+.
-
-  def html_name
-    CGI.escape(@new_name.gsub('-', '-2D')).gsub('%','-').sub(/^-/, '')
-  end
-
-  def inspect # :nodoc:
-    parent_name = parent ? parent.name : '(unknown)'
-    "#<%s:0x%x %s.alias_method %s, %s>" % [
-      self.class, object_id,
-      parent_name, @old_name, @new_name,
-    ]
-  end
-
-  ##
-  # '::' for the alias of a singleton method/attribute, '#' for instance-level.
-
-  def name_prefix
-    singleton ? '::' : '#'
-  end
-
-  ##
-  # Old name with prefix '::' or '#'.
-
-  def pretty_old_name
-    "#{singleton ? '::' : '#'}#{@old_name}"
-  end
-
-  ##
-  # New name with prefix '::' or '#'.
-
-  def pretty_new_name
-    "#{singleton ? '::' : '#'}#{@new_name}"
-  end
-
-  alias pretty_name pretty_new_name
-
-  def to_s # :nodoc:
-    "alias: #{self.new_name} -> #{self.pretty_old_name} in: #{parent}"
-  end
-
-end
diff --git a/lib/rdoc/anon_class.rb b/lib/rdoc/anon_class.rb
deleted file mode 100644
index 3c2f0e1877dabf..00000000000000
--- a/lib/rdoc/anon_class.rb
+++ /dev/null
@@ -1,10 +0,0 @@
-# frozen_string_literal: true
-##
-# An anonymous class like:
-#
-#   c = Class.new do end
-#
-# AnonClass is currently not used.
-
-class RDoc::AnonClass < RDoc::ClassModule
-end
diff --git a/lib/rdoc/any_method.rb b/lib/rdoc/any_method.rb
deleted file mode 100644
index 465c4a4fb2d7ef..00000000000000
--- a/lib/rdoc/any_method.rb
+++ /dev/null
@@ -1,379 +0,0 @@
-# frozen_string_literal: true
-##
-# AnyMethod is the base class for objects representing methods
-
-class RDoc::AnyMethod < RDoc::MethodAttr
-
-  ##
-  # 2::
-  #   RDoc 4
-  #   Added calls_super
-  #   Added parent name and class
-  #   Added section title
-  # 3::
-  #   RDoc 4.1
-  #   Added is_alias_for
-
-  MARSHAL_VERSION = 3 # :nodoc:
-
-  ##
-  # Don't rename \#initialize to \::new
-
-  attr_accessor :dont_rename_initialize
-
-  ##
-  # The C function that implements this method (if it was defined in a C file)
-
-  attr_accessor :c_function
-
-  # The section title of the method (if defined in a C file via +:category:+)
-  attr_accessor :section_title
-
-  # Parameters for this method
-
-  attr_accessor :params
-
-  ##
-  # If true this method uses +super+ to call a superclass version
-
-  attr_accessor :calls_super
-
-  include RDoc::TokenStream
-
-  ##
-  # Creates a new AnyMethod with a token stream +text+ and +name+
-
-  def initialize text, name
-    super
-
-    @c_function = nil
-    @dont_rename_initialize = false
-    @token_stream = nil
-    @calls_super = false
-    @superclass_method = nil
-  end
-
-  ##
-  # Adds +an_alias+ as an alias for this method in +context+.
-
-  def add_alias an_alias, context = nil
-    method = self.class.new an_alias.text, an_alias.new_name
-
-    method.record_location an_alias.file
-    method.singleton = self.singleton
-    method.params = self.params
-    method.visibility = self.visibility
-    method.comment = an_alias.comment
-    method.is_alias_for = self
-    @aliases << method
-    context.add_method method if context
-    method
-  end
-
-  ##
-  # Prefix for +aref+ is 'method'.
-
-  def aref_prefix
-    'method'
-  end
-
-  ##
-  # The call_seq or the param_seq with method name, if there is no call_seq.
-  #
-  # Use this for displaying a method's argument lists.
-
-  def arglists
-    if @call_seq then
-      @call_seq
-    elsif @params then
-      "#{name}#{param_seq}"
-    end
-  end
-
-  ##
-  # Different ways to call this method
-
-  def call_seq
-    unless call_seq = _call_seq
-      call_seq = is_alias_for._call_seq if is_alias_for
-    end
-
-    return unless call_seq
-
-    deduplicate_call_seq(call_seq)
-  end
-
-  ##
-  # Sets the different ways you can call this method.  If an empty +call_seq+
-  # is given nil is assumed.
-  #
-  # See also #param_seq
-
-  def call_seq= call_seq
-    return if call_seq.empty?
-
-    @call_seq = call_seq
-  end
-
-  ##
-  # Whether the method has a call-seq.
-
-  def has_call_seq?
-    !!(@call_seq || is_alias_for&._call_seq)
-  end
-
-  ##
-  # Loads is_alias_for from the internal name.  Returns nil if the alias
-  # cannot be found.
-
-  def is_alias_for # :nodoc:
-    case @is_alias_for
-    when RDoc::MethodAttr then
-      @is_alias_for
-    when Array then
-      return nil unless @store
-
-      klass_name, singleton, method_name = @is_alias_for
-
-      return nil unless klass = @store.find_class_or_module(klass_name)
-
-      @is_alias_for = klass.find_method method_name, singleton
-    end
-  end
-
-  ##
-  # Dumps this AnyMethod for use by ri.  See also #marshal_load
-
-  def marshal_dump
-    aliases = @aliases.map do |a|
-      [a.name, parse(a.comment)]
-    end
-
-    is_alias_for = [
-      @is_alias_for.parent.full_name,
-      @is_alias_for.singleton,
-      @is_alias_for.name
-    ] if @is_alias_for
-
-    [ MARSHAL_VERSION,
-      @name,
-      full_name,
-      @singleton,
-      @visibility,
-      parse(@comment),
-      @call_seq,
-      @block_params,
-      aliases,
-      @params,
-      @file.relative_name,
-      @calls_super,
-      @parent.name,
-      @parent.class,
-      @section.title,
-      is_alias_for,
-    ]
-  end
-
-  ##
-  # Loads this AnyMethod from +array+.  For a loaded AnyMethod the following
-  # methods will return cached values:
-  #
-  # * #full_name
-  # * #parent_name
-
-  def marshal_load array
-    initialize_visibility
-
-    @dont_rename_initialize = nil
-    @token_stream           = nil
-    @aliases                = []
-    @parent                 = nil
-    @parent_name            = nil
-    @parent_class           = nil
-    @section                = nil
-    @file                   = nil
-
-    version        = array[0]
-    @name          = array[1]
-    @full_name     = array[2]
-    @singleton     = array[3]
-    @visibility    = array[4]
-    @comment       = array[5]
-    @call_seq      = array[6]
-    @block_params  = array[7]
-    #                      8 handled below
-    @params        = array[9]
-    #                      10 handled below
-    @calls_super   = array[11]
-    @parent_name   = array[12]
-    @parent_title  = array[13]
-    @section_title = array[14]
-    @is_alias_for  = array[15]
-
-    array[8].each do |new_name, comment|
-      add_alias RDoc::Alias.new(nil, @name, new_name, comment, @singleton)
-    end
-
-    @parent_name ||= if @full_name =~ /#/ then
-                       $`
-                     else
-                       name = @full_name.split('::')
-                       name.pop
-                       name.join '::'
-                     end
-
-    @file = RDoc::TopLevel.new array[10] if version > 0
-  end
-
-  ##
-  # Method name
-  #
-  # If the method has no assigned name, it extracts it from #call_seq.
-
-  def name
-    return @name if @name
-
-    @name =
-      @call_seq[/^.*?\.(\w+)/, 1] ||
-      @call_seq[/^.*?(\w+)/, 1] ||
-      @call_seq if @call_seq
-  end
-
-  ##
-  # A list of this method's method and yield parameters.  +call-seq+ params
-  # are preferred over parsed method and block params.
-
-  def param_list
-    if @call_seq then
-      params = @call_seq.split("\n").last
-      params = params.sub(/.*?\((.*)\)/, '\1')
-      params = params.sub(/(\{|do)\s*\|([^|]*)\|.*/, ',\2')
-    elsif @params then
-      params = @params.sub(/\((.*)\)/, '\1')
-
-      params << ",#{@block_params}" if @block_params
-    elsif @block_params then
-      params = @block_params
-    else
-      return []
-    end
-
-    if @block_params then
-      # If this method has explicit block parameters, remove any explicit
-      # &block
-      params = params.sub(/,?\s*&\w+/, '')
-    else
-      params = params.sub(/\&(\w+)/, '\1')
-    end
-
-    params = params.gsub(/\s+/, '').split(',').reject(&:empty?)
-
-    params.map { |param| param.sub(/=.*/, '') }
-  end
-
-  ##
-  # Pretty parameter list for this method.  If the method's parameters were
-  # given by +call-seq+ it is preferred over the parsed values.
-
-  def param_seq
-    if @call_seq then
-      params = @call_seq.split("\n").last
-      params = params.sub(/[^( ]+/, '')
-      params = params.sub(/(\|[^|]+\|)\s*\.\.\.\s*(end|\})/, '\1 \2')
-    elsif @params then
-      params = @params.gsub(/\s*\#.*/, '')
-      params = params.tr_s("\n ", " ")
-      params = "(#{params})" unless params[0] == ?(
-    else
-      params = ''
-    end
-
-    if @block_params then
-      # If this method has explicit block parameters, remove any explicit
-      # &block
-      params = params.sub(/,?\s*&\w+/, '')
-
-      block = @block_params.tr_s("\n ", " ")
-      if block[0] == ?(
-        block = block.sub(/^\(/, '').sub(/\)/, '')
-      end
-      params << " { |#{block}| ... }"
-    end
-
-    params
-  end
-
-  ##
-  # Whether to skip the method description, true for methods that have
-  # aliases with a call-seq that doesn't include the method name.
-
-  def skip_description?
-    has_call_seq? && call_seq.nil? && !!(is_alias_for || !aliases.empty?)
-  end
-
-  ##
-  # Sets the store for this method and its referenced code objects.
-
-  def store= store
-    super
-
-    @file = @store.add_file @file.full_name if @file
-  end
-
-  ##
-  # For methods that +super+, find the superclass method that would be called.
-
-  def superclass_method
-    return unless @calls_super
-    return @superclass_method if @superclass_method
-
-    parent.each_ancestor do |ancestor|
-      if method = ancestor.method_list.find { |m| m.name == @name } then
-        @superclass_method = method
-        break
-      end
-    end
-
-    @superclass_method
-  end
-
-  protected
-
-  ##
-  # call_seq without deduplication and alias lookup.
-
-  def _call_seq
-    @call_seq if defined?(@call_seq) && @call_seq
-  end
-
-  private
-
-  ##
-  # call_seq with alias examples information removed, if this
-  # method is an alias method.
-
-  def deduplicate_call_seq(call_seq)
-    return call_seq unless is_alias_for || !aliases.empty?
-
-    method_name = self.name
-    method_name = method_name[0, 1] if method_name =~ /\A\[/
-
-    entries = call_seq.split "\n"
-
-    ignore = aliases.map(&:name)
-    if is_alias_for
-      ignore << is_alias_for.name
-      ignore.concat is_alias_for.aliases.map(&:name)
-    end
-    ignore.map! { |n| n =~ /\A\[/ ? /\[.*\]/ : n}
-    ignore.delete(method_name)
-    ignore = Regexp.union(ignore)
-
-    matching = entries.reject do |entry|
-      entry =~ /^\w*\.?#{ignore}[$\(\s]/ or
-        entry =~ /\s#{ignore}\s/
-    end
-
-    matching.empty? ? nil : matching.join("\n")
-  end
-end
diff --git a/lib/rdoc/attr.rb b/lib/rdoc/attr.rb
deleted file mode 100644
index a4032359334f31..00000000000000
--- a/lib/rdoc/attr.rb
+++ /dev/null
@@ -1,175 +0,0 @@
-# frozen_string_literal: true
-##
-# An attribute created by \#attr, \#attr_reader, \#attr_writer or
-# \#attr_accessor
-
-class RDoc::Attr < RDoc::MethodAttr
-
-  ##
-  # 3::
-  #   RDoc 4
-  #    Added parent name and class
-  #    Added section title
-
-  MARSHAL_VERSION = 3 # :nodoc:
-
-  ##
-  # Is the attribute readable ('R'), writable ('W') or both ('RW')?
-
-  attr_accessor :rw
-
-  ##
-  # Creates a new Attr with body +text+, +name+, read/write status +rw+ and
-  # +comment+.  +singleton+ marks this as a class attribute.
-
-  def initialize(text, name, rw, comment, singleton = false)
-    super text, name
-
-    @rw = rw
-    @singleton = singleton
-    self.comment = comment
-  end
-
-  ##
-  # Attributes are equal when their names, singleton and rw are identical
-
-  def == other
-    self.class == other.class and
-      self.name == other.name and
-      self.rw == other.rw and
-      self.singleton == other.singleton
-  end
-
-  ##
-  # Add +an_alias+ as an attribute in +context+.
-
-  def add_alias(an_alias, context)
-    new_attr = self.class.new(self.text, an_alias.new_name, self.rw,
-                              self.comment, self.singleton)
-
-    new_attr.record_location an_alias.file
-    new_attr.visibility = self.visibility
-    new_attr.is_alias_for = self
-    @aliases << new_attr
-    context.add_attribute new_attr
-    new_attr
-  end
-
-  ##
-  # The #aref prefix for attributes
-
-  def aref_prefix
-    'attribute'
-  end
-
-  ##
-  # Attributes never call super.  See RDoc::AnyMethod#calls_super
-  #
-  # An RDoc::Attr can show up in the method list in some situations (see
-  # Gem::ConfigFile)
-
-  def calls_super # :nodoc:
-    false
-  end
-
-  ##
-  # Returns attr_reader, attr_writer or attr_accessor as appropriate.
-
-  def definition
-    case @rw
-    when 'RW' then 'attr_accessor'
-    when 'R'  then 'attr_reader'
-    when 'W'  then 'attr_writer'
-    end
-  end
-
-  def inspect # :nodoc:
-    alias_for = @is_alias_for ? " (alias for #{@is_alias_for.name})" : nil
-    visibility = self.visibility
-    visibility = "forced #{visibility}" if force_documentation
-    "#<%s:0x%x %s %s (%s)%s>" % [
-      self.class, object_id,
-      full_name,
-      rw,
-      visibility,
-      alias_for,
-    ]
-  end
-
-  ##
-  # Dumps this Attr for use by ri.  See also #marshal_load
-
-  def marshal_dump
-    [ MARSHAL_VERSION,
-      @name,
-      full_name,
-      @rw,
-      @visibility,
-      parse(@comment),
-      singleton,
-      @file.relative_name,
-      @parent.full_name,
-      @parent.class,
-      @section.title
-    ]
-  end
-
-  ##
-  # Loads this Attr from +array+.  For a loaded Attr the following
-  # methods will return cached values:
-  #
-  # * #full_name
-  # * #parent_name
-
-  def marshal_load array
-    initialize_visibility
-
-    @aliases      = []
-    @parent       = nil
-    @parent_name  = nil
-    @parent_class = nil
-    @section      = nil
-    @file         = nil
-
-    version        = array[0]
-    @name          = array[1]
-    @full_name     = array[2]
-    @rw            = array[3]
-    @visibility    = array[4]
-    @comment       = array[5]
-    @singleton     = array[6] || false # MARSHAL_VERSION == 0
-    #                      7 handled below
-    @parent_name   = array[8]
-    @parent_class  = array[9]
-    @section_title = array[10]
-
-    @file = RDoc::TopLevel.new array[7] if version > 1
-
-    @parent_name ||= @full_name.split('#', 2).first
-  end
-
-  def pretty_print q # :nodoc:
-    q.group 2, "[#{self.class.name} #{full_name} #{rw} #{visibility}", "]" do
-      unless comment.empty? then
-        q.breakable
-        q.text "comment:"
-        q.breakable
-        q.pp @comment
-      end
-    end
-  end
-
-  def to_s # :nodoc:
-    "#{definition} #{name} in: #{parent}"
-  end
-
-  ##
-  # Attributes do not have token streams.
-  #
-  # An RDoc::Attr can show up in the method list in some situations (see
-  # Gem::ConfigFile)
-
-  def token_stream # :nodoc:
-  end
-
-end
diff --git a/lib/rdoc/class_module.rb b/lib/rdoc/class_module.rb
deleted file mode 100644
index c69e14b5e4ba0b..00000000000000
--- a/lib/rdoc/class_module.rb
+++ /dev/null
@@ -1,801 +0,0 @@
-# frozen_string_literal: true
-##
-# ClassModule is the base class for objects representing either a class or a
-# module.
-
-class RDoc::ClassModule < RDoc::Context
-
-  ##
-  # 1::
-  #   RDoc 3.7
-  #   * Added visibility, singleton and file to attributes
-  #   * Added file to constants
-  #   * Added file to includes
-  #   * Added file to methods
-  # 2::
-  #   RDoc 3.13
-  #   * Added extends
-  # 3::
-  #   RDoc 4.0
-  #   * Added sections
-  #   * Added in_files
-  #   * Added parent name
-  #   * Complete Constant dump
-
-  MARSHAL_VERSION = 3 # :nodoc:
-
-  ##
-  # Constants that are aliases for this class or module
-
-  attr_accessor :constant_aliases
-
-  ##
-  # Comment and the location it came from.  Use #add_comment to add comments
-
-  attr_accessor :comment_location
-
-  attr_accessor :diagram # :nodoc:
-
-  ##
-  # Class or module this constant is an alias for
-
-  attr_accessor :is_alias_for
-
-  ##
-  # Return a RDoc::ClassModule of class +class_type+ that is a copy
-  # of module +module+. Used to promote modules to classes.
-  #--
-  # TODO move to RDoc::NormalClass (I think)
-
-  def self.from_module class_type, mod
-    klass = class_type.new mod.name
-
-    mod.comment_location.each do |comment, location|
-      klass.add_comment comment, location
-    end
-
-    klass.parent = mod.parent
-    klass.section = mod.section
-    klass.viewer = mod.viewer
-
-    klass.attributes.concat mod.attributes
-    klass.method_list.concat mod.method_list
-    klass.aliases.concat mod.aliases
-    klass.external_aliases.concat mod.external_aliases
-    klass.constants.concat mod.constants
-    klass.includes.concat mod.includes
-    klass.extends.concat mod.extends
-
-    klass.methods_hash.update mod.methods_hash
-    klass.constants_hash.update mod.constants_hash
-
-    klass.current_section = mod.current_section
-    klass.in_files.concat mod.in_files
-    klass.sections.concat mod.sections
-    klass.unmatched_alias_lists = mod.unmatched_alias_lists
-    klass.current_section = mod.current_section
-    klass.visibility = mod.visibility
-
-    klass.classes_hash.update mod.classes_hash
-    klass.modules_hash.update mod.modules_hash
-    klass.metadata.update mod.metadata
-
-    klass.document_self = mod.received_nodoc ? nil : mod.document_self
-    klass.document_children = mod.document_children
-    klass.force_documentation = mod.force_documentation
-    klass.done_documenting = mod.done_documenting
-
-    # update the parent of all children
-
-    (klass.attributes +
-     klass.method_list +
-     klass.aliases +
-     klass.external_aliases +
-     klass.constants +
-     klass.includes +
-     klass.extends +
-     klass.classes +
-     klass.modules).each do |obj|
-      obj.parent = klass
-      obj.full_name = nil
-    end
-
-    klass
-  end
-
-  ##
-  # Creates a new ClassModule with +name+ with optional +superclass+
-  #
-  # This is a constructor for subclasses, and must never be called directly.
-
-  def initialize(name, superclass = nil)
-    @constant_aliases = []
-    @diagram          = nil
-    @is_alias_for     = nil
-    @name             = name
-    @superclass       = superclass
-    @comment_location = [] # [[comment, location]]
-
-    super()
-  end
-
-  ##
-  # Adds +comment+ to this ClassModule's list of comments at +location+.  This
-  # method is preferred over #comment= since it allows ri data to be updated
-  # across multiple runs.
-
-  def add_comment comment, location
-    return unless document_self
-
-    original = comment
-
-    comment = case comment
-              when RDoc::Comment then
-                comment.normalize
-              else
-                normalize_comment comment
-              end
-
-    if location.parser == RDoc::Parser::C
-      @comment_location.delete_if { |(_, l)| l == location }
-    end
-
-    @comment_location << [comment, location]
-
-    self.comment = original
-  end
-
-  def add_things my_things, other_things # :nodoc:
-    other_things.each do |group, things|
-      my_things[group].each { |thing| yield false, thing } if
-        my_things.include? group
-
-      things.each do |thing|
-        yield true, thing
-      end
-    end
-  end
-
-  ##
-  # Ancestors list for this ClassModule: the list of included modules
-  # (classes will add their superclass if any).
-  #
-  # Returns the included classes or modules, not the includes
-  # themselves. The returned values are either String or
-  # RDoc::NormalModule instances (see RDoc::Include#module).
-  #
-  # The values are returned in reverse order of their inclusion,
-  # which is the order suitable for searching methods/attributes
-  # in the ancestors. The superclass, if any, comes last.
-
-  def ancestors
-    includes.map { |i| i.module }.reverse
-  end
-
-  def aref_prefix # :nodoc:
-    raise NotImplementedError, "missing aref_prefix for #{self.class}"
-  end
-
-  ##
-  # HTML fragment reference for this module or class.  See
-  # RDoc::NormalClass#aref and RDoc::NormalModule#aref
-
-  def aref
-    "#{aref_prefix}-#{full_name}"
-  end
-
-  ##
-  # Ancestors of this class or module only
-
-  alias direct_ancestors ancestors
-
-  ##
-  # Clears the comment. Used by the Ruby parser.
-
-  def clear_comment
-    @comment = ''
-  end
-
-  ##
-  # This method is deprecated, use #add_comment instead.
-  #
-  # Appends +comment+ to the current comment, but separated by a rule.  Works
-  # more like <tt>+=</tt>.
-
-  def comment= comment # :nodoc:
-    comment = case comment
-              when RDoc::Comment then
-                comment.normalize
-              else
-                normalize_comment comment
-              end
-
-    comment = "#{@comment.to_s}\n---\n#{comment.to_s}" unless @comment.empty?
-
-    super comment
-  end
-
-  ##
-  # Prepares this ClassModule for use by a generator.
-  #
-  # See RDoc::Store#complete
-
-  def complete min_visibility
-    update_aliases
-    remove_nodoc_children
-    update_includes
-    remove_invisible min_visibility
-  end
-
-  ##
-  # Does this ClassModule or any of its methods have document_self set?
-
-  def document_self_or_methods
-    document_self || method_list.any?{ |m| m.document_self }
-  end
-
-  ##
-  # Does this class or module have a comment with content or is
-  # #received_nodoc true?
-
-  def documented?
-    return true if @received_nodoc
-    return false if @comment_location.empty?
-    @comment_location.any? { |comment, _| not comment.empty? }
-  end
-
-  ##
-  # Iterates the ancestors of this class or module for which an
-  # RDoc::ClassModule exists.
-
-  def each_ancestor # :yields: module
-    return enum_for __method__ unless block_given?
-
-    ancestors.each do |mod|
-      next if String === mod
-      next if self == mod
-      yield mod
-    end
-  end
-
-  ##
-  # Looks for a symbol in the #ancestors. See Context#find_local_symbol.
-
-  def find_ancestor_local_symbol symbol
-    each_ancestor do |m|
-      res = m.find_local_symbol(symbol)
-      return res if res
-    end
-
-    nil
-  end
-
-  ##
-  # Finds a class or module with +name+ in this namespace or its descendants
-
-  def find_class_named name
-    return self if full_name == name
-    return self if @name == name
-
-    @classes.values.find do |klass|
-      next if klass == self
-      klass.find_class_named name
-    end
-  end
-
-  ##
-  # Return the fully qualified name of this class or module
-
-  def full_name
-    @full_name ||= if RDoc::ClassModule === parent then
-                     "#{parent.full_name}::#{@name}"
-                   else
-                     @name
-                   end
-  end
-
-  ##
-  # TODO: filter included items by #display?
-
-  def marshal_dump # :nodoc:
-    attrs = attributes.sort.map do |attr|
-      next unless attr.display?
-      [ attr.name, attr.rw,
-        attr.visibility, attr.singleton, attr.file_name,
-      ]
-    end.compact
-
-    method_types = methods_by_type.map do |type, visibilities|
-      visibilities = visibilities.map do |visibility, methods|
-        method_names = methods.map do |method|
-          next unless method.display?
-          [method.name, method.file_name]
-        end.compact
-
-        [visibility, method_names.uniq]
-      end
-
-      [type, visibilities]
-    end
-
-    [ MARSHAL_VERSION,
-      @name,
-      full_name,
-      @superclass,
-      parse(@comment_location),
-      attrs,
-      constants.select { |constant| constant.display? },
-      includes.map do |incl|
-        next unless incl.display?
-        [incl.name, parse(incl.comment), incl.file_name]
-      end.compact,
-      method_types,
-      extends.map do |ext|
-        next unless ext.display?
-        [ext.name, parse(ext.comment), ext.file_name]
-      end.compact,
-      @sections.values,
-      @in_files.map do |tl|
-        tl.relative_name
-      end,
-      parent.full_name,
-      parent.class,
-    ]
-  end
-
-  def marshal_load array # :nodoc:
-    initialize_visibility
-    initialize_methods_etc
-    @current_section   = nil
-    @document_self     = true
-    @done_documenting  = false
-    @parent            = nil
-    @temporary_section = nil
-    @visibility        = nil
-    @classes           = {}
-    @modules           = {}
-
-    @name       = array[1]
-    @full_name  = array[2]
-    @superclass = array[3]
-    @comment    = array[4]
-
-    @comment_location = if RDoc::Markup::Document === @comment.parts.first then
-                          @comment
-                        else
-                          RDoc::Markup::Document.new @comment
-                        end
-
-    array[5].each do |name, rw, visibility, singleton, file|
-      singleton  ||= false
-      visibility ||= :public
-
-      attr = RDoc::Attr.new nil, name, rw, nil, singleton
-
-      add_attribute attr
-      attr.visibility = visibility
-      attr.record_location RDoc::TopLevel.new file
-    end
-
-    array[6].each do |constant, comment, file|
-      case constant
-      when RDoc::Constant then
-        add_constant constant
-      else
-        constant = add_constant RDoc::Constant.new(constant, nil, comment)
-        constant.record_location RDoc::TopLevel.new file
-      end
-    end
-
-    array[7].each do |name, comment, file|
-      incl = add_include RDoc::Include.new(name, comment)
-      incl.record_location RDoc::TopLevel.new file
-    end
-
-    array[8].each do |type, visibilities|
-      visibilities.each do |visibility, methods|
-        @visibility = visibility
-
-        methods.each do |name, file|
-          method = RDoc::AnyMethod.new nil, name
-          method.singleton = true if type == 'class'
-          method.record_location RDoc::TopLevel.new file
-          add_method method
-        end
-      end
-    end
-
-    array[9].each do |name, comment, file|
-      ext = add_extend RDoc::Extend.new(name, comment)
-      ext.record_location RDoc::TopLevel.new file
-    end if array[9] # Support Marshal version 1
-
-    sections = (array[10] || []).map do |section|
-      [section.title, section]
-    end
-
-    @sections = Hash[*sections.flatten]
-    @current_section = add_section nil
-
-    @in_files = []
-
-    (array[11] || []).each do |filename|
-      record_location RDoc::TopLevel.new filename
-    end
-
-    @parent_name  = array[12]
-    @parent_class = array[13]
-  end
-
-  ##
-  # Merges +class_module+ into this ClassModule.
-  #
-  # The data in +class_module+ is preferred over the receiver.
-
-  def merge class_module
-    @parent      = class_module.parent
-    @parent_name = class_module.parent_name
-
-    other_document = parse class_module.comment_location
-
-    if other_document then
-      document = parse @comment_location
-
-      document = document.merge other_document
-
-      @comment = @comment_location = document
-    end
-
-    cm = class_module
-    other_files = cm.in_files
-
-    merge_collections attributes, cm.attributes, other_files do |add, attr|
-      if add then
-        add_attribute attr
-      else
-        @attributes.delete attr
-        @methods_hash.delete attr.pretty_name
-      end
-    end
-
-    merge_collections constants, cm.constants, other_files do |add, const|
-      if add then
-        add_constant const
-      else
-        @constants.delete const
-        @constants_hash.delete const.name
-      end
-    end
-
-    merge_collections includes, cm.includes, other_files do |add, incl|
-      if add then
-        add_include incl
-      else
-        @includes.delete incl
-      end
-    end
-
-    @includes.uniq! # clean up
-
-    merge_collections extends, cm.extends, other_files do |add, ext|
-      if add then
-        add_extend ext
-      else
-        @extends.delete ext
-      end
-    end
-
-    @extends.uniq! # clean up
-
-    merge_collections method_list, cm.method_list, other_files do |add, meth|
-      if add then
-        add_method meth
-      else
-        @method_list.delete meth
-        @methods_hash.delete meth.pretty_name
-      end
-    end
-
-    merge_sections cm
-
-    self
-  end
-
-  ##
-  # Merges collection +mine+ with +other+ preferring other.  +other_files+ is
-  # used to help determine which items should be deleted.
-  #
-  # Yields whether the item should be added or removed (true or false) and the
-  # item to be added or removed.
-  #
-  #   merge_collections things, other.things, other.in_files do |add, thing|
-  #     if add then
-  #       # add the thing
-  #     else
-  #       # remove the thing
-  #     end
-  #   end
-
-  def merge_collections mine, other, other_files, &block # :nodoc:
-    my_things    = mine. group_by { |thing| thing.file }
-    other_things = other.group_by { |thing| thing.file }
-
-    remove_things my_things, other_files,  &block
-    add_things    my_things, other_things, &block
-  end
-
-  ##
-  # Merges the comments in this ClassModule with the comments in the other
-  # ClassModule +cm+.
-
-  def merge_sections cm # :nodoc:
-    my_sections    =    sections.group_by { |section| section.title }
-    other_sections = cm.sections.group_by { |section| section.title }
-
-    other_files = cm.in_files
-
-    remove_things my_sections, other_files do |_, section|
-      @sections.delete section.title
-    end
-
-    other_sections.each do |group, sections|
-      if my_sections.include? group
-        my_sections[group].each do |my_section|
-          other_section = cm.sections_hash[group]
-
-          my_comments    = my_section.comments
-          other_comments = other_section.comments
-
-          other_files = other_section.in_files
-
-          merge_collections my_comments, other_comments, other_files do |add, comment|
-            if add then
-              my_section.add_comment comment
-            else
-              my_section.remove_comment comment
-            end
-          end
-        end
-      else
-        sections.each do |section|
-          add_section group, section.comments
-        end
-      end
-    end
-  end
-
-  ##
-  # Does this object represent a module?
-
-  def module?
-    false
-  end
-
-  ##
-  # Allows overriding the initial name.
-  #
-  # Used for modules and classes that are constant aliases.
-
-  def name= new_name
-    @name = new_name
-  end
-
-  ##
-  # Parses +comment_location+ into an RDoc::Markup::Document composed of
-  # multiple RDoc::Markup::Documents with their file set.
-
-  def parse comment_location
-    case comment_location
-    when String then
-      super
-    when Array then
-      docs = comment_location.map do |comment, location|
-        doc = super comment
-        doc.file = location
-        doc
-      end
-
-      RDoc::Markup::Document.new(*docs)
-    when RDoc::Comment then
-      doc = super comment_location.text, comment_location.format
-      doc.file = comment_location.location
-      doc
-    when RDoc::Markup::Document then
-      return comment_location
-    else
-      raise ArgumentError, "unknown comment class #{comment_location.class}"
-    end
-  end
-
-  ##
-  # Path to this class or module for use with HTML generator output.
-
-  def path
-    http_url @store.rdoc.generator.class_dir
-  end
-
-  ##
-  # Name to use to generate the url:
-  # modules and classes that are aliases for another
-  # module or class return the name of the latter.
-
-  def name_for_path
-    is_alias_for ? is_alias_for.full_name : full_name
-  end
-
-  ##
-  # Returns the classes and modules that are not constants
-  # aliasing another class or module. For use by formatters
-  # only (caches its result).
-
-  def non_aliases
-    @non_aliases ||= classes_and_modules.reject { |cm| cm.is_alias_for }
-  end
-
-  ##
-  # Updates the child modules or classes of class/module +parent+ by
-  # deleting the ones that have been removed from the documentation.
-  #
-  # +parent_hash+ is either <tt>parent.modules_hash</tt> or
-  # <tt>parent.classes_hash</tt> and +all_hash+ is ::all_modules_hash or
-  # ::all_classes_hash.
-
-  def remove_nodoc_children
-    prefix = self.full_name + '::'
-
-    modules_hash.each_key do |name|
-      full_name = prefix + name
-      modules_hash.delete name unless @store.modules_hash[full_name]
-    end
-
-    classes_hash.each_key do |name|
-      full_name = prefix + name
-      classes_hash.delete name unless @store.classes_hash[full_name]
-    end
-  end
-
-  def remove_things my_things, other_files # :nodoc:
-    my_things.delete_if do |file, things|
-      next false unless other_files.include? file
-
-      things.each do |thing|
-        yield false, thing
-      end
-
-      true
-    end
-  end
-
-  ##
-  # Search record used by RDoc::Generator::JsonIndex
-
-  def search_record
-    [
-      name,
-      full_name,
-      full_name,
-      '',
-      path,
-      '',
-      snippet(@comment_location),
-    ]
-  end
-
-  ##
-  # Sets the store for this class or module and its contained code objects.
-
-  def store= store
-    super
-
-    @attributes .each do |attr|  attr.store  = store end
-    @constants  .each do |const| const.store = store end
-    @includes   .each do |incl|  incl.store  = store end
-    @extends    .each do |ext|   ext.store   = store end
-    @method_list.each do |meth|  meth.store  = store end
-  end
-
-  ##
-  # Get the superclass of this class.  Attempts to retrieve the superclass
-  # object, returns the name if it is not known.
-
-  def superclass
-    @store.find_class_named(@superclass) || @superclass
-  end
-
-  ##
-  # Set the superclass of this class to +superclass+
-
-  def superclass=(superclass)
-    raise NoMethodError, "#{full_name} is a module" if module?
-    @superclass = superclass
-  end
-
-  def to_s # :nodoc:
-    if is_alias_for then
-      "#{self.class.name} #{self.full_name} -> #{is_alias_for}"
-    else
-      super
-    end
-  end
-
-  ##
-  # 'module' or 'class'
-
-  def type
-    module? ? 'module' : 'class'
-  end
-
-  ##
-  # Updates the child modules & classes by replacing the ones that are
-  # aliases through a constant.
-  #
-  # The aliased module/class is replaced in the children and in
-  # RDoc::Store#modules_hash or RDoc::Store#classes_hash
-  # by a copy that has <tt>RDoc::ClassModule#is_alias_for</tt> set to
-  # the aliased module/class, and this copy is added to <tt>#aliases</tt>
-  # of the aliased module/class.
-  #
-  # Formatters can use the #non_aliases method to retrieve children that
-  # are not aliases, for instance to list the namespace content, since
-  # the aliased modules are included in the constants of the class/module,
-  # that are listed separately.
-
-  def update_aliases
-    constants.each do |const|
-      next unless cm = const.is_alias_for
-      cm_alias = cm.dup
-      cm_alias.name = const.name
-
-      # Don't move top-level aliases under Object, they look ugly there
-      unless RDoc::TopLevel === cm_alias.parent then
-        cm_alias.parent = self
-        cm_alias.full_name = nil # force update for new parent
-      end
-
-      cm_alias.aliases.clear
-      cm_alias.is_alias_for = cm
-
-      if cm.module? then
-        @store.modules_hash[cm_alias.full_name] = cm_alias
-        modules_hash[const.name] = cm_alias
-      else
-        @store.classes_hash[cm_alias.full_name] = cm_alias
-        classes_hash[const.name] = cm_alias
-      end
-
-      cm.aliases << cm_alias
-    end
-  end
-
-  ##
-  # Deletes from #includes those whose module has been removed from the
-  # documentation.
-  #--
-  # FIXME: includes are not reliably removed, see _possible_bug test case
-
-  def update_includes
-    includes.reject! do |include|
-      mod = include.module
-      !(String === mod) && @store.modules_hash[mod.full_name].nil?
-    end
-
-    includes.uniq!
-  end
-
-  ##
-  # Deletes from #extends those whose module has been removed from the
-  # documentation.
-  #--
-  # FIXME: like update_includes, extends are not reliably removed
-
-  def update_extends
-    extends.reject! do |ext|
-      mod = ext.module
-
-      !(String === mod) && @store.modules_hash[mod.full_name].nil?
-    end
-
-    extends.uniq!
-  end
-
-end
diff --git a/lib/rdoc/code_object.rb b/lib/rdoc/code_object.rb
deleted file mode 100644
index aeb4b4762e88da..00000000000000
--- a/lib/rdoc/code_object.rb
+++ /dev/null
@@ -1,421 +0,0 @@
-# frozen_string_literal: true
-##
-# Base class for the RDoc code tree.
-#
-# We contain the common stuff for contexts (which are containers) and other
-# elements (methods, attributes and so on)
-#
-# Here's the tree of the CodeObject subclasses:
-#
-# * RDoc::Context
-#   * RDoc::TopLevel
-#   * RDoc::ClassModule
-#     * RDoc::AnonClass (never used so far)
-#     * RDoc::NormalClass
-#     * RDoc::NormalModule
-#     * RDoc::SingleClass
-# * RDoc::MethodAttr
-#   * RDoc::Attr
-#   * RDoc::AnyMethod
-#     * RDoc::GhostMethod
-#     * RDoc::MetaMethod
-# * RDoc::Alias
-# * RDoc::Constant
-# * RDoc::Mixin
-#   * RDoc::Require
-#   * RDoc::Include
-
-class RDoc::CodeObject
-
-  include RDoc::Text
-
-  ##
-  # Our comment
-
-  attr_reader :comment
-
-  ##
-  # Do we document our children?
-
-  attr_reader :document_children
-
-  ##
-  # Do we document ourselves?
-
-  attr_reader :document_self
-
-  ##
-  # Are we done documenting (ie, did we come across a :enddoc:)?
-
-  attr_reader :done_documenting
-
-  ##
-  # Which file this code object was defined in
-
-  attr_reader :file
-
-  ##
-  # Force documentation of this CodeObject
-
-  attr_reader :force_documentation
-
-  ##
-  # Line in #file where this CodeObject was defined
-
-  attr_accessor :line
-
-  ##
-  # Hash of arbitrary metadata for this CodeObject
-
-  attr_reader :metadata
-
-  ##
-  # Sets the parent CodeObject
-
-  attr_writer :parent
-
-  ##
-  # Did we ever receive a +:nodoc:+ directive?
-
-  attr_reader :received_nodoc
-
-  ##
-  # Set the section this CodeObject is in
-
-  attr_writer :section
-
-  ##
-  # The RDoc::Store for this object.
-
-  attr_reader :store
-
-  ##
-  # We are the model of the code, but we know that at some point we will be
-  # worked on by viewers. By implementing the Viewable protocol, viewers can
-  # associated themselves with these objects.
-
-  attr_accessor :viewer
-
-  ##
-  # Creates a new CodeObject that will document itself and its children
-
-  def initialize
-    @metadata         = {}
-    @comment          = ''
-    @parent           = nil
-    @parent_name      = nil # for loading
-    @parent_class     = nil # for loading
-    @section          = nil
-    @section_title    = nil # for loading
-    @file             = nil
-    @full_name        = nil
-    @store            = nil
-    @track_visibility = true
-
-    initialize_visibility
-  end
-
-  ##
-  # Initializes state for visibility of this CodeObject and its children.
-
-  def initialize_visibility # :nodoc:
-    @document_children   = true
-    @document_self       = true
-    @done_documenting    = false
-    @force_documentation = false
-    @received_nodoc      = false
-    @ignored             = false
-    @suppressed          = false
-    @track_visibility    = true
-  end
-
-  ##
-  # Replaces our comment with +comment+, unless it is empty.
-
-  def comment=(comment)
-    @comment = case comment
-               when NilClass               then ''
-               when RDoc::Markup::Document then comment
-               when RDoc::Comment          then comment.normalize
-               else
-                 if comment and not comment.empty? then
-                   normalize_comment comment
-                 else
-                   # HACK correct fix is to have #initialize create @comment
-                   #      with the correct encoding
-                   if String === @comment and @comment.empty? then
-                     @comment = RDoc::Encoding.change_encoding @comment, comment.encoding
-                   end
-                   @comment
-                 end
-               end
-  end
-
-  ##
-  # Should this CodeObject be displayed in output?
-  #
-  # A code object should be displayed if:
-  #
-  # * The item didn't have a nodoc or wasn't in a container that had nodoc
-  # * The item wasn't ignored
-  # * The item has documentation and was not suppressed
-
-  def display?
-    @document_self and not @ignored and
-      (documented? or not @suppressed)
-  end
-
-  ##
-  # Enables or disables documentation of this CodeObject's children unless it
-  # has been turned off by :enddoc:
-
-  def document_children=(document_children)
-    return unless @track_visibility
-
-    @document_children = document_children unless @done_documenting
-  end
-
-  ##
-  # Enables or disables documentation of this CodeObject unless it has been
-  # turned off by :enddoc:.  If the argument is +nil+ it means the
-  # documentation is turned off by +:nodoc:+.
-
-  def document_self=(document_self)
-    return unless @track_visibility
-    return if @done_documenting
-
-    @document_self = document_self
-    @received_nodoc = true if document_self.nil?
-  end
-
-  ##
-  # Does this object have a comment with content or is #received_nodoc true?
-
-  def documented?
-    @received_nodoc or !@comment.empty?
-  end
-
-  ##
-  # Turns documentation on/off, and turns on/off #document_self
-  # and #document_children.
-  #
-  # Once documentation has been turned off (by +:enddoc:+),
-  # the object will refuse to turn #document_self or
-  # #document_children on, so +:doc:+ and +:start_doc:+ directives
-  # will have no effect in the current file.
-
-  def done_documenting=(value)
-    return unless @track_visibility
-    @done_documenting  = value
-    @document_self     = !value
-    @document_children = @document_self
-  end
-
-  ##
-  # Yields each parent of this CodeObject.  See also
-  # RDoc::ClassModule#each_ancestor
-
-  def each_parent
-    code_object = self
-
-    while code_object = code_object.parent do
-      yield code_object
-    end
-
-    self
-  end
-
-  ##
-  # File name where this CodeObject was found.
-  #
-  # See also RDoc::Context#in_files
-
-  def file_name
-    return unless @file
-
-    @file.absolute_name
-  end
-
-  ##
-  # Force the documentation of this object unless documentation
-  # has been turned off by :enddoc:
-  #--
-  # HACK untested, was assigning to an ivar
-
-  def force_documentation=(value)
-    @force_documentation = value unless @done_documenting
-  end
-
-  ##
-  # Sets the full_name overriding any computed full name.
-  #
-  # Set to +nil+ to clear RDoc's cached value
-
-  def full_name= full_name
-    @full_name = full_name
-  end
-
-  ##
-  # Use this to ignore a CodeObject and all its children until found again
-  # (#record_location is called).  An ignored item will not be displayed in
-  # documentation.
-  #
-  # See github issue #55
-  #
-  # The ignored status is temporary in order to allow implementation details
-  # to be hidden.  At the end of processing a file RDoc allows all classes
-  # and modules to add new documentation to previously created classes.
-  #
-  # If a class was ignored (via stopdoc) then reopened later with additional
-  # documentation it should be displayed.  If a class was ignored and never
-  # reopened it should not be displayed.  The ignore flag allows this to
-  # occur.
-
-  def ignore
-    return unless @track_visibility
-
-    @ignored = true
-
-    stop_doc
-  end
-
-  ##
-  # Has this class been ignored?
-  #
-  # See also #ignore
-
-  def ignored?
-    @ignored
-  end
-
-  ##
-  # The options instance from the store this CodeObject is attached to, or a
-  # default options instance if the CodeObject is not attached.
-  #
-  # This is used by Text#snippet
-
-  def options
-    if @store and @store.rdoc then
-      @store.rdoc.options
-    else
-      RDoc::Options.new
-    end
-  end
-
-  ##
-  # Our parent CodeObject.  The parent may be missing for classes loaded from
-  # legacy RI data stores.
-
-  def parent
-    return @parent if @parent
-    return nil unless @parent_name
-
-    if @parent_class == RDoc::TopLevel then
-      @parent = @store.add_file @parent_name
-    else
-      @parent = @store.find_class_or_module @parent_name
-
-      return @parent if @parent
-
-      begin
-        @parent = @store.load_class @parent_name
-      rescue RDoc::Store::MissingFileError
-        nil
-      end
-    end
-  end
-
-  ##
-  # File name of our parent
-
-  def parent_file_name
-    @parent ? @parent.base_name : '(unknown)'
-  end
-
-  ##
-  # Name of our parent
-
-  def parent_name
-    @parent ? @parent.full_name : '(unknown)'
-  end
-
-  ##
-  # Records the RDoc::TopLevel (file) where this code object was defined
-
-  def record_location top_level
-    @ignored    = false
-    @suppressed = false
-    @file       = top_level
-  end
-
-  ##
-  # The section this CodeObject is in.  Sections allow grouping of constants,
-  # attributes and methods inside a class or module.
-
-  def section
-    return @section if @section
-
-    @section = parent.add_section @section_title if parent
-  end
-
-  ##
-  # Enable capture of documentation unless documentation has been
-  # turned off by :enddoc:
-
-  def start_doc
-    return if @done_documenting
-
-    @document_self = true
-    @document_children = true
-    @ignored    = false
-    @suppressed = false
-  end
-
-  ##
-  # Disable capture of documentation
-
-  def stop_doc
-    return unless @track_visibility
-
-    @document_self = false
-    @document_children = false
-  end
-
-  ##
-  # Sets the +store+ that contains this CodeObject
-
-  def store= store
-    @store = store
-
-    return unless @track_visibility
-
-    if :nodoc == options.visibility then
-      initialize_visibility
-      @track_visibility = false
-    end
-  end
-
-  ##
-  # Use this to suppress a CodeObject and all its children until the next file
-  # it is seen in or documentation is discovered.  A suppressed item with
-  # documentation will be displayed while an ignored item with documentation
-  # may not be displayed.
-
-  def suppress
-    return unless @track_visibility
-
-    @suppressed = true
-
-    stop_doc
-  end
-
-  ##
-  # Has this class been suppressed?
-  #
-  # See also #suppress
-
-  def suppressed?
-    @suppressed
-  end
-
-end
diff --git a/lib/rdoc/code_objects.rb b/lib/rdoc/code_objects.rb
deleted file mode 100644
index d5f2f920ad1402..00000000000000
--- a/lib/rdoc/code_objects.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-# frozen_string_literal: true
-# This file was used to load all the RDoc::CodeObject subclasses at once.  Now
-# autoload handles this.
-
-require_relative '../rdoc'
diff --git a/lib/rdoc/comment.rb b/lib/rdoc/comment.rb
deleted file mode 100644
index fecdcac7820b39..00000000000000
--- a/lib/rdoc/comment.rb
+++ /dev/null
@@ -1,229 +0,0 @@
-# frozen_string_literal: true
-##
-# A comment holds the text comment for a RDoc::CodeObject and provides a
-# unified way of cleaning it up and parsing it into an RDoc::Markup::Document.
-#
-# Each comment may have a different markup format set by #format=.  By default
-# 'rdoc' is used.  The :markup: directive tells RDoc which format to use.
-#
-# See RDoc::Markup@Other+directives for instructions on adding an alternate
-# format.
-
-class RDoc::Comment
-
-  include RDoc::Text
-
-  ##
-  # The format of this comment.  Defaults to RDoc::Markup
-
-  attr_reader :format
-
-  ##
-  # The RDoc::TopLevel this comment was found in
-
-  attr_accessor :location
-
-  ##
-  # Line where this Comment was written
-
-  attr_accessor :line
-
-  ##
-  # For duck-typing when merging classes at load time
-
-  alias file location # :nodoc:
-
-  ##
-  # The text for this comment
-
-  attr_reader :text
-
-  ##
-  # Alias for text
-
-  alias to_s text
-
-  ##
-  # Overrides the content returned by #parse.  Use when there is no #text
-  # source for this comment
-
-  attr_writer   :document
-
-  ##
-  # Creates a new comment with +text+ that is found in the RDoc::TopLevel
-  # +location+.
-
-  def initialize text = nil, location = nil, language = nil
-    @location = location
-    @text     = text.nil? ? nil : text.dup
-    @language = language
-
-    @document   = nil
-    @format     = 'rdoc'
-    @normalized = false
-  end
-
-  ##
-  #--
-  # TODO deep copy @document
-
-  def initialize_copy copy # :nodoc:
-    @text = copy.text.dup
-  end
-
-  def == other # :nodoc:
-    self.class === other and
-      other.text == @text and other.location == @location
-  end
-
-  ##
-  # Look for a 'call-seq' in the comment to override the normal parameter
-  # handling.  The :call-seq: is indented from the baseline.  All lines of the
-  # same indentation level and prefix are consumed.
-  #
-  # For example, all of the following will be used as the :call-seq:
-  #
-  #   # :call-seq:
-  #   #   ARGF.readlines(sep=$/)     -> array
-  #   #   ARGF.readlines(limit)      -> array
-  #   #   ARGF.readlines(sep, limit) -> array
-  #   #
-  #   #   ARGF.to_a(sep=$/)     -> array
-  #   #   ARGF.to_a(limit)      -> array
-  #   #   ARGF.to_a(sep, limit) -> array
-
-  def extract_call_seq method
-    # we must handle situations like the above followed by an unindented first
-    # comment.  The difficulty is to make sure not to match lines starting
-    # with ARGF at the same indent, but that are after the first description
-    # paragraph.
-    if /^(?<S> ((?!\n)\s)*+        (?# whitespaces except newline))
-         :?call-seq:
-           (?<B> \g<S>(?<N>\n|\z)  (?# trailing spaces))?
-         (?<seq>
-           (\g<S>(?!\w)\S.*\g<N>)*
-           (?>
-             (?<H> \g<S>\w+        (?# ' #   ARGF' in the example above))
-             .*\g<N>)?
-           (\g<S>\S.*\g<N>         (?# other non-blank line))*+
-           (\g<B>+(\k<H>.*\g<N>    (?# ARGF.to_a lines))++)*+
-         )
-         (?m:^\s*$|\z)
-        /x =~ @text
-      seq = $~[:seq]
-
-      all_start, all_stop = $~.offset(0)
-      @text.slice! all_start...all_stop
-
-      seq.gsub!(/^\s*/, '')
-      method.call_seq = seq
-    end
-
-    method
-  end
-
-  ##
-  # A comment is empty if its text String is empty.
-
-  def empty?
-    @text.empty?
-  end
-
-  ##
-  # HACK dubious
-
-  def encode! encoding
-    @text = String.new @text, encoding: encoding
-    self
-  end
-
-  ##
-  # Sets the format of this comment and resets any parsed document
-
-  def format= format
-    @format = format
-    @document = nil
-  end
-
-  def inspect # :nodoc:
-    location = @location ? @location.relative_name : '(unknown)'
-
-    "#<%s:%x %s %p>" % [self.class, object_id, location, @text]
-  end
-
-  ##
-  # Normalizes the text.  See RDoc::Text#normalize_comment for details
-
-  def normalize
-    return self unless @text
-    return self if @normalized # TODO eliminate duplicate normalization
-
-    @text = normalize_comment @text
-
-    @normalized = true
-
-    self
-  end
-
-  ##
-  # Was this text normalized?
-
-  def normalized? # :nodoc:
-    @normalized
-  end
-
-  ##
-  # Parses the comment into an RDoc::Markup::Document.  The parsed document is
-  # cached until the text is changed.
-
-  def parse
-    return @document if @document
-
-    @document = super @text, @format
-    @document.file = @location
-    @document
-  end
-
-  ##
-  # Removes private sections from this comment.  Private sections are flush to
-  # the comment marker and start with <tt>--</tt> and end with <tt>++</tt>.
-  # For C-style comments, a private marker may not start at the opening of the
-  # comment.
-  #
-  #   /*
-  #    *--
-  #    * private
-  #    *++
-  #    * public
-  #    */
-
-  def remove_private
-    # Workaround for gsub encoding for Ruby 1.9.2 and earlier
-    empty = ''
-    empty = RDoc::Encoding.change_encoding empty, @text.encoding
-
-    @text = @text.gsub(%r%^\s*([#*]?)--.*?^\s*(\1)\+\+\n?%m, empty)
-    @text = @text.sub(%r%^\s*[#*]?--.*%m, '')
-  end
-
-  ##
-  # Replaces this comment's text with +text+ and resets the parsed document.
-  #
-  # An error is raised if the comment contains a document but no text.
-
-  def text= text
-    raise RDoc::Error, 'replacing document-only comment is not allowed' if
-      @text.nil? and @document
-
-    @document = nil
-    @text = text.nil? ? nil : text.dup
-  end
-
-  ##
-  # Returns true if this comment is in TomDoc format.
-
-  def tomdoc?
-    @format == 'tomdoc'
-  end
-
-end
diff --git a/lib/rdoc/constant.rb b/lib/rdoc/constant.rb
deleted file mode 100644
index 12b8be775cf6f2..00000000000000
--- a/lib/rdoc/constant.rb
+++ /dev/null
@@ -1,186 +0,0 @@
-# frozen_string_literal: true
-##
-# A constant
-
-class RDoc::Constant < RDoc::CodeObject
-
-  MARSHAL_VERSION = 0 # :nodoc:
-
-  ##
-  # Sets the module or class this is constant is an alias for.
-
-  attr_writer :is_alias_for
-
-  ##
-  # The constant's name
-
-  attr_accessor :name
-
-  ##
-  # The constant's value
-
-  attr_accessor :value
-
-  ##
-  # The constant's visibility
-
-  attr_accessor :visibility
-
-  ##
-  # Creates a new constant with +name+, +value+ and +comment+
-
-  def initialize(name, value, comment)
-    super()
-
-    @name  = name
-    @value = value
-
-    @is_alias_for = nil
-    @visibility   = :public
-
-    self.comment = comment
-  end
-
-  ##
-  # Constants are ordered by name
-
-  def <=> other
-    return unless self.class === other
-
-    [parent_name, name] <=> [other.parent_name, other.name]
-  end
-
-  ##
-  # Constants are equal when their #parent and #name is the same
-
-  def == other
-    self.class == other.class and
-      @parent == other.parent and
-      @name == other.name
-  end
-
-  ##
-  # A constant is documented if it has a comment, or is an alias
-  # for a documented class or module.
-
-  def documented?
-    return true if super
-    return false unless @is_alias_for
-    case @is_alias_for
-    when String then
-      found = @store.find_class_or_module @is_alias_for
-      return false unless found
-      @is_alias_for = found
-    end
-    @is_alias_for.documented?
-  end
-
-  ##
-  # Full constant name including namespace
-
-  def full_name
-    @full_name ||= "#{parent_name}::#{@name}"
-  end
-
-  ##
-  # The module or class this constant is an alias for
-
-  def is_alias_for
-    case @is_alias_for
-    when String then
-      found = @store.find_class_or_module @is_alias_for
-      @is_alias_for = found if found
-      @is_alias_for
-    else
-      @is_alias_for
-    end
-  end
-
-  def inspect # :nodoc:
-    "#<%s:0x%x %s::%s>" % [
-      self.class, object_id,
-      parent_name, @name,
-    ]
-  end
-
-  ##
-  # Dumps this Constant for use by ri.  See also #marshal_load
-
-  def marshal_dump
-    alias_name = case found = is_alias_for
-                 when RDoc::CodeObject then found.full_name
-                 else                       found
-                 end
-
-    [ MARSHAL_VERSION,
-      @name,
-      full_name,
-      @visibility,
-      alias_name,
-      parse(@comment),
-      @file.relative_name,
-      parent.name,
-      parent.class,
-      section.title,
-    ]
-  end
-
-  ##
-  # Loads this Constant from +array+.  For a loaded Constant the following
-  # methods will return cached values:
-  #
-  # * #full_name
-  # * #parent_name
-
-  def marshal_load array
-    initialize array[1], nil, array[5]
-
-    @full_name     = array[2]
-    @visibility    = array[3] || :public
-    @is_alias_for  = array[4]
-    #                      5 handled above
-    #                      6 handled below
-    @parent_name   = array[7]
-    @parent_class  = array[8]
-    @section_title = array[9]
-
-    @file = RDoc::TopLevel.new array[6]
-  end
-
-  ##
-  # Path to this constant for use with HTML generator output.
-
-  def path
-    "#{@parent.path}##{@name}"
-  end
-
-  def pretty_print q # :nodoc:
-    q.group 2, "[#{self.class.name} #{full_name}", "]" do
-      unless comment.empty? then
-        q.breakable
-        q.text "comment:"
-        q.breakable
-        q.pp @comment
-      end
-    end
-  end
-
-  ##
-  # Sets the store for this class or module and its contained code objects.
-
-  def store= store
-    super
-
-    @file = @store.add_file @file.full_name if @file
-  end
-
-  def to_s # :nodoc:
-    parent_name = parent ? parent.full_name : '(unknown)'
-    if is_alias_for
-      "constant #{parent_name}::#@name -> #{is_alias_for}"
-    else
-      "constant #{parent_name}::#@name"
-    end
-  end
-
-end
diff --git a/lib/rdoc/context.rb b/lib/rdoc/context.rb
deleted file mode 100644
index c6edfb473c2d16..00000000000000
--- a/lib/rdoc/context.rb
+++ /dev/null
@@ -1,1264 +0,0 @@
-# frozen_string_literal: true
-##
-# A Context is something that can hold modules, classes, methods, attributes,
-# aliases, requires, and includes. Classes, modules, and files are all
-# Contexts.
-
-class RDoc::Context < RDoc::CodeObject
-
-  include Comparable
-
-  ##
-  # Types of methods
-
-  TYPES = %w[class instance]
-
-  ##
-  # If a context has these titles it will be sorted in this order.
-
-  TOMDOC_TITLES = [nil, 'Public', 'Internal', 'Deprecated'] # :nodoc:
-  TOMDOC_TITLES_SORT = TOMDOC_TITLES.sort_by { |title| title.to_s } # :nodoc:
-
-  ##
-  # Class/module aliases
-
-  attr_reader :aliases
-
-  ##
-  # All attr* methods
-
-  attr_reader :attributes
-
-  ##
-  # Block params to be used in the next MethodAttr parsed under this context
-
-  attr_accessor :block_params
-
-  ##
-  # Constants defined
-
-  attr_reader :constants
-
-  ##
-  # Sets the current documentation section of documentation
-
-  attr_writer :current_section
-
-  ##
-  # Files this context is found in
-
-  attr_reader :in_files
-
-  ##
-  # Modules this context includes
-
-  attr_reader :includes
-
-  ##
-  # Modules this context is extended with
-
-  attr_reader :extends
-
-  ##
-  # Methods defined in this context
-
-  attr_reader :method_list
-
-  ##
-  # Name of this class excluding namespace.  See also full_name
-
-  attr_reader :name
-
-  ##
-  # Files this context requires
-
-  attr_reader :requires
-
-  ##
-  # Use this section for the next method, attribute or constant added.
-
-  attr_accessor :temporary_section
-
-  ##
-  # Hash <tt>old_name => [aliases]</tt>, for aliases
-  # that haven't (yet) been resolved to a method/attribute.
-  # (Not to be confused with the aliases of the context.)
-
-  attr_accessor :unmatched_alias_lists
-
-  ##
-  # Aliases that could not be resolved.
-
-  attr_reader :external_aliases
-
-  ##
-  # Current visibility of this context
-
-  attr_accessor :visibility
-
-  ##
-  # Current visibility of this line
-
-  attr_writer :current_line_visibility
-
-  ##
-  # Hash of registered methods. Attributes are also registered here,
-  # twice if they are RW.
-
-  attr_reader :methods_hash
-
-  ##
-  # Params to be used in the next MethodAttr parsed under this context
-
-  attr_accessor :params
-
-  ##
-  # Hash of registered constants.
-
-  attr_reader :constants_hash
-
-  ##
-  # Creates an unnamed empty context with public current visibility
-
-  def initialize
-    super
-
-    @in_files = []
-
-    @name    ||= "unknown"
-    @parent  = nil
-    @visibility = :public
-
-    @current_section = Section.new self, nil, nil
-    @sections = { nil => @current_section }
-    @temporary_section = nil
-
-    @classes = {}
-    @modules = {}
-
-    initialize_methods_etc
-  end
-
-  ##
-  # Sets the defaults for methods and so-forth
-
-  def initialize_methods_etc
-    @method_list = []
-    @attributes  = []
-    @aliases     = []
-    @requires    = []
-    @includes    = []
-    @extends     = []
-    @constants   = []
-    @external_aliases = []
-    @current_line_visibility = nil
-
-    # This Hash maps a method name to a list of unmatched aliases (aliases of
-    # a method not yet encountered).
-    @unmatched_alias_lists = {}
-
-    @methods_hash   = {}
-    @constants_hash = {}
-
-    @params = nil
-
-    @store ||= nil
-  end
-
-  ##
-  # Contexts are sorted by full_name
-
-  def <=>(other)
-    return nil unless RDoc::CodeObject === other
-
-    full_name <=> other.full_name
-  end
-
-  ##
-  # Adds an item of type +klass+ with the given +name+ and +comment+ to the
-  # context.
-  #
-  # Currently only RDoc::Extend and RDoc::Include are supported.
-
-  def add klass, name, comment
-    if RDoc::Extend == klass then
-      ext = RDoc::Extend.new name, comment
-      add_extend ext
-    elsif RDoc::Include == klass then
-      incl = RDoc::Include.new name, comment
-      add_include incl
-    else
-      raise NotImplementedError, "adding a #{klass} is not implemented"
-    end
-  end
-
-  ##
-  # Adds +an_alias+ that is automatically resolved
-
-  def add_alias an_alias
-    return an_alias unless @document_self
-
-    method_attr = find_method(an_alias.old_name, an_alias.singleton) ||
-                  find_attribute(an_alias.old_name, an_alias.singleton)
-
-    if method_attr then
-      method_attr.add_alias an_alias, self
-    else
-      add_to @external_aliases, an_alias
-      unmatched_alias_list =
-        @unmatched_alias_lists[an_alias.pretty_old_name] ||= []
-      unmatched_alias_list.push an_alias
-    end
-
-    an_alias
-  end
-
-  ##
-  # Adds +attribute+ if not already there. If it is (as method(s) or attribute),
-  # updates the comment if it was empty.
-  #
-  # The attribute is registered only if it defines a new method.
-  # For instance, <tt>attr_reader :foo</tt> will not be registered
-  # if method +foo+ exists, but <tt>attr_accessor :foo</tt> will be registered
-  # if method +foo+ exists, but <tt>foo=</tt> does not.
-
-  def add_attribute attribute
-    return attribute unless @document_self
-
-    # mainly to check for redefinition of an attribute as a method
-    # TODO find a policy for 'attr_reader :foo' + 'def foo=()'
-    register = false
-
-    key = nil
-
-    if attribute.rw.index 'R' then
-      key = attribute.pretty_name
-      known = @methods_hash[key]
-
-      if known then
-        known.comment = attribute.comment if known.comment.empty?
-      elsif registered = @methods_hash[attribute.pretty_name + '='] and
-            RDoc::Attr === registered then
-        registered.rw = 'RW'
-      else
-        @methods_hash[key] = attribute
-        register = true
-      end
-    end
-
-    if attribute.rw.index 'W' then
-      key = attribute.pretty_name + '='
-      known = @methods_hash[key]
-
-      if known then
-        known.comment = attribute.comment if known.comment.empty?
-      elsif registered = @methods_hash[attribute.pretty_name] and
-            RDoc::Attr === registered then
-        registered.rw = 'RW'
-      else
-        @methods_hash[key] = attribute
-        register = true
-      end
-    end
-
-    if register then
-      attribute.visibility = @visibility
-      add_to @attributes, attribute
-      resolve_aliases attribute
-    end
-
-    attribute
-  end
-
-  ##
-  # Adds a class named +given_name+ with +superclass+.
-  #
-  # Both +given_name+ and +superclass+ may contain '::', and are
-  # interpreted relative to the +self+ context. This allows handling correctly
-  # examples like these:
-  #   class RDoc::Gauntlet < Gauntlet
-  #   module Mod
-  #     class Object   # implies < ::Object
-  #     class SubObject < Object  # this is _not_ ::Object
-  #
-  # Given <tt>class Container::Item</tt> RDoc assumes +Container+ is a module
-  # unless it later sees <tt>class Container</tt>.  +add_class+ automatically
-  # upgrades +given_name+ to a class in this case.
-
-  def add_class class_type, given_name, superclass = '::Object'
-    # superclass +nil+ is passed by the C parser in the following cases:
-    # - registering Object in 1.8 (correct)
-    # - registering BasicObject in 1.9 (correct)
-    # - registering RubyVM in 1.9 in iseq.c (incorrect: < Object in vm.c)
-    #
-    # If we later find a superclass for a registered class with a nil
-    # superclass, we must honor it.
-
-    # find the name & enclosing context
-    if given_name =~ /^:+(\w+)$/ then
-      full_name = $1
-      enclosing = top_level
-      name = full_name.split(/:+/).last
-    else
-      full_name = child_name given_name
-
-      if full_name =~ /^(.+)::(\w+)$/ then
-        name = $2
-        ename = $1
-        enclosing = @store.classes_hash[ename] || @store.modules_hash[ename]
-        # HACK: crashes in actionpack/lib/action_view/helpers/form_helper.rb (metaprogramming)
-        unless enclosing then
-          # try the given name at top level (will work for the above example)
-          enclosing = @store.classes_hash[given_name] ||
-                      @store.modules_hash[given_name]
-          return enclosing if enclosing
-          # not found: create the parent(s)
-          names = ename.split('::')
-          enclosing = self
-          names.each do |n|
-            enclosing = enclosing.classes_hash[n] ||
-                        enclosing.modules_hash[n] ||
-                        enclosing.add_module(RDoc::NormalModule, n)
-          end
-        end
-      else
-        name = full_name
-        enclosing = self
-      end
-    end
-
-    # fix up superclass
-    if full_name == 'BasicObject' then
-      superclass = nil
-    elsif full_name == 'Object' then
-      superclass = '::BasicObject'
-    end
-
-    # find the superclass full name
-    if superclass then
-      if superclass =~ /^:+/ then
-        superclass = $' #'
-      else
-        if superclass =~ /^(\w+):+(.+)$/ then
-          suffix = $2
-          mod = find_module_named($1)
-          superclass = mod.full_name + '::' + suffix if mod
-        else
-          mod = find_module_named(superclass)
-          superclass = mod.full_name if mod
-        end
-      end
-
-      # did we believe it was a module?
-      mod = @store.modules_hash.delete superclass
-
-      upgrade_to_class mod, RDoc::NormalClass, mod.parent if mod
-
-      # e.g., Object < Object
-      superclass = nil if superclass == full_name
-    end
-
-    klass = @store.classes_hash[full_name]
-
-    if klass then
-      # if TopLevel, it may not be registered in the classes:
-      enclosing.classes_hash[name] = klass
-
-      # update the superclass if needed
-      if superclass then
-        existing = klass.superclass
-        existing = existing.full_name unless existing.is_a?(String) if existing
-        if existing.nil? ||
-           (existing == 'Object' && superclass != 'Object') then
-          klass.superclass = superclass
-        end
-      end
-    else
-      # this is a new class
-      mod = @store.modules_hash.delete full_name
-
-      if mod then
-        klass = upgrade_to_class mod, RDoc::NormalClass, enclosing
-
-        klass.superclass = superclass unless superclass.nil?
-      else
-        klass = class_type.new name, superclass
-
-        enclosing.add_class_or_module(klass, enclosing.classes_hash,
-                                      @store.classes_hash)
-      end
-    end
-
-    klass.parent = self
-
-    klass
-  end
-
-  ##
-  # Adds the class or module +mod+ to the modules or
-  # classes Hash +self_hash+, and to +all_hash+ (either
-  # <tt>TopLevel::modules_hash</tt> or <tt>TopLevel::classes_hash</tt>),
-  # unless #done_documenting is +true+. Sets the #parent of +mod+
-  # to +self+, and its #section to #current_section. Returns +mod+.
-
-  def add_class_or_module mod, self_hash, all_hash
-    mod.section = current_section # TODO declaring context? something is
-                                  # wrong here...
-    mod.parent = self
-    mod.full_name = nil
-    mod.store = @store
-
-    unless @done_documenting then
-      self_hash[mod.name] = mod
-      # this must be done AFTER adding mod to its parent, so that the full
-      # name is correct:
-      all_hash[mod.full_name] = mod
-      if @store.unmatched_constant_alias[mod.full_name] then
-        to, file = @store.unmatched_constant_alias[mod.full_name]
-        add_module_alias mod, mod.name, to, file
-      end
-    end
-
-    mod
-  end
-
-  ##
-  # Adds +constant+ if not already there. If it is, updates the comment,
-  # value and/or is_alias_for of the known constant if they were empty/nil.
-
-  def add_constant constant
-    return constant unless @document_self
-
-    # HACK: avoid duplicate 'PI' & 'E' in math.c (1.8.7 source code)
-    # (this is a #ifdef: should be handled by the C parser)
-    known = @constants_hash[constant.name]
-
-    if known then
-      known.comment = constant.comment if known.comment.empty?
-
-      known.value = constant.value if
-        known.value.nil? or known.value.strip.empty?
-
-      known.is_alias_for ||= constant.is_alias_for
-    else
-      @constants_hash[constant.name] = constant
-      add_to @constants, constant
-    end
-
-    constant
-  end
-
-  ##
-  # Adds included module +include+ which should be an RDoc::Include
-
-  def add_include include
-    add_to @includes, include
-
-    include
-  end
-
-  ##
-  # Adds extension module +ext+ which should be an RDoc::Extend
-
-  def add_extend ext
-    add_to @extends, ext
-
-    ext
-  end
-
-  ##
-  # Adds +method+ if not already there. If it is (as method or attribute),
-  # updates the comment if it was empty.
-
-  def add_method method
-    return method unless @document_self
-
-    # HACK: avoid duplicate 'new' in io.c & struct.c (1.8.7 source code)
-    key = method.pretty_name
-    known = @methods_hash[key]
-
-    if known then
-      if @store then # otherwise we are loading
-        known.comment = method.comment if known.comment.empty?
-        previously = ", previously in #{known.file}" unless
-          method.file == known.file
-        @store.rdoc.options.warn \
-          "Duplicate method #{known.full_name} in #{method.file}#{previously}"
-      end
-    else
-      @methods_hash[key] = method
-      if @current_line_visibility
-        method.visibility, @current_line_visibility = @current_line_visibility, nil
-      else
-        method.visibility = @visibility
-      end
-      add_to @method_list, method
-      resolve_aliases method
-    end
-
-    method
-  end
-
-  ##
-  # Adds a module named +name+.  If RDoc already knows +name+ is a class then
-  # that class is returned instead.  See also #add_class.
-
-  def add_module(class_type, name)
-    mod = @classes[name] || @modules[name]
-    return mod if mod
-
-    full_name = child_name name
-    mod = @store.modules_hash[full_name] || class_type.new(name)
-
-    add_class_or_module mod, @modules, @store.modules_hash
-  end
-
-  ##
-  # Adds a module by +RDoc::NormalModule+ instance. See also #add_module.
-
-  def add_module_by_normal_module(mod)
-    add_class_or_module mod, @modules, @store.modules_hash
-  end
-
-  ##
-  # Adds an alias from +from+ (a class or module) to +name+ which was defined
-  # in +file+.
-
-  def add_module_alias from, from_name, to, file
-    return from if @done_documenting
-
-    to_full_name = child_name to.name
-
-    # if we already know this name, don't register an alias:
-    # see the metaprogramming in lib/active_support/basic_object.rb,
-    # where we already know BasicObject is a class when we find
-    # BasicObject = BlankSlate
-    return from if @store.find_class_or_module to_full_name
-
-    unless from
-      @store.unmatched_constant_alias[child_name(from_name)] = [to, file]
-      return to
-    end
-
-    new_to = from.dup
-    new_to.name = to.name
-    new_to.full_name = nil
-
-    if new_to.module? then
-      @store.modules_hash[to_full_name] = new_to
-      @modules[to.name] = new_to
-    else
-      @store.classes_hash[to_full_name] = new_to
-      @classes[to.name] = new_to
-    end
-
-    # Registers a constant for this alias.  The constant value and comment
-    # will be updated later, when the Ruby parser adds the constant
-    const = RDoc::Constant.new to.name, nil, new_to.comment
-    const.record_location file
-    const.is_alias_for = from
-    add_constant const
-
-    new_to
-  end
-
-  ##
-  # Adds +require+ to this context's top level
-
-  def add_require(require)
-    return require unless @document_self
-
-    if RDoc::TopLevel === self then
-      add_to @requires, require
-    else
-      parent.add_require require
-    end
-  end
-
-  ##
-  # Returns a section with +title+, creating it if it doesn't already exist.
-  # +comment+ will be appended to the section's comment.
-  #
-  # A section with a +title+ of +nil+ will return the default section.
-  #
-  # See also RDoc::Context::Section
-
-  def add_section title, comment = nil
-    if section = @sections[title] then
-      section.add_comment comment if comment
-    else
-      section = Section.new self, title, comment
-      @sections[title] = section
-    end
-
-    section
-  end
-
-  ##
-  # Adds +thing+ to the collection +array+
-
-  def add_to array, thing
-    array << thing if @document_self
-
-    thing.parent  = self
-    thing.store   = @store if @store
-    thing.section = current_section
-  end
-
-  ##
-  # Is there any content?
-  #
-  # This means any of: comment, aliases, methods, attributes, external
-  # aliases, require, constant.
-  #
-  # Includes and extends are also checked unless <tt>includes == false</tt>.
-
-  def any_content(includes = true)
-    @any_content ||= !(
-      @comment.empty? &&
-      @method_list.empty? &&
-      @attributes.empty? &&
-      @aliases.empty? &&
-      @external_aliases.empty? &&
-      @requires.empty? &&
-      @constants.empty?
-    )
-    @any_content || (includes && !(@includes + @extends).empty? )
-  end
-
-  ##
-  # Creates the full name for a child with +name+
-
-  def child_name name
-    if name =~ /^:+/
-      $'  #'
-    elsif RDoc::TopLevel === self then
-      name
-    else
-      "#{self.full_name}::#{name}"
-    end
-  end
-
-  ##
-  # Class attributes
-
-  def class_attributes
-    @class_attributes ||= attributes.select { |a| a.singleton }
-  end
-
-  ##
-  # Class methods
-
-  def class_method_list
-    @class_method_list ||= method_list.select { |a| a.singleton }
-  end
-
-  ##
-  # Array of classes in this context
-
-  def classes
-    @classes.values
-  end
-
-  ##
-  # All classes and modules in this namespace
-
-  def classes_and_modules
-    classes + modules
-  end
-
-  ##
-  # Hash of classes keyed by class name
-
-  def classes_hash
-    @classes
-  end
-
-  ##
-  # The current documentation section that new items will be added to.  If
-  # temporary_section is available it will be used.
-
-  def current_section
-    if section = @temporary_section then
-      @temporary_section = nil
-    else
-      section = @current_section
-    end
-
-    section
-  end
-
-  ##
-  # Is part of this thing was defined in +file+?
-
-  def defined_in?(file)
-    @in_files.include?(file)
-  end
-
-  def display(method_attr) # :nodoc:
-    if method_attr.is_a? RDoc::Attr
-      "#{method_attr.definition} #{method_attr.pretty_name}"
-    else
-      "method #{method_attr.pretty_name}"
-    end
-  end
-
-  ##
-  # Iterator for ancestors for duck-typing.  Does nothing.  See
-  # RDoc::ClassModule#each_ancestor.
-  #
-  # This method exists to make it easy to work with Context subclasses that
-  # aren't part of RDoc.
-
-  def each_ancestor # :nodoc:
-  end
-
-  ##
-  # Iterator for attributes
-
-  def each_attribute # :yields: attribute
-    @attributes.each { |a| yield a }
-  end
-
-  ##
-  # Iterator for classes and modules
-
-  def each_classmodule(&block) # :yields: module
-    classes_and_modules.sort.each(&block)
-  end
-
-  ##
-  # Iterator for constants
-
-  def each_constant # :yields: constant
-    @constants.each {|c| yield c}
-  end
-
-  ##
-  # Iterator for included modules
-
-  def each_include # :yields: include
-    @includes.each do |i| yield i end
-  end
-
-  ##
-  # Iterator for extension modules
-
-  def each_extend # :yields: extend
-    @extends.each do |e| yield e end
-  end
-
-  ##
-  # Iterator for methods
-
-  def each_method # :yields: method
-    return enum_for __method__ unless block_given?
-
-    @method_list.sort.each { |m| yield m }
-  end
-
-  ##
-  # Iterator for each section's contents sorted by title.  The +section+, the
-  # section's +constants+ and the sections +attributes+ are yielded.  The
-  # +constants+ and +attributes+ collections are sorted.
-  #
-  # To retrieve methods in a section use #methods_by_type with the optional
-  # +section+ parameter.
-  #
-  # NOTE: Do not edit collections yielded by this method
-
-  def each_section # :yields: section, constants, attributes
-    return enum_for __method__ unless block_given?
-
-    constants  = @constants.group_by  do |constant|  constant.section end
-    attributes = @attributes.group_by do |attribute| attribute.section end
-
-    constants.default  = []
-    attributes.default = []
-
-    sort_sections.each do |section|
-      yield section, constants[section].select(&:display?).sort, attributes[section].select(&:display?).sort
-    end
-  end
-
-  ##
-  # Finds an attribute +name+ with singleton value +singleton+.
-
-  def find_attribute(name, singleton)
-    name = $1 if name =~ /^(.*)=$/
-    @attributes.find { |a| a.name == name && a.singleton == singleton }
-  end
-
-  ##
-  # Finds an attribute with +name+ in this context
-
-  def find_attribute_named(name)
-    case name
-    when /\A#/ then
-      find_attribute name[1..-1], false
-    when /\A::/ then
-      find_attribute name[2..-1], true
-    else
-      @attributes.find { |a| a.name == name }
-    end
-  end
-
-  ##
-  # Finds a class method with +name+ in this context
-
-  def find_class_method_named(name)
-    @method_list.find { |meth| meth.singleton && meth.name == name }
-  end
-
-  ##
-  # Finds a constant with +name+ in this context
-
-  def find_constant_named(name)
-    @constants.find do |m|
-      m.name == name || m.full_name == name
-    end
-  end
-
-  ##
-  # Find a module at a higher scope
-
-  def find_enclosing_module_named(name)
-    parent && parent.find_module_named(name)
-  end
-
-  ##
-  # Finds an external alias +name+ with singleton value +singleton+.
-
-  def find_external_alias(name, singleton)
-    @external_aliases.find { |m| m.name == name && m.singleton == singleton }
-  end
-
-  ##
-  # Finds an external alias with +name+ in this context
-
-  def find_external_alias_named(name)
-    case name
-    when /\A#/ then
-      find_external_alias name[1..-1], false
-    when /\A::/ then
-      find_external_alias name[2..-1], true
-    else
-      @external_aliases.find { |a| a.name == name }
-    end
-  end
-
-  ##
-  # Finds a file with +name+ in this context
-
-  def find_file_named name
-    @store.find_file_named name
-  end
-
-  ##
-  # Finds an instance method with +name+ in this context
-
-  def find_instance_method_named(name)
-    @method_list.find { |meth| !meth.singleton && meth.name == name }
-  end
-
-  ##
-  # Finds a method, constant, attribute, external alias, module or file
-  # named +symbol+ in this context.
-
-  def find_local_symbol(symbol)
-    find_method_named(symbol) or
-    find_constant_named(symbol) or
-    find_attribute_named(symbol) or
-    find_external_alias_named(symbol) or
-    find_module_named(symbol) or
-    find_file_named(symbol)
-  end
-
-  ##
-  # Finds a method named +name+ with singleton value +singleton+.
-
-  def find_method(name, singleton)
-    @method_list.find { |m|
-      if m.singleton
-        m.name == name && m.singleton == singleton
-      else
-        m.name == name && !m.singleton && !singleton
-      end
-    }
-  end
-
-  ##
-  # Finds a instance or module method with +name+ in this context
-
-  def find_method_named(name)
-    case name
-    when /\A#/ then
-      find_method name[1..-1], false
-    when /\A::/ then
-      find_method name[2..-1], true
-    else
-      @method_list.find { |meth| meth.name == name }
-    end
-  end
-
-  ##
-  # Find a module with +name+ using ruby's scoping rules
-
-  def find_module_named(name)
-    res = @modules[name] || @classes[name]
-    return res if res
-    return self if self.name == name
-    find_enclosing_module_named name
-  end
-
-  ##
-  # Look up +symbol+, first as a module, then as a local symbol.
-
-  def find_symbol(symbol)
-    find_symbol_module(symbol) || find_local_symbol(symbol)
-  end
-
-  ##
-  # Look up a module named +symbol+.
-
-  def find_symbol_module(symbol)
-    result = nil
-
-    # look for a class or module 'symbol'
-    case symbol
-    when /^::/ then
-      result = @store.find_class_or_module symbol
-    when /^(\w+):+(.+)$/
-      suffix = $2
-      top = $1
-      searched = self
-      while searched do
-        mod = searched.find_module_named(top)
-        break unless mod
-        result = @store.find_class_or_module "#{mod.full_name}::#{suffix}"
-        break if result || searched.is_a?(RDoc::TopLevel)
-        searched = searched.parent
-      end
-    else
-      searched = self
-      while searched do
-        result = searched.find_module_named(symbol)
-        break if result || searched.is_a?(RDoc::TopLevel)
-        searched = searched.parent
-      end
-    end
-
-    result
-  end
-
-  ##
-  # The full name for this context.  This method is overridden by subclasses.
-
-  def full_name
-    '(unknown)'
-  end
-
-  ##
-  # Does this context and its methods and constants all have documentation?
-  #
-  # (Yes, fully documented doesn't mean everything.)
-
-  def fully_documented?
-    documented? and
-      attributes.all? { |a| a.documented? } and
-      method_list.all? { |m| m.documented? } and
-      constants.all? { |c| c.documented? }
-  end
-
-  ##
-  # URL for this with a +prefix+
-
-  def http_url(prefix)
-    path = name_for_path
-    path = path.gsub(/<<\s*(\w*)/, 'from-\1') if path =~ /<</
-    path = [prefix] + path.split('::')
-
-    File.join(*path.compact) + '.html'
-  end
-
-  ##
-  # Instance attributes
-
-  def instance_attributes
-    @instance_attributes ||= attributes.reject { |a| a.singleton }
-  end
-
-  ##
-  # Instance methods
-
-  def instance_methods
-    @instance_methods ||= method_list.reject { |a| a.singleton }
-  end
-
-  ##
-  # Instance methods
-  #--
-  # TODO remove this later
-
-  def instance_method_list
-    warn '#instance_method_list is obsoleted, please use #instance_methods'
-    @instance_methods ||= method_list.reject { |a| a.singleton }
-  end
-
-  ##
-  # Breaks method_list into a nested hash by type (<tt>'class'</tt> or
-  # <tt>'instance'</tt>) and visibility (+:public+, +:protected+, +:private+).
-  #
-  # If +section+ is provided only methods in that RDoc::Context::Section will
-  # be returned.
-
-  def methods_by_type section = nil
-    methods = {}
-
-    TYPES.each do |type|
-      visibilities = {}
-      RDoc::VISIBILITIES.each do |vis|
-        visibilities[vis] = []
-      end
-
-      methods[type] = visibilities
-    end
-
-    each_method do |method|
-      next if section and not method.section == section
-      methods[method.type][method.visibility] << method
-    end
-
-    methods
-  end
-
-  ##
-  # Yields AnyMethod and Attr entries matching the list of names in +methods+.
-
-  def methods_matching(methods, singleton = false, &block)
-    (@method_list + @attributes).each do |m|
-      yield m if methods.include?(m.name) and m.singleton == singleton
-    end
-
-    each_ancestor do |parent|
-      parent.methods_matching(methods, singleton, &block)
-    end
-  end
-
-  ##
-  # Array of modules in this context
-
-  def modules
-    @modules.values
-  end
-
-  ##
-  # Hash of modules keyed by module name
-
-  def modules_hash
-    @modules
-  end
-
-  ##
-  # Name to use to generate the url.
-  # <tt>#full_name</tt> by default.
-
-  def name_for_path
-    full_name
-  end
-
-  ##
-  # Changes the visibility for new methods to +visibility+
-
-  def ongoing_visibility=(visibility)
-    @visibility = visibility
-  end
-
-  ##
-  # Record +top_level+ as a file +self+ is in.
-
-  def record_location(top_level)
-    @in_files << top_level unless @in_files.include?(top_level)
-  end
-
-  ##
-  # Should we remove this context from the documentation?
-  #
-  # The answer is yes if:
-  # * #received_nodoc is +true+
-  # * #any_content is +false+ (not counting includes)
-  # * All #includes are modules (not a string), and their module has
-  #   <tt>#remove_from_documentation? == true</tt>
-  # * All classes and modules have <tt>#remove_from_documentation? == true</tt>
-
-  def remove_from_documentation?
-    @remove_from_documentation ||=
-      @received_nodoc &&
-      !any_content(false) &&
-      @includes.all? { |i| !i.module.is_a?(String) && i.module.remove_from_documentation? } &&
-      classes_and_modules.all? { |cm| cm.remove_from_documentation? }
-  end
-
-  ##
-  # Removes methods and attributes with a visibility less than +min_visibility+.
-  #--
-  # TODO mark the visibility of attributes in the template (if not public?)
-
-  def remove_invisible min_visibility
-    return if [:private, :nodoc].include? min_visibility
-    remove_invisible_in @method_list, min_visibility
-    remove_invisible_in @attributes, min_visibility
-    remove_invisible_in @constants, min_visibility
-  end
-
-  ##
-  # Only called when min_visibility == :public or :private
-
-  def remove_invisible_in array, min_visibility # :nodoc:
-    if min_visibility == :public then
-      array.reject! { |e|
-        e.visibility != :public and not e.force_documentation
-      }
-    else
-      array.reject! { |e|
-        e.visibility == :private and not e.force_documentation
-      }
-    end
-  end
-
-  ##
-  # Tries to resolve unmatched aliases when a method or attribute has just
-  # been added.
-
-  def resolve_aliases added
-    # resolve any pending unmatched aliases
-    key = added.pretty_name
-    unmatched_alias_list = @unmatched_alias_lists[key]
-    return unless unmatched_alias_list
-    unmatched_alias_list.each do |unmatched_alias|
-      added.add_alias unmatched_alias, self
-      @external_aliases.delete unmatched_alias
-    end
-    @unmatched_alias_lists.delete key
-  end
-
-  ##
-  # Returns RDoc::Context::Section objects referenced in this context for use
-  # in a table of contents.
-
-  def section_contents
-    used_sections = {}
-
-    each_method do |method|
-      next unless method.display?
-
-      used_sections[method.section] = true
-    end
-
-    # order found sections
-    sections = sort_sections.select do |section|
-      used_sections[section]
-    end
-
-    # only the default section is used
-    return [] if
-      sections.length == 1 and not sections.first.title
-
-    sections
-  end
-
-  ##
-  # Sections in this context
-
-  def sections
-    @sections.values
-  end
-
-  def sections_hash # :nodoc:
-    @sections
-  end
-
-  ##
-  # Sets the current section to a section with +title+.  See also #add_section
-
-  def set_current_section title, comment
-    @current_section = add_section title, comment
-  end
-
-  ##
-  # Given an array +methods+ of method names, set the visibility of each to
-  # +visibility+
-
-  def set_visibility_for(methods, visibility, singleton = false)
-    methods_matching methods, singleton do |m|
-      m.visibility = visibility
-    end
-  end
-
-  ##
-  # Given an array +names+ of constants, set the visibility of each constant to
-  # +visibility+
-
-  def set_constant_visibility_for(names, visibility)
-    names.each do |name|
-      constant = @constants_hash[name] or next
-      constant.visibility = visibility
-    end
-  end
-
-  ##
-  # Sorts sections alphabetically (default) or in TomDoc fashion (none,
-  # Public, Internal, Deprecated)
-
-  def sort_sections
-    titles = @sections.map { |title, _| title }
-
-    if titles.length > 1 and
-       TOMDOC_TITLES_SORT ==
-         (titles | TOMDOC_TITLES).sort_by { |title| title.to_s } then
-      @sections.values_at(*TOMDOC_TITLES).compact
-    else
-      @sections.sort_by { |title, _|
-        title.to_s
-      }.map { |_, section|
-        section
-      }
-    end
-  end
-
-  def to_s # :nodoc:
-    "#{self.class.name} #{self.full_name}"
-  end
-
-  ##
-  # Return the TopLevel that owns us
-  #--
-  # FIXME we can be 'owned' by several TopLevel (see #record_location &
-  # #in_files)
-
-  def top_level
-    return @top_level if defined? @top_level
-    @top_level = self
-    @top_level = @top_level.parent until RDoc::TopLevel === @top_level
-    @top_level
-  end
-
-  ##
-  # Upgrades NormalModule +mod+ in +enclosing+ to a +class_type+
-
-  def upgrade_to_class mod, class_type, enclosing
-    enclosing.modules_hash.delete mod.name
-
-    klass = RDoc::ClassModule.from_module class_type, mod
-    klass.store = @store
-
-    # if it was there, then we keep it even if done_documenting
-    @store.classes_hash[mod.full_name] = klass
-    enclosing.classes_hash[mod.name]   = klass
-
-    klass
-  end
-
-  autoload :Section, "#{__dir__}/context/section"
-
-end
diff --git a/lib/rdoc/context/section.rb b/lib/rdoc/context/section.rb
deleted file mode 100644
index aecd4e02137bce..00000000000000
--- a/lib/rdoc/context/section.rb
+++ /dev/null
@@ -1,233 +0,0 @@
-# frozen_string_literal: true
-require 'cgi/util'
-
-##
-# A section of documentation like:
-#
-#   # :section: The title
-#   # The body
-#
-# Sections can be referenced multiple times and will be collapsed into a
-# single section.
-
-class RDoc::Context::Section
-
-  include RDoc::Text
-
-  MARSHAL_VERSION = 0 # :nodoc:
-
-  ##
-  # Section comment
-
-  attr_reader :comment
-
-  ##
-  # Section comments
-
-  attr_reader :comments
-
-  ##
-  # Context this Section lives in
-
-  attr_reader :parent
-
-  ##
-  # Section title
-
-  attr_reader :title
-
-  ##
-  # Creates a new section with +title+ and +comment+
-
-  def initialize parent, title, comment
-    @parent = parent
-    @title = title ? title.strip : title
-
-    @comments = []
-
-    add_comment comment
-  end
-
-  ##
-  # Sections are equal when they have the same #title
-
-  def == other
-    self.class === other and @title == other.title
-  end
-
-  alias eql? ==
-
-  ##
-  # Adds +comment+ to this section
-
-  def add_comment comment
-    comment = extract_comment comment
-
-    return if comment.empty?
-
-    case comment
-    when RDoc::Comment then
-      @comments << comment
-    when RDoc::Markup::Document then
-      @comments.concat comment.parts
-    when Array then
-      @comments.concat comment
-    else
-      raise TypeError, "unknown comment type: #{comment.inspect}"
-    end
-  end
-
-  ##
-  # Anchor reference for linking to this section
-
-  def aref
-    title = @title || '[untitled]'
-
-    CGI.escape(title).gsub('%', '-').sub(/^-/, '')
-  end
-
-  ##
-  # Extracts the comment for this section from the original comment block.
-  # If the first line contains :section:, strip it and use the rest.
-  # Otherwise remove lines up to the line containing :section:, and look
-  # for those lines again at the end and remove them. This lets us write
-  #
-  #   # :section: The title
-  #   # The body
-
-  def extract_comment comment
-    case comment
-    when Array then
-      comment.map do |c|
-        extract_comment c
-      end
-    when nil
-      RDoc::Comment.new ''
-    when RDoc::Comment then
-      if comment.text =~ /^#[ \t]*:section:.*\n/ then
-        start = $`
-        rest = $'
-
-        comment.text = if start.empty? then
-                         rest
-                       else
-                         rest.sub(/#{start.chomp}\Z/, '')
-                       end
-      end
-
-      comment
-    when RDoc::Markup::Document then
-      comment
-    else
-      raise TypeError, "unknown comment #{comment.inspect}"
-    end
-  end
-
-  def inspect # :nodoc:
-    "#<%s:0x%x %p>" % [self.class, object_id, title]
-  end
-
-  def hash # :nodoc:
-    @title.hash
-  end
-
-  ##
-  # The files comments in this section come from
-
-  def in_files
-    return [] if @comments.empty?
-
-    case @comments
-    when Array then
-      @comments.map do |comment|
-        comment.file
-      end
-    when RDoc::Markup::Document then
-      @comment.parts.map do |document|
-        document.file
-      end
-    else
-      raise RDoc::Error, "BUG: unknown comment class #{@comments.class}"
-    end
-  end
-
-  ##
-  # Serializes this Section.  The title and parsed comment are saved, but not
-  # the section parent which must be restored manually.
-
-  def marshal_dump
-    [
-      MARSHAL_VERSION,
-      @title,
-      parse,
-    ]
-  end
-
-  ##
-  # De-serializes this Section.  The section parent must be restored manually.
-
-  def marshal_load array
-    @parent  = nil
-
-    @title    = array[1]
-    @comments = array[2]
-  end
-
-  ##
-  # Parses +comment_location+ into an RDoc::Markup::Document composed of
-  # multiple RDoc::Markup::Documents with their file set.
-
-  def parse
-    case @comments
-    when String then
-      super
-    when Array then
-      docs = @comments.map do |comment, location|
-        doc = super comment
-        doc.file = location if location
-        doc
-      end
-
-      RDoc::Markup::Document.new(*docs)
-    when RDoc::Comment then
-      doc = super @comments.text, comments.format
-      doc.file = @comments.location
-      doc
-    when RDoc::Markup::Document then
-      return @comments
-    else
-      raise ArgumentError, "unknown comment class #{comments.class}"
-    end
-  end
-
-  ##
-  # The section's title, or 'Top Section' if the title is nil.
-  #
-  # This is used by the table of contents template so the name is silly.
-
-  def plain_html
-    @title || 'Top Section'
-  end
-
-  ##
-  # Removes a comment from this section if it is from the same file as
-  # +comment+
-
-  def remove_comment comment
-    return if @comments.empty?
-
-    case @comments
-    when Array then
-      @comments.delete_if do |my_comment|
-        my_comment.file == comment.file
-      end
-    when RDoc::Markup::Document then
-      @comments.parts.delete_if do |document|
-        document.file == comment.file.name
-      end
-    else
-      raise RDoc::Error, "BUG: unknown comment class #{@comments.class}"
-    end
-  end
-
-end
diff --git a/lib/rdoc/cross_reference.rb b/lib/rdoc/cross_reference.rb
deleted file mode 100644
index f3b703a5597226..00000000000000
--- a/lib/rdoc/cross_reference.rb
+++ /dev/null
@@ -1,225 +0,0 @@
-# frozen_string_literal: true
-
-require_relative 'markup/attribute_manager' # for PROTECT_ATTR
-
-##
-# RDoc::CrossReference is a reusable way to create cross references for names.
-
-class RDoc::CrossReference
-
-  ##
-  # Regular expression to match class references
-  #
-  # 1. There can be a '\\' in front of text to suppress the cross-reference
-  # 2. There can be a '::' in front of class names to reference from the
-  #    top-level namespace.
-  # 3. The method can be followed by parenthesis (not recommended)
-
-  CLASS_REGEXP_STR = '\\\\?((?:\:{2})?[A-Z]\w*(?:\:\:\w+)*)'
-
-  ##
-  # Regular expression to match a single method argument.
-
-  METHOD_ARG_REGEXP_STR = '[\w.+*/=<>-]+'
-
-  ##
-  # Regular expression to match method arguments.
-
-  METHOD_ARGS_REGEXP_STR = /(?:\((?:#{METHOD_ARG_REGEXP_STR}(?:,\s*#{METHOD_ARG_REGEXP_STR})*)?\))?/.source
-
-  ##
-  # Regular expression to match method references.
-  #
-  # See CLASS_REGEXP_STR
-
-  METHOD_REGEXP_STR = /(
-    (?!\d)[\w#{RDoc::Markup::AttributeManager::PROTECT_ATTR}]+[!?=]?|
-    %|=(?:==?|~)|![=~]|\[\]=?|<(?:<|=>?)?|>[>=]?|[-+!]@?|\*\*?|[\/%\`|&^~]
-  )#{METHOD_ARGS_REGEXP_STR}/.source.delete("\n ").freeze
-
-  ##
-  # Regular expressions matching text that should potentially have
-  # cross-reference links generated are passed to add_regexp_handling. Note
-  # that these expressions are meant to pick up text for which cross-references
-  # have been suppressed, since the suppression characters are removed by the
-  # code that is triggered.
-
-  CROSSREF_REGEXP = /(?:^|[\s()])
-                     (
-                      (?:
-                       # A::B::C.meth
-                       #{CLASS_REGEXP_STR}(?:[.#]|::)#{METHOD_REGEXP_STR}
-
-                       # A::B::C
-                       # The stuff after CLASS_REGEXP_STR is a
-                       # nasty hack.  CLASS_REGEXP_STR unfortunately matches
-                       # words like dog and cat (these are legal "class"
-                       # names in Fortran 95).  When a word is flagged as a
-                       # potential cross-reference, limitations in the markup
-                       # engine suppress other processing, such as typesetting.
-                       # This is particularly noticeable for contractions.
-                       # In order that words like "can't" not
-                       # be flagged as potential cross-references, only
-                       # flag potential class cross-references if the character
-                       # after the cross-reference is a space, sentence
-                       # punctuation, tag start character, or attribute
-                       # marker.
-                       | #{CLASS_REGEXP_STR}(?=[@\s).?!,;<\000]|\z)
-
-                       # Stand-alone method (preceded by a #)
-                       | \\?\##{METHOD_REGEXP_STR}
-
-                       # Stand-alone method (preceded by ::)
-                       | ::#{METHOD_REGEXP_STR}
-
-                       # Things that look like filenames
-                       # The key thing is that there must be at least
-                       # one special character (period, slash, or
-                       # underscore).
-                       | (?:\.\.\/)*[-\/\w]+[_\/.][-\w\/.]+
-
-                       # Things that have markup suppressed
-                       # Don't process things like '\<' in \<tt>, though.
-                       # TODO: including < is a hack, not very satisfying.
-                       | \\[^\s<]
-                      )
-
-                      # labels for headings
-                      (?:@[\w+%-]+(?:\.[\w|%-]+)?)?
-                     )/x
-
-  ##
-  # Version of CROSSREF_REGEXP used when <tt>--hyperlink-all</tt> is specified.
-
-  ALL_CROSSREF_REGEXP = /
-                     (?:^|[\s()])
-                     (
-                      (?:
-                       # A::B::C.meth
-                       #{CLASS_REGEXP_STR}(?:[.#]|::)#{METHOD_REGEXP_STR}
-
-                       # A::B::C
-                       | #{CLASS_REGEXP_STR}(?=[@\s).?!,;<\000]|\z)
-
-                       # Stand-alone method
-                       | \\?#{METHOD_REGEXP_STR}
-
-                       # Things that look like filenames
-                       | (?:\.\.\/)*[-\/\w]+[_\/.][-\w\/.]+
-
-                       # Things that have markup suppressed
-                       | \\[^\s<]
-                      )
-
-                      # labels for headings
-                      (?:@[\w+%-]+)?
-                     )/x
-
-  ##
-  # Hash of references that have been looked-up to their replacements
-
-  attr_accessor :seen
-
-  ##
-  # Allows cross-references to be created based on the given +context+
-  # (RDoc::Context).
-
-  def initialize context
-    @context = context
-    @store   = context.store
-
-    @seen = {}
-  end
-
-  def resolve_method name
-    ref = nil
-
-    if /#{CLASS_REGEXP_STR}([.#]|::)#{METHOD_REGEXP_STR}/o =~ name then
-      type = $2
-      if '.' == type # will find either #method or ::method
-        method = $3
-      else
-        method = "#{type}#{$3}"
-      end
-      container = @context.find_symbol_module($1)
-    elsif /^([.#]|::)#{METHOD_REGEXP_STR}/o =~ name then
-      type = $1
-      if '.' == type
-        method = $2
-      else
-        method = "#{type}#{$2}"
-      end
-      container = @context
-    else
-      type = nil
-      container = nil
-    end
-
-    if container then
-      unless RDoc::TopLevel === container then
-        if '.' == type then
-          if 'new' == method then # AnyClassName.new will be class method
-            ref = container.find_local_symbol method
-            ref = container.find_ancestor_local_symbol method unless ref
-          else
-            ref = container.find_local_symbol "::#{method}"
-            ref = container.find_ancestor_local_symbol "::#{method}" unless ref
-            ref = container.find_local_symbol "##{method}" unless ref
-            ref = container.find_ancestor_local_symbol "##{method}" unless ref
-          end
-        else
-          ref = container.find_local_symbol method
-          ref = container.find_ancestor_local_symbol method unless ref
-        end
-      end
-    end
-
-    ref
-  end
-
-  ##
-  # Returns a reference to +name+.
-  #
-  # If the reference is found and +name+ is not documented +text+ will be
-  # returned.  If +name+ is escaped +name+ is returned.  If +name+ is not
-  # found +text+ is returned.
-
-  def resolve name, text
-    return @seen[name] if @seen.include? name
-
-    ref = case name
-          when /^\\(#{CLASS_REGEXP_STR})$/o then
-            @context.find_symbol $1
-          else
-            @context.find_symbol name
-          end
-
-    ref = resolve_method name unless ref
-
-    # Try a page name
-    ref = @store.page name if not ref and name =~ /^[\w.]+$/
-
-    ref = nil if RDoc::Alias === ref # external alias, can't link to it
-
-    out = if name == '\\' then
-            name
-          elsif name =~ /^\\/ then
-            # we remove the \ only in front of what we know:
-            # other backslashes are treated later, only outside of <tt>
-            ref ? $' : name
-          elsif ref then
-            if ref.display? then
-              ref
-            else
-              text
-            end
-          else
-            text
-          end
-
-    @seen[name] = out
-
-    out
-  end
-
-end
diff --git a/lib/rdoc/encoding.rb b/lib/rdoc/encoding.rb
deleted file mode 100644
index 8a921c7011fa42..00000000000000
--- a/lib/rdoc/encoding.rb
+++ /dev/null
@@ -1,131 +0,0 @@
-# coding: US-ASCII
-# frozen_string_literal: true
-
-##
-# This class is a wrapper around File IO and Encoding that helps RDoc load
-# files and convert them to the correct encoding.
-
-module RDoc::Encoding
-
-  HEADER_REGEXP = /^
-    (?:
-      \A\#!.*\n
-      |
-      ^\#\s+frozen[-_]string[-_]literal[=:].+\n
-      |
-      ^\#[^\n]+\b(?:en)?coding[=:]\s*(?<name>[^\s;]+).*\n
-      |
-      <\?xml[^?]*encoding=(?<quote>["'])(?<name>.*?)\k<quote>.*\n
-    )+
-  /xi # :nodoc:
-
-  ##
-  # Reads the contents of +filename+ and handles any encoding directives in
-  # the file.
-  #
-  # The content will be converted to the +encoding+.  If the file cannot be
-  # converted a warning will be printed and nil will be returned.
-  #
-  # If +force_transcode+ is true the document will be transcoded and any
-  # unknown character in the target encoding will be replaced with '?'
-
-  def self.read_file filename, encoding, force_transcode = false
-    content = File.open filename, "rb" do |f| f.read end
-    content.gsub!("\r\n", "\n") if RUBY_PLATFORM =~ /mswin|mingw/
-
-    utf8 = content.sub!(/\A\xef\xbb\xbf/, '')
-
-    enc = RDoc::Encoding.detect_encoding content
-    content = RDoc::Encoding.change_encoding content, enc if enc
-
-    begin
-      encoding ||= Encoding.default_external
-      orig_encoding = content.encoding
-
-      if not orig_encoding.ascii_compatible? then
-        content = content.encode encoding
-      elsif utf8 then
-        content = RDoc::Encoding.change_encoding content, Encoding::UTF_8
-        content = content.encode encoding
-      else
-        # assume the content is in our output encoding
-        content = RDoc::Encoding.change_encoding content, encoding
-      end
-
-      unless content.valid_encoding? then
-        # revert and try to transcode
-        content = RDoc::Encoding.change_encoding content, orig_encoding
-        content = content.encode encoding
-      end
-
-      unless content.valid_encoding? then
-        warn "unable to convert #{filename} to #{encoding}, skipping"
-        content = nil
-      end
-    rescue Encoding::InvalidByteSequenceError,
-           Encoding::UndefinedConversionError => e
-      if force_transcode then
-        content = RDoc::Encoding.change_encoding content, orig_encoding
-        content = content.encode(encoding,
-                                 :invalid => :replace,
-                                 :undef => :replace,
-                                 :replace => '?')
-        return content
-      else
-        warn "unable to convert #{e.message} for #{filename}, skipping"
-        return nil
-      end
-    end
-
-    content
-  rescue ArgumentError => e
-    raise unless e.message =~ /unknown encoding name - (.*)/
-    warn "unknown encoding name \"#{$1}\" for #{filename}, skipping"
-    nil
-  rescue Errno::EISDIR, Errno::ENOENT
-    nil
-  end
-
-  def self.remove_frozen_string_literal string
-    string =~ /\A(?:#!.*\n)?(.*\n)/
-    first_line = $1
-
-    if first_line =~ /\A# +frozen[-_]string[-_]literal[=:].+$/i
-      string = string.sub first_line, ''
-    end
-
-    string
-  end
-
-  ##
-  # Detects the encoding of +string+ based on the magic comment
-
-  def self.detect_encoding string
-    result = HEADER_REGEXP.match string
-    name = result && result[:name]
-
-    name ? Encoding.find(name) : nil
-  end
-
-  ##
-  # Removes magic comments and shebang
-
-  def self.remove_magic_comment string
-    string.sub HEADER_REGEXP do |s|
-      s.gsub(/[^\n]/, '')
-    end
-  end
-
-  ##
-  # Changes encoding based on +encoding+ without converting and returns new
-  # string
-
-  def self.change_encoding text, encoding
-    if text.kind_of? RDoc::Comment
-      text.encode! encoding
-    else
-      String.new text, encoding: encoding
-    end
-  end
-
-end
diff --git a/lib/rdoc/erb_partial.rb b/lib/rdoc/erb_partial.rb
deleted file mode 100644
index 043d763db1d3da..00000000000000
--- a/lib/rdoc/erb_partial.rb
+++ /dev/null
@@ -1,18 +0,0 @@
-# frozen_string_literal: true
-##
-# Allows an ERB template to be rendered in the context (binding) of an
-# existing ERB template evaluation.
-
-class RDoc::ERBPartial < ERB
-
-  ##
-  # Overrides +compiler+ startup to set the +eoutvar+ to an empty string only
-  # if it isn't already set.
-
-  def set_eoutvar compiler, eoutvar = '_erbout'
-    super
-
-    compiler.pre_cmd = ["#{eoutvar} ||= +''"]
-  end
-
-end
diff --git a/lib/rdoc/erbio.rb b/lib/rdoc/erbio.rb
deleted file mode 100644
index 0f98eaedeef313..00000000000000
--- a/lib/rdoc/erbio.rb
+++ /dev/null
@@ -1,37 +0,0 @@
-# frozen_string_literal: true
-require 'erb'
-
-##
-# A subclass of ERB that writes directly to an IO.  Credit to Aaron Patterson
-# and Masatoshi SEKI.
-#
-# To use:
-#
-#   erbio = RDoc::ERBIO.new '<%= "hello world" %>', nil, nil
-#
-#   File.open 'hello.txt', 'w' do |io|
-#     erbio.result binding
-#   end
-#
-# Note that binding must enclose the io you wish to output on.
-
-class RDoc::ERBIO < ERB
-
-  ##
-  # Defaults +eoutvar+ to 'io', otherwise is identical to ERB's initialize
-
-  def initialize str, trim_mode: nil, eoutvar: 'io'
-    super(str, trim_mode: trim_mode, eoutvar: eoutvar)
-  end
-
-  ##
-  # Instructs +compiler+ how to write to +io_variable+
-
-  def set_eoutvar compiler, io_variable
-    compiler.put_cmd    = "#{io_variable}.write"
-    compiler.insert_cmd = "#{io_variable}.write"
-    compiler.pre_cmd    = []
-    compiler.post_cmd   = []
-  end
-
-end
diff --git a/lib/rdoc/extend.rb b/lib/rdoc/extend.rb
deleted file mode 100644
index 7d57433de668fb..00000000000000
--- a/lib/rdoc/extend.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-# frozen_string_literal: true
-##
-# A Module extension to a class with \#extend
-#
-#   RDoc::Extend.new 'Enumerable', 'comment ...'
-
-class RDoc::Extend < RDoc::Mixin
-
-end
diff --git a/lib/rdoc/generator.rb b/lib/rdoc/generator.rb
deleted file mode 100644
index a769cf8ac0e9cf..00000000000000
--- a/lib/rdoc/generator.rb
+++ /dev/null
@@ -1,51 +0,0 @@
-# frozen_string_literal: true
-##
-# RDoc uses generators to turn parsed source code in the form of an
-# RDoc::CodeObject tree into some form of output.  RDoc comes with the HTML
-# generator RDoc::Generator::Darkfish and an ri data generator
-# RDoc::Generator::RI.
-#
-# == Registering a Generator
-#
-# Generators are registered by calling RDoc::RDoc.add_generator with the class
-# of the generator:
-#
-#   class My::Awesome::Generator
-#     RDoc::RDoc.add_generator self
-#   end
-#
-# == Adding Options to +rdoc+
-#
-# Before option processing in +rdoc+, RDoc::Options will call ::setup_options
-# on the generator class with an RDoc::Options instance.  The generator can
-# use RDoc::Options#option_parser to add command-line options to the +rdoc+
-# tool.  See RDoc::Options@Custom+Options for an example and see OptionParser
-# for details on how to add options.
-#
-# You can extend the RDoc::Options instance with additional accessors for your
-# generator.
-#
-# == Generator Instantiation
-#
-# After parsing, RDoc::RDoc will instantiate a generator by calling
-# #initialize with an RDoc::Store instance and an RDoc::Options instance.
-#
-# The RDoc::Store instance holds documentation for parsed source code.  In
-# RDoc 3 and earlier the RDoc::TopLevel class held this data.  When upgrading
-# a generator from RDoc 3 and earlier you should only need to replace
-# RDoc::TopLevel with the store instance.
-#
-# RDoc will then call #generate on the generator instance.  You can use the
-# various methods on RDoc::Store and in the RDoc::CodeObject tree to create
-# your desired output format.
-
-module RDoc::Generator
-
-  autoload :Markup,   "#{__dir__}/generator/markup"
-
-  autoload :Darkfish,  "#{__dir__}/generator/darkfish"
-  autoload :JsonIndex, "#{__dir__}/generator/json_index"
-  autoload :RI,        "#{__dir__}/generator/ri"
-  autoload :POT,       "#{__dir__}/generator/pot"
-
-end
diff --git a/lib/rdoc/generator/darkfish.rb b/lib/rdoc/generator/darkfish.rb
deleted file mode 100644
index 1b408a6f8ee59e..00000000000000
--- a/lib/rdoc/generator/darkfish.rb
+++ /dev/null
@@ -1,786 +0,0 @@
-# frozen_string_literal: true
-# -*- mode: ruby; ruby-indent-level: 2; tab-width: 2 -*-
-
-require 'erb'
-require 'fileutils'
-require 'pathname'
-require_relative 'markup'
-
-##
-# Darkfish RDoc HTML Generator
-#
-# $Id: darkfish.rb 52 2009-01-07 02:08:11Z deveiant $
-#
-# == Author/s
-# * Michael Granger (ged@FaerieMUD.org)
-#
-# == Contributors
-# * Mahlon E. Smith (mahlon@martini.nu)
-# * Eric Hodel (drbrain@segment7.net)
-#
-# == License
-#
-# Copyright (c) 2007, 2008, Michael Granger. All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
-#
-# * Redistributions of source code must retain the above copyright notice,
-#   this list of conditions and the following disclaimer.
-#
-# * 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.
-#
-# * Neither the name of the author/s, nor the names of the project's
-#   contributors may be used to endorse or promote products derived from this
-#   software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-# DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
-# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#
-# == Attributions
-#
-# Darkfish uses the {Silk Icons}[http://www.famfamfam.com/lab/icons/silk/] set
-# by Mark James.
-
-class RDoc::Generator::Darkfish
-
-  RDoc::RDoc.add_generator self
-
-  include ERB::Util
-
-  ##
-  # Stylesheets, fonts, etc. that are included in RDoc.
-
-  BUILTIN_STYLE_ITEMS = # :nodoc:
-    %w[
-      css/fonts.css
-      fonts/Lato-Light.ttf
-      fonts/Lato-LightItalic.ttf
-      fonts/Lato-Regular.ttf
-      fonts/Lato-RegularItalic.ttf
-      fonts/SourceCodePro-Bold.ttf
-      fonts/SourceCodePro-Regular.ttf
-      css/rdoc.css
-  ]
-
-  ##
-  # Path to this file's parent directory. Used to find templates and other
-  # resources.
-
-  GENERATOR_DIR = File.join 'rdoc', 'generator'
-
-  ##
-  # Release Version
-
-  VERSION = '3'
-
-  ##
-  # Description of this generator
-
-  DESCRIPTION = 'HTML generator, written by Michael Granger'
-
-  ##
-  # The relative path to style sheets and javascript.  By default this is set
-  # the same as the rel_prefix.
-
-  attr_accessor :asset_rel_path
-
-  ##
-  # The path to generate files into, combined with <tt>--op</tt> from the
-  # options for a full path.
-
-  attr_reader :base_dir
-
-  ##
-  # Classes and modules to be used by this generator, not necessarily
-  # displayed.  See also #modsort
-
-  attr_reader :classes
-
-  ##
-  # No files will be written when dry_run is true.
-
-  attr_accessor :dry_run
-
-  ##
-  # When false the generate methods return a String instead of writing to a
-  # file.  The default is true.
-
-  attr_accessor :file_output
-
-  ##
-  # Files to be displayed by this generator
-
-  attr_reader :files
-
-  ##
-  # The JSON index generator for this Darkfish generator
-
-  attr_reader :json_index
-
-  ##
-  # Methods to be displayed by this generator
-
-  attr_reader :methods
-
-  ##
-  # Sorted list of classes and modules to be displayed by this generator
-
-  attr_reader :modsort
-
-  ##
-  # The RDoc::Store that is the source of the generated content
-
-  attr_reader :store
-
-  ##
-  # The directory where the template files live
-
-  attr_reader :template_dir # :nodoc:
-
-  ##
-  # The output directory
-
-  attr_reader :outputdir
-
-  ##
-  # Initialize a few instance variables before we start
-
-  def initialize store, options
-    @store   = store
-    @options = options
-
-    @asset_rel_path = ''
-    @base_dir       = Pathname.pwd.expand_path
-    @dry_run        = @options.dry_run
-    @file_output    = true
-    @template_dir   = Pathname.new options.template_dir
-    @template_cache = {}
-
-    @classes = nil
-    @context = nil
-    @files   = nil
-    @methods = nil
-    @modsort = nil
-
-    @json_index = RDoc::Generator::JsonIndex.new self, options
-  end
-
-  ##
-  # Output progress information if debugging is enabled
-
-  def debug_msg *msg
-    return unless $DEBUG_RDOC
-    $stderr.puts(*msg)
-  end
-
-  ##
-  # Directory where generated class HTML files live relative to the output
-  # dir.
-
-  def class_dir
-    nil
-  end
-
-  ##
-  # Directory where generated class HTML files live relative to the output
-  # dir.
-
-  def file_dir
-    nil
-  end
-
-  ##
-  # Create the directories the generated docs will live in if they don't
-  # already exist.
-
-  def gen_sub_directories
-    @outputdir.mkpath
-  end
-
-  ##
-  # Copy over the stylesheet into the appropriate place in the output
-  # directory.
-
-  def write_style_sheet
-    debug_msg "Copying static files"
-    options = { :verbose => $DEBUG_RDOC, :noop => @dry_run }
-
-    BUILTIN_STYLE_ITEMS.each do |item|
-      install_rdoc_static_file @template_dir + item, "./#{item}", options
-    end
-
-    unless @options.template_stylesheets.empty?
-      FileUtils.cp @options.template_stylesheets, '.', **options
-    end
-
-    Dir[(@template_dir + "{js,images}/**/*").to_s].each do |path|
-      next if File.directory? path
-      next if File.basename(path) =~ /^\./
-
-      dst = Pathname.new(path).relative_path_from @template_dir
-
-      install_rdoc_static_file @template_dir + path, dst, options
-    end
-  end
-
-  ##
-  # Build the initial indices and output objects based on an array of TopLevel
-  # objects containing the extracted information.
-
-  def generate
-    setup
-
-    write_style_sheet
-    generate_index
-    generate_class_files
-    generate_file_files
-    generate_table_of_contents
-    @json_index.generate
-    @json_index.generate_gzipped
-
-    copy_static
-
-  rescue => e
-    debug_msg "%s: %s\n  %s" % [
-      e.class.name, e.message, e.backtrace.join("\n  ")
-    ]
-
-    raise
-  end
-
-  ##
-  # Copies static files from the static_path into the output directory
-
-  def copy_static
-    return if @options.static_path.empty?
-
-    fu_options = { :verbose => $DEBUG_RDOC, :noop => @dry_run }
-
-    @options.static_path.each do |path|
-      unless File.directory? path then
-        FileUtils.install path, @outputdir, **fu_options.merge(:mode => 0644)
-        next
-      end
-
-      Dir.chdir path do
-        Dir[File.join('**', '*')].each do |entry|
-          dest_file = @outputdir + entry
-
-          if File.directory? entry then
-            FileUtils.mkdir_p entry, **fu_options
-          else
-            FileUtils.install entry, dest_file, **fu_options.merge(:mode => 0644)
-          end
-        end
-      end
-    end
-  end
-
-  ##
-  # Return a list of the documented modules sorted by salience first, then
-  # by name.
-
-  def get_sorted_module_list classes
-    classes.select do |klass|
-      klass.display?
-    end.sort
-  end
-
-  ##
-  # Generate an index page which lists all the classes which are documented.
-
-  def generate_index
-    setup
-
-    template_file = @template_dir + 'index.rhtml'
-    return unless template_file.exist?
-
-    debug_msg "Rendering the index page..."
-
-    out_file = @base_dir + @options.op_dir + 'index.html'
-    rel_prefix = @outputdir.relative_path_from out_file.dirname
-    search_index_rel_prefix = rel_prefix
-    search_index_rel_prefix += @asset_rel_path if @file_output
-
-    asset_rel_prefix = rel_prefix + @asset_rel_path
-
-    @title = @options.title
-
-    render_template template_file, out_file do |io|
-      here = binding
-      # suppress 1.9.3 warning
-      here.local_variable_set(:asset_rel_prefix, asset_rel_prefix)
-      here
-    end
-  rescue => e
-    error = RDoc::Error.new \
-      "error generating index.html: #{e.message} (#{e.class})"
-    error.set_backtrace e.backtrace
-
-    raise error
-  end
-
-  ##
-  # Generates a class file for +klass+
-
-  def generate_class klass, template_file = nil
-    setup
-
-    current = klass
-
-    template_file ||= @template_dir + 'class.rhtml'
-
-    debug_msg "  working on %s (%s)" % [klass.full_name, klass.path]
-    out_file   = @outputdir + klass.path
-    rel_prefix = @outputdir.relative_path_from out_file.dirname
-    search_index_rel_prefix = rel_prefix
-    search_index_rel_prefix += @asset_rel_path if @file_output
-
-    asset_rel_prefix = rel_prefix + @asset_rel_path
-    svninfo          = get_svninfo(current)
-
-    @title = "#{klass.type} #{klass.full_name} - #{@options.title}"
-
-    debug_msg "  rendering #{out_file}"
-    render_template template_file, out_file do |io|
-      here = binding
-      # suppress 1.9.3 warning
-      here.local_variable_set(:asset_rel_prefix, asset_rel_prefix)
-      here.local_variable_set(:svninfo, svninfo)
-      here
-    end
-  end
-
-  ##
-  # Generate a documentation file for each class and module
-
-  def generate_class_files
-    setup
-
-    template_file = @template_dir + 'class.rhtml'
-    template_file = @template_dir + 'classpage.rhtml' unless
-      template_file.exist?
-    return unless template_file.exist?
-    debug_msg "Generating class documentation in #{@outputdir}"
-
-    current = nil
-
-    @classes.each do |klass|
-      current = klass
-
-      generate_class klass, template_file
-    end
-  rescue => e
-    error = RDoc::Error.new \
-      "error generating #{current.path}: #{e.message} (#{e.class})"
-    error.set_backtrace e.backtrace
-
-    raise error
-  end
-
-  ##
-  # Generate a documentation file for each file
-
-  def generate_file_files
-    setup
-
-    page_file     = @template_dir + 'page.rhtml'
-    fileinfo_file = @template_dir + 'fileinfo.rhtml'
-
-    # for legacy templates
-    filepage_file = @template_dir + 'filepage.rhtml' unless
-      page_file.exist? or fileinfo_file.exist?
-
-    return unless
-      page_file.exist? or fileinfo_file.exist? or filepage_file.exist?
-
-    debug_msg "Generating file documentation in #{@outputdir}"
-
-    out_file = nil
-    current = nil
-
-    @files.each do |file|
-      current = file
-
-      if file.text? and page_file.exist? then
-        generate_page file
-        next
-      end
-
-      template_file = nil
-      out_file = @outputdir + file.path
-      debug_msg "  working on %s (%s)" % [file.full_name, out_file]
-      rel_prefix = @outputdir.relative_path_from out_file.dirname
-      search_index_rel_prefix = rel_prefix
-      search_index_rel_prefix += @asset_rel_path if @file_output
-
-      asset_rel_prefix = rel_prefix + @asset_rel_path
-
-      unless filepage_file then
-        if file.text? then
-          next unless page_file.exist?
-          template_file = page_file
-          @title = file.page_name
-        else
-          next unless fileinfo_file.exist?
-          template_file = fileinfo_file
-          @title = "File: #{file.base_name}"
-        end
-      end
-
-      @title += " - #{@options.title}"
-      template_file ||= filepage_file
-
-      render_template template_file, out_file do |io|
-        here = binding
-        # suppress 1.9.3 warning
-        here.local_variable_set(:asset_rel_prefix, asset_rel_prefix)
-        here.local_variable_set(:current, current)
-        here
-      end
-    end
-  rescue => e
-    error =
-      RDoc::Error.new "error generating #{out_file}: #{e.message} (#{e.class})"
-    error.set_backtrace e.backtrace
-
-    raise error
-  end
-
-  ##
-  # Generate a page file for +file+
-
-  def generate_page file
-    setup
-
-    template_file = @template_dir + 'page.rhtml'
-
-    out_file = @outputdir + file.path
-    debug_msg "  working on %s (%s)" % [file.full_name, out_file]
-    rel_prefix = @outputdir.relative_path_from out_file.dirname
-    search_index_rel_prefix = rel_prefix
-    search_index_rel_prefix += @asset_rel_path if @file_output
-
-    current          = file
-    asset_rel_prefix = rel_prefix + @asset_rel_path
-
-    @title = "#{file.page_name} - #{@options.title}"
-
-    debug_msg "  rendering #{out_file}"
-    render_template template_file, out_file do |io|
-      here = binding
-      # suppress 1.9.3 warning
-      here.local_variable_set(:current, current)
-      here.local_variable_set(:asset_rel_prefix, asset_rel_prefix)
-      here
-    end
-  end
-
-  ##
-  # Generates the 404 page for the RDoc servlet
-
-  def generate_servlet_not_found message
-    setup
-
-    template_file = @template_dir + 'servlet_not_found.rhtml'
-    return unless template_file.exist?
-
-    debug_msg "Rendering the servlet 404 Not Found page..."
-
-    rel_prefix = rel_prefix = ''
-    search_index_rel_prefix = rel_prefix
-    search_index_rel_prefix += @asset_rel_path if @file_output
-
-    asset_rel_prefix = ''
-
-    @title = 'Not Found'
-
-    render_template template_file do |io|
-      here = binding
-      # suppress 1.9.3 warning
-      here.local_variable_set(:asset_rel_prefix, asset_rel_prefix)
-      here
-    end
-  rescue => e
-    error = RDoc::Error.new \
-      "error generating servlet_not_found: #{e.message} (#{e.class})"
-    error.set_backtrace e.backtrace
-
-    raise error
-  end
-
-  ##
-  # Generates the servlet root page for the RDoc servlet
-
-  def generate_servlet_root installed
-    setup
-
-    template_file = @template_dir + 'servlet_root.rhtml'
-    return unless template_file.exist?
-
-    debug_msg 'Rendering the servlet root page...'
-
-    rel_prefix = '.'
-    asset_rel_prefix = rel_prefix
-    search_index_rel_prefix = asset_rel_prefix
-    search_index_rel_prefix += @asset_rel_path if @file_output
-
-    @title = 'Local RDoc Documentation'
-
-    render_template template_file do |io| binding end
-  rescue => e
-    error = RDoc::Error.new \
-      "error generating servlet_root: #{e.message} (#{e.class})"
-    error.set_backtrace e.backtrace
-
-    raise error
-  end
-
-  ##
-  # Generate an index page which lists all the classes which are documented.
-
-  def generate_table_of_contents
-    setup
-
-    template_file = @template_dir + 'table_of_contents.rhtml'
-    return unless template_file.exist?
-
-    debug_msg "Rendering the Table of Contents..."
-
-    out_file = @outputdir + 'table_of_contents.html'
-    rel_prefix = @outputdir.relative_path_from out_file.dirname
-    search_index_rel_prefix = rel_prefix
-    search_index_rel_prefix += @asset_rel_path if @file_output
-
-    asset_rel_prefix = rel_prefix + @asset_rel_path
-
-    @title = "Table of Contents - #{@options.title}"
-
-    render_template template_file, out_file do |io|
-      here = binding
-      # suppress 1.9.3 warning
-      here.local_variable_set(:asset_rel_prefix, asset_rel_prefix)
-      here
-    end
-  rescue => e
-    error = RDoc::Error.new \
-      "error generating table_of_contents.html: #{e.message} (#{e.class})"
-    error.set_backtrace e.backtrace
-
-    raise error
-  end
-
-  def install_rdoc_static_file source, destination, options # :nodoc:
-    return unless source.exist?
-
-    begin
-      FileUtils.mkdir_p File.dirname(destination), **options
-
-      begin
-        FileUtils.ln source, destination, **options
-      rescue Errno::EEXIST
-        FileUtils.rm destination
-        retry
-      end
-    rescue
-      FileUtils.cp source, destination, **options
-    end
-  end
-
-  ##
-  # Prepares for generation of output from the current directory
-
-  def setup
-    return if instance_variable_defined? :@outputdir
-
-    @outputdir = Pathname.new(@options.op_dir).expand_path @base_dir
-
-    return unless @store
-
-    @classes = @store.all_classes_and_modules.sort
-    @files   = @store.all_files.sort
-    @methods = @classes.flat_map { |m| m.method_list }.sort
-    @modsort = get_sorted_module_list @classes
-  end
-
-  ##
-  # Return a string describing the amount of time in the given number of
-  # seconds in terms a human can understand easily.
-
-  def time_delta_string seconds
-    return 'less than a minute'          if seconds < 60
-    return "#{seconds / 60} minute#{seconds / 60 == 1 ? '' : 's'}" if
-                                            seconds < 3000     # 50 minutes
-    return 'about one hour'              if seconds < 5400     # 90 minutes
-    return "#{seconds / 3600} hours"     if seconds < 64800    # 18 hours
-    return 'one day'                     if seconds < 86400    #  1 day
-    return 'about one day'               if seconds < 172800   #  2 days
-    return "#{seconds / 86400} days"     if seconds < 604800   #  1 week
-    return 'about one week'              if seconds < 1209600  #  2 week
-    return "#{seconds / 604800} weeks"   if seconds < 7257600  #  3 months
-    return "#{seconds / 2419200} months" if seconds < 31536000 #  1 year
-    return "#{seconds / 31536000} years"
-  end
-
-  # %q$Id: darkfish.rb 52 2009-01-07 02:08:11Z deveiant $"
-  SVNID_PATTERN = /
-    \$Id:\s
-    (\S+)\s                # filename
-    (\d+)\s                # rev
-    (\d{4}-\d{2}-\d{2})\s  # Date (YYYY-MM-DD)
-    (\d{2}:\d{2}:\d{2}Z)\s # Time (HH:MM:SSZ)
-    (\w+)\s                # committer
-    \$$
-  /x
-
-  ##
-  # Try to extract Subversion information out of the first constant whose
-  # value looks like a subversion Id tag. If no matching constant is found,
-  # and empty hash is returned.
-
-  def get_svninfo klass
-    constants = klass.constants or return {}
-
-    constants.find { |c| c.value =~ SVNID_PATTERN } or return {}
-
-    filename, rev, date, time, committer = $~.captures
-    commitdate = Time.parse "#{date} #{time}"
-
-    return {
-      :filename    => filename,
-      :rev         => Integer(rev),
-      :commitdate  => commitdate,
-      :commitdelta => time_delta_string(Time.now - commitdate),
-      :committer   => committer,
-    }
-  end
-
-  ##
-  # Creates a template from its components and the +body_file+.
-  #
-  # For backwards compatibility, if +body_file+ contains "<html" the body is
-  # used directly.
-
-  def assemble_template body_file
-    body = body_file.read
-    return body if body =~ /<html/
-
-    head_file = @template_dir + '_head.rhtml'
-    footer_file = @template_dir + '_footer.rhtml'
-
-    <<-TEMPLATE
-<!DOCTYPE html>
-
-<html>
-<head>
-#{head_file.read}
-
-#{body}
-
-#{footer_file.read}
-    TEMPLATE
-  end
-
-  ##
-  # Renders the ERb contained in +file_name+ relative to the template
-  # directory and returns the result based on the current context.
-
-  def render file_name
-    template_file = @template_dir + file_name
-
-    template = template_for template_file, false, RDoc::ERBPartial
-
-    template.filename = template_file.to_s
-
-    template.result @context
-  end
-
-  ##
-  # Load and render the erb template in the given +template_file+ and write
-  # it out to +out_file+.
-  #
-  # Both +template_file+ and +out_file+ should be Pathname-like objects.
-  #
-  # An io will be yielded which must be captured by binding in the caller.
-
-  def render_template template_file, out_file = nil # :yield: io
-    io_output = out_file && !@dry_run && @file_output
-    erb_klass = io_output ? RDoc::ERBIO : ERB
-
-    template = template_for template_file, true, erb_klass
-
-    if io_output then
-      debug_msg "Outputting to %s" % [out_file.expand_path]
-
-      out_file.dirname.mkpath
-      out_file.open 'w', 0644 do |io|
-        io.set_encoding @options.encoding
-
-        @context = yield io
-
-        template_result template, @context, template_file
-      end
-    else
-      @context = yield nil
-
-      output = template_result template, @context, template_file
-
-      debug_msg "  would have written %d characters to %s" % [
-        output.length, out_file.expand_path
-      ] if @dry_run
-
-      output
-    end
-  end
-
-  ##
-  # Creates the result for +template+ with +context+.  If an error is raised a
-  # Pathname +template_file+ will indicate the file where the error occurred.
-
-  def template_result template, context, template_file
-    template.filename = template_file.to_s
-    template.result context
-  rescue NoMethodError => e
-    raise RDoc::Error, "Error while evaluating %s: %s" % [
-      template_file.expand_path,
-      e.message,
-    ], e.backtrace
-  end
-
-  ##
-  # Retrieves a cache template for +file+, if present, or fills the cache.
-
-  def template_for file, page = true, klass = ERB
-    template = @template_cache[file]
-
-    return template if template
-
-    if page then
-      template = assemble_template file
-      erbout = 'io'
-    else
-      template = file.read
-      template = template.encode @options.encoding
-
-      file_var = File.basename(file).sub(/\..*/, '')
-
-      erbout = "_erbout_#{file_var}"
-    end
-
-    template = klass.new template, trim_mode: '-', eoutvar: erbout
-    @template_cache[file] = template
-    template
-  end
-
-end
diff --git a/lib/rdoc/generator/json_index.rb b/lib/rdoc/generator/json_index.rb
deleted file mode 100644
index c454910d5c94f8..00000000000000
--- a/lib/rdoc/generator/json_index.rb
+++ /dev/null
@@ -1,300 +0,0 @@
-# frozen_string_literal: true
-require 'json'
-begin
-  require 'zlib'
-rescue LoadError
-end
-
-##
-# The JsonIndex generator is designed to complement an HTML generator and
-# produces a JSON search index.  This generator is derived from sdoc by
-# Vladimir Kolesnikov and contains verbatim code written by him.
-#
-# This generator is designed to be used with a regular HTML generator:
-#
-#   class RDoc::Generator::Darkfish
-#     def initialize options
-#       # ...
-#       @base_dir = Pathname.pwd.expand_path
-#
-#       @json_index = RDoc::Generator::JsonIndex.new self, options
-#     end
-#
-#     def generate
-#       # ...
-#       @json_index.generate
-#     end
-#   end
-#
-# == Index Format
-#
-# The index is output as a JSON file assigned to the global variable
-# +search_data+.  The structure is:
-#
-#   var search_data = {
-#     "index": {
-#       "searchIndex":
-#         ["a", "b", ...],
-#       "longSearchIndex":
-#         ["a", "a::b", ...],
-#       "info": [
-#         ["A", "A", "A.html", "", ""],
-#         ["B", "A::B", "A::B.html", "", ""],
-#         ...
-#       ]
-#     }
-#   }
-#
-# The same item is described across the +searchIndex+, +longSearchIndex+ and
-# +info+ fields.  The +searchIndex+ field contains the item's short name, the
-# +longSearchIndex+ field contains the full_name (when appropriate) and the
-# +info+ field contains the item's name, full_name, path, parameters and a
-# snippet of the item's comment.
-#
-# == LICENSE
-#
-# Copyright (c) 2009 Vladimir Kolesnikov
-#
-# Permission is hereby granted, free of charge, to any person obtaining
-# a copy of this software and associated documentation files (the
-# "Software"), to deal in the Software without restriction, including
-# without limitation the rights to use, copy, modify, merge, publish,
-# distribute, sublicense, and/or sell copies of the Software, and to
-# permit persons to whom the Software is furnished to do so, subject to
-# the following conditions:
-#
-# The above copyright notice and this permission notice shall be
-# included in all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-class RDoc::Generator::JsonIndex
-
-  include RDoc::Text
-
-  ##
-  # Where the search index lives in the generated output
-
-  SEARCH_INDEX_FILE = File.join 'js', 'search_index.js'
-
-  attr_reader :index # :nodoc:
-
-  ##
-  # Creates a new generator.  +parent_generator+ is used to determine the
-  # class_dir and file_dir of links in the output index.
-  #
-  # +options+ are the same options passed to the parent generator.
-
-  def initialize parent_generator, options
-    @parent_generator = parent_generator
-    @store            = parent_generator.store
-    @options          = options
-
-    @template_dir = File.expand_path '../template/json_index', __FILE__
-    @base_dir = @parent_generator.base_dir
-
-    @classes = nil
-    @files   = nil
-    @index   = nil
-  end
-
-  ##
-  # Builds the JSON index as a Hash.
-
-  def build_index
-    reset @store.all_files.sort, @store.all_classes_and_modules.sort
-
-    index_classes
-    index_methods
-    index_pages
-
-    { :index => @index }
-  end
-
-  ##
-  # Output progress information if debugging is enabled
-
-  def debug_msg *msg
-    return unless $DEBUG_RDOC
-    $stderr.puts(*msg)
-  end
-
-  ##
-  # Writes the JSON index to disk
-
-  def generate
-    debug_msg "Generating JSON index"
-
-    debug_msg "  writing search index to %s" % SEARCH_INDEX_FILE
-    data = build_index
-
-    return if @options.dry_run
-
-    out_dir = @base_dir + @options.op_dir
-    index_file = out_dir + SEARCH_INDEX_FILE
-
-    FileUtils.mkdir_p index_file.dirname, :verbose => $DEBUG_RDOC
-
-    index_file.open 'w', 0644 do |io|
-      io.set_encoding Encoding::UTF_8
-      io.write 'var search_data = '
-
-      JSON.dump data, io, 0
-    end
-    unless ENV['SOURCE_DATE_EPOCH'].nil?
-      index_file.utime index_file.atime, Time.at(ENV['SOURCE_DATE_EPOCH'].to_i).gmtime
-    end
-
-    Dir.chdir @template_dir do
-      Dir['**/*.js'].each do |source|
-        dest = File.join out_dir, source
-
-        FileUtils.install source, dest, :mode => 0644, :preserve => true, :verbose => $DEBUG_RDOC
-      end
-    end
-  end
-
-  ##
-  # Compress the search_index.js file using gzip
-
-  def generate_gzipped
-    return if @options.dry_run or not defined?(Zlib)
-
-    debug_msg "Compressing generated JSON index"
-    out_dir = @base_dir + @options.op_dir
-
-    search_index_file = out_dir + SEARCH_INDEX_FILE
-    outfile           = out_dir + "#{search_index_file}.gz"
-
-    debug_msg "Reading the JSON index file from %s" % search_index_file
-    search_index = search_index_file.read(mode: 'r:utf-8')
-
-    debug_msg "Writing gzipped search index to %s" % outfile
-
-    Zlib::GzipWriter.open(outfile) do |gz|
-      gz.mtime = File.mtime(search_index_file)
-      gz.orig_name = search_index_file.basename.to_s
-      gz.write search_index
-      gz.close
-    end
-
-    # GZip the rest of the js files
-    Dir.chdir @template_dir do
-      Dir['**/*.js'].each do |source|
-        dest = out_dir + source
-        outfile = out_dir + "#{dest}.gz"
-
-        debug_msg "Reading the original js file from %s" % dest
-        data = dest.read
-
-        debug_msg "Writing gzipped file to %s" % outfile
-
-        Zlib::GzipWriter.open(outfile) do |gz|
-          gz.mtime = File.mtime(dest)
-          gz.orig_name = dest.basename.to_s
-          gz.write data
-          gz.close
-        end
-      end
-    end
-  end
-
-  ##
-  # Adds classes and modules to the index
-
-  def index_classes
-    debug_msg "  generating class search index"
-
-    documented = @classes.uniq.select do |klass|
-      klass.document_self_or_methods
-    end
-
-    documented.each do |klass|
-      debug_msg "    #{klass.full_name}"
-      record = klass.search_record
-      @index[:searchIndex]     << search_string(record.shift)
-      @index[:longSearchIndex] << search_string(record.shift)
-      @index[:info]            << record
-    end
-  end
-
-  ##
-  # Adds methods to the index
-
-  def index_methods
-    debug_msg "  generating method search index"
-
-    list = @classes.uniq.flat_map do |klass|
-      klass.method_list
-    end.sort_by do |method|
-      [method.name, method.parent.full_name]
-    end
-
-    list.each do |method|
-      debug_msg "    #{method.full_name}"
-      record = method.search_record
-      @index[:searchIndex]     << "#{search_string record.shift}()"
-      @index[:longSearchIndex] << "#{search_string record.shift}()"
-      @index[:info]            << record
-    end
-  end
-
-  ##
-  # Adds pages to the index
-
-  def index_pages
-    debug_msg "  generating pages search index"
-
-    pages = @files.select do |file|
-      file.text?
-    end
-
-    pages.each do |page|
-      debug_msg "    #{page.page_name}"
-      record = page.search_record
-      @index[:searchIndex]     << search_string(record.shift)
-      @index[:longSearchIndex] << ''
-      record.shift
-      @index[:info]            << record
-    end
-  end
-
-  ##
-  # The directory classes are written to
-
-  def class_dir
-    @parent_generator.class_dir
-  end
-
-  ##
-  # The directory files are written to
-
-  def file_dir
-    @parent_generator.file_dir
-  end
-
-  def reset files, classes # :nodoc:
-    @files   = files
-    @classes = classes
-
-    @index = {
-      :searchIndex => [],
-      :longSearchIndex => [],
-      :info => []
-    }
-  end
-
-  ##
-  # Removes whitespace and downcases +string+
-
-  def search_string string
-    string.downcase.gsub(/\s/, '')
-  end
-
-end
diff --git a/lib/rdoc/generator/markup.rb b/lib/rdoc/generator/markup.rb
deleted file mode 100644
index 76b7d458aa233c..00000000000000
--- a/lib/rdoc/generator/markup.rb
+++ /dev/null
@@ -1,159 +0,0 @@
-# frozen_string_literal: true
-##
-# Handle common RDoc::Markup tasks for various CodeObjects
-#
-# This module is loaded by generators.  It allows RDoc's CodeObject tree to
-# avoid loading generator code to improve startup time for +ri+.
-
-module RDoc::Generator::Markup
-
-  ##
-  # Generates a relative URL from this object's path to +target_path+
-
-  def aref_to(target_path)
-    RDoc::Markup::ToHtml.gen_relative_url path, target_path
-  end
-
-  ##
-  # Generates a relative URL from +from_path+ to this object's path
-
-  def as_href(from_path)
-    RDoc::Markup::ToHtml.gen_relative_url from_path, path
-  end
-
-  ##
-  # Handy wrapper for marking up this object's comment
-
-  def description
-    markup @comment
-  end
-
-  ##
-  # Creates an RDoc::Markup::ToHtmlCrossref formatter
-
-  def formatter
-    return @formatter if defined? @formatter
-
-    options = @store.rdoc.options
-    this = RDoc::Context === self ? self : @parent
-
-    @formatter = RDoc::Markup::ToHtmlCrossref.new options, this.path, this
-    @formatter.code_object = self
-    @formatter
-  end
-
-  ##
-  # Build a webcvs URL starting for the given +url+ with +full_path+ appended
-  # as the destination path.  If +url+ contains '%s' +full_path+ will be
-  # will replace the %s using sprintf on the +url+.
-
-  def cvs_url(url, full_path)
-    if /%s/ =~ url then
-      sprintf url, full_path
-    else
-      url + full_path
-    end
-  end
-
-end
-
-class RDoc::CodeObject
-
-  include RDoc::Generator::Markup
-
-end
-
-class RDoc::MethodAttr
-
-  ##
-  # Prepend +src+ with line numbers.  Relies on the first line of a source
-  # code listing having:
-  #
-  #   # File xxxxx, line dddd
-  #
-  # If it has this comment then line numbers are added to +src+ and the <tt>,
-  # line dddd</tt> portion of the comment is removed.
-
-  def add_line_numbers(src)
-    return unless src.sub!(/\A(.*)(, line (\d+))/, '\1')
-    first = $3.to_i - 1
-    last  = first + src.count("\n")
-    size = last.to_s.length
-
-    line = first
-    src.gsub!(/^/) do
-      res = if line == first then
-              " " * (size + 1)
-            else
-              "<span class=\"line-num\">%2$*1$d</span> " % [size, line]
-            end
-
-      line += 1
-      res
-    end
-  end
-
-  ##
-  # Turns the method's token stream into HTML.
-  #
-  # Prepends line numbers if +options.line_numbers+ is true.
-
-  def markup_code
-    return '' unless @token_stream
-
-    src = RDoc::TokenStream.to_html @token_stream
-
-    # dedent the source
-    indent = src.length
-    lines = src.lines.to_a
-    lines.shift if src =~ /\A.*#\ *File/i # remove '# File' comment
-    lines.each do |line|
-      if line =~ /^ *(?=\S)/
-        n = $~.end(0)
-        indent = n if n < indent
-        break if n == 0
-      end
-    end
-    src.gsub!(/^#{' ' * indent}/, '') if indent > 0
-
-    add_line_numbers(src) if options.line_numbers
-
-    src
-  end
-
-end
-
-class RDoc::ClassModule
-
-  ##
-  # Handy wrapper for marking up this class or module's comment
-
-  def description
-    markup @comment_location
-  end
-
-end
-
-class RDoc::Context::Section
-
-  include RDoc::Generator::Markup
-
-end
-
-class RDoc::TopLevel
-
-  ##
-  # Returns a URL for this source file on some web repository.  Use the -W
-  # command line option to set.
-
-  def cvs_url
-    url = @store.rdoc.options.webcvs
-
-    if /%s/ =~ url then
-      url % @relative_name
-    else
-      url + @relative_name
-    end
-  end
-
-end
diff --git a/lib/rdoc/generator/pot.rb b/lib/rdoc/generator/pot.rb
deleted file mode 100644
index bee1133b078e4b..00000000000000
--- a/lib/rdoc/generator/pot.rb
+++ /dev/null
@@ -1,98 +0,0 @@
-# frozen_string_literal: true
-##
-# Generates a POT file.
-#
-# Here is a translator work flow with the generator.
-#
-# == Create .pot
-#
-# You create .pot file by pot formatter:
-#
-#   % rdoc --format pot
-#
-# It generates doc/rdoc.pot.
-#
-# == Create .po
-#
-# You create .po file from doc/rdoc.pot. This operation is needed only
-# the first time. This work flow assumes that you are a translator
-# for Japanese.
-#
-# You create locale/ja/rdoc.po from doc/rdoc.pot. You can use msginit
-# provided by GNU gettext or rmsginit provided by gettext gem. This
-# work flow uses gettext gem because it is more portable than GNU
-# gettext for Rubyists. Gettext gem is implemented by pure Ruby.
-#
-#   % gem install gettext
-#   % mkdir -p locale/ja
-#   % rmsginit --input doc/rdoc.pot --output locale/ja/rdoc.po --locale ja
-#
-# Translate messages in .po
-#
-# You translate messages in .po by a PO file editor. po-mode.el exists
-# for Emacs users. There are some GUI tools such as GTranslator.
-# There are some Web services such as POEditor and Tansifex. You can
-# edit by your favorite text editor because .po is a text file.
-# Generate localized documentation
-#
-# You can generate localized documentation with locale/ja/rdoc.po:
-#
-#   % rdoc --locale ja
-#
-# You can find documentation in Japanese in doc/. Yay!
-#
-# == Update translation
-#
-# You need to update translation when your application is added or
-# modified messages.
-#
-# You can update .po by the following command lines:
-#
-#   % rdoc --format pot
-#   % rmsgmerge --update locale/ja/rdoc.po doc/rdoc.pot
-#
-# You edit locale/ja/rdoc.po to translate new messages.
-
-class RDoc::Generator::POT
-
-  RDoc::RDoc.add_generator self
-
-  ##
-  # Description of this generator
-
-  DESCRIPTION = 'creates .pot file'
-
-  ##
-  # Set up a new .pot generator
-
-  def initialize store, options #:not-new:
-    @options    = options
-    @store      = store
-  end
-
-  ##
-  # Writes .pot to disk.
-
-  def generate
-    po = extract_messages
-    pot_path = 'rdoc.pot'
-    File.open(pot_path, "w") do |pot|
-      pot.print(po.to_s)
-    end
-  end
-
-  def class_dir
-    nil
-  end
-
-  private
-  def extract_messages
-    extractor = MessageExtractor.new(@store)
-    extractor.extract
-  end
-
-  require_relative 'pot/message_extractor'
-  require_relative 'pot/po'
-  require_relative 'pot/po_entry'
-
-end
diff --git a/lib/rdoc/generator/pot/message_extractor.rb b/lib/rdoc/generator/pot/message_extractor.rb
deleted file mode 100644
index 313dfd2dc71393..00000000000000
--- a/lib/rdoc/generator/pot/message_extractor.rb
+++ /dev/null
@@ -1,68 +0,0 @@
-# frozen_string_literal: true
-##
-# Extracts message from RDoc::Store
-
-class RDoc::Generator::POT::MessageExtractor
-
-  ##
-  # Creates a message extractor for +store+.
-
-  def initialize store
-    @store = store
-    @po = RDoc::Generator::POT::PO.new
-  end
-
-  ##
-  # Extracts messages from +store+, stores them into
-  # RDoc::Generator::POT::PO and returns it.
-
-  def extract
-    @store.all_classes_and_modules.each do |klass|
-      extract_from_klass(klass)
-    end
-    @po
-  end
-
-  private
-
-  def extract_from_klass klass
-    extract_text(klass.comment_location, klass.full_name)
-
-    klass.each_section do |section, constants, attributes|
-      extract_text(section.title ,"#{klass.full_name}: section title")
-      section.comments.each do |comment|
-        extract_text(comment, "#{klass.full_name}: #{section.title}")
-      end
-    end
-
-    klass.each_constant do |constant|
-      extract_text(constant.comment, constant.full_name)
-    end
-
-    klass.each_attribute do |attribute|
-      extract_text(attribute.comment, attribute.full_name)
-    end
-
-    klass.each_method do |method|
-      extract_text(method.comment, method.full_name)
-    end
-  end
-
-  def extract_text text, comment, location = nil
-    return if text.nil?
-
-    options = {
-      :extracted_comment => comment,
-      :references => [location].compact,
-    }
-    i18n_text = RDoc::I18n::Text.new(text)
-    i18n_text.extract_messages do |part|
-      @po.add(entry(part[:paragraph], options))
-    end
-  end
-
-  def entry msgid, options
-    RDoc::Generator::POT::POEntry.new(msgid, options)
-  end
-
-end
diff --git a/lib/rdoc/generator/pot/po.rb b/lib/rdoc/generator/pot/po.rb
deleted file mode 100644
index 37d45e525889cb..00000000000000
--- a/lib/rdoc/generator/pot/po.rb
+++ /dev/null
@@ -1,84 +0,0 @@
-# frozen_string_literal: true
-##
-# Generates a PO format text
-
-class RDoc::Generator::POT::PO
-
-  ##
-  # Creates an object that represents PO format.
-
-  def initialize
-    @entries = {}
-    add_header
-  end
-
-  ##
-  # Adds a PO entry to the PO.
-
-  def add entry
-    existing_entry = @entries[entry.msgid]
-    if existing_entry
-      entry = existing_entry.merge(entry)
-    end
-    @entries[entry.msgid] = entry
-  end
-
-  ##
-  # Returns PO format text for the PO.
-
-  def to_s
-    po = ''
-    sort_entries.each do |entry|
-      po += "\n" unless po.empty?
-      po += entry.to_s
-    end
-    po
-  end
-
-  private
-
-  def add_header
-    add(header_entry)
-  end
-
-  def header_entry
-    comment = <<-COMMENT
-SOME DESCRIPTIVE TITLE.
-Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-This file is distributed under the same license as the PACKAGE package.
-FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-    COMMENT
-
-    content = <<-CONTENT
-Project-Id-Version: PACKAGE VERSEION
-Report-Msgid-Bugs-To:
-PO-Revision-Date: YEAR-MO_DA HO:MI+ZONE
-Last-Translator: FULL NAME <EMAIL@ADDRESS>
-Language-Team: LANGUAGE <LL@li.org>
-Language:
-MIME-Version: 1.0
-Content-Type: text/plain; charset=CHARSET
-Content-Transfer-Encoding: 8bit
-Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;
-    CONTENT
-
-    options = {
-      :msgstr => content,
-      :translator_comment => comment,
-      :flags => ['fuzzy'],
-    }
-    RDoc::Generator::POT::POEntry.new('', options)
-  end
-
-  def sort_entries
-    headers, messages = @entries.values.partition do |entry|
-      entry.msgid.empty?
-    end
-    # TODO: sort by location
-    sorted_messages = messages.sort_by do |entry|
-      entry.msgid
-    end
-    headers + sorted_messages
-  end
-
-end
diff --git a/lib/rdoc/generator/pot/po_entry.rb b/lib/rdoc/generator/pot/po_entry.rb
deleted file mode 100644
index 3c278826f43905..00000000000000
--- a/lib/rdoc/generator/pot/po_entry.rb
+++ /dev/null
@@ -1,141 +0,0 @@
-# frozen_string_literal: true
-##
-# A PO entry in PO
-
-class RDoc::Generator::POT::POEntry
-
-  # The msgid content
-  attr_reader :msgid
-
-  # The msgstr content
-  attr_reader :msgstr
-
-  # The comment content created by translator (PO editor)
-  attr_reader :translator_comment
-
-  # The comment content extracted from source file
-  attr_reader :extracted_comment
-
-  # The locations where the PO entry is extracted
-  attr_reader :references
-
-  # The flags of the PO entry
-  attr_reader :flags
-
-  ##
-  # Creates a PO entry for +msgid+. Other valus can be specified by
-  # +options+.
-
-  def initialize msgid, options = {}
-    @msgid = msgid
-    @msgstr = options[:msgstr] || ""
-    @translator_comment = options[:translator_comment]
-    @extracted_comment = options[:extracted_comment]
-    @references = options[:references] || []
-    @flags = options[:flags] || []
-  end
-
-  ##
-  # Returns the PO entry in PO format.
-
-  def to_s
-    entry = ''
-    entry += format_translator_comment
-    entry += format_extracted_comment
-    entry += format_references
-    entry += format_flags
-    entry += <<-ENTRY
-msgid #{format_message(@msgid)}
-msgstr #{format_message(@msgstr)}
-    ENTRY
-  end
-
-  ##
-  # Merges the PO entry with +other_entry+.
-
-  def merge other_entry
-    options = {
-      :extracted_comment  => merge_string(@extracted_comment,
-                                          other_entry.extracted_comment),
-      :translator_comment => merge_string(@translator_comment,
-                                          other_entry.translator_comment),
-      :references         => merge_array(@references,
-                                         other_entry.references),
-      :flags              => merge_array(@flags,
-                                         other_entry.flags),
-    }
-    self.class.new(@msgid, options)
-  end
-
-  private
-
-  def format_comment mark, comment
-    return '' unless comment
-    return '' if comment.empty?
-
-    formatted_comment = ''
-    comment.each_line do |line|
-      formatted_comment += "#{mark} #{line}"
-    end
-    formatted_comment += "\n" unless formatted_comment.end_with?("\n")
-    formatted_comment
-  end
-
-  def format_translator_comment
-    format_comment('#', @translator_comment)
-  end
-
-  def format_extracted_comment
-    format_comment('#.', @extracted_comment)
-  end
-
-  def format_references
-    return '' if @references.empty?
-
-    formatted_references = ''
-    @references.sort.each do |file, line|
-      formatted_references += "\#: #{file}:#{line}\n"
-    end
-    formatted_references
-  end
-
-  def format_flags
-    return '' if @flags.empty?
-
-    formatted_flags = flags.join(",")
-    "\#, #{formatted_flags}\n"
-  end
-
-  def format_message message
-    return "\"#{escape(message)}\"" unless message.include?("\n")
-
-    formatted_message = '""'
-    message.each_line do |line|
-      formatted_message += "\n"
-      formatted_message += "\"#{escape(line)}\""
-    end
-    formatted_message
-  end
-
-  def escape string
-    string.gsub(/["\\\t\n]/) do |special_character|
-      case special_character
-      when "\t"
-        "\\t"
-      when "\n"
-        "\\n"
-      else
-        "\\#{special_character}"
-      end
-    end
-  end
-
-  def merge_string string1, string2
-    [string1, string2].compact.join("\n")
-  end
-
-  def merge_array array1, array2
-      (array1 + array2).uniq
-  end
-
-end
diff --git a/lib/rdoc/generator/ri.rb b/lib/rdoc/generator/ri.rb
deleted file mode 100644
index 1c2f018f97d15b..00000000000000
--- a/lib/rdoc/generator/ri.rb
+++ /dev/null
@@ -1,30 +0,0 @@
-# frozen_string_literal: true
-##
-# Generates ri data files
-
-class RDoc::Generator::RI
-
-  RDoc::RDoc.add_generator self
-
-  ##
-  # Description of this generator
-
-  DESCRIPTION = 'creates ri data files'
-
-  ##
-  # Set up a new ri generator
-
-  def initialize store, options #:not-new:
-    @options    = options
-    @store      = store
-    @store.path = '.'
-  end
-
-  ##
-  # Writes the parsed data store to disk for use by ri.
-
-  def generate
-    @store.save
-  end
-
-end
diff --git a/lib/rdoc/generator/template/darkfish/.document b/lib/rdoc/generator/template/darkfish/.document
deleted file mode 100644
index e69de29bb2d1d6..00000000000000
diff --git a/lib/rdoc/generator/template/darkfish/_footer.rhtml b/lib/rdoc/generator/template/darkfish/_footer.rhtml
deleted file mode 100644
index 9791b42901bf94..00000000000000
--- a/lib/rdoc/generator/template/darkfish/_footer.rhtml
+++ /dev/null
@@ -1,5 +0,0 @@
-<footer id="validator-badges" role="contentinfo">
-  <p><a href="https://validator.w3.org/check/referer">Validate</a>
-  <p>Generated by <a href="https://ruby.github.io/rdoc/">RDoc</a> <%= RDoc::VERSION %>.
-  <p>Based on <a href="http://deveiate.org/projects/Darkfish-RDoc/">Darkfish</a> by <a href="http://deveiate.org">Michael Granger</a>.
-</footer>
diff --git a/lib/rdoc/generator/template/darkfish/_head.rhtml b/lib/rdoc/generator/template/darkfish/_head.rhtml
deleted file mode 100644
index d5aed3e9ef2569..00000000000000
--- a/lib/rdoc/generator/template/darkfish/_head.rhtml
+++ /dev/null
@@ -1,20 +0,0 @@
-<meta charset="<%= @options.charset %>">
-
-<title><%= h @title %></title>
-
-<script type="text/javascript">
-  var rdoc_rel_prefix = "<%= h asset_rel_prefix %>/";
-  var index_rel_prefix = "<%= h rel_prefix %>/";
-</script>
-
-<script src="<%= h asset_rel_prefix %>/js/navigation.js" defer></script>
-<script src="<%= h asset_rel_prefix %>/js/search.js" defer></script>
-<script src="<%= h asset_rel_prefix %>/js/search_index.js" defer></script>
-<script src="<%= h asset_rel_prefix %>/js/searcher.js" defer></script>
-<script src="<%= h asset_rel_prefix %>/js/darkfish.js" defer></script>
-
-<link href="<%= h asset_rel_prefix %>/css/fonts.css" rel="stylesheet">
-<link href="<%= h asset_rel_prefix %>/css/rdoc.css" rel="stylesheet">
-<%- @options.template_stylesheets.each do |stylesheet| -%>
-<link href="<%= h asset_rel_prefix %>/<%= File.basename stylesheet %>" rel="stylesheet">
-<%- end -%>
diff --git a/lib/rdoc/generator/template/darkfish/_sidebar_VCS_info.rhtml b/lib/rdoc/generator/template/darkfish/_sidebar_VCS_info.rhtml
deleted file mode 100644
index 22a12d9e95a995..00000000000000
--- a/lib/rdoc/generator/template/darkfish/_sidebar_VCS_info.rhtml
+++ /dev/null
@@ -1,19 +0,0 @@
-<%- if !svninfo.empty? then %>
-<div id="file-svninfo-section" class="nav-section">
-  <h3>VCS Info</h3>
-
-  <div class="section-body">
-    <dl class="svninfo">
-      <dt>Rev
-      <dd><%= svninfo[:rev] %>
-
-      <dt>Last Checked In
-      <dd><%= svninfo[:commitdate].strftime('%Y-%m-%d %H:%M:%S') %>
-        (<%= svninfo[:commitdelta] %> ago)
-
-      <dt>Checked in by
-      <dd><%= svninfo[:committer] %>
-    </dl>
-  </div>
-</div>
-<%- end -%>
diff --git a/lib/rdoc/generator/template/darkfish/_sidebar_classes.rhtml b/lib/rdoc/generator/template/darkfish/_sidebar_classes.rhtml
deleted file mode 100644
index d3d8da4017c3ec..00000000000000
--- a/lib/rdoc/generator/template/darkfish/_sidebar_classes.rhtml
+++ /dev/null
@@ -1,33 +0,0 @@
-<div id="classindex-section" class="nav-section">
-  <h3>Class and Module Index</h3>
-
-  <%-
-  all_classes = @classes.group_by do |klass|
-    klass.full_name[/\A[^:]++(?:::[^:]++(?=::))*+(?=::[^:]*+\z)/]
-  end.delete_if do |_, klasses|
-    !klasses.any?(&:display?)
-  end
-  link = proc do |index_klass, display = index_klass.display?|
-    if display
-      -%><code><a href="<%= rel_prefix %>/<%= index_klass.path %>"><%= index_klass.name %></a></code><%-
-    else
-      -%><code><%= index_klass.name %></code><%-
-    end
-  end
-  if top = all_classes[nil]
-    solo = top.one? {|klass| klass.display?}
-    traverse = proc do |klasses| -%>
-  <ul class="link-list">
-      <%- klasses.each do |index_klass| -%>
-        <%- if children = all_classes[index_klass.full_name] -%>
-  <li><details<% if solo; solo = false %> open<% end %>><summary><% link.call(index_klass) %></summary>
-          <%- traverse.call(children) -%>
-  </ul></details>
-        <%- elsif index_klass.display? -%>
-  <li><% link.call(index_klass, true) %>
-        <%- end -%>
-      <%- end -%>
-    <%- end -%>
-    <%- traverse.call(top) -%>
-  <%- end -%>
-</div>
diff --git a/lib/rdoc/generator/template/darkfish/_sidebar_extends.rhtml b/lib/rdoc/generator/template/darkfish/_sidebar_extends.rhtml
deleted file mode 100644
index 7602076c966f32..00000000000000
--- a/lib/rdoc/generator/template/darkfish/_sidebar_extends.rhtml
+++ /dev/null
@@ -1,15 +0,0 @@
-<%- unless klass.extends.empty? then %>
-<div id="extends-section" class="nav-section">
-  <h3>Extended With Modules</h3>
-
-  <ul class="link-list">
-    <%- klass.each_extend do |ext| -%>
-  <%- unless String === ext.module then -%>
-    <li><a class="extend" href="<%= klass.aref_to ext.module.path %>"><%= ext.module.full_name %></a>
-  <%- else -%>
-    <li><span class="extend"><%= ext.name %></span>
-  <%- end -%>
-  <%- end -%>
-  </ul>
-</div>
-<%- end -%>
diff --git a/lib/rdoc/generator/template/darkfish/_sidebar_in_files.rhtml b/lib/rdoc/generator/template/darkfish/_sidebar_in_files.rhtml
deleted file mode 100644
index 74869a4b514032..00000000000000
--- a/lib/rdoc/generator/template/darkfish/_sidebar_in_files.rhtml
+++ /dev/null
@@ -1,9 +0,0 @@
-<div id="file-list-section" class="nav-section">
-  <h3>Defined In</h3>
-
-  <ul>
-<%- klass.in_files.each do |tl| -%>
-    <li><%= h tl.relative_name %>
-<%- end -%>
-  </ul>
-</div>
diff --git a/lib/rdoc/generator/template/darkfish/_sidebar_includes.rhtml b/lib/rdoc/generator/template/darkfish/_sidebar_includes.rhtml
deleted file mode 100644
index 5b600e597592bc..00000000000000
--- a/lib/rdoc/generator/template/darkfish/_sidebar_includes.rhtml
+++ /dev/null
@@ -1,15 +0,0 @@
-<%- unless klass.includes.empty? then %>
-<div id="includes-section" class="nav-section">
-  <h3>Included Modules</h3>
-
-  <ul class="link-list">
-  <%- klass.each_include do |inc| -%>
-  <%- unless String === inc.module then -%>
-    <li><a class="include" href="<%= klass.aref_to inc.module.path %>"><%= inc.module.full_name %></a>
-  <%- else -%>
-    <li><span class="include"><%= inc.name %></span>
-  <%- end -%>
-  <%- end -%>
-  </ul>
-</div>
-<%- end -%>
diff --git a/lib/rdoc/generator/template/darkfish/_sidebar_installed.rhtml b/lib/rdoc/generator/template/darkfish/_sidebar_installed.rhtml
deleted file mode 100644
index faed7e0a9409ba..00000000000000
--- a/lib/rdoc/generator/template/darkfish/_sidebar_installed.rhtml
+++ /dev/null
@@ -1,15 +0,0 @@
-<div id="home-section" class="nav-section">
-  <h3>Documentation</h3>
-
-  <ul>
-  <%- installed.each do |name, href, exists, type, _| -%>
-    <%- next if type == :extra -%>
-    <li class="folder">
-    <%- if exists then -%>
-      <a href="<%= href %>"><%= h name %></a>
-    <%- else -%>
-      <%= h name %>
-    <%- end -%>
-  <%- end -%>
-  </ul>
-</div>
diff --git a/lib/rdoc/generator/template/darkfish/_sidebar_methods.rhtml b/lib/rdoc/generator/template/darkfish/_sidebar_methods.rhtml
deleted file mode 100644
index 5b4c295bed0444..00000000000000
--- a/lib/rdoc/generator/template/darkfish/_sidebar_methods.rhtml
+++ /dev/null
@@ -1,12 +0,0 @@
-<%- unless klass.method_list.empty? then %>
-<!-- Method Quickref -->
-<div id="method-list-section" class="nav-section">
-  <h3>Methods</h3>
-
-  <ul class="link-list" role="directory">
-    <%- klass.each_method do |meth| -%>
-    <li <%- if meth.calls_super %>class="calls-super" <%- end %>><a href="#<%= meth.aref %>"><%= meth.singleton ? '::' : '#' %><%= h meth.name -%></a>
-    <%- end -%>
-  </ul>
-</div>
-<%- end -%>
diff --git a/lib/rdoc/generator/template/darkfish/_sidebar_navigation.rhtml b/lib/rdoc/generator/template/darkfish/_sidebar_navigation.rhtml
deleted file mode 100644
index d7f330840a4969..00000000000000
--- a/lib/rdoc/generator/template/darkfish/_sidebar_navigation.rhtml
+++ /dev/null
@@ -1,11 +0,0 @@
-<div id="home-section" role="region" title="Quick navigation" class="nav-section">
-  <h2>
-    <a href="<%= rel_prefix %>/index.html" rel="home">Home</a>
-  </h2>
-
-  <div id="table-of-contents-navigation">
-    <a href="<%= rel_prefix %>/table_of_contents.html#pages">Pages</a>
-    <a href="<%= rel_prefix %>/table_of_contents.html#classes">Classes</a>
-    <a href="<%= rel_prefix %>/table_of_contents.html#methods">Methods</a>
-  </div>
-</div>
diff --git a/lib/rdoc/generator/template/darkfish/_sidebar_pages.rhtml b/lib/rdoc/generator/template/darkfish/_sidebar_pages.rhtml
deleted file mode 100644
index 3f68f0c0dc8bd3..00000000000000
--- a/lib/rdoc/generator/template/darkfish/_sidebar_pages.rhtml
+++ /dev/null
@@ -1,32 +0,0 @@
-<%- simple_files = @files.select { |f| f.text? } %>
-<%- if defined?(current) -%>
-  <%- dir = current.full_name[%r{\A[^/]+(?=/)}] || current.page_name -%>
-<%- end -%>
-<%- unless simple_files.empty? then -%>
-<div id="fileindex-section" class="nav-section">
-  <h3>Pages</h3>
-
-  <ul class="link-list">
-  <%- simple_files.group_by do |f| -%>
-    <%- f.full_name[%r{\A[^/]+(?=/)}] || f.page_name -%>
-  <%- end.each do |n, files| -%>
-    <%- f = files.shift -%>
-    <%- if files.empty? -%>
-    <li><a href="<%= rel_prefix %>/<%= h f.path %>"><%= h f.page_name %></a>
-      <%- next -%>
-    <%- end -%>
-    <li><details<% if dir == n %> open<% end %>><summary><%
-    if n == f.page_name
-      %><a href="<%= rel_prefix %>/<%= h f.path %>"><%= h n %></a><%
-    else
-      %><%= h n %><% files.unshift(f)
-    end %></summary>
-    <ul class="link-list">
-    <%- files.each do |f| -%>
-      <li><a href="<%= rel_prefix %>/<%= h f.path %>"><%= h f.page_name %></a>
-    <%- end -%>
-    </ul></details>
-  <%- end -%>
-  </ul>
-</div>
-<%- end -%>
diff --git a/lib/rdoc/generator/template/darkfish/_sidebar_parent.rhtml b/lib/rdoc/generator/template/darkfish/_sidebar_parent.rhtml
deleted file mode 100644
index 1420da3201ceb6..00000000000000
--- a/lib/rdoc/generator/template/darkfish/_sidebar_parent.rhtml
+++ /dev/null
@@ -1,11 +0,0 @@
-<%- if klass.type == 'class' then %>
-<div id="parent-class-section" class="nav-section">
-  <h3>Parent</h3>
-
-  <%- if klass.superclass and not String === klass.superclass then -%>
-  <p class="link"><a href="<%= klass.aref_to klass.superclass.path %>"><%= klass.superclass.full_name %></a>
-  <%- else -%>
-  <p class="link"><%= klass.superclass %>
-  <%- end -%>
-</div>
-<%- end -%>
diff --git a/lib/rdoc/generator/template/darkfish/_sidebar_search.rhtml b/lib/rdoc/generator/template/darkfish/_sidebar_search.rhtml
deleted file mode 100644
index afc7f7b88d1d11..00000000000000
--- a/lib/rdoc/generator/template/darkfish/_sidebar_search.rhtml
+++ /dev/null
@@ -1,14 +0,0 @@
-<div id="search-section" role="search" class="project-section initially-hidden">
-  <form action="#" method="get" accept-charset="utf-8">
-    <div id="search-field-wrapper">
-      <input id="search-field" role="combobox" aria-label="Search"
-             aria-autocomplete="list" aria-controls="search-results"
-             type="text" name="search" placeholder="Search (/) for a class, method, ..." spellcheck="false"
-             title="Type to search, Up and Down to navigate, Enter to load">
-    </div>
-
-    <ul id="search-results" aria-label="Search Results"
-        aria-busy="false" aria-expanded="false"
-        aria-atomic="false" class="initially-hidden"></ul>
-  </form>
-</div>
diff --git a/lib/rdoc/generator/template/darkfish/_sidebar_sections.rhtml b/lib/rdoc/generator/template/darkfish/_sidebar_sections.rhtml
deleted file mode 100644
index 6dcd2ae81faf2d..00000000000000
--- a/lib/rdoc/generator/template/darkfish/_sidebar_sections.rhtml
+++ /dev/null
@@ -1,11 +0,0 @@
-<%- unless klass.sections.length == 1 then %>
-<div id="sections-section" class="nav-section">
-  <h3>Sections</h3>
-
-  <ul class="link-list" role="directory">
-    <%- klass.sort_sections.each do |section| -%>
-      <li><a href="#<%= section.aref %>"><%= h section.title %></a></li>
-    <%- end -%>
-  </ul>
-</div>
-<%- end -%>
diff --git a/lib/rdoc/generator/template/darkfish/_sidebar_table_of_contents.rhtml b/lib/rdoc/generator/template/darkfish/_sidebar_table_of_contents.rhtml
deleted file mode 100644
index b1e047b5f71b36..00000000000000
--- a/lib/rdoc/generator/template/darkfish/_sidebar_table_of_contents.rhtml
+++ /dev/null
@@ -1,39 +0,0 @@
-<%- comment = if current.respond_to? :comment_location then
-               current.comment_location
-             else
-               current.comment
-             end
-   table = current.parse(comment).table_of_contents.dup
-
-   if table.length > 1 then %>
-<div class="nav-section">
-  <h3>Table of Contents</h3>
-
-    <%- display_link = proc do |heading| -%>
-      <a href="#<%= heading.label current %>"><%= heading.plain_html %></a>
-    <%- end -%>
-
-    <%- list_siblings = proc do -%>
-      <%- level = table.first&.level -%>
-      <%- while table.first && table.first.level >= level -%>
-        <%- heading = table.shift -%>
-        <%- if table.first.nil? || table.first.level <= heading.level -%>
-          <li><% display_link.call heading -%>
-        <%- else -%>
-          <li>
-            <details open>
-              <summary><%- display_link.call heading -%></summary>
-              <ul class="link-list" role="directory">
-                <% list_siblings.call %>
-              </ul>
-            </details>
-          </li>
-        <%- end -%>
-      <%- end -%>
-    <%- end -%>
-
-  <ul class="link-list" role="directory">
-    <% list_siblings.call %>
-  </ul>
-</div>
-<%- end -%>
diff --git a/lib/rdoc/generator/template/darkfish/class.rhtml b/lib/rdoc/generator/template/darkfish/class.rhtml
deleted file mode 100644
index d6510336dfa110..00000000000000
--- a/lib/rdoc/generator/template/darkfish/class.rhtml
+++ /dev/null
@@ -1,180 +0,0 @@
-<body id="top" role="document" class="<%= klass.type %>">
-<nav role="navigation">
-  <div id="project-navigation">
-    <%= render '_sidebar_navigation.rhtml' %>
-    <%= render '_sidebar_search.rhtml' %>
-  </div>
-
-  <%= render '_sidebar_table_of_contents.rhtml' %>
-
-  <div id="class-metadata">
-    <%= render '_sidebar_sections.rhtml' %>
-    <%= render '_sidebar_parent.rhtml' %>
-    <%= render '_sidebar_includes.rhtml' %>
-    <%= render '_sidebar_extends.rhtml' %>
-    <%= render '_sidebar_methods.rhtml' %>
-  </div>
-</nav>
-
-<main role="main" aria-labelledby="<%=h klass.aref %>">
-  <h1 id="<%=h klass.aref %>" class="<%= klass.type %>">
-    <%= klass.type %> <%= klass.full_name %>
-  </h1>
-
-  <section class="description">
-    <%= klass.description %>
-  </section>
-
-  <%- klass.each_section do |section, constants, attributes| -%>
-  <section id="<%= section.aref %>" class="documentation-section">
-    <%- if section.title then -%>
-    <header class="documentation-section-title">
-      <h2>
-        <%= section.title %>
-      </h2>
-      <span class="section-click-top">
-        <a href="#top">&uarr; top</a>
-      </span>
-    </header>
-    <%- end -%>
-
-    <%- if section.comment then -%>
-    <div>
-      <%= section.description %>
-    </div>
-    <%- end -%>
-
-    <%- unless constants.empty? then -%>
-    <section class="constants-list">
-      <header>
-        <h3>Constants</h3>
-      </header>
-      <dl>
-      <%- constants.each do |const| -%>
-        <dt id="<%= const.name %>"><%= const.name %>
-        <%- if const.comment then -%>
-        <dd><%= const.description.strip %>
-        <%- else -%>
-        <dd class="missing-docs">(Not documented)
-        <%- end -%>
-      <%- end -%>
-      </dl>
-    </section>
-    <%- end -%>
-
-    <%- unless attributes.empty? then -%>
-    <section class="attribute-method-details" class="method-section">
-      <header>
-        <h3>Attributes</h3>
-      </header>
-
-      <%- attributes.each do |attrib| -%>
-      <div id="<%= attrib.aref %>" class="method-detail">
-        <div class="method-heading attribute-method-heading">
-          <span class="method-name"><%= h attrib.name %></span><span
-            class="attribute-access-type">[<%= attrib.rw %>]</span>
-        </div>
-
-        <div class="method-description">
-        <%- if attrib.comment then -%>
-        <%= attrib.description.strip %>
-        <%- else -%>
-        <p class="missing-docs">(Not documented)
-        <%- end -%>
-        </div>
-      </div>
-      <%- end -%>
-    </section>
-    <%- end -%>
-
-    <%- klass.methods_by_type(section).each do |type, visibilities|
-       next if visibilities.empty?
-       visibilities.each do |visibility, methods|
-         next if methods.empty? %>
-     <section id="<%= visibility %>-<%= type %>-<%= section.aref %>-method-details" class="method-section">
-       <header>
-         <h3><%= visibility.to_s.capitalize %> <%= type.capitalize %> Methods</h3>
-       </header>
-
-    <%- methods.each do |method| -%>
-      <div id="<%= method.aref %>" class="method-detail <%= method.is_alias_for ? "method-alias" : '' %>">
-        <div class="method-header">
-          <%- if (call_seq = method.call_seq) then -%>
-          <%-   call_seq.strip.split("\n").each_with_index do |call_seq, i| -%>
-          <div class="method-heading">
-            <span class="method-callseq">
-              <%= h(call_seq.strip.
-                    gsub( /^\w+\./m, '')).
-                    gsub(/(.*)[-=]&gt;/, '\1&rarr;') %>
-            </span>
-            <%- if i == 0 and method.token_stream then -%>
-            <span class="method-click-advice">click to toggle source</span>
-            <%- end -%>
-          </div>
-          <%-   end -%>
-          <%- elsif method.has_call_seq? then -%>
-          <div class="method-heading">
-            <span class="method-name"><%= h method.name %></span>
-          </div>
-          <%- else -%>
-          <div class="method-heading">
-            <span class="method-name"><%= h method.name %></span><span
-              class="method-args"><%= h method.param_seq %></span>
-            <%- if method.token_stream then -%>
-            <span class="method-click-advice">click to toggle source</span>
-            <%- end -%>
-          </div>
-          <%- end -%>
-        </div>
-
-        <%- unless method.skip_description? then -%>
-        <div class="method-description">
-          <%- if method.comment then -%>
-          <%= method.description.strip %>
-          <%- else -%>
-          <p class="missing-docs">(Not documented)
-          <%- end -%>
-          <%- if method.calls_super then -%>
-            <div class="method-calls-super">
-              Calls superclass method
-              <%=
-                  method.superclass_method ?
-                  method.formatter.link(method.superclass_method.full_name, method.superclass_method.full_name) : nil
-              %>
-            </div>
-          <%- end -%>
-
-          <%- if method.token_stream then -%>
-          <div class="method-source-code" id="<%= method.html_name %>-source">
-            <pre><%= method.markup_code %></pre>
-          </div>
-          <%- end -%>
-        </div>
-        <%- end -%>
-
-        <%- unless method.aliases.empty? then -%>
-        <div class="aliases">
-          Also aliased as: <%= method.aliases.map do |aka|
-            if aka.parent then # HACK lib/rexml/encodings
-              %{<a href="#{klass.aref_to aka.path}">#{h aka.name}</a>}
-            else
-              h aka.name
-            end
-          end.join ", " %>
-        </div>
-        <%- end -%>
-
-        <%- if method.is_alias_for then -%>
-        <div class="aliases">
-          Alias for: <a href="<%= klass.aref_to method.is_alias_for.path %>"><%= h method.is_alias_for.name %></a>
-        </div>
-        <%- end -%>
-      </div>
-
-    <%- end -%>
-    </section>
-  <%- end
-     end %>
-  </section>
-<%- end -%>
-</main>
diff --git a/lib/rdoc/generator/template/darkfish/css/fonts.css b/lib/rdoc/generator/template/darkfish/css/fonts.css
deleted file mode 100644
index 57302b51837117..00000000000000
--- a/lib/rdoc/generator/template/darkfish/css/fonts.css
+++ /dev/null
@@ -1,167 +0,0 @@
-/*
- * Copyright 2010, 2012 Adobe Systems Incorporated (http://www.adobe.com/),
- * with Reserved Font Name "Source". All Rights Reserved. Source is a
- * trademark of Adobe Systems Incorporated in the United States and/or other
- * countries.
- *
- * This Font Software is licensed under the SIL Open Font License, Version
- * 1.1.
- *
- * This license is copied below, and is also available with a FAQ at:
- * http://scripts.sil.org/OFL
- */
-
-@font-face {
-  font-family: "Source Code Pro";
-  font-style: normal;
-  font-weight: 400;
-  src: local("Source Code Pro"),
-       local("SourceCodePro-Regular"),
-       url("../fonts/SourceCodePro-Regular.ttf") format("truetype");
-}
-
-@font-face {
-  font-family: "Source Code Pro";
-  font-style: normal;
-  font-weight: 700;
-  src: local("Source Code Pro Bold"),
-       local("SourceCodePro-Bold"),
-       url("../fonts/SourceCodePro-Bold.ttf") format("truetype");
-}
-
-/*
- * Copyright (c) 2010, Łukasz Dziedzic (dziedzic@typoland.com),
- * with Reserved Font Name Lato.
- *
- * This Font Software is licensed under the SIL Open Font License, Version
- * 1.1.
- *
- * This license is copied below, and is also available with a FAQ at:
- * http://scripts.sil.org/OFL
- */
-
-@font-face {
-  font-family: "Lato";
-  font-style: normal;
-  font-weight: 300;
-  src: local("Lato Light"),
-       local("Lato-Light"),
-       url("../fonts/Lato-Light.ttf") format("truetype");
-}
-
-@font-face {
-  font-family: "Lato";
-  font-style: italic;
-  font-weight: 300;
-  src: local("Lato Light Italic"),
-       local("Lato-LightItalic"),
-       url("../fonts/Lato-LightItalic.ttf") format("truetype");
-}
-
-@font-face {
-  font-family: "Lato";
-  font-style: normal;
-  font-weight: 700;
-  src: local("Lato Regular"),
-       local("Lato-Regular"),
-       url("../fonts/Lato-Regular.ttf") format("truetype");
-}
-
-@font-face {
-  font-family: "Lato";
-  font-style: italic;
-  font-weight: 700;
-  src: local("Lato Italic"),
-       local("Lato-Italic"),
-       url("../fonts/Lato-RegularItalic.ttf") format("truetype");
-}
-
-/*
- * -----------------------------------------------------------
- * SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
- * -----------------------------------------------------------
- *
- * PREAMBLE
- * The goals of the Open Font License (OFL) are to stimulate worldwide
- * development of collaborative font projects, to support the font creation
- * efforts of academic and linguistic communities, and to provide a free and
- * open framework in which fonts may be shared and improved in partnership
- * with others.
- *
- * The OFL allows the licensed fonts to be used, studied, modified and
- * redistributed freely as long as they are not sold by themselves. The
- * fonts, including any derivative works, can be bundled, embedded,
- * redistributed and/or sold with any software provided that any reserved
- * names are not used by derivative works. The fonts and derivatives,
- * however, cannot be released under any other type of license. The
- * requirement for fonts to remain under this license does not apply
- * to any document created using the fonts or their derivatives.
- *
- * DEFINITIONS
- * "Font Software" refers to the set of files released by the Copyright
- * Holder(s) under this license and clearly marked as such. This may
- * include source files, build scripts and documentation.
- *
- * "Reserved Font Name" refers to any names specified as such after the
- * copyright statement(s).
- *
- * "Original Version" refers to the collection of Font Software components as
- * distributed by the Copyright Holder(s).
- *
- * "Modified Version" refers to any derivative made by adding to, deleting,
- * or substituting -- in part or in whole -- any of the components of the
- * Original Version, by changing formats or by porting the Font Software to a
- * new environment.
- *
- * "Author" refers to any designer, engineer, programmer, technical
- * writer or other person who contributed to the Font Software.
- *
- * PERMISSION & CONDITIONS
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of the Font Software, to use, study, copy, merge, embed, modify,
- * redistribute, and sell modified and unmodified copies of the Font
- * Software, subject to the following conditions:
- *
- * 1) Neither the Font Software nor any of its individual components,
- * in Original or Modified Versions, may be sold by itself.
- *
- * 2) Original or Modified Versions of the Font Software may be bundled,
- * redistributed and/or sold with any software, provided that each copy
- * contains the above copyright notice and this license. These can be
- * included either as stand-alone text files, human-readable headers or
- * in the appropriate machine-readable metadata fields within text or
- * binary files as long as those fields can be easily viewed by the user.
- *
- * 3) No Modified Version of the Font Software may use the Reserved Font
- * Name(s) unless explicit written permission is granted by the corresponding
- * Copyright Holder. This restriction only applies to the primary font name as
- * presented to the users.
- *
- * 4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
- * Software shall not be used to promote, endorse or advertise any
- * Modified Version, except to acknowledge the contribution(s) of the
- * Copyright Holder(s) and the Author(s) or with their explicit written
- * permission.
- *
- * 5) The Font Software, modified or unmodified, in part or in whole,
- * must be distributed entirely under this license, and must not be
- * distributed under any other license. The requirement for fonts to
- * remain under this license does not apply to any document created
- * using the Font Software.
- *
- * TERMINATION
- * This license becomes null and void if any of the above conditions are
- * not met.
- *
- * DISCLAIMER
- * THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
- * OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
- * COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
- * DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
- * OTHER DEALINGS IN THE FONT SOFTWARE.
- */
-
diff --git a/lib/rdoc/generator/template/darkfish/css/rdoc.css b/lib/rdoc/generator/template/darkfish/css/rdoc.css
deleted file mode 100644
index f845d6cecba0bd..00000000000000
--- a/lib/rdoc/generator/template/darkfish/css/rdoc.css
+++ /dev/null
@@ -1,676 +0,0 @@
-/*
- * "Darkfish" Rdoc CSS
- * $Id: rdoc.css 54 2009-01-27 01:09:48Z deveiant $
- *
- * Author: Michael Granger <ged@FaerieMUD.org>
- *
- */
-
-/* vim: ft=css et sw=2 ts=2 sts=2 */
-/* Base Green is: #6C8C22 */
-
-.hide { display: none !important; }
-
-* { padding: 0; margin: 0; }
-
-body {
-  background: #fafafa;
-  font-family: Lato, sans-serif;
-  font-weight: 300;
-
-  /* Layout */
-  display: grid;
-  grid-template-columns: auto 1fr;
-}
-
-body > :last-child {
-  grid-column: 1 / 3;
-}
-
-h1 span,
-h2 span,
-h3 span,
-h4 span,
-h5 span,
-h6 span {
-  position: relative;
-
-  display: none;
-  padding-left: 1em;
-  line-height: 0;
-  vertical-align: baseline;
-  font-size: 10px;
-}
-
-h1 span { top: -1.3em; }
-h2 span { top: -1.2em; }
-h3 span { top: -1.0em; }
-h4 span { top: -0.8em; }
-h5 span { top: -0.5em; }
-h6 span { top: -0.5em; }
-
-h1:hover span,
-h2:hover span,
-h3:hover span,
-h4:hover span,
-h5:hover span,
-h6:hover span {
-  display: inline;
-}
-
-h1:target,
-h2:target,
-h3:target,
-h4:target,
-h5:target,
-h6:target {
-  margin-left: -10px;
-  border-left: 10px solid #f1edba;
-}
-
-:link,
-:visited {
-  color: #6C8C22;
-  text-decoration: none;
-}
-
-:link:hover,
-:visited:hover {
-  border-bottom: 1px dotted #6C8C22;
-}
-
-code,
-pre {
-  font-family: "Source Code Pro", Monaco, monospace;
-  background-color: rgba(27,31,35,0.05);
-  padding: 0em 0.2em;
-  border-radius: 0.2em;
-}
-
-table {
-  margin: 0;
-  border-spacing: 0;
-  border-collapse: collapse;
-}
-
-table tr th, table tr td {
-  padding: 0.2em 0.4em;
-  border: 1px solid #ccc;
-}
-
-table tr th {
-  background-color: #eceaed;
-}
-
-table tr:nth-child(even) td {
-  background-color: #f5f4f6;
-}
-
-/* @group Generic Classes */
-
-.initially-hidden {
-  display: none;
-}
-
-#search-field {
-  width: 98%;
-  background: white;
-  border: none;
-  height: 1.5em;
-  -webkit-border-radius: 4px;
-  -moz-border-radius: 4px;
-  border-radius: 4px;
-  text-align: left;
-}
-#search-field:focus {
-  background: #f1edba;
-}
-#search-field:-moz-placeholder,
-#search-field::-webkit-input-placeholder {
-  font-weight: bold;
-  color: #666;
-}
-
-.missing-docs {
-  font-size: 120%;
-  background: white url(../images/wrench_orange.png) no-repeat 4px center;
-  color: #ccc;
-  line-height: 2em;
-  border: 1px solid #d00;
-  opacity: 1;
-  padding-left: 20px;
-  text-indent: 24px;
-  letter-spacing: 3px;
-  font-weight: bold;
-  -webkit-border-radius: 5px;
-  -moz-border-radius: 5px;
-}
-
-.target-section {
-  border: 2px solid #dcce90;
-  border-left-width: 8px;
-  padding: 0 1em;
-  background: #fff3c2;
-}
-
-/* @end */
-
-/* @group Index Page, Standalone file pages */
-.table-of-contents ul {
-  margin: 1em;
-  list-style: none;
-}
-
-.table-of-contents ul ul {
-  margin-top: 0.25em;
-}
-
-.table-of-contents ul :link,
-.table-of-contents ul :visited {
-  font-size: 16px;
-}
-
-.table-of-contents li {
-  margin-bottom: 0.25em;
-}
-
-.table-of-contents li .toc-toggle {
-  width: 16px;
-  height: 16px;
-  background: url(../images/add.png) no-repeat;
-}
-
-.table-of-contents li .toc-toggle.open {
-  background: url(../images/delete.png) no-repeat;
-}
-
-/* @end */
-
-/* @group Top-Level Structure */
-
-nav {
-  font-family: Helvetica, sans-serif;
-  font-size: 14px;
-  border-right: 1px solid #ccc;
-  position: sticky;
-  top: 0;
-  overflow: auto;
-
-  /* Layout */
-  width: 260px; /* fallback */
-  width: max(50px, 20vw);
-  min-width: 50px;
-  max-width: 80vw;
-  height: calc(100vh - 100px); /* reduce the footer height */
-  resize: horizontal;
-}
-
-main {
-  display: block;
-  margin: 1em;
-  min-width: 340px;
-  font-size: 16px;
-}
-
-main h1,
-main h2,
-main h3,
-main h4,
-main h5,
-main h6 {
-  font-family: Helvetica, sans-serif;
-}
-
-.table-of-contents main {
-  margin-left: 2em;
-}
-
-#validator-badges {
-  margin: 1em 1em 2em;
-  font-size: smaller;
-}
-
-/* @end */
-
-/* @group navigation */
-nav {
-  margin-bottom: 1em;
-}
-
-nav .nav-section {
-  margin-top: 2em;
-  border-top: 2px solid #aaa;
-  font-size: 90%;
-  overflow: hidden;
-}
-
-nav h2 {
-  margin: 0;
-  padding: 2px 8px 2px 8px;
-  background-color: #e8e8e8;
-  color: #555;
-  font-size: 125%;
-  text-align: center;
-}
-
-nav h3,
-#table-of-contents-navigation {
-  margin: 0;
-  padding: 2px 8px 2px 8px;
-  text-align: right;
-  background-color: #e8e8e8;
-  color: #555;
-}
-
-nav ul,
-nav dl,
-nav p {
-  padding: 4px 8px 0;
-  list-style: none;
-}
-
-#project-navigation .nav-section {
-  margin: 0;
-  border-top: 0;
-}
-
-#home-section h2 {
-  text-align: center;
-}
-
-#table-of-contents-navigation {
-  font-size: 1.2em;
-  font-weight: bold;
-  text-align: center;
-}
-
-#search-section {
-  margin-top: 0;
-  border-top: 0;
-}
-
-#search-field-wrapper {
-  border-top: 1px solid #aaa;
-  border-bottom: 1px solid #aaa;
-  padding: 3px 8px;
-  background-color: #e8e8e8;
-  color: #555;
-}
-
-ul.link-list li {
-  white-space: nowrap;
-  line-height: 1.4em;
-}
-
-ul.link-list .type {
-  font-size: 8px;
-  text-transform: uppercase;
-  color: white;
-  background: #969696;
-  padding: 2px 4px;
-  -webkit-border-radius: 5px;
-}
-
-dl.note-list dt {
-  float: left;
-  margin-right: 1em;
-}
-
-.calls-super {
-  background: url(../images/arrow_up.png) no-repeat right center;
-}
-
-.nav-section details > summary {
-  display: block;
-}
-
-.nav-section details > summary::-webkit-details-marker {
-  display: none;
-}
-
-.nav-section details > summary::before {
-  content: "";
-}
-
-.nav-section details > summary::after {
-  content: "\25B6"; /* BLACK RIGHT-POINTING TRIANGLE */
-  font-size: 0.8em;
-  margin-left: 0.4em;
-}
-
-.nav-section details[open] > summary::after {
-  content: "\25BD"; /* WHITE DOWN-POINTING TRIANGLE */
-}
-
-/* @end */
-
-/* @group Documentation Section */
-main {
-  color: #333;
-}
-
-main > h1:first-child,
-main > h2:first-child,
-main > h3:first-child,
-main > h4:first-child,
-main > h5:first-child,
-main > h6:first-child {
-  margin-top: 0px;
-}
-
-main sup {
-  vertical-align: super;
-  font-size: 0.8em;
-}
-
-/* The heading with the class name */
-main h1[class] {
-  margin-top: 0;
-  margin-bottom: 1em;
-  font-size: 2em;
-  color: #6C8C22;
-}
-
-main h1 {
-  margin: 2em 0 0.5em;
-  font-size: 1.7em;
-}
-
-main h2 {
-  margin: 2em 0 0.5em;
-  font-size: 1.5em;
-}
-
-main h3 {
-  margin: 2em 0 0.5em;
-  font-size: 1.2em;
-}
-
-main h4 {
-  margin: 2em 0 0.5em;
-  font-size: 1.1em;
-}
-
-main h5 {
-  margin: 2em 0 0.5em;
-  font-size: 1em;
-}
-
-main h6 {
-  margin: 2em 0 0.5em;
-  font-size: 1em;
-}
-
-main p {
-  margin: 0 0 0.5em;
-  line-height: 1.4em;
-}
-
-main pre {
-  margin: 1.2em 0.5em;
-  padding: 1em;
-  font-size: 0.8em;
-}
-
-main hr {
-  margin: 1.5em 1em;
-  border: 2px solid #ddd;
-}
-
-main blockquote {
-  margin: 0 2em 1.2em 1.2em;
-  padding-left: 0.5em;
-  border-left: 2px solid #ddd;
-}
-
-main ol,
-main ul {
-  margin: 1em 2em;
-}
-
-main li > p {
-  margin-bottom: 0.5em;
-}
-
-main dl {
-  margin: 1em 0.5em;
-}
-
-main dt {
-  margin-bottom: 0.5em;
-  font-weight: bold;
-}
-
-main dd {
-  margin: 0 1em 1em 0.5em;
-}
-
-main header h2 {
-  margin-top: 2em;
-  border-width: 0;
-  border-top: 4px solid #bbb;
-  font-size: 130%;
-}
-
-main header h3 {
-  margin: 2em 0 1.5em;
-  border-width: 0;
-  border-top: 3px solid #bbb;
-  font-size: 120%;
-}
-
-.documentation-section-title {
-  position: relative;
-}
-.documentation-section-title .section-click-top {
-  position: absolute;
-  top: 6px;
-  left: 12px;
-  font-size: 10px;
-  color: #9b9877;
-  visibility: hidden;
-  padding-left: 0.5px;
-}
-
-.documentation-section-title:hover .section-click-top {
-  visibility: visible;
-}
-
-.constants-list > dl {
-  margin: 1em 0 2em;
-  border: 0;
-}
-
-.constants-list > dl dt {
-  margin-bottom: 0.75em;
-  padding-left: 0;
-  font-family: "Source Code Pro", Monaco, monospace;
-  font-size: 110%;
-}
-
-.constants-list > dl dt a {
-  color: inherit;
-}
-
-.constants-list > dl dd {
-  margin: 0 0 2em 0;
-  padding: 0;
-  color: #666;
-}
-
-.documentation-section h2 {
-  position: relative;
-}
-
-.documentation-section h2 a {
-  position: absolute;
-  top: 8px;
-  right: 10px;
-  font-size: 12px;
-  color: #9b9877;
-  visibility: hidden;
-}
-
-.documentation-section h2:hover a {
-  visibility: visible;
-}
-
-/* @group Method Details */
-
-main .method-source-code {
-  max-height: 0;
-  overflow: auto;
-  transition-duration: 200ms;
-  transition-delay: 0ms;
-  transition-property: all;
-  transition-timing-function: ease-in-out;
-}
-
-main .method-source-code.active-menu {
-  max-height: 100vh;
-}
-
-main .method-description .method-calls-super {
-  color: #333;
-  font-weight: bold;
-}
-
-main .method-detail {
-  margin-bottom: 2.5em;
-  cursor: pointer;
-}
-
-main .method-detail:target {
-  margin-left: -10px;
-  border-left: 10px solid #f1edba;
-}
-
-main .method-heading {
-  position: relative;
-  font-family: "Source Code Pro", Monaco, monospace;
-  font-size: 110%;
-  font-weight: bold;
-  color: #333;
-}
-main .method-heading :link,
-main .method-heading :visited {
-  color: inherit;
-}
-main .method-click-advice {
-  position: absolute;
-  top: 2px;
-  right: 5px;
-  font-size: 12px;
-  color: #9b9877;
-  visibility: hidden;
-  padding-right: 20px;
-  line-height: 20px;
-  background: url(../images/zoom.png) no-repeat right top;
-}
-main .method-header:hover .method-click-advice {
-  visibility: visible;
-}
-
-main .method-alias .method-heading {
-  color: #666;
-}
-
-main .method-description,
-main .aliases {
-  margin-top: 0.75em;
-  color: #333;
-}
-
-main .aliases {
-  padding-top: 4px;
-  font-style: italic;
-  cursor: default;
-}
-main .method-description ul {
-  margin-left: 1.5em;
-}
-
-main #attribute-method-details .method-detail:hover {
-  background-color: transparent;
-  cursor: default;
-}
-main .attribute-access-type {
-  text-transform: uppercase;
-  padding: 0 1em;
-}
-/* @end */
-
-/* @end */
-
-/* @group Source Code */
-
-pre {
-  margin: 0.5em 0;
-  border: 1px dashed #999;
-  padding: 0.5em;
-  background: #262626;
-  color: white;
-  overflow: auto;
-}
-
-.ruby-constant   { color: #7fffd4; background: transparent; }
-.ruby-keyword    { color: #00ffff; background: transparent; }
-.ruby-ivar       { color: #eedd82; background: transparent; }
-.ruby-operator   { color: #00ffee; background: transparent; }
-.ruby-identifier { color: #ffdead; background: transparent; }
-.ruby-node       { color: #ffa07a; background: transparent; }
-.ruby-comment    { color: #dc0000; background: transparent; }
-.ruby-regexp     { color: #ffa07a; background: transparent; }
-.ruby-value      { color: #7fffd4; background: transparent; }
-
-/* @end */
-
-
-/* @group search results */
-#search-results {
-  font-family: Lato, sans-serif;
-  font-weight: 300;
-}
-
-#search-results .search-match {
-  font-family: Helvetica, sans-serif;
-  font-weight: normal;
-}
-
-#search-results .search-selected {
-  background: #e8e8e8;
-  border-bottom: 1px solid transparent;
-}
-
-#search-results li {
-  list-style: none;
-  border-bottom: 1px solid #aaa;
-  margin-bottom: 0.5em;
-}
-
-#search-results li:last-child {
-  border-bottom: none;
-  margin-bottom: 0;
-}
-
-#search-results li p {
-  padding: 0;
-  margin: 0.5em;
-}
-
-#search-results .search-namespace {
-  font-weight: bold;
-}
-
-#search-results li em {
-  background: yellow;
-  font-style: normal;
-}
-
-#search-results pre {
-  margin: 0.5em;
-  font-family: "Source Code Pro", Monaco, monospace;
-}
-
-/* @end */
-
diff --git a/lib/rdoc/generator/template/darkfish/fonts/Lato-Light.ttf b/lib/rdoc/generator/template/darkfish/fonts/Lato-Light.ttf
deleted file mode 100644
index b49dd43729d456..00000000000000
Binary files a/lib/rdoc/generator/template/darkfish/fonts/Lato-Light.ttf and /dev/null differ
diff --git a/lib/rdoc/generator/template/darkfish/fonts/Lato-LightItalic.ttf b/lib/rdoc/generator/template/darkfish/fonts/Lato-LightItalic.ttf
deleted file mode 100644
index 7959fef0756e90..00000000000000
Binary files a/lib/rdoc/generator/template/darkfish/fonts/Lato-LightItalic.ttf and /dev/null differ
diff --git a/lib/rdoc/generator/template/darkfish/fonts/Lato-Regular.ttf b/lib/rdoc/generator/template/darkfish/fonts/Lato-Regular.ttf
deleted file mode 100644
index 839cd589dc5eba..00000000000000
Binary files a/lib/rdoc/generator/template/darkfish/fonts/Lato-Regular.ttf and /dev/null differ
diff --git a/lib/rdoc/generator/template/darkfish/fonts/Lato-RegularItalic.ttf b/lib/rdoc/generator/template/darkfish/fonts/Lato-RegularItalic.ttf
deleted file mode 100644
index bababa09e3fad2..00000000000000
Binary files a/lib/rdoc/generator/template/darkfish/fonts/Lato-RegularItalic.ttf and /dev/null differ
diff --git a/lib/rdoc/generator/template/darkfish/fonts/SourceCodePro-Bold.ttf b/lib/rdoc/generator/template/darkfish/fonts/SourceCodePro-Bold.ttf
deleted file mode 100644
index dd00982d4952a7..00000000000000
Binary files a/lib/rdoc/generator/template/darkfish/fonts/SourceCodePro-Bold.ttf and /dev/null differ
diff --git a/lib/rdoc/generator/template/darkfish/fonts/SourceCodePro-Regular.ttf b/lib/rdoc/generator/template/darkfish/fonts/SourceCodePro-Regular.ttf
deleted file mode 100644
index 1decfb95af634f..00000000000000
Binary files a/lib/rdoc/generator/template/darkfish/fonts/SourceCodePro-Regular.ttf and /dev/null differ
diff --git a/lib/rdoc/generator/template/darkfish/images/add.png b/lib/rdoc/generator/template/darkfish/images/add.png
deleted file mode 100644
index 6332fefea4be19..00000000000000
Binary files a/lib/rdoc/generator/template/darkfish/images/add.png and /dev/null differ
diff --git a/lib/rdoc/generator/template/darkfish/images/arrow_up.png b/lib/rdoc/generator/template/darkfish/images/arrow_up.png
deleted file mode 100644
index 1ebb193243780b..00000000000000
Binary files a/lib/rdoc/generator/template/darkfish/images/arrow_up.png and /dev/null differ
diff --git a/lib/rdoc/generator/template/darkfish/images/brick.png b/lib/rdoc/generator/template/darkfish/images/brick.png
deleted file mode 100644
index 7851cf34c946e5..00000000000000
Binary files a/lib/rdoc/generator/template/darkfish/images/brick.png and /dev/null differ
diff --git a/lib/rdoc/generator/template/darkfish/images/brick_link.png b/lib/rdoc/generator/template/darkfish/images/brick_link.png
deleted file mode 100644
index 9ebf013a23a566..00000000000000
Binary files a/lib/rdoc/generator/template/darkfish/images/brick_link.png and /dev/null differ
diff --git a/lib/rdoc/generator/template/darkfish/images/bug.png b/lib/rdoc/generator/template/darkfish/images/bug.png
deleted file mode 100644
index 2d5fb90ec6ee08..00000000000000
Binary files a/lib/rdoc/generator/template/darkfish/images/bug.png and /dev/null differ
diff --git a/lib/rdoc/generator/template/darkfish/images/bullet_black.png b/lib/rdoc/generator/template/darkfish/images/bullet_black.png
deleted file mode 100644
index 57619706d10d97..00000000000000
Binary files a/lib/rdoc/generator/template/darkfish/images/bullet_black.png and /dev/null differ
diff --git a/lib/rdoc/generator/template/darkfish/images/bullet_toggle_minus.png b/lib/rdoc/generator/template/darkfish/images/bullet_toggle_minus.png
deleted file mode 100644
index b47ce55f685dac..00000000000000
Binary files a/lib/rdoc/generator/template/darkfish/images/bullet_toggle_minus.png and /dev/null differ
diff --git a/lib/rdoc/generator/template/darkfish/images/bullet_toggle_plus.png b/lib/rdoc/generator/template/darkfish/images/bullet_toggle_plus.png
deleted file mode 100644
index 9ab4a89664eee1..00000000000000
Binary files a/lib/rdoc/generator/template/darkfish/images/bullet_toggle_plus.png and /dev/null differ
diff --git a/lib/rdoc/generator/template/darkfish/images/date.png b/lib/rdoc/generator/template/darkfish/images/date.png
deleted file mode 100644
index 783c83357fdf90..00000000000000
Binary files a/lib/rdoc/generator/template/darkfish/images/date.png and /dev/null differ
diff --git a/lib/rdoc/generator/template/darkfish/images/delete.png b/lib/rdoc/generator/template/darkfish/images/delete.png
deleted file mode 100644
index 08f249365afd29..00000000000000
Binary files a/lib/rdoc/generator/template/darkfish/images/delete.png and /dev/null differ
diff --git a/lib/rdoc/generator/template/darkfish/images/find.png b/lib/rdoc/generator/template/darkfish/images/find.png
deleted file mode 100644
index 1547479646722b..00000000000000
Binary files a/lib/rdoc/generator/template/darkfish/images/find.png and /dev/null differ
diff --git a/lib/rdoc/generator/template/darkfish/images/loadingAnimation.gif b/lib/rdoc/generator/template/darkfish/images/loadingAnimation.gif
deleted file mode 100644
index 82290f48334c81..00000000000000
Binary files a/lib/rdoc/generator/template/darkfish/images/loadingAnimation.gif and /dev/null differ
diff --git a/lib/rdoc/generator/template/darkfish/images/macFFBgHack.png b/lib/rdoc/generator/template/darkfish/images/macFFBgHack.png
deleted file mode 100644
index c6473b324ee1da..00000000000000
Binary files a/lib/rdoc/generator/template/darkfish/images/macFFBgHack.png and /dev/null differ
diff --git a/lib/rdoc/generator/template/darkfish/images/package.png b/lib/rdoc/generator/template/darkfish/images/package.png
deleted file mode 100644
index da3c2a2d74bab1..00000000000000
Binary files a/lib/rdoc/generator/template/darkfish/images/package.png and /dev/null differ
diff --git a/lib/rdoc/generator/template/darkfish/images/page_green.png b/lib/rdoc/generator/template/darkfish/images/page_green.png
deleted file mode 100644
index de8e003f9fb875..00000000000000
Binary files a/lib/rdoc/generator/template/darkfish/images/page_green.png and /dev/null differ
diff --git a/lib/rdoc/generator/template/darkfish/images/page_white_text.png b/lib/rdoc/generator/template/darkfish/images/page_white_text.png
deleted file mode 100644
index 813f712f726c93..00000000000000
Binary files a/lib/rdoc/generator/template/darkfish/images/page_white_text.png and /dev/null differ
diff --git a/lib/rdoc/generator/template/darkfish/images/page_white_width.png b/lib/rdoc/generator/template/darkfish/images/page_white_width.png
deleted file mode 100644
index 1eb880947ddf3e..00000000000000
Binary files a/lib/rdoc/generator/template/darkfish/images/page_white_width.png and /dev/null differ
diff --git a/lib/rdoc/generator/template/darkfish/images/plugin.png b/lib/rdoc/generator/template/darkfish/images/plugin.png
deleted file mode 100644
index 6187b15aec001b..00000000000000
Binary files a/lib/rdoc/generator/template/darkfish/images/plugin.png and /dev/null differ
diff --git a/lib/rdoc/generator/template/darkfish/images/ruby.png b/lib/rdoc/generator/template/darkfish/images/ruby.png
deleted file mode 100644
index f763a168807514..00000000000000
Binary files a/lib/rdoc/generator/template/darkfish/images/ruby.png and /dev/null differ
diff --git a/lib/rdoc/generator/template/darkfish/images/tag_blue.png b/lib/rdoc/generator/template/darkfish/images/tag_blue.png
deleted file mode 100644
index 3f02b5f8f8bf7c..00000000000000
Binary files a/lib/rdoc/generator/template/darkfish/images/tag_blue.png and /dev/null differ
diff --git a/lib/rdoc/generator/template/darkfish/images/tag_green.png b/lib/rdoc/generator/template/darkfish/images/tag_green.png
deleted file mode 100644
index 83ec984bd73364..00000000000000
Binary files a/lib/rdoc/generator/template/darkfish/images/tag_green.png and /dev/null differ
diff --git a/lib/rdoc/generator/template/darkfish/images/transparent.png b/lib/rdoc/generator/template/darkfish/images/transparent.png
deleted file mode 100644
index d665e179efd797..00000000000000
Binary files a/lib/rdoc/generator/template/darkfish/images/transparent.png and /dev/null differ
diff --git a/lib/rdoc/generator/template/darkfish/images/wrench.png b/lib/rdoc/generator/template/darkfish/images/wrench.png
deleted file mode 100644
index 5c8213fef5ab96..00000000000000
Binary files a/lib/rdoc/generator/template/darkfish/images/wrench.png and /dev/null differ
diff --git a/lib/rdoc/generator/template/darkfish/images/wrench_orange.png b/lib/rdoc/generator/template/darkfish/images/wrench_orange.png
deleted file mode 100644
index 565a9330e0a156..00000000000000
Binary files a/lib/rdoc/generator/template/darkfish/images/wrench_orange.png and /dev/null differ
diff --git a/lib/rdoc/generator/template/darkfish/images/zoom.png b/lib/rdoc/generator/template/darkfish/images/zoom.png
deleted file mode 100644
index 908612e394525f..00000000000000
Binary files a/lib/rdoc/generator/template/darkfish/images/zoom.png and /dev/null differ
diff --git a/lib/rdoc/generator/template/darkfish/index.rhtml b/lib/rdoc/generator/template/darkfish/index.rhtml
deleted file mode 100644
index 423e225b683e8b..00000000000000
--- a/lib/rdoc/generator/template/darkfish/index.rhtml
+++ /dev/null
@@ -1,22 +0,0 @@
-<body id="top" role="document" class="file">
-<nav role="navigation">
-  <div id="project-navigation">
-    <%= render '_sidebar_navigation.rhtml' %>
-
-    <%= render '_sidebar_search.rhtml' %>
-  </div>
-
-  <div id="project-metadata">
-    <%= render '_sidebar_pages.rhtml' %>
-    <%= render '_sidebar_classes.rhtml' %>
-  </div>
-</nav>
-
-<main role="main">
-<%- if @options.main_page and
-      main_page = @files.find { |f| f.full_name == @options.main_page } then %>
-<%= main_page.description %>
-<%- else -%>
-<p>This is the API documentation for <%= h @title %>.
-<%- end -%>
-</main>
diff --git a/lib/rdoc/generator/template/darkfish/js/darkfish.js b/lib/rdoc/generator/template/darkfish/js/darkfish.js
deleted file mode 100644
index 19a85c54e17701..00000000000000
--- a/lib/rdoc/generator/template/darkfish/js/darkfish.js
+++ /dev/null
@@ -1,97 +0,0 @@
-/**
- *
- * Darkfish Page Functions
- * $Id: darkfish.js 53 2009-01-07 02:52:03Z deveiant $
- *
- * Author: Michael Granger <mgranger@laika.com>
- *
- */
-
-/* Provide console simulation for firebug-less environments */
-/*
-if (!("console" in window) || !("firebug" in console)) {
-  var names = ["log", "debug", "info", "warn", "error", "assert", "dir", "dirxml",
-    "group", "groupEnd", "time", "timeEnd", "count", "trace", "profile", "profileEnd"];
-
-  window.console = {};
-  for (var i = 0; i < names.length; ++i)
-    window.console[names[i]] = function() {};
-};
-*/
-
-
-function showSource( e ) {
-  var target = e.target;
-  while (!target.classList.contains('method-detail')) {
-    target = target.parentNode;
-  }
-  if (typeof target !== "undefined" && target !== null) {
-    target = target.querySelector('.method-source-code');
-  }
-  if (typeof target !== "undefined" && target !== null) {
-    target.classList.toggle('active-menu')
-  }
-};
-
-function hookSourceViews() {
-  document.querySelectorAll('.method-heading').forEach(function (codeObject) {
-    codeObject.addEventListener('click', showSource);
-  });
-};
-
-function hookSearch() {
-  var input  = document.querySelector('#search-field');
-  var result = document.querySelector('#search-results');
-  result.classList.remove("initially-hidden");
-
-  var search_section = document.querySelector('#search-section');
-  search_section.classList.remove("initially-hidden");
-
-  var search = new Search(search_data, input, result);
-
-  search.renderItem = function(result) {
-    var li = document.createElement('li');
-    var html = '';
-
-    // TODO add relative path to <script> per-page
-    html += '<p class="search-match"><a href="' + index_rel_prefix + this.escapeHTML(result.path) + '">' + this.hlt(result.title);
-    if (result.params)
-      html += '<span class="params">' + result.params + '</span>';
-    html += '</a>';
-
-
-    if (result.namespace)
-      html += '<p class="search-namespace">' + this.hlt(result.namespace);
-
-    if (result.snippet)
-      html += '<div class="search-snippet">' + result.snippet + '</div>';
-
-    li.innerHTML = html;
-
-    return li;
-  }
-
-  search.select = function(result) {
-    window.location.href = result.firstChild.firstChild.href;
-  }
-
-  search.scrollIntoView = search.scrollInWindow;
-};
-
-function hookFocus() {
-  document.addEventListener("keydown", (event) => {
-    if (document.activeElement.tagName === 'INPUT') {
-      return;
-    }
-    if (event.key === "/") {
-      event.preventDefault();
-      document.querySelector('#search-field').focus();
-    }
-  });
-}
-
-document.addEventListener('DOMContentLoaded', function() {
-  hookSourceViews();
-  hookSearch();
-  hookFocus();
-});
diff --git a/lib/rdoc/generator/template/darkfish/js/search.js b/lib/rdoc/generator/template/darkfish/js/search.js
deleted file mode 100644
index d3cded1d57ba69..00000000000000
--- a/lib/rdoc/generator/template/darkfish/js/search.js
+++ /dev/null
@@ -1,110 +0,0 @@
-Search = function(data, input, result) {
-  this.data = data;
-  this.input = input;
-  this.result = result;
-
-  this.current = null;
-  this.view = this.result.parentNode;
-  this.searcher = new Searcher(data.index);
-  this.init();
-}
-
-Search.prototype = Object.assign({}, Navigation, new function() {
-  var suid = 1;
-
-  this.init = function() {
-    var _this = this;
-    var observer = function(e) {
-      switch(e.key) {
-        case 'ArrowUp':
-        case 'ArrowDown':
-          return;
-      }
-      _this.search(_this.input.value);
-    };
-    this.input.addEventListener('keyup', observer);
-    this.input.addEventListener('click', observer); // mac's clear field
-
-    this.searcher.ready(function(results, isLast) {
-      _this.addResults(results, isLast);
-    })
-
-    this.initNavigation();
-    this.setNavigationActive(false);
-  }
-
-  this.search = function(value, selectFirstMatch) {
-    value = value.trim().toLowerCase();
-    if (value) {
-      this.setNavigationActive(true);
-    } else {
-      this.setNavigationActive(false);
-    }
-
-    if (value == '') {
-      this.lastQuery = value;
-      this.result.innerHTML = '';
-      this.result.setAttribute('aria-expanded', 'false');
-      this.setNavigationActive(false);
-    } else if (value != this.lastQuery) {
-      this.lastQuery = value;
-      this.result.setAttribute('aria-busy',     'true');
-      this.result.setAttribute('aria-expanded', 'true');
-      this.firstRun = true;
-      this.searcher.find(value);
-    }
-  }
-
-  this.addResults = function(results, isLast) {
-    var target = this.result;
-    if (this.firstRun && (results.length > 0 || isLast)) {
-      this.current = null;
-      this.result.innerHTML = '';
-    }
-
-    for (var i=0, l = results.length; i < l; i++) {
-      var item = this.renderItem.call(this, results[i]);
-      item.setAttribute('id', 'search-result-' + target.childElementCount);
-      target.appendChild(item);
-    };
-
-    if (this.firstRun && results.length > 0) {
-      this.firstRun = false;
-      this.current = target.firstChild;
-      this.current.classList.add('search-selected');
-    }
-    //TODO: ECMAScript
-    //if (jQuery.browser.msie) this.$element[0].className += '';
-
-    if (isLast) this.result.setAttribute('aria-busy', 'false');
-  }
-
-  this.move = function(isDown) {
-    if (!this.current) return;
-    var next = isDown ? this.current.nextElementSibling : this.current.previousElementSibling;
-    if (next) {
-      this.current.classList.remove('search-selected');
-      next.classList.add('search-selected');
-      this.input.setAttribute('aria-activedescendant', next.getAttribute('id'));
-      this.scrollIntoView(next, this.view);
-      this.current = next;
-      this.input.value = next.firstChild.firstChild.text;
-      this.input.select();
-    }
-    return true;
-  }
-
-  this.hlt = function(html) {
-    return this.escapeHTML(html).
-      replace(/\u0001/g, '<em>').
-      replace(/\u0002/g, '</em>');
-  }
-
-  this.escapeHTML = function(html) {
-    return html.replace(/[&<>"`']/g, function(c) {
-      return '&#' + c.charCodeAt(0) + ';';
-    });
-  }
-
-});
-
diff --git a/lib/rdoc/generator/template/darkfish/page.rhtml b/lib/rdoc/generator/template/darkfish/page.rhtml
deleted file mode 100644
index 4a6b006bb3f1ae..00000000000000
--- a/lib/rdoc/generator/template/darkfish/page.rhtml
+++ /dev/null
@@ -1,18 +0,0 @@
-<body id="top" role="document" class="file">
-<nav role="navigation">
-  <div id="project-navigation">
-    <%= render '_sidebar_navigation.rhtml' %>
-    <%= render '_sidebar_search.rhtml' %>
-  </div>
-
-  <%= render '_sidebar_table_of_contents.rhtml' %>
-
-  <div id="project-metadata">
-    <%= render '_sidebar_pages.rhtml' %>
-  </div>
-</nav>
-
-<main role="main" aria-label="Page <%=h file.full_name%>">
-<%= file.description %>
-</main>
-
diff --git a/lib/rdoc/generator/template/darkfish/servlet_not_found.rhtml b/lib/rdoc/generator/template/darkfish/servlet_not_found.rhtml
deleted file mode 100644
index f0841572c348ba..00000000000000
--- a/lib/rdoc/generator/template/darkfish/servlet_not_found.rhtml
+++ /dev/null
@@ -1,18 +0,0 @@
-<body role="document">
-<nav role="navigation">
-  <%= render '_sidebar_navigation.rhtml' %>
-
-  <%= render '_sidebar_search.rhtml' %>
-
-  <div id="project-metadata">
-    <%= render '_sidebar_pages.rhtml' %>
-    <%= render '_sidebar_classes.rhtml' %>
-  </div>
-</nav>
-
-<main role="main">
-  <h1>Not Found</h1>
-
-  <p><%= message %>
-</main>
-
diff --git a/lib/rdoc/generator/template/darkfish/servlet_root.rhtml b/lib/rdoc/generator/template/darkfish/servlet_root.rhtml
deleted file mode 100644
index cab3092b17a5c0..00000000000000
--- a/lib/rdoc/generator/template/darkfish/servlet_root.rhtml
+++ /dev/null
@@ -1,62 +0,0 @@
-<body role="document">
-<nav role="navigation">
-  <div id="project-navigation">
-    <div id="home-section" class="nav-section">
-      <h2>
-        <a href="<%= rel_prefix %>/" rel="home">Home</a>
-      </h2>
-    </div>
-
-    <%= render '_sidebar_search.rhtml' %>
-  </div>
-
-<%= render '_sidebar_installed.rhtml' %>
-</nav>
-
-<main role="main">
-  <h1>Local RDoc Documentation</h1>
-
-  <p>Here you can browse local documentation from the ruby standard library and
-  your installed gems.
-
-<%- extra_dirs = installed.select { |_, _, _, type,| type == :extra } -%>
-<%- unless extra_dirs.empty? -%>
-  <h2>Extra Documentation Directories</h2>
-
-  <p>The following additional documentation directories are available:</p>
-
-  <ol>
-  <%- extra_dirs.each do |name, href, exists, _, path| -%>
-    <li>
-    <%- if exists -%>
-      <a href="<%= href %>"><%= h name %></a> (<%= h path %>)
-    <%- else -%>
-      <%= h name %> (<%= h path %>; <i>not available</i>)
-    <%- end -%>
-    </li>
-  <%- end -%>
-  </ol>
-<%- end -%>
-
-<%- gems = installed.select { |_, _, _, type,| type == :gem } -%>
-<%- missing = gems.reject { |_, _, exists,| exists } -%>
-<%- unless missing.empty? then -%>
-  <h2>Missing Gem Documentation</h2>
-
-  <p>You are missing documentation for some of your installed gems.
-  You can install missing documentation for gems by running
-  <kbd>gem rdoc --all</kbd>.  After installing the missing documentation you
-  only need to reload this page.  The newly created documentation will
-  automatically appear.
-
-  <p>You can also install documentation for a specific gem by running one of
-  the following commands.
-
-  <ul>
-  <%- names = missing.map { |name,| name.sub(/-([^-]*)$/, '') }.uniq -%>
-  <%- names.each do |name| -%>
-    <li><kbd>gem rdoc <%=h name %></kbd>
-  <%- end -%>
-  </ul>
-<%- end -%>
-</main>
diff --git a/lib/rdoc/generator/template/darkfish/table_of_contents.rhtml b/lib/rdoc/generator/template/darkfish/table_of_contents.rhtml
deleted file mode 100644
index 54a376c9e55e05..00000000000000
--- a/lib/rdoc/generator/template/darkfish/table_of_contents.rhtml
+++ /dev/null
@@ -1,59 +0,0 @@
-<body id="top" class="table-of-contents">
-<main role="main">
-<h1 class="class"><%= h @title %></h1>
-
-<%- simple_files = @files.select { |f| f.text? } -%>
-<%- unless simple_files.empty? then -%>
-<h2 id="pages">Pages</h2>
-<ul>
-<%- simple_files.sort.each do |file| -%>
-  <li class="file">
-    <a href="<%= h file.path %>"><%= h file.page_name %></a>
-<%
-   # HACK table_of_contents should not exist on Document
-   table = file.parse(file.comment).table_of_contents
-   unless table.empty? then %>
-    <ul>
-<%- table.each do |heading| -%>
-      <li><a href="<%= h file.path %>#<%= heading.aref %>"><%= heading.plain_html %></a>
-<%-   end -%>
-    </ul>
-<%- end -%>
-  </li>
-  <%- end -%>
-</ul>
-<%- end -%>
-
-<h2 id="classes">Classes and Modules</h2>
-<ul>
-<%- @modsort.each do |klass| -%>
-  <li class="<%= klass.type %>">
-    <a href="<%= klass.path %>"><%= klass.full_name %></a>
-<%- table = []
-   table.concat klass.parse(klass.comment_location).table_of_contents
-   table.concat klass.section_contents
-
-   unless table.empty? then %>
-    <ul>
-<%- table.each do |item| -%>
-<%-   label = item.respond_to?(:label) ? item.label(klass) : item.aref -%>
-      <li><a href="<%= klass.path %>#<%= label %>"><%= item.plain_html %></a>
-<%- end -%>
-    </ul>
-<%- end -%>
-  </li>
-<%- end -%>
-</ul>
-
-<h2 id="methods">Methods</h2>
-<ul>
-<%- @store.all_classes_and_modules.flat_map do |mod|
-     mod.method_list
-   end.sort.each do |method| %>
-  <li class="method">
-    <a href="<%= method.path %>"><%= h method.pretty_name %></a>
-    &mdash;
-    <span class="container"><%= method.parent.full_name %></span>
-<%- end -%>
-</ul>
-</main>
diff --git a/lib/rdoc/generator/template/json_index/.document b/lib/rdoc/generator/template/json_index/.document
deleted file mode 100644
index 1713b67654e39c..00000000000000
--- a/lib/rdoc/generator/template/json_index/.document
+++ /dev/null
@@ -1 +0,0 @@
-# ignore all files in this directory
diff --git a/lib/rdoc/generator/template/json_index/js/navigation.js b/lib/rdoc/generator/template/json_index/js/navigation.js
deleted file mode 100644
index 137e3a0038f0ef..00000000000000
--- a/lib/rdoc/generator/template/json_index/js/navigation.js
+++ /dev/null
@@ -1,105 +0,0 @@
-/*
- * Navigation allows movement using the arrow keys through the search results.
- *
- * When using this library you will need to set scrollIntoView to the
- * appropriate function for your layout.  Use scrollInWindow if the container
- * is not scrollable and scrollInElement if the container is a separate
- * scrolling region.
- */
-Navigation = new function() {
-  this.initNavigation = function() {
-    var _this = this;
-
-    document.addEventListener('keydown', function(e) {
-      _this.onkeydown(e);
-    });
-
-    this.navigationActive = true;
-  }
-
-  this.setNavigationActive = function(state) {
-    this.navigationActive = state;
-  }
-
-  this.onkeydown = function(e) {
-    if (!this.navigationActive) return;
-    switch(e.key) {
-      case 'ArrowLeft':
-        if (this.moveLeft()) e.preventDefault();
-        break;
-      case 'ArrowUp':
-        if (e.key == 'ArrowUp' || e.ctrlKey) {
-          if (this.moveUp()) e.preventDefault();
-        }
-        break;
-      case 'ArrowRight':
-        if (this.moveRight()) e.preventDefault();
-        break;
-      case 'ArrowDown':
-        if (e.key == 'ArrowDown' || e.ctrlKey) {
-          if (this.moveDown()) e.preventDefault();
-        }
-        break;
-      case 'Enter':
-        if (this.current) e.preventDefault();
-        this.select(this.current);
-        break;
-    }
-    if (e.ctrlKey && e.shiftKey) this.select(this.current);
-  }
-
-  this.moveRight = function() {
-  }
-
-  this.moveLeft = function() {
-  }
-
-  this.move = function(isDown) {
-  }
-
-  this.moveUp = function() {
-    return this.move(false);
-  }
-
-  this.moveDown = function() {
-    return this.move(true);
-  }
-
-  /*
-   * Scrolls to the given element in the scrollable element view.
-   */
-  this.scrollInElement = function(element, view) {
-    var offset, viewHeight, viewScroll, height;
-    offset = element.offsetTop;
-    height = element.offsetHeight;
-    viewHeight = view.offsetHeight;
-    viewScroll = view.scrollTop;
-
-    if (offset - viewScroll + height > viewHeight) {
-      view.scrollTop = offset - viewHeight + height;
-    }
-    if (offset < viewScroll) {
-      view.scrollTop = offset;
-    }
-  }
-
-  /*
-   * Scrolls to the given element in the window.  The second argument is
-   * ignored
-   */
-  this.scrollInWindow = function(element, ignored) {
-    var offset, viewHeight, viewScroll, height;
-    offset = element.offsetTop;
-    height = element.offsetHeight;
-    viewHeight = window.innerHeight;
-    viewScroll = window.scrollY;
-
-    if (offset - viewScroll + height > viewHeight) {
-      window.scrollTo(window.scrollX, offset - viewHeight + height);
-    }
-    if (offset < viewScroll) {
-      window.scrollTo(window.scrollX, offset);
-    }
-  }
-}
-
diff --git a/lib/rdoc/generator/template/json_index/js/searcher.js b/lib/rdoc/generator/template/json_index/js/searcher.js
deleted file mode 100644
index e200a168b0f74f..00000000000000
--- a/lib/rdoc/generator/template/json_index/js/searcher.js
+++ /dev/null
@@ -1,229 +0,0 @@
-Searcher = function(data) {
-  this.data = data;
-  this.handlers = [];
-}
-
-Searcher.prototype = new function() {
-  // search is performed in chunks of 1000 for non-blocking user input
-  var CHUNK_SIZE = 1000;
-  // do not try to find more than 100 results
-  var MAX_RESULTS = 100;
-  var huid = 1;
-  var suid = 1;
-  var runs = 0;
-
-  this.find = function(query) {
-    var queries = splitQuery(query);
-    var regexps = buildRegexps(queries);
-    var highlighters = buildHilighters(queries);
-    var state = { from: 0, pass: 0, limit: MAX_RESULTS, n: suid++};
-    var _this = this;
-
-    this.currentSuid = state.n;
-
-    if (!query) return;
-
-    var run = function() {
-      // stop current search thread if new search started
-      if (state.n != _this.currentSuid) return;
-
-      var results =
-        performSearch(_this.data, regexps, queries, highlighters, state);
-      var hasMore = (state.limit > 0 && state.pass < 4);
-
-      triggerResults.call(_this, results, !hasMore);
-      if (hasMore) {
-        setTimeout(run, 2);
-      }
-      runs++;
-    };
-    runs = 0;
-
-    // start search thread
-    run();
-  }
-
-  /*  ----- Events ------  */
-  this.ready = function(fn) {
-    fn.huid = huid;
-    this.handlers.push(fn);
-  }
-
-  /*  ----- Utilities ------  */
-  function splitQuery(query) {
-    return query.split(/(\s+|::?|\(\)?)/).filter(function(string) {
-      return string.match(/\S/);
-    });
-  }
-
-  function buildRegexps(queries) {
-    return queries.map(function(query) {
-      return new RegExp(query.replace(/(.)/g, '([$1])([^$1]*?)'), 'i');
-    });
-  }
-
-  function buildHilighters(queries) {
-    return queries.map(function(query) {
-      return query.split('').map(function(l, i) {
-        return '\u0001$' + (i*2+1) + '\u0002$' + (i*2+2);
-      }).join('');
-    });
-  }
-
-  // function longMatchRegexp(index, longIndex, regexps) {
-  //     for (var i = regexps.length - 1; i >= 0; i--){
-  //         if (!index.match(regexps[i]) && !longIndex.match(regexps[i])) return false;
-  //     };
-  //     return true;
-  // }
-
-
-  /*  ----- Mathchers ------  */
-
-  /*
-   * This record matches if the index starts with queries[0] and the record
-   * matches all of the regexps
-   */
-  function matchPassBeginning(index, longIndex, queries, regexps) {
-    if (index.indexOf(queries[0]) != 0) return false;
-    for (var i=1, l = regexps.length; i < l; i++) {
-      if (!index.match(regexps[i]) && !longIndex.match(regexps[i]))
-        return false;
-    };
-    return true;
-  }
-
-  /*
-   * This record matches if the longIndex starts with queries[0] and the
-   * longIndex matches all of the regexps
-   */
-  function matchPassLongIndex(index, longIndex, queries, regexps) {
-    if (longIndex.indexOf(queries[0]) != 0) return false;
-    for (var i=1, l = regexps.length; i < l; i++) {
-      if (!longIndex.match(regexps[i]))
-        return false;
-    };
-    return true;
-  }
-
-  /*
-   * This record matches if the index contains queries[0] and the record
-   * matches all of the regexps
-   */
-  function matchPassContains(index, longIndex, queries, regexps) {
-    if (index.indexOf(queries[0]) == -1) return false;
-    for (var i=1, l = regexps.length; i < l; i++) {
-      if (!index.match(regexps[i]) && !longIndex.match(regexps[i]))
-        return false;
-    };
-    return true;
-  }
-
-  /*
-   * This record matches if regexps[0] matches the index and the record
-   * matches all of the regexps
-   */
-  function matchPassRegexp(index, longIndex, queries, regexps) {
-    if (!index.match(regexps[0])) return false;
-    for (var i=1, l = regexps.length; i < l; i++) {
-      if (!index.match(regexps[i]) && !longIndex.match(regexps[i]))
-        return false;
-    };
-    return true;
-  }
-
-
-  /*  ----- Highlighters ------  */
-  function highlightRegexp(info, queries, regexps, highlighters) {
-    var result = createResult(info);
-    for (var i=0, l = regexps.length; i < l; i++) {
-      result.title = result.title.replace(regexps[i], highlighters[i]);
-      result.namespace = result.namespace.replace(regexps[i], highlighters[i]);
-    };
-    return result;
-  }
-
-  function hltSubstring(string, pos, length) {
-    return string.substring(0, pos) + '\u0001' + string.substring(pos, pos + length) + '\u0002' + string.substring(pos + length);
-  }
-
-  function highlightQuery(info, queries, regexps, highlighters) {
-    var result = createResult(info);
-    var pos = 0;
-    var lcTitle = result.title.toLowerCase();
-
-    pos = lcTitle.indexOf(queries[0]);
-    if (pos != -1) {
-      result.title = hltSubstring(result.title, pos, queries[0].length);
-    }
-
-    result.namespace = result.namespace.replace(regexps[0], highlighters[0]);
-    for (var i=1, l = regexps.length; i < l; i++) {
-      result.title = result.title.replace(regexps[i], highlighters[i]);
-      result.namespace = result.namespace.replace(regexps[i], highlighters[i]);
-    };
-    return result;
-  }
-
-  function createResult(info) {
-    var result = {};
-    result.title = info[0];
-    result.namespace = info[1];
-    result.path = info[2];
-    result.params = info[3];
-    result.snippet = info[4];
-    result.badge = info[6];
-    return result;
-  }
-
-  /*  ----- Searching ------  */
-  function performSearch(data, regexps, queries, highlighters, state) {
-    var searchIndex = data.searchIndex;
-    var longSearchIndex = data.longSearchIndex;
-    var info = data.info;
-    var result = [];
-    var i = state.from;
-    var l = searchIndex.length;
-    var togo = CHUNK_SIZE;
-    var matchFunc, hltFunc;
-
-    while (state.pass < 4 && state.limit > 0 && togo > 0) {
-      if (state.pass == 0) {
-        matchFunc = matchPassBeginning;
-        hltFunc = highlightQuery;
-      } else if (state.pass == 1) {
-        matchFunc = matchPassLongIndex;
-        hltFunc = highlightQuery;
-      } else if (state.pass == 2) {
-        matchFunc = matchPassContains;
-        hltFunc = highlightQuery;
-      } else if (state.pass == 3) {
-        matchFunc = matchPassRegexp;
-        hltFunc = highlightRegexp;
-      }
-
-      for (; togo > 0 && i < l && state.limit > 0; i++, togo--) {
-        if (info[i].n == state.n) continue;
-        if (matchFunc(searchIndex[i], longSearchIndex[i], queries, regexps)) {
-          info[i].n = state.n;
-          result.push(hltFunc(info[i], queries, regexps, highlighters));
-          state.limit--;
-        }
-      };
-      if (searchIndex.length <= i) {
-        state.pass++;
-        i = state.from = 0;
-      } else {
-        state.from = i;
-      }
-    }
-    return result;
-  }
-
-  function triggerResults(results, isLast) {
-    this.handlers.forEach(function(fn) {
-      fn.call(this, results, isLast)
-    });
-  }
-}
-
diff --git a/lib/rdoc/ghost_method.rb b/lib/rdoc/ghost_method.rb
deleted file mode 100644
index 25f951e35ef0af..00000000000000
--- a/lib/rdoc/ghost_method.rb
+++ /dev/null
@@ -1,6 +0,0 @@
-# frozen_string_literal: true
-##
-# GhostMethod represents a method referenced only by a comment
-
-class RDoc::GhostMethod < RDoc::AnyMethod
-end
diff --git a/lib/rdoc/i18n.rb b/lib/rdoc/i18n.rb
deleted file mode 100644
index f209a9a6f67ac1..00000000000000
--- a/lib/rdoc/i18n.rb
+++ /dev/null
@@ -1,10 +0,0 @@
-# frozen_string_literal: true
-##
-# This module provides i18n related features.
-
-module RDoc::I18n
-
-  autoload :Locale, "#{__dir__}/i18n/locale"
-  require_relative 'i18n/text'
-
-end
diff --git a/lib/rdoc/i18n/locale.rb b/lib/rdoc/i18n/locale.rb
deleted file mode 100644
index 6a70d6c986e1f4..00000000000000
--- a/lib/rdoc/i18n/locale.rb
+++ /dev/null
@@ -1,102 +0,0 @@
-# frozen_string_literal: true
-##
-# A message container for a locale.
-#
-# This object provides the following two features:
-#
-#   * Loads translated messages from .po file.
-#   * Translates a message into the locale.
-
-class RDoc::I18n::Locale
-
-  @@locales = {} # :nodoc:
-
-  class << self
-
-    ##
-    # Returns the locale object for +locale_name+.
-
-    def [](locale_name)
-      @@locales[locale_name] ||= new(locale_name)
-    end
-
-    ##
-    # Sets the locale object for +locale_name+.
-    #
-    # Normally, this method is not used. This method is useful for
-    # testing.
-
-    def []=(locale_name, locale)
-      @@locales[locale_name] = locale
-    end
-
-  end
-
-  ##
-  # The name of the locale. It uses IETF language tag format
-  # +[language[_territory][.codeset][@modifier]]+.
-  #
-  # See also {BCP 47 - Tags for Identifying
-  # Languages}[http://tools.ietf.org/rfc/bcp/bcp47.txt].
-
-  attr_reader :name
-
-  ##
-  # Creates a new locale object for +name+ locale. +name+ must
-  # follow IETF language tag format.
-
-  def initialize(name)
-    @name = name
-    @messages = {}
-  end
-
-  ##
-  # Loads translation messages from +locale_directory+/+@name+/rdoc.po
-  # or +locale_directory+/+@name+.po. The former has high priority.
-  #
-  # This method requires gettext gem for parsing .po file. If you
-  # don't have gettext gem, this method doesn't load .po file. This
-  # method warns and returns +false+.
-  #
-  # Returns +true+ if succeeded, +false+ otherwise.
-
-  def load(locale_directory)
-    return false if @name.nil?
-
-    po_file_candidates = [
-      File.join(locale_directory, @name, 'rdoc.po'),
-      File.join(locale_directory, "#{@name}.po"),
-    ]
-    po_file = po_file_candidates.find do |po_file_candidate|
-      File.exist?(po_file_candidate)
-    end
-    return false unless po_file
-
-    begin
-      require 'gettext/po_parser'
-      require 'gettext/mo'
-    rescue LoadError
-      warn('Need gettext gem for i18n feature:')
-      warn('  gem install gettext')
-      return false
-    end
-
-    po_parser = GetText::POParser.new
-    messages = GetText::MO.new
-    po_parser.report_warning = false
-    po_parser.parse_file(po_file, messages)
-
-    @messages.merge!(messages)
-
-    true
-  end
-
-  ##
-  # Translates the +message+ into locale. If there is no translation
-  # messages for +message+ in locale, +message+ itself is returned.
-
-  def translate(message)
-    @messages[message] || message
-  end
-
-end
diff --git a/lib/rdoc/i18n/text.rb b/lib/rdoc/i18n/text.rb
deleted file mode 100644
index 7ea6664442eafa..00000000000000
--- a/lib/rdoc/i18n/text.rb
+++ /dev/null
@@ -1,126 +0,0 @@
-# frozen_string_literal: true
-##
-# An i18n supported text.
-#
-# This object provides the following two features:
-#
-#   * Extracts translation messages from wrapped raw text.
-#   * Translates wrapped raw text in specified locale.
-#
-# Wrapped raw text is one of String, RDoc::Comment or Array of them.
-
-class RDoc::I18n::Text
-
-  ##
-  # Creates a new i18n supported text for +raw+ text.
-
-  def initialize(raw)
-    @raw = raw
-  end
-
-  ##
-  # Extracts translation target messages and yields each message.
-  #
-  # Each yielded message is a Hash. It consists of the followings:
-  #
-  # :type      :: :paragraph
-  # :paragraph :: String (The translation target message itself.)
-  # :line_no   :: Integer (The line number of the :paragraph is started.)
-  #
-  # The above content may be added in the future.
-
-  def extract_messages
-    parse do |part|
-      case part[:type]
-      when :empty_line
-        # ignore
-      when :paragraph
-        yield(part)
-      end
-    end
-  end
-
-  # Translates raw text into +locale+.
-  def translate(locale)
-    translated_text = ''
-    parse do |part|
-      case part[:type]
-      when :paragraph
-        translated_text += locale.translate(part[:paragraph])
-      when :empty_line
-        translated_text += part[:line]
-      else
-        raise "should not reach here: unexpected type: #{type}"
-      end
-    end
-    translated_text
-  end
-
-  private
-  def parse(&block)
-    paragraph = ''
-    paragraph_start_line = 0
-    line_no = 0
-
-    each_line(@raw) do |line|
-      line_no += 1
-      case line
-      when /\A\s*\z/
-        if paragraph.empty?
-          emit_empty_line_event(line, line_no, &block)
-        else
-          paragraph += line
-          emit_paragraph_event(paragraph, paragraph_start_line, line_no,
-                               &block)
-          paragraph = ''
-        end
-      else
-        paragraph_start_line = line_no if paragraph.empty?
-        paragraph += line
-      end
-    end
-
-    unless paragraph.empty?
-      emit_paragraph_event(paragraph, paragraph_start_line, line_no, &block)
-    end
-  end
-
-  def each_line(raw, &block)
-    case raw
-    when RDoc::Comment
-      raw.text.each_line(&block)
-    when Array
-      raw.each do |comment, location|
-        each_line(comment, &block)
-      end
-    else
-      raw.each_line(&block)
-    end
-  end
-
-  def emit_empty_line_event(line, line_no)
-    part = {
-      :type => :empty_line,
-      :line => line,
-      :line_no => line_no,
-    }
-    yield(part)
-  end
-
-  def emit_paragraph_event(paragraph, paragraph_start_line, line_no, &block)
-    paragraph_part = {
-      :type => :paragraph,
-      :line_no => paragraph_start_line,
-    }
-    match_data = /(\s*)\z/.match(paragraph)
-    if match_data
-      paragraph_part[:paragraph] = match_data.pre_match
-      yield(paragraph_part)
-      emit_empty_line_event(match_data[1], line_no, &block)
-    else
-      paragraph_part[:paragraph] = paragraph
-      yield(paragraph_part)
-    end
-  end
-
-end
diff --git a/lib/rdoc/include.rb b/lib/rdoc/include.rb
deleted file mode 100644
index c3e0d45e47f120..00000000000000
--- a/lib/rdoc/include.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-# frozen_string_literal: true
-##
-# A Module included in a class with \#include
-#
-#   RDoc::Include.new 'Enumerable', 'comment ...'
-
-class RDoc::Include < RDoc::Mixin
-
-end
diff --git a/lib/rdoc/known_classes.rb b/lib/rdoc/known_classes.rb
deleted file mode 100644
index 3e8752bbdebda4..00000000000000
--- a/lib/rdoc/known_classes.rb
+++ /dev/null
@@ -1,74 +0,0 @@
-# frozen_string_literal: true
-module RDoc
-
-  ##
-  # Ruby's built-in classes, modules and exceptions
-
-  KNOWN_CLASSES = {
-    "rb_cArray"            => "Array",
-    "rb_cBasicObject"      => "BasicObject",
-    "rb_cBignum"           => "Bignum",
-    "rb_cClass"            => "Class",
-    "rb_cData"             => "Data",
-    "rb_cDir"              => "Dir",
-    "rb_cEncoding"         => "Encoding",
-    "rb_cFalseClass"       => "FalseClass",
-    "rb_cFile"             => "File",
-    "rb_cFixnum"           => "Fixnum",
-    "rb_cFloat"            => "Float",
-    "rb_cHash"             => "Hash",
-    "rb_cIO"               => "IO",
-    "rb_cInteger"          => "Integer",
-    "rb_cModule"           => "Module",
-    "rb_cNilClass"         => "NilClass",
-    "rb_cNumeric"          => "Numeric",
-    "rb_cObject"           => "Object",
-    "rb_cProc"             => "Proc",
-    "rb_cRange"            => "Range",
-    "rb_cRefinement"       => "Refinement",
-    "rb_cRegexp"           => "Regexp",
-    "rb_cRubyVM"           => "RubyVM",
-    "rb_cSocket"           => "Socket",
-    "rb_cString"           => "String",
-    "rb_cStruct"           => "Struct",
-    "rb_cSymbol"           => "Symbol",
-    "rb_cThread"           => "Thread",
-    "rb_cTime"             => "Time",
-    "rb_cTrueClass"        => "TrueClass",
-
-    "rb_eArgError"         => "ArgumentError",
-    "rb_eEOFError"         => "EOFError",
-    "rb_eException"        => "Exception",
-    "rb_eFatal"            => "fatal",
-    "rb_eFloatDomainError" => "FloatDomainError",
-    "rb_eIOError"          => "IOError",
-    "rb_eIndexError"       => "IndexError",
-    "rb_eInterrupt"        => "Interrupt",
-    "rb_eLoadError"        => "LoadError",
-    "rb_eNameError"        => "NameError",
-    "rb_eNoMemError"       => "NoMemoryError",
-    "rb_eNotImpError"      => "NotImplementedError",
-    "rb_eRangeError"       => "RangeError",
-    "rb_eRuntimeError"     => "RuntimeError",
-    "rb_eScriptError"      => "ScriptError",
-    "rb_eSecurityError"    => "SecurityError",
-    "rb_eSignal"           => "SignalException",
-    "rb_eStandardError"    => "StandardError",
-    "rb_eSyntaxError"      => "SyntaxError",
-    "rb_eSystemCallError"  => "SystemCallError",
-    "rb_eSystemExit"       => "SystemExit",
-    "rb_eTypeError"        => "TypeError",
-    "rb_eZeroDivError"     => "ZeroDivisionError",
-
-    "rb_mComparable"       => "Comparable",
-    "rb_mEnumerable"       => "Enumerable",
-    "rb_mErrno"            => "Errno",
-    "rb_mFConst"           => "File::Constants",
-    "rb_mFileTest"         => "FileTest",
-    "rb_mGC"               => "GC",
-    "rb_mKernel"           => "Kernel",
-    "rb_mMath"             => "Math",
-    "rb_mProcess"          => "Process"
-  }
-
-end
diff --git a/lib/rdoc/markdown.rb b/lib/rdoc/markdown.rb
deleted file mode 100644
index a0709b635213a4..00000000000000
--- a/lib/rdoc/markdown.rb
+++ /dev/null
@@ -1,16783 +0,0 @@
-# coding: UTF-8
-# frozen_string_literal: true
-# :markup: markdown
-
-##
-# RDoc::Markdown as described by the [markdown syntax][syntax].
-#
-# To choose Markdown as your only default format see
-# RDoc::Options@Saved+Options for instructions on setting up a `.doc_options`
-# file to store your project default.
-#
-# ## Usage
-#
-# Here is a brief example of using this parse to read a markdown file by hand.
-#
-#     data = File.read("README.md")
-#     formatter = RDoc::Markup::ToHtml.new(RDoc::Options.new, nil)
-#     html = RDoc::Markdown.parse(data).accept(formatter)
-#
-#     # do something with html
-#
-# ## Extensions
-#
-# The following markdown extensions are supported by the parser, but not all
-# are used in RDoc output by default.
-#
-# ### RDoc
-#
-# The RDoc Markdown parser has the following built-in behaviors that cannot be
-# disabled.
-#
-# Underscores embedded in words are never interpreted as emphasis.  (While the
-# [markdown dingus][dingus] emphasizes in-word underscores, neither the
-# Markdown syntax nor MarkdownTest mention this behavior.)
-#
-# For HTML output, RDoc always auto-links bare URLs.
-#
-# ### Break on Newline
-#
-# The break_on_newline extension converts all newlines into hard line breaks
-# as in [Github Flavored Markdown][GFM].  This extension is disabled by
-# default.
-#
-# ### CSS
-#
-# The #css extension enables CSS blocks to be included in the output, but they
-# are not used for any built-in RDoc output format.  This extension is disabled
-# by default.
-#
-# Example:
-#
-#     <style type="text/css">
-#     h1 { font-size: 3em }
-#     </style>
-#
-# ### Definition Lists
-#
-# The definition_lists extension allows definition lists using the [PHP
-# Markdown Extra syntax][PHPE], but only one label and definition are supported
-# at this time.  This extension is enabled by default.
-#
-# Example:
-#
-# ```
-# cat
-# :   A small furry mammal
-# that seems to sleep a lot
-#
-# ant
-# :   A little insect that is known
-# to enjoy picnics
-#
-# ```
-#
-# Produces:
-#
-# cat
-# :   A small furry mammal
-# that seems to sleep a lot
-#
-# ant
-# :   A little insect that is known
-# to enjoy picnics
-#
-# ### Strike
-#
-# Example:
-#
-# ```
-# This is ~~striked~~.
-# ```
-#
-# Produces:
-#
-# This is ~~striked~~.
-#
-# ### Github
-#
-# The #github extension enables a partial set of [Github Flavored Markdown]
-# [GFM].  This extension is enabled by default.
-#
-# Supported github extensions include:
-#
-# #### Fenced code blocks
-#
-# Use ` ``` ` around a block of code instead of indenting it four spaces.
-#
-# #### Syntax highlighting
-#
-# Use ` ``` ruby ` as the start of a code fence to add syntax highlighting.
-# (Currently only `ruby` syntax is supported).
-#
-# ### HTML
-#
-# Enables raw HTML to be included in the output.  This extension is enabled by
-# default.
-#
-# Example:
-#
-#     <table>
-#     ...
-#     </table>
-#
-# ### Notes
-#
-# The #notes extension enables footnote support.  This extension is enabled by
-# default.
-#
-# Example:
-#
-#     Here is some text[^1] including an inline footnote ^[for short footnotes]
-#
-#     ...
-#
-#     [^1]: With the footnote text down at the bottom
-#
-# Produces:
-#
-# Here is some text[^1] including an inline footnote ^[for short footnotes]
-#
-# [^1]: With the footnote text down at the bottom
-#
-# ## Limitations
-#
-# * Link titles are not used
-# * Footnotes are collapsed into a single paragraph
-#
-# ## Author
-#
-# This markdown parser is a port to kpeg from [peg-markdown][pegmarkdown] by
-# John MacFarlane.
-#
-# It is used under the MIT license:
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-#
-# The port to kpeg was performed by Eric Hodel and Evan Phoenix
-#
-# [dingus]: http://daringfireball.net/projects/markdown/dingus
-# [GFM]: https://github.github.com/gfm/
-# [pegmarkdown]: https://github.com/jgm/peg-markdown
-# [PHPE]: http://michelf.com/projects/php-markdown/extra/#def-list
-# [syntax]: http://daringfireball.net/projects/markdown/syntax
-#--
-# Last updated to jgm/peg-markdown commit 8f8fc22ef0
-class RDoc::Markdown
-  # :stopdoc:
-
-    # This is distinct from setup_parser so that a standalone parser
-    # can redefine #initialize and still have access to the proper
-    # parser setup code.
-    def initialize(str, debug=false)
-      setup_parser(str, debug)
-    end
-
-
-
-    # Prepares for parsing +str+.  If you define a custom initialize you must
-    # call this method before #parse
-    def setup_parser(str, debug=false)
-      set_string str, 0
-      @memoizations = Hash.new { |h,k| h[k] = {} }
-      @result = nil
-      @failed_rule = nil
-      @failing_rule_offset = -1
-      @line_offsets = nil
-
-      setup_foreign_grammar
-    end
-
-    attr_reader :string
-    attr_reader :failing_rule_offset
-    attr_accessor :result, :pos
-
-    def current_column(target=pos)
-      if string[target] == "\n" && (c = string.rindex("\n", target-1) || -1)
-        return target - c
-      elsif c = string.rindex("\n", target)
-        return target - c
-      end
-
-      target + 1
-    end
-
-    def position_line_offsets
-      unless @position_line_offsets
-        @position_line_offsets = []
-        total = 0
-        string.each_line do |line|
-          total += line.size
-          @position_line_offsets << total
-        end
-      end
-      @position_line_offsets
-    end
-
-    if [].respond_to? :bsearch_index
-      def current_line(target=pos)
-        if line = position_line_offsets.bsearch_index {|x| x > target }
-          return line + 1
-        end
-        raise "Target position #{target} is outside of string"
-      end
-    else
-      def current_line(target=pos)
-        if line = position_line_offsets.index {|x| x > target }
-          return line + 1
-        end
-
-        raise "Target position #{target} is outside of string"
-      end
-    end
-
-    def current_character(target=pos)
-      if target < 0 || target >= string.size
-        raise "Target position #{target} is outside of string"
-      end
-      string[target, 1]
-    end
-
-    KpegPosInfo = Struct.new(:pos, :lno, :col, :line, :char)
-
-    def current_pos_info(target=pos)
-      l = current_line target
-      c = current_column target
-      ln = get_line(l-1)
-      chr = string[target,1]
-      KpegPosInfo.new(target, l, c, ln, chr)
-    end
-
-    def lines
-      string.lines
-    end
-
-    def get_line(no)
-      loff = position_line_offsets
-      if no < 0
-        raise "Line No is out of range: #{no} < 0"
-      elsif no >= loff.size
-        raise "Line No is out of range: #{no} >= #{loff.size}"
-      end
-      lend = loff[no]-1
-      lstart = no > 0 ? loff[no-1] : 0
-      string[lstart..lend]
-    end
-
-
-
-    def get_text(start)
-      @string[start..@pos-1]
-    end
-
-    # Sets the string and current parsing position for the parser.
-    def set_string string, pos
-      @string = string
-      @string_size = string ? string.size : 0
-      @pos = pos
-      @position_line_offsets = nil
-    end
-
-    def show_pos
-      width = 10
-      if @pos < width
-        "#{@pos} (\"#{@string[0,@pos]}\" @ \"#{@string[@pos,width]}\")"
-      else
-        "#{@pos} (\"... #{@string[@pos - width, width]}\" @ \"#{@string[@pos,width]}\")"
-      end
-    end
-
-    def failure_info
-      l = current_line @failing_rule_offset
-      c = current_column @failing_rule_offset
-
-      if @failed_rule.kind_of? Symbol
-        info = self.class::Rules[@failed_rule]
-        "line #{l}, column #{c}: failed rule '#{info.name}' = '#{info.rendered}'"
-      else
-        "line #{l}, column #{c}: failed rule '#{@failed_rule}'"
-      end
-    end
-
-    def failure_caret
-      p = current_pos_info @failing_rule_offset
-      "#{p.line.chomp}\n#{' ' * (p.col - 1)}^"
-    end
-
-    def failure_character
-      current_character @failing_rule_offset
-    end
-
-    def failure_oneline
-      p = current_pos_info @failing_rule_offset
-
-      if @failed_rule.kind_of? Symbol
-        info = self.class::Rules[@failed_rule]
-        "@#{p.lno}:#{p.col} failed rule '#{info.name}', got '#{p.char}'"
-      else
-        "@#{p.lno}:#{p.col} failed rule '#{@failed_rule}', got '#{p.char}'"
-      end
-    end
-
-    class ParseError < RuntimeError
-    end
-
-    def raise_error
-      raise ParseError, failure_oneline
-    end
-
-    def show_error(io=STDOUT)
-      error_pos = @failing_rule_offset
-      p = current_pos_info(error_pos)
-
-      io.puts "On line #{p.lno}, column #{p.col}:"
-
-      if @failed_rule.kind_of? Symbol
-        info = self.class::Rules[@failed_rule]
-        io.puts "Failed to match '#{info.rendered}' (rule '#{info.name}')"
-      else
-        io.puts "Failed to match rule '#{@failed_rule}'"
-      end
-
-      io.puts "Got: #{p.char.inspect}"
-      io.puts "=> #{p.line}"
-      io.print(" " * (p.col + 2))
-      io.puts "^"
-    end
-
-    def set_failed_rule(name)
-      if @pos > @failing_rule_offset
-        @failed_rule = name
-        @failing_rule_offset = @pos
-      end
-    end
-
-    attr_reader :failed_rule
-
-    def match_string(str)
-      len = str.size
-      if @string[pos,len] == str
-        @pos += len
-        return str
-      end
-
-      return nil
-    end
-
-    def scan(reg)
-      if m = reg.match(@string, @pos)
-        @pos = m.end(0)
-        return true
-      end
-
-      return nil
-    end
-
-    if "".respond_to? :ord
-      def get_byte
-        if @pos >= @string_size
-          return nil
-        end
-
-        s = @string[@pos].ord
-        @pos += 1
-        s
-      end
-    else
-      def get_byte
-        if @pos >= @string_size
-          return nil
-        end
-
-        s = @string[@pos]
-        @pos += 1
-        s
-      end
-    end
-
-    def parse(rule=nil)
-      # We invoke the rules indirectly via apply
-      # instead of by just calling them as methods because
-      # if the rules use left recursion, apply needs to
-      # manage that.
-
-      if !rule
-        apply(:_root)
-      else
-        method = rule.gsub("-","_hyphen_")
-        apply :"_#{method}"
-      end
-    end
-
-    class MemoEntry
-      def initialize(ans, pos)
-        @ans = ans
-        @pos = pos
-        @result = nil
-        @set = false
-        @left_rec = false
-      end
-
-      attr_reader :ans, :pos, :result, :set
-      attr_accessor :left_rec
-
-      def move!(ans, pos, result)
-        @ans = ans
-        @pos = pos
-        @result = result
-        @set = true
-        @left_rec = false
-      end
-    end
-
-    def external_invoke(other, rule, *args)
-      old_pos = @pos
-      old_string = @string
-
-      set_string other.string, other.pos
-
-      begin
-        if val = __send__(rule, *args)
-          other.pos = @pos
-          other.result = @result
-        else
-          other.set_failed_rule "#{self.class}##{rule}"
-        end
-        val
-      ensure
-        set_string old_string, old_pos
-      end
-    end
-
-    def apply_with_args(rule, *args)
-      @result = nil
-      memo_key = [rule, args]
-      if m = @memoizations[memo_key][@pos]
-        @pos = m.pos
-        if !m.set
-          m.left_rec = true
-          return nil
-        end
-
-        @result = m.result
-
-        return m.ans
-      else
-        m = MemoEntry.new(nil, @pos)
-        @memoizations[memo_key][@pos] = m
-        start_pos = @pos
-
-        ans = __send__ rule, *args
-
-        lr = m.left_rec
-
-        m.move! ans, @pos, @result
-
-        # Don't bother trying to grow the left recursion
-        # if it's failing straight away (thus there is no seed)
-        if ans and lr
-          return grow_lr(rule, args, start_pos, m)
-        else
-          return ans
-        end
-      end
-    end
-
-    def apply(rule)
-      @result = nil
-      if m = @memoizations[rule][@pos]
-        @pos = m.pos
-        if !m.set
-          m.left_rec = true
-          return nil
-        end
-
-        @result = m.result
-
-        return m.ans
-      else
-        m = MemoEntry.new(nil, @pos)
-        @memoizations[rule][@pos] = m
-        start_pos = @pos
-
-        ans = __send__ rule
-
-        lr = m.left_rec
-
-        m.move! ans, @pos, @result
-
-        # Don't bother trying to grow the left recursion
-        # if it's failing straight away (thus there is no seed)
-        if ans and lr
-          return grow_lr(rule, nil, start_pos, m)
-        else
-          return ans
-        end
-      end
-    end
-
-    def grow_lr(rule, args, start_pos, m)
-      while true
-        @pos = start_pos
-        @result = m.result
-
-        if args
-          ans = __send__ rule, *args
-        else
-          ans = __send__ rule
-        end
-        return nil unless ans
-
-        break if @pos <= m.pos
-
-        m.move! ans, @pos, @result
-      end
-
-      @result = m.result
-      @pos = m.pos
-      return m.ans
-    end
-
-    class RuleInfo
-      def initialize(name, rendered)
-        @name = name
-        @rendered = rendered
-      end
-
-      attr_reader :name, :rendered
-    end
-
-    def self.rule_info(name, rendered)
-      RuleInfo.new(name, rendered)
-    end
-
-
-  # :startdoc:
-
-
-
-  require_relative '../rdoc'
-  require_relative 'markup/to_joined_paragraph'
-  require_relative 'markdown/entities'
-
-  require_relative 'markdown/literals'
-
-  ##
-  # Supported extensions
-
-  EXTENSIONS = []
-
-  ##
-  # Extensions enabled by default
-
-  DEFAULT_EXTENSIONS = [
-    :definition_lists,
-    :github,
-    :html,
-    :notes,
-    :strike,
-  ]
-
-  # :section: Extensions
-
-  ##
-  # Creates extension methods for the `name` extension to enable and disable
-  # the extension and to query if they are active.
-
-  def self.extension name
-    EXTENSIONS << name
-
-    define_method "#{name}?" do
-      extension? name
-    end
-
-    define_method "#{name}=" do |enable|
-      extension name, enable
-    end
-  end
-
-  ##
-  # Converts all newlines into hard breaks
-
-  extension :break_on_newline
-
-  ##
-  # Allow style blocks
-
-  extension :css
-
-  ##
-  # Allow PHP Markdown Extras style definition lists
-
-  extension :definition_lists
-
-  ##
-  # Allow Github Flavored Markdown
-
-  extension :github
-
-  ##
-  # Allow HTML
-
-  extension :html
-
-  ##
-  # Enables the notes extension
-
-  extension :notes
-
-  ##
-  # Enables the strike extension
-
-  extension :strike
-
-  # :section:
-
-  ##
-  # Parses the `markdown` document into an RDoc::Document using the default
-  # extensions.
-
-  def self.parse markdown
-    parser = new
-
-    parser.parse markdown
-  end
-
-  # TODO remove when kpeg 0.10 is released
-  alias orig_initialize initialize # :nodoc:
-
-  ##
-  # Creates a new markdown parser that enables the given +extensions+.
-
-  def initialize extensions = DEFAULT_EXTENSIONS, debug = false
-    @debug      = debug
-    @formatter  = RDoc::Markup::ToJoinedParagraph.new
-    @extensions = extensions
-
-    @references          = nil
-    @unlinked_references = nil
-
-    @footnotes       = nil
-    @note_order      = nil
-  end
-
-  ##
-  # Wraps `text` in emphasis for rdoc inline formatting
-
-  def emphasis text
-    if text =~ /\A[a-z\d.\/]+\z/i then
-      "_#{text}_"
-    else
-      "<em>#{text}</em>"
-    end
-  end
-
-  ##
-  # :category: Extensions
-  #
-  # Is the extension `name` enabled?
-
-  def extension? name
-    @extensions.include? name
-  end
-
-  ##
-  # :category: Extensions
-  #
-  # Enables or disables the extension with `name`
-
-  def extension name, enable
-    if enable then
-      @extensions |= [name]
-    else
-      @extensions -= [name]
-    end
-  end
-
-  ##
-  # Parses `text` in a clone of this parser.  This is used for handling nested
-  # lists the same way as markdown_parser.
-
-  def inner_parse text # :nodoc:
-    parser = clone
-
-    parser.setup_parser text, @debug
-
-    parser.peg_parse
-
-    doc = parser.result
-
-    doc.accept @formatter
-
-    doc.parts
-  end
-
-  ##
-  # Finds a link reference for `label` and creates a new link to it with
-  # `content` as the link text.  If `label` was not encountered in the
-  # reference-gathering parser pass the label and content are reconstructed
-  # with the linking `text` (usually whitespace).
-
-  def link_to content, label = content, text = nil
-    raise ParseError, 'enable notes extension' if
-      content.start_with? '^' and label.equal? content
-
-    if ref = @references[label] then
-      "{#{content}}[#{ref}]"
-    elsif label.equal? content then
-      "[#{content}]#{text}"
-    else
-      "[#{content}]#{text}[#{label}]"
-    end
-  end
-
-  ##
-  # Creates an RDoc::Markup::ListItem by parsing the `unparsed` content from
-  # the first parsing pass.
-
-  def list_item_from unparsed
-    parsed = inner_parse unparsed.join
-    RDoc::Markup::ListItem.new nil, *parsed
-  end
-
-  ##
-  # Stores `label` as a note and fills in previously unknown note references.
-
-  def note label
-    #foottext = "rdoc-label:foottext-#{label}:footmark-#{label}"
-
-    #ref.replace foottext if ref = @unlinked_notes.delete(label)
-
-    @notes[label] = foottext
-
-    #"{^1}[rdoc-label:footmark-#{label}:foottext-#{label}] "
-  end
-
-  ##
-  # Creates a new link for the footnote `reference` and adds the reference to
-  # the note order list for proper display at the end of the document.
-
-  def note_for ref
-    @note_order << ref
-
-    label = @note_order.length
-
-    "{*#{label}}[rdoc-label:foottext-#{label}:footmark-#{label}]"
-  end
-
-  ##
-  # The internal kpeg parse method
-
-  alias peg_parse parse # :nodoc:
-
-  ##
-  # Creates an RDoc::Markup::Paragraph from `parts` and including
-  # extension-specific behavior
-
-  def paragraph parts
-    parts = parts.map do |part|
-      if "\n" == part then
-        RDoc::Markup::HardBreak.new
-      else
-        part
-      end
-    end if break_on_newline?
-
-    RDoc::Markup::Paragraph.new(*parts)
-  end
-
-  ##
-  # Parses `markdown` into an RDoc::Document
-
-  def parse markdown
-    @references          = {}
-    @unlinked_references = {}
-
-    markdown += "\n\n"
-
-    setup_parser markdown, @debug
-    peg_parse 'References'
-
-    if notes? then
-      @footnotes       = {}
-
-      setup_parser markdown, @debug
-      peg_parse 'Notes'
-
-      # using note_order on the first pass would be a bug
-      @note_order      = []
-    end
-
-    setup_parser markdown, @debug
-    peg_parse
-
-    doc = result
-
-    if notes? and not @footnotes.empty? then
-      doc << RDoc::Markup::Rule.new(1)
-
-      @note_order.each_with_index do |ref, index|
-        label = index + 1
-        note = @footnotes[ref] or raise ParseError, "footnote [^#{ref}] not found"
-
-        link = "{^#{label}}[rdoc-label:footmark-#{label}:foottext-#{label}] "
-        note.parts.unshift link
-
-        doc << note
-      end
-    end
-
-    doc.accept @formatter
-
-    doc
-  end
-
-  ##
-  # Stores `label` as a reference to `link` and fills in previously unknown
-  # link references.
-
-  def reference label, link
-    if ref = @unlinked_references.delete(label) then
-      ref.replace link
-    end
-
-    @references[label] = link
-  end
-
-  ##
-  # Wraps `text` in strong markup for rdoc inline formatting
-
-  def strong text
-    if text =~ /\A[a-z\d.\/-]+\z/i then
-      "*#{text}*"
-    else
-      "<b>#{text}</b>"
-    end
-  end
-
-  ##
-  # Wraps `text` in strike markup for rdoc inline formatting
-
-  def strike text
-    if text =~ /\A[a-z\d.\/-]+\z/i then
-      "~#{text}~"
-    else
-      "<s>#{text}</s>"
-    end
-  end
-
-
-  # :stopdoc:
-  def setup_foreign_grammar
-    @_grammar_literals = RDoc::Markdown::Literals.new(nil)
-  end
-
-  # root = Doc
-  def _root
-    _tmp = apply(:_Doc)
-    set_failed_rule :_root unless _tmp
-    return _tmp
-  end
-
-  # Doc = BOM? Block*:a { RDoc::Markup::Document.new(*a.compact) }
-  def _Doc
-
-    _save = self.pos
-    while true # sequence
-      _save1 = self.pos
-      _tmp = apply(:_BOM)
-      unless _tmp
-        _tmp = true
-        self.pos = _save1
-      end
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _ary = []
-      while true
-        _tmp = apply(:_Block)
-        _ary << @result if _tmp
-        break unless _tmp
-      end
-      _tmp = true
-      @result = _ary
-      a = @result
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      @result = begin;  RDoc::Markup::Document.new(*a.compact) ; end
-      _tmp = true
-      unless _tmp
-        self.pos = _save
-      end
-      break
-    end # end sequence
-
-    set_failed_rule :_Doc unless _tmp
-    return _tmp
-  end
-
-  # Block = @BlankLine* (BlockQuote | Verbatim | CodeFence | Table | Note | Reference | HorizontalRule | Heading | OrderedList | BulletList | DefinitionList | HtmlBlock | StyleBlock | Para | Plain)
-  def _Block
-
-    _save = self.pos
-    while true # sequence
-      while true
-        _tmp = _BlankLine()
-        break unless _tmp
-      end
-      _tmp = true
-      unless _tmp
-        self.pos = _save
-        break
-      end
-
-      _save2 = self.pos
-      while true # choice
-        _tmp = apply(:_BlockQuote)
-        break if _tmp
-        self.pos = _save2
-        _tmp = apply(:_Verbatim)
-        break if _tmp
-        self.pos = _save2
-        _tmp = apply(:_CodeFence)
-        break if _tmp
-        self.pos = _save2
-        _tmp = apply(:_Table)
-        break if _tmp
-        self.pos = _save2
-        _tmp = apply(:_Note)
-        break if _tmp
-        self.pos = _save2
-        _tmp = apply(:_Reference)
-        break if _tmp
-        self.pos = _save2
-        _tmp = apply(:_HorizontalRule)
-        break if _tmp
-        self.pos = _save2
-        _tmp = apply(:_Heading)
-        break if _tmp
-        self.pos = _save2
-        _tmp = apply(:_OrderedList)
-        break if _tmp
-        self.pos = _save2
-        _tmp = apply(:_BulletList)
-        break if _tmp
-        self.pos = _save2
-        _tmp = apply(:_DefinitionList)
-        break if _tmp
-        self.pos = _save2
-        _tmp = apply(:_HtmlBlock)
-        break if _tmp
-        self.pos = _save2
-        _tmp = apply(:_StyleBlock)
-        break if _tmp
-        self.pos = _save2
-        _tmp = apply(:_Para)
-        break if _tmp
-        self.pos = _save2
-        _tmp = apply(:_Plain)
-        break if _tmp
-        self.pos = _save2
-        break
-      end # end choice
-
-      unless _tmp
-        self.pos = _save
-      end
-      break
-    end # end sequence
-
-    set_failed_rule :_Block unless _tmp
-    return _tmp
-  end
-
-  # Para = @NonindentSpace Inlines:a @BlankLine+ { paragraph a }
-  def _Para
-
-    _save = self.pos
-    while true # sequence
-      _tmp = _NonindentSpace()
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = apply(:_Inlines)
-      a = @result
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _save1 = self.pos
-      _tmp = _BlankLine()
-      if _tmp
-        while true
-          _tmp = _BlankLine()
-          break unless _tmp
-        end
-        _tmp = true
-      else
-        self.pos = _save1
-      end
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      @result = begin;  paragraph a ; end
-      _tmp = true
-      unless _tmp
-        self.pos = _save
-      end
-      break
-    end # end sequence
-
-    set_failed_rule :_Para unless _tmp
-    return _tmp
-  end
-
-  # Plain = Inlines:a { paragraph a }
-  def _Plain
-
-    _save = self.pos
-    while true # sequence
-      _tmp = apply(:_Inlines)
-      a = @result
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      @result = begin;  paragraph a ; end
-      _tmp = true
-      unless _tmp
-        self.pos = _save
-      end
-      break
-    end # end sequence
-
-    set_failed_rule :_Plain unless _tmp
-    return _tmp
-  end
-
-  # AtxInline = !@Newline !(@Sp /#*/ @Sp @Newline) Inline
-  def _AtxInline
-
-    _save = self.pos
-    while true # sequence
-      _save1 = self.pos
-      _tmp = _Newline()
-      _tmp = _tmp ? nil : true
-      self.pos = _save1
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _save2 = self.pos
-
-      _save3 = self.pos
-      while true # sequence
-        _tmp = _Sp()
-        unless _tmp
-          self.pos = _save3
-          break
-        end
-        _tmp = scan(/\G(?-mix:#*)/)
-        unless _tmp
-          self.pos = _save3
-          break
-        end
-        _tmp = _Sp()
-        unless _tmp
-          self.pos = _save3
-          break
-        end
-        _tmp = _Newline()
-        unless _tmp
-          self.pos = _save3
-        end
-        break
-      end # end sequence
-
-      _tmp = _tmp ? nil : true
-      self.pos = _save2
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = apply(:_Inline)
-      unless _tmp
-        self.pos = _save
-      end
-      break
-    end # end sequence
-
-    set_failed_rule :_AtxInline unless _tmp
-    return _tmp
-  end
-
-  # AtxStart = < /\#{1,6}/ > { text.length }
-  def _AtxStart
-
-    _save = self.pos
-    while true # sequence
-      _text_start = self.pos
-      _tmp = scan(/\G(?-mix:\#{1,6})/)
-      if _tmp
-        text = get_text(_text_start)
-      end
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      @result = begin;  text.length ; end
-      _tmp = true
-      unless _tmp
-        self.pos = _save
-      end
-      break
-    end # end sequence
-
-    set_failed_rule :_AtxStart unless _tmp
-    return _tmp
-  end
-
-  # AtxHeading = AtxStart:s @Sp AtxInline+:a (@Sp /#*/ @Sp)? @Newline { RDoc::Markup::Heading.new(s, a.join) }
-  def _AtxHeading
-
-    _save = self.pos
-    while true # sequence
-      _tmp = apply(:_AtxStart)
-      s = @result
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = _Sp()
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _save1 = self.pos
-      _ary = []
-      _tmp = apply(:_AtxInline)
-      if _tmp
-        _ary << @result
-        while true
-          _tmp = apply(:_AtxInline)
-          _ary << @result if _tmp
-          break unless _tmp
-        end
-        _tmp = true
-        @result = _ary
-      else
-        self.pos = _save1
-      end
-      a = @result
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _save2 = self.pos
-
-      _save3 = self.pos
-      while true # sequence
-        _tmp = _Sp()
-        unless _tmp
-          self.pos = _save3
-          break
-        end
-        _tmp = scan(/\G(?-mix:#*)/)
-        unless _tmp
-          self.pos = _save3
-          break
-        end
-        _tmp = _Sp()
-        unless _tmp
-          self.pos = _save3
-        end
-        break
-      end # end sequence
-
-      unless _tmp
-        _tmp = true
-        self.pos = _save2
-      end
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = _Newline()
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      @result = begin;  RDoc::Markup::Heading.new(s, a.join) ; end
-      _tmp = true
-      unless _tmp
-        self.pos = _save
-      end
-      break
-    end # end sequence
-
-    set_failed_rule :_AtxHeading unless _tmp
-    return _tmp
-  end
-
-  # SetextHeading = (SetextHeading1 | SetextHeading2)
-  def _SetextHeading
-
-    _save = self.pos
-    while true # choice
-      _tmp = apply(:_SetextHeading1)
-      break if _tmp
-      self.pos = _save
-      _tmp = apply(:_SetextHeading2)
-      break if _tmp
-      self.pos = _save
-      break
-    end # end choice
-
-    set_failed_rule :_SetextHeading unless _tmp
-    return _tmp
-  end
-
-  # SetextBottom1 = /={1,}/ @Newline
-  def _SetextBottom1
-
-    _save = self.pos
-    while true # sequence
-      _tmp = scan(/\G(?-mix:={1,})/)
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = _Newline()
-      unless _tmp
-        self.pos = _save
-      end
-      break
-    end # end sequence
-
-    set_failed_rule :_SetextBottom1 unless _tmp
-    return _tmp
-  end
-
-  # SetextBottom2 = /-{1,}/ @Newline
-  def _SetextBottom2
-
-    _save = self.pos
-    while true # sequence
-      _tmp = scan(/\G(?-mix:-{1,})/)
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = _Newline()
-      unless _tmp
-        self.pos = _save
-      end
-      break
-    end # end sequence
-
-    set_failed_rule :_SetextBottom2 unless _tmp
-    return _tmp
-  end
-
-  # SetextHeading1 = &(@RawLine SetextBottom1) @StartList:a (!@Endline Inline:b { a << b })+ @Sp @Newline SetextBottom1 { RDoc::Markup::Heading.new(1, a.join) }
-  def _SetextHeading1
-
-    _save = self.pos
-    while true # sequence
-      _save1 = self.pos
-
-      _save2 = self.pos
-      while true # sequence
-        _tmp = _RawLine()
-        unless _tmp
-          self.pos = _save2
-          break
-        end
-        _tmp = apply(:_SetextBottom1)
-        unless _tmp
-          self.pos = _save2
-        end
-        break
-      end # end sequence
-
-      self.pos = _save1
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = _StartList()
-      a = @result
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _save3 = self.pos
-
-      _save4 = self.pos
-      while true # sequence
-        _save5 = self.pos
-        _tmp = _Endline()
-        _tmp = _tmp ? nil : true
-        self.pos = _save5
-        unless _tmp
-          self.pos = _save4
-          break
-        end
-        _tmp = apply(:_Inline)
-        b = @result
-        unless _tmp
-          self.pos = _save4
-          break
-        end
-        @result = begin;  a << b ; end
-        _tmp = true
-        unless _tmp
-          self.pos = _save4
-        end
-        break
-      end # end sequence
-
-      if _tmp
-        while true
-
-          _save6 = self.pos
-          while true # sequence
-            _save7 = self.pos
-            _tmp = _Endline()
-            _tmp = _tmp ? nil : true
-            self.pos = _save7
-            unless _tmp
-              self.pos = _save6
-              break
-            end
-            _tmp = apply(:_Inline)
-            b = @result
-            unless _tmp
-              self.pos = _save6
-              break
-            end
-            @result = begin;  a << b ; end
-            _tmp = true
-            unless _tmp
-              self.pos = _save6
-            end
-            break
-          end # end sequence
-
-          break unless _tmp
-        end
-        _tmp = true
-      else
-        self.pos = _save3
-      end
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = _Sp()
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = _Newline()
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = apply(:_SetextBottom1)
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      @result = begin;  RDoc::Markup::Heading.new(1, a.join) ; end
-      _tmp = true
-      unless _tmp
-        self.pos = _save
-      end
-      break
-    end # end sequence
-
-    set_failed_rule :_SetextHeading1 unless _tmp
-    return _tmp
-  end
-
-  # SetextHeading2 = &(@RawLine SetextBottom2) @StartList:a (!@Endline Inline:b { a << b })+ @Sp @Newline SetextBottom2 { RDoc::Markup::Heading.new(2, a.join) }
-  def _SetextHeading2
-
-    _save = self.pos
-    while true # sequence
-      _save1 = self.pos
-
-      _save2 = self.pos
-      while true # sequence
-        _tmp = _RawLine()
-        unless _tmp
-          self.pos = _save2
-          break
-        end
-        _tmp = apply(:_SetextBottom2)
-        unless _tmp
-          self.pos = _save2
-        end
-        break
-      end # end sequence
-
-      self.pos = _save1
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = _StartList()
-      a = @result
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _save3 = self.pos
-
-      _save4 = self.pos
-      while true # sequence
-        _save5 = self.pos
-        _tmp = _Endline()
-        _tmp = _tmp ? nil : true
-        self.pos = _save5
-        unless _tmp
-          self.pos = _save4
-          break
-        end
-        _tmp = apply(:_Inline)
-        b = @result
-        unless _tmp
-          self.pos = _save4
-          break
-        end
-        @result = begin;  a << b ; end
-        _tmp = true
-        unless _tmp
-          self.pos = _save4
-        end
-        break
-      end # end sequence
-
-      if _tmp
-        while true
-
-          _save6 = self.pos
-          while true # sequence
-            _save7 = self.pos
-            _tmp = _Endline()
-            _tmp = _tmp ? nil : true
-            self.pos = _save7
-            unless _tmp
-              self.pos = _save6
-              break
-            end
-            _tmp = apply(:_Inline)
-            b = @result
-            unless _tmp
-              self.pos = _save6
-              break
-            end
-            @result = begin;  a << b ; end
-            _tmp = true
-            unless _tmp
-              self.pos = _save6
-            end
-            break
-          end # end sequence
-
-          break unless _tmp
-        end
-        _tmp = true
-      else
-        self.pos = _save3
-      end
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = _Sp()
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = _Newline()
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = apply(:_SetextBottom2)
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      @result = begin;  RDoc::Markup::Heading.new(2, a.join) ; end
-      _tmp = true
-      unless _tmp
-        self.pos = _save
-      end
-      break
-    end # end sequence
-
-    set_failed_rule :_SetextHeading2 unless _tmp
-    return _tmp
-  end
-
-  # Heading = (SetextHeading | AtxHeading)
-  def _Heading
-
-    _save = self.pos
-    while true # choice
-      _tmp = apply(:_SetextHeading)
-      break if _tmp
-      self.pos = _save
-      _tmp = apply(:_AtxHeading)
-      break if _tmp
-      self.pos = _save
-      break
-    end # end choice
-
-    set_failed_rule :_Heading unless _tmp
-    return _tmp
-  end
-
-  # BlockQuote = BlockQuoteRaw:a { RDoc::Markup::BlockQuote.new(*a) }
-  def _BlockQuote
-
-    _save = self.pos
-    while true # sequence
-      _tmp = apply(:_BlockQuoteRaw)
-      a = @result
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      @result = begin;  RDoc::Markup::BlockQuote.new(*a) ; end
-      _tmp = true
-      unless _tmp
-        self.pos = _save
-      end
-      break
-    end # end sequence
-
-    set_failed_rule :_BlockQuote unless _tmp
-    return _tmp
-  end
-
-  # BlockQuoteRaw = @StartList:a (">" " "? Line:l { a << l } (!">" !@BlankLine Line:c { a << c })* (@BlankLine:n { a << n })*)+ { inner_parse a.join }
-  def _BlockQuoteRaw
-
-    _save = self.pos
-    while true # sequence
-      _tmp = _StartList()
-      a = @result
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _save1 = self.pos
-
-      _save2 = self.pos
-      while true # sequence
-        _tmp = match_string(">")
-        unless _tmp
-          self.pos = _save2
-          break
-        end
-        _save3 = self.pos
-        _tmp = match_string(" ")
-        unless _tmp
-          _tmp = true
-          self.pos = _save3
-        end
-        unless _tmp
-          self.pos = _save2
-          break
-        end
-        _tmp = apply(:_Line)
-        l = @result
-        unless _tmp
-          self.pos = _save2
-          break
-        end
-        @result = begin;  a << l ; end
-        _tmp = true
-        unless _tmp
-          self.pos = _save2
-          break
-        end
-        while true
-
-          _save5 = self.pos
-          while true # sequence
-            _save6 = self.pos
-            _tmp = match_string(">")
-            _tmp = _tmp ? nil : true
-            self.pos = _save6
-            unless _tmp
-              self.pos = _save5
-              break
-            end
-            _save7 = self.pos
-            _tmp = _BlankLine()
-            _tmp = _tmp ? nil : true
-            self.pos = _save7
-            unless _tmp
-              self.pos = _save5
-              break
-            end
-            _tmp = apply(:_Line)
-            c = @result
-            unless _tmp
-              self.pos = _save5
-              break
-            end
-            @result = begin;  a << c ; end
-            _tmp = true
-            unless _tmp
-              self.pos = _save5
-            end
-            break
-          end # end sequence
-
-          break unless _tmp
-        end
-        _tmp = true
-        unless _tmp
-          self.pos = _save2
-          break
-        end
-        while true
-
-          _save9 = self.pos
-          while true # sequence
-            _tmp = _BlankLine()
-            n = @result
-            unless _tmp
-              self.pos = _save9
-              break
-            end
-            @result = begin;  a << n ; end
-            _tmp = true
-            unless _tmp
-              self.pos = _save9
-            end
-            break
-          end # end sequence
-
-          break unless _tmp
-        end
-        _tmp = true
-        unless _tmp
-          self.pos = _save2
-        end
-        break
-      end # end sequence
-
-      if _tmp
-        while true
-
-          _save10 = self.pos
-          while true # sequence
-            _tmp = match_string(">")
-            unless _tmp
-              self.pos = _save10
-              break
-            end
-            _save11 = self.pos
-            _tmp = match_string(" ")
-            unless _tmp
-              _tmp = true
-              self.pos = _save11
-            end
-            unless _tmp
-              self.pos = _save10
-              break
-            end
-            _tmp = apply(:_Line)
-            l = @result
-            unless _tmp
-              self.pos = _save10
-              break
-            end
-            @result = begin;  a << l ; end
-            _tmp = true
-            unless _tmp
-              self.pos = _save10
-              break
-            end
-            while true
-
-              _save13 = self.pos
-              while true # sequence
-                _save14 = self.pos
-                _tmp = match_string(">")
-                _tmp = _tmp ? nil : true
-                self.pos = _save14
-                unless _tmp
-                  self.pos = _save13
-                  break
-                end
-                _save15 = self.pos
-                _tmp = _BlankLine()
-                _tmp = _tmp ? nil : true
-                self.pos = _save15
-                unless _tmp
-                  self.pos = _save13
-                  break
-                end
-                _tmp = apply(:_Line)
-                c = @result
-                unless _tmp
-                  self.pos = _save13
-                  break
-                end
-                @result = begin;  a << c ; end
-                _tmp = true
-                unless _tmp
-                  self.pos = _save13
-                end
-                break
-              end # end sequence
-
-              break unless _tmp
-            end
-            _tmp = true
-            unless _tmp
-              self.pos = _save10
-              break
-            end
-            while true
-
-              _save17 = self.pos
-              while true # sequence
-                _tmp = _BlankLine()
-                n = @result
-                unless _tmp
-                  self.pos = _save17
-                  break
-                end
-                @result = begin;  a << n ; end
-                _tmp = true
-                unless _tmp
-                  self.pos = _save17
-                end
-                break
-              end # end sequence
-
-              break unless _tmp
-            end
-            _tmp = true
-            unless _tmp
-              self.pos = _save10
-            end
-            break
-          end # end sequence
-
-          break unless _tmp
-        end
-        _tmp = true
-      else
-        self.pos = _save1
-      end
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      @result = begin;  inner_parse a.join ; end
-      _tmp = true
-      unless _tmp
-        self.pos = _save
-      end
-      break
-    end # end sequence
-
-    set_failed_rule :_BlockQuoteRaw unless _tmp
-    return _tmp
-  end
-
-  # NonblankIndentedLine = !@BlankLine IndentedLine
-  def _NonblankIndentedLine
-
-    _save = self.pos
-    while true # sequence
-      _save1 = self.pos
-      _tmp = _BlankLine()
-      _tmp = _tmp ? nil : true
-      self.pos = _save1
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = apply(:_IndentedLine)
-      unless _tmp
-        self.pos = _save
-      end
-      break
-    end # end sequence
-
-    set_failed_rule :_NonblankIndentedLine unless _tmp
-    return _tmp
-  end
-
-  # VerbatimChunk = @BlankLine*:a NonblankIndentedLine+:b { a.concat b }
-  def _VerbatimChunk
-
-    _save = self.pos
-    while true # sequence
-      _ary = []
-      while true
-        _tmp = _BlankLine()
-        _ary << @result if _tmp
-        break unless _tmp
-      end
-      _tmp = true
-      @result = _ary
-      a = @result
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _save2 = self.pos
-      _ary = []
-      _tmp = apply(:_NonblankIndentedLine)
-      if _tmp
-        _ary << @result
-        while true
-          _tmp = apply(:_NonblankIndentedLine)
-          _ary << @result if _tmp
-          break unless _tmp
-        end
-        _tmp = true
-        @result = _ary
-      else
-        self.pos = _save2
-      end
-      b = @result
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      @result = begin;  a.concat b ; end
-      _tmp = true
-      unless _tmp
-        self.pos = _save
-      end
-      break
-    end # end sequence
-
-    set_failed_rule :_VerbatimChunk unless _tmp
-    return _tmp
-  end
-
-  # Verbatim = VerbatimChunk+:a { RDoc::Markup::Verbatim.new(*a.flatten) }
-  def _Verbatim
-
-    _save = self.pos
-    while true # sequence
-      _save1 = self.pos
-      _ary = []
-      _tmp = apply(:_VerbatimChunk)
-      if _tmp
-        _ary << @result
-        while true
-          _tmp = apply(:_VerbatimChunk)
-          _ary << @result if _tmp
-          break unless _tmp
-        end
-        _tmp = true
-        @result = _ary
-      else
-        self.pos = _save1
-      end
-      a = @result
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      @result = begin;  RDoc::Markup::Verbatim.new(*a.flatten) ; end
-      _tmp = true
-      unless _tmp
-        self.pos = _save
-      end
-      break
-    end # end sequence
-
-    set_failed_rule :_Verbatim unless _tmp
-    return _tmp
-  end
-
-  # HorizontalRule = @NonindentSpace ("*" @Sp "*" @Sp "*" (@Sp "*")* | "-" @Sp "-" @Sp "-" (@Sp "-")* | "_" @Sp "_" @Sp "_" (@Sp "_")*) @Sp @Newline @BlankLine+ { RDoc::Markup::Rule.new 1 }
-  def _HorizontalRule
-
-    _save = self.pos
-    while true # sequence
-      _tmp = _NonindentSpace()
-      unless _tmp
-        self.pos = _save
-        break
-      end
-
-      _save1 = self.pos
-      while true # choice
-
-        _save2 = self.pos
-        while true # sequence
-          _tmp = match_string("*")
-          unless _tmp
-            self.pos = _save2
-            break
-          end
-          _tmp = _Sp()
-          unless _tmp
-            self.pos = _save2
-            break
-          end
-          _tmp = match_string("*")
-          unless _tmp
-            self.pos = _save2
-            break
-          end
-          _tmp = _Sp()
-          unless _tmp
-            self.pos = _save2
-            break
-          end
-          _tmp = match_string("*")
-          unless _tmp
-            self.pos = _save2
-            break
-          end
-          while true
-
-            _save4 = self.pos
-            while true # sequence
-              _tmp = _Sp()
-              unless _tmp
-                self.pos = _save4
-                break
-              end
-              _tmp = match_string("*")
-              unless _tmp
-                self.pos = _save4
-              end
-              break
-            end # end sequence
-
-            break unless _tmp
-          end
-          _tmp = true
-          unless _tmp
-            self.pos = _save2
-          end
-          break
-        end # end sequence
-
-        break if _tmp
-        self.pos = _save1
-
-        _save5 = self.pos
-        while true # sequence
-          _tmp = match_string("-")
-          unless _tmp
-            self.pos = _save5
-            break
-          end
-          _tmp = _Sp()
-          unless _tmp
-            self.pos = _save5
-            break
-          end
-          _tmp = match_string("-")
-          unless _tmp
-            self.pos = _save5
-            break
-          end
-          _tmp = _Sp()
-          unless _tmp
-            self.pos = _save5
-            break
-          end
-          _tmp = match_string("-")
-          unless _tmp
-            self.pos = _save5
-            break
-          end
-          while true
-
-            _save7 = self.pos
-            while true # sequence
-              _tmp = _Sp()
-              unless _tmp
-                self.pos = _save7
-                break
-              end
-              _tmp = match_string("-")
-              unless _tmp
-                self.pos = _save7
-              end
-              break
-            end # end sequence
-
-            break unless _tmp
-          end
-          _tmp = true
-          unless _tmp
-            self.pos = _save5
-          end
-          break
-        end # end sequence
-
-        break if _tmp
-        self.pos = _save1
-
-        _save8 = self.pos
-        while true # sequence
-          _tmp = match_string("_")
-          unless _tmp
-            self.pos = _save8
-            break
-          end
-          _tmp = _Sp()
-          unless _tmp
-            self.pos = _save8
-            break
-          end
-          _tmp = match_string("_")
-          unless _tmp
-            self.pos = _save8
-            break
-          end
-          _tmp = _Sp()
-          unless _tmp
-            self.pos = _save8
-            break
-          end
-          _tmp = match_string("_")
-          unless _tmp
-            self.pos = _save8
-            break
-          end
-          while true
-
-            _save10 = self.pos
-            while true # sequence
-              _tmp = _Sp()
-              unless _tmp
-                self.pos = _save10
-                break
-              end
-              _tmp = match_string("_")
-              unless _tmp
-                self.pos = _save10
-              end
-              break
-            end # end sequence
-
-            break unless _tmp
-          end
-          _tmp = true
-          unless _tmp
-            self.pos = _save8
-          end
-          break
-        end # end sequence
-
-        break if _tmp
-        self.pos = _save1
-        break
-      end # end choice
-
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = _Sp()
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = _Newline()
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _save11 = self.pos
-      _tmp = _BlankLine()
-      if _tmp
-        while true
-          _tmp = _BlankLine()
-          break unless _tmp
-        end
-        _tmp = true
-      else
-        self.pos = _save11
-      end
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      @result = begin;  RDoc::Markup::Rule.new 1 ; end
-      _tmp = true
-      unless _tmp
-        self.pos = _save
-      end
-      break
-    end # end sequence
-
-    set_failed_rule :_HorizontalRule unless _tmp
-    return _tmp
-  end
-
-  # Bullet = !HorizontalRule @NonindentSpace /[+*-]/ @Spacechar+
-  def _Bullet
-
-    _save = self.pos
-    while true # sequence
-      _save1 = self.pos
-      _tmp = apply(:_HorizontalRule)
-      _tmp = _tmp ? nil : true
-      self.pos = _save1
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = _NonindentSpace()
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = scan(/\G(?-mix:[+*-])/)
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _save2 = self.pos
-      _tmp = _Spacechar()
-      if _tmp
-        while true
-          _tmp = _Spacechar()
-          break unless _tmp
-        end
-        _tmp = true
-      else
-        self.pos = _save2
-      end
-      unless _tmp
-        self.pos = _save
-      end
-      break
-    end # end sequence
-
-    set_failed_rule :_Bullet unless _tmp
-    return _tmp
-  end
-
-  # BulletList = &Bullet (ListTight | ListLoose):a { RDoc::Markup::List.new(:BULLET, *a) }
-  def _BulletList
-
-    _save = self.pos
-    while true # sequence
-      _save1 = self.pos
-      _tmp = apply(:_Bullet)
-      self.pos = _save1
-      unless _tmp
-        self.pos = _save
-        break
-      end
-
-      _save2 = self.pos
-      while true # choice
-        _tmp = apply(:_ListTight)
-        break if _tmp
-        self.pos = _save2
-        _tmp = apply(:_ListLoose)
-        break if _tmp
-        self.pos = _save2
-        break
-      end # end choice
-
-      a = @result
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      @result = begin;  RDoc::Markup::List.new(:BULLET, *a) ; end
-      _tmp = true
-      unless _tmp
-        self.pos = _save
-      end
-      break
-    end # end sequence
-
-    set_failed_rule :_BulletList unless _tmp
-    return _tmp
-  end
-
-  # ListTight = ListItemTight+:a @BlankLine* !(Bullet | Enumerator) { a }
-  def _ListTight
-
-    _save = self.pos
-    while true # sequence
-      _save1 = self.pos
-      _ary = []
-      _tmp = apply(:_ListItemTight)
-      if _tmp
-        _ary << @result
-        while true
-          _tmp = apply(:_ListItemTight)
-          _ary << @result if _tmp
-          break unless _tmp
-        end
-        _tmp = true
-        @result = _ary
-      else
-        self.pos = _save1
-      end
-      a = @result
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      while true
-        _tmp = _BlankLine()
-        break unless _tmp
-      end
-      _tmp = true
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _save3 = self.pos
-
-      _save4 = self.pos
-      while true # choice
-        _tmp = apply(:_Bullet)
-        break if _tmp
-        self.pos = _save4
-        _tmp = apply(:_Enumerator)
-        break if _tmp
-        self.pos = _save4
-        break
-      end # end choice
-
-      _tmp = _tmp ? nil : true
-      self.pos = _save3
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      @result = begin;  a ; end
-      _tmp = true
-      unless _tmp
-        self.pos = _save
-      end
-      break
-    end # end sequence
-
-    set_failed_rule :_ListTight unless _tmp
-    return _tmp
-  end
-
-  # ListLoose = @StartList:a (ListItem:b @BlankLine* { a << b })+ { a }
-  def _ListLoose
-
-    _save = self.pos
-    while true # sequence
-      _tmp = _StartList()
-      a = @result
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _save1 = self.pos
-
-      _save2 = self.pos
-      while true # sequence
-        _tmp = apply(:_ListItem)
-        b = @result
-        unless _tmp
-          self.pos = _save2
-          break
-        end
-        while true
-          _tmp = _BlankLine()
-          break unless _tmp
-        end
-        _tmp = true
-        unless _tmp
-          self.pos = _save2
-          break
-        end
-        @result = begin;  a << b ; end
-        _tmp = true
-        unless _tmp
-          self.pos = _save2
-        end
-        break
-      end # end sequence
-
-      if _tmp
-        while true
-
-          _save4 = self.pos
-          while true # sequence
-            _tmp = apply(:_ListItem)
-            b = @result
-            unless _tmp
-              self.pos = _save4
-              break
-            end
-            while true
-              _tmp = _BlankLine()
-              break unless _tmp
-            end
-            _tmp = true
-            unless _tmp
-              self.pos = _save4
-              break
-            end
-            @result = begin;  a << b ; end
-            _tmp = true
-            unless _tmp
-              self.pos = _save4
-            end
-            break
-          end # end sequence
-
-          break unless _tmp
-        end
-        _tmp = true
-      else
-        self.pos = _save1
-      end
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      @result = begin;  a ; end
-      _tmp = true
-      unless _tmp
-        self.pos = _save
-      end
-      break
-    end # end sequence
-
-    set_failed_rule :_ListLoose unless _tmp
-    return _tmp
-  end
-
-  # ListItem = (Bullet | Enumerator) @StartList:a ListBlock:b { a << b } (ListContinuationBlock:c { a.push(*c) })* { list_item_from a }
-  def _ListItem
-
-    _save = self.pos
-    while true # sequence
-
-      _save1 = self.pos
-      while true # choice
-        _tmp = apply(:_Bullet)
-        break if _tmp
-        self.pos = _save1
-        _tmp = apply(:_Enumerator)
-        break if _tmp
-        self.pos = _save1
-        break
-      end # end choice
-
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = _StartList()
-      a = @result
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = apply(:_ListBlock)
-      b = @result
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      @result = begin;  a << b ; end
-      _tmp = true
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      while true
-
-        _save3 = self.pos
-        while true # sequence
-          _tmp = apply(:_ListContinuationBlock)
-          c = @result
-          unless _tmp
-            self.pos = _save3
-            break
-          end
-          @result = begin;  a.push(*c) ; end
-          _tmp = true
-          unless _tmp
-            self.pos = _save3
-          end
-          break
-        end # end sequence
-
-        break unless _tmp
-      end
-      _tmp = true
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      @result = begin;  list_item_from a ; end
-      _tmp = true
-      unless _tmp
-        self.pos = _save
-      end
-      break
-    end # end sequence
-
-    set_failed_rule :_ListItem unless _tmp
-    return _tmp
-  end
-
-  # ListItemTight = (Bullet | Enumerator) ListBlock:a (!@BlankLine ListContinuationBlock:b { a.push(*b) })* !ListContinuationBlock { list_item_from a }
-  def _ListItemTight
-
-    _save = self.pos
-    while true # sequence
-
-      _save1 = self.pos
-      while true # choice
-        _tmp = apply(:_Bullet)
-        break if _tmp
-        self.pos = _save1
-        _tmp = apply(:_Enumerator)
-        break if _tmp
-        self.pos = _save1
-        break
-      end # end choice
-
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = apply(:_ListBlock)
-      a = @result
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      while true
-
-        _save3 = self.pos
-        while true # sequence
-          _save4 = self.pos
-          _tmp = _BlankLine()
-          _tmp = _tmp ? nil : true
-          self.pos = _save4
-          unless _tmp
-            self.pos = _save3
-            break
-          end
-          _tmp = apply(:_ListContinuationBlock)
-          b = @result
-          unless _tmp
-            self.pos = _save3
-            break
-          end
-          @result = begin;  a.push(*b) ; end
-          _tmp = true
-          unless _tmp
-            self.pos = _save3
-          end
-          break
-        end # end sequence
-
-        break unless _tmp
-      end
-      _tmp = true
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _save5 = self.pos
-      _tmp = apply(:_ListContinuationBlock)
-      _tmp = _tmp ? nil : true
-      self.pos = _save5
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      @result = begin;  list_item_from a ; end
-      _tmp = true
-      unless _tmp
-        self.pos = _save
-      end
-      break
-    end # end sequence
-
-    set_failed_rule :_ListItemTight unless _tmp
-    return _tmp
-  end
-
-  # ListBlock = !@BlankLine Line:a ListBlockLine*:c { [a, *c] }
-  def _ListBlock
-
-    _save = self.pos
-    while true # sequence
-      _save1 = self.pos
-      _tmp = _BlankLine()
-      _tmp = _tmp ? nil : true
-      self.pos = _save1
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = apply(:_Line)
-      a = @result
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _ary = []
-      while true
-        _tmp = apply(:_ListBlockLine)
-        _ary << @result if _tmp
-        break unless _tmp
-      end
-      _tmp = true
-      @result = _ary
-      c = @result
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      @result = begin;  [a, *c] ; end
-      _tmp = true
-      unless _tmp
-        self.pos = _save
-      end
-      break
-    end # end sequence
-
-    set_failed_rule :_ListBlock unless _tmp
-    return _tmp
-  end
-
-  # ListContinuationBlock = @StartList:a @BlankLine* { a << "\n" } (Indent ListBlock:b { a.concat b })+ { a }
-  def _ListContinuationBlock
-
-    _save = self.pos
-    while true # sequence
-      _tmp = _StartList()
-      a = @result
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      while true
-        _tmp = _BlankLine()
-        break unless _tmp
-      end
-      _tmp = true
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      @result = begin;  a << "\n" ; end
-      _tmp = true
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _save2 = self.pos
-
-      _save3 = self.pos
-      while true # sequence
-        _tmp = apply(:_Indent)
-        unless _tmp
-          self.pos = _save3
-          break
-        end
-        _tmp = apply(:_ListBlock)
-        b = @result
-        unless _tmp
-          self.pos = _save3
-          break
-        end
-        @result = begin;  a.concat b ; end
-        _tmp = true
-        unless _tmp
-          self.pos = _save3
-        end
-        break
-      end # end sequence
-
-      if _tmp
-        while true
-
-          _save4 = self.pos
-          while true # sequence
-            _tmp = apply(:_Indent)
-            unless _tmp
-              self.pos = _save4
-              break
-            end
-            _tmp = apply(:_ListBlock)
-            b = @result
-            unless _tmp
-              self.pos = _save4
-              break
-            end
-            @result = begin;  a.concat b ; end
-            _tmp = true
-            unless _tmp
-              self.pos = _save4
-            end
-            break
-          end # end sequence
-
-          break unless _tmp
-        end
-        _tmp = true
-      else
-        self.pos = _save2
-      end
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      @result = begin;  a ; end
-      _tmp = true
-      unless _tmp
-        self.pos = _save
-      end
-      break
-    end # end sequence
-
-    set_failed_rule :_ListContinuationBlock unless _tmp
-    return _tmp
-  end
-
-  # Enumerator = @NonindentSpace [0-9]+ "." @Spacechar+
-  def _Enumerator
-
-    _save = self.pos
-    while true # sequence
-      _tmp = _NonindentSpace()
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _save1 = self.pos
-      _save2 = self.pos
-      _tmp = get_byte
-      if _tmp
-        unless _tmp >= 48 and _tmp <= 57
-          self.pos = _save2
-          _tmp = nil
-        end
-      end
-      if _tmp
-        while true
-          _save3 = self.pos
-          _tmp = get_byte
-          if _tmp
-            unless _tmp >= 48 and _tmp <= 57
-              self.pos = _save3
-              _tmp = nil
-            end
-          end
-          break unless _tmp
-        end
-        _tmp = true
-      else
-        self.pos = _save1
-      end
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = match_string(".")
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _save4 = self.pos
-      _tmp = _Spacechar()
-      if _tmp
-        while true
-          _tmp = _Spacechar()
-          break unless _tmp
-        end
-        _tmp = true
-      else
-        self.pos = _save4
-      end
-      unless _tmp
-        self.pos = _save
-      end
-      break
-    end # end sequence
-
-    set_failed_rule :_Enumerator unless _tmp
-    return _tmp
-  end
-
-  # OrderedList = &Enumerator (ListTight | ListLoose):a { RDoc::Markup::List.new(:NUMBER, *a) }
-  def _OrderedList
-
-    _save = self.pos
-    while true # sequence
-      _save1 = self.pos
-      _tmp = apply(:_Enumerator)
-      self.pos = _save1
-      unless _tmp
-        self.pos = _save
-        break
-      end
-
-      _save2 = self.pos
-      while true # choice
-        _tmp = apply(:_ListTight)
-        break if _tmp
-        self.pos = _save2
-        _tmp = apply(:_ListLoose)
-        break if _tmp
-        self.pos = _save2
-        break
-      end # end choice
-
-      a = @result
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      @result = begin;  RDoc::Markup::List.new(:NUMBER, *a) ; end
-      _tmp = true
-      unless _tmp
-        self.pos = _save
-      end
-      break
-    end # end sequence
-
-    set_failed_rule :_OrderedList unless _tmp
-    return _tmp
-  end
-
-  # ListBlockLine = !@BlankLine !(Indent? (Bullet | Enumerator)) !HorizontalRule OptionallyIndentedLine
-  def _ListBlockLine
-
-    _save = self.pos
-    while true # sequence
-      _save1 = self.pos
-      _tmp = _BlankLine()
-      _tmp = _tmp ? nil : true
-      self.pos = _save1
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _save2 = self.pos
-
-      _save3 = self.pos
-      while true # sequence
-        _save4 = self.pos
-        _tmp = apply(:_Indent)
-        unless _tmp
-          _tmp = true
-          self.pos = _save4
-        end
-        unless _tmp
-          self.pos = _save3
-          break
-        end
-
-        _save5 = self.pos
-        while true # choice
-          _tmp = apply(:_Bullet)
-          break if _tmp
-          self.pos = _save5
-          _tmp = apply(:_Enumerator)
-          break if _tmp
-          self.pos = _save5
-          break
-        end # end choice
-
-        unless _tmp
-          self.pos = _save3
-        end
-        break
-      end # end sequence
-
-      _tmp = _tmp ? nil : true
-      self.pos = _save2
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _save6 = self.pos
-      _tmp = apply(:_HorizontalRule)
-      _tmp = _tmp ? nil : true
-      self.pos = _save6
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = apply(:_OptionallyIndentedLine)
-      unless _tmp
-        self.pos = _save
-      end
-      break
-    end # end sequence
-
-    set_failed_rule :_ListBlockLine unless _tmp
-    return _tmp
-  end
-
-  # HtmlOpenAnchor = "<" Spnl ("a" | "A") Spnl HtmlAttribute* ">"
-  def _HtmlOpenAnchor
-
-    _save = self.pos
-    while true # sequence
-      _tmp = match_string("<")
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = apply(:_Spnl)
-      unless _tmp
-        self.pos = _save
-        break
-      end
-
-      _save1 = self.pos
-      while true # choice
-        _tmp = match_string("a")
-        break if _tmp
-        self.pos = _save1
-        _tmp = match_string("A")
-        break if _tmp
-        self.pos = _save1
-        break
-      end # end choice
-
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = apply(:_Spnl)
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      while true
-        _tmp = apply(:_HtmlAttribute)
-        break unless _tmp
-      end
-      _tmp = true
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = match_string(">")
-      unless _tmp
-        self.pos = _save
-      end
-      break
-    end # end sequence
-
-    set_failed_rule :_HtmlOpenAnchor unless _tmp
-    return _tmp
-  end
-
-  # HtmlCloseAnchor = "<" Spnl "/" ("a" | "A") Spnl ">"
-  def _HtmlCloseAnchor
-
-    _save = self.pos
-    while true # sequence
-      _tmp = match_string("<")
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = apply(:_Spnl)
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = match_string("/")
-      unless _tmp
-        self.pos = _save
-        break
-      end
-
-      _save1 = self.pos
-      while true # choice
-        _tmp = match_string("a")
-        break if _tmp
-        self.pos = _save1
-        _tmp = match_string("A")
-        break if _tmp
-        self.pos = _save1
-        break
-      end # end choice
-
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = apply(:_Spnl)
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = match_string(">")
-      unless _tmp
-        self.pos = _save
-      end
-      break
-    end # end sequence
-
-    set_failed_rule :_HtmlCloseAnchor unless _tmp
-    return _tmp
-  end
-
-  # HtmlAnchor = HtmlOpenAnchor (HtmlAnchor | !HtmlCloseAnchor .)* HtmlCloseAnchor
-  def _HtmlAnchor
-
-    _save = self.pos
-    while true # sequence
-      _tmp = apply(:_HtmlOpenAnchor)
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      while true
-
-        _save2 = self.pos
-        while true # choice
-          _tmp = apply(:_HtmlAnchor)
-          break if _tmp
-          self.pos = _save2
-
-          _save3 = self.pos
-          while true # sequence
-            _save4 = self.pos
-            _tmp = apply(:_HtmlCloseAnchor)
-            _tmp = _tmp ? nil : true
-            self.pos = _save4
-            unless _tmp
-              self.pos = _save3
-              break
-            end
-            _tmp = get_byte
-            unless _tmp
-              self.pos = _save3
-            end
-            break
-          end # end sequence
-
-          break if _tmp
-          self.pos = _save2
-          break
-        end # end choice
-
-        break unless _tmp
-      end
-      _tmp = true
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = apply(:_HtmlCloseAnchor)
-      unless _tmp
-        self.pos = _save
-      end
-      break
-    end # end sequence
-
-    set_failed_rule :_HtmlAnchor unless _tmp
-    return _tmp
-  end
-
-  # HtmlBlockOpenAddress = "<" Spnl ("address" | "ADDRESS") Spnl HtmlAttribute* ">"
-  def _HtmlBlockOpenAddress
-
-    _save = self.pos
-    while true # sequence
-      _tmp = match_string("<")
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = apply(:_Spnl)
-      unless _tmp
-        self.pos = _save
-        break
-      end
-
-      _save1 = self.pos
-      while true # choice
-        _tmp = match_string("address")
-        break if _tmp
-        self.pos = _save1
-        _tmp = match_string("ADDRESS")
-        break if _tmp
-        self.pos = _save1
-        break
-      end # end choice
-
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = apply(:_Spnl)
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      while true
-        _tmp = apply(:_HtmlAttribute)
-        break unless _tmp
-      end
-      _tmp = true
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = match_string(">")
-      unless _tmp
-        self.pos = _save
-      end
-      break
-    end # end sequence
-
-    set_failed_rule :_HtmlBlockOpenAddress unless _tmp
-    return _tmp
-  end
-
-  # HtmlBlockCloseAddress = "<" Spnl "/" ("address" | "ADDRESS") Spnl ">"
-  def _HtmlBlockCloseAddress
-
-    _save = self.pos
-    while true # sequence
-      _tmp = match_string("<")
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = apply(:_Spnl)
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = match_string("/")
-      unless _tmp
-        self.pos = _save
-        break
-      end
-
-      _save1 = self.pos
-      while true # choice
-        _tmp = match_string("address")
-        break if _tmp
-        self.pos = _save1
-        _tmp = match_string("ADDRESS")
-        break if _tmp
-        self.pos = _save1
-        break
-      end # end choice
-
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = apply(:_Spnl)
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = match_string(">")
-      unless _tmp
-        self.pos = _save
-      end
-      break
-    end # end sequence
-
-    set_failed_rule :_HtmlBlockCloseAddress unless _tmp
-    return _tmp
-  end
-
-  # HtmlBlockAddress = HtmlBlockOpenAddress (HtmlBlockAddress | !HtmlBlockCloseAddress .)* HtmlBlockCloseAddress
-  def _HtmlBlockAddress
-
-    _save = self.pos
-    while true # sequence
-      _tmp = apply(:_HtmlBlockOpenAddress)
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      while true
-
-        _save2 = self.pos
-        while true # choice
-          _tmp = apply(:_HtmlBlockAddress)
-          break if _tmp
-          self.pos = _save2
-
-          _save3 = self.pos
-          while true # sequence
-            _save4 = self.pos
-            _tmp = apply(:_HtmlBlockCloseAddress)
-            _tmp = _tmp ? nil : true
-            self.pos = _save4
-            unless _tmp
-              self.pos = _save3
-              break
-            end
-            _tmp = get_byte
-            unless _tmp
-              self.pos = _save3
-            end
-            break
-          end # end sequence
-
-          break if _tmp
-          self.pos = _save2
-          break
-        end # end choice
-
-        break unless _tmp
-      end
-      _tmp = true
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = apply(:_HtmlBlockCloseAddress)
-      unless _tmp
-        self.pos = _save
-      end
-      break
-    end # end sequence
-
-    set_failed_rule :_HtmlBlockAddress unless _tmp
-    return _tmp
-  end
-
-  # HtmlBlockOpenBlockquote = "<" Spnl ("blockquote" | "BLOCKQUOTE") Spnl HtmlAttribute* ">"
-  def _HtmlBlockOpenBlockquote
-
-    _save = self.pos
-    while true # sequence
-      _tmp = match_string("<")
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = apply(:_Spnl)
-      unless _tmp
-        self.pos = _save
-        break
-      end
-
-      _save1 = self.pos
-      while true # choice
-        _tmp = match_string("blockquote")
-        break if _tmp
-        self.pos = _save1
-        _tmp = match_string("BLOCKQUOTE")
-        break if _tmp
-        self.pos = _save1
-        break
-      end # end choice
-
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = apply(:_Spnl)
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      while true
-        _tmp = apply(:_HtmlAttribute)
-        break unless _tmp
-      end
-      _tmp = true
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = match_string(">")
-      unless _tmp
-        self.pos = _save
-      end
-      break
-    end # end sequence
-
-    set_failed_rule :_HtmlBlockOpenBlockquote unless _tmp
-    return _tmp
-  end
-
-  # HtmlBlockCloseBlockquote = "<" Spnl "/" ("blockquote" | "BLOCKQUOTE") Spnl ">"
-  def _HtmlBlockCloseBlockquote
-
-    _save = self.pos
-    while true # sequence
-      _tmp = match_string("<")
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = apply(:_Spnl)
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = match_string("/")
-      unless _tmp
-        self.pos = _save
-        break
-      end
-
-      _save1 = self.pos
-      while true # choice
-        _tmp = match_string("blockquote")
-        break if _tmp
-        self.pos = _save1
-        _tmp = match_string("BLOCKQUOTE")
-        break if _tmp
-        self.pos = _save1
-        break
-      end # end choice
-
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = apply(:_Spnl)
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = match_string(">")
-      unless _tmp
-        self.pos = _save
-      end
-      break
-    end # end sequence
-
-    set_failed_rule :_HtmlBlockCloseBlockquote unless _tmp
-    return _tmp
-  end
-
-  # HtmlBlockBlockquote = HtmlBlockOpenBlockquote (HtmlBlockBlockquote | !HtmlBlockCloseBlockquote .)* HtmlBlockCloseBlockquote
-  def _HtmlBlockBlockquote
-
-    _save = self.pos
-    while true # sequence
-      _tmp = apply(:_HtmlBlockOpenBlockquote)
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      while true
-
-        _save2 = self.pos
-        while true # choice
-          _tmp = apply(:_HtmlBlockBlockquote)
-          break if _tmp
-          self.pos = _save2
-
-          _save3 = self.pos
-          while true # sequence
-            _save4 = self.pos
-            _tmp = apply(:_HtmlBlockCloseBlockquote)
-            _tmp = _tmp ? nil : true
-            self.pos = _save4
-            unless _tmp
-              self.pos = _save3
-              break
-            end
-            _tmp = get_byte
-            unless _tmp
-              self.pos = _save3
-            end
-            break
-          end # end sequence
-
-          break if _tmp
-          self.pos = _save2
-          break
-        end # end choice
-
-        break unless _tmp
-      end
-      _tmp = true
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = apply(:_HtmlBlockCloseBlockquote)
-      unless _tmp
-        self.pos = _save
-      end
-      break
-    end # end sequence
-
-    set_failed_rule :_HtmlBlockBlockquote unless _tmp
-    return _tmp
-  end
-
-  # HtmlBlockOpenCenter = "<" Spnl ("center" | "CENTER") Spnl HtmlAttribute* ">"
-  def _HtmlBlockOpenCenter
-
-    _save = self.pos
-    while true # sequence
-      _tmp = match_string("<")
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = apply(:_Spnl)
-      unless _tmp
-        self.pos = _save
-        break
-      end
-
-      _save1 = self.pos
-      while true # choice
-        _tmp = match_string("center")
-        break if _tmp
-        self.pos = _save1
-        _tmp = match_string("CENTER")
-        break if _tmp
-        self.pos = _save1
-        break
-      end # end choice
-
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = apply(:_Spnl)
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      while true
-        _tmp = apply(:_HtmlAttribute)
-        break unless _tmp
-      end
-      _tmp = true
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = match_string(">")
-      unless _tmp
-        self.pos = _save
-      end
-      break
-    end # end sequence
-
-    set_failed_rule :_HtmlBlockOpenCenter unless _tmp
-    return _tmp
-  end
-
-  # HtmlBlockCloseCenter = "<" Spnl "/" ("center" | "CENTER") Spnl ">"
-  def _HtmlBlockCloseCenter
-
-    _save = self.pos
-    while true # sequence
-      _tmp = match_string("<")
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = apply(:_Spnl)
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = match_string("/")
-      unless _tmp
-        self.pos = _save
-        break
-      end
-
-      _save1 = self.pos
-      while true # choice
-        _tmp = match_string("center")
-        break if _tmp
-        self.pos = _save1
-        _tmp = match_string("CENTER")
-        break if _tmp
-        self.pos = _save1
-        break
-      end # end choice
-
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = apply(:_Spnl)
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = match_string(">")
-      unless _tmp
-        self.pos = _save
-      end
-      break
-    end # end sequence
-
-    set_failed_rule :_HtmlBlockCloseCenter unless _tmp
-    return _tmp
-  end
-
-  # HtmlBlockCenter = HtmlBlockOpenCenter (HtmlBlockCenter | !HtmlBlockCloseCenter .)* HtmlBlockCloseCenter
-  def _HtmlBlockCenter
-
-    _save = self.pos
-    while true # sequence
-      _tmp = apply(:_HtmlBlockOpenCenter)
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      while true
-
-        _save2 = self.pos
-        while true # choice
-          _tmp = apply(:_HtmlBlockCenter)
-          break if _tmp
-          self.pos = _save2
-
-          _save3 = self.pos
-          while true # sequence
-            _save4 = self.pos
-            _tmp = apply(:_HtmlBlockCloseCenter)
-            _tmp = _tmp ? nil : true
-            self.pos = _save4
-            unless _tmp
-              self.pos = _save3
-              break
-            end
-            _tmp = get_byte
-            unless _tmp
-              self.pos = _save3
-            end
-            break
-          end # end sequence
-
-          break if _tmp
-          self.pos = _save2
-          break
-        end # end choice
-
-        break unless _tmp
-      end
-      _tmp = true
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = apply(:_HtmlBlockCloseCenter)
-      unless _tmp
-        self.pos = _save
-      end
-      break
-    end # end sequence
-
-    set_failed_rule :_HtmlBlockCenter unless _tmp
-    return _tmp
-  end
-
-  # HtmlBlockOpenDir = "<" Spnl ("dir" | "DIR") Spnl HtmlAttribute* ">"
-  def _HtmlBlockOpenDir
-
-    _save = self.pos
-    while true # sequence
-      _tmp = match_string("<")
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = apply(:_Spnl)
-      unless _tmp
-        self.pos = _save
-        break
-      end
-
-      _save1 = self.pos
-      while true # choice
-        _tmp = match_string("dir")
-        break if _tmp
-        self.pos = _save1
-        _tmp = match_string("DIR")
-        break if _tmp
-        self.pos = _save1
-        break
-      end # end choice
-
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = apply(:_Spnl)
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      while true
-        _tmp = apply(:_HtmlAttribute)
-        break unless _tmp
-      end
-      _tmp = true
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = match_string(">")
-      unless _tmp
-        self.pos = _save
-      end
-      break
-    end # end sequence
-
-    set_failed_rule :_HtmlBlockOpenDir unless _tmp
-    return _tmp
-  end
-
-  # HtmlBlockCloseDir = "<" Spnl "/" ("dir" | "DIR") Spnl ">"
-  def _HtmlBlockCloseDir
-
-    _save = self.pos
-    while true # sequence
-      _tmp = match_string("<")
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = apply(:_Spnl)
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = match_string("/")
-      unless _tmp
-        self.pos = _save
-        break
-      end
-
-      _save1 = self.pos
-      while true # choice
-        _tmp = match_string("dir")
-        break if _tmp
-        self.pos = _save1
-        _tmp = match_string("DIR")
-        break if _tmp
-        self.pos = _save1
-        break
-      end # end choice
-
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = apply(:_Spnl)
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = match_string(">")
-      unless _tmp
-        self.pos = _save
-      end
-      break
-    end # end sequence
-
-    set_failed_rule :_HtmlBlockCloseDir unless _tmp
-    return _tmp
-  end
-
-  # HtmlBlockDir = HtmlBlockOpenDir (HtmlBlockDir | !HtmlBlockCloseDir .)* HtmlBlockCloseDir
-  def _HtmlBlockDir
-
-    _save = self.pos
-    while true # sequence
-      _tmp = apply(:_HtmlBlockOpenDir)
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      while true
-
-        _save2 = self.pos
-        while true # choice
-          _tmp = apply(:_HtmlBlockDir)
-          break if _tmp
-          self.pos = _save2
-
-          _save3 = self.pos
-          while true # sequence
-            _save4 = self.pos
-            _tmp = apply(:_HtmlBlockCloseDir)
-            _tmp = _tmp ? nil : true
-            self.pos = _save4
-            unless _tmp
-              self.pos = _save3
-              break
-            end
-            _tmp = get_byte
-            unless _tmp
-              self.pos = _save3
-            end
-            break
-          end # end sequence
-
-          break if _tmp
-          self.pos = _save2
-          break
-        end # end choice
-
-        break unless _tmp
-      end
-      _tmp = true
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = apply(:_HtmlBlockCloseDir)
-      unless _tmp
-        self.pos = _save
-      end
-      break
-    end # end sequence
-
-    set_failed_rule :_HtmlBlockDir unless _tmp
-    return _tmp
-  end
-
-  # HtmlBlockOpenDiv = "<" Spnl ("div" | "DIV") Spnl HtmlAttribute* ">"
-  def _HtmlBlockOpenDiv
-
-    _save = self.pos
-    while true # sequence
-      _tmp = match_string("<")
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = apply(:_Spnl)
-      unless _tmp
-        self.pos = _save
-        break
-      end
-
-      _save1 = self.pos
-      while true # choice
-        _tmp = match_string("div")
-        break if _tmp
-        self.pos = _save1
-        _tmp = match_string("DIV")
-        break if _tmp
-        self.pos = _save1
-        break
-      end # end choice
-
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = apply(:_Spnl)
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      while true
-        _tmp = apply(:_HtmlAttribute)
-        break unless _tmp
-      end
-      _tmp = true
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = match_string(">")
-      unless _tmp
-        self.pos = _save
-      end
-      break
-    end # end sequence
-
-    set_failed_rule :_HtmlBlockOpenDiv unless _tmp
-    return _tmp
-  end
-
-  # HtmlBlockCloseDiv = "<" Spnl "/" ("div" | "DIV") Spnl ">"
-  def _HtmlBlockCloseDiv
-
-    _save = self.pos
-    while true # sequence
-      _tmp = match_string("<")
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = apply(:_Spnl)
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = match_string("/")
-      unless _tmp
-        self.pos = _save
-        break
-      end
-
-      _save1 = self.pos
-      while true # choice
-        _tmp = match_string("div")
-        break if _tmp
-        self.pos = _save1
-        _tmp = match_string("DIV")
-        break if _tmp
-        self.pos = _save1
-        break
-      end # end choice
-
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = apply(:_Spnl)
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = match_string(">")
-      unless _tmp
-        self.pos = _save
-      end
-      break
-    end # end sequence
-
-    set_failed_rule :_HtmlBlockCloseDiv unless _tmp
-    return _tmp
-  end
-
-  # HtmlBlockDiv = HtmlBlockOpenDiv (HtmlBlockDiv | !HtmlBlockCloseDiv .)* HtmlBlockCloseDiv
-  def _HtmlBlockDiv
-
-    _save = self.pos
-    while true # sequence
-      _tmp = apply(:_HtmlBlockOpenDiv)
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      while true
-
-        _save2 = self.pos
-        while true # choice
-          _tmp = apply(:_HtmlBlockDiv)
-          break if _tmp
-          self.pos = _save2
-
-          _save3 = self.pos
-          while true # sequence
-            _save4 = self.pos
-            _tmp = apply(:_HtmlBlockCloseDiv)
-            _tmp = _tmp ? nil : true
-            self.pos = _save4
-            unless _tmp
-              self.pos = _save3
-              break
-            end
-            _tmp = get_byte
-            unless _tmp
-              self.pos = _save3
-            end
-            break
-          end # end sequence
-
-          break if _tmp
-          self.pos = _save2
-          break
-        end # end choice
-
-        break unless _tmp
-      end
-      _tmp = true
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = apply(:_HtmlBlockCloseDiv)
-      unless _tmp
-        self.pos = _save
-      end
-      break
-    end # end sequence
-
-    set_failed_rule :_HtmlBlockDiv unless _tmp
-    return _tmp
-  end
-
-  # HtmlBlockOpenDl = "<" Spnl ("dl" | "DL") Spnl HtmlAttribute* ">"
-  def _HtmlBlockOpenDl
-
-    _save = self.pos
-    while true # sequence
-      _tmp = match_string("<")
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = apply(:_Spnl)
-      unless _tmp
-        self.pos = _save
-        break
-      end
-
-      _save1 = self.pos
-      while true # choice
-        _tmp = match_string("dl")
-        break if _tmp
-        self.pos = _save1
-        _tmp = match_string("DL")
-        break if _tmp
-        self.pos = _save1
-        break
-      end # end choice
-
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = apply(:_Spnl)
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      while true
-        _tmp = apply(:_HtmlAttribute)
-        break unless _tmp
-      end
-      _tmp = true
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = match_string(">")
-      unless _tmp
-        self.pos = _save
-      end
-      break
-    end # end sequence
-
-    set_failed_rule :_HtmlBlockOpenDl unless _tmp
-    return _tmp
-  end
-
-  # HtmlBlockCloseDl = "<" Spnl "/" ("dl" | "DL") Spnl ">"
-  def _HtmlBlockCloseDl
-
-    _save = self.pos
-    while true # sequence
-      _tmp = match_string("<")
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = apply(:_Spnl)
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = match_string("/")
-      unless _tmp
-        self.pos = _save
-        break
-      end
-
-      _save1 = self.pos
-      while true # choice
-        _tmp = match_string("dl")
-        break if _tmp
-        self.pos = _save1
-        _tmp = match_string("DL")
-        break if _tmp
-        self.pos = _save1
-        break
-      end # end choice
-
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = apply(:_Spnl)
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = match_string(">")
-      unless _tmp
-        self.pos = _save
-      end
-      break
-    end # end sequence
-
-    set_failed_rule :_HtmlBlockCloseDl unless _tmp
-    return _tmp
-  end
-
-  # HtmlBlockDl = HtmlBlockOpenDl (HtmlBlockDl | !HtmlBlockCloseDl .)* HtmlBlockCloseDl
-  def _HtmlBlockDl
-
-    _save = self.pos
-    while true # sequence
-      _tmp = apply(:_HtmlBlockOpenDl)
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      while true
-
-        _save2 = self.pos
-        while true # choice
-          _tmp = apply(:_HtmlBlockDl)
-          break if _tmp
-          self.pos = _save2
-
-          _save3 = self.pos
-          while true # sequence
-            _save4 = self.pos
-            _tmp = apply(:_HtmlBlockCloseDl)
-            _tmp = _tmp ? nil : true
-            self.pos = _save4
-            unless _tmp
-              self.pos = _save3
-              break
-            end
-            _tmp = get_byte
-            unless _tmp
-              self.pos = _save3
-            end
-            break
-          end # end sequence
-
-          break if _tmp
-          self.pos = _save2
-          break
-        end # end choice
-
-        break unless _tmp
-      end
-      _tmp = true
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = apply(:_HtmlBlockCloseDl)
-      unless _tmp
-        self.pos = _save
-      end
-      break
-    end # end sequence
-
-    set_failed_rule :_HtmlBlockDl unless _tmp
-    return _tmp
-  end
-
-  # HtmlBlockOpenFieldset = "<" Spnl ("fieldset" | "FIELDSET") Spnl HtmlAttribute* ">"
-  def _HtmlBlockOpenFieldset
-
-    _save = self.pos
-    while true # sequence
-      _tmp = match_string("<")
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = apply(:_Spnl)
-      unless _tmp
-        self.pos = _save
-        break
-      end
-
-      _save1 = self.pos
-      while true # choice
-        _tmp = match_string("fieldset")
-        break if _tmp
-        self.pos = _save1
-        _tmp = match_string("FIELDSET")
-        break if _tmp
-        self.pos = _save1
-        break
-      end # end choice
-
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = apply(:_Spnl)
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      while true
-        _tmp = apply(:_HtmlAttribute)
-        break unless _tmp
-      end
-      _tmp = true
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = match_string(">")
-      unless _tmp
-        self.pos = _save
-      end
-      break
-    end # end sequence
-
-    set_failed_rule :_HtmlBlockOpenFieldset unless _tmp
-    return _tmp
-  end
-
-  # HtmlBlockCloseFieldset = "<" Spnl "/" ("fieldset" | "FIELDSET") Spnl ">"
-  def _HtmlBlockCloseFieldset
-
-    _save = self.pos
-    while true # sequence
-      _tmp = match_string("<")
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = apply(:_Spnl)
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = match_string("/")
-      unless _tmp
-        self.pos = _save
-        break
-      end
-
-      _save1 = self.pos
-      while true # choice
-        _tmp = match_string("fieldset")
-        break if _tmp
-        self.pos = _save1
-        _tmp = match_string("FIELDSET")
-        break if _tmp
-        self.pos = _save1
-        break
-      end # end choice
-
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = apply(:_Spnl)
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = match_string(">")
-      unless _tmp
-        self.pos = _save
-      end
-      break
-    end # end sequence
-
-    set_failed_rule :_HtmlBlockCloseFieldset unless _tmp
-    return _tmp
-  end
-
-  # HtmlBlockFieldset = HtmlBlockOpenFieldset (HtmlBlockFieldset | !HtmlBlockCloseFieldset .)* HtmlBlockCloseFieldset
-  def _HtmlBlockFieldset
-
-    _save = self.pos
-    while true # sequence
-      _tmp = apply(:_HtmlBlockOpenFieldset)
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      while true
-
-        _save2 = self.pos
-        while true # choice
-          _tmp = apply(:_HtmlBlockFieldset)
-          break if _tmp
-          self.pos = _save2
-
-          _save3 = self.pos
-          while true # sequence
-            _save4 = self.pos
-            _tmp = apply(:_HtmlBlockCloseFieldset)
-            _tmp = _tmp ? nil : true
-            self.pos = _save4
-            unless _tmp
-              self.pos = _save3
-              break
-            end
-            _tmp = get_byte
-            unless _tmp
-              self.pos = _save3
-            end
-            break
-          end # end sequence
-
-          break if _tmp
-          self.pos = _save2
-          break
-        end # end choice
-
-        break unless _tmp
-      end
-      _tmp = true
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = apply(:_HtmlBlockCloseFieldset)
-      unless _tmp
-        self.pos = _save
-      end
-      break
-    end # end sequence
-
-    set_failed_rule :_HtmlBlockFieldset unless _tmp
-    return _tmp
-  end
-
-  # HtmlBlockOpenForm = "<" Spnl ("form" | "FORM") Spnl HtmlAttribute* ">"
-  def _HtmlBlockOpenForm
-
-    _save = self.pos
-    while true # sequence
-      _tmp = match_string("<")
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = apply(:_Spnl)
-      unless _tmp
-        self.pos = _save
-        break
-      end
-
-      _save1 = self.pos
-      while true # choice
-        _tmp = match_string("form")
-        break if _tmp
-        self.pos = _save1
-        _tmp = match_string("FORM")
-        break if _tmp
-        self.pos = _save1
-        break
-      end # end choice
-
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = apply(:_Spnl)
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      while true
-        _tmp = apply(:_HtmlAttribute)
-        break unless _tmp
-      end
-      _tmp = true
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = match_string(">")
-      unless _tmp
-        self.pos = _save
-      end
-      break
-    end # end sequence
-
-    set_failed_rule :_HtmlBlockOpenForm unless _tmp
-    return _tmp
-  end
-
-  # HtmlBlockCloseForm = "<" Spnl "/" ("form" | "FORM") Spnl ">"
-  def _HtmlBlockCloseForm
-
-    _save = self.pos
-    while true # sequence
-      _tmp = match_string("<")
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = apply(:_Spnl)
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = match_string("/")
-      unless _tmp
-        self.pos = _save
-        break
-      end
-
-      _save1 = self.pos
-      while true # choice
-        _tmp = match_string("form")
-        break if _tmp
-        self.pos = _save1
-        _tmp = match_string("FORM")
-        break if _tmp
-        self.pos = _save1
-        break
-      end # end choice
-
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = apply(:_Spnl)
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = match_string(">")
-      unless _tmp
-        self.pos = _save
-      end
-      break
-    end # end sequence
-
-    set_failed_rule :_HtmlBlockCloseForm unless _tmp
-    return _tmp
-  end
-
-  # HtmlBlockForm = HtmlBlockOpenForm (HtmlBlockForm | !HtmlBlockCloseForm .)* HtmlBlockCloseForm
-  def _HtmlBlockForm
-
-    _save = self.pos
-    while true # sequence
-      _tmp = apply(:_HtmlBlockOpenForm)
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      while true
-
-        _save2 = self.pos
-        while true # choice
-          _tmp = apply(:_HtmlBlockForm)
-          break if _tmp
-          self.pos = _save2
-
-          _save3 = self.pos
-          while true # sequence
-            _save4 = self.pos
-            _tmp = apply(:_HtmlBlockCloseForm)
-            _tmp = _tmp ? nil : true
-            self.pos = _save4
-            unless _tmp
-              self.pos = _save3
-              break
-            end
-            _tmp = get_byte
-            unless _tmp
-              self.pos = _save3
-            end
-            break
-          end # end sequence
-
-          break if _tmp
-          self.pos = _save2
-          break
-        end # end choice
-
-        break unless _tmp
-      end
-      _tmp = true
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = apply(:_HtmlBlockCloseForm)
-      unless _tmp
-        self.pos = _save
-      end
-      break
-    end # end sequence
-
-    set_failed_rule :_HtmlBlockForm unless _tmp
-    return _tmp
-  end
-
-  # HtmlBlockOpenH1 = "<" Spnl ("h1" | "H1") Spnl HtmlAttribute* ">"
-  def _HtmlBlockOpenH1
-
-    _save = self.pos
-    while true # sequence
-      _tmp = match_string("<")
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = apply(:_Spnl)
-      unless _tmp
-        self.pos = _save
-        break
-      end
-
-      _save1 = self.pos
-      while true # choice
-        _tmp = match_string("h1")
-        break if _tmp
-        self.pos = _save1
-        _tmp = match_string("H1")
-        break if _tmp
-        self.pos = _save1
-        break
-      end # end choice
-
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = apply(:_Spnl)
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      while true
-        _tmp = apply(:_HtmlAttribute)
-        break unless _tmp
-      end
-      _tmp = true
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = match_string(">")
-      unless _tmp
-        self.pos = _save
-      end
-      break
-    end # end sequence
-
-    set_failed_rule :_HtmlBlockOpenH1 unless _tmp
-    return _tmp
-  end
-
-  # HtmlBlockCloseH1 = "<" Spnl "/" ("h1" | "H1") Spnl ">"
-  def _HtmlBlockCloseH1
-
-    _save = self.pos
-    while true # sequence
-      _tmp = match_string("<")
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = apply(:_Spnl)
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = match_string("/")
-      unless _tmp
-        self.pos = _save
-        break
-      end
-
-      _save1 = self.pos
-      while true # choice
-        _tmp = match_string("h1")
-        break if _tmp
-        self.pos = _save1
-        _tmp = match_string("H1")
-        break if _tmp
-        self.pos = _save1
-        break
-      end # end choice
-
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = apply(:_Spnl)
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = match_string(">")
-      unless _tmp
-        self.pos = _save
-      end
-      break
-    end # end sequence
-
-    set_failed_rule :_HtmlBlockCloseH1 unless _tmp
-    return _tmp
-  end
-
-  # HtmlBlockH1 = HtmlBlockOpenH1 (HtmlBlockH1 | !HtmlBlockCloseH1 .)* HtmlBlockCloseH1
-  def _HtmlBlockH1
-
-    _save = self.pos
-    while true # sequence
-      _tmp = apply(:_HtmlBlockOpenH1)
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      while true
-
-        _save2 = self.pos
-        while true # choice
-          _tmp = apply(:_HtmlBlockH1)
-          break if _tmp
-          self.pos = _save2
-
-          _save3 = self.pos
-          while true # sequence
-            _save4 = self.pos
-            _tmp = apply(:_HtmlBlockCloseH1)
-            _tmp = _tmp ? nil : true
-            self.pos = _save4
-            unless _tmp
-              self.pos = _save3
-              break
-            end
-            _tmp = get_byte
-            unless _tmp
-              self.pos = _save3
-            end
-            break
-          end # end sequence
-
-          break if _tmp
-          self.pos = _save2
-          break
-        end # end choice
-
-        break unless _tmp
-      end
-      _tmp = true
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = apply(:_HtmlBlockCloseH1)
-      unless _tmp
-        self.pos = _save
-      end
-      break
-    end # end sequence
-
-    set_failed_rule :_HtmlBlockH1 unless _tmp
-    return _tmp
-  end
-
-  # HtmlBlockOpenH2 = "<" Spnl ("h2" | "H2") Spnl HtmlAttribute* ">"
-  def _HtmlBlockOpenH2
-
-    _save = self.pos
-    while true # sequence
-      _tmp = match_string("<")
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = apply(:_Spnl)
-      unless _tmp
-        self.pos = _save
-        break
-      end
-
-      _save1 = self.pos
-      while true # choice
-        _tmp = match_string("h2")
-        break if _tmp
-        self.pos = _save1
-        _tmp = match_string("H2")
-        break if _tmp
-        self.pos = _save1
-        break
-      end # end choice
-
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = apply(:_Spnl)
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      while true
-        _tmp = apply(:_HtmlAttribute)
-        break unless _tmp
-      end
-      _tmp = true
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = match_string(">")
-      unless _tmp
-        self.pos = _save
-      end
-      break
-    end # end sequence
-
-    set_failed_rule :_HtmlBlockOpenH2 unless _tmp
-    return _tmp
-  end
-
-  # HtmlBlockCloseH2 = "<" Spnl "/" ("h2" | "H2") Spnl ">"
-  def _HtmlBlockCloseH2
-
-    _save = self.pos
-    while true # sequence
-      _tmp = match_string("<")
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = apply(:_Spnl)
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = match_string("/")
-      unless _tmp
-        self.pos = _save
-        break
-      end
-
-      _save1 = self.pos
-      while true # choice
-        _tmp = match_string("h2")
-        break if _tmp
-        self.pos = _save1
-        _tmp = match_string("H2")
-        break if _tmp
-        self.pos = _save1
-        break
-      end # end choice
-
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = apply(:_Spnl)
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = match_string(">")
-      unless _tmp
-        self.pos = _save
-      end
-      break
-    end # end sequence
-
-    set_failed_rule :_HtmlBlockCloseH2 unless _tmp
-    return _tmp
-  end
-
-  # HtmlBlockH2 = HtmlBlockOpenH2 (HtmlBlockH2 | !HtmlBlockCloseH2 .)* HtmlBlockCloseH2
-  def _HtmlBlockH2
-
-    _save = self.pos
-    while true # sequence
-      _tmp = apply(:_HtmlBlockOpenH2)
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      while true
-
-        _save2 = self.pos
-        while true # choice
-          _tmp = apply(:_HtmlBlockH2)
-          break if _tmp
-          self.pos = _save2
-
-          _save3 = self.pos
-          while true # sequence
-            _save4 = self.pos
-            _tmp = apply(:_HtmlBlockCloseH2)
-            _tmp = _tmp ? nil : true
-            self.pos = _save4
-            unless _tmp
-              self.pos = _save3
-              break
-            end
-            _tmp = get_byte
-            unless _tmp
-              self.pos = _save3
-            end
-            break
-          end # end sequence
-
-          break if _tmp
-          self.pos = _save2
-          break
-        end # end choice
-
-        break unless _tmp
-      end
-      _tmp = true
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = apply(:_HtmlBlockCloseH2)
-      unless _tmp
-        self.pos = _save
-      end
-      break
-    end # end sequence
-
-    set_failed_rule :_HtmlBlockH2 unless _tmp
-    return _tmp
-  end
-
-  # HtmlBlockOpenH3 = "<" Spnl ("h3" | "H3") Spnl HtmlAttribute* ">"
-  def _HtmlBlockOpenH3
-
-    _save = self.pos
-    while true # sequence
-      _tmp = match_string("<")
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = apply(:_Spnl)
-      unless _tmp
-        self.pos = _save
-        break
-      end
-
-      _save1 = self.pos
-      while true # choice
-        _tmp = match_string("h3")
-        break if _tmp
-        self.pos = _save1
-        _tmp = match_string("H3")
-        break if _tmp
-        self.pos = _save1
-        break
-      end # end choice
-
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = apply(:_Spnl)
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      while true
-        _tmp = apply(:_HtmlAttribute)
-        break unless _tmp
-      end
-      _tmp = true
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = match_string(">")
-      unless _tmp
-        self.pos = _save
-      end
-      break
-    end # end sequence
-
-    set_failed_rule :_HtmlBlockOpenH3 unless _tmp
-    return _tmp
-  end
-
-  # HtmlBlockCloseH3 = "<" Spnl "/" ("h3" | "H3") Spnl ">"
-  def _HtmlBlockCloseH3
-
-    _save = self.pos
-    while true # sequence
-      _tmp = match_string("<")
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = apply(:_Spnl)
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = match_string("/")
-      unless _tmp
-        self.pos = _save
-        break
-      end
-
-      _save1 = self.pos
-      while true # choice
-        _tmp = match_string("h3")
-        break if _tmp
-        self.pos = _save1
-        _tmp = match_string("H3")
-        break if _tmp
-        self.pos = _save1
-        break
-      end # end choice
-
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = apply(:_Spnl)
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = match_string(">")
-      unless _tmp
-        self.pos = _save
-      end
-      break
-    end # end sequence
-
-    set_failed_rule :_HtmlBlockCloseH3 unless _tmp
-    return _tmp
-  end
-
-  # HtmlBlockH3 = HtmlBlockOpenH3 (HtmlBlockH3 | !HtmlBlockCloseH3 .)* HtmlBlockCloseH3
-  def _HtmlBlockH3
-
-    _save = self.pos
-    while true # sequence
-      _tmp = apply(:_HtmlBlockOpenH3)
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      while true
-
-        _save2 = self.pos
-        while true # choice
-          _tmp = apply(:_HtmlBlockH3)
-          break if _tmp
-          self.pos = _save2
-
-          _save3 = self.pos
-          while true # sequence
-            _save4 = self.pos
-            _tmp = apply(:_HtmlBlockCloseH3)
-            _tmp = _tmp ? nil : true
-            self.pos = _save4
-            unless _tmp
-              self.pos = _save3
-              break
-            end
-            _tmp = get_byte
-            unless _tmp
-              self.pos = _save3
-            end
-            break
-          end # end sequence
-
-          break if _tmp
-          self.pos = _save2
-          break
-        end # end choice
-
-        break unless _tmp
-      end
-      _tmp = true
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = apply(:_HtmlBlockCloseH3)
-      unless _tmp
-        self.pos = _save
-      end
-      break
-    end # end sequence
-
-    set_failed_rule :_HtmlBlockH3 unless _tmp
-    return _tmp
-  end
-
-  # HtmlBlockOpenH4 = "<" Spnl ("h4" | "H4") Spnl HtmlAttribute* ">"
-  def _HtmlBlockOpenH4
-
-    _save = self.pos
-    while true # sequence
-      _tmp = match_string("<")
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = apply(:_Spnl)
-      unless _tmp
-        self.pos = _save
-        break
-      end
-
-      _save1 = self.pos
-      while true # choice
-        _tmp = match_string("h4")
-        break if _tmp
-        self.pos = _save1
-        _tmp = match_string("H4")
-        break if _tmp
-        self.pos = _save1
-        break
-      end # end choice
-
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = apply(:_Spnl)
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      while true
-        _tmp = apply(:_HtmlAttribute)
-        break unless _tmp
-      end
-      _tmp = true
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = match_string(">")
-      unless _tmp
-        self.pos = _save
-      end
-      break
-    end # end sequence
-
-    set_failed_rule :_HtmlBlockOpenH4 unless _tmp
-    return _tmp
-  end
-
-  # HtmlBlockCloseH4 = "<" Spnl "/" ("h4" | "H4") Spnl ">"
-  def _HtmlBlockCloseH4
-
-    _save = self.pos
-    while true # sequence
-      _tmp = match_string("<")
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = apply(:_Spnl)
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = match_string("/")
-      unless _tmp
-        self.pos = _save
-        break
-      end
-
-      _save1 = self.pos
-      while true # choice
-        _tmp = match_string("h4")
-        break if _tmp
-        self.pos = _save1
-        _tmp = match_string("H4")
-        break if _tmp
-        self.pos = _save1
-        break
-      end # end choice
-
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = apply(:_Spnl)
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = match_string(">")
-      unless _tmp
-        self.pos = _save
-      end
-      break
-    end # end sequence
-
-    set_failed_rule :_HtmlBlockCloseH4 unless _tmp
-    return _tmp
-  end
-
-  # HtmlBlockH4 = HtmlBlockOpenH4 (HtmlBlockH4 | !HtmlBlockCloseH4 .)* HtmlBlockCloseH4
-  def _HtmlBlockH4
-
-    _save = self.pos
-    while true # sequence
-      _tmp = apply(:_HtmlBlockOpenH4)
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      while true
-
-        _save2 = self.pos
-        while true # choice
-          _tmp = apply(:_HtmlBlockH4)
-          break if _tmp
-          self.pos = _save2
-
-          _save3 = self.pos
-          while true # sequence
-            _save4 = self.pos
-            _tmp = apply(:_HtmlBlockCloseH4)
-            _tmp = _tmp ? nil : true
-            self.pos = _save4
-            unless _tmp
-              self.pos = _save3
-              break
-            end
-            _tmp = get_byte
-            unless _tmp
-              self.pos = _save3
-            end
-            break
-          end # end sequence
-
-          break if _tmp
-          self.pos = _save2
-          break
-        end # end choice
-
-        break unless _tmp
-      end
-      _tmp = true
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = apply(:_HtmlBlockCloseH4)
-      unless _tmp
-        self.pos = _save
-      end
-      break
-    end # end sequence
-
-    set_failed_rule :_HtmlBlockH4 unless _tmp
-    return _tmp
-  end
-
-  # HtmlBlockOpenH5 = "<" Spnl ("h5" | "H5") Spnl HtmlAttribute* ">"
-  def _HtmlBlockOpenH5
-
-    _save = self.pos
-    while true # sequence
-      _tmp = match_string("<")
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = apply(:_Spnl)
-      unless _tmp
-        self.pos = _save
-        break
-      end
-
-      _save1 = self.pos
-      while true # choice
-        _tmp = match_string("h5")
-        break if _tmp
-        self.pos = _save1
-        _tmp = match_string("H5")
-        break if _tmp
-        self.pos = _save1
-        break
-      end # end choice
-
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = apply(:_Spnl)
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      while true
-        _tmp = apply(:_HtmlAttribute)
-        break unless _tmp
-      end
-      _tmp = true
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = match_string(">")
-      unless _tmp
-        self.pos = _save
-      end
-      break
-    end # end sequence
-
-    set_failed_rule :_HtmlBlockOpenH5 unless _tmp
-    return _tmp
-  end
-
-  # HtmlBlockCloseH5 = "<" Spnl "/" ("h5" | "H5") Spnl ">"
-  def _HtmlBlockCloseH5
-
-    _save = self.pos
-    while true # sequence
-      _tmp = match_string("<")
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = apply(:_Spnl)
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = match_string("/")
-      unless _tmp
-        self.pos = _save
-        break
-      end
-
-      _save1 = self.pos
-      while true # choice
-        _tmp = match_string("h5")
-        break if _tmp
-        self.pos = _save1
-        _tmp = match_string("H5")
-        break if _tmp
-        self.pos = _save1
-        break
-      end # end choice
-
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = apply(:_Spnl)
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = match_string(">")
-      unless _tmp
-        self.pos = _save
-      end
-      break
-    end # end sequence
-
-    set_failed_rule :_HtmlBlockCloseH5 unless _tmp
-    return _tmp
-  end
-
-  # HtmlBlockH5 = HtmlBlockOpenH5 (HtmlBlockH5 | !HtmlBlockCloseH5 .)* HtmlBlockCloseH5
-  def _HtmlBlockH5
-
-    _save = self.pos
-    while true # sequence
-      _tmp = apply(:_HtmlBlockOpenH5)
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      while true
-
-        _save2 = self.pos
-        while true # choice
-          _tmp = apply(:_HtmlBlockH5)
-          break if _tmp
-          self.pos = _save2
-
-          _save3 = self.pos
-          while true # sequence
-            _save4 = self.pos
-            _tmp = apply(:_HtmlBlockCloseH5)
-            _tmp = _tmp ? nil : true
-            self.pos = _save4
-            unless _tmp
-              self.pos = _save3
-              break
-            end
-            _tmp = get_byte
-            unless _tmp
-              self.pos = _save3
-            end
-            break
-          end # end sequence
-
-          break if _tmp
-          self.pos = _save2
-          break
-        end # end choice
-
-        break unless _tmp
-      end
-      _tmp = true
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = apply(:_HtmlBlockCloseH5)
-      unless _tmp
-        self.pos = _save
-      end
-      break
-    end # end sequence
-
-    set_failed_rule :_HtmlBlockH5 unless _tmp
-    return _tmp
-  end
-
-  # HtmlBlockOpenH6 = "<" Spnl ("h6" | "H6") Spnl HtmlAttribute* ">"
-  def _HtmlBlockOpenH6
-
-    _save = self.pos
-    while true # sequence
-      _tmp = match_string("<")
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = apply(:_Spnl)
-      unless _tmp
-        self.pos = _save
-        break
-      end
-
-      _save1 = self.pos
-      while true # choice
-        _tmp = match_string("h6")
-        break if _tmp
-        self.pos = _save1
-        _tmp = match_string("H6")
-        break if _tmp
-        self.pos = _save1
-        break
-      end # end choice
-
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = apply(:_Spnl)
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      while true
-        _tmp = apply(:_HtmlAttribute)
-        break unless _tmp
-      end
-      _tmp = true
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = match_string(">")
-      unless _tmp
-        self.pos = _save
-      end
-      break
-    end # end sequence
-
-    set_failed_rule :_HtmlBlockOpenH6 unless _tmp
-    return _tmp
-  end
-
-  # HtmlBlockCloseH6 = "<" Spnl "/" ("h6" | "H6") Spnl ">"
-  def _HtmlBlockCloseH6
-
-    _save = self.pos
-    while true # sequence
-      _tmp = match_string("<")
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = apply(:_Spnl)
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = match_string("/")
-      unless _tmp
-        self.pos = _save
-        break
-      end
-
-      _save1 = self.pos
-      while true # choice
-        _tmp = match_string("h6")
-        break if _tmp
-        self.pos = _save1
-        _tmp = match_string("H6")
-        break if _tmp
-        self.pos = _save1
-        break
-      end # end choice
-
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = apply(:_Spnl)
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = match_string(">")
-      unless _tmp
-        self.pos = _save
-      end
-      break
-    end # end sequence
-
-    set_failed_rule :_HtmlBlockCloseH6 unless _tmp
-    return _tmp
-  end
-
-  # HtmlBlockH6 = HtmlBlockOpenH6 (HtmlBlockH6 | !HtmlBlockCloseH6 .)* HtmlBlockCloseH6
-  def _HtmlBlockH6
-
-    _save = self.pos
-    while true # sequence
-      _tmp = apply(:_HtmlBlockOpenH6)
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      while true
-
-        _save2 = self.pos
-        while true # choice
-          _tmp = apply(:_HtmlBlockH6)
-          break if _tmp
-          self.pos = _save2
-
-          _save3 = self.pos
-          while true # sequence
-            _save4 = self.pos
-            _tmp = apply(:_HtmlBlockCloseH6)
-            _tmp = _tmp ? nil : true
-            self.pos = _save4
-            unless _tmp
-              self.pos = _save3
-              break
-            end
-            _tmp = get_byte
-            unless _tmp
-              self.pos = _save3
-            end
-            break
-          end # end sequence
-
-          break if _tmp
-          self.pos = _save2
-          break
-        end # end choice
-
-        break unless _tmp
-      end
-      _tmp = true
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = apply(:_HtmlBlockCloseH6)
-      unless _tmp
-        self.pos = _save
-      end
-      break
-    end # end sequence
-
-    set_failed_rule :_HtmlBlockH6 unless _tmp
-    return _tmp
-  end
-
-  # HtmlBlockOpenMenu = "<" Spnl ("menu" | "MENU") Spnl HtmlAttribute* ">"
-  def _HtmlBlockOpenMenu
-
-    _save = self.pos
-    while true # sequence
-      _tmp = match_string("<")
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = apply(:_Spnl)
-      unless _tmp
-        self.pos = _save
-        break
-      end
-
-      _save1 = self.pos
-      while true # choice
-        _tmp = match_string("menu")
-        break if _tmp
-        self.pos = _save1
-        _tmp = match_string("MENU")
-        break if _tmp
-        self.pos = _save1
-        break
-      end # end choice
-
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = apply(:_Spnl)
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      while true
-        _tmp = apply(:_HtmlAttribute)
-        break unless _tmp
-      end
-      _tmp = true
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = match_string(">")
-      unless _tmp
-        self.pos = _save
-      end
-      break
-    end # end sequence
-
-    set_failed_rule :_HtmlBlockOpenMenu unless _tmp
-    return _tmp
-  end
-
-  # HtmlBlockCloseMenu = "<" Spnl "/" ("menu" | "MENU") Spnl ">"
-  def _HtmlBlockCloseMenu
-
-    _save = self.pos
-    while true # sequence
-      _tmp = match_string("<")
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = apply(:_Spnl)
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = match_string("/")
-      unless _tmp
-        self.pos = _save
-        break
-      end
-
-      _save1 = self.pos
-      while true # choice
-        _tmp = match_string("menu")
-        break if _tmp
-        self.pos = _save1
-        _tmp = match_string("MENU")
-        break if _tmp
-        self.pos = _save1
-        break
-      end # end choice
-
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = apply(:_Spnl)
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = match_string(">")
-      unless _tmp
-        self.pos = _save
-      end
-      break
-    end # end sequence
-
-    set_failed_rule :_HtmlBlockCloseMenu unless _tmp
-    return _tmp
-  end
-
-  # HtmlBlockMenu = HtmlBlockOpenMenu (HtmlBlockMenu | !HtmlBlockCloseMenu .)* HtmlBlockCloseMenu
-  def _HtmlBlockMenu
-
-    _save = self.pos
-    while true # sequence
-      _tmp = apply(:_HtmlBlockOpenMenu)
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      while true
-
-        _save2 = self.pos
-        while true # choice
-          _tmp = apply(:_HtmlBlockMenu)
-          break if _tmp
-          self.pos = _save2
-
-          _save3 = self.pos
-          while true # sequence
-            _save4 = self.pos
-            _tmp = apply(:_HtmlBlockCloseMenu)
-            _tmp = _tmp ? nil : true
-            self.pos = _save4
-            unless _tmp
-              self.pos = _save3
-              break
-            end
-            _tmp = get_byte
-            unless _tmp
-              self.pos = _save3
-            end
-            break
-          end # end sequence
-
-          break if _tmp
-          self.pos = _save2
-          break
-        end # end choice
-
-        break unless _tmp
-      end
-      _tmp = true
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = apply(:_HtmlBlockCloseMenu)
-      unless _tmp
-        self.pos = _save
-      end
-      break
-    end # end sequence
-
-    set_failed_rule :_HtmlBlockMenu unless _tmp
-    return _tmp
-  end
-
-  # HtmlBlockOpenNoframes = "<" Spnl ("noframes" | "NOFRAMES") Spnl HtmlAttribute* ">"
-  def _HtmlBlockOpenNoframes
-
-    _save = self.pos
-    while true # sequence
-      _tmp = match_string("<")
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = apply(:_Spnl)
-      unless _tmp
-        self.pos = _save
-        break
-      end
-
-      _save1 = self.pos
-      while true # choice
-        _tmp = match_string("noframes")
-        break if _tmp
-        self.pos = _save1
-        _tmp = match_string("NOFRAMES")
-        break if _tmp
-        self.pos = _save1
-        break
-      end # end choice
-
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = apply(:_Spnl)
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      while true
-        _tmp = apply(:_HtmlAttribute)
-        break unless _tmp
-      end
-      _tmp = true
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = match_string(">")
-      unless _tmp
-        self.pos = _save
-      end
-      break
-    end # end sequence
-
-    set_failed_rule :_HtmlBlockOpenNoframes unless _tmp
-    return _tmp
-  end
-
-  # HtmlBlockCloseNoframes = "<" Spnl "/" ("noframes" | "NOFRAMES") Spnl ">"
-  def _HtmlBlockCloseNoframes
-
-    _save = self.pos
-    while true # sequence
-      _tmp = match_string("<")
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = apply(:_Spnl)
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = match_string("/")
-      unless _tmp
-        self.pos = _save
-        break
-      end
-
-      _save1 = self.pos
-      while true # choice
-        _tmp = match_string("noframes")
-        break if _tmp
-        self.pos = _save1
-        _tmp = match_string("NOFRAMES")
-        break if _tmp
-        self.pos = _save1
-        break
-      end # end choice
-
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = apply(:_Spnl)
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = match_string(">")
-      unless _tmp
-        self.pos = _save
-      end
-      break
-    end # end sequence
-
-    set_failed_rule :_HtmlBlockCloseNoframes unless _tmp
-    return _tmp
-  end
-
-  # HtmlBlockNoframes = HtmlBlockOpenNoframes (HtmlBlockNoframes | !HtmlBlockCloseNoframes .)* HtmlBlockCloseNoframes
-  def _HtmlBlockNoframes
-
-    _save = self.pos
-    while true # sequence
-      _tmp = apply(:_HtmlBlockOpenNoframes)
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      while true
-
-        _save2 = self.pos
-        while true # choice
-          _tmp = apply(:_HtmlBlockNoframes)
-          break if _tmp
-          self.pos = _save2
-
-          _save3 = self.pos
-          while true # sequence
-            _save4 = self.pos
-            _tmp = apply(:_HtmlBlockCloseNoframes)
-            _tmp = _tmp ? nil : true
-            self.pos = _save4
-            unless _tmp
-              self.pos = _save3
-              break
-            end
-            _tmp = get_byte
-            unless _tmp
-              self.pos = _save3
-            end
-            break
-          end # end sequence
-
-          break if _tmp
-          self.pos = _save2
-          break
-        end # end choice
-
-        break unless _tmp
-      end
-      _tmp = true
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = apply(:_HtmlBlockCloseNoframes)
-      unless _tmp
-        self.pos = _save
-      end
-      break
-    end # end sequence
-
-    set_failed_rule :_HtmlBlockNoframes unless _tmp
-    return _tmp
-  end
-
-  # HtmlBlockOpenNoscript = "<" Spnl ("noscript" | "NOSCRIPT") Spnl HtmlAttribute* ">"
-  def _HtmlBlockOpenNoscript
-
-    _save = self.pos
-    while true # sequence
-      _tmp = match_string("<")
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = apply(:_Spnl)
-      unless _tmp
-        self.pos = _save
-        break
-      end
-
-      _save1 = self.pos
-      while true # choice
-        _tmp = match_string("noscript")
-        break if _tmp
-        self.pos = _save1
-        _tmp = match_string("NOSCRIPT")
-        break if _tmp
-        self.pos = _save1
-        break
-      end # end choice
-
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = apply(:_Spnl)
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      while true
-        _tmp = apply(:_HtmlAttribute)
-        break unless _tmp
-      end
-      _tmp = true
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = match_string(">")
-      unless _tmp
-        self.pos = _save
-      end
-      break
-    end # end sequence
-
-    set_failed_rule :_HtmlBlockOpenNoscript unless _tmp
-    return _tmp
-  end
-
-  # HtmlBlockCloseNoscript = "<" Spnl "/" ("noscript" | "NOSCRIPT") Spnl ">"
-  def _HtmlBlockCloseNoscript
-
-    _save = self.pos
-    while true # sequence
-      _tmp = match_string("<")
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = apply(:_Spnl)
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = match_string("/")
-      unless _tmp
-        self.pos = _save
-        break
-      end
-
-      _save1 = self.pos
-      while true # choice
-        _tmp = match_string("noscript")
-        break if _tmp
-        self.pos = _save1
-        _tmp = match_string("NOSCRIPT")
-        break if _tmp
-        self.pos = _save1
-        break
-      end # end choice
-
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = apply(:_Spnl)
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = match_string(">")
-      unless _tmp
-        self.pos = _save
-      end
-      break
-    end # end sequence
-
-    set_failed_rule :_HtmlBlockCloseNoscript unless _tmp
-    return _tmp
-  end
-
-  # HtmlBlockNoscript = HtmlBlockOpenNoscript (HtmlBlockNoscript | !HtmlBlockCloseNoscript .)* HtmlBlockCloseNoscript
-  def _HtmlBlockNoscript
-
-    _save = self.pos
-    while true # sequence
-      _tmp = apply(:_HtmlBlockOpenNoscript)
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      while true
-
-        _save2 = self.pos
-        while true # choice
-          _tmp = apply(:_HtmlBlockNoscript)
-          break if _tmp
-          self.pos = _save2
-
-          _save3 = self.pos
-          while true # sequence
-            _save4 = self.pos
-            _tmp = apply(:_HtmlBlockCloseNoscript)
-            _tmp = _tmp ? nil : true
-            self.pos = _save4
-            unless _tmp
-              self.pos = _save3
-              break
-            end
-            _tmp = get_byte
-            unless _tmp
-              self.pos = _save3
-            end
-            break
-          end # end sequence
-
-          break if _tmp
-          self.pos = _save2
-          break
-        end # end choice
-
-        break unless _tmp
-      end
-      _tmp = true
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = apply(:_HtmlBlockCloseNoscript)
-      unless _tmp
-        self.pos = _save
-      end
-      break
-    end # end sequence
-
-    set_failed_rule :_HtmlBlockNoscript unless _tmp
-    return _tmp
-  end
-
-  # HtmlBlockOpenOl = "<" Spnl ("ol" | "OL") Spnl HtmlAttribute* ">"
-  def _HtmlBlockOpenOl
-
-    _save = self.pos
-    while true # sequence
-      _tmp = match_string("<")
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = apply(:_Spnl)
-      unless _tmp
-        self.pos = _save
-        break
-      end
-
-      _save1 = self.pos
-      while true # choice
-        _tmp = match_string("ol")
-        break if _tmp
-        self.pos = _save1
-        _tmp = match_string("OL")
-        break if _tmp
-        self.pos = _save1
-        break
-      end # end choice
-
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = apply(:_Spnl)
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      while true
-        _tmp = apply(:_HtmlAttribute)
-        break unless _tmp
-      end
-      _tmp = true
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = match_string(">")
-      unless _tmp
-        self.pos = _save
-      end
-      break
-    end # end sequence
-
-    set_failed_rule :_HtmlBlockOpenOl unless _tmp
-    return _tmp
-  end
-
-  # HtmlBlockCloseOl = "<" Spnl "/" ("ol" | "OL") Spnl ">"
-  def _HtmlBlockCloseOl
-
-    _save = self.pos
-    while true # sequence
-      _tmp = match_string("<")
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = apply(:_Spnl)
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = match_string("/")
-      unless _tmp
-        self.pos = _save
-        break
-      end
-
-      _save1 = self.pos
-      while true # choice
-        _tmp = match_string("ol")
-        break if _tmp
-        self.pos = _save1
-        _tmp = match_string("OL")
-        break if _tmp
-        self.pos = _save1
-        break
-      end # end choice
-
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = apply(:_Spnl)
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = match_string(">")
-      unless _tmp
-        self.pos = _save
-      end
-      break
-    end # end sequence
-
-    set_failed_rule :_HtmlBlockCloseOl unless _tmp
-    return _tmp
-  end
-
-  # HtmlBlockOl = HtmlBlockOpenOl (HtmlBlockOl | !HtmlBlockCloseOl .)* HtmlBlockCloseOl
-  def _HtmlBlockOl
-
-    _save = self.pos
-    while true # sequence
-      _tmp = apply(:_HtmlBlockOpenOl)
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      while true
-
-        _save2 = self.pos
-        while true # choice
-          _tmp = apply(:_HtmlBlockOl)
-          break if _tmp
-          self.pos = _save2
-
-          _save3 = self.pos
-          while true # sequence
-            _save4 = self.pos
-            _tmp = apply(:_HtmlBlockCloseOl)
-            _tmp = _tmp ? nil : true
-            self.pos = _save4
-            unless _tmp
-              self.pos = _save3
-              break
-            end
-            _tmp = get_byte
-            unless _tmp
-              self.pos = _save3
-            end
-            break
-          end # end sequence
-
-          break if _tmp
-          self.pos = _save2
-          break
-        end # end choice
-
-        break unless _tmp
-      end
-      _tmp = true
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = apply(:_HtmlBlockCloseOl)
-      unless _tmp
-        self.pos = _save
-      end
-      break
-    end # end sequence
-
-    set_failed_rule :_HtmlBlockOl unless _tmp
-    return _tmp
-  end
-
-  # HtmlBlockOpenP = "<" Spnl ("p" | "P") Spnl HtmlAttribute* ">"
-  def _HtmlBlockOpenP
-
-    _save = self.pos
-    while true # sequence
-      _tmp = match_string("<")
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = apply(:_Spnl)
-      unless _tmp
-        self.pos = _save
-        break
-      end
-
-      _save1 = self.pos
-      while true # choice
-        _tmp = match_string("p")
-        break if _tmp
-        self.pos = _save1
-        _tmp = match_string("P")
-        break if _tmp
-        self.pos = _save1
-        break
-      end # end choice
-
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = apply(:_Spnl)
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      while true
-        _tmp = apply(:_HtmlAttribute)
-        break unless _tmp
-      end
-      _tmp = true
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = match_string(">")
-      unless _tmp
-        self.pos = _save
-      end
-      break
-    end # end sequence
-
-    set_failed_rule :_HtmlBlockOpenP unless _tmp
-    return _tmp
-  end
-
-  # HtmlBlockCloseP = "<" Spnl "/" ("p" | "P") Spnl ">"
-  def _HtmlBlockCloseP
-
-    _save = self.pos
-    while true # sequence
-      _tmp = match_string("<")
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = apply(:_Spnl)
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = match_string("/")
-      unless _tmp
-        self.pos = _save
-        break
-      end
-
-      _save1 = self.pos
-      while true # choice
-        _tmp = match_string("p")
-        break if _tmp
-        self.pos = _save1
-        _tmp = match_string("P")
-        break if _tmp
-        self.pos = _save1
-        break
-      end # end choice
-
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = apply(:_Spnl)
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = match_string(">")
-      unless _tmp
-        self.pos = _save
-      end
-      break
-    end # end sequence
-
-    set_failed_rule :_HtmlBlockCloseP unless _tmp
-    return _tmp
-  end
-
-  # HtmlBlockP = HtmlBlockOpenP (HtmlBlockP | !HtmlBlockCloseP .)* HtmlBlockCloseP
-  def _HtmlBlockP
-
-    _save = self.pos
-    while true # sequence
-      _tmp = apply(:_HtmlBlockOpenP)
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      while true
-
-        _save2 = self.pos
-        while true # choice
-          _tmp = apply(:_HtmlBlockP)
-          break if _tmp
-          self.pos = _save2
-
-          _save3 = self.pos
-          while true # sequence
-            _save4 = self.pos
-            _tmp = apply(:_HtmlBlockCloseP)
-            _tmp = _tmp ? nil : true
-            self.pos = _save4
-            unless _tmp
-              self.pos = _save3
-              break
-            end
-            _tmp = get_byte
-            unless _tmp
-              self.pos = _save3
-            end
-            break
-          end # end sequence
-
-          break if _tmp
-          self.pos = _save2
-          break
-        end # end choice
-
-        break unless _tmp
-      end
-      _tmp = true
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = apply(:_HtmlBlockCloseP)
-      unless _tmp
-        self.pos = _save
-      end
-      break
-    end # end sequence
-
-    set_failed_rule :_HtmlBlockP unless _tmp
-    return _tmp
-  end
-
-  # HtmlBlockOpenPre = "<" Spnl ("pre" | "PRE") Spnl HtmlAttribute* ">"
-  def _HtmlBlockOpenPre
-
-    _save = self.pos
-    while true # sequence
-      _tmp = match_string("<")
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = apply(:_Spnl)
-      unless _tmp
-        self.pos = _save
-        break
-      end
-
-      _save1 = self.pos
-      while true # choice
-        _tmp = match_string("pre")
-        break if _tmp
-        self.pos = _save1
-        _tmp = match_string("PRE")
-        break if _tmp
-        self.pos = _save1
-        break
-      end # end choice
-
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = apply(:_Spnl)
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      while true
-        _tmp = apply(:_HtmlAttribute)
-        break unless _tmp
-      end
-      _tmp = true
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = match_string(">")
-      unless _tmp
-        self.pos = _save
-      end
-      break
-    end # end sequence
-
-    set_failed_rule :_HtmlBlockOpenPre unless _tmp
-    return _tmp
-  end
-
-  # HtmlBlockClosePre = "<" Spnl "/" ("pre" | "PRE") Spnl ">"
-  def _HtmlBlockClosePre
-
-    _save = self.pos
-    while true # sequence
-      _tmp = match_string("<")
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = apply(:_Spnl)
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = match_string("/")
-      unless _tmp
-        self.pos = _save
-        break
-      end
-
-      _save1 = self.pos
-      while true # choice
-        _tmp = match_string("pre")
-        break if _tmp
-        self.pos = _save1
-        _tmp = match_string("PRE")
-        break if _tmp
-        self.pos = _save1
-        break
-      end # end choice
-
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = apply(:_Spnl)
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = match_string(">")
-      unless _tmp
-        self.pos = _save
-      end
-      break
-    end # end sequence
-
-    set_failed_rule :_HtmlBlockClosePre unless _tmp
-    return _tmp
-  end
-
-  # HtmlBlockPre = HtmlBlockOpenPre (HtmlBlockPre | !HtmlBlockClosePre .)* HtmlBlockClosePre
-  def _HtmlBlockPre
-
-    _save = self.pos
-    while true # sequence
-      _tmp = apply(:_HtmlBlockOpenPre)
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      while true
-
-        _save2 = self.pos
-        while true # choice
-          _tmp = apply(:_HtmlBlockPre)
-          break if _tmp
-          self.pos = _save2
-
-          _save3 = self.pos
-          while true # sequence
-            _save4 = self.pos
-            _tmp = apply(:_HtmlBlockClosePre)
-            _tmp = _tmp ? nil : true
-            self.pos = _save4
-            unless _tmp
-              self.pos = _save3
-              break
-            end
-            _tmp = get_byte
-            unless _tmp
-              self.pos = _save3
-            end
-            break
-          end # end sequence
-
-          break if _tmp
-          self.pos = _save2
-          break
-        end # end choice
-
-        break unless _tmp
-      end
-      _tmp = true
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = apply(:_HtmlBlockClosePre)
-      unless _tmp
-        self.pos = _save
-      end
-      break
-    end # end sequence
-
-    set_failed_rule :_HtmlBlockPre unless _tmp
-    return _tmp
-  end
-
-  # HtmlBlockOpenTable = "<" Spnl ("table" | "TABLE") Spnl HtmlAttribute* ">"
-  def _HtmlBlockOpenTable
-
-    _save = self.pos
-    while true # sequence
-      _tmp = match_string("<")
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = apply(:_Spnl)
-      unless _tmp
-        self.pos = _save
-        break
-      end
-
-      _save1 = self.pos
-      while true # choice
-        _tmp = match_string("table")
-        break if _tmp
-        self.pos = _save1
-        _tmp = match_string("TABLE")
-        break if _tmp
-        self.pos = _save1
-        break
-      end # end choice
-
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = apply(:_Spnl)
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      while true
-        _tmp = apply(:_HtmlAttribute)
-        break unless _tmp
-      end
-      _tmp = true
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = match_string(">")
-      unless _tmp
-        self.pos = _save
-      end
-      break
-    end # end sequence
-
-    set_failed_rule :_HtmlBlockOpenTable unless _tmp
-    return _tmp
-  end
-
-  # HtmlBlockCloseTable = "<" Spnl "/" ("table" | "TABLE") Spnl ">"
-  def _HtmlBlockCloseTable
-
-    _save = self.pos
-    while true # sequence
-      _tmp = match_string("<")
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = apply(:_Spnl)
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = match_string("/")
-      unless _tmp
-        self.pos = _save
-        break
-      end
-
-      _save1 = self.pos
-      while true # choice
-        _tmp = match_string("table")
-        break if _tmp
-        self.pos = _save1
-        _tmp = match_string("TABLE")
-        break if _tmp
-        self.pos = _save1
-        break
-      end # end choice
-
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = apply(:_Spnl)
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = match_string(">")
-      unless _tmp
-        self.pos = _save
-      end
-      break
-    end # end sequence
-
-    set_failed_rule :_HtmlBlockCloseTable unless _tmp
-    return _tmp
-  end
-
-  # HtmlBlockTable = HtmlBlockOpenTable (HtmlBlockTable | !HtmlBlockCloseTable .)* HtmlBlockCloseTable
-  def _HtmlBlockTable
-
-    _save = self.pos
-    while true # sequence
-      _tmp = apply(:_HtmlBlockOpenTable)
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      while true
-
-        _save2 = self.pos
-        while true # choice
-          _tmp = apply(:_HtmlBlockTable)
-          break if _tmp
-          self.pos = _save2
-
-          _save3 = self.pos
-          while true # sequence
-            _save4 = self.pos
-            _tmp = apply(:_HtmlBlockCloseTable)
-            _tmp = _tmp ? nil : true
-            self.pos = _save4
-            unless _tmp
-              self.pos = _save3
-              break
-            end
-            _tmp = get_byte
-            unless _tmp
-              self.pos = _save3
-            end
-            break
-          end # end sequence
-
-          break if _tmp
-          self.pos = _save2
-          break
-        end # end choice
-
-        break unless _tmp
-      end
-      _tmp = true
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = apply(:_HtmlBlockCloseTable)
-      unless _tmp
-        self.pos = _save
-      end
-      break
-    end # end sequence
-
-    set_failed_rule :_HtmlBlockTable unless _tmp
-    return _tmp
-  end
-
-  # HtmlBlockOpenUl = "<" Spnl ("ul" | "UL") Spnl HtmlAttribute* ">"
-  def _HtmlBlockOpenUl
-
-    _save = self.pos
-    while true # sequence
-      _tmp = match_string("<")
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = apply(:_Spnl)
-      unless _tmp
-        self.pos = _save
-        break
-      end
-
-      _save1 = self.pos
-      while true # choice
-        _tmp = match_string("ul")
-        break if _tmp
-        self.pos = _save1
-        _tmp = match_string("UL")
-        break if _tmp
-        self.pos = _save1
-        break
-      end # end choice
-
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = apply(:_Spnl)
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      while true
-        _tmp = apply(:_HtmlAttribute)
-        break unless _tmp
-      end
-      _tmp = true
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = match_string(">")
-      unless _tmp
-        self.pos = _save
-      end
-      break
-    end # end sequence
-
-    set_failed_rule :_HtmlBlockOpenUl unless _tmp
-    return _tmp
-  end
-
-  # HtmlBlockCloseUl = "<" Spnl "/" ("ul" | "UL") Spnl ">"
-  def _HtmlBlockCloseUl
-
-    _save = self.pos
-    while true # sequence
-      _tmp = match_string("<")
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = apply(:_Spnl)
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = match_string("/")
-      unless _tmp
-        self.pos = _save
-        break
-      end
-
-      _save1 = self.pos
-      while true # choice
-        _tmp = match_string("ul")
-        break if _tmp
-        self.pos = _save1
-        _tmp = match_string("UL")
-        break if _tmp
-        self.pos = _save1
-        break
-      end # end choice
-
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = apply(:_Spnl)
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = match_string(">")
-      unless _tmp
-        self.pos = _save
-      end
-      break
-    end # end sequence
-
-    set_failed_rule :_HtmlBlockCloseUl unless _tmp
-    return _tmp
-  end
-
-  # HtmlBlockUl = HtmlBlockOpenUl (HtmlBlockUl | !HtmlBlockCloseUl .)* HtmlBlockCloseUl
-  def _HtmlBlockUl
-
-    _save = self.pos
-    while true # sequence
-      _tmp = apply(:_HtmlBlockOpenUl)
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      while true
-
-        _save2 = self.pos
-        while true # choice
-          _tmp = apply(:_HtmlBlockUl)
-          break if _tmp
-          self.pos = _save2
-
-          _save3 = self.pos
-          while true # sequence
-            _save4 = self.pos
-            _tmp = apply(:_HtmlBlockCloseUl)
-            _tmp = _tmp ? nil : true
-            self.pos = _save4
-            unless _tmp
-              self.pos = _save3
-              break
-            end
-            _tmp = get_byte
-            unless _tmp
-              self.pos = _save3
-            end
-            break
-          end # end sequence
-
-          break if _tmp
-          self.pos = _save2
-          break
-        end # end choice
-
-        break unless _tmp
-      end
-      _tmp = true
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = apply(:_HtmlBlockCloseUl)
-      unless _tmp
-        self.pos = _save
-      end
-      break
-    end # end sequence
-
-    set_failed_rule :_HtmlBlockUl unless _tmp
-    return _tmp
-  end
-
-  # HtmlBlockOpenDd = "<" Spnl ("dd" | "DD") Spnl HtmlAttribute* ">"
-  def _HtmlBlockOpenDd
-
-    _save = self.pos
-    while true # sequence
-      _tmp = match_string("<")
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = apply(:_Spnl)
-      unless _tmp
-        self.pos = _save
-        break
-      end
-
-      _save1 = self.pos
-      while true # choice
-        _tmp = match_string("dd")
-        break if _tmp
-        self.pos = _save1
-        _tmp = match_string("DD")
-        break if _tmp
-        self.pos = _save1
-        break
-      end # end choice
-
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = apply(:_Spnl)
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      while true
-        _tmp = apply(:_HtmlAttribute)
-        break unless _tmp
-      end
-      _tmp = true
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = match_string(">")
-      unless _tmp
-        self.pos = _save
-      end
-      break
-    end # end sequence
-
-    set_failed_rule :_HtmlBlockOpenDd unless _tmp
-    return _tmp
-  end
-
-  # HtmlBlockCloseDd = "<" Spnl "/" ("dd" | "DD") Spnl ">"
-  def _HtmlBlockCloseDd
-
-    _save = self.pos
-    while true # sequence
-      _tmp = match_string("<")
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = apply(:_Spnl)
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = match_string("/")
-      unless _tmp
-        self.pos = _save
-        break
-      end
-
-      _save1 = self.pos
-      while true # choice
-        _tmp = match_string("dd")
-        break if _tmp
-        self.pos = _save1
-        _tmp = match_string("DD")
-        break if _tmp
-        self.pos = _save1
-        break
-      end # end choice
-
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = apply(:_Spnl)
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = match_string(">")
-      unless _tmp
-        self.pos = _save
-      end
-      break
-    end # end sequence
-
-    set_failed_rule :_HtmlBlockCloseDd unless _tmp
-    return _tmp
-  end
-
-  # HtmlBlockDd = HtmlBlockOpenDd (HtmlBlockDd | !HtmlBlockCloseDd .)* HtmlBlockCloseDd
-  def _HtmlBlockDd
-
-    _save = self.pos
-    while true # sequence
-      _tmp = apply(:_HtmlBlockOpenDd)
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      while true
-
-        _save2 = self.pos
-        while true # choice
-          _tmp = apply(:_HtmlBlockDd)
-          break if _tmp
-          self.pos = _save2
-
-          _save3 = self.pos
-          while true # sequence
-            _save4 = self.pos
-            _tmp = apply(:_HtmlBlockCloseDd)
-            _tmp = _tmp ? nil : true
-            self.pos = _save4
-            unless _tmp
-              self.pos = _save3
-              break
-            end
-            _tmp = get_byte
-            unless _tmp
-              self.pos = _save3
-            end
-            break
-          end # end sequence
-
-          break if _tmp
-          self.pos = _save2
-          break
-        end # end choice
-
-        break unless _tmp
-      end
-      _tmp = true
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = apply(:_HtmlBlockCloseDd)
-      unless _tmp
-        self.pos = _save
-      end
-      break
-    end # end sequence
-
-    set_failed_rule :_HtmlBlockDd unless _tmp
-    return _tmp
-  end
-
-  # HtmlBlockOpenDt = "<" Spnl ("dt" | "DT") Spnl HtmlAttribute* ">"
-  def _HtmlBlockOpenDt
-
-    _save = self.pos
-    while true # sequence
-      _tmp = match_string("<")
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = apply(:_Spnl)
-      unless _tmp
-        self.pos = _save
-        break
-      end
-
-      _save1 = self.pos
-      while true # choice
-        _tmp = match_string("dt")
-        break if _tmp
-        self.pos = _save1
-        _tmp = match_string("DT")
-        break if _tmp
-        self.pos = _save1
-        break
-      end # end choice
-
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = apply(:_Spnl)
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      while true
-        _tmp = apply(:_HtmlAttribute)
-        break unless _tmp
-      end
-      _tmp = true
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = match_string(">")
-      unless _tmp
-        self.pos = _save
-      end
-      break
-    end # end sequence
-
-    set_failed_rule :_HtmlBlockOpenDt unless _tmp
-    return _tmp
-  end
-
-  # HtmlBlockCloseDt = "<" Spnl "/" ("dt" | "DT") Spnl ">"
-  def _HtmlBlockCloseDt
-
-    _save = self.pos
-    while true # sequence
-      _tmp = match_string("<")
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = apply(:_Spnl)
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = match_string("/")
-      unless _tmp
-        self.pos = _save
-        break
-      end
-
-      _save1 = self.pos
-      while true # choice
-        _tmp = match_string("dt")
-        break if _tmp
-        self.pos = _save1
-        _tmp = match_string("DT")
-        break if _tmp
-        self.pos = _save1
-        break
-      end # end choice
-
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = apply(:_Spnl)
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = match_string(">")
-      unless _tmp
-        self.pos = _save
-      end
-      break
-    end # end sequence
-
-    set_failed_rule :_HtmlBlockCloseDt unless _tmp
-    return _tmp
-  end
-
-  # HtmlBlockDt = HtmlBlockOpenDt (HtmlBlockDt | !HtmlBlockCloseDt .)* HtmlBlockCloseDt
-  def _HtmlBlockDt
-
-    _save = self.pos
-    while true # sequence
-      _tmp = apply(:_HtmlBlockOpenDt)
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      while true
-
-        _save2 = self.pos
-        while true # choice
-          _tmp = apply(:_HtmlBlockDt)
-          break if _tmp
-          self.pos = _save2
-
-          _save3 = self.pos
-          while true # sequence
-            _save4 = self.pos
-            _tmp = apply(:_HtmlBlockCloseDt)
-            _tmp = _tmp ? nil : true
-            self.pos = _save4
-            unless _tmp
-              self.pos = _save3
-              break
-            end
-            _tmp = get_byte
-            unless _tmp
-              self.pos = _save3
-            end
-            break
-          end # end sequence
-
-          break if _tmp
-          self.pos = _save2
-          break
-        end # end choice
-
-        break unless _tmp
-      end
-      _tmp = true
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = apply(:_HtmlBlockCloseDt)
-      unless _tmp
-        self.pos = _save
-      end
-      break
-    end # end sequence
-
-    set_failed_rule :_HtmlBlockDt unless _tmp
-    return _tmp
-  end
-
-  # HtmlBlockOpenFrameset = "<" Spnl ("frameset" | "FRAMESET") Spnl HtmlAttribute* ">"
-  def _HtmlBlockOpenFrameset
-
-    _save = self.pos
-    while true # sequence
-      _tmp = match_string("<")
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = apply(:_Spnl)
-      unless _tmp
-        self.pos = _save
-        break
-      end
-
-      _save1 = self.pos
-      while true # choice
-        _tmp = match_string("frameset")
-        break if _tmp
-        self.pos = _save1
-        _tmp = match_string("FRAMESET")
-        break if _tmp
-        self.pos = _save1
-        break
-      end # end choice
-
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = apply(:_Spnl)
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      while true
-        _tmp = apply(:_HtmlAttribute)
-        break unless _tmp
-      end
-      _tmp = true
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = match_string(">")
-      unless _tmp
-        self.pos = _save
-      end
-      break
-    end # end sequence
-
-    set_failed_rule :_HtmlBlockOpenFrameset unless _tmp
-    return _tmp
-  end
-
-  # HtmlBlockCloseFrameset = "<" Spnl "/" ("frameset" | "FRAMESET") Spnl ">"
-  def _HtmlBlockCloseFrameset
-
-    _save = self.pos
-    while true # sequence
-      _tmp = match_string("<")
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = apply(:_Spnl)
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = match_string("/")
-      unless _tmp
-        self.pos = _save
-        break
-      end
-
-      _save1 = self.pos
-      while true # choice
-        _tmp = match_string("frameset")
-        break if _tmp
-        self.pos = _save1
-        _tmp = match_string("FRAMESET")
-        break if _tmp
-        self.pos = _save1
-        break
-      end # end choice
-
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = apply(:_Spnl)
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = match_string(">")
-      unless _tmp
-        self.pos = _save
-      end
-      break
-    end # end sequence
-
-    set_failed_rule :_HtmlBlockCloseFrameset unless _tmp
-    return _tmp
-  end
-
-  # HtmlBlockFrameset = HtmlBlockOpenFrameset (HtmlBlockFrameset | !HtmlBlockCloseFrameset .)* HtmlBlockCloseFrameset
-  def _HtmlBlockFrameset
-
-    _save = self.pos
-    while true # sequence
-      _tmp = apply(:_HtmlBlockOpenFrameset)
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      while true
-
-        _save2 = self.pos
-        while true # choice
-          _tmp = apply(:_HtmlBlockFrameset)
-          break if _tmp
-          self.pos = _save2
-
-          _save3 = self.pos
-          while true # sequence
-            _save4 = self.pos
-            _tmp = apply(:_HtmlBlockCloseFrameset)
-            _tmp = _tmp ? nil : true
-            self.pos = _save4
-            unless _tmp
-              self.pos = _save3
-              break
-            end
-            _tmp = get_byte
-            unless _tmp
-              self.pos = _save3
-            end
-            break
-          end # end sequence
-
-          break if _tmp
-          self.pos = _save2
-          break
-        end # end choice
-
-        break unless _tmp
-      end
-      _tmp = true
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = apply(:_HtmlBlockCloseFrameset)
-      unless _tmp
-        self.pos = _save
-      end
-      break
-    end # end sequence
-
-    set_failed_rule :_HtmlBlockFrameset unless _tmp
-    return _tmp
-  end
-
-  # HtmlBlockOpenLi = "<" Spnl ("li" | "LI") Spnl HtmlAttribute* ">"
-  def _HtmlBlockOpenLi
-
-    _save = self.pos
-    while true # sequence
-      _tmp = match_string("<")
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = apply(:_Spnl)
-      unless _tmp
-        self.pos = _save
-        break
-      end
-
-      _save1 = self.pos
-      while true # choice
-        _tmp = match_string("li")
-        break if _tmp
-        self.pos = _save1
-        _tmp = match_string("LI")
-        break if _tmp
-        self.pos = _save1
-        break
-      end # end choice
-
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = apply(:_Spnl)
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      while true
-        _tmp = apply(:_HtmlAttribute)
-        break unless _tmp
-      end
-      _tmp = true
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = match_string(">")
-      unless _tmp
-        self.pos = _save
-      end
-      break
-    end # end sequence
-
-    set_failed_rule :_HtmlBlockOpenLi unless _tmp
-    return _tmp
-  end
-
-  # HtmlBlockCloseLi = "<" Spnl "/" ("li" | "LI") Spnl ">"
-  def _HtmlBlockCloseLi
-
-    _save = self.pos
-    while true # sequence
-      _tmp = match_string("<")
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = apply(:_Spnl)
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = match_string("/")
-      unless _tmp
-        self.pos = _save
-        break
-      end
-
-      _save1 = self.pos
-      while true # choice
-        _tmp = match_string("li")
-        break if _tmp
-        self.pos = _save1
-        _tmp = match_string("LI")
-        break if _tmp
-        self.pos = _save1
-        break
-      end # end choice
-
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = apply(:_Spnl)
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = match_string(">")
-      unless _tmp
-        self.pos = _save
-      end
-      break
-    end # end sequence
-
-    set_failed_rule :_HtmlBlockCloseLi unless _tmp
-    return _tmp
-  end
-
-  # HtmlBlockLi = HtmlBlockOpenLi (HtmlBlockLi | !HtmlBlockCloseLi .)* HtmlBlockCloseLi
-  def _HtmlBlockLi
-
-    _save = self.pos
-    while true # sequence
-      _tmp = apply(:_HtmlBlockOpenLi)
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      while true
-
-        _save2 = self.pos
-        while true # choice
-          _tmp = apply(:_HtmlBlockLi)
-          break if _tmp
-          self.pos = _save2
-
-          _save3 = self.pos
-          while true # sequence
-            _save4 = self.pos
-            _tmp = apply(:_HtmlBlockCloseLi)
-            _tmp = _tmp ? nil : true
-            self.pos = _save4
-            unless _tmp
-              self.pos = _save3
-              break
-            end
-            _tmp = get_byte
-            unless _tmp
-              self.pos = _save3
-            end
-            break
-          end # end sequence
-
-          break if _tmp
-          self.pos = _save2
-          break
-        end # end choice
-
-        break unless _tmp
-      end
-      _tmp = true
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = apply(:_HtmlBlockCloseLi)
-      unless _tmp
-        self.pos = _save
-      end
-      break
-    end # end sequence
-
-    set_failed_rule :_HtmlBlockLi unless _tmp
-    return _tmp
-  end
-
-  # HtmlBlockOpenTbody = "<" Spnl ("tbody" | "TBODY") Spnl HtmlAttribute* ">"
-  def _HtmlBlockOpenTbody
-
-    _save = self.pos
-    while true # sequence
-      _tmp = match_string("<")
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = apply(:_Spnl)
-      unless _tmp
-        self.pos = _save
-        break
-      end
-
-      _save1 = self.pos
-      while true # choice
-        _tmp = match_string("tbody")
-        break if _tmp
-        self.pos = _save1
-        _tmp = match_string("TBODY")
-        break if _tmp
-        self.pos = _save1
-        break
-      end # end choice
-
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = apply(:_Spnl)
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      while true
-        _tmp = apply(:_HtmlAttribute)
-        break unless _tmp
-      end
-      _tmp = true
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = match_string(">")
-      unless _tmp
-        self.pos = _save
-      end
-      break
-    end # end sequence
-
-    set_failed_rule :_HtmlBlockOpenTbody unless _tmp
-    return _tmp
-  end
-
-  # HtmlBlockCloseTbody = "<" Spnl "/" ("tbody" | "TBODY") Spnl ">"
-  def _HtmlBlockCloseTbody
-
-    _save = self.pos
-    while true # sequence
-      _tmp = match_string("<")
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = apply(:_Spnl)
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = match_string("/")
-      unless _tmp
-        self.pos = _save
-        break
-      end
-
-      _save1 = self.pos
-      while true # choice
-        _tmp = match_string("tbody")
-        break if _tmp
-        self.pos = _save1
-        _tmp = match_string("TBODY")
-        break if _tmp
-        self.pos = _save1
-        break
-      end # end choice
-
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = apply(:_Spnl)
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = match_string(">")
-      unless _tmp
-        self.pos = _save
-      end
-      break
-    end # end sequence
-
-    set_failed_rule :_HtmlBlockCloseTbody unless _tmp
-    return _tmp
-  end
-
-  # HtmlBlockTbody = HtmlBlockOpenTbody (HtmlBlockTbody | !HtmlBlockCloseTbody .)* HtmlBlockCloseTbody
-  def _HtmlBlockTbody
-
-    _save = self.pos
-    while true # sequence
-      _tmp = apply(:_HtmlBlockOpenTbody)
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      while true
-
-        _save2 = self.pos
-        while true # choice
-          _tmp = apply(:_HtmlBlockTbody)
-          break if _tmp
-          self.pos = _save2
-
-          _save3 = self.pos
-          while true # sequence
-            _save4 = self.pos
-            _tmp = apply(:_HtmlBlockCloseTbody)
-            _tmp = _tmp ? nil : true
-            self.pos = _save4
-            unless _tmp
-              self.pos = _save3
-              break
-            end
-            _tmp = get_byte
-            unless _tmp
-              self.pos = _save3
-            end
-            break
-          end # end sequence
-
-          break if _tmp
-          self.pos = _save2
-          break
-        end # end choice
-
-        break unless _tmp
-      end
-      _tmp = true
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = apply(:_HtmlBlockCloseTbody)
-      unless _tmp
-        self.pos = _save
-      end
-      break
-    end # end sequence
-
-    set_failed_rule :_HtmlBlockTbody unless _tmp
-    return _tmp
-  end
-
-  # HtmlBlockOpenTd = "<" Spnl ("td" | "TD") Spnl HtmlAttribute* ">"
-  def _HtmlBlockOpenTd
-
-    _save = self.pos
-    while true # sequence
-      _tmp = match_string("<")
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = apply(:_Spnl)
-      unless _tmp
-        self.pos = _save
-        break
-      end
-
-      _save1 = self.pos
-      while true # choice
-        _tmp = match_string("td")
-        break if _tmp
-        self.pos = _save1
-        _tmp = match_string("TD")
-        break if _tmp
-        self.pos = _save1
-        break
-      end # end choice
-
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = apply(:_Spnl)
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      while true
-        _tmp = apply(:_HtmlAttribute)
-        break unless _tmp
-      end
-      _tmp = true
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = match_string(">")
-      unless _tmp
-        self.pos = _save
-      end
-      break
-    end # end sequence
-
-    set_failed_rule :_HtmlBlockOpenTd unless _tmp
-    return _tmp
-  end
-
-  # HtmlBlockCloseTd = "<" Spnl "/" ("td" | "TD") Spnl ">"
-  def _HtmlBlockCloseTd
-
-    _save = self.pos
-    while true # sequence
-      _tmp = match_string("<")
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = apply(:_Spnl)
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = match_string("/")
-      unless _tmp
-        self.pos = _save
-        break
-      end
-
-      _save1 = self.pos
-      while true # choice
-        _tmp = match_string("td")
-        break if _tmp
-        self.pos = _save1
-        _tmp = match_string("TD")
-        break if _tmp
-        self.pos = _save1
-        break
-      end # end choice
-
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = apply(:_Spnl)
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = match_string(">")
-      unless _tmp
-        self.pos = _save
-      end
-      break
-    end # end sequence
-
-    set_failed_rule :_HtmlBlockCloseTd unless _tmp
-    return _tmp
-  end
-
-  # HtmlBlockTd = HtmlBlockOpenTd (HtmlBlockTd | !HtmlBlockCloseTd .)* HtmlBlockCloseTd
-  def _HtmlBlockTd
-
-    _save = self.pos
-    while true # sequence
-      _tmp = apply(:_HtmlBlockOpenTd)
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      while true
-
-        _save2 = self.pos
-        while true # choice
-          _tmp = apply(:_HtmlBlockTd)
-          break if _tmp
-          self.pos = _save2
-
-          _save3 = self.pos
-          while true # sequence
-            _save4 = self.pos
-            _tmp = apply(:_HtmlBlockCloseTd)
-            _tmp = _tmp ? nil : true
-            self.pos = _save4
-            unless _tmp
-              self.pos = _save3
-              break
-            end
-            _tmp = get_byte
-            unless _tmp
-              self.pos = _save3
-            end
-            break
-          end # end sequence
-
-          break if _tmp
-          self.pos = _save2
-          break
-        end # end choice
-
-        break unless _tmp
-      end
-      _tmp = true
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = apply(:_HtmlBlockCloseTd)
-      unless _tmp
-        self.pos = _save
-      end
-      break
-    end # end sequence
-
-    set_failed_rule :_HtmlBlockTd unless _tmp
-    return _tmp
-  end
-
-  # HtmlBlockOpenTfoot = "<" Spnl ("tfoot" | "TFOOT") Spnl HtmlAttribute* ">"
-  def _HtmlBlockOpenTfoot
-
-    _save = self.pos
-    while true # sequence
-      _tmp = match_string("<")
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = apply(:_Spnl)
-      unless _tmp
-        self.pos = _save
-        break
-      end
-
-      _save1 = self.pos
-      while true # choice
-        _tmp = match_string("tfoot")
-        break if _tmp
-        self.pos = _save1
-        _tmp = match_string("TFOOT")
-        break if _tmp
-        self.pos = _save1
-        break
-      end # end choice
-
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = apply(:_Spnl)
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      while true
-        _tmp = apply(:_HtmlAttribute)
-        break unless _tmp
-      end
-      _tmp = true
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = match_string(">")
-      unless _tmp
-        self.pos = _save
-      end
-      break
-    end # end sequence
-
-    set_failed_rule :_HtmlBlockOpenTfoot unless _tmp
-    return _tmp
-  end
-
-  # HtmlBlockCloseTfoot = "<" Spnl "/" ("tfoot" | "TFOOT") Spnl ">"
-  def _HtmlBlockCloseTfoot
-
-    _save = self.pos
-    while true # sequence
-      _tmp = match_string("<")
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = apply(:_Spnl)
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = match_string("/")
-      unless _tmp
-        self.pos = _save
-        break
-      end
-
-      _save1 = self.pos
-      while true # choice
-        _tmp = match_string("tfoot")
-        break if _tmp
-        self.pos = _save1
-        _tmp = match_string("TFOOT")
-        break if _tmp
-        self.pos = _save1
-        break
-      end # end choice
-
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = apply(:_Spnl)
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = match_string(">")
-      unless _tmp
-        self.pos = _save
-      end
-      break
-    end # end sequence
-
-    set_failed_rule :_HtmlBlockCloseTfoot unless _tmp
-    return _tmp
-  end
-
-  # HtmlBlockTfoot = HtmlBlockOpenTfoot (HtmlBlockTfoot | !HtmlBlockCloseTfoot .)* HtmlBlockCloseTfoot
-  def _HtmlBlockTfoot
-
-    _save = self.pos
-    while true # sequence
-      _tmp = apply(:_HtmlBlockOpenTfoot)
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      while true
-
-        _save2 = self.pos
-        while true # choice
-          _tmp = apply(:_HtmlBlockTfoot)
-          break if _tmp
-          self.pos = _save2
-
-          _save3 = self.pos
-          while true # sequence
-            _save4 = self.pos
-            _tmp = apply(:_HtmlBlockCloseTfoot)
-            _tmp = _tmp ? nil : true
-            self.pos = _save4
-            unless _tmp
-              self.pos = _save3
-              break
-            end
-            _tmp = get_byte
-            unless _tmp
-              self.pos = _save3
-            end
-            break
-          end # end sequence
-
-          break if _tmp
-          self.pos = _save2
-          break
-        end # end choice
-
-        break unless _tmp
-      end
-      _tmp = true
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = apply(:_HtmlBlockCloseTfoot)
-      unless _tmp
-        self.pos = _save
-      end
-      break
-    end # end sequence
-
-    set_failed_rule :_HtmlBlockTfoot unless _tmp
-    return _tmp
-  end
-
-  # HtmlBlockOpenTh = "<" Spnl ("th" | "TH") Spnl HtmlAttribute* ">"
-  def _HtmlBlockOpenTh
-
-    _save = self.pos
-    while true # sequence
-      _tmp = match_string("<")
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = apply(:_Spnl)
-      unless _tmp
-        self.pos = _save
-        break
-      end
-
-      _save1 = self.pos
-      while true # choice
-        _tmp = match_string("th")
-        break if _tmp
-        self.pos = _save1
-        _tmp = match_string("TH")
-        break if _tmp
-        self.pos = _save1
-        break
-      end # end choice
-
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = apply(:_Spnl)
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      while true
-        _tmp = apply(:_HtmlAttribute)
-        break unless _tmp
-      end
-      _tmp = true
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = match_string(">")
-      unless _tmp
-        self.pos = _save
-      end
-      break
-    end # end sequence
-
-    set_failed_rule :_HtmlBlockOpenTh unless _tmp
-    return _tmp
-  end
-
-  # HtmlBlockCloseTh = "<" Spnl "/" ("th" | "TH") Spnl ">"
-  def _HtmlBlockCloseTh
-
-    _save = self.pos
-    while true # sequence
-      _tmp = match_string("<")
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = apply(:_Spnl)
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = match_string("/")
-      unless _tmp
-        self.pos = _save
-        break
-      end
-
-      _save1 = self.pos
-      while true # choice
-        _tmp = match_string("th")
-        break if _tmp
-        self.pos = _save1
-        _tmp = match_string("TH")
-        break if _tmp
-        self.pos = _save1
-        break
-      end # end choice
-
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = apply(:_Spnl)
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = match_string(">")
-      unless _tmp
-        self.pos = _save
-      end
-      break
-    end # end sequence
-
-    set_failed_rule :_HtmlBlockCloseTh unless _tmp
-    return _tmp
-  end
-
-  # HtmlBlockTh = HtmlBlockOpenTh (HtmlBlockTh | !HtmlBlockCloseTh .)* HtmlBlockCloseTh
-  def _HtmlBlockTh
-
-    _save = self.pos
-    while true # sequence
-      _tmp = apply(:_HtmlBlockOpenTh)
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      while true
-
-        _save2 = self.pos
-        while true # choice
-          _tmp = apply(:_HtmlBlockTh)
-          break if _tmp
-          self.pos = _save2
-
-          _save3 = self.pos
-          while true # sequence
-            _save4 = self.pos
-            _tmp = apply(:_HtmlBlockCloseTh)
-            _tmp = _tmp ? nil : true
-            self.pos = _save4
-            unless _tmp
-              self.pos = _save3
-              break
-            end
-            _tmp = get_byte
-            unless _tmp
-              self.pos = _save3
-            end
-            break
-          end # end sequence
-
-          break if _tmp
-          self.pos = _save2
-          break
-        end # end choice
-
-        break unless _tmp
-      end
-      _tmp = true
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = apply(:_HtmlBlockCloseTh)
-      unless _tmp
-        self.pos = _save
-      end
-      break
-    end # end sequence
-
-    set_failed_rule :_HtmlBlockTh unless _tmp
-    return _tmp
-  end
-
-  # HtmlBlockOpenThead = "<" Spnl ("thead" | "THEAD") Spnl HtmlAttribute* ">"
-  def _HtmlBlockOpenThead
-
-    _save = self.pos
-    while true # sequence
-      _tmp = match_string("<")
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = apply(:_Spnl)
-      unless _tmp
-        self.pos = _save
-        break
-      end
-
-      _save1 = self.pos
-      while true # choice
-        _tmp = match_string("thead")
-        break if _tmp
-        self.pos = _save1
-        _tmp = match_string("THEAD")
-        break if _tmp
-        self.pos = _save1
-        break
-      end # end choice
-
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = apply(:_Spnl)
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      while true
-        _tmp = apply(:_HtmlAttribute)
-        break unless _tmp
-      end
-      _tmp = true
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = match_string(">")
-      unless _tmp
-        self.pos = _save
-      end
-      break
-    end # end sequence
-
-    set_failed_rule :_HtmlBlockOpenThead unless _tmp
-    return _tmp
-  end
-
-  # HtmlBlockCloseThead = "<" Spnl "/" ("thead" | "THEAD") Spnl ">"
-  def _HtmlBlockCloseThead
-
-    _save = self.pos
-    while true # sequence
-      _tmp = match_string("<")
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = apply(:_Spnl)
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = match_string("/")
-      unless _tmp
-        self.pos = _save
-        break
-      end
-
-      _save1 = self.pos
-      while true # choice
-        _tmp = match_string("thead")
-        break if _tmp
-        self.pos = _save1
-        _tmp = match_string("THEAD")
-        break if _tmp
-        self.pos = _save1
-        break
-      end # end choice
-
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = apply(:_Spnl)
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = match_string(">")
-      unless _tmp
-        self.pos = _save
-      end
-      break
-    end # end sequence
-
-    set_failed_rule :_HtmlBlockCloseThead unless _tmp
-    return _tmp
-  end
-
-  # HtmlBlockThead = HtmlBlockOpenThead (HtmlBlockThead | !HtmlBlockCloseThead .)* HtmlBlockCloseThead
-  def _HtmlBlockThead
-
-    _save = self.pos
-    while true # sequence
-      _tmp = apply(:_HtmlBlockOpenThead)
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      while true
-
-        _save2 = self.pos
-        while true # choice
-          _tmp = apply(:_HtmlBlockThead)
-          break if _tmp
-          self.pos = _save2
-
-          _save3 = self.pos
-          while true # sequence
-            _save4 = self.pos
-            _tmp = apply(:_HtmlBlockCloseThead)
-            _tmp = _tmp ? nil : true
-            self.pos = _save4
-            unless _tmp
-              self.pos = _save3
-              break
-            end
-            _tmp = get_byte
-            unless _tmp
-              self.pos = _save3
-            end
-            break
-          end # end sequence
-
-          break if _tmp
-          self.pos = _save2
-          break
-        end # end choice
-
-        break unless _tmp
-      end
-      _tmp = true
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = apply(:_HtmlBlockCloseThead)
-      unless _tmp
-        self.pos = _save
-      end
-      break
-    end # end sequence
-
-    set_failed_rule :_HtmlBlockThead unless _tmp
-    return _tmp
-  end
-
-  # HtmlBlockOpenTr = "<" Spnl ("tr" | "TR") Spnl HtmlAttribute* ">"
-  def _HtmlBlockOpenTr
-
-    _save = self.pos
-    while true # sequence
-      _tmp = match_string("<")
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = apply(:_Spnl)
-      unless _tmp
-        self.pos = _save
-        break
-      end
-
-      _save1 = self.pos
-      while true # choice
-        _tmp = match_string("tr")
-        break if _tmp
-        self.pos = _save1
-        _tmp = match_string("TR")
-        break if _tmp
-        self.pos = _save1
-        break
-      end # end choice
-
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = apply(:_Spnl)
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      while true
-        _tmp = apply(:_HtmlAttribute)
-        break unless _tmp
-      end
-      _tmp = true
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = match_string(">")
-      unless _tmp
-        self.pos = _save
-      end
-      break
-    end # end sequence
-
-    set_failed_rule :_HtmlBlockOpenTr unless _tmp
-    return _tmp
-  end
-
-  # HtmlBlockCloseTr = "<" Spnl "/" ("tr" | "TR") Spnl ">"
-  def _HtmlBlockCloseTr
-
-    _save = self.pos
-    while true # sequence
-      _tmp = match_string("<")
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = apply(:_Spnl)
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = match_string("/")
-      unless _tmp
-        self.pos = _save
-        break
-      end
-
-      _save1 = self.pos
-      while true # choice
-        _tmp = match_string("tr")
-        break if _tmp
-        self.pos = _save1
-        _tmp = match_string("TR")
-        break if _tmp
-        self.pos = _save1
-        break
-      end # end choice
-
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = apply(:_Spnl)
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = match_string(">")
-      unless _tmp
-        self.pos = _save
-      end
-      break
-    end # end sequence
-
-    set_failed_rule :_HtmlBlockCloseTr unless _tmp
-    return _tmp
-  end
-
-  # HtmlBlockTr = HtmlBlockOpenTr (HtmlBlockTr | !HtmlBlockCloseTr .)* HtmlBlockCloseTr
-  def _HtmlBlockTr
-
-    _save = self.pos
-    while true # sequence
-      _tmp = apply(:_HtmlBlockOpenTr)
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      while true
-
-        _save2 = self.pos
-        while true # choice
-          _tmp = apply(:_HtmlBlockTr)
-          break if _tmp
-          self.pos = _save2
-
-          _save3 = self.pos
-          while true # sequence
-            _save4 = self.pos
-            _tmp = apply(:_HtmlBlockCloseTr)
-            _tmp = _tmp ? nil : true
-            self.pos = _save4
-            unless _tmp
-              self.pos = _save3
-              break
-            end
-            _tmp = get_byte
-            unless _tmp
-              self.pos = _save3
-            end
-            break
-          end # end sequence
-
-          break if _tmp
-          self.pos = _save2
-          break
-        end # end choice
-
-        break unless _tmp
-      end
-      _tmp = true
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = apply(:_HtmlBlockCloseTr)
-      unless _tmp
-        self.pos = _save
-      end
-      break
-    end # end sequence
-
-    set_failed_rule :_HtmlBlockTr unless _tmp
-    return _tmp
-  end
-
-  # HtmlBlockOpenScript = "<" Spnl ("script" | "SCRIPT") Spnl HtmlAttribute* ">"
-  def _HtmlBlockOpenScript
-
-    _save = self.pos
-    while true # sequence
-      _tmp = match_string("<")
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = apply(:_Spnl)
-      unless _tmp
-        self.pos = _save
-        break
-      end
-
-      _save1 = self.pos
-      while true # choice
-        _tmp = match_string("script")
-        break if _tmp
-        self.pos = _save1
-        _tmp = match_string("SCRIPT")
-        break if _tmp
-        self.pos = _save1
-        break
-      end # end choice
-
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = apply(:_Spnl)
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      while true
-        _tmp = apply(:_HtmlAttribute)
-        break unless _tmp
-      end
-      _tmp = true
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = match_string(">")
-      unless _tmp
-        self.pos = _save
-      end
-      break
-    end # end sequence
-
-    set_failed_rule :_HtmlBlockOpenScript unless _tmp
-    return _tmp
-  end
-
-  # HtmlBlockCloseScript = "<" Spnl "/" ("script" | "SCRIPT") Spnl ">"
-  def _HtmlBlockCloseScript
-
-    _save = self.pos
-    while true # sequence
-      _tmp = match_string("<")
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = apply(:_Spnl)
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = match_string("/")
-      unless _tmp
-        self.pos = _save
-        break
-      end
-
-      _save1 = self.pos
-      while true # choice
-        _tmp = match_string("script")
-        break if _tmp
-        self.pos = _save1
-        _tmp = match_string("SCRIPT")
-        break if _tmp
-        self.pos = _save1
-        break
-      end # end choice
-
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = apply(:_Spnl)
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = match_string(">")
-      unless _tmp
-        self.pos = _save
-      end
-      break
-    end # end sequence
-
-    set_failed_rule :_HtmlBlockCloseScript unless _tmp
-    return _tmp
-  end
-
-  # HtmlBlockScript = HtmlBlockOpenScript (!HtmlBlockCloseScript .)* HtmlBlockCloseScript
-  def _HtmlBlockScript
-
-    _save = self.pos
-    while true # sequence
-      _tmp = apply(:_HtmlBlockOpenScript)
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      while true
-
-        _save2 = self.pos
-        while true # sequence
-          _save3 = self.pos
-          _tmp = apply(:_HtmlBlockCloseScript)
-          _tmp = _tmp ? nil : true
-          self.pos = _save3
-          unless _tmp
-            self.pos = _save2
-            break
-          end
-          _tmp = get_byte
-          unless _tmp
-            self.pos = _save2
-          end
-          break
-        end # end sequence
-
-        break unless _tmp
-      end
-      _tmp = true
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = apply(:_HtmlBlockCloseScript)
-      unless _tmp
-        self.pos = _save
-      end
-      break
-    end # end sequence
-
-    set_failed_rule :_HtmlBlockScript unless _tmp
-    return _tmp
-  end
-
-  # HtmlBlockOpenHead = "<" Spnl ("head" | "HEAD") Spnl HtmlAttribute* ">"
-  def _HtmlBlockOpenHead
-
-    _save = self.pos
-    while true # sequence
-      _tmp = match_string("<")
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = apply(:_Spnl)
-      unless _tmp
-        self.pos = _save
-        break
-      end
-
-      _save1 = self.pos
-      while true # choice
-        _tmp = match_string("head")
-        break if _tmp
-        self.pos = _save1
-        _tmp = match_string("HEAD")
-        break if _tmp
-        self.pos = _save1
-        break
-      end # end choice
-
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = apply(:_Spnl)
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      while true
-        _tmp = apply(:_HtmlAttribute)
-        break unless _tmp
-      end
-      _tmp = true
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = match_string(">")
-      unless _tmp
-        self.pos = _save
-      end
-      break
-    end # end sequence
-
-    set_failed_rule :_HtmlBlockOpenHead unless _tmp
-    return _tmp
-  end
-
-  # HtmlBlockCloseHead = "<" Spnl "/" ("head" | "HEAD") Spnl ">"
-  def _HtmlBlockCloseHead
-
-    _save = self.pos
-    while true # sequence
-      _tmp = match_string("<")
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = apply(:_Spnl)
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = match_string("/")
-      unless _tmp
-        self.pos = _save
-        break
-      end
-
-      _save1 = self.pos
-      while true # choice
-        _tmp = match_string("head")
-        break if _tmp
-        self.pos = _save1
-        _tmp = match_string("HEAD")
-        break if _tmp
-        self.pos = _save1
-        break
-      end # end choice
-
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = apply(:_Spnl)
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = match_string(">")
-      unless _tmp
-        self.pos = _save
-      end
-      break
-    end # end sequence
-
-    set_failed_rule :_HtmlBlockCloseHead unless _tmp
-    return _tmp
-  end
-
-  # HtmlBlockHead = HtmlBlockOpenHead (!HtmlBlockCloseHead .)* HtmlBlockCloseHead
-  def _HtmlBlockHead
-
-    _save = self.pos
-    while true # sequence
-      _tmp = apply(:_HtmlBlockOpenHead)
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      while true
-
-        _save2 = self.pos
-        while true # sequence
-          _save3 = self.pos
-          _tmp = apply(:_HtmlBlockCloseHead)
-          _tmp = _tmp ? nil : true
-          self.pos = _save3
-          unless _tmp
-            self.pos = _save2
-            break
-          end
-          _tmp = get_byte
-          unless _tmp
-            self.pos = _save2
-          end
-          break
-        end # end sequence
-
-        break unless _tmp
-      end
-      _tmp = true
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = apply(:_HtmlBlockCloseHead)
-      unless _tmp
-        self.pos = _save
-      end
-      break
-    end # end sequence
-
-    set_failed_rule :_HtmlBlockHead unless _tmp
-    return _tmp
-  end
-
-  # HtmlBlockInTags = (HtmlAnchor | HtmlBlockAddress | HtmlBlockBlockquote | HtmlBlockCenter | HtmlBlockDir | HtmlBlockDiv | HtmlBlockDl | HtmlBlockFieldset | HtmlBlockForm | HtmlBlockH1 | HtmlBlockH2 | HtmlBlockH3 | HtmlBlockH4 | HtmlBlockH5 | HtmlBlockH6 | HtmlBlockMenu | HtmlBlockNoframes | HtmlBlockNoscript | HtmlBlockOl | HtmlBlockP | HtmlBlockPre | HtmlBlockTable | HtmlBlockUl | HtmlBlockDd | HtmlBlockDt | HtmlBlockFrameset | HtmlBlockLi | HtmlBlockTbody | HtmlBlockTd | HtmlBlockTfoot | HtmlBlockTh | HtmlBlockThead | HtmlBlockTr | HtmlBlockScript | HtmlBlockHead)
-  def _HtmlBlockInTags
-
-    _save = self.pos
-    while true # choice
-      _tmp = apply(:_HtmlAnchor)
-      break if _tmp
-      self.pos = _save
-      _tmp = apply(:_HtmlBlockAddress)
-      break if _tmp
-      self.pos = _save
-      _tmp = apply(:_HtmlBlockBlockquote)
-      break if _tmp
-      self.pos = _save
-      _tmp = apply(:_HtmlBlockCenter)
-      break if _tmp
-      self.pos = _save
-      _tmp = apply(:_HtmlBlockDir)
-      break if _tmp
-      self.pos = _save
-      _tmp = apply(:_HtmlBlockDiv)
-      break if _tmp
-      self.pos = _save
-      _tmp = apply(:_HtmlBlockDl)
-      break if _tmp
-      self.pos = _save
-      _tmp = apply(:_HtmlBlockFieldset)
-      break if _tmp
-      self.pos = _save
-      _tmp = apply(:_HtmlBlockForm)
-      break if _tmp
-      self.pos = _save
-      _tmp = apply(:_HtmlBlockH1)
-      break if _tmp
-      self.pos = _save
-      _tmp = apply(:_HtmlBlockH2)
-      break if _tmp
-      self.pos = _save
-      _tmp = apply(:_HtmlBlockH3)
-      break if _tmp
-      self.pos = _save
-      _tmp = apply(:_HtmlBlockH4)
-      break if _tmp
-      self.pos = _save
-      _tmp = apply(:_HtmlBlockH5)
-      break if _tmp
-      self.pos = _save
-      _tmp = apply(:_HtmlBlockH6)
-      break if _tmp
-      self.pos = _save
-      _tmp = apply(:_HtmlBlockMenu)
-      break if _tmp
-      self.pos = _save
-      _tmp = apply(:_HtmlBlockNoframes)
-      break if _tmp
-      self.pos = _save
-      _tmp = apply(:_HtmlBlockNoscript)
-      break if _tmp
-      self.pos = _save
-      _tmp = apply(:_HtmlBlockOl)
-      break if _tmp
-      self.pos = _save
-      _tmp = apply(:_HtmlBlockP)
-      break if _tmp
-      self.pos = _save
-      _tmp = apply(:_HtmlBlockPre)
-      break if _tmp
-      self.pos = _save
-      _tmp = apply(:_HtmlBlockTable)
-      break if _tmp
-      self.pos = _save
-      _tmp = apply(:_HtmlBlockUl)
-      break if _tmp
-      self.pos = _save
-      _tmp = apply(:_HtmlBlockDd)
-      break if _tmp
-      self.pos = _save
-      _tmp = apply(:_HtmlBlockDt)
-      break if _tmp
-      self.pos = _save
-      _tmp = apply(:_HtmlBlockFrameset)
-      break if _tmp
-      self.pos = _save
-      _tmp = apply(:_HtmlBlockLi)
-      break if _tmp
-      self.pos = _save
-      _tmp = apply(:_HtmlBlockTbody)
-      break if _tmp
-      self.pos = _save
-      _tmp = apply(:_HtmlBlockTd)
-      break if _tmp
-      self.pos = _save
-      _tmp = apply(:_HtmlBlockTfoot)
-      break if _tmp
-      self.pos = _save
-      _tmp = apply(:_HtmlBlockTh)
-      break if _tmp
-      self.pos = _save
-      _tmp = apply(:_HtmlBlockThead)
-      break if _tmp
-      self.pos = _save
-      _tmp = apply(:_HtmlBlockTr)
-      break if _tmp
-      self.pos = _save
-      _tmp = apply(:_HtmlBlockScript)
-      break if _tmp
-      self.pos = _save
-      _tmp = apply(:_HtmlBlockHead)
-      break if _tmp
-      self.pos = _save
-      break
-    end # end choice
-
-    set_failed_rule :_HtmlBlockInTags unless _tmp
-    return _tmp
-  end
-
-  # HtmlBlock = < (HtmlBlockInTags | HtmlComment | HtmlBlockSelfClosing | HtmlUnclosed) > @BlankLine+ { if html? then                 RDoc::Markup::Raw.new text               end }
-  def _HtmlBlock
-
-    _save = self.pos
-    while true # sequence
-      _text_start = self.pos
-
-      _save1 = self.pos
-      while true # choice
-        _tmp = apply(:_HtmlBlockInTags)
-        break if _tmp
-        self.pos = _save1
-        _tmp = apply(:_HtmlComment)
-        break if _tmp
-        self.pos = _save1
-        _tmp = apply(:_HtmlBlockSelfClosing)
-        break if _tmp
-        self.pos = _save1
-        _tmp = apply(:_HtmlUnclosed)
-        break if _tmp
-        self.pos = _save1
-        break
-      end # end choice
-
-      if _tmp
-        text = get_text(_text_start)
-      end
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _save2 = self.pos
-      _tmp = _BlankLine()
-      if _tmp
-        while true
-          _tmp = _BlankLine()
-          break unless _tmp
-        end
-        _tmp = true
-      else
-        self.pos = _save2
-      end
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      @result = begin;  if html? then
-                RDoc::Markup::Raw.new text
-              end ; end
-      _tmp = true
-      unless _tmp
-        self.pos = _save
-      end
-      break
-    end # end sequence
-
-    set_failed_rule :_HtmlBlock unless _tmp
-    return _tmp
-  end
-
-  # HtmlUnclosed = "<" Spnl HtmlUnclosedType Spnl HtmlAttribute* Spnl ">"
-  def _HtmlUnclosed
-
-    _save = self.pos
-    while true # sequence
-      _tmp = match_string("<")
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = apply(:_Spnl)
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = apply(:_HtmlUnclosedType)
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = apply(:_Spnl)
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      while true
-        _tmp = apply(:_HtmlAttribute)
-        break unless _tmp
-      end
-      _tmp = true
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = apply(:_Spnl)
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = match_string(">")
-      unless _tmp
-        self.pos = _save
-      end
-      break
-    end # end sequence
-
-    set_failed_rule :_HtmlUnclosed unless _tmp
-    return _tmp
-  end
-
-  # HtmlUnclosedType = ("HR" | "hr")
-  def _HtmlUnclosedType
-
-    _save = self.pos
-    while true # choice
-      _tmp = match_string("HR")
-      break if _tmp
-      self.pos = _save
-      _tmp = match_string("hr")
-      break if _tmp
-      self.pos = _save
-      break
-    end # end choice
-
-    set_failed_rule :_HtmlUnclosedType unless _tmp
-    return _tmp
-  end
-
-  # HtmlBlockSelfClosing = "<" Spnl HtmlBlockType Spnl HtmlAttribute* "/" Spnl ">"
-  def _HtmlBlockSelfClosing
-
-    _save = self.pos
-    while true # sequence
-      _tmp = match_string("<")
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = apply(:_Spnl)
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = apply(:_HtmlBlockType)
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = apply(:_Spnl)
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      while true
-        _tmp = apply(:_HtmlAttribute)
-        break unless _tmp
-      end
-      _tmp = true
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = match_string("/")
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = apply(:_Spnl)
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = match_string(">")
-      unless _tmp
-        self.pos = _save
-      end
-      break
-    end # end sequence
-
-    set_failed_rule :_HtmlBlockSelfClosing unless _tmp
-    return _tmp
-  end
-
-  # HtmlBlockType = ("ADDRESS" | "BLOCKQUOTE" | "CENTER" | "DD" | "DIR" | "DIV" | "DL" | "DT" | "FIELDSET" | "FORM" | "FRAMESET" | "H1" | "H2" | "H3" | "H4" | "H5" | "H6" | "HR" | "ISINDEX" | "LI" | "MENU" | "NOFRAMES" | "NOSCRIPT" | "OL" | "P" | "PRE" | "SCRIPT" | "TABLE" | "TBODY" | "TD" | "TFOOT" | "TH" | "THEAD" | "TR" | "UL" | "address" | "blockquote" | "center" | "dd" | "dir" | "div" | "dl" | "dt" | "fieldset" | "form" | "frameset" | "h1" | "h2" | "h3" | "h4" | "h5" | "h6" | "hr" | "isindex" | "li" | "menu" | "noframes" | "noscript" | "ol" | "p" | "pre" | "script" | "table" | "tbody" | "td" | "tfoot" | "th" | "thead" | "tr" | "ul")
-  def _HtmlBlockType
-
-    _save = self.pos
-    while true # choice
-      _tmp = match_string("ADDRESS")
-      break if _tmp
-      self.pos = _save
-      _tmp = match_string("BLOCKQUOTE")
-      break if _tmp
-      self.pos = _save
-      _tmp = match_string("CENTER")
-      break if _tmp
-      self.pos = _save
-      _tmp = match_string("DD")
-      break if _tmp
-      self.pos = _save
-      _tmp = match_string("DIR")
-      break if _tmp
-      self.pos = _save
-      _tmp = match_string("DIV")
-      break if _tmp
-      self.pos = _save
-      _tmp = match_string("DL")
-      break if _tmp
-      self.pos = _save
-      _tmp = match_string("DT")
-      break if _tmp
-      self.pos = _save
-      _tmp = match_string("FIELDSET")
-      break if _tmp
-      self.pos = _save
-      _tmp = match_string("FORM")
-      break if _tmp
-      self.pos = _save
-      _tmp = match_string("FRAMESET")
-      break if _tmp
-      self.pos = _save
-      _tmp = match_string("H1")
-      break if _tmp
-      self.pos = _save
-      _tmp = match_string("H2")
-      break if _tmp
-      self.pos = _save
-      _tmp = match_string("H3")
-      break if _tmp
-      self.pos = _save
-      _tmp = match_string("H4")
-      break if _tmp
-      self.pos = _save
-      _tmp = match_string("H5")
-      break if _tmp
-      self.pos = _save
-      _tmp = match_string("H6")
-      break if _tmp
-      self.pos = _save
-      _tmp = match_string("HR")
-      break if _tmp
-      self.pos = _save
-      _tmp = match_string("ISINDEX")
-      break if _tmp
-      self.pos = _save
-      _tmp = match_string("LI")
-      break if _tmp
-      self.pos = _save
-      _tmp = match_string("MENU")
-      break if _tmp
-      self.pos = _save
-      _tmp = match_string("NOFRAMES")
-      break if _tmp
-      self.pos = _save
-      _tmp = match_string("NOSCRIPT")
-      break if _tmp
-      self.pos = _save
-      _tmp = match_string("OL")
-      break if _tmp
-      self.pos = _save
-      _tmp = match_string("P")
-      break if _tmp
-      self.pos = _save
-      _tmp = match_string("PRE")
-      break if _tmp
-      self.pos = _save
-      _tmp = match_string("SCRIPT")
-      break if _tmp
-      self.pos = _save
-      _tmp = match_string("TABLE")
-      break if _tmp
-      self.pos = _save
-      _tmp = match_string("TBODY")
-      break if _tmp
-      self.pos = _save
-      _tmp = match_string("TD")
-      break if _tmp
-      self.pos = _save
-      _tmp = match_string("TFOOT")
-      break if _tmp
-      self.pos = _save
-      _tmp = match_string("TH")
-      break if _tmp
-      self.pos = _save
-      _tmp = match_string("THEAD")
-      break if _tmp
-      self.pos = _save
-      _tmp = match_string("TR")
-      break if _tmp
-      self.pos = _save
-      _tmp = match_string("UL")
-      break if _tmp
-      self.pos = _save
-      _tmp = match_string("address")
-      break if _tmp
-      self.pos = _save
-      _tmp = match_string("blockquote")
-      break if _tmp
-      self.pos = _save
-      _tmp = match_string("center")
-      break if _tmp
-      self.pos = _save
-      _tmp = match_string("dd")
-      break if _tmp
-      self.pos = _save
-      _tmp = match_string("dir")
-      break if _tmp
-      self.pos = _save
-      _tmp = match_string("div")
-      break if _tmp
-      self.pos = _save
-      _tmp = match_string("dl")
-      break if _tmp
-      self.pos = _save
-      _tmp = match_string("dt")
-      break if _tmp
-      self.pos = _save
-      _tmp = match_string("fieldset")
-      break if _tmp
-      self.pos = _save
-      _tmp = match_string("form")
-      break if _tmp
-      self.pos = _save
-      _tmp = match_string("frameset")
-      break if _tmp
-      self.pos = _save
-      _tmp = match_string("h1")
-      break if _tmp
-      self.pos = _save
-      _tmp = match_string("h2")
-      break if _tmp
-      self.pos = _save
-      _tmp = match_string("h3")
-      break if _tmp
-      self.pos = _save
-      _tmp = match_string("h4")
-      break if _tmp
-      self.pos = _save
-      _tmp = match_string("h5")
-      break if _tmp
-      self.pos = _save
-      _tmp = match_string("h6")
-      break if _tmp
-      self.pos = _save
-      _tmp = match_string("hr")
-      break if _tmp
-      self.pos = _save
-      _tmp = match_string("isindex")
-      break if _tmp
-      self.pos = _save
-      _tmp = match_string("li")
-      break if _tmp
-      self.pos = _save
-      _tmp = match_string("menu")
-      break if _tmp
-      self.pos = _save
-      _tmp = match_string("noframes")
-      break if _tmp
-      self.pos = _save
-      _tmp = match_string("noscript")
-      break if _tmp
-      self.pos = _save
-      _tmp = match_string("ol")
-      break if _tmp
-      self.pos = _save
-      _tmp = match_string("p")
-      break if _tmp
-      self.pos = _save
-      _tmp = match_string("pre")
-      break if _tmp
-      self.pos = _save
-      _tmp = match_string("script")
-      break if _tmp
-      self.pos = _save
-      _tmp = match_string("table")
-      break if _tmp
-      self.pos = _save
-      _tmp = match_string("tbody")
-      break if _tmp
-      self.pos = _save
-      _tmp = match_string("td")
-      break if _tmp
-      self.pos = _save
-      _tmp = match_string("tfoot")
-      break if _tmp
-      self.pos = _save
-      _tmp = match_string("th")
-      break if _tmp
-      self.pos = _save
-      _tmp = match_string("thead")
-      break if _tmp
-      self.pos = _save
-      _tmp = match_string("tr")
-      break if _tmp
-      self.pos = _save
-      _tmp = match_string("ul")
-      break if _tmp
-      self.pos = _save
-      break
-    end # end choice
-
-    set_failed_rule :_HtmlBlockType unless _tmp
-    return _tmp
-  end
-
-  # StyleOpen = "<" Spnl ("style" | "STYLE") Spnl HtmlAttribute* ">"
-  def _StyleOpen
-
-    _save = self.pos
-    while true # sequence
-      _tmp = match_string("<")
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = apply(:_Spnl)
-      unless _tmp
-        self.pos = _save
-        break
-      end
-
-      _save1 = self.pos
-      while true # choice
-        _tmp = match_string("style")
-        break if _tmp
-        self.pos = _save1
-        _tmp = match_string("STYLE")
-        break if _tmp
-        self.pos = _save1
-        break
-      end # end choice
-
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = apply(:_Spnl)
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      while true
-        _tmp = apply(:_HtmlAttribute)
-        break unless _tmp
-      end
-      _tmp = true
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = match_string(">")
-      unless _tmp
-        self.pos = _save
-      end
-      break
-    end # end sequence
-
-    set_failed_rule :_StyleOpen unless _tmp
-    return _tmp
-  end
-
-  # StyleClose = "<" Spnl "/" ("style" | "STYLE") Spnl ">"
-  def _StyleClose
-
-    _save = self.pos
-    while true # sequence
-      _tmp = match_string("<")
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = apply(:_Spnl)
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = match_string("/")
-      unless _tmp
-        self.pos = _save
-        break
-      end
-
-      _save1 = self.pos
-      while true # choice
-        _tmp = match_string("style")
-        break if _tmp
-        self.pos = _save1
-        _tmp = match_string("STYLE")
-        break if _tmp
-        self.pos = _save1
-        break
-      end # end choice
-
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = apply(:_Spnl)
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = match_string(">")
-      unless _tmp
-        self.pos = _save
-      end
-      break
-    end # end sequence
-
-    set_failed_rule :_StyleClose unless _tmp
-    return _tmp
-  end
-
-  # InStyleTags = StyleOpen (!StyleClose .)* StyleClose
-  def _InStyleTags
-
-    _save = self.pos
-    while true # sequence
-      _tmp = apply(:_StyleOpen)
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      while true
-
-        _save2 = self.pos
-        while true # sequence
-          _save3 = self.pos
-          _tmp = apply(:_StyleClose)
-          _tmp = _tmp ? nil : true
-          self.pos = _save3
-          unless _tmp
-            self.pos = _save2
-            break
-          end
-          _tmp = get_byte
-          unless _tmp
-            self.pos = _save2
-          end
-          break
-        end # end sequence
-
-        break unless _tmp
-      end
-      _tmp = true
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = apply(:_StyleClose)
-      unless _tmp
-        self.pos = _save
-      end
-      break
-    end # end sequence
-
-    set_failed_rule :_InStyleTags unless _tmp
-    return _tmp
-  end
-
-  # StyleBlock = < InStyleTags > @BlankLine* { if css? then                     RDoc::Markup::Raw.new text                   end }
-  def _StyleBlock
-
-    _save = self.pos
-    while true # sequence
-      _text_start = self.pos
-      _tmp = apply(:_InStyleTags)
-      if _tmp
-        text = get_text(_text_start)
-      end
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      while true
-        _tmp = _BlankLine()
-        break unless _tmp
-      end
-      _tmp = true
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      @result = begin;  if css? then
-                    RDoc::Markup::Raw.new text
-                  end ; end
-      _tmp = true
-      unless _tmp
-        self.pos = _save
-      end
-      break
-    end # end sequence
-
-    set_failed_rule :_StyleBlock unless _tmp
-    return _tmp
-  end
-
-  # Inlines = (!@Endline Inline:i { i } | @Endline:c !(&{ github? } Ticks3 /[^`\n]*$/) &Inline { c })+:chunks @Endline? { chunks }
-  def _Inlines
-
-    _save = self.pos
-    while true # sequence
-      _save1 = self.pos
-      _ary = []
-
-      _save2 = self.pos
-      while true # choice
-
-        _save3 = self.pos
-        while true # sequence
-          _save4 = self.pos
-          _tmp = _Endline()
-          _tmp = _tmp ? nil : true
-          self.pos = _save4
-          unless _tmp
-            self.pos = _save3
-            break
-          end
-          _tmp = apply(:_Inline)
-          i = @result
-          unless _tmp
-            self.pos = _save3
-            break
-          end
-          @result = begin;  i ; end
-          _tmp = true
-          unless _tmp
-            self.pos = _save3
-          end
-          break
-        end # end sequence
-
-        break if _tmp
-        self.pos = _save2
-
-        _save5 = self.pos
-        while true # sequence
-          _tmp = _Endline()
-          c = @result
-          unless _tmp
-            self.pos = _save5
-            break
-          end
-          _save6 = self.pos
-
-          _save7 = self.pos
-          while true # sequence
-            _save8 = self.pos
-            _tmp = begin;  github? ; end
-            self.pos = _save8
-            unless _tmp
-              self.pos = _save7
-              break
-            end
-            _tmp = apply(:_Ticks3)
-            unless _tmp
-              self.pos = _save7
-              break
-            end
-            _tmp = scan(/\G(?-mix:[^`\n]*$)/)
-            unless _tmp
-              self.pos = _save7
-            end
-            break
-          end # end sequence
-
-          _tmp = _tmp ? nil : true
-          self.pos = _save6
-          unless _tmp
-            self.pos = _save5
-            break
-          end
-          _save9 = self.pos
-          _tmp = apply(:_Inline)
-          self.pos = _save9
-          unless _tmp
-            self.pos = _save5
-            break
-          end
-          @result = begin;  c ; end
-          _tmp = true
-          unless _tmp
-            self.pos = _save5
-          end
-          break
-        end # end sequence
-
-        break if _tmp
-        self.pos = _save2
-        break
-      end # end choice
-
-      if _tmp
-        _ary << @result
-        while true
-
-          _save10 = self.pos
-          while true # choice
-
-            _save11 = self.pos
-            while true # sequence
-              _save12 = self.pos
-              _tmp = _Endline()
-              _tmp = _tmp ? nil : true
-              self.pos = _save12
-              unless _tmp
-                self.pos = _save11
-                break
-              end
-              _tmp = apply(:_Inline)
-              i = @result
-              unless _tmp
-                self.pos = _save11
-                break
-              end
-              @result = begin;  i ; end
-              _tmp = true
-              unless _tmp
-                self.pos = _save11
-              end
-              break
-            end # end sequence
-
-            break if _tmp
-            self.pos = _save10
-
-            _save13 = self.pos
-            while true # sequence
-              _tmp = _Endline()
-              c = @result
-              unless _tmp
-                self.pos = _save13
-                break
-              end
-              _save14 = self.pos
-
-              _save15 = self.pos
-              while true # sequence
-                _save16 = self.pos
-                _tmp = begin;  github? ; end
-                self.pos = _save16
-                unless _tmp
-                  self.pos = _save15
-                  break
-                end
-                _tmp = apply(:_Ticks3)
-                unless _tmp
-                  self.pos = _save15
-                  break
-                end
-                _tmp = scan(/\G(?-mix:[^`\n]*$)/)
-                unless _tmp
-                  self.pos = _save15
-                end
-                break
-              end # end sequence
-
-              _tmp = _tmp ? nil : true
-              self.pos = _save14
-              unless _tmp
-                self.pos = _save13
-                break
-              end
-              _save17 = self.pos
-              _tmp = apply(:_Inline)
-              self.pos = _save17
-              unless _tmp
-                self.pos = _save13
-                break
-              end
-              @result = begin;  c ; end
-              _tmp = true
-              unless _tmp
-                self.pos = _save13
-              end
-              break
-            end # end sequence
-
-            break if _tmp
-            self.pos = _save10
-            break
-          end # end choice
-
-          _ary << @result if _tmp
-          break unless _tmp
-        end
-        _tmp = true
-        @result = _ary
-      else
-        self.pos = _save1
-      end
-      chunks = @result
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _save18 = self.pos
-      _tmp = _Endline()
-      unless _tmp
-        _tmp = true
-        self.pos = _save18
-      end
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      @result = begin;  chunks ; end
-      _tmp = true
-      unless _tmp
-        self.pos = _save
-      end
-      break
-    end # end sequence
-
-    set_failed_rule :_Inlines unless _tmp
-    return _tmp
-  end
-
-  # Inline = (Str | @Endline | UlOrStarLine | @Space | Strong | Emph | Strike | Image | Link | NoteReference | InlineNote | Code | RawHtml | Entity | EscapedChar | Symbol)
-  def _Inline
-
-    _save = self.pos
-    while true # choice
-      _tmp = apply(:_Str)
-      break if _tmp
-      self.pos = _save
-      _tmp = _Endline()
-      break if _tmp
-      self.pos = _save
-      _tmp = apply(:_UlOrStarLine)
-      break if _tmp
-      self.pos = _save
-      _tmp = _Space()
-      break if _tmp
-      self.pos = _save
-      _tmp = apply(:_Strong)
-      break if _tmp
-      self.pos = _save
-      _tmp = apply(:_Emph)
-      break if _tmp
-      self.pos = _save
-      _tmp = apply(:_Strike)
-      break if _tmp
-      self.pos = _save
-      _tmp = apply(:_Image)
-      break if _tmp
-      self.pos = _save
-      _tmp = apply(:_Link)
-      break if _tmp
-      self.pos = _save
-      _tmp = apply(:_NoteReference)
-      break if _tmp
-      self.pos = _save
-      _tmp = apply(:_InlineNote)
-      break if _tmp
-      self.pos = _save
-      _tmp = apply(:_Code)
-      break if _tmp
-      self.pos = _save
-      _tmp = apply(:_RawHtml)
-      break if _tmp
-      self.pos = _save
-      _tmp = apply(:_Entity)
-      break if _tmp
-      self.pos = _save
-      _tmp = apply(:_EscapedChar)
-      break if _tmp
-      self.pos = _save
-      _tmp = apply(:_Symbol)
-      break if _tmp
-      self.pos = _save
-      break
-    end # end choice
-
-    set_failed_rule :_Inline unless _tmp
-    return _tmp
-  end
-
-  # Space = @Spacechar+ { " " }
-  def _Space
-
-    _save = self.pos
-    while true # sequence
-      _save1 = self.pos
-      _tmp = _Spacechar()
-      if _tmp
-        while true
-          _tmp = _Spacechar()
-          break unless _tmp
-        end
-        _tmp = true
-      else
-        self.pos = _save1
-      end
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      @result = begin;  " " ; end
-      _tmp = true
-      unless _tmp
-        self.pos = _save
-      end
-      break
-    end # end sequence
-
-    set_failed_rule :_Space unless _tmp
-    return _tmp
-  end
-
-  # Str = @StartList:a < @NormalChar+ > { a = text } (StrChunk:c { a << c })* { a }
-  def _Str
-
-    _save = self.pos
-    while true # sequence
-      _tmp = _StartList()
-      a = @result
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _text_start = self.pos
-      _save1 = self.pos
-      _tmp = _NormalChar()
-      if _tmp
-        while true
-          _tmp = _NormalChar()
-          break unless _tmp
-        end
-        _tmp = true
-      else
-        self.pos = _save1
-      end
-      if _tmp
-        text = get_text(_text_start)
-      end
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      @result = begin;  a = text ; end
-      _tmp = true
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      while true
-
-        _save3 = self.pos
-        while true # sequence
-          _tmp = apply(:_StrChunk)
-          c = @result
-          unless _tmp
-            self.pos = _save3
-            break
-          end
-          @result = begin;  a << c ; end
-          _tmp = true
-          unless _tmp
-            self.pos = _save3
-          end
-          break
-        end # end sequence
-
-        break unless _tmp
-      end
-      _tmp = true
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      @result = begin;  a ; end
-      _tmp = true
-      unless _tmp
-        self.pos = _save
-      end
-      break
-    end # end sequence
-
-    set_failed_rule :_Str unless _tmp
-    return _tmp
-  end
-
-  # StrChunk = < (@NormalChar | /_+/ &Alphanumeric)+ > { text }
-  def _StrChunk
-
-    _save = self.pos
-    while true # sequence
-      _text_start = self.pos
-      _save1 = self.pos
-
-      _save2 = self.pos
-      while true # choice
-        _tmp = _NormalChar()
-        break if _tmp
-        self.pos = _save2
-
-        _save3 = self.pos
-        while true # sequence
-          _tmp = scan(/\G(?-mix:_+)/)
-          unless _tmp
-            self.pos = _save3
-            break
-          end
-          _save4 = self.pos
-          _tmp = apply(:_Alphanumeric)
-          self.pos = _save4
-          unless _tmp
-            self.pos = _save3
-          end
-          break
-        end # end sequence
-
-        break if _tmp
-        self.pos = _save2
-        break
-      end # end choice
-
-      if _tmp
-        while true
-
-          _save5 = self.pos
-          while true # choice
-            _tmp = _NormalChar()
-            break if _tmp
-            self.pos = _save5
-
-            _save6 = self.pos
-            while true # sequence
-              _tmp = scan(/\G(?-mix:_+)/)
-              unless _tmp
-                self.pos = _save6
-                break
-              end
-              _save7 = self.pos
-              _tmp = apply(:_Alphanumeric)
-              self.pos = _save7
-              unless _tmp
-                self.pos = _save6
-              end
-              break
-            end # end sequence
-
-            break if _tmp
-            self.pos = _save5
-            break
-          end # end choice
-
-          break unless _tmp
-        end
-        _tmp = true
-      else
-        self.pos = _save1
-      end
-      if _tmp
-        text = get_text(_text_start)
-      end
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      @result = begin;  text ; end
-      _tmp = true
-      unless _tmp
-        self.pos = _save
-      end
-      break
-    end # end sequence
-
-    set_failed_rule :_StrChunk unless _tmp
-    return _tmp
-  end
-
-  # EscapedChar = "\\" !@Newline < /[:\\`|*_{}\[\]()#+.!><-]/ > { text }
-  def _EscapedChar
-
-    _save = self.pos
-    while true # sequence
-      _tmp = match_string("\\")
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _save1 = self.pos
-      _tmp = _Newline()
-      _tmp = _tmp ? nil : true
-      self.pos = _save1
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _text_start = self.pos
-      _tmp = scan(/\G(?-mix:[:\\`|*_{}\[\]()#+.!><-])/)
-      if _tmp
-        text = get_text(_text_start)
-      end
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      @result = begin;  text ; end
-      _tmp = true
-      unless _tmp
-        self.pos = _save
-      end
-      break
-    end # end sequence
-
-    set_failed_rule :_EscapedChar unless _tmp
-    return _tmp
-  end
-
-  # Entity = (HexEntity | DecEntity | CharEntity):a { a }
-  def _Entity
-
-    _save = self.pos
-    while true # sequence
-
-      _save1 = self.pos
-      while true # choice
-        _tmp = apply(:_HexEntity)
-        break if _tmp
-        self.pos = _save1
-        _tmp = apply(:_DecEntity)
-        break if _tmp
-        self.pos = _save1
-        _tmp = apply(:_CharEntity)
-        break if _tmp
-        self.pos = _save1
-        break
-      end # end choice
-
-      a = @result
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      @result = begin;  a ; end
-      _tmp = true
-      unless _tmp
-        self.pos = _save
-      end
-      break
-    end # end sequence
-
-    set_failed_rule :_Entity unless _tmp
-    return _tmp
-  end
-
-  # Endline = (@LineBreak | @TerminalEndline | @NormalEndline)
-  def _Endline
-
-    _save = self.pos
-    while true # choice
-      _tmp = _LineBreak()
-      break if _tmp
-      self.pos = _save
-      _tmp = _TerminalEndline()
-      break if _tmp
-      self.pos = _save
-      _tmp = _NormalEndline()
-      break if _tmp
-      self.pos = _save
-      break
-    end # end choice
-
-    set_failed_rule :_Endline unless _tmp
-    return _tmp
-  end
-
-  # NormalEndline = @Sp @Newline !@BlankLine !">" !AtxStart !(Line /={1,}|-{1,}/ @Newline) { "\n" }
-  def _NormalEndline
-
-    _save = self.pos
-    while true # sequence
-      _tmp = _Sp()
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = _Newline()
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _save1 = self.pos
-      _tmp = _BlankLine()
-      _tmp = _tmp ? nil : true
-      self.pos = _save1
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _save2 = self.pos
-      _tmp = match_string(">")
-      _tmp = _tmp ? nil : true
-      self.pos = _save2
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _save3 = self.pos
-      _tmp = apply(:_AtxStart)
-      _tmp = _tmp ? nil : true
-      self.pos = _save3
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _save4 = self.pos
-
-      _save5 = self.pos
-      while true # sequence
-        _tmp = apply(:_Line)
-        unless _tmp
-          self.pos = _save5
-          break
-        end
-        _tmp = scan(/\G(?-mix:={1,}|-{1,})/)
-        unless _tmp
-          self.pos = _save5
-          break
-        end
-        _tmp = _Newline()
-        unless _tmp
-          self.pos = _save5
-        end
-        break
-      end # end sequence
-
-      _tmp = _tmp ? nil : true
-      self.pos = _save4
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      @result = begin;  "\n" ; end
-      _tmp = true
-      unless _tmp
-        self.pos = _save
-      end
-      break
-    end # end sequence
-
-    set_failed_rule :_NormalEndline unless _tmp
-    return _tmp
-  end
-
-  # TerminalEndline = @Sp @Newline @Eof
-  def _TerminalEndline
-
-    _save = self.pos
-    while true # sequence
-      _tmp = _Sp()
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = _Newline()
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = _Eof()
-      unless _tmp
-        self.pos = _save
-      end
-      break
-    end # end sequence
-
-    set_failed_rule :_TerminalEndline unless _tmp
-    return _tmp
-  end
-
-  # LineBreak = "  " @NormalEndline { RDoc::Markup::HardBreak.new }
-  def _LineBreak
-
-    _save = self.pos
-    while true # sequence
-      _tmp = match_string("  ")
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = _NormalEndline()
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      @result = begin;  RDoc::Markup::HardBreak.new ; end
-      _tmp = true
-      unless _tmp
-        self.pos = _save
-      end
-      break
-    end # end sequence
-
-    set_failed_rule :_LineBreak unless _tmp
-    return _tmp
-  end
-
-  # Symbol = < @SpecialChar > { text }
-  def _Symbol
-
-    _save = self.pos
-    while true # sequence
-      _text_start = self.pos
-      _tmp = _SpecialChar()
-      if _tmp
-        text = get_text(_text_start)
-      end
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      @result = begin;  text ; end
-      _tmp = true
-      unless _tmp
-        self.pos = _save
-      end
-      break
-    end # end sequence
-
-    set_failed_rule :_Symbol unless _tmp
-    return _tmp
-  end
-
-  # UlOrStarLine = (UlLine | StarLine):a { a }
-  def _UlOrStarLine
-
-    _save = self.pos
-    while true # sequence
-
-      _save1 = self.pos
-      while true # choice
-        _tmp = apply(:_UlLine)
-        break if _tmp
-        self.pos = _save1
-        _tmp = apply(:_StarLine)
-        break if _tmp
-        self.pos = _save1
-        break
-      end # end choice
-
-      a = @result
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      @result = begin;  a ; end
-      _tmp = true
-      unless _tmp
-        self.pos = _save
-      end
-      break
-    end # end sequence
-
-    set_failed_rule :_UlOrStarLine unless _tmp
-    return _tmp
-  end
-
-  # StarLine = (< /\*{4,}/ > { text } | < @Spacechar /\*+/ &@Spacechar > { text })
-  def _StarLine
-
-    _save = self.pos
-    while true # choice
-
-      _save1 = self.pos
-      while true # sequence
-        _text_start = self.pos
-        _tmp = scan(/\G(?-mix:\*{4,})/)
-        if _tmp
-          text = get_text(_text_start)
-        end
-        unless _tmp
-          self.pos = _save1
-          break
-        end
-        @result = begin;  text ; end
-        _tmp = true
-        unless _tmp
-          self.pos = _save1
-        end
-        break
-      end # end sequence
-
-      break if _tmp
-      self.pos = _save
-
-      _save2 = self.pos
-      while true # sequence
-        _text_start = self.pos
-
-        _save3 = self.pos
-        while true # sequence
-          _tmp = _Spacechar()
-          unless _tmp
-            self.pos = _save3
-            break
-          end
-          _tmp = scan(/\G(?-mix:\*+)/)
-          unless _tmp
-            self.pos = _save3
-            break
-          end
-          _save4 = self.pos
-          _tmp = _Spacechar()
-          self.pos = _save4
-          unless _tmp
-            self.pos = _save3
-          end
-          break
-        end # end sequence
-
-        if _tmp
-          text = get_text(_text_start)
-        end
-        unless _tmp
-          self.pos = _save2
-          break
-        end
-        @result = begin;  text ; end
-        _tmp = true
-        unless _tmp
-          self.pos = _save2
-        end
-        break
-      end # end sequence
-
-      break if _tmp
-      self.pos = _save
-      break
-    end # end choice
-
-    set_failed_rule :_StarLine unless _tmp
-    return _tmp
-  end
-
-  # UlLine = (< /_{4,}/ > { text } | < @Spacechar /_+/ &@Spacechar > { text })
-  def _UlLine
-
-    _save = self.pos
-    while true # choice
-
-      _save1 = self.pos
-      while true # sequence
-        _text_start = self.pos
-        _tmp = scan(/\G(?-mix:_{4,})/)
-        if _tmp
-          text = get_text(_text_start)
-        end
-        unless _tmp
-          self.pos = _save1
-          break
-        end
-        @result = begin;  text ; end
-        _tmp = true
-        unless _tmp
-          self.pos = _save1
-        end
-        break
-      end # end sequence
-
-      break if _tmp
-      self.pos = _save
-
-      _save2 = self.pos
-      while true # sequence
-        _text_start = self.pos
-
-        _save3 = self.pos
-        while true # sequence
-          _tmp = _Spacechar()
-          unless _tmp
-            self.pos = _save3
-            break
-          end
-          _tmp = scan(/\G(?-mix:_+)/)
-          unless _tmp
-            self.pos = _save3
-            break
-          end
-          _save4 = self.pos
-          _tmp = _Spacechar()
-          self.pos = _save4
-          unless _tmp
-            self.pos = _save3
-          end
-          break
-        end # end sequence
-
-        if _tmp
-          text = get_text(_text_start)
-        end
-        unless _tmp
-          self.pos = _save2
-          break
-        end
-        @result = begin;  text ; end
-        _tmp = true
-        unless _tmp
-          self.pos = _save2
-        end
-        break
-      end # end sequence
-
-      break if _tmp
-      self.pos = _save
-      break
-    end # end choice
-
-    set_failed_rule :_UlLine unless _tmp
-    return _tmp
-  end
-
-  # Emph = (EmphStar | EmphUl)
-  def _Emph
-
-    _save = self.pos
-    while true # choice
-      _tmp = apply(:_EmphStar)
-      break if _tmp
-      self.pos = _save
-      _tmp = apply(:_EmphUl)
-      break if _tmp
-      self.pos = _save
-      break
-    end # end choice
-
-    set_failed_rule :_Emph unless _tmp
-    return _tmp
-  end
-
-  # Whitespace = (@Spacechar | @Newline)
-  def _Whitespace
-
-    _save = self.pos
-    while true # choice
-      _tmp = _Spacechar()
-      break if _tmp
-      self.pos = _save
-      _tmp = _Newline()
-      break if _tmp
-      self.pos = _save
-      break
-    end # end choice
-
-    set_failed_rule :_Whitespace unless _tmp
-    return _tmp
-  end
-
-  # EmphStar = "*" !@Whitespace @StartList:a (!"*" Inline:b { a << b } | StrongStar:b { a << b })+ "*" { emphasis a.join }
-  def _EmphStar
-
-    _save = self.pos
-    while true # sequence
-      _tmp = match_string("*")
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _save1 = self.pos
-      _tmp = _Whitespace()
-      _tmp = _tmp ? nil : true
-      self.pos = _save1
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = _StartList()
-      a = @result
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _save2 = self.pos
-
-      _save3 = self.pos
-      while true # choice
-
-        _save4 = self.pos
-        while true # sequence
-          _save5 = self.pos
-          _tmp = match_string("*")
-          _tmp = _tmp ? nil : true
-          self.pos = _save5
-          unless _tmp
-            self.pos = _save4
-            break
-          end
-          _tmp = apply(:_Inline)
-          b = @result
-          unless _tmp
-            self.pos = _save4
-            break
-          end
-          @result = begin;  a << b ; end
-          _tmp = true
-          unless _tmp
-            self.pos = _save4
-          end
-          break
-        end # end sequence
-
-        break if _tmp
-        self.pos = _save3
-
-        _save6 = self.pos
-        while true # sequence
-          _tmp = apply(:_StrongStar)
-          b = @result
-          unless _tmp
-            self.pos = _save6
-            break
-          end
-          @result = begin;  a << b ; end
-          _tmp = true
-          unless _tmp
-            self.pos = _save6
-          end
-          break
-        end # end sequence
-
-        break if _tmp
-        self.pos = _save3
-        break
-      end # end choice
-
-      if _tmp
-        while true
-
-          _save7 = self.pos
-          while true # choice
-
-            _save8 = self.pos
-            while true # sequence
-              _save9 = self.pos
-              _tmp = match_string("*")
-              _tmp = _tmp ? nil : true
-              self.pos = _save9
-              unless _tmp
-                self.pos = _save8
-                break
-              end
-              _tmp = apply(:_Inline)
-              b = @result
-              unless _tmp
-                self.pos = _save8
-                break
-              end
-              @result = begin;  a << b ; end
-              _tmp = true
-              unless _tmp
-                self.pos = _save8
-              end
-              break
-            end # end sequence
-
-            break if _tmp
-            self.pos = _save7
-
-            _save10 = self.pos
-            while true # sequence
-              _tmp = apply(:_StrongStar)
-              b = @result
-              unless _tmp
-                self.pos = _save10
-                break
-              end
-              @result = begin;  a << b ; end
-              _tmp = true
-              unless _tmp
-                self.pos = _save10
-              end
-              break
-            end # end sequence
-
-            break if _tmp
-            self.pos = _save7
-            break
-          end # end choice
-
-          break unless _tmp
-        end
-        _tmp = true
-      else
-        self.pos = _save2
-      end
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = match_string("*")
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      @result = begin;  emphasis a.join ; end
-      _tmp = true
-      unless _tmp
-        self.pos = _save
-      end
-      break
-    end # end sequence
-
-    set_failed_rule :_EmphStar unless _tmp
-    return _tmp
-  end
-
-  # EmphUl = "_" !@Whitespace @StartList:a (!"_" Inline:b { a << b } | StrongUl:b { a << b })+ "_" { emphasis a.join }
-  def _EmphUl
-
-    _save = self.pos
-    while true # sequence
-      _tmp = match_string("_")
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _save1 = self.pos
-      _tmp = _Whitespace()
-      _tmp = _tmp ? nil : true
-      self.pos = _save1
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = _StartList()
-      a = @result
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _save2 = self.pos
-
-      _save3 = self.pos
-      while true # choice
-
-        _save4 = self.pos
-        while true # sequence
-          _save5 = self.pos
-          _tmp = match_string("_")
-          _tmp = _tmp ? nil : true
-          self.pos = _save5
-          unless _tmp
-            self.pos = _save4
-            break
-          end
-          _tmp = apply(:_Inline)
-          b = @result
-          unless _tmp
-            self.pos = _save4
-            break
-          end
-          @result = begin;  a << b ; end
-          _tmp = true
-          unless _tmp
-            self.pos = _save4
-          end
-          break
-        end # end sequence
-
-        break if _tmp
-        self.pos = _save3
-
-        _save6 = self.pos
-        while true # sequence
-          _tmp = apply(:_StrongUl)
-          b = @result
-          unless _tmp
-            self.pos = _save6
-            break
-          end
-          @result = begin;  a << b ; end
-          _tmp = true
-          unless _tmp
-            self.pos = _save6
-          end
-          break
-        end # end sequence
-
-        break if _tmp
-        self.pos = _save3
-        break
-      end # end choice
-
-      if _tmp
-        while true
-
-          _save7 = self.pos
-          while true # choice
-
-            _save8 = self.pos
-            while true # sequence
-              _save9 = self.pos
-              _tmp = match_string("_")
-              _tmp = _tmp ? nil : true
-              self.pos = _save9
-              unless _tmp
-                self.pos = _save8
-                break
-              end
-              _tmp = apply(:_Inline)
-              b = @result
-              unless _tmp
-                self.pos = _save8
-                break
-              end
-              @result = begin;  a << b ; end
-              _tmp = true
-              unless _tmp
-                self.pos = _save8
-              end
-              break
-            end # end sequence
-
-            break if _tmp
-            self.pos = _save7
-
-            _save10 = self.pos
-            while true # sequence
-              _tmp = apply(:_StrongUl)
-              b = @result
-              unless _tmp
-                self.pos = _save10
-                break
-              end
-              @result = begin;  a << b ; end
-              _tmp = true
-              unless _tmp
-                self.pos = _save10
-              end
-              break
-            end # end sequence
-
-            break if _tmp
-            self.pos = _save7
-            break
-          end # end choice
-
-          break unless _tmp
-        end
-        _tmp = true
-      else
-        self.pos = _save2
-      end
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = match_string("_")
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      @result = begin;  emphasis a.join ; end
-      _tmp = true
-      unless _tmp
-        self.pos = _save
-      end
-      break
-    end # end sequence
-
-    set_failed_rule :_EmphUl unless _tmp
-    return _tmp
-  end
-
-  # Strong = (StrongStar | StrongUl)
-  def _Strong
-
-    _save = self.pos
-    while true # choice
-      _tmp = apply(:_StrongStar)
-      break if _tmp
-      self.pos = _save
-      _tmp = apply(:_StrongUl)
-      break if _tmp
-      self.pos = _save
-      break
-    end # end choice
-
-    set_failed_rule :_Strong unless _tmp
-    return _tmp
-  end
-
-  # StrongStar = "**" !@Whitespace @StartList:a (!"**" Inline:b { a << b })+ "**" { strong a.join }
-  def _StrongStar
-
-    _save = self.pos
-    while true # sequence
-      _tmp = match_string("**")
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _save1 = self.pos
-      _tmp = _Whitespace()
-      _tmp = _tmp ? nil : true
-      self.pos = _save1
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = _StartList()
-      a = @result
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _save2 = self.pos
-
-      _save3 = self.pos
-      while true # sequence
-        _save4 = self.pos
-        _tmp = match_string("**")
-        _tmp = _tmp ? nil : true
-        self.pos = _save4
-        unless _tmp
-          self.pos = _save3
-          break
-        end
-        _tmp = apply(:_Inline)
-        b = @result
-        unless _tmp
-          self.pos = _save3
-          break
-        end
-        @result = begin;  a << b ; end
-        _tmp = true
-        unless _tmp
-          self.pos = _save3
-        end
-        break
-      end # end sequence
-
-      if _tmp
-        while true
-
-          _save5 = self.pos
-          while true # sequence
-            _save6 = self.pos
-            _tmp = match_string("**")
-            _tmp = _tmp ? nil : true
-            self.pos = _save6
-            unless _tmp
-              self.pos = _save5
-              break
-            end
-            _tmp = apply(:_Inline)
-            b = @result
-            unless _tmp
-              self.pos = _save5
-              break
-            end
-            @result = begin;  a << b ; end
-            _tmp = true
-            unless _tmp
-              self.pos = _save5
-            end
-            break
-          end # end sequence
-
-          break unless _tmp
-        end
-        _tmp = true
-      else
-        self.pos = _save2
-      end
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = match_string("**")
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      @result = begin;  strong a.join ; end
-      _tmp = true
-      unless _tmp
-        self.pos = _save
-      end
-      break
-    end # end sequence
-
-    set_failed_rule :_StrongStar unless _tmp
-    return _tmp
-  end
-
-  # StrongUl = "__" !@Whitespace @StartList:a (!"__" Inline:b { a << b })+ "__" { strong a.join }
-  def _StrongUl
-
-    _save = self.pos
-    while true # sequence
-      _tmp = match_string("__")
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _save1 = self.pos
-      _tmp = _Whitespace()
-      _tmp = _tmp ? nil : true
-      self.pos = _save1
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = _StartList()
-      a = @result
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _save2 = self.pos
-
-      _save3 = self.pos
-      while true # sequence
-        _save4 = self.pos
-        _tmp = match_string("__")
-        _tmp = _tmp ? nil : true
-        self.pos = _save4
-        unless _tmp
-          self.pos = _save3
-          break
-        end
-        _tmp = apply(:_Inline)
-        b = @result
-        unless _tmp
-          self.pos = _save3
-          break
-        end
-        @result = begin;  a << b ; end
-        _tmp = true
-        unless _tmp
-          self.pos = _save3
-        end
-        break
-      end # end sequence
-
-      if _tmp
-        while true
-
-          _save5 = self.pos
-          while true # sequence
-            _save6 = self.pos
-            _tmp = match_string("__")
-            _tmp = _tmp ? nil : true
-            self.pos = _save6
-            unless _tmp
-              self.pos = _save5
-              break
-            end
-            _tmp = apply(:_Inline)
-            b = @result
-            unless _tmp
-              self.pos = _save5
-              break
-            end
-            @result = begin;  a << b ; end
-            _tmp = true
-            unless _tmp
-              self.pos = _save5
-            end
-            break
-          end # end sequence
-
-          break unless _tmp
-        end
-        _tmp = true
-      else
-        self.pos = _save2
-      end
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = match_string("__")
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      @result = begin;  strong a.join ; end
-      _tmp = true
-      unless _tmp
-        self.pos = _save
-      end
-      break
-    end # end sequence
-
-    set_failed_rule :_StrongUl unless _tmp
-    return _tmp
-  end
-
-  # Strike = &{ strike? } "~~" !@Whitespace @StartList:a (!"~~" Inline:b { a << b })+ "~~" { strike a.join }
-  def _Strike
-
-    _save = self.pos
-    while true # sequence
-      _save1 = self.pos
-      _tmp = begin;  strike? ; end
-      self.pos = _save1
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = match_string("~~")
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _save2 = self.pos
-      _tmp = _Whitespace()
-      _tmp = _tmp ? nil : true
-      self.pos = _save2
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = _StartList()
-      a = @result
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _save3 = self.pos
-
-      _save4 = self.pos
-      while true # sequence
-        _save5 = self.pos
-        _tmp = match_string("~~")
-        _tmp = _tmp ? nil : true
-        self.pos = _save5
-        unless _tmp
-          self.pos = _save4
-          break
-        end
-        _tmp = apply(:_Inline)
-        b = @result
-        unless _tmp
-          self.pos = _save4
-          break
-        end
-        @result = begin;  a << b ; end
-        _tmp = true
-        unless _tmp
-          self.pos = _save4
-        end
-        break
-      end # end sequence
-
-      if _tmp
-        while true
-
-          _save6 = self.pos
-          while true # sequence
-            _save7 = self.pos
-            _tmp = match_string("~~")
-            _tmp = _tmp ? nil : true
-            self.pos = _save7
-            unless _tmp
-              self.pos = _save6
-              break
-            end
-            _tmp = apply(:_Inline)
-            b = @result
-            unless _tmp
-              self.pos = _save6
-              break
-            end
-            @result = begin;  a << b ; end
-            _tmp = true
-            unless _tmp
-              self.pos = _save6
-            end
-            break
-          end # end sequence
-
-          break unless _tmp
-        end
-        _tmp = true
-      else
-        self.pos = _save3
-      end
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = match_string("~~")
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      @result = begin;  strike a.join ; end
-      _tmp = true
-      unless _tmp
-        self.pos = _save
-      end
-      break
-    end # end sequence
-
-    set_failed_rule :_Strike unless _tmp
-    return _tmp
-  end
-
-  # Image = "!" (ExplicitLink | ReferenceLink):a { "rdoc-image:#{a[/\[(.*)\]/, 1]}" }
-  def _Image
-
-    _save = self.pos
-    while true # sequence
-      _tmp = match_string("!")
-      unless _tmp
-        self.pos = _save
-        break
-      end
-
-      _save1 = self.pos
-      while true # choice
-        _tmp = apply(:_ExplicitLink)
-        break if _tmp
-        self.pos = _save1
-        _tmp = apply(:_ReferenceLink)
-        break if _tmp
-        self.pos = _save1
-        break
-      end # end choice
-
-      a = @result
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      @result = begin;  "rdoc-image:#{a[/\[(.*)\]/, 1]}" ; end
-      _tmp = true
-      unless _tmp
-        self.pos = _save
-      end
-      break
-    end # end sequence
-
-    set_failed_rule :_Image unless _tmp
-    return _tmp
-  end
-
-  # Link = (ExplicitLink | ReferenceLink | AutoLink)
-  def _Link
-
-    _save = self.pos
-    while true # choice
-      _tmp = apply(:_ExplicitLink)
-      break if _tmp
-      self.pos = _save
-      _tmp = apply(:_ReferenceLink)
-      break if _tmp
-      self.pos = _save
-      _tmp = apply(:_AutoLink)
-      break if _tmp
-      self.pos = _save
-      break
-    end # end choice
-
-    set_failed_rule :_Link unless _tmp
-    return _tmp
-  end
-
-  # ReferenceLink = (ReferenceLinkDouble | ReferenceLinkSingle)
-  def _ReferenceLink
-
-    _save = self.pos
-    while true # choice
-      _tmp = apply(:_ReferenceLinkDouble)
-      break if _tmp
-      self.pos = _save
-      _tmp = apply(:_ReferenceLinkSingle)
-      break if _tmp
-      self.pos = _save
-      break
-    end # end choice
-
-    set_failed_rule :_ReferenceLink unless _tmp
-    return _tmp
-  end
-
-  # ReferenceLinkDouble = Label:content < Spnl > !"[]" Label:label { link_to content, label, text }
-  def _ReferenceLinkDouble
-
-    _save = self.pos
-    while true # sequence
-      _tmp = apply(:_Label)
-      content = @result
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _text_start = self.pos
-      _tmp = apply(:_Spnl)
-      if _tmp
-        text = get_text(_text_start)
-      end
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _save1 = self.pos
-      _tmp = match_string("[]")
-      _tmp = _tmp ? nil : true
-      self.pos = _save1
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = apply(:_Label)
-      label = @result
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      @result = begin;  link_to content, label, text ; end
-      _tmp = true
-      unless _tmp
-        self.pos = _save
-      end
-      break
-    end # end sequence
-
-    set_failed_rule :_ReferenceLinkDouble unless _tmp
-    return _tmp
-  end
-
-  # ReferenceLinkSingle = Label:content < (Spnl "[]")? > { link_to content, content, text }
-  def _ReferenceLinkSingle
-
-    _save = self.pos
-    while true # sequence
-      _tmp = apply(:_Label)
-      content = @result
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _text_start = self.pos
-      _save1 = self.pos
-
-      _save2 = self.pos
-      while true # sequence
-        _tmp = apply(:_Spnl)
-        unless _tmp
-          self.pos = _save2
-          break
-        end
-        _tmp = match_string("[]")
-        unless _tmp
-          self.pos = _save2
-        end
-        break
-      end # end sequence
-
-      unless _tmp
-        _tmp = true
-        self.pos = _save1
-      end
-      if _tmp
-        text = get_text(_text_start)
-      end
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      @result = begin;  link_to content, content, text ; end
-      _tmp = true
-      unless _tmp
-        self.pos = _save
-      end
-      break
-    end # end sequence
-
-    set_failed_rule :_ReferenceLinkSingle unless _tmp
-    return _tmp
-  end
-
-  # ExplicitLink = Label:l "(" @Sp Source:s Spnl Title @Sp ")" { "{#{l}}[#{s}]" }
-  def _ExplicitLink
-
-    _save = self.pos
-    while true # sequence
-      _tmp = apply(:_Label)
-      l = @result
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = match_string("(")
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = _Sp()
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = apply(:_Source)
-      s = @result
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = apply(:_Spnl)
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = apply(:_Title)
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = _Sp()
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = match_string(")")
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      @result = begin;  "{#{l}}[#{s}]" ; end
-      _tmp = true
-      unless _tmp
-        self.pos = _save
-      end
-      break
-    end # end sequence
-
-    set_failed_rule :_ExplicitLink unless _tmp
-    return _tmp
-  end
-
-  # Source = ("<" < SourceContents > ">" | < SourceContents >) { text }
-  def _Source
-
-    _save = self.pos
-    while true # sequence
-
-      _save1 = self.pos
-      while true # choice
-
-        _save2 = self.pos
-        while true # sequence
-          _tmp = match_string("<")
-          unless _tmp
-            self.pos = _save2
-            break
-          end
-          _text_start = self.pos
-          _tmp = apply(:_SourceContents)
-          if _tmp
-            text = get_text(_text_start)
-          end
-          unless _tmp
-            self.pos = _save2
-            break
-          end
-          _tmp = match_string(">")
-          unless _tmp
-            self.pos = _save2
-          end
-          break
-        end # end sequence
-
-        break if _tmp
-        self.pos = _save1
-        _text_start = self.pos
-        _tmp = apply(:_SourceContents)
-        if _tmp
-          text = get_text(_text_start)
-        end
-        break if _tmp
-        self.pos = _save1
-        break
-      end # end choice
-
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      @result = begin;  text ; end
-      _tmp = true
-      unless _tmp
-        self.pos = _save
-      end
-      break
-    end # end sequence
-
-    set_failed_rule :_Source unless _tmp
-    return _tmp
-  end
-
-  # SourceContents = ((!"(" !")" !">" Nonspacechar)+ | "(" SourceContents ")")*
-  def _SourceContents
-    while true
-
-      _save1 = self.pos
-      while true # choice
-        _save2 = self.pos
-
-        _save3 = self.pos
-        while true # sequence
-          _save4 = self.pos
-          _tmp = match_string("(")
-          _tmp = _tmp ? nil : true
-          self.pos = _save4
-          unless _tmp
-            self.pos = _save3
-            break
-          end
-          _save5 = self.pos
-          _tmp = match_string(")")
-          _tmp = _tmp ? nil : true
-          self.pos = _save5
-          unless _tmp
-            self.pos = _save3
-            break
-          end
-          _save6 = self.pos
-          _tmp = match_string(">")
-          _tmp = _tmp ? nil : true
-          self.pos = _save6
-          unless _tmp
-            self.pos = _save3
-            break
-          end
-          _tmp = apply(:_Nonspacechar)
-          unless _tmp
-            self.pos = _save3
-          end
-          break
-        end # end sequence
-
-        if _tmp
-          while true
-
-            _save7 = self.pos
-            while true # sequence
-              _save8 = self.pos
-              _tmp = match_string("(")
-              _tmp = _tmp ? nil : true
-              self.pos = _save8
-              unless _tmp
-                self.pos = _save7
-                break
-              end
-              _save9 = self.pos
-              _tmp = match_string(")")
-              _tmp = _tmp ? nil : true
-              self.pos = _save9
-              unless _tmp
-                self.pos = _save7
-                break
-              end
-              _save10 = self.pos
-              _tmp = match_string(">")
-              _tmp = _tmp ? nil : true
-              self.pos = _save10
-              unless _tmp
-                self.pos = _save7
-                break
-              end
-              _tmp = apply(:_Nonspacechar)
-              unless _tmp
-                self.pos = _save7
-              end
-              break
-            end # end sequence
-
-            break unless _tmp
-          end
-          _tmp = true
-        else
-          self.pos = _save2
-        end
-        break if _tmp
-        self.pos = _save1
-
-        _save11 = self.pos
-        while true # sequence
-          _tmp = match_string("(")
-          unless _tmp
-            self.pos = _save11
-            break
-          end
-          _tmp = apply(:_SourceContents)
-          unless _tmp
-            self.pos = _save11
-            break
-          end
-          _tmp = match_string(")")
-          unless _tmp
-            self.pos = _save11
-          end
-          break
-        end # end sequence
-
-        break if _tmp
-        self.pos = _save1
-        break
-      end # end choice
-
-      break unless _tmp
-    end
-    _tmp = true
-    set_failed_rule :_SourceContents unless _tmp
-    return _tmp
-  end
-
-  # Title = (TitleSingle | TitleDouble | ""):a { a }
-  def _Title
-
-    _save = self.pos
-    while true # sequence
-
-      _save1 = self.pos
-      while true # choice
-        _tmp = apply(:_TitleSingle)
-        break if _tmp
-        self.pos = _save1
-        _tmp = apply(:_TitleDouble)
-        break if _tmp
-        self.pos = _save1
-        _tmp = match_string("")
-        break if _tmp
-        self.pos = _save1
-        break
-      end # end choice
-
-      a = @result
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      @result = begin;  a ; end
-      _tmp = true
-      unless _tmp
-        self.pos = _save
-      end
-      break
-    end # end sequence
-
-    set_failed_rule :_Title unless _tmp
-    return _tmp
-  end
-
-  # TitleSingle = "'" (!("'" @Sp (")" | @Newline)) .)* "'"
-  def _TitleSingle
-
-    _save = self.pos
-    while true # sequence
-      _tmp = match_string("'")
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      while true
-
-        _save2 = self.pos
-        while true # sequence
-          _save3 = self.pos
-
-          _save4 = self.pos
-          while true # sequence
-            _tmp = match_string("'")
-            unless _tmp
-              self.pos = _save4
-              break
-            end
-            _tmp = _Sp()
-            unless _tmp
-              self.pos = _save4
-              break
-            end
-
-            _save5 = self.pos
-            while true # choice
-              _tmp = match_string(")")
-              break if _tmp
-              self.pos = _save5
-              _tmp = _Newline()
-              break if _tmp
-              self.pos = _save5
-              break
-            end # end choice
-
-            unless _tmp
-              self.pos = _save4
-            end
-            break
-          end # end sequence
-
-          _tmp = _tmp ? nil : true
-          self.pos = _save3
-          unless _tmp
-            self.pos = _save2
-            break
-          end
-          _tmp = get_byte
-          unless _tmp
-            self.pos = _save2
-          end
-          break
-        end # end sequence
-
-        break unless _tmp
-      end
-      _tmp = true
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = match_string("'")
-      unless _tmp
-        self.pos = _save
-      end
-      break
-    end # end sequence
-
-    set_failed_rule :_TitleSingle unless _tmp
-    return _tmp
-  end
-
-  # TitleDouble = "\"" (!("\"" @Sp (")" | @Newline)) .)* "\""
-  def _TitleDouble
-
-    _save = self.pos
-    while true # sequence
-      _tmp = match_string("\"")
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      while true
-
-        _save2 = self.pos
-        while true # sequence
-          _save3 = self.pos
-
-          _save4 = self.pos
-          while true # sequence
-            _tmp = match_string("\"")
-            unless _tmp
-              self.pos = _save4
-              break
-            end
-            _tmp = _Sp()
-            unless _tmp
-              self.pos = _save4
-              break
-            end
-
-            _save5 = self.pos
-            while true # choice
-              _tmp = match_string(")")
-              break if _tmp
-              self.pos = _save5
-              _tmp = _Newline()
-              break if _tmp
-              self.pos = _save5
-              break
-            end # end choice
-
-            unless _tmp
-              self.pos = _save4
-            end
-            break
-          end # end sequence
-
-          _tmp = _tmp ? nil : true
-          self.pos = _save3
-          unless _tmp
-            self.pos = _save2
-            break
-          end
-          _tmp = get_byte
-          unless _tmp
-            self.pos = _save2
-          end
-          break
-        end # end sequence
-
-        break unless _tmp
-      end
-      _tmp = true
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = match_string("\"")
-      unless _tmp
-        self.pos = _save
-      end
-      break
-    end # end sequence
-
-    set_failed_rule :_TitleDouble unless _tmp
-    return _tmp
-  end
-
-  # AutoLink = (AutoLinkUrl | AutoLinkEmail)
-  def _AutoLink
-
-    _save = self.pos
-    while true # choice
-      _tmp = apply(:_AutoLinkUrl)
-      break if _tmp
-      self.pos = _save
-      _tmp = apply(:_AutoLinkEmail)
-      break if _tmp
-      self.pos = _save
-      break
-    end # end choice
-
-    set_failed_rule :_AutoLink unless _tmp
-    return _tmp
-  end
-
-  # AutoLinkUrl = "<" < /[A-Za-z]+/ "://" (!@Newline !">" .)+ > ">" { text }
-  def _AutoLinkUrl
-
-    _save = self.pos
-    while true # sequence
-      _tmp = match_string("<")
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _text_start = self.pos
-
-      _save1 = self.pos
-      while true # sequence
-        _tmp = scan(/\G(?-mix:[A-Za-z]+)/)
-        unless _tmp
-          self.pos = _save1
-          break
-        end
-        _tmp = match_string("://")
-        unless _tmp
-          self.pos = _save1
-          break
-        end
-        _save2 = self.pos
-
-        _save3 = self.pos
-        while true # sequence
-          _save4 = self.pos
-          _tmp = _Newline()
-          _tmp = _tmp ? nil : true
-          self.pos = _save4
-          unless _tmp
-            self.pos = _save3
-            break
-          end
-          _save5 = self.pos
-          _tmp = match_string(">")
-          _tmp = _tmp ? nil : true
-          self.pos = _save5
-          unless _tmp
-            self.pos = _save3
-            break
-          end
-          _tmp = get_byte
-          unless _tmp
-            self.pos = _save3
-          end
-          break
-        end # end sequence
-
-        if _tmp
-          while true
-
-            _save6 = self.pos
-            while true # sequence
-              _save7 = self.pos
-              _tmp = _Newline()
-              _tmp = _tmp ? nil : true
-              self.pos = _save7
-              unless _tmp
-                self.pos = _save6
-                break
-              end
-              _save8 = self.pos
-              _tmp = match_string(">")
-              _tmp = _tmp ? nil : true
-              self.pos = _save8
-              unless _tmp
-                self.pos = _save6
-                break
-              end
-              _tmp = get_byte
-              unless _tmp
-                self.pos = _save6
-              end
-              break
-            end # end sequence
-
-            break unless _tmp
-          end
-          _tmp = true
-        else
-          self.pos = _save2
-        end
-        unless _tmp
-          self.pos = _save1
-        end
-        break
-      end # end sequence
-
-      if _tmp
-        text = get_text(_text_start)
-      end
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = match_string(">")
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      @result = begin;  text ; end
-      _tmp = true
-      unless _tmp
-        self.pos = _save
-      end
-      break
-    end # end sequence
-
-    set_failed_rule :_AutoLinkUrl unless _tmp
-    return _tmp
-  end
-
-  # AutoLinkEmail = "<" "mailto:"? < /[\w+.\/!%~$-]+/i "@" (!@Newline !">" .)+ > ">" { "mailto:#{text}" }
-  def _AutoLinkEmail
-
-    _save = self.pos
-    while true # sequence
-      _tmp = match_string("<")
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _save1 = self.pos
-      _tmp = match_string("mailto:")
-      unless _tmp
-        _tmp = true
-        self.pos = _save1
-      end
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _text_start = self.pos
-
-      _save2 = self.pos
-      while true # sequence
-        _tmp = scan(/\G(?i-mx:[\w+.\/!%~$-]+)/)
-        unless _tmp
-          self.pos = _save2
-          break
-        end
-        _tmp = match_string("@")
-        unless _tmp
-          self.pos = _save2
-          break
-        end
-        _save3 = self.pos
-
-        _save4 = self.pos
-        while true # sequence
-          _save5 = self.pos
-          _tmp = _Newline()
-          _tmp = _tmp ? nil : true
-          self.pos = _save5
-          unless _tmp
-            self.pos = _save4
-            break
-          end
-          _save6 = self.pos
-          _tmp = match_string(">")
-          _tmp = _tmp ? nil : true
-          self.pos = _save6
-          unless _tmp
-            self.pos = _save4
-            break
-          end
-          _tmp = get_byte
-          unless _tmp
-            self.pos = _save4
-          end
-          break
-        end # end sequence
-
-        if _tmp
-          while true
-
-            _save7 = self.pos
-            while true # sequence
-              _save8 = self.pos
-              _tmp = _Newline()
-              _tmp = _tmp ? nil : true
-              self.pos = _save8
-              unless _tmp
-                self.pos = _save7
-                break
-              end
-              _save9 = self.pos
-              _tmp = match_string(">")
-              _tmp = _tmp ? nil : true
-              self.pos = _save9
-              unless _tmp
-                self.pos = _save7
-                break
-              end
-              _tmp = get_byte
-              unless _tmp
-                self.pos = _save7
-              end
-              break
-            end # end sequence
-
-            break unless _tmp
-          end
-          _tmp = true
-        else
-          self.pos = _save3
-        end
-        unless _tmp
-          self.pos = _save2
-        end
-        break
-      end # end sequence
-
-      if _tmp
-        text = get_text(_text_start)
-      end
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = match_string(">")
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      @result = begin;  "mailto:#{text}" ; end
-      _tmp = true
-      unless _tmp
-        self.pos = _save
-      end
-      break
-    end # end sequence
-
-    set_failed_rule :_AutoLinkEmail unless _tmp
-    return _tmp
-  end
-
-  # Reference = @NonindentSpace !"[]" Label:label ":" Spnl RefSrc:link RefTitle @BlankLine+ { # TODO use title               reference label, link               nil             }
-  def _Reference
-
-    _save = self.pos
-    while true # sequence
-      _tmp = _NonindentSpace()
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _save1 = self.pos
-      _tmp = match_string("[]")
-      _tmp = _tmp ? nil : true
-      self.pos = _save1
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = apply(:_Label)
-      label = @result
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = match_string(":")
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = apply(:_Spnl)
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = apply(:_RefSrc)
-      link = @result
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = apply(:_RefTitle)
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _save2 = self.pos
-      _tmp = _BlankLine()
-      if _tmp
-        while true
-          _tmp = _BlankLine()
-          break unless _tmp
-        end
-        _tmp = true
-      else
-        self.pos = _save2
-      end
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      @result = begin;  # TODO use title
-              reference label, link
-              nil
-            ; end
-      _tmp = true
-      unless _tmp
-        self.pos = _save
-      end
-      break
-    end # end sequence
-
-    set_failed_rule :_Reference unless _tmp
-    return _tmp
-  end
-
-  # Label = "[" (!"^" &{ notes? } | &. &{ !notes? }) @StartList:a (!"]" Inline:l { a << l })* "]" { a.join.gsub(/\s+/, ' ') }
-  def _Label
-
-    _save = self.pos
-    while true # sequence
-      _tmp = match_string("[")
-      unless _tmp
-        self.pos = _save
-        break
-      end
-
-      _save1 = self.pos
-      while true # choice
-
-        _save2 = self.pos
-        while true # sequence
-          _save3 = self.pos
-          _tmp = match_string("^")
-          _tmp = _tmp ? nil : true
-          self.pos = _save3
-          unless _tmp
-            self.pos = _save2
-            break
-          end
-          _save4 = self.pos
-          _tmp = begin;  notes? ; end
-          self.pos = _save4
-          unless _tmp
-            self.pos = _save2
-          end
-          break
-        end # end sequence
-
-        break if _tmp
-        self.pos = _save1
-
-        _save5 = self.pos
-        while true # sequence
-          _save6 = self.pos
-          _tmp = get_byte
-          self.pos = _save6
-          unless _tmp
-            self.pos = _save5
-            break
-          end
-          _save7 = self.pos
-          _tmp = begin;  !notes? ; end
-          self.pos = _save7
-          unless _tmp
-            self.pos = _save5
-          end
-          break
-        end # end sequence
-
-        break if _tmp
-        self.pos = _save1
-        break
-      end # end choice
-
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = _StartList()
-      a = @result
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      while true
-
-        _save9 = self.pos
-        while true # sequence
-          _save10 = self.pos
-          _tmp = match_string("]")
-          _tmp = _tmp ? nil : true
-          self.pos = _save10
-          unless _tmp
-            self.pos = _save9
-            break
-          end
-          _tmp = apply(:_Inline)
-          l = @result
-          unless _tmp
-            self.pos = _save9
-            break
-          end
-          @result = begin;  a << l ; end
-          _tmp = true
-          unless _tmp
-            self.pos = _save9
-          end
-          break
-        end # end sequence
-
-        break unless _tmp
-      end
-      _tmp = true
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = match_string("]")
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      @result = begin;  a.join.gsub(/\s+/, ' ') ; end
-      _tmp = true
-      unless _tmp
-        self.pos = _save
-      end
-      break
-    end # end sequence
-
-    set_failed_rule :_Label unless _tmp
-    return _tmp
-  end
-
-  # RefSrc = < Nonspacechar+ > { text }
-  def _RefSrc
-
-    _save = self.pos
-    while true # sequence
-      _text_start = self.pos
-      _save1 = self.pos
-      _tmp = apply(:_Nonspacechar)
-      if _tmp
-        while true
-          _tmp = apply(:_Nonspacechar)
-          break unless _tmp
-        end
-        _tmp = true
-      else
-        self.pos = _save1
-      end
-      if _tmp
-        text = get_text(_text_start)
-      end
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      @result = begin;  text ; end
-      _tmp = true
-      unless _tmp
-        self.pos = _save
-      end
-      break
-    end # end sequence
-
-    set_failed_rule :_RefSrc unless _tmp
-    return _tmp
-  end
-
-  # RefTitle = (RefTitleSingle | RefTitleDouble | RefTitleParens | EmptyTitle)
-  def _RefTitle
-
-    _save = self.pos
-    while true # choice
-      _tmp = apply(:_RefTitleSingle)
-      break if _tmp
-      self.pos = _save
-      _tmp = apply(:_RefTitleDouble)
-      break if _tmp
-      self.pos = _save
-      _tmp = apply(:_RefTitleParens)
-      break if _tmp
-      self.pos = _save
-      _tmp = apply(:_EmptyTitle)
-      break if _tmp
-      self.pos = _save
-      break
-    end # end choice
-
-    set_failed_rule :_RefTitle unless _tmp
-    return _tmp
-  end
-
-  # EmptyTitle = ""
-  def _EmptyTitle
-    _tmp = match_string("")
-    set_failed_rule :_EmptyTitle unless _tmp
-    return _tmp
-  end
-
-  # RefTitleSingle = Spnl "'" < (!("'" @Sp @Newline | @Newline) .)* > "'" { text }
-  def _RefTitleSingle
-
-    _save = self.pos
-    while true # sequence
-      _tmp = apply(:_Spnl)
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = match_string("'")
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _text_start = self.pos
-      while true
-
-        _save2 = self.pos
-        while true # sequence
-          _save3 = self.pos
-
-          _save4 = self.pos
-          while true # choice
-
-            _save5 = self.pos
-            while true # sequence
-              _tmp = match_string("'")
-              unless _tmp
-                self.pos = _save5
-                break
-              end
-              _tmp = _Sp()
-              unless _tmp
-                self.pos = _save5
-                break
-              end
-              _tmp = _Newline()
-              unless _tmp
-                self.pos = _save5
-              end
-              break
-            end # end sequence
-
-            break if _tmp
-            self.pos = _save4
-            _tmp = _Newline()
-            break if _tmp
-            self.pos = _save4
-            break
-          end # end choice
-
-          _tmp = _tmp ? nil : true
-          self.pos = _save3
-          unless _tmp
-            self.pos = _save2
-            break
-          end
-          _tmp = get_byte
-          unless _tmp
-            self.pos = _save2
-          end
-          break
-        end # end sequence
-
-        break unless _tmp
-      end
-      _tmp = true
-      if _tmp
-        text = get_text(_text_start)
-      end
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = match_string("'")
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      @result = begin;  text ; end
-      _tmp = true
-      unless _tmp
-        self.pos = _save
-      end
-      break
-    end # end sequence
-
-    set_failed_rule :_RefTitleSingle unless _tmp
-    return _tmp
-  end
-
-  # RefTitleDouble = Spnl "\"" < (!("\"" @Sp @Newline | @Newline) .)* > "\"" { text }
-  def _RefTitleDouble
-
-    _save = self.pos
-    while true # sequence
-      _tmp = apply(:_Spnl)
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = match_string("\"")
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _text_start = self.pos
-      while true
-
-        _save2 = self.pos
-        while true # sequence
-          _save3 = self.pos
-
-          _save4 = self.pos
-          while true # choice
-
-            _save5 = self.pos
-            while true # sequence
-              _tmp = match_string("\"")
-              unless _tmp
-                self.pos = _save5
-                break
-              end
-              _tmp = _Sp()
-              unless _tmp
-                self.pos = _save5
-                break
-              end
-              _tmp = _Newline()
-              unless _tmp
-                self.pos = _save5
-              end
-              break
-            end # end sequence
-
-            break if _tmp
-            self.pos = _save4
-            _tmp = _Newline()
-            break if _tmp
-            self.pos = _save4
-            break
-          end # end choice
-
-          _tmp = _tmp ? nil : true
-          self.pos = _save3
-          unless _tmp
-            self.pos = _save2
-            break
-          end
-          _tmp = get_byte
-          unless _tmp
-            self.pos = _save2
-          end
-          break
-        end # end sequence
-
-        break unless _tmp
-      end
-      _tmp = true
-      if _tmp
-        text = get_text(_text_start)
-      end
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = match_string("\"")
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      @result = begin;  text ; end
-      _tmp = true
-      unless _tmp
-        self.pos = _save
-      end
-      break
-    end # end sequence
-
-    set_failed_rule :_RefTitleDouble unless _tmp
-    return _tmp
-  end
-
-  # RefTitleParens = Spnl "(" < (!(")" @Sp @Newline | @Newline) .)* > ")" { text }
-  def _RefTitleParens
-
-    _save = self.pos
-    while true # sequence
-      _tmp = apply(:_Spnl)
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = match_string("(")
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _text_start = self.pos
-      while true
-
-        _save2 = self.pos
-        while true # sequence
-          _save3 = self.pos
-
-          _save4 = self.pos
-          while true # choice
-
-            _save5 = self.pos
-            while true # sequence
-              _tmp = match_string(")")
-              unless _tmp
-                self.pos = _save5
-                break
-              end
-              _tmp = _Sp()
-              unless _tmp
-                self.pos = _save5
-                break
-              end
-              _tmp = _Newline()
-              unless _tmp
-                self.pos = _save5
-              end
-              break
-            end # end sequence
-
-            break if _tmp
-            self.pos = _save4
-            _tmp = _Newline()
-            break if _tmp
-            self.pos = _save4
-            break
-          end # end choice
-
-          _tmp = _tmp ? nil : true
-          self.pos = _save3
-          unless _tmp
-            self.pos = _save2
-            break
-          end
-          _tmp = get_byte
-          unless _tmp
-            self.pos = _save2
-          end
-          break
-        end # end sequence
-
-        break unless _tmp
-      end
-      _tmp = true
-      if _tmp
-        text = get_text(_text_start)
-      end
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = match_string(")")
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      @result = begin;  text ; end
-      _tmp = true
-      unless _tmp
-        self.pos = _save
-      end
-      break
-    end # end sequence
-
-    set_failed_rule :_RefTitleParens unless _tmp
-    return _tmp
-  end
-
-  # References = (Reference | SkipBlock)*
-  def _References
-    while true
-
-      _save1 = self.pos
-      while true # choice
-        _tmp = apply(:_Reference)
-        break if _tmp
-        self.pos = _save1
-        _tmp = apply(:_SkipBlock)
-        break if _tmp
-        self.pos = _save1
-        break
-      end # end choice
-
-      break unless _tmp
-    end
-    _tmp = true
-    set_failed_rule :_References unless _tmp
-    return _tmp
-  end
-
-  # Ticks1 = "`" !"`"
-  def _Ticks1
-
-    _save = self.pos
-    while true # sequence
-      _tmp = match_string("`")
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _save1 = self.pos
-      _tmp = match_string("`")
-      _tmp = _tmp ? nil : true
-      self.pos = _save1
-      unless _tmp
-        self.pos = _save
-      end
-      break
-    end # end sequence
-
-    set_failed_rule :_Ticks1 unless _tmp
-    return _tmp
-  end
-
-  # Ticks2 = "``" !"`"
-  def _Ticks2
-
-    _save = self.pos
-    while true # sequence
-      _tmp = match_string("``")
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _save1 = self.pos
-      _tmp = match_string("`")
-      _tmp = _tmp ? nil : true
-      self.pos = _save1
-      unless _tmp
-        self.pos = _save
-      end
-      break
-    end # end sequence
-
-    set_failed_rule :_Ticks2 unless _tmp
-    return _tmp
-  end
-
-  # Ticks3 = "```" !"`"
-  def _Ticks3
-
-    _save = self.pos
-    while true # sequence
-      _tmp = match_string("```")
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _save1 = self.pos
-      _tmp = match_string("`")
-      _tmp = _tmp ? nil : true
-      self.pos = _save1
-      unless _tmp
-        self.pos = _save
-      end
-      break
-    end # end sequence
-
-    set_failed_rule :_Ticks3 unless _tmp
-    return _tmp
-  end
-
-  # Ticks4 = "````" !"`"
-  def _Ticks4
-
-    _save = self.pos
-    while true # sequence
-      _tmp = match_string("````")
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _save1 = self.pos
-      _tmp = match_string("`")
-      _tmp = _tmp ? nil : true
-      self.pos = _save1
-      unless _tmp
-        self.pos = _save
-      end
-      break
-    end # end sequence
-
-    set_failed_rule :_Ticks4 unless _tmp
-    return _tmp
-  end
-
-  # Ticks5 = "`````" !"`"
-  def _Ticks5
-
-    _save = self.pos
-    while true # sequence
-      _tmp = match_string("`````")
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _save1 = self.pos
-      _tmp = match_string("`")
-      _tmp = _tmp ? nil : true
-      self.pos = _save1
-      unless _tmp
-        self.pos = _save
-      end
-      break
-    end # end sequence
-
-    set_failed_rule :_Ticks5 unless _tmp
-    return _tmp
-  end
-
-  # Code = (Ticks1 @Sp < ((!"`" Nonspacechar)+ | !Ticks1 /`+/ | !(@Sp Ticks1) (@Spacechar | @Newline !@BlankLine))+ > @Sp Ticks1 | Ticks2 @Sp < ((!"`" Nonspacechar)+ | !Ticks2 /`+/ | !(@Sp Ticks2) (@Spacechar | @Newline !@BlankLine))+ > @Sp Ticks2 | Ticks3 @Sp < ((!"`" Nonspacechar)+ | !Ticks3 /`+/ | !(@Sp Ticks3) (@Spacechar | @Newline !@BlankLine))+ > @Sp Ticks3 | Ticks4 @Sp < ((!"`" Nonspacechar)+ | !Ticks4 /`+/ | !(@Sp Ticks4) (@Spacechar | @Newline !@BlankLine))+ > @Sp Ticks4 | Ticks5 @Sp < ((!"`" Nonspacechar)+ | !Ticks5 /`+/ | !(@Sp Ticks5) (@Spacechar | @Newline !@BlankLine))+ > @Sp Ticks5) { "<code>#{text}</code>" }
-  def _Code
-
-    _save = self.pos
-    while true # sequence
-
-      _save1 = self.pos
-      while true # choice
-
-        _save2 = self.pos
-        while true # sequence
-          _tmp = apply(:_Ticks1)
-          unless _tmp
-            self.pos = _save2
-            break
-          end
-          _tmp = _Sp()
-          unless _tmp
-            self.pos = _save2
-            break
-          end
-          _text_start = self.pos
-          _save3 = self.pos
-
-          _save4 = self.pos
-          while true # choice
-            _save5 = self.pos
-
-            _save6 = self.pos
-            while true # sequence
-              _save7 = self.pos
-              _tmp = match_string("`")
-              _tmp = _tmp ? nil : true
-              self.pos = _save7
-              unless _tmp
-                self.pos = _save6
-                break
-              end
-              _tmp = apply(:_Nonspacechar)
-              unless _tmp
-                self.pos = _save6
-              end
-              break
-            end # end sequence
-
-            if _tmp
-              while true
-
-                _save8 = self.pos
-                while true # sequence
-                  _save9 = self.pos
-                  _tmp = match_string("`")
-                  _tmp = _tmp ? nil : true
-                  self.pos = _save9
-                  unless _tmp
-                    self.pos = _save8
-                    break
-                  end
-                  _tmp = apply(:_Nonspacechar)
-                  unless _tmp
-                    self.pos = _save8
-                  end
-                  break
-                end # end sequence
-
-                break unless _tmp
-              end
-              _tmp = true
-            else
-              self.pos = _save5
-            end
-            break if _tmp
-            self.pos = _save4
-
-            _save10 = self.pos
-            while true # sequence
-              _save11 = self.pos
-              _tmp = apply(:_Ticks1)
-              _tmp = _tmp ? nil : true
-              self.pos = _save11
-              unless _tmp
-                self.pos = _save10
-                break
-              end
-              _tmp = scan(/\G(?-mix:`+)/)
-              unless _tmp
-                self.pos = _save10
-              end
-              break
-            end # end sequence
-
-            break if _tmp
-            self.pos = _save4
-
-            _save12 = self.pos
-            while true # sequence
-              _save13 = self.pos
-
-              _save14 = self.pos
-              while true # sequence
-                _tmp = _Sp()
-                unless _tmp
-                  self.pos = _save14
-                  break
-                end
-                _tmp = apply(:_Ticks1)
-                unless _tmp
-                  self.pos = _save14
-                end
-                break
-              end # end sequence
-
-              _tmp = _tmp ? nil : true
-              self.pos = _save13
-              unless _tmp
-                self.pos = _save12
-                break
-              end
-
-              _save15 = self.pos
-              while true # choice
-                _tmp = _Spacechar()
-                break if _tmp
-                self.pos = _save15
-
-                _save16 = self.pos
-                while true # sequence
-                  _tmp = _Newline()
-                  unless _tmp
-                    self.pos = _save16
-                    break
-                  end
-                  _save17 = self.pos
-                  _tmp = _BlankLine()
-                  _tmp = _tmp ? nil : true
-                  self.pos = _save17
-                  unless _tmp
-                    self.pos = _save16
-                  end
-                  break
-                end # end sequence
-
-                break if _tmp
-                self.pos = _save15
-                break
-              end # end choice
-
-              unless _tmp
-                self.pos = _save12
-              end
-              break
-            end # end sequence
-
-            break if _tmp
-            self.pos = _save4
-            break
-          end # end choice
-
-          if _tmp
-            while true
-
-              _save18 = self.pos
-              while true # choice
-                _save19 = self.pos
-
-                _save20 = self.pos
-                while true # sequence
-                  _save21 = self.pos
-                  _tmp = match_string("`")
-                  _tmp = _tmp ? nil : true
-                  self.pos = _save21
-                  unless _tmp
-                    self.pos = _save20
-                    break
-                  end
-                  _tmp = apply(:_Nonspacechar)
-                  unless _tmp
-                    self.pos = _save20
-                  end
-                  break
-                end # end sequence
-
-                if _tmp
-                  while true
-
-                    _save22 = self.pos
-                    while true # sequence
-                      _save23 = self.pos
-                      _tmp = match_string("`")
-                      _tmp = _tmp ? nil : true
-                      self.pos = _save23
-                      unless _tmp
-                        self.pos = _save22
-                        break
-                      end
-                      _tmp = apply(:_Nonspacechar)
-                      unless _tmp
-                        self.pos = _save22
-                      end
-                      break
-                    end # end sequence
-
-                    break unless _tmp
-                  end
-                  _tmp = true
-                else
-                  self.pos = _save19
-                end
-                break if _tmp
-                self.pos = _save18
-
-                _save24 = self.pos
-                while true # sequence
-                  _save25 = self.pos
-                  _tmp = apply(:_Ticks1)
-                  _tmp = _tmp ? nil : true
-                  self.pos = _save25
-                  unless _tmp
-                    self.pos = _save24
-                    break
-                  end
-                  _tmp = scan(/\G(?-mix:`+)/)
-                  unless _tmp
-                    self.pos = _save24
-                  end
-                  break
-                end # end sequence
-
-                break if _tmp
-                self.pos = _save18
-
-                _save26 = self.pos
-                while true # sequence
-                  _save27 = self.pos
-
-                  _save28 = self.pos
-                  while true # sequence
-                    _tmp = _Sp()
-                    unless _tmp
-                      self.pos = _save28
-                      break
-                    end
-                    _tmp = apply(:_Ticks1)
-                    unless _tmp
-                      self.pos = _save28
-                    end
-                    break
-                  end # end sequence
-
-                  _tmp = _tmp ? nil : true
-                  self.pos = _save27
-                  unless _tmp
-                    self.pos = _save26
-                    break
-                  end
-
-                  _save29 = self.pos
-                  while true # choice
-                    _tmp = _Spacechar()
-                    break if _tmp
-                    self.pos = _save29
-
-                    _save30 = self.pos
-                    while true # sequence
-                      _tmp = _Newline()
-                      unless _tmp
-                        self.pos = _save30
-                        break
-                      end
-                      _save31 = self.pos
-                      _tmp = _BlankLine()
-                      _tmp = _tmp ? nil : true
-                      self.pos = _save31
-                      unless _tmp
-                        self.pos = _save30
-                      end
-                      break
-                    end # end sequence
-
-                    break if _tmp
-                    self.pos = _save29
-                    break
-                  end # end choice
-
-                  unless _tmp
-                    self.pos = _save26
-                  end
-                  break
-                end # end sequence
-
-                break if _tmp
-                self.pos = _save18
-                break
-              end # end choice
-
-              break unless _tmp
-            end
-            _tmp = true
-          else
-            self.pos = _save3
-          end
-          if _tmp
-            text = get_text(_text_start)
-          end
-          unless _tmp
-            self.pos = _save2
-            break
-          end
-          _tmp = _Sp()
-          unless _tmp
-            self.pos = _save2
-            break
-          end
-          _tmp = apply(:_Ticks1)
-          unless _tmp
-            self.pos = _save2
-          end
-          break
-        end # end sequence
-
-        break if _tmp
-        self.pos = _save1
-
-        _save32 = self.pos
-        while true # sequence
-          _tmp = apply(:_Ticks2)
-          unless _tmp
-            self.pos = _save32
-            break
-          end
-          _tmp = _Sp()
-          unless _tmp
-            self.pos = _save32
-            break
-          end
-          _text_start = self.pos
-          _save33 = self.pos
-
-          _save34 = self.pos
-          while true # choice
-            _save35 = self.pos
-
-            _save36 = self.pos
-            while true # sequence
-              _save37 = self.pos
-              _tmp = match_string("`")
-              _tmp = _tmp ? nil : true
-              self.pos = _save37
-              unless _tmp
-                self.pos = _save36
-                break
-              end
-              _tmp = apply(:_Nonspacechar)
-              unless _tmp
-                self.pos = _save36
-              end
-              break
-            end # end sequence
-
-            if _tmp
-              while true
-
-                _save38 = self.pos
-                while true # sequence
-                  _save39 = self.pos
-                  _tmp = match_string("`")
-                  _tmp = _tmp ? nil : true
-                  self.pos = _save39
-                  unless _tmp
-                    self.pos = _save38
-                    break
-                  end
-                  _tmp = apply(:_Nonspacechar)
-                  unless _tmp
-                    self.pos = _save38
-                  end
-                  break
-                end # end sequence
-
-                break unless _tmp
-              end
-              _tmp = true
-            else
-              self.pos = _save35
-            end
-            break if _tmp
-            self.pos = _save34
-
-            _save40 = self.pos
-            while true # sequence
-              _save41 = self.pos
-              _tmp = apply(:_Ticks2)
-              _tmp = _tmp ? nil : true
-              self.pos = _save41
-              unless _tmp
-                self.pos = _save40
-                break
-              end
-              _tmp = scan(/\G(?-mix:`+)/)
-              unless _tmp
-                self.pos = _save40
-              end
-              break
-            end # end sequence
-
-            break if _tmp
-            self.pos = _save34
-
-            _save42 = self.pos
-            while true # sequence
-              _save43 = self.pos
-
-              _save44 = self.pos
-              while true # sequence
-                _tmp = _Sp()
-                unless _tmp
-                  self.pos = _save44
-                  break
-                end
-                _tmp = apply(:_Ticks2)
-                unless _tmp
-                  self.pos = _save44
-                end
-                break
-              end # end sequence
-
-              _tmp = _tmp ? nil : true
-              self.pos = _save43
-              unless _tmp
-                self.pos = _save42
-                break
-              end
-
-              _save45 = self.pos
-              while true # choice
-                _tmp = _Spacechar()
-                break if _tmp
-                self.pos = _save45
-
-                _save46 = self.pos
-                while true # sequence
-                  _tmp = _Newline()
-                  unless _tmp
-                    self.pos = _save46
-                    break
-                  end
-                  _save47 = self.pos
-                  _tmp = _BlankLine()
-                  _tmp = _tmp ? nil : true
-                  self.pos = _save47
-                  unless _tmp
-                    self.pos = _save46
-                  end
-                  break
-                end # end sequence
-
-                break if _tmp
-                self.pos = _save45
-                break
-              end # end choice
-
-              unless _tmp
-                self.pos = _save42
-              end
-              break
-            end # end sequence
-
-            break if _tmp
-            self.pos = _save34
-            break
-          end # end choice
-
-          if _tmp
-            while true
-
-              _save48 = self.pos
-              while true # choice
-                _save49 = self.pos
-
-                _save50 = self.pos
-                while true # sequence
-                  _save51 = self.pos
-                  _tmp = match_string("`")
-                  _tmp = _tmp ? nil : true
-                  self.pos = _save51
-                  unless _tmp
-                    self.pos = _save50
-                    break
-                  end
-                  _tmp = apply(:_Nonspacechar)
-                  unless _tmp
-                    self.pos = _save50
-                  end
-                  break
-                end # end sequence
-
-                if _tmp
-                  while true
-
-                    _save52 = self.pos
-                    while true # sequence
-                      _save53 = self.pos
-                      _tmp = match_string("`")
-                      _tmp = _tmp ? nil : true
-                      self.pos = _save53
-                      unless _tmp
-                        self.pos = _save52
-                        break
-                      end
-                      _tmp = apply(:_Nonspacechar)
-                      unless _tmp
-                        self.pos = _save52
-                      end
-                      break
-                    end # end sequence
-
-                    break unless _tmp
-                  end
-                  _tmp = true
-                else
-                  self.pos = _save49
-                end
-                break if _tmp
-                self.pos = _save48
-
-                _save54 = self.pos
-                while true # sequence
-                  _save55 = self.pos
-                  _tmp = apply(:_Ticks2)
-                  _tmp = _tmp ? nil : true
-                  self.pos = _save55
-                  unless _tmp
-                    self.pos = _save54
-                    break
-                  end
-                  _tmp = scan(/\G(?-mix:`+)/)
-                  unless _tmp
-                    self.pos = _save54
-                  end
-                  break
-                end # end sequence
-
-                break if _tmp
-                self.pos = _save48
-
-                _save56 = self.pos
-                while true # sequence
-                  _save57 = self.pos
-
-                  _save58 = self.pos
-                  while true # sequence
-                    _tmp = _Sp()
-                    unless _tmp
-                      self.pos = _save58
-                      break
-                    end
-                    _tmp = apply(:_Ticks2)
-                    unless _tmp
-                      self.pos = _save58
-                    end
-                    break
-                  end # end sequence
-
-                  _tmp = _tmp ? nil : true
-                  self.pos = _save57
-                  unless _tmp
-                    self.pos = _save56
-                    break
-                  end
-
-                  _save59 = self.pos
-                  while true # choice
-                    _tmp = _Spacechar()
-                    break if _tmp
-                    self.pos = _save59
-
-                    _save60 = self.pos
-                    while true # sequence
-                      _tmp = _Newline()
-                      unless _tmp
-                        self.pos = _save60
-                        break
-                      end
-                      _save61 = self.pos
-                      _tmp = _BlankLine()
-                      _tmp = _tmp ? nil : true
-                      self.pos = _save61
-                      unless _tmp
-                        self.pos = _save60
-                      end
-                      break
-                    end # end sequence
-
-                    break if _tmp
-                    self.pos = _save59
-                    break
-                  end # end choice
-
-                  unless _tmp
-                    self.pos = _save56
-                  end
-                  break
-                end # end sequence
-
-                break if _tmp
-                self.pos = _save48
-                break
-              end # end choice
-
-              break unless _tmp
-            end
-            _tmp = true
-          else
-            self.pos = _save33
-          end
-          if _tmp
-            text = get_text(_text_start)
-          end
-          unless _tmp
-            self.pos = _save32
-            break
-          end
-          _tmp = _Sp()
-          unless _tmp
-            self.pos = _save32
-            break
-          end
-          _tmp = apply(:_Ticks2)
-          unless _tmp
-            self.pos = _save32
-          end
-          break
-        end # end sequence
-
-        break if _tmp
-        self.pos = _save1
-
-        _save62 = self.pos
-        while true # sequence
-          _tmp = apply(:_Ticks3)
-          unless _tmp
-            self.pos = _save62
-            break
-          end
-          _tmp = _Sp()
-          unless _tmp
-            self.pos = _save62
-            break
-          end
-          _text_start = self.pos
-          _save63 = self.pos
-
-          _save64 = self.pos
-          while true # choice
-            _save65 = self.pos
-
-            _save66 = self.pos
-            while true # sequence
-              _save67 = self.pos
-              _tmp = match_string("`")
-              _tmp = _tmp ? nil : true
-              self.pos = _save67
-              unless _tmp
-                self.pos = _save66
-                break
-              end
-              _tmp = apply(:_Nonspacechar)
-              unless _tmp
-                self.pos = _save66
-              end
-              break
-            end # end sequence
-
-            if _tmp
-              while true
-
-                _save68 = self.pos
-                while true # sequence
-                  _save69 = self.pos
-                  _tmp = match_string("`")
-                  _tmp = _tmp ? nil : true
-                  self.pos = _save69
-                  unless _tmp
-                    self.pos = _save68
-                    break
-                  end
-                  _tmp = apply(:_Nonspacechar)
-                  unless _tmp
-                    self.pos = _save68
-                  end
-                  break
-                end # end sequence
-
-                break unless _tmp
-              end
-              _tmp = true
-            else
-              self.pos = _save65
-            end
-            break if _tmp
-            self.pos = _save64
-
-            _save70 = self.pos
-            while true # sequence
-              _save71 = self.pos
-              _tmp = apply(:_Ticks3)
-              _tmp = _tmp ? nil : true
-              self.pos = _save71
-              unless _tmp
-                self.pos = _save70
-                break
-              end
-              _tmp = scan(/\G(?-mix:`+)/)
-              unless _tmp
-                self.pos = _save70
-              end
-              break
-            end # end sequence
-
-            break if _tmp
-            self.pos = _save64
-
-            _save72 = self.pos
-            while true # sequence
-              _save73 = self.pos
-
-              _save74 = self.pos
-              while true # sequence
-                _tmp = _Sp()
-                unless _tmp
-                  self.pos = _save74
-                  break
-                end
-                _tmp = apply(:_Ticks3)
-                unless _tmp
-                  self.pos = _save74
-                end
-                break
-              end # end sequence
-
-              _tmp = _tmp ? nil : true
-              self.pos = _save73
-              unless _tmp
-                self.pos = _save72
-                break
-              end
-
-              _save75 = self.pos
-              while true # choice
-                _tmp = _Spacechar()
-                break if _tmp
-                self.pos = _save75
-
-                _save76 = self.pos
-                while true # sequence
-                  _tmp = _Newline()
-                  unless _tmp
-                    self.pos = _save76
-                    break
-                  end
-                  _save77 = self.pos
-                  _tmp = _BlankLine()
-                  _tmp = _tmp ? nil : true
-                  self.pos = _save77
-                  unless _tmp
-                    self.pos = _save76
-                  end
-                  break
-                end # end sequence
-
-                break if _tmp
-                self.pos = _save75
-                break
-              end # end choice
-
-              unless _tmp
-                self.pos = _save72
-              end
-              break
-            end # end sequence
-
-            break if _tmp
-            self.pos = _save64
-            break
-          end # end choice
-
-          if _tmp
-            while true
-
-              _save78 = self.pos
-              while true # choice
-                _save79 = self.pos
-
-                _save80 = self.pos
-                while true # sequence
-                  _save81 = self.pos
-                  _tmp = match_string("`")
-                  _tmp = _tmp ? nil : true
-                  self.pos = _save81
-                  unless _tmp
-                    self.pos = _save80
-                    break
-                  end
-                  _tmp = apply(:_Nonspacechar)
-                  unless _tmp
-                    self.pos = _save80
-                  end
-                  break
-                end # end sequence
-
-                if _tmp
-                  while true
-
-                    _save82 = self.pos
-                    while true # sequence
-                      _save83 = self.pos
-                      _tmp = match_string("`")
-                      _tmp = _tmp ? nil : true
-                      self.pos = _save83
-                      unless _tmp
-                        self.pos = _save82
-                        break
-                      end
-                      _tmp = apply(:_Nonspacechar)
-                      unless _tmp
-                        self.pos = _save82
-                      end
-                      break
-                    end # end sequence
-
-                    break unless _tmp
-                  end
-                  _tmp = true
-                else
-                  self.pos = _save79
-                end
-                break if _tmp
-                self.pos = _save78
-
-                _save84 = self.pos
-                while true # sequence
-                  _save85 = self.pos
-                  _tmp = apply(:_Ticks3)
-                  _tmp = _tmp ? nil : true
-                  self.pos = _save85
-                  unless _tmp
-                    self.pos = _save84
-                    break
-                  end
-                  _tmp = scan(/\G(?-mix:`+)/)
-                  unless _tmp
-                    self.pos = _save84
-                  end
-                  break
-                end # end sequence
-
-                break if _tmp
-                self.pos = _save78
-
-                _save86 = self.pos
-                while true # sequence
-                  _save87 = self.pos
-
-                  _save88 = self.pos
-                  while true # sequence
-                    _tmp = _Sp()
-                    unless _tmp
-                      self.pos = _save88
-                      break
-                    end
-                    _tmp = apply(:_Ticks3)
-                    unless _tmp
-                      self.pos = _save88
-                    end
-                    break
-                  end # end sequence
-
-                  _tmp = _tmp ? nil : true
-                  self.pos = _save87
-                  unless _tmp
-                    self.pos = _save86
-                    break
-                  end
-
-                  _save89 = self.pos
-                  while true # choice
-                    _tmp = _Spacechar()
-                    break if _tmp
-                    self.pos = _save89
-
-                    _save90 = self.pos
-                    while true # sequence
-                      _tmp = _Newline()
-                      unless _tmp
-                        self.pos = _save90
-                        break
-                      end
-                      _save91 = self.pos
-                      _tmp = _BlankLine()
-                      _tmp = _tmp ? nil : true
-                      self.pos = _save91
-                      unless _tmp
-                        self.pos = _save90
-                      end
-                      break
-                    end # end sequence
-
-                    break if _tmp
-                    self.pos = _save89
-                    break
-                  end # end choice
-
-                  unless _tmp
-                    self.pos = _save86
-                  end
-                  break
-                end # end sequence
-
-                break if _tmp
-                self.pos = _save78
-                break
-              end # end choice
-
-              break unless _tmp
-            end
-            _tmp = true
-          else
-            self.pos = _save63
-          end
-          if _tmp
-            text = get_text(_text_start)
-          end
-          unless _tmp
-            self.pos = _save62
-            break
-          end
-          _tmp = _Sp()
-          unless _tmp
-            self.pos = _save62
-            break
-          end
-          _tmp = apply(:_Ticks3)
-          unless _tmp
-            self.pos = _save62
-          end
-          break
-        end # end sequence
-
-        break if _tmp
-        self.pos = _save1
-
-        _save92 = self.pos
-        while true # sequence
-          _tmp = apply(:_Ticks4)
-          unless _tmp
-            self.pos = _save92
-            break
-          end
-          _tmp = _Sp()
-          unless _tmp
-            self.pos = _save92
-            break
-          end
-          _text_start = self.pos
-          _save93 = self.pos
-
-          _save94 = self.pos
-          while true # choice
-            _save95 = self.pos
-
-            _save96 = self.pos
-            while true # sequence
-              _save97 = self.pos
-              _tmp = match_string("`")
-              _tmp = _tmp ? nil : true
-              self.pos = _save97
-              unless _tmp
-                self.pos = _save96
-                break
-              end
-              _tmp = apply(:_Nonspacechar)
-              unless _tmp
-                self.pos = _save96
-              end
-              break
-            end # end sequence
-
-            if _tmp
-              while true
-
-                _save98 = self.pos
-                while true # sequence
-                  _save99 = self.pos
-                  _tmp = match_string("`")
-                  _tmp = _tmp ? nil : true
-                  self.pos = _save99
-                  unless _tmp
-                    self.pos = _save98
-                    break
-                  end
-                  _tmp = apply(:_Nonspacechar)
-                  unless _tmp
-                    self.pos = _save98
-                  end
-                  break
-                end # end sequence
-
-                break unless _tmp
-              end
-              _tmp = true
-            else
-              self.pos = _save95
-            end
-            break if _tmp
-            self.pos = _save94
-
-            _save100 = self.pos
-            while true # sequence
-              _save101 = self.pos
-              _tmp = apply(:_Ticks4)
-              _tmp = _tmp ? nil : true
-              self.pos = _save101
-              unless _tmp
-                self.pos = _save100
-                break
-              end
-              _tmp = scan(/\G(?-mix:`+)/)
-              unless _tmp
-                self.pos = _save100
-              end
-              break
-            end # end sequence
-
-            break if _tmp
-            self.pos = _save94
-
-            _save102 = self.pos
-            while true # sequence
-              _save103 = self.pos
-
-              _save104 = self.pos
-              while true # sequence
-                _tmp = _Sp()
-                unless _tmp
-                  self.pos = _save104
-                  break
-                end
-                _tmp = apply(:_Ticks4)
-                unless _tmp
-                  self.pos = _save104
-                end
-                break
-              end # end sequence
-
-              _tmp = _tmp ? nil : true
-              self.pos = _save103
-              unless _tmp
-                self.pos = _save102
-                break
-              end
-
-              _save105 = self.pos
-              while true # choice
-                _tmp = _Spacechar()
-                break if _tmp
-                self.pos = _save105
-
-                _save106 = self.pos
-                while true # sequence
-                  _tmp = _Newline()
-                  unless _tmp
-                    self.pos = _save106
-                    break
-                  end
-                  _save107 = self.pos
-                  _tmp = _BlankLine()
-                  _tmp = _tmp ? nil : true
-                  self.pos = _save107
-                  unless _tmp
-                    self.pos = _save106
-                  end
-                  break
-                end # end sequence
-
-                break if _tmp
-                self.pos = _save105
-                break
-              end # end choice
-
-              unless _tmp
-                self.pos = _save102
-              end
-              break
-            end # end sequence
-
-            break if _tmp
-            self.pos = _save94
-            break
-          end # end choice
-
-          if _tmp
-            while true
-
-              _save108 = self.pos
-              while true # choice
-                _save109 = self.pos
-
-                _save110 = self.pos
-                while true # sequence
-                  _save111 = self.pos
-                  _tmp = match_string("`")
-                  _tmp = _tmp ? nil : true
-                  self.pos = _save111
-                  unless _tmp
-                    self.pos = _save110
-                    break
-                  end
-                  _tmp = apply(:_Nonspacechar)
-                  unless _tmp
-                    self.pos = _save110
-                  end
-                  break
-                end # end sequence
-
-                if _tmp
-                  while true
-
-                    _save112 = self.pos
-                    while true # sequence
-                      _save113 = self.pos
-                      _tmp = match_string("`")
-                      _tmp = _tmp ? nil : true
-                      self.pos = _save113
-                      unless _tmp
-                        self.pos = _save112
-                        break
-                      end
-                      _tmp = apply(:_Nonspacechar)
-                      unless _tmp
-                        self.pos = _save112
-                      end
-                      break
-                    end # end sequence
-
-                    break unless _tmp
-                  end
-                  _tmp = true
-                else
-                  self.pos = _save109
-                end
-                break if _tmp
-                self.pos = _save108
-
-                _save114 = self.pos
-                while true # sequence
-                  _save115 = self.pos
-                  _tmp = apply(:_Ticks4)
-                  _tmp = _tmp ? nil : true
-                  self.pos = _save115
-                  unless _tmp
-                    self.pos = _save114
-                    break
-                  end
-                  _tmp = scan(/\G(?-mix:`+)/)
-                  unless _tmp
-                    self.pos = _save114
-                  end
-                  break
-                end # end sequence
-
-                break if _tmp
-                self.pos = _save108
-
-                _save116 = self.pos
-                while true # sequence
-                  _save117 = self.pos
-
-                  _save118 = self.pos
-                  while true # sequence
-                    _tmp = _Sp()
-                    unless _tmp
-                      self.pos = _save118
-                      break
-                    end
-                    _tmp = apply(:_Ticks4)
-                    unless _tmp
-                      self.pos = _save118
-                    end
-                    break
-                  end # end sequence
-
-                  _tmp = _tmp ? nil : true
-                  self.pos = _save117
-                  unless _tmp
-                    self.pos = _save116
-                    break
-                  end
-
-                  _save119 = self.pos
-                  while true # choice
-                    _tmp = _Spacechar()
-                    break if _tmp
-                    self.pos = _save119
-
-                    _save120 = self.pos
-                    while true # sequence
-                      _tmp = _Newline()
-                      unless _tmp
-                        self.pos = _save120
-                        break
-                      end
-                      _save121 = self.pos
-                      _tmp = _BlankLine()
-                      _tmp = _tmp ? nil : true
-                      self.pos = _save121
-                      unless _tmp
-                        self.pos = _save120
-                      end
-                      break
-                    end # end sequence
-
-                    break if _tmp
-                    self.pos = _save119
-                    break
-                  end # end choice
-
-                  unless _tmp
-                    self.pos = _save116
-                  end
-                  break
-                end # end sequence
-
-                break if _tmp
-                self.pos = _save108
-                break
-              end # end choice
-
-              break unless _tmp
-            end
-            _tmp = true
-          else
-            self.pos = _save93
-          end
-          if _tmp
-            text = get_text(_text_start)
-          end
-          unless _tmp
-            self.pos = _save92
-            break
-          end
-          _tmp = _Sp()
-          unless _tmp
-            self.pos = _save92
-            break
-          end
-          _tmp = apply(:_Ticks4)
-          unless _tmp
-            self.pos = _save92
-          end
-          break
-        end # end sequence
-
-        break if _tmp
-        self.pos = _save1
-
-        _save122 = self.pos
-        while true # sequence
-          _tmp = apply(:_Ticks5)
-          unless _tmp
-            self.pos = _save122
-            break
-          end
-          _tmp = _Sp()
-          unless _tmp
-            self.pos = _save122
-            break
-          end
-          _text_start = self.pos
-          _save123 = self.pos
-
-          _save124 = self.pos
-          while true # choice
-            _save125 = self.pos
-
-            _save126 = self.pos
-            while true # sequence
-              _save127 = self.pos
-              _tmp = match_string("`")
-              _tmp = _tmp ? nil : true
-              self.pos = _save127
-              unless _tmp
-                self.pos = _save126
-                break
-              end
-              _tmp = apply(:_Nonspacechar)
-              unless _tmp
-                self.pos = _save126
-              end
-              break
-            end # end sequence
-
-            if _tmp
-              while true
-
-                _save128 = self.pos
-                while true # sequence
-                  _save129 = self.pos
-                  _tmp = match_string("`")
-                  _tmp = _tmp ? nil : true
-                  self.pos = _save129
-                  unless _tmp
-                    self.pos = _save128
-                    break
-                  end
-                  _tmp = apply(:_Nonspacechar)
-                  unless _tmp
-                    self.pos = _save128
-                  end
-                  break
-                end # end sequence
-
-                break unless _tmp
-              end
-              _tmp = true
-            else
-              self.pos = _save125
-            end
-            break if _tmp
-            self.pos = _save124
-
-            _save130 = self.pos
-            while true # sequence
-              _save131 = self.pos
-              _tmp = apply(:_Ticks5)
-              _tmp = _tmp ? nil : true
-              self.pos = _save131
-              unless _tmp
-                self.pos = _save130
-                break
-              end
-              _tmp = scan(/\G(?-mix:`+)/)
-              unless _tmp
-                self.pos = _save130
-              end
-              break
-            end # end sequence
-
-            break if _tmp
-            self.pos = _save124
-
-            _save132 = self.pos
-            while true # sequence
-              _save133 = self.pos
-
-              _save134 = self.pos
-              while true # sequence
-                _tmp = _Sp()
-                unless _tmp
-                  self.pos = _save134
-                  break
-                end
-                _tmp = apply(:_Ticks5)
-                unless _tmp
-                  self.pos = _save134
-                end
-                break
-              end # end sequence
-
-              _tmp = _tmp ? nil : true
-              self.pos = _save133
-              unless _tmp
-                self.pos = _save132
-                break
-              end
-
-              _save135 = self.pos
-              while true # choice
-                _tmp = _Spacechar()
-                break if _tmp
-                self.pos = _save135
-
-                _save136 = self.pos
-                while true # sequence
-                  _tmp = _Newline()
-                  unless _tmp
-                    self.pos = _save136
-                    break
-                  end
-                  _save137 = self.pos
-                  _tmp = _BlankLine()
-                  _tmp = _tmp ? nil : true
-                  self.pos = _save137
-                  unless _tmp
-                    self.pos = _save136
-                  end
-                  break
-                end # end sequence
-
-                break if _tmp
-                self.pos = _save135
-                break
-              end # end choice
-
-              unless _tmp
-                self.pos = _save132
-              end
-              break
-            end # end sequence
-
-            break if _tmp
-            self.pos = _save124
-            break
-          end # end choice
-
-          if _tmp
-            while true
-
-              _save138 = self.pos
-              while true # choice
-                _save139 = self.pos
-
-                _save140 = self.pos
-                while true # sequence
-                  _save141 = self.pos
-                  _tmp = match_string("`")
-                  _tmp = _tmp ? nil : true
-                  self.pos = _save141
-                  unless _tmp
-                    self.pos = _save140
-                    break
-                  end
-                  _tmp = apply(:_Nonspacechar)
-                  unless _tmp
-                    self.pos = _save140
-                  end
-                  break
-                end # end sequence
-
-                if _tmp
-                  while true
-
-                    _save142 = self.pos
-                    while true # sequence
-                      _save143 = self.pos
-                      _tmp = match_string("`")
-                      _tmp = _tmp ? nil : true
-                      self.pos = _save143
-                      unless _tmp
-                        self.pos = _save142
-                        break
-                      end
-                      _tmp = apply(:_Nonspacechar)
-                      unless _tmp
-                        self.pos = _save142
-                      end
-                      break
-                    end # end sequence
-
-                    break unless _tmp
-                  end
-                  _tmp = true
-                else
-                  self.pos = _save139
-                end
-                break if _tmp
-                self.pos = _save138
-
-                _save144 = self.pos
-                while true # sequence
-                  _save145 = self.pos
-                  _tmp = apply(:_Ticks5)
-                  _tmp = _tmp ? nil : true
-                  self.pos = _save145
-                  unless _tmp
-                    self.pos = _save144
-                    break
-                  end
-                  _tmp = scan(/\G(?-mix:`+)/)
-                  unless _tmp
-                    self.pos = _save144
-                  end
-                  break
-                end # end sequence
-
-                break if _tmp
-                self.pos = _save138
-
-                _save146 = self.pos
-                while true # sequence
-                  _save147 = self.pos
-
-                  _save148 = self.pos
-                  while true # sequence
-                    _tmp = _Sp()
-                    unless _tmp
-                      self.pos = _save148
-                      break
-                    end
-                    _tmp = apply(:_Ticks5)
-                    unless _tmp
-                      self.pos = _save148
-                    end
-                    break
-                  end # end sequence
-
-                  _tmp = _tmp ? nil : true
-                  self.pos = _save147
-                  unless _tmp
-                    self.pos = _save146
-                    break
-                  end
-
-                  _save149 = self.pos
-                  while true # choice
-                    _tmp = _Spacechar()
-                    break if _tmp
-                    self.pos = _save149
-
-                    _save150 = self.pos
-                    while true # sequence
-                      _tmp = _Newline()
-                      unless _tmp
-                        self.pos = _save150
-                        break
-                      end
-                      _save151 = self.pos
-                      _tmp = _BlankLine()
-                      _tmp = _tmp ? nil : true
-                      self.pos = _save151
-                      unless _tmp
-                        self.pos = _save150
-                      end
-                      break
-                    end # end sequence
-
-                    break if _tmp
-                    self.pos = _save149
-                    break
-                  end # end choice
-
-                  unless _tmp
-                    self.pos = _save146
-                  end
-                  break
-                end # end sequence
-
-                break if _tmp
-                self.pos = _save138
-                break
-              end # end choice
-
-              break unless _tmp
-            end
-            _tmp = true
-          else
-            self.pos = _save123
-          end
-          if _tmp
-            text = get_text(_text_start)
-          end
-          unless _tmp
-            self.pos = _save122
-            break
-          end
-          _tmp = _Sp()
-          unless _tmp
-            self.pos = _save122
-            break
-          end
-          _tmp = apply(:_Ticks5)
-          unless _tmp
-            self.pos = _save122
-          end
-          break
-        end # end sequence
-
-        break if _tmp
-        self.pos = _save1
-        break
-      end # end choice
-
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      @result = begin;  "<code>#{text}</code>" ; end
-      _tmp = true
-      unless _tmp
-        self.pos = _save
-      end
-      break
-    end # end sequence
-
-    set_failed_rule :_Code unless _tmp
-    return _tmp
-  end
-
-  # RawHtml = < (HtmlComment | HtmlBlockScript | HtmlTag) > { if html? then text else '' end }
-  def _RawHtml
-
-    _save = self.pos
-    while true # sequence
-      _text_start = self.pos
-
-      _save1 = self.pos
-      while true # choice
-        _tmp = apply(:_HtmlComment)
-        break if _tmp
-        self.pos = _save1
-        _tmp = apply(:_HtmlBlockScript)
-        break if _tmp
-        self.pos = _save1
-        _tmp = apply(:_HtmlTag)
-        break if _tmp
-        self.pos = _save1
-        break
-      end # end choice
-
-      if _tmp
-        text = get_text(_text_start)
-      end
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      @result = begin;  if html? then text else '' end ; end
-      _tmp = true
-      unless _tmp
-        self.pos = _save
-      end
-      break
-    end # end sequence
-
-    set_failed_rule :_RawHtml unless _tmp
-    return _tmp
-  end
-
-  # BlankLine = @Sp @Newline { "\n" }
-  def _BlankLine
-
-    _save = self.pos
-    while true # sequence
-      _tmp = _Sp()
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = _Newline()
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      @result = begin;  "\n" ; end
-      _tmp = true
-      unless _tmp
-        self.pos = _save
-      end
-      break
-    end # end sequence
-
-    set_failed_rule :_BlankLine unless _tmp
-    return _tmp
-  end
-
-  # Quoted = ("\"" (!"\"" .)* "\"" | "'" (!"'" .)* "'")
-  def _Quoted
-
-    _save = self.pos
-    while true # choice
-
-      _save1 = self.pos
-      while true # sequence
-        _tmp = match_string("\"")
-        unless _tmp
-          self.pos = _save1
-          break
-        end
-        while true
-
-          _save3 = self.pos
-          while true # sequence
-            _save4 = self.pos
-            _tmp = match_string("\"")
-            _tmp = _tmp ? nil : true
-            self.pos = _save4
-            unless _tmp
-              self.pos = _save3
-              break
-            end
-            _tmp = get_byte
-            unless _tmp
-              self.pos = _save3
-            end
-            break
-          end # end sequence
-
-          break unless _tmp
-        end
-        _tmp = true
-        unless _tmp
-          self.pos = _save1
-          break
-        end
-        _tmp = match_string("\"")
-        unless _tmp
-          self.pos = _save1
-        end
-        break
-      end # end sequence
-
-      break if _tmp
-      self.pos = _save
-
-      _save5 = self.pos
-      while true # sequence
-        _tmp = match_string("'")
-        unless _tmp
-          self.pos = _save5
-          break
-        end
-        while true
-
-          _save7 = self.pos
-          while true # sequence
-            _save8 = self.pos
-            _tmp = match_string("'")
-            _tmp = _tmp ? nil : true
-            self.pos = _save8
-            unless _tmp
-              self.pos = _save7
-              break
-            end
-            _tmp = get_byte
-            unless _tmp
-              self.pos = _save7
-            end
-            break
-          end # end sequence
-
-          break unless _tmp
-        end
-        _tmp = true
-        unless _tmp
-          self.pos = _save5
-          break
-        end
-        _tmp = match_string("'")
-        unless _tmp
-          self.pos = _save5
-        end
-        break
-      end # end sequence
-
-      break if _tmp
-      self.pos = _save
-      break
-    end # end choice
-
-    set_failed_rule :_Quoted unless _tmp
-    return _tmp
-  end
-
-  # HtmlAttribute = (AlphanumericAscii | "-")+ Spnl ("=" Spnl (Quoted | (!">" Nonspacechar)+))? Spnl
-  def _HtmlAttribute
-
-    _save = self.pos
-    while true # sequence
-      _save1 = self.pos
-
-      _save2 = self.pos
-      while true # choice
-        _tmp = apply(:_AlphanumericAscii)
-        break if _tmp
-        self.pos = _save2
-        _tmp = match_string("-")
-        break if _tmp
-        self.pos = _save2
-        break
-      end # end choice
-
-      if _tmp
-        while true
-
-          _save3 = self.pos
-          while true # choice
-            _tmp = apply(:_AlphanumericAscii)
-            break if _tmp
-            self.pos = _save3
-            _tmp = match_string("-")
-            break if _tmp
-            self.pos = _save3
-            break
-          end # end choice
-
-          break unless _tmp
-        end
-        _tmp = true
-      else
-        self.pos = _save1
-      end
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = apply(:_Spnl)
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _save4 = self.pos
-
-      _save5 = self.pos
-      while true # sequence
-        _tmp = match_string("=")
-        unless _tmp
-          self.pos = _save5
-          break
-        end
-        _tmp = apply(:_Spnl)
-        unless _tmp
-          self.pos = _save5
-          break
-        end
-
-        _save6 = self.pos
-        while true # choice
-          _tmp = apply(:_Quoted)
-          break if _tmp
-          self.pos = _save6
-          _save7 = self.pos
-
-          _save8 = self.pos
-          while true # sequence
-            _save9 = self.pos
-            _tmp = match_string(">")
-            _tmp = _tmp ? nil : true
-            self.pos = _save9
-            unless _tmp
-              self.pos = _save8
-              break
-            end
-            _tmp = apply(:_Nonspacechar)
-            unless _tmp
-              self.pos = _save8
-            end
-            break
-          end # end sequence
-
-          if _tmp
-            while true
-
-              _save10 = self.pos
-              while true # sequence
-                _save11 = self.pos
-                _tmp = match_string(">")
-                _tmp = _tmp ? nil : true
-                self.pos = _save11
-                unless _tmp
-                  self.pos = _save10
-                  break
-                end
-                _tmp = apply(:_Nonspacechar)
-                unless _tmp
-                  self.pos = _save10
-                end
-                break
-              end # end sequence
-
-              break unless _tmp
-            end
-            _tmp = true
-          else
-            self.pos = _save7
-          end
-          break if _tmp
-          self.pos = _save6
-          break
-        end # end choice
-
-        unless _tmp
-          self.pos = _save5
-        end
-        break
-      end # end sequence
-
-      unless _tmp
-        _tmp = true
-        self.pos = _save4
-      end
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = apply(:_Spnl)
-      unless _tmp
-        self.pos = _save
-      end
-      break
-    end # end sequence
-
-    set_failed_rule :_HtmlAttribute unless _tmp
-    return _tmp
-  end
-
-  # HtmlComment = "<!--" (!"-->" .)* "-->"
-  def _HtmlComment
-
-    _save = self.pos
-    while true # sequence
-      _tmp = match_string("<!--")
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      while true
-
-        _save2 = self.pos
-        while true # sequence
-          _save3 = self.pos
-          _tmp = match_string("-->")
-          _tmp = _tmp ? nil : true
-          self.pos = _save3
-          unless _tmp
-            self.pos = _save2
-            break
-          end
-          _tmp = get_byte
-          unless _tmp
-            self.pos = _save2
-          end
-          break
-        end # end sequence
-
-        break unless _tmp
-      end
-      _tmp = true
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = match_string("-->")
-      unless _tmp
-        self.pos = _save
-      end
-      break
-    end # end sequence
-
-    set_failed_rule :_HtmlComment unless _tmp
-    return _tmp
-  end
-
-  # HtmlTag = "<" Spnl "/"? AlphanumericAscii+ Spnl HtmlAttribute* "/"? Spnl ">"
-  def _HtmlTag
-
-    _save = self.pos
-    while true # sequence
-      _tmp = match_string("<")
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = apply(:_Spnl)
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _save1 = self.pos
-      _tmp = match_string("/")
-      unless _tmp
-        _tmp = true
-        self.pos = _save1
-      end
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _save2 = self.pos
-      _tmp = apply(:_AlphanumericAscii)
-      if _tmp
-        while true
-          _tmp = apply(:_AlphanumericAscii)
-          break unless _tmp
-        end
-        _tmp = true
-      else
-        self.pos = _save2
-      end
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = apply(:_Spnl)
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      while true
-        _tmp = apply(:_HtmlAttribute)
-        break unless _tmp
-      end
-      _tmp = true
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _save4 = self.pos
-      _tmp = match_string("/")
-      unless _tmp
-        _tmp = true
-        self.pos = _save4
-      end
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = apply(:_Spnl)
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = match_string(">")
-      unless _tmp
-        self.pos = _save
-      end
-      break
-    end # end sequence
-
-    set_failed_rule :_HtmlTag unless _tmp
-    return _tmp
-  end
-
-  # Eof = !.
-  def _Eof
-    _save = self.pos
-    _tmp = get_byte
-    _tmp = _tmp ? nil : true
-    self.pos = _save
-    set_failed_rule :_Eof unless _tmp
-    return _tmp
-  end
-
-  # Nonspacechar = !@Spacechar !@Newline .
-  def _Nonspacechar
-
-    _save = self.pos
-    while true # sequence
-      _save1 = self.pos
-      _tmp = _Spacechar()
-      _tmp = _tmp ? nil : true
-      self.pos = _save1
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _save2 = self.pos
-      _tmp = _Newline()
-      _tmp = _tmp ? nil : true
-      self.pos = _save2
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = get_byte
-      unless _tmp
-        self.pos = _save
-      end
-      break
-    end # end sequence
-
-    set_failed_rule :_Nonspacechar unless _tmp
-    return _tmp
-  end
-
-  # Sp = @Spacechar*
-  def _Sp
-    while true
-      _tmp = _Spacechar()
-      break unless _tmp
-    end
-    _tmp = true
-    set_failed_rule :_Sp unless _tmp
-    return _tmp
-  end
-
-  # Spnl = @Sp (@Newline @Sp)?
-  def _Spnl
-
-    _save = self.pos
-    while true # sequence
-      _tmp = _Sp()
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _save1 = self.pos
-
-      _save2 = self.pos
-      while true # sequence
-        _tmp = _Newline()
-        unless _tmp
-          self.pos = _save2
-          break
-        end
-        _tmp = _Sp()
-        unless _tmp
-          self.pos = _save2
-        end
-        break
-      end # end sequence
-
-      unless _tmp
-        _tmp = true
-        self.pos = _save1
-      end
-      unless _tmp
-        self.pos = _save
-      end
-      break
-    end # end sequence
-
-    set_failed_rule :_Spnl unless _tmp
-    return _tmp
-  end
-
-  # SpecialChar = (/[~*_`&\[\]()<!#\\'"]/ | @ExtendedSpecialChar)
-  def _SpecialChar
-
-    _save = self.pos
-    while true # choice
-      _tmp = scan(/\G(?-mix:[~*_`&\[\]()<!#\\'"])/)
-      break if _tmp
-      self.pos = _save
-      _tmp = _ExtendedSpecialChar()
-      break if _tmp
-      self.pos = _save
-      break
-    end # end choice
-
-    set_failed_rule :_SpecialChar unless _tmp
-    return _tmp
-  end
-
-  # NormalChar = !(@SpecialChar | @Spacechar | @Newline) .
-  def _NormalChar
-
-    _save = self.pos
-    while true # sequence
-      _save1 = self.pos
-
-      _save2 = self.pos
-      while true # choice
-        _tmp = _SpecialChar()
-        break if _tmp
-        self.pos = _save2
-        _tmp = _Spacechar()
-        break if _tmp
-        self.pos = _save2
-        _tmp = _Newline()
-        break if _tmp
-        self.pos = _save2
-        break
-      end # end choice
-
-      _tmp = _tmp ? nil : true
-      self.pos = _save1
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = get_byte
-      unless _tmp
-        self.pos = _save
-      end
-      break
-    end # end sequence
-
-    set_failed_rule :_NormalChar unless _tmp
-    return _tmp
-  end
-
-  # Digit = [0-9]
-  def _Digit
-    _save = self.pos
-    _tmp = get_byte
-    if _tmp
-      unless _tmp >= 48 and _tmp <= 57
-        self.pos = _save
-        _tmp = nil
-      end
-    end
-    set_failed_rule :_Digit unless _tmp
-    return _tmp
-  end
-
-  # Alphanumeric = %literals.Alphanumeric
-  def _Alphanumeric
-    _tmp = @_grammar_literals.external_invoke(self, :_Alphanumeric)
-    set_failed_rule :_Alphanumeric unless _tmp
-    return _tmp
-  end
-
-  # AlphanumericAscii = %literals.AlphanumericAscii
-  def _AlphanumericAscii
-    _tmp = @_grammar_literals.external_invoke(self, :_AlphanumericAscii)
-    set_failed_rule :_AlphanumericAscii unless _tmp
-    return _tmp
-  end
-
-  # BOM = %literals.BOM
-  def _BOM
-    _tmp = @_grammar_literals.external_invoke(self, :_BOM)
-    set_failed_rule :_BOM unless _tmp
-    return _tmp
-  end
-
-  # Newline = %literals.Newline
-  def _Newline
-    _tmp = @_grammar_literals.external_invoke(self, :_Newline)
-    set_failed_rule :_Newline unless _tmp
-    return _tmp
-  end
-
-  # Spacechar = %literals.Spacechar
-  def _Spacechar
-    _tmp = @_grammar_literals.external_invoke(self, :_Spacechar)
-    set_failed_rule :_Spacechar unless _tmp
-    return _tmp
-  end
-
-  # HexEntity = /&#x/i < /[0-9a-fA-F]+/ > ";" { [text.to_i(16)].pack 'U' }
-  def _HexEntity
-
-    _save = self.pos
-    while true # sequence
-      _tmp = scan(/\G(?i-mx:&#x)/)
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _text_start = self.pos
-      _tmp = scan(/\G(?-mix:[0-9a-fA-F]+)/)
-      if _tmp
-        text = get_text(_text_start)
-      end
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = match_string(";")
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      @result = begin;  [text.to_i(16)].pack 'U' ; end
-      _tmp = true
-      unless _tmp
-        self.pos = _save
-      end
-      break
-    end # end sequence
-
-    set_failed_rule :_HexEntity unless _tmp
-    return _tmp
-  end
-
-  # DecEntity = "&#" < /[0-9]+/ > ";" { [text.to_i].pack 'U' }
-  def _DecEntity
-
-    _save = self.pos
-    while true # sequence
-      _tmp = match_string("&#")
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _text_start = self.pos
-      _tmp = scan(/\G(?-mix:[0-9]+)/)
-      if _tmp
-        text = get_text(_text_start)
-      end
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = match_string(";")
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      @result = begin;  [text.to_i].pack 'U' ; end
-      _tmp = true
-      unless _tmp
-        self.pos = _save
-      end
-      break
-    end # end sequence
-
-    set_failed_rule :_DecEntity unless _tmp
-    return _tmp
-  end
-
-  # CharEntity = "&" < /[A-Za-z0-9]+/ > ";" { if entity = HTML_ENTITIES[text] then                  entity.pack 'U*'                else                  "&#{text};"                end              }
-  def _CharEntity
-
-    _save = self.pos
-    while true # sequence
-      _tmp = match_string("&")
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _text_start = self.pos
-      _tmp = scan(/\G(?-mix:[A-Za-z0-9]+)/)
-      if _tmp
-        text = get_text(_text_start)
-      end
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = match_string(";")
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      @result = begin;  if entity = HTML_ENTITIES[text] then
-                 entity.pack 'U*'
-               else
-                 "&#{text};"
-               end
-             ; end
-      _tmp = true
-      unless _tmp
-        self.pos = _save
-      end
-      break
-    end # end sequence
-
-    set_failed_rule :_CharEntity unless _tmp
-    return _tmp
-  end
-
-  # NonindentSpace = / {0,3}/
-  def _NonindentSpace
-    _tmp = scan(/\G(?-mix: {0,3})/)
-    set_failed_rule :_NonindentSpace unless _tmp
-    return _tmp
-  end
-
-  # Indent = /\t|    /
-  def _Indent
-    _tmp = scan(/\G(?-mix:\t|    )/)
-    set_failed_rule :_Indent unless _tmp
-    return _tmp
-  end
-
-  # IndentedLine = Indent Line
-  def _IndentedLine
-
-    _save = self.pos
-    while true # sequence
-      _tmp = apply(:_Indent)
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = apply(:_Line)
-      unless _tmp
-        self.pos = _save
-      end
-      break
-    end # end sequence
-
-    set_failed_rule :_IndentedLine unless _tmp
-    return _tmp
-  end
-
-  # OptionallyIndentedLine = Indent? Line
-  def _OptionallyIndentedLine
-
-    _save = self.pos
-    while true # sequence
-      _save1 = self.pos
-      _tmp = apply(:_Indent)
-      unless _tmp
-        _tmp = true
-        self.pos = _save1
-      end
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = apply(:_Line)
-      unless _tmp
-        self.pos = _save
-      end
-      break
-    end # end sequence
-
-    set_failed_rule :_OptionallyIndentedLine unless _tmp
-    return _tmp
-  end
-
-  # StartList = &. { [] }
-  def _StartList
-
-    _save = self.pos
-    while true # sequence
-      _save1 = self.pos
-      _tmp = get_byte
-      self.pos = _save1
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      @result = begin;  [] ; end
-      _tmp = true
-      unless _tmp
-        self.pos = _save
-      end
-      break
-    end # end sequence
-
-    set_failed_rule :_StartList unless _tmp
-    return _tmp
-  end
-
-  # Line = @RawLine:a { a }
-  def _Line
-
-    _save = self.pos
-    while true # sequence
-      _tmp = _RawLine()
-      a = @result
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      @result = begin;  a ; end
-      _tmp = true
-      unless _tmp
-        self.pos = _save
-      end
-      break
-    end # end sequence
-
-    set_failed_rule :_Line unless _tmp
-    return _tmp
-  end
-
-  # RawLine = (< /[^\r\n]*/ @Newline > | < .+ > @Eof) { text }
-  def _RawLine
-
-    _save = self.pos
-    while true # sequence
-
-      _save1 = self.pos
-      while true # choice
-        _text_start = self.pos
-
-        _save2 = self.pos
-        while true # sequence
-          _tmp = scan(/\G(?-mix:[^\r\n]*)/)
-          unless _tmp
-            self.pos = _save2
-            break
-          end
-          _tmp = _Newline()
-          unless _tmp
-            self.pos = _save2
-          end
-          break
-        end # end sequence
-
-        if _tmp
-          text = get_text(_text_start)
-        end
-        break if _tmp
-        self.pos = _save1
-
-        _save3 = self.pos
-        while true # sequence
-          _text_start = self.pos
-          _save4 = self.pos
-          _tmp = get_byte
-          if _tmp
-            while true
-              _tmp = get_byte
-              break unless _tmp
-            end
-            _tmp = true
-          else
-            self.pos = _save4
-          end
-          if _tmp
-            text = get_text(_text_start)
-          end
-          unless _tmp
-            self.pos = _save3
-            break
-          end
-          _tmp = _Eof()
-          unless _tmp
-            self.pos = _save3
-          end
-          break
-        end # end sequence
-
-        break if _tmp
-        self.pos = _save1
-        break
-      end # end choice
-
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      @result = begin;  text ; end
-      _tmp = true
-      unless _tmp
-        self.pos = _save
-      end
-      break
-    end # end sequence
-
-    set_failed_rule :_RawLine unless _tmp
-    return _tmp
-  end
-
-  # SkipBlock = (HtmlBlock | (!"#" !SetextBottom1 !SetextBottom2 !@BlankLine @RawLine)+ @BlankLine* | @BlankLine+ | @RawLine)
-  def _SkipBlock
-
-    _save = self.pos
-    while true # choice
-      _tmp = apply(:_HtmlBlock)
-      break if _tmp
-      self.pos = _save
-
-      _save1 = self.pos
-      while true # sequence
-        _save2 = self.pos
-
-        _save3 = self.pos
-        while true # sequence
-          _save4 = self.pos
-          _tmp = match_string("#")
-          _tmp = _tmp ? nil : true
-          self.pos = _save4
-          unless _tmp
-            self.pos = _save3
-            break
-          end
-          _save5 = self.pos
-          _tmp = apply(:_SetextBottom1)
-          _tmp = _tmp ? nil : true
-          self.pos = _save5
-          unless _tmp
-            self.pos = _save3
-            break
-          end
-          _save6 = self.pos
-          _tmp = apply(:_SetextBottom2)
-          _tmp = _tmp ? nil : true
-          self.pos = _save6
-          unless _tmp
-            self.pos = _save3
-            break
-          end
-          _save7 = self.pos
-          _tmp = _BlankLine()
-          _tmp = _tmp ? nil : true
-          self.pos = _save7
-          unless _tmp
-            self.pos = _save3
-            break
-          end
-          _tmp = _RawLine()
-          unless _tmp
-            self.pos = _save3
-          end
-          break
-        end # end sequence
-
-        if _tmp
-          while true
-
-            _save8 = self.pos
-            while true # sequence
-              _save9 = self.pos
-              _tmp = match_string("#")
-              _tmp = _tmp ? nil : true
-              self.pos = _save9
-              unless _tmp
-                self.pos = _save8
-                break
-              end
-              _save10 = self.pos
-              _tmp = apply(:_SetextBottom1)
-              _tmp = _tmp ? nil : true
-              self.pos = _save10
-              unless _tmp
-                self.pos = _save8
-                break
-              end
-              _save11 = self.pos
-              _tmp = apply(:_SetextBottom2)
-              _tmp = _tmp ? nil : true
-              self.pos = _save11
-              unless _tmp
-                self.pos = _save8
-                break
-              end
-              _save12 = self.pos
-              _tmp = _BlankLine()
-              _tmp = _tmp ? nil : true
-              self.pos = _save12
-              unless _tmp
-                self.pos = _save8
-                break
-              end
-              _tmp = _RawLine()
-              unless _tmp
-                self.pos = _save8
-              end
-              break
-            end # end sequence
-
-            break unless _tmp
-          end
-          _tmp = true
-        else
-          self.pos = _save2
-        end
-        unless _tmp
-          self.pos = _save1
-          break
-        end
-        while true
-          _tmp = _BlankLine()
-          break unless _tmp
-        end
-        _tmp = true
-        unless _tmp
-          self.pos = _save1
-        end
-        break
-      end # end sequence
-
-      break if _tmp
-      self.pos = _save
-      _save14 = self.pos
-      _tmp = _BlankLine()
-      if _tmp
-        while true
-          _tmp = _BlankLine()
-          break unless _tmp
-        end
-        _tmp = true
-      else
-        self.pos = _save14
-      end
-      break if _tmp
-      self.pos = _save
-      _tmp = _RawLine()
-      break if _tmp
-      self.pos = _save
-      break
-    end # end choice
-
-    set_failed_rule :_SkipBlock unless _tmp
-    return _tmp
-  end
-
-  # ExtendedSpecialChar = &{ notes? } "^"
-  def _ExtendedSpecialChar
-
-    _save = self.pos
-    while true # sequence
-      _save1 = self.pos
-      _tmp = begin;  notes? ; end
-      self.pos = _save1
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = match_string("^")
-      unless _tmp
-        self.pos = _save
-      end
-      break
-    end # end sequence
-
-    set_failed_rule :_ExtendedSpecialChar unless _tmp
-    return _tmp
-  end
-
-  # NoteReference = &{ notes? } RawNoteReference:ref { note_for ref }
-  def _NoteReference
-
-    _save = self.pos
-    while true # sequence
-      _save1 = self.pos
-      _tmp = begin;  notes? ; end
-      self.pos = _save1
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = apply(:_RawNoteReference)
-      ref = @result
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      @result = begin;  note_for ref ; end
-      _tmp = true
-      unless _tmp
-        self.pos = _save
-      end
-      break
-    end # end sequence
-
-    set_failed_rule :_NoteReference unless _tmp
-    return _tmp
-  end
-
-  # RawNoteReference = "[^" < (!@Newline !"]" .)+ > "]" { text }
-  def _RawNoteReference
-
-    _save = self.pos
-    while true # sequence
-      _tmp = match_string("[^")
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _text_start = self.pos
-      _save1 = self.pos
-
-      _save2 = self.pos
-      while true # sequence
-        _save3 = self.pos
-        _tmp = _Newline()
-        _tmp = _tmp ? nil : true
-        self.pos = _save3
-        unless _tmp
-          self.pos = _save2
-          break
-        end
-        _save4 = self.pos
-        _tmp = match_string("]")
-        _tmp = _tmp ? nil : true
-        self.pos = _save4
-        unless _tmp
-          self.pos = _save2
-          break
-        end
-        _tmp = get_byte
-        unless _tmp
-          self.pos = _save2
-        end
-        break
-      end # end sequence
-
-      if _tmp
-        while true
-
-          _save5 = self.pos
-          while true # sequence
-            _save6 = self.pos
-            _tmp = _Newline()
-            _tmp = _tmp ? nil : true
-            self.pos = _save6
-            unless _tmp
-              self.pos = _save5
-              break
-            end
-            _save7 = self.pos
-            _tmp = match_string("]")
-            _tmp = _tmp ? nil : true
-            self.pos = _save7
-            unless _tmp
-              self.pos = _save5
-              break
-            end
-            _tmp = get_byte
-            unless _tmp
-              self.pos = _save5
-            end
-            break
-          end # end sequence
-
-          break unless _tmp
-        end
-        _tmp = true
-      else
-        self.pos = _save1
-      end
-      if _tmp
-        text = get_text(_text_start)
-      end
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = match_string("]")
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      @result = begin;  text ; end
-      _tmp = true
-      unless _tmp
-        self.pos = _save
-      end
-      break
-    end # end sequence
-
-    set_failed_rule :_RawNoteReference unless _tmp
-    return _tmp
-  end
-
-  # Note = &{ notes? } @NonindentSpace RawNoteReference:ref ":" @Sp @StartList:a RawNoteBlock:i { a.concat i } (&Indent RawNoteBlock:i { a.concat i })* { @footnotes[ref] = paragraph a                    nil                 }
-  def _Note
-
-    _save = self.pos
-    while true # sequence
-      _save1 = self.pos
-      _tmp = begin;  notes? ; end
-      self.pos = _save1
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = _NonindentSpace()
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = apply(:_RawNoteReference)
-      ref = @result
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = match_string(":")
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = _Sp()
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = _StartList()
-      a = @result
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = apply(:_RawNoteBlock)
-      i = @result
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      @result = begin;  a.concat i ; end
-      _tmp = true
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      while true
-
-        _save3 = self.pos
-        while true # sequence
-          _save4 = self.pos
-          _tmp = apply(:_Indent)
-          self.pos = _save4
-          unless _tmp
-            self.pos = _save3
-            break
-          end
-          _tmp = apply(:_RawNoteBlock)
-          i = @result
-          unless _tmp
-            self.pos = _save3
-            break
-          end
-          @result = begin;  a.concat i ; end
-          _tmp = true
-          unless _tmp
-            self.pos = _save3
-          end
-          break
-        end # end sequence
-
-        break unless _tmp
-      end
-      _tmp = true
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      @result = begin;  @footnotes[ref] = paragraph a
-
-                  nil
-                ; end
-      _tmp = true
-      unless _tmp
-        self.pos = _save
-      end
-      break
-    end # end sequence
-
-    set_failed_rule :_Note unless _tmp
-    return _tmp
-  end
-
-  # InlineNote = &{ notes? } "^[" @StartList:a (!"]" Inline:l { a << l })+ "]" { ref = [:inline, @note_order.length]                @footnotes[ref] = paragraph a                 note_for ref              }
-  def _InlineNote
-
-    _save = self.pos
-    while true # sequence
-      _save1 = self.pos
-      _tmp = begin;  notes? ; end
-      self.pos = _save1
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = match_string("^[")
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = _StartList()
-      a = @result
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _save2 = self.pos
-
-      _save3 = self.pos
-      while true # sequence
-        _save4 = self.pos
-        _tmp = match_string("]")
-        _tmp = _tmp ? nil : true
-        self.pos = _save4
-        unless _tmp
-          self.pos = _save3
-          break
-        end
-        _tmp = apply(:_Inline)
-        l = @result
-        unless _tmp
-          self.pos = _save3
-          break
-        end
-        @result = begin;  a << l ; end
-        _tmp = true
-        unless _tmp
-          self.pos = _save3
-        end
-        break
-      end # end sequence
-
-      if _tmp
-        while true
-
-          _save5 = self.pos
-          while true # sequence
-            _save6 = self.pos
-            _tmp = match_string("]")
-            _tmp = _tmp ? nil : true
-            self.pos = _save6
-            unless _tmp
-              self.pos = _save5
-              break
-            end
-            _tmp = apply(:_Inline)
-            l = @result
-            unless _tmp
-              self.pos = _save5
-              break
-            end
-            @result = begin;  a << l ; end
-            _tmp = true
-            unless _tmp
-              self.pos = _save5
-            end
-            break
-          end # end sequence
-
-          break unless _tmp
-        end
-        _tmp = true
-      else
-        self.pos = _save2
-      end
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = match_string("]")
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      @result = begin;  ref = [:inline, @note_order.length]
-               @footnotes[ref] = paragraph a
-
-               note_for ref
-             ; end
-      _tmp = true
-      unless _tmp
-        self.pos = _save
-      end
-      break
-    end # end sequence
-
-    set_failed_rule :_InlineNote unless _tmp
-    return _tmp
-  end
-
-  # Notes = (Note | SkipBlock)*
-  def _Notes
-    while true
-
-      _save1 = self.pos
-      while true # choice
-        _tmp = apply(:_Note)
-        break if _tmp
-        self.pos = _save1
-        _tmp = apply(:_SkipBlock)
-        break if _tmp
-        self.pos = _save1
-        break
-      end # end choice
-
-      break unless _tmp
-    end
-    _tmp = true
-    set_failed_rule :_Notes unless _tmp
-    return _tmp
-  end
-
-  # RawNoteBlock = @StartList:a (!@BlankLine !RawNoteReference OptionallyIndentedLine:l { a << l })+ < @BlankLine* > { a << text } { a }
-  def _RawNoteBlock
-
-    _save = self.pos
-    while true # sequence
-      _tmp = _StartList()
-      a = @result
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _save1 = self.pos
-
-      _save2 = self.pos
-      while true # sequence
-        _save3 = self.pos
-        _tmp = _BlankLine()
-        _tmp = _tmp ? nil : true
-        self.pos = _save3
-        unless _tmp
-          self.pos = _save2
-          break
-        end
-        _save4 = self.pos
-        _tmp = apply(:_RawNoteReference)
-        _tmp = _tmp ? nil : true
-        self.pos = _save4
-        unless _tmp
-          self.pos = _save2
-          break
-        end
-        _tmp = apply(:_OptionallyIndentedLine)
-        l = @result
-        unless _tmp
-          self.pos = _save2
-          break
-        end
-        @result = begin;  a << l ; end
-        _tmp = true
-        unless _tmp
-          self.pos = _save2
-        end
-        break
-      end # end sequence
-
-      if _tmp
-        while true
-
-          _save5 = self.pos
-          while true # sequence
-            _save6 = self.pos
-            _tmp = _BlankLine()
-            _tmp = _tmp ? nil : true
-            self.pos = _save6
-            unless _tmp
-              self.pos = _save5
-              break
-            end
-            _save7 = self.pos
-            _tmp = apply(:_RawNoteReference)
-            _tmp = _tmp ? nil : true
-            self.pos = _save7
-            unless _tmp
-              self.pos = _save5
-              break
-            end
-            _tmp = apply(:_OptionallyIndentedLine)
-            l = @result
-            unless _tmp
-              self.pos = _save5
-              break
-            end
-            @result = begin;  a << l ; end
-            _tmp = true
-            unless _tmp
-              self.pos = _save5
-            end
-            break
-          end # end sequence
-
-          break unless _tmp
-        end
-        _tmp = true
-      else
-        self.pos = _save1
-      end
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _text_start = self.pos
-      while true
-        _tmp = _BlankLine()
-        break unless _tmp
-      end
-      _tmp = true
-      if _tmp
-        text = get_text(_text_start)
-      end
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      @result = begin;  a << text ; end
-      _tmp = true
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      @result = begin;  a ; end
-      _tmp = true
-      unless _tmp
-        self.pos = _save
-      end
-      break
-    end # end sequence
-
-    set_failed_rule :_RawNoteBlock unless _tmp
-    return _tmp
-  end
-
-  # CodeFence = &{ github? } Ticks3 (@Sp StrChunk:format)? Spnl < ((!"`" Nonspacechar)+ | !Ticks3 /`+/ | Spacechar | @Newline)+ > Ticks3 @Sp @Newline* { verbatim = RDoc::Markup::Verbatim.new text               verbatim.format = format.intern if format.instance_of?(String)               verbatim             }
-  def _CodeFence
-
-    _save = self.pos
-    while true # sequence
-      _save1 = self.pos
-      _tmp = begin;  github? ; end
-      self.pos = _save1
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = apply(:_Ticks3)
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _save2 = self.pos
-
-      _save3 = self.pos
-      while true # sequence
-        _tmp = _Sp()
-        unless _tmp
-          self.pos = _save3
-          break
-        end
-        _tmp = apply(:_StrChunk)
-        format = @result
-        unless _tmp
-          self.pos = _save3
-        end
-        break
-      end # end sequence
-
-      unless _tmp
-        _tmp = true
-        self.pos = _save2
-      end
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = apply(:_Spnl)
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _text_start = self.pos
-      _save4 = self.pos
-
-      _save5 = self.pos
-      while true # choice
-        _save6 = self.pos
-
-        _save7 = self.pos
-        while true # sequence
-          _save8 = self.pos
-          _tmp = match_string("`")
-          _tmp = _tmp ? nil : true
-          self.pos = _save8
-          unless _tmp
-            self.pos = _save7
-            break
-          end
-          _tmp = apply(:_Nonspacechar)
-          unless _tmp
-            self.pos = _save7
-          end
-          break
-        end # end sequence
-
-        if _tmp
-          while true
-
-            _save9 = self.pos
-            while true # sequence
-              _save10 = self.pos
-              _tmp = match_string("`")
-              _tmp = _tmp ? nil : true
-              self.pos = _save10
-              unless _tmp
-                self.pos = _save9
-                break
-              end
-              _tmp = apply(:_Nonspacechar)
-              unless _tmp
-                self.pos = _save9
-              end
-              break
-            end # end sequence
-
-            break unless _tmp
-          end
-          _tmp = true
-        else
-          self.pos = _save6
-        end
-        break if _tmp
-        self.pos = _save5
-
-        _save11 = self.pos
-        while true # sequence
-          _save12 = self.pos
-          _tmp = apply(:_Ticks3)
-          _tmp = _tmp ? nil : true
-          self.pos = _save12
-          unless _tmp
-            self.pos = _save11
-            break
-          end
-          _tmp = scan(/\G(?-mix:`+)/)
-          unless _tmp
-            self.pos = _save11
-          end
-          break
-        end # end sequence
-
-        break if _tmp
-        self.pos = _save5
-        _tmp = apply(:_Spacechar)
-        break if _tmp
-        self.pos = _save5
-        _tmp = _Newline()
-        break if _tmp
-        self.pos = _save5
-        break
-      end # end choice
-
-      if _tmp
-        while true
-
-          _save13 = self.pos
-          while true # choice
-            _save14 = self.pos
-
-            _save15 = self.pos
-            while true # sequence
-              _save16 = self.pos
-              _tmp = match_string("`")
-              _tmp = _tmp ? nil : true
-              self.pos = _save16
-              unless _tmp
-                self.pos = _save15
-                break
-              end
-              _tmp = apply(:_Nonspacechar)
-              unless _tmp
-                self.pos = _save15
-              end
-              break
-            end # end sequence
-
-            if _tmp
-              while true
-
-                _save17 = self.pos
-                while true # sequence
-                  _save18 = self.pos
-                  _tmp = match_string("`")
-                  _tmp = _tmp ? nil : true
-                  self.pos = _save18
-                  unless _tmp
-                    self.pos = _save17
-                    break
-                  end
-                  _tmp = apply(:_Nonspacechar)
-                  unless _tmp
-                    self.pos = _save17
-                  end
-                  break
-                end # end sequence
-
-                break unless _tmp
-              end
-              _tmp = true
-            else
-              self.pos = _save14
-            end
-            break if _tmp
-            self.pos = _save13
-
-            _save19 = self.pos
-            while true # sequence
-              _save20 = self.pos
-              _tmp = apply(:_Ticks3)
-              _tmp = _tmp ? nil : true
-              self.pos = _save20
-              unless _tmp
-                self.pos = _save19
-                break
-              end
-              _tmp = scan(/\G(?-mix:`+)/)
-              unless _tmp
-                self.pos = _save19
-              end
-              break
-            end # end sequence
-
-            break if _tmp
-            self.pos = _save13
-            _tmp = apply(:_Spacechar)
-            break if _tmp
-            self.pos = _save13
-            _tmp = _Newline()
-            break if _tmp
-            self.pos = _save13
-            break
-          end # end choice
-
-          break unless _tmp
-        end
-        _tmp = true
-      else
-        self.pos = _save4
-      end
-      if _tmp
-        text = get_text(_text_start)
-      end
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = apply(:_Ticks3)
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = _Sp()
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      while true
-        _tmp = _Newline()
-        break unless _tmp
-      end
-      _tmp = true
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      @result = begin;  verbatim = RDoc::Markup::Verbatim.new text
-              verbatim.format = format.intern if format.instance_of?(String)
-              verbatim
-            ; end
-      _tmp = true
-      unless _tmp
-        self.pos = _save
-      end
-      break
-    end # end sequence
-
-    set_failed_rule :_CodeFence unless _tmp
-    return _tmp
-  end
-
-  # Table = &{ github? } TableHead:header TableLine:line TableRow+:body { table = RDoc::Markup::Table.new(header, line, body) }
-  def _Table
-
-    _save = self.pos
-    while true # sequence
-      _save1 = self.pos
-      _tmp = begin;  github? ; end
-      self.pos = _save1
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = apply(:_TableHead)
-      header = @result
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = apply(:_TableLine)
-      line = @result
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _save2 = self.pos
-      _ary = []
-      _tmp = apply(:_TableRow)
-      if _tmp
-        _ary << @result
-        while true
-          _tmp = apply(:_TableRow)
-          _ary << @result if _tmp
-          break unless _tmp
-        end
-        _tmp = true
-        @result = _ary
-      else
-        self.pos = _save2
-      end
-      body = @result
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      @result = begin;  table = RDoc::Markup::Table.new(header, line, body) ; end
-      _tmp = true
-      unless _tmp
-        self.pos = _save
-      end
-      break
-    end # end sequence
-
-    set_failed_rule :_Table unless _tmp
-    return _tmp
-  end
-
-  # TableHead = TableItem2+:items "|"? @Newline { items }
-  def _TableHead
-
-    _save = self.pos
-    while true # sequence
-      _save1 = self.pos
-      _ary = []
-      _tmp = apply(:_TableItem2)
-      if _tmp
-        _ary << @result
-        while true
-          _tmp = apply(:_TableItem2)
-          _ary << @result if _tmp
-          break unless _tmp
-        end
-        _tmp = true
-        @result = _ary
-      else
-        self.pos = _save1
-      end
-      items = @result
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _save2 = self.pos
-      _tmp = match_string("|")
-      unless _tmp
-        _tmp = true
-        self.pos = _save2
-      end
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = _Newline()
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      @result = begin;  items ; end
-      _tmp = true
-      unless _tmp
-        self.pos = _save
-      end
-      break
-    end # end sequence
-
-    set_failed_rule :_TableHead unless _tmp
-    return _tmp
-  end
-
-  # TableRow = ((TableItem:item1 TableItem2*:items { [item1, *items] }):row | TableItem2+:row) "|"? @Newline { row }
-  def _TableRow
-
-    _save = self.pos
-    while true # sequence
-
-      _save1 = self.pos
-      while true # choice
-
-        _save2 = self.pos
-        while true # sequence
-          _tmp = apply(:_TableItem)
-          item1 = @result
-          unless _tmp
-            self.pos = _save2
-            break
-          end
-          _ary = []
-          while true
-            _tmp = apply(:_TableItem2)
-            _ary << @result if _tmp
-            break unless _tmp
-          end
-          _tmp = true
-          @result = _ary
-          items = @result
-          unless _tmp
-            self.pos = _save2
-            break
-          end
-          @result = begin;  [item1, *items] ; end
-          _tmp = true
-          unless _tmp
-            self.pos = _save2
-          end
-          break
-        end # end sequence
-
-        row = @result
-        break if _tmp
-        self.pos = _save1
-        _save4 = self.pos
-        _ary = []
-        _tmp = apply(:_TableItem2)
-        if _tmp
-          _ary << @result
-          while true
-            _tmp = apply(:_TableItem2)
-            _ary << @result if _tmp
-            break unless _tmp
-          end
-          _tmp = true
-          @result = _ary
-        else
-          self.pos = _save4
-        end
-        row = @result
-        break if _tmp
-        self.pos = _save1
-        break
-      end # end choice
-
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _save5 = self.pos
-      _tmp = match_string("|")
-      unless _tmp
-        _tmp = true
-        self.pos = _save5
-      end
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = _Newline()
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      @result = begin;  row ; end
-      _tmp = true
-      unless _tmp
-        self.pos = _save
-      end
-      break
-    end # end sequence
-
-    set_failed_rule :_TableRow unless _tmp
-    return _tmp
-  end
-
-  # TableItem2 = "|" TableItem
-  def _TableItem2
-
-    _save = self.pos
-    while true # sequence
-      _tmp = match_string("|")
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = apply(:_TableItem)
-      unless _tmp
-        self.pos = _save
-      end
-      break
-    end # end sequence
-
-    set_failed_rule :_TableItem2 unless _tmp
-    return _tmp
-  end
-
-  # TableItem = < /(?:\\.|[^|\n])+/ > { text.strip.gsub(/\\(.)/, '\1')  }
-  def _TableItem
-
-    _save = self.pos
-    while true # sequence
-      _text_start = self.pos
-      _tmp = scan(/\G(?-mix:(?:\\.|[^|\n])+)/)
-      if _tmp
-        text = get_text(_text_start)
-      end
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      @result = begin;  text.strip.gsub(/\\(.)/, '\1')  ; end
-      _tmp = true
-      unless _tmp
-        self.pos = _save
-      end
-      break
-    end # end sequence
-
-    set_failed_rule :_TableItem unless _tmp
-    return _tmp
-  end
-
-  # TableLine = ((TableAlign:align1 TableAlign2*:aligns {[align1, *aligns] }):line | TableAlign2+:line) "|"? @Newline { line }
-  def _TableLine
-
-    _save = self.pos
-    while true # sequence
-
-      _save1 = self.pos
-      while true # choice
-
-        _save2 = self.pos
-        while true # sequence
-          _tmp = apply(:_TableAlign)
-          align1 = @result
-          unless _tmp
-            self.pos = _save2
-            break
-          end
-          _ary = []
-          while true
-            _tmp = apply(:_TableAlign2)
-            _ary << @result if _tmp
-            break unless _tmp
-          end
-          _tmp = true
-          @result = _ary
-          aligns = @result
-          unless _tmp
-            self.pos = _save2
-            break
-          end
-          @result = begin; [align1, *aligns] ; end
-          _tmp = true
-          unless _tmp
-            self.pos = _save2
-          end
-          break
-        end # end sequence
-
-        line = @result
-        break if _tmp
-        self.pos = _save1
-        _save4 = self.pos
-        _ary = []
-        _tmp = apply(:_TableAlign2)
-        if _tmp
-          _ary << @result
-          while true
-            _tmp = apply(:_TableAlign2)
-            _ary << @result if _tmp
-            break unless _tmp
-          end
-          _tmp = true
-          @result = _ary
-        else
-          self.pos = _save4
-        end
-        line = @result
-        break if _tmp
-        self.pos = _save1
-        break
-      end # end choice
-
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _save5 = self.pos
-      _tmp = match_string("|")
-      unless _tmp
-        _tmp = true
-        self.pos = _save5
-      end
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = _Newline()
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      @result = begin;  line ; end
-      _tmp = true
-      unless _tmp
-        self.pos = _save
-      end
-      break
-    end # end sequence
-
-    set_failed_rule :_TableLine unless _tmp
-    return _tmp
-  end
-
-  # TableAlign2 = "|" @Sp TableAlign
-  def _TableAlign2
-
-    _save = self.pos
-    while true # sequence
-      _tmp = match_string("|")
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = _Sp()
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = apply(:_TableAlign)
-      unless _tmp
-        self.pos = _save
-      end
-      break
-    end # end sequence
-
-    set_failed_rule :_TableAlign2 unless _tmp
-    return _tmp
-  end
-
-  # TableAlign = < /:?-+:?/ > @Sp {                 text.start_with?(":") ?                 (text.end_with?(":") ? :center : :left) :                 (text.end_with?(":") ? :right : nil)               }
-  def _TableAlign
-
-    _save = self.pos
-    while true # sequence
-      _text_start = self.pos
-      _tmp = scan(/\G(?-mix::?-+:?)/)
-      if _tmp
-        text = get_text(_text_start)
-      end
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = _Sp()
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      @result = begin;
-                text.start_with?(":") ?
-                (text.end_with?(":") ? :center : :left) :
-                (text.end_with?(":") ? :right : nil)
-              ; end
-      _tmp = true
-      unless _tmp
-        self.pos = _save
-      end
-      break
-    end # end sequence
-
-    set_failed_rule :_TableAlign unless _tmp
-    return _tmp
-  end
-
-  # DefinitionList = &{ definition_lists? } DefinitionListItem+:list { RDoc::Markup::List.new :NOTE, *list.flatten }
-  def _DefinitionList
-
-    _save = self.pos
-    while true # sequence
-      _save1 = self.pos
-      _tmp = begin;  definition_lists? ; end
-      self.pos = _save1
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _save2 = self.pos
-      _ary = []
-      _tmp = apply(:_DefinitionListItem)
-      if _tmp
-        _ary << @result
-        while true
-          _tmp = apply(:_DefinitionListItem)
-          _ary << @result if _tmp
-          break unless _tmp
-        end
-        _tmp = true
-        @result = _ary
-      else
-        self.pos = _save2
-      end
-      list = @result
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      @result = begin;  RDoc::Markup::List.new :NOTE, *list.flatten ; end
-      _tmp = true
-      unless _tmp
-        self.pos = _save
-      end
-      break
-    end # end sequence
-
-    set_failed_rule :_DefinitionList unless _tmp
-    return _tmp
-  end
-
-  # DefinitionListItem = DefinitionListLabel+:label DefinitionListDefinition+:defns { list_items = []                        list_items <<                          RDoc::Markup::ListItem.new(label, defns.shift)                         list_items.concat defns.map { |defn|                          RDoc::Markup::ListItem.new nil, defn                        } unless list_items.empty?                         list_items                      }
-  def _DefinitionListItem
-
-    _save = self.pos
-    while true # sequence
-      _save1 = self.pos
-      _ary = []
-      _tmp = apply(:_DefinitionListLabel)
-      if _tmp
-        _ary << @result
-        while true
-          _tmp = apply(:_DefinitionListLabel)
-          _ary << @result if _tmp
-          break unless _tmp
-        end
-        _tmp = true
-        @result = _ary
-      else
-        self.pos = _save1
-      end
-      label = @result
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _save2 = self.pos
-      _ary = []
-      _tmp = apply(:_DefinitionListDefinition)
-      if _tmp
-        _ary << @result
-        while true
-          _tmp = apply(:_DefinitionListDefinition)
-          _ary << @result if _tmp
-          break unless _tmp
-        end
-        _tmp = true
-        @result = _ary
-      else
-        self.pos = _save2
-      end
-      defns = @result
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      @result = begin;  list_items = []
-                       list_items <<
-                         RDoc::Markup::ListItem.new(label, defns.shift)
-
-                       list_items.concat defns.map { |defn|
-                         RDoc::Markup::ListItem.new nil, defn
-                       } unless list_items.empty?
-
-                       list_items
-                     ; end
-      _tmp = true
-      unless _tmp
-        self.pos = _save
-      end
-      break
-    end # end sequence
-
-    set_failed_rule :_DefinitionListItem unless _tmp
-    return _tmp
-  end
-
-  # DefinitionListLabel = StrChunk:label @Sp @Newline { label }
-  def _DefinitionListLabel
-
-    _save = self.pos
-    while true # sequence
-      _tmp = apply(:_StrChunk)
-      label = @result
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = _Sp()
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = _Newline()
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      @result = begin;  label ; end
-      _tmp = true
-      unless _tmp
-        self.pos = _save
-      end
-      break
-    end # end sequence
-
-    set_failed_rule :_DefinitionListLabel unless _tmp
-    return _tmp
-  end
-
-  # DefinitionListDefinition = @NonindentSpace ":" @Space Inlines:a @BlankLine+ { paragraph a }
-  def _DefinitionListDefinition
-
-    _save = self.pos
-    while true # sequence
-      _tmp = _NonindentSpace()
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = match_string(":")
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = _Space()
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = apply(:_Inlines)
-      a = @result
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _save1 = self.pos
-      _tmp = _BlankLine()
-      if _tmp
-        while true
-          _tmp = _BlankLine()
-          break unless _tmp
-        end
-        _tmp = true
-      else
-        self.pos = _save1
-      end
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      @result = begin;  paragraph a ; end
-      _tmp = true
-      unless _tmp
-        self.pos = _save
-      end
-      break
-    end # end sequence
-
-    set_failed_rule :_DefinitionListDefinition unless _tmp
-    return _tmp
-  end
-
-  Rules = {}
-  Rules[:_root] = rule_info("root", "Doc")
-  Rules[:_Doc] = rule_info("Doc", "BOM? Block*:a { RDoc::Markup::Document.new(*a.compact) }")
-  Rules[:_Block] = rule_info("Block", "@BlankLine* (BlockQuote | Verbatim | CodeFence | Table | Note | Reference | HorizontalRule | Heading | OrderedList | BulletList | DefinitionList | HtmlBlock | StyleBlock | Para | Plain)")
-  Rules[:_Para] = rule_info("Para", "@NonindentSpace Inlines:a @BlankLine+ { paragraph a }")
-  Rules[:_Plain] = rule_info("Plain", "Inlines:a { paragraph a }")
-  Rules[:_AtxInline] = rule_info("AtxInline", "!@Newline !(@Sp /\#*/ @Sp @Newline) Inline")
-  Rules[:_AtxStart] = rule_info("AtxStart", "< /\\\#{1,6}/ > { text.length }")
-  Rules[:_AtxHeading] = rule_info("AtxHeading", "AtxStart:s @Sp AtxInline+:a (@Sp /\#*/ @Sp)? @Newline { RDoc::Markup::Heading.new(s, a.join) }")
-  Rules[:_SetextHeading] = rule_info("SetextHeading", "(SetextHeading1 | SetextHeading2)")
-  Rules[:_SetextBottom1] = rule_info("SetextBottom1", "/={1,}/ @Newline")
-  Rules[:_SetextBottom2] = rule_info("SetextBottom2", "/-{1,}/ @Newline")
-  Rules[:_SetextHeading1] = rule_info("SetextHeading1", "&(@RawLine SetextBottom1) @StartList:a (!@Endline Inline:b { a << b })+ @Sp @Newline SetextBottom1 { RDoc::Markup::Heading.new(1, a.join) }")
-  Rules[:_SetextHeading2] = rule_info("SetextHeading2", "&(@RawLine SetextBottom2) @StartList:a (!@Endline Inline:b { a << b })+ @Sp @Newline SetextBottom2 { RDoc::Markup::Heading.new(2, a.join) }")
-  Rules[:_Heading] = rule_info("Heading", "(SetextHeading | AtxHeading)")
-  Rules[:_BlockQuote] = rule_info("BlockQuote", "BlockQuoteRaw:a { RDoc::Markup::BlockQuote.new(*a) }")
-  Rules[:_BlockQuoteRaw] = rule_info("BlockQuoteRaw", "@StartList:a (\">\" \" \"? Line:l { a << l } (!\">\" !@BlankLine Line:c { a << c })* (@BlankLine:n { a << n })*)+ { inner_parse a.join }")
-  Rules[:_NonblankIndentedLine] = rule_info("NonblankIndentedLine", "!@BlankLine IndentedLine")
-  Rules[:_VerbatimChunk] = rule_info("VerbatimChunk", "@BlankLine*:a NonblankIndentedLine+:b { a.concat b }")
-  Rules[:_Verbatim] = rule_info("Verbatim", "VerbatimChunk+:a { RDoc::Markup::Verbatim.new(*a.flatten) }")
-  Rules[:_HorizontalRule] = rule_info("HorizontalRule", "@NonindentSpace (\"*\" @Sp \"*\" @Sp \"*\" (@Sp \"*\")* | \"-\" @Sp \"-\" @Sp \"-\" (@Sp \"-\")* | \"_\" @Sp \"_\" @Sp \"_\" (@Sp \"_\")*) @Sp @Newline @BlankLine+ { RDoc::Markup::Rule.new 1 }")
-  Rules[:_Bullet] = rule_info("Bullet", "!HorizontalRule @NonindentSpace /[+*-]/ @Spacechar+")
-  Rules[:_BulletList] = rule_info("BulletList", "&Bullet (ListTight | ListLoose):a { RDoc::Markup::List.new(:BULLET, *a) }")
-  Rules[:_ListTight] = rule_info("ListTight", "ListItemTight+:a @BlankLine* !(Bullet | Enumerator) { a }")
-  Rules[:_ListLoose] = rule_info("ListLoose", "@StartList:a (ListItem:b @BlankLine* { a << b })+ { a }")
-  Rules[:_ListItem] = rule_info("ListItem", "(Bullet | Enumerator) @StartList:a ListBlock:b { a << b } (ListContinuationBlock:c { a.push(*c) })* { list_item_from a }")
-  Rules[:_ListItemTight] = rule_info("ListItemTight", "(Bullet | Enumerator) ListBlock:a (!@BlankLine ListContinuationBlock:b { a.push(*b) })* !ListContinuationBlock { list_item_from a }")
-  Rules[:_ListBlock] = rule_info("ListBlock", "!@BlankLine Line:a ListBlockLine*:c { [a, *c] }")
-  Rules[:_ListContinuationBlock] = rule_info("ListContinuationBlock", "@StartList:a @BlankLine* { a << \"\\n\" } (Indent ListBlock:b { a.concat b })+ { a }")
-  Rules[:_Enumerator] = rule_info("Enumerator", "@NonindentSpace [0-9]+ \".\" @Spacechar+")
-  Rules[:_OrderedList] = rule_info("OrderedList", "&Enumerator (ListTight | ListLoose):a { RDoc::Markup::List.new(:NUMBER, *a) }")
-  Rules[:_ListBlockLine] = rule_info("ListBlockLine", "!@BlankLine !(Indent? (Bullet | Enumerator)) !HorizontalRule OptionallyIndentedLine")
-  Rules[:_HtmlOpenAnchor] = rule_info("HtmlOpenAnchor", "\"<\" Spnl (\"a\" | \"A\") Spnl HtmlAttribute* \">\"")
-  Rules[:_HtmlCloseAnchor] = rule_info("HtmlCloseAnchor", "\"<\" Spnl \"/\" (\"a\" | \"A\") Spnl \">\"")
-  Rules[:_HtmlAnchor] = rule_info("HtmlAnchor", "HtmlOpenAnchor (HtmlAnchor | !HtmlCloseAnchor .)* HtmlCloseAnchor")
-  Rules[:_HtmlBlockOpenAddress] = rule_info("HtmlBlockOpenAddress", "\"<\" Spnl (\"address\" | \"ADDRESS\") Spnl HtmlAttribute* \">\"")
-  Rules[:_HtmlBlockCloseAddress] = rule_info("HtmlBlockCloseAddress", "\"<\" Spnl \"/\" (\"address\" | \"ADDRESS\") Spnl \">\"")
-  Rules[:_HtmlBlockAddress] = rule_info("HtmlBlockAddress", "HtmlBlockOpenAddress (HtmlBlockAddress | !HtmlBlockCloseAddress .)* HtmlBlockCloseAddress")
-  Rules[:_HtmlBlockOpenBlockquote] = rule_info("HtmlBlockOpenBlockquote", "\"<\" Spnl (\"blockquote\" | \"BLOCKQUOTE\") Spnl HtmlAttribute* \">\"")
-  Rules[:_HtmlBlockCloseBlockquote] = rule_info("HtmlBlockCloseBlockquote", "\"<\" Spnl \"/\" (\"blockquote\" | \"BLOCKQUOTE\") Spnl \">\"")
-  Rules[:_HtmlBlockBlockquote] = rule_info("HtmlBlockBlockquote", "HtmlBlockOpenBlockquote (HtmlBlockBlockquote | !HtmlBlockCloseBlockquote .)* HtmlBlockCloseBlockquote")
-  Rules[:_HtmlBlockOpenCenter] = rule_info("HtmlBlockOpenCenter", "\"<\" Spnl (\"center\" | \"CENTER\") Spnl HtmlAttribute* \">\"")
-  Rules[:_HtmlBlockCloseCenter] = rule_info("HtmlBlockCloseCenter", "\"<\" Spnl \"/\" (\"center\" | \"CENTER\") Spnl \">\"")
-  Rules[:_HtmlBlockCenter] = rule_info("HtmlBlockCenter", "HtmlBlockOpenCenter (HtmlBlockCenter | !HtmlBlockCloseCenter .)* HtmlBlockCloseCenter")
-  Rules[:_HtmlBlockOpenDir] = rule_info("HtmlBlockOpenDir", "\"<\" Spnl (\"dir\" | \"DIR\") Spnl HtmlAttribute* \">\"")
-  Rules[:_HtmlBlockCloseDir] = rule_info("HtmlBlockCloseDir", "\"<\" Spnl \"/\" (\"dir\" | \"DIR\") Spnl \">\"")
-  Rules[:_HtmlBlockDir] = rule_info("HtmlBlockDir", "HtmlBlockOpenDir (HtmlBlockDir | !HtmlBlockCloseDir .)* HtmlBlockCloseDir")
-  Rules[:_HtmlBlockOpenDiv] = rule_info("HtmlBlockOpenDiv", "\"<\" Spnl (\"div\" | \"DIV\") Spnl HtmlAttribute* \">\"")
-  Rules[:_HtmlBlockCloseDiv] = rule_info("HtmlBlockCloseDiv", "\"<\" Spnl \"/\" (\"div\" | \"DIV\") Spnl \">\"")
-  Rules[:_HtmlBlockDiv] = rule_info("HtmlBlockDiv", "HtmlBlockOpenDiv (HtmlBlockDiv | !HtmlBlockCloseDiv .)* HtmlBlockCloseDiv")
-  Rules[:_HtmlBlockOpenDl] = rule_info("HtmlBlockOpenDl", "\"<\" Spnl (\"dl\" | \"DL\") Spnl HtmlAttribute* \">\"")
-  Rules[:_HtmlBlockCloseDl] = rule_info("HtmlBlockCloseDl", "\"<\" Spnl \"/\" (\"dl\" | \"DL\") Spnl \">\"")
-  Rules[:_HtmlBlockDl] = rule_info("HtmlBlockDl", "HtmlBlockOpenDl (HtmlBlockDl | !HtmlBlockCloseDl .)* HtmlBlockCloseDl")
-  Rules[:_HtmlBlockOpenFieldset] = rule_info("HtmlBlockOpenFieldset", "\"<\" Spnl (\"fieldset\" | \"FIELDSET\") Spnl HtmlAttribute* \">\"")
-  Rules[:_HtmlBlockCloseFieldset] = rule_info("HtmlBlockCloseFieldset", "\"<\" Spnl \"/\" (\"fieldset\" | \"FIELDSET\") Spnl \">\"")
-  Rules[:_HtmlBlockFieldset] = rule_info("HtmlBlockFieldset", "HtmlBlockOpenFieldset (HtmlBlockFieldset | !HtmlBlockCloseFieldset .)* HtmlBlockCloseFieldset")
-  Rules[:_HtmlBlockOpenForm] = rule_info("HtmlBlockOpenForm", "\"<\" Spnl (\"form\" | \"FORM\") Spnl HtmlAttribute* \">\"")
-  Rules[:_HtmlBlockCloseForm] = rule_info("HtmlBlockCloseForm", "\"<\" Spnl \"/\" (\"form\" | \"FORM\") Spnl \">\"")
-  Rules[:_HtmlBlockForm] = rule_info("HtmlBlockForm", "HtmlBlockOpenForm (HtmlBlockForm | !HtmlBlockCloseForm .)* HtmlBlockCloseForm")
-  Rules[:_HtmlBlockOpenH1] = rule_info("HtmlBlockOpenH1", "\"<\" Spnl (\"h1\" | \"H1\") Spnl HtmlAttribute* \">\"")
-  Rules[:_HtmlBlockCloseH1] = rule_info("HtmlBlockCloseH1", "\"<\" Spnl \"/\" (\"h1\" | \"H1\") Spnl \">\"")
-  Rules[:_HtmlBlockH1] = rule_info("HtmlBlockH1", "HtmlBlockOpenH1 (HtmlBlockH1 | !HtmlBlockCloseH1 .)* HtmlBlockCloseH1")
-  Rules[:_HtmlBlockOpenH2] = rule_info("HtmlBlockOpenH2", "\"<\" Spnl (\"h2\" | \"H2\") Spnl HtmlAttribute* \">\"")
-  Rules[:_HtmlBlockCloseH2] = rule_info("HtmlBlockCloseH2", "\"<\" Spnl \"/\" (\"h2\" | \"H2\") Spnl \">\"")
-  Rules[:_HtmlBlockH2] = rule_info("HtmlBlockH2", "HtmlBlockOpenH2 (HtmlBlockH2 | !HtmlBlockCloseH2 .)* HtmlBlockCloseH2")
-  Rules[:_HtmlBlockOpenH3] = rule_info("HtmlBlockOpenH3", "\"<\" Spnl (\"h3\" | \"H3\") Spnl HtmlAttribute* \">\"")
-  Rules[:_HtmlBlockCloseH3] = rule_info("HtmlBlockCloseH3", "\"<\" Spnl \"/\" (\"h3\" | \"H3\") Spnl \">\"")
-  Rules[:_HtmlBlockH3] = rule_info("HtmlBlockH3", "HtmlBlockOpenH3 (HtmlBlockH3 | !HtmlBlockCloseH3 .)* HtmlBlockCloseH3")
-  Rules[:_HtmlBlockOpenH4] = rule_info("HtmlBlockOpenH4", "\"<\" Spnl (\"h4\" | \"H4\") Spnl HtmlAttribute* \">\"")
-  Rules[:_HtmlBlockCloseH4] = rule_info("HtmlBlockCloseH4", "\"<\" Spnl \"/\" (\"h4\" | \"H4\") Spnl \">\"")
-  Rules[:_HtmlBlockH4] = rule_info("HtmlBlockH4", "HtmlBlockOpenH4 (HtmlBlockH4 | !HtmlBlockCloseH4 .)* HtmlBlockCloseH4")
-  Rules[:_HtmlBlockOpenH5] = rule_info("HtmlBlockOpenH5", "\"<\" Spnl (\"h5\" | \"H5\") Spnl HtmlAttribute* \">\"")
-  Rules[:_HtmlBlockCloseH5] = rule_info("HtmlBlockCloseH5", "\"<\" Spnl \"/\" (\"h5\" | \"H5\") Spnl \">\"")
-  Rules[:_HtmlBlockH5] = rule_info("HtmlBlockH5", "HtmlBlockOpenH5 (HtmlBlockH5 | !HtmlBlockCloseH5 .)* HtmlBlockCloseH5")
-  Rules[:_HtmlBlockOpenH6] = rule_info("HtmlBlockOpenH6", "\"<\" Spnl (\"h6\" | \"H6\") Spnl HtmlAttribute* \">\"")
-  Rules[:_HtmlBlockCloseH6] = rule_info("HtmlBlockCloseH6", "\"<\" Spnl \"/\" (\"h6\" | \"H6\") Spnl \">\"")
-  Rules[:_HtmlBlockH6] = rule_info("HtmlBlockH6", "HtmlBlockOpenH6 (HtmlBlockH6 | !HtmlBlockCloseH6 .)* HtmlBlockCloseH6")
-  Rules[:_HtmlBlockOpenMenu] = rule_info("HtmlBlockOpenMenu", "\"<\" Spnl (\"menu\" | \"MENU\") Spnl HtmlAttribute* \">\"")
-  Rules[:_HtmlBlockCloseMenu] = rule_info("HtmlBlockCloseMenu", "\"<\" Spnl \"/\" (\"menu\" | \"MENU\") Spnl \">\"")
-  Rules[:_HtmlBlockMenu] = rule_info("HtmlBlockMenu", "HtmlBlockOpenMenu (HtmlBlockMenu | !HtmlBlockCloseMenu .)* HtmlBlockCloseMenu")
-  Rules[:_HtmlBlockOpenNoframes] = rule_info("HtmlBlockOpenNoframes", "\"<\" Spnl (\"noframes\" | \"NOFRAMES\") Spnl HtmlAttribute* \">\"")
-  Rules[:_HtmlBlockCloseNoframes] = rule_info("HtmlBlockCloseNoframes", "\"<\" Spnl \"/\" (\"noframes\" | \"NOFRAMES\") Spnl \">\"")
-  Rules[:_HtmlBlockNoframes] = rule_info("HtmlBlockNoframes", "HtmlBlockOpenNoframes (HtmlBlockNoframes | !HtmlBlockCloseNoframes .)* HtmlBlockCloseNoframes")
-  Rules[:_HtmlBlockOpenNoscript] = rule_info("HtmlBlockOpenNoscript", "\"<\" Spnl (\"noscript\" | \"NOSCRIPT\") Spnl HtmlAttribute* \">\"")
-  Rules[:_HtmlBlockCloseNoscript] = rule_info("HtmlBlockCloseNoscript", "\"<\" Spnl \"/\" (\"noscript\" | \"NOSCRIPT\") Spnl \">\"")
-  Rules[:_HtmlBlockNoscript] = rule_info("HtmlBlockNoscript", "HtmlBlockOpenNoscript (HtmlBlockNoscript | !HtmlBlockCloseNoscript .)* HtmlBlockCloseNoscript")
-  Rules[:_HtmlBlockOpenOl] = rule_info("HtmlBlockOpenOl", "\"<\" Spnl (\"ol\" | \"OL\") Spnl HtmlAttribute* \">\"")
-  Rules[:_HtmlBlockCloseOl] = rule_info("HtmlBlockCloseOl", "\"<\" Spnl \"/\" (\"ol\" | \"OL\") Spnl \">\"")
-  Rules[:_HtmlBlockOl] = rule_info("HtmlBlockOl", "HtmlBlockOpenOl (HtmlBlockOl | !HtmlBlockCloseOl .)* HtmlBlockCloseOl")
-  Rules[:_HtmlBlockOpenP] = rule_info("HtmlBlockOpenP", "\"<\" Spnl (\"p\" | \"P\") Spnl HtmlAttribute* \">\"")
-  Rules[:_HtmlBlockCloseP] = rule_info("HtmlBlockCloseP", "\"<\" Spnl \"/\" (\"p\" | \"P\") Spnl \">\"")
-  Rules[:_HtmlBlockP] = rule_info("HtmlBlockP", "HtmlBlockOpenP (HtmlBlockP | !HtmlBlockCloseP .)* HtmlBlockCloseP")
-  Rules[:_HtmlBlockOpenPre] = rule_info("HtmlBlockOpenPre", "\"<\" Spnl (\"pre\" | \"PRE\") Spnl HtmlAttribute* \">\"")
-  Rules[:_HtmlBlockClosePre] = rule_info("HtmlBlockClosePre", "\"<\" Spnl \"/\" (\"pre\" | \"PRE\") Spnl \">\"")
-  Rules[:_HtmlBlockPre] = rule_info("HtmlBlockPre", "HtmlBlockOpenPre (HtmlBlockPre | !HtmlBlockClosePre .)* HtmlBlockClosePre")
-  Rules[:_HtmlBlockOpenTable] = rule_info("HtmlBlockOpenTable", "\"<\" Spnl (\"table\" | \"TABLE\") Spnl HtmlAttribute* \">\"")
-  Rules[:_HtmlBlockCloseTable] = rule_info("HtmlBlockCloseTable", "\"<\" Spnl \"/\" (\"table\" | \"TABLE\") Spnl \">\"")
-  Rules[:_HtmlBlockTable] = rule_info("HtmlBlockTable", "HtmlBlockOpenTable (HtmlBlockTable | !HtmlBlockCloseTable .)* HtmlBlockCloseTable")
-  Rules[:_HtmlBlockOpenUl] = rule_info("HtmlBlockOpenUl", "\"<\" Spnl (\"ul\" | \"UL\") Spnl HtmlAttribute* \">\"")
-  Rules[:_HtmlBlockCloseUl] = rule_info("HtmlBlockCloseUl", "\"<\" Spnl \"/\" (\"ul\" | \"UL\") Spnl \">\"")
-  Rules[:_HtmlBlockUl] = rule_info("HtmlBlockUl", "HtmlBlockOpenUl (HtmlBlockUl | !HtmlBlockCloseUl .)* HtmlBlockCloseUl")
-  Rules[:_HtmlBlockOpenDd] = rule_info("HtmlBlockOpenDd", "\"<\" Spnl (\"dd\" | \"DD\") Spnl HtmlAttribute* \">\"")
-  Rules[:_HtmlBlockCloseDd] = rule_info("HtmlBlockCloseDd", "\"<\" Spnl \"/\" (\"dd\" | \"DD\") Spnl \">\"")
-  Rules[:_HtmlBlockDd] = rule_info("HtmlBlockDd", "HtmlBlockOpenDd (HtmlBlockDd | !HtmlBlockCloseDd .)* HtmlBlockCloseDd")
-  Rules[:_HtmlBlockOpenDt] = rule_info("HtmlBlockOpenDt", "\"<\" Spnl (\"dt\" | \"DT\") Spnl HtmlAttribute* \">\"")
-  Rules[:_HtmlBlockCloseDt] = rule_info("HtmlBlockCloseDt", "\"<\" Spnl \"/\" (\"dt\" | \"DT\") Spnl \">\"")
-  Rules[:_HtmlBlockDt] = rule_info("HtmlBlockDt", "HtmlBlockOpenDt (HtmlBlockDt | !HtmlBlockCloseDt .)* HtmlBlockCloseDt")
-  Rules[:_HtmlBlockOpenFrameset] = rule_info("HtmlBlockOpenFrameset", "\"<\" Spnl (\"frameset\" | \"FRAMESET\") Spnl HtmlAttribute* \">\"")
-  Rules[:_HtmlBlockCloseFrameset] = rule_info("HtmlBlockCloseFrameset", "\"<\" Spnl \"/\" (\"frameset\" | \"FRAMESET\") Spnl \">\"")
-  Rules[:_HtmlBlockFrameset] = rule_info("HtmlBlockFrameset", "HtmlBlockOpenFrameset (HtmlBlockFrameset | !HtmlBlockCloseFrameset .)* HtmlBlockCloseFrameset")
-  Rules[:_HtmlBlockOpenLi] = rule_info("HtmlBlockOpenLi", "\"<\" Spnl (\"li\" | \"LI\") Spnl HtmlAttribute* \">\"")
-  Rules[:_HtmlBlockCloseLi] = rule_info("HtmlBlockCloseLi", "\"<\" Spnl \"/\" (\"li\" | \"LI\") Spnl \">\"")
-  Rules[:_HtmlBlockLi] = rule_info("HtmlBlockLi", "HtmlBlockOpenLi (HtmlBlockLi | !HtmlBlockCloseLi .)* HtmlBlockCloseLi")
-  Rules[:_HtmlBlockOpenTbody] = rule_info("HtmlBlockOpenTbody", "\"<\" Spnl (\"tbody\" | \"TBODY\") Spnl HtmlAttribute* \">\"")
-  Rules[:_HtmlBlockCloseTbody] = rule_info("HtmlBlockCloseTbody", "\"<\" Spnl \"/\" (\"tbody\" | \"TBODY\") Spnl \">\"")
-  Rules[:_HtmlBlockTbody] = rule_info("HtmlBlockTbody", "HtmlBlockOpenTbody (HtmlBlockTbody | !HtmlBlockCloseTbody .)* HtmlBlockCloseTbody")
-  Rules[:_HtmlBlockOpenTd] = rule_info("HtmlBlockOpenTd", "\"<\" Spnl (\"td\" | \"TD\") Spnl HtmlAttribute* \">\"")
-  Rules[:_HtmlBlockCloseTd] = rule_info("HtmlBlockCloseTd", "\"<\" Spnl \"/\" (\"td\" | \"TD\") Spnl \">\"")
-  Rules[:_HtmlBlockTd] = rule_info("HtmlBlockTd", "HtmlBlockOpenTd (HtmlBlockTd | !HtmlBlockCloseTd .)* HtmlBlockCloseTd")
-  Rules[:_HtmlBlockOpenTfoot] = rule_info("HtmlBlockOpenTfoot", "\"<\" Spnl (\"tfoot\" | \"TFOOT\") Spnl HtmlAttribute* \">\"")
-  Rules[:_HtmlBlockCloseTfoot] = rule_info("HtmlBlockCloseTfoot", "\"<\" Spnl \"/\" (\"tfoot\" | \"TFOOT\") Spnl \">\"")
-  Rules[:_HtmlBlockTfoot] = rule_info("HtmlBlockTfoot", "HtmlBlockOpenTfoot (HtmlBlockTfoot | !HtmlBlockCloseTfoot .)* HtmlBlockCloseTfoot")
-  Rules[:_HtmlBlockOpenTh] = rule_info("HtmlBlockOpenTh", "\"<\" Spnl (\"th\" | \"TH\") Spnl HtmlAttribute* \">\"")
-  Rules[:_HtmlBlockCloseTh] = rule_info("HtmlBlockCloseTh", "\"<\" Spnl \"/\" (\"th\" | \"TH\") Spnl \">\"")
-  Rules[:_HtmlBlockTh] = rule_info("HtmlBlockTh", "HtmlBlockOpenTh (HtmlBlockTh | !HtmlBlockCloseTh .)* HtmlBlockCloseTh")
-  Rules[:_HtmlBlockOpenThead] = rule_info("HtmlBlockOpenThead", "\"<\" Spnl (\"thead\" | \"THEAD\") Spnl HtmlAttribute* \">\"")
-  Rules[:_HtmlBlockCloseThead] = rule_info("HtmlBlockCloseThead", "\"<\" Spnl \"/\" (\"thead\" | \"THEAD\") Spnl \">\"")
-  Rules[:_HtmlBlockThead] = rule_info("HtmlBlockThead", "HtmlBlockOpenThead (HtmlBlockThead | !HtmlBlockCloseThead .)* HtmlBlockCloseThead")
-  Rules[:_HtmlBlockOpenTr] = rule_info("HtmlBlockOpenTr", "\"<\" Spnl (\"tr\" | \"TR\") Spnl HtmlAttribute* \">\"")
-  Rules[:_HtmlBlockCloseTr] = rule_info("HtmlBlockCloseTr", "\"<\" Spnl \"/\" (\"tr\" | \"TR\") Spnl \">\"")
-  Rules[:_HtmlBlockTr] = rule_info("HtmlBlockTr", "HtmlBlockOpenTr (HtmlBlockTr | !HtmlBlockCloseTr .)* HtmlBlockCloseTr")
-  Rules[:_HtmlBlockOpenScript] = rule_info("HtmlBlockOpenScript", "\"<\" Spnl (\"script\" | \"SCRIPT\") Spnl HtmlAttribute* \">\"")
-  Rules[:_HtmlBlockCloseScript] = rule_info("HtmlBlockCloseScript", "\"<\" Spnl \"/\" (\"script\" | \"SCRIPT\") Spnl \">\"")
-  Rules[:_HtmlBlockScript] = rule_info("HtmlBlockScript", "HtmlBlockOpenScript (!HtmlBlockCloseScript .)* HtmlBlockCloseScript")
-  Rules[:_HtmlBlockOpenHead] = rule_info("HtmlBlockOpenHead", "\"<\" Spnl (\"head\" | \"HEAD\") Spnl HtmlAttribute* \">\"")
-  Rules[:_HtmlBlockCloseHead] = rule_info("HtmlBlockCloseHead", "\"<\" Spnl \"/\" (\"head\" | \"HEAD\") Spnl \">\"")
-  Rules[:_HtmlBlockHead] = rule_info("HtmlBlockHead", "HtmlBlockOpenHead (!HtmlBlockCloseHead .)* HtmlBlockCloseHead")
-  Rules[:_HtmlBlockInTags] = rule_info("HtmlBlockInTags", "(HtmlAnchor | HtmlBlockAddress | HtmlBlockBlockquote | HtmlBlockCenter | HtmlBlockDir | HtmlBlockDiv | HtmlBlockDl | HtmlBlockFieldset | HtmlBlockForm | HtmlBlockH1 | HtmlBlockH2 | HtmlBlockH3 | HtmlBlockH4 | HtmlBlockH5 | HtmlBlockH6 | HtmlBlockMenu | HtmlBlockNoframes | HtmlBlockNoscript | HtmlBlockOl | HtmlBlockP | HtmlBlockPre | HtmlBlockTable | HtmlBlockUl | HtmlBlockDd | HtmlBlockDt | HtmlBlockFrameset | HtmlBlockLi | HtmlBlockTbody | HtmlBlockTd | HtmlBlockTfoot | HtmlBlockTh | HtmlBlockThead | HtmlBlockTr | HtmlBlockScript | HtmlBlockHead)")
-  Rules[:_HtmlBlock] = rule_info("HtmlBlock", "< (HtmlBlockInTags | HtmlComment | HtmlBlockSelfClosing | HtmlUnclosed) > @BlankLine+ { if html? then                 RDoc::Markup::Raw.new text               end }")
-  Rules[:_HtmlUnclosed] = rule_info("HtmlUnclosed", "\"<\" Spnl HtmlUnclosedType Spnl HtmlAttribute* Spnl \">\"")
-  Rules[:_HtmlUnclosedType] = rule_info("HtmlUnclosedType", "(\"HR\" | \"hr\")")
-  Rules[:_HtmlBlockSelfClosing] = rule_info("HtmlBlockSelfClosing", "\"<\" Spnl HtmlBlockType Spnl HtmlAttribute* \"/\" Spnl \">\"")
-  Rules[:_HtmlBlockType] = rule_info("HtmlBlockType", "(\"ADDRESS\" | \"BLOCKQUOTE\" | \"CENTER\" | \"DD\" | \"DIR\" | \"DIV\" | \"DL\" | \"DT\" | \"FIELDSET\" | \"FORM\" | \"FRAMESET\" | \"H1\" | \"H2\" | \"H3\" | \"H4\" | \"H5\" | \"H6\" | \"HR\" | \"ISINDEX\" | \"LI\" | \"MENU\" | \"NOFRAMES\" | \"NOSCRIPT\" | \"OL\" | \"P\" | \"PRE\" | \"SCRIPT\" | \"TABLE\" | \"TBODY\" | \"TD\" | \"TFOOT\" | \"TH\" | \"THEAD\" | \"TR\" | \"UL\" | \"address\" | \"blockquote\" | \"center\" | \"dd\" | \"dir\" | \"div\" | \"dl\" | \"dt\" | \"fieldset\" | \"form\" | \"frameset\" | \"h1\" | \"h2\" | \"h3\" | \"h4\" | \"h5\" | \"h6\" | \"hr\" | \"isindex\" | \"li\" | \"menu\" | \"noframes\" | \"noscript\" | \"ol\" | \"p\" | \"pre\" | \"script\" | \"table\" | \"tbody\" | \"td\" | \"tfoot\" | \"th\" | \"thead\" | \"tr\" | \"ul\")")
-  Rules[:_StyleOpen] = rule_info("StyleOpen", "\"<\" Spnl (\"style\" | \"STYLE\") Spnl HtmlAttribute* \">\"")
-  Rules[:_StyleClose] = rule_info("StyleClose", "\"<\" Spnl \"/\" (\"style\" | \"STYLE\") Spnl \">\"")
-  Rules[:_InStyleTags] = rule_info("InStyleTags", "StyleOpen (!StyleClose .)* StyleClose")
-  Rules[:_StyleBlock] = rule_info("StyleBlock", "< InStyleTags > @BlankLine* { if css? then                     RDoc::Markup::Raw.new text                   end }")
-  Rules[:_Inlines] = rule_info("Inlines", "(!@Endline Inline:i { i } | @Endline:c !(&{ github? } Ticks3 /[^`\\n]*$/) &Inline { c })+:chunks @Endline? { chunks }")
-  Rules[:_Inline] = rule_info("Inline", "(Str | @Endline | UlOrStarLine | @Space | Strong | Emph | Strike | Image | Link | NoteReference | InlineNote | Code | RawHtml | Entity | EscapedChar | Symbol)")
-  Rules[:_Space] = rule_info("Space", "@Spacechar+ { \" \" }")
-  Rules[:_Str] = rule_info("Str", "@StartList:a < @NormalChar+ > { a = text } (StrChunk:c { a << c })* { a }")
-  Rules[:_StrChunk] = rule_info("StrChunk", "< (@NormalChar | /_+/ &Alphanumeric)+ > { text }")
-  Rules[:_EscapedChar] = rule_info("EscapedChar", "\"\\\\\" !@Newline < /[:\\\\`|*_{}\\[\\]()\#+.!><-]/ > { text }")
-  Rules[:_Entity] = rule_info("Entity", "(HexEntity | DecEntity | CharEntity):a { a }")
-  Rules[:_Endline] = rule_info("Endline", "(@LineBreak | @TerminalEndline | @NormalEndline)")
-  Rules[:_NormalEndline] = rule_info("NormalEndline", "@Sp @Newline !@BlankLine !\">\" !AtxStart !(Line /={1,}|-{1,}/ @Newline) { \"\\n\" }")
-  Rules[:_TerminalEndline] = rule_info("TerminalEndline", "@Sp @Newline @Eof")
-  Rules[:_LineBreak] = rule_info("LineBreak", "\"  \" @NormalEndline { RDoc::Markup::HardBreak.new }")
-  Rules[:_Symbol] = rule_info("Symbol", "< @SpecialChar > { text }")
-  Rules[:_UlOrStarLine] = rule_info("UlOrStarLine", "(UlLine | StarLine):a { a }")
-  Rules[:_StarLine] = rule_info("StarLine", "(< /\\*{4,}/ > { text } | < @Spacechar /\\*+/ &@Spacechar > { text })")
-  Rules[:_UlLine] = rule_info("UlLine", "(< /_{4,}/ > { text } | < @Spacechar /_+/ &@Spacechar > { text })")
-  Rules[:_Emph] = rule_info("Emph", "(EmphStar | EmphUl)")
-  Rules[:_Whitespace] = rule_info("Whitespace", "(@Spacechar | @Newline)")
-  Rules[:_EmphStar] = rule_info("EmphStar", "\"*\" !@Whitespace @StartList:a (!\"*\" Inline:b { a << b } | StrongStar:b { a << b })+ \"*\" { emphasis a.join }")
-  Rules[:_EmphUl] = rule_info("EmphUl", "\"_\" !@Whitespace @StartList:a (!\"_\" Inline:b { a << b } | StrongUl:b { a << b })+ \"_\" { emphasis a.join }")
-  Rules[:_Strong] = rule_info("Strong", "(StrongStar | StrongUl)")
-  Rules[:_StrongStar] = rule_info("StrongStar", "\"**\" !@Whitespace @StartList:a (!\"**\" Inline:b { a << b })+ \"**\" { strong a.join }")
-  Rules[:_StrongUl] = rule_info("StrongUl", "\"__\" !@Whitespace @StartList:a (!\"__\" Inline:b { a << b })+ \"__\" { strong a.join }")
-  Rules[:_Strike] = rule_info("Strike", "&{ strike? } \"~~\" !@Whitespace @StartList:a (!\"~~\" Inline:b { a << b })+ \"~~\" { strike a.join }")
-  Rules[:_Image] = rule_info("Image", "\"!\" (ExplicitLink | ReferenceLink):a { \"rdoc-image:\#{a[/\\[(.*)\\]/, 1]}\" }")
-  Rules[:_Link] = rule_info("Link", "(ExplicitLink | ReferenceLink | AutoLink)")
-  Rules[:_ReferenceLink] = rule_info("ReferenceLink", "(ReferenceLinkDouble | ReferenceLinkSingle)")
-  Rules[:_ReferenceLinkDouble] = rule_info("ReferenceLinkDouble", "Label:content < Spnl > !\"[]\" Label:label { link_to content, label, text }")
-  Rules[:_ReferenceLinkSingle] = rule_info("ReferenceLinkSingle", "Label:content < (Spnl \"[]\")? > { link_to content, content, text }")
-  Rules[:_ExplicitLink] = rule_info("ExplicitLink", "Label:l \"(\" @Sp Source:s Spnl Title @Sp \")\" { \"{\#{l}}[\#{s}]\" }")
-  Rules[:_Source] = rule_info("Source", "(\"<\" < SourceContents > \">\" | < SourceContents >) { text }")
-  Rules[:_SourceContents] = rule_info("SourceContents", "((!\"(\" !\")\" !\">\" Nonspacechar)+ | \"(\" SourceContents \")\")*")
-  Rules[:_Title] = rule_info("Title", "(TitleSingle | TitleDouble | \"\"):a { a }")
-  Rules[:_TitleSingle] = rule_info("TitleSingle", "\"'\" (!(\"'\" @Sp (\")\" | @Newline)) .)* \"'\"")
-  Rules[:_TitleDouble] = rule_info("TitleDouble", "\"\\\"\" (!(\"\\\"\" @Sp (\")\" | @Newline)) .)* \"\\\"\"")
-  Rules[:_AutoLink] = rule_info("AutoLink", "(AutoLinkUrl | AutoLinkEmail)")
-  Rules[:_AutoLinkUrl] = rule_info("AutoLinkUrl", "\"<\" < /[A-Za-z]+/ \"://\" (!@Newline !\">\" .)+ > \">\" { text }")
-  Rules[:_AutoLinkEmail] = rule_info("AutoLinkEmail", "\"<\" \"mailto:\"? < /[\\w+.\\/!%~$-]+/i \"@\" (!@Newline !\">\" .)+ > \">\" { \"mailto:\#{text}\" }")
-  Rules[:_Reference] = rule_info("Reference", "@NonindentSpace !\"[]\" Label:label \":\" Spnl RefSrc:link RefTitle @BlankLine+ { \# TODO use title               reference label, link               nil             }")
-  Rules[:_Label] = rule_info("Label", "\"[\" (!\"^\" &{ notes? } | &. &{ !notes? }) @StartList:a (!\"]\" Inline:l { a << l })* \"]\" { a.join.gsub(/\\s+/, ' ') }")
-  Rules[:_RefSrc] = rule_info("RefSrc", "< Nonspacechar+ > { text }")
-  Rules[:_RefTitle] = rule_info("RefTitle", "(RefTitleSingle | RefTitleDouble | RefTitleParens | EmptyTitle)")
-  Rules[:_EmptyTitle] = rule_info("EmptyTitle", "\"\"")
-  Rules[:_RefTitleSingle] = rule_info("RefTitleSingle", "Spnl \"'\" < (!(\"'\" @Sp @Newline | @Newline) .)* > \"'\" { text }")
-  Rules[:_RefTitleDouble] = rule_info("RefTitleDouble", "Spnl \"\\\"\" < (!(\"\\\"\" @Sp @Newline | @Newline) .)* > \"\\\"\" { text }")
-  Rules[:_RefTitleParens] = rule_info("RefTitleParens", "Spnl \"(\" < (!(\")\" @Sp @Newline | @Newline) .)* > \")\" { text }")
-  Rules[:_References] = rule_info("References", "(Reference | SkipBlock)*")
-  Rules[:_Ticks1] = rule_info("Ticks1", "\"`\" !\"`\"")
-  Rules[:_Ticks2] = rule_info("Ticks2", "\"``\" !\"`\"")
-  Rules[:_Ticks3] = rule_info("Ticks3", "\"```\" !\"`\"")
-  Rules[:_Ticks4] = rule_info("Ticks4", "\"````\" !\"`\"")
-  Rules[:_Ticks5] = rule_info("Ticks5", "\"`````\" !\"`\"")
-  Rules[:_Code] = rule_info("Code", "(Ticks1 @Sp < ((!\"`\" Nonspacechar)+ | !Ticks1 /`+/ | !(@Sp Ticks1) (@Spacechar | @Newline !@BlankLine))+ > @Sp Ticks1 | Ticks2 @Sp < ((!\"`\" Nonspacechar)+ | !Ticks2 /`+/ | !(@Sp Ticks2) (@Spacechar | @Newline !@BlankLine))+ > @Sp Ticks2 | Ticks3 @Sp < ((!\"`\" Nonspacechar)+ | !Ticks3 /`+/ | !(@Sp Ticks3) (@Spacechar | @Newline !@BlankLine))+ > @Sp Ticks3 | Ticks4 @Sp < ((!\"`\" Nonspacechar)+ | !Ticks4 /`+/ | !(@Sp Ticks4) (@Spacechar | @Newline !@BlankLine))+ > @Sp Ticks4 | Ticks5 @Sp < ((!\"`\" Nonspacechar)+ | !Ticks5 /`+/ | !(@Sp Ticks5) (@Spacechar | @Newline !@BlankLine))+ > @Sp Ticks5) { \"<code>\#{text}</code>\" }")
-  Rules[:_RawHtml] = rule_info("RawHtml", "< (HtmlComment | HtmlBlockScript | HtmlTag) > { if html? then text else '' end }")
-  Rules[:_BlankLine] = rule_info("BlankLine", "@Sp @Newline { \"\\n\" }")
-  Rules[:_Quoted] = rule_info("Quoted", "(\"\\\"\" (!\"\\\"\" .)* \"\\\"\" | \"'\" (!\"'\" .)* \"'\")")
-  Rules[:_HtmlAttribute] = rule_info("HtmlAttribute", "(AlphanumericAscii | \"-\")+ Spnl (\"=\" Spnl (Quoted | (!\">\" Nonspacechar)+))? Spnl")
-  Rules[:_HtmlComment] = rule_info("HtmlComment", "\"<!--\" (!\"-->\" .)* \"-->\"")
-  Rules[:_HtmlTag] = rule_info("HtmlTag", "\"<\" Spnl \"/\"? AlphanumericAscii+ Spnl HtmlAttribute* \"/\"? Spnl \">\"")
-  Rules[:_Eof] = rule_info("Eof", "!.")
-  Rules[:_Nonspacechar] = rule_info("Nonspacechar", "!@Spacechar !@Newline .")
-  Rules[:_Sp] = rule_info("Sp", "@Spacechar*")
-  Rules[:_Spnl] = rule_info("Spnl", "@Sp (@Newline @Sp)?")
-  Rules[:_SpecialChar] = rule_info("SpecialChar", "(/[~*_`&\\[\\]()<!\#\\\\'\"]/ | @ExtendedSpecialChar)")
-  Rules[:_NormalChar] = rule_info("NormalChar", "!(@SpecialChar | @Spacechar | @Newline) .")
-  Rules[:_Digit] = rule_info("Digit", "[0-9]")
-  Rules[:_Alphanumeric] = rule_info("Alphanumeric", "%literals.Alphanumeric")
-  Rules[:_AlphanumericAscii] = rule_info("AlphanumericAscii", "%literals.AlphanumericAscii")
-  Rules[:_BOM] = rule_info("BOM", "%literals.BOM")
-  Rules[:_Newline] = rule_info("Newline", "%literals.Newline")
-  Rules[:_Spacechar] = rule_info("Spacechar", "%literals.Spacechar")
-  Rules[:_HexEntity] = rule_info("HexEntity", "/&\#x/i < /[0-9a-fA-F]+/ > \";\" { [text.to_i(16)].pack 'U' }")
-  Rules[:_DecEntity] = rule_info("DecEntity", "\"&\#\" < /[0-9]+/ > \";\" { [text.to_i].pack 'U' }")
-  Rules[:_CharEntity] = rule_info("CharEntity", "\"&\" < /[A-Za-z0-9]+/ > \";\" { if entity = HTML_ENTITIES[text] then                  entity.pack 'U*'                else                  \"&\#{text};\"                end              }")
-  Rules[:_NonindentSpace] = rule_info("NonindentSpace", "/ {0,3}/")
-  Rules[:_Indent] = rule_info("Indent", "/\\t|    /")
-  Rules[:_IndentedLine] = rule_info("IndentedLine", "Indent Line")
-  Rules[:_OptionallyIndentedLine] = rule_info("OptionallyIndentedLine", "Indent? Line")
-  Rules[:_StartList] = rule_info("StartList", "&. { [] }")
-  Rules[:_Line] = rule_info("Line", "@RawLine:a { a }")
-  Rules[:_RawLine] = rule_info("RawLine", "(< /[^\\r\\n]*/ @Newline > | < .+ > @Eof) { text }")
-  Rules[:_SkipBlock] = rule_info("SkipBlock", "(HtmlBlock | (!\"\#\" !SetextBottom1 !SetextBottom2 !@BlankLine @RawLine)+ @BlankLine* | @BlankLine+ | @RawLine)")
-  Rules[:_ExtendedSpecialChar] = rule_info("ExtendedSpecialChar", "&{ notes? } \"^\"")
-  Rules[:_NoteReference] = rule_info("NoteReference", "&{ notes? } RawNoteReference:ref { note_for ref }")
-  Rules[:_RawNoteReference] = rule_info("RawNoteReference", "\"[^\" < (!@Newline !\"]\" .)+ > \"]\" { text }")
-  Rules[:_Note] = rule_info("Note", "&{ notes? } @NonindentSpace RawNoteReference:ref \":\" @Sp @StartList:a RawNoteBlock:i { a.concat i } (&Indent RawNoteBlock:i { a.concat i })* { @footnotes[ref] = paragraph a                    nil                 }")
-  Rules[:_InlineNote] = rule_info("InlineNote", "&{ notes? } \"^[\" @StartList:a (!\"]\" Inline:l { a << l })+ \"]\" { ref = [:inline, @note_order.length]                @footnotes[ref] = paragraph a                 note_for ref              }")
-  Rules[:_Notes] = rule_info("Notes", "(Note | SkipBlock)*")
-  Rules[:_RawNoteBlock] = rule_info("RawNoteBlock", "@StartList:a (!@BlankLine !RawNoteReference OptionallyIndentedLine:l { a << l })+ < @BlankLine* > { a << text } { a }")
-  Rules[:_CodeFence] = rule_info("CodeFence", "&{ github? } Ticks3 (@Sp StrChunk:format)? Spnl < ((!\"`\" Nonspacechar)+ | !Ticks3 /`+/ | Spacechar | @Newline)+ > Ticks3 @Sp @Newline* { verbatim = RDoc::Markup::Verbatim.new text               verbatim.format = format.intern if format.instance_of?(String)               verbatim             }")
-  Rules[:_Table] = rule_info("Table", "&{ github? } TableHead:header TableLine:line TableRow+:body { table = RDoc::Markup::Table.new(header, line, body) }")
-  Rules[:_TableHead] = rule_info("TableHead", "TableItem2+:items \"|\"? @Newline { items }")
-  Rules[:_TableRow] = rule_info("TableRow", "((TableItem:item1 TableItem2*:items { [item1, *items] }):row | TableItem2+:row) \"|\"? @Newline { row }")
-  Rules[:_TableItem2] = rule_info("TableItem2", "\"|\" TableItem")
-  Rules[:_TableItem] = rule_info("TableItem", "< /(?:\\\\.|[^|\\n])+/ > { text.strip.gsub(/\\\\(.)/, '\\1')  }")
-  Rules[:_TableLine] = rule_info("TableLine", "((TableAlign:align1 TableAlign2*:aligns {[align1, *aligns] }):line | TableAlign2+:line) \"|\"? @Newline { line }")
-  Rules[:_TableAlign2] = rule_info("TableAlign2", "\"|\" @Sp TableAlign")
-  Rules[:_TableAlign] = rule_info("TableAlign", "< /:?-+:?/ > @Sp {                 text.start_with?(\":\") ?                 (text.end_with?(\":\") ? :center : :left) :                 (text.end_with?(\":\") ? :right : nil)               }")
-  Rules[:_DefinitionList] = rule_info("DefinitionList", "&{ definition_lists? } DefinitionListItem+:list { RDoc::Markup::List.new :NOTE, *list.flatten }")
-  Rules[:_DefinitionListItem] = rule_info("DefinitionListItem", "DefinitionListLabel+:label DefinitionListDefinition+:defns { list_items = []                        list_items <<                          RDoc::Markup::ListItem.new(label, defns.shift)                         list_items.concat defns.map { |defn|                          RDoc::Markup::ListItem.new nil, defn                        } unless list_items.empty?                         list_items                      }")
-  Rules[:_DefinitionListLabel] = rule_info("DefinitionListLabel", "StrChunk:label @Sp @Newline { label }")
-  Rules[:_DefinitionListDefinition] = rule_info("DefinitionListDefinition", "@NonindentSpace \":\" @Space Inlines:a @BlankLine+ { paragraph a }")
-  # :startdoc:
-end
diff --git a/lib/rdoc/markdown/entities.rb b/lib/rdoc/markdown/entities.rb
deleted file mode 100644
index 265c2eb3f3dff8..00000000000000
--- a/lib/rdoc/markdown/entities.rb
+++ /dev/null
@@ -1,2131 +0,0 @@
-# frozen_string_literal: true
-##
-# HTML entity name map for RDoc::Markdown
-
-RDoc::Markdown::HTML_ENTITIES = {
-  "AElig" => [0x000C6],
-  "AMP" => [0x00026],
-  "Aacute" => [0x000C1],
-  "Abreve" => [0x00102],
-  "Acirc" => [0x000C2],
-  "Acy" => [0x00410],
-  "Afr" => [0x1D504],
-  "Agrave" => [0x000C0],
-  "Alpha" => [0x00391],
-  "Amacr" => [0x00100],
-  "And" => [0x02A53],
-  "Aogon" => [0x00104],
-  "Aopf" => [0x1D538],
-  "ApplyFunction" => [0x02061],
-  "Aring" => [0x000C5],
-  "Ascr" => [0x1D49C],
-  "Assign" => [0x02254],
-  "Atilde" => [0x000C3],
-  "Auml" => [0x000C4],
-  "Backslash" => [0x02216],
-  "Barv" => [0x02AE7],
-  "Barwed" => [0x02306],
-  "Bcy" => [0x00411],
-  "Because" => [0x02235],
-  "Bernoullis" => [0x0212C],
-  "Beta" => [0x00392],
-  "Bfr" => [0x1D505],
-  "Bopf" => [0x1D539],
-  "Breve" => [0x002D8],
-  "Bscr" => [0x0212C],
-  "Bumpeq" => [0x0224E],
-  "CHcy" => [0x00427],
-  "COPY" => [0x000A9],
-  "Cacute" => [0x00106],
-  "Cap" => [0x022D2],
-  "CapitalDifferentialD" => [0x02145],
-  "Cayleys" => [0x0212D],
-  "Ccaron" => [0x0010C],
-  "Ccedil" => [0x000C7],
-  "Ccirc" => [0x00108],
-  "Cconint" => [0x02230],
-  "Cdot" => [0x0010A],
-  "Cedilla" => [0x000B8],
-  "CenterDot" => [0x000B7],
-  "Cfr" => [0x0212D],
-  "Chi" => [0x003A7],
-  "CircleDot" => [0x02299],
-  "CircleMinus" => [0x02296],
-  "CirclePlus" => [0x02295],
-  "CircleTimes" => [0x02297],
-  "ClockwiseContourIntegral" => [0x02232],
-  "CloseCurlyDoubleQuote" => [0x0201D],
-  "CloseCurlyQuote" => [0x02019],
-  "Colon" => [0x02237],
-  "Colone" => [0x02A74],
-  "Congruent" => [0x02261],
-  "Conint" => [0x0222F],
-  "ContourIntegral" => [0x0222E],
-  "Copf" => [0x02102],
-  "Coproduct" => [0x02210],
-  "CounterClockwiseContourIntegral" => [0x02233],
-  "Cross" => [0x02A2F],
-  "Cscr" => [0x1D49E],
-  "Cup" => [0x022D3],
-  "CupCap" => [0x0224D],
-  "DD" => [0x02145],
-  "DDotrahd" => [0x02911],
-  "DJcy" => [0x00402],
-  "DScy" => [0x00405],
-  "DZcy" => [0x0040F],
-  "Dagger" => [0x02021],
-  "Darr" => [0x021A1],
-  "Dashv" => [0x02AE4],
-  "Dcaron" => [0x0010E],
-  "Dcy" => [0x00414],
-  "Del" => [0x02207],
-  "Delta" => [0x00394],
-  "Dfr" => [0x1D507],
-  "DiacriticalAcute" => [0x000B4],
-  "DiacriticalDot" => [0x002D9],
-  "DiacriticalDoubleAcute" => [0x002DD],
-  "DiacriticalGrave" => [0x00060],
-  "DiacriticalTilde" => [0x002DC],
-  "Diamond" => [0x022C4],
-  "DifferentialD" => [0x02146],
-  "Dopf" => [0x1D53B],
-  "Dot" => [0x000A8],
-  "DotDot" => [0x020DC],
-  "DotEqual" => [0x02250],
-  "DoubleContourIntegral" => [0x0222F],
-  "DoubleDot" => [0x000A8],
-  "DoubleDownArrow" => [0x021D3],
-  "DoubleLeftArrow" => [0x021D0],
-  "DoubleLeftRightArrow" => [0x021D4],
-  "DoubleLeftTee" => [0x02AE4],
-  "DoubleLongLeftArrow" => [0x027F8],
-  "DoubleLongLeftRightArrow" => [0x027FA],
-  "DoubleLongRightArrow" => [0x027F9],
-  "DoubleRightArrow" => [0x021D2],
-  "DoubleRightTee" => [0x022A8],
-  "DoubleUpArrow" => [0x021D1],
-  "DoubleUpDownArrow" => [0x021D5],
-  "DoubleVerticalBar" => [0x02225],
-  "DownArrow" => [0x02193],
-  "DownArrowBar" => [0x02913],
-  "DownArrowUpArrow" => [0x021F5],
-  "DownBreve" => [0x00311],
-  "DownLeftRightVector" => [0x02950],
-  "DownLeftTeeVector" => [0x0295E],
-  "DownLeftVector" => [0x021BD],
-  "DownLeftVectorBar" => [0x02956],
-  "DownRightTeeVector" => [0x0295F],
-  "DownRightVector" => [0x021C1],
-  "DownRightVectorBar" => [0x02957],
-  "DownTee" => [0x022A4],
-  "DownTeeArrow" => [0x021A7],
-  "Downarrow" => [0x021D3],
-  "Dscr" => [0x1D49F],
-  "Dstrok" => [0x00110],
-  "ENG" => [0x0014A],
-  "ETH" => [0x000D0],
-  "Eacute" => [0x000C9],
-  "Ecaron" => [0x0011A],
-  "Ecirc" => [0x000CA],
-  "Ecy" => [0x0042D],
-  "Edot" => [0x00116],
-  "Efr" => [0x1D508],
-  "Egrave" => [0x000C8],
-  "Element" => [0x02208],
-  "Emacr" => [0x00112],
-  "EmptySmallSquare" => [0x025FB],
-  "EmptyVerySmallSquare" => [0x025AB],
-  "Eogon" => [0x00118],
-  "Eopf" => [0x1D53C],
-  "Epsilon" => [0x00395],
-  "Equal" => [0x02A75],
-  "EqualTilde" => [0x02242],
-  "Equilibrium" => [0x021CC],
-  "Escr" => [0x02130],
-  "Esim" => [0x02A73],
-  "Eta" => [0x00397],
-  "Euml" => [0x000CB],
-  "Exists" => [0x02203],
-  "ExponentialE" => [0x02147],
-  "Fcy" => [0x00424],
-  "Ffr" => [0x1D509],
-  "FilledSmallSquare" => [0x025FC],
-  "FilledVerySmallSquare" => [0x025AA],
-  "Fopf" => [0x1D53D],
-  "ForAll" => [0x02200],
-  "Fouriertrf" => [0x02131],
-  "Fscr" => [0x02131],
-  "GJcy" => [0x00403],
-  "GT" => [0x0003E],
-  "Gamma" => [0x00393],
-  "Gammad" => [0x003DC],
-  "Gbreve" => [0x0011E],
-  "Gcedil" => [0x00122],
-  "Gcirc" => [0x0011C],
-  "Gcy" => [0x00413],
-  "Gdot" => [0x00120],
-  "Gfr" => [0x1D50A],
-  "Gg" => [0x022D9],
-  "Gopf" => [0x1D53E],
-  "GreaterEqual" => [0x02265],
-  "GreaterEqualLess" => [0x022DB],
-  "GreaterFullEqual" => [0x02267],
-  "GreaterGreater" => [0x02AA2],
-  "GreaterLess" => [0x02277],
-  "GreaterSlantEqual" => [0x02A7E],
-  "GreaterTilde" => [0x02273],
-  "Gscr" => [0x1D4A2],
-  "Gt" => [0x0226B],
-  "HARDcy" => [0x0042A],
-  "Hacek" => [0x002C7],
-  "Hat" => [0x0005E],
-  "Hcirc" => [0x00124],
-  "Hfr" => [0x0210C],
-  "HilbertSpace" => [0x0210B],
-  "Hopf" => [0x0210D],
-  "HorizontalLine" => [0x02500],
-  "Hscr" => [0x0210B],
-  "Hstrok" => [0x00126],
-  "HumpDownHump" => [0x0224E],
-  "HumpEqual" => [0x0224F],
-  "IEcy" => [0x00415],
-  "IJlig" => [0x00132],
-  "IOcy" => [0x00401],
-  "Iacute" => [0x000CD],
-  "Icirc" => [0x000CE],
-  "Icy" => [0x00418],
-  "Idot" => [0x00130],
-  "Ifr" => [0x02111],
-  "Igrave" => [0x000CC],
-  "Im" => [0x02111],
-  "Imacr" => [0x0012A],
-  "ImaginaryI" => [0x02148],
-  "Implies" => [0x021D2],
-  "Int" => [0x0222C],
-  "Integral" => [0x0222B],
-  "Intersection" => [0x022C2],
-  "InvisibleComma" => [0x02063],
-  "InvisibleTimes" => [0x02062],
-  "Iogon" => [0x0012E],
-  "Iopf" => [0x1D540],
-  "Iota" => [0x00399],
-  "Iscr" => [0x02110],
-  "Itilde" => [0x00128],
-  "Iukcy" => [0x00406],
-  "Iuml" => [0x000CF],
-  "Jcirc" => [0x00134],
-  "Jcy" => [0x00419],
-  "Jfr" => [0x1D50D],
-  "Jopf" => [0x1D541],
-  "Jscr" => [0x1D4A5],
-  "Jsercy" => [0x00408],
-  "Jukcy" => [0x00404],
-  "KHcy" => [0x00425],
-  "KJcy" => [0x0040C],
-  "Kappa" => [0x0039A],
-  "Kcedil" => [0x00136],
-  "Kcy" => [0x0041A],
-  "Kfr" => [0x1D50E],
-  "Kopf" => [0x1D542],
-  "Kscr" => [0x1D4A6],
-  "LJcy" => [0x00409],
-  "LT" => [0x0003C],
-  "Lacute" => [0x00139],
-  "Lambda" => [0x0039B],
-  "Lang" => [0x027EA],
-  "Laplacetrf" => [0x02112],
-  "Larr" => [0x0219E],
-  "Lcaron" => [0x0013D],
-  "Lcedil" => [0x0013B],
-  "Lcy" => [0x0041B],
-  "LeftAngleBracket" => [0x027E8],
-  "LeftArrow" => [0x02190],
-  "LeftArrowBar" => [0x021E4],
-  "LeftArrowRightArrow" => [0x021C6],
-  "LeftCeiling" => [0x02308],
-  "LeftDoubleBracket" => [0x027E6],
-  "LeftDownTeeVector" => [0x02961],
-  "LeftDownVector" => [0x021C3],
-  "LeftDownVectorBar" => [0x02959],
-  "LeftFloor" => [0x0230A],
-  "LeftRightArrow" => [0x02194],
-  "LeftRightVector" => [0x0294E],
-  "LeftTee" => [0x022A3],
-  "LeftTeeArrow" => [0x021A4],
-  "LeftTeeVector" => [0x0295A],
-  "LeftTriangle" => [0x022B2],
-  "LeftTriangleBar" => [0x029CF],
-  "LeftTriangleEqual" => [0x022B4],
-  "LeftUpDownVector" => [0x02951],
-  "LeftUpTeeVector" => [0x02960],
-  "LeftUpVector" => [0x021BF],
-  "LeftUpVectorBar" => [0x02958],
-  "LeftVector" => [0x021BC],
-  "LeftVectorBar" => [0x02952],
-  "Leftarrow" => [0x021D0],
-  "Leftrightarrow" => [0x021D4],
-  "LessEqualGreater" => [0x022DA],
-  "LessFullEqual" => [0x02266],
-  "LessGreater" => [0x02276],
-  "LessLess" => [0x02AA1],
-  "LessSlantEqual" => [0x02A7D],
-  "LessTilde" => [0x02272],
-  "Lfr" => [0x1D50F],
-  "Ll" => [0x022D8],
-  "Lleftarrow" => [0x021DA],
-  "Lmidot" => [0x0013F],
-  "LongLeftArrow" => [0x027F5],
-  "LongLeftRightArrow" => [0x027F7],
-  "LongRightArrow" => [0x027F6],
-  "Longleftarrow" => [0x027F8],
-  "Longleftrightarrow" => [0x027FA],
-  "Longrightarrow" => [0x027F9],
-  "Lopf" => [0x1D543],
-  "LowerLeftArrow" => [0x02199],
-  "LowerRightArrow" => [0x02198],
-  "Lscr" => [0x02112],
-  "Lsh" => [0x021B0],
-  "Lstrok" => [0x00141],
-  "Lt" => [0x0226A],
-  "Map" => [0x02905],
-  "Mcy" => [0x0041C],
-  "MediumSpace" => [0x0205F],
-  "Mellintrf" => [0x02133],
-  "Mfr" => [0x1D510],
-  "MinusPlus" => [0x02213],
-  "Mopf" => [0x1D544],
-  "Mscr" => [0x02133],
-  "Mu" => [0x0039C],
-  "NJcy" => [0x0040A],
-  "Nacute" => [0x00143],
-  "Ncaron" => [0x00147],
-  "Ncedil" => [0x00145],
-  "Ncy" => [0x0041D],
-  "NegativeMediumSpace" => [0x0200B],
-  "NegativeThickSpace" => [0x0200B],
-  "NegativeThinSpace" => [0x0200B],
-  "NegativeVeryThinSpace" => [0x0200B],
-  "NestedGreaterGreater" => [0x0226B],
-  "NestedLessLess" => [0x0226A],
-  "NewLine" => [0x0000A],
-  "Nfr" => [0x1D511],
-  "NoBreak" => [0x02060],
-  "NonBreakingSpace" => [0x000A0],
-  "Nopf" => [0x02115],
-  "Not" => [0x02AEC],
-  "NotCongruent" => [0x02262],
-  "NotCupCap" => [0x0226D],
-  "NotDoubleVerticalBar" => [0x02226],
-  "NotElement" => [0x02209],
-  "NotEqual" => [0x02260],
-  "NotEqualTilde" => [0x02242, 0x00338],
-  "NotExists" => [0x02204],
-  "NotGreater" => [0x0226F],
-  "NotGreaterEqual" => [0x02271],
-  "NotGreaterFullEqual" => [0x02267, 0x00338],
-  "NotGreaterGreater" => [0x0226B, 0x00338],
-  "NotGreaterLess" => [0x02279],
-  "NotGreaterSlantEqual" => [0x02A7E, 0x00338],
-  "NotGreaterTilde" => [0x02275],
-  "NotHumpDownHump" => [0x0224E, 0x00338],
-  "NotHumpEqual" => [0x0224F, 0x00338],
-  "NotLeftTriangle" => [0x022EA],
-  "NotLeftTriangleBar" => [0x029CF, 0x00338],
-  "NotLeftTriangleEqual" => [0x022EC],
-  "NotLess" => [0x0226E],
-  "NotLessEqual" => [0x02270],
-  "NotLessGreater" => [0x02278],
-  "NotLessLess" => [0x0226A, 0x00338],
-  "NotLessSlantEqual" => [0x02A7D, 0x00338],
-  "NotLessTilde" => [0x02274],
-  "NotNestedGreaterGreater" => [0x02AA2, 0x00338],
-  "NotNestedLessLess" => [0x02AA1, 0x00338],
-  "NotPrecedes" => [0x02280],
-  "NotPrecedesEqual" => [0x02AAF, 0x00338],
-  "NotPrecedesSlantEqual" => [0x022E0],
-  "NotReverseElement" => [0x0220C],
-  "NotRightTriangle" => [0x022EB],
-  "NotRightTriangleBar" => [0x029D0, 0x00338],
-  "NotRightTriangleEqual" => [0x022ED],
-  "NotSquareSubset" => [0x0228F, 0x00338],
-  "NotSquareSubsetEqual" => [0x022E2],
-  "NotSquareSuperset" => [0x02290, 0x00338],
-  "NotSquareSupersetEqual" => [0x022E3],
-  "NotSubset" => [0x02282, 0x020D2],
-  "NotSubsetEqual" => [0x02288],
-  "NotSucceeds" => [0x02281],
-  "NotSucceedsEqual" => [0x02AB0, 0x00338],
-  "NotSucceedsSlantEqual" => [0x022E1],
-  "NotSucceedsTilde" => [0x0227F, 0x00338],
-  "NotSuperset" => [0x02283, 0x020D2],
-  "NotSupersetEqual" => [0x02289],
-  "NotTilde" => [0x02241],
-  "NotTildeEqual" => [0x02244],
-  "NotTildeFullEqual" => [0x02247],
-  "NotTildeTilde" => [0x02249],
-  "NotVerticalBar" => [0x02224],
-  "Nscr" => [0x1D4A9],
-  "Ntilde" => [0x000D1],
-  "Nu" => [0x0039D],
-  "OElig" => [0x00152],
-  "Oacute" => [0x000D3],
-  "Ocirc" => [0x000D4],
-  "Ocy" => [0x0041E],
-  "Odblac" => [0x00150],
-  "Ofr" => [0x1D512],
-  "Ograve" => [0x000D2],
-  "Omacr" => [0x0014C],
-  "Omega" => [0x003A9],
-  "Omicron" => [0x0039F],
-  "Oopf" => [0x1D546],
-  "OpenCurlyDoubleQuote" => [0x0201C],
-  "OpenCurlyQuote" => [0x02018],
-  "Or" => [0x02A54],
-  "Oscr" => [0x1D4AA],
-  "Oslash" => [0x000D8],
-  "Otilde" => [0x000D5],
-  "Otimes" => [0x02A37],
-  "Ouml" => [0x000D6],
-  "OverBar" => [0x0203E],
-  "OverBrace" => [0x023DE],
-  "OverBracket" => [0x023B4],
-  "OverParenthesis" => [0x023DC],
-  "PartialD" => [0x02202],
-  "Pcy" => [0x0041F],
-  "Pfr" => [0x1D513],
-  "Phi" => [0x003A6],
-  "Pi" => [0x003A0],
-  "PlusMinus" => [0x000B1],
-  "Poincareplane" => [0x0210C],
-  "Popf" => [0x02119],
-  "Pr" => [0x02ABB],
-  "Precedes" => [0x0227A],
-  "PrecedesEqual" => [0x02AAF],
-  "PrecedesSlantEqual" => [0x0227C],
-  "PrecedesTilde" => [0x0227E],
-  "Prime" => [0x02033],
-  "Product" => [0x0220F],
-  "Proportion" => [0x02237],
-  "Proportional" => [0x0221D],
-  "Pscr" => [0x1D4AB],
-  "Psi" => [0x003A8],
-  "QUOT" => [0x00022],
-  "Qfr" => [0x1D514],
-  "Qopf" => [0x0211A],
-  "Qscr" => [0x1D4AC],
-  "RBarr" => [0x02910],
-  "REG" => [0x000AE],
-  "Racute" => [0x00154],
-  "Rang" => [0x027EB],
-  "Rarr" => [0x021A0],
-  "Rarrtl" => [0x02916],
-  "Rcaron" => [0x00158],
-  "Rcedil" => [0x00156],
-  "Rcy" => [0x00420],
-  "Re" => [0x0211C],
-  "ReverseElement" => [0x0220B],
-  "ReverseEquilibrium" => [0x021CB],
-  "ReverseUpEquilibrium" => [0x0296F],
-  "Rfr" => [0x0211C],
-  "Rho" => [0x003A1],
-  "RightAngleBracket" => [0x027E9],
-  "RightArrow" => [0x02192],
-  "RightArrowBar" => [0x021E5],
-  "RightArrowLeftArrow" => [0x021C4],
-  "RightCeiling" => [0x02309],
-  "RightDoubleBracket" => [0x027E7],
-  "RightDownTeeVector" => [0x0295D],
-  "RightDownVector" => [0x021C2],
-  "RightDownVectorBar" => [0x02955],
-  "RightFloor" => [0x0230B],
-  "RightTee" => [0x022A2],
-  "RightTeeArrow" => [0x021A6],
-  "RightTeeVector" => [0x0295B],
-  "RightTriangle" => [0x022B3],
-  "RightTriangleBar" => [0x029D0],
-  "RightTriangleEqual" => [0x022B5],
-  "RightUpDownVector" => [0x0294F],
-  "RightUpTeeVector" => [0x0295C],
-  "RightUpVector" => [0x021BE],
-  "RightUpVectorBar" => [0x02954],
-  "RightVector" => [0x021C0],
-  "RightVectorBar" => [0x02953],
-  "Rightarrow" => [0x021D2],
-  "Ropf" => [0x0211D],
-  "RoundImplies" => [0x02970],
-  "Rrightarrow" => [0x021DB],
-  "Rscr" => [0x0211B],
-  "Rsh" => [0x021B1],
-  "RuleDelayed" => [0x029F4],
-  "SHCHcy" => [0x00429],
-  "SHcy" => [0x00428],
-  "SOFTcy" => [0x0042C],
-  "Sacute" => [0x0015A],
-  "Sc" => [0x02ABC],
-  "Scaron" => [0x00160],
-  "Scedil" => [0x0015E],
-  "Scirc" => [0x0015C],
-  "Scy" => [0x00421],
-  "Sfr" => [0x1D516],
-  "ShortDownArrow" => [0x02193],
-  "ShortLeftArrow" => [0x02190],
-  "ShortRightArrow" => [0x02192],
-  "ShortUpArrow" => [0x02191],
-  "Sigma" => [0x003A3],
-  "SmallCircle" => [0x02218],
-  "Sopf" => [0x1D54A],
-  "Sqrt" => [0x0221A],
-  "Square" => [0x025A1],
-  "SquareIntersection" => [0x02293],
-  "SquareSubset" => [0x0228F],
-  "SquareSubsetEqual" => [0x02291],
-  "SquareSuperset" => [0x02290],
-  "SquareSupersetEqual" => [0x02292],
-  "SquareUnion" => [0x02294],
-  "Sscr" => [0x1D4AE],
-  "Star" => [0x022C6],
-  "Sub" => [0x022D0],
-  "Subset" => [0x022D0],
-  "SubsetEqual" => [0x02286],
-  "Succeeds" => [0x0227B],
-  "SucceedsEqual" => [0x02AB0],
-  "SucceedsSlantEqual" => [0x0227D],
-  "SucceedsTilde" => [0x0227F],
-  "SuchThat" => [0x0220B],
-  "Sum" => [0x02211],
-  "Sup" => [0x022D1],
-  "Superset" => [0x02283],
-  "SupersetEqual" => [0x02287],
-  "Supset" => [0x022D1],
-  "THORN" => [0x000DE],
-  "TRADE" => [0x02122],
-  "TSHcy" => [0x0040B],
-  "TScy" => [0x00426],
-  "Tab" => [0x00009],
-  "Tau" => [0x003A4],
-  "Tcaron" => [0x00164],
-  "Tcedil" => [0x00162],
-  "Tcy" => [0x00422],
-  "Tfr" => [0x1D517],
-  "Therefore" => [0x02234],
-  "Theta" => [0x00398],
-  "ThickSpace" => [0x0205F, 0x0200A],
-  "ThinSpace" => [0x02009],
-  "Tilde" => [0x0223C],
-  "TildeEqual" => [0x02243],
-  "TildeFullEqual" => [0x02245],
-  "TildeTilde" => [0x02248],
-  "Topf" => [0x1D54B],
-  "TripleDot" => [0x020DB],
-  "Tscr" => [0x1D4AF],
-  "Tstrok" => [0x00166],
-  "Uacute" => [0x000DA],
-  "Uarr" => [0x0219F],
-  "Uarrocir" => [0x02949],
-  "Ubrcy" => [0x0040E],
-  "Ubreve" => [0x0016C],
-  "Ucirc" => [0x000DB],
-  "Ucy" => [0x00423],
-  "Udblac" => [0x00170],
-  "Ufr" => [0x1D518],
-  "Ugrave" => [0x000D9],
-  "Umacr" => [0x0016A],
-  "UnderBar" => [0x0005F],
-  "UnderBrace" => [0x023DF],
-  "UnderBracket" => [0x023B5],
-  "UnderParenthesis" => [0x023DD],
-  "Union" => [0x022C3],
-  "UnionPlus" => [0x0228E],
-  "Uogon" => [0x00172],
-  "Uopf" => [0x1D54C],
-  "UpArrow" => [0x02191],
-  "UpArrowBar" => [0x02912],
-  "UpArrowDownArrow" => [0x021C5],
-  "UpDownArrow" => [0x02195],
-  "UpEquilibrium" => [0x0296E],
-  "UpTee" => [0x022A5],
-  "UpTeeArrow" => [0x021A5],
-  "Uparrow" => [0x021D1],
-  "Updownarrow" => [0x021D5],
-  "UpperLeftArrow" => [0x02196],
-  "UpperRightArrow" => [0x02197],
-  "Upsi" => [0x003D2],
-  "Upsilon" => [0x003A5],
-  "Uring" => [0x0016E],
-  "Uscr" => [0x1D4B0],
-  "Utilde" => [0x00168],
-  "Uuml" => [0x000DC],
-  "VDash" => [0x022AB],
-  "Vbar" => [0x02AEB],
-  "Vcy" => [0x00412],
-  "Vdash" => [0x022A9],
-  "Vdashl" => [0x02AE6],
-  "Vee" => [0x022C1],
-  "Verbar" => [0x02016],
-  "Vert" => [0x02016],
-  "VerticalBar" => [0x02223],
-  "VerticalLine" => [0x0007C],
-  "VerticalSeparator" => [0x02758],
-  "VerticalTilde" => [0x02240],
-  "VeryThinSpace" => [0x0200A],
-  "Vfr" => [0x1D519],
-  "Vopf" => [0x1D54D],
-  "Vscr" => [0x1D4B1],
-  "Vvdash" => [0x022AA],
-  "Wcirc" => [0x00174],
-  "Wedge" => [0x022C0],
-  "Wfr" => [0x1D51A],
-  "Wopf" => [0x1D54E],
-  "Wscr" => [0x1D4B2],
-  "Xfr" => [0x1D51B],
-  "Xi" => [0x0039E],
-  "Xopf" => [0x1D54F],
-  "Xscr" => [0x1D4B3],
-  "YAcy" => [0x0042F],
-  "YIcy" => [0x00407],
-  "YUcy" => [0x0042E],
-  "Yacute" => [0x000DD],
-  "Ycirc" => [0x00176],
-  "Ycy" => [0x0042B],
-  "Yfr" => [0x1D51C],
-  "Yopf" => [0x1D550],
-  "Yscr" => [0x1D4B4],
-  "Yuml" => [0x00178],
-  "ZHcy" => [0x00416],
-  "Zacute" => [0x00179],
-  "Zcaron" => [0x0017D],
-  "Zcy" => [0x00417],
-  "Zdot" => [0x0017B],
-  "ZeroWidthSpace" => [0x0200B],
-  "Zeta" => [0x00396],
-  "Zfr" => [0x02128],
-  "Zopf" => [0x02124],
-  "Zscr" => [0x1D4B5],
-  "aacute" => [0x000E1],
-  "abreve" => [0x00103],
-  "ac" => [0x0223E],
-  "acE" => [0x0223E, 0x00333],
-  "acd" => [0x0223F],
-  "acirc" => [0x000E2],
-  "acute" => [0x000B4],
-  "acy" => [0x00430],
-  "aelig" => [0x000E6],
-  "af" => [0x02061],
-  "afr" => [0x1D51E],
-  "agrave" => [0x000E0],
-  "alefsym" => [0x02135],
-  "aleph" => [0x02135],
-  "alpha" => [0x003B1],
-  "amacr" => [0x00101],
-  "amalg" => [0x02A3F],
-  "amp" => [0x00026],
-  "and" => [0x02227],
-  "andand" => [0x02A55],
-  "andd" => [0x02A5C],
-  "andslope" => [0x02A58],
-  "andv" => [0x02A5A],
-  "ang" => [0x02220],
-  "ange" => [0x029A4],
-  "angle" => [0x02220],
-  "angmsd" => [0x02221],
-  "angmsdaa" => [0x029A8],
-  "angmsdab" => [0x029A9],
-  "angmsdac" => [0x029AA],
-  "angmsdad" => [0x029AB],
-  "angmsdae" => [0x029AC],
-  "angmsdaf" => [0x029AD],
-  "angmsdag" => [0x029AE],
-  "angmsdah" => [0x029AF],
-  "angrt" => [0x0221F],
-  "angrtvb" => [0x022BE],
-  "angrtvbd" => [0x0299D],
-  "angsph" => [0x02222],
-  "angst" => [0x000C5],
-  "angzarr" => [0x0237C],
-  "aogon" => [0x00105],
-  "aopf" => [0x1D552],
-  "ap" => [0x02248],
-  "apE" => [0x02A70],
-  "apacir" => [0x02A6F],
-  "ape" => [0x0224A],
-  "apid" => [0x0224B],
-  "apos" => [0x00027],
-  "approx" => [0x02248],
-  "approxeq" => [0x0224A],
-  "aring" => [0x000E5],
-  "ascr" => [0x1D4B6],
-  "ast" => [0x0002A],
-  "asymp" => [0x02248],
-  "asympeq" => [0x0224D],
-  "atilde" => [0x000E3],
-  "auml" => [0x000E4],
-  "awconint" => [0x02233],
-  "awint" => [0x02A11],
-  "bNot" => [0x02AED],
-  "backcong" => [0x0224C],
-  "backepsilon" => [0x003F6],
-  "backprime" => [0x02035],
-  "backsim" => [0x0223D],
-  "backsimeq" => [0x022CD],
-  "barvee" => [0x022BD],
-  "barwed" => [0x02305],
-  "barwedge" => [0x02305],
-  "bbrk" => [0x023B5],
-  "bbrktbrk" => [0x023B6],
-  "bcong" => [0x0224C],
-  "bcy" => [0x00431],
-  "bdquo" => [0x0201E],
-  "becaus" => [0x02235],
-  "because" => [0x02235],
-  "bemptyv" => [0x029B0],
-  "bepsi" => [0x003F6],
-  "bernou" => [0x0212C],
-  "beta" => [0x003B2],
-  "beth" => [0x02136],
-  "between" => [0x0226C],
-  "bfr" => [0x1D51F],
-  "bigcap" => [0x022C2],
-  "bigcirc" => [0x025EF],
-  "bigcup" => [0x022C3],
-  "bigodot" => [0x02A00],
-  "bigoplus" => [0x02A01],
-  "bigotimes" => [0x02A02],
-  "bigsqcup" => [0x02A06],
-  "bigstar" => [0x02605],
-  "bigtriangledown" => [0x025BD],
-  "bigtriangleup" => [0x025B3],
-  "biguplus" => [0x02A04],
-  "bigvee" => [0x022C1],
-  "bigwedge" => [0x022C0],
-  "bkarow" => [0x0290D],
-  "blacklozenge" => [0x029EB],
-  "blacksquare" => [0x025AA],
-  "blacktriangle" => [0x025B4],
-  "blacktriangledown" => [0x025BE],
-  "blacktriangleleft" => [0x025C2],
-  "blacktriangleright" => [0x025B8],
-  "blank" => [0x02423],
-  "blk12" => [0x02592],
-  "blk14" => [0x02591],
-  "blk34" => [0x02593],
-  "block" => [0x02588],
-  "bne" => [0x0003D, 0x020E5],
-  "bnequiv" => [0x02261, 0x020E5],
-  "bnot" => [0x02310],
-  "bopf" => [0x1D553],
-  "bot" => [0x022A5],
-  "bottom" => [0x022A5],
-  "bowtie" => [0x022C8],
-  "boxDL" => [0x02557],
-  "boxDR" => [0x02554],
-  "boxDl" => [0x02556],
-  "boxDr" => [0x02553],
-  "boxH" => [0x02550],
-  "boxHD" => [0x02566],
-  "boxHU" => [0x02569],
-  "boxHd" => [0x02564],
-  "boxHu" => [0x02567],
-  "boxUL" => [0x0255D],
-  "boxUR" => [0x0255A],
-  "boxUl" => [0x0255C],
-  "boxUr" => [0x02559],
-  "boxV" => [0x02551],
-  "boxVH" => [0x0256C],
-  "boxVL" => [0x02563],
-  "boxVR" => [0x02560],
-  "boxVh" => [0x0256B],
-  "boxVl" => [0x02562],
-  "boxVr" => [0x0255F],
-  "boxbox" => [0x029C9],
-  "boxdL" => [0x02555],
-  "boxdR" => [0x02552],
-  "boxdl" => [0x02510],
-  "boxdr" => [0x0250C],
-  "boxh" => [0x02500],
-  "boxhD" => [0x02565],
-  "boxhU" => [0x02568],
-  "boxhd" => [0x0252C],
-  "boxhu" => [0x02534],
-  "boxminus" => [0x0229F],
-  "boxplus" => [0x0229E],
-  "boxtimes" => [0x022A0],
-  "boxuL" => [0x0255B],
-  "boxuR" => [0x02558],
-  "boxul" => [0x02518],
-  "boxur" => [0x02514],
-  "boxv" => [0x02502],
-  "boxvH" => [0x0256A],
-  "boxvL" => [0x02561],
-  "boxvR" => [0x0255E],
-  "boxvh" => [0x0253C],
-  "boxvl" => [0x02524],
-  "boxvr" => [0x0251C],
-  "bprime" => [0x02035],
-  "breve" => [0x002D8],
-  "brvbar" => [0x000A6],
-  "bscr" => [0x1D4B7],
-  "bsemi" => [0x0204F],
-  "bsim" => [0x0223D],
-  "bsime" => [0x022CD],
-  "bsol" => [0x0005C],
-  "bsolb" => [0x029C5],
-  "bsolhsub" => [0x027C8],
-  "bull" => [0x02022],
-  "bullet" => [0x02022],
-  "bump" => [0x0224E],
-  "bumpE" => [0x02AAE],
-  "bumpe" => [0x0224F],
-  "bumpeq" => [0x0224F],
-  "cacute" => [0x00107],
-  "cap" => [0x02229],
-  "capand" => [0x02A44],
-  "capbrcup" => [0x02A49],
-  "capcap" => [0x02A4B],
-  "capcup" => [0x02A47],
-  "capdot" => [0x02A40],
-  "caps" => [0x02229, 0x0FE00],
-  "caret" => [0x02041],
-  "caron" => [0x002C7],
-  "ccaps" => [0x02A4D],
-  "ccaron" => [0x0010D],
-  "ccedil" => [0x000E7],
-  "ccirc" => [0x00109],
-  "ccups" => [0x02A4C],
-  "ccupssm" => [0x02A50],
-  "cdot" => [0x0010B],
-  "cedil" => [0x000B8],
-  "cemptyv" => [0x029B2],
-  "cent" => [0x000A2],
-  "centerdot" => [0x000B7],
-  "cfr" => [0x1D520],
-  "chcy" => [0x00447],
-  "check" => [0x02713],
-  "checkmark" => [0x02713],
-  "chi" => [0x003C7],
-  "cir" => [0x025CB],
-  "cirE" => [0x029C3],
-  "circ" => [0x002C6],
-  "circeq" => [0x02257],
-  "circlearrowleft" => [0x021BA],
-  "circlearrowright" => [0x021BB],
-  "circledR" => [0x000AE],
-  "circledS" => [0x024C8],
-  "circledast" => [0x0229B],
-  "circledcirc" => [0x0229A],
-  "circleddash" => [0x0229D],
-  "cire" => [0x02257],
-  "cirfnint" => [0x02A10],
-  "cirmid" => [0x02AEF],
-  "cirscir" => [0x029C2],
-  "clubs" => [0x02663],
-  "clubsuit" => [0x02663],
-  "colon" => [0x0003A],
-  "colone" => [0x02254],
-  "coloneq" => [0x02254],
-  "comma" => [0x0002C],
-  "commat" => [0x00040],
-  "comp" => [0x02201],
-  "compfn" => [0x02218],
-  "complement" => [0x02201],
-  "complexes" => [0x02102],
-  "cong" => [0x02245],
-  "congdot" => [0x02A6D],
-  "conint" => [0x0222E],
-  "copf" => [0x1D554],
-  "coprod" => [0x02210],
-  "copy" => [0x000A9],
-  "copysr" => [0x02117],
-  "crarr" => [0x021B5],
-  "cross" => [0x02717],
-  "cscr" => [0x1D4B8],
-  "csub" => [0x02ACF],
-  "csube" => [0x02AD1],
-  "csup" => [0x02AD0],
-  "csupe" => [0x02AD2],
-  "ctdot" => [0x022EF],
-  "cudarrl" => [0x02938],
-  "cudarrr" => [0x02935],
-  "cuepr" => [0x022DE],
-  "cuesc" => [0x022DF],
-  "cularr" => [0x021B6],
-  "cularrp" => [0x0293D],
-  "cup" => [0x0222A],
-  "cupbrcap" => [0x02A48],
-  "cupcap" => [0x02A46],
-  "cupcup" => [0x02A4A],
-  "cupdot" => [0x0228D],
-  "cupor" => [0x02A45],
-  "cups" => [0x0222A, 0x0FE00],
-  "curarr" => [0x021B7],
-  "curarrm" => [0x0293C],
-  "curlyeqprec" => [0x022DE],
-  "curlyeqsucc" => [0x022DF],
-  "curlyvee" => [0x022CE],
-  "curlywedge" => [0x022CF],
-  "curren" => [0x000A4],
-  "curvearrowleft" => [0x021B6],
-  "curvearrowright" => [0x021B7],
-  "cuvee" => [0x022CE],
-  "cuwed" => [0x022CF],
-  "cwconint" => [0x02232],
-  "cwint" => [0x02231],
-  "cylcty" => [0x0232D],
-  "dArr" => [0x021D3],
-  "dHar" => [0x02965],
-  "dagger" => [0x02020],
-  "daleth" => [0x02138],
-  "darr" => [0x02193],
-  "dash" => [0x02010],
-  "dashv" => [0x022A3],
-  "dbkarow" => [0x0290F],
-  "dblac" => [0x002DD],
-  "dcaron" => [0x0010F],
-  "dcy" => [0x00434],
-  "dd" => [0x02146],
-  "ddagger" => [0x02021],
-  "ddarr" => [0x021CA],
-  "ddotseq" => [0x02A77],
-  "deg" => [0x000B0],
-  "delta" => [0x003B4],
-  "demptyv" => [0x029B1],
-  "dfisht" => [0x0297F],
-  "dfr" => [0x1D521],
-  "dharl" => [0x021C3],
-  "dharr" => [0x021C2],
-  "diam" => [0x022C4],
-  "diamond" => [0x022C4],
-  "diamondsuit" => [0x02666],
-  "diams" => [0x02666],
-  "die" => [0x000A8],
-  "digamma" => [0x003DD],
-  "disin" => [0x022F2],
-  "div" => [0x000F7],
-  "divide" => [0x000F7],
-  "divideontimes" => [0x022C7],
-  "divonx" => [0x022C7],
-  "djcy" => [0x00452],
-  "dlcorn" => [0x0231E],
-  "dlcrop" => [0x0230D],
-  "dollar" => [0x00024],
-  "dopf" => [0x1D555],
-  "dot" => [0x002D9],
-  "doteq" => [0x02250],
-  "doteqdot" => [0x02251],
-  "dotminus" => [0x02238],
-  "dotplus" => [0x02214],
-  "dotsquare" => [0x022A1],
-  "doublebarwedge" => [0x02306],
-  "downarrow" => [0x02193],
-  "downdownarrows" => [0x021CA],
-  "downharpoonleft" => [0x021C3],
-  "downharpoonright" => [0x021C2],
-  "drbkarow" => [0x02910],
-  "drcorn" => [0x0231F],
-  "drcrop" => [0x0230C],
-  "dscr" => [0x1D4B9],
-  "dscy" => [0x00455],
-  "dsol" => [0x029F6],
-  "dstrok" => [0x00111],
-  "dtdot" => [0x022F1],
-  "dtri" => [0x025BF],
-  "dtrif" => [0x025BE],
-  "duarr" => [0x021F5],
-  "duhar" => [0x0296F],
-  "dwangle" => [0x029A6],
-  "dzcy" => [0x0045F],
-  "dzigrarr" => [0x027FF],
-  "eDDot" => [0x02A77],
-  "eDot" => [0x02251],
-  "eacute" => [0x000E9],
-  "easter" => [0x02A6E],
-  "ecaron" => [0x0011B],
-  "ecir" => [0x02256],
-  "ecirc" => [0x000EA],
-  "ecolon" => [0x02255],
-  "ecy" => [0x0044D],
-  "edot" => [0x00117],
-  "ee" => [0x02147],
-  "efDot" => [0x02252],
-  "efr" => [0x1D522],
-  "eg" => [0x02A9A],
-  "egrave" => [0x000E8],
-  "egs" => [0x02A96],
-  "egsdot" => [0x02A98],
-  "el" => [0x02A99],
-  "elinters" => [0x023E7],
-  "ell" => [0x02113],
-  "els" => [0x02A95],
-  "elsdot" => [0x02A97],
-  "emacr" => [0x00113],
-  "empty" => [0x02205],
-  "emptyset" => [0x02205],
-  "emptyv" => [0x02205],
-  "emsp" => [0x02003],
-  "emsp13" => [0x02004],
-  "emsp14" => [0x02005],
-  "eng" => [0x0014B],
-  "ensp" => [0x02002],
-  "eogon" => [0x00119],
-  "eopf" => [0x1D556],
-  "epar" => [0x022D5],
-  "eparsl" => [0x029E3],
-  "eplus" => [0x02A71],
-  "epsi" => [0x003B5],
-  "epsilon" => [0x003B5],
-  "epsiv" => [0x003F5],
-  "eqcirc" => [0x02256],
-  "eqcolon" => [0x02255],
-  "eqsim" => [0x02242],
-  "eqslantgtr" => [0x02A96],
-  "eqslantless" => [0x02A95],
-  "equals" => [0x0003D],
-  "equest" => [0x0225F],
-  "equiv" => [0x02261],
-  "equivDD" => [0x02A78],
-  "eqvparsl" => [0x029E5],
-  "erDot" => [0x02253],
-  "erarr" => [0x02971],
-  "escr" => [0x0212F],
-  "esdot" => [0x02250],
-  "esim" => [0x02242],
-  "eta" => [0x003B7],
-  "eth" => [0x000F0],
-  "euml" => [0x000EB],
-  "euro" => [0x020AC],
-  "excl" => [0x00021],
-  "exist" => [0x02203],
-  "expectation" => [0x02130],
-  "exponentiale" => [0x02147],
-  "fallingdotseq" => [0x02252],
-  "fcy" => [0x00444],
-  "female" => [0x02640],
-  "ffilig" => [0x0FB03],
-  "fflig" => [0x0FB00],
-  "ffllig" => [0x0FB04],
-  "ffr" => [0x1D523],
-  "filig" => [0x0FB01],
-  "fjlig" => [0x00066, 0x0006A],
-  "flat" => [0x0266D],
-  "fllig" => [0x0FB02],
-  "fltns" => [0x025B1],
-  "fnof" => [0x00192],
-  "fopf" => [0x1D557],
-  "forall" => [0x02200],
-  "fork" => [0x022D4],
-  "forkv" => [0x02AD9],
-  "fpartint" => [0x02A0D],
-  "frac12" => [0x000BD],
-  "frac13" => [0x02153],
-  "frac14" => [0x000BC],
-  "frac15" => [0x02155],
-  "frac16" => [0x02159],
-  "frac18" => [0x0215B],
-  "frac23" => [0x02154],
-  "frac25" => [0x02156],
-  "frac34" => [0x000BE],
-  "frac35" => [0x02157],
-  "frac38" => [0x0215C],
-  "frac45" => [0x02158],
-  "frac56" => [0x0215A],
-  "frac58" => [0x0215D],
-  "frac78" => [0x0215E],
-  "frasl" => [0x02044],
-  "frown" => [0x02322],
-  "fscr" => [0x1D4BB],
-  "gE" => [0x02267],
-  "gEl" => [0x02A8C],
-  "gacute" => [0x001F5],
-  "gamma" => [0x003B3],
-  "gammad" => [0x003DD],
-  "gap" => [0x02A86],
-  "gbreve" => [0x0011F],
-  "gcirc" => [0x0011D],
-  "gcy" => [0x00433],
-  "gdot" => [0x00121],
-  "ge" => [0x02265],
-  "gel" => [0x022DB],
-  "geq" => [0x02265],
-  "geqq" => [0x02267],
-  "geqslant" => [0x02A7E],
-  "ges" => [0x02A7E],
-  "gescc" => [0x02AA9],
-  "gesdot" => [0x02A80],
-  "gesdoto" => [0x02A82],
-  "gesdotol" => [0x02A84],
-  "gesl" => [0x022DB, 0x0FE00],
-  "gesles" => [0x02A94],
-  "gfr" => [0x1D524],
-  "gg" => [0x0226B],
-  "ggg" => [0x022D9],
-  "gimel" => [0x02137],
-  "gjcy" => [0x00453],
-  "gl" => [0x02277],
-  "glE" => [0x02A92],
-  "gla" => [0x02AA5],
-  "glj" => [0x02AA4],
-  "gnE" => [0x02269],
-  "gnap" => [0x02A8A],
-  "gnapprox" => [0x02A8A],
-  "gne" => [0x02A88],
-  "gneq" => [0x02A88],
-  "gneqq" => [0x02269],
-  "gnsim" => [0x022E7],
-  "gopf" => [0x1D558],
-  "grave" => [0x00060],
-  "gscr" => [0x0210A],
-  "gsim" => [0x02273],
-  "gsime" => [0x02A8E],
-  "gsiml" => [0x02A90],
-  "gt" => [0x0003E],
-  "gtcc" => [0x02AA7],
-  "gtcir" => [0x02A7A],
-  "gtdot" => [0x022D7],
-  "gtlPar" => [0x02995],
-  "gtquest" => [0x02A7C],
-  "gtrapprox" => [0x02A86],
-  "gtrarr" => [0x02978],
-  "gtrdot" => [0x022D7],
-  "gtreqless" => [0x022DB],
-  "gtreqqless" => [0x02A8C],
-  "gtrless" => [0x02277],
-  "gtrsim" => [0x02273],
-  "gvertneqq" => [0x02269, 0x0FE00],
-  "gvnE" => [0x02269, 0x0FE00],
-  "hArr" => [0x021D4],
-  "hairsp" => [0x0200A],
-  "half" => [0x000BD],
-  "hamilt" => [0x0210B],
-  "hardcy" => [0x0044A],
-  "harr" => [0x02194],
-  "harrcir" => [0x02948],
-  "harrw" => [0x021AD],
-  "hbar" => [0x0210F],
-  "hcirc" => [0x00125],
-  "hearts" => [0x02665],
-  "heartsuit" => [0x02665],
-  "hellip" => [0x02026],
-  "hercon" => [0x022B9],
-  "hfr" => [0x1D525],
-  "hksearow" => [0x02925],
-  "hkswarow" => [0x02926],
-  "hoarr" => [0x021FF],
-  "homtht" => [0x0223B],
-  "hookleftarrow" => [0x021A9],
-  "hookrightarrow" => [0x021AA],
-  "hopf" => [0x1D559],
-  "horbar" => [0x02015],
-  "hscr" => [0x1D4BD],
-  "hslash" => [0x0210F],
-  "hstrok" => [0x00127],
-  "hybull" => [0x02043],
-  "hyphen" => [0x02010],
-  "iacute" => [0x000ED],
-  "ic" => [0x02063],
-  "icirc" => [0x000EE],
-  "icy" => [0x00438],
-  "iecy" => [0x00435],
-  "iexcl" => [0x000A1],
-  "iff" => [0x021D4],
-  "ifr" => [0x1D526],
-  "igrave" => [0x000EC],
-  "ii" => [0x02148],
-  "iiiint" => [0x02A0C],
-  "iiint" => [0x0222D],
-  "iinfin" => [0x029DC],
-  "iiota" => [0x02129],
-  "ijlig" => [0x00133],
-  "imacr" => [0x0012B],
-  "image" => [0x02111],
-  "imagline" => [0x02110],
-  "imagpart" => [0x02111],
-  "imath" => [0x00131],
-  "imof" => [0x022B7],
-  "imped" => [0x001B5],
-  "in" => [0x02208],
-  "incare" => [0x02105],
-  "infin" => [0x0221E],
-  "infintie" => [0x029DD],
-  "inodot" => [0x00131],
-  "int" => [0x0222B],
-  "intcal" => [0x022BA],
-  "integers" => [0x02124],
-  "intercal" => [0x022BA],
-  "intlarhk" => [0x02A17],
-  "intprod" => [0x02A3C],
-  "iocy" => [0x00451],
-  "iogon" => [0x0012F],
-  "iopf" => [0x1D55A],
-  "iota" => [0x003B9],
-  "iprod" => [0x02A3C],
-  "iquest" => [0x000BF],
-  "iscr" => [0x1D4BE],
-  "isin" => [0x02208],
-  "isinE" => [0x022F9],
-  "isindot" => [0x022F5],
-  "isins" => [0x022F4],
-  "isinsv" => [0x022F3],
-  "isinv" => [0x02208],
-  "it" => [0x02062],
-  "itilde" => [0x00129],
-  "iukcy" => [0x00456],
-  "iuml" => [0x000EF],
-  "jcirc" => [0x00135],
-  "jcy" => [0x00439],
-  "jfr" => [0x1D527],
-  "jmath" => [0x00237],
-  "jopf" => [0x1D55B],
-  "jscr" => [0x1D4BF],
-  "jsercy" => [0x00458],
-  "jukcy" => [0x00454],
-  "kappa" => [0x003BA],
-  "kappav" => [0x003F0],
-  "kcedil" => [0x00137],
-  "kcy" => [0x0043A],
-  "kfr" => [0x1D528],
-  "kgreen" => [0x00138],
-  "khcy" => [0x00445],
-  "kjcy" => [0x0045C],
-  "kopf" => [0x1D55C],
-  "kscr" => [0x1D4C0],
-  "lAarr" => [0x021DA],
-  "lArr" => [0x021D0],
-  "lAtail" => [0x0291B],
-  "lBarr" => [0x0290E],
-  "lE" => [0x02266],
-  "lEg" => [0x02A8B],
-  "lHar" => [0x02962],
-  "lacute" => [0x0013A],
-  "laemptyv" => [0x029B4],
-  "lagran" => [0x02112],
-  "lambda" => [0x003BB],
-  "lang" => [0x027E8],
-  "langd" => [0x02991],
-  "langle" => [0x027E8],
-  "lap" => [0x02A85],
-  "laquo" => [0x000AB],
-  "larr" => [0x02190],
-  "larrb" => [0x021E4],
-  "larrbfs" => [0x0291F],
-  "larrfs" => [0x0291D],
-  "larrhk" => [0x021A9],
-  "larrlp" => [0x021AB],
-  "larrpl" => [0x02939],
-  "larrsim" => [0x02973],
-  "larrtl" => [0x021A2],
-  "lat" => [0x02AAB],
-  "latail" => [0x02919],
-  "late" => [0x02AAD],
-  "lates" => [0x02AAD, 0x0FE00],
-  "lbarr" => [0x0290C],
-  "lbbrk" => [0x02772],
-  "lbrace" => [0x0007B],
-  "lbrack" => [0x0005B],
-  "lbrke" => [0x0298B],
-  "lbrksld" => [0x0298F],
-  "lbrkslu" => [0x0298D],
-  "lcaron" => [0x0013E],
-  "lcedil" => [0x0013C],
-  "lceil" => [0x02308],
-  "lcub" => [0x0007B],
-  "lcy" => [0x0043B],
-  "ldca" => [0x02936],
-  "ldquo" => [0x0201C],
-  "ldquor" => [0x0201E],
-  "ldrdhar" => [0x02967],
-  "ldrushar" => [0x0294B],
-  "ldsh" => [0x021B2],
-  "le" => [0x02264],
-  "leftarrow" => [0x02190],
-  "leftarrowtail" => [0x021A2],
-  "leftharpoondown" => [0x021BD],
-  "leftharpoonup" => [0x021BC],
-  "leftleftarrows" => [0x021C7],
-  "leftrightarrow" => [0x02194],
-  "leftrightarrows" => [0x021C6],
-  "leftrightharpoons" => [0x021CB],
-  "leftrightsquigarrow" => [0x021AD],
-  "leftthreetimes" => [0x022CB],
-  "leg" => [0x022DA],
-  "leq" => [0x02264],
-  "leqq" => [0x02266],
-  "leqslant" => [0x02A7D],
-  "les" => [0x02A7D],
-  "lescc" => [0x02AA8],
-  "lesdot" => [0x02A7F],
-  "lesdoto" => [0x02A81],
-  "lesdotor" => [0x02A83],
-  "lesg" => [0x022DA, 0x0FE00],
-  "lesges" => [0x02A93],
-  "lessapprox" => [0x02A85],
-  "lessdot" => [0x022D6],
-  "lesseqgtr" => [0x022DA],
-  "lesseqqgtr" => [0x02A8B],
-  "lessgtr" => [0x02276],
-  "lesssim" => [0x02272],
-  "lfisht" => [0x0297C],
-  "lfloor" => [0x0230A],
-  "lfr" => [0x1D529],
-  "lg" => [0x02276],
-  "lgE" => [0x02A91],
-  "lhard" => [0x021BD],
-  "lharu" => [0x021BC],
-  "lharul" => [0x0296A],
-  "lhblk" => [0x02584],
-  "ljcy" => [0x00459],
-  "ll" => [0x0226A],
-  "llarr" => [0x021C7],
-  "llcorner" => [0x0231E],
-  "llhard" => [0x0296B],
-  "lltri" => [0x025FA],
-  "lmidot" => [0x00140],
-  "lmoust" => [0x023B0],
-  "lmoustache" => [0x023B0],
-  "lnE" => [0x02268],
-  "lnap" => [0x02A89],
-  "lnapprox" => [0x02A89],
-  "lne" => [0x02A87],
-  "lneq" => [0x02A87],
-  "lneqq" => [0x02268],
-  "lnsim" => [0x022E6],
-  "loang" => [0x027EC],
-  "loarr" => [0x021FD],
-  "lobrk" => [0x027E6],
-  "longleftarrow" => [0x027F5],
-  "longleftrightarrow" => [0x027F7],
-  "longmapsto" => [0x027FC],
-  "longrightarrow" => [0x027F6],
-  "looparrowleft" => [0x021AB],
-  "looparrowright" => [0x021AC],
-  "lopar" => [0x02985],
-  "lopf" => [0x1D55D],
-  "loplus" => [0x02A2D],
-  "lotimes" => [0x02A34],
-  "lowast" => [0x02217],
-  "lowbar" => [0x0005F],
-  "loz" => [0x025CA],
-  "lozenge" => [0x025CA],
-  "lozf" => [0x029EB],
-  "lpar" => [0x00028],
-  "lparlt" => [0x02993],
-  "lrarr" => [0x021C6],
-  "lrcorner" => [0x0231F],
-  "lrhar" => [0x021CB],
-  "lrhard" => [0x0296D],
-  "lrm" => [0x0200E],
-  "lrtri" => [0x022BF],
-  "lsaquo" => [0x02039],
-  "lscr" => [0x1D4C1],
-  "lsh" => [0x021B0],
-  "lsim" => [0x02272],
-  "lsime" => [0x02A8D],
-  "lsimg" => [0x02A8F],
-  "lsqb" => [0x0005B],
-  "lsquo" => [0x02018],
-  "lsquor" => [0x0201A],
-  "lstrok" => [0x00142],
-  "lt" => [0x0003C],
-  "ltcc" => [0x02AA6],
-  "ltcir" => [0x02A79],
-  "ltdot" => [0x022D6],
-  "lthree" => [0x022CB],
-  "ltimes" => [0x022C9],
-  "ltlarr" => [0x02976],
-  "ltquest" => [0x02A7B],
-  "ltrPar" => [0x02996],
-  "ltri" => [0x025C3],
-  "ltrie" => [0x022B4],
-  "ltrif" => [0x025C2],
-  "lurdshar" => [0x0294A],
-  "luruhar" => [0x02966],
-  "lvertneqq" => [0x02268, 0x0FE00],
-  "lvnE" => [0x02268, 0x0FE00],
-  "mDDot" => [0x0223A],
-  "macr" => [0x000AF],
-  "male" => [0x02642],
-  "malt" => [0x02720],
-  "maltese" => [0x02720],
-  "map" => [0x021A6],
-  "mapsto" => [0x021A6],
-  "mapstodown" => [0x021A7],
-  "mapstoleft" => [0x021A4],
-  "mapstoup" => [0x021A5],
-  "marker" => [0x025AE],
-  "mcomma" => [0x02A29],
-  "mcy" => [0x0043C],
-  "mdash" => [0x02014],
-  "measuredangle" => [0x02221],
-  "mfr" => [0x1D52A],
-  "mho" => [0x02127],
-  "micro" => [0x000B5],
-  "mid" => [0x02223],
-  "midast" => [0x0002A],
-  "midcir" => [0x02AF0],
-  "middot" => [0x000B7],
-  "minus" => [0x02212],
-  "minusb" => [0x0229F],
-  "minusd" => [0x02238],
-  "minusdu" => [0x02A2A],
-  "mlcp" => [0x02ADB],
-  "mldr" => [0x02026],
-  "mnplus" => [0x02213],
-  "models" => [0x022A7],
-  "mopf" => [0x1D55E],
-  "mp" => [0x02213],
-  "mscr" => [0x1D4C2],
-  "mstpos" => [0x0223E],
-  "mu" => [0x003BC],
-  "multimap" => [0x022B8],
-  "mumap" => [0x022B8],
-  "nGg" => [0x022D9, 0x00338],
-  "nGt" => [0x0226B, 0x020D2],
-  "nGtv" => [0x0226B, 0x00338],
-  "nLeftarrow" => [0x021CD],
-  "nLeftrightarrow" => [0x021CE],
-  "nLl" => [0x022D8, 0x00338],
-  "nLt" => [0x0226A, 0x020D2],
-  "nLtv" => [0x0226A, 0x00338],
-  "nRightarrow" => [0x021CF],
-  "nVDash" => [0x022AF],
-  "nVdash" => [0x022AE],
-  "nabla" => [0x02207],
-  "nacute" => [0x00144],
-  "nang" => [0x02220, 0x020D2],
-  "nap" => [0x02249],
-  "napE" => [0x02A70, 0x00338],
-  "napid" => [0x0224B, 0x00338],
-  "napos" => [0x00149],
-  "napprox" => [0x02249],
-  "natur" => [0x0266E],
-  "natural" => [0x0266E],
-  "naturals" => [0x02115],
-  "nbsp" => [0x000A0],
-  "nbump" => [0x0224E, 0x00338],
-  "nbumpe" => [0x0224F, 0x00338],
-  "ncap" => [0x02A43],
-  "ncaron" => [0x00148],
-  "ncedil" => [0x00146],
-  "ncong" => [0x02247],
-  "ncongdot" => [0x02A6D, 0x00338],
-  "ncup" => [0x02A42],
-  "ncy" => [0x0043D],
-  "ndash" => [0x02013],
-  "ne" => [0x02260],
-  "neArr" => [0x021D7],
-  "nearhk" => [0x02924],
-  "nearr" => [0x02197],
-  "nearrow" => [0x02197],
-  "nedot" => [0x02250, 0x00338],
-  "nequiv" => [0x02262],
-  "nesear" => [0x02928],
-  "nesim" => [0x02242, 0x00338],
-  "nexist" => [0x02204],
-  "nexists" => [0x02204],
-  "nfr" => [0x1D52B],
-  "ngE" => [0x02267, 0x00338],
-  "nge" => [0x02271],
-  "ngeq" => [0x02271],
-  "ngeqq" => [0x02267, 0x00338],
-  "ngeqslant" => [0x02A7E, 0x00338],
-  "nges" => [0x02A7E, 0x00338],
-  "ngsim" => [0x02275],
-  "ngt" => [0x0226F],
-  "ngtr" => [0x0226F],
-  "nhArr" => [0x021CE],
-  "nharr" => [0x021AE],
-  "nhpar" => [0x02AF2],
-  "ni" => [0x0220B],
-  "nis" => [0x022FC],
-  "nisd" => [0x022FA],
-  "niv" => [0x0220B],
-  "njcy" => [0x0045A],
-  "nlArr" => [0x021CD],
-  "nlE" => [0x02266, 0x00338],
-  "nlarr" => [0x0219A],
-  "nldr" => [0x02025],
-  "nle" => [0x02270],
-  "nleftarrow" => [0x0219A],
-  "nleftrightarrow" => [0x021AE],
-  "nleq" => [0x02270],
-  "nleqq" => [0x02266, 0x00338],
-  "nleqslant" => [0x02A7D, 0x00338],
-  "nles" => [0x02A7D, 0x00338],
-  "nless" => [0x0226E],
-  "nlsim" => [0x02274],
-  "nlt" => [0x0226E],
-  "nltri" => [0x022EA],
-  "nltrie" => [0x022EC],
-  "nmid" => [0x02224],
-  "nopf" => [0x1D55F],
-  "not" => [0x000AC],
-  "notin" => [0x02209],
-  "notinE" => [0x022F9, 0x00338],
-  "notindot" => [0x022F5, 0x00338],
-  "notinva" => [0x02209],
-  "notinvb" => [0x022F7],
-  "notinvc" => [0x022F6],
-  "notni" => [0x0220C],
-  "notniva" => [0x0220C],
-  "notnivb" => [0x022FE],
-  "notnivc" => [0x022FD],
-  "npar" => [0x02226],
-  "nparallel" => [0x02226],
-  "nparsl" => [0x02AFD, 0x020E5],
-  "npart" => [0x02202, 0x00338],
-  "npolint" => [0x02A14],
-  "npr" => [0x02280],
-  "nprcue" => [0x022E0],
-  "npre" => [0x02AAF, 0x00338],
-  "nprec" => [0x02280],
-  "npreceq" => [0x02AAF, 0x00338],
-  "nrArr" => [0x021CF],
-  "nrarr" => [0x0219B],
-  "nrarrc" => [0x02933, 0x00338],
-  "nrarrw" => [0x0219D, 0x00338],
-  "nrightarrow" => [0x0219B],
-  "nrtri" => [0x022EB],
-  "nrtrie" => [0x022ED],
-  "nsc" => [0x02281],
-  "nsccue" => [0x022E1],
-  "nsce" => [0x02AB0, 0x00338],
-  "nscr" => [0x1D4C3],
-  "nshortmid" => [0x02224],
-  "nshortparallel" => [0x02226],
-  "nsim" => [0x02241],
-  "nsime" => [0x02244],
-  "nsimeq" => [0x02244],
-  "nsmid" => [0x02224],
-  "nspar" => [0x02226],
-  "nsqsube" => [0x022E2],
-  "nsqsupe" => [0x022E3],
-  "nsub" => [0x02284],
-  "nsubE" => [0x02AC5, 0x00338],
-  "nsube" => [0x02288],
-  "nsubset" => [0x02282, 0x020D2],
-  "nsubseteq" => [0x02288],
-  "nsubseteqq" => [0x02AC5, 0x00338],
-  "nsucc" => [0x02281],
-  "nsucceq" => [0x02AB0, 0x00338],
-  "nsup" => [0x02285],
-  "nsupE" => [0x02AC6, 0x00338],
-  "nsupe" => [0x02289],
-  "nsupset" => [0x02283, 0x020D2],
-  "nsupseteq" => [0x02289],
-  "nsupseteqq" => [0x02AC6, 0x00338],
-  "ntgl" => [0x02279],
-  "ntilde" => [0x000F1],
-  "ntlg" => [0x02278],
-  "ntriangleleft" => [0x022EA],
-  "ntrianglelefteq" => [0x022EC],
-  "ntriangleright" => [0x022EB],
-  "ntrianglerighteq" => [0x022ED],
-  "nu" => [0x003BD],
-  "num" => [0x00023],
-  "numero" => [0x02116],
-  "numsp" => [0x02007],
-  "nvDash" => [0x022AD],
-  "nvHarr" => [0x02904],
-  "nvap" => [0x0224D, 0x020D2],
-  "nvdash" => [0x022AC],
-  "nvge" => [0x02265, 0x020D2],
-  "nvgt" => [0x0003E, 0x020D2],
-  "nvinfin" => [0x029DE],
-  "nvlArr" => [0x02902],
-  "nvle" => [0x02264, 0x020D2],
-  "nvlt" => [0x0003C, 0x020D2],
-  "nvltrie" => [0x022B4, 0x020D2],
-  "nvrArr" => [0x02903],
-  "nvrtrie" => [0x022B5, 0x020D2],
-  "nvsim" => [0x0223C, 0x020D2],
-  "nwArr" => [0x021D6],
-  "nwarhk" => [0x02923],
-  "nwarr" => [0x02196],
-  "nwarrow" => [0x02196],
-  "nwnear" => [0x02927],
-  "oS" => [0x024C8],
-  "oacute" => [0x000F3],
-  "oast" => [0x0229B],
-  "ocir" => [0x0229A],
-  "ocirc" => [0x000F4],
-  "ocy" => [0x0043E],
-  "odash" => [0x0229D],
-  "odblac" => [0x00151],
-  "odiv" => [0x02A38],
-  "odot" => [0x02299],
-  "odsold" => [0x029BC],
-  "oelig" => [0x00153],
-  "ofcir" => [0x029BF],
-  "ofr" => [0x1D52C],
-  "ogon" => [0x002DB],
-  "ograve" => [0x000F2],
-  "ogt" => [0x029C1],
-  "ohbar" => [0x029B5],
-  "ohm" => [0x003A9],
-  "oint" => [0x0222E],
-  "olarr" => [0x021BA],
-  "olcir" => [0x029BE],
-  "olcross" => [0x029BB],
-  "oline" => [0x0203E],
-  "olt" => [0x029C0],
-  "omacr" => [0x0014D],
-  "omega" => [0x003C9],
-  "omicron" => [0x003BF],
-  "omid" => [0x029B6],
-  "ominus" => [0x02296],
-  "oopf" => [0x1D560],
-  "opar" => [0x029B7],
-  "operp" => [0x029B9],
-  "oplus" => [0x02295],
-  "or" => [0x02228],
-  "orarr" => [0x021BB],
-  "ord" => [0x02A5D],
-  "order" => [0x02134],
-  "orderof" => [0x02134],
-  "ordf" => [0x000AA],
-  "ordm" => [0x000BA],
-  "origof" => [0x022B6],
-  "oror" => [0x02A56],
-  "orslope" => [0x02A57],
-  "orv" => [0x02A5B],
-  "oscr" => [0x02134],
-  "oslash" => [0x000F8],
-  "osol" => [0x02298],
-  "otilde" => [0x000F5],
-  "otimes" => [0x02297],
-  "otimesas" => [0x02A36],
-  "ouml" => [0x000F6],
-  "ovbar" => [0x0233D],
-  "par" => [0x02225],
-  "para" => [0x000B6],
-  "parallel" => [0x02225],
-  "parsim" => [0x02AF3],
-  "parsl" => [0x02AFD],
-  "part" => [0x02202],
-  "pcy" => [0x0043F],
-  "percnt" => [0x00025],
-  "period" => [0x0002E],
-  "permil" => [0x02030],
-  "perp" => [0x022A5],
-  "pertenk" => [0x02031],
-  "pfr" => [0x1D52D],
-  "phi" => [0x003C6],
-  "phiv" => [0x003D5],
-  "phmmat" => [0x02133],
-  "phone" => [0x0260E],
-  "pi" => [0x003C0],
-  "pitchfork" => [0x022D4],
-  "piv" => [0x003D6],
-  "planck" => [0x0210F],
-  "planckh" => [0x0210E],
-  "plankv" => [0x0210F],
-  "plus" => [0x0002B],
-  "plusacir" => [0x02A23],
-  "plusb" => [0x0229E],
-  "pluscir" => [0x02A22],
-  "plusdo" => [0x02214],
-  "plusdu" => [0x02A25],
-  "pluse" => [0x02A72],
-  "plusmn" => [0x000B1],
-  "plussim" => [0x02A26],
-  "plustwo" => [0x02A27],
-  "pm" => [0x000B1],
-  "pointint" => [0x02A15],
-  "popf" => [0x1D561],
-  "pound" => [0x000A3],
-  "pr" => [0x0227A],
-  "prE" => [0x02AB3],
-  "prap" => [0x02AB7],
-  "prcue" => [0x0227C],
-  "pre" => [0x02AAF],
-  "prec" => [0x0227A],
-  "precapprox" => [0x02AB7],
-  "preccurlyeq" => [0x0227C],
-  "preceq" => [0x02AAF],
-  "precnapprox" => [0x02AB9],
-  "precneqq" => [0x02AB5],
-  "precnsim" => [0x022E8],
-  "precsim" => [0x0227E],
-  "prime" => [0x02032],
-  "primes" => [0x02119],
-  "prnE" => [0x02AB5],
-  "prnap" => [0x02AB9],
-  "prnsim" => [0x022E8],
-  "prod" => [0x0220F],
-  "profalar" => [0x0232E],
-  "profline" => [0x02312],
-  "profsurf" => [0x02313],
-  "prop" => [0x0221D],
-  "propto" => [0x0221D],
-  "prsim" => [0x0227E],
-  "prurel" => [0x022B0],
-  "pscr" => [0x1D4C5],
-  "psi" => [0x003C8],
-  "puncsp" => [0x02008],
-  "qfr" => [0x1D52E],
-  "qint" => [0x02A0C],
-  "qopf" => [0x1D562],
-  "qprime" => [0x02057],
-  "qscr" => [0x1D4C6],
-  "quaternions" => [0x0210D],
-  "quatint" => [0x02A16],
-  "quest" => [0x0003F],
-  "questeq" => [0x0225F],
-  "quot" => [0x00022],
-  "rAarr" => [0x021DB],
-  "rArr" => [0x021D2],
-  "rAtail" => [0x0291C],
-  "rBarr" => [0x0290F],
-  "rHar" => [0x02964],
-  "race" => [0x0223D, 0x00331],
-  "racute" => [0x00155],
-  "radic" => [0x0221A],
-  "raemptyv" => [0x029B3],
-  "rang" => [0x027E9],
-  "rangd" => [0x02992],
-  "range" => [0x029A5],
-  "rangle" => [0x027E9],
-  "raquo" => [0x000BB],
-  "rarr" => [0x02192],
-  "rarrap" => [0x02975],
-  "rarrb" => [0x021E5],
-  "rarrbfs" => [0x02920],
-  "rarrc" => [0x02933],
-  "rarrfs" => [0x0291E],
-  "rarrhk" => [0x021AA],
-  "rarrlp" => [0x021AC],
-  "rarrpl" => [0x02945],
-  "rarrsim" => [0x02974],
-  "rarrtl" => [0x021A3],
-  "rarrw" => [0x0219D],
-  "ratail" => [0x0291A],
-  "ratio" => [0x02236],
-  "rationals" => [0x0211A],
-  "rbarr" => [0x0290D],
-  "rbbrk" => [0x02773],
-  "rbrace" => [0x0007D],
-  "rbrack" => [0x0005D],
-  "rbrke" => [0x0298C],
-  "rbrksld" => [0x0298E],
-  "rbrkslu" => [0x02990],
-  "rcaron" => [0x00159],
-  "rcedil" => [0x00157],
-  "rceil" => [0x02309],
-  "rcub" => [0x0007D],
-  "rcy" => [0x00440],
-  "rdca" => [0x02937],
-  "rdldhar" => [0x02969],
-  "rdquo" => [0x0201D],
-  "rdquor" => [0x0201D],
-  "rdsh" => [0x021B3],
-  "real" => [0x0211C],
-  "realine" => [0x0211B],
-  "realpart" => [0x0211C],
-  "reals" => [0x0211D],
-  "rect" => [0x025AD],
-  "reg" => [0x000AE],
-  "rfisht" => [0x0297D],
-  "rfloor" => [0x0230B],
-  "rfr" => [0x1D52F],
-  "rhard" => [0x021C1],
-  "rharu" => [0x021C0],
-  "rharul" => [0x0296C],
-  "rho" => [0x003C1],
-  "rhov" => [0x003F1],
-  "rightarrow" => [0x02192],
-  "rightarrowtail" => [0x021A3],
-  "rightharpoondown" => [0x021C1],
-  "rightharpoonup" => [0x021C0],
-  "rightleftarrows" => [0x021C4],
-  "rightleftharpoons" => [0x021CC],
-  "rightrightarrows" => [0x021C9],
-  "rightsquigarrow" => [0x0219D],
-  "rightthreetimes" => [0x022CC],
-  "ring" => [0x002DA],
-  "risingdotseq" => [0x02253],
-  "rlarr" => [0x021C4],
-  "rlhar" => [0x021CC],
-  "rlm" => [0x0200F],
-  "rmoust" => [0x023B1],
-  "rmoustache" => [0x023B1],
-  "rnmid" => [0x02AEE],
-  "roang" => [0x027ED],
-  "roarr" => [0x021FE],
-  "robrk" => [0x027E7],
-  "ropar" => [0x02986],
-  "ropf" => [0x1D563],
-  "roplus" => [0x02A2E],
-  "rotimes" => [0x02A35],
-  "rpar" => [0x00029],
-  "rpargt" => [0x02994],
-  "rppolint" => [0x02A12],
-  "rrarr" => [0x021C9],
-  "rsaquo" => [0x0203A],
-  "rscr" => [0x1D4C7],
-  "rsh" => [0x021B1],
-  "rsqb" => [0x0005D],
-  "rsquo" => [0x02019],
-  "rsquor" => [0x02019],
-  "rthree" => [0x022CC],
-  "rtimes" => [0x022CA],
-  "rtri" => [0x025B9],
-  "rtrie" => [0x022B5],
-  "rtrif" => [0x025B8],
-  "rtriltri" => [0x029CE],
-  "ruluhar" => [0x02968],
-  "rx" => [0x0211E],
-  "sacute" => [0x0015B],
-  "sbquo" => [0x0201A],
-  "sc" => [0x0227B],
-  "scE" => [0x02AB4],
-  "scap" => [0x02AB8],
-  "scaron" => [0x00161],
-  "sccue" => [0x0227D],
-  "sce" => [0x02AB0],
-  "scedil" => [0x0015F],
-  "scirc" => [0x0015D],
-  "scnE" => [0x02AB6],
-  "scnap" => [0x02ABA],
-  "scnsim" => [0x022E9],
-  "scpolint" => [0x02A13],
-  "scsim" => [0x0227F],
-  "scy" => [0x00441],
-  "sdot" => [0x022C5],
-  "sdotb" => [0x022A1],
-  "sdote" => [0x02A66],
-  "seArr" => [0x021D8],
-  "searhk" => [0x02925],
-  "searr" => [0x02198],
-  "searrow" => [0x02198],
-  "sect" => [0x000A7],
-  "semi" => [0x0003B],
-  "seswar" => [0x02929],
-  "setminus" => [0x02216],
-  "setmn" => [0x02216],
-  "sext" => [0x02736],
-  "sfr" => [0x1D530],
-  "sfrown" => [0x02322],
-  "sharp" => [0x0266F],
-  "shchcy" => [0x00449],
-  "shcy" => [0x00448],
-  "shortmid" => [0x02223],
-  "shortparallel" => [0x02225],
-  "shy" => [0x000AD],
-  "sigma" => [0x003C3],
-  "sigmaf" => [0x003C2],
-  "sigmav" => [0x003C2],
-  "sim" => [0x0223C],
-  "simdot" => [0x02A6A],
-  "sime" => [0x02243],
-  "simeq" => [0x02243],
-  "simg" => [0x02A9E],
-  "simgE" => [0x02AA0],
-  "siml" => [0x02A9D],
-  "simlE" => [0x02A9F],
-  "simne" => [0x02246],
-  "simplus" => [0x02A24],
-  "simrarr" => [0x02972],
-  "slarr" => [0x02190],
-  "smallsetminus" => [0x02216],
-  "smashp" => [0x02A33],
-  "smeparsl" => [0x029E4],
-  "smid" => [0x02223],
-  "smile" => [0x02323],
-  "smt" => [0x02AAA],
-  "smte" => [0x02AAC],
-  "smtes" => [0x02AAC, 0x0FE00],
-  "softcy" => [0x0044C],
-  "sol" => [0x0002F],
-  "solb" => [0x029C4],
-  "solbar" => [0x0233F],
-  "sopf" => [0x1D564],
-  "spades" => [0x02660],
-  "spadesuit" => [0x02660],
-  "spar" => [0x02225],
-  "sqcap" => [0x02293],
-  "sqcaps" => [0x02293, 0x0FE00],
-  "sqcup" => [0x02294],
-  "sqcups" => [0x02294, 0x0FE00],
-  "sqsub" => [0x0228F],
-  "sqsube" => [0x02291],
-  "sqsubset" => [0x0228F],
-  "sqsubseteq" => [0x02291],
-  "sqsup" => [0x02290],
-  "sqsupe" => [0x02292],
-  "sqsupset" => [0x02290],
-  "sqsupseteq" => [0x02292],
-  "squ" => [0x025A1],
-  "square" => [0x025A1],
-  "squarf" => [0x025AA],
-  "squf" => [0x025AA],
-  "srarr" => [0x02192],
-  "sscr" => [0x1D4C8],
-  "ssetmn" => [0x02216],
-  "ssmile" => [0x02323],
-  "sstarf" => [0x022C6],
-  "star" => [0x02606],
-  "starf" => [0x02605],
-  "straightepsilon" => [0x003F5],
-  "straightphi" => [0x003D5],
-  "strns" => [0x000AF],
-  "sub" => [0x02282],
-  "subE" => [0x02AC5],
-  "subdot" => [0x02ABD],
-  "sube" => [0x02286],
-  "subedot" => [0x02AC3],
-  "submult" => [0x02AC1],
-  "subnE" => [0x02ACB],
-  "subne" => [0x0228A],
-  "subplus" => [0x02ABF],
-  "subrarr" => [0x02979],
-  "subset" => [0x02282],
-  "subseteq" => [0x02286],
-  "subseteqq" => [0x02AC5],
-  "subsetneq" => [0x0228A],
-  "subsetneqq" => [0x02ACB],
-  "subsim" => [0x02AC7],
-  "subsub" => [0x02AD5],
-  "subsup" => [0x02AD3],
-  "succ" => [0x0227B],
-  "succapprox" => [0x02AB8],
-  "succcurlyeq" => [0x0227D],
-  "succeq" => [0x02AB0],
-  "succnapprox" => [0x02ABA],
-  "succneqq" => [0x02AB6],
-  "succnsim" => [0x022E9],
-  "succsim" => [0x0227F],
-  "sum" => [0x02211],
-  "sung" => [0x0266A],
-  "sup" => [0x02283],
-  "sup1" => [0x000B9],
-  "sup2" => [0x000B2],
-  "sup3" => [0x000B3],
-  "supE" => [0x02AC6],
-  "supdot" => [0x02ABE],
-  "supdsub" => [0x02AD8],
-  "supe" => [0x02287],
-  "supedot" => [0x02AC4],
-  "suphsol" => [0x027C9],
-  "suphsub" => [0x02AD7],
-  "suplarr" => [0x0297B],
-  "supmult" => [0x02AC2],
-  "supnE" => [0x02ACC],
-  "supne" => [0x0228B],
-  "supplus" => [0x02AC0],
-  "supset" => [0x02283],
-  "supseteq" => [0x02287],
-  "supseteqq" => [0x02AC6],
-  "supsetneq" => [0x0228B],
-  "supsetneqq" => [0x02ACC],
-  "supsim" => [0x02AC8],
-  "supsub" => [0x02AD4],
-  "supsup" => [0x02AD6],
-  "swArr" => [0x021D9],
-  "swarhk" => [0x02926],
-  "swarr" => [0x02199],
-  "swarrow" => [0x02199],
-  "swnwar" => [0x0292A],
-  "szlig" => [0x000DF],
-  "target" => [0x02316],
-  "tau" => [0x003C4],
-  "tbrk" => [0x023B4],
-  "tcaron" => [0x00165],
-  "tcedil" => [0x00163],
-  "tcy" => [0x00442],
-  "tdot" => [0x020DB],
-  "telrec" => [0x02315],
-  "tfr" => [0x1D531],
-  "there4" => [0x02234],
-  "therefore" => [0x02234],
-  "theta" => [0x003B8],
-  "thetasym" => [0x003D1],
-  "thetav" => [0x003D1],
-  "thickapprox" => [0x02248],
-  "thicksim" => [0x0223C],
-  "thinsp" => [0x02009],
-  "thkap" => [0x02248],
-  "thksim" => [0x0223C],
-  "thorn" => [0x000FE],
-  "tilde" => [0x002DC],
-  "times" => [0x000D7],
-  "timesb" => [0x022A0],
-  "timesbar" => [0x02A31],
-  "timesd" => [0x02A30],
-  "tint" => [0x0222D],
-  "toea" => [0x02928],
-  "top" => [0x022A4],
-  "topbot" => [0x02336],
-  "topcir" => [0x02AF1],
-  "topf" => [0x1D565],
-  "topfork" => [0x02ADA],
-  "tosa" => [0x02929],
-  "tprime" => [0x02034],
-  "trade" => [0x02122],
-  "triangle" => [0x025B5],
-  "triangledown" => [0x025BF],
-  "triangleleft" => [0x025C3],
-  "trianglelefteq" => [0x022B4],
-  "triangleq" => [0x0225C],
-  "triangleright" => [0x025B9],
-  "trianglerighteq" => [0x022B5],
-  "tridot" => [0x025EC],
-  "trie" => [0x0225C],
-  "triminus" => [0x02A3A],
-  "triplus" => [0x02A39],
-  "trisb" => [0x029CD],
-  "tritime" => [0x02A3B],
-  "trpezium" => [0x023E2],
-  "tscr" => [0x1D4C9],
-  "tscy" => [0x00446],
-  "tshcy" => [0x0045B],
-  "tstrok" => [0x00167],
-  "twixt" => [0x0226C],
-  "twoheadleftarrow" => [0x0219E],
-  "twoheadrightarrow" => [0x021A0],
-  "uArr" => [0x021D1],
-  "uHar" => [0x02963],
-  "uacute" => [0x000FA],
-  "uarr" => [0x02191],
-  "ubrcy" => [0x0045E],
-  "ubreve" => [0x0016D],
-  "ucirc" => [0x000FB],
-  "ucy" => [0x00443],
-  "udarr" => [0x021C5],
-  "udblac" => [0x00171],
-  "udhar" => [0x0296E],
-  "ufisht" => [0x0297E],
-  "ufr" => [0x1D532],
-  "ugrave" => [0x000F9],
-  "uharl" => [0x021BF],
-  "uharr" => [0x021BE],
-  "uhblk" => [0x02580],
-  "ulcorn" => [0x0231C],
-  "ulcorner" => [0x0231C],
-  "ulcrop" => [0x0230F],
-  "ultri" => [0x025F8],
-  "umacr" => [0x0016B],
-  "uml" => [0x000A8],
-  "uogon" => [0x00173],
-  "uopf" => [0x1D566],
-  "uparrow" => [0x02191],
-  "updownarrow" => [0x02195],
-  "upharpoonleft" => [0x021BF],
-  "upharpoonright" => [0x021BE],
-  "uplus" => [0x0228E],
-  "upsi" => [0x003C5],
-  "upsih" => [0x003D2],
-  "upsilon" => [0x003C5],
-  "upuparrows" => [0x021C8],
-  "urcorn" => [0x0231D],
-  "urcorner" => [0x0231D],
-  "urcrop" => [0x0230E],
-  "uring" => [0x0016F],
-  "urtri" => [0x025F9],
-  "uscr" => [0x1D4CA],
-  "utdot" => [0x022F0],
-  "utilde" => [0x00169],
-  "utri" => [0x025B5],
-  "utrif" => [0x025B4],
-  "uuarr" => [0x021C8],
-  "uuml" => [0x000FC],
-  "uwangle" => [0x029A7],
-  "vArr" => [0x021D5],
-  "vBar" => [0x02AE8],
-  "vBarv" => [0x02AE9],
-  "vDash" => [0x022A8],
-  "vangrt" => [0x0299C],
-  "varepsilon" => [0x003F5],
-  "varkappa" => [0x003F0],
-  "varnothing" => [0x02205],
-  "varphi" => [0x003D5],
-  "varpi" => [0x003D6],
-  "varpropto" => [0x0221D],
-  "varr" => [0x02195],
-  "varrho" => [0x003F1],
-  "varsigma" => [0x003C2],
-  "varsubsetneq" => [0x0228A, 0x0FE00],
-  "varsubsetneqq" => [0x02ACB, 0x0FE00],
-  "varsupsetneq" => [0x0228B, 0x0FE00],
-  "varsupsetneqq" => [0x02ACC, 0x0FE00],
-  "vartheta" => [0x003D1],
-  "vartriangleleft" => [0x022B2],
-  "vartriangleright" => [0x022B3],
-  "vcy" => [0x00432],
-  "vdash" => [0x022A2],
-  "vee" => [0x02228],
-  "veebar" => [0x022BB],
-  "veeeq" => [0x0225A],
-  "vellip" => [0x022EE],
-  "verbar" => [0x0007C],
-  "vert" => [0x0007C],
-  "vfr" => [0x1D533],
-  "vltri" => [0x022B2],
-  "vnsub" => [0x02282, 0x020D2],
-  "vnsup" => [0x02283, 0x020D2],
-  "vopf" => [0x1D567],
-  "vprop" => [0x0221D],
-  "vrtri" => [0x022B3],
-  "vscr" => [0x1D4CB],
-  "vsubnE" => [0x02ACB, 0x0FE00],
-  "vsubne" => [0x0228A, 0x0FE00],
-  "vsupnE" => [0x02ACC, 0x0FE00],
-  "vsupne" => [0x0228B, 0x0FE00],
-  "vzigzag" => [0x0299A],
-  "wcirc" => [0x00175],
-  "wedbar" => [0x02A5F],
-  "wedge" => [0x02227],
-  "wedgeq" => [0x02259],
-  "weierp" => [0x02118],
-  "wfr" => [0x1D534],
-  "wopf" => [0x1D568],
-  "wp" => [0x02118],
-  "wr" => [0x02240],
-  "wreath" => [0x02240],
-  "wscr" => [0x1D4CC],
-  "xcap" => [0x022C2],
-  "xcirc" => [0x025EF],
-  "xcup" => [0x022C3],
-  "xdtri" => [0x025BD],
-  "xfr" => [0x1D535],
-  "xhArr" => [0x027FA],
-  "xharr" => [0x027F7],
-  "xi" => [0x003BE],
-  "xlArr" => [0x027F8],
-  "xlarr" => [0x027F5],
-  "xmap" => [0x027FC],
-  "xnis" => [0x022FB],
-  "xodot" => [0x02A00],
-  "xopf" => [0x1D569],
-  "xoplus" => [0x02A01],
-  "xotime" => [0x02A02],
-  "xrArr" => [0x027F9],
-  "xrarr" => [0x027F6],
-  "xscr" => [0x1D4CD],
-  "xsqcup" => [0x02A06],
-  "xuplus" => [0x02A04],
-  "xutri" => [0x025B3],
-  "xvee" => [0x022C1],
-  "xwedge" => [0x022C0],
-  "yacute" => [0x000FD],
-  "yacy" => [0x0044F],
-  "ycirc" => [0x00177],
-  "ycy" => [0x0044B],
-  "yen" => [0x000A5],
-  "yfr" => [0x1D536],
-  "yicy" => [0x00457],
-  "yopf" => [0x1D56A],
-  "yscr" => [0x1D4CE],
-  "yucy" => [0x0044E],
-  "yuml" => [0x000FF],
-  "zacute" => [0x0017A],
-  "zcaron" => [0x0017E],
-  "zcy" => [0x00437],
-  "zdot" => [0x0017C],
-  "zeetrf" => [0x02128],
-  "zeta" => [0x003B6],
-  "zfr" => [0x1D537],
-  "zhcy" => [0x00436],
-  "zigrarr" => [0x021DD],
-  "zopf" => [0x1D56B],
-  "zscr" => [0x1D4CF],
-  "zwj" => [0x0200D],
-  "zwnj" => [0x0200C],
-}
diff --git a/lib/rdoc/markdown/literals.rb b/lib/rdoc/markdown/literals.rb
deleted file mode 100644
index 37659b7ae04c25..00000000000000
--- a/lib/rdoc/markdown/literals.rb
+++ /dev/null
@@ -1,455 +0,0 @@
-# coding: UTF-8
-# frozen_string_literal: true
-# :markup: markdown
-
-##
-#--
-# This set of literals is for Ruby 1.9 regular expressions and gives full
-# unicode support.
-#
-# Unlike peg-markdown, this set of literals recognizes Unicode alphanumeric
-# characters, newlines and spaces.
-class RDoc::Markdown::Literals
-  # :stopdoc:
-
-    # This is distinct from setup_parser so that a standalone parser
-    # can redefine #initialize and still have access to the proper
-    # parser setup code.
-    def initialize(str, debug=false)
-      setup_parser(str, debug)
-    end
-
-
-
-    # Prepares for parsing +str+.  If you define a custom initialize you must
-    # call this method before #parse
-    def setup_parser(str, debug=false)
-      set_string str, 0
-      @memoizations = Hash.new { |h,k| h[k] = {} }
-      @result = nil
-      @failed_rule = nil
-      @failing_rule_offset = -1
-      @line_offsets = nil
-
-      setup_foreign_grammar
-    end
-
-    attr_reader :string
-    attr_reader :failing_rule_offset
-    attr_accessor :result, :pos
-
-    def current_column(target=pos)
-      if string[target] == "\n" && (c = string.rindex("\n", target-1) || -1)
-        return target - c
-      elsif c = string.rindex("\n", target)
-        return target - c
-      end
-
-      target + 1
-    end
-
-    def position_line_offsets
-      unless @position_line_offsets
-        @position_line_offsets = []
-        total = 0
-        string.each_line do |line|
-          total += line.size
-          @position_line_offsets << total
-        end
-      end
-      @position_line_offsets
-    end
-
-    if [].respond_to? :bsearch_index
-      def current_line(target=pos)
-        if line = position_line_offsets.bsearch_index {|x| x > target }
-          return line + 1
-        end
-        raise "Target position #{target} is outside of string"
-      end
-    else
-      def current_line(target=pos)
-        if line = position_line_offsets.index {|x| x > target }
-          return line + 1
-        end
-
-        raise "Target position #{target} is outside of string"
-      end
-    end
-
-    def current_character(target=pos)
-      if target < 0 || target >= string.size
-        raise "Target position #{target} is outside of string"
-      end
-      string[target, 1]
-    end
-
-    KpegPosInfo = Struct.new(:pos, :lno, :col, :line, :char)
-
-    def current_pos_info(target=pos)
-      l = current_line target
-      c = current_column target
-      ln = get_line(l-1)
-      chr = string[target,1]
-      KpegPosInfo.new(target, l, c, ln, chr)
-    end
-
-    def lines
-      string.lines
-    end
-
-    def get_line(no)
-      loff = position_line_offsets
-      if no < 0
-        raise "Line No is out of range: #{no} < 0"
-      elsif no >= loff.size
-        raise "Line No is out of range: #{no} >= #{loff.size}"
-      end
-      lend = loff[no]-1
-      lstart = no > 0 ? loff[no-1] : 0
-      string[lstart..lend]
-    end
-
-
-
-    def get_text(start)
-      @string[start..@pos-1]
-    end
-
-    # Sets the string and current parsing position for the parser.
-    def set_string string, pos
-      @string = string
-      @string_size = string ? string.size : 0
-      @pos = pos
-      @position_line_offsets = nil
-    end
-
-    def show_pos
-      width = 10
-      if @pos < width
-        "#{@pos} (\"#{@string[0,@pos]}\" @ \"#{@string[@pos,width]}\")"
-      else
-        "#{@pos} (\"... #{@string[@pos - width, width]}\" @ \"#{@string[@pos,width]}\")"
-      end
-    end
-
-    def failure_info
-      l = current_line @failing_rule_offset
-      c = current_column @failing_rule_offset
-
-      if @failed_rule.kind_of? Symbol
-        info = self.class::Rules[@failed_rule]
-        "line #{l}, column #{c}: failed rule '#{info.name}' = '#{info.rendered}'"
-      else
-        "line #{l}, column #{c}: failed rule '#{@failed_rule}'"
-      end
-    end
-
-    def failure_caret
-      p = current_pos_info @failing_rule_offset
-      "#{p.line.chomp}\n#{' ' * (p.col - 1)}^"
-    end
-
-    def failure_character
-      current_character @failing_rule_offset
-    end
-
-    def failure_oneline
-      p = current_pos_info @failing_rule_offset
-
-      if @failed_rule.kind_of? Symbol
-        info = self.class::Rules[@failed_rule]
-        "@#{p.lno}:#{p.col} failed rule '#{info.name}', got '#{p.char}'"
-      else
-        "@#{p.lno}:#{p.col} failed rule '#{@failed_rule}', got '#{p.char}'"
-      end
-    end
-
-    class ParseError < RuntimeError
-    end
-
-    def raise_error
-      raise ParseError, failure_oneline
-    end
-
-    def show_error(io=STDOUT)
-      error_pos = @failing_rule_offset
-      p = current_pos_info(error_pos)
-
-      io.puts "On line #{p.lno}, column #{p.col}:"
-
-      if @failed_rule.kind_of? Symbol
-        info = self.class::Rules[@failed_rule]
-        io.puts "Failed to match '#{info.rendered}' (rule '#{info.name}')"
-      else
-        io.puts "Failed to match rule '#{@failed_rule}'"
-      end
-
-      io.puts "Got: #{p.char.inspect}"
-      io.puts "=> #{p.line}"
-      io.print(" " * (p.col + 2))
-      io.puts "^"
-    end
-
-    def set_failed_rule(name)
-      if @pos > @failing_rule_offset
-        @failed_rule = name
-        @failing_rule_offset = @pos
-      end
-    end
-
-    attr_reader :failed_rule
-
-    def match_string(str)
-      len = str.size
-      if @string[pos,len] == str
-        @pos += len
-        return str
-      end
-
-      return nil
-    end
-
-    def scan(reg)
-      if m = reg.match(@string, @pos)
-        @pos = m.end(0)
-        return true
-      end
-
-      return nil
-    end
-
-    if "".respond_to? :ord
-      def get_byte
-        if @pos >= @string_size
-          return nil
-        end
-
-        s = @string[@pos].ord
-        @pos += 1
-        s
-      end
-    else
-      def get_byte
-        if @pos >= @string_size
-          return nil
-        end
-
-        s = @string[@pos]
-        @pos += 1
-        s
-      end
-    end
-
-    def parse(rule=nil)
-      # We invoke the rules indirectly via apply
-      # instead of by just calling them as methods because
-      # if the rules use left recursion, apply needs to
-      # manage that.
-
-      if !rule
-        apply(:_root)
-      else
-        method = rule.gsub("-","_hyphen_")
-        apply :"_#{method}"
-      end
-    end
-
-    class MemoEntry
-      def initialize(ans, pos)
-        @ans = ans
-        @pos = pos
-        @result = nil
-        @set = false
-        @left_rec = false
-      end
-
-      attr_reader :ans, :pos, :result, :set
-      attr_accessor :left_rec
-
-      def move!(ans, pos, result)
-        @ans = ans
-        @pos = pos
-        @result = result
-        @set = true
-        @left_rec = false
-      end
-    end
-
-    def external_invoke(other, rule, *args)
-      old_pos = @pos
-      old_string = @string
-
-      set_string other.string, other.pos
-
-      begin
-        if val = __send__(rule, *args)
-          other.pos = @pos
-          other.result = @result
-        else
-          other.set_failed_rule "#{self.class}##{rule}"
-        end
-        val
-      ensure
-        set_string old_string, old_pos
-      end
-    end
-
-    def apply_with_args(rule, *args)
-      @result = nil
-      memo_key = [rule, args]
-      if m = @memoizations[memo_key][@pos]
-        @pos = m.pos
-        if !m.set
-          m.left_rec = true
-          return nil
-        end
-
-        @result = m.result
-
-        return m.ans
-      else
-        m = MemoEntry.new(nil, @pos)
-        @memoizations[memo_key][@pos] = m
-        start_pos = @pos
-
-        ans = __send__ rule, *args
-
-        lr = m.left_rec
-
-        m.move! ans, @pos, @result
-
-        # Don't bother trying to grow the left recursion
-        # if it's failing straight away (thus there is no seed)
-        if ans and lr
-          return grow_lr(rule, args, start_pos, m)
-        else
-          return ans
-        end
-      end
-    end
-
-    def apply(rule)
-      @result = nil
-      if m = @memoizations[rule][@pos]
-        @pos = m.pos
-        if !m.set
-          m.left_rec = true
-          return nil
-        end
-
-        @result = m.result
-
-        return m.ans
-      else
-        m = MemoEntry.new(nil, @pos)
-        @memoizations[rule][@pos] = m
-        start_pos = @pos
-
-        ans = __send__ rule
-
-        lr = m.left_rec
-
-        m.move! ans, @pos, @result
-
-        # Don't bother trying to grow the left recursion
-        # if it's failing straight away (thus there is no seed)
-        if ans and lr
-          return grow_lr(rule, nil, start_pos, m)
-        else
-          return ans
-        end
-      end
-    end
-
-    def grow_lr(rule, args, start_pos, m)
-      while true
-        @pos = start_pos
-        @result = m.result
-
-        if args
-          ans = __send__ rule, *args
-        else
-          ans = __send__ rule
-        end
-        return nil unless ans
-
-        break if @pos <= m.pos
-
-        m.move! ans, @pos, @result
-      end
-
-      @result = m.result
-      @pos = m.pos
-      return m.ans
-    end
-
-    class RuleInfo
-      def initialize(name, rendered)
-        @name = name
-        @rendered = rendered
-      end
-
-      attr_reader :name, :rendered
-    end
-
-    def self.rule_info(name, rendered)
-      RuleInfo.new(name, rendered)
-    end
-
-
-  # :startdoc:
-  # :stopdoc:
-  def setup_foreign_grammar; end
-
-  # Alphanumeric = /\p{Word}/
-  def _Alphanumeric
-    _tmp = scan(/\G(?-mix:\p{Word})/)
-    set_failed_rule :_Alphanumeric unless _tmp
-    return _tmp
-  end
-
-  # AlphanumericAscii = /[A-Za-z0-9]/
-  def _AlphanumericAscii
-    _tmp = scan(/\G(?-mix:[A-Za-z0-9])/)
-    set_failed_rule :_AlphanumericAscii unless _tmp
-    return _tmp
-  end
-
-  # BOM = "uFEFF"
-  def _BOM
-    _tmp = match_string("uFEFF")
-    set_failed_rule :_BOM unless _tmp
-    return _tmp
-  end
-
-  # Newline = /\n|\r\n?|\p{Zl}|\p{Zp}/
-  def _Newline
-    _tmp = scan(/\G(?-mix:\n|\r\n?|\p{Zl}|\p{Zp})/)
-    set_failed_rule :_Newline unless _tmp
-    return _tmp
-  end
-
-  # NonAlphanumeric = /\p{^Word}/
-  def _NonAlphanumeric
-    _tmp = scan(/\G(?-mix:\p{^Word})/)
-    set_failed_rule :_NonAlphanumeric unless _tmp
-    return _tmp
-  end
-
-  # Spacechar = /\t|\p{Zs}/
-  def _Spacechar
-    _tmp = scan(/\G(?-mix:\t|\p{Zs})/)
-    set_failed_rule :_Spacechar unless _tmp
-    return _tmp
-  end
-
-  Rules = {}
-  Rules[:_Alphanumeric] = rule_info("Alphanumeric", "/\\p{Word}/")
-  Rules[:_AlphanumericAscii] = rule_info("AlphanumericAscii", "/[A-Za-z0-9]/")
-  Rules[:_BOM] = rule_info("BOM", "\"uFEFF\"")
-  Rules[:_Newline] = rule_info("Newline", "/\\n|\\r\\n?|\\p{Zl}|\\p{Zp}/")
-  Rules[:_NonAlphanumeric] = rule_info("NonAlphanumeric", "/\\p{^Word}/")
-  Rules[:_Spacechar] = rule_info("Spacechar", "/\\t|\\p{Zs}/")
-  # :startdoc:
-end
diff --git a/lib/rdoc/markup.rb b/lib/rdoc/markup.rb
deleted file mode 100644
index 6e9303096509b0..00000000000000
--- a/lib/rdoc/markup.rb
+++ /dev/null
@@ -1,235 +0,0 @@
-# frozen_string_literal: true
-##
-# RDoc::Markup parses plain text documents and attempts to decompose them into
-# their constituent parts.  Some of these parts are high-level: paragraphs,
-# chunks of verbatim text, list entries and the like.  Other parts happen at
-# the character level: a piece of bold text, a word in code font.  This markup
-# is similar in spirit to that used on WikiWiki webs, where folks create web
-# pages using a simple set of formatting rules.
-#
-# RDoc::Markup and other markup formats do no output formatting, this is
-# handled by the RDoc::Markup::Formatter subclasses.
-#
-# = Supported Formats
-#
-# Besides the RDoc::Markup format, the following formats are built in to RDoc:
-#
-# markdown::
-#   The markdown format as described by
-#   http://daringfireball.net/projects/markdown/.  See RDoc::Markdown for
-#   details on the parser and supported extensions.
-# rd::
-#   The rdtool format.  See RDoc::RD for details on the parser and format.
-# tomdoc::
-#   The TomDoc format as described by http://tomdoc.org/.  See RDoc::TomDoc
-#   for details on the parser and supported extensions.
-#
-# You can choose a markup format using the following methods:
-#
-# per project::
-#   If you build your documentation with rake use RDoc::Task#markup.
-#
-#   If you build your documentation by hand run:
-#
-#      rdoc --markup your_favorite_format --write-options
-#
-#   and commit <tt>.rdoc_options</tt> and ship it with your packaged gem.
-# per file::
-#   At the top of the file use the <tt>:markup:</tt> directive to set the
-#   default format for the rest of the file.
-# per comment::
-#   Use the <tt>:markup:</tt> directive at the top of a comment you want
-#   to write in a different format.
-#
-# = RDoc::Markup
-#
-# RDoc::Markup is extensible at runtime: you can add \new markup elements to
-# be recognized in the documents that RDoc::Markup parses.
-#
-# RDoc::Markup is intended to be the basis for a family of tools which share
-# the common requirement that simple, plain-text should be rendered in a
-# variety of different output formats and media.  It is envisaged that
-# RDoc::Markup could be the basis for formatting RDoc style comment blocks,
-# Wiki entries, and online FAQs.
-#
-# == Synopsis
-#
-# This code converts +input_string+ to HTML.  The conversion takes place in
-# the +convert+ method, so you can use the same RDoc::Markup converter to
-# convert multiple input strings.
-#
-#   require 'rdoc'
-#
-#   h = RDoc::Markup::ToHtml.new(RDoc::Options.new)
-#
-#   puts h.convert(input_string)
-#
-# You can extend the RDoc::Markup parser to recognize new markup
-# sequences, and to add regexp handling. Here we make WikiWords significant to
-# the parser, and also make the sequences {word} and \<no>text...</no> signify
-# strike-through text.  We then subclass the HTML output class to deal
-# with these:
-#
-#   require 'rdoc'
-#
-#   class WikiHtml < RDoc::Markup::ToHtml
-#     def handle_regexp_WIKIWORD(target)
-#       "<font color=red>" + target.text + "</font>"
-#     end
-#   end
-#
-#   markup = RDoc::Markup.new
-#   markup.add_word_pair("{", "}", :STRIKE)
-#   markup.add_html("no", :STRIKE)
-#
-#   markup.add_regexp_handling(/\b([A-Z][a-z]+[A-Z]\w+)/, :WIKIWORD)
-#
-#   wh = WikiHtml.new RDoc::Options.new, markup
-#   wh.add_tag(:STRIKE, "<strike>", "</strike>")
-#
-#   puts "<body>#{wh.convert ARGF.read}</body>"
-#
-# == Encoding
-#
-# Where Encoding support is available, RDoc will automatically convert all
-# documents to the same output encoding.  The output encoding can be set via
-# RDoc::Options#encoding and defaults to Encoding.default_external.
-#
-# = \RDoc Markup Reference
-#
-# See RDoc::MarkupReference.
-#
-#--
-# Original Author:: Dave Thomas,  dave@pragmaticprogrammer.com
-# License:: Ruby license
-
-class RDoc::Markup
-
-  ##
-  # An AttributeManager which handles inline markup.
-
-  attr_reader :attribute_manager
-
-  ##
-  # Parses +str+ into an RDoc::Markup::Document.
-
-  def self.parse str
-    RDoc::Markup::Parser.parse str
-  rescue RDoc::Markup::Parser::Error => e
-    $stderr.puts <<-EOF
-While parsing markup, RDoc encountered a #{e.class}:
-
-#{e}
-\tfrom #{e.backtrace.join "\n\tfrom "}
-
----8<---
-#{text}
----8<---
-
-RDoc #{RDoc::VERSION}
-
-Ruby #{RUBY_VERSION}-p#{RUBY_PATCHLEVEL} #{RUBY_RELEASE_DATE}
-
-Please file a bug report with the above information at:
-
-https://github.com/ruby/rdoc/issues
-
-    EOF
-    raise
-  end
-
-  ##
-  # Take a block of text and use various heuristics to determine its
-  # structure (paragraphs, lists, and so on).  Invoke an event handler as we
-  # identify significant chunks.
-
-  def initialize attribute_manager = nil
-    @attribute_manager = attribute_manager || RDoc::Markup::AttributeManager.new
-    @output = nil
-  end
-
-  ##
-  # Add to the sequences used to add formatting to an individual word (such
-  # as *bold*).  Matching entries will generate attributes that the output
-  # formatters can recognize by their +name+.
-
-  def add_word_pair(start, stop, name)
-    @attribute_manager.add_word_pair(start, stop, name)
-  end
-
-  ##
-  # Add to the sequences recognized as general markup.
-
-  def add_html(tag, name)
-    @attribute_manager.add_html(tag, name)
-  end
-
-  ##
-  # Add to other inline sequences.  For example, we could add WikiWords using
-  # something like:
-  #
-  #    parser.add_regexp_handling(/\b([A-Z][a-z]+[A-Z]\w+)/, :WIKIWORD)
-  #
-  # Each wiki word will be presented to the output formatter.
-
-  def add_regexp_handling(pattern, name)
-    @attribute_manager.add_regexp_handling(pattern, name)
-  end
-
-  ##
-  # We take +input+, parse it if necessary, then invoke the output +formatter+
-  # using a Visitor to render the result.
-
-  def convert input, formatter
-    document = case input
-               when RDoc::Markup::Document then
-                 input
-               else
-                 RDoc::Markup::Parser.parse input
-               end
-
-    document.accept formatter
-  end
-
-  autoload :Parser,                "#{__dir__}/markup/parser"
-  autoload :PreProcess,            "#{__dir__}/markup/pre_process"
-
-  # Inline markup classes
-  autoload :AttrChanger,           "#{__dir__}/markup/attr_changer"
-  autoload :AttrSpan,              "#{__dir__}/markup/attr_span"
-  autoload :Attributes,            "#{__dir__}/markup/attributes"
-  autoload :AttributeManager,      "#{__dir__}/markup/attribute_manager"
-  autoload :RegexpHandling,        "#{__dir__}/markup/regexp_handling"
-
-  # RDoc::Markup AST
-  autoload :BlankLine,             "#{__dir__}/markup/blank_line"
-  autoload :BlockQuote,            "#{__dir__}/markup/block_quote"
-  autoload :Document,              "#{__dir__}/markup/document"
-  autoload :HardBreak,             "#{__dir__}/markup/hard_break"
-  autoload :Heading,               "#{__dir__}/markup/heading"
-  autoload :Include,               "#{__dir__}/markup/include"
-  autoload :IndentedParagraph,     "#{__dir__}/markup/indented_paragraph"
-  autoload :List,                  "#{__dir__}/markup/list"
-  autoload :ListItem,              "#{__dir__}/markup/list_item"
-  autoload :Paragraph,             "#{__dir__}/markup/paragraph"
-  autoload :Table,                 "#{__dir__}/markup/table"
-  autoload :Raw,                   "#{__dir__}/markup/raw"
-  autoload :Rule,                  "#{__dir__}/markup/rule"
-  autoload :Verbatim,              "#{__dir__}/markup/verbatim"
-
-  # Formatters
-  autoload :Formatter,             "#{__dir__}/markup/formatter"
-
-  autoload :ToAnsi,                "#{__dir__}/markup/to_ansi"
-  autoload :ToBs,                  "#{__dir__}/markup/to_bs"
-  autoload :ToHtml,                "#{__dir__}/markup/to_html"
-  autoload :ToHtmlCrossref,        "#{__dir__}/markup/to_html_crossref"
-  autoload :ToHtmlSnippet,         "#{__dir__}/markup/to_html_snippet"
-  autoload :ToLabel,               "#{__dir__}/markup/to_label"
-  autoload :ToMarkdown,            "#{__dir__}/markup/to_markdown"
-  autoload :ToRdoc,                "#{__dir__}/markup/to_rdoc"
-  autoload :ToTableOfContents,     "#{__dir__}/markup/to_table_of_contents"
-  autoload :ToTest,                "#{__dir__}/markup/to_test"
-  autoload :ToTtOnly,              "#{__dir__}/markup/to_tt_only"
-
-end
diff --git a/lib/rdoc/markup/attr_changer.rb b/lib/rdoc/markup/attr_changer.rb
deleted file mode 100644
index e5ba470bb6ca3d..00000000000000
--- a/lib/rdoc/markup/attr_changer.rb
+++ /dev/null
@@ -1,22 +0,0 @@
-# frozen_string_literal: true
-class RDoc::Markup
-
-  AttrChanger = Struct.new :turn_on, :turn_off # :nodoc:
-
-end
-
-##
-# An AttrChanger records a change in attributes. It contains a bitmap of the
-# attributes to turn on, and a bitmap of those to turn off.
-
-class RDoc::Markup::AttrChanger
-
-  def to_s # :nodoc:
-    "Attr: +#{turn_on}/-#{turn_off}"
-  end
-
-  def inspect # :nodoc:
-    '+%d/-%d' % [turn_on, turn_off]
-  end
-
-end
diff --git a/lib/rdoc/markup/attr_span.rb b/lib/rdoc/markup/attr_span.rb
deleted file mode 100644
index f1fabf1c3be35f..00000000000000
--- a/lib/rdoc/markup/attr_span.rb
+++ /dev/null
@@ -1,35 +0,0 @@
-# frozen_string_literal: true
-##
-# An array of attributes which parallels the characters in a string.
-
-class RDoc::Markup::AttrSpan
-
-  ##
-  # Creates a new AttrSpan for +length+ characters
-
-  def initialize(length, exclusive)
-    @attrs = Array.new(length, 0)
-    @exclusive = exclusive
-  end
-
-  ##
-  # Toggles +bits+ from +start+ to +length+
-  def set_attrs(start, length, bits)
-    updated = false
-    for i in start ... (start+length)
-      if (@exclusive & @attrs[i]) == 0 || (@exclusive & bits) != 0
-        @attrs[i] |= bits
-        updated = true
-      end
-    end
-    updated
-  end
-
-  ##
-  # Accesses flags for character +n+
-
-  def [](n)
-    @attrs[n]
-  end
-
-end
diff --git a/lib/rdoc/markup/attribute_manager.rb b/lib/rdoc/markup/attribute_manager.rb
deleted file mode 100644
index 1162f27284081a..00000000000000
--- a/lib/rdoc/markup/attribute_manager.rb
+++ /dev/null
@@ -1,402 +0,0 @@
-# frozen_string_literal: true
-
-##
-# Manages changes of attributes in a block of text
-
-class RDoc::Markup::AttributeManager
-  unless ::MatchData.method_defined?(:match_length)
-    using ::Module.new {
-      refine(::MatchData) {
-        def match_length(nth) # :nodoc:
-          b, e = offset(nth)
-          e - b if b
-        end
-      }
-    }
-  end
-
-  ##
-  # The NUL character
-
-  NULL = "\000".freeze
-
-  #--
-  # We work by substituting non-printing characters in to the text. For now
-  # I'm assuming that I can substitute a character in the range 0..8 for a 7
-  # bit character without damaging the encoded string, but this might be
-  # optimistic
-  #++
-
-  A_PROTECT = 004 # :nodoc:
-
-  ##
-  # Special mask character to prevent inline markup handling
-
-  PROTECT_ATTR = A_PROTECT.chr # :nodoc:
-
-  ##
-  # The attributes enabled for this markup object.
-
-  attr_reader :attributes
-
-  ##
-  # This maps delimiters that occur around words (such as *bold* or +tt+)
-  # where the start and end delimiters and the same. This lets us optimize
-  # the regexp
-
-  attr_reader :matching_word_pairs
-
-  ##
-  # And this is used when the delimiters aren't the same. In this case the
-  # hash maps a pattern to the attribute character
-
-  attr_reader :word_pair_map
-
-  ##
-  # This maps HTML tags to the corresponding attribute char
-
-  attr_reader :html_tags
-
-  ##
-  # A \ in front of a character that would normally be processed turns off
-  # processing. We do this by turning \< into <#{PROTECT}
-
-  attr_reader :protectable
-
-  ##
-  # And this maps _regexp handling_ sequences to a name. A regexp handling
-  # sequence is something like a WikiWord
-
-  attr_reader :regexp_handlings
-
-  ##
-  # A bits of exclusive maps
-  attr_reader :exclusive_bitmap
-
-  ##
-  # Creates a new attribute manager that understands bold, emphasized and
-  # teletype text.
-
-  def initialize
-    @html_tags = {}
-    @matching_word_pairs = {}
-    @protectable = %w[<]
-    @regexp_handlings = []
-    @word_pair_map = {}
-    @exclusive_bitmap = 0
-    @attributes = RDoc::Markup::Attributes.new
-
-    add_word_pair "*", "*", :BOLD, true
-    add_word_pair "_", "_", :EM, true
-    add_word_pair "+", "+", :TT, true
-
-    add_html "em", :EM, true
-    add_html "i",  :EM, true
-    add_html "b",  :BOLD, true
-    add_html "tt",   :TT, true
-    add_html "code", :TT, true
-  end
-
-  ##
-  # Return an attribute object with the given turn_on and turn_off bits set
-
-  def attribute(turn_on, turn_off)
-    RDoc::Markup::AttrChanger.new turn_on, turn_off
-  end
-
-  ##
-  # Changes the current attribute from +current+ to +new+
-
-  def change_attribute current, new
-    diff = current ^ new
-    attribute(new & diff, current & diff)
-  end
-
-  ##
-  # Used by the tests to change attributes by name from +current_set+ to
-  # +new_set+
-
-  def changed_attribute_by_name current_set, new_set
-    current = new = 0
-    current_set.each do |name|
-      current |= @attributes.bitmap_for(name)
-    end
-
-    new_set.each do |name|
-      new |= @attributes.bitmap_for(name)
-    end
-
-    change_attribute(current, new)
-  end
-
-  ##
-  # Copies +start_pos+ to +end_pos+ from the current string
-
-  def copy_string(start_pos, end_pos)
-    res = @str[start_pos...end_pos]
-    res.gsub!(/\000/, '')
-    res
-  end
-
-  def exclusive?(attr)
-    (attr & @exclusive_bitmap) != 0
-  end
-
-  NON_PRINTING_START = "\1" # :nodoc:
-  NON_PRINTING_END = "\2" # :nodoc:
-
-  ##
-  # Map attributes like <b>text</b>to the sequence
-  # \001\002<char>\001\003<char>, where <char> is a per-attribute specific
-  # character
-
-  def convert_attrs(str, attrs, exclusive = false)
-    convert_attrs_matching_word_pairs(str, attrs, exclusive)
-    convert_attrs_word_pair_map(str, attrs, exclusive)
-  end
-
-  def convert_attrs_matching_word_pairs(str, attrs, exclusive)
-    # first do matching ones
-    tags = @matching_word_pairs.select { |start, bitmap|
-      exclusive == exclusive?(bitmap)
-    }.keys
-    return if tags.empty?
-    tags = "[#{tags.join("")}](?!#{PROTECT_ATTR})"
-    all_tags = "[#{@matching_word_pairs.keys.join("")}](?!#{PROTECT_ATTR})"
-
-    re = /(?:^|\W|#{all_tags})\K(#{tags})(\1*[#\\]?[\w:#{PROTECT_ATTR}.\/\[\]-]+?\S?)\1(?!\1)(?=#{all_tags}|\W|$)/
-
-    1 while str.gsub!(re) { |orig|
-      a, w = (m = $~).values_at(1, 2)
-      attr = @matching_word_pairs[a]
-      if attrs.set_attrs(m.begin(2), w.length, attr)
-        a = NULL * a.length
-      else
-        a = NON_PRINTING_START + a + NON_PRINTING_END
-      end
-      a + w + a
-    }
-    str.delete!(NON_PRINTING_START + NON_PRINTING_END)
-  end
-
-  def convert_attrs_word_pair_map(str, attrs, exclusive)
-    # then non-matching
-    unless @word_pair_map.empty? then
-      @word_pair_map.each do |regexp, attr|
-        next unless exclusive == exclusive?(attr)
-        1 while str.gsub!(regexp) { |orig|
-          w = (m = ($~))[2]
-          updated = attrs.set_attrs(m.begin(2), w.length, attr)
-          if updated
-            NULL * m.match_length(1) + w + NULL * m.match_length(3)
-          else
-            orig
-          end
-        }
-      end
-    end
-  end
-
-  ##
-  # Converts HTML tags to RDoc attributes
-
-  def convert_html(str, attrs, exclusive = false)
-    tags = @html_tags.select { |start, bitmap|
-      exclusive == exclusive?(bitmap)
-    }.keys.join '|'
-
-    1 while str.gsub!(/<(#{tags})>(.*?)<\/\1>/i) { |orig|
-      attr = @html_tags[$1.downcase]
-      html_length = $~.match_length(1) + 2 # "<>".length
-      seq = NULL * html_length
-      attrs.set_attrs($~.begin(2), $~.match_length(2), attr)
-      seq + $2 + seq + NULL
-    }
-  end
-
-  ##
-  # Converts regexp handling sequences to RDoc attributes
-
-  def convert_regexp_handlings str, attrs, exclusive = false
-    @regexp_handlings.each do |regexp, attribute|
-      next unless exclusive == exclusive?(attribute)
-      str.scan(regexp) do
-        capture = $~.size == 1 ? 0 : 1
-
-        s, e = $~.offset capture
-
-        attrs.set_attrs s, e - s, attribute | @attributes.regexp_handling
-      end
-    end
-  end
-
-  ##
-  # Escapes regexp handling sequences of text to prevent conversion to RDoc
-
-  def mask_protected_sequences
-    # protect __send__, __FILE__, etc.
-    @str.gsub!(/__([a-z]+)__/i,
-      "_#{PROTECT_ATTR}_#{PROTECT_ATTR}\\1_#{PROTECT_ATTR}_#{PROTECT_ATTR}")
-    @str.gsub!(/(\A|[^\\])\\([#{Regexp.escape @protectable.join}])/m,
-               "\\1\\2#{PROTECT_ATTR}")
-    @str.gsub!(/\\(\\[#{Regexp.escape @protectable.join}])/m, "\\1")
-  end
-
-  ##
-  # Unescapes regexp handling sequences of text
-
-  def unmask_protected_sequences
-    @str.gsub!(/(.)#{PROTECT_ATTR}/, "\\1\000")
-  end
-
-  ##
-  # Adds a markup class with +name+ for words wrapped in the +start+ and
-  # +stop+ character.  To make words wrapped with "*" bold:
-  #
-  #   am.add_word_pair '*', '*', :BOLD
-
-  def add_word_pair(start, stop, name, exclusive = false)
-    raise ArgumentError, "Word flags may not start with '<'" if
-      start[0,1] == '<'
-
-    bitmap = @attributes.bitmap_for name
-
-    if start == stop then
-      @matching_word_pairs[start] = bitmap
-    else
-      pattern = /(#{Regexp.escape start})(\S+)(#{Regexp.escape stop})/
-      @word_pair_map[pattern] = bitmap
-    end
-
-    @protectable << start[0,1]
-    @protectable.uniq!
-
-    @exclusive_bitmap |= bitmap if exclusive
-  end
-
-  ##
-  # Adds a markup class with +name+ for words surrounded by HTML tag +tag+.
-  # To process emphasis tags:
-  #
-  #   am.add_html 'em', :EM
-
-  def add_html(tag, name, exclusive = false)
-    bitmap = @attributes.bitmap_for name
-    @html_tags[tag.downcase] = bitmap
-    @exclusive_bitmap |= bitmap if exclusive
-  end
-
-  ##
-  # Adds a regexp handling for +pattern+ with +name+.  A simple URL handler
-  # would be:
-  #
-  #   @am.add_regexp_handling(/((https?:)\S+\w)/, :HYPERLINK)
-
-  def add_regexp_handling pattern, name, exclusive = false
-    bitmap = @attributes.bitmap_for(name)
-    @regexp_handlings << [pattern, bitmap]
-    @exclusive_bitmap |= bitmap if exclusive
-  end
-
-  ##
-  # Processes +str+ converting attributes, HTML and regexp handlings
-
-  def flow str
-    @str = str.dup
-
-    mask_protected_sequences
-
-    @attrs = RDoc::Markup::AttrSpan.new @str.length, @exclusive_bitmap
-
-    convert_attrs            @str, @attrs, true
-    convert_html             @str, @attrs, true
-    convert_regexp_handlings @str, @attrs, true
-    convert_attrs            @str, @attrs
-    convert_html             @str, @attrs
-    convert_regexp_handlings @str, @attrs
-
-    unmask_protected_sequences
-
-    split_into_flow
-  end
-
-  ##
-  # Debug method that prints a string along with its attributes
-
-  def display_attributes
-    puts
-    puts @str.tr(NULL, "!")
-    bit = 1
-    16.times do |bno|
-      line = ""
-      @str.length.times do |i|
-        if (@attrs[i] & bit) == 0
-          line << " "
-        else
-          if bno.zero?
-            line << "S"
-          else
-            line << ("%d" % (bno+1))
-          end
-        end
-      end
-      puts(line) unless line =~ /^ *$/
-      bit <<= 1
-    end
-  end
-
-  ##
-  # Splits the string into chunks by attribute change
-
-  def split_into_flow
-    res = []
-    current_attr = 0
-
-    str_len = @str.length
-
-    # skip leading invisible text
-    i = 0
-    i += 1 while i < str_len and @str[i].chr == "\0"
-    start_pos = i
-
-    # then scan the string, chunking it on attribute changes
-    while i < str_len
-      new_attr = @attrs[i]
-      if new_attr != current_attr
-        if i > start_pos
-          res << copy_string(start_pos, i)
-          start_pos = i
-        end
-
-        res << change_attribute(current_attr, new_attr)
-        current_attr = new_attr
-
-        if (current_attr & @attributes.regexp_handling) != 0 then
-          i += 1 while
-            i < str_len and (@attrs[i] & @attributes.regexp_handling) != 0
-
-          res << RDoc::Markup::RegexpHandling.new(current_attr,
-                                                  copy_string(start_pos, i))
-          start_pos = i
-          next
-        end
-      end
-
-      # move on, skipping any invisible characters
-      begin
-        i += 1
-      end while i < str_len and @str[i].chr == "\0"
-    end
-
-    # tidy up trailing text
-    if start_pos < str_len
-      res << copy_string(start_pos, str_len)
-    end
-
-    # and reset to all attributes off
-    res << change_attribute(current_attr, 0) if current_attr != 0
-
-    res
-  end
-
-end
diff --git a/lib/rdoc/markup/attributes.rb b/lib/rdoc/markup/attributes.rb
deleted file mode 100644
index d9d18b305926d0..00000000000000
--- a/lib/rdoc/markup/attributes.rb
+++ /dev/null
@@ -1,70 +0,0 @@
-# frozen_string_literal: true
-##
-# We manage a set of attributes.  Each attribute has a symbol name and a bit
-# value.
-
-class RDoc::Markup::Attributes
-
-  ##
-  # The regexp handling attribute type. See RDoc::Markup#add_regexp_handling
-
-  attr_reader :regexp_handling
-
-  ##
-  # Creates a new attributes set.
-
-  def initialize
-    @regexp_handling = 1
-
-    @name_to_bitmap = [
-      [:_REGEXP_HANDLING_, @regexp_handling],
-    ]
-
-    @next_bitmap = @regexp_handling << 1
-  end
-
-  ##
-  # Returns a unique bit for +name+
-
-  def bitmap_for name
-    bitmap = @name_to_bitmap.assoc name
-
-    unless bitmap then
-      bitmap = @next_bitmap
-      @next_bitmap <<= 1
-      @name_to_bitmap << [name, bitmap]
-    else
-      bitmap = bitmap.last
-    end
-
-    bitmap
-  end
-
-  ##
-  # Returns a string representation of +bitmap+
-
-  def as_string bitmap
-    return 'none' if bitmap.zero?
-    res = []
-
-    @name_to_bitmap.each do |name, bit|
-      res << name if (bitmap & bit) != 0
-    end
-
-    res.join ','
-  end
-
-  ##
-  # yields each attribute name in +bitmap+
-
-  def each_name_of bitmap
-    return enum_for __method__, bitmap unless block_given?
-
-    @name_to_bitmap.each do |name, bit|
-      next if bit == @regexp_handling
-
-      yield name.to_s if (bitmap & bit) != 0
-    end
-  end
-
-end
diff --git a/lib/rdoc/markup/blank_line.rb b/lib/rdoc/markup/blank_line.rb
deleted file mode 100644
index f63ae9479ced4a..00000000000000
--- a/lib/rdoc/markup/blank_line.rb
+++ /dev/null
@@ -1,27 +0,0 @@
-# frozen_string_literal: true
-##
-# An empty line.  This class is a singleton.
-
-class RDoc::Markup::BlankLine
-
-  @instance = new
-
-  ##
-  # RDoc::Markup::BlankLine is a singleton
-
-  def self.new
-    @instance
-  end
-
-  ##
-  # Calls #accept_blank_line on +visitor+
-
-  def accept visitor
-    visitor.accept_blank_line self
-  end
-
-  def pretty_print q # :nodoc:
-    q.text 'blankline'
-  end
-
-end
diff --git a/lib/rdoc/markup/block_quote.rb b/lib/rdoc/markup/block_quote.rb
deleted file mode 100644
index d9fcbf213c695d..00000000000000
--- a/lib/rdoc/markup/block_quote.rb
+++ /dev/null
@@ -1,14 +0,0 @@
-# frozen_string_literal: true
-##
-# A quoted section which contains markup items.
-
-class RDoc::Markup::BlockQuote < RDoc::Markup::Raw
-
-  ##
-  # Calls #accept_block_quote on +visitor+
-
-  def accept visitor
-    visitor.accept_block_quote self
-  end
-
-end
diff --git a/lib/rdoc/markup/document.rb b/lib/rdoc/markup/document.rb
deleted file mode 100644
index 94cf6a3666c297..00000000000000
--- a/lib/rdoc/markup/document.rb
+++ /dev/null
@@ -1,164 +0,0 @@
-# frozen_string_literal: true
-##
-# A Document containing lists, headings, paragraphs, etc.
-
-class RDoc::Markup::Document
-
-  include Enumerable
-
-  ##
-  # The file this document was created from.  See also
-  # RDoc::ClassModule#add_comment
-
-  attr_reader :file
-
-  ##
-  # If a heading is below the given level it will be omitted from the
-  # table_of_contents
-
-  attr_accessor :omit_headings_below
-
-  ##
-  # The parts of the Document
-
-  attr_reader :parts
-
-  ##
-  # Creates a new Document with +parts+
-
-  def initialize *parts
-    @parts = []
-    @parts.concat parts
-
-    @file = nil
-    @omit_headings_from_table_of_contents_below = nil
-  end
-
-  ##
-  # Appends +part+ to the document
-
-  def << part
-    case part
-    when RDoc::Markup::Document then
-      unless part.empty? then
-        parts.concat part.parts
-        parts << RDoc::Markup::BlankLine.new
-      end
-    when String then
-      raise ArgumentError,
-            "expected RDoc::Markup::Document and friends, got String" unless
-        part.empty?
-    else
-      parts << part
-    end
-  end
-
-  def == other # :nodoc:
-    self.class == other.class and
-      @file == other.file and
-      @parts == other.parts
-  end
-
-  ##
-  # Runs this document and all its #items through +visitor+
-
-  def accept visitor
-    visitor.start_accepting
-
-    visitor.accept_document self
-
-    visitor.end_accepting
-  end
-
-  ##
-  # Concatenates the given +parts+ onto the document
-
-  def concat parts
-    self.parts.concat parts
-  end
-
-  ##
-  # Enumerator for the parts of this document
-
-  def each &block
-    @parts.each(&block)
-  end
-
-  ##
-  # Does this document have no parts?
-
-  def empty?
-    @parts.empty? or (@parts.length == 1 and merged? and @parts.first.empty?)
-  end
-
-  ##
-  # The file this Document was created from.
-
-  def file= location
-    @file = case location
-            when RDoc::TopLevel then
-              location.relative_name
-            else
-              location
-            end
-  end
-
-  ##
-  # When this is a collection of documents (#file is not set and this document
-  # contains only other documents as its direct children) #merge replaces
-  # documents in this class with documents from +other+ when the file matches
-  # and adds documents from +other+ when the files do not.
-  #
-  # The information in +other+ is preferred over the receiver
-
-  def merge other
-    if empty? then
-      @parts = other.parts
-      return self
-    end
-
-    other.parts.each do |other_part|
-      self.parts.delete_if do |self_part|
-        self_part.file and self_part.file == other_part.file
-      end
-
-      self.parts << other_part
-    end
-
-    self
-  end
-
-  ##
-  # Does this Document contain other Documents?
-
-  def merged?
-    RDoc::Markup::Document === @parts.first
-  end
-
-  def pretty_print q # :nodoc:
-    start = @file ? "[doc (#{@file}): " : '[doc: '
-
-    q.group 2, start, ']' do
-      q.seplist @parts do |part|
-        q.pp part
-      end
-    end
-  end
-
-  ##
-  # Appends +parts+ to the document
-
-  def push *parts
-    self.parts.concat parts
-  end
-
-  ##
-  # Returns an Array of headings in the document.
-  #
-  # Require 'rdoc/markup/formatter' before calling this method.
-
-  def table_of_contents
-    accept RDoc::Markup::ToTableOfContents.to_toc
-  end
-
-end
diff --git a/lib/rdoc/markup/formatter.rb b/lib/rdoc/markup/formatter.rb
deleted file mode 100644
index 37a2c2751a3ccd..00000000000000
--- a/lib/rdoc/markup/formatter.rb
+++ /dev/null
@@ -1,265 +0,0 @@
-# frozen_string_literal: true
-##
-# Base class for RDoc markup formatters
-#
-# Formatters are a visitor that converts an RDoc::Markup tree (from a comment)
-# into some kind of output.  RDoc ships with formatters for converting back to
-# rdoc, ANSI text, HTML, a Table of Contents and other formats.
-#
-# If you'd like to write your own Formatter use
-# RDoc::Markup::FormatterTestCase.  If you're writing a text-output formatter
-# use RDoc::Markup::TextFormatterTestCase which provides extra test cases.
-
-class RDoc::Markup::Formatter
-
-  ##
-  # Tag for inline markup containing a +bit+ for the bitmask and the +on+ and
-  # +off+ triggers.
-
-  InlineTag = Struct.new(:bit, :on, :off)
-
-  ##
-  # Converts a target url to one that is relative to a given path
-
-  def self.gen_relative_url path, target
-    from        = File.dirname path
-    to, to_file = File.split target
-
-    from = from.split "/"
-    to   = to.split "/"
-
-    from.delete '.'
-    to.delete '.'
-
-    while from.size > 0 and to.size > 0 and from[0] == to[0] do
-      from.shift
-      to.shift
-    end
-
-    from.fill ".."
-    from.concat to
-    from << to_file
-    File.join(*from)
-  end
-
-  ##
-  # Creates a new Formatter
-
-  def initialize options, markup = nil
-    @options = options
-
-    @markup = markup || RDoc::Markup.new
-    @am     = @markup.attribute_manager
-    @am.add_regexp_handling(/<br>/, :HARD_BREAK)
-
-    @attributes = @am.attributes
-
-    @attr_tags = []
-
-    @in_tt = 0
-    @tt_bit = @attributes.bitmap_for :TT
-
-    @hard_break = ''
-    @from_path = '.'
-  end
-
-  ##
-  # Adds +document+ to the output
-
-  def accept_document document
-    document.parts.each do |item|
-      case item
-      when RDoc::Markup::Document then # HACK
-        accept_document item
-      else
-        item.accept self
-      end
-    end
-  end
-
-  ##
-  # Adds a regexp handling for links of the form rdoc-...:
-
-  def add_regexp_handling_RDOCLINK
-    @markup.add_regexp_handling(/rdoc-[a-z]+:[^\s\]]+/, :RDOCLINK)
-  end
-
-  ##
-  # Adds a regexp handling for links of the form {<text>}[<url>] and
-  # <word>[<url>]
-
-  def add_regexp_handling_TIDYLINK
-    @markup.add_regexp_handling(/(?:
-                                  \{.*?\} |    # multi-word label
-                                  \b[^\s{}]+? # single-word label
-                                 )
-
-                                 \[\S+?\]     # link target
-                                /x, :TIDYLINK)
-  end
-
-  ##
-  # Add a new set of tags for an attribute. We allow separate start and end
-  # tags for flexibility
-
-  def add_tag(name, start, stop)
-    attr = @attributes.bitmap_for name
-    @attr_tags << InlineTag.new(attr, start, stop)
-  end
-
-  ##
-  # Allows +tag+ to be decorated with additional information.
-
-  def annotate(tag)
-    tag
-  end
-
-  ##
-  # Marks up +content+
-
-  def convert content
-    @markup.convert content, self
-  end
-
-  ##
-  # Converts flow items +flow+
-
-  def convert_flow(flow)
-    res = []
-
-    flow.each do |item|
-      case item
-      when String then
-        res << convert_string(item)
-      when RDoc::Markup::AttrChanger then
-        off_tags res, item
-        on_tags res, item
-      when RDoc::Markup::RegexpHandling then
-        res << convert_regexp_handling(item)
-      else
-        raise "Unknown flow element: #{item.inspect}"
-      end
-    end
-
-    res.join
-  end
-
-  ##
-  # Converts added regexp handlings. See RDoc::Markup#add_regexp_handling
-
-  def convert_regexp_handling target
-    return target.text if in_tt?
-
-    handled = false
-
-    @attributes.each_name_of target.type do |name|
-      method_name = "handle_regexp_#{name}"
-
-      if respond_to? method_name then
-        target.text = public_send method_name, target
-        handled = true
-      end
-    end
-
-    unless handled then
-      target_name = @attributes.as_string target.type
-
-      raise RDoc::Error, "Unhandled regexp handling #{target_name}: #{target}"
-    end
-
-    target.text
-  end
-
-  ##
-  # Converts a string to be fancier if desired
-
-  def convert_string string
-    string
-  end
-
-  ##
-  # Use ignore in your subclass to ignore the content of a node.
-  #
-  #   ##
-  #   # We don't support raw nodes in ToNoRaw
-  #
-  #   alias accept_raw ignore
-
-  def ignore *node
-  end
-
-  ##
-  # Are we currently inside tt tags?
-
-  def in_tt?
-    @in_tt > 0
-  end
-
-  ##
-  # Turns on tags for +item+ on +res+
-
-  def on_tags res, item
-    attr_mask = item.turn_on
-    return if attr_mask.zero?
-
-    @attr_tags.each do |tag|
-      if attr_mask & tag.bit != 0 then
-        res << annotate(tag.on)
-        @in_tt += 1 if tt? tag
-      end
-    end
-  end
-
-  ##
-  # Turns off tags for +item+ on +res+
-
-  def off_tags res, item
-    attr_mask = item.turn_off
-    return if attr_mask.zero?
-
-    @attr_tags.reverse_each do |tag|
-      if attr_mask & tag.bit != 0 then
-        @in_tt -= 1 if tt? tag
-        res << annotate(tag.off)
-      end
-    end
-  end
-
-  ##
-  # Extracts and a scheme, url and an anchor id from +url+ and returns them.
-
-  def parse_url url
-    case url
-    when /^rdoc-label:([^:]*)(?::(.*))?/ then
-      scheme = 'link'
-      path   = "##{$1}"
-      id     = " id=\"#{$2}\"" if $2
-    when /([A-Za-z]+):(.*)/ then
-      scheme = $1.downcase
-      path   = $2
-    when /^#/ then
-    else
-      scheme = 'http'
-      path   = url
-      url    = url
-    end
-
-    if scheme == 'link' then
-      url = if path[0, 1] == '#' then # is this meaningful?
-              path
-            else
-              self.class.gen_relative_url @from_path, path
-            end
-    end
-
-    [scheme, url, id]
-  end
-
-  ##
-  # Is +tag+ a tt tag?
-
-  def tt? tag
-    tag.bit == @tt_bit
-  end
-
-end
diff --git a/lib/rdoc/markup/hard_break.rb b/lib/rdoc/markup/hard_break.rb
deleted file mode 100644
index de1819c9030f2c..00000000000000
--- a/lib/rdoc/markup/hard_break.rb
+++ /dev/null
@@ -1,31 +0,0 @@
-# frozen_string_literal: true
-##
-# A hard-break in the middle of a paragraph.
-
-class RDoc::Markup::HardBreak
-
-  @instance = new
-
-  ##
-  # RDoc::Markup::HardBreak is a singleton
-
-  def self.new
-    @instance
-  end
-
-  ##
-  # Calls #accept_hard_break on +visitor+
-
-  def accept visitor
-    visitor.accept_hard_break self
-  end
-
-  def == other # :nodoc:
-    self.class === other
-  end
-
-  def pretty_print q # :nodoc:
-    q.text "[break]"
-  end
-
-end
diff --git a/lib/rdoc/markup/heading.rb b/lib/rdoc/markup/heading.rb
deleted file mode 100644
index 02476e5226234f..00000000000000
--- a/lib/rdoc/markup/heading.rb
+++ /dev/null
@@ -1,78 +0,0 @@
-# frozen_string_literal: true
-##
-# A heading with a level (1-6) and text
-
-RDoc::Markup::Heading =
-  Struct.new :level, :text do
-
-  @to_html = nil
-  @to_label = nil
-
-  ##
-  # A singleton RDoc::Markup::ToLabel formatter for headings.
-
-  def self.to_label
-    @to_label ||= RDoc::Markup::ToLabel.new
-  end
-
-  ##
-  # A singleton plain HTML formatter for headings.  Used for creating labels
-  # for the Table of Contents
-
-  def self.to_html
-    return @to_html if @to_html
-
-    markup = RDoc::Markup.new
-    markup.add_regexp_handling RDoc::CrossReference::CROSSREF_REGEXP, :CROSSREF
-
-    @to_html = RDoc::Markup::ToHtml.new nil
-
-    def @to_html.handle_regexp_CROSSREF target
-      target.text.sub(/^\\/, '')
-    end
-
-    @to_html
-  end
-
-  ##
-  # Calls #accept_heading on +visitor+
-
-  def accept visitor
-    visitor.accept_heading self
-  end
-
-  ##
-  # An HTML-safe anchor reference for this header.
-
-  def aref
-    "label-#{self.class.to_label.convert text.dup}"
-  end
-
-  ##
-  # Creates a fully-qualified label which will include the label from
-  # +context+.  This helps keep ids unique in HTML.
-
-  def label context = nil
-    label = aref
-
-    label = [context.aref, label].compact.join '-' if
-      context and context.respond_to? :aref
-
-    label
-  end
-
-  ##
-  # HTML markup of the text of this label without the surrounding header
-  # element.
-
-  def plain_html
-    self.class.to_html.to_html(text.dup)
-  end
-
-  def pretty_print q # :nodoc:
-    q.group 2, "[head: #{level} ", ']' do
-      q.pp text
-    end
-  end
-
-end
diff --git a/lib/rdoc/markup/include.rb b/lib/rdoc/markup/include.rb
deleted file mode 100644
index 2bf63526b20557..00000000000000
--- a/lib/rdoc/markup/include.rb
+++ /dev/null
@@ -1,42 +0,0 @@
-# frozen_string_literal: true
-##
-# A file included at generation time.  Objects of this class are created by
-# RDoc::RD for an extension-less include.
-#
-# This implementation in incomplete.
-
-class RDoc::Markup::Include
-
-  ##
-  # The filename to be included, without extension
-
-  attr_reader :file
-
-  ##
-  # Directories to search for #file
-
-  attr_reader :include_path
-
-  ##
-  # Creates a new include that will import +file+ from +include_path+
-
-  def initialize file, include_path
-    @file = file
-    @include_path = include_path
-  end
-
-  def == other # :nodoc:
-    self.class === other and
-      @file == other.file and @include_path == other.include_path
-  end
-
-  def pretty_print q # :nodoc:
-    q.group 2, '[incl ', ']' do
-      q.text file
-      q.breakable
-      q.text 'from '
-      q.pp include_path
-    end
-  end
-
-end
diff --git a/lib/rdoc/markup/indented_paragraph.rb b/lib/rdoc/markup/indented_paragraph.rb
deleted file mode 100644
index 992cd7cf81570e..00000000000000
--- a/lib/rdoc/markup/indented_paragraph.rb
+++ /dev/null
@@ -1,47 +0,0 @@
-# frozen_string_literal: true
-##
-# An Indented Paragraph of text
-
-class RDoc::Markup::IndentedParagraph < RDoc::Markup::Raw
-
-  ##
-  # The indent in number of spaces
-
-  attr_reader :indent
-
-  ##
-  # Creates a new IndentedParagraph containing +parts+ indented with +indent+
-  # spaces
-
-  def initialize indent, *parts
-    @indent = indent
-
-    super(*parts)
-  end
-
-  def == other # :nodoc:
-    super and indent == other.indent
-  end
-
-  ##
-  # Calls #accept_indented_paragraph on +visitor+
-
-  def accept visitor
-    visitor.accept_indented_paragraph self
-  end
-
-  ##
-  # Joins the raw paragraph text and converts inline HardBreaks to the
-  # +hard_break+ text followed by the indent.
-
-  def text hard_break = nil
-    @parts.map do |part|
-      if RDoc::Markup::HardBreak === part then
-        '%1$s%3$*2$s' % [hard_break, @indent, ' '] if hard_break
-      else
-        part
-      end
-    end.join
-  end
-
-end
diff --git a/lib/rdoc/markup/list.rb b/lib/rdoc/markup/list.rb
deleted file mode 100644
index 112b7a1a86fd4e..00000000000000
--- a/lib/rdoc/markup/list.rb
+++ /dev/null
@@ -1,101 +0,0 @@
-# frozen_string_literal: true
-##
-# A List is a homogeneous set of ListItems.
-#
-# The supported list types include:
-#
-# :BULLET::
-#   An unordered list
-# :LABEL::
-#   An unordered definition list, but using an alternate RDoc::Markup syntax
-# :LALPHA::
-#   An ordered list using increasing lowercase English letters
-# :NOTE::
-#   An unordered definition list
-# :NUMBER::
-#   An ordered list using increasing Arabic numerals
-# :UALPHA::
-#   An ordered list using increasing uppercase English letters
-#
-# Definition lists behave like HTML definition lists.  Each list item can
-# describe multiple terms.  See RDoc::Markup::ListItem for how labels and
-# definition are stored as list items.
-
-class RDoc::Markup::List
-
-  ##
-  # The list's type
-
-  attr_accessor :type
-
-  ##
-  # Items in the list
-
-  attr_reader :items
-
-  ##
-  # Creates a new list of +type+ with +items+.  Valid list types are:
-  # +:BULLET+, +:LABEL+, +:LALPHA+, +:NOTE+, +:NUMBER+, +:UALPHA+
-
-  def initialize type = nil, *items
-    @type = type
-    @items = []
-    @items.concat items
-  end
-
-  ##
-  # Appends +item+ to the list
-
-  def << item
-    @items << item
-  end
-
-  def == other # :nodoc:
-    self.class == other.class and
-      @type == other.type and
-      @items == other.items
-  end
-
-  ##
-  # Runs this list and all its #items through +visitor+
-
-  def accept visitor
-    visitor.accept_list_start self
-
-    @items.each do |item|
-      item.accept visitor
-    end
-
-    visitor.accept_list_end self
-  end
-
-  ##
-  # Is the list empty?
-
-  def empty?
-    @items.empty?
-  end
-
-  ##
-  # Returns the last item in the list
-
-  def last
-    @items.last
-  end
-
-  def pretty_print q # :nodoc:
-    q.group 2, "[list: #{@type} ", ']' do
-      q.seplist @items do |item|
-        q.pp item
-      end
-    end
-  end
-
-  ##
-  # Appends +items+ to the list
-
-  def push *items
-    @items.concat items
-  end
-
-end
diff --git a/lib/rdoc/markup/list_item.rb b/lib/rdoc/markup/list_item.rb
deleted file mode 100644
index 0b8326a69fc3ae..00000000000000
--- a/lib/rdoc/markup/list_item.rb
+++ /dev/null
@@ -1,99 +0,0 @@
-# frozen_string_literal: true
-##
-# An item within a List that contains paragraphs, headings, etc.
-#
-# For BULLET, NUMBER, LALPHA and UALPHA lists, the label will always be nil.
-# For NOTE and LABEL lists, the list label may contain:
-#
-# * a single String for a single label
-# * an Array of Strings for a list item with multiple terms
-# * nil for an extra description attached to a previously labeled list item
-
-class RDoc::Markup::ListItem
-
-  ##
-  # The label for the ListItem
-
-  attr_accessor :label
-
-  ##
-  # Parts of the ListItem
-
-  attr_reader :parts
-
-  ##
-  # Creates a new ListItem with an optional +label+ containing +parts+
-
-  def initialize label = nil, *parts
-    @label = label
-    @parts = []
-    @parts.concat parts
-  end
-
-  ##
-  # Appends +part+ to the ListItem
-
-  def << part
-    @parts << part
-  end
-
-  def == other # :nodoc:
-    self.class == other.class and
-      @label == other.label and
-      @parts == other.parts
-  end
-
-  ##
-  # Runs this list item and all its #parts through +visitor+
-
-  def accept visitor
-    visitor.accept_list_item_start self
-
-    @parts.each do |part|
-      part.accept visitor
-    end
-
-    visitor.accept_list_item_end self
-  end
-
-  ##
-  # Is the ListItem empty?
-
-  def empty?
-    @parts.empty?
-  end
-
-  ##
-  # Length of parts in the ListItem
-
-  def length
-    @parts.length
-  end
-
-  def pretty_print q # :nodoc:
-    q.group 2, '[item: ', ']' do
-      case @label
-      when Array then
-        q.pp @label
-        q.text ';'
-        q.breakable
-      when String then
-        q.pp @label
-        q.text ';'
-        q.breakable
-      end
-
-      q.seplist @parts do |part|
-        q.pp part
-      end
-    end
-  end
-
-  ##
-  # Adds +parts+ to the ListItem
-
-  def push *parts
-    @parts.concat parts
-  end
-
-end
diff --git a/lib/rdoc/markup/paragraph.rb b/lib/rdoc/markup/paragraph.rb
deleted file mode 100644
index 21dfda007ad4d5..00000000000000
--- a/lib/rdoc/markup/paragraph.rb
+++ /dev/null
@@ -1,28 +0,0 @@
-# frozen_string_literal: true
-##
-# A Paragraph of text
-
-class RDoc::Markup::Paragraph < RDoc::Markup::Raw
-
-  ##
-  # Calls #accept_paragraph on +visitor+
-
-  def accept visitor
-    visitor.accept_paragraph self
-  end
-
-  ##
-  # Joins the raw paragraph text and converts inline HardBreaks to the
-  # +hard_break+ text.
-
-  def text hard_break = ''
-    @parts.map do |part|
-      if RDoc::Markup::HardBreak === part then
-        hard_break
-      else
-        part
-      end
-    end.join
-  end
-
-end
diff --git a/lib/rdoc/markup/parser.rb b/lib/rdoc/markup/parser.rb
deleted file mode 100644
index 0029df7e65e7f9..00000000000000
--- a/lib/rdoc/markup/parser.rb
+++ /dev/null
@@ -1,581 +0,0 @@
-# frozen_string_literal: true
-require 'strscan'
-
-##
-# A recursive-descent parser for RDoc markup.
-#
-# The parser tokenizes an input string then parses the tokens into a Document.
-# Documents can be converted into output formats by writing a visitor like
-# RDoc::Markup::ToHTML.
-#
-# The parser only handles the block-level constructs Paragraph, List,
-# ListItem, Heading, Verbatim, BlankLine, Rule and BlockQuote.
-# Inline markup such as <tt>\+blah\+</tt> is handled separately by
-# RDoc::Markup::AttributeManager.
-#
-# To see what markup the Parser implements read RDoc.  To see how to use
-# RDoc markup to format text in your program read RDoc::Markup.
-
-class RDoc::Markup::Parser
-
-  include RDoc::Text
-
-  ##
-  # List token types
-
-  LIST_TOKENS = [
-    :BULLET,
-    :LABEL,
-    :LALPHA,
-    :NOTE,
-    :NUMBER,
-    :UALPHA,
-  ]
-
-  ##
-  # Parser error subclass
-
-  class Error < RuntimeError; end
-
-  ##
-  # Raised when the parser is unable to handle the given markup
-
-  class ParseError < Error; end
-
-  ##
-  # Enables display of debugging information
-
-  attr_accessor :debug
-
-  ##
-  # Token accessor
-
-  attr_reader :tokens
-
-  ##
-  # Parses +str+ into a Document.
-  #
-  # Use RDoc::Markup#parse instead of this method.
-
-  def self.parse str
-    parser = new
-    parser.tokenize str
-    doc = RDoc::Markup::Document.new
-    parser.parse doc
-  end
-
-  ##
-  # Returns a token stream for +str+, for testing
-
-  def self.tokenize str
-    parser = new
-    parser.tokenize str
-    parser.tokens
-  end
-
-  ##
-  # Creates a new Parser.  See also ::parse
-
-  def initialize
-    @binary_input   = nil
-    @current_token  = nil
-    @debug          = false
-    @s              = nil
-    @tokens         = []
-  end
-
-  ##
-  # Builds a Heading of +level+
-
-  def build_heading level
-    type, text, = get
-
-    text = case type
-           when :TEXT then
-             skip :NEWLINE
-             text
-           else
-             unget
-             ''
-           end
-
-    RDoc::Markup::Heading.new level, text
-  end
-
-  ##
-  # Builds a List flush to +margin+
-
-  def build_list margin
-    p :list_start => margin if @debug
-
-    list = RDoc::Markup::List.new
-    label = nil
-
-    until @tokens.empty? do
-      type, data, column, = get
-
-      case type
-      when *LIST_TOKENS then
-        if column < margin || (list.type && list.type != type) then
-          unget
-          break
-        end
-
-        list.type = type
-        peek_type, _, column, = peek_token
-
-        case type
-        when :NOTE, :LABEL then
-          label = [] unless label
-
-          if peek_type == :NEWLINE then
-            # description not on the same line as LABEL/NOTE
-            # skip the trailing newline & any blank lines below
-            while peek_type == :NEWLINE
-              get
-              peek_type, _, column, = peek_token
-            end
-
-            # we may be:
-            #   - at end of stream
-            #   - at a column < margin:
-            #         [text]
-            #       blah blah blah
-            #   - at the same column, but with a different type of list item
-            #       [text]
-            #       * blah blah
-            #   - at the same column, with the same type of list item
-            #       [one]
-            #       [two]
-            # In all cases, we have an empty description.
-            # In the last case only, we continue.
-            if peek_type.nil? || column < margin then
-              empty = true
-            elsif column == margin then
-              case peek_type
-              when type
-                empty = :continue
-              when *LIST_TOKENS
-                empty = true
-              else
-                empty = false
-              end
-            else
-              empty = false
-            end
-
-            if empty then
-              label << data
-              next if empty == :continue
-              break
-            end
-          end
-        else
-          data = nil
-        end
-
-        if label then
-          data = label << data
-          label = nil
-        end
-
-        list_item = RDoc::Markup::ListItem.new data
-        parse list_item, column
-        list << list_item
-
-      else
-        unget
-        break
-      end
-    end
-
-    p :list_end => margin if @debug
-
-    if list.empty? then
-      return nil unless label
-      return nil unless [:LABEL, :NOTE].include? list.type
-
-      list_item = RDoc::Markup::ListItem.new label, RDoc::Markup::BlankLine.new
-      list << list_item
-    end
-
-    list
-  end
-
-  ##
-  # Builds a Paragraph that is flush to +margin+
-
-  def build_paragraph margin
-    p :paragraph_start => margin if @debug
-
-    paragraph = RDoc::Markup::Paragraph.new
-
-    until @tokens.empty? do
-      type, data, column, = get
-
-      if type == :TEXT and column == margin then
-        paragraph << data
-
-        break if peek_token.first == :BREAK
-
-        data << ' ' if skip :NEWLINE
-      else
-        unget
-        break
-      end
-    end
-
-    paragraph.parts.last.sub!(/ \z/, '') # cleanup
-
-    p :paragraph_end => margin if @debug
-
-    paragraph
-  end
-
-  ##
-  # Builds a Verbatim that is indented from +margin+.
-  #
-  # The verbatim block is shifted left (the least indented lines start in
-  # column 0).  Each part of the verbatim is one line of text, always
-  # terminated by a newline.  Blank lines always consist of a single newline
-  # character, and there is never a single newline at the end of the verbatim.
-
-  def build_verbatim margin
-    p :verbatim_begin => margin if @debug
-    verbatim = RDoc::Markup::Verbatim.new
-
-    min_indent = nil
-    generate_leading_spaces = true
-    line = ''.dup
-
-    until @tokens.empty? do
-      type, data, column, = get
-
-      if type == :NEWLINE then
-        line << data
-        verbatim << line
-        line = ''.dup
-        generate_leading_spaces = true
-        next
-      end
-
-      if column <= margin
-        unget
-        break
-      end
-
-      if generate_leading_spaces then
-        indent = column - margin
-        line << ' ' * indent
-        min_indent = indent if min_indent.nil? || indent < min_indent
-        generate_leading_spaces = false
-      end
-
-      case type
-      when :HEADER then
-        line << '=' * data
-        _, _, peek_column, = peek_token
-        peek_column ||= column + data
-        indent = peek_column - column - data
-        line << ' ' * indent
-      when :RULE then
-        width = 2 + data
-        line << '-' * width
-        _, _, peek_column, = peek_token
-        peek_column ||= column + width
-        indent = peek_column - column - width
-        line << ' ' * indent
-      when :BREAK, :TEXT then
-        line << data
-      when :BLOCKQUOTE then
-        line << '>>>'
-        peek_type, _, peek_column = peek_token
-        if peek_type != :NEWLINE and peek_column
-          line << ' ' * (peek_column - column - 3)
-        end
-      else # *LIST_TOKENS
-        list_marker = case type
-                      when :BULLET then data
-                      when :LABEL  then "[#{data}]"
-                      when :NOTE   then "#{data}::"
-                      else # :LALPHA, :NUMBER, :UALPHA
-                        "#{data}."
-                      end
-        line << list_marker
-        peek_type, _, peek_column = peek_token
-        unless peek_type == :NEWLINE then
-          peek_column ||= column + list_marker.length
-          indent = peek_column - column - list_marker.length
-          line << ' ' * indent
-        end
-      end
-
-    end
-
-    verbatim << line << "\n" unless line.empty?
-    verbatim.parts.each { |p| p.slice!(0, min_indent) unless p == "\n" } if min_indent > 0
-    verbatim.normalize
-
-    p :verbatim_end => margin if @debug
-
-    verbatim
-  end
-
-  ##
-  # Pulls the next token from the stream.
-
-  def get
-    @current_token = @tokens.shift
-    p :get => @current_token if @debug
-    @current_token
-  end
-
-  ##
-  # Parses the tokens into an array of RDoc::Markup::XXX objects,
-  # and appends them to the passed +parent+ RDoc::Markup::YYY object.
-  #
-  # Exits at the end of the token stream, or when it encounters a token
-  # in a column less than +indent+ (unless it is a NEWLINE).
-  #
-  # Returns +parent+.
-
-  def parse parent, indent = 0
-    p :parse_start => indent if @debug
-
-    until @tokens.empty? do
-      type, data, column, = get
-
-      case type
-      when :BREAK then
-        parent << RDoc::Markup::BlankLine.new
-        skip :NEWLINE, false
-        next
-      when :NEWLINE then
-        # trailing newlines are skipped below, so this is a blank line
-        parent << RDoc::Markup::BlankLine.new
-        skip :NEWLINE, false
-        next
-      end
-
-      # indentation change: break or verbatim
-      if column < indent then
-        unget
-        break
-      elsif column > indent then
-        unget
-        parent << build_verbatim(indent)
-        next
-      end
-
-      # indentation is the same
-      case type
-      when :HEADER then
-        parent << build_heading(data)
-      when :RULE then
-        parent << RDoc::Markup::Rule.new(data)
-        skip :NEWLINE
-      when :TEXT then
-        unget
-        parse_text parent, indent
-      when :BLOCKQUOTE then
-        nil while (type, = get; type) and type != :NEWLINE
-        _, _, column, = peek_token
-        bq = RDoc::Markup::BlockQuote.new
-        p :blockquote_start => [data, column] if @debug
-        parse bq, column
-        p :blockquote_end => indent if @debug
-        parent << bq
-      when *LIST_TOKENS then
-        unget
-        parent << build_list(indent)
-      else
-        type, data, column, line = @current_token
-        raise ParseError, "Unhandled token #{type} (#{data.inspect}) at #{line}:#{column}"
-      end
-    end
-
-    p :parse_end => indent if @debug
-
-    parent
-
-  end
-
-  ##
-  # Small hook that is overridden by RDoc::TomDoc
-
-  def parse_text parent, indent # :nodoc:
-    parent << build_paragraph(indent)
-  end
-
-  ##
-  # Returns the next token on the stream without modifying the stream
-
-  def peek_token
-    token = @tokens.first || []
-    p :peek => token if @debug
-    token
-  end
-
-  ##
-  # A simple wrapper of StringScanner that is aware of the current column and lineno
-
-  class MyStringScanner
-    def initialize(input)
-      @line = @column = 0
-      @s = StringScanner.new input
-    end
-
-    def scan(re)
-      ret = @s.scan(re)
-      @column += ret.length if ret
-      ret
-    end
-
-    def unscan(s)
-      @s.pos -= s.bytesize
-      @column -= s.length
-    end
-
-    def pos
-      [@column, @line]
-    end
-
-    def newline!
-      @column = 0
-      @line += 1
-    end
-
-    def eos?
-      @s.eos?
-    end
-
-    def matched
-      @s.matched
-    end
-
-    def [](i)
-      @s[i]
-    end
-  end
-
-  ##
-  # Creates the StringScanner
-
-  def setup_scanner input
-    @s = MyStringScanner.new input
-  end
-
-  ##
-  # Skips the next token if its type is +token_type+.
-  #
-  # Optionally raises an error if the next token is not of the expected type.
-
-  def skip token_type, error = true
-    type, = get
-    return unless type # end of stream
-    return @current_token if token_type == type
-    unget
-    raise ParseError, "expected #{token_type} got #{@current_token.inspect}" if error
-  end
-
-  ##
-  # Turns text +input+ into a stream of tokens
-
-  def tokenize input
-    setup_scanner input
-
-    until @s.eos? do
-      pos = @s.pos
-
-      # leading spaces will be reflected by the column of the next token
-      # the only thing we loose are trailing spaces at the end of the file
-      next if @s.scan(/ +/)
-
-      # note: after BULLET, LABEL, etc.,
-      # indent will be the column of the next non-newline token
-
-      @tokens << case
-                 # [CR]LF => :NEWLINE
-                 when @s.scan(/\r?\n/) then
-                   token = [:NEWLINE, @s.matched, *pos]
-                   @s.newline!
-                   token
-                 # === text => :HEADER then :TEXT
-                 when @s.scan(/(=+)(\s*)/) then
-                   level = @s[1].length
-                   header = [:HEADER, level, *pos]
-
-                   if @s[2] =~ /^\r?\n/ then
-                     @s.unscan(@s[2])
-                     header
-                   else
-                     pos = @s.pos
-                     @s.scan(/.*/)
-                     @tokens << header
-                     [:TEXT, @s.matched.sub(/\r$/, ''), *pos]
-                   end
-                 # --- (at least 3) and nothing else on the line => :RULE
-                 when @s.scan(/(-{3,}) *\r?$/) then
-                   [:RULE, @s[1].length - 2, *pos]
-                 # * or - followed by white space and text => :BULLET
-                 when @s.scan(/([*-]) +(\S)/) then
-                   @s.unscan(@s[2])
-                   [:BULLET, @s[1], *pos]
-                 # A. text, a. text, 12. text => :UALPHA, :LALPHA, :NUMBER
-                 when @s.scan(/([a-z]|\d+)\. +(\S)/i) then
-                   # FIXME if tab(s), the column will be wrong
-                   # either support tabs everywhere by first expanding them to
-                   # spaces, or assume that they will have been replaced
-                   # before (and provide a check for that at least in debug
-                   # mode)
-                   list_label = @s[1]
-                   @s.unscan(@s[2])
-                   list_type =
-                     case list_label
-                     when /[a-z]/ then :LALPHA
-                     when /[A-Z]/ then :UALPHA
-                     when /\d/    then :NUMBER
-                     else
-                       raise ParseError, "BUG token #{list_label}"
-                     end
-                   [list_type, list_label, *pos]
-                 # [text] followed by spaces or end of line => :LABEL
-                 when @s.scan(/\[(.*?)\]( +|\r?$)/) then
-                   [:LABEL, @s[1], *pos]
-                 # text:: followed by spaces or end of line => :NOTE
-                 when @s.scan(/(.*?)::( +|\r?$)/) then
-                   [:NOTE, @s[1], *pos]
-                 # >>> followed by end of line => :BLOCKQUOTE
-                 when @s.scan(/>>> *(\w+)?$/) then
-                   if word = @s[1]
-                     @s.unscan(word)
-                   end
-                   [:BLOCKQUOTE, word, *pos]
-                 # anything else: :TEXT
-                 else
-                   @s.scan(/(.*?)(  )?\r?$/)
-                   token = [:TEXT, @s[1], *pos]
-
-                   if @s[2] then
-                     @tokens << token
-                     [:BREAK, @s[2], pos[0] + @s[1].length, pos[1]]
-                   else
-                     token
-                   end
-                 end
-    end
-
-    self
-  end
-
-  ##
-  # Returns the current token to the token stream
-
-  def unget
-    token = @current_token
-    p :unget => token if @debug
-    raise Error, 'too many #ungets' if token == @tokens.first
-    @tokens.unshift token if token
-  end
-
-end
diff --git a/lib/rdoc/markup/pre_process.rb b/lib/rdoc/markup/pre_process.rb
deleted file mode 100644
index 88078c9cefca56..00000000000000
--- a/lib/rdoc/markup/pre_process.rb
+++ /dev/null
@@ -1,298 +0,0 @@
-# frozen_string_literal: true
-##
-# Handle common directives that can occur in a block of text:
-#
-#   \:include: filename
-#
-# Directives can be escaped by preceding them with a backslash.
-#
-# RDoc plugin authors can register additional directives to be handled by
-# using RDoc::Markup::PreProcess::register.
-#
-# Any directive that is not built-in to RDoc (including those registered via
-# plugins) will be stored in the metadata hash on the CodeObject the comment
-# is attached to.  See RDoc::Markup@Directives for the list of built-in
-# directives.
-
-class RDoc::Markup::PreProcess
-
-  ##
-  # An RDoc::Options instance that will be filled in with overrides from
-  # directives
-
-  attr_accessor :options
-
-  ##
-  # Adds a post-process handler for directives.  The handler will be called
-  # with the result RDoc::Comment (or text String) and the code object for the
-  # comment (if any).
-
-  def self.post_process &block
-    @post_processors << block
-  end
-
-  ##
-  # Registered post-processors
-
-  def self.post_processors
-    @post_processors
-  end
-
-  ##
-  # Registers +directive+ as one handled by RDoc.  If a block is given the
-  # directive will be replaced by the result of the block, otherwise the
-  # directive will be removed from the processed text.
-  #
-  # The block will be called with the directive name and the directive
-  # parameter:
-  #
-  #   RDoc::Markup::PreProcess.register 'my-directive' do |directive, param|
-  #     # replace text, etc.
-  #   end
-
-  def self.register directive, &block
-    @registered[directive] = block
-  end
-
-  ##
-  # Registered directives
-
-  def self.registered
-    @registered
-  end
-
-  ##
-  # Clears all registered directives and post-processors
-
-  def self.reset
-    @post_processors = []
-    @registered = {}
-  end
-
-  reset
-
-  ##
-  # Creates a new pre-processor for +input_file_name+ that will look for
-  # included files in +include_path+
-
-  def initialize(input_file_name, include_path)
-    @input_file_name = input_file_name
-    @include_path = include_path
-    @options = nil
-  end
-
-  ##
-  # Look for directives in the given +text+.
-  #
-  # Options that we don't handle are yielded.  If the block returns false the
-  # directive is restored to the text.  If the block returns nil or no block
-  # was given the directive is handled according to the registered directives.
-  # If a String was returned the directive is replaced with the string.
-  #
-  # If no matching directive was registered the directive is restored to the
-  # text.
-  #
-  # If +code_object+ is given and the directive is unknown then the
-  # directive's parameter is set as metadata on the +code_object+.  See
-  # RDoc::CodeObject#metadata for details.
-
-  def handle text, code_object = nil, &block
-    if RDoc::Comment === text then
-      comment = text
-      text = text.text
-    end
-
-    # regexp helper (square brackets for optional)
-    # $1      $2  $3        $4      $5
-    # [prefix][\]:directive:[spaces][param]newline
-    text = text.gsub(/^([ \t]*(?:#|\/?\*)?[ \t]*)(\\?):(\w+):([ \t]*)(.+)?(\r?\n|$)/) do
-      # skip something like ':toto::'
-      next $& if $4.empty? and $5 and $5[0, 1] == ':'
-
-      # skip if escaped
-      next "#$1:#$3:#$4#$5\n" unless $2.empty?
-
-      # This is not in handle_directive because I didn't want to pass another
-      # argument into it
-      if comment and $3 == 'markup' then
-        next "#{$1.strip}\n" unless $5
-        comment.format = $5.downcase
-        next "#{$1.strip}\n"
-      end
-
-      handle_directive $1, $3, $5, code_object, text.encoding, &block
-    end
-
-    if comment then
-      comment.text = text
-    else
-      comment = text
-    end
-
-    self.class.post_processors.each do |handler|
-      handler.call comment, code_object
-    end
-
-    text
-  end
-
-  ##
-  # Performs the actions described by +directive+ and its parameter +param+.
-  #
-  # +code_object+ is used for directives that operate on a class or module.
-  # +prefix+ is used to ensure the replacement for handled directives is
-  # correct.  +encoding+ is used for the <tt>include</tt> directive.
-  #
-  # For a list of directives in RDoc see RDoc::Markup.
-  #--
-  # When 1.8.7 support is ditched prefix can be defaulted to ''
-
-  def handle_directive prefix, directive, param, code_object = nil,
-                       encoding = nil
-    blankline = "#{prefix.strip}\n"
-    directive = directive.downcase
-
-    case directive
-    when 'arg', 'args' then
-      return "#{prefix}:#{directive}: #{param}\n" unless code_object && code_object.kind_of?(RDoc::AnyMethod)
-
-      code_object.params = param
-
-      blankline
-    when 'category' then
-      if RDoc::Context === code_object then
-        section = code_object.add_section param
-        code_object.temporary_section = section
-      elsif RDoc::AnyMethod === code_object then
-        code_object.section_title = param
-      end
-
-      blankline # ignore category if we're not on an RDoc::Context
-    when 'doc' then
-      return blankline unless code_object
-      code_object.document_self = true
-      code_object.force_documentation = true
-
-      blankline
-    when 'enddoc' then
-      return blankline unless code_object
-      code_object.done_documenting = true
-
-      blankline
-    when 'include' then
-      filename = param.split(' ', 2).first
-      include_file filename, prefix, encoding
-    when 'main' then
-      @options.main_page = param if @options.respond_to? :main_page
-
-      blankline
-    when 'nodoc' then
-      return blankline unless code_object
-      code_object.document_self = nil # notify nodoc
-      code_object.document_children = param !~ /all/i
-
-      blankline
-    when 'notnew', 'not_new', 'not-new' then
-      return blankline unless RDoc::AnyMethod === code_object
-
-      code_object.dont_rename_initialize = true
-
-      blankline
-    when 'startdoc' then
-      return blankline unless code_object
-
-      code_object.start_doc
-      code_object.force_documentation = true
-
-      blankline
-    when 'stopdoc' then
-      return blankline unless code_object
-
-      code_object.stop_doc
-
-      blankline
-    when 'title' then
-      @options.default_title = param if @options.respond_to? :default_title=
-
-      blankline
-    when 'yield', 'yields' then
-      return blankline unless code_object
-      # remove parameter &block
-      code_object.params = code_object.params.sub(/,?\s*&\w+/, '') if code_object.params
-
-      code_object.block_params = param
-
-      blankline
-    else
-      result = yield directive, param if block_given?
-
-      case result
-      when nil then
-        code_object.metadata[directive] = param if code_object
-
-        if RDoc::Markup::PreProcess.registered.include? directive then
-          handler = RDoc::Markup::PreProcess.registered[directive]
-          result = handler.call directive, param if handler
-        else
-          result = "#{prefix}:#{directive}: #{param}\n"
-        end
-      when false then
-        result = "#{prefix}:#{directive}: #{param}\n"
-      end
-
-      result
-    end
-  end
-
-  ##
-  # Handles the <tt>:include: _filename_</tt> directive.
-  #
-  # If the first line of the included file starts with '#', and contains
-  # an encoding information in the form 'coding:' or 'coding=', it is
-  # removed.
-  #
-  # If all lines in the included file start with a '#', this leading '#'
-  # is removed before inclusion. The included content is indented like
-  # the <tt>:include:</tt> directive.
-  #--
-  # so all content will be verbatim because of the likely space after '#'?
-  # TODO shift left the whole file content in that case
-  # TODO comment stop/start #-- and #++ in included file must be processed here
-
-  def include_file name, indent, encoding
-    full_name = find_include_file name
-
-    unless full_name then
-      warn "Couldn't find file to include '#{name}' from #{@input_file_name}"
-      return ''
-    end
-
-    content = RDoc::Encoding.read_file full_name, encoding, true
-    content = RDoc::Encoding.remove_magic_comment content
-
-    # strip magic comment
-    content = content.sub(/\A# .*coding[=:].*$/, '').lstrip
-
-    # strip leading '#'s, but only if all lines start with them
-    if content =~ /^[^#]/ then
-      content.gsub(/^/, indent)
-    else
-      content.gsub(/^#?/, indent)
-    end
-  end
-
-  ##
-  # Look for the given file in the directory containing the current file,
-  # and then in each of the directories specified in the RDOC_INCLUDE path
-
-  def find_include_file(name)
-    to_search = [File.dirname(@input_file_name)].concat @include_path
-    to_search.each do |dir|
-      full_name = File.join(dir, name)
-      stat = File.stat(full_name) rescue next
-      return full_name if stat.readable?
-    end
-    nil
-  end
-
-end
diff --git a/lib/rdoc/markup/raw.rb b/lib/rdoc/markup/raw.rb
deleted file mode 100644
index a7c1c210a6fa06..00000000000000
--- a/lib/rdoc/markup/raw.rb
+++ /dev/null
@@ -1,69 +0,0 @@
-# frozen_string_literal: true
-##
-# A section of text that is added to the output document as-is
-
-class RDoc::Markup::Raw
-
-  ##
-  # The component parts of the list
-
-  attr_reader :parts
-
-  ##
-  # Creates a new Raw containing +parts+
-
-  def initialize *parts
-    @parts = []
-    @parts.concat parts
-  end
-
-  ##
-  # Appends +text+
-
-  def << text
-    @parts << text
-  end
-
-  def == other # :nodoc:
-    self.class == other.class and @parts == other.parts
-  end
-
-  ##
-  # Calls #accept_raw+ on +visitor+
-
-  def accept visitor
-    visitor.accept_raw self
-  end
-
-  ##
-  # Appends +other+'s parts
-
-  def merge other
-    @parts.concat other.parts
-  end
-
-  def pretty_print q # :nodoc:
-    self.class.name =~ /.*::(\w{1,4})/i
-
-    q.group 2, "[#{$1.downcase}: ", ']' do
-      q.seplist @parts do |part|
-        q.pp part
-      end
-    end
-  end
-
-  ##
-  # Appends +texts+ onto this Paragraph
-
-  def push *texts
-    self.parts.concat texts
-  end
-
-  ##
-  # The raw text
-
-  def text
-    @parts.join ' '
-  end
-
-end
diff --git a/lib/rdoc/markup/regexp_handling.rb b/lib/rdoc/markup/regexp_handling.rb
deleted file mode 100644
index c471fe73c73917..00000000000000
--- a/lib/rdoc/markup/regexp_handling.rb
+++ /dev/null
@@ -1,40 +0,0 @@
-# frozen_string_literal: true
-##
-# Hold details of a regexp handling sequence
-
-class RDoc::Markup::RegexpHandling
-
-  ##
-  # Regexp handling type
-
-  attr_reader   :type
-
-  ##
-  # Regexp handling text
-
-  attr_accessor :text
-
-  ##
-  # Creates a new regexp handling sequence of +type+ with +text+
-
-  def initialize(type, text)
-    @type, @text = type, text
-  end
-
-  ##
-  # Regexp handlings are equal when the have the same text and type
-
-  def ==(o)
-    self.text == o.text && self.type == o.type
-  end
-
-  def inspect # :nodoc:
-    "#<RDoc::Markup::RegexpHandling:0x%x @type=%p, @text=%p>" % [
-      object_id, @type, text.dump]
-  end
-
-  def to_s # :nodoc:
-    "RegexpHandling: type=#{type} text=#{text.dump}"
-  end
-
-end
diff --git a/lib/rdoc/markup/rule.rb b/lib/rdoc/markup/rule.rb
deleted file mode 100644
index 448148d6d18276..00000000000000
--- a/lib/rdoc/markup/rule.rb
+++ /dev/null
@@ -1,20 +0,0 @@
-# frozen_string_literal: true
-##
-# A horizontal rule with a weight
-
-class RDoc::Markup::Rule < Struct.new :weight
-
-  ##
-  # Calls #accept_rule on +visitor+
-
-  def accept visitor
-    visitor.accept_rule self
-  end
-
-  def pretty_print q # :nodoc:
-    q.group 2, '[rule:', ']' do
-      q.pp weight
-    end
-  end
-
-end
diff --git a/lib/rdoc/markup/table.rb b/lib/rdoc/markup/table.rb
deleted file mode 100644
index 7bcb10aff30e89..00000000000000
--- a/lib/rdoc/markup/table.rb
+++ /dev/null
@@ -1,47 +0,0 @@
-# frozen_string_literal: true
-##
-# A section of table
-
-class RDoc::Markup::Table
-  attr_accessor :header, :align, :body
-
-  def initialize header, align, body
-    @header, @align, @body = header, align, body
-  end
-
-  def == other
-    self.class == other.class and
-      @header == other.header and
-      @align == other.align and
-      @body == other.body
-  end
-
-  def accept visitor
-    visitor.accept_table @header, @body, @align
-  end
-
-  def pretty_print q # :nodoc:
-    q.group 2, '[Table: ', ']' do
-      q.group 2, '[Head: ', ']' do
-        q.seplist @header.zip(@align) do |text, align|
-          q.pp text
-          if align
-            q.text ":"
-            q.breakable
-            q.text align.to_s
-          end
-        end
-      end
-      q.breakable
-      q.group 2, '[Body: ', ']' do
-        q.seplist @body do |body|
-          q.group 2, '[', ']' do
-            q.seplist body do |text|
-              q.pp text
-            end
-          end
-        end
-      end
-    end
-  end
-end
diff --git a/lib/rdoc/markup/to_ansi.rb b/lib/rdoc/markup/to_ansi.rb
deleted file mode 100644
index c3eacab21af9a9..00000000000000
--- a/lib/rdoc/markup/to_ansi.rb
+++ /dev/null
@@ -1,93 +0,0 @@
-# frozen_string_literal: true
-##
-# Outputs RDoc markup with vibrant ANSI color!
-
-class RDoc::Markup::ToAnsi < RDoc::Markup::ToRdoc
-
-  ##
-  # Creates a new ToAnsi visitor that is ready to output vibrant ANSI color!
-
-  def initialize markup = nil
-    super
-
-    @headings.clear
-    @headings[1] = ["\e[1;32m", "\e[m"] # bold
-    @headings[2] = ["\e[4;32m", "\e[m"] # underline
-    @headings[3] = ["\e[32m",   "\e[m"] # just green
-  end
-
-  ##
-  # Maps attributes to ANSI sequences
-
-  def init_tags
-    add_tag :BOLD, "\e[1m", "\e[m"
-    add_tag :TT,   "\e[7m", "\e[m"
-    add_tag :EM,   "\e[4m", "\e[m"
-  end
-
-  ##
-  # Overrides indent width to ensure output lines up correctly.
-
-  def accept_list_item_end list_item
-    width = case @list_type.last
-            when :BULLET then
-              2
-            when :NOTE, :LABEL then
-              if @prefix then
-                @res << @prefix.strip
-                @prefix = nil
-              end
-
-              @res << "\n" unless res.length == 1
-              2
-            else
-              bullet = @list_index.last.to_s
-              @list_index[-1] = @list_index.last.succ
-              bullet.length + 2
-            end
-
-    @indent -= width
-  end
-
-  ##
-  # Adds coloring to note and label list items
-
-  def accept_list_item_start list_item
-    bullet = case @list_type.last
-             when :BULLET then
-               '*'
-             when :NOTE, :LABEL then
-               labels = Array(list_item.label).map do |label|
-                 attributes(label).strip
-               end.join "\n"
-
-               labels << ":\n" unless labels.empty?
-
-               labels
-             else
-               @list_index.last.to_s + '.'
-             end
-
-    case @list_type.last
-    when :NOTE, :LABEL then
-      @indent += 2
-      @prefix = bullet + (' ' * @indent)
-    else
-      @prefix = (' ' * @indent) + bullet.ljust(bullet.length + 1)
-
-      width = bullet.gsub(/\e\[[\d;]*m/, '').length + 1
-
-      @indent += width
-    end
-  end
-
-  ##
-  # Starts accepting with a reset screen
-
-  def start_accepting
-    super
-
-    @res = ["\e[0m"]
-  end
-
-end
diff --git a/lib/rdoc/markup/to_bs.rb b/lib/rdoc/markup/to_bs.rb
deleted file mode 100644
index f9b86487db2153..00000000000000
--- a/lib/rdoc/markup/to_bs.rb
+++ /dev/null
@@ -1,77 +0,0 @@
-# frozen_string_literal: true
-##
-# Outputs RDoc markup with hot backspace action!  You will probably need a
-# pager to use this output format.
-#
-# This formatter won't work on 1.8.6 because it lacks String#chars.
-
-class RDoc::Markup::ToBs < RDoc::Markup::ToRdoc
-
-  ##
-  # Returns a new ToBs that is ready for hot backspace action!
-
-  def initialize markup = nil
-    super
-
-    @in_b  = false
-    @in_em = false
-  end
-
-  ##
-  # Sets a flag that is picked up by #annotate to do the right thing in
-  # #convert_string
-
-  def init_tags
-    add_tag :BOLD, '+b', '-b'
-    add_tag :EM,   '+_', '-_'
-    add_tag :TT,   ''  , ''   # we need in_tt information maintained
-  end
-
-  ##
-  # Makes heading text bold.
-
-  def accept_heading heading
-    use_prefix or @res << ' ' * @indent
-    @res << @headings[heading.level][0]
-    @in_b = true
-    @res << attributes(heading.text)
-    @in_b = false
-    @res << @headings[heading.level][1]
-    @res << "\n"
-  end
-
-  ##
-  # Turns on or off regexp handling for +convert_string+
-
-  def annotate tag
-    case tag
-    when '+b' then @in_b = true
-    when '-b' then @in_b = false
-    when '+_' then @in_em = true
-    when '-_' then @in_em = false
-    end
-    ''
-  end
-
-  ##
-  # Calls convert_string on the result of convert_regexp_handling
-
-  def convert_regexp_handling target
-    convert_string super
-  end
-
-  ##
-  # Adds bold or underline mixed with backspaces
-
-  def convert_string string
-    return string unless @in_b or @in_em
-    chars = if @in_b then
-              string.chars.map do |char| "#{char}\b#{char}" end
-            elsif @in_em then
-              string.chars.map do |char| "_\b#{char}" end
-            end
-
-    chars.join
-  end
-
-end
diff --git a/lib/rdoc/markup/to_html.rb b/lib/rdoc/markup/to_html.rb
deleted file mode 100644
index 6c9f5733a2dd3c..00000000000000
--- a/lib/rdoc/markup/to_html.rb
+++ /dev/null
@@ -1,449 +0,0 @@
-# frozen_string_literal: true
-require 'cgi/util'
-
-##
-# Outputs RDoc markup as HTML.
-
-class RDoc::Markup::ToHtml < RDoc::Markup::Formatter
-
-  include RDoc::Text
-
-  # :section: Utilities
-
-  ##
-  # Maps RDoc::Markup::Parser::LIST_TOKENS types to HTML tags
-
-  LIST_TYPE_TO_HTML = {
-    :BULLET => ['<ul>',                                      '</ul>'],
-    :LABEL  => ['<dl class="rdoc-list label-list">',         '</dl>'],
-    :LALPHA => ['<ol style="list-style-type: lower-alpha">', '</ol>'],
-    :NOTE   => ['<dl class="rdoc-list note-list">',          '</dl>'],
-    :NUMBER => ['<ol>',                                      '</ol>'],
-    :UALPHA => ['<ol style="list-style-type: upper-alpha">', '</ol>'],
-  }
-
-  attr_reader :res # :nodoc:
-  attr_reader :in_list_entry # :nodoc:
-  attr_reader :list # :nodoc:
-
-  ##
-  # The RDoc::CodeObject HTML is being generated for.  This is used to
-  # generate namespaced URI fragments
-
-  attr_accessor :code_object
-
-  ##
-  # Path to this document for relative links
-
-  attr_accessor :from_path
-
-  # :section:
-
-  ##
-  # Creates a new formatter that will output HTML
-
-  def initialize options, markup = nil
-    super
-
-    @code_object = nil
-    @from_path = ''
-    @in_list_entry = nil
-    @list = nil
-    @th = nil
-    @hard_break = "<br>\n"
-
-    init_regexp_handlings
-
-    init_tags
-  end
-
-  # :section: Regexp Handling
-  #
-  # These methods are used by regexp handling markup added by RDoc::Markup#add_regexp_handling.
-
-  URL_CHARACTERS_REGEXP_STR = /[A-Za-z0-9\-._~:\/\?#\[\]@!$&'\(\)*+,;%=]/.source
-
-  ##
-  # Adds regexp handlings.
-
-  def init_regexp_handlings
-    # external links
-    @markup.add_regexp_handling(/(?:link:|https?:|mailto:|ftp:|irc:|www\.)#{URL_CHARACTERS_REGEXP_STR}+\w/,
-                                :HYPERLINK)
-    init_link_notation_regexp_handlings
-  end
-
-  ##
-  # Adds regexp handlings about link notations.
-
-  def init_link_notation_regexp_handlings
-    add_regexp_handling_RDOCLINK
-    add_regexp_handling_TIDYLINK
-  end
-
-  def handle_RDOCLINK url # :nodoc:
-    case url
-    when /^rdoc-ref:/
-      CGI.escapeHTML($')
-    when /^rdoc-label:/
-      text = $'
-
-      text = case text
-             when /\Alabel-/    then $'
-             when /\Afootmark-/ then $'
-             when /\Afoottext-/ then $'
-             else                    text
-             end
-
-      gen_url CGI.escapeHTML(url), CGI.escapeHTML(text)
-    when /^rdoc-image:/
-      %[<img src=\"#{CGI.escapeHTML($')}\">]
-    when /\Ardoc-[a-z]+:/
-      CGI.escapeHTML($')
-    end
-  end
-
-  ##
-  # +target+ is a <code><br></code>
-
-  def handle_regexp_HARD_BREAK target
-    '<br>'
-  end
-
-  ##
-  # +target+ is a potential link.  The following schemes are handled:
-  #
-  # <tt>mailto:</tt>::
-  #   Inserted as-is.
-  # <tt>http:</tt>::
-  #   Links are checked to see if they reference an image. If so, that image
-  #   gets inserted using an <tt><img></tt> tag. Otherwise a conventional
-  #   <tt><a href></tt> is used.
-  # <tt>link:</tt>::
-  #   Reference to a local file relative to the output directory.
-
-  def handle_regexp_HYPERLINK(target)
-    url = CGI.escapeHTML(target.text)
-
-    gen_url url, url
-  end
-
-  ##
-  # +target+ is an rdoc-schemed link that will be converted into a hyperlink.
-  #
-  # For the +rdoc-ref+ scheme the named reference will be returned without
-  # creating a link.
-  #
-  # For the +rdoc-label+ scheme the footnote and label prefixes are stripped
-  # when creating a link.  All other contents will be linked verbatim.
-
-  def handle_regexp_RDOCLINK target
-    handle_RDOCLINK target.text
-  end
-
-  ##
-  # This +target+ is a link where the label is different from the URL
-  # <tt>label[url]</tt> or <tt>{long label}[url]</tt>
-
-  def handle_regexp_TIDYLINK(target)
-    text = target.text
-
-    return text unless
-      text =~ /^\{(.*)\}\[(.*?)\]$/ or text =~ /^(\S+)\[(.*?)\]$/
-
-    label = $1
-    url   = CGI.escapeHTML($2)
-
-    if /^rdoc-image:/ =~ label
-      label = handle_RDOCLINK(label)
-    else
-      label = CGI.escapeHTML(label)
-    end
-
-    gen_url url, label
-  end
-
-  # :section: Visitor
-  #
-  # These methods implement the HTML visitor.
-
-  ##
-  # Prepares the visitor for HTML generation
-
-  def start_accepting
-    @res = []
-    @in_list_entry = []
-    @list = []
-  end
-
-  ##
-  # Returns the generated output
-
-  def end_accepting
-    @res.join
-  end
-
-  ##
-  # Adds +block_quote+ to the output
-
-  def accept_block_quote block_quote
-    @res << "\n<blockquote>"
-
-    block_quote.parts.each do |part|
-      part.accept self
-    end
-
-    @res << "</blockquote>\n"
-  end
-
-  ##
-  # Adds +paragraph+ to the output
-
-  def accept_paragraph paragraph
-    @res << "\n<p>"
-    text = paragraph.text @hard_break
-    text = text.gsub(/\r?\n/, ' ')
-    @res << to_html(text)
-    @res << "</p>\n"
-  end
-
-  ##
-  # Adds +verbatim+ to the output
-
-  def accept_verbatim verbatim
-    text = verbatim.text.rstrip
-
-    klass = nil
-
-    content = if verbatim.ruby? or parseable? text then
-                begin
-                  tokens = RDoc::Parser::RipperStateLex.parse text
-                  klass  = ' class="ruby"'
-
-                  result = RDoc::TokenStream.to_html tokens
-                  result = result + "\n" unless "\n" == result[-1]
-                  result
-                rescue
-                  CGI.escapeHTML text
-                end
-              else
-                CGI.escapeHTML text
-              end
-
-    if @options.pipe then
-      @res << "\n<pre><code>#{CGI.escapeHTML text}\n</code></pre>\n"
-    else
-      @res << "\n<pre#{klass}>#{content}</pre>\n"
-    end
-  end
-
-  ##
-  # Adds +rule+ to the output
-
-  def accept_rule rule
-    @res << "<hr>\n"
-  end
-
-  ##
-  # Prepares the visitor for consuming +list+
-
-  def accept_list_start(list)
-    @list << list.type
-    @res << html_list_name(list.type, true)
-    @in_list_entry.push false
-  end
-
-  ##
-  # Finishes consumption of +list+
-
-  def accept_list_end(list)
-    @list.pop
-    if tag = @in_list_entry.pop
-      @res << tag
-    end
-    @res << html_list_name(list.type, false) << "\n"
-  end
-
-  ##
-  # Prepares the visitor for consuming +list_item+
-
-  def accept_list_item_start(list_item)
-    if tag = @in_list_entry.last
-      @res << tag
-    end
-
-    @res << list_item_start(list_item, @list.last)
-  end
-
-  ##
-  # Finishes consumption of +list_item+
-
-  def accept_list_item_end(list_item)
-    @in_list_entry[-1] = list_end_for(@list.last)
-  end
-
-  ##
-  # Adds +blank_line+ to the output
-
-  def accept_blank_line(blank_line)
-    # @res << annotate("<p />") << "\n"
-  end
-
-  ##
-  # Adds +heading+ to the output.  The headings greater than 6 are trimmed to
-  # level 6.
-
-  def accept_heading heading
-    level = [6, heading.level].min
-
-    label = heading.label @code_object
-
-    @res << if @options.output_decoration
-              "\n<h#{level} id=\"#{label}\">"
-            else
-              "\n<h#{level}>"
-            end
-    @res << to_html(heading.text)
-    unless @options.pipe then
-      @res << "<span><a href=\"##{label}\">&para;</a>"
-      @res << " <a href=\"#top\">&uarr;</a></span>"
-    end
-    @res << "</h#{level}>\n"
-  end
-
-  ##
-  # Adds +raw+ to the output
-
-  def accept_raw raw
-    @res << raw.parts.join("\n")
-  end
-
-  ##
-  # Adds +table+ to the output
-
-  def accept_table header, body, aligns
-    @res << "\n<table role=\"table\">\n<thead>\n<tr>\n"
-    header.zip(aligns) do |text, align|
-      @res << '<th'
-      @res << ' align="' << align << '"' if align
-      @res << '>' << to_html(text) << "</th>\n"
-    end
-    @res << "</tr>\n</thead>\n<tbody>\n"
-    body.each do |row|
-      @res << "<tr>\n"
-      row.zip(aligns) do |text, align|
-        @res << '<td'
-        @res << ' align="' << align << '"' if align
-        @res << '>' << to_html(text) << "</td>\n"
-      end
-      @res << "</tr>\n"
-    end
-    @res << "</tbody>\n</table>\n"
-  end
-
-  # :section: Utilities
-
-  ##
-  # CGI-escapes +text+
-
-  def convert_string(text)
-    CGI.escapeHTML text
-  end
-
-  ##
-  # Generate a link to +url+ with content +text+.  Handles the special cases
-  # for img: and link: described under handle_regexp_HYPERLINK
-
-  def gen_url url, text
-    scheme, url, id = parse_url url
-
-    if %w[http https link].include?(scheme) and
-       url =~ /\.(gif|png|jpg|jpeg|bmp)$/ then
-      "<img src=\"#{url}\" />"
-    else
-      if scheme != 'link' and %r%\A((?!https?:)(?:[^/#]*/)*+)([^/#]+)\.(rb|rdoc|md)(?=\z|#)%i =~ url
-        url = "#$1#{$2.tr('.', '_')}_#$3.html#$'"
-      end
-
-      text = text.sub %r%^#{scheme}:/*%i, ''
-      text = text.sub %r%^[*\^](\d+)$%,   '\1'
-
-      link = "<a#{id} href=\"#{url}\">#{text}</a>"
-
-      link = "<sup>#{link}</sup>" if /"foot/ =~ id
-
-      link
-    end
-  end
-
-  ##
-  # Determines the HTML list element for +list_type+ and +open_tag+
-
-  def html_list_name(list_type, open_tag)
-    tags = LIST_TYPE_TO_HTML[list_type]
-    raise RDoc::Error, "Invalid list type: #{list_type.inspect}" unless tags
-    tags[open_tag ? 0 : 1]
-  end
-
-  ##
-  # Maps attributes to HTML tags
-
-  def init_tags
-    add_tag :BOLD, "<strong>", "</strong>"
-    add_tag :TT,   "<code>",   "</code>"
-    add_tag :EM,   "<em>",     "</em>"
-  end
-
-  ##
-  # Returns the HTML tag for +list_type+, possible using a label from
-  # +list_item+
-
-  def list_item_start(list_item, list_type)
-    case list_type
-    when :BULLET, :LALPHA, :NUMBER, :UALPHA then
-      "<li>"
-    when :LABEL, :NOTE then
-      Array(list_item.label).map do |label|
-        "<dt>#{to_html label}\n"
-      end.join << "<dd>"
-    else
-      raise RDoc::Error, "Invalid list type: #{list_type.inspect}"
-    end
-  end
-
-  ##
-  # Returns the HTML end-tag for +list_type+
-
-  def list_end_for(list_type)
-    case list_type
-    when :BULLET, :LALPHA, :NUMBER, :UALPHA then
-      "</li>"
-    when :LABEL, :NOTE then
-      "</dd>"
-    else
-      raise RDoc::Error, "Invalid list type: #{list_type.inspect}"
-    end
-  end
-
-  ##
-  # Returns true if text is valid ruby syntax
-
-  def parseable? text
-    verbose, $VERBOSE = $VERBOSE, nil
-    catch(:valid) do
-      eval("BEGIN { throw :valid, true }\n#{text}")
-    end
-  rescue SyntaxError
-    false
-  ensure
-    $VERBOSE = verbose
-  end
-
-  ##
-  # Converts +item+ to HTML using RDoc::Text#to_html
-
-  def to_html item
-    super convert_flow @am.flow item
-  end
-
-end
diff --git a/lib/rdoc/markup/to_html_crossref.rb b/lib/rdoc/markup/to_html_crossref.rb
deleted file mode 100644
index 434b62249573d2..00000000000000
--- a/lib/rdoc/markup/to_html_crossref.rb
+++ /dev/null
@@ -1,175 +0,0 @@
-# frozen_string_literal: true
-##
-# Subclass of the RDoc::Markup::ToHtml class that supports looking up method
-# names, classes, etc to create links.  RDoc::CrossReference is used to
-# generate those links based on the current context.
-
-class RDoc::Markup::ToHtmlCrossref < RDoc::Markup::ToHtml
-
-  # :stopdoc:
-  ALL_CROSSREF_REGEXP = RDoc::CrossReference::ALL_CROSSREF_REGEXP
-  CLASS_REGEXP_STR    = RDoc::CrossReference::CLASS_REGEXP_STR
-  CROSSREF_REGEXP     = RDoc::CrossReference::CROSSREF_REGEXP
-  METHOD_REGEXP_STR   = RDoc::CrossReference::METHOD_REGEXP_STR
-  # :startdoc:
-
-  ##
-  # RDoc::CodeObject for generating references
-
-  attr_accessor :context
-
-  ##
-  # Should we show '#' characters on method references?
-
-  attr_accessor :show_hash
-
-  ##
-  # Creates a new crossref resolver that generates links relative to +context+
-  # which lives at +from_path+ in the generated files.  '#' characters on
-  # references are removed unless +show_hash+ is true.  Only method names
-  # preceded by '#' or '::' are linked, unless +hyperlink_all+ is true.
-
-  def initialize(options, from_path, context, markup = nil)
-    raise ArgumentError, 'from_path cannot be nil' if from_path.nil?
-
-    super options, markup
-
-    @context       = context
-    @from_path     = from_path
-    @hyperlink_all = @options.hyperlink_all
-    @show_hash     = @options.show_hash
-
-    @cross_reference = RDoc::CrossReference.new @context
-  end
-
-  def init_link_notation_regexp_handlings
-    add_regexp_handling_RDOCLINK
-
-    # The crossref must be linked before tidylink because Klass.method[:sym]
-    # will be processed as a tidylink first and will be broken.
-    crossref_re = @options.hyperlink_all ? ALL_CROSSREF_REGEXP : CROSSREF_REGEXP
-    @markup.add_regexp_handling crossref_re, :CROSSREF
-
-    add_regexp_handling_TIDYLINK
-  end
-
-  ##
-  # Creates a link to the reference +name+ if the name exists.  If +text+ is
-  # given it is used as the link text, otherwise +name+ is used.
-
-  def cross_reference name, text = nil, code = true
-    lookup = name
-
-    name = name[1..-1] unless @show_hash if name[0, 1] == '#'
-
-    if !(name.end_with?('+@', '-@')) and name =~ /(.*[^#:])@/
-      text ||= "#{CGI.unescape $'} at <code>#{$1}</code>"
-      code = false
-    else
-      text ||= name
-    end
-
-    link lookup, text, code
-  end
-
-  ##
-  # We're invoked when any text matches the CROSSREF pattern.  If we find the
-  # corresponding reference, generate a link.  If the name we're looking for
-  # contains no punctuation, we look for it up the module/class chain.  For
-  # example, ToHtml is found, even without the <tt>RDoc::Markup::</tt> prefix,
-  # because we look for it in module Markup first.
-
-  def handle_regexp_CROSSREF(target)
-    name = target.text
-
-    return name if name =~ /@[\w-]+\.[\w-]/ # labels that look like emails
-
-    unless @hyperlink_all then
-      # This ensures that words entirely consisting of lowercase letters will
-      # not have cross-references generated (to suppress lots of erroneous
-      # cross-references to "new" in text, for instance)
-      return name if name =~ /\A[a-z]*\z/
-    end
-
-    cross_reference name
-  end
-
-  ##
-  # Handles <tt>rdoc-ref:</tt> scheme links and allows RDoc::Markup::ToHtml to
-  # handle other schemes.
-
-  def handle_regexp_HYPERLINK target
-    return cross_reference $' if target.text =~ /\Ardoc-ref:/
-
-    super
-  end
-
-  ##
-  # +target+ is an rdoc-schemed link that will be converted into a hyperlink.
-  # For the rdoc-ref scheme the cross-reference will be looked up and the
-  # given name will be used.
-  #
-  # All other contents are handled by
-  # {the superclass}[rdoc-ref:RDoc::Markup::ToHtml#handle_regexp_RDOCLINK]
-
-  def handle_regexp_RDOCLINK target
-    url = target.text
-
-    case url
-    when /\Ardoc-ref:/ then
-      cross_reference $'
-    else
-      super
-    end
-  end
-
-  ##
-  # Generates links for <tt>rdoc-ref:</tt> scheme URLs and allows
-  # RDoc::Markup::ToHtml to handle other schemes.
-
-  def gen_url url, text
-    return super unless url =~ /\Ardoc-ref:/
-
-    name = $'
-    cross_reference name, text, name == text
-  end
-
-  ##
-  # Creates an HTML link to +name+ with the given +text+.
-
-  def link name, text, code = true
-    if !(name.end_with?('+@', '-@')) and name =~ /(.*[^#:])@/
-      name = $1
-      label = $'
-    end
-
-    ref = @cross_reference.resolve name, text
-
-    case ref
-    when String then
-      ref
-    else
-      path = ref.as_href @from_path
-
-      if code and RDoc::CodeObject === ref and !(RDoc::TopLevel === ref)
-        text = "<code>#{CGI.escapeHTML text}</code>"
-      end
-
-      if path =~ /#/ then
-        path << "-label-#{label}"
-      elsif ref.sections and
-            ref.sections.any? { |section| label == section.title } then
-        path << "##{label}"
-      else
-        if ref.respond_to?(:aref)
-          path << "##{ref.aref}-label-#{label}"
-        else
-          path << "#label-#{label}"
-        end
-      end if label
-
-      "<a href=\"#{path}\">#{text}</a>"
-    end
-  end
-
-end
diff --git a/lib/rdoc/markup/to_html_snippet.rb b/lib/rdoc/markup/to_html_snippet.rb
deleted file mode 100644
index 8219f0b169e38d..00000000000000
--- a/lib/rdoc/markup/to_html_snippet.rb
+++ /dev/null
@@ -1,284 +0,0 @@
-# frozen_string_literal: true
-##
-# Outputs RDoc markup as paragraphs with inline markup only.
-
-class RDoc::Markup::ToHtmlSnippet < RDoc::Markup::ToHtml
-
-  ##
-  # After this many characters the input will be cut off.
-
-  attr_reader :character_limit
-
-  ##
-  # The number of characters seen so far.
-
-  attr_reader :characters # :nodoc:
-
-  ##
-  # The attribute bitmask
-
-  attr_reader :mask
-
-  ##
-  # After this many paragraphs the input will be cut off.
-
-  attr_reader :paragraph_limit
-
-  ##
-  # Count of paragraphs found
-
-  attr_reader :paragraphs
-
-  ##
-  # Creates a new ToHtmlSnippet formatter that will cut off the input on the
-  # next word boundary after the given number of +characters+ or +paragraphs+
-  # of text have been encountered.
-
-  def initialize options, characters = 100, paragraphs = 3, markup = nil
-    super options, markup
-
-    @character_limit = characters
-    @paragraph_limit = paragraphs
-
-    @characters = 0
-    @mask       = 0
-    @paragraphs = 0
-
-    @markup.add_regexp_handling RDoc::CrossReference::CROSSREF_REGEXP, :CROSSREF
-  end
-
-  ##
-  # Adds +heading+ to the output as a paragraph
-
-  def accept_heading heading
-    @res << "<p>#{to_html heading.text}\n"
-
-    add_paragraph
-  end
-
-  ##
-  # Raw sections are untrusted and ignored
-
-  alias accept_raw ignore
-
-  ##
-  # Rules are ignored
-
-  alias accept_rule ignore
-
-  def accept_paragraph paragraph
-    para = @in_list_entry.last || "<p>"
-
-    text = paragraph.text @hard_break
-
-    @res << "#{para}#{to_html text}\n"
-
-    add_paragraph
-  end
-
-  ##
-  # Finishes consumption of +list_item+
-
-  def accept_list_item_end list_item
-  end
-
-  ##
-  # Prepares the visitor for consuming +list_item+
-
-  def accept_list_item_start list_item
-    @res << list_item_start(list_item, @list.last)
-  end
-
-  ##
-  # Prepares the visitor for consuming +list+
-
-  def accept_list_start list
-    @list << list.type
-    @res << html_list_name(list.type, true)
-    @in_list_entry.push ''
-  end
-
-  ##
-  # Adds +verbatim+ to the output
-
-  def accept_verbatim verbatim
-    throw :done if @characters >= @character_limit
-    input = verbatim.text.rstrip
-
-    text = truncate input
-    text << ' ...' unless text == input
-
-    super RDoc::Markup::Verbatim.new text
-
-    add_paragraph
-  end
-
-  ##
-  # Prepares the visitor for HTML snippet generation
-
-  def start_accepting
-    super
-
-    @characters = 0
-  end
-
-  ##
-  # Removes escaping from the cross-references in +target+
-
-  def handle_regexp_CROSSREF target
-    target.text.sub(/\A\\/, '')
-  end
-
-  ##
-  # +target+ is a <code><br></code>
-
-  def handle_regexp_HARD_BREAK target
-    @characters -= 4
-    '<br>'
-  end
-
-  ##
-  # Lists are paragraphs, but notes and labels have a separator
-
-  def list_item_start list_item, list_type
-    throw :done if @characters >= @character_limit
-
-    case list_type
-    when :BULLET, :LALPHA, :NUMBER, :UALPHA then
-      "<p>"
-    when :LABEL, :NOTE then
-      labels = Array(list_item.label).map do |label|
-        to_html label
-      end.join ', '
-
-      labels << " &mdash; " unless labels.empty?
-
-      start = "<p>#{labels}"
-      @characters += 1 # try to include the label
-      start
-    else
-      raise RDoc::Error, "Invalid list type: #{list_type.inspect}"
-    end
-  end
-
-  ##
-  # Returns just the text of +link+, +url+ is only used to determine the link
-  # type.
-
-  def gen_url url, text
-    if url =~ /^rdoc-label:([^:]*)(?::(.*))?/ then
-      type = "link"
-    elsif url =~ /([A-Za-z]+):(.*)/ then
-      type = $1
-    else
-      type = "http"
-    end
-
-    if (type == "http" or type == "https" or type == "link") and
-       url =~ /\.(gif|png|jpg|jpeg|bmp)$/ then
-      ''
-    else
-      text.sub(%r%^#{type}:/*%, '')
-    end
-  end
-
-  ##
-  # In snippets, there are no lists
-
-  def html_list_name list_type, open_tag
-    ''
-  end
-
-  ##
-  # Throws +:done+ when paragraph_limit paragraphs have been encountered
-
-  def add_paragraph
-    @paragraphs += 1
-
-    throw :done if @paragraphs >= @paragraph_limit
-  end
-
-  ##
-  # Marks up +content+
-
-  def convert content
-    catch :done do
-      return super
-    end
-
-    end_accepting
-  end
-
-  ##
-  # Converts flow items +flow+
-
-  def convert_flow flow
-    throw :done if @characters >= @character_limit
-
-    res = []
-    @mask = 0
-
-    flow.each do |item|
-      case item
-      when RDoc::Markup::AttrChanger then
-        off_tags res, item
-        on_tags  res, item
-      when String then
-        text = convert_string item
-        res << truncate(text)
-      when RDoc::Markup::RegexpHandling then
-        text = convert_regexp_handling item
-        res << truncate(text)
-      else
-        raise "Unknown flow element: #{item.inspect}"
-      end
-
-      if @characters >= @character_limit then
-        off_tags res, RDoc::Markup::AttrChanger.new(0, @mask)
-        break
-      end
-    end
-
-    res << ' ...' if @characters >= @character_limit
-
-    res.join
-  end
-
-  ##
-  # Maintains a bitmask to allow HTML elements to be closed properly.  See
-  # RDoc::Markup::Formatter.
-
-  def on_tags res, item
-    @mask ^= item.turn_on
-
-    super
-  end
-
-  ##
-  # Maintains a bitmask to allow HTML elements to be closed properly.  See
-  # RDoc::Markup::Formatter.
-
-  def off_tags res, item
-    @mask ^= item.turn_off
-
-    super
-  end
-
-  ##
-  # Truncates +text+ at the end of the first word after the character_limit.
-
-  def truncate text
-    length = text.length
-    characters = @characters
-    @characters += length
-
-    return text if @characters < @character_limit
-
-    remaining = @character_limit - characters
-
-    text =~ /\A(.{#{remaining},}?)(\s|$)/m # TODO word-break instead of \s?
-
-    $1
-  end
-
-end
diff --git a/lib/rdoc/markup/to_joined_paragraph.rb b/lib/rdoc/markup/to_joined_paragraph.rb
deleted file mode 100644
index 31cbe0853c6858..00000000000000
--- a/lib/rdoc/markup/to_joined_paragraph.rb
+++ /dev/null
@@ -1,46 +0,0 @@
-# frozen_string_literal: true
-##
-# Joins the parts of an RDoc::Markup::Paragraph into a single String.
-#
-# This allows for easier maintenance and testing of Markdown support.
-#
-# This formatter only works on Paragraph instances.  Attempting to process
-# other markup syntax items will not work.
-
-class RDoc::Markup::ToJoinedParagraph < RDoc::Markup::Formatter
-
-  def initialize # :nodoc:
-    super nil
-  end
-
-  def start_accepting # :nodoc:
-  end
-
-  def end_accepting # :nodoc:
-  end
-
-  ##
-  # Converts the parts of +paragraph+ to a single entry.
-
-  def accept_paragraph paragraph
-    parts = paragraph.parts.chunk do |part|
-      String === part
-    end.flat_map do |string, chunk|
-      string ? chunk.join.rstrip : chunk
-    end
-
-    paragraph.parts.replace parts
-  end
-
-  alias accept_block_quote     ignore
-  alias accept_heading         ignore
-  alias accept_list_end        ignore
-  alias accept_list_item_end   ignore
-  alias accept_list_item_start ignore
-  alias accept_list_start      ignore
-  alias accept_raw             ignore
-  alias accept_rule            ignore
-  alias accept_verbatim        ignore
-  alias accept_table           ignore
-
-end
diff --git a/lib/rdoc/markup/to_label.rb b/lib/rdoc/markup/to_label.rb
deleted file mode 100644
index cf808364e9ecd8..00000000000000
--- a/lib/rdoc/markup/to_label.rb
+++ /dev/null
@@ -1,74 +0,0 @@
-# frozen_string_literal: true
-require 'cgi/util'
-
-##
-# Creates HTML-safe labels suitable for use in id attributes.  Tidylinks are
-# converted to their link part and cross-reference links have the suppression
-# marks removed (\\SomeClass is converted to SomeClass).
-
-class RDoc::Markup::ToLabel < RDoc::Markup::Formatter
-
-  attr_reader :res # :nodoc:
-
-  ##
-  # Creates a new formatter that will output HTML-safe labels
-
-  def initialize markup = nil
-    super nil, markup
-
-    @markup.add_regexp_handling RDoc::CrossReference::CROSSREF_REGEXP, :CROSSREF
-    @markup.add_regexp_handling(/(((\{.*?\})|\b\S+?)\[\S+?\])/, :TIDYLINK)
-
-    add_tag :BOLD, '', ''
-    add_tag :TT,   '', ''
-    add_tag :EM,   '', ''
-
-    @res = []
-  end
-
-  ##
-  # Converts +text+ to an HTML-safe label
-
-  def convert text
-    label = convert_flow @am.flow text
-
-    CGI.escape(label).gsub('%', '-').sub(/^-/, '')
-  end
-
-  ##
-  # Converts the CROSSREF +target+ to plain text, removing the suppression
-  # marker, if any
-
-  def handle_regexp_CROSSREF target
-    text = target.text
-
-    text.sub(/^\\/, '')
-  end
-
-  ##
-  # Converts the TIDYLINK +target+ to just the text part
-
-  def handle_regexp_TIDYLINK target
-    text = target.text
-
-    return text unless text =~ /\{(.*?)\}\[(.*?)\]/ or text =~ /(\S+)\[(.*?)\]/
-
-    $1
-  end
-
-  alias accept_blank_line         ignore
-  alias accept_block_quote        ignore
-  alias accept_heading            ignore
-  alias accept_list_end           ignore
-  alias accept_list_item_end      ignore
-  alias accept_list_item_start    ignore
-  alias accept_list_start         ignore
-  alias accept_paragraph          ignore
-  alias accept_raw                ignore
-  alias accept_rule               ignore
-  alias accept_verbatim           ignore
-  alias end_accepting             ignore
-  alias handle_regexp_HARD_BREAK  ignore
-  alias start_accepting           ignore
-
-end
diff --git a/lib/rdoc/markup/to_markdown.rb b/lib/rdoc/markup/to_markdown.rb
deleted file mode 100644
index 5dd60e18f58288..00000000000000
--- a/lib/rdoc/markup/to_markdown.rb
+++ /dev/null
@@ -1,191 +0,0 @@
-# frozen_string_literal: true
-# :markup: markdown
-
-##
-# Outputs parsed markup as Markdown
-
-class RDoc::Markup::ToMarkdown < RDoc::Markup::ToRdoc
-
-  ##
-  # Creates a new formatter that will output Markdown format text
-
-  def initialize markup = nil
-    super
-
-    @headings[1] = ['# ',      '']
-    @headings[2] = ['## ',     '']
-    @headings[3] = ['### ',    '']
-    @headings[4] = ['#### ',   '']
-    @headings[5] = ['##### ',  '']
-    @headings[6] = ['###### ', '']
-
-    add_regexp_handling_RDOCLINK
-    add_regexp_handling_TIDYLINK
-
-    @hard_break = "  \n"
-  end
-
-  ##
-  # Maps attributes to HTML sequences
-
-  def init_tags
-    add_tag :BOLD, '**', '**'
-    add_tag :EM,   '*',  '*'
-    add_tag :TT,   '`',  '`'
-  end
-
-  ##
-  # Adds a newline to the output
-
-  def handle_regexp_HARD_BREAK target
-    "  \n"
-  end
-
-  ##
-  # Finishes consumption of `list`
-
-  def accept_list_end list
-    @res << "\n"
-
-    super
-  end
-
-  ##
-  # Finishes consumption of `list_item`
-
-  def accept_list_item_end list_item
-    width = case @list_type.last
-            when :BULLET then
-              4
-            when :NOTE, :LABEL then
-              use_prefix
-
-              4
-            else
-              @list_index[-1] = @list_index.last.succ
-              4
-            end
-
-    @indent -= width
-  end
-
-  ##
-  # Prepares the visitor for consuming `list_item`
-
-  def accept_list_item_start list_item
-    type = @list_type.last
-
-    case type
-    when :NOTE, :LABEL then
-      bullets = Array(list_item.label).map do |label|
-        attributes(label).strip
-      end.join "\n"
-
-      bullets << "\n:"
-
-      @prefix = ' ' * @indent
-      @indent += 4
-      @prefix << bullets + (' ' * (@indent - 1))
-    else
-      bullet = type == :BULLET ? '*' : @list_index.last.to_s + '.'
-      @prefix = (' ' * @indent) + bullet.ljust(4)
-
-      @indent += 4
-    end
-  end
-
-  ##
-  # Prepares the visitor for consuming `list`
-
-  def accept_list_start list
-    case list.type
-    when :BULLET, :LABEL, :NOTE then
-      @list_index << nil
-    when :LALPHA, :NUMBER, :UALPHA then
-      @list_index << 1
-    else
-      raise RDoc::Error, "invalid list type #{list.type}"
-    end
-
-    @list_width << 4
-    @list_type << list.type
-  end
-
-  ##
-  # Adds `rule` to the output
-
-  def accept_rule rule
-    use_prefix or @res << ' ' * @indent
-    @res << '-' * 3
-    @res << "\n"
-  end
-
-  ##
-  # Outputs `verbatim` indented 4 columns
-
-  def accept_verbatim verbatim
-    indent = ' ' * (@indent + 4)
-
-    verbatim.parts.each do |part|
-      @res << indent unless part == "\n"
-      @res << part
-    end
-
-    @res << "\n"
-  end
-
-  ##
-  # Creates a Markdown-style URL from +url+ with +text+.
-
-  def gen_url url, text
-    scheme, url, = parse_url url
-
-    "[#{text.sub(%r{^#{scheme}:/*}i, '')}](#{url})"
-  end
-
-  ##
-  # Handles <tt>rdoc-</tt> type links for footnotes.
-
-  def handle_rdoc_link url
-    case url
-    when /^rdoc-ref:/ then
-      $'
-    when /^rdoc-label:footmark-(\d+)/ then
-      "[^#{$1}]:"
-    when /^rdoc-label:foottext-(\d+)/ then
-      "[^#{$1}]"
-    when /^rdoc-label:label-/ then
-      gen_url url, $'
-    when /^rdoc-image:/ then
-      "![](#{$'})"
-    when /^rdoc-[a-z]+:/ then
-      $'
-    end
-  end
-
-  ##
-  # Converts the RDoc markup tidylink into a Markdown.style link.
-
-  def handle_regexp_TIDYLINK target
-    text = target.text
-
-    return text unless text =~ /\{(.*?)\}\[(.*?)\]/ or text =~ /(\S+)\[(.*?)\]/
-
-    label = $1
-    url   = $2
-
-    if url =~ /^rdoc-label:foot/ then
-      handle_rdoc_link url
-    else
-      gen_url url, label
-    end
-  end
-
-  ##
-  # Converts the rdoc-...: links into a Markdown.style links.
-
-  def handle_regexp_RDOCLINK target
-    handle_rdoc_link target.text
-  end
-
-end
diff --git a/lib/rdoc/markup/to_rdoc.rb b/lib/rdoc/markup/to_rdoc.rb
deleted file mode 100644
index 692904958258d9..00000000000000
--- a/lib/rdoc/markup/to_rdoc.rb
+++ /dev/null
@@ -1,344 +0,0 @@
-# frozen_string_literal: true
-##
-# Outputs RDoc markup as RDoc markup! (mostly)
-
-class RDoc::Markup::ToRdoc < RDoc::Markup::Formatter
-
-  ##
-  # Current indent amount for output in characters
-
-  attr_accessor :indent
-
-  ##
-  # Output width in characters
-
-  attr_accessor :width
-
-  ##
-  # Stack of current list indexes for alphabetic and numeric lists
-
-  attr_reader :list_index
-
-  ##
-  # Stack of list types
-
-  attr_reader :list_type
-
-  ##
-  # Stack of list widths for indentation
-
-  attr_reader :list_width
-
-  ##
-  # Prefix for the next list item.  See #use_prefix
-
-  attr_reader :prefix
-
-  ##
-  # Output accumulator
-
-  attr_reader :res
-
-  ##
-  # Creates a new formatter that will output (mostly) \RDoc markup
-
-  def initialize markup = nil
-    super nil, markup
-
-    @markup.add_regexp_handling(/\\\S/, :SUPPRESSED_CROSSREF)
-    @width = 78
-    init_tags
-
-    @headings = {}
-    @headings.default = []
-
-    @headings[1] = ['= ',      '']
-    @headings[2] = ['== ',     '']
-    @headings[3] = ['=== ',    '']
-    @headings[4] = ['==== ',   '']
-    @headings[5] = ['===== ',  '']
-    @headings[6] = ['====== ', '']
-
-    @hard_break = "\n"
-  end
-
-  ##
-  # Maps attributes to HTML sequences
-
-  def init_tags
-    add_tag :BOLD, "<b>", "</b>"
-    add_tag :TT,   "<tt>", "</tt>"
-    add_tag :EM,   "<em>", "</em>"
-  end
-
-  ##
-  # Adds +blank_line+ to the output
-
-  def accept_blank_line blank_line
-    @res << "\n"
-  end
-
-  ##
-  # Adds +paragraph+ to the output
-
-  def accept_block_quote block_quote
-    @indent += 2
-
-    block_quote.parts.each do |part|
-      @prefix = '> '
-
-      part.accept self
-    end
-
-    @indent -= 2
-  end
-
-  ##
-  # Adds +heading+ to the output
-
-  def accept_heading heading
-    use_prefix or @res << ' ' * @indent
-    @res << @headings[heading.level][0]
-    @res << attributes(heading.text)
-    @res << @headings[heading.level][1]
-    @res << "\n"
-  end
-
-  ##
-  # Finishes consumption of +list+
-
-  def accept_list_end list
-    @list_index.pop
-    @list_type.pop
-    @list_width.pop
-  end
-
-  ##
-  # Finishes consumption of +list_item+
-
-  def accept_list_item_end list_item
-    width = case @list_type.last
-            when :BULLET then
-              2
-            when :NOTE, :LABEL then
-              if @prefix then
-                @res << @prefix.strip
-                @prefix = nil
-              end
-
-              @res << "\n"
-              2
-            else
-              bullet = @list_index.last.to_s
-              @list_index[-1] = @list_index.last.succ
-              bullet.length + 2
-            end
-
-    @indent -= width
-  end
-
-  ##
-  # Prepares the visitor for consuming +list_item+
-
-  def accept_list_item_start list_item
-    type = @list_type.last
-
-    case type
-    when :NOTE, :LABEL then
-      bullets = Array(list_item.label).map do |label|
-        attributes(label).strip
-      end.join "\n"
-
-      bullets << ":\n" unless bullets.empty?
-
-      @prefix = ' ' * @indent
-      @indent += 2
-      @prefix << bullets + (' ' * @indent)
-    else
-      bullet = type == :BULLET ? '*' :  @list_index.last.to_s + '.'
-      @prefix = (' ' * @indent) + bullet.ljust(bullet.length + 1)
-      width = bullet.length + 1
-      @indent += width
-    end
-  end
-
-  ##
-  # Prepares the visitor for consuming +list+
-
-  def accept_list_start list
-    case list.type
-    when :BULLET then
-      @list_index << nil
-      @list_width << 1
-    when :LABEL, :NOTE then
-      @list_index << nil
-      @list_width << 2
-    when :LALPHA then
-      @list_index << 'a'
-      @list_width << list.items.length.to_s.length
-    when :NUMBER then
-      @list_index << 1
-      @list_width << list.items.length.to_s.length
-    when :UALPHA then
-      @list_index << 'A'
-      @list_width << list.items.length.to_s.length
-    else
-      raise RDoc::Error, "invalid list type #{list.type}"
-    end
-
-    @list_type << list.type
-  end
-
-  ##
-  # Adds +paragraph+ to the output
-
-  def accept_paragraph paragraph
-    text = paragraph.text @hard_break
-    wrap attributes text
-  end
-
-  ##
-  # Adds +paragraph+ to the output
-
-  def accept_indented_paragraph paragraph
-    @indent += paragraph.indent
-    text = paragraph.text @hard_break
-    wrap attributes text
-    @indent -= paragraph.indent
-  end
-
-  ##
-  # Adds +raw+ to the output
-
-  def accept_raw raw
-    @res << raw.parts.join("\n")
-  end
-
-  ##
-  # Adds +rule+ to the output
-
-  def accept_rule rule
-    use_prefix or @res << ' ' * @indent
-    @res << '-' * (@width - @indent)
-    @res << "\n"
-  end
-
-  ##
-  # Outputs +verbatim+ indented 2 columns
-
-  def accept_verbatim verbatim
-    indent = ' ' * (@indent + 2)
-
-    verbatim.parts.each do |part|
-      @res << indent unless part == "\n"
-      @res << part
-    end
-
-    @res << "\n"
-  end
-
-  ##
-  # Adds +table+ to the output
-
-  def accept_table header, body, aligns
-    widths = header.zip(body) do |h, b|
-      [h.size, b.size].max
-    end
-    aligns = aligns.map do |a|
-      case a
-      when nil
-        :center
-      when :left
-        :ljust
-      when :right
-        :rjust
-      end
-    end
-    @res << header.zip(widths, aligns) do |h, w, a|
-      h.__send__(a, w)
-    end.join("|").rstrip << "\n"
-    @res << widths.map {|w| "-" * w }.join("|") << "\n"
-    body.each do |row|
-      @res << row.zip(widths, aligns) do |t, w, a|
-        t.__send__(a, w)
-      end.join("|").rstrip << "\n"
-    end
-  end
-
-  ##
-  # Applies attribute-specific markup to +text+ using RDoc::AttributeManager
-
-  def attributes text
-    flow = @am.flow text.dup
-    convert_flow flow
-  end
-
-  ##
-  # Returns the generated output
-
-  def end_accepting
-    @res.join
-  end
-
-  ##
-  # Removes preceding \\ from the suppressed crossref +target+
-
-  def handle_regexp_SUPPRESSED_CROSSREF target
-    text = target.text
-    text = text.sub('\\', '') unless in_tt?
-    text
-  end
-
-  ##
-  # Adds a newline to the output
-
-  def handle_regexp_HARD_BREAK target
-    "\n"
-  end
-
-  ##
-  # Prepares the visitor for text generation
-
-  def start_accepting
-    @res = [""]
-    @indent = 0
-    @prefix = nil
-
-    @list_index = []
-    @list_type  = []
-    @list_width = []
-  end
-
-  ##
-  # Adds the stored #prefix to the output and clears it.  Lists generate a
-  # prefix for later consumption.
-
-  def use_prefix
-    prefix, @prefix = @prefix, nil
-    @res << prefix if prefix
-
-    prefix
-  end
-
-  ##
-  # Wraps +text+ to #width
-
-  def wrap text
-    return unless text && !text.empty?
-
-    text_len = @width - @indent
-
-    text_len = 20 if text_len < 20
-
-    next_prefix = ' ' * @indent
-
-    prefix = @prefix || next_prefix
-    @prefix = nil
-
-    text.scan(/\G(?:([^ \n]{#{text_len}})(?=[^ \n])|(.{1,#{text_len}})(?:[ \n]|\z))/) do
-      @res << prefix << ($1 || $2) << "\n"
-      prefix = next_prefix
-    end
-  end
-
-end
diff --git a/lib/rdoc/markup/to_table_of_contents.rb b/lib/rdoc/markup/to_table_of_contents.rb
deleted file mode 100644
index e5b8225ba3cee4..00000000000000
--- a/lib/rdoc/markup/to_table_of_contents.rb
+++ /dev/null
@@ -1,88 +0,0 @@
-# frozen_string_literal: true
-##
-# Extracts just the RDoc::Markup::Heading elements from a
-# RDoc::Markup::Document to help build a table of contents
-
-class RDoc::Markup::ToTableOfContents < RDoc::Markup::Formatter
-
-  @to_toc = nil
-
-  ##
-  # Singleton for table-of-contents generation
-
-  def self.to_toc
-    @to_toc ||= new
-  end
-
-  ##
-  # Output accumulator
-
-  attr_reader :res
-
-  ##
-  # Omits headings with a level less than the given level.
-
-  attr_accessor :omit_headings_below
-
-  def initialize # :nodoc:
-    super nil
-
-    @omit_headings_below = nil
-  end
-
-  ##
-  # Adds +document+ to the output, using its heading cutoff if present
-
-  def accept_document document
-    @omit_headings_below = document.omit_headings_below
-
-    super
-  end
-
-  ##
-  # Adds +heading+ to the table of contents
-
-  def accept_heading heading
-    @res << heading unless suppressed? heading
-  end
-
-  ##
-  # Returns the table of contents
-
-  def end_accepting
-    @res
-  end
-
-  ##
-  # Prepares the visitor for text generation
-
-  def start_accepting
-    @omit_headings_below = nil
-    @res = []
-  end
-
-  ##
-  # Returns true if +heading+ is below the display threshold
-
-  def suppressed? heading
-    return false unless @omit_headings_below
-
-    heading.level > @omit_headings_below
-  end
-
-  # :stopdoc:
-  alias accept_block_quote     ignore
-  alias accept_raw             ignore
-  alias accept_rule            ignore
-  alias accept_blank_line      ignore
-  alias accept_paragraph       ignore
-  alias accept_verbatim        ignore
-  alias accept_list_end        ignore
-  alias accept_list_item_start ignore
-  alias accept_list_item_end   ignore
-  alias accept_list_end_bullet ignore
-  alias accept_list_start      ignore
-  alias accept_table           ignore
-  # :startdoc:
-
-end
diff --git a/lib/rdoc/markup/to_test.rb b/lib/rdoc/markup/to_test.rb
deleted file mode 100644
index 30113da5614a27..00000000000000
--- a/lib/rdoc/markup/to_test.rb
+++ /dev/null
@@ -1,69 +0,0 @@
-# frozen_string_literal: true
-##
-# This Markup outputter is used for testing purposes.
-
-class RDoc::Markup::ToTest < RDoc::Markup::Formatter
-
-  # :stopdoc:
-
-  ##
-  # :section: Visitor
-
-  def start_accepting
-    @res = []
-    @list = []
-  end
-
-  def end_accepting
-    @res
-  end
-
-  def accept_paragraph(paragraph)
-    @res << convert_flow(@am.flow(paragraph.text))
-  end
-
-  def accept_raw raw
-    @res << raw.parts.join
-  end
-
-  def accept_verbatim(verbatim)
-    @res << verbatim.text.gsub(/^(\S)/, '  \1')
-  end
-
-  def accept_list_start(list)
-    @list << case list.type
-             when :BULLET then
-               '*'
-             when :NUMBER then
-               '1'
-             else
-               list.type
-             end
-  end
-
-  def accept_list_end(list)
-    @list.pop
-  end
-
-  def accept_list_item_start(list_item)
-    @res << "#{' ' * (@list.size - 1)}#{@list.last}: "
-  end
-
-  def accept_list_item_end(list_item)
-  end
-
-  def accept_blank_line(blank_line)
-    @res << "\n"
-  end
-
-  def accept_heading(heading)
-    @res << "#{'=' * heading.level} #{heading.text}"
-  end
-
-  def accept_rule(rule)
-    @res << '-' * rule.weight
-  end
-
-  # :startdoc:
-
-end
diff --git a/lib/rdoc/markup/to_tt_only.rb b/lib/rdoc/markup/to_tt_only.rb
deleted file mode 100644
index 9ac14ed2358dc3..00000000000000
--- a/lib/rdoc/markup/to_tt_only.rb
+++ /dev/null
@@ -1,120 +0,0 @@
-# frozen_string_literal: true
-##
-# Extracts sections of text enclosed in plus, tt or code.  Used to discover
-# undocumented parameters.
-
-class RDoc::Markup::ToTtOnly < RDoc::Markup::Formatter
-
-  ##
-  # Stack of list types
-
-  attr_reader :list_type
-
-  ##
-  # Output accumulator
-
-  attr_reader :res
-
-  ##
-  # Creates a new tt-only formatter.
-
-  def initialize markup = nil
-    super nil, markup
-
-    add_tag :TT, nil, nil
-  end
-
-  ##
-  # Adds tts from +block_quote+ to the output
-
-  def accept_block_quote block_quote
-    tt_sections block_quote.text
-  end
-
-  ##
-  # Pops the list type for +list+ from #list_type
-
-  def accept_list_end list
-    @list_type.pop
-  end
-
-  ##
-  # Pushes the list type for +list+ onto #list_type
-
-  def accept_list_start list
-    @list_type << list.type
-  end
-
-  ##
-  # Prepares the visitor for consuming +list_item+
-
-  def accept_list_item_start list_item
-    case @list_type.last
-    when :NOTE, :LABEL then
-      Array(list_item.label).map do |label|
-        tt_sections label
-      end.flatten
-    end
-  end
-
-  ##
-  # Adds +paragraph+ to the output
-
-  def accept_paragraph paragraph
-    tt_sections(paragraph.text)
-  end
-
-  ##
-  # Does nothing to +markup_item+ because it doesn't have any user-built
-  # content
-
-  def do_nothing markup_item
-  end
-
-  alias accept_blank_line    do_nothing # :nodoc:
-  alias accept_heading       do_nothing # :nodoc:
-  alias accept_list_item_end do_nothing # :nodoc:
-  alias accept_raw           do_nothing # :nodoc:
-  alias accept_rule          do_nothing # :nodoc:
-  alias accept_verbatim      do_nothing # :nodoc:
-
-  ##
-  # Extracts tt sections from +text+
-
-  def tt_sections text
-    flow = @am.flow text.dup
-
-    flow.each do |item|
-      case item
-      when String then
-        @res << item if in_tt?
-      when RDoc::Markup::AttrChanger then
-        off_tags res, item
-        on_tags res, item
-      when RDoc::Markup::RegexpHandling then
-        @res << convert_regexp_handling(item) if in_tt? # TODO can this happen?
-      else
-        raise "Unknown flow element: #{item.inspect}"
-      end
-    end
-
-    res
-  end
-
-  ##
-  # Returns an Array of items that were wrapped in plus, tt or code.
-
-  def end_accepting
-    @res.compact
-  end
-
-  ##
-  # Prepares the visitor for gathering tt sections
-
-  def start_accepting
-    @res = []
-
-    @list_type = []
-  end
-
-end
diff --git a/lib/rdoc/markup/verbatim.rb b/lib/rdoc/markup/verbatim.rb
deleted file mode 100644
index f51c2cfa1462d1..00000000000000
--- a/lib/rdoc/markup/verbatim.rb
+++ /dev/null
@@ -1,83 +0,0 @@
-# frozen_string_literal: true
-##
-# A section of verbatim text
-
-class RDoc::Markup::Verbatim < RDoc::Markup::Raw
-
-  ##
-  # Format of this verbatim section
-
-  attr_accessor :format
-
-  def initialize *parts # :nodoc:
-    super
-
-    @format = nil
-  end
-
-  def == other # :nodoc:
-    super and @format == other.format
-  end
-
-  ##
-  # Calls #accept_verbatim on +visitor+
-
-  def accept visitor
-    visitor.accept_verbatim self
-  end
-
-  ##
-  # Collapses 3+ newlines into two newlines
-
-  def normalize
-    parts = []
-
-    newlines = 0
-
-    @parts.each do |part|
-      case part
-      when /^\s*\n/ then
-        newlines += 1
-        parts << part if newlines == 1
-      else
-        newlines = 0
-        parts << part
-      end
-    end
-
-    parts.pop if parts.last =~ /\A\r?\n\z/
-
-    @parts = parts
-  end
-
-  def pretty_print q # :nodoc:
-    self.class.name =~ /.*::(\w{1,4})/i
-
-    q.group 2, "[#{$1.downcase}: ", ']' do
-      if @format then
-        q.text "format: #{@format}"
-        q.breakable
-      end
-
-      q.seplist @parts do |part|
-        q.pp part
-      end
-    end
-  end
-
-  ##
-  # Is this verbatim section Ruby code?
-
-  def ruby?
-    @format ||= nil # TODO for older ri data, switch the tree to marshal_dump
-    @format == :ruby
-  end
-
-  ##
-  # The text of the section
-
-  def text
-    @parts.join
-  end
-
-end
diff --git a/lib/rdoc/meta_method.rb b/lib/rdoc/meta_method.rb
deleted file mode 100644
index 8c95a0f78cd6ca..00000000000000
--- a/lib/rdoc/meta_method.rb
+++ /dev/null
@@ -1,6 +0,0 @@
-# frozen_string_literal: true
-##
-# MetaMethod represents a meta-programmed method
-
-class RDoc::MetaMethod < RDoc::AnyMethod
-end
diff --git a/lib/rdoc/method_attr.rb b/lib/rdoc/method_attr.rb
deleted file mode 100644
index 61ddb32f46edb0..00000000000000
--- a/lib/rdoc/method_attr.rb
+++ /dev/null
@@ -1,418 +0,0 @@
-# frozen_string_literal: true
-##
-# Abstract class representing either a method or an attribute.
-
-class RDoc::MethodAttr < RDoc::CodeObject
-
-  include Comparable
-
-  ##
-  # Name of this method/attribute.
-
-  attr_accessor :name
-
-  ##
-  # public, protected, private
-
-  attr_accessor :visibility
-
-  ##
-  # Is this a singleton method/attribute?
-
-  attr_accessor :singleton
-
-  ##
-  # Source file token stream
-
-  attr_reader :text
-
-  ##
-  # Array of other names for this method/attribute
-
-  attr_reader :aliases
-
-  ##
-  # The method/attribute we're aliasing
-
-  attr_accessor :is_alias_for
-
-  #--
-  # The attributes below are for AnyMethod only.
-  # They are left here for the time being to
-  # allow ri to operate.
-  # TODO modify ri to avoid calling these on attributes.
-  #++
-
-  ##
-  # Parameters yielded by the called block
-
-  attr_reader :block_params
-
-  ##
-  # Parameters for this method
-
-  attr_accessor :params
-
-  ##
-  # Different ways to call this method
-
-  attr_accessor :call_seq
-
-  ##
-  # The call_seq or the param_seq with method name, if there is no call_seq.
-
-  attr_reader :arglists
-
-  ##
-  # Pretty parameter list for this method
-
-  attr_reader :param_seq
-
-
-  ##
-  # Creates a new MethodAttr from token stream +text+ and method or attribute
-  # name +name+.
-  #
-  # Usually this is called by super from a subclass.
-
-  def initialize text, name
-    super()
-
-    @text = text
-    @name = name
-
-    @aliases      = []
-    @is_alias_for = nil
-    @parent_name  = nil
-    @singleton    = nil
-    @visibility   = :public
-    @see = false
-
-    @arglists     = nil
-    @block_params = nil
-    @call_seq     = nil
-    @param_seq    = nil
-    @params       = nil
-  end
-
-  ##
-  # Resets cached data for the object so it can be rebuilt by accessor methods
-
-  def initialize_copy other # :nodoc:
-    @full_name = nil
-  end
-
-  def initialize_visibility # :nodoc:
-    super
-    @see = nil
-  end
-
-  ##
-  # Order by #singleton then #name
-
-  def <=>(other)
-    return unless other.respond_to?(:singleton) &&
-                  other.respond_to?(:name)
-
-    [     @singleton ? 0 : 1,       name] <=>
-    [other.singleton ? 0 : 1, other.name]
-  end
-
-  def == other # :nodoc:
-    equal?(other) or self.class == other.class and full_name == other.full_name
-  end
-
-  ##
-  # A method/attribute is documented if any of the following is true:
-  # - it was marked with :nodoc:;
-  # - it has a comment;
-  # - it is an alias for a documented method;
-  # - it has a +#see+ method that is documented.
-
-  def documented?
-    super or
-      (is_alias_for and is_alias_for.documented?) or
-      (see and see.documented?)
-  end
-
-  ##
-  # A method/attribute to look at,
-  # in particular if this method/attribute has no documentation.
-  #
-  # It can be a method/attribute of the superclass or of an included module,
-  # including the Kernel module, which is always appended to the included
-  # modules.
-  #
-  # Returns +nil+ if there is no such method/attribute.
-  # The +#is_alias_for+ method/attribute, if any, is not included.
-  #
-  # Templates may generate a "see also ..." if this method/attribute
-  # has documentation, and "see ..." if it does not.
-
-  def see
-    @see = find_see if @see == false
-    @see
-  end
-
-  ##
-  # Sets the store for this class or module and its contained code objects.
-
-  def store= store
-    super
-
-    @file = @store.add_file @file.full_name if @file
-  end
-
-  def find_see # :nodoc:
-    return nil if singleton || is_alias_for
-
-    # look for the method
-    other = find_method_or_attribute name
-    return other if other
-
-    # if it is a setter, look for a getter
-    return nil unless name =~ /[a-z_]=$/i   # avoid == or ===
-    return find_method_or_attribute name[0..-2]
-  end
-
-  def find_method_or_attribute name # :nodoc:
-    return nil unless parent.respond_to? :ancestors
-
-    searched = parent.ancestors
-    kernel = @store.modules_hash['Kernel']
-
-    searched << kernel if kernel &&
-      parent != kernel && !searched.include?(kernel)
-
-    searched.each do |ancestor|
-      next if String === ancestor
-      next if parent == ancestor
-
-      other = ancestor.find_method_named('#' + name) ||
-              ancestor.find_attribute_named(name)
-
-      return other if other
-    end
-
-    nil
-  end
-
-  ##
-  # Abstract method. Contexts in their building phase call this
-  # to register a new alias for this known method/attribute.
-  #
-  # - creates a new AnyMethod/Attribute named <tt>an_alias.new_name</tt>;
-  # - adds +self+ as an alias for the new method or attribute
-  # - adds the method or attribute to #aliases
-  # - adds the method or attribute to +context+.
-
-  def add_alias(an_alias, context)
-    raise NotImplementedError
-  end
-
-  ##
-  # HTML fragment reference for this method
-
-  def aref
-    type = singleton ? 'c' : 'i'
-    # % characters are not allowed in html names => dash instead
-    "#{aref_prefix}-#{type}-#{html_name}"
-  end
-
-  ##
-  # Prefix for +aref+, defined by subclasses.
-
-  def aref_prefix
-    raise NotImplementedError
-  end
-
-  ##
-  # Attempts to sanitize the content passed by the Ruby parser:
-  # remove outer parentheses, etc.
-
-  def block_params=(value)
-    # 'yield.to_s' or 'assert yield, msg'
-    return @block_params = '' if value =~ /^[\.,]/
-
-    # remove trailing 'if/unless ...'
-    return @block_params = '' if value =~ /^(if|unless)\s/
-
-    value = $1.strip if value =~ /^(.+)\s(if|unless)\s/
-
-    # outer parentheses
-    value = $1 if value =~ /^\s*\((.*)\)\s*$/
-    value = value.strip
-
-    # proc/lambda
-    return @block_params = $1 if value =~ /^(proc|lambda)(\s*\{|\sdo)/
-
-    # surrounding +...+ or [...]
-    value = $1.strip if value =~ /^\+(.*)\+$/
-    value = $1.strip if value =~ /^\[(.*)\]$/
-
-    return @block_params = '' if value.empty?
-
-    # global variable
-    return @block_params = 'str' if value =~ /^\$[&0-9]$/
-
-    # wipe out array/hash indices
-    value.gsub!(/(\w)\[[^\[]+\]/, '\1')
-
-    # remove @ from class/instance variables
-    value.gsub!(/@@?([a-z0-9_]+)/, '\1')
-
-    # method calls => method name
-    value.gsub!(/([A-Z:a-z0-9_]+)\.([a-z0-9_]+)(\s*\(\s*[a-z0-9_.,\s]*\s*\)\s*)?/) do
-      case $2
-      when 'to_s'      then $1
-      when 'const_get' then 'const'
-      when 'new' then
-        $1.split('::').last.  # ClassName => class_name
-          gsub(/([A-Z]+)([A-Z][a-z])/,'\1_\2').
-          gsub(/([a-z\d])([A-Z])/,'\1_\2').
-          downcase
-      else
-        $2
-      end
-    end
-
-    # class prefixes
-    value.gsub!(/[A-Za-z0-9_:]+::/, '')
-
-    # simple expressions
-    value = $1 if value =~ /^([a-z0-9_]+)\s*[-*+\/]/
-
-    @block_params = value.strip
-  end
-
-  ##
-  # HTML id-friendly method/attribute name
-
-  def html_name
-    require 'cgi/util'
-
-    CGI.escape(@name.gsub('-', '-2D')).gsub('%','-').sub(/^-/, '')
-  end
-
-  ##
-  # Full method/attribute name including namespace
-
-  def full_name
-    @full_name ||= "#{parent_name}#{pretty_name}"
-  end
-
-  def inspect # :nodoc:
-    alias_for = @is_alias_for ? " (alias for #{@is_alias_for.name})" : nil
-    visibility = self.visibility
-    visibility = "forced #{visibility}" if force_documentation
-    "#<%s:0x%x %s (%s)%s>" % [
-      self.class, object_id,
-      full_name,
-      visibility,
-      alias_for,
-    ]
-  end
-
-  ##
-  # '::' for a class method/attribute, '#' for an instance method.
-
-  def name_prefix
-    @singleton ? '::' : '#'
-  end
-
-  ##
-  # Name for output to HTML.  For class methods the full name with a "." is
-  # used like +SomeClass.method_name+.  For instance methods the class name is
-  # used if +context+ does not match the parent.
-  #
-  # This is to help prevent people from using :: to call class methods.
-
-  def output_name context
-    return "#{name_prefix}#{@name}" if context == parent
-
-    "#{parent_name}#{@singleton ? '.' : '#'}#{@name}"
-  end
-
-  ##
-  # Method/attribute name with class/instance indicator
-
-  def pretty_name
-    "#{name_prefix}#{@name}"
-  end
-
-  ##
-  # Type of method/attribute (class or instance)
-
-  def type
-    singleton ? 'class' : 'instance'
-  end
-
-  ##
-  # Path to this method for use with HTML generator output.
-
-  def path
-    "#{@parent.path}##{aref}"
-  end
-
-  ##
-  # Name of our parent with special handling for un-marshaled methods
-
-  def parent_name
-    @parent_name || super
-  end
-
-  def pretty_print q # :nodoc:
-    alias_for =
-      if @is_alias_for.respond_to? :name then
-        "alias for #{@is_alias_for.name}"
-      elsif Array === @is_alias_for then
-        "alias for #{@is_alias_for.last}"
-      end
-
-    q.group 2, "[#{self.class.name} #{full_name} #{visibility}", "]" do
-      if alias_for then
-        q.breakable
-        q.text alias_for
-      end
-
-      if text then
-        q.breakable
-        q.text "text:"
-        q.breakable
-        q.pp @text
-      end
-
-      unless comment.empty? then
-        q.breakable
-        q.text "comment:"
-        q.breakable
-        q.pp @comment
-      end
-    end
-  end
-
-  ##
-  # Used by RDoc::Generator::JsonIndex to create a record for the search
-  # engine.
-
-  def search_record
-    [
-      @name,
-      full_name,
-      @name,
-      @parent.full_name,
-      path,
-      params,
-      snippet(@comment),
-    ]
-  end
-
-  def to_s # :nodoc:
-    if @is_alias_for
-      "#{self.class.name}: #{full_name} -> #{is_alias_for}"
-    else
-      "#{self.class.name}: #{full_name}"
-    end
-  end
-
-end
diff --git a/lib/rdoc/mixin.rb b/lib/rdoc/mixin.rb
deleted file mode 100644
index fa8faefc15c2f0..00000000000000
--- a/lib/rdoc/mixin.rb
+++ /dev/null
@@ -1,120 +0,0 @@
-# frozen_string_literal: true
-##
-# A Mixin adds features from a module into another context.  RDoc::Include and
-# RDoc::Extend are both mixins.
-
-class RDoc::Mixin < RDoc::CodeObject
-
-  ##
-  # Name of included module
-
-  attr_accessor :name
-
-  ##
-  # Creates a new Mixin for +name+ with +comment+
-
-  def initialize(name, comment)
-    super()
-    @name = name
-    self.comment = comment
-    @module = nil # cache for module if found
-  end
-
-  ##
-  # Mixins are sorted by name
-
-  def <=> other
-    return unless self.class === other
-
-    name <=> other.name
-  end
-
-  def == other # :nodoc:
-    self.class === other and @name == other.name
-  end
-
-  alias eql? == # :nodoc:
-
-  ##
-  # Full name based on #module
-
-  def full_name
-    m = self.module
-    RDoc::ClassModule === m ? m.full_name : @name
-  end
-
-  def hash # :nodoc:
-    [@name, self.module].hash
-  end
-
-  def inspect # :nodoc:
-    "#<%s:0x%x %s.%s %s>" % [
-      self.class,
-      object_id,
-      parent_name, self.class.name.downcase, @name,
-    ]
-  end
-
-  ##
-  # Attempts to locate the included module object.  Returns the name if not
-  # known.
-  #
-  # The scoping rules of Ruby to resolve the name of an included module are:
-  # - first look into the children of the current context;
-  # - if not found, look into the children of included modules,
-  #   in reverse inclusion order;
-  # - if still not found, go up the hierarchy of names.
-  #
-  # This method has <code>O(n!)</code> behavior when the module calling
-  # include is referencing nonexistent modules.  Avoid calling #module until
-  # after all the files are parsed.  This behavior is due to ruby's constant
-  # lookup behavior.
-  #
-  # As of the beginning of October, 2011, no gem includes nonexistent modules.
-
-  def module
-    return @module if @module
-
-    # search the current context
-    return @name unless parent
-    full_name = parent.child_name(@name)
-    @module = @store.modules_hash[full_name]
-    return @module if @module
-    return @name if @name =~ /^::/
-
-    # search the includes before this one, in reverse order
-    searched = parent.includes.take_while { |i| i != self }.reverse
-    searched.each do |i|
-      inc = i.module
-      next if String === inc
-      full_name = inc.child_name(@name)
-      @module = @store.modules_hash[full_name]
-      return @module if @module
-    end
-
-    # go up the hierarchy of names
-    up = parent.parent
-    while up
-      full_name = up.child_name(@name)
-      @module = @store.modules_hash[full_name]
-      return @module if @module
-      up = up.parent
-    end
-
-    @name
-  end
-
-  ##
-  # Sets the store for this class or module and its contained code objects.
-
-  def store= store
-    super
-
-    @file = @store.add_file @file.full_name if @file
-  end
-
-  def to_s # :nodoc:
-    "#{self.class.name.downcase} #@name in: #{parent}"
-  end
-
-end
diff --git a/lib/rdoc/normal_class.rb b/lib/rdoc/normal_class.rb
deleted file mode 100644
index aa340b5d15d9fe..00000000000000
--- a/lib/rdoc/normal_class.rb
+++ /dev/null
@@ -1,92 +0,0 @@
-# frozen_string_literal: true
-##
-# A normal class, neither singleton nor anonymous
-
-class RDoc::NormalClass < RDoc::ClassModule
-
-  ##
-  # The ancestors of this class including modules.  Unlike Module#ancestors,
-  # this class is not included in the result.  The result will contain both
-  # RDoc::ClassModules and Strings.
-
-  def ancestors
-    if String === superclass then
-      super << superclass
-    elsif superclass then
-      ancestors = super
-      ancestors << superclass
-      ancestors.concat superclass.ancestors
-    else
-      super
-    end
-  end
-
-  def aref_prefix # :nodoc:
-    'class'
-  end
-
-  ##
-  # The definition of this class, <tt>class MyClassName</tt>
-
-  def definition
-    "class #{full_name}"
-  end
-
-  def direct_ancestors
-    superclass ? super + [superclass] : super
-  end
-
-  def inspect # :nodoc:
-    superclass = @superclass ? " < #{@superclass}" : nil
-    "<%s:0x%x class %s%s includes: %p extends: %p attributes: %p methods: %p aliases: %p>" % [
-      self.class, object_id,
-      full_name, superclass, @includes, @extends, @attributes, @method_list, @aliases
-    ]
-  end
-
-  def to_s # :nodoc:
-    display = "#{self.class.name} #{self.full_name}"
-    if superclass
-      display += ' < ' + (superclass.is_a?(String) ? superclass : superclass.full_name)
-    end
-    display += ' -> ' + is_alias_for.to_s if is_alias_for
-    display
-  end
-
-  def pretty_print q # :nodoc:
-    superclass = @superclass ? " < #{@superclass}" : nil
-
-    q.group 2, "[class #{full_name}#{superclass}", "]" do
-      q.breakable
-      q.text "includes:"
-      q.breakable
-      q.seplist @includes do |inc| q.pp inc end
-
-      q.breakable
-      q.text "constants:"
-      q.breakable
-      q.seplist @constants do |const| q.pp const end
-
-      q.breakable
-      q.text "attributes:"
-      q.breakable
-      q.seplist @attributes do |attr| q.pp attr end
-
-      q.breakable
-      q.text "methods:"
-      q.breakable
-      q.seplist @method_list do |meth| q.pp meth end
-
-      q.breakable
-      q.text "aliases:"
-      q.breakable
-      q.seplist @aliases do |aliaz| q.pp aliaz end
-
-      q.breakable
-      q.text "comment:"
-      q.breakable
-      q.pp comment
-    end
-  end
-
-end
diff --git a/lib/rdoc/normal_module.rb b/lib/rdoc/normal_module.rb
deleted file mode 100644
index 498ec4dde2966f..00000000000000
--- a/lib/rdoc/normal_module.rb
+++ /dev/null
@@ -1,73 +0,0 @@
-# frozen_string_literal: true
-##
-# A normal module, like NormalClass
-
-class RDoc::NormalModule < RDoc::ClassModule
-
-  def aref_prefix # :nodoc:
-    'module'
-  end
-
-  def inspect # :nodoc:
-    "#<%s:0x%x module %s includes: %p extends: %p attributes: %p methods: %p aliases: %p>" % [
-      self.class, object_id,
-      full_name, @includes, @extends, @attributes, @method_list, @aliases
-    ]
-  end
-
-  ##
-  # The definition of this module, <tt>module MyModuleName</tt>
-
-  def definition
-    "module #{full_name}"
-  end
-
-  ##
-  # This is a module, returns true
-
-  def module?
-    true
-  end
-
-  def pretty_print q # :nodoc:
-    q.group 2, "[module #{full_name}:", "]" do
-      q.breakable
-      q.text "includes:"
-      q.breakable
-      q.seplist @includes do |inc| q.pp inc end
-      q.breakable
-
-      q.breakable
-      q.text "constants:"
-      q.breakable
-      q.seplist @constants do |const| q.pp const end
-
-      q.text "attributes:"
-      q.breakable
-      q.seplist @attributes do |attr| q.pp attr end
-      q.breakable
-
-      q.text "methods:"
-      q.breakable
-      q.seplist @method_list do |meth| q.pp meth end
-      q.breakable
-
-      q.text "aliases:"
-      q.breakable
-      q.seplist @aliases do |aliaz| q.pp aliaz end
-      q.breakable
-
-      q.text "comment:"
-      q.breakable
-      q.pp comment
-    end
-  end
-
-  ##
-  # Modules don't have one, raises NoMethodError
-
-  def superclass
-    raise NoMethodError, "#{full_name} is a module"
-  end
-
-end
diff --git a/lib/rdoc/options.rb b/lib/rdoc/options.rb
deleted file mode 100644
index 6ee29fd071af98..00000000000000
--- a/lib/rdoc/options.rb
+++ /dev/null
@@ -1,1330 +0,0 @@
-# frozen_string_literal: true
-require 'optparse'
-require 'pathname'
-
-##
-# RDoc::Options handles the parsing and storage of options
-#
-# == Saved Options
-#
-# You can save some options like the markup format in the
-# <tt>.rdoc_options</tt> file in your gem.  The easiest way to do this is:
-#
-#   rdoc --markup tomdoc --write-options
-#
-# Which will automatically create the file and fill it with the options you
-# specified.
-#
-# The following options will not be saved since they interfere with the user's
-# preferences or with the normal operation of RDoc:
-#
-# * +--coverage-report+
-# * +--dry-run+
-# * +--encoding+
-# * +--force-update+
-# * +--format+
-# * +--pipe+
-# * +--quiet+
-# * +--template+
-# * +--verbose+
-#
-# == Custom Options
-#
-# Generators can hook into RDoc::Options to add generator-specific command
-# line options.
-#
-# When <tt>--format</tt> is encountered in ARGV, RDoc calls ::setup_options on
-# the generator class to add extra options to the option parser.  Options for
-# custom generators must occur after <tt>--format</tt>.  <tt>rdoc --help</tt>
-# will list options for all installed generators.
-#
-# Example:
-#
-#   class RDoc::Generator::Spellcheck
-#     RDoc::RDoc.add_generator self
-#
-#     def self.setup_options rdoc_options
-#       op = rdoc_options.option_parser
-#
-#       op.on('--spell-dictionary DICTIONARY',
-#             RDoc::Options::Path) do |dictionary|
-#         rdoc_options.spell_dictionary = dictionary
-#       end
-#     end
-#   end
-#
-# Of course, RDoc::Options does not respond to +spell_dictionary+ by default
-# so you will need to add it:
-#
-#   class RDoc::Options
-#
-#     ##
-#     # The spell dictionary used by the spell-checking plugin.
-#
-#     attr_accessor :spell_dictionary
-#
-#   end
-#
-# == Option Validators
-#
-# OptionParser validators will validate and cast user input values.  In
-# addition to the validators that ship with OptionParser (String, Integer,
-# Float, TrueClass, FalseClass, Array, Regexp, Date, Time, URI, etc.),
-# RDoc::Options adds Path, PathArray and Template.
-
-class RDoc::Options
-
-  ##
-  # The deprecated options.
-
-  DEPRECATED = {
-    '--accessor'      => 'support discontinued',
-    '--diagram'       => 'support discontinued',
-    '--help-output'   => 'support discontinued',
-    '--image-format'  => 'was an option for --diagram',
-    '--inline-source' => 'source code is now always inlined',
-    '--merge'         => 'ri now always merges class information',
-    '--one-file'      => 'support discontinued',
-    '--op-name'       => 'support discontinued',
-    '--opname'        => 'support discontinued',
-    '--promiscuous'   => 'files always only document their content',
-    '--ri-system'     => 'Ruby installers use other techniques',
-  }
-
-  ##
-  # RDoc options ignored (or handled specially) by --write-options
-
-  SPECIAL = %w[
-    coverage_report
-    dry_run
-    encoding
-    files
-    force_output
-    force_update
-    generator
-    generator_name
-    generator_options
-    generators
-    op_dir
-    page_dir
-    option_parser
-    pipe
-    rdoc_include
-    root
-    static_path
-    stylesheet_url
-    template
-    template_dir
-    update_output_dir
-    verbosity
-    write_options
-  ]
-
-  ##
-  # Option validator for OptionParser that matches a directory that exists on
-  # the filesystem.
-
-  Directory = Object.new
-
-  ##
-  # Option validator for OptionParser that matches a file or directory that
-  # exists on the filesystem.
-
-  Path = Object.new
-
-  ##
-  # Option validator for OptionParser that matches a comma-separated list of
-  # files or directories that exist on the filesystem.
-
-  PathArray = Object.new
-
-  ##
-  # Option validator for OptionParser that matches a template directory for an
-  # installed generator that lives in
-  # <tt>"rdoc/generator/template/#{template_name}"</tt>
-
-  Template = Object.new
-
-  ##
-  # Character-set for HTML output.  #encoding is preferred over #charset
-
-  attr_accessor :charset
-
-  ##
-  # If true, RDoc will not write any files.
-
-  attr_accessor :dry_run
-
-  ##
-  # The output encoding.  All input files will be transcoded to this encoding.
-  #
-  # The default encoding is UTF-8.  This is set via --encoding.
-
-  attr_accessor :encoding
-
-  ##
-  # Files matching this pattern will be excluded
-
-  attr_writer :exclude
-
-  ##
-  # The list of files to be processed
-
-  attr_accessor :files
-
-  ##
-  # Create the output even if the output directory does not look
-  # like an rdoc output directory
-
-  attr_accessor :force_output
-
-  ##
-  # Scan newer sources than the flag file if true.
-
-  attr_accessor :force_update
-
-  ##
-  # Formatter to mark up text with
-
-  attr_accessor :formatter
-
-  ##
-  # Description of the output generator (set with the <tt>--format</tt> option)
-
-  attr_accessor :generator
-
-  ##
-  # For #==
-
-  attr_reader :generator_name # :nodoc:
-
-  ##
-  # Loaded generator options.  Used to prevent --help from loading the same
-  # options multiple times.
-
-  attr_accessor :generator_options
-
-  ##
-  # Old rdoc behavior: hyperlink all words that match a method name,
-  # even if not preceded by '#' or '::'
-
-  attr_accessor :hyperlink_all
-
-  ##
-  # Include line numbers in the source code
-
-  attr_accessor :line_numbers
-
-  ##
-  # The output locale.
-
-  attr_accessor :locale
-
-  ##
-  # The directory where locale data live.
-
-  attr_accessor :locale_dir
-
-  ##
-  # Name of the file, class or module to display in the initial index page (if
-  # not specified the first file we encounter is used)
-
-  attr_accessor :main_page
-
-  ##
-  # The default markup format.  The default is 'rdoc'.  'markdown', 'tomdoc'
-  # and 'rd' are also built-in.
-
-  attr_accessor :markup
-
-  ##
-  # If true, only report on undocumented files
-
-  attr_accessor :coverage_report
-
-  ##
-  # The name of the output directory
-
-  attr_accessor :op_dir
-
-  ##
-  # The OptionParser for this instance
-
-  attr_accessor :option_parser
-
-  ##
-  # Output heading decorations?
-  attr_accessor :output_decoration
-
-  ##
-  # Directory where guides, FAQ, and other pages not associated with a class
-  # live.  You may leave this unset if these are at the root of your project.
-
-  attr_accessor :page_dir
-
-  ##
-  # Is RDoc in pipe mode?
-
-  attr_accessor :pipe
-
-  ##
-  # Array of directories to search for files to satisfy an :include:
-
-  attr_accessor :rdoc_include
-
-  ##
-  # Root of the source documentation will be generated for.  Set this when
-  # building documentation outside the source directory.  Defaults to the
-  # current directory.
-
-  attr_accessor :root
-
-  ##
-  # Include the '#' at the front of hyperlinked instance method names
-
-  attr_accessor :show_hash
-
-  ##
-  # Directory to copy static files from
-
-  attr_accessor :static_path
-
-  ##
-  # The number of columns in a tab
-
-  attr_accessor :tab_width
-
-  ##
-  # Template to be used when generating output
-
-  attr_accessor :template
-
-  ##
-  # Directory the template lives in
-
-  attr_accessor :template_dir
-
-  ##
-  # Additional template stylesheets
-
-  attr_accessor :template_stylesheets
-
-  ##
-  # Documentation title
-
-  attr_accessor :title
-
-  ##
-  # Should RDoc update the timestamps in the output dir?
-
-  attr_accessor :update_output_dir
-
-  ##
-  # Verbosity, zero means quiet
-
-  attr_accessor :verbosity
-
-  ##
-  # URL of web cvs frontend
-
-  attr_accessor :webcvs
-
-  ##
-  # Minimum visibility of a documented method. One of +:public+, +:protected+,
-  # +:private+ or +:nodoc+.
-  #
-  # The +:nodoc+ visibility ignores all directives related to visibility.  The
-  # other visibilities may be overridden on a per-method basis with the :doc:
-  # directive.
-
-  attr_reader :visibility
-
-  ##
-  # Indicates if files of test suites should be skipped
-  attr_accessor :skip_tests
-
-  def initialize loaded_options = nil # :nodoc:
-    init_ivars
-    override loaded_options if loaded_options
-  end
-
-  def init_ivars # :nodoc:
-    @dry_run = false
-    @exclude = %w[
-      ~\z \.orig\z \.rej\z \.bak\z
-      \.gemspec\z
-    ]
-    @files = nil
-    @force_output = false
-    @force_update = true
-    @generator = nil
-    @generator_name = nil
-    @generator_options = []
-    @generators = RDoc::RDoc::GENERATORS
-    @hyperlink_all = false
-    @line_numbers = false
-    @locale = nil
-    @locale_name = nil
-    @locale_dir = 'locale'
-    @main_page = nil
-    @markup = 'rdoc'
-    @coverage_report = false
-    @op_dir = nil
-    @page_dir = nil
-    @pipe = false
-    @output_decoration = true
-    @rdoc_include = []
-    @root = Pathname(Dir.pwd)
-    @show_hash = false
-    @static_path = []
-    @stylesheet_url = nil # TODO remove in RDoc 4
-    @tab_width = 8
-    @template = nil
-    @template_dir = nil
-    @template_stylesheets = []
-    @title = nil
-    @update_output_dir = true
-    @verbosity = 1
-    @visibility = :protected
-    @webcvs = nil
-    @write_options = false
-    @encoding = Encoding::UTF_8
-    @charset = @encoding.name
-    @skip_tests = true
-  end
-
-  def init_with map # :nodoc:
-    init_ivars
-
-    encoding = map['encoding']
-    @encoding = encoding ? Encoding.find(encoding) : encoding
-
-    @charset        = map['charset']
-    @exclude        = map['exclude']
-    @generator_name = map['generator_name']
-    @hyperlink_all  = map['hyperlink_all']
-    @line_numbers   = map['line_numbers']
-    @locale_name    = map['locale_name']
-    @locale_dir     = map['locale_dir']
-    @main_page      = map['main_page']
-    @markup         = map['markup']
-    @op_dir         = map['op_dir']
-    @show_hash      = map['show_hash']
-    @tab_width      = map['tab_width']
-    @template_dir   = map['template_dir']
-    @title          = map['title']
-    @visibility     = map['visibility']
-    @webcvs         = map['webcvs']
-
-    @rdoc_include = sanitize_path map['rdoc_include']
-    @static_path  = sanitize_path map['static_path']
-  end
-
-  def yaml_initialize tag, map # :nodoc:
-    init_with map
-  end
-
-  def override map # :nodoc:
-    if map.has_key?('encoding')
-      encoding = map['encoding']
-      @encoding = encoding ? Encoding.find(encoding) : encoding
-    end
-
-    @charset        = map['charset']        if map.has_key?('charset')
-    @exclude        = map['exclude']        if map.has_key?('exclude')
-    @generator_name = map['generator_name'] if map.has_key?('generator_name')
-    @hyperlink_all  = map['hyperlink_all']  if map.has_key?('hyperlink_all')
-    @line_numbers   = map['line_numbers']   if map.has_key?('line_numbers')
-    @locale_name    = map['locale_name']    if map.has_key?('locale_name')
-    @locale_dir     = map['locale_dir']     if map.has_key?('locale_dir')
-    @main_page      = map['main_page']      if map.has_key?('main_page')
-    @markup         = map['markup']         if map.has_key?('markup')
-    @op_dir         = map['op_dir']         if map.has_key?('op_dir')
-    @page_dir       = map['page_dir']       if map.has_key?('page_dir')
-    @show_hash      = map['show_hash']      if map.has_key?('show_hash')
-    @tab_width      = map['tab_width']      if map.has_key?('tab_width')
-    @template_dir   = map['template_dir']   if map.has_key?('template_dir')
-    @title          = map['title']          if map.has_key?('title')
-    @visibility     = map['visibility']     if map.has_key?('visibility')
-    @webcvs         = map['webcvs']         if map.has_key?('webcvs')
-
-    if map.has_key?('rdoc_include')
-      @rdoc_include = sanitize_path map['rdoc_include']
-    end
-    if map.has_key?('static_path')
-      @static_path  = sanitize_path map['static_path']
-    end
-  end
-
-  def == other # :nodoc:
-    self.class === other and
-      @encoding       == other.encoding       and
-      @generator_name == other.generator_name and
-      @hyperlink_all  == other.hyperlink_all  and
-      @line_numbers   == other.line_numbers   and
-      @locale         == other.locale         and
-      @locale_dir     == other.locale_dir and
-      @main_page      == other.main_page      and
-      @markup         == other.markup         and
-      @op_dir         == other.op_dir         and
-      @rdoc_include   == other.rdoc_include   and
-      @show_hash      == other.show_hash      and
-      @static_path    == other.static_path    and
-      @tab_width      == other.tab_width      and
-      @template       == other.template       and
-      @title          == other.title          and
-      @visibility     == other.visibility     and
-      @webcvs         == other.webcvs
-  end
-
-  ##
-  # Check that the files on the command line exist
-
-  def check_files
-    @files.delete_if do |file|
-      if File.exist? file then
-        if File.readable? file then
-          false
-        else
-          warn "file '#{file}' not readable"
-
-          true
-        end
-      else
-        warn "file '#{file}' not found"
-
-        true
-      end
-    end
-  end
-
-  ##
-  # Ensure only one generator is loaded
-
-  def check_generator
-    if @generator then
-      raise OptionParser::InvalidOption,
-        "generator already set to #{@generator_name}"
-    end
-  end
-
-  ##
-  # Set the title, but only if not already set. Used to set the title
-  # from a source file, so that a title set from the command line
-  # will have the priority.
-
-  def default_title=(string)
-    @title ||= string
-  end
-
-  ##
-  # For dumping YAML
-
-  def to_yaml(*options) # :nodoc:
-    encoding = @encoding ? @encoding.name : nil
-
-    yaml = {}
-    yaml['encoding'] = encoding
-    yaml['static_path'] = sanitize_path(@static_path)
-    yaml['rdoc_include'] = sanitize_path(@rdoc_include)
-    yaml['page_dir'] = (sanitize_path([@page_dir]).first if @page_dir)
-
-    ivars = instance_variables.map { |ivar| ivar.to_s[1..-1] }
-    ivars -= SPECIAL
-
-    ivars.sort.each do |ivar|
-      yaml[ivar] = instance_variable_get("@#{ivar}")
-    end
-    yaml.to_yaml
-  end
-
-  ##
-  # Create a regexp for #exclude
-
-  def exclude
-    if @exclude.nil? or Regexp === @exclude then
-      # done, #finish is being re-run
-      @exclude
-    elsif @exclude.empty? then
-      nil
-    else
-      Regexp.new(@exclude.join("|"))
-    end
-  end
-
-  ##
-  # Completes any unfinished option setup business such as filtering for
-  # existent files, creating a regexp for #exclude and setting a default
-  # #template.
-
-  def finish
-    if @write_options then
-      write_options
-      exit
-    end
-
-    @op_dir ||= 'doc'
-
-    root = @root.to_s
-    if @rdoc_include.empty? || !@rdoc_include.include?(root)
-      @rdoc_include << root
-    end
-
-    @exclude = self.exclude
-
-    finish_page_dir
-
-    check_files
-
-    # If no template was specified, use the default template for the output
-    # formatter
-
-    unless @template then
-      @template     = @generator_name
-      @template_dir = template_dir_for @template
-    end
-
-    if @locale_name
-      @locale = RDoc::I18n::Locale[@locale_name]
-      @locale.load(@locale_dir)
-    else
-      @locale = nil
-    end
-
-    self
-  end
-
-  ##
-  # Fixes the page_dir to be relative to the root_dir and adds the page_dir to
-  # the files list.
-
-  def finish_page_dir
-    return unless @page_dir
-
-    @files << @page_dir
-
-    page_dir = Pathname(@page_dir)
-    begin
-      page_dir = page_dir.expand_path.relative_path_from @root
-    rescue ArgumentError
-      # On Windows, sometimes crosses different drive letters.
-      page_dir = page_dir.expand_path
-    end
-
-    @page_dir = page_dir
-  end
-
-  ##
-  # Returns a properly-space list of generators and their descriptions.
-
-  def generator_descriptions
-    lengths = []
-
-    generators = RDoc::RDoc::GENERATORS.map do |name, generator|
-      lengths << name.length
-
-      description = generator::DESCRIPTION if
-        generator.const_defined? :DESCRIPTION
-
-      [name, description]
-    end
-
-    longest = lengths.max
-
-    generators.sort.map do |name, description|
-      if description then
-        "  %-*s - %s" % [longest, name, description]
-      else
-        "  #{name}"
-      end
-    end.join "\n"
-  end
-
-  ##
-  # Parses command line options.
-
-  def parse argv
-    ignore_invalid = true
-
-    argv.insert(0, *ENV['RDOCOPT'].split) if ENV['RDOCOPT']
-
-    opts = OptionParser.new do |opt|
-      @option_parser = opt
-      opt.program_name = File.basename $0
-      opt.version = RDoc::VERSION
-      opt.release = nil
-      opt.summary_indent = ' ' * 4
-      opt.banner = <<-EOF
-Usage: #{opt.program_name} [options] [names...]
-
-  Files are parsed, and the information they contain collected, before any
-  output is produced. This allows cross references between all files to be
-  resolved. If a name is a directory, it is traversed. If no names are
-  specified, all Ruby files in the current directory (and subdirectories) are
-  processed.
-
-  How RDoc generates output depends on the output formatter being used, and on
-  the options you give.
-
-  Options can be specified via the RDOCOPT environment variable, which
-  functions similar to the RUBYOPT environment variable for ruby.
-
-    $ export RDOCOPT="--show-hash"
-
-  will make rdoc show hashes in method links by default.  Command-line options
-  always will override those in RDOCOPT.
-
-  Available formatters:
-
-#{generator_descriptions}
-
-  RDoc understands the following file formats:
-
-      EOF
-
-      parsers = Hash.new { |h,parser| h[parser] = [] }
-
-      RDoc::Parser.parsers.each do |regexp, parser|
-        parsers[parser.name.sub('RDoc::Parser::', '')] << regexp.source
-      end
-
-      parsers.sort.each do |parser, regexp|
-        opt.banner += "  - #{parser}: #{regexp.join ', '}\n"
-      end
-      opt.banner += "  - TomDoc:  Only in ruby files\n"
-
-      opt.banner += "\n  The following options are deprecated:\n\n"
-
-      name_length = DEPRECATED.keys.sort_by { |k| k.length }.last.length
-
-      DEPRECATED.sort_by { |k,| k }.each do |name, reason|
-        opt.banner += "    %*1$2$s  %3$s\n" % [-name_length, name, reason]
-      end
-
-      opt.accept Template do |template|
-        template_dir = template_dir_for template
-
-        unless template_dir then
-          $stderr.puts "could not find template #{template}"
-          nil
-        else
-          [template, template_dir]
-        end
-      end
-
-      opt.accept Directory do |directory|
-        directory = File.expand_path directory
-
-        raise OptionParser::InvalidArgument unless File.directory? directory
-
-        directory
-      end
-
-      opt.accept Path do |path|
-        path = File.expand_path path
-
-        raise OptionParser::InvalidArgument unless File.exist? path
-
-        path
-      end
-
-      opt.accept PathArray do |paths,|
-        paths = if paths then
-                  paths.split(',').map { |d| d unless d.empty? }
-                end
-
-        paths.map do |path|
-          path = File.expand_path path
-
-          raise OptionParser::InvalidArgument unless File.exist? path
-
-          path
-        end
-      end
-
-      opt.separator nil
-      opt.separator "Parsing options:"
-      opt.separator nil
-
-      opt.on("--encoding=ENCODING", "-e", Encoding.list.map { |e| e.name },
-             "Specifies the output encoding.  All files",
-             "read will be converted to this encoding.",
-             "The default encoding is UTF-8.",
-             "--encoding is preferred over --charset") do |value|
-               @encoding = Encoding.find value
-               @charset = @encoding.name # may not be valid value
-             end
-
-      opt.separator nil
-
-      opt.on("--locale=NAME",
-             "Specifies the output locale.") do |value|
-        @locale_name = value
-      end
-
-      opt.on("--locale-data-dir=DIR",
-             "Specifies the directory where locale data live.") do |value|
-        @locale_dir = value
-      end
-
-      opt.separator nil
-
-      opt.on("--all", "-a",
-             "Synonym for --visibility=private.") do |value|
-        @visibility = :private
-      end
-
-      opt.separator nil
-
-      opt.on("--exclude=PATTERN", "-x", Regexp,
-             "Do not process files or directories",
-             "matching PATTERN.") do |value|
-        @exclude << value
-      end
-
-      opt.separator nil
-
-      opt.on("--no-skipping-tests", nil,
-             "Don't skip generating documentation for test and spec files") do |value|
-        @skip_tests = false
-      end
-
-      opt.separator nil
-
-      opt.on("--extension=NEW=OLD", "-E",
-             "Treat files ending with .new as if they",
-             "ended with .old. Using '-E cgi=rb' will",
-             "cause xxx.cgi to be parsed as a Ruby file.") do |value|
-        new, old = value.split(/=/, 2)
-
-        unless new and old then
-          raise OptionParser::InvalidArgument, "Invalid parameter to '-E'"
-        end
-
-        unless RDoc::Parser.alias_extension old, new then
-          raise OptionParser::InvalidArgument, "Unknown extension .#{old} to -E"
-        end
-      end
-
-      opt.separator nil
-
-      opt.on("--[no-]force-update", "-U",
-             "Forces rdoc to scan all sources even if",
-             "no files are newer than the flag file.") do |value|
-        @force_update = value
-      end
-
-      opt.separator nil
-
-      opt.on("--pipe", "-p",
-             "Convert RDoc on stdin to HTML") do
-        @pipe = true
-      end
-
-      opt.separator nil
-
-      opt.on("--tab-width=WIDTH", "-w", Integer,
-             "Set the width of tab characters.") do |value|
-        raise OptionParser::InvalidArgument,
-              "#{value} is an invalid tab width" if value <= 0
-        @tab_width = value
-      end
-
-      opt.separator nil
-
-      opt.on("--visibility=VISIBILITY", "-V", RDoc::VISIBILITIES + [:nodoc],
-             "Minimum visibility to document a method.",
-             "One of 'public', 'protected' (the default),",
-             "'private' or 'nodoc' (show everything)") do |value|
-        @visibility = value
-      end
-
-      opt.separator nil
-
-      markup_formats = RDoc::Text::MARKUP_FORMAT.keys.sort
-
-      opt.on("--markup=MARKUP", markup_formats,
-             "The markup format for the named files.",
-             "The default is rdoc.  Valid values are:",
-             markup_formats.join(', ')) do |value|
-        @markup = value
-      end
-
-      opt.separator nil
-
-      opt.on("--root=ROOT", Directory,
-             "Root of the source tree documentation",
-             "will be generated for.  Set this when",
-             "building documentation outside the",
-             "source directory.  Default is the",
-             "current directory.") do |root|
-        @root = Pathname(root)
-      end
-
-      opt.separator nil
-
-      opt.on("--page-dir=DIR", Directory,
-             "Directory where guides, your FAQ or",
-             "other pages not associated with a class",
-             "live.  Set this when you don't store",
-             "such files at your project root.",
-             "NOTE: Do not use the same file name in",
-             "the page dir and the root of your project") do |page_dir|
-        @page_dir = page_dir
-      end
-
-      opt.separator nil
-      opt.separator "Common generator options:"
-      opt.separator nil
-
-      opt.on("--force-output", "-O",
-             "Forces rdoc to write the output files,",
-             "even if the output directory exists",
-             "and does not seem to have been created",
-             "by rdoc.") do |value|
-        @force_output = value
-      end
-
-      opt.separator nil
-
-      generator_text = @generators.keys.map { |name| "  #{name}" }.sort
-
-      opt.on("-f", "--fmt=FORMAT", "--format=FORMAT", @generators.keys,
-             "Set the output formatter.  One of:", *generator_text) do |value|
-        check_generator
-
-        @generator_name = value.downcase
-        setup_generator
-      end
-
-      opt.separator nil
-
-      opt.on("--include=DIRECTORIES", "-i", PathArray,
-             "Set (or add to) the list of directories to",
-             "be searched when satisfying :include:",
-             "requests. Can be used more than once.") do |value|
-        @rdoc_include.concat value.map { |dir| dir.strip }
-      end
-
-      opt.separator nil
-
-      opt.on("--[no-]coverage-report=[LEVEL]", "--[no-]dcov", "-C", Integer,
-             "Prints a report on undocumented items.",
-             "Does not generate files.") do |value|
-        value = 0 if value.nil? # Integer converts -C to nil
-
-        @coverage_report = value
-        @force_update = true if value
-      end
-
-      opt.separator nil
-
-      opt.on("--output=DIR", "--op", "-o",
-             "Set the output directory.") do |value|
-        @op_dir = value
-      end
-
-      opt.separator nil
-
-      opt.on("-d",
-             "Deprecated --diagram option.",
-             "Prevents firing debug mode",
-             "with legacy invocation.") do |value|
-      end
-
-      opt.separator nil
-      opt.separator 'HTML generator options:'
-      opt.separator nil
-
-      opt.on("--charset=CHARSET", "-c",
-             "Specifies the output HTML character-set.",
-             "Use --encoding instead of --charset if",
-             "available.") do |value|
-        @charset = value
-      end
-
-      opt.separator nil
-
-      opt.on("--hyperlink-all", "-A",
-             "Generate hyperlinks for all words that",
-             "correspond to known methods, even if they",
-             "do not start with '#' or '::' (legacy",
-             "behavior).") do |value|
-        @hyperlink_all = value
-      end
-
-      opt.separator nil
-
-      opt.on("--main=NAME", "-m",
-             "NAME will be the initial page displayed.") do |value|
-        @main_page = value
-      end
-
-      opt.separator nil
-
-      opt.on("--[no-]line-numbers", "-N",
-             "Include line numbers in the source code.",
-             "By default, only the number of the first",
-             "line is displayed, in a leading comment.") do |value|
-        @line_numbers = value
-      end
-
-      opt.separator nil
-
-      opt.on("--show-hash", "-H",
-             "A name of the form #name in a comment is a",
-             "possible hyperlink to an instance method",
-             "name. When displayed, the '#' is removed",
-             "unless this option is specified.") do |value|
-        @show_hash = value
-      end
-
-      opt.separator nil
-
-      opt.on("--template=NAME", "-T", Template,
-             "Set the template used when generating",
-             "output. The default depends on the",
-             "formatter used.") do |(template, template_dir)|
-        @template     = template
-        @template_dir = template_dir
-      end
-
-      opt.separator nil
-
-      opt.on("--template-stylesheets=FILES", PathArray,
-             "Set (or add to) the list of files to",
-             "include with the html template.") do |value|
-        @template_stylesheets.concat value
-      end
-
-      opt.separator nil
-
-      opt.on("--title=TITLE", "-t",
-             "Set TITLE as the title for HTML output.") do |value|
-        @title = value
-      end
-
-      opt.separator nil
-
-      opt.on("--copy-files=PATH", Path,
-             "Specify a file or directory to copy static",
-             "files from.",
-             "If a file is given it will be copied into",
-             "the output dir.  If a directory is given the",
-             "entire directory will be copied.",
-             "You can use this multiple times") do |value|
-        @static_path << value
-      end
-
-      opt.separator nil
-
-      opt.on("--webcvs=URL", "-W",
-             "Specify a URL for linking to a web frontend",
-             "to CVS. If the URL contains a '\%s', the",
-             "name of the current file will be",
-             "substituted; if the URL doesn't contain a",
-             "'\%s', the filename will be appended to it.") do |value|
-        @webcvs = value
-      end
-
-      opt.separator nil
-      opt.separator "ri generator options:"
-      opt.separator nil
-
-      opt.on("--ri", "-r",
-             "Generate output for use by `ri`. The files",
-             "are stored in the '.rdoc' directory under",
-             "your home directory unless overridden by a",
-             "subsequent --op parameter, so no special",
-             "privileges are needed.") do |value|
-        check_generator
-
-        @generator_name = "ri"
-        @op_dir ||= RDoc::RI::Paths::HOMEDIR
-        setup_generator
-      end
-
-      opt.separator nil
-
-      opt.on("--ri-site", "-R",
-             "Generate output for use by `ri`. The files",
-             "are stored in a site-wide directory,",
-             "making them accessible to others, so",
-             "special privileges are needed.") do |value|
-        check_generator
-
-        @generator_name = "ri"
-        @op_dir = RDoc::RI::Paths.site_dir
-        setup_generator
-      end
-
-      opt.separator nil
-      opt.separator "Generic options:"
-      opt.separator nil
-
-      opt.on("--write-options",
-             "Write .rdoc_options to the current",
-             "directory with the given options.  Not all",
-             "options will be used.  See RDoc::Options",
-             "for details.") do |value|
-        @write_options = true
-      end
-
-      opt.separator nil
-
-      opt.on("--[no-]dry-run",
-             "Don't write any files") do |value|
-        @dry_run = value
-      end
-
-      opt.separator nil
-
-      opt.on("-D", "--[no-]debug",
-             "Displays lots on internal stuff.") do |value|
-        $DEBUG_RDOC = value
-      end
-
-      opt.separator nil
-
-      opt.on("--[no-]ignore-invalid",
-             "Ignore invalid options and continue",
-             "(default true).") do |value|
-        ignore_invalid = value
-      end
-
-      opt.separator nil
-
-      opt.on("--quiet", "-q",
-             "Don't show progress as we parse.") do |value|
-        @verbosity = 0
-      end
-
-      opt.separator nil
-
-      opt.on("--verbose", "-V",
-             "Display extra progress as RDoc parses") do |value|
-        @verbosity = 2
-      end
-
-      opt.separator nil
-
-      opt.on("--version", "-v", "print the version") do
-        puts opt.version
-        exit
-      end
-
-      opt.separator nil
-
-      opt.on("--help", "-h", "Display this help") do
-        RDoc::RDoc::GENERATORS.each_key do |generator|
-          setup_generator generator
-        end
-
-        puts opt.help
-        exit
-      end
-
-      opt.separator nil
-    end
-
-    setup_generator 'darkfish' if
-      argv.grep(/\A(-f|--fmt|--format|-r|-R|--ri|--ri-site)\b/).empty?
-
-    deprecated = []
-    invalid = []
-
-    begin
-      opts.parse! argv
-    rescue OptionParser::ParseError => e
-      if DEPRECATED[e.args.first] then
-        deprecated << e.args.first
-      elsif %w[--format --ri -r --ri-site -R].include? e.args.first then
-        raise
-      else
-        invalid << e.args.join(' ')
-      end
-
-      retry
-    end
-
-    unless @generator then
-      @generator = RDoc::Generator::Darkfish
-      @generator_name = 'darkfish'
-    end
-
-    if @pipe and not argv.empty? then
-      @pipe = false
-      invalid << '-p (with files)'
-    end
-
-    unless quiet then
-      deprecated.each do |opt|
-        $stderr.puts 'option ' + opt + ' is deprecated: ' + DEPRECATED[opt]
-      end
-    end
-
-    unless invalid.empty? then
-      invalid = "invalid options: #{invalid.join ', '}"
-
-      if ignore_invalid then
-        unless quiet then
-          $stderr.puts invalid
-          $stderr.puts '(invalid options are ignored)'
-        end
-      else
-        unless quiet then
-          $stderr.puts opts
-        end
-        $stderr.puts invalid
-        exit 1
-      end
-    end
-
-    @files = argv.dup
-
-    self
-  end
-
-  ##
-  # Don't display progress as we process the files
-
-  def quiet
-    @verbosity.zero?
-  end
-
-  ##
-  # Set quietness to +bool+
-
-  def quiet= bool
-    @verbosity = bool ? 0 : 1
-  end
-
-  ##
-  # Removes directories from +path+ that are outside the current directory
-
-  def sanitize_path path
-    require 'pathname'
-    dot = Pathname.new('.').expand_path
-
-    path.reject do |item|
-      path = Pathname.new(item).expand_path
-      is_reject = nil
-      relative = nil
-      begin
-        relative = path.relative_path_from(dot).to_s
-      rescue ArgumentError
-        # On Windows, sometimes crosses different drive letters.
-        is_reject = true
-      else
-        is_reject = relative.start_with? '..'
-      end
-      is_reject
-    end
-  end
-
-  ##
-  # Set up an output generator for the named +generator_name+.
-  #
-  # If the found generator responds to :setup_options it will be called with
-  # the options instance.  This allows generators to add custom options or set
-  # default options.
-
-  def setup_generator generator_name = @generator_name
-    @generator = @generators[generator_name]
-
-    unless @generator then
-      raise OptionParser::InvalidArgument,
-            "Invalid output formatter #{generator_name}"
-    end
-
-    return if @generator_options.include? @generator
-
-    @generator_name = generator_name
-    @generator_options << @generator
-
-    if @generator.respond_to? :setup_options then
-      @option_parser ||= OptionParser.new
-      @generator.setup_options self
-    end
-  end
-
-  ##
-  # Finds the template dir for +template+
-
-  def template_dir_for template
-    template_path = File.join 'rdoc', 'generator', 'template', template
-
-    $LOAD_PATH.map do |path|
-      File.join File.expand_path(path), template_path
-    end.find do |dir|
-      File.directory? dir
-    end
-  end
-
-  # Sets the minimum visibility of a documented method.
-  #
-  # Accepts +:public+, +:protected+, +:private+, +:nodoc+, or +:all+.
-  #
-  # When +:all+ is passed, visibility is set to +:private+, similarly to
-  # RDOCOPT="--all", see #visibility for more information.
-
-  def visibility= visibility
-    case visibility
-    when :all
-      @visibility = :private
-    else
-      @visibility = visibility
-    end
-  end
-
-  ##
-  # Displays a warning using Kernel#warn if we're being verbose
-
-  def warn message
-    super message if @verbosity > 1
-  end
-
-  ##
-  # Writes the YAML file .rdoc_options to the current directory containing the
-  # parsed options.
-
-  def write_options
-    RDoc.load_yaml
-
-    File.open '.rdoc_options', 'w' do |io|
-      io.set_encoding Encoding::UTF_8
-
-      io.print to_yaml
-    end
-  end
-
-  ##
-  # Loads options from .rdoc_options if the file exists, otherwise creates a
-  # new RDoc::Options instance.
-
-  def self.load_options
-    options_file = File.expand_path '.rdoc_options'
-    return RDoc::Options.new unless File.exist? options_file
-
-    RDoc.load_yaml
-
-    begin
-      options = YAML.safe_load File.read('.rdoc_options'), permitted_classes: [RDoc::Options, Symbol]
-    rescue Psych::SyntaxError
-      raise RDoc::Error, "#{options_file} is not a valid rdoc options file"
-    end
-
-    return RDoc::Options.new unless options # Allow empty file.
-
-    raise RDoc::Error, "#{options_file} is not a valid rdoc options file" unless
-      RDoc::Options === options or Hash === options
-
-    if Hash === options
-      # Override the default values with the contents of YAML file.
-      options = RDoc::Options.new options
-    end
-
-    options
-  end
-
-end
diff --git a/lib/rdoc/parser.rb b/lib/rdoc/parser.rb
deleted file mode 100644
index 3bb6f5d1f274ff..00000000000000
--- a/lib/rdoc/parser.rb
+++ /dev/null
@@ -1,294 +0,0 @@
-# -*- coding: us-ascii -*-
-# frozen_string_literal: true
-
-##
-# A parser is simple a class that subclasses RDoc::Parser and implements #scan
-# to fill in an RDoc::TopLevel with parsed data.
-#
-# The initialize method takes an RDoc::TopLevel to fill with parsed content,
-# the name of the file to be parsed, the content of the file, an RDoc::Options
-# object and an RDoc::Stats object to inform the user of parsed items.  The
-# scan method is then called to parse the file and must return the
-# RDoc::TopLevel object.  By calling super these items will be set for you.
-#
-# In order to be used by RDoc the parser needs to register the file extensions
-# it can parse.  Use ::parse_files_matching to register extensions.
-#
-#   require 'rdoc'
-#
-#   class RDoc::Parser::Xyz < RDoc::Parser
-#     parse_files_matching /\.xyz$/
-#
-#     def initialize top_level, file_name, content, options, stats
-#       super
-#
-#       # extra initialization if needed
-#     end
-#
-#     def scan
-#       # parse file and fill in @top_level
-#     end
-#   end
-
-class RDoc::Parser
-
-  @parsers = []
-
-  class << self
-
-    ##
-    # An Array of arrays that maps file extension (or name) regular
-    # expressions to parser classes that will parse matching filenames.
-    #
-    # Use parse_files_matching to register a parser's file extensions.
-
-    attr_reader :parsers
-
-  end
-
-  ##
-  # The name of the file being parsed
-
-  attr_reader :file_name
-
-  ##
-  # Alias an extension to another extension. After this call, files ending
-  # "new_ext" will be parsed using the same parser as "old_ext"
-
-  def self.alias_extension(old_ext, new_ext)
-    old_ext = old_ext.sub(/^\.(.*)/, '\1')
-    new_ext = new_ext.sub(/^\.(.*)/, '\1')
-
-    parser = can_parse_by_name "xxx.#{old_ext}"
-    return false unless parser
-
-    RDoc::Parser.parsers.unshift [/\.#{new_ext}$/, parser]
-
-    true
-  end
-
-  ##
-  # Determines if the file is a "binary" file which basically means it has
-  # content that an RDoc parser shouldn't try to consume.
-
-  def self.binary?(file)
-    return false if file =~ /\.(rdoc|txt)$/
-
-    s = File.read(file, 1024) or return false
-
-    return true if s[0, 2] == Marshal.dump('')[0, 2] or s.index("\x00")
-
-    mode = 'r:utf-8' # default source encoding has been changed to utf-8
-    s.sub!(/\A#!.*\n/, '')     # assume shebang line isn't longer than 1024.
-    encoding = s[/^\s*\#\s*(?:-\*-\s*)?(?:en)?coding:\s*([^\s;]+?)(?:-\*-|[\s;])/, 1]
-    mode = "rb:#{encoding}" if encoding
-    s = File.open(file, mode) {|f| f.gets(nil, 1024)}
-
-    not s.valid_encoding?
-  end
-
-  ##
-  # Checks if +file+ is a zip file in disguise.  Signatures from
-  # http://www.garykessler.net/library/file_sigs.html
-
-  def self.zip? file
-    zip_signature = File.read file, 4
-
-    zip_signature == "PK\x03\x04" or
-      zip_signature == "PK\x05\x06" or
-      zip_signature == "PK\x07\x08"
-  rescue
-    false
-  end
-
-  ##
-  # Return a parser that can handle a particular extension
-
-  def self.can_parse file_name
-    parser = can_parse_by_name file_name
-
-    # HACK Selenium hides a jar file using a .txt extension
-    return if parser == RDoc::Parser::Simple and zip? file_name
-
-    parser
-  end
-
-  ##
-  # Returns a parser that can handle the extension for +file_name+.  This does
-  # not depend upon the file being readable.
-
-  def self.can_parse_by_name file_name
-    _, parser = RDoc::Parser.parsers.find { |regexp,| regexp =~ file_name }
-
-    # The default parser must not parse binary files
-    ext_name = File.extname file_name
-    return parser if ext_name.empty?
-
-    if parser == RDoc::Parser::Simple and ext_name !~ /txt|rdoc/ then
-      case check_modeline file_name
-      when nil, 'rdoc' then # continue
-      else return nil
-      end
-    end
-
-    parser
-  rescue Errno::EACCES
-  end
-
-  ##
-  # Returns the file type from the modeline in +file_name+
-
-  def self.check_modeline file_name
-    line = File.open file_name do |io|
-      io.gets
-    end
-
-    /-\*-\s*(.*?\S)\s*-\*-/ =~ line
-
-    return nil unless type = $1
-
-    if /;/ =~ type then
-      return nil unless /(?:\s|\A)mode:\s*([^\s;]+)/i =~ type
-      type = $1
-    end
-
-    return nil if /coding:/i =~ type
-
-    type.downcase
-  rescue ArgumentError
-  rescue Encoding::InvalidByteSequenceError # invalid byte sequence
-
-  end
-
-  ##
-  # Finds and instantiates the correct parser for the given +file_name+ and
-  # +content+.
-
-  def self.for top_level, file_name, content, options, stats
-    return if binary? file_name
-
-    parser = use_markup content
-
-    unless parser then
-      parse_name = file_name
-
-      # If no extension, look for shebang
-      if file_name !~ /\.\w+$/ && content =~ %r{\A#!(.+)} then
-        shebang = $1
-        case shebang
-        when %r{env\s+ruby}, %r{/ruby}
-          parse_name = 'dummy.rb'
-        end
-      end
-
-      parser = can_parse parse_name
-    end
-
-    return unless parser
-
-    content = remove_modeline content
-
-    parser.new top_level, file_name, content, options, stats
-  rescue SystemCallError
-    nil
-  end
-
-  ##
-  # Record which file types this parser can understand.
-  #
-  # It is ok to call this multiple times.
-
-  def self.parse_files_matching(regexp)
-    RDoc::Parser.parsers.unshift [regexp, self]
-  end
-
-  ##
-  # Removes an emacs-style modeline from the first line of the document
-
-  def self.remove_modeline content
-    content.sub(/\A.*-\*-\s*(.*?\S)\s*-\*-.*\r?\n/, '')
-  end
-
-  ##
-  # If there is a <tt>markup: parser_name</tt> comment at the front of the
-  # file, use it to determine the parser.  For example:
-  #
-  #   # markup: rdoc
-  #   # Class comment can go here
-  #
-  #   class C
-  #   end
-  #
-  # The comment should appear as the first line of the +content+.
-  #
-  # If the content contains a shebang or editor modeline the comment may
-  # appear on the second or third line.
-  #
-  # Any comment style may be used to hide the markup comment.
-
-  def self.use_markup content
-    markup = content.lines.first(3).grep(/markup:\s+(\w+)/) { $1 }.first
-
-    return unless markup
-
-    # TODO Ruby should be returned only when the filename is correct
-    return RDoc::Parser::Ruby if %w[tomdoc markdown].include? markup
-
-    markup = Regexp.escape markup
-
-    _, selected = RDoc::Parser.parsers.find do |_, parser|
-      /^#{markup}$/i =~ parser.name.sub(/.*:/, '')
-    end
-
-    selected
-  end
-
-  ##
-  # Creates a new Parser storing +top_level+, +file_name+, +content+,
-  # +options+ and +stats+ in instance variables.  In +@preprocess+ an
-  # RDoc::Markup::PreProcess object is created which allows processing of
-  # directives.
-
-  def initialize top_level, file_name, content, options, stats
-    @top_level = top_level
-    @top_level.parser = self.class
-    @store = @top_level.store
-
-    @file_name = file_name
-    @content = content
-    @options = options
-    @stats = stats
-
-    @preprocess = RDoc::Markup::PreProcess.new @file_name, @options.rdoc_include
-    @preprocess.options = @options
-  end
-
-  autoload :RubyTools, "#{__dir__}/parser/ruby_tools"
-  autoload :Text,      "#{__dir__}/parser/text"
-
-  ##
-  # Normalizes tabs in +body+
-
-  def handle_tab_width(body)
-    if /\t/ =~ body
-      tab_width = @options.tab_width
-      body.split(/\n/).map do |line|
-        1 while line.gsub!(/\t+/) do
-          b, e = $~.offset(0)
-          ' ' * (tab_width * (e-b) - b % tab_width)
-        end
-        line
-      end.join "\n"
-    else
-      body
-    end
-  end
-end
-
-# simple must come first in order to show up last in the parsers list
-require_relative 'parser/simple'
-require_relative 'parser/c'
-require_relative 'parser/changelog'
-require_relative 'parser/markdown'
-require_relative 'parser/rd'
-require_relative 'parser/ruby'
diff --git a/lib/rdoc/parser/c.rb b/lib/rdoc/parser/c.rb
deleted file mode 100644
index 5695bf1acbb795..00000000000000
--- a/lib/rdoc/parser/c.rb
+++ /dev/null
@@ -1,1225 +0,0 @@
-# frozen_string_literal: true
-require 'tsort'
-
-##
-# RDoc::Parser::C attempts to parse C extension files.  It looks for
-# the standard patterns that you find in extensions: +rb_define_class+,
-# +rb_define_method+ and so on.  It tries to find the corresponding
-# C source for the methods and extract comments, but if we fail
-# we don't worry too much.
-#
-# The comments associated with a Ruby method are extracted from the C
-# comment block associated with the routine that _implements_ that
-# method, that is to say the method whose name is given in the
-# +rb_define_method+ call. For example, you might write:
-#
-#   /*
-#    * Returns a new array that is a one-dimensional flattening of this
-#    * array (recursively). That is, for every element that is an array,
-#    * extract its elements into the new array.
-#    *
-#    *    s = [ 1, 2, 3 ]           #=> [1, 2, 3]
-#    *    t = [ 4, 5, 6, [7, 8] ]   #=> [4, 5, 6, [7, 8]]
-#    *    a = [ s, t, 9, 10 ]       #=> [[1, 2, 3], [4, 5, 6, [7, 8]], 9, 10]
-#    *    a.flatten                 #=> [1, 2, 3, 4, 5, 6, 7, 8, 9, 10]
-#    */
-#    static VALUE
-#    rb_ary_flatten(VALUE ary)
-#    {
-#        ary = rb_obj_dup(ary);
-#        rb_ary_flatten_bang(ary);
-#        return ary;
-#    }
-#
-#    ...
-#
-#    void
-#    Init_Array(void)
-#    {
-#      ...
-#      rb_define_method(rb_cArray, "flatten", rb_ary_flatten, 0);
-#
-# Here RDoc will determine from the +rb_define_method+ line that there's a
-# method called "flatten" in class Array, and will look for the implementation
-# in the method +rb_ary_flatten+. It will then use the comment from that
-# method in the HTML output. This method must be in the same source file
-# as the +rb_define_method+.
-#
-# The comment blocks may include special directives:
-#
-# [Document-class: +name+]
-#   Documentation for the named class.
-#
-# [Document-module: +name+]
-#   Documentation for the named module.
-#
-# [Document-const: +name+]
-#   Documentation for the named +rb_define_const+.
-#
-#   Constant values can be supplied on the first line of the comment like so:
-#
-#     /* 300: The highest possible score in bowling */
-#     rb_define_const(cFoo, "PERFECT", INT2FIX(300));
-#
-#   The value can contain internal colons so long as they are escaped with a \
-#
-# [Document-global: +name+]
-#   Documentation for the named +rb_define_global_const+
-#
-# [Document-variable: +name+]
-#   Documentation for the named +rb_define_variable+
-#
-# [Document-method\: +method_name+]
-#   Documentation for the named method.  Use this when the method name is
-#   unambiguous.
-#
-# [Document-method\: <tt>ClassName::method_name</tt>]
-#   Documentation for a singleton method in the given class.  Use this when
-#   the method name alone is ambiguous.
-#
-# [Document-method\: <tt>ClassName#method_name</tt>]
-#   Documentation for a instance method in the given class.  Use this when the
-#   method name alone is ambiguous.
-#
-# [Document-attr: +name+]
-#   Documentation for the named attribute.
-#
-# [call-seq:  <i>text up to an empty line</i>]
-#   Because C source doesn't give descriptive names to Ruby-level parameters,
-#   you need to document the calling sequence explicitly
-#
-# In addition, RDoc assumes by default that the C method implementing a
-# Ruby function is in the same source file as the rb_define_method call.
-# If this isn't the case, add the comment:
-#
-#   rb_define_method(....);  // in filename
-#
-# As an example, we might have an extension that defines multiple classes
-# in its Init_xxx method. We could document them using
-#
-#   /*
-#    * Document-class:  MyClass
-#    *
-#    * Encapsulate the writing and reading of the configuration
-#    * file. ...
-#    */
-#
-#   /*
-#    * Document-method: read_value
-#    *
-#    * call-seq:
-#    *   cfg.read_value(key)            -> value
-#    *   cfg.read_value(key} { |key| }  -> value
-#    *
-#    * Return the value corresponding to +key+ from the configuration.
-#    * In the second form, if the key isn't found, invoke the
-#    * block and return its value.
-#    */
-
-class RDoc::Parser::C < RDoc::Parser
-
-  parse_files_matching(/\.(?:([CcHh])\1?|c([+xp])\2|y)\z/)
-
-  include RDoc::Text
-
-  # :stopdoc:
-  BOOL_ARG_PATTERN = /\s*+\b([01]|Q?(?:true|false)|TRUE|FALSE)\b\s*/
-  TRUE_VALUES = ['1', 'TRUE', 'true', 'Qtrue'].freeze
-  # :startdoc:
-
-  ##
-  # Maps C variable names to names of Ruby classes or modules
-
-  attr_reader :classes
-
-  ##
-  # C file the parser is parsing
-
-  attr_accessor :content
-
-  ##
-  # Dependencies from a missing enclosing class to the classes in
-  # missing_dependencies that depend upon it.
-
-  attr_reader :enclosure_dependencies
-
-  ##
-  # Maps C variable names to names of Ruby classes (and singleton classes)
-
-  attr_reader :known_classes
-
-  ##
-  # Classes found while parsing the C file that were not yet registered due to
-  # a missing enclosing class.  These are processed by do_missing
-
-  attr_reader :missing_dependencies
-
-  ##
-  # Maps C variable names to names of Ruby singleton classes
-
-  attr_reader :singleton_classes
-
-  ##
-  # The TopLevel items in the parsed file belong to
-
-  attr_reader :top_level
-
-  ##
-  # Prepares for parsing a C file.  See RDoc::Parser#initialize for details on
-  # the arguments.
-
-  def initialize top_level, file_name, content, options, stats
-    super
-
-    @known_classes = RDoc::KNOWN_CLASSES.dup
-    @content = handle_tab_width handle_ifdefs_in @content
-    @file_dir = File.dirname @file_name
-
-    @classes           = load_variable_map :c_class_variables
-    @singleton_classes = load_variable_map :c_singleton_class_variables
-
-    @markup = @options.markup
-
-    # class_variable => { function => [method, ...] }
-    @methods = Hash.new { |h, f| h[f] = Hash.new { |i, m| i[m] = [] } }
-
-    # missing variable => [handle_class_module arguments]
-    @missing_dependencies = {}
-
-    # missing enclosure variable => [dependent handle_class_module arguments]
-    @enclosure_dependencies = Hash.new { |h, k| h[k] = [] }
-    @enclosure_dependencies.instance_variable_set :@missing_dependencies,
-                                                  @missing_dependencies
-
-    @enclosure_dependencies.extend TSort
-
-    def @enclosure_dependencies.tsort_each_node &block
-      each_key(&block)
-    rescue TSort::Cyclic => e
-      cycle_vars = e.message.scan(/"(.*?)"/).flatten
-
-      cycle = cycle_vars.sort.map do |var_name|
-        delete var_name
-
-        var_name, type, mod_name, = @missing_dependencies[var_name]
-
-        "#{type} #{mod_name} (#{var_name})"
-      end.join ', '
-
-      warn "Unable to create #{cycle} due to a cyclic class or module creation"
-
-      retry
-    end
-
-    def @enclosure_dependencies.tsort_each_child node, &block
-      fetch(node, []).each(&block)
-    end
-  end
-
-  ##
-  # Scans #content for rb_define_alias
-
-  def do_aliases
-    @content.scan(/rb_define_alias\s*\(
-                   \s*(\w+),
-                   \s*"(.+?)",
-                   \s*"(.+?)"
-                   \s*\)/xm) do |var_name, new_name, old_name|
-      class_name = @known_classes[var_name]
-
-      unless class_name then
-        @options.warn "Enclosing class or module %p for alias %s %s is not known" % [
-          var_name, new_name, old_name]
-        next
-      end
-
-      class_obj = find_class var_name, class_name
-      comment = find_alias_comment var_name, new_name, old_name
-      comment.normalize
-      if comment.to_s.empty? and existing_method = class_obj.method_list.find { |m| m.name == old_name}
-        comment = existing_method.comment
-      end
-      add_alias(var_name, class_obj, old_name, new_name, comment)
-    end
-  end
-
-  ##
-  # Add alias, either from a direct alias definition, or from two
-  # method that reference the same function.
-
-  def add_alias(var_name, class_obj, old_name, new_name, comment)
-    al = RDoc::Alias.new '', old_name, new_name, ''
-    al.singleton = @singleton_classes.key? var_name
-    al.comment = comment
-    al.record_location @top_level
-    class_obj.add_alias al
-    @stats.add_alias al
-    al
-  end
-
-  ##
-  # Scans #content for rb_attr and rb_define_attr
-
-  def do_attrs
-    @content.scan(/rb_attr\s*\(
-                   \s*(\w+),
-                   \s*([\w"()]+),
-                   #{BOOL_ARG_PATTERN},
-                   #{BOOL_ARG_PATTERN},
-                   \s*\w+\);/xmo) do |var_name, attr_name, read, write|
-      handle_attr var_name, attr_name, read, write
-    end
-
-    @content.scan(%r%rb_define_attr\(
-                             \s*([\w\.]+),
-                             \s*"([^"]+)",
-                             #{BOOL_ARG_PATTERN},
-                             #{BOOL_ARG_PATTERN}\);
-                %xmo) do |var_name, attr_name, read, write|
-      handle_attr var_name, attr_name, read, write
-    end
-  end
-
-  ##
-  # Scans #content for boot_defclass
-
-  def do_boot_defclass
-    @content.scan(/(\w+)\s*=\s*boot_defclass\s*\(\s*"(\w+?)",\s*(\w+?)\s*\)/) do
-      |var_name, class_name, parent|
-      parent = nil if parent == "0"
-      handle_class_module(var_name, :class, class_name, parent, nil)
-    end
-  end
-
-  ##
-  # Scans #content for rb_define_class, boot_defclass, rb_define_class_under
-  # and rb_singleton_class
-
-  def do_classes_and_modules
-    do_boot_defclass if @file_name == "class.c"
-
-    @content.scan(
-      %r(
-        (?<open>\s*\(\s*) {0}
-        (?<close>\s*\)\s*) {0}
-        (?<name>\s*"(?<class_name>\w+)") {0}
-        (?<parent>\s*(?:
-          (?<parent_name>[\w\*\s\(\)\.\->]+) |
-          rb_path2class\s*\(\s*"(?<path>[\w:]+)"\s*\)
-        )) {0}
-        (?<under>\w+) {0}
-
-        (?<var_name>[\w\.]+)\s* =
-        \s*rb_(?:
-          define_(?:
-            class(?: # rb_define_class(name, parent_name)
-              \(\s*
-                \g<name>,
-                \g<parent>
-              \s*\)
-            |
-              _under\g<open> # rb_define_class_under(under, name, parent_name...)
-                \g<under>,
-                \g<name>,
-                \g<parent>
-              \g<close>
-            )
-          |
-            (?<module>)
-            module(?: # rb_define_module(name)
-              \g<open>
-                \g<name>
-              \g<close>
-            |
-              _under\g<open> # rb_define_module_under(under, name)
-                \g<under>,
-                \g<name>
-              \g<close>
-            )
-          )
-      |
-        (?<attributes>(?:\s*"\w+",)*\s*NULL\s*) {0}
-        struct_define(?:
-          \g<open> # rb_struct_define(name, ...)
-            \g<name>,
-        |
-          _under\g<open> # rb_struct_define_under(under, name, ...)
-            \g<under>,
-            \g<name>,
-        |
-          _without_accessor(?:
-            \g<open> # rb_struct_define_without_accessor(name, parent_name, ...)
-          |
-            _under\g<open> # rb_struct_define_without_accessor_under(under, name, parent_name, ...)
-              \g<under>,
-          )
-            \g<name>,
-            \g<parent>,
-            \s*\w+,        # Allocation function
-        )
-          \g<attributes>
-        \g<close>
-      |
-        singleton_class\g<open> # rb_singleton_class(target_class_name)
-          (?<target_class_name>\w+)
-        \g<close>
-        )
-      )mx
-    ) do
-      if target_class_name = $~[:target_class_name]
-        # rb_singleton_class(target_class_name)
-        handle_singleton $~[:var_name], target_class_name
-        next
-      end
-
-      var_name = $~[:var_name]
-      type = $~[:module] ? :module : :class
-      class_name = $~[:class_name]
-      parent_name = $~[:parent_name] || $~[:path]
-      under = $~[:under]
-      attributes = $~[:attributes]
-
-      handle_class_module(var_name, type, class_name, parent_name, under)
-      if attributes and !parent_name # rb_struct_define *not* without_accessor
-        true_flag = 'Qtrue'
-        attributes.scan(/"\K\w+(?=")/) do |attr_name|
-          handle_attr var_name, attr_name, true_flag, true_flag
-        end
-      end
-    end
-  end
-
-  ##
-  # Scans #content for rb_define_variable, rb_define_readonly_variable,
-  # rb_define_const and rb_define_global_const
-
-  def do_constants
-    @content.scan(%r%\Wrb_define_
-                   ( variable          |
-                     readonly_variable |
-                     const             |
-                     global_const        )
-               \s*\(
-                 (?:\s*(\w+),)?
-                 \s*"(\w+)",
-                 \s*(.*?)\s*\)\s*;
-                 %xm) do |type, var_name, const_name, definition|
-      var_name = "rb_cObject" if !var_name or var_name == "rb_mKernel"
-      handle_constants type, var_name, const_name, definition
-    end
-
-    @content.scan(%r%
-                  \Wrb_curses_define_const
-                  \s*\(
-                    \s*
-                    (\w+)
-                    \s*
-                  \)
-                  \s*;%xm) do |consts|
-      const = consts.first
-
-      handle_constants 'const', 'mCurses', const, "UINT2NUM(#{const})"
-    end
-
-    @content.scan(%r%
-                  \Wrb_file_const
-                  \s*\(
-                    \s*
-                    "([^"]+)",
-                    \s*
-                    (.*?)
-                    \s*
-                  \)
-                  \s*;%xm) do |name, value|
-      handle_constants 'const', 'rb_mFConst', name, value
-    end
-  end
-
-
-  ##
-  # Scans #content for rb_include_module
-
-  def do_includes
-    @content.scan(/rb_include_module\s*\(\s*(\w+?),\s*(\w+?)\s*\)/) do |c,m|
-      next unless cls = @classes[c]
-      m = @known_classes[m] || m
-
-      comment = new_comment '', @top_level, :c
-      incl = cls.add_include RDoc::Include.new(m, comment)
-      incl.record_location @top_level
-    end
-  end
-
-  ##
-  # Scans #content for rb_define_method, rb_define_singleton_method,
-  # rb_define_module_function, rb_define_private_method,
-  # rb_define_global_function and define_filetest_function
-
-  def do_methods
-    @content.scan(%r%rb_define_
-                   (
-                      singleton_method |
-                      method           |
-                      module_function  |
-                      private_method
-                   )
-                   \s*\(\s*([\w\.]+),
-                     \s*"([^"]+)",
-                     \s*(?:RUBY_METHOD_FUNC\(|VALUEFUNC\(|\(METHOD\))?(\w+)\)?,
-                     \s*(-?\w+)\s*\)
-                   (?:;\s*/[*/]\s+in\s+(\w+?\.(?:cpp|c|y)))?
-                 %xm) do |type, var_name, meth_name, function, param_count, source_file|
-
-      # Ignore top-object and weird struct.c dynamic stuff
-      next if var_name == "ruby_top_self"
-      next if var_name == "nstr"
-
-      var_name = "rb_cObject" if var_name == "rb_mKernel"
-      handle_method(type, var_name, meth_name, function, param_count,
-                    source_file)
-    end
-
-    @content.scan(%r%rb_define_global_function\s*\(
-                             \s*"([^"]+)",
-                             \s*(?:RUBY_METHOD_FUNC\(|VALUEFUNC\()?(\w+)\)?,
-                             \s*(-?\w+)\s*\)
-                (?:;\s*/[*/]\s+in\s+(\w+?\.[cy]))?
-                %xm) do |meth_name, function, param_count, source_file|
-      handle_method("method", "rb_mKernel", meth_name, function, param_count,
-                    source_file)
-    end
-
-    @content.scan(/define_filetest_function\s*\(
-                     \s*"([^"]+)",
-                     \s*(?:RUBY_METHOD_FUNC\(|VALUEFUNC\()?(\w+)\)?,
-                     \s*(-?\w+)\s*\)/xm) do |meth_name, function, param_count|
-
-      handle_method("method", "rb_mFileTest", meth_name, function, param_count)
-      handle_method("singleton_method", "rb_cFile", meth_name, function,
-                    param_count)
-    end
-  end
-
-  ##
-  # Creates classes and module that were missing were defined due to the file
-  # order being different than the declaration order.
-
-  def do_missing
-    return if @missing_dependencies.empty?
-
-    @enclosure_dependencies.tsort.each do |in_module|
-      arguments = @missing_dependencies.delete in_module
-
-      next unless arguments # dependency on existing class
-
-      handle_class_module(*arguments)
-    end
-  end
-
-  ##
-  # Finds the comment for an alias on +class_name+ from +new_name+ to
-  # +old_name+
-
-  def find_alias_comment class_name, new_name, old_name
-    content =~ %r%((?>/\*.*?\*/\s+))
-                  rb_define_alias\(\s*#{Regexp.escape class_name}\s*,
-                                   \s*"#{Regexp.escape new_name}"\s*,
-                                   \s*"#{Regexp.escape old_name}"\s*\);%xm
-
-    new_comment($1 || '', @top_level, :c)
-  end
-
-  ##
-  # Finds a comment for rb_define_attr, rb_attr or Document-attr.
-  #
-  # +var_name+ is the C class variable the attribute is defined on.
-  # +attr_name+ is the attribute's name.
-  #
-  # +read+ and +write+ are the read/write flags ('1' or '0').  Either both or
-  # neither must be provided.
-
-  def find_attr_comment var_name, attr_name, read = nil, write = nil
-    attr_name = Regexp.escape attr_name
-
-    rw = if read and write then
-           /\s*#{read}\s*,\s*#{write}\s*/xm
-         else
-           /.*?/m
-         end
-
-    comment = if @content =~ %r%((?>/\*.*?\*/\s+))
-                                rb_define_attr\((?:\s*#{var_name},)?\s*
-                                                "#{attr_name}"\s*,
-                                                #{rw}\)\s*;%xm then
-                $1
-              elsif @content =~ %r%((?>/\*.*?\*/\s+))
-                                   rb_attr\(\s*#{var_name}\s*,
-                                            \s*#{attr_name}\s*,
-                                            #{rw},.*?\)\s*;%xm then
-                $1
-              elsif @content =~ %r%(/\*.*?(?:\s*\*\s*)?)
-                                   Document-attr:\s#{attr_name}\s*?\n
-                                   ((?>(.|\n)*?\*/))%x then
-                "#{$1}\n#{$2}"
-              else
-                ''
-              end
-
-    new_comment comment, @top_level, :c
-  end
-
-  ##
-  # Generate a Ruby-method table
-
-  def gen_body_table file_content
-    table = {}
-    file_content.scan(%r{
-      ((?>/\*.*?\*/\s*)?)
-      ((?:(?:\w+)\s+)?
-        (?:intern\s+)?VALUE\s+(\w+)
-        \s*(?:\([^)]*\))(?:[^\);]|$))
-    | ((?>/\*.*?\*/\s*))^\s*(\#\s*define\s+(\w+)\s+(\w+))
-    | ^\s*\#\s*define\s+(\w+)\s+(\w+)
-    }xm) do
-      case
-      when $1
-        table[$3] = [:func_def, $1, $2, $~.offset(2)] if !table[$3] || table[$3][0] != :func_def
-      when $4
-        table[$6] = [:macro_def, $4, $5, $~.offset(5), $7] if !table[$6] || table[$6][0] == :macro_alias
-      when $8
-        table[$8] ||= [:macro_alias, $9]
-      end
-    end
-    table
-  end
-
-  ##
-  # Find the C code corresponding to a Ruby method
-
-  def find_body class_name, meth_name, meth_obj, file_content, quiet = false
-    if file_content
-      @body_table ||= {}
-      @body_table[file_content] ||= gen_body_table file_content
-      type, *args = @body_table[file_content][meth_name]
-    end
-
-    case type
-    when :func_def
-      comment = new_comment args[0], @top_level, :c
-      body = args[1]
-      offset, = args[2]
-
-      comment.remove_private if comment
-
-      # try to find the whole body
-      body = $& if /#{Regexp.escape body}[^(]*?\{.*?^\}/m =~ file_content
-
-      # The comment block may have been overridden with a 'Document-method'
-      # block. This happens in the interpreter when multiple methods are
-      # vectored through to the same C method but those methods are logically
-      # distinct (for example Kernel.hash and Kernel.object_id share the same
-      # implementation
-
-      override_comment = find_override_comment class_name, meth_obj
-      comment = override_comment if override_comment
-
-      comment.normalize
-      find_modifiers comment, meth_obj if comment
-
-      #meth_obj.params = params
-      meth_obj.start_collecting_tokens
-      tk = { :line_no => 1, :char_no => 1, :text => body }
-      meth_obj.add_token tk
-      meth_obj.comment = comment
-      meth_obj.line    = file_content[0, offset].count("\n") + 1
-
-      body
-    when :macro_def
-      comment = new_comment args[0], @top_level, :c
-      body = args[1]
-      offset, = args[2]
-
-      find_body class_name, args[3], meth_obj, file_content, true
-
-      comment.normalize
-      find_modifiers comment, meth_obj
-
-      meth_obj.start_collecting_tokens
-      tk = { :line_no => 1, :char_no => 1, :text => body }
-      meth_obj.add_token tk
-      meth_obj.comment = comment
-      meth_obj.line    = file_content[0, offset].count("\n") + 1
-
-      body
-    when :macro_alias
-      # with no comment we hope the aliased definition has it and use it's
-      # definition
-
-      body = find_body(class_name, args[0], meth_obj, file_content, true)
-
-      return body if body
-
-      @options.warn "No definition for #{meth_name}"
-      false
-    else # No body, but might still have an override comment
-      comment = find_override_comment class_name, meth_obj
-
-      if comment then
-        comment.normalize
-        find_modifiers comment, meth_obj
-        meth_obj.comment = comment
-
-        ''
-      else
-        @options.warn "No definition for #{meth_name}"
-        false
-      end
-    end
-  end
-
-  ##
-  # Finds a RDoc::NormalClass or RDoc::NormalModule for +raw_name+
-
-  def find_class(raw_name, name, base_name = nil)
-    unless @classes[raw_name]
-      if raw_name =~ /^rb_m/
-        container = @top_level.add_module RDoc::NormalModule, name
-      else
-        container = @top_level.add_class RDoc::NormalClass, name
-      end
-      container.name = base_name if base_name
-
-      container.record_location @top_level
-      @classes[raw_name] = container
-    end
-    @classes[raw_name]
-  end
-
-  ##
-  # Look for class or module documentation above Init_+class_name+(void),
-  # in a Document-class +class_name+ (or module) comment or above an
-  # rb_define_class (or module).  If a comment is supplied above a matching
-  # Init_ and a rb_define_class the Init_ comment is used.
-  #
-  #   /*
-  #    * This is a comment for Foo
-  #    */
-  #   Init_Foo(void) {
-  #       VALUE cFoo = rb_define_class("Foo", rb_cObject);
-  #   }
-  #
-  #   /*
-  #    * Document-class: Foo
-  #    * This is a comment for Foo
-  #    */
-  #   Init_foo(void) {
-  #       VALUE cFoo = rb_define_class("Foo", rb_cObject);
-  #   }
-  #
-  #   /*
-  #    * This is a comment for Foo
-  #    */
-  #   VALUE cFoo = rb_define_class("Foo", rb_cObject);
-
-  def find_class_comment class_name, class_mod
-    comment = nil
-
-    if @content =~ %r%
-        ((?>/\*.*?\*/\s+))
-        (static\s+)?
-        void\s+
-        Init(?:VM)?_(?i:#{class_name})\s*(?:_\(\s*)?\(\s*(?:void\s*)?\)%xm then
-      comment = $1.sub(%r%Document-(?:class|module):\s+#{class_name}%, '')
-    elsif @content =~ %r%Document-(?:class|module):\s+#{class_name}\s*?
-                         (?:<\s+[:,\w]+)?\n((?>.*?\*/))%xm then
-      comment = "/*\n#{$1}"
-    elsif @content =~ %r%((?>/\*.*?\*/\s+))
-                         ([\w\.\s]+\s* = \s+)?rb_define_(class|module)[\t (]*?"(#{class_name})"%xm then
-      comment = $1
-    elsif @content =~ %r%((?>/\*.*?\*/\s+))
-                         ([\w\. \t]+ = \s+)?rb_define_(class|module)_under[\t\w, (]*?"(#{class_name.split('::').last})"%xm then
-      comment = $1
-    else
-      comment = ''
-    end
-
-    comment = new_comment comment, @top_level, :c
-    comment.normalize
-
-    look_for_directives_in class_mod, comment
-
-    class_mod.add_comment comment, @top_level
-  end
-
-  ##
-  # Generate a const table
-
-  def gen_const_table file_content
-    table = {}
-    @content.scan(%r{
-      ((?>^\s*/\*.*?\*/\s+))
-        rb_define_(\w+)\((?:\s*(?:\w+),)?\s*
-                           "(\w+)"\s*,
-                           .*?\)\s*;
-    | Document-(?:const|global|variable):\s
-        ((?:\w+::)*\w+)
-        \s*?\n((?>.*?\*/))
-    }mxi) do
-      case
-      when $1 then table[[$2, $3]] = $1
-      when $4 then table[$4] = "/*\n" + $5
-      end
-    end
-    table
-  end
-
-  ##
-  # Finds a comment matching +type+ and +const_name+ either above the
-  # comment or in the matching Document- section.
-
-  def find_const_comment(type, const_name, class_name = nil)
-    @const_table ||= {}
-    @const_table[@content] ||= gen_const_table @content
-    table = @const_table[@content]
-
-    comment =
-      table[[type, const_name]] ||
-      (class_name && table[class_name + "::" + const_name]) ||
-      table[const_name] ||
-      ''
-
-    new_comment comment, @top_level, :c
-  end
-
-  ##
-  # Handles modifiers in +comment+ and updates +meth_obj+ as appropriate.
-
-  def find_modifiers comment, meth_obj
-    comment.normalize
-    comment.extract_call_seq meth_obj
-
-    look_for_directives_in meth_obj, comment
-  end
-
-  ##
-  # Finds a <tt>Document-method</tt> override for +meth_obj+ on +class_name+
-
-  def find_override_comment class_name, meth_obj
-    name = Regexp.escape meth_obj.name
-    prefix = Regexp.escape meth_obj.name_prefix
-
-    comment = if @content =~ %r%Document-method:
-                                \s+#{class_name}#{prefix}#{name}
-                                \s*?\n((?>.*?\*/))%xm then
-                "/*#{$1}"
-              elsif @content =~ %r%Document-method:
-                                   \s#{name}\s*?\n((?>.*?\*/))%xm then
-                "/*#{$1}"
-              end
-
-    return unless comment
-
-    new_comment comment, @top_level, :c
-  end
-
-  ##
-  # Creates a new RDoc::Attr +attr_name+ on class +var_name+ that is either
-  # +read+, +write+ or both
-
-  def handle_attr(var_name, attr_name, read, write)
-    rw = ''
-    rw += 'R' if TRUE_VALUES.include?(read)
-    rw += 'W' if TRUE_VALUES.include?(write)
-
-    class_name = @known_classes[var_name]
-
-    return unless class_name
-
-    class_obj = find_class var_name, class_name
-
-    return unless class_obj
-
-    comment = find_attr_comment var_name, attr_name
-    comment.normalize
-
-    name = attr_name.gsub(/rb_intern(?:_const)?\("([^"]+)"\)/, '\1')
-
-    attr = RDoc::Attr.new '', name, rw, comment
-
-    attr.record_location @top_level
-    class_obj.add_attribute attr
-    @stats.add_attribute attr
-  end
-
-  ##
-  # Creates a new RDoc::NormalClass or RDoc::NormalModule based on +type+
-  # named +class_name+ in +parent+ which was assigned to the C +var_name+.
-
-  def handle_class_module(var_name, type, class_name, parent, in_module)
-    parent_name = @known_classes[parent] || parent
-
-    if in_module then
-      enclosure = @classes[in_module] || @store.find_c_enclosure(in_module)
-
-      if enclosure.nil? and enclosure = @known_classes[in_module] then
-        enc_type = /^rb_m/ =~ in_module ? :module : :class
-        handle_class_module in_module, enc_type, enclosure, nil, nil
-        enclosure = @classes[in_module]
-      end
-
-      unless enclosure then
-        @enclosure_dependencies[in_module] << var_name
-        @missing_dependencies[var_name] =
-          [var_name, type, class_name, parent, in_module]
-
-        return
-      end
-    else
-      enclosure = @top_level
-    end
-
-    if type == :class then
-      full_name = if RDoc::ClassModule === enclosure then
-                    enclosure.full_name + "::#{class_name}"
-                  else
-                    class_name
-                  end
-
-      if @content =~ %r%Document-class:\s+#{full_name}\s*<\s+([:,\w]+)% then
-        parent_name = $1
-      end
-
-      cm = enclosure.add_class RDoc::NormalClass, class_name, parent_name
-    else
-      cm = enclosure.add_module RDoc::NormalModule, class_name
-    end
-
-    cm.record_location enclosure.top_level
-
-    find_class_comment cm.full_name, cm
-
-    case cm
-    when RDoc::NormalClass
-      @stats.add_class cm
-    when RDoc::NormalModule
-      @stats.add_module cm
-    end
-
-    @classes[var_name] = cm
-    @known_classes[var_name] = cm.full_name
-    @store.add_c_enclosure var_name, cm
-  end
-
-  ##
-  # Adds constants.  By providing some_value: at the start of the comment you
-  # can override the C value of the comment to give a friendly definition.
-  #
-  #   /* 300: The perfect score in bowling */
-  #   rb_define_const(cFoo, "PERFECT", INT2FIX(300));
-  #
-  # Will override <tt>INT2FIX(300)</tt> with the value +300+ in the output
-  # RDoc.  Values may include quotes and escaped colons (\:).
-
-  def handle_constants(type, var_name, const_name, definition)
-    class_name = @known_classes[var_name]
-
-    return unless class_name
-
-    class_obj = find_class var_name, class_name, class_name[/::\K[^:]+\z/]
-
-    unless class_obj then
-      @options.warn 'Enclosing class or module %p is not known' % [const_name]
-      return
-    end
-
-    comment = find_const_comment type, const_name, class_name
-    comment.normalize
-
-    # In the case of rb_define_const, the definition and comment are in
-    # "/* definition: comment */" form.  The literal ':' and '\' characters
-    # can be escaped with a backslash.
-    if type.downcase == 'const' then
-      no_match, new_definition, new_comment = comment.text.split(/(\A.*):/)
-
-      if no_match and no_match.empty? then
-        if new_definition.empty? then # Default to literal C definition
-          new_definition = definition
-        else
-          new_definition = new_definition.gsub("\:", ":")
-          new_definition = new_definition.gsub("\\", '\\')
-        end
-
-        new_definition.sub!(/\A(\s+)/, '')
-
-        new_comment = "#{$1}#{new_comment.lstrip}"
-
-        new_comment = self.new_comment(new_comment, @top_level, :c)
-
-        con = RDoc::Constant.new const_name, new_definition, new_comment
-      else
-        con = RDoc::Constant.new const_name, definition, comment
-      end
-    else
-      con = RDoc::Constant.new const_name, definition, comment
-    end
-
-    con.record_location @top_level
-    @stats.add_constant con
-    class_obj.add_constant con
-  end
-
-  ##
-  # Removes #ifdefs that would otherwise confuse us
-
-  def handle_ifdefs_in(body)
-    body.gsub(/^#ifdef HAVE_PROTOTYPES.*?#else.*?\n(.*?)#endif.*?\n/m, '\1')
-  end
-
-  ##
-  # Adds an RDoc::AnyMethod +meth_name+ defined on a class or module assigned
-  # to +var_name+.  +type+ is the type of method definition function used.
-  # +singleton_method+ and +module_function+ create a singleton method.
-
-  def handle_method(type, var_name, meth_name, function, param_count,
-                    source_file = nil)
-    class_name = @known_classes[var_name]
-    singleton  = @singleton_classes.key? var_name
-
-    @methods[var_name][function] << meth_name
-
-    return unless class_name
-
-    class_obj = find_class var_name, class_name
-
-    if existing_method = class_obj.method_list.find { |m| m.c_function == function }
-      add_alias(var_name, class_obj, existing_method.name, meth_name, existing_method.comment)
-    end
-
-    if class_obj then
-      if meth_name == 'initialize' then
-        meth_name = 'new'
-        singleton = true
-        type = 'method' # force public
-      end
-
-      meth_obj = RDoc::AnyMethod.new '', meth_name
-      meth_obj.c_function = function
-      meth_obj.singleton =
-        singleton || %w[singleton_method module_function].include?(type)
-
-      p_count = Integer(param_count) rescue -1
-
-      if source_file then
-        file_name = File.join @file_dir, source_file
-
-        if File.exist? file_name then
-          file_content = File.read file_name
-        else
-          @options.warn "unknown source #{source_file} for #{meth_name} in #{@file_name}"
-        end
-      else
-        file_content = @content
-      end
-
-      body = find_body class_name, function, meth_obj, file_content
-
-      if body and meth_obj.document_self then
-        meth_obj.params = if p_count < -1 then # -2 is Array
-                            '(*args)'
-                          elsif p_count == -1 then # argc, argv
-                            rb_scan_args body
-                          else
-                            args = (1..p_count).map { |i| "p#{i}" }
-                            "(#{args.join ', '})"
-                          end
-
-
-        meth_obj.record_location @top_level
-
-        if meth_obj.section_title
-          class_obj.temporary_section = class_obj.add_section(meth_obj.section_title)
-        end
-        class_obj.add_method meth_obj
-
-        @stats.add_method meth_obj
-        meth_obj.visibility = :private if 'private_method' == type
-      end
-    end
-  end
-
-  ##
-  # Registers a singleton class +sclass_var+ as a singleton of +class_var+
-
-  def handle_singleton sclass_var, class_var
-    class_name = @known_classes[class_var]
-
-    @known_classes[sclass_var]     = class_name
-    @singleton_classes[sclass_var] = class_name
-  end
-
-  ##
-  # Loads the variable map with the given +name+ from the RDoc::Store, if
-  # present.
-
-  def load_variable_map map_name
-    return {} unless files = @store.cache[map_name]
-    return {} unless name_map = files[@file_name]
-
-    class_map = {}
-
-    name_map.each do |variable, name|
-      next unless mod = @store.find_class_or_module(name)
-
-      class_map[variable] = if map_name == :c_class_variables then
-                              mod
-                            else
-                              name
-                            end
-      @known_classes[variable] = name
-    end
-
-    class_map
-  end
-
-  ##
-  # Look for directives in a normal comment block:
-  #
-  #   /*
-  #    * :title: My Awesome Project
-  #    */
-  #
-  # This method modifies the +comment+
-
-  def look_for_directives_in context, comment
-    @preprocess.handle comment, context do |directive, param|
-      case directive
-      when 'main' then
-        @options.main_page = param
-        ''
-      when 'title' then
-        @options.default_title = param if @options.respond_to? :default_title=
-        ''
-      end
-    end
-
-    comment
-  end
-
-  ##
-  # Extracts parameters from the +method_body+ and returns a method
-  # parameter string.  Follows 1.9.3dev's scan-arg-spec, see README.EXT
-
-  def rb_scan_args method_body
-    method_body =~ /rb_scan_args\((.*?)\)/m
-    return '(*args)' unless $1
-
-    $1.split(/,/)[2] =~ /"(.*?)"/ # format argument
-    format = $1.split(//)
-
-    lead = opt = trail = 0
-
-    if format.first =~ /\d/ then
-      lead = $&.to_i
-      format.shift
-      if format.first =~ /\d/ then
-        opt = $&.to_i
-        format.shift
-        if format.first =~ /\d/ then
-          trail = $&.to_i
-          format.shift
-          block_arg = true
-        end
-      end
-    end
-
-    if format.first == '*' and not block_arg then
-      var = true
-      format.shift
-      if format.first =~ /\d/ then
-        trail = $&.to_i
-        format.shift
-      end
-    end
-
-    if format.first == ':' then
-      hash = true
-      format.shift
-    end
-
-    if format.first == '&' then
-      block = true
-      format.shift
-    end
-
-    # if the format string is not empty there's a bug in the C code, ignore it
-
-    args = []
-    position = 1
-
-    (1...(position + lead)).each do |index|
-      args << "p#{index}"
-    end
-
-    position += lead
-
-    (position...(position + opt)).each do |index|
-      args << "p#{index} = v#{index}"
-    end
-
-    position += opt
-
-    if var then
-      args << '*args'
-      position += 1
-    end
-
-    (position...(position + trail)).each do |index|
-      args << "p#{index}"
-    end
-
-    position += trail
-
-    if hash then
-      args << "p#{position} = {}"
-    end
-
-    args << '&block' if block
-
-    "(#{args.join ', '})"
-  end
-
-  ##
-  # Removes lines that are commented out that might otherwise get picked up
-  # when scanning for classes and methods
-
-  def remove_commented_out_lines
-    @content = @content.gsub(%r%//.*rb_define_%, '//')
-  end
-
-  ##
-  # Extracts the classes, modules, methods, attributes, constants and aliases
-  # from a C file and returns an RDoc::TopLevel for this file
-
-  def scan
-    remove_commented_out_lines
-
-    do_classes_and_modules
-    do_missing
-
-    do_constants
-    do_methods
-    do_includes
-    do_aliases
-    do_attrs
-
-    @store.add_c_variables self
-
-    @top_level
-  end
-
-  def new_comment text = nil, location = nil, language = nil
-    RDoc::Comment.new(text, location, language).tap do |comment|
-      comment.format = @markup
-    end
-  end
-end
diff --git a/lib/rdoc/parser/changelog.rb b/lib/rdoc/parser/changelog.rb
deleted file mode 100644
index 2a685d1d79781e..00000000000000
--- a/lib/rdoc/parser/changelog.rb
+++ /dev/null
@@ -1,334 +0,0 @@
-# frozen_string_literal: true
-
-##
-# A ChangeLog file parser.
-#
-# This parser converts a ChangeLog into an RDoc::Markup::Document.  When
-# viewed as HTML a ChangeLog page will have an entry for each day's entries in
-# the sidebar table of contents.
-#
-# This parser is meant to parse the MRI ChangeLog, but can be used to parse any
-# {GNU style Change
-# Log}[http://www.gnu.org/prep/standards/html_node/Style-of-Change-Logs.html].
-
-class RDoc::Parser::ChangeLog < RDoc::Parser
-
-  include RDoc::Parser::Text
-
-  parse_files_matching(/(\/|\\|\A)ChangeLog[^\/\\]*\z/)
-
-  ##
-  # Attaches the +continuation+ of the previous line to the +entry_body+.
-  #
-  # Continued function listings are joined together as a single entry.
-  # Continued descriptions are joined to make a single paragraph.
-
-  def continue_entry_body entry_body, continuation
-    return unless last = entry_body.last
-
-    if last =~ /\)\s*\z/ and continuation =~ /\A\(/ then
-      last.sub!(/\)\s*\z/, ',')
-      continuation = continuation.sub(/\A\(/, '')
-    end
-
-    if last =~ /\s\z/ then
-      last << continuation
-    else
-      last << ' ' + continuation
-    end
-  end
-
-  ##
-  # Creates an RDoc::Markup::Document given the +groups+ of ChangeLog entries.
-
-  def create_document groups
-    doc = RDoc::Markup::Document.new
-    doc.omit_headings_below = 2
-    doc.file = @top_level
-
-    doc << RDoc::Markup::Heading.new(1, File.basename(@file_name))
-    doc << RDoc::Markup::BlankLine.new
-
-    groups.sort_by do |day,| day end.reverse_each do |day, entries|
-      doc << RDoc::Markup::Heading.new(2, day.dup)
-      doc << RDoc::Markup::BlankLine.new
-
-      doc.concat create_entries entries
-    end
-
-    doc
-  end
-
-  ##
-  # Returns a list of ChangeLog entries an RDoc::Markup nodes for the given
-  # +entries+.
-
-  def create_entries entries
-    out = []
-
-    entries.each do |entry, items|
-      out << RDoc::Markup::Heading.new(3, entry)
-      out << RDoc::Markup::BlankLine.new
-
-      out << create_items(items)
-    end
-
-    out
-  end
-
-  ##
-  # Returns an RDoc::Markup::List containing the given +items+ in the
-  # ChangeLog
-
-  def create_items items
-    list = RDoc::Markup::List.new :NOTE
-
-    items.each do |item|
-      item =~ /\A(.*?(?:\([^)]+\))?):\s*/
-
-      title = $1
-      body = $'
-
-      paragraph = RDoc::Markup::Paragraph.new body
-      list_item = RDoc::Markup::ListItem.new title, paragraph
-      list << list_item
-    end
-
-    list
-  end
-
-  ##
-  # Groups +entries+ by date.
-
-  def group_entries entries
-    @time_cache ||= {}
-    entries.group_by do |title, _|
-      begin
-        time = @time_cache[title]
-        (time || parse_date(title)).strftime '%Y-%m-%d'
-      rescue NoMethodError, ArgumentError
-        time, = title.split '  ', 2
-        parse_date(time).strftime '%Y-%m-%d'
-      end
-    end
-  end
-
-  ##
-  # Parse date in ISO-8601, RFC-2822, or default of Git
-
-  def parse_date(date)
-    case date
-    when /\A\s*(\d+)-(\d+)-(\d+)(?:[ T](\d+):(\d+):(\d+) *([-+]\d\d):?(\d\d))?\b/
-      Time.new($1, $2, $3, $4, $5, $6, ("#{$7}:#{$8}" if $7))
-    when /\A\s*\w{3}, +(\d+) (\w{3}) (\d+) (\d+):(\d+):(\d+) *(?:([-+]\d\d):?(\d\d))\b/
-      Time.new($3, $2, $1, $4, $5, $6, ("#{$7}:#{$8}" if $7))
-    when /\A\s*\w{3} (\w{3}) +(\d+) (\d+) (\d+):(\d+):(\d+) *(?:([-+]\d\d):?(\d\d))\b/
-      Time.new($3, $1, $2, $4, $5, $6, ("#{$7}:#{$8}" if $7))
-    when /\A\s*\w{3} (\w{3}) +(\d+) (\d+):(\d+):(\d+) (\d+)\b/
-      Time.new($6, $1, $2, $3, $4, $5)
-    else
-      raise ArgumentError, "bad date: #{date}"
-    end
-  end
-
-  ##
-  # Parses the entries in the ChangeLog.
-  #
-  # Returns an Array of each ChangeLog entry in order of parsing.
-  #
-  # A ChangeLog entry is an Array containing the ChangeLog title (date and
-  # committer) and an Array of ChangeLog items (file and function changed with
-  # description).
-  #
-  # An example result would be:
-  #
-  #    [ 'Tue Dec  4 08:33:46 2012  Eric Hodel  <drbrain@segment7.net>',
-  #      [ 'README.EXT:  Converted to RDoc format',
-  #        'README.EXT.ja:  ditto']]
-
-  def parse_entries
-    @time_cache ||= {}
-
-    if /\A((?:.*\n){,3})commit\s/ =~ @content
-      class << self; prepend Git; end
-      parse_info($1)
-      return parse_entries
-    end
-
-    entries = []
-    entry_name = nil
-    entry_body = []
-
-    @content.each_line do |line|
-      case line
-      when /^\s*$/ then
-        next
-      when /^\w.*/ then
-        entries << [entry_name, entry_body] if entry_name
-
-        entry_name = $&
-
-        begin
-          time = parse_date entry_name
-          @time_cache[entry_name] = time
-        rescue ArgumentError
-          entry_name = nil
-        end
-
-        entry_body = []
-      when /^(\t| {8})?\*\s*(.*)/ then # "\t* file.c (func): ..."
-        entry_body << $2.dup
-      when /^(\t| {8})?\s*(\(.*)/ then # "\t(func): ..."
-        entry = $2
-
-        if entry_body.last =~ /:/ then
-          entry_body << entry.dup
-        else
-          continue_entry_body entry_body, entry
-        end
-      when /^(\t| {8})?\s*(.*)/ then
-        continue_entry_body entry_body, $2
-      end
-    end
-
-    entries << [entry_name, entry_body] if entry_name
-
-    entries.reject! do |(entry,_)|
-      entry == nil
-    end
-
-    entries
-  end
-
-  ##
-  # Converts the ChangeLog into an RDoc::Markup::Document
-
-  def scan
-    @time_cache = {}
-
-    entries = parse_entries
-    grouped_entries = group_entries entries
-
-    doc = create_document grouped_entries
-
-    @top_level.comment = doc
-
-    @top_level
-  end
-
-  module Git
-    def parse_info(info)
-      /^\s*base-url\s*=\s*(.*\S)/ =~ info
-      @base_url = $1
-    end
-
-    def parse_entries
-      entries = []
-
-      @content.scan(/^commit\s+(\h{20})\h*\n((?:.+\n)*)\n((?: {4}.*\n+)*)/) do
-        entry_name, header, entry_body = $1, $2, $3.gsub(/^ {4}/, '')
-        # header = header.scan(/^ *(\S+?): +(.*)/).to_h
-        # date = header["CommitDate"] || header["Date"]
-        date = header[/^ *(?:Author)?Date: +(.*)/, 1]
-        author = header[/^ *Author: +(.*)/, 1]
-        begin
-          time = parse_date(header[/^ *CommitDate: +(.*)/, 1] || date)
-          @time_cache[entry_name] = time
-          author.sub!(/\s*<(.*)>/, '')
-          email = $1
-          entries << [entry_name, [author, email, date, entry_body]]
-        rescue ArgumentError
-        end
-      end
-
-      entries
-    end
-
-    def create_entries entries
-      # git log entries have no strictly itemized style like the old
-      # style, just assume Markdown.
-      entries.map do |commit, entry|
-        LogEntry.new(@base_url, commit, *entry)
-      end
-    end
-
-    LogEntry = Struct.new(:base, :commit, :author, :email, :date, :contents) do
-      HEADING_LEVEL = 3
-
-      def initialize(base, commit, author, email, date, contents)
-        case contents
-        when String
-          contents = RDoc::Markdown.parse(contents).parts.each do |body|
-            case body
-            when RDoc::Markup::Heading
-              body.level += HEADING_LEVEL + 1
-            end
-          end
-          case first = contents[0]
-          when RDoc::Markup::Paragraph
-            contents[0] = RDoc::Markup::Heading.new(HEADING_LEVEL + 1, first.text)
-          end
-        end
-        super
-      end
-
-      def level
-        HEADING_LEVEL
-      end
-
-      def aref
-        "label-#{commit}"
-      end
-
-      def label context = nil
-        aref
-      end
-
-      def text
-        case base
-        when nil
-          "#{date}"
-        when /%s/
-          "{#{date}}[#{base % commit}]"
-        else
-          "{#{date}}[#{base}#{commit}]"
-        end + " {#{author}}[mailto:#{email}]"
-      end
-
-      def accept visitor
-        visitor.accept_heading self
-        begin
-          if visitor.respond_to?(:code_object=)
-            code_object = visitor.code_object
-            visitor.code_object = self
-          end
-          contents.each do |body|
-            body.accept visitor
-          end
-        ensure
-          if visitor.respond_to?(:code_object)
-            visitor.code_object = code_object
-          end
-        end
-      end
-
-      def pretty_print q # :nodoc:
-        q.group(2, '[log_entry: ', ']') do
-          q.text commit
-          q.text ','
-          q.breakable
-          q.group(2, '[date: ', ']') { q.text date }
-          q.text ','
-          q.breakable
-          q.group(2, '[author: ', ']') { q.text author }
-          q.text ','
-          q.breakable
-          q.group(2, '[email: ', ']') { q.text email }
-          q.text ','
-          q.breakable
-          q.pp contents
-        end
-      end
-    end
-  end
-end
diff --git a/lib/rdoc/parser/markdown.rb b/lib/rdoc/parser/markdown.rb
deleted file mode 100644
index 3c316227b9cc5e..00000000000000
--- a/lib/rdoc/parser/markdown.rb
+++ /dev/null
@@ -1,22 +0,0 @@
-# frozen_string_literal: true
-##
-# Parse a Markdown format file.  The parsed RDoc::Markup::Document is attached
-# as a file comment.
-
-class RDoc::Parser::Markdown < RDoc::Parser
-
-  include RDoc::Parser::Text
-
-  parse_files_matching(/\.(md|markdown)(?:\.[^.]+)?$/)
-
-  ##
-  # Creates an Markdown-format TopLevel for the given file.
-
-  def scan
-    comment = RDoc::Comment.new @content, @top_level
-    comment.format = 'markdown'
-
-    @top_level.comment = comment
-  end
-
-end
diff --git a/lib/rdoc/parser/rd.rb b/lib/rdoc/parser/rd.rb
deleted file mode 100644
index 19e47e549d2224..00000000000000
--- a/lib/rdoc/parser/rd.rb
+++ /dev/null
@@ -1,22 +0,0 @@
-# frozen_string_literal: true
-##
-# Parse a RD format file.  The parsed RDoc::Markup::Document is attached as a
-# file comment.
-
-class RDoc::Parser::RD < RDoc::Parser
-
-  include RDoc::Parser::Text
-
-  parse_files_matching(/\.rd(?:\.[^.]+)?$/)
-
-  ##
-  # Creates an rd-format TopLevel for the given file.
-
-  def scan
-    comment = RDoc::Comment.new @content, @top_level
-    comment.format = 'rd'
-
-    @top_level.comment = comment
-  end
-
-end
diff --git a/lib/rdoc/parser/ripper_state_lex.rb b/lib/rdoc/parser/ripper_state_lex.rb
deleted file mode 100644
index 27d73732707041..00000000000000
--- a/lib/rdoc/parser/ripper_state_lex.rb
+++ /dev/null
@@ -1,590 +0,0 @@
-# frozen_string_literal: true
-require 'ripper'
-
-class RDoc::Parser::RipperStateLex
-  # TODO: Remove this constants after Ruby 2.4 EOL
-  RIPPER_HAS_LEX_STATE = Ripper::Filter.method_defined?(:state)
-
-  Token = Struct.new(:line_no, :char_no, :kind, :text, :state)
-
-  EXPR_NONE = 0
-  EXPR_BEG = 1
-  EXPR_END = 2
-  EXPR_ENDARG = 4
-  EXPR_ENDFN = 8
-  EXPR_ARG = 16
-  EXPR_CMDARG = 32
-  EXPR_MID = 64
-  EXPR_FNAME = 128
-  EXPR_DOT = 256
-  EXPR_CLASS = 512
-  EXPR_LABEL = 1024
-  EXPR_LABELED = 2048
-  EXPR_FITEM = 4096
-  EXPR_VALUE = EXPR_BEG
-  EXPR_BEG_ANY  =  (EXPR_BEG | EXPR_MID | EXPR_CLASS)
-  EXPR_ARG_ANY  =  (EXPR_ARG | EXPR_CMDARG)
-  EXPR_END_ANY  =  (EXPR_END | EXPR_ENDARG | EXPR_ENDFN)
-
-  class InnerStateLex < Ripper::Filter
-    attr_accessor :lex_state
-
-    def initialize(code)
-      @lex_state = EXPR_BEG
-      @in_fname = false
-      @continue = false
-      reset
-      super(code)
-    end
-
-    def reset
-      @command_start = false
-      @cmd_state = @command_start
-    end
-
-    def on_nl(tok, data)
-      case @lex_state
-      when EXPR_FNAME, EXPR_DOT
-        @continue = true
-      else
-        @continue = false
-        @lex_state = EXPR_BEG unless (EXPR_LABEL & @lex_state) != 0
-      end
-      data << Token.new(lineno, column, __method__, tok, @lex_state)
-    end
-
-    def on_ignored_nl(tok, data)
-      case @lex_state
-      when EXPR_FNAME, EXPR_DOT
-        @continue = true
-      else
-        @continue = false
-        @lex_state = EXPR_BEG unless (EXPR_LABEL & @lex_state) != 0
-      end
-      data << Token.new(lineno, column, __method__, tok, @lex_state)
-    end
-
-    def on_op(tok, data)
-      case tok
-      when '&', '|', '!', '!=', '!~'
-        case @lex_state
-        when EXPR_FNAME, EXPR_DOT
-          @lex_state = EXPR_ARG
-        else
-          @lex_state = EXPR_BEG
-        end
-      when '<<'
-        # TODO next token?
-        case @lex_state
-        when EXPR_FNAME, EXPR_DOT
-          @lex_state = EXPR_ARG
-        else
-          @lex_state = EXPR_BEG
-        end
-      when '?'
-        @lex_state = EXPR_BEG
-      when '&&', '||', '+=', '-=', '*=', '**=',
-           '&=', '|=', '^=', '<<=', '>>=', '||=', '&&='
-        @lex_state = EXPR_BEG
-      when '::'
-        case @lex_state
-        when EXPR_ARG, EXPR_CMDARG
-          @lex_state = EXPR_DOT
-        when EXPR_FNAME, EXPR_DOT
-          @lex_state = EXPR_ARG
-        else
-          @lex_state = EXPR_BEG
-        end
-      else
-        case @lex_state
-        when EXPR_FNAME, EXPR_DOT
-          @lex_state = EXPR_ARG
-        else
-          @lex_state = EXPR_BEG
-        end
-      end
-      data << Token.new(lineno, column, __method__, tok, @lex_state)
-    end
-
-    def on_kw(tok, data)
-      case tok
-      when 'class'
-        @lex_state = EXPR_CLASS
-        @in_fname = true
-      when 'def'
-        @lex_state = EXPR_FNAME
-        @continue = true
-        @in_fname = true
-      when 'if', 'unless', 'while', 'until'
-        if ((EXPR_MID | EXPR_END | EXPR_ENDARG | EXPR_ENDFN | EXPR_ARG | EXPR_CMDARG) & @lex_state) != 0 # postfix if
-          @lex_state = EXPR_BEG | EXPR_LABEL
-        else
-          @lex_state = EXPR_BEG
-        end
-      when 'begin', 'case', 'when'
-        @lex_state = EXPR_BEG
-      when 'return', 'break'
-        @lex_state = EXPR_MID
-      else
-        if @lex_state == EXPR_FNAME
-          @lex_state = EXPR_END
-        else
-          @lex_state = EXPR_END
-        end
-      end
-      data << Token.new(lineno, column, __method__, tok, @lex_state)
-    end
-
-    def on_tstring_beg(tok, data)
-      @lex_state = EXPR_BEG
-      data << Token.new(lineno, column, __method__, tok, @lex_state)
-    end
-
-    def on_tstring_end(tok, data)
-      @lex_state = EXPR_END | EXPR_ENDARG
-      data << Token.new(lineno, column, __method__, tok, @lex_state)
-    end
-
-    def on_CHAR(tok, data)
-      @lex_state = EXPR_END
-      data << Token.new(lineno, column, __method__, tok, @lex_state)
-    end
-
-    def on_period(tok, data)
-      @lex_state = EXPR_DOT
-      data << Token.new(lineno, column, __method__, tok, @lex_state)
-    end
-
-    def on_int(tok, data)
-      @lex_state = EXPR_END | EXPR_ENDARG
-      data << Token.new(lineno, column, __method__, tok, @lex_state)
-    end
-
-    def on_float(tok, data)
-      @lex_state = EXPR_END | EXPR_ENDARG
-      data << Token.new(lineno, column, __method__, tok, @lex_state)
-    end
-
-    def on_rational(tok, data)
-      @lex_state = EXPR_END | EXPR_ENDARG
-      data << Token.new(lineno, column, __method__, tok, @lex_state)
-    end
-
-    def on_imaginary(tok, data)
-      @lex_state = EXPR_END | EXPR_ENDARG
-      data << Token.new(lineno, column, __method__, tok, @lex_state)
-    end
-
-    def on_symbeg(tok, data)
-      @lex_state = EXPR_FNAME
-      @continue = true
-      @in_fname = true
-      data << Token.new(lineno, column, __method__, tok, @lex_state)
-    end
-
-    private def on_variables(event, tok, data)
-      if @in_fname
-        @lex_state = EXPR_ENDFN
-        @in_fname = false
-        @continue = false
-      elsif @continue
-        case @lex_state
-        when EXPR_DOT
-          @lex_state = EXPR_ARG
-        else
-          @lex_state = EXPR_ENDFN
-          @continue = false
-        end
-      else
-        @lex_state = EXPR_CMDARG
-      end
-      data << Token.new(lineno, column, event, tok, @lex_state)
-    end
-
-    def on_ident(tok, data)
-      on_variables(__method__, tok, data)
-    end
-
-    def on_ivar(tok, data)
-      @lex_state = EXPR_END
-      on_variables(__method__, tok, data)
-    end
-
-    def on_cvar(tok, data)
-      @lex_state = EXPR_END
-      on_variables(__method__, tok, data)
-    end
-
-    def on_gvar(tok, data)
-      @lex_state = EXPR_END
-      on_variables(__method__, tok, data)
-    end
-
-    def on_backref(tok, data)
-      @lex_state = EXPR_END
-      on_variables(__method__, tok, data)
-    end
-
-    def on_lparen(tok, data)
-      @lex_state = EXPR_LABEL | EXPR_BEG
-      data << Token.new(lineno, column, __method__, tok, @lex_state)
-    end
-
-    def on_rparen(tok, data)
-      @lex_state = EXPR_ENDFN
-      data << Token.new(lineno, column, __method__, tok, @lex_state)
-    end
-
-    def on_lbrace(tok, data)
-      @lex_state = EXPR_LABEL | EXPR_BEG
-      data << Token.new(lineno, column, __method__, tok, @lex_state)
-    end
-
-    def on_rbrace(tok, data)
-      @lex_state = EXPR_ENDARG
-      data << Token.new(lineno, column, __method__, tok, @lex_state)
-    end
-
-    def on_lbracket(tok, data)
-      @lex_state = EXPR_LABEL | EXPR_BEG
-      data << Token.new(lineno, column, __method__, tok, @lex_state)
-    end
-
-    def on_rbracket(tok, data)
-      @lex_state = EXPR_ENDARG
-      data << Token.new(lineno, column, __method__, tok, @lex_state)
-    end
-
-    def on_const(tok, data)
-      case @lex_state
-      when EXPR_FNAME
-        @lex_state = EXPR_ENDFN
-      when EXPR_CLASS, EXPR_CMDARG, EXPR_MID
-        @lex_state = EXPR_ARG
-      else
-        @lex_state = EXPR_CMDARG
-      end
-      data << Token.new(lineno, column, __method__, tok, @lex_state)
-    end
-
-    def on_sp(tok, data)
-      data << Token.new(lineno, column, __method__, tok, @lex_state)
-    end
-
-    def on_comma(tok, data)
-      @lex_state = EXPR_BEG | EXPR_LABEL if (EXPR_ARG_ANY & @lex_state) != 0
-      data << Token.new(lineno, column, __method__, tok, @lex_state)
-    end
-
-    def on_comment(tok, data)
-      @lex_state = EXPR_BEG unless (EXPR_LABEL & @lex_state) != 0
-      data << Token.new(lineno, column, __method__, tok, @lex_state)
-    end
-
-    def on_ignored_sp(tok, data)
-      @lex_state = EXPR_BEG unless (EXPR_LABEL & @lex_state) != 0
-      data << Token.new(lineno, column, __method__, tok, @lex_state)
-    end
-
-    def on_heredoc_beg(tok, data)
-      data << Token.new(lineno, column, __method__, tok, @lex_state)
-      @lex_state = EXPR_END
-      data
-    end
-
-    def on_heredoc_end(tok, data)
-      data << Token.new(lineno, column, __method__, tok, @lex_state)
-      @lex_state = EXPR_BEG
-      data
-    end
-
-    def on_default(event, tok, data)
-      reset
-      data << Token.new(lineno, column, event, tok, @lex_state)
-    end
-  end unless RIPPER_HAS_LEX_STATE
-
-  class InnerStateLex < Ripper::Filter
-    def initialize(code)
-      super(code)
-    end
-
-    def on_default(event, tok, data)
-      data << Token.new(lineno, column, event, tok, state)
-    end
-  end if RIPPER_HAS_LEX_STATE
-
-  def get_squashed_tk
-    if @buf.empty?
-      tk = @tokens.shift
-    else
-      tk = @buf.shift
-    end
-    return nil if tk.nil?
-    case tk[:kind]
-    when :on_symbeg then
-      tk = get_symbol_tk(tk)
-    when :on_tstring_beg then
-      tk = get_string_tk(tk)
-    when :on_backtick then
-      if (tk[:state] & (EXPR_FNAME | EXPR_ENDFN)) != 0
-        @inner_lex.lex_state = EXPR_ARG unless RIPPER_HAS_LEX_STATE
-        tk[:kind] = :on_ident
-        tk[:state] = Ripper::Lexer.const_defined?(:State) ? Ripper::Lexer::State.new(EXPR_ARG) : EXPR_ARG
-      else
-        tk = get_string_tk(tk)
-      end
-    when :on_regexp_beg then
-      tk = get_regexp_tk(tk)
-    when :on_embdoc_beg then
-      tk = get_embdoc_tk(tk)
-    when :on_heredoc_beg then
-      @heredoc_queue << retrieve_heredoc_info(tk)
-      @inner_lex.lex_state = EXPR_END unless RIPPER_HAS_LEX_STATE
-    when :on_nl, :on_ignored_nl, :on_comment, :on_heredoc_end then
-      if !@heredoc_queue.empty?
-        get_heredoc_tk(*@heredoc_queue.shift)
-      elsif tk[:text].nil? # :on_ignored_nl sometimes gives nil
-        tk[:text] = ''
-      end
-    when :on_words_beg then
-      tk = get_words_tk(tk)
-    when :on_qwords_beg then
-      tk = get_words_tk(tk)
-    when :on_symbols_beg then
-      tk = get_words_tk(tk)
-    when :on_qsymbols_beg then
-      tk = get_words_tk(tk)
-    when :on_op then
-      if '&.' == tk[:text]
-        tk[:kind] = :on_period
-      else
-        tk = get_op_tk(tk)
-      end
-    end
-    tk
-  end
-
-  private def get_symbol_tk(tk)
-    is_symbol = true
-    symbol_tk = Token.new(tk.line_no, tk.char_no, :on_symbol)
-    if ":'" == tk[:text] or ':"' == tk[:text] or tk[:text].start_with?('%s')
-      tk1 = get_string_tk(tk)
-      symbol_tk[:text] = tk1[:text]
-      symbol_tk[:state] = tk1[:state]
-    else
-      case (tk1 = get_squashed_tk)[:kind]
-      when :on_ident
-        symbol_tk[:text] = ":#{tk1[:text]}"
-        symbol_tk[:state] = tk1[:state]
-      when :on_tstring_content
-        symbol_tk[:text] = ":#{tk1[:text]}"
-        symbol_tk[:state] = get_squashed_tk[:state] # skip :on_tstring_end
-      when :on_tstring_end
-        symbol_tk[:text] = ":#{tk1[:text]}"
-        symbol_tk[:state] = tk1[:state]
-      when :on_op
-        symbol_tk[:text] = ":#{tk1[:text]}"
-        symbol_tk[:state] = tk1[:state]
-      when :on_ivar
-        symbol_tk[:text] = ":#{tk1[:text]}"
-        symbol_tk[:state] = tk1[:state]
-      when :on_cvar
-        symbol_tk[:text] = ":#{tk1[:text]}"
-        symbol_tk[:state] = tk1[:state]
-      when :on_gvar
-        symbol_tk[:text] = ":#{tk1[:text]}"
-        symbol_tk[:state] = tk1[:state]
-      when :on_const
-        symbol_tk[:text] = ":#{tk1[:text]}"
-        symbol_tk[:state] = tk1[:state]
-      when :on_kw
-        symbol_tk[:text] = ":#{tk1[:text]}"
-        symbol_tk[:state] = tk1[:state]
-      else
-        is_symbol = false
-        tk = tk1
-      end
-    end
-    if is_symbol
-      tk = symbol_tk
-    end
-    tk
-  end
-
-  private def get_string_tk(tk)
-    string = tk[:text]
-    state = nil
-    kind = :on_tstring
-    loop do
-      inner_str_tk = get_squashed_tk
-      if inner_str_tk.nil?
-        break
-      elsif :on_tstring_end == inner_str_tk[:kind]
-        string = string + inner_str_tk[:text]
-        state = inner_str_tk[:state]
-        break
-      elsif :on_label_end == inner_str_tk[:kind]
-        string = string + inner_str_tk[:text]
-        state = inner_str_tk[:state]
-        kind = :on_symbol
-        break
-      else
-        string = string + inner_str_tk[:text]
-        if :on_embexpr_beg == inner_str_tk[:kind] then
-          kind = :on_dstring if :on_tstring == kind
-        end
-      end
-    end
-    Token.new(tk.line_no, tk.char_no, kind, string, state)
-  end
-
-  private def get_regexp_tk(tk)
-    string = tk[:text]
-    state = nil
-    loop do
-      inner_str_tk = get_squashed_tk
-      if inner_str_tk.nil?
-        break
-      elsif :on_regexp_end == inner_str_tk[:kind]
-        string = string + inner_str_tk[:text]
-        state = inner_str_tk[:state]
-        break
-      else
-        string = string + inner_str_tk[:text]
-      end
-    end
-    Token.new(tk.line_no, tk.char_no, :on_regexp, string, state)
-  end
-
-  private def get_embdoc_tk(tk)
-    string = tk[:text]
-    until :on_embdoc_end == (embdoc_tk = get_squashed_tk)[:kind] do
-      string = string + embdoc_tk[:text]
-    end
-    string = string + embdoc_tk[:text]
-    Token.new(tk.line_no, tk.char_no, :on_embdoc, string, embdoc_tk.state)
-  end
-
-  private def get_heredoc_tk(heredoc_name, indent)
-    string = ''
-    start_tk = nil
-    prev_tk = nil
-    until heredoc_end?(heredoc_name, indent, tk = @tokens.shift) do
-      start_tk = tk unless start_tk
-      if (prev_tk.nil? or "\n" == prev_tk[:text][-1]) and 0 != tk[:char_no]
-        string = string + (' ' * tk[:char_no])
-      end
-      string = string + tk[:text]
-      prev_tk = tk
-    end
-    start_tk = tk unless start_tk
-    prev_tk = tk unless prev_tk
-    @buf.unshift tk # closing heredoc
-    heredoc_tk = Token.new(start_tk.line_no, start_tk.char_no, :on_heredoc, string, prev_tk.state)
-    @buf.unshift heredoc_tk
-  end
-
-  private def retrieve_heredoc_info(tk)
-    name = tk[:text].gsub(/\A<<[-~]?(['"`]?)(.+)\1\z/, '\2')
-    indent = tk[:text] =~ /\A<<[-~]/
-    [name, indent]
-  end
-
-  private def heredoc_end?(name, indent, tk)
-    result = false
-    if :on_heredoc_end == tk[:kind] then
-      tk_name = tk[:text].chomp
-      tk_name.lstrip! if indent
-      if name == tk_name
-        result = true
-      end
-    end
-    result
-  end
-
-  private def get_words_tk(tk)
-    string = ''
-    start_token = tk[:text]
-    start_quote = tk[:text].rstrip[-1]
-    line_no = tk[:line_no]
-    char_no = tk[:char_no]
-    state = tk[:state]
-    end_quote =
-      case start_quote
-      when ?( then ?)
-      when ?[ then ?]
-      when ?{ then ?}
-      when ?< then ?>
-      else start_quote
-      end
-    end_token = nil
-    loop do
-      tk = get_squashed_tk
-      if tk.nil?
-        end_token = end_quote
-        break
-      elsif :on_tstring_content == tk[:kind] then
-        string += tk[:text]
-      elsif :on_words_sep == tk[:kind] or :on_tstring_end == tk[:kind] then
-        if end_quote == tk[:text].strip then
-          end_token = tk[:text]
-          break
-        else
-          string += tk[:text]
-        end
-      else
-        string += tk[:text]
-      end
-    end
-    text = "#{start_token}#{string}#{end_token}"
-    Token.new(line_no, char_no, :on_dstring, text, state)
-  end
-
-  private def get_op_tk(tk)
-    redefinable_operators = %w[! != !~ % & * ** + +@ - -@ / < << <= <=> == === =~ > >= >> [] []= ^ ` | ~]
-    if redefinable_operators.include?(tk[:text]) and tk[:state] == EXPR_ARG then
-      @inner_lex.lex_state = EXPR_ARG unless RIPPER_HAS_LEX_STATE
-      tk[:state] = Ripper::Lexer.const_defined?(:State) ? Ripper::Lexer::State.new(EXPR_ARG) : EXPR_ARG
-      tk[:kind] = :on_ident
-    elsif tk[:text] =~ /^[-+]$/ then
-      tk_ahead = get_squashed_tk
-      case tk_ahead[:kind]
-      when :on_int, :on_float, :on_rational, :on_imaginary then
-        tk[:text] += tk_ahead[:text]
-        tk[:kind] = tk_ahead[:kind]
-        tk[:state] = tk_ahead[:state]
-      when :on_heredoc_beg, :on_tstring, :on_dstring # frozen/non-frozen string literal
-        tk[:text] += tk_ahead[:text]
-        tk[:kind] = tk_ahead[:kind]
-        tk[:state] = tk_ahead[:state]
-      else
-        @buf.unshift tk_ahead
-      end
-    end
-    tk
-  end
-
-  def initialize(code)
-    @buf = []
-    @heredoc_queue = []
-    @inner_lex = InnerStateLex.new(code)
-    @tokens = @inner_lex.parse([])
-  end
-
-  def self.parse(code)
-    lex = self.new(code)
-    tokens = []
-    begin
-      while tk = lex.get_squashed_tk
-        tokens.push tk
-      end
-    rescue StopIteration
-    end
-    tokens
-  end
-
-  def self.end?(token)
-    (token[:state] & EXPR_END)
-  end
-end
diff --git a/lib/rdoc/parser/ruby.rb b/lib/rdoc/parser/ruby.rb
deleted file mode 100644
index 2c8a19f6088507..00000000000000
--- a/lib/rdoc/parser/ruby.rb
+++ /dev/null
@@ -1,2360 +0,0 @@
-# frozen_string_literal: true
-##
-# This file contains stuff stolen outright from:
-#
-#   rtags.rb -
-#   ruby-lex.rb - ruby lexcal analyzer
-#   ruby-token.rb - ruby tokens
-#       by Keiju ISHITSUKA (Nippon Rational Inc.)
-#
-
-require 'ripper'
-require_relative 'ripper_state_lex'
-
-##
-# Extracts code elements from a source file returning a TopLevel object
-# containing the constituent file elements.
-#
-# This file is based on rtags
-#
-# RubyParser understands how to document:
-# * classes
-# * modules
-# * methods
-# * constants
-# * aliases
-# * private, public, protected
-# * private_class_function, public_class_function
-# * private_constant, public_constant
-# * module_function
-# * attr, attr_reader, attr_writer, attr_accessor
-# * extra accessors given on the command line
-# * metaprogrammed methods
-# * require
-# * include
-#
-# == Method Arguments
-#
-#--
-# NOTE: I don't think this works, needs tests, remove the paragraph following
-# this block when known to work
-#
-# The parser extracts the arguments from the method definition.  You can
-# override this with a custom argument definition using the :args: directive:
-#
-#   ##
-#   # This method tries over and over until it is tired
-#
-#   def go_go_go(thing_to_try, tries = 10) # :args: thing_to_try
-#     puts thing_to_try
-#     go_go_go thing_to_try, tries - 1
-#   end
-#
-# If you have a more-complex set of overrides you can use the :call-seq:
-# directive:
-#++
-#
-# The parser extracts the arguments from the method definition.  You can
-# override this with a custom argument definition using the :call-seq:
-# directive:
-#
-#   ##
-#   # This method can be called with a range or an offset and length
-#   #
-#   # :call-seq:
-#   #   my_method(Range)
-#   #   my_method(offset, length)
-#
-#   def my_method(*args)
-#   end
-#
-# The parser extracts +yield+ expressions from method bodies to gather the
-# yielded argument names.  If your method manually calls a block instead of
-# yielding or you want to override the discovered argument names use
-# the :yields: directive:
-#
-#   ##
-#   # My method is awesome
-#
-#   def my_method(&block) # :yields: happy, times
-#     block.call 1, 2
-#   end
-#
-# == Metaprogrammed Methods
-#
-# To pick up a metaprogrammed method, the parser looks for a comment starting
-# with '##' before an identifier:
-#
-#   ##
-#   # This is a meta-programmed method!
-#
-#   add_my_method :meta_method, :arg1, :arg2
-#
-# The parser looks at the token after the identifier to determine the name, in
-# this example, :meta_method.  If a name cannot be found, a warning is printed
-# and 'unknown is used.
-#
-# You can force the name of a method using the :method: directive:
-#
-#   ##
-#   # :method: some_method!
-#
-# By default, meta-methods are instance methods.  To indicate that a method is
-# a singleton method instead use the :singleton-method: directive:
-#
-#   ##
-#   # :singleton-method:
-#
-# You can also use the :singleton-method: directive with a name:
-#
-#   ##
-#   # :singleton-method: some_method!
-#
-# You can define arguments for metaprogrammed methods via either the
-# :call-seq:, :arg: or :args: directives.
-#
-# Additionally you can mark a method as an attribute by
-# using :attr:, :attr_reader:, :attr_writer: or :attr_accessor:.  Just like
-# for :method:, the name is optional.
-#
-#   ##
-#   # :attr_reader: my_attr_name
-#
-# == Hidden methods and attributes
-#
-# You can provide documentation for methods that don't appear using
-# the :method:, :singleton-method: and :attr: directives:
-#
-#   ##
-#   # :attr_writer: ghost_writer
-#   # There is an attribute here, but you can't see it!
-#
-#   ##
-#   # :method: ghost_method
-#   # There is a method here, but you can't see it!
-#
-#   ##
-#   # this is a comment for a regular method
-#
-#   def regular_method() end
-#
-# Note that by default, the :method: directive will be ignored if there is a
-# standard rdocable item following it.
-
-class RDoc::Parser::Ruby < RDoc::Parser
-
-  parse_files_matching(/\.rbw?$/)
-
-  include RDoc::TokenStream
-  include RDoc::Parser::RubyTools
-
-  ##
-  # RDoc::NormalClass type
-
-  NORMAL = "::"
-
-  ##
-  # RDoc::SingleClass type
-
-  SINGLE = "<<"
-
-  ##
-  # Creates a new Ruby parser.
-
-  def initialize(top_level, file_name, content, options, stats)
-    super
-
-    content = handle_tab_width(content)
-
-    @size = 0
-    @token_listeners = nil
-    content = RDoc::Encoding.remove_magic_comment content
-    @scanner = RDoc::Parser::RipperStateLex.parse(content)
-    @content = content
-    @scanner_point = 0
-    @prev_seek = nil
-    @markup = @options.markup
-    @track_visibility = :nodoc != @options.visibility
-    @encoding = @options.encoding
-
-    reset
-  end
-
-  def tk_nl?(tk)
-    :on_nl == tk[:kind] or :on_ignored_nl == tk[:kind]
-  end
-
-  ##
-  # Retrieves the read token stream and replaces +pattern+ with +replacement+
-  # using gsub.  If the result is only a ";" returns an empty string.
-
-  def get_tkread_clean pattern, replacement # :nodoc:
-    read = get_tkread.gsub(pattern, replacement).strip
-    return '' if read == ';'
-    read
-  end
-
-  ##
-  # Extracts the visibility information for the visibility token +tk+
-  # and +single+ class type identifier.
-  #
-  # Returns the visibility type (a string), the visibility (a symbol) and
-  # +singleton+ if the methods following should be converted to singleton
-  # methods.
-
-  def get_visibility_information tk, single # :nodoc:
-    vis_type  = tk[:text]
-    singleton = single == SINGLE
-
-    vis =
-      case vis_type
-      when 'private'   then :private
-      when 'protected' then :protected
-      when 'public'    then :public
-      when 'private_class_method' then
-        singleton = true
-        :private
-      when 'public_class_method' then
-        singleton = true
-        :public
-      when 'module_function' then
-        singleton = true
-        :public
-      else
-        raise RDoc::Error, "Invalid visibility: #{tk.name}"
-      end
-
-    return vis_type, vis, singleton
-  end
-
-  ##
-  # Look for the first comment in a file that isn't a shebang line.
-
-  def collect_first_comment
-    skip_tkspace
-    comment = ''.dup
-    comment = RDoc::Encoding.change_encoding comment, @encoding if @encoding
-    first_line = true
-    first_comment_tk_kind = nil
-    line_no = nil
-
-    tk = get_tk
-
-    while tk && (:on_comment == tk[:kind] or :on_embdoc == tk[:kind])
-      comment_body = retrieve_comment_body(tk)
-      if first_line and comment_body =~ /\A#!/ then
-        skip_tkspace
-        tk = get_tk
-      elsif first_line and comment_body =~ /\A#\s*-\*-/ then
-        first_line = false
-        skip_tkspace
-        tk = get_tk
-      else
-        break if first_comment_tk_kind and not first_comment_tk_kind === tk[:kind]
-        first_comment_tk_kind = tk[:kind]
-
-        line_no = tk[:line_no] if first_line
-        first_line = false
-        comment << comment_body
-        tk = get_tk
-
-        if :on_nl === tk then
-          skip_tkspace_without_nl
-          tk = get_tk
-        end
-      end
-    end
-
-    unget_tk tk
-
-    new_comment comment, line_no
-  end
-
-  ##
-  # Consumes trailing whitespace from the token stream
-
-  def consume_trailing_spaces # :nodoc:
-    skip_tkspace_without_nl
-  end
-
-  ##
-  # Creates a new attribute in +container+ with +name+.
-
-  def create_attr container, single, name, rw, comment # :nodoc:
-    att = RDoc::Attr.new get_tkread, name, rw, comment, single == SINGLE
-    record_location att
-
-    container.add_attribute att
-    @stats.add_attribute att
-
-    att
-  end
-
-  ##
-  # Creates a module alias in +container+ at +rhs_name+ (or at the top-level
-  # for "::") with the name from +constant+.
-
-  def create_module_alias container, constant, rhs_name # :nodoc:
-    mod = if rhs_name =~ /^::/ then
-            @store.find_class_or_module rhs_name
-          else
-            container.find_module_named rhs_name
-          end
-
-    container.add_module_alias mod, rhs_name, constant, @top_level
-  end
-
-  ##
-  # Aborts with +msg+
-
-  def error(msg)
-    msg = make_message msg
-
-    abort msg
-  end
-
-  ##
-  # Looks for a true or false token.
-
-  def get_bool
-    skip_tkspace
-    tk = get_tk
-    if :on_kw == tk[:kind] && 'true' == tk[:text]
-      true
-    elsif :on_kw == tk[:kind] && ('false' == tk[:text] || 'nil' == tk[:text])
-      false
-    else
-      unget_tk tk
-      true
-    end
-  end
-
-  ##
-  # Look for the name of a class of module (optionally with a leading :: or
-  # with :: separated named) and return the ultimate name, the associated
-  # container, and the given name (with the ::).
-
-  def get_class_or_module container, ignore_constants = false
-    skip_tkspace
-    name_t = get_tk
-    given_name = ''.dup
-
-    # class ::A -> A is in the top level
-    if :on_op == name_t[:kind] and '::' == name_t[:text] then # bug
-      name_t = get_tk
-      container = @top_level
-      given_name << '::'
-    end
-
-    skip_tkspace_without_nl
-    given_name << name_t[:text]
-
-    is_self = name_t[:kind] == :on_op && name_t[:text] == '<<'
-    new_modules = []
-    while !is_self && (tk = peek_tk) and :on_op == tk[:kind] and '::' == tk[:text] do
-      prev_container = container
-      container = container.find_module_named name_t[:text]
-      container ||=
-        if ignore_constants then
-          c = RDoc::NormalModule.new name_t[:text]
-          c.store = @store
-          new_modules << [prev_container, c]
-          c
-        else
-          c = prev_container.add_module RDoc::NormalModule, name_t[:text]
-          c.ignore unless prev_container.document_children
-          @top_level.add_to_classes_or_modules c
-          c
-        end
-
-      record_location container
-
-      get_tk
-      skip_tkspace
-      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}"
-      end
-      if prev_container == container and !ignore_constants
-        given_name = name_t[:text]
-      else
-        given_name << '::' + name_t[:text]
-      end
-    end
-
-    skip_tkspace_without_nl
-
-    return [container, name_t, given_name, new_modules]
-  end
-
-  ##
-  # Skip opening parentheses and yield the block.
-  # Skip closing parentheses too when exists.
-
-  def skip_parentheses(&block)
-    left_tk = peek_tk
-
-    if :on_lparen == left_tk[:kind]
-      get_tk
-
-      ret = skip_parentheses(&block)
-
-      right_tk = peek_tk
-      if :on_rparen == right_tk[:kind]
-        get_tk
-      end
-
-      ret
-    else
-      yield
-    end
-  end
-
-  ##
-  # Return a superclass, which can be either a constant of an expression
-
-  def get_class_specification
-    tk = peek_tk
-    if tk.nil?
-      return ''
-    elsif :on_kw == tk[:kind] && 'self' == tk[:text]
-      return 'self'
-    elsif :on_gvar == tk[:kind]
-      return ''
-    end
-
-    res = get_constant
-
-    skip_tkspace_without_nl
-
-    get_tkread # empty out read buffer
-
-    tk = get_tk
-    return res unless tk
-
-    case tk[:kind]
-    when :on_nl, :on_comment, :on_embdoc, :on_semicolon then
-      unget_tk(tk)
-      return res
-    end
-
-    res += parse_call_parameters(tk)
-    res
-  end
-
-  ##
-  # Parse a constant, which might be qualified by one or more class or module
-  # names
-
-  def get_constant
-    res = ""
-    skip_tkspace_without_nl
-    tk = get_tk
-
-    while tk && ((:on_op == tk[:kind] && '::' == tk[:text]) || :on_const == tk[:kind]) do
-      res += tk[:text]
-      tk = get_tk
-    end
-
-    unget_tk(tk)
-    res
-  end
-
-  ##
-  # Get an included module that may be surrounded by parens
-
-  def get_included_module_with_optional_parens
-    skip_tkspace_without_nl
-    get_tkread
-    tk = get_tk
-    end_token = get_end_token tk
-    return '' unless end_token
-
-    nest = 0
-    continue = false
-    only_constant = true
-
-    while tk != nil do
-      is_element_of_constant = false
-      case tk[:kind]
-      when :on_semicolon then
-        break if nest == 0
-      when :on_lbracket then
-        nest += 1
-      when :on_rbracket then
-        nest -= 1
-      when :on_lbrace then
-        nest += 1
-      when :on_rbrace then
-        nest -= 1
-        if nest <= 0
-          # we might have a.each { |i| yield i }
-          unget_tk(tk) if nest < 0
-          break
-        end
-      when :on_lparen then
-        nest += 1
-      when end_token[:kind] then
-        if end_token[:kind] == :on_rparen
-          nest -= 1
-          break if nest <= 0
-        else
-          break if nest <= 0
-        end
-      when :on_rparen then
-        nest -= 1
-      when :on_comment, :on_embdoc then
-        @read.pop
-        if :on_nl == end_token[:kind] and "\n" == tk[:text][-1] and
-          (!continue or (tk[:state] & RDoc::Parser::RipperStateLex::EXPR_LABEL) != 0) then
-          break if !continue and nest <= 0
-        end
-      when :on_comma then
-        continue = true
-      when :on_ident then
-        continue = false if continue
-      when :on_kw then
-        case tk[:text]
-        when 'def', 'do', 'case', 'for', 'begin', 'class', 'module'
-          nest += 1
-        when 'if', 'unless', 'while', 'until', 'rescue'
-          # postfix if/unless/while/until/rescue must be EXPR_LABEL
-          nest += 1 unless (tk[:state] & RDoc::Parser::RipperStateLex::EXPR_LABEL) != 0
-        when 'end'
-          nest -= 1
-          break if nest == 0
-        end
-      when :on_const then
-        is_element_of_constant = true
-      when :on_op then
-        is_element_of_constant = true if '::' == tk[:text]
-      end
-      only_constant = false unless is_element_of_constant
-      tk = get_tk
-    end
-
-    if only_constant
-      get_tkread_clean(/\s+/, ' ')
-    else
-      ''
-    end
-  end
-
-  ##
-  # Little hack going on here. In the statement:
-  #
-  #   f = 2*(1+yield)
-  #
-  # We see the RPAREN as the next token, so we need to exit early.  This still
-  # won't catch all cases (such as "a = yield + 1"
-
-  def get_end_token tk # :nodoc:
-    case tk[:kind]
-    when :on_lparen
-      token = RDoc::Parser::RipperStateLex::Token.new
-      token[:kind] = :on_rparen
-      token[:text] = ')'
-      token
-    when :on_rparen
-      nil
-    else
-      token = RDoc::Parser::RipperStateLex::Token.new
-      token[:kind] = :on_nl
-      token[:text] = "\n"
-      token
-    end
-  end
-
-  ##
-  # Retrieves the method container for a singleton method.
-
-  def get_method_container container, name_t # :nodoc:
-    prev_container = container
-    container = container.find_module_named(name_t[:text])
-
-    unless container then
-      constant = prev_container.constants.find do |const|
-        const.name == name_t[:text]
-      end
-
-      if constant then
-        parse_method_dummy prev_container
-        return
-      end
-    end
-
-    unless container then
-      # TODO seems broken, should starting at Object in @store
-      obj = name_t[:text].split("::").inject(Object) do |state, item|
-        state.const_get(item)
-      end rescue nil
-
-      type = obj.class == Class ? RDoc::NormalClass : RDoc::NormalModule
-
-      unless [Class, Module].include?(obj.class) then
-        warn("Couldn't find #{name_t[:text]}. Assuming it's a module")
-      end
-
-      if type == RDoc::NormalClass then
-        sclass = obj.superclass ? obj.superclass.name : nil
-        container = prev_container.add_class type, name_t[:text], sclass
-      else
-        container = prev_container.add_module type, name_t[:text]
-      end
-
-      record_location container
-    end
-
-    container
-  end
-
-  ##
-  # Extracts a name or symbol from the token stream.
-
-  def get_symbol_or_name
-    tk = get_tk
-    case tk[:kind]
-    when :on_symbol then
-      text = tk[:text].sub(/^:/, '')
-
-      next_tk = peek_tk
-      if next_tk && :on_op == next_tk[:kind] && '=' == next_tk[:text] then
-        get_tk
-        text << '='
-      end
-
-      text
-    when :on_ident, :on_const, :on_gvar, :on_cvar, :on_ivar, :on_op, :on_kw then
-      tk[:text]
-    when :on_tstring, :on_dstring then
-      tk[:text][1..-2]
-    else
-      raise RDoc::Error, "Name or symbol expected (got #{tk})"
-    end
-  end
-
-  ##
-  # Marks containers between +container+ and +ancestor+ as ignored
-
-  def suppress_parents container, ancestor # :nodoc:
-    while container and container != ancestor do
-      container.suppress unless container.documented?
-      container = container.parent
-    end
-  end
-
-  ##
-  # Look for directives in a normal comment block:
-  #
-  #   # :stopdoc:
-  #   # Don't display comment from this point forward
-  #
-  # This routine modifies its +comment+ parameter.
-
-  def look_for_directives_in container, comment
-    @preprocess.handle comment, container do |directive, param|
-      case directive
-      when 'method', 'singleton-method',
-           'attr', 'attr_accessor', 'attr_reader', 'attr_writer' then
-        false # handled elsewhere
-      when 'section' then
-        break unless container.kind_of?(RDoc::Context)
-        container.set_current_section param, comment.dup
-        comment.text = ''
-        break
-      end
-    end
-
-    comment.remove_private
-  end
-
-  ##
-  # Adds useful info about the parser to +message+
-
-  def make_message message
-    prefix = "#{@file_name}:".dup
-
-    tk = peek_tk
-    prefix << "#{tk[:line_no]}:#{tk[:char_no]}:" if tk
-
-    "#{prefix} #{message}"
-  end
-
-  ##
-  # Creates a comment with the correct format
-
-  def new_comment comment, line_no = nil
-    c = RDoc::Comment.new comment, @top_level, :ruby
-    c.line = line_no
-    c.format = @markup
-    c
-  end
-
-  ##
-  # Creates an RDoc::Attr for the name following +tk+, setting the comment to
-  # +comment+.
-
-  def parse_attr(context, single, tk, comment)
-    line_no = tk[:line_no]
-
-    args = parse_symbol_arg 1
-    if args.size > 0 then
-      name = args[0]
-      rw = "R"
-      skip_tkspace_without_nl
-      tk = get_tk
-
-      if :on_comma == tk[:kind] then
-        rw = "RW" if get_bool
-      else
-        unget_tk tk
-      end
-
-      att = create_attr context, single, name, rw, comment
-      att.line   = line_no
-
-      read_documentation_modifiers att, RDoc::ATTR_MODIFIERS
-    else
-      warn "'attr' ignored - looks like a variable"
-    end
-  end
-
-  ##
-  # Creates an RDoc::Attr for each attribute listed after +tk+, setting the
-  # comment for each to +comment+.
-
-  def parse_attr_accessor(context, single, tk, comment)
-    line_no = tk[:line_no]
-
-    args = parse_symbol_arg
-    rw = "?"
-
-    tmp = RDoc::CodeObject.new
-    read_documentation_modifiers tmp, RDoc::ATTR_MODIFIERS
-    # TODO In most other places we let the context keep track of document_self
-    # and add found items appropriately but here we do not.  I'm not sure why.
-    return if @track_visibility and not tmp.document_self
-
-    case tk[:text]
-    when "attr_reader"   then rw = "R"
-    when "attr_writer"   then rw = "W"
-    when "attr_accessor" then rw = "RW"
-    else
-      rw = '?'
-    end
-
-    for name in args
-      att = create_attr context, single, name, rw, comment
-      att.line   = line_no
-    end
-  end
-
-  ##
-  # Parses an +alias+ in +context+ with +comment+
-
-  def parse_alias(context, single, tk, comment)
-    line_no = tk[:line_no]
-
-    skip_tkspace
-
-    if :on_lparen === peek_tk[:kind] then
-      get_tk
-      skip_tkspace
-    end
-
-    new_name = get_symbol_or_name
-
-    skip_tkspace
-    if :on_comma === peek_tk[:kind] then
-      get_tk
-      skip_tkspace
-    end
-
-    begin
-      old_name = get_symbol_or_name
-    rescue RDoc::Error
-      return
-    end
-
-    al = RDoc::Alias.new(get_tkread, old_name, new_name, comment,
-                         single == SINGLE)
-    record_location al
-    al.line   = line_no
-
-    read_documentation_modifiers al, RDoc::ATTR_MODIFIERS
-    context.add_alias al
-    @stats.add_alias al
-
-    al
-  end
-
-  ##
-  # Extracts call parameters from the token stream.
-
-  def parse_call_parameters(tk)
-    end_token = case tk[:kind]
-                when :on_lparen
-                  :on_rparen
-                when :on_rparen
-                  return ""
-                else
-                  :on_nl
-                end
-    nest = 0
-
-    loop do
-      break if tk.nil?
-      case tk[:kind]
-      when :on_semicolon
-        break
-      when :on_lparen
-        nest += 1
-      when end_token
-        if end_token == :on_rparen
-          nest -= 1
-          break if RDoc::Parser::RipperStateLex.end?(tk) and nest <= 0
-        else
-          break if RDoc::Parser::RipperStateLex.end?(tk)
-        end
-      when :on_comment, :on_embdoc
-        unget_tk(tk)
-        break
-      when :on_op
-        if tk[:text] =~ /^(.{1,2})?=$/
-          unget_tk(tk)
-          break
-        end
-      end
-      tk = get_tk
-    end
-
-    get_tkread_clean "\n", " "
-  end
-
-  ##
-  # Parses a class in +context+ with +comment+
-
-  def parse_class container, single, tk, comment
-    line_no = tk[:line_no]
-
-    declaration_context = container
-    container, name_t, given_name, = get_class_or_module container
-
-    if name_t[:kind] == :on_const
-      cls = parse_class_regular container, declaration_context, single,
-        name_t, given_name, comment
-    elsif name_t[:kind] == :on_op && name_t[:text] == '<<'
-      case name = skip_parentheses { get_class_specification }
-      when 'self', container.name
-        read_documentation_modifiers cls, RDoc::CLASS_MODIFIERS
-        parse_statements container, SINGLE
-        return # don't update line
-      else
-        cls = parse_class_singleton container, name, comment
-      end
-    else
-      warn "Expected class name or '<<'. Got #{name_t[:kind]}: #{name_t[:text].inspect}"
-      return
-    end
-
-    cls.line   = line_no
-
-    # after end modifiers
-    read_documentation_modifiers cls, RDoc::CLASS_MODIFIERS
-
-    cls
-  end
-
-  ##
-  # Parses and creates a regular class
-
-  def parse_class_regular container, declaration_context, single, # :nodoc:
-                          name_t, given_name, comment
-    superclass = '::Object'
-
-    if given_name =~ /^::/ then
-      declaration_context = @top_level
-      given_name = $'
-    end
-
-    tk = peek_tk
-    if tk[:kind] == :on_op && tk[:text] == '<' then
-      get_tk
-      skip_tkspace
-      superclass = get_class_specification
-      superclass = '(unknown)' if superclass.empty?
-    end
-
-    cls_type = single == SINGLE ? RDoc::SingleClass : RDoc::NormalClass
-    cls = declaration_context.add_class cls_type, given_name, superclass
-    cls.ignore unless container.document_children
-
-    read_documentation_modifiers cls, RDoc::CLASS_MODIFIERS
-    record_location cls
-
-    cls.add_comment comment, @top_level
-
-    @top_level.add_to_classes_or_modules cls
-    @stats.add_class cls
-
-    suppress_parents container, declaration_context unless cls.document_self
-
-    parse_statements cls
-
-    cls
-  end
-
-  ##
-  # Parses a singleton class in +container+ with the given +name+ and
-  # +comment+.
-
-  def parse_class_singleton container, name, comment # :nodoc:
-    other = @store.find_class_named name
-
-    unless other then
-      if name =~ /^::/ then
-        name = $'
-        container = @top_level
-      end
-
-      other = container.add_module RDoc::NormalModule, name
-      record_location other
-
-      # class << $gvar
-      other.ignore if name.empty?
-
-      other.add_comment comment, @top_level
-    end
-
-    # notify :nodoc: all if not a constant-named class/module
-    # (and remove any comment)
-    unless name =~ /\A(::)?[A-Z]/ then
-      other.document_self = nil
-      other.document_children = false
-      other.clear_comment
-    end
-
-    @top_level.add_to_classes_or_modules other
-    @stats.add_class other
-
-    read_documentation_modifiers other, RDoc::CLASS_MODIFIERS
-    parse_statements(other, SINGLE)
-
-    other
-  end
-
-  ##
-  # Parses a constant in +context+ with +comment+.  If +ignore_constants+ is
-  # true, no found constants will be added to RDoc.
-
-  def parse_constant container, tk, comment, ignore_constants = false
-    line_no = tk[:line_no]
-
-    name = tk[:text]
-    skip_tkspace_without_nl
-
-    return unless name =~ /^\w+$/
-
-    new_modules = []
-    if :on_op == peek_tk[:kind] && '::' == peek_tk[:text] then
-      unget_tk tk
-
-      container, name_t, _, new_modules = get_class_or_module container, true
-
-      name = name_t[:text]
-    end
-
-    is_array_or_hash = false
-    if peek_tk && :on_lbracket == peek_tk[:kind]
-      get_tk
-      nest = 1
-      while bracket_tk = get_tk
-        case bracket_tk[:kind]
-        when :on_lbracket
-          nest += 1
-        when :on_rbracket
-          nest -= 1
-          break if nest == 0
-        end
-      end
-      skip_tkspace_without_nl
-      is_array_or_hash = true
-    end
-
-    unless peek_tk && :on_op == peek_tk[:kind] && '=' == peek_tk[:text] then
-      return false
-    end
-    get_tk
-
-    unless ignore_constants
-      new_modules.each do |prev_c, new_module|
-        prev_c.add_module_by_normal_module new_module
-        new_module.ignore unless prev_c.document_children
-        @top_level.add_to_classes_or_modules new_module
-      end
-    end
-
-    value = ''
-    con = RDoc::Constant.new name, value, comment
-
-    body = parse_constant_body container, con, is_array_or_hash
-
-    return unless body
-
-    con.value = body
-    record_location con
-    con.line   = line_no
-    read_documentation_modifiers con, RDoc::CONSTANT_MODIFIERS
-
-    return if is_array_or_hash
-
-    @stats.add_constant con
-    container.add_constant con
-
-    true
-  end
-
-  def parse_constant_body container, constant, is_array_or_hash # :nodoc:
-    nest     = 0
-    rhs_name = ''.dup
-
-    get_tkread
-
-    tk = get_tk
-
-    body = nil
-    loop do
-      break if tk.nil?
-      if :on_semicolon == tk[:kind] then
-        break if nest <= 0
-      elsif [:on_tlambeg, :on_lparen, :on_lbrace, :on_lbracket].include?(tk[:kind]) then
-        nest += 1
-      elsif (:on_kw == tk[:kind] && 'def' == tk[:text]) then
-        nest += 1
-      elsif (:on_kw == tk[:kind] && %w{do if unless case begin}.include?(tk[:text])) then
-        if (tk[:state] & RDoc::Parser::RipperStateLex::EXPR_LABEL) == 0
-          nest += 1
-        end
-      elsif [:on_rparen, :on_rbrace, :on_rbracket].include?(tk[:kind]) ||
-            (:on_kw == tk[:kind] && 'end' == tk[:text]) then
-        nest -= 1
-      elsif (:on_comment == tk[:kind] or :on_embdoc == tk[:kind]) then
-        unget_tk tk
-        if nest <= 0 and RDoc::Parser::RipperStateLex.end?(tk) then
-          body = get_tkread_clean(/^[ \t]+/, '')
-          read_documentation_modifiers constant, RDoc::CONSTANT_MODIFIERS
-          break
-        else
-          read_documentation_modifiers constant, RDoc::CONSTANT_MODIFIERS
-        end
-      elsif :on_const == tk[:kind] then
-        rhs_name << tk[:text]
-
-        next_tk = peek_tk
-        if nest <= 0 and (next_tk.nil? || :on_nl == next_tk[:kind]) then
-          create_module_alias container, constant, rhs_name unless is_array_or_hash
-          break
-        end
-      elsif :on_nl == tk[:kind] then
-        if nest <= 0 and RDoc::Parser::RipperStateLex.end?(tk) then
-          unget_tk tk
-          break
-        end
-      elsif :on_op == tk[:kind] && '::' == tk[:text]
-        rhs_name << '::'
-      end
-      tk = get_tk
-    end
-
-    body ? body : get_tkread_clean(/^[ \t]+/, '')
-  end
-
-  ##
-  # Generates an RDoc::Method or RDoc::Attr from +comment+ by looking for
-  # :method: or :attr: directives in +comment+.
-
-  def parse_comment container, tk, comment
-    return parse_comment_tomdoc container, tk, comment if @markup == 'tomdoc'
-    column  = tk[:char_no]
-    line_no = comment.line.nil? ? tk[:line_no] : comment.line
-
-    comment.text = comment.text.sub(/(^# +:?)(singleton-)(method:)/, '\1\3')
-    singleton = !!$~
-
-    co =
-      if (comment.text = comment.text.sub(/^# +:?method: *(\S*).*?\n/i, '')) && !!$~ then
-        line_no += $`.count("\n")
-        parse_comment_ghost container, comment.text, $1, column, line_no, comment
-      elsif (comment.text = comment.text.sub(/# +:?(attr(_reader|_writer|_accessor)?): *(\S*).*?\n/i, '')) && !!$~ then
-        parse_comment_attr container, $1, $3, comment
-      end
-
-    if co then
-      co.singleton = singleton
-      co.line      = line_no
-    end
-
-    true
-  end
-
-  ##
-  # Parse a comment that is describing an attribute in +container+ with the
-  # given +name+ and +comment+.
-
-  def parse_comment_attr container, type, name, comment # :nodoc:
-    return if name.empty?
-
-    rw = case type
-         when 'attr_reader' then 'R'
-         when 'attr_writer' then 'W'
-         else 'RW'
-         end
-
-    create_attr container, NORMAL, name, rw, comment
-  end
-
-  def parse_comment_ghost container, text, name, column, line_no, # :nodoc:
-                          comment
-    name = nil if name.empty?
-
-    meth = RDoc::GhostMethod.new get_tkread, name
-    record_location meth
-
-    meth.start_collecting_tokens
-    indent = RDoc::Parser::RipperStateLex::Token.new(1, 1, :on_sp, ' ' * column)
-    position_comment = RDoc::Parser::RipperStateLex::Token.new(line_no, 1, :on_comment)
-    position_comment[:text] = "# File #{@top_level.relative_name}, line #{line_no}"
-    newline = RDoc::Parser::RipperStateLex::Token.new(0, 0, :on_nl, "\n")
-    meth.add_tokens [position_comment, newline, indent]
-
-    meth.params =
-      if text.sub!(/^#\s+:?args?:\s*(.*?)\s*$/i, '') then
-        $1
-      else
-        ''
-      end
-
-    comment.normalize
-    comment.extract_call_seq meth
-
-    return unless meth.name
-
-    container.add_method meth
-
-    meth.comment = comment
-
-    @stats.add_method meth
-
-    meth
-  end
-
-  ##
-  # Creates an RDoc::Method on +container+ from +comment+ if there is a
-  # Signature section in the comment
-
-  def parse_comment_tomdoc container, tk, comment
-    return unless signature = RDoc::TomDoc.signature(comment)
-    column  = tk[:char_no]
-    line_no = tk[:line_no]
-
-    name, = signature.split %r%[ \(]%, 2
-
-    meth = RDoc::GhostMethod.new get_tkread, name
-    record_location meth
-    meth.line      = line_no
-
-    meth.start_collecting_tokens
-    indent = RDoc::Parser::RipperStateLex::Token.new(1, 1, :on_sp, ' ' * column)
-    position_comment = RDoc::Parser::RipperStateLex::Token.new(line_no, 1, :on_comment)
-    position_comment[:text] = "# File #{@top_level.relative_name}, line #{line_no}"
-    newline = RDoc::Parser::RipperStateLex::Token.new(0, 0, :on_nl, "\n")
-    meth.add_tokens [position_comment, newline, indent]
-
-    meth.call_seq = signature
-
-    comment.normalize
-
-    return unless meth.name
-
-    container.add_method meth
-
-    meth.comment = comment
-
-    @stats.add_method meth
-  end
-
-  ##
-  # Parses an +include+ or +extend+, indicated by the +klass+ and adds it to
-  # +container+ # with +comment+
-
-  def parse_extend_or_include klass, container, comment # :nodoc:
-    loop do
-      skip_tkspace_comment
-
-      name = get_included_module_with_optional_parens
-
-      unless name.empty? then
-        obj = container.add klass, name, comment
-        record_location obj
-      end
-
-      return if peek_tk.nil? || :on_comma != peek_tk[:kind]
-
-      get_tk
-    end
-  end
-
-  ##
-  # Parses an +included+ with a block feature of ActiveSupport::Concern.
-
-  def parse_included_with_activesupport_concern container, comment # :nodoc:
-    skip_tkspace_without_nl
-    tk = get_tk
-    unless tk[:kind] == :on_lbracket || (tk[:kind] == :on_kw && tk[:text] == 'do')
-      unget_tk tk
-      return nil # should be a block
-    end
-
-    parse_statements container
-
-    container
-  end
-
-  ##
-  # Parses identifiers that can create new methods or change visibility.
-  #
-  # Returns true if the comment was not consumed.
-
-  def parse_identifier container, single, tk, comment # :nodoc:
-    case tk[:text]
-    when 'private', 'protected', 'public', 'private_class_method',
-         'public_class_method', 'module_function' then
-      parse_visibility container, single, tk
-      return true
-    when 'private_constant', 'public_constant'
-      parse_constant_visibility container, single, tk
-      return true
-    when 'attr' then
-      parse_attr container, single, tk, comment
-    when /^attr_(reader|writer|accessor)$/ then
-      parse_attr_accessor container, single, tk, comment
-    when 'alias_method' then
-      parse_alias container, single, tk, comment
-    when 'require', 'include' then
-      # ignore
-    else
-      if comment.text =~ /\A#\#$/ then
-        case comment.text
-        when /^# +:?attr(_reader|_writer|_accessor)?:/ then
-          parse_meta_attr container, single, tk, comment
-        else
-          method = parse_meta_method container, single, tk, comment
-          method.params = container.params if
-            container.params
-          method.block_params = container.block_params if
-            container.block_params
-        end
-      end
-    end
-
-    false
-  end
-
-  ##
-  # Parses a meta-programmed attribute and creates an RDoc::Attr.
-  #
-  # To create foo and bar attributes on class C with comment "My attributes":
-  #
-  #   class C
-  #
-  #     ##
-  #     # :attr:
-  #     #
-  #     # My attributes
-  #
-  #     my_attr :foo, :bar
-  #
-  #   end
-  #
-  # To create a foo attribute on class C with comment "My attribute":
-  #
-  #   class C
-  #
-  #     ##
-  #     # :attr: foo
-  #     #
-  #     # My attribute
-  #
-  #     my_attr :foo, :bar
-  #
-  #   end
-
-  def parse_meta_attr(context, single, tk, comment)
-    args = parse_symbol_arg
-    rw = "?"
-
-    # If nodoc is given, don't document any of them
-
-    tmp = RDoc::CodeObject.new
-    read_documentation_modifiers tmp, RDoc::ATTR_MODIFIERS
-
-    regexp = /^# +:?(attr(_reader|_writer|_accessor)?): *(\S*).*?\n/i
-    if regexp =~ comment.text then
-      comment.text = comment.text.sub(regexp, '')
-      rw = case $1
-           when 'attr_reader' then 'R'
-           when 'attr_writer' then 'W'
-           else 'RW'
-           end
-      name = $3 unless $3.empty?
-    end
-
-    if name then
-      att = create_attr context, single, name, rw, comment
-    else
-      args.each do |attr_name|
-        att = create_attr context, single, attr_name, rw, comment
-      end
-    end
-
-    att
-  end
-
-  ##
-  # Parses a meta-programmed method
-
-  def parse_meta_method(container, single, tk, comment)
-    column  = tk[:char_no]
-    line_no = tk[:line_no]
-
-    start_collecting_tokens
-    add_token tk
-    add_token_listener self
-
-    skip_tkspace_without_nl
-
-    comment.text = comment.text.sub(/(^# +:?)(singleton-)(method:)/, '\1\3')
-    singleton = !!$~
-
-    name = parse_meta_method_name comment, tk
-
-    return unless name
-
-    meth = RDoc::MetaMethod.new get_tkread, name
-    record_location meth
-    meth.line   = line_no
-    meth.singleton = singleton
-
-    remove_token_listener self
-
-    meth.start_collecting_tokens
-    indent = RDoc::Parser::RipperStateLex::Token.new(1, 1, :on_sp, ' ' * column)
-    position_comment = RDoc::Parser::RipperStateLex::Token.new(line_no, 1, :on_comment)
-    position_comment[:text] = "# File #{@top_level.relative_name}, line #{line_no}"
-    newline = RDoc::Parser::RipperStateLex::Token.new(0, 0, :on_nl, "\n")
-    meth.add_tokens [position_comment, newline, indent]
-    meth.add_tokens @token_stream
-
-    parse_meta_method_params container, single, meth, tk, comment
-
-    meth.comment = comment
-
-    @stats.add_method meth
-
-    meth
-  end
-
-  ##
-  # Parses the name of a metaprogrammed method.  +comment+ is used to
-  # determine the name while +tk+ is used in an error message if the name
-  # cannot be determined.
-
-  def parse_meta_method_name comment, tk # :nodoc:
-    if comment.text.sub!(/^# +:?method: *(\S*).*?\n/i, '') then
-      return $1 unless $1.empty?
-    end
-
-    name_t = get_tk
-
-    if :on_symbol == name_t[:kind] then
-      name_t[:text][1..-1]
-    elsif :on_tstring == name_t[:kind] then
-      name_t[:text][1..-2]
-    elsif :on_op == name_t[:kind] && '=' == name_t[:text] then # ignore
-      remove_token_listener self
-
-      nil
-    else
-      warn "unknown name token #{name_t.inspect} for meta-method '#{tk[:text]}'"
-      'unknown'
-    end
-  end
-
-  ##
-  # Parses the parameters and block for a meta-programmed method.
-
-  def parse_meta_method_params container, single, meth, tk, comment # :nodoc:
-    token_listener meth do
-      meth.params = ''
-
-      look_for_directives_in meth, comment
-      comment.normalize
-      comment.extract_call_seq meth
-
-      container.add_method meth
-
-      last_tk = tk
-
-      while tk = get_tk do
-        if :on_semicolon == tk[:kind] then
-          break
-        elsif :on_nl == tk[:kind] then
-          break unless last_tk and :on_comma == last_tk[:kind]
-        elsif :on_sp == tk[:kind] then
-          # expression continues
-        elsif :on_kw == tk[:kind] && 'do' == tk[:text] then
-          parse_statements container, single, meth
-          break
-        else
-          last_tk = tk
-        end
-      end
-    end
-  end
-
-  ##
-  # Parses a normal method defined by +def+
-
-  def parse_method(container, single, tk, comment)
-    singleton = nil
-    added_container = false
-    name = nil
-    column  = tk[:char_no]
-    line_no = tk[:line_no]
-
-    start_collecting_tokens
-    add_token tk
-
-    token_listener self do
-      prev_container = container
-      name, container, singleton = parse_method_name container
-      added_container = container != prev_container
-    end
-
-    return unless name
-
-    meth = RDoc::AnyMethod.new get_tkread, name
-    look_for_directives_in meth, comment
-    meth.singleton = single == SINGLE ? true : singleton
-
-    record_location meth
-    meth.line   = line_no
-
-    meth.start_collecting_tokens
-    indent = RDoc::Parser::RipperStateLex::Token.new(1, 1, :on_sp, ' ' * column)
-    token = RDoc::Parser::RipperStateLex::Token.new(line_no, 1, :on_comment)
-    token[:text] = "# File #{@top_level.relative_name}, line #{line_no}"
-    newline = RDoc::Parser::RipperStateLex::Token.new(0, 0, :on_nl, "\n")
-    meth.add_tokens [token, newline, indent]
-    meth.add_tokens @token_stream
-
-    parse_method_params_and_body container, single, meth, added_container
-
-    comment.normalize
-    comment.extract_call_seq meth
-
-    meth.comment = comment
-
-    # after end modifiers
-    read_documentation_modifiers meth, RDoc::METHOD_MODIFIERS
-
-    @stats.add_method meth
-  end
-
-  ##
-  # Parses the parameters and body of +meth+
-
-  def parse_method_params_and_body container, single, meth, added_container
-    token_listener meth do
-      parse_method_parameters meth
-
-      if meth.document_self or not @track_visibility then
-        container.add_method meth
-      elsif added_container then
-        container.document_self = false
-      end
-
-      # Having now read the method parameters and documentation modifiers, we
-      # now know whether we have to rename #initialize to ::new
-
-      if meth.name == "initialize" && !meth.singleton then
-        if meth.dont_rename_initialize then
-          meth.visibility = :protected
-        else
-          meth.singleton = true
-          meth.name = "new"
-          meth.visibility = :public
-        end
-      end
-
-      parse_statements container, single, meth
-    end
-  end
-
-  ##
-  # Parses a method that needs to be ignored.
-
-  def parse_method_dummy container
-    dummy = RDoc::Context.new
-    dummy.parent = container
-    dummy.store  = container.store
-    skip_method dummy
-  end
-
-  ##
-  # Parses the name of a method in +container+.
-  #
-  # Returns the method name, the container it is in (for def Foo.name) and if
-  # it is a singleton or regular method.
-
-  def parse_method_name container # :nodoc:
-    skip_tkspace
-    name_t = get_tk
-    back_tk = skip_tkspace_without_nl
-    singleton = false
-
-    dot = get_tk
-    if dot[:kind] == :on_period || (dot[:kind] == :on_op && dot[:text] == '::') then
-      singleton = true
-
-      name, container = parse_method_name_singleton container, name_t
-    else
-      unget_tk dot
-      back_tk.reverse_each do |token|
-        unget_tk token
-      end
-
-      name = parse_method_name_regular container, name_t
-    end
-
-    return name, container, singleton
-  end
-
-  ##
-  # For the given +container+ and initial name token +name_t+ the method name
-  # is parsed from the token stream for a regular method.
-
-  def parse_method_name_regular container, name_t # :nodoc:
-    if :on_op == name_t[:kind] && (%w{* & [] []= <<}.include?(name_t[:text])) then
-      name_t[:text]
-    else
-      unless [:on_kw, :on_const, :on_ident].include?(name_t[:kind]) then
-        warn "expected method name token, . or ::, got #{name_t.inspect}"
-        skip_method container
-        return
-      end
-      name_t[:text]
-    end
-  end
-
-  ##
-  # For the given +container+ and initial name token +name_t+ the method name
-  # and the new +container+ (if necessary) are parsed from the token stream
-  # for a singleton method.
-
-  def parse_method_name_singleton container, name_t # :nodoc:
-    skip_tkspace
-    name_t2 = get_tk
-
-    if (:on_kw == name_t[:kind] && 'self' == name_t[:text]) || (:on_op == name_t[:kind] && '%' == name_t[:text]) then
-      # NOTE: work around '[' being consumed early
-      if :on_lbracket == name_t2[:kind]
-        get_tk
-        name = '[]'
-      else
-        name = name_t2[:text]
-      end
-    elsif :on_const == name_t[:kind] then
-      name = name_t2[:text]
-
-      container = get_method_container container, name_t
-
-      return unless container
-
-      name
-    elsif :on_ident == name_t[:kind] || :on_ivar == name_t[:kind] || :on_gvar == name_t[:kind] then
-      parse_method_dummy container
-
-      name = nil
-    elsif (:on_kw == name_t[:kind]) && ('true' == name_t[:text] || 'false' == name_t[:text] || 'nil' == name_t[:text]) then
-      klass_name = "#{name_t[:text].capitalize}Class"
-      container = @store.find_class_named klass_name
-      container ||= @top_level.add_class RDoc::NormalClass, klass_name
-
-      name = name_t2[:text]
-    else
-      warn "unexpected method name token #{name_t.inspect}"
-      # break
-      skip_method container
-
-      name = nil
-    end
-
-    return name, container
-  end
-
-  ##
-  # Extracts +yield+ parameters from +method+
-
-  def parse_method_or_yield_parameters(method = nil,
-                                       modifiers = RDoc::METHOD_MODIFIERS)
-    skip_tkspace_without_nl
-    tk = get_tk
-    end_token = get_end_token tk
-    return '' unless end_token
-
-    nest = 0
-    continue = false
-
-    while tk != nil do
-      case tk[:kind]
-      when :on_semicolon then
-        break if nest == 0
-      when :on_lbracket then
-        nest += 1
-      when :on_rbracket then
-        nest -= 1
-      when :on_lbrace then
-        nest += 1
-      when :on_rbrace then
-        nest -= 1
-        if nest <= 0
-          # we might have a.each { |i| yield i }
-          unget_tk(tk) if nest < 0
-          break
-        end
-      when :on_lparen then
-        nest += 1
-      when end_token[:kind] then
-        if end_token[:kind] == :on_rparen
-          nest -= 1
-          break if nest <= 0
-        else
-          break
-        end
-      when :on_rparen then
-        nest -= 1
-      when :on_comment, :on_embdoc then
-        @read.pop
-        if :on_nl == end_token[:kind] and "\n" == tk[:text][-1] and
-          (!continue or (tk[:state] & RDoc::Parser::RipperStateLex::EXPR_LABEL) != 0) then
-          if method && method.block_params.nil? then
-            unget_tk tk
-            read_documentation_modifiers method, modifiers
-          end
-          break if !continue and nest <= 0
-        end
-      when :on_comma then
-        continue = true
-      when :on_ident then
-        continue = false if continue
-      end
-      tk = get_tk
-    end
-
-    get_tkread_clean(/\s+/, ' ')
-  end
-
-  ##
-  # Capture the method's parameters. Along the way, look for a comment
-  # containing:
-  #
-  #    # yields: ....
-  #
-  # and add this as the block_params for the method
-
-  def parse_method_parameters method
-    res = parse_method_or_yield_parameters method
-
-    res = "(#{res})" unless res =~ /\A\(/
-    method.params = res unless method.params
-
-    return if  method.block_params
-
-    skip_tkspace_without_nl
-    read_documentation_modifiers method, RDoc::METHOD_MODIFIERS
-  end
-
-  ##
-  # Parses an RDoc::NormalModule in +container+ with +comment+
-
-  def parse_module container, single, tk, comment
-    container, name_t, = get_class_or_module container
-
-    name = name_t[:text]
-
-    mod = container.add_module RDoc::NormalModule, name
-    mod.ignore unless container.document_children
-    record_location mod
-
-    read_documentation_modifiers mod, RDoc::CLASS_MODIFIERS
-    mod.add_comment comment, @top_level
-    parse_statements mod
-
-    # after end modifiers
-    read_documentation_modifiers mod, RDoc::CLASS_MODIFIERS
-
-    @stats.add_module mod
-  end
-
-  ##
-  # Parses an RDoc::Require in +context+ containing +comment+
-
-  def parse_require(context, comment)
-    skip_tkspace_comment
-    tk = get_tk
-
-    if :on_lparen == tk[:kind] then
-      skip_tkspace_comment
-      tk = get_tk
-    end
-
-    name = tk[:text][1..-2] if :on_tstring == tk[:kind]
-
-    if name then
-      @top_level.add_require RDoc::Require.new(name, comment)
-    else
-      unget_tk tk
-    end
-  end
-
-  ##
-  # Parses a rescue
-
-  def parse_rescue
-    skip_tkspace_without_nl
-
-    while tk = get_tk
-      case tk[:kind]
-      when :on_nl, :on_semicolon, :on_comment then
-        break
-      when :on_comma then
-        skip_tkspace_without_nl
-
-        get_tk if :on_nl == peek_tk[:kind]
-      end
-
-      skip_tkspace_without_nl
-    end
-  end
-
-  ##
-  # Retrieve comment body without =begin/=end
-
-  def retrieve_comment_body(tk)
-    if :on_embdoc == tk[:kind]
-      tk[:text].gsub(/\A=begin.*\n/, '').gsub(/=end\n?\z/, '')
-    else
-      tk[:text]
-    end
-  end
-
-  ##
-  # The core of the Ruby parser.
-
-  def parse_statements(container, single = NORMAL, current_method = nil,
-                       comment = new_comment(''))
-    raise 'no' unless RDoc::Comment === comment
-    comment = RDoc::Encoding.change_encoding comment, @encoding if @encoding
-
-    nest = 1
-    save_visibility = container.visibility
-
-    non_comment_seen = true
-
-    while tk = get_tk do
-      keep_comment = false
-      try_parse_comment = false
-
-      non_comment_seen = true unless (:on_comment == tk[:kind] or :on_embdoc == tk[:kind])
-
-      case tk[:kind]
-      when :on_nl, :on_ignored_nl, :on_comment, :on_embdoc then
-        if :on_nl == tk[:kind] or :on_ignored_nl == tk[:kind]
-          skip_tkspace
-          tk = get_tk
-        else
-          past_tokens = @read.size > 1 ? @read[0..-2] : []
-          nl_position = 0
-          past_tokens.reverse.each_with_index do |read_tk, i|
-            if read_tk =~ /^\n$/ then
-              nl_position = (past_tokens.size - 1) - i
-              break
-            elsif read_tk =~ /^#.*\n$/ then
-              nl_position = ((past_tokens.size - 1) - i) + 1
-              break
-            end
-          end
-          comment_only_line = past_tokens[nl_position..-1].all?{ |c| c =~ /^\s+$/ }
-          unless comment_only_line then
-            tk = get_tk
-          end
-        end
-
-        if tk and (:on_comment == tk[:kind] or :on_embdoc == tk[:kind]) then
-          if non_comment_seen then
-            # Look for RDoc in a comment about to be thrown away
-            non_comment_seen = parse_comment container, tk, comment unless
-              comment.empty?
-
-            comment = ''
-            comment = RDoc::Encoding.change_encoding comment, @encoding if @encoding
-          end
-
-          line_no = nil
-          while tk and (:on_comment == tk[:kind] or :on_embdoc == tk[:kind]) do
-            comment_body = retrieve_comment_body(tk)
-            line_no = tk[:line_no] if comment.empty?
-            comment += comment_body
-            comment << "\n" unless comment_body =~ /\n\z/
-
-            if comment_body.size > 1 && comment_body =~ /\n\z/ then
-              skip_tkspace_without_nl # leading spaces
-            end
-            tk = get_tk
-          end
-
-          comment = new_comment comment, line_no
-
-          unless comment.empty? then
-            look_for_directives_in container, comment
-
-            if container.done_documenting then
-              throw :eof if RDoc::TopLevel === container
-              container.ongoing_visibility = save_visibility
-            end
-          end
-
-          keep_comment = true
-        else
-          non_comment_seen = true
-        end
-
-        unget_tk tk
-        keep_comment = true
-        container.current_line_visibility = nil
-
-      when :on_kw then
-        case tk[:text]
-        when 'class' then
-          parse_class container, single, tk, comment
-
-        when 'module' then
-          parse_module container, single, tk, comment
-
-        when 'def' then
-          parse_method container, single, tk, comment
-
-        when 'alias' then
-          parse_alias container, single, tk, comment unless current_method
-
-        when 'yield' then
-          if current_method.nil? then
-            warn "Warning: yield outside of method" if container.document_self
-          else
-            parse_yield container, single, tk, current_method
-          end
-
-        when 'until', 'while' then
-          if (tk[:state] & RDoc::Parser::RipperStateLex::EXPR_LABEL) == 0
-            nest += 1
-            skip_optional_do_after_expression
-          end
-
-        # Until and While can have a 'do', which shouldn't increase the nesting.
-        # We can't solve the general case, but we can handle most occurrences by
-        # ignoring a do at the end of a line.
-
-        # 'for' is trickier
-        when 'for' then
-          nest += 1
-          skip_for_variable
-          skip_optional_do_after_expression
-
-        when 'case', 'do', 'if', 'unless', 'begin' then
-          if (tk[:state] & RDoc::Parser::RipperStateLex::EXPR_LABEL) == 0
-            nest += 1
-          end
-
-        when 'super' then
-          current_method.calls_super = true if current_method
-
-        when 'rescue' then
-          parse_rescue
-
-        when 'end' then
-          nest -= 1
-          if nest == 0 then
-            container.ongoing_visibility = save_visibility
-
-            parse_comment container, tk, comment unless comment.empty?
-
-            return
-          end
-        end
-
-      when :on_const then
-        unless parse_constant container, tk, comment, current_method then
-          try_parse_comment = true
-        end
-
-      when :on_ident then
-        if nest == 1 and current_method.nil? then
-          keep_comment = parse_identifier container, single, tk, comment
-        end
-
-        case tk[:text]
-        when "require" then
-          parse_require container, comment
-        when "include" then
-          parse_extend_or_include RDoc::Include, container, comment
-        when "extend" then
-          parse_extend_or_include RDoc::Extend, container, comment
-        when "included" then
-          parse_included_with_activesupport_concern container, comment
-        end
-
-      else
-        try_parse_comment = nest == 1
-      end
-
-      if try_parse_comment then
-        non_comment_seen = parse_comment container, tk, comment unless
-          comment.empty?
-
-        keep_comment = false
-      end
-
-      unless keep_comment then
-        comment = new_comment ''
-        comment = RDoc::Encoding.change_encoding comment, @encoding if @encoding
-        container.params = nil
-        container.block_params = nil
-      end
-
-      consume_trailing_spaces
-    end
-
-    container.params = nil
-    container.block_params = nil
-  end
-
-  ##
-  # Parse up to +no+ symbol arguments
-
-  def parse_symbol_arg(no = nil)
-    skip_tkspace_comment
-
-    tk = get_tk
-    if tk[:kind] == :on_lparen
-      parse_symbol_arg_paren no
-    else
-      parse_symbol_arg_space no, tk
-    end
-  end
-
-  ##
-  # Parses up to +no+ symbol arguments surrounded by () and places them in
-  # +args+.
-
-  def parse_symbol_arg_paren no # :nodoc:
-    args = []
-
-    loop do
-      skip_tkspace_comment
-      if tk1 = parse_symbol_in_arg
-        args.push tk1
-        break if no and args.size >= no
-      end
-
-      skip_tkspace_comment
-      case (tk2 = get_tk)[:kind]
-      when :on_rparen
-        break
-      when :on_comma
-      else
-        warn("unexpected token: '#{tk2.inspect}'") if $DEBUG_RDOC
-        break
-      end
-    end
-
-    args
-  end
-
-  ##
-  # Parses up to +no+ symbol arguments separated by spaces and places them in
-  # +args+.
-
-  def parse_symbol_arg_space no, tk # :nodoc:
-    args = []
-
-    unget_tk tk
-    if tk = parse_symbol_in_arg
-      args.push tk
-      return args if no and args.size >= no
-    end
-
-    loop do
-      skip_tkspace_without_nl
-
-      tk1 = get_tk
-      if tk1.nil? || :on_comma != tk1[:kind] then
-        unget_tk tk1
-        break
-      end
-
-      skip_tkspace_comment
-      if tk = parse_symbol_in_arg
-        args.push tk
-        break if no and args.size >= no
-      end
-    end
-
-    args
-  end
-
-  ##
-  # Returns symbol text from the next token
-
-  def parse_symbol_in_arg
-    tk = get_tk
-    if :on_symbol == tk[:kind] then
-      tk[:text].sub(/^:/, '')
-    elsif :on_tstring == tk[:kind] then
-      tk[:text][1..-2]
-    elsif :on_dstring == tk[:kind] or :on_ident == tk[:kind] then
-      nil # ignore
-    else
-      warn("Expected symbol or string, got #{tk.inspect}") if $DEBUG_RDOC
-      nil
-    end
-  end
-
-  ##
-  # Parses statements in the top-level +container+
-
-  def parse_top_level_statements container
-    comment = collect_first_comment
-
-    look_for_directives_in container, comment
-
-    throw :eof if container.done_documenting
-
-    @markup = comment.format
-
-    # HACK move if to RDoc::Context#comment=
-    container.comment = comment if container.document_self unless comment.empty?
-
-    parse_statements container, NORMAL, nil, comment
-  end
-
-  ##
-  # Determines the visibility in +container+ from +tk+
-
-  def parse_visibility(container, single, tk)
-    vis_type, vis, singleton = get_visibility_information tk, single
-
-    skip_tkspace_comment false
-
-    ptk = peek_tk
-    # Ryan Davis suggested the extension to ignore modifiers, because he
-    # often writes
-    #
-    #   protected unless $TESTING
-    #
-    if [:on_nl, :on_semicolon].include?(ptk[:kind]) || (:on_kw == ptk[:kind] && (['if', 'unless'].include?(ptk[:text]))) then
-      container.ongoing_visibility = vis
-    elsif :on_kw == ptk[:kind] && 'def' == ptk[:text]
-      container.current_line_visibility = vis
-    else
-      update_visibility container, vis_type, vis, singleton
-    end
-  end
-
-  ##
-  # Parses a Module#private_constant or Module#public_constant call from +tk+.
-
-  def parse_constant_visibility(container, single, tk)
-    args = parse_symbol_arg
-    case tk[:text]
-    when 'private_constant'
-      vis = :private
-    when 'public_constant'
-      vis = :public
-    else
-      raise RDoc::Error, 'Unreachable'
-    end
-    container.set_constant_visibility_for args, vis
-  end
-
-  ##
-  # Determines the block parameter for +context+
-
-  def parse_yield(context, single, tk, method)
-    return if method.block_params
-
-    get_tkread
-    method.block_params = parse_method_or_yield_parameters
-  end
-
-  ##
-  # Directives are modifier comments that can appear after class, module, or
-  # method names. For example:
-  #
-  #   def fred # :yields: a, b
-  #
-  # or:
-  #
-  #   class MyClass # :nodoc:
-  #
-  # We return the directive name and any parameters as a two element array if
-  # the name is in +allowed+.  A directive can be found anywhere up to the end
-  # of the current line.
-
-  def read_directive allowed
-    tokens = []
-
-    while tk = get_tk do
-      tokens << tk
-
-      if :on_nl == tk[:kind] or (:on_kw == tk[:kind] && 'def' == tk[:text]) then
-        return
-      elsif :on_comment == tk[:kind] or :on_embdoc == tk[:kind] then
-        return unless tk[:text] =~ /:?\b([\w-]+):\s*(.*)/
-
-        directive = $1.downcase
-
-        return [directive, $2] if allowed.include? directive
-
-        return
-      end
-    end
-  ensure
-    unless tokens.length == 1 and (:on_comment == tokens.first[:kind] or :on_embdoc == tokens.first[:kind]) then
-      tokens.reverse_each do |token|
-        unget_tk token
-      end
-    end
-  end
-
-  ##
-  # Handles directives following the definition for +context+ (any
-  # RDoc::CodeObject) if the directives are +allowed+ at this point.
-  #
-  # See also RDoc::Markup::PreProcess#handle_directive
-
-  def read_documentation_modifiers context, allowed
-    skip_tkspace_without_nl
-    directive, value = read_directive allowed
-
-    return unless directive
-
-    @preprocess.handle_directive '', directive, value, context do |dir, param|
-      if %w[notnew not_new not-new].include? dir then
-        context.dont_rename_initialize = true
-
-        true
-      end
-    end
-  end
-
-  ##
-  # Records the location of this +container+ in the file for this parser and
-  # adds it to the list of classes and modules in the file.
-
-  def record_location container # :nodoc:
-    case container
-    when RDoc::ClassModule then
-      @top_level.add_to_classes_or_modules container
-    end
-
-    container.record_location @top_level
-  end
-
-  ##
-  # Scans this Ruby file for Ruby constructs
-
-  def scan
-    reset
-
-    catch :eof do
-      begin
-        parse_top_level_statements @top_level
-
-      rescue StandardError => e
-        if @content.include?('<%') and @content.include?('%>') then
-          # Maybe, this is ERB.
-          $stderr.puts "\033[2KRDoc detects ERB file. Skips it for compatibility:"
-          $stderr.puts @file_name
-          return
-        end
-
-        if @scanner_point >= @scanner.size
-          now_line_no = @scanner[@scanner.size - 1][:line_no]
-        else
-          now_line_no = peek_tk[:line_no]
-        end
-        first_tk_index = @scanner.find_index { |tk| tk[:line_no] == now_line_no }
-        last_tk_index = @scanner.find_index { |tk| tk[:line_no] == now_line_no + 1 }
-        last_tk_index = last_tk_index ? last_tk_index - 1 : @scanner.size - 1
-        code = @scanner[first_tk_index..last_tk_index].map{ |t| t[:text] }.join
-
-        $stderr.puts <<-EOF
-
-#{self.class} failure around line #{now_line_no} of
-#{@file_name}
-
-        EOF
-
-        unless code.empty? then
-          $stderr.puts code
-          $stderr.puts
-        end
-
-        raise e
-      end
-    end
-
-    @top_level
-  end
-
-  ##
-  # while, until, and for have an optional do
-
-  def skip_optional_do_after_expression
-    skip_tkspace_without_nl
-    tk = get_tk
-
-    b_nest = 0
-    nest = 0
-
-    loop do
-      break unless tk
-      case tk[:kind]
-      when :on_semicolon, :on_nl, :on_ignored_nl then
-        break if b_nest.zero?
-      when :on_lparen then
-        nest += 1
-      when :on_rparen then
-        nest -= 1
-      when :on_kw then
-        case tk[:text]
-        when 'begin'
-          b_nest += 1
-        when 'end'
-          b_nest -= 1
-        when 'do'
-          break if nest.zero?
-        end
-      when :on_comment, :on_embdoc then
-        if b_nest.zero? and "\n" == tk[:text][-1] then
-          break
-        end
-      end
-      tk = get_tk
-    end
-
-    skip_tkspace_without_nl
-
-    get_tk if peek_tk && :on_kw == peek_tk[:kind] && 'do' == peek_tk[:text]
-  end
-
-  ##
-  # skip the var [in] part of a 'for' statement
-
-  def skip_for_variable
-    skip_tkspace_without_nl
-    get_tk
-    skip_tkspace_without_nl
-    tk = get_tk
-    unget_tk(tk) unless :on_kw == tk[:kind] and 'in' == tk[:text]
-  end
-
-  ##
-  # Skips the next method in +container+
-
-  def skip_method container
-    meth = RDoc::AnyMethod.new "", "anon"
-    parse_method_parameters meth
-    parse_statements container, false, meth
-  end
-
-  ##
-  # Skip spaces until a comment is found
-
-  def skip_tkspace_comment(skip_nl = true)
-    loop do
-      skip_nl ? skip_tkspace : skip_tkspace_without_nl
-      next_tk = peek_tk
-      return if next_tk.nil? || (:on_comment != next_tk[:kind] and :on_embdoc != next_tk[:kind])
-      get_tk
-    end
-  end
-
-  ##
-  # Updates visibility in +container+ from +vis_type+ and +vis+.
-
-  def update_visibility container, vis_type, vis, singleton # :nodoc:
-    new_methods = []
-
-    case vis_type
-    when 'module_function' then
-      args = parse_symbol_arg
-      container.set_visibility_for args, :private, false
-
-      container.methods_matching args do |m|
-        s_m = m.dup
-        record_location s_m
-        s_m.singleton = true
-        new_methods << s_m
-      end
-    when 'public_class_method', 'private_class_method' then
-      args = parse_symbol_arg
-
-      container.methods_matching args, true do |m|
-        if m.parent != container then
-          m = m.dup
-          record_location m
-          new_methods << m
-        end
-
-        m.visibility = vis
-      end
-    else
-      args = parse_symbol_arg
-      container.set_visibility_for args, vis, singleton
-    end
-
-    new_methods.each do |method|
-      case method
-      when RDoc::AnyMethod then
-        container.add_method method
-      when RDoc::Attr then
-        container.add_attribute method
-      end
-      method.visibility = vis
-    end
-  end
-
-  ##
-  # Prints +message+ to +$stderr+ unless we're being quiet
-
-  def warn message
-    @options.warn make_message message
-  end
-
-end
diff --git a/lib/rdoc/parser/ruby_tools.rb b/lib/rdoc/parser/ruby_tools.rb
deleted file mode 100644
index 40ea517c4da93c..00000000000000
--- a/lib/rdoc/parser/ruby_tools.rb
+++ /dev/null
@@ -1,165 +0,0 @@
-# frozen_string_literal: true
-##
-# Collection of methods for writing parsers
-
-module RDoc::Parser::RubyTools
-
-  ##
-  # Adds a token listener +obj+, but you should probably use token_listener
-
-  def add_token_listener(obj)
-    @token_listeners ||= []
-    @token_listeners << obj
-  end
-
-  ##
-  # Fetches the next token from the scanner
-
-  def get_tk
-    tk = nil
-
-    if @tokens.empty? then
-      if @scanner_point >= @scanner.size
-        return nil
-      else
-        tk = @scanner[@scanner_point]
-        @scanner_point += 1
-        @read.push tk[:text]
-      end
-    else
-      @read.push @unget_read.shift
-      tk = @tokens.shift
-    end
-
-    if tk == nil || :on___end__ == tk[:kind]
-      tk = nil
-    end
-
-    return nil unless tk
-
-    # inform any listeners of our shiny new token
-    @token_listeners.each do |obj|
-      obj.add_token(tk)
-    end if @token_listeners
-
-    tk
-  end
-
-  ##
-  # Reads and returns all tokens up to one of +tokens+.  Leaves the matched
-  # token in the token list.
-
-  def get_tk_until(*tokens)
-    read = []
-
-    loop do
-      tk = get_tk
-
-      case tk
-      when *tokens then
-        unget_tk tk
-        break
-      end
-
-      read << tk
-    end
-
-    read
-  end
-
-  ##
-  # Retrieves a String representation of the read tokens
-
-  def get_tkread
-    read = @read.join("")
-    @read = []
-    read
-  end
-
-  ##
-  # Peek equivalent for get_tkread
-
-  def peek_read
-    @read.join('')
-  end
-
-  ##
-  # Peek at the next token, but don't remove it from the stream
-
-  def peek_tk
-    unget_tk(tk = get_tk)
-    tk
-  end
-
-  ##
-  # Removes the token listener +obj+
-
-  def remove_token_listener(obj)
-    @token_listeners.delete(obj)
-  end
-
-  ##
-  # Resets the tools
-
-  def reset
-    @read       = []
-    @tokens     = []
-    @unget_read = []
-    @nest = 0
-    @scanner_point = 0
-  end
-
-  ##
-  # Skips whitespace tokens including newlines
-
-  def skip_tkspace
-    tokens = []
-
-    while (tk = get_tk) and (:on_sp == tk[:kind] or :on_nl == tk[:kind] or :on_ignored_nl == tk[:kind]) do
-      tokens.push(tk)
-    end
-
-    unget_tk(tk)
-    tokens
-  end
-
-  ##
-  # Skips whitespace tokens excluding newlines
-
-  def skip_tkspace_without_nl
-    tokens = []
-
-    while (tk = get_tk) and :on_sp == tk[:kind] do
-      tokens.push(tk)
-    end
-
-    unget_tk(tk)
-    tokens
-  end
-
-  ##
-  # Has +obj+ listen to tokens
-
-  def token_listener(obj)
-    add_token_listener obj
-    yield
-  ensure
-    remove_token_listener obj
-  end
-
-  ##
-  # Returns +tk+ to the scanner
-
-  def unget_tk(tk)
-    @tokens.unshift tk
-    @unget_read.unshift @read.pop
-
-    # Remove this token from any listeners
-    @token_listeners.each do |obj|
-      obj.pop_token
-    end if @token_listeners
-
-    nil
-  end
-
-end
diff --git a/lib/rdoc/parser/simple.rb b/lib/rdoc/parser/simple.rb
deleted file mode 100644
index b1dabad0f8f747..00000000000000
--- a/lib/rdoc/parser/simple.rb
+++ /dev/null
@@ -1,61 +0,0 @@
-# frozen_string_literal: true
-##
-# Parse a non-source file. We basically take the whole thing as one big
-# comment.
-
-class RDoc::Parser::Simple < RDoc::Parser
-
-  include RDoc::Parser::Text
-
-  parse_files_matching(//)
-
-  attr_reader :content # :nodoc:
-
-  ##
-  # Prepare to parse a plain file
-
-  def initialize(top_level, file_name, content, options, stats)
-    super
-
-    preprocess = RDoc::Markup::PreProcess.new @file_name, @options.rdoc_include
-
-    @content = preprocess.handle @content, @top_level
-  end
-
-  ##
-  # Extract the file contents and attach them to the TopLevel as a comment
-
-  def scan
-    comment = remove_coding_comment @content
-    comment = remove_private_comment comment
-
-    comment = RDoc::Comment.new comment, @top_level
-
-    @top_level.comment = comment
-    @top_level
-  end
-
-  ##
-  # Removes the encoding magic comment from +text+
-
-  def remove_coding_comment text
-    text.sub(/\A# .*coding[=:].*$/, '')
-  end
-
-  ##
-  # Removes private comments.
-  #
-  # Unlike RDoc::Comment#remove_private this implementation only looks for two
-  # dashes at the beginning of the line.  Three or more dashes are considered
-  # to be a rule and ignored.
-
-  def remove_private_comment comment
-    # Workaround for gsub encoding for Ruby 1.9.2 and earlier
-    empty = ''
-    empty = RDoc::Encoding.change_encoding empty, comment.encoding
-
-    comment = comment.gsub(%r%^--\n.*?^\+\+\n?%m, empty)
-    comment.sub(%r%^--\n.*%m, empty)
-  end
-
-end
diff --git a/lib/rdoc/parser/text.rb b/lib/rdoc/parser/text.rb
deleted file mode 100644
index 5095d8cc6420c5..00000000000000
--- a/lib/rdoc/parser/text.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-# frozen_string_literal: true
-##
-# Indicates this parser is text and doesn't contain code constructs.
-#
-# Include this module in a RDoc::Parser subclass to make it show up as a file,
-# not as part of a class or module.
-#--
-# This is not named File to avoid overriding ::File
-
-module RDoc::Parser::Text
-end
diff --git a/lib/rdoc/rd.rb b/lib/rdoc/rd.rb
deleted file mode 100644
index 8c2366a3cac271..00000000000000
--- a/lib/rdoc/rd.rb
+++ /dev/null
@@ -1,99 +0,0 @@
-# frozen_string_literal: true
-##
-# RDoc::RD implements the RD format from the rdtool gem.
-#
-# To choose RD as your only default format see
-# RDoc::Options@Saved+Options for instructions on setting up a
-# <code>.doc_options</code> file to store your project default.
-#
-# == LICENSE
-#
-# The grammar that produces RDoc::RD::BlockParser and RDoc::RD::InlineParser
-# is included in RDoc under the Ruby License.
-#
-# You can find the original source for rdtool at
-# https://github.com/uwabami/rdtool/
-#
-# You can use, re-distribute or change these files under Ruby's License or GPL.
-#
-# 1. You may make and give away verbatim copies of the source form of the
-#    software without restriction, provided that you duplicate all of the
-#    original copyright notices and associated disclaimers.
-#
-# 2. You may modify your copy of the software in any way, provided that
-#    you do at least ONE of the following:
-#
-#    a. place your modifications in the Public Domain or otherwise
-#       make them Freely Available, such as by posting said
-#       modifications to Usenet or an equivalent medium, or by allowing
-#       the author to include your modifications in the software.
-#
-#    b. use the modified software only within your corporation or
-#       organization.
-#
-#    c. give non-standard binaries non-standard names, with
-#       instructions on where to get the original software distribution.
-#
-#    d. make other distribution arrangements with the author.
-#
-# 3. You may distribute the software in object code or binary form,
-#    provided that you do at least ONE of the following:
-#
-#    a. distribute the binaries and library files of the software,
-#       together with instructions (in the manual page or equivalent)
-#       on where to get the original distribution.
-#
-#    b. accompany the distribution with the machine-readable source of
-#       the software.
-#
-#    c. give non-standard binaries non-standard names, with
-#       instructions on where to get the original software distribution.
-#
-#    d. make other distribution arrangements with the author.
-#
-# 4. You may modify and include the part of the software into any other
-#    software (possibly commercial).  But some files in the distribution
-#    are not written by the author, so that they are not under these terms.
-#
-#    For the list of those files and their copying conditions, see the
-#    file LEGAL.
-#
-# 5. The scripts and library files supplied as input to or produced as
-#    output from the software do not automatically fall under the
-#    copyright of the software, but belong to whomever generated them,
-#    and may be sold commercially, and may be aggregated with this
-#    software.
-#
-# 6. THIS SOFTWARE IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR
-#    IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
-#    WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-#    PURPOSE.
-
-class RDoc::RD
-
-  ##
-  # Parses +rd+ source and returns an RDoc::Markup::Document.  If the
-  # <tt>=begin</tt> or <tt>=end</tt> lines are missing they will be added.
-
-  def self.parse rd
-    rd = rd.lines.to_a
-
-    if rd.find { |i| /\S/ === i } and !rd.find{|i| /^=begin\b/ === i } then
-      rd.unshift("=begin\n").push("=end\n")
-    end
-
-    parser = RDoc::RD::BlockParser.new
-    document = parser.parse rd
-
-    # isn't this always true?
-    document.parts.shift if RDoc::Markup::BlankLine === document.parts.first
-    document.parts.pop   if RDoc::Markup::BlankLine === document.parts.last
-
-    document
-  end
-
-  autoload :BlockParser,  "#{__dir__}/rd/block_parser"
-  autoload :InlineParser, "#{__dir__}/rd/inline_parser"
-  autoload :Inline,       "#{__dir__}/rd/inline"
-
-end
diff --git a/lib/rdoc/rd/block_parser.rb b/lib/rdoc/rd/block_parser.rb
deleted file mode 100644
index aa1c6f62272d1d..00000000000000
--- a/lib/rdoc/rd/block_parser.rb
+++ /dev/null
@@ -1,1720 +0,0 @@
-# frozen_string_literal: true
-#
-# DO NOT MODIFY!!!!
-# This file is automatically generated by Racc 1.7.1
-# from Racc grammar file "".
-#
-
-###### racc/parser.rb begin
-unless $".find {|p| p.end_with?('/racc/parser.rb')}
-$".push "#{__dir__}/racc/parser.rb"
-# frozen_string_literal: false
-#--
-# Copyright (c) 1999-2006 Minero Aoki
-#
-# This program is free software.
-# You can distribute/modify this program under the same terms of ruby.
-#
-# As a special exception, when this code is copied by Racc
-# into a Racc output file, you may use that output file
-# without restriction.
-#++
-
-unless $".find {|p| p.end_with?('/racc/info.rb')}
-$".push "#{__dir__}/racc/info.rb"
-#--
-#
-#
-#
-# Copyright (c) 1999-2006 Minero Aoki
-#
-# 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.7.1'
-  Version = VERSION
-  Copyright = 'Copyright (c) 1999-2006 Minero Aoki'
-end
-
-end
-
-
-unless defined?(NotImplementedError)
-  NotImplementedError = NotImplementError # :nodoc:
-end
-
-module Racc
-  class ParseError < StandardError; end
-end
-unless defined?(::ParseError)
-  ParseError = Racc::ParseError # :nodoc:
-end
-
-# Racc is a LALR(1) parser generator.
-# It is written in Ruby itself, and generates Ruby programs.
-#
-# == Command-line Reference
-#
-#     racc [-o<var>filename</var>] [--output-file=<var>filename</var>]
-#          [-e<var>rubypath</var>] [--executable=<var>rubypath</var>]
-#          [-v] [--verbose]
-#          [-O<var>filename</var>] [--log-file=<var>filename</var>]
-#          [-g] [--debug]
-#          [-E] [--embedded]
-#          [-l] [--no-line-convert]
-#          [-c] [--line-convert-all]
-#          [-a] [--no-omit-actions]
-#          [-C] [--check-only]
-#          [-S] [--output-status]
-#          [--version] [--copyright] [--help] <var>grammarfile</var>
-#
-# [+grammarfile+]
-#   Racc grammar file. Any extension is permitted.
-# [-o+outfile+, --output-file=+outfile+]
-#   A filename for output. default is <+filename+>.tab.rb
-# [-O+filename+, --log-file=+filename+]
-#   Place logging output in file +filename+.
-#   Default log file name is <+filename+>.output.
-# [-e+rubypath+, --executable=+rubypath+]
-#   output executable file(mode 755). where +path+ is the Ruby interpreter.
-# [-v, --verbose]
-#   verbose mode. create +filename+.output file, like yacc's y.output file.
-# [-g, --debug]
-#   add debug code to parser class. To display debuggin information,
-#   use this '-g' option and set @yydebug true in parser class.
-# [-E, --embedded]
-#   Output parser which doesn't need runtime files (racc/parser.rb).
-# [-C, --check-only]
-#   Check syntax of racc grammar file and quit.
-# [-S, --output-status]
-#   Print messages time to time while compiling.
-# [-l, --no-line-convert]
-#   turns off line number converting.
-# [-c, --line-convert-all]
-#   Convert line number of actions, inner, header and footer.
-# [-a, --no-omit-actions]
-#   Call all actions, even if an action is empty.
-# [--version]
-#   print Racc version and quit.
-# [--copyright]
-#   Print copyright and quit.
-# [--help]
-#   Print usage and quit.
-#
-# == Generating Parser Using Racc
-#
-# To compile Racc grammar file, simply type:
-#
-#   $ racc parse.y
-#
-# This creates Ruby script file "parse.tab.y". The -o option can change the output filename.
-#
-# == Writing A Racc Grammar File
-#
-# If you want your own parser, you have to write a grammar file.
-# A grammar file contains the name of your parser class, grammar for the parser,
-# user code, and anything else.
-# When writing a grammar file, yacc's knowledge is helpful.
-# If you have not used yacc before, Racc is not too difficult.
-#
-# Here's an example Racc grammar file.
-#
-#   class Calcparser
-#   rule
-#     target: exp { print val[0] }
-#
-#     exp: exp '+' exp
-#        | exp '*' exp
-#        | '(' exp ')'
-#        | NUMBER
-#   end
-#
-# Racc grammar files resemble yacc files.
-# But (of course), this is Ruby code.
-# yacc's $$ is the 'result', $0, $1... is
-# an array called 'val', and $-1, $-2... is an array called '_values'.
-#
-# See the {Grammar File Reference}[rdoc-ref:lib/racc/rdoc/grammar.en.rdoc] for
-# more information on grammar files.
-#
-# == Parser
-#
-# Then you must prepare the parse entry method. There are two types of
-# parse methods in Racc, Racc::Parser#do_parse and Racc::Parser#yyparse
-#
-# Racc::Parser#do_parse is simple.
-#
-# It's yyparse() of yacc, and Racc::Parser#next_token is yylex().
-# This method must returns an array like [TOKENSYMBOL, ITS_VALUE].
-# EOF is [false, false].
-# (TOKENSYMBOL is a Ruby symbol (taken from String#intern) by default.
-# If you want to change this, see the grammar reference.
-#
-# Racc::Parser#yyparse is little complicated, but useful.
-# It does not use Racc::Parser#next_token, instead it gets tokens from any iterator.
-#
-# For example, <code>yyparse(obj, :scan)</code> causes
-# calling +obj#scan+, and you can return tokens by yielding them from +obj#scan+.
-#
-# == Debugging
-#
-# When debugging, "-v" or/and the "-g" option is helpful.
-#
-# "-v" creates verbose log file (.output).
-# "-g" creates a "Verbose Parser".
-# Verbose Parser prints the internal status when parsing.
-# But it's _not_ automatic.
-# You must use -g option and set +@yydebug+ to +true+ in order to get output.
-# -g option only creates the verbose parser.
-#
-# === Racc reported syntax error.
-#
-# Isn't there too many "end"?
-# grammar of racc file is changed in v0.10.
-#
-# Racc does not use '%' mark, while yacc uses huge number of '%' marks..
-#
-# === Racc reported "XXXX conflicts".
-#
-# Try "racc -v xxxx.y".
-# It causes producing racc's internal log file, xxxx.output.
-#
-# === Generated parsers does not work correctly
-#
-# Try "racc -g xxxx.y".
-# This command let racc generate "debugging parser".
-# Then set @yydebug=true in your parser.
-# It produces a working log of your parser.
-#
-# == Re-distributing Racc runtime
-#
-# A parser, which is created by Racc, requires the Racc runtime module;
-# racc/parser.rb.
-#
-# Ruby 1.8.x comes with Racc runtime module,
-# you need NOT distribute Racc runtime files.
-#
-# If you want to include the Racc runtime module with your parser.
-# This can be done by using '-E' option:
-#
-#   $ racc -E -omyparser.rb myparser.y
-#
-# This command creates myparser.rb which `includes' Racc runtime.
-# Only you must do is to distribute your parser file (myparser.rb).
-#
-# Note: parser.rb is ruby license, but your parser is not.
-# Your own parser is completely yours.
-module Racc
-
-  unless defined?(Racc_No_Extensions)
-    Racc_No_Extensions = false # :nodoc:
-  end
-
-  class Parser
-
-    Racc_Runtime_Version = ::Racc::VERSION
-    Racc_Runtime_Core_Version_R = ::Racc::VERSION
-
-    begin
-      if Object.const_defined?(:RUBY_ENGINE) and RUBY_ENGINE == 'jruby'
-        require 'jruby'
-        require 'racc/cparse-jruby.jar'
-        com.headius.racc.Cparse.new.load(JRuby.runtime, false)
-      else
-        require 'racc/cparse'
-      end
-
-      unless new.respond_to?(:_racc_do_parse_c, true)
-        raise LoadError, 'old cparse.so'
-      end
-      if Racc_No_Extensions
-        raise LoadError, 'selecting ruby version of racc runtime core'
-      end
-
-      Racc_Main_Parsing_Routine    = :_racc_do_parse_c # :nodoc:
-      Racc_YY_Parse_Method         = :_racc_yyparse_c # :nodoc:
-      Racc_Runtime_Core_Version    = Racc_Runtime_Core_Version_C # :nodoc:
-      Racc_Runtime_Type            = 'c' # :nodoc:
-    rescue LoadError
-      Racc_Main_Parsing_Routine    = :_racc_do_parse_rb
-      Racc_YY_Parse_Method         = :_racc_yyparse_rb
-      Racc_Runtime_Core_Version    = Racc_Runtime_Core_Version_R
-      Racc_Runtime_Type            = 'ruby'
-    end
-
-    def Parser.racc_runtime_type # :nodoc:
-      Racc_Runtime_Type
-    end
-
-    def _racc_setup
-      @yydebug = false unless self.class::Racc_debug_parser
-      @yydebug = false unless defined?(@yydebug)
-      if @yydebug
-        @racc_debug_out = $stderr unless defined?(@racc_debug_out)
-        @racc_debug_out ||= $stderr
-      end
-      arg = self.class::Racc_arg
-      arg[13] = true if arg.size < 14
-      arg
-    end
-
-    def _racc_init_sysvars
-      @racc_state  = [0]
-      @racc_tstack = []
-      @racc_vstack = []
-
-      @racc_t = nil
-      @racc_val = nil
-
-      @racc_read_next = true
-
-      @racc_user_yyerror = false
-      @racc_error_status = 0
-    end
-
-    # The entry point of the parser. This method is used with #next_token.
-    # If Racc wants to get token (and its value), calls next_token.
-    #
-    # Example:
-    #     def parse
-    #       @q = [[1,1],
-    #             [2,2],
-    #             [3,3],
-    #             [false, '$']]
-    #       do_parse
-    #     end
-    #
-    #     def next_token
-    #       @q.shift
-    #     end
-    class_eval <<~RUBY, __FILE__, __LINE__ + 1
-    def do_parse
-      #{Racc_Main_Parsing_Routine}(_racc_setup(), false)
-    end
-    RUBY
-
-    # The method to fetch next token.
-    # If you use #do_parse method, you must implement #next_token.
-    #
-    # The format of return value is [TOKEN_SYMBOL, VALUE].
-    # +token-symbol+ is represented by Ruby's symbol by default, e.g. :IDENT
-    # for 'IDENT'.  ";" (String) for ';'.
-    #
-    # The final symbol (End of file) must be false.
-    def next_token
-      raise NotImplementedError, "#{self.class}\#next_token is not defined"
-    end
-
-    def _racc_do_parse_rb(arg, in_debug)
-      action_table, action_check, action_default, action_pointer,
-      _,            _,            _,              _,
-      _,            _,            token_table,    * = arg
-
-      _racc_init_sysvars
-      tok = act = i = nil
-
-      catch(:racc_end_parse) {
-        while true
-          if i = action_pointer[@racc_state[-1]]
-            if @racc_read_next
-              if @racc_t != 0   # not EOF
-                tok, @racc_val = next_token()
-                unless tok      # EOF
-                  @racc_t = 0
-                else
-                  @racc_t = (token_table[tok] or 1)   # error token
-                end
-                racc_read_token(@racc_t, tok, @racc_val) if @yydebug
-                @racc_read_next = false
-              end
-            end
-            i += @racc_t
-            unless i >= 0 and
-                   act = action_table[i] and
-                   action_check[i] == @racc_state[-1]
-              act = action_default[@racc_state[-1]]
-            end
-          else
-            act = action_default[@racc_state[-1]]
-          end
-          while act = _racc_evalact(act, arg)
-            ;
-          end
-        end
-      }
-    end
-
-    # Another entry point for the parser.
-    # If you use this method, you must implement RECEIVER#METHOD_ID method.
-    #
-    # RECEIVER#METHOD_ID is a method to get next token.
-    # It must 'yield' the token, which format is [TOKEN-SYMBOL, VALUE].
-    class_eval <<~RUBY, __FILE__, __LINE__ + 1
-    def yyparse(recv, mid)
-      #{Racc_YY_Parse_Method}(recv, mid, _racc_setup(), false)
-    end
-    RUBY
-
-    def _racc_yyparse_rb(recv, mid, arg, c_debug)
-      action_table, action_check, action_default, action_pointer,
-      _,            _,            _,              _,
-      _,            _,            token_table,    * = arg
-
-      _racc_init_sysvars
-
-      catch(:racc_end_parse) {
-        until i = action_pointer[@racc_state[-1]]
-          while act = _racc_evalact(action_default[@racc_state[-1]], arg)
-            ;
-          end
-        end
-        recv.__send__(mid) do |tok, val|
-          unless tok
-            @racc_t = 0
-          else
-            @racc_t = (token_table[tok] or 1)   # error token
-          end
-          @racc_val = val
-          @racc_read_next = false
-
-          i += @racc_t
-          unless i >= 0 and
-                 act = action_table[i] and
-                 action_check[i] == @racc_state[-1]
-            act = action_default[@racc_state[-1]]
-          end
-          while act = _racc_evalact(act, arg)
-            ;
-          end
-
-          while !(i = action_pointer[@racc_state[-1]]) ||
-                ! @racc_read_next ||
-                @racc_t == 0  # $
-            unless i and i += @racc_t and
-                   i >= 0 and
-                   act = action_table[i] and
-                   action_check[i] == @racc_state[-1]
-              act = action_default[@racc_state[-1]]
-            end
-            while act = _racc_evalact(act, arg)
-              ;
-            end
-          end
-        end
-      }
-    end
-
-    ###
-    ### common
-    ###
-
-    def _racc_evalact(act, arg)
-      action_table, action_check, _, action_pointer,
-      _,            _,            _, _,
-      _,            _,            _, shift_n,
-      reduce_n,     * = arg
-      nerr = 0   # tmp
-
-      if act > 0 and act < shift_n
-        #
-        # shift
-        #
-        if @racc_error_status > 0
-          @racc_error_status -= 1 unless @racc_t <= 1 # error token or EOF
-        end
-        @racc_vstack.push @racc_val
-        @racc_state.push act
-        @racc_read_next = true
-        if @yydebug
-          @racc_tstack.push @racc_t
-          racc_shift @racc_t, @racc_tstack, @racc_vstack
-        end
-
-      elsif act < 0 and act > -reduce_n
-        #
-        # reduce
-        #
-        code = catch(:racc_jump) {
-          @racc_state.push _racc_do_reduce(arg, act)
-          false
-        }
-        if code
-          case code
-          when 1 # yyerror
-            @racc_user_yyerror = true   # user_yyerror
-            return -reduce_n
-          when 2 # yyaccept
-            return shift_n
-          else
-            raise '[Racc Bug] unknown jump code'
-          end
-        end
-
-      elsif act == shift_n
-        #
-        # accept
-        #
-        racc_accept if @yydebug
-        throw :racc_end_parse, @racc_vstack[0]
-
-      elsif act == -reduce_n
-        #
-        # error
-        #
-        case @racc_error_status
-        when 0
-          unless arg[21]    # user_yyerror
-            nerr += 1
-            on_error @racc_t, @racc_val, @racc_vstack
-          end
-        when 3
-          if @racc_t == 0   # is $
-            # We're at EOF, and another error occurred immediately after
-            # attempting auto-recovery
-            throw :racc_end_parse, nil
-          end
-          @racc_read_next = true
-        end
-        @racc_user_yyerror = false
-        @racc_error_status = 3
-        while true
-          if i = action_pointer[@racc_state[-1]]
-            i += 1   # error token
-            if  i >= 0 and
-                (act = action_table[i]) and
-                action_check[i] == @racc_state[-1]
-              break
-            end
-          end
-          throw :racc_end_parse, nil if @racc_state.size <= 1
-          @racc_state.pop
-          @racc_vstack.pop
-          if @yydebug
-            @racc_tstack.pop
-            racc_e_pop @racc_state, @racc_tstack, @racc_vstack
-          end
-        end
-        return act
-
-      else
-        raise "[Racc Bug] unknown action #{act.inspect}"
-      end
-
-      racc_next_state(@racc_state[-1], @racc_state) if @yydebug
-
-      nil
-    end
-
-    def _racc_do_reduce(arg, act)
-      _,          _,            _,            _,
-      goto_table, goto_check,   goto_default, goto_pointer,
-      nt_base,    reduce_table, _,            _,
-      _,          use_result,   * = arg
-
-      state = @racc_state
-      vstack = @racc_vstack
-      tstack = @racc_tstack
-
-      i = act * -3
-      len       = reduce_table[i]
-      reduce_to = reduce_table[i+1]
-      method_id = reduce_table[i+2]
-      void_array = []
-
-      tmp_t = tstack[-len, len] if @yydebug
-      tmp_v = vstack[-len, len]
-      tstack[-len, len] = void_array if @yydebug
-      vstack[-len, len] = void_array
-      state[-len, len]  = void_array
-
-      # tstack must be updated AFTER method call
-      if use_result
-        vstack.push __send__(method_id, tmp_v, vstack, tmp_v[0])
-      else
-        vstack.push __send__(method_id, tmp_v, vstack)
-      end
-      tstack.push reduce_to
-
-      racc_reduce(tmp_t, reduce_to, tstack, vstack) if @yydebug
-
-      k1 = reduce_to - nt_base
-      if i = goto_pointer[k1]
-        i += state[-1]
-        if i >= 0 and (curstate = goto_table[i]) and goto_check[i] == k1
-          return curstate
-        end
-      end
-      goto_default[k1]
-    end
-
-    # This method is called when a parse error is found.
-    #
-    # ERROR_TOKEN_ID is an internal ID of token which caused error.
-    # You can get string representation of this ID by calling
-    # #token_to_str.
-    #
-    # ERROR_VALUE is a value of error token.
-    #
-    # value_stack is a stack of symbol values.
-    # DO NOT MODIFY this object.
-    #
-    # This method raises ParseError by default.
-    #
-    # If this method returns, parsers enter "error recovering mode".
-    def on_error(t, val, vstack)
-      raise ParseError, sprintf("\nparse error on value %s (%s)",
-                                val.inspect, token_to_str(t) || '?')
-    end
-
-    # Enter error recovering mode.
-    # This method does not call #on_error.
-    def yyerror
-      throw :racc_jump, 1
-    end
-
-    # Exit parser.
-    # Return value is +Symbol_Value_Stack[0]+.
-    def yyaccept
-      throw :racc_jump, 2
-    end
-
-    # Leave error recovering mode.
-    def yyerrok
-      @racc_error_status = 0
-    end
-
-    # For debugging output
-    def racc_read_token(t, tok, val)
-      @racc_debug_out.print 'read    '
-      @racc_debug_out.print tok.inspect, '(', racc_token2str(t), ') '
-      @racc_debug_out.puts val.inspect
-      @racc_debug_out.puts
-    end
-
-    def racc_shift(tok, tstack, vstack)
-      @racc_debug_out.puts "shift   #{racc_token2str tok}"
-      racc_print_stacks tstack, vstack
-      @racc_debug_out.puts
-    end
-
-    def racc_reduce(toks, sim, tstack, vstack)
-      out = @racc_debug_out
-      out.print 'reduce '
-      if toks.empty?
-        out.print ' <none>'
-      else
-        toks.each {|t| out.print ' ', racc_token2str(t) }
-      end
-      out.puts " --> #{racc_token2str(sim)}"
-      racc_print_stacks tstack, vstack
-      @racc_debug_out.puts
-    end
-
-    def racc_accept
-      @racc_debug_out.puts 'accept'
-      @racc_debug_out.puts
-    end
-
-    def racc_e_pop(state, tstack, vstack)
-      @racc_debug_out.puts 'error recovering mode: pop token'
-      racc_print_states state
-      racc_print_stacks tstack, vstack
-      @racc_debug_out.puts
-    end
-
-    def racc_next_state(curstate, state)
-      @racc_debug_out.puts  "goto    #{curstate}"
-      racc_print_states state
-      @racc_debug_out.puts
-    end
-
-    def racc_print_stacks(t, v)
-      out = @racc_debug_out
-      out.print '        ['
-      t.each_index do |i|
-        out.print ' (', racc_token2str(t[i]), ' ', v[i].inspect, ')'
-      end
-      out.puts ' ]'
-    end
-
-    def racc_print_states(s)
-      out = @racc_debug_out
-      out.print '        ['
-      s.each {|st| out.print ' ', st }
-      out.puts ' ]'
-    end
-
-    def racc_token2str(tok)
-      self.class::Racc_token_to_s_table[tok] or
-          raise "[Racc Bug] can't convert token #{tok} to string"
-    end
-
-    # Convert internal ID of token symbol to the string.
-    def token_to_str(t)
-      self.class::Racc_token_to_s_table[t]
-    end
-
-  end
-
-end
-
-end
-###### racc/parser.rb end
-
-class RDoc::RD
-
-##
-# RD format parser for headings, paragraphs, lists, verbatim sections that
-# exist as blocks.
-
-class BlockParser < Racc::Parser
-
-
-# :stopdoc:
-
-MARK_TO_LEVEL = {
-  '='    => 1,
-  '=='   => 2,
-  '==='  => 3,
-  '====' => 4,
-  '+'    => 5,
-  '++'   => 6,
-}
-
-# :startdoc:
-
-##
-# Footnotes for this document
-
-attr_reader :footnotes
-
-##
-# Labels for items in this document
-
-attr_reader :labels
-
-##
-# Path to find included files in
-
-attr_accessor :include_path
-
-##
-# Creates a new RDoc::RD::BlockParser.  Use #parse to parse an rd-format
-# document.
-
-def initialize
-  @inline_parser = RDoc::RD::InlineParser.new self
-  @include_path = []
-
-  # for testing
-  @footnotes = []
-  @labels    = {}
-end
-
-##
-# Parses +src+ and returns an RDoc::Markup::Document.
-
-def parse src
-  @src = src
-  @src.push false
-
-  @footnotes = []
-  @labels    = {}
-
-  # @i: index(line no.) of src
-  @i = 0
-
-  # stack for current indentation
-  @indent_stack = []
-
-  # how indented.
-  @current_indent = @indent_stack.join("")
-
-  # RDoc::RD::BlockParser for tmp src
-  @subparser = nil
-
-  # which part is in now
-  @in_part = nil
-  @part_content = []
-
-  @in_verbatim = false
-
-  @yydebug = true
-
-  document = do_parse
-
-  unless @footnotes.empty? then
-    blankline = document.parts.pop
-
-    document.parts << RDoc::Markup::Rule.new(1)
-    document.parts.concat @footnotes
-
-    document.parts.push blankline
-  end
-
-  document
-end
-
-##
-# Returns the next token from the document
-
-def next_token # :nodoc:
-  # preprocessing
-  # if it is not in RD part
-  # => method
-  while @in_part != "rd"
-    line = @src[@i]
-    @i += 1 # next line
-
-    case line
-    # src end
-    when false
-      return [false, false]
-    # RD part begin
-    when /^=begin\s*(?:\bRD\b.*)?\s*$/
-      if @in_part # if in non-RD part
-        @part_content.push(line)
-      else
-        @in_part = "rd"
-        return [:WHITELINE, "=begin\n"] # <= for textblockand
-      end
-    # non-RD part begin
-    when /^=begin\s+(\w+)/
-      part = $1
-=begin # not imported to RDoc
-      if @in_part # if in non-RD part
-        @part_content.push(line)
-      else
-        @in_part = part if @tree.filter[part] # if filter exists
-#  p "BEGIN_PART: #{@in_part}" # DEBUG
-      end
-=end
-      @in_part = part
-    # non-RD part end
-    when /^=end(?:$|[\s\0\C-d\C-z])/
-      if @in_part # if in non-RD part
-=begin # not imported to RDoc
-#  p "END_PART: #{@in_part}" # DEBUG
-        # make Part-in object
-        part = RDoc::RD::Part.new(@part_content.join(""), @tree, "r")
-        @part_content.clear
-        # call filter, part_out is output(Part object)
-        part_out = @tree.filter[@in_part].call(part)
-
-        if @tree.filter[@in_part].mode == :rd # if output is RD formatted
-          subtree = parse_subtree(part_out.to_a)
-        else # if output is target formatted
-          basename = Tempfile.create(["rdtmp", ".#{@in_part}"], @tree.tmp_dir) do |tmpfile|
-            tmpfile.print(part_out)
-            File.basename(tmpfile.path)
-          end
-          subtree = parse_subtree(["=begin\n", "<<< #{basename}\n", "=end\n"])
-        end
-        @in_part = nil
-        return [:SUBTREE, subtree]
-=end
-      end
-    else
-=begin # not imported to RDoc
-      if @in_part # if in non-RD part
-        @part_content.push(line)
-      end
-=end
-    end
-  end
-
-  @current_indent = @indent_stack.join("")
-  line = @src[@i]
-  case line
-  when false
-    if_current_indent_equal("") do
-      [false, false]
-    end
-  when /^=end/
-    if_current_indent_equal("") do
-      @in_part = nil
-      [:WHITELINE, "=end"] # MUST CHANGE??
-    end
-  when /^\s*$/
-    @i += 1 # next line
-    return [:WHITELINE, ':WHITELINE']
-  when /^\#/  # comment line
-    @i += 1 # next line
-    self.next_token()
-  when /^(={1,4})(?!=)\s*(?=\S)/, /^(\+{1,2})(?!\+)\s*(?=\S)/
-    rest = $'                    # '
-    rest.strip!
-    mark = $1
-    if_current_indent_equal("") do
-      return [:HEADLINE, [MARK_TO_LEVEL[mark], rest]]
-    end
-  when /^<<<\s*(\S+)/
-    file = $1
-    if_current_indent_equal("") do
-      suffix = file[-3 .. -1]
-      if suffix == ".rd" or suffix == ".rb"
-        subtree = parse_subtree(get_included(file))
-        [:SUBTREE, subtree]
-      else
-        [:INCLUDE, file]
-      end
-    end
-  when /^(\s*)\*(\s*)/
-    rest = $'                   # '
-    newIndent = $2
-    if_current_indent_equal($1) do
-      if @in_verbatim
-        [:STRINGLINE, line]
-      else
-        @indent_stack.push("\s" + newIndent)
-        [:ITEMLISTLINE, rest]
-      end
-    end
-  when /^(\s*)(\(\d+\))(\s*)/
-    rest = $'                     # '
-    mark = $2
-    newIndent = $3
-    if_current_indent_equal($1) do
-      if @in_verbatim
-        [:STRINGLINE, line]
-      else
-        @indent_stack.push("\s" * mark.size + newIndent)
-        [:ENUMLISTLINE, rest]
-      end
-    end
-  when /^(\s*):(\s*)/
-    rest = $'                    # '
-    newIndent = $2
-    if_current_indent_equal($1) do
-      if @in_verbatim
-        [:STRINGLINE, line]
-      else
-        @indent_stack.push("\s#{$2}")
-        [:DESCLISTLINE, rest]
-      end
-    end
-  when /^(\s*)---(?!-|\s*$)/
-    indent = $1
-    rest = $'
-    /\s*/ === rest
-    term = $'
-    new_indent = $&
-    if_current_indent_equal(indent) do
-      if @in_verbatim
-        [:STRINGLINE, line]
-      else
-        @indent_stack.push("\s\s\s" + new_indent)
-        [:METHODLISTLINE, term]
-      end
-    end
-  when /^(\s*)/
-    if_current_indent_equal($1) do
-      [:STRINGLINE, line]
-    end
-  else
-    raise "[BUG] parsing error may occurred."
-  end
-end
-
-##
-# Yields to the given block if +indent+ matches the current indent, otherwise
-# an indentation token is processed.
-
-def if_current_indent_equal(indent)
-  indent = indent.sub(/\t/, "\s" * 8)
-  if @current_indent == indent
-    @i += 1 # next line
-    yield
-  elsif indent.index(@current_indent) == 0
-    @indent_stack.push(indent[@current_indent.size .. -1])
-    [:INDENT, ":INDENT"]
-  else
-    @indent_stack.pop
-    [:DEDENT, ":DEDENT"]
-  end
-end
-private :if_current_indent_equal
-
-##
-# Cuts off excess whitespace in +src+
-
-def cut_off(src)
-  ret = []
-  whiteline_buf = []
-
-  line = src.shift
-  /^\s*/ =~ line
-
-  indent = Regexp.quote($&)
-  ret.push($')
-
-  while line = src.shift
-    if /^(\s*)$/ =~ line
-      whiteline_buf.push(line)
-    elsif /^#{indent}/ =~ line
-      unless whiteline_buf.empty?
-        ret.concat(whiteline_buf)
-        whiteline_buf.clear
-      end
-      ret.push($')
-    else
-      raise "[BUG]: probably Parser Error while cutting off.\n"
-    end
-  end
-  ret
-end
-private :cut_off
-
-def set_term_to_element(parent, term)
-#  parent.set_term_under_document_struct(term, @tree.document_struct)
-  parent.set_term_without_document_struct(term)
-end
-private :set_term_to_element
-
-##
-# Raises a ParseError when invalid formatting is found
-
-def on_error(et, ev, _values)
-  prv, cur, nxt = format_line_num(@i, @i+1, @i+2)
-
-  raise ParseError, <<Msg
-
-RD syntax error: line #{@i+1}:
-  #{prv}  |#{@src[@i-1].chomp}
-  #{cur}=>|#{@src[@i].chomp}
-  #{nxt}  |#{@src[@i+1].chomp}
-
-Msg
-end
-
-##
-# Current line number
-
-def line_index
-  @i
-end
-
-##
-# Parses subtree +src+
-
-def parse_subtree src
-  @subparser ||= RDoc::RD::BlockParser.new
-
-  @subparser.parse src
-end
-private :parse_subtree
-
-##
-# Retrieves the content for +file+ from the include_path
-
-def get_included(file)
-  included = []
-
-  @include_path.each do |dir|
-    file_name = File.join dir, file
-
-    if File.exist? file_name then
-      included = File.readlines file_name
-      break
-    end
-  end
-
-  included
-end
-private :get_included
-
-##
-# Formats line numbers +line_numbers+ prettily
-
-def format_line_num(*line_numbers)
-  width = line_numbers.collect{|i| i.to_s.length }.max
-  line_numbers.collect{|i| sprintf("%#{width}d", i) }
-end
-private :format_line_num
-
-##
-# Retrieves the content of +values+ as a single String
-
-def content values
- values.map { |value| value.content }.join
-end
-
-##
-# Creates a paragraph for +value+
-
-def paragraph value
-  content = cut_off(value).join(' ').rstrip
-  contents = @inline_parser.parse content
-
-  RDoc::Markup::Paragraph.new(*contents)
-end
-
-##
-# Adds footnote +content+ to the document
-
-def add_footnote content
-  index = @footnotes.length / 2 + 1
-
-  footmark_link = "{^#{index}}[rdoc-label:footmark-#{index}:foottext-#{index}]"
-
-  @footnotes << RDoc::Markup::Paragraph.new(footmark_link, ' ', *content)
-  @footnotes << RDoc::Markup::BlankLine.new
-
-  index
-end
-
-##
-# Adds label +label+ to the document
-
-def add_label label
-  @labels[label] = true
-
-  label
-end
-
-# :stopdoc:
-
-##### State transition tables begin ###
-
-racc_action_table = [
-    34,    35,    30,    33,    40,    34,    35,    30,    33,    40,
-    65,    34,    35,    30,    33,    14,    73,    36,    38,    34,
-    15,    88,    34,    35,    30,    33,    14,     9,    10,    11,
-    12,    15,    34,    35,    30,    33,    14,     9,    10,    11,
-    12,    15,    34,    35,    30,    33,    35,    47,    30,    54,
-    33,    15,    34,    35,    30,    33,    54,    47,    14,    14,
-    59,    15,    34,    35,    30,    33,    14,    73,    67,    76,
-    77,    15,    34,    35,    30,    33,    14,    73,    54,    81,
-    38,    15,    34,    35,    30,    33,    14,    73,    38,    40,
-    83,    15,    34,    35,    30,    33,    14,    73,   nil,   nil,
-   nil,    15,    34,    35,    30,    33,    14,    73,   nil,   nil,
-   nil,    15,    34,    35,    30,    33,    14,    73,   nil,   nil,
-   nil,    15,    34,    35,    30,    33,    14,    73,   nil,   nil,
-   nil,    15,    34,    35,    30,    33,    14,    73,   nil,   nil,
-   nil,    15,    34,    35,    30,    33,    14,    73,    61,    63,
-   nil,    15,    14,    62,    60,    61,    63,    79,    61,    63,
-    62,    87,   nil,    62,    34,    35,    30,    33 ]
-
-racc_action_check = [
-    41,    41,    41,    41,    41,    15,    15,    15,    15,    15,
-    41,    86,    86,    86,    86,    86,    86,     1,    13,    22,
-    86,    86,     0,     0,     0,     0,     0,     0,     0,     0,
-     0,     0,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,    24,    24,    24,    24,    25,    24,    28,    30,
-    31,    24,    27,    27,    27,    27,    33,    27,    34,    35,
-    36,    27,    45,    45,    45,    45,    45,    45,    44,    49,
-    51,    45,    46,    46,    46,    46,    46,    46,    54,    56,
-    57,    46,    47,    47,    47,    47,    47,    47,    58,    62,
-    66,    47,    68,    68,    68,    68,    68,    68,   nil,   nil,
-   nil,    68,    74,    74,    74,    74,    74,    74,   nil,   nil,
-   nil,    74,    75,    75,    75,    75,    75,    75,   nil,   nil,
-   nil,    75,    78,    78,    78,    78,    78,    78,   nil,   nil,
-   nil,    78,    79,    79,    79,    79,    79,    79,   nil,   nil,
-   nil,    79,    85,    85,    85,    85,    85,    85,    39,    39,
-   nil,    85,    52,    39,    39,    82,    82,    52,    64,    64,
-    82,    82,   nil,    64,    20,    20,    20,    20 ]
-
-racc_action_pointer = [
-    19,    17,    29,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,    11,   nil,     2,   nil,   nil,   nil,   nil,
-   161,   nil,    16,   nil,    39,    42,   nil,    49,    43,   nil,
-    41,    44,   nil,    48,    51,    52,    60,   nil,   nil,   141,
-   nil,    -3,   nil,   nil,    55,    59,    69,    79,   nil,    56,
-   nil,    57,   145,   nil,    70,   nil,    66,    73,    81,   nil,
-   nil,   nil,    82,   nil,   151,   nil,    77,   nil,    89,   nil,
-   nil,   nil,   nil,   nil,    99,   109,   nil,   nil,   119,   129,
-   nil,   nil,   148,   nil,   nil,   139,     8,   nil,   nil ]
-
-racc_action_default = [
-    -2,   -73,    -1,    -4,    -5,    -6,    -7,    -8,    -9,   -10,
-   -11,   -12,   -13,   -14,   -16,   -73,   -23,   -24,   -25,   -26,
-   -27,   -31,   -32,   -34,   -72,   -36,   -38,   -72,   -40,   -42,
-   -59,   -44,   -46,   -59,   -63,   -65,   -73,    -3,   -15,   -73,
-   -22,   -73,   -30,   -33,   -73,   -69,   -70,   -71,   -37,   -73,
-   -41,   -73,   -51,   -58,   -61,   -45,   -73,   -62,   -64,    89,
-   -17,   -19,   -73,   -21,   -18,   -28,   -73,   -35,   -66,   -53,
-   -54,   -55,   -56,   -57,   -67,   -68,   -39,   -43,   -49,   -73,
-   -60,   -47,   -73,   -29,   -52,   -48,   -73,   -20,   -50 ]
-
-racc_goto_table = [
-     4,    39,     4,    68,    74,    75,     5,     6,     5,     6,
-    44,    42,    51,    49,     3,    56,    37,    57,    58,     1,
-     2,    66,    84,    41,    43,    48,    50,    64,    84,    84,
-    45,    46,    42,    45,    46,    55,    85,    86,    80,    84,
-    84,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    82,   nil,
-   nil,   nil,    78 ]
-
-racc_goto_check = [
-     4,    10,     4,    31,    31,    31,     5,     6,     5,     6,
-    21,    12,    27,    21,     3,    27,     3,     9,     9,     1,
-     2,    11,    32,    17,    19,    23,    26,    10,    32,    32,
-     5,     6,    12,     5,     6,    29,    31,    31,    33,    32,
-    32,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    10,   nil,
-   nil,   nil,     4 ]
-
-racc_goto_pointer = [
-   nil,    19,    20,    14,     0,     6,     7,   nil,   nil,   -17,
-   -14,   -20,    -9,   nil,   nil,   nil,   nil,     8,   nil,     2,
-   nil,   -14,   nil,     0,   nil,   nil,    -2,   -18,   nil,     4,
-   nil,   -42,   -46,   -16 ]
-
-racc_goto_default = [
-   nil,   nil,   nil,   nil,    70,    71,    72,     7,     8,    13,
-   nil,   nil,    21,    16,    17,    18,    19,    20,    22,    23,
-    24,   nil,    25,    26,    27,    28,    29,   nil,    31,    32,
-    52,   nil,    69,    53 ]
-
-racc_reduce_table = [
-  0, 0, :racc_error,
-  1, 15, :_reduce_1,
-  0, 15, :_reduce_2,
-  2, 16, :_reduce_3,
-  1, 16, :_reduce_4,
-  1, 17, :_reduce_5,
-  1, 17, :_reduce_6,
-  1, 17, :_reduce_none,
-  1, 17, :_reduce_8,
-  1, 17, :_reduce_9,
-  1, 17, :_reduce_10,
-  1, 17, :_reduce_11,
-  1, 21, :_reduce_12,
-  1, 22, :_reduce_13,
-  1, 18, :_reduce_14,
-  2, 23, :_reduce_15,
-  1, 23, :_reduce_16,
-  3, 19, :_reduce_17,
-  1, 25, :_reduce_18,
-  2, 24, :_reduce_19,
-  4, 24, :_reduce_20,
-  2, 24, :_reduce_21,
-  1, 24, :_reduce_22,
-  1, 26, :_reduce_none,
-  1, 26, :_reduce_none,
-  1, 26, :_reduce_none,
-  1, 26, :_reduce_none,
-  1, 20, :_reduce_27,
-  3, 20, :_reduce_28,
-  4, 20, :_reduce_29,
-  2, 31, :_reduce_30,
-  1, 31, :_reduce_31,
-  1, 27, :_reduce_32,
-  2, 32, :_reduce_33,
-  1, 32, :_reduce_34,
-  3, 33, :_reduce_35,
-  1, 28, :_reduce_36,
-  2, 36, :_reduce_37,
-  1, 36, :_reduce_38,
-  3, 37, :_reduce_39,
-  1, 29, :_reduce_40,
-  2, 39, :_reduce_41,
-  1, 39, :_reduce_42,
-  3, 40, :_reduce_43,
-  1, 30, :_reduce_44,
-  2, 42, :_reduce_45,
-  1, 42, :_reduce_46,
-  3, 43, :_reduce_47,
-  3, 41, :_reduce_48,
-  2, 41, :_reduce_49,
-  4, 41, :_reduce_50,
-  1, 41, :_reduce_51,
-  2, 45, :_reduce_52,
-  1, 45, :_reduce_none,
-  1, 46, :_reduce_54,
-  1, 46, :_reduce_55,
-  1, 46, :_reduce_none,
-  1, 46, :_reduce_57,
-  1, 44, :_reduce_none,
-  0, 44, :_reduce_none,
-  2, 47, :_reduce_none,
-  1, 47, :_reduce_none,
-  2, 34, :_reduce_62,
-  1, 34, :_reduce_63,
-  2, 38, :_reduce_64,
-  1, 38, :_reduce_65,
-  2, 35, :_reduce_66,
-  2, 35, :_reduce_67,
-  2, 35, :_reduce_68,
-  1, 35, :_reduce_69,
-  1, 35, :_reduce_none,
-  1, 35, :_reduce_71,
-  0, 35, :_reduce_72 ]
-
-racc_reduce_n = 73
-
-racc_shift_n = 89
-
-racc_token_table = {
-  false => 0,
-  :error => 1,
-  :DUMMY => 2,
-  :ITEMLISTLINE => 3,
-  :ENUMLISTLINE => 4,
-  :DESCLISTLINE => 5,
-  :METHODLISTLINE => 6,
-  :STRINGLINE => 7,
-  :WHITELINE => 8,
-  :SUBTREE => 9,
-  :HEADLINE => 10,
-  :INCLUDE => 11,
-  :INDENT => 12,
-  :DEDENT => 13 }
-
-racc_nt_base = 14
-
-racc_use_result_var = true
-
-Racc_arg = [
-  racc_action_table,
-  racc_action_check,
-  racc_action_default,
-  racc_action_pointer,
-  racc_goto_table,
-  racc_goto_check,
-  racc_goto_default,
-  racc_goto_pointer,
-  racc_nt_base,
-  racc_reduce_table,
-  racc_token_table,
-  racc_shift_n,
-  racc_reduce_n,
-  racc_use_result_var ]
-Ractor.make_shareable(Racc_arg) if defined?(Ractor)
-
-Racc_token_to_s_table = [
-  "$end",
-  "error",
-  "DUMMY",
-  "ITEMLISTLINE",
-  "ENUMLISTLINE",
-  "DESCLISTLINE",
-  "METHODLISTLINE",
-  "STRINGLINE",
-  "WHITELINE",
-  "SUBTREE",
-  "HEADLINE",
-  "INCLUDE",
-  "INDENT",
-  "DEDENT",
-  "$start",
-  "document",
-  "blocks",
-  "block",
-  "textblock",
-  "verbatim",
-  "lists",
-  "headline",
-  "include",
-  "textblockcontent",
-  "verbatimcontent",
-  "verbatim_after_lists",
-  "list",
-  "itemlist",
-  "enumlist",
-  "desclist",
-  "methodlist",
-  "lists2",
-  "itemlistitems",
-  "itemlistitem",
-  "first_textblock_in_itemlist",
-  "other_blocks_in_list",
-  "enumlistitems",
-  "enumlistitem",
-  "first_textblock_in_enumlist",
-  "desclistitems",
-  "desclistitem",
-  "description_part",
-  "methodlistitems",
-  "methodlistitem",
-  "whitelines",
-  "blocks_in_list",
-  "block_in_list",
-  "whitelines2" ]
-Ractor.make_shareable(Racc_token_to_s_table) if defined?(Ractor)
-
-Racc_debug_parser = false
-
-##### State transition tables end #####
-
-# reduce 0 omitted
-
-def _reduce_1(val, _values, result)
- result = RDoc::Markup::Document.new(*val[0])
-    result
-end
-
-def _reduce_2(val, _values, result)
- raise ParseError, "file empty"
-    result
-end
-
-def _reduce_3(val, _values, result)
- result = val[0].concat val[1]
-    result
-end
-
-def _reduce_4(val, _values, result)
- result = val[0]
-    result
-end
-
-def _reduce_5(val, _values, result)
- result = val
-    result
-end
-
-def _reduce_6(val, _values, result)
- result = val
-    result
-end
-
-# reduce 7 omitted
-
-def _reduce_8(val, _values, result)
- result = val
-    result
-end
-
-def _reduce_9(val, _values, result)
- result = val
-    result
-end
-
-def _reduce_10(val, _values, result)
- result = [RDoc::Markup::BlankLine.new]
-    result
-end
-
-def _reduce_11(val, _values, result)
- result = val[0].parts
-    result
-end
-
-def _reduce_12(val, _values, result)
-      # val[0] is like [level, title]
-      title = @inline_parser.parse(val[0][1])
-      result = RDoc::Markup::Heading.new(val[0][0], title)
-
-    result
-end
-
-def _reduce_13(val, _values, result)
-      result = RDoc::Markup::Include.new val[0], @include_path
-
-    result
-end
-
-def _reduce_14(val, _values, result)
-      # val[0] is Array of String
-      result = paragraph val[0]
-
-    result
-end
-
-def _reduce_15(val, _values, result)
- result << val[1].rstrip
-    result
-end
-
-def _reduce_16(val, _values, result)
- result = [val[0].rstrip]
-    result
-end
-
-def _reduce_17(val, _values, result)
-      # val[1] is Array of String
-      content = cut_off val[1]
-      result = RDoc::Markup::Verbatim.new(*content)
-
-      # imform to lexer.
-      @in_verbatim = false
-
-    result
-end
-
-def _reduce_18(val, _values, result)
-      # val[0] is Array of String
-      content = cut_off val[0]
-      result = RDoc::Markup::Verbatim.new(*content)
-
-      # imform to lexer.
-      @in_verbatim = false
-
-    result
-end
-
-def _reduce_19(val, _values, result)
-      result << val[1]
-
-    result
-end
-
-def _reduce_20(val, _values, result)
-      result.concat val[2]
-
-    result
-end
-
-def _reduce_21(val, _values, result)
-      result << "\n"
-
-    result
-end
-
-def _reduce_22(val, _values, result)
-      result = val
-      # inform to lexer.
-      @in_verbatim = true
-
-    result
-end
-
-# reduce 23 omitted
-
-# reduce 24 omitted
-
-# reduce 25 omitted
-
-# reduce 26 omitted
-
-def _reduce_27(val, _values, result)
-      result = val[0]
-
-    result
-end
-
-def _reduce_28(val, _values, result)
-      result = val[1]
-
-    result
-end
-
-def _reduce_29(val, _values, result)
-      result = val[1].push(val[2])
-
-    result
-end
-
-def _reduce_30(val, _values, result)
- result = val[0] << val[1]
-    result
-end
-
-def _reduce_31(val, _values, result)
- result = [val[0]]
-    result
-end
-
-def _reduce_32(val, _values, result)
-      result = RDoc::Markup::List.new :BULLET, *val[0]
-
-    result
-end
-
-def _reduce_33(val, _values, result)
- result.push(val[1])
-    result
-end
-
-def _reduce_34(val, _values, result)
- result = val
-    result
-end
-
-def _reduce_35(val, _values, result)
-      result = RDoc::Markup::ListItem.new nil, val[0], *val[1]
-
-    result
-end
-
-def _reduce_36(val, _values, result)
-      result = RDoc::Markup::List.new :NUMBER, *val[0]
-
-    result
-end
-
-def _reduce_37(val, _values, result)
- result.push(val[1])
-    result
-end
-
-def _reduce_38(val, _values, result)
- result = val
-    result
-end
-
-def _reduce_39(val, _values, result)
-      result = RDoc::Markup::ListItem.new nil, val[0], *val[1]
-
-    result
-end
-
-def _reduce_40(val, _values, result)
-      result = RDoc::Markup::List.new :NOTE, *val[0]
-
-    result
-end
-
-def _reduce_41(val, _values, result)
- result.push(val[1])
-    result
-end
-
-def _reduce_42(val, _values, result)
- result = val
-    result
-end
-
-def _reduce_43(val, _values, result)
-      term = @inline_parser.parse val[0].strip
-
-      result = RDoc::Markup::ListItem.new term, *val[1]
-
-    result
-end
-
-def _reduce_44(val, _values, result)
-      result = RDoc::Markup::List.new :LABEL, *val[0]
-
-    result
-end
-
-def _reduce_45(val, _values, result)
- result.push(val[1])
-    result
-end
-
-def _reduce_46(val, _values, result)
- result = val
-    result
-end
-
-def _reduce_47(val, _values, result)
-      result = RDoc::Markup::ListItem.new "<tt>#{val[0].strip}</tt>", *val[1]
-
-    result
-end
-
-def _reduce_48(val, _values, result)
-      result = [val[1]].concat(val[2])
-
-    result
-end
-
-def _reduce_49(val, _values, result)
-      result = [val[1]]
-
-    result
-end
-
-def _reduce_50(val, _values, result)
-      result = val[2]
-
-    result
-end
-
-def _reduce_51(val, _values, result)
-      result = []
-
-    result
-end
-
-def _reduce_52(val, _values, result)
- result.concat val[1]
-    result
-end
-
-# reduce 53 omitted
-
-def _reduce_54(val, _values, result)
- result = val
-    result
-end
-
-def _reduce_55(val, _values, result)
- result = val
-    result
-end
-
-# reduce 56 omitted
-
-def _reduce_57(val, _values, result)
- result = []
-    result
-end
-
-# reduce 58 omitted
-
-# reduce 59 omitted
-
-# reduce 60 omitted
-
-# reduce 61 omitted
-
-def _reduce_62(val, _values, result)
-      result = paragraph [val[0]].concat(val[1])
-
-    result
-end
-
-def _reduce_63(val, _values, result)
-      result = paragraph [val[0]]
-
-    result
-end
-
-def _reduce_64(val, _values, result)
-      result = paragraph [val[0]].concat(val[1])
-
-    result
-end
-
-def _reduce_65(val, _values, result)
-      result = paragraph [val[0]]
-
-    result
-end
-
-def _reduce_66(val, _values, result)
-      result = [val[0]].concat(val[1])
-
-    result
-end
-
-def _reduce_67(val, _values, result)
- result.concat val[1]
-    result
-end
-
-def _reduce_68(val, _values, result)
- result = val[1]
-    result
-end
-
-def _reduce_69(val, _values, result)
- result = val
-    result
-end
-
-# reduce 70 omitted
-
-def _reduce_71(val, _values, result)
- result = []
-    result
-end
-
-def _reduce_72(val, _values, result)
- result = []
-    result
-end
-
-def _reduce_none(val, _values, result)
-  val[0]
-end
-
-end   # class BlockParser
-
-end
diff --git a/lib/rdoc/rd/inline.rb b/lib/rdoc/rd/inline.rb
deleted file mode 100644
index 77d88b2860470b..00000000000000
--- a/lib/rdoc/rd/inline.rb
+++ /dev/null
@@ -1,71 +0,0 @@
-# frozen_string_literal: true
-##
-# Inline keeps track of markup and labels to create proper links.
-
-class RDoc::RD::Inline
-
-  ##
-  # The text of the reference
-
-  attr_reader :reference
-
-  ##
-  # The markup of this reference in RDoc format
-
-  attr_reader :rdoc
-
-  ##
-  # Creates a new Inline for +rdoc+ and +reference+.
-  #
-  # +rdoc+ may be another Inline or a String.  If +reference+ is not given it
-  # will use the text from +rdoc+.
-
-  def self.new rdoc, reference = rdoc
-    if self === rdoc and reference.equal? rdoc then
-      rdoc
-    else
-      super
-    end
-  end
-
-  ##
-  # Initializes the Inline with +rdoc+ and +inline+
-
-  def initialize rdoc, reference # :not-new:
-    @reference = reference.equal?(rdoc) ? reference.dup : reference
-
-    # unpack
-    @reference = @reference.reference if self.class === @reference
-    @rdoc      = rdoc
-  end
-
-  def == other # :nodoc:
-    self.class === other and
-      @reference == other.reference and @rdoc == other.rdoc
-  end
-
-  ##
-  # Appends +more+ to this inline.  +more+ may be a String or another Inline.
-
-  def append more
-    case more
-    when String then
-      @reference += more
-      @rdoc      += more
-    when RDoc::RD::Inline then
-      @reference += more.reference
-      @rdoc      += more.rdoc
-    else
-      raise "unknown thingy #{more}"
-    end
-
-    self
-  end
-
-  def inspect # :nodoc:
-    "(inline: #{self})"
-  end
-
-  alias to_s rdoc # :nodoc:
-
-end
diff --git a/lib/rdoc/rd/inline_parser.rb b/lib/rdoc/rd/inline_parser.rb
deleted file mode 100644
index d454cb52fd8991..00000000000000
--- a/lib/rdoc/rd/inline_parser.rb
+++ /dev/null
@@ -1,1868 +0,0 @@
-# frozen_string_literal: true
-#
-# DO NOT MODIFY!!!!
-# This file is automatically generated by Racc 1.7.1
-# from Racc grammar file "".
-#
-
-###### racc/parser.rb begin
-unless $".find {|p| p.end_with?('/racc/parser.rb')}
-$".push "#{__dir__}/racc/parser.rb"
-# frozen_string_literal: false
-#--
-# Copyright (c) 1999-2006 Minero Aoki
-#
-# This program is free software.
-# You can distribute/modify this program under the same terms of ruby.
-#
-# As a special exception, when this code is copied by Racc
-# into a Racc output file, you may use that output file
-# without restriction.
-#++
-
-unless $".find {|p| p.end_with?('/racc/info.rb')}
-$".push "#{__dir__}/racc/info.rb"
-#--
-#
-#
-#
-# Copyright (c) 1999-2006 Minero Aoki
-#
-# 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.7.1'
-  Version = VERSION
-  Copyright = 'Copyright (c) 1999-2006 Minero Aoki'
-end
-
-end
-
-
-unless defined?(NotImplementedError)
-  NotImplementedError = NotImplementError # :nodoc:
-end
-
-module Racc
-  class ParseError < StandardError; end
-end
-unless defined?(::ParseError)
-  ParseError = Racc::ParseError # :nodoc:
-end
-
-# Racc is a LALR(1) parser generator.
-# It is written in Ruby itself, and generates Ruby programs.
-#
-# == Command-line Reference
-#
-#     racc [-o<var>filename</var>] [--output-file=<var>filename</var>]
-#          [-e<var>rubypath</var>] [--executable=<var>rubypath</var>]
-#          [-v] [--verbose]
-#          [-O<var>filename</var>] [--log-file=<var>filename</var>]
-#          [-g] [--debug]
-#          [-E] [--embedded]
-#          [-l] [--no-line-convert]
-#          [-c] [--line-convert-all]
-#          [-a] [--no-omit-actions]
-#          [-C] [--check-only]
-#          [-S] [--output-status]
-#          [--version] [--copyright] [--help] <var>grammarfile</var>
-#
-# [+grammarfile+]
-#   Racc grammar file. Any extension is permitted.
-# [-o+outfile+, --output-file=+outfile+]
-#   A filename for output. default is <+filename+>.tab.rb
-# [-O+filename+, --log-file=+filename+]
-#   Place logging output in file +filename+.
-#   Default log file name is <+filename+>.output.
-# [-e+rubypath+, --executable=+rubypath+]
-#   output executable file(mode 755). where +path+ is the Ruby interpreter.
-# [-v, --verbose]
-#   verbose mode. create +filename+.output file, like yacc's y.output file.
-# [-g, --debug]
-#   add debug code to parser class. To display debuggin information,
-#   use this '-g' option and set @yydebug true in parser class.
-# [-E, --embedded]
-#   Output parser which doesn't need runtime files (racc/parser.rb).
-# [-C, --check-only]
-#   Check syntax of racc grammar file and quit.
-# [-S, --output-status]
-#   Print messages time to time while compiling.
-# [-l, --no-line-convert]
-#   turns off line number converting.
-# [-c, --line-convert-all]
-#   Convert line number of actions, inner, header and footer.
-# [-a, --no-omit-actions]
-#   Call all actions, even if an action is empty.
-# [--version]
-#   print Racc version and quit.
-# [--copyright]
-#   Print copyright and quit.
-# [--help]
-#   Print usage and quit.
-#
-# == Generating Parser Using Racc
-#
-# To compile Racc grammar file, simply type:
-#
-#   $ racc parse.y
-#
-# This creates Ruby script file "parse.tab.y". The -o option can change the output filename.
-#
-# == Writing A Racc Grammar File
-#
-# If you want your own parser, you have to write a grammar file.
-# A grammar file contains the name of your parser class, grammar for the parser,
-# user code, and anything else.
-# When writing a grammar file, yacc's knowledge is helpful.
-# If you have not used yacc before, Racc is not too difficult.
-#
-# Here's an example Racc grammar file.
-#
-#   class Calcparser
-#   rule
-#     target: exp { print val[0] }
-#
-#     exp: exp '+' exp
-#        | exp '*' exp
-#        | '(' exp ')'
-#        | NUMBER
-#   end
-#
-# Racc grammar files resemble yacc files.
-# But (of course), this is Ruby code.
-# yacc's $$ is the 'result', $0, $1... is
-# an array called 'val', and $-1, $-2... is an array called '_values'.
-#
-# See the {Grammar File Reference}[rdoc-ref:lib/racc/rdoc/grammar.en.rdoc] for
-# more information on grammar files.
-#
-# == Parser
-#
-# Then you must prepare the parse entry method. There are two types of
-# parse methods in Racc, Racc::Parser#do_parse and Racc::Parser#yyparse
-#
-# Racc::Parser#do_parse is simple.
-#
-# It's yyparse() of yacc, and Racc::Parser#next_token is yylex().
-# This method must returns an array like [TOKENSYMBOL, ITS_VALUE].
-# EOF is [false, false].
-# (TOKENSYMBOL is a Ruby symbol (taken from String#intern) by default.
-# If you want to change this, see the grammar reference.
-#
-# Racc::Parser#yyparse is little complicated, but useful.
-# It does not use Racc::Parser#next_token, instead it gets tokens from any iterator.
-#
-# For example, <code>yyparse(obj, :scan)</code> causes
-# calling +obj#scan+, and you can return tokens by yielding them from +obj#scan+.
-#
-# == Debugging
-#
-# When debugging, "-v" or/and the "-g" option is helpful.
-#
-# "-v" creates verbose log file (.output).
-# "-g" creates a "Verbose Parser".
-# Verbose Parser prints the internal status when parsing.
-# But it's _not_ automatic.
-# You must use -g option and set +@yydebug+ to +true+ in order to get output.
-# -g option only creates the verbose parser.
-#
-# === Racc reported syntax error.
-#
-# Isn't there too many "end"?
-# grammar of racc file is changed in v0.10.
-#
-# Racc does not use '%' mark, while yacc uses huge number of '%' marks..
-#
-# === Racc reported "XXXX conflicts".
-#
-# Try "racc -v xxxx.y".
-# It causes producing racc's internal log file, xxxx.output.
-#
-# === Generated parsers does not work correctly
-#
-# Try "racc -g xxxx.y".
-# This command let racc generate "debugging parser".
-# Then set @yydebug=true in your parser.
-# It produces a working log of your parser.
-#
-# == Re-distributing Racc runtime
-#
-# A parser, which is created by Racc, requires the Racc runtime module;
-# racc/parser.rb.
-#
-# Ruby 1.8.x comes with Racc runtime module,
-# you need NOT distribute Racc runtime files.
-#
-# If you want to include the Racc runtime module with your parser.
-# This can be done by using '-E' option:
-#
-#   $ racc -E -omyparser.rb myparser.y
-#
-# This command creates myparser.rb which `includes' Racc runtime.
-# Only you must do is to distribute your parser file (myparser.rb).
-#
-# Note: parser.rb is ruby license, but your parser is not.
-# Your own parser is completely yours.
-module Racc
-
-  unless defined?(Racc_No_Extensions)
-    Racc_No_Extensions = false # :nodoc:
-  end
-
-  class Parser
-
-    Racc_Runtime_Version = ::Racc::VERSION
-    Racc_Runtime_Core_Version_R = ::Racc::VERSION
-
-    begin
-      if Object.const_defined?(:RUBY_ENGINE) and RUBY_ENGINE == 'jruby'
-        require 'jruby'
-        require 'racc/cparse-jruby.jar'
-        com.headius.racc.Cparse.new.load(JRuby.runtime, false)
-      else
-        require 'racc/cparse'
-      end
-
-      unless new.respond_to?(:_racc_do_parse_c, true)
-        raise LoadError, 'old cparse.so'
-      end
-      if Racc_No_Extensions
-        raise LoadError, 'selecting ruby version of racc runtime core'
-      end
-
-      Racc_Main_Parsing_Routine    = :_racc_do_parse_c # :nodoc:
-      Racc_YY_Parse_Method         = :_racc_yyparse_c # :nodoc:
-      Racc_Runtime_Core_Version    = Racc_Runtime_Core_Version_C # :nodoc:
-      Racc_Runtime_Type            = 'c' # :nodoc:
-    rescue LoadError
-      Racc_Main_Parsing_Routine    = :_racc_do_parse_rb
-      Racc_YY_Parse_Method         = :_racc_yyparse_rb
-      Racc_Runtime_Core_Version    = Racc_Runtime_Core_Version_R
-      Racc_Runtime_Type            = 'ruby'
-    end
-
-    def Parser.racc_runtime_type # :nodoc:
-      Racc_Runtime_Type
-    end
-
-    def _racc_setup
-      @yydebug = false unless self.class::Racc_debug_parser
-      @yydebug = false unless defined?(@yydebug)
-      if @yydebug
-        @racc_debug_out = $stderr unless defined?(@racc_debug_out)
-        @racc_debug_out ||= $stderr
-      end
-      arg = self.class::Racc_arg
-      arg[13] = true if arg.size < 14
-      arg
-    end
-
-    def _racc_init_sysvars
-      @racc_state  = [0]
-      @racc_tstack = []
-      @racc_vstack = []
-
-      @racc_t = nil
-      @racc_val = nil
-
-      @racc_read_next = true
-
-      @racc_user_yyerror = false
-      @racc_error_status = 0
-    end
-
-    # The entry point of the parser. This method is used with #next_token.
-    # If Racc wants to get token (and its value), calls next_token.
-    #
-    # Example:
-    #     def parse
-    #       @q = [[1,1],
-    #             [2,2],
-    #             [3,3],
-    #             [false, '$']]
-    #       do_parse
-    #     end
-    #
-    #     def next_token
-    #       @q.shift
-    #     end
-    class_eval <<~RUBY, __FILE__, __LINE__ + 1
-    def do_parse
-      #{Racc_Main_Parsing_Routine}(_racc_setup(), false)
-    end
-    RUBY
-
-    # The method to fetch next token.
-    # If you use #do_parse method, you must implement #next_token.
-    #
-    # The format of return value is [TOKEN_SYMBOL, VALUE].
-    # +token-symbol+ is represented by Ruby's symbol by default, e.g. :IDENT
-    # for 'IDENT'.  ";" (String) for ';'.
-    #
-    # The final symbol (End of file) must be false.
-    def next_token
-      raise NotImplementedError, "#{self.class}\#next_token is not defined"
-    end
-
-    def _racc_do_parse_rb(arg, in_debug)
-      action_table, action_check, action_default, action_pointer,
-      _,            _,            _,              _,
-      _,            _,            token_table,    * = arg
-
-      _racc_init_sysvars
-      tok = act = i = nil
-
-      catch(:racc_end_parse) {
-        while true
-          if i = action_pointer[@racc_state[-1]]
-            if @racc_read_next
-              if @racc_t != 0   # not EOF
-                tok, @racc_val = next_token()
-                unless tok      # EOF
-                  @racc_t = 0
-                else
-                  @racc_t = (token_table[tok] or 1)   # error token
-                end
-                racc_read_token(@racc_t, tok, @racc_val) if @yydebug
-                @racc_read_next = false
-              end
-            end
-            i += @racc_t
-            unless i >= 0 and
-                   act = action_table[i] and
-                   action_check[i] == @racc_state[-1]
-              act = action_default[@racc_state[-1]]
-            end
-          else
-            act = action_default[@racc_state[-1]]
-          end
-          while act = _racc_evalact(act, arg)
-            ;
-          end
-        end
-      }
-    end
-
-    # Another entry point for the parser.
-    # If you use this method, you must implement RECEIVER#METHOD_ID method.
-    #
-    # RECEIVER#METHOD_ID is a method to get next token.
-    # It must 'yield' the token, which format is [TOKEN-SYMBOL, VALUE].
-    class_eval <<~RUBY, __FILE__, __LINE__ + 1
-    def yyparse(recv, mid)
-      #{Racc_YY_Parse_Method}(recv, mid, _racc_setup(), false)
-    end
-    RUBY
-
-    def _racc_yyparse_rb(recv, mid, arg, c_debug)
-      action_table, action_check, action_default, action_pointer,
-      _,            _,            _,              _,
-      _,            _,            token_table,    * = arg
-
-      _racc_init_sysvars
-
-      catch(:racc_end_parse) {
-        until i = action_pointer[@racc_state[-1]]
-          while act = _racc_evalact(action_default[@racc_state[-1]], arg)
-            ;
-          end
-        end
-        recv.__send__(mid) do |tok, val|
-          unless tok
-            @racc_t = 0
-          else
-            @racc_t = (token_table[tok] or 1)   # error token
-          end
-          @racc_val = val
-          @racc_read_next = false
-
-          i += @racc_t
-          unless i >= 0 and
-                 act = action_table[i] and
-                 action_check[i] == @racc_state[-1]
-            act = action_default[@racc_state[-1]]
-          end
-          while act = _racc_evalact(act, arg)
-            ;
-          end
-
-          while !(i = action_pointer[@racc_state[-1]]) ||
-                ! @racc_read_next ||
-                @racc_t == 0  # $
-            unless i and i += @racc_t and
-                   i >= 0 and
-                   act = action_table[i] and
-                   action_check[i] == @racc_state[-1]
-              act = action_default[@racc_state[-1]]
-            end
-            while act = _racc_evalact(act, arg)
-              ;
-            end
-          end
-        end
-      }
-    end
-
-    ###
-    ### common
-    ###
-
-    def _racc_evalact(act, arg)
-      action_table, action_check, _, action_pointer,
-      _,            _,            _, _,
-      _,            _,            _, shift_n,
-      reduce_n,     * = arg
-      nerr = 0   # tmp
-
-      if act > 0 and act < shift_n
-        #
-        # shift
-        #
-        if @racc_error_status > 0
-          @racc_error_status -= 1 unless @racc_t <= 1 # error token or EOF
-        end
-        @racc_vstack.push @racc_val
-        @racc_state.push act
-        @racc_read_next = true
-        if @yydebug
-          @racc_tstack.push @racc_t
-          racc_shift @racc_t, @racc_tstack, @racc_vstack
-        end
-
-      elsif act < 0 and act > -reduce_n
-        #
-        # reduce
-        #
-        code = catch(:racc_jump) {
-          @racc_state.push _racc_do_reduce(arg, act)
-          false
-        }
-        if code
-          case code
-          when 1 # yyerror
-            @racc_user_yyerror = true   # user_yyerror
-            return -reduce_n
-          when 2 # yyaccept
-            return shift_n
-          else
-            raise '[Racc Bug] unknown jump code'
-          end
-        end
-
-      elsif act == shift_n
-        #
-        # accept
-        #
-        racc_accept if @yydebug
-        throw :racc_end_parse, @racc_vstack[0]
-
-      elsif act == -reduce_n
-        #
-        # error
-        #
-        case @racc_error_status
-        when 0
-          unless arg[21]    # user_yyerror
-            nerr += 1
-            on_error @racc_t, @racc_val, @racc_vstack
-          end
-        when 3
-          if @racc_t == 0   # is $
-            # We're at EOF, and another error occurred immediately after
-            # attempting auto-recovery
-            throw :racc_end_parse, nil
-          end
-          @racc_read_next = true
-        end
-        @racc_user_yyerror = false
-        @racc_error_status = 3
-        while true
-          if i = action_pointer[@racc_state[-1]]
-            i += 1   # error token
-            if  i >= 0 and
-                (act = action_table[i]) and
-                action_check[i] == @racc_state[-1]
-              break
-            end
-          end
-          throw :racc_end_parse, nil if @racc_state.size <= 1
-          @racc_state.pop
-          @racc_vstack.pop
-          if @yydebug
-            @racc_tstack.pop
-            racc_e_pop @racc_state, @racc_tstack, @racc_vstack
-          end
-        end
-        return act
-
-      else
-        raise "[Racc Bug] unknown action #{act.inspect}"
-      end
-
-      racc_next_state(@racc_state[-1], @racc_state) if @yydebug
-
-      nil
-    end
-
-    def _racc_do_reduce(arg, act)
-      _,          _,            _,            _,
-      goto_table, goto_check,   goto_default, goto_pointer,
-      nt_base,    reduce_table, _,            _,
-      _,          use_result,   * = arg
-
-      state = @racc_state
-      vstack = @racc_vstack
-      tstack = @racc_tstack
-
-      i = act * -3
-      len       = reduce_table[i]
-      reduce_to = reduce_table[i+1]
-      method_id = reduce_table[i+2]
-      void_array = []
-
-      tmp_t = tstack[-len, len] if @yydebug
-      tmp_v = vstack[-len, len]
-      tstack[-len, len] = void_array if @yydebug
-      vstack[-len, len] = void_array
-      state[-len, len]  = void_array
-
-      # tstack must be updated AFTER method call
-      if use_result
-        vstack.push __send__(method_id, tmp_v, vstack, tmp_v[0])
-      else
-        vstack.push __send__(method_id, tmp_v, vstack)
-      end
-      tstack.push reduce_to
-
-      racc_reduce(tmp_t, reduce_to, tstack, vstack) if @yydebug
-
-      k1 = reduce_to - nt_base
-      if i = goto_pointer[k1]
-        i += state[-1]
-        if i >= 0 and (curstate = goto_table[i]) and goto_check[i] == k1
-          return curstate
-        end
-      end
-      goto_default[k1]
-    end
-
-    # This method is called when a parse error is found.
-    #
-    # ERROR_TOKEN_ID is an internal ID of token which caused error.
-    # You can get string representation of this ID by calling
-    # #token_to_str.
-    #
-    # ERROR_VALUE is a value of error token.
-    #
-    # value_stack is a stack of symbol values.
-    # DO NOT MODIFY this object.
-    #
-    # This method raises ParseError by default.
-    #
-    # If this method returns, parsers enter "error recovering mode".
-    def on_error(t, val, vstack)
-      raise ParseError, sprintf("\nparse error on value %s (%s)",
-                                val.inspect, token_to_str(t) || '?')
-    end
-
-    # Enter error recovering mode.
-    # This method does not call #on_error.
-    def yyerror
-      throw :racc_jump, 1
-    end
-
-    # Exit parser.
-    # Return value is +Symbol_Value_Stack[0]+.
-    def yyaccept
-      throw :racc_jump, 2
-    end
-
-    # Leave error recovering mode.
-    def yyerrok
-      @racc_error_status = 0
-    end
-
-    # For debugging output
-    def racc_read_token(t, tok, val)
-      @racc_debug_out.print 'read    '
-      @racc_debug_out.print tok.inspect, '(', racc_token2str(t), ') '
-      @racc_debug_out.puts val.inspect
-      @racc_debug_out.puts
-    end
-
-    def racc_shift(tok, tstack, vstack)
-      @racc_debug_out.puts "shift   #{racc_token2str tok}"
-      racc_print_stacks tstack, vstack
-      @racc_debug_out.puts
-    end
-
-    def racc_reduce(toks, sim, tstack, vstack)
-      out = @racc_debug_out
-      out.print 'reduce '
-      if toks.empty?
-        out.print ' <none>'
-      else
-        toks.each {|t| out.print ' ', racc_token2str(t) }
-      end
-      out.puts " --> #{racc_token2str(sim)}"
-      racc_print_stacks tstack, vstack
-      @racc_debug_out.puts
-    end
-
-    def racc_accept
-      @racc_debug_out.puts 'accept'
-      @racc_debug_out.puts
-    end
-
-    def racc_e_pop(state, tstack, vstack)
-      @racc_debug_out.puts 'error recovering mode: pop token'
-      racc_print_states state
-      racc_print_stacks tstack, vstack
-      @racc_debug_out.puts
-    end
-
-    def racc_next_state(curstate, state)
-      @racc_debug_out.puts  "goto    #{curstate}"
-      racc_print_states state
-      @racc_debug_out.puts
-    end
-
-    def racc_print_stacks(t, v)
-      out = @racc_debug_out
-      out.print '        ['
-      t.each_index do |i|
-        out.print ' (', racc_token2str(t[i]), ' ', v[i].inspect, ')'
-      end
-      out.puts ' ]'
-    end
-
-    def racc_print_states(s)
-      out = @racc_debug_out
-      out.print '        ['
-      s.each {|st| out.print ' ', st }
-      out.puts ' ]'
-    end
-
-    def racc_token2str(tok)
-      self.class::Racc_token_to_s_table[tok] or
-          raise "[Racc Bug] can't convert token #{tok} to string"
-    end
-
-    # Convert internal ID of token symbol to the string.
-    def token_to_str(t)
-      self.class::Racc_token_to_s_table[t]
-    end
-
-  end
-
-end
-
-end
-###### racc/parser.rb end
-
-require 'strscan'
-
-class RDoc::RD
-
-##
-# RD format parser for inline markup such as emphasis, links, footnotes, etc.
-
-class InlineParser < Racc::Parser
-
-
-# :stopdoc:
-
-EM_OPEN = '((*'
-EM_OPEN_RE = /\A#{Regexp.quote(EM_OPEN)}/
-EM_CLOSE = '*))'
-EM_CLOSE_RE = /\A#{Regexp.quote(EM_CLOSE)}/
-CODE_OPEN = '(({'
-CODE_OPEN_RE = /\A#{Regexp.quote(CODE_OPEN)}/
-CODE_CLOSE = '}))'
-CODE_CLOSE_RE = /\A#{Regexp.quote(CODE_CLOSE)}/
-VAR_OPEN = '((|'
-VAR_OPEN_RE = /\A#{Regexp.quote(VAR_OPEN)}/
-VAR_CLOSE = '|))'
-VAR_CLOSE_RE = /\A#{Regexp.quote(VAR_CLOSE)}/
-KBD_OPEN = '((%'
-KBD_OPEN_RE = /\A#{Regexp.quote(KBD_OPEN)}/
-KBD_CLOSE = '%))'
-KBD_CLOSE_RE = /\A#{Regexp.quote(KBD_CLOSE)}/
-INDEX_OPEN = '((:'
-INDEX_OPEN_RE = /\A#{Regexp.quote(INDEX_OPEN)}/
-INDEX_CLOSE = ':))'
-INDEX_CLOSE_RE = /\A#{Regexp.quote(INDEX_CLOSE)}/
-REF_OPEN = '((<'
-REF_OPEN_RE = /\A#{Regexp.quote(REF_OPEN)}/
-REF_CLOSE = '>))'
-REF_CLOSE_RE = /\A#{Regexp.quote(REF_CLOSE)}/
-FOOTNOTE_OPEN = '((-'
-FOOTNOTE_OPEN_RE = /\A#{Regexp.quote(FOOTNOTE_OPEN)}/
-FOOTNOTE_CLOSE = '-))'
-FOOTNOTE_CLOSE_RE = /\A#{Regexp.quote(FOOTNOTE_CLOSE)}/
-VERB_OPEN = "(('"
-VERB_OPEN_RE = /\A#{Regexp.quote(VERB_OPEN)}/
-VERB_CLOSE = "'))"
-VERB_CLOSE_RE = /\A#{Regexp.quote(VERB_CLOSE)}/
-
-BAR = "|"
-BAR_RE = /\A#{Regexp.quote(BAR)}/
-QUOTE = '"'
-QUOTE_RE = /\A#{Regexp.quote(QUOTE)}/
-SLASH = "/"
-SLASH_RE = /\A#{Regexp.quote(SLASH)}/
-BACK_SLASH = "\\"
-BACK_SLASH_RE = /\A#{Regexp.quote(BACK_SLASH)}/
-URL = "URL:"
-URL_RE = /\A#{Regexp.quote(URL)}/
-
-other_re_mode = Regexp::EXTENDED
-other_re_mode |= Regexp::MULTILINE
-
-OTHER_RE = Regexp.new(
-  "\\A.+?(?=#{Regexp.quote(EM_OPEN)}|#{Regexp.quote(EM_CLOSE)}|
-              #{Regexp.quote(CODE_OPEN)}|#{Regexp.quote(CODE_CLOSE)}|
-              #{Regexp.quote(VAR_OPEN)}|#{Regexp.quote(VAR_CLOSE)}|
-              #{Regexp.quote(KBD_OPEN)}|#{Regexp.quote(KBD_CLOSE)}|
-              #{Regexp.quote(INDEX_OPEN)}|#{Regexp.quote(INDEX_CLOSE)}|
-              #{Regexp.quote(REF_OPEN)}|#{Regexp.quote(REF_CLOSE)}|
-            #{Regexp.quote(FOOTNOTE_OPEN)}|#{Regexp.quote(FOOTNOTE_CLOSE)}|
-              #{Regexp.quote(VERB_OPEN)}|#{Regexp.quote(VERB_CLOSE)}|
-              #{Regexp.quote(BAR)}|
-              #{Regexp.quote(QUOTE)}|
-              #{Regexp.quote(SLASH)}|
-              #{Regexp.quote(BACK_SLASH)}|
-              #{Regexp.quote(URL)})", other_re_mode)
-
-# :startdoc:
-
-##
-# Creates a new parser for inline markup in the rd format.  The +block_parser+
-# is used to for footnotes and labels in the inline text.
-
-def initialize block_parser
-  @block_parser = block_parser
-end
-
-##
-# Parses the +inline+ text from RD format into RDoc format.
-
-def parse inline
-  @inline = inline
-  @src = StringScanner.new inline
-  @pre = "".dup
-  @yydebug = true
-  do_parse.to_s
-end
-
-##
-# Returns the next token from the inline text
-
-def next_token
-  return [false, false] if @src.eos?
-#  p @src.rest if @yydebug
-  if ret = @src.scan(EM_OPEN_RE)
-    @pre << ret
-    [:EM_OPEN, ret]
-  elsif ret = @src.scan(EM_CLOSE_RE)
-    @pre << ret
-    [:EM_CLOSE, ret]
-  elsif ret = @src.scan(CODE_OPEN_RE)
-    @pre << ret
-    [:CODE_OPEN, ret]
-  elsif ret = @src.scan(CODE_CLOSE_RE)
-    @pre << ret
-    [:CODE_CLOSE, ret]
-  elsif ret = @src.scan(VAR_OPEN_RE)
-    @pre << ret
-    [:VAR_OPEN, ret]
-  elsif ret = @src.scan(VAR_CLOSE_RE)
-    @pre << ret
-    [:VAR_CLOSE, ret]
-  elsif ret = @src.scan(KBD_OPEN_RE)
-    @pre << ret
-    [:KBD_OPEN, ret]
-  elsif ret = @src.scan(KBD_CLOSE_RE)
-    @pre << ret
-    [:KBD_CLOSE, ret]
-  elsif ret = @src.scan(INDEX_OPEN_RE)
-    @pre << ret
-    [:INDEX_OPEN, ret]
-  elsif ret = @src.scan(INDEX_CLOSE_RE)
-    @pre << ret
-    [:INDEX_CLOSE, ret]
-  elsif ret = @src.scan(REF_OPEN_RE)
-    @pre << ret
-    [:REF_OPEN, ret]
-  elsif ret = @src.scan(REF_CLOSE_RE)
-    @pre << ret
-    [:REF_CLOSE, ret]
-  elsif ret = @src.scan(FOOTNOTE_OPEN_RE)
-    @pre << ret
-    [:FOOTNOTE_OPEN, ret]
-  elsif ret = @src.scan(FOOTNOTE_CLOSE_RE)
-    @pre << ret
-    [:FOOTNOTE_CLOSE, ret]
-  elsif ret = @src.scan(VERB_OPEN_RE)
-    @pre << ret
-    [:VERB_OPEN, ret]
-  elsif ret = @src.scan(VERB_CLOSE_RE)
-    @pre << ret
-    [:VERB_CLOSE, ret]
-  elsif ret = @src.scan(BAR_RE)
-    @pre << ret
-    [:BAR, ret]
-  elsif ret = @src.scan(QUOTE_RE)
-    @pre << ret
-    [:QUOTE, ret]
-  elsif ret = @src.scan(SLASH_RE)
-    @pre << ret
-    [:SLASH, ret]
-  elsif ret = @src.scan(BACK_SLASH_RE)
-    @pre << ret
-    [:BACK_SLASH, ret]
-  elsif ret = @src.scan(URL_RE)
-    @pre << ret
-    [:URL, ret]
-  elsif ret = @src.scan(OTHER_RE)
-    @pre << ret
-    [:OTHER, ret]
-  else
-    ret = @src.rest
-    @pre << ret
-    @src.terminate
-    [:OTHER, ret]
-  end
-end
-
-##
-# Raises a ParseError when invalid formatting is found
-
-def on_error(et, ev, values)
-  lines_of_rest = @src.rest.lines.to_a.length
-  prev_words = prev_words_on_error(ev)
-  at = 4 + prev_words.length
-
-  message = <<-MSG
-RD syntax error: line #{@block_parser.line_index - lines_of_rest}:
-...#{prev_words} #{(ev||'')} #{next_words_on_error()} ...
-  MSG
-
-  message << " " * at + "^" * (ev ? ev.length : 0) + "\n"
-  raise ParseError, message
-end
-
-##
-# Returns words before the error
-
-def prev_words_on_error(ev)
-  pre = @pre
-  if ev and /#{Regexp.quote(ev)}$/ =~ pre
-    pre = $`
-  end
-  last_line(pre)
-end
-
-##
-# Returns the last line of +src+
-
-def last_line(src)
-  if n = src.rindex("\n")
-    src[(n+1) .. -1]
-  else
-    src
-  end
-end
-private :last_line
-
-##
-# Returns words following an error
-
-def next_words_on_error
-  if n = @src.rest.index("\n")
-    @src.rest[0 .. (n-1)]
-  else
-    @src.rest
-  end
-end
-
-##
-# Creates a new RDoc::RD::Inline for the +rdoc+ markup and the raw +reference+
-
-def inline rdoc, reference = rdoc
-  RDoc::RD::Inline.new rdoc, reference
-end
-
-# :stopdoc:
-##### State transition tables begin ###
-
-racc_action_table = [
-   104,   103,   102,   100,   101,    99,   115,   116,   117,    29,
-   105,   106,   107,   108,   109,   110,   111,   112,   113,   114,
-    84,   118,   119,    63,    64,    65,    61,    81,    62,    76,
-    78,    79,    85,    66,    67,    68,    69,    70,    71,    72,
-    73,    74,    75,    77,    80,   149,    63,    64,    65,   153,
-    81,    62,    76,    78,    79,    86,    66,    67,    68,    69,
-    70,    71,    72,    73,    74,    75,    77,    80,   152,   104,
-   103,   102,   100,   101,    99,   115,   116,   117,    87,   105,
-   106,   107,   108,   109,   110,   111,   112,   113,   114,    88,
-   118,   119,   104,   103,   102,   100,   101,    99,   115,   116,
-   117,    89,   105,   106,   107,   108,   109,   110,   111,   112,
-   113,   114,    96,   118,   119,   104,   103,   102,   100,   101,
-    99,   115,   116,   117,   124,   105,   106,   107,   108,   109,
-   110,   111,   112,   113,   114,   137,   118,   119,    22,    23,
-    24,    25,    26,    21,    18,    19,   176,   177,    13,   148,
-    14,   154,    15,   137,    16,   161,    17,   164,   173,    20,
-    22,    23,    24,    25,    26,    21,    18,    19,   175,   177,
-    13,   nil,    14,   nil,    15,   nil,    16,   nil,    17,   nil,
-   nil,    20,    22,    23,    24,    25,    26,    21,    18,    19,
-   nil,   nil,    13,   nil,    14,   nil,    15,   nil,    16,   nil,
-    17,   nil,   nil,    20,    22,    23,    24,    25,    26,    21,
-    18,    19,   nil,   nil,    13,   nil,    14,   nil,    15,   nil,
-    16,   nil,    17,   nil,   nil,    20,    22,    23,    24,    25,
-    26,    21,    18,    19,   nil,   nil,    13,   nil,    14,   nil,
-    15,   nil,    16,   nil,    17,   nil,   nil,    20,    22,    23,
-    24,    25,    26,    21,    18,    19,   nil,   nil,    13,   nil,
-    14,   nil,    15,   nil,    16,   nil,    17,   nil,   nil,    20,
-    22,    23,    24,    25,    26,    21,    18,    19,   nil,   nil,
-    13,   nil,    14,   nil,    15,   nil,    16,   nil,    17,    42,
-   nil,    20,    54,    38,    53,    55,    56,    57,   nil,    13,
-   nil,    14,   nil,    15,   nil,    16,   nil,    17,   nil,   nil,
-    20,    22,    23,    24,    25,    26,    21,    18,    19,   nil,
-   nil,    13,   nil,    14,   nil,    15,   nil,    16,   nil,    17,
-   nil,   nil,    20,    63,    64,    65,    61,    81,    62,    76,
-    78,    79,   nil,    66,    67,    68,    69,    70,    71,    72,
-    73,    74,    75,    77,    80,   122,   nil,   nil,    54,   nil,
-    53,    55,    56,    57,   nil,    13,   nil,    14,   nil,    15,
-   nil,    16,   nil,    17,   145,   nil,    20,    54,   133,    53,
-    55,    56,    57,   nil,    13,   nil,    14,   nil,    15,   nil,
-    16,   nil,    17,   145,   nil,    20,    54,   133,    53,    55,
-    56,    57,   nil,    13,   nil,    14,   nil,    15,   nil,    16,
-   nil,    17,   145,   nil,    20,    54,   133,    53,    55,    56,
-    57,   nil,    13,   nil,    14,   nil,    15,   nil,    16,   nil,
-    17,   145,   nil,    20,    54,   133,    53,    55,    56,    57,
-   nil,    13,   nil,    14,   nil,    15,   nil,    16,   nil,    17,
-   nil,   nil,    20,   135,   136,    54,   133,    53,    55,    56,
-    57,   nil,    13,   nil,    14,   nil,    15,   nil,    16,   nil,
-    17,   nil,   nil,    20,   135,   136,    54,   133,    53,    55,
-    56,    57,   nil,    13,   nil,    14,   nil,    15,   nil,    16,
-   nil,    17,   nil,   nil,    20,   135,   136,    54,   133,    53,
-    55,    56,    57,   nil,    13,   nil,    14,   nil,    15,   nil,
-    16,   nil,    17,    95,   nil,    20,    54,    91,    53,    55,
-    56,    57,   145,   nil,   nil,    54,   133,    53,    55,    56,
-    57,   158,   nil,   nil,    54,   nil,    53,    55,    56,    57,
-   165,   135,   136,    54,   133,    53,    55,    56,    57,   145,
-   nil,   nil,    54,   133,    53,    55,    56,    57,   172,   135,
-   136,    54,   133,    53,    55,    56,    57,   174,   135,   136,
-    54,   133,    53,    55,    56,    57,   178,   135,   136,    54,
-   133,    53,    55,    56,    57,   135,   136,    54,   133,    53,
-    55,    56,    57,   135,   136,    54,   133,    53,    55,    56,
-    57,   135,   136,    54,   133,    53,    55,    56,    57,    22,
-    23,    24,    25,    26,    21 ]
-
-racc_action_check = [
-    38,    38,    38,    38,    38,    38,    38,    38,    38,     1,
-    38,    38,    38,    38,    38,    38,    38,    38,    38,    38,
-    29,    38,    38,    59,    59,    59,    59,    59,    59,    59,
-    59,    59,    31,    59,    59,    59,    59,    59,    59,    59,
-    59,    59,    59,    59,    59,    59,    61,    61,    61,    61,
-    61,    61,    61,    61,    61,    32,    61,    61,    61,    61,
-    61,    61,    61,    61,    61,    61,    61,    61,    61,    91,
-    91,    91,    91,    91,    91,    91,    91,    91,    33,    91,
-    91,    91,    91,    91,    91,    91,    91,    91,    91,    34,
-    91,    91,    97,    97,    97,    97,    97,    97,    97,    97,
-    97,    35,    97,    97,    97,    97,    97,    97,    97,    97,
-    97,    97,    37,    97,    97,   155,   155,   155,   155,   155,
-   155,   155,   155,   155,    41,   155,   155,   155,   155,   155,
-   155,   155,   155,   155,   155,    43,   155,   155,     0,     0,
-     0,     0,     0,     0,     0,     0,   165,   165,     0,    58,
-     0,    90,     0,    94,     0,   100,     0,   125,   162,     0,
-     2,     2,     2,     2,     2,     2,     2,     2,   164,   172,
-     2,   nil,     2,   nil,     2,   nil,     2,   nil,     2,   nil,
-   nil,     2,    13,    13,    13,    13,    13,    13,    13,    13,
-   nil,   nil,    13,   nil,    13,   nil,    13,   nil,    13,   nil,
-    13,   nil,   nil,    13,    14,    14,    14,    14,    14,    14,
-    14,    14,   nil,   nil,    14,   nil,    14,   nil,    14,   nil,
-    14,   nil,    14,   nil,   nil,    14,    15,    15,    15,    15,
-    15,    15,    15,    15,   nil,   nil,    15,   nil,    15,   nil,
-    15,   nil,    15,   nil,    15,   nil,   nil,    15,    16,    16,
-    16,    16,    16,    16,    16,    16,   nil,   nil,    16,   nil,
-    16,   nil,    16,   nil,    16,   nil,    16,   nil,   nil,    16,
-    17,    17,    17,    17,    17,    17,    17,    17,   nil,   nil,
-    17,   nil,    17,   nil,    17,   nil,    17,   nil,    17,    18,
-   nil,    17,    18,    18,    18,    18,    18,    18,   nil,    18,
-   nil,    18,   nil,    18,   nil,    18,   nil,    18,   nil,   nil,
-    18,    19,    19,    19,    19,    19,    19,    19,    19,   nil,
-   nil,    19,   nil,    19,   nil,    19,   nil,    19,   nil,    19,
-   nil,   nil,    19,    20,    20,    20,    20,    20,    20,    20,
-    20,    20,   nil,    20,    20,    20,    20,    20,    20,    20,
-    20,    20,    20,    20,    20,    39,   nil,   nil,    39,   nil,
-    39,    39,    39,    39,   nil,    39,   nil,    39,   nil,    39,
-   nil,    39,   nil,    39,    44,   nil,    39,    44,    44,    44,
-    44,    44,    44,   nil,    44,   nil,    44,   nil,    44,   nil,
-    44,   nil,    44,    45,   nil,    44,    45,    45,    45,    45,
-    45,    45,   nil,    45,   nil,    45,   nil,    45,   nil,    45,
-   nil,    45,   138,   nil,    45,   138,   138,   138,   138,   138,
-   138,   nil,   138,   nil,   138,   nil,   138,   nil,   138,   nil,
-   138,   146,   nil,   138,   146,   146,   146,   146,   146,   146,
-   nil,   146,   nil,   146,   nil,   146,   nil,   146,   nil,   146,
-   nil,   nil,   146,    42,    42,    42,    42,    42,    42,    42,
-    42,   nil,    42,   nil,    42,   nil,    42,   nil,    42,   nil,
-    42,   nil,   nil,    42,   122,   122,   122,   122,   122,   122,
-   122,   122,   nil,   122,   nil,   122,   nil,   122,   nil,   122,
-   nil,   122,   nil,   nil,   122,   127,   127,   127,   127,   127,
-   127,   127,   127,   nil,   127,   nil,   127,   nil,   127,   nil,
-   127,   nil,   127,    36,   nil,   127,    36,    36,    36,    36,
-    36,    36,    52,   nil,   nil,    52,    52,    52,    52,    52,
-    52,    92,   nil,   nil,    92,   nil,    92,    92,    92,    92,
-   126,   126,   126,   126,   126,   126,   126,   126,   126,   142,
-   nil,   nil,   142,   142,   142,   142,   142,   142,   159,   159,
-   159,   159,   159,   159,   159,   159,   159,   163,   163,   163,
-   163,   163,   163,   163,   163,   163,   171,   171,   171,   171,
-   171,   171,   171,   171,   171,    95,    95,    95,    95,    95,
-    95,    95,    95,   158,   158,   158,   158,   158,   158,   158,
-   158,   168,   168,   168,   168,   168,   168,   168,   168,    27,
-    27,    27,    27,    27,    27 ]
-
-racc_action_pointer = [
-   135,     9,   157,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   179,   201,   223,   245,   267,   286,   308,
-   330,   nil,   nil,   nil,   nil,   nil,   nil,   606,   nil,    20,
-   nil,    18,    39,    60,    69,    79,   510,    89,    -3,   352,
-   nil,   120,   449,   130,   371,   390,   nil,   nil,   nil,   nil,
-   nil,   nil,   519,   nil,   nil,   nil,   nil,   nil,   138,    20,
-   nil,    43,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   128,    66,   528,   nil,   148,   581,   nil,    89,   nil,   nil,
-   149,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   470,   nil,   nil,   154,   537,   491,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   409,   nil,
-   nil,   nil,   546,   nil,   nil,   nil,   428,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   112,   nil,   nil,   589,   555,
-   nil,   nil,   155,   564,   164,   142,   nil,   nil,   597,   nil,
-   nil,   573,   164,   nil,   nil,   nil,   nil,   nil,   nil ]
-
-racc_action_default = [
-  -138,  -138,    -1,    -3,    -4,    -5,    -6,    -7,    -8,    -9,
-   -10,   -11,   -12,  -138,  -138,  -138,  -138,  -138,  -138,  -138,
-  -138,  -103,  -104,  -105,  -106,  -107,  -108,  -111,  -110,  -138,
-    -2,  -138,  -138,  -138,  -138,  -138,  -138,  -138,  -138,   -27,
-   -26,   -35,  -138,   -58,   -41,   -40,   -47,   -48,   -49,   -50,
-   -51,   -52,   -63,   -66,   -67,   -68,   -69,   -70,  -138,  -138,
-  -112,  -138,  -116,  -117,  -118,  -119,  -120,  -121,  -122,  -123,
-  -124,  -125,  -126,  -127,  -128,  -129,  -130,  -131,  -132,  -133,
-  -134,  -135,  -137,  -109,   179,   -13,   -14,   -15,   -16,   -17,
-  -138,  -138,   -23,   -22,   -33,  -138,   -19,   -24,   -79,   -80,
-  -138,   -82,   -83,   -84,   -85,   -86,   -87,   -88,   -89,   -90,
-   -91,   -92,   -93,   -94,   -95,   -96,   -97,   -98,   -99,  -100,
-   -25,   -35,  -138,   -58,   -28,  -138,   -59,   -42,   -46,   -55,
-   -56,   -65,   -71,   -72,   -75,   -76,   -77,   -31,   -38,   -44,
-   -53,   -54,   -57,   -61,   -73,   -74,   -39,   -62,  -101,  -102,
-  -136,  -113,  -114,  -115,   -18,   -20,   -21,   -33,  -138,  -138,
-   -78,   -81,  -138,   -59,   -36,   -37,   -64,   -45,   -59,   -43,
-   -60,  -138,   -34,   -36,   -37,   -29,   -30,   -32,   -34 ]
-
-racc_goto_table = [
-   126,    44,   125,    43,   144,   144,   160,    93,    97,    52,
-   166,    82,   144,    40,    41,    39,   138,   146,   169,    30,
-    36,    94,    44,     1,   123,   129,   169,    52,    90,    37,
-    52,   167,   147,    92,   120,   121,    31,    32,    33,    34,
-    35,   170,    58,   166,    59,    83,   170,   166,   151,   nil,
-   150,   nil,   166,   159,     4,   166,     4,   nil,   nil,   nil,
-   nil,   155,   nil,   156,   160,   nil,   nil,     4,     4,     4,
-     4,     4,   nil,     4,     5,   nil,     5,   157,   nil,   nil,
-   163,   nil,   162,    52,   nil,   168,   nil,     5,     5,     5,
-     5,     5,   nil,     5,   nil,   nil,   nil,   nil,   144,   nil,
-   nil,   nil,   144,   nil,   nil,   129,   144,   144,   nil,     6,
-   129,     6,   nil,   nil,   nil,   nil,   171,     7,   nil,     7,
-   nil,   nil,     6,     6,     6,     6,     6,     8,     6,     8,
-     7,     7,     7,     7,     7,    11,     7,    11,   nil,   nil,
-     8,     8,     8,     8,     8,   nil,     8,   nil,    11,    11,
-    11,    11,    11,   nil,    11 ]
-
-racc_goto_check = [
-    22,    24,    21,    23,    36,    36,    37,    18,    16,    34,
-    35,    41,    36,    19,    20,    17,    25,    25,    28,     3,
-    13,    23,    24,     1,    23,    24,    28,    34,    14,    15,
-    34,    29,    32,    17,    19,    20,     1,     1,     1,     1,
-     1,    33,     1,    35,    38,    39,    33,    35,    42,   nil,
-    41,   nil,    35,    22,     4,    35,     4,   nil,   nil,   nil,
-   nil,    16,   nil,    18,    37,   nil,   nil,     4,     4,     4,
-     4,     4,   nil,     4,     5,   nil,     5,    23,   nil,   nil,
-    22,   nil,    21,    34,   nil,    22,   nil,     5,     5,     5,
-     5,     5,   nil,     5,   nil,   nil,   nil,   nil,    36,   nil,
-   nil,   nil,    36,   nil,   nil,    24,    36,    36,   nil,     6,
-    24,     6,   nil,   nil,   nil,   nil,    22,     7,   nil,     7,
-   nil,   nil,     6,     6,     6,     6,     6,     8,     6,     8,
-     7,     7,     7,     7,     7,    11,     7,    11,   nil,   nil,
-     8,     8,     8,     8,     8,   nil,     8,   nil,    11,    11,
-    11,    11,    11,   nil,    11 ]
-
-racc_goto_pointer = [
-   nil,    23,   nil,    17,    54,    74,   109,   117,   127,   nil,
-   nil,   135,   nil,     2,    -8,    11,   -30,    -3,   -29,    -5,
-    -4,   -40,   -42,   -15,   -17,   -28,   nil,   nil,  -120,   -96,
-   nil,   nil,   -20,  -101,    -9,  -116,   -40,   -91,    24,    18,
-   nil,    -9,   -13 ]
-
-racc_goto_default = [
-   nil,   nil,     2,     3,    46,    47,    48,    49,    50,     9,
-    10,    51,    12,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   140,   nil,    45,   127,   139,   128,
-   141,   130,   142,   143,   132,   131,   134,    98,   nil,    28,
-    27,   nil,    60 ]
-
-racc_reduce_table = [
-  0, 0, :racc_error,
-  1, 27, :_reduce_none,
-  2, 28, :_reduce_2,
-  1, 28, :_reduce_3,
-  1, 29, :_reduce_none,
-  1, 29, :_reduce_none,
-  1, 29, :_reduce_none,
-  1, 29, :_reduce_none,
-  1, 29, :_reduce_none,
-  1, 29, :_reduce_none,
-  1, 29, :_reduce_none,
-  1, 29, :_reduce_none,
-  1, 29, :_reduce_none,
-  3, 30, :_reduce_13,
-  3, 31, :_reduce_14,
-  3, 32, :_reduce_15,
-  3, 33, :_reduce_16,
-  3, 34, :_reduce_17,
-  4, 35, :_reduce_18,
-  3, 35, :_reduce_19,
-  2, 40, :_reduce_20,
-  2, 40, :_reduce_21,
-  1, 40, :_reduce_22,
-  1, 40, :_reduce_23,
-  2, 41, :_reduce_24,
-  2, 41, :_reduce_25,
-  1, 41, :_reduce_26,
-  1, 41, :_reduce_27,
-  2, 39, :_reduce_none,
-  4, 39, :_reduce_29,
-  4, 39, :_reduce_30,
-  2, 43, :_reduce_31,
-  4, 43, :_reduce_32,
-  1, 44, :_reduce_33,
-  3, 44, :_reduce_34,
-  1, 45, :_reduce_none,
-  3, 45, :_reduce_36,
-  3, 45, :_reduce_37,
-  2, 46, :_reduce_38,
-  2, 46, :_reduce_39,
-  1, 46, :_reduce_40,
-  1, 46, :_reduce_41,
-  1, 47, :_reduce_none,
-  2, 51, :_reduce_43,
-  1, 51, :_reduce_44,
-  2, 53, :_reduce_45,
-  1, 53, :_reduce_46,
-  1, 50, :_reduce_none,
-  1, 50, :_reduce_none,
-  1, 50, :_reduce_none,
-  1, 50, :_reduce_none,
-  1, 50, :_reduce_none,
-  1, 50, :_reduce_none,
-  1, 54, :_reduce_none,
-  1, 54, :_reduce_none,
-  1, 55, :_reduce_none,
-  1, 55, :_reduce_none,
-  1, 56, :_reduce_57,
-  1, 52, :_reduce_58,
-  1, 57, :_reduce_59,
-  2, 58, :_reduce_60,
-  1, 58, :_reduce_none,
-  2, 49, :_reduce_62,
-  1, 49, :_reduce_none,
-  2, 48, :_reduce_64,
-  1, 48, :_reduce_none,
-  1, 60, :_reduce_none,
-  1, 60, :_reduce_none,
-  1, 60, :_reduce_none,
-  1, 60, :_reduce_none,
-  1, 60, :_reduce_none,
-  1, 62, :_reduce_none,
-  1, 62, :_reduce_none,
-  1, 59, :_reduce_none,
-  1, 59, :_reduce_none,
-  1, 61, :_reduce_none,
-  1, 61, :_reduce_none,
-  1, 61, :_reduce_none,
-  2, 42, :_reduce_78,
-  1, 42, :_reduce_none,
-  1, 63, :_reduce_none,
-  2, 63, :_reduce_none,
-  1, 63, :_reduce_none,
-  1, 63, :_reduce_none,
-  1, 63, :_reduce_none,
-  1, 63, :_reduce_none,
-  1, 63, :_reduce_none,
-  1, 63, :_reduce_none,
-  1, 63, :_reduce_none,
-  1, 63, :_reduce_none,
-  1, 63, :_reduce_none,
-  1, 63, :_reduce_none,
-  1, 63, :_reduce_none,
-  1, 63, :_reduce_none,
-  1, 63, :_reduce_none,
-  1, 63, :_reduce_none,
-  1, 63, :_reduce_none,
-  1, 63, :_reduce_none,
-  1, 63, :_reduce_none,
-  1, 63, :_reduce_none,
-  1, 63, :_reduce_none,
-  3, 36, :_reduce_101,
-  3, 37, :_reduce_102,
-  1, 65, :_reduce_none,
-  1, 65, :_reduce_none,
-  1, 65, :_reduce_none,
-  1, 65, :_reduce_none,
-  1, 65, :_reduce_none,
-  1, 65, :_reduce_none,
-  2, 66, :_reduce_109,
-  1, 66, :_reduce_none,
-  1, 38, :_reduce_111,
-  1, 67, :_reduce_none,
-  2, 67, :_reduce_113,
-  2, 67, :_reduce_114,
-  2, 67, :_reduce_115,
-  1, 68, :_reduce_none,
-  1, 68, :_reduce_none,
-  1, 68, :_reduce_none,
-  1, 68, :_reduce_none,
-  1, 68, :_reduce_none,
-  1, 68, :_reduce_none,
-  1, 68, :_reduce_none,
-  1, 68, :_reduce_none,
-  1, 68, :_reduce_none,
-  1, 68, :_reduce_none,
-  1, 68, :_reduce_none,
-  1, 68, :_reduce_none,
-  1, 68, :_reduce_none,
-  1, 68, :_reduce_none,
-  1, 68, :_reduce_none,
-  1, 68, :_reduce_none,
-  1, 68, :_reduce_none,
-  1, 68, :_reduce_none,
-  1, 68, :_reduce_none,
-  1, 68, :_reduce_none,
-  2, 64, :_reduce_136,
-  1, 64, :_reduce_none ]
-
-racc_reduce_n = 138
-
-racc_shift_n = 179
-
-racc_token_table = {
-  false => 0,
-  :error => 1,
-  :EX_LOW => 2,
-  :QUOTE => 3,
-  :BAR => 4,
-  :SLASH => 5,
-  :BACK_SLASH => 6,
-  :URL => 7,
-  :OTHER => 8,
-  :REF_OPEN => 9,
-  :FOOTNOTE_OPEN => 10,
-  :FOOTNOTE_CLOSE => 11,
-  :EX_HIGH => 12,
-  :EM_OPEN => 13,
-  :EM_CLOSE => 14,
-  :CODE_OPEN => 15,
-  :CODE_CLOSE => 16,
-  :VAR_OPEN => 17,
-  :VAR_CLOSE => 18,
-  :KBD_OPEN => 19,
-  :KBD_CLOSE => 20,
-  :INDEX_OPEN => 21,
-  :INDEX_CLOSE => 22,
-  :REF_CLOSE => 23,
-  :VERB_OPEN => 24,
-  :VERB_CLOSE => 25 }
-
-racc_nt_base = 26
-
-racc_use_result_var = true
-
-Racc_arg = [
-  racc_action_table,
-  racc_action_check,
-  racc_action_default,
-  racc_action_pointer,
-  racc_goto_table,
-  racc_goto_check,
-  racc_goto_default,
-  racc_goto_pointer,
-  racc_nt_base,
-  racc_reduce_table,
-  racc_token_table,
-  racc_shift_n,
-  racc_reduce_n,
-  racc_use_result_var ]
-Ractor.make_shareable(Racc_arg) if defined?(Ractor)
-
-Racc_token_to_s_table = [
-  "$end",
-  "error",
-  "EX_LOW",
-  "QUOTE",
-  "BAR",
-  "SLASH",
-  "BACK_SLASH",
-  "URL",
-  "OTHER",
-  "REF_OPEN",
-  "FOOTNOTE_OPEN",
-  "FOOTNOTE_CLOSE",
-  "EX_HIGH",
-  "EM_OPEN",
-  "EM_CLOSE",
-  "CODE_OPEN",
-  "CODE_CLOSE",
-  "VAR_OPEN",
-  "VAR_CLOSE",
-  "KBD_OPEN",
-  "KBD_CLOSE",
-  "INDEX_OPEN",
-  "INDEX_CLOSE",
-  "REF_CLOSE",
-  "VERB_OPEN",
-  "VERB_CLOSE",
-  "$start",
-  "content",
-  "elements",
-  "element",
-  "emphasis",
-  "code",
-  "var",
-  "keyboard",
-  "index",
-  "reference",
-  "footnote",
-  "verb",
-  "normal_str_ele",
-  "substitute",
-  "ref_label",
-  "ref_label2",
-  "ref_url_strings",
-  "filename",
-  "element_label",
-  "element_label2",
-  "ref_subst_content",
-  "ref_subst_content_q",
-  "ref_subst_strings_q",
-  "ref_subst_strings_first",
-  "ref_subst_ele2",
-  "ref_subst_eles",
-  "ref_subst_str_ele_first",
-  "ref_subst_eles_q",
-  "ref_subst_ele",
-  "ref_subst_ele_q",
-  "ref_subst_str_ele",
-  "ref_subst_str_ele_q",
-  "ref_subst_strings",
-  "ref_subst_string3",
-  "ref_subst_string",
-  "ref_subst_string_q",
-  "ref_subst_string2",
-  "ref_url_string",
-  "verb_strings",
-  "normal_string",
-  "normal_strings",
-  "verb_string",
-  "verb_normal_string" ]
-Ractor.make_shareable(Racc_token_to_s_table) if defined?(Ractor)
-
-Racc_debug_parser = false
-
-##### State transition tables end #####
-
-# reduce 0 omitted
-
-# reduce 1 omitted
-
-def _reduce_2(val, _values, result)
- result.append val[1]
-    result
-end
-
-def _reduce_3(val, _values, result)
- result = val[0]
-    result
-end
-
-# reduce 4 omitted
-
-# reduce 5 omitted
-
-# reduce 6 omitted
-
-# reduce 7 omitted
-
-# reduce 8 omitted
-
-# reduce 9 omitted
-
-# reduce 10 omitted
-
-# reduce 11 omitted
-
-# reduce 12 omitted
-
-def _reduce_13(val, _values, result)
-      content = val[1]
-      result = inline "<em>#{content}</em>", content
-
-    result
-end
-
-def _reduce_14(val, _values, result)
-      content = val[1]
-      result = inline "<code>#{content}</code>", content
-
-    result
-end
-
-def _reduce_15(val, _values, result)
-      content = val[1]
-      result = inline "+#{content}+", content
-
-    result
-end
-
-def _reduce_16(val, _values, result)
-      content = val[1]
-      result = inline "<tt>#{content}</tt>", content
-
-    result
-end
-
-def _reduce_17(val, _values, result)
-      label = val[1]
-      @block_parser.add_label label.reference
-      result = "<span id=\"label-#{label}\">#{label}</span>"
-
-    result
-end
-
-def _reduce_18(val, _values, result)
-      result = "{#{val[1]}}[#{val[2].join}]"
-
-    result
-end
-
-def _reduce_19(val, _values, result)
-      scheme, inline = val[1]
-
-      result = "{#{inline}}[#{scheme}#{inline.reference}]"
-
-    result
-end
-
-def _reduce_20(val, _values, result)
-      result = [nil, inline(val[1])]
-
-    result
-end
-
-def _reduce_21(val, _values, result)
-      result = [
-        'rdoc-label:',
-        inline("#{val[0].reference}/#{val[1].reference}")
-      ]
-
-    result
-end
-
-def _reduce_22(val, _values, result)
-      result = ['rdoc-label:', val[0].reference]
-
-    result
-end
-
-def _reduce_23(val, _values, result)
-      result = ['rdoc-label:', "#{val[0].reference}/"]
-
-    result
-end
-
-def _reduce_24(val, _values, result)
-      result = [nil, inline(val[1])]
-
-    result
-end
-
-def _reduce_25(val, _values, result)
-      result = [
-        'rdoc-label:',
-        inline("#{val[0].reference}/#{val[1].reference}")
-      ]
-
-    result
-end
-
-def _reduce_26(val, _values, result)
-      result = ['rdoc-label:', val[0]]
-
-    result
-end
-
-def _reduce_27(val, _values, result)
-      ref = val[0].reference
-      result = ['rdoc-label:', inline(ref, "#{ref}/")]
-
-    result
-end
-
-# reduce 28 omitted
-
-def _reduce_29(val, _values, result)
- result = val[1]
-    result
-end
-
-def _reduce_30(val, _values, result)
- result = val[1]
-    result
-end
-
-def _reduce_31(val, _values, result)
-      result = inline val[0]
-
-    result
-end
-
-def _reduce_32(val, _values, result)
-      result = inline "\"#{val[1]}\""
-
-    result
-end
-
-def _reduce_33(val, _values, result)
-      result = inline val[0]
-
-    result
-end
-
-def _reduce_34(val, _values, result)
-      result = inline "\"#{val[1]}\""
-
-    result
-end
-
-# reduce 35 omitted
-
-def _reduce_36(val, _values, result)
- result = val[1]
-    result
-end
-
-def _reduce_37(val, _values, result)
- result = inline val[1]
-    result
-end
-
-def _reduce_38(val, _values, result)
-      result = val[0].append val[1]
-
-    result
-end
-
-def _reduce_39(val, _values, result)
-      result = val[0].append val[1]
-
-    result
-end
-
-def _reduce_40(val, _values, result)
-      result = val[0]
-
-    result
-end
-
-def _reduce_41(val, _values, result)
-      result = inline val[0]
-
-    result
-end
-
-# reduce 42 omitted
-
-def _reduce_43(val, _values, result)
-      result = val[0].append val[1]
-
-    result
-end
-
-def _reduce_44(val, _values, result)
-      result = inline val[0]
-
-    result
-end
-
-def _reduce_45(val, _values, result)
-      result = val[0].append val[1]
-
-    result
-end
-
-def _reduce_46(val, _values, result)
-      result = val[0]
-
-    result
-end
-
-# reduce 47 omitted
-
-# reduce 48 omitted
-
-# reduce 49 omitted
-
-# reduce 50 omitted
-
-# reduce 51 omitted
-
-# reduce 52 omitted
-
-# reduce 53 omitted
-
-# reduce 54 omitted
-
-# reduce 55 omitted
-
-# reduce 56 omitted
-
-def _reduce_57(val, _values, result)
-      result = val[0]
-
-    result
-end
-
-def _reduce_58(val, _values, result)
-      result = inline val[0]
-
-    result
-end
-
-def _reduce_59(val, _values, result)
-      result = inline val[0]
-
-    result
-end
-
-def _reduce_60(val, _values, result)
- result << val[1]
-    result
-end
-
-# reduce 61 omitted
-
-def _reduce_62(val, _values, result)
-      result << val[1]
-
-    result
-end
-
-# reduce 63 omitted
-
-def _reduce_64(val, _values, result)
-      result << val[1]
-
-    result
-end
-
-# reduce 65 omitted
-
-# reduce 66 omitted
-
-# reduce 67 omitted
-
-# reduce 68 omitted
-
-# reduce 69 omitted
-
-# reduce 70 omitted
-
-# reduce 71 omitted
-
-# reduce 72 omitted
-
-# reduce 73 omitted
-
-# reduce 74 omitted
-
-# reduce 75 omitted
-
-# reduce 76 omitted
-
-# reduce 77 omitted
-
-def _reduce_78(val, _values, result)
- result << val[1]
-    result
-end
-
-# reduce 79 omitted
-
-# reduce 80 omitted
-
-# reduce 81 omitted
-
-# reduce 82 omitted
-
-# reduce 83 omitted
-
-# reduce 84 omitted
-
-# reduce 85 omitted
-
-# reduce 86 omitted
-
-# reduce 87 omitted
-
-# reduce 88 omitted
-
-# reduce 89 omitted
-
-# reduce 90 omitted
-
-# reduce 91 omitted
-
-# reduce 92 omitted
-
-# reduce 93 omitted
-
-# reduce 94 omitted
-
-# reduce 95 omitted
-
-# reduce 96 omitted
-
-# reduce 97 omitted
-
-# reduce 98 omitted
-
-# reduce 99 omitted
-
-# reduce 100 omitted
-
-def _reduce_101(val, _values, result)
-      index = @block_parser.add_footnote val[1].rdoc
-      result = "{*#{index}}[rdoc-label:foottext-#{index}:footmark-#{index}]"
-
-    result
-end
-
-def _reduce_102(val, _values, result)
-      result = inline "<tt>#{val[1]}</tt>", val[1]
-
-    result
-end
-
-# reduce 103 omitted
-
-# reduce 104 omitted
-
-# reduce 105 omitted
-
-# reduce 106 omitted
-
-# reduce 107 omitted
-
-# reduce 108 omitted
-
-def _reduce_109(val, _values, result)
- result << val[1]
-    result
-end
-
-# reduce 110 omitted
-
-def _reduce_111(val, _values, result)
-      result = inline val[0]
-
-    result
-end
-
-# reduce 112 omitted
-
-def _reduce_113(val, _values, result)
- result = val[1]
-    result
-end
-
-def _reduce_114(val, _values, result)
- result = val[1]
-    result
-end
-
-def _reduce_115(val, _values, result)
- result = val[1]
-    result
-end
-
-# reduce 116 omitted
-
-# reduce 117 omitted
-
-# reduce 118 omitted
-
-# reduce 119 omitted
-
-# reduce 120 omitted
-
-# reduce 121 omitted
-
-# reduce 122 omitted
-
-# reduce 123 omitted
-
-# reduce 124 omitted
-
-# reduce 125 omitted
-
-# reduce 126 omitted
-
-# reduce 127 omitted
-
-# reduce 128 omitted
-
-# reduce 129 omitted
-
-# reduce 130 omitted
-
-# reduce 131 omitted
-
-# reduce 132 omitted
-
-# reduce 133 omitted
-
-# reduce 134 omitted
-
-# reduce 135 omitted
-
-def _reduce_136(val, _values, result)
- result << val[1]
-    result
-end
-
-# reduce 137 omitted
-
-def _reduce_none(val, _values, result)
-  val[0]
-end
-
-end   # class InlineParser
-
-end
diff --git a/lib/rdoc/rdoc.gemspec b/lib/rdoc/rdoc.gemspec
deleted file mode 100644
index 93a281c8aea62d..00000000000000
--- a/lib/rdoc/rdoc.gemspec
+++ /dev/null
@@ -1,237 +0,0 @@
-begin
-  require_relative "lib/rdoc/version"
-rescue LoadError
-  # for Ruby repository
-  require_relative "version"
-end
-
-Gem::Specification.new do |s|
-  s.name = "rdoc"
-  s.version = RDoc::VERSION
-
-  s.authors = [
-    "Eric Hodel",
-    "Dave Thomas",
-    "Phil Hagelberg",
-    "Tony Strauss",
-    "Zachary Scott",
-    "Hiroshi SHIBATA",
-    "ITOYANAGI Sakura"
-  ]
-  s.email = ["drbrain@segment7.net", "", "", "", "mail@zzak.io", "hsbt@ruby-lang.org", "aycabta@gmail.com"]
-
-  s.summary = "RDoc produces HTML and command-line documentation for Ruby projects"
-  s.description = <<-DESCRIPTION
-RDoc produces HTML and command-line documentation for Ruby projects.
-RDoc includes the +rdoc+ and +ri+ tools for generating and displaying documentation from the command-line.
-  DESCRIPTION
-  s.homepage = "https://ruby.github.io/rdoc"
-  s.licenses = ["Ruby"]
-
-  s.metadata["homepage_uri"] = s.homepage
-  s.metadata["source_code_uri"] = "https://github.com/ruby/rdoc"
-  s.metadata["changelog_uri"] = "#{s.metadata["source_code_uri"]}/releases"
-
-  s.bindir = "exe"
-  s.executables = ["rdoc", "ri"]
-  s.require_paths = ["lib"]
-  # for ruby core repository. It was generated by
-  # `git ls-files -z`.split("\x0").each {|f| puts "    #{f.dump}," unless f.start_with?(*%W[test/ spec/ features/ .]) }
-  s.files = [
-    "CONTRIBUTING.rdoc",
-    "CVE-2013-0256.rdoc",
-    "ExampleMarkdown.md",
-    "ExampleRDoc.rdoc",
-    "History.rdoc",
-    "LEGAL.rdoc",
-    "LICENSE.rdoc",
-    "README.rdoc",
-    "RI.rdoc",
-    "TODO.rdoc",
-    "exe/rdoc",
-    "exe/ri",
-    "lib/rdoc.rb",
-    "lib/rdoc/alias.rb",
-    "lib/rdoc/anon_class.rb",
-    "lib/rdoc/any_method.rb",
-    "lib/rdoc/attr.rb",
-    "lib/rdoc/class_module.rb",
-    "lib/rdoc/code_object.rb",
-    "lib/rdoc/code_objects.rb",
-    "lib/rdoc/comment.rb",
-    "lib/rdoc/constant.rb",
-    "lib/rdoc/context.rb",
-    "lib/rdoc/context/section.rb",
-    "lib/rdoc/cross_reference.rb",
-    "lib/rdoc/encoding.rb",
-    "lib/rdoc/erb_partial.rb",
-    "lib/rdoc/erbio.rb",
-    "lib/rdoc/extend.rb",
-    "lib/rdoc/generator.rb",
-    "lib/rdoc/generator/darkfish.rb",
-    "lib/rdoc/generator/json_index.rb",
-    "lib/rdoc/generator/markup.rb",
-    "lib/rdoc/generator/pot.rb",
-    "lib/rdoc/generator/pot/message_extractor.rb",
-    "lib/rdoc/generator/pot/po.rb",
-    "lib/rdoc/generator/pot/po_entry.rb",
-    "lib/rdoc/generator/ri.rb",
-    "lib/rdoc/generator/template/darkfish/.document",
-    "lib/rdoc/generator/template/darkfish/_footer.rhtml",
-    "lib/rdoc/generator/template/darkfish/_head.rhtml",
-    "lib/rdoc/generator/template/darkfish/_sidebar_VCS_info.rhtml",
-    "lib/rdoc/generator/template/darkfish/_sidebar_classes.rhtml",
-    "lib/rdoc/generator/template/darkfish/_sidebar_extends.rhtml",
-    "lib/rdoc/generator/template/darkfish/_sidebar_in_files.rhtml",
-    "lib/rdoc/generator/template/darkfish/_sidebar_includes.rhtml",
-    "lib/rdoc/generator/template/darkfish/_sidebar_installed.rhtml",
-    "lib/rdoc/generator/template/darkfish/_sidebar_methods.rhtml",
-    "lib/rdoc/generator/template/darkfish/_sidebar_navigation.rhtml",
-    "lib/rdoc/generator/template/darkfish/_sidebar_pages.rhtml",
-    "lib/rdoc/generator/template/darkfish/_sidebar_parent.rhtml",
-    "lib/rdoc/generator/template/darkfish/_sidebar_search.rhtml",
-    "lib/rdoc/generator/template/darkfish/_sidebar_sections.rhtml",
-    "lib/rdoc/generator/template/darkfish/_sidebar_table_of_contents.rhtml",
-    "lib/rdoc/generator/template/darkfish/class.rhtml",
-    "lib/rdoc/generator/template/darkfish/css/fonts.css",
-    "lib/rdoc/generator/template/darkfish/css/rdoc.css",
-    "lib/rdoc/generator/template/darkfish/fonts/Lato-Light.ttf",
-    "lib/rdoc/generator/template/darkfish/fonts/Lato-LightItalic.ttf",
-    "lib/rdoc/generator/template/darkfish/fonts/Lato-Regular.ttf",
-    "lib/rdoc/generator/template/darkfish/fonts/Lato-RegularItalic.ttf",
-    "lib/rdoc/generator/template/darkfish/fonts/SourceCodePro-Bold.ttf",
-    "lib/rdoc/generator/template/darkfish/fonts/SourceCodePro-Regular.ttf",
-    "lib/rdoc/generator/template/darkfish/images/add.png",
-    "lib/rdoc/generator/template/darkfish/images/arrow_up.png",
-    "lib/rdoc/generator/template/darkfish/images/brick.png",
-    "lib/rdoc/generator/template/darkfish/images/brick_link.png",
-    "lib/rdoc/generator/template/darkfish/images/bug.png",
-    "lib/rdoc/generator/template/darkfish/images/bullet_black.png",
-    "lib/rdoc/generator/template/darkfish/images/bullet_toggle_minus.png",
-    "lib/rdoc/generator/template/darkfish/images/bullet_toggle_plus.png",
-    "lib/rdoc/generator/template/darkfish/images/date.png",
-    "lib/rdoc/generator/template/darkfish/images/delete.png",
-    "lib/rdoc/generator/template/darkfish/images/find.png",
-    "lib/rdoc/generator/template/darkfish/images/loadingAnimation.gif",
-    "lib/rdoc/generator/template/darkfish/images/macFFBgHack.png",
-    "lib/rdoc/generator/template/darkfish/images/package.png",
-    "lib/rdoc/generator/template/darkfish/images/page_green.png",
-    "lib/rdoc/generator/template/darkfish/images/page_white_text.png",
-    "lib/rdoc/generator/template/darkfish/images/page_white_width.png",
-    "lib/rdoc/generator/template/darkfish/images/plugin.png",
-    "lib/rdoc/generator/template/darkfish/images/ruby.png",
-    "lib/rdoc/generator/template/darkfish/images/tag_blue.png",
-    "lib/rdoc/generator/template/darkfish/images/tag_green.png",
-    "lib/rdoc/generator/template/darkfish/images/transparent.png",
-    "lib/rdoc/generator/template/darkfish/images/wrench.png",
-    "lib/rdoc/generator/template/darkfish/images/wrench_orange.png",
-    "lib/rdoc/generator/template/darkfish/images/zoom.png",
-    "lib/rdoc/generator/template/darkfish/index.rhtml",
-    "lib/rdoc/generator/template/darkfish/js/darkfish.js",
-    "lib/rdoc/generator/template/darkfish/js/search.js",
-    "lib/rdoc/generator/template/darkfish/page.rhtml",
-    "lib/rdoc/generator/template/darkfish/servlet_not_found.rhtml",
-    "lib/rdoc/generator/template/darkfish/servlet_root.rhtml",
-    "lib/rdoc/generator/template/darkfish/table_of_contents.rhtml",
-    "lib/rdoc/generator/template/json_index/.document",
-    "lib/rdoc/generator/template/json_index/js/navigation.js",
-    "lib/rdoc/generator/template/json_index/js/searcher.js",
-    "lib/rdoc/ghost_method.rb",
-    "lib/rdoc/i18n.rb",
-    "lib/rdoc/i18n/locale.rb",
-    "lib/rdoc/i18n/text.rb",
-    "lib/rdoc/include.rb",
-    "lib/rdoc/known_classes.rb",
-    "lib/rdoc/markdown.kpeg",
-    "lib/rdoc/markdown/entities.rb",
-    "lib/rdoc/markdown/literals.kpeg",
-    "lib/rdoc/markup.rb",
-    "lib/rdoc/markup/attr_changer.rb",
-    "lib/rdoc/markup/attr_span.rb",
-    "lib/rdoc/markup/attribute_manager.rb",
-    "lib/rdoc/markup/attributes.rb",
-    "lib/rdoc/markup/blank_line.rb",
-    "lib/rdoc/markup/block_quote.rb",
-    "lib/rdoc/markup/document.rb",
-    "lib/rdoc/markup/formatter.rb",
-    "lib/rdoc/markup/hard_break.rb",
-    "lib/rdoc/markup/heading.rb",
-    "lib/rdoc/markup/include.rb",
-    "lib/rdoc/markup/indented_paragraph.rb",
-    "lib/rdoc/markup/list.rb",
-    "lib/rdoc/markup/list_item.rb",
-    "lib/rdoc/markup/paragraph.rb",
-    "lib/rdoc/markup/parser.rb",
-    "lib/rdoc/markup/pre_process.rb",
-    "lib/rdoc/markup/raw.rb",
-    "lib/rdoc/markup/regexp_handling.rb",
-    "lib/rdoc/markup/rule.rb",
-    "lib/rdoc/markup/table.rb",
-    "lib/rdoc/markup/to_ansi.rb",
-    "lib/rdoc/markup/to_bs.rb",
-    "lib/rdoc/markup/to_html.rb",
-    "lib/rdoc/markup/to_html_crossref.rb",
-    "lib/rdoc/markup/to_html_snippet.rb",
-    "lib/rdoc/markup/to_joined_paragraph.rb",
-    "lib/rdoc/markup/to_label.rb",
-    "lib/rdoc/markup/to_markdown.rb",
-    "lib/rdoc/markup/to_rdoc.rb",
-    "lib/rdoc/markup/to_table_of_contents.rb",
-    "lib/rdoc/markup/to_test.rb",
-    "lib/rdoc/markup/to_tt_only.rb",
-    "lib/rdoc/markup/verbatim.rb",
-    "lib/rdoc/meta_method.rb",
-    "lib/rdoc/method_attr.rb",
-    "lib/rdoc/mixin.rb",
-    "lib/rdoc/normal_class.rb",
-    "lib/rdoc/normal_module.rb",
-    "lib/rdoc/options.rb",
-    "lib/rdoc/parser.rb",
-    "lib/rdoc/parser/c.rb",
-    "lib/rdoc/parser/changelog.rb",
-    "lib/rdoc/parser/markdown.rb",
-    "lib/rdoc/parser/rd.rb",
-    "lib/rdoc/parser/ripper_state_lex.rb",
-    "lib/rdoc/parser/ruby.rb",
-    "lib/rdoc/parser/ruby_tools.rb",
-    "lib/rdoc/parser/simple.rb",
-    "lib/rdoc/parser/text.rb",
-    "lib/rdoc/rd.rb",
-    "lib/rdoc/rd/block_parser.ry",
-    "lib/rdoc/rd/inline.rb",
-    "lib/rdoc/rd/inline_parser.ry",
-    "lib/rdoc/rdoc.rb",
-    "lib/rdoc/require.rb",
-    "lib/rdoc/ri.rb",
-    "lib/rdoc/ri/driver.rb",
-    "lib/rdoc/ri/formatter.rb",
-    "lib/rdoc/ri/paths.rb",
-    "lib/rdoc/ri/store.rb",
-    "lib/rdoc/ri/task.rb",
-    "lib/rdoc/rubygems_hook.rb",
-    "lib/rdoc/servlet.rb",
-    "lib/rdoc/single_class.rb",
-    "lib/rdoc/stats.rb",
-    "lib/rdoc/stats/normal.rb",
-    "lib/rdoc/stats/quiet.rb",
-    "lib/rdoc/stats/verbose.rb",
-    "lib/rdoc/store.rb",
-    "lib/rdoc/task.rb",
-    "lib/rdoc/text.rb",
-    "lib/rdoc/token_stream.rb",
-    "lib/rdoc/tom_doc.rb",
-    "lib/rdoc/top_level.rb",
-    "lib/rdoc/version.rb",
-    "man/ri.1",
-  ]
-  # files from .gitignore
-  s.files << "lib/rdoc/rd/block_parser.rb" << "lib/rdoc/rd/inline_parser.rb" << "lib/rdoc/markdown.rb" << "lib/rdoc/markdown/literals.rb"
-
-  s.rdoc_options = ["--main", "README.rdoc"]
-  s.extra_rdoc_files += s.files.grep(%r[\A[^\/]+\.(?:rdoc|md)\z])
-
-  s.required_ruby_version = Gem::Requirement.new(">= 2.6.0")
-  s.required_rubygems_version = Gem::Requirement.new(">= 2.2")
-
-  s.add_dependency 'psych', '>= 4.0.0'
-end
diff --git a/lib/rdoc/rdoc.rb b/lib/rdoc/rdoc.rb
deleted file mode 100644
index 2da6d9b5754a84..00000000000000
--- a/lib/rdoc/rdoc.rb
+++ /dev/null
@@ -1,563 +0,0 @@
-# frozen_string_literal: true
-require_relative '../rdoc'
-
-require 'find'
-require 'fileutils'
-require 'pathname'
-require 'time'
-
-##
-# This is the driver for generating RDoc output.  It handles file parsing and
-# generation of output.
-#
-# To use this class to generate RDoc output via the API, the recommended way
-# is:
-#
-#   rdoc = RDoc::RDoc.new
-#   options = RDoc::Options.load_options # returns an RDoc::Options instance
-#   # set extra options
-#   rdoc.document options
-#
-# You can also generate output like the +rdoc+ executable:
-#
-#   rdoc = RDoc::RDoc.new
-#   rdoc.document argv
-#
-# Where +argv+ is an array of strings, each corresponding to an argument you'd
-# give rdoc on the command line.  See <tt>rdoc --help</tt> for details.
-
-class RDoc::RDoc
-
-  @current = nil
-
-  ##
-  # This is the list of supported output generators
-
-  GENERATORS = {}
-
-  ##
-  # List of directory names always skipped
-
-  UNCONDITIONALLY_SKIPPED_DIRECTORIES = %w[CVS .svn .git].freeze
-
-  ##
-  # List of directory names skipped if test suites should be skipped
-
-  TEST_SUITE_DIRECTORY_NAMES = %w[spec test].freeze
-
-
-  ##
-  # Generator instance used for creating output
-
-  attr_accessor :generator
-
-  ##
-  # Hash of files and their last modified times.
-
-  attr_reader :last_modified
-
-  ##
-  # RDoc options
-
-  attr_accessor :options
-
-  ##
-  # Accessor for statistics.  Available after each call to parse_files
-
-  attr_reader :stats
-
-  ##
-  # The current documentation store
-
-  attr_reader :store
-
-  ##
-  # Add +klass+ that can generate output after parsing
-
-  def self.add_generator(klass)
-    name = klass.name.sub(/^RDoc::Generator::/, '').downcase
-    GENERATORS[name] = klass
-  end
-
-  ##
-  # Active RDoc::RDoc instance
-
-  def self.current
-    @current
-  end
-
-  ##
-  # Sets the active RDoc::RDoc instance
-
-  def self.current= rdoc
-    @current = rdoc
-  end
-
-  ##
-  # Creates a new RDoc::RDoc instance.  Call #document to parse files and
-  # generate documentation.
-
-  def initialize
-    @current       = nil
-    @generator     = nil
-    @last_modified = {}
-    @old_siginfo   = nil
-    @options       = nil
-    @stats         = nil
-    @store         = nil
-  end
-
-  ##
-  # Report an error message and exit
-
-  def error(msg)
-    raise RDoc::Error, msg
-  end
-
-  ##
-  # Gathers a set of parseable files from the files and directories listed in
-  # +files+.
-
-  def gather_files files
-    files = [@options.root.to_s] if files.empty?
-
-    file_list = normalized_file_list files, true, @options.exclude
-
-    file_list = remove_unparseable(file_list)
-
-    if file_list.count {|name, mtime|
-         file_list[name] = @last_modified[name] unless mtime
-         mtime
-       } > 0
-      @last_modified.replace file_list
-      file_list.keys.sort
-    else
-      []
-    end
-  end
-
-  ##
-  # Turns RDoc from stdin into HTML
-
-  def handle_pipe
-    @html = RDoc::Markup::ToHtml.new @options
-
-    parser = RDoc::Text::MARKUP_FORMAT[@options.markup]
-
-    document = parser.parse $stdin.read
-
-    out = @html.convert document
-
-    $stdout.write out
-  end
-
-  ##
-  # Installs a siginfo handler that prints the current filename.
-
-  def install_siginfo_handler
-    return unless Signal.list.include? 'INFO'
-
-    @old_siginfo = trap 'INFO' do
-      puts @current if @current
-    end
-  end
-
-  ##
-  # Create an output dir if it doesn't exist. If it does exist, but doesn't
-  # contain the flag file <tt>created.rid</tt> then we refuse to use it, as
-  # we may clobber some manually generated documentation
-
-  def setup_output_dir(dir, force)
-    flag_file = output_flag_file dir
-
-    last = {}
-
-    if @options.dry_run then
-      # do nothing
-    elsif File.exist? dir then
-      error "#{dir} exists and is not a directory" unless File.directory? dir
-
-      begin
-        File.open flag_file do |io|
-          unless force then
-            Time.parse io.gets
-
-            io.each do |line|
-              file, time = line.split "\t", 2
-              time = Time.parse(time) rescue next
-              last[file] = time
-            end
-          end
-        end
-      rescue SystemCallError, TypeError
-        error <<-ERROR
-
-Directory #{dir} already exists, but it looks like it isn't an RDoc directory.
-
-Because RDoc doesn't want to risk destroying any of your existing files,
-you'll need to specify a different output directory name (using the --op <dir>
-option)
-
-        ERROR
-      end unless @options.force_output
-    else
-      FileUtils.mkdir_p dir
-      FileUtils.touch flag_file
-    end
-
-    last
-  end
-
-  ##
-  # Sets the current documentation tree to +store+ and sets the store's rdoc
-  # driver to this instance.
-
-  def store= store
-    @store = store
-    @store.rdoc = self
-  end
-
-  ##
-  # Update the flag file in an output directory.
-
-  def update_output_dir(op_dir, time, last = {})
-    return if @options.dry_run or not @options.update_output_dir
-    unless ENV['SOURCE_DATE_EPOCH'].nil?
-      time = Time.at(ENV['SOURCE_DATE_EPOCH'].to_i).gmtime
-    end
-
-    File.open output_flag_file(op_dir), "w" do |f|
-      f.puts time.rfc2822
-      last.each do |n, t|
-        f.puts "#{n}\t#{t.rfc2822}"
-      end
-    end
-  end
-
-  ##
-  # Return the path name of the flag file in an output directory.
-
-  def output_flag_file(op_dir)
-    File.join op_dir, "created.rid"
-  end
-
-  ##
-  # The .document file contains a list of file and directory name patterns,
-  # representing candidates for documentation. It may also contain comments
-  # (starting with '#')
-
-  def parse_dot_doc_file in_dir, filename
-    # read and strip comments
-    patterns = File.read(filename).gsub(/#.*/, '')
-
-    result = {}
-
-    patterns.split(' ').each do |patt|
-      candidates = Dir.glob(File.join(in_dir, patt))
-      result.update normalized_file_list(candidates, false, @options.exclude)
-    end
-
-    result
-  end
-
-  ##
-  # Given a list of files and directories, create a list of all the Ruby
-  # files they contain.
-  #
-  # If +force_doc+ is true we always add the given files, if false, only
-  # add files that we guarantee we can parse.  It is true when looking at
-  # files given on the command line, false when recursing through
-  # subdirectories.
-  #
-  # The effect of this is that if you want a file with a non-standard
-  # extension parsed, you must name it explicitly.
-
-  def normalized_file_list(relative_files, force_doc = false,
-                           exclude_pattern = nil)
-    file_list = {}
-
-    relative_files.each do |rel_file_name|
-      rel_file_name = rel_file_name.sub(/^\.\//, '')
-      next if rel_file_name.end_with? 'created.rid'
-      next if exclude_pattern && exclude_pattern =~ rel_file_name
-      stat = File.stat rel_file_name rescue next
-
-      case type = stat.ftype
-      when "file" then
-        mtime = (stat.mtime unless (last_modified = @last_modified[rel_file_name] and
-                                    stat.mtime.to_i <= last_modified.to_i))
-
-        if force_doc or RDoc::Parser.can_parse(rel_file_name) then
-          file_list[rel_file_name] = mtime
-        end
-      when "directory" then
-        next if UNCONDITIONALLY_SKIPPED_DIRECTORIES.include?(rel_file_name)
-
-        basename = File.basename(rel_file_name)
-        next if options.skip_tests && TEST_SUITE_DIRECTORY_NAMES.include?(basename)
-
-        created_rid = File.join rel_file_name, "created.rid"
-        next if File.file? created_rid
-
-        dot_doc = File.join rel_file_name, RDoc::DOT_DOC_FILENAME
-
-        if File.file? dot_doc then
-          file_list.update(parse_dot_doc_file(rel_file_name, dot_doc))
-        else
-          file_list.update(list_files_in_directory(rel_file_name))
-        end
-      else
-        warn "rdoc can't parse the #{type} #{rel_file_name}"
-      end
-    end
-
-    file_list
-  end
-
-  ##
-  # Return a list of the files to be processed in a directory. We know that
-  # this directory doesn't have a .document file, so we're looking for real
-  # files. However we may well contain subdirectories which must be tested
-  # for .document files.
-
-  def list_files_in_directory dir
-    files = Dir.glob File.join(dir, "*")
-
-    normalized_file_list files, false, @options.exclude
-  end
-
-  ##
-  # Parses +filename+ and returns an RDoc::TopLevel
-
-  def parse_file filename
-    encoding = @options.encoding
-    filename = filename.encode encoding
-
-    @stats.add_file filename
-
-    return if RDoc::Parser.binary? filename
-
-    content = RDoc::Encoding.read_file filename, encoding
-
-    return unless content
-
-    filename_path = Pathname(filename).expand_path
-    begin
-      relative_path = filename_path.relative_path_from @options.root
-    rescue ArgumentError
-      relative_path = filename_path
-    end
-
-    if @options.page_dir and
-       relative_path.to_s.start_with? @options.page_dir.to_s then
-      relative_path =
-        relative_path.relative_path_from @options.page_dir
-    end
-
-    top_level = @store.add_file filename, relative_name: relative_path.to_s
-
-    parser = RDoc::Parser.for top_level, filename, content, @options, @stats
-
-    return unless parser
-
-    parser.scan
-
-    # restart documentation for the classes & modules found
-    top_level.classes_or_modules.each do |cm|
-      cm.done_documenting = false
-    end
-
-    top_level
-
-  rescue Errno::EACCES => e
-    $stderr.puts <<-EOF
-Unable to read #{filename}, #{e.message}
-
-Please check the permissions for this file.  Perhaps you do not have access to
-it or perhaps the original author's permissions are to restrictive.  If the
-this is not your library please report a bug to the author.
-    EOF
-  rescue => e
-    $stderr.puts <<-EOF
-Before reporting this, could you check that the file you're documenting
-has proper syntax:
-
-  #{Gem.ruby} -c #{filename}
-
-RDoc is not a full Ruby parser and will fail when fed invalid ruby programs.
-
-The internal error was:
-
-\t(#{e.class}) #{e.message}
-
-    EOF
-
-    $stderr.puts e.backtrace.join("\n\t") if $DEBUG_RDOC
-
-    raise e
-    nil
-  end
-
-  ##
-  # Parse each file on the command line, recursively entering directories.
-
-  def parse_files files
-    file_list = gather_files files
-    @stats = RDoc::Stats.new @store, file_list.length, @options.verbosity
-
-    return [] if file_list.empty?
-
-    original_options = @options.dup
-    @stats.begin_adding
-
-    file_info = file_list.map do |filename|
-      @current = filename
-      parse_file filename
-    end.compact
-
-    @stats.done_adding
-    @options = original_options
-
-    file_info
-  end
-
-  ##
-  # Removes file extensions known to be unparseable from +files+ and TAGS
-  # files for emacs and vim.
-
-  def remove_unparseable files
-    files.reject do |file, *|
-      file =~ /\.(?:class|eps|erb|scpt\.txt|svg|ttf|yml)$/i or
-        (file =~ /tags$/i and
-         /\A(\f\n[^,]+,\d+$|!_TAG_)/.match?(File.binread(file, 100)))
-    end
-  end
-
-  ##
-  # Generates documentation or a coverage report depending upon the settings
-  # in +options+.
-  #
-  # +options+ can be either an RDoc::Options instance or an array of strings
-  # equivalent to the strings that would be passed on the command line like
-  # <tt>%w[-q -o doc -t My\ Doc\ Title]</tt>.  #document will automatically
-  # call RDoc::Options#finish if an options instance was given.
-  #
-  # For a list of options, see either RDoc::Options or <tt>rdoc --help</tt>.
-  #
-  # By default, output will be stored in a directory called "doc" below the
-  # current directory, so make sure you're somewhere writable before invoking.
-
-  def document options
-    self.store = RDoc::Store.new
-
-    if RDoc::Options === options then
-      @options = options
-    else
-      @options = RDoc::Options.load_options
-      @options.parse options
-    end
-    @options.finish
-
-    if @options.pipe then
-      handle_pipe
-      exit
-    end
-
-    unless @options.coverage_report then
-      @last_modified = setup_output_dir @options.op_dir, @options.force_update
-    end
-
-    @store.encoding = @options.encoding
-    @store.dry_run  = @options.dry_run
-    @store.main     = @options.main_page
-    @store.title    = @options.title
-    @store.path     = @options.op_dir
-
-    @start_time = Time.now
-
-    @store.load_cache
-
-    file_info = parse_files @options.files
-
-    @options.default_title = "RDoc Documentation"
-
-    @store.complete @options.visibility
-
-    @stats.coverage_level = @options.coverage_report
-
-    if @options.coverage_report then
-      puts
-
-      puts @stats.report.accept RDoc::Markup::ToRdoc.new
-    elsif file_info.empty? then
-      $stderr.puts "\nNo newer files." unless @options.quiet
-    else
-      gen_klass = @options.generator
-
-      @generator = gen_klass.new @store, @options
-
-      generate
-    end
-
-    if @stats and (@options.coverage_report or not @options.quiet) then
-      puts
-      puts @stats.summary.accept RDoc::Markup::ToRdoc.new
-    end
-
-    exit @stats.fully_documented? if @options.coverage_report
-  end
-
-  ##
-  # Generates documentation for +file_info+ (from #parse_files) into the
-  # output dir using the generator selected
-  # by the RDoc options
-
-  def generate
-    if @options.dry_run then
-      # do nothing
-      @generator.generate
-    else
-      Dir.chdir @options.op_dir do
-        unless @options.quiet then
-          $stderr.puts "\nGenerating #{@generator.class.name.sub(/^.*::/, '')} format into #{Dir.pwd}..."
-        end
-
-        @generator.generate
-        update_output_dir '.', @start_time, @last_modified
-      end
-    end
-  end
-
-  ##
-  # Removes a siginfo handler and replaces the previous
-
-  def remove_siginfo_handler
-    return unless Signal.list.key? 'INFO'
-
-    handler = @old_siginfo || 'DEFAULT'
-
-    trap 'INFO', handler
-  end
-
-end
-
-begin
-  require 'rubygems'
-
-  rdoc_extensions = Gem.find_files 'rdoc/discover'
-
-  rdoc_extensions.each do |extension|
-    begin
-      load extension
-    rescue => e
-      warn "error loading #{extension.inspect}: #{e.message} (#{e.class})"
-      warn "\t#{e.backtrace.join "\n\t"}" if $DEBUG
-    end
-  end
-rescue LoadError
-end
-
-# require built-in generators after discovery in case they've been replaced
-require_relative 'generator/darkfish'
-require_relative 'generator/ri'
-require_relative 'generator/pot'
diff --git a/lib/rdoc/require.rb b/lib/rdoc/require.rb
deleted file mode 100644
index 05e26b84b0ed97..00000000000000
--- a/lib/rdoc/require.rb
+++ /dev/null
@@ -1,51 +0,0 @@
-# frozen_string_literal: true
-##
-# A file loaded by \#require
-
-class RDoc::Require < RDoc::CodeObject
-
-  ##
-  # Name of the required file
-
-  attr_accessor :name
-
-  ##
-  # Creates a new Require that loads +name+ with +comment+
-
-  def initialize(name, comment)
-    super()
-    @name = name.gsub(/'|"/, "") #'
-    @top_level = nil
-    self.comment = comment
-  end
-
-  def inspect # :nodoc:
-    "#<%s:0x%x require '%s' in %s>" % [
-      self.class,
-      object_id,
-      @name,
-      parent_file_name,
-    ]
-  end
-
-  def to_s # :nodoc:
-    "require #{name} in: #{parent}"
-  end
-
-  ##
-  # The RDoc::TopLevel corresponding to this require, or +nil+ if not found.
-
-  def top_level
-    @top_level ||= begin
-      tl = RDoc::TopLevel.all_files_hash[name + '.rb']
-
-      if tl.nil? and RDoc::TopLevel.all_files.first.full_name =~ %r(^lib/) then
-        # second chance
-        tl = RDoc::TopLevel.all_files_hash['lib/' + name + '.rb']
-      end
-
-      tl
-    end
-  end
-
-end
diff --git a/lib/rdoc/ri.rb b/lib/rdoc/ri.rb
deleted file mode 100644
index 0af05f729f7cd3..00000000000000
--- a/lib/rdoc/ri.rb
+++ /dev/null
@@ -1,20 +0,0 @@
-# frozen_string_literal: true
-require_relative '../rdoc'
-
-##
-# Namespace for the ri command line tool's implementation.
-#
-# See <tt>ri --help</tt> for details.
-
-module RDoc::RI
-
-  ##
-  # Base RI error class
-
-  class Error < RDoc::Error; end
-
-  autoload :Driver, "#{__dir__}/ri/driver"
-  autoload :Paths,  "#{__dir__}/ri/paths"
-  autoload :Store,  "#{__dir__}/ri/store"
-
-end
diff --git a/lib/rdoc/ri/driver.rb b/lib/rdoc/ri/driver.rb
deleted file mode 100644
index 819cff8aa3dd04..00000000000000
--- a/lib/rdoc/ri/driver.rb
+++ /dev/null
@@ -1,1512 +0,0 @@
-# frozen_string_literal: true
-require 'optparse'
-
-require_relative '../../rdoc'
-
-require_relative 'formatter' # For RubyGems backwards compatibility
-# TODO: Fix weird documentation with `require_relative`
-
-##
-# The RI driver implements the command-line ri tool.
-#
-# The driver supports:
-# * loading RI data from:
-#   * Ruby's standard library
-#   * RubyGems
-#   * ~/.rdoc
-#   * A user-supplied directory
-# * Paging output (uses RI_PAGER environment variable, PAGER environment
-#   variable or the less, more and pager programs)
-# * Interactive mode with tab-completion
-# * Abbreviated names (ri Zl shows Zlib documentation)
-# * Colorized output
-# * Merging output from multiple RI data sources
-
-class RDoc::RI::Driver
-
-  ##
-  # Base Driver error class
-
-  class Error < RDoc::RI::Error; end
-
-  ##
-  # Raised when a name isn't found in the ri data stores
-
-  class NotFoundError < Error
-
-    def initialize(klass, suggestions = nil) # :nodoc:
-      @klass = klass
-      @suggestions = suggestions
-    end
-
-    ##
-    # Name that wasn't found
-
-    def name
-      @klass
-    end
-
-    def message # :nodoc:
-      str = "Nothing known about #{@klass}"
-      if @suggestions and !@suggestions.empty?
-        str += "\nDid you mean?  #{@suggestions.join("\n               ")}"
-      end
-      str
-    end
-  end
-
-  ##
-  # Show all method documentation following a class or module
-
-  attr_accessor :show_all
-
-  ##
-  # An RDoc::RI::Store for each entry in the RI path
-
-  attr_accessor :stores
-
-  ##
-  # Controls the user of the pager vs $stdout
-
-  attr_accessor :use_stdout
-
-  ##
-  # Default options for ri
-
-  def self.default_options
-    options = {}
-    options[:interactive] = false
-    options[:profile]     = false
-    options[:show_all]    = false
-    options[:use_stdout]  = !$stdout.tty?
-    options[:width]       = 72
-
-    # By default all standard paths are used.
-    options[:use_system]     = true
-    options[:use_site]       = true
-    options[:use_home]       = true
-    options[:use_gems]       = true
-    options[:extra_doc_dirs] = []
-
-    return options
-  end
-
-  ##
-  # Dump +data_path+ using pp
-
-  def self.dump data_path
-    require 'pp'
-
-    File.open data_path, 'rb' do |io|
-      pp Marshal.load(io.read)
-    end
-  end
-
-  ##
-  # Parses +argv+ and returns a Hash of options
-
-  def self.process_args argv
-    options = default_options
-
-    opts = OptionParser.new do |opt|
-      opt.accept File do |file,|
-        File.readable?(file) and not File.directory?(file) and file
-      end
-
-      opt.program_name = File.basename $0
-      opt.version = RDoc::VERSION
-      opt.release = nil
-      opt.summary_indent = ' ' * 4
-
-      opt.banner = <<-EOT
-Usage: #{opt.program_name} [options] [name ...]
-
-Where name can be:
-
-  Class | Module | Module::Class
-
-  Class::method | Class#method | Class.method | method
-
-  gem_name: | gem_name:README | gem_name:History
-
-  ruby: | ruby:NEWS | ruby:globals
-
-All class names may be abbreviated to their minimum unambiguous form.
-If a name is ambiguous, all valid options will be listed.
-
-A '.' matches either class or instance methods, while #method
-matches only instance and ::method matches only class methods.
-
-README and other files may be displayed by prefixing them with the gem name
-they're contained in.  If the gem name is followed by a ':' all files in the
-gem will be shown.  The file name extension may be omitted where it is
-unambiguous.
-
-'ruby' can be used as a pseudo gem name to display files from the Ruby
-core documentation. Use 'ruby:' by itself to get a list of all available
-core documentation files.
-
-For example:
-
-    #{opt.program_name} Fil
-    #{opt.program_name} File
-    #{opt.program_name} File.new
-    #{opt.program_name} zip
-    #{opt.program_name} rdoc:README
-    #{opt.program_name} ruby:comments
-
-Note that shell quoting or escaping may be required for method names
-containing punctuation:
-
-    #{opt.program_name} 'Array.[]'
-    #{opt.program_name} compact\\!
-
-To see the default directories #{opt.program_name} will search, run:
-
-    #{opt.program_name} --list-doc-dirs
-
-Specifying the --system, --site, --home, --gems, or --doc-dir options
-will limit ri to searching only the specified directories.
-
-ri options may be set in the RI environment variable.
-
-The ri pager can be set with the RI_PAGER environment variable
-or the PAGER environment variable.
-      EOT
-
-      opt.separator nil
-      opt.separator "Options:"
-
-      opt.separator nil
-
-      opt.on("--[no-]interactive", "-i",
-             "In interactive mode you can repeatedly",
-             "look up methods with autocomplete.") do |interactive|
-        options[:interactive] = interactive
-      end
-
-      opt.separator nil
-
-      opt.on("--[no-]all", "-a",
-             "Show all documentation for a class or",
-             "module.") do |show_all|
-        options[:show_all] = show_all
-      end
-
-      opt.separator nil
-
-      opt.on("--[no-]list", "-l",
-             "List classes ri knows about.") do |list|
-        options[:list] = list
-      end
-
-      opt.separator nil
-
-      opt.on("--[no-]pager",
-             "Send output to a pager,",
-             "rather than directly to stdout.") do |use_pager|
-        options[:use_stdout] = !use_pager
-      end
-
-      opt.separator nil
-
-      opt.on("-T",
-             "Synonym for --no-pager.") do
-        options[:use_stdout] = true
-      end
-
-      opt.separator nil
-
-      opt.on("--width=WIDTH", "-w", OptionParser::DecimalInteger,
-             "Set the width of the output.") do |width|
-        options[:width] = width
-      end
-
-      opt.separator nil
-
-      opt.on("--server[=PORT]", Integer,
-             "Run RDoc server on the given port.",
-             "The default port is 8214.") do |port|
-        options[:server] = port || 8214
-      end
-
-      opt.separator nil
-
-      formatters = RDoc::Markup.constants.grep(/^To[A-Z][a-z]+$/).sort
-      formatters = formatters.sort.map do |formatter|
-        formatter.to_s.sub('To', '').downcase
-      end
-      formatters -= %w[html label test] # remove useless output formats
-
-      opt.on("--format=NAME", "-f",
-             "Use the selected formatter.  The default",
-             "formatter is bs for paged output and ansi",
-             "otherwise.  Valid formatters are:",
-             "#{formatters.join(', ')}.", formatters) do |value|
-        options[:formatter] = RDoc::Markup.const_get "To#{value.capitalize}"
-      end
-
-      opt.separator nil
-
-      opt.on("--help", "-h",
-             "Show help and exit.") do
-        puts opts
-        exit
-      end
-
-      opt.separator nil
-
-      opt.on("--version", "-v",
-             "Output version information and exit.") do
-        puts "#{opts.program_name} #{opts.version}"
-        exit
-      end
-
-      opt.separator nil
-      opt.separator "Data source options:"
-      opt.separator nil
-
-      opt.on("--[no-]list-doc-dirs",
-             "List the directories from which ri will",
-             "source documentation on stdout and exit.") do |list_doc_dirs|
-        options[:list_doc_dirs] = list_doc_dirs
-      end
-
-      opt.separator nil
-
-      opt.on("--doc-dir=DIRNAME", "-d", Array,
-             "List of directories from which to source",
-             "documentation in addition to the standard",
-             "directories.  May be repeated.") do |value|
-        value.each do |dir|
-          unless File.directory? dir then
-            raise OptionParser::InvalidArgument, "#{dir} is not a directory"
-          end
-
-          options[:extra_doc_dirs] << File.expand_path(dir)
-        end
-      end
-
-      opt.separator nil
-
-      opt.on("--no-standard-docs",
-             "Do not include documentation from",
-             "the Ruby standard library, site_lib,",
-             "installed gems, or ~/.rdoc.",
-             "Use with --doc-dir.") do
-        options[:use_system] = false
-        options[:use_site] = false
-        options[:use_gems] = false
-        options[:use_home] = false
-      end
-
-      opt.separator nil
-
-      opt.on("--[no-]system",
-             "Include documentation from Ruby's",
-             "standard library.  Defaults to true.") do |value|
-        options[:use_system] = value
-      end
-
-      opt.separator nil
-
-      opt.on("--[no-]site",
-             "Include documentation from libraries",
-             "installed in site_lib.",
-             "Defaults to true.") do |value|
-        options[:use_site] = value
-      end
-
-      opt.separator nil
-
-      opt.on("--[no-]gems",
-             "Include documentation from RubyGems.",
-             "Defaults to true.") do |value|
-        options[:use_gems] = value
-      end
-
-      opt.separator nil
-
-      opt.on("--[no-]home",
-             "Include documentation stored in ~/.rdoc.",
-             "Defaults to true.") do |value|
-        options[:use_home] = value
-      end
-
-      opt.separator nil
-      opt.separator "Debug options:"
-      opt.separator nil
-
-      opt.on("--[no-]profile",
-             "Run with the ruby profiler.") do |value|
-        options[:profile] = value
-      end
-
-      opt.separator nil
-
-      opt.on("--dump=CACHE", File,
-             "Dump data from an ri cache or data file.") do |value|
-        options[:dump_path] = value
-      end
-    end
-
-    argv = ENV['RI'].to_s.split(' ').concat argv
-
-    opts.parse! argv
-
-    options[:names] = argv
-
-    options[:use_stdout] ||= !$stdout.tty?
-    options[:use_stdout] ||= options[:interactive]
-    options[:width] ||= 72
-
-    options
-
-  rescue OptionParser::InvalidArgument, OptionParser::InvalidOption => e
-    puts opts
-    puts
-    puts e
-    exit 1
-  end
-
-  ##
-  # Runs the ri command line executable using +argv+
-
-  def self.run argv = ARGV
-    options = process_args argv
-
-    if options[:dump_path] then
-      dump options[:dump_path]
-      return
-    end
-
-    ri = new options
-    ri.run
-  end
-
-  ##
-  # Creates a new driver using +initial_options+ from ::process_args
-
-  def initialize initial_options = {}
-    @paging = false
-    @classes = nil
-
-    options = self.class.default_options.update(initial_options)
-
-    @formatter_klass = options[:formatter]
-
-    require 'profile' if options[:profile]
-
-    @names = options[:names]
-    @list = options[:list]
-
-    @doc_dirs = []
-    @stores   = []
-
-    RDoc::RI::Paths.each(options[:use_system], options[:use_site],
-                         options[:use_home], options[:use_gems],
-                         *options[:extra_doc_dirs]) do |path, type|
-      @doc_dirs << path
-
-      store = RDoc::RI::Store.new path, type
-      store.load_cache
-      @stores << store
-    end
-
-    @list_doc_dirs = options[:list_doc_dirs]
-
-    @interactive = options[:interactive]
-    @server      = options[:server]
-    @use_stdout  = options[:use_stdout]
-    @show_all    = options[:show_all]
-    @width       = options[:width]
-  end
-
-  ##
-  # Adds paths for undocumented classes +also_in+ to +out+
-
-  def add_also_in out, also_in
-    return if also_in.empty?
-
-    out << RDoc::Markup::Rule.new(1)
-    out << RDoc::Markup::Paragraph.new("Also found in:")
-
-    paths = RDoc::Markup::Verbatim.new
-    also_in.each do |store|
-      paths.parts.push store.friendly_path, "\n"
-    end
-    out << paths
-  end
-
-  ##
-  # Adds a class header to +out+ for class +name+ which is described in
-  # +classes+.
-
-  def add_class out, name, classes
-    heading = if classes.all? { |klass| klass.module? } then
-                name
-              else
-                superclass = classes.map do |klass|
-                  klass.superclass unless klass.module?
-                end.compact.shift || 'Object'
-
-                superclass = superclass.full_name unless String === superclass
-
-                "#{name} < #{superclass}"
-              end
-
-    out << RDoc::Markup::Heading.new(1, heading)
-    out << RDoc::Markup::BlankLine.new
-  end
-
-  ##
-  # Adds "(from ...)" to +out+ for +store+
-
-  def add_from out, store
-    out << RDoc::Markup::Paragraph.new("(from #{store.friendly_path})")
-  end
-
-  ##
-  # Adds +extends+ to +out+
-
-  def add_extends out, extends
-    add_extension_modules out, 'Extended by', extends
-  end
-
-  ##
-  # Adds a list of +extensions+ to this module of the given +type+ to +out+.
-  # add_includes and add_extends call this, so you should use those directly.
-
-  def add_extension_modules out, type, extensions
-    return if extensions.empty?
-
-    out << RDoc::Markup::Rule.new(1)
-    out << RDoc::Markup::Heading.new(1, "#{type}:")
-
-    extensions.each do |modules, store|
-      if modules.length == 1 then
-        add_extension_modules_single out, store, modules.first
-      else
-        add_extension_modules_multiple out, store, modules
-      end
-    end
-  end
-
-  ##
-  # Renders multiple included +modules+ from +store+ to +out+.
-
-  def add_extension_modules_multiple out, store, modules # :nodoc:
-    out << RDoc::Markup::Paragraph.new("(from #{store.friendly_path})")
-
-    wout, with = modules.partition { |incl| incl.comment.empty? }
-
-    out << RDoc::Markup::BlankLine.new unless with.empty?
-
-    with.each do |incl|
-      out << RDoc::Markup::Paragraph.new(incl.name)
-      out << RDoc::Markup::BlankLine.new
-      out << incl.comment
-    end
-
-    unless wout.empty? then
-      verb = RDoc::Markup::Verbatim.new
-
-      wout.each do |incl|
-        verb.push incl.name, "\n"
-      end
-
-      out << verb
-    end
-  end
-
-  ##
-  # Adds a single extension module +include+ from +store+ to +out+
-
-  def add_extension_modules_single out, store, include # :nodoc:
-    name = include.name
-    path = store.friendly_path
-    out << RDoc::Markup::Paragraph.new("#{name} (from #{path})")
-
-    if include.comment then
-      out << RDoc::Markup::BlankLine.new
-      out << include.comment
-    end
-  end
-
-  ##
-  # Adds +includes+ to +out+
-
-  def add_includes out, includes
-    add_extension_modules out, 'Includes', includes
-  end
-
-  ##
-  # Looks up the method +name+ and adds it to +out+
-
-  def add_method out, name
-    filtered   = lookup_method name
-
-    method_out = method_document name, filtered
-
-    out.concat method_out.parts
-  end
-
-  ##
-  # Adds documentation for all methods in +klass+ to +out+
-
-  def add_method_documentation out, klass
-    klass.method_list.each do |method|
-      begin
-        add_method out, method.full_name
-      rescue NotFoundError
-        next
-      end
-    end
-  end
-
-  ##
-  # Adds a list of +methods+ to +out+ with a heading of +name+
-
-  def add_method_list out, methods, name
-    return if methods.empty?
-
-    out << RDoc::Markup::Heading.new(1, "#{name}:")
-    out << RDoc::Markup::BlankLine.new
-
-    if @use_stdout and !@interactive then
-      out.concat methods.map { |method|
-        RDoc::Markup::Verbatim.new method
-      }
-    else
-      out << RDoc::Markup::IndentedParagraph.new(2, methods.join(', '))
-    end
-
-    out << RDoc::Markup::BlankLine.new
-  end
-
-  ##
-  # Returns ancestor classes of +klass+
-
-  def ancestors_of klass
-    ancestors = []
-
-    unexamined = [klass]
-    seen = []
-
-    loop do
-      break if unexamined.empty?
-      current = unexamined.shift
-      seen << current
-
-      stores = classes[current]
-
-      next unless stores and not stores.empty?
-
-      klasses = stores.flat_map do |store|
-        store.ancestors[current] || []
-      end.uniq
-
-      klasses = klasses - seen
-
-      ancestors.concat klasses
-      unexamined.concat klasses
-    end
-
-    ancestors.reverse
-  end
-
-  ##
-  # For RubyGems backwards compatibility
-
-  def class_cache # :nodoc:
-  end
-
-  ##
-  # Builds a RDoc::Markup::Document from +found+, +klasess+ and +includes+
-
-  def class_document name, found, klasses, includes, extends
-    also_in = []
-
-    out = RDoc::Markup::Document.new
-
-    add_class out, name, klasses
-
-    add_includes out, includes
-    add_extends  out, extends
-
-    found.each do |store, klass|
-      render_class out, store, klass, also_in
-    end
-
-    add_also_in out, also_in
-
-    out
-  end
-
-  ##
-  # Adds the class +comment+ to +out+.
-
-  def class_document_comment out, comment # :nodoc:
-    unless comment.empty? then
-      out << RDoc::Markup::Rule.new(1)
-
-      if comment.merged? then
-        parts = comment.parts
-        parts = parts.zip [RDoc::Markup::BlankLine.new] * parts.length
-        parts.flatten!
-        parts.pop
-
-        out.concat parts
-      else
-        out << comment
-      end
-    end
-  end
-
-  ##
-  # Adds the constants from +klass+ to the Document +out+.
-
-  def class_document_constants out, klass # :nodoc:
-    return if klass.constants.empty?
-
-    out << RDoc::Markup::Heading.new(1, "Constants:")
-    out << RDoc::Markup::BlankLine.new
-    list = RDoc::Markup::List.new :NOTE
-
-    constants = klass.constants.sort_by { |constant| constant.name }
-
-    list.items.concat constants.map { |constant|
-      parts = constant.comment.parts if constant.comment
-      parts << RDoc::Markup::Paragraph.new('[not documented]') if
-        parts.empty?
-
-      RDoc::Markup::ListItem.new(constant.name, *parts)
-    }
-
-    out << list
-    out << RDoc::Markup::BlankLine.new
-  end
-
-  ##
-  # Hash mapping a known class or module to the stores it can be loaded from
-
-  def classes
-    return @classes if @classes
-
-    @classes = {}
-
-    @stores.each do |store|
-      store.cache[:modules].each do |mod|
-        # using default block causes searched-for modules to be added
-        @classes[mod] ||= []
-        @classes[mod] << store
-      end
-    end
-
-    @classes
-  end
-
-  ##
-  # Returns the stores wherein +name+ is found along with the classes,
-  # extends and includes that match it
-
-  def classes_and_includes_and_extends_for name
-    klasses = []
-    extends = []
-    includes = []
-
-    found = @stores.map do |store|
-      begin
-        klass = store.load_class name
-        klasses  << klass
-        extends  << [klass.extends,  store] if klass.extends
-        includes << [klass.includes, store] if klass.includes
-        [store, klass]
-      rescue RDoc::Store::MissingFileError
-      end
-    end.compact
-
-    extends.reject!  do |modules,| modules.empty? end
-    includes.reject! do |modules,| modules.empty? end
-
-    [found, klasses, includes, extends]
-  end
-
-  ##
-  # Completes +name+ based on the caches.  For Readline
-
-  def complete name
-    completions = []
-
-    klass, selector, method = parse_name name
-
-    complete_klass  name, klass, selector, method, completions
-    complete_method name, klass, selector,         completions
-
-    completions.sort.uniq
-  end
-
-  def complete_klass name, klass, selector, method, completions # :nodoc:
-    klasses = classes.keys
-
-    # may need to include Foo when given Foo::
-    klass_name = method ? name : klass
-
-    if name !~ /#|\./ then
-      completions.replace klasses.grep(/^#{Regexp.escape klass_name}[^:]*$/)
-      completions.concat klasses.grep(/^#{Regexp.escape name}[^:]*$/) if
-        name =~ /::$/
-
-      completions << klass if classes.key? klass # to complete a method name
-    elsif selector then
-      completions << klass if classes.key? klass
-    elsif classes.key? klass_name then
-      completions << klass_name
-    end
-  end
-
-  def complete_method name, klass, selector, completions # :nodoc:
-    if completions.include? klass and name =~ /#|\.|::/ then
-      methods = list_methods_matching name
-
-      if not methods.empty? then
-        # remove Foo if given Foo:: and a method was found
-        completions.delete klass
-      elsif selector then
-        # replace Foo with Foo:: as given
-        completions.delete klass
-        completions << "#{klass}#{selector}"
-      end
-
-      completions.concat methods
-    end
-  end
-
-  ##
-  # Converts +document+ to text and writes it to the pager
-
-  def display document
-    page do |io|
-      f = formatter(io)
-      f.width = @width if @width and f.respond_to?(:width)
-      text = document.accept f
-
-      io.write text
-    end
-  end
-
-  ##
-  # Outputs formatted RI data for class +name+.  Groups undocumented classes
-
-  def display_class name
-    return if name =~ /#|\./
-
-    found, klasses, includes, extends =
-      classes_and_includes_and_extends_for name
-
-    return if found.empty?
-
-    out = class_document name, found, klasses, includes, extends
-
-    display out
-  end
-
-  ##
-  # Outputs formatted RI data for method +name+
-
-  def display_method name
-    out = RDoc::Markup::Document.new
-
-    add_method out, name
-
-    display out
-  end
-
-  ##
-  # Outputs formatted RI data for the class or method +name+.
-  #
-  # Returns true if +name+ was found, false if it was not an alternative could
-  # be guessed, raises an error if +name+ couldn't be guessed.
-
-  def display_name name
-    if name =~ /\w:(\w|$)/ then
-      display_page name
-      return true
-    end
-
-    return true if display_class name
-
-    display_method name if name =~ /::|#|\./
-
-    true
-  rescue NotFoundError
-    matches = list_methods_matching name if name =~ /::|#|\./
-    matches = classes.keys.grep(/^#{Regexp.escape name}/) if matches.empty?
-
-    raise if matches.empty?
-
-    page do |io|
-      io.puts "#{name} not found, maybe you meant:"
-      io.puts
-      io.puts matches.sort.join("\n")
-    end
-
-    false
-  end
-
-  ##
-  # Displays each name in +name+
-
-  def display_names names
-    names.each do |name|
-      name = expand_name name
-
-      display_name name
-    end
-  end
-
-  ##
-  # Outputs formatted RI data for page +name+.
-
-  def display_page name
-    store_name, page_name = name.split ':', 2
-
-    store = @stores.find { |s| s.source == store_name }
-
-    return display_page_list store if page_name.empty?
-
-    pages = store.cache[:pages]
-
-    unless pages.include? page_name then
-      found_names = pages.select do |n|
-        n =~ /#{Regexp.escape page_name}\.[^.]+$/
-      end
-
-      if found_names.length.zero? then
-        return display_page_list store, pages
-      elsif found_names.length > 1 then
-        return display_page_list store, found_names, page_name
-      end
-
-      page_name = found_names.first
-    end
-
-    page = store.load_page page_name
-
-    display page.comment
-  end
-
-  ##
-  # Outputs a formatted RI page list for the pages in +store+.
-
-  def display_page_list store, pages = store.cache[:pages], search = nil
-    out = RDoc::Markup::Document.new
-
-    title = if search then
-              "#{search} pages"
-            else
-              'Pages'
-            end
-
-    out << RDoc::Markup::Heading.new(1, "#{title} in #{store.friendly_path}")
-    out << RDoc::Markup::BlankLine.new
-
-    list = RDoc::Markup::List.new(:BULLET)
-
-    pages.each do |page|
-      list << RDoc::Markup::Paragraph.new(page)
-    end
-
-    out << list
-
-    display out
-  end
-
-  def check_did_you_mean # :nodoc:
-    if defined? DidYouMean::SpellChecker
-      true
-    else
-      begin
-        require 'did_you_mean'
-        if defined? DidYouMean::SpellChecker
-          true
-        else
-          false
-        end
-      rescue LoadError
-        false
-      end
-    end
-  end
-
-  ##
-  # Expands abbreviated klass +klass+ into a fully-qualified class.  "Zl::Da"
-  # will be expanded to Zlib::DataError.
-
-  def expand_class klass
-    class_names = classes.keys
-    ary = class_names.grep(Regexp.new("\\A#{klass.gsub(/(?=::|\z)/, '[^:]*')}\\z"))
-    if ary.length != 1 && ary.first != klass
-      if check_did_you_mean
-        suggestions = DidYouMean::SpellChecker.new(dictionary: class_names).correct(klass)
-        raise NotFoundError.new(klass, suggestions)
-      else
-        raise NotFoundError, klass
-      end
-    end
-    ary.first
-  end
-
-  ##
-  # Expands the class portion of +name+ into a fully-qualified class.  See
-  # #expand_class.
-
-  def expand_name name
-    klass, selector, method = parse_name name
-
-    return [selector, method].join if klass.empty?
-
-    case selector
-    when ':' then
-      [find_store(klass),   selector, method]
-    else
-      [expand_class(klass), selector, method]
-    end.join
-  end
-
-  ##
-  # Filters the methods in +found+ trying to find a match for +name+.
-
-  def filter_methods found, name
-    regexp = name_regexp name
-
-    filtered = found.find_all do |store, methods|
-      methods.any? { |method| method.full_name =~ regexp }
-    end
-
-    return filtered unless filtered.empty?
-
-    found
-  end
-
-  ##
-  # Yields items matching +name+ including the store they were found in, the
-  # class being searched for, the class they were found in (an ancestor) the
-  # types of methods to look up (from #method_type), and the method name being
-  # searched for
-
-  def find_methods name
-    klass, selector, method = parse_name name
-
-    types = method_type selector
-
-    klasses = nil
-    ambiguous = klass.empty?
-
-    if ambiguous then
-      klasses = classes.keys
-    else
-      klasses = ancestors_of klass
-      klasses.unshift klass
-    end
-
-    methods = []
-
-    klasses.each do |ancestor|
-      ancestors = classes[ancestor]
-
-      next unless ancestors
-
-      klass = ancestor if ambiguous
-
-      ancestors.each do |store|
-        methods << [store, klass, ancestor, types, method]
-      end
-    end
-
-    methods = methods.sort_by do |_, k, a, _, m|
-      [k, a, m].compact
-    end
-
-    methods.each do |item|
-      yield(*item) # :yields: store, klass, ancestor, types, method
-    end
-
-    self
-  end
-
-  ##
-  # Finds a store that matches +name+ which can be the name of a gem, "ruby",
-  # "home" or "site".
-  #
-  # See also RDoc::Store#source
-
-  def find_store name
-    @stores.each do |store|
-      source = store.source
-
-      return source if source == name
-
-      return source if
-        store.type == :gem and source =~ /^#{Regexp.escape name}-\d/
-    end
-
-    raise RDoc::RI::Driver::NotFoundError, name
-  end
-
-  ##
-  # Creates a new RDoc::Markup::Formatter.  If a formatter is given with -f,
-  # use it.  If we're outputting to a pager, use bs, otherwise ansi.
-
-  def formatter(io)
-    if @formatter_klass then
-      @formatter_klass.new
-    elsif paging? or !io.tty? then
-      RDoc::Markup::ToBs.new
-    else
-      RDoc::Markup::ToAnsi.new
-    end
-  end
-
-  ##
-  # Runs ri interactively using Readline if it is available.
-
-  def interactive
-    puts "\nEnter the method name you want to look up."
-
-    begin
-      require 'readline'
-    rescue LoadError
-    end
-    if defined? Readline then
-      Readline.completion_proc = method :complete
-      puts "You can use tab to autocomplete."
-    end
-
-    puts "Enter a blank line to exit.\n\n"
-
-    loop do
-      name = if defined? Readline then
-               Readline.readline ">> "
-             else
-               print ">> "
-               $stdin.gets
-             end
-
-      return if name.nil? or name.empty?
-
-      begin
-        display_name expand_name(name.strip)
-      rescue NotFoundError => e
-        puts e.message
-      end
-    end
-
-  rescue Interrupt
-    exit
-  end
-
-  ##
-  # Lists classes known to ri starting with +names+.  If +names+ is empty all
-  # known classes are shown.
-
-  def list_known_classes names = []
-    classes = []
-
-    stores.each do |store|
-      classes << store.module_names
-    end
-
-    classes = classes.flatten.uniq.sort
-
-    unless names.empty? then
-      filter = Regexp.union names.map { |name| /^#{name}/ }
-
-      classes = classes.grep filter
-    end
-
-    page do |io|
-      if paging? or io.tty? then
-        if names.empty? then
-          io.puts "Classes and Modules known to ri:"
-        else
-          io.puts "Classes and Modules starting with #{names.join ', '}:"
-        end
-        io.puts
-      end
-
-      io.puts classes.join("\n")
-    end
-  end
-
-  ##
-  # Returns an Array of methods matching +name+
-
-  def list_methods_matching name
-    found = []
-
-    find_methods name do |store, klass, ancestor, types, method|
-      if types == :instance or types == :both then
-        methods = store.instance_methods[ancestor]
-
-        if methods then
-          matches = methods.grep(/^#{Regexp.escape method.to_s}/)
-
-          matches = matches.map do |match|
-            "#{klass}##{match}"
-          end
-
-          found.concat matches
-        end
-      end
-
-      if types == :class or types == :both then
-        methods = store.class_methods[ancestor]
-
-        next unless methods
-        matches = methods.grep(/^#{Regexp.escape method.to_s}/)
-
-        matches = matches.map do |match|
-          "#{klass}::#{match}"
-        end
-
-        found.concat matches
-      end
-    end
-
-    found.uniq
-  end
-
-  ##
-  # Loads RI data for method +name+ on +klass+ from +store+.  +type+ and
-  # +cache+ indicate if it is a class or instance method.
-
-  def load_method store, cache, klass, type, name
-    methods = store.public_send(cache)[klass]
-
-    return unless methods
-
-    method = methods.find do |method_name|
-      method_name == name
-    end
-
-    return unless method
-
-    store.load_method klass, "#{type}#{method}"
-  rescue RDoc::Store::MissingFileError => e
-    comment = RDoc::Comment.new("missing documentation at #{e.file}").parse
-
-    method = RDoc::AnyMethod.new nil, name
-    method.comment = comment
-    method
-  end
-
-  ##
-  # Returns an Array of RI data for methods matching +name+
-
-  def load_methods_matching name
-    found = []
-
-    find_methods name do |store, klass, ancestor, types, method|
-      methods = []
-
-      methods << load_method(store, :class_methods, ancestor, '::',  method) if
-        [:class, :both].include? types
-
-      methods << load_method(store, :instance_methods, ancestor, '#',  method) if
-        [:instance, :both].include? types
-
-      found << [store, methods.compact]
-    end
-
-    found.reject do |path, methods| methods.empty? end
-  end
-
-  ##
-  # Returns a filtered list of methods matching +name+
-
-  def lookup_method name
-    found = load_methods_matching name
-
-    if found.empty?
-      if check_did_you_mean
-        methods = []
-        _, _, method_name = parse_name name
-        find_methods name do |store, klass, ancestor, types, method|
-          methods.push(*store.class_methods[klass]) if [:class, :both].include? types
-          methods.push(*store.instance_methods[klass]) if [:instance, :both].include? types
-        end
-        methods = methods.uniq
-        suggestions = DidYouMean::SpellChecker.new(dictionary: methods).correct(method_name)
-        raise NotFoundError.new(name, suggestions)
-      else
-        raise NotFoundError, name
-      end
-    end
-
-    filter_methods found, name
-  end
-
-  ##
-  # Builds a RDoc::Markup::Document from +found+, +klasses+ and +includes+
-
-  def method_document name, filtered
-    out = RDoc::Markup::Document.new
-
-    out << RDoc::Markup::Heading.new(1, name)
-    out << RDoc::Markup::BlankLine.new
-
-    filtered.each do |store, methods|
-      methods.each do |method|
-        render_method out, store, method, name
-      end
-    end
-
-    out
-  end
-
-  ##
-  # Returns the type of method (:both, :instance, :class) for +selector+
-
-  def method_type selector
-    case selector
-    when '.', nil then :both
-    when '#'      then :instance
-    else               :class
-    end
-  end
-
-  ##
-  # Returns a regular expression for +name+ that will match an
-  # RDoc::AnyMethod's name.
-
-  def name_regexp name
-    klass, type, name = parse_name name
-
-    case type
-    when '#', '::' then
-      /^#{klass}#{type}#{Regexp.escape name}$/
-    else
-      /^#{klass}(#|::)#{Regexp.escape name}$/
-    end
-  end
-
-  ##
-  # Paginates output through a pager program.
-
-  def page
-    if pager = setup_pager then
-      begin
-        yield pager
-      ensure
-        pager.close
-      end
-    else
-      yield $stdout
-    end
-  rescue Errno::EPIPE
-  ensure
-    @paging = false
-  end
-
-  ##
-  # Are we using a pager?
-
-  def paging?
-    @paging
-  end
-
-  ##
-  # Extracts the class, selector and method name parts from +name+ like
-  # Foo::Bar#baz.
-  #
-  # NOTE: Given Foo::Bar, Bar is considered a class even though it may be a
-  # method
-
-  def parse_name name
-    parts = name.split(/(::?|#|\.)/)
-
-    if parts.length == 1 then
-      if parts.first =~ /^[a-z]|^([%&*+\/<>^`|~-]|\+@|-@|<<|<=>?|===?|=>|=~|>>|\[\]=?|~@)$/ then
-        type = '.'
-        meth = parts.pop
-      else
-        type = nil
-        meth = nil
-      end
-    elsif parts.length == 2 or parts.last =~ /::|#|\./ then
-      type = parts.pop
-      meth = nil
-    elsif parts[1] == ':' then
-      klass = parts.shift
-      type  = parts.shift
-      meth  = parts.join
-    elsif parts[-2] != '::' or parts.last !~ /^[A-Z]/ then
-      meth = parts.pop
-      type = parts.pop
-    end
-
-    klass ||= parts.join
-
-    [klass, type, meth]
-  end
-
-  ##
-  # Renders the +klass+ from +store+ to +out+.  If the klass has no
-  # documentable items the class is added to +also_in+ instead.
-
-  def render_class out, store, klass, also_in # :nodoc:
-    comment = klass.comment
-    # TODO the store's cache should always return an empty Array
-    class_methods    = store.class_methods[klass.full_name]    || []
-    instance_methods = store.instance_methods[klass.full_name] || []
-    attributes       = store.attributes[klass.full_name]       || []
-
-    if comment.empty? and
-       instance_methods.empty? and class_methods.empty? then
-      also_in << store
-      return
-    end
-
-    add_from out, store
-
-    class_document_comment out, comment
-
-    if class_methods or instance_methods or not klass.constants.empty? then
-      out << RDoc::Markup::Rule.new(1)
-    end
-
-    class_document_constants out, klass
-
-    add_method_list out, class_methods,    'Class methods'
-    add_method_list out, instance_methods, 'Instance methods'
-    add_method_list out, attributes,       'Attributes'
-
-    add_method_documentation out, klass if @show_all
-  end
-
-  def render_method out, store, method, name # :nodoc:
-    out << RDoc::Markup::Paragraph.new("(from #{store.friendly_path})")
-
-    unless name =~ /^#{Regexp.escape method.parent_name}/ then
-      out << RDoc::Markup::Heading.new(3, "Implementation from #{method.parent_name}")
-    end
-
-    out << RDoc::Markup::Rule.new(1)
-
-    render_method_arguments out, method.arglists
-    render_method_superclass out, method
-    if method.is_alias_for
-      al = method.is_alias_for
-      alias_for = store.load_method al.parent_name, "#{al.name_prefix}#{al.name}"
-      render_method_comment out, method, alias_for
-    else
-      render_method_comment out, method
-    end
-  end
-
-  def render_method_arguments out, arglists # :nodoc:
-    return unless arglists
-
-    arglists = arglists.chomp.split "\n"
-    arglists = arglists.map { |line| line + "\n" }
-    out << RDoc::Markup::Verbatim.new(*arglists)
-    out << RDoc::Markup::Rule.new(1)
-  end
-
-  def render_method_comment out, method, alias_for = nil# :nodoc:
-    if alias_for
-      unless method.comment.nil? or method.comment.empty?
-        out << RDoc::Markup::BlankLine.new
-        out << method.comment
-      end
-      out << RDoc::Markup::BlankLine.new
-      out << RDoc::Markup::Paragraph.new("(This method is an alias for #{alias_for.full_name}.)")
-      out << RDoc::Markup::BlankLine.new
-      out << alias_for.comment
-      out << RDoc::Markup::BlankLine.new
-    else
-      out << RDoc::Markup::BlankLine.new
-      out << method.comment
-      out << RDoc::Markup::BlankLine.new
-    end
-  end
-
-  def render_method_superclass out, method # :nodoc:
-    return unless
-      method.respond_to?(:superclass_method) and method.superclass_method
-
-    out << RDoc::Markup::BlankLine.new
-    out << RDoc::Markup::Heading.new(4, "(Uses superclass method #{method.superclass_method})")
-    out << RDoc::Markup::Rule.new(1)
-  end
-
-  ##
-  # Looks up and displays ri data according to the options given.
-
-  def run
-    if @list_doc_dirs then
-      puts @doc_dirs
-    elsif @list then
-      list_known_classes @names
-    elsif @server then
-      start_server
-    elsif @interactive or @names.empty? then
-      interactive
-    else
-      display_names @names
-    end
-  rescue NotFoundError => e
-    abort e.message
-  end
-
-  ##
-  # Sets up a pager program to pass output through.  Tries the RI_PAGER and
-  # PAGER environment variables followed by pager, less then more.
-
-  def setup_pager
-    return if @use_stdout
-
-    pagers = [ENV['RI_PAGER'], ENV['PAGER'], 'pager', 'less', 'more']
-
-    require 'shellwords'
-    pagers.compact.uniq.each do |pager|
-      pager = Shellwords.split(pager)
-      next if pager.empty?
-
-      io = IO.popen(pager, 'w') rescue next
-      next if $? and $?.pid == io.pid and $?.exited? # pager didn't work
-
-      @paging = true
-
-      return io
-    end
-
-    @use_stdout = true
-
-    nil
-  end
-
-  ##
-  # Starts a WEBrick server for ri.
-
-  def start_server
-    begin
-      require 'webrick'
-    rescue LoadError
-      abort "webrick is not found. You may need to `gem install webrick` to install webrick."
-    end
-
-    server = WEBrick::HTTPServer.new :Port => @server
-
-    extra_doc_dirs = @stores.map {|s| s.type == :extra ? s.path : nil}.compact
-
-    server.mount '/', RDoc::Servlet, nil, extra_doc_dirs
-
-    trap 'INT'  do server.shutdown end
-    trap 'TERM' do server.shutdown end
-
-    server.start
-  end
-
-end
diff --git a/lib/rdoc/ri/formatter.rb b/lib/rdoc/ri/formatter.rb
deleted file mode 100644
index 832a101e6c212b..00000000000000
--- a/lib/rdoc/ri/formatter.rb
+++ /dev/null
@@ -1,6 +0,0 @@
-# frozen_string_literal: true
-##
-# For RubyGems backwards compatibility
-
-module RDoc::RI::Formatter # :nodoc:
-end
diff --git a/lib/rdoc/ri/paths.rb b/lib/rdoc/ri/paths.rb
deleted file mode 100644
index 8e89b04e548209..00000000000000
--- a/lib/rdoc/ri/paths.rb
+++ /dev/null
@@ -1,171 +0,0 @@
-# frozen_string_literal: true
-require_relative '../rdoc'
-
-##
-# The directories where ri data lives.  Paths can be enumerated via ::each, or
-# queried individually via ::system_dir, ::site_dir, ::home_dir and ::gem_dir.
-
-module RDoc::RI::Paths
-
-  #:stopdoc:
-  require 'rbconfig'
-
-  version = RbConfig::CONFIG['ruby_version']
-
-  BASE    = File.join RbConfig::CONFIG['ridir'], version
-
-  HOMEDIR = RDoc.home
-  #:startdoc:
-
-  ##
-  # Iterates over each selected path yielding the directory and type.
-  #
-  # Yielded types:
-  # :system:: Where Ruby's ri data is stored.  Yielded when +system+ is
-  #           true
-  # :site:: Where ri for installed libraries are stored.  Yielded when
-  #         +site+ is true.  Normally no ri data is stored here.
-  # :home:: ~/.rdoc.  Yielded when +home+ is true.
-  # :gem:: ri data for an installed gem.  Yielded when +gems+ is true.
-  # :extra:: ri data directory from the command line.  Yielded for each
-  #          entry in +extra_dirs+
-
-  def self.each system = true, site = true, home = true, gems = :latest, *extra_dirs # :yields: directory, type
-    return enum_for __method__, system, site, home, gems, *extra_dirs unless
-      block_given?
-
-    extra_dirs.each do |dir|
-      yield dir, :extra
-    end
-
-    yield system_dir,  :system if system
-    yield site_dir,    :site   if site
-    yield home_dir,    :home   if home and HOMEDIR
-
-    gemdirs(gems).each do |dir|
-      yield dir, :gem
-    end if gems
-
-    nil
-  end
-
-  ##
-  # The ri directory for the gem with +gem_name+.
-
-  def self.gem_dir name, version
-    req = Gem::Requirement.new "= #{version}"
-
-    spec = Gem::Specification.find_by_name name, req
-
-    File.join spec.doc_dir, 'ri'
-  end
-
-  ##
-  # The latest installed gems' ri directories.  +filter+ can be :all or
-  # :latest.
-  #
-  # A +filter+ :all includes all versions of gems and includes gems without
-  # ri documentation.
-
-  def self.gemdirs filter = :latest
-    ri_paths = {}
-
-    all = Gem::Specification.map do |spec|
-      [File.join(spec.doc_dir, 'ri'), spec.name, spec.version]
-    end
-
-    if filter == :all then
-      gemdirs = []
-
-      all.group_by do |_, name, _|
-        name
-      end.sort_by do |group, _|
-        group
-      end.map do |group, items|
-        items.sort_by do |_, _, version|
-          version
-        end.reverse_each do |dir,|
-          gemdirs << dir
-        end
-      end
-
-      return gemdirs
-    end
-
-    all.each do |dir, name, ver|
-      next unless File.exist? dir
-
-      if ri_paths[name].nil? or ver > ri_paths[name].first then
-        ri_paths[name] = [ver, name, dir]
-      end
-    end
-
-    ri_paths.sort_by { |_, (_, name, _)| name }.map { |k, v| v.last }
-  rescue LoadError
-    []
-  end
-
-  ##
-  # The location of the rdoc data in the user's home directory.
-  #
-  # Like ::system, ri data in the user's home directory is rare and predates
-  # libraries distributed via RubyGems.  ri data is rarely generated into this
-  # directory.
-
-  def self.home_dir
-    HOMEDIR
-  end
-
-  ##
-  # Returns existing directories from the selected documentation directories
-  # as an Array.
-  #
-  # See also ::each
-
-  def self.path(system = true, site = true, home = true, gems = :latest, *extra_dirs)
-    path = raw_path system, site, home, gems, *extra_dirs
-
-    path.select { |directory| File.directory? directory }
-  end
-
-  ##
-  # Returns selected documentation directories including nonexistent
-  # directories.
-  #
-  # See also ::each
-
-  def self.raw_path(system, site, home, gems, *extra_dirs)
-    path = []
-
-    each(system, site, home, gems, *extra_dirs) do |dir, type|
-      path << dir
-    end
-
-    path.compact
-  end
-
-  ##
-  # The location of ri data installed into the site dir.
-  #
-  # Historically this was available for documentation installed by Ruby
-  # libraries predating RubyGems.  It is unlikely to contain any content for
-  # modern Ruby installations.
-
-  def self.site_dir
-    File.join BASE, 'site'
-  end
-
-  ##
-  # The location of the built-in ri data.
-  #
-  # This data is built automatically when `make` is run when Ruby is
-  # installed.  If you did not install Ruby by hand you may need to install
-  # the documentation yourself.  Please consult the documentation for your
-  # package manager or Ruby installer for details.  You can also use the
-  # rdoc-data gem to install system ri data for common versions of Ruby.
-
-  def self.system_dir
-    File.join BASE, 'system'
-  end
-
-end
diff --git a/lib/rdoc/ri/store.rb b/lib/rdoc/ri/store.rb
deleted file mode 100644
index 96742e7ae3a79f..00000000000000
--- a/lib/rdoc/ri/store.rb
+++ /dev/null
@@ -1,6 +0,0 @@
-# frozen_string_literal: true
-module RDoc::RI
-
-  Store = RDoc::Store # :nodoc:
-
-end
diff --git a/lib/rdoc/ri/task.rb b/lib/rdoc/ri/task.rb
deleted file mode 100644
index 1122ea37756d65..00000000000000
--- a/lib/rdoc/ri/task.rb
+++ /dev/null
@@ -1,71 +0,0 @@
-# frozen_string_literal: true
-begin
-  gem 'rdoc'
-rescue Gem::LoadError
-end unless defined?(RDoc)
-
-require_relative '../task'
-
-##
-# RDoc::RI::Task creates ri data in <code>./.rdoc</code> for your project.
-#
-# It contains the following tasks:
-#
-# [ri]
-#   Build ri data
-#
-# [clobber_ri]
-#   Delete ri data files.  This target is automatically added to the main
-#   clobber target.
-#
-# [reri]
-#   Rebuild the ri data from scratch even if they are not out of date.
-#
-# Simple example:
-#
-#   require 'rdoc/ri/task'
-#
-#   RDoc::RI::Task.new do |ri|
-#     ri.main = 'README.rdoc'
-#     ri.rdoc_files.include 'README.rdoc', 'lib/**/*.rb'
-#   end
-#
-# For further configuration details see RDoc::Task.
-
-class RDoc::RI::Task < RDoc::Task
-
-  DEFAULT_NAMES = { # :nodoc:
-    :clobber_rdoc => :clobber_ri,
-    :rdoc         => :ri,
-    :rerdoc       => :reri,
-  }
-
-  ##
-  # Create an ri task with the given name. See RDoc::Task for documentation on
-  # setting names.
-
-  def initialize name = DEFAULT_NAMES # :yield: self
-    super
-  end
-
-  def clobber_task_description # :nodoc:
-    "Remove RI data files"
-  end
-
-  ##
-  # Sets default task values
-
-  def defaults
-    super
-
-    @rdoc_dir = '.rdoc'
-  end
-
-  def rdoc_task_description # :nodoc:
-    'Build RI data files'
-  end
-
-  def rerdoc_task_description # :nodoc:
-    'Rebuild RI data files'
-  end
-end
diff --git a/lib/rdoc/rubygems_hook.rb b/lib/rdoc/rubygems_hook.rb
deleted file mode 100644
index 3160072e5334d6..00000000000000
--- a/lib/rdoc/rubygems_hook.rb
+++ /dev/null
@@ -1,248 +0,0 @@
-# frozen_string_literal: true
-require 'rubygems/user_interaction'
-require 'fileutils'
-require_relative '../rdoc'
-
-##
-# Gem::RDoc provides methods to generate RDoc and ri data for installed gems
-# upon gem installation.
-#
-# This file is automatically required by RubyGems 1.9 and newer.
-
-class RDoc::RubygemsHook
-
-  include Gem::UserInteraction
-  extend  Gem::UserInteraction
-
-  @rdoc_version = nil
-  @specs = []
-
-  ##
-  # Force installation of documentation?
-
-  attr_accessor :force
-
-  ##
-  # Generate rdoc?
-
-  attr_accessor :generate_rdoc
-
-  ##
-  # Generate ri data?
-
-  attr_accessor :generate_ri
-
-  class << self
-
-    ##
-    # Loaded version of RDoc.  Set by ::load_rdoc
-
-    attr_reader :rdoc_version
-
-  end
-
-  ##
-  # Post installs hook that generates documentation for each specification in
-  # +specs+
-
-  def self.generation_hook installer, specs
-    start = Time.now
-    types = installer.document
-
-    generate_rdoc = types.include? 'rdoc'
-    generate_ri   = types.include? 'ri'
-
-    specs.each do |spec|
-      new(spec, generate_rdoc, generate_ri).generate
-    end
-
-    return unless generate_rdoc or generate_ri
-
-    duration = (Time.now - start).to_i
-    names    = specs.map(&:name).join ', '
-
-    say "Done installing documentation for #{names} after #{duration} seconds"
-  end
-
-  ##
-  # Loads the RDoc generator
-
-  def self.load_rdoc
-    return if @rdoc_version
-
-    require_relative 'rdoc'
-
-    @rdoc_version = Gem::Version.new ::RDoc::VERSION
-  end
-
-  ##
-  # Creates a new documentation generator for +spec+.  RDoc and ri data
-  # generation can be enabled or disabled through +generate_rdoc+ and
-  # +generate_ri+ respectively.
-  #
-  # Only +generate_ri+ is enabled by default.
-
-  def initialize spec, generate_rdoc = false, generate_ri = true
-    @doc_dir   = spec.doc_dir
-    @force     = false
-    @rdoc      = nil
-    @spec      = spec
-
-    @generate_rdoc = generate_rdoc
-    @generate_ri   = generate_ri
-
-    @rdoc_dir = spec.doc_dir 'rdoc'
-    @ri_dir   = spec.doc_dir 'ri'
-  end
-
-  ##
-  # Removes legacy rdoc arguments from +args+
-  #--
-  # TODO move to RDoc::Options
-
-  def delete_legacy_args args
-    args.delete '--inline-source'
-    args.delete '--promiscuous'
-    args.delete '-p'
-    args.delete '--one-file'
-  end
-
-  ##
-  # Generates documentation using the named +generator+ ("darkfish" or "ri")
-  # and following the given +options+.
-  #
-  # Documentation will be generated into +destination+
-
-  def document generator, options, destination
-    generator_name = generator
-
-    options = options.dup
-    options.exclude ||= [] # TODO maybe move to RDoc::Options#finish
-    options.setup_generator generator
-    options.op_dir = destination
-    Dir.chdir @spec.full_gem_path do
-      options.finish
-    end
-
-    generator = options.generator.new @rdoc.store, options
-
-    @rdoc.options = options
-    @rdoc.generator = generator
-
-    say "Installing #{generator_name} documentation for #{@spec.full_name}"
-
-    FileUtils.mkdir_p options.op_dir
-
-    Dir.chdir options.op_dir do
-      begin
-        @rdoc.class.current = @rdoc
-        @rdoc.generator.generate
-      ensure
-        @rdoc.class.current = nil
-      end
-    end
-  end
-
-  ##
-  # Generates RDoc and ri data
-
-  def generate
-    return if @spec.default_gem?
-    return unless @generate_ri or @generate_rdoc
-
-    setup
-
-    options = nil
-
-    args = @spec.rdoc_options
-    args.concat @spec.source_paths
-    args.concat @spec.extra_rdoc_files
-
-    case config_args = Gem.configuration[:rdoc]
-    when String then
-      args = args.concat config_args.split(' ')
-    when Array then
-      args = args.concat config_args
-    end
-
-    delete_legacy_args args
-
-    Dir.chdir @spec.full_gem_path do
-      options = ::RDoc::Options.new
-      options.default_title = "#{@spec.full_name} Documentation"
-      options.parse args
-    end
-
-    options.quiet = !Gem.configuration.really_verbose
-
-    @rdoc = new_rdoc
-    @rdoc.options = options
-
-    store = RDoc::Store.new
-    store.encoding = options.encoding
-    store.dry_run  = options.dry_run
-    store.main     = options.main_page
-    store.title    = options.title
-
-    @rdoc.store = store
-
-    say "Parsing documentation for #{@spec.full_name}"
-
-    Dir.chdir @spec.full_gem_path do
-      @rdoc.parse_files options.files
-    end
-
-    document 'ri',       options, @ri_dir if
-      @generate_ri   and (@force or not File.exist? @ri_dir)
-
-    document 'darkfish', options, @rdoc_dir if
-      @generate_rdoc and (@force or not File.exist? @rdoc_dir)
-  end
-
-  ##
-  # #new_rdoc creates a new RDoc instance.  This method is provided only to
-  # make testing easier.
-
-  def new_rdoc # :nodoc:
-    ::RDoc::RDoc.new
-  end
-
-  ##
-  # Is rdoc documentation installed?
-
-  def rdoc_installed?
-    File.exist? @rdoc_dir
-  end
-
-  ##
-  # Removes generated RDoc and ri data
-
-  def remove
-    base_dir = @spec.base_dir
-
-    raise Gem::FilePermissionError, base_dir unless File.writable? base_dir
-
-    FileUtils.rm_rf @rdoc_dir
-    FileUtils.rm_rf @ri_dir
-  end
-
-  ##
-  # Is ri data installed?
-
-  def ri_installed?
-    File.exist? @ri_dir
-  end
-
-  ##
-  # Prepares the spec for documentation generation
-
-  def setup
-    self.class.load_rdoc
-
-    raise Gem::FilePermissionError, @doc_dir if
-      File.exist?(@doc_dir) and not File.writable?(@doc_dir)
-
-    FileUtils.mkdir_p @doc_dir unless File.exist? @doc_dir
-  end
-
-end
diff --git a/lib/rdoc/servlet.rb b/lib/rdoc/servlet.rb
deleted file mode 100644
index d05368766ad5b8..00000000000000
--- a/lib/rdoc/servlet.rb
+++ /dev/null
@@ -1,451 +0,0 @@
-# frozen_string_literal: true
-require_relative '../rdoc'
-require 'erb'
-require 'time'
-require 'json'
-
-begin
-  require 'webrick'
-rescue LoadError
-  abort "webrick is not found. You may need to `gem install webrick` to install webrick."
-end
-
-##
-# This is a WEBrick servlet that allows you to browse ri documentation.
-#
-# You can show documentation through either `ri --server` or, with RubyGems
-# 2.0 or newer, `gem server`.  For ri, the server runs on port 8214 by
-# default.  For RubyGems the server runs on port 8808 by default.
-#
-# You can use this servlet in your own project by mounting it on a WEBrick
-# server:
-#
-#   require 'webrick'
-#
-#   server = WEBrick::HTTPServer.new Port: 8000
-#
-#   server.mount '/', RDoc::Servlet
-#
-# If you want to mount the servlet some other place than the root, provide the
-# base path when mounting:
-#
-#   server.mount '/rdoc', RDoc::Servlet, '/rdoc'
-
-class RDoc::Servlet < WEBrick::HTTPServlet::AbstractServlet
-
-  @server_stores = Hash.new { |hash, server| hash[server] = {} }
-  @cache         = Hash.new { |hash, store|  hash[store]  = {} }
-
-  ##
-  # Maps an asset type to its path on the filesystem
-
-  attr_reader :asset_dirs
-
-  ##
-  # An RDoc::Options instance used for rendering options
-
-  attr_reader :options
-
-  ##
-  # Creates an instance of this servlet that shares cached data between
-  # requests.
-
-  def self.get_instance server, *options # :nodoc:
-    stores = @server_stores[server]
-
-    new server, stores, @cache, *options
-  end
-
-  ##
-  # Creates a new WEBrick servlet.
-  #
-  # Use +mount_path+ when mounting the servlet somewhere other than /.
-  #
-  # Use +extra_doc_dirs+ for additional documentation directories.
-  #
-  # +server+ is provided automatically by WEBrick when mounting.  +stores+ and
-  # +cache+ are provided automatically by the servlet.
-
-  def initialize server, stores, cache, mount_path = nil, extra_doc_dirs = []
-    super server
-
-    @cache      = cache
-    @mount_path = mount_path
-    @extra_doc_dirs = extra_doc_dirs
-    @stores     = stores
-
-    @options = RDoc::Options.new
-    @options.op_dir = '.'
-
-    darkfish_dir = nil
-
-    # HACK dup
-    $LOAD_PATH.each do |path|
-      darkfish_dir = File.join path, 'rdoc/generator/template/darkfish/'
-      next unless File.directory? darkfish_dir
-      @options.template_dir = darkfish_dir
-      break
-    end
-
-    @asset_dirs = {
-      :darkfish   => darkfish_dir,
-      :json_index =>
-        File.expand_path('../generator/template/json_index/', __FILE__),
-    }
-  end
-
-  ##
-  # Serves the asset at the path in +req+ for +generator_name+ via +res+.
-
-  def asset generator_name, req, res
-    asset_dir = @asset_dirs[generator_name]
-
-    asset_path = File.join asset_dir, req.path
-
-    if_modified_since req, res, asset_path
-
-    res.body = File.read asset_path
-
-    res.content_type = case req.path
-                       when /\.css\z/ then 'text/css'
-                       when /\.js\z/  then 'application/javascript'
-                       else                'application/octet-stream'
-                       end
-  end
-
-  ##
-  # GET request entry point.  Fills in +res+ for the path, etc. in +req+.
-
-  def do_GET req, res
-    req.path.sub!(/\A#{Regexp.escape @mount_path}/, '') if @mount_path
-
-    case req.path
-    when '/' then
-      root req, res
-    when '/js/darkfish.js', '/js/jquery.js', '/js/search.js',
-         %r%^/css/%, %r%^/images/%, %r%^/fonts/% then
-      asset :darkfish, req, res
-    when '/js/navigation.js', '/js/searcher.js' then
-      asset :json_index, req, res
-    when '/js/search_index.js' then
-      root_search req, res
-    else
-      show_documentation req, res
-    end
-  rescue WEBrick::HTTPStatus::NotFound => e
-    generator = generator_for RDoc::Store.new
-
-    not_found generator, req, res, e.message
-  rescue WEBrick::HTTPStatus::Status
-    raise
-  rescue => e
-    error e, req, res
-  end
-
-  ##
-  # Fills in +res+ with the class, module or page for +req+ from +store+.
-  #
-  # +path+ is relative to the mount_path and is used to determine the class,
-  # module or page name (/RDoc/Servlet.html becomes RDoc::Servlet).
-  # +generator+ is used to create the page.
-
-  def documentation_page store, generator, path, req, res
-    text_name = path.chomp '.html'
-    name = text_name.gsub '/', '::'
-
-    if klass = store.find_class_or_module(name) then
-      res.body = generator.generate_class klass
-    elsif page = store.find_text_page(name.sub(/_([^_]*)\z/, '.\1')) then
-      res.body = generator.generate_page page
-    elsif page = store.find_text_page(text_name.sub(/_([^_]*)\z/, '.\1')) then
-      res.body = generator.generate_page page
-    else
-      not_found generator, req, res
-    end
-  end
-
-  ##
-  # Creates the JSON search index on +res+ for the given +store+.  +generator+
-  # must respond to \#json_index to build.  +req+ is ignored.
-
-  def documentation_search store, generator, req, res
-    json_index = @cache[store].fetch :json_index do
-      @cache[store][:json_index] =
-        JSON.dump generator.json_index.build_index
-    end
-
-    res.content_type = 'application/javascript'
-    res.body = "var search_data = #{json_index}"
-  end
-
-  ##
-  # Returns the RDoc::Store and path relative to +mount_path+ for
-  # documentation at +path+.
-
-  def documentation_source path
-    _, source_name, path = path.split '/', 3
-
-    store = @stores[source_name]
-    return store, path if store
-
-    store = store_for source_name
-
-    store.load_all
-
-    @stores[source_name] = store
-
-    return store, path
-  end
-
-  ##
-  # Generates an error page for the +exception+ while handling +req+ on +res+.
-
-  def error exception, req, res
-    backtrace = exception.backtrace.join "\n"
-
-    res.content_type = 'text/html'
-    res.status = 500
-    res.body = <<-BODY
-<!DOCTYPE html>
-<html>
-<head>
-<meta content="text/html; charset=UTF-8" http-equiv="Content-Type">
-
-<title>Error - #{ERB::Util.html_escape exception.class}</title>
-
-<link type="text/css" media="screen" href="#{@mount_path}/css/rdoc.css" rel="stylesheet">
-</head>
-<body>
-<h1>Error</h1>
-
-<p>While processing <code>#{ERB::Util.html_escape req.request_uri}</code> the
-RDoc (#{ERB::Util.html_escape RDoc::VERSION}) server has encountered a
-<code>#{ERB::Util.html_escape exception.class}</code>
-exception:
-
-<pre>#{ERB::Util.html_escape exception.message}</pre>
-
-<p>Please report this to the
-<a href="https://github.com/ruby/rdoc/issues">RDoc issues tracker</a>.  Please
-include the RDoc version, the URI above and exception class, message and
-backtrace.  If you're viewing a gem's documentation, include the gem name and
-version.  If you're viewing Ruby's documentation, include the version of ruby.
-
-<p>Backtrace:
-
-<pre>#{ERB::Util.html_escape backtrace}</pre>
-
-</body>
-</html>
-    BODY
-  end
-
-  ##
-  # Instantiates a Darkfish generator for +store+
-
-  def generator_for store
-    generator = RDoc::Generator::Darkfish.new store, @options
-    generator.file_output = false
-    generator.asset_rel_path = '..'
-
-    rdoc = RDoc::RDoc.new
-    rdoc.store     = store
-    rdoc.generator = generator
-    rdoc.options   = @options
-
-    @options.main_page = store.main
-    @options.title     = store.title
-
-    generator
-  end
-
-  ##
-  # Handles the If-Modified-Since HTTP header on +req+ for +path+.  If the
-  # file has not been modified a Not Modified response is returned.  If the
-  # file has been modified a Last-Modified header is added to +res+.
-
-  def if_modified_since req, res, path = nil
-    last_modified = File.stat(path).mtime if path
-
-    res['last-modified'] = last_modified.httpdate
-
-    return unless ims = req['if-modified-since']
-
-    ims = Time.parse ims
-
-    unless ims < last_modified then
-      res.body = ''
-      raise WEBrick::HTTPStatus::NotModified
-    end
-  end
-
-  ##
-  # Returns an Array of installed documentation.
-  #
-  # Each entry contains the documentation name (gem name, 'Ruby
-  # Documentation', etc.), the path relative to the mount point, whether the
-  # documentation exists, the type of documentation (See RDoc::RI::Paths#each)
-  # and the filesystem to the RDoc::Store for the documentation.
-
-  def installed_docs
-    extra_counter = 0
-    ri_paths.map do |path, type|
-      store = RDoc::Store.new path, type
-      exists = File.exist? store.cache_path
-
-      case type
-      when :gem then
-        gem_path = path[%r%/([^/]*)/ri$%, 1]
-        [gem_path, "#{gem_path}/", exists, type, path]
-      when :system then
-        ['Ruby Documentation', 'ruby/', exists, type, path]
-      when :site then
-        ['Site Documentation', 'site/', exists, type, path]
-      when :home then
-        ['Home Documentation', 'home/', exists, type, path]
-      when :extra then
-        extra_counter += 1
-        store.load_cache if exists
-        title = store.title || "Extra Documentation"
-        [title, "extra-#{extra_counter}/", exists, type, path]
-      end
-    end
-  end
-
-  ##
-  # Returns a 404 page built by +generator+ for +req+ on +res+.
-
-  def not_found generator, req, res, message = nil
-    message ||= "The page <kbd>#{ERB::Util.h req.path}</kbd> was not found"
-    res.body = generator.generate_servlet_not_found message
-    res.status = 404
-  end
-
-  ##
-  # Enumerates the ri paths.  See RDoc::RI::Paths#each
-
-  def ri_paths &block
-    RDoc::RI::Paths.each true, true, true, :all, *@extra_doc_dirs, &block #TODO: pass extra_dirs
-  end
-
-  ##
-  # Generates the root page on +res+.  +req+ is ignored.
-
-  def root req, res
-    generator = RDoc::Generator::Darkfish.new nil, @options
-
-    res.body = generator.generate_servlet_root installed_docs
-
-    res.content_type = 'text/html'
-  end
-
-  ##
-  # Generates a search index for the root page on +res+.  +req+ is ignored.
-
-  def root_search req, res
-    search_index = []
-    info         = []
-
-    installed_docs.map do |name, href, exists, type, path|
-      next unless exists
-
-      search_index << name
-
-      case type
-      when :gem
-        gemspec = path.gsub(%r%/doc/([^/]*?)/ri$%,
-                            '/specifications/\1.gemspec')
-
-        spec = Gem::Specification.load gemspec
-
-        path    = spec.full_name
-        comment = spec.summary
-      when :system then
-        path    = 'ruby'
-        comment = 'Documentation for the Ruby standard library'
-      when :site then
-        path    = 'site'
-        comment = 'Documentation for non-gem libraries'
-      when :home then
-        path    = 'home'
-        comment = 'Documentation from your home directory'
-      when :extra
-        comment = name
-      end
-
-      info << [name, '', path, '', comment]
-    end
-
-    index = {
-      :index => {
-        :searchIndex     => search_index,
-        :longSearchIndex => search_index,
-        :info            => info,
-      }
-    }
-
-    res.body = "var search_data = #{JSON.dump index};"
-    res.content_type = 'application/javascript'
-  end
-
-  ##
-  # Displays documentation for +req+ on +res+, whether that be HTML or some
-  # asset.
-
-  def show_documentation req, res
-    store, path = documentation_source req.path
-
-    if_modified_since req, res, store.cache_path
-
-    generator = generator_for store
-
-    case path
-    when nil, '', 'index.html' then
-      res.body = generator.generate_index
-    when 'table_of_contents.html' then
-      res.body = generator.generate_table_of_contents
-    when 'js/search_index.js' then
-      documentation_search store, generator, req, res
-    else
-      documentation_page store, generator, path, req, res
-    end
-  ensure
-    res.content_type ||= 'text/html'
-  end
-
-  ##
-  # Returns an RDoc::Store for the given +source_name+ ('ruby' or a gem name).
-
-  def store_for source_name
-    case source_name
-    when 'home' then
-      RDoc::Store.new RDoc::RI::Paths.home_dir, :home
-    when 'ruby' then
-      RDoc::Store.new RDoc::RI::Paths.system_dir, :system
-    when 'site' then
-      RDoc::Store.new RDoc::RI::Paths.site_dir, :site
-    when /\Aextra-(\d+)\z/ then
-      index = $1.to_i - 1
-      ri_dir = installed_docs[index][4]
-      RDoc::Store.new ri_dir, :extra
-    else
-      ri_dir, type = ri_paths.find do |dir, dir_type|
-        next unless dir_type == :gem
-
-        source_name == dir[%r%/([^/]*)/ri$%, 1]
-      end
-
-      raise WEBrick::HTTPStatus::NotFound,
-            "Could not find gem \"#{ERB::Util.html_escape(source_name)}\". Are you sure you installed it?" unless ri_dir
-
-      store = RDoc::Store.new ri_dir, type
-
-      return store if File.exist? store.cache_path
-
-      raise WEBrick::HTTPStatus::NotFound,
-            "Could not find documentation for \"#{ERB::Util.html_escape(source_name)}\". Please run `gem rdoc --ri gem_name`"
-
-    end
-  end
-
-end
diff --git a/lib/rdoc/single_class.rb b/lib/rdoc/single_class.rb
deleted file mode 100644
index dd16529648e5e1..00000000000000
--- a/lib/rdoc/single_class.rb
+++ /dev/null
@@ -1,30 +0,0 @@
-# frozen_string_literal: true
-##
-# A singleton class
-
-class RDoc::SingleClass < RDoc::ClassModule
-
-  ##
-  # Adds the superclass to the included modules.
-
-  def ancestors
-    superclass ? super + [superclass] : super
-  end
-
-  def aref_prefix # :nodoc:
-    'sclass'
-  end
-
-  ##
-  # The definition of this singleton class, <tt>class << MyClassName</tt>
-
-  def definition
-    "class << #{full_name}"
-  end
-
-  def pretty_print q # :nodoc:
-    q.group 2, "[class << #{full_name}", "]" do
-      next
-    end
-  end
-end
diff --git a/lib/rdoc/stats.rb b/lib/rdoc/stats.rb
deleted file mode 100644
index 4817c9c7290308..00000000000000
--- a/lib/rdoc/stats.rb
+++ /dev/null
@@ -1,461 +0,0 @@
-# frozen_string_literal: true
-##
-# RDoc statistics collector which prints a summary and report of a project's
-# documentation totals.
-
-class RDoc::Stats
-
-  include RDoc::Text
-
-  ##
-  # Output level for the coverage report
-
-  attr_reader :coverage_level
-
-  ##
-  # Count of files parsed during parsing
-
-  attr_reader :files_so_far
-
-  ##
-  # Total number of files found
-
-  attr_reader :num_files
-
-  ##
-  # Creates a new Stats that will have +num_files+.  +verbosity+ defaults to 1
-  # which will create an RDoc::Stats::Normal outputter.
-
-  def initialize store, num_files, verbosity = 1
-    @num_files = num_files
-    @store     = store
-
-    @coverage_level   = 0
-    @doc_items        = nil
-    @files_so_far     = 0
-    @fully_documented = false
-    @num_params       = 0
-    @percent_doc      = nil
-    @start            = Time.now
-    @undoc_params     = 0
-
-    @display = case verbosity
-               when 0 then Quiet.new   num_files
-               when 1 then Normal.new  num_files
-               else        Verbose.new num_files
-               end
-  end
-
-  ##
-  # Records the parsing of an alias +as+.
-
-  def add_alias as
-    @display.print_alias as
-  end
-
-  ##
-  # Records the parsing of an attribute +attribute+
-
-  def add_attribute attribute
-    @display.print_attribute attribute
-  end
-
-  ##
-  # Records the parsing of a class +klass+
-
-  def add_class klass
-    @display.print_class klass
-  end
-
-  ##
-  # Records the parsing of +constant+
-
-  def add_constant constant
-    @display.print_constant constant
-  end
-
-  ##
-  # Records the parsing of +file+
-
-  def add_file(file)
-    @files_so_far += 1
-    @display.print_file @files_so_far, file
-  end
-
-  ##
-  # Records the parsing of +method+
-
-  def add_method(method)
-    @display.print_method method
-  end
-
-  ##
-  # Records the parsing of a module +mod+
-
-  def add_module(mod)
-    @display.print_module mod
-  end
-
-  ##
-  # Call this to mark the beginning of parsing for display purposes
-
-  def begin_adding
-    @display.begin_adding
-  end
-
-  ##
-  # Calculates documentation totals and percentages for classes, modules,
-  # constants, attributes and methods.
-
-  def calculate
-    return if @doc_items
-
-    ucm = @store.unique_classes_and_modules
-
-    classes = @store.unique_classes.reject { |cm| cm.full_name == 'Object' }
-
-    constants = []
-    ucm.each { |cm| constants.concat cm.constants }
-
-    methods = []
-    ucm.each { |cm| methods.concat cm.method_list }
-
-    attributes = []
-    ucm.each { |cm| attributes.concat cm.attributes }
-
-    @num_attributes, @undoc_attributes = doc_stats attributes
-    @num_classes,    @undoc_classes    = doc_stats classes
-    @num_constants,  @undoc_constants  = doc_stats constants
-    @num_methods,    @undoc_methods    = doc_stats methods
-    @num_modules,    @undoc_modules    = doc_stats @store.unique_modules
-
-    @num_items =
-      @num_attributes +
-      @num_classes +
-      @num_constants +
-      @num_methods +
-      @num_modules +
-      @num_params
-
-    @undoc_items =
-      @undoc_attributes +
-      @undoc_classes +
-      @undoc_constants +
-      @undoc_methods +
-      @undoc_modules +
-      @undoc_params
-
-    @doc_items = @num_items - @undoc_items
-  end
-
-  ##
-  # Sets coverage report level.  Accepted values are:
-  #
-  # false or nil:: No report
-  # 0:: Classes, modules, constants, attributes, methods
-  # 1:: Level 0 + method parameters
-
-  def coverage_level= level
-    level = -1 unless level
-
-    @coverage_level = level
-  end
-
-  ##
-  # Returns the length and number of undocumented items in +collection+.
-
-  def doc_stats collection
-    visible = collection.select { |item| item.display? }
-    [visible.length, visible.count { |item| not item.documented? }]
-  end
-
-  ##
-  # Call this to mark the end of parsing for display purposes
-
-  def done_adding
-    @display.done_adding
-  end
-
-  ##
-  # The documentation status of this project.  +true+ when 100%, +false+ when
-  # less than 100% and +nil+ when unknown.
-  #
-  # Set by calling #calculate
-
-  def fully_documented?
-    @fully_documented
-  end
-
-  ##
-  # A report that says you did a great job!
-
-  def great_job
-    report = RDoc::Markup::Document.new
-
-    report << RDoc::Markup::Paragraph.new('100% documentation!')
-    report << RDoc::Markup::Paragraph.new('Great Job!')
-
-    report
-  end
-
-  ##
-  # Calculates the percentage of items documented.
-
-  def percent_doc
-    return @percent_doc if @percent_doc
-
-    @fully_documented = (@num_items - @doc_items) == 0
-
-    @percent_doc = @doc_items.to_f / @num_items * 100 if @num_items.nonzero?
-    @percent_doc ||= 0
-
-    @percent_doc
-  end
-
-  ##
-  # Returns a report on which items are not documented
-
-  def report
-    if @coverage_level > 0 then
-      extend RDoc::Text
-    end
-
-    if @coverage_level.zero? then
-      calculate
-
-      return great_job if @num_items == @doc_items
-    end
-
-    ucm = @store.unique_classes_and_modules
-
-    report = RDoc::Markup::Document.new
-    report << RDoc::Markup::Paragraph.new('The following items are not documented:')
-    report << RDoc::Markup::BlankLine.new
-
-    ucm.sort.each do |cm|
-      body = report_class_module(cm) {
-        [
-          report_constants(cm),
-          report_attributes(cm),
-          report_methods(cm),
-        ].compact
-      }
-
-      report << body if body
-    end
-
-    if @coverage_level > 0 then
-      calculate
-
-      return great_job if @num_items == @doc_items
-    end
-
-    report
-  end
-
-  ##
-  # Returns a report on undocumented attributes in ClassModule +cm+
-
-  def report_attributes cm
-    return if cm.attributes.empty?
-
-    report = []
-
-    cm.each_attribute do |attr|
-      next if attr.documented?
-      line = attr.line ? ":#{attr.line}" : nil
-      report << "  #{attr.definition} :#{attr.name} # in file #{attr.file.full_name}#{line}\n"
-      report << "\n"
-    end
-
-    report
-  end
-
-  ##
-  # Returns a report on undocumented items in ClassModule +cm+
-
-  def report_class_module cm
-    return if cm.fully_documented? and @coverage_level.zero?
-    return unless cm.display?
-
-    report = RDoc::Markup::Document.new
-
-    if cm.in_files.empty? then
-      report << RDoc::Markup::Paragraph.new("#{cm.definition} is referenced but empty.")
-      report << RDoc::Markup::Paragraph.new("It probably came from another project.  I'm sorry I'm holding it against you.")
-
-      return report
-    elsif cm.documented? then
-      documented = true
-      klass = RDoc::Markup::Verbatim.new("#{cm.definition} # is documented\n")
-    else
-      report << RDoc::Markup::Paragraph.new('In files:')
-
-      list = RDoc::Markup::List.new :BULLET
-
-      cm.in_files.each do |file|
-        para = RDoc::Markup::Paragraph.new file.full_name
-        list << RDoc::Markup::ListItem.new(nil, para)
-      end
-
-      report << list
-      report << RDoc::Markup::BlankLine.new
-
-      klass = RDoc::Markup::Verbatim.new("#{cm.definition}\n")
-    end
-
-    klass << "\n"
-
-    body = yield.flatten # HACK remove #flatten
-
-    if body.empty? then
-      return if documented
-
-      klass.parts.pop
-    else
-      klass.parts.concat body
-    end
-
-    klass << "end\n"
-
-    report << klass
-
-    report
-  end
-
-  ##
-  # Returns a report on undocumented constants in ClassModule +cm+
-
-  def report_constants cm
-    return if cm.constants.empty?
-
-    report = []
-
-    cm.each_constant do |constant|
-      # TODO constant aliases are listed in the summary but not reported
-      # figure out what to do here
-      next if constant.documented? || constant.is_alias_for
-
-      line = constant.line ? ":#{constant.line}" : line
-      report << "  # in file #{constant.file.full_name}#{line}\n"
-      report << "  #{constant.name} = nil\n"
-      report << "\n"
-    end
-
-    report
-  end
-
-  ##
-  # Returns a report on undocumented methods in ClassModule +cm+
-
-  def report_methods cm
-    return if cm.method_list.empty?
-
-    report = []
-
-    cm.each_method do |method|
-      next if method.documented? and @coverage_level.zero?
-
-      if @coverage_level > 0 then
-        params, undoc = undoc_params method
-
-        @num_params += params
-
-        unless undoc.empty? then
-          @undoc_params += undoc.length
-
-          undoc = undoc.map do |param| "+#{param}+" end
-          param_report = "  # #{undoc.join ', '} is not documented\n"
-        end
-      end
-
-      next if method.documented? and not param_report
-
-      line = method.line ? ":#{method.line}" : nil
-      scope = method.singleton ? 'self.' : nil
-
-      report << "  # in file #{method.file.full_name}#{line}\n"
-      report << param_report if param_report
-      report << "  def #{scope}#{method.name}#{method.params}; end\n"
-      report << "\n"
-    end
-
-    report
-  end
-
-  ##
-  # Returns a summary of the collected statistics.
-
-  def summary
-    calculate
-
-    num_width = [@num_files, @num_items].max.to_s.length
-    undoc_width = [
-      @undoc_attributes,
-      @undoc_classes,
-      @undoc_constants,
-      @undoc_items,
-      @undoc_methods,
-      @undoc_modules,
-      @undoc_params,
-    ].max.to_s.length
-
-    report = RDoc::Markup::Verbatim.new
-
-    report << "Files:      %*d\n" % [num_width, @num_files]
-
-    report << "\n"
-
-    report << "Classes:    %*d (%*d undocumented)\n" % [
-      num_width, @num_classes, undoc_width, @undoc_classes]
-    report << "Modules:    %*d (%*d undocumented)\n" % [
-      num_width, @num_modules, undoc_width, @undoc_modules]
-    report << "Constants:  %*d (%*d undocumented)\n" % [
-      num_width, @num_constants, undoc_width, @undoc_constants]
-    report << "Attributes: %*d (%*d undocumented)\n" % [
-      num_width, @num_attributes, undoc_width, @undoc_attributes]
-    report << "Methods:    %*d (%*d undocumented)\n" % [
-      num_width, @num_methods, undoc_width, @undoc_methods]
-    report << "Parameters: %*d (%*d undocumented)\n" % [
-      num_width, @num_params, undoc_width, @undoc_params] if
-        @coverage_level > 0
-
-    report << "\n"
-
-    report << "Total:      %*d (%*d undocumented)\n" % [
-      num_width, @num_items, undoc_width, @undoc_items]
-
-    report << "%6.2f%% documented\n" % percent_doc
-    report << "\n"
-    report << "Elapsed: %0.1fs\n" % (Time.now - @start)
-
-    RDoc::Markup::Document.new report
-  end
-
-  ##
-  # Determines which parameters in +method+ were not documented.  Returns a
-  # total parameter count and an Array of undocumented methods.
-
-  def undoc_params method
-    @formatter ||= RDoc::Markup::ToTtOnly.new
-
-    params = method.param_list
-
-    params = params.map { |param| param.gsub(/^\*\*?/, '') }
-
-    return 0, [] if params.empty?
-
-    document = parse method.comment
-
-    tts = document.accept @formatter
-
-    undoc = params - tts
-
-    [params.length, undoc]
-  end
-
-  autoload :Quiet,   "#{__dir__}/stats/quiet"
-  autoload :Normal,  "#{__dir__}/stats/normal"
-  autoload :Verbose, "#{__dir__}/stats/verbose"
-
-end
diff --git a/lib/rdoc/stats/normal.rb b/lib/rdoc/stats/normal.rb
deleted file mode 100644
index 0a22f0582b44dc..00000000000000
--- a/lib/rdoc/stats/normal.rb
+++ /dev/null
@@ -1,58 +0,0 @@
-# frozen_string_literal: true
-begin
-  require 'io/console/size'
-rescue LoadError
-  # for JRuby
-  require 'io/console'
-end
-
-##
-# Stats printer that prints just the files being documented with a progress
-# bar
-
-class RDoc::Stats::Normal < RDoc::Stats::Quiet
-
-  def begin_adding # :nodoc:
-    puts "Parsing sources..."
-    @last_width = 0
-  end
-
-  ##
-  # Prints a file with a progress bar
-
-  def print_file files_so_far, filename
-    progress_bar = sprintf("%3d%% [%2d/%2d]  ",
-                           100 * files_so_far / @num_files,
-                           files_so_far,
-                           @num_files)
-
-    if $stdout.tty?
-      # Print a progress bar, but make sure it fits on a single line. Filename
-      # will be truncated if necessary.
-      size = IO.respond_to?(:console_size) ? IO.console_size : IO.console.winsize
-      terminal_width = size[1].to_i.nonzero? || 80
-      max_filename_size = (terminal_width - progress_bar.size) - 1
-
-      if filename.size > max_filename_size then
-        # Turn "some_long_filename.rb" to "...ong_filename.rb"
-        filename = filename[(filename.size - max_filename_size) .. -1]
-        filename[0..2] = "..."
-      end
-
-      # Clean the line with whitespaces so that leftover output from the
-      # previous line doesn't show up.
-      $stdout.print("\r\e[K") if @last_width && @last_width > 0
-      @last_width = progress_bar.size + filename.size
-      term = "\r"
-    else
-      term = "\n"
-    end
-    $stdout.print(progress_bar, filename, term)
-    $stdout.flush
-  end
-
-  def done_adding # :nodoc:
-    puts
-  end
-
-end
diff --git a/lib/rdoc/stats/quiet.rb b/lib/rdoc/stats/quiet.rb
deleted file mode 100644
index 9c98ea5f860671..00000000000000
--- a/lib/rdoc/stats/quiet.rb
+++ /dev/null
@@ -1,59 +0,0 @@
-# frozen_string_literal: true
-##
-# Stats printer that prints nothing
-
-class RDoc::Stats::Quiet
-
-  ##
-  # Creates a new Quiet that will print nothing
-
-  def initialize num_files
-    @num_files = num_files
-  end
-
-  ##
-  # Prints a message at the beginning of parsing
-
-  def begin_adding(*) end
-
-  ##
-  # Prints when an alias is added
-
-  def print_alias(*) end
-
-  ##
-  # Prints when an attribute is added
-
-  def print_attribute(*) end
-
-  ##
-  # Prints when a class is added
-
-  def print_class(*) end
-
-  ##
-  # Prints when a constant is added
-
-  def print_constant(*) end
-
-  ##
-  # Prints when a file is added
-
-  def print_file(*) end
-
-  ##
-  # Prints when a method is added
-
-  def print_method(*) end
-
-  ##
-  # Prints when a module is added
-
-  def print_module(*) end
-
-  ##
-  # Prints when RDoc is done
-
-  def done_adding(*) end
-
-end
diff --git a/lib/rdoc/stats/verbose.rb b/lib/rdoc/stats/verbose.rb
deleted file mode 100644
index 7090d561f87243..00000000000000
--- a/lib/rdoc/stats/verbose.rb
+++ /dev/null
@@ -1,44 +0,0 @@
-# frozen_string_literal: true
-##
-# Stats printer that prints everything documented, including the documented
-# status
-
-class RDoc::Stats::Verbose < RDoc::Stats::Normal
-
-  ##
-  # Returns a marker for RDoc::CodeObject +co+ being undocumented
-
-  def nodoc co
-    " (undocumented)" unless co.documented?
-  end
-
-  def print_alias as # :nodoc:
-    puts "    alias #{as.new_name} #{as.old_name}#{nodoc as}"
-  end
-
-  def print_attribute attribute # :nodoc:
-    puts "    #{attribute.definition} #{attribute.name}#{nodoc attribute}"
-  end
-
-  def print_class(klass) # :nodoc:
-    puts "  class #{klass.full_name}#{nodoc klass}"
-  end
-
-  def print_constant(constant) # :nodoc:
-    puts "    #{constant.name}#{nodoc constant}"
-  end
-
-  def print_file(files_so_far, file) # :nodoc:
-    super
-    puts
-  end
-
-  def print_method(method) # :nodoc:
-    puts "    #{method.singleton ? '::' : '#'}#{method.name}#{nodoc method}"
-  end
-
-  def print_module(mod) # :nodoc:
-    puts "  module #{mod.full_name}#{nodoc mod}"
-  end
-
-end
diff --git a/lib/rdoc/store.rb b/lib/rdoc/store.rb
deleted file mode 100644
index 9fc540d3172bd2..00000000000000
--- a/lib/rdoc/store.rb
+++ /dev/null
@@ -1,979 +0,0 @@
-# frozen_string_literal: true
-require 'fileutils'
-
-##
-# A set of rdoc data for a single project (gem, path, etc.).
-#
-# The store manages reading and writing ri data for a project and maintains a
-# cache of methods, classes and ancestors in the store.
-#
-# The store maintains a #cache of its contents for faster lookup.  After
-# adding items to the store it must be flushed using #save_cache.  The cache
-# contains the following structures:
-#
-#    @cache = {
-#      :ancestors        => {}, # class name => ancestor names
-#      :attributes       => {}, # class name => attributes
-#      :class_methods    => {}, # class name => class methods
-#      :instance_methods => {}, # class name => instance methods
-#      :modules          => [], # classes and modules in this store
-#      :pages            => [], # page names
-#    }
-#--
-# TODO need to prune classes
-
-class RDoc::Store
-
-  ##
-  # Errors raised from loading or saving the store
-
-  class Error < RDoc::Error
-  end
-
-  ##
-  # Raised when a stored file for a class, module, page or method is missing.
-
-  class MissingFileError < Error
-
-    ##
-    # The store the file should exist in
-
-    attr_reader :store
-
-    ##
-    # The file the #name should be saved as
-
-    attr_reader :file
-
-    ##
-    # The name of the object the #file would be loaded from
-
-    attr_reader :name
-
-    ##
-    # Creates a new MissingFileError for the missing +file+ for the given
-    # +name+ that should have been in the +store+.
-
-    def initialize store, file, name
-      @store = store
-      @file  = file
-      @name  = name
-    end
-
-    def message # :nodoc:
-      "store at #{@store.path} missing file #{@file} for #{@name}"
-    end
-
-  end
-
-  ##
-  # Stores the name of the C variable a class belongs to.  This helps wire up
-  # classes defined from C across files.
-
-  attr_reader :c_enclosure_classes # :nodoc:
-
-  attr_reader :c_enclosure_names # :nodoc:
-
-  ##
-  # Maps C variables to class or module names for each parsed C file.
-
-  attr_reader :c_class_variables
-
-  ##
-  # Maps C variables to singleton class names for each parsed C file.
-
-  attr_reader :c_singleton_class_variables
-
-  ##
-  # If true this Store will not write any files
-
-  attr_accessor :dry_run
-
-  ##
-  # Path this store reads or writes
-
-  attr_accessor :path
-
-  ##
-  # The RDoc::RDoc driver for this parse tree.  This allows classes consulting
-  # the documentation tree to access user-set options, for example.
-
-  attr_accessor :rdoc
-
-  ##
-  # Type of ri datastore this was loaded from.  See RDoc::RI::Driver,
-  # RDoc::RI::Paths.
-
-  attr_accessor :type
-
-  ##
-  # The contents of the Store
-
-  attr_reader :cache
-
-  ##
-  # The encoding of the contents in the Store
-
-  attr_accessor :encoding
-
-  ##
-  # The lazy constants alias will be discovered in passing
-
-  attr_reader :unmatched_constant_alias
-
-  ##
-  # Creates a new Store of +type+ that will load or save to +path+
-
-  def initialize path = nil, type = nil
-    @dry_run  = false
-    @encoding = nil
-    @path     = path
-    @rdoc     = nil
-    @type     = type
-
-    @cache = {
-      :ancestors                   => {},
-      :attributes                  => {},
-      :class_methods               => {},
-      :c_class_variables           => {},
-      :c_singleton_class_variables => {},
-      :encoding                    => @encoding,
-      :instance_methods            => {},
-      :main                        => nil,
-      :modules                     => [],
-      :pages                       => [],
-      :title                       => nil,
-    }
-
-    @classes_hash = {}
-    @modules_hash = {}
-    @files_hash   = {}
-    @text_files_hash = {}
-
-    @c_enclosure_classes = {}
-    @c_enclosure_names   = {}
-
-    @c_class_variables           = {}
-    @c_singleton_class_variables = {}
-
-    @unique_classes = nil
-    @unique_modules = nil
-
-    @unmatched_constant_alias = {}
-  end
-
-  ##
-  # Adds +module+ as an enclosure (namespace) for the given +variable+ for C
-  # files.
-
-  def add_c_enclosure variable, namespace
-    @c_enclosure_classes[variable] = namespace
-  end
-
-  ##
-  # Adds C variables from an RDoc::Parser::C
-
-  def add_c_variables c_parser
-    filename = c_parser.top_level.relative_name
-
-    @c_class_variables[filename] = make_variable_map c_parser.classes
-
-    @c_singleton_class_variables[filename] = c_parser.singleton_classes
-  end
-
-  ##
-  # Adds the file with +name+ as an RDoc::TopLevel to the store.  Returns the
-  # created RDoc::TopLevel.
-
-  def add_file absolute_name, relative_name: absolute_name, parser: nil
-    unless top_level = @files_hash[relative_name] then
-      top_level = RDoc::TopLevel.new absolute_name, relative_name
-      top_level.parser = parser if parser
-      top_level.store = self
-      @files_hash[relative_name] = top_level
-      @text_files_hash[relative_name] = top_level if top_level.text?
-    end
-
-    top_level
-  end
-
-  def update_parser_of_file(absolute_name, parser)
-    if top_level = @files_hash[absolute_name] then
-      @text_files_hash[absolute_name] = top_level if top_level.text?
-    end
-  end
-
-  ##
-  # Returns all classes discovered by RDoc
-
-  def all_classes
-    @classes_hash.values
-  end
-
-  ##
-  # Returns all classes and modules discovered by RDoc
-
-  def all_classes_and_modules
-    @classes_hash.values + @modules_hash.values
-  end
-
-  ##
-  # All TopLevels known to RDoc
-
-  def all_files
-    @files_hash.values
-  end
-
-  ##
-  # Returns all modules discovered by RDoc
-
-  def all_modules
-    modules_hash.values
-  end
-
-  ##
-  # Ancestors cache accessor.  Maps a klass name to an Array of its ancestors
-  # in this store.  If Foo in this store inherits from Object, Kernel won't be
-  # listed (it will be included from ruby's ri store).
-
-  def ancestors
-    @cache[:ancestors]
-  end
-
-  ##
-  # Attributes cache accessor.  Maps a class to an Array of its attributes.
-
-  def attributes
-    @cache[:attributes]
-  end
-
-  ##
-  # Path to the cache file
-
-  def cache_path
-    File.join @path, 'cache.ri'
-  end
-
-  ##
-  # Path to the ri data for +klass_name+
-
-  def class_file klass_name
-    name = klass_name.split('::').last
-    File.join class_path(klass_name), "cdesc-#{name}.ri"
-  end
-
-  ##
-  # Class methods cache accessor.  Maps a class to an Array of its class
-  # methods (not full name).
-
-  def class_methods
-    @cache[:class_methods]
-  end
-
-  ##
-  # Path where data for +klass_name+ will be stored (methods or class data)
-
-  def class_path klass_name
-    File.join @path, *klass_name.split('::')
-  end
-
-  ##
-  # Hash of all classes known to RDoc
-
-  def classes_hash
-    @classes_hash
-  end
-
-  ##
-  # Removes empty items and ensures item in each collection are unique and
-  # sorted
-
-  def clean_cache_collection collection # :nodoc:
-    collection.each do |name, item|
-      if item.empty? then
-        collection.delete name
-      else
-        # HACK mongrel-1.1.5 documents its files twice
-        item.uniq!
-        item.sort!
-      end
-    end
-  end
-
-  ##
-  # Prepares the RDoc code object tree for use by a generator.
-  #
-  # It finds unique classes/modules defined, and replaces classes/modules that
-  # are aliases for another one by a copy with RDoc::ClassModule#is_alias_for
-  # set.
-  #
-  # It updates the RDoc::ClassModule#constant_aliases attribute of "real"
-  # classes or modules.
-  #
-  # It also completely removes the classes and modules that should be removed
-  # from the documentation and the methods that have a visibility below
-  # +min_visibility+, which is the <tt>--visibility</tt> option.
-  #
-  # See also RDoc::Context#remove_from_documentation?
-
-  def complete min_visibility
-    fix_basic_object_inheritance
-
-    # cache included modules before they are removed from the documentation
-    all_classes_and_modules.each { |cm| cm.ancestors }
-
-    unless min_visibility == :nodoc then
-      remove_nodoc @classes_hash
-      remove_nodoc @modules_hash
-    end
-
-    @unique_classes = find_unique @classes_hash
-    @unique_modules = find_unique @modules_hash
-
-    unique_classes_and_modules.each do |cm|
-      cm.complete min_visibility
-    end
-
-    @files_hash.each_key do |file_name|
-      tl = @files_hash[file_name]
-
-      unless tl.text? then
-        tl.modules_hash.clear
-        tl.classes_hash.clear
-
-        tl.classes_or_modules.each do |cm|
-          name = cm.full_name
-          if cm.type == 'class' then
-            tl.classes_hash[name] = cm if @classes_hash[name]
-          else
-            tl.modules_hash[name] = cm if @modules_hash[name]
-          end
-        end
-      end
-    end
-  end
-
-  ##
-  # Hash of all files known to RDoc
-
-  def files_hash
-    @files_hash
-  end
-
-  ##
-  # Finds the enclosure (namespace) for the given C +variable+.
-
-  def find_c_enclosure variable
-    @c_enclosure_classes.fetch variable do
-      break unless name = @c_enclosure_names[variable]
-
-      mod = find_class_or_module name
-
-      unless mod then
-        loaded_mod = load_class_data name
-
-        file = loaded_mod.in_files.first
-
-        return unless file # legacy data source
-
-        file.store = self
-
-        mod = file.add_module RDoc::NormalModule, name
-      end
-
-      @c_enclosure_classes[variable] = mod
-    end
-  end
-
-  ##
-  # Finds the class with +name+ in all discovered classes
-
-  def find_class_named name
-    @classes_hash[name]
-  end
-
-  ##
-  # Finds the class with +name+ starting in namespace +from+
-
-  def find_class_named_from name, from
-    from = find_class_named from unless RDoc::Context === from
-
-    until RDoc::TopLevel === from do
-      return nil unless from
-
-      klass = from.find_class_named name
-      return klass if klass
-
-      from = from.parent
-    end
-
-    find_class_named name
-  end
-
-  ##
-  # Finds the class or module with +name+
-
-  def find_class_or_module name
-    name = $' if name =~ /^::/
-    @classes_hash[name] || @modules_hash[name]
-  end
-
-  ##
-  # Finds the file with +name+ in all discovered files
-
-  def find_file_named name
-    @files_hash[name]
-  end
-
-  ##
-  # Finds the module with +name+ in all discovered modules
-
-  def find_module_named name
-    @modules_hash[name]
-  end
-
-  ##
-  # Returns the RDoc::TopLevel that is a text file and has the given
-  # +file_name+
-
-  def find_text_page file_name
-    @text_files_hash.each_value.find do |file|
-      file.full_name == file_name
-    end
-  end
-
-  ##
-  # Finds unique classes/modules defined in +all_hash+,
-  # and returns them as an array. Performs the alias
-  # updates in +all_hash+: see ::complete.
-  #--
-  # TODO  aliases should be registered by Context#add_module_alias
-
-  def find_unique all_hash
-    unique = []
-
-    all_hash.each_pair do |full_name, cm|
-      unique << cm if full_name == cm.full_name
-    end
-
-    unique
-  end
-
-  ##
-  # Fixes the erroneous <tt>BasicObject < Object</tt> in 1.9.
-  #
-  # Because we assumed all classes without a stated superclass
-  # inherit from Object, we have the above wrong inheritance.
-  #
-  # We fix BasicObject right away if we are running in a Ruby
-  # version >= 1.9.
-
-  def fix_basic_object_inheritance
-    basic = classes_hash['BasicObject']
-    return unless basic
-    basic.superclass = nil
-  end
-
-  ##
-  # Friendly rendition of #path
-
-  def friendly_path
-    case type
-    when :gem    then
-      parent = File.expand_path '..', @path
-      "gem #{File.basename parent}"
-    when :home   then RDoc.home
-    when :site   then 'ruby site'
-    when :system then 'ruby core'
-    else @path
-    end
-  end
-
-  def inspect # :nodoc:
-    "#<%s:0x%x %s %p>" % [self.class, object_id, @path, module_names.sort]
-  end
-
-  ##
-  # Instance methods cache accessor.  Maps a class to an Array of its
-  # instance methods (not full name).
-
-  def instance_methods
-    @cache[:instance_methods]
-  end
-
-  ##
-  # Loads all items from this store into memory.  This recreates a
-  # documentation tree for use by a generator
-
-  def load_all
-    load_cache
-
-    module_names.each do |module_name|
-      mod = find_class_or_module(module_name) || load_class(module_name)
-
-      # load method documentation since the loaded class/module does not have
-      # it
-      loaded_methods = mod.method_list.map do |method|
-        load_method module_name, method.full_name
-      end
-
-      mod.method_list.replace loaded_methods
-
-      loaded_attributes = mod.attributes.map do |attribute|
-        load_method module_name, attribute.full_name
-      end
-
-      mod.attributes.replace loaded_attributes
-    end
-
-    all_classes_and_modules.each do |mod|
-      descendent_re = /^#{mod.full_name}::[^:]+$/
-
-      module_names.each do |name|
-        next unless name =~ descendent_re
-
-        descendent = find_class_or_module name
-
-        case descendent
-        when RDoc::NormalClass then
-          mod.classes_hash[name] = descendent
-        when RDoc::NormalModule then
-          mod.modules_hash[name] = descendent
-        end
-      end
-    end
-
-    @cache[:pages].each do |page_name|
-      page = load_page page_name
-      @files_hash[page_name] = page
-      @text_files_hash[page_name] = page if page.text?
-    end
-  end
-
-  ##
-  # Loads cache file for this store
-
-  def load_cache
-    #orig_enc = @encoding
-
-    File.open cache_path, 'rb' do |io|
-      @cache = Marshal.load io
-    end
-
-    load_enc = @cache[:encoding]
-
-    # TODO this feature will be time-consuming to add:
-    # a) Encodings may be incompatible but transcodeable
-    # b) Need to warn in the appropriate spots, wherever they may be
-    # c) Need to handle cross-cache differences in encodings
-    # d) Need to warn when generating into a cache with different encodings
-    #
-    #if orig_enc and load_enc != orig_enc then
-    #  warn "Cached encoding #{load_enc} is incompatible with #{orig_enc}\n" \
-    #       "from #{path}/cache.ri" unless
-    #    Encoding.compatible? orig_enc, load_enc
-    #end
-
-    @encoding = load_enc unless @encoding
-
-    @cache[:pages]                       ||= []
-    @cache[:main]                        ||= nil
-    @cache[:c_class_variables]           ||= {}
-    @cache[:c_singleton_class_variables] ||= {}
-
-    @cache[:c_class_variables].each do |_, map|
-      map.each do |variable, name|
-        @c_enclosure_names[variable] = name
-      end
-    end
-
-    @cache
-  rescue Errno::ENOENT
-  end
-
-  ##
-  # Loads ri data for +klass_name+ and hooks it up to this store.
-
-  def load_class klass_name
-    obj = load_class_data klass_name
-
-    obj.store = self
-
-    case obj
-    when RDoc::NormalClass then
-      @classes_hash[klass_name] = obj
-    when RDoc::SingleClass then
-      @classes_hash[klass_name] = obj
-    when RDoc::NormalModule then
-      @modules_hash[klass_name] = obj
-    end
-  end
-
-  ##
-  # Loads ri data for +klass_name+
-
-  def load_class_data klass_name
-    file = class_file klass_name
-
-    File.open file, 'rb' do |io|
-      Marshal.load io
-    end
-  rescue Errno::ENOENT => e
-    error = MissingFileError.new(self, file, klass_name)
-    error.set_backtrace e.backtrace
-    raise error
-  end
-
-  ##
-  # Loads ri data for +method_name+ in +klass_name+
-
-  def load_method klass_name, method_name
-    file = method_file klass_name, method_name
-
-    File.open file, 'rb' do |io|
-      obj = Marshal.load io
-      obj.store = self
-      obj.parent =
-        find_class_or_module(klass_name) || load_class(klass_name) unless
-          obj.parent
-      obj
-    end
-  rescue Errno::ENOENT => e
-    error = MissingFileError.new(self, file, klass_name + method_name)
-    error.set_backtrace e.backtrace
-    raise error
-  end
-
-  ##
-  # Loads ri data for +page_name+
-
-  def load_page page_name
-    file = page_file page_name
-
-    File.open file, 'rb' do |io|
-      obj = Marshal.load io
-      obj.store = self
-      obj
-    end
-  rescue Errno::ENOENT => e
-    error = MissingFileError.new(self, file, page_name)
-    error.set_backtrace e.backtrace
-    raise error
-  end
-
-  ##
-  # Gets the main page for this RDoc store.  This page is used as the root of
-  # the RDoc server.
-
-  def main
-    @cache[:main]
-  end
-
-  ##
-  # Sets the main page for this RDoc store.
-
-  def main= page
-    @cache[:main] = page
-  end
-
-  ##
-  # Converts the variable => ClassModule map +variables+ from a C parser into
-  # a variable => class name map.
-
-  def make_variable_map variables
-    map = {}
-
-    variables.each { |variable, class_module|
-      map[variable] = class_module.full_name
-    }
-
-    map
-  end
-
-  ##
-  # Path to the ri data for +method_name+ in +klass_name+
-
-  def method_file klass_name, method_name
-    method_name = method_name.split('::').last
-    method_name =~ /#(.*)/
-    method_type = $1 ? 'i' : 'c'
-    method_name = $1 if $1
-    method_name = method_name.gsub(/\W/) { "%%%02x" % $&[0].ord }
-
-    File.join class_path(klass_name), "#{method_name}-#{method_type}.ri"
-  end
-
-  ##
-  # Modules cache accessor.  An Array of all the module (and class) names in
-  # the store.
-
-  def module_names
-    @cache[:modules]
-  end
-
-  ##
-  # Hash of all modules known to RDoc
-
-  def modules_hash
-    @modules_hash
-  end
-
-  ##
-  # Returns the RDoc::TopLevel that is a text file and has the given +name+
-
-  def page name
-    @text_files_hash.each_value.find do |file|
-      file.page_name == name or file.base_name == name
-    end
-  end
-
-  ##
-  # Path to the ri data for +page_name+
-
-  def page_file page_name
-    file_name = File.basename(page_name).gsub('.', '_')
-
-    File.join @path, File.dirname(page_name), "page-#{file_name}.ri"
-  end
-
-  ##
-  # Removes from +all_hash+ the contexts that are nodoc or have no content.
-  #
-  # See RDoc::Context#remove_from_documentation?
-
-  def remove_nodoc all_hash
-    all_hash.keys.each do |name|
-      context = all_hash[name]
-      all_hash.delete(name) if context.remove_from_documentation?
-    end
-  end
-
-  ##
-  # Saves all entries in the store
-
-  def save
-    load_cache
-
-    all_classes_and_modules.each do |klass|
-      save_class klass
-
-      klass.each_method do |method|
-        save_method klass, method
-      end
-
-      klass.each_attribute do |attribute|
-        save_method klass, attribute
-      end
-    end
-
-    all_files.each do |file|
-      save_page file
-    end
-
-    save_cache
-  end
-
-  ##
-  # Writes the cache file for this store
-
-  def save_cache
-    clean_cache_collection @cache[:ancestors]
-    clean_cache_collection @cache[:attributes]
-    clean_cache_collection @cache[:class_methods]
-    clean_cache_collection @cache[:instance_methods]
-
-    @cache[:modules].uniq!
-    @cache[:modules].sort!
-
-    @cache[:pages].uniq!
-    @cache[:pages].sort!
-
-    @cache[:encoding] = @encoding # this gets set twice due to assert_cache
-
-    @cache[:c_class_variables].merge!           @c_class_variables
-    @cache[:c_singleton_class_variables].merge! @c_singleton_class_variables
-
-    return if @dry_run
-
-    File.open cache_path, 'wb' do |io|
-      Marshal.dump @cache, io
-    end
-  end
-
-  ##
-  # Writes the ri data for +klass+ (or module)
-
-  def save_class klass
-    full_name = klass.full_name
-
-    FileUtils.mkdir_p class_path(full_name) unless @dry_run
-
-    @cache[:modules] << full_name
-
-    path = class_file full_name
-
-    begin
-      disk_klass = load_class full_name
-
-      klass = disk_klass.merge klass
-    rescue MissingFileError
-    end
-
-    # BasicObject has no ancestors
-    ancestors = klass.direct_ancestors.compact.map do |ancestor|
-      # HACK for classes we don't know about (class X < RuntimeError)
-      String === ancestor ? ancestor : ancestor.full_name
-    end
-
-    @cache[:ancestors][full_name] ||= []
-    @cache[:ancestors][full_name].concat ancestors
-
-    attribute_definitions = klass.attributes.map do |attribute|
-      "#{attribute.definition} #{attribute.name}"
-    end
-
-    unless attribute_definitions.empty? then
-      @cache[:attributes][full_name] ||= []
-      @cache[:attributes][full_name].concat attribute_definitions
-    end
-
-    to_delete = []
-
-    unless klass.method_list.empty? then
-      @cache[:class_methods][full_name]    ||= []
-      @cache[:instance_methods][full_name] ||= []
-
-      class_methods, instance_methods =
-        klass.method_list.partition { |meth| meth.singleton }
-
-      class_methods    = class_methods.   map { |method| method.name }
-      instance_methods = instance_methods.map { |method| method.name }
-      attribute_names  = klass.attributes.map { |attr|   attr.name }
-
-      old = @cache[:class_methods][full_name] - class_methods
-      to_delete.concat old.map { |method|
-        method_file full_name, "#{full_name}::#{method}"
-      }
-
-      old = @cache[:instance_methods][full_name] -
-        instance_methods - attribute_names
-      to_delete.concat old.map { |method|
-        method_file full_name, "#{full_name}##{method}"
-      }
-
-      @cache[:class_methods][full_name]    = class_methods
-      @cache[:instance_methods][full_name] = instance_methods
-    end
-
-    return if @dry_run
-
-    FileUtils.rm_f to_delete
-
-    File.open path, 'wb' do |io|
-      Marshal.dump klass, io
-    end
-  end
-
-  ##
-  # Writes the ri data for +method+ on +klass+
-
-  def save_method klass, method
-    full_name = klass.full_name
-
-    FileUtils.mkdir_p class_path(full_name) unless @dry_run
-
-    cache = if method.singleton then
-              @cache[:class_methods]
-            else
-              @cache[:instance_methods]
-            end
-    cache[full_name] ||= []
-    cache[full_name] << method.name
-
-    return if @dry_run
-
-    File.open method_file(full_name, method.full_name), 'wb' do |io|
-      Marshal.dump method, io
-    end
-  end
-
-  ##
-  # Writes the ri data for +page+
-
-  def save_page page
-    return unless page.text?
-
-    path = page_file page.full_name
-
-    FileUtils.mkdir_p File.dirname(path) unless @dry_run
-
-    cache[:pages] ||= []
-    cache[:pages] << page.full_name
-
-    return if @dry_run
-
-    File.open path, 'wb' do |io|
-      Marshal.dump page, io
-    end
-  end
-
-  ##
-  # Source of the contents of this store.
-  #
-  # For a store from a gem the source is the gem name.  For a store from the
-  # home directory the source is "home".  For system ri store (the standard
-  # library documentation) the source is"ruby".  For a store from the site
-  # ri directory the store is "site".  For other stores the source is the
-  # #path.
-
-  def source
-    case type
-    when :gem    then File.basename File.expand_path '..', @path
-    when :home   then 'home'
-    when :site   then 'site'
-    when :system then 'ruby'
-    else @path
-    end
-  end
-
-  ##
-  # Gets the title for this RDoc store.  This is used as the title in each
-  # page on the RDoc server
-
-  def title
-    @cache[:title]
-  end
-
-  ##
-  # Sets the title page for this RDoc store.
-
-  def title= title
-    @cache[:title] = title
-  end
-
-  ##
-  # Returns the unique classes discovered by RDoc.
-  #
-  # ::complete must have been called prior to using this method.
-
-  def unique_classes
-    @unique_classes
-  end
-
-  ##
-  # Returns the unique classes and modules discovered by RDoc.
-  # ::complete must have been called prior to using this method.
-
-  def unique_classes_and_modules
-    @unique_classes + @unique_modules
-  end
-
-  ##
-  # Returns the unique modules discovered by RDoc.
-  # ::complete must have been called prior to using this method.
-
-  def unique_modules
-    @unique_modules
-  end
-
-end
diff --git a/lib/rdoc/task.rb b/lib/rdoc/task.rb
deleted file mode 100644
index eb584c9d2aeb0e..00000000000000
--- a/lib/rdoc/task.rb
+++ /dev/null
@@ -1,355 +0,0 @@
-# frozen_string_literal: true
-#--
-# Copyright (c) 2003, 2004 Jim Weirich, 2009 Eric Hodel
-#
-# Permission is hereby granted, free of charge, to any person obtaining
-# a copy of this software and associated documentation files (the
-# "Software"), to deal in the Software without restriction, including
-# without limitation the rights to use, copy, modify, merge, publish,
-# distribute, sublicense, and/or sell copies of the Software, and to
-# permit persons to whom the Software is furnished to do so, subject to
-# the following conditions:
-#
-# The above copyright notice and this permission notice shall be
-# included in all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-#++
-
-begin
-  gem 'rdoc'
-rescue Gem::LoadError
-end unless defined?(RDoc)
-
-begin
-  gem 'rake'
-rescue Gem::LoadError
-end unless defined?(Rake)
-
-require_relative '../rdoc'
-require 'rake'
-require 'rake/tasklib'
-
-##
-# RDoc::Task creates the following rake tasks to generate and clean up RDoc
-# output:
-#
-# [rdoc]
-#   Main task for this RDoc task.
-#
-# [clobber_rdoc]
-#   Delete all the rdoc files.  This target is automatically added to the main
-#   clobber target.
-#
-# [rerdoc]
-#   Rebuild the rdoc files from scratch, even if they are not out of date.
-#
-# [rdoc:coverage]
-#   Print RDoc coverage report for all rdoc files.
-#
-# Simple Example:
-#
-#   require 'rdoc/task'
-#
-#   RDoc::Task.new do |rdoc|
-#     rdoc.main = "README.rdoc"
-#     rdoc.rdoc_files.include("README.rdoc", "lib/**/*.rb")
-#   end
-#
-# The +rdoc+ object passed to the block is an RDoc::Task object. See the
-# attributes list for the RDoc::Task class for available customization options.
-#
-# == Specifying different task names
-#
-# You may wish to give the task a different name, such as if you are
-# generating two sets of documentation.  For instance, if you want to have a
-# development set of documentation including private methods:
-#
-#   require 'rdoc/task'
-#
-#   RDoc::Task.new :rdoc_dev do |rdoc|
-#     rdoc.main = "README.rdoc"
-#     rdoc.rdoc_files.include("README.rdoc", "lib/**/*.rb")
-#     rdoc.options << "--all"
-#   end
-#
-# The tasks would then be named :<em>rdoc_dev</em>,
-# :clobber_<em>rdoc_dev</em>, and :re<em>rdoc_dev</em>.
-#
-# If you wish to have completely different task names, then pass a Hash as
-# first argument. With the <tt>:rdoc</tt>, <tt>:clobber_rdoc</tt> and
-# <tt>:rerdoc</tt> options, you can customize the task names to your liking.
-#
-# For example:
-#
-#   require 'rdoc/task'
-#
-#   RDoc::Task.new(:rdoc => "rdoc", :clobber_rdoc => "rdoc:clean",
-#                  :rerdoc => "rdoc:force")
-#
-# This will create the tasks <tt>:rdoc</tt>, <tt>:rdoc:clean</tt>,
-# <tt>:rdoc:force</tt>, and <tt>:rdoc:coverage</tt>.
-
-class RDoc::Task < Rake::TaskLib
-
-  ##
-  # Name of the main, top level task.  (default is :rdoc)
-
-  attr_accessor :name
-
-  ##
-  # Comment markup format.  rdoc, rd and tomdoc are supported.  (default is
-  # 'rdoc')
-
-  attr_accessor :markup
-
-  ##
-  # Name of directory to receive the html output files. (default is "html")
-
-  attr_accessor :rdoc_dir
-
-  ##
-  # Title of RDoc documentation. (defaults to rdoc's default)
-
-  attr_accessor :title
-
-  ##
-  # Name of file to be used as the main, top level file of the RDoc. (default
-  # is none)
-
-  attr_accessor :main
-
-  ##
-  # Name of template to be used by rdoc. (defaults to rdoc's default)
-
-  attr_accessor :template
-
-  ##
-  # Name of format generator (<tt>--format</tt>) used by rdoc. (defaults to
-  # rdoc's default)
-
-  attr_accessor :generator
-
-  ##
-  # List of files to be included in the rdoc generation. (default is [])
-
-  attr_accessor :rdoc_files
-
-  ##
-  # Additional list of options to be passed rdoc.  (default is [])
-
-  attr_accessor :options
-
-  ##
-  # Whether to run the rdoc process as an external shell (default is false)
-
-  attr_accessor :external
-
-  ##
-  # Create an RDoc task with the given name. See the RDoc::Task class overview
-  # for documentation.
-
-  def initialize name = :rdoc # :yield: self
-    defaults
-
-    check_names name
-
-    @name = name
-
-    yield self if block_given?
-
-    define
-  end
-
-  ##
-  # Ensures that +names+ only includes names for the :rdoc, :clobber_rdoc and
-  # :rerdoc.  If other names are given an ArgumentError is raised.
-
-  def check_names names
-    return unless Hash === names
-
-    invalid_options =
-      names.keys.map { |k| k.to_sym } - [:rdoc, :clobber_rdoc, :rerdoc]
-
-    unless invalid_options.empty? then
-      raise ArgumentError, "invalid options: #{invalid_options.join ', '}"
-    end
-  end
-
-  ##
-  # Task description for the clobber rdoc task or its renamed equivalent
-
-  def clobber_task_description
-    "Remove RDoc HTML files"
-  end
-
-  ##
-  # Sets default task values
-
-  def defaults
-    @name = :rdoc
-    @rdoc_files = Rake::FileList.new
-    @rdoc_dir = 'html'
-    @main = nil
-    @title = nil
-    @template = nil
-    @generator = nil
-    @options = []
-  end
-
-  ##
-  # All source is inline now.  This method is deprecated
-
-  def inline_source # :nodoc:
-    warn "RDoc::Task#inline_source is deprecated"
-    true
-  end
-
-  ##
-  # All source is inline now.  This method is deprecated
-
-  def inline_source=(value) # :nodoc:
-    warn "RDoc::Task#inline_source is deprecated"
-  end
-
-  ##
-  # Create the tasks defined by this task lib.
-
-  def define
-    desc rdoc_task_description
-    task rdoc_task_name
-
-    desc rerdoc_task_description
-    task rerdoc_task_name => [clobber_task_name, rdoc_task_name]
-
-    desc clobber_task_description
-    task clobber_task_name do
-      rm_r @rdoc_dir rescue nil
-    end
-
-    task :clobber => [clobber_task_name]
-
-    directory @rdoc_dir
-
-    rdoc_target_deps = [
-      @rdoc_files,
-      Rake.application.rakefile
-    ].flatten.compact
-
-    task rdoc_task_name => [rdoc_target]
-    file rdoc_target => rdoc_target_deps do
-      @before_running_rdoc.call if @before_running_rdoc
-      args = option_list + @rdoc_files
-
-      $stderr.puts "rdoc #{args.join ' '}" if Rake.application.options.trace
-      RDoc::RDoc.new.document args
-    end
-
-    namespace rdoc_task_name do
-      desc coverage_task_description
-      task coverage_task_name do
-        @before_running_rdoc.call if @before_running_rdoc
-        opts = option_list << "-C"
-        args = opts + @rdoc_files
-
-        $stderr.puts "rdoc #{args.join ' '}" if Rake.application.options.trace
-        RDoc::RDoc.new.document args
-      end
-    end
-
-    self
-  end
-
-  ##
-  # List of options that will be supplied to RDoc
-
-  def option_list
-    result = @options.dup
-    result << "-o"       << @rdoc_dir
-    result << "--main"   << main      if main
-    result << "--markup" << markup    if markup
-    result << "--title"  << title     if title
-    result << "-T"       << template  if template
-    result << '-f'       << generator if generator
-    result
-  end
-
-  ##
-  # The block passed to this method will be called just before running the
-  # RDoc generator. It is allowed to modify RDoc::Task attributes inside the
-  # block.
-
-  def before_running_rdoc(&block)
-    @before_running_rdoc = block
-  end
-
-  ##
-  # Task description for the rdoc task or its renamed equivalent
-
-  def rdoc_task_description
-    'Build RDoc HTML files'
-  end
-
-  ##
-  # Task description for the rerdoc task or its renamed description
-
-  def rerdoc_task_description
-    "Rebuild RDoc HTML files"
-  end
-
-  ##
-  # Task description for the coverage task or its renamed description
-
-  def coverage_task_description
-    "Print RDoc coverage report"
-  end
-
-  private
-
-  def rdoc_target
-    "#{rdoc_dir}/created.rid"
-  end
-
-  def rdoc_task_name
-    case name
-    when Hash then (name[:rdoc] || "rdoc").to_s
-    else           name.to_s
-    end
-  end
-
-  def clobber_task_name
-    case name
-    when Hash then (name[:clobber_rdoc] || "clobber_rdoc").to_s
-    else           "clobber_#{name}"
-    end
-  end
-
-  def rerdoc_task_name
-    case name
-    when Hash then (name[:rerdoc] || "rerdoc").to_s
-    else           "re#{name}"
-    end
-  end
-
-  def coverage_task_name
-    "coverage"
-  end
-
-end
-
-# :stopdoc:
-module Rake
-
-  ##
-  # For backwards compatibility
-
-  RDocTask = RDoc::Task # :nodoc:
-
-end
-# :startdoc:
diff --git a/lib/rdoc/text.rb b/lib/rdoc/text.rb
deleted file mode 100644
index 0bc4aba4281d9e..00000000000000
--- a/lib/rdoc/text.rb
+++ /dev/null
@@ -1,312 +0,0 @@
-# frozen_string_literal: true
-
-##
-# For RDoc::Text#to_html
-
-require 'strscan'
-
-##
-# Methods for manipulating comment text
-
-module RDoc::Text
-
-  attr_accessor :language
-
-  ##
-  # Maps markup formats to classes that can parse them.  If the format is
-  # unknown, "rdoc" format is used.
-
-  MARKUP_FORMAT = {
-    'markdown' => RDoc::Markdown,
-    'rdoc'     => RDoc::Markup,
-    'rd'       => RDoc::RD,
-    'tomdoc'   => RDoc::TomDoc,
-  }
-
-  MARKUP_FORMAT.default = RDoc::Markup
-
-  ##
-  # Maps an encoding to a Hash of characters properly transcoded for that
-  # encoding.
-  #
-  # See also encode_fallback.
-
-  TO_HTML_CHARACTERS = Hash.new do |h, encoding|
-    h[encoding] = {
-      :close_dquote => encode_fallback('”', encoding, '"'),
-      :close_squote => encode_fallback('’', encoding, '\''),
-      :copyright    => encode_fallback('©', encoding, '(c)'),
-      :ellipsis     => encode_fallback('…', encoding, '...'),
-      :em_dash      => encode_fallback('—', encoding, '---'),
-      :en_dash      => encode_fallback('–', encoding, '--'),
-      :open_dquote  => encode_fallback('“', encoding, '"'),
-      :open_squote  => encode_fallback('‘', encoding, '\''),
-      :trademark    => encode_fallback('®', encoding, '(r)'),
-    }
-  end
-
-  ##
-  # Transcodes +character+ to +encoding+ with a +fallback+ character.
-
-  def self.encode_fallback character, encoding, fallback
-    character.encode(encoding, :fallback => { character => fallback },
-                     :undef => :replace, :replace => fallback)
-  end
-
-  ##
-  # Expands tab characters in +text+ to eight spaces
-
-  def expand_tabs text
-    expanded = []
-
-    text.each_line do |line|
-      nil while line.gsub!(/(?:\G|\r)((?:.{8})*?)([^\t\r\n]{0,7})\t/) do
-        r = "#{$1}#{$2}#{' ' * (8 - $2.size)}"
-        r = RDoc::Encoding.change_encoding r, text.encoding
-        r
-      end
-
-      expanded << line
-    end
-
-    expanded.join
-  end
-
-  ##
-  # Flush +text+ left based on the shortest line
-
-  def flush_left text
-    indent = 9999
-
-    text.each_line do |line|
-      line_indent = line =~ /\S/ || 9999
-      indent = line_indent if indent > line_indent
-    end
-
-    empty = ''
-    empty = RDoc::Encoding.change_encoding empty, text.encoding
-
-    text.gsub(/^ {0,#{indent}}/, empty)
-  end
-
-  ##
-  # Convert a string in markup format into HTML.
-  #
-  # Requires the including class to implement #formatter
-
-  def markup text
-    if @store.rdoc.options
-      locale = @store.rdoc.options.locale
-    else
-      locale = nil
-    end
-    if locale
-      i18n_text = RDoc::I18n::Text.new(text)
-      text = i18n_text.translate(locale)
-    end
-    parse(text).accept formatter
-  end
-
-  ##
-  # Strips hashes, expands tabs then flushes +text+ to the left
-
-  def normalize_comment text
-    return text if text.empty?
-
-    case language
-    when :ruby
-      text = strip_hashes text
-    when :c
-      text = strip_stars text
-    end
-    text = expand_tabs    text
-    text = flush_left     text
-    text = strip_newlines text
-    text
-  end
-
-  ##
-  # Normalizes +text+ then builds a RDoc::Markup::Document from it
-
-  def parse text, format = 'rdoc'
-    return text if RDoc::Markup::Document === text
-    return text.parse if RDoc::Comment === text
-
-    text = normalize_comment text # TODO remove, should not be necessary
-
-    return RDoc::Markup::Document.new if text =~ /\A\n*\z/
-
-    MARKUP_FORMAT[format].parse text
-  end
-
-  ##
-  # The first +limit+ characters of +text+ as HTML
-
-  def snippet text, limit = 100
-    document = parse text
-
-    RDoc::Markup::ToHtmlSnippet.new(options, limit).convert document
-  end
-
-  ##
-  # Strips leading # characters from +text+
-
-  def strip_hashes text
-    return text if text =~ /^(?>\s*)[^\#]/
-
-    empty = ''
-    empty = RDoc::Encoding.change_encoding empty, text.encoding
-
-    text.gsub(/^\s*(#+)/) { $1.tr '#', ' ' }.gsub(/^\s+$/, empty)
-  end
-
-  ##
-  # Strips leading and trailing \n characters from +text+
-
-  def strip_newlines text
-    text.gsub(/\A\n*(.*?)\n*\z/m) do $1 end # block preserves String encoding
-  end
-
-  ##
-  # Strips /* */ style comments
-
-  def strip_stars text
-    return text unless text =~ %r%/\*.*\*/%m
-
-    encoding = text.encoding
-
-    text = text.gsub %r%Document-method:\s+[\w:.#=!?|^&<>~+\-/*\%@`\[\]]+%, ''
-
-    space = ' '
-    space = RDoc::Encoding.change_encoding space, encoding if encoding
-
-    text.sub!  %r%/\*+%       do space * $&.length end
-    text.sub!  %r%\*+/%       do space * $&.length end
-    text.gsub! %r%^[ \t]*\*%m do space * $&.length end
-
-    empty = ''
-    empty = RDoc::Encoding.change_encoding empty, encoding if encoding
-    text.gsub(/^\s+$/, empty)
-  end
-
-  ##
-  # Converts ampersand, dashes, ellipsis, quotes, copyright and registered
-  # trademark symbols in +text+ to properly encoded characters.
-
-  def to_html text
-    html = (''.encode text.encoding).dup
-
-    encoded = RDoc::Text::TO_HTML_CHARACTERS[text.encoding]
-
-    s = StringScanner.new text
-    insquotes = false
-    indquotes = false
-    after_word = nil
-
-    until s.eos? do
-      case
-      when s.scan(/<(tt|code)>.*?<\/\1>/) then # skip contents of tt
-        html << s.matched.gsub('\\\\', '\\')
-      when s.scan(/<(tt|code)>.*?/) then
-        warn "mismatched <#{s[1]}> tag" # TODO signal file/line
-        html << s.matched
-      when s.scan(/<[^>]+\/?s*>/) then # skip HTML tags
-        html << s.matched
-      when s.scan(/\\(\S)/) then # unhandled suppressed crossref
-        html << s[1]
-        after_word = nil
-      when s.scan(/\.\.\.(\.?)/) then
-        html << s[1] << encoded[:ellipsis]
-        after_word = nil
-      when s.scan(/\(c\)/i) then
-        html << encoded[:copyright]
-        after_word = nil
-      when s.scan(/\(r\)/i) then
-        html << encoded[:trademark]
-        after_word = nil
-      when s.scan(/---/) then
-        html << encoded[:em_dash]
-        after_word = nil
-      when s.scan(/--/) then
-        html << encoded[:en_dash]
-        after_word = nil
-      when s.scan(/&quot;|"/) then
-        html << encoded[indquotes ? :close_dquote : :open_dquote]
-        indquotes = !indquotes
-        after_word = nil
-      when s.scan(/``/) then # backtick double quote
-        html << encoded[:open_dquote]
-        after_word = nil
-      when s.scan(/(?:&#39;|'){2}/) then # tick double quote
-        html << encoded[:close_dquote]
-        after_word = nil
-      when s.scan(/`/) then # backtick
-        if insquotes or after_word
-          html << '`'
-          after_word = false
-        else
-          html << encoded[:open_squote]
-          insquotes = true
-        end
-      when s.scan(/&#39;|'/) then # single quote
-        if insquotes
-          html << encoded[:close_squote]
-          insquotes = false
-        elsif after_word
-          # Mary's dog, my parents' house: do not start paired quotes
-          html << encoded[:close_squote]
-        else
-          html << encoded[:open_squote]
-          insquotes = true
-        end
-
-        after_word = nil
-      else # advance to the next potentially significant character
-        match = s.scan(/.+?(?=[<\\.("'`&-])/) #"
-
-        if match then
-          html << match
-          after_word = match =~ /\w$/
-        else
-          html << s.rest
-          break
-        end
-      end
-    end
-
-    html
-  end
-
-  ##
-  # Wraps +txt+ to +line_len+
-
-  def wrap(txt, line_len = 76)
-    res = []
-    sp = 0
-    ep = txt.length
-
-    while sp < ep
-      # scan back for a space
-      p = sp + line_len - 1
-      if p >= ep
-        p = ep
-      else
-        while p > sp and txt[p] != ?\s
-          p -= 1
-        end
-        if p <= sp
-          p = sp + line_len
-          while p < ep and txt[p] != ?\s
-            p += 1
-          end
-        end
-      end
-      res << txt[sp...p] << "\n"
-      sp = p
-      sp += 1 while sp < ep and txt[sp] == ?\s
-    end
-
-    res.join.strip
-  end
-
-end
diff --git a/lib/rdoc/token_stream.rb b/lib/rdoc/token_stream.rb
deleted file mode 100644
index 8fc6eadd8569cc..00000000000000
--- a/lib/rdoc/token_stream.rb
+++ /dev/null
@@ -1,118 +0,0 @@
-# frozen_string_literal: true
-##
-# A TokenStream is a list of tokens, gathered during the parse of some entity
-# (say a method). Entities populate these streams by being registered with the
-# lexer. Any class can collect tokens by including TokenStream. From the
-# outside, you use such an object by calling the start_collecting_tokens
-# method, followed by calls to add_token and pop_token.
-
-module RDoc::TokenStream
-
-  ##
-  # Converts +token_stream+ to HTML wrapping various tokens with
-  # <tt><span></tt> elements. Some tokens types are wrapped in spans
-  # with the given class names. Other token types are not wrapped in spans.
-
-  def self.to_html token_stream
-    starting_title = false
-
-    token_stream.map do |t|
-      next unless t
-
-      style = case t[:kind]
-              when :on_const   then 'ruby-constant'
-              when :on_kw      then 'ruby-keyword'
-              when :on_ivar    then 'ruby-ivar'
-              when :on_cvar    then 'ruby-identifier'
-              when :on_gvar    then 'ruby-identifier'
-              when '=' != t[:text] && :on_op
-                               then 'ruby-operator'
-              when :on_tlambda then 'ruby-operator'
-              when :on_ident   then 'ruby-identifier'
-              when :on_label   then 'ruby-value'
-              when :on_backref, :on_dstring
-                               then 'ruby-node'
-              when :on_comment then 'ruby-comment'
-              when :on_embdoc  then 'ruby-comment'
-              when :on_regexp  then 'ruby-regexp'
-              when :on_tstring then 'ruby-string'
-              when :on_int, :on_float,
-                   :on_rational, :on_imaginary,
-                   :on_heredoc,
-                   :on_symbol, :on_CHAR then 'ruby-value'
-              when :on_heredoc_beg, :on_heredoc_end
-                               then 'ruby-identifier'
-              end
-
-      comment_with_nl = false
-      if :on_comment == t[:kind] or :on_embdoc == t[:kind] or :on_heredoc_end == t[:kind]
-        comment_with_nl = true if "\n" == t[:text][-1]
-        text = t[:text].rstrip
-      else
-        text = t[:text]
-      end
-
-      if :on_ident == t[:kind] && starting_title
-        starting_title = false
-        style = 'ruby-identifier ruby-title'
-      end
-
-      if :on_kw == t[:kind] and 'def' == t[:text]
-        starting_title = true
-      end
-
-      text = CGI.escapeHTML text
-
-      if style then
-        "<span class=\"#{style}\">#{text}</span>#{"\n" if comment_with_nl}"
-      else
-        text
-      end
-    end.join
-  end
-
-  ##
-  # Adds +tokens+ to the collected tokens
-
-  def add_tokens(tokens)
-    @token_stream.concat(tokens)
-  end
-
-  ##
-  # Adds one +token+ to the collected tokens
-
-  def add_token(token)
-    @token_stream.push(token)
-  end
-
-  ##
-  # Starts collecting tokens
-
-  def collect_tokens
-    @token_stream = []
-  end
-
-  alias start_collecting_tokens collect_tokens
-
-  ##
-  # Remove the last token from the collected tokens
-
-  def pop_token
-    @token_stream.pop
-  end
-
-  ##
-  # Current token stream
-
-  def token_stream
-    @token_stream
-  end
-
-  ##
-  # Returns a string representation of the token stream
-
-  def tokens_to_s
-    token_stream.compact.map { |token| token[:text] }.join ''
-  end
-
-end
diff --git a/lib/rdoc/tom_doc.rb b/lib/rdoc/tom_doc.rb
deleted file mode 100644
index e161fcf42f6efc..00000000000000
--- a/lib/rdoc/tom_doc.rb
+++ /dev/null
@@ -1,263 +0,0 @@
-# frozen_string_literal: true
-# :markup: tomdoc
-
-# A parser for TomDoc based on TomDoc 1.0.0-rc1 (02adef9b5a)
-#
-# The TomDoc specification can be found at:
-#
-# http://tomdoc.org
-#
-# The latest version of the TomDoc specification can be found at:
-#
-# https://github.com/mojombo/tomdoc/blob/master/tomdoc.md
-#
-# To choose TomDoc as your only default format see RDoc::Options@Saved+Options
-# for instructions on setting up a <code>.rdoc_options</code> file to store
-# your project default.
-#
-# There are a few differences between this parser and the specification.  A
-# best-effort was made to follow the specification as closely as possible but
-# some choices to deviate were made.
-#
-# A future version of RDoc will warn when a MUST or MUST NOT is violated and
-# may warn when a SHOULD or SHOULD NOT is violated.  RDoc will always try
-# to emit documentation even if given invalid TomDoc.
-#
-# Here are some implementation choices this parser currently makes:
-#
-# This parser allows rdoc-style inline markup but you should not depended on
-# it.
-#
-# This parser allows a space between the comment and the method body.
-#
-# This parser does not require the default value to be described for an
-# optional argument.
-#
-# This parser does not examine the order of sections.  An Examples section may
-# precede the Arguments section.
-#
-# This class is documented in TomDoc format.  Since this is a subclass of the
-# RDoc markup parser there isn't much to see here, unfortunately.
-
-class RDoc::TomDoc < RDoc::Markup::Parser
-
-  # Internal: Token accessor
-
-  attr_reader :tokens
-
-  # Internal: Adds a post-processor which sets the RDoc section based on the
-  # comment's status.
-  #
-  # Returns nothing.
-
-  def self.add_post_processor # :nodoc:
-    RDoc::Markup::PreProcess.post_process do |comment, code_object|
-      next unless code_object and
-                  RDoc::Comment === comment and comment.format == 'tomdoc'
-
-      comment.text.gsub!(/(\A\s*# )(Public|Internal|Deprecated):\s+/) do
-        section = code_object.add_section $2
-        code_object.temporary_section = section
-
-        $1
-      end
-    end
-  end
-
-  add_post_processor
-
-  # Public: Parses TomDoc from text
-  #
-  # text - A String containing TomDoc-format text.
-  #
-  # Examples
-  #
-  #   RDoc::TomDoc.parse <<-TOMDOC
-  #   This method does some things
-  #
-  #   Returns nothing.
-  #   TOMDOC
-  #   # => #<RDoc::Markup::Document:0xXXX @parts=[...], @file=nil>
-  #
-  # Returns an RDoc::Markup::Document representing the TomDoc format.
-
-  def self.parse text
-    parser = new
-
-    parser.tokenize text
-    doc = RDoc::Markup::Document.new
-    parser.parse doc
-    doc
-  end
-
-  # Internal: Extracts the Signature section's method signature
-  #
-  # comment - An RDoc::Comment that will be parsed and have the signature
-  #           extracted
-  #
-  # Returns a String containing the signature and nil if not
-
-  def self.signature comment
-    return unless comment.tomdoc?
-
-    document = comment.parse
-
-    signature = nil
-    found_heading = false
-    found_signature = false
-
-    document.parts.delete_if do |part|
-      next false if found_signature
-
-      found_heading ||=
-        RDoc::Markup::Heading === part && part.text == 'Signature'
-
-      next false unless found_heading
-
-      next true if RDoc::Markup::BlankLine === part
-
-      if RDoc::Markup::Verbatim === part then
-        signature = part
-        found_signature = true
-      end
-    end
-
-    signature and signature.text
-  end
-
-  # Public: Creates a new TomDoc parser.  See also RDoc::Markup::parse
-
-  def initialize
-    super
-
-    @section      = nil
-    @seen_returns = false
-  end
-
-  # Internal: Builds a heading from the token stream
-  #
-  # level - The level of heading to create
-  #
-  # Returns an RDoc::Markup::Heading
-
-  def build_heading level
-    heading = super
-
-    @section = heading.text
-
-    heading
-  end
-
-  # Internal: Builds a verbatim from the token stream.  A verbatim in the
-  # Examples section will be marked as in Ruby format.
-  #
-  # margin - The indentation from the margin for lines that belong to this
-  #          verbatim section.
-  #
-  # Returns an RDoc::Markup::Verbatim
-
-  def build_verbatim margin
-    verbatim = super
-
-    verbatim.format = :ruby if @section == 'Examples'
-
-    verbatim
-  end
-
-  # Internal: Builds a paragraph from the token stream
-  #
-  # margin - Unused
-  #
-  # Returns an RDoc::Markup::Paragraph.
-
-  def build_paragraph margin
-    p :paragraph_start => margin if @debug
-
-    paragraph = RDoc::Markup::Paragraph.new
-
-    until @tokens.empty? do
-      type, data, = get
-
-      case type
-      when :TEXT then
-        @section = 'Returns' if data =~ /\A(Returns|Raises)/
-
-        paragraph << data
-      when :NEWLINE then
-        if :TEXT == peek_token[0] then
-          # Lines beginning with 'Raises' in the Returns section should not be
-          # treated as multiline text
-          if 'Returns' == @section and
-            peek_token[1].start_with?('Raises') then
-            break
-          else
-            paragraph << ' '
-          end
-        else
-          break
-        end
-      else
-        unget
-        break
-      end
-    end
-
-    p :paragraph_end => margin if @debug
-
-    paragraph
-  end
-
-  ##
-  # Detects a section change to "Returns" and adds a heading
-
-  def parse_text parent, indent # :nodoc:
-    paragraph = build_paragraph indent
-
-    if false == @seen_returns and 'Returns' == @section then
-      @seen_returns = true
-      parent << RDoc::Markup::Heading.new(3, 'Returns')
-      parent << RDoc::Markup::BlankLine.new
-    end
-
-    parent << paragraph
-  end
-
-  # Internal: Turns text into an Array of tokens
-  #
-  # text - A String containing TomDoc-format text.
-  #
-  # Returns self.
-
-  def tokenize text
-    text = text.sub(/\A(Public|Internal|Deprecated):\s+/, '')
-
-    setup_scanner text
-
-    until @s.eos? do
-      pos = @s.pos
-
-      # leading spaces will be reflected by the column of the next token
-      # the only thing we loose are trailing spaces at the end of the file
-      next if @s.scan(/ +/)
-
-      @tokens << case
-                 when @s.scan(/\r?\n/) then
-                   token = [:NEWLINE, @s.matched, *pos]
-                   @s.newline!
-                   token
-                 when @s.scan(/(Examples|Signature)$/) then
-                   @tokens << [:HEADER, 3, *pos]
-
-                   [:TEXT, @s[1], *pos]
-                 when @s.scan(/([:\w][\w\[\]]*)[ ]+- /) then
-                   [:NOTE, @s[1], *pos]
-                 else
-                   @s.scan(/.*/)
-                   [:TEXT, @s.matched.sub(/\r$/, ''), *pos]
-                 end
-    end
-
-    self
-  end
-
-end
diff --git a/lib/rdoc/top_level.rb b/lib/rdoc/top_level.rb
deleted file mode 100644
index e6caa34ee3c839..00000000000000
--- a/lib/rdoc/top_level.rb
+++ /dev/null
@@ -1,288 +0,0 @@
-# frozen_string_literal: true
-##
-# A TopLevel context is a representation of the contents of a single file
-
-class RDoc::TopLevel < RDoc::Context
-
-  MARSHAL_VERSION = 0 # :nodoc:
-
-  ##
-  # This TopLevel's File::Stat struct
-
-  attr_accessor :file_stat
-
-  ##
-  # Relative name of this file
-
-  attr_accessor :relative_name
-
-  ##
-  # Absolute name of this file
-
-  attr_accessor :absolute_name
-
-  ##
-  # All the classes or modules that were declared in
-  # this file. These are assigned to either +#classes_hash+
-  # or +#modules_hash+ once we know what they really are.
-
-  attr_reader :classes_or_modules
-
-  attr_accessor :diagram # :nodoc:
-
-  ##
-  # The parser class that processed this file
-
-  attr_reader :parser
-
-  ##
-  # Creates a new TopLevel for the file at +absolute_name+.  If documentation
-  # is being generated outside the source dir +relative_name+ is relative to
-  # the source directory.
-
-  def initialize absolute_name, relative_name = absolute_name
-    super()
-    @name = nil
-    @absolute_name = absolute_name
-    @relative_name = relative_name
-    @file_stat     = File.stat(absolute_name) rescue nil # HACK for testing
-    @diagram       = nil
-    @parser        = nil
-
-    @classes_or_modules = []
-  end
-
-  def parser=(val)
-    @parser = val
-    @store.update_parser_of_file(absolute_name, val) if @store
-    @parser
-  end
-
-  ##
-  # An RDoc::TopLevel is equal to another with the same relative_name
-
-  def == other
-    self.class === other and @relative_name == other.relative_name
-  end
-
-  alias eql? ==
-
-  ##
-  # Adds +an_alias+ to +Object+ instead of +self+.
-
-  def add_alias(an_alias)
-    object_class.record_location self
-    return an_alias unless @document_self
-    object_class.add_alias an_alias
-  end
-
-  ##
-  # Adds +constant+ to +Object+ instead of +self+.
-
-  def add_constant constant
-    object_class.record_location self
-    return constant unless @document_self
-    object_class.add_constant constant
-  end
-
-  ##
-  # Adds +include+ to +Object+ instead of +self+.
-
-  def add_include(include)
-    object_class.record_location self
-    return include unless @document_self
-    object_class.add_include include
-  end
-
-  ##
-  # Adds +method+ to +Object+ instead of +self+.
-
-  def add_method(method)
-    object_class.record_location self
-    return method unless @document_self
-    object_class.add_method method
-  end
-
-  ##
-  # Adds class or module +mod+. Used in the building phase
-  # by the Ruby parser.
-
-  def add_to_classes_or_modules mod
-    @classes_or_modules << mod
-  end
-
-  ##
-  # Base name of this file
-
-  def base_name
-    File.basename @relative_name
-  end
-
-  alias name base_name
-
-  ##
-  # Only a TopLevel that contains text file) will be displayed.  See also
-  # RDoc::CodeObject#display?
-
-  def display?
-    text? and super
-  end
-
-  ##
-  # See RDoc::TopLevel::find_class_or_module
-  #--
-  # TODO Why do we search through all classes/modules found, not just the
-  #       ones of this instance?
-
-  def find_class_or_module name
-    @store.find_class_or_module name
-  end
-
-  ##
-  # Finds a class or module named +symbol+
-
-  def find_local_symbol(symbol)
-    find_class_or_module(symbol) || super
-  end
-
-  ##
-  # Finds a module or class with +name+
-
-  def find_module_named(name)
-    find_class_or_module(name)
-  end
-
-  ##
-  # Returns the relative name of this file
-
-  def full_name
-    @relative_name
-  end
-
-  ##
-  # An RDoc::TopLevel has the same hash as another with the same
-  # relative_name
-
-  def hash
-    @relative_name.hash
-  end
-
-  ##
-  # URL for this with a +prefix+
-
-  def http_url(prefix)
-    path = [prefix, @relative_name.tr('.', '_')]
-
-    File.join(*path.compact) + '.html'
-  end
-
-  def inspect # :nodoc:
-    "#<%s:0x%x %p modules: %p classes: %p>" % [
-      self.class, object_id,
-      base_name,
-      @modules.map { |n,m| m },
-      @classes.map { |n,c| c }
-    ]
-  end
-
-  ##
-  # Time this file was last modified, if known
-
-  def last_modified
-    @file_stat ? file_stat.mtime : nil
-  end
-
-  ##
-  # Dumps this TopLevel for use by ri.  See also #marshal_load
-
-  def marshal_dump
-    [
-      MARSHAL_VERSION,
-      @relative_name,
-      @parser,
-      parse(@comment),
-    ]
-  end
-
-  ##
-  # Loads this TopLevel from +array+.
-
-  def marshal_load array # :nodoc:
-    initialize array[1]
-
-    @parser  = array[2]
-    @comment = array[3]
-
-    @file_stat          = nil
-  end
-
-  ##
-  # Returns the NormalClass "Object", creating it if not found.
-  #
-  # Records +self+ as a location in "Object".
-
-  def object_class
-    @object_class ||= begin
-      oc = @store.find_class_named('Object') || add_class(RDoc::NormalClass, 'Object')
-      oc.record_location self
-      oc
-    end
-  end
-
-  ##
-  # Base name of this file without the extension
-
-  def page_name
-    basename = File.basename @relative_name
-    basename =~ /\.(rb|rdoc|txt|md)$/i
-
-    $` || basename
-  end
-
-  ##
-  # Path to this file for use with HTML generator output.
-
-  def path
-    http_url @store.rdoc.generator.file_dir
-  end
-
-  def pretty_print q # :nodoc:
-    q.group 2, "[#{self.class}: ", "]" do
-      q.text "base name: #{base_name.inspect}"
-      q.breakable
-
-      items = @modules.map { |n,m| m }
-      items.concat @modules.map { |n,c| c }
-      q.seplist items do |mod| q.pp mod end
-    end
-  end
-
-  ##
-  # Search record used by RDoc::Generator::JsonIndex
-
-  def search_record
-    return unless @parser < RDoc::Parser::Text
-
-    [
-      page_name,
-      '',
-      page_name,
-      '',
-      path,
-      '',
-      snippet(@comment),
-    ]
-  end
-
-  ##
-  # Is this TopLevel from a text file instead of a source code file?
-
-  def text?
-    @parser and @parser.include? RDoc::Parser::Text
-  end
-
-  def to_s # :nodoc:
-    "file #{full_name}"
-  end
-
-end
diff --git a/lib/rdoc/version.rb b/lib/rdoc/version.rb
deleted file mode 100644
index 04322a19702f0c..00000000000000
--- a/lib/rdoc/version.rb
+++ /dev/null
@@ -1,10 +0,0 @@
-# frozen_string_literal: true
-
-module RDoc
-
-  ##
-  # RDoc version you are using
-
-  VERSION = '6.5.0'
-
-end
diff --git a/lib/readline.gemspec b/lib/readline.gemspec
deleted file mode 100644
index 3a18f9edb628a5..00000000000000
--- a/lib/readline.gemspec
+++ /dev/null
@@ -1,33 +0,0 @@
-Gem::Specification.new do |spec|
-  spec.name          = 'readline'
-  spec.version       = '0.0.3'
-  spec.authors       = ['aycabta']
-  spec.email         = ['aycabta@gmail.com']
-
-  spec.summary       = %q{Loader for "readline".}
-  spec.description   = <<~EOD
-    This is just a loader for "readline". If Ruby has the "readline-ext" gem
-    that is a native extension, this gem will load it. If Ruby does not have
-    the "readline-ext" gem this gem will load "reline", a library that is
-    compatible with the "readline-ext" gem and implemented in pure Ruby.
-  EOD
-  spec.homepage      = 'https://github.com/ruby/readline'
-  spec.license       = 'Ruby'
-
-  spec.files         = Dir['BSDL', 'COPYING', 'README.md', 'lib/readline.rb']
-  spec.require_paths = ['lib']
-
-  spec.post_install_message = <<~EOM
-    +---------------------------------------------------------------------------+
-    | This is just a loader for "readline". If Ruby has the "readline-ext" gem  |
-    | that is a native extension, this gem will load it. If Ruby does not have  |
-    | the "readline-ext" gem this gem will load "reline", a library that is     |
-    | compatible with the "readline-ext" gem and implemented in pure Ruby.      |
-    |                                                                           |
-    | If you intend to use GNU Readline by `require 'readline'`, please install |
-    | the "readline-ext" gem.                                                   |
-    +---------------------------------------------------------------------------+
-  EOM
-
-  spec.add_runtime_dependency 'reline'
-end
diff --git a/lib/readline.rb b/lib/readline.rb
deleted file mode 100644
index 29cdf3a14f013b..00000000000000
--- a/lib/readline.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-begin
-  require 'readline.so'
-rescue LoadError
-  require 'reline' unless defined? Reline
-  Object.send(:remove_const, :Readline) if Object.const_defined?(:Readline)
-  Readline = Reline
-end
diff --git a/lib/reline.rb b/lib/reline.rb
deleted file mode 100644
index 3d1716c81bb53f..00000000000000
--- a/lib/reline.rb
+++ /dev/null
@@ -1,609 +0,0 @@
-require 'io/console'
-require 'forwardable'
-require 'reline/version'
-require 'reline/config'
-require 'reline/key_actor'
-require 'reline/key_stroke'
-require 'reline/line_editor'
-require 'reline/history'
-require 'reline/terminfo'
-require 'rbconfig'
-
-module Reline
-  # NOTE: For making compatible with the rb-readline gem
-  FILENAME_COMPLETION_PROC = nil
-  USERNAME_COMPLETION_PROC = nil
-
-  class ConfigEncodingConversionError < StandardError; end
-
-  Key = Struct.new(:char, :combined_char, :with_meta) do
-    def match?(other)
-      case other
-      when Reline::Key
-        (other.char.nil? or char.nil? or char == other.char) and
-        (other.combined_char.nil? or combined_char.nil? or combined_char == other.combined_char) and
-        (other.with_meta.nil? or with_meta.nil? or with_meta == other.with_meta)
-      when Integer, Symbol
-        (combined_char and combined_char == other) or
-        (combined_char.nil? and char and char == other)
-      else
-        false
-      end
-    end
-    alias_method :==, :match?
-  end
-  CursorPos = Struct.new(:x, :y)
-  DialogRenderInfo = Struct.new(
-    :pos,
-    :contents,
-    :bg_color,
-    :pointer_bg_color,
-    :fg_color,
-    :pointer_fg_color,
-    :width,
-    :height,
-    :scrollbar,
-    keyword_init: true
-  )
-
-  class Core
-    ATTR_READER_NAMES = %i(
-      completion_append_character
-      basic_word_break_characters
-      completer_word_break_characters
-      basic_quote_characters
-      completer_quote_characters
-      filename_quote_characters
-      special_prefixes
-      completion_proc
-      output_modifier_proc
-      prompt_proc
-      auto_indent_proc
-      pre_input_hook
-      dig_perfect_match_proc
-    ).each(&method(:attr_reader))
-
-    attr_accessor :config
-    attr_accessor :key_stroke
-    attr_accessor :line_editor
-    attr_accessor :last_incremental_search
-    attr_reader :output
-
-    extend Forwardable
-    def_delegators :config,
-      :autocompletion,
-      :autocompletion=
-
-    def initialize
-      self.output = STDOUT
-      @dialog_proc_list = {}
-      yield self
-      @completion_quote_character = nil
-      @bracketed_paste_finished = false
-    end
-
-    def io_gate
-      Reline::IOGate
-    end
-
-    def encoding
-      io_gate.encoding
-    end
-
-    def completion_append_character=(val)
-      if val.nil?
-        @completion_append_character = nil
-      elsif val.size == 1
-        @completion_append_character = val.encode(encoding)
-      elsif val.size > 1
-        @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)
-    end
-
-    def completer_word_break_characters=(v)
-      @completer_word_break_characters = v.encode(encoding)
-    end
-
-    def basic_quote_characters=(v)
-      @basic_quote_characters = v.encode(encoding)
-    end
-
-    def completer_quote_characters=(v)
-      @completer_quote_characters = v.encode(encoding)
-    end
-
-    def filename_quote_characters=(v)
-      @filename_quote_characters = v.encode(encoding)
-    end
-
-    def special_prefixes=(v)
-      @special_prefixes = v.encode(encoding)
-    end
-
-    def completion_case_fold=(v)
-      @config.completion_ignore_case = v
-    end
-
-    def completion_case_fold
-      @config.completion_ignore_case
-    end
-
-    def completion_quote_character
-      @completion_quote_character
-    end
-
-    def completion_proc=(p)
-      raise ArgumentError unless p.respond_to?(:call) or p.nil?
-      @completion_proc = p
-    end
-
-    def output_modifier_proc=(p)
-      raise ArgumentError unless p.respond_to?(:call) or p.nil?
-      @output_modifier_proc = p
-    end
-
-    def prompt_proc=(p)
-      raise ArgumentError unless p.respond_to?(:call) or p.nil?
-      @prompt_proc = p
-    end
-
-    def auto_indent_proc=(p)
-      raise ArgumentError unless p.respond_to?(:call) or p.nil?
-      @auto_indent_proc = p
-    end
-
-    def pre_input_hook=(p)
-      @pre_input_hook = p
-    end
-
-    def dig_perfect_match_proc=(p)
-      raise ArgumentError unless p.respond_to?(:call) or p.nil?
-      @dig_perfect_match_proc = p
-    end
-
-    DialogProc = Struct.new(:dialog_proc, :context)
-    def add_dialog_proc(name_sym, p, context = nil)
-      raise ArgumentError unless name_sym.instance_of?(Symbol)
-      if p.nil?
-        @dialog_proc_list.delete(name_sym)
-      else
-        raise ArgumentError unless p.respond_to?(:call)
-        @dialog_proc_list[name_sym] = DialogProc.new(p, context)
-      end
-    end
-
-    def dialog_proc(name_sym)
-      @dialog_proc_list[name_sym]
-    end
-
-    def input=(val)
-      raise TypeError unless val.respond_to?(:getc) or val.nil?
-      if val.respond_to?(:getc) && io_gate.respond_to?(:input=)
-        io_gate.input = val
-      end
-    end
-
-    def output=(val)
-      raise TypeError unless val.respond_to?(:write) or val.nil?
-      @output = val
-      if io_gate.respond_to?(:output=)
-        io_gate.output = val
-      end
-    end
-
-    def vi_editing_mode
-      config.editing_mode = :vi_insert
-      nil
-    end
-
-    def emacs_editing_mode
-      config.editing_mode = :emacs
-      nil
-    end
-
-    def vi_editing_mode?
-      config.editing_mode_is?(:vi_insert, :vi_command)
-    end
-
-    def emacs_editing_mode?
-      config.editing_mode_is?(:emacs)
-    end
-
-    def get_screen_size
-      io_gate.get_screen_size
-    end
-
-    Reline::DEFAULT_DIALOG_PROC_AUTOCOMPLETE = ->() {
-      # autocomplete
-      return nil unless config.autocompletion
-      if just_cursor_moving and completion_journey_data.nil?
-        # Auto complete starts only when edited
-        return nil
-      end
-      pre, target, post = retrieve_completion_block(true)
-      if target.nil? or target.empty? or (completion_journey_data&.pointer == -1 and target.size <= 3)
-        return nil
-      end
-      if completion_journey_data and completion_journey_data.list
-        result = completion_journey_data.list.dup
-        result.shift
-        pointer = completion_journey_data.pointer - 1
-      else
-        result = call_completion_proc_with_checking_args(pre, target, post)
-        pointer = nil
-      end
-      if result and result.size == 1 and result[0] == target and pointer != 0
-        result = nil
-      end
-      target_width = Reline::Unicode.calculate_width(target)
-      x = cursor_pos.x - target_width
-      if x < 0
-        x = screen_width + x
-        y = -1
-      else
-        y = 0
-      end
-      cursor_pos_to_render = Reline::CursorPos.new(x, y)
-      if context and context.is_a?(Array)
-        context.clear
-        context.push(cursor_pos_to_render, result, pointer, dialog)
-      end
-      dialog.pointer = pointer
-      DialogRenderInfo.new(
-        pos: cursor_pos_to_render,
-        contents: result,
-        scrollbar: true,
-        height: [15, preferred_dialog_height].min,
-        bg_color: 46,
-        pointer_bg_color: 45,
-        fg_color: 37,
-        pointer_fg_color: 37
-      )
-    }
-    Reline::DEFAULT_DIALOG_CONTEXT = Array.new
-
-    def readmultiline(prompt = '', add_hist = false, &confirm_multiline_termination)
-      Reline.update_iogate
-      io_gate.with_raw_input do
-        unless confirm_multiline_termination
-          raise ArgumentError.new('#readmultiline needs block to confirm multiline termination')
-        end
-        inner_readline(prompt, add_hist, true, &confirm_multiline_termination)
-
-        whole_buffer = line_editor.whole_buffer.dup
-        whole_buffer.taint if RUBY_VERSION < '2.7'
-        if add_hist and whole_buffer and whole_buffer.chomp("\n").size > 0
-          Reline::HISTORY << whole_buffer
-        end
-
-        line_editor.reset_line if line_editor.whole_buffer.nil?
-        whole_buffer
-      end
-    end
-
-    def readline(prompt = '', add_hist = false)
-      Reline.update_iogate
-      inner_readline(prompt, add_hist, false)
-
-      line = line_editor.line.dup
-      line.taint if RUBY_VERSION < '2.7'
-      if add_hist and line and line.chomp("\n").size > 0
-        Reline::HISTORY << line.chomp("\n")
-      end
-
-      line_editor.reset_line if line_editor.line.nil?
-      line
-    end
-
-    private def inner_readline(prompt, add_hist, multiline, &confirm_multiline_termination)
-      if ENV['RELINE_STDERR_TTY']
-        if io_gate.win?
-          $stderr = File.open(ENV['RELINE_STDERR_TTY'], 'a')
-        else
-          $stderr.reopen(ENV['RELINE_STDERR_TTY'], 'w')
-        end
-        $stderr.sync = true
-        $stderr.puts "Reline is used by #{Process.pid}"
-      end
-      otio = io_gate.prep
-
-      may_req_ambiguous_char_width
-      line_editor.reset(prompt, encoding: encoding)
-      if multiline
-        line_editor.multiline_on
-        if block_given?
-          line_editor.confirm_multiline_termination_proc = confirm_multiline_termination
-        end
-      else
-        line_editor.multiline_off
-      end
-      line_editor.output = output
-      line_editor.completion_proc = completion_proc
-      line_editor.completion_append_character = completion_append_character
-      line_editor.output_modifier_proc = output_modifier_proc
-      line_editor.prompt_proc = prompt_proc
-      line_editor.auto_indent_proc = auto_indent_proc
-      line_editor.dig_perfect_match_proc = dig_perfect_match_proc
-      line_editor.pre_input_hook = pre_input_hook
-      @dialog_proc_list.each_pair do |name_sym, d|
-        line_editor.add_dialog_proc(name_sym, d.dialog_proc, d.context)
-      end
-
-      unless config.test_mode
-        config.read
-        config.reset_default_key_bindings
-        io_gate.set_default_key_bindings(config)
-      end
-
-      line_editor.rerender
-
-      begin
-        line_editor.set_signal_handlers
-        prev_pasting_state = false
-        loop do
-          prev_pasting_state = io_gate.in_pasting?
-          read_io(config.keyseq_timeout) { |inputs|
-            line_editor.set_pasting_state(io_gate.in_pasting?)
-            inputs.each { |c|
-              line_editor.input_key(c)
-              line_editor.rerender
-            }
-            if @bracketed_paste_finished
-              line_editor.rerender_all
-              @bracketed_paste_finished = false
-            end
-          }
-          if prev_pasting_state == true and not io_gate.in_pasting? and not line_editor.finished?
-            line_editor.set_pasting_state(false)
-            prev_pasting_state = false
-            line_editor.rerender_all
-          end
-          break if line_editor.finished?
-        end
-        io_gate.move_cursor_column(0)
-      rescue Errno::EIO
-        # Maybe the I/O has been closed.
-      rescue StandardError => e
-        line_editor.finalize
-        io_gate.deprep(otio)
-        raise e
-      rescue Exception
-        # Including Interrupt
-        line_editor.finalize
-        io_gate.deprep(otio)
-        raise
-      end
-
-      line_editor.finalize
-      io_gate.deprep(otio)
-    end
-
-    # GNU Readline waits for "keyseq-timeout" milliseconds to see if the ESC
-    # is followed by a character, and times out and treats it as a standalone
-    # ESC if the second character does not arrive. If the second character
-    # comes before timed out, it is treated as a modifier key with the
-    # meta-property of meta-key, so that it can be distinguished from
-    # multibyte characters with the 8th bit turned on.
-    #
-    # GNU Readline will wait for the 2nd character with "keyseq-timeout"
-    # milli-seconds but wait forever after 3rd characters.
-    private def read_io(keyseq_timeout, &block)
-      buffer = []
-      loop do
-        c = io_gate.getc(Float::INFINITY)
-        if c == -1
-          result = :unmatched
-          @bracketed_paste_finished = true
-        else
-          buffer << c
-          result = key_stroke.match_status(buffer)
-        end
-        case result
-        when :matched
-          expanded = key_stroke.expand(buffer).map{ |expanded_c|
-            Reline::Key.new(expanded_c, expanded_c, false)
-          }
-          block.(expanded)
-          break
-        when :matching
-          if buffer.size == 1
-            case read_2nd_character_of_key_sequence(keyseq_timeout, buffer, c, block)
-            when :break then break
-            when :next  then next
-            end
-          end
-        when :unmatched
-          if buffer.size == 1 and c == "\e".ord
-            read_escaped_key(keyseq_timeout, c, block)
-          else
-            expanded = buffer.map{ |expanded_c|
-              Reline::Key.new(expanded_c, expanded_c, false)
-            }
-            block.(expanded)
-          end
-          break
-        end
-      end
-    end
-
-    private def read_2nd_character_of_key_sequence(keyseq_timeout, buffer, c, block)
-      succ_c = io_gate.getc(keyseq_timeout.fdiv(1000))
-      if succ_c
-        case key_stroke.match_status(buffer.dup.push(succ_c))
-        when :unmatched
-          if c == "\e".ord
-            block.([Reline::Key.new(succ_c, succ_c | 0b10000000, true)])
-          else
-            block.([Reline::Key.new(c, c, false), Reline::Key.new(succ_c, succ_c, false)])
-          end
-          return :break
-        when :matching
-          io_gate.ungetc(succ_c)
-          return :next
-        when :matched
-          buffer << succ_c
-          expanded = key_stroke.expand(buffer).map{ |expanded_c|
-            Reline::Key.new(expanded_c, expanded_c, false)
-          }
-          block.(expanded)
-          return :break
-        end
-      else
-        block.([Reline::Key.new(c, c, false)])
-        return :break
-      end
-    end
-
-    private def read_escaped_key(keyseq_timeout, c, block)
-      escaped_c = io_gate.getc(keyseq_timeout.fdiv(1000))
-
-      if escaped_c.nil?
-        block.([Reline::Key.new(c, c, false)])
-      elsif escaped_c >= 128 # maybe, first byte of multi byte
-        block.([Reline::Key.new(c, c, false), Reline::Key.new(escaped_c, escaped_c, false)])
-      elsif escaped_c == "\e".ord # escape twice
-        block.([Reline::Key.new(c, c, false), Reline::Key.new(c, c, false)])
-      else
-        block.([Reline::Key.new(escaped_c, escaped_c | 0b10000000, true)])
-      end
-    end
-
-    def ambiguous_width
-      may_req_ambiguous_char_width unless defined? @ambiguous_width
-      @ambiguous_width
-    end
-
-    private def may_req_ambiguous_char_width
-      @ambiguous_width = 2 if io_gate == Reline::GeneralIO or !STDOUT.tty?
-      return if defined? @ambiguous_width
-      io_gate.move_cursor_column(0)
-      begin
-        output.write "\u{25bd}"
-      rescue Encoding::UndefinedConversionError
-        # LANG=C
-        @ambiguous_width = 1
-      else
-        @ambiguous_width = io_gate.cursor_pos.x
-      end
-      io_gate.move_cursor_column(0)
-      io_gate.erase_after_cursor
-    end
-  end
-
-  extend Forwardable
-  extend SingleForwardable
-
-  #--------------------------------------------------------
-  # Documented API
-  #--------------------------------------------------------
-
-  (Core::ATTR_READER_NAMES).each { |name|
-    def_single_delegators :core, :"#{name}", :"#{name}="
-  }
-  def_single_delegators :core, :input=, :output=
-  def_single_delegators :core, :vi_editing_mode, :emacs_editing_mode
-  def_single_delegators :core, :readline
-  def_single_delegators :core, :completion_case_fold, :completion_case_fold=
-  def_single_delegators :core, :completion_quote_character
-  def_instance_delegators self, :readline
-  private :readline
-
-
-  #--------------------------------------------------------
-  # Undocumented API
-  #--------------------------------------------------------
-
-  # Testable in original
-  def_single_delegators :core, :get_screen_size
-  def_single_delegators :line_editor, :eof?
-  def_instance_delegators self, :eof?
-  def_single_delegators :line_editor, :delete_text
-  def_single_delegator :line_editor, :line, :line_buffer
-  def_single_delegator :line_editor, :byte_pointer, :point
-  def_single_delegator :line_editor, :byte_pointer=, :point=
-
-  def self.insert_text(*args, &block)
-    line_editor.insert_text(*args, &block)
-    self
-  end
-
-  # Untestable in original
-  def_single_delegator :line_editor, :rerender, :redisplay
-  def_single_delegators :core, :vi_editing_mode?, :emacs_editing_mode?
-  def_single_delegators :core, :ambiguous_width
-  def_single_delegators :core, :last_incremental_search
-  def_single_delegators :core, :last_incremental_search=
-  def_single_delegators :core, :add_dialog_proc
-  def_single_delegators :core, :dialog_proc
-  def_single_delegators :core, :autocompletion, :autocompletion=
-
-  def_single_delegators :core, :readmultiline
-  def_instance_delegators self, :readmultiline
-  private :readmultiline
-
-  def self.encoding_system_needs
-    self.core.encoding
-  end
-
-  def self.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, core.encoding)
-
-      core.basic_word_break_characters = " \t\n`><=;|&{("
-      core.completer_word_break_characters = " \t\n`><=;|&{("
-      core.basic_quote_characters = '"\''
-      core.completer_quote_characters = '"\''
-      core.filename_quote_characters = ""
-      core.special_prefixes = ""
-      core.add_dialog_proc(:autocomplete, Reline::DEFAULT_DIALOG_PROC_AUTOCOMPLETE, Reline::DEFAULT_DIALOG_CONTEXT)
-    }
-  end
-
-  def self.ungetc(c)
-    core.io_gate.ungetc(c)
-  end
-
-  def self.line_editor
-    core.line_editor
-  end
-
-  def self.update_iogate
-    return if core.config.test_mode
-
-    # Need to change IOGate when `$stdout.tty?` change from false to true by `$stdout.reopen`
-    # Example: rails/spring boot the application in non-tty, then run console in tty.
-    if ENV['TERM'] != 'dumb' && core.io_gate == Reline::GeneralIO && $stdout.tty?
-      require 'reline/ansi'
-      remove_const(:IOGate)
-      const_set(:IOGate, Reline::ANSI)
-    end
-  end
-end
-
-require 'reline/general_io'
-io = Reline::GeneralIO
-unless ENV['TERM'] == 'dumb'
-  case RbConfig::CONFIG['host_os']
-  when /mswin|msys|mingw|cygwin|bccwin|wince|emc/
-    require 'reline/windows'
-    tty = (io = Reline::Windows).msys_tty?
-  else
-    tty = $stdout.tty?
-  end
-end
-Reline::IOGate = if tty
-  require 'reline/ansi'
-  Reline::ANSI
-else
-  io
-end
-
-Reline::HISTORY = Reline::History.new(Reline.core.config)
diff --git a/lib/reline/ansi.rb b/lib/reline/ansi.rb
deleted file mode 100644
index c2e5075ea8b5b4..00000000000000
--- a/lib/reline/ansi.rb
+++ /dev/null
@@ -1,363 +0,0 @@
-require 'io/console'
-require 'io/wait'
-require_relative 'terminfo'
-
-class Reline::ANSI
-  CAPNAME_KEY_BINDINGS = {
-    'khome' => :ed_move_to_beg,
-    'kend'  => :ed_move_to_end,
-    'kdch1' => :key_delete,
-    'kpp' => :ed_search_prev_history,
-    'knp' => :ed_search_next_history,
-    'kcuu1' => :ed_prev_history,
-    'kcud1' => :ed_next_history,
-    'kcuf1' => :ed_next_char,
-    'kcub1' => :ed_prev_char,
-  }
-
-  ANSI_CURSOR_KEY_BINDINGS = {
-    # Up
-    'A' => [:ed_prev_history, {}],
-    # Down
-    'B' => [:ed_next_history, {}],
-    # Right
-    'C' => [:ed_next_char, { ctrl: :em_next_word, meta: :em_next_word }],
-    # Left
-    'D' => [:ed_prev_char, { ctrl: :ed_prev_word, meta: :ed_prev_word }],
-    # End
-    'F' => [:ed_move_to_end, {}],
-    # Home
-    'H' => [:ed_move_to_beg, {}],
-  }
-
-  if Reline::Terminfo.enabled?
-    Reline::Terminfo.setupterm(0, 2)
-  end
-
-  def self.encoding
-    Encoding.default_external
-  end
-
-  def self.win?
-    false
-  end
-
-  def self.set_default_key_bindings(config, allow_terminfo: true)
-    set_default_key_bindings_ansi_cursor(config)
-    if allow_terminfo && Reline::Terminfo.enabled?
-      set_default_key_bindings_terminfo(config)
-    else
-      set_default_key_bindings_comprehensive_list(config)
-    end
-    {
-      [27, 91, 90] => :completion_journey_up, # S-Tab
-    }.each_pair do |key, func|
-      config.add_default_key_binding_by_keymap(:emacs, key, func)
-      config.add_default_key_binding_by_keymap(:vi_insert, key, func)
-    end
-    {
-      # default bindings
-      [27, 32] => :em_set_mark,             # M-<space>
-      [24, 24] => :em_exchange_mark,        # C-x C-x
-    }.each_pair do |key, func|
-      config.add_default_key_binding_by_keymap(:emacs, key, func)
-    end
-  end
-
-  def self.set_default_key_bindings_ansi_cursor(config)
-    ANSI_CURSOR_KEY_BINDINGS.each do |char, (default_func, modifiers)|
-      bindings = [["\e[#{char}", default_func]] # CSI + char
-      if modifiers[:ctrl]
-        # CSI + ctrl_key_modifier + char
-        bindings << ["\e[1;5#{char}", modifiers[:ctrl]]
-      end
-      if modifiers[:meta]
-        # CSI + meta_key_modifier + char
-        bindings << ["\e[1;3#{char}", modifiers[:meta]]
-        # Meta(ESC) + CSI + char
-        bindings << ["\e\e[#{char}", modifiers[:meta]]
-      end
-      bindings.each do |sequence, func|
-        key = sequence.bytes
-        config.add_default_key_binding_by_keymap(:emacs, key, func)
-        config.add_default_key_binding_by_keymap(:vi_insert, key, func)
-        config.add_default_key_binding_by_keymap(:vi_command, key, func)
-      end
-    end
-  end
-
-  def self.set_default_key_bindings_terminfo(config)
-    key_bindings = CAPNAME_KEY_BINDINGS.map do |capname, key_binding|
-      begin
-        key_code = Reline::Terminfo.tigetstr(capname)
-        [ key_code.bytes, key_binding ]
-      rescue Reline::Terminfo::TerminfoError
-        # capname is undefined
-      end
-    end.compact.to_h
-
-    key_bindings.each_pair do |key, func|
-      config.add_default_key_binding_by_keymap(:emacs, key, func)
-      config.add_default_key_binding_by_keymap(:vi_insert, key, func)
-      config.add_default_key_binding_by_keymap(:vi_command, key, func)
-    end
-  end
-
-  def self.set_default_key_bindings_comprehensive_list(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
-
-      # KDE
-      # 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,        # ←
-
-      # urxvt / exoterm
-      [27, 91, 55, 126] => :ed_move_to_beg, # Home
-      [27, 91, 56, 126] => :ed_move_to_end, # End
-
-      # 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
-
-      [27, 79, 65] => :ed_prev_history,     # ↑
-      [27, 79, 66] => :ed_next_history,     # ↓
-      [27, 79, 67] => :ed_next_char,        # →
-      [27, 79, 68] => :ed_prev_char,        # ←
-    }.each_pair do |key, func|
-      config.add_default_key_binding_by_keymap(:emacs, key, func)
-      config.add_default_key_binding_by_keymap(:vi_insert, key, func)
-      config.add_default_key_binding_by_keymap(:vi_command, key, func)
-    end
-  end
-
-  @@input = STDIN
-  def self.input=(val)
-    @@input = val
-  end
-
-  @@output = STDOUT
-  def self.output=(val)
-    @@output = val
-  end
-
-  def self.with_raw_input
-    @@input.raw { yield }
-  end
-
-  @@buf = []
-  def self.inner_getc(timeout_second)
-    unless @@buf.empty?
-      return @@buf.shift
-    end
-    until c = @@input.raw(intr: true) { @@input.wait_readable(0.1) && @@input.getbyte }
-      timeout_second -= 0.1
-      return nil if timeout_second <= 0
-      Reline.core.line_editor.resize
-    end
-    (c == 0x16 && @@input.raw(min: 0, time: 0, &:getbyte)) || c
-  rescue Errno::EIO
-    # Maybe the I/O has been closed.
-    nil
-  rescue Errno::ENOTTY
-    nil
-  end
-
-  @@in_bracketed_paste_mode = false
-  START_BRACKETED_PASTE = String.new("\e[200~,", encoding: Encoding::ASCII_8BIT)
-  END_BRACKETED_PASTE = String.new("\e[200~.", encoding: Encoding::ASCII_8BIT)
-  def self.getc_with_bracketed_paste(timeout_second)
-    buffer = String.new(encoding: Encoding::ASCII_8BIT)
-    buffer << inner_getc(timeout_second)
-    while START_BRACKETED_PASTE.start_with?(buffer) or END_BRACKETED_PASTE.start_with?(buffer) do
-      if START_BRACKETED_PASTE == buffer
-        @@in_bracketed_paste_mode = true
-        return inner_getc(timeout_second)
-      elsif END_BRACKETED_PASTE == buffer
-        @@in_bracketed_paste_mode = false
-        ungetc(-1)
-        return inner_getc(timeout_second)
-      end
-      succ_c = inner_getc(Reline.core.config.keyseq_timeout)
-
-      if succ_c
-        buffer << succ_c
-      else
-        break
-      end
-    end
-    buffer.bytes.reverse_each do |ch|
-      ungetc ch
-    end
-    inner_getc(timeout_second)
-  end
-
-  # if the usage expects to wait indefinitely, use Float::INFINITY for timeout_second
-  def self.getc(timeout_second)
-    if Reline.core.config.enable_bracketed_paste
-      getc_with_bracketed_paste(timeout_second)
-    else
-      inner_getc(timeout_second)
-    end
-  end
-
-  def self.in_pasting?
-    @@in_bracketed_paste_mode or (not empty_buffer?)
-  end
-
-  def self.empty_buffer?
-    unless @@buf.empty?
-      return false
-    end
-    !@@input.wait_readable(0)
-  end
-
-  def self.ungetc(c)
-    @@buf.unshift(c)
-  end
-
-  def self.retrieve_keybuffer
-    begin
-      return unless @@input.wait_readable(0.001)
-      str = @@input.read_nonblock(1024)
-      str.bytes.each do |c|
-        @@buf.push(c)
-      end
-    rescue EOFError
-    end
-  end
-
-  def self.get_screen_size
-    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
-
-  def self.set_screen_size(rows, columns)
-    @@input.winsize = [rows, columns]
-    self
-  rescue Errno::ENOTTY
-    self
-  end
-
-  def self.cursor_pos
-    begin
-      res = +''
-      m = nil
-      @@input.raw do |stdin|
-        @@output << "\e[6n"
-        @@output.flush
-        loop do
-          c = stdin.getc
-          next if c.nil?
-          res << c
-          m = res.match(/\e\[(?<row>\d+);(?<column>\d+)R/)
-          break if m
-        end
-        (m.pre_match + m.post_match).chars.reverse_each do |ch|
-          stdin.ungetc ch
-        end
-      end
-      column = m[:column].to_i - 1
-      row = m[:row].to_i - 1
-    rescue Errno::ENOTTY
-      begin
-        buf = @@output.pread(@@output.pos, 0)
-        row = buf.count("\n")
-        column = buf.rindex("\n") ? (buf.size - buf.rindex("\n")) - 1 : 0
-      rescue Errno::ESPIPE
-        # Just returns column 1 for ambiguous width because this I/O is not
-        # tty and can't seek.
-        row = 0
-        column = 1
-      end
-    end
-    Reline::CursorPos.new(column, row)
-  end
-
-  def self.move_cursor_column(x)
-    @@output.write "\e[#{x + 1}G"
-  end
-
-  def self.move_cursor_up(x)
-    if x > 0
-      @@output.write "\e[#{x}A"
-    elsif x < 0
-      move_cursor_down(-x)
-    end
-  end
-
-  def self.move_cursor_down(x)
-    if x > 0
-      @@output.write "\e[#{x}B"
-    elsif x < 0
-      move_cursor_up(-x)
-    end
-  end
-
-  def self.hide_cursor
-    if Reline::Terminfo.enabled?
-      begin
-        @@output.write Reline::Terminfo.tigetstr('civis')
-      rescue Reline::Terminfo::TerminfoError
-        # civis is undefined
-      end
-    else
-      # ignored
-    end
-  end
-
-  def self.show_cursor
-    if Reline::Terminfo.enabled?
-      begin
-        @@output.write Reline::Terminfo.tigetstr('cnorm')
-      rescue Reline::Terminfo::TerminfoError
-        # cnorm is undefined
-      end
-    else
-      # ignored
-    end
-  end
-
-  def self.erase_after_cursor
-    @@output.write "\e[K"
-  end
-
-  # This only works when the cursor is at the bottom of the scroll range
-  # For more details, see https://github.com/ruby/reline/pull/577#issuecomment-1646679623
-  def self.scroll_down(x)
-    return if x.zero?
-    # We use `\n` instead of CSI + S because CSI + S would cause https://github.com/ruby/reline/issues/576
-    @@output.write "\n" * x
-  end
-
-  def self.clear_screen
-    @@output.write "\e[2J"
-    @@output.write "\e[1;1H"
-  end
-
-  @@old_winch_handler = nil
-  def self.set_winch_handler(&handler)
-    @@old_winch_handler = Signal.trap('WINCH', &handler)
-  end
-
-  def self.prep
-    retrieve_keybuffer
-    nil
-  end
-
-  def self.deprep(otio)
-    Signal.trap('WINCH', @@old_winch_handler) if @@old_winch_handler
-  end
-end
diff --git a/lib/reline/config.rb b/lib/reline/config.rb
deleted file mode 100644
index 87726393a6622a..00000000000000
--- a/lib/reline/config.rb
+++ /dev/null
@@ -1,401 +0,0 @@
-class Reline::Config
-  attr_reader :test_mode
-
-  KEYSEQ_PATTERN = /\\(?:C|Control)-[A-Za-z_]|\\(?:M|Meta)-[0-9A-Za-z_]|\\(?:C|Control)-(?:M|Meta)-[A-Za-z_]|\\(?:M|Meta)-(?:C|Control)-[A-Za-z_]|\\e|\\[\\\"\'abdfnrtv]|\\\d{1,3}|\\x\h{1,2}|./
-
-  class InvalidInputrc < RuntimeError
-    attr_accessor :file, :lineno
-  end
-
-  VARIABLE_NAMES = %w{
-    bind-tty-special-chars
-    blink-matching-paren
-    byte-oriented
-    completion-ignore-case
-    convert-meta
-    disable-completion
-    enable-keypad
-    expand-tilde
-    history-preserve-point
-    history-size
-    horizontal-scroll-mode
-    input-meta
-    keyseq-timeout
-    mark-directories
-    mark-modified-lines
-    mark-symlinked-directories
-    match-hidden-files
-    meta-flag
-    output-meta
-    page-completions
-    prefer-visible-bell
-    print-completions-horizontally
-    show-all-if-ambiguous
-    show-all-if-unmodified
-    visible-stats
-    show-mode-in-prompt
-    vi-cmd-mode-string
-    vi-ins-mode-string
-    emacs-mode-string
-    enable-bracketed-paste
-    isearch-terminators
-  }
-  VARIABLE_NAME_SYMBOLS = VARIABLE_NAMES.map { |v| :"#{v.tr(?-, ?_)}" }
-  VARIABLE_NAME_SYMBOLS.each do |v|
-    attr_accessor v
-  end
-
-  attr_accessor :autocompletion
-
-  def initialize
-    @additional_key_bindings = {} # from inputrc
-    @additional_key_bindings[:emacs] = {}
-    @additional_key_bindings[:vi_insert] = {}
-    @additional_key_bindings[:vi_command] = {}
-    @oneshot_key_bindings = {}
-    @skip_section = nil
-    @if_stack = nil
-    @editing_mode_label = :emacs
-    @keymap_label = :emacs
-    @keymap_prefix = []
-    @key_actors = {}
-    @key_actors[:emacs] = Reline::KeyActor::Emacs.new
-    @key_actors[:vi_insert] = Reline::KeyActor::ViInsert.new
-    @key_actors[:vi_command] = Reline::KeyActor::ViCommand.new
-    @vi_cmd_mode_string = '(cmd)'
-    @vi_ins_mode_string = '(ins)'
-    @emacs_mode_string = '@'
-    # https://tiswww.case.edu/php/chet/readline/readline.html#IDX25
-    @history_size = -1 # unlimited
-    @keyseq_timeout = 500
-    @test_mode = false
-    @autocompletion = false
-    @convert_meta = true if seven_bit_encoding?(Reline::IOGate.encoding)
-  end
-
-  def reset
-    if editing_mode_is?(:vi_command)
-      @editing_mode_label = :vi_insert
-    end
-    @additional_key_bindings.keys.each do |key|
-      @additional_key_bindings[key].clear
-    end
-    @oneshot_key_bindings.clear
-    reset_default_key_bindings
-  end
-
-  def editing_mode
-    @key_actors[@editing_mode_label]
-  end
-
-  def editing_mode=(val)
-    @editing_mode_label = val
-  end
-
-  def editing_mode_is?(*val)
-    val.any?(@editing_mode_label)
-  end
-
-  def keymap
-    @key_actors[@keymap_label]
-  end
-
-  def inputrc_path
-    case ENV['INPUTRC']
-    when nil, ''
-    else
-      return File.expand_path(ENV['INPUTRC'])
-    end
-
-    # In the XDG Specification, if ~/.config/readline/inputrc exists, then
-    # ~/.inputrc should not be read, but for compatibility with GNU Readline,
-    # if ~/.inputrc exists, then it is given priority.
-    home_rc_path = File.expand_path('~/.inputrc')
-    return home_rc_path if File.exist?(home_rc_path)
-
-    case path = ENV['XDG_CONFIG_HOME']
-    when nil, ''
-    else
-      path = File.join(path, 'readline/inputrc')
-      return path if File.exist?(path) and path == File.expand_path(path)
-    end
-
-    path = File.expand_path('~/.config/readline/inputrc')
-    return path if File.exist?(path)
-
-    return home_rc_path
-  end
-
-  private def default_inputrc_path
-    @default_inputrc_path ||= inputrc_path
-  end
-
-  def read(file = nil)
-    file ||= default_inputrc_path
-    begin
-      if file.respond_to?(:readlines)
-        lines = file.readlines
-      else
-        lines = File.readlines(file)
-      end
-    rescue Errno::ENOENT
-      return nil
-    end
-
-    read_lines(lines, file)
-    self
-  rescue InvalidInputrc => e
-    warn e.message
-    nil
-  end
-
-  def key_bindings
-    # The key bindings for each editing mode will be overwritten by the user-defined ones.
-    kb = @key_actors[@editing_mode_label].default_key_bindings.dup
-    kb.merge!(@additional_key_bindings[@editing_mode_label])
-    kb.merge!(@oneshot_key_bindings)
-    kb
-  end
-
-  def add_oneshot_key_binding(keystroke, target)
-    @oneshot_key_bindings[keystroke] = target
-  end
-
-  def reset_oneshot_key_bindings
-    @oneshot_key_bindings.clear
-  end
-
-  def add_default_key_binding_by_keymap(keymap, keystroke, target)
-    @key_actors[keymap].default_key_bindings[keystroke] = target
-  end
-
-  def add_default_key_binding(keystroke, target)
-    @key_actors[@keymap_label].default_key_bindings[keystroke] = target
-  end
-
-  def reset_default_key_bindings
-    @key_actors.values.each do |ka|
-      ka.reset_default_key_bindings
-    end
-  end
-
-  def read_lines(lines, file = nil)
-    if not lines.empty? and lines.first.encoding != Reline.encoding_system_needs
-      begin
-        lines = lines.map do |l|
-          l.encode(Reline.encoding_system_needs)
-        rescue Encoding::UndefinedConversionError
-          mes = "The inputrc encoded in #{lines.first.encoding.name} can't be converted to the locale #{Reline.encoding_system_needs.name}."
-          raise Reline::ConfigEncodingConversionError.new(mes)
-        end
-      end
-    end
-    conditions = [@skip_section, @if_stack]
-    @skip_section = nil
-    @if_stack = []
-
-    lines.each_with_index do |line, no|
-      next if line.match(/\A\s*#/)
-
-      no += 1
-
-      line = line.chomp.lstrip
-      if line.start_with?('$')
-        handle_directive(line[1..-1], file, no)
-        next
-      end
-
-      next if @skip_section
-
-      case line
-      when /^set +([^ ]+) +([^ ]+)/i
-        var, value = $1.downcase, $2
-        bind_variable(var, value)
-        next
-      when /\s*("#{KEYSEQ_PATTERN}+")\s*:\s*(.*)\s*$/o
-        key, func_name = $1, $2
-        keystroke, func = bind_key(key, func_name)
-        next unless keystroke
-        @additional_key_bindings[@keymap_label][@keymap_prefix + keystroke] = func
-      end
-    end
-    unless @if_stack.empty?
-      raise InvalidInputrc, "#{file}:#{@if_stack.last[1]}: unclosed if"
-    end
-  ensure
-    @skip_section, @if_stack = conditions
-  end
-
-  def handle_directive(directive, file, no)
-    directive, args = directive.split(' ')
-    case directive
-    when 'if'
-      condition = false
-      case args
-      when 'mode'
-      when 'term'
-      when 'version'
-      else # application name
-        condition = true if args == 'Ruby'
-        condition = true if args == 'Reline'
-      end
-      @if_stack << [file, no, @skip_section]
-      @skip_section = !condition
-    when 'else'
-      if @if_stack.empty?
-        raise InvalidInputrc, "#{file}:#{no}: unmatched else"
-      end
-      @skip_section = !@skip_section
-    when 'endif'
-      if @if_stack.empty?
-        raise InvalidInputrc, "#{file}:#{no}: unmatched endif"
-      end
-      @skip_section = @if_stack.pop
-    when 'include'
-      read(args)
-    end
-  end
-
-  def bind_variable(name, value)
-    case name
-    when 'history-size'
-      begin
-        @history_size = Integer(value)
-      rescue ArgumentError
-        @history_size = 500
-      end
-    when 'bell-style'
-      @bell_style =
-        case value
-        when 'none', 'off'
-          :none
-        when 'audible', 'on'
-          :audible
-        when 'visible'
-          :visible
-        else
-          :audible
-        end
-    when 'comment-begin'
-      @comment_begin = value.dup
-    when 'completion-query-items'
-      @completion_query_items = value.to_i
-    when 'isearch-terminators'
-      @isearch_terminators = retrieve_string(value)
-    when 'editing-mode'
-      case value
-      when 'emacs'
-        @editing_mode_label = :emacs
-        @keymap_label = :emacs
-        @keymap_prefix = []
-      when 'vi'
-        @editing_mode_label = :vi_insert
-        @keymap_label = :vi_insert
-        @keymap_prefix = []
-      end
-    when 'keymap'
-      case value
-      when 'emacs', 'emacs-standard'
-        @keymap_label = :emacs
-        @keymap_prefix = []
-      when 'emacs-ctlx'
-        @keymap_label = :emacs
-        @keymap_prefix = [?\C-x.ord]
-      when 'emacs-meta'
-        @keymap_label = :emacs
-        @keymap_prefix = [?\e.ord]
-      when 'vi', 'vi-move', 'vi-command'
-        @keymap_label = :vi_command
-        @keymap_prefix = []
-      when 'vi-insert'
-        @keymap_label = :vi_insert
-        @keymap_prefix = []
-      end
-    when 'keyseq-timeout'
-      @keyseq_timeout = value.to_i
-    when 'show-mode-in-prompt'
-      case value
-      when 'off'
-        @show_mode_in_prompt = false
-      when 'on'
-        @show_mode_in_prompt = true
-      else
-        @show_mode_in_prompt = false
-      end
-    when 'vi-cmd-mode-string'
-      @vi_cmd_mode_string = retrieve_string(value)
-    when 'vi-ins-mode-string'
-      @vi_ins_mode_string = retrieve_string(value)
-    when 'emacs-mode-string'
-      @emacs_mode_string = retrieve_string(value)
-    when *VARIABLE_NAMES then
-      variable_name = :"@#{name.tr(?-, ?_)}"
-      instance_variable_set(variable_name, value.nil? || value == '1' || value == 'on')
-    end
-  end
-
-  def retrieve_string(str)
-    str = $1 if str =~ /\A"(.*)"\z/
-    parse_keyseq(str).map { |c| c.chr(Reline.encoding_system_needs) }.join
-  end
-
-  def bind_key(key, func_name)
-    if key =~ /\A"(.*)"\z/
-      keyseq = parse_keyseq($1)
-    else
-      keyseq = nil
-    end
-    if func_name =~ /"(.*)"/
-      func = parse_keyseq($1)
-    else
-      func = func_name.tr(?-, ?_).to_sym # It must be macro.
-    end
-    [keyseq, func]
-  end
-
-  def key_notation_to_code(notation)
-    case notation
-    when /\\(?:C|Control)-([A-Za-z_])/
-      (1 + $1.downcase.ord - ?a.ord)
-    when /\\(?:M|Meta)-([0-9A-Za-z_])/
-      modified_key = $1
-      case $1
-      when /[0-9]/
-        ?\M-0.bytes.first + (modified_key.ord - ?0.ord)
-      when /[A-Z]/
-        ?\M-A.bytes.first + (modified_key.ord - ?A.ord)
-      when /[a-z]/
-        ?\M-a.bytes.first + (modified_key.ord - ?a.ord)
-      end
-    when /\\(?:C|Control)-(?:M|Meta)-[A-Za-z_]/, /\\(?:M|Meta)-(?:C|Control)-[A-Za-z_]/
-    # 129 M-^A
-    when /\\(\d{1,3})/ then $1.to_i(8) # octal
-    when /\\x(\h{1,2})/ then $1.to_i(16) # hexadecimal
-    when "\\e" then ?\e.ord
-    when "\\\\" then ?\\.ord
-    when "\\\"" then ?".ord
-    when "\\'" then ?'.ord
-    when "\\a" then ?\a.ord
-    when "\\b" then ?\b.ord
-    when "\\d" then ?\d.ord
-    when "\\f" then ?\f.ord
-    when "\\n" then ?\n.ord
-    when "\\r" then ?\r.ord
-    when "\\t" then ?\t.ord
-    when "\\v" then ?\v.ord
-    else notation.ord
-    end
-  end
-
-  def parse_keyseq(str)
-    ret = []
-    str.scan(KEYSEQ_PATTERN) do
-      ret << key_notation_to_code($&)
-    end
-    ret
-  end
-
-  private def seven_bit_encoding?(encoding)
-    encoding == Encoding::US_ASCII
-  end
-end
diff --git a/lib/reline/general_io.rb b/lib/reline/general_io.rb
deleted file mode 100644
index dd2e87eaf0a441..00000000000000
--- a/lib/reline/general_io.rb
+++ /dev/null
@@ -1,112 +0,0 @@
-require 'io/wait'
-
-class Reline::GeneralIO
-  def self.reset(encoding: nil)
-    @@pasting = false
-    @@encoding = encoding
-  end
-
-  def self.encoding
-    if defined?(@@encoding)
-      @@encoding
-    elsif RUBY_PLATFORM =~ /mswin|mingw/
-      Encoding::UTF_8
-    else
-      Encoding::default_external
-    end
-  end
-
-  def self.win?
-    false
-  end
-
-  def self.set_default_key_bindings(_)
-  end
-
-  @@buf = []
-  @@input = STDIN
-
-  def self.input=(val)
-    @@input = val
-  end
-
-  def self.with_raw_input
-    yield
-  end
-
-  def self.getc(_timeout_second)
-    unless @@buf.empty?
-      return @@buf.shift
-    end
-    c = nil
-    loop do
-      result = @@input.wait_readable(0.1)
-      next if result.nil?
-      c = @@input.read(1)
-      break
-    end
-    c&.ord
-  end
-
-  def self.ungetc(c)
-    @@buf.unshift(c)
-  end
-
-  def self.get_screen_size
-    [1, 1]
-  end
-
-  def self.cursor_pos
-    Reline::CursorPos.new(1, 1)
-  end
-
-  def self.hide_cursor
-  end
-
-  def self.show_cursor
-  end
-
-  def self.move_cursor_column(val)
-  end
-
-  def self.move_cursor_up(val)
-  end
-
-  def self.move_cursor_down(val)
-  end
-
-  def self.erase_after_cursor
-  end
-
-  def self.scroll_down(val)
-  end
-
-  def self.clear_screen
-  end
-
-  def self.set_screen_size(rows, columns)
-  end
-
-  def self.set_winch_handler(&handler)
-  end
-
-  @@pasting = false
-
-  def self.in_pasting?
-    @@pasting
-  end
-
-  def self.start_pasting
-    @@pasting = true
-  end
-
-  def self.finish_pasting
-    @@pasting = false
-  end
-
-  def self.prep
-  end
-
-  def self.deprep(otio)
-  end
-end
diff --git a/lib/reline/history.rb b/lib/reline/history.rb
deleted file mode 100644
index 7a1ed6b90baa41..00000000000000
--- a/lib/reline/history.rb
+++ /dev/null
@@ -1,76 +0,0 @@
-class Reline::History < Array
-  def initialize(config)
-    @config = config
-  end
-
-  def to_s
-    'HISTORY'
-  end
-
-  def delete_at(index)
-    index = check_index(index)
-    super(index)
-  end
-
-  def [](index)
-    index = check_index(index) unless index.is_a?(Range)
-    super(index)
-  end
-
-  def []=(index, val)
-    index = check_index(index)
-    super(index, String.new(val, encoding: Reline.encoding_system_needs))
-  end
-
-  def concat(*val)
-    val.each do |v|
-      push(*v)
-    end
-  end
-
-  def push(*val)
-    # If history_size is zero, all histories are dropped.
-    return self if @config.history_size.zero?
-    # If history_size is negative, history size is unlimited.
-    if @config.history_size.positive?
-      diff = size + val.size - @config.history_size
-      if diff > 0
-        if diff <= size
-          shift(diff)
-        else
-          diff -= size
-          clear
-          val.shift(diff)
-        end
-      end
-    end
-    super(*(val.map{ |v|
-      String.new(v, encoding: Reline.encoding_system_needs)
-    }))
-  end
-
-  def <<(val)
-    # If history_size is zero, all histories are dropped.
-    return self if @config.history_size.zero?
-    # If history_size is negative, history size is unlimited.
-    if @config.history_size.positive?
-      shift if size + 1 > @config.history_size
-    end
-    super(String.new(val, encoding: Reline.encoding_system_needs))
-  end
-
-  private def check_index(index)
-    index += size if index < 0
-    if index < -2147483648 or 2147483647 < index
-      raise RangeError.new("integer #{index} too big to convert to `int'")
-    end
-    # If history_size is negative, history size is unlimited.
-    if @config.history_size.positive?
-      if index < -@config.history_size or @config.history_size < index
-        raise RangeError.new("index=<#{index}>")
-      end
-    end
-    raise IndexError.new("index=<#{index}>") if index < 0 or size <= index
-    index
-  end
-end
diff --git a/lib/reline/key_actor.rb b/lib/reline/key_actor.rb
deleted file mode 100644
index ebe09d20099f67..00000000000000
--- a/lib/reline/key_actor.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-module Reline::KeyActor
-end
-
-require 'reline/key_actor/base'
-require 'reline/key_actor/emacs'
-require 'reline/key_actor/vi_command'
-require 'reline/key_actor/vi_insert'
diff --git a/lib/reline/key_actor/base.rb b/lib/reline/key_actor/base.rb
deleted file mode 100644
index a1cd7fb2a19060..00000000000000
--- a/lib/reline/key_actor/base.rb
+++ /dev/null
@@ -1,19 +0,0 @@
-class Reline::KeyActor::Base
-  MAPPING = Array.new(256)
-
-  def get_method(key)
-    self.class::MAPPING[key]
-  end
-
-  def initialize
-    @default_key_bindings = {}
-  end
-
-  def default_key_bindings
-    @default_key_bindings
-  end
-
-  def reset_default_key_bindings
-    @default_key_bindings.clear
-  end
-end
diff --git a/lib/reline/key_actor/emacs.rb b/lib/reline/key_actor/emacs.rb
deleted file mode 100644
index a561feee578cd2..00000000000000
--- a/lib/reline/key_actor/emacs.rb
+++ /dev/null
@@ -1,517 +0,0 @@
-class Reline::KeyActor::Emacs < Reline::KeyActor::Base
-  MAPPING = [
-    #   0 ^@
-    :em_set_mark,
-    #   1 ^A
-    :ed_move_to_beg,
-    #   2 ^B
-    :ed_prev_char,
-    #   3 ^C
-    :ed_ignore,
-    #   4 ^D
-    :em_delete,
-    #   5 ^E
-    :ed_move_to_end,
-    #   6 ^F
-    :ed_next_char,
-    #   7 ^G
-    :ed_unassigned,
-    #   8 ^H
-    :em_delete_prev_char,
-    #   9 ^I
-    :ed_unassigned,
-    #  10 ^J
-    :ed_newline,
-    #  11 ^K
-    :ed_kill_line,
-    #  12 ^L
-    :ed_clear_screen,
-    #  13 ^M
-    :ed_newline,
-    #  14 ^N
-    :ed_next_history,
-    #  15 ^O
-    :ed_ignore,
-    #  16 ^P
-    :ed_prev_history,
-    #  17 ^Q
-    :ed_quoted_insert,
-    #  18 ^R
-    :vi_search_prev,
-    #  19 ^S
-    :vi_search_next,
-    #  20 ^T
-    :ed_transpose_chars,
-    #  21 ^U
-    :unix_line_discard,
-    #  22 ^V
-    :ed_quoted_insert,
-    #  23 ^W
-    :em_kill_region,
-    #  24 ^X
-    :ed_sequence_lead_in,
-    #  25 ^Y
-    :em_yank,
-    #  26 ^Z
-    :ed_ignore,
-    #  27 ^[
-    :em_meta_next,
-    #  28 ^\
-    :ed_ignore,
-    #  29 ^]
-    :ed_ignore,
-    #  30 ^^
-    :ed_unassigned,
-    #  31 ^_
-    :ed_unassigned,
-    #  32 SPACE
-    :ed_insert,
-    #  33 !
-    :ed_insert,
-    #  34 "
-    :ed_insert,
-    #  35 #
-    :ed_insert,
-    #  36 $
-    :ed_insert,
-    #  37 %
-    :ed_insert,
-    #  38 &
-    :ed_insert,
-    #  39 '
-    :ed_insert,
-    #  40 (
-    :ed_insert,
-    #  41 )
-    :ed_insert,
-    #  42 *
-    :ed_insert,
-    #  43 +
-    :ed_insert,
-    #  44 ,
-    :ed_insert,
-    #  45 -
-    :ed_insert,
-    #  46 .
-    :ed_insert,
-    #  47 /
-    :ed_insert,
-    #  48 0
-    :ed_digit,
-    #  49 1
-    :ed_digit,
-    #  50 2
-    :ed_digit,
-    #  51 3
-    :ed_digit,
-    #  52 4
-    :ed_digit,
-    #  53 5
-    :ed_digit,
-    #  54 6
-    :ed_digit,
-    #  55 7
-    :ed_digit,
-    #  56 8
-    :ed_digit,
-    #  57 9
-    :ed_digit,
-    #  58 :
-    :ed_insert,
-    #  59 ;
-    :ed_insert,
-    #  60 <
-    :ed_insert,
-    #  61 =
-    :ed_insert,
-    #  62 >
-    :ed_insert,
-    #  63 ?
-    :ed_insert,
-    #  64 @
-    :ed_insert,
-    #  65 A
-    :ed_insert,
-    #  66 B
-    :ed_insert,
-    #  67 C
-    :ed_insert,
-    #  68 D
-    :ed_insert,
-    #  69 E
-    :ed_insert,
-    #  70 F
-    :ed_insert,
-    #  71 G
-    :ed_insert,
-    #  72 H
-    :ed_insert,
-    #  73 I
-    :ed_insert,
-    #  74 J
-    :ed_insert,
-    #  75 K
-    :ed_insert,
-    #  76 L
-    :ed_insert,
-    #  77 M
-    :ed_insert,
-    #  78 N
-    :ed_insert,
-    #  79 O
-    :ed_insert,
-    #  80 P
-    :ed_insert,
-    #  81 Q
-    :ed_insert,
-    #  82 R
-    :ed_insert,
-    #  83 S
-    :ed_insert,
-    #  84 T
-    :ed_insert,
-    #  85 U
-    :ed_insert,
-    #  86 V
-    :ed_insert,
-    #  87 W
-    :ed_insert,
-    #  88 X
-    :ed_insert,
-    #  89 Y
-    :ed_insert,
-    #  90 Z
-    :ed_insert,
-    #  91 [
-    :ed_insert,
-    #  92 \
-    :ed_insert,
-    #  93 ]
-    :ed_insert,
-    #  94 ^
-    :ed_insert,
-    #  95 _
-    :ed_insert,
-    #  96 `
-    :ed_insert,
-    #  97 a
-    :ed_insert,
-    #  98 b
-    :ed_insert,
-    #  99 c
-    :ed_insert,
-    # 100 d
-    :ed_insert,
-    # 101 e
-    :ed_insert,
-    # 102 f
-    :ed_insert,
-    # 103 g
-    :ed_insert,
-    # 104 h
-    :ed_insert,
-    # 105 i
-    :ed_insert,
-    # 106 j
-    :ed_insert,
-    # 107 k
-    :ed_insert,
-    # 108 l
-    :ed_insert,
-    # 109 m
-    :ed_insert,
-    # 110 n
-    :ed_insert,
-    # 111 o
-    :ed_insert,
-    # 112 p
-    :ed_insert,
-    # 113 q
-    :ed_insert,
-    # 114 r
-    :ed_insert,
-    # 115 s
-    :ed_insert,
-    # 116 t
-    :ed_insert,
-    # 117 u
-    :ed_insert,
-    # 118 v
-    :ed_insert,
-    # 119 w
-    :ed_insert,
-    # 120 x
-    :ed_insert,
-    # 121 y
-    :ed_insert,
-    # 122 z
-    :ed_insert,
-    # 123 {
-    :ed_insert,
-    # 124 |
-    :ed_insert,
-    # 125 }
-    :ed_insert,
-    # 126 ~
-    :ed_insert,
-    # 127 ^?
-    :em_delete_prev_char,
-    # 128 M-^@
-    :ed_unassigned,
-    # 129 M-^A
-    :ed_unassigned,
-    # 130 M-^B
-    :ed_unassigned,
-    # 131 M-^C
-    :ed_unassigned,
-    # 132 M-^D
-    :ed_unassigned,
-    # 133 M-^E
-    :ed_unassigned,
-    # 134 M-^F
-    :ed_unassigned,
-    # 135 M-^G
-    :ed_unassigned,
-    # 136 M-^H
-    :ed_delete_prev_word,
-    # 137 M-^I
-    :ed_unassigned,
-    # 138 M-^J
-    :key_newline,
-    # 139 M-^K
-    :ed_unassigned,
-    # 140 M-^L
-    :ed_clear_screen,
-    # 141 M-^M
-    :key_newline,
-    # 142 M-^N
-    :ed_unassigned,
-    # 143 M-^O
-    :ed_unassigned,
-    # 144 M-^P
-    :ed_unassigned,
-    # 145 M-^Q
-    :ed_unassigned,
-    # 146 M-^R
-    :ed_unassigned,
-    # 147 M-^S
-    :ed_unassigned,
-    # 148 M-^T
-    :ed_unassigned,
-    # 149 M-^U
-    :ed_unassigned,
-    # 150 M-^V
-    :ed_unassigned,
-    # 151 M-^W
-    :ed_unassigned,
-    # 152 M-^X
-    :ed_unassigned,
-    # 153 M-^Y
-    :em_yank_pop,
-    # 154 M-^Z
-    :ed_unassigned,
-    # 155 M-^[
-    :ed_unassigned,
-    # 156 M-^\
-    :ed_unassigned,
-    # 157 M-^]
-    :ed_unassigned,
-    # 158 M-^^
-    :ed_unassigned,
-    # 159 M-^_
-    :em_copy_prev_word,
-    # 160 M-SPACE
-    :ed_unassigned,
-    # 161 M-!
-    :ed_unassigned,
-    # 162 M-"
-    :ed_unassigned,
-    # 163 M-#
-    :ed_unassigned,
-    # 164 M-$
-    :ed_unassigned,
-    # 165 M-%
-    :ed_unassigned,
-    # 166 M-&
-    :ed_unassigned,
-    # 167 M-'
-    :ed_unassigned,
-    # 168 M-(
-    :ed_unassigned,
-    # 169 M-)
-    :ed_unassigned,
-    # 170 M-*
-    :ed_unassigned,
-    # 171 M-+
-    :ed_unassigned,
-    # 172 M-,
-    :ed_unassigned,
-    # 173 M--
-    :ed_unassigned,
-    # 174 M-.
-    :ed_unassigned,
-    # 175 M-/
-    :ed_unassigned,
-    # 176 M-0
-    :ed_argument_digit,
-    # 177 M-1
-    :ed_argument_digit,
-    # 178 M-2
-    :ed_argument_digit,
-    # 179 M-3
-    :ed_argument_digit,
-    # 180 M-4
-    :ed_argument_digit,
-    # 181 M-5
-    :ed_argument_digit,
-    # 182 M-6
-    :ed_argument_digit,
-    # 183 M-7
-    :ed_argument_digit,
-    # 184 M-8
-    :ed_argument_digit,
-    # 185 M-9
-    :ed_argument_digit,
-    # 186 M-:
-    :ed_unassigned,
-    # 187 M-;
-    :ed_unassigned,
-    # 188 M-<
-    :ed_unassigned,
-    # 189 M-=
-    :ed_unassigned,
-    # 190 M->
-    :ed_unassigned,
-    # 191 M-?
-    :ed_unassigned,
-    # 192 M-@
-    :ed_unassigned,
-    # 193 M-A
-    :ed_unassigned,
-    # 194 M-B
-    :ed_prev_word,
-    # 195 M-C
-    :em_capitol_case,
-    # 196 M-D
-    :em_delete_next_word,
-    # 197 M-E
-    :ed_unassigned,
-    # 198 M-F
-    :em_next_word,
-    # 199 M-G
-    :ed_unassigned,
-    # 200 M-H
-    :ed_unassigned,
-    # 201 M-I
-    :ed_unassigned,
-    # 202 M-J
-    :ed_unassigned,
-    # 203 M-K
-    :ed_unassigned,
-    # 204 M-L
-    :em_lower_case,
-    # 205 M-M
-    :ed_unassigned,
-    # 206 M-N
-    :vi_search_next,
-    # 207 M-O
-    :ed_sequence_lead_in,
-    # 208 M-P
-    :vi_search_prev,
-    # 209 M-Q
-    :ed_unassigned,
-    # 210 M-R
-    :ed_unassigned,
-    # 211 M-S
-    :ed_unassigned,
-    # 212 M-T
-    :ed_unassigned,
-    # 213 M-U
-    :em_upper_case,
-    # 214 M-V
-    :ed_unassigned,
-    # 215 M-W
-    :em_copy_region,
-    # 216 M-X
-    :ed_command,
-    # 217 M-Y
-    :ed_unassigned,
-    # 218 M-Z
-    :ed_unassigned,
-    # 219 M-[
-    :ed_sequence_lead_in,
-    # 220 M-\
-    :ed_unassigned,
-    # 221 M-]
-    :ed_unassigned,
-    # 222 M-^
-    :ed_unassigned,
-    # 223 M-_
-    :ed_unassigned,
-    # 224 M-`
-    :ed_unassigned,
-    # 225 M-a
-    :ed_unassigned,
-    # 226 M-b
-    :ed_prev_word,
-    # 227 M-c
-    :em_capitol_case,
-    # 228 M-d
-    :em_delete_next_word,
-    # 229 M-e
-    :ed_unassigned,
-    # 230 M-f
-    :em_next_word,
-    # 231 M-g
-    :ed_unassigned,
-    # 232 M-h
-    :ed_unassigned,
-    # 233 M-i
-    :ed_unassigned,
-    # 234 M-j
-    :ed_unassigned,
-    # 235 M-k
-    :ed_unassigned,
-    # 236 M-l
-    :em_lower_case,
-    # 237 M-m
-    :ed_unassigned,
-    # 238 M-n
-    :vi_search_next,
-    # 239 M-o
-    :ed_unassigned,
-    # 240 M-p
-    :vi_search_prev,
-    # 241 M-q
-    :ed_unassigned,
-    # 242 M-r
-    :ed_unassigned,
-    # 243 M-s
-    :ed_unassigned,
-    # 244 M-t
-    :ed_transpose_words,
-    # 245 M-u
-    :em_upper_case,
-    # 246 M-v
-    :ed_unassigned,
-    # 247 M-w
-    :em_copy_region,
-    # 248 M-x
-    :ed_command,
-    # 249 M-y
-    :ed_unassigned,
-    # 250 M-z
-    :ed_unassigned,
-    # 251 M-{
-    :ed_unassigned,
-    # 252 M-|
-    :ed_unassigned,
-    # 253 M-}
-    :ed_unassigned,
-    # 254 M-~
-    :ed_unassigned,
-    # 255 M-^?
-    :ed_delete_prev_word
-    # EOF
-  ]
-end
diff --git a/lib/reline/key_actor/vi_command.rb b/lib/reline/key_actor/vi_command.rb
deleted file mode 100644
index 98146d2f7794e8..00000000000000
--- a/lib/reline/key_actor/vi_command.rb
+++ /dev/null
@@ -1,518 +0,0 @@
-class Reline::KeyActor::ViCommand < Reline::KeyActor::Base
-  MAPPING = [
-    #   0 ^@
-    :ed_unassigned,
-    #   1 ^A
-    :ed_move_to_beg,
-    #   2 ^B
-    :ed_unassigned,
-    #   3 ^C
-    :ed_ignore,
-    #   4 ^D
-    :vi_end_of_transmission,
-    #   5 ^E
-    :ed_move_to_end,
-    #   6 ^F
-    :ed_unassigned,
-    #   7 ^G
-    :ed_unassigned,
-    #   8 ^H
-    :ed_unassigned,
-    #   9 ^I
-    :ed_unassigned,
-    #  10 ^J
-    :ed_newline,
-    #  11 ^K
-    :ed_kill_line,
-    #  12 ^L
-    :ed_clear_screen,
-    #  13 ^M
-    :ed_newline,
-    #  14 ^N
-    :ed_next_history,
-    #  15 ^O
-    :ed_ignore,
-    #  16 ^P
-    :ed_prev_history,
-    #  17 ^Q
-    :ed_ignore,
-    #  18 ^R
-    :vi_search_prev,
-    #  19 ^S
-    :ed_ignore,
-    #  20 ^T
-    :ed_unassigned,
-    #  21 ^U
-    :vi_kill_line_prev,
-    #  22 ^V
-    :ed_quoted_insert,
-    #  23 ^W
-    :ed_delete_prev_word,
-    #  24 ^X
-    :ed_unassigned,
-    #  25 ^Y
-    :ed_unassigned,
-    #  26 ^Z
-    :ed_unassigned,
-    #  27 ^[
-    :ed_unassigned,
-    #  28 ^\
-    :ed_ignore,
-    #  29 ^]
-    :ed_unassigned,
-    #  30 ^^
-    :ed_unassigned,
-    #  31 ^_
-    :ed_unassigned,
-    #  32 SPACE
-    :ed_next_char,
-    #  33 !
-    :ed_unassigned,
-    #  34 "
-    :ed_unassigned,
-    #  35 #
-    :vi_comment_out,
-    #  36 $
-    :ed_move_to_end,
-    #  37 %
-    :vi_match,
-    #  38 &
-    :ed_unassigned,
-    #  39 '
-    :ed_unassigned,
-    #  40 (
-    :ed_unassigned,
-    #  41 )
-    :ed_unassigned,
-    #  42 *
-    :ed_unassigned,
-    #  43 +
-    :ed_next_history,
-    #  44 ,
-    :vi_repeat_prev_char,
-    #  45 -
-    :ed_prev_history,
-    #  46 .
-    :vi_redo,
-    #  47 /
-    :vi_search_prev,
-    #  48 0
-    :vi_zero,
-    #  49 1
-    :ed_argument_digit,
-    #  50 2
-    :ed_argument_digit,
-    #  51 3
-    :ed_argument_digit,
-    #  52 4
-    :ed_argument_digit,
-    #  53 5
-    :ed_argument_digit,
-    #  54 6
-    :ed_argument_digit,
-    #  55 7
-    :ed_argument_digit,
-    #  56 8
-    :ed_argument_digit,
-    #  57 9
-    :ed_argument_digit,
-    #  58 :
-    :ed_command,
-    #  59 ;
-    :vi_repeat_next_char,
-    #  60 <
-    :ed_unassigned,
-    #  61 =
-    :ed_unassigned,
-    #  62 >
-    :ed_unassigned,
-    #  63 ?
-    :vi_search_next,
-    #  64 @
-    :vi_alias,
-    #  65 A
-    :vi_add_at_eol,
-    #  66 B
-    :vi_prev_big_word,
-    #  67 C
-    :vi_change_to_eol,
-    #  68 D
-    :ed_kill_line,
-    #  69 E
-    :vi_end_big_word,
-    #  70 F
-    :vi_prev_char,
-    #  71 G
-    :vi_to_history_line,
-    #  72 H
-    :ed_unassigned,
-    #  73 I
-    :vi_insert_at_bol,
-    #  74 J
-    :vi_join_lines,
-    #  75 K
-    :vi_search_prev,
-    #  76 L
-    :ed_unassigned,
-    #  77 M
-    :ed_unassigned,
-    #  78 N
-    :vi_repeat_search_prev,
-    #  79 O
-    :ed_sequence_lead_in,
-    #  80 P
-    :vi_paste_prev,
-    #  81 Q
-    :ed_unassigned,
-    #  82 R
-    :vi_replace_mode,
-    #  83 S
-    :vi_substitute_line,
-    #  84 T
-    :vi_to_prev_char,
-    #  85 U
-    :vi_undo_line,
-    #  86 V
-    :ed_unassigned,
-    #  87 W
-    :vi_next_big_word,
-    #  88 X
-    :ed_delete_prev_char,
-    #  89 Y
-    :vi_yank_end,
-    #  90 Z
-    :ed_unassigned,
-    #  91 [
-    :ed_sequence_lead_in,
-    #  92 \
-    :ed_unassigned,
-    #  93 ]
-    :ed_unassigned,
-    #  94 ^
-    :vi_first_print,
-    #  95 _
-    :vi_history_word,
-    #  96 `
-    :ed_unassigned,
-    #  97 a
-    :vi_add,
-    #  98 b
-    :vi_prev_word,
-    #  99 c
-    :vi_change_meta,
-    # 100 d
-    :vi_delete_meta,
-    # 101 e
-    :vi_end_word,
-    # 102 f
-    :vi_next_char,
-    # 103 g
-    :ed_unassigned,
-    # 104 h
-    :ed_prev_char,
-    # 105 i
-    :vi_insert,
-    # 106 j
-    :ed_next_history,
-    # 107 k
-    :ed_prev_history,
-    # 108 l
-    :ed_next_char,
-    # 109 m
-    :ed_unassigned,
-    # 110 n
-    :vi_repeat_search_next,
-    # 111 o
-    :ed_unassigned,
-    # 112 p
-    :vi_paste_next,
-    # 113 q
-    :ed_unassigned,
-    # 114 r
-    :vi_replace_char,
-    # 115 s
-    :vi_substitute_char,
-    # 116 t
-    :vi_to_next_char,
-    # 117 u
-    :vi_undo,
-    # 118 v
-    :vi_histedit,
-    # 119 w
-    :vi_next_word,
-    # 120 x
-    :ed_delete_next_char,
-    # 121 y
-    :vi_yank,
-    # 122 z
-    :ed_unassigned,
-    # 123 {
-    :ed_unassigned,
-    # 124 |
-    :vi_to_column,
-    # 125 }
-    :ed_unassigned,
-    # 126 ~
-    :vi_change_case,
-    # 127 ^?
-    :ed_unassigned,
-    # 128 M-^@
-    :ed_unassigned,
-    # 129 M-^A
-    :ed_unassigned,
-    # 130 M-^B
-    :ed_unassigned,
-    # 131 M-^C
-    :ed_unassigned,
-    # 132 M-^D
-    :ed_unassigned,
-    # 133 M-^E
-    :ed_unassigned,
-    # 134 M-^F
-    :ed_unassigned,
-    # 135 M-^G
-    :ed_unassigned,
-    # 136 M-^H
-    :ed_unassigned,
-    # 137 M-^I
-    :ed_unassigned,
-    # 138 M-^J
-    :ed_unassigned,
-    # 139 M-^K
-    :ed_unassigned,
-    # 140 M-^L
-    :ed_unassigned,
-    # 141 M-^M
-    :ed_unassigned,
-    # 142 M-^N
-    :ed_unassigned,
-    # 143 M-^O
-    :ed_unassigned,
-    # 144 M-^P
-    :ed_unassigned,
-    # 145 M-^Q
-    :ed_unassigned,
-    # 146 M-^R
-    :ed_unassigned,
-    # 147 M-^S
-    :ed_unassigned,
-    # 148 M-^T
-    :ed_unassigned,
-    # 149 M-^U
-    :ed_unassigned,
-    # 150 M-^V
-    :ed_unassigned,
-    # 151 M-^W
-    :ed_unassigned,
-    # 152 M-^X
-    :ed_unassigned,
-    # 153 M-^Y
-    :ed_unassigned,
-    # 154 M-^Z
-    :ed_unassigned,
-    # 155 M-^[
-    :ed_unassigned,
-    # 156 M-^\
-    :ed_unassigned,
-    # 157 M-^]
-    :ed_unassigned,
-    # 158 M-^^
-    :ed_unassigned,
-    # 159 M-^_
-    :ed_unassigned,
-    # 160 M-SPACE
-    :ed_unassigned,
-    # 161 M-!
-    :ed_unassigned,
-    # 162 M-"
-    :ed_unassigned,
-    # 163 M-#
-    :ed_unassigned,
-    # 164 M-$
-    :ed_unassigned,
-    # 165 M-%
-    :ed_unassigned,
-    # 166 M-&
-    :ed_unassigned,
-    # 167 M-'
-    :ed_unassigned,
-    # 168 M-(
-    :ed_unassigned,
-    # 169 M-)
-    :ed_unassigned,
-    # 170 M-*
-    :ed_unassigned,
-    # 171 M-+
-    :ed_unassigned,
-    # 172 M-,
-    :ed_unassigned,
-    # 173 M--
-    :ed_unassigned,
-    # 174 M-.
-    :ed_unassigned,
-    # 175 M-/
-    :ed_unassigned,
-    # 176 M-0
-    :ed_unassigned,
-    # 177 M-1
-    :ed_unassigned,
-    # 178 M-2
-    :ed_unassigned,
-    # 179 M-3
-    :ed_unassigned,
-    # 180 M-4
-    :ed_unassigned,
-    # 181 M-5
-    :ed_unassigned,
-    # 182 M-6
-    :ed_unassigned,
-    # 183 M-7
-    :ed_unassigned,
-    # 184 M-8
-    :ed_unassigned,
-    # 185 M-9
-    :ed_unassigned,
-    # 186 M-:
-    :ed_unassigned,
-    # 187 M-;
-    :ed_unassigned,
-    # 188 M-<
-    :ed_unassigned,
-    # 189 M-=
-    :ed_unassigned,
-    # 190 M->
-    :ed_unassigned,
-    # 191 M-?
-    :ed_unassigned,
-    # 192 M-@
-    :ed_unassigned,
-    # 193 M-A
-    :ed_unassigned,
-    # 194 M-B
-    :ed_unassigned,
-    # 195 M-C
-    :ed_unassigned,
-    # 196 M-D
-    :ed_unassigned,
-    # 197 M-E
-    :ed_unassigned,
-    # 198 M-F
-    :ed_unassigned,
-    # 199 M-G
-    :ed_unassigned,
-    # 200 M-H
-    :ed_unassigned,
-    # 201 M-I
-    :ed_unassigned,
-    # 202 M-J
-    :ed_unassigned,
-    # 203 M-K
-    :ed_unassigned,
-    # 204 M-L
-    :ed_unassigned,
-    # 205 M-M
-    :ed_unassigned,
-    # 206 M-N
-    :ed_unassigned,
-    # 207 M-O
-    :ed_sequence_lead_in,
-    # 208 M-P
-    :ed_unassigned,
-    # 209 M-Q
-    :ed_unassigned,
-    # 210 M-R
-    :ed_unassigned,
-    # 211 M-S
-    :ed_unassigned,
-    # 212 M-T
-    :ed_unassigned,
-    # 213 M-U
-    :ed_unassigned,
-    # 214 M-V
-    :ed_unassigned,
-    # 215 M-W
-    :ed_unassigned,
-    # 216 M-X
-    :ed_unassigned,
-    # 217 M-Y
-    :ed_unassigned,
-    # 218 M-Z
-    :ed_unassigned,
-    # 219 M-[
-    :ed_sequence_lead_in,
-    # 220 M-\
-    :ed_unassigned,
-    # 221 M-]
-    :ed_unassigned,
-    # 222 M-^
-    :ed_unassigned,
-    # 223 M-_
-    :ed_unassigned,
-    # 224 M-`
-    :ed_unassigned,
-    # 225 M-a
-    :ed_unassigned,
-    # 226 M-b
-    :ed_unassigned,
-    # 227 M-c
-    :ed_unassigned,
-    # 228 M-d
-    :ed_unassigned,
-    # 229 M-e
-    :ed_unassigned,
-    # 230 M-f
-    :ed_unassigned,
-    # 231 M-g
-    :ed_unassigned,
-    # 232 M-h
-    :ed_unassigned,
-    # 233 M-i
-    :ed_unassigned,
-    # 234 M-j
-    :ed_unassigned,
-    # 235 M-k
-    :ed_unassigned,
-    # 236 M-l
-    :ed_unassigned,
-    # 237 M-m
-    :ed_unassigned,
-    # 238 M-n
-    :ed_unassigned,
-    # 239 M-o
-    :ed_unassigned,
-    # 240 M-p
-    :ed_unassigned,
-    # 241 M-q
-    :ed_unassigned,
-    # 242 M-r
-    :ed_unassigned,
-    # 243 M-s
-    :ed_unassigned,
-    # 244 M-t
-    :ed_unassigned,
-    # 245 M-u
-    :ed_unassigned,
-    # 246 M-v
-    :ed_unassigned,
-    # 247 M-w
-    :ed_unassigned,
-    # 248 M-x
-    :ed_unassigned,
-    # 249 M-y
-    :ed_unassigned,
-    # 250 M-z
-    :ed_unassigned,
-    # 251 M-{
-    :ed_unassigned,
-    # 252 M-|
-    :ed_unassigned,
-    # 253 M-}
-    :ed_unassigned,
-    # 254 M-~
-    :ed_unassigned,
-    # 255 M-^?
-    :ed_unassigned
-    # EOF
-  ]
-end
-
diff --git a/lib/reline/key_actor/vi_insert.rb b/lib/reline/key_actor/vi_insert.rb
deleted file mode 100644
index b8e89f81d8075d..00000000000000
--- a/lib/reline/key_actor/vi_insert.rb
+++ /dev/null
@@ -1,517 +0,0 @@
-class Reline::KeyActor::ViInsert < Reline::KeyActor::Base
-  MAPPING = [
-    #   0 ^@
-    :ed_unassigned,
-    #   1 ^A
-    :ed_insert,
-    #   2 ^B
-    :ed_insert,
-    #   3 ^C
-    :ed_insert,
-    #   4 ^D
-    :vi_list_or_eof,
-    #   5 ^E
-    :ed_insert,
-    #   6 ^F
-    :ed_insert,
-    #   7 ^G
-    :ed_insert,
-    #   8 ^H
-    :vi_delete_prev_char,
-    #   9 ^I
-    :ed_insert,
-    #  10 ^J
-    :ed_newline,
-    #  11 ^K
-    :ed_insert,
-    #  12 ^L
-    :ed_insert,
-    #  13 ^M
-    :ed_newline,
-    #  14 ^N
-    :ed_insert,
-    #  15 ^O
-    :ed_insert,
-    #  16 ^P
-    :ed_insert,
-    #  17 ^Q
-    :ed_ignore,
-    #  18 ^R
-    :vi_search_prev,
-    #  19 ^S
-    :vi_search_next,
-    #  20 ^T
-    :ed_insert,
-    #  21 ^U
-    :vi_kill_line_prev,
-    #  22 ^V
-    :ed_quoted_insert,
-    #  23 ^W
-    :ed_delete_prev_word,
-    #  24 ^X
-    :ed_insert,
-    #  25 ^Y
-    :ed_insert,
-    #  26 ^Z
-    :ed_insert,
-    #  27 ^[
-    :vi_command_mode,
-    #  28 ^\
-    :ed_ignore,
-    #  29 ^]
-    :ed_insert,
-    #  30 ^^
-    :ed_insert,
-    #  31 ^_
-    :ed_insert,
-    #  32 SPACE
-    :ed_insert,
-    #  33 !
-    :ed_insert,
-    #  34 "
-    :ed_insert,
-    #  35 #
-    :ed_insert,
-    #  36 $
-    :ed_insert,
-    #  37 %
-    :ed_insert,
-    #  38 &
-    :ed_insert,
-    #  39 '
-    :ed_insert,
-    #  40 (
-    :ed_insert,
-    #  41 )
-    :ed_insert,
-    #  42 *
-    :ed_insert,
-    #  43 +
-    :ed_insert,
-    #  44 ,
-    :ed_insert,
-    #  45 -
-    :ed_insert,
-    #  46 .
-    :ed_insert,
-    #  47 /
-    :ed_insert,
-    #  48 0
-    :ed_insert,
-    #  49 1
-    :ed_insert,
-    #  50 2
-    :ed_insert,
-    #  51 3
-    :ed_insert,
-    #  52 4
-    :ed_insert,
-    #  53 5
-    :ed_insert,
-    #  54 6
-    :ed_insert,
-    #  55 7
-    :ed_insert,
-    #  56 8
-    :ed_insert,
-    #  57 9
-    :ed_insert,
-    #  58 :
-    :ed_insert,
-    #  59 ;
-    :ed_insert,
-    #  60 <
-    :ed_insert,
-    #  61 =
-    :ed_insert,
-    #  62 >
-    :ed_insert,
-    #  63 ?
-    :ed_insert,
-    #  64 @
-    :ed_insert,
-    #  65 A
-    :ed_insert,
-    #  66 B
-    :ed_insert,
-    #  67 C
-    :ed_insert,
-    #  68 D
-    :ed_insert,
-    #  69 E
-    :ed_insert,
-    #  70 F
-    :ed_insert,
-    #  71 G
-    :ed_insert,
-    #  72 H
-    :ed_insert,
-    #  73 I
-    :ed_insert,
-    #  74 J
-    :ed_insert,
-    #  75 K
-    :ed_insert,
-    #  76 L
-    :ed_insert,
-    #  77 M
-    :ed_insert,
-    #  78 N
-    :ed_insert,
-    #  79 O
-    :ed_insert,
-    #  80 P
-    :ed_insert,
-    #  81 Q
-    :ed_insert,
-    #  82 R
-    :ed_insert,
-    #  83 S
-    :ed_insert,
-    #  84 T
-    :ed_insert,
-    #  85 U
-    :ed_insert,
-    #  86 V
-    :ed_insert,
-    #  87 W
-    :ed_insert,
-    #  88 X
-    :ed_insert,
-    #  89 Y
-    :ed_insert,
-    #  90 Z
-    :ed_insert,
-    #  91 [
-    :ed_insert,
-    #  92 \
-    :ed_insert,
-    #  93 ]
-    :ed_insert,
-    #  94 ^
-    :ed_insert,
-    #  95 _
-    :ed_insert,
-    #  96 `
-    :ed_insert,
-    #  97 a
-    :ed_insert,
-    #  98 b
-    :ed_insert,
-    #  99 c
-    :ed_insert,
-    # 100 d
-    :ed_insert,
-    # 101 e
-    :ed_insert,
-    # 102 f
-    :ed_insert,
-    # 103 g
-    :ed_insert,
-    # 104 h
-    :ed_insert,
-    # 105 i
-    :ed_insert,
-    # 106 j
-    :ed_insert,
-    # 107 k
-    :ed_insert,
-    # 108 l
-    :ed_insert,
-    # 109 m
-    :ed_insert,
-    # 110 n
-    :ed_insert,
-    # 111 o
-    :ed_insert,
-    # 112 p
-    :ed_insert,
-    # 113 q
-    :ed_insert,
-    # 114 r
-    :ed_insert,
-    # 115 s
-    :ed_insert,
-    # 116 t
-    :ed_insert,
-    # 117 u
-    :ed_insert,
-    # 118 v
-    :ed_insert,
-    # 119 w
-    :ed_insert,
-    # 120 x
-    :ed_insert,
-    # 121 y
-    :ed_insert,
-    # 122 z
-    :ed_insert,
-    # 123 {
-    :ed_insert,
-    # 124 |
-    :ed_insert,
-    # 125 }
-    :ed_insert,
-    # 126 ~
-    :ed_insert,
-    # 127 ^?
-    :vi_delete_prev_char,
-    # 128 M-^@
-    :ed_unassigned,
-    # 129 M-^A
-    :ed_unassigned,
-    # 130 M-^B
-    :ed_unassigned,
-    # 131 M-^C
-    :ed_unassigned,
-    # 132 M-^D
-    :ed_unassigned,
-    # 133 M-^E
-    :ed_unassigned,
-    # 134 M-^F
-    :ed_unassigned,
-    # 135 M-^G
-    :ed_unassigned,
-    # 136 M-^H
-    :ed_unassigned,
-    # 137 M-^I
-    :ed_unassigned,
-    # 138 M-^J
-    :key_newline,
-    # 139 M-^K
-    :ed_unassigned,
-    # 140 M-^L
-    :ed_unassigned,
-    # 141 M-^M
-    :key_newline,
-    # 142 M-^N
-    :ed_unassigned,
-    # 143 M-^O
-    :ed_unassigned,
-    # 144 M-^P
-    :ed_unassigned,
-    # 145 M-^Q
-    :ed_unassigned,
-    # 146 M-^R
-    :ed_unassigned,
-    # 147 M-^S
-    :ed_unassigned,
-    # 148 M-^T
-    :ed_unassigned,
-    # 149 M-^U
-    :ed_unassigned,
-    # 150 M-^V
-    :ed_unassigned,
-    # 151 M-^W
-    :ed_unassigned,
-    # 152 M-^X
-    :ed_unassigned,
-    # 153 M-^Y
-    :ed_unassigned,
-    # 154 M-^Z
-    :ed_unassigned,
-    # 155 M-^[
-    :ed_unassigned,
-    # 156 M-^\
-    :ed_unassigned,
-    # 157 M-^]
-    :ed_unassigned,
-    # 158 M-^^
-    :ed_unassigned,
-    # 159 M-^_
-    :ed_unassigned,
-    # 160 M-SPACE
-    :ed_unassigned,
-    # 161 M-!
-    :ed_unassigned,
-    # 162 M-"
-    :ed_unassigned,
-    # 163 M-#
-    :ed_unassigned,
-    # 164 M-$
-    :ed_unassigned,
-    # 165 M-%
-    :ed_unassigned,
-    # 166 M-&
-    :ed_unassigned,
-    # 167 M-'
-    :ed_unassigned,
-    # 168 M-(
-    :ed_unassigned,
-    # 169 M-)
-    :ed_unassigned,
-    # 170 M-*
-    :ed_unassigned,
-    # 171 M-+
-    :ed_unassigned,
-    # 172 M-,
-    :ed_unassigned,
-    # 173 M--
-    :ed_unassigned,
-    # 174 M-.
-    :ed_unassigned,
-    # 175 M-/
-    :ed_unassigned,
-    # 176 M-0
-    :ed_unassigned,
-    # 177 M-1
-    :ed_unassigned,
-    # 178 M-2
-    :ed_unassigned,
-    # 179 M-3
-    :ed_unassigned,
-    # 180 M-4
-    :ed_unassigned,
-    # 181 M-5
-    :ed_unassigned,
-    # 182 M-6
-    :ed_unassigned,
-    # 183 M-7
-    :ed_unassigned,
-    # 184 M-8
-    :ed_unassigned,
-    # 185 M-9
-    :ed_unassigned,
-    # 186 M-:
-    :ed_unassigned,
-    # 187 M-;
-    :ed_unassigned,
-    # 188 M-<
-    :ed_unassigned,
-    # 189 M-=
-    :ed_unassigned,
-    # 190 M->
-    :ed_unassigned,
-    # 191 M-?
-    :ed_unassigned,
-    # 192 M-@
-    :ed_unassigned,
-    # 193 M-A
-    :ed_unassigned,
-    # 194 M-B
-    :ed_unassigned,
-    # 195 M-C
-    :ed_unassigned,
-    # 196 M-D
-    :ed_unassigned,
-    # 197 M-E
-    :ed_unassigned,
-    # 198 M-F
-    :ed_unassigned,
-    # 199 M-G
-    :ed_unassigned,
-    # 200 M-H
-    :ed_unassigned,
-    # 201 M-I
-    :ed_unassigned,
-    # 202 M-J
-    :ed_unassigned,
-    # 203 M-K
-    :ed_unassigned,
-    # 204 M-L
-    :ed_unassigned,
-    # 205 M-M
-    :ed_unassigned,
-    # 206 M-N
-    :ed_unassigned,
-    # 207 M-O
-    :ed_unassigned,
-    # 208 M-P
-    :ed_unassigned,
-    # 209 M-Q
-    :ed_unassigned,
-    # 210 M-R
-    :ed_unassigned,
-    # 211 M-S
-    :ed_unassigned,
-    # 212 M-T
-    :ed_unassigned,
-    # 213 M-U
-    :ed_unassigned,
-    # 214 M-V
-    :ed_unassigned,
-    # 215 M-W
-    :ed_unassigned,
-    # 216 M-X
-    :ed_unassigned,
-    # 217 M-Y
-    :ed_unassigned,
-    # 218 M-Z
-    :ed_unassigned,
-    # 219 M-[
-    :ed_unassigned,
-    # 220 M-\
-    :ed_unassigned,
-    # 221 M-]
-    :ed_unassigned,
-    # 222 M-^
-    :ed_unassigned,
-    # 223 M-_
-    :ed_unassigned,
-    # 224 M-`
-    :ed_unassigned,
-    # 225 M-a
-    :ed_unassigned,
-    # 226 M-b
-    :ed_unassigned,
-    # 227 M-c
-    :ed_unassigned,
-    # 228 M-d
-    :ed_unassigned,
-    # 229 M-e
-    :ed_unassigned,
-    # 230 M-f
-    :ed_unassigned,
-    # 231 M-g
-    :ed_unassigned,
-    # 232 M-h
-    :ed_unassigned,
-    # 233 M-i
-    :ed_unassigned,
-    # 234 M-j
-    :ed_unassigned,
-    # 235 M-k
-    :ed_unassigned,
-    # 236 M-l
-    :ed_unassigned,
-    # 237 M-m
-    :ed_unassigned,
-    # 238 M-n
-    :ed_unassigned,
-    # 239 M-o
-    :ed_unassigned,
-    # 240 M-p
-    :ed_unassigned,
-    # 241 M-q
-    :ed_unassigned,
-    # 242 M-r
-    :ed_unassigned,
-    # 243 M-s
-    :ed_unassigned,
-    # 244 M-t
-    :ed_unassigned,
-    # 245 M-u
-    :ed_unassigned,
-    # 246 M-v
-    :ed_unassigned,
-    # 247 M-w
-    :ed_unassigned,
-    # 248 M-x
-    :ed_unassigned,
-    # 249 M-y
-    :ed_unassigned,
-    # 250 M-z
-    :ed_unassigned,
-    # 251 M-{
-    :ed_unassigned,
-    # 252 M-|
-    :ed_unassigned,
-    # 253 M-}
-    :ed_unassigned,
-    # 254 M-~
-    :ed_unassigned,
-    # 255 M-^?
-    :ed_unassigned
-    # EOF
-  ]
-end
diff --git a/lib/reline/key_stroke.rb b/lib/reline/key_stroke.rb
deleted file mode 100644
index bceffbb53f4d2a..00000000000000
--- a/lib/reline/key_stroke.rb
+++ /dev/null
@@ -1,148 +0,0 @@
-class Reline::KeyStroke
-  ESC_BYTE = 27
-  CSI_PARAMETER_BYTES_RANGE = 0x30..0x3f
-  CSI_INTERMEDIATE_BYTES_RANGE = (0x20..0x2f)
-
-  def initialize(config)
-    @config = config
-  end
-
-  def compress_meta_key(ary)
-    return ary unless @config.convert_meta
-    ary.inject([]) { |result, key|
-      if result.size > 0 and result.last == "\e".ord
-        result[result.size - 1] = Reline::Key.new(key, key | 0b10000000, true)
-      else
-        result << key
-      end
-      result
-    }
-  end
-
-  def start_with?(me, other)
-    compressed_me = compress_meta_key(me)
-    compressed_other = compress_meta_key(other)
-    i = 0
-    loop do
-      my_c = compressed_me[i]
-      other_c = compressed_other[i]
-      other_is_last = (i + 1) == compressed_other.size
-      me_is_last = (i + 1) == compressed_me.size
-      if my_c != other_c
-        if other_c == "\e".ord and other_is_last and my_c.is_a?(Reline::Key) and my_c.with_meta
-          return true
-        else
-          return false
-        end
-      elsif other_is_last
-        return true
-      elsif me_is_last
-        return false
-      end
-      i += 1
-    end
-  end
-
-  def equal?(me, other)
-    case me
-    when Array
-      compressed_me = compress_meta_key(me)
-      compressed_other = compress_meta_key(other)
-      compressed_me.size == compressed_other.size and [compressed_me, compressed_other].transpose.all?{ |i| equal?(i[0], i[1]) }
-    when Integer
-      if other.is_a?(Reline::Key)
-        if other.combined_char == "\e".ord
-          false
-        else
-          other.combined_char == me
-        end
-      else
-        me == other
-      end
-    when Reline::Key
-      if other.is_a?(Integer)
-        me.combined_char == other
-      else
-        me == other
-      end
-    end
-  end
-
-  def match_status(input)
-    key_mapping.keys.select { |lhs|
-      start_with?(lhs, input)
-    }.tap { |it|
-      return :matched  if it.size == 1 && equal?(it[0], input)
-      return :matching if it.size == 1 && !equal?(it[0], input)
-      return :matched  if it.max_by(&:size)&.size&.< input.size
-      return :matching if it.size > 1
-    }
-    if key_mapping.keys.any? { |lhs| start_with?(input, lhs) }
-      :matched
-    else
-      match_unknown_escape_sequence(input).first
-    end
-  end
-
-  def expand(input)
-    lhs = key_mapping.keys.select { |item| start_with?(input, item) }.sort_by(&:size).last
-    unless lhs
-      status, size = match_unknown_escape_sequence(input)
-      case status
-      when :matched
-        return [:ed_unassigned] + expand(input.drop(size))
-      when :matching
-        return [:ed_unassigned]
-      else
-        return input
-      end
-    end
-    rhs = key_mapping[lhs]
-
-    case rhs
-    when String
-      rhs_bytes = rhs.bytes
-      expand(expand(rhs_bytes) + expand(input.drop(lhs.size)))
-    when Symbol
-      [rhs] + expand(input.drop(lhs.size))
-    when Array
-      rhs
-    end
-  end
-
-  private
-
-  # returns match status of CSI/SS3 sequence and matched length
-  def match_unknown_escape_sequence(input)
-    idx = 0
-    return [:unmatched, nil] unless input[idx] == ESC_BYTE
-    idx += 1
-    idx += 1 if input[idx] == ESC_BYTE
-
-    case input[idx]
-    when nil
-      return [:matching, nil]
-    when 91 # == '['.ord
-      # CSI sequence
-      idx += 1
-      idx += 1 while idx < input.size && CSI_PARAMETER_BYTES_RANGE.cover?(input[idx])
-      idx += 1 while idx < input.size && CSI_INTERMEDIATE_BYTES_RANGE.cover?(input[idx])
-      input[idx] ? [:matched, idx + 1] : [:matching, nil]
-    when 79 # == 'O'.ord
-      # SS3 sequence
-      input[idx + 1] ? [:matched, idx + 2] : [:matching, nil]
-    else
-      if idx == 1
-        # `ESC char`, make it :unmatched so that it will be handled correctly in `read_2nd_character_of_key_sequence`
-        [:unmatched, nil]
-      else
-        # `ESC ESC char`
-        [:matched, idx + 1]
-      end
-    end
-  end
-
-  def key_mapping
-    @config.key_bindings
-  end
-end
diff --git a/lib/reline/kill_ring.rb b/lib/reline/kill_ring.rb
deleted file mode 100644
index bb3684b42bfc40..00000000000000
--- a/lib/reline/kill_ring.rb
+++ /dev/null
@@ -1,125 +0,0 @@
-class Reline::KillRing
-  include Enumerable
-
-  module State
-    FRESH = :fresh
-    CONTINUED = :continued
-    PROCESSED = :processed
-    YANK = :yank
-  end
-
-  RingPoint = Struct.new(:backward, :forward, :str) do
-    def initialize(str)
-      super(nil, nil, str)
-    end
-
-    def ==(other)
-      object_id == other.object_id
-    end
-  end
-
-  class RingBuffer
-    attr_reader :size
-    attr_reader :head
-
-    def initialize(max = 1024)
-      @max = max
-      @size = 0
-      @head = nil # reading head of ring-shaped tape
-    end
-
-    def <<(point)
-      if @size.zero?
-        @head = point
-        @head.backward = @head
-        @head.forward = @head
-        @size = 1
-      elsif @size >= @max
-        tail = @head.forward
-        new_tail = tail.forward
-        @head.forward = point
-        point.backward = @head
-        new_tail.backward = point
-        point.forward = new_tail
-        @head = point
-      else
-        tail = @head.forward
-        @head.forward = point
-        point.backward = @head
-        tail.backward = point
-        point.forward = tail
-        @head = point
-        @size += 1
-      end
-    end
-
-    def empty?
-      @size.zero?
-    end
-  end
-
-  def initialize(max = 1024)
-    @ring = RingBuffer.new(max)
-    @ring_pointer = nil
-    @buffer = nil
-    @state = State::FRESH
-  end
-
-  def append(string, before_p = false)
-    case @state
-    when State::FRESH, State::YANK
-      @ring << RingPoint.new(string)
-      @state = State::CONTINUED
-    when State::CONTINUED, State::PROCESSED
-      if before_p
-        @ring.head.str.prepend(string)
-      else
-        @ring.head.str.concat(string)
-      end
-      @state = State::CONTINUED
-    end
-  end
-
-  def process
-    case @state
-    when State::FRESH
-      # nothing to do
-    when State::CONTINUED
-      @state = State::PROCESSED
-    when State::PROCESSED
-      @state = State::FRESH
-    when State::YANK
-      # nothing to do
-    end
-  end
-
-  def yank
-    unless @ring.empty?
-      @state = State::YANK
-      @ring_pointer = @ring.head
-      @ring_pointer.str
-    else
-      nil
-    end
-  end
-
-  def yank_pop
-    if @state == State::YANK
-      prev_yank = @ring_pointer.str
-      @ring_pointer = @ring_pointer.backward
-      [@ring_pointer.str, prev_yank]
-    else
-      nil
-    end
-  end
-
-  def each
-    start = head = @ring.head
-    loop do
-      break if head.nil?
-      yield head.str
-      head = head.backward
-      break if head == start
-    end
-  end
-end
diff --git a/lib/reline/line_editor.rb b/lib/reline/line_editor.rb
deleted file mode 100644
index 0d990c2c0adce5..00000000000000
--- a/lib/reline/line_editor.rb
+++ /dev/null
@@ -1,3300 +0,0 @@
-require 'reline/kill_ring'
-require 'reline/unicode'
-
-require 'tempfile'
-
-class Reline::LineEditor
-  # TODO: undo
-  # TODO: Use "private alias_method" idiom after drop Ruby 2.5.
-  attr_reader :line
-  attr_reader :byte_pointer
-  attr_accessor :confirm_multiline_termination_proc
-  attr_accessor :completion_proc
-  attr_accessor :completion_append_character
-  attr_accessor :output_modifier_proc
-  attr_accessor :prompt_proc
-  attr_accessor :auto_indent_proc
-  attr_accessor :pre_input_hook
-  attr_accessor :dig_perfect_match_proc
-  attr_writer :output
-
-  VI_MOTIONS = %i{
-    ed_prev_char
-    ed_next_char
-    vi_zero
-    ed_move_to_beg
-    ed_move_to_end
-    vi_to_column
-    vi_next_char
-    vi_prev_char
-    vi_next_word
-    vi_prev_word
-    vi_to_next_char
-    vi_to_prev_char
-    vi_end_word
-    vi_next_big_word
-    vi_prev_big_word
-    vi_end_big_word
-    vi_repeat_next_char
-    vi_repeat_prev_char
-  }
-
-  module CompletionState
-    NORMAL = :normal
-    COMPLETION = :completion
-    MENU = :menu
-    JOURNEY = :journey
-    MENU_WITH_PERFECT_MATCH = :menu_with_perfect_match
-    PERFECT_MATCH = :perfect_match
-  end
-
-  CompletionJourneyData = Struct.new(:preposing, :postposing, :list, :pointer)
-  MenuInfo = Struct.new(:target, :list)
-
-  PROMPT_LIST_CACHE_TIMEOUT = 0.5
-  MINIMUM_SCROLLBAR_HEIGHT = 1
-
-  def initialize(config, encoding)
-    @config = config
-    @completion_append_character = ''
-    reset_variables(encoding: encoding)
-  end
-
-  def io_gate
-    Reline::IOGate
-  end
-
-  def set_pasting_state(in_pasting)
-    @in_pasting = in_pasting
-  end
-
-  def simplified_rendering?
-    if finished?
-      false
-    elsif @just_cursor_moving and not @rerender_all
-      true
-    else
-      not @rerender_all and not finished? and @in_pasting
-    end
-  end
-
-  private def check_mode_string
-    mode_string = nil
-    if @config.show_mode_in_prompt
-      if @config.editing_mode_is?(:vi_command)
-        mode_string = @config.vi_cmd_mode_string
-      elsif @config.editing_mode_is?(:vi_insert)
-        mode_string = @config.vi_ins_mode_string
-      elsif @config.editing_mode_is?(:emacs)
-        mode_string = @config.emacs_mode_string
-      else
-        mode_string = '?'
-      end
-    end
-    if mode_string != @prev_mode_string
-      @rerender_all = true
-    end
-    @prev_mode_string = mode_string
-    mode_string
-  end
-
-  private def check_multiline_prompt(buffer, force_recalc: false)
-    if @vi_arg
-      prompt = "(arg: #{@vi_arg}) "
-      @rerender_all = true
-    elsif @searching_prompt
-      prompt = @searching_prompt
-      @rerender_all = true
-    else
-      prompt = @prompt
-    end
-    if simplified_rendering? && !force_recalc
-      mode_string = check_mode_string
-      prompt = mode_string + prompt if mode_string
-      return [prompt, calculate_width(prompt, true), [prompt] * buffer.size]
-    end
-    if @prompt_proc
-      use_cached_prompt_list = false
-      if @cached_prompt_list
-        if @just_cursor_moving
-          use_cached_prompt_list = true
-        elsif Time.now.to_f < (@prompt_cache_time + PROMPT_LIST_CACHE_TIMEOUT) and buffer.size == @cached_prompt_list.size
-          use_cached_prompt_list = true
-        end
-      end
-      use_cached_prompt_list = false if @rerender_all
-      if use_cached_prompt_list
-        prompt_list = @cached_prompt_list
-      else
-        prompt_list = @cached_prompt_list = @prompt_proc.(buffer).map { |pr| pr.gsub("\n", "\\n") }
-        @prompt_cache_time = Time.now.to_f
-      end
-      prompt_list.map!{ prompt } if @vi_arg or @searching_prompt
-      prompt_list = [prompt] if prompt_list.empty?
-      mode_string = check_mode_string
-      prompt_list = prompt_list.map{ |pr| mode_string + pr } if mode_string
-      prompt = prompt_list[@line_index]
-      prompt = prompt_list[0] if prompt.nil?
-      prompt = prompt_list.last if prompt.nil?
-      if buffer.size > prompt_list.size
-        (buffer.size - prompt_list.size).times do
-          prompt_list << prompt_list.last
-        end
-      end
-      prompt_width = calculate_width(prompt, true)
-      [prompt, prompt_width, prompt_list]
-    else
-      mode_string = check_mode_string
-      prompt = mode_string + prompt if mode_string
-      prompt_width = calculate_width(prompt, true)
-      [prompt, prompt_width, nil]
-    end
-  end
-
-  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
-    @screen_height = @screen_size.first
-    reset_variables(prompt, encoding: encoding)
-    Reline::IOGate.set_winch_handler do
-      @resized = true
-    end
-    if ENV.key?('RELINE_ALT_SCROLLBAR')
-      @full_block = '::'
-      @upper_half_block = "''"
-      @lower_half_block = '..'
-      @block_elem_width = 2
-    elsif Reline::IOGate.win?
-      @full_block = '█'
-      @upper_half_block = '▀'
-      @lower_half_block = '▄'
-      @block_elem_width = 1
-    elsif @encoding == Encoding::UTF_8
-      @full_block = '█'
-      @upper_half_block = '▀'
-      @lower_half_block = '▄'
-      @block_elem_width = Reline::Unicode.calculate_width('█')
-    else
-      @full_block = '::'
-      @upper_half_block = "''"
-      @lower_half_block = '..'
-      @block_elem_width = 2
-    end
-  end
-
-  def resize
-    return unless @resized
-    @resized = false
-    @rest_height = (Reline::IOGate.get_screen_size.first - 1) - Reline::IOGate.cursor_pos.y
-    old_screen_size = @screen_size
-    @screen_size = Reline::IOGate.get_screen_size
-    @screen_height = @screen_size.first
-    if old_screen_size.last < @screen_size.last # columns increase
-      @rerender_all = true
-      rerender
-    else
-      back = 0
-      new_buffer = whole_lines
-      prompt, prompt_width, prompt_list = check_multiline_prompt(new_buffer)
-      new_buffer.each_with_index do |line, index|
-        prompt_width = calculate_width(prompt_list[index], true) if @prompt_proc
-        width = prompt_width + calculate_width(line)
-        height = calculate_height_by_width(width)
-        back += height
-      end
-      @highest_in_all = back
-      @highest_in_this = calculate_height_by_width(prompt_width + @cursor_max)
-      @first_line_started_from =
-        if @line_index.zero?
-          0
-        else
-          calculate_height_by_lines(@buffer_of_lines[0..(@line_index - 1)], prompt_list || prompt)
-        end
-      if @prompt_proc
-        prompt = prompt_list[@line_index]
-        prompt_width = calculate_width(prompt, true)
-      end
-      calculate_nearest_cursor
-      @started_from = calculate_height_by_width(prompt_width + @cursor) - 1
-      Reline::IOGate.move_cursor_column((prompt_width + @cursor) % @screen_size.last)
-      @highest_in_this = calculate_height_by_width(prompt_width + @cursor_max)
-      @rerender_all = true
-    end
-  end
-
-  def set_signal_handlers
-    @old_trap = Signal.trap('INT') {
-      clear_dialog(0)
-      if @scroll_partial_screen
-        move_cursor_down(@screen_height - (@line_index - @scroll_partial_screen) - 1)
-      else
-        move_cursor_down(@highest_in_all - @line_index - 1)
-      end
-      Reline::IOGate.move_cursor_column(0)
-      scroll_down(1)
-      case @old_trap
-      when 'DEFAULT', 'SYSTEM_DEFAULT'
-        raise Interrupt
-      when 'IGNORE'
-        # Do nothing
-      when 'EXIT'
-        exit
-      else
-        @old_trap.call if @old_trap.respond_to?(:call)
-      end
-    }
-  end
-
-  def finalize
-    Signal.trap('INT', @old_trap)
-  end
-
-  def eof?
-    @eof
-  end
-
-  def reset_variables(prompt = '', encoding:)
-    @prompt = prompt.gsub("\n", "\\n")
-    @mark_pointer = nil
-    @encoding = encoding
-    @is_multiline = false
-    @finished = false
-    @cleared = false
-    @rerender_all = false
-    @history_pointer = nil
-    @kill_ring ||= Reline::KillRing.new
-    @vi_clipboard = ''
-    @vi_arg = nil
-    @waiting_proc = nil
-    @waiting_operator_proc = nil
-    @waiting_operator_vi_arg = nil
-    @completion_journey_data = nil
-    @completion_state = CompletionState::NORMAL
-    @perfect_matched = nil
-    @menu_info = nil
-    @first_prompt = true
-    @searching_prompt = nil
-    @first_char = true
-    @add_newline_to_end_of_buffer = false
-    @just_cursor_moving = nil
-    @cached_prompt_list = nil
-    @prompt_cache_time = nil
-    @eof = false
-    @continuous_insertion_buffer = String.new(encoding: @encoding)
-    @scroll_partial_screen = nil
-    @prev_mode_string = nil
-    @drop_terminate_spaces = false
-    @in_pasting = false
-    @auto_indent_proc = nil
-    @dialogs = []
-    @previous_rendered_dialog_y = 0
-    @last_key = nil
-    @resized = false
-    reset_line
-  end
-
-  def reset_line
-    @cursor = 0
-    @cursor_max = 0
-    @byte_pointer = 0
-    @buffer_of_lines = [String.new(encoding: @encoding)]
-    @line_index = 0
-    @previous_line_index = nil
-    @line = @buffer_of_lines[0]
-    @first_line_started_from = 0
-    @move_up = 0
-    @started_from = 0
-    @highest_in_this = 1
-    @highest_in_all = 1
-    @line_backup_in_history = nil
-    @multibyte_buffer = String.new(encoding: 'ASCII-8BIT')
-    @check_new_auto_indent = false
-  end
-
-  def multiline_on
-    @is_multiline = true
-  end
-
-  def multiline_off
-    @is_multiline = false
-  end
-
-  private def calculate_height_by_lines(lines, prompt)
-    result = 0
-    prompt_list = prompt.is_a?(Array) ? prompt : nil
-    lines.each_with_index { |line, i|
-      prompt = prompt_list[i] if prompt_list and prompt_list[i]
-      result += calculate_height_by_width(calculate_width(prompt, true) + calculate_width(line))
-    }
-    result
-  end
-
-  private def insert_new_line(cursor_line, next_line)
-    @line = cursor_line
-    @buffer_of_lines.insert(@line_index + 1, String.new(next_line, encoding: @encoding))
-    @previous_line_index = @line_index
-    @line_index += 1
-    @just_cursor_moving = false
-  end
-
-  private def calculate_height_by_width(width)
-    width.div(@screen_size.last) + 1
-  end
-
-  private def split_by_width(str, max_width)
-    Reline::Unicode.split_by_width(str, max_width, @encoding)
-  end
-
-  private def scroll_down(val)
-    if val <= @rest_height
-      Reline::IOGate.move_cursor_down(val)
-      @rest_height -= val
-    else
-      Reline::IOGate.move_cursor_down(@rest_height)
-      Reline::IOGate.scroll_down(val - @rest_height)
-      @rest_height = 0
-    end
-  end
-
-  private def move_cursor_up(val)
-    if val > 0
-      Reline::IOGate.move_cursor_up(val)
-      @rest_height += val
-    elsif val < 0
-      move_cursor_down(-val)
-    end
-  end
-
-  private def move_cursor_down(val)
-    if val > 0
-      Reline::IOGate.move_cursor_down(val)
-      @rest_height -= val
-      @rest_height = 0 if @rest_height < 0
-    elsif val < 0
-      move_cursor_up(-val)
-    end
-  end
-
-  private def calculate_nearest_cursor(line_to_calc = @line, cursor = @cursor, started_from = @started_from, byte_pointer = @byte_pointer, update = true)
-    new_cursor_max = calculate_width(line_to_calc)
-    new_cursor = 0
-    new_byte_pointer = 0
-    height = 1
-    max_width = @screen_size.last
-    if @config.editing_mode_is?(:vi_command)
-      last_byte_size = Reline::Unicode.get_prev_mbchar_size(line_to_calc, line_to_calc.bytesize)
-      if last_byte_size > 0
-        last_mbchar = line_to_calc.byteslice(line_to_calc.bytesize - last_byte_size, last_byte_size)
-        last_width = Reline::Unicode.get_mbchar_width(last_mbchar)
-        end_of_line_cursor = new_cursor_max - last_width
-      else
-      end_of_line_cursor = new_cursor_max
-      end
-    else
-    end_of_line_cursor = new_cursor_max
-    end
-    line_to_calc.grapheme_clusters.each do |gc|
-      mbchar = gc.encode(Encoding::UTF_8)
-      mbchar_width = Reline::Unicode.get_mbchar_width(mbchar)
-      now = new_cursor + mbchar_width
-      if now > end_of_line_cursor or now > cursor
-        break
-      end
-      new_cursor += mbchar_width
-      if new_cursor > max_width * height
-        height += 1
-      end
-      new_byte_pointer += gc.bytesize
-    end
-    new_started_from = height - 1
-    if update
-      @cursor = new_cursor
-      @cursor_max = new_cursor_max
-      @started_from = new_started_from
-      @byte_pointer = new_byte_pointer
-    else
-      [new_cursor, new_cursor_max, new_started_from, new_byte_pointer]
-    end
-  end
-
-  def rerender_all
-    @rerender_all = true
-    process_insert(force: true)
-    rerender
-  end
-
-  def rerender
-    return if @line.nil?
-    if @menu_info
-      scroll_down(@highest_in_all - @first_line_started_from)
-      @rerender_all = true
-    end
-    if @menu_info
-      show_menu
-      @menu_info = nil
-    end
-    prompt, prompt_width, prompt_list = check_multiline_prompt(whole_lines)
-    cursor_column = (prompt_width + @cursor) % @screen_size.last
-    if @cleared
-      clear_screen_buffer(prompt, prompt_list, prompt_width)
-      @cleared = false
-      return
-    end
-    if @is_multiline and finished? and @scroll_partial_screen
-      # Re-output all code higher than the screen when finished.
-      Reline::IOGate.move_cursor_up(@first_line_started_from + @started_from - @scroll_partial_screen)
-      Reline::IOGate.move_cursor_column(0)
-      @scroll_partial_screen = nil
-      new_lines = whole_lines
-      prompt, prompt_width, prompt_list = check_multiline_prompt(new_lines)
-      modify_lines(new_lines).each_with_index do |line, index|
-        @output.write "#{prompt_list ? prompt_list[index] : prompt}#{line}\r\n"
-        Reline::IOGate.erase_after_cursor
-      end
-      @output.flush
-      clear_dialog(cursor_column)
-      return
-    end
-    new_highest_in_this = calculate_height_by_width(prompt_width + calculate_width(@line.nil? ? '' : @line))
-    rendered = false
-    if @add_newline_to_end_of_buffer
-      clear_dialog_with_trap_key(cursor_column)
-      rerender_added_newline(prompt, prompt_width, prompt_list)
-      @add_newline_to_end_of_buffer = false
-    else
-      if @just_cursor_moving and not @rerender_all
-        clear_dialog_with_trap_key(cursor_column)
-        rendered = just_move_cursor
-        @just_cursor_moving = false
-        return
-      elsif @previous_line_index or new_highest_in_this != @highest_in_this
-        clear_dialog_with_trap_key(cursor_column)
-        rerender_changed_current_line
-        @previous_line_index = nil
-        rendered = true
-      elsif @rerender_all
-        rerender_all_lines
-        @rerender_all = false
-        rendered = true
-      else
-      end
-    end
-    if @is_multiline
-      if finished?
-        # Always rerender on finish because output_modifier_proc may return a different output.
-        new_lines = whole_lines
-        line = modify_lines(new_lines)[@line_index]
-        clear_dialog(cursor_column)
-        prompt, prompt_width, prompt_list = check_multiline_prompt(new_lines)
-        render_partial(prompt, prompt_width, line, @first_line_started_from)
-        move_cursor_down(@highest_in_all - (@first_line_started_from + @highest_in_this - 1) - 1)
-        scroll_down(1)
-        Reline::IOGate.move_cursor_column(0)
-        Reline::IOGate.erase_after_cursor
-      else
-        if not rendered and not @in_pasting
-          line = modify_lines(whole_lines)[@line_index]
-          prompt, prompt_width, prompt_list = check_multiline_prompt(whole_lines)
-          render_partial(prompt, prompt_width, line, @first_line_started_from)
-        end
-        render_dialog(cursor_column)
-      end
-      @buffer_of_lines[@line_index] = @line
-      @rest_height = 0 if @scroll_partial_screen
-    else
-      line = modify_lines(whole_lines)[@line_index]
-      render_partial(prompt, prompt_width, line, 0)
-      if finished?
-        scroll_down(1)
-        Reline::IOGate.move_cursor_column(0)
-        Reline::IOGate.erase_after_cursor
-      end
-    end
-  end
-
-  class DialogProcScope
-    def initialize(line_editor, config, proc_to_exec, context)
-      @line_editor = line_editor
-      @config = config
-      @proc_to_exec = proc_to_exec
-      @context = context
-      @cursor_pos = Reline::CursorPos.new
-    end
-
-    def context
-      @context
-    end
-
-    def retrieve_completion_block(set_completion_quote_character = false)
-      @line_editor.retrieve_completion_block(set_completion_quote_character)
-    end
-
-    def call_completion_proc_with_checking_args(pre, target, post)
-      @line_editor.call_completion_proc_with_checking_args(pre, target, post)
-    end
-
-    def set_dialog(dialog)
-      @dialog = dialog
-    end
-
-    def dialog
-      @dialog
-    end
-
-    def set_cursor_pos(col, row)
-      @cursor_pos.x = col
-      @cursor_pos.y = row
-    end
-
-    def set_key(key)
-      @key = key
-    end
-
-    def key
-      @key
-    end
-
-    def cursor_pos
-      @cursor_pos
-    end
-
-    def just_cursor_moving
-      @line_editor.instance_variable_get(:@just_cursor_moving)
-    end
-
-    def screen_width
-      @line_editor.instance_variable_get(:@screen_size).last
-    end
-
-    def screen_height
-      @line_editor.instance_variable_get(:@screen_size).first
-    end
-
-    def preferred_dialog_height
-      rest_height = @line_editor.instance_variable_get(:@rest_height)
-      scroll_partial_screen = @line_editor.instance_variable_get(:@scroll_partial_screen) || 0
-      [cursor_pos.y - scroll_partial_screen, rest_height, (screen_height + 6) / 5].max
-    end
-
-    def completion_journey_data
-      @line_editor.instance_variable_get(:@completion_journey_data)
-    end
-
-    def config
-      @config
-    end
-
-    def call
-      instance_exec(&@proc_to_exec)
-    end
-  end
-
-  class Dialog
-    attr_reader :name, :contents, :width
-    attr_accessor :scroll_top, :pointer, :column, :vertical_offset, :trap_key
-
-    def initialize(name, config, proc_scope)
-      @name = name
-      @config = config
-      @proc_scope = proc_scope
-      @width = nil
-      @scroll_top = 0
-      @trap_key = nil
-    end
-
-    def set_cursor_pos(col, row)
-      @proc_scope.set_cursor_pos(col, row)
-    end
-
-    def width=(v)
-      @width = v
-    end
-
-    def contents=(contents)
-      @contents = contents
-      if contents and @width.nil?
-        @width = contents.map{ |line| Reline::Unicode.calculate_width(line, true) }.max
-      end
-    end
-
-    def call(key)
-      @proc_scope.set_dialog(self)
-      @proc_scope.set_key(key)
-      dialog_render_info = @proc_scope.call
-      if @trap_key
-        if @trap_key.any?{ |i| i.is_a?(Array) } # multiple trap
-          @trap_key.each do |t|
-            @config.add_oneshot_key_binding(t, @name)
-          end
-        elsif @trap_key.is_a?(Array)
-          @config.add_oneshot_key_binding(@trap_key, @name)
-        elsif @trap_key.is_a?(Integer) or @trap_key.is_a?(Reline::Key)
-          @config.add_oneshot_key_binding([@trap_key], @name)
-        end
-      end
-      dialog_render_info
-    end
-  end
-
-  def add_dialog_proc(name, p, context = nil)
-    dialog = Dialog.new(name, @config, DialogProcScope.new(self, @config, p, context))
-    if index = @dialogs.find_index { |d| d.name == name }
-      @dialogs[index] = dialog
-    else
-      @dialogs << dialog
-    end
-  end
-
-  DIALOG_DEFAULT_HEIGHT = 20
-  private def render_dialog(cursor_column)
-    changes = @dialogs.map do |dialog|
-      old_dialog = dialog.dup
-      update_each_dialog(dialog, cursor_column)
-      [old_dialog, dialog]
-    end
-    render_dialog_changes(changes, cursor_column)
-  end
-
-  private def padding_space_with_escape_sequences(str, width)
-    padding_width = width - calculate_width(str, true)
-    # padding_width should be only positive value. But macOS and Alacritty returns negative value.
-    padding_width = 0 if padding_width < 0
-    str + (' ' * padding_width)
-  end
-
-  private def range_subtract(base_ranges, subtract_ranges)
-    indices = base_ranges.flat_map(&:to_a).uniq.sort - subtract_ranges.flat_map(&:to_a)
-    chunks = indices.chunk_while { |a, b| a + 1 == b }
-    chunks.map { |a| a.first...a.last + 1 }
-  end
-
-  private def dialog_range(dialog, dialog_y)
-    x_range = dialog.column...dialog.column + dialog.width
-    y_range = dialog_y + dialog.vertical_offset...dialog_y + dialog.vertical_offset + dialog.contents.size
-    [x_range, y_range]
-  end
-
-  private def render_dialog_changes(changes, cursor_column)
-    # Collect x-coordinate range and content of previous and current dialogs for each line
-    old_dialog_ranges = {}
-    new_dialog_ranges = {}
-    new_dialog_contents = {}
-    changes.each do |old_dialog, new_dialog|
-      if old_dialog.contents
-        x_range, y_range = dialog_range(old_dialog, @previous_rendered_dialog_y)
-        y_range.each do |y|
-          (old_dialog_ranges[y] ||= []) << x_range
-        end
-      end
-      if new_dialog.contents
-        x_range, y_range = dialog_range(new_dialog, @first_line_started_from + @started_from)
-        y_range.each do |y|
-          (new_dialog_ranges[y] ||= []) << x_range
-          (new_dialog_contents[y] ||= []) << [x_range, new_dialog.contents[y - y_range.begin]]
-        end
-      end
-    end
-    return if old_dialog_ranges.empty? && new_dialog_ranges.empty?
-
-    # Calculate x-coordinate ranges to restore text that was hidden behind dialogs for each line
-    ranges_to_restore = {}
-    subtract_cache = {}
-    old_dialog_ranges.each do |y, old_x_ranges|
-      new_x_ranges = new_dialog_ranges[y] || []
-      ranges = subtract_cache[[old_x_ranges, new_x_ranges]] ||= range_subtract(old_x_ranges, new_x_ranges)
-      ranges_to_restore[y] = ranges if ranges.any?
-    end
-
-    # Create visual_lines for restoring text hidden behind dialogs
-    if ranges_to_restore.any?
-      lines = whole_lines
-      prompt, _prompt_width, prompt_list = check_multiline_prompt(lines, force_recalc: true)
-      modified_lines = modify_lines(lines, force_recalc: true)
-      visual_lines = []
-      modified_lines.each_with_index { |l, i|
-        pr = prompt_list ? prompt_list[i] : prompt
-        vl, = split_by_width(pr + l, @screen_size.last)
-        vl.compact!
-        visual_lines.concat(vl)
-      }
-    end
-
-    # Clear and rerender all dialogs line by line
-    Reline::IOGate.hide_cursor
-    ymin, ymax = (ranges_to_restore.keys + new_dialog_ranges.keys).minmax
-    scroll_partial_screen = @scroll_partial_screen || 0
-    screen_y_range = scroll_partial_screen..(scroll_partial_screen + @screen_height - 1)
-    ymin = ymin.clamp(screen_y_range.begin, screen_y_range.end)
-    ymax = ymax.clamp(screen_y_range.begin, screen_y_range.end)
-    dialog_y = @first_line_started_from + @started_from
-    cursor_y = dialog_y
-    if @highest_in_all <= ymax
-      scroll_down(ymax - cursor_y)
-      move_cursor_up(ymax - cursor_y)
-    end
-    (ymin..ymax).each do |y|
-      move_cursor_down(y - cursor_y)
-      cursor_y = y
-      new_x_ranges = new_dialog_ranges[y]
-      restore_ranges = ranges_to_restore[y]
-      # Restore text that was hidden behind dialogs
-      if restore_ranges
-        line = visual_lines[y] || ''
-        restore_ranges.each do |range|
-          col = range.begin
-          width = range.end - range.begin
-          s = padding_space_with_escape_sequences(Reline::Unicode.take_range(line, col, width), width)
-          Reline::IOGate.move_cursor_column(col)
-          @output.write "\e[0m#{s}\e[0m"
-        end
-        max_column = [calculate_width(line, true), new_x_ranges&.map(&:end)&.max || 0].max
-        if max_column < restore_ranges.map(&:end).max
-          Reline::IOGate.move_cursor_column(max_column)
-          Reline::IOGate.erase_after_cursor
-        end
-      end
-      # Render dialog contents
-      new_dialog_contents[y]&.each do |x_range, content|
-        Reline::IOGate.move_cursor_column(x_range.begin)
-        @output.write "\e[0m#{content}\e[0m"
-      end
-    end
-    move_cursor_up(cursor_y - dialog_y)
-    Reline::IOGate.move_cursor_column(cursor_column)
-    Reline::IOGate.show_cursor
-
-    @previous_rendered_dialog_y = dialog_y
-  end
-
-  private def update_each_dialog(dialog, cursor_column)
-    if @in_pasting
-      dialog.contents = nil
-      dialog.trap_key = nil
-      return
-    end
-    dialog.set_cursor_pos(cursor_column, @first_line_started_from + @started_from)
-    dialog_render_info = dialog.call(@last_key)
-    if dialog_render_info.nil? or dialog_render_info.contents.nil? or dialog_render_info.contents.empty?
-      dialog.contents = nil
-      dialog.trap_key = nil
-      return
-    end
-    contents = dialog_render_info.contents
-    pointer = dialog.pointer
-    if dialog_render_info.width
-      dialog.width = dialog_render_info.width
-    else
-      dialog.width = contents.map { |l| calculate_width(l, true) }.max
-    end
-    height = dialog_render_info.height || DIALOG_DEFAULT_HEIGHT
-    height = contents.size if contents.size < height
-    if contents.size > height
-      if dialog.pointer
-        if dialog.pointer < 0
-          dialog.scroll_top = 0
-        elsif (dialog.pointer - dialog.scroll_top) >= (height - 1)
-          dialog.scroll_top = dialog.pointer - (height - 1)
-        elsif (dialog.pointer - dialog.scroll_top) < 0
-          dialog.scroll_top = dialog.pointer
-        end
-        pointer = dialog.pointer - dialog.scroll_top
-      else
-        dialog.scroll_top = 0
-      end
-      contents = contents[dialog.scroll_top, height]
-    end
-    if dialog_render_info.scrollbar and dialog_render_info.contents.size > height
-      bar_max_height = height * 2
-      moving_distance = (dialog_render_info.contents.size - height) * 2
-      position_ratio = dialog.scroll_top.zero? ? 0.0 : ((dialog.scroll_top * 2).to_f / moving_distance)
-      bar_height = (bar_max_height * ((contents.size * 2).to_f / (dialog_render_info.contents.size * 2))).floor.to_i
-      bar_height = MINIMUM_SCROLLBAR_HEIGHT if bar_height < MINIMUM_SCROLLBAR_HEIGHT
-      scrollbar_pos = ((bar_max_height - bar_height) * position_ratio).floor.to_i
-    else
-      scrollbar_pos = nil
-    end
-    upper_space = @first_line_started_from - @started_from
-    dialog.column = dialog_render_info.pos.x
-    dialog.width += @block_elem_width if scrollbar_pos
-    diff = (dialog.column + dialog.width) - (@screen_size.last)
-    if diff > 0
-      dialog.column -= diff
-    end
-    if (@rest_height - dialog_render_info.pos.y) >= height
-      dialog.vertical_offset = dialog_render_info.pos.y + 1
-    elsif upper_space >= height
-      dialog.vertical_offset = dialog_render_info.pos.y - height
-    else
-      dialog.vertical_offset = dialog_render_info.pos.y + 1
-    end
-    if dialog.column < 0
-      dialog.column = 0
-      dialog.width = @screen_size.last
-    end
-    dialog.contents = contents.map.with_index do |item, i|
-      if i == pointer
-        fg_color = dialog_render_info.pointer_fg_color
-        bg_color = dialog_render_info.pointer_bg_color
-      else
-        fg_color = dialog_render_info.fg_color
-        bg_color = dialog_render_info.bg_color
-      end
-      str_width = dialog.width - (scrollbar_pos.nil? ? 0 : @block_elem_width)
-      str = padding_space_with_escape_sequences(Reline::Unicode.take_range(item, 0, str_width), str_width)
-      colored_content = "\e[#{bg_color}m\e[#{fg_color}m#{str}"
-      if scrollbar_pos
-        color_seq = "\e[37m"
-        if scrollbar_pos <= (i * 2) and (i * 2 + 1) < (scrollbar_pos + bar_height)
-          colored_content + color_seq + @full_block
-        elsif scrollbar_pos <= (i * 2) and (i * 2) < (scrollbar_pos + bar_height)
-          colored_content + color_seq + @upper_half_block
-        elsif scrollbar_pos <= (i * 2 + 1) and (i * 2) < (scrollbar_pos + bar_height)
-          colored_content + color_seq + @lower_half_block
-        else
-          colored_content + color_seq + ' ' * @block_elem_width
-        end
-      else
-        colored_content
-      end
-    end
-  end
-
-  private def clear_dialog(cursor_column)
-    changes = @dialogs.map do |dialog|
-      old_dialog = dialog.dup
-      dialog.contents = nil
-      [old_dialog, dialog]
-    end
-    render_dialog_changes(changes, cursor_column)
-  end
-
-  private def clear_dialog_with_trap_key(cursor_column)
-    clear_dialog(cursor_column)
-    @dialogs.each do |dialog|
-      dialog.trap_key = nil
-    end
-  end
-
-  private def calculate_scroll_partial_screen(highest_in_all, cursor_y)
-    if @screen_height < highest_in_all
-      old_scroll_partial_screen = @scroll_partial_screen
-      if cursor_y == 0
-        @scroll_partial_screen = 0
-      elsif cursor_y == (highest_in_all - 1)
-        @scroll_partial_screen = highest_in_all - @screen_height
-      else
-        if @scroll_partial_screen
-          if cursor_y <= @scroll_partial_screen
-            @scroll_partial_screen = cursor_y
-          elsif (@scroll_partial_screen + @screen_height - 1) < cursor_y
-            @scroll_partial_screen = cursor_y - (@screen_height - 1)
-          end
-        else
-          if cursor_y > (@screen_height - 1)
-            @scroll_partial_screen = cursor_y - (@screen_height - 1)
-          else
-            @scroll_partial_screen = 0
-          end
-        end
-      end
-      if @scroll_partial_screen != old_scroll_partial_screen
-        @rerender_all = true
-      end
-    else
-      if @scroll_partial_screen
-        @rerender_all = true
-      end
-      @scroll_partial_screen = nil
-    end
-  end
-
-  private def rerender_added_newline(prompt, prompt_width, prompt_list)
-    @buffer_of_lines[@previous_line_index] = @line
-    @line = @buffer_of_lines[@line_index]
-    @previous_line_index = nil
-    if @in_pasting
-      scroll_down(1)
-    else
-      lines = whole_lines
-      prev_line_prompt = @prompt_proc ? prompt_list[@line_index - 1] : prompt
-      prev_line_prompt_width = @prompt_proc ? calculate_width(prev_line_prompt, true) : prompt_width
-      prev_line = modify_lines(lines)[@line_index - 1]
-      move_cursor_up(@started_from)
-      render_partial(prev_line_prompt, prev_line_prompt_width, prev_line, @first_line_started_from + @started_from, with_control: false)
-      scroll_down(1)
-      render_partial(prompt, prompt_width, @line, @first_line_started_from + @started_from + 1, with_control: false)
-    end
-    @cursor = @cursor_max = calculate_width(@line)
-    @byte_pointer = @line.bytesize
-    @highest_in_all += @highest_in_this
-    @highest_in_this = calculate_height_by_width(prompt_width + @cursor_max)
-    @first_line_started_from += @started_from + 1
-    @started_from = calculate_height_by_width(prompt_width + @cursor) - 1
-  end
-
-  def just_move_cursor
-    prompt, prompt_width, prompt_list = check_multiline_prompt(@buffer_of_lines)
-    move_cursor_up(@started_from)
-    new_first_line_started_from =
-      if @line_index.zero?
-        0
-      else
-        calculate_height_by_lines(@buffer_of_lines[0..(@line_index - 1)], prompt_list || prompt)
-      end
-    first_line_diff = new_first_line_started_from - @first_line_started_from
-    @cursor, @cursor_max, _, @byte_pointer = calculate_nearest_cursor(@buffer_of_lines[@line_index], @cursor, @started_from, @byte_pointer, false)
-    new_started_from = calculate_height_by_width(prompt_width + @cursor) - 1
-    calculate_scroll_partial_screen(@highest_in_all, new_first_line_started_from + new_started_from)
-    @previous_line_index = nil
-    @line = @buffer_of_lines[@line_index]
-    if @rerender_all
-      rerender_all_lines
-      @rerender_all = false
-      true
-    else
-      @first_line_started_from = new_first_line_started_from
-      @started_from = new_started_from
-      move_cursor_down(first_line_diff + @started_from)
-      Reline::IOGate.move_cursor_column((prompt_width + @cursor) % @screen_size.last)
-      false
-    end
-  end
-
-  private def rerender_changed_current_line
-    new_lines = whole_lines
-    prompt, prompt_width, prompt_list = check_multiline_prompt(new_lines)
-    all_height = calculate_height_by_lines(new_lines, prompt_list || prompt)
-    diff = all_height - @highest_in_all
-    move_cursor_down(@highest_in_all - @first_line_started_from - @started_from - 1)
-    if diff > 0
-      scroll_down(diff)
-      move_cursor_up(all_height - 1)
-    elsif diff < 0
-      (-diff).times do
-        Reline::IOGate.move_cursor_column(0)
-        Reline::IOGate.erase_after_cursor
-        move_cursor_up(1)
-      end
-      move_cursor_up(all_height - 1)
-    else
-      move_cursor_up(all_height - 1)
-    end
-    @highest_in_all = all_height
-    back = render_whole_lines(new_lines, prompt_list || prompt, prompt_width)
-    move_cursor_up(back)
-    if @previous_line_index
-      @buffer_of_lines[@previous_line_index] = @line
-      @line = @buffer_of_lines[@line_index]
-    end
-    @first_line_started_from =
-      if @line_index.zero?
-        0
-      else
-        calculate_height_by_lines(@buffer_of_lines[0..(@line_index - 1)], prompt_list || prompt)
-      end
-    if @prompt_proc
-      prompt = prompt_list[@line_index]
-      prompt_width = calculate_width(prompt, true)
-    end
-    move_cursor_down(@first_line_started_from)
-    calculate_nearest_cursor
-    @started_from = calculate_height_by_width(prompt_width + @cursor) - 1
-    move_cursor_down(@started_from)
-    Reline::IOGate.move_cursor_column((prompt_width + @cursor) % @screen_size.last)
-    @highest_in_this = calculate_height_by_width(prompt_width + @cursor_max)
-  end
-
-  private def rerender_all_lines
-    move_cursor_up(@first_line_started_from + @started_from)
-    Reline::IOGate.move_cursor_column(0)
-    back = 0
-    new_buffer = whole_lines
-    prompt, prompt_width, prompt_list = check_multiline_prompt(new_buffer)
-    new_buffer.each_with_index do |line, index|
-      prompt_width = calculate_width(prompt_list[index], true) if @prompt_proc
-      width = prompt_width + calculate_width(line)
-      height = calculate_height_by_width(width)
-      back += height
-    end
-    old_highest_in_all = @highest_in_all
-    if @line_index.zero?
-      new_first_line_started_from = 0
-    else
-      new_first_line_started_from = calculate_height_by_lines(new_buffer[0..(@line_index - 1)], prompt_list || prompt)
-    end
-    new_started_from = calculate_height_by_width(prompt_width + @cursor) - 1
-    calculate_scroll_partial_screen(back, new_first_line_started_from + new_started_from)
-    if @scroll_partial_screen
-      move_cursor_up(@first_line_started_from + @started_from)
-      scroll_down(@screen_height - 1)
-      move_cursor_up(@screen_height)
-      Reline::IOGate.move_cursor_column(0)
-    elsif back > old_highest_in_all
-      scroll_down(back - 1)
-      move_cursor_up(back - 1)
-    elsif back < old_highest_in_all
-      scroll_down(back)
-      Reline::IOGate.erase_after_cursor
-      (old_highest_in_all - back - 1).times do
-        scroll_down(1)
-        Reline::IOGate.erase_after_cursor
-      end
-      move_cursor_up(old_highest_in_all - 1)
-    end
-    render_whole_lines(new_buffer, prompt_list || prompt, prompt_width)
-    if @prompt_proc
-      prompt = prompt_list[@line_index]
-      prompt_width = calculate_width(prompt, true)
-    end
-    @highest_in_this = calculate_height_by_width(prompt_width + @cursor_max)
-    @highest_in_all = back
-    @first_line_started_from = new_first_line_started_from
-    @started_from = new_started_from
-    if @scroll_partial_screen
-      Reline::IOGate.move_cursor_up(@screen_height - (@first_line_started_from + @started_from - @scroll_partial_screen) - 1)
-      Reline::IOGate.move_cursor_column((prompt_width + @cursor) % @screen_size.last)
-    else
-      move_cursor_down(@first_line_started_from + @started_from - back + 1)
-      Reline::IOGate.move_cursor_column((prompt_width + @cursor) % @screen_size.last)
-    end
-  end
-
-  private def render_whole_lines(lines, prompt, prompt_width)
-    rendered_height = 0
-    modify_lines(lines).each_with_index do |line, index|
-      if prompt.is_a?(Array)
-        line_prompt = prompt[index]
-        prompt_width = calculate_width(line_prompt, true)
-      else
-        line_prompt = prompt
-      end
-      height = render_partial(line_prompt, prompt_width, line, rendered_height, with_control: false)
-      if index < (lines.size - 1)
-        if @scroll_partial_screen
-          if (@scroll_partial_screen - height) < rendered_height and (@scroll_partial_screen + @screen_height - 1) >= (rendered_height + height)
-            move_cursor_down(1)
-          end
-        else
-          scroll_down(1)
-        end
-        rendered_height += height
-      else
-        rendered_height += height - 1
-      end
-    end
-    rendered_height
-  end
-
-  private def render_partial(prompt, prompt_width, line_to_render, this_started_from, with_control: true)
-    visual_lines, height = split_by_width(line_to_render.nil? ? prompt : prompt + line_to_render, @screen_size.last)
-    cursor_up_from_last_line = 0
-    if @scroll_partial_screen
-      last_visual_line = this_started_from + (height - 1)
-      last_screen_line = @scroll_partial_screen + (@screen_height - 1)
-      if (@scroll_partial_screen - this_started_from) >= height
-        # Render nothing because this line is before the screen.
-        visual_lines = []
-      elsif this_started_from > last_screen_line
-        # Render nothing because this line is after the screen.
-        visual_lines = []
-      else
-        deleted_lines_before_screen = []
-        if @scroll_partial_screen > this_started_from and last_visual_line >= @scroll_partial_screen
-          # A part of visual lines are before the screen.
-          deleted_lines_before_screen = visual_lines.shift((@scroll_partial_screen - this_started_from) * 2)
-          deleted_lines_before_screen.compact!
-        end
-        if this_started_from <= last_screen_line and last_screen_line < last_visual_line
-          # A part of visual lines are after the screen.
-          visual_lines.pop((last_visual_line - last_screen_line) * 2)
-        end
-        move_cursor_up(deleted_lines_before_screen.size - @started_from)
-        cursor_up_from_last_line = @started_from - deleted_lines_before_screen.size
-      end
-    end
-    if with_control
-      if height > @highest_in_this
-        diff = height - @highest_in_this
-        scroll_down(diff)
-        @highest_in_all += diff
-        @highest_in_this = height
-        move_cursor_up(diff)
-      elsif height < @highest_in_this
-        diff = @highest_in_this - height
-        @highest_in_all -= diff
-        @highest_in_this = height
-      end
-      move_cursor_up(@started_from)
-      @started_from = calculate_height_by_width(prompt_width + @cursor) - 1
-      cursor_up_from_last_line = height - 1 - @started_from
-    end
-    if Reline::Unicode::CSI_REGEXP.match?(prompt + line_to_render)
-      @output.write "\e[0m" # clear character decorations
-    end
-    visual_lines.each_with_index do |line, index|
-      Reline::IOGate.move_cursor_column(0)
-      if line.nil?
-        if calculate_width(visual_lines[index - 1], true) == Reline::IOGate.get_screen_size.last
-          # reaches the end of line
-          if Reline::IOGate.win? and Reline::IOGate.win_legacy_console?
-            # A newline is automatically inserted if a character is rendered at
-            # eol on command prompt.
-          else
-            # When the cursor is at the end of the line and erases characters
-            # after the cursor, some terminals delete the character at the
-            # cursor position.
-            move_cursor_down(1)
-            Reline::IOGate.move_cursor_column(0)
-          end
-        else
-          Reline::IOGate.erase_after_cursor
-          move_cursor_down(1)
-          Reline::IOGate.move_cursor_column(0)
-        end
-        next
-      end
-      @output.write line
-      if Reline::IOGate.win? and Reline::IOGate.win_legacy_console? 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
-        @pre_input_hook&.call
-      end
-    end
-    unless visual_lines.empty?
-      Reline::IOGate.erase_after_cursor
-      Reline::IOGate.move_cursor_column(0)
-    end
-    if with_control
-      # Just after rendring, so the cursor is on the last line.
-      if finished?
-        Reline::IOGate.move_cursor_column(0)
-      else
-        # Moves up from bottom of lines to the cursor position.
-        move_cursor_up(cursor_up_from_last_line)
-        # This logic is buggy if a fullwidth char is wrapped because there is only one halfwidth at end of a line.
-        Reline::IOGate.move_cursor_column((prompt_width + @cursor) % @screen_size.last)
-      end
-    end
-    height
-  end
-
-  private def modify_lines(before, force_recalc: false)
-    return before if !force_recalc && (before.nil? || before.empty? || simplified_rendering?)
-
-    if after = @output_modifier_proc&.call("#{before.join("\n")}\n", complete: finished?)
-      after.lines("\n").map { |l| l.chomp('') }
-    else
-      before
-    end
-  end
-
-  private def show_menu
-    scroll_down(@highest_in_all - @first_line_started_from)
-    @rerender_all = true
-    @menu_info.list.sort!.each do |item|
-      Reline::IOGate.move_cursor_column(0)
-      @output.write item
-      @output.flush
-      scroll_down(1)
-    end
-    scroll_down(@highest_in_all - 1)
-    move_cursor_up(@highest_in_all - 1 - @first_line_started_from)
-  end
-
-  private def clear_screen_buffer(prompt, prompt_list, prompt_width)
-    Reline::IOGate.clear_screen
-    back = 0
-    modify_lines(whole_lines).each_with_index do |line, index|
-      if @prompt_proc
-        pr = prompt_list[index]
-        height = render_partial(pr, calculate_width(pr), line, back, with_control: false)
-      else
-        height = render_partial(prompt, prompt_width, line, back, with_control: false)
-      end
-      if index < (@buffer_of_lines.size - 1)
-        move_cursor_down(1)
-        back += height
-      end
-    end
-    move_cursor_up(back)
-    move_cursor_down(@first_line_started_from + @started_from)
-    @rest_height = (Reline::IOGate.get_screen_size.first - 1) - Reline::IOGate.cursor_pos.y
-    Reline::IOGate.move_cursor_column((prompt_width + @cursor) % @screen_size.last)
-  end
-
-  def editing_mode
-    @config.editing_mode
-  end
-
-  private def menu(target, list)
-    @menu_info = MenuInfo.new(target, list)
-  end
-
-  private def complete_internal_proc(list, is_menu)
-    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 compatible with #{i.encoding.name}"
-      end
-      if @config.completion_ignore_case
-        i&.downcase&.start_with?(target.downcase)
-      else
-        i&.start_with?(target)
-      end
-    }.uniq
-    if is_menu
-      menu(target, list)
-      return nil
-    end
-    completed = list.inject { |memo, item|
-      begin
-        memo_mbchars = memo.unicode_normalize.grapheme_clusters
-        item_mbchars = item.unicode_normalize.grapheme_clusters
-      rescue Encoding::CompatibilityError
-        memo_mbchars = memo.grapheme_clusters
-        item_mbchars = item.grapheme_clusters
-      end
-      size = [memo_mbchars.size, item_mbchars.size].min
-      result = ''
-      size.times do |i|
-        if @config.completion_ignore_case
-          if memo_mbchars[i].casecmp?(item_mbchars[i])
-            result << memo_mbchars[i]
-          else
-            break
-          end
-        else
-          if memo_mbchars[i] == item_mbchars[i]
-            result << memo_mbchars[i]
-          else
-            break
-          end
-        end
-      end
-      result
-    }
-    [target, preposing, completed, postposing]
-  end
-
-  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
-    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
-    end
-    return if result.nil?
-    target, preposing, completed, postposing = result
-    return if completed.nil?
-    if target <= completed and (@completion_state == CompletionState::COMPLETION)
-      if list.include?(completed)
-        if list.one?
-          @completion_state = CompletionState::PERFECT_MATCH
-        else
-          @completion_state = CompletionState::MENU_WITH_PERFECT_MATCH
-        end
-        @perfect_matched = completed
-      else
-        @completion_state = CompletionState::MENU
-      end
-      if not just_show_list and target < completed
-        @line = (preposing + completed + completion_append_character.to_s + postposing).split("\n")[@line_index] || String.new(encoding: @encoding)
-        line_to_pointer = (preposing + completed + completion_append_character.to_s).split("\n").last || String.new(encoding: @encoding)
-        @cursor_max = calculate_width(@line)
-        @cursor = calculate_width(line_to_pointer)
-        @byte_pointer = line_to_pointer.bytesize
-      end
-    end
-  end
-
-  private def move_completed_list(list, direction)
-    case @completion_state
-    when CompletionState::NORMAL, CompletionState::COMPLETION,
-         CompletionState::MENU, CompletionState::MENU_WITH_PERFECT_MATCH
-      @completion_state = CompletionState::JOURNEY
-      result = retrieve_completion_block
-      return if result.nil?
-      preposing, target, postposing = result
-      @completion_journey_data = CompletionJourneyData.new(
-        preposing, postposing,
-        [target] + list.select{ |item| item.start_with?(target) }, 0)
-      if @completion_journey_data.list.size == 1
-        @completion_journey_data.pointer = 0
-      else
-        case direction
-        when :up
-          @completion_journey_data.pointer = @completion_journey_data.list.size - 1
-        when :down
-          @completion_journey_data.pointer = 1
-        end
-      end
-      @completion_state = CompletionState::JOURNEY
-    else
-      case direction
-      when :up
-        @completion_journey_data.pointer -= 1
-        if @completion_journey_data.pointer < 0
-          @completion_journey_data.pointer = @completion_journey_data.list.size - 1
-        end
-      when :down
-        @completion_journey_data.pointer += 1
-        if @completion_journey_data.pointer >= @completion_journey_data.list.size
-          @completion_journey_data.pointer = 0
-        end
-      end
-    end
-    completed = @completion_journey_data.list[@completion_journey_data.pointer]
-    new_line = (@completion_journey_data.preposing + completed + @completion_journey_data.postposing).split("\n")[@line_index]
-    @line = new_line.nil? ? String.new(encoding: @encoding) : new_line
-    line_to_pointer = (@completion_journey_data.preposing + completed).split("\n").last
-    line_to_pointer = String.new(encoding: @encoding) if line_to_pointer.nil?
-    @cursor_max = calculate_width(@line)
-    @cursor = calculate_width(line_to_pointer)
-    @byte_pointer = line_to_pointer.bytesize
-  end
-
-  private def run_for_operators(key, method_symbol, &block)
-    if @waiting_operator_proc
-      if VI_MOTIONS.include?(method_symbol)
-        old_cursor, old_byte_pointer = @cursor, @byte_pointer
-        @vi_arg = @waiting_operator_vi_arg if @waiting_operator_vi_arg&.> 1
-        block.(true)
-        unless @waiting_proc
-          cursor_diff, byte_pointer_diff = @cursor - old_cursor, @byte_pointer - old_byte_pointer
-          @cursor, @byte_pointer = old_cursor, old_byte_pointer
-          @waiting_operator_proc.(cursor_diff, byte_pointer_diff)
-        else
-          old_waiting_proc = @waiting_proc
-          old_waiting_operator_proc = @waiting_operator_proc
-          current_waiting_operator_proc = @waiting_operator_proc
-          @waiting_proc = proc { |k|
-            old_cursor, old_byte_pointer = @cursor, @byte_pointer
-            old_waiting_proc.(k)
-            cursor_diff, byte_pointer_diff = @cursor - old_cursor, @byte_pointer - old_byte_pointer
-            @cursor, @byte_pointer = old_cursor, old_byte_pointer
-            current_waiting_operator_proc.(cursor_diff, byte_pointer_diff)
-            @waiting_operator_proc = old_waiting_operator_proc
-          }
-        end
-      else
-        # Ignores operator when not motion is given.
-        block.(false)
-      end
-      @waiting_operator_proc = nil
-      @waiting_operator_vi_arg = nil
-      if @vi_arg
-        @rerender_all = true
-        @vi_arg = nil
-      end
-    else
-      block.(false)
-    end
-  end
-
-  private def argumentable?(method_obj)
-    method_obj and method_obj.parameters.any? { |param| param[0] == :key and param[1] == :arg }
-  end
-
-  private def inclusive?(method_obj)
-    # If a motion method with the keyword argument "inclusive" follows the
-    # operator, it must contain the character at the cursor position.
-    method_obj and method_obj.parameters.any? { |param| param[0] == :key and param[1] == :inclusive }
-  end
-
-  def wrap_method_call(method_symbol, method_obj, key, with_operator = false)
-    if @config.editing_mode_is?(:emacs, :vi_insert) and @waiting_proc.nil? and @waiting_operator_proc.nil?
-      not_insertion = method_symbol != :ed_insert
-      process_insert(force: not_insertion)
-    end
-    if @vi_arg and argumentable?(method_obj)
-      if with_operator and inclusive?(method_obj)
-        method_obj.(key, arg: @vi_arg, inclusive: true)
-      else
-        method_obj.(key, arg: @vi_arg)
-      end
-    else
-      if with_operator and inclusive?(method_obj)
-        method_obj.(key, inclusive: true)
-      else
-        method_obj.(key)
-      end
-    end
-  end
-
-  private def process_key(key, method_symbol)
-    if method_symbol and respond_to?(method_symbol, true)
-      method_obj = method(method_symbol)
-    else
-      method_obj = nil
-    end
-    if method_symbol and key.is_a?(Symbol)
-      if @vi_arg and argumentable?(method_obj)
-        run_for_operators(key, method_symbol) do |with_operator|
-          wrap_method_call(method_symbol, method_obj, key, with_operator)
-        end
-      else
-        wrap_method_call(method_symbol, method_obj, key) if method_obj
-      end
-      @kill_ring.process
-      if @vi_arg
-        @rerender_al = true
-        @vi_arg = nil
-      end
-    elsif @vi_arg
-      if key.chr =~ /[0-9]/
-        ed_argument_digit(key)
-      else
-        if argumentable?(method_obj)
-          run_for_operators(key, method_symbol) do |with_operator|
-            wrap_method_call(method_symbol, method_obj, key, with_operator)
-          end
-        elsif @waiting_proc
-          @waiting_proc.(key)
-        elsif method_obj
-          wrap_method_call(method_symbol, method_obj, key)
-        else
-          ed_insert(key) unless @config.editing_mode_is?(:vi_command)
-        end
-        @kill_ring.process
-        if @vi_arg
-          @rerender_all = true
-          @vi_arg = nil
-        end
-      end
-    elsif @waiting_proc
-      @waiting_proc.(key)
-      @kill_ring.process
-    elsif method_obj
-      if method_symbol == :ed_argument_digit
-        wrap_method_call(method_symbol, method_obj, key)
-      else
-        run_for_operators(key, method_symbol) do |with_operator|
-          wrap_method_call(method_symbol, method_obj, key, with_operator)
-        end
-      end
-      @kill_ring.process
-    else
-      ed_insert(key) unless @config.editing_mode_is?(:vi_command)
-    end
-  end
-
-  private def normal_char(key)
-    method_symbol = method_obj = nil
-    if key.combined_char.is_a?(Symbol)
-      process_key(key.combined_char, key.combined_char)
-      return
-    end
-    @multibyte_buffer << key.combined_char
-    if @multibyte_buffer.size > 1
-      if @multibyte_buffer.dup.force_encoding(@encoding).valid_encoding?
-        process_key(@multibyte_buffer.dup.force_encoding(@encoding), nil)
-        @multibyte_buffer.clear
-      else
-        # invalid
-        return
-      end
-    else # single byte
-      return if key.char >= 128 # maybe, first byte of multi byte
-      method_symbol = @config.editing_mode.get_method(key.combined_char)
-      if key.with_meta and method_symbol == :ed_unassigned
-        if @config.editing_mode_is?(:vi_command, :vi_insert)
-          # split ESC + key in vi mode
-          method_symbol = @config.editing_mode.get_method("\e".ord)
-          process_key("\e".ord, method_symbol)
-          method_symbol = @config.editing_mode.get_method(key.char)
-          process_key(key.char, method_symbol)
-        end
-      else
-        process_key(key.combined_char, method_symbol)
-      end
-      @multibyte_buffer.clear
-    end
-    if @config.editing_mode_is?(:vi_command) and @cursor > 0 and @cursor == @cursor_max
-      byte_size = Reline::Unicode.get_prev_mbchar_size(@line, @byte_pointer)
-      @byte_pointer -= byte_size
-      mbchar = @line.byteslice(@byte_pointer, byte_size)
-      width = Reline::Unicode.get_mbchar_width(mbchar)
-      @cursor -= width
-    end
-  end
-
-  def input_key(key)
-    @last_key = key
-    @config.reset_oneshot_key_bindings
-    @dialogs.each do |dialog|
-      if key.char.instance_of?(Symbol) and key.char == dialog.name
-        return
-      end
-    end
-    @just_cursor_moving = nil
-    if key.char.nil?
-      if @first_char
-        @line = nil
-      end
-      finish
-      return
-    end
-    old_line = @line.dup
-    @first_char = false
-    completion_occurs = false
-    if @config.editing_mode_is?(:emacs, :vi_insert) and key.char == "\C-i".ord
-      unless @config.disable_completion
-        result = call_completion_proc
-        if result.is_a?(Array)
-          completion_occurs = true
-          process_insert
-          if @config.autocompletion
-            move_completed_list(result, :down)
-          else
-            complete(result)
-          end
-        end
-      end
-    elsif @config.editing_mode_is?(:emacs, :vi_insert) and key.char == :completion_journey_up
-      if not @config.disable_completion and @config.autocompletion
-        result = call_completion_proc
-        if result.is_a?(Array)
-          completion_occurs = true
-          process_insert
-          move_completed_list(result, :up)
-        end
-      end
-    elsif not @config.disable_completion and @config.editing_mode_is?(:vi_insert) and ["\C-p".ord, "\C-n".ord].include?(key.char)
-      unless @config.disable_completion
-        result = call_completion_proc
-        if result.is_a?(Array)
-          completion_occurs = true
-          process_insert
-          move_completed_list(result, "\C-p".ord == key.char ? :up : :down)
-        end
-      end
-    elsif Symbol === key.char and respond_to?(key.char, true)
-      process_key(key.char, key.char)
-    else
-      normal_char(key)
-    end
-    unless completion_occurs
-      @completion_state = CompletionState::NORMAL
-      @completion_journey_data = nil
-    end
-    if not @in_pasting and @just_cursor_moving.nil?
-      if @previous_line_index and @buffer_of_lines[@previous_line_index] == @line
-        @just_cursor_moving = true
-      elsif @previous_line_index.nil? and @buffer_of_lines[@line_index] == @line and old_line == @line
-        @just_cursor_moving = true
-      else
-        @just_cursor_moving = false
-      end
-    else
-      @just_cursor_moving = false
-    end
-    if @is_multiline and @auto_indent_proc and not simplified_rendering? and @line
-      process_auto_indent
-    end
-  end
-
-  def call_completion_proc
-    result = retrieve_completion_block(true)
-    pre, target, post = result
-    result = call_completion_proc_with_checking_args(pre, target, post)
-    Reline.core.instance_variable_set(:@completion_quote_character, nil)
-    result
-  end
-
-  def call_completion_proc_with_checking_args(pre, target, post)
-    if @completion_proc and target
-      argnum = @completion_proc.parameters.inject(0) { |result, item|
-        case item.first
-        when :req, :opt
-          result + 1
-        when :rest
-          break 3
-        end
-      }
-      case argnum
-      when 1
-        result = @completion_proc.(target)
-      when 2
-        result = @completion_proc.(target, pre)
-      when 3..Float::INFINITY
-        result = @completion_proc.(target, pre, post)
-      end
-    end
-    result
-  end
-
-  private def process_auto_indent
-    return if not @check_new_auto_indent and @previous_line_index # move cursor up or down
-    if @check_new_auto_indent and @previous_line_index and @previous_line_index > 0 and @line_index > @previous_line_index
-      # Fix indent of a line when a newline is inserted to the next
-      new_lines = whole_lines
-      new_indent = @auto_indent_proc.(new_lines[0..-3].push(''), @line_index - 1, 0, true)
-      md = @line.match(/\A */)
-      prev_indent = md[0].count(' ')
-      @line = ' ' * new_indent + @line.lstrip
-
-      new_indent = nil
-      result = @auto_indent_proc.(new_lines[0..-2], @line_index - 1, (new_lines[@line_index - 1].bytesize + 1), false)
-      if result
-        new_indent = result
-      end
-      if new_indent&.>= 0
-        @line = ' ' * new_indent + @line.lstrip
-      end
-    end
-    new_lines = whole_lines
-    new_indent = @auto_indent_proc.(new_lines, @line_index, @byte_pointer, @check_new_auto_indent)
-    if new_indent&.>= 0
-      md = new_lines[@line_index].match(/\A */)
-      prev_indent = md[0].count(' ')
-      if @check_new_auto_indent
-        line = @buffer_of_lines[@line_index] = ' ' * new_indent + @buffer_of_lines[@line_index].lstrip
-        @cursor = new_indent
-        @cursor_max = calculate_width(line)
-        @byte_pointer = new_indent
-      else
-        @line = ' ' * new_indent + @line.lstrip
-        @cursor += new_indent - prev_indent
-        @cursor_max = calculate_width(@line)
-        @byte_pointer += new_indent - prev_indent
-      end
-    end
-    @check_new_auto_indent = false
-  end
-
-  def retrieve_completion_block(set_completion_quote_character = false)
-    if Reline.completer_word_break_characters.empty?
-      word_break_regexp = nil
-    else
-      word_break_regexp = /\A[#{Regexp.escape(Reline.completer_word_break_characters)}]/
-    end
-    if Reline.completer_quote_characters.empty?
-      quote_characters_regexp = nil
-    else
-      quote_characters_regexp = /\A[#{Regexp.escape(Reline.completer_quote_characters)}]/
-    end
-    before = @line.byteslice(0, @byte_pointer)
-    rest = nil
-    break_pointer = nil
-    quote = nil
-    closing_quote = nil
-    escaped_quote = nil
-    i = 0
-    while i < @byte_pointer do
-      slice = @line.byteslice(i, @byte_pointer - i)
-      unless slice.valid_encoding?
-        i += 1
-        next
-      end
-      if quote and slice.start_with?(closing_quote)
-        quote = nil
-        i += 1
-        rest = nil
-      elsif quote and slice.start_with?(escaped_quote)
-        # skip
-        i += 2
-      elsif quote_characters_regexp and slice =~ quote_characters_regexp # find new "
-        rest = $'
-        quote = $&
-        closing_quote = /(?!\\)#{Regexp.escape(quote)}/
-        escaped_quote = /\\#{Regexp.escape(quote)}/
-        i += 1
-        break_pointer = i - 1
-      elsif word_break_regexp and not quote and slice =~ word_break_regexp
-        rest = $'
-        i += 1
-        before = @line.byteslice(i, @byte_pointer - i)
-        break_pointer = i
-      else
-        i += 1
-      end
-    end
-    postposing = @line.byteslice(@byte_pointer, @line.bytesize - @byte_pointer)
-    if rest
-      preposing = @line.byteslice(0, break_pointer)
-      target = rest
-      if set_completion_quote_character and quote
-        Reline.core.instance_variable_set(:@completion_quote_character, quote)
-        if postposing !~ /(?!\\)#{Regexp.escape(quote)}/ # closing quote
-          insert_text(quote)
-        end
-      end
-    else
-      preposing = ''
-      if break_pointer
-        preposing = @line.byteslice(0, break_pointer)
-      else
-        preposing = ''
-      end
-      target = before
-    end
-    if @is_multiline
-      lines = whole_lines
-      if @line_index > 0
-        preposing = lines[0..(@line_index - 1)].join("\n") + "\n" + preposing
-      end
-      if (lines.size - 1) > @line_index
-        postposing = postposing + "\n" + lines[(@line_index + 1)..-1].join("\n")
-      end
-    end
-    [preposing.encode(@encoding), target.encode(@encoding), postposing.encode(@encoding)]
-  end
-
-  def confirm_multiline_termination
-    temp_buffer = @buffer_of_lines.dup
-    if @previous_line_index and @line_index == (@buffer_of_lines.size - 1)
-      temp_buffer[@previous_line_index] = @line
-    else
-      temp_buffer[@line_index] = @line
-    end
-    @confirm_multiline_termination_proc.(temp_buffer.join("\n") + "\n")
-  end
-
-  def insert_text(text)
-    width = calculate_width(text)
-    if @cursor == @cursor_max
-      @line += text
-    else
-      @line = byteinsert(@line, @byte_pointer, text)
-    end
-    @byte_pointer += text.bytesize
-    @cursor += width
-    @cursor_max += width
-  end
-
-  def delete_text(start = nil, length = nil)
-    if start.nil? and length.nil?
-      if @is_multiline
-        if @buffer_of_lines.size == 1
-          @line&.clear
-          @byte_pointer = 0
-          @cursor = 0
-          @cursor_max = 0
-        elsif @line_index == (@buffer_of_lines.size - 1) and @line_index > 0
-          @buffer_of_lines.pop
-          @line_index -= 1
-          @line = @buffer_of_lines[@line_index]
-          @byte_pointer = 0
-          @cursor = 0
-          @cursor_max = calculate_width(@line)
-        elsif @line_index < (@buffer_of_lines.size - 1)
-          @buffer_of_lines.delete_at(@line_index)
-          @line = @buffer_of_lines[@line_index]
-          @byte_pointer = 0
-          @cursor = 0
-          @cursor_max = calculate_width(@line)
-        end
-      else
-        @line&.clear
-        @byte_pointer = 0
-        @cursor = 0
-        @cursor_max = 0
-      end
-    elsif not start.nil? and not length.nil?
-      if @line
-        before = @line.byteslice(0, start)
-        after = @line.byteslice(start + length, @line.bytesize)
-        @line = before + after
-        @byte_pointer = @line.bytesize if @byte_pointer > @line.bytesize
-        str = @line.byteslice(0, @byte_pointer)
-        @cursor = calculate_width(str)
-        @cursor_max = calculate_width(@line)
-      end
-    elsif start.is_a?(Range)
-      range = start
-      first = range.first
-      last = range.last
-      last = @line.bytesize - 1 if last > @line.bytesize
-      last += @line.bytesize if last < 0
-      first += @line.bytesize if first < 0
-      range = range.exclude_end? ? first...last : first..last
-      @line = @line.bytes.reject.with_index{ |c, i| range.include?(i) }.map{ |c| c.chr(Encoding::ASCII_8BIT) }.join.force_encoding(@encoding)
-      @byte_pointer = @line.bytesize if @byte_pointer > @line.bytesize
-      str = @line.byteslice(0, @byte_pointer)
-      @cursor = calculate_width(str)
-      @cursor_max = calculate_width(@line)
-    else
-      @line = @line.byteslice(0, start)
-      @byte_pointer = @line.bytesize if @byte_pointer > @line.bytesize
-      str = @line.byteslice(0, @byte_pointer)
-      @cursor = calculate_width(str)
-      @cursor_max = calculate_width(@line)
-    end
-  end
-
-  def byte_pointer=(val)
-    @byte_pointer = val
-    str = @line.byteslice(0, @byte_pointer)
-    @cursor = calculate_width(str)
-    @cursor_max = calculate_width(@line)
-  end
-
-  def whole_lines
-    index = @previous_line_index || @line_index
-    temp_lines = @buffer_of_lines.dup
-    temp_lines[index] = @line
-    temp_lines
-  end
-
-  def whole_buffer
-    if @buffer_of_lines.size == 1 and @line.nil?
-      nil
-    else
-      whole_lines.join("\n")
-    end
-  end
-
-  def finished?
-    @finished
-  end
-
-  def finish
-    @finished = true
-    @rerender_all = true
-    @config.reset
-  end
-
-  private def byteslice!(str, byte_pointer, size)
-    new_str = str.byteslice(0, byte_pointer)
-    new_str << str.byteslice(byte_pointer + size, str.bytesize)
-    [new_str, str.byteslice(byte_pointer, size)]
-  end
-
-  private def byteinsert(str, byte_pointer, other)
-    new_str = str.byteslice(0, byte_pointer)
-    new_str << other
-    new_str << str.byteslice(byte_pointer, str.bytesize)
-    new_str
-  end
-
-  private def calculate_width(str, allow_escape_code = false)
-    Reline::Unicode.calculate_width(str, allow_escape_code)
-  end
-
-  private def key_delete(key)
-    if @config.editing_mode_is?(:vi_insert)
-      ed_delete_next_char(key)
-    elsif @config.editing_mode_is?(:emacs)
-      em_delete(key)
-    end
-  end
-
-  private def key_newline(key)
-    if @is_multiline
-      if (@buffer_of_lines.size - 1) == @line_index and @line.bytesize == @byte_pointer
-        @add_newline_to_end_of_buffer = true
-      end
-      next_line = @line.byteslice(@byte_pointer, @line.bytesize - @byte_pointer)
-      cursor_line = @line.byteslice(0, @byte_pointer)
-      insert_new_line(cursor_line, next_line)
-      @cursor = 0
-      @check_new_auto_indent = true unless @in_pasting
-    end
-  end
-
-  # Editline:: +ed-unassigned+ This  editor command always results in an error.
-  # GNU Readline:: There is no corresponding macro.
-  private def ed_unassigned(key) end # do nothing
-
-  private def process_insert(force: false)
-    return if @continuous_insertion_buffer.empty? or (@in_pasting and not force)
-    width = Reline::Unicode.calculate_width(@continuous_insertion_buffer)
-    bytesize = @continuous_insertion_buffer.bytesize
-    if @cursor == @cursor_max
-      @line += @continuous_insertion_buffer
-    else
-      @line = byteinsert(@line, @byte_pointer, @continuous_insertion_buffer)
-    end
-    @byte_pointer += bytesize
-    @cursor += width
-    @cursor_max += width
-    @continuous_insertion_buffer.clear
-  end
-
-  # Editline:: +ed-insert+ (vi input: almost all; emacs: printable characters)
-  #            In insert mode, insert the input character left of the cursor
-  #            position. In replace mode, overwrite the character at the
-  #            cursor and move the cursor to the right by one character
-  #            position. Accept an argument to do this repeatedly. It is an
-  #            error if the input character is the NUL character (+Ctrl-@+).
-  #            Failure to enlarge the edit buffer also results in an error.
-  # Editline:: +ed-digit+ (emacs: 0 to 9) If in argument input mode, append
-  #            the input digit to the argument being read. Otherwise, call
-  #            +ed-insert+. It is an error if the input character is not a
-  #            digit or if the existing argument is already greater than a
-  #            million.
-  # GNU Readline:: +self-insert+ (a, b, A, 1, !, …) Insert yourself.
-  private def ed_insert(key)
-    str = nil
-    width = nil
-    bytesize = nil
-    if key.instance_of?(String)
-      begin
-        key.encode(Encoding::UTF_8)
-      rescue Encoding::UndefinedConversionError
-        return
-      end
-      str = key
-      bytesize = key.bytesize
-    else
-      begin
-        key.chr.encode(Encoding::UTF_8)
-      rescue Encoding::UndefinedConversionError
-        return
-      end
-      str = key.chr
-      bytesize = 1
-    end
-    if @in_pasting
-      @continuous_insertion_buffer << str
-      return
-    elsif not @continuous_insertion_buffer.empty?
-      process_insert
-    end
-    width = Reline::Unicode.get_mbchar_width(str)
-    if @cursor == @cursor_max
-      @line += str
-    else
-      @line = byteinsert(@line, @byte_pointer, str)
-    end
-    last_byte_size = Reline::Unicode.get_prev_mbchar_size(@line, @byte_pointer)
-    @byte_pointer += bytesize
-    last_mbchar = @line.byteslice((@byte_pointer - bytesize - last_byte_size), last_byte_size)
-    combined_char = last_mbchar + str
-    if last_byte_size != 0 and combined_char.grapheme_clusters.size == 1
-      # combined char
-      last_mbchar_width = Reline::Unicode.get_mbchar_width(last_mbchar)
-      combined_char_width = Reline::Unicode.get_mbchar_width(combined_char)
-      if combined_char_width > last_mbchar_width
-        width = combined_char_width - last_mbchar_width
-      else
-        width = 0
-      end
-    end
-    @cursor += width
-    @cursor_max += width
-  end
-  alias_method :ed_digit, :ed_insert
-  alias_method :self_insert, :ed_insert
-
-  private def ed_quoted_insert(str, arg: 1)
-    @waiting_proc = proc { |key|
-      arg.times do
-        if key == "\C-j".ord or key == "\C-m".ord
-          key_newline(key)
-        elsif key == 0
-          # Ignore NUL.
-        else
-          ed_insert(key)
-        end
-      end
-      @waiting_proc = nil
-    }
-  end
-  alias_method :quoted_insert, :ed_quoted_insert
-
-  private def ed_next_char(key, arg: 1)
-    byte_size = Reline::Unicode.get_next_mbchar_size(@line, @byte_pointer)
-    if (@byte_pointer < @line.bytesize)
-      mbchar = @line.byteslice(@byte_pointer, byte_size)
-      width = Reline::Unicode.get_mbchar_width(mbchar)
-      @cursor += width if width
-      @byte_pointer += byte_size
-    elsif @is_multiline and @config.editing_mode_is?(:emacs) and @byte_pointer == @line.bytesize and @line_index < @buffer_of_lines.size - 1
-      next_line = @buffer_of_lines[@line_index + 1]
-      @cursor = 0
-      @byte_pointer = 0
-      @cursor_max = calculate_width(next_line)
-      @previous_line_index = @line_index
-      @line_index += 1
-    end
-    arg -= 1
-    ed_next_char(key, arg: arg) if arg > 0
-  end
-  alias_method :forward_char, :ed_next_char
-
-  private def ed_prev_char(key, arg: 1)
-    if @cursor > 0
-      byte_size = Reline::Unicode.get_prev_mbchar_size(@line, @byte_pointer)
-      @byte_pointer -= byte_size
-      mbchar = @line.byteslice(@byte_pointer, byte_size)
-      width = Reline::Unicode.get_mbchar_width(mbchar)
-      @cursor -= width
-    elsif @is_multiline and @config.editing_mode_is?(:emacs) and @byte_pointer == 0 and @line_index > 0
-      prev_line = @buffer_of_lines[@line_index - 1]
-      @cursor = calculate_width(prev_line)
-      @byte_pointer = prev_line.bytesize
-      @cursor_max = calculate_width(prev_line)
-      @previous_line_index = @line_index
-      @line_index -= 1
-    end
-    arg -= 1
-    ed_prev_char(key, arg: arg) if arg > 0
-  end
-  alias_method :backward_char, :ed_prev_char
-
-  private def vi_first_print(key)
-    @byte_pointer, @cursor = Reline::Unicode.vi_first_print(@line)
-  end
-
-  private def ed_move_to_beg(key)
-    @byte_pointer = @cursor = 0
-  end
-  alias_method :beginning_of_line, :ed_move_to_beg
-
-  private def ed_move_to_end(key)
-    @byte_pointer = 0
-    @cursor = 0
-    byte_size = 0
-    while @byte_pointer < @line.bytesize
-      byte_size = Reline::Unicode.get_next_mbchar_size(@line, @byte_pointer)
-      if byte_size > 0
-        mbchar = @line.byteslice(@byte_pointer, byte_size)
-        @cursor += Reline::Unicode.get_mbchar_width(mbchar)
-      end
-      @byte_pointer += byte_size
-    end
-  end
-  alias_method :end_of_line, :ed_move_to_end
-
-  private def generate_searcher
-    Fiber.new do |first_key|
-      prev_search_key = first_key
-      search_word = String.new(encoding: @encoding)
-      multibyte_buf = String.new(encoding: 'ASCII-8BIT')
-      last_hit = nil
-      case first_key
-      when "\C-r".ord
-        prompt_name = 'reverse-i-search'
-      when "\C-s".ord
-        prompt_name = 'i-search'
-      end
-      loop do
-        key = Fiber.yield(search_word)
-        search_again = false
-        case key
-        when -1 # determined
-          Reline.last_incremental_search = search_word
-          break
-        when "\C-h".ord, "\C-?".ord
-          grapheme_clusters = search_word.grapheme_clusters
-          if grapheme_clusters.size > 0
-            grapheme_clusters.pop
-            search_word = grapheme_clusters.join
-          end
-        when "\C-r".ord, "\C-s".ord
-          search_again = true if prev_search_key == key
-          prev_search_key = key
-        else
-          multibyte_buf << key
-          if multibyte_buf.dup.force_encoding(@encoding).valid_encoding?
-            search_word << multibyte_buf.dup.force_encoding(@encoding)
-            multibyte_buf.clear
-          end
-        end
-        hit = nil
-        if not search_word.empty? and @line_backup_in_history&.include?(search_word)
-          @history_pointer = nil
-          hit = @line_backup_in_history
-        else
-          if search_again
-            if search_word.empty? and Reline.last_incremental_search
-              search_word = Reline.last_incremental_search
-            end
-            if @history_pointer
-              case prev_search_key
-              when "\C-r".ord
-                history_pointer_base = 0
-                history = Reline::HISTORY[0..(@history_pointer - 1)]
-              when "\C-s".ord
-                history_pointer_base = @history_pointer + 1
-                history = Reline::HISTORY[(@history_pointer + 1)..-1]
-              end
-            else
-              history_pointer_base = 0
-              history = Reline::HISTORY
-            end
-          elsif @history_pointer
-            case prev_search_key
-            when "\C-r".ord
-              history_pointer_base = 0
-              history = Reline::HISTORY[0..@history_pointer]
-            when "\C-s".ord
-              history_pointer_base = @history_pointer
-              history = Reline::HISTORY[@history_pointer..-1]
-            end
-          else
-            history_pointer_base = 0
-            history = Reline::HISTORY
-          end
-          case prev_search_key
-          when "\C-r".ord
-            hit_index = history.rindex { |item|
-              item.include?(search_word)
-            }
-          when "\C-s".ord
-            hit_index = history.index { |item|
-              item.include?(search_word)
-            }
-          end
-          if hit_index
-            @history_pointer = history_pointer_base + hit_index
-            hit = Reline::HISTORY[@history_pointer]
-          end
-        end
-        case prev_search_key
-        when "\C-r".ord
-          prompt_name = 'reverse-i-search'
-        when "\C-s".ord
-          prompt_name = 'i-search'
-        end
-        if hit
-          if @is_multiline
-            @buffer_of_lines = hit.split("\n")
-            @buffer_of_lines = [String.new(encoding: @encoding)] if @buffer_of_lines.empty?
-            @line_index = @buffer_of_lines.size - 1
-            @line = @buffer_of_lines.last
-            @byte_pointer = @line.bytesize
-            @cursor = @cursor_max = calculate_width(@line)
-            @rerender_all = true
-            @searching_prompt = "(%s)`%s'" % [prompt_name, search_word]
-          else
-            @line = hit
-            @searching_prompt = "(%s)`%s': %s" % [prompt_name, search_word, hit]
-          end
-          last_hit = hit
-        else
-          if @is_multiline
-            @rerender_all = true
-            @searching_prompt = "(failed %s)`%s'" % [prompt_name, search_word]
-          else
-            @searching_prompt = "(failed %s)`%s': %s" % [prompt_name, search_word, last_hit]
-          end
-        end
-      end
-    end
-  end
-
-  private def incremental_search_history(key)
-    unless @history_pointer
-      if @is_multiline
-        @line_backup_in_history = whole_buffer
-      else
-        @line_backup_in_history = @line
-      end
-    end
-    searcher = generate_searcher
-    searcher.resume(key)
-    @searching_prompt = "(reverse-i-search)`': "
-    termination_keys = ["\C-j".ord]
-    termination_keys.concat(@config.isearch_terminators&.chars&.map(&:ord)) if @config.isearch_terminators
-    @waiting_proc = ->(k) {
-      case k
-      when *termination_keys
-        if @history_pointer
-          buffer = Reline::HISTORY[@history_pointer]
-        else
-          buffer = @line_backup_in_history
-        end
-        if @is_multiline
-          @buffer_of_lines = buffer.split("\n")
-          @buffer_of_lines = [String.new(encoding: @encoding)] if @buffer_of_lines.empty?
-          @line_index = @buffer_of_lines.size - 1
-          @line = @buffer_of_lines.last
-          @rerender_all = true
-        else
-          @line = buffer
-        end
-        @searching_prompt = nil
-        @waiting_proc = nil
-        @cursor_max = calculate_width(@line)
-        @cursor = @byte_pointer = 0
-        @rerender_all = true
-        @cached_prompt_list = nil
-        searcher.resume(-1)
-      when "\C-g".ord
-        if @is_multiline
-          @buffer_of_lines = @line_backup_in_history.split("\n")
-          @buffer_of_lines = [String.new(encoding: @encoding)] if @buffer_of_lines.empty?
-          @line_index = @buffer_of_lines.size - 1
-          @line = @buffer_of_lines.last
-          @rerender_all = true
-        else
-          @line = @line_backup_in_history
-        end
-        @history_pointer = nil
-        @searching_prompt = nil
-        @waiting_proc = nil
-        @line_backup_in_history = nil
-        @cursor_max = calculate_width(@line)
-        @cursor = @byte_pointer = 0
-        @rerender_all = true
-      else
-        chr = k.is_a?(String) ? k : k.chr(Encoding::ASCII_8BIT)
-        if chr.match?(/[[:print:]]/) or k == "\C-h".ord or k == "\C-?".ord or k == "\C-r".ord or k == "\C-s".ord
-          searcher.resume(k)
-        else
-          if @history_pointer
-            line = Reline::HISTORY[@history_pointer]
-          else
-            line = @line_backup_in_history
-          end
-          if @is_multiline
-            @line_backup_in_history = whole_buffer
-            @buffer_of_lines = line.split("\n")
-            @buffer_of_lines = [String.new(encoding: @encoding)] if @buffer_of_lines.empty?
-            @line_index = @buffer_of_lines.size - 1
-            @line = @buffer_of_lines.last
-            @rerender_all = true
-          else
-            @line_backup_in_history = @line
-            @line = line
-          end
-          @searching_prompt = nil
-          @waiting_proc = nil
-          @cursor_max = calculate_width(@line)
-          @cursor = @byte_pointer = 0
-          @rerender_all = true
-          @cached_prompt_list = nil
-          searcher.resume(-1)
-        end
-      end
-    }
-  end
-
-  private def vi_search_prev(key)
-    incremental_search_history(key)
-  end
-  alias_method :reverse_search_history, :vi_search_prev
-
-  private def vi_search_next(key)
-    incremental_search_history(key)
-  end
-  alias_method :forward_search_history, :vi_search_next
-
-  private def ed_search_prev_history(key, arg: 1)
-    history = nil
-    h_pointer = nil
-    line_no = nil
-    substr = @line.slice(0, @byte_pointer)
-    if @history_pointer.nil?
-      return if not @line.empty? and substr.empty?
-      history = Reline::HISTORY
-    elsif @history_pointer.zero?
-      history = nil
-      h_pointer = nil
-    else
-      history = Reline::HISTORY.slice(0, @history_pointer)
-    end
-    return if history.nil?
-    if @is_multiline
-      h_pointer = history.rindex { |h|
-        h.split("\n").each_with_index { |l, i|
-          if l.start_with?(substr)
-            line_no = i
-            break
-          end
-        }
-        not line_no.nil?
-      }
-    else
-      h_pointer = history.rindex { |l|
-        l.start_with?(substr)
-      }
-    end
-    return if h_pointer.nil?
-    @history_pointer = h_pointer
-    if @is_multiline
-      @buffer_of_lines = Reline::HISTORY[@history_pointer].split("\n")
-      @buffer_of_lines = [String.new(encoding: @encoding)] if @buffer_of_lines.empty?
-      @line_index = line_no
-      @line = @buffer_of_lines[@line_index]
-      @rerender_all = true
-    else
-      @line = Reline::HISTORY[@history_pointer]
-    end
-    @cursor_max = calculate_width(@line)
-    arg -= 1
-    ed_search_prev_history(key, arg: arg) if arg > 0
-  end
-  alias_method :history_search_backward, :ed_search_prev_history
-
-  private def ed_search_next_history(key, arg: 1)
-    substr = @line.slice(0, @byte_pointer)
-    if @history_pointer.nil?
-      return
-    elsif @history_pointer == (Reline::HISTORY.size - 1) and not substr.empty?
-      return
-    end
-    history = Reline::HISTORY.slice((@history_pointer + 1)..-1)
-    h_pointer = nil
-    line_no = nil
-    if @is_multiline
-      h_pointer = history.index { |h|
-        h.split("\n").each_with_index { |l, i|
-          if l.start_with?(substr)
-            line_no = i
-            break
-          end
-        }
-        not line_no.nil?
-      }
-    else
-      h_pointer = history.index { |l|
-        l.start_with?(substr)
-      }
-    end
-    h_pointer += @history_pointer + 1 if h_pointer and @history_pointer
-    return if h_pointer.nil? and not substr.empty?
-    @history_pointer = h_pointer
-    if @is_multiline
-      if @history_pointer.nil? and substr.empty?
-        @buffer_of_lines = []
-        @line_index = 0
-      else
-        @buffer_of_lines = Reline::HISTORY[@history_pointer].split("\n")
-        @line_index = line_no
-      end
-      @buffer_of_lines = [String.new(encoding: @encoding)] if @buffer_of_lines.empty?
-      @line = @buffer_of_lines[@line_index]
-      @rerender_all = true
-    else
-      if @history_pointer.nil? and substr.empty?
-        @line = ''
-      else
-        @line = Reline::HISTORY[@history_pointer]
-      end
-    end
-    @cursor_max = calculate_width(@line)
-    arg -= 1
-    ed_search_next_history(key, arg: arg) if arg > 0
-  end
-  alias_method :history_search_forward, :ed_search_next_history
-
-  private def ed_prev_history(key, arg: 1)
-    if @is_multiline and @line_index > 0
-      @previous_line_index = @line_index
-      @line_index -= 1
-      return
-    end
-    if Reline::HISTORY.empty?
-      return
-    end
-    if @history_pointer.nil?
-      @history_pointer = Reline::HISTORY.size - 1
-      if @is_multiline
-        @line_backup_in_history = whole_buffer
-        @buffer_of_lines = Reline::HISTORY[@history_pointer].split("\n")
-        @buffer_of_lines = [String.new(encoding: @encoding)] if @buffer_of_lines.empty?
-        @line_index = @buffer_of_lines.size - 1
-        @line = @buffer_of_lines.last
-        @rerender_all = true
-      else
-        @line_backup_in_history = @line
-        @line = Reline::HISTORY[@history_pointer]
-      end
-    elsif @history_pointer.zero?
-      return
-    else
-      if @is_multiline
-        Reline::HISTORY[@history_pointer] = whole_buffer
-        @history_pointer -= 1
-        @buffer_of_lines = Reline::HISTORY[@history_pointer].split("\n")
-        @buffer_of_lines = [String.new(encoding: @encoding)] if @buffer_of_lines.empty?
-        @line_index = @buffer_of_lines.size - 1
-        @line = @buffer_of_lines.last
-        @rerender_all = true
-      else
-        Reline::HISTORY[@history_pointer] = @line
-        @history_pointer -= 1
-        @line = Reline::HISTORY[@history_pointer]
-      end
-    end
-    if @config.editing_mode_is?(:emacs, :vi_insert)
-      @cursor_max = @cursor = calculate_width(@line)
-      @byte_pointer = @line.bytesize
-    elsif @config.editing_mode_is?(:vi_command)
-      @byte_pointer = @cursor = 0
-      @cursor_max = calculate_width(@line)
-    end
-    arg -= 1
-    ed_prev_history(key, arg: arg) if arg > 0
-  end
-  alias_method :previous_history, :ed_prev_history
-
-  private def ed_next_history(key, arg: 1)
-    if @is_multiline and @line_index < (@buffer_of_lines.size - 1)
-      @previous_line_index = @line_index
-      @line_index += 1
-      return
-    end
-    if @history_pointer.nil?
-      return
-    elsif @history_pointer == (Reline::HISTORY.size - 1)
-      if @is_multiline
-        @history_pointer = nil
-        @buffer_of_lines = @line_backup_in_history.split("\n")
-        @buffer_of_lines = [String.new(encoding: @encoding)] if @buffer_of_lines.empty?
-        @line_index = 0
-        @line = @buffer_of_lines.first
-        @rerender_all = true
-      else
-        @history_pointer = nil
-        @line = @line_backup_in_history
-      end
-    else
-      if @is_multiline
-        Reline::HISTORY[@history_pointer] = whole_buffer
-        @history_pointer += 1
-        @buffer_of_lines = Reline::HISTORY[@history_pointer].split("\n")
-        @buffer_of_lines = [String.new(encoding: @encoding)] if @buffer_of_lines.empty?
-        @line_index = 0
-        @line = @buffer_of_lines.first
-        @rerender_all = true
-      else
-        Reline::HISTORY[@history_pointer] = @line
-        @history_pointer += 1
-        @line = Reline::HISTORY[@history_pointer]
-      end
-    end
-    @line = '' unless @line
-    if @config.editing_mode_is?(:emacs, :vi_insert)
-      @cursor_max = @cursor = calculate_width(@line)
-      @byte_pointer = @line.bytesize
-    elsif @config.editing_mode_is?(:vi_command)
-      @byte_pointer = @cursor = 0
-      @cursor_max = calculate_width(@line)
-    end
-    arg -= 1
-    ed_next_history(key, arg: arg) if arg > 0
-  end
-  alias_method :next_history, :ed_next_history
-
-  private def ed_newline(key)
-    process_insert(force: true)
-    if @is_multiline
-      if @config.editing_mode_is?(:vi_command)
-        if @line_index < (@buffer_of_lines.size - 1)
-          ed_next_history(key) # means cursor down
-        else
-          # should check confirm_multiline_termination to finish?
-          finish
-        end
-      else
-        if @line_index == (@buffer_of_lines.size - 1)
-          if confirm_multiline_termination
-            finish
-          else
-            key_newline(key)
-          end
-        else
-          # should check confirm_multiline_termination to finish?
-          @previous_line_index = @line_index
-          @line_index = @buffer_of_lines.size - 1
-          finish
-        end
-      end
-    else
-      if @history_pointer
-        Reline::HISTORY[@history_pointer] = @line
-        @history_pointer = nil
-      end
-      finish
-    end
-  end
-
-  private def em_delete_prev_char(key, arg: 1)
-    if @is_multiline and @cursor == 0 and @line_index > 0
-      @buffer_of_lines[@line_index] = @line
-      @cursor = calculate_width(@buffer_of_lines[@line_index - 1])
-      @byte_pointer = @buffer_of_lines[@line_index - 1].bytesize
-      @buffer_of_lines[@line_index - 1] += @buffer_of_lines.delete_at(@line_index)
-      @line_index -= 1
-      @line = @buffer_of_lines[@line_index]
-      @cursor_max = calculate_width(@line)
-      @rerender_all = true
-    elsif @cursor > 0
-      byte_size = Reline::Unicode.get_prev_mbchar_size(@line, @byte_pointer)
-      @byte_pointer -= byte_size
-      @line, mbchar = byteslice!(@line, @byte_pointer, byte_size)
-      width = Reline::Unicode.get_mbchar_width(mbchar)
-      @cursor -= width
-      @cursor_max -= width
-    end
-    arg -= 1
-    em_delete_prev_char(key, arg: arg) if arg > 0
-  end
-  alias_method :backward_delete_char, :em_delete_prev_char
-
-  # Editline:: +ed-kill-line+ (vi command: +D+, +Ctrl-K+; emacs: +Ctrl-K+,
-  #            +Ctrl-U+) + Kill from the cursor to the end of the line.
-  # GNU Readline:: +kill-line+ (+C-k+) Kill the text from point to the end of
-  #                the line. With a negative numeric argument, kill backward
-  #                from the cursor to the beginning of the current line.
-  private def ed_kill_line(key)
-    if @line.bytesize > @byte_pointer
-      @line, deleted = byteslice!(@line, @byte_pointer, @line.bytesize - @byte_pointer)
-      @byte_pointer = @line.bytesize
-      @cursor = @cursor_max = calculate_width(@line)
-      @kill_ring.append(deleted)
-    elsif @is_multiline and @byte_pointer == @line.bytesize and @buffer_of_lines.size > @line_index + 1
-      @cursor = calculate_width(@line)
-      @byte_pointer = @line.bytesize
-      @line += @buffer_of_lines.delete_at(@line_index + 1)
-      @cursor_max = calculate_width(@line)
-      @buffer_of_lines[@line_index] = @line
-      @rerender_all = true
-      @rest_height += 1
-    end
-  end
-  alias_method :kill_line, :ed_kill_line
-
-  # Editline:: +vi-kill-line-prev+ (vi: +Ctrl-U+) Delete the string from the
-  #            beginning  of the edit buffer to the cursor and save it to the
-  #            cut buffer.
-  # GNU Readline:: +unix-line-discard+ (+C-u+) Kill backward from the cursor
-  #                to the beginning of the current line.
-  private def vi_kill_line_prev(key)
-    if @byte_pointer > 0
-      @line, deleted = byteslice!(@line, 0, @byte_pointer)
-      @byte_pointer = 0
-      @kill_ring.append(deleted, true)
-      @cursor_max = calculate_width(@line)
-      @cursor = 0
-    end
-  end
-  alias_method :unix_line_discard, :vi_kill_line_prev
-
-  # Editline:: +em-kill-line+ (not bound) Delete the entire contents of the
-  #            edit buffer and save it to the cut buffer. +vi-kill-line-prev+
-  # GNU Readline:: +kill-whole-line+ (not bound) Kill all characters on the
-  #                current line, no matter where point is.
-  private def em_kill_line(key)
-    if @line.size > 0
-      @kill_ring.append(@line.dup, true)
-      @line.clear
-      @byte_pointer = 0
-      @cursor_max = 0
-      @cursor = 0
-    end
-  end
-  alias_method :kill_whole_line, :em_kill_line
-
-  private def em_delete(key)
-    if @line.empty? and (not @is_multiline or @buffer_of_lines.size == 1) and key == "\C-d".ord
-      @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
-    elsif @byte_pointer < @line.bytesize
-      splitted_last = @line.byteslice(@byte_pointer, @line.bytesize)
-      mbchar = splitted_last.grapheme_clusters.first
-      width = Reline::Unicode.get_mbchar_width(mbchar)
-      @cursor_max -= width
-      @line, = byteslice!(@line, @byte_pointer, mbchar.bytesize)
-    elsif @is_multiline and @byte_pointer == @line.bytesize and @buffer_of_lines.size > @line_index + 1
-      @cursor = calculate_width(@line)
-      @byte_pointer = @line.bytesize
-      @line += @buffer_of_lines.delete_at(@line_index + 1)
-      @cursor_max = calculate_width(@line)
-      @buffer_of_lines[@line_index] = @line
-      @rerender_all = true
-      @rest_height += 1
-    end
-  end
-  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)
-        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
-    if yanked
-      @line = byteinsert(@line, @byte_pointer, yanked)
-      yanked_width = calculate_width(yanked)
-      @cursor += yanked_width
-      @cursor_max += yanked_width
-      @byte_pointer += yanked.bytesize
-    end
-  end
-  alias_method :yank, :em_yank
-
-  private def em_yank_pop(key)
-    yanked, prev_yank = @kill_ring.yank_pop
-    if yanked
-      prev_yank_width = calculate_width(prev_yank)
-      @cursor -= prev_yank_width
-      @cursor_max -= prev_yank_width
-      @byte_pointer -= prev_yank.bytesize
-      @line, = byteslice!(@line, @byte_pointer, prev_yank.bytesize)
-      @line = byteinsert(@line, @byte_pointer, yanked)
-      yanked_width = calculate_width(yanked)
-      @cursor += yanked_width
-      @cursor_max += yanked_width
-      @byte_pointer += yanked.bytesize
-    end
-  end
-  alias_method :yank_pop, :em_yank_pop
-
-  private def ed_clear_screen(key)
-    @cleared = true
-  end
-  alias_method :clear_screen, :ed_clear_screen
-
-  private def em_next_word(key)
-    if @line.bytesize > @byte_pointer
-      byte_size, width = Reline::Unicode.em_forward_word(@line, @byte_pointer)
-      @byte_pointer += byte_size
-      @cursor += width
-    end
-  end
-  alias_method :forward_word, :em_next_word
-
-  private def ed_prev_word(key)
-    if @byte_pointer > 0
-      byte_size, width = Reline::Unicode.em_backward_word(@line, @byte_pointer)
-      @byte_pointer -= byte_size
-      @cursor -= width
-    end
-  end
-  alias_method :backward_word, :ed_prev_word
-
-  private def em_delete_next_word(key)
-    if @line.bytesize > @byte_pointer
-      byte_size, width = Reline::Unicode.em_forward_word(@line, @byte_pointer)
-      @line, word = byteslice!(@line, @byte_pointer, byte_size)
-      @kill_ring.append(word)
-      @cursor_max -= width
-    end
-  end
-  alias_method :kill_word, :em_delete_next_word
-
-  private def ed_delete_prev_word(key)
-    if @byte_pointer > 0
-      byte_size, width = Reline::Unicode.em_backward_word(@line, @byte_pointer)
-      @line, word = byteslice!(@line, @byte_pointer - byte_size, byte_size)
-      @kill_ring.append(word, true)
-      @byte_pointer -= byte_size
-      @cursor -= width
-      @cursor_max -= width
-    end
-  end
-  alias_method :backward_kill_word, :ed_delete_prev_word
-
-  private def ed_transpose_chars(key)
-    if @byte_pointer > 0
-      if @cursor_max > @cursor
-        byte_size = Reline::Unicode.get_next_mbchar_size(@line, @byte_pointer)
-        mbchar = @line.byteslice(@byte_pointer, byte_size)
-        width = Reline::Unicode.get_mbchar_width(mbchar)
-        @cursor += width
-        @byte_pointer += byte_size
-      end
-      back1_byte_size = Reline::Unicode.get_prev_mbchar_size(@line, @byte_pointer)
-      if (@byte_pointer - back1_byte_size) > 0
-        back2_byte_size = Reline::Unicode.get_prev_mbchar_size(@line, @byte_pointer - back1_byte_size)
-        back2_pointer = @byte_pointer - back1_byte_size - back2_byte_size
-        @line, back2_mbchar = byteslice!(@line, back2_pointer, back2_byte_size)
-        @line = byteinsert(@line, @byte_pointer - back2_byte_size, back2_mbchar)
-      end
-    end
-  end
-  alias_method :transpose_chars, :ed_transpose_chars
-
-  private def ed_transpose_words(key)
-    left_word_start, middle_start, right_word_start, after_start = Reline::Unicode.ed_transpose_words(@line, @byte_pointer)
-    before = @line.byteslice(0, left_word_start)
-    left_word = @line.byteslice(left_word_start, middle_start - left_word_start)
-    middle = @line.byteslice(middle_start, right_word_start - middle_start)
-    right_word = @line.byteslice(right_word_start, after_start - right_word_start)
-    after = @line.byteslice(after_start, @line.bytesize - after_start)
-    return if left_word.empty? or right_word.empty?
-    @line = before + right_word + middle + left_word + after
-    from_head_to_left_word = before + right_word + middle + left_word
-    @byte_pointer = from_head_to_left_word.bytesize
-    @cursor = calculate_width(from_head_to_left_word)
-  end
-  alias_method :transpose_words, :ed_transpose_words
-
-  private def em_capitol_case(key)
-    if @line.bytesize > @byte_pointer
-      byte_size, _, new_str = Reline::Unicode.em_forward_word_with_capitalization(@line, @byte_pointer)
-      before = @line.byteslice(0, @byte_pointer)
-      after = @line.byteslice((@byte_pointer + byte_size)..-1)
-      @line = before + new_str + after
-      @byte_pointer += new_str.bytesize
-      @cursor += calculate_width(new_str)
-    end
-  end
-  alias_method :capitalize_word, :em_capitol_case
-
-  private def em_lower_case(key)
-    if @line.bytesize > @byte_pointer
-      byte_size, = Reline::Unicode.em_forward_word(@line, @byte_pointer)
-      part = @line.byteslice(@byte_pointer, byte_size).grapheme_clusters.map { |mbchar|
-        mbchar =~ /[A-Z]/ ? mbchar.downcase : mbchar
-      }.join
-      rest = @line.byteslice((@byte_pointer + byte_size)..-1)
-      @line = @line.byteslice(0, @byte_pointer) + part
-      @byte_pointer = @line.bytesize
-      @cursor = calculate_width(@line)
-      @cursor_max = @cursor + calculate_width(rest)
-      @line += rest
-    end
-  end
-  alias_method :downcase_word, :em_lower_case
-
-  private def em_upper_case(key)
-    if @line.bytesize > @byte_pointer
-      byte_size, = Reline::Unicode.em_forward_word(@line, @byte_pointer)
-      part = @line.byteslice(@byte_pointer, byte_size).grapheme_clusters.map { |mbchar|
-        mbchar =~ /[a-z]/ ? mbchar.upcase : mbchar
-      }.join
-      rest = @line.byteslice((@byte_pointer + byte_size)..-1)
-      @line = @line.byteslice(0, @byte_pointer) + part
-      @byte_pointer = @line.bytesize
-      @cursor = calculate_width(@line)
-      @cursor_max = @cursor + calculate_width(rest)
-      @line += rest
-    end
-  end
-  alias_method :upcase_word, :em_upper_case
-
-  private def em_kill_region(key)
-    if @byte_pointer > 0
-      byte_size, width = Reline::Unicode.em_big_backward_word(@line, @byte_pointer)
-      @line, deleted = byteslice!(@line, @byte_pointer - byte_size, byte_size)
-      @byte_pointer -= byte_size
-      @cursor -= width
-      @cursor_max -= width
-      @kill_ring.append(deleted, true)
-    end
-  end
-  alias_method :unix_word_rubout, :em_kill_region
-
-  private def copy_for_vi(text)
-    if @config.editing_mode_is?(:vi_insert) or @config.editing_mode_is?(:vi_command)
-      @vi_clipboard = text
-    end
-  end
-
-  private def vi_insert(key)
-    @config.editing_mode = :vi_insert
-  end
-
-  private def vi_add(key)
-    @config.editing_mode = :vi_insert
-    ed_next_char(key)
-  end
-
-  private def vi_command_mode(key)
-    ed_prev_char(key)
-    @config.editing_mode = :vi_command
-  end
-  alias_method :vi_movement_mode, :vi_command_mode
-
-  private def vi_next_word(key, arg: 1)
-    if @line.bytesize > @byte_pointer
-      byte_size, width = Reline::Unicode.vi_forward_word(@line, @byte_pointer, @drop_terminate_spaces)
-      @byte_pointer += byte_size
-      @cursor += width
-    end
-    arg -= 1
-    vi_next_word(key, arg: arg) if arg > 0
-  end
-
-  private def vi_prev_word(key, arg: 1)
-    if @byte_pointer > 0
-      byte_size, width = Reline::Unicode.vi_backward_word(@line, @byte_pointer)
-      @byte_pointer -= byte_size
-      @cursor -= width
-    end
-    arg -= 1
-    vi_prev_word(key, arg: arg) if arg > 0
-  end
-
-  private def vi_end_word(key, arg: 1, inclusive: false)
-    if @line.bytesize > @byte_pointer
-      byte_size, width = Reline::Unicode.vi_forward_end_word(@line, @byte_pointer)
-      @byte_pointer += byte_size
-      @cursor += width
-    end
-    arg -= 1
-    if inclusive and arg.zero?
-      byte_size = Reline::Unicode.get_next_mbchar_size(@line, @byte_pointer)
-      if byte_size > 0
-        c = @line.byteslice(@byte_pointer, byte_size)
-        width = Reline::Unicode.get_mbchar_width(c)
-        @byte_pointer += byte_size
-        @cursor += width
-      end
-    end
-    vi_end_word(key, arg: arg) if arg > 0
-  end
-
-  private def vi_next_big_word(key, arg: 1)
-    if @line.bytesize > @byte_pointer
-      byte_size, width = Reline::Unicode.vi_big_forward_word(@line, @byte_pointer)
-      @byte_pointer += byte_size
-      @cursor += width
-    end
-    arg -= 1
-    vi_next_big_word(key, arg: arg) if arg > 0
-  end
-
-  private def vi_prev_big_word(key, arg: 1)
-    if @byte_pointer > 0
-      byte_size, width = Reline::Unicode.vi_big_backward_word(@line, @byte_pointer)
-      @byte_pointer -= byte_size
-      @cursor -= width
-    end
-    arg -= 1
-    vi_prev_big_word(key, arg: arg) if arg > 0
-  end
-
-  private def vi_end_big_word(key, arg: 1, inclusive: false)
-    if @line.bytesize > @byte_pointer
-      byte_size, width = Reline::Unicode.vi_big_forward_end_word(@line, @byte_pointer)
-      @byte_pointer += byte_size
-      @cursor += width
-    end
-    arg -= 1
-    if inclusive and arg.zero?
-      byte_size = Reline::Unicode.get_next_mbchar_size(@line, @byte_pointer)
-      if byte_size > 0
-        c = @line.byteslice(@byte_pointer, byte_size)
-        width = Reline::Unicode.get_mbchar_width(c)
-        @byte_pointer += byte_size
-        @cursor += width
-      end
-    end
-    vi_end_big_word(key, arg: arg) if arg > 0
-  end
-
-  private def vi_delete_prev_char(key)
-    if @is_multiline and @cursor == 0 and @line_index > 0
-      @buffer_of_lines[@line_index] = @line
-      @cursor = calculate_width(@buffer_of_lines[@line_index - 1])
-      @byte_pointer = @buffer_of_lines[@line_index - 1].bytesize
-      @buffer_of_lines[@line_index - 1] += @buffer_of_lines.delete_at(@line_index)
-      @line_index -= 1
-      @line = @buffer_of_lines[@line_index]
-      @cursor_max = calculate_width(@line)
-      @rerender_all = true
-    elsif @cursor > 0
-      byte_size = Reline::Unicode.get_prev_mbchar_size(@line, @byte_pointer)
-      @byte_pointer -= byte_size
-      @line, mbchar = byteslice!(@line, @byte_pointer, byte_size)
-      width = Reline::Unicode.get_mbchar_width(mbchar)
-      @cursor -= width
-      @cursor_max -= width
-    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
-      if @cursor > 0
-        byte_size = Reline::Unicode.get_prev_mbchar_size(@line, @byte_pointer)
-        @byte_pointer -= byte_size
-        @line, mbchar = byteslice!(@line, @byte_pointer, byte_size)
-        deleted.prepend(mbchar)
-        width = Reline::Unicode.get_mbchar_width(mbchar)
-        @cursor -= width
-        @cursor_max -= width
-      end
-    end
-    copy_for_vi(deleted)
-  end
-
-  private def vi_zero(key)
-    @byte_pointer = 0
-    @cursor = 0
-  end
-
-  private def vi_change_meta(key, arg: 1)
-    @drop_terminate_spaces = true
-    @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
-      @drop_terminate_spaces = false
-    }
-    @waiting_operator_vi_arg = arg
-  end
-
-  private def vi_delete_meta(key, arg: 1)
-    @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
-    }
-    @waiting_operator_vi_arg = arg
-  end
-
-  private def vi_yank(key, arg: 1)
-    @waiting_operator_proc = proc { |cursor_diff, byte_pointer_diff|
-      if byte_pointer_diff > 0
-        cut = @line.byteslice(@byte_pointer, byte_pointer_diff)
-      elsif byte_pointer_diff < 0
-        cut = @line.byteslice(@byte_pointer + byte_pointer_diff, -byte_pointer_diff)
-      end
-      copy_for_vi(cut)
-    }
-    @waiting_operator_vi_arg = arg
-  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
-      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
-    else
-      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)
-    unless @line.empty? || byte_size == 0
-      @line, mbchar = byteslice!(@line, @byte_pointer, byte_size)
-      copy_for_vi(mbchar)
-      width = Reline::Unicode.get_mbchar_width(mbchar)
-      @cursor_max -= width
-      if @cursor > 0 and @cursor >= @cursor_max
-        byte_size = Reline::Unicode.get_prev_mbchar_size(@line, @byte_pointer)
-        mbchar = @line.byteslice(@byte_pointer - byte_size, byte_size)
-        width = Reline::Unicode.get_mbchar_width(mbchar)
-        @byte_pointer -= byte_size
-        @cursor -= width
-      end
-    end
-    arg -= 1
-    ed_delete_next_char(key, arg: arg) if arg > 0
-  end
-
-  private def vi_to_history_line(key)
-    if Reline::HISTORY.empty?
-      return
-    end
-    if @history_pointer.nil?
-      @history_pointer = 0
-      @line_backup_in_history = @line
-      @line = Reline::HISTORY[@history_pointer]
-      @cursor_max = calculate_width(@line)
-      @cursor = 0
-      @byte_pointer = 0
-    elsif @history_pointer.zero?
-      return
-    else
-      Reline::HISTORY[@history_pointer] = @line
-      @history_pointer = 0
-      @line = Reline::HISTORY[@history_pointer]
-      @cursor_max = calculate_width(@line)
-      @cursor = 0
-      @byte_pointer = 0
-    end
-  end
-
-  private def vi_histedit(key)
-    path = Tempfile.open { |fp|
-      if @is_multiline
-        fp.write whole_lines.join("\n")
-      else
-        fp.write @line
-      end
-      fp.path
-    }
-    system("#{ENV['EDITOR']} #{path}")
-    if @is_multiline
-      @buffer_of_lines = File.read(path).split("\n")
-      @buffer_of_lines = [String.new(encoding: @encoding)] if @buffer_of_lines.empty?
-      @line_index = 0
-      @line = @buffer_of_lines[@line_index]
-      @rerender_all = true
-    else
-      @line = File.read(path)
-    end
-    finish
-  end
-
-  private def vi_paste_prev(key, arg: 1)
-    if @vi_clipboard.size > 0
-      @line = byteinsert(@line, @byte_pointer, @vi_clipboard)
-      @cursor_max += calculate_width(@vi_clipboard)
-      cursor_point = @vi_clipboard.grapheme_clusters[0..-2].join
-      @cursor += calculate_width(cursor_point)
-      @byte_pointer += cursor_point.bytesize
-    end
-    arg -= 1
-    vi_paste_prev(key, arg: arg) if arg > 0
-  end
-
-  private def vi_paste_next(key, arg: 1)
-    if @vi_clipboard.size > 0
-      byte_size = Reline::Unicode.get_next_mbchar_size(@line, @byte_pointer)
-      @line = byteinsert(@line, @byte_pointer + byte_size, @vi_clipboard)
-      @cursor_max += calculate_width(@vi_clipboard)
-      @cursor += calculate_width(@vi_clipboard)
-      @byte_pointer += @vi_clipboard.bytesize
-    end
-    arg -= 1
-    vi_paste_next(key, arg: arg) if arg > 0
-  end
-
-  private def ed_argument_digit(key)
-    if @vi_arg.nil?
-      if key.chr.to_i.zero?
-        if key.anybits?(0b10000000)
-          unescaped_key = key ^ 0b10000000
-          unless unescaped_key.chr.to_i.zero?
-            @vi_arg = unescaped_key.chr.to_i
-          end
-        end
-      else
-        @vi_arg = key.chr.to_i
-      end
-    else
-      @vi_arg = @vi_arg * 10 + key.chr.to_i
-    end
-  end
-
-  private def vi_to_column(key, arg: 0)
-    @byte_pointer, @cursor = @line.grapheme_clusters.inject([0, 0]) { |total, gc|
-      # total has [byte_size, cursor]
-      mbchar_width = Reline::Unicode.get_mbchar_width(gc)
-      if (total.last + mbchar_width) >= arg
-        break total
-      elsif (total.last + mbchar_width) >= @cursor_max
-        break total
-      else
-        total = [total.first + gc.bytesize, total.last + mbchar_width]
-        total
-      end
-    }
-  end
-
-  private def vi_replace_char(key, arg: 1)
-    @waiting_proc = ->(k) {
-      if arg == 1
-        byte_size = Reline::Unicode.get_next_mbchar_size(@line, @byte_pointer)
-        before = @line.byteslice(0, @byte_pointer)
-        remaining_point = @byte_pointer + byte_size
-        after = @line.byteslice(remaining_point, @line.bytesize - remaining_point)
-        @line = before + k.chr + after
-        @cursor_max = calculate_width(@line)
-        @waiting_proc = nil
-      elsif arg > 1
-        byte_size = 0
-        arg.times do
-          byte_size += Reline::Unicode.get_next_mbchar_size(@line, @byte_pointer + byte_size)
-        end
-        before = @line.byteslice(0, @byte_pointer)
-        remaining_point = @byte_pointer + byte_size
-        after = @line.byteslice(remaining_point, @line.bytesize - remaining_point)
-        replaced = k.chr * arg
-        @line = before + replaced + after
-        @byte_pointer += replaced.bytesize
-        @cursor += calculate_width(replaced)
-        @cursor_max = calculate_width(@line)
-        @waiting_proc = nil
-      end
-    }
-  end
-
-  private def vi_next_char(key, arg: 1, inclusive: false)
-    @waiting_proc = ->(key_for_proc) { search_next_char(key_for_proc, arg, inclusive: inclusive) }
-  end
-
-  private def vi_to_next_char(key, arg: 1, inclusive: false)
-    @waiting_proc = ->(key_for_proc) { search_next_char(key_for_proc, arg, need_prev_char: true, inclusive: inclusive) }
-  end
-
-  private def search_next_char(key, arg, need_prev_char: false, inclusive: 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|
-      # 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_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
-    if inclusive
-      byte_size = Reline::Unicode.get_next_mbchar_size(@line, @byte_pointer)
-      if byte_size > 0
-        c = @line.byteslice(@byte_pointer, byte_size)
-        width = Reline::Unicode.get_mbchar_width(c)
-        @byte_pointer += byte_size
-        @cursor += width
-      end
-    end
-    @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)
-      @byte_pointer = @line.bytesize
-      @line += ' ' + @buffer_of_lines.delete_at(@line_index + 1).lstrip
-      @cursor_max = calculate_width(@line)
-      @buffer_of_lines[@line_index] = @line
-      @rerender_all = true
-      @rest_height += 1
-    end
-    arg -= 1
-    vi_join_lines(key, arg: arg) if arg > 0
-  end
-
-  private def em_set_mark(key)
-    @mark_pointer = [@byte_pointer, @line_index]
-  end
-  alias_method :set_mark, :em_set_mark
-
-  private def em_exchange_mark(key)
-    return unless @mark_pointer
-    new_pointer = [@byte_pointer, @line_index]
-    @previous_line_index = @line_index
-    @byte_pointer, @line_index = @mark_pointer
-    @cursor = calculate_width(@line.byteslice(0, @byte_pointer))
-    @cursor_max = calculate_width(@line)
-    @mark_pointer = new_pointer
-  end
-  alias_method :exchange_point_and_mark, :em_exchange_mark
-
-  private def em_meta_next(key)
-  end
-end
diff --git a/lib/reline/reline.gemspec b/lib/reline/reline.gemspec
deleted file mode 100644
index 7bf1f8758bf428..00000000000000
--- a/lib/reline/reline.gemspec
+++ /dev/null
@@ -1,25 +0,0 @@
-
-begin
-  require_relative 'lib/reline/version'
-rescue LoadError
-  require_relative 'version'
-end
-
-Gem::Specification.new do |spec|
-  spec.name          = 'reline'
-  spec.version       = Reline::VERSION
-  spec.authors       = ['aycabta']
-  spec.email         = ['aycabta@gmail.com']
-
-  spec.summary       = %q{Alternative GNU Readline or Editline implementation by pure Ruby.}
-  spec.description   = %q{Alternative GNU Readline or Editline implementation by pure Ruby.}
-  spec.homepage      = 'https://github.com/ruby/reline'
-  spec.license       = 'Ruby'
-
-  spec.files         = Dir['BSDL', 'COPYING', 'README.md', 'license_of_rb-readline', 'lib/**/*']
-  spec.require_paths = ['lib']
-
-  spec.required_ruby_version = Gem::Requirement.new('>= 2.6')
-
-  spec.add_dependency 'io-console', '~> 0.5'
-end
diff --git a/lib/reline/terminfo.rb b/lib/reline/terminfo.rb
deleted file mode 100644
index 2cfa32b9f7a9e0..00000000000000
--- a/lib/reline/terminfo.rb
+++ /dev/null
@@ -1,160 +0,0 @@
-begin
-  require 'fiddle'
-  require 'fiddle/import'
-rescue LoadError
-  module Reline::Terminfo
-    def self.curses_dl
-      false
-    end
-  end
-end
-
-module Reline::Terminfo
-  extend Fiddle::Importer
-
-  class TerminfoError < StandardError; end
-
-  def self.curses_dl_files
-    case RUBY_PLATFORM
-    when /mingw/, /mswin/
-      # aren't supported
-      []
-    when /cygwin/
-      %w[cygncursesw-10.dll cygncurses-10.dll]
-    when /darwin/
-      %w[libncursesw.dylib libcursesw.dylib libncurses.dylib libcurses.dylib]
-    else
-      %w[libncursesw.so libcursesw.so libncurses.so libcurses.so]
-    end
-  end
-
-  @curses_dl = false
-  def self.curses_dl
-    return @curses_dl unless @curses_dl == false
-    if Fiddle.const_defined?(:TYPE_VARIADIC)
-      curses_dl_files.each do |curses_name|
-        result = Fiddle::Handle.new(curses_name)
-      rescue Fiddle::DLError
-        next
-      else
-        @curses_dl = result
-        break
-      end
-    end
-    @curses_dl = nil if @curses_dl == false
-    @curses_dl
-  end
-end if not Reline.const_defined?(:Terminfo) or not Reline::Terminfo.respond_to?(:curses_dl)
-
-module Reline::Terminfo
-  dlload curses_dl
-  #extern 'int setupterm(char *term, int fildes, int *errret)'
-  @setupterm = Fiddle::Function.new(curses_dl['setupterm'], [Fiddle::TYPE_VOIDP, Fiddle::TYPE_INT, Fiddle::TYPE_VOIDP], Fiddle::TYPE_INT)
-  #extern 'char *tigetstr(char *capname)'
-  @tigetstr = Fiddle::Function.new(curses_dl['tigetstr'], [Fiddle::TYPE_VOIDP], Fiddle::TYPE_VOIDP)
-  begin
-    #extern 'char *tiparm(const char *str, ...)'
-    @tiparm = Fiddle::Function.new(curses_dl['tiparm'], [Fiddle::TYPE_VOIDP, Fiddle::TYPE_VARIADIC], Fiddle::TYPE_VOIDP)
-  rescue Fiddle::DLError
-    # OpenBSD lacks tiparm
-    #extern 'char *tparm(const char *str, ...)'
-    @tiparm = Fiddle::Function.new(curses_dl['tparm'], [Fiddle::TYPE_VOIDP, Fiddle::TYPE_VARIADIC], Fiddle::TYPE_VOIDP)
-  end
-  begin
-    #extern 'int tigetflag(char *str)'
-    @tigetflag = Fiddle::Function.new(curses_dl['tigetflag'], [Fiddle::TYPE_VOIDP], Fiddle::TYPE_INT)
-  rescue Fiddle::DLError
-    # OpenBSD lacks tigetflag
-    #extern 'int tgetflag(char *str)'
-    @tigetflag = Fiddle::Function.new(curses_dl['tgetflag'], [Fiddle::TYPE_VOIDP], Fiddle::TYPE_INT)
-  end
-  begin
-    #extern 'int tigetnum(char *str)'
-    @tigetnum = Fiddle::Function.new(curses_dl['tigetnum'], [Fiddle::TYPE_VOIDP], Fiddle::TYPE_INT)
-  rescue Fiddle::DLError
-    # OpenBSD lacks tigetnum
-    #extern 'int tgetnum(char *str)'
-    @tigetnum = Fiddle::Function.new(curses_dl['tgetnum'], [Fiddle::TYPE_VOIDP], Fiddle::TYPE_INT)
-  end
-
-  def self.setupterm(term, fildes)
-    errret_int = Fiddle::Pointer.malloc(Fiddle::SIZEOF_INT)
-    ret = @setupterm.(term, fildes, errret_int)
-    errret = errret_int[0, Fiddle::SIZEOF_INT].unpack1('i')
-    case ret
-    when 0 # OK
-      0
-    when -1 # ERR
-      case errret
-      when 1
-        raise TerminfoError.new('The terminal is hardcopy, cannot be used for curses applications.')
-      when 0
-        raise TerminfoError.new('The terminal could not be found, or that it is a generic type, having too little information for curses applications to run.')
-      when -1
-        raise TerminfoError.new('The terminfo database could not be found.')
-      else # unknown
-        -1
-      end
-    else # unknown
-      -2
-    end
-  end
-
-  class StringWithTiparm < String
-    def tiparm(*args) # for method chain
-      Reline::Terminfo.tiparm(self, *args)
-    end
-  end
-
-  def self.tigetstr(capname)
-    raise TerminfoError, "capname is not String: #{capname.inspect}" unless capname.is_a?(String)
-    capability = @tigetstr.(capname)
-    case capability.to_i
-    when 0, -1
-      raise TerminfoError, "can't find capability: #{capname}"
-    end
-    StringWithTiparm.new(capability.to_s)
-  end
-
-  def self.tiparm(str, *args)
-    new_args = []
-    args.each do |a|
-      new_args << Fiddle::TYPE_INT << a
-    end
-    @tiparm.(str, *new_args).to_s
-  end
-
-  def self.tigetflag(capname)
-    raise TerminfoError, "capname is not String: #{capname.inspect}" unless capname.is_a?(String)
-    flag = @tigetflag.(capname).to_i
-    case flag
-    when -1
-      raise TerminfoError, "not boolean capability: #{capname}"
-    when 0
-      raise TerminfoError, "can't find capability: #{capname}"
-    end
-    flag
-  end
-
-  def self.tigetnum(capname)
-    raise TerminfoError, "capname is not String: #{capname.inspect}" unless capname.is_a?(String)
-    num = @tigetnum.(capname).to_i
-    case num
-    when -2
-      raise TerminfoError, "not numeric capability: #{capname}"
-    when -1
-      raise TerminfoError, "can't find capability: #{capname}"
-    end
-    num
-  end
-
-  def self.enabled?
-    true
-  end
-end if Reline::Terminfo.curses_dl
-
-module Reline::Terminfo
-  def self.enabled?
-    false
-  end
-end unless Reline::Terminfo.curses_dl
diff --git a/lib/reline/unicode.rb b/lib/reline/unicode.rb
deleted file mode 100644
index 26ef207ba6fe98..00000000000000
--- a/lib/reline/unicode.rb
+++ /dev/null
@@ -1,642 +0,0 @@
-class Reline::Unicode
-  EscapedPairs = {
-    0x00 => '^@',
-    0x01 => '^A', # C-a
-    0x02 => '^B',
-    0x03 => '^C',
-    0x04 => '^D',
-    0x05 => '^E',
-    0x06 => '^F',
-    0x07 => '^G',
-    0x08 => '^H', # Backspace
-    0x09 => '^I',
-    0x0A => '^J',
-    0x0B => '^K',
-    0x0C => '^L',
-    0x0D => '^M', # Enter
-    0x0E => '^N',
-    0x0F => '^O',
-    0x10 => '^P',
-    0x11 => '^Q',
-    0x12 => '^R',
-    0x13 => '^S',
-    0x14 => '^T',
-    0x15 => '^U',
-    0x16 => '^V',
-    0x17 => '^W',
-    0x18 => '^X',
-    0x19 => '^Y',
-    0x1A => '^Z', # C-z
-    0x1B => '^[', # C-[ C-3
-    0x1D => '^]', # C-]
-    0x1E => '^^', # C-~ C-6
-    0x1F => '^_', # C-_ C-7
-    0x7F => '^?', # C-? C-8
-  }
-  EscapedChars = EscapedPairs.keys.map(&:chr)
-
-  NON_PRINTING_START = "\1"
-  NON_PRINTING_END = "\2"
-  CSI_REGEXP = /\e\[[\d;]*[ABCDEFGHJKSTfminsuhl]/
-  OSC_REGEXP = /\e\]\d+(?:;[^;\a\e]+)*(?:\a|\e\\)/
-  WIDTH_SCANNER = /\G(?:(#{NON_PRINTING_START})|(#{NON_PRINTING_END})|(#{CSI_REGEXP})|(#{OSC_REGEXP})|(\X))/o
-
-  def self.escape_for_print(str)
-    str.chars.map! { |gr|
-      escaped = EscapedPairs[gr.ord]
-      if escaped && gr != -"\n" && gr != -"\t"
-        escaped
-      else
-        gr
-      end
-    }.join
-  end
-
-  require 'reline/unicode/east_asian_width'
-
-  HalfwidthDakutenHandakuten = /[\u{FF9E}\u{FF9F}]/
-
-  MBCharWidthRE = /
-    (?<width_2_1>
-      [#{ EscapedChars.map {|c| "\\x%02x" % c.ord }.join }] (?# ^ + char, such as ^M, ^H, ^[, ...)
-    )
-  | (?<width_3>^\u{2E3B}) (?# THREE-EM DASH)
-  | (?<width_0>^\p{M})
-  | (?<width_2_2>
-      #{ EastAsianWidth::TYPE_F }
-    | #{ EastAsianWidth::TYPE_W }
-    )
-  | (?<width_1>
-      #{ EastAsianWidth::TYPE_H }
-    | #{ EastAsianWidth::TYPE_NA }
-    | #{ EastAsianWidth::TYPE_N }
-    )(?!#{ HalfwidthDakutenHandakuten })
-  | (?<width_2_3>
-      (?: #{ EastAsianWidth::TYPE_H }
-        | #{ EastAsianWidth::TYPE_NA }
-        | #{ EastAsianWidth::TYPE_N })
-      #{ HalfwidthDakutenHandakuten }
-    )
-  | (?<ambiguous_width>
-      #{EastAsianWidth::TYPE_A}
-    )
-  /x
-
-  def self.get_mbchar_width(mbchar)
-    ord = mbchar.ord
-    if (0x00 <= ord and ord <= 0x1F) # in EscapedPairs
-      return 2
-    elsif (0x20 <= ord and ord <= 0x7E) # printable ASCII chars
-      return 1
-    end
-    m = mbchar.encode(Encoding::UTF_8).match(MBCharWidthRE)
-    case
-    when m.nil? then 1 # TODO should be U+FFFD � REPLACEMENT CHARACTER
-    when m[:width_2_1], m[:width_2_2], m[:width_2_3] then 2
-    when m[:width_3] then 3
-    when m[:width_0] then 0
-    when m[:width_1] then 1
-    when m[:ambiguous_width] then Reline.ambiguous_width
-    else
-      nil
-    end
-  end
-
-  def self.calculate_width(str, allow_escape_code = false)
-    if allow_escape_code
-      width = 0
-      rest = str.encode(Encoding::UTF_8)
-      in_zero_width = false
-      rest.scan(WIDTH_SCANNER) do |non_printing_start, non_printing_end, csi, osc, gc|
-        case
-        when non_printing_start
-          in_zero_width = true
-        when non_printing_end
-          in_zero_width = false
-        when csi, osc
-        when gc
-          unless in_zero_width
-            width += get_mbchar_width(gc)
-          end
-        end
-      end
-      width
-    else
-      str.encode(Encoding::UTF_8).grapheme_clusters.inject(0) { |w, gc|
-        w + get_mbchar_width(gc)
-      }
-    end
-  end
-
-  def self.split_by_width(str, max_width, encoding = str.encoding)
-    lines = [String.new(encoding: encoding)]
-    height = 1
-    width = 0
-    rest = str.encode(Encoding::UTF_8)
-    in_zero_width = false
-    seq = String.new(encoding: encoding)
-    rest.scan(WIDTH_SCANNER) do |non_printing_start, non_printing_end, csi, osc, gc|
-      case
-      when non_printing_start
-        in_zero_width = true
-        lines.last << NON_PRINTING_START
-      when non_printing_end
-        in_zero_width = false
-        lines.last << NON_PRINTING_END
-      when csi
-        lines.last << csi
-        seq << csi
-      when osc
-        lines.last << osc
-        seq << osc
-      when gc
-        unless in_zero_width
-          mbchar_width = get_mbchar_width(gc)
-          if (width += mbchar_width) > max_width
-            width = mbchar_width
-            lines << nil
-            lines << seq.dup
-            height += 1
-          end
-        end
-        lines.last << gc
-      end
-    end
-    # The cursor moves to next line in first
-    if width == max_width
-      lines << nil
-      lines << String.new(encoding: encoding)
-      height += 1
-    end
-    [lines, height]
-  end
-
-  # Take a chunk of a String cut by width with escape sequences.
-  def self.take_range(str, start_col, max_width)
-    chunk = String.new(encoding: str.encoding)
-    total_width = 0
-    rest = str.encode(Encoding::UTF_8)
-    in_zero_width = false
-    rest.scan(WIDTH_SCANNER) do |non_printing_start, non_printing_end, csi, osc, gc|
-      case
-      when non_printing_start
-        in_zero_width = true
-      when non_printing_end
-        in_zero_width = false
-      when csi
-        chunk << csi
-      when osc
-        chunk << osc
-      when gc
-        if in_zero_width
-          chunk << gc
-        else
-          mbchar_width = get_mbchar_width(gc)
-          total_width += mbchar_width
-          break if (start_col + max_width) < total_width
-          chunk << gc if start_col < total_width
-        end
-      end
-    end
-    chunk
-  end
-
-  def self.get_next_mbchar_size(line, byte_pointer)
-    grapheme = line.byteslice(byte_pointer..-1).grapheme_clusters.first
-    grapheme ? grapheme.bytesize : 0
-  end
-
-  def self.get_prev_mbchar_size(line, byte_pointer)
-    if byte_pointer.zero?
-      0
-    else
-      grapheme = line.byteslice(0..(byte_pointer - 1)).grapheme_clusters.last
-      grapheme ? grapheme.bytesize : 0
-    end
-  end
-
-  def self.em_forward_word(line, byte_pointer)
-    width = 0
-    byte_size = 0
-    while line.bytesize > (byte_pointer + byte_size)
-      size = get_next_mbchar_size(line, byte_pointer + byte_size)
-      mbchar = line.byteslice(byte_pointer + byte_size, size)
-      break if mbchar.encode(Encoding::UTF_8) =~ /\p{Word}/
-      width += get_mbchar_width(mbchar)
-      byte_size += size
-    end
-    while line.bytesize > (byte_pointer + byte_size)
-      size = get_next_mbchar_size(line, byte_pointer + byte_size)
-      mbchar = line.byteslice(byte_pointer + byte_size, size)
-      break if mbchar.encode(Encoding::UTF_8) =~ /\P{Word}/
-      width += get_mbchar_width(mbchar)
-      byte_size += size
-    end
-    [byte_size, width]
-  end
-
-  def self.em_forward_word_with_capitalization(line, byte_pointer)
-    width = 0
-    byte_size = 0
-    new_str = String.new
-    while line.bytesize > (byte_pointer + byte_size)
-      size = get_next_mbchar_size(line, byte_pointer + byte_size)
-      mbchar = line.byteslice(byte_pointer + byte_size, size)
-      break if mbchar.encode(Encoding::UTF_8) =~ /\p{Word}/
-      new_str += mbchar
-      width += get_mbchar_width(mbchar)
-      byte_size += size
-    end
-    first = true
-    while line.bytesize > (byte_pointer + byte_size)
-      size = get_next_mbchar_size(line, byte_pointer + byte_size)
-      mbchar = line.byteslice(byte_pointer + byte_size, size)
-      break if mbchar.encode(Encoding::UTF_8) =~ /\P{Word}/
-      if first
-        new_str += mbchar.upcase
-        first = false
-      else
-        new_str += mbchar.downcase
-      end
-      width += get_mbchar_width(mbchar)
-      byte_size += size
-    end
-    [byte_size, width, new_str]
-  end
-
-  def self.em_backward_word(line, byte_pointer)
-    width = 0
-    byte_size = 0
-    while 0 < (byte_pointer - byte_size)
-      size = get_prev_mbchar_size(line, byte_pointer - byte_size)
-      mbchar = line.byteslice(byte_pointer - byte_size - size, size)
-      break if mbchar.encode(Encoding::UTF_8) =~ /\p{Word}/
-      width += get_mbchar_width(mbchar)
-      byte_size += size
-    end
-    while 0 < (byte_pointer - byte_size)
-      size = get_prev_mbchar_size(line, byte_pointer - byte_size)
-      mbchar = line.byteslice(byte_pointer - byte_size - size, size)
-      break if mbchar.encode(Encoding::UTF_8) =~ /\P{Word}/
-      width += get_mbchar_width(mbchar)
-      byte_size += size
-    end
-    [byte_size, width]
-  end
-
-  def self.em_big_backward_word(line, byte_pointer)
-    width = 0
-    byte_size = 0
-    while 0 < (byte_pointer - byte_size)
-      size = get_prev_mbchar_size(line, byte_pointer - byte_size)
-      mbchar = line.byteslice(byte_pointer - byte_size - size, size)
-      break if mbchar =~ /\S/
-      width += get_mbchar_width(mbchar)
-      byte_size += size
-    end
-    while 0 < (byte_pointer - byte_size)
-      size = get_prev_mbchar_size(line, byte_pointer - byte_size)
-      mbchar = line.byteslice(byte_pointer - byte_size - size, size)
-      break if mbchar =~ /\s/
-      width += get_mbchar_width(mbchar)
-      byte_size += size
-    end
-    [byte_size, width]
-  end
-
-  def self.ed_transpose_words(line, byte_pointer)
-    right_word_start = nil
-    size = get_next_mbchar_size(line, byte_pointer)
-    mbchar = line.byteslice(byte_pointer, size)
-    if size.zero?
-      # ' aaa bbb [cursor]'
-      byte_size = 0
-      while 0 < (byte_pointer + byte_size)
-        size = get_prev_mbchar_size(line, byte_pointer + byte_size)
-        mbchar = line.byteslice(byte_pointer + byte_size - size, size)
-        break if mbchar.encode(Encoding::UTF_8) =~ /\p{Word}/
-        byte_size -= size
-      end
-      while 0 < (byte_pointer + byte_size)
-        size = get_prev_mbchar_size(line, byte_pointer + byte_size)
-        mbchar = line.byteslice(byte_pointer + byte_size - size, size)
-        break if mbchar.encode(Encoding::UTF_8) =~ /\P{Word}/
-        byte_size -= size
-      end
-      right_word_start = byte_pointer + byte_size
-      byte_size = 0
-      while line.bytesize > (byte_pointer + byte_size)
-        size = get_next_mbchar_size(line, byte_pointer + byte_size)
-        mbchar = line.byteslice(byte_pointer + byte_size, size)
-        break if mbchar.encode(Encoding::UTF_8) =~ /\P{Word}/
-        byte_size += size
-      end
-      after_start = byte_pointer + byte_size
-    elsif mbchar.encode(Encoding::UTF_8) =~ /\p{Word}/
-      # ' aaa bb[cursor]b'
-      byte_size = 0
-      while 0 < (byte_pointer + byte_size)
-        size = get_prev_mbchar_size(line, byte_pointer + byte_size)
-        mbchar = line.byteslice(byte_pointer + byte_size - size, size)
-        break if mbchar.encode(Encoding::UTF_8) =~ /\P{Word}/
-        byte_size -= size
-      end
-      right_word_start = byte_pointer + byte_size
-      byte_size = 0
-      while line.bytesize > (byte_pointer + byte_size)
-        size = get_next_mbchar_size(line, byte_pointer + byte_size)
-        mbchar = line.byteslice(byte_pointer + byte_size, size)
-        break if mbchar.encode(Encoding::UTF_8) =~ /\P{Word}/
-        byte_size += size
-      end
-      after_start = byte_pointer + byte_size
-    else
-      byte_size = 0
-      while (line.bytesize - 1) > (byte_pointer + byte_size)
-        size = get_next_mbchar_size(line, byte_pointer + byte_size)
-        mbchar = line.byteslice(byte_pointer + byte_size, size)
-        break if mbchar.encode(Encoding::UTF_8) =~ /\p{Word}/
-        byte_size += size
-      end
-      if (byte_pointer + byte_size) == (line.bytesize - 1)
-        # ' aaa bbb [cursor] '
-        after_start = line.bytesize
-        while 0 < (byte_pointer + byte_size)
-          size = get_prev_mbchar_size(line, byte_pointer + byte_size)
-          mbchar = line.byteslice(byte_pointer + byte_size - size, size)
-          break if mbchar.encode(Encoding::UTF_8) =~ /\p{Word}/
-          byte_size -= size
-        end
-        while 0 < (byte_pointer + byte_size)
-          size = get_prev_mbchar_size(line, byte_pointer + byte_size)
-          mbchar = line.byteslice(byte_pointer + byte_size - size, size)
-          break if mbchar.encode(Encoding::UTF_8) =~ /\P{Word}/
-          byte_size -= size
-        end
-        right_word_start = byte_pointer + byte_size
-      else
-        # ' aaa [cursor] bbb '
-        right_word_start = byte_pointer + byte_size
-        while line.bytesize > (byte_pointer + byte_size)
-          size = get_next_mbchar_size(line, byte_pointer + byte_size)
-          mbchar = line.byteslice(byte_pointer + byte_size, size)
-          break if mbchar.encode(Encoding::UTF_8) =~ /\P{Word}/
-          byte_size += size
-        end
-        after_start = byte_pointer + byte_size
-      end
-    end
-    byte_size = right_word_start - byte_pointer
-    while 0 < (byte_pointer + byte_size)
-      size = get_prev_mbchar_size(line, byte_pointer + byte_size)
-      mbchar = line.byteslice(byte_pointer + byte_size - size, size)
-      break if mbchar.encode(Encoding::UTF_8) =~ /\p{Word}/
-      byte_size -= size
-    end
-    middle_start = byte_pointer + byte_size
-    byte_size = middle_start - byte_pointer
-    while 0 < (byte_pointer + byte_size)
-      size = get_prev_mbchar_size(line, byte_pointer + byte_size)
-      mbchar = line.byteslice(byte_pointer + byte_size - size, size)
-      break if mbchar.encode(Encoding::UTF_8) =~ /\P{Word}/
-      byte_size -= size
-    end
-    left_word_start = byte_pointer + byte_size
-    [left_word_start, middle_start, right_word_start, after_start]
-  end
-
-  def self.vi_big_forward_word(line, byte_pointer)
-    width = 0
-    byte_size = 0
-    while (line.bytesize - 1) > (byte_pointer + byte_size)
-      size = get_next_mbchar_size(line, byte_pointer + byte_size)
-      mbchar = line.byteslice(byte_pointer + byte_size, size)
-      break if mbchar =~ /\s/
-      width += get_mbchar_width(mbchar)
-      byte_size += size
-    end
-    while (line.bytesize - 1) > (byte_pointer + byte_size)
-      size = get_next_mbchar_size(line, byte_pointer + byte_size)
-      mbchar = line.byteslice(byte_pointer + byte_size, size)
-      break if mbchar =~ /\S/
-      width += get_mbchar_width(mbchar)
-      byte_size += size
-    end
-    [byte_size, width]
-  end
-
-  def self.vi_big_forward_end_word(line, byte_pointer)
-    if (line.bytesize - 1) > byte_pointer
-      size = get_next_mbchar_size(line, byte_pointer)
-      mbchar = line.byteslice(byte_pointer, size)
-      width = get_mbchar_width(mbchar)
-      byte_size = size
-    else
-      return [0, 0]
-    end
-    while (line.bytesize - 1) > (byte_pointer + byte_size)
-      size = get_next_mbchar_size(line, byte_pointer + byte_size)
-      mbchar = line.byteslice(byte_pointer + byte_size, size)
-      break if mbchar =~ /\S/
-      width += get_mbchar_width(mbchar)
-      byte_size += size
-    end
-    prev_width = width
-    prev_byte_size = byte_size
-    while line.bytesize > (byte_pointer + byte_size)
-      size = get_next_mbchar_size(line, byte_pointer + byte_size)
-      mbchar = line.byteslice(byte_pointer + byte_size, size)
-      break if mbchar =~ /\s/
-      prev_width = width
-      prev_byte_size = byte_size
-      width += get_mbchar_width(mbchar)
-      byte_size += size
-    end
-    [prev_byte_size, prev_width]
-  end
-
-  def self.vi_big_backward_word(line, byte_pointer)
-    width = 0
-    byte_size = 0
-    while 0 < (byte_pointer - byte_size)
-      size = get_prev_mbchar_size(line, byte_pointer - byte_size)
-      mbchar = line.byteslice(byte_pointer - byte_size - size, size)
-      break if mbchar =~ /\S/
-      width += get_mbchar_width(mbchar)
-      byte_size += size
-    end
-    while 0 < (byte_pointer - byte_size)
-      size = get_prev_mbchar_size(line, byte_pointer - byte_size)
-      mbchar = line.byteslice(byte_pointer - byte_size - size, size)
-      break if mbchar =~ /\s/
-      width += get_mbchar_width(mbchar)
-      byte_size += size
-    end
-    [byte_size, width]
-  end
-
-  def self.vi_forward_word(line, byte_pointer, drop_terminate_spaces = false)
-    if line.bytesize > byte_pointer
-      size = get_next_mbchar_size(line, byte_pointer)
-      mbchar = line.byteslice(byte_pointer, size)
-      if mbchar =~ /\w/
-        started_by = :word
-      elsif mbchar =~ /\s/
-        started_by = :space
-      else
-        started_by = :non_word_printable
-      end
-      width = get_mbchar_width(mbchar)
-      byte_size = size
-    else
-      return [0, 0]
-    end
-    while line.bytesize > (byte_pointer + byte_size)
-      size = get_next_mbchar_size(line, byte_pointer + byte_size)
-      mbchar = line.byteslice(byte_pointer + byte_size, size)
-      case started_by
-      when :word
-        break if mbchar =~ /\W/
-      when :space
-        break if mbchar =~ /\S/
-      when :non_word_printable
-        break if mbchar =~ /\w|\s/
-      end
-      width += get_mbchar_width(mbchar)
-      byte_size += size
-    end
-    return [byte_size, width] if drop_terminate_spaces
-    while line.bytesize > (byte_pointer + byte_size)
-      size = get_next_mbchar_size(line, byte_pointer + byte_size)
-      mbchar = line.byteslice(byte_pointer + byte_size, size)
-      break if mbchar =~ /\S/
-      width += get_mbchar_width(mbchar)
-      byte_size += size
-    end
-    [byte_size, width]
-  end
-
-  def self.vi_forward_end_word(line, byte_pointer)
-    if (line.bytesize - 1) > byte_pointer
-      size = get_next_mbchar_size(line, byte_pointer)
-      mbchar = line.byteslice(byte_pointer, size)
-      if mbchar =~ /\w/
-        started_by = :word
-      elsif mbchar =~ /\s/
-        started_by = :space
-      else
-        started_by = :non_word_printable
-      end
-      width = get_mbchar_width(mbchar)
-      byte_size = size
-    else
-      return [0, 0]
-    end
-    if (line.bytesize - 1) > (byte_pointer + byte_size)
-      size = get_next_mbchar_size(line, byte_pointer + byte_size)
-      mbchar = line.byteslice(byte_pointer + byte_size, size)
-      if mbchar =~ /\w/
-        second = :word
-      elsif mbchar =~ /\s/
-        second = :space
-      else
-        second = :non_word_printable
-      end
-      second_width = get_mbchar_width(mbchar)
-      second_byte_size = size
-    else
-      return [byte_size, width]
-    end
-    if second == :space
-      width += second_width
-      byte_size += second_byte_size
-      while (line.bytesize - 1) > (byte_pointer + byte_size)
-        size = get_next_mbchar_size(line, byte_pointer + byte_size)
-        mbchar = line.byteslice(byte_pointer + byte_size, size)
-        if mbchar =~ /\S/
-          if mbchar =~ /\w/
-            started_by = :word
-          else
-            started_by = :non_word_printable
-          end
-          break
-        end
-        width += get_mbchar_width(mbchar)
-        byte_size += size
-      end
-    else
-      case [started_by, second]
-      when [:word, :non_word_printable], [:non_word_printable, :word]
-        started_by = second
-      else
-        width += second_width
-        byte_size += second_byte_size
-        started_by = second
-      end
-    end
-    prev_width = width
-    prev_byte_size = byte_size
-    while line.bytesize > (byte_pointer + byte_size)
-      size = get_next_mbchar_size(line, byte_pointer + byte_size)
-      mbchar = line.byteslice(byte_pointer + byte_size, size)
-      case started_by
-      when :word
-        break if mbchar =~ /\W/
-      when :non_word_printable
-        break if mbchar =~ /[\w\s]/
-      end
-      prev_width = width
-      prev_byte_size = byte_size
-      width += get_mbchar_width(mbchar)
-      byte_size += size
-    end
-    [prev_byte_size, prev_width]
-  end
-
-  def self.vi_backward_word(line, byte_pointer)
-    width = 0
-    byte_size = 0
-    while 0 < (byte_pointer - byte_size)
-      size = get_prev_mbchar_size(line, byte_pointer - byte_size)
-      mbchar = line.byteslice(byte_pointer - byte_size - size, size)
-      if mbchar =~ /\S/
-        if mbchar =~ /\w/
-          started_by = :word
-        else
-          started_by = :non_word_printable
-        end
-        break
-      end
-      width += get_mbchar_width(mbchar)
-      byte_size += size
-    end
-    while 0 < (byte_pointer - byte_size)
-      size = get_prev_mbchar_size(line, byte_pointer - byte_size)
-      mbchar = line.byteslice(byte_pointer - byte_size - size, size)
-      case started_by
-      when :word
-        break if mbchar =~ /\W/
-      when :non_word_printable
-        break if mbchar =~ /[\w\s]/
-      end
-      width += get_mbchar_width(mbchar)
-      byte_size += size
-    end
-    [byte_size, width]
-  end
-
-  def self.vi_first_print(line)
-    width = 0
-    byte_size = 0
-    while (line.bytesize - 1) > byte_size
-      size = get_next_mbchar_size(line, byte_size)
-      mbchar = line.byteslice(byte_size, size)
-      if mbchar =~ /\S/
-        break
-      end
-      width += get_mbchar_width(mbchar)
-      byte_size += size
-    end
-    [byte_size, width]
-  end
-end
diff --git a/lib/reline/unicode/east_asian_width.rb b/lib/reline/unicode/east_asian_width.rb
deleted file mode 100644
index c1c941f7993cc9..00000000000000
--- a/lib/reline/unicode/east_asian_width.rb
+++ /dev/null
@@ -1,1196 +0,0 @@
-class Reline::Unicode::EastAsianWidth
-  # This is based on EastAsianWidth.txt
-  # UNICODE_VERSION = '15.0.0'
-
-  # Fullwidth
-  TYPE_F = /^[#{ %W(
-    \u{3000}
-    \u{FF01}-\u{FF60}
-    \u{FFE0}-\u{FFE6}
-  ).join }]/
-
-  # Halfwidth
-  TYPE_H = /^[#{ %W(
-    \u{20A9}
-    \u{FF61}-\u{FFBE}
-    \u{FFC2}-\u{FFC7}
-    \u{FFCA}-\u{FFCF}
-    \u{FFD2}-\u{FFD7}
-    \u{FFDA}-\u{FFDC}
-    \u{FFE8}-\u{FFEE}
-  ).join }]/
-
-  # Wide
-  TYPE_W = /^[#{ %W(
-    \u{1100}-\u{115F}
-    \u{231A}-\u{231B}
-    \u{2329}-\u{232A}
-    \u{23E9}-\u{23EC}
-    \u{23F0}
-    \u{23F3}
-    \u{25FD}-\u{25FE}
-    \u{2614}-\u{2615}
-    \u{2648}-\u{2653}
-    \u{267F}
-    \u{2693}
-    \u{26A1}
-    \u{26AA}-\u{26AB}
-    \u{26BD}-\u{26BE}
-    \u{26C4}-\u{26C5}
-    \u{26CE}
-    \u{26D4}
-    \u{26EA}
-    \u{26F2}-\u{26F3}
-    \u{26F5}
-    \u{26FA}
-    \u{26FD}
-    \u{2705}
-    \u{270A}-\u{270B}
-    \u{2728}
-    \u{274C}
-    \u{274E}
-    \u{2753}-\u{2755}
-    \u{2757}
-    \u{2795}-\u{2797}
-    \u{27B0}
-    \u{27BF}
-    \u{2B1B}-\u{2B1C}
-    \u{2B50}
-    \u{2B55}
-    \u{2E80}-\u{2E99}
-    \u{2E9B}-\u{2EF3}
-    \u{2F00}-\u{2FD5}
-    \u{2FF0}-\u{2FFB}
-    \u{3001}-\u{303E}
-    \u{3041}-\u{3096}
-    \u{3099}-\u{30FF}
-    \u{3105}-\u{312F}
-    \u{3131}-\u{318E}
-    \u{3190}-\u{31E3}
-    \u{31F0}-\u{321E}
-    \u{3220}-\u{3247}
-    \u{3250}-\u{4DBF}
-    \u{4E00}-\u{A48C}
-    \u{A490}-\u{A4C6}
-    \u{A960}-\u{A97C}
-    \u{AC00}-\u{D7A3}
-    \u{F900}-\u{FAFF}
-    \u{FE10}-\u{FE19}
-    \u{FE30}-\u{FE52}
-    \u{FE54}-\u{FE66}
-    \u{FE68}-\u{FE6B}
-    \u{16FE0}-\u{16FE4}
-    \u{16FF0}-\u{16FF1}
-    \u{17000}-\u{187F7}
-    \u{18800}-\u{18CD5}
-    \u{18D00}-\u{18D08}
-    \u{1AFF0}-\u{1AFF3}
-    \u{1AFF5}-\u{1AFFB}
-    \u{1AFFD}-\u{1AFFE}
-    \u{1B000}-\u{1B122}
-    \u{1B132}
-    \u{1B150}-\u{1B152}
-    \u{1B155}
-    \u{1B164}-\u{1B167}
-    \u{1B170}-\u{1B2FB}
-    \u{1F004}
-    \u{1F0CF}
-    \u{1F18E}
-    \u{1F191}-\u{1F19A}
-    \u{1F200}-\u{1F202}
-    \u{1F210}-\u{1F23B}
-    \u{1F240}-\u{1F248}
-    \u{1F250}-\u{1F251}
-    \u{1F260}-\u{1F265}
-    \u{1F300}-\u{1F320}
-    \u{1F32D}-\u{1F335}
-    \u{1F337}-\u{1F37C}
-    \u{1F37E}-\u{1F393}
-    \u{1F3A0}-\u{1F3CA}
-    \u{1F3CF}-\u{1F3D3}
-    \u{1F3E0}-\u{1F3F0}
-    \u{1F3F4}
-    \u{1F3F8}-\u{1F43E}
-    \u{1F440}
-    \u{1F442}-\u{1F4FC}
-    \u{1F4FF}-\u{1F53D}
-    \u{1F54B}-\u{1F54E}
-    \u{1F550}-\u{1F567}
-    \u{1F57A}
-    \u{1F595}-\u{1F596}
-    \u{1F5A4}
-    \u{1F5FB}-\u{1F64F}
-    \u{1F680}-\u{1F6C5}
-    \u{1F6CC}
-    \u{1F6D0}-\u{1F6D2}
-    \u{1F6D5}-\u{1F6D7}
-    \u{1F6DC}-\u{1F6DF}
-    \u{1F6EB}-\u{1F6EC}
-    \u{1F6F4}-\u{1F6FC}
-    \u{1F7E0}-\u{1F7EB}
-    \u{1F7F0}
-    \u{1F90C}-\u{1F93A}
-    \u{1F93C}-\u{1F945}
-    \u{1F947}-\u{1F9FF}
-    \u{1FA70}-\u{1FA7C}
-    \u{1FA80}-\u{1FA88}
-    \u{1FA90}-\u{1FABD}
-    \u{1FABF}-\u{1FAC5}
-    \u{1FACE}-\u{1FADB}
-    \u{1FAE0}-\u{1FAE8}
-    \u{1FAF0}-\u{1FAF8}
-    \u{20000}-\u{2FFFD}
-    \u{30000}-\u{3FFFD}
-  ).join }]/
-
-  # Narrow
-  TYPE_NA = /^[#{ %W(
-    \u{0020}-\u{007E}
-    \u{00A2}-\u{00A3}
-    \u{00A5}-\u{00A6}
-    \u{00AC}
-    \u{00AF}
-    \u{27E6}-\u{27ED}
-    \u{2985}-\u{2986}
-  ).join }]/
-
-  # Ambiguous
-  TYPE_A = /^[#{ %W(
-    \u{00A1}
-    \u{00A4}
-    \u{00A7}-\u{00A8}
-    \u{00AA}
-    \u{00AD}-\u{00AE}
-    \u{00B0}-\u{00B4}
-    \u{00B6}-\u{00BA}
-    \u{00BC}-\u{00BF}
-    \u{00C6}
-    \u{00D0}
-    \u{00D7}-\u{00D8}
-    \u{00DE}-\u{00E1}
-    \u{00E6}
-    \u{00E8}-\u{00EA}
-    \u{00EC}-\u{00ED}
-    \u{00F0}
-    \u{00F2}-\u{00F3}
-    \u{00F7}-\u{00FA}
-    \u{00FC}
-    \u{00FE}
-    \u{0101}
-    \u{0111}
-    \u{0113}
-    \u{011B}
-    \u{0126}-\u{0127}
-    \u{012B}
-    \u{0131}-\u{0133}
-    \u{0138}
-    \u{013F}-\u{0142}
-    \u{0144}
-    \u{0148}-\u{014B}
-    \u{014D}
-    \u{0152}-\u{0153}
-    \u{0166}-\u{0167}
-    \u{016B}
-    \u{01CE}
-    \u{01D0}
-    \u{01D2}
-    \u{01D4}
-    \u{01D6}
-    \u{01D8}
-    \u{01DA}
-    \u{01DC}
-    \u{0251}
-    \u{0261}
-    \u{02C4}
-    \u{02C7}
-    \u{02C9}-\u{02CB}
-    \u{02CD}
-    \u{02D0}
-    \u{02D8}-\u{02DB}
-    \u{02DD}
-    \u{02DF}
-    \u{0300}-\u{036F}
-    \u{0391}-\u{03A1}
-    \u{03A3}-\u{03A9}
-    \u{03B1}-\u{03C1}
-    \u{03C3}-\u{03C9}
-    \u{0401}
-    \u{0410}-\u{044F}
-    \u{0451}
-    \u{2010}
-    \u{2013}-\u{2016}
-    \u{2018}-\u{2019}
-    \u{201C}-\u{201D}
-    \u{2020}-\u{2022}
-    \u{2024}-\u{2027}
-    \u{2030}
-    \u{2032}-\u{2033}
-    \u{2035}
-    \u{203B}
-    \u{203E}
-    \u{2074}
-    \u{207F}
-    \u{2081}-\u{2084}
-    \u{20AC}
-    \u{2103}
-    \u{2105}
-    \u{2109}
-    \u{2113}
-    \u{2116}
-    \u{2121}-\u{2122}
-    \u{2126}
-    \u{212B}
-    \u{2153}-\u{2154}
-    \u{215B}-\u{215E}
-    \u{2160}-\u{216B}
-    \u{2170}-\u{2179}
-    \u{2189}
-    \u{2190}-\u{2199}
-    \u{21B8}-\u{21B9}
-    \u{21D2}
-    \u{21D4}
-    \u{21E7}
-    \u{2200}
-    \u{2202}-\u{2203}
-    \u{2207}-\u{2208}
-    \u{220B}
-    \u{220F}
-    \u{2211}
-    \u{2215}
-    \u{221A}
-    \u{221D}-\u{2220}
-    \u{2223}
-    \u{2225}
-    \u{2227}-\u{222C}
-    \u{222E}
-    \u{2234}-\u{2237}
-    \u{223C}-\u{223D}
-    \u{2248}
-    \u{224C}
-    \u{2252}
-    \u{2260}-\u{2261}
-    \u{2264}-\u{2267}
-    \u{226A}-\u{226B}
-    \u{226E}-\u{226F}
-    \u{2282}-\u{2283}
-    \u{2286}-\u{2287}
-    \u{2295}
-    \u{2299}
-    \u{22A5}
-    \u{22BF}
-    \u{2312}
-    \u{2460}-\u{24E9}
-    \u{24EB}-\u{254B}
-    \u{2550}-\u{2573}
-    \u{2580}-\u{258F}
-    \u{2592}-\u{2595}
-    \u{25A0}-\u{25A1}
-    \u{25A3}-\u{25A9}
-    \u{25B2}-\u{25B3}
-    \u{25B6}-\u{25B7}
-    \u{25BC}-\u{25BD}
-    \u{25C0}-\u{25C1}
-    \u{25C6}-\u{25C8}
-    \u{25CB}
-    \u{25CE}-\u{25D1}
-    \u{25E2}-\u{25E5}
-    \u{25EF}
-    \u{2605}-\u{2606}
-    \u{2609}
-    \u{260E}-\u{260F}
-    \u{261C}
-    \u{261E}
-    \u{2640}
-    \u{2642}
-    \u{2660}-\u{2661}
-    \u{2663}-\u{2665}
-    \u{2667}-\u{266A}
-    \u{266C}-\u{266D}
-    \u{266F}
-    \u{269E}-\u{269F}
-    \u{26BF}
-    \u{26C6}-\u{26CD}
-    \u{26CF}-\u{26D3}
-    \u{26D5}-\u{26E1}
-    \u{26E3}
-    \u{26E8}-\u{26E9}
-    \u{26EB}-\u{26F1}
-    \u{26F4}
-    \u{26F6}-\u{26F9}
-    \u{26FB}-\u{26FC}
-    \u{26FE}-\u{26FF}
-    \u{273D}
-    \u{2776}-\u{277F}
-    \u{2B56}-\u{2B59}
-    \u{3248}-\u{324F}
-    \u{E000}-\u{F8FF}
-    \u{FE00}-\u{FE0F}
-    \u{FFFD}
-    \u{1F100}-\u{1F10A}
-    \u{1F110}-\u{1F12D}
-    \u{1F130}-\u{1F169}
-    \u{1F170}-\u{1F18D}
-    \u{1F18F}-\u{1F190}
-    \u{1F19B}-\u{1F1AC}
-    \u{E0100}-\u{E01EF}
-    \u{F0000}-\u{FFFFD}
-    \u{100000}-\u{10FFFD}
-  ).join }]/
-
-  # Neutral
-  TYPE_N = /^[#{ %W(
-    \u{0000}-\u{001F}
-    \u{007F}-\u{00A0}
-    \u{00A9}
-    \u{00AB}
-    \u{00B5}
-    \u{00BB}
-    \u{00C0}-\u{00C5}
-    \u{00C7}-\u{00CF}
-    \u{00D1}-\u{00D6}
-    \u{00D9}-\u{00DD}
-    \u{00E2}-\u{00E5}
-    \u{00E7}
-    \u{00EB}
-    \u{00EE}-\u{00EF}
-    \u{00F1}
-    \u{00F4}-\u{00F6}
-    \u{00FB}
-    \u{00FD}
-    \u{00FF}-\u{0100}
-    \u{0102}-\u{0110}
-    \u{0112}
-    \u{0114}-\u{011A}
-    \u{011C}-\u{0125}
-    \u{0128}-\u{012A}
-    \u{012C}-\u{0130}
-    \u{0134}-\u{0137}
-    \u{0139}-\u{013E}
-    \u{0143}
-    \u{0145}-\u{0147}
-    \u{014C}
-    \u{014E}-\u{0151}
-    \u{0154}-\u{0165}
-    \u{0168}-\u{016A}
-    \u{016C}-\u{01CD}
-    \u{01CF}
-    \u{01D1}
-    \u{01D3}
-    \u{01D5}
-    \u{01D7}
-    \u{01D9}
-    \u{01DB}
-    \u{01DD}-\u{0250}
-    \u{0252}-\u{0260}
-    \u{0262}-\u{02C3}
-    \u{02C5}-\u{02C6}
-    \u{02C8}
-    \u{02CC}
-    \u{02CE}-\u{02CF}
-    \u{02D1}-\u{02D7}
-    \u{02DC}
-    \u{02DE}
-    \u{02E0}-\u{02FF}
-    \u{0370}-\u{0377}
-    \u{037A}-\u{037F}
-    \u{0384}-\u{038A}
-    \u{038C}
-    \u{038E}-\u{0390}
-    \u{03AA}-\u{03B0}
-    \u{03C2}
-    \u{03CA}-\u{0400}
-    \u{0402}-\u{040F}
-    \u{0450}
-    \u{0452}-\u{052F}
-    \u{0531}-\u{0556}
-    \u{0559}-\u{058A}
-    \u{058D}-\u{058F}
-    \u{0591}-\u{05C7}
-    \u{05D0}-\u{05EA}
-    \u{05EF}-\u{05F4}
-    \u{0600}-\u{070D}
-    \u{070F}-\u{074A}
-    \u{074D}-\u{07B1}
-    \u{07C0}-\u{07FA}
-    \u{07FD}-\u{082D}
-    \u{0830}-\u{083E}
-    \u{0840}-\u{085B}
-    \u{085E}
-    \u{0860}-\u{086A}
-    \u{0870}-\u{088E}
-    \u{0890}-\u{0891}
-    \u{0898}-\u{0983}
-    \u{0985}-\u{098C}
-    \u{098F}-\u{0990}
-    \u{0993}-\u{09A8}
-    \u{09AA}-\u{09B0}
-    \u{09B2}
-    \u{09B6}-\u{09B9}
-    \u{09BC}-\u{09C4}
-    \u{09C7}-\u{09C8}
-    \u{09CB}-\u{09CE}
-    \u{09D7}
-    \u{09DC}-\u{09DD}
-    \u{09DF}-\u{09E3}
-    \u{09E6}-\u{09FE}
-    \u{0A01}-\u{0A03}
-    \u{0A05}-\u{0A0A}
-    \u{0A0F}-\u{0A10}
-    \u{0A13}-\u{0A28}
-    \u{0A2A}-\u{0A30}
-    \u{0A32}-\u{0A33}
-    \u{0A35}-\u{0A36}
-    \u{0A38}-\u{0A39}
-    \u{0A3C}
-    \u{0A3E}-\u{0A42}
-    \u{0A47}-\u{0A48}
-    \u{0A4B}-\u{0A4D}
-    \u{0A51}
-    \u{0A59}-\u{0A5C}
-    \u{0A5E}
-    \u{0A66}-\u{0A76}
-    \u{0A81}-\u{0A83}
-    \u{0A85}-\u{0A8D}
-    \u{0A8F}-\u{0A91}
-    \u{0A93}-\u{0AA8}
-    \u{0AAA}-\u{0AB0}
-    \u{0AB2}-\u{0AB3}
-    \u{0AB5}-\u{0AB9}
-    \u{0ABC}-\u{0AC5}
-    \u{0AC7}-\u{0AC9}
-    \u{0ACB}-\u{0ACD}
-    \u{0AD0}
-    \u{0AE0}-\u{0AE3}
-    \u{0AE6}-\u{0AF1}
-    \u{0AF9}-\u{0AFF}
-    \u{0B01}-\u{0B03}
-    \u{0B05}-\u{0B0C}
-    \u{0B0F}-\u{0B10}
-    \u{0B13}-\u{0B28}
-    \u{0B2A}-\u{0B30}
-    \u{0B32}-\u{0B33}
-    \u{0B35}-\u{0B39}
-    \u{0B3C}-\u{0B44}
-    \u{0B47}-\u{0B48}
-    \u{0B4B}-\u{0B4D}
-    \u{0B55}-\u{0B57}
-    \u{0B5C}-\u{0B5D}
-    \u{0B5F}-\u{0B63}
-    \u{0B66}-\u{0B77}
-    \u{0B82}-\u{0B83}
-    \u{0B85}-\u{0B8A}
-    \u{0B8E}-\u{0B90}
-    \u{0B92}-\u{0B95}
-    \u{0B99}-\u{0B9A}
-    \u{0B9C}
-    \u{0B9E}-\u{0B9F}
-    \u{0BA3}-\u{0BA4}
-    \u{0BA8}-\u{0BAA}
-    \u{0BAE}-\u{0BB9}
-    \u{0BBE}-\u{0BC2}
-    \u{0BC6}-\u{0BC8}
-    \u{0BCA}-\u{0BCD}
-    \u{0BD0}
-    \u{0BD7}
-    \u{0BE6}-\u{0BFA}
-    \u{0C00}-\u{0C0C}
-    \u{0C0E}-\u{0C10}
-    \u{0C12}-\u{0C28}
-    \u{0C2A}-\u{0C39}
-    \u{0C3C}-\u{0C44}
-    \u{0C46}-\u{0C48}
-    \u{0C4A}-\u{0C4D}
-    \u{0C55}-\u{0C56}
-    \u{0C58}-\u{0C5A}
-    \u{0C5D}
-    \u{0C60}-\u{0C63}
-    \u{0C66}-\u{0C6F}
-    \u{0C77}-\u{0C8C}
-    \u{0C8E}-\u{0C90}
-    \u{0C92}-\u{0CA8}
-    \u{0CAA}-\u{0CB3}
-    \u{0CB5}-\u{0CB9}
-    \u{0CBC}-\u{0CC4}
-    \u{0CC6}-\u{0CC8}
-    \u{0CCA}-\u{0CCD}
-    \u{0CD5}-\u{0CD6}
-    \u{0CDD}-\u{0CDE}
-    \u{0CE0}-\u{0CE3}
-    \u{0CE6}-\u{0CEF}
-    \u{0CF1}-\u{0CF3}
-    \u{0D00}-\u{0D0C}
-    \u{0D0E}-\u{0D10}
-    \u{0D12}-\u{0D44}
-    \u{0D46}-\u{0D48}
-    \u{0D4A}-\u{0D4F}
-    \u{0D54}-\u{0D63}
-    \u{0D66}-\u{0D7F}
-    \u{0D81}-\u{0D83}
-    \u{0D85}-\u{0D96}
-    \u{0D9A}-\u{0DB1}
-    \u{0DB3}-\u{0DBB}
-    \u{0DBD}
-    \u{0DC0}-\u{0DC6}
-    \u{0DCA}
-    \u{0DCF}-\u{0DD4}
-    \u{0DD6}
-    \u{0DD8}-\u{0DDF}
-    \u{0DE6}-\u{0DEF}
-    \u{0DF2}-\u{0DF4}
-    \u{0E01}-\u{0E3A}
-    \u{0E3F}-\u{0E5B}
-    \u{0E81}-\u{0E82}
-    \u{0E84}
-    \u{0E86}-\u{0E8A}
-    \u{0E8C}-\u{0EA3}
-    \u{0EA5}
-    \u{0EA7}-\u{0EBD}
-    \u{0EC0}-\u{0EC4}
-    \u{0EC6}
-    \u{0EC8}-\u{0ECE}
-    \u{0ED0}-\u{0ED9}
-    \u{0EDC}-\u{0EDF}
-    \u{0F00}-\u{0F47}
-    \u{0F49}-\u{0F6C}
-    \u{0F71}-\u{0F97}
-    \u{0F99}-\u{0FBC}
-    \u{0FBE}-\u{0FCC}
-    \u{0FCE}-\u{0FDA}
-    \u{1000}-\u{10C5}
-    \u{10C7}
-    \u{10CD}
-    \u{10D0}-\u{10FF}
-    \u{1160}-\u{1248}
-    \u{124A}-\u{124D}
-    \u{1250}-\u{1256}
-    \u{1258}
-    \u{125A}-\u{125D}
-    \u{1260}-\u{1288}
-    \u{128A}-\u{128D}
-    \u{1290}-\u{12B0}
-    \u{12B2}-\u{12B5}
-    \u{12B8}-\u{12BE}
-    \u{12C0}
-    \u{12C2}-\u{12C5}
-    \u{12C8}-\u{12D6}
-    \u{12D8}-\u{1310}
-    \u{1312}-\u{1315}
-    \u{1318}-\u{135A}
-    \u{135D}-\u{137C}
-    \u{1380}-\u{1399}
-    \u{13A0}-\u{13F5}
-    \u{13F8}-\u{13FD}
-    \u{1400}-\u{169C}
-    \u{16A0}-\u{16F8}
-    \u{1700}-\u{1715}
-    \u{171F}-\u{1736}
-    \u{1740}-\u{1753}
-    \u{1760}-\u{176C}
-    \u{176E}-\u{1770}
-    \u{1772}-\u{1773}
-    \u{1780}-\u{17DD}
-    \u{17E0}-\u{17E9}
-    \u{17F0}-\u{17F9}
-    \u{1800}-\u{1819}
-    \u{1820}-\u{1878}
-    \u{1880}-\u{18AA}
-    \u{18B0}-\u{18F5}
-    \u{1900}-\u{191E}
-    \u{1920}-\u{192B}
-    \u{1930}-\u{193B}
-    \u{1940}
-    \u{1944}-\u{196D}
-    \u{1970}-\u{1974}
-    \u{1980}-\u{19AB}
-    \u{19B0}-\u{19C9}
-    \u{19D0}-\u{19DA}
-    \u{19DE}-\u{1A1B}
-    \u{1A1E}-\u{1A5E}
-    \u{1A60}-\u{1A7C}
-    \u{1A7F}-\u{1A89}
-    \u{1A90}-\u{1A99}
-    \u{1AA0}-\u{1AAD}
-    \u{1AB0}-\u{1ACE}
-    \u{1B00}-\u{1B4C}
-    \u{1B50}-\u{1B7E}
-    \u{1B80}-\u{1BF3}
-    \u{1BFC}-\u{1C37}
-    \u{1C3B}-\u{1C49}
-    \u{1C4D}-\u{1C88}
-    \u{1C90}-\u{1CBA}
-    \u{1CBD}-\u{1CC7}
-    \u{1CD0}-\u{1CFA}
-    \u{1D00}-\u{1F15}
-    \u{1F18}-\u{1F1D}
-    \u{1F20}-\u{1F45}
-    \u{1F48}-\u{1F4D}
-    \u{1F50}-\u{1F57}
-    \u{1F59}
-    \u{1F5B}
-    \u{1F5D}
-    \u{1F5F}-\u{1F7D}
-    \u{1F80}-\u{1FB4}
-    \u{1FB6}-\u{1FC4}
-    \u{1FC6}-\u{1FD3}
-    \u{1FD6}-\u{1FDB}
-    \u{1FDD}-\u{1FEF}
-    \u{1FF2}-\u{1FF4}
-    \u{1FF6}-\u{1FFE}
-    \u{2000}-\u{200F}
-    \u{2011}-\u{2012}
-    \u{2017}
-    \u{201A}-\u{201B}
-    \u{201E}-\u{201F}
-    \u{2023}
-    \u{2028}-\u{202F}
-    \u{2031}
-    \u{2034}
-    \u{2036}-\u{203A}
-    \u{203C}-\u{203D}
-    \u{203F}-\u{2064}
-    \u{2066}-\u{2071}
-    \u{2075}-\u{207E}
-    \u{2080}
-    \u{2085}-\u{208E}
-    \u{2090}-\u{209C}
-    \u{20A0}-\u{20A8}
-    \u{20AA}-\u{20AB}
-    \u{20AD}-\u{20C0}
-    \u{20D0}-\u{20F0}
-    \u{2100}-\u{2102}
-    \u{2104}
-    \u{2106}-\u{2108}
-    \u{210A}-\u{2112}
-    \u{2114}-\u{2115}
-    \u{2117}-\u{2120}
-    \u{2123}-\u{2125}
-    \u{2127}-\u{212A}
-    \u{212C}-\u{2152}
-    \u{2155}-\u{215A}
-    \u{215F}
-    \u{216C}-\u{216F}
-    \u{217A}-\u{2188}
-    \u{218A}-\u{218B}
-    \u{219A}-\u{21B7}
-    \u{21BA}-\u{21D1}
-    \u{21D3}
-    \u{21D5}-\u{21E6}
-    \u{21E8}-\u{21FF}
-    \u{2201}
-    \u{2204}-\u{2206}
-    \u{2209}-\u{220A}
-    \u{220C}-\u{220E}
-    \u{2210}
-    \u{2212}-\u{2214}
-    \u{2216}-\u{2219}
-    \u{221B}-\u{221C}
-    \u{2221}-\u{2222}
-    \u{2224}
-    \u{2226}
-    \u{222D}
-    \u{222F}-\u{2233}
-    \u{2238}-\u{223B}
-    \u{223E}-\u{2247}
-    \u{2249}-\u{224B}
-    \u{224D}-\u{2251}
-    \u{2253}-\u{225F}
-    \u{2262}-\u{2263}
-    \u{2268}-\u{2269}
-    \u{226C}-\u{226D}
-    \u{2270}-\u{2281}
-    \u{2284}-\u{2285}
-    \u{2288}-\u{2294}
-    \u{2296}-\u{2298}
-    \u{229A}-\u{22A4}
-    \u{22A6}-\u{22BE}
-    \u{22C0}-\u{2311}
-    \u{2313}-\u{2319}
-    \u{231C}-\u{2328}
-    \u{232B}-\u{23E8}
-    \u{23ED}-\u{23EF}
-    \u{23F1}-\u{23F2}
-    \u{23F4}-\u{2426}
-    \u{2440}-\u{244A}
-    \u{24EA}
-    \u{254C}-\u{254F}
-    \u{2574}-\u{257F}
-    \u{2590}-\u{2591}
-    \u{2596}-\u{259F}
-    \u{25A2}
-    \u{25AA}-\u{25B1}
-    \u{25B4}-\u{25B5}
-    \u{25B8}-\u{25BB}
-    \u{25BE}-\u{25BF}
-    \u{25C2}-\u{25C5}
-    \u{25C9}-\u{25CA}
-    \u{25CC}-\u{25CD}
-    \u{25D2}-\u{25E1}
-    \u{25E6}-\u{25EE}
-    \u{25F0}-\u{25FC}
-    \u{25FF}-\u{2604}
-    \u{2607}-\u{2608}
-    \u{260A}-\u{260D}
-    \u{2610}-\u{2613}
-    \u{2616}-\u{261B}
-    \u{261D}
-    \u{261F}-\u{263F}
-    \u{2641}
-    \u{2643}-\u{2647}
-    \u{2654}-\u{265F}
-    \u{2662}
-    \u{2666}
-    \u{266B}
-    \u{266E}
-    \u{2670}-\u{267E}
-    \u{2680}-\u{2692}
-    \u{2694}-\u{269D}
-    \u{26A0}
-    \u{26A2}-\u{26A9}
-    \u{26AC}-\u{26BC}
-    \u{26C0}-\u{26C3}
-    \u{26E2}
-    \u{26E4}-\u{26E7}
-    \u{2700}-\u{2704}
-    \u{2706}-\u{2709}
-    \u{270C}-\u{2727}
-    \u{2729}-\u{273C}
-    \u{273E}-\u{274B}
-    \u{274D}
-    \u{274F}-\u{2752}
-    \u{2756}
-    \u{2758}-\u{2775}
-    \u{2780}-\u{2794}
-    \u{2798}-\u{27AF}
-    \u{27B1}-\u{27BE}
-    \u{27C0}-\u{27E5}
-    \u{27EE}-\u{2984}
-    \u{2987}-\u{2B1A}
-    \u{2B1D}-\u{2B4F}
-    \u{2B51}-\u{2B54}
-    \u{2B5A}-\u{2B73}
-    \u{2B76}-\u{2B95}
-    \u{2B97}-\u{2CF3}
-    \u{2CF9}-\u{2D25}
-    \u{2D27}
-    \u{2D2D}
-    \u{2D30}-\u{2D67}
-    \u{2D6F}-\u{2D70}
-    \u{2D7F}-\u{2D96}
-    \u{2DA0}-\u{2DA6}
-    \u{2DA8}-\u{2DAE}
-    \u{2DB0}-\u{2DB6}
-    \u{2DB8}-\u{2DBE}
-    \u{2DC0}-\u{2DC6}
-    \u{2DC8}-\u{2DCE}
-    \u{2DD0}-\u{2DD6}
-    \u{2DD8}-\u{2DDE}
-    \u{2DE0}-\u{2E5D}
-    \u{303F}
-    \u{4DC0}-\u{4DFF}
-    \u{A4D0}-\u{A62B}
-    \u{A640}-\u{A6F7}
-    \u{A700}-\u{A7CA}
-    \u{A7D0}-\u{A7D1}
-    \u{A7D3}
-    \u{A7D5}-\u{A7D9}
-    \u{A7F2}-\u{A82C}
-    \u{A830}-\u{A839}
-    \u{A840}-\u{A877}
-    \u{A880}-\u{A8C5}
-    \u{A8CE}-\u{A8D9}
-    \u{A8E0}-\u{A953}
-    \u{A95F}
-    \u{A980}-\u{A9CD}
-    \u{A9CF}-\u{A9D9}
-    \u{A9DE}-\u{A9FE}
-    \u{AA00}-\u{AA36}
-    \u{AA40}-\u{AA4D}
-    \u{AA50}-\u{AA59}
-    \u{AA5C}-\u{AAC2}
-    \u{AADB}-\u{AAF6}
-    \u{AB01}-\u{AB06}
-    \u{AB09}-\u{AB0E}
-    \u{AB11}-\u{AB16}
-    \u{AB20}-\u{AB26}
-    \u{AB28}-\u{AB2E}
-    \u{AB30}-\u{AB6B}
-    \u{AB70}-\u{ABED}
-    \u{ABF0}-\u{ABF9}
-    \u{D7B0}-\u{D7C6}
-    \u{D7CB}-\u{D7FB}
-    \u{FB00}-\u{FB06}
-    \u{FB13}-\u{FB17}
-    \u{FB1D}-\u{FB36}
-    \u{FB38}-\u{FB3C}
-    \u{FB3E}
-    \u{FB40}-\u{FB41}
-    \u{FB43}-\u{FB44}
-    \u{FB46}-\u{FBC2}
-    \u{FBD3}-\u{FD8F}
-    \u{FD92}-\u{FDC7}
-    \u{FDCF}
-    \u{FDF0}-\u{FDFF}
-    \u{FE20}-\u{FE2F}
-    \u{FE70}-\u{FE74}
-    \u{FE76}-\u{FEFC}
-    \u{FEFF}
-    \u{FFF9}-\u{FFFC}
-    \u{10000}-\u{1000B}
-    \u{1000D}-\u{10026}
-    \u{10028}-\u{1003A}
-    \u{1003C}-\u{1003D}
-    \u{1003F}-\u{1004D}
-    \u{10050}-\u{1005D}
-    \u{10080}-\u{100FA}
-    \u{10100}-\u{10102}
-    \u{10107}-\u{10133}
-    \u{10137}-\u{1018E}
-    \u{10190}-\u{1019C}
-    \u{101A0}
-    \u{101D0}-\u{101FD}
-    \u{10280}-\u{1029C}
-    \u{102A0}-\u{102D0}
-    \u{102E0}-\u{102FB}
-    \u{10300}-\u{10323}
-    \u{1032D}-\u{1034A}
-    \u{10350}-\u{1037A}
-    \u{10380}-\u{1039D}
-    \u{1039F}-\u{103C3}
-    \u{103C8}-\u{103D5}
-    \u{10400}-\u{1049D}
-    \u{104A0}-\u{104A9}
-    \u{104B0}-\u{104D3}
-    \u{104D8}-\u{104FB}
-    \u{10500}-\u{10527}
-    \u{10530}-\u{10563}
-    \u{1056F}-\u{1057A}
-    \u{1057C}-\u{1058A}
-    \u{1058C}-\u{10592}
-    \u{10594}-\u{10595}
-    \u{10597}-\u{105A1}
-    \u{105A3}-\u{105B1}
-    \u{105B3}-\u{105B9}
-    \u{105BB}-\u{105BC}
-    \u{10600}-\u{10736}
-    \u{10740}-\u{10755}
-    \u{10760}-\u{10767}
-    \u{10780}-\u{10785}
-    \u{10787}-\u{107B0}
-    \u{107B2}-\u{107BA}
-    \u{10800}-\u{10805}
-    \u{10808}
-    \u{1080A}-\u{10835}
-    \u{10837}-\u{10838}
-    \u{1083C}
-    \u{1083F}-\u{10855}
-    \u{10857}-\u{1089E}
-    \u{108A7}-\u{108AF}
-    \u{108E0}-\u{108F2}
-    \u{108F4}-\u{108F5}
-    \u{108FB}-\u{1091B}
-    \u{1091F}-\u{10939}
-    \u{1093F}
-    \u{10980}-\u{109B7}
-    \u{109BC}-\u{109CF}
-    \u{109D2}-\u{10A03}
-    \u{10A05}-\u{10A06}
-    \u{10A0C}-\u{10A13}
-    \u{10A15}-\u{10A17}
-    \u{10A19}-\u{10A35}
-    \u{10A38}-\u{10A3A}
-    \u{10A3F}-\u{10A48}
-    \u{10A50}-\u{10A58}
-    \u{10A60}-\u{10A9F}
-    \u{10AC0}-\u{10AE6}
-    \u{10AEB}-\u{10AF6}
-    \u{10B00}-\u{10B35}
-    \u{10B39}-\u{10B55}
-    \u{10B58}-\u{10B72}
-    \u{10B78}-\u{10B91}
-    \u{10B99}-\u{10B9C}
-    \u{10BA9}-\u{10BAF}
-    \u{10C00}-\u{10C48}
-    \u{10C80}-\u{10CB2}
-    \u{10CC0}-\u{10CF2}
-    \u{10CFA}-\u{10D27}
-    \u{10D30}-\u{10D39}
-    \u{10E60}-\u{10E7E}
-    \u{10E80}-\u{10EA9}
-    \u{10EAB}-\u{10EAD}
-    \u{10EB0}-\u{10EB1}
-    \u{10EFD}-\u{10F27}
-    \u{10F30}-\u{10F59}
-    \u{10F70}-\u{10F89}
-    \u{10FB0}-\u{10FCB}
-    \u{10FE0}-\u{10FF6}
-    \u{11000}-\u{1104D}
-    \u{11052}-\u{11075}
-    \u{1107F}-\u{110C2}
-    \u{110CD}
-    \u{110D0}-\u{110E8}
-    \u{110F0}-\u{110F9}
-    \u{11100}-\u{11134}
-    \u{11136}-\u{11147}
-    \u{11150}-\u{11176}
-    \u{11180}-\u{111DF}
-    \u{111E1}-\u{111F4}
-    \u{11200}-\u{11211}
-    \u{11213}-\u{11241}
-    \u{11280}-\u{11286}
-    \u{11288}
-    \u{1128A}-\u{1128D}
-    \u{1128F}-\u{1129D}
-    \u{1129F}-\u{112A9}
-    \u{112B0}-\u{112EA}
-    \u{112F0}-\u{112F9}
-    \u{11300}-\u{11303}
-    \u{11305}-\u{1130C}
-    \u{1130F}-\u{11310}
-    \u{11313}-\u{11328}
-    \u{1132A}-\u{11330}
-    \u{11332}-\u{11333}
-    \u{11335}-\u{11339}
-    \u{1133B}-\u{11344}
-    \u{11347}-\u{11348}
-    \u{1134B}-\u{1134D}
-    \u{11350}
-    \u{11357}
-    \u{1135D}-\u{11363}
-    \u{11366}-\u{1136C}
-    \u{11370}-\u{11374}
-    \u{11400}-\u{1145B}
-    \u{1145D}-\u{11461}
-    \u{11480}-\u{114C7}
-    \u{114D0}-\u{114D9}
-    \u{11580}-\u{115B5}
-    \u{115B8}-\u{115DD}
-    \u{11600}-\u{11644}
-    \u{11650}-\u{11659}
-    \u{11660}-\u{1166C}
-    \u{11680}-\u{116B9}
-    \u{116C0}-\u{116C9}
-    \u{11700}-\u{1171A}
-    \u{1171D}-\u{1172B}
-    \u{11730}-\u{11746}
-    \u{11800}-\u{1183B}
-    \u{118A0}-\u{118F2}
-    \u{118FF}-\u{11906}
-    \u{11909}
-    \u{1190C}-\u{11913}
-    \u{11915}-\u{11916}
-    \u{11918}-\u{11935}
-    \u{11937}-\u{11938}
-    \u{1193B}-\u{11946}
-    \u{11950}-\u{11959}
-    \u{119A0}-\u{119A7}
-    \u{119AA}-\u{119D7}
-    \u{119DA}-\u{119E4}
-    \u{11A00}-\u{11A47}
-    \u{11A50}-\u{11AA2}
-    \u{11AB0}-\u{11AF8}
-    \u{11B00}-\u{11B09}
-    \u{11C00}-\u{11C08}
-    \u{11C0A}-\u{11C36}
-    \u{11C38}-\u{11C45}
-    \u{11C50}-\u{11C6C}
-    \u{11C70}-\u{11C8F}
-    \u{11C92}-\u{11CA7}
-    \u{11CA9}-\u{11CB6}
-    \u{11D00}-\u{11D06}
-    \u{11D08}-\u{11D09}
-    \u{11D0B}-\u{11D36}
-    \u{11D3A}
-    \u{11D3C}-\u{11D3D}
-    \u{11D3F}-\u{11D47}
-    \u{11D50}-\u{11D59}
-    \u{11D60}-\u{11D65}
-    \u{11D67}-\u{11D68}
-    \u{11D6A}-\u{11D8E}
-    \u{11D90}-\u{11D91}
-    \u{11D93}-\u{11D98}
-    \u{11DA0}-\u{11DA9}
-    \u{11EE0}-\u{11EF8}
-    \u{11F00}-\u{11F10}
-    \u{11F12}-\u{11F3A}
-    \u{11F3E}-\u{11F59}
-    \u{11FB0}
-    \u{11FC0}-\u{11FF1}
-    \u{11FFF}-\u{12399}
-    \u{12400}-\u{1246E}
-    \u{12470}-\u{12474}
-    \u{12480}-\u{12543}
-    \u{12F90}-\u{12FF2}
-    \u{13000}-\u{13455}
-    \u{14400}-\u{14646}
-    \u{16800}-\u{16A38}
-    \u{16A40}-\u{16A5E}
-    \u{16A60}-\u{16A69}
-    \u{16A6E}-\u{16ABE}
-    \u{16AC0}-\u{16AC9}
-    \u{16AD0}-\u{16AED}
-    \u{16AF0}-\u{16AF5}
-    \u{16B00}-\u{16B45}
-    \u{16B50}-\u{16B59}
-    \u{16B5B}-\u{16B61}
-    \u{16B63}-\u{16B77}
-    \u{16B7D}-\u{16B8F}
-    \u{16E40}-\u{16E9A}
-    \u{16F00}-\u{16F4A}
-    \u{16F4F}-\u{16F87}
-    \u{16F8F}-\u{16F9F}
-    \u{1BC00}-\u{1BC6A}
-    \u{1BC70}-\u{1BC7C}
-    \u{1BC80}-\u{1BC88}
-    \u{1BC90}-\u{1BC99}
-    \u{1BC9C}-\u{1BCA3}
-    \u{1CF00}-\u{1CF2D}
-    \u{1CF30}-\u{1CF46}
-    \u{1CF50}-\u{1CFC3}
-    \u{1D000}-\u{1D0F5}
-    \u{1D100}-\u{1D126}
-    \u{1D129}-\u{1D1EA}
-    \u{1D200}-\u{1D245}
-    \u{1D2C0}-\u{1D2D3}
-    \u{1D2E0}-\u{1D2F3}
-    \u{1D300}-\u{1D356}
-    \u{1D360}-\u{1D378}
-    \u{1D400}-\u{1D454}
-    \u{1D456}-\u{1D49C}
-    \u{1D49E}-\u{1D49F}
-    \u{1D4A2}
-    \u{1D4A5}-\u{1D4A6}
-    \u{1D4A9}-\u{1D4AC}
-    \u{1D4AE}-\u{1D4B9}
-    \u{1D4BB}
-    \u{1D4BD}-\u{1D4C3}
-    \u{1D4C5}-\u{1D505}
-    \u{1D507}-\u{1D50A}
-    \u{1D50D}-\u{1D514}
-    \u{1D516}-\u{1D51C}
-    \u{1D51E}-\u{1D539}
-    \u{1D53B}-\u{1D53E}
-    \u{1D540}-\u{1D544}
-    \u{1D546}
-    \u{1D54A}-\u{1D550}
-    \u{1D552}-\u{1D6A5}
-    \u{1D6A8}-\u{1D7CB}
-    \u{1D7CE}-\u{1DA8B}
-    \u{1DA9B}-\u{1DA9F}
-    \u{1DAA1}-\u{1DAAF}
-    \u{1DF00}-\u{1DF1E}
-    \u{1DF25}-\u{1DF2A}
-    \u{1E000}-\u{1E006}
-    \u{1E008}-\u{1E018}
-    \u{1E01B}-\u{1E021}
-    \u{1E023}-\u{1E024}
-    \u{1E026}-\u{1E02A}
-    \u{1E030}-\u{1E06D}
-    \u{1E08F}
-    \u{1E100}-\u{1E12C}
-    \u{1E130}-\u{1E13D}
-    \u{1E140}-\u{1E149}
-    \u{1E14E}-\u{1E14F}
-    \u{1E290}-\u{1E2AE}
-    \u{1E2C0}-\u{1E2F9}
-    \u{1E2FF}
-    \u{1E4D0}-\u{1E4F9}
-    \u{1E7E0}-\u{1E7E6}
-    \u{1E7E8}-\u{1E7EB}
-    \u{1E7ED}-\u{1E7EE}
-    \u{1E7F0}-\u{1E7FE}
-    \u{1E800}-\u{1E8C4}
-    \u{1E8C7}-\u{1E8D6}
-    \u{1E900}-\u{1E94B}
-    \u{1E950}-\u{1E959}
-    \u{1E95E}-\u{1E95F}
-    \u{1EC71}-\u{1ECB4}
-    \u{1ED01}-\u{1ED3D}
-    \u{1EE00}-\u{1EE03}
-    \u{1EE05}-\u{1EE1F}
-    \u{1EE21}-\u{1EE22}
-    \u{1EE24}
-    \u{1EE27}
-    \u{1EE29}-\u{1EE32}
-    \u{1EE34}-\u{1EE37}
-    \u{1EE39}
-    \u{1EE3B}
-    \u{1EE42}
-    \u{1EE47}
-    \u{1EE49}
-    \u{1EE4B}
-    \u{1EE4D}-\u{1EE4F}
-    \u{1EE51}-\u{1EE52}
-    \u{1EE54}
-    \u{1EE57}
-    \u{1EE59}
-    \u{1EE5B}
-    \u{1EE5D}
-    \u{1EE5F}
-    \u{1EE61}-\u{1EE62}
-    \u{1EE64}
-    \u{1EE67}-\u{1EE6A}
-    \u{1EE6C}-\u{1EE72}
-    \u{1EE74}-\u{1EE77}
-    \u{1EE79}-\u{1EE7C}
-    \u{1EE7E}
-    \u{1EE80}-\u{1EE89}
-    \u{1EE8B}-\u{1EE9B}
-    \u{1EEA1}-\u{1EEA3}
-    \u{1EEA5}-\u{1EEA9}
-    \u{1EEAB}-\u{1EEBB}
-    \u{1EEF0}-\u{1EEF1}
-    \u{1F000}-\u{1F003}
-    \u{1F005}-\u{1F02B}
-    \u{1F030}-\u{1F093}
-    \u{1F0A0}-\u{1F0AE}
-    \u{1F0B1}-\u{1F0BF}
-    \u{1F0C1}-\u{1F0CE}
-    \u{1F0D1}-\u{1F0F5}
-    \u{1F10B}-\u{1F10F}
-    \u{1F12E}-\u{1F12F}
-    \u{1F16A}-\u{1F16F}
-    \u{1F1AD}
-    \u{1F1E6}-\u{1F1FF}
-    \u{1F321}-\u{1F32C}
-    \u{1F336}
-    \u{1F37D}
-    \u{1F394}-\u{1F39F}
-    \u{1F3CB}-\u{1F3CE}
-    \u{1F3D4}-\u{1F3DF}
-    \u{1F3F1}-\u{1F3F3}
-    \u{1F3F5}-\u{1F3F7}
-    \u{1F43F}
-    \u{1F441}
-    \u{1F4FD}-\u{1F4FE}
-    \u{1F53E}-\u{1F54A}
-    \u{1F54F}
-    \u{1F568}-\u{1F579}
-    \u{1F57B}-\u{1F594}
-    \u{1F597}-\u{1F5A3}
-    \u{1F5A5}-\u{1F5FA}
-    \u{1F650}-\u{1F67F}
-    \u{1F6C6}-\u{1F6CB}
-    \u{1F6CD}-\u{1F6CF}
-    \u{1F6D3}-\u{1F6D4}
-    \u{1F6E0}-\u{1F6EA}
-    \u{1F6F0}-\u{1F6F3}
-    \u{1F700}-\u{1F776}
-    \u{1F77B}-\u{1F7D9}
-    \u{1F800}-\u{1F80B}
-    \u{1F810}-\u{1F847}
-    \u{1F850}-\u{1F859}
-    \u{1F860}-\u{1F887}
-    \u{1F890}-\u{1F8AD}
-    \u{1F8B0}-\u{1F8B1}
-    \u{1F900}-\u{1F90B}
-    \u{1F93B}
-    \u{1F946}
-    \u{1FA00}-\u{1FA53}
-    \u{1FA60}-\u{1FA6D}
-    \u{1FB00}-\u{1FB92}
-    \u{1FB94}-\u{1FBCA}
-    \u{1FBF0}-\u{1FBF9}
-    \u{E0001}
-    \u{E0020}-\u{E007F}
-  ).join }]/
-end
diff --git a/lib/reline/version.rb b/lib/reline/version.rb
deleted file mode 100644
index a2538f6fa36431..00000000000000
--- a/lib/reline/version.rb
+++ /dev/null
@@ -1,3 +0,0 @@
-module Reline
-  VERSION = '0.3.8'
-end
diff --git a/lib/reline/windows.rb b/lib/reline/windows.rb
deleted file mode 100644
index 6f635f630fda69..00000000000000
--- a/lib/reline/windows.rb
+++ /dev/null
@@ -1,501 +0,0 @@
-require 'fiddle/import'
-
-class Reline::Windows
-  def self.encoding
-    Encoding::UTF_8
-  end
-
-  def self.win?
-    true
-  end
-
-  def self.win_legacy_console?
-    @@legacy_console
-  end
-
-  def self.set_default_key_bindings(config)
-    {
-      [224, 72] => :ed_prev_history, # ↑
-      [224, 80] => :ed_next_history, # ↓
-      [224, 77] => :ed_next_char,    # →
-      [224, 75] => :ed_prev_char,    # ←
-      [224, 83] => :key_delete,      # Del
-      [224, 71] => :ed_move_to_beg,  # Home
-      [224, 79] => :ed_move_to_end,  # End
-      [  0, 41] => :ed_unassigned,   # input method on/off
-      [  0, 72] => :ed_prev_history, # ↑
-      [  0, 80] => :ed_next_history, # ↓
-      [  0, 77] => :ed_next_char,    # →
-      [  0, 75] => :ed_prev_char,    # ←
-      [  0, 83] => :key_delete,      # Del
-      [  0, 71] => :ed_move_to_beg,  # Home
-      [  0, 79] => :ed_move_to_end   # End
-    }.each_pair do |key, func|
-      config.add_default_key_binding_by_keymap(:emacs, key, func)
-      config.add_default_key_binding_by_keymap(:vi_insert, key, func)
-      config.add_default_key_binding_by_keymap(:vi_command, key, func)
-    end
-
-    {
-      [27, 32] => :em_set_mark,             # M-<space>
-      [24, 24] => :em_exchange_mark,        # C-x C-x
-    }.each_pair do |key, func|
-      config.add_default_key_binding_by_keymap(:emacs, key, func)
-    end
-
-    # Emulate ANSI key sequence.
-    {
-      [27, 91, 90] => :completion_journey_up, # S-Tab
-    }.each_pair do |key, func|
-      config.add_default_key_binding_by_keymap(:emacs, key, func)
-      config.add_default_key_binding_by_keymap(:vi_insert, key, func)
-    end
-  end
-
-  if defined? JRUBY_VERSION
-    require 'win32api'
-  else
-    class Win32API
-      DLL = {}
-      TYPEMAP = {"0" => Fiddle::TYPE_VOID, "S" => Fiddle::TYPE_VOIDP, "I" => Fiddle::TYPE_LONG}
-      POINTER_TYPE = Fiddle::SIZEOF_VOIDP == Fiddle::SIZEOF_LONG_LONG ? 'q*' : 'l!*'
-
-      WIN32_TYPES = "VPpNnLlIi"
-      DL_TYPES = "0SSI"
-
-      def initialize(dllname, func, import, export = "0", calltype = :stdcall)
-        @proto = [import].join.tr(WIN32_TYPES, DL_TYPES).sub(/^(.)0*$/, '\1')
-        import = @proto.chars.map {|win_type| TYPEMAP[win_type.tr(WIN32_TYPES, DL_TYPES)]}
-        export = TYPEMAP[export.tr(WIN32_TYPES, DL_TYPES)]
-        calltype = Fiddle::Importer.const_get(:CALL_TYPE_TO_ABI)[calltype]
-
-        handle = DLL[dllname] ||=
-                 begin
-                   Fiddle.dlopen(dllname)
-                 rescue Fiddle::DLError
-                   raise unless File.extname(dllname).empty?
-                   Fiddle.dlopen(dllname + ".dll")
-                 end
-
-        @func = Fiddle::Function.new(handle[func], import, export, calltype)
-      rescue Fiddle::DLError => e
-        raise LoadError, e.message, e.backtrace
-      end
-
-      def call(*args)
-        import = @proto.split("")
-        args.each_with_index do |x, i|
-          args[i], = [x == 0 ? nil : x].pack("p").unpack(POINTER_TYPE) if import[i] == "S"
-          args[i], = [x].pack("I").unpack("i") if import[i] == "I"
-        end
-        ret, = @func.call(*args)
-        return ret || 0
-      end
-    end
-  end
-
-  VK_RETURN = 0x0D
-  VK_MENU = 0x12 # ALT key
-  VK_LMENU = 0xA4
-  VK_CONTROL = 0x11
-  VK_SHIFT = 0x10
-  VK_DIVIDE = 0x6F
-
-  KEY_EVENT = 0x01
-  WINDOW_BUFFER_SIZE_EVENT = 0x04
-
-  CAPSLOCK_ON = 0x0080
-  ENHANCED_KEY = 0x0100
-  LEFT_ALT_PRESSED = 0x0002
-  LEFT_CTRL_PRESSED = 0x0008
-  NUMLOCK_ON = 0x0020
-  RIGHT_ALT_PRESSED = 0x0001
-  RIGHT_CTRL_PRESSED = 0x0004
-  SCROLLLOCK_ON = 0x0040
-  SHIFT_PRESSED = 0x0010
-
-  VK_TAB = 0x09
-  VK_END = 0x23
-  VK_HOME = 0x24
-  VK_LEFT = 0x25
-  VK_UP = 0x26
-  VK_RIGHT = 0x27
-  VK_DOWN = 0x28
-  VK_DELETE = 0x2E
-
-  STD_INPUT_HANDLE = -10
-  STD_OUTPUT_HANDLE = -11
-  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')
-  @@GetConsoleScreenBufferInfo = Win32API.new('kernel32', 'GetConsoleScreenBufferInfo', ['L', 'P'], 'L')
-  @@SetConsoleCursorPosition = Win32API.new('kernel32', 'SetConsoleCursorPosition', ['L', 'L'], 'L')
-  @@GetStdHandle = Win32API.new('kernel32', 'GetStdHandle', ['L'], 'L')
-  @@FillConsoleOutputCharacter = Win32API.new('kernel32', 'FillConsoleOutputCharacter', ['L', 'L', 'L', 'L', 'P'], 'L')
-  @@ScrollConsoleScreenBuffer = Win32API.new('kernel32', 'ScrollConsoleScreenBuffer', ['L', 'P', 'P', 'L', 'P'], 'L')
-  @@hConsoleHandle = @@GetStdHandle.call(STD_OUTPUT_HANDLE)
-  @@hConsoleInputHandle = @@GetStdHandle.call(STD_INPUT_HANDLE)
-  @@GetNumberOfConsoleInputEvents = Win32API.new('kernel32', 'GetNumberOfConsoleInputEvents', ['L', 'P'], 'L')
-  @@ReadConsoleInputW = Win32API.new('kernel32', 'ReadConsoleInputW', ['L', 'P', 'L', 'P'], 'L')
-  @@GetFileType = Win32API.new('kernel32', 'GetFileType', ['L'], 'L')
-  @@GetFileInformationByHandleEx = Win32API.new('kernel32', 'GetFileInformationByHandleEx', ['L', 'I', 'P', 'L'], 'I')
-  @@FillConsoleOutputAttribute = Win32API.new('kernel32', 'FillConsoleOutputAttribute', ['L', 'L', 'L', 'L', 'P'], 'L')
-  @@SetConsoleCursorInfo = Win32API.new('kernel32', 'SetConsoleCursorInfo', ['L', 'P'], 'L')
-
-  @@GetConsoleMode = Win32API.new('kernel32', 'GetConsoleMode', ['L', 'P'], 'L')
-  @@SetConsoleMode = Win32API.new('kernel32', 'SetConsoleMode', ['L', 'L'], 'L')
-  @@WaitForSingleObject = Win32API.new('kernel32', 'WaitForSingleObject', ['L', 'L'], 'L')
-  ENABLE_VIRTUAL_TERMINAL_PROCESSING = 4
-
-  private_class_method def self.getconsolemode
-    mode = "\000\000\000\000"
-    @@GetConsoleMode.call(@@hConsoleHandle, mode)
-    mode.unpack1('L')
-  end
-
-  private_class_method def self.setconsolemode(mode)
-    @@SetConsoleMode.call(@@hConsoleHandle, mode)
-  end
-
-  @@legacy_console = (getconsolemode() & ENABLE_VIRTUAL_TERMINAL_PROCESSING == 0)
-  #if @@legacy_console
-  #  setconsolemode(getconsolemode() | ENABLE_VIRTUAL_TERMINAL_PROCESSING)
-  #  @@legacy_console = (getconsolemode() & ENABLE_VIRTUAL_TERMINAL_PROCESSING == 0)
-  #end
-
-  @@input_buf = []
-  @@output_buf = []
-
-  @@output = STDOUT
-
-  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].unpack1("L")
-    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
-
-  KEY_MAP = [
-    # It's treated as Meta+Enter on Windows.
-    [ { control_keys: :CTRL,  virtual_key_code: 0x0D }, "\e\r".bytes ],
-    [ { control_keys: :SHIFT, virtual_key_code: 0x0D }, "\e\r".bytes ],
-
-    # It's treated as Meta+Space on Windows.
-    [ { control_keys: :CTRL,  char_code: 0x20 }, "\e ".bytes ],
-
-    # Emulate getwch() key sequences.
-    [ { control_keys: [], virtual_key_code: VK_UP },     [0, 72] ],
-    [ { control_keys: [], virtual_key_code: VK_DOWN },   [0, 80] ],
-    [ { control_keys: [], virtual_key_code: VK_RIGHT },  [0, 77] ],
-    [ { control_keys: [], virtual_key_code: VK_LEFT },   [0, 75] ],
-    [ { control_keys: [], virtual_key_code: VK_DELETE }, [0, 83] ],
-    [ { control_keys: [], virtual_key_code: VK_HOME },   [0, 71] ],
-    [ { control_keys: [], virtual_key_code: VK_END },    [0, 79] ],
-
-    # Emulate ANSI key sequence.
-    [ { control_keys: :SHIFT, virtual_key_code: VK_TAB }, [27, 91, 90] ],
-  ]
-
-  @@hsg = nil
-
-  def self.process_key_event(repeat_count, virtual_key_code, virtual_scan_code, char_code, control_key_state)
-
-    # high-surrogate
-    if 0xD800 <= char_code and char_code <= 0xDBFF
-      @@hsg = char_code
-      return
-    end
-    # low-surrogate
-    if 0xDC00 <= char_code and char_code <= 0xDFFF
-      if @@hsg
-        char_code = 0x10000 + (@@hsg - 0xD800) * 0x400 + char_code - 0xDC00
-        @@hsg = nil
-      else
-        # no high-surrogate. ignored.
-        return
-      end
-    else
-      # ignore high-surrogate without low-surrogate if there
-      @@hsg = nil
-    end
-
-    key = KeyEventRecord.new(virtual_key_code, char_code, control_key_state)
-
-    match = KEY_MAP.find { |args,| key.matches?(**args) }
-    unless match.nil?
-      @@output_buf.concat(match.last)
-      return
-    end
-
-    # no char, only control keys
-    return if key.char_code == 0 and key.control_keys.any?
-
-    @@output_buf.push("\e".ord) if key.control_keys.include?(:ALT) and !key.control_keys.include?(:CTRL)
-
-    @@output_buf.concat(key.char.bytes)
-  end
-
-  def self.check_input_event
-    num_of_events = 0.chr * 8
-    while @@output_buf.empty?
-      Reline.core.line_editor.resize
-      if @@WaitForSingleObject.(@@hConsoleInputHandle, 100) != 0 # max 0.1 sec
-        # prevent for background consolemode change
-        @@legacy_console = (getconsolemode() & ENABLE_VIRTUAL_TERMINAL_PROCESSING == 0)
-        next
-      end
-      next if @@GetNumberOfConsoleInputEvents.(@@hConsoleInputHandle, num_of_events) == 0 or num_of_events.unpack1('L') == 0
-      input_records = 0.chr * 20 * 80
-      read_event = 0.chr * 4
-      if @@ReadConsoleInputW.(@@hConsoleInputHandle, input_records, 80, read_event) != 0
-        read_events = read_event.unpack1('L')
-        0.upto(read_events) do |idx|
-          input_record = input_records[idx * 20, 20]
-          event = input_record[0, 2].unpack1('s*')
-          case event
-          when WINDOW_BUFFER_SIZE_EVENT
-            @@winch_handler.()
-          when KEY_EVENT
-            key_down = input_record[4, 4].unpack1('l*')
-            repeat_count = input_record[8, 2].unpack1('s*')
-            virtual_key_code = input_record[10, 2].unpack1('s*')
-            virtual_scan_code = input_record[12, 2].unpack1('s*')
-            char_code = input_record[14, 2].unpack1('S*')
-            control_key_state = input_record[16, 2].unpack1('S*')
-            is_key_down = key_down.zero? ? false : true
-            if is_key_down
-              process_key_event(repeat_count, virtual_key_code, virtual_scan_code, char_code, control_key_state)
-            end
-          end
-        end
-      end
-    end
-  end
-
-  def self.with_raw_input
-    yield
-  end
-
-  def self.getc(_timeout_second)
-    check_input_event
-    @@output_buf.shift
-  end
-
-  def self.ungetc(c)
-    @@output_buf.unshift(c)
-  end
-
-  def self.in_pasting?
-    not self.empty_buffer?
-  end
-
-  def self.empty_buffer?
-    if not @@output_buf.empty?
-      false
-    elsif @@kbhit.call == 0
-      true
-    else
-      false
-    end
-  end
-
-  def self.get_console_screen_buffer_info
-    # CONSOLE_SCREEN_BUFFER_INFO
-    # [ 0,2] dwSize.X
-    # [ 2,2] dwSize.Y
-    # [ 4,2] dwCursorPositions.X
-    # [ 6,2] dwCursorPositions.Y
-    # [ 8,2] wAttributes
-    # [10,2] srWindow.Left
-    # [12,2] srWindow.Top
-    # [14,2] srWindow.Right
-    # [16,2] srWindow.Bottom
-    # [18,2] dwMaximumWindowSize.X
-    # [20,2] dwMaximumWindowSize.Y
-    csbi = 0.chr * 22
-    return if @@GetConsoleScreenBufferInfo.call(@@hConsoleHandle, csbi) == 0
-    csbi
-  end
-
-  def self.get_screen_size
-    unless csbi = get_console_screen_buffer_info
-      return [1, 1]
-    end
-    csbi[0, 4].unpack('SS').reverse
-  end
-
-  def self.cursor_pos
-    unless csbi = get_console_screen_buffer_info
-      return Reline::CursorPos.new(0, 0)
-    end
-    x = csbi[4, 2].unpack1('s')
-    y = csbi[6, 2].unpack1('s')
-    Reline::CursorPos.new(x, y)
-  end
-
-  def self.move_cursor_column(val)
-    @@SetConsoleCursorPosition.call(@@hConsoleHandle, cursor_pos.y * 65536 + val)
-  end
-
-  def self.move_cursor_up(val)
-    if val > 0
-      y = cursor_pos.y - val
-      y = 0 if y < 0
-      @@SetConsoleCursorPosition.call(@@hConsoleHandle, y * 65536 + cursor_pos.x)
-    elsif val < 0
-      move_cursor_down(-val)
-    end
-  end
-
-  def self.move_cursor_down(val)
-    if val > 0
-      return unless csbi = get_console_screen_buffer_info
-      screen_height = get_screen_size.first
-      y = cursor_pos.y + val
-      y = screen_height - 1 if y > (screen_height - 1)
-      @@SetConsoleCursorPosition.call(@@hConsoleHandle, (cursor_pos.y + val) * 65536 + cursor_pos.x)
-    elsif val < 0
-      move_cursor_up(-val)
-    end
-  end
-
-  def self.erase_after_cursor
-    return unless csbi = get_console_screen_buffer_info
-    attributes = csbi[8, 2].unpack1('S')
-    cursor = csbi[4, 4].unpack1('L')
-    written = 0.chr * 4
-    @@FillConsoleOutputCharacter.call(@@hConsoleHandle, 0x20, get_screen_size.last - cursor_pos.x, cursor, written)
-    @@FillConsoleOutputAttribute.call(@@hConsoleHandle, attributes, get_screen_size.last - cursor_pos.x, cursor, written)
-  end
-
-  def self.scroll_down(val)
-    return if val < 0
-    return unless csbi = get_console_screen_buffer_info
-    buffer_width, buffer_lines, x, y, attributes, window_left, window_top, window_bottom = csbi.unpack('ssssSssx2s')
-    screen_height = window_bottom - window_top + 1
-    val = screen_height if val > screen_height
-
-    if @@legacy_console || window_left != 0
-      # unless ENABLE_VIRTUAL_TERMINAL,
-      # if srWindow.Left != 0 then it's conhost.exe hosted console
-      # and puts "\n" causes horizontal scroll. its glitch.
-      # FYI irb write from culumn 1, so this gives no gain.
-      scroll_rectangle = [0, val, buffer_width, buffer_lines - val].pack('s4')
-      destination_origin = 0 # y * 65536 + x
-      fill = [' '.ord, attributes].pack('SS')
-      @@ScrollConsoleScreenBuffer.call(@@hConsoleHandle, scroll_rectangle, nil, destination_origin, fill)
-    else
-      origin_x = x + 1
-      origin_y = y - window_top + 1
-      @@output.write [
-        (origin_y != screen_height) ? "\e[#{screen_height};H" : nil,
-        "\n" * val,
-        (origin_y != screen_height or !x.zero?) ? "\e[#{origin_y};#{origin_x}H" : nil
-      ].join
-    end
-  end
-
-  def self.clear_screen
-    if @@legacy_console
-      return unless csbi = get_console_screen_buffer_info
-      buffer_width, _buffer_lines, attributes, window_top, window_bottom = csbi.unpack('ss@8S@12sx2s')
-      fill_length = buffer_width * (window_bottom - window_top + 1)
-      screen_topleft = window_top * 65536
-      written = 0.chr * 4
-      @@FillConsoleOutputCharacter.call(@@hConsoleHandle, 0x20, fill_length, screen_topleft, written)
-      @@FillConsoleOutputAttribute.call(@@hConsoleHandle, attributes, fill_length, screen_topleft, written)
-      @@SetConsoleCursorPosition.call(@@hConsoleHandle, screen_topleft)
-    else
-      @@output.write "\e[2J" "\e[H"
-    end
-  end
-
-  def self.set_screen_size(rows, columns)
-    raise NotImplementedError
-  end
-
-  def self.hide_cursor
-    size = 100
-    visible = 0 # 0 means false
-    cursor_info = [size, visible].pack('Li')
-    @@SetConsoleCursorInfo.call(@@hConsoleHandle, cursor_info)
-  end
-
-  def self.show_cursor
-    size = 100
-    visible = 1 # 1 means true
-    cursor_info = [size, visible].pack('Li')
-    @@SetConsoleCursorInfo.call(@@hConsoleHandle, cursor_info)
-  end
-
-  def self.set_winch_handler(&handler)
-    @@winch_handler = handler
-  end
-
-  def self.prep
-    # do nothing
-    nil
-  end
-
-  def self.deprep(otio)
-    # do nothing
-  end
-
-  class KeyEventRecord
-
-    attr_reader :virtual_key_code, :char_code, :control_key_state, :control_keys
-
-    def initialize(virtual_key_code, char_code, control_key_state)
-      @virtual_key_code = virtual_key_code
-      @char_code = char_code
-      @control_key_state = control_key_state
-      @enhanced = control_key_state & ENHANCED_KEY != 0
-
-      (@control_keys = []).tap do |control_keys|
-        # symbols must be sorted to make comparison is easier later on
-        control_keys << :ALT   if control_key_state & (LEFT_ALT_PRESSED | RIGHT_ALT_PRESSED) != 0
-        control_keys << :CTRL  if control_key_state & (LEFT_CTRL_PRESSED | RIGHT_CTRL_PRESSED) != 0
-        control_keys << :SHIFT if control_key_state & SHIFT_PRESSED != 0
-      end.freeze
-    end
-
-    def char
-      @char_code.chr(Encoding::UTF_8)
-    end
-
-    def enhanced?
-      @enhanced
-    end
-
-    # Verifies if the arguments match with this key event.
-    # Nil arguments are ignored, but at least one must be passed as non-nil.
-    # To verify that no control keys were pressed, pass an empty array: `control_keys: []`.
-    def matches?(control_keys: nil, virtual_key_code: nil, char_code: nil)
-      raise ArgumentError, 'No argument was passed to match key event' if control_keys.nil? && virtual_key_code.nil? && char_code.nil?
-
-      (control_keys.nil? || [*control_keys].sort == @control_keys) &&
-      (virtual_key_code.nil? || @virtual_key_code == virtual_key_code) &&
-      (char_code.nil? || char_code == @char_code)
-    end
-
-  end
-end
diff --git a/lib/resolv-replace.gemspec b/lib/resolv-replace.gemspec
deleted file mode 100644
index 48f7108a8e2ab3..00000000000000
--- a/lib/resolv-replace.gemspec
+++ /dev/null
@@ -1,22 +0,0 @@
-Gem::Specification.new do |spec|
-  spec.name          = "resolv-replace"
-  spec.version       = "0.1.1"
-  spec.authors       = ["Tanaka Akira"]
-  spec.email         = ["akr@fsij.org"]
-
-  spec.summary       = %q{Replace Socket DNS with Resolv.}
-  spec.description   = %q{Replace Socket DNS with Resolv.}
-  spec.homepage      = "https://github.com/ruby/resolv-replace"
-  spec.required_ruby_version = Gem::Requirement.new(">= 2.3.0")
-  spec.licenses      = ["Ruby", "BSD-2-Clause"]
-
-  spec.metadata["homepage_uri"] = spec.homepage
-  spec.metadata["source_code_uri"] = spec.homepage
-
-  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.require_paths = ["lib"]
-
-  spec.add_dependency "resolv"
-end
diff --git a/lib/resolv-replace.rb b/lib/resolv-replace.rb
deleted file mode 100644
index a83e79d99603d4..00000000000000
--- a/lib/resolv-replace.rb
+++ /dev/null
@@ -1,76 +0,0 @@
-# frozen_string_literal: true
-
-require 'socket'
-require 'resolv'
-
-class << IPSocket
-  # :stopdoc:
-  alias original_resolv_getaddress getaddress
-  # :startdoc:
-  def getaddress(host)
-    begin
-      return Resolv.getaddress(host).to_s
-    rescue Resolv::ResolvError
-      raise SocketError, "Hostname not known: #{host}"
-    end
-  end
-end
-
-class TCPSocket < IPSocket
-  # :stopdoc:
-  alias original_resolv_initialize initialize
-  # :startdoc:
-  def initialize(host, serv, *rest)
-    rest[0] = IPSocket.getaddress(rest[0]) if rest[0]
-    original_resolv_initialize(IPSocket.getaddress(host), serv, *rest)
-  end
-end
-
-class UDPSocket < IPSocket
-  # :stopdoc:
-  alias original_resolv_bind bind
-  # :startdoc:
-  def bind(host, port)
-    host = IPSocket.getaddress(host) if host != ""
-    original_resolv_bind(host, port)
-  end
-
-  # :stopdoc:
-  alias original_resolv_connect connect
-  # :startdoc:
-  def connect(host, port)
-    original_resolv_connect(IPSocket.getaddress(host), port)
-  end
-
-  # :stopdoc:
-  alias original_resolv_send send
-  # :startdoc:
-  def send(mesg, flags, *rest)
-    if rest.length == 2
-      host, port = rest
-      begin
-        addrs = Resolv.getaddresses(host)
-      rescue Resolv::ResolvError
-        raise SocketError, "Hostname not known: #{host}"
-      end
-      addrs[0...-1].each {|addr|
-        begin
-          return original_resolv_send(mesg, flags, addr, port)
-        rescue SystemCallError
-        end
-      }
-      original_resolv_send(mesg, flags, addrs[-1], port)
-    else
-      original_resolv_send(mesg, flags, *rest)
-    end
-  end
-end
-
-class SOCKSSocket < TCPSocket
-  # :stopdoc:
-  alias original_resolv_initialize initialize
-  # :startdoc:
-  def initialize(host, serv)
-    original_resolv_initialize(IPSocket.getaddress(host), port)
-  end
-end if defined? SOCKSSocket
diff --git a/lib/resolv.gemspec b/lib/resolv.gemspec
index 6b83e303d7f51f..bfa2f9ff31f957 100644
--- a/lib/resolv.gemspec
+++ b/lib/resolv.gemspec
@@ -16,6 +16,7 @@ Gem::Specification.new do |spec|
   spec.homepage      = "https://github.com/ruby/resolv"
   spec.required_ruby_version = Gem::Requirement.new(">= 2.3.0")
   spec.licenses      = ["Ruby", "BSD-2-Clause"]
+  spec.extensions << "ext/win32/resolv/extconf.rb"
 
   spec.metadata["homepage_uri"] = spec.homepage
   spec.metadata["source_code_uri"] = spec.homepage
diff --git a/lib/resolv.rb b/lib/resolv.rb
index 47c4ef6b3b6600..e2255b7d11a70f 100644
--- a/lib/resolv.rb
+++ b/lib/resolv.rb
@@ -3,11 +3,7 @@
 require 'socket'
 require 'timeout'
 require 'io/wait'
-
-begin
-  require 'securerandom'
-rescue LoadError
-end
+require 'securerandom'
 
 # Resolv is a thread-aware DNS resolver library written in Ruby.  Resolv can
 # handle multiple DNS requests concurrently without blocking the entire Ruby
@@ -37,7 +33,7 @@
 
 class Resolv
 
-  VERSION = "0.2.2"
+  VERSION = "0.6.2"
 
   ##
   # Looks up the first IP address for +name+.
@@ -83,9 +79,22 @@ def self.each_name(address, &proc)
 
   ##
   # Creates a new Resolv using +resolvers+.
+  #
+  # If +resolvers+ is not given, a hash, or +nil+, uses a Hosts resolver and
+  # and a DNS resolver.  If +resolvers+ is a hash, uses the hash as
+  # configuration for the DNS resolver.
 
-  def initialize(resolvers=[Hosts.new, DNS.new])
-    @resolvers = resolvers
+  def initialize(resolvers=(arg_not_set = true; nil), use_ipv6: (keyword_not_set = true; nil))
+    if !keyword_not_set && !arg_not_set
+      warn "Support for separate use_ipv6 keyword is deprecated, as it is ignored if an argument is provided. Do not provide a positional argument if using the use_ipv6 keyword argument.", uplevel: 1
+    end
+
+    @resolvers = case resolvers
+    when Hash, nil
+      [Hosts.new, DNS.new(DNS::Config.default_config_hash.merge(resolvers || {}))]
+    else
+      resolvers
+    end
   end
 
   ##
@@ -164,13 +173,16 @@ class ResolvError < StandardError; end
 
   class ResolvTimeout < Timeout::Error; end
 
+  WINDOWS = /mswin|cygwin|mingw|bccwin/ =~ RUBY_PLATFORM || ::RbConfig::CONFIG['host_os'] =~ /mswin/
+  private_constant :WINDOWS
+
   ##
   # Resolv::Hosts is a hostname resolver that uses the system hosts file.
 
   class Hosts
-    if /mswin|mingw|cygwin/ =~ RUBY_PLATFORM and
+    if WINDOWS
       begin
-        require 'win32/resolv'
+        require 'win32/resolv' unless defined?(Win32::Resolv)
         DefaultFileName = Win32::Resolv.get_hosts_path || IO::NULL
       rescue LoadError
       end
@@ -194,17 +206,10 @@ def lazy_initialize # :nodoc:
           File.open(@filename, 'rb') {|f|
             f.each {|line|
               line.sub!(/#.*/, '')
-              addr, hostname, *aliases = line.split(/\s+/)
+              addr, *hostnames = line.split(/\s+/)
               next unless addr
-              @addr2name[addr] = [] unless @addr2name.include? addr
-              @addr2name[addr] << hostname
-              @addr2name[addr].concat(aliases)
-              @name2addr[hostname] = [] unless @name2addr.include? hostname
-              @name2addr[hostname] << addr
-              aliases.each {|n|
-                @name2addr[n] = [] unless @name2addr.include? n
-                @name2addr[n] << addr
-              }
+              (@addr2name[addr] ||= []).concat(hostnames)
+              hostnames.each {|hostname| (@name2addr[hostname] ||= []) << addr}
             }
           }
           @name2addr.each {|name, arr| arr.reverse!}
@@ -312,6 +317,8 @@ def self.open(*args)
     # String:: Path to a file using /etc/resolv.conf's format.
     # Hash:: Must contain :nameserver, :search and :ndots keys.
     # :nameserver_port can be used to specify port number of nameserver address.
+    # :raise_timeout_errors can be used to raise timeout errors
+    # as exceptions instead of treating the same as an NXDOMAIN response.
     #
     # The value of :nameserver should be an address string or
     # an array of address strings.
@@ -401,13 +408,20 @@ def getaddresses(name)
     # be a Resolv::IPv4 or Resolv::IPv6
 
     def each_address(name)
-      each_resource(name, Resource::IN::A) {|resource| yield resource.address}
       if use_ipv6?
         each_resource(name, Resource::IN::AAAA) {|resource| yield resource.address}
       end
+      each_resource(name, Resource::IN::A) {|resource| yield resource.address}
     end
 
     def use_ipv6? # :nodoc:
+      @config.lazy_initialize unless @config.instance_variable_get(:@initialized)
+
+      use_ipv6 = @config.use_ipv6?
+      unless use_ipv6.nil?
+        return use_ipv6
+      end
+
       begin
         list = Socket.ip_address_list
       rescue NotImplementedError
@@ -513,35 +527,40 @@ def each_resource(name, typeclass, &proc)
 
     def fetch_resource(name, typeclass)
       lazy_initialize
-      begin
-        requester = make_udp_requester
+      truncated = {}
+      requesters = {}
+      udp_requester = begin
+        make_udp_requester
       rescue Errno::EACCES
         # fall back to TCP
       end
       senders = {}
+
       begin
-        @config.resolv(name) {|candidate, tout, nameserver, port|
-          requester ||= make_tcp_requester(nameserver, port)
+        @config.resolv(name) do |candidate, tout, nameserver, port|
           msg = Message.new
           msg.rd = 1
           msg.add_question(candidate, typeclass)
-          unless sender = senders[[candidate, nameserver, port]]
+
+          requester = requesters.fetch([nameserver, port]) do
+            if !truncated[candidate] && udp_requester
+              udp_requester
+            else
+              requesters[[nameserver, port]] = make_tcp_requester(nameserver, port)
+            end
+          end
+
+          unless sender = senders[[candidate, requester, nameserver, port]]
             sender = requester.sender(msg, candidate, nameserver, port)
             next if !sender
-            senders[[candidate, nameserver, port]] = sender
+            senders[[candidate, requester, nameserver, port]] = sender
           end
           reply, reply_name = requester.request(sender, tout)
           case reply.rcode
           when RCode::NoError
             if reply.tc == 1 and not Requester::TCP === requester
-              requester.close
               # Retry via TCP:
-              requester = make_tcp_requester(nameserver, port)
-              senders = {}
-              # This will use TCP for all remaining candidates (assuming the
-              # current candidate does not already respond successfully via
-              # TCP).  This makes sense because we already know the full
-              # response will not fit in an untruncated UDP packet.
+              truncated[candidate] = true
               redo
             else
               yield(reply, reply_name)
@@ -552,9 +571,10 @@ def fetch_resource(name, typeclass)
           else
             raise Config::OtherResolvError.new(reply_name.to_s)
           end
-        }
+        end
       ensure
-        requester&.close
+        udp_requester&.close
+        requesters.each_value { |requester| requester&.close }
       end
     end
 
@@ -569,6 +589,11 @@ def make_udp_requester # :nodoc:
 
     def make_tcp_requester(host, port) # :nodoc:
       return Requester::TCP.new(host, port)
+    rescue Errno::ECONNREFUSED
+      # Treat a refused TCP connection attempt to a nameserver like a timeout,
+      # as Resolv::DNS::Config#resolv considers ResolvTimeout exceptions as a
+      # hint to try the next nameserver:
+      raise ResolvTimeout
     end
 
     def extract_resources(msg, name, typeclass) # :nodoc:
@@ -602,16 +627,10 @@ def extract_resources(msg, name, typeclass) # :nodoc:
       }
     end
 
-    if defined? SecureRandom
-      def self.random(arg) # :nodoc:
-        begin
-          SecureRandom.random_number(arg)
-        rescue NotImplementedError
-          rand(arg)
-        end
-      end
-    else
-      def self.random(arg) # :nodoc:
+    def self.random(arg) # :nodoc:
+      begin
+        SecureRandom.random_number(arg)
+      rescue NotImplementedError
         rand(arg)
       end
     end
@@ -643,8 +662,20 @@ def self.free_request_id(host, port, id) # :nodoc:
       }
     end
 
-    def self.bind_random_port(udpsock, bind_host="0.0.0.0") # :nodoc:
-      begin
+    case RUBY_PLATFORM
+    when *[
+      # https://www.rfc-editor.org/rfc/rfc6056.txt
+      # Appendix A. Survey of the Algorithms in Use by Some Popular Implementations
+      /freebsd/, /linux/, /netbsd/, /openbsd/, /solaris/,
+      /darwin/, # the same as FreeBSD
+    ] then
+      def self.bind_random_port(udpsock, bind_host="0.0.0.0") # :nodoc:
+        udpsock.bind(bind_host, 0)
+      end
+    else
+      # Sequential port assignment
+      def self.bind_random_port(udpsock, bind_host="0.0.0.0") # :nodoc:
+        # Ephemeral port number range recommended by RFC 6056
         port = random(1024..65535)
         udpsock.bind(bind_host, port)
       rescue Errno::EADDRINUSE, # POSIX
@@ -750,7 +781,7 @@ def lazy_initialize
               next if @socks_hash[bind_host]
               begin
                 sock = UDPSocket.new(af)
-              rescue Errno::EAFNOSUPPORT
+              rescue Errno::EAFNOSUPPORT, Errno::EPROTONOSUPPORT
                 next # The kernel doesn't support the address family.
               end
               @socks << sock
@@ -967,13 +998,13 @@ def Config.parse_resolv_conf(filename)
             next unless keyword
             case keyword
             when 'nameserver'
-              nameserver.concat(args)
+              nameserver.concat(args.each(&:freeze))
             when 'domain'
               next if args.empty?
-              search = [args[0]]
+              search = [args[0].freeze]
             when 'search'
               next if args.empty?
-              search = args
+              search = args.each(&:freeze)
             when 'options'
               args.each {|arg|
                 case arg
@@ -984,28 +1015,29 @@ def Config.parse_resolv_conf(filename)
             end
           }
         }
-        return { :nameserver => nameserver, :search => search, :ndots => ndots }
+        return { :nameserver => nameserver.freeze, :search => search.freeze, :ndots => ndots.freeze }.freeze
       end
 
       def Config.default_config_hash(filename="/etc/resolv.conf")
         if File.exist? filename
-          config_hash = Config.parse_resolv_conf(filename)
+          Config.parse_resolv_conf(filename)
+        elsif WINDOWS
+          require 'win32/resolv' unless defined?(Win32::Resolv)
+          search, nameserver = Win32::Resolv.get_resolv_info
+          config_hash = {}
+          config_hash[:nameserver] = nameserver if nameserver
+          config_hash[:search] = [search].flatten if search
+          config_hash
         else
-          if /mswin|cygwin|mingw|bccwin/ =~ RUBY_PLATFORM
-            require 'win32/resolv'
-            search, nameserver = Win32::Resolv.get_resolv_info
-            config_hash = {}
-            config_hash[:nameserver] = nameserver if nameserver
-            config_hash[:search] = [search].flatten if search
-          end
+          {}
         end
-        config_hash || {}
       end
 
       def lazy_initialize
         @mutex.synchronize {
           unless @initialized
             @nameserver_port = []
+            @use_ipv6 = nil
             @search = nil
             @ndots = 1
             case @config_info
@@ -1030,8 +1062,12 @@ def lazy_initialize
             if config_hash.include? :nameserver_port
               @nameserver_port = config_hash[:nameserver_port].map {|ns, port| [ns, (port || Port)] }
             end
+            if config_hash.include? :use_ipv6
+              @use_ipv6 = config_hash[:use_ipv6]
+            end
             @search = config_hash[:search] if config_hash.include? :search
             @ndots = config_hash[:ndots] if config_hash.include? :ndots
+            @raise_timeout_errors = config_hash[:raise_timeout_errors]
 
             if @nameserver_port.empty?
               @nameserver_port << ['0.0.0.0', Port]
@@ -1085,6 +1121,10 @@ def nameserver_port
         @nameserver_port
       end
 
+      def use_ipv6?
+        @use_ipv6
+      end
+
       def generate_candidates(name)
         candidates = nil
         name = Name.create(name)
@@ -1118,6 +1158,7 @@ def generate_timeouts
       def resolv(name)
         candidates = generate_candidates(name)
         timeouts = @timeouts || generate_timeouts
+        timeout_error = false
         begin
           candidates.each {|candidate|
             begin
@@ -1129,11 +1170,13 @@ def resolv(name)
                   end
                 }
               }
+              timeout_error = true
               raise ResolvError.new("DNS resolv timeout: #{name}")
             rescue NXDomain
             end
           }
         rescue ResolvError
+          raise if @raise_timeout_errors && timeout_error
         end
       end
 
@@ -1520,13 +1563,15 @@ def Message.decode(m)
           id, flag, qdcount, ancount, nscount, arcount =
             msg.get_unpack('nnnnnn')
           o.id = id
+          o.tc = (flag >> 9) & 1
+          o.rcode = flag & 15
+          return o unless o.tc.zero?
+
           o.qr = (flag >> 15) & 1
           o.opcode = (flag >> 11) & 15
           o.aa = (flag >> 10) & 1
-          o.tc = (flag >> 9) & 1
           o.rd = (flag >> 8) & 1
           o.ra = (flag >> 7) & 1
-          o.rcode = flag & 15
           (1..qdcount).each {
             name, typeclass = msg.get_question
             o.add_question(name, typeclass)
@@ -1618,6 +1663,14 @@ def get_string_list
           strings
         end
 
+        def get_list
+          [].tap do |values|
+            while @index < @limit
+              values << yield
+            end
+          end
+        end
+
         def get_name
           return Name.new(self.get_labels)
         end
@@ -1626,6 +1679,7 @@ def get_labels
           prev_index = @index
           save_index = nil
           d = []
+          size = -1
           while true
             raise DecodeError.new("limit exceeded") if @limit <= @index
             case @data.getbyte(@index)
@@ -1646,7 +1700,10 @@ def get_labels
               end
               @index = idx
             else
-              d << self.get_label
+              l = self.get_label
+              d << l
+              size += 1 + l.string.bytesize
+              raise DecodeError.new("name label data exceed 255 octets") if size > 255
             end
           end
         end
@@ -1678,6 +1735,377 @@ def get_rr
       end
     end
 
+    ##
+    # SvcParams for service binding RRs. [RFC9460]
+
+    class SvcParams
+      include Enumerable
+
+      ##
+      # Create a list of SvcParams with the given initial content.
+      #
+      # +params+ has to be an enumerable of +SvcParam+s.
+      # If its content has +SvcParam+s with the duplicate key,
+      # the one appears last takes precedence.
+
+      def initialize(params = [])
+        @params = {}
+
+        params.each do |param|
+          add param
+        end
+      end
+
+      ##
+      # Get SvcParam for the given +key+ in this list.
+
+      def [](key)
+        @params[canonical_key(key)]
+      end
+
+      ##
+      # Get the number of SvcParams in this list.
+
+      def count
+        @params.count
+      end
+
+      ##
+      # Get whether this list is empty.
+
+      def empty?
+        @params.empty?
+      end
+
+      ##
+      # Add the SvcParam +param+ to this list, overwriting the existing one with the same key.
+
+      def add(param)
+        @params[param.class.key_number] = param
+      end
+
+      ##
+      # Remove the +SvcParam+ with the given +key+ and return it.
+
+      def delete(key)
+        @params.delete(canonical_key(key))
+      end
+
+      ##
+      # Enumerate the +SvcParam+s in this list.
+
+      def each(&block)
+        return enum_for(:each) unless block
+        @params.each_value(&block)
+      end
+
+      def encode(msg) # :nodoc:
+        @params.keys.sort.each do |key|
+          msg.put_pack('n', key)
+          msg.put_length16 do
+            @params.fetch(key).encode(msg)
+          end
+        end
+      end
+
+      def self.decode(msg) # :nodoc:
+        params = msg.get_list do
+          key, = msg.get_unpack('n')
+          msg.get_length16 do
+            SvcParam::ClassHash[key].decode(msg)
+          end
+        end
+
+        return self.new(params)
+      end
+
+      private
+
+      def canonical_key(key) # :nodoc:
+        case key
+        when Integer
+          key
+        when /\Akey(\d+)\z/
+          Integer($1)
+        when Symbol
+          SvcParam::ClassHash[key].key_number
+        else
+          raise TypeError, 'key must be either String or Symbol'
+        end
+      end
+    end
+
+    ##
+    # Base class for SvcParam. [RFC9460]
+
+    class SvcParam
+
+      ##
+      # Get the presentation name of the SvcParamKey.
+
+      def self.key_name
+        const_get(:KeyName)
+      end
+
+      ##
+      # Get the registered number of the SvcParamKey.
+
+      def self.key_number
+        const_get(:KeyNumber)
+      end
+
+      ClassHash = Hash.new do |h, key| # :nodoc:
+        case key
+        when Integer
+          Generic.create(key)
+        when /\Akey(?<key>\d+)\z/
+          Generic.create(key.to_int)
+        when Symbol
+          raise KeyError, "unknown key #{key}"
+        else
+          raise TypeError, 'key must be either String or Symbol'
+        end
+      end
+
+      ##
+      # Generic SvcParam abstract class.
+
+      class Generic < SvcParam
+
+        ##
+        # SvcParamValue in wire-format byte string.
+
+        attr_reader :value
+
+        ##
+        # Create generic SvcParam
+
+        def initialize(value)
+          @value = value
+        end
+
+        def encode(msg) # :nodoc:
+          msg.put_bytes(@value)
+        end
+
+        def self.decode(msg) # :nodoc:
+          return self.new(msg.get_bytes)
+        end
+
+        def self.create(key_number)
+          c = Class.new(Generic)
+          key_name = :"key#{key_number}"
+          c.const_set(:KeyName, key_name)
+          c.const_set(:KeyNumber, key_number)
+          self.const_set(:"Key#{key_number}", c)
+          ClassHash[key_name] = ClassHash[key_number] = c
+          return c
+        end
+      end
+
+      ##
+      # "mandatory" SvcParam -- Mandatory keys in service binding RR
+
+      class Mandatory < SvcParam
+        KeyName = :mandatory
+        KeyNumber = 0
+        ClassHash[KeyName] = ClassHash[KeyNumber] = self # :nodoc:
+
+        ##
+        # Mandatory keys.
+
+        attr_reader :keys
+
+        ##
+        # Initialize "mandatory" ScvParam.
+
+        def initialize(keys)
+          @keys = keys.map(&:to_int)
+        end
+
+        def encode(msg) # :nodoc:
+          @keys.sort.each do |key|
+            msg.put_pack('n', key)
+          end
+        end
+
+        def self.decode(msg) # :nodoc:
+          keys = msg.get_list { msg.get_unpack('n')[0] }
+          return self.new(keys)
+        end
+      end
+
+      ##
+      # "alpn" SvcParam -- Additional supported protocols
+
+      class ALPN < SvcParam
+        KeyName = :alpn
+        KeyNumber = 1
+        ClassHash[KeyName] = ClassHash[KeyNumber] = self # :nodoc:
+
+        ##
+        # Supported protocol IDs.
+
+        attr_reader :protocol_ids
+
+        ##
+        # Initialize "alpn" ScvParam.
+
+        def initialize(protocol_ids)
+          @protocol_ids = protocol_ids.map(&:to_str)
+        end
+
+        def encode(msg) # :nodoc:
+          msg.put_string_list(@protocol_ids)
+        end
+
+        def self.decode(msg) # :nodoc:
+          return self.new(msg.get_string_list)
+        end
+      end
+
+      ##
+      # "no-default-alpn" SvcParam -- No support for default protocol
+
+      class NoDefaultALPN < SvcParam
+        KeyName = :'no-default-alpn'
+        KeyNumber = 2
+        ClassHash[KeyName] = ClassHash[KeyNumber] = self # :nodoc:
+
+        def encode(msg) # :nodoc:
+          # no payload
+        end
+
+        def self.decode(msg) # :nodoc:
+          return self.new
+        end
+      end
+
+      ##
+      # "port" SvcParam -- Port for alternative endpoint
+
+      class Port < SvcParam
+        KeyName = :port
+        KeyNumber = 3
+        ClassHash[KeyName] = ClassHash[KeyNumber] = self # :nodoc:
+
+        ##
+        # Port number.
+
+        attr_reader :port
+
+        ##
+        # Initialize "port" ScvParam.
+
+        def initialize(port)
+          @port = port.to_int
+        end
+
+        def encode(msg) # :nodoc:
+          msg.put_pack('n', @port)
+        end
+
+        def self.decode(msg) # :nodoc:
+          port, = msg.get_unpack('n')
+          return self.new(port)
+        end
+      end
+
+      ##
+      # "ipv4hint" SvcParam -- IPv4 address hints
+
+      class IPv4Hint < SvcParam
+        KeyName = :ipv4hint
+        KeyNumber = 4
+        ClassHash[KeyName] = ClassHash[KeyNumber] = self # :nodoc:
+
+        ##
+        # Set of IPv4 addresses.
+
+        attr_reader :addresses
+
+        ##
+        # Initialize "ipv4hint" ScvParam.
+
+        def initialize(addresses)
+          @addresses = addresses.map {|address| IPv4.create(address) }
+        end
+
+        def encode(msg) # :nodoc:
+          @addresses.each do |address|
+            msg.put_bytes(address.address)
+          end
+        end
+
+        def self.decode(msg) # :nodoc:
+          addresses = msg.get_list { IPv4.new(msg.get_bytes(4)) }
+          return self.new(addresses)
+        end
+      end
+
+      ##
+      # "ipv6hint" SvcParam -- IPv6 address hints
+
+      class IPv6Hint < SvcParam
+        KeyName = :ipv6hint
+        KeyNumber = 6
+        ClassHash[KeyName] = ClassHash[KeyNumber] = self # :nodoc:
+
+        ##
+        # Set of IPv6 addresses.
+
+        attr_reader :addresses
+
+        ##
+        # Initialize "ipv6hint" ScvParam.
+
+        def initialize(addresses)
+          @addresses = addresses.map {|address| IPv6.create(address) }
+        end
+
+        def encode(msg) # :nodoc:
+          @addresses.each do |address|
+            msg.put_bytes(address.address)
+          end
+        end
+
+        def self.decode(msg) # :nodoc:
+          addresses = msg.get_list { IPv6.new(msg.get_bytes(16)) }
+          return self.new(addresses)
+        end
+      end
+
+      ##
+      # "dohpath" SvcParam -- DNS over HTTPS path template [RFC9461]
+
+      class DoHPath < SvcParam
+        KeyName = :dohpath
+        KeyNumber = 7
+        ClassHash[KeyName] = ClassHash[KeyNumber] = self # :nodoc:
+
+        ##
+        # URI template for DoH queries.
+
+        attr_reader :template
+
+        ##
+        # Initialize "dohpath" ScvParam.
+
+        def initialize(template)
+          @template = template.encode('utf-8')
+        end
+
+        def encode(msg) # :nodoc:
+          msg.put_bytes(@template)
+        end
+
+        def self.decode(msg) # :nodoc:
+          template = msg.get_bytes.force_encoding('utf-8')
+          return self.new(template)
+        end
+      end
+    end
+
     ##
     # A DNS query abstract class.
 
@@ -1701,7 +2129,14 @@ class Resource < Query
 
       attr_reader :ttl
 
-      ClassHash = {} # :nodoc:
+      ClassHash = Module.new do
+        module_function
+
+        def []=(type_class_value, klass)
+          type_value, class_value = type_class_value
+          Resource.const_set(:"Type#{type_value}_Class#{class_value}", klass)
+        end
+      end
 
       def encode_rdata(msg) # :nodoc:
         raise NotImplementedError.new
@@ -1739,7 +2174,9 @@ def hash # :nodoc:
       end
 
       def self.get_class(type_value, class_value) # :nodoc:
-        return ClassHash[[type_value, class_value]] ||
+        cache = :"Type#{type_value}_Class#{class_value}"
+
+        return (const_defined?(cache) && const_get(cache)) ||
                Generic.create(type_value, class_value)
       end
 
@@ -2105,7 +2542,6 @@ def initialize(version, ssize, hprecision, vprecision, latitude, longitude, alti
 
         attr_reader :altitude
 
-
         def encode_rdata(msg) # :nodoc:
           msg.put_bytes(@version)
           msg.put_bytes(@ssize.scalar)
@@ -2143,8 +2579,70 @@ class ANY < Query
         TypeValue = 255 # :nodoc:
       end
 
+      ##
+      # CAA resource record defined in RFC 8659
+      #
+      # These records identify certificate authority allowed to issue
+      # certificates for the given domain.
+
+      class CAA < Resource
+        TypeValue = 257
+
+        ##
+        # Creates a new CAA for +flags+, +tag+ and +value+.
+
+        def initialize(flags, tag, value)
+          unless (0..255) === flags
+            raise ArgumentError.new('flags must be an Integer between 0 and 255')
+          end
+          unless (1..15) === tag.bytesize
+            raise ArgumentError.new('length of tag must be between 1 and 15')
+          end
+
+          @flags = flags
+          @tag = tag
+          @value = value
+        end
+
+        ##
+        # Flags for this property:
+        # - Bit 0 : 0 = not critical, 1 = critical
+
+        attr_reader :flags
+
+        ##
+        # Property tag ("issue", "issuewild", "iodef"...).
+
+        attr_reader :tag
+
+        ##
+        # Property value.
+
+        attr_reader :value
+
+        ##
+        # Whether the critical flag is set on this property.
+
+        def critical?
+          flags & 0x80 != 0
+        end
+
+        def encode_rdata(msg) # :nodoc:
+          msg.put_pack('C', @flags)
+          msg.put_string(@tag)
+          msg.put_bytes(@value)
+        end
+
+        def self.decode_rdata(msg) # :nodoc:
+          flags, = msg.get_unpack('C')
+          tag = msg.get_string
+          value = msg.get_bytes
+          self.new flags, tag, value
+        end
+      end
+
       ClassInsensitiveTypes = [ # :nodoc:
-        NS, CNAME, SOA, PTR, HINFO, MINFO, MX, TXT, LOC, ANY
+        NS, CNAME, SOA, PTR, HINFO, MINFO, MX, TXT, LOC, ANY, CAA
       ]
 
       ##
@@ -2341,6 +2839,84 @@ def self.decode_rdata(msg) # :nodoc:
             return self.new(priority, weight, port, target)
           end
         end
+
+        ##
+        # Common implementation for SVCB-compatible resource records.
+
+        class ServiceBinding
+
+          ##
+          # Create a service binding resource record.
+
+          def initialize(priority, target, params = [])
+            @priority = priority.to_int
+            @target = Name.create(target)
+            @params = SvcParams.new(params)
+          end
+
+          ##
+          # The priority of this target host.
+          #
+          # The range is 0-65535.
+          # If set to 0, this RR is in AliasMode. Otherwise, it is in ServiceMode.
+
+          attr_reader :priority
+
+          ##
+          # The domain name of the target host.
+
+          attr_reader :target
+
+          ##
+          # The service parameters for the target host.
+
+          attr_reader :params
+
+          ##
+          # Whether this RR is in AliasMode.
+
+          def alias_mode?
+            self.priority == 0
+          end
+
+          ##
+          # Whether this RR is in ServiceMode.
+
+          def service_mode?
+            !alias_mode?
+          end
+
+          def encode_rdata(msg) # :nodoc:
+            msg.put_pack("n", @priority)
+            msg.put_name(@target, compress: false)
+            @params.encode(msg)
+          end
+
+          def self.decode_rdata(msg) # :nodoc:
+            priority, = msg.get_unpack("n")
+            target    = msg.get_name
+            params    = SvcParams.decode(msg)
+            return self.new(priority, target, params)
+          end
+        end
+
+        ##
+        # SVCB resource record [RFC9460]
+
+        class SVCB < ServiceBinding
+          TypeValue = 64
+          ClassValue = IN::ClassValue
+          ClassHash[[TypeValue, ClassValue]] = self # :nodoc:
+        end
+
+        ##
+        # HTTPS resource record [RFC9460]
+
+        class HTTPS < ServiceBinding
+          TypeValue = 65
+          ClassValue = IN::ClassValue
+          ClassHash[[TypeValue, ClassValue]] = self # :nodoc:
+        end
       end
     end
   end
@@ -2560,11 +3136,7 @@ def initialize(address) # :nodoc:
     attr_reader :address
 
     def to_s # :nodoc:
-      address = sprintf("%x:%x:%x:%x:%x:%x:%x:%x", *@address.unpack("nnnnnnnn"))
-      unless address.sub!(/(^|:)0(:0)+(:|$)/, '::')
-        address.sub!(/(^|:)0(:|$)/, '::')
-      end
-      return address
+      sprintf("%x:%x:%x:%x:%x:%x:%x:%x", *@address.unpack("nnnnnnnn")).sub(/(^|:)0(:0)+(:|$)/, '::')
     end
 
     def inspect # :nodoc:
@@ -2909,4 +3481,3 @@ def DefaultResolver.replace_resolvers new_resolvers
   AddressRegex = /(?:#{IPv4::Regex})|(?:#{IPv6::Regex})/
 
 end
-
diff --git a/lib/rinda/rinda.gemspec b/lib/rinda/rinda.gemspec
deleted file mode 100644
index e9f53dd86414e3..00000000000000
--- a/lib/rinda/rinda.gemspec
+++ /dev/null
@@ -1,35 +0,0 @@
-name = File.basename(__FILE__, ".gemspec")
-version = ["lib/rinda", "."].find do |dir|
-  break File.foreach(File.join(__dir__, dir, "#{name}.rb")) do |line|
-    /^\s*VERSION\s*=\s*"(.*)"/ =~ line and break $1
-  end rescue nil
-end
-
-Gem::Specification.new do |spec|
-  spec.name          = name
-  spec.version       = version
-  spec.authors       = ["Masatoshi SEKI"]
-  spec.email         = ["seki@ruby-lang.org"]
-
-  spec.summary       = %q{The Linda distributed computing paradigm in Ruby.}
-  spec.description   = %q{The Linda distributed computing paradigm in Ruby.}
-  spec.homepage      = "https://github.com/ruby/rinda"
-  spec.required_ruby_version = Gem::Requirement.new(">= 2.3.0")
-  spec.licenses      = ["Ruby", "BSD-2-Clause"]
-
-  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"]
-
-  spec.add_dependency "drb"
-  spec.add_dependency "ipaddr"
-  spec.add_dependency "forwardable"
-end
diff --git a/lib/rinda/rinda.rb b/lib/rinda/rinda.rb
deleted file mode 100644
index ac3444244d707f..00000000000000
--- a/lib/rinda/rinda.rb
+++ /dev/null
@@ -1,329 +0,0 @@
-# frozen_string_literal: false
-require 'drb/drb'
-
-##
-# A module to implement the Linda distributed computing paradigm in Ruby.
-#
-# Rinda is part of DRb (dRuby).
-#
-# == Example(s)
-#
-# See the sample/drb/ directory in the Ruby distribution, from 1.8.2 onwards.
-#
-#--
-# TODO
-# == Introduction to Linda/rinda?
-#
-# == Why is this library separate from DRb?
-
-module Rinda
-
-  VERSION = "0.1.1"
-
-  ##
-  # Rinda error base class
-
-  class RindaError < RuntimeError; end
-
-  ##
-  # Raised when a hash-based tuple has an invalid key.
-
-  class InvalidHashTupleKey < RindaError; end
-
-  ##
-  # Raised when trying to use a canceled tuple.
-
-  class RequestCanceledError < ThreadError; end
-
-  ##
-  # Raised when trying to use an expired tuple.
-
-  class RequestExpiredError < ThreadError; end
-
-  ##
-  # A tuple is the elementary object in Rinda programming.
-  # Tuples may be matched against templates if the tuple and
-  # the template are the same size.
-
-  class Tuple
-
-    ##
-    # Creates a new Tuple from +ary_or_hash+ which must be an Array or Hash.
-
-    def initialize(ary_or_hash)
-      if hash?(ary_or_hash)
-        init_with_hash(ary_or_hash)
-      else
-        init_with_ary(ary_or_hash)
-      end
-    end
-
-    ##
-    # The number of elements in the tuple.
-
-    def size
-      @tuple.size
-    end
-
-    ##
-    # Accessor method for elements of the tuple.
-
-    def [](k)
-      @tuple[k]
-    end
-
-    ##
-    # Fetches item +k+ from the tuple.
-
-    def fetch(k)
-      @tuple.fetch(k)
-    end
-
-    ##
-    # Iterate through the tuple, yielding the index or key, and the
-    # value, thus ensuring arrays are iterated similarly to hashes.
-
-    def each # FIXME
-      if Hash === @tuple
-        @tuple.each { |k, v| yield(k, v) }
-      else
-        @tuple.each_with_index { |v, k| yield(k, v) }
-      end
-    end
-
-    ##
-    # Return the tuple itself
-    def value
-      @tuple
-    end
-
-    private
-
-    def hash?(ary_or_hash)
-      ary_or_hash.respond_to?(:keys)
-    end
-
-    ##
-    # Munges +ary+ into a valid Tuple.
-
-    def init_with_ary(ary)
-      @tuple = Array.new(ary.size)
-      @tuple.size.times do |i|
-        @tuple[i] = ary[i]
-      end
-    end
-
-    ##
-    # Ensures +hash+ is a valid Tuple.
-
-    def init_with_hash(hash)
-      @tuple = Hash.new
-      hash.each do |k, v|
-        raise InvalidHashTupleKey unless String === k
-        @tuple[k] = v
-      end
-    end
-
-  end
-
-  ##
-  # Templates are used to match tuples in Rinda.
-
-  class Template < Tuple
-
-    ##
-    # Matches this template against +tuple+.  The +tuple+ must be the same
-    # size as the template.  An element with a +nil+ value in a template acts
-    # as a wildcard, matching any value in the corresponding position in the
-    # tuple.  Elements of the template match the +tuple+ if the are #== or
-    # #===.
-    #
-    #   Template.new([:foo, 5]).match   Tuple.new([:foo, 5]) # => true
-    #   Template.new([:foo, nil]).match Tuple.new([:foo, 5]) # => true
-    #   Template.new([String]).match    Tuple.new(['hello']) # => true
-    #
-    #   Template.new([:foo]).match      Tuple.new([:foo, 5]) # => false
-    #   Template.new([:foo, 6]).match   Tuple.new([:foo, 5]) # => false
-    #   Template.new([:foo, nil]).match Tuple.new([:foo])    # => false
-    #   Template.new([:foo, 6]).match   Tuple.new([:foo])    # => false
-
-    def match(tuple)
-      return false unless tuple.respond_to?(:size)
-      return false unless tuple.respond_to?(:fetch)
-      return false unless self.size == tuple.size
-      each do |k, v|
-        begin
-          it = tuple.fetch(k)
-        rescue
-          return false
-        end
-        next if v.nil?
-        next if v == it
-        next if v === it
-        return false
-      end
-      return true
-    end
-
-    ##
-    # Alias for #match.
-
-    def ===(tuple)
-      match(tuple)
-    end
-
-  end
-
-  ##
-  # <i>Documentation?</i>
-
-  class DRbObjectTemplate
-
-    ##
-    # Creates a new DRbObjectTemplate that will match against +uri+ and +ref+.
-
-    def initialize(uri=nil, ref=nil)
-      @drb_uri = uri
-      @drb_ref = ref
-    end
-
-    ##
-    # This DRbObjectTemplate matches +ro+ if the remote object's drburi and
-    # drbref are the same.  +nil+ is used as a wildcard.
-
-    def ===(ro)
-      return true if super(ro)
-      unless @drb_uri.nil?
-        return false unless (@drb_uri === ro.__drburi rescue false)
-      end
-      unless @drb_ref.nil?
-        return false unless (@drb_ref === ro.__drbref rescue false)
-      end
-      true
-    end
-
-  end
-
-  ##
-  # TupleSpaceProxy allows a remote Tuplespace to appear as local.
-
-  class TupleSpaceProxy
-    ##
-    # A Port ensures that a moved tuple arrives properly at its destination
-    # and does not get lost.
-    #
-    # See https://bugs.ruby-lang.org/issues/8125
-
-    class Port # :nodoc:
-      attr_reader :value
-
-      def self.deliver
-        port = new
-
-        begin
-          yield(port)
-        ensure
-          port.close
-        end
-
-        port.value
-      end
-
-      def initialize
-        @open = true
-        @value = nil
-      end
-
-      ##
-      # Don't let the DRb thread push to it when remote sends tuple
-
-      def close
-        @open = false
-      end
-
-      ##
-      # Stores +value+ and ensure it does not get marshaled multiple times.
-
-      def push value
-        raise 'port closed' unless @open
-
-        @value = value
-
-        nil # avoid Marshal
-      end
-    end
-
-    ##
-    # Creates a new TupleSpaceProxy to wrap +ts+.
-
-    def initialize(ts)
-      @ts = ts
-    end
-
-    ##
-    # Adds +tuple+ to the proxied TupleSpace.  See TupleSpace#write.
-
-    def write(tuple, sec=nil)
-      @ts.write(tuple, sec)
-    end
-
-    ##
-    # Takes +tuple+ from the proxied TupleSpace.  See TupleSpace#take.
-
-    def take(tuple, sec=nil, &block)
-      Port.deliver do |port|
-        @ts.move(DRbObject.new(port), tuple, sec, &block)
-      end
-    end
-
-    ##
-    # Reads +tuple+ from the proxied TupleSpace.  See TupleSpace#read.
-
-    def read(tuple, sec=nil, &block)
-      @ts.read(tuple, sec, &block)
-    end
-
-    ##
-    # Reads all tuples matching +tuple+ from the proxied TupleSpace.  See
-    # TupleSpace#read_all.
-
-    def read_all(tuple)
-      @ts.read_all(tuple)
-    end
-
-    ##
-    # Registers for notifications of event +ev+ on the proxied TupleSpace.
-    # See TupleSpace#notify
-
-    def notify(ev, tuple, sec=nil)
-      @ts.notify(ev, tuple, sec)
-    end
-
-  end
-
-  ##
-  # An SimpleRenewer allows a TupleSpace to check if a TupleEntry is still
-  # alive.
-
-  class SimpleRenewer
-
-    include DRbUndumped
-
-    ##
-    # Creates a new SimpleRenewer that keeps an object alive for another +sec+
-    # seconds.
-
-    def initialize(sec=180)
-      @sec = sec
-    end
-
-    ##
-    # Called by the TupleSpace to check if the object is still alive.
-
-    def renew
-      @sec
-    end
-  end
-
-end
-
diff --git a/lib/rinda/ring.rb b/lib/rinda/ring.rb
deleted file mode 100644
index 948cfaf20831a1..00000000000000
--- a/lib/rinda/ring.rb
+++ /dev/null
@@ -1,484 +0,0 @@
-# frozen_string_literal: false
-#
-# Note: Rinda::Ring API is unstable.
-#
-require 'drb/drb'
-require_relative 'rinda'
-require 'ipaddr'
-
-module Rinda
-
-  ##
-  # The default port Ring discovery will use.
-
-  Ring_PORT = 7647
-
-  ##
-  # A RingServer allows a Rinda::TupleSpace to be located via UDP broadcasts.
-  # Default service location uses the following steps:
-  #
-  # 1. A RingServer begins listening on the network broadcast UDP address.
-  # 2. A RingFinger sends a UDP packet containing the DRb URI where it will
-  #    listen for a reply.
-  # 3. The RingServer receives the UDP packet and connects back to the
-  #    provided DRb URI with the DRb service.
-  #
-  # A RingServer requires a TupleSpace:
-  #
-  #   ts = Rinda::TupleSpace.new
-  #   rs = Rinda::RingServer.new
-  #
-  # RingServer can also listen on multicast addresses for announcements.  This
-  # allows multiple RingServers to run on the same host.  To use network
-  # broadcast and multicast:
-  #
-  #   ts = Rinda::TupleSpace.new
-  #   rs = Rinda::RingServer.new ts, %w[Socket::INADDR_ANY, 239.0.0.1 ff02::1]
-
-  class RingServer
-
-    include DRbUndumped
-
-    ##
-    # Special renewer for the RingServer to allow shutdown
-
-    class Renewer # :nodoc:
-      include DRbUndumped
-
-      ##
-      # Set to false to shutdown future requests using this Renewer
-
-      attr_writer :renew
-
-      def initialize # :nodoc:
-        @renew = true
-      end
-
-      def renew # :nodoc:
-        @renew ? 1 : true
-      end
-    end
-
-    ##
-    # Advertises +ts+ on the given +addresses+ at +port+.
-    #
-    # If +addresses+ is omitted only the UDP broadcast address is used.
-    #
-    # +addresses+ can contain multiple addresses.  If a multicast address is
-    # given in +addresses+ then the RingServer will listen for multicast
-    # queries.
-    #
-    # If you use IPv4 multicast you may need to set an address of the inbound
-    # interface which joins a multicast group.
-    #
-    #   ts = Rinda::TupleSpace.new
-    #   rs = Rinda::RingServer.new(ts, [['239.0.0.1', '9.5.1.1']])
-    #
-    # You can set addresses as an Array Object.  The first element of the
-    # Array is a multicast address and the second is an inbound interface
-    # address.  If the second is omitted then '0.0.0.0' is used.
-    #
-    # If you use IPv6 multicast you may need to set both the local interface
-    # address and the inbound interface index:
-    #
-    #   rs = Rinda::RingServer.new(ts, [['ff02::1', '::1', 1]])
-    #
-    # The first element is a multicast address and the second is an inbound
-    # interface address.  The third is an inbound interface index.
-    #
-    # At this time there is no easy way to get an interface index by name.
-    #
-    # If the second is omitted then '::1' is used.
-    # If the third is omitted then 0 (default interface) is used.
-
-    def initialize(ts, addresses=[Socket::INADDR_ANY], port=Ring_PORT)
-      @port = port
-
-      if Integer === addresses then
-        addresses, @port = [Socket::INADDR_ANY], addresses
-      end
-
-      @renewer = Renewer.new
-
-      @ts = ts
-      @sockets = []
-      addresses.each do |address|
-        if Array === address
-          make_socket(*address)
-        else
-          make_socket(address)
-        end
-      end
-
-      @w_services = write_services
-      @r_service  = reply_service
-    end
-
-    ##
-    # Creates a socket at +address+
-    #
-    # If +address+ is multicast address then +interface_address+ and
-    # +multicast_interface+ can be set as optional.
-    #
-    # A created socket is bound to +interface_address+.  If you use IPv4
-    # multicast then the interface of +interface_address+ is used as the
-    # inbound interface.  If +interface_address+ is omitted or nil then
-    # '0.0.0.0' or '::1' is used.
-    #
-    # If you use IPv6 multicast then +multicast_interface+ is used as the
-    # inbound interface.  +multicast_interface+ is a network interface index.
-    # If +multicast_interface+ is omitted then 0 (default interface) is used.
-
-    def make_socket(address, interface_address=nil, multicast_interface=0)
-      addrinfo = Addrinfo.udp(address, @port)
-
-      socket = Socket.new(addrinfo.pfamily, addrinfo.socktype,
-                          addrinfo.protocol)
-
-      if addrinfo.ipv4_multicast? or addrinfo.ipv6_multicast? then
-        if Socket.const_defined?(:SO_REUSEPORT) then
-          socket.setsockopt(:SOCKET, :SO_REUSEPORT, true)
-        else
-          socket.setsockopt(:SOCKET, :SO_REUSEADDR, true)
-        end
-
-        if addrinfo.ipv4_multicast? then
-          interface_address = '0.0.0.0' if interface_address.nil?
-          socket.bind(Addrinfo.udp(interface_address, @port))
-
-          mreq = IPAddr.new(addrinfo.ip_address).hton +
-            IPAddr.new(interface_address).hton
-
-          socket.setsockopt(:IPPROTO_IP, :IP_ADD_MEMBERSHIP, mreq)
-        else
-          interface_address = '::1' if interface_address.nil?
-          socket.bind(Addrinfo.udp(interface_address, @port))
-
-          mreq = IPAddr.new(addrinfo.ip_address).hton +
-            [multicast_interface].pack('I')
-
-          socket.setsockopt(:IPPROTO_IPV6, :IPV6_JOIN_GROUP, mreq)
-        end
-      else
-        socket.bind(addrinfo)
-      end
-
-      socket
-    rescue
-      socket = socket.close if socket
-      raise
-    ensure
-      @sockets << socket if socket
-    end
-
-    ##
-    # Creates threads that pick up UDP packets and passes them to do_write for
-    # decoding.
-
-    def write_services
-      @sockets.map do |s|
-        Thread.new(s) do |socket|
-          loop do
-            msg = socket.recv(1024)
-            do_write(msg)
-          end
-        end
-      end
-    end
-
-    ##
-    # Extracts the response URI from +msg+ and adds it to TupleSpace where it
-    # will be picked up by +reply_service+ for notification.
-
-    def do_write(msg)
-      Thread.new do
-        begin
-          tuple, sec = Marshal.load(msg)
-          @ts.write(tuple, sec)
-        rescue
-        end
-      end
-    end
-
-    ##
-    # Creates a thread that notifies waiting clients from the TupleSpace.
-
-    def reply_service
-      Thread.new do
-        loop do
-          do_reply
-        end
-      end
-    end
-
-    ##
-    # Pulls lookup tuples out of the TupleSpace and sends their DRb object the
-    # address of the local TupleSpace.
-
-    def do_reply
-      tuple = @ts.take([:lookup_ring, nil], @renewer)
-      Thread.new { tuple[1].call(@ts) rescue nil}
-    rescue
-    end
-
-    ##
-    # Shuts down the RingServer
-
-    def shutdown
-      @renewer.renew = false
-
-      @w_services.each do |thread|
-        thread.kill
-        thread.join
-      end
-
-      @sockets.each do |socket|
-        socket.close
-      end
-
-      @r_service.kill
-      @r_service.join
-    end
-
-  end
-
-  ##
-  # RingFinger is used by RingServer clients to discover the RingServer's
-  # TupleSpace.  Typically, all a client needs to do is call
-  # RingFinger.primary to retrieve the remote TupleSpace, which it can then
-  # begin using.
-  #
-  # To find the first available remote TupleSpace:
-  #
-  #   Rinda::RingFinger.primary
-  #
-  # To create a RingFinger that broadcasts to a custom list:
-  #
-  #   rf = Rinda::RingFinger.new  ['localhost', '192.0.2.1']
-  #   rf.primary
-  #
-  # Rinda::RingFinger also understands multicast addresses and sets them up
-  # properly.  This allows you to run multiple RingServers on the same host:
-  #
-  #   rf = Rinda::RingFinger.new ['239.0.0.1']
-  #   rf.primary
-  #
-  # You can set the hop count (or TTL) for multicast searches using
-  # #multicast_hops.
-  #
-  # If you use IPv6 multicast you may need to set both an address and the
-  # outbound interface index:
-  #
-  #   rf = Rinda::RingFinger.new ['ff02::1']
-  #   rf.multicast_interface = 1
-  #   rf.primary
-  #
-  # At this time there is no easy way to get an interface index by name.
-
-  class RingFinger
-
-    @@broadcast_list = ['<broadcast>', 'localhost']
-
-    @@finger = nil
-
-    ##
-    # Creates a singleton RingFinger and looks for a RingServer.  Returns the
-    # created RingFinger.
-
-    def self.finger
-      unless @@finger
-        @@finger = self.new
-        @@finger.lookup_ring_any
-      end
-      @@finger
-    end
-
-    ##
-    # Returns the first advertised TupleSpace.
-
-    def self.primary
-      finger.primary
-    end
-
-    ##
-    # Contains all discovered TupleSpaces except for the primary.
-
-    def self.to_a
-      finger.to_a
-    end
-
-    ##
-    # The list of addresses where RingFinger will send query packets.
-
-    attr_accessor :broadcast_list
-
-    ##
-    # Maximum number of hops for sent multicast packets (if using a multicast
-    # address in the broadcast list).  The default is 1 (same as UDP
-    # broadcast).
-
-    attr_accessor :multicast_hops
-
-    ##
-    # The interface index to send IPv6 multicast packets from.
-
-    attr_accessor :multicast_interface
-
-    ##
-    # The port that RingFinger will send query packets to.
-
-    attr_accessor :port
-
-    ##
-    # Contain the first advertised TupleSpace after lookup_ring_any is called.
-
-    attr_accessor :primary
-
-    ##
-    # Creates a new RingFinger that will look for RingServers at +port+ on
-    # the addresses in +broadcast_list+.
-    #
-    # If +broadcast_list+ contains a multicast address then multicast queries
-    # will be made using the given multicast_hops and multicast_interface.
-
-    def initialize(broadcast_list=@@broadcast_list, port=Ring_PORT)
-      @broadcast_list = broadcast_list || ['localhost']
-      @port = port
-      @primary = nil
-      @rings = []
-
-      @multicast_hops = 1
-      @multicast_interface = 0
-    end
-
-    ##
-    # Contains all discovered TupleSpaces except for the primary.
-
-    def to_a
-      @rings
-    end
-
-    ##
-    # Iterates over all discovered TupleSpaces starting with the primary.
-
-    def each
-      lookup_ring_any unless @primary
-      return unless @primary
-      yield(@primary)
-      @rings.each { |x| yield(x) }
-    end
-
-    ##
-    # Looks up RingServers waiting +timeout+ seconds.  RingServers will be
-    # given +block+ as a callback, which will be called with the remote
-    # TupleSpace.
-
-    def lookup_ring(timeout=5, &block)
-      return lookup_ring_any(timeout) unless block_given?
-
-      msg = Marshal.dump([[:lookup_ring, DRbObject.new(block)], timeout])
-      @broadcast_list.each do |it|
-        send_message(it, msg)
-      end
-      sleep(timeout)
-    end
-
-    ##
-    # Returns the first found remote TupleSpace.  Any further recovered
-    # TupleSpaces can be found by calling +to_a+.
-
-    def lookup_ring_any(timeout=5)
-      queue = Thread::Queue.new
-
-      Thread.new do
-        self.lookup_ring(timeout) do |ts|
-          queue.push(ts)
-        end
-        queue.push(nil)
-      end
-
-      @primary = queue.pop
-      raise('RingNotFound') if @primary.nil?
-
-      Thread.new do
-        while it = queue.pop
-          @rings.push(it)
-        end
-      end
-
-      @primary
-    end
-
-    ##
-    # Creates a socket for +address+ with the appropriate multicast options
-    # for multicast addresses.
-
-    def make_socket(address) # :nodoc:
-      addrinfo = Addrinfo.udp(address, @port)
-
-      soc = Socket.new(addrinfo.pfamily, addrinfo.socktype, addrinfo.protocol)
-      begin
-        if addrinfo.ipv4_multicast? then
-          soc.setsockopt(Socket::Option.ipv4_multicast_loop(1))
-          soc.setsockopt(Socket::Option.ipv4_multicast_ttl(@multicast_hops))
-        elsif addrinfo.ipv6_multicast? then
-          soc.setsockopt(:IPPROTO_IPV6, :IPV6_MULTICAST_LOOP, true)
-          soc.setsockopt(:IPPROTO_IPV6, :IPV6_MULTICAST_HOPS,
-                         [@multicast_hops].pack('I'))
-          soc.setsockopt(:IPPROTO_IPV6, :IPV6_MULTICAST_IF,
-                         [@multicast_interface].pack('I'))
-        else
-          soc.setsockopt(:SOL_SOCKET, :SO_BROADCAST, true)
-        end
-
-        soc.connect(addrinfo)
-      rescue Exception
-        soc.close
-        raise
-      end
-
-      soc
-    end
-
-    def send_message(address, message) # :nodoc:
-      soc = make_socket(address)
-
-      soc.send(message, 0)
-    rescue
-      nil
-    ensure
-      soc.close if soc
-    end
-
-  end
-
-  ##
-  # RingProvider uses a RingServer advertised TupleSpace as a name service.
-  # TupleSpace clients can register themselves with the remote TupleSpace and
-  # look up other provided services via the remote TupleSpace.
-  #
-  # Services are registered with a tuple of the format [:name, klass,
-  # DRbObject, description].
-
-  class RingProvider
-
-    ##
-    # Creates a RingProvider that will provide a +klass+ service running on
-    # +front+, with a +description+.  +renewer+ is optional.
-
-    def initialize(klass, front, desc, renewer = nil)
-      @tuple = [:name, klass, front, desc]
-      @renewer = renewer || Rinda::SimpleRenewer.new
-    end
-
-    ##
-    # Advertises this service on the primary remote TupleSpace.
-
-    def provide
-      ts = Rinda::RingFinger.primary
-      ts.write(@tuple, @renewer)
-    end
-
-  end
-
-end
diff --git a/lib/rinda/tuplespace.rb b/lib/rinda/tuplespace.rb
deleted file mode 100644
index 6a41a7ba75d503..00000000000000
--- a/lib/rinda/tuplespace.rb
+++ /dev/null
@@ -1,641 +0,0 @@
-# frozen_string_literal: false
-require 'monitor'
-require 'drb/drb'
-require_relative 'rinda'
-require 'forwardable'
-
-module Rinda
-
-  ##
-  # A TupleEntry is a Tuple (i.e. a possible entry in some Tuplespace)
-  # together with expiry and cancellation data.
-
-  class TupleEntry
-
-    include DRbUndumped
-
-    attr_accessor :expires
-
-    ##
-    # Creates a TupleEntry based on +ary+ with an optional renewer or expiry
-    # time +sec+.
-    #
-    # A renewer must implement the +renew+ method which returns a Numeric,
-    # nil, or true to indicate when the tuple has expired.
-
-    def initialize(ary, sec=nil)
-      @cancel = false
-      @expires = nil
-      @tuple = make_tuple(ary)
-      @renewer = nil
-      renew(sec)
-    end
-
-    ##
-    # Marks this TupleEntry as canceled.
-
-    def cancel
-      @cancel = true
-    end
-
-    ##
-    # A TupleEntry is dead when it is canceled or expired.
-
-    def alive?
-      !canceled? && !expired?
-    end
-
-    ##
-    # Return the object which makes up the tuple itself: the Array
-    # or Hash.
-
-    def value; @tuple.value; end
-
-    ##
-    # Returns the canceled status.
-
-    def canceled?; @cancel; end
-
-    ##
-    # Has this tuple expired? (true/false).
-    #
-    # A tuple has expired when its expiry timer based on the +sec+ argument to
-    # #initialize runs out.
-
-    def expired?
-      return true unless @expires
-      return false if @expires > Time.now
-      return true if @renewer.nil?
-      renew(@renewer)
-      return true unless @expires
-      return @expires < Time.now
-    end
-
-    ##
-    # Reset the expiry time according to +sec_or_renewer+.
-    #
-    # +nil+::    it is set to expire in the far future.
-    # +true+::   it has expired.
-    # Numeric::  it will expire in that many seconds.
-    #
-    # Otherwise the argument refers to some kind of renewer object
-    # which will reset its expiry time.
-
-    def renew(sec_or_renewer)
-      sec, @renewer = get_renewer(sec_or_renewer)
-      @expires = make_expires(sec)
-    end
-
-    ##
-    # Returns an expiry Time based on +sec+ which can be one of:
-    # Numeric:: +sec+ seconds into the future
-    # +true+::  the expiry time is the start of 1970 (i.e. expired)
-    # +nil+::   it is  Tue Jan 19 03:14:07 GMT Standard Time 2038 (i.e. when
-    #           UNIX clocks will die)
-
-    def make_expires(sec=nil)
-      case sec
-      when Numeric
-        Time.now + sec
-      when true
-        Time.at(1)
-      when nil
-        Time.at(2**31-1)
-      end
-    end
-
-    ##
-    # Retrieves +key+ from the tuple.
-
-    def [](key)
-      @tuple[key]
-    end
-
-    ##
-    # Fetches +key+ from the tuple.
-
-    def fetch(key)
-      @tuple.fetch(key)
-    end
-
-    ##
-    # The size of the tuple.
-
-    def size
-      @tuple.size
-    end
-
-    ##
-    # Creates a Rinda::Tuple for +ary+.
-
-    def make_tuple(ary)
-      Rinda::Tuple.new(ary)
-    end
-
-    private
-
-    ##
-    # Returns a valid argument to make_expires and the renewer or nil.
-    #
-    # Given +true+, +nil+, or Numeric, returns that value and +nil+ (no actual
-    # renewer).  Otherwise it returns an expiry value from calling +it.renew+
-    # and the renewer.
-
-    def get_renewer(it)
-      case it
-      when Numeric, true, nil
-        return it, nil
-      else
-        begin
-          return it.renew, it
-        rescue Exception
-          return it, nil
-        end
-      end
-    end
-
-  end
-
-  ##
-  # A TemplateEntry is a Template together with expiry and cancellation data.
-
-  class TemplateEntry < TupleEntry
-    ##
-    # Matches this TemplateEntry against +tuple+.  See Template#match for
-    # details on how a Template matches a Tuple.
-
-    def match(tuple)
-      @tuple.match(tuple)
-    end
-
-    alias === match
-
-    def make_tuple(ary) # :nodoc:
-      Rinda::Template.new(ary)
-    end
-
-  end
-
-  ##
-  # <i>Documentation?</i>
-
-  class WaitTemplateEntry < TemplateEntry
-
-    attr_reader :found
-
-    def initialize(place, ary, expires=nil)
-      super(ary, expires)
-      @place = place
-      @cond = place.new_cond
-      @found = nil
-    end
-
-    def cancel
-      super
-      signal
-    end
-
-    def wait
-      @cond.wait
-    end
-
-    def read(tuple)
-      @found = tuple
-      signal
-    end
-
-    def signal
-      @place.synchronize do
-        @cond.signal
-      end
-    end
-
-  end
-
-  ##
-  # A NotifyTemplateEntry is returned by TupleSpace#notify and is notified of
-  # TupleSpace changes.  You may receive either your subscribed event or the
-  # 'close' event when iterating over notifications.
-  #
-  # See TupleSpace#notify_event for valid notification types.
-  #
-  # == Example
-  #
-  #   ts = Rinda::TupleSpace.new
-  #   observer = ts.notify 'write', [nil]
-  #
-  #   Thread.start do
-  #     observer.each { |t| p t }
-  #   end
-  #
-  #   3.times { |i| ts.write [i] }
-  #
-  # Outputs:
-  #
-  #   ['write', [0]]
-  #   ['write', [1]]
-  #   ['write', [2]]
-
-  class NotifyTemplateEntry < TemplateEntry
-
-    ##
-    # Creates a new NotifyTemplateEntry that watches +place+ for +event+s that
-    # match +tuple+.
-
-    def initialize(place, event, tuple, expires=nil)
-      ary = [event, Rinda::Template.new(tuple)]
-      super(ary, expires)
-      @queue = Thread::Queue.new
-      @done = false
-    end
-
-    ##
-    # Called by TupleSpace to notify this NotifyTemplateEntry of a new event.
-
-    def notify(ev)
-      @queue.push(ev)
-    end
-
-    ##
-    # Retrieves a notification.  Raises RequestExpiredError when this
-    # NotifyTemplateEntry expires.
-
-    def pop
-      raise RequestExpiredError if @done
-      it = @queue.pop
-      @done = true if it[0] == 'close'
-      return it
-    end
-
-    ##
-    # Yields event/tuple pairs until this NotifyTemplateEntry expires.
-
-    def each # :yields: event, tuple
-      while !@done
-        it = pop
-        yield(it)
-      end
-    rescue
-    ensure
-      cancel
-    end
-
-  end
-
-  ##
-  # TupleBag is an unordered collection of tuples. It is the basis
-  # of Tuplespace.
-
-  class TupleBag
-    class TupleBin
-      extend Forwardable
-      def_delegators '@bin', :find_all, :delete_if, :each, :empty?
-
-      def initialize
-        @bin = []
-      end
-
-      def add(tuple)
-        @bin.push(tuple)
-      end
-
-      def delete(tuple)
-        idx = @bin.rindex(tuple)
-        @bin.delete_at(idx) if idx
-      end
-
-      def find
-        @bin.reverse_each do |x|
-          return x if yield(x)
-        end
-        nil
-      end
-    end
-
-    def initialize # :nodoc:
-      @hash = {}
-      @enum = enum_for(:each_entry)
-    end
-
-    ##
-    # +true+ if the TupleBag to see if it has any expired entries.
-
-    def has_expires?
-      @enum.find do |tuple|
-        tuple.expires
-      end
-    end
-
-    ##
-    # Add +tuple+ to the TupleBag.
-
-    def push(tuple)
-      key = bin_key(tuple)
-      @hash[key] ||= TupleBin.new
-      @hash[key].add(tuple)
-    end
-
-    ##
-    # Removes +tuple+ from the TupleBag.
-
-    def delete(tuple)
-      key = bin_key(tuple)
-      bin = @hash[key]
-      return nil unless bin
-      bin.delete(tuple)
-      @hash.delete(key) if bin.empty?
-      tuple
-    end
-
-    ##
-    # Finds all live tuples that match +template+.
-    def find_all(template)
-      bin_for_find(template).find_all do |tuple|
-        tuple.alive? && template.match(tuple)
-      end
-    end
-
-    ##
-    # Finds a live tuple that matches +template+.
-
-    def find(template)
-      bin_for_find(template).find do |tuple|
-        tuple.alive? && template.match(tuple)
-      end
-    end
-
-    ##
-    # Finds all tuples in the TupleBag which when treated as templates, match
-    # +tuple+ and are alive.
-
-    def find_all_template(tuple)
-      @enum.find_all do |template|
-        template.alive? && template.match(tuple)
-      end
-    end
-
-    ##
-    # Delete tuples which dead tuples from the TupleBag, returning the deleted
-    # tuples.
-
-    def delete_unless_alive
-      deleted = []
-      @hash.each do |key, bin|
-        bin.delete_if do |tuple|
-          if tuple.alive?
-            false
-          else
-            deleted.push(tuple)
-            true
-          end
-        end
-      end
-      deleted
-    end
-
-    private
-    def each_entry(&blk)
-      @hash.each do |k, v|
-        v.each(&blk)
-      end
-    end
-
-    def bin_key(tuple)
-      head = tuple[0]
-      if head.class == Symbol
-        return head
-      else
-        false
-      end
-    end
-
-    def bin_for_find(template)
-      key = bin_key(template)
-      key ? @hash.fetch(key, []) : @enum
-    end
-  end
-
-  ##
-  # The Tuplespace manages access to the tuples it contains,
-  # ensuring mutual exclusion requirements are met.
-  #
-  # The +sec+ option for the write, take, move, read and notify methods may
-  # either be a number of seconds or a Renewer object.
-
-  class TupleSpace
-
-    include DRbUndumped
-    include MonitorMixin
-
-    ##
-    # Creates a new TupleSpace.  +period+ is used to control how often to look
-    # for dead tuples after modifications to the TupleSpace.
-    #
-    # If no dead tuples are found +period+ seconds after the last
-    # modification, the TupleSpace will stop looking for dead tuples.
-
-    def initialize(period=60)
-      super()
-      @bag = TupleBag.new
-      @read_waiter = TupleBag.new
-      @take_waiter = TupleBag.new
-      @notify_waiter = TupleBag.new
-      @period = period
-      @keeper = nil
-    end
-
-    ##
-    # Adds +tuple+
-
-    def write(tuple, sec=nil)
-      entry = create_entry(tuple, sec)
-      synchronize do
-        if entry.expired?
-          @read_waiter.find_all_template(entry).each do |template|
-            template.read(tuple)
-          end
-          notify_event('write', entry.value)
-          notify_event('delete', entry.value)
-        else
-          @bag.push(entry)
-          start_keeper if entry.expires
-          @read_waiter.find_all_template(entry).each do |template|
-            template.read(tuple)
-          end
-          @take_waiter.find_all_template(entry).each do |template|
-            template.signal
-          end
-          notify_event('write', entry.value)
-        end
-      end
-      entry
-    end
-
-    ##
-    # Removes +tuple+
-
-    def take(tuple, sec=nil, &block)
-      move(nil, tuple, sec, &block)
-    end
-
-    ##
-    # Moves +tuple+ to +port+.
-
-    def move(port, tuple, sec=nil)
-      template = WaitTemplateEntry.new(self, tuple, sec)
-      yield(template) if block_given?
-      synchronize do
-        entry = @bag.find(template)
-        if entry
-          port.push(entry.value) if port
-          @bag.delete(entry)
-          notify_event('take', entry.value)
-          return port ? nil : entry.value
-        end
-        raise RequestExpiredError if template.expired?
-
-        begin
-          @take_waiter.push(template)
-          start_keeper if template.expires
-          while true
-            raise RequestCanceledError if template.canceled?
-            raise RequestExpiredError if template.expired?
-            entry = @bag.find(template)
-            if entry
-              port.push(entry.value) if port
-              @bag.delete(entry)
-              notify_event('take', entry.value)
-              return port ? nil : entry.value
-            end
-            template.wait
-          end
-        ensure
-          @take_waiter.delete(template)
-        end
-      end
-    end
-
-    ##
-    # Reads +tuple+, but does not remove it.
-
-    def read(tuple, sec=nil)
-      template = WaitTemplateEntry.new(self, tuple, sec)
-      yield(template) if block_given?
-      synchronize do
-        entry = @bag.find(template)
-        return entry.value if entry
-        raise RequestExpiredError if template.expired?
-
-        begin
-          @read_waiter.push(template)
-          start_keeper if template.expires
-          template.wait
-          raise RequestCanceledError if template.canceled?
-          raise RequestExpiredError if template.expired?
-          return template.found
-        ensure
-          @read_waiter.delete(template)
-        end
-      end
-    end
-
-    ##
-    # Returns all tuples matching +tuple+.  Does not remove the found tuples.
-
-    def read_all(tuple)
-      template = WaitTemplateEntry.new(self, tuple, nil)
-      synchronize do
-        entry = @bag.find_all(template)
-        entry.collect do |e|
-          e.value
-        end
-      end
-    end
-
-    ##
-    # Registers for notifications of +event+.  Returns a NotifyTemplateEntry.
-    # See NotifyTemplateEntry for examples of how to listen for notifications.
-    #
-    # +event+ can be:
-    # 'write'::  A tuple was added
-    # 'take'::   A tuple was taken or moved
-    # 'delete':: A tuple was lost after being overwritten or expiring
-    #
-    # The TupleSpace will also notify you of the 'close' event when the
-    # NotifyTemplateEntry has expired.
-
-    def notify(event, tuple, sec=nil)
-      template = NotifyTemplateEntry.new(self, event, tuple, sec)
-      synchronize do
-        @notify_waiter.push(template)
-      end
-      template
-    end
-
-    private
-
-    def create_entry(tuple, sec)
-      TupleEntry.new(tuple, sec)
-    end
-
-    ##
-    # Removes dead tuples.
-
-    def keep_clean
-      synchronize do
-        @read_waiter.delete_unless_alive.each do |e|
-          e.signal
-        end
-        @take_waiter.delete_unless_alive.each do |e|
-          e.signal
-        end
-        @notify_waiter.delete_unless_alive.each do |e|
-          e.notify(['close'])
-        end
-        @bag.delete_unless_alive.each do |e|
-          notify_event('delete', e.value)
-        end
-      end
-    end
-
-    ##
-    # Notifies all registered listeners for +event+ of a status change of
-    # +tuple+.
-
-    def notify_event(event, tuple)
-      ev = [event, tuple]
-      @notify_waiter.find_all_template(ev).each do |template|
-        template.notify(ev)
-      end
-    end
-
-    ##
-    # Creates a thread that scans the tuplespace for expired tuples.
-
-    def start_keeper
-      return if @keeper && @keeper.alive?
-      @keeper = Thread.new do
-        while true
-          sleep(@period)
-          synchronize do
-            break unless need_keeper?
-            keep_clean
-          end
-        end
-      end
-    end
-
-    ##
-    # Checks the tuplespace to see if it needs cleaning.
-
-    def need_keeper?
-      return true if @bag.has_expires?
-      return true if @read_waiter.has_expires?
-      return true if @take_waiter.has_expires?
-      return true if @notify_waiter.has_expires?
-    end
-
-  end
-
-end
-
diff --git a/lib/ruby_vm/rjit/assembler.rb b/lib/ruby_vm/rjit/assembler.rb
deleted file mode 100644
index 64f663ec0e1c57..00000000000000
--- a/lib/ruby_vm/rjit/assembler.rb
+++ /dev/null
@@ -1,1129 +0,0 @@
-# frozen_string_literal: true
-module RubyVM::RJIT
-  # 8-bit memory access
-  class BytePtr < Data.define(:reg, :disp); end
-
-  # 32-bit memory access
-  class DwordPtr < Data.define(:reg, :disp); end
-
-  # 64-bit memory access
-  QwordPtr = Array
-
-  # SystemV x64 calling convention
-  C_ARGS = [:rdi, :rsi, :rdx, :rcx, :r8, :r9]
-  C_RET  = :rax
-
-  # https://cdrdv2.intel.com/v1/dl/getContent/671110
-  # Mostly an x86_64 assembler, but this also has some stuff that is useful for any architecture.
-  class Assembler
-    # rel8 jumps are made with labels
-    class Label < Data.define(:id, :name); end
-
-    # rel32 is inserted as [Rel32, Rel32Pad..] and converted on #resolve_rel32
-    class Rel32 < Data.define(:addr); end
-    Rel32Pad = Object.new
-
-    # A set of ModR/M values encoded on #insn
-    class ModRM < Data.define(:mod, :reg, :rm); end
-    Mod00 = 0b00 # Mod 00: [reg]
-    Mod01 = 0b01 # Mod 01: [reg]+disp8
-    Mod10 = 0b10 # Mod 10: [reg]+disp32
-    Mod11 = 0b11 # Mod 11: reg
-
-    # REX =   0100WR0B
-    REX_B = 0b01000001
-    REX_R = 0b01000100
-    REX_W = 0b01001000
-
-    # Operand matchers
-    R32   = -> (op) { op.is_a?(Symbol) && r32?(op) }
-    R64   = -> (op) { op.is_a?(Symbol) && r64?(op) }
-    IMM8  = -> (op) { op.is_a?(Integer) && imm8?(op) }
-    IMM32 = -> (op) { op.is_a?(Integer) && imm32?(op) }
-    IMM64 = -> (op) { op.is_a?(Integer) && imm64?(op) }
-
-    def initialize
-      @bytes = []
-      @labels = {}
-      @label_id = 0
-      @comments = Hash.new { |h, k| h[k] = [] }
-      @blocks = Hash.new { |h, k| h[k] = [] }
-      @stub_starts = Hash.new { |h, k| h[k] = [] }
-      @stub_ends = Hash.new { |h, k| h[k] = [] }
-      @pos_markers = Hash.new { |h, k| h[k] = [] }
-    end
-
-    def assemble(addr)
-      set_code_addrs(addr)
-      resolve_rel32(addr)
-      resolve_labels
-
-      write_bytes(addr)
-
-      @pos_markers.each do |write_pos, markers|
-        markers.each { |marker| marker.call(addr + write_pos) }
-      end
-      @bytes.size
-    ensure
-      @bytes.clear
-    end
-
-    def size
-      @bytes.size
-    end
-
-    #
-    # Instructions
-    #
-
-    def add(dst, src)
-      case [dst, src]
-      # ADD r/m64, imm8 (Mod 00: [reg])
-      in [QwordPtr[R64 => dst_reg], IMM8 => src_imm]
-        # REX.W + 83 /0 ib
-        # MI: Operand 1: ModRM:r/m (r, w), Operand 2: imm8/16/32
-        insn(
-          prefix: REX_W,
-          opcode: 0x83,
-          mod_rm: ModRM[mod: Mod00, reg: 0, rm: dst_reg],
-          imm: imm8(src_imm),
-        )
-      # ADD r/m64, imm8 (Mod 11: reg)
-      in [R64 => dst_reg, IMM8 => src_imm]
-        # REX.W + 83 /0 ib
-        # MI: Operand 1: ModRM:r/m (r, w), Operand 2: imm8/16/32
-        insn(
-          prefix: REX_W,
-          opcode: 0x83,
-          mod_rm: ModRM[mod: Mod11, reg: 0, rm: dst_reg],
-          imm: imm8(src_imm),
-        )
-      # ADD r/m64 imm32 (Mod 11: reg)
-      in [R64 => dst_reg, IMM32 => src_imm]
-        # REX.W + 81 /0 id
-        # MI: Operand 1: ModRM:r/m (r, w), Operand 2: imm8/16/32
-        insn(
-          prefix: REX_W,
-          opcode: 0x81,
-          mod_rm: ModRM[mod: Mod11, reg: 0, rm: dst_reg],
-          imm: imm32(src_imm),
-        )
-      # ADD r/m64, r64 (Mod 11: reg)
-      in [R64 => dst_reg, R64 => src_reg]
-        # REX.W + 01 /r
-        # MR: Operand 1: ModRM:r/m (r, w), Operand 2: ModRM:reg (r)
-        insn(
-          prefix: REX_W,
-          opcode: 0x01,
-          mod_rm: ModRM[mod: Mod11, reg: src_reg, rm: dst_reg],
-        )
-      end
-    end
-
-    def and(dst, src)
-      case [dst, src]
-      # AND r/m64, imm8 (Mod 11: reg)
-      in [R64 => dst_reg, IMM8 => src_imm]
-        # REX.W + 83 /4 ib
-        # MI: Operand 1: ModRM:r/m (r, w), Operand 2: imm8/16/32
-        insn(
-          prefix: REX_W,
-          opcode: 0x83,
-          mod_rm: ModRM[mod: Mod11, reg: 4, rm: dst_reg],
-          imm: imm8(src_imm),
-        )
-      # AND r/m64, imm32 (Mod 11: reg)
-      in [R64 => dst_reg, IMM32 => src_imm]
-        # REX.W + 81 /4 id
-        # MI: Operand 1: ModRM:r/m (r, w), Operand 2: imm8/16/32
-        insn(
-          prefix: REX_W,
-          opcode: 0x81,
-          mod_rm: ModRM[mod: Mod11, reg: 4, rm: dst_reg],
-          imm: imm32(src_imm),
-        )
-      # AND r64, r/m64 (Mod 01: [reg]+disp8)
-      in [R64 => dst_reg, QwordPtr[R64 => src_reg, IMM8 => src_disp]]
-        # REX.W + 23 /r
-        # RM: Operand 1: ModRM:reg (r, w), Operand 2: ModRM:r/m (r)
-        insn(
-          prefix: REX_W,
-          opcode: 0x23,
-          mod_rm: ModRM[mod: Mod01, reg: dst_reg, rm: src_reg],
-          disp: imm8(src_disp),
-        )
-      end
-    end
-
-    def call(dst)
-      case dst
-      # CALL rel32
-      in Integer => dst_addr
-        # E8 cd
-        # D: Operand 1: Offset
-        insn(opcode: 0xe8, imm: rel32(dst_addr))
-      # CALL r/m64 (Mod 11: reg)
-      in R64 => dst_reg
-        # FF /2
-        # M: Operand 1: ModRM:r/m (r)
-        insn(
-          opcode: 0xff,
-          mod_rm: ModRM[mod: Mod11, reg: 2, rm: dst_reg],
-        )
-      end
-    end
-
-    def cmove(dst, src)
-      case [dst, src]
-      # CMOVE r64, r/m64 (Mod 11: reg)
-      in [R64 => dst_reg, R64 => src_reg]
-        # REX.W + 0F 44 /r
-        # RM: Operand 1: ModRM:reg (r, w), Operand 2: ModRM:r/m (r)
-        insn(
-          prefix: REX_W,
-          opcode: [0x0f, 0x44],
-          mod_rm: ModRM[mod: Mod11, reg: dst_reg, rm: src_reg],
-        )
-      end
-    end
-
-    def cmovg(dst, src)
-      case [dst, src]
-      # CMOVG r64, r/m64 (Mod 11: reg)
-      in [R64 => dst_reg, R64 => src_reg]
-        # REX.W + 0F 4F /r
-        # RM: Operand 1: ModRM:reg (r, w), Operand 2: ModRM:r/m (r)
-        insn(
-          prefix: REX_W,
-          opcode: [0x0f, 0x4f],
-          mod_rm: ModRM[mod: Mod11, reg: dst_reg, rm: src_reg],
-        )
-      end
-    end
-
-    def cmovge(dst, src)
-      case [dst, src]
-      # CMOVGE r64, r/m64 (Mod 11: reg)
-      in [R64 => dst_reg, R64 => src_reg]
-        # REX.W + 0F 4D /r
-        # RM: Operand 1: ModRM:reg (r, w), Operand 2: ModRM:r/m (r)
-        insn(
-          prefix: REX_W,
-          opcode: [0x0f, 0x4d],
-          mod_rm: ModRM[mod: Mod11, reg: dst_reg, rm: src_reg],
-        )
-      end
-    end
-
-    def cmovl(dst, src)
-      case [dst, src]
-      # CMOVL r64, r/m64 (Mod 11: reg)
-      in [R64 => dst_reg, R64 => src_reg]
-        # REX.W + 0F 4C /r
-        # RM: Operand 1: ModRM:reg (r, w), Operand 2: ModRM:r/m (r)
-        insn(
-          prefix: REX_W,
-          opcode: [0x0f, 0x4c],
-          mod_rm: ModRM[mod: Mod11, reg: dst_reg, rm: src_reg],
-        )
-      end
-    end
-
-    def cmovle(dst, src)
-      case [dst, src]
-      # CMOVLE r64, r/m64 (Mod 11: reg)
-      in [R64 => dst_reg, R64 => src_reg]
-        # REX.W + 0F 4E /r
-        # RM: Operand 1: ModRM:reg (r, w), Operand 2: ModRM:r/m (r)
-        insn(
-          prefix: REX_W,
-          opcode: [0x0f, 0x4e],
-          mod_rm: ModRM[mod: Mod11, reg: dst_reg, rm: src_reg],
-        )
-      end
-    end
-
-    def cmovne(dst, src)
-      case [dst, src]
-      # CMOVNE r64, r/m64 (Mod 11: reg)
-      in [R64 => dst_reg, R64 => src_reg]
-        # REX.W + 0F 45 /r
-        # RM: Operand 1: ModRM:reg (r, w), Operand 2: ModRM:r/m (r)
-        insn(
-          prefix: REX_W,
-          opcode: [0x0f, 0x45],
-          mod_rm: ModRM[mod: Mod11, reg: dst_reg, rm: src_reg],
-        )
-      end
-    end
-
-    def cmovnz(dst, src)
-      case [dst, src]
-      # CMOVNZ r64, r/m64 (Mod 11: reg)
-      in [R64 => dst_reg, R64 => src_reg]
-        # REX.W + 0F 45 /r
-        # RM: Operand 1: ModRM:reg (r, w), Operand 2: ModRM:r/m (r)
-        insn(
-          prefix: REX_W,
-          opcode: [0x0f, 0x45],
-          mod_rm: ModRM[mod: Mod11, reg: dst_reg, rm: src_reg],
-        )
-      end
-    end
-
-    def cmovz(dst, src)
-      case [dst, src]
-      # CMOVZ r64, r/m64 (Mod 11: reg)
-      in [R64 => dst_reg, R64 => src_reg]
-        # REX.W + 0F 44 /r
-        # RM: Operand 1: ModRM:reg (r, w), Operand 2: ModRM:r/m (r)
-        insn(
-          prefix: REX_W,
-          opcode: [0x0f, 0x44],
-          mod_rm: ModRM[mod: Mod11, reg: dst_reg, rm: src_reg],
-        )
-      # CMOVZ r64, r/m64 (Mod 01: [reg]+disp8)
-      in [R64 => dst_reg, QwordPtr[R64 => src_reg, IMM8 => src_disp]]
-        # REX.W + 0F 44 /r
-        # RM: Operand 1: ModRM:reg (r, w), Operand 2: ModRM:r/m (r)
-        insn(
-          prefix: REX_W,
-          opcode: [0x0f, 0x44],
-          mod_rm: ModRM[mod: Mod01, reg: dst_reg, rm: src_reg],
-          disp: imm8(src_disp),
-        )
-      end
-    end
-
-    def cmp(left, right)
-      case [left, right]
-      # CMP r/m8, imm8 (Mod 01: [reg]+disp8)
-      in [BytePtr[R64 => left_reg, IMM8 => left_disp], IMM8 => right_imm]
-        # 80 /7 ib
-        # MI: Operand 1: ModRM:r/m (r), Operand 2: imm8/16/32
-        insn(
-          opcode: 0x80,
-          mod_rm: ModRM[mod: Mod01, reg: 7, rm: left_reg],
-          disp: left_disp,
-          imm: imm8(right_imm),
-        )
-      # CMP r/m32, imm32 (Mod 01: [reg]+disp8)
-      in [DwordPtr[R64 => left_reg, IMM8 => left_disp], IMM32 => right_imm]
-        # 81 /7 id
-        # MI: Operand 1: ModRM:r/m (r), Operand 2: imm8/16/32
-        insn(
-          opcode: 0x81,
-          mod_rm: ModRM[mod: Mod01, reg: 7, rm: left_reg],
-          disp: left_disp,
-          imm: imm32(right_imm),
-        )
-      # CMP r/m64, imm8 (Mod 01: [reg]+disp8)
-      in [QwordPtr[R64 => left_reg, IMM8 => left_disp], IMM8 => right_imm]
-        # REX.W + 83 /7 ib
-        # MI: Operand 1: ModRM:r/m (r), Operand 2: imm8/16/32
-        insn(
-          prefix: REX_W,
-          opcode: 0x83,
-          mod_rm: ModRM[mod: Mod01, reg: 7, rm: left_reg],
-          disp: left_disp,
-          imm: imm8(right_imm),
-        )
-      # CMP r/m64, imm8 (Mod 10: [reg]+disp32)
-      in [QwordPtr[R64 => left_reg, IMM32 => left_disp], IMM8 => right_imm]
-        # REX.W + 83 /7 ib
-        # MI: Operand 1: ModRM:r/m (r), Operand 2: imm8/16/32
-        insn(
-          prefix: REX_W,
-          opcode: 0x83,
-          mod_rm: ModRM[mod: Mod10, reg: 7, rm: left_reg],
-          disp: imm32(left_disp),
-          imm: imm8(right_imm),
-        )
-      # CMP r/m64, imm8 (Mod 11: reg)
-      in [R64 => left_reg, IMM8 => right_imm]
-        # REX.W + 83 /7 ib
-        # MI: Operand 1: ModRM:r/m (r), Operand 2: imm8/16/32
-        insn(
-          prefix: REX_W,
-          opcode: 0x83,
-          mod_rm: ModRM[mod: Mod11, reg: 7, rm: left_reg],
-          imm: imm8(right_imm),
-        )
-      # CMP r/m64, imm32 (Mod 11: reg)
-      in [R64 => left_reg, IMM32 => right_imm]
-        # REX.W + 81 /7 id
-        # MI: Operand 1: ModRM:r/m (r), Operand 2: imm8/16/32
-        insn(
-          prefix: REX_W,
-          opcode: 0x81,
-          mod_rm: ModRM[mod: Mod11, reg: 7, rm: left_reg],
-          imm: imm32(right_imm),
-        )
-      # CMP r/m64, r64 (Mod 01: [reg]+disp8)
-      in [QwordPtr[R64 => left_reg, IMM8 => left_disp], R64 => right_reg]
-        # REX.W + 39 /r
-        # MR: Operand 1: ModRM:r/m (r), Operand 2: ModRM:reg (r)
-        insn(
-          prefix: REX_W,
-          opcode: 0x39,
-          mod_rm: ModRM[mod: Mod01, reg: right_reg, rm: left_reg],
-          disp: left_disp,
-        )
-      # CMP r/m64, r64 (Mod 10: [reg]+disp32)
-      in [QwordPtr[R64 => left_reg, IMM32 => left_disp], R64 => right_reg]
-        # REX.W + 39 /r
-        # MR: Operand 1: ModRM:r/m (r), Operand 2: ModRM:reg (r)
-        insn(
-          prefix: REX_W,
-          opcode: 0x39,
-          mod_rm: ModRM[mod: Mod10, reg: right_reg, rm: left_reg],
-          disp: imm32(left_disp),
-        )
-      # CMP r/m64, r64 (Mod 11: reg)
-      in [R64 => left_reg, R64 => right_reg]
-        # REX.W + 39 /r
-        # MR: Operand 1: ModRM:r/m (r), Operand 2: ModRM:reg (r)
-        insn(
-          prefix: REX_W,
-          opcode: 0x39,
-          mod_rm: ModRM[mod: Mod11, reg: right_reg, rm: left_reg],
-        )
-      end
-    end
-
-    def jbe(dst)
-      case dst
-      # JBE rel8
-      in Label => dst_label
-        # 76 cb
-        insn(opcode: 0x76, imm: dst_label)
-      # JBE rel32
-      in Integer => dst_addr
-        # 0F 86 cd
-        insn(opcode: [0x0f, 0x86], imm: rel32(dst_addr))
-      end
-    end
-
-    def je(dst)
-      case dst
-      # JE rel8
-      in Label => dst_label
-        # 74 cb
-        insn(opcode: 0x74, imm: dst_label)
-      # JE rel32
-      in Integer => dst_addr
-        # 0F 84 cd
-        insn(opcode: [0x0f, 0x84], imm: rel32(dst_addr))
-      end
-    end
-
-    def jl(dst)
-      case dst
-      # JL rel32
-      in Integer => dst_addr
-        # 0F 8C cd
-        insn(opcode: [0x0f, 0x8c], imm: rel32(dst_addr))
-      end
-    end
-
-    def jmp(dst)
-      case dst
-      # JZ rel8
-      in Label => dst_label
-        # EB cb
-        insn(opcode: 0xeb, imm: dst_label)
-      # JMP rel32
-      in Integer => dst_addr
-        # E9 cd
-        insn(opcode: 0xe9, imm: rel32(dst_addr))
-      # JMP r/m64 (Mod 01: [reg]+disp8)
-      in QwordPtr[R64 => dst_reg, IMM8 => dst_disp]
-        # FF /4
-        insn(opcode: 0xff, mod_rm: ModRM[mod: Mod01, reg: 4, rm: dst_reg], disp: dst_disp)
-      # JMP r/m64 (Mod 11: reg)
-      in R64 => dst_reg
-        # FF /4
-        insn(opcode: 0xff, mod_rm: ModRM[mod: Mod11, reg: 4, rm: dst_reg])
-      end
-    end
-
-    def jne(dst)
-      case dst
-      # JNE rel8
-      in Label => dst_label
-        # 75 cb
-        insn(opcode: 0x75, imm: dst_label)
-      # JNE rel32
-      in Integer => dst_addr
-        # 0F 85 cd
-        insn(opcode: [0x0f, 0x85], imm: rel32(dst_addr))
-      end
-    end
-
-    def jnz(dst)
-      case dst
-      # JE rel8
-      in Label => dst_label
-        # 75 cb
-        insn(opcode: 0x75, imm: dst_label)
-      # JNZ rel32
-      in Integer => dst_addr
-        # 0F 85 cd
-        insn(opcode: [0x0f, 0x85], imm: rel32(dst_addr))
-      end
-    end
-
-    def jo(dst)
-      case dst
-      # JO rel32
-      in Integer => dst_addr
-        # 0F 80 cd
-        insn(opcode: [0x0f, 0x80], imm: rel32(dst_addr))
-      end
-    end
-
-    def jz(dst)
-      case dst
-      # JZ rel8
-      in Label => dst_label
-        # 74 cb
-        insn(opcode: 0x74, imm: dst_label)
-      # JZ rel32
-      in Integer => dst_addr
-        # 0F 84 cd
-        insn(opcode: [0x0f, 0x84], imm: rel32(dst_addr))
-      end
-    end
-
-    def lea(dst, src)
-      case [dst, src]
-      # LEA r64,m (Mod 01: [reg]+disp8)
-      in [R64 => dst_reg, QwordPtr[R64 => src_reg, IMM8 => src_disp]]
-        # REX.W + 8D /r
-        # RM: Operand 1: ModRM:reg (w), Operand 2: ModRM:r/m (r)
-        insn(
-          prefix: REX_W,
-          opcode: 0x8d,
-          mod_rm: ModRM[mod: Mod01, reg: dst_reg, rm: src_reg],
-          disp: imm8(src_disp),
-        )
-      # LEA r64,m (Mod 10: [reg]+disp32)
-      in [R64 => dst_reg, QwordPtr[R64 => src_reg, IMM32 => src_disp]]
-        # REX.W + 8D /r
-        # RM: Operand 1: ModRM:reg (w), Operand 2: ModRM:r/m (r)
-        insn(
-          prefix: REX_W,
-          opcode: 0x8d,
-          mod_rm: ModRM[mod: Mod10, reg: dst_reg, rm: src_reg],
-          disp: imm32(src_disp),
-        )
-      end
-    end
-
-    def mov(dst, src)
-      case dst
-      in R32 => dst_reg
-        case src
-        # MOV r32 r/m32 (Mod 01: [reg]+disp8)
-        in DwordPtr[R64 => src_reg, IMM8 => src_disp]
-          # 8B /r
-          # RM: Operand 1: ModRM:reg (w), Operand 2: ModRM:r/m (r)
-          insn(
-            opcode: 0x8b,
-            mod_rm: ModRM[mod: Mod01, reg: dst_reg, rm: src_reg],
-            disp: src_disp,
-          )
-        # MOV r32, imm32 (Mod 11: reg)
-        in IMM32 => src_imm
-          # B8+ rd id
-          # OI: Operand 1: opcode + rd (w), Operand 2: imm8/16/32/64
-          insn(
-            opcode: 0xb8,
-            rd: dst_reg,
-            imm: imm32(src_imm),
-          )
-        end
-      in R64 => dst_reg
-        case src
-        # MOV r64, r/m64 (Mod 00: [reg])
-        in QwordPtr[R64 => src_reg]
-          # REX.W + 8B /r
-          # RM: Operand 1: ModRM:reg (w), Operand 2: ModRM:r/m (r)
-          insn(
-            prefix: REX_W,
-            opcode: 0x8b,
-            mod_rm: ModRM[mod: Mod00, reg: dst_reg, rm: src_reg],
-          )
-        # MOV r64, r/m64 (Mod 01: [reg]+disp8)
-        in QwordPtr[R64 => src_reg, IMM8 => src_disp]
-          # REX.W + 8B /r
-          # RM: Operand 1: ModRM:reg (w), Operand 2: ModRM:r/m (r)
-          insn(
-            prefix: REX_W,
-            opcode: 0x8b,
-            mod_rm: ModRM[mod: Mod01, reg: dst_reg, rm: src_reg],
-            disp: src_disp,
-          )
-        # MOV r64, r/m64 (Mod 10: [reg]+disp32)
-        in QwordPtr[R64 => src_reg, IMM32 => src_disp]
-          # REX.W + 8B /r
-          # RM: Operand 1: ModRM:reg (w), Operand 2: ModRM:r/m (r)
-          insn(
-            prefix: REX_W,
-            opcode: 0x8b,
-            mod_rm: ModRM[mod: Mod10, reg: dst_reg, rm: src_reg],
-            disp: imm32(src_disp),
-          )
-        # MOV r64, r/m64 (Mod 11: reg)
-        in R64 => src_reg
-          # REX.W + 8B /r
-          # RM: Operand 1: ModRM:reg (w), Operand 2: ModRM:r/m (r)
-          insn(
-            prefix: REX_W,
-            opcode: 0x8b,
-            mod_rm: ModRM[mod: Mod11, reg: dst_reg, rm: src_reg],
-          )
-        # MOV r/m64, imm32 (Mod 11: reg)
-        in IMM32 => src_imm
-          # REX.W + C7 /0 id
-          # MI: Operand 1: ModRM:r/m (w), Operand 2: imm8/16/32/64
-          insn(
-            prefix: REX_W,
-            opcode: 0xc7,
-            mod_rm: ModRM[mod: Mod11, reg: 0, rm: dst_reg],
-            imm: imm32(src_imm),
-          )
-        # MOV r64, imm64
-        in IMM64 => src_imm
-          # REX.W + B8+ rd io
-          # OI: Operand 1: opcode + rd (w), Operand 2: imm8/16/32/64
-          insn(
-            prefix: REX_W,
-            opcode: 0xb8,
-            rd: dst_reg,
-            imm: imm64(src_imm),
-          )
-        end
-      in DwordPtr[R64 => dst_reg, IMM8 => dst_disp]
-        case src
-        # MOV r/m32, imm32 (Mod 01: [reg]+disp8)
-        in IMM32 => src_imm
-          # C7 /0 id
-          # MI: Operand 1: ModRM:r/m (w), Operand 2: imm8/16/32/64
-          insn(
-            opcode: 0xc7,
-            mod_rm: ModRM[mod: Mod01, reg: 0, rm: dst_reg],
-            disp: dst_disp,
-            imm: imm32(src_imm),
-          )
-        end
-      in QwordPtr[R64 => dst_reg]
-        case src
-        # MOV r/m64, imm32 (Mod 00: [reg])
-        in IMM32 => src_imm
-          # REX.W + C7 /0 id
-          # MI: Operand 1: ModRM:r/m (w), Operand 2: imm8/16/32/64
-          insn(
-            prefix: REX_W,
-            opcode: 0xc7,
-            mod_rm: ModRM[mod: Mod00, reg: 0, rm: dst_reg],
-            imm: imm32(src_imm),
-          )
-        # MOV r/m64, r64 (Mod 00: [reg])
-        in R64 => src_reg
-          # REX.W + 89 /r
-          # MR: Operand 1: ModRM:r/m (w), Operand 2: ModRM:reg (r)
-          insn(
-            prefix: REX_W,
-            opcode: 0x89,
-            mod_rm: ModRM[mod: Mod00, reg: src_reg, rm: dst_reg],
-          )
-        end
-      in QwordPtr[R64 => dst_reg, IMM8 => dst_disp]
-        # Optimize encoding when disp is 0
-        return mov([dst_reg], src) if dst_disp == 0
-
-        case src
-        # MOV r/m64, imm32 (Mod 01: [reg]+disp8)
-        in IMM32 => src_imm
-          # REX.W + C7 /0 id
-          # MI: Operand 1: ModRM:r/m (w), Operand 2: imm8/16/32/64
-          insn(
-            prefix: REX_W,
-            opcode: 0xc7,
-            mod_rm: ModRM[mod: Mod01, reg: 0, rm: dst_reg],
-            disp: dst_disp,
-            imm: imm32(src_imm),
-          )
-        # MOV r/m64, r64 (Mod 01: [reg]+disp8)
-        in R64 => src_reg
-          # REX.W + 89 /r
-          # MR: Operand 1: ModRM:r/m (w), Operand 2: ModRM:reg (r)
-          insn(
-            prefix: REX_W,
-            opcode: 0x89,
-            mod_rm: ModRM[mod: Mod01, reg: src_reg, rm: dst_reg],
-            disp: dst_disp,
-          )
-        end
-      in QwordPtr[R64 => dst_reg, IMM32 => dst_disp]
-        case src
-        # MOV r/m64, imm32 (Mod 10: [reg]+disp32)
-        in IMM32 => src_imm
-          # REX.W + C7 /0 id
-          # MI: Operand 1: ModRM:r/m (w), Operand 2: imm8/16/32/64
-          insn(
-            prefix: REX_W,
-            opcode: 0xc7,
-            mod_rm: ModRM[mod: Mod10, reg: 0, rm: dst_reg],
-            disp: imm32(dst_disp),
-            imm: imm32(src_imm),
-          )
-        # MOV r/m64, r64 (Mod 10: [reg]+disp32)
-        in R64 => src_reg
-          # REX.W + 89 /r
-          # MR: Operand 1: ModRM:r/m (w), Operand 2: ModRM:reg (r)
-          insn(
-            prefix: REX_W,
-            opcode: 0x89,
-            mod_rm: ModRM[mod: Mod10, reg: src_reg, rm: dst_reg],
-            disp: imm32(dst_disp),
-          )
-        end
-      end
-    end
-
-    def or(dst, src)
-      case [dst, src]
-      # OR r/m64, imm8 (Mod 11: reg)
-      in [R64 => dst_reg, IMM8 => src_imm]
-        # REX.W + 83 /1 ib
-        # MI: Operand 1: ModRM:r/m (r, w), Operand 2: imm8/16/32
-        insn(
-          prefix: REX_W,
-          opcode: 0x83,
-          mod_rm: ModRM[mod: Mod11, reg: 1, rm: dst_reg],
-          imm: imm8(src_imm),
-        )
-      # OR r/m64, imm32 (Mod 11: reg)
-      in [R64 => dst_reg, IMM32 => src_imm]
-        # REX.W + 81 /1 id
-        # MI: Operand 1: ModRM:r/m (r, w), Operand 2: imm8/16/32
-        insn(
-          prefix: REX_W,
-          opcode: 0x81,
-          mod_rm: ModRM[mod: Mod11, reg: 1, rm: dst_reg],
-          imm: imm32(src_imm),
-        )
-      # OR r64, r/m64 (Mod 01: [reg]+disp8)
-      in [R64 => dst_reg, QwordPtr[R64 => src_reg, IMM8 => src_disp]]
-        # REX.W + 0B /r
-        # RM: Operand 1: ModRM:reg (r, w), Operand 2: ModRM:r/m (r)
-        insn(
-          prefix: REX_W,
-          opcode: 0x0b,
-          mod_rm: ModRM[mod: Mod01, reg: dst_reg, rm: src_reg],
-          disp: imm8(src_disp),
-        )
-      end
-    end
-
-    def push(src)
-      case src
-      # PUSH r64
-      in R64 => src_reg
-        # 50+rd
-        # O: Operand 1: opcode + rd (r)
-        insn(opcode: 0x50, rd: src_reg)
-      end
-    end
-
-    def pop(dst)
-      case dst
-      # POP r64
-      in R64 => dst_reg
-        # 58+ rd
-        # O: Operand 1: opcode + rd (r)
-        insn(opcode: 0x58, rd: dst_reg)
-      end
-    end
-
-    def ret
-      # RET
-      # Near return: A return to a procedure within the current code segment
-      insn(opcode: 0xc3)
-    end
-
-    def sar(dst, src)
-      case [dst, src]
-      in [R64 => dst_reg, IMM8 => src_imm]
-        # REX.W + C1 /7 ib
-        # MI: Operand 1: ModRM:r/m (r, w), Operand 2: imm8
-        insn(
-          prefix: REX_W,
-          opcode: 0xc1,
-          mod_rm: ModRM[mod: Mod11, reg: 7, rm: dst_reg],
-          imm: imm8(src_imm),
-        )
-      end
-    end
-
-    def sub(dst, src)
-      case [dst, src]
-      # SUB r/m64, imm8 (Mod 11: reg)
-      in [R64 => dst_reg, IMM8 => src_imm]
-        # REX.W + 83 /5 ib
-        # MI: Operand 1: ModRM:r/m (r, w), Operand 2: imm8/16/32
-        insn(
-          prefix: REX_W,
-          opcode: 0x83,
-          mod_rm: ModRM[mod: Mod11, reg: 5, rm: dst_reg],
-          imm: imm8(src_imm),
-        )
-      # SUB r/m64, r64 (Mod 11: reg)
-      in [R64 => dst_reg, R64 => src_reg]
-        # REX.W + 29 /r
-        # MR: Operand 1: ModRM:r/m (r, w), Operand 2: ModRM:reg (r)
-        insn(
-          prefix: REX_W,
-          opcode: 0x29,
-          mod_rm: ModRM[mod: Mod11, reg: src_reg, rm: dst_reg],
-        )
-      end
-    end
-
-    def test(left, right)
-      case [left, right]
-      # TEST r/m8*, imm8 (Mod 01: [reg]+disp8)
-      in [BytePtr[R64 => left_reg, IMM8 => left_disp], IMM8 => right_imm]
-        # REX + F6 /0 ib
-        # MI: Operand 1: ModRM:r/m (r), Operand 2: imm8/16/32
-        insn(
-          opcode: 0xf6,
-          mod_rm: ModRM[mod: Mod01, reg: 0, rm: left_reg],
-          disp: left_disp,
-          imm: imm8(right_imm),
-        )
-      # TEST r/m64, imm32 (Mod 01: [reg]+disp8)
-      in [QwordPtr[R64 => left_reg, IMM8 => left_disp], IMM32 => right_imm]
-        # REX.W + F7 /0 id
-        # MI: Operand 1: ModRM:r/m (r), Operand 2: imm8/16/32
-        insn(
-          prefix: REX_W,
-          opcode: 0xf7,
-          mod_rm: ModRM[mod: Mod01, reg: 0, rm: left_reg],
-          disp: left_disp,
-          imm: imm32(right_imm),
-        )
-      # TEST r/m64, imm32 (Mod 10: [reg]+disp32)
-      in [QwordPtr[R64 => left_reg, IMM32 => left_disp], IMM32 => right_imm]
-        # REX.W + F7 /0 id
-        # MI: Operand 1: ModRM:r/m (r), Operand 2: imm8/16/32
-        insn(
-          prefix: REX_W,
-          opcode: 0xf7,
-          mod_rm: ModRM[mod: Mod10, reg: 0, rm: left_reg],
-          disp: imm32(left_disp),
-          imm: imm32(right_imm),
-        )
-      # TEST r/m64, imm32 (Mod 11: reg)
-      in [R64 => left_reg, IMM32 => right_imm]
-        # REX.W + F7 /0 id
-        # MI: Operand 1: ModRM:r/m (r), Operand 2: imm8/16/32
-        insn(
-          prefix: REX_W,
-          opcode: 0xf7,
-          mod_rm: ModRM[mod: Mod11, reg: 0, rm: left_reg],
-          imm: imm32(right_imm),
-        )
-      # TEST r/m32, r32 (Mod 11: reg)
-      in [R32 => left_reg, R32 => right_reg]
-        # 85 /r
-        # MR: Operand 1: ModRM:r/m (r), Operand 2: ModRM:reg (r)
-        insn(
-          opcode: 0x85,
-          mod_rm: ModRM[mod: Mod11, reg: right_reg, rm: left_reg],
-        )
-      # TEST r/m64, r64 (Mod 11: reg)
-      in [R64 => left_reg, R64 => right_reg]
-        # REX.W + 85 /r
-        # MR: Operand 1: ModRM:r/m (r), Operand 2: ModRM:reg (r)
-        insn(
-          prefix: REX_W,
-          opcode: 0x85,
-          mod_rm: ModRM[mod: Mod11, reg: right_reg, rm: left_reg],
-        )
-      end
-    end
-
-    def xor(dst, src)
-      case [dst, src]
-      # XOR r/m64, r64 (Mod 11: reg)
-      in [R64 => dst_reg, R64 => src_reg]
-        # REX.W + 31 /r
-        # MR: Operand 1: ModRM:r/m (r, w), Operand 2: ModRM:reg (r)
-        insn(
-          prefix: REX_W,
-          opcode: 0x31,
-          mod_rm: ModRM[mod: Mod11, reg: src_reg, rm: dst_reg],
-        )
-      end
-    end
-
-    #
-    # Utilities
-    #
-
-    attr_reader :comments
-
-    def comment(message)
-      @comments[@bytes.size] << message
-    end
-
-    # Mark the starting address of a block
-    def block(block)
-      @blocks[@bytes.size] << block
-    end
-
-    # Mark the starting/ending addresses of a stub
-    def stub(stub)
-      @stub_starts[@bytes.size] << stub
-      yield
-    ensure
-      @stub_ends[@bytes.size] << stub
-    end
-
-    def pos_marker(&block)
-      @pos_markers[@bytes.size] << block
-    end
-
-    def new_label(name)
-      Label.new(id: @label_id += 1, name:)
-    end
-
-    # @param [RubyVM::RJIT::Assembler::Label] label
-    def write_label(label)
-      @labels[label] = @bytes.size
-    end
-
-    def incr_counter(name)
-      if C.rjit_opts.stats
-        comment("increment counter #{name}")
-        mov(:rax, C.rb_rjit_counters[name].to_i)
-        add([:rax], 1) # TODO: lock
-      end
-    end
-
-    private
-
-    def insn(prefix: 0, opcode:, rd: nil, mod_rm: nil, disp: nil, imm: nil)
-      # Determine prefix
-      if rd
-        prefix |= REX_B if extended_reg?(rd)
-        opcode += reg_code(rd)
-      end
-      if mod_rm
-        prefix |= REX_R if mod_rm.reg.is_a?(Symbol) && extended_reg?(mod_rm.reg)
-        prefix |= REX_B if mod_rm.rm.is_a?(Symbol) && extended_reg?(mod_rm.rm)
-      end
-
-      # Encode insn
-      if prefix > 0
-        @bytes.push(prefix)
-      end
-      @bytes.push(*Array(opcode))
-      if mod_rm
-        mod_rm_byte = encode_mod_rm(
-          mod: mod_rm.mod,
-          reg: mod_rm.reg.is_a?(Symbol) ? reg_code(mod_rm.reg) : mod_rm.reg,
-          rm: mod_rm.rm.is_a?(Symbol) ? reg_code(mod_rm.rm) : mod_rm.rm,
-        )
-        @bytes.push(mod_rm_byte)
-      end
-      if disp
-        @bytes.push(*Array(disp))
-      end
-      if imm
-        @bytes.push(*imm)
-      end
-    end
-
-    def reg_code(reg)
-      reg_code_extended(reg).first
-    end
-
-    # Table 2-2. 32-Bit Addressing Forms with the ModR/M Byte
-    #
-    #  7  6  5  4  3  2  1  0
-    # +--+--+--+--+--+--+--+--+
-    # | Mod | Reg/   | R/M    |
-    # |     | Opcode |        |
-    # +--+--+--+--+--+--+--+--+
-    #
-    # The r/m field can specify a register as an operand or it can be combined
-    # with the mod field to encode an addressing mode.
-    #
-    # /0: R/M is 0 (not used)
-    # /r: R/M is a register
-    def encode_mod_rm(mod:, reg: 0, rm: 0)
-      if mod > 0b11
-        raise ArgumentError, "too large Mod: #{mod}"
-      end
-      if reg > 0b111
-        raise ArgumentError, "too large Reg/Opcode: #{reg}"
-      end
-      if rm > 0b111
-        raise ArgumentError, "too large R/M: #{rm}"
-      end
-      (mod << 6) + (reg << 3) + rm
-    end
-
-    # ib: 1 byte
-    def imm8(imm)
-      unless imm8?(imm)
-        raise ArgumentError, "unexpected imm8: #{imm}"
-      end
-      [imm].pack('c').unpack('c*') # TODO: consider uimm
-    end
-
-    # id: 4 bytes
-    def imm32(imm)
-      unless imm32?(imm)
-        raise ArgumentError, "unexpected imm32: #{imm}"
-      end
-      [imm].pack('l').unpack('c*') # TODO: consider uimm
-    end
-
-    # io: 8 bytes
-    def imm64(imm)
-      unless imm64?(imm)
-        raise ArgumentError, "unexpected imm64: #{imm}"
-      end
-      imm_bytes(imm, 8)
-    end
-
-    def imm_bytes(imm, num_bytes)
-      bytes = []
-      bits = imm
-      num_bytes.times do
-        bytes << (bits & 0xff)
-        bits >>= 8
-      end
-      if bits != 0
-        raise ArgumentError, "unexpected imm with #{num_bytes} bytes: #{imm}"
-      end
-      bytes
-    end
-
-    def rel32(addr)
-      [Rel32.new(addr), Rel32Pad, Rel32Pad, Rel32Pad]
-    end
-
-    def set_code_addrs(write_addr)
-      (@bytes.size + 1).times do |index|
-        @blocks.fetch(index, []).each do |block|
-          block.start_addr = write_addr + index
-        end
-        @stub_starts.fetch(index, []).each do |stub|
-          stub.start_addr = write_addr + index
-        end
-        @stub_ends.fetch(index, []).each do |stub|
-          stub.end_addr = write_addr + index
-        end
-      end
-    end
-
-    def resolve_rel32(write_addr)
-      @bytes.each_with_index do |byte, index|
-        if byte.is_a?(Rel32)
-          src_addr = write_addr + index + 4 # offset 4 bytes for rel32 itself
-          dst_addr = byte.addr
-          rel32 = dst_addr - src_addr
-          raise "unexpected offset: #{rel32}" unless imm32?(rel32)
-          imm32(rel32).each_with_index do |rel_byte, rel_index|
-            @bytes[index + rel_index] = rel_byte
-          end
-        end
-      end
-    end
-
-    def resolve_labels
-      @bytes.each_with_index do |byte, index|
-        if byte.is_a?(Label)
-          src_index = index + 1 # offset 1 byte for rel8 itself
-          dst_index = @labels.fetch(byte)
-          rel8 = dst_index - src_index
-          raise "unexpected offset: #{rel8}" unless imm8?(rel8)
-          @bytes[index] = rel8
-        end
-      end
-    end
-
-    def write_bytes(addr)
-      Fiddle::Pointer.new(addr)[0, @bytes.size] = @bytes.pack('c*')
-    end
-  end
-
-  module OperandMatcher
-    def imm8?(imm)
-      (-0x80..0x7f).include?(imm)
-    end
-
-    def imm32?(imm)
-      (-0x8000_0000..0x7fff_ffff).include?(imm) # TODO: consider uimm
-    end
-
-    def imm64?(imm)
-      (-0x8000_0000_0000_0000..0xffff_ffff_ffff_ffff).include?(imm)
-    end
-
-    def r32?(reg)
-      if extended_reg?(reg)
-        reg.end_with?('d')
-      else
-        reg.start_with?('e')
-      end
-    end
-
-    def r64?(reg)
-      if extended_reg?(reg)
-        reg.match?(/\Ar\d+\z/)
-      else
-        reg.start_with?('r')
-      end
-    end
-
-    def extended_reg?(reg)
-      reg_code_extended(reg).last
-    end
-
-    def reg_code_extended(reg)
-      case reg
-      # Not extended
-      when :al, :ax, :eax, :rax then [0, false]
-      when :cl, :cx, :ecx, :rcx then [1, false]
-      when :dl, :dx, :edx, :rdx then [2, false]
-      when :bl, :bx, :ebx, :rbx then [3, false]
-      when :ah, :sp, :esp, :rsp then [4, false]
-      when :ch, :bp, :ebp, :rbp then [5, false]
-      when :dh, :si, :esi, :rsi then [6, false]
-      when :bh, :di, :edi, :rdi then [7, false]
-      # Extended
-      when :r8b,  :r8w,  :r8d,  :r8  then [0, true]
-      when :r9b,  :r9w,  :r9d,  :r9  then [1, true]
-      when :r10b, :r10w, :r10d, :r10 then [2, true]
-      when :r11b, :r11w, :r11d, :r11 then [3, true]
-      when :r12b, :r12w, :r12d, :r12 then [4, true]
-      when :r13b, :r13w, :r13d, :r13 then [5, true]
-      when :r14b, :r14w, :r14d, :r14 then [6, true]
-      when :r15b, :r15w, :r15d, :r15 then [7, true]
-      else raise ArgumentError, "unexpected reg: #{reg.inspect}"
-      end
-    end
-  end
-
-  class Assembler
-    include OperandMatcher
-    extend OperandMatcher
-  end
-end
diff --git a/lib/ruby_vm/rjit/block.rb b/lib/ruby_vm/rjit/block.rb
deleted file mode 100644
index cfdaade8b1c053..00000000000000
--- a/lib/ruby_vm/rjit/block.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-class RubyVM::RJIT::Block < Struct.new(
-  :iseq,        # @param ``
-  :pc,          # @param [Integer] Starting PC
-  :ctx,         # @param [RubyVM::RJIT::Context] **Starting** Context (TODO: freeze?)
-  :start_addr,  # @param [Integer] Starting address of this block's JIT code
-  :entry_exit,  # @param [Integer] Address of entry exit (optional)
-  :incoming,    # @param [Array<RubyVM::RJIT::BranchStub>] Incoming branches
-  :invalidated, # @param [TrueClass,FalseClass] true if already invalidated
-)
-  def initialize(incoming: [], invalidated: false, **) = super
-end
diff --git a/lib/ruby_vm/rjit/branch_stub.rb b/lib/ruby_vm/rjit/branch_stub.rb
deleted file mode 100644
index b9fe78b7449777..00000000000000
--- a/lib/ruby_vm/rjit/branch_stub.rb
+++ /dev/null
@@ -1,24 +0,0 @@
-module RubyVM::RJIT
-  # Branch shapes
-  Next0   = :Next0   # target0 is a fallthrough
-  Next1   = :Next1   # target1 is a fallthrough
-  Default = :Default # neither targets is a fallthrough
-
-  class BranchStub < Struct.new(
-    :iseq,       # @param [RubyVM::RJIT::CPointer::Struct_rb_iseq_struct] Branch target ISEQ
-    :shape,      # @param [Symbol] Next0, Next1, or Default
-    :target0,    # @param [RubyVM::RJIT::BranchTarget] First branch target
-    :target1,    # @param [RubyVM::RJIT::BranchTarget,NilClass] Second branch target (optional)
-    :compile,    # @param [Proc] A callback to (re-)generate this branch stub
-    :start_addr, # @param [Integer] Stub source start address to be re-generated
-    :end_addr,   # @param [Integer] Stub source end address to be re-generated
-  )
-  end
-
-  class BranchTarget < Struct.new(
-    :pc,
-    :ctx,
-    :address,
-  )
-  end
-end
diff --git a/lib/ruby_vm/rjit/c_pointer.rb b/lib/ruby_vm/rjit/c_pointer.rb
deleted file mode 100644
index d65d5a93a52f25..00000000000000
--- a/lib/ruby_vm/rjit/c_pointer.rb
+++ /dev/null
@@ -1,360 +0,0 @@
-module RubyVM::RJIT
-  # Every class under this namespace is a pointer. Even if the type is
-  # immediate, it shouldn't be dereferenced until `*` is called.
-  module CPointer
-    # Note: We'd like to avoid alphabetic method names to avoid a conflict
-    # with member methods. to_i and to_s are considered an exception.
-    class Struct
-      # @param name [String]
-      # @param sizeof [Integer]
-      # @param members [Hash{ Symbol => [RubyVM::RJIT::CType::*, Integer, TrueClass] }]
-      def initialize(addr, sizeof, members)
-        @addr = addr
-        @sizeof = sizeof
-        @members = members
-      end
-
-      # Get a raw address
-      def to_i
-        @addr
-      end
-
-      # Serialized address for generated code
-      def to_s
-        "0x#{@addr.to_s(16)}"
-      end
-
-      # Pointer diff
-      def -(struct)
-        raise ArgumentError if self.class != struct.class
-        (@addr - struct.to_i) / @sizeof
-      end
-
-      # Primitive API that does no automatic dereference
-      # TODO: remove this?
-      # @param member [Symbol]
-      def [](member)
-        type, offset = @members.fetch(member)
-        type.new(@addr + offset / 8)
-      end
-
-      private
-
-      # @param member [Symbol]
-      # @param value [Object]
-      def []=(member, value)
-        type, offset = @members.fetch(member)
-        type[@addr + offset / 8] = value
-      end
-
-      # @param size [Integer]
-      # @param members [Hash{ Symbol => [Integer, RubyVM::RJIT::CType::*] }]
-      def self.define(size, members)
-        Class.new(self) do
-          # Return the size of this type
-          define_singleton_method(:size) { size }
-
-          # Return the offset to a field
-          define_singleton_method(:offsetof) do |field, *fields|
-            member, offset = members.fetch(field)
-            offset /= 8
-            unless fields.empty?
-              offset += member.offsetof(*fields)
-            end
-            offset
-          end
-
-          # Return member names
-          define_singleton_method(:members) { members.keys }
-
-          define_method(:initialize) do |addr = nil|
-            if addr.nil? # TODO: get rid of this feature later
-              addr = Fiddle.malloc(size)
-            end
-            super(addr, size, members)
-          end
-
-          members.each do |member, (type, offset, to_ruby)|
-            # Intelligent API that does automatic dereference
-            define_method(member) do
-              value = self[member]
-              if value.respond_to?(:*)
-                value = value.*
-              end
-              if to_ruby
-                value = C.to_ruby(value)
-              end
-              value
-            end
-
-            define_method("#{member}=") do |value|
-              if to_ruby
-                value = C.to_value(value)
-              end
-              self[member] = value
-            end
-          end
-        end
-      end
-    end
-
-    # Note: We'd like to avoid alphabetic method names to avoid a conflict
-    # with member methods. to_i is considered an exception.
-    class Union
-      # @param _name [String] To be used when it starts defining a union pointer class
-      # @param sizeof [Integer]
-      # @param members [Hash{ Symbol => RubyVM::RJIT::CType::* }]
-      def initialize(addr, sizeof, members)
-        @addr = addr
-        @sizeof = sizeof
-        @members = members
-      end
-
-      # Get a raw address
-      def to_i
-        @addr
-      end
-
-      # Move addr to access this pointer like an array
-      def +(index)
-        raise ArgumentError unless index.is_a?(Integer)
-        self.class.new(@addr + index * @sizeof)
-      end
-
-      # Pointer diff
-      def -(union)
-        raise ArgumentError if self.class != union.class
-        (@addr - union.instance_variable_get(:@addr)) / @sizeof
-      end
-
-      # @param sizeof [Integer]
-      # @param members [Hash{ Symbol => RubyVM::RJIT::CType::* }]
-      def self.define(sizeof, members)
-        Class.new(self) do
-          # Return the size of this type
-          define_singleton_method(:sizeof) { sizeof }
-
-          # Part of Struct's offsetof implementation
-          define_singleton_method(:offsetof) do |field, *fields|
-            member = members.fetch(field)
-            offset = 0
-            unless fields.empty?
-              offset += member.offsetof(*fields)
-            end
-            offset
-          end
-
-          define_method(:initialize) do |addr|
-            super(addr, sizeof, members)
-          end
-
-          members.each do |member, type|
-            # Intelligent API that does automatic dereference
-            define_method(member) do
-              value = type.new(@addr)
-              if value.respond_to?(:*)
-                value = value.*
-              end
-              value
-            end
-          end
-        end
-      end
-    end
-
-    class Immediate
-      # @param addr [Integer]
-      # @param size [Integer]
-      # @param pack [String]
-      def initialize(addr, size, pack)
-        @addr = addr
-        @size = size
-        @pack = pack
-      end
-
-      # Get a raw address
-      def to_i
-        @addr
-      end
-
-      # Move addr to addess this pointer like an array
-      def +(index)
-        Immediate.new(@addr + index * @size, @size, @pack)
-      end
-
-      # Dereference
-      def *
-        self[0]
-      end
-
-      # Array access
-      def [](index)
-        return nil if @addr == 0
-        Fiddle::Pointer.new(@addr + index * @size)[0, @size].unpack1(@pack)
-      end
-
-      # Array set
-      def []=(index, value)
-        Fiddle::Pointer.new(@addr + index * @size)[0, @size] = [value].pack(@pack)
-      end
-
-      # Serialized address for generated code. Used for embedding things like body->iseq_encoded.
-      def to_s
-        "0x#{Integer(@addr).to_s(16)}"
-      end
-
-      # @param fiddle_type [Integer] Fiddle::TYPE_*
-      def self.define(fiddle_type)
-        size = Fiddle::PackInfo::SIZE_MAP.fetch(fiddle_type)
-        pack = Fiddle::PackInfo::PACK_MAP.fetch(fiddle_type)
-
-        Class.new(self) do
-          define_method(:initialize) do |addr|
-            super(addr, size, pack)
-          end
-
-          define_singleton_method(:size) do
-            size
-          end
-
-          # Type-level []=: Used by struct fields
-          define_singleton_method(:[]=) do |addr, value|
-            Fiddle::Pointer.new(addr)[0, size] = [value].pack(pack)
-          end
-        end
-      end
-    end
-
-    # -Fiddle::TYPE_CHAR Immediate with special handling of true/false
-    class Bool < Immediate.define(-Fiddle::TYPE_CHAR)
-      # Dereference
-      def *
-        return nil if @addr == 0
-        super != 0
-      end
-
-      def self.[]=(addr, value)
-        super(addr, value ? 1 : 0)
-      end
-    end
-
-    class Pointer
-      attr_reader :type
-
-      # @param addr [Integer]
-      # @param type [Class] RubyVM::RJIT::CType::*
-      def initialize(addr, type)
-        @addr = addr
-        @type = type
-      end
-
-      # Move addr to addess this pointer like an array
-      def +(index)
-        raise ArgumentError unless index.is_a?(Integer)
-        Pointer.new(@addr + index * Fiddle::SIZEOF_VOIDP, @type)
-      end
-
-      # Dereference
-      def *
-        return nil if dest_addr == 0
-        @type.new(dest_addr)
-      end
-
-      # Array access
-      def [](index)
-        (self + index).*
-      end
-
-      # Array set
-      # @param index [Integer]
-      # @param value [Integer, RubyVM::RJIT::CPointer::Struct] an address itself or an object that return an address with to_i
-      def []=(index, value)
-        Fiddle::Pointer.new(@addr + index * Fiddle::SIZEOF_VOIDP)[0, Fiddle::SIZEOF_VOIDP] =
-          [value.to_i].pack(Fiddle::PackInfo::PACK_MAP[Fiddle::TYPE_VOIDP])
-      end
-
-      # Get a raw address
-      def to_i
-        @addr
-      end
-
-      private
-
-      def dest_addr
-        Fiddle::Pointer.new(@addr)[0, Fiddle::SIZEOF_VOIDP].unpack1(Fiddle::PackInfo::PACK_MAP[Fiddle::TYPE_VOIDP])
-      end
-
-      def self.define(block)
-        Class.new(self) do
-          define_method(:initialize) do |addr|
-            super(addr, block.call)
-          end
-
-          # Type-level []=: Used by struct fields
-          # @param addr [Integer]
-          # @param value [Integer, RubyVM::RJIT::CPointer::Struct] an address itself, or an object that return an address with to_i
-          define_singleton_method(:[]=) do |addr, value|
-            value = value.to_i
-            Fiddle::Pointer.new(addr)[0, Fiddle::SIZEOF_VOIDP] = [value].pack(Fiddle::PackInfo::PACK_MAP[Fiddle::TYPE_VOIDP])
-          end
-        end
-      end
-    end
-
-    class BitField
-      # @param addr [Integer]
-      # @param width [Integer]
-      # @param offset [Integer]
-      def initialize(addr, width, offset)
-        @addr = addr
-        @width = width
-        @offset = offset
-      end
-
-      # Dereference
-      def *
-        byte = Fiddle::Pointer.new(@addr)[0, Fiddle::SIZEOF_CHAR].unpack('c').first
-        if @width == 1
-          bit = (1 & (byte >> @offset))
-          bit == 1
-        elsif @width <= 8 && @offset == 0
-          bitmask = @width.times.map { |i| 1 << i }.sum
-          byte & bitmask
-        else
-          raise NotImplementedError.new("not-implemented bit field access: width=#{@width} offset=#{@offset}")
-        end
-      end
-
-      # @param width [Integer]
-      # @param offset [Integer]
-      def self.define(width, offset)
-        Class.new(self) do
-          define_method(:initialize) do |addr|
-            super(addr, width, offset)
-          end
-        end
-      end
-    end
-
-    # Give a name to a dynamic CPointer class to see it on inspect
-    def self.with_class_name(prefix, name, cache: false, &block)
-      return block.call if name.empty?
-
-      # Use a cached result only if cache: true
-      class_name = "#{prefix}_#{name}"
-      klass =
-        if cache && self.const_defined?(class_name)
-          self.const_get(class_name)
-        else
-          block.call
-        end
-
-      # Give it a name unless it's already defined
-      unless self.const_defined?(class_name)
-        self.const_set(class_name, klass)
-      end
-
-      klass
-    end
-  end
-end
diff --git a/lib/ruby_vm/rjit/c_type.rb b/lib/ruby_vm/rjit/c_type.rb
deleted file mode 100644
index bec7e21c386611..00000000000000
--- a/lib/ruby_vm/rjit/c_type.rb
+++ /dev/null
@@ -1,91 +0,0 @@
-require 'fiddle'
-require 'fiddle/pack'
-require_relative 'c_pointer'
-
-module RubyVM::RJIT
-  module CType
-    module Struct
-      # @param name [String]
-      # @param members [Hash{ Symbol => [Integer, RubyVM::RJIT::CType::*] }]
-      def self.new(name, sizeof, **members)
-        name = members.keys.join('_') if name.empty?
-        CPointer.with_class_name('Struct', name) do
-          CPointer::Struct.define(sizeof, members)
-        end
-      end
-    end
-
-    module Union
-      # @param name [String]
-      # @param members [Hash{ Symbol => RubyVM::RJIT::CType::* }]
-      def self.new(name, sizeof, **members)
-        name = members.keys.join('_') if name.empty?
-        CPointer.with_class_name('Union', name) do
-          CPointer::Union.define(sizeof, members)
-        end
-      end
-    end
-
-    module Immediate
-      # @param fiddle_type [Integer]
-      def self.new(fiddle_type)
-        name = Fiddle.constants.find do |const|
-          const.start_with?('TYPE_') && Fiddle.const_get(const) == fiddle_type.abs
-        end&.to_s
-        name.delete_prefix!('TYPE_')
-        if fiddle_type.negative?
-          name.prepend('U')
-        end
-        CPointer.with_class_name('Immediate', name, cache: true) do
-          CPointer::Immediate.define(fiddle_type)
-        end
-      end
-
-      # @param type [String]
-      def self.parse(ctype)
-        new(Fiddle::Importer.parse_ctype(ctype))
-      end
-
-      def self.find(size, signed)
-        fiddle_type = TYPE_MAP.fetch(size)
-        fiddle_type = -fiddle_type unless signed
-        new(fiddle_type)
-      end
-
-      TYPE_MAP = Fiddle::PackInfo::SIZE_MAP.map { |type, size| [size, type.abs] }.to_h
-      private_constant :TYPE_MAP
-    end
-
-    module Bool
-      def self.new
-        CPointer::Bool
-      end
-    end
-
-    class Pointer
-      # This takes a block to avoid "stack level too deep" on a cyclic reference
-      # @param block [Proc]
-      def self.new(&block)
-        CPointer.with_class_name('Pointer', block.object_id.to_s) do
-          CPointer::Pointer.define(block)
-        end
-      end
-    end
-
-    module BitField
-      # @param width [Integer]
-      # @param offset [Integer]
-      def self.new(width, offset)
-        CPointer.with_class_name('BitField', "#{offset}_#{width}") do
-          CPointer::BitField.define(width, offset)
-        end
-      end
-    end
-
-    # Types that are referenced but not part of code generation targets
-    Stub = ::Struct.new(:name)
-
-    # Types that it failed to figure out from the header
-    Unknown = Module.new
-  end
-end
diff --git a/lib/ruby_vm/rjit/code_block.rb b/lib/ruby_vm/rjit/code_block.rb
deleted file mode 100644
index 6260ec8b4bcc88..00000000000000
--- a/lib/ruby_vm/rjit/code_block.rb
+++ /dev/null
@@ -1,87 +0,0 @@
-module RubyVM::RJIT
-  class CodeBlock
-    # @param mem_block [Integer] JIT buffer address
-    # @param mem_size  [Integer] JIT buffer size
-    # @param outliend  [TrueClass,FalseClass] true for outlined CodeBlock
-    def initialize(mem_block:, mem_size:, outlined: false)
-      @comments  = Hash.new { |h, k| h[k] = [] }
-      @mem_block = mem_block
-      @mem_size  = mem_size
-      @write_pos = 0
-      @outlined  = outlined
-    end
-
-    # @param asm [RubyVM::RJIT::Assembler]
-    def write(asm)
-      return 0 if @write_pos + asm.size >= @mem_size
-
-      start_addr = write_addr
-
-      # Write machine code
-      C.mprotect_write(@mem_block, @mem_size)
-      @write_pos += asm.assemble(start_addr)
-      C.mprotect_exec(@mem_block, @mem_size)
-
-      end_addr = write_addr
-
-      # Convert comment indexes to addresses
-      asm.comments.each do |index, comments|
-        @comments[start_addr + index] += comments
-      end
-      asm.comments.clear
-
-      # Dump disasm if --rjit-dump-disasm
-      if C.rjit_opts.dump_disasm && start_addr < end_addr
-        dump_disasm(start_addr, end_addr)
-      end
-      start_addr
-    end
-
-    def set_write_addr(addr)
-      @write_pos = addr - @mem_block
-      @comments.delete(addr) # TODO: clean up old comments for all the overwritten range?
-    end
-
-    def with_write_addr(addr)
-      old_write_pos = @write_pos
-      set_write_addr(addr)
-      yield
-    ensure
-      @write_pos = old_write_pos
-    end
-
-    def write_addr
-      @mem_block + @write_pos
-    end
-
-    def include?(addr)
-      (@mem_block...(@mem_block + @mem_size)).include?(addr)
-    end
-
-    def dump_disasm(from, to, io: STDOUT, color: true, test: false)
-      C.dump_disasm(from, to, test:).each do |address, mnemonic, op_str|
-        @comments.fetch(address, []).each do |comment|
-          io.puts colorize("  # #{comment}", bold: true, color:)
-        end
-        io.puts colorize("  0x#{format("%x", address)}: #{mnemonic} #{op_str}", color:)
-      end
-      io.puts
-    end
-
-    private
-
-    def colorize(text, bold: false, color:)
-      return text unless color
-      buf = +''
-      buf << "\e[1m" if bold
-      buf << "\e[34m" if @outlined
-      buf << text
-      buf << "\e[0m"
-      buf
-    end
-
-    def bold(text)
-      "\e[1m#{text}\e[0m"
-    end
-  end
-end
diff --git a/lib/ruby_vm/rjit/compiler.rb b/lib/ruby_vm/rjit/compiler.rb
deleted file mode 100644
index 9ae528a0e99d4c..00000000000000
--- a/lib/ruby_vm/rjit/compiler.rb
+++ /dev/null
@@ -1,509 +0,0 @@
-require 'ruby_vm/rjit/assembler'
-require 'ruby_vm/rjit/block'
-require 'ruby_vm/rjit/branch_stub'
-require 'ruby_vm/rjit/code_block'
-require 'ruby_vm/rjit/context'
-require 'ruby_vm/rjit/entry_stub'
-require 'ruby_vm/rjit/exit_compiler'
-require 'ruby_vm/rjit/insn_compiler'
-require 'ruby_vm/rjit/instruction'
-require 'ruby_vm/rjit/invariants'
-require 'ruby_vm/rjit/jit_state'
-require 'ruby_vm/rjit/type'
-
-module RubyVM::RJIT
-  # Compilation status
-  KeepCompiling = :KeepCompiling
-  CantCompile = :CantCompile
-  EndBlock = :EndBlock
-
-  # Ruby constants
-  Qtrue = Fiddle::Qtrue
-  Qfalse = Fiddle::Qfalse
-  Qnil = Fiddle::Qnil
-  Qundef = Fiddle::Qundef
-
-  # Callee-saved registers
-  # TODO: support using r12/r13 here
-  EC  = :r14
-  CFP = :r15
-  SP  = :rbx
-
-  # Scratch registers: rax, rcx, rdx
-
-  # Mark objects in this Array during GC
-  GC_REFS = []
-
-  # Maximum number of versions per block
-  # 1 means always create generic versions
-  MAX_VERSIONS = 4
-
-  class Compiler
-    attr_accessor :write_pos
-
-    def self.decode_insn(encoded)
-      INSNS.fetch(C.rb_vm_insn_decode(encoded))
-    end
-
-    def initialize
-      mem_size = C.rjit_opts.exec_mem_size * 1024 * 1024
-      mem_block = C.mmap(mem_size)
-      @cb = CodeBlock.new(mem_block: mem_block, mem_size: mem_size / 2)
-      @ocb = CodeBlock.new(mem_block: mem_block + mem_size / 2, mem_size: mem_size / 2, outlined: true)
-      @exit_compiler = ExitCompiler.new
-      @insn_compiler = InsnCompiler.new(@cb, @ocb, @exit_compiler)
-      Invariants.initialize(@cb, @ocb, self, @exit_compiler)
-    end
-
-    # Compile an ISEQ from its entry point.
-    # @param iseq `RubyVM::RJIT::CPointer::Struct_rb_iseq_t`
-    # @param cfp `RubyVM::RJIT::CPointer::Struct_rb_control_frame_t`
-    def compile(iseq, cfp)
-      pc = cfp.pc.to_i
-      jit = JITState.new(iseq:, cfp:)
-      asm = Assembler.new
-      compile_prologue(asm, iseq, pc)
-      compile_block(asm, jit:, pc:)
-      iseq.body.jit_entry = @cb.write(asm)
-    rescue Exception => e
-      $stderr.puts e.full_message
-      exit 1
-    end
-
-    # Compile an entry.
-    # @param entry [RubyVM::RJIT::EntryStub]
-    def entry_stub_hit(entry_stub, cfp)
-      # Compile a new entry guard as a next entry
-      pc = cfp.pc.to_i
-      next_entry = Assembler.new.then do |asm|
-        compile_entry_chain_guard(asm, cfp.iseq, pc)
-        @cb.write(asm)
-      end
-
-      # Try to find an existing compiled version of this block
-      ctx = Context.new
-      block = find_block(cfp.iseq, pc, ctx)
-      if block
-        # If an existing block is found, generate a jump to the block.
-        asm = Assembler.new
-        asm.jmp(block.start_addr)
-        @cb.write(asm)
-      else
-        # If this block hasn't yet been compiled, generate blocks after the entry guard.
-        asm = Assembler.new
-        jit = JITState.new(iseq: cfp.iseq, cfp:)
-        compile_block(asm, jit:, pc:, ctx:)
-        @cb.write(asm)
-
-        block = jit.block
-      end
-
-      # Regenerate the previous entry
-      @cb.with_write_addr(entry_stub.start_addr) do
-        # The last instruction of compile_entry_chain_guard is jne
-        asm = Assembler.new
-        asm.jne(next_entry)
-        @cb.write(asm)
-      end
-
-      return block.start_addr
-    rescue Exception => e
-      $stderr.puts e.full_message
-      exit 1
-    end
-
-    # Compile a branch stub.
-    # @param branch_stub [RubyVM::RJIT::BranchStub]
-    # @param cfp `RubyVM::RJIT::CPointer::Struct_rb_control_frame_t`
-    # @param target0_p [TrueClass,FalseClass]
-    # @return [Integer] The starting address of the compiled branch stub
-    def branch_stub_hit(branch_stub, cfp, target0_p)
-      # Update cfp->pc for `jit.at_current_insn?`
-      target = target0_p ? branch_stub.target0 : branch_stub.target1
-      cfp.pc = target.pc
-
-      # Reuse an existing block if it already exists
-      block = find_block(branch_stub.iseq, target.pc, target.ctx)
-
-      # If the branch stub's jump is the last code, allow overwriting part of
-      # the old branch code with the new block code.
-      fallthrough = block.nil? && @cb.write_addr == branch_stub.end_addr
-      if fallthrough
-        # If the branch stub's jump is the last code, allow overwriting part of
-        # the old branch code with the new block code.
-        @cb.set_write_addr(branch_stub.start_addr)
-        branch_stub.shape = target0_p ? Next0 : Next1
-        Assembler.new.tap do |branch_asm|
-          branch_stub.compile.call(branch_asm)
-          @cb.write(branch_asm)
-        end
-      end
-
-      # Reuse or generate a block
-      if block
-        target.address = block.start_addr
-      else
-        jit = JITState.new(iseq: branch_stub.iseq, cfp:)
-        target.address = Assembler.new.then do |asm|
-          compile_block(asm, jit:, pc: target.pc, ctx: target.ctx.dup)
-          @cb.write(asm)
-        end
-        block = jit.block
-      end
-      block.incoming << branch_stub # prepare for invalidate_block
-
-      # Re-generate the branch code for non-fallthrough cases
-      unless fallthrough
-        @cb.with_write_addr(branch_stub.start_addr) do
-          branch_asm = Assembler.new
-          branch_stub.compile.call(branch_asm)
-          @cb.write(branch_asm)
-        end
-      end
-
-      return target.address
-    rescue Exception => e
-      $stderr.puts e.full_message
-      exit 1
-    end
-
-    # @param iseq `RubyVM::RJIT::CPointer::Struct_rb_iseq_t`
-    # @param pc [Integer]
-    def invalidate_blocks(iseq, pc)
-      list_blocks(iseq, pc).each do |block|
-        invalidate_block(block)
-      end
-
-      # If they were the ISEQ's first blocks, re-compile RJIT entry as well
-      if iseq.body.iseq_encoded.to_i == pc
-        iseq.body.jit_entry = 0
-        iseq.body.jit_entry_calls = 0
-      end
-    end
-
-    def invalidate_block(block)
-      iseq = block.iseq
-      # Avoid touching GCed ISEQs. We assume it won't be re-entered.
-      return unless C.imemo_type_p(iseq, C.imemo_iseq)
-
-      # Remove this block from the version array
-      remove_block(iseq, block)
-
-      # Invalidate the block with entry exit
-      unless block.invalidated
-        @cb.with_write_addr(block.start_addr) do
-          asm = Assembler.new
-          asm.comment('invalidate_block')
-          asm.jmp(block.entry_exit)
-          @cb.write(asm)
-        end
-        block.invalidated = true
-      end
-
-      # Re-stub incoming branches
-      block.incoming.each do |branch_stub|
-        target = [branch_stub.target0, branch_stub.target1].compact.find do |target|
-          target.pc == block.pc && target.ctx == block.ctx
-        end
-        next if target.nil?
-        # TODO: Could target.address be a stub address? Is invalidation not needed in that case?
-
-        # If the target being re-generated is currently a fallthrough block,
-        # the fallthrough code must be rewritten with a jump to the stub.
-        if target.address == branch_stub.end_addr
-          branch_stub.shape = Default
-        end
-
-        target.address = Assembler.new.then do |ocb_asm|
-          @exit_compiler.compile_branch_stub(block.ctx, ocb_asm, branch_stub, target == branch_stub.target0)
-          @ocb.write(ocb_asm)
-        end
-        @cb.with_write_addr(branch_stub.start_addr) do
-          branch_asm = Assembler.new
-          branch_stub.compile.call(branch_asm)
-          @cb.write(branch_asm)
-        end
-      end
-    end
-
-    private
-
-    # Callee-saved: rbx, rsp, rbp, r12, r13, r14, r15
-    # Caller-saved: rax, rdi, rsi, rdx, rcx, r8, r9, r10, r11
-    #
-    # @param asm [RubyVM::RJIT::Assembler]
-    def compile_prologue(asm, iseq, pc)
-      asm.comment('RJIT entry point')
-
-      # Save callee-saved registers used by JITed code
-      asm.push(CFP)
-      asm.push(EC)
-      asm.push(SP)
-
-      # Move arguments EC and CFP to dedicated registers
-      asm.mov(EC, :rdi)
-      asm.mov(CFP, :rsi)
-
-      # Load sp to a dedicated register
-      asm.mov(SP, [CFP, C.rb_control_frame_t.offsetof(:sp)]) # rbx = cfp->sp
-
-      # Setup cfp->jit_return
-      asm.mov(:rax, leave_exit)
-      asm.mov([CFP, C.rb_control_frame_t.offsetof(:jit_return)], :rax)
-
-      # We're compiling iseqs that we *expect* to start at `insn_idx`. But in
-      # the case of optional parameters, the interpreter can set the pc to a
-      # different location depending on the optional parameters.  If an iseq
-      # has optional parameters, we'll add a runtime check that the PC we've
-      # compiled for is the same PC that the interpreter wants us to run with.
-      # If they don't match, then we'll take a side exit.
-      if iseq.body.param.flags.has_opt
-        compile_entry_chain_guard(asm, iseq, pc)
-      end
-    end
-
-    def compile_entry_chain_guard(asm, iseq, pc)
-      entry_stub = EntryStub.new
-      stub_addr = Assembler.new.then do |ocb_asm|
-        @exit_compiler.compile_entry_stub(ocb_asm, entry_stub)
-        @ocb.write(ocb_asm)
-      end
-
-      asm.comment('guard expected PC')
-      asm.mov(:rax, pc)
-      asm.cmp([CFP, C.rb_control_frame_t.offsetof(:pc)], :rax)
-
-      asm.stub(entry_stub) do
-        asm.jne(stub_addr)
-      end
-    end
-
-    # @param asm [RubyVM::RJIT::Assembler]
-    # @param jit [RubyVM::RJIT::JITState]
-    # @param ctx [RubyVM::RJIT::Context]
-    def compile_block(asm, jit:, pc:, ctx: Context.new)
-      # Mark the block start address and prepare an exit code storage
-      ctx = limit_block_versions(jit.iseq, pc, ctx)
-      block = Block.new(iseq: jit.iseq, pc:, ctx: ctx.dup)
-      jit.block = block
-      asm.block(block)
-
-      iseq = jit.iseq
-      asm.comment("Block: #{iseq.body.location.label}@#{C.rb_iseq_path(iseq)}:#{iseq_lineno(iseq, pc)}")
-
-      # Compile each insn
-      index = (pc - iseq.body.iseq_encoded.to_i) / C.VALUE.size
-      while index < iseq.body.iseq_size
-        # Set the current instruction
-        insn = self.class.decode_insn(iseq.body.iseq_encoded[index])
-        jit.pc = (iseq.body.iseq_encoded + index).to_i
-        jit.stack_size_for_pc = ctx.stack_size
-        jit.side_exit_for_pc.clear
-
-        # If previous instruction requested to record the boundary
-        if jit.record_boundary_patch_point
-          # Generate an exit to this instruction and record it
-          exit_pos = Assembler.new.then do |ocb_asm|
-            @exit_compiler.compile_side_exit(jit.pc, ctx, ocb_asm)
-            @ocb.write(ocb_asm)
-          end
-          Invariants.record_global_inval_patch(asm, exit_pos)
-          jit.record_boundary_patch_point = false
-        end
-
-        # In debug mode, verify our existing assumption
-        if C.rjit_opts.verify_ctx && jit.at_current_insn?
-          verify_ctx(jit, ctx)
-        end
-
-        case status = @insn_compiler.compile(jit, ctx, asm, insn)
-        when KeepCompiling
-          # For now, reset the chain depth after each instruction as only the
-          # first instruction in the block can concern itself with the depth.
-          ctx.chain_depth = 0
-
-          index += insn.len
-        when EndBlock
-          # TODO: pad nops if entry exit exists (not needed for x86_64?)
-          break
-        when CantCompile
-          # Rewind stack_size using ctx.with_stack_size to allow stack_size changes
-          # before you return CantCompile.
-          @exit_compiler.compile_side_exit(jit.pc, ctx.with_stack_size(jit.stack_size_for_pc), asm)
-
-          # If this is the first instruction, this block never needs to be invalidated.
-          if block.pc == iseq.body.iseq_encoded.to_i + index * C.VALUE.size
-            block.invalidated = true
-          end
-
-          break
-        else
-          raise "compiling #{insn.name} returned unexpected status: #{status.inspect}"
-        end
-      end
-
-      incr_counter(:compiled_block_count)
-      add_block(iseq, block)
-    end
-
-    def leave_exit
-      @leave_exit ||= Assembler.new.then do |asm|
-        @exit_compiler.compile_leave_exit(asm)
-        @ocb.write(asm)
-      end
-    end
-
-    def incr_counter(name)
-      if C.rjit_opts.stats
-        C.rb_rjit_counters[name][0] += 1
-      end
-    end
-
-    # Produce a generic context when the block version limit is hit for the block
-    def limit_block_versions(iseq, pc, ctx)
-      # Guard chains implement limits separately, do nothing
-      if ctx.chain_depth > 0
-        return ctx.dup
-      end
-
-      # If this block version we're about to add will hit the version limit
-      if list_blocks(iseq, pc).size + 1 >= MAX_VERSIONS
-        # Produce a generic context that stores no type information,
-        # but still respects the stack_size and sp_offset constraints.
-        # This new context will then match all future requests.
-        generic_ctx = Context.new
-        generic_ctx.stack_size = ctx.stack_size
-        generic_ctx.sp_offset = ctx.sp_offset
-
-        if ctx.diff(generic_ctx) == TypeDiff::Incompatible
-          raise 'should substitute a compatible context'
-        end
-
-        return generic_ctx
-      end
-
-      return ctx.dup
-    end
-
-    def list_blocks(iseq, pc)
-      rjit_blocks(iseq)[pc]
-    end
-
-    # @param [Integer] pc
-    # @param [RubyVM::RJIT::Context] ctx
-    # @return [RubyVM::RJIT::Block,NilClass]
-    def find_block(iseq, pc, ctx)
-      versions = rjit_blocks(iseq)[pc]
-
-      best_version = nil
-      best_diff = Float::INFINITY
-
-      versions.each do |block|
-        # Note that we always prefer the first matching
-        # version found because of inline-cache chains
-        case ctx.diff(block.ctx)
-        in TypeDiff::Compatible[diff] if diff < best_diff
-          best_version = block
-          best_diff = diff
-        else
-        end
-      end
-
-      return best_version
-    end
-
-    # @param [RubyVM::RJIT::Block] block
-    def add_block(iseq, block)
-      rjit_blocks(iseq)[block.pc] << block
-    end
-
-    # @param [RubyVM::RJIT::Block] block
-    def remove_block(iseq, block)
-      rjit_blocks(iseq)[block.pc].delete(block)
-    end
-
-    def rjit_blocks(iseq)
-      # Guard against ISEQ GC at random moments
-
-      unless C.imemo_type_p(iseq, C.imemo_iseq)
-        return Hash.new { |h, k| h[k] = [] }
-      end
-
-      unless iseq.body.rjit_blocks
-        iseq.body.rjit_blocks = Hash.new { |blocks, pc| blocks[pc] = [] }
-        # For some reason, rb_rjit_iseq_mark didn't protect this Hash
-        # from being freed. So we rely on GC_REFS to keep the Hash.
-        GC_REFS << iseq.body.rjit_blocks
-      end
-      iseq.body.rjit_blocks
-    end
-
-    def iseq_lineno(iseq, pc)
-      C.rb_iseq_line_no(iseq, (pc - iseq.body.iseq_encoded.to_i) / C.VALUE.size)
-    rescue RangeError # bignum too big to convert into `unsigned long long' (RangeError)
-      -1
-    end
-
-    # Verify the ctx's types and mappings against the compile-time stack, self, and locals.
-    # @param jit [RubyVM::RJIT::JITState]
-    # @param ctx [RubyVM::RJIT::Context]
-    def verify_ctx(jit, ctx)
-      # Only able to check types when at current insn
-      assert(jit.at_current_insn?)
-
-      self_val = jit.peek_at_self
-      self_val_type = Type.from(self_val)
-
-      # Verify self operand type
-      assert_compatible(self_val_type, ctx.get_opnd_type(SelfOpnd))
-
-      # Verify stack operand types
-      [ctx.stack_size, MAX_TEMP_TYPES].min.times do |i|
-        learned_mapping, learned_type = ctx.get_opnd_mapping(StackOpnd[i])
-        stack_val = jit.peek_at_stack(i)
-        val_type = Type.from(stack_val)
-
-        case learned_mapping
-        in MapToSelf
-          if C.to_value(self_val) != C.to_value(stack_val)
-            raise "verify_ctx: stack value was mapped to self, but values did not match:\n"\
-              "stack: #{stack_val.inspect}, self: #{self_val.inspect}"
-          end
-        in MapToLocal[local_idx]
-          local_val = jit.peek_at_local(local_idx)
-          if C.to_value(local_val) != C.to_value(stack_val)
-            raise "verify_ctx: stack value was mapped to local, but values did not match:\n"\
-              "stack: #{stack_val.inspect}, local: #{local_val.inspect}"
-          end
-        in MapToStack
-          # noop
-        end
-
-        # If the actual type differs from the learned type
-        assert_compatible(val_type, learned_type)
-      end
-
-      # Verify local variable types
-      local_table_size = jit.iseq.body.local_table_size
-      [local_table_size, MAX_TEMP_TYPES].min.times do |i|
-        learned_type = ctx.get_local_type(i)
-        local_val = jit.peek_at_local(i)
-        local_type = Type.from(local_val)
-
-        assert_compatible(local_type, learned_type)
-      end
-    end
-
-    def assert_compatible(actual_type, ctx_type)
-      if actual_type.diff(ctx_type) == TypeDiff::Incompatible
-        raise "verify_ctx: ctx type (#{ctx_type.type.inspect}) is incompatible with actual type (#{actual_type.type.inspect})"
-      end
-    end
-
-    def assert(cond)
-      unless cond
-        raise "'#{cond.inspect}' was not true"
-      end
-    end
-  end
-end
diff --git a/lib/ruby_vm/rjit/context.rb b/lib/ruby_vm/rjit/context.rb
deleted file mode 100644
index 66da478c7fdbde..00000000000000
--- a/lib/ruby_vm/rjit/context.rb
+++ /dev/null
@@ -1,377 +0,0 @@
-module RubyVM::RJIT
-  # Maximum number of temp value types we keep track of
-  MAX_TEMP_TYPES = 8
-  # Maximum number of local variable types we keep track of
-  MAX_LOCAL_TYPES = 8
-
-  # Operand to a YARV bytecode instruction
-  SelfOpnd = :SelfOpnd # The value is self
-  StackOpnd = Data.define(:index) # Temporary stack operand with stack index
-
-  # Potential mapping of a value on the temporary stack to self,
-  # a local variable, or constant so that we can track its type
-  MapToStack = :MapToStack # Normal stack value
-  MapToSelf  = :MapToSelf  # Temp maps to the self operand
-  MapToLocal = Data.define(:local_index) # Temp maps to a local variable with index
-
-  class Context < Struct.new(
-    :stack_size,   # @param [Integer] The number of values on the stack
-    :sp_offset,    # @param [Integer] JIT sp offset relative to the interpreter's sp
-    :chain_depth,  # @param [Integer] jit_chain_guard depth
-    :local_types,  # @param [Array<RubyVM::RJIT::Type>] Local variable types we keep track of
-    :temp_types,   # @param [Array<RubyVM::RJIT::Type>] Temporary variable types we keep track of
-    :self_type,    # @param [RubyVM::RJIT::Type] Type we track for self
-    :temp_mapping, # @param [Array<Symbol>] Mapping of temp stack entries to types we track
-  )
-    def initialize(
-      stack_size:   0,
-      sp_offset:    0,
-      chain_depth:  0,
-      local_types:  [Type::Unknown] * MAX_LOCAL_TYPES,
-      temp_types:   [Type::Unknown] * MAX_TEMP_TYPES,
-      self_type:    Type::Unknown,
-      temp_mapping: [MapToStack] * MAX_TEMP_TYPES
-    ) = super
-
-    # Deep dup by default for safety
-    def dup
-      ctx = super
-      ctx.local_types = ctx.local_types.dup
-      ctx.temp_types = ctx.temp_types.dup
-      ctx.temp_mapping = ctx.temp_mapping.dup
-      ctx
-    end
-
-    # Create a new Context instance with a given stack_size and sp_offset adjusted
-    # accordingly. This is useful when you want to virtually rewind a stack_size for
-    # generating a side exit while considering past sp_offset changes on gen_save_sp.
-    def with_stack_size(stack_size)
-      ctx = self.dup
-      ctx.sp_offset -= ctx.stack_size - stack_size
-      ctx.stack_size = stack_size
-      ctx
-    end
-
-    def stack_opnd(depth_from_top)
-      [SP, C.VALUE.size * (self.sp_offset - 1 - depth_from_top)]
-    end
-
-    def sp_opnd(offset_bytes = 0)
-      [SP, (C.VALUE.size * self.sp_offset) + offset_bytes]
-    end
-
-    # Push one new value on the temp stack with an explicit mapping
-    # Return a pointer to the new stack top
-    def stack_push_mapping(mapping_temp_type)
-      stack_size = self.stack_size
-
-      # Keep track of the type and mapping of the value
-      if stack_size < MAX_TEMP_TYPES
-        mapping, temp_type = mapping_temp_type
-        self.temp_mapping[stack_size] = mapping
-        self.temp_types[stack_size] = temp_type
-
-        case mapping
-        in MapToLocal[idx]
-          assert(idx < MAX_LOCAL_TYPES)
-        else
-        end
-      end
-
-      self.stack_size += 1
-      self.sp_offset += 1
-
-      return self.stack_opnd(0)
-    end
-
-    # Push one new value on the temp stack
-    # Return a pointer to the new stack top
-    def stack_push(val_type)
-      return self.stack_push_mapping([MapToStack, val_type])
-    end
-
-    # Push the self value on the stack
-    def stack_push_self
-      return self.stack_push_mapping([MapToStack, Type::Unknown])
-    end
-
-    # Push a local variable on the stack
-    def stack_push_local(local_idx)
-      if local_idx >= MAX_LOCAL_TYPES
-        return self.stack_push(Type::Unknown)
-      end
-
-      return self.stack_push_mapping([MapToLocal[local_idx], Type::Unknown])
-    end
-
-    # Pop N values off the stack
-    # Return a pointer to the stack top before the pop operation
-    def stack_pop(n = 1)
-      assert(n <= self.stack_size)
-
-      top = self.stack_opnd(0)
-
-      # Clear the types of the popped values
-      n.times do |i|
-        idx = self.stack_size - i - 1
-
-        if idx < MAX_TEMP_TYPES
-          self.temp_types[idx] = Type::Unknown
-          self.temp_mapping[idx] = MapToStack
-        end
-      end
-
-      self.stack_size -= n
-      self.sp_offset -= n
-
-      return top
-    end
-
-    def shift_stack(argc)
-      assert(argc < self.stack_size)
-
-      method_name_index = self.stack_size - argc - 1
-
-      (method_name_index...(self.stack_size - 1)).each do |i|
-        if i + 1 < MAX_TEMP_TYPES
-          self.temp_types[i] = self.temp_types[i + 1]
-          self.temp_mapping[i] = self.temp_mapping[i + 1]
-        end
-      end
-      self.stack_pop(1)
-    end
-
-    # Get the type of an instruction operand
-    def get_opnd_type(opnd)
-      case opnd
-      in SelfOpnd
-        self.self_type
-      in StackOpnd[idx]
-        assert(idx < self.stack_size)
-        stack_idx = self.stack_size - 1 - idx
-
-        # If outside of tracked range, do nothing
-        if stack_idx >= MAX_TEMP_TYPES
-          return Type::Unknown
-        end
-
-        mapping = self.temp_mapping[stack_idx]
-
-        case mapping
-        in MapToSelf
-          self.self_type
-        in MapToStack
-          self.temp_types[self.stack_size - 1 - idx]
-        in MapToLocal[idx]
-          assert(idx < MAX_LOCAL_TYPES)
-          self.local_types[idx]
-        end
-      end
-    end
-
-    # Get the currently tracked type for a local variable
-    def get_local_type(idx)
-      self.local_types[idx] || Type::Unknown
-    end
-
-    # Upgrade (or "learn") the type of an instruction operand
-    # This value must be compatible and at least as specific as the previously known type.
-    # If this value originated from self, or an lvar, the learned type will be
-    # propagated back to its source.
-    def upgrade_opnd_type(opnd, opnd_type)
-      case opnd
-      in SelfOpnd
-        self.self_type = self.self_type.upgrade(opnd_type)
-      in StackOpnd[idx]
-        assert(idx < self.stack_size)
-        stack_idx = self.stack_size - 1 - idx
-
-        # If outside of tracked range, do nothing
-        if stack_idx >= MAX_TEMP_TYPES
-          return
-        end
-
-        mapping = self.temp_mapping[stack_idx]
-
-        case mapping
-        in MapToSelf
-          self.self_type = self.self_type.upgrade(opnd_type)
-        in MapToStack
-          self.temp_types[stack_idx] = self.temp_types[stack_idx].upgrade(opnd_type)
-        in MapToLocal[idx]
-          assert(idx < MAX_LOCAL_TYPES)
-          self.local_types[idx] = self.local_types[idx].upgrade(opnd_type)
-        end
-      end
-    end
-
-    # Get both the type and mapping (where the value originates) of an operand.
-    # This is can be used with stack_push_mapping or set_opnd_mapping to copy
-    # a stack value's type while maintaining the mapping.
-    def get_opnd_mapping(opnd)
-      opnd_type = self.get_opnd_type(opnd)
-
-      case opnd
-      in SelfOpnd
-        return [MapToSelf, opnd_type]
-      in StackOpnd[idx]
-        assert(idx < self.stack_size)
-        stack_idx = self.stack_size - 1 - idx
-
-        if stack_idx < MAX_TEMP_TYPES
-          return [self.temp_mapping[stack_idx], opnd_type]
-        else
-          # We can't know the source of this stack operand, so we assume it is
-          # a stack-only temporary. type will be UNKNOWN
-          assert(opnd_type == Type::Unknown)
-          return [MapToStack, opnd_type]
-        end
-      end
-    end
-
-    # Overwrite both the type and mapping of a stack operand.
-    def set_opnd_mapping(opnd, mapping_opnd_type)
-      case opnd
-      in SelfOpnd
-        raise 'self always maps to self'
-      in StackOpnd[idx]
-        assert(idx < self.stack_size)
-        stack_idx = self.stack_size - 1 - idx
-
-        # If outside of tracked range, do nothing
-        if stack_idx >= MAX_TEMP_TYPES
-          return
-        end
-
-        mapping, opnd_type = mapping_opnd_type
-        self.temp_mapping[stack_idx] = mapping
-
-        # Only used when mapping == MAP_STACK
-        self.temp_types[stack_idx] = opnd_type
-      end
-    end
-
-    # Set the type of a local variable
-    def set_local_type(local_idx, local_type)
-      if local_idx >= MAX_LOCAL_TYPES
-        return
-      end
-
-      # If any values on the stack map to this local we must detach them
-      MAX_TEMP_TYPES.times do |stack_idx|
-        case self.temp_mapping[stack_idx]
-        in MapToStack
-          # noop
-        in MapToSelf
-          # noop
-        in MapToLocal[local_idx]
-          if stack_idx == local_idx
-            self.temp_types[stack_idx] = self.local_types[local_idx];
-            self.temp_mapping[stack_idx] = MapToStack
-          else
-            # noop
-          end
-        end
-      end
-
-      self.local_types[local_idx] = local_type
-    end
-
-    # Erase local variable type information
-    # eg: because of a call we can't track
-    def clear_local_types
-      # When clearing local types we must detach any stack mappings to those
-      # locals. Even if local values may have changed, stack values will not.
-      MAX_TEMP_TYPES.times do |stack_idx|
-        case self.temp_mapping[stack_idx]
-        in MapToStack
-          # noop
-        in MapToSelf
-          # noop
-        in MapToLocal[local_idx]
-          self.temp_types[stack_idx] = self.local_types[local_idx]
-          self.temp_mapping[stack_idx] = MapToStack
-        end
-      end
-
-      # Clear the local types
-      self.local_types = [Type::Unknown] * MAX_LOCAL_TYPES
-    end
-
-    # Compute a difference score for two context objects
-    def diff(dst)
-      # Self is the source context (at the end of the predecessor)
-      src = self
-
-      # Can only lookup the first version in the chain
-      if dst.chain_depth != 0
-        return TypeDiff::Incompatible
-      end
-
-      # Blocks with depth > 0 always produce new versions
-      # Sidechains cannot overlap
-      if src.chain_depth != 0
-        return TypeDiff::Incompatible
-      end
-
-      if dst.stack_size != src.stack_size
-        return TypeDiff::Incompatible
-      end
-
-      if dst.sp_offset != src.sp_offset
-        return TypeDiff::Incompatible
-      end
-
-      # Difference sum
-      diff = 0
-
-      # Check the type of self
-      diff += case src.self_type.diff(dst.self_type)
-      in TypeDiff::Compatible[diff] then diff
-      in TypeDiff::Incompatible then return TypeDiff::Incompatible
-      end
-
-      # For each local type we track
-      src.local_types.size.times do |i|
-        t_src = src.local_types[i]
-        t_dst = dst.local_types[i]
-        diff += case t_src.diff(t_dst)
-        in TypeDiff::Compatible[diff] then diff
-        in TypeDiff::Incompatible then return TypeDiff::Incompatible
-        end
-      end
-
-      # For each value on the temp stack
-      src.stack_size.times do |i|
-        src_mapping, src_type = src.get_opnd_mapping(StackOpnd[i])
-        dst_mapping, dst_type = dst.get_opnd_mapping(StackOpnd[i])
-
-        # If the two mappings aren't the same
-        if src_mapping != dst_mapping
-          if dst_mapping == MapToStack
-            # We can safely drop information about the source of the temp
-            # stack operand.
-            diff += 1
-          else
-            return TypeDiff::Incompatible
-          end
-        end
-
-        diff += case src_type.diff(dst_type)
-        in TypeDiff::Compatible[diff] then diff
-        in TypeDiff::Incompatible then return TypeDiff::Incompatible
-        end
-      end
-
-      return TypeDiff::Compatible[diff]
-    end
-
-    private
-
-    def assert(cond)
-      unless cond
-        raise "'#{cond.inspect}' was not true"
-      end
-    end
-  end
-end
diff --git a/lib/ruby_vm/rjit/entry_stub.rb b/lib/ruby_vm/rjit/entry_stub.rb
deleted file mode 100644
index 9bcef140536b04..00000000000000
--- a/lib/ruby_vm/rjit/entry_stub.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-module RubyVM::RJIT
-  class EntryStub < Struct.new(
-    :start_addr, # @param [Integer] Stub source start address to be re-generated
-    :end_addr,   # @param [Integer] Stub source end address to be re-generated
-  )
-  end
-end
diff --git a/lib/ruby_vm/rjit/exit_compiler.rb b/lib/ruby_vm/rjit/exit_compiler.rb
deleted file mode 100644
index 1ced2141a485e4..00000000000000
--- a/lib/ruby_vm/rjit/exit_compiler.rb
+++ /dev/null
@@ -1,164 +0,0 @@
-module RubyVM::RJIT
-  class ExitCompiler
-    def initialize = freeze
-
-    # Used for invalidating a block on entry.
-    # @param pc [Integer]
-    # @param asm [RubyVM::RJIT::Assembler]
-    def compile_entry_exit(pc, ctx, asm, cause:)
-      # Fix pc/sp offsets for the interpreter
-      save_pc_and_sp(pc, ctx, asm, reset_sp_offset: false)
-
-      # Increment per-insn exit counter
-      count_insn_exit(pc, asm)
-
-      # Restore callee-saved registers
-      asm.comment("#{cause}: entry exit")
-      asm.pop(SP)
-      asm.pop(EC)
-      asm.pop(CFP)
-
-      asm.mov(C_RET, Qundef)
-      asm.ret
-    end
-
-    # Set to cfp->jit_return by default for leave insn
-    # @param asm [RubyVM::RJIT::Assembler]
-    def compile_leave_exit(asm)
-      asm.comment('default cfp->jit_return')
-
-      # Restore callee-saved registers
-      asm.pop(SP)
-      asm.pop(EC)
-      asm.pop(CFP)
-
-      # :rax is written by #leave
-      asm.ret
-    end
-
-    # Fire cfunc events on invalidation by TracePoint
-    # @param asm [RubyVM::RJIT::Assembler]
-    def compile_full_cfunc_return(asm)
-      # This chunk of code expects REG_EC to be filled properly and
-      # RAX to contain the return value of the C method.
-
-      asm.comment('full cfunc return')
-      asm.mov(C_ARGS[0], EC)
-      asm.mov(C_ARGS[1], :rax)
-      asm.call(C.rjit_full_cfunc_return)
-
-      # TODO: count the exit
-
-      # Restore callee-saved registers
-      asm.pop(SP)
-      asm.pop(EC)
-      asm.pop(CFP)
-
-      asm.mov(C_RET, Qundef)
-      asm.ret
-    end
-
-    # @param jit [RubyVM::RJIT::JITState]
-    # @param ctx [RubyVM::RJIT::Context]
-    # @param asm [RubyVM::RJIT::Assembler]
-    def compile_side_exit(pc, ctx, asm)
-      # Fix pc/sp offsets for the interpreter
-      save_pc_and_sp(pc, ctx.dup, asm) # dup to avoid sp_offset update
-
-      # Increment per-insn exit counter
-      count_insn_exit(pc, asm)
-
-      # Restore callee-saved registers
-      asm.comment("exit to interpreter on #{pc_to_insn(pc).name}")
-      asm.pop(SP)
-      asm.pop(EC)
-      asm.pop(CFP)
-
-      asm.mov(C_RET, Qundef)
-      asm.ret
-    end
-
-    # @param asm [RubyVM::RJIT::Assembler]
-    # @param entry_stub [RubyVM::RJIT::EntryStub]
-    def compile_entry_stub(asm, entry_stub)
-      # Call rb_rjit_entry_stub_hit
-      asm.comment('entry stub hit')
-      asm.mov(C_ARGS[0], to_value(entry_stub))
-      asm.call(C.rb_rjit_entry_stub_hit)
-
-      # Jump to the address returned by rb_rjit_entry_stub_hit
-      asm.jmp(:rax)
-    end
-
-    # @param ctx [RubyVM::RJIT::Context]
-    # @param asm [RubyVM::RJIT::Assembler]
-    # @param branch_stub [RubyVM::RJIT::BranchStub]
-    # @param target0_p [TrueClass,FalseClass]
-    def compile_branch_stub(ctx, asm, branch_stub, target0_p)
-      # Call rb_rjit_branch_stub_hit
-      iseq = branch_stub.iseq
-      if C.rjit_opts.dump_disasm && C.imemo_type_p(iseq, C.imemo_iseq) # Guard against ISEQ GC at random moments
-        asm.comment("branch stub hit: #{iseq.body.location.label}@#{C.rb_iseq_path(iseq)}:#{iseq_lineno(iseq, target0_p ? branch_stub.target0.pc : branch_stub.target1.pc)}")
-      end
-      asm.mov(:rdi, to_value(branch_stub))
-      asm.mov(:esi, ctx.sp_offset)
-      asm.mov(:edx, target0_p ? 1 : 0)
-      asm.call(C.rb_rjit_branch_stub_hit)
-
-      # Jump to the address returned by rb_rjit_branch_stub_hit
-      asm.jmp(:rax)
-    end
-
-    private
-
-    def pc_to_insn(pc)
-      Compiler.decode_insn(C.VALUE.new(pc).*)
-    end
-
-    # @param pc [Integer]
-    # @param asm [RubyVM::RJIT::Assembler]
-    def count_insn_exit(pc, asm)
-      if C.rjit_opts.stats
-        insn = Compiler.decode_insn(C.VALUE.new(pc).*)
-        asm.comment("increment insn exit: #{insn.name}")
-        asm.mov(:rax, (C.rjit_insn_exits + insn.bin).to_i)
-        asm.add([:rax], 1) # TODO: lock
-      end
-      if C.rjit_opts.trace_exits
-        asm.comment('rjit_record_exit_stack')
-        asm.mov(C_ARGS[0], pc)
-        asm.call(C.rjit_record_exit_stack)
-      end
-    end
-
-    # @param jit [RubyVM::RJIT::JITState]
-    # @param ctx [RubyVM::RJIT::Context]
-    # @param asm [RubyVM::RJIT::Assembler]
-    def save_pc_and_sp(pc, ctx, asm, reset_sp_offset: true)
-      # Update pc (TODO: manage PC offset?)
-      asm.comment("save PC#{' and SP' if ctx.sp_offset != 0} to CFP")
-      asm.mov(:rax, pc) # rax = jit.pc
-      asm.mov([CFP, C.rb_control_frame_t.offsetof(:pc)], :rax) # cfp->pc = rax
-
-      # Update sp
-      if ctx.sp_offset != 0
-        asm.add(SP, C.VALUE.size * ctx.sp_offset) # sp += stack_size
-        asm.mov([CFP, C.rb_control_frame_t.offsetof(:sp)], SP) # cfp->sp = sp
-        if reset_sp_offset
-          ctx.sp_offset = 0
-        end
-      end
-    end
-
-    def to_value(obj)
-      GC_REFS << obj
-      C.to_value(obj)
-    end
-
-    def iseq_lineno(iseq, pc)
-      C.rb_iseq_line_no(iseq, (pc - iseq.body.iseq_encoded.to_i) / C.VALUE.size)
-    rescue RangeError # bignum too big to convert into `unsigned long long' (RangeError)
-      -1
-    end
-  end
-end
diff --git a/lib/ruby_vm/rjit/hooks.rb b/lib/ruby_vm/rjit/hooks.rb
deleted file mode 100644
index ea9d7bf5a85d4b..00000000000000
--- a/lib/ruby_vm/rjit/hooks.rb
+++ /dev/null
@@ -1,36 +0,0 @@
-module RubyVM::RJIT
-  module Hooks # :nodoc: all
-    def self.on_bop_redefined(_redefined_flag, _bop)
-      # C.rjit_cancel_all("BOP is redefined")
-    end
-
-    def self.on_cme_invalidate(cme)
-      cme = C.rb_callable_method_entry_struct.new(cme)
-      Invariants.on_cme_invalidate(cme)
-    end
-
-    def self.on_ractor_spawn
-      # C.rjit_cancel_all("Ractor is spawned")
-    end
-
-    # Global constant changes like const_set
-    def self.on_constant_state_changed(id)
-      Invariants.on_constant_state_changed(id)
-    end
-
-    # ISEQ-specific constant invalidation
-    def self.on_constant_ic_update(iseq, ic, insn_idx)
-      iseq = C.rb_iseq_t.new(iseq)
-      ic = C.IC.new(ic)
-      Invariants.on_constant_ic_update(iseq, ic, insn_idx)
-    end
-
-    def self.on_tracing_invalidate_all(_new_iseq_events)
-      Invariants.on_tracing_invalidate_all
-    end
-
-    def self.on_update_references
-      Invariants.on_update_references
-    end
-  end
-end
diff --git a/lib/ruby_vm/rjit/insn_compiler.rb b/lib/ruby_vm/rjit/insn_compiler.rb
deleted file mode 100644
index 96dfa55c69f383..00000000000000
--- a/lib/ruby_vm/rjit/insn_compiler.rb
+++ /dev/null
@@ -1,5964 +0,0 @@
-module RubyVM::RJIT
-  class InsnCompiler
-    # struct rb_calling_info. Storing flags instead of ci.
-    CallingInfo = Struct.new(:argc, :flags, :kwarg, :ci_addr, :send_shift, :block_handler) do
-      def kw_splat = flags & C::VM_CALL_KW_SPLAT != 0
-    end
-
-    # @param ocb [CodeBlock]
-    # @param exit_compiler [RubyVM::RJIT::ExitCompiler]
-    def initialize(cb, ocb, exit_compiler)
-      @ocb = ocb
-      @exit_compiler = exit_compiler
-
-      @cfunc_codegen_table = {}
-      register_cfunc_codegen_funcs
-    end
-
-    # @param jit [RubyVM::RJIT::JITState]
-    # @param ctx [RubyVM::RJIT::Context]
-    # @param asm [RubyVM::RJIT::Assembler]
-    # @param insn `RubyVM::RJIT::Instruction`
-    def compile(jit, ctx, asm, insn)
-      asm.incr_counter(:rjit_insns_count)
-
-      stack = ctx.stack_size.times.map do |stack_idx|
-        ctx.get_opnd_type(StackOpnd[ctx.stack_size - stack_idx - 1]).type
-      end
-      locals = jit.iseq.body.local_table_size.times.map do |local_idx|
-        (ctx.local_types[local_idx] || Type::Unknown).type
-      end
-
-      insn_idx = format('%04d', (jit.pc.to_i - jit.iseq.body.iseq_encoded.to_i) / C.VALUE.size)
-      asm.comment("Insn: #{insn_idx} #{insn.name} (stack: [#{stack.join(', ')}], locals: [#{locals.join(', ')}])")
-
-      # 83/102
-      case insn.name
-      when :nop then nop(jit, ctx, asm)
-      when :getlocal then getlocal(jit, ctx, asm)
-      when :setlocal then setlocal(jit, ctx, asm)
-      when :getblockparam then getblockparam(jit, ctx, asm)
-      # setblockparam
-      when :getblockparamproxy then getblockparamproxy(jit, ctx, asm)
-      when :getspecial then getspecial(jit, ctx, asm)
-      # setspecial
-      when :getinstancevariable then getinstancevariable(jit, ctx, asm)
-      when :setinstancevariable then setinstancevariable(jit, ctx, asm)
-      when :getclassvariable then getclassvariable(jit, ctx, asm)
-      when :setclassvariable then setclassvariable(jit, ctx, asm)
-      when :opt_getconstant_path then opt_getconstant_path(jit, ctx, asm)
-      when :getconstant then getconstant(jit, ctx, asm)
-      # setconstant
-      when :getglobal then getglobal(jit, ctx, asm)
-      # setglobal
-      when :putnil then putnil(jit, ctx, asm)
-      when :putself then putself(jit, ctx, asm)
-      when :putobject then putobject(jit, ctx, asm)
-      when :putspecialobject then putspecialobject(jit, ctx, asm)
-      when :putstring then putstring(jit, ctx, asm)
-      when :concatstrings then concatstrings(jit, ctx, asm)
-      when :anytostring then anytostring(jit, ctx, asm)
-      when :toregexp then toregexp(jit, ctx, asm)
-      when :intern then intern(jit, ctx, asm)
-      when :newarray then newarray(jit, ctx, asm)
-      # newarraykwsplat
-      when :duparray then duparray(jit, ctx, asm)
-      # duphash
-      when :expandarray then expandarray(jit, ctx, asm)
-      when :concatarray then concatarray(jit, ctx, asm)
-      when :splatarray then splatarray(jit, ctx, asm)
-      when :newhash then newhash(jit, ctx, asm)
-      when :newrange then newrange(jit, ctx, asm)
-      when :pop then pop(jit, ctx, asm)
-      when :dup then dup(jit, ctx, asm)
-      when :dupn then dupn(jit, ctx, asm)
-      when :swap then swap(jit, ctx, asm)
-      # opt_reverse
-      when :topn then topn(jit, ctx, asm)
-      when :setn then setn(jit, ctx, asm)
-      when :adjuststack then adjuststack(jit, ctx, asm)
-      when :defined then defined(jit, ctx, asm)
-      when :definedivar then definedivar(jit, ctx, asm)
-      # checkmatch
-      when :checkkeyword then checkkeyword(jit, ctx, asm)
-      # checktype
-      # defineclass
-      # definemethod
-      # definesmethod
-      when :send then send(jit, ctx, asm)
-      when :opt_send_without_block then opt_send_without_block(jit, ctx, asm)
-      when :objtostring then objtostring(jit, ctx, asm)
-      when :opt_str_freeze then opt_str_freeze(jit, ctx, asm)
-      when :opt_nil_p then opt_nil_p(jit, ctx, asm)
-      # opt_str_uminus
-      when :opt_newarray_send then opt_newarray_send(jit, ctx, asm)
-      when :invokesuper then invokesuper(jit, ctx, asm)
-      when :invokeblock then invokeblock(jit, ctx, asm)
-      when :leave then leave(jit, ctx, asm)
-      when :throw then throw(jit, ctx, asm)
-      when :jump then jump(jit, ctx, asm)
-      when :branchif then branchif(jit, ctx, asm)
-      when :branchunless then branchunless(jit, ctx, asm)
-      when :branchnil then branchnil(jit, ctx, asm)
-      # once
-      when :opt_case_dispatch then opt_case_dispatch(jit, ctx, asm)
-      when :opt_plus then opt_plus(jit, ctx, asm)
-      when :opt_minus then opt_minus(jit, ctx, asm)
-      when :opt_mult then opt_mult(jit, ctx, asm)
-      when :opt_div then opt_div(jit, ctx, asm)
-      when :opt_mod then opt_mod(jit, ctx, asm)
-      when :opt_eq then opt_eq(jit, ctx, asm)
-      when :opt_neq then opt_neq(jit, ctx, asm)
-      when :opt_lt then opt_lt(jit, ctx, asm)
-      when :opt_le then opt_le(jit, ctx, asm)
-      when :opt_gt then opt_gt(jit, ctx, asm)
-      when :opt_ge then opt_ge(jit, ctx, asm)
-      when :opt_ltlt then opt_ltlt(jit, ctx, asm)
-      when :opt_and then opt_and(jit, ctx, asm)
-      when :opt_or then opt_or(jit, ctx, asm)
-      when :opt_aref then opt_aref(jit, ctx, asm)
-      when :opt_aset then opt_aset(jit, ctx, asm)
-      # opt_aset_with
-      # opt_aref_with
-      when :opt_length then opt_length(jit, ctx, asm)
-      when :opt_size then opt_size(jit, ctx, asm)
-      when :opt_empty_p then opt_empty_p(jit, ctx, asm)
-      when :opt_succ then opt_succ(jit, ctx, asm)
-      when :opt_not then opt_not(jit, ctx, asm)
-      when :opt_regexpmatch2 then opt_regexpmatch2(jit, ctx, asm)
-      # invokebuiltin
-      when :opt_invokebuiltin_delegate then opt_invokebuiltin_delegate(jit, ctx, asm)
-      when :opt_invokebuiltin_delegate_leave then opt_invokebuiltin_delegate_leave(jit, ctx, asm)
-      when :getlocal_WC_0 then getlocal_WC_0(jit, ctx, asm)
-      when :getlocal_WC_1 then getlocal_WC_1(jit, ctx, asm)
-      when :setlocal_WC_0 then setlocal_WC_0(jit, ctx, asm)
-      when :setlocal_WC_1 then setlocal_WC_1(jit, ctx, asm)
-      when :putobject_INT2FIX_0_ then putobject_INT2FIX_0_(jit, ctx, asm)
-      when :putobject_INT2FIX_1_ then putobject_INT2FIX_1_(jit, ctx, asm)
-      else CantCompile
-      end
-    end
-
-    private
-
-    #
-    # Insns
-    #
-
-    # @param jit [RubyVM::RJIT::JITState]
-    # @param ctx [RubyVM::RJIT::Context]
-    # @param asm [RubyVM::RJIT::Assembler]
-    def nop(jit, ctx, asm)
-      # Do nothing
-      KeepCompiling
-    end
-
-    # @param jit [RubyVM::RJIT::JITState]
-    # @param ctx [RubyVM::RJIT::Context]
-    # @param asm [RubyVM::RJIT::Assembler]
-    def getlocal(jit, ctx, asm)
-      idx = jit.operand(0)
-      level = jit.operand(1)
-      jit_getlocal_generic(jit, ctx, asm, idx:, level:)
-    end
-
-    # @param jit [RubyVM::RJIT::JITState]
-    # @param ctx [RubyVM::RJIT::Context]
-    # @param asm [RubyVM::RJIT::Assembler]
-    def getlocal_WC_0(jit, ctx, asm)
-      idx = jit.operand(0)
-      jit_getlocal_generic(jit, ctx, asm, idx:, level: 0)
-    end
-
-    # @param jit [RubyVM::RJIT::JITState]
-    # @param ctx [RubyVM::RJIT::Context]
-    # @param asm [RubyVM::RJIT::Assembler]
-    def getlocal_WC_1(jit, ctx, asm)
-      idx = jit.operand(0)
-      jit_getlocal_generic(jit, ctx, asm, idx:, level: 1)
-    end
-
-    # @param jit [RubyVM::RJIT::JITState]
-    # @param ctx [RubyVM::RJIT::Context]
-    # @param asm [RubyVM::RJIT::Assembler]
-    def setlocal(jit, ctx, asm)
-      idx = jit.operand(0)
-      level = jit.operand(1)
-      jit_setlocal_generic(jit, ctx, asm, idx:, level:)
-    end
-
-    # @param jit [RubyVM::RJIT::JITState]
-    # @param ctx [RubyVM::RJIT::Context]
-    # @param asm [RubyVM::RJIT::Assembler]
-    def setlocal_WC_0(jit, ctx, asm)
-      idx = jit.operand(0)
-      jit_setlocal_generic(jit, ctx, asm, idx:, level: 0)
-    end
-
-    # @param jit [RubyVM::RJIT::JITState]
-    # @param ctx [RubyVM::RJIT::Context]
-    # @param asm [RubyVM::RJIT::Assembler]
-    def setlocal_WC_1(jit, ctx, asm)
-      idx = jit.operand(0)
-      jit_setlocal_generic(jit, ctx, asm, idx:, level: 1)
-    end
-
-    # @param jit [RubyVM::RJIT::JITState]
-    # @param ctx [RubyVM::RJIT::Context]
-    # @param asm [RubyVM::RJIT::Assembler]
-    def getblockparam(jit, ctx, asm)
-      # EP level
-      level = jit.operand(1)
-
-      # Save the PC and SP because we might allocate
-      jit_prepare_routine_call(jit, ctx, asm)
-
-      # A mirror of the interpreter code. Checking for the case
-      # where it's pushing rb_block_param_proxy.
-      side_exit = side_exit(jit, ctx)
-
-      # Load environment pointer EP from CFP
-      ep_reg = :rax
-      jit_get_ep(asm, level, reg: ep_reg)
-
-      # Bail when VM_ENV_FLAGS(ep, VM_FRAME_FLAG_MODIFIED_BLOCK_PARAM) is non zero
-      # FIXME: This is testing bits in the same place that the WB check is testing.
-      # We should combine these at some point
-      asm.test([ep_reg, C.VALUE.size * C::VM_ENV_DATA_INDEX_FLAGS], C::VM_FRAME_FLAG_MODIFIED_BLOCK_PARAM)
-
-      # If the frame flag has been modified, then the actual proc value is
-      # already in the EP and we should just use the value.
-      frame_flag_modified = asm.new_label('frame_flag_modified')
-      asm.jnz(frame_flag_modified)
-
-      # This instruction writes the block handler to the EP.  If we need to
-      # fire a write barrier for the write, then exit (we'll let the
-      # interpreter handle it so it can fire the write barrier).
-      # flags & VM_ENV_FLAG_WB_REQUIRED
-      asm.test([ep_reg, C.VALUE.size * C::VM_ENV_DATA_INDEX_FLAGS], C::VM_ENV_FLAG_WB_REQUIRED)
-
-      # if (flags & VM_ENV_FLAG_WB_REQUIRED) != 0
-      asm.jnz(side_exit)
-
-      # Convert the block handler in to a proc
-      # call rb_vm_bh_to_procval(const rb_execution_context_t *ec, VALUE block_handler)
-      asm.mov(C_ARGS[0], EC)
-      # The block handler for the current frame
-      # note, VM_ASSERT(VM_ENV_LOCAL_P(ep))
-      asm.mov(C_ARGS[1], [ep_reg, C.VALUE.size * C::VM_ENV_DATA_INDEX_SPECVAL])
-      asm.call(C.rb_vm_bh_to_procval)
-
-      # Load environment pointer EP from CFP (again)
-      ep_reg = :rcx
-      jit_get_ep(asm, level, reg: ep_reg)
-
-      # Write the value at the environment pointer
-      idx = jit.operand(0)
-      offs = -(C.VALUE.size * idx)
-      asm.mov([ep_reg, offs], C_RET);
-
-      # Set the frame modified flag
-      asm.mov(:rax, [ep_reg, C.VALUE.size * C::VM_ENV_DATA_INDEX_FLAGS]) # flag_check
-      asm.or(:rax, C::VM_FRAME_FLAG_MODIFIED_BLOCK_PARAM) # modified_flag
-      asm.mov([ep_reg, C.VALUE.size * C::VM_ENV_DATA_INDEX_FLAGS], :rax)
-
-      asm.write_label(frame_flag_modified)
-
-      # Push the proc on the stack
-      stack_ret = ctx.stack_push(Type::Unknown)
-      ep_reg = :rax
-      jit_get_ep(asm, level, reg: ep_reg)
-      asm.mov(:rax, [ep_reg, offs])
-      asm.mov(stack_ret, :rax)
-
-      KeepCompiling
-    end
-
-    # setblockparam
-
-    # @param jit [RubyVM::RJIT::JITState]
-    # @param ctx [RubyVM::RJIT::Context]
-    # @param asm [RubyVM::RJIT::Assembler]
-    def getblockparamproxy(jit, ctx, asm)
-      # To get block_handler
-      unless jit.at_current_insn?
-        defer_compilation(jit, ctx, asm)
-        return EndBlock
-      end
-
-      starting_context = ctx.dup # make a copy for use with jit_chain_guard
-
-      # A mirror of the interpreter code. Checking for the case
-      # where it's pushing rb_block_param_proxy.
-      side_exit = side_exit(jit, ctx)
-
-      # EP level
-      level = jit.operand(1)
-
-      # Peek at the block handler so we can check whether it's nil
-      comptime_handler = jit.peek_at_block_handler(level)
-
-      # When a block handler is present, it should always be a GC-guarded
-      # pointer (VM_BH_ISEQ_BLOCK_P)
-      if comptime_handler != 0 && comptime_handler & 0x3 != 0x1
-        asm.incr_counter(:getblockpp_not_gc_guarded)
-        return CantCompile
-      end
-
-      # Load environment pointer EP from CFP
-      ep_reg = :rax
-      jit_get_ep(asm, level, reg: ep_reg)
-
-      # Bail when VM_ENV_FLAGS(ep, VM_FRAME_FLAG_MODIFIED_BLOCK_PARAM) is non zero
-      asm.test([ep_reg, C.VALUE.size * C::VM_ENV_DATA_INDEX_FLAGS], C::VM_FRAME_FLAG_MODIFIED_BLOCK_PARAM)
-      asm.jnz(counted_exit(side_exit, :getblockpp_block_param_modified))
-
-      # Load the block handler for the current frame
-      # note, VM_ASSERT(VM_ENV_LOCAL_P(ep))
-      block_handler = :rax
-      asm.mov(block_handler, [ep_reg, C.VALUE.size * C::VM_ENV_DATA_INDEX_SPECVAL])
-
-      # Specialize compilation for the case where no block handler is present
-      if comptime_handler == 0
-        # Bail if there is a block handler
-        asm.cmp(block_handler, 0)
-
-        jit_chain_guard(:jnz, jit, starting_context, asm, counted_exit(side_exit, :getblockpp_block_handler_none))
-
-        putobject(jit, ctx, asm, val: Qnil)
-      else
-        # Block handler is a tagged pointer. Look at the tag. 0x03 is from VM_BH_ISEQ_BLOCK_P().
-        asm.and(block_handler, 0x3)
-
-        # Bail unless VM_BH_ISEQ_BLOCK_P(bh). This also checks for null.
-        asm.cmp(block_handler, 0x1)
-
-        jit_chain_guard(:jnz, jit, starting_context, asm, counted_exit(side_exit, :getblockpp_not_iseq_block))
-
-        # Push rb_block_param_proxy. It's a root, so no need to use jit_mov_gc_ptr.
-        top = ctx.stack_push(Type::BlockParamProxy)
-        asm.mov(:rax, C.rb_block_param_proxy)
-        asm.mov(top, :rax)
-      end
-
-      jump_to_next_insn(jit, ctx, asm)
-
-      EndBlock
-    end
-
-    # @param jit [RubyVM::RJIT::JITState]
-    # @param ctx [RubyVM::RJIT::Context]
-    # @param asm [RubyVM::RJIT::Assembler]
-    def getspecial(jit, ctx, asm)
-      # This takes two arguments, key and type
-      # key is only used when type == 0
-      # A non-zero type determines which type of backref to fetch
-      #rb_num_t key = jit.jit_get_arg(0);
-      rtype = jit.operand(1)
-
-      if rtype == 0
-        # not yet implemented
-        return CantCompile;
-      elsif rtype & 0x01 != 0
-        # Fetch a "special" backref based on a char encoded by shifting by 1
-
-        # Can raise if matchdata uninitialized
-        jit_prepare_routine_call(jit, ctx, asm)
-
-        # call rb_backref_get()
-        asm.comment('rb_backref_get')
-        asm.call(C.rb_backref_get)
-
-        asm.mov(C_ARGS[0], C_RET) # backref
-        case [rtype >> 1].pack('c')
-        in ?&
-          asm.comment("rb_reg_last_match")
-          asm.call(C.rb_reg_last_match)
-        in ?`
-          asm.comment("rb_reg_match_pre")
-          asm.call(C.rb_reg_match_pre)
-        in ?'
-          asm.comment("rb_reg_match_post")
-          asm.call(C.rb_reg_match_post)
-        in ?+
-          asm.comment("rb_reg_match_last")
-          asm.call(C.rb_reg_match_last)
-        end
-
-        stack_ret = ctx.stack_push(Type::Unknown)
-        asm.mov(stack_ret, C_RET)
-
-        KeepCompiling
-      else
-        # Fetch the N-th match from the last backref based on type shifted by 1
-
-        # Can raise if matchdata uninitialized
-        jit_prepare_routine_call(jit, ctx, asm)
-
-        # call rb_backref_get()
-        asm.comment('rb_backref_get')
-        asm.call(C.rb_backref_get)
-
-        # rb_reg_nth_match((int)(type >> 1), backref);
-        asm.comment('rb_reg_nth_match')
-        asm.mov(C_ARGS[0], rtype >> 1)
-        asm.mov(C_ARGS[1], C_RET) # backref
-        asm.call(C.rb_reg_nth_match)
-
-        stack_ret = ctx.stack_push(Type::Unknown)
-        asm.mov(stack_ret, C_RET)
-
-        KeepCompiling
-      end
-    end
-
-    # setspecial
-
-    # @param jit [RubyVM::RJIT::JITState]
-    # @param ctx [RubyVM::RJIT::Context]
-    # @param asm [RubyVM::RJIT::Assembler]
-    def getinstancevariable(jit, ctx, asm)
-      # Specialize on a compile-time receiver, and split a block for chain guards
-      unless jit.at_current_insn?
-        defer_compilation(jit, ctx, asm)
-        return EndBlock
-      end
-
-      id = jit.operand(0)
-      comptime_obj = jit.peek_at_self
-
-      jit_getivar(jit, ctx, asm, comptime_obj, id, nil, SelfOpnd)
-    end
-
-    # @param jit [RubyVM::RJIT::JITState]
-    # @param ctx [RubyVM::RJIT::Context]
-    # @param asm [RubyVM::RJIT::Assembler]
-    def setinstancevariable(jit, ctx, asm)
-      starting_context = ctx.dup # make a copy for use with jit_chain_guard
-
-      # Defer compilation so we can specialize on a runtime `self`
-      unless jit.at_current_insn?
-        defer_compilation(jit, ctx, asm)
-        return EndBlock
-      end
-
-      ivar_name = jit.operand(0)
-      comptime_receiver = jit.peek_at_self
-
-      # If the comptime receiver is frozen, writing an IV will raise an exception
-      # and we don't want to JIT code to deal with that situation.
-      if C.rb_obj_frozen_p(comptime_receiver)
-        asm.incr_counter(:setivar_frozen)
-        return CantCompile
-      end
-
-      # Check if the comptime receiver is a T_OBJECT
-      receiver_t_object = C::BUILTIN_TYPE(comptime_receiver) == C::T_OBJECT
-
-      # If the receiver isn't a T_OBJECT, or uses a custom allocator,
-      # then just write out the IV write as a function call.
-      # too-complex shapes can't use index access, so we use rb_ivar_get for them too.
-      if !receiver_t_object || shape_too_complex?(comptime_receiver) || ctx.chain_depth >= 10
-        asm.comment('call rb_vm_setinstancevariable')
-
-        ic = jit.operand(1)
-
-        # The function could raise exceptions.
-        # Note that this modifies REG_SP, which is why we do it first
-        jit_prepare_routine_call(jit, ctx, asm)
-
-        # Get the operands from the stack
-        val_opnd = ctx.stack_pop(1)
-
-        # Call rb_vm_setinstancevariable(iseq, obj, id, val, ic);
-        asm.mov(:rdi, jit.iseq.to_i)
-        asm.mov(:rsi, [CFP, C.rb_control_frame_t.offsetof(:self)])
-        asm.mov(:rdx, ivar_name)
-        asm.mov(:rcx, val_opnd)
-        asm.mov(:r8, ic)
-        asm.call(C.rb_vm_setinstancevariable)
-      else
-        # Get the iv index
-        shape_id = C.rb_shape_get_shape_id(comptime_receiver)
-        ivar_index = C.rb_shape_get_iv_index(shape_id, ivar_name)
-
-        # Get the receiver
-        asm.mov(:rax, [CFP, C.rb_control_frame_t.offsetof(:self)])
-
-        # Generate a side exit
-        side_exit = side_exit(jit, ctx)
-
-        # Upgrade type
-        guard_object_is_heap(jit, ctx, asm, :rax, SelfOpnd, :setivar_not_heap)
-
-        asm.comment('guard shape')
-        asm.cmp(DwordPtr[:rax, C.rb_shape_id_offset], shape_id)
-        megamorphic_side_exit = counted_exit(side_exit, :setivar_megamorphic)
-        jit_chain_guard(:jne, jit, starting_context, asm, megamorphic_side_exit)
-
-        # If we don't have an instance variable index, then we need to
-        # transition out of the current shape.
-        if ivar_index.nil?
-          shape = C.rb_shape_get_shape_by_id(shape_id)
-
-          current_capacity = shape.capacity
-          new_capacity = current_capacity * 2
-
-          # If the object doesn't have the capacity to store the IV,
-          # then we'll need to allocate it.
-          needs_extension = shape.next_iv_index >= current_capacity
-
-          # We can write to the object, but we need to transition the shape
-          ivar_index = shape.next_iv_index
-
-          capa_shape =
-            if needs_extension
-              # We need to add an extended table to the object
-              # First, create an outgoing transition that increases the capacity
-              C.rb_shape_transition_shape_capa(shape, new_capacity)
-            else
-              nil
-            end
-
-          dest_shape =
-            if capa_shape
-              C.rb_shape_get_next(capa_shape, comptime_receiver, ivar_name)
-            else
-              C.rb_shape_get_next(shape, comptime_receiver, ivar_name)
-            end
-          new_shape_id = C.rb_shape_id(dest_shape)
-
-          if new_shape_id == C::OBJ_TOO_COMPLEX_SHAPE_ID
-            asm.incr_counter(:setivar_too_complex)
-            return CantCompile
-          end
-
-          if needs_extension
-            # Generate the C call so that runtime code will increase
-            # the capacity and set the buffer.
-            asm.mov(C_ARGS[0], :rax)
-            asm.mov(C_ARGS[1], current_capacity)
-            asm.mov(C_ARGS[2], new_capacity)
-            asm.call(C.rb_ensure_iv_list_size)
-
-            # Load the receiver again after the function call
-            asm.mov(:rax, [CFP, C.rb_control_frame_t.offsetof(:self)])
-          end
-
-          write_val = ctx.stack_pop(1)
-          jit_write_iv(asm, comptime_receiver, :rax, :rcx, ivar_index, write_val, needs_extension)
-
-          # Store the new shape
-          asm.comment('write shape')
-          asm.mov(:rax, [CFP, C.rb_control_frame_t.offsetof(:self)]) # reload after jit_write_iv
-          asm.mov(DwordPtr[:rax, C.rb_shape_id_offset], new_shape_id)
-        else
-          # If the iv index already exists, then we don't need to
-          # transition to a new shape.  The reason is because we find
-          # the iv index by searching up the shape tree.  If we've
-          # made the transition already, then there's no reason to
-          # update the shape on the object.  Just set the IV.
-          write_val = ctx.stack_pop(1)
-          jit_write_iv(asm, comptime_receiver, :rax, :rcx, ivar_index, write_val, false)
-        end
-
-        skip_wb = asm.new_label('skip_wb')
-        # If the value we're writing is an immediate, we don't need to WB
-        asm.test(write_val, C::RUBY_IMMEDIATE_MASK)
-        asm.jnz(skip_wb)
-
-        # If the value we're writing is nil or false, we don't need to WB
-        asm.cmp(write_val, Qnil)
-        asm.jbe(skip_wb)
-
-        asm.comment('write barrier')
-        asm.mov(C_ARGS[0], [CFP, C.rb_control_frame_t.offsetof(:self)]) # reload after jit_write_iv
-        asm.mov(C_ARGS[1], write_val)
-        asm.call(C.rb_gc_writebarrier)
-
-        asm.write_label(skip_wb)
-      end
-
-      KeepCompiling
-    end
-
-    # @param jit [RubyVM::RJIT::JITState]
-    # @param ctx [RubyVM::RJIT::Context]
-    # @param asm [RubyVM::RJIT::Assembler]
-    def getclassvariable(jit, ctx, asm)
-      # rb_vm_getclassvariable can raise exceptions.
-      jit_prepare_routine_call(jit, ctx, asm)
-
-      asm.mov(C_ARGS[0], [CFP, C.rb_control_frame_t.offsetof(:iseq)])
-      asm.mov(C_ARGS[1], CFP)
-      asm.mov(C_ARGS[2], jit.operand(0))
-      asm.mov(C_ARGS[3], jit.operand(1))
-      asm.call(C.rb_vm_getclassvariable)
-
-      top = ctx.stack_push(Type::Unknown)
-      asm.mov(top, C_RET)
-
-      KeepCompiling
-    end
-
-    # @param jit [RubyVM::RJIT::JITState]
-    # @param ctx [RubyVM::RJIT::Context]
-    # @param asm [RubyVM::RJIT::Assembler]
-    def setclassvariable(jit, ctx, asm)
-      # rb_vm_setclassvariable can raise exceptions.
-      jit_prepare_routine_call(jit, ctx, asm)
-
-      asm.mov(C_ARGS[0], [CFP, C.rb_control_frame_t.offsetof(:iseq)])
-      asm.mov(C_ARGS[1], CFP)
-      asm.mov(C_ARGS[2], jit.operand(0))
-      asm.mov(C_ARGS[3], ctx.stack_pop(1))
-      asm.mov(C_ARGS[4], jit.operand(1))
-      asm.call(C.rb_vm_setclassvariable)
-
-      KeepCompiling
-    end
-
-    # @param jit [RubyVM::RJIT::JITState]
-    # @param ctx [RubyVM::RJIT::Context]
-    # @param asm [RubyVM::RJIT::Assembler]
-    def opt_getconstant_path(jit, ctx, asm)
-      # Cut the block for invalidation
-      unless jit.at_current_insn?
-        defer_compilation(jit, ctx, asm)
-        return EndBlock
-      end
-
-      ic = C.iseq_inline_constant_cache.new(jit.operand(0))
-      idlist = ic.segments
-
-      # Make sure there is an exit for this block as the interpreter might want
-      # to invalidate this block from rb_rjit_constant_ic_update().
-      # For now, we always take an entry exit even if it was a side exit.
-      Invariants.ensure_block_entry_exit(jit, cause: 'opt_getconstant_path')
-
-      # See vm_ic_hit_p(). The same conditions are checked in yjit_constant_ic_update().
-      ice = ic.entry
-      if ice.nil?
-        # In this case, leave a block that unconditionally side exits
-        # for the interpreter to invalidate.
-        asm.incr_counter(:optgetconst_not_cached)
-        return CantCompile
-      end
-
-      if ice.ic_cref # with cref
-        # Cache is keyed on a certain lexical scope. Use the interpreter's cache.
-        side_exit = side_exit(jit, ctx)
-
-        # Call function to verify the cache. It doesn't allocate or call methods.
-        asm.mov(C_ARGS[0], ic.to_i)
-        asm.mov(C_ARGS[1], [CFP, C.rb_control_frame_t.offsetof(:ep)])
-        asm.call(C.rb_vm_ic_hit_p)
-
-        # Check the result. SysV only specifies one byte for _Bool return values,
-        # so it's important we only check one bit to ignore the higher bits in the register.
-        asm.test(C_RET, 1)
-        asm.jz(counted_exit(side_exit, :optgetconst_cache_miss))
-
-        asm.mov(:rax, ic.to_i) # inline_cache
-        asm.mov(:rax, [:rax, C.iseq_inline_constant_cache.offsetof(:entry)]) # ic_entry
-        asm.mov(:rax, [:rax, C.iseq_inline_constant_cache_entry.offsetof(:value)]) # ic_entry_val
-
-        # Push ic->entry->value
-        stack_top = ctx.stack_push(Type::Unknown)
-        asm.mov(stack_top, :rax)
-      else # without cref
-        # TODO: implement this
-        # Optimize for single ractor mode.
-        # if !assume_single_ractor_mode(jit, ocb)
-        #   return CantCompile
-        # end
-
-        # Invalidate output code on any constant writes associated with
-        # constants referenced within the current block.
-        Invariants.assume_stable_constant_names(jit, idlist)
-
-        putobject(jit, ctx, asm, val: ice.value)
-      end
-
-      jump_to_next_insn(jit, ctx, asm)
-      EndBlock
-    end
-
-    # @param jit [RubyVM::RJIT::JITState]
-    # @param ctx [RubyVM::RJIT::Context]
-    # @param asm [RubyVM::RJIT::Assembler]
-    def getconstant(jit, ctx, asm)
-      id = jit.operand(0)
-
-      # vm_get_ev_const can raise exceptions.
-      jit_prepare_routine_call(jit, ctx, asm)
-
-      allow_nil_opnd = ctx.stack_pop(1)
-      klass_opnd = ctx.stack_pop(1)
-
-      asm.mov(C_ARGS[0], EC)
-      asm.mov(C_ARGS[1], klass_opnd)
-      asm.mov(C_ARGS[2], id)
-      asm.mov(C_ARGS[3], allow_nil_opnd)
-      asm.call(C.rb_vm_get_ev_const)
-
-      top = ctx.stack_push(Type::Unknown)
-      asm.mov(top, C_RET)
-
-      KeepCompiling
-    end
-
-    # setconstant
-
-    # @param jit [RubyVM::RJIT::JITState]
-    # @param ctx [RubyVM::RJIT::Context]
-    # @param asm [RubyVM::RJIT::Assembler]
-    def getglobal(jit, ctx, asm)
-      gid = jit.operand(0)
-
-      # Save the PC and SP because we might make a Ruby call for warning
-      jit_prepare_routine_call(jit, ctx, asm)
-
-      asm.mov(C_ARGS[0], gid)
-      asm.call(C.rb_gvar_get)
-
-      top = ctx.stack_push(Type::Unknown)
-      asm.mov(top, C_RET)
-
-      KeepCompiling
-    end
-
-    # setglobal
-
-    # @param jit [RubyVM::RJIT::JITState]
-    # @param ctx [RubyVM::RJIT::Context]
-    # @param asm [RubyVM::RJIT::Assembler]
-    def putnil(jit, ctx, asm)
-      putobject(jit, ctx, asm, val: Qnil)
-    end
-
-    # @param jit [RubyVM::RJIT::JITState]
-    # @param ctx [RubyVM::RJIT::Context]
-    # @param asm [RubyVM::RJIT::Assembler]
-    def putself(jit, ctx, asm)
-      stack_top = ctx.stack_push_self
-      asm.mov(:rax, [CFP, C.rb_control_frame_t.offsetof(:self)])
-      asm.mov(stack_top, :rax)
-      KeepCompiling
-    end
-
-    # @param jit [RubyVM::RJIT::JITState]
-    # @param ctx [RubyVM::RJIT::Context]
-    # @param asm [RubyVM::RJIT::Assembler]
-    def putobject(jit, ctx, asm, val: jit.operand(0))
-      # Push it to the stack
-      val_type = Type.from(C.to_ruby(val))
-      stack_top = ctx.stack_push(val_type)
-      if asm.imm32?(val)
-        asm.mov(stack_top, val)
-      else # 64-bit immediates can't be directly written to memory
-        asm.mov(:rax, val)
-        asm.mov(stack_top, :rax)
-      end
-
-      KeepCompiling
-    end
-
-    # @param jit [RubyVM::RJIT::JITState]
-    # @param ctx [RubyVM::RJIT::Context]
-    # @param asm [RubyVM::RJIT::Assembler]
-    def putspecialobject(jit, ctx, asm)
-      object_type = jit.operand(0)
-      if object_type == C::VM_SPECIAL_OBJECT_VMCORE
-        stack_top = ctx.stack_push(Type::UnknownHeap)
-        asm.mov(:rax, C.rb_mRubyVMFrozenCore)
-        asm.mov(stack_top, :rax)
-        KeepCompiling
-      else
-        # TODO: implement for VM_SPECIAL_OBJECT_CBASE and
-        # VM_SPECIAL_OBJECT_CONST_BASE
-        CantCompile
-      end
-    end
-
-    # @param jit [RubyVM::RJIT::JITState]
-    # @param ctx [RubyVM::RJIT::Context]
-    # @param asm [RubyVM::RJIT::Assembler]
-    def putstring(jit, ctx, asm)
-      put_val = jit.operand(0, ruby: true)
-
-      # Save the PC and SP because the callee will allocate
-      jit_prepare_routine_call(jit, ctx, asm)
-
-      asm.mov(C_ARGS[0], EC)
-      asm.mov(C_ARGS[1], to_value(put_val))
-      asm.call(C.rb_ec_str_resurrect)
-
-      stack_top = ctx.stack_push(Type::TString)
-      asm.mov(stack_top, C_RET)
-
-      KeepCompiling
-    end
-
-    # @param jit [RubyVM::RJIT::JITState]
-    # @param ctx [RubyVM::RJIT::Context]
-    # @param asm [RubyVM::RJIT::Assembler]
-    def concatstrings(jit, ctx, asm)
-      n = jit.operand(0)
-
-      # Save the PC and SP because we are allocating
-      jit_prepare_routine_call(jit, ctx, asm)
-
-      asm.lea(:rax, ctx.sp_opnd(-C.VALUE.size * n))
-
-      # call rb_str_concat_literals(size_t n, const VALUE *strings);
-      asm.mov(C_ARGS[0], n)
-      asm.mov(C_ARGS[1], :rax)
-      asm.call(C.rb_str_concat_literals)
-
-      ctx.stack_pop(n)
-      stack_ret = ctx.stack_push(Type::TString)
-      asm.mov(stack_ret, C_RET)
-
-      KeepCompiling
-    end
-
-    # @param jit [RubyVM::RJIT::JITState]
-    # @param ctx [RubyVM::RJIT::Context]
-    # @param asm [RubyVM::RJIT::Assembler]
-    def anytostring(jit, ctx, asm)
-      # Save the PC and SP since we might call #to_s
-      jit_prepare_routine_call(jit, ctx, asm)
-
-      str = ctx.stack_pop(1)
-      val = ctx.stack_pop(1)
-
-      asm.mov(C_ARGS[0], str)
-      asm.mov(C_ARGS[1], val)
-      asm.call(C.rb_obj_as_string_result)
-
-      # Push the return value
-      stack_ret = ctx.stack_push(Type::TString)
-      asm.mov(stack_ret, C_RET)
-
-      KeepCompiling
-    end
-
-    # @param jit [RubyVM::RJIT::JITState]
-    # @param ctx [RubyVM::RJIT::Context]
-    # @param asm [RubyVM::RJIT::Assembler]
-    def toregexp(jit, ctx, asm)
-      opt = jit.operand(0, signed: true)
-      cnt = jit.operand(1)
-
-      # Save the PC and SP because this allocates an object and could
-      # raise an exception.
-      jit_prepare_routine_call(jit, ctx, asm)
-
-      asm.lea(:rax, ctx.sp_opnd(-C.VALUE.size * cnt)) # values_ptr
-      ctx.stack_pop(cnt)
-
-      asm.mov(C_ARGS[0], 0)
-      asm.mov(C_ARGS[1], cnt)
-      asm.mov(C_ARGS[2], :rax) # values_ptr
-      asm.call(C.rb_ary_tmp_new_from_values)
-
-      # Save the array so we can clear it later
-      asm.push(C_RET)
-      asm.push(C_RET) # Alignment
-
-      asm.mov(C_ARGS[0], C_RET)
-      asm.mov(C_ARGS[1], opt)
-      asm.call(C.rb_reg_new_ary)
-
-      # The actual regex is in RAX now.  Pop the temp array from
-      # rb_ary_tmp_new_from_values into C arg regs so we can clear it
-      asm.pop(:rcx) # Alignment
-      asm.pop(:rcx) # ary
-
-      # The value we want to push on the stack is in RAX right now
-      stack_ret = ctx.stack_push(Type::UnknownHeap)
-      asm.mov(stack_ret, C_RET)
-
-      # Clear the temp array.
-      asm.mov(C_ARGS[0], :rcx) # ary
-      asm.call(C.rb_ary_clear)
-
-      KeepCompiling
-    end
-
-    # @param jit [RubyVM::RJIT::JITState]
-    # @param ctx [RubyVM::RJIT::Context]
-    # @param asm [RubyVM::RJIT::Assembler]
-    def intern(jit, ctx, asm)
-      # Save the PC and SP because we might allocate
-      jit_prepare_routine_call(jit, ctx, asm);
-
-      str = ctx.stack_pop(1)
-      asm.mov(C_ARGS[0], str)
-      asm.call(C.rb_str_intern)
-
-      # Push the return value
-      stack_ret = ctx.stack_push(Type::Unknown)
-      asm.mov(stack_ret, C_RET)
-
-      KeepCompiling
-    end
-
-    # @param jit [RubyVM::RJIT::JITState]
-    # @param ctx [RubyVM::RJIT::Context]
-    # @param asm [RubyVM::RJIT::Assembler]
-    def newarray(jit, ctx, asm)
-      n = jit.operand(0)
-
-      # Save the PC and SP because we are allocating
-      jit_prepare_routine_call(jit, ctx, asm)
-
-      # If n is 0, then elts is never going to be read, so we can just pass null
-      if n == 0
-        values_ptr = 0
-      else
-        asm.comment('load pointer to array elts')
-        offset_magnitude = C.VALUE.size * n
-        values_opnd = ctx.sp_opnd(-(offset_magnitude))
-        asm.lea(:rax, values_opnd)
-        values_ptr = :rax
-      end
-
-      # call rb_ec_ary_new_from_values(struct rb_execution_context_struct *ec, long n, const VALUE *elts);
-      asm.mov(C_ARGS[0], EC)
-      asm.mov(C_ARGS[1], n)
-      asm.mov(C_ARGS[2], values_ptr)
-      asm.call(C.rb_ec_ary_new_from_values)
-
-      ctx.stack_pop(n)
-      stack_ret = ctx.stack_push(Type::TArray)
-      asm.mov(stack_ret, C_RET)
-
-      KeepCompiling
-    end
-
-    # newarraykwsplat
-
-    # @param jit [RubyVM::RJIT::JITState]
-    # @param ctx [RubyVM::RJIT::Context]
-    # @param asm [RubyVM::RJIT::Assembler]
-    def duparray(jit, ctx, asm)
-      ary = jit.operand(0)
-
-      # Save the PC and SP because we are allocating
-      jit_prepare_routine_call(jit, ctx, asm)
-
-      # call rb_ary_resurrect(VALUE ary);
-      asm.comment('call rb_ary_resurrect')
-      asm.mov(C_ARGS[0], ary)
-      asm.call(C.rb_ary_resurrect)
-
-      stack_ret = ctx.stack_push(Type::TArray)
-      asm.mov(stack_ret, C_RET)
-
-      KeepCompiling
-    end
-
-    # duphash
-
-    # @param jit [RubyVM::RJIT::JITState]
-    # @param ctx [RubyVM::RJIT::Context]
-    # @param asm [RubyVM::RJIT::Assembler]
-    def expandarray(jit, ctx, asm)
-      # Both arguments are rb_num_t which is unsigned
-      num = jit.operand(0)
-      flag = jit.operand(1)
-
-      # If this instruction has the splat flag, then bail out.
-      if flag & 0x01 != 0
-        asm.incr_counter(:expandarray_splat)
-        return CantCompile
-      end
-
-      # If this instruction has the postarg flag, then bail out.
-      if flag & 0x02 != 0
-        asm.incr_counter(:expandarray_postarg)
-        return CantCompile
-      end
-
-      side_exit = side_exit(jit, ctx)
-
-      array_opnd = ctx.stack_opnd(0)
-      array_stack_opnd = StackOpnd[0]
-
-      # num is the number of requested values. If there aren't enough in the
-      # array then we're going to push on nils.
-      if ctx.get_opnd_type(array_stack_opnd) == Type::Nil
-        ctx.stack_pop(1) # pop after using the type info
-        # special case for a, b = nil pattern
-        # push N nils onto the stack
-        num.times do
-          push_opnd = ctx.stack_push(Type::Nil)
-          asm.mov(push_opnd, Qnil)
-        end
-        return KeepCompiling
-      end
-
-      # Move the array from the stack and check that it's an array.
-      asm.mov(:rax, array_opnd)
-      guard_object_is_array(jit, ctx, asm, :rax, :rcx, array_stack_opnd, :expandarray_not_array)
-      ctx.stack_pop(1) # pop after using the type info
-
-      # If we don't actually want any values, then just return.
-      if num == 0
-        return KeepCompiling
-      end
-
-      jit_array_len(asm, :rax, :rcx)
-
-      # Only handle the case where the number of values in the array is greater
-      # than or equal to the number of values requested.
-      asm.cmp(:rcx, num)
-      asm.jl(counted_exit(side_exit, :expandarray_rhs_too_small))
-
-      # Conditionally load the address of the heap array into REG1.
-      # (struct RArray *)(obj)->as.heap.ptr
-      #asm.mov(:rax, array_opnd)
-      asm.mov(:rcx, [:rax, C.RBasic.offsetof(:flags)])
-      asm.test(:rcx, C::RARRAY_EMBED_FLAG);
-      asm.mov(:rcx, [:rax, C.RArray.offsetof(:as, :heap, :ptr)])
-
-      # Load the address of the embedded array into REG1.
-      # (struct RArray *)(obj)->as.ary
-      asm.lea(:rax, [:rax, C.RArray.offsetof(:as, :ary)])
-
-      asm.cmovnz(:rcx, :rax)
-
-      # Loop backward through the array and push each element onto the stack.
-      (num - 1).downto(0).each do |i|
-        top = ctx.stack_push(Type::Unknown)
-        asm.mov(:rax, [:rcx, i * C.VALUE.size])
-        asm.mov(top, :rax)
-      end
-
-      KeepCompiling
-    end
-
-    # @param jit [RubyVM::RJIT::JITState]
-    # @param ctx [RubyVM::RJIT::Context]
-    # @param asm [RubyVM::RJIT::Assembler]
-    def concatarray(jit, ctx, asm)
-      # Save the PC and SP because the callee may allocate
-      # Note that this modifies REG_SP, which is why we do it first
-      jit_prepare_routine_call(jit, ctx, asm)
-
-      # Get the operands from the stack
-      ary2st_opnd = ctx.stack_pop(1)
-      ary1_opnd = ctx.stack_pop(1)
-
-      # Call rb_vm_concat_array(ary1, ary2st)
-      asm.mov(C_ARGS[0], ary1_opnd)
-      asm.mov(C_ARGS[1], ary2st_opnd)
-      asm.call(C.rb_vm_concat_array)
-
-      stack_ret = ctx.stack_push(Type::TArray)
-      asm.mov(stack_ret, C_RET)
-
-      KeepCompiling
-    end
-
-    # @param jit [RubyVM::RJIT::JITState]
-    # @param ctx [RubyVM::RJIT::Context]
-    # @param asm [RubyVM::RJIT::Assembler]
-    def splatarray(jit, ctx, asm)
-      flag = jit.operand(0)
-
-      # Save the PC and SP because the callee may allocate
-      # Note that this modifies REG_SP, which is why we do it first
-      jit_prepare_routine_call(jit, ctx, asm)
-
-      # Get the operands from the stack
-      ary_opnd = ctx.stack_pop(1)
-
-      # Call rb_vm_splat_array(flag, ary)
-      asm.mov(C_ARGS[0], flag)
-      asm.mov(C_ARGS[1], ary_opnd)
-      asm.call(C.rb_vm_splat_array)
-
-      stack_ret = ctx.stack_push(Type::TArray)
-      asm.mov(stack_ret, C_RET)
-
-      KeepCompiling
-    end
-
-    # @param jit [RubyVM::RJIT::JITState]
-    # @param ctx [RubyVM::RJIT::Context]
-    # @param asm [RubyVM::RJIT::Assembler]
-    def newhash(jit, ctx, asm)
-      num = jit.operand(0)
-
-      # Save the PC and SP because we are allocating
-      jit_prepare_routine_call(jit, ctx, asm)
-
-      if num != 0
-        # val = rb_hash_new_with_size(num / 2);
-        asm.mov(C_ARGS[0], num / 2)
-        asm.call(C.rb_hash_new_with_size)
-
-        # Save the allocated hash as we want to push it after insertion
-        asm.push(C_RET)
-        asm.push(C_RET) # x86 alignment
-
-        # Get a pointer to the values to insert into the hash
-        asm.lea(:rcx, ctx.stack_opnd(num - 1))
-
-        # rb_hash_bulk_insert(num, STACK_ADDR_FROM_TOP(num), val);
-        asm.mov(C_ARGS[0], num)
-        asm.mov(C_ARGS[1], :rcx)
-        asm.mov(C_ARGS[2], C_RET)
-        asm.call(C.rb_hash_bulk_insert)
-
-        asm.pop(:rax)
-        asm.pop(:rax)
-
-        ctx.stack_pop(num)
-        stack_ret = ctx.stack_push(Type::Hash)
-        asm.mov(stack_ret, :rax)
-      else
-        # val = rb_hash_new();
-        asm.call(C.rb_hash_new)
-        stack_ret = ctx.stack_push(Type::Hash)
-        asm.mov(stack_ret, C_RET)
-      end
-
-      KeepCompiling
-    end
-
-    # @param jit [RubyVM::RJIT::JITState]
-    # @param ctx [RubyVM::RJIT::Context]
-    # @param asm [RubyVM::RJIT::Assembler]
-    def newrange(jit, ctx, asm)
-      flag = jit.operand(0)
-
-      # rb_range_new() allocates and can raise
-      jit_prepare_routine_call(jit, ctx, asm)
-
-      # val = rb_range_new(low, high, (int)flag);
-      asm.mov(C_ARGS[0], ctx.stack_opnd(1))
-      asm.mov(C_ARGS[1], ctx.stack_opnd(0))
-      asm.mov(C_ARGS[2], flag)
-      asm.call(C.rb_range_new)
-
-      ctx.stack_pop(2)
-      stack_ret = ctx.stack_push(Type::UnknownHeap)
-      asm.mov(stack_ret, C_RET)
-
-      KeepCompiling
-    end
-
-    # @param jit [RubyVM::RJIT::JITState]
-    # @param ctx [RubyVM::RJIT::Context]
-    # @param asm [RubyVM::RJIT::Assembler]
-    def pop(jit, ctx, asm)
-      ctx.stack_pop
-      KeepCompiling
-    end
-
-    # @param jit [RubyVM::RJIT::JITState]
-    # @param ctx [RubyVM::RJIT::Context]
-    # @param asm [RubyVM::RJIT::Assembler]
-    def dup(jit, ctx, asm)
-      dup_val = ctx.stack_opnd(0)
-      mapping, tmp_type = ctx.get_opnd_mapping(StackOpnd[0])
-
-      loc0 = ctx.stack_push_mapping([mapping, tmp_type])
-      asm.mov(:rax, dup_val)
-      asm.mov(loc0, :rax)
-
-      KeepCompiling
-    end
-
-    # @param jit [RubyVM::RJIT::JITState]
-    # @param ctx [RubyVM::RJIT::Context]
-    # @param asm [RubyVM::RJIT::Assembler]
-    def dupn(jit, ctx, asm)
-      n = jit.operand(0)
-
-      # In practice, seems to be only used for n==2
-      if n != 2
-        return CantCompile
-      end
-
-      opnd1 = ctx.stack_opnd(1)
-      opnd0 = ctx.stack_opnd(0)
-
-      mapping1 = ctx.get_opnd_mapping(StackOpnd[1])
-      mapping0 = ctx.get_opnd_mapping(StackOpnd[0])
-
-      dst1 = ctx.stack_push_mapping(mapping1)
-      asm.mov(:rax, opnd1)
-      asm.mov(dst1, :rax)
-
-      dst0 = ctx.stack_push_mapping(mapping0)
-      asm.mov(:rax, opnd0)
-      asm.mov(dst0, :rax)
-
-      KeepCompiling
-    end
-
-    # @param jit [RubyVM::RJIT::JITState]
-    # @param ctx [RubyVM::RJIT::Context]
-    # @param asm [RubyVM::RJIT::Assembler]
-    def swap(jit, ctx, asm)
-      stack_swap(jit, ctx, asm, 0, 1)
-      KeepCompiling
-    end
-
-    # opt_reverse
-
-    # @param jit [RubyVM::RJIT::JITState]
-    # @param ctx [RubyVM::RJIT::Context]
-    # @param asm [RubyVM::RJIT::Assembler]
-    def topn(jit, ctx, asm)
-      n = jit.operand(0)
-
-      top_n_val = ctx.stack_opnd(n)
-      mapping = ctx.get_opnd_mapping(StackOpnd[n])
-      loc0 = ctx.stack_push_mapping(mapping)
-      asm.mov(:rax, top_n_val)
-      asm.mov(loc0, :rax)
-
-      KeepCompiling
-    end
-
-    # @param jit [RubyVM::RJIT::JITState]
-    # @param ctx [RubyVM::RJIT::Context]
-    # @param asm [RubyVM::RJIT::Assembler]
-    def setn(jit, ctx, asm)
-      n = jit.operand(0)
-
-      top_val = ctx.stack_pop(0)
-      dst_opnd = ctx.stack_opnd(n)
-      asm.mov(:rax, top_val)
-      asm.mov(dst_opnd, :rax)
-
-      mapping = ctx.get_opnd_mapping(StackOpnd[0])
-      ctx.set_opnd_mapping(StackOpnd[n], mapping)
-
-      KeepCompiling
-    end
-
-    # @param jit [RubyVM::RJIT::JITState]
-    # @param ctx [RubyVM::RJIT::Context]
-    # @param asm [RubyVM::RJIT::Assembler]
-    def adjuststack(jit, ctx, asm)
-      n = jit.operand(0)
-      ctx.stack_pop(n)
-      KeepCompiling
-    end
-
-    # @param jit [RubyVM::RJIT::JITState]
-    # @param ctx [RubyVM::RJIT::Context]
-    # @param asm [RubyVM::RJIT::Assembler]
-    def defined(jit, ctx, asm)
-      op_type = jit.operand(0)
-      obj = jit.operand(1, ruby: true)
-      pushval = jit.operand(2, ruby: true)
-
-      # Save the PC and SP because the callee may allocate
-      # Note that this modifies REG_SP, which is why we do it first
-      jit_prepare_routine_call(jit, ctx, asm)
-
-      # Get the operands from the stack
-      v_opnd = ctx.stack_pop(1)
-
-      # Call vm_defined(ec, reg_cfp, op_type, obj, v)
-      asm.mov(C_ARGS[0], EC)
-      asm.mov(C_ARGS[1], CFP)
-      asm.mov(C_ARGS[2], op_type)
-      asm.mov(C_ARGS[3], to_value(obj))
-      asm.mov(C_ARGS[4], v_opnd)
-      asm.call(C.rb_vm_defined)
-
-      asm.test(C_RET, 255)
-      asm.mov(:rax, Qnil)
-      asm.mov(:rcx, to_value(pushval))
-      asm.cmovnz(:rax, :rcx)
-
-      # Push the return value onto the stack
-      out_type = if C::SPECIAL_CONST_P(pushval)
-        Type::UnknownImm
-      else
-        Type::Unknown
-      end
-      stack_ret = ctx.stack_push(out_type)
-      asm.mov(stack_ret, :rax)
-
-      KeepCompiling
-    end
-
-    # @param jit [RubyVM::RJIT::JITState]
-    # @param ctx [RubyVM::RJIT::Context]
-    # @param asm [RubyVM::RJIT::Assembler]
-    def definedivar(jit, ctx, asm)
-      # Defer compilation so we can specialize base on a runtime receiver
-      unless jit.at_current_insn?
-        defer_compilation(jit, ctx, asm)
-        return EndBlock
-      end
-
-      ivar_name = jit.operand(0)
-      # Value that will be pushed on the stack if the ivar is defined. In practice this is always the
-      # string "instance-variable". If the ivar is not defined, nil will be pushed instead.
-      pushval = jit.operand(2, ruby: true)
-
-      # Get the receiver
-      recv = :rcx
-      asm.mov(recv, [CFP, C.rb_control_frame_t.offsetof(:self)])
-
-      # Specialize base on compile time values
-      comptime_receiver = jit.peek_at_self
-
-      if shape_too_complex?(comptime_receiver)
-        # Fall back to calling rb_ivar_defined
-
-        # Save the PC and SP because the callee may allocate
-        # Note that this modifies REG_SP, which is why we do it first
-        jit_prepare_routine_call(jit, ctx, asm) # clobbers :rax
-
-        # Call rb_ivar_defined(recv, ivar_name)
-        asm.mov(C_ARGS[0], recv)
-        asm.mov(C_ARGS[1], ivar_name)
-        asm.call(C.rb_ivar_defined)
-
-        # if (rb_ivar_defined(recv, ivar_name)) {
-        #  val = pushval;
-        # }
-        asm.test(C_RET, 255)
-        asm.mov(:rax, Qnil)
-        asm.mov(:rcx, to_value(pushval))
-        asm.cmovnz(:rax, :rcx)
-
-        # Push the return value onto the stack
-        out_type = C::SPECIAL_CONST_P(pushval) ? Type::UnknownImm : Type::Unknown
-        stack_ret = ctx.stack_push(out_type)
-        asm.mov(stack_ret, :rax)
-
-        return KeepCompiling
-      end
-
-      shape_id = C.rb_shape_get_shape_id(comptime_receiver)
-      ivar_exists = C.rb_shape_get_iv_index(shape_id, ivar_name)
-
-      side_exit = side_exit(jit, ctx)
-
-      # Guard heap object (recv_opnd must be used before stack_pop)
-      guard_object_is_heap(jit, ctx, asm, recv, SelfOpnd)
-
-      shape_opnd = DwordPtr[recv, C.rb_shape_id_offset]
-
-      asm.comment('guard shape')
-      asm.cmp(shape_opnd, shape_id)
-      jit_chain_guard(:jne, jit, ctx, asm, side_exit)
-
-      result = ivar_exists ? C.to_value(pushval) : Qnil
-      putobject(jit, ctx, asm, val: result)
-
-      # Jump to next instruction. This allows guard chains to share the same successor.
-      jump_to_next_insn(jit, ctx, asm)
-
-      return EndBlock
-    end
-
-    # checkmatch
-
-    # @param jit [RubyVM::RJIT::JITState]
-    # @param ctx [RubyVM::RJIT::Context]
-    # @param asm [RubyVM::RJIT::Assembler]
-    def checkkeyword(jit, ctx, asm)
-      # When a keyword is unspecified past index 32, a hash will be used
-      # instead. This can only happen in iseqs taking more than 32 keywords.
-      if jit.iseq.body.param.keyword.num >= 32
-        return CantCompile
-      end
-
-      # The EP offset to the undefined bits local
-      bits_offset = jit.operand(0)
-
-      # The index of the keyword we want to check
-      index = jit.operand(1, signed: true)
-
-      # Load environment pointer EP
-      ep_reg = :rax
-      jit_get_ep(asm, 0, reg: ep_reg)
-
-      # VALUE kw_bits = *(ep - bits)
-      bits_opnd = [ep_reg, C.VALUE.size * -bits_offset]
-
-      # unsigned int b = (unsigned int)FIX2ULONG(kw_bits);
-      # if ((b & (0x01 << idx))) {
-      #
-      # We can skip the FIX2ULONG conversion by shifting the bit we test
-      bit_test = 0x01 << (index + 1)
-      asm.test(bits_opnd, bit_test)
-      asm.mov(:rax, Qfalse)
-      asm.mov(:rcx, Qtrue)
-      asm.cmovz(:rax, :rcx)
-
-      stack_ret = ctx.stack_push(Type::UnknownImm)
-      asm.mov(stack_ret, :rax)
-
-      KeepCompiling
-    end
-
-    # checktype
-    # defineclass
-    # definemethod
-    # definesmethod
-
-    # @param jit [RubyVM::RJIT::JITState]
-    # @param ctx [RubyVM::RJIT::Context]
-    # @param asm [RubyVM::RJIT::Assembler]
-    def send(jit, ctx, asm)
-      # Specialize on a compile-time receiver, and split a block for chain guards
-      unless jit.at_current_insn?
-        defer_compilation(jit, ctx, asm)
-        return EndBlock
-      end
-
-      cd = C.rb_call_data.new(jit.operand(0))
-      blockiseq = jit.operand(1)
-
-      # calling->ci
-      mid = C.vm_ci_mid(cd.ci)
-      calling = build_calling(ci: cd.ci, block_handler: blockiseq)
-
-      # vm_sendish
-      cme, comptime_recv_klass = jit_search_method(jit, ctx, asm, mid, calling)
-      if cme == CantCompile
-        return CantCompile
-      end
-      jit_call_general(jit, ctx, asm, mid, calling, cme, comptime_recv_klass)
-    end
-
-    # @param jit [RubyVM::RJIT::JITState]
-    # @param ctx [RubyVM::RJIT::Context]
-    # @param asm [RubyVM::RJIT::Assembler]
-    def opt_send_without_block(jit, ctx, asm, cd: C.rb_call_data.new(jit.operand(0)))
-      # Specialize on a compile-time receiver, and split a block for chain guards
-      unless jit.at_current_insn?
-        defer_compilation(jit, ctx, asm)
-        return EndBlock
-      end
-
-      # calling->ci
-      mid = C.vm_ci_mid(cd.ci)
-      calling = build_calling(ci: cd.ci, block_handler: C::VM_BLOCK_HANDLER_NONE)
-
-      # vm_sendish
-      cme, comptime_recv_klass = jit_search_method(jit, ctx, asm, mid, calling)
-      if cme == CantCompile
-        return CantCompile
-      end
-      jit_call_general(jit, ctx, asm, mid, calling, cme, comptime_recv_klass)
-    end
-
-    # @param jit [RubyVM::RJIT::JITState]
-    # @param ctx [RubyVM::RJIT::Context]
-    # @param asm [RubyVM::RJIT::Assembler]
-    def objtostring(jit, ctx, asm)
-      unless jit.at_current_insn?
-        defer_compilation(jit, ctx, asm)
-        return EndBlock
-      end
-
-      recv = ctx.stack_opnd(0)
-      comptime_recv = jit.peek_at_stack(0)
-
-      if C.RB_TYPE_P(comptime_recv, C::RUBY_T_STRING)
-        side_exit = side_exit(jit, ctx)
-
-        jit_guard_known_klass(jit, ctx, asm, C.rb_class_of(comptime_recv), recv, StackOpnd[0], comptime_recv, side_exit)
-        # No work needed. The string value is already on the top of the stack.
-        KeepCompiling
-      else
-        cd = C.rb_call_data.new(jit.operand(0))
-        opt_send_without_block(jit, ctx, asm, cd:)
-      end
-    end
-
-    # @param jit [RubyVM::RJIT::JITState]
-    # @param ctx [RubyVM::RJIT::Context]
-    # @param asm [RubyVM::RJIT::Assembler]
-    def opt_str_freeze(jit, ctx, asm)
-      unless Invariants.assume_bop_not_redefined(jit, C::STRING_REDEFINED_OP_FLAG, C::BOP_FREEZE)
-        return CantCompile;
-      end
-
-      str = jit.operand(0, ruby: true)
-
-      # Push the return value onto the stack
-      stack_ret = ctx.stack_push(Type::CString)
-      asm.mov(:rax, to_value(str))
-      asm.mov(stack_ret, :rax)
-
-      KeepCompiling
-    end
-
-    # @param jit [RubyVM::RJIT::JITState]
-    # @param ctx [RubyVM::RJIT::Context]
-    # @param asm [RubyVM::RJIT::Assembler]
-    def opt_nil_p(jit, ctx, asm)
-      opt_send_without_block(jit, ctx, asm)
-    end
-
-    # opt_str_uminus
-
-    # @param jit [RubyVM::RJIT::JITState]
-    # @param ctx [RubyVM::RJIT::Context]
-    # @param asm [RubyVM::RJIT::Assembler]
-    def opt_newarray_send(jit, ctx, asm)
-      type = C.ID2SYM jit.operand(1)
-
-      case type
-      when :min then opt_newarray_min(jit, ctx, asm)
-      when :max then opt_newarray_max(jit, ctx, asm)
-      when :hash then opt_newarray_hash(jit, ctx, asm)
-      else
-        return CantCompile
-      end
-    end
-
-    # @param jit [RubyVM::RJIT::JITState]
-    # @param ctx [RubyVM::RJIT::Context]
-    # @param asm [RubyVM::RJIT::Assembler]
-    def opt_newarray_min(jit, ctx, asm)
-      num = jit.operand(0)
-
-      # Save the PC and SP because we may allocate
-      jit_prepare_routine_call(jit, ctx, asm)
-
-      offset_magnitude = C.VALUE.size * num
-      values_opnd = ctx.sp_opnd(-offset_magnitude)
-      asm.lea(:rax, values_opnd)
-
-      asm.mov(C_ARGS[0], EC)
-      asm.mov(C_ARGS[1], num)
-      asm.mov(C_ARGS[2], :rax)
-      asm.call(C.rb_vm_opt_newarray_min)
-
-      ctx.stack_pop(num)
-      stack_ret = ctx.stack_push(Type::Unknown)
-      asm.mov(stack_ret, C_RET)
-
-      KeepCompiling
-    end
-
-    # @param jit [RubyVM::RJIT::JITState]
-    # @param ctx [RubyVM::RJIT::Context]
-    # @param asm [RubyVM::RJIT::Assembler]
-    def opt_newarray_max(jit, ctx, asm)
-      num = jit.operand(0)
-
-      # Save the PC and SP because we may allocate
-      jit_prepare_routine_call(jit, ctx, asm)
-
-      offset_magnitude = C.VALUE.size * num
-      values_opnd = ctx.sp_opnd(-offset_magnitude)
-      asm.lea(:rax, values_opnd)
-
-      asm.mov(C_ARGS[0], EC)
-      asm.mov(C_ARGS[1], num)
-      asm.mov(C_ARGS[2], :rax)
-      asm.call(C.rb_vm_opt_newarray_max)
-
-      ctx.stack_pop(num)
-      stack_ret = ctx.stack_push(Type::Unknown)
-      asm.mov(stack_ret, C_RET)
-
-      KeepCompiling
-    end
-
-    # @param jit [RubyVM::RJIT::JITState]
-    # @param ctx [RubyVM::RJIT::Context]
-    # @param asm [RubyVM::RJIT::Assembler]
-    def opt_newarray_hash(jit, ctx, asm)
-      num = jit.operand(0)
-
-      # Save the PC and SP because we may allocate
-      jit_prepare_routine_call(jit, ctx, asm)
-
-      offset_magnitude = C.VALUE.size * num
-      values_opnd = ctx.sp_opnd(-offset_magnitude)
-      asm.lea(:rax, values_opnd)
-
-      asm.mov(C_ARGS[0], EC)
-      asm.mov(C_ARGS[1], num)
-      asm.mov(C_ARGS[2], :rax)
-      asm.call(C.rb_vm_opt_newarray_hash)
-
-      ctx.stack_pop(num)
-      stack_ret = ctx.stack_push(Type::Unknown)
-      asm.mov(stack_ret, C_RET)
-
-      KeepCompiling
-    end
-
-    # @param jit [RubyVM::RJIT::JITState]
-    # @param ctx [RubyVM::RJIT::Context]
-    # @param asm [RubyVM::RJIT::Assembler]
-    def invokesuper(jit, ctx, asm)
-      cd = C.rb_call_data.new(jit.operand(0))
-      block = jit.operand(1)
-
-      # Defer compilation so we can specialize on class of receiver
-      unless jit.at_current_insn?
-        defer_compilation(jit, ctx, asm)
-        return EndBlock
-      end
-
-      me = C.rb_vm_frame_method_entry(jit.cfp)
-      if me.nil?
-        return CantCompile
-      end
-
-      # FIXME: We should track and invalidate this block when this cme is invalidated
-      current_defined_class = me.defined_class
-      mid = me.def.original_id
-
-      if me.to_i != C.rb_callable_method_entry(current_defined_class, me.called_id).to_i
-        # Though we likely could generate this call, as we are only concerned
-        # with the method entry remaining valid, assume_method_lookup_stable
-        # below requires that the method lookup matches as well
-        return CantCompile
-      end
-
-      # vm_search_normal_superclass
-      rbasic_klass = C.to_ruby(C.RBasic.new(C.to_value(current_defined_class)).klass)
-      if C::BUILTIN_TYPE(current_defined_class) == C::RUBY_T_ICLASS && C::BUILTIN_TYPE(rbasic_klass) == C::RUBY_T_MODULE && \
-          C::FL_TEST_RAW(rbasic_klass, C::RMODULE_IS_REFINEMENT)
-        return CantCompile
-      end
-      comptime_superclass = C.rb_class_get_superclass(C.RCLASS_ORIGIN(current_defined_class))
-
-      ci = cd.ci
-      argc = C.vm_ci_argc(ci)
-
-      ci_flags = C.vm_ci_flag(ci)
-
-      # Don't JIT calls that aren't simple
-      # Note, not using VM_CALL_ARGS_SIMPLE because sometimes we pass a block.
-
-      if ci_flags & C::VM_CALL_KWARG != 0
-        asm.incr_counter(:send_keywords)
-        return CantCompile
-      end
-      if ci_flags & C::VM_CALL_KW_SPLAT != 0
-        asm.incr_counter(:send_kw_splat)
-        return CantCompile
-      end
-      if ci_flags & C::VM_CALL_ARGS_BLOCKARG != 0
-        asm.incr_counter(:send_block_arg)
-        return CantCompile
-      end
-
-      # Ensure we haven't rebound this method onto an incompatible class.
-      # In the interpreter we try to avoid making this check by performing some
-      # cheaper calculations first, but since we specialize on the method entry
-      # and so only have to do this once at compile time this is fine to always
-      # check and side exit.
-      comptime_recv = jit.peek_at_stack(argc)
-      unless C.obj_is_kind_of(comptime_recv, current_defined_class)
-        return CantCompile
-      end
-
-      # Do method lookup
-      cme = C.rb_callable_method_entry(comptime_superclass, mid)
-
-      if cme.nil?
-        return CantCompile
-      end
-
-      # Check that we'll be able to write this method dispatch before generating checks
-      cme_def_type = cme.def.type
-      if cme_def_type != C::VM_METHOD_TYPE_ISEQ && cme_def_type != C::VM_METHOD_TYPE_CFUNC
-        # others unimplemented
-        return CantCompile
-      end
-
-      asm.comment('guard known me')
-      lep_opnd = :rax
-      jit_get_lep(jit, asm, reg: lep_opnd)
-      ep_me_opnd = [lep_opnd, C.VALUE.size * C::VM_ENV_DATA_INDEX_ME_CREF]
-
-      asm.mov(:rcx, me.to_i)
-      asm.cmp(ep_me_opnd, :rcx)
-      asm.jne(counted_exit(side_exit(jit, ctx), :invokesuper_me_changed))
-
-      if block == C::VM_BLOCK_HANDLER_NONE
-        # Guard no block passed
-        # rb_vm_frame_block_handler(GET_EC()->cfp) == VM_BLOCK_HANDLER_NONE
-        # note, we assume VM_ASSERT(VM_ENV_LOCAL_P(ep))
-        #
-        # TODO: this could properly forward the current block handler, but
-        # would require changes to gen_send_*
-        asm.comment('guard no block given')
-        ep_specval_opnd = [lep_opnd, C.VALUE.size * C::VM_ENV_DATA_INDEX_SPECVAL]
-        asm.cmp(ep_specval_opnd, C::VM_BLOCK_HANDLER_NONE)
-        asm.jne(counted_exit(side_exit(jit, ctx), :invokesuper_block))
-      end
-
-      # We need to assume that both our current method entry and the super
-      # method entry we invoke remain stable
-      Invariants.assume_method_lookup_stable(jit, me)
-      Invariants.assume_method_lookup_stable(jit, cme)
-
-      # Method calls may corrupt types
-      ctx.clear_local_types
-
-      calling = build_calling(ci:, block_handler: block)
-      case cme_def_type
-      in C::VM_METHOD_TYPE_ISEQ
-        iseq = def_iseq_ptr(cme.def)
-        frame_type = C::VM_FRAME_MAGIC_METHOD | C::VM_ENV_FLAG_LOCAL
-        jit_call_iseq(jit, ctx, asm, cme, calling, iseq, frame_type:)
-      in C::VM_METHOD_TYPE_CFUNC
-        jit_call_cfunc(jit, ctx, asm, cme, calling)
-      end
-    end
-
-    # @param jit [RubyVM::RJIT::JITState]
-    # @param ctx [RubyVM::RJIT::Context]
-    # @param asm [RubyVM::RJIT::Assembler]
-    def invokeblock(jit, ctx, asm)
-      unless jit.at_current_insn?
-        defer_compilation(jit, ctx, asm)
-        return EndBlock
-      end
-
-      # Get call info
-      cd = C.rb_call_data.new(jit.operand(0))
-      calling = build_calling(ci: cd.ci, block_handler: :captured)
-
-      # Get block_handler
-      cfp = jit.cfp
-      lep = C.rb_vm_ep_local_ep(cfp.ep)
-      comptime_handler = lep[C::VM_ENV_DATA_INDEX_SPECVAL]
-
-      # Handle each block_handler type
-      if comptime_handler == C::VM_BLOCK_HANDLER_NONE # no block given
-        asm.incr_counter(:invokeblock_none)
-        CantCompile
-      elsif comptime_handler & 0x3 == 0x1 # VM_BH_ISEQ_BLOCK_P
-        asm.comment('get local EP')
-        ep_reg = :rax
-        jit_get_lep(jit, asm, reg: ep_reg)
-        asm.mov(:rax, [ep_reg, C.VALUE.size * C::VM_ENV_DATA_INDEX_SPECVAL]) # block_handler_opnd
-
-        asm.comment('guard block_handler type')
-        side_exit = side_exit(jit, ctx)
-        asm.mov(:rcx, :rax)
-        asm.and(:rcx, 0x3) # block_handler is a tagged pointer
-        asm.cmp(:rcx, 0x1) # VM_BH_ISEQ_BLOCK_P
-        tag_changed_exit = counted_exit(side_exit, :invokeblock_tag_changed)
-        jit_chain_guard(:jne, jit, ctx, asm, tag_changed_exit)
-
-        comptime_captured = C.rb_captured_block.new(comptime_handler & ~0x3)
-        comptime_iseq = comptime_captured.code.iseq
-
-        asm.comment('guard known ISEQ')
-        asm.and(:rax, ~0x3) # captured
-        asm.mov(:rax, [:rax, C.VALUE.size * 2]) # captured->iseq
-        asm.mov(:rcx, comptime_iseq.to_i)
-        asm.cmp(:rax, :rcx)
-        block_changed_exit = counted_exit(side_exit, :invokeblock_iseq_block_changed)
-        jit_chain_guard(:jne, jit, ctx, asm, block_changed_exit)
-
-        jit_call_iseq(jit, ctx, asm, nil, calling, comptime_iseq, frame_type: C::VM_FRAME_MAGIC_BLOCK)
-      elsif comptime_handler & 0x3 == 0x3 # VM_BH_IFUNC_P
-        # We aren't handling CALLER_SETUP_ARG and CALLER_REMOVE_EMPTY_KW_SPLAT yet.
-        if calling.flags & C::VM_CALL_ARGS_SPLAT != 0
-          asm.incr_counter(:invokeblock_ifunc_args_splat)
-          return CantCompile
-        end
-        if calling.flags & C::VM_CALL_KW_SPLAT != 0
-          asm.incr_counter(:invokeblock_ifunc_kw_splat)
-          return CantCompile
-        end
-
-        asm.comment('get local EP')
-        jit_get_lep(jit, asm, reg: :rax)
-        asm.mov(:rcx, [:rax, C.VALUE.size * C::VM_ENV_DATA_INDEX_SPECVAL]) # block_handler_opnd
-
-        asm.comment('guard block_handler type');
-        side_exit = side_exit(jit, ctx)
-        asm.mov(:rax, :rcx) # block_handler_opnd
-        asm.and(:rax, 0x3) # tag_opnd: block_handler is a tagged pointer
-        asm.cmp(:rax, 0x3) # VM_BH_IFUNC_P
-        tag_changed_exit = counted_exit(side_exit, :invokeblock_tag_changed)
-        jit_chain_guard(:jne, jit, ctx, asm, tag_changed_exit)
-
-        # The cfunc may not be leaf
-        jit_prepare_routine_call(jit, ctx, asm) # clobbers :rax
-
-        asm.comment('call ifunc')
-        asm.and(:rcx, ~0x3) # captured_opnd
-        asm.lea(:rax, ctx.sp_opnd(-calling.argc * C.VALUE.size)) # argv
-        asm.mov(C_ARGS[0], EC)
-        asm.mov(C_ARGS[1], :rcx) # captured_opnd
-        asm.mov(C_ARGS[2], calling.argc)
-        asm.mov(C_ARGS[3], :rax) # argv
-        asm.call(C.rb_vm_yield_with_cfunc)
-
-        ctx.stack_pop(calling.argc)
-        stack_ret = ctx.stack_push(Type::Unknown)
-        asm.mov(stack_ret, C_RET)
-
-        # cfunc calls may corrupt types
-        ctx.clear_local_types
-
-        # Share the successor with other chains
-        jump_to_next_insn(jit, ctx, asm)
-        EndBlock
-      elsif symbol?(comptime_handler)
-        asm.incr_counter(:invokeblock_symbol)
-        CantCompile
-      else # Proc
-        asm.incr_counter(:invokeblock_proc)
-        CantCompile
-      end
-    end
-
-    # @param jit [RubyVM::RJIT::JITState]
-    # @param ctx [RubyVM::RJIT::Context]
-    # @param asm [RubyVM::RJIT::Assembler]
-    def leave(jit, ctx, asm)
-      assert_equal(ctx.stack_size, 1)
-
-      jit_check_ints(jit, ctx, asm)
-
-      asm.comment('pop stack frame')
-      asm.lea(:rax, [CFP, C.rb_control_frame_t.size])
-      asm.mov(CFP, :rax)
-      asm.mov([EC, C.rb_execution_context_t.offsetof(:cfp)], :rax)
-
-      # Return a value (for compile_leave_exit)
-      ret_opnd = ctx.stack_pop
-      asm.mov(:rax, ret_opnd)
-
-      # Set caller's SP and push a value to its stack (for JIT)
-      asm.mov(SP, [CFP, C.rb_control_frame_t.offsetof(:sp)]) # Note: SP is in the position after popping a receiver and arguments
-      asm.mov([SP], :rax)
-
-      # Jump to cfp->jit_return
-      asm.jmp([CFP, -C.rb_control_frame_t.size + C.rb_control_frame_t.offsetof(:jit_return)])
-
-      EndBlock
-    end
-
-    # @param jit [RubyVM::RJIT::JITState]
-    # @param ctx [RubyVM::RJIT::Context]
-    # @param asm [RubyVM::RJIT::Assembler]
-    def throw(jit, ctx, asm)
-      throw_state = jit.operand(0)
-      asm.mov(:rcx, ctx.stack_pop(1)) # throwobj
-
-      # THROW_DATA_NEW allocates. Save SP for GC and PC for allocation tracing as
-      # well as handling the catch table. However, not using jit_prepare_routine_call
-      # since we don't need a patch point for this implementation.
-      jit_save_pc(jit, asm) # clobbers rax
-      jit_save_sp(ctx, asm)
-
-      # rb_vm_throw verifies it's a valid throw, sets ec->tag->state, and returns throw
-      # data, which is throwobj or a vm_throw_data wrapping it. When ec->tag->state is
-      # set, JIT code callers will handle the throw with vm_exec_handle_exception.
-      asm.mov(C_ARGS[0], EC)
-      asm.mov(C_ARGS[1], CFP)
-      asm.mov(C_ARGS[2], throw_state)
-      # asm.mov(C_ARGS[3], :rcx) # same reg
-      asm.call(C.rb_vm_throw)
-
-      asm.comment('exit from throw')
-      asm.pop(SP)
-      asm.pop(EC)
-      asm.pop(CFP)
-
-      # return C_RET as C_RET
-      asm.ret
-      EndBlock
-    end
-
-    # @param jit [RubyVM::RJIT::JITState]
-    # @param ctx [RubyVM::RJIT::Context]
-    # @param asm [RubyVM::RJIT::Assembler]
-    def jump(jit, ctx, asm)
-      # Check for interrupts, but only on backward branches that may create loops
-      jump_offset = jit.operand(0, signed: true)
-      if jump_offset < 0
-        jit_check_ints(jit, ctx, asm)
-      end
-
-      pc = jit.pc + C.VALUE.size * (jit.insn.len + jump_offset)
-      jit_direct_jump(jit.iseq, pc, ctx, asm)
-      EndBlock
-    end
-
-    # @param jit [RubyVM::RJIT::JITState]
-    # @param ctx [RubyVM::RJIT::Context]
-    # @param asm [RubyVM::RJIT::Assembler]
-    def branchif(jit, ctx, asm)
-      # Check for interrupts, but only on backward branches that may create loops
-      jump_offset = jit.operand(0, signed: true)
-      if jump_offset < 0
-        jit_check_ints(jit, ctx, asm)
-      end
-
-      # Get the branch target instruction offsets
-      next_pc = jit.pc + C.VALUE.size * jit.insn.len
-      jump_pc = jit.pc + C.VALUE.size * (jit.insn.len + jump_offset)
-
-      val_type = ctx.get_opnd_type(StackOpnd[0])
-      val_opnd = ctx.stack_pop(1)
-
-      if (result = val_type.known_truthy) != nil
-        target_pc = result ? jump_pc : next_pc
-        jit_direct_jump(jit.iseq, target_pc, ctx, asm)
-      else
-        # This `test` sets ZF only for Qnil and Qfalse, which let jz jump.
-        asm.test(val_opnd, ~Qnil)
-
-        # Set stubs
-        branch_stub = BranchStub.new(
-          iseq: jit.iseq,
-          shape: Default,
-          target0: BranchTarget.new(ctx:, pc: jump_pc), # branch target
-          target1: BranchTarget.new(ctx:, pc: next_pc), # fallthrough
-        )
-        branch_stub.target0.address = Assembler.new.then do |ocb_asm|
-          @exit_compiler.compile_branch_stub(ctx, ocb_asm, branch_stub, true)
-          @ocb.write(ocb_asm)
-        end
-        branch_stub.target1.address = Assembler.new.then do |ocb_asm|
-          @exit_compiler.compile_branch_stub(ctx, ocb_asm, branch_stub, false)
-          @ocb.write(ocb_asm)
-        end
-
-        # Jump to target0 on jnz
-        branch_stub.compile = proc do |branch_asm|
-          branch_asm.comment("branchif #{branch_stub.shape}")
-          branch_asm.stub(branch_stub) do
-            case branch_stub.shape
-            in Default
-              branch_asm.jnz(branch_stub.target0.address)
-              branch_asm.jmp(branch_stub.target1.address)
-            in Next0
-              branch_asm.jz(branch_stub.target1.address)
-            in Next1
-              branch_asm.jnz(branch_stub.target0.address)
-            end
-          end
-        end
-        branch_stub.compile.call(asm)
-      end
-
-      EndBlock
-    end
-
-    # @param jit [RubyVM::RJIT::JITState]
-    # @param ctx [RubyVM::RJIT::Context]
-    # @param asm [RubyVM::RJIT::Assembler]
-    def branchunless(jit, ctx, asm)
-      # Check for interrupts, but only on backward branches that may create loops
-      jump_offset = jit.operand(0, signed: true)
-      if jump_offset < 0
-        jit_check_ints(jit, ctx, asm)
-      end
-
-      # Get the branch target instruction offsets
-      next_pc = jit.pc + C.VALUE.size * jit.insn.len
-      jump_pc = jit.pc + C.VALUE.size * (jit.insn.len + jump_offset)
-
-      val_type = ctx.get_opnd_type(StackOpnd[0])
-      val_opnd = ctx.stack_pop(1)
-
-      if (result = val_type.known_truthy) != nil
-        target_pc = result ? next_pc : jump_pc
-        jit_direct_jump(jit.iseq, target_pc, ctx, asm)
-      else
-        # This `test` sets ZF only for Qnil and Qfalse, which let jz jump.
-        asm.test(val_opnd, ~Qnil)
-
-        # Set stubs
-        branch_stub = BranchStub.new(
-          iseq: jit.iseq,
-          shape: Default,
-          target0: BranchTarget.new(ctx:, pc: jump_pc), # branch target
-          target1: BranchTarget.new(ctx:, pc: next_pc), # fallthrough
-        )
-        branch_stub.target0.address = Assembler.new.then do |ocb_asm|
-          @exit_compiler.compile_branch_stub(ctx, ocb_asm, branch_stub, true)
-          @ocb.write(ocb_asm)
-        end
-        branch_stub.target1.address = Assembler.new.then do |ocb_asm|
-          @exit_compiler.compile_branch_stub(ctx, ocb_asm, branch_stub, false)
-          @ocb.write(ocb_asm)
-        end
-
-        # Jump to target0 on jz
-        branch_stub.compile = proc do |branch_asm|
-          branch_asm.comment("branchunless #{branch_stub.shape}")
-          branch_asm.stub(branch_stub) do
-            case branch_stub.shape
-            in Default
-              branch_asm.jz(branch_stub.target0.address)
-              branch_asm.jmp(branch_stub.target1.address)
-            in Next0
-              branch_asm.jnz(branch_stub.target1.address)
-            in Next1
-              branch_asm.jz(branch_stub.target0.address)
-            end
-          end
-        end
-        branch_stub.compile.call(asm)
-      end
-
-      EndBlock
-    end
-
-    # @param jit [RubyVM::RJIT::JITState]
-    # @param ctx [RubyVM::RJIT::Context]
-    # @param asm [RubyVM::RJIT::Assembler]
-    def branchnil(jit, ctx, asm)
-      # Check for interrupts, but only on backward branches that may create loops
-      jump_offset = jit.operand(0, signed: true)
-      if jump_offset < 0
-        jit_check_ints(jit, ctx, asm)
-      end
-
-      # Get the branch target instruction offsets
-      next_pc = jit.pc + C.VALUE.size * jit.insn.len
-      jump_pc = jit.pc + C.VALUE.size * (jit.insn.len + jump_offset)
-
-      val_type = ctx.get_opnd_type(StackOpnd[0])
-      val_opnd = ctx.stack_pop(1)
-
-      if (result = val_type.known_nil) != nil
-        target_pc = result ? jump_pc : next_pc
-        jit_direct_jump(jit.iseq, target_pc, ctx, asm)
-      else
-        asm.cmp(val_opnd, Qnil)
-
-        # Set stubs
-        branch_stub = BranchStub.new(
-          iseq: jit.iseq,
-          shape: Default,
-          target0: BranchTarget.new(ctx:, pc: jump_pc), # branch target
-          target1: BranchTarget.new(ctx:, pc: next_pc), # fallthrough
-        )
-        branch_stub.target0.address = Assembler.new.then do |ocb_asm|
-          @exit_compiler.compile_branch_stub(ctx, ocb_asm, branch_stub, true)
-          @ocb.write(ocb_asm)
-        end
-        branch_stub.target1.address = Assembler.new.then do |ocb_asm|
-          @exit_compiler.compile_branch_stub(ctx, ocb_asm, branch_stub, false)
-          @ocb.write(ocb_asm)
-        end
-
-        # Jump to target0 on je
-        branch_stub.compile = proc do |branch_asm|
-          branch_asm.comment("branchnil #{branch_stub.shape}")
-          branch_asm.stub(branch_stub) do
-            case branch_stub.shape
-            in Default
-              branch_asm.je(branch_stub.target0.address)
-              branch_asm.jmp(branch_stub.target1.address)
-            in Next0
-              branch_asm.jne(branch_stub.target1.address)
-            in Next1
-              branch_asm.je(branch_stub.target0.address)
-            end
-          end
-        end
-        branch_stub.compile.call(asm)
-      end
-
-      EndBlock
-    end
-
-    # once
-
-    # @param jit [RubyVM::RJIT::JITState]
-    # @param ctx [RubyVM::RJIT::Context]
-    # @param asm [RubyVM::RJIT::Assembler]
-    def opt_case_dispatch(jit, ctx, asm)
-      # Normally this instruction would lookup the key in a hash and jump to an
-      # offset based on that.
-      # Instead we can take the fallback case and continue with the next
-      # instruction.
-      # We'd hope that our jitted code will be sufficiently fast without the
-      # hash lookup, at least for small hashes, but it's worth revisiting this
-      # assumption in the future.
-      unless jit.at_current_insn?
-        defer_compilation(jit, ctx, asm)
-        return EndBlock
-      end
-      starting_context = ctx.dup
-
-      case_hash = jit.operand(0, ruby: true)
-      else_offset = jit.operand(1)
-
-      # Try to reorder case/else branches so that ones that are actually used come first.
-      # Supporting only Fixnum for now so that the implementation can be an equality check.
-      key_opnd = ctx.stack_pop(1)
-      comptime_key = jit.peek_at_stack(0)
-
-      # Check that all cases are fixnums to avoid having to register BOP assumptions on
-      # all the types that case hashes support. This spends compile time to save memory.
-      if fixnum?(comptime_key) && comptime_key <= 2**32 && C.rb_hash_keys(case_hash).all? { |key| fixnum?(key) }
-        unless Invariants.assume_bop_not_redefined(jit, C::INTEGER_REDEFINED_OP_FLAG, C::BOP_EQQ)
-          return CantCompile
-        end
-
-        # Check if the key is the same value
-        asm.cmp(key_opnd, comptime_key)
-        side_exit = side_exit(jit, starting_context)
-        jit_chain_guard(:jne, jit, starting_context, asm, side_exit)
-
-        # Get the offset for the compile-time key
-        offset = C.rb_hash_stlike_lookup(case_hash, comptime_key)
-        # NOTE: If we hit the else branch with various values, it could negatively impact the performance.
-        jump_offset = offset || else_offset
-
-        # Jump to the offset of case or else
-        target_pc = jit.pc + (jit.insn.len + jump_offset) * C.VALUE.size
-        jit_direct_jump(jit.iseq, target_pc, ctx, asm)
-        EndBlock
-      else
-        KeepCompiling # continue with === branches
-      end
-    end
-
-    # @param jit [RubyVM::RJIT::JITState]
-    # @param ctx [RubyVM::RJIT::Context]
-    # @param asm [RubyVM::RJIT::Assembler]
-    def opt_plus(jit, ctx, asm)
-      unless jit.at_current_insn?
-        defer_compilation(jit, ctx, asm)
-        return EndBlock
-      end
-
-      comptime_recv = jit.peek_at_stack(1)
-      comptime_obj  = jit.peek_at_stack(0)
-
-      if fixnum?(comptime_recv) && fixnum?(comptime_obj)
-        unless Invariants.assume_bop_not_redefined(jit, C::INTEGER_REDEFINED_OP_FLAG, C::BOP_PLUS)
-          return CantCompile
-        end
-
-        # Check that both operands are fixnums
-        guard_two_fixnums(jit, ctx, asm)
-
-        obj_opnd  = ctx.stack_pop
-        recv_opnd = ctx.stack_pop
-
-        asm.mov(:rax, recv_opnd)
-        asm.sub(:rax, 1) # untag
-        asm.mov(:rcx, obj_opnd)
-        asm.add(:rax, :rcx)
-        asm.jo(side_exit(jit, ctx))
-
-        dst_opnd = ctx.stack_push(Type::Fixnum)
-        asm.mov(dst_opnd, :rax)
-
-        KeepCompiling
-      else
-        opt_send_without_block(jit, ctx, asm)
-      end
-    end
-
-    # @param jit [RubyVM::RJIT::JITState]
-    # @param ctx [RubyVM::RJIT::Context]
-    # @param asm [RubyVM::RJIT::Assembler]
-    def opt_minus(jit, ctx, asm)
-      unless jit.at_current_insn?
-        defer_compilation(jit, ctx, asm)
-        return EndBlock
-      end
-
-      comptime_recv = jit.peek_at_stack(1)
-      comptime_obj  = jit.peek_at_stack(0)
-
-      if fixnum?(comptime_recv) && fixnum?(comptime_obj)
-        unless Invariants.assume_bop_not_redefined(jit, C::INTEGER_REDEFINED_OP_FLAG, C::BOP_MINUS)
-          return CantCompile
-        end
-
-        # Check that both operands are fixnums
-        guard_two_fixnums(jit, ctx, asm)
-
-        obj_opnd  = ctx.stack_pop
-        recv_opnd = ctx.stack_pop
-
-        asm.mov(:rax, recv_opnd)
-        asm.mov(:rcx, obj_opnd)
-        asm.sub(:rax, :rcx)
-        asm.jo(side_exit(jit, ctx))
-        asm.add(:rax, 1) # re-tag
-
-        dst_opnd = ctx.stack_push(Type::Fixnum)
-        asm.mov(dst_opnd, :rax)
-
-        KeepCompiling
-      else
-        opt_send_without_block(jit, ctx, asm)
-      end
-    end
-
-    # @param jit [RubyVM::RJIT::JITState]
-    # @param ctx [RubyVM::RJIT::Context]
-    # @param asm [RubyVM::RJIT::Assembler]
-    def opt_mult(jit, ctx, asm)
-      opt_send_without_block(jit, ctx, asm)
-    end
-
-    # @param jit [RubyVM::RJIT::JITState]
-    # @param ctx [RubyVM::RJIT::Context]
-    # @param asm [RubyVM::RJIT::Assembler]
-    def opt_div(jit, ctx, asm)
-      opt_send_without_block(jit, ctx, asm)
-    end
-
-    # @param jit [RubyVM::RJIT::JITState]
-    # @param ctx [RubyVM::RJIT::Context]
-    # @param asm [RubyVM::RJIT::Assembler]
-    def opt_mod(jit, ctx, asm)
-      unless jit.at_current_insn?
-        defer_compilation(jit, ctx, asm)
-        return EndBlock
-      end
-
-      if two_fixnums_on_stack?(jit)
-        unless Invariants.assume_bop_not_redefined(jit, C::INTEGER_REDEFINED_OP_FLAG, C::BOP_MOD)
-          return CantCompile
-        end
-
-        # Check that both operands are fixnums
-        guard_two_fixnums(jit, ctx, asm)
-
-        # Get the operands and destination from the stack
-        arg1 = ctx.stack_pop(1)
-        arg0 = ctx.stack_pop(1)
-
-        # Check for arg0 % 0
-        asm.cmp(arg1, 0)
-        asm.je(side_exit(jit, ctx))
-
-        # Call rb_fix_mod_fix(VALUE recv, VALUE obj)
-        asm.mov(C_ARGS[0], arg0)
-        asm.mov(C_ARGS[1], arg1)
-        asm.call(C.rb_fix_mod_fix)
-
-        # Push the return value onto the stack
-        stack_ret = ctx.stack_push(Type::Fixnum)
-        asm.mov(stack_ret, C_RET)
-
-        KeepCompiling
-      else
-        opt_send_without_block(jit, ctx, asm)
-      end
-    end
-
-    # @param jit [RubyVM::RJIT::JITState]
-    # @param ctx [RubyVM::RJIT::Context]
-    # @param asm [RubyVM::RJIT::Assembler]
-    def opt_eq(jit, ctx, asm)
-      unless jit.at_current_insn?
-        defer_compilation(jit, ctx, asm)
-        return EndBlock
-      end
-
-      if jit_equality_specialized(jit, ctx, asm, true)
-        jump_to_next_insn(jit, ctx, asm)
-        EndBlock
-      else
-        opt_send_without_block(jit, ctx, asm)
-      end
-    end
-
-    # @param jit [RubyVM::RJIT::JITState]
-    # @param ctx [RubyVM::RJIT::Context]
-    # @param asm [RubyVM::RJIT::Assembler]
-    def opt_neq(jit, ctx, asm)
-      # opt_neq is passed two rb_call_data as arguments:
-      # first for ==, second for !=
-      neq_cd = C.rb_call_data.new(jit.operand(1))
-      opt_send_without_block(jit, ctx, asm, cd: neq_cd)
-    end
-
-    # @param jit [RubyVM::RJIT::JITState]
-    # @param ctx [RubyVM::RJIT::Context]
-    # @param asm [RubyVM::RJIT::Assembler]
-    def opt_lt(jit, ctx, asm)
-      jit_fixnum_cmp(jit, ctx, asm, opcode: :cmovl, bop: C::BOP_LT)
-    end
-
-    # @param jit [RubyVM::RJIT::JITState]
-    # @param ctx [RubyVM::RJIT::Context]
-    # @param asm [RubyVM::RJIT::Assembler]
-    def opt_le(jit, ctx, asm)
-      jit_fixnum_cmp(jit, ctx, asm, opcode: :cmovle, bop: C::BOP_LE)
-    end
-
-    # @param jit [RubyVM::RJIT::JITState]
-    # @param ctx [RubyVM::RJIT::Context]
-    # @param asm [RubyVM::RJIT::Assembler]
-    def opt_gt(jit, ctx, asm)
-      jit_fixnum_cmp(jit, ctx, asm, opcode: :cmovg, bop: C::BOP_GT)
-    end
-
-    # @param jit [RubyVM::RJIT::JITState]
-    # @param ctx [RubyVM::RJIT::Context]
-    # @param asm [RubyVM::RJIT::Assembler]
-    def opt_ge(jit, ctx, asm)
-      jit_fixnum_cmp(jit, ctx, asm, opcode: :cmovge, bop: C::BOP_GE)
-    end
-
-    # @param jit [RubyVM::RJIT::JITState]
-    # @param ctx [RubyVM::RJIT::Context]
-    # @param asm [RubyVM::RJIT::Assembler]
-    def opt_ltlt(jit, ctx, asm)
-      opt_send_without_block(jit, ctx, asm)
-    end
-
-    # @param jit [RubyVM::RJIT::JITState]
-    # @param ctx [RubyVM::RJIT::Context]
-    # @param asm [RubyVM::RJIT::Assembler]
-    def opt_and(jit, ctx, asm)
-      unless jit.at_current_insn?
-        defer_compilation(jit, ctx, asm)
-        return EndBlock
-      end
-
-      if two_fixnums_on_stack?(jit)
-        unless Invariants.assume_bop_not_redefined(jit, C::INTEGER_REDEFINED_OP_FLAG, C::BOP_AND)
-          return CantCompile
-        end
-
-        # Check that both operands are fixnums
-        guard_two_fixnums(jit, ctx, asm)
-
-        # Get the operands and destination from the stack
-        arg1 = ctx.stack_pop(1)
-        arg0 = ctx.stack_pop(1)
-
-        asm.comment('bitwise and')
-        asm.mov(:rax, arg0)
-        asm.and(:rax, arg1)
-
-        # Push the return value onto the stack
-        dst = ctx.stack_push(Type::Fixnum)
-        asm.mov(dst, :rax)
-
-        KeepCompiling
-      else
-        opt_send_without_block(jit, ctx, asm)
-      end
-    end
-
-    # @param jit [RubyVM::RJIT::JITState]
-    # @param ctx [RubyVM::RJIT::Context]
-    # @param asm [RubyVM::RJIT::Assembler]
-    def opt_or(jit, ctx, asm)
-      unless jit.at_current_insn?
-        defer_compilation(jit, ctx, asm)
-        return EndBlock
-      end
-
-      if two_fixnums_on_stack?(jit)
-        unless Invariants.assume_bop_not_redefined(jit, C::INTEGER_REDEFINED_OP_FLAG, C::BOP_OR)
-          return CantCompile
-        end
-
-        # Check that both operands are fixnums
-        guard_two_fixnums(jit, ctx, asm)
-
-        # Get the operands and destination from the stack
-        asm.comment('bitwise or')
-        arg1 = ctx.stack_pop(1)
-        arg0 = ctx.stack_pop(1)
-
-        # Do the bitwise or arg0 | arg1
-        asm.mov(:rax, arg0)
-        asm.or(:rax, arg1)
-
-        # Push the return value onto the stack
-        dst = ctx.stack_push(Type::Fixnum)
-        asm.mov(dst, :rax)
-
-        KeepCompiling
-      else
-        opt_send_without_block(jit, ctx, asm)
-      end
-    end
-
-    # @param jit [RubyVM::RJIT::JITState]
-    # @param ctx [RubyVM::RJIT::Context]
-    # @param asm [RubyVM::RJIT::Assembler]
-    def opt_aref(jit, ctx, asm)
-      cd = C.rb_call_data.new(jit.operand(0))
-      argc = C.vm_ci_argc(cd.ci)
-
-      if argc != 1
-        asm.incr_counter(:optaref_argc_not_one)
-        return CantCompile
-      end
-
-      unless jit.at_current_insn?
-        defer_compilation(jit, ctx, asm)
-        return EndBlock
-      end
-
-      comptime_recv = jit.peek_at_stack(1)
-      comptime_obj  = jit.peek_at_stack(0)
-
-      side_exit = side_exit(jit, ctx)
-
-      if C.rb_class_of(comptime_recv) == Array && fixnum?(comptime_obj)
-        unless Invariants.assume_bop_not_redefined(jit, C::ARRAY_REDEFINED_OP_FLAG, C::BOP_AREF)
-          return CantCompile
-        end
-
-        idx_opnd = ctx.stack_opnd(0)
-        recv_opnd = ctx.stack_opnd(1)
-
-        not_array_exit = counted_exit(side_exit, :optaref_recv_not_array)
-        jit_guard_known_klass(jit, ctx, asm, C.rb_class_of(comptime_recv), recv_opnd, StackOpnd[1], comptime_recv, not_array_exit)
-
-        # Bail if idx is not a FIXNUM
-        asm.mov(:rax, idx_opnd)
-        asm.test(:rax, C::RUBY_FIXNUM_FLAG)
-        asm.jz(counted_exit(side_exit, :optaref_arg_not_fixnum))
-
-        # Call VALUE rb_ary_entry_internal(VALUE ary, long offset).
-        # It never raises or allocates, so we don't need to write to cfp->pc.
-        asm.sar(:rax, 1) # Convert fixnum to int
-        asm.mov(C_ARGS[0], recv_opnd)
-        asm.mov(C_ARGS[1], :rax)
-        asm.call(C.rb_ary_entry_internal)
-
-        # Pop the argument and the receiver
-        ctx.stack_pop(2)
-
-        # Push the return value onto the stack
-        stack_ret = ctx.stack_push(Type::Unknown)
-        asm.mov(stack_ret, C_RET)
-
-        # Let guard chains share the same successor
-        jump_to_next_insn(jit, ctx, asm)
-        EndBlock
-      elsif C.rb_class_of(comptime_recv) == Hash
-        unless Invariants.assume_bop_not_redefined(jit, C::HASH_REDEFINED_OP_FLAG, C::BOP_AREF)
-          return CantCompile
-        end
-
-        recv_opnd = ctx.stack_opnd(1)
-
-        # Guard that the receiver is a Hash
-        not_hash_exit = counted_exit(side_exit, :optaref_recv_not_hash)
-        jit_guard_known_klass(jit, ctx, asm, C.rb_class_of(comptime_recv), recv_opnd, StackOpnd[1], comptime_recv, not_hash_exit)
-
-        # Prepare to call rb_hash_aref(). It might call #hash on the key.
-        jit_prepare_routine_call(jit, ctx, asm)
-
-        asm.comment('call rb_hash_aref')
-        key_opnd = ctx.stack_opnd(0)
-        recv_opnd = ctx.stack_opnd(1)
-        asm.mov(:rdi, recv_opnd)
-        asm.mov(:rsi, key_opnd)
-        asm.call(C.rb_hash_aref)
-
-        # Pop the key and the receiver
-        ctx.stack_pop(2)
-
-        stack_ret = ctx.stack_push(Type::Unknown)
-        asm.mov(stack_ret, C_RET)
-
-        # Let guard chains share the same successor
-        jump_to_next_insn(jit, ctx, asm)
-        EndBlock
-      else
-        opt_send_without_block(jit, ctx, asm)
-      end
-    end
-
-    # @param jit [RubyVM::RJIT::JITState]
-    # @param ctx [RubyVM::RJIT::Context]
-    # @param asm [RubyVM::RJIT::Assembler]
-    def opt_aset(jit, ctx, asm)
-      # Defer compilation so we can specialize on a runtime `self`
-      unless jit.at_current_insn?
-        defer_compilation(jit, ctx, asm)
-        return EndBlock
-      end
-
-      comptime_recv = jit.peek_at_stack(2)
-      comptime_key = jit.peek_at_stack(1)
-
-      # Get the operands from the stack
-      recv = ctx.stack_opnd(2)
-      key = ctx.stack_opnd(1)
-      _val = ctx.stack_opnd(0)
-
-      if C.rb_class_of(comptime_recv) == Array && fixnum?(comptime_key)
-        side_exit = side_exit(jit, ctx)
-
-        # Guard receiver is an Array
-        jit_guard_known_klass(jit, ctx, asm, C.rb_class_of(comptime_recv), recv, StackOpnd[2], comptime_recv, side_exit)
-
-        # Guard key is a fixnum
-        jit_guard_known_klass(jit, ctx, asm, C.rb_class_of(comptime_key), key, StackOpnd[1], comptime_key, side_exit)
-
-        # We might allocate or raise
-        jit_prepare_routine_call(jit, ctx, asm)
-
-        asm.comment('call rb_ary_store')
-        recv = ctx.stack_opnd(2)
-        key = ctx.stack_opnd(1)
-        val = ctx.stack_opnd(0)
-        asm.mov(:rax, key)
-        asm.sar(:rax, 1) # FIX2LONG(key)
-        asm.mov(C_ARGS[0], recv)
-        asm.mov(C_ARGS[1], :rax)
-        asm.mov(C_ARGS[2], val)
-        asm.call(C.rb_ary_store)
-
-        # rb_ary_store returns void
-        # stored value should still be on stack
-        val = ctx.stack_opnd(0)
-
-        # Push the return value onto the stack
-        ctx.stack_pop(3)
-        stack_ret = ctx.stack_push(Type::Unknown)
-        asm.mov(:rax, val)
-        asm.mov(stack_ret, :rax)
-
-        jump_to_next_insn(jit, ctx, asm)
-        EndBlock
-      elsif C.rb_class_of(comptime_recv) == Hash
-        side_exit = side_exit(jit, ctx)
-
-        # Guard receiver is a Hash
-        jit_guard_known_klass(jit, ctx, asm, C.rb_class_of(comptime_recv), recv, StackOpnd[2], comptime_recv, side_exit)
-
-        # We might allocate or raise
-        jit_prepare_routine_call(jit, ctx, asm)
-
-        # Call rb_hash_aset
-        recv = ctx.stack_opnd(2)
-        key = ctx.stack_opnd(1)
-        val = ctx.stack_opnd(0)
-        asm.mov(C_ARGS[0], recv)
-        asm.mov(C_ARGS[1], key)
-        asm.mov(C_ARGS[2], val)
-        asm.call(C.rb_hash_aset)
-
-        # Push the return value onto the stack
-        ctx.stack_pop(3)
-        stack_ret = ctx.stack_push(Type::Unknown)
-        asm.mov(stack_ret, C_RET)
-
-        jump_to_next_insn(jit, ctx, asm)
-        EndBlock
-      else
-        opt_send_without_block(jit, ctx, asm)
-      end
-    end
-
-    # opt_aset_with
-    # opt_aref_with
-
-    # @param jit [RubyVM::RJIT::JITState]
-    # @param ctx [RubyVM::RJIT::Context]
-    # @param asm [RubyVM::RJIT::Assembler]
-    def opt_length(jit, ctx, asm)
-      opt_send_without_block(jit, ctx, asm)
-    end
-
-    # @param jit [RubyVM::RJIT::JITState]
-    # @param ctx [RubyVM::RJIT::Context]
-    # @param asm [RubyVM::RJIT::Assembler]
-    def opt_size(jit, ctx, asm)
-      opt_send_without_block(jit, ctx, asm)
-    end
-
-    # @param jit [RubyVM::RJIT::JITState]
-    # @param ctx [RubyVM::RJIT::Context]
-    # @param asm [RubyVM::RJIT::Assembler]
-    def opt_empty_p(jit, ctx, asm)
-      opt_send_without_block(jit, ctx, asm)
-    end
-
-    # @param jit [RubyVM::RJIT::JITState]
-    # @param ctx [RubyVM::RJIT::Context]
-    # @param asm [RubyVM::RJIT::Assembler]
-    def opt_succ(jit, ctx, asm)
-      opt_send_without_block(jit, ctx, asm)
-    end
-
-    # @param jit [RubyVM::RJIT::JITState]
-    # @param ctx [RubyVM::RJIT::Context]
-    # @param asm [RubyVM::RJIT::Assembler]
-    def opt_not(jit, ctx, asm)
-      opt_send_without_block(jit, ctx, asm)
-    end
-
-    # @param jit [RubyVM::RJIT::JITState]
-    # @param ctx [RubyVM::RJIT::Context]
-    # @param asm [RubyVM::RJIT::Assembler]
-    def opt_regexpmatch2(jit, ctx, asm)
-      opt_send_without_block(jit, ctx, asm)
-    end
-
-    # invokebuiltin
-
-    # @param jit [RubyVM::RJIT::JITState]
-    # @param ctx [RubyVM::RJIT::Context]
-    # @param asm [RubyVM::RJIT::Assembler]
-    def opt_invokebuiltin_delegate(jit, ctx, asm)
-      bf = C.rb_builtin_function.new(jit.operand(0))
-      bf_argc = bf.argc
-      start_index = jit.operand(1)
-
-      # ec, self, and arguments
-      if bf_argc + 2 > C_ARGS.size
-        return CantCompile
-      end
-
-      # If the calls don't allocate, do they need up to date PC, SP?
-      jit_prepare_routine_call(jit, ctx, asm)
-
-      # Call the builtin func (ec, recv, arg1, arg2, ...)
-      asm.comment('call builtin func')
-      asm.mov(C_ARGS[0], EC)
-      asm.mov(C_ARGS[1], [CFP, C.rb_control_frame_t.offsetof(:self)])
-
-      # Copy arguments from locals
-      if bf_argc > 0
-        # Load environment pointer EP from CFP
-        asm.mov(:rax, [CFP, C.rb_control_frame_t.offsetof(:ep)])
-
-        bf_argc.times do |i|
-          table_size = jit.iseq.body.local_table_size
-          offs = -table_size - C::VM_ENV_DATA_SIZE + 1 + start_index + i
-          asm.mov(C_ARGS[2 + i], [:rax, offs * C.VALUE.size])
-        end
-      end
-      asm.call(bf.func_ptr)
-
-      # Push the return value
-      stack_ret = ctx.stack_push(Type::Unknown)
-      asm.mov(stack_ret, C_RET)
-
-      KeepCompiling
-    end
-
-    # @param jit [RubyVM::RJIT::JITState]
-    # @param ctx [RubyVM::RJIT::Context]
-    # @param asm [RubyVM::RJIT::Assembler]
-    def opt_invokebuiltin_delegate_leave(jit, ctx, asm)
-      opt_invokebuiltin_delegate(jit, ctx, asm)
-      # opt_invokebuiltin_delegate is always followed by leave insn
-    end
-
-    # @param jit [RubyVM::RJIT::JITState]
-    # @param ctx [RubyVM::RJIT::Context]
-    # @param asm [RubyVM::RJIT::Assembler]
-    def putobject_INT2FIX_0_(jit, ctx, asm)
-      putobject(jit, ctx, asm, val: C.to_value(0))
-    end
-
-    # @param jit [RubyVM::RJIT::JITState]
-    # @param ctx [RubyVM::RJIT::Context]
-    # @param asm [RubyVM::RJIT::Assembler]
-    def putobject_INT2FIX_1_(jit, ctx, asm)
-      putobject(jit, ctx, asm, val: C.to_value(1))
-    end
-
-    #
-    # C func
-    #
-
-    # @param jit [RubyVM::RJIT::JITState]
-    # @param ctx [RubyVM::RJIT::Context]
-    # @param asm [RubyVM::RJIT::Assembler]
-    def jit_rb_true(jit, ctx, asm, argc, _known_recv_class)
-      return false if argc != 0
-      asm.comment('nil? == true')
-      ctx.stack_pop(1)
-      stack_ret = ctx.stack_push(Type::True)
-      asm.mov(stack_ret, Qtrue)
-      true
-    end
-
-    # @param jit [RubyVM::RJIT::JITState]
-    # @param ctx [RubyVM::RJIT::Context]
-    # @param asm [RubyVM::RJIT::Assembler]
-    def jit_rb_false(jit, ctx, asm, argc, _known_recv_class)
-      return false if argc != 0
-      asm.comment('nil? == false')
-      ctx.stack_pop(1)
-      stack_ret = ctx.stack_push(Type::False)
-      asm.mov(stack_ret, Qfalse)
-      true
-    end
-
-    # @param jit [RubyVM::RJIT::JITState]
-    # @param ctx [RubyVM::RJIT::Context]
-    # @param asm [RubyVM::RJIT::Assembler]
-    def jit_rb_kernel_is_a(jit, ctx, asm, argc, known_recv_class)
-      if argc != 1
-        return false
-      end
-
-      # If this is a super call we might not know the class
-      if known_recv_class.nil?
-        return false
-      end
-
-      # Important note: The output code will simply `return true/false`.
-      # Correctness follows from:
-      #  - `known_recv_class` implies there is a guard scheduled before here
-      #    for a particular `CLASS_OF(lhs)`.
-      #  - We guard that rhs is identical to the compile-time sample
-      #  - In general, for any two Class instances A, B, `A < B` does not change at runtime.
-      #    Class#superclass is stable.
-
-      sample_rhs = jit.peek_at_stack(0)
-      sample_lhs = jit.peek_at_stack(1)
-
-      # We are not allowing module here because the module hierachy can change at runtime.
-      if C.RB_TYPE_P(sample_rhs, C::RUBY_T_CLASS)
-        return false
-      end
-      sample_is_a = C.obj_is_kind_of(sample_lhs, sample_rhs)
-
-      side_exit = side_exit(jit, ctx)
-      asm.comment('Kernel#is_a?')
-      asm.mov(:rax, to_value(sample_rhs))
-      asm.cmp(ctx.stack_opnd(0), :rax)
-      asm.jne(counted_exit(side_exit, :send_is_a_class_mismatch))
-
-      ctx.stack_pop(2)
-
-      if sample_is_a
-        stack_ret = ctx.stack_push(Type::True)
-        asm.mov(stack_ret, Qtrue)
-      else
-        stack_ret = ctx.stack_push(Type::False)
-        asm.mov(stack_ret, Qfalse)
-      end
-      return true
-    end
-
-    # @param jit [RubyVM::RJIT::JITState]
-    # @param ctx [RubyVM::RJIT::Context]
-    # @param asm [RubyVM::RJIT::Assembler]
-    def jit_rb_kernel_instance_of(jit, ctx, asm, argc, known_recv_class)
-      if argc != 1
-        return false
-      end
-
-      # If this is a super call we might not know the class
-      if known_recv_class.nil?
-        return false
-      end
-
-      # Important note: The output code will simply `return true/false`.
-      # Correctness follows from:
-      #  - `known_recv_class` implies there is a guard scheduled before here
-      #    for a particular `CLASS_OF(lhs)`.
-      #  - We guard that rhs is identical to the compile-time sample
-      #  - For a particular `CLASS_OF(lhs)`, `rb_obj_class(lhs)` does not change.
-      #    (because for any singleton class `s`, `s.superclass.equal?(s.attached_object.class)`)
-
-      sample_rhs = jit.peek_at_stack(0)
-      sample_lhs = jit.peek_at_stack(1)
-
-      # Filters out cases where the C implementation raises
-      unless C.RB_TYPE_P(sample_rhs, C::RUBY_T_CLASS) || C.RB_TYPE_P(sample_rhs, C::RUBY_T_MODULE)
-        return false
-      end
-
-      # We need to grab the class here to deal with singleton classes.
-      # Instance of grabs the "real class" of the object rather than the
-      # singleton class.
-      sample_lhs_real_class = C.rb_obj_class(sample_lhs)
-
-      sample_instance_of = (sample_lhs_real_class == sample_rhs)
-
-      side_exit = side_exit(jit, ctx)
-      asm.comment('Kernel#instance_of?')
-      asm.mov(:rax, to_value(sample_rhs))
-      asm.cmp(ctx.stack_opnd(0), :rax)
-      asm.jne(counted_exit(side_exit, :send_instance_of_class_mismatch))
-
-      ctx.stack_pop(2)
-
-      if sample_instance_of
-        stack_ret = ctx.stack_push(Type::True)
-        asm.mov(stack_ret, Qtrue)
-      else
-        stack_ret = ctx.stack_push(Type::False)
-        asm.mov(stack_ret, Qfalse)
-      end
-      return true;
-    end
-
-    # @param jit [RubyVM::RJIT::JITState]
-    # @param ctx [RubyVM::RJIT::Context]
-    # @param asm [RubyVM::RJIT::Assembler]
-    def jit_rb_obj_not(jit, ctx, asm, argc, _known_recv_class)
-      return false if argc != 0
-      recv_type = ctx.get_opnd_type(StackOpnd[0])
-
-      case recv_type.known_truthy
-      in false
-        asm.comment('rb_obj_not(nil_or_false)')
-        ctx.stack_pop(1)
-        out_opnd = ctx.stack_push(Type::True)
-        asm.mov(out_opnd, Qtrue)
-      in true
-        # Note: recv_type != Type::Nil && recv_type != Type::False.
-        asm.comment('rb_obj_not(truthy)')
-        ctx.stack_pop(1)
-        out_opnd = ctx.stack_push(Type::False)
-        asm.mov(out_opnd, Qfalse)
-      in nil
-        asm.comment('rb_obj_not')
-
-        recv = ctx.stack_pop
-        # This `test` sets ZF only for Qnil and Qfalse, which let cmovz set.
-        asm.test(recv, ~Qnil)
-        asm.mov(:rax, Qfalse)
-        asm.mov(:rcx, Qtrue)
-        asm.cmovz(:rax, :rcx)
-
-        stack_ret = ctx.stack_push(Type::UnknownImm)
-        asm.mov(stack_ret, :rax)
-      end
-      true
-    end
-
-    # @param jit [RubyVM::RJIT::JITState]
-    # @param ctx [RubyVM::RJIT::Context]
-    # @param asm [RubyVM::RJIT::Assembler]
-    def jit_rb_obj_equal(jit, ctx, asm, argc, _known_recv_class)
-      return false if argc != 1
-      asm.comment('equal?')
-      obj1 = ctx.stack_pop(1)
-      obj2 = ctx.stack_pop(1)
-
-      asm.mov(:rax, obj1)
-      asm.mov(:rcx, obj2)
-      asm.cmp(:rax, :rcx)
-      asm.mov(:rax, Qfalse)
-      asm.mov(:rcx, Qtrue)
-      asm.cmove(:rax, :rcx)
-
-      stack_ret = ctx.stack_push(Type::UnknownImm)
-      asm.mov(stack_ret, :rax)
-      true
-    end
-
-    # @param jit [RubyVM::RJIT::JITState]
-    # @param ctx [RubyVM::RJIT::Context]
-    # @param asm [RubyVM::RJIT::Assembler]
-    def jit_rb_obj_not_equal(jit, ctx, asm, argc, _known_recv_class)
-      return false if argc != 1
-      jit_equality_specialized(jit, ctx, asm, false)
-    end
-
-    # @param jit [RubyVM::RJIT::JITState]
-    # @param ctx [RubyVM::RJIT::Context]
-    # @param asm [RubyVM::RJIT::Assembler]
-    def jit_rb_mod_eqq(jit, ctx, asm, argc, _known_recv_class)
-      return false if argc != 1
-
-      asm.comment('Module#===')
-      # By being here, we know that the receiver is a T_MODULE or a T_CLASS, because Module#=== can
-      # only live on these objects. With that, we can call rb_obj_is_kind_of() without
-      # jit_prepare_routine_call() or a control frame push because it can't raise, allocate, or call
-      # Ruby methods with these inputs.
-      # Note the difference in approach from Kernel#is_a? because we don't get a free guard for the
-      # right hand side.
-      lhs = ctx.stack_opnd(1) # the module
-      rhs = ctx.stack_opnd(0)
-      asm.mov(C_ARGS[0], rhs);
-      asm.mov(C_ARGS[1], lhs);
-      asm.call(C.rb_obj_is_kind_of)
-
-      # Return the result
-      ctx.stack_pop(2)
-      stack_ret = ctx.stack_push(Type::UnknownImm)
-      asm.mov(stack_ret, C_RET)
-
-      return true
-    end
-
-    # @param jit [RubyVM::RJIT::JITState]
-    # @param ctx [RubyVM::RJIT::Context]
-    # @param asm [RubyVM::RJIT::Assembler]
-    def jit_rb_int_equal(jit, ctx, asm, argc, _known_recv_class)
-      return false if argc != 1
-      return false unless two_fixnums_on_stack?(jit)
-
-      guard_two_fixnums(jit, ctx, asm)
-
-      # Compare the arguments
-      asm.comment('rb_int_equal')
-      arg1 = ctx.stack_pop(1)
-      arg0 = ctx.stack_pop(1)
-      asm.mov(:rax, arg1)
-      asm.cmp(arg0, :rax)
-      asm.mov(:rax, Qfalse)
-      asm.mov(:rcx, Qtrue)
-      asm.cmove(:rax, :rcx)
-
-      stack_ret = ctx.stack_push(Type::UnknownImm)
-      asm.mov(stack_ret, :rax)
-      true
-    end
-
-    # @param jit [RubyVM::RJIT::JITState]
-    # @param ctx [RubyVM::RJIT::Context]
-    # @param asm [RubyVM::RJIT::Assembler]
-    def jit_rb_int_mul(jit, ctx, asm, argc, _known_recv_class)
-      return false if argc != 1
-      return false unless two_fixnums_on_stack?(jit)
-
-      guard_two_fixnums(jit, ctx, asm)
-
-      asm.comment('rb_int_mul')
-      y_opnd = ctx.stack_pop
-      x_opnd = ctx.stack_pop
-      asm.mov(C_ARGS[0], x_opnd)
-      asm.mov(C_ARGS[1], y_opnd)
-      asm.call(C.rb_fix_mul_fix)
-
-      ret_opnd = ctx.stack_push(Type::Unknown)
-      asm.mov(ret_opnd, C_RET)
-      true
-    end
-
-    def jit_rb_int_div(jit, ctx, asm, argc, _known_recv_class)
-      return false if argc != 1
-      return false unless two_fixnums_on_stack?(jit)
-
-      guard_two_fixnums(jit, ctx, asm)
-
-      asm.comment('rb_int_div')
-      y_opnd = ctx.stack_pop
-      x_opnd = ctx.stack_pop
-      asm.mov(:rax, y_opnd)
-      asm.cmp(:rax, C.to_value(0))
-      asm.je(side_exit(jit, ctx))
-
-      asm.mov(C_ARGS[0], x_opnd)
-      asm.mov(C_ARGS[1], :rax)
-      asm.call(C.rb_fix_div_fix)
-
-      ret_opnd = ctx.stack_push(Type::Unknown)
-      asm.mov(ret_opnd, C_RET)
-      true
-    end
-
-    # @param jit [RubyVM::RJIT::JITState]
-    # @param ctx [RubyVM::RJIT::Context]
-    # @param asm [RubyVM::RJIT::Assembler]
-    def jit_rb_int_aref(jit, ctx, asm, argc, _known_recv_class)
-      return false if argc != 1
-      return false unless two_fixnums_on_stack?(jit)
-
-      guard_two_fixnums(jit, ctx, asm)
-
-      asm.comment('rb_int_aref')
-      y_opnd = ctx.stack_pop
-      x_opnd = ctx.stack_pop
-
-      asm.mov(C_ARGS[0], x_opnd)
-      asm.mov(C_ARGS[1], y_opnd)
-      asm.call(C.rb_fix_aref)
-
-      ret_opnd = ctx.stack_push(Type::UnknownImm)
-      asm.mov(ret_opnd, C_RET)
-      true
-    end
-
-    # @param jit [RubyVM::RJIT::JITState]
-    # @param ctx [RubyVM::RJIT::Context]
-    # @param asm [RubyVM::RJIT::Assembler]
-    def jit_rb_str_empty_p(jit, ctx, asm, argc, known_recv_class)
-      recv_opnd = ctx.stack_pop(1)
-      out_opnd = ctx.stack_push(Type::UnknownImm)
-
-      asm.comment('get string length')
-      asm.mov(:rax, recv_opnd)
-      str_len_opnd = [:rax, C.RString.offsetof(:len)]
-
-      asm.cmp(str_len_opnd, 0)
-      asm.mov(:rax, Qfalse)
-      asm.mov(:rcx, Qtrue)
-      asm.cmove(:rax, :rcx)
-      asm.mov(out_opnd, :rax)
-
-      return true
-    end
-
-    # @param jit [RubyVM::RJIT::JITState]
-    # @param ctx [RubyVM::RJIT::Context]
-    # @param asm [RubyVM::RJIT::Assembler]
-    def jit_rb_str_to_s(jit, ctx, asm, argc, known_recv_class)
-      return false if argc != 0
-      if known_recv_class == String
-        asm.comment('to_s on plain string')
-        # The method returns the receiver, which is already on the stack.
-        # No stack movement.
-        return true
-      end
-      false
-    end
-
-    # @param jit [RubyVM::RJIT::JITState]
-    # @param ctx [RubyVM::RJIT::Context]
-    # @param asm [RubyVM::RJIT::Assembler]
-    def jit_rb_str_bytesize(jit, ctx, asm, argc, known_recv_class)
-      asm.comment('String#bytesize')
-
-      recv = ctx.stack_pop(1)
-      asm.mov(C_ARGS[0], recv)
-      asm.call(C.rb_str_bytesize)
-
-      out_opnd = ctx.stack_push(Type::Fixnum)
-      asm.mov(out_opnd, C_RET)
-
-      true
-    end
-
-    # @param jit [RubyVM::RJIT::JITState]
-    # @param ctx [RubyVM::RJIT::Context]
-    # @param asm [RubyVM::RJIT::Assembler]
-    def jit_rb_str_concat(jit, ctx, asm, argc, known_recv_class)
-      # The << operator can accept integer codepoints for characters
-      # as the argument. We only specially optimise string arguments.
-      # If the peeked-at compile time argument is something other than
-      # a string, assume it won't be a string later either.
-      comptime_arg = jit.peek_at_stack(0)
-      unless C.RB_TYPE_P(comptime_arg, C::RUBY_T_STRING)
-        return false
-      end
-
-      # Guard that the concat argument is a string
-      asm.mov(:rax, ctx.stack_opnd(0))
-      guard_object_is_string(jit, ctx, asm, :rax, :rcx, StackOpnd[0])
-
-      # Guard buffers from GC since rb_str_buf_append may allocate. During the VM lock on GC,
-      # other Ractors may trigger global invalidation, so we need ctx.clear_local_types.
-      # PC is used on errors like Encoding::CompatibilityError raised by rb_str_buf_append.
-      jit_prepare_routine_call(jit, ctx, asm)
-
-      concat_arg = ctx.stack_pop(1)
-      recv = ctx.stack_pop(1)
-
-      # Test if string encodings differ. If different, use rb_str_append. If the same,
-      # use rb_yjit_str_simple_append, which calls rb_str_cat.
-      asm.comment('<< on strings')
-
-      # Take receiver's object flags XOR arg's flags. If any
-      # string-encoding flags are different between the two,
-      # the encodings don't match.
-      recv_reg = :rax
-      asm.mov(recv_reg, recv)
-      concat_arg_reg = :rcx
-      asm.mov(concat_arg_reg, concat_arg)
-      asm.mov(recv_reg, [recv_reg, C.RBasic.offsetof(:flags)])
-      asm.mov(concat_arg_reg, [concat_arg_reg, C.RBasic.offsetof(:flags)])
-      asm.xor(recv_reg, concat_arg_reg)
-      asm.test(recv_reg, C::RUBY_ENCODING_MASK)
-
-      # Push once, use the resulting operand in both branches below.
-      stack_ret = ctx.stack_push(Type::TString)
-
-      enc_mismatch = asm.new_label('enc_mismatch')
-      asm.jnz(enc_mismatch)
-
-      # If encodings match, call the simple append function and jump to return
-      asm.mov(C_ARGS[0], recv)
-      asm.mov(C_ARGS[1], concat_arg)
-      asm.call(C.rjit_str_simple_append)
-      ret_label = asm.new_label('func_return')
-      asm.mov(stack_ret, C_RET)
-      asm.jmp(ret_label)
-
-      # If encodings are different, use a slower encoding-aware concatenate
-      asm.write_label(enc_mismatch)
-      asm.mov(C_ARGS[0], recv)
-      asm.mov(C_ARGS[1], concat_arg)
-      asm.call(C.rb_str_buf_append)
-      asm.mov(stack_ret, C_RET)
-      # Drop through to return
-
-      asm.write_label(ret_label)
-
-      true
-    end
-
-    # @param jit [RubyVM::RJIT::JITState]
-    # @param ctx [RubyVM::RJIT::Context]
-    # @param asm [RubyVM::RJIT::Assembler]
-    def jit_rb_str_uplus(jit, ctx, asm, argc, _known_recv_class)
-      if argc != 0
-        return false
-      end
-
-      # We allocate when we dup the string
-      jit_prepare_routine_call(jit, ctx, asm)
-
-      asm.comment('Unary plus on string')
-      asm.mov(:rax, ctx.stack_pop(1)) # recv_opnd
-      asm.mov(:rcx, [:rax, C.RBasic.offsetof(:flags)]) # flags_opnd
-      asm.test(:rcx, C::RUBY_FL_FREEZE)
-
-      ret_label = asm.new_label('stack_ret')
-
-      # String#+@ can only exist on T_STRING
-      stack_ret = ctx.stack_push(Type::TString)
-
-      # If the string isn't frozen, we just return it.
-      asm.mov(stack_ret, :rax) # recv_opnd
-      asm.jz(ret_label)
-
-      # Str is frozen - duplicate it
-      asm.mov(C_ARGS[0], :rax) # recv_opnd
-      asm.call(C.rb_str_dup)
-      asm.mov(stack_ret, C_RET)
-
-      asm.write_label(ret_label)
-
-      true
-    end
-
-    # @param jit [RubyVM::RJIT::JITState]
-    # @param ctx [RubyVM::RJIT::Context]
-    # @param asm [RubyVM::RJIT::Assembler]
-    def jit_rb_str_getbyte(jit, ctx, asm, argc, _known_recv_class)
-      return false if argc != 1
-      asm.comment('rb_str_getbyte')
-
-      index_opnd = ctx.stack_pop
-      str_opnd = ctx.stack_pop
-      asm.mov(C_ARGS[0], str_opnd)
-      asm.mov(C_ARGS[1], index_opnd)
-      asm.call(C.rb_str_getbyte)
-
-      ret_opnd = ctx.stack_push(Type::Fixnum)
-      asm.mov(ret_opnd, C_RET)
-      true
-    end
-
-    # @param jit [RubyVM::RJIT::JITState]
-    # @param ctx [RubyVM::RJIT::Context]
-    # @param asm [RubyVM::RJIT::Assembler]
-    def jit_rb_ary_empty_p(jit, ctx, asm, argc, _known_recv_class)
-      array_reg = :rax
-      asm.mov(array_reg, ctx.stack_pop(1))
-      jit_array_len(asm, array_reg, :rcx)
-
-      asm.test(:rcx, :rcx)
-      asm.mov(:rax, Qfalse)
-      asm.mov(:rcx, Qtrue)
-      asm.cmovz(:rax, :rcx)
-
-      out_opnd = ctx.stack_push(Type::UnknownImm)
-      asm.mov(out_opnd, :rax)
-
-      return true
-    end
-
-    # @param jit [RubyVM::RJIT::JITState]
-    # @param ctx [RubyVM::RJIT::Context]
-    # @param asm [RubyVM::RJIT::Assembler]
-    def jit_rb_ary_push(jit, ctx, asm, argc, _known_recv_class)
-      return false if argc != 1
-      asm.comment('rb_ary_push')
-
-      jit_prepare_routine_call(jit, ctx, asm)
-
-      item_opnd = ctx.stack_pop
-      ary_opnd = ctx.stack_pop
-      asm.mov(C_ARGS[0], ary_opnd)
-      asm.mov(C_ARGS[1], item_opnd)
-      asm.call(C.rb_ary_push)
-
-      ret_opnd = ctx.stack_push(Type::TArray)
-      asm.mov(ret_opnd, C_RET)
-      true
-    end
-
-    # @param jit [RubyVM::RJIT::JITState]
-    # @param ctx [RubyVM::RJIT::Context]
-    # @param asm [RubyVM::RJIT::Assembler]
-    def jit_obj_respond_to(jit, ctx, asm, argc, known_recv_class)
-      # respond_to(:sym) or respond_to(:sym, true)
-      if argc != 1 && argc != 2
-        return false
-      end
-
-      if known_recv_class.nil?
-        return false
-      end
-
-      recv_class = known_recv_class
-
-      # Get the method_id from compile time. We will later add a guard against it.
-      mid_sym = jit.peek_at_stack(argc - 1)
-      unless static_symbol?(mid_sym)
-        return false
-      end
-      mid = C.rb_sym2id(mid_sym)
-
-      # This represents the value of the "include_all" argument and whether it's known
-      allow_priv = if argc == 1
-        # Default is false
-        false
-      else
-        # Get value from type information (may or may not be known)
-        ctx.get_opnd_type(StackOpnd[0]).known_truthy
-      end
-
-      target_cme = C.rb_callable_method_entry_or_negative(recv_class, mid)
-
-      # Should never be null, as in that case we will be returned a "negative CME"
-      assert_equal(false, target_cme.nil?)
-
-      cme_def_type = C.UNDEFINED_METHOD_ENTRY_P(target_cme) ? C::VM_METHOD_TYPE_UNDEF : target_cme.def.type
-
-      if cme_def_type == C::VM_METHOD_TYPE_REFINED
-        return false
-      end
-
-      visibility = if cme_def_type == C::VM_METHOD_TYPE_UNDEF
-        C::METHOD_VISI_UNDEF
-      else
-        C.METHOD_ENTRY_VISI(target_cme)
-      end
-
-      result =
-        case [visibility, allow_priv]
-        in C::METHOD_VISI_UNDEF, _ then Qfalse # No method => false
-        in C::METHOD_VISI_PUBLIC, _ then Qtrue # Public method => true regardless of include_all
-        in _, true then Qtrue # include_all => always true
-        else return false # not public and include_all not known, can't compile
-        end
-
-      if result != Qtrue
-        # Only if respond_to_missing? hasn't been overridden
-        # In the future, we might want to jit the call to respond_to_missing?
-        unless Invariants.assume_method_basic_definition(jit, recv_class, C.idRespond_to_missing)
-          return false
-        end
-      end
-
-      # Invalidate this block if method lookup changes for the method being queried. This works
-      # both for the case where a method does or does not exist, as for the latter we asked for a
-      # "negative CME" earlier.
-      Invariants.assume_method_lookup_stable(jit, target_cme)
-
-      # Generate a side exit
-      side_exit = side_exit(jit, ctx)
-
-      if argc == 2
-        # pop include_all argument (we only use its type info)
-        ctx.stack_pop(1)
-      end
-
-      sym_opnd = ctx.stack_pop(1)
-      _recv_opnd = ctx.stack_pop(1)
-
-      # This is necessary because we have no guarantee that sym_opnd is a constant
-      asm.comment('guard known mid')
-      asm.mov(:rax, to_value(mid_sym))
-      asm.cmp(sym_opnd, :rax)
-      asm.jne(side_exit)
-
-      putobject(jit, ctx, asm, val: result)
-
-      true
-    end
-
-    # @param jit [RubyVM::RJIT::JITState]
-    # @param ctx [RubyVM::RJIT::Context]
-    # @param asm [RubyVM::RJIT::Assembler]
-    def jit_rb_f_block_given_p(jit, ctx, asm, argc, _known_recv_class)
-      asm.comment('block_given?')
-
-      # Same as rb_vm_frame_block_handler
-      jit_get_lep(jit, asm, reg: :rax)
-      asm.mov(:rax, [:rax, C.VALUE.size * C::VM_ENV_DATA_INDEX_SPECVAL]) # block_handler
-
-      ctx.stack_pop(1)
-      out_opnd = ctx.stack_push(Type::UnknownImm)
-
-      # Return `block_handler != VM_BLOCK_HANDLER_NONE`
-      asm.cmp(:rax, C::VM_BLOCK_HANDLER_NONE)
-      asm.mov(:rax, Qfalse)
-      asm.mov(:rcx, Qtrue)
-      asm.cmovne(:rax, :rcx) # block_given
-      asm.mov(out_opnd, :rax)
-
-      true
-    end
-
-    # @param jit [RubyVM::RJIT::JITState]
-    # @param ctx [RubyVM::RJIT::Context]
-    # @param asm [RubyVM::RJIT::Assembler]
-    def jit_thread_s_current(jit, ctx, asm, argc, _known_recv_class)
-      return false if argc != 0
-      asm.comment('Thread.current')
-      ctx.stack_pop(1)
-
-      # ec->thread_ptr
-      asm.mov(:rax, [EC, C.rb_execution_context_t.offsetof(:thread_ptr)])
-
-      # thread->self
-      asm.mov(:rax, [:rax, C.rb_thread_struct.offsetof(:self)])
-
-      stack_ret = ctx.stack_push(Type::UnknownHeap)
-      asm.mov(stack_ret, :rax)
-      true
-    end
-
-    #
-    # Helpers
-    #
-
-    def register_cfunc_codegen_funcs
-      # Specialization for C methods. See register_cfunc_method for details.
-      register_cfunc_method(BasicObject, :!, :jit_rb_obj_not)
-
-      register_cfunc_method(NilClass, :nil?, :jit_rb_true)
-      register_cfunc_method(Kernel, :nil?, :jit_rb_false)
-      register_cfunc_method(Kernel, :is_a?, :jit_rb_kernel_is_a)
-      register_cfunc_method(Kernel, :kind_of?, :jit_rb_kernel_is_a)
-      register_cfunc_method(Kernel, :instance_of?, :jit_rb_kernel_instance_of)
-
-      register_cfunc_method(BasicObject, :==, :jit_rb_obj_equal)
-      register_cfunc_method(BasicObject, :equal?, :jit_rb_obj_equal)
-      register_cfunc_method(BasicObject, :!=, :jit_rb_obj_not_equal)
-      register_cfunc_method(Kernel, :eql?, :jit_rb_obj_equal)
-      register_cfunc_method(Module, :==, :jit_rb_obj_equal)
-      register_cfunc_method(Module, :===, :jit_rb_mod_eqq)
-      register_cfunc_method(Symbol, :==, :jit_rb_obj_equal)
-      register_cfunc_method(Symbol, :===, :jit_rb_obj_equal)
-      register_cfunc_method(Integer, :==, :jit_rb_int_equal)
-      register_cfunc_method(Integer, :===, :jit_rb_int_equal)
-
-      # rb_str_to_s() methods in string.c
-      register_cfunc_method(String, :empty?, :jit_rb_str_empty_p)
-      register_cfunc_method(String, :to_s, :jit_rb_str_to_s)
-      register_cfunc_method(String, :to_str, :jit_rb_str_to_s)
-      register_cfunc_method(String, :bytesize, :jit_rb_str_bytesize)
-      register_cfunc_method(String, :<<, :jit_rb_str_concat)
-      register_cfunc_method(String, :+@, :jit_rb_str_uplus)
-
-      # rb_ary_empty_p() method in array.c
-      register_cfunc_method(Array, :empty?, :jit_rb_ary_empty_p)
-
-      register_cfunc_method(Kernel, :respond_to?, :jit_obj_respond_to)
-      register_cfunc_method(Kernel, :block_given?, :jit_rb_f_block_given_p)
-
-      # Thread.current
-      register_cfunc_method(C.rb_singleton_class(Thread), :current, :jit_thread_s_current)
-
-      #---
-      register_cfunc_method(Array, :<<, :jit_rb_ary_push)
-      register_cfunc_method(Integer, :*, :jit_rb_int_mul)
-      register_cfunc_method(Integer, :/, :jit_rb_int_div)
-      register_cfunc_method(Integer, :[], :jit_rb_int_aref)
-      register_cfunc_method(String, :getbyte, :jit_rb_str_getbyte)
-    end
-
-    def register_cfunc_method(klass, mid_sym, func)
-      mid = C.rb_intern(mid_sym.to_s)
-      me = C.rb_method_entry_at(klass, mid)
-
-      assert_equal(false, me.nil?)
-
-      # Only cfuncs are supported
-      method_serial = me.def.method_serial
-
-      @cfunc_codegen_table[method_serial] = method(func)
-    end
-
-    def lookup_cfunc_codegen(cme_def)
-      @cfunc_codegen_table[cme_def.method_serial]
-    end
-
-    def stack_swap(_jit, ctx, asm, offset0, offset1)
-      stack0_mem = ctx.stack_opnd(offset0)
-      stack1_mem = ctx.stack_opnd(offset1)
-
-      mapping0 = ctx.get_opnd_mapping(StackOpnd[offset0])
-      mapping1 = ctx.get_opnd_mapping(StackOpnd[offset1])
-
-      asm.mov(:rax, stack0_mem)
-      asm.mov(:rcx, stack1_mem)
-      asm.mov(stack0_mem, :rcx)
-      asm.mov(stack1_mem, :rax)
-
-      ctx.set_opnd_mapping(StackOpnd[offset0], mapping1)
-      ctx.set_opnd_mapping(StackOpnd[offset1], mapping0)
-    end
-
-    def jit_getlocal_generic(jit, ctx, asm, idx:, level:)
-      # Load environment pointer EP (level 0) from CFP
-      ep_reg = :rax
-      jit_get_ep(asm, level, reg: ep_reg)
-
-      # Load the local from the block
-      # val = *(vm_get_ep(GET_EP(), level) - idx);
-      asm.mov(:rax, [ep_reg, -idx * C.VALUE.size])
-
-      # Write the local at SP
-      stack_top = if level == 0
-        local_idx = ep_offset_to_local_idx(jit.iseq, idx)
-        ctx.stack_push_local(local_idx)
-      else
-        ctx.stack_push(Type::Unknown)
-      end
-
-      asm.mov(stack_top, :rax)
-      KeepCompiling
-    end
-
-    def jit_setlocal_generic(jit, ctx, asm, idx:, level:)
-      value_type = ctx.get_opnd_type(StackOpnd[0])
-
-      # Load environment pointer EP at level
-      ep_reg = :rax
-      jit_get_ep(asm, level, reg: ep_reg)
-
-      # Write barriers may be required when VM_ENV_FLAG_WB_REQUIRED is set, however write barriers
-      # only affect heap objects being written. If we know an immediate value is being written we
-      # can skip this check.
-      unless value_type.imm?
-        # flags & VM_ENV_FLAG_WB_REQUIRED
-        flags_opnd = [ep_reg, C.VALUE.size * C::VM_ENV_DATA_INDEX_FLAGS]
-        asm.test(flags_opnd, C::VM_ENV_FLAG_WB_REQUIRED)
-
-        # if (flags & VM_ENV_FLAG_WB_REQUIRED) != 0
-        asm.jnz(side_exit(jit, ctx))
-      end
-
-      if level == 0
-        local_idx = ep_offset_to_local_idx(jit.iseq, idx)
-        ctx.set_local_type(local_idx, value_type)
-      end
-
-      # Pop the value to write from the stack
-      stack_top = ctx.stack_pop(1)
-
-      # Write the value at the environment pointer
-      asm.mov(:rcx, stack_top)
-      asm.mov([ep_reg, -(C.VALUE.size * idx)], :rcx)
-
-      KeepCompiling
-    end
-
-    # Compute the index of a local variable from its slot index
-    def ep_offset_to_local_idx(iseq, ep_offset)
-      # Layout illustration
-      # This is an array of VALUE
-      #                                           | VM_ENV_DATA_SIZE |
-      #                                           v                  v
-      # low addr <+-------+-------+-------+-------+------------------+
-      #           |local 0|local 1|  ...  |local n|       ....       |
-      #           +-------+-------+-------+-------+------------------+
-      #           ^       ^                       ^                  ^
-      #           +-------+---local_table_size----+         cfp->ep--+
-      #                   |                                          |
-      #                   +------------------ep_offset---------------+
-      #
-      # See usages of local_var_name() from iseq.c for similar calculation.
-
-      # Equivalent of iseq->body->local_table_size
-      local_table_size = iseq.body.local_table_size
-      op = ep_offset - C::VM_ENV_DATA_SIZE
-      local_idx = local_table_size - op - 1
-      assert_equal(true, local_idx >= 0 && local_idx < local_table_size)
-      local_idx
-    end
-
-    # Compute the index of a local variable from its slot index
-    def slot_to_local_idx(iseq, slot_idx)
-      # Layout illustration
-      # This is an array of VALUE
-      #                                           | VM_ENV_DATA_SIZE |
-      #                                           v                  v
-      # low addr <+-------+-------+-------+-------+------------------+
-      #           |local 0|local 1|  ...  |local n|       ....       |
-      #           +-------+-------+-------+-------+------------------+
-      #           ^       ^                       ^                  ^
-      #           +-------+---local_table_size----+         cfp->ep--+
-      #                   |                                          |
-      #                   +------------------slot_idx----------------+
-      #
-      # See usages of local_var_name() from iseq.c for similar calculation.
-
-      local_table_size = iseq.body.local_table_size
-      op = slot_idx - C::VM_ENV_DATA_SIZE
-      local_table_size - op - 1
-    end
-
-    # @param jit [RubyVM::RJIT::JITState]
-    # @param ctx [RubyVM::RJIT::Context]
-    # @param asm [RubyVM::RJIT::Assembler]
-    def guard_object_is_heap(jit, ctx, asm, object, object_opnd, counter = nil)
-      object_type = ctx.get_opnd_type(object_opnd)
-      if object_type.heap?
-        return
-      end
-
-      side_exit = side_exit(jit, ctx)
-      side_exit = counted_exit(side_exit, counter) if counter
-
-      asm.comment('guard object is heap')
-      # Test that the object is not an immediate
-      asm.test(object, C::RUBY_IMMEDIATE_MASK)
-      asm.jnz(side_exit)
-
-      # Test that the object is not false
-      asm.cmp(object, Qfalse)
-      asm.je(side_exit)
-
-      if object_type.diff(Type::UnknownHeap) != TypeDiff::Incompatible
-        ctx.upgrade_opnd_type(object_opnd, Type::UnknownHeap)
-      end
-    end
-
-    # @param jit [RubyVM::RJIT::JITState]
-    # @param ctx [RubyVM::RJIT::Context]
-    # @param asm [RubyVM::RJIT::Assembler]
-    def guard_object_is_array(jit, ctx, asm, object_reg, flags_reg, object_opnd, counter = nil)
-      object_type = ctx.get_opnd_type(object_opnd)
-      if object_type.array?
-        return
-      end
-
-      guard_object_is_heap(jit, ctx, asm, object_reg, object_opnd, counter)
-
-      side_exit = side_exit(jit, ctx)
-      side_exit = counted_exit(side_exit, counter) if counter
-
-      asm.comment('guard object is array')
-      # Pull out the type mask
-      asm.mov(flags_reg, [object_reg, C.RBasic.offsetof(:flags)])
-      asm.and(flags_reg, C::RUBY_T_MASK)
-
-      # Compare the result with T_ARRAY
-      asm.cmp(flags_reg, C::RUBY_T_ARRAY)
-      asm.jne(side_exit)
-
-      if object_type.diff(Type::TArray) != TypeDiff::Incompatible
-        ctx.upgrade_opnd_type(object_opnd, Type::TArray)
-      end
-    end
-
-    # @param jit [RubyVM::RJIT::JITState]
-    # @param ctx [RubyVM::RJIT::Context]
-    # @param asm [RubyVM::RJIT::Assembler]
-    def guard_object_is_string(jit, ctx, asm, object_reg, flags_reg, object_opnd, counter = nil)
-      object_type = ctx.get_opnd_type(object_opnd)
-      if object_type.string?
-        return
-      end
-
-      guard_object_is_heap(jit, ctx, asm, object_reg, object_opnd, counter)
-
-      side_exit = side_exit(jit, ctx)
-      side_exit = counted_exit(side_exit, counter) if counter
-
-      asm.comment('guard object is string')
-      # Pull out the type mask
-      asm.mov(flags_reg, [object_reg, C.RBasic.offsetof(:flags)])
-      asm.and(flags_reg, C::RUBY_T_MASK)
-
-      # Compare the result with T_STRING
-      asm.cmp(flags_reg, C::RUBY_T_STRING)
-      asm.jne(side_exit)
-
-      if object_type.diff(Type::TString) != TypeDiff::Incompatible
-        ctx.upgrade_opnd_type(object_opnd, Type::TString)
-      end
-    end
-
-    # clobbers object_reg
-    def guard_object_is_not_ruby2_keyword_hash(asm, object_reg, flags_reg, side_exit)
-      asm.comment('guard object is not ruby2 keyword hash')
-
-      not_ruby2_keyword = asm.new_label('not_ruby2_keyword')
-      asm.test(object_reg, C::RUBY_IMMEDIATE_MASK)
-      asm.jnz(not_ruby2_keyword)
-
-      asm.cmp(object_reg, Qfalse)
-      asm.je(not_ruby2_keyword)
-
-      asm.mov(flags_reg, [object_reg, C.RBasic.offsetof(:flags)])
-      type_reg = object_reg
-      asm.mov(type_reg, flags_reg)
-      asm.and(type_reg, C::RUBY_T_MASK)
-
-      asm.cmp(type_reg, C::RUBY_T_HASH)
-      asm.jne(not_ruby2_keyword)
-
-      asm.test(flags_reg, C::RHASH_PASS_AS_KEYWORDS)
-      asm.jnz(side_exit)
-
-      asm.write_label(not_ruby2_keyword)
-    end
-
-    # @param jit [RubyVM::RJIT::JITState]
-    # @param ctx [RubyVM::RJIT::Context]
-    # @param asm [RubyVM::RJIT::Assembler]
-    def jit_chain_guard(opcode, jit, ctx, asm, side_exit, limit: 20)
-      opcode => :je | :jne | :jnz | :jz
-
-      if ctx.chain_depth < limit
-        deeper = ctx.dup
-        deeper.chain_depth += 1
-
-        branch_stub = BranchStub.new(
-          iseq: jit.iseq,
-          shape: Default,
-          target0: BranchTarget.new(ctx: deeper, pc: jit.pc),
-        )
-        branch_stub.target0.address = Assembler.new.then do |ocb_asm|
-          @exit_compiler.compile_branch_stub(deeper, ocb_asm, branch_stub, true)
-          @ocb.write(ocb_asm)
-        end
-        branch_stub.compile = proc do |branch_asm|
-          # Not using `asm.comment` here since it's usually put before cmp/test before this.
-          branch_asm.stub(branch_stub) do
-            case branch_stub.shape
-            in Default
-              branch_asm.public_send(opcode, branch_stub.target0.address)
-            end
-          end
-        end
-        branch_stub.compile.call(asm)
-      else
-        asm.public_send(opcode, side_exit)
-      end
-    end
-
-    # @param jit [RubyVM::RJIT::JITState]
-    # @param ctx [RubyVM::RJIT::Context]
-    # @param asm [RubyVM::RJIT::Assembler]
-    def jit_guard_known_klass(jit, ctx, asm, known_klass, obj_opnd, insn_opnd, comptime_obj, side_exit, limit: 10)
-      # Only memory operand is supported for now
-      assert_equal(true, obj_opnd.is_a?(Array))
-
-      known_klass = C.to_value(known_klass)
-      val_type = ctx.get_opnd_type(insn_opnd)
-      if val_type.known_class == known_klass
-        # We already know from type information that this is a match
-        return
-      end
-
-      # Touching this as Ruby could crash for FrozenCore
-      if known_klass == C.rb_cNilClass
-        assert(!val_type.heap?)
-        assert(val_type.unknown?)
-
-        asm.comment('guard object is nil')
-        asm.cmp(obj_opnd, Qnil)
-        jit_chain_guard(:jne, jit, ctx, asm, side_exit, limit:)
-
-        ctx.upgrade_opnd_type(insn_opnd, Type::Nil)
-      elsif known_klass == C.rb_cTrueClass
-        assert(!val_type.heap?)
-        assert(val_type.unknown?)
-
-        asm.comment('guard object is true')
-        asm.cmp(obj_opnd, Qtrue)
-        jit_chain_guard(:jne, jit, ctx, asm, side_exit, limit:)
-
-        ctx.upgrade_opnd_type(insn_opnd, Type::True)
-      elsif known_klass == C.rb_cFalseClass
-        assert(!val_type.heap?)
-        assert(val_type.unknown?)
-
-        asm.comment('guard object is false')
-        asm.cmp(obj_opnd, Qfalse)
-        jit_chain_guard(:jne, jit, ctx, asm, side_exit, limit:)
-
-        ctx.upgrade_opnd_type(insn_opnd, Type::False)
-      elsif known_klass == C.rb_cInteger && fixnum?(comptime_obj)
-        # We will guard fixnum and bignum as though they were separate classes
-        # BIGNUM can be handled by the general else case below
-        assert(val_type.unknown?)
-
-        asm.comment('guard object is fixnum')
-        asm.test(obj_opnd, C::RUBY_FIXNUM_FLAG)
-        jit_chain_guard(:jz, jit, ctx, asm, side_exit, limit:)
-
-        ctx.upgrade_opnd_type(insn_opnd, Type::Fixnum)
-      elsif known_klass == C.rb_cSymbol && static_symbol?(comptime_obj)
-        assert(!val_type.heap?)
-        # We will guard STATIC vs DYNAMIC as though they were separate classes
-        # DYNAMIC symbols can be handled by the general else case below
-        if val_type != Type::ImmSymbol || !val_type.imm?
-          assert(val_type.unknown?)
-
-          asm.comment('guard object is static symbol')
-          assert_equal(8, C::RUBY_SPECIAL_SHIFT)
-          asm.cmp(BytePtr[*obj_opnd], C::RUBY_SYMBOL_FLAG)
-          jit_chain_guard(:jne, jit, ctx, asm, side_exit, limit:)
-
-          ctx.upgrade_opnd_type(insn_opnd, Type::ImmSymbol)
-        end
-      elsif known_klass == C.rb_cFloat && flonum?(comptime_obj)
-        assert(!val_type.heap?)
-        if val_type != Type::Flonum || !val_type.imm?
-          assert(val_type.unknown?)
-
-          # We will guard flonum vs heap float as though they were separate classes
-          asm.comment('guard object is flonum')
-          asm.mov(:rax, obj_opnd)
-          asm.and(:rax, C::RUBY_FLONUM_MASK)
-          asm.cmp(:rax, C::RUBY_FLONUM_FLAG)
-          jit_chain_guard(:jne, jit, ctx, asm, side_exit, limit:)
-
-          ctx.upgrade_opnd_type(insn_opnd, Type::Flonum)
-        end
-      elsif C.FL_TEST(known_klass, C::RUBY_FL_SINGLETON) && comptime_obj == C.rb_class_attached_object(known_klass)
-        # Singleton classes are attached to one specific object, so we can
-        # avoid one memory access (and potentially the is_heap check) by
-        # looking for the expected object directly.
-        # Note that in case the sample instance has a singleton class that
-        # doesn't attach to the sample instance, it means the sample instance
-        # has an empty singleton class that hasn't been materialized yet. In
-        # this case, comparing against the sample instance doesn't guarantee
-        # that its singleton class is empty, so we can't avoid the memory
-        # access. As an example, `Object.new.singleton_class` is an object in
-        # this situation.
-        asm.comment('guard known object with singleton class')
-        asm.mov(:rax, to_value(comptime_obj))
-        asm.cmp(obj_opnd, :rax)
-        jit_chain_guard(:jne, jit, ctx, asm, side_exit, limit:)
-      elsif val_type == Type::CString && known_klass == C.rb_cString
-        # guard elided because the context says we've already checked
-        assert_equal(C.to_value(C.rb_class_of(comptime_obj)), C.rb_cString)
-      else
-        assert(!val_type.imm?)
-
-        # Load memory to a register
-        asm.mov(:rax, obj_opnd)
-        obj_opnd = :rax
-
-        # Check that the receiver is a heap object
-        # Note: if we get here, the class doesn't have immediate instances.
-        unless val_type.heap?
-          asm.comment('guard not immediate')
-          asm.test(obj_opnd, C::RUBY_IMMEDIATE_MASK)
-          jit_chain_guard(:jnz, jit, ctx, asm, side_exit, limit:)
-          asm.cmp(obj_opnd, Qfalse)
-          jit_chain_guard(:je, jit, ctx, asm, side_exit, limit:)
-        end
-
-        # Bail if receiver class is different from known_klass
-        klass_opnd = [obj_opnd, C.RBasic.offsetof(:klass)]
-        asm.comment("guard known class #{known_klass}")
-        asm.mov(:rcx, known_klass)
-        asm.cmp(klass_opnd, :rcx)
-        jit_chain_guard(:jne, jit, ctx, asm, side_exit, limit:)
-
-        if known_klass == C.rb_cString
-          # Upgrading to Type::CString here is incorrect.
-          # The guard we put only checks RBASIC_CLASS(obj),
-          # which adding a singleton class can change. We
-          # additionally need to know the string is frozen
-          # to claim Type::CString.
-          ctx.upgrade_opnd_type(insn_opnd, Type::TString)
-        elsif known_klass == C.rb_cArray
-          ctx.upgrade_opnd_type(insn_opnd, Type::TArray)
-        end
-      end
-    end
-
-    # @param jit [RubyVM::RJIT::JITState]
-    def two_fixnums_on_stack?(jit)
-      comptime_recv = jit.peek_at_stack(1)
-      comptime_arg = jit.peek_at_stack(0)
-      return fixnum?(comptime_recv) && fixnum?(comptime_arg)
-    end
-
-    # @param jit [RubyVM::RJIT::JITState]
-    # @param ctx [RubyVM::RJIT::Context]
-    # @param asm [RubyVM::RJIT::Assembler]
-    def guard_two_fixnums(jit, ctx, asm)
-      # Get stack operands without popping them
-      arg1 = ctx.stack_opnd(0)
-      arg0 = ctx.stack_opnd(1)
-
-      # Get the stack operand types
-      arg1_type = ctx.get_opnd_type(StackOpnd[0])
-      arg0_type = ctx.get_opnd_type(StackOpnd[1])
-
-      if arg0_type.heap? || arg1_type.heap?
-        asm.comment('arg is heap object')
-        asm.jmp(side_exit(jit, ctx))
-        return
-      end
-
-      if arg0_type != Type::Fixnum && arg0_type.specific?
-        asm.comment('arg0 not fixnum')
-        asm.jmp(side_exit(jit, ctx))
-        return
-      end
-
-      if arg1_type != Type::Fixnum && arg1_type.specific?
-        asm.comment('arg1 not fixnum')
-        asm.jmp(side_exit(jit, ctx))
-        return
-      end
-
-      assert(!arg0_type.heap?)
-      assert(!arg1_type.heap?)
-      assert(arg0_type == Type::Fixnum || arg0_type.unknown?)
-      assert(arg1_type == Type::Fixnum || arg1_type.unknown?)
-
-      # If not fixnums at run-time, fall back
-      if arg0_type != Type::Fixnum
-        asm.comment('guard arg0 fixnum')
-        asm.test(arg0, C::RUBY_FIXNUM_FLAG)
-        jit_chain_guard(:jz, jit, ctx, asm, side_exit(jit, ctx))
-      end
-      if arg1_type != Type::Fixnum
-        asm.comment('guard arg1 fixnum')
-        asm.test(arg1, C::RUBY_FIXNUM_FLAG)
-        jit_chain_guard(:jz, jit, ctx, asm, side_exit(jit, ctx))
-      end
-
-      # Set stack types in context
-      ctx.upgrade_opnd_type(StackOpnd[0], Type::Fixnum)
-      ctx.upgrade_opnd_type(StackOpnd[1], Type::Fixnum)
-    end
-
-    # @param jit [RubyVM::RJIT::JITState]
-    # @param ctx [RubyVM::RJIT::Context]
-    # @param asm [RubyVM::RJIT::Assembler]
-    def jit_fixnum_cmp(jit, ctx, asm, opcode:, bop:)
-      opcode => :cmovl | :cmovle | :cmovg | :cmovge
-
-      unless jit.at_current_insn?
-        defer_compilation(jit, ctx, asm)
-        return EndBlock
-      end
-
-      comptime_recv = jit.peek_at_stack(1)
-      comptime_obj  = jit.peek_at_stack(0)
-
-      if fixnum?(comptime_recv) && fixnum?(comptime_obj)
-        unless Invariants.assume_bop_not_redefined(jit, C::INTEGER_REDEFINED_OP_FLAG, bop)
-          return CantCompile
-        end
-
-        # Check that both operands are fixnums
-        guard_two_fixnums(jit, ctx, asm)
-
-        obj_opnd  = ctx.stack_pop
-        recv_opnd = ctx.stack_pop
-
-        asm.mov(:rax, obj_opnd)
-        asm.cmp(recv_opnd, :rax)
-        asm.mov(:rax, Qfalse)
-        asm.mov(:rcx, Qtrue)
-        asm.public_send(opcode, :rax, :rcx)
-
-        dst_opnd = ctx.stack_push(Type::UnknownImm)
-        asm.mov(dst_opnd, :rax)
-
-        KeepCompiling
-      else
-        opt_send_without_block(jit, ctx, asm)
-      end
-    end
-
-    # @param jit [RubyVM::RJIT::JITState]
-    # @param ctx [RubyVM::RJIT::Context]
-    # @param asm [RubyVM::RJIT::Assembler]
-    def jit_equality_specialized(jit, ctx, asm, gen_eq)
-      # Create a side-exit to fall back to the interpreter
-      side_exit = side_exit(jit, ctx)
-
-      a_opnd = ctx.stack_opnd(1)
-      b_opnd = ctx.stack_opnd(0)
-
-      comptime_a = jit.peek_at_stack(1)
-      comptime_b = jit.peek_at_stack(0)
-
-      if two_fixnums_on_stack?(jit)
-        unless Invariants.assume_bop_not_redefined(jit, C::INTEGER_REDEFINED_OP_FLAG, C::BOP_EQ)
-          return false
-        end
-
-        guard_two_fixnums(jit, ctx, asm)
-
-        asm.comment('check fixnum equality')
-        asm.mov(:rax, a_opnd)
-        asm.mov(:rcx, b_opnd)
-        asm.cmp(:rax, :rcx)
-        asm.mov(:rax, gen_eq ? Qfalse : Qtrue)
-        asm.mov(:rcx, gen_eq ? Qtrue  : Qfalse)
-        asm.cmove(:rax, :rcx)
-
-        # Push the output on the stack
-        ctx.stack_pop(2)
-        dst = ctx.stack_push(Type::UnknownImm)
-        asm.mov(dst, :rax)
-
-        true
-      elsif C.rb_class_of(comptime_a) == String && C.rb_class_of(comptime_b) == String
-        unless Invariants.assume_bop_not_redefined(jit, C::STRING_REDEFINED_OP_FLAG, C::BOP_EQ)
-          # if overridden, emit the generic version
-          return false
-        end
-
-        # Guard that a is a String
-        jit_guard_known_klass(jit, ctx, asm, C.rb_class_of(comptime_a), a_opnd, StackOpnd[1], comptime_a, side_exit)
-
-        equal_label = asm.new_label(:equal)
-        ret_label = asm.new_label(:ret)
-
-        # If they are equal by identity, return true
-        asm.mov(:rax, a_opnd)
-        asm.mov(:rcx, b_opnd)
-        asm.cmp(:rax, :rcx)
-        asm.je(equal_label)
-
-        # Otherwise guard that b is a T_STRING (from type info) or String (from runtime guard)
-        btype = ctx.get_opnd_type(StackOpnd[0])
-        unless btype.string?
-          # Note: any T_STRING is valid here, but we check for a ::String for simplicity
-          # To pass a mutable static variable (rb_cString) requires an unsafe block
-          jit_guard_known_klass(jit, ctx, asm, C.rb_class_of(comptime_b), b_opnd, StackOpnd[0], comptime_b, side_exit)
-        end
-
-        asm.comment('call rb_str_eql_internal')
-        asm.mov(C_ARGS[0], a_opnd)
-        asm.mov(C_ARGS[1], b_opnd)
-        asm.call(gen_eq ? C.rb_str_eql_internal : C.rjit_str_neq_internal)
-
-        # Push the output on the stack
-        ctx.stack_pop(2)
-        dst = ctx.stack_push(Type::UnknownImm)
-        asm.mov(dst, C_RET)
-        asm.jmp(ret_label)
-
-        asm.write_label(equal_label)
-        asm.mov(dst, gen_eq ? Qtrue : Qfalse)
-
-        asm.write_label(ret_label)
-
-        true
-      else
-        false
-      end
-    end
-
-    # NOTE: This clobbers :rax
-    # @param jit [RubyVM::RJIT::JITState]
-    # @param ctx [RubyVM::RJIT::Context]
-    # @param asm [RubyVM::RJIT::Assembler]
-    def jit_prepare_routine_call(jit, ctx, asm)
-      jit.record_boundary_patch_point = true
-      jit_save_pc(jit, asm)
-      jit_save_sp(ctx, asm)
-
-      # In case the routine calls Ruby methods, it can set local variables
-      # through Kernel#binding and other means.
-      ctx.clear_local_types
-    end
-
-    # NOTE: This clobbers :rax
-    # @param jit [RubyVM::RJIT::JITState]
-    # @param asm [RubyVM::RJIT::Assembler]
-    def jit_save_pc(jit, asm, comment: 'save PC to CFP')
-      next_pc = jit.pc + jit.insn.len * C.VALUE.size # Use the next one for backtrace and side exits
-      asm.comment(comment)
-      asm.mov(:rax, next_pc)
-      asm.mov([CFP, C.rb_control_frame_t.offsetof(:pc)], :rax)
-    end
-
-    # @param ctx [RubyVM::RJIT::Context]
-    # @param asm [RubyVM::RJIT::Assembler]
-    def jit_save_sp(ctx, asm)
-      if ctx.sp_offset != 0
-        asm.comment('save SP to CFP')
-        asm.lea(SP, ctx.sp_opnd)
-        asm.mov([CFP, C.rb_control_frame_t.offsetof(:sp)], SP)
-        ctx.sp_offset = 0
-      end
-    end
-
-    # @param jit [RubyVM::RJIT::JITState]
-    # @param ctx [RubyVM::RJIT::Context]
-    # @param asm [RubyVM::RJIT::Assembler]
-    def jump_to_next_insn(jit, ctx, asm)
-      reset_depth = ctx.dup
-      reset_depth.chain_depth = 0
-
-      next_pc = jit.pc + jit.insn.len * C.VALUE.size
-
-      # We are at the end of the current instruction. Record the boundary.
-      if jit.record_boundary_patch_point
-        exit_pos = Assembler.new.then do |ocb_asm|
-          @exit_compiler.compile_side_exit(next_pc, ctx, ocb_asm)
-          @ocb.write(ocb_asm)
-        end
-        Invariants.record_global_inval_patch(asm, exit_pos)
-        jit.record_boundary_patch_point = false
-      end
-
-      jit_direct_jump(jit.iseq, next_pc, reset_depth, asm, comment: 'jump_to_next_insn')
-    end
-
-    # rb_vm_check_ints
-    # @param jit [RubyVM::RJIT::JITState]
-    # @param ctx [RubyVM::RJIT::Context]
-    # @param asm [RubyVM::RJIT::Assembler]
-    def jit_check_ints(jit, ctx, asm)
-      asm.comment('RUBY_VM_CHECK_INTS(ec)')
-      asm.mov(:eax, DwordPtr[EC, C.rb_execution_context_t.offsetof(:interrupt_flag)])
-      asm.test(:eax, :eax)
-      asm.jnz(side_exit(jit, ctx))
-    end
-
-    # See get_lvar_level in compile.c
-    def get_lvar_level(iseq)
-      level = 0
-      while iseq.to_i != iseq.body.local_iseq.to_i
-        level += 1
-        iseq = iseq.body.parent_iseq
-      end
-      return level
-    end
-
-    # GET_LEP
-    # @param jit [RubyVM::RJIT::JITState]
-    # @param asm [RubyVM::RJIT::Assembler]
-    def jit_get_lep(jit, asm, reg:)
-      level = get_lvar_level(jit.iseq)
-      jit_get_ep(asm, level, reg:)
-    end
-
-    # vm_get_ep
-    # @param asm [RubyVM::RJIT::Assembler]
-    def jit_get_ep(asm, level, reg:)
-      asm.mov(reg, [CFP, C.rb_control_frame_t.offsetof(:ep)])
-      level.times do
-        # GET_PREV_EP: ep[VM_ENV_DATA_INDEX_SPECVAL] & ~0x03
-        asm.mov(reg, [reg, C.VALUE.size * C::VM_ENV_DATA_INDEX_SPECVAL])
-        asm.and(reg, ~0x03)
-      end
-    end
-
-    # vm_getivar
-    # @param jit [RubyVM::RJIT::JITState]
-    # @param ctx [RubyVM::RJIT::Context]
-    # @param asm [RubyVM::RJIT::Assembler]
-    def jit_getivar(jit, ctx, asm, comptime_obj, ivar_id, obj_opnd, obj_yarv_opnd)
-      side_exit = side_exit(jit, ctx)
-      starting_ctx = ctx.dup # copy for jit_chain_guard
-
-      # Guard not special const
-      if C::SPECIAL_CONST_P(comptime_obj)
-        asm.incr_counter(:getivar_special_const)
-        return CantCompile
-      end
-
-      case C::BUILTIN_TYPE(comptime_obj)
-      when C::T_OBJECT
-        # This is the only supported case for now (ROBJECT_IVPTR)
-      else
-        # General case. Call rb_ivar_get().
-        # VALUE rb_ivar_get(VALUE obj, ID id)
-        asm.comment('call rb_ivar_get()')
-        asm.mov(C_ARGS[0], obj_opnd ? obj_opnd : [CFP, C.rb_control_frame_t.offsetof(:self)])
-        asm.mov(C_ARGS[1], ivar_id)
-
-        # The function could raise exceptions.
-        jit_prepare_routine_call(jit, ctx, asm) # clobbers obj_opnd and :rax
-
-        asm.call(C.rb_ivar_get)
-
-        if obj_opnd # attr_reader
-          ctx.stack_pop
-        end
-
-        # Push the ivar on the stack
-        out_opnd = ctx.stack_push(Type::Unknown)
-        asm.mov(out_opnd, C_RET)
-
-        # Jump to next instruction. This allows guard chains to share the same successor.
-        jump_to_next_insn(jit, ctx, asm)
-        return EndBlock
-      end
-
-      asm.mov(:rax, obj_opnd ? obj_opnd : [CFP, C.rb_control_frame_t.offsetof(:self)])
-      guard_object_is_heap(jit, ctx, asm, :rax, obj_yarv_opnd, :getivar_not_heap)
-
-      shape_id = C.rb_shape_get_shape_id(comptime_obj)
-      if shape_id == C::OBJ_TOO_COMPLEX_SHAPE_ID
-        asm.incr_counter(:getivar_too_complex)
-        return CantCompile
-      end
-
-      asm.comment('guard shape')
-      asm.cmp(DwordPtr[:rax, C.rb_shape_id_offset], shape_id)
-      jit_chain_guard(:jne, jit, starting_ctx, asm, counted_exit(side_exit, :getivar_megamorphic))
-
-      if obj_opnd
-        ctx.stack_pop # pop receiver for attr_reader
-      end
-
-      index = C.rb_shape_get_iv_index(shape_id, ivar_id)
-      # If there is no IVAR index, then the ivar was undefined
-      # when we entered the compiler.  That means we can just return
-      # nil for this shape + iv name
-      if index.nil?
-        stack_opnd = ctx.stack_push(Type::Nil)
-        val_opnd = Qnil
-      else
-        asm.comment('ROBJECT_IVPTR')
-        if C::FL_TEST_RAW(comptime_obj, C::ROBJECT_EMBED)
-          # Access embedded array
-          asm.mov(:rax, [:rax, C.RObject.offsetof(:as, :ary) + (index * C.VALUE.size)])
-        else
-          # Pull out an ivar table on heap
-          asm.mov(:rax, [:rax, C.RObject.offsetof(:as, :heap, :ivptr)])
-          # Read the table
-          asm.mov(:rax, [:rax, index * C.VALUE.size])
-        end
-        stack_opnd = ctx.stack_push(Type::Unknown)
-        val_opnd = :rax
-      end
-      asm.mov(stack_opnd, val_opnd)
-
-      # Let guard chains share the same successor
-      jump_to_next_insn(jit, ctx, asm)
-      EndBlock
-    end
-
-    def jit_write_iv(asm, comptime_receiver, recv_reg, temp_reg, ivar_index, set_value, needs_extension)
-      # Compile time self is embedded and the ivar index lands within the object
-      embed_test_result = C::FL_TEST_RAW(comptime_receiver, C::ROBJECT_EMBED) && !needs_extension
-
-      if embed_test_result
-        # Find the IV offset
-        offs = C.RObject.offsetof(:as, :ary) + ivar_index * C.VALUE.size
-
-        # Write the IV
-        asm.comment('write IV')
-        asm.mov(temp_reg, set_value)
-        asm.mov([recv_reg, offs], temp_reg)
-      else
-        # Compile time value is *not* embedded.
-
-        # Get a pointer to the extended table
-        asm.mov(recv_reg, [recv_reg, C.RObject.offsetof(:as, :heap, :ivptr)])
-
-        # Write the ivar in to the extended table
-        asm.comment("write IV");
-        asm.mov(temp_reg, set_value)
-        asm.mov([recv_reg, C.VALUE.size * ivar_index], temp_reg)
-      end
-    end
-
-    # vm_caller_setup_arg_block: Handle VM_CALL_ARGS_BLOCKARG cases.
-    # @param jit [RubyVM::RJIT::JITState]
-    # @param ctx [RubyVM::RJIT::Context]
-    # @param asm [RubyVM::RJIT::Assembler]
-    def guard_block_arg(jit, ctx, asm, calling)
-      if calling.flags & C::VM_CALL_ARGS_BLOCKARG != 0
-        block_arg_type = ctx.get_opnd_type(StackOpnd[0])
-        case block_arg_type
-        in Type::Nil
-          calling.block_handler = C::VM_BLOCK_HANDLER_NONE
-        in Type::BlockParamProxy
-          calling.block_handler = C.rb_block_param_proxy
-        else
-          asm.incr_counter(:send_block_arg)
-          return CantCompile
-        end
-      end
-    end
-
-    # vm_search_method
-    # @param jit [RubyVM::RJIT::JITState]
-    # @param ctx [RubyVM::RJIT::Context]
-    # @param asm [RubyVM::RJIT::Assembler]
-    def jit_search_method(jit, ctx, asm, mid, calling)
-      assert_equal(true, jit.at_current_insn?)
-
-      # Generate a side exit
-      side_exit = side_exit(jit, ctx)
-
-      # kw_splat is not supported yet
-      if calling.flags & C::VM_CALL_KW_SPLAT != 0
-        asm.incr_counter(:send_kw_splat)
-        return CantCompile
-      end
-
-      # Get a compile-time receiver and its class
-      recv_idx = calling.argc + (calling.flags & C::VM_CALL_ARGS_BLOCKARG != 0 ? 1 : 0) # blockarg is not popped yet
-      recv_idx += calling.send_shift
-      comptime_recv = jit.peek_at_stack(recv_idx)
-      comptime_recv_klass = C.rb_class_of(comptime_recv)
-
-      # Guard the receiver class (part of vm_search_method_fastpath)
-      recv_opnd = ctx.stack_opnd(recv_idx)
-      megamorphic_exit = counted_exit(side_exit, :send_klass_megamorphic)
-      jit_guard_known_klass(jit, ctx, asm, comptime_recv_klass, recv_opnd, StackOpnd[recv_idx], comptime_recv, megamorphic_exit)
-
-      # Do method lookup (vm_cc_cme(cc) != NULL)
-      cme = C.rb_callable_method_entry(comptime_recv_klass, mid)
-      if cme.nil?
-        asm.incr_counter(:send_missing_cme)
-        return CantCompile # We don't support vm_call_method_name
-      end
-
-      # Invalidate on redefinition (part of vm_search_method_fastpath)
-      Invariants.assume_method_lookup_stable(jit, cme)
-
-      return cme, comptime_recv_klass
-    end
-
-    # vm_call_general
-    # @param jit [RubyVM::RJIT::JITState]
-    # @param ctx [RubyVM::RJIT::Context]
-    # @param asm [RubyVM::RJIT::Assembler]
-    def jit_call_general(jit, ctx, asm, mid, calling, cme, known_recv_class)
-      jit_call_method(jit, ctx, asm, mid, calling, cme, known_recv_class)
-    end
-
-    # vm_call_method
-    # @param jit [RubyVM::RJIT::JITState]
-    # @param ctx [RubyVM::RJIT::Context]
-    # @param asm [RubyVM::RJIT::Assembler]
-    # @param send_shift [Integer] The number of shifts needed for VM_CALL_OPT_SEND
-    def jit_call_method(jit, ctx, asm, mid, calling, cme, known_recv_class)
-      # The main check of vm_call_method before vm_call_method_each_type
-      case C::METHOD_ENTRY_VISI(cme)
-      in C::METHOD_VISI_PUBLIC
-        # You can always call public methods
-      in C::METHOD_VISI_PRIVATE
-        # Allow only callsites without a receiver
-        if calling.flags & C::VM_CALL_FCALL == 0
-          asm.incr_counter(:send_private)
-          return CantCompile
-        end
-      in C::METHOD_VISI_PROTECTED
-        # If the method call is an FCALL, it is always valid
-        if calling.flags & C::VM_CALL_FCALL == 0
-          # otherwise we need an ancestry check to ensure the receiver is valid to be called as protected
-          jit_protected_callee_ancestry_guard(asm, cme, side_exit(jit, ctx))
-        end
-      end
-
-      # Get a compile-time receiver
-      recv_idx = calling.argc + (calling.flags & C::VM_CALL_ARGS_BLOCKARG != 0 ? 1 : 0) # blockarg is not popped yet
-      recv_idx += calling.send_shift
-      comptime_recv = jit.peek_at_stack(recv_idx)
-      recv_opnd = ctx.stack_opnd(recv_idx)
-
-      jit_call_method_each_type(jit, ctx, asm, calling, cme, comptime_recv, recv_opnd, known_recv_class)
-    end
-
-    # Generate ancestry guard for protected callee.
-    # Calls to protected callees only go through when self.is_a?(klass_that_defines_the_callee).
-    def jit_protected_callee_ancestry_guard(asm, cme, side_exit)
-      # See vm_call_method().
-      def_class = cme.defined_class
-      # Note: PC isn't written to current control frame as rb_is_kind_of() shouldn't raise.
-      # VALUE rb_obj_is_kind_of(VALUE obj, VALUE klass);
-
-      asm.mov(C_ARGS[0], [CFP, C.rb_control_frame_t.offsetof(:self)])
-      asm.mov(C_ARGS[1], to_value(def_class))
-      asm.call(C.rb_obj_is_kind_of)
-      asm.test(C_RET, C_RET)
-      asm.jz(counted_exit(side_exit, :send_protected_check_failed))
-    end
-
-    # vm_call_method_each_type
-    # @param jit [RubyVM::RJIT::JITState]
-    # @param ctx [RubyVM::RJIT::Context]
-    # @param asm [RubyVM::RJIT::Assembler]
-    def jit_call_method_each_type(jit, ctx, asm, calling, cme, comptime_recv, recv_opnd, known_recv_class)
-      case cme.def.type
-      in C::VM_METHOD_TYPE_ISEQ
-        iseq = def_iseq_ptr(cme.def)
-        jit_call_iseq(jit, ctx, asm, cme, calling, iseq)
-      in C::VM_METHOD_TYPE_NOTIMPLEMENTED
-        asm.incr_counter(:send_notimplemented)
-        return CantCompile
-      in C::VM_METHOD_TYPE_CFUNC
-        jit_call_cfunc(jit, ctx, asm, cme, calling, known_recv_class:)
-      in C::VM_METHOD_TYPE_ATTRSET
-        jit_call_attrset(jit, ctx, asm, cme, calling, comptime_recv, recv_opnd)
-      in C::VM_METHOD_TYPE_IVAR
-        jit_call_ivar(jit, ctx, asm, cme, calling, comptime_recv, recv_opnd)
-      in C::VM_METHOD_TYPE_MISSING
-        asm.incr_counter(:send_missing)
-        return CantCompile
-      in C::VM_METHOD_TYPE_BMETHOD
-        jit_call_bmethod(jit, ctx, asm, calling, cme, comptime_recv, recv_opnd, known_recv_class)
-      in C::VM_METHOD_TYPE_ALIAS
-        jit_call_alias(jit, ctx, asm, calling, cme, comptime_recv, recv_opnd, known_recv_class)
-      in C::VM_METHOD_TYPE_OPTIMIZED
-        jit_call_optimized(jit, ctx, asm, cme, calling, known_recv_class)
-      in C::VM_METHOD_TYPE_UNDEF
-        asm.incr_counter(:send_undef)
-        return CantCompile
-      in C::VM_METHOD_TYPE_ZSUPER
-        asm.incr_counter(:send_zsuper)
-        return CantCompile
-      in C::VM_METHOD_TYPE_REFINED
-        asm.incr_counter(:send_refined)
-        return CantCompile
-      end
-    end
-
-    # vm_call_iseq_setup
-    # @param jit [RubyVM::RJIT::JITState]
-    # @param ctx [RubyVM::RJIT::Context]
-    # @param asm [RubyVM::RJIT::Assembler]
-    def jit_call_iseq(jit, ctx, asm, cme, calling, iseq, frame_type: nil, prev_ep: nil)
-      argc = calling.argc
-      flags = calling.flags
-      send_shift = calling.send_shift
-
-      # When you have keyword arguments, there is an extra object that gets
-      # placed on the stack the represents a bitmap of the keywords that were not
-      # specified at the call site. We need to keep track of the fact that this
-      # value is present on the stack in order to properly set up the callee's
-      # stack pointer.
-      doing_kw_call = iseq.body.param.flags.has_kw
-      supplying_kws = flags & C::VM_CALL_KWARG != 0
-
-      if flags & C::VM_CALL_TAILCALL != 0
-        # We can't handle tailcalls
-        asm.incr_counter(:send_tailcall)
-        return CantCompile
-      end
-
-      # No support for callees with these parameters yet as they require allocation
-      # or complex handling.
-      if iseq.body.param.flags.has_post
-        asm.incr_counter(:send_iseq_has_opt)
-        return CantCompile
-      end
-      if iseq.body.param.flags.has_kwrest
-        asm.incr_counter(:send_iseq_has_kwrest)
-        return CantCompile
-      end
-
-      # In order to handle backwards compatibility between ruby 3 and 2
-      # ruby2_keywords was introduced. It is called only on methods
-      # with splat and changes they way they handle them.
-      # We are just going to not compile these.
-      # https://www.rubydoc.info/stdlib/core/Proc:ruby2_keywords
-      if iseq.body.param.flags.ruby2_keywords && flags & C::VM_CALL_ARGS_SPLAT != 0
-        asm.incr_counter(:send_iseq_ruby2_keywords)
-        return CantCompile
-      end
-
-      iseq_has_rest = iseq.body.param.flags.has_rest
-      if iseq_has_rest && calling.block_handler == :captured
-        asm.incr_counter(:send_iseq_has_rest_and_captured)
-        return CantCompile
-      end
-
-      if iseq_has_rest && iseq.body.param.flags.has_kw && supplying_kws
-        asm.incr_counter(:send_iseq_has_rest_and_kw_supplied)
-        return CantCompile
-      end
-
-      # If we have keyword arguments being passed to a callee that only takes
-      # positionals, then we need to allocate a hash. For now we're going to
-      # call that too complex and bail.
-      if supplying_kws && !iseq.body.param.flags.has_kw
-        asm.incr_counter(:send_iseq_has_no_kw)
-        return CantCompile
-      end
-
-      # If we have a method accepting no kwargs (**nil), exit if we have passed
-      # it any kwargs.
-      if supplying_kws && iseq.body.param.flags.accepts_no_kwarg
-        asm.incr_counter(:send_iseq_accepts_no_kwarg)
-        return CantCompile
-      end
-
-      # For computing number of locals to set up for the callee
-      num_params = iseq.body.param.size
-
-      # Block parameter handling. This mirrors setup_parameters_complex().
-      if iseq.body.param.flags.has_block
-        if iseq.body.local_iseq.to_i == iseq.to_i
-          num_params -= 1
-        else
-          # In this case (param.flags.has_block && local_iseq != iseq),
-          # the block argument is setup as a local variable and requires
-          # materialization (allocation). Bail.
-          asm.incr_counter(:send_iseq_materialized_block)
-          return CantCompile
-        end
-      end
-
-      if flags & C::VM_CALL_ARGS_SPLAT != 0 && flags & C::VM_CALL_ZSUPER != 0
-        # zsuper methods are super calls without any arguments.
-        # They are also marked as splat, but don't actually have an array
-        # they pull arguments from, instead we need to change to call
-        # a different method with the current stack.
-        asm.incr_counter(:send_iseq_zsuper)
-        return CantCompile
-      end
-
-      start_pc_offset = 0
-      required_num = iseq.body.param.lead_num
-
-      # This struct represents the metadata about the caller-specified
-      # keyword arguments.
-      kw_arg = calling.kwarg
-      kw_arg_num = if kw_arg.nil?
-        0
-      else
-        kw_arg.keyword_len
-      end
-
-      # Arity handling and optional parameter setup
-      opts_filled = argc - required_num - kw_arg_num
-      opt_num = iseq.body.param.opt_num
-      opts_missing = opt_num - opts_filled
-
-      if doing_kw_call && flags & C::VM_CALL_ARGS_SPLAT != 0
-        asm.incr_counter(:send_iseq_splat_with_kw)
-        return CantCompile
-      end
-
-      if iseq_has_rest && opt_num != 0
-        asm.incr_counter(:send_iseq_has_rest_and_optional)
-        return CantCompile
-      end
-
-      if opts_filled < 0 && flags & C::VM_CALL_ARGS_SPLAT == 0
-        # Too few arguments and no splat to make up for it
-        asm.incr_counter(:send_iseq_arity_error)
-        return CantCompile
-      end
-
-      if opts_filled > opt_num && !iseq_has_rest
-        # Too many arguments and no place to put them (i.e. rest arg)
-        asm.incr_counter(:send_iseq_arity_error)
-        return CantCompile
-      end
-
-      block_arg = flags & C::VM_CALL_ARGS_BLOCKARG != 0
-
-      # Guard block_arg_type
-      if guard_block_arg(jit, ctx, asm, calling) == CantCompile
-        return CantCompile
-      end
-
-      # If we have unfilled optional arguments and keyword arguments then we
-      # would need to adjust the arguments location to account for that.
-      # For now we aren't handling this case.
-      if doing_kw_call && opts_missing > 0
-        asm.incr_counter(:send_iseq_missing_optional_kw)
-        return CantCompile
-      end
-
-      # We will handle splat case later
-      if opt_num > 0 && flags & C::VM_CALL_ARGS_SPLAT == 0
-        num_params -= opts_missing
-        start_pc_offset = iseq.body.param.opt_table[opts_filled]
-      end
-
-      if doing_kw_call
-        # Here we're calling a method with keyword arguments and specifying
-        # keyword arguments at this call site.
-
-        # This struct represents the metadata about the callee-specified
-        # keyword parameters.
-        keyword = iseq.body.param.keyword
-        keyword_num = keyword.num
-        keyword_required_num = keyword.required_num
-
-        required_kwargs_filled = 0
-
-        if keyword_num > 30
-          # We have so many keywords that (1 << num) encoded as a FIXNUM
-          # (which shifts it left one more) no longer fits inside a 32-bit
-          # immediate.
-          asm.incr_counter(:send_iseq_too_many_kwargs)
-          return CantCompile
-        end
-
-        # Check that the kwargs being passed are valid
-        if supplying_kws
-          # This is the list of keyword arguments that the callee specified
-          # in its initial declaration.
-          # SAFETY: see compile.c for sizing of this slice.
-          callee_kwargs = keyword_num.times.map { |i| keyword.table[i] }
-
-          # Here we're going to build up a list of the IDs that correspond to
-          # the caller-specified keyword arguments. If they're not in the
-          # same order as the order specified in the callee declaration, then
-          # we're going to need to generate some code to swap values around
-          # on the stack.
-          caller_kwargs = []
-          kw_arg.keyword_len.times do |kwarg_idx|
-            sym = C.to_ruby(kw_arg[:keywords][kwarg_idx])
-            caller_kwargs << C.rb_sym2id(sym)
-          end
-
-          # First, we're going to be sure that the names of every
-          # caller-specified keyword argument correspond to a name in the
-          # list of callee-specified keyword parameters.
-          caller_kwargs.each do |caller_kwarg|
-            search_result = callee_kwargs.map.with_index.find { |kwarg, _| kwarg == caller_kwarg }
-
-            case search_result
-            in nil
-              # If the keyword was never found, then we know we have a
-              # mismatch in the names of the keyword arguments, so we need to
-              # bail.
-              asm.incr_counter(:send_iseq_kwargs_mismatch)
-              return CantCompile
-            in _, callee_idx if callee_idx < keyword_required_num
-              # Keep a count to ensure all required kwargs are specified
-              required_kwargs_filled += 1
-            else
-            end
-          end
-        end
-        assert_equal(true, required_kwargs_filled <= keyword_required_num)
-        if required_kwargs_filled != keyword_required_num
-          asm.incr_counter(:send_iseq_kwargs_mismatch)
-          return CantCompile
-        end
-      end
-
-      # Check if we need the arg0 splat handling of vm_callee_setup_block_arg
-      arg_setup_block = (calling.block_handler == :captured) # arg_setup_type: arg_setup_block (invokeblock)
-      block_arg0_splat = arg_setup_block && argc == 1 &&
-        (iseq.body.param.flags.has_lead || opt_num > 1) &&
-        !iseq.body.param.flags.ambiguous_param0
-      if block_arg0_splat
-        # If block_arg0_splat, we still need side exits after splat, but
-        # doing push_splat_args here disallows it. So bail out.
-        if flags & C::VM_CALL_ARGS_SPLAT != 0 && !iseq_has_rest
-          asm.incr_counter(:invokeblock_iseq_arg0_args_splat)
-          return CantCompile
-        end
-        # The block_arg0_splat implementation is for the rb_simple_iseq_p case,
-        # but doing_kw_call means it's not a simple ISEQ.
-        if doing_kw_call
-          asm.incr_counter(:invokeblock_iseq_arg0_has_kw)
-          return CantCompile
-        end
-        # The block_arg0_splat implementation cannot deal with optional parameters.
-        # This is a setup_parameters_complex() situation and interacts with the
-        # starting position of the callee.
-        if opt_num > 1
-          asm.incr_counter(:invokeblock_iseq_arg0_optional)
-          return CantCompile
-        end
-      end
-      if flags & C::VM_CALL_ARGS_SPLAT != 0 && !iseq_has_rest
-        array = jit.peek_at_stack(block_arg ? 1 : 0)
-        splat_array_length = if array.nil?
-          0
-        else
-          array.length
-        end
-
-        if opt_num == 0 && required_num != splat_array_length + argc - 1
-          asm.incr_counter(:send_iseq_splat_arity_error)
-          return CantCompile
-        end
-      end
-
-      # We will not have CantCompile from here.
-
-      if block_arg
-        ctx.stack_pop(1)
-      end
-
-      if calling.block_handler == C::VM_BLOCK_HANDLER_NONE && iseq.body.builtin_attrs & C::BUILTIN_ATTR_LEAF != 0
-        if jit_leaf_builtin_func(jit, ctx, asm, flags, iseq)
-          return KeepCompiling
-        end
-      end
-
-      # Number of locals that are not parameters
-      num_locals = iseq.body.local_table_size - num_params
-
-      # Stack overflow check
-      # Note that vm_push_frame checks it against a decremented cfp, hence the multiply by 2.
-      # #define CHECK_VM_STACK_OVERFLOW0(cfp, sp, margin)
-      asm.comment('stack overflow check')
-      locals_offs = C.VALUE.size * (num_locals + iseq.body.stack_max) + 2 * C.rb_control_frame_t.size
-      asm.lea(:rax, ctx.sp_opnd(locals_offs))
-      asm.cmp(CFP, :rax)
-      asm.jbe(counted_exit(side_exit(jit, ctx), :send_stackoverflow))
-
-      # push_splat_args does stack manipulation so we can no longer side exit
-      if splat_array_length
-        remaining_opt = (opt_num + required_num) - (splat_array_length + (argc - 1))
-
-        if opt_num > 0
-          # We are going to jump to the correct offset based on how many optional
-          # params are remaining.
-          offset = opt_num - remaining_opt
-          start_pc_offset = iseq.body.param.opt_table[offset]
-        end
-        # We are going to assume that the splat fills
-        # all the remaining arguments. In the generated code
-        # we test if this is true and if not side exit.
-        argc = argc - 1 + splat_array_length + remaining_opt
-        push_splat_args(splat_array_length, jit, ctx, asm)
-
-        remaining_opt.times do
-          # We need to push nil for the optional arguments
-          stack_ret = ctx.stack_push(Type::Unknown)
-          asm.mov(stack_ret, Qnil)
-        end
-      end
-
-      # This is a .send call and we need to adjust the stack
-      if flags & C::VM_CALL_OPT_SEND != 0
-        handle_opt_send_shift_stack(asm, argc, ctx, send_shift:)
-      end
-
-      if iseq_has_rest
-        # We are going to allocate so setting pc and sp.
-        jit_save_pc(jit, asm) # clobbers rax
-        jit_save_sp(ctx, asm)
-
-        if flags & C::VM_CALL_ARGS_SPLAT != 0
-          non_rest_arg_count = argc - 1
-          # We start by dupping the array because someone else might have
-          # a reference to it.
-          array = ctx.stack_pop(1)
-          asm.mov(C_ARGS[0], array)
-          asm.call(C.rb_ary_dup)
-          array = C_RET
-          if non_rest_arg_count > required_num
-            # If we have more arguments than required, we need to prepend
-            # the items from the stack onto the array.
-            diff = (non_rest_arg_count - required_num)
-
-            # diff is >0 so no need to worry about null pointer
-            asm.comment('load pointer to array elements')
-            offset_magnitude = C.VALUE.size * diff
-            values_opnd = ctx.sp_opnd(-offset_magnitude)
-            values_ptr = :rcx
-            asm.lea(values_ptr, values_opnd)
-
-            asm.comment('prepend stack values to rest array')
-            asm.mov(C_ARGS[0], diff)
-            asm.mov(C_ARGS[1], values_ptr)
-            asm.mov(C_ARGS[2], array)
-            asm.call(C.rb_ary_unshift_m)
-            ctx.stack_pop(diff)
-
-            stack_ret = ctx.stack_push(Type::TArray)
-            asm.mov(stack_ret, C_RET)
-            # We now should have the required arguments
-            # and an array of all the rest arguments
-            argc = required_num + 1
-          elsif non_rest_arg_count < required_num
-            # If we have fewer arguments than required, we need to take some
-            # from the array and move them to the stack.
-            diff = (required_num - non_rest_arg_count)
-            # This moves the arguments onto the stack. But it doesn't modify the array.
-            move_rest_args_to_stack(array, diff, jit, ctx, asm)
-
-            # We will now slice the array to give us a new array of the correct size
-            asm.mov(C_ARGS[0], array)
-            asm.mov(C_ARGS[1], diff)
-            asm.call(C.rjit_rb_ary_subseq_length)
-            stack_ret = ctx.stack_push(Type::TArray)
-            asm.mov(stack_ret, C_RET)
-
-            # We now should have the required arguments
-            # and an array of all the rest arguments
-            argc = required_num + 1
-          else
-            # The arguments are equal so we can just push to the stack
-            assert_equal(non_rest_arg_count, required_num)
-            stack_ret = ctx.stack_push(Type::TArray)
-            asm.mov(stack_ret, array)
-          end
-        else
-          assert_equal(true, argc >= required_num)
-          n = (argc - required_num)
-          argc = required_num + 1
-          # If n is 0, then elts is never going to be read, so we can just pass null
-          if n == 0
-            values_ptr = 0
-          else
-            asm.comment('load pointer to array elements')
-            offset_magnitude = C.VALUE.size * n
-            values_opnd = ctx.sp_opnd(-offset_magnitude)
-            values_ptr = :rcx
-            asm.lea(values_ptr, values_opnd)
-          end
-
-          asm.mov(C_ARGS[0], EC)
-          asm.mov(C_ARGS[1], n)
-          asm.mov(C_ARGS[2], values_ptr)
-          asm.call(C.rb_ec_ary_new_from_values)
-
-          ctx.stack_pop(n)
-          stack_ret = ctx.stack_push(Type::TArray)
-          asm.mov(stack_ret, C_RET)
-        end
-      end
-
-      if doing_kw_call
-        # Here we're calling a method with keyword arguments and specifying
-        # keyword arguments at this call site.
-
-        # Number of positional arguments the callee expects before the first
-        # keyword argument
-        args_before_kw = required_num + opt_num
-
-        # This struct represents the metadata about the caller-specified
-        # keyword arguments.
-        ci_kwarg = calling.kwarg
-        caller_keyword_len = if ci_kwarg.nil?
-          0
-        else
-          ci_kwarg.keyword_len
-        end
-
-        # This struct represents the metadata about the callee-specified
-        # keyword parameters.
-        keyword = iseq.body.param.keyword
-
-        asm.comment('keyword args')
-
-        # This is the list of keyword arguments that the callee specified
-        # in its initial declaration.
-        callee_kwargs = keyword.table
-        total_kwargs = keyword.num
-
-        # Here we're going to build up a list of the IDs that correspond to
-        # the caller-specified keyword arguments. If they're not in the
-        # same order as the order specified in the callee declaration, then
-        # we're going to need to generate some code to swap values around
-        # on the stack.
-        caller_kwargs = []
-
-        caller_keyword_len.times do |kwarg_idx|
-          sym = C.to_ruby(ci_kwarg[:keywords][kwarg_idx])
-          caller_kwargs << C.rb_sym2id(sym)
-        end
-        kwarg_idx = caller_keyword_len
-
-        unspecified_bits = 0
-
-        keyword_required_num = keyword.required_num
-        (keyword_required_num...total_kwargs).each do |callee_idx|
-          already_passed = false
-          callee_kwarg = callee_kwargs[callee_idx]
-
-          caller_keyword_len.times do |caller_idx|
-            if caller_kwargs[caller_idx] == callee_kwarg
-              already_passed = true
-              break
-            end
-          end
-
-          unless already_passed
-            # Reserve space on the stack for each default value we'll be
-            # filling in (which is done in the next loop). Also increments
-            # argc so that the callee's SP is recorded correctly.
-            argc += 1
-            default_arg = ctx.stack_push(Type::Unknown)
-
-            # callee_idx - keyword->required_num is used in a couple of places below.
-            req_num = keyword.required_num
-            extra_args = callee_idx - req_num
-
-            # VALUE default_value = keyword->default_values[callee_idx - keyword->required_num];
-            default_value = keyword.default_values[extra_args]
-
-            if default_value == Qundef
-              # Qundef means that this value is not constant and must be
-              # recalculated at runtime, so we record it in unspecified_bits
-              # (Qnil is then used as a placeholder instead of Qundef).
-              unspecified_bits |= 0x01 << extra_args
-              default_value = Qnil
-            end
-
-            asm.mov(:rax, default_value)
-            asm.mov(default_arg, :rax)
-
-            caller_kwargs[kwarg_idx] = callee_kwarg
-            kwarg_idx += 1
-          end
-        end
-
-        assert_equal(kwarg_idx, total_kwargs)
-
-        # Next, we're going to loop through every keyword that was
-        # specified by the caller and make sure that it's in the correct
-        # place. If it's not we're going to swap it around with another one.
-        total_kwargs.times do |kwarg_idx|
-          callee_kwarg = callee_kwargs[kwarg_idx]
-
-          # If the argument is already in the right order, then we don't
-          # need to generate any code since the expected value is already
-          # in the right place on the stack.
-          if callee_kwarg == caller_kwargs[kwarg_idx]
-            next
-          end
-
-          # In this case the argument is not in the right place, so we
-          # need to find its position where it _should_ be and swap with
-          # that location.
-          ((kwarg_idx + 1)...total_kwargs).each do |swap_idx|
-            if callee_kwarg == caller_kwargs[swap_idx]
-              # First we're going to generate the code that is going
-              # to perform the actual swapping at runtime.
-              offset0 = argc - 1 - swap_idx - args_before_kw
-              offset1 = argc - 1 - kwarg_idx - args_before_kw
-              stack_swap(jit, ctx, asm, offset0, offset1)
-
-              # Next we're going to do some bookkeeping on our end so
-              # that we know the order that the arguments are
-              # actually in now.
-              caller_kwargs[kwarg_idx], caller_kwargs[swap_idx] =
-                caller_kwargs[swap_idx], caller_kwargs[kwarg_idx]
-
-              break
-            end
-          end
-        end
-
-        # Keyword arguments cause a special extra local variable to be
-        # pushed onto the stack that represents the parameters that weren't
-        # explicitly given a value and have a non-constant default.
-        asm.mov(ctx.stack_opnd(-1), C.to_value(unspecified_bits))
-      end
-
-      # Same as vm_callee_setup_block_arg_arg0_check and vm_callee_setup_block_arg_arg0_splat
-      # on vm_callee_setup_block_arg for arg_setup_block. This is done after CALLER_SETUP_ARG
-      # and CALLER_REMOVE_EMPTY_KW_SPLAT, so this implementation is put here. This may need
-      # side exits, so you still need to allow side exits here if block_arg0_splat is true.
-      # Note that you can't have side exits after this arg0 splat.
-      if block_arg0_splat
-        asm.incr_counter(:send_iseq_block_arg0_splat)
-        return CantCompile
-      end
-
-      # Create a context for the callee
-      callee_ctx = Context.new
-
-      # Set the argument types in the callee's context
-      argc.times do |arg_idx|
-        stack_offs = argc - arg_idx - 1
-        arg_type = ctx.get_opnd_type(StackOpnd[stack_offs])
-        callee_ctx.set_local_type(arg_idx, arg_type)
-      end
-
-      recv_type = if calling.block_handler == :captured
-        Type::Unknown # we don't track the type information of captured->self for now
-      else
-        ctx.get_opnd_type(StackOpnd[argc])
-      end
-      callee_ctx.upgrade_opnd_type(SelfOpnd, recv_type)
-
-      # Setup the new frame
-      frame_type ||= C::VM_FRAME_MAGIC_METHOD | C::VM_ENV_FLAG_LOCAL
-      jit_push_frame(
-        jit, ctx, asm, cme, flags, argc, frame_type, calling.block_handler,
-        iseq:       iseq,
-        local_size: num_locals,
-        stack_max:  iseq.body.stack_max,
-        prev_ep:,
-        doing_kw_call:,
-      )
-
-      # Directly jump to the entry point of the callee
-      pc = (iseq.body.iseq_encoded + start_pc_offset).to_i
-      jit_direct_jump(iseq, pc, callee_ctx, asm)
-
-      EndBlock
-    end
-
-    def jit_leaf_builtin_func(jit, ctx, asm, flags, iseq)
-      builtin_func = builtin_function(iseq)
-      if builtin_func.nil?
-        return false
-      end
-
-      # this is a .send call not currently supported for builtins
-      if flags & C::VM_CALL_OPT_SEND != 0
-        return false
-      end
-
-      builtin_argc = builtin_func.argc
-      if builtin_argc + 1 >= C_ARGS.size
-        return false
-      end
-
-      asm.comment('inlined leaf builtin')
-
-      # Skip this if it doesn't trigger GC
-      if iseq.body.builtin_attrs & C::BUILTIN_ATTR_NO_GC == 0
-        # The callee may allocate, e.g. Integer#abs on a Bignum.
-        # Save SP for GC, save PC for allocation tracing, and prepare
-        # for global invalidation after GC's VM lock contention.
-        jit_prepare_routine_call(jit, ctx, asm)
-      end
-
-      # Call the builtin func (ec, recv, arg1, arg2, ...)
-      asm.mov(C_ARGS[0], EC)
-
-      # Copy self and arguments
-      (0..builtin_argc).each do |i|
-        stack_opnd = ctx.stack_opnd(builtin_argc - i)
-        asm.mov(C_ARGS[i + 1], stack_opnd)
-      end
-      ctx.stack_pop(builtin_argc + 1)
-      asm.call(builtin_func.func_ptr)
-
-      # Push the return value
-      stack_ret = ctx.stack_push(Type::Unknown)
-      asm.mov(stack_ret, C_RET)
-      return true
-    end
-
-    # vm_call_cfunc
-    # @param jit [RubyVM::RJIT::JITState]
-    # @param ctx [RubyVM::RJIT::Context]
-    # @param asm [RubyVM::RJIT::Assembler]
-    def jit_call_cfunc(jit, ctx, asm, cme, calling, known_recv_class: nil)
-      argc = calling.argc
-      flags = calling.flags
-
-      cfunc = cme.def.body.cfunc
-      cfunc_argc = cfunc.argc
-
-      # If the function expects a Ruby array of arguments
-      if cfunc_argc < 0 && cfunc_argc != -1
-        asm.incr_counter(:send_cfunc_ruby_array_varg)
-        return CantCompile
-      end
-
-      # We aren't handling a vararg cfuncs with splat currently.
-      if flags & C::VM_CALL_ARGS_SPLAT != 0 && cfunc_argc == -1
-        asm.incr_counter(:send_args_splat_cfunc_var_args)
-        return CantCompile
-      end
-
-      if flags & C::VM_CALL_ARGS_SPLAT != 0 && flags & C::VM_CALL_ZSUPER != 0
-        # zsuper methods are super calls without any arguments.
-        # They are also marked as splat, but don't actually have an array
-        # they pull arguments from, instead we need to change to call
-        # a different method with the current stack.
-        asm.incr_counter(:send_args_splat_cfunc_zuper)
-        return CantCompile;
-      end
-
-      # In order to handle backwards compatibility between ruby 3 and 2
-      # ruby2_keywords was introduced. It is called only on methods
-      # with splat and changes they way they handle them.
-      # We are just going to not compile these.
-      # https://docs.ruby-lang.org/en/3.2/Module.html#method-i-ruby2_keywords
-      if jit.iseq.body.param.flags.ruby2_keywords && flags & C::VM_CALL_ARGS_SPLAT != 0
-        asm.incr_counter(:send_args_splat_cfunc_ruby2_keywords)
-        return CantCompile;
-      end
-
-      kw_arg = calling.kwarg
-      kw_arg_num = if kw_arg.nil?
-        0
-      else
-        kw_arg.keyword_len
-      end
-
-      if kw_arg_num != 0 && flags & C::VM_CALL_ARGS_SPLAT != 0
-        asm.incr_counter(:send_cfunc_splat_with_kw)
-        return CantCompile
-      end
-
-      if c_method_tracing_currently_enabled?
-        # Don't JIT if tracing c_call or c_return
-        asm.incr_counter(:send_cfunc_tracing)
-        return CantCompile
-      end
-
-      # Delegate to codegen for C methods if we have it.
-      if kw_arg.nil? && flags & C::VM_CALL_OPT_SEND == 0 && flags & C::VM_CALL_ARGS_SPLAT == 0 && (cfunc_argc == -1 || argc == cfunc_argc)
-        known_cfunc_codegen = lookup_cfunc_codegen(cme.def)
-        if known_cfunc_codegen&.call(jit, ctx, asm, argc, known_recv_class)
-          # cfunc codegen generated code. Terminate the block so
-          # there isn't multiple calls in the same block.
-          jump_to_next_insn(jit, ctx, asm)
-          return EndBlock
-        end
-      end
-
-      # Check for interrupts
-      jit_check_ints(jit, ctx, asm)
-
-      # Stack overflow check
-      # #define CHECK_VM_STACK_OVERFLOW0(cfp, sp, margin)
-      # REG_CFP <= REG_SP + 4 * SIZEOF_VALUE + sizeof(rb_control_frame_t)
-      asm.comment('stack overflow check')
-      asm.lea(:rax, ctx.sp_opnd(C.VALUE.size * 4 + 2 * C.rb_control_frame_t.size))
-      asm.cmp(CFP, :rax)
-      asm.jbe(counted_exit(side_exit(jit, ctx), :send_stackoverflow))
-
-      # Number of args which will be passed through to the callee
-      # This is adjusted by the kwargs being combined into a hash.
-      passed_argc = if kw_arg.nil?
-        argc
-      else
-        argc - kw_arg_num + 1
-      end
-
-      # If the argument count doesn't match
-      if cfunc_argc >= 0 && cfunc_argc != passed_argc && flags & C::VM_CALL_ARGS_SPLAT == 0
-        asm.incr_counter(:send_cfunc_argc_mismatch)
-        return CantCompile
-      end
-
-      # Don't JIT functions that need C stack arguments for now
-      if cfunc_argc >= 0 && passed_argc + 1 > C_ARGS.size
-        asm.incr_counter(:send_cfunc_toomany_args)
-        return CantCompile
-      end
-
-      block_arg = flags & C::VM_CALL_ARGS_BLOCKARG != 0
-
-      # Guard block_arg_type
-      if guard_block_arg(jit, ctx, asm, calling) == CantCompile
-        return CantCompile
-      end
-
-      if block_arg
-        ctx.stack_pop(1)
-      end
-
-      # push_splat_args does stack manipulation so we can no longer side exit
-      if flags & C::VM_CALL_ARGS_SPLAT != 0
-        assert_equal(true, cfunc_argc >= 0)
-        required_args = cfunc_argc - (argc - 1)
-        # + 1 because we pass self
-        if required_args + 1 >= C_ARGS.size
-          asm.incr_counter(:send_cfunc_toomany_args)
-          return CantCompile
-        end
-
-        # We are going to assume that the splat fills
-        # all the remaining arguments. So the number of args
-        # should just equal the number of args the cfunc takes.
-        # In the generated code we test if this is true
-        # and if not side exit.
-        argc = cfunc_argc
-        passed_argc = argc
-        push_splat_args(required_args, jit, ctx, asm)
-      end
-
-      # This is a .send call and we need to adjust the stack
-      if flags & C::VM_CALL_OPT_SEND != 0
-        handle_opt_send_shift_stack(asm, argc, ctx, send_shift: calling.send_shift)
-      end
-
-      # Points to the receiver operand on the stack
-
-      # Store incremented PC into current control frame in case callee raises.
-      jit_save_pc(jit, asm)
-
-      # Increment the stack pointer by 3 (in the callee)
-      # sp += 3
-
-      frame_type = C::VM_FRAME_MAGIC_CFUNC | C::VM_FRAME_FLAG_CFRAME | C::VM_ENV_FLAG_LOCAL
-      if kw_arg
-        frame_type |= C::VM_FRAME_FLAG_CFRAME_KW
-      end
-
-      jit_push_frame(jit, ctx, asm, cme, flags, argc, frame_type, calling.block_handler)
-
-      if kw_arg
-        # Build a hash from all kwargs passed
-        asm.comment('build_kwhash')
-        imemo_ci = calling.ci_addr
-        # we assume all callinfos with kwargs are on the GC heap
-        assert_equal(true, C.imemo_type_p(imemo_ci, C.imemo_callinfo))
-        asm.mov(C_ARGS[0], imemo_ci)
-        asm.lea(C_ARGS[1], ctx.sp_opnd(0))
-        asm.call(C.rjit_build_kwhash)
-
-        # Replace the stack location at the start of kwargs with the new hash
-        stack_opnd = ctx.stack_opnd(argc - passed_argc)
-        asm.mov(stack_opnd, C_RET)
-      end
-
-      # Copy SP because REG_SP will get overwritten
-      sp = :rax
-      asm.lea(sp, ctx.sp_opnd(0))
-
-      # Pop the C function arguments from the stack (in the caller)
-      ctx.stack_pop(argc + 1)
-
-      # Write interpreter SP into CFP.
-      # Needed in case the callee yields to the block.
-      jit_save_sp(ctx, asm)
-
-      # Non-variadic method
-      case cfunc_argc
-      in (0..) # Non-variadic method
-        # Copy the arguments from the stack to the C argument registers
-        # self is the 0th argument and is at index argc from the stack top
-        (0..passed_argc).each do |i|
-          asm.mov(C_ARGS[i], [sp, -(argc + 1 - i) * C.VALUE.size])
-        end
-      in -1 # Variadic method: rb_f_puts(int argc, VALUE *argv, VALUE recv)
-        # The method gets a pointer to the first argument
-        # rb_f_puts(int argc, VALUE *argv, VALUE recv)
-        asm.mov(C_ARGS[0], passed_argc)
-        asm.lea(C_ARGS[1], [sp, -argc * C.VALUE.size]) # argv
-        asm.mov(C_ARGS[2], [sp, -(argc + 1) * C.VALUE.size]) # recv
-      end
-
-      # Call the C function
-      # VALUE ret = (cfunc->func)(recv, argv[0], argv[1]);
-      # cfunc comes from compile-time cme->def, which we assume to be stable.
-      # Invalidation logic is in yjit_method_lookup_change()
-      asm.comment('call C function')
-      asm.mov(:rax, cfunc.func)
-      asm.call(:rax) # TODO: use rel32 if close enough
-
-      # Record code position for TracePoint patching. See full_cfunc_return().
-      Invariants.record_global_inval_patch(asm, full_cfunc_return)
-
-      # Push the return value on the Ruby stack
-      stack_ret = ctx.stack_push(Type::Unknown)
-      asm.mov(stack_ret, C_RET)
-
-      # Pop the stack frame (ec->cfp++)
-      # Instead of recalculating, we can reuse the previous CFP, which is stored in a callee-saved
-      # register
-      asm.mov([EC, C.rb_execution_context_t.offsetof(:cfp)], CFP)
-
-      # cfunc calls may corrupt types
-      ctx.clear_local_types
-
-      # Note: the return block of jit_call_iseq has ctx->sp_offset == 1
-      # which allows for sharing the same successor.
-
-      # Jump (fall through) to the call continuation block
-      # We do this to end the current block after the call
-      assert_equal(1, ctx.sp_offset)
-      jump_to_next_insn(jit, ctx, asm)
-      EndBlock
-    end
-
-    # vm_call_attrset
-    # @param jit [RubyVM::RJIT::JITState]
-    # @param ctx [RubyVM::RJIT::Context]
-    # @param asm [RubyVM::RJIT::Assembler]
-    def jit_call_attrset(jit, ctx, asm, cme, calling, comptime_recv, recv_opnd)
-      argc = calling.argc
-      flags = calling.flags
-      send_shift = calling.send_shift
-
-      if flags & C::VM_CALL_ARGS_SPLAT != 0
-        asm.incr_counter(:send_attrset_splat)
-        return CantCompile
-      end
-      if flags & C::VM_CALL_KWARG != 0
-        asm.incr_counter(:send_attrset_kwarg)
-        return CantCompile
-      elsif argc != 1 || !C.RB_TYPE_P(comptime_recv, C::RUBY_T_OBJECT)
-        asm.incr_counter(:send_attrset_method)
-        return CantCompile
-      elsif c_method_tracing_currently_enabled?
-        # Can't generate code for firing c_call and c_return events
-        # See :attr-tracing:
-        asm.incr_counter(:send_c_tracingg)
-        return CantCompile
-      elsif flags & C::VM_CALL_ARGS_BLOCKARG != 0
-        asm.incr_counter(:send_block_arg)
-        return CantCompile
-      end
-
-      ivar_name = cme.def.body.attr.id
-
-      # This is a .send call and we need to adjust the stack
-      if flags & C::VM_CALL_OPT_SEND != 0
-        handle_opt_send_shift_stack(asm, argc, ctx, send_shift:)
-      end
-
-      # Save the PC and SP because the callee may allocate
-      # Note that this modifies REG_SP, which is why we do it first
-      jit_prepare_routine_call(jit, ctx, asm)
-
-      # Get the operands from the stack
-      val_opnd = ctx.stack_pop(1)
-      recv_opnd = ctx.stack_pop(1)
-
-      # Call rb_vm_set_ivar_id with the receiver, the ivar name, and the value
-      asm.mov(C_ARGS[0], recv_opnd)
-      asm.mov(C_ARGS[1], ivar_name)
-      asm.mov(C_ARGS[2], val_opnd)
-      asm.call(C.rb_vm_set_ivar_id)
-
-      out_opnd = ctx.stack_push(Type::Unknown)
-      asm.mov(out_opnd, C_RET)
-
-      KeepCompiling
-    end
-
-    # vm_call_ivar (+ part of vm_call_method_each_type)
-    # @param jit [RubyVM::RJIT::JITState]
-    # @param ctx [RubyVM::RJIT::Context]
-    # @param asm [RubyVM::RJIT::Assembler]
-    def jit_call_ivar(jit, ctx, asm, cme, calling, comptime_recv, recv_opnd)
-      argc = calling.argc
-      flags = calling.flags
-
-      if flags & C::VM_CALL_ARGS_SPLAT != 0
-        asm.incr_counter(:send_ivar_splat)
-        return CantCompile
-      end
-
-      if argc != 0
-        asm.incr_counter(:send_arity)
-        return CantCompile
-      end
-
-      # We don't support handle_opt_send_shift_stack for this yet.
-      if flags & C::VM_CALL_OPT_SEND != 0
-        asm.incr_counter(:send_ivar_opt_send)
-        return CantCompile
-      end
-
-      ivar_id = cme.def.body.attr.id
-
-      # Not handling block_handler
-      if flags & C::VM_CALL_ARGS_BLOCKARG != 0
-        asm.incr_counter(:send_block_arg)
-        return CantCompile
-      end
-
-      jit_getivar(jit, ctx, asm, comptime_recv, ivar_id, recv_opnd, StackOpnd[0])
-    end
-
-    # vm_call_bmethod
-    # @param jit [RubyVM::RJIT::JITState]
-    # @param ctx [RubyVM::RJIT::Context]
-    # @param asm [RubyVM::RJIT::Assembler]
-    def jit_call_bmethod(jit, ctx, asm, calling, cme, comptime_recv, recv_opnd, known_recv_class)
-      proc_addr = cme.def.body.bmethod.proc
-
-      proc_t = C.rb_yjit_get_proc_ptr(proc_addr)
-      proc_block = proc_t.block
-
-      if proc_block.type != C.block_type_iseq
-        asm.incr_counter(:send_bmethod_not_iseq)
-        return CantCompile
-      end
-
-      capture = proc_block.as.captured
-      iseq = capture.code.iseq
-
-      # TODO: implement this
-      # Optimize for single ractor mode and avoid runtime check for
-      # "defined with an un-shareable Proc in a different Ractor"
-      # if !assume_single_ractor_mode(jit, ocb)
-      #     return CantCompile;
-      # end
-
-      # Passing a block to a block needs logic different from passing
-      # a block to a method and sometimes requires allocation. Bail for now.
-      if calling.block_handler != C::VM_BLOCK_HANDLER_NONE
-        asm.incr_counter(:send_bmethod_blockarg)
-        return CantCompile
-      end
-
-      jit_call_iseq(
-        jit, ctx, asm, cme, calling, iseq,
-        frame_type: C::VM_FRAME_MAGIC_BLOCK | C::VM_FRAME_FLAG_BMETHOD | C::VM_FRAME_FLAG_LAMBDA,
-        prev_ep: capture.ep,
-      )
-    end
-
-    # vm_call_alias
-    # @param jit [RubyVM::RJIT::JITState]
-    # @param ctx [RubyVM::RJIT::Context]
-    # @param asm [RubyVM::RJIT::Assembler]
-    def jit_call_alias(jit, ctx, asm, calling, cme, comptime_recv, recv_opnd, known_recv_class)
-      cme = C.rb_aliased_callable_method_entry(cme)
-      jit_call_method_each_type(jit, ctx, asm, calling, cme, comptime_recv, recv_opnd, known_recv_class)
-    end
-
-    # vm_call_optimized
-    # @param jit [RubyVM::RJIT::JITState]
-    # @param ctx [RubyVM::RJIT::Context]
-    # @param asm [RubyVM::RJIT::Assembler]
-    def jit_call_optimized(jit, ctx, asm, cme, calling, known_recv_class)
-      if calling.flags & C::VM_CALL_ARGS_BLOCKARG != 0
-        # Not working yet
-        asm.incr_counter(:send_block_arg)
-        return CantCompile
-      end
-
-      case cme.def.body.optimized.type
-      in C::OPTIMIZED_METHOD_TYPE_SEND
-        jit_call_opt_send(jit, ctx, asm, cme, calling, known_recv_class)
-      in C::OPTIMIZED_METHOD_TYPE_CALL
-        jit_call_opt_call(jit, ctx, asm, cme, calling.flags, calling.argc, calling.block_handler, known_recv_class, send_shift: calling.send_shift)
-      in C::OPTIMIZED_METHOD_TYPE_BLOCK_CALL
-        asm.incr_counter(:send_optimized_block_call)
-        return CantCompile
-      in C::OPTIMIZED_METHOD_TYPE_STRUCT_AREF
-        jit_call_opt_struct_aref(jit, ctx, asm, cme, calling.flags, calling.argc, calling.block_handler, known_recv_class, send_shift: calling.send_shift)
-      in C::OPTIMIZED_METHOD_TYPE_STRUCT_ASET
-        asm.incr_counter(:send_optimized_struct_aset)
-        return CantCompile
-      end
-    end
-
-    # vm_call_opt_send
-    # @param jit [RubyVM::RJIT::JITState]
-    # @param ctx [RubyVM::RJIT::Context]
-    # @param asm [RubyVM::RJIT::Assembler]
-    def jit_call_opt_send(jit, ctx, asm, cme, calling, known_recv_class)
-      if jit_caller_setup_arg(jit, ctx, asm, calling.flags) == CantCompile
-        return CantCompile
-      end
-
-      if calling.argc == 0
-        asm.incr_counter(:send_optimized_send_no_args)
-        return CantCompile
-      end
-
-      calling.argc -= 1
-      # We aren't handling `send(:send, ...)` yet. This might work, but not tested yet.
-      if calling.send_shift > 0
-        asm.incr_counter(:send_optimized_send_send)
-        return CantCompile
-      end
-      # Lazily handle stack shift in handle_opt_send_shift_stack
-      calling.send_shift += 1
-
-      jit_call_symbol(jit, ctx, asm, cme, calling, known_recv_class, C::VM_CALL_FCALL)
-    end
-
-    # vm_call_opt_call
-    # @param jit [RubyVM::RJIT::JITState]
-    # @param ctx [RubyVM::RJIT::Context]
-    # @param asm [RubyVM::RJIT::Assembler]
-    def jit_call_opt_call(jit, ctx, asm, cme, flags, argc, block_handler, known_recv_class, send_shift:)
-      if block_handler != C::VM_BLOCK_HANDLER_NONE
-        asm.incr_counter(:send_optimized_call_block)
-        return CantCompile
-      end
-
-      if flags & C::VM_CALL_KWARG != 0
-        asm.incr_counter(:send_optimized_call_kwarg)
-        return CantCompile
-      end
-
-      if flags & C::VM_CALL_ARGS_SPLAT != 0
-        asm.incr_counter(:send_optimized_call_splat)
-        return CantCompile
-      end
-
-      # TODO: implement this
-      # Optimize for single ractor mode and avoid runtime check for
-      # "defined with an un-shareable Proc in a different Ractor"
-      # if !assume_single_ractor_mode(jit, ocb)
-      #   return CantCompile
-      # end
-
-      # If this is a .send call we need to adjust the stack
-      if flags & C::VM_CALL_OPT_SEND != 0
-        handle_opt_send_shift_stack(asm, argc, ctx, send_shift:)
-      end
-
-      # About to reset the SP, need to load this here
-      recv_idx = argc # blockarg is not supported. send_shift is already handled.
-      asm.mov(:rcx, ctx.stack_opnd(recv_idx)) # recv
-
-      # Save the PC and SP because the callee can make Ruby calls
-      jit_prepare_routine_call(jit, ctx, asm) # NOTE: clobbers rax
-
-      asm.lea(:rax, ctx.sp_opnd(0)) # sp
-
-      kw_splat = flags & C::VM_CALL_KW_SPLAT
-
-      asm.mov(C_ARGS[0], :rcx)
-      asm.mov(C_ARGS[1], EC)
-      asm.mov(C_ARGS[2], argc)
-      asm.lea(C_ARGS[3], [:rax, -argc * C.VALUE.size]) # stack_argument_pointer. NOTE: C_ARGS[3] is rcx
-      asm.mov(C_ARGS[4], kw_splat)
-      asm.mov(C_ARGS[5], C::VM_BLOCK_HANDLER_NONE)
-      asm.call(C.rjit_optimized_call)
-
-      ctx.stack_pop(argc + 1)
-
-      stack_ret = ctx.stack_push(Type::Unknown)
-      asm.mov(stack_ret, C_RET)
-      return KeepCompiling
-    end
-
-    # vm_call_opt_struct_aref
-    # @param jit [RubyVM::RJIT::JITState]
-    # @param ctx [RubyVM::RJIT::Context]
-    # @param asm [RubyVM::RJIT::Assembler]
-    def jit_call_opt_struct_aref(jit, ctx, asm, cme, flags, argc, block_handler, known_recv_class, send_shift:)
-      if argc != 0
-        asm.incr_counter(:send_optimized_struct_aref_error)
-        return CantCompile
-      end
-
-      off = cme.def.body.optimized.index
-
-      recv_idx = argc # blockarg is not supported
-      recv_idx += send_shift
-      comptime_recv = jit.peek_at_stack(recv_idx)
-
-      # This is a .send call and we need to adjust the stack
-      if flags & C::VM_CALL_OPT_SEND != 0
-        handle_opt_send_shift_stack(asm, argc, ctx, send_shift:)
-      end
-
-      # All structs from the same Struct class should have the same
-      # length. So if our comptime_recv is embedded all runtime
-      # structs of the same class should be as well, and the same is
-      # true of the converse.
-      embedded = C::FL_TEST_RAW(comptime_recv, C::RSTRUCT_EMBED_LEN_MASK)
-
-      asm.comment('struct aref')
-      asm.mov(:rax, ctx.stack_pop(1)) # recv
-
-      if embedded
-        asm.mov(:rax, [:rax, C.RStruct.offsetof(:as, :ary) + (C.VALUE.size * off)])
-      else
-        asm.mov(:rax, [:rax, C.RStruct.offsetof(:as, :heap, :ptr)])
-        asm.mov(:rax, [:rax, C.VALUE.size * off])
-      end
-
-      ret = ctx.stack_push(Type::Unknown)
-      asm.mov(ret, :rax)
-
-      jump_to_next_insn(jit, ctx, asm)
-      EndBlock
-    end
-
-    # vm_call_opt_send (lazy part)
-    # @param ctx [RubyVM::RJIT::Context]
-    # @param asm [RubyVM::RJIT::Assembler]
-    def handle_opt_send_shift_stack(asm, argc, ctx, send_shift:)
-      # We don't support `send(:send, ...)` for now.
-      assert_equal(1, send_shift)
-
-      asm.comment('shift stack')
-      (0...argc).reverse_each do |i|
-        opnd = ctx.stack_opnd(i)
-        opnd2 = ctx.stack_opnd(i + 1)
-        asm.mov(:rax, opnd)
-        asm.mov(opnd2, :rax)
-      end
-
-      ctx.shift_stack(argc)
-    end
-
-    # vm_call_symbol
-    # @param jit [RubyVM::RJIT::JITState]
-    # @param ctx [RubyVM::RJIT::Context]
-    # @param asm [RubyVM::RJIT::Assembler]
-    def jit_call_symbol(jit, ctx, asm, cme, calling, known_recv_class, flags)
-      flags |= C::VM_CALL_OPT_SEND | (calling.kw_splat ? C::VM_CALL_KW_SPLAT : 0)
-
-      comptime_symbol = jit.peek_at_stack(calling.argc)
-      if comptime_symbol.class != String && !static_symbol?(comptime_symbol)
-        asm.incr_counter(:send_optimized_send_not_sym_or_str)
-        return CantCompile
-      end
-
-      mid = C.get_symbol_id(comptime_symbol)
-      if mid == 0
-        asm.incr_counter(:send_optimized_send_null_mid)
-        return CantCompile
-      end
-
-      asm.comment("Guard #{comptime_symbol.inspect} is on stack")
-      class_changed_exit = counted_exit(side_exit(jit, ctx), :send_optimized_send_mid_class_changed)
-      jit_guard_known_klass(
-        jit, ctx, asm, C.rb_class_of(comptime_symbol), ctx.stack_opnd(calling.argc),
-        StackOpnd[calling.argc], comptime_symbol, class_changed_exit,
-      )
-      asm.mov(C_ARGS[0], ctx.stack_opnd(calling.argc))
-      asm.call(C.rb_get_symbol_id)
-      asm.cmp(C_RET, mid)
-      id_changed_exit = counted_exit(side_exit(jit, ctx), :send_optimized_send_mid_id_changed)
-      jit_chain_guard(:jne, jit, ctx, asm, id_changed_exit)
-
-      # rb_callable_method_entry_with_refinements
-      calling.flags = flags
-      cme, _ = jit_search_method(jit, ctx, asm, mid, calling)
-      if cme == CantCompile
-        return CantCompile
-      end
-
-      if flags & C::VM_CALL_FCALL != 0
-        return jit_call_method(jit, ctx, asm, mid, calling, cme, known_recv_class)
-      end
-
-      raise NotImplementedError # unreachable for now
-    end
-
-    # vm_push_frame
-    #
-    # Frame structure:
-    # | args | locals | cme/cref | block_handler/prev EP | frame type (EP here) | stack bottom (SP here)
-    #
-    # @param jit [RubyVM::RJIT::JITState]
-    # @param ctx [RubyVM::RJIT::Context]
-    # @param asm [RubyVM::RJIT::Assembler]
-    def jit_push_frame(jit, ctx, asm, cme, flags, argc, frame_type, block_handler, iseq: nil, local_size: 0, stack_max: 0, prev_ep: nil, doing_kw_call: nil)
-      # Save caller SP and PC before pushing a callee frame for backtrace and side exits
-      asm.comment('save SP to caller CFP')
-      recv_idx = argc # blockarg is already popped
-      recv_idx += (block_handler == :captured) ? 0 : 1 # receiver is not on stack when captured->self is used
-      if iseq
-        # Skip setting this to SP register. This cfp->sp will be copied to SP on leave insn.
-        asm.lea(:rax, ctx.sp_opnd(C.VALUE.size * -recv_idx)) # Pop receiver and arguments to prepare for side exits
-        asm.mov([CFP, C.rb_control_frame_t.offsetof(:sp)], :rax)
-      else
-        asm.lea(SP, ctx.sp_opnd(C.VALUE.size * -recv_idx))
-        asm.mov([CFP, C.rb_control_frame_t.offsetof(:sp)], SP)
-        ctx.sp_offset = recv_idx
-      end
-      jit_save_pc(jit, asm, comment: 'save PC to caller CFP')
-
-      sp_offset = ctx.sp_offset + 3 + local_size + (doing_kw_call ? 1 : 0) # callee_sp
-      local_size.times do |i|
-        asm.comment('set local variables') if i == 0
-        local_index = sp_offset + i - local_size - 3
-        asm.mov([SP, C.VALUE.size * local_index], Qnil)
-      end
-
-      asm.comment('set up EP with managing data')
-      ep_offset = sp_offset - 1
-      # ep[-2]: cref_or_me
-      asm.mov(:rax, cme.to_i)
-      asm.mov([SP, C.VALUE.size * (ep_offset - 2)], :rax)
-      # ep[-1]: block handler or prev env ptr (specval)
-      if prev_ep
-        asm.mov(:rax, prev_ep.to_i | 1) # tagged prev ep
-        asm.mov([SP, C.VALUE.size * (ep_offset - 1)], :rax)
-      elsif block_handler == :captured
-        # Set captured->ep, saving captured in :rcx for captured->self
-        ep_reg = :rcx
-        jit_get_lep(jit, asm, reg: ep_reg)
-        asm.mov(:rcx, [ep_reg, C.VALUE.size * C::VM_ENV_DATA_INDEX_SPECVAL]) # block_handler
-        asm.and(:rcx, ~0x3) # captured
-        asm.mov(:rax, [:rcx, C.VALUE.size]) # captured->ep
-        asm.or(:rax, 0x1) # GC_GUARDED_PTR
-        asm.mov([SP, C.VALUE.size * (ep_offset - 1)], :rax)
-      elsif block_handler == C::VM_BLOCK_HANDLER_NONE
-        asm.mov([SP, C.VALUE.size * (ep_offset - 1)], C::VM_BLOCK_HANDLER_NONE)
-      elsif block_handler == C.rb_block_param_proxy
-        # vm_caller_setup_arg_block: block_code == rb_block_param_proxy
-        jit_get_lep(jit, asm, reg: :rax) # VM_CF_BLOCK_HANDLER: VM_CF_LEP
-        asm.mov(:rax, [:rax, C.VALUE.size * C::VM_ENV_DATA_INDEX_SPECVAL]) # VM_CF_BLOCK_HANDLER: VM_ENV_BLOCK_HANDLER
-        asm.mov([CFP, C.rb_control_frame_t.offsetof(:block_code)], :rax) # reg_cfp->block_code = handler
-        asm.mov([SP, C.VALUE.size * (ep_offset - 1)], :rax) # return handler;
-      else # assume blockiseq
-        asm.mov(:rax, block_handler)
-        asm.mov([CFP, C.rb_control_frame_t.offsetof(:block_code)], :rax)
-        asm.lea(:rax, [CFP, C.rb_control_frame_t.offsetof(:self)]) # VM_CFP_TO_CAPTURED_BLOCK
-        asm.or(:rax, 1) # VM_BH_FROM_ISEQ_BLOCK
-        asm.mov([SP, C.VALUE.size * (ep_offset - 1)], :rax)
-      end
-      # ep[-0]: ENV_FLAGS
-      asm.mov([SP, C.VALUE.size * (ep_offset - 0)], frame_type)
-
-      asm.comment('set up new frame')
-      cfp_offset = -C.rb_control_frame_t.size # callee CFP
-      # For ISEQ, JIT code will set it as needed. However, C func needs 0 there for svar frame detection.
-      if iseq.nil?
-        asm.mov([CFP, cfp_offset + C.rb_control_frame_t.offsetof(:pc)], 0)
-      end
-      asm.mov(:rax, iseq.to_i)
-      asm.mov([CFP, cfp_offset + C.rb_control_frame_t.offsetof(:iseq)], :rax)
-      if block_handler == :captured
-        asm.mov(:rax, [:rcx]) # captured->self
-      else
-        self_index = ctx.sp_offset - (1 + argc) # blockarg has been popped
-        asm.mov(:rax, [SP, C.VALUE.size * self_index])
-      end
-      asm.mov([CFP, cfp_offset + C.rb_control_frame_t.offsetof(:self)], :rax)
-      asm.lea(:rax, [SP, C.VALUE.size * ep_offset])
-      asm.mov([CFP, cfp_offset + C.rb_control_frame_t.offsetof(:ep)], :rax)
-      asm.mov([CFP, cfp_offset + C.rb_control_frame_t.offsetof(:block_code)], 0)
-      # Update SP register only for ISEQ calls. SP-relative operations should be done above this.
-      sp_reg = iseq ? SP : :rax
-      asm.lea(sp_reg, [SP, C.VALUE.size * sp_offset])
-      asm.mov([CFP, cfp_offset + C.rb_control_frame_t.offsetof(:sp)], sp_reg)
-
-      # cfp->jit_return is used only for ISEQs
-      if iseq
-        # The callee might change locals through Kernel#binding and other means.
-        ctx.clear_local_types
-
-        # Stub cfp->jit_return
-        return_ctx = ctx.dup
-        return_ctx.stack_pop(argc + ((block_handler == :captured) ? 0 : 1)) # Pop args and receiver. blockarg has been popped
-        return_ctx.stack_push(Type::Unknown) # push callee's return value
-        return_ctx.sp_offset = 1 # SP is in the position after popping a receiver and arguments
-        return_ctx.chain_depth = 0
-        branch_stub = BranchStub.new(
-          iseq: jit.iseq,
-          shape: Default,
-          target0: BranchTarget.new(ctx: return_ctx, pc: jit.pc + jit.insn.len * C.VALUE.size),
-        )
-        branch_stub.target0.address = Assembler.new.then do |ocb_asm|
-          @exit_compiler.compile_branch_stub(return_ctx, ocb_asm, branch_stub, true)
-          @ocb.write(ocb_asm)
-        end
-        branch_stub.compile = proc do |branch_asm|
-          branch_asm.comment('set jit_return to callee CFP')
-          branch_asm.stub(branch_stub) do
-            case branch_stub.shape
-            in Default
-              branch_asm.mov(:rax, branch_stub.target0.address)
-              branch_asm.mov([CFP, cfp_offset + C.rb_control_frame_t.offsetof(:jit_return)], :rax)
-            end
-          end
-        end
-        branch_stub.compile.call(asm)
-      end
-
-      asm.comment('switch to callee CFP')
-      # Update CFP register only for ISEQ calls
-      cfp_reg = iseq ? CFP : :rax
-      asm.lea(cfp_reg, [CFP, cfp_offset])
-      asm.mov([EC, C.rb_execution_context_t.offsetof(:cfp)], cfp_reg)
-    end
-
-    # CALLER_SETUP_ARG: Return CantCompile if not supported
-    # @param jit [RubyVM::RJIT::JITState]
-    # @param ctx [RubyVM::RJIT::Context]
-    # @param asm [RubyVM::RJIT::Assembler]
-    def jit_caller_setup_arg(jit, ctx, asm, flags)
-      if flags & C::VM_CALL_ARGS_SPLAT != 0 && flags & C::VM_CALL_KW_SPLAT != 0
-        asm.incr_counter(:send_args_splat_kw_splat)
-        return CantCompile
-      elsif flags & C::VM_CALL_ARGS_SPLAT != 0
-        # splat is not supported in this path
-        asm.incr_counter(:send_args_splat)
-        return CantCompile
-      elsif flags & C::VM_CALL_KW_SPLAT != 0
-        asm.incr_counter(:send_args_kw_splat)
-        return CantCompile
-      elsif flags & C::VM_CALL_KWARG != 0
-        asm.incr_counter(:send_kwarg)
-        return CantCompile
-      end
-    end
-
-    # Pushes arguments from an array to the stack. Differs from push splat because
-    # the array can have items left over.
-    # @param jit [RubyVM::RJIT::JITState]
-    # @param ctx [RubyVM::RJIT::Context]
-    # @param asm [RubyVM::RJIT::Assembler]
-    def move_rest_args_to_stack(array, num_args, jit, ctx, asm)
-      side_exit = side_exit(jit, ctx)
-
-      asm.comment('move_rest_args_to_stack')
-
-      # array is :rax
-      array_len_opnd = :rcx
-      jit_array_len(asm, array, array_len_opnd)
-
-      asm.comment('Side exit if length is less than required')
-      asm.cmp(array_len_opnd, num_args)
-      asm.jl(counted_exit(side_exit, :send_iseq_has_rest_and_splat_not_equal))
-
-      asm.comment('Push arguments from array')
-
-      # Load the address of the embedded array
-      # (struct RArray *)(obj)->as.ary
-      array_reg = array
-
-      # Conditionally load the address of the heap array
-      # (struct RArray *)(obj)->as.heap.ptr
-      flags_opnd = [array_reg, C.RBasic.offsetof(:flags)]
-      asm.test(flags_opnd, C::RARRAY_EMBED_FLAG)
-      heap_ptr_opnd = [array_reg, C.RArray.offsetof(:as, :heap, :ptr)]
-      # Load the address of the embedded array
-      # (struct RArray *)(obj)->as.ary
-      ary_opnd = :rdx # NOTE: array :rax is used after move_rest_args_to_stack too
-      asm.lea(:rcx, [array_reg, C.RArray.offsetof(:as, :ary)])
-      asm.mov(ary_opnd, heap_ptr_opnd)
-      asm.cmovnz(ary_opnd, :rcx)
-
-      num_args.times do |i|
-        top = ctx.stack_push(Type::Unknown)
-        asm.mov(:rcx, [ary_opnd, i * C.VALUE.size])
-        asm.mov(top, :rcx)
-      end
-    end
-
-    # vm_caller_setup_arg_splat (+ CALLER_SETUP_ARG):
-    # Pushes arguments from an array to the stack that are passed with a splat (i.e. *args).
-    # It optimistically compiles to a static size that is the exact number of arguments needed for the function.
-    # @param jit [RubyVM::RJIT::JITState]
-    # @param ctx [RubyVM::RJIT::Context]
-    # @param asm [RubyVM::RJIT::Assembler]
-    def push_splat_args(required_args, jit, ctx, asm)
-      side_exit = side_exit(jit, ctx)
-
-      asm.comment('push_splat_args')
-
-      array_opnd = ctx.stack_opnd(0)
-      array_stack_opnd = StackOpnd[0]
-      array_reg = :rax
-      asm.mov(array_reg, array_opnd)
-
-      guard_object_is_array(jit, ctx, asm, array_reg, :rcx, array_stack_opnd, :send_args_splat_not_array)
-
-      array_len_opnd = :rcx
-      jit_array_len(asm, array_reg, array_len_opnd)
-
-      asm.comment('Side exit if length is not equal to remaining args')
-      asm.cmp(array_len_opnd, required_args)
-      asm.jne(counted_exit(side_exit, :send_args_splat_length_not_equal))
-
-      asm.comment('Check last argument is not ruby2keyword hash')
-
-      ary_opnd = :rcx
-      jit_array_ptr(asm, array_reg, ary_opnd) # clobbers array_reg
-
-      last_array_value = :rax
-      asm.mov(last_array_value, [ary_opnd, (required_args - 1) * C.VALUE.size])
-
-      ruby2_exit = counted_exit(side_exit, :send_args_splat_ruby2_hash);
-      guard_object_is_not_ruby2_keyword_hash(asm, last_array_value, :rcx, ruby2_exit) # clobbers :rax
-
-      asm.comment('Push arguments from array')
-      array_opnd = ctx.stack_pop(1)
-
-      if required_args > 0
-        # Load the address of the embedded array
-        # (struct RArray *)(obj)->as.ary
-        array_reg = :rax
-        asm.mov(array_reg, array_opnd)
-
-        # Conditionally load the address of the heap array
-        # (struct RArray *)(obj)->as.heap.ptr
-        flags_opnd = [array_reg, C.RBasic.offsetof(:flags)]
-        asm.test(flags_opnd, C::RARRAY_EMBED_FLAG)
-        heap_ptr_opnd = [array_reg, C.RArray.offsetof(:as, :heap, :ptr)]
-        # Load the address of the embedded array
-        # (struct RArray *)(obj)->as.ary
-        asm.lea(:rcx, [array_reg, C.RArray.offsetof(:as, :ary)])
-        asm.mov(:rax, heap_ptr_opnd)
-        asm.cmovnz(:rax, :rcx)
-        ary_opnd = :rax
-
-        (0...required_args).each do |i|
-          top = ctx.stack_push(Type::Unknown)
-          asm.mov(:rcx, [ary_opnd, i * C.VALUE.size])
-          asm.mov(top, :rcx)
-        end
-
-        asm.comment('end push_each')
-      end
-    end
-
-    # Generate RARRAY_LEN. For array_opnd, use Opnd::Reg to reduce memory access,
-    # and use Opnd::Mem to save registers.
-    def jit_array_len(asm, array_reg, len_reg)
-      asm.comment('get array length for embedded or heap')
-
-      # Pull out the embed flag to check if it's an embedded array.
-      asm.mov(len_reg, [array_reg, C.RBasic.offsetof(:flags)])
-
-      # Get the length of the array
-      asm.and(len_reg, C::RARRAY_EMBED_LEN_MASK)
-      asm.sar(len_reg, C::RARRAY_EMBED_LEN_SHIFT)
-
-      # Conditionally move the length of the heap array
-      asm.test([array_reg, C.RBasic.offsetof(:flags)], C::RARRAY_EMBED_FLAG)
-
-      # Select the array length value
-      asm.cmovz(len_reg, [array_reg, C.RArray.offsetof(:as, :heap, :len)])
-    end
-
-    # Generate RARRAY_CONST_PTR (part of RARRAY_AREF)
-    def jit_array_ptr(asm, array_reg, ary_opnd) # clobbers array_reg
-      asm.comment('get array pointer for embedded or heap')
-
-      flags_opnd = [array_reg, C.RBasic.offsetof(:flags)]
-      asm.test(flags_opnd, C::RARRAY_EMBED_FLAG)
-      # Load the address of the embedded array
-      # (struct RArray *)(obj)->as.ary
-      asm.mov(ary_opnd, [array_reg, C.RArray.offsetof(:as, :heap, :ptr)])
-      asm.lea(array_reg, [array_reg, C.RArray.offsetof(:as, :ary)]) # clobbers array_reg
-      asm.cmovnz(ary_opnd, array_reg)
-    end
-
-    def assert(cond)
-      assert_equal(cond, true)
-    end
-
-    def assert_equal(left, right)
-      if left != right
-        raise "'#{left.inspect}' was not '#{right.inspect}'"
-      end
-    end
-
-    def fixnum?(obj)
-      (C.to_value(obj) & C::RUBY_FIXNUM_FLAG) == C::RUBY_FIXNUM_FLAG
-    end
-
-    def flonum?(obj)
-      (C.to_value(obj) & C::RUBY_FLONUM_MASK) == C::RUBY_FLONUM_FLAG
-    end
-
-    def symbol?(obj)
-      static_symbol?(obj) || dynamic_symbol?(obj)
-    end
-
-    def static_symbol?(obj)
-      (C.to_value(obj) & 0xff) == C::RUBY_SYMBOL_FLAG
-    end
-
-    def dynamic_symbol?(obj)
-      return false if C::SPECIAL_CONST_P(obj)
-      C.RB_TYPE_P(obj, C::RUBY_T_SYMBOL)
-    end
-
-    def shape_too_complex?(obj)
-      C.rb_shape_get_shape_id(obj) == C::OBJ_TOO_COMPLEX_SHAPE_ID
-    end
-
-    # @param jit [RubyVM::RJIT::JITState]
-    # @param ctx [RubyVM::RJIT::Context]
-    # @param asm [RubyVM::RJIT::Assembler]
-    def defer_compilation(jit, ctx, asm)
-      # Make a stub to compile the current insn
-      if ctx.chain_depth != 0
-        raise "double defer!"
-      end
-      ctx.chain_depth += 1
-      jit_direct_jump(jit.iseq, jit.pc, ctx, asm, comment: 'defer_compilation')
-    end
-
-    def jit_direct_jump(iseq, pc, ctx, asm, comment: 'jit_direct_jump')
-      branch_stub = BranchStub.new(
-        iseq:,
-        shape: Default,
-        target0: BranchTarget.new(ctx:, pc:),
-      )
-      branch_stub.target0.address = Assembler.new.then do |ocb_asm|
-        @exit_compiler.compile_branch_stub(ctx, ocb_asm, branch_stub, true)
-        @ocb.write(ocb_asm)
-      end
-      branch_stub.compile = proc do |branch_asm|
-        branch_asm.comment(comment)
-        branch_asm.stub(branch_stub) do
-          case branch_stub.shape
-          in Default
-            branch_asm.jmp(branch_stub.target0.address)
-          in Next0
-            # Just write the block without a jump
-          end
-        end
-      end
-      branch_stub.compile.call(asm)
-    end
-
-    # @param jit [RubyVM::RJIT::JITState]
-    # @param ctx [RubyVM::RJIT::Context]
-    def side_exit(jit, ctx)
-      # We use the latest ctx.sp_offset to generate a side exit to tolerate sp_offset changes by jit_save_sp.
-      # However, we want to simulate an old stack_size when we take a side exit. We do that by adjusting the
-      # sp_offset because gen_outlined_exit uses ctx.sp_offset to move SP.
-      ctx = ctx.with_stack_size(jit.stack_size_for_pc)
-
-      jit.side_exit_for_pc[ctx.sp_offset] ||= Assembler.new.then do |asm|
-        @exit_compiler.compile_side_exit(jit.pc, ctx, asm)
-        @ocb.write(asm)
-      end
-    end
-
-    def counted_exit(side_exit, name)
-      asm = Assembler.new
-      asm.incr_counter(name)
-      asm.jmp(side_exit)
-      @ocb.write(asm)
-    end
-
-    def def_iseq_ptr(cme_def)
-      C.rb_iseq_check(cme_def.body.iseq.iseqptr)
-    end
-
-    def to_value(obj)
-      GC_REFS << obj
-      C.to_value(obj)
-    end
-
-    def full_cfunc_return
-      @full_cfunc_return ||= Assembler.new.then do |asm|
-        @exit_compiler.compile_full_cfunc_return(asm)
-        @ocb.write(asm)
-      end
-    end
-
-    def c_method_tracing_currently_enabled?
-      C.rb_rjit_global_events & (C::RUBY_EVENT_C_CALL | C::RUBY_EVENT_C_RETURN) != 0
-    end
-
-    # Return a builtin function if a given iseq consists of only that builtin function
-    def builtin_function(iseq)
-      opt_invokebuiltin_delegate_leave = INSNS.values.find { |i| i.name == :opt_invokebuiltin_delegate_leave }
-      leave = INSNS.values.find { |i| i.name == :leave }
-      if iseq.body.iseq_size == opt_invokebuiltin_delegate_leave.len + leave.len &&
-          C.rb_vm_insn_decode(iseq.body.iseq_encoded[0]) == opt_invokebuiltin_delegate_leave.bin &&
-          C.rb_vm_insn_decode(iseq.body.iseq_encoded[opt_invokebuiltin_delegate_leave.len]) == leave.bin
-        C.rb_builtin_function.new(iseq.body.iseq_encoded[1])
-      end
-    end
-
-    def build_calling(ci:, block_handler:)
-      CallingInfo.new(
-        argc: C.vm_ci_argc(ci),
-        flags: C.vm_ci_flag(ci),
-        kwarg: C.vm_ci_kwarg(ci),
-        ci_addr: ci.to_i,
-        send_shift: 0,
-        block_handler:,
-      )
-    end
-  end
-end
diff --git a/lib/ruby_vm/rjit/invariants.rb b/lib/ruby_vm/rjit/invariants.rb
deleted file mode 100644
index 5b061d19944dca..00000000000000
--- a/lib/ruby_vm/rjit/invariants.rb
+++ /dev/null
@@ -1,155 +0,0 @@
-require 'set'
-
-module RubyVM::RJIT
-  class Invariants
-    class << self
-      # Called by RubyVM::RJIT::Compiler to lazily initialize this
-      # @param cb [CodeBlock]
-      # @param ocb [CodeBlock]
-      # @param compiler [RubyVM::RJIT::Compiler]
-      # @param exit_compiler [RubyVM::RJIT::ExitCompiler]
-      def initialize(cb, ocb, compiler, exit_compiler)
-        @cb = cb
-        @ocb = ocb
-        @compiler = compiler
-        @exit_compiler = exit_compiler
-        @bop_blocks = Set.new # TODO: actually invalidate this
-        @cme_blocks = Hash.new { |h, k| h[k] = Set.new }
-        @const_blocks = Hash.new { |h, k| h[k] = Set.new }
-        @patches = {}
-
-        # freeze # workaround a binding.irb issue. TODO: resurrect this
-      end
-
-      # @param jit [RubyVM::RJIT::JITState]
-      # @param klass [Integer]
-      # @param op [Integer]
-      def assume_bop_not_redefined(jit, klass, op)
-        return false unless C.BASIC_OP_UNREDEFINED_P(klass, op)
-
-        ensure_block_entry_exit(jit, cause: 'assume_bop_not_redefined')
-        @bop_blocks << jit.block
-        true
-      end
-
-      # @param jit [RubyVM::RJIT::JITState]
-      def assume_method_lookup_stable(jit, cme)
-        ensure_block_entry_exit(jit, cause: 'assume_method_lookup_stable')
-        @cme_blocks[cme.to_i] << jit.block
-      end
-
-      # @param jit [RubyVM::RJIT::JITState]
-      def assume_method_basic_definition(jit, klass, mid)
-        if C.rb_method_basic_definition_p(klass, mid)
-          cme = C.rb_callable_method_entry(klass, mid)
-          assume_method_lookup_stable(jit, cme)
-          true
-        else
-          false
-        end
-      end
-
-      def assume_stable_constant_names(jit, idlist)
-        (0..).each do |i|
-          break if (id = idlist[i]) == 0
-          @const_blocks[id] << jit.block
-        end
-      end
-
-      # @param asm [RubyVM::RJIT::Assembler]
-      def record_global_inval_patch(asm, target)
-        asm.pos_marker do |address|
-          if @patches.key?(address)
-            raise 'multiple patches in the same address'
-          end
-          @patches[address] = target
-        end
-      end
-
-      def on_cme_invalidate(cme)
-        @cme_blocks.fetch(cme.to_i, []).each do |block|
-          @cb.with_write_addr(block.start_addr) do
-            asm = Assembler.new
-            asm.comment('on_cme_invalidate')
-            asm.jmp(block.entry_exit)
-            @cb.write(asm)
-          end
-          # TODO: re-generate branches that refer to this block
-        end
-        @cme_blocks.delete(cme.to_i)
-      end
-
-      def on_constant_ic_update(iseq, ic, insn_idx)
-        # TODO: check multi ractor as well
-        if ic.entry.ic_cref
-          # No need to recompile the slowpath
-          return
-        end
-
-        pc = iseq.body.iseq_encoded + insn_idx
-        insn_name = Compiler.decode_insn(pc.*).name
-        if insn_name != :opt_getconstant_path && insn_name != :trace_opt_getconstant_path
-          raise 'insn_idx was not at opt_getconstant_path'
-        end
-        if ic.to_i != pc[1]
-          raise 'insn_idx + 1 was not at the updated IC'
-        end
-        @compiler.invalidate_blocks(iseq, pc.to_i)
-      end
-
-      def on_constant_state_changed(id)
-        @const_blocks.fetch(id, []).each do |block|
-          @compiler.invalidate_block(block)
-        end
-      end
-
-      def on_tracing_invalidate_all
-        invalidate_all
-      end
-
-      def on_update_references
-        # Give up. In order to support GC.compact, you'd have to update ISEQ
-        # addresses in BranchStub, etc. Ideally, we'd need to update moved
-        # pointers in JITed code here, but we just invalidate all for now.
-        invalidate_all
-      end
-
-      # @param jit [RubyVM::RJIT::JITState]
-      # @param block [RubyVM::RJIT::Block]
-      def ensure_block_entry_exit(jit, cause:)
-        block = jit.block
-        if block.entry_exit.nil?
-          block.entry_exit = Assembler.new.then do |asm|
-            @exit_compiler.compile_entry_exit(block.pc, block.ctx, asm, cause:)
-            @ocb.write(asm)
-          end
-        end
-      end
-
-      private
-
-      def invalidate_all
-        # On-Stack Replacement
-        @patches.each do |address, target|
-          # TODO: assert patches don't overlap each other
-          @cb.with_write_addr(address) do
-            asm = Assembler.new
-            asm.comment('on_tracing_invalidate_all')
-            asm.jmp(target)
-            @cb.write(asm)
-          end
-        end
-        @patches.clear
-
-        C.rjit_for_each_iseq do |iseq|
-          # Avoid entering past code
-          iseq.body.jit_entry = 0
-          # Avoid reusing past code
-          iseq.body.rjit_blocks.clear if iseq.body.rjit_blocks
-          # Compile this again if not converted to trace_* insns
-          iseq.body.jit_entry_calls = 0
-        end
-      end
-    end
-  end
-end
diff --git a/lib/ruby_vm/rjit/jit_state.rb b/lib/ruby_vm/rjit/jit_state.rb
deleted file mode 100644
index 02a713474e6e05..00000000000000
--- a/lib/ruby_vm/rjit/jit_state.rb
+++ /dev/null
@@ -1,65 +0,0 @@
-module RubyVM::RJIT
-  class JITState < Struct.new(
-    :iseq,                        # @param `RubyVM::RJIT::CPointer::Struct_rb_iseq_t`
-    :pc,                          # @param [Integer] The JIT target PC
-    :cfp,                         # @param `RubyVM::RJIT::CPointer::Struct_rb_control_frame_t` The JIT source CFP (before RJIT is called)
-    :block,                       # @param [RubyVM::RJIT::Block]
-    :stack_size_for_pc,           # @param [Integer]
-    :side_exit_for_pc,            # @param [Hash{ Integer => Integer }] { sp_offset => address }
-    :record_boundary_patch_point, # @param [TrueClass,FalseClass]
-  )
-    def initialize(side_exit_for_pc: {}, record_boundary_patch_point: false, **) = super
-
-    def insn
-      Compiler.decode_insn(C.VALUE.new(pc).*)
-    end
-
-    def operand(index, signed: false, ruby: false)
-      addr = pc + (index + 1) * Fiddle::SIZEOF_VOIDP
-      value = Fiddle::Pointer.new(addr)[0, Fiddle::SIZEOF_VOIDP].unpack(signed ? 'q' : 'Q')[0]
-      if ruby
-        value = C.to_ruby(value)
-      end
-      value
-    end
-
-    def at_current_insn?
-      pc == cfp.pc.to_i
-    end
-
-    def peek_at_local(n)
-      local_table_size = iseq.body.local_table_size
-      offset = -C::VM_ENV_DATA_SIZE - local_table_size + n + 1
-      value = (cfp.ep + offset).*
-      C.to_ruby(value)
-    end
-
-    def peek_at_stack(depth_from_top)
-      raise 'not at current insn' unless at_current_insn?
-      offset = -(1 + depth_from_top)
-      # rb_rjit_branch_stub_hit updates SP, so you don't need to worry about sp_offset
-      value = (cfp.sp + offset).*
-      C.to_ruby(value)
-    end
-
-    def peek_at_self
-      C.to_ruby(cfp.self)
-    end
-
-    def peek_at_block_handler(level)
-      ep = ep_at_level(cfp, level:)
-      ep[C::VM_ENV_DATA_INDEX_SPECVAL]
-    end
-
-    private
-
-    def ep_at_level(cfp, level:)
-      ep = cfp.ep
-      level.times do
-        # VM_ENV_PREV_EP
-        ep = C.VALUE.new(ep[C::VM_ENV_DATA_INDEX_SPECVAL] & ~0x03)
-      end
-      ep
-    end
-  end
-end
diff --git a/lib/ruby_vm/rjit/stats.rb b/lib/ruby_vm/rjit/stats.rb
deleted file mode 100644
index 8c4253880a4fd8..00000000000000
--- a/lib/ruby_vm/rjit/stats.rb
+++ /dev/null
@@ -1,188 +0,0 @@
-# frozen_string_literal: true
-module RubyVM::RJIT
-  def self.runtime_stats
-    stats = {}
-
-    # Insn exits
-    INSNS.each_value do |insn|
-      exits = C.rjit_insn_exits[insn.bin]
-      if exits > 0
-        stats[:"exit_#{insn.name}"] = exits
-      end
-    end
-
-    # Runtime stats
-    C.rb_rjit_runtime_counters.members.each do |member|
-      stats[member] = C.rb_rjit_counters.public_send(member)
-    end
-
-    # Other stats are calculated here
-    stats[:side_exit_count] = stats.select { |name, _count| name.start_with?('exit_') }.sum(&:last)
-    if stats[:vm_insns_count] > 0
-      retired_in_rjit = stats[:rjit_insns_count] - stats[:side_exit_count]
-      stats[:total_insns_count] = retired_in_rjit + stats[:vm_insns_count]
-      stats[:ratio_in_rjit] = 100.0 * retired_in_rjit / stats[:total_insns_count]
-    else
-      stats.delete(:vm_insns_count)
-    end
-
-    stats
-  end
-
-  class << self
-    private
-
-    # --yjit-stats at_exit
-    def print_stats
-      stats = runtime_stats
-      $stderr.puts("***RJIT: Printing RJIT statistics on exit***")
-
-      print_counters(stats, prefix: 'send_', prompt: 'method call exit reasons')
-      print_counters(stats, prefix: 'invokeblock_', prompt: 'invokeblock exit reasons')
-      print_counters(stats, prefix: 'invokesuper_', prompt: 'invokesuper exit reasons')
-      print_counters(stats, prefix: 'getblockpp_', prompt: 'getblockparamproxy exit reasons')
-      print_counters(stats, prefix: 'getivar_', prompt: 'getinstancevariable exit reasons')
-      print_counters(stats, prefix: 'setivar_', prompt: 'setinstancevariable exit reasons')
-      print_counters(stats, prefix: 'optaref_', prompt: 'opt_aref exit reasons')
-      print_counters(stats, prefix: 'optgetconst_', prompt: 'opt_getconstant_path exit reasons')
-      print_counters(stats, prefix: 'expandarray_', prompt: 'expandarray exit reasons')
-
-      $stderr.puts "compiled_block_count:  #{format_number(13, stats[:compiled_block_count])}"
-      $stderr.puts "side_exit_count:       #{format_number(13, stats[:side_exit_count])}"
-      $stderr.puts "total_insns_count:     #{format_number(13, stats[:total_insns_count])}" if stats.key?(:total_insns_count)
-      $stderr.puts "vm_insns_count:        #{format_number(13, stats[:vm_insns_count])}" if stats.key?(:vm_insns_count)
-      $stderr.puts "rjit_insns_count:      #{format_number(13, stats[:rjit_insns_count])}"
-      $stderr.puts "ratio_in_rjit:         #{format('%12.1f', stats[:ratio_in_rjit])}%" if stats.key?(:ratio_in_rjit)
-
-      print_exit_counts(stats)
-    end
-
-    def print_counters(stats, prefix:, prompt:)
-      $stderr.puts("#{prompt}: ")
-      counters = stats.filter { |key, _| key.start_with?(prefix) }
-      counters.filter! { |_, value| value != 0 }
-      counters.transform_keys! { |key| key.to_s.delete_prefix(prefix) }
-
-      if counters.empty?
-        $stderr.puts("    (all relevant counters are zero)")
-        return
-      end
-
-      counters = counters.to_a
-      counters.sort_by! { |(_, counter_value)| counter_value }
-      longest_name_length = counters.max_by { |(name, _)| name.length }.first.length
-      total = counters.sum { |(_, counter_value)| counter_value }
-
-      counters.reverse_each do |(name, value)|
-        percentage = value.fdiv(total) * 100
-        $stderr.printf("    %*s %s (%4.1f%%)\n", longest_name_length, name, format_number(10, value), percentage)
-      end
-    end
-
-    def print_exit_counts(stats, how_many: 20, padding: 2)
-      exits = stats.filter_map { |name, count| [name.to_s.delete_prefix('exit_'), count] if name.start_with?('exit_') }.to_h
-      return if exits.empty?
-
-      top_exits = exits.sort_by { |_name, count| -count }.first(how_many).to_h
-      total_exits = exits.values.sum
-      $stderr.puts "Top-#{top_exits.size} most frequent exit ops (#{format("%.1f", 100.0 * top_exits.values.sum / total_exits)}% of exits):"
-
-      name_width  = top_exits.map { |name, _count| name.length }.max + padding
-      count_width = top_exits.map { |_name, count| format_number(10, count).length }.max + padding
-      top_exits.each do |name, count|
-        ratio = 100.0 * count / total_exits
-        $stderr.puts "#{format("%#{name_width}s", name)}: #{format_number(count_width, count)} (#{format('%4.1f', ratio)}%)"
-      end
-    end
-
-    # Format large numbers with comma separators for readability
-    def format_number(pad, number)
-      integer, decimal = number.to_s.split('.')
-      d_groups = integer.chars.reverse.each_slice(3)
-      with_commas = d_groups.map(&:join).join(',').reverse
-      [with_commas, decimal].compact.join('.').rjust(pad, ' ')
-    end
-
-    # --yjit-trace-exits at_exit
-    def dump_trace_exits
-      filename = "#{Dir.pwd}/rjit_exit_locations.dump"
-      File.binwrite(filename, Marshal.dump(exit_traces))
-      $stderr.puts("RJIT exit locations dumped to:\n#{filename}")
-    end
-
-    # Convert rb_rjit_raw_samples and rb_rjit_line_samples into a StackProf format.
-    def exit_traces
-      results = C.rjit_exit_traces
-      raw_samples = results[:raw].dup
-      line_samples = results[:lines].dup
-      frames = results[:frames].dup
-      samples_count = 0
-
-      # Loop through the instructions and set the frame hash with the data.
-      # We use nonexistent.def for the file name, otherwise insns.def will be displayed
-      # and that information isn't useful in this context.
-      RubyVM::INSTRUCTION_NAMES.each_with_index do |name, frame_id|
-        frame_hash = { samples: 0, total_samples: 0, edges: {}, name: name, file: "nonexistent.def", line: nil, lines: {} }
-        results[:frames][frame_id] = frame_hash
-        frames[frame_id] = frame_hash
-      end
-
-      # Loop through the raw_samples and build the hashes for StackProf.
-      # The loop is based off an example in the StackProf documentation and therefore
-      # this functionality can only work with that library.
-      #
-      # Raw Samples:
-      # [ length, frame1, frame2, frameN, ..., instruction, count
-      #
-      # Line Samples
-      # [ length, line_1, line_2, line_n, ..., dummy value, count
-      i = 0
-      while i < raw_samples.length
-        stack_length = raw_samples[i] + 1
-        i += 1 # consume the stack length
-
-        prev_frame_id = nil
-        stack_length.times do |idx|
-          idx += i
-          frame_id = raw_samples[idx]
-
-          if prev_frame_id
-            prev_frame = frames[prev_frame_id]
-            prev_frame[:edges][frame_id] ||= 0
-            prev_frame[:edges][frame_id] += 1
-          end
-
-          frame_info = frames[frame_id]
-          frame_info[:total_samples] += 1
-
-          frame_info[:lines][line_samples[idx]] ||= [0, 0]
-          frame_info[:lines][line_samples[idx]][0] += 1
-
-          prev_frame_id = frame_id
-        end
-
-        i += stack_length # consume the stack
-
-        top_frame_id = prev_frame_id
-        top_frame_line = 1
-
-        sample_count = raw_samples[i]
-
-        frames[top_frame_id][:samples] += sample_count
-        frames[top_frame_id][:lines] ||= {}
-        frames[top_frame_id][:lines][top_frame_line] ||= [0, 0]
-        frames[top_frame_id][:lines][top_frame_line][1] += sample_count
-
-        samples_count += sample_count
-        i += 1
-      end
-
-      results[:samples] = samples_count
-      # Set missed_samples and gc_samples to 0 as their values
-      # don't matter to us in this context.
-      results[:missed_samples] = 0
-      results[:gc_samples] = 0
-      results
-    end
-  end
-end
diff --git a/lib/ruby_vm/rjit/type.rb b/lib/ruby_vm/rjit/type.rb
deleted file mode 100644
index 119692014bfe02..00000000000000
--- a/lib/ruby_vm/rjit/type.rb
+++ /dev/null
@@ -1,221 +0,0 @@
-module RubyVM::RJIT
-  # Represent the type of a value (local/stack/self) in RJIT
-  Type = Data.define(:type) do
-    # Check if the type is an immediate
-    def imm?
-      case self
-      in Type::UnknownImm then true
-      in Type::Nil then true
-      in Type::True then true
-      in Type::False then true
-      in Type::Fixnum then true
-      in Type::Flonum then true
-      in Type::ImmSymbol then true
-      else false
-      end
-    end
-
-    # Returns true when the type is not specific.
-    def unknown?
-      case self
-      in Type::Unknown | Type::UnknownImm | Type::UnknownHeap then true
-      else false
-      end
-    end
-
-    # Returns true when we know the VALUE is a specific handle type,
-    # such as a static symbol ([Type::ImmSymbol], i.e. true from RB_STATIC_SYM_P()).
-    # Opposite of [Self::is_unknown].
-    def specific?
-      !self.unknown?
-    end
-
-    # Check if the type is a heap object
-    def heap?
-      case self
-      in Type::UnknownHeap then true
-      in Type::TArray then true
-      in Type::Hash then true
-      in Type::HeapSymbol then true
-      in Type::TString then true
-      in Type::CString then true
-      in Type::BlockParamProxy then true
-      else false
-      end
-    end
-
-    # Check if it's a T_ARRAY object
-    def array?
-      case self
-      in Type::TArray then true
-      else false
-      end
-    end
-
-    # Check if it's a T_STRING object (both TString and CString are T_STRING)
-    def string?
-      case self
-      in Type::TString then true
-      in Type::CString then true
-      else false
-      end
-    end
-
-    # Returns the class if it is known, otherwise nil
-    def known_class
-      case self
-      in Type::Nil then C.rb_cNilClass
-      in Type::True then C.rb_cTrueClass
-      in Type::False then C.rb_cFalseClass
-      in Type::Fixnum then C.rb_cInteger
-      in Type::Flonum then C.rb_cFloat
-      in Type::ImmSymbol | Type::HeapSymbol then C.rb_cSymbol
-      in Type::CString then C.rb_cString
-      else nil
-      end
-    end
-
-    # Returns a boolean representing whether the value is truthy if known, otherwise nil
-    def known_truthy
-      case self
-      in Type::Nil then false
-      in Type::False then false
-      in Type::UnknownHeap then false
-      in Type::Unknown | Type::UnknownImm then nil
-      else true
-      end
-    end
-
-    # Returns a boolean representing whether the value is equal to nil if known, otherwise nil
-    def known_nil
-      case [self, self.known_truthy]
-      in Type::Nil, _ then true
-      in Type::False, _ then false # Qfalse is not nil
-      in _, true then false # if truthy, can't be nil
-      in _, _ then nil # otherwise unknown
-      end
-    end
-
-    def diff(dst)
-      # Perfect match, difference is zero
-      if self == dst
-        return TypeDiff::Compatible[0]
-      end
-
-      # Any type can flow into an unknown type
-      if dst == Type::Unknown
-        return TypeDiff::Compatible[1]
-      end
-
-      # A CString is also a TString.
-      if self == Type::CString && dst == Type::TString
-        return TypeDiff::Compatible[1]
-      end
-
-      # Specific heap type into unknown heap type is imperfect but valid
-      if self.heap? && dst == Type::UnknownHeap
-        return TypeDiff::Compatible[1]
-      end
-
-      # Specific immediate type into unknown immediate type is imperfect but valid
-      if self.imm? && dst == Type::UnknownImm
-        return TypeDiff::Compatible[1]
-      end
-
-      # Incompatible types
-      return TypeDiff::Incompatible
-    end
-
-    def upgrade(new_type)
-      assert(new_type.diff(self) != TypeDiff::Incompatible)
-      new_type
-    end
-
-    private
-
-    def assert(cond)
-      unless cond
-        raise "'#{cond.inspect}' was not true"
-      end
-    end
-  end
-
-  # This returns an appropriate Type based on a known value
-  class << Type
-    def from(val)
-      if C::SPECIAL_CONST_P(val)
-        if fixnum?(val)
-          Type::Fixnum
-        elsif val.nil?
-          Type::Nil
-        elsif val == true
-          Type::True
-        elsif val == false
-          Type::False
-        elsif static_symbol?(val)
-          Type::ImmSymbol
-        elsif flonum?(val)
-          Type::Flonum
-        else
-          raise "Illegal value: #{val.inspect}"
-        end
-      else
-        val_class = C.to_value(C.rb_class_of(val))
-        if val_class == C.rb_cString && C.rb_obj_frozen_p(val)
-          return Type::CString
-        end
-        if C.to_value(val) == C.rb_block_param_proxy
-          return Type::BlockParamProxy
-        end
-        case C::BUILTIN_TYPE(val)
-        in C::RUBY_T_ARRAY
-          Type::TArray
-        in C::RUBY_T_HASH
-          Type::Hash
-        in C::RUBY_T_STRING
-          Type::TString
-        else
-          Type::UnknownHeap
-        end
-      end
-    end
-
-    private
-
-    def fixnum?(obj)
-      (C.to_value(obj) & C::RUBY_FIXNUM_FLAG) == C::RUBY_FIXNUM_FLAG
-    end
-
-    def flonum?(obj)
-      (C.to_value(obj) & C::RUBY_FLONUM_MASK) == C::RUBY_FLONUM_FLAG
-    end
-
-    def static_symbol?(obj)
-      (C.to_value(obj) & 0xff) == C::RUBY_SYMBOL_FLAG
-    end
-  end
-
-  # List of types
-  Type::Unknown     = Type[:Unknown]
-  Type::UnknownImm  = Type[:UnknownImm]
-  Type::UnknownHeap = Type[:UnknownHeap]
-  Type::Nil         = Type[:Nil]
-  Type::True        = Type[:True]
-  Type::False       = Type[:False]
-  Type::Fixnum      = Type[:Fixnum]
-  Type::Flonum      = Type[:Flonum]
-  Type::Hash        = Type[:Hash]
-  Type::ImmSymbol   = Type[:ImmSymbol]
-  Type::HeapSymbol  = Type[:HeapSymbol]
-
-  Type::TString = Type[:TString] # An object with the T_STRING flag set, possibly an rb_cString
-  Type::CString = Type[:CString] # An un-subclassed string of type rb_cString (can have instance vars in some cases)
-  Type::TArray  = Type[:TArray]  # An object with the T_ARRAY flag set, possibly an rb_cArray
-
-  Type::BlockParamProxy = Type[:BlockParamProxy] # A special sentinel value indicating the block parameter should be read from
-
-  module TypeDiff
-    Compatible = Data.define(:diversion) # The smaller, the more compatible.
-    Incompatible = :Incompatible
-  end
-end
diff --git a/lib/rubygems.rb b/lib/rubygems.rb
index cb716570187433..6c104ae10bb31e 100644
--- a/lib/rubygems.rb
+++ b/lib/rubygems.rb
@@ -9,7 +9,7 @@
 require "rbconfig"
 
 module Gem
-  VERSION = "3.5.0.dev"
+  VERSION = "3.7.0.dev"
 end
 
 # Must be first since it unloads the prelude from 1.9.2
@@ -18,6 +18,7 @@ module Gem
 require_relative "rubygems/defaults"
 require_relative "rubygems/deprecate"
 require_relative "rubygems/errors"
+require_relative "rubygems/target_rbconfig"
 
 ##
 # RubyGems is the Ruby standard for publishing and managing third party
@@ -106,7 +107,7 @@ module Gem
 #
 # == License
 #
-# See {LICENSE.txt}[rdoc-ref:lib/rubygems/LICENSE.txt] for permissions.
+# See {LICENSE.txt}[https://github.com/rubygems/rubygems/blob/master/LICENSE.txt] for permissions.
 #
 # Thanks!
 #
@@ -115,11 +116,6 @@ module Gem
 module Gem
   RUBYGEMS_DIR = __dir__
 
-  # Taint support is deprecated in Ruby 2.7.
-  # This allows switching ".untaint" to ".tap(&Gem::UNTAINT)",
-  # to avoid deprecation warnings in Ruby 2.7.
-  UNTAINT = RUBY_VERSION < "2.7" ? :untaint.to_sym : proc {}
-
   ##
   # An Array of Regexps that match windows Ruby platforms.
 
@@ -160,6 +156,13 @@ module Gem
     specifications/default
   ].freeze
 
+  ##
+  # The default value for SOURCE_DATE_EPOCH if not specified.
+  # We want a date after 1980-01-01, to prevent issues with Zip files.
+  # This particular timestamp is for 1980-01-02 00:00:00 GMT.
+
+  DEFAULT_SOURCE_DATE_EPOCH = 315_619_200
+
   @@win_platform = nil
 
   @configuration = nil
@@ -184,6 +187,8 @@ module Gem
 
   @discover_gems_on_require = true
 
+  @target_rbconfig = nil
+
   ##
   # Try to activate a gem containing +path+. Returns true if
   # activation succeeded or wasn't needed because it was already
@@ -244,6 +249,16 @@ def self.bin_path(name, exec_name = nil, *requirements)
     find_spec_for_exe(name, exec_name, requirements).bin_file exec_name
   end
 
+  def self.find_and_activate_spec_for_exe(name, exec_name, requirements)
+    spec = find_spec_for_exe name, exec_name, requirements
+    Gem::LOADED_SPECS_MUTEX.synchronize do
+      spec.activate
+      finish_resolve
+    end
+    spec
+  end
+  private_class_method :find_and_activate_spec_for_exe
+
   def self.find_spec_for_exe(name, exec_name, requirements)
     raise ArgumentError, "you must supply exec_name" unless exec_name
 
@@ -268,6 +283,35 @@ def self.find_spec_for_exe(name, exec_name, requirements)
   end
   private_class_method :find_spec_for_exe
 
+  ##
+  # Find and load the full path to the executable for gem +name+.  If the
+  # +exec_name+ is not given, an exception will be raised, otherwise the
+  # specified executable's path is returned.  +requirements+ allows
+  # you to specify specific gem versions.
+  #
+  # A side effect of this method is that it will activate the gem that
+  # contains the executable.
+  #
+  # This method should *only* be used in bin stub files.
+
+  def self.activate_and_load_bin_path(name, exec_name = nil, *requirements)
+    spec = find_and_activate_spec_for_exe name, exec_name, requirements
+
+    if spec.name == "bundler"
+      # Make sure there's no version of Bundler in `$LOAD_PATH` that's different
+      # from the version we just activated. If that was the case (it happens
+      # when testing Bundler from ruby/ruby), we would load Bundler extensions
+      # to RubyGems from the copy in `$LOAD_PATH` but then load the binstub from
+      # an installed copy, causing those copies to be mixed and yet more
+      # redefinition warnings.
+      #
+      require_path = $LOAD_PATH.resolve_feature_path("bundler").last.delete_suffix("/bundler.rb")
+      Gem.load_bundler_extensions(spec.version) if spec.full_require_paths.include?(require_path)
+    end
+
+    load spec.bin_file(exec_name)
+  end
+
   ##
   # Find the full path to the executable for gem +name+.  If the +exec_name+
   # is not given, an exception will be raised, otherwise the
@@ -280,12 +324,7 @@ def self.find_spec_for_exe(name, exec_name, requirements)
   # This method should *only* be used in bin stub files.
 
   def self.activate_bin_path(name, exec_name = nil, *requirements) # :nodoc:
-    spec = find_spec_for_exe name, exec_name, requirements
-    Gem::LOADED_SPECS_MUTEX.synchronize do
-      spec.activate
-      finish_resolve
-    end
-    spec.bin_file exec_name
+    find_and_activate_spec_for_exe(name, exec_name, requirements).bin_file exec_name
   end
 
   ##
@@ -401,6 +440,23 @@ def self.spec_cache_dir
     paths.spec_cache_dir
   end
 
+  ##
+  # The RbConfig object for the deployment target platform.
+  #
+  # This is usually the same as the running platform, but may be
+  # different if you are cross-compiling.
+
+  def self.target_rbconfig
+    @target_rbconfig || Gem::TargetRbConfig.for_running_ruby
+  end
+
+  def self.set_target_rbconfig(rbconfig_path)
+    @target_rbconfig = Gem::TargetRbConfig.from_path(rbconfig_path)
+    Gem::Platform.local(refresh: true)
+    Gem.platforms << Gem::Platform.local unless Gem.platforms.include? Gem::Platform.local
+    @target_rbconfig
+  end
+
   ##
   # Quietly ensure the Gem directory +dir+ contains all the proper
   # subdirectories.  If we can't create a directory due to a permission
@@ -455,7 +511,7 @@ def self.ensure_subdirectories(dir, mode, subdirs) # :nodoc:
   # distinction as extensions cannot be shared between the two.
 
   def self.extension_api_version # :nodoc:
-    if RbConfig::CONFIG["ENABLE_SHARED"] == "no"
+    if target_rbconfig["ENABLE_SHARED"] == "no"
       "#{ruby_api_version}-static"
     else
       ruby_api_version
@@ -481,9 +537,9 @@ def self.find_files(glob, check_load_path=true)
 
     gem_specifications = @gemdeps ? Gem.loaded_specs.values : Gem::Specification.stubs
 
-    files.concat gem_specifications.map {|spec|
+    files.concat gem_specifications.flat_map {|spec|
       spec.matches_for_glob("#{glob}#{Gem.suffix_pattern}")
-    }.flatten
+    }
 
     # $LOAD_PATH might contain duplicate entries or reference
     # the spec dirs directly, so we prune.
@@ -494,9 +550,9 @@ def self.find_files(glob, check_load_path=true)
 
   def self.find_files_from_load_path(glob) # :nodoc:
     glob_with_suffixes = "#{glob}#{Gem.suffix_pattern}"
-    $LOAD_PATH.map do |load_path|
+    $LOAD_PATH.flat_map do |load_path|
       Gem::Util.glob_files_in_dir(glob_with_suffixes, load_path)
-    end.flatten.select {|file| File.file? file.tap(&Gem::UNTAINT) }
+    end.select {|file| File.file? file }
   end
 
   ##
@@ -516,9 +572,9 @@ def self.find_latest_files(glob, check_load_path=true)
 
     files = find_files_from_load_path glob if check_load_path
 
-    files.concat Gem::Specification.latest_specs(true).map {|spec|
+    files.concat Gem::Specification.latest_specs(true).flat_map {|spec|
       spec.matches_for_glob("#{glob}#{Gem.suffix_pattern}")
-    }.flatten
+    }
 
     # $LOAD_PATH might contain duplicate entries or reference
     # the spec dirs directly, so we prune.
@@ -572,7 +628,7 @@ def self.load_path_insert_index
 
   ##
   # The number of paths in the +$LOAD_PATH+ from activated gems. Used to
-  # prioritize +-I+ and +ENV['RUBYLIB']+ entries during +require+.
+  # prioritize +-I+ and <code>ENV['RUBYLIB']</code> entries during +require+.
 
   def self.activated_gem_paths
     @activated_gem_paths ||= 0
@@ -604,6 +660,40 @@ def self.load_yaml
     @yaml_loaded = true
   end
 
+  @safe_marshal_loaded = false
+
+  def self.load_safe_marshal
+    return if @safe_marshal_loaded
+
+    require_relative "rubygems/safe_marshal"
+
+    @safe_marshal_loaded = true
+  end
+
+  ##
+  # Load Bundler extensions to RubyGems, making sure to avoid redefinition
+  # warnings in platform constants
+
+  def self.load_bundler_extensions(version)
+    return unless version <= "2.6.9"
+
+    previous_platforms = {}
+
+    platform_const_list = ["JAVA", "MSWIN", "MSWIN64", "MINGW", "X64_MINGW_LEGACY", "X64_MINGW", "UNIVERSAL_MINGW", "WINDOWS", "X64_LINUX", "X64_LINUX_MUSL"]
+
+    platform_const_list.each do |platform|
+      previous_platforms[platform] = Gem::Platform.const_get(platform)
+      Gem::Platform.send(:remove_const, platform)
+    end
+
+    require "bundler/rubygems_ext"
+
+    platform_const_list.each do |platform|
+      Gem::Platform.send(:remove_const, platform) if Gem::Platform.const_defined?(platform)
+      Gem::Platform.const_set(platform, previous_platforms[platform])
+    end
+  end
+
   ##
   # The file name and line number of the caller of the caller of this method.
   #
@@ -748,17 +838,14 @@ def self.refresh
   # Safely read a file in binary mode on all platforms.
 
   def self.read_binary(path)
-    open_file(path, "rb+", &:read)
-  rescue Errno::EACCES, Errno::EROFS
-    open_file(path, "rb", &:read)
+    File.binread(path)
   end
 
   ##
   # Safely write a file in binary mode on all platforms.
+
   def self.write_binary(path, data)
-    open_file(path, "wb") do |io|
-      io.write data
-    end
+    File.binwrite(path, data)
   rescue Errno::ENOSPC
     # If we ran out of space but the file exists, it's *guaranteed* to be corrupted.
     File.delete(path) if File.exist?(path)
@@ -766,26 +853,45 @@ def self.write_binary(path, data)
   end
 
   ##
-  # Open a file with given flags, and on Windows protect access with flock
+  # Open a file with given flags
 
   def self.open_file(path, flags, &block)
-    File.open(path, flags) do |io|
-      if !java_platform? && win_platform?
-        begin
+    File.open(path, flags, &block)
+  end
+
+  ##
+  # Open a file with given flags, and protect access with a file lock
+
+  def self.open_file_with_lock(path, &block)
+    file_lock = "#{path}.lock"
+    open_file_with_flock(file_lock, &block)
+  ensure
+    require "fileutils"
+    FileUtils.rm_f file_lock
+  end
+
+  ##
+  # Open a file with given flags, and protect access with flock
+
+  def self.open_file_with_flock(path, &block)
+    # read-write mode is used rather than read-only in order to support NFS
+    mode = IO::RDWR | IO::APPEND | IO::CREAT | IO::BINARY
+    mode |= IO::SHARE_DELETE if IO.const_defined?(:SHARE_DELETE)
+
+    File.open(path, mode) do |io|
+      begin
+        # Try to get a lock without blocking.
+        # If we do, the file is locked.
+        # Otherwise, explain why we're waiting and get a lock, but block this time.
+        if io.flock(File::LOCK_EX | File::LOCK_NB) != 0
+          warn "Waiting for another process to let go of lock: #{path}"
           io.flock(File::LOCK_EX)
-        rescue Errno::ENOSYS, Errno::ENOTSUP
         end
+        io.puts(Process.pid)
+      rescue Errno::ENOSYS, Errno::ENOTSUP
       end
       yield io
     end
-  rescue Errno::ENOLCK # NFS
-    if Thread.main != Thread.current
-      raise
-    else
-      File.open(path, flags) do |io|
-        yield io
-      end
-    end
   end
 
   ##
@@ -805,7 +911,7 @@ def self.ruby
   # Returns a String containing the API compatibility version of Ruby
 
   def self.ruby_api_version
-    @ruby_api_version ||= RbConfig::CONFIG["ruby_version"].dup
+    @ruby_api_version ||= target_rbconfig["ruby_version"].dup
   end
 
   def self.env_requirement(gem_name)
@@ -937,6 +1043,13 @@ def self.suffixes
                    end].compact.uniq
   end
 
+  ##
+  # Suffixes for dynamic library require-able paths.
+
+  def self.dynamic_library_suffixes
+    @dynamic_library_suffixes ||= suffixes - [".rb"]
+  end
+
   ##
   # Prints the amount of time the supplied block takes to run using the debug
   # UI output.
@@ -1000,6 +1113,13 @@ def self.solaris_platform?
     RUBY_PLATFORM.include?("solaris")
   end
 
+  ##
+  # Is this platform FreeBSD
+
+  def self.freebsd_platform?
+    RbConfig::CONFIG["host_os"].to_s.include?("bsd")
+  end
+
   ##
   # Load +plugins+ as Ruby files
 
@@ -1074,8 +1194,6 @@ def self.use_gemdeps(path = nil)
       end
     end
 
-    path.tap(&Gem::UNTAINT)
-
     unless File.file? path
       return unless raise_exception
 
@@ -1102,8 +1220,7 @@ def self.use_gemdeps(path = nil)
 
   ##
   # If the SOURCE_DATE_EPOCH environment variable is set, returns it's value.
-  # Otherwise, returns the time that +Gem.source_date_epoch_string+ was
-  # first called in the same format as SOURCE_DATE_EPOCH.
+  # Otherwise, returns DEFAULT_SOURCE_DATE_EPOCH as a string.
   #
   # NOTE(@duckinator): The implementation is a tad weird because we want to:
   #   1. Make builds reproducible by default, by having this function always
@@ -1118,15 +1235,12 @@ def self.use_gemdeps(path = nil)
   # https://reproducible-builds.org/specs/source-date-epoch/
 
   def self.source_date_epoch_string
-    # The value used if $SOURCE_DATE_EPOCH is not set.
-    @default_source_date_epoch ||= Time.now.to_i.to_s
-
     specified_epoch = ENV["SOURCE_DATE_EPOCH"]
 
     # If it's empty or just whitespace, treat it like it wasn't set at all.
     specified_epoch = nil if !specified_epoch.nil? && specified_epoch.strip.empty?
 
-    epoch = specified_epoch || @default_source_date_epoch
+    epoch = specified_epoch || DEFAULT_SOURCE_DATE_EPOCH.to_s
 
     epoch.strip
   end
@@ -1206,9 +1320,16 @@ def register_default_spec(spec)
     ##
     # Find a Gem::Specification of default gem from +path+
 
+    def find_default_spec(path)
+      @path_to_default_spec_map[path]
+    end
+
+    ##
+    # Find an unresolved Gem::Specification of default gem from +path+
+
     def find_unresolved_default_spec(path)
       default_spec = @path_to_default_spec_map[path]
-      return default_spec if default_spec && loaded_specs[default_spec.name] != default_spec
+      default_spec if default_spec && loaded_specs[default_spec.name] != default_spec
     end
 
     ##
@@ -1284,9 +1405,10 @@ def default_gem_load_paths
   ##
   # Location of Marshal quick gemspecs on remote repositories
 
-  MARSHAL_SPEC_DIR = "quick/Marshal.#{Gem.marshal_version}/"
+  MARSHAL_SPEC_DIR = "quick/Marshal.#{Gem.marshal_version}/".freeze
 
   autoload :ConfigFile,         File.expand_path("rubygems/config_file", __dir__)
+  autoload :CIDetector,         File.expand_path("rubygems/ci_detector", __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__)
@@ -1342,7 +1464,7 @@ def default_gem_load_paths
 path = File.join(__dir__, "rubygems/core_ext/kernel_require.rb")
 # When https://bugs.ruby-lang.org/issues/17259 is available, there is no need to override Kernel#warn
 if RUBY_ENGINE == "truffleruby" ||
-   (RUBY_ENGINE == "ruby" && RUBY_VERSION >= "3.0")
+   RUBY_ENGINE == "ruby"
   file = "<internal:#{path}>"
 else
   require_relative "rubygems/core_ext/kernel_warn"
diff --git a/lib/rubygems/basic_specification.rb b/lib/rubygems/basic_specification.rb
index 4aa74fd29c693a..a0b552f63ceb2e 100644
--- a/lib/rubygems/basic_specification.rb
+++ b/lib/rubygems/basic_specification.rb
@@ -71,11 +71,7 @@ def base_dir
   # Return true if this spec can require +file+.
 
   def contains_requirable_file?(file)
-    if @ignored
-      return false
-    elsif missing_extensions?
-      @ignored = true
-
+    if ignored?
       if platform == Gem::Platform::RUBY || Gem::Platform.local === platform
         warn "Ignoring #{full_name} because its extensions are not built. " \
              "Try: gem pristine #{name} --version #{version}"
@@ -84,19 +80,48 @@ def contains_requirable_file?(file)
       return false
     end
 
-    have_file? file, Gem.suffixes
+    is_soext = file.end_with?(".so", ".o")
+
+    if is_soext
+      have_file? file.delete_suffix(File.extname(file)), Gem.dynamic_library_suffixes
+    else
+      have_file? file, Gem.suffixes
+    end
+  end
+
+  ##
+  # Return true if this spec should be ignored because it's missing extensions.
+
+  def ignored?
+    return @ignored unless @ignored.nil?
+
+    @ignored = missing_extensions?
   end
 
   def default_gem?
-    loaded_from &&
+    !loaded_from.nil? &&
       File.dirname(loaded_from) == Gem.default_specifications_dir
   end
 
+  ##
+  # Regular gems take precedence over default gems
+
+  def default_gem_priority
+    default_gem? ? 1 : -1
+  end
+
+  ##
+  # Gems higher up in +gem_path+ take precedence
+
+  def base_dir_priority(gem_path)
+    gem_path.index(base_dir) || gem_path.size
+  end
+
   ##
   # Returns full path to the directory where gem's extensions are installed.
 
   def extension_dir
-    @extension_dir ||= File.expand_path(File.join(extensions_dir, full_name)).tap(&Gem::UNTAINT)
+    @extension_dir ||= File.expand_path(File.join(extensions_dir, full_name))
   end
 
   ##
@@ -109,20 +134,17 @@ def extensions_dir
   end
 
   def find_full_gem_path # :nodoc:
-    # TODO: also, shouldn't it default to full_name if it hasn't been written?
-    path = File.expand_path File.join(gems_dir, full_name)
-    path.tap(&Gem::UNTAINT)
-    path
+    File.expand_path File.join(gems_dir, full_name)
   end
 
   private :find_full_gem_path
 
   ##
   # The full path to the gem (install path + full name).
+  #
+  # TODO: This is duplicated with #gem_dir. Eventually either of them should be deprecated.
 
   def full_gem_path
-    # TODO: This is a heavily used method by gems, so we'll need
-    # to aleast just alias it to #gem_dir rather than remove it.
     @full_gem_path ||= find_full_gem_path
   end
 
@@ -133,9 +155,22 @@ def full_gem_path
 
   def full_name
     if platform == Gem::Platform::RUBY || platform.nil?
-      "#{name}-#{version}".dup.tap(&Gem::UNTAINT)
+      "#{name}-#{version}"
+    else
+      "#{name}-#{version}-#{platform}"
+    end
+  end
+
+  ##
+  # Returns the full name of this Gem (see `Gem::BasicSpecification#full_name`).
+  # Information about where the gem is installed is also included if not
+  # installed in the default GEM_HOME.
+
+  def full_name_with_location
+    if base_dir != Gem.dir
+      "#{full_name} in #{base_dir}"
     else
-      "#{name}-#{version}-#{platform}".dup.tap(&Gem::UNTAINT)
+      full_name
     end
   end
 
@@ -147,7 +182,7 @@ def full_require_paths
     @full_require_paths ||=
       begin
         full_paths = raw_require_paths.map do |path|
-          File.join full_gem_path, path.tap(&Gem::UNTAINT)
+          File.join full_gem_path, path
         end
 
         full_paths << extension_dir if have_extensions?
@@ -161,7 +196,7 @@ def full_require_paths
 
   def datadir
     # TODO: drop the extra ", gem_name" which is uselessly redundant
-    File.expand_path(File.join(gems_dir, full_name, "data", name)).tap(&Gem::UNTAINT)
+    File.expand_path(File.join(gems_dir, full_name, "data", name))
   end
 
   ##
@@ -185,9 +220,11 @@ def to_fullpath(path)
   ##
   # Returns the full path to this spec's gem directory.
   # eg: /usr/local/lib/ruby/1.8/gems/mygem-1.0
+  #
+  # TODO: This is duplicated with #full_gem_path. Eventually either of them should be deprecated.
 
   def gem_dir
-    @gem_dir ||= File.expand_path File.join(gems_dir, full_name)
+    @gem_dir ||= find_full_gem_path
   end
 
   ##
@@ -219,6 +256,13 @@ def platform
     raise NotImplementedError
   end
 
+  def installable_on_platform?(target_platform) # :nodoc:
+    return true if [Gem::Platform::RUBY, nil, target_platform].include?(platform)
+    return true if Gem::Platform.new(platform) === target_platform
+
+    false
+  end
+
   def raw_require_paths # :nodoc:
     raise NotImplementedError
   end
@@ -270,7 +314,7 @@ def source_paths
   def matches_for_glob(glob) # TODO: rename?
     glob = File.join(lib_dirs_glob, glob)
 
-    Dir[glob].map {|f| f.tap(&Gem::UNTAINT) } # FIX our tests are broken, run w/ SAFE=1
+    Dir[glob]
   end
 
   ##
@@ -295,7 +339,7 @@ def lib_dirs_glob
       "lib" # default value for require_paths for bundler/inline
     end
 
-    "#{full_gem_path}/#{dirs}".dup.tap(&Gem::UNTAINT)
+    "#{full_gem_path}/#{dirs}"
   end
 
   ##
@@ -332,7 +376,7 @@ def have_extensions?
 
   def have_file?(file, suffixes)
     return true if raw_require_paths.any? do |path|
-      base = File.join(gems_dir, full_name, path.tap(&Gem::UNTAINT), file).tap(&Gem::UNTAINT)
+      base = File.join(gems_dir, full_name, path, file)
       suffixes.any? {|suf| File.file? base + suf }
     end
 
diff --git a/lib/rubygems/bundler_version_finder.rb b/lib/rubygems/bundler_version_finder.rb
index cd51c37c59b6f6..4ebbad1c0cfa33 100644
--- a/lib/rubygems/bundler_version_finder.rb
+++ b/lib/rubygems/bundler_version_finder.rb
@@ -21,7 +21,7 @@ def self.prioritize!(specs)
   end
 
   def self.bundle_update_bundler_version
-    return unless File.basename($0) == "bundle"
+    return unless ["bundle", "bundler"].include? File.basename($0)
     return unless "update".start_with?(ARGV.first || " ")
     bundler_version = nil
     update_index = nil
@@ -52,7 +52,7 @@ def self.lockfile_contents
     unless gemfile
       begin
         Gem::Util.traverse_parents(Dir.pwd) do |directory|
-          next unless gemfile = Gem::GEM_DEP_FILES.find {|f| File.file?(f.tap(&Gem::UNTAINT)) }
+          next unless gemfile = Gem::GEM_DEP_FILES.find {|f| File.file?(f) }
 
           gemfile = File.join directory, gemfile
           break
@@ -67,7 +67,7 @@ def self.lockfile_contents
     lockfile = case gemfile
                when "gems.rb" then "gems.locked"
                else "#{gemfile}.lock"
-    end.dup.tap(&Gem::UNTAINT)
+    end
 
     return unless File.file?(lockfile)
 
diff --git a/lib/rubygems/ci_detector.rb b/lib/rubygems/ci_detector.rb
new file mode 100644
index 00000000000000..7a2d4ee29a9360
--- /dev/null
+++ b/lib/rubygems/ci_detector.rb
@@ -0,0 +1,75 @@
+# frozen_string_literal: true
+
+module Gem
+  module CIDetector
+    # NOTE: Any changes made here will need to be made to both lib/rubygems/ci_detector.rb and
+    # bundler/lib/bundler/ci_detector.rb (which are enforced duplicates).
+    # TODO: Drop that duplication once bundler drops support for RubyGems 3.4
+    #
+    # ## Recognized CI providers, their signifiers, and the relevant docs ##
+    #
+    # Travis CI   - CI, TRAVIS            https://docs.travis-ci.com/user/environment-variables/#default-environment-variables
+    # Cirrus CI   - CI, CIRRUS_CI         https://cirrus-ci.org/guide/writing-tasks/#environment-variables
+    # Circle CI   - CI, CIRCLECI          https://circleci.com/docs/variables/#built-in-environment-variables
+    # Gitlab CI   - CI, GITLAB_CI         https://docs.gitlab.com/ee/ci/variables/
+    # AppVeyor    - CI, APPVEYOR          https://www.appveyor.com/docs/environment-variables/
+    # CodeShip    - CI_NAME               https://docs.cloudbees.com/docs/cloudbees-codeship/latest/pro-builds-and-configuration/environment-variables#_default_environment_variables
+    # dsari       - CI, DSARI             https://github.com/rfinnie/dsari#running
+    # Jenkins     - BUILD_NUMBER          https://www.jenkins.io/doc/book/pipeline/jenkinsfile/#using-environment-variables
+    # TeamCity    - TEAMCITY_VERSION      https://www.jetbrains.com/help/teamcity/predefined-build-parameters.html#Predefined+Server+Build+Parameters
+    # Appflow     - CI_BUILD_ID           https://ionic.io/docs/appflow/automation/environments#predefined-environments
+    # TaskCluster - TASKCLUSTER_ROOT_URL  https://docs.taskcluster.net/docs/manual/design/env-vars
+    # Semaphore   - CI, SEMAPHORE         https://docs.semaphoreci.com/ci-cd-environment/environment-variables/
+    # BuildKite   - CI, BUILDKITE         https://buildkite.com/docs/pipelines/environment-variables
+    # GoCD        - GO_SERVER_URL         https://docs.gocd.org/current/faq/dev_use_current_revision_in_build.html
+    # GH Actions  - CI, GITHUB_ACTIONS    https://docs.github.com/en/actions/learn-github-actions/variables#default-environment-variables
+    #
+    # ### Some "standard" ENVs that multiple providers may set ###
+    #
+    # * CI - this is set by _most_ (but not all) CI providers now; it's approaching a standard.
+    # * CI_NAME - Not as frequently used, but some providers set this to specify their own name
+
+    # Any of these being set is a reasonably reliable indicator that we are
+    # executing in a CI environment.
+    ENV_INDICATORS = [
+      "CI",
+      "CI_NAME",
+      "CONTINUOUS_INTEGRATION",
+      "BUILD_NUMBER",
+      "CI_APP_ID",
+      "CI_BUILD_ID",
+      "CI_BUILD_NUMBER",
+      "RUN_ID",
+      "TASKCLUSTER_ROOT_URL",
+    ].freeze
+
+    # For each CI, this env suffices to indicate that we're on _that_ CI's
+    # containers. (A few of them only supply a CI_NAME variable, which is also
+    # nice). And if they set "CI" but we can't tell which one they are, we also
+    # want to know that - a bare "ci" without another token tells us as much.
+    ENV_DESCRIPTORS = {
+      "TRAVIS" => "travis",
+      "CIRCLECI" => "circle",
+      "CIRRUS_CI" => "cirrus",
+      "DSARI" => "dsari",
+      "SEMAPHORE" => "semaphore",
+      "JENKINS_URL" => "jenkins",
+      "BUILDKITE" => "buildkite",
+      "GO_SERVER_URL" => "go",
+      "GITLAB_CI" => "gitlab",
+      "GITHUB_ACTIONS" => "github",
+      "TASKCLUSTER_ROOT_URL" => "taskcluster",
+      "CI" => "ci",
+    }.freeze
+
+    def self.ci?
+      ENV_INDICATORS.any? {|var| ENV.include?(var) }
+    end
+
+    def self.ci_strings
+      matching_names = ENV_DESCRIPTORS.select {|env, _| ENV[env] }.values
+      matching_names << ENV["CI_NAME"].downcase if ENV["CI_NAME"]
+      matching_names.reject(&:empty?).sort.uniq
+    end
+  end
+end
diff --git a/lib/rubygems/command.rb b/lib/rubygems/command.rb
index 53bb609ae0e152..3a149ea38e23e2 100644
--- a/lib/rubygems/command.rb
+++ b/lib/rubygems/command.rb
@@ -6,7 +6,7 @@
 # See LICENSE.txt for permissions.
 #++
 
-require_relative "optparse"
+require_relative "vendored_optparse"
 require_relative "requirement"
 require_relative "user_interaction"
 
@@ -190,7 +190,7 @@ def get_all_gem_names
             "Please specify at least one gem name (e.g. gem build GEMNAME)"
     end
 
-    args.select {|arg| arg !~ /^-/ }
+    args.reject {|arg| arg.start_with?("-") }
   end
 
   ##
@@ -485,7 +485,7 @@ def add_parser_description # :nodoc:
 
     @parser.separator nil
     @parser.separator "  Description:"
-    formatted.split("\n").each do |line|
+    formatted.each_line do |line|
       @parser.separator "    #{line.rstrip}"
     end
   end
@@ -512,8 +512,8 @@ def add_parser_run_info(title, content)
 
     @parser.separator nil
     @parser.separator "  #{title}:"
-    content.split(/\n/).each do |line|
-      @parser.separator "    #{line}"
+    content.each_line do |line|
+      @parser.separator "    #{line.rstrip}"
     end
   end
 
@@ -522,7 +522,7 @@ def add_parser_summary # :nodoc:
 
     @parser.separator nil
     @parser.separator "  Summary:"
-    wrap(@summary, 80 - 4).split("\n").each do |line|
+    wrap(@summary, 80 - 4).each_line do |line|
       @parser.separator "    #{line.strip}"
     end
   end
@@ -650,9 +650,6 @@ def wrap(text, width) # :doc:
     gem help platforms           gem platforms guide
     gem help <COMMAND>           show help on COMMAND
                                    (e.g. 'gem help install')
-    gem server                   present a web page at
-                                 http://localhost:8808/
-                                 with info about installed gems
   Further information:
     https://guides.rubygems.org
   HELP
diff --git a/lib/rubygems/command_manager.rb b/lib/rubygems/command_manager.rb
index c53f0231afc9f8..15834ce4dd0c09 100644
--- a/lib/rubygems/command_manager.rb
+++ b/lib/rubygems/command_manager.rb
@@ -60,6 +60,7 @@ class Gem::CommandManager
     :push,
     :query,
     :rdoc,
+    :rebuild,
     :search,
     :server,
     :signin,
@@ -106,7 +107,7 @@ def self.reset
   # Register all the subcommands supported by the gem command.
 
   def initialize
-    require "timeout"
+    require_relative "vendored_timeout"
     @commands = {}
 
     BUILTIN_COMMANDS.each do |name|
@@ -149,7 +150,7 @@ def command_names
 
   def run(args, build_args=nil)
     process_args(args, build_args)
-  rescue StandardError, Timeout::Error => ex
+  rescue StandardError, Gem::Timeout::Error => ex
     if ex.respond_to?(:detailed_message)
       msg = ex.detailed_message(highlight: false).sub(/\A(.*?)(?: \(.+?\))/) { $1 }
     else
@@ -229,18 +230,16 @@ def find_command_possibilities(cmd_name)
   def load_and_instantiate(command_name)
     command_name = command_name.to_s
     const_name = command_name.capitalize.gsub(/_(.)/) { $1.upcase } << "Command"
-    load_error = nil
 
     begin
       begin
         require "rubygems/commands/#{command_name}_command"
-      rescue LoadError => e
-        load_error = e
+      rescue LoadError
+        # it may have been defined from a rubygems_plugin.rb file
       end
+
       Gem::Commands.const_get(const_name).new
     rescue StandardError => e
-      e = load_error if load_error
-
       alert_error clean_text("Loading command: #{command_name} (#{e.class})\n\t#{e}")
       ui.backtrace e
     end
@@ -249,6 +248,7 @@ def load_and_instantiate(command_name)
   def invoke_command(args, build_args)
     cmd_name = args.shift.downcase
     cmd = find_command cmd_name
+    terminate_interaction 1 unless cmd
     cmd.deprecation_warning if cmd.deprecated?
     cmd.invoke_with_build_args args, build_args
   end
diff --git a/lib/rubygems/commands/build_command.rb b/lib/rubygems/commands/build_command.rb
index 0ebdec565b5606..2ec83241418d13 100644
--- a/lib/rubygems/commands/build_command.rb
+++ b/lib/rubygems/commands/build_command.rb
@@ -1,11 +1,13 @@
 # frozen_string_literal: true
 
 require_relative "../command"
+require_relative "../gemspec_helpers"
 require_relative "../package"
 require_relative "../version_option"
 
 class Gem::Commands::BuildCommand < Gem::Command
   include Gem::VersionOption
+  include Gem::GemspecHelpers
 
   def initialize
     super "build", "Build a gem from a gemspec"
@@ -75,17 +77,6 @@ def execute
 
   private
 
-  def find_gemspec(glob = "*.gemspec")
-    gemspecs = Dir.glob(glob).sort
-
-    if gemspecs.size > 1
-      alert_error "Multiple gemspecs found: #{gemspecs}, please specify one"
-      terminate_interaction(1)
-    end
-
-    gemspecs.first
-  end
-
   def build_gem
     gemspec = resolve_gem_name
 
diff --git a/lib/rubygems/commands/cert_command.rb b/lib/rubygems/commands/cert_command.rb
index 22864a9b29005f..72dcf1dd170bbe 100644
--- a/lib/rubygems/commands/cert_command.rb
+++ b/lib/rubygems/commands/cert_command.rb
@@ -6,7 +6,7 @@
 class Gem::Commands::CertCommand < Gem::Command
   def initialize
     super "cert", "Manage RubyGems certificates and signing settings",
-          :add => [], :remove => [], :list => [], :build => [], :sign => []
+          add: [], remove: [], list: [], build: [], sign: []
 
     add_option("-a", "--add CERT",
                "Add a trusted certificate.") do |cert_file, options|
diff --git a/lib/rubygems/commands/check_command.rb b/lib/rubygems/commands/check_command.rb
index 65522585529313..fb23dd9cb4138c 100644
--- a/lib/rubygems/commands/check_command.rb
+++ b/lib/rubygems/commands/check_command.rb
@@ -10,7 +10,7 @@ class Gem::Commands::CheckCommand < Gem::Command
 
   def initialize
     super "check", "Check a gem repository for added or missing files",
-          :alien => true, :doctor => false, :dry_run => false, :gems => true
+          alien: true, doctor: false, dry_run: false, gems: true
 
     add_option("-a", "--[no-]alien",
                'Report "unmanaged" or rogue files in the',
diff --git a/lib/rubygems/commands/cleanup_command.rb b/lib/rubygems/commands/cleanup_command.rb
index 26beba48df537b..c89a24eee9c0d6 100644
--- a/lib/rubygems/commands/cleanup_command.rb
+++ b/lib/rubygems/commands/cleanup_command.rb
@@ -8,8 +8,8 @@ class Gem::Commands::CleanupCommand < Gem::Command
   def initialize
     super "cleanup",
           "Clean up old versions of installed gems",
-          :force => false, :install_dir => Gem.dir,
-          :check_dev => true
+          force: false, install_dir: Gem.dir,
+          check_dev: true
 
     add_option("-n", "-d", "--dry-run",
                "Do not uninstall gems") do |_value, options|
@@ -38,8 +38,6 @@ def initialize
     @default_gems    = []
     @full            = nil
     @gems_to_cleanup = nil
-    @original_home   = nil
-    @original_path   = nil
     @primary_gems    = nil
   end
 
@@ -95,9 +93,6 @@ def execute
   end
 
   def clean_gems
-    @original_home = Gem.dir
-    @original_path = Gem.path
-
     get_primary_gems
     get_candidate_gems
     get_gems_to_cleanup
@@ -112,17 +107,15 @@ def clean_gems
     deps.reverse_each do |spec|
       uninstall_dep spec
     end
-
-    Gem::Specification.reset
   end
 
   def get_candidate_gems
     @candidate_gems = if options[:args].empty?
       Gem::Specification.to_a
     else
-      options[:args].map do |gem_name|
+      options[:args].flat_map do |gem_name|
         Gem::Specification.find_all_by_name gem_name
-      end.flatten
+      end
     end
   end
 
@@ -133,7 +126,7 @@ def get_gems_to_cleanup
 
     default_gems, gems_to_cleanup = gems_to_cleanup.partition(&:default_gem?)
 
-    uninstall_from = options[:user_install] ? Gem.user_dir : @original_home
+    uninstall_from = options[:user_install] ? Gem.user_dir : Gem.dir
 
     gems_to_cleanup = gems_to_cleanup.select do |spec|
       spec.base_dir == uninstall_from
@@ -166,8 +159,8 @@ def uninstall_dep(spec)
     say "Attempting to uninstall #{spec.full_name}"
 
     uninstall_options = {
-      :executables => false,
-      :version => "= #{spec.version}",
+      executables: false,
+      version: "= #{spec.version}",
     }
 
     uninstall_options[:user_install] = Gem.user_dir == spec.base_dir
@@ -181,8 +174,5 @@ def uninstall_dep(spec)
       say "Unable to uninstall #{spec.full_name}:"
       say "\t#{e.class}: #{e.message}"
     end
-  ensure
-    # Restore path Gem::Uninstaller may have changed
-    Gem.use_paths @original_home, *@original_path
   end
 end
diff --git a/lib/rubygems/commands/contents_command.rb b/lib/rubygems/commands/contents_command.rb
index f3783468aa3f1d..d4f98718683c3b 100644
--- a/lib/rubygems/commands/contents_command.rb
+++ b/lib/rubygems/commands/contents_command.rb
@@ -8,8 +8,8 @@ class Gem::Commands::ContentsCommand < Gem::Command
 
   def initialize
     super "contents", "Display the contents of the installed gems",
-          :specdirs => [], :lib_only => false, :prefix => true,
-          :show_install_dir => false
+          specdirs: [], lib_only: false, prefix: true,
+          show_install_dir: false
 
     add_version_option
 
@@ -102,15 +102,22 @@ def files_in_gem(spec)
   end
 
   def files_in_default_gem(spec)
-    spec.files.map do |file|
-      case file
-      when %r{\A#{spec.bindir}/}
-        # $' is POSTMATCH
-        [RbConfig::CONFIG["bindir"], $']
-      when /\.so\z/
-        [RbConfig::CONFIG["archdir"], file]
+    spec.files.filter_map do |file|
+      if file.start_with?("#{spec.bindir}/")
+        [RbConfig::CONFIG["bindir"], file.delete_prefix("#{spec.bindir}/")]
       else
-        [RbConfig::CONFIG["rubylibdir"], file]
+        gem spec.name, spec.version
+
+        require_path = spec.require_paths.find do |path|
+          file.start_with?("#{path}/")
+        end
+
+        requirable_part = file.delete_prefix("#{require_path}/")
+
+        resolve = $LOAD_PATH.resolve_feature_path(requirable_part)&.last
+        next unless resolve
+
+        [resolve.delete_suffix(requirable_part), requirable_part]
       end
     end
   end
@@ -182,8 +189,8 @@ def spec_for(name)
   end
 
   def specification_directories # :nodoc:
-    options[:specdirs].map do |i|
+    options[:specdirs].flat_map do |i|
       [i, File.join(i, "specifications")]
-    end.flatten
+    end
   end
 end
diff --git a/lib/rubygems/commands/dependency_command.rb b/lib/rubygems/commands/dependency_command.rb
index 109bf03affd2db..9aaefae999d480 100644
--- a/lib/rubygems/commands/dependency_command.rb
+++ b/lib/rubygems/commands/dependency_command.rb
@@ -11,7 +11,7 @@ class Gem::Commands::DependencyCommand < Gem::Command
   def initialize
     super "dependency",
           "Show the dependencies of an installed gem",
-          :version => Gem::Requirement.default, :domain => :local
+          version: Gem::Requirement.default, domain: :local
 
     add_version_option
     add_platform_option
diff --git a/lib/rubygems/commands/environment_command.rb b/lib/rubygems/commands/environment_command.rb
index 8ed0996069d987..aea8c0d7deadd8 100644
--- a/lib/rubygems/commands/environment_command.rb
+++ b/lib/rubygems/commands/environment_command.rb
@@ -15,6 +15,7 @@ def arguments # :nodoc:
           version         display the gem format version
           remotesources   display the remote gem servers
           platform        display the supported gem platforms
+          credentials     display the path where credentials are stored
           <omitted>       display everything
     EOF
     args.gsub(/^\s+/, "")
@@ -88,6 +89,8 @@ def execute
         Gem.sources.to_a.join("\n")
       when /^platform/ then
         Gem.platforms.join(File::PATH_SEPARATOR)
+      when /^credentials/, /^creds/ then
+        Gem.configuration.credentials_path
       when nil then
         show_environment
       else
@@ -114,6 +117,8 @@ def show_environment # :nodoc:
 
     out << "  - USER INSTALLATION DIRECTORY: #{Gem.user_dir}\n"
 
+    out << "  - CREDENTIALS FILE: #{Gem.configuration.credentials_path}\n"
+
     out << "  - RUBYGEMS PREFIX: #{Gem.prefix}\n" unless Gem.prefix.nil?
 
     out << "  - RUBY EXECUTABLE: #{Gem.ruby}\n"
diff --git a/lib/rubygems/commands/exec_command.rb b/lib/rubygems/commands/exec_command.rb
index d588804290e9ab..c24ebbf711c2d7 100644
--- a/lib/rubygems/commands/exec_command.rb
+++ b/lib/rubygems/commands/exec_command.rb
@@ -57,8 +57,6 @@ def usage # :nodoc:
   end
 
   def execute
-    gem_paths = { "GEM_HOME" => Gem.paths.home, "GEM_PATH" => Gem.paths.path.join(File::PATH_SEPARATOR), "GEM_SPEC_CACHE" => Gem.paths.spec_cache_dir }.compact
-
     check_executable
 
     print_command
@@ -74,9 +72,6 @@ def execute
     end
 
     load!
-  ensure
-    ENV.update(gem_paths) if gem_paths
-    Gem.clear_paths
   end
 
   private
@@ -143,7 +138,7 @@ def install_if_needed
   end
 
   def set_gem_exec_install_paths
-    home = File.join(Gem.dir, "gem_exec")
+    home = Gem.dir
 
     ENV["GEM_PATH"] = ([home] + Gem.path).join(File::PATH_SEPARATOR)
     ENV["GEM_HOME"] = home
@@ -200,7 +195,7 @@ def load!
     argv = ARGV.clone
     ARGV.replace options[:args]
 
-    exe = executable = options[:executable]
+    executable = options[:executable]
 
     contains_executable = Gem.loaded_specs.values.select do |spec|
       spec.executables.include?(executable)
@@ -211,13 +206,22 @@ def load!
     end
 
     if contains_executable.empty?
-      if (spec = Gem.loaded_specs[executable]) && (exe = spec.executable)
-        contains_executable << spec
-      else
+      spec = Gem.loaded_specs[executable]
+
+      if spec.nil? || spec.executables.empty?
         alert_error "Failed to load executable `#{executable}`," \
               " are you sure the gem `#{options[:gem_name]}` contains it?"
         terminate_interaction 1
       end
+
+      if spec.executables.size > 1
+        alert_error "Ambiguous which executable from gem `#{executable}` should be run: " \
+              "the options are #{spec.executables.sort}, specify one via COMMAND, and use `-g` and `-v` to specify gem and version"
+        terminate_interaction 1
+      end
+
+      contains_executable << spec
+      executable = spec.executable
     end
 
     if contains_executable.size > 1
@@ -227,8 +231,11 @@ def load!
       terminate_interaction 1
     end
 
-    load Gem.activate_bin_path(contains_executable.first.name, exe, ">= 0.a")
+    old_exe = $0
+    $0 = executable
+    load Gem.activate_bin_path(contains_executable.first.name, executable, ">= 0.a")
   ensure
+    $0 = old_exe if old_exe
     ARGV.replace argv
   end
 
diff --git a/lib/rubygems/commands/fetch_command.rb b/lib/rubygems/commands/fetch_command.rb
index 950d4fe30e0ec6..c524cf792293bd 100644
--- a/lib/rubygems/commands/fetch_command.rb
+++ b/lib/rubygems/commands/fetch_command.rb
@@ -10,8 +10,8 @@ class Gem::Commands::FetchCommand < Gem::Command
 
   def initialize
     defaults = {
-      :suggest_alternate => true,
-      :version => Gem::Requirement.default,
+      suggest_alternate: true,
+      version: Gem::Requirement.default,
     }
 
     super "fetch", "Download a gem and place it in the current directory", defaults
@@ -63,6 +63,17 @@ def check_version # :nodoc:
 
   def execute
     check_version
+
+    exit_code = fetch_gems
+
+    terminate_interaction exit_code
+  end
+
+  private
+
+  def fetch_gems
+    exit_code = 0
+
     version = options[:version]
 
     platform  = Gem.platforms.last
@@ -86,10 +97,13 @@ def execute
 
       if spec.nil?
         show_lookup_failure gem_name, gem_version, errors, suppress_suggestions, options[:domain]
+        exit_code |= 2
         next
       end
       source.download spec
       say "Downloaded #{spec.full_name}"
     end
+
+    exit_code
   end
 end
diff --git a/lib/rubygems/commands/generate_index_command.rb b/lib/rubygems/commands/generate_index_command.rb
index ce580cfaf913e8..13be92593b1c47 100644
--- a/lib/rubygems/commands/generate_index_command.rb
+++ b/lib/rubygems/commands/generate_index_command.rb
@@ -1,86 +1,51 @@
 # frozen_string_literal: true
 
 require_relative "../command"
-require_relative "../indexer"
 
-##
-# Generates a index files for use as a gem server.
-#
-# See `gem help generate_index`
-
-class Gem::Commands::GenerateIndexCommand < Gem::Command
-  def initialize
-    super "generate_index",
-          "Generates the index files for a gem server directory",
-          :directory => ".", :build_modern => true
+unless defined? Gem::Commands::GenerateIndexCommand
+  class Gem::Commands::GenerateIndexCommand < Gem::Command
+    module RubygemsTrampoline
+      def description # :nodoc:
+        <<~EOF
+          The generate_index command has been moved to the rubygems-generate_index gem.
+        EOF
+      end
 
-    add_option "-d", "--directory=DIRNAME",
-               "repository base dir containing gems subdir" do |dir, options|
-      options[:directory] = File.expand_path dir
-    end
+      def execute
+        alert_error "Install the rubygems-generate_index gem for the generate_index command"
+      end
 
-    add_option "--[no-]modern",
-               "Generate indexes for RubyGems",
-               "(always true)" do |value, options|
-      options[:build_modern] = value
+      def invoke_with_build_args(args, build_args)
+        name = "rubygems-generate_index"
+        spec = begin
+          Gem::Specification.find_by_name(name)
+        rescue Gem::LoadError
+          require "rubygems/dependency_installer"
+          Gem.install(name, Gem::Requirement.default, Gem::DependencyInstaller::DEFAULT_OPTIONS).find {|s| s.name == name }
+        end
+
+        # remove the methods defined in this file so that the methods defined in the gem are used instead,
+        # and without a method redefinition warning
+        %w[description execute invoke_with_build_args].each do |method|
+          RubygemsTrampoline.remove_method(method)
+        end
+        self.class.singleton_class.remove_method(:new)
+
+        spec.activate
+        Gem.load_plugin_files spec.matches_for_glob("rubygems_plugin#{Gem.suffix_pattern}")
+
+        self.class.new.invoke_with_build_args(args, build_args)
+      end
     end
+    private_constant :RubygemsTrampoline
 
-    deprecate_option("--modern", version: "4.0", extra_msg: "Modern indexes (specs, latest_specs, and prerelease_specs) are always generated, so this option is not needed.")
-    deprecate_option("--no-modern", version: "4.0", extra_msg: "The `--no-modern` option is currently ignored. Modern indexes (specs, latest_specs, and prerelease_specs) are always generated.")
-
-    add_option "--update",
-               "Update modern indexes with gems added",
-               "since the last update" do |value, options|
-      options[:update] = value
+    # remove_method(:initialize) warns, but removing new does not warn
+    def self.new
+      command = allocate
+      command.send(:initialize, "generate_index", "Generates the index files for a gem server directory (requires rubygems-generate_index)")
+      command
     end
-  end
-
-  def defaults_str # :nodoc:
-    "--directory . --modern"
-  end
-
-  def description # :nodoc:
-    <<-EOF
-The generate_index command creates a set of indexes for serving gems
-statically.  The command expects a 'gems' directory under the path given to
-the --directory option.  The given directory will be the directory you serve
-as the gem repository.
 
-For `gem generate_index --directory /path/to/repo`, expose /path/to/repo via
-your HTTP server configuration (not /path/to/repo/gems).
-
-When done, it will generate a set of files like this:
-
-  gems/*.gem                                   # .gem files you want to
-                                               # index
-
-  specs.<version>.gz                           # specs index
-  latest_specs.<version>.gz                    # latest specs index
-  prerelease_specs.<version>.gz                # prerelease specs index
-  quick/Marshal.<version>/<gemname>.gemspec.rz # Marshal quick index file
-
-The .rz extension files are compressed with the inflate algorithm.
-The Marshal version number comes from ruby's Marshal::MAJOR_VERSION and
-Marshal::MINOR_VERSION constants.  It is used to ensure compatibility.
-    EOF
-  end
-
-  def execute
-    # This is always true because it's the only way now.
-    options[:build_modern] = true
-
-    if !File.exist?(options[:directory]) ||
-       !File.directory?(options[:directory])
-      alert_error "unknown directory name #{options[:directory]}."
-      terminate_interaction 1
-    else
-      indexer = Gem::Indexer.new options.delete(:directory), options
-
-      if options[:update]
-        indexer.update_index
-      else
-        indexer.generate_index
-      end
-    end
+    prepend(RubygemsTrampoline)
   end
 end
diff --git a/lib/rubygems/commands/help_command.rb b/lib/rubygems/commands/help_command.rb
index 043e7d36911342..1619b152e7beb4 100644
--- a/lib/rubygems/commands/help_command.rb
+++ b/lib/rubygems/commands/help_command.rb
@@ -59,7 +59,7 @@ class Gem::Commands::HelpCommand < Gem::Command
 compatible with Bundler's Gemfile format.  You can see additional
 documentation on the format at:
 
-  http://bundler.io
+  https://bundler.io
 
 RubyGems automatically looks for these gem dependencies files:
 
@@ -172,7 +172,7 @@ class Gem::Commands::HelpCommand < Gem::Command
 See the bundler Gemfile manual page for a list of platforms supported in a gem
 dependencies file.:
 
-  http://bundler.io/v1.6/man/gemfile.5.html
+  https://bundler.io/v2.5/man/gemfile.5.html
 
 Ruby Version and Engine Dependency
 ==================================
@@ -333,7 +333,7 @@ def show_commands # :nodoc:
     @command_manager.command_names.each do |cmd_name|
       command = @command_manager[cmd_name]
 
-      next if command.deprecated?
+      next if command&.deprecated?
 
       summary =
         if command
diff --git a/lib/rubygems/commands/info_command.rb b/lib/rubygems/commands/info_command.rb
index ced7751ff55711..f65c639662c546 100644
--- a/lib/rubygems/commands/info_command.rb
+++ b/lib/rubygems/commands/info_command.rb
@@ -8,8 +8,8 @@ class Gem::Commands::InfoCommand < Gem::Command
 
   def initialize
     super "info", "Show information for the given gem",
-         :name => //, :domain => :local, :details => false, :versions => true,
-         :installed => nil, :version => Gem::Requirement.default
+         name: //, domain: :local, details: false, versions: true,
+         installed: nil, version: Gem::Requirement.default
 
     add_query_options
 
diff --git a/lib/rubygems/commands/install_command.rb b/lib/rubygems/commands/install_command.rb
index b8dfc9011191ea..2888b6c55a8372 100644
--- a/lib/rubygems/commands/install_command.rb
+++ b/lib/rubygems/commands/install_command.rb
@@ -23,11 +23,11 @@ class Gem::Commands::InstallCommand < Gem::Command
 
   def initialize
     defaults = Gem::DependencyInstaller::DEFAULT_OPTIONS.merge({
-      :format_executable => false,
-      :lock => true,
-      :suggest_alternate => true,
-      :version => Gem::Requirement.default,
-      :without_groups => [],
+      format_executable: false,
+      lock: true,
+      suggest_alternate: true,
+      version: Gem::Requirement.default,
+      without_groups: [],
     })
 
     defaults.merge!(install_update_options)
@@ -136,13 +136,6 @@ def usage # :nodoc:
     "#{program_name} [options] GEMNAME [GEMNAME ...] -- --build-flags"
   end
 
-  def check_install_dir # :nodoc:
-    if options[:install_dir] && options[:user_install]
-      alert_error "Use --install-dir or --user-install but not both"
-      terminate_interaction 1
-    end
-  end
-
   def check_version # :nodoc:
     if options[:version] != Gem::Requirement.default &&
        get_all_gem_names.size > 1
@@ -162,7 +155,6 @@ def execute
 
     ENV.delete "GEM_PATH" if options[:install_dir].nil?
 
-    check_install_dir
     check_version
 
     load_hooks
@@ -171,7 +163,7 @@ def execute
 
     show_installed
 
-    say update_suggestion if eglible_for_update?
+    say update_suggestion if eligible_for_update?
 
     terminate_interaction exit_code
   end
@@ -232,10 +224,6 @@ def install_gems # :nodoc:
       rescue Gem::InstallError => e
         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, suppress_suggestions
-
-        exit_code |= 2
       rescue Gem::UnsatisfiableDependencyError => e
         show_lookup_failure e.name, e.version, e.errors, suppress_suggestions,
                             "'#{gem_name}' (#{gem_version})"
diff --git a/lib/rubygems/commands/list_command.rb b/lib/rubygems/commands/list_command.rb
index 522c771f901aad..fab4b738149229 100644
--- a/lib/rubygems/commands/list_command.rb
+++ b/lib/rubygems/commands/list_command.rb
@@ -11,8 +11,8 @@ class Gem::Commands::ListCommand < Gem::Command
 
   def initialize
     super "list", "Display local gems whose name matches REGEXP",
-         :domain => :local, :details => false, :versions => true,
-         :installed => nil, :version => Gem::Requirement.default
+         domain: :local, details: false, versions: true,
+         installed: nil, version: Gem::Requirement.default
 
     add_query_options
   end
diff --git a/lib/rubygems/commands/lock_command.rb b/lib/rubygems/commands/lock_command.rb
index 3a9512fe3f4635..f7fd5ada169b1f 100644
--- a/lib/rubygems/commands/lock_command.rb
+++ b/lib/rubygems/commands/lock_command.rb
@@ -5,7 +5,7 @@
 class Gem::Commands::LockCommand < Gem::Command
   def initialize
     super "lock", "Generate a lockdown list of gems",
-          :strict => false
+          strict: false
 
     add_option "-s", "--[no-]strict",
                "fail if unable to satisfy a dependency" do |strict, options|
diff --git a/lib/rubygems/commands/open_command.rb b/lib/rubygems/commands/open_command.rb
index 5a13074a1d02b1..0fe90dc8b83586 100644
--- a/lib/rubygems/commands/open_command.rb
+++ b/lib/rubygems/commands/open_command.rb
@@ -70,9 +70,7 @@ def open_gem(name)
   end
 
   def open_editor(path)
-    Dir.chdir(path) do
-      system(*@editor.split(/\s+/) + [path])
-    end
+    system(*@editor.split(/\s+/) + [path], { chdir: path })
   end
 
   def spec_for(name)
diff --git a/lib/rubygems/commands/owner_command.rb b/lib/rubygems/commands/owner_command.rb
index fce32aca3ed196..12bfe3a834b703 100644
--- a/lib/rubygems/commands/owner_command.rb
+++ b/lib/rubygems/commands/owner_command.rb
@@ -39,7 +39,7 @@ def initialize
     add_proxy_option
     add_key_option
     add_otp_option
-    defaults.merge! :add => [], :remove => []
+    defaults.merge! add: [], remove: []
 
     add_option "-a", "--add NEW_OWNER", "Add an owner by user identifier" do |value, options|
       options[:add] << value
diff --git a/lib/rubygems/commands/pristine_command.rb b/lib/rubygems/commands/pristine_command.rb
index 3dbbb3e50c977f..93503d2b69915d 100644
--- a/lib/rubygems/commands/pristine_command.rb
+++ b/lib/rubygems/commands/pristine_command.rb
@@ -11,10 +11,10 @@ class Gem::Commands::PristineCommand < Gem::Command
   def initialize
     super "pristine",
           "Restores installed gems to pristine condition from files located in the gem cache",
-          :version => Gem::Requirement.default,
-          :extensions => true,
-          :extensions_set => false,
-          :all => false
+          version: Gem::Requirement.default,
+          extensions: true,
+          extensions_set: false,
+          all: false
 
     add_option("--all",
                "Restore all installed gems to pristine",
@@ -57,7 +57,7 @@ def initialize
     end
 
     add_option("-i", "--install-dir DIR",
-               "Gem repository to get binstubs and plugins installed") do |value, options|
+               "Gem repository to get gems restored") do |value, options|
       options[:install_dir] = File.expand_path(value)
     end
 
@@ -103,22 +103,26 @@ def usage # :nodoc:
   end
 
   def execute
+    install_dir = options[:install_dir]
+
+    specification_record = install_dir ? Gem::SpecificationRecord.from_path(install_dir) : Gem::Specification.specification_record
+
     specs = if options[:all]
-      Gem::Specification.map
+      specification_record.map
 
     # `--extensions` must be explicitly given to pristine only gems
     # with extensions.
     elsif options[:extensions_set] &&
           options[:extensions] && options[:args].empty?
-      Gem::Specification.select do |spec|
+      specification_record.select do |spec|
         spec.extensions && !spec.extensions.empty?
       end
     elsif options[:only_missing_extensions]
-      Gem::Specification.select(&:missing_extensions?)
+      specification_record.select(&:missing_extensions?)
     else
-      get_all_gem_names.sort.map do |gem_name|
-        Gem::Specification.find_all_by_name(gem_name, options[:version]).reverse
-      end.flatten
+      get_all_gem_names.sort.flat_map do |gem_name|
+        specification_record.find_all_by_name(gem_name, options[:version]).reverse
+      end
     end
 
     specs = specs.select {|spec| spec.platform == RUBY_ENGINE || Gem::Platform.local === spec.platform || spec.platform == Gem::Platform::RUBY }
@@ -130,10 +134,17 @@ def execute
 
     say "Restoring gems to pristine condition..."
 
-    specs.each do |spec|
-      if spec.default_gem?
-        say "Skipped #{spec.full_name}, it is a default gem"
-        next
+    specs.group_by(&:full_name_with_location).values.each do |grouped_specs|
+      spec = grouped_specs.find {|s| !s.default_gem? } || grouped_specs.first
+
+      only_executables = options[:only_executables]
+      only_plugins = options[:only_plugins]
+
+      unless only_executables || only_plugins
+        # Default gemspecs include changes provided by ruby-core installer that
+        # can't currently be pristined (inclusion of compiled extension targets in
+        # the file list). So stick to resetting executables if it's a default gem.
+        only_executables = true if spec.default_gem?
       end
 
       if options.key? :skip
@@ -143,17 +154,17 @@ def execute
         end
       end
 
-      unless spec.extensions.empty? || options[:extensions] || options[:only_executables] || options[:only_plugins]
-        say "Skipped #{spec.full_name}, it needs to compile an extension"
+      unless spec.extensions.empty? || options[:extensions] || only_executables || only_plugins
+        say "Skipped #{spec.full_name_with_location}, it needs to compile an extension"
         next
       end
 
       gem = spec.cache_file
 
-      unless File.exist?(gem) || options[:only_executables] || options[:only_plugins]
+      unless File.exist?(gem) || only_executables || only_plugins
         require_relative "../remote_fetcher"
 
-        say "Cached gem for #{spec.full_name} not found, attempting to fetch..."
+        say "Cached gem for #{spec.full_name_with_location} not found, attempting to fetch..."
 
         dep = Gem::Dependency.new spec.name, spec.version
         found, _ = Gem::SpecFetcher.fetcher.spec_for_dependency dep
@@ -176,21 +187,20 @@ def execute
         end
 
       bin_dir = options[:bin_dir] if options[:bin_dir]
-      install_dir = options[:install_dir] if options[:install_dir]
 
       installer_options = {
-        :wrappers => true,
-        :force => true,
-        :install_dir => install_dir || spec.base_dir,
-        :env_shebang => env_shebang,
-        :build_args => spec.build_args,
-        :bin_dir => bin_dir,
+        wrappers: true,
+        force: true,
+        install_dir: install_dir || spec.base_dir,
+        env_shebang: env_shebang,
+        build_args: spec.build_args,
+        bin_dir: bin_dir,
       }
 
-      if options[:only_executables]
+      if only_executables
         installer = Gem::Installer.for_spec(spec, installer_options)
         installer.generate_bin
-      elsif options[:only_plugins]
+      elsif only_plugins
         installer = Gem::Installer.for_spec(spec, installer_options)
         installer.generate_plugins
       else
@@ -198,7 +208,7 @@ def execute
         installer.install
       end
 
-      say "Restored #{spec.full_name}"
+      say "Restored #{spec.full_name_with_location}"
     end
   end
 end
diff --git a/lib/rubygems/commands/push_command.rb b/lib/rubygems/commands/push_command.rb
index 418b46acc59d6d..d2ce86703ba382 100644
--- a/lib/rubygems/commands/push_command.rb
+++ b/lib/rubygems/commands/push_command.rb
@@ -30,7 +30,7 @@ def usage # :nodoc:
   end
 
   def initialize
-    super "push", "Push a gem up to the gem server", :host => host
+    super "push", "Push a gem up to the gem server", host: host, attestations: []
 
     @user_defined_host = false
 
@@ -45,6 +45,11 @@ def initialize
       @user_defined_host = true
     end
 
+    add_option("--attestation FILE",
+                "Push with sigstore attestations") do |value, options|
+      options[:attestations] << value
+    end
+
     @host = nil
   end
 
@@ -87,11 +92,20 @@ def send_gem(name)
   private
 
   def send_push_request(name, args)
-    rubygems_api_request(*args, scope: get_push_scope) do |request|
-      request.body = Gem.read_binary name
-      request.add_field "Content-Length", request.body.size
-      request.add_field "Content-Type",   "application/octet-stream"
-      request.add_field "Authorization",  api_key
+    scope = get_push_scope
+    rubygems_api_request(*args, scope: scope) do |request|
+      body = Gem.read_binary name
+      if options[:attestations].any?
+        request.set_form([
+          ["gem", body, { filename: name, content_type: "application/octet-stream" }],
+          get_attestations_part,
+        ], "multipart/form-data")
+      else
+        request.body = body
+        request.add_field "Content-Type",   "application/octet-stream"
+        request.add_field "Content-Length", request.body.size
+      end
+      request.add_field "Authorization", api_key
     end
   end
 
@@ -107,4 +121,15 @@ def get_hosts_for(name)
   def get_push_scope
     :push_rubygem
   end
+
+  def get_attestations_part
+    bundles = "[" + options[:attestations].map do |attestation|
+      Gem.read_binary(attestation)
+    end.join(",") + "]"
+    [
+      "attestations",
+      bundles,
+      { content_type: "application/json" },
+    ]
+  end
 end
diff --git a/lib/rubygems/commands/query_command.rb b/lib/rubygems/commands/query_command.rb
index e7d21f341b86c2..3b527974a3afea 100644
--- a/lib/rubygems/commands/query_command.rb
+++ b/lib/rubygems/commands/query_command.rb
@@ -20,8 +20,8 @@ def deprecation_warning
 
   def initialize(name = "query", summary = "Query gem information in local or remote repositories")
     super name, summary,
-         :domain => :local, :details => false, :versions => true,
-         :installed => nil, :version => Gem::Requirement.default
+         domain: :local, details: false, versions: true,
+         installed: nil, version: Gem::Requirement.default
 
     add_option("-n", "--name-matches REGEXP",
                "Name of gem(s) to query on matches the",
diff --git a/lib/rubygems/commands/rdoc_command.rb b/lib/rubygems/commands/rdoc_command.rb
index e318a529147734..62c4bf8ce97d4a 100644
--- a/lib/rubygems/commands/rdoc_command.rb
+++ b/lib/rubygems/commands/rdoc_command.rb
@@ -10,8 +10,8 @@ class Gem::Commands::RdocCommand < Gem::Command
 
   def initialize
     super "rdoc", "Generates RDoc for pre-installed gems",
-          :version => Gem::Requirement.default,
-          :include_rdoc => false, :include_ri => true, :overwrite => false
+          version: Gem::Requirement.default,
+          include_rdoc: false, include_ri: true, overwrite: false
 
     add_option("--all",
                "Generate RDoc/RI documentation for all",
@@ -64,9 +64,9 @@ def execute
     specs = if options[:all]
       Gem::Specification.to_a
     else
-      get_all_gem_names.map do |name|
+      get_all_gem_names.flat_map do |name|
         Gem::Specification.find_by_name name, options[:version]
-      end.flatten.uniq
+      end.uniq
     end
 
     if specs.empty?
@@ -84,14 +84,7 @@ def execute
         FileUtils.rm_rf File.join(spec.doc_dir, "rdoc")
       end
 
-      begin
-        doc.generate
-      rescue Errno::ENOENT => e
-        match = / - /.match(e.message)
-        alert_error "Unable to document #{spec.full_name}, " \
-                    " #{match.post_match} is missing, skipping"
-        terminate_interaction 1 if specs.length == 1
-      end
+      doc.generate
     end
   end
 end
diff --git a/lib/rubygems/commands/rebuild_command.rb b/lib/rubygems/commands/rebuild_command.rb
new file mode 100644
index 00000000000000..77a474ef1ddf32
--- /dev/null
+++ b/lib/rubygems/commands/rebuild_command.rb
@@ -0,0 +1,262 @@
+# frozen_string_literal: true
+
+require "date"
+require "digest"
+require "fileutils"
+require "tmpdir"
+require_relative "../gemspec_helpers"
+require_relative "../package"
+
+class Gem::Commands::RebuildCommand < Gem::Command
+  include Gem::GemspecHelpers
+
+  def initialize
+    super "rebuild", "Attempt to reproduce a build of a gem."
+
+    add_option "--diff", "If the files don't match, compare them using diffoscope." do |_value, options|
+      options[:diff] = true
+    end
+
+    add_option "--force", "Skip validation of the spec." do |_value, options|
+      options[:force] = true
+    end
+
+    add_option "--strict", "Consider warnings as errors when validating the spec." do |_value, options|
+      options[:strict] = true
+    end
+
+    add_option "--source GEM_SOURCE", "Specify the source to download the gem from." do |value, options|
+      options[:source] = value
+    end
+
+    add_option "--original GEM_FILE", "Specify a local file to compare against (instead of downloading it)." do |value, options|
+      options[:original_gem_file] = value
+    end
+
+    add_option "--gemspec GEMSPEC_FILE", "Specify the name of the gemspec file." do |value, options|
+      options[:gemspec_file] = value
+    end
+
+    add_option "-C PATH", "Run as if gem build was started in <PATH> instead of the current working directory." do |value, options|
+      options[:build_path] = value
+    end
+  end
+
+  def arguments # :nodoc:
+    "GEM_NAME      gem name on gem server\n" \
+    "GEM_VERSION   gem version you are attempting to rebuild"
+  end
+
+  def description # :nodoc:
+    <<-EOF
+The rebuild command allows you to (attempt to) reproduce a build of a gem
+from a ruby gemspec.
+
+This command assumes the gemspec can be built with the `gem build` command.
+If you use any of `gem build`, `rake build`, or`rake release` in the
+build/release process for a gem, it is a potential candidate.
+
+You will need to match the RubyGems version used, since this is included in
+the Gem metadata.
+
+If the gem includes lockfiles (e.g. Gemfile.lock) and similar, it will
+require more effort to reproduce a build. For example, it might require
+more precisely matched versions of Ruby and/or Bundler to be used.
+    EOF
+  end
+
+  def usage # :nodoc:
+    "#{program_name} GEM_NAME GEM_VERSION"
+  end
+
+  def execute
+    gem_name, gem_version = get_gem_name_and_version
+
+    old_dir, new_dir = prep_dirs
+
+    gem_filename = "#{gem_name}-#{gem_version}.gem"
+    old_file = File.join(old_dir, gem_filename)
+    new_file = File.join(new_dir, gem_filename)
+
+    if options[:original_gem_file]
+      FileUtils.copy_file(options[:original_gem_file], old_file)
+    else
+      download_gem(gem_name, gem_version, old_file)
+    end
+
+    rg_version = rubygems_version(old_file)
+    unless rg_version == Gem::VERSION
+      alert_error <<-EOF
+You need to use the same RubyGems version #{gem_name} v#{gem_version} was built with.
+
+#{gem_name} v#{gem_version} was built using RubyGems v#{rg_version}.
+Gem files include the version of RubyGems used to build them.
+This means in order to reproduce #{gem_filename}, you must also use RubyGems v#{rg_version}.
+
+You're using RubyGems v#{Gem::VERSION}.
+
+Please install RubyGems v#{rg_version} and try again.
+      EOF
+      terminate_interaction 1
+    end
+
+    source_date_epoch = get_timestamp(old_file).to_s
+
+    if build_path = options[:build_path]
+      Dir.chdir(build_path) { build_gem(gem_name, source_date_epoch, new_file) }
+    else
+      build_gem(gem_name, source_date_epoch, new_file)
+    end
+
+    compare(source_date_epoch, old_file, new_file)
+  end
+
+  private
+
+  def sha256(file)
+    Digest::SHA256.hexdigest(Gem.read_binary(file))
+  end
+
+  def get_timestamp(file)
+    mtime = nil
+    File.open(file, Gem.binary_mode) do |f|
+      Gem::Package::TarReader.new(f) do |tar|
+        mtime = tar.seek("metadata.gz") {|tf| tf.header.mtime }
+      end
+    end
+
+    mtime
+  end
+
+  def compare(source_date_epoch, old_file, new_file)
+    date = Time.at(source_date_epoch.to_i).strftime("%F %T %Z")
+
+    old_hash = sha256(old_file)
+    new_hash = sha256(new_file)
+
+    say
+    say "Built at: #{date} (#{source_date_epoch})"
+    say "Original build saved to:   #{old_file}"
+    say "Reproduced build saved to: #{new_file}"
+    say "Working directory: #{options[:build_path] || Dir.pwd}"
+    say
+    say "Hash comparison:"
+    say "  #{old_hash}\t#{old_file}"
+    say "  #{new_hash}\t#{new_file}"
+    say
+
+    if old_hash == new_hash
+      say "SUCCESS - original and rebuild hashes matched"
+    else
+      say "FAILURE - original and rebuild hashes did not match"
+      say
+
+      if options[:diff]
+        if system("diffoscope", old_file, new_file).nil?
+          alert_error "error: could not find `diffoscope` executable"
+        end
+      else
+        say "Pass --diff for more details (requires diffoscope to be installed)."
+      end
+
+      terminate_interaction 1
+    end
+  end
+
+  def prep_dirs
+    rebuild_dir = Dir.mktmpdir("gem_rebuild")
+    old_dir = File.join(rebuild_dir, "old")
+    new_dir = File.join(rebuild_dir, "new")
+
+    FileUtils.mkdir_p(old_dir)
+    FileUtils.mkdir_p(new_dir)
+
+    [old_dir, new_dir]
+  end
+
+  def get_gem_name_and_version
+    args = options[:args] || []
+    if args.length == 2
+      gem_name, gem_version = args
+    elsif args.length > 2
+      raise Gem::CommandLineError, "Too many arguments"
+    else
+      raise Gem::CommandLineError, "Expected GEM_NAME and GEM_VERSION arguments (gem rebuild GEM_NAME GEM_VERSION)"
+    end
+
+    [gem_name, gem_version]
+  end
+
+  def build_gem(gem_name, source_date_epoch, output_file)
+    gemspec = options[:gemspec_file] || find_gemspec("#{gem_name}.gemspec")
+
+    if gemspec
+      build_package(gemspec, source_date_epoch, output_file)
+    else
+      alert_error error_message(gem_name)
+      terminate_interaction(1)
+    end
+  end
+
+  def build_package(gemspec, source_date_epoch, output_file)
+    with_source_date_epoch(source_date_epoch) do
+      spec = Gem::Specification.load(gemspec)
+      if spec
+        Gem::Package.build(
+          spec,
+          options[:force],
+          options[:strict],
+          output_file
+        )
+      else
+        alert_error "Error loading gemspec. Aborting."
+        terminate_interaction 1
+      end
+    end
+  end
+
+  def with_source_date_epoch(source_date_epoch)
+    old_sde = ENV["SOURCE_DATE_EPOCH"]
+    ENV["SOURCE_DATE_EPOCH"] = source_date_epoch.to_s
+
+    yield
+  ensure
+    ENV["SOURCE_DATE_EPOCH"] = old_sde
+  end
+
+  def error_message(gem_name)
+    if gem_name
+      "Couldn't find a gemspec file matching '#{gem_name}' in #{Dir.pwd}"
+    else
+      "Couldn't find a gemspec file in #{Dir.pwd}"
+    end
+  end
+
+  def download_gem(gem_name, gem_version, old_file)
+    # This code was based loosely off the `gem fetch` command.
+    version = "= #{gem_version}"
+    dep = Gem::Dependency.new gem_name, version
+
+    specs_and_sources, errors =
+      Gem::SpecFetcher.fetcher.spec_for_dependency dep
+
+    # There should never be more than one item in specs_and_sources,
+    # since we search for an exact version.
+    spec, source = specs_and_sources[0]
+
+    if spec.nil?
+      show_lookup_failure gem_name, version, errors, options[:domain]
+      terminate_interaction 1
+    end
+
+    download_path = source.download spec
+
+    FileUtils.move(download_path, old_file)
+
+    say "Downloaded #{gem_name} version #{gem_version} as #{old_file}."
+  end
+
+  def rubygems_version(gem_file)
+    Gem::Package.new(gem_file).spec.rubygems_version
+  end
+end
diff --git a/lib/rubygems/commands/search_command.rb b/lib/rubygems/commands/search_command.rb
index c7469e1fa8f9e2..50e161ac9bf468 100644
--- a/lib/rubygems/commands/search_command.rb
+++ b/lib/rubygems/commands/search_command.rb
@@ -8,8 +8,8 @@ class Gem::Commands::SearchCommand < Gem::Command
 
   def initialize
     super "search", "Display remote gems whose name matches REGEXP",
-         :domain => :remote, :details => false, :versions => true,
-         :installed => nil, :version => Gem::Requirement.default
+         domain: :remote, details: false, versions: true,
+         installed: nil, version: Gem::Requirement.default
 
     add_query_options
   end
diff --git a/lib/rubygems/commands/setup_command.rb b/lib/rubygems/commands/setup_command.rb
index c35d0f5ccc5b93..85e28cceddf608 100644
--- a/lib/rubygems/commands/setup_command.rb
+++ b/lib/rubygems/commands/setup_command.rb
@@ -7,19 +7,19 @@
 # RubyGems checkout or tarball.
 
 class Gem::Commands::SetupCommand < Gem::Command
-  HISTORY_HEADER = %r{^#\s*[\d.a-zA-Z]+\s*/\s*\d{4}-\d{2}-\d{2}\s*$}.freeze
-  VERSION_MATCHER = %r{^#\s*([\d.a-zA-Z]+)\s*/\s*\d{4}-\d{2}-\d{2}\s*$}.freeze
+  HISTORY_HEADER = %r{^##\s*[\d.a-zA-Z]+\s*/\s*\d{4}-\d{2}-\d{2}\s*$}
+  VERSION_MATCHER = %r{^##\s*([\d.a-zA-Z]+)\s*/\s*\d{4}-\d{2}-\d{2}\s*$}
 
   ENV_PATHS = %w[/usr/bin/env /bin/env].freeze
 
   def initialize
     super "setup", "Install RubyGems",
-          :format_executable => false, :document => %w[ri],
-          :force => true,
-          :site_or_vendor => "sitelibdir",
-          :destdir => "", :prefix => "", :previous_version => "",
-          :regenerate_binstubs => true,
-          :regenerate_plugins => true
+          format_executable: false, document: %w[ri],
+          force: true,
+          site_or_vendor: "sitelibdir",
+          destdir: "", prefix: "", previous_version: "",
+          regenerate_binstubs: true,
+          regenerate_plugins: true
 
     add_option "--previous-version=VERSION",
                "Previous version of RubyGems",
@@ -107,15 +107,6 @@ def initialize
     @verbose = nil
   end
 
-  def check_ruby_version
-    required_version = Gem::Requirement.new ">= 2.6.0"
-
-    unless required_version.satisfied_by? Gem.ruby_version
-      alert_error "Expected Ruby version #{required_version}, is #{Gem.ruby_version}"
-      terminate_interaction 1
-    end
-  end
-
   def defaults_str # :nodoc:
     "--format-executable --document ri --regenerate-binstubs"
   end
@@ -148,8 +139,6 @@ def mkdir_p(path, **opts)
   def execute
     @verbose = Gem.configuration.really_verbose
 
-    check_ruby_version
-
     require "fileutils"
     if Gem.configuration.really_verbose
       extend FileUtils::Verbose
@@ -265,7 +254,7 @@ def install_executables(bin_dir)
             fp.puts bin.join
           end
 
-          install bin_tmp_file, dest_file, :mode => prog_mode
+          install bin_tmp_file, dest_file, mode: prog_mode
           bin_file_names << dest_file
         ensure
           rm bin_tmp_file
@@ -279,15 +268,11 @@ def install_executables(bin_dir)
           File.open bin_cmd_file, "w" do |file|
             file.puts <<-TEXT
   @ECHO OFF
-  IF NOT "%~f0" == "~f0" GOTO :WinNT
-  @"#{File.basename(Gem.ruby).chomp('"')}" "#{dest_file}" %1 %2 %3 %4 %5 %6 %7 %8 %9
-  GOTO :EOF
-  :WinNT
-  @"#{File.basename(Gem.ruby).chomp('"')}" "%~dpn0" %*
+  @"%~dp0#{File.basename(Gem.ruby).chomp('"')}" "%~dpn0" %*
   TEXT
           end
 
-          install bin_cmd_file, "#{dest_file}.bat", :mode => prog_mode
+          install bin_cmd_file, "#{dest_file}.bat", mode: prog_mode
         ensure
           rm bin_cmd_file
         end
@@ -340,6 +325,8 @@ def install_rdoc
 
       require_relative "../rdoc"
 
+      return false unless defined?(Gem::RDoc)
+
       fake_spec = Gem::Specification.new "rubygems", Gem::VERSION
       def fake_spec.full_gem_path
         File.expand_path "../../..", __dir__
@@ -363,24 +350,33 @@ def fake_spec.full_gem_path
   def install_default_bundler_gem(bin_dir)
     current_default_spec = Gem::Specification.default_stubs.find {|s| s.name == "bundler" }
     specs_dir = if current_default_spec && default_dir == Gem.default_dir
+      all_specs_current_version = Gem::Specification.stubs.select {|s| s.full_name == current_default_spec.full_name }
+
       Gem::Specification.remove_spec current_default_spec
       loaded_from = current_default_spec.loaded_from
       File.delete(loaded_from)
+
+      # Remove previous default gem executables if they were not shadowed by a regular gem
+      FileUtils.rm_rf current_default_spec.full_gem_path if all_specs_current_version.size == 1
+
       File.dirname(loaded_from)
     else
       target_specs_dir = File.join(default_dir, "specifications", "default")
-      mkdir_p target_specs_dir, :mode => 0o755
+      mkdir_p target_specs_dir, mode: 0o755
       target_specs_dir
     end
 
-    bundler_spec = Dir.chdir("bundler") { Gem::Specification.load("bundler.gemspec") }
-    default_spec_path = File.join(specs_dir, "#{bundler_spec.full_name}.gemspec")
-    Gem.write_binary(default_spec_path, bundler_spec.to_ruby)
+    new_bundler_spec = Dir.chdir("bundler") { Gem::Specification.load("bundler.gemspec") }
+    full_name = new_bundler_spec.full_name
+    gemspec_path = "#{full_name}.gemspec"
+
+    default_spec_path = File.join(specs_dir, gemspec_path)
+    Gem.write_binary(default_spec_path, new_bundler_spec.to_ruby)
 
     bundler_spec = Gem::Specification.load(default_spec_path)
 
     # Remove gemspec that was same version of vendored bundler.
-    normal_gemspec = File.join(default_dir, "specifications", "bundler-#{bundler_spec.version}.gemspec")
+    normal_gemspec = File.join(default_dir, "specifications", gemspec_path)
     if File.file? normal_gemspec
       File.delete normal_gemspec
     end
@@ -388,20 +384,14 @@ def install_default_bundler_gem(bin_dir)
     # Remove gem files that were same version of vendored bundler.
     if File.directory? bundler_spec.gems_dir
       Dir.entries(bundler_spec.gems_dir).
-        select {|default_gem| File.basename(default_gem) == "bundler-#{bundler_spec.version}" }.
+        select {|default_gem| File.basename(default_gem) == full_name }.
         each {|default_gem| rm_r File.join(bundler_spec.gems_dir, default_gem) }
     end
 
-    bundler_bin_dir = bundler_spec.bin_dir
-    mkdir_p bundler_bin_dir, :mode => 0o755
-    bundler_spec.executables.each do |e|
-      cp File.join("bundler", bundler_spec.bindir, e), File.join(bundler_bin_dir, e)
-    end
-
     require_relative "../installer"
 
     Dir.chdir("bundler") do
-      built_gem = Gem::Package.build(bundler_spec)
+      built_gem = Gem::Package.build(new_bundler_spec)
       begin
         Gem::Installer.at(
           built_gem,
@@ -418,9 +408,9 @@ def install_default_bundler_gem(bin_dir)
       end
     end
 
-    bundler_spec.executables.each {|executable| bin_file_names << target_bin_path(bin_dir, executable) }
+    new_bundler_spec.executables.each {|executable| bin_file_names << target_bin_path(bin_dir, executable) }
 
-    say "Bundler #{bundler_spec.version} installed"
+    say "Bundler #{new_bundler_spec.version} installed"
   end
 
   def make_destination_dirs
@@ -430,8 +420,8 @@ def make_destination_dirs
       lib_dir, bin_dir = generate_default_dirs
     end
 
-    mkdir_p lib_dir, :mode => 0o755
-    mkdir_p bin_dir, :mode => 0o755
+    mkdir_p lib_dir, mode: 0o755
+    mkdir_p bin_dir, mode: 0o755
 
     [lib_dir, bin_dir]
   end
@@ -576,8 +566,8 @@ def show_release_notes
   def uninstall_old_gemcutter
     require_relative "../uninstaller"
 
-    ui = Gem::Uninstaller.new("gemcutter", :all => true, :ignore => true,
-                                           :version => "< 0.4")
+    ui = Gem::Uninstaller.new("gemcutter", all: true, ignore: true,
+                                           version: "< 0.4")
     ui.uninstall
   rescue Gem::InstallError
   end
@@ -588,6 +578,8 @@ def regenerate_binstubs(bindir)
 
     args = %w[--all --only-executables --silent]
     args << "--bindir=#{bindir}"
+    args << "--install-dir=#{default_dir}"
+
     if options[:env_shebang]
       args << "--env-shebang"
     end
@@ -639,10 +631,10 @@ def install_file(file, dest_dir)
     dest_file = File.join dest_dir, file
     dest_dir = File.dirname dest_file
     unless File.directory? dest_dir
-      mkdir_p dest_dir, :mode => 0o755
+      mkdir_p dest_dir, mode: 0o755
     end
 
-    install file, dest_file, :mode => options[:data_mode] || 0o644
+    install file, dest_file, mode: options[:data_mode] || 0o644
   end
 
   def remove_file_list(files, dir)
diff --git a/lib/rubygems/commands/sources_command.rb b/lib/rubygems/commands/sources_command.rb
index c9c6ee80ed50a4..976f4a4ea2ae92 100644
--- a/lib/rubygems/commands/sources_command.rb
+++ b/lib/rubygems/commands/sources_command.rb
@@ -59,7 +59,7 @@ def add_source(source_uri) # :nodoc:
 
         say "#{source_uri} added to sources"
       end
-    rescue URI::Error, ArgumentError
+    rescue Gem::URI::Error, ArgumentError
       say "#{source_uri} is not a URI"
       terminate_interaction 1
     rescue Gem::RemoteFetcher::FetchError => e
@@ -81,7 +81,7 @@ def check_typo_squatting(source)
   end
 
   def check_rubygems_https(source_uri) # :nodoc:
-    uri = URI source_uri
+    uri = Gem::URI source_uri
 
     if uri.scheme && uri.scheme.casecmp("http").zero? &&
        uri.host.casecmp("rubygems.org").zero?
diff --git a/lib/rubygems/commands/specification_command.rb b/lib/rubygems/commands/specification_command.rb
index 938b9507f985c0..a21ed35be316a4 100644
--- a/lib/rubygems/commands/specification_command.rb
+++ b/lib/rubygems/commands/specification_command.rb
@@ -13,8 +13,8 @@ def initialize
     Gem.load_yaml
 
     super "specification", "Display gem specification (in yaml)",
-          :domain => :local, :version => Gem::Requirement.default,
-          :format => :yaml
+          domain: :local, version: Gem::Requirement.default,
+          format: :yaml
 
     add_version_option("examine")
     add_platform_option
diff --git a/lib/rubygems/commands/uninstall_command.rb b/lib/rubygems/commands/uninstall_command.rb
index c66bbe42e12a1c..3d6e41e49e1413 100644
--- a/lib/rubygems/commands/uninstall_command.rb
+++ b/lib/rubygems/commands/uninstall_command.rb
@@ -15,8 +15,8 @@ class Gem::Commands::UninstallCommand < Gem::Command
 
   def initialize
     super "uninstall", "Uninstall gems from the local repository",
-          :version => Gem::Requirement.default, :user_install => true,
-          :check_dev => false, :vendor => false
+          version: Gem::Requirement.default, user_install: true,
+          check_dev: false, vendor: false
 
     add_option("-a", "--[no-]all",
       "Uninstall all matching versions") do |value, options|
@@ -157,9 +157,14 @@ def uninstall_specific
 
       gem_specs = Gem::Specification.find_all_by_name(name, original_gem_version[name])
 
-      say("Gem '#{name}' is not installed") if gem_specs.empty?
-      gem_specs.each do |spec|
-        deplist.add spec
+      if gem_specs.empty?
+        say("Gem '#{name}' is not installed")
+      else
+        gem_specs.reject!(&:default_gem?) if gem_specs.size > 1
+
+        gem_specs.each do |spec|
+          deplist.add spec
+        end
       end
     end
 
@@ -168,10 +173,10 @@ def uninstall_specific
     gems_to_uninstall = {}
 
     deps.each do |dep|
-      next if gems_to_uninstall[dep.name]
-      gems_to_uninstall[dep.name] = true
-
-      unless original_gem_version[dep.name] == Gem::Requirement.default
+      if original_gem_version[dep.name] == Gem::Requirement.default
+        next if gems_to_uninstall[dep.name]
+        gems_to_uninstall[dep.name] = true
+      else
         options[:version] = dep.version
       end
 
@@ -184,7 +189,7 @@ def uninstall_gem(gem_name)
   rescue Gem::GemNotInHomeException => e
     spec = e.spec
     alert("In order to remove #{spec.name}, please execute:\n" \
-          "\tgem uninstall #{spec.name} --install-dir=#{spec.installation_path}")
+          "\tgem uninstall #{spec.name} --install-dir=#{spec.base_dir}")
   rescue Gem::UninstallError => e
     spec = e.spec
     alert_error("Error: unable to successfully uninstall '#{spec.name}' which is " \
diff --git a/lib/rubygems/commands/unpack_command.rb b/lib/rubygems/commands/unpack_command.rb
index 73eefe153c97fd..c2fc72029775d8 100644
--- a/lib/rubygems/commands/unpack_command.rb
+++ b/lib/rubygems/commands/unpack_command.rb
@@ -21,8 +21,8 @@ def initialize
     require "fileutils"
 
     super "unpack", "Unpack an installed gem to the current directory",
-          :version => Gem::Requirement.default,
-          :target => Dir.pwd
+          version: Gem::Requirement.default,
+          target: Dir.pwd
 
     add_option("--target=DIR",
                "target directory for unpacking") do |value, options|
@@ -143,12 +143,6 @@ def find_in_cache(filename)
   #   get_path 'rake', '< 0.1' # nil
   #   get_path 'rak'           # nil (exact name required)
   #--
-  # TODO: This should be refactored so that it's a general service. I don't
-  # think any of our existing classes are the right place though.  Just maybe
-  # 'Cache'?
-  #
-  # TODO: It just uses Gem.dir for now.  What's an easy way to get the list of
-  # source directories?
 
   def get_path(dependency)
     return dependency.name if /\.gem$/i.match?(dependency.name)
diff --git a/lib/rubygems/commands/update_command.rb b/lib/rubygems/commands/update_command.rb
index fb27e755bcb128..d9740d814a2e70 100644
--- a/lib/rubygems/commands/update_command.rb
+++ b/lib/rubygems/commands/update_command.rb
@@ -21,7 +21,7 @@ class Gem::Commands::UpdateCommand < Gem::Command
 
   def initialize
     options = {
-      :force => false,
+      force: false,
     }
 
     options.merge!(install_update_options)
@@ -197,18 +197,17 @@ def preparing_gem_layout_for(version)
       yield
     else
       require "tmpdir"
-      tmpdir = Dir.mktmpdir
-      FileUtils.mv Gem.plugindir, tmpdir
+      Dir.mktmpdir("gem_update") do |tmpdir|
+        FileUtils.mv Gem.plugindir, tmpdir
 
-      status = yield
+        status = yield
 
-      if status
-        FileUtils.rm_rf tmpdir
-      else
-        FileUtils.mv File.join(tmpdir, "plugins"), Gem.plugindir
-      end
+        unless status
+          FileUtils.mv File.join(tmpdir, "plugins"), Gem.plugindir
+        end
 
-      status
+        status
+      end
     end
   end
 
@@ -244,7 +243,7 @@ def update_gem(name, version = Gem::Requirement.default)
 
     @installer = Gem::DependencyInstaller.new update_options
 
-    say "Updating #{name}" unless options[:system] && options[:silent]
+    say "Updating #{name}" unless options[:system]
     begin
       @installer.install name, Gem::Requirement.new(version)
     rescue Gem::InstallError, Gem::DependencyError => e
@@ -282,7 +281,7 @@ def update_rubygems
     check_oldest_rubygems version
 
     installed_gems = Gem::Specification.find_all_by_name "rubygems-update", requirement
-    installed_gems = update_gem("rubygems-update", version) if installed_gems.empty? || installed_gems.first.version != version
+    installed_gems = update_gem("rubygems-update", requirement) if installed_gems.empty? || installed_gems.first.version != version
     return if installed_gems.empty?
 
     install_rubygems installed_gems.first
@@ -294,9 +293,7 @@ def update_rubygems_arguments # :nodoc:
     args << "--prefix" << Gem.prefix if Gem.prefix
     args << "--no-document" unless options[:document].include?("rdoc") || options[:document].include?("ri")
     args << "--no-format-executable" if options[:no_format_executable]
-    args << "--previous-version" << Gem::VERSION if
-      options[:system] == true ||
-      Gem::Version.new(options[:system]) >= Gem::Version.new(2)
+    args << "--previous-version" << Gem::VERSION
     args
   end
 
@@ -320,20 +317,10 @@ def which_to_update(highest_installed_gems, gem_names)
 
   #
   # Oldest version we support downgrading to. This is the version that
-  # originally ships with the first patch version of each ruby, because we never
-  # test each ruby against older rubygems, so we can't really guarantee it
-  # works. Version list can be checked here: https://stdgems.org/rubygems
+  # originally ships with the oldest supported patch version of ruby.
   #
   def oldest_supported_version
     @oldest_supported_version ||=
-      if Gem.ruby_version > Gem::Version.new("3.1.a")
-        Gem::Version.new("3.3.3")
-      elsif Gem.ruby_version > Gem::Version.new("3.0.a")
-        Gem::Version.new("3.2.3")
-      elsif Gem.ruby_version > Gem::Version.new("2.7.a")
-        Gem::Version.new("3.1.2")
-      else
-        Gem::Version.new("3.0.1")
-      end
+      Gem::Version.new("3.3.3")
   end
 end
diff --git a/lib/rubygems/commands/which_command.rb b/lib/rubygems/commands/which_command.rb
index ec464d9672f27f..5ed4d9d1429aff 100644
--- a/lib/rubygems/commands/which_command.rb
+++ b/lib/rubygems/commands/which_command.rb
@@ -5,7 +5,7 @@
 class Gem::Commands::WhichCommand < Gem::Command
   def initialize
     super "which", "Find the location of a library file you can require",
-          :search_gems_first => false, :show_all => false
+          search_gems_first: false, show_all: false
 
     add_option "-a", "--[no-]all", "show all matching files" do |show_all, options|
       options[:show_all] = show_all
diff --git a/lib/rubygems/config_file.rb b/lib/rubygems/config_file.rb
index d90ec9f92c4ce2..a2bcb6dfbc249b 100644
--- a/lib/rubygems/config_file.rb
+++ b/lib/rubygems/config_file.rb
@@ -47,6 +47,8 @@ class Gem::ConfigFile
   DEFAULT_CONCURRENT_DOWNLOADS = 8
   DEFAULT_CERT_EXPIRATION_LENGTH_DAYS = 365
   DEFAULT_IPV4_FALLBACK_ENABLED = false
+  # TODO: Use false as default value for this option in RubyGems 4.0
+  DEFAULT_INSTALL_EXTENSION_IN_LIB = true
 
   ##
   # For Ruby packagers to set configuration defaults.  Set in
@@ -142,6 +144,11 @@ class Gem::ConfigFile
 
   attr_accessor :cert_expiration_length_days
 
+  ##
+  # Install extensions into lib as well as into the extension directory.
+
+  attr_accessor :install_extension_in_lib
+
   ##
   # == Experimental ==
   # Fallback to IPv4 when IPv6 is not reachable or slow (default: false)
@@ -183,12 +190,13 @@ def initialize(args)
     @update_sources = DEFAULT_UPDATE_SOURCES
     @concurrent_downloads = DEFAULT_CONCURRENT_DOWNLOADS
     @cert_expiration_length_days = DEFAULT_CERT_EXPIRATION_LENGTH_DAYS
+    @install_extension_in_lib = DEFAULT_INSTALL_EXTENSION_IN_LIB
     @ipv4_fallback_enabled = ENV["IPV4_FALLBACK_ENABLED"] == "true" || DEFAULT_IPV4_FALLBACK_ENABLED
 
     operating_system_config = Marshal.load Marshal.dump(OPERATING_SYSTEM_DEFAULTS)
     platform_config = Marshal.load Marshal.dump(PLATFORM_DEFAULTS)
     system_config = load_file SYSTEM_WIDE_CONFIG_FILE
-    user_config = load_file config_file_name.dup.tap(&Gem::UNTAINT)
+    user_config = load_file config_file_name
 
     environment_config = (ENV["GEMRC"] || "").
       split(File::PATH_SEPARATOR).inject({}) do |result, file|
@@ -202,21 +210,34 @@ def initialize(args)
       @hash = @hash.merge environment_config
     end
 
+    @hash.transform_keys! do |k|
+      # gemhome and gempath are not working with symbol keys
+      if %w[backtrace bulk_threshold verbose update_sources cert_expiration_length_days
+            install_extension_in_lib ipv4_fallback_enabled sources disable_default_gem_server
+            ssl_verify_mode ssl_ca_cert ssl_client_cert].include?(k)
+        k.to_sym
+      else
+        k
+      end
+    end
+
     # HACK: these override command-line args, which is bad
     @backtrace                   = @hash[:backtrace]                   if @hash.key? :backtrace
     @bulk_threshold              = @hash[:bulk_threshold]              if @hash.key? :bulk_threshold
-    @home                        = @hash[:gemhome]                     if @hash.key? :gemhome
-    @path                        = @hash[:gempath]                     if @hash.key? :gempath
-    @update_sources              = @hash[:update_sources]              if @hash.key? :update_sources
     @verbose                     = @hash[:verbose]                     if @hash.key? :verbose
-    @disable_default_gem_server  = @hash[:disable_default_gem_server]  if @hash.key? :disable_default_gem_server
-    @sources                     = @hash[:sources]                     if @hash.key? :sources
+    @update_sources              = @hash[:update_sources]              if @hash.key? :update_sources
+    # TODO: We should handle concurrent_downloads same as other options
     @cert_expiration_length_days = @hash[:cert_expiration_length_days] if @hash.key? :cert_expiration_length_days
+    @install_extension_in_lib    = @hash[:install_extension_in_lib]    if @hash.key? :install_extension_in_lib
     @ipv4_fallback_enabled       = @hash[:ipv4_fallback_enabled]       if @hash.key? :ipv4_fallback_enabled
 
-    @ssl_verify_mode  = @hash[:ssl_verify_mode]  if @hash.key? :ssl_verify_mode
-    @ssl_ca_cert      = @hash[:ssl_ca_cert]      if @hash.key? :ssl_ca_cert
-    @ssl_client_cert  = @hash[:ssl_client_cert]  if @hash.key? :ssl_client_cert
+    @home                        = @hash[:gemhome]                     if @hash.key? :gemhome
+    @path                        = @hash[:gempath]                     if @hash.key? :gempath
+    @sources                     = @hash[:sources]                     if @hash.key? :sources
+    @disable_default_gem_server  = @hash[:disable_default_gem_server]  if @hash.key? :disable_default_gem_server
+    @ssl_verify_mode             = @hash[:ssl_verify_mode]             if @hash.key? :ssl_verify_mode
+    @ssl_ca_cert                 = @hash[:ssl_ca_cert]                 if @hash.key? :ssl_ca_cert
+    @ssl_client_cert             = @hash[:ssl_client_cert]             if @hash.key? :ssl_client_cert
 
     @api_keys         = nil
     @rubygems_api_key = nil
@@ -464,6 +485,9 @@ def to_yaml # :nodoc:
     yaml_hash[:concurrent_downloads] =
       @hash.fetch(:concurrent_downloads, DEFAULT_CONCURRENT_DOWNLOADS)
 
+    yaml_hash[:install_extension_in_lib] =
+      @hash.fetch(:install_extension_in_lib, DEFAULT_INSTALL_EXTENSION_IN_LIB)
+
     yaml_hash[:ssl_verify_mode] =
       @hash[:ssl_verify_mode] if @hash.key? :ssl_verify_mode
 
@@ -498,12 +522,12 @@ def write
 
   # Return the configuration information for +key+.
   def [](key)
-    @hash[key.to_s]
+    @hash[key] || @hash[key.to_s]
   end
 
   # Set configuration option +key+ to +value+.
   def []=(key, value)
-    @hash[key.to_s] = value
+    @hash[key] = value
   end
 
   def ==(other) # :nodoc:
@@ -531,8 +555,13 @@ def self.load_with_rubygems_config_hash(yaml)
     require_relative "yaml_serializer"
 
     content = Gem::YAMLSerializer.load(yaml)
+    deep_transform_config_keys!(content)
+  end
 
-    content.transform_keys! do |k|
+  private
+
+  def self.deep_transform_config_keys!(config)
+    config.transform_keys! do |k|
       if k.match?(/\A:(.*)\Z/)
         k[1..-1].to_sym
       elsif k.include?("__") || k.match?(%r{/\Z})
@@ -546,7 +575,7 @@ def self.load_with_rubygems_config_hash(yaml)
       end
     end
 
-    content.transform_values! do |v|
+    config.transform_values! do |v|
       if v.is_a?(String)
         if v.match?(/\A:(.*)\Z/)
           v[1..-1].to_sym
@@ -559,18 +588,18 @@ def self.load_with_rubygems_config_hash(yaml)
         else
           v
         end
-      elsif v.is_a?(Hash) && v.empty?
+      elsif v.empty?
         nil
+      elsif v.is_a?(Hash)
+        deep_transform_config_keys!(v)
       else
         v
       end
     end
 
-    content
+    config
   end
 
-  private
-
   def set_config_file_name(args)
     @config_file_name = ENV["GEMRC"]
     need_config_file_name = false
diff --git a/lib/rubygems/core_ext/kernel_require.rb b/lib/rubygems/core_ext/kernel_require.rb
index ddb44276eb63c9..3a9bdbdc9d72c1 100644
--- a/lib/rubygems/core_ext/kernel_require.rb
+++ b/lib/rubygems/core_ext/kernel_require.rb
@@ -39,27 +39,38 @@ def require(path) # :doc:
     RUBYGEMS_ACTIVATION_MONITOR.synchronize do
       path = File.path(path)
 
-      if spec = Gem.find_unresolved_default_spec(path)
+      # If +path+ belongs to a default gem, we activate it and then go straight
+      # to normal require
+
+      if spec = Gem.find_default_spec(path)
+        name = spec.name
+
+        next if Gem.loaded_specs[name]
+
         # Ensure -I beats a default gem
         resolved_path = begin
           rp = nil
           load_path_check_index = Gem.load_path_insert_index - Gem.activated_gem_paths
           Gem.suffixes.find do |s|
             $LOAD_PATH[0...load_path_check_index].find do |lp|
-              safe_lp = lp.dup.tap(&Gem::UNTAINT)
-              if File.symlink? safe_lp # for backward compatibility
+              if File.symlink? lp # for backward compatibility
                 next
               end
 
-              full_path = File.expand_path(File.join(safe_lp, "#{path}#{s}"))
+              full_path = File.expand_path(File.join(lp, "#{path}#{s}"))
               rp = full_path if File.file?(full_path)
             end
           end
           rp
         end
 
-        Kernel.send(:gem, spec.name, Gem::Requirement.default_prerelease) unless
-          resolved_path
+        next if resolved_path
+
+        Kernel.send(:gem, name, Gem::Requirement.default_prerelease)
+
+        Gem.load_bundler_extensions(Gem.loaded_specs[name].version) if name == "bundler"
+
+        next
       end
 
       # If there are no unresolved deps, then we can use just try
diff --git a/lib/rubygems/core_ext/kernel_warn.rb b/lib/rubygems/core_ext/kernel_warn.rb
index 9dc9f2218cf900..f806b77faba3de 100644
--- a/lib/rubygems/core_ext/kernel_warn.rb
+++ b/lib/rubygems/core_ext/kernel_warn.rb
@@ -13,11 +13,7 @@ class << self
 
   module_function define_method(:warn) {|*messages, **kw|
     unless uplevel = kw[:uplevel]
-      if Gem.java_platform? && RUBY_VERSION < "3.1"
-        return original_warn.bind(self).call(*messages)
-      else
-        return original_warn.bind(self).call(*messages, **kw)
-      end
+      return original_warn.bind_call(self, *messages, **kw)
     end
 
     # Ensure `uplevel` fits a `long`
@@ -44,6 +40,6 @@ class << self
       kw[:uplevel] = start
     end
 
-    original_warn.bind(self).call(*messages, **kw)
+    original_warn.bind_call(self, *messages, **kw)
   }
 end
diff --git a/lib/rubygems/defaults.rb b/lib/rubygems/defaults.rb
index 7888e8cee5fe27..db07681a17e218 100644
--- a/lib/rubygems/defaults.rb
+++ b/lib/rubygems/defaults.rb
@@ -24,7 +24,7 @@ def self.default_spec_cache_dir
     default_spec_cache_dir = File.join Gem.user_home, ".gem", "specs"
 
     unless File.exist?(default_spec_cache_dir)
-      default_spec_cache_dir = File.join Gem.data_home, "gem", "specs"
+      default_spec_cache_dir = File.join Gem.cache_home, "gem", "specs"
     end
 
     default_spec_cache_dir
@@ -94,7 +94,7 @@ def self.find_home
   # The home directory for the user.
 
   def self.user_home
-    @user_home ||= find_home.tap(&Gem::UNTAINT)
+    @user_home ||= find_home
   end
 
   ##
@@ -112,7 +112,7 @@ def self.user_dir
   # The path to standard location of the user's configuration directory.
 
   def self.config_home
-    @config_home ||= (ENV["XDG_CONFIG_HOME"] || File.join(Gem.user_home, ".config"))
+    @config_home ||= ENV["XDG_CONFIG_HOME"] || File.join(Gem.user_home, ".config")
   end
 
   ##
@@ -131,35 +131,35 @@ def self.find_config_file
   # The path to standard location of the user's .gemrc file.
 
   def self.config_file
-    @config_file ||= find_config_file.tap(&Gem::UNTAINT)
+    @config_file ||= find_config_file
   end
 
   ##
   # The path to standard location of the user's state file.
 
   def self.state_file
-    @state_file ||= File.join(Gem.state_home, "gem", "last_update_check").tap(&Gem::UNTAINT)
+    @state_file ||= File.join(Gem.state_home, "gem", "last_update_check")
   end
 
   ##
   # The path to standard location of the user's cache directory.
 
   def self.cache_home
-    @cache_home ||= (ENV["XDG_CACHE_HOME"] || File.join(Gem.user_home, ".cache"))
+    @cache_home ||= ENV["XDG_CACHE_HOME"] || File.join(Gem.user_home, ".cache")
   end
 
   ##
   # The path to standard location of the user's data directory.
 
   def self.data_home
-    @data_home ||= (ENV["XDG_DATA_HOME"] || File.join(Gem.user_home, ".local", "share"))
+    @data_home ||= ENV["XDG_DATA_HOME"] || File.join(Gem.user_home, ".local", "share")
   end
 
   ##
   # The path to standard location of the user's state directory.
 
   def self.state_home
-    @state_home ||= (ENV["XDG_STATE_HOME"] || File.join(Gem.user_home, ".local", "state"))
+    @state_home ||= ENV["XDG_STATE_HOME"] || File.join(Gem.user_home, ".local", "state")
   end
 
   ##
@@ -235,11 +235,23 @@ def self.default_cert_path
     default_cert_path
   end
 
+  ##
+  # Enables automatic installation into user directory
+
+  def self.default_user_install # :nodoc:
+    if !ENV.key?("GEM_HOME") && File.exist?(Gem.dir) && !File.writable?(Gem.dir)
+      Gem.ui.say "Defaulting to user installation because default installation directory (#{Gem.dir}) is not writable."
+      return true
+    end
+
+    false
+  end
+
   ##
   # Install extensions into lib as well as into the extension directory.
 
   def self.install_extension_in_lib # :nodoc:
-    true
+    Gem.configuration.install_extension_in_lib
   end
 
   ##
diff --git a/lib/rubygems/dependency.rb b/lib/rubygems/dependency.rb
index 00eff2dfe7cfaf..d1ec9222af1a89 100644
--- a/lib/rubygems/dependency.rb
+++ b/lib/rubygems/dependency.rb
@@ -271,15 +271,7 @@ def merge(other)
   end
 
   def matching_specs(platform_only = false)
-    env_req = Gem.env_requirement(name)
-    matches = Gem::Specification.stubs_for(name).find_all do |spec|
-      requirement.satisfied_by?(spec.version) && env_req.satisfied_by?(spec.version)
-    end.map(&:to_spec)
-
-    if prioritizes_bundler?
-      require_relative "bundler_version_finder"
-      Gem::BundlerVersionFinder.prioritize!(matches)
-    end
+    matches = Gem::Specification.find_all_by_name(name, requirement)
 
     if platform_only
       matches.reject! do |spec|
@@ -287,7 +279,7 @@ def matching_specs(platform_only = false)
       end
     end
 
-    matches
+    matches.reject(&:ignored?)
   end
 
   ##
@@ -297,10 +289,6 @@ def specific?
     @requirement.specific?
   end
 
-  def prioritizes_bundler?
-    name == "bundler" && !specific?
-  end
-
   def to_specs
     matches = matching_specs true
 
@@ -328,9 +316,9 @@ def to_spec
     return active if active
 
     unless prerelease?
-      # Move prereleases to the end of the list for >= 0 requirements
+      # Consider prereleases only as a fallback
       pre, matches = matches.partition {|spec| spec.version.prerelease? }
-      matches += pre if requirement == Gem::Requirement.default
+      matches = pre if matches.empty?
     end
 
     matches.first
@@ -349,4 +337,12 @@ def identity
       :released
     end
   end
+
+  def encode_with(coder) # :nodoc:
+    coder.add "name", @name
+    coder.add "requirement", @requirement
+    coder.add "type", @type
+    coder.add "prerelease", @prerelease
+    coder.add "version_requirements", @version_requirements
+  end
 end
diff --git a/lib/rubygems/dependency_installer.rb b/lib/rubygems/dependency_installer.rb
index 56a9309a7e2b14..b119dca1cf2912 100644
--- a/lib/rubygems/dependency_installer.rb
+++ b/lib/rubygems/dependency_installer.rb
@@ -17,18 +17,18 @@ class Gem::DependencyInstaller
   extend Gem::Deprecate
 
   DEFAULT_OPTIONS = { # :nodoc:
-    :env_shebang => false,
-    :document => %w[ri],
-    :domain => :both, # HACK: dup
-    :force => false,
-    :format_executable => false, # HACK: dup
-    :ignore_dependencies => false,
-    :prerelease => false,
-    :security_policy => nil, # HACK: NoSecurity requires OpenSSL. AlmostNo? Low?
-    :wrappers => true,
-    :build_args => nil,
-    :build_docs_in_background => false,
-    :install_as_default => false,
+    env_shebang: false,
+    document: %w[ri],
+    domain: :both, # HACK: dup
+    force: false,
+    format_executable: false, # HACK: dup
+    ignore_dependencies: false,
+    prerelease: false,
+    security_policy: nil, # HACK: NoSecurity requires OpenSSL. AlmostNo? Low?
+    wrappers: true,
+    build_args: nil,
+    build_docs_in_background: false,
+    install_as_default: false,
   }.freeze
 
   ##
@@ -228,22 +228,22 @@ def install(dep_or_name, version = Gem::Requirement.default)
     @installed_gems = []
 
     options = {
-      :bin_dir => @bin_dir,
-      :build_args => @build_args,
-      :document => @document,
-      :env_shebang => @env_shebang,
-      :force => @force,
-      :format_executable => @format_executable,
-      :ignore_dependencies => @ignore_dependencies,
-      :prerelease => @prerelease,
-      :security_policy => @security_policy,
-      :user_install => @user_install,
-      :wrappers => @wrappers,
-      :build_root => @build_root,
-      :install_as_default => @install_as_default,
-      :dir_mode => @dir_mode,
-      :data_mode => @data_mode,
-      :prog_mode => @prog_mode,
+      bin_dir: @bin_dir,
+      build_args: @build_args,
+      document: @document,
+      env_shebang: @env_shebang,
+      force: @force,
+      format_executable: @format_executable,
+      ignore_dependencies: @ignore_dependencies,
+      prerelease: @prerelease,
+      security_policy: @security_policy,
+      user_install: @user_install,
+      wrappers: @wrappers,
+      build_root: @build_root,
+      install_as_default: @install_as_default,
+      dir_mode: @dir_mode,
+      data_mode: @data_mode,
+      prog_mode: @prog_mode,
     }
     options[:install_dir] = @install_dir if @only_install_dir
 
diff --git a/lib/rubygems/dependency_list.rb b/lib/rubygems/dependency_list.rb
index 30098ff0b574c0..ad5e59e8c173f1 100644
--- a/lib/rubygems/dependency_list.rb
+++ b/lib/rubygems/dependency_list.rb
@@ -6,7 +6,7 @@
 # See LICENSE.txt for permissions.
 #++
 
-require_relative "tsort"
+require_relative "vendored_tsort"
 require_relative "deprecate"
 
 ##
diff --git a/lib/rubygems/deprecate.rb b/lib/rubygems/deprecate.rb
index 58a6c5b7dcda3e..7d24f9cbfc02c3 100644
--- a/lib/rubygems/deprecate.rb
+++ b/lib/rubygems/deprecate.rb
@@ -69,99 +69,101 @@
 #       end
 #     end
 
-module Gem::Deprecate
-  def self.skip # :nodoc:
-    @skip ||= false
-  end
+module Gem
+  module Deprecate
+    def self.skip # :nodoc:
+      @skip ||= false
+    end
 
-  def self.skip=(v) # :nodoc:
-    @skip = v
-  end
+    def self.skip=(v) # :nodoc:
+      @skip = v
+    end
 
-  ##
-  # Temporarily turn off warnings. Intended for tests only.
+    ##
+    # Temporarily turn off warnings. Intended for tests only.
 
-  def skip_during
-    original = Gem::Deprecate.skip
-    Gem::Deprecate.skip = true
-    yield
-  ensure
-    Gem::Deprecate.skip = original
-  end
+    def skip_during
+      original = Gem::Deprecate.skip
+      Gem::Deprecate.skip = true
+      yield
+    ensure
+      Gem::Deprecate.skip = original
+    end
 
-  def self.next_rubygems_major_version # :nodoc:
-    Gem::Version.new(Gem.rubygems_version.segments.first).bump
-  end
+    def self.next_rubygems_major_version # :nodoc:
+      Gem::Version.new(Gem.rubygems_version.segments.first).bump
+    end
 
-  ##
-  # Simple deprecation method that deprecates +name+ by wrapping it up
-  # in a dummy method. It warns on each call to the dummy method
-  # telling the user of +repl+ (unless +repl+ is :none) and the
-  # year/month that it is planned to go away.
+    ##
+    # Simple deprecation method that deprecates +name+ by wrapping it up
+    # in a dummy method. It warns on each call to the dummy method
+    # telling the user of +repl+ (unless +repl+ is :none) and the
+    # year/month that it is planned to go away.
 
-  def deprecate(name, repl, year, month)
-    class_eval do
-      old = "_deprecated_#{name}"
-      alias_method old, name
-      define_method name do |*args, &block|
-        klass = is_a? Module
-        target = klass ? "#{self}." : "#{self.class}#"
-        msg = [
-          "NOTE: #{target}#{name} is deprecated",
-          repl == :none ? " with no replacement" : "; use #{repl} instead",
-          format(". It will be removed on or after %4d-%02d.", year, month),
-          "\n#{target}#{name} called from #{Gem.location_of_caller.join(":")}",
-        ]
-        warn "#{msg.join}." unless Gem::Deprecate.skip
-        send old, *args, &block
+    def deprecate(name, repl, year, month)
+      class_eval do
+        old = "_deprecated_#{name}"
+        alias_method old, name
+        define_method name do |*args, &block|
+          klass = is_a? Module
+          target = klass ? "#{self}." : "#{self.class}#"
+          msg = [
+            "NOTE: #{target}#{name} is deprecated",
+            repl == :none ? " with no replacement" : "; use #{repl} instead",
+            format(". It will be removed on or after %4d-%02d.", year, month),
+            "\n#{target}#{name} called from #{Gem.location_of_caller.join(":")}",
+          ]
+          warn "#{msg.join}." unless Gem::Deprecate.skip
+          send old, *args, &block
+        end
+        ruby2_keywords name if respond_to?(:ruby2_keywords, true)
       end
-      ruby2_keywords name if respond_to?(:ruby2_keywords, true)
     end
-  end
 
-  ##
-  # Simple deprecation method that deprecates +name+ by wrapping it up
-  # in a dummy method. It warns on each call to the dummy method
-  # telling the user of +repl+ (unless +repl+ is :none) and the
-  # Rubygems version that it is planned to go away.
+    ##
+    # Simple deprecation method that deprecates +name+ by wrapping it up
+    # in a dummy method. It warns on each call to the dummy method
+    # telling the user of +repl+ (unless +repl+ is :none) and the
+    # Rubygems version that it is planned to go away.
 
-  def rubygems_deprecate(name, replacement=:none)
-    class_eval do
-      old = "_deprecated_#{name}"
-      alias_method old, name
-      define_method name do |*args, &block|
-        klass = is_a? Module
-        target = klass ? "#{self}." : "#{self.class}#"
-        msg = [
-          "NOTE: #{target}#{name} is deprecated",
-          replacement == :none ? " with no replacement" : "; use #{replacement} instead",
-          ". It will be removed in Rubygems #{Gem::Deprecate.next_rubygems_major_version}",
-          "\n#{target}#{name} called from #{Gem.location_of_caller.join(":")}",
-        ]
-        warn "#{msg.join}." unless Gem::Deprecate.skip
-        send old, *args, &block
+    def rubygems_deprecate(name, replacement=:none)
+      class_eval do
+        old = "_deprecated_#{name}"
+        alias_method old, name
+        define_method name do |*args, &block|
+          klass = is_a? Module
+          target = klass ? "#{self}." : "#{self.class}#"
+          msg = [
+            "NOTE: #{target}#{name} is deprecated",
+            replacement == :none ? " with no replacement" : "; use #{replacement} instead",
+            ". It will be removed in Rubygems #{Gem::Deprecate.next_rubygems_major_version}",
+            "\n#{target}#{name} called from #{Gem.location_of_caller.join(":")}",
+          ]
+          warn "#{msg.join}." unless Gem::Deprecate.skip
+          send old, *args, &block
+        end
+        ruby2_keywords name if respond_to?(:ruby2_keywords, true)
       end
-      ruby2_keywords name if respond_to?(:ruby2_keywords, true)
     end
-  end
 
-  # Deprecation method to deprecate Rubygems commands
-  def rubygems_deprecate_command(version = Gem::Deprecate.next_rubygems_major_version)
-    class_eval do
-      define_method "deprecated?" do
-        true
-      end
+    # Deprecation method to deprecate Rubygems commands
+    def rubygems_deprecate_command(version = Gem::Deprecate.next_rubygems_major_version)
+      class_eval do
+        define_method "deprecated?" do
+          true
+        end
 
-      define_method "deprecation_warning" do
-        msg = [
-          "#{command} command is deprecated",
-          ". It will be removed in Rubygems #{version}.\n",
-        ]
+        define_method "deprecation_warning" do
+          msg = [
+            "#{command} command is deprecated",
+            ". It will be removed in Rubygems #{version}.\n",
+          ]
 
-        alert_warning msg.join.to_s unless Gem::Deprecate.skip
+          alert_warning msg.join.to_s unless Gem::Deprecate.skip
+        end
       end
     end
-  end
 
-  module_function :rubygems_deprecate, :rubygems_deprecate_command, :skip_during
+    module_function :rubygems_deprecate, :rubygems_deprecate_command, :skip_during
+  end
 end
diff --git a/lib/rubygems/errors.rb b/lib/rubygems/errors.rb
index be6c34dc8520b3..57fb3eb12008a1 100644
--- a/lib/rubygems/errors.rb
+++ b/lib/rubygems/errors.rb
@@ -30,6 +30,7 @@ def initialize(name, requirement, extra_message=nil)
       @name        = name
       @requirement = requirement
       @extra_message = extra_message
+      super(message)
     end
 
     def message # :nodoc:
@@ -53,8 +54,8 @@ class MissingSpecVersionError < MissingSpecError
     attr_reader :specs
 
     def initialize(name, requirement, specs)
-      super(name, requirement)
       @specs = specs
+      super(name, requirement)
     end
 
     private
diff --git a/lib/rubygems/exceptions.rb b/lib/rubygems/exceptions.rb
index 65caaab8b1f3c0..793324b875c754 100644
--- a/lib/rubygems/exceptions.rb
+++ b/lib/rubygems/exceptions.rb
@@ -104,9 +104,6 @@ class Gem::FormatException < Gem::Exception
 
 class Gem::GemNotFoundException < Gem::Exception; end
 
-##
-# Raised by the DependencyInstaller when a specific gem cannot be found
-
 class Gem::SpecificGemNotFoundException < Gem::GemNotFoundException
   ##
   # Creates a new SpecificGemNotFoundException for a gem with the given +name+
@@ -137,6 +134,8 @@ def initialize(name, version, errors=nil)
   attr_reader :errors
 end
 
+Gem.deprecate_constant :SpecificGemNotFoundException
+
 ##
 # Raised by Gem::Resolver when dependencies conflict and create the
 # inability to find a valid possible spec for a request.
@@ -292,9 +291,3 @@ def version
     @dependency.requirement
   end
 end
-
-##
-# Backwards compatible typo'd exception class for early RubyGems 2.0.x
-
-Gem::UnsatisfiableDepedencyError = Gem::UnsatisfiableDependencyError # :nodoc:
-Gem.deprecate_constant :UnsatisfiableDepedencyError
diff --git a/lib/rubygems/ext/builder.rb b/lib/rubygems/ext/builder.rb
index 242dd0125af2c7..05cd735bd90d4f 100644
--- a/lib/rubygems/ext/builder.rb
+++ b/lib/rubygems/ext/builder.rb
@@ -7,7 +7,6 @@
 #++
 
 require_relative "../user_interaction"
-require_relative "../shellwords"
 
 class Gem::Ext::Builder
   include Gem::UserInteraction
@@ -19,16 +18,17 @@ def self.class_name
     $1.downcase
   end
 
-  def self.make(dest_path, results, make_dir = Dir.pwd, sitedir = nil, targets = ["clean", "", "install"])
+  def self.make(dest_path, results, make_dir = Dir.pwd, sitedir = nil, targets = ["clean", "", "install"],
+    target_rbconfig: Gem.target_rbconfig)
     unless File.exist? File.join(make_dir, "Makefile")
       raise Gem::InstallError, "Makefile not found"
     end
 
     # try to find make program from Ruby configure arguments first
-    RbConfig::CONFIG["configure_args"] =~ /with-make-prog\=(\w+)/
+    target_rbconfig["configure_args"] =~ /with-make-prog\=(\w+)/
     make_program_name = ENV["MAKE"] || ENV["make"] || $1
     make_program_name ||= RUBY_PLATFORM.include?("mswin") ? "nmake" : "make"
-    make_program = Shellwords.split(make_program_name)
+    make_program = shellsplit(make_program_name)
 
     # The installation of the bundled gems is failed when DESTDIR is empty in mswin platform.
     destdir = /\bnmake/i !~ make_program_name || ENV["DESTDIR"] && ENV["DESTDIR"] != "" ? format("DESTDIR=%s", ENV["DESTDIR"]) : ""
@@ -57,7 +57,7 @@ def self.make(dest_path, results, make_dir = Dir.pwd, sitedir = nil, targets = [
 
   def self.ruby
     # Gem.ruby is quoted if it contains whitespace
-    cmd = Shellwords.split(Gem.ruby)
+    cmd = shellsplit(Gem.ruby)
 
     # This load_path is only needed when running rubygems test without a proper installation.
     # Prepending it in a normal installation will cause problem with order of $LOAD_PATH.
@@ -82,19 +82,26 @@ def self.run(command, results, command_name = nil, dir = Dir.pwd, env = {})
         p(command)
       end
       results << "current directory: #{dir}"
-      results << Shellwords.join(command)
+      results << shelljoin(command)
 
       require "open3"
       # Set $SOURCE_DATE_EPOCH for the subprocess.
       build_env = { "SOURCE_DATE_EPOCH" => Gem.source_date_epoch_string }.merge(env)
       output, status = begin
-                         Open3.capture2e(build_env, *command, :chdir => dir)
+                         Open3.popen2e(build_env, *command, chdir: dir) do |_stdin, stdouterr, wait_thread|
+                           output = String.new
+                           while line = stdouterr.gets
+                             output << line
+                             if verbose
+                               print line
+                             end
+                           end
+                           [output, wait_thread.value]
+                         end
                        rescue StandardError => error
                          raise Gem::InstallError, "#{command_name || class_name} failed#{error.message}"
                        end
-      if verbose
-        puts output
-      else
+      unless verbose
         results << output
       end
     ensure
@@ -119,15 +126,28 @@ def self.run(command, results, command_name = nil, dir = Dir.pwd, env = {})
     end
   end
 
+  def self.shellsplit(command)
+    require "shellwords"
+
+    Shellwords.split(command)
+  end
+
+  def self.shelljoin(command)
+    require "shellwords"
+
+    Shellwords.join(command)
+  end
+
   ##
   # Creates a new extension builder for +spec+.  If the +spec+ does not yet
   # have build arguments, saved, set +build_args+ which is an ARGV-style
   # array.
 
-  def initialize(spec, build_args = spec.build_args)
+  def initialize(spec, build_args = spec.build_args, target_rbconfig = Gem.target_rbconfig)
     @spec       = spec
     @build_args = build_args
     @gem_dir    = spec.full_gem_path
+    @target_rbconfig = target_rbconfig
 
     @ran_rake = false
   end
@@ -184,7 +204,7 @@ def build_extension(extension, dest_path) # :nodoc:
       FileUtils.mkdir_p dest_path
 
       results = builder.build(extension, dest_path,
-                              results, @build_args, lib_dir, extension_dir)
+                              results, @build_args, lib_dir, extension_dir, @target_rbconfig)
 
       verbose { results.join("\n") }
 
diff --git a/lib/rubygems/ext/cargo_builder.rb b/lib/rubygems/ext/cargo_builder.rb
index 0480b4ffdc2bc2..21b50f394d552d 100644
--- a/lib/rubygems/ext/cargo_builder.rb
+++ b/lib/rubygems/ext/cargo_builder.rb
@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require_relative "../shellwords"
-
 # This class is used by rubygems to build Rust extensions. It is a thin-wrapper
 # over the `cargo rustc` command which takes care of building Rust code in a way
 # that Ruby can use.
@@ -16,10 +14,15 @@ def initialize
     @profile = :release
   end
 
-  def build(extension, dest_path, results, args = [], lib_dir = nil, cargo_dir = Dir.pwd)
+  def build(extension, dest_path, results, args = [], lib_dir = nil, cargo_dir = Dir.pwd,
+    target_rbconfig=Gem.target_rbconfig)
     require "tempfile"
     require "fileutils"
 
+    if target_rbconfig.path
+      warn "--target-rbconfig is not yet supported for Rust extensions. Ignoring"
+    end
+
     # Where's the Cargo.toml of the crate we're building
     cargo_toml = File.join(cargo_dir, "Cargo.toml")
     # What's the crate's name
@@ -47,7 +50,6 @@ def build(extension, dest_path, results, args = [], lib_dir = nil, cargo_dir = D
 
       nesting = extension_nesting(extension)
 
-      # TODO: remove in RubyGems 4
       if Gem.install_extension_in_lib && lib_dir
         nested_lib_dir = File.join(lib_dir, nesting)
         FileUtils.mkdir_p nested_lib_dir
@@ -155,7 +157,11 @@ def platform_specific_rustc_args(dest_dir, flags = [])
   # We want to use the same linker that Ruby uses, so that the linker flags from
   # mkmf work properly.
   def linker_args
-    cc_flag = Shellwords.split(makefile_config("CC"))
+    cc_flag = self.class.shellsplit(makefile_config("CC"))
+    # Avoid to ccache like tool from Rust build
+    # see https://github.com/rubygems/rubygems/pull/8521#issuecomment-2689854359
+    # ex. CC="ccache gcc" or CC="sccache clang --any --args"
+    cc_flag.shift if cc_flag.size >= 2 && !cc_flag[1].start_with?("-")
     linker = cc_flag.shift
     link_args = cc_flag.flat_map {|a| ["-C", "link-arg=#{a}"] }
 
@@ -174,7 +180,7 @@ def mswin_link_args
 
   def libruby_args(dest_dir)
     libs = makefile_config(ruby_static? ? "LIBRUBYARG_STATIC" : "LIBRUBYARG_SHARED")
-    raw_libs = Shellwords.split(libs)
+    raw_libs = self.class.shellsplit(libs)
     raw_libs.flat_map {|l| ldflag_to_link_modifier(l) }
   end
 
@@ -185,6 +191,7 @@ def ruby_static?
   end
 
   def cargo_dylib_path(dest_path, crate_name)
+    so_ext = RbConfig::CONFIG["SOEXT"]
     prefix = so_ext == "dll" ? "" : "lib"
     path_parts = [dest_path]
     path_parts << ENV["CARGO_BUILD_TARGET"] if ENV["CARGO_BUILD_TARGET"]
@@ -198,7 +205,7 @@ def cargo_crate_name(cargo_dir, manifest_path, results)
 
     output, status =
       begin
-        Open3.capture2e(cargo, "metadata", "--no-deps", "--format-version", "1", :chdir => cargo_dir)
+        Open3.capture2e(cargo, "metadata", "--no-deps", "--format-version", "1", chdir: cargo_dir)
       rescue StandardError => error
         raise Gem::InstallError, "cargo metadata failed #{error.message}"
       end
@@ -247,8 +254,7 @@ def normalize_path(path)
 
   def rustc_dynamic_linker_flags(dest_dir, crate_name)
     split_flags("DLDFLAGS").
-      map {|arg| maybe_resolve_ldflag_variable(arg, dest_dir, crate_name) }.
-      compact.
+      filter_map {|arg| maybe_resolve_ldflag_variable(arg, dest_dir, crate_name) }.
       flat_map {|arg| ldflag_to_link_modifier(arg) }
   end
 
@@ -257,7 +263,7 @@ def rustc_lib_flags(dest_dir)
   end
 
   def split_flags(var)
-    Shellwords.split(RbConfig::CONFIG.fetch(var, ""))
+    self.class.shellsplit(RbConfig::CONFIG.fetch(var, ""))
   end
 
   def ldflag_to_link_modifier(arg)
@@ -293,7 +299,7 @@ def maybe_resolve_ldflag_variable(input_arg, dest_dir, crate_name)
 
     case var_name
     # On windows, it is assumed that mkmf has setup an exports file for the
-    # extension, so we have to to create one ourselves.
+    # extension, so we have to create one ourselves.
     when "DEFFILE"
       write_deffile(dest_dir, crate_name)
     else
@@ -313,22 +319,6 @@ def write_deffile(dest_dir, crate_name)
     deffile_path
   end
 
-  # We have to basically reimplement RbConfig::CONFIG['SOEXT'] here to support
-  # Ruby < 2.5
-  #
-  # @see https://github.com/ruby/ruby/blob/c87c027f18c005460746a74c07cd80ee355b16e4/configure.ac#L3185
-  def so_ext
-    return RbConfig::CONFIG["SOEXT"] if RbConfig::CONFIG.key?("SOEXT")
-
-    if win_target?
-      "dll"
-    elsif darwin_target?
-      "dylib"
-    else
-      "so"
-    end
-  end
-
   # Corresponds to $(LIBPATH) in mkmf
   def mkmf_libpath
     ["-L", "native=#{makefile_config("libdir")}"]
diff --git a/lib/rubygems/ext/cmake_builder.rb b/lib/rubygems/ext/cmake_builder.rb
index b1626647842af1..34564f668da87d 100644
--- a/lib/rubygems/ext/cmake_builder.rb
+++ b/lib/rubygems/ext/cmake_builder.rb
@@ -1,7 +1,12 @@
 # frozen_string_literal: true
 
 class Gem::Ext::CmakeBuilder < Gem::Ext::Builder
-  def self.build(extension, dest_path, results, args=[], lib_dir=nil, cmake_dir=Dir.pwd)
+  def self.build(extension, dest_path, results, args=[], lib_dir=nil, cmake_dir=Dir.pwd,
+    target_rbconfig=Gem.target_rbconfig)
+    if target_rbconfig.path
+      warn "--target-rbconfig is not yet supported for CMake extensions. Ignoring"
+    end
+
     unless File.exist?(File.join(cmake_dir, "Makefile"))
       require_relative "../command"
       cmd = ["cmake", ".", "-DCMAKE_INSTALL_PREFIX=#{dest_path}", *Gem::Command.build_args]
@@ -9,7 +14,7 @@ def self.build(extension, dest_path, results, args=[], lib_dir=nil, cmake_dir=Di
       run cmd, results, class_name, cmake_dir
     end
 
-    make dest_path, results, cmake_dir
+    make dest_path, results, cmake_dir, target_rbconfig: target_rbconfig
 
     results
   end
diff --git a/lib/rubygems/ext/configure_builder.rb b/lib/rubygems/ext/configure_builder.rb
index 6b8590ba2e5b6c..d91b1ec5e82a17 100644
--- a/lib/rubygems/ext/configure_builder.rb
+++ b/lib/rubygems/ext/configure_builder.rb
@@ -7,14 +7,19 @@
 #++
 
 class Gem::Ext::ConfigureBuilder < Gem::Ext::Builder
-  def self.build(extension, dest_path, results, args=[], lib_dir=nil, configure_dir=Dir.pwd)
+  def self.build(extension, dest_path, results, args=[], lib_dir=nil, configure_dir=Dir.pwd,
+    target_rbconfig=Gem.target_rbconfig)
+    if target_rbconfig.path
+      warn "--target-rbconfig is not yet supported for configure-based extensions. Ignoring"
+    end
+
     unless File.exist?(File.join(configure_dir, "Makefile"))
       cmd = ["sh", "./configure", "--prefix=#{dest_path}", *args]
 
       run cmd, results, class_name, configure_dir
     end
 
-    make dest_path, results, configure_dir
+    make dest_path, results, configure_dir, target_rbconfig: target_rbconfig
 
     results
   end
diff --git a/lib/rubygems/ext/ext_conf_builder.rb b/lib/rubygems/ext/ext_conf_builder.rb
index 7efd4a06b701dd..e652a221f83b32 100644
--- a/lib/rubygems/ext/ext_conf_builder.rb
+++ b/lib/rubygems/ext/ext_conf_builder.rb
@@ -7,7 +7,8 @@
 #++
 
 class Gem::Ext::ExtConfBuilder < Gem::Ext::Builder
-  def self.build(extension, dest_path, results, args=[], lib_dir=nil, extension_dir=Dir.pwd)
+  def self.build(extension, dest_path, results, args=[], lib_dir=nil, extension_dir=Dir.pwd,
+    target_rbconfig=Gem.target_rbconfig)
     require "fileutils"
     require "tempfile"
 
@@ -23,6 +24,7 @@ def self.build(extension, dest_path, results, args=[], lib_dir=nil, extension_di
 
     begin
       cmd = ruby << File.basename(extension)
+      cmd << "--target-rbconfig=#{target_rbconfig.path}" if target_rbconfig.path
       cmd.push(*args)
 
       run(cmd, results, class_name, extension_dir) do |s, r|
@@ -39,16 +41,18 @@ def self.build(extension, dest_path, results, args=[], lib_dir=nil, extension_di
 
       ENV["DESTDIR"] = nil
 
-      make dest_path, results, extension_dir, tmp_dest_relative
+      make dest_path, results, extension_dir, tmp_dest_relative, target_rbconfig: target_rbconfig
 
       full_tmp_dest = File.join(extension_dir, tmp_dest_relative)
 
-      # TODO: remove in RubyGems 4
-      if Gem.install_extension_in_lib && lib_dir
+      is_cross_compiling = target_rbconfig["platform"] != RbConfig::CONFIG["platform"]
+      # Do not copy extension libraries by default when cross-compiling
+      # not to conflict with the one already built for the host platform.
+      if Gem.install_extension_in_lib && lib_dir && !is_cross_compiling
         FileUtils.mkdir_p lib_dir
         entries = Dir.entries(full_tmp_dest) - %w[. ..]
         entries = entries.map {|entry| File.join full_tmp_dest, entry }
-        FileUtils.cp_r entries, lib_dir, :remove_destination => true
+        FileUtils.cp_r entries, lib_dir, remove_destination: true
       end
 
       FileUtils::Entry_.new(full_tmp_dest).traverse do |ent|
@@ -56,7 +60,7 @@ def self.build(extension, dest_path, results, args=[], lib_dir=nil, extension_di
         destent.exist? || FileUtils.mv(ent.path, destent.path)
       end
 
-      make dest_path, results, extension_dir, tmp_dest_relative, ["clean"]
+      make dest_path, results, extension_dir, tmp_dest_relative, ["clean"], target_rbconfig: target_rbconfig
     ensure
       ENV["DESTDIR"] = destdir
     end
diff --git a/lib/rubygems/ext/rake_builder.rb b/lib/rubygems/ext/rake_builder.rb
index 0171807b39e744..8edd8d1373768f 100644
--- a/lib/rubygems/ext/rake_builder.rb
+++ b/lib/rubygems/ext/rake_builder.rb
@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require_relative "../shellwords"
-
 #--
 # Copyright 2006 by Chad Fowler, Rich Kilmer, Jim Weirich and others.
 # All rights reserved.
@@ -9,7 +7,12 @@
 #++
 
 class Gem::Ext::RakeBuilder < Gem::Ext::Builder
-  def self.build(extension, dest_path, results, args=[], lib_dir=nil, extension_dir=Dir.pwd)
+  def self.build(extension, dest_path, results, args=[], lib_dir=nil, extension_dir=Dir.pwd,
+    target_rbconfig=Gem.target_rbconfig)
+    if target_rbconfig.path
+      warn "--target-rbconfig is not yet supported for Rake extensions. Ignoring"
+    end
+
     if /mkrf_conf/i.match?(File.basename(extension))
       run([Gem.ruby, File.basename(extension), *args], results, class_name, extension_dir)
     end
@@ -17,7 +20,7 @@ def self.build(extension, dest_path, results, args=[], lib_dir=nil, extension_di
     rake = ENV["rake"]
 
     if rake
-      rake = Shellwords.split(rake)
+      rake = shellsplit(rake)
     else
       begin
         rake = ruby << "-rrubygems" << Gem.bin_path("rake", "rake")
diff --git a/lib/rubygems/gem_runner.rb b/lib/rubygems/gem_runner.rb
index 8335a0ad03fcd2..4cb924677f8360 100644
--- a/lib/rubygems/gem_runner.rb
+++ b/lib/rubygems/gem_runner.rb
@@ -29,6 +29,7 @@ def initialize
   # Run the gem command with the following arguments.
 
   def run(args)
+    validate_encoding args
     build_args = extract_build_args args
 
     do_configuration args
@@ -72,6 +73,14 @@ def extract_build_args(args) # :nodoc:
 
   private
 
+  def validate_encoding(args)
+    invalid_arg = args.find {|arg| !arg.valid_encoding? }
+
+    if invalid_arg
+      raise Gem::OptionParser::InvalidArgument.new("'#{invalid_arg.scrub}' has invalid encoding")
+    end
+  end
+
   def do_configuration(args)
     Gem.configuration = @config_file_class.new(args)
     Gem.use_paths Gem.configuration[:gemhome], Gem.configuration[:gempath]
diff --git a/lib/rubygems/gemcutter_utilities.rb b/lib/rubygems/gemcutter_utilities.rb
index 074a0df3344c78..afe7957f43064f 100644
--- a/lib/rubygems/gemcutter_utilities.rb
+++ b/lib/rubygems/gemcutter_utilities.rb
@@ -10,7 +10,8 @@
 
 module Gem::GemcutterUtilities
   ERROR_CODE = 1
-  API_SCOPES = [:index_rubygems, :push_rubygem, :yank_rubygem, :add_owner, :remove_owner, :access_webhooks, :show_dashboard].freeze
+  API_SCOPES = [:index_rubygems, :push_rubygem, :yank_rubygem, :add_owner, :remove_owner, :access_webhooks].freeze
+  EXCLUSIVELY_API_SCOPES = [:show_dashboard].freeze
 
   include Gem::Text
 
@@ -61,6 +62,10 @@ def otp
     options[:otp] || ENV["GEM_HOST_OTP_CODE"]
   end
 
+  def webauthn_enabled?
+    options[:webauthn]
+  end
+
   ##
   # The host to connect to either from the RUBYGEMS_HOST environment variable
   # or from the user's configuration
@@ -84,7 +89,7 @@ def host
   # If +allowed_push_host+ metadata is present, then it will only allow that host.
 
   def rubygems_api_request(method, path, host = nil, allowed_push_host = nil, scope: nil, credentials: {}, &block)
-    require "net/http"
+    require_relative "vendored_net_http"
 
     self.host = host if host
     unless self.host
@@ -93,8 +98,8 @@ def rubygems_api_request(method, path, host = nil, allowed_push_host = nil, scop
     end
 
     if allowed_push_host
-      allowed_host_uri = URI.parse(allowed_push_host)
-      host_uri         = URI.parse(self.host)
+      allowed_host_uri = Gem::URI.parse(allowed_push_host)
+      host_uri         = Gem::URI.parse(self.host)
 
       unless (host_uri.scheme == allowed_host_uri.scheme) && (host_uri.host == allowed_host_uri.host)
         alert_error "#{self.host.inspect} is not allowed by the gemspec, which only allows #{allowed_push_host.inspect}"
@@ -102,7 +107,7 @@ def rubygems_api_request(method, path, host = nil, allowed_push_host = nil, scop
       end
     end
 
-    uri = URI.parse "#{self.host}/#{path}"
+    uri = Gem::URI.parse "#{self.host}/#{path}"
     response = request_with_otp(method, uri, &block)
 
     if mfa_unauthorized?(response)
@@ -119,7 +124,7 @@ def rubygems_api_request(method, path, host = nil, allowed_push_host = nil, scop
   end
 
   def mfa_unauthorized?(response)
-    response.is_a?(Net::HTTPUnauthorized) && response.body.start_with?("You have enabled multifactor authentication")
+    response.is_a?(Gem::Net::HTTPUnauthorized) && response.body.start_with?("You have enabled multifactor authentication")
   end
 
   def update_scope(scope)
@@ -129,14 +134,13 @@ def update_scope(scope)
 
     say "The existing key doesn't have access of #{scope} on #{pretty_host}. Please sign in to update access."
 
-    email    = ask "   Email: "
-    password = ask_for_password "Password: "
+    identifier = ask "Username/email: "
+    password   = ask_for_password "      Password: "
 
     response = rubygems_api_request(:put, "api/v1/api_key",
                                     sign_in_host, scope: scope) do |request|
-      request.basic_auth email, password
-      request["OTP"] = otp if otp
-      request.body = URI.encode_www_form({ :api_key => api_key }.merge(update_scope_params))
+      request.basic_auth identifier, password
+      request.body = Gem::URI.encode_www_form({ api_key: api_key }.merge(update_scope_params))
     end
 
     with_response response do |_resp|
@@ -158,25 +162,24 @@ def sign_in(sign_in_host = nil, scope: nil)
     say "Don't have an account yet? " \
         "Create one at #{sign_in_host}/sign_up"
 
-    email = ask "   Email: "
-    password = ask_for_password "Password: "
+    identifier = ask "Username/email: "
+    password   = ask_for_password "      Password: "
     say "\n"
 
     key_name     = get_key_name(scope)
     scope_params = get_scope_params(scope)
-    profile      = get_user_profile(email, password)
+    profile      = get_user_profile(identifier, password)
     mfa_params   = get_mfa_params(profile)
     all_params   = scope_params.merge(mfa_params)
     warning      = profile["warning"]
-    credentials  = { email: email, password: password }
+    credentials  = { identifier: identifier, password: password }
 
     say "#{warning}\n" if warning
 
     response = rubygems_api_request(:post, "api/v1/api_key",
                                     sign_in_host, credentials: credentials, scope: scope) do |request|
-      request.basic_auth email, password
-      request["OTP"] = otp if otp
-      request.body = URI.encode_www_form({ name: key_name }.merge(all_params))
+      request.basic_auth identifier, password
+      request.body = Gem::URI.encode_www_form({ name: key_name }.merge(all_params))
     end
 
     with_response response do |resp|
@@ -208,13 +211,13 @@ def verify_api_key(key)
 
   def with_response(response, error_prefix = nil)
     case response
-    when Net::HTTPSuccess then
+    when Gem::Net::HTTPSuccess then
       if block_given?
         yield response
       else
         say clean_text(response.body)
       end
-    when Net::HTTPPermanentRedirect, Net::HTTPRedirection then
+    when Gem::Net::HTTPPermanentRedirect, Gem::Net::HTTPRedirection then
       message = "The request has redirected permanently to #{response["location"]}. Please check your defined push host URL."
       message = "#{error_prefix}: #{message}" if error_prefix
 
@@ -244,12 +247,14 @@ def set_api_key(host, key)
   private
 
   def request_with_otp(method, uri, &block)
-    request_method = Net::HTTP.const_get method.to_s.capitalize
+    request_method = Gem::Net::HTTP.const_get method.to_s.capitalize
 
     Gem::RemoteFetcher.fetcher.request(uri, request_method) do |req|
       req["OTP"] = otp if otp
       block.call(req)
     end
+  ensure
+    options[:otp] = nil if webauthn_enabled?
   end
 
   def fetch_otp(credentials)
@@ -258,7 +263,10 @@ def fetch_otp(credentials)
       port = server.addr[1].to_s
 
       url_with_port = "#{webauthn_url}?port=#{port}"
-      say "You have enabled multi-factor authentication. Please visit #{url_with_port} to authenticate via security device. If you can't verify using WebAuthn but have OTP enabled, you can re-run the gem signin command with the `--otp [your_code]` option."
+      say "You have enabled multi-factor authentication. Please visit the following URL to authenticate via security device. If you can't verify using WebAuthn but have OTP enabled, you can re-run the gem signin command with the `--otp [your_code]` option."
+      say ""
+      say url_with_port
+      say ""
 
       threads = [WebauthnListener.listener_thread(host, server), WebauthnPoller.poll_thread(options, host, webauthn_url, credentials)]
       otp_thread = wait_for_otp_thread(*threads)
@@ -270,6 +278,8 @@ def fetch_otp(credentials)
         terminate_interaction(1)
       end
 
+      options[:webauthn] = true
+
       say "You are verified with a security device. You may close the browser window."
       otp_thread[:otp]
     else
@@ -294,10 +304,10 @@ def webauthn_verification_url(credentials)
       if credentials.empty?
         request.add_field "Authorization", api_key
       else
-        request.basic_auth credentials[:email], credentials[:password]
+        request.basic_auth credentials[:identifier], credentials[:password]
       end
     end
-    response.is_a?(Net::HTTPSuccess) ? response.body : nil
+    response.is_a?(Gem::Net::HTTPSuccess) ? response.body : nil
   end
 
   def pretty_host(host)
@@ -309,15 +319,31 @@ def pretty_host(host)
   end
 
   def get_scope_params(scope)
-    scope_params = {}
+    scope_params = { index_rubygems: true, push_rubygem: true }
 
     if scope
       scope_params = { scope => true }
     else
-      say "Please select scopes you want to enable for the API key (y/n)"
-      API_SCOPES.each do |s|
-        selected = ask_yes_no(s.to_s, false)
-        scope_params[s] = true if selected
+      say "The default access scope is:"
+      scope_params.each do |k, _v|
+        say "  #{k}: y"
+      end
+      say "\n"
+      customise = ask_yes_no("Do you want to customise scopes?", false)
+      if customise
+        EXCLUSIVELY_API_SCOPES.each do |excl_scope|
+          selected = ask_yes_no("#{excl_scope} (exclusive scope, answering yes will not prompt for other scopes)", false)
+          next unless selected
+
+          return { excl_scope => true }
+        end
+
+        scope_params = {}
+
+        API_SCOPES.each do |s|
+          selected = ask_yes_no(s.to_s, false)
+          scope_params[s] = true if selected
+        end
       end
       say "\n"
     end
@@ -329,11 +355,11 @@ def default_host?
     host == Gem::DEFAULT_HOST
   end
 
-  def get_user_profile(email, password)
+  def get_user_profile(identifier, password)
     return {} unless default_host?
 
     response = rubygems_api_request(:get, "api/v1/profile/me.yaml") do |request|
-      request.basic_auth email, password
+      request.basic_auth identifier, password
     end
 
     with_response response do |resp|
@@ -366,6 +392,6 @@ def get_key_name(scope)
   end
 
   def api_key_forbidden?(response)
-    response.is_a?(Net::HTTPForbidden) && response.body.start_with?("The API key doesn't have access")
+    response.is_a?(Gem::Net::HTTPForbidden) && response.body.start_with?("The API key doesn't have access")
   end
 end
diff --git a/lib/rubygems/gemcutter_utilities/webauthn_listener.rb b/lib/rubygems/gemcutter_utilities/webauthn_listener.rb
index bea9d9e397d864..3f56a077c9bbc8 100644
--- a/lib/rubygems/gemcutter_utilities/webauthn_listener.rb
+++ b/lib/rubygems/gemcutter_utilities/webauthn_listener.rb
@@ -51,7 +51,7 @@ def wait_for_otp_code(server)
         request_line = socket.gets
 
         method, req_uri, _protocol = request_line.split(" ")
-        req_uri = URI.parse(req_uri)
+        req_uri = Gem::URI.parse(req_uri)
 
         responder = SocketResponder.new(socket)
 
@@ -85,10 +85,17 @@ def root_path?(uri)
     end
 
     def parse_otp_from_uri(uri)
-      require "cgi"
+      query = uri.query
+      return unless query && !query.empty?
 
-      return if uri.query.nil?
-      CGI.parse(uri.query).dig("code", 0)
+      query.split("&") do |param|
+        key, value = param.split("=", 2)
+        if value && Gem::URI.decode_www_form_component(key) == "code"
+          return Gem::URI.decode_www_form_component(value)
+        end
+      end
+
+      nil
     end
 
     class SocketResponder
diff --git a/lib/rubygems/gemcutter_utilities/webauthn_listener/response.rb b/lib/rubygems/gemcutter_utilities/webauthn_listener/response.rb
index 7709a8fef37351..17baa64fff3aef 100644
--- a/lib/rubygems/gemcutter_utilities/webauthn_listener/response.rb
+++ b/lib/rubygems/gemcutter_utilities/webauthn_listener/response.rb
@@ -2,9 +2,9 @@
 
 ##
 # The WebauthnListener Response class is used by the WebauthnListener to create
-# responses to be sent to the Gem host. It creates a Net::HTTPResponse instance
+# responses to be sent to the Gem host. It creates a Gem::Net::HTTPResponse instance
 # when initialized and can be converted to the appropriate format to be sent by a socket using `to_s`.
-# Net::HTTPResponse instances cannot be directly sent over a socket.
+# Gem::Net::HTTPResponse instances cannot be directly sent over a socket.
 #
 # Types of response classes:
 #   - OkResponse
@@ -60,7 +60,7 @@ def reason_phrase
       def body; end
 
       def build_http_response
-        response_class = Net::HTTPResponse::CODE_TO_OBJ[code.to_s]
+        response_class = Gem::Net::HTTPResponse::CODE_TO_OBJ[code.to_s]
         @http_response = response_class.new("1.1", code, reason_phrase)
         @http_response.instance_variable_set(:@read, true)
 
diff --git a/lib/rubygems/gemcutter_utilities/webauthn_poller.rb b/lib/rubygems/gemcutter_utilities/webauthn_poller.rb
index e7068605a43a5d..fe3f163a8887b4 100644
--- a/lib/rubygems/gemcutter_utilities/webauthn_poller.rb
+++ b/lib/rubygems/gemcutter_utilities/webauthn_poller.rb
@@ -37,16 +37,16 @@ def self.poll_thread(options, host, webauthn_url, credentials)
         thread.abort_on_exception = true
         thread.report_on_exception = false
         thread[:otp] = new(options, host).poll_for_otp(webauthn_url, credentials)
-      rescue Gem::WebauthnVerificationError, Timeout::Error => e
+      rescue Gem::WebauthnVerificationError, Gem::Timeout::Error => e
         thread[:error] = e
       end
     end
 
     def poll_for_otp(webauthn_url, credentials)
-      Timeout.timeout(TIMEOUT_IN_SECONDS) do
+      Gem::Timeout.timeout(TIMEOUT_IN_SECONDS) do
         loop do
           response = webauthn_verification_poll_response(webauthn_url, credentials)
-          raise Gem::WebauthnVerificationError, response.message unless response.is_a?(Net::HTTPSuccess)
+          raise Gem::WebauthnVerificationError, response.message unless response.is_a?(Gem::Net::HTTPSuccess)
 
           require "json"
           parsed_response = JSON.parse(response.body)
@@ -69,8 +69,10 @@ def webauthn_verification_poll_response(webauthn_url, credentials)
       rubygems_api_request(:get, "api/v1/webauthn_verification/#{webauthn_token}/status.json") do |request|
         if credentials.empty?
           request.add_field "Authorization", api_key
+        elsif credentials[:identifier] && credentials[:password]
+          request.basic_auth credentials[:identifier], credentials[:password]
         else
-          request.basic_auth credentials[:email], credentials[:password]
+          raise Gem::WebauthnVerificationError, "Provided missing credentials"
         end
       end
     end
diff --git a/lib/rubygems/gemspec_helpers.rb b/lib/rubygems/gemspec_helpers.rb
new file mode 100644
index 00000000000000..2b20fcafa12120
--- /dev/null
+++ b/lib/rubygems/gemspec_helpers.rb
@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+require_relative "../rubygems"
+
+##
+# Mixin methods for commands that work with gemspecs.
+
+module Gem::GemspecHelpers
+  def find_gemspec(glob = "*.gemspec")
+    gemspecs = Dir.glob(glob).sort
+
+    if gemspecs.size > 1
+      alert_error "Multiple gemspecs found: #{gemspecs}, please specify one"
+      terminate_interaction(1)
+    end
+
+    gemspecs.first
+  end
+end
diff --git a/lib/rubygems/indexer.rb b/lib/rubygems/indexer.rb
deleted file mode 100644
index c6691517b38dab..00000000000000
--- a/lib/rubygems/indexer.rb
+++ /dev/null
@@ -1,428 +0,0 @@
-# frozen_string_literal: true
-
-require_relative "../rubygems"
-require_relative "package"
-require "tmpdir"
-
-##
-# Top level class for building the gem repository index.
-
-class Gem::Indexer
-  include Gem::UserInteraction
-
-  ##
-  # Build indexes for RubyGems 1.2.0 and newer when true
-
-  attr_accessor :build_modern
-
-  ##
-  # Index install location
-
-  attr_reader :dest_directory
-
-  ##
-  # Specs index install location
-
-  attr_reader :dest_specs_index
-
-  ##
-  # Latest specs index install location
-
-  attr_reader :dest_latest_specs_index
-
-  ##
-  # Prerelease specs index install location
-
-  attr_reader :dest_prerelease_specs_index
-
-  ##
-  # Index build directory
-
-  attr_reader :directory
-
-  ##
-  # Create an indexer that will index the gems in +directory+.
-
-  def initialize(directory, options = {})
-    require "fileutils"
-    require "tmpdir"
-    require "zlib"
-
-    options = { :build_modern => true }.merge options
-
-    @build_modern = options[:build_modern]
-
-    @dest_directory = directory
-    @directory = Dir.mktmpdir "gem_generate_index"
-
-    marshal_name = "Marshal.#{Gem.marshal_version}"
-
-    @master_index = File.join @directory, "yaml"
-    @marshal_index = File.join @directory, marshal_name
-
-    @quick_dir = File.join @directory, "quick"
-    @quick_marshal_dir = File.join @quick_dir, marshal_name
-    @quick_marshal_dir_base = File.join "quick", marshal_name # FIX: UGH
-
-    @quick_index = File.join @quick_dir, "index"
-    @latest_index = File.join @quick_dir, "latest_index"
-
-    @specs_index = File.join @directory, "specs.#{Gem.marshal_version}"
-    @latest_specs_index =
-      File.join(@directory, "latest_specs.#{Gem.marshal_version}")
-    @prerelease_specs_index =
-      File.join(@directory, "prerelease_specs.#{Gem.marshal_version}")
-    @dest_specs_index =
-      File.join(@dest_directory, "specs.#{Gem.marshal_version}")
-    @dest_latest_specs_index =
-      File.join(@dest_directory, "latest_specs.#{Gem.marshal_version}")
-    @dest_prerelease_specs_index =
-      File.join(@dest_directory, "prerelease_specs.#{Gem.marshal_version}")
-
-    @files = []
-  end
-
-  ##
-  # Build various indices
-
-  def build_indices
-    specs = map_gems_to_specs gem_file_list
-    Gem::Specification._resort! specs
-    build_marshal_gemspecs specs
-    build_modern_indices specs if @build_modern
-
-    compress_indices
-  end
-
-  ##
-  # Builds Marshal quick index gemspecs.
-
-  def build_marshal_gemspecs(specs)
-    count = specs.count
-    progress = ui.progress_reporter count,
-                                    "Generating Marshal quick index gemspecs for #{count} gems",
-                                    "Complete"
-
-    files = []
-
-    Gem.time "Generated Marshal quick index gemspecs" do
-      specs.each do |spec|
-        next if spec.default_gem?
-        spec_file_name = "#{spec.original_name}.gemspec.rz"
-        marshal_name = File.join @quick_marshal_dir, spec_file_name
-
-        marshal_zipped = Gem.deflate Marshal.dump(spec)
-
-        File.open marshal_name, "wb" do |io|
-          io.write marshal_zipped
-        end
-
-        files << marshal_name
-
-        progress.updated spec.original_name
-      end
-
-      progress.done
-    end
-
-    @files << @quick_marshal_dir
-
-    files
-  end
-
-  ##
-  # Build a single index for RubyGems 1.2 and newer
-
-  def build_modern_index(index, file, name)
-    say "Generating #{name} index"
-
-    Gem.time "Generated #{name} index" do
-      File.open(file, "wb") do |io|
-        specs = index.map do |*spec|
-          # We have to splat here because latest_specs is an array, while the
-          # others are hashes.
-          spec = spec.flatten.last
-          platform = spec.original_platform
-
-          # win32-api-1.0.4-x86-mswin32-60
-          unless String === platform
-            alert_warning "Skipping invalid platform in gem: #{spec.full_name}"
-            next
-          end
-
-          platform = Gem::Platform::RUBY if platform.nil? || platform.empty?
-          [spec.name, spec.version, platform]
-        end
-
-        specs = compact_specs(specs)
-        Marshal.dump(specs, io)
-      end
-    end
-  end
-
-  ##
-  # Builds indices for RubyGems 1.2 and newer. Handles full, latest, prerelease
-
-  def build_modern_indices(specs)
-    prerelease, released = specs.partition do |s|
-      s.version.prerelease?
-    end
-    latest_specs =
-      Gem::Specification._latest_specs specs
-
-    build_modern_index(released.sort, @specs_index, "specs")
-    build_modern_index(latest_specs.sort, @latest_specs_index, "latest specs")
-    build_modern_index(prerelease.sort, @prerelease_specs_index,
-                       "prerelease specs")
-
-    @files += [@specs_index,
-               "#{@specs_index}.gz",
-               @latest_specs_index,
-               "#{@latest_specs_index}.gz",
-               @prerelease_specs_index,
-               "#{@prerelease_specs_index}.gz"]
-  end
-
-  def map_gems_to_specs(gems)
-    gems.map do |gemfile|
-      if File.size(gemfile) == 0
-        alert_warning "Skipping zero-length gem: #{gemfile}"
-        next
-      end
-
-      begin
-        spec = Gem::Package.new(gemfile).spec
-        spec.loaded_from = gemfile
-
-        spec.abbreviate
-        spec.sanitize
-
-        spec
-      rescue SignalException
-        alert_error "Received signal, exiting"
-        raise
-      rescue StandardError => e
-        msg = ["Unable to process #{gemfile}",
-               "#{e.message} (#{e.class})",
-               "\t#{e.backtrace.join "\n\t"}"].join("\n")
-        alert_error msg
-      end
-    end.compact
-  end
-
-  ##
-  # Compresses indices on disk
-  #--
-  # All future files should be compressed using gzip, not deflate
-
-  def compress_indices
-    say "Compressing indices"
-
-    Gem.time "Compressed indices" do
-      if @build_modern
-        gzip @specs_index
-        gzip @latest_specs_index
-        gzip @prerelease_specs_index
-      end
-    end
-  end
-
-  ##
-  # Compacts Marshal output for the specs index data source by using identical
-  # objects as much as possible.
-
-  def compact_specs(specs)
-    names = {}
-    versions = {}
-    platforms = {}
-
-    specs.map do |(name, version, platform)|
-      names[name] = name unless names.include? name
-      versions[version] = version unless versions.include? version
-      platforms[platform] = platform unless platforms.include? platform
-
-      [names[name], versions[version], platforms[platform]]
-    end
-  end
-
-  ##
-  # Compress +filename+ with +extension+.
-
-  def compress(filename, extension)
-    data = Gem.read_binary filename
-
-    zipped = Gem.deflate data
-
-    File.open "#{filename}.#{extension}", "wb" do |io|
-      io.write zipped
-    end
-  end
-
-  ##
-  # List of gem file names to index.
-
-  def gem_file_list
-    Gem::Util.glob_files_in_dir("*.gem", File.join(@dest_directory, "gems"))
-  end
-
-  ##
-  # Builds and installs indices.
-
-  def generate_index
-    make_temp_directories
-    build_indices
-    install_indices
-  rescue SignalException
-  ensure
-    FileUtils.rm_rf @directory
-  end
-
-  ##
-  # Zlib::GzipWriter wrapper that gzips +filename+ on disk.
-
-  def gzip(filename)
-    Zlib::GzipWriter.open "#{filename}.gz" do |io|
-      io.write Gem.read_binary(filename)
-    end
-  end
-
-  ##
-  # Install generated indices into the destination directory.
-
-  def install_indices
-    verbose = Gem.configuration.really_verbose
-
-    say "Moving index into production dir #{@dest_directory}" if verbose
-
-    files = @files
-    files.delete @quick_marshal_dir if files.include? @quick_dir
-
-    if files.include?(@quick_marshal_dir) && !files.include?(@quick_dir)
-      files.delete @quick_marshal_dir
-
-      dst_name = File.join(@dest_directory, @quick_marshal_dir_base)
-
-      FileUtils.mkdir_p File.dirname(dst_name), :verbose => verbose
-      FileUtils.rm_rf dst_name, :verbose => verbose
-      FileUtils.mv(@quick_marshal_dir, dst_name,
-                   :verbose => verbose, :force => true)
-    end
-
-    files = files.map do |path|
-      path.sub(%r{^#{Regexp.escape @directory}/?}, "") # HACK?
-    end
-
-    files.each do |file|
-      src_name = File.join @directory, file
-      dst_name = File.join @dest_directory, file
-
-      FileUtils.rm_rf dst_name, :verbose => verbose
-      FileUtils.mv(src_name, @dest_directory,
-                   :verbose => verbose, :force => true)
-    end
-  end
-
-  ##
-  # Make directories for index generation
-
-  def make_temp_directories
-    FileUtils.rm_rf @directory
-    FileUtils.mkdir_p @directory, :mode => 0o700
-    FileUtils.mkdir_p @quick_marshal_dir
-  end
-
-  ##
-  # Ensure +path+ and path with +extension+ are identical.
-
-  def paranoid(path, extension)
-    data = Gem.read_binary path
-    compressed_data = Gem.read_binary "#{path}.#{extension}"
-
-    unless data == Gem::Util.inflate(compressed_data)
-      raise "Compressed file #{compressed_path} does not match uncompressed file #{path}"
-    end
-  end
-
-  ##
-  # Perform an in-place update of the repository from newly added gems.
-
-  def update_index
-    make_temp_directories
-
-    specs_mtime = File.stat(@dest_specs_index).mtime
-    newest_mtime = Time.at 0
-
-    updated_gems = gem_file_list.select do |gem|
-      gem_mtime = File.stat(gem).mtime
-      newest_mtime = gem_mtime if gem_mtime > newest_mtime
-      gem_mtime >= specs_mtime
-    end
-
-    if updated_gems.empty?
-      say "No new gems"
-      terminate_interaction 0
-    end
-
-    specs = map_gems_to_specs updated_gems
-    prerelease, released = specs.partition {|s| s.version.prerelease? }
-
-    files = build_marshal_gemspecs specs
-
-    Gem.time "Updated indexes" do
-      update_specs_index released, @dest_specs_index, @specs_index
-      update_specs_index released, @dest_latest_specs_index, @latest_specs_index
-      update_specs_index(prerelease,
-                         @dest_prerelease_specs_index,
-                         @prerelease_specs_index)
-    end
-
-    compress_indices
-
-    verbose = Gem.configuration.really_verbose
-
-    say "Updating production dir #{@dest_directory}" if verbose
-
-    files << @specs_index
-    files << "#{@specs_index}.gz"
-    files << @latest_specs_index
-    files << "#{@latest_specs_index}.gz"
-    files << @prerelease_specs_index
-    files << "#{@prerelease_specs_index}.gz"
-
-    files = files.map do |path|
-      path.sub(%r{^#{Regexp.escape @directory}/?}, "") # HACK?
-    end
-
-    files.each do |file|
-      src_name = File.join @directory, file
-      dst_name = File.join @dest_directory, file # REFACTOR: duped above
-
-      FileUtils.mv src_name, dst_name, :verbose => verbose,
-                                       :force => true
-
-      File.utime newest_mtime, newest_mtime, dst_name
-    end
-  ensure
-    FileUtils.rm_rf @directory
-  end
-
-  ##
-  # Combines specs in +index+ and +source+ then writes out a new copy to
-  # +dest+.  For a latest index, does not ensure the new file is minimal.
-
-  def update_specs_index(index, source, dest)
-    specs_index = Marshal.load Gem.read_binary(source)
-
-    index.each do |spec|
-      platform = spec.original_platform
-      platform = Gem::Platform::RUBY if platform.nil? || platform.empty?
-      specs_index << [spec.name, spec.version, platform]
-    end
-
-    specs_index = compact_specs specs_index.uniq.sort
-
-    File.open dest, "wb" do |io|
-      Marshal.dump specs_index, io
-    end
-  end
-end
diff --git a/lib/rubygems/install_update_options.rb b/lib/rubygems/install_update_options.rb
index 5c7289426e9830..0d0f0dc211ef1c 100644
--- a/lib/rubygems/install_update_options.rb
+++ b/lib/rubygems/install_update_options.rb
@@ -179,6 +179,11 @@ def add_install_update_options
                "Suggest alternates when gems are not found") do |v,_o|
       options[:suggest_alternate] = v
     end
+
+    add_option(:"Install/Update", "--target-rbconfig [FILE]",
+                "rbconfig.rb for the deployment target platform") do |v, _o|
+      Gem.set_target_rbconfig(v)
+    end
   end
 
   ##
@@ -186,7 +191,7 @@ def add_install_update_options
 
   def install_update_options
     {
-      :document => %w[ri],
+      document: %w[ri],
     }
   end
 
diff --git a/lib/rubygems/installer.rb b/lib/rubygems/installer.rb
index 162a50fdb76813..2b3200223a5db7 100644
--- a/lib/rubygems/installer.rb
+++ b/lib/rubygems/installer.rb
@@ -66,8 +66,6 @@ class Gem::Installer
 
   attr_reader :package
 
-  @path_warning = false
-
   class << self
     #
     # Changes in rubygems to lazily loading `rubygems/command` (in order to
@@ -86,11 +84,6 @@ def inherited(klass)
       super(klass)
     end
 
-    ##
-    # True if we've warned about PATH not including Gem.bindir
-
-    attr_accessor :path_warning
-
     ##
     # Overrides the executable format.
     #
@@ -188,13 +181,6 @@ def initialize(package, options={})
     @package.dir_mode = options[:dir_mode]
     @package.prog_mode = options[:prog_mode]
     @package.data_mode = options[:data_mode]
-
-    if options[:user_install]
-      @gem_home = Gem.user_dir
-      @bin_dir = Gem.bindir gem_home unless options[:bin_dir]
-      @plugins_dir = Gem.plugindir(gem_home)
-      check_that_user_bin_dir_is_in_path
-    end
   end
 
   ##
@@ -222,10 +208,11 @@ def check_executable_overwrite(filename) # :nodoc:
 
     File.open generated_bin, "rb" do |io|
       line = io.gets
-      shebang = /^#!.*ruby/
+      shebang = /^#!.*ruby/o
 
-      if load_relative_enabled?
-        until line.nil? || line =~ shebang do
+      # TruffleRuby uses a bash prelude in default launchers
+      if load_relative_enabled? || RUBY_ENGINE == "truffleruby"
+        until line.nil? || shebang.match?(line) do
           line = io.gets
         end
       end
@@ -236,13 +223,12 @@ def check_executable_overwrite(filename) # :nodoc:
 
       # TODO: detect a specially formatted comment instead of trying
       # to find a string inside Ruby code.
-      next unless io.gets.to_s.include?("This file was generated by RubyGems")
+      next unless io.gets&.include?("This file was generated by RubyGems")
 
       ruby_executable = true
       existing = io.read.slice(/
           ^\s*(
-            gem \s |
-            load \s Gem\.bin_path\( |
+            Gem\.activate_and_load_bin_path\( |
             load \s Gem\.activate_bin_path\(
           )
           (['"])(.*?)(\2),
@@ -316,7 +302,7 @@ def install
     FileUtils.rm_rf spec.extension_dir
 
     dir_mode = options[:dir_mode]
-    FileUtils.mkdir_p gem_dir, :mode => dir_mode && 0o755
+    FileUtils.mkdir_p gem_dir, mode: dir_mode && 0o755
 
     if @options[:install_as_default]
       extract_bin
@@ -341,18 +327,16 @@ def install
 
     say spec.post_install_message if options[:post_install_message] && !spec.post_install_message.nil?
 
-    Gem::Specification.add_spec(spec)
+    Gem::Specification.add_spec(spec) unless @install_dir
 
     load_plugin
 
     run_post_install_hooks
 
     spec
-
-  # TODO: This rescue is in the wrong place. What is raising this exception?
-  # move this rescue to around the code that actually might raise it.
-  rescue Zlib::GzipFile::Error
-    raise Gem::InstallError, "gzip error installing #{gem}"
+  rescue Errno::EACCES => e
+    # Permission denied - /path/to/foo
+    raise Gem::FilePermissionError, e.message.split(" - ").last
   end
 
   def run_pre_install_hooks # :nodoc:
@@ -393,7 +377,7 @@ def installed_specs
       specs = []
 
       Gem::Util.glob_files_in_dir("*.gemspec", File.join(gem_home, "specifications")).each do |path|
-        spec = Gem::Specification.load path.tap(&Gem::UNTAINT)
+        spec = Gem::Specification.load path
         specs << spec if spec
       end
 
@@ -487,12 +471,21 @@ def generate_windows_script(filename, bindir)
   end
 
   def generate_bin # :nodoc:
-    return if spec.executables.nil? || spec.executables.empty?
+    executables = spec.executables
+    return if executables.nil? || executables.empty?
+
+    if @gem_home == Gem.user_dir
+      # If we get here, then one of the following likely happened:
+      # - `--user-install` was specified
+      # - `Gem::PathSupport#home` fell back to `Gem.user_dir`
+      # - GEM_HOME was manually set to `Gem.user_dir`
+
+      check_that_user_bin_dir_is_in_path(executables)
+    end
 
     ensure_writable_dir @bin_dir
 
-    spec.executables.each do |filename|
-      filename.tap(&Gem::UNTAINT)
+    executables.each do |filename|
       bin_path = File.join gem_dir, spec.bindir, filename
       next unless File.exist? bin_path
 
@@ -500,8 +493,7 @@ def generate_bin # :nodoc:
       dir_mode = options[:prog_mode] || (mode | 0o111)
 
       unless dir_mode == mode
-        require "fileutils"
-        FileUtils.chmod dir_mode, bin_path
+        File.chmod dir_mode, bin_path
       end
 
       check_executable_overwrite filename
@@ -539,12 +531,14 @@ def generate_plugins # :nodoc:
   def generate_bin_script(filename, bindir)
     bin_script_path = File.join bindir, formatted_program_filename(filename)
 
-    require "fileutils"
-    FileUtils.rm_f bin_script_path # prior install may have been --no-wrappers
+    Gem.open_file_with_lock(bin_script_path) do
+      require "fileutils"
+      FileUtils.rm_f bin_script_path # prior install may have been --no-wrappers
 
-    File.open bin_script_path, "wb", 0o755 do |file|
-      file.print app_script_text(filename)
-      file.chmod(options[:prog_mode] || 0o755)
+      File.open(bin_script_path, "wb", 0o755) do |file|
+        file.write app_script_text(filename)
+        file.chmod(options[:prog_mode] || 0o755)
+      end
     end
 
     verbose bin_script_path
@@ -569,7 +563,7 @@ def generate_bin_symlink(filename, bindir)
       File.unlink dst
     end
 
-    FileUtils.symlink src, dst, :verbose => Gem.configuration.really_verbose
+    FileUtils.symlink src, dst, verbose: Gem.configuration.really_verbose
   rescue NotImplementedError, SystemCallError
     alert_warning "Unable to use symlinks, installing wrapper"
     generate_bin_script filename, bindir
@@ -634,7 +628,6 @@ def shebang(bin_file_name)
 
   def ensure_loadable_spec
     ruby = spec.to_ruby_for_cache
-    ruby.tap(&Gem::UNTAINT)
 
     begin
       eval ruby
@@ -655,32 +648,37 @@ def ensure_dependencies_met # :nodoc:
 
   def process_options # :nodoc:
     @options = {
-      :bin_dir => nil,
-      :env_shebang => false,
-      :force => false,
-      :only_install_dir => false,
-      :post_install_message => true,
+      bin_dir: nil,
+      env_shebang: false,
+      force: false,
+      only_install_dir: false,
+      post_install_message: true,
     }.merge options
 
     @env_shebang         = options[:env_shebang]
     @force               = options[:force]
     @install_dir         = options[:install_dir]
-    @gem_home            = options[:install_dir] || Gem.dir
-    @plugins_dir         = Gem.plugindir(@gem_home)
+    @user_install        = options[:user_install]
     @ignore_dependencies = options[:ignore_dependencies]
     @format_executable   = options[:format_executable]
     @wrappers            = options[:wrappers]
     @only_install_dir    = options[:only_install_dir]
 
-    # If the user has asked for the gem to be installed in a directory that is
-    # the system gem directory, then use the system bin directory, else create
-    # (or use) a new bin dir under the gem_home.
-    @bin_dir             = options[:bin_dir] || Gem.bindir(gem_home)
+    @bin_dir             = options[:bin_dir]
     @development         = options[:development]
     @build_root          = options[:build_root]
 
     @build_args = options[:build_args]
 
+    @gem_home = @install_dir || user_install_dir || Gem.dir
+
+    # If the user has asked for the gem to be installed in a directory that is
+    # the system gem directory, then use the system bin directory, else create
+    # (or use) a new bin dir under the gem_home.
+    @bin_dir ||= Gem.bindir(@gem_home)
+
+    @plugins_dir = Gem.plugindir(@gem_home)
+
     unless @build_root.nil?
       @bin_dir = File.join(@build_root, @bin_dir.gsub(/^[a-zA-Z]:/, ""))
       @gem_home = File.join(@build_root, @gem_home.gsub(/^[a-zA-Z]:/, ""))
@@ -689,9 +687,7 @@ def process_options # :nodoc:
     end
   end
 
-  def check_that_user_bin_dir_is_in_path # :nodoc:
-    return if self.class.path_warning
-
+  def check_that_user_bin_dir_is_in_path(executables) # :nodoc:
     user_bin_dir = @bin_dir || Gem.bindir(gem_home)
     user_bin_dir = user_bin_dir.tr(File::ALT_SEPARATOR, File::SEPARATOR) if File::ALT_SEPARATOR
 
@@ -707,15 +703,13 @@ def check_that_user_bin_dir_is_in_path # :nodoc:
 
     unless path.include? user_bin_dir
       unless !Gem.win_platform? && (path.include? user_bin_dir.sub(ENV["HOME"], "~"))
-        alert_warning "You don't have #{user_bin_dir} in your PATH,\n\t  gem executables will not run."
-        self.class.path_warning = true
+        alert_warning "You don't have #{user_bin_dir} in your PATH,\n\t  gem executables (#{executables.join(", ")}) will not run."
       end
     end
   end
 
   def verify_gem_home # :nodoc:
-    FileUtils.mkdir_p gem_home, :mode => options[:dir_mode] && 0o755
-    raise Gem::FilePermissionError, gem_home unless File.writable?(gem_home)
+    FileUtils.mkdir_p gem_home, mode: options[:dir_mode] && 0o755
   end
 
   def verify_spec
@@ -754,54 +748,53 @@ def verify_spec
   def app_script_text(bin_file_name)
     # NOTE: that the `load` lines cannot be indented, as old RG versions match
     # against the beginning of the line
-    <<-TEXT
-#{shebang bin_file_name}
-#
-# This file was generated by RubyGems.
-#
-# The application '#{spec.name}' is installed as part of a gem, and
-# this file is here to facilitate running it.
-#
-
-require 'rubygems'
-#{gemdeps_load(spec.name)}
-version = "#{Gem::Requirement.default_prerelease}"
-
-str = ARGV.first
-if str
-  str = str.b[/\\A_(.*)_\\z/, 1]
-  if str and Gem::Version.correct?(str)
-    #{explicit_version_requirement(spec.name)}
-    ARGV.shift
-  end
-end
+    <<~TEXT
+      #{shebang bin_file_name}
+      #
+      # This file was generated by RubyGems.
+      #
+      # The application '#{spec.name}' is installed as part of a gem, and
+      # this file is here to facilitate running it.
+      #
+
+      require 'rubygems'
+      #{gemdeps_load(spec.name)}
+      version = "#{Gem::Requirement.default_prerelease}"
+
+      str = ARGV.first
+      if str
+        str = str.b[/\\A_(.*)_\\z/, 1]
+        if str and Gem::Version.correct?(str)
+          #{explicit_version_requirement(spec.name)}
+          ARGV.shift
+        end
+      end
 
-if Gem.respond_to?(:activate_bin_path)
-load Gem.activate_bin_path('#{spec.name}', '#{bin_file_name}', version)
-else
-gem #{spec.name.dump}, version
-load Gem.bin_path(#{spec.name.dump}, #{bin_file_name.dump}, version)
-end
-TEXT
+      if Gem.respond_to?(:activate_and_load_bin_path)
+        Gem.activate_and_load_bin_path('#{spec.name}', '#{bin_file_name}', version)
+      else
+        load Gem.activate_bin_path('#{spec.name}', '#{bin_file_name}', version)
+      end
+    TEXT
   end
 
   def gemdeps_load(name)
     return "" if name == "bundler"
 
-    <<-TEXT
+    <<~TEXT
 
-Gem.use_gemdeps
-TEXT
+      Gem.use_gemdeps
+    TEXT
   end
 
   def explicit_version_requirement(name)
     code = "version = str"
     return code unless name == "bundler"
 
-    code += <<-TEXT
+    code += <<~TEXT
 
-    ENV['BUNDLER_VERSION'] = str
-TEXT
+      ENV['BUNDLER_VERSION'] = str
+    TEXT
   end
 
   ##
@@ -816,9 +809,9 @@ def windows_stub_script(bindir, bin_file_name)
 
     if File.exist?(File.join(bindir, ruby_exe))
       # stub & ruby.exe within same folder.  Portable
-      <<-TEXT
-@ECHO OFF
-@"%~dp0#{ruby_exe}" "%~dpn0" %*
+      <<~TEXT
+        @ECHO OFF
+        @"%~dp0#{ruby_exe}" "%~dpn0" %*
       TEXT
     elsif bindir.downcase.start_with? rb_topdir.downcase
       # stub within ruby folder, but not standard bin.  Portable
@@ -826,16 +819,16 @@ def windows_stub_script(bindir, bin_file_name)
       from = Pathname.new bindir
       to   = Pathname.new "#{rb_topdir}/bin"
       rel  = to.relative_path_from from
-      <<-TEXT
-@ECHO OFF
-@"%~dp0#{rel}/#{ruby_exe}" "%~dpn0" %*
+      <<~TEXT
+        @ECHO OFF
+        @"%~dp0#{rel}/#{ruby_exe}" "%~dpn0" %*
       TEXT
     else
       # outside ruby folder, maybe -user-install or bundler.  Portable, but ruby
       # is dependent on PATH
-      <<-TEXT
-@ECHO OFF
-@#{ruby_exe} "%~dpn0" %*
+      <<~TEXT
+        @ECHO OFF
+        @#{ruby_exe} "%~dpn0" %*
       TEXT
     end
   end
@@ -844,7 +837,7 @@ def windows_stub_script(bindir, bin_file_name)
   # configure scripts and rakefiles or mkrf_conf files.
 
   def build_extensions
-    builder = Gem::Ext::Builder.new spec, build_args
+    builder = Gem::Ext::Builder.new spec, build_args, Gem.target_rbconfig
 
     builder.build_extensions
   end
@@ -936,7 +929,7 @@ def write_build_info_file
     build_info_dir = File.join gem_home, "build_info"
 
     dir_mode = options[:dir_mode]
-    FileUtils.mkdir_p build_info_dir, :mode => dir_mode && 0o755
+    FileUtils.mkdir_p build_info_dir, mode: dir_mode && 0o755
 
     build_info_file = File.join build_info_dir, "#{spec.full_name}.info"
 
@@ -958,17 +951,27 @@ def write_cache_file
   end
 
   def ensure_writable_dir(dir) # :nodoc:
-    begin
-      Dir.mkdir dir, *[options[:dir_mode] && 0o755].compact
-    rescue SystemCallError
-      raise unless File.directory? dir
-    end
+    require "fileutils"
+    FileUtils.mkdir_p dir, mode: options[:dir_mode] && 0o755
 
     raise Gem::FilePermissionError.new(dir) unless File.writable? dir
   end
 
   private
 
+  def user_install_dir
+    # never install to user home in --build-root mode
+    return unless @build_root.nil?
+
+    # Please note that @user_install might have three states:
+    # * `true`: `--user-install`
+    # * `false`: `--no-user-install` and
+    # * `nil`: option was not specified
+    if @user_install || (@user_install.nil? && Gem.default_user_install)
+      Gem.user_dir
+    end
+  end
+
   def build_args
     @build_args ||= begin
                       require_relative "command"
@@ -977,7 +980,7 @@ def build_args
   end
 
   def rb_config
-    RbConfig::CONFIG
+    Gem.target_rbconfig
   end
 
   def ruby_install_name
@@ -990,18 +993,17 @@ def load_relative_enabled?
 
   def bash_prolog_script
     if load_relative_enabled?
-      script = +<<~EOS
-        bindir="${0%/*}"
-      EOS
-
-      script << %(exec "$bindir/#{ruby_install_name}" "-x" "$0" "$@"\n)
-
       <<~EOS
         #!/bin/sh
         # -*- ruby -*-
         _=_\\
         =begin
-        #{script.chomp}
+        bindir="${0%/*}"
+        ruby="$bindir/#{ruby_install_name}"
+        if [ ! -f "$ruby" ]; then
+          ruby="#{ruby_install_name}"
+        fi
+        exec "$ruby" "-x" "$0" "$@"
         =end
       EOS
     else
diff --git a/lib/rubygems/local_remote_options.rb b/lib/rubygems/local_remote_options.rb
index e2a008fada83fe..3b88c43149ac68 100644
--- a/lib/rubygems/local_remote_options.rb
+++ b/lib/rubygems/local_remote_options.rb
@@ -6,7 +6,7 @@
 # See LICENSE.txt for permissions.
 #++
 
-require "uri"
+require_relative "vendor/uri/lib/uri"
 require_relative "../rubygems"
 
 ##
@@ -17,10 +17,10 @@ module Gem::LocalRemoteOptions
   # Allows Gem::OptionParser to handle HTTP URIs.
 
   def accept_uri_http
-    Gem::OptionParser.accept URI::HTTP do |value|
+    Gem::OptionParser.accept Gem::URI::HTTP do |value|
       begin
-        uri = URI.parse value
-      rescue URI::InvalidURIError
+        uri = Gem::URI.parse value
+      rescue Gem::URI::InvalidURIError
         raise Gem::OptionParser::InvalidArgument, value
       end
 
@@ -88,7 +88,7 @@ def add_clear_sources_option
   def add_proxy_option
     accept_uri_http
 
-    add_option(:"Local/Remote", "-p", "--[no-]http-proxy [URL]", URI::HTTP,
+    add_option(:"Local/Remote", "-p", "--[no-]http-proxy [URL]", Gem::URI::HTTP,
                "Use HTTP proxy for remote operations") do |value, options|
       options[:http_proxy] = value == false ? :no_proxy : value
       Gem.configuration[:http_proxy] = options[:http_proxy]
@@ -101,7 +101,7 @@ def add_proxy_option
   def add_source_option
     accept_uri_http
 
-    add_option(:"Local/Remote", "-s", "--source URL", URI::HTTP,
+    add_option(:"Local/Remote", "-s", "--source URL", Gem::URI::HTTP,
                "Append URL to list of remote gem sources") do |source, options|
       source << "/" unless source.end_with?("/")
 
@@ -134,13 +134,13 @@ def both?
   # Is local fetching enabled?
 
   def local?
-    options[:domain] == :local || options[:domain] == :both
+    [:local, :both].include?(options[:domain])
   end
 
   ##
   # Is remote fetching enabled?
 
   def remote?
-    options[:domain] == :remote || options[:domain] == :both
+    [:remote, :both].include?(options[:domain])
   end
 end
diff --git a/lib/rubygems/name_tuple.rb b/lib/rubygems/name_tuple.rb
index 9963c8bc5c3b3b..3f4a6fcf3dfbb1 100644
--- a/lib/rubygems/name_tuple.rb
+++ b/lib/rubygems/name_tuple.rb
@@ -6,14 +6,12 @@
 # wrap the data returned from the indexes.
 
 class Gem::NameTuple
-  def initialize(name, version, platform="ruby")
+  def initialize(name, version, platform=Gem::Platform::RUBY)
     @name = name
     @version = version
 
-    unless platform.is_a? Gem::Platform
-      platform = "ruby" if !platform || platform.empty?
-    end
-
+    platform &&= platform.to_s
+    platform = Gem::Platform::RUBY if !platform || platform.empty?
     @platform = platform
   end
 
@@ -49,11 +47,11 @@ def self.null
 
   def full_name
     case @platform
-    when nil, "ruby", ""
+    when nil, "", Gem::Platform::RUBY
       "#{@name}-#{@version}"
     else
       "#{@name}-#{@version}-#{@platform}"
-    end.dup.tap(&Gem::UNTAINT)
+    end
   end
 
   ##
diff --git a/lib/rubygems/optparse.rb b/lib/rubygems/optparse.rb
deleted file mode 100644
index 6ed718423c9124..00000000000000
--- a/lib/rubygems/optparse.rb
+++ /dev/null
@@ -1,3 +0,0 @@
-# frozen_string_literal: true
-
-require_relative "optparse/lib/optparse"
diff --git a/lib/rubygems/optparse/lib/optparse.rb b/lib/rubygems/optparse/lib/optparse.rb
deleted file mode 100644
index 1e50bda76961c8..00000000000000
--- a/lib/rubygems/optparse/lib/optparse.rb
+++ /dev/null
@@ -1,2308 +0,0 @@
-# frozen_string_literal: true
-#
-# optparse.rb - command-line option analysis with the Gem::OptionParser class.
-#
-# Author:: Nobu Nakada
-# Documentation:: Nobu Nakada and Gavin Sinclair.
-#
-# See Gem::OptionParser for documentation.
-#
-
-
-#--
-# == Developer Documentation (not for RDoc output)
-#
-# === Class tree
-#
-# - Gem::OptionParser:: front end
-# - Gem::OptionParser::Switch:: each switches
-# - Gem::OptionParser::List:: options list
-# - Gem::OptionParser::ParseError:: errors on parsing
-#   - Gem::OptionParser::AmbiguousOption
-#   - Gem::OptionParser::NeedlessArgument
-#   - Gem::OptionParser::MissingArgument
-#   - Gem::OptionParser::InvalidOption
-#   - Gem::OptionParser::InvalidArgument
-#     - Gem::OptionParser::AmbiguousArgument
-#
-# === Object relationship diagram
-#
-#   +--------------+
-#   | Gem::OptionParser |<>-----+
-#   +--------------+       |                      +--------+
-#                          |                    ,-| Switch |
-#        on_head -------->+---------------+    /  +--------+
-#        accept/reject -->| List          |<|>-
-#                         |               |<|>-  +----------+
-#        on ------------->+---------------+    `-| argument |
-#                           :           :        |  class   |
-#                         +---------------+      |==========|
-#        on_tail -------->|               |      |pattern   |
-#                         +---------------+      |----------|
-#   Gem::OptionParser.accept ->| DefaultList   |      |converter |
-#                reject   |(shared between|      +----------+
-#                         | all instances)|
-#                         +---------------+
-#
-#++
-#
-# == Gem::OptionParser
-#
-# === New to \Gem::OptionParser?
-#
-# See the {Tutorial}[optparse/tutorial.rdoc].
-#
-# === Introduction
-#
-# Gem::OptionParser is a class for command-line option analysis.  It is much more
-# advanced, yet also easier to use, than GetoptLong, and is a more Ruby-oriented
-# solution.
-#
-# === Features
-#
-# 1. The argument specification and the code to handle it are written in the
-#    same place.
-# 2. It can output an option summary; you don't need to maintain this string
-#    separately.
-# 3. Optional and mandatory arguments are specified very gracefully.
-# 4. Arguments can be automatically converted to a specified class.
-# 5. Arguments can be restricted to a certain set.
-#
-# All of these features are demonstrated in the examples below.  See
-# #make_switch for full documentation.
-#
-# === Minimal example
-#
-#   require 'rubygems/optparse/lib/optparse'
-#
-#   options = {}
-#   Gem::OptionParser.new do |parser|
-#     parser.banner = "Usage: example.rb [options]"
-#
-#     parser.on("-v", "--[no-]verbose", "Run verbosely") do |v|
-#       options[:verbose] = v
-#     end
-#   end.parse!
-#
-#   p options
-#   p ARGV
-#
-# === Generating Help
-#
-# Gem::OptionParser can be used to automatically generate help for the commands you
-# write:
-#
-#   require 'rubygems/optparse/lib/optparse'
-#
-#   Options = Struct.new(:name)
-#
-#   class Parser
-#     def self.parse(options)
-#       args = Options.new("world")
-#
-#       opt_parser = Gem::OptionParser.new do |parser|
-#         parser.banner = "Usage: example.rb [options]"
-#
-#         parser.on("-nNAME", "--name=NAME", "Name to say hello to") do |n|
-#           args.name = n
-#         end
-#
-#         parser.on("-h", "--help", "Prints this help") do
-#           puts parser
-#           exit
-#         end
-#       end
-#
-#       opt_parser.parse!(options)
-#       return args
-#     end
-#   end
-#   options = Parser.parse %w[--help]
-#
-#   #=>
-#      # Usage: example.rb [options]
-#      #     -n, --name=NAME                  Name to say hello to
-#      #     -h, --help                       Prints this help
-#
-# === Required Arguments
-#
-# For options that require an argument, option specification strings may include an
-# option name in all caps. If an option is used without the required argument,
-# an exception will be raised.
-#
-#   require 'rubygems/optparse/lib/optparse'
-#
-#   options = {}
-#   Gem::OptionParser.new do |parser|
-#     parser.on("-r", "--require LIBRARY",
-#               "Require the LIBRARY before executing your script") do |lib|
-#       puts "You required #{lib}!"
-#     end
-#   end.parse!
-#
-# Used:
-#
-#   $ ruby optparse-test.rb -r
-#   optparse-test.rb:9:in `<main>': missing argument: -r (Gem::OptionParser::MissingArgument)
-#   $ ruby optparse-test.rb -r my-library
-#   You required my-library!
-#
-# === Type Coercion
-#
-# Gem::OptionParser supports the ability to coerce command line arguments
-# into objects for us.
-#
-# Gem::OptionParser comes with a few ready-to-use kinds of  type
-# coercion. They are:
-#
-# - Date  -- Anything accepted by +Date.parse+
-# - DateTime -- Anything accepted by +DateTime.parse+
-# - Time -- Anything accepted by +Time.httpdate+ or +Time.parse+
-# - URI  -- Anything accepted by +URI.parse+
-# - Shellwords -- Anything accepted by +Shellwords.shellwords+
-# - String -- Any non-empty string
-# - Integer -- Any integer. Will convert octal. (e.g. 124, -3, 040)
-# - Float -- Any float. (e.g. 10, 3.14, -100E+13)
-# - Numeric -- Any integer, float, or rational (1, 3.4, 1/3)
-# - DecimalInteger -- Like +Integer+, but no octal format.
-# - OctalInteger -- Like +Integer+, but no decimal format.
-# - DecimalNumeric -- Decimal integer or float.
-# - TrueClass --  Accepts '+, yes, true, -, no, false' and
-#   defaults as +true+
-# - FalseClass -- Same as +TrueClass+, but defaults to +false+
-# - Array -- Strings separated by ',' (e.g. 1,2,3)
-# - Regexp -- Regular expressions. Also includes options.
-#
-# We can also add our own coercions, which we will cover below.
-#
-# ==== Using Built-in Conversions
-#
-# As an example, the built-in +Time+ conversion is used. The other built-in
-# conversions behave in the same way.
-# Gem::OptionParser will attempt to parse the argument
-# as a +Time+. If it succeeds, that time will be passed to the
-# handler block. Otherwise, an exception will be raised.
-#
-#   require 'rubygems/optparse/lib/optparse'
-#   require 'rubygems/optparse/lib/optparse/time'
-#   Gem::OptionParser.new do |parser|
-#     parser.on("-t", "--time [TIME]", Time, "Begin execution at given time") do |time|
-#       p time
-#     end
-#   end.parse!
-#
-# Used:
-#
-#   $ ruby optparse-test.rb  -t nonsense
-#   ... invalid argument: -t nonsense (Gem::OptionParser::InvalidArgument)
-#   $ ruby optparse-test.rb  -t 10-11-12
-#   2010-11-12 00:00:00 -0500
-#   $ ruby optparse-test.rb  -t 9:30
-#   2014-08-13 09:30:00 -0400
-#
-# ==== Creating Custom Conversions
-#
-# The +accept+ method on Gem::OptionParser may be used to create converters.
-# It specifies which conversion block to call whenever a class is specified.
-# The example below uses it to fetch a +User+ object before the +on+ handler receives it.
-#
-#   require 'rubygems/optparse/lib/optparse'
-#
-#   User = Struct.new(:id, :name)
-#
-#   def find_user id
-#     not_found = ->{ raise "No User Found for id #{id}" }
-#     [ User.new(1, "Sam"),
-#       User.new(2, "Gandalf") ].find(not_found) do |u|
-#       u.id == id
-#     end
-#   end
-#
-#   op = Gem::OptionParser.new
-#   op.accept(User) do |user_id|
-#     find_user user_id.to_i
-#   end
-#
-#   op.on("--user ID", User) do |user|
-#     puts user
-#   end
-#
-#   op.parse!
-#
-# Used:
-#
-#   $ ruby optparse-test.rb --user 1
-#   #<struct User id=1, name="Sam">
-#   $ ruby optparse-test.rb --user 2
-#   #<struct User id=2, name="Gandalf">
-#   $ ruby optparse-test.rb --user 3
-#   optparse-test.rb:15:in `block in find_user': No User Found for id 3 (RuntimeError)
-#
-# === Store options to a Hash
-#
-# The +into+ option of +order+, +parse+ and so on methods stores command line options into a Hash.
-#
-#   require 'rubygems/optparse/lib/optparse'
-#
-#   options = {}
-#   Gem::OptionParser.new do |parser|
-#     parser.on('-a')
-#     parser.on('-b NUM', Integer)
-#     parser.on('-v', '--verbose')
-#   end.parse!(into: options)
-#
-#   p options
-#
-# Used:
-#
-#   $ ruby optparse-test.rb -a
-#   {:a=>true}
-#   $ ruby optparse-test.rb -a -v
-#   {:a=>true, :verbose=>true}
-#   $ ruby optparse-test.rb -a -b 100
-#   {:a=>true, :b=>100}
-#
-# === Complete example
-#
-# The following example is a complete Ruby program.  You can run it and see the
-# effect of specifying various options.  This is probably the best way to learn
-# the features of +optparse+.
-#
-#   require 'rubygems/optparse/lib/optparse'
-#   require 'rubygems/optparse/lib/optparse/time'
-#   require 'ostruct'
-#   require 'pp'
-#
-#   class OptparseExample
-#     Version = '1.0.0'
-#
-#     CODES = %w[iso-2022-jp shift_jis euc-jp utf8 binary]
-#     CODE_ALIASES = { "jis" => "iso-2022-jp", "sjis" => "shift_jis" }
-#
-#     class ScriptOptions
-#       attr_accessor :library, :inplace, :encoding, :transfer_type,
-#                     :verbose, :extension, :delay, :time, :record_separator,
-#                     :list
-#
-#       def initialize
-#         self.library = []
-#         self.inplace = false
-#         self.encoding = "utf8"
-#         self.transfer_type = :auto
-#         self.verbose = false
-#       end
-#
-#       def define_options(parser)
-#         parser.banner = "Usage: example.rb [options]"
-#         parser.separator ""
-#         parser.separator "Specific options:"
-#
-#         # add additional options
-#         perform_inplace_option(parser)
-#         delay_execution_option(parser)
-#         execute_at_time_option(parser)
-#         specify_record_separator_option(parser)
-#         list_example_option(parser)
-#         specify_encoding_option(parser)
-#         optional_option_argument_with_keyword_completion_option(parser)
-#         boolean_verbose_option(parser)
-#
-#         parser.separator ""
-#         parser.separator "Common options:"
-#         # No argument, shows at tail.  This will print an options summary.
-#         # Try it and see!
-#         parser.on_tail("-h", "--help", "Show this message") do
-#           puts parser
-#           exit
-#         end
-#         # Another typical switch to print the version.
-#         parser.on_tail("--version", "Show version") do
-#           puts Version
-#           exit
-#         end
-#       end
-#
-#       def perform_inplace_option(parser)
-#         # Specifies an optional option argument
-#         parser.on("-i", "--inplace [EXTENSION]",
-#                   "Edit ARGV files in place",
-#                   "(make backup if EXTENSION supplied)") do |ext|
-#           self.inplace = true
-#           self.extension = ext || ''
-#           self.extension.sub!(/\A\.?(?=.)/, ".")  # Ensure extension begins with dot.
-#         end
-#       end
-#
-#       def delay_execution_option(parser)
-#         # Cast 'delay' argument to a Float.
-#         parser.on("--delay N", Float, "Delay N seconds before executing") do |n|
-#           self.delay = n
-#         end
-#       end
-#
-#       def execute_at_time_option(parser)
-#         # Cast 'time' argument to a Time object.
-#         parser.on("-t", "--time [TIME]", Time, "Begin execution at given time") do |time|
-#           self.time = time
-#         end
-#       end
-#
-#       def specify_record_separator_option(parser)
-#         # Cast to octal integer.
-#         parser.on("-F", "--irs [OCTAL]", Gem::OptionParser::OctalInteger,
-#                   "Specify record separator (default \\0)") do |rs|
-#           self.record_separator = rs
-#         end
-#       end
-#
-#       def list_example_option(parser)
-#         # List of arguments.
-#         parser.on("--list x,y,z", Array, "Example 'list' of arguments") do |list|
-#           self.list = list
-#         end
-#       end
-#
-#       def specify_encoding_option(parser)
-#         # Keyword completion.  We are specifying a specific set of arguments (CODES
-#         # and CODE_ALIASES - notice the latter is a Hash), and the user may provide
-#         # the shortest unambiguous text.
-#         code_list = (CODE_ALIASES.keys + CODES).join(', ')
-#         parser.on("--code CODE", CODES, CODE_ALIASES, "Select encoding",
-#                   "(#{code_list})") do |encoding|
-#           self.encoding = encoding
-#         end
-#       end
-#
-#       def optional_option_argument_with_keyword_completion_option(parser)
-#         # Optional '--type' option argument with keyword completion.
-#         parser.on("--type [TYPE]", [:text, :binary, :auto],
-#                   "Select transfer type (text, binary, auto)") do |t|
-#           self.transfer_type = t
-#         end
-#       end
-#
-#       def boolean_verbose_option(parser)
-#         # Boolean switch.
-#         parser.on("-v", "--[no-]verbose", "Run verbosely") do |v|
-#           self.verbose = v
-#         end
-#       end
-#     end
-#
-#     #
-#     # Return a structure describing the options.
-#     #
-#     def parse(args)
-#       # The options specified on the command line will be collected in
-#       # *options*.
-#
-#       @options = ScriptOptions.new
-#       @args = Gem::OptionParser.new do |parser|
-#         @options.define_options(parser)
-#         parser.parse!(args)
-#       end
-#       @options
-#     end
-#
-#     attr_reader :parser, :options
-#   end  # class OptparseExample
-#
-#   example = OptparseExample.new
-#   options = example.parse(ARGV)
-#   pp options # example.options
-#   pp ARGV
-#
-# === Shell Completion
-#
-# For modern shells (e.g. bash, zsh, etc.), you can use shell
-# completion for command line options.
-#
-# === Further documentation
-#
-# The above examples, along with the accompanying
-# {Tutorial}[optparse/tutorial.rdoc],
-# should be enough to learn how to use this class.
-# If you have any questions, file a ticket at http://bugs.ruby-lang.org.
-#
-class Gem::OptionParser
-  Gem::OptionParser::Version = "0.3.0"
-
-  # :stopdoc:
-  NoArgument = [NO_ARGUMENT = :NONE, nil].freeze
-  RequiredArgument = [REQUIRED_ARGUMENT = :REQUIRED, true].freeze
-  OptionalArgument = [OPTIONAL_ARGUMENT = :OPTIONAL, false].freeze
-  # :startdoc:
-
-  #
-  # Keyword completion module.  This allows partial arguments to be specified
-  # and resolved against a list of acceptable values.
-  #
-  module Completion
-    def self.regexp(key, icase)
-      Regexp.new('\A' + Regexp.quote(key).gsub(/\w+\b/, '\&\w*'), icase)
-    end
-
-    def self.candidate(key, icase = false, pat = nil, &block)
-      pat ||= Completion.regexp(key, icase)
-      candidates = []
-      block.call do |k, *v|
-        (if Regexp === k
-           kn = ""
-           k === key
-         else
-           kn = defined?(k.id2name) ? k.id2name : k
-           pat === kn
-         end) or next
-        v << k if v.empty?
-        candidates << [k, v, kn]
-      end
-      candidates
-    end
-
-    def candidate(key, icase = false, pat = nil)
-      Completion.candidate(key, icase, pat, &method(:each))
-    end
-
-    public
-    def complete(key, icase = false, pat = nil)
-      candidates = candidate(key, icase, pat, &method(:each)).sort_by {|k, v, kn| kn.size}
-      if candidates.size == 1
-        canon, sw, * = candidates[0]
-      elsif candidates.size > 1
-        canon, sw, cn = candidates.shift
-        candidates.each do |k, v, kn|
-          next if sw == v
-          if String === cn and String === kn
-            if cn.rindex(kn, 0)
-              canon, sw, cn = k, v, kn
-              next
-            elsif kn.rindex(cn, 0)
-              next
-            end
-          end
-          throw :ambiguous, key
-        end
-      end
-      if canon
-        block_given? or return key, *sw
-        yield(key, *sw)
-      end
-    end
-
-    def convert(opt = nil, val = nil, *)
-      val
-    end
-  end
-
-
-  #
-  # Map from option/keyword string to object with completion.
-  #
-  class OptionMap < Hash
-    include Completion
-  end
-
-
-  #
-  # Individual switch class.  Not important to the user.
-  #
-  # Defined within Switch are several Switch-derived classes: NoArgument,
-  # RequiredArgument, etc.
-  #
-  class Switch
-    attr_reader :pattern, :conv, :short, :long, :arg, :desc, :block
-
-    #
-    # Guesses argument style from +arg+.  Returns corresponding
-    # Gem::OptionParser::Switch class (OptionalArgument, etc.).
-    #
-    def self.guess(arg)
-      case arg
-      when ""
-        t = self
-      when /\A=?\[/
-        t = Switch::OptionalArgument
-      when /\A\s+\[/
-        t = Switch::PlacedArgument
-      else
-        t = Switch::RequiredArgument
-      end
-      self >= t or incompatible_argument_styles(arg, t)
-      t
-    end
-
-    def self.incompatible_argument_styles(arg, t)
-      raise(ArgumentError, "#{arg}: incompatible argument styles\n  #{self}, #{t}",
-            ParseError.filter_backtrace(caller(2)))
-    end
-
-    def self.pattern
-      NilClass
-    end
-
-    def initialize(pattern = nil, conv = nil,
-                   short = nil, long = nil, arg = nil,
-                   desc = ([] if short or long), block = nil, &_block)
-      raise if Array === pattern
-      block ||= _block
-      @pattern, @conv, @short, @long, @arg, @desc, @block =
-        pattern, conv, short, long, arg, desc, block
-    end
-
-    #
-    # Parses +arg+ and returns rest of +arg+ and matched portion to the
-    # argument pattern. Yields when the pattern doesn't match substring.
-    #
-    def parse_arg(arg) # :nodoc:
-      pattern or return nil, [arg]
-      unless m = pattern.match(arg)
-        yield(InvalidArgument, arg)
-        return arg, []
-      end
-      if String === m
-        m = [s = m]
-      else
-        m = m.to_a
-        s = m[0]
-        return nil, m unless String === s
-      end
-      raise InvalidArgument, arg unless arg.rindex(s, 0)
-      return nil, m if s.length == arg.length
-      yield(InvalidArgument, arg) # didn't match whole arg
-      return arg[s.length..-1], m
-    end
-    private :parse_arg
-
-    #
-    # Parses argument, converts and returns +arg+, +block+ and result of
-    # conversion. Yields at semi-error condition instead of raising an
-    # exception.
-    #
-    def conv_arg(arg, val = []) # :nodoc:
-      if conv
-        val = conv.call(*val)
-      else
-        val = proc {|v| v}.call(*val)
-      end
-      return arg, block, val
-    end
-    private :conv_arg
-
-    #
-    # Produces the summary text. Each line of the summary is yielded to the
-    # block (without newline).
-    #
-    # +sdone+::  Already summarized short style options keyed hash.
-    # +ldone+::  Already summarized long style options keyed hash.
-    # +width+::  Width of left side (option part). In other words, the right
-    #            side (description part) starts after +width+ columns.
-    # +max+::    Maximum width of left side -> the options are filled within
-    #            +max+ columns.
-    # +indent+:: Prefix string indents all summarized lines.
-    #
-    def summarize(sdone = {}, ldone = {}, width = 1, max = width - 1, indent = "")
-      sopts, lopts = [], [], nil
-      @short.each {|s| sdone.fetch(s) {sopts << s}; sdone[s] = true} if @short
-      @long.each {|s| ldone.fetch(s) {lopts << s}; ldone[s] = true} if @long
-      return if sopts.empty? and lopts.empty? # completely hidden
-
-      left = [sopts.join(', ')]
-      right = desc.dup
-
-      while s = lopts.shift
-        l = left[-1].length + s.length
-        l += arg.length if left.size == 1 && arg
-        l < max or sopts.empty? or left << +''
-        left[-1] << (left[-1].empty? ? ' ' * 4 : ', ') << s
-      end
-
-      if arg
-        left[0] << (left[1] ? arg.sub(/\A(\[?)=/, '\1') + ',' : arg)
-      end
-      mlen = left.collect {|ss| ss.length}.max.to_i
-      while mlen > width and l = left.shift
-        mlen = left.collect {|ss| ss.length}.max.to_i if l.length == mlen
-        if l.length < width and (r = right[0]) and !r.empty?
-          l = l.to_s.ljust(width) + ' ' + r
-          right.shift
-        end
-        yield(indent + l)
-      end
-
-      while begin l = left.shift; r = right.shift; l or r end
-        l = l.to_s.ljust(width) + ' ' + r if r and !r.empty?
-        yield(indent + l)
-      end
-
-      self
-    end
-
-    def add_banner(to)  # :nodoc:
-      unless @short or @long
-        s = desc.join
-        to << " [" + s + "]..." unless s.empty?
-      end
-      to
-    end
-
-    def match_nonswitch?(str)  # :nodoc:
-      @pattern =~ str unless @short or @long
-    end
-
-    #
-    # Main name of the switch.
-    #
-    def switch_name
-      (long.first || short.first).sub(/\A-+(?:\[no-\])?/, '')
-    end
-
-    def compsys(sdone, ldone)   # :nodoc:
-      sopts, lopts = [], []
-      @short.each {|s| sdone.fetch(s) {sopts << s}; sdone[s] = true} if @short
-      @long.each {|s| ldone.fetch(s) {lopts << s}; ldone[s] = true} if @long
-      return if sopts.empty? and lopts.empty? # completely hidden
-
-      (sopts+lopts).each do |opt|
-        # "(-x -c -r)-l[left justify]"
-        if /^--\[no-\](.+)$/ =~ opt
-          o = $1
-          yield("--#{o}", desc.join(""))
-          yield("--no-#{o}", desc.join(""))
-        else
-          yield("#{opt}", desc.join(""))
-        end
-      end
-    end
-
-    def pretty_print_contents(q) # :nodoc:
-      if @block
-        q.text ":" + @block.source_location.join(":") + ":"
-        first = false
-      else
-        first = true
-      end
-      [@short, @long].each do |list|
-        list.each do |opt|
-          if first
-            q.text ":"
-            first = false
-          end
-          q.breakable
-          q.text opt
-        end
-      end
-    end
-
-    def pretty_print(q)         # :nodoc:
-      q.object_group(self) {pretty_print_contents(q)}
-    end
-
-    #
-    # Switch that takes no arguments.
-    #
-    class NoArgument < self
-
-      #
-      # Raises an exception if any arguments given.
-      #
-      def parse(arg, argv)
-        yield(NeedlessArgument, arg) if arg
-        conv_arg(arg)
-      end
-
-      def self.incompatible_argument_styles(*)
-      end
-
-      def self.pattern
-        Object
-      end
-
-      def pretty_head           # :nodoc:
-        "NoArgument"
-      end
-    end
-
-    #
-    # Switch that takes an argument.
-    #
-    class RequiredArgument < self
-
-      #
-      # Raises an exception if argument is not present.
-      #
-      def parse(arg, argv)
-        unless arg
-          raise MissingArgument if argv.empty?
-          arg = argv.shift
-        end
-        conv_arg(*parse_arg(arg, &method(:raise)))
-      end
-
-      def pretty_head           # :nodoc:
-        "Required"
-      end
-    end
-
-    #
-    # Switch that can omit argument.
-    #
-    class OptionalArgument < self
-
-      #
-      # Parses argument if given, or uses default value.
-      #
-      def parse(arg, argv, &error)
-        if arg
-          conv_arg(*parse_arg(arg, &error))
-        else
-          conv_arg(arg)
-        end
-      end
-
-      def pretty_head           # :nodoc:
-        "Optional"
-      end
-    end
-
-    #
-    # Switch that takes an argument, which does not begin with '-' or is '-'.
-    #
-    class PlacedArgument < self
-
-      #
-      # Returns nil if argument is not present or begins with '-' and is not '-'.
-      #
-      def parse(arg, argv, &error)
-        if !(val = arg) and (argv.empty? or /\A-./ =~ (val = argv[0]))
-          return nil, block, nil
-        end
-        opt = (val = parse_arg(val, &error))[1]
-        val = conv_arg(*val)
-        if opt and !arg
-          argv.shift
-        else
-          val[0] = nil
-        end
-        val
-      end
-
-      def pretty_head           # :nodoc:
-        "Placed"
-      end
-    end
-  end
-
-  #
-  # Simple option list providing mapping from short and/or long option
-  # string to Gem::OptionParser::Switch and mapping from acceptable argument to
-  # matching pattern and converter pair. Also provides summary feature.
-  #
-  class List
-    # Map from acceptable argument types to pattern and converter pairs.
-    attr_reader :atype
-
-    # Map from short style option switches to actual switch objects.
-    attr_reader :short
-
-    # Map from long style option switches to actual switch objects.
-    attr_reader :long
-
-    # List of all switches and summary string.
-    attr_reader :list
-
-    #
-    # Just initializes all instance variables.
-    #
-    def initialize
-      @atype = {}
-      @short = OptionMap.new
-      @long = OptionMap.new
-      @list = []
-    end
-
-    def pretty_print(q)         # :nodoc:
-      q.group(1, "(", ")") do
-        @list.each do |sw|
-          next unless Switch === sw
-          q.group(1, "(" + sw.pretty_head, ")") do
-            sw.pretty_print_contents(q)
-          end
-        end
-      end
-    end
-
-    #
-    # See Gem::OptionParser.accept.
-    #
-    def accept(t, pat = /.*/m, &block)
-      if pat
-        pat.respond_to?(:match) or
-          raise TypeError, "has no `match'", ParseError.filter_backtrace(caller(2))
-      else
-        pat = t if t.respond_to?(:match)
-      end
-      unless block
-        block = pat.method(:convert).to_proc if pat.respond_to?(:convert)
-      end
-      @atype[t] = [pat, block]
-    end
-
-    #
-    # See Gem::OptionParser.reject.
-    #
-    def reject(t)
-      @atype.delete(t)
-    end
-
-    #
-    # Adds +sw+ according to +sopts+, +lopts+ and +nlopts+.
-    #
-    # +sw+::     Gem::OptionParser::Switch instance to be added.
-    # +sopts+::  Short style option list.
-    # +lopts+::  Long style option list.
-    # +nlopts+:: Negated long style options list.
-    #
-    def update(sw, sopts, lopts, nsw = nil, nlopts = nil) # :nodoc:
-      sopts.each {|o| @short[o] = sw} if sopts
-      lopts.each {|o| @long[o] = sw} if lopts
-      nlopts.each {|o| @long[o] = nsw} if nsw and nlopts
-      used = @short.invert.update(@long.invert)
-      @list.delete_if {|o| Switch === o and !used[o]}
-    end
-    private :update
-
-    #
-    # Inserts +switch+ at the head of the list, and associates short, long
-    # and negated long options. Arguments are:
-    #
-    # +switch+::      Gem::OptionParser::Switch instance to be inserted.
-    # +short_opts+::  List of short style options.
-    # +long_opts+::   List of long style options.
-    # +nolong_opts+:: List of long style options with "no-" prefix.
-    #
-    #   prepend(switch, short_opts, long_opts, nolong_opts)
-    #
-    def prepend(*args)
-      update(*args)
-      @list.unshift(args[0])
-    end
-
-    #
-    # Appends +switch+ at the tail of the list, and associates short, long
-    # and negated long options. Arguments are:
-    #
-    # +switch+::      Gem::OptionParser::Switch instance to be inserted.
-    # +short_opts+::  List of short style options.
-    # +long_opts+::   List of long style options.
-    # +nolong_opts+:: List of long style options with "no-" prefix.
-    #
-    #   append(switch, short_opts, long_opts, nolong_opts)
-    #
-    def append(*args)
-      update(*args)
-      @list.push(args[0])
-    end
-
-    #
-    # Searches +key+ in +id+ list. The result is returned or yielded if a
-    # block is given. If it isn't found, nil is returned.
-    #
-    def search(id, key)
-      if list = __send__(id)
-        val = list.fetch(key) {return nil}
-        block_given? ? yield(val) : val
-      end
-    end
-
-    #
-    # Searches list +id+ for +opt+ and the optional patterns for completion
-    # +pat+. If +icase+ is true, the search is case insensitive. The result
-    # is returned or yielded if a block is given. If it isn't found, nil is
-    # returned.
-    #
-    def complete(id, opt, icase = false, *pat, &block)
-      __send__(id).complete(opt, icase, *pat, &block)
-    end
-
-    def get_candidates(id)
-      yield __send__(id).keys
-    end
-
-    #
-    # Iterates over each option, passing the option to the +block+.
-    #
-    def each_option(&block)
-      list.each(&block)
-    end
-
-    #
-    # Creates the summary table, passing each line to the +block+ (without
-    # newline). The arguments +args+ are passed along to the summarize
-    # method which is called on every option.
-    #
-    def summarize(*args, &block)
-      sum = []
-      list.reverse_each do |opt|
-        if opt.respond_to?(:summarize) # perhaps Gem::OptionParser::Switch
-          s = []
-          opt.summarize(*args) {|l| s << l}
-          sum.concat(s.reverse)
-        elsif !opt or opt.empty?
-          sum << ""
-        elsif opt.respond_to?(:each_line)
-          sum.concat([*opt.each_line].reverse)
-        else
-          sum.concat([*opt.each].reverse)
-        end
-      end
-      sum.reverse_each(&block)
-    end
-
-    def add_banner(to)  # :nodoc:
-      list.each do |opt|
-        if opt.respond_to?(:add_banner)
-          opt.add_banner(to)
-        end
-      end
-      to
-    end
-
-    def compsys(*args, &block)  # :nodoc:
-      list.each do |opt|
-        if opt.respond_to?(:compsys)
-          opt.compsys(*args, &block)
-        end
-      end
-    end
-  end
-
-  #
-  # Hash with completion search feature. See Gem::OptionParser::Completion.
-  #
-  class CompletingHash < Hash
-    include Completion
-
-    #
-    # Completion for hash key.
-    #
-    def match(key)
-      *values = fetch(key) {
-        raise AmbiguousArgument, catch(:ambiguous) {return complete(key)}
-      }
-      return key, *values
-    end
-  end
-
-  # :stopdoc:
-
-  #
-  # Enumeration of acceptable argument styles. Possible values are:
-  #
-  # NO_ARGUMENT::       The switch takes no arguments. (:NONE)
-  # REQUIRED_ARGUMENT:: The switch requires an argument. (:REQUIRED)
-  # OPTIONAL_ARGUMENT:: The switch requires an optional argument. (:OPTIONAL)
-  #
-  # Use like --switch=argument (long style) or -Xargument (short style). For
-  # short style, only portion matched to argument pattern is treated as
-  # argument.
-  #
-  ArgumentStyle = {}
-  NoArgument.each {|el| ArgumentStyle[el] = Switch::NoArgument}
-  RequiredArgument.each {|el| ArgumentStyle[el] = Switch::RequiredArgument}
-  OptionalArgument.each {|el| ArgumentStyle[el] = Switch::OptionalArgument}
-  ArgumentStyle.freeze
-
-  #
-  # Switches common used such as '--', and also provides default
-  # argument classes
-  #
-  DefaultList = List.new
-  DefaultList.short['-'] = Switch::NoArgument.new {}
-  DefaultList.long[''] = Switch::NoArgument.new {throw :terminate}
-
-
-  COMPSYS_HEADER = <<'XXX'      # :nodoc:
-
-typeset -A opt_args
-local context state line
-
-_arguments -s -S \
-XXX
-
-  def compsys(to, name = File.basename($0)) # :nodoc:
-    to << "#compdef #{name}\n"
-    to << COMPSYS_HEADER
-    visit(:compsys, {}, {}) {|o, d|
-      to << %Q[  "#{o}[#{d.gsub(/[\"\[\]]/, '\\\\\&')}]" \\\n]
-    }
-    to << "  '*:file:_files' && return 0\n"
-  end
-
-  #
-  # Default options for ARGV, which never appear in option summary.
-  #
-  Officious = {}
-
-  #
-  # --help
-  # Shows option summary.
-  #
-  Officious['help'] = proc do |parser|
-    Switch::NoArgument.new do |arg|
-      puts parser.help
-      exit
-    end
-  end
-
-  #
-  # --*-completion-bash=WORD
-  # Shows candidates for command line completion.
-  #
-  Officious['*-completion-bash'] = proc do |parser|
-    Switch::RequiredArgument.new do |arg|
-      puts parser.candidate(arg)
-      exit
-    end
-  end
-
-  #
-  # --*-completion-zsh[=NAME:FILE]
-  # Creates zsh completion file.
-  #
-  Officious['*-completion-zsh'] = proc do |parser|
-    Switch::OptionalArgument.new do |arg|
-      parser.compsys(STDOUT, arg)
-      exit
-    end
-  end
-
-  #
-  # --version
-  # Shows version string if Version is defined.
-  #
-  Officious['version'] = proc do |parser|
-    Switch::OptionalArgument.new do |pkg|
-      if pkg
-        begin
-          require 'rubygems/optparse/lib/optparse/version'
-        rescue LoadError
-        else
-          show_version(*pkg.split(/,/)) or
-            abort("#{parser.program_name}: no version found in package #{pkg}")
-          exit
-        end
-      end
-      v = parser.ver or abort("#{parser.program_name}: version unknown")
-      puts v
-      exit
-    end
-  end
-
-  # :startdoc:
-
-  #
-  # Class methods
-  #
-
-  #
-  # Initializes a new instance and evaluates the optional block in context
-  # of the instance. Arguments +args+ are passed to #new, see there for
-  # description of parameters.
-  #
-  # This method is *deprecated*, its behavior corresponds to the older #new
-  # method.
-  #
-  def self.with(*args, &block)
-    opts = new(*args)
-    opts.instance_eval(&block)
-    opts
-  end
-
-  #
-  # Returns an incremented value of +default+ according to +arg+.
-  #
-  def self.inc(arg, default = nil)
-    case arg
-    when Integer
-      arg.nonzero?
-    when nil
-      default.to_i + 1
-    end
-  end
-  def inc(*args)
-    self.class.inc(*args)
-  end
-
-  #
-  # Initializes the instance and yields itself if called with a block.
-  #
-  # +banner+:: Banner message.
-  # +width+::  Summary width.
-  # +indent+:: Summary indent.
-  #
-  def initialize(banner = nil, width = 32, indent = ' ' * 4)
-    @stack = [DefaultList, List.new, List.new]
-    @program_name = nil
-    @banner = banner
-    @summary_width = width
-    @summary_indent = indent
-    @default_argv = ARGV
-    @require_exact = false
-    @raise_unknown = true
-    add_officious
-    yield self if block_given?
-  end
-
-  def add_officious  # :nodoc:
-    list = base()
-    Officious.each do |opt, block|
-      list.long[opt] ||= block.call(self)
-    end
-  end
-
-  #
-  # Terminates option parsing. Optional parameter +arg+ is a string pushed
-  # back to be the first non-option argument.
-  #
-  def terminate(arg = nil)
-    self.class.terminate(arg)
-  end
-  def self.terminate(arg = nil)
-    throw :terminate, arg
-  end
-
-  @stack = [DefaultList]
-  def self.top() DefaultList end
-
-  #
-  # Directs to accept specified class +t+. The argument string is passed to
-  # the block in which it should be converted to the desired class.
-  #
-  # +t+::   Argument class specifier, any object including Class.
-  # +pat+:: Pattern for argument, defaults to +t+ if it responds to match.
-  #
-  #   accept(t, pat, &block)
-  #
-  def accept(*args, &blk) top.accept(*args, &blk) end
-  #
-  # See #accept.
-  #
-  def self.accept(*args, &blk) top.accept(*args, &blk) end
-
-  #
-  # Directs to reject specified class argument.
-  #
-  # +t+:: Argument class specifier, any object including Class.
-  #
-  #   reject(t)
-  #
-  def reject(*args, &blk) top.reject(*args, &blk) end
-  #
-  # See #reject.
-  #
-  def self.reject(*args, &blk) top.reject(*args, &blk) end
-
-  #
-  # Instance methods
-  #
-
-  # Heading banner preceding summary.
-  attr_writer :banner
-
-  # Program name to be emitted in error message and default banner,
-  # defaults to $0.
-  attr_writer :program_name
-
-  # Width for option list portion of summary. Must be Numeric.
-  attr_accessor :summary_width
-
-  # Indentation for summary. Must be String (or have + String method).
-  attr_accessor :summary_indent
-
-  # Strings to be parsed in default.
-  attr_accessor :default_argv
-
-  # Whether to require that options match exactly (disallows providing
-  # abbreviated long option as short option).
-  attr_accessor :require_exact
-
-  # Whether to raise at unknown option.
-  attr_accessor :raise_unknown
-
-  #
-  # Heading banner preceding summary.
-  #
-  def banner
-    unless @banner
-      @banner = +"Usage: #{program_name} [options]"
-      visit(:add_banner, @banner)
-    end
-    @banner
-  end
-
-  #
-  # Program name to be emitted in error message and default banner, defaults
-  # to $0.
-  #
-  def program_name
-    @program_name || File.basename($0, '.*')
-  end
-
-  # for experimental cascading :-)
-  alias set_banner banner=
-  alias set_program_name program_name=
-  alias set_summary_width summary_width=
-  alias set_summary_indent summary_indent=
-
-  # Version
-  attr_writer :version
-  # Release code
-  attr_writer :release
-
-  #
-  # Version
-  #
-  def version
-    (defined?(@version) && @version) || (defined?(::Version) && ::Version)
-  end
-
-  #
-  # Release code
-  #
-  def release
-    (defined?(@release) && @release) || (defined?(::Release) && ::Release) || (defined?(::RELEASE) && ::RELEASE)
-  end
-
-  #
-  # Returns version string from program_name, version and release.
-  #
-  def ver
-    if v = version
-      str = +"#{program_name} #{[v].join('.')}"
-      str << " (#{v})" if v = release
-      str
-    end
-  end
-
-  def warn(mesg = $!)
-    super("#{program_name}: #{mesg}")
-  end
-
-  def abort(mesg = $!)
-    super("#{program_name}: #{mesg}")
-  end
-
-  #
-  # Subject of #on / #on_head, #accept / #reject
-  #
-  def top
-    @stack[-1]
-  end
-
-  #
-  # Subject of #on_tail.
-  #
-  def base
-    @stack[1]
-  end
-
-  #
-  # Pushes a new List.
-  #
-  def new
-    @stack.push(List.new)
-    if block_given?
-      yield self
-    else
-      self
-    end
-  end
-
-  #
-  # Removes the last List.
-  #
-  def remove
-    @stack.pop
-  end
-
-  #
-  # Puts option summary into +to+ and returns +to+. Yields each line if
-  # a block is given.
-  #
-  # +to+:: Output destination, which must have method <<. Defaults to [].
-  # +width+:: Width of left side, defaults to @summary_width.
-  # +max+:: Maximum length allowed for left side, defaults to +width+ - 1.
-  # +indent+:: Indentation, defaults to @summary_indent.
-  #
-  def summarize(to = [], width = @summary_width, max = width - 1, indent = @summary_indent, &blk)
-    nl = "\n"
-    blk ||= proc {|l| to << (l.index(nl, -1) ? l : l + nl)}
-    visit(:summarize, {}, {}, width, max, indent, &blk)
-    to
-  end
-
-  #
-  # Returns option summary string.
-  #
-  def help; summarize("#{banner}".sub(/\n?\z/, "\n")) end
-  alias to_s help
-
-  def pretty_print(q)           # :nodoc:
-    q.object_group(self) do
-      first = true
-      if @stack.size > 2
-        @stack.each_with_index do |s, i|
-          next if i < 2
-          next if s.list.empty?
-          if first
-            first = false
-            q.text ":"
-          end
-          q.breakable
-          s.pretty_print(q)
-        end
-      end
-    end
-  end
-
-  def inspect                   # :nodoc:
-    require 'pp'
-    pretty_print_inspect
-  end
-
-  #
-  # Returns option summary list.
-  #
-  def to_a; summarize("#{banner}".split(/^/)) end
-
-  #
-  # Checks if an argument is given twice, in which case an ArgumentError is
-  # raised. Called from Gem::OptionParser#switch only.
-  #
-  # +obj+:: New argument.
-  # +prv+:: Previously specified argument.
-  # +msg+:: Exception message.
-  #
-  def notwice(obj, prv, msg) # :nodoc:
-    unless !prv or prv == obj
-      raise(ArgumentError, "argument #{msg} given twice: #{obj}",
-            ParseError.filter_backtrace(caller(2)))
-    end
-    obj
-  end
-  private :notwice
-
-  SPLAT_PROC = proc {|*a| a.length <= 1 ? a.first : a} # :nodoc:
-
-  # :call-seq:
-  #   make_switch(params, block = nil)
-  #
-  # :include: ../doc/optparse/creates_option.rdoc
-  #
-  def make_switch(opts, block = nil)
-    short, long, nolong, style, pattern, conv, not_pattern, not_conv, not_style = [], [], []
-    ldesc, sdesc, desc, arg = [], [], []
-    default_style = Switch::NoArgument
-    default_pattern = nil
-    klass = nil
-    q, a = nil
-    has_arg = false
-
-    opts.each do |o|
-      # argument class
-      next if search(:atype, o) do |pat, c|
-        klass = notwice(o, klass, 'type')
-        if not_style and not_style != Switch::NoArgument
-          not_pattern, not_conv = pat, c
-        else
-          default_pattern, conv = pat, c
-        end
-      end
-
-      # directly specified pattern(any object possible to match)
-      if (!(String === o || Symbol === o)) and o.respond_to?(:match)
-        pattern = notwice(o, pattern, 'pattern')
-        if pattern.respond_to?(:convert)
-          conv = pattern.method(:convert).to_proc
-        else
-          conv = SPLAT_PROC
-        end
-        next
-      end
-
-      # anything others
-      case o
-      when Proc, Method
-        block = notwice(o, block, 'block')
-      when Array, Hash
-        case pattern
-        when CompletingHash
-        when nil
-          pattern = CompletingHash.new
-          conv = pattern.method(:convert).to_proc if pattern.respond_to?(:convert)
-        else
-          raise ArgumentError, "argument pattern given twice"
-        end
-        o.each {|pat, *v| pattern[pat] = v.fetch(0) {pat}}
-      when Module
-        raise ArgumentError, "unsupported argument type: #{o}", ParseError.filter_backtrace(caller(4))
-      when *ArgumentStyle.keys
-        style = notwice(ArgumentStyle[o], style, 'style')
-      when /^--no-([^\[\]=\s]*)(.+)?/
-        q, a = $1, $2
-        o = notwice(a ? Object : TrueClass, klass, 'type')
-        not_pattern, not_conv = search(:atype, o) unless not_style
-        not_style = (not_style || default_style).guess(arg = a) if a
-        default_style = Switch::NoArgument
-        default_pattern, conv = search(:atype, FalseClass) unless default_pattern
-        ldesc << "--no-#{q}"
-        (q = q.downcase).tr!('_', '-')
-        long << "no-#{q}"
-        nolong << q
-      when /^--\[no-\]([^\[\]=\s]*)(.+)?/
-        q, a = $1, $2
-        o = notwice(a ? Object : TrueClass, klass, 'type')
-        if a
-          default_style = default_style.guess(arg = a)
-          default_pattern, conv = search(:atype, o) unless default_pattern
-        end
-        ldesc << "--[no-]#{q}"
-        (o = q.downcase).tr!('_', '-')
-        long << o
-        not_pattern, not_conv = search(:atype, FalseClass) unless not_style
-        not_style = Switch::NoArgument
-        nolong << "no-#{o}"
-      when /^--([^\[\]=\s]*)(.+)?/
-        q, a = $1, $2
-        if a
-          o = notwice(NilClass, klass, 'type')
-          default_style = default_style.guess(arg = a)
-          default_pattern, conv = search(:atype, o) unless default_pattern
-        end
-        ldesc << "--#{q}"
-        (o = q.downcase).tr!('_', '-')
-        long << o
-      when /^-(\[\^?\]?(?:[^\\\]]|\\.)*\])(.+)?/
-        q, a = $1, $2
-        o = notwice(Object, klass, 'type')
-        if a
-          default_style = default_style.guess(arg = a)
-          default_pattern, conv = search(:atype, o) unless default_pattern
-        else
-          has_arg = true
-        end
-        sdesc << "-#{q}"
-        short << Regexp.new(q)
-      when /^-(.)(.+)?/
-        q, a = $1, $2
-        if a
-          o = notwice(NilClass, klass, 'type')
-          default_style = default_style.guess(arg = a)
-          default_pattern, conv = search(:atype, o) unless default_pattern
-        end
-        sdesc << "-#{q}"
-        short << q
-      when /^=/
-        style = notwice(default_style.guess(arg = o), style, 'style')
-        default_pattern, conv = search(:atype, Object) unless default_pattern
-      else
-        desc.push(o) if o && !o.empty?
-      end
-    end
-
-    default_pattern, conv = search(:atype, default_style.pattern) unless default_pattern
-    if !(short.empty? and long.empty?)
-      if has_arg and default_style == Switch::NoArgument
-        default_style = Switch::RequiredArgument
-      end
-      s = (style || default_style).new(pattern || default_pattern,
-                                       conv, sdesc, ldesc, arg, desc, block)
-    elsif !block
-      if style or pattern
-        raise ArgumentError, "no switch given", ParseError.filter_backtrace(caller)
-      end
-      s = desc
-    else
-      short << pattern
-      s = (style || default_style).new(pattern,
-                                       conv, nil, nil, arg, desc, block)
-    end
-    return s, short, long,
-      (not_style.new(not_pattern, not_conv, sdesc, ldesc, nil, desc, block) if not_style),
-      nolong
-  end
-
-  # :call-seq:
-  #   define(*params, &block)
-  #
-  # :include: ../doc/optparse/creates_option.rdoc
-  #
-  def define(*opts, &block)
-    top.append(*(sw = make_switch(opts, block)))
-    sw[0]
-  end
-
-  # :call-seq:
-  #   on(*params, &block)
-  #
-  # :include: ../doc/optparse/creates_option.rdoc
-  #
-  def on(*opts, &block)
-    define(*opts, &block)
-    self
-  end
-  alias def_option define
-
-  # :call-seq:
-  #   define_head(*params, &block)
-  #
-  # :include: ../doc/optparse/creates_option.rdoc
-  #
-  def define_head(*opts, &block)
-    top.prepend(*(sw = make_switch(opts, block)))
-    sw[0]
-  end
-
-  # :call-seq:
-  #   on_head(*params, &block)
-  #
-  # :include: ../doc/optparse/creates_option.rdoc
-  #
-  # The new option is added at the head of the summary.
-  #
-  def on_head(*opts, &block)
-    define_head(*opts, &block)
-    self
-  end
-  alias def_head_option define_head
-
-  # :call-seq:
-  #   define_tail(*params, &block)
-  #
-  # :include: ../doc/optparse/creates_option.rdoc
-  #
-  def define_tail(*opts, &block)
-    base.append(*(sw = make_switch(opts, block)))
-    sw[0]
-  end
-
-  #
-  # :call-seq:
-  #   on_tail(*params, &block)
-  #
-  # :include: ../doc/optparse/creates_option.rdoc
-  #
-  # The new option is added at the tail of the summary.
-  #
-  def on_tail(*opts, &block)
-    define_tail(*opts, &block)
-    self
-  end
-  alias def_tail_option define_tail
-
-  #
-  # Add separator in summary.
-  #
-  def separator(string)
-    top.append(string, nil, nil)
-  end
-
-  #
-  # Parses command line arguments +argv+ in order. When a block is given,
-  # each non-option argument is yielded. When optional +into+ keyword
-  # argument is provided, the parsed option values are stored there via
-  # <code>[]=</code> method (so it can be Hash, or OpenStruct, or other
-  # similar object).
-  #
-  # Returns the rest of +argv+ left unparsed.
-  #
-  def order(*argv, into: nil, &nonopt)
-    argv = argv[0].dup if argv.size == 1 and Array === argv[0]
-    order!(argv, into: into, &nonopt)
-  end
-
-  #
-  # Same as #order, but removes switches destructively.
-  # Non-option arguments remain in +argv+.
-  #
-  def order!(argv = default_argv, into: nil, &nonopt)
-    setter = ->(name, val) {into[name.to_sym] = val} if into
-    parse_in_order(argv, setter, &nonopt)
-  end
-
-  def parse_in_order(argv = default_argv, setter = nil, &nonopt)  # :nodoc:
-    opt, arg, val, rest = nil
-    nonopt ||= proc {|a| throw :terminate, a}
-    argv.unshift(arg) if arg = catch(:terminate) {
-      while arg = argv.shift
-        case arg
-        # long option
-        when /\A--([^=]*)(?:=(.*))?/m
-          opt, rest = $1, $2
-          opt.tr!('_', '-')
-          begin
-            sw, = complete(:long, opt, true)
-            if require_exact && !sw.long.include?(arg)
-              throw :terminate, arg unless raise_unknown
-              raise InvalidOption, arg
-            end
-          rescue ParseError
-            throw :terminate, arg unless raise_unknown
-            raise $!.set_option(arg, true)
-          end
-          begin
-            opt, cb, val = sw.parse(rest, argv) {|*exc| raise(*exc)}
-            val = cb.call(val) if cb
-            setter.call(sw.switch_name, val) if setter
-          rescue ParseError
-            raise $!.set_option(arg, rest)
-          end
-
-        # short option
-        when /\A-(.)((=).*|.+)?/m
-          eq, rest, opt = $3, $2, $1
-          has_arg, val = eq, rest
-          begin
-            sw, = search(:short, opt)
-            unless sw
-              begin
-                sw, = complete(:short, opt)
-                # short option matched.
-                val = arg.delete_prefix('-')
-                has_arg = true
-              rescue InvalidOption
-                raise if require_exact
-                # if no short options match, try completion with long
-                # options.
-                sw, = complete(:long, opt)
-                eq ||= !rest
-              end
-            end
-          rescue ParseError
-            throw :terminate, arg unless raise_unknown
-            raise $!.set_option(arg, true)
-          end
-          begin
-            opt, cb, val = sw.parse(val, argv) {|*exc| raise(*exc) if eq}
-          rescue ParseError
-            raise $!.set_option(arg, arg.length > 2)
-          else
-            raise InvalidOption, arg if has_arg and !eq and arg == "-#{opt}"
-          end
-          begin
-            argv.unshift(opt) if opt and (!rest or (opt = opt.sub(/\A-*/, '-')) != '-')
-            val = cb.call(val) if cb
-            setter.call(sw.switch_name, val) if setter
-          rescue ParseError
-            raise $!.set_option(arg, arg.length > 2)
-          end
-
-        # non-option argument
-        else
-          catch(:prune) do
-            visit(:each_option) do |sw0|
-              sw = sw0
-              sw.block.call(arg) if Switch === sw and sw.match_nonswitch?(arg)
-            end
-            nonopt.call(arg)
-          end
-        end
-      end
-
-      nil
-    }
-
-    visit(:search, :short, nil) {|sw| sw.block.call(*argv) if !sw.pattern}
-
-    argv
-  end
-  private :parse_in_order
-
-  #
-  # Parses command line arguments +argv+ in permutation mode and returns
-  # list of non-option arguments. When optional +into+ keyword
-  # argument is provided, the parsed option values are stored there via
-  # <code>[]=</code> method (so it can be Hash, or OpenStruct, or other
-  # similar object).
-  #
-  def permute(*argv, into: nil)
-    argv = argv[0].dup if argv.size == 1 and Array === argv[0]
-    permute!(argv, into: into)
-  end
-
-  #
-  # Same as #permute, but removes switches destructively.
-  # Non-option arguments remain in +argv+.
-  #
-  def permute!(argv = default_argv, into: nil)
-    nonopts = []
-    order!(argv, into: into, &nonopts.method(:<<))
-    argv[0, 0] = nonopts
-    argv
-  end
-
-  #
-  # Parses command line arguments +argv+ in order when environment variable
-  # POSIXLY_CORRECT is set, and in permutation mode otherwise.
-  # When optional +into+ keyword argument is provided, the parsed option
-  # values are stored there via <code>[]=</code> method (so it can be Hash,
-  # or OpenStruct, or other similar object).
-  #
-  def parse(*argv, into: nil)
-    argv = argv[0].dup if argv.size == 1 and Array === argv[0]
-    parse!(argv, into: into)
-  end
-
-  #
-  # Same as #parse, but removes switches destructively.
-  # Non-option arguments remain in +argv+.
-  #
-  def parse!(argv = default_argv, into: nil)
-    if ENV.include?('POSIXLY_CORRECT')
-      order!(argv, into: into)
-    else
-      permute!(argv, into: into)
-    end
-  end
-
-  #
-  # Wrapper method for getopts.rb.
-  #
-  #   params = ARGV.getopts("ab:", "foo", "bar:", "zot:Z;zot option")
-  #   # params["a"] = true   # -a
-  #   # params["b"] = "1"    # -b1
-  #   # params["foo"] = "1"  # --foo
-  #   # params["bar"] = "x"  # --bar x
-  #   # params["zot"] = "z"  # --zot Z
-  #
-  def getopts(*args)
-    argv = Array === args.first ? args.shift : default_argv
-    single_options, *long_options = *args
-
-    result = {}
-
-    single_options.scan(/(.)(:)?/) do |opt, val|
-      if val
-        result[opt] = nil
-        define("-#{opt} VAL")
-      else
-        result[opt] = false
-        define("-#{opt}")
-      end
-    end if single_options
-
-    long_options.each do |arg|
-      arg, desc = arg.split(';', 2)
-      opt, val = arg.split(':', 2)
-      if val
-        result[opt] = val.empty? ? nil : val
-        define("--#{opt}=#{result[opt] || "VAL"}", *[desc].compact)
-      else
-        result[opt] = false
-        define("--#{opt}", *[desc].compact)
-      end
-    end
-
-    parse_in_order(argv, result.method(:[]=))
-    result
-  end
-
-  #
-  # See #getopts.
-  #
-  def self.getopts(*args)
-    new.getopts(*args)
-  end
-
-  #
-  # Traverses @stack, sending each element method +id+ with +args+ and
-  # +block+.
-  #
-  def visit(id, *args, &block) # :nodoc:
-    @stack.reverse_each do |el|
-      el.__send__(id, *args, &block)
-    end
-    nil
-  end
-  private :visit
-
-  #
-  # Searches +key+ in @stack for +id+ hash and returns or yields the result.
-  #
-  def search(id, key) # :nodoc:
-    block_given = block_given?
-    visit(:search, id, key) do |k|
-      return block_given ? yield(k) : k
-    end
-  end
-  private :search
-
-  #
-  # Completes shortened long style option switch and returns pair of
-  # canonical switch and switch descriptor Gem::OptionParser::Switch.
-  #
-  # +typ+::   Searching table.
-  # +opt+::   Searching key.
-  # +icase+:: Search case insensitive if true.
-  # +pat+::   Optional pattern for completion.
-  #
-  def complete(typ, opt, icase = false, *pat) # :nodoc:
-    if pat.empty?
-      search(typ, opt) {|sw| return [sw, opt]} # exact match or...
-    end
-    ambiguous = catch(:ambiguous) {
-      visit(:complete, typ, opt, icase, *pat) {|o, *sw| return sw}
-    }
-    exc = ambiguous ? AmbiguousOption : InvalidOption
-    raise exc.new(opt, additional: self.method(:additional_message).curry[typ])
-  end
-  private :complete
-
-  #
-  # Returns additional info.
-  #
-  def additional_message(typ, opt)
-    return unless typ and opt and defined?(DidYouMean::SpellChecker)
-    all_candidates = []
-    visit(:get_candidates, typ) do |candidates|
-      all_candidates.concat(candidates)
-    end
-    all_candidates.select! {|cand| cand.is_a?(String) }
-    checker = DidYouMean::SpellChecker.new(dictionary: all_candidates)
-    DidYouMean.formatter.message_for(all_candidates & checker.correct(opt))
-  end
-
-  def candidate(word)
-    list = []
-    case word
-    when '-'
-      long = short = true
-    when /\A--/
-      word, arg = word.split(/=/, 2)
-      argpat = Completion.regexp(arg, false) if arg and !arg.empty?
-      long = true
-    when /\A-/
-      short = true
-    end
-    pat = Completion.regexp(word, long)
-    visit(:each_option) do |opt|
-      next unless Switch === opt
-      opts = (long ? opt.long : []) + (short ? opt.short : [])
-      opts = Completion.candidate(word, true, pat, &opts.method(:each)).map(&:first) if pat
-      if /\A=/ =~ opt.arg
-        opts.map! {|sw| sw + "="}
-        if arg and CompletingHash === opt.pattern
-          if opts = opt.pattern.candidate(arg, false, argpat)
-            opts.map!(&:last)
-          end
-        end
-      end
-      list.concat(opts)
-    end
-    list
-  end
-
-  #
-  # Loads options from file names as +filename+. Does nothing when the file
-  # is not present. Returns whether successfully loaded.
-  #
-  # +filename+ defaults to basename of the program without suffix in a
-  # directory ~/.options, then the basename with '.options' suffix
-  # under XDG and Haiku standard places.
-  #
-  # The optional +into+ keyword argument works exactly like that accepted in
-  # method #parse.
-  #
-  def load(filename = nil, into: nil)
-    unless filename
-      basename = File.basename($0, '.*')
-      return true if load(File.expand_path(basename, '~/.options'), into: into) rescue nil
-      basename << ".options"
-      return [
-        # XDG
-        ENV['XDG_CONFIG_HOME'],
-        '~/.config',
-        *ENV['XDG_CONFIG_DIRS']&.split(File::PATH_SEPARATOR),
-
-        # Haiku
-        '~/config/settings',
-      ].any? {|dir|
-        next if !dir or dir.empty?
-        load(File.expand_path(basename, dir), into: into) rescue nil
-      }
-    end
-    begin
-      parse(*File.readlines(filename, chomp: true), into: into)
-      true
-    rescue Errno::ENOENT, Errno::ENOTDIR
-      false
-    end
-  end
-
-  #
-  # Parses environment variable +env+ or its uppercase with splitting like a
-  # shell.
-  #
-  # +env+ defaults to the basename of the program.
-  #
-  def environment(env = File.basename($0, '.*'))
-    env = ENV[env] || ENV[env.upcase] or return
-    require 'shellwords'
-    parse(*Shellwords.shellwords(env))
-  end
-
-  #
-  # Acceptable argument classes
-  #
-
-  #
-  # Any string and no conversion. This is fall-back.
-  #
-  accept(Object) {|s,|s or s.nil?}
-
-  accept(NilClass) {|s,|s}
-
-  #
-  # Any non-empty string, and no conversion.
-  #
-  accept(String, /.+/m) {|s,*|s}
-
-  #
-  # Ruby/C-like integer, octal for 0-7 sequence, binary for 0b, hexadecimal
-  # for 0x, and decimal for others; with optional sign prefix. Converts to
-  # Integer.
-  #
-  decimal = '\d+(?:_\d+)*'
-  binary = 'b[01]+(?:_[01]+)*'
-  hex = 'x[\da-f]+(?:_[\da-f]+)*'
-  octal = "0(?:[0-7]+(?:_[0-7]+)*|#{binary}|#{hex})?"
-  integer = "#{octal}|#{decimal}"
-
-  accept(Integer, %r"\A[-+]?(?:#{integer})\z"io) {|s,|
-    begin
-      Integer(s)
-    rescue ArgumentError
-      raise Gem::OptionParser::InvalidArgument, s
-    end if s
-  }
-
-  #
-  # Float number format, and converts to Float.
-  #
-  float = "(?:#{decimal}(?=(.)?)(?:\\.(?:#{decimal})?)?|\\.#{decimal})(?:E[-+]?#{decimal})?"
-  floatpat = %r"\A[-+]?#{float}\z"io
-  accept(Float, floatpat) {|s,| s.to_f if s}
-
-  #
-  # Generic numeric format, converts to Integer for integer format, Float
-  # for float format, and Rational for rational format.
-  #
-  real = "[-+]?(?:#{octal}|#{float})"
-  accept(Numeric, /\A(#{real})(?:\/(#{real}))?\z/io) {|s, d, f, n,|
-    if n
-      Rational(d, n)
-    elsif f
-      Float(s)
-    else
-      Integer(s)
-    end
-  }
-
-  #
-  # Decimal integer format, to be converted to Integer.
-  #
-  DecimalInteger = /\A[-+]?#{decimal}\z/io
-  accept(DecimalInteger, DecimalInteger) {|s,|
-    begin
-      Integer(s, 10)
-    rescue ArgumentError
-      raise Gem::OptionParser::InvalidArgument, s
-    end if s
-  }
-
-  #
-  # Ruby/C like octal/hexadecimal/binary integer format, to be converted to
-  # Integer.
-  #
-  OctalInteger = /\A[-+]?(?:[0-7]+(?:_[0-7]+)*|0(?:#{binary}|#{hex}))\z/io
-  accept(OctalInteger, OctalInteger) {|s,|
-    begin
-      Integer(s, 8)
-    rescue ArgumentError
-      raise Gem::OptionParser::InvalidArgument, s
-    end if s
-  }
-
-  #
-  # Decimal integer/float number format, to be converted to Integer for
-  # integer format, Float for float format.
-  #
-  DecimalNumeric = floatpat     # decimal integer is allowed as float also.
-  accept(DecimalNumeric, floatpat) {|s, f|
-    begin
-      if f
-        Float(s)
-      else
-        Integer(s)
-      end
-    rescue ArgumentError
-      raise Gem::OptionParser::InvalidArgument, s
-    end if s
-  }
-
-  #
-  # Boolean switch, which means whether it is present or not, whether it is
-  # absent or not with prefix no-, or it takes an argument
-  # yes/no/true/false/+/-.
-  #
-  yesno = CompletingHash.new
-  %w[- no false].each {|el| yesno[el] = false}
-  %w[+ yes true].each {|el| yesno[el] = true}
-  yesno['nil'] = false          # should be nil?
-  accept(TrueClass, yesno) {|arg, val| val == nil or val}
-  #
-  # Similar to TrueClass, but defaults to false.
-  #
-  accept(FalseClass, yesno) {|arg, val| val != nil and val}
-
-  #
-  # List of strings separated by ",".
-  #
-  accept(Array) do |s, |
-    if s
-      s = s.split(',').collect {|ss| ss unless ss.empty?}
-    end
-    s
-  end
-
-  #
-  # Regular expression with options.
-  #
-  accept(Regexp, %r"\A/((?:\\.|[^\\])*)/([[:alpha:]]+)?\z|.*") do |all, s, o|
-    f = 0
-    if o
-      f |= Regexp::IGNORECASE if /i/ =~ o
-      f |= Regexp::MULTILINE if /m/ =~ o
-      f |= Regexp::EXTENDED if /x/ =~ o
-      k = o.delete("imx")
-      k = nil if k.empty?
-    end
-    Regexp.new(s || all, f, k)
-  end
-
-  #
-  # Exceptions
-  #
-
-  #
-  # Base class of exceptions from Gem::OptionParser.
-  #
-  class ParseError < RuntimeError
-    # Reason which caused the error.
-    Reason = 'parse error'
-
-    def initialize(*args, additional: nil)
-      @additional = additional
-      @arg0, = args
-      @args = args
-      @reason = nil
-    end
-
-    attr_reader :args
-    attr_writer :reason
-    attr_accessor :additional
-
-    #
-    # Pushes back erred argument(s) to +argv+.
-    #
-    def recover(argv)
-      argv[0, 0] = @args
-      argv
-    end
-
-    def self.filter_backtrace(array)
-      unless $DEBUG
-        array.delete_if(&%r"\A#{Regexp.quote(__FILE__)}:"o.method(:=~))
-      end
-      array
-    end
-
-    def set_backtrace(array)
-      super(self.class.filter_backtrace(array))
-    end
-
-    def set_option(opt, eq)
-      if eq
-        @args[0] = opt
-      else
-        @args.unshift(opt)
-      end
-      self
-    end
-
-    #
-    # Returns error reason. Override this for I18N.
-    #
-    def reason
-      @reason || self.class::Reason
-    end
-
-    def inspect
-      "#<#{self.class}: #{args.join(' ')}>"
-    end
-
-    #
-    # Default stringizing method to emit standard error message.
-    #
-    def message
-      "#{reason}: #{args.join(' ')}#{additional[@arg0] if additional}"
-    end
-
-    alias to_s message
-  end
-
-  #
-  # Raises when ambiguously completable string is encountered.
-  #
-  class AmbiguousOption < ParseError
-    const_set(:Reason, 'ambiguous option')
-  end
-
-  #
-  # Raises when there is an argument for a switch which takes no argument.
-  #
-  class NeedlessArgument < ParseError
-    const_set(:Reason, 'needless argument')
-  end
-
-  #
-  # Raises when a switch with mandatory argument has no argument.
-  #
-  class MissingArgument < ParseError
-    const_set(:Reason, 'missing argument')
-  end
-
-  #
-  # Raises when switch is undefined.
-  #
-  class InvalidOption < ParseError
-    const_set(:Reason, 'invalid option')
-  end
-
-  #
-  # Raises when the given argument does not match required format.
-  #
-  class InvalidArgument < ParseError
-    const_set(:Reason, 'invalid argument')
-  end
-
-  #
-  # Raises when the given argument word can't be completed uniquely.
-  #
-  class AmbiguousArgument < InvalidArgument
-    const_set(:Reason, 'ambiguous argument')
-  end
-
-  #
-  # Miscellaneous
-  #
-
-  #
-  # Extends command line arguments array (ARGV) to parse itself.
-  #
-  module Arguable
-
-    #
-    # Sets Gem::OptionParser object, when +opt+ is +false+ or +nil+, methods
-    # Gem::OptionParser::Arguable#options and Gem::OptionParser::Arguable#options= are
-    # undefined. Thus, there is no ways to access the Gem::OptionParser object
-    # via the receiver object.
-    #
-    def options=(opt)
-      unless @optparse = opt
-        class << self
-          undef_method(:options)
-          undef_method(:options=)
-        end
-      end
-    end
-
-    #
-    # Actual Gem::OptionParser object, automatically created if nonexistent.
-    #
-    # If called with a block, yields the Gem::OptionParser object and returns the
-    # result of the block. If an Gem::OptionParser::ParseError exception occurs
-    # in the block, it is rescued, a error message printed to STDERR and
-    # +nil+ returned.
-    #
-    def options
-      @optparse ||= Gem::OptionParser.new
-      @optparse.default_argv = self
-      block_given? or return @optparse
-      begin
-        yield @optparse
-      rescue ParseError
-        @optparse.warn $!
-        nil
-      end
-    end
-
-    #
-    # Parses +self+ destructively in order and returns +self+ containing the
-    # rest arguments left unparsed.
-    #
-    def order!(&blk) options.order!(self, &blk) end
-
-    #
-    # Parses +self+ destructively in permutation mode and returns +self+
-    # containing the rest arguments left unparsed.
-    #
-    def permute!() options.permute!(self) end
-
-    #
-    # Parses +self+ destructively and returns +self+ containing the
-    # rest arguments left unparsed.
-    #
-    def parse!() options.parse!(self) end
-
-    #
-    # Substitution of getopts is possible as follows. Also see
-    # Gem::OptionParser#getopts.
-    #
-    #   def getopts(*args)
-    #     ($OPT = ARGV.getopts(*args)).each do |opt, val|
-    #       eval "$OPT_#{opt.gsub(/[^A-Za-z0-9_]/, '_')} = val"
-    #     end
-    #   rescue Gem::OptionParser::ParseError
-    #   end
-    #
-    def getopts(*args)
-      options.getopts(self, *args)
-    end
-
-    #
-    # Initializes instance variable.
-    #
-    def self.extend_object(obj)
-      super
-      obj.instance_eval {@optparse = nil}
-    end
-    def initialize(*args)
-      super
-      @optparse = nil
-    end
-  end
-
-  #
-  # Acceptable argument classes. Now contains DecimalInteger, OctalInteger
-  # and DecimalNumeric. See Acceptable argument classes (in source code).
-  #
-  module Acceptables
-    const_set(:DecimalInteger, Gem::OptionParser::DecimalInteger)
-    const_set(:OctalInteger, Gem::OptionParser::OctalInteger)
-    const_set(:DecimalNumeric, Gem::OptionParser::DecimalNumeric)
-  end
-end
-
-# ARGV is arguable by Gem::OptionParser
-ARGV.extend(Gem::OptionParser::Arguable)
diff --git a/lib/rubygems/optparse/lib/optparse/kwargs.rb b/lib/rubygems/optparse/lib/optparse/kwargs.rb
deleted file mode 100644
index 6987a5ed62f0a6..00000000000000
--- a/lib/rubygems/optparse/lib/optparse/kwargs.rb
+++ /dev/null
@@ -1,22 +0,0 @@
-# frozen_string_literal: true
-require_relative '../optparse'
-
-class Gem::OptionParser
-  # :call-seq:
-  #   define_by_keywords(options, method, **params)
-  #
-  # :include: ../../doc/optparse/creates_option.rdoc
-  #
-  def define_by_keywords(options, meth, **opts)
-    meth.parameters.each do |type, name|
-      case type
-      when :key, :keyreq
-        op, cl = *(type == :key ? %w"[ ]" : ["", ""])
-        define("--#{name}=#{op}#{name.upcase}#{cl}", *opts[name]) do |o|
-          options[name] = o
-        end
-      end
-    end
-    options
-  end
-end
diff --git a/lib/rubygems/optparse/lib/optparse/uri.rb b/lib/rubygems/optparse/lib/optparse/uri.rb
deleted file mode 100644
index 664d7f2af4f9fb..00000000000000
--- a/lib/rubygems/optparse/lib/optparse/uri.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-# frozen_string_literal: false
-# -*- ruby -*-
-
-require_relative '../optparse'
-require 'uri'
-
-Gem::OptionParser.accept(URI) {|s,| URI.parse(s) if s}
diff --git a/lib/rubygems/optparse/lib/optparse/version.rb b/lib/rubygems/optparse/lib/optparse/version.rb
deleted file mode 100644
index 5d79e9db44d4d9..00000000000000
--- a/lib/rubygems/optparse/lib/optparse/version.rb
+++ /dev/null
@@ -1,71 +0,0 @@
-# frozen_string_literal: false
-# Gem::OptionParser internal utility
-
-class << Gem::OptionParser
-  def show_version(*pkgs)
-    progname = ARGV.options.program_name
-    result = false
-    show = proc do |klass, cname, version|
-      str = "#{progname}"
-      unless klass == ::Object and cname == :VERSION
-        version = version.join(".") if Array === version
-        str << ": #{klass}" unless klass == Object
-        str << " version #{version}"
-      end
-      [:Release, :RELEASE].find do |rel|
-        if klass.const_defined?(rel)
-          str << " (#{klass.const_get(rel)})"
-        end
-      end
-      puts str
-      result = true
-    end
-    if pkgs.size == 1 and pkgs[0] == "all"
-      self.search_const(::Object, /\AV(?:ERSION|ersion)\z/) do |klass, cname, version|
-        unless cname[1] == ?e and klass.const_defined?(:Version)
-          show.call(klass, cname.intern, version)
-        end
-      end
-    else
-      pkgs.each do |pkg|
-        begin
-          pkg = pkg.split(/::|\//).inject(::Object) {|m, c| m.const_get(c)}
-          v = case
-              when pkg.const_defined?(:Version)
-                pkg.const_get(n = :Version)
-              when pkg.const_defined?(:VERSION)
-                pkg.const_get(n = :VERSION)
-              else
-                n = nil
-                "unknown"
-              end
-          show.call(pkg, n, v)
-        rescue NameError
-        end
-      end
-    end
-    result
-  end
-
-  def each_const(path, base = ::Object)
-    path.split(/::|\//).inject(base) do |klass, name|
-      raise NameError, path unless Module === klass
-      klass.constants.grep(/#{name}/i) do |c|
-        klass.const_defined?(c) or next
-        klass.const_get(c)
-      end
-    end
-  end
-
-  def search_const(klass, name)
-    klasses = [klass]
-    while klass = klasses.shift
-      klass.constants.each do |cname|
-        klass.const_defined?(cname) or next
-        const = klass.const_get(cname)
-        yield klass, cname, const if name === cname
-        klasses << const if Module === const and const != ::Object
-      end
-    end
-  end
-end
diff --git a/lib/rubygems/package.rb b/lib/rubygems/package.rb
index ba05fadbaf679b..c855423ed764de 100644
--- a/lib/rubygems/package.rb
+++ b/lib/rubygems/package.rb
@@ -7,7 +7,6 @@
 
 # rubocop:enable Style/AsciiComments
 
-require_relative "../rubygems"
 require_relative "security"
 require_relative "user_interaction"
 
@@ -59,7 +58,7 @@ class FormatError < Error
 
     def initialize(message, source = nil)
       if source
-        @path = source.path
+        @path = source.is_a?(String) ? source : source.path
 
         message += " in #{path}" if path
       end
@@ -268,7 +267,7 @@ def add_files(tar) # :nodoc:
 
       tar.add_file_simple file, stat.mode, stat.size do |dst_io|
         File.open file, "rb" do |src_io|
-          dst_io.write src_io.read 16_384 until src_io.eof?
+          copy_stream(src_io, dst_io)
         end
       end
     end
@@ -295,7 +294,6 @@ def build(skip_validation = false, strict_validation = false)
 
     Gem.load_yaml
 
-    @spec.mark_version
     @spec.validate true, strict_validation unless skip_validation
 
     setup_signer(
@@ -357,18 +355,21 @@ def contents
 
   def digest(entry) # :nodoc:
     algorithms = if @checksums
-      @checksums.keys
-    else
-      [Gem::Security::DIGEST_NAME].compact
+      @checksums.to_h {|algorithm, _| [algorithm, Gem::Security.create_digest(algorithm)] }
+    elsif Gem::Security::DIGEST_NAME
+      { Gem::Security::DIGEST_NAME => Gem::Security.create_digest(Gem::Security::DIGEST_NAME) }
     end
 
-    algorithms.each do |algorithm|
-      digester = Gem::Security.create_digest(algorithm)
-
-      digester << entry.readpartial(16_384) until entry.eof?
+    return @digests if algorithms.nil? || algorithms.empty?
 
-      entry.rewind
+    buf = String.new(capacity: 16_384, encoding: Encoding::BINARY)
+    until entry.eof?
+      entry.readpartial(16_384, buf)
+      algorithms.each_value {|digester| digester << buf }
+    end
+    entry.rewind
 
+    algorithms.each do |algorithm, digester|
       @digests[algorithm][entry.full_name] = digester
     end
 
@@ -384,7 +385,7 @@ def digest(entry) # :nodoc:
   def extract_files(destination_dir, pattern = "*")
     verify unless @spec
 
-    FileUtils.mkdir_p destination_dir, :mode => dir_mode && 0o755
+    FileUtils.mkdir_p destination_dir, mode: dir_mode && 0o755
 
     @gem.with_read_io do |io|
       reader = Gem::Package::TarReader.new io
@@ -413,6 +414,8 @@ def extract_files(destination_dir, pattern = "*")
   # extracted.
 
   def extract_tar_gz(io, destination_dir, pattern = "*") # :nodoc:
+    destination_dir = File.realpath(destination_dir)
+
     directories = []
     symlinks = []
 
@@ -435,8 +438,6 @@ def extract_tar_gz(io, destination_dir, pattern = "*") # :nodoc:
 
         FileUtils.rm_rf destination
 
-        mkdir_options = {}
-        mkdir_options[:mode] = dir_mode ? 0o755 : (entry.header.mode if entry.directory?)
         mkdir =
           if entry.directory?
             destination
@@ -445,13 +446,13 @@ def extract_tar_gz(io, destination_dir, pattern = "*") # :nodoc:
           end
 
         unless directories.include?(mkdir)
-          FileUtils.mkdir_p mkdir, **mkdir_options
+          FileUtils.mkdir_p mkdir, mode: dir_mode ? 0o755 : (entry.header.mode if entry.directory?)
           directories << mkdir
         end
 
         if entry.file?
-          File.open(destination, "wb") {|out| out.write entry.read }
-          FileUtils.chmod file_mode(entry.header.mode), destination
+          File.open(destination, "wb") {|out| copy_stream(entry, out) }
+          FileUtils.chmod file_mode(entry.header.mode) & ~File.umask, destination
         end
 
         verbose destination
@@ -510,7 +511,6 @@ def install_location(filename, destination_dir) # :nodoc:
     raise Gem::Package::PathError.new(destination, destination_dir) unless
       normalize_path(destination).start_with? normalize_path(destination_dir + "/")
 
-    destination.tap(&Gem::UNTAINT)
     destination
   end
 
@@ -526,12 +526,13 @@ def normalize_path(pathname)
   # Loads a Gem::Specification from the TarEntry +entry+
 
   def load_spec(entry) # :nodoc:
+    limit = 10 * 1024 * 1024
     case entry.full_name
     when "metadata" then
-      @spec = Gem::Specification.from_yaml entry.read
+      @spec = Gem::Specification.from_yaml limit_read(entry, "metadata", limit)
     when "metadata.gz" then
       Zlib::GzipReader.wrap(entry, external_encoding: Encoding::UTF_8) do |gzio|
-        @spec = Gem::Specification.from_yaml gzio.read
+        @spec = Gem::Specification.from_yaml limit_read(gzio, "metadata.gz", limit)
       end
     end
   end
@@ -555,7 +556,7 @@ def read_checksums(gem)
 
     @checksums = gem.seek "checksums.yaml.gz" do |entry|
       Zlib::GzipReader.wrap entry do |gz_io|
-        Gem::SafeYAML.safe_load gz_io.read
+        Gem::SafeYAML.safe_load limit_read(gz_io, "checksums.yaml.gz", 10 * 1024 * 1024)
       end
     end
   end
@@ -662,7 +663,7 @@ def verify_entry(entry)
 
     case file_name
     when /\.sig$/ then
-      @signatures[$`] = entry.read if @security_policy
+      @signatures[$`] = limit_read(entry, file_name, 1024 * 1024) if @security_policy
       return
     else
       digest entry
@@ -706,11 +707,28 @@ def verify_files(gem)
 
   def verify_gz(entry) # :nodoc:
     Zlib::GzipReader.wrap entry do |gzio|
+      # TODO: read into a buffer once zlib supports it
       gzio.read 16_384 until gzio.eof? # gzip checksum verification
     end
   rescue Zlib::GzipFile::Error => e
     raise Gem::Package::FormatError.new(e.message, entry.full_name)
   end
+
+  if RUBY_ENGINE == "truffleruby"
+    def copy_stream(src, dst) # :nodoc:
+      dst.write src.read
+    end
+  else
+    def copy_stream(src, dst) # :nodoc:
+      IO.copy_stream(src, dst)
+    end
+  end
+
+  def limit_read(io, name, limit)
+    bytes = io.read(limit + 1)
+    raise Gem::Package::FormatError, "#{name} is too big (over #{limit} bytes)" if bytes.size > limit
+    bytes
+  end
 end
 
 require_relative "package/digest_io"
diff --git a/lib/rubygems/package/old.rb b/lib/rubygems/package/old.rb
index 41f6986b8f5ad8..1a13ac3e297a72 100644
--- a/lib/rubygems/package/old.rb
+++ b/lib/rubygems/package/old.rb
@@ -70,7 +70,7 @@ def extract_files(destination_dir)
           file_data << line
         end
 
-        file_data = file_data.strip.unpack("m")[0]
+        file_data = file_data.strip.unpack1("m")
         file_data = Zlib::Inflate.inflate file_data
 
         raise Gem::Package::FormatError, "#{full_name} in #{@gem} is corrupt" if
@@ -78,7 +78,7 @@ def extract_files(destination_dir)
 
         FileUtils.rm_rf destination
 
-        FileUtils.mkdir_p File.dirname(destination), :mode => dir_mode && 0o755
+        FileUtils.mkdir_p File.dirname(destination), mode: dir_mode && 0o755
 
         File.open destination, "wb", file_mode(entry["mode"]) do |out|
           out.write file_data
diff --git a/lib/rubygems/package/tar_header.rb b/lib/rubygems/package/tar_header.rb
index 6fb5b3b2e3f436..0ebcbd789d4038 100644
--- a/lib/rubygems/package/tar_header.rb
+++ b/lib/rubygems/package/tar_header.rb
@@ -95,39 +95,40 @@ class Gem::Package::TarHeader
 
   attr_reader(*FIELDS)
 
-  EMPTY_HEADER = ("\0" * 512).freeze # :nodoc:
+  EMPTY_HEADER = ("\0" * 512).b.freeze # :nodoc:
 
   ##
   # Creates a tar header from IO +stream+
 
   def self.from(stream)
     header = stream.read 512
-    empty = (header == EMPTY_HEADER)
+    return EMPTY if header == EMPTY_HEADER
 
     fields = header.unpack UNPACK_FORMAT
 
-    new :name => fields.shift,
-        :mode => strict_oct(fields.shift),
-        :uid => oct_or_256based(fields.shift),
-        :gid => oct_or_256based(fields.shift),
-        :size => strict_oct(fields.shift),
-        :mtime => strict_oct(fields.shift),
-        :checksum => strict_oct(fields.shift),
-        :typeflag => fields.shift,
-        :linkname => fields.shift,
-        :magic => fields.shift,
-        :version => strict_oct(fields.shift),
-        :uname => fields.shift,
-        :gname => fields.shift,
-        :devmajor => strict_oct(fields.shift),
-        :devminor => strict_oct(fields.shift),
-        :prefix => fields.shift,
-
-        :empty => empty
+    new name: fields.shift,
+        mode: strict_oct(fields.shift),
+        uid: oct_or_256based(fields.shift),
+        gid: oct_or_256based(fields.shift),
+        size: strict_oct(fields.shift),
+        mtime: strict_oct(fields.shift),
+        checksum: strict_oct(fields.shift),
+        typeflag: fields.shift,
+        linkname: fields.shift,
+        magic: fields.shift,
+        version: strict_oct(fields.shift),
+        uname: fields.shift,
+        gname: fields.shift,
+        devmajor: strict_oct(fields.shift),
+        devminor: strict_oct(fields.shift),
+        prefix: fields.shift,
+
+        empty: false
   end
 
   def self.strict_oct(str)
-    return str.strip.oct if /\A[0-7]*\z/.match?(str.strip)
+    str.strip!
+    return str.oct if /\A[0-7]*\z/.match?(str)
 
     raise ArgumentError, "#{str.inspect} is not an octal string"
   end
@@ -137,7 +138,8 @@ def self.oct_or_256based(str)
     # \ff flags a negative 256-based number
     # In case we have a match, parse it as a signed binary value
     # in big-endian order, except that the high-order bit is ignored.
-    return str.unpack("N2").last if /\A[\x80\xff]/n.match?(str)
+
+    return str.unpack1("@4N") if /\A[\x80\xff]/n.match?(str)
     strict_oct(str)
   end
 
@@ -149,25 +151,43 @@ def initialize(vals)
       raise ArgumentError, ":name, :size, :prefix and :mode required"
     end
 
-    vals[:uid] ||= 0
-    vals[:gid] ||= 0
-    vals[:mtime] ||= 0
-    vals[:checksum] ||= ""
-    vals[:typeflag] = "0" if vals[:typeflag].nil? || vals[:typeflag].empty?
-    vals[:magic] ||= "ustar"
-    vals[:version] ||= "00"
-    vals[:uname] ||= "wheel"
-    vals[:gname] ||= "wheel"
-    vals[:devmajor] ||= 0
-    vals[:devminor] ||= 0
-
-    FIELDS.each do |name|
-      instance_variable_set "@#{name}", vals[name]
-    end
+    @checksum = vals[:checksum] || ""
+    @devmajor = vals[:devmajor] || 0
+    @devminor = vals[:devminor] || 0
+    @gid = vals[:gid] || 0
+    @gname = vals[:gname] || "wheel"
+    @linkname = vals[:linkname]
+    @magic = vals[:magic] || "ustar"
+    @mode = vals[:mode]
+    @mtime = vals[:mtime] || 0
+    @name = vals[:name]
+    @prefix = vals[:prefix]
+    @size = vals[:size]
+    @typeflag = vals[:typeflag]
+    @typeflag = "0" if @typeflag.nil? || @typeflag.empty?
+    @uid = vals[:uid] || 0
+    @uname = vals[:uname] || "wheel"
+    @version = vals[:version] || "00"
 
     @empty = vals[:empty]
   end
 
+  EMPTY = new({ # :nodoc:
+    checksum: 0,
+    gname: "",
+    linkname: "",
+    magic: "",
+    mode: 0,
+    name: "",
+    prefix: "",
+    size: 0,
+    uname: "",
+    version: 0,
+
+    empty: true,
+  }).freeze
+  private_constant :EMPTY
+
   ##
   # Is the tar entry empty?
 
@@ -208,6 +228,17 @@ def update_checksum
     @checksum = oct calculate_checksum(header), 6
   end
 
+  ##
+  # Header's full name, including prefix
+
+  def full_name
+    if prefix != ""
+      File.join prefix, name
+    else
+      name
+    end
+  end
+
   private
 
   def calculate_checksum(header)
@@ -237,7 +268,7 @@ def header(checksum = @checksum)
 
     header = header.pack PACK_FORMAT
 
-    header << ("\0" * ((512 - header.size) % 512))
+    header.ljust 512, "\0"
   end
 
   def oct(num, len)
diff --git a/lib/rubygems/package/tar_reader.rb b/lib/rubygems/package/tar_reader.rb
index 410cf2e0b3c2cc..25f9b2f9450a95 100644
--- a/lib/rubygems/package/tar_reader.rb
+++ b/lib/rubygems/package/tar_reader.rb
@@ -52,7 +52,14 @@ def each
     return enum_for __method__ unless block_given?
 
     until @io.eof? do
-      header = Gem::Package::TarHeader.from @io
+      begin
+        header = Gem::Package::TarHeader.from @io
+      rescue ArgumentError => e
+        # Specialize only exceptions from Gem::Package::TarHeader.strict_oct
+        raise e unless e.message.match?(/ is not an octal string$/)
+        raise Gem::Package::TarInvalidError, e.message
+      end
+
       return if header.empty?
       entry = Gem::Package::TarReader::Entry.new header, @io
       yield entry
diff --git a/lib/rubygems/package/tar_reader/entry.rb b/lib/rubygems/package/tar_reader/entry.rb
index 5e9d9af5c62e5b..f837e86fd60aef 100644
--- a/lib/rubygems/package/tar_reader/entry.rb
+++ b/lib/rubygems/package/tar_reader/entry.rb
@@ -87,11 +87,7 @@ def eof?
   # Full name of the tar entry
 
   def full_name
-    if @header.prefix != ""
-      File.join @header.prefix, @header.name
-    else
-      @header.name
-    end
+    @header.full_name.force_encoding(Encoding::UTF_8)
   rescue ArgumentError => e
     raise unless e.message == "string contains null byte"
     raise Gem::Package::TarInvalidError,
diff --git a/lib/rubygems/package/tar_writer.rb b/lib/rubygems/package/tar_writer.rb
index e06ec25961616d..7dcb9737c06620 100644
--- a/lib/rubygems/package/tar_writer.rb
+++ b/lib/rubygems/package/tar_writer.rb
@@ -95,10 +95,11 @@ def initialize(io)
   end
 
   ##
-  # Adds file +name+ with permissions +mode+, and yields an IO for writing the
-  # file to
+  # Adds file +name+ with permissions +mode+ and mtime +mtime+ (sets
+  # Gem.source_date_epoch if not specified), and yields an IO for
+  # writing the file to
 
-  def add_file(name, mode) # :yields: io
+  def add_file(name, mode, mtime=nil) # :yields: io
     check_closed
 
     name, prefix = split_name name
@@ -116,9 +117,9 @@ def add_file(name, mode) # :yields: io
     final_pos = @io.pos
     @io.pos = init_pos
 
-    header = Gem::Package::TarHeader.new :name => name, :mode => mode,
-                                         :size => size, :prefix => prefix,
-                                         :mtime => Gem.source_date_epoch
+    header = Gem::Package::TarHeader.new name: name, mode: mode,
+                                         size: size, prefix: prefix,
+                                         mtime: mtime || Gem.source_date_epoch
 
     @io.write header
     @io.pos = final_pos
@@ -209,9 +210,9 @@ def add_file_simple(name, mode, size) # :yields: io
 
     name, prefix = split_name name
 
-    header = Gem::Package::TarHeader.new(:name => name, :mode => mode,
-                                         :size => size, :prefix => prefix,
-                                         :mtime => Gem.source_date_epoch).to_s
+    header = Gem::Package::TarHeader.new(name: name, mode: mode,
+                                         size: size, prefix: prefix,
+                                         mtime: Gem.source_date_epoch).to_s
 
     @io.write header
     os = BoundedStream.new @io, size
@@ -235,11 +236,11 @@ def add_symlink(name, target, mode)
 
     name, prefix = split_name name
 
-    header = Gem::Package::TarHeader.new(:name => name, :mode => mode,
-                                         :size => 0, :typeflag => "2",
-                                         :linkname => target,
-                                         :prefix => prefix,
-                                         :mtime => Gem.source_date_epoch).to_s
+    header = Gem::Package::TarHeader.new(name: name, mode: mode,
+                                         size: 0, typeflag: "2",
+                                         linkname: target,
+                                         prefix: prefix,
+                                         mtime: Gem.source_date_epoch).to_s
 
     @io.write header
 
@@ -289,10 +290,10 @@ def mkdir(name, mode)
 
     name, prefix = split_name(name)
 
-    header = Gem::Package::TarHeader.new :name => name, :mode => mode,
-                                         :typeflag => "5", :size => 0,
-                                         :prefix => prefix,
-                                         :mtime => Gem.source_date_epoch
+    header = Gem::Package::TarHeader.new name: name, mode: mode,
+                                         typeflag: "5", size: 0,
+                                         prefix: prefix,
+                                         mtime: Gem.source_date_epoch
 
     @io.write header
 
diff --git a/lib/rubygems/package_task.rb b/lib/rubygems/package_task.rb
index a67d8cb916a1a4..d26411684dd0fb 100644
--- a/lib/rubygems/package_task.rb
+++ b/lib/rubygems/package_task.rb
@@ -97,13 +97,13 @@ def define
     gem_path = File.join package_dir, gem_file
     gem_dir  = File.join package_dir, gem_spec.full_name
 
-    task :package => [:gem]
+    task package: [:gem]
 
     directory package_dir
     directory gem_dir
 
     desc "Build the gem file #{gem_file}"
-    task :gem => [gem_path]
+    task gem: [gem_path]
 
     trace = Rake.application.options.trace
     Gem.configuration.verbose = trace
diff --git a/lib/rubygems/path_support.rb b/lib/rubygems/path_support.rb
index b596b4f6b8d220..13091e29bac33f 100644
--- a/lib/rubygems/path_support.rb
+++ b/lib/rubygems/path_support.rb
@@ -24,23 +24,22 @@ class Gem::PathSupport
   # hashtable, or defaults to ENV, the system environment.
   #
   def initialize(env)
-    @home = env["GEM_HOME"] || Gem.default_dir
-
-    if File::ALT_SEPARATOR
-      @home = @home.gsub(File::ALT_SEPARATOR, File::SEPARATOR)
-    end
-
-    @home = expand(@home)
-
+    @home = normalize_home_dir(env["GEM_HOME"] || Gem.default_dir)
     @path = split_gem_path env["GEM_PATH"], @home
 
     @spec_cache_dir = env["GEM_SPEC_CACHE"] || Gem.default_spec_cache_dir
-
-    @spec_cache_dir = @spec_cache_dir.dup.tap(&Gem::UNTAINT)
   end
 
   private
 
+  def normalize_home_dir(home)
+    if File::ALT_SEPARATOR
+      home = home.gsub(File::ALT_SEPARATOR, File::SEPARATOR)
+    end
+
+    expand(home)
+  end
+
   ##
   # Split the Gem search path (as reported by Gem.path).
 
diff --git a/lib/rubygems/platform.rb b/lib/rubygems/platform.rb
index 93e33383fd4956..8b82292a46919a 100644
--- a/lib/rubygems/platform.rb
+++ b/lib/rubygems/platform.rb
@@ -12,10 +12,13 @@ class Gem::Platform
 
   attr_accessor :cpu, :os, :version
 
-  def self.local
-    arch = RbConfig::CONFIG["arch"]
-    arch = "#{arch}_60" if /mswin(?:32|64)$/.match?(arch)
-    @local ||= new(arch)
+  def self.local(refresh: false)
+    return @local if @local && !refresh
+    @local = begin
+      arch = Gem.target_rbconfig["arch"]
+      arch = "#{arch}_60" if /mswin(?:32|64)$/.match?(arch)
+      new(arch)
+    end
   end
 
   def self.match(platform)
@@ -41,10 +44,20 @@ def self.match_spec?(spec)
     match_gem?(spec.platform, spec.name)
   end
 
-  def self.match_gem?(platform, gem_name)
-    # NOTE: this method might be redefined by Ruby implementations to
-    # customize behavior per RUBY_ENGINE, gem_name or other criteria.
-    match_platforms?(platform, Gem.platforms)
+  if RUBY_ENGINE == "truffleruby"
+    def self.match_gem?(platform, gem_name)
+      raise "Not a string: #{gem_name.inspect}" unless String === gem_name
+
+      if REUSE_AS_BINARY_ON_TRUFFLERUBY.include?(gem_name)
+        match_platforms?(platform, [Gem::Platform::RUBY, Gem::Platform.local])
+      else
+        match_platforms?(platform, Gem.platforms)
+      end
+    end
+  else
+    def self.match_gem?(platform, gem_name)
+      match_platforms?(platform, Gem.platforms)
+    end
   end
 
   def self.sort_priority(platform)
@@ -75,55 +88,45 @@ def initialize(arch)
     when Array then
       @cpu, @os, @version = arch
     when String then
-      arch = arch.split "-"
+      cpu, os = arch.sub(/-+$/, "").split("-", 2)
 
-      if arch.length > 2 && arch.last !~ /\d+(\.\d+)?$/ # reassemble x86-linux-{libc}
-        extra = arch.pop
-        arch.last << "-#{extra}"
+      @cpu = if cpu.match?(/i\d86/)
+        "x86"
+      else
+        cpu
       end
 
-      cpu = arch.shift
-
-      @cpu = case cpu
-             when /i\d86/ then "x86"
-             else cpu
-      end
-
-      if arch.length == 2 && arch.last =~ /^\d+(\.\d+)?$/ # for command-line
-        @os, @version = arch
-        return
-      end
-
-      os, = arch
       if os.nil?
         @cpu = nil
         os = cpu
       end # legacy jruby
 
       @os, @version = case os
-                      when /aix(\d+)?/ then             ["aix",       $1]
-                      when /cygwin/ then                ["cygwin",    nil]
-                      when /darwin(\d+)?/ then          ["darwin",    $1]
-                      when /^macruby$/ then             ["macruby",   nil]
-                      when /freebsd(\d+)?/ then         ["freebsd",   $1]
-                      when /^java$/, /^jruby$/ then     ["java",      nil]
-                      when /^java([\d.]*)/ then         ["java",      $1]
-                      when /^dalvik(\d+)?$/ then        ["dalvik",    $1]
-                      when /^dotnet$/ then              ["dotnet",    nil]
-                      when /^dotnet([\d.]*)/ then       ["dotnet",    $1]
-                      when /linux-?(\w+)?/ then         ["linux",     $1]
-                      when /mingw32/ then               ["mingw32",   nil]
-                      when /mingw-?(\w+)?/ then         ["mingw",     $1]
-                      when /(mswin\d+)(\_(\d+))?/ then
+                      when /aix-?(\d+)?/ then                ["aix",     $1]
+                      when /cygwin/ then                     ["cygwin",  nil]
+                      when /darwin-?(\d+)?/ then             ["darwin",  $1]
+                      when "macruby" then                    ["macruby", nil]
+                      when /^macruby-?(\d+(?:\.\d+)*)?/ then ["macruby", $1]
+                      when /freebsd-?(\d+)?/ then            ["freebsd", $1]
+                      when "java", "jruby" then              ["java",    nil]
+                      when /^java-?(\d+(?:\.\d+)*)?/ then    ["java",    $1]
+                      when /^dalvik-?(\d+)?$/ then           ["dalvik",  $1]
+                      when /^dotnet$/ then                   ["dotnet",  nil]
+                      when /^dotnet-?(\d+(?:\.\d+)*)?/ then  ["dotnet",  $1]
+                      when /linux-?(\w+)?/ then              ["linux",   $1]
+                      when /mingw32/ then                    ["mingw32", nil]
+                      when /mingw-?(\w+)?/ then              ["mingw",   $1]
+                      when /(mswin\d+)(?:[_-](\d+))?/ then
                         os = $1
-                        version = $3
-                        @cpu = "x86" if @cpu.nil? && os =~ /32$/
+                        version = $2
+                        @cpu = "x86" if @cpu.nil? && os.end_with?("32")
                         [os, version]
-                      when /netbsdelf/ then             ["netbsdelf", nil]
-                      when /openbsd(\d+\.\d+)?/ then    ["openbsd",   $1]
-                      when /solaris(\d+\.\d+)?/ then    ["solaris",   $1]
+                      when /netbsdelf/ then                  ["netbsdelf", nil]
+                      when /openbsd-?(\d+\.\d+)?/ then       ["openbsd",   $1]
+                      when /solaris-?(\d+\.\d+)?/ then       ["solaris",   $1]
+                      when /wasi/ then                       ["wasi",      nil]
                       # test
-                      when /^(\w+_platform)(\d+)?/ then [$1,          $2]
+                      when /^(\w+_platform)-?(\d+)?/ then    [$1,          $2]
                       else ["unknown", nil]
       end
     when Gem::Platform then
@@ -140,7 +143,7 @@ def to_a
   end
 
   def to_s
-    to_a.compact.join "-"
+    to_a.compact.join(@cpu.nil? ? "" : "-")
   end
 
   ##
@@ -163,7 +166,7 @@ def hash # :nodoc:
   # they have the same version, or either one has no version
   #
   # Additionally, the platform will match if the local CPU is 'arm' and the
-  # other CPU starts with "arm" (for generic ARM family support).
+  # other CPU starts with "armv" (for generic 32-bit ARM family support).
   #
   # Of note, this method is not commutative. Indeed the OS 'linux' has a
   # special case: the version is the libc name, yet while "no version" stands
@@ -184,7 +187,7 @@ def ===(other)
 
     # cpu
     ([nil,"universal"].include?(@cpu) || [nil, "universal"].include?(other.cpu) || @cpu == other.cpu ||
-    (@cpu == "arm" && other.cpu.start_with?("arm"))) &&
+    (@cpu == "arm" && other.cpu.start_with?("armv"))) &&
 
       # os
       @os == other.os &&
@@ -252,4 +255,118 @@ def =~(other)
   # This will be replaced with Gem::Platform::local.
 
   CURRENT = "current"
+
+  JAVA  = Gem::Platform.new("java") # :nodoc:
+  MSWIN = Gem::Platform.new("mswin32") # :nodoc:
+  MSWIN64 = Gem::Platform.new("mswin64") # :nodoc:
+  MINGW = Gem::Platform.new("x86-mingw32") # :nodoc:
+  X64_MINGW_LEGACY = Gem::Platform.new("x64-mingw32") # :nodoc:
+  X64_MINGW = Gem::Platform.new("x64-mingw-ucrt") # :nodoc:
+  UNIVERSAL_MINGW = Gem::Platform.new("universal-mingw") # :nodoc:
+  WINDOWS = [MSWIN, MSWIN64, UNIVERSAL_MINGW].freeze # :nodoc:
+  X64_LINUX = Gem::Platform.new("x86_64-linux") # :nodoc:
+  X64_LINUX_MUSL = Gem::Platform.new("x86_64-linux-musl") # :nodoc:
+
+  GENERICS = [JAVA, *WINDOWS].freeze # :nodoc:
+  private_constant :GENERICS
+
+  GENERIC_CACHE = GENERICS.each_with_object({}) {|g, h| h[g] = g } # :nodoc:
+  private_constant :GENERIC_CACHE
+
+  class << self
+    ##
+    # Returns the generic platform for the given platform.
+
+    def generic(platform)
+      return Gem::Platform::RUBY if platform.nil? || platform == Gem::Platform::RUBY
+
+      GENERIC_CACHE[platform] ||= begin
+        found = GENERICS.find do |match|
+          platform === match
+        end
+        found || Gem::Platform::RUBY
+      end
+    end
+
+    ##
+    # Returns the platform specificity match for the given spec platform and user platform.
+
+    def platform_specificity_match(spec_platform, user_platform)
+      return -1 if spec_platform == user_platform
+      return 1_000_000 if spec_platform.nil? || spec_platform == Gem::Platform::RUBY || user_platform == Gem::Platform::RUBY
+
+      os_match(spec_platform, user_platform) +
+        cpu_match(spec_platform, user_platform) * 10 +
+        version_match(spec_platform, user_platform) * 100
+    end
+
+    ##
+    # Sorts and filters the best platform match for the given matching specs and platform.
+
+    def sort_and_filter_best_platform_match(matching, platform)
+      return matching if matching.one?
+
+      exact = matching.select {|spec| spec.platform == platform }
+      return exact if exact.any?
+
+      sorted_matching = sort_best_platform_match(matching, platform)
+      exemplary_spec = sorted_matching.first
+
+      sorted_matching.take_while {|spec| same_specificity?(platform, spec, exemplary_spec) && same_deps?(spec, exemplary_spec) }
+    end
+
+    ##
+    # Sorts the best platform match for the given matching specs and platform.
+
+    def sort_best_platform_match(matching, platform)
+      matching.sort_by.with_index do |spec, i|
+        [
+          platform_specificity_match(spec.platform, platform),
+          i, # for stable sort
+        ]
+      end
+    end
+
+    private
+
+    def same_specificity?(platform, spec, exemplary_spec)
+      platform_specificity_match(spec.platform, platform) == platform_specificity_match(exemplary_spec.platform, platform)
+    end
+
+    def same_deps?(spec, exemplary_spec)
+      spec.required_ruby_version == exemplary_spec.required_ruby_version &&
+        spec.required_rubygems_version == exemplary_spec.required_rubygems_version &&
+        spec.dependencies.sort == exemplary_spec.dependencies.sort
+    end
+
+    def os_match(spec_platform, user_platform)
+      if spec_platform.os == user_platform.os
+        0
+      else
+        1
+      end
+    end
+
+    def cpu_match(spec_platform, user_platform)
+      if spec_platform.cpu == user_platform.cpu
+        0
+      elsif spec_platform.cpu == "arm" && user_platform.cpu.to_s.start_with?("arm")
+        0
+      elsif spec_platform.cpu.nil? || spec_platform.cpu == "universal"
+        1
+      else
+        2
+      end
+    end
+
+    def version_match(spec_platform, user_platform)
+      if spec_platform.version == user_platform.version
+        0
+      elsif spec_platform.version.nil?
+        1
+      else
+        2
+      end
+    end
+  end
 end
diff --git a/lib/rubygems/psych_tree.rb b/lib/rubygems/psych_tree.rb
index 2d478c94d9da6c..24857adb9d3c41 100644
--- a/lib/rubygems/psych_tree.rb
+++ b/lib/rubygems/psych_tree.rb
@@ -14,6 +14,10 @@ def visit_String(str)
         @emitter.scalar str, nil, nil, false, true, quote
       end
 
+      def visit_Hash(o)
+        super(o.compact)
+      end
+
       # Noop this out so there are no anchors
       def register(target, obj)
       end
diff --git a/lib/rubygems/query_utils.rb b/lib/rubygems/query_utils.rb
index 9a6a7364618550..9849370b1a62b5 100644
--- a/lib/rubygems/query_utils.rb
+++ b/lib/rubygems/query_utils.rb
@@ -132,7 +132,7 @@ def show_local_gems(name, req = Gem::Requirement.default)
       version_matches = show_prereleases? || !s.version.prerelease?
 
       name_matches && version_matches
-    end
+    end.uniq(&:full_name)
 
     spec_tuples = specs.map do |spec|
       [spec.name_tuple, spec]
@@ -311,8 +311,8 @@ def spec_loaded_from(entry, spec, specs)
       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}"
+        default = s.default_gem? ? ", default" : ""
+        entry << "\n" << "    #{label} (#{version}#{default}): #{s.base_dir}"
         label = " " * label.length
       end
     end
diff --git a/lib/rubygems/rdoc.rb b/lib/rubygems/rdoc.rb
index 907dcd94311346..3524b161b26058 100644
--- a/lib/rubygems/rdoc.rb
+++ b/lib/rubygems/rdoc.rb
@@ -5,9 +5,22 @@
 begin
   require "rdoc/rubygems_hook"
   module Gem
-    RDoc = ::RDoc::RubygemsHook
-  end
+    ##
+    # Returns whether RDoc defines its own install hooks through a RubyGems
+    # plugin. This and whatever is guarded by it can be removed once no
+    # supported Ruby ships with RDoc older than 6.9.0.
+
+    def self.rdoc_hooks_defined_via_plugin?
+      Gem::Version.new(::RDoc::VERSION) >= Gem::Version.new("6.9.0")
+    end
 
-  Gem.done_installing(&Gem::RDoc.method(:generation_hook))
+    if rdoc_hooks_defined_via_plugin?
+      RDoc = ::RDoc::RubyGemsHook
+    else
+      RDoc = ::RDoc::RubygemsHook
+
+      Gem.done_installing(&Gem::RDoc.method(:generation_hook))
+    end
+  end
 rescue LoadError
 end
diff --git a/lib/rubygems/remote_fetcher.rb b/lib/rubygems/remote_fetcher.rb
index f9f8c45817a521..355a668b39f81e 100644
--- a/lib/rubygems/remote_fetcher.rb
+++ b/lib/rubygems/remote_fetcher.rb
@@ -74,9 +74,8 @@ def self.fetcher
 
   def initialize(proxy=nil, dns=nil, headers={})
     require_relative "core_ext/tcpsocket_init" if Gem.configuration.ipv4_fallback_enabled
-    require "net/http"
-    require "stringio"
-    require "uri"
+    require_relative "vendored_net_http"
+    require_relative "vendor/uri/lib/uri"
 
     Socket.do_not_reverse_lookup = true
 
@@ -135,7 +134,7 @@ def download(spec, source_uri, install_dir = Gem.dir)
 
     scheme = source_uri.scheme
 
-    # URI.parse gets confused by MS Windows paths with forward slashes.
+    # Gem::URI.parse gets confused by MS Windows paths with forward slashes.
     scheme = nil if /^[a-z]$/i.match?(scheme)
 
     # REFACTOR: split this up and dispatch on scheme (eg download_http)
@@ -210,17 +209,17 @@ def fetch_file(uri, *_)
   # HTTP Fetcher. Dispatched by +fetch_path+. Use it instead.
 
   def fetch_http(uri, last_modified = nil, head = false, depth = 0)
-    fetch_type = head ? Net::HTTP::Head : Net::HTTP::Get
+    fetch_type = head ? Gem::Net::HTTP::Head : Gem::Net::HTTP::Get
     response   = request uri, fetch_type, last_modified do |req|
       headers.each {|k,v| req.add_field(k,v) }
     end
 
     case response
-    when Net::HTTPOK, Net::HTTPNotModified then
+    when Gem::Net::HTTPOK, Gem::Net::HTTPNotModified then
       response.uri = uri
       head ? response : response.body
-    when Net::HTTPMovedPermanently, Net::HTTPFound, Net::HTTPSeeOther,
-         Net::HTTPTemporaryRedirect then
+    when Gem::Net::HTTPMovedPermanently, Gem::Net::HTTPFound, Gem::Net::HTTPSeeOther,
+         Gem::Net::HTTPTemporaryRedirect then
       raise FetchError.new("too many redirects", uri) if depth > 10
 
       unless location = response["Location"]
@@ -261,14 +260,14 @@ def fetch_path(uri, mtime = nil, head = false)
     end
 
     data
-  rescue Timeout::Error, IOError, SocketError, SystemCallError,
+  rescue Gem::Timeout::Error, IOError, SocketError, SystemCallError,
          *(OpenSSL::SSL::SSLError if Gem::HAVE_OPENSSL) => e
     raise FetchError.new("#{e.class}: #{e}", uri)
   end
 
   def fetch_s3(uri, mtime = nil, head = false)
     begin
-      public_uri = s3_uri_signer(uri).sign
+      public_uri = s3_uri_signer(uri, head ? "HEAD" : "GET").sign
     rescue Gem::S3URISigner::ConfigurationError, Gem::S3URISigner::InstanceProfileError => e
       raise FetchError.new(e.message, "s3://#{uri.host}")
     end
@@ -276,8 +275,8 @@ def fetch_s3(uri, mtime = nil, head = false)
   end
 
   # we have our own signing code here to avoid a dependency on the aws-sdk gem
-  def s3_uri_signer(uri)
-    Gem::S3URISigner.new(uri)
+  def s3_uri_signer(uri, method)
+    Gem::S3URISigner.new(uri, method)
   end
 
   ##
@@ -305,8 +304,8 @@ def cache_update_path(uri, path = nil, update = true)
   end
 
   ##
-  # Performs a Net::HTTP request of type +request_class+ on +uri+ returning
-  # a Net::HTTP response object.  request maintains a table of persistent
+  # Performs a Gem::Net::HTTP request of type +request_class+ on +uri+ returning
+  # a Gem::Net::HTTP response object.  request maintains a table of persistent
   # connections to reduce connect overhead.
 
   def request(uri, request_class, last_modified = nil)
diff --git a/lib/rubygems/request.rb b/lib/rubygems/request.rb
index 619a5934b19b83..9116785231ea10 100644
--- a/lib/rubygems/request.rb
+++ b/lib/rubygems/request.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require "net/http"
+require_relative "vendored_net_http"
 require_relative "user_interaction"
 
 class Gem::Request
@@ -18,11 +18,11 @@ def self.create_with_proxy(uri, request_class, last_modified, proxy) # :nodoc:
   end
 
   def self.proxy_uri(proxy) # :nodoc:
-    require "uri"
+    require_relative "vendor/uri/lib/uri"
     case proxy
     when :no_proxy then nil
-    when URI::HTTP then proxy
-    else URI.parse(proxy)
+    when Gem::URI::HTTP then proxy
+    else Gem::URI.parse(proxy)
     end
   end
 
@@ -30,7 +30,7 @@ def initialize(uri, request_class, last_modified, pool)
     @uri = uri
     @request_class = request_class
     @last_modified = last_modified
-    @requests = Hash.new 0
+    @requests = Hash.new(0).compare_by_identity
     @user_agent = user_agent
 
     @connection_pool = pool
@@ -176,7 +176,7 @@ def self.get_proxy_from_env(scheme = "http")
     end
 
     require "uri"
-    uri = URI(Gem::UriFormatter.new(env_proxy).normalize)
+    uri = Gem::URI(Gem::UriFormatter.new(env_proxy).normalize)
 
     if uri && uri.user.nil? && uri.password.nil?
       user     = ENV["#{downcase_scheme}_proxy_user"] || ENV["#{upcase_scheme}_PROXY_USER"]
@@ -196,7 +196,7 @@ def perform_request(request) # :nodoc:
     bad_response = false
 
     begin
-      @requests[connection.object_id] += 1
+      @requests[connection] += 1
 
       verbose "#{request.method} #{Gem::Uri.redact(@uri)}"
 
@@ -205,7 +205,7 @@ def perform_request(request) # :nodoc:
       if request.response_body_permitted? && file_name =~ /\.gem$/
         reporter = ui.download_reporter
         response = connection.request(request) do |incomplete_response|
-          if Net::HTTPOK === incomplete_response
+          if Gem::Net::HTTPOK === incomplete_response
             reporter.fetch(file_name, incomplete_response.content_length)
             downloaded = 0
             data = String.new
@@ -228,7 +228,7 @@ def perform_request(request) # :nodoc:
       end
 
       verbose "#{response.code} #{response.message}"
-    rescue Net::HTTPBadResponse
+    rescue Gem::Net::HTTPBadResponse
       verbose "bad response"
 
       reset connection
@@ -237,17 +237,17 @@ def perform_request(request) # :nodoc:
 
       bad_response = true
       retry
-    rescue Net::HTTPFatalError
+    rescue Gem::Net::HTTPFatalError
       verbose "fatal error"
 
       raise Gem::RemoteFetcher::FetchError.new("fatal error", @uri)
-    # HACK: work around EOFError bug in Net::HTTP
+    # HACK: work around EOFError bug in Gem::Net::HTTP
     # NOTE Errno::ECONNABORTED raised a lot on Windows, and make impossible
     # to install gems.
-    rescue EOFError, Timeout::Error,
+    rescue EOFError, Gem::Timeout::Error,
            Errno::ECONNABORTED, Errno::ECONNRESET, Errno::EPIPE
 
-      requests = @requests[connection.object_id]
+      requests = @requests[connection]
       verbose "connection reset after #{requests} requests, retrying"
 
       raise Gem::RemoteFetcher::FetchError.new("too many connection resets", @uri) if retried
@@ -267,7 +267,7 @@ def perform_request(request) # :nodoc:
   # Resets HTTP connection +connection+.
 
   def reset(connection)
-    @requests.delete connection.object_id
+    @requests.delete connection
 
     connection.finish
     connection.start
diff --git a/lib/rubygems/request/connection_pools.rb b/lib/rubygems/request/connection_pools.rb
index b7ad92f5c6878c..6c1b04ab6567d2 100644
--- a/lib/rubygems/request/connection_pools.rb
+++ b/lib/rubygems/request/connection_pools.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class Gem::Request::ConnectionPools # :nodoc:
-  @client = Net::HTTP
+  @client = Gem::Net::HTTP
 
   class << self
     attr_accessor :client
diff --git a/lib/rubygems/request_set.rb b/lib/rubygems/request_set.rb
index 46e9cc346c8667..5a855fdb104026 100644
--- a/lib/rubygems/request_set.rb
+++ b/lib/rubygems/request_set.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require_relative "tsort"
+require_relative "vendored_tsort"
 
 ##
 # A RequestSet groups a request to activate a set of dependencies.
@@ -181,13 +181,10 @@ def install(options, &block) # :yields: request, installer
 
     # Install requested gems after they have been downloaded
     sorted_requests.each do |req|
-      if req.installed?
+      if req.installed? && @always_install.none? {|spec| spec == req.spec.spec }
         req.spec.spec.build_extensions
-
-        if @always_install.none? {|spec| spec == req.spec.spec }
-          yield req, nil if block_given?
-          next
-        end
+        yield req, nil if block_given?
+        next
       end
 
       spec =
@@ -324,7 +321,7 @@ def load_gemdeps(path, without_groups = [], installing = false)
 
     @git_set.root_dir = @install_dir
 
-    lock_file = "#{File.expand_path(path)}.lock".dup.tap(&Gem::UNTAINT)
+    lock_file = "#{File.expand_path(path)}.lock"
     begin
       tokenizer = Gem::RequestSet::Lockfile::Tokenizer.from_file lock_file
       parser = tokenizer.make_parser self, []
diff --git a/lib/rubygems/request_set/gem_dependency_api.rb b/lib/rubygems/request_set/gem_dependency_api.rb
index 28e232cfd3590a..99d96f928bcc25 100644
--- a/lib/rubygems/request_set/gem_dependency_api.rb
+++ b/lib/rubygems/request_set/gem_dependency_api.rb
@@ -33,22 +33,22 @@
 
 class Gem::RequestSet::GemDependencyAPI
   ENGINE_MAP = { # :nodoc:
-    :jruby => %w[jruby],
-    :jruby_18 => %w[jruby],
-    :jruby_19 => %w[jruby],
-    :maglev => %w[maglev],
-    :mri => %w[ruby],
-    :mri_18 => %w[ruby],
-    :mri_19 => %w[ruby],
-    :mri_20 => %w[ruby],
-    :mri_21 => %w[ruby],
-    :rbx => %w[rbx],
-    :truffleruby => %w[truffleruby],
-    :ruby => %w[ruby rbx maglev truffleruby],
-    :ruby_18 => %w[ruby rbx maglev truffleruby],
-    :ruby_19 => %w[ruby rbx maglev truffleruby],
-    :ruby_20 => %w[ruby rbx maglev truffleruby],
-    :ruby_21 => %w[ruby rbx maglev truffleruby],
+    jruby: %w[jruby],
+    jruby_18: %w[jruby],
+    jruby_19: %w[jruby],
+    maglev: %w[maglev],
+    mri: %w[ruby],
+    mri_18: %w[ruby],
+    mri_19: %w[ruby],
+    mri_20: %w[ruby],
+    mri_21: %w[ruby],
+    rbx: %w[rbx],
+    truffleruby: %w[truffleruby],
+    ruby: %w[ruby rbx maglev truffleruby],
+    ruby_18: %w[ruby rbx maglev truffleruby],
+    ruby_19: %w[ruby rbx maglev truffleruby],
+    ruby_20: %w[ruby rbx maglev truffleruby],
+    ruby_21: %w[ruby rbx maglev truffleruby],
   }.freeze
 
   mswin     = Gem::Platform.new "x86-mswin32"
@@ -57,39 +57,39 @@ class Gem::RequestSet::GemDependencyAPI
   x64_mingw = Gem::Platform.new "x64-mingw32"
 
   PLATFORM_MAP = { # :nodoc:
-    :jruby => Gem::Platform::RUBY,
-    :jruby_18 => Gem::Platform::RUBY,
-    :jruby_19 => Gem::Platform::RUBY,
-    :maglev => Gem::Platform::RUBY,
-    :mingw => x86_mingw,
-    :mingw_18 => x86_mingw,
-    :mingw_19 => x86_mingw,
-    :mingw_20 => x86_mingw,
-    :mingw_21 => x86_mingw,
-    :mri => Gem::Platform::RUBY,
-    :mri_18 => Gem::Platform::RUBY,
-    :mri_19 => Gem::Platform::RUBY,
-    :mri_20 => Gem::Platform::RUBY,
-    :mri_21 => Gem::Platform::RUBY,
-    :mswin => mswin,
-    :mswin_18 => mswin,
-    :mswin_19 => mswin,
-    :mswin_20 => mswin,
-    :mswin_21 => mswin,
-    :mswin64 => mswin64,
-    :mswin64_19 => mswin64,
-    :mswin64_20 => mswin64,
-    :mswin64_21 => mswin64,
-    :rbx => Gem::Platform::RUBY,
-    :ruby => Gem::Platform::RUBY,
-    :ruby_18 => Gem::Platform::RUBY,
-    :ruby_19 => Gem::Platform::RUBY,
-    :ruby_20 => Gem::Platform::RUBY,
-    :ruby_21 => Gem::Platform::RUBY,
-    :truffleruby => Gem::Platform::RUBY,
-    :x64_mingw => x64_mingw,
-    :x64_mingw_20 => x64_mingw,
-    :x64_mingw_21 => x64_mingw,
+    jruby: Gem::Platform::RUBY,
+    jruby_18: Gem::Platform::RUBY,
+    jruby_19: Gem::Platform::RUBY,
+    maglev: Gem::Platform::RUBY,
+    mingw: x86_mingw,
+    mingw_18: x86_mingw,
+    mingw_19: x86_mingw,
+    mingw_20: x86_mingw,
+    mingw_21: x86_mingw,
+    mri: Gem::Platform::RUBY,
+    mri_18: Gem::Platform::RUBY,
+    mri_19: Gem::Platform::RUBY,
+    mri_20: Gem::Platform::RUBY,
+    mri_21: Gem::Platform::RUBY,
+    mswin: mswin,
+    mswin_18: mswin,
+    mswin_19: mswin,
+    mswin_20: mswin,
+    mswin_21: mswin,
+    mswin64: mswin64,
+    mswin64_19: mswin64,
+    mswin64_20: mswin64,
+    mswin64_21: mswin64,
+    rbx: Gem::Platform::RUBY,
+    ruby: Gem::Platform::RUBY,
+    ruby_18: Gem::Platform::RUBY,
+    ruby_19: Gem::Platform::RUBY,
+    ruby_20: Gem::Platform::RUBY,
+    ruby_21: Gem::Platform::RUBY,
+    truffleruby: Gem::Platform::RUBY,
+    x64_mingw: x64_mingw,
+    x64_mingw_20: x64_mingw,
+    x64_mingw_21: x64_mingw,
   }.freeze
 
   gt_eq_0        = Gem::Requirement.new ">= 0"
@@ -99,70 +99,70 @@ class Gem::RequestSet::GemDependencyAPI
   tilde_gt_2_1_0 = Gem::Requirement.new "~> 2.1.0"
 
   VERSION_MAP = { # :nodoc:
-    :jruby => gt_eq_0,
-    :jruby_18 => tilde_gt_1_8_0,
-    :jruby_19 => tilde_gt_1_9_0,
-    :maglev => gt_eq_0,
-    :mingw => gt_eq_0,
-    :mingw_18 => tilde_gt_1_8_0,
-    :mingw_19 => tilde_gt_1_9_0,
-    :mingw_20 => tilde_gt_2_0_0,
-    :mingw_21 => tilde_gt_2_1_0,
-    :mri => gt_eq_0,
-    :mri_18 => tilde_gt_1_8_0,
-    :mri_19 => tilde_gt_1_9_0,
-    :mri_20 => tilde_gt_2_0_0,
-    :mri_21 => tilde_gt_2_1_0,
-    :mswin => gt_eq_0,
-    :mswin_18 => tilde_gt_1_8_0,
-    :mswin_19 => tilde_gt_1_9_0,
-    :mswin_20 => tilde_gt_2_0_0,
-    :mswin_21 => tilde_gt_2_1_0,
-    :mswin64 => gt_eq_0,
-    :mswin64_19 => tilde_gt_1_9_0,
-    :mswin64_20 => tilde_gt_2_0_0,
-    :mswin64_21 => tilde_gt_2_1_0,
-    :rbx => gt_eq_0,
-    :ruby => gt_eq_0,
-    :ruby_18 => tilde_gt_1_8_0,
-    :ruby_19 => tilde_gt_1_9_0,
-    :ruby_20 => tilde_gt_2_0_0,
-    :ruby_21 => tilde_gt_2_1_0,
-    :truffleruby => gt_eq_0,
-    :x64_mingw => gt_eq_0,
-    :x64_mingw_20 => tilde_gt_2_0_0,
-    :x64_mingw_21 => tilde_gt_2_1_0,
+    jruby: gt_eq_0,
+    jruby_18: tilde_gt_1_8_0,
+    jruby_19: tilde_gt_1_9_0,
+    maglev: gt_eq_0,
+    mingw: gt_eq_0,
+    mingw_18: tilde_gt_1_8_0,
+    mingw_19: tilde_gt_1_9_0,
+    mingw_20: tilde_gt_2_0_0,
+    mingw_21: tilde_gt_2_1_0,
+    mri: gt_eq_0,
+    mri_18: tilde_gt_1_8_0,
+    mri_19: tilde_gt_1_9_0,
+    mri_20: tilde_gt_2_0_0,
+    mri_21: tilde_gt_2_1_0,
+    mswin: gt_eq_0,
+    mswin_18: tilde_gt_1_8_0,
+    mswin_19: tilde_gt_1_9_0,
+    mswin_20: tilde_gt_2_0_0,
+    mswin_21: tilde_gt_2_1_0,
+    mswin64: gt_eq_0,
+    mswin64_19: tilde_gt_1_9_0,
+    mswin64_20: tilde_gt_2_0_0,
+    mswin64_21: tilde_gt_2_1_0,
+    rbx: gt_eq_0,
+    ruby: gt_eq_0,
+    ruby_18: tilde_gt_1_8_0,
+    ruby_19: tilde_gt_1_9_0,
+    ruby_20: tilde_gt_2_0_0,
+    ruby_21: tilde_gt_2_1_0,
+    truffleruby: gt_eq_0,
+    x64_mingw: gt_eq_0,
+    x64_mingw_20: tilde_gt_2_0_0,
+    x64_mingw_21: tilde_gt_2_1_0,
   }.freeze
 
   WINDOWS = { # :nodoc:
-    :mingw => :only,
-    :mingw_18 => :only,
-    :mingw_19 => :only,
-    :mingw_20 => :only,
-    :mingw_21 => :only,
-    :mri => :never,
-    :mri_18 => :never,
-    :mri_19 => :never,
-    :mri_20 => :never,
-    :mri_21 => :never,
-    :mswin => :only,
-    :mswin_18 => :only,
-    :mswin_19 => :only,
-    :mswin_20 => :only,
-    :mswin_21 => :only,
-    :mswin64 => :only,
-    :mswin64_19 => :only,
-    :mswin64_20 => :only,
-    :mswin64_21 => :only,
-    :rbx => :never,
-    :ruby => :never,
-    :ruby_18 => :never,
-    :ruby_19 => :never,
-    :ruby_20 => :never,
-    :ruby_21 => :never,
-    :x64_mingw => :only,
-    :x64_mingw_20 => :only,
-    :x64_mingw_21 => :only,
+    mingw: :only,
+    mingw_18: :only,
+    mingw_19: :only,
+    mingw_20: :only,
+    mingw_21: :only,
+    mri: :never,
+    mri_18: :never,
+    mri_19: :never,
+    mri_20: :never,
+    mri_21: :never,
+    mswin: :only,
+    mswin_18: :only,
+    mswin_19: :only,
+    mswin_20: :only,
+    mswin_21: :only,
+    mswin64: :only,
+    mswin64_19: :only,
+    mswin64_20: :only,
+    mswin64_21: :only,
+    rbx: :never,
+    ruby: :never,
+    ruby_18: :never,
+    ruby_19: :never,
+    ruby_20: :never,
+    ruby_21: :never,
+    x64_mingw: :only,
+    x64_mingw_20: :only,
+    x64_mingw_21: :only,
   }.freeze
 
   ##
@@ -280,7 +280,7 @@ def installing=(installing) # :nodoc:
   # Loads the gem dependency file and returns self.
 
   def load
-    instance_eval File.read(@path).tap(&Gem::UNTAINT), @path, 1
+    instance_eval File.read(@path), @path, 1
 
     self
   end
@@ -330,7 +330,7 @@ def load
   # git: ::
   #   Install this dependency from a git repository:
   #
-  #     gem 'private_gem', git: git@my.company.example:private_gem.git'
+  #     gem 'private_gem', git: 'git@my.company.example:private_gem.git'
   #
   # gist: ::
   #   Install this dependency from the gist ID:
diff --git a/lib/rubygems/request_set/lockfile.rb b/lib/rubygems/request_set/lockfile.rb
index 7b115fe59b4ea9..c446b3ae51abd5 100644
--- a/lib/rubygems/request_set/lockfile.rb
+++ b/lib/rubygems/request_set/lockfile.rb
@@ -76,11 +76,6 @@ def initialize(request_set, gem_deps_file, dependencies)
     @dependencies  = dependencies
     @gem_deps_file = File.expand_path(gem_deps_file)
     @gem_deps_dir  = File.dirname(@gem_deps_file)
-
-    if RUBY_VERSION < "2.7"
-      @gem_deps_file.untaint unless gem_deps_file.tainted?
-    end
-
     @platforms = []
   end
 
diff --git a/lib/rubygems/requirement.rb b/lib/rubygems/requirement.rb
index 09497f1a2e8d56..0d3f98eb0fcf61 100644
--- a/lib/rubygems/requirement.rb
+++ b/lib/rubygems/requirement.rb
@@ -13,8 +13,8 @@ class Gem::Requirement
   OPS = { # :nodoc:
     "=" => lambda {|v, r| v == r },
     "!=" => lambda {|v, r| v != r },
-    ">" => lambda {|v, r| v >  r },
-    "<" => lambda {|v, r| v <  r },
+    ">" => lambda {|v, r| v > r },
+    "<" => lambda {|v, r| v < r },
     ">=" => lambda {|v, r| v >= r },
     "<=" => lambda {|v, r| v <= r },
     "~>" => lambda {|v, r| v >= r && v.release < r.bump },
@@ -22,13 +22,13 @@ class Gem::Requirement
 
   SOURCE_SET_REQUIREMENT = Struct.new(:for_lockfile).new "!" # :nodoc:
 
-  quoted = OPS.keys.map {|k| Regexp.quote k }.join "|"
-  PATTERN_RAW = "\\s*(#{quoted})?\\s*(#{Gem::Version::VERSION_PATTERN})\\s*" # :nodoc:
+  quoted = Regexp.union(OPS.keys)
+  PATTERN_RAW = "\\s*(#{quoted})?\\s*(#{Gem::Version::VERSION_PATTERN})\\s*".freeze # :nodoc:
 
   ##
   # A regular expression that matches a requirement
 
-  PATTERN = /\A#{PATTERN_RAW}\z/.freeze
+  PATTERN = /\A#{PATTERN_RAW}\z/
 
   ##
   # The default requirement matches any non-prerelease version
@@ -106,13 +106,15 @@ def self.parse(obj)
     unless PATTERN =~ obj.to_s
       raise BadRequirementError, "Illformed requirement [#{obj.inspect}]"
     end
+    op = -($1 || "=")
+    version = -$2
 
-    if $1 == ">=" && $2 == "0"
+    if op == ">=" && version == "0"
       DefaultRequirement
-    elsif $1 == ">=" && $2 == "0.a"
+    elsif op == ">=" && version == "0.a"
       DefaultPrereleaseRequirement
     else
-      [-($1 || "="), Gem::Version.new($2)]
+      [op, Gem::Version.new(version)]
     end
   end
 
@@ -201,7 +203,8 @@ def marshal_dump # :nodoc:
   def marshal_load(array) # :nodoc:
     @requirements = array[0]
 
-    raise TypeError, "wrong @requirements" unless Array === @requirements
+    raise TypeError, "wrong @requirements" unless Array === @requirements &&
+                                                  @requirements.all? {|r| r.size == 2 && (r.first.is_a?(String) || r[0] = "=") && r.last.is_a?(Gem::Version) }
   end
 
   def yaml_initialize(tag, vals) # :nodoc:
@@ -214,10 +217,6 @@ def init_with(coder) # :nodoc:
     yaml_initialize coder.tag, coder.map
   end
 
-  def to_yaml_properties # :nodoc:
-    ["@requirements"]
-  end
-
   def encode_with(coder) # :nodoc:
     coder.add "requirements", @requirements
   end
@@ -242,7 +241,7 @@ def pretty_print(q) # :nodoc:
   def satisfied_by?(version)
     raise ArgumentError, "Need a Gem::Version: #{version.inspect}" unless
       Gem::Version === version
-    requirements.all? {|op, rv| OPS[op].call version, rv }
+    requirements.all? {|op, rv| OPS.fetch(op).call version, rv }
   end
 
   alias_method :===, :satisfied_by?
@@ -284,6 +283,11 @@ def _sorted_requirements
   def _tilde_requirements
     @_tilde_requirements ||= _sorted_requirements.select {|r| r.first == "~>" }
   end
+
+  def initialize_copy(other) # :nodoc:
+    @requirements = other.requirements.dup
+    super
+  end
 end
 
 class Gem::Version
diff --git a/lib/rubygems/resolver.rb b/lib/rubygems/resolver.rb
index 620ba921bc4e10..9bf5f8093041d7 100644
--- a/lib/rubygems/resolver.rb
+++ b/lib/rubygems/resolver.rb
@@ -11,7 +11,7 @@
 # all the requirements.
 
 class Gem::Resolver
-  require_relative "resolver/molinillo"
+  require_relative "vendored_molinillo"
 
   ##
   # If the DEBUG_RESOLVER environment variable is set then debugging mode is
@@ -59,7 +59,7 @@ class Gem::Resolver
   def self.compose_sets(*sets)
     sets.compact!
 
-    sets = sets.map do |set|
+    sets = sets.flat_map do |set|
       case set
       when Gem::Resolver::BestSet then
         set
@@ -68,7 +68,7 @@ def self.compose_sets(*sets)
       else
         set
       end
-    end.flatten
+    end
 
     case sets.length
     when 0 then
@@ -167,7 +167,7 @@ def requests(s, act, reqs=[]) # :nodoc:
     reqs
   end
 
-  include Molinillo::UI
+  include Gem::Molinillo::UI
 
   def output
     @output ||= debug? ? $stdout : File.open(IO::NULL, "w")
@@ -177,14 +177,14 @@ def debug?
     DEBUG_RESOLVER
   end
 
-  include Molinillo::SpecificationProvider
+  include Gem::Molinillo::SpecificationProvider
 
   ##
   # Proceed with resolution! Returns an array of ActivationRequest objects.
 
   def resolve
-    Molinillo::Resolver.new(self, self).resolve(@needed.map {|d| DependencyRequest.new d, nil }).tsort.map(&:payload).compact
-  rescue Molinillo::VersionConflict => e
+    Gem::Molinillo::Resolver.new(self, self).resolve(@needed.map {|d| DependencyRequest.new d, nil }).tsort.filter_map(&:payload)
+  rescue Gem::Molinillo::VersionConflict => e
     conflict = e.conflicts.values.first
     raise Gem::DependencyResolutionError, Conflict.new(conflict.requirement_trees.first.first, conflict.existing, conflict.requirement)
   ensure
@@ -241,7 +241,7 @@ def search_for(dependency)
 
     sources.each do |source|
       groups[source].
-        sort_by {|spec| [spec.version, spec.platform =~ Gem::Platform.local ? 1 : 0] }. # rubocop:disable Performance/RegexpMatch
+        sort_by {|spec| [spec.version, -Gem::Platform.platform_specificity_match(spec.platform, Gem::Platform.local)] }.
         map {|spec| ActivationRequest.new spec, dependency }.
         each {|activation_request| activation_requests << activation_request }
     end
diff --git a/lib/rubygems/resolver/activation_request.rb b/lib/rubygems/resolver/activation_request.rb
index fc9ff58f5796f0..5c722001b1ae64 100644
--- a/lib/rubygems/resolver/activation_request.rb
+++ b/lib/rubygems/resolver/activation_request.rb
@@ -106,7 +106,7 @@ def installed?
       this_spec = full_spec
 
       Gem::Specification.any? do |s|
-        s == this_spec
+        s == this_spec && s.base_dir == this_spec.base_dir
       end
     end
   end
diff --git a/lib/rubygems/resolver/api_set.rb b/lib/rubygems/resolver/api_set.rb
index e8e37473616ece..9f6695a6a97455 100644
--- a/lib/rubygems/resolver/api_set.rb
+++ b/lib/rubygems/resolver/api_set.rb
@@ -30,7 +30,7 @@ class Gem::Resolver::APISet < Gem::Resolver::Set
   def initialize(dep_uri = "https://index.rubygems.org/info/")
     super()
 
-    dep_uri = URI dep_uri unless URI === dep_uri
+    dep_uri = Gem::URI dep_uri unless Gem::URI === dep_uri
 
     @dep_uri = dep_uri
     @uri     = dep_uri + ".."
@@ -104,16 +104,21 @@ def versions(name) # :nodoc:
     end
 
     uri = @dep_uri + name
-    str = Gem::RemoteFetcher.fetcher.fetch_path uri
 
-    lines(str).each do |ver|
-      number, platform, dependencies, requirements = parse_gem(ver)
+    begin
+      str = Gem::RemoteFetcher.fetcher.fetch_path uri
+    rescue Gem::RemoteFetcher::FetchError
+      @data[name] = []
+    else
+      lines(str).each do |ver|
+        number, platform, dependencies, requirements = parse_gem(ver)
 
-      platform ||= "ruby"
-      dependencies = dependencies.map {|dep_name, reqs| [dep_name, reqs.join(", ")] }
-      requirements = requirements.map {|req_name, reqs| [req_name.to_sym, reqs] }.to_h
+        platform ||= "ruby"
+        dependencies = dependencies.map {|dep_name, reqs| [dep_name, reqs.join(", ")] }
+        requirements = requirements.map {|req_name, reqs| [req_name.to_sym, reqs] }.to_h
 
-      @data[name] << { name: name, number: number, platform: platform, dependencies: dependencies, requirements: requirements }
+        @data[name] << { name: name, number: number, platform: platform, dependencies: dependencies, requirements: requirements }
+      end
     end
 
     @data[name]
diff --git a/lib/rubygems/resolver/api_set/gem_parser.rb b/lib/rubygems/resolver/api_set/gem_parser.rb
index 685c39558d675a..7dd9a89ebcdf18 100644
--- a/lib/rubygems/resolver/api_set/gem_parser.rb
+++ b/lib/rubygems/resolver/api_set/gem_parser.rb
@@ -4,9 +4,9 @@ class Gem::Resolver::APISet::GemParser
   def parse(line)
     version_and_platform, rest = line.split(" ", 2)
     version, platform = version_and_platform.split("-", 2)
-    dependencies, requirements = rest.split("|", 2).map {|s| s.split(",") } if rest
-    dependencies = dependencies ? dependencies.map {|d| parse_dependency(d) } : []
-    requirements = requirements ? requirements.map {|d| parse_dependency(d) } : []
+    dependencies, requirements = rest.split("|", 2).map! {|s| s.split(",") } if rest
+    dependencies = dependencies ? dependencies.map! {|d| parse_dependency(d) } : []
+    requirements = requirements ? requirements.map! {|d| parse_dependency(d) } : []
     [version, platform, dependencies, requirements]
   end
 
@@ -15,6 +15,7 @@ def parse(line)
   def parse_dependency(string)
     dependency = string.split(":")
     dependency[-1] = dependency[-1].split("&") if dependency.size > 1
+    dependency[0] = -dependency[0]
     dependency
   end
 end
diff --git a/lib/rubygems/resolver/api_specification.rb b/lib/rubygems/resolver/api_specification.rb
index f26f82757e2988..a14bcbfeb1a6a5 100644
--- a/lib/rubygems/resolver/api_specification.rb
+++ b/lib/rubygems/resolver/api_specification.rb
@@ -22,7 +22,7 @@ def self.new(set, api_data)
   # Creates an APISpecification for the given +set+ from the rubygems.org
   # +api_data+.
   #
-  # See https://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/resolver/best_set.rb b/lib/rubygems/resolver/best_set.rb
index c2e898204796fa..e647a2c11bc035 100644
--- a/lib/rubygems/resolver/best_set.rb
+++ b/lib/rubygems/resolver/best_set.rb
@@ -21,7 +21,7 @@ def initialize(sources = Gem.sources)
 
   def pick_sets # :nodoc:
     @sources.each_source do |source|
-      @sets << source.dependency_resolver_set
+      @sets << source.dependency_resolver_set(@prerelease)
     end
   end
 
@@ -29,10 +29,6 @@ def find_all(req) # :nodoc:
     pick_sets if @remote && @sets.empty?
 
     super
-  rescue Gem::RemoteFetcher::FetchError => e
-    replace_failed_api_set e
-
-    retry
   end
 
   def prefetch(reqs) # :nodoc:
@@ -50,28 +46,4 @@ def pretty_print(q) # :nodoc:
       q.pp @sets
     end
   end
-
-  ##
-  # Replaces a failed APISet for the URI in +error+ with an IndexSet.
-  #
-  # If no matching APISet can be found the original +error+ is raised.
-  #
-  # The calling method must retry the exception to repeat the lookup.
-
-  def replace_failed_api_set(error) # :nodoc:
-    uri = error.original_uri
-    uri = URI uri unless URI === uri
-    uri += "."
-
-    raise error unless api_set = @sets.find do |set|
-      Gem::Resolver::APISet === set && set.dep_uri == uri
-    end
-
-    index_set = Gem::Resolver::IndexSet.new api_set.source
-
-    @sets.map! do |set|
-      next set unless set == api_set
-      index_set
-    end
-  end
 end
diff --git a/lib/rubygems/resolver/composed_set.rb b/lib/rubygems/resolver/composed_set.rb
index 8a714ad447d173..e67dd4175456f1 100644
--- a/lib/rubygems/resolver/composed_set.rb
+++ b/lib/rubygems/resolver/composed_set.rb
@@ -44,16 +44,16 @@ def remote=(remote)
   end
 
   def errors
-    @errors + @sets.map(&:errors).flatten
+    @errors + @sets.flat_map(&:errors)
   end
 
   ##
   # Finds all specs matching +req+ in all sets.
 
   def find_all(req)
-    @sets.map do |s|
+    @sets.flat_map do |s|
       s.find_all req
-    end.flatten
+    end
   end
 
   ##
diff --git a/lib/rubygems/resolver/git_set.rb b/lib/rubygems/resolver/git_set.rb
index 89342ff80d8bca..2912378fe76bf4 100644
--- a/lib/rubygems/resolver/git_set.rb
+++ b/lib/rubygems/resolver/git_set.rb
@@ -36,7 +36,6 @@ class Gem::Resolver::GitSet < Gem::Resolver::Set
   def initialize # :nodoc:
     super()
 
-    @git             = ENV["git"] || "git"
     @need_submodules = {}
     @repositories    = {}
     @root_dir        = Gem.dir
diff --git a/lib/rubygems/resolver/index_set.rb b/lib/rubygems/resolver/index_set.rb
index 0b4f376452bedb..cddaf8773fb3f6 100644
--- a/lib/rubygems/resolver/index_set.rb
+++ b/lib/rubygems/resolver/index_set.rb
@@ -65,11 +65,11 @@ def pretty_print(q) # :nodoc:
 
       q.breakable
 
-      names = @all.values.map do |tuples|
+      names = @all.values.flat_map do |tuples|
         tuples.map do |_, tuple|
           tuple.full_name
         end
-      end.flatten
+      end
 
       q.seplist names do |name|
         q.text name
diff --git a/lib/rubygems/resolver/molinillo.rb b/lib/rubygems/resolver/molinillo.rb
deleted file mode 100644
index d703505410c00c..00000000000000
--- a/lib/rubygems/resolver/molinillo.rb
+++ /dev/null
@@ -1,3 +0,0 @@
-# frozen_string_literal: true
-
-require_relative "molinillo/lib/molinillo"
diff --git a/lib/rubygems/resolver/molinillo/lib/molinillo.rb b/lib/rubygems/resolver/molinillo/lib/molinillo.rb
deleted file mode 100644
index f67badbde79022..00000000000000
--- a/lib/rubygems/resolver/molinillo/lib/molinillo.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-# frozen_string_literal: true
-
-require_relative 'molinillo/gem_metadata'
-require_relative 'molinillo/errors'
-require_relative 'molinillo/resolver'
-require_relative 'molinillo/modules/ui'
-require_relative 'molinillo/modules/specification_provider'
-
-# Gem::Resolver::Molinillo is a generic dependency resolution algorithm.
-module Gem::Resolver::Molinillo
-end
diff --git a/lib/rubygems/resolver/molinillo/lib/molinillo/delegates/resolution_state.rb b/lib/rubygems/resolver/molinillo/lib/molinillo/delegates/resolution_state.rb
deleted file mode 100644
index d540d3baffc8fa..00000000000000
--- a/lib/rubygems/resolver/molinillo/lib/molinillo/delegates/resolution_state.rb
+++ /dev/null
@@ -1,57 +0,0 @@
-# frozen_string_literal: true
-
-module Gem::Resolver::Molinillo
-  # @!visibility private
-  module Delegates
-    # Delegates all {Gem::Resolver::Molinillo::ResolutionState} methods to a `#state` property.
-    module ResolutionState
-      # (see Gem::Resolver::Molinillo::ResolutionState#name)
-      def name
-        current_state = state || Gem::Resolver::Molinillo::ResolutionState.empty
-        current_state.name
-      end
-
-      # (see Gem::Resolver::Molinillo::ResolutionState#requirements)
-      def requirements
-        current_state = state || Gem::Resolver::Molinillo::ResolutionState.empty
-        current_state.requirements
-      end
-
-      # (see Gem::Resolver::Molinillo::ResolutionState#activated)
-      def activated
-        current_state = state || Gem::Resolver::Molinillo::ResolutionState.empty
-        current_state.activated
-      end
-
-      # (see Gem::Resolver::Molinillo::ResolutionState#requirement)
-      def requirement
-        current_state = state || Gem::Resolver::Molinillo::ResolutionState.empty
-        current_state.requirement
-      end
-
-      # (see Gem::Resolver::Molinillo::ResolutionState#possibilities)
-      def possibilities
-        current_state = state || Gem::Resolver::Molinillo::ResolutionState.empty
-        current_state.possibilities
-      end
-
-      # (see Gem::Resolver::Molinillo::ResolutionState#depth)
-      def depth
-        current_state = state || Gem::Resolver::Molinillo::ResolutionState.empty
-        current_state.depth
-      end
-
-      # (see Gem::Resolver::Molinillo::ResolutionState#conflicts)
-      def conflicts
-        current_state = state || Gem::Resolver::Molinillo::ResolutionState.empty
-        current_state.conflicts
-      end
-
-      # (see Gem::Resolver::Molinillo::ResolutionState#unused_unwind_options)
-      def unused_unwind_options
-        current_state = state || Gem::Resolver::Molinillo::ResolutionState.empty
-        current_state.unused_unwind_options
-      end
-    end
-  end
-end
diff --git a/lib/rubygems/resolver/molinillo/lib/molinillo/delegates/specification_provider.rb b/lib/rubygems/resolver/molinillo/lib/molinillo/delegates/specification_provider.rb
deleted file mode 100644
index b765226fb00743..00000000000000
--- a/lib/rubygems/resolver/molinillo/lib/molinillo/delegates/specification_provider.rb
+++ /dev/null
@@ -1,88 +0,0 @@
-# frozen_string_literal: true
-
-module Gem::Resolver::Molinillo
-  module Delegates
-    # Delegates all {Gem::Resolver::Molinillo::SpecificationProvider} methods to a
-    # `#specification_provider` property.
-    module SpecificationProvider
-      # (see Gem::Resolver::Molinillo::SpecificationProvider#search_for)
-      def search_for(dependency)
-        with_no_such_dependency_error_handling do
-          specification_provider.search_for(dependency)
-        end
-      end
-
-      # (see Gem::Resolver::Molinillo::SpecificationProvider#dependencies_for)
-      def dependencies_for(specification)
-        with_no_such_dependency_error_handling do
-          specification_provider.dependencies_for(specification)
-        end
-      end
-
-      # (see Gem::Resolver::Molinillo::SpecificationProvider#requirement_satisfied_by?)
-      def requirement_satisfied_by?(requirement, activated, spec)
-        with_no_such_dependency_error_handling do
-          specification_provider.requirement_satisfied_by?(requirement, activated, spec)
-        end
-      end
-
-      # (see Gem::Resolver::Molinillo::SpecificationProvider#dependencies_equal?)
-      def dependencies_equal?(dependencies, other_dependencies)
-        with_no_such_dependency_error_handling do
-          specification_provider.dependencies_equal?(dependencies, other_dependencies)
-        end
-      end
-
-      # (see Gem::Resolver::Molinillo::SpecificationProvider#name_for)
-      def name_for(dependency)
-        with_no_such_dependency_error_handling do
-          specification_provider.name_for(dependency)
-        end
-      end
-
-      # (see Gem::Resolver::Molinillo::SpecificationProvider#name_for_explicit_dependency_source)
-      def name_for_explicit_dependency_source
-        with_no_such_dependency_error_handling do
-          specification_provider.name_for_explicit_dependency_source
-        end
-      end
-
-      # (see Gem::Resolver::Molinillo::SpecificationProvider#name_for_locking_dependency_source)
-      def name_for_locking_dependency_source
-        with_no_such_dependency_error_handling do
-          specification_provider.name_for_locking_dependency_source
-        end
-      end
-
-      # (see Gem::Resolver::Molinillo::SpecificationProvider#sort_dependencies)
-      def sort_dependencies(dependencies, activated, conflicts)
-        with_no_such_dependency_error_handling do
-          specification_provider.sort_dependencies(dependencies, activated, conflicts)
-        end
-      end
-
-      # (see Gem::Resolver::Molinillo::SpecificationProvider#allow_missing?)
-      def allow_missing?(dependency)
-        with_no_such_dependency_error_handling do
-          specification_provider.allow_missing?(dependency)
-        end
-      end
-
-      private
-
-      # Ensures any raised {NoSuchDependencyError} has its
-      # {NoSuchDependencyError#required_by} set.
-      # @yield
-      def with_no_such_dependency_error_handling
-        yield
-      rescue NoSuchDependencyError => error
-        if state
-          vertex = activated.vertex_named(name_for(error.dependency))
-          error.required_by += vertex.incoming_edges.map { |e| e.origin.name }
-          error.required_by << name_for_explicit_dependency_source unless vertex.explicit_requirements.empty?
-        end
-        raise
-      end
-    end
-  end
-end
diff --git a/lib/rubygems/resolver/molinillo/lib/molinillo/dependency_graph/log.rb b/lib/rubygems/resolver/molinillo/lib/molinillo/dependency_graph/log.rb
deleted file mode 100644
index 7aeb8847ec60ee..00000000000000
--- a/lib/rubygems/resolver/molinillo/lib/molinillo/dependency_graph/log.rb
+++ /dev/null
@@ -1,126 +0,0 @@
-# frozen_string_literal: true
-
-require_relative 'add_edge_no_circular'
-require_relative 'add_vertex'
-require_relative 'delete_edge'
-require_relative 'detach_vertex_named'
-require_relative 'set_payload'
-require_relative 'tag'
-
-module Gem::Resolver::Molinillo
-  class DependencyGraph
-    # A log for dependency graph actions
-    class Log
-      # Initializes an empty log
-      def initialize
-        @current_action = @first_action = nil
-      end
-
-      # @!macro [new] action
-      #   {include:DependencyGraph#$0}
-      #   @param [Graph] graph the graph to perform the action on
-      #   @param (see DependencyGraph#$0)
-      #   @return (see DependencyGraph#$0)
-
-      # @macro action
-      def tag(graph, tag)
-        push_action(graph, Tag.new(tag))
-      end
-
-      # @macro action
-      def add_vertex(graph, name, payload, root)
-        push_action(graph, AddVertex.new(name, payload, root))
-      end
-
-      # @macro action
-      def detach_vertex_named(graph, name)
-        push_action(graph, DetachVertexNamed.new(name))
-      end
-
-      # @macro action
-      def add_edge_no_circular(graph, origin, destination, requirement)
-        push_action(graph, AddEdgeNoCircular.new(origin, destination, requirement))
-      end
-
-      # {include:DependencyGraph#delete_edge}
-      # @param [Graph] graph the graph to perform the action on
-      # @param [String] origin_name
-      # @param [String] destination_name
-      # @param [Object] requirement
-      # @return (see DependencyGraph#delete_edge)
-      def delete_edge(graph, origin_name, destination_name, requirement)
-        push_action(graph, DeleteEdge.new(origin_name, destination_name, requirement))
-      end
-
-      # @macro action
-      def set_payload(graph, name, payload)
-        push_action(graph, SetPayload.new(name, payload))
-      end
-
-      # Pops the most recent action from the log and undoes the action
-      # @param [DependencyGraph] graph
-      # @return [Action] the action that was popped off the log
-      def pop!(graph)
-        return unless action = @current_action
-        unless @current_action = action.previous
-          @first_action = nil
-        end
-        action.down(graph)
-        action
-      end
-
-      extend Enumerable
-
-      # @!visibility private
-      # Enumerates each action in the log
-      # @yield [Action]
-      def each
-        return enum_for unless block_given?
-        action = @first_action
-        loop do
-          break unless action
-          yield action
-          action = action.next
-        end
-        self
-      end
-
-      # @!visibility private
-      # Enumerates each action in the log in reverse order
-      # @yield [Action]
-      def reverse_each
-        return enum_for(:reverse_each) unless block_given?
-        action = @current_action
-        loop do
-          break unless action
-          yield action
-          action = action.previous
-        end
-        self
-      end
-
-      # @macro action
-      def rewind_to(graph, tag)
-        loop do
-          action = pop!(graph)
-          raise "No tag #{tag.inspect} found" unless action
-          break if action.class.action_name == :tag && action.tag == tag
-        end
-      end
-
-      private
-
-      # Adds the given action to the log, running the action
-      # @param [DependencyGraph] graph
-      # @param [Action] action
-      # @return The value returned by `action.up`
-      def push_action(graph, action)
-        action.previous = @current_action
-        @current_action.next = action if @current_action
-        @current_action = action
-        @first_action ||= action
-        action.up(graph)
-      end
-    end
-  end
-end
diff --git a/lib/rubygems/resolver/molinillo/lib/molinillo/dependency_graph/tag.rb b/lib/rubygems/resolver/molinillo/lib/molinillo/dependency_graph/tag.rb
deleted file mode 100644
index bfe6fd31f8f4aa..00000000000000
--- a/lib/rubygems/resolver/molinillo/lib/molinillo/dependency_graph/tag.rb
+++ /dev/null
@@ -1,36 +0,0 @@
-# frozen_string_literal: true
-
-require_relative 'action'
-module Gem::Resolver::Molinillo
-  class DependencyGraph
-    # @!visibility private
-    # @see DependencyGraph#tag
-    class Tag < Action
-      # @!group Action
-
-      # (see Action.action_name)
-      def self.action_name
-        :tag
-      end
-
-      # (see Action#up)
-      def up(graph)
-      end
-
-      # (see Action#down)
-      def down(graph)
-      end
-
-      # @!group Tag
-
-      # @return [Object] An opaque tag
-      attr_reader :tag
-
-      # Initialize an action to tag a state of a dependency graph
-      # @param [Object] tag an opaque tag
-      def initialize(tag)
-        @tag = tag
-      end
-    end
-  end
-end
diff --git a/lib/rubygems/resolver/molinillo/lib/molinillo/errors.rb b/lib/rubygems/resolver/molinillo/lib/molinillo/errors.rb
deleted file mode 100644
index 42899028284615..00000000000000
--- a/lib/rubygems/resolver/molinillo/lib/molinillo/errors.rb
+++ /dev/null
@@ -1,149 +0,0 @@
-# frozen_string_literal: true
-
-module Gem::Resolver::Molinillo
-  # An error that occurred during the resolution process
-  class ResolverError < StandardError; end
-
-  # An error caused by searching for a dependency that is completely unknown,
-  # i.e. has no versions available whatsoever.
-  class NoSuchDependencyError < ResolverError
-    # @return [Object] the dependency that could not be found
-    attr_accessor :dependency
-
-    # @return [Array<Object>] the specifications that depended upon {#dependency}
-    attr_accessor :required_by
-
-    # Initializes a new error with the given missing dependency.
-    # @param [Object] dependency @see {#dependency}
-    # @param [Array<Object>] required_by @see {#required_by}
-    def initialize(dependency, required_by = [])
-      @dependency = dependency
-      @required_by = required_by.uniq
-      super()
-    end
-
-    # The error message for the missing dependency, including the specifications
-    # that had this dependency.
-    def message
-      sources = required_by.map { |r| "`#{r}`" }.join(' and ')
-      message = "Unable to find a specification for `#{dependency}`"
-      message += " depended upon by #{sources}" unless sources.empty?
-      message
-    end
-  end
-
-  # An error caused by attempting to fulfil a dependency that was circular
-  #
-  # @note This exception will be thrown if and only if a {Vertex} is added to a
-  #   {DependencyGraph} that has a {DependencyGraph::Vertex#path_to?} an
-  #   existing {DependencyGraph::Vertex}
-  class CircularDependencyError < ResolverError
-    # [Set<Object>] the dependencies responsible for causing the error
-    attr_reader :dependencies
-
-    # Initializes a new error with the given circular vertices.
-    # @param [Array<DependencyGraph::Vertex>] vertices the vertices in the dependency
-    #   that caused the error
-    def initialize(vertices)
-      super "There is a circular dependency between #{vertices.map(&:name).join(' and ')}"
-      @dependencies = vertices.map { |vertex| vertex.payload.possibilities.last }.to_set
-    end
-  end
-
-  # An error caused by conflicts in version
-  class VersionConflict < ResolverError
-    # @return [{String => Resolution::Conflict}] the conflicts that caused
-    #   resolution to fail
-    attr_reader :conflicts
-
-    # @return [SpecificationProvider] the specification provider used during
-    #   resolution
-    attr_reader :specification_provider
-
-    # Initializes a new error with the given version conflicts.
-    # @param [{String => Resolution::Conflict}] conflicts see {#conflicts}
-    # @param [SpecificationProvider] specification_provider see {#specification_provider}
-    def initialize(conflicts, specification_provider)
-      pairs = []
-      conflicts.values.flat_map(&:requirements).each do |conflicting|
-        conflicting.each do |source, conflict_requirements|
-          conflict_requirements.each do |c|
-            pairs << [c, source]
-          end
-        end
-      end
-
-      super "Unable to satisfy the following requirements:\n\n" \
-        "#{pairs.map { |r, d| "- `#{r}` required by `#{d}`" }.join("\n")}"
-
-      @conflicts = conflicts
-      @specification_provider = specification_provider
-    end
-
-    require_relative 'delegates/specification_provider'
-    include Delegates::SpecificationProvider
-
-    # @return [String] An error message that includes requirement trees,
-    #   which is much more detailed & customizable than the default message
-    # @param [Hash] opts the options to create a message with.
-    # @option opts [String] :solver_name The user-facing name of the solver
-    # @option opts [String] :possibility_type The generic name of a possibility
-    # @option opts [Proc] :reduce_trees A proc that reduced the list of requirement trees
-    # @option opts [Proc] :printable_requirement A proc that pretty-prints requirements
-    # @option opts [Proc] :additional_message_for_conflict A proc that appends additional
-    #   messages for each conflict
-    # @option opts [Proc] :version_for_spec A proc that returns the version number for a
-    #   possibility
-    def message_with_trees(opts = {})
-      solver_name = opts.delete(:solver_name) { self.class.name.split('::').first }
-      possibility_type = opts.delete(:possibility_type) { 'possibility named' }
-      reduce_trees = opts.delete(:reduce_trees) { proc { |trees| trees.uniq.sort_by(&:to_s) } }
-      printable_requirement = opts.delete(:printable_requirement) { proc { |req| req.to_s } }
-      additional_message_for_conflict = opts.delete(:additional_message_for_conflict) { proc {} }
-      version_for_spec = opts.delete(:version_for_spec) { proc(&:to_s) }
-      incompatible_version_message_for_conflict = opts.delete(:incompatible_version_message_for_conflict) do
-        proc do |name, _conflict|
-          %(#{solver_name} could not find compatible versions for #{possibility_type} "#{name}":)
-        end
-      end
-
-      full_message_for_conflict = opts.delete(:full_message_for_conflict) do
-        proc do |name, conflict|
-          o = "\n".dup << incompatible_version_message_for_conflict.call(name, conflict) << "\n"
-          if conflict.locked_requirement
-            o << %(  In snapshot (#{name_for_locking_dependency_source}):\n)
-            o << %(    #{printable_requirement.call(conflict.locked_requirement)}\n)
-            o << %(\n)
-          end
-          o << %(  In #{name_for_explicit_dependency_source}:\n)
-          trees = reduce_trees.call(conflict.requirement_trees)
-
-          o << trees.map do |tree|
-            t = ''.dup
-            depth = 2
-            tree.each do |req|
-              t << '  ' * depth << printable_requirement.call(req)
-              unless tree.last == req
-                if spec = conflict.activated_by_name[name_for(req)]
-                  t << %( was resolved to #{version_for_spec.call(spec)}, which)
-                end
-                t << %( depends on)
-              end
-              t << %(\n)
-              depth += 1
-            end
-            t
-          end.join("\n")
-
-          additional_message_for_conflict.call(o, name, conflict)
-
-          o
-        end
-      end
-
-      conflicts.sort.reduce(''.dup) do |o, (name, conflict)|
-        o << full_message_for_conflict.call(name, conflict)
-      end.strip
-    end
-  end
-end
diff --git a/lib/rubygems/resolver/molinillo/lib/molinillo/gem_metadata.rb b/lib/rubygems/resolver/molinillo/lib/molinillo/gem_metadata.rb
deleted file mode 100644
index 86c249c40455d4..00000000000000
--- a/lib/rubygems/resolver/molinillo/lib/molinillo/gem_metadata.rb
+++ /dev/null
@@ -1,6 +0,0 @@
-# frozen_string_literal: true
-
-module Gem::Resolver::Molinillo
-  # The version of Gem::Resolver::Molinillo.
-  VERSION = '0.8.0'.freeze
-end
diff --git a/lib/rubygems/resolver/molinillo/lib/molinillo/modules/specification_provider.rb b/lib/rubygems/resolver/molinillo/lib/molinillo/modules/specification_provider.rb
deleted file mode 100644
index 1067bf7439d6e7..00000000000000
--- a/lib/rubygems/resolver/molinillo/lib/molinillo/modules/specification_provider.rb
+++ /dev/null
@@ -1,112 +0,0 @@
-# frozen_string_literal: true
-
-module Gem::Resolver::Molinillo
-  # Provides information about specifications and dependencies to the resolver,
-  # allowing the {Resolver} class to remain generic while still providing power
-  # and flexibility.
-  #
-  # This module contains the methods that users of Gem::Resolver::Molinillo must to implement,
-  # using knowledge of their own model classes.
-  module SpecificationProvider
-    # Search for the specifications that match the given dependency.
-    # The specifications in the returned array will be considered in reverse
-    # order, so the latest version ought to be last.
-    # @note This method should be 'pure', i.e. the return value should depend
-    #   only on the `dependency` parameter.
-    #
-    # @param [Object] dependency
-    # @return [Array<Object>] the specifications that satisfy the given
-    #   `dependency`.
-    def search_for(dependency)
-      []
-    end
-
-    # Returns the dependencies of `specification`.
-    # @note This method should be 'pure', i.e. the return value should depend
-    #   only on the `specification` parameter.
-    #
-    # @param [Object] specification
-    # @return [Array<Object>] the dependencies that are required by the given
-    #   `specification`.
-    def dependencies_for(specification)
-      []
-    end
-
-    # Determines whether the given `requirement` is satisfied by the given
-    # `spec`, in the context of the current `activated` dependency graph.
-    #
-    # @param [Object] requirement
-    # @param [DependencyGraph] activated the current dependency graph in the
-    #   resolution process.
-    # @param [Object] spec
-    # @return [Boolean] whether `requirement` is satisfied by `spec` in the
-    #   context of the current `activated` dependency graph.
-    def requirement_satisfied_by?(requirement, activated, spec)
-      true
-    end
-
-    # Determines whether two arrays of dependencies are equal, and thus can be
-    # grouped.
-    #
-    # @param [Array<Object>] dependencies
-    # @param [Array<Object>] other_dependencies
-    # @return [Boolean] whether `dependencies` and `other_dependencies` should
-    #   be considered equal.
-    def dependencies_equal?(dependencies, other_dependencies)
-      dependencies == other_dependencies
-    end
-
-    # Returns the name for the given `dependency`.
-    # @note This method should be 'pure', i.e. the return value should depend
-    #   only on the `dependency` parameter.
-    #
-    # @param [Object] dependency
-    # @return [String] the name for the given `dependency`.
-    def name_for(dependency)
-      dependency.to_s
-    end
-
-    # @return [String] the name of the source of explicit dependencies, i.e.
-    #   those passed to {Resolver#resolve} directly.
-    def name_for_explicit_dependency_source
-      'user-specified dependency'
-    end
-
-    # @return [String] the name of the source of 'locked' dependencies, i.e.
-    #   those passed to {Resolver#resolve} directly as the `base`
-    def name_for_locking_dependency_source
-      'Lockfile'
-    end
-
-    # Sort dependencies so that the ones that are easiest to resolve are first.
-    # Easiest to resolve is (usually) defined by:
-    #   1) Is this dependency already activated?
-    #   2) How relaxed are the requirements?
-    #   3) Are there any conflicts for this dependency?
-    #   4) How many possibilities are there to satisfy this dependency?
-    #
-    # @param [Array<Object>] dependencies
-    # @param [DependencyGraph] activated the current dependency graph in the
-    #   resolution process.
-    # @param [{String => Array<Conflict>}] conflicts
-    # @return [Array<Object>] a sorted copy of `dependencies`.
-    def sort_dependencies(dependencies, activated, conflicts)
-      dependencies.sort_by do |dependency|
-        name = name_for(dependency)
-        [
-          activated.vertex_named(name).payload ? 0 : 1,
-          conflicts[name] ? 0 : 1,
-        ]
-      end
-    end
-
-    # Returns whether this dependency, which has no possible matching
-    # specifications, can safely be ignored.
-    #
-    # @param [Object] dependency
-    # @return [Boolean] whether this dependency can safely be skipped.
-    def allow_missing?(dependency)
-      false
-    end
-  end
-end
diff --git a/lib/rubygems/resolver/molinillo/lib/molinillo/modules/ui.rb b/lib/rubygems/resolver/molinillo/lib/molinillo/modules/ui.rb
deleted file mode 100644
index a810fd519cdeb8..00000000000000
--- a/lib/rubygems/resolver/molinillo/lib/molinillo/modules/ui.rb
+++ /dev/null
@@ -1,67 +0,0 @@
-# frozen_string_literal: true
-
-module Gem::Resolver::Molinillo
-  # Conveys information about the resolution process to a user.
-  module UI
-    # The {IO} object that should be used to print output. `STDOUT`, by default.
-    #
-    # @return [IO]
-    def output
-      STDOUT
-    end
-
-    # Called roughly every {#progress_rate}, this method should convey progress
-    # to the user.
-    #
-    # @return [void]
-    def indicate_progress
-      output.print '.' unless debug?
-    end
-
-    # How often progress should be conveyed to the user via
-    # {#indicate_progress}, in seconds. A third of a second, by default.
-    #
-    # @return [Float]
-    def progress_rate
-      0.33
-    end
-
-    # Called before resolution begins.
-    #
-    # @return [void]
-    def before_resolution
-      output.print 'Resolving dependencies...'
-    end
-
-    # Called after resolution ends (either successfully or with an error).
-    # By default, prints a newline.
-    #
-    # @return [void]
-    def after_resolution
-      output.puts
-    end
-
-    # Conveys debug information to the user.
-    #
-    # @param [Integer] depth the current depth of the resolution process.
-    # @return [void]
-    def debug(depth = 0)
-      if debug?
-        debug_info = yield
-        debug_info = debug_info.inspect unless debug_info.is_a?(String)
-        debug_info = debug_info.split("\n").map { |s| ":#{depth.to_s.rjust 4}: #{s}" }
-        output.puts debug_info
-      end
-    end
-
-    # Whether or not debug messages should be printed.
-    # By default, whether or not the `MOLINILLO_DEBUG` environment variable is
-    # set.
-    #
-    # @return [Boolean]
-    def debug?
-      return @debug_mode if defined?(@debug_mode)
-      @debug_mode = ENV['MOLINILLO_DEBUG']
-    end
-  end
-end
diff --git a/lib/rubygems/resolver/molinillo/lib/molinillo/resolver.rb b/lib/rubygems/resolver/molinillo/lib/molinillo/resolver.rb
deleted file mode 100644
index d43121f8ca6706..00000000000000
--- a/lib/rubygems/resolver/molinillo/lib/molinillo/resolver.rb
+++ /dev/null
@@ -1,46 +0,0 @@
-# frozen_string_literal: true
-
-require_relative 'dependency_graph'
-
-module Gem::Resolver::Molinillo
-  # This class encapsulates a dependency resolver.
-  # The resolver is responsible for determining which set of dependencies to
-  # activate, with feedback from the {#specification_provider}
-  #
-  #
-  class Resolver
-    require_relative 'resolution'
-
-    # @return [SpecificationProvider] the specification provider used
-    #   in the resolution process
-    attr_reader :specification_provider
-
-    # @return [UI] the UI module used to communicate back to the user
-    #   during the resolution process
-    attr_reader :resolver_ui
-
-    # Initializes a new resolver.
-    # @param  [SpecificationProvider] specification_provider
-    #   see {#specification_provider}
-    # @param  [UI] resolver_ui
-    #   see {#resolver_ui}
-    def initialize(specification_provider, resolver_ui)
-      @specification_provider = specification_provider
-      @resolver_ui = resolver_ui
-    end
-
-    # Resolves the requested dependencies into a {DependencyGraph},
-    # locking to the base dependency graph (if specified)
-    # @param [Array] requested an array of 'requested' dependencies that the
-    #   {#specification_provider} can understand
-    # @param [DependencyGraph,nil] base the base dependency graph to which
-    #   dependencies should be 'locked'
-    def resolve(requested, base = DependencyGraph.new)
-      Resolution.new(specification_provider,
-                     resolver_ui,
-                     requested,
-                     base).
-        resolve
-    end
-  end
-end
diff --git a/lib/rubygems/resolver/molinillo/lib/molinillo/state.rb b/lib/rubygems/resolver/molinillo/lib/molinillo/state.rb
deleted file mode 100644
index 6e7c715fcedd76..00000000000000
--- a/lib/rubygems/resolver/molinillo/lib/molinillo/state.rb
+++ /dev/null
@@ -1,58 +0,0 @@
-# frozen_string_literal: true
-
-module Gem::Resolver::Molinillo
-  # A state that a {Resolution} can be in
-  # @attr [String] name the name of the current requirement
-  # @attr [Array<Object>] requirements currently unsatisfied requirements
-  # @attr [DependencyGraph] activated the graph of activated dependencies
-  # @attr [Object] requirement the current requirement
-  # @attr [Object] possibilities the possibilities to satisfy the current requirement
-  # @attr [Integer] depth the depth of the resolution
-  # @attr [Hash] conflicts unresolved conflicts, indexed by dependency name
-  # @attr [Array<UnwindDetails>] unused_unwind_options unwinds for previous conflicts that weren't explored
-  ResolutionState = Struct.new(
-    :name,
-    :requirements,
-    :activated,
-    :requirement,
-    :possibilities,
-    :depth,
-    :conflicts,
-    :unused_unwind_options
-  )
-
-  class ResolutionState
-    # Returns an empty resolution state
-    # @return [ResolutionState] an empty state
-    def self.empty
-      new(nil, [], DependencyGraph.new, nil, nil, 0, {}, [])
-    end
-  end
-
-  # A state that encapsulates a set of {#requirements} with an {Array} of
-  # possibilities
-  class DependencyState < ResolutionState
-    # Removes a possibility from `self`
-    # @return [PossibilityState] a state with a single possibility,
-    #  the possibility that was removed from `self`
-    def pop_possibility_state
-      PossibilityState.new(
-        name,
-        requirements.dup,
-        activated,
-        requirement,
-        [possibilities.pop],
-        depth + 1,
-        conflicts.dup,
-        unused_unwind_options.dup
-      ).tap do |state|
-        state.activated.tag(state)
-      end
-    end
-  end
-
-  # A state that encapsulates a single possibility to fulfill the given
-  # {#requirement}
-  class PossibilityState < ResolutionState
-  end
-end
diff --git a/lib/rubygems/resolver/source_set.rb b/lib/rubygems/resolver/source_set.rb
index 296cf410789316..074b473edc1ba6 100644
--- a/lib/rubygems/resolver/source_set.rb
+++ b/lib/rubygems/resolver/source_set.rb
@@ -42,6 +42,6 @@ def add_source_gem(name, source)
 
   def get_set(name)
     link = @links[name]
-    @sets[link] ||= Gem::Source.new(link).dependency_resolver_set if link
+    @sets[link] ||= Gem::Source.new(link).dependency_resolver_set(@prerelease) if link
   end
 end
diff --git a/lib/rubygems/resolver/spec_specification.rb b/lib/rubygems/resolver/spec_specification.rb
index 79a34d8063f6fa..00ef9fdba05bc0 100644
--- a/lib/rubygems/resolver/spec_specification.rb
+++ b/lib/rubygems/resolver/spec_specification.rb
@@ -66,4 +66,11 @@ def platform
   def version
     spec.version
   end
+
+  ##
+  # The hash value for this specification.
+
+  def hash
+    spec.hash
+  end
 end
diff --git a/lib/rubygems/s3_uri_signer.rb b/lib/rubygems/s3_uri_signer.rb
index 20e95345d1a66f..0d8e9e82851654 100644
--- a/lib/rubygems/s3_uri_signer.rb
+++ b/lib/rubygems/s3_uri_signer.rb
@@ -27,9 +27,11 @@ def to_s # :nodoc:
   end
 
   attr_accessor :uri
+  attr_accessor :method
 
-  def initialize(uri)
+  def initialize(uri, method)
     @uri = uri
+    @method = method
   end
 
   ##
@@ -38,7 +40,7 @@ def sign(expiration = 86_400)
     s3_config = fetch_s3_config
 
     current_time = Time.now.utc
-    date_time = current_time.strftime("%Y%m%dT%H%m%SZ")
+    date_time = current_time.strftime("%Y%m%dT%H%M%SZ")
     date = date_time[0,8]
 
     credential_info = "#{date}/#{s3_config.region}/s3/aws4_request"
@@ -49,7 +51,7 @@ def sign(expiration = 86_400)
     string_to_sign = generate_string_to_sign(date_time, credential_info, canonical_request)
     signature = generate_signature(s3_config, date, string_to_sign)
 
-    URI.parse("https://#{canonical_host}#{uri.path}?#{query_params}&X-Amz-Signature=#{signature}")
+    Gem::URI.parse("https://#{canonical_host}#{uri.path}?#{query_params}&X-Amz-Signature=#{signature}")
   end
 
   private
@@ -73,7 +75,7 @@ def generate_canonical_query_params(s3_config, date_time, credential_info, expir
 
   def generate_canonical_request(canonical_host, query_params)
     [
-      "GET",
+      method.upcase,
       uri.path,
       query_params,
       "host:#{canonical_host}",
@@ -140,7 +142,7 @@ def base64_uri_escape(str)
   end
 
   def ec2_metadata_credentials_json
-    require "net/http"
+    require_relative "vendored_net_http"
     require_relative "request"
     require_relative "request/connection_pools"
     require "json"
@@ -152,13 +154,13 @@ def ec2_metadata_credentials_json
   end
 
   def ec2_metadata_request(url)
-    uri = URI(url)
+    uri = Gem::URI(url)
     @request_pool ||= create_request_pool(uri)
-    request = Gem::Request.new(uri, Net::HTTP::Get, nil, @request_pool)
+    request = Gem::Request.new(uri, Gem::Net::HTTP::Get, nil, @request_pool)
     response = request.fetch
 
     case response
-    when Net::HTTPOK then
+    when Gem::Net::HTTPOK then
       JSON.parse(response.body)
     else
       raise InstanceProfileError.new("Unable to fetch AWS metadata from #{uri}: #{response.message} #{response.code}")
diff --git a/lib/rubygems/safe_marshal.rb b/lib/rubygems/safe_marshal.rb
new file mode 100644
index 00000000000000..b81d1a0a475a00
--- /dev/null
+++ b/lib/rubygems/safe_marshal.rb
@@ -0,0 +1,74 @@
+# frozen_string_literal: true
+
+require "stringio"
+
+require_relative "safe_marshal/reader"
+require_relative "safe_marshal/visitors/to_ruby"
+
+module Gem
+  ###
+  # This module is used for safely loading Marshal specs from a gem.  The
+  # `safe_load` method defined on this module is specifically designed for
+  # loading Gem specifications.
+
+  module SafeMarshal
+    PERMITTED_CLASSES = %w[
+      Date
+      Time
+      Rational
+
+      Gem::Dependency
+      Gem::NameTuple
+      Gem::Platform
+      Gem::Requirement
+      Gem::Specification
+      Gem::Version
+      Gem::Version::Requirement
+
+      YAML::Syck::DefaultKey
+      YAML::PrivateType
+    ].freeze
+    private_constant :PERMITTED_CLASSES
+
+    PERMITTED_SYMBOLS = %w[
+      development
+      runtime
+
+      name
+      number
+      platform
+      dependencies
+    ].freeze
+    private_constant :PERMITTED_SYMBOLS
+
+    PERMITTED_IVARS = {
+      "String" => %w[E encoding @taguri @debug_created_info],
+      "Time" => %w[
+        offset zone nano_num nano_den submicro
+        @_zone @marshal_with_utc_coercion
+      ],
+      "Gem::Dependency" => %w[
+        @name @requirement @prerelease @version_requirement @version_requirements @type
+        @force_ruby_platform
+      ],
+      "Gem::NameTuple" => %w[@name @version @platform],
+      "Gem::Platform" => %w[@os @cpu @version],
+      "Psych::PrivateType" => %w[@value @type_id],
+    }.freeze
+    private_constant :PERMITTED_IVARS
+
+    def self.safe_load(input)
+      load(input, permitted_classes: PERMITTED_CLASSES, permitted_symbols: PERMITTED_SYMBOLS, permitted_ivars: PERMITTED_IVARS)
+    end
+
+    def self.load(input, permitted_classes: [::Symbol], permitted_symbols: [], permitted_ivars: {})
+      root = Reader.new(StringIO.new(input, "r").binmode).read!
+
+      Visitors::ToRuby.new(
+        permitted_classes: permitted_classes,
+        permitted_symbols: permitted_symbols,
+        permitted_ivars: permitted_ivars,
+      ).visit(root)
+    end
+  end
+end
diff --git a/lib/rubygems/safe_marshal/elements.rb b/lib/rubygems/safe_marshal/elements.rb
new file mode 100644
index 00000000000000..f8874b1b2fbccd
--- /dev/null
+++ b/lib/rubygems/safe_marshal/elements.rb
@@ -0,0 +1,146 @@
+# frozen_string_literal: true
+
+module Gem
+  module SafeMarshal
+    module Elements
+      class Element
+      end
+
+      class Symbol < Element
+        def initialize(name)
+          @name = name
+        end
+        attr_reader :name
+      end
+
+      class UserDefined < Element
+        def initialize(name, binary_string)
+          @name = name
+          @binary_string = binary_string
+        end
+
+        attr_reader :name, :binary_string
+      end
+
+      class UserMarshal < Element
+        def initialize(name, data)
+          @name = name
+          @data = data
+        end
+
+        attr_reader :name, :data
+      end
+
+      class String < Element
+        def initialize(str)
+          @str = str
+        end
+
+        attr_reader :str
+      end
+
+      class Hash < Element
+        def initialize(pairs)
+          @pairs = pairs
+        end
+
+        attr_reader :pairs
+      end
+
+      class HashWithDefaultValue < Hash
+        def initialize(pairs, default)
+          super(pairs)
+          @default = default
+        end
+
+        attr_reader :default
+      end
+
+      class Array < Element
+        def initialize(elements)
+          @elements = elements
+        end
+
+        attr_reader :elements
+      end
+
+      class Integer < Element
+        def initialize(int)
+          @int = int
+        end
+
+        attr_reader :int
+      end
+
+      class True < Element
+        def initialize
+        end
+        TRUE = new.freeze
+      end
+
+      class False < Element
+        def initialize
+        end
+
+        FALSE = new.freeze
+      end
+
+      class WithIvars < Element
+        def initialize(object, ivars)
+          @object = object
+          @ivars = ivars
+        end
+
+        attr_reader :object, :ivars
+      end
+
+      class Object < Element
+        def initialize(name)
+          @name = name
+        end
+        attr_reader :name
+      end
+
+      class Nil < Element
+        NIL = new.freeze
+      end
+
+      class ObjectLink < Element
+        def initialize(offset)
+          @offset = offset
+        end
+        attr_reader :offset
+      end
+
+      class SymbolLink < Element
+        def initialize(offset)
+          @offset = offset
+        end
+        attr_reader :offset
+      end
+
+      class Float < Element
+        def initialize(string)
+          @string = string
+        end
+        attr_reader :string
+      end
+
+      class Bignum < Element # rubocop:disable Lint/UnifiedInteger
+        def initialize(sign, data)
+          @sign = sign
+          @data = data
+        end
+        attr_reader :sign, :data
+      end
+
+      class UserClass < Element
+        def initialize(name, wrapped_object)
+          @name = name
+          @wrapped_object = wrapped_object
+        end
+        attr_reader :name, :wrapped_object
+      end
+    end
+  end
+end
diff --git a/lib/rubygems/safe_marshal/reader.rb b/lib/rubygems/safe_marshal/reader.rb
new file mode 100644
index 00000000000000..4362d65fd681a3
--- /dev/null
+++ b/lib/rubygems/safe_marshal/reader.rb
@@ -0,0 +1,325 @@
+# frozen_string_literal: true
+
+require_relative "elements"
+
+module Gem
+  module SafeMarshal
+    class Reader
+      class Error < StandardError
+      end
+
+      class UnsupportedVersionError < Error
+      end
+
+      class UnconsumedBytesError < Error
+      end
+
+      class NotImplementedError < Error
+      end
+
+      class EOFError < Error
+      end
+
+      class DataTooShortError < Error
+      end
+
+      class NegativeLengthError < Error
+      end
+
+      def initialize(io)
+        @io = io
+      end
+
+      def read!
+        read_header
+        root = read_element
+        raise UnconsumedBytesError, "expected EOF, got #{@io.read(10).inspect}... after top-level element #{root.class}" unless @io.eof?
+        root
+      end
+
+      private
+
+      MARSHAL_VERSION = [Marshal::MAJOR_VERSION, Marshal::MINOR_VERSION].map(&:chr).join.freeze
+      private_constant :MARSHAL_VERSION
+
+      def read_header
+        v = @io.read(2)
+        raise UnsupportedVersionError, "Unsupported marshal version #{v.bytes.map(&:ord).join(".")}, expected #{Marshal::MAJOR_VERSION}.#{Marshal::MINOR_VERSION}" unless v == MARSHAL_VERSION
+      end
+
+      def read_bytes(n)
+        raise NegativeLengthError if n < 0
+        str = @io.read(n)
+        raise EOFError, "expected #{n} bytes, got EOF" if str.nil?
+        raise DataTooShortError, "expected #{n} bytes, got #{str.inspect}" unless str.bytesize == n
+        str
+      end
+
+      def read_byte
+        @io.getbyte || raise(EOFError, "Unexpected EOF")
+      end
+
+      def read_integer
+        b = read_byte
+
+        case b
+        when 0x00
+          0
+        when 0x01
+          read_byte
+        when 0x02
+          read_byte | (read_byte << 8)
+        when 0x03
+          read_byte | (read_byte << 8) | (read_byte << 16)
+        when 0x04
+          read_byte | (read_byte << 8) | (read_byte << 16) | (read_byte << 24)
+        when 0xFC
+          read_byte | (read_byte << 8) | (read_byte << 16) | (read_byte << 24) | -0x100000000
+        when 0xFD
+          read_byte | (read_byte << 8) | (read_byte << 16) | -0x1000000
+        when 0xFE
+          read_byte | (read_byte << 8) | -0x10000
+        when 0xFF
+          read_byte | -0x100
+        else
+          signed = (b ^ 128) - 128
+          if b >= 128
+            signed + 5
+          else
+            signed - 5
+          end
+        end
+      end
+
+      def read_element
+        type = read_byte
+        case type
+        when 34 then read_string # ?"
+        when 48 then read_nil # ?0
+        when 58 then read_symbol # ?:
+        when 59 then read_symbol_link # ?;
+        when 64 then read_object_link # ?@
+        when 70 then read_false # ?F
+        when 73 then read_object_with_ivars # ?I
+        when 84 then read_true # ?T
+        when 85 then read_user_marshal # ?U
+        when 91 then read_array # ?[
+        when 102 then read_float # ?f
+        when 105 then Elements::Integer.new(read_integer) # ?i
+        when 108 then read_bignum # ?l
+        when 111 then read_object # ?o
+        when 117 then read_user_defined # ?u
+        when 123 then read_hash # ?{
+        when 125 then read_hash_with_default_value # ?}
+        when 101 then read_extended_object # ?e
+        when 99 then read_class # ?c
+        when 109 then read_module # ?m
+        when 77 then read_class_or_module # ?M
+        when 100 then read_data # ?d
+        when 47 then read_regexp # ?/
+        when 83 then read_struct # ?S
+        when 67 then read_user_class # ?C
+        else
+          raise Error, "Unknown marshal type discriminator #{type.chr.inspect} (#{type})"
+        end
+      end
+
+      STRING_E_SYMBOL = Elements::Symbol.new("E").freeze
+      private_constant :STRING_E_SYMBOL
+
+      def read_symbol
+        len = read_integer
+        if len == 1
+          byte = read_byte
+          if byte == 69 # ?E
+            STRING_E_SYMBOL
+          else
+            Elements::Symbol.new(byte.chr)
+          end
+        else
+          name = read_bytes(len)
+          Elements::Symbol.new(name)
+        end
+      end
+
+      EMPTY_STRING = Elements::String.new("".b.freeze).freeze
+      private_constant :EMPTY_STRING
+
+      def read_string
+        length = read_integer
+        return EMPTY_STRING if length == 0
+        str = read_bytes(length)
+        Elements::String.new(str)
+      end
+
+      def read_true
+        Elements::True::TRUE
+      end
+
+      def read_false
+        Elements::False::FALSE
+      end
+
+      def read_user_defined
+        name = read_element
+        binary_string = read_bytes(read_integer)
+        Elements::UserDefined.new(name, binary_string)
+      end
+
+      EMPTY_ARRAY = Elements::Array.new([].freeze).freeze
+      private_constant :EMPTY_ARRAY
+
+      def read_array
+        length = read_integer
+        return EMPTY_ARRAY if length == 0
+        raise NegativeLengthError if length < 0
+        elements = Array.new(length) do
+          read_element
+        end
+        Elements::Array.new(elements)
+      end
+
+      def read_object_with_ivars
+        object = read_element
+        length = read_integer
+        raise NegativeLengthError if length < 0
+        ivars = Array.new(length) do
+          [read_element, read_element]
+        end
+        Elements::WithIvars.new(object, ivars)
+      end
+
+      def read_symbol_link
+        offset = read_integer
+        Elements::SymbolLink.new(offset)
+      end
+
+      def read_user_marshal
+        name = read_element
+        data = read_element
+        Elements::UserMarshal.new(name, data)
+      end
+
+      # profiling bundle install --full-index shows that
+      # offset 6 is by far the most common object link,
+      # so we special case it to avoid allocating a new
+      # object a third of the time.
+      # the following are all the object links that
+      # appear more than 10000 times in my profiling
+
+      OBJECT_LINKS = {
+        6 => Elements::ObjectLink.new(6).freeze,
+        30 => Elements::ObjectLink.new(30).freeze,
+        81 => Elements::ObjectLink.new(81).freeze,
+        34 => Elements::ObjectLink.new(34).freeze,
+        38 => Elements::ObjectLink.new(38).freeze,
+        50 => Elements::ObjectLink.new(50).freeze,
+        91 => Elements::ObjectLink.new(91).freeze,
+        42 => Elements::ObjectLink.new(42).freeze,
+        46 => Elements::ObjectLink.new(46).freeze,
+        150 => Elements::ObjectLink.new(150).freeze,
+        100 => Elements::ObjectLink.new(100).freeze,
+        104 => Elements::ObjectLink.new(104).freeze,
+        108 => Elements::ObjectLink.new(108).freeze,
+        242 => Elements::ObjectLink.new(242).freeze,
+        246 => Elements::ObjectLink.new(246).freeze,
+        139 => Elements::ObjectLink.new(139).freeze,
+        143 => Elements::ObjectLink.new(143).freeze,
+        114 => Elements::ObjectLink.new(114).freeze,
+        308 => Elements::ObjectLink.new(308).freeze,
+        200 => Elements::ObjectLink.new(200).freeze,
+        54 => Elements::ObjectLink.new(54).freeze,
+        62 => Elements::ObjectLink.new(62).freeze,
+        1_286_245 => Elements::ObjectLink.new(1_286_245).freeze,
+      }.freeze
+      private_constant :OBJECT_LINKS
+
+      def read_object_link
+        offset = read_integer
+        OBJECT_LINKS[offset] || Elements::ObjectLink.new(offset)
+      end
+
+      EMPTY_HASH = Elements::Hash.new([].freeze).freeze
+      private_constant :EMPTY_HASH
+
+      def read_hash
+        length = read_integer
+        return EMPTY_HASH if length == 0
+        pairs = Array.new(length) do
+          [read_element, read_element]
+        end
+        Elements::Hash.new(pairs)
+      end
+
+      def read_hash_with_default_value
+        length = read_integer
+        raise NegativeLengthError if length < 0
+        pairs = Array.new(length) do
+          [read_element, read_element]
+        end
+        default = read_element
+        Elements::HashWithDefaultValue.new(pairs, default)
+      end
+
+      def read_object
+        name = read_element
+        object = Elements::Object.new(name)
+        length = read_integer
+        raise NegativeLengthError if length < 0
+        ivars = Array.new(length) do
+          [read_element, read_element]
+        end
+        Elements::WithIvars.new(object, ivars)
+      end
+
+      def read_nil
+        Elements::Nil::NIL
+      end
+
+      def read_float
+        string = read_bytes(read_integer)
+        Elements::Float.new(string)
+      end
+
+      def read_bignum
+        sign = read_byte
+        data = read_bytes(read_integer * 2)
+        Elements::Bignum.new(sign, data)
+      end
+
+      def read_extended_object
+        raise NotImplementedError, "Reading Marshal objects of type extended_object is not implemented"
+      end
+
+      def read_class
+        raise NotImplementedError, "Reading Marshal objects of type class is not implemented"
+      end
+
+      def read_module
+        raise NotImplementedError, "Reading Marshal objects of type module is not implemented"
+      end
+
+      def read_class_or_module
+        raise NotImplementedError, "Reading Marshal objects of type class_or_module is not implemented"
+      end
+
+      def read_data
+        raise NotImplementedError, "Reading Marshal objects of type data is not implemented"
+      end
+
+      def read_regexp
+        raise NotImplementedError, "Reading Marshal objects of type regexp is not implemented"
+      end
+
+      def read_struct
+        raise NotImplementedError, "Reading Marshal objects of type struct is not implemented"
+      end
+
+      def read_user_class
+        name = read_element
+        wrapped_object = read_element
+        Elements::UserClass.new(name, wrapped_object)
+      end
+    end
+  end
+end
diff --git a/lib/rubygems/safe_marshal/visitors/stream_printer.rb b/lib/rubygems/safe_marshal/visitors/stream_printer.rb
new file mode 100644
index 00000000000000..162b36ad0541e9
--- /dev/null
+++ b/lib/rubygems/safe_marshal/visitors/stream_printer.rb
@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+require_relative "visitor"
+
+module Gem::SafeMarshal
+  module Visitors
+    class StreamPrinter < Visitor
+      def initialize(io, indent: "")
+        @io = io
+        @indent = indent
+        @level = 0
+      end
+
+      def visit(target)
+        @io.write("#{@indent * @level}#{target.class}")
+        target.instance_variables.each do |ivar|
+          value = target.instance_variable_get(ivar)
+          next if Elements::Element === value || Array === value
+          @io.write(" #{ivar}=#{value.inspect}")
+        end
+        @io.write("\n")
+        begin
+          @level += 1
+          super
+        ensure
+          @level -= 1
+        end
+      end
+    end
+  end
+end
diff --git a/lib/rubygems/safe_marshal/visitors/to_ruby.rb b/lib/rubygems/safe_marshal/visitors/to_ruby.rb
new file mode 100644
index 00000000000000..a1f94817760e43
--- /dev/null
+++ b/lib/rubygems/safe_marshal/visitors/to_ruby.rb
@@ -0,0 +1,428 @@
+# frozen_string_literal: true
+
+require_relative "visitor"
+
+module Gem::SafeMarshal
+  module Visitors
+    class ToRuby < Visitor
+      def initialize(permitted_classes:, permitted_symbols:, permitted_ivars:)
+        @permitted_classes = permitted_classes
+        @permitted_symbols = ["E"].concat(permitted_symbols).concat(permitted_classes)
+        @permitted_ivars = permitted_ivars
+
+        @objects = []
+        @symbols = []
+        @class_cache = {}
+
+        @stack = ["root"]
+        @stack_idx = 1
+      end
+
+      def inspect # :nodoc:
+        format("#<%s permitted_classes: %p permitted_symbols: %p permitted_ivars: %p>",
+          self.class, @permitted_classes, @permitted_symbols, @permitted_ivars)
+      end
+
+      def visit(target)
+        stack_idx = @stack_idx
+        super
+      ensure
+        @stack_idx = stack_idx - 1
+      end
+
+      private
+
+      def push_stack(element)
+        @stack[@stack_idx] = element
+        @stack_idx += 1
+      end
+
+      def visit_Gem_SafeMarshal_Elements_Array(a)
+        array = register_object([])
+
+        elements = a.elements
+        size = elements.size
+        idx = 0
+        # not idiomatic, but there's a huge number of IMEMOs allocated here, so we avoid the block
+        # because this is such a hot path when doing a bundle install with the full index
+        while idx < size
+          push_stack idx
+          array << visit(elements[idx])
+          idx += 1
+        end
+
+        array
+      end
+
+      def visit_Gem_SafeMarshal_Elements_Symbol(s)
+        name = s.name
+        raise UnpermittedSymbolError.new(symbol: name, stack: formatted_stack) unless @permitted_symbols.include?(name)
+        visit_symbol_type(s)
+      end
+
+      def map_ivars(klass, ivars)
+        stack_idx = @stack_idx
+        ivars.map.with_index do |(k, v), i|
+          @stack_idx = stack_idx
+
+          push_stack "ivar_"
+          push_stack i
+          k = resolve_ivar(klass, k)
+
+          @stack_idx = stack_idx
+          push_stack k
+
+          next k, visit(v)
+        end
+      end
+
+      def visit_Gem_SafeMarshal_Elements_WithIvars(e)
+        object_offset = @objects.size
+        push_stack "object"
+        object = visit(e.object)
+        ivars = map_ivars(object.class, e.ivars)
+
+        case e.object
+        when Elements::UserDefined
+          if object.class == ::Time
+            internal = []
+
+            ivars.reject! do |k, v|
+              case k
+              when :offset, :zone, :nano_num, :nano_den, :submicro
+                internal << [k, v]
+                true
+              else
+                false
+              end
+            end
+
+            s = e.object.binary_string
+            # 122 is the largest integer that can be represented in marshal in a single byte
+            raise TimeTooLargeError.new("binary string too large", stack: formatted_stack) if s.bytesize > 122
+
+            marshal_string = "\x04\bIu:\tTime".b
+            marshal_string.concat(s.bytesize + 5)
+            marshal_string << s
+            # internal is limited to 5, so no overflow is possible
+            marshal_string.concat(internal.size + 5)
+
+            internal.each do |k, v|
+              k = k.name
+              # ivar name can't be too large because only known ivars are in the internal ivars list
+              marshal_string.concat(":")
+              marshal_string.concat(k.bytesize + 5)
+              marshal_string.concat(k)
+              dumped = Marshal.dump(v)
+              dumped[0, 2] = ""
+              marshal_string.concat(dumped)
+            end
+
+            object = @objects[object_offset] = Marshal.load(marshal_string)
+          end
+        when Elements::String
+          enc = nil
+
+          ivars.reject! do |k, v|
+            case k
+            when :E
+              case v
+              when TrueClass
+                enc = "UTF-8"
+              when FalseClass
+                enc = "US-ASCII"
+              else
+                raise FormatError, "Unexpected value for String :E #{v.inspect}"
+              end
+            when :encoding
+              enc = v
+            else
+              next false
+            end
+            true
+          end
+
+          object.force_encoding(enc) if enc
+        end
+
+        ivars.each do |k, v|
+          object.instance_variable_set k, v
+        end
+        object
+      end
+
+      def visit_Gem_SafeMarshal_Elements_Hash(o)
+        hash = register_object({})
+
+        o.pairs.each_with_index do |(k, v), i|
+          push_stack i
+          k = visit(k)
+          push_stack k
+          hash[k] = visit(v)
+        end
+
+        hash
+      end
+
+      def visit_Gem_SafeMarshal_Elements_HashWithDefaultValue(o)
+        hash = visit_Gem_SafeMarshal_Elements_Hash(o)
+        push_stack :default
+        hash.default = visit(o.default)
+        hash
+      end
+
+      def visit_Gem_SafeMarshal_Elements_Object(o)
+        register_object(resolve_class(o.name).allocate)
+      end
+
+      def visit_Gem_SafeMarshal_Elements_ObjectLink(o)
+        @objects.fetch(o.offset)
+      end
+
+      def visit_Gem_SafeMarshal_Elements_SymbolLink(o)
+        @symbols.fetch(o.offset)
+      end
+
+      def visit_Gem_SafeMarshal_Elements_UserDefined(o)
+        register_object(call_method(resolve_class(o.name), :_load, o.binary_string))
+      end
+
+      def visit_Gem_SafeMarshal_Elements_UserMarshal(o)
+        klass = resolve_class(o.name)
+        compat = COMPAT_CLASSES.fetch(klass, nil)
+        idx = @objects.size
+        object = register_object(call_method(compat || klass, :allocate))
+
+        push_stack :data
+        ret = call_method(object, :marshal_load, visit(o.data))
+
+        if compat
+          object = @objects[idx] = ret
+        end
+
+        object
+      end
+
+      def visit_Gem_SafeMarshal_Elements_Integer(i)
+        i.int
+      end
+
+      def visit_Gem_SafeMarshal_Elements_Nil(_)
+        nil
+      end
+
+      def visit_Gem_SafeMarshal_Elements_True(_)
+        true
+      end
+
+      def visit_Gem_SafeMarshal_Elements_False(_)
+        false
+      end
+
+      def visit_Gem_SafeMarshal_Elements_String(s)
+        register_object(+s.str)
+      end
+
+      def visit_Gem_SafeMarshal_Elements_Float(f)
+        register_object(
+          case f.string
+          when "inf"
+            ::Float::INFINITY
+          when "-inf"
+            -::Float::INFINITY
+          when "nan"
+            ::Float::NAN
+          else
+            f.string.to_f
+          end
+        )
+      end
+
+      def visit_Gem_SafeMarshal_Elements_Bignum(b)
+        result = 0
+        b.data.each_byte.with_index do |byte, exp|
+          result += (byte * 2**(exp * 8))
+        end
+
+        case b.sign
+        when 43 # ?+
+          result
+        when 45 # ?-
+          -result
+        else
+          raise FormatError, "Unexpected sign for Bignum #{b.sign.chr.inspect} (#{b.sign})"
+        end
+      end
+
+      def visit_Gem_SafeMarshal_Elements_UserClass(r)
+        if resolve_class(r.name) == ::Hash && r.wrapped_object.is_a?(Elements::Hash)
+
+          hash = register_object({}.compare_by_identity)
+
+          o = r.wrapped_object
+          o.pairs.each_with_index do |(k, v), i|
+            push_stack i
+            k = visit(k)
+            push_stack k
+            hash[k] = visit(v)
+          end
+
+          if o.is_a?(Elements::HashWithDefaultValue)
+            push_stack :default
+            hash.default = visit(o.default)
+          end
+
+          hash
+        else
+          raise UnsupportedError.new("Unsupported user class #{resolve_class(r.name)} in marshal stream", stack: formatted_stack)
+        end
+      end
+
+      def resolve_class(n)
+        @class_cache[n] ||= begin
+          to_s = resolve_symbol_name(n)
+          raise UnpermittedClassError.new(name: to_s, stack: formatted_stack) unless @permitted_classes.include?(to_s)
+          visit_symbol_type(n)
+          begin
+            ::Object.const_get(to_s)
+          rescue NameError
+            raise ArgumentError, "Undefined class #{to_s.inspect}"
+          end
+        end
+      end
+
+      class RationalCompat
+        def marshal_load(s)
+          num, den = s
+          raise ArgumentError, "Expected 2 ints" unless s.size == 2 && num.is_a?(Integer) && den.is_a?(Integer)
+          Rational(num, den)
+        end
+      end
+      private_constant :RationalCompat
+
+      COMPAT_CLASSES = {}.tap do |h|
+        h[Rational] = RationalCompat
+      end.compare_by_identity.freeze
+      private_constant :COMPAT_CLASSES
+
+      def resolve_ivar(klass, name)
+        to_s = resolve_symbol_name(name)
+
+        raise UnpermittedIvarError.new(symbol: to_s, klass: klass, stack: formatted_stack) unless @permitted_ivars.fetch(klass.name, [].freeze).include?(to_s)
+
+        visit_symbol_type(name)
+      end
+
+      def visit_symbol_type(element)
+        case element
+        when Elements::Symbol
+          sym = element.name.to_sym
+          @symbols << sym
+          sym
+        when Elements::SymbolLink
+          visit_Gem_SafeMarshal_Elements_SymbolLink(element)
+        end
+      end
+
+      # This is a hot method, so avoid respond_to? checks on every invocation
+      if :read.respond_to?(:name)
+        def resolve_symbol_name(element)
+          case element
+          when Elements::Symbol
+            element.name
+          when Elements::SymbolLink
+            visit_Gem_SafeMarshal_Elements_SymbolLink(element).name
+          else
+            raise FormatError, "Expected symbol or symbol link, got #{element.inspect} @ #{formatted_stack.join(".")}"
+          end
+        end
+      else
+        def resolve_symbol_name(element)
+          case element
+          when Elements::Symbol
+            element.name
+          when Elements::SymbolLink
+            visit_Gem_SafeMarshal_Elements_SymbolLink(element).to_s
+          else
+            raise FormatError, "Expected symbol or symbol link, got #{element.inspect} @ #{formatted_stack.join(".")}"
+          end
+        end
+      end
+
+      def register_object(o)
+        @objects << o
+        o
+      end
+
+      def call_method(receiver, method, *args)
+        receiver.__send__(method, *args)
+      rescue NoMethodError => e
+        raise unless e.receiver == receiver
+
+        raise MethodCallError, "Unable to call #{method.inspect} on #{receiver.inspect}, perhaps it is a class using marshal compat, which is not visible in ruby? #{e}"
+      end
+
+      def formatted_stack
+        formatted = []
+        @stack[0, @stack_idx].each do |e|
+          if e.is_a?(Integer)
+            if formatted.last == "ivar_"
+              formatted[-1] = "ivar_#{e}"
+            else
+              formatted << "[#{e}]"
+            end
+          else
+            formatted << e
+          end
+        end
+        formatted
+      end
+
+      class Error < StandardError
+      end
+
+      class TimeTooLargeError < Error
+        def initialize(message, stack:)
+          super "#{message} @ #{stack.join "."}"
+        end
+      end
+
+      class UnpermittedSymbolError < Error
+        def initialize(symbol:, stack:)
+          @symbol = symbol
+          @stack = stack
+          super "Attempting to load unpermitted symbol #{symbol.inspect} @ #{stack.join "."}"
+        end
+      end
+
+      class UnpermittedIvarError < Error
+        def initialize(symbol:, klass:, stack:)
+          @symbol = symbol
+          @klass = klass
+          @stack = stack
+          super "Attempting to set unpermitted ivar #{symbol.inspect} on object of class #{klass} @ #{stack.join "."}"
+        end
+      end
+
+      class UnpermittedClassError < Error
+        def initialize(name:, stack:)
+          @name = name
+          @stack = stack
+          super "Attempting to load unpermitted class #{name.inspect} @ #{stack.join "."}"
+        end
+      end
+
+      class UnsupportedError < Error
+        def initialize(message, stack:)
+          super "#{message} @ #{stack.join "."}"
+        end
+      end
+
+      class FormatError < Error
+      end
+
+      class MethodCallError < Error
+      end
+    end
+  end
+end
diff --git a/lib/rubygems/safe_marshal/visitors/visitor.rb b/lib/rubygems/safe_marshal/visitors/visitor.rb
new file mode 100644
index 00000000000000..c9a079dc0ea593
--- /dev/null
+++ b/lib/rubygems/safe_marshal/visitors/visitor.rb
@@ -0,0 +1,74 @@
+# frozen_string_literal: true
+
+module Gem::SafeMarshal::Visitors
+  class Visitor
+    def visit(target)
+      send DISPATCH.fetch(target.class), target
+    end
+
+    private
+
+    DISPATCH = Gem::SafeMarshal::Elements.constants.each_with_object({}) do |c, h|
+      next if c == :Element
+
+      klass = Gem::SafeMarshal::Elements.const_get(c)
+      h[klass] = :"visit_#{klass.name.gsub("::", "_")}"
+      h.default = :visit_unknown_element
+    end.compare_by_identity.freeze
+    private_constant :DISPATCH
+
+    def visit_unknown_element(e)
+      raise ArgumentError, "Attempting to visit unknown element #{e.inspect}"
+    end
+
+    def visit_Gem_SafeMarshal_Elements_Array(target)
+      target.elements.each {|e| visit(e) }
+    end
+
+    def visit_Gem_SafeMarshal_Elements_Bignum(target); end
+    def visit_Gem_SafeMarshal_Elements_False(target); end
+    def visit_Gem_SafeMarshal_Elements_Float(target); end
+
+    def visit_Gem_SafeMarshal_Elements_Hash(target)
+      target.pairs.each do |k, v|
+        visit(k)
+        visit(v)
+      end
+    end
+
+    def visit_Gem_SafeMarshal_Elements_HashWithDefaultValue(target)
+      visit_Gem_SafeMarshal_Elements_Hash(target)
+      visit(target.default)
+    end
+
+    def visit_Gem_SafeMarshal_Elements_Integer(target); end
+    def visit_Gem_SafeMarshal_Elements_Nil(target); end
+
+    def visit_Gem_SafeMarshal_Elements_Object(target)
+      visit(target.name)
+    end
+
+    def visit_Gem_SafeMarshal_Elements_ObjectLink(target); end
+    def visit_Gem_SafeMarshal_Elements_String(target); end
+    def visit_Gem_SafeMarshal_Elements_Symbol(target); end
+    def visit_Gem_SafeMarshal_Elements_SymbolLink(target); end
+    def visit_Gem_SafeMarshal_Elements_True(target); end
+
+    def visit_Gem_SafeMarshal_Elements_UserDefined(target)
+      visit(target.name)
+    end
+
+    def visit_Gem_SafeMarshal_Elements_UserMarshal(target)
+      visit(target.name)
+      visit(target.data)
+    end
+
+    def visit_Gem_SafeMarshal_Elements_WithIvars(target)
+      visit(target.object)
+      target.ivars.each do |k, v|
+        visit(k)
+        visit(v)
+      end
+    end
+  end
+end
diff --git a/lib/rubygems/safe_yaml.rb b/lib/rubygems/safe_yaml.rb
index dba3cfb16dcd29..6a02a482304dc0 100644
--- a/lib/rubygems/safe_yaml.rb
+++ b/lib/rubygems/safe_yaml.rb
@@ -25,8 +25,17 @@ module SafeYAML
       runtime
     ].freeze
 
+    @aliases_enabled = true
+    def self.aliases_enabled=(value) # :nodoc:
+      @aliases_enabled = !!value
+    end
+
+    def self.aliases_enabled? # :nodoc:
+      @aliases_enabled
+    end
+
     def self.safe_load(input)
-      ::Psych.safe_load(input, permitted_classes: PERMITTED_CLASSES, permitted_symbols: PERMITTED_SYMBOLS, aliases: true)
+      ::Psych.safe_load(input, permitted_classes: PERMITTED_CLASSES, permitted_symbols: PERMITTED_SYMBOLS, aliases: @aliases_enabled)
     end
 
     def self.load(input)
diff --git a/lib/rubygems/security.rb b/lib/rubygems/security.rb
index 1e8e57b5a96165..69ba87b07f8e41 100644
--- a/lib/rubygems/security.rb
+++ b/lib/rubygems/security.rb
@@ -323,7 +323,7 @@
 # == Original author
 #
 # Paul Duncan <pabs@pablotron.org>
-# http://pablotron.org/
+# https://pablotron.org/
 
 module Gem::Security
   ##
diff --git a/lib/rubygems/security/policies.rb b/lib/rubygems/security/policies.rb
index 4180832d85c955..41f66043ada912 100644
--- a/lib/rubygems/security/policies.rb
+++ b/lib/rubygems/security/policies.rb
@@ -6,12 +6,12 @@ module Gem::Security
 
   NoSecurity = Policy.new(
     "No Security",
-    :verify_data => false,
-    :verify_signer => false,
-    :verify_chain => false,
-    :verify_root => false,
-    :only_trusted => false,
-    :only_signed => false
+    verify_data: false,
+    verify_signer: false,
+    verify_chain: false,
+    verify_root: false,
+    only_trusted: false,
+    only_signed: false
   )
 
   ##
@@ -24,12 +24,12 @@ module Gem::Security
 
   AlmostNoSecurity = Policy.new(
     "Almost No Security",
-    :verify_data => true,
-    :verify_signer => false,
-    :verify_chain => false,
-    :verify_root => false,
-    :only_trusted => false,
-    :only_signed => false
+    verify_data: true,
+    verify_signer: false,
+    verify_chain: false,
+    verify_root: false,
+    only_trusted: false,
+    only_signed: false
   )
 
   ##
@@ -41,12 +41,12 @@ module Gem::Security
 
   LowSecurity = Policy.new(
     "Low Security",
-    :verify_data => true,
-    :verify_signer => true,
-    :verify_chain => false,
-    :verify_root => false,
-    :only_trusted => false,
-    :only_signed => false
+    verify_data: true,
+    verify_signer: true,
+    verify_chain: false,
+    verify_root: false,
+    only_trusted: false,
+    only_signed: false
   )
 
   ##
@@ -60,12 +60,12 @@ module Gem::Security
 
   MediumSecurity = Policy.new(
     "Medium Security",
-    :verify_data => true,
-    :verify_signer => true,
-    :verify_chain => true,
-    :verify_root => true,
-    :only_trusted => true,
-    :only_signed => false
+    verify_data: true,
+    verify_signer: true,
+    verify_chain: true,
+    verify_root: true,
+    only_trusted: true,
+    only_signed: false
   )
 
   ##
@@ -79,12 +79,12 @@ module Gem::Security
 
   HighSecurity = Policy.new(
     "High Security",
-    :verify_data => true,
-    :verify_signer => true,
-    :verify_chain => true,
-    :verify_root => true,
-    :only_trusted => true,
-    :only_signed => true
+    verify_data: true,
+    verify_signer: true,
+    verify_chain: true,
+    verify_root: true,
+    only_trusted: true,
+    only_signed: true
   )
 
   ##
@@ -92,12 +92,12 @@ module Gem::Security
 
   SigningPolicy = Policy.new(
     "Signing Policy",
-    :verify_data => false,
-    :verify_signer => true,
-    :verify_chain => true,
-    :verify_root => true,
-    :only_trusted => false,
-    :only_signed => false
+    verify_data: false,
+    verify_signer: true,
+    verify_chain: true,
+    verify_root: true,
+    only_trusted: false,
+    only_signed: false
   )
 
   ##
diff --git a/lib/rubygems/security/trust_dir.rb b/lib/rubygems/security/trust_dir.rb
index ea011e6d656614..d23d161cfe0386 100644
--- a/lib/rubygems/security/trust_dir.rb
+++ b/lib/rubygems/security/trust_dir.rb
@@ -9,8 +9,8 @@ class Gem::Security::TrustDir
   # Default permissions for the trust directory and its contents
 
   DEFAULT_PERMISSIONS = {
-    :trust_dir => 0o700,
-    :trusted_cert => 0o600,
+    trust_dir: 0o700,
+    trusted_cert: 0o600,
   }.freeze
 
   ##
@@ -111,7 +111,7 @@ def verify
 
       FileUtils.chmod 0o700, @dir
     else
-      FileUtils.mkdir_p @dir, :mode => @permissions[:trust_dir]
+      FileUtils.mkdir_p @dir, mode: @permissions[:trust_dir]
     end
   end
 end
diff --git a/lib/rubygems/shellwords.rb b/lib/rubygems/shellwords.rb
deleted file mode 100644
index 741dccb3635523..00000000000000
--- a/lib/rubygems/shellwords.rb
+++ /dev/null
@@ -1,3 +0,0 @@
-# frozen_string_literal: true
-
-autoload :Shellwords, "shellwords"
diff --git a/lib/rubygems/source.rb b/lib/rubygems/source.rb
index 8b3a8828d140db..772ad04bc92575 100644
--- a/lib/rubygems/source.rb
+++ b/lib/rubygems/source.rb
@@ -12,9 +12,9 @@ class Gem::Source
   include Gem::Text
 
   FILES = { # :nodoc:
-    :released => "specs",
-    :latest => "latest_specs",
-    :prerelease => "prerelease_specs",
+    released: "specs",
+    latest: "latest_specs",
+    prerelease: "prerelease_specs",
   }.freeze
 
   ##
@@ -67,28 +67,11 @@ def ==(other) # :nodoc:
 
   ##
   # Returns a Set that can fetch specifications from this source.
-
-  def dependency_resolver_set # :nodoc:
-    return Gem::Resolver::IndexSet.new self if uri.scheme == "file"
-
-    fetch_uri = if uri.host == "rubygems.org"
-      index_uri = uri.dup
-      index_uri.host = "index.rubygems.org"
-      index_uri
-    else
-      uri
-    end
-
-    bundler_api_uri = enforce_trailing_slash(fetch_uri)
-
-    begin
-      fetcher = Gem::RemoteFetcher.fetcher
-      response = fetcher.fetch_path bundler_api_uri, nil, true
-    rescue Gem::RemoteFetcher::FetchError
-      Gem::Resolver::IndexSet.new self
-    else
-      Gem::Resolver::APISet.new response.uri + "./info/"
-    end
+  #
+  # The set will optionally fetch prereleases if requested.
+  #
+  def dependency_resolver_set(prerelease = false)
+    new_dependency_resolver_set.tap {|set| set.prerelease = prerelease }
   end
 
   def hash # :nodoc:
@@ -101,7 +84,6 @@ def hash # :nodoc:
   def cache_dir(uri)
     # Correct for windows paths
     escaped_path = uri.path.sub(%r{^/([a-z]):/}i, '/\\1-/')
-    escaped_path.tap(&Gem::UNTAINT)
 
     File.join Gem.spec_cache_dir, "#{uri.host}%#{uri.port}", File.dirname(escaped_path)
   end
@@ -135,8 +117,9 @@ def fetch_spec(name_tuple)
 
     if File.exist? local_spec
       spec = Gem.read_binary local_spec
+      Gem.load_safe_marshal
       spec = begin
-               Marshal.load(spec)
+               Gem::SafeMarshal.safe_load(spec)
              rescue StandardError
                nil
              end
@@ -157,8 +140,9 @@ def fetch_spec(name_tuple)
       end
     end
 
+    Gem.load_safe_marshal
     # TODO: Investigate setting Gem::Specification#loaded_from to a URI
-    Marshal.load spec
+    Gem::SafeMarshal.safe_load spec
   end
 
   ##
@@ -188,8 +172,9 @@ def load_specs(type)
 
     spec_dump = fetcher.cache_update_path spec_path, local_file, update_cache?
 
+    Gem.load_safe_marshal
     begin
-      Gem::NameTuple.from_list Marshal.load(spec_dump)
+      Gem::NameTuple.from_list Gem::SafeMarshal.safe_load(spec_dump)
     rescue ArgumentError
       if update_cache? && !retried
         FileUtils.rm local_file
@@ -211,14 +196,16 @@ def download(spec, dir=Dir.pwd)
   end
 
   def pretty_print(q) # :nodoc:
-    q.group 2, "[Remote:", "]" do
-      q.breakable
-      q.text @uri.to_s
-
-      if api = uri
+    q.object_group(self) do
+      q.group 2, "[Remote:", "]" do
         q.breakable
-        q.text "API URI: "
-        q.text api.to_s
+        q.text @uri.to_s
+
+        if api = uri
+          q.breakable
+          q.text "API URI: "
+          q.text api.to_s
+        end
       end
     end
   end
@@ -230,6 +217,29 @@ def typo_squatting?(host, distance_threshold=4)
 
   private
 
+  def new_dependency_resolver_set
+    return Gem::Resolver::IndexSet.new self if uri.scheme == "file"
+
+    fetch_uri = if uri.host == "rubygems.org"
+      index_uri = uri.dup
+      index_uri.host = "index.rubygems.org"
+      index_uri
+    else
+      uri
+    end
+
+    bundler_api_uri = enforce_trailing_slash(fetch_uri) + "versions"
+
+    begin
+      fetcher = Gem::RemoteFetcher.fetcher
+      response = fetcher.fetch_path bundler_api_uri, nil, true
+    rescue Gem::RemoteFetcher::FetchError
+      Gem::Resolver::IndexSet.new self
+    else
+      Gem::Resolver::APISet.new response.uri + "./info/"
+    end
+  end
+
   def enforce_trailing_slash(uri)
     uri.merge(uri.path.gsub(%r{/+$}, "") + "/")
   end
diff --git a/lib/rubygems/source/git.rb b/lib/rubygems/source/git.rb
index 70e8d1b06e104a..baf2f9dd4c0932 100644
--- a/lib/rubygems/source/git.rb
+++ b/lib/rubygems/source/git.rb
@@ -58,7 +58,6 @@ def initialize(name, repository, reference, submodules = false)
 
     @remote   = true
     @root_dir = Gem.dir
-    @git      = ENV["git"] || "git"
   end
 
   def <=>(other)
@@ -81,6 +80,10 @@ def ==(other) # :nodoc:
       @need_submodules == other.need_submodules
   end
 
+  def git_command
+    ENV.fetch("git", "git")
+  end
+
   ##
   # Checks out the files for the repository into the install_dir.
 
@@ -90,18 +93,18 @@ def checkout # :nodoc:
     return false unless File.exist? repo_cache_dir
 
     unless File.exist? install_dir
-      system @git, "clone", "--quiet", "--no-checkout",
+      system git_command, "clone", "--quiet", "--no-checkout",
              repo_cache_dir, install_dir
     end
 
     Dir.chdir install_dir do
-      system @git, "fetch", "--quiet", "--force", "--tags", install_dir
+      system git_command, "fetch", "--quiet", "--force", "--tags", install_dir
 
-      success = system @git, "reset", "--quiet", "--hard", rev_parse
+      success = system git_command, "reset", "--quiet", "--hard", rev_parse
 
       if @need_submodules
         require "open3"
-        _, status = Open3.capture2e(@git, "submodule", "update", "--quiet", "--init", "--recursive")
+        _, status = Open3.capture2e(git_command, "submodule", "update", "--quiet", "--init", "--recursive")
 
         success &&= status.success?
       end
@@ -118,11 +121,11 @@ def cache # :nodoc:
 
     if File.exist? repo_cache_dir
       Dir.chdir repo_cache_dir do
-        system @git, "fetch", "--quiet", "--force", "--tags",
+        system git_command, "fetch", "--quiet", "--force", "--tags",
                @repository, "refs/heads/*:refs/heads/*"
       end
     else
-      system @git, "clone", "--quiet", "--bare", "--no-hardlinks",
+      system git_command, "clone", "--quiet", "--bare", "--no-hardlinks",
              @repository, repo_cache_dir
     end
   end
@@ -157,12 +160,14 @@ def install_dir # :nodoc:
   end
 
   def pretty_print(q) # :nodoc:
-    q.group 2, "[Git: ", "]" do
-      q.breakable
-      q.text @repository
+    q.object_group(self) do
+      q.group 2, "[Git: ", "]" do
+        q.breakable
+        q.text @repository
 
-      q.breakable
-      q.text @reference
+        q.breakable
+        q.text @reference
+      end
     end
   end
 
@@ -180,7 +185,7 @@ def rev_parse # :nodoc:
     hash = nil
 
     Dir.chdir repo_cache_dir do
-      hash = Gem::Util.popen(@git, "rev-parse", @reference).strip
+      hash = Gem::Util.popen(git_command, "rev-parse", @reference).strip
     end
 
     raise Gem::Exception,
@@ -199,7 +204,7 @@ def specs
     return [] unless install_dir
 
     Dir.chdir install_dir do
-      Dir["{,*,*/*}.gemspec"].map do |spec_file|
+      Dir["{,*,*/*}.gemspec"].filter_map do |spec_file|
         directory = File.dirname spec_file
         file      = File.basename spec_file
 
@@ -216,19 +221,19 @@ def specs
           end
           spec
         end
-      end.compact
+      end
     end
   end
 
   ##
-  # A hash for the git gem based on the git repository URI.
+  # A hash for the git gem based on the git repository Gem::URI.
 
   def uri_hash # :nodoc:
     require_relative "../openssl"
 
     normalized =
-      if @repository =~ %r{^\w+://(\w+@)?}
-        uri = URI(@repository).normalize.to_s.sub %r{/$},""
+      if @repository.match?(%r{^\w+://(\w+@)?})
+        uri = Gem::URI(@repository).normalize.to_s.sub %r{/$},""
         uri.sub(/\A(\w+)/) { $1.downcase }
       else
         @repository
diff --git a/lib/rubygems/source/installed.rb b/lib/rubygems/source/installed.rb
index cbe12a05163642..f5c96fee5129b4 100644
--- a/lib/rubygems/source/installed.rb
+++ b/lib/rubygems/source/installed.rb
@@ -32,6 +32,8 @@ def download(spec, path)
   end
 
   def pretty_print(q) # :nodoc:
-    q.text "[Installed]"
+    q.object_group(self) do
+      q.text "[Installed]"
+    end
   end
 end
diff --git a/lib/rubygems/source/local.rb b/lib/rubygems/source/local.rb
index 533b0a4d062fa9..ba6eea1f9aa5c7 100644
--- a/lib/rubygems/source/local.rb
+++ b/lib/rubygems/source/local.rb
@@ -40,10 +40,11 @@ def load_specs(type) # :nodoc:
 
       Dir["*.gem"].each do |file|
         pkg = Gem::Package.new(file)
+        spec = pkg.spec
       rescue SystemCallError, Gem::Package::FormatError
         # ignore
       else
-        tup = pkg.spec.name_tuple
+        tup = spec.name_tuple
         @specs[tup] = [File.expand_path(file), pkg]
 
         case type
@@ -116,10 +117,14 @@ def download(spec, cache_dir = nil) # :nodoc:
   end
 
   def pretty_print(q) # :nodoc:
-    q.group 2, "[Local gems:", "]" do
-      q.breakable
-      q.seplist @specs.keys do |v|
-        q.text v.full_name
+    q.object_group(self) do
+      q.group 2, "[Local gems:", "]" do
+        q.breakable
+        if @specs
+          q.seplist @specs.keys do |v|
+            q.text v.full_name
+          end
+        end
       end
     end
   end
diff --git a/lib/rubygems/source/specific_file.rb b/lib/rubygems/source/specific_file.rb
index e9b27536469300..dde1d48a219d76 100644
--- a/lib/rubygems/source/specific_file.rb
+++ b/lib/rubygems/source/specific_file.rb
@@ -42,9 +42,11 @@ def download(spec, dir = nil) # :nodoc:
   end
 
   def pretty_print(q) # :nodoc:
-    q.group 2, "[SpecificFile:", "]" do
-      q.breakable
-      q.text @path
+    q.object_group(self) do
+      q.group 2, "[SpecificFile:", "]" do
+        q.breakable
+        q.text @path
+      end
     end
   end
 
diff --git a/lib/rubygems/source_list.rb b/lib/rubygems/source_list.rb
index 9e8a9e16ef5788..33db64fbc1513d 100644
--- a/lib/rubygems/source_list.rb
+++ b/lib/rubygems/source_list.rb
@@ -44,7 +44,7 @@ def initialize_copy(other) # :nodoc:
   end
 
   ##
-  # Appends +obj+ to the source list which may be a Gem::Source, URI or URI
+  # Appends +obj+ to the source list which may be a Gem::Source, Gem::URI or URI
   # String.
 
   def <<(obj)
diff --git a/lib/rubygems/spec_fetcher.rb b/lib/rubygems/spec_fetcher.rb
index 34e6d7638c18fa..285f117b393269 100644
--- a/lib/rubygems/spec_fetcher.rb
+++ b/lib/rubygems/spec_fetcher.rb
@@ -69,9 +69,9 @@ def initialize(sources = nil)
     @prerelease_specs = {}
 
     @caches = {
-      :latest => @latest_specs,
-      :prerelease => @prerelease_specs,
-      :released => @specs,
+      latest: @latest_specs,
+      prerelease: @prerelease_specs,
+      released: @specs,
     }
 
     @fetcher = Gem::RemoteFetcher.fetcher
@@ -170,23 +170,55 @@ def spec_for_dependency(dependency, matching_platform=true)
   # alternative gem names.
 
   def suggest_gems_from_name(gem_name, type = :latest, num_results = 5)
-    gem_name        = gem_name.downcase.tr("_-", "")
-    max             = gem_name.size / 2
-    names           = available_specs(type).first.values.flatten(1)
+    gem_name = gem_name.downcase.tr("_-", "")
 
-    matches = names.map do |n|
+    # All results for 3-character-or-shorter (minus hyphens/underscores) gem
+    # names get rejected, so we just return an empty array immediately instead.
+    return [] if gem_name.length <= 3
+
+    max   = gem_name.size / 2
+    names = available_specs(type).first.values.flatten(1)
+
+    min_length = gem_name.length - max
+    max_length = gem_name.length + max
+
+    gem_name_with_postfix = "#{gem_name}ruby"
+    gem_name_with_prefix = "ruby#{gem_name}"
+
+    matches = names.filter_map do |n|
+      len = n.name.length
+      # If the gem doesn't support the current platform, bail early.
       next unless n.match_platform?
-      [n.name, 0] if n.name.downcase.tr("_-", "").include?(gem_name)
-    end.compact
-
-    if matches.length < num_results
-      matches += names.map do |n|
-        next unless n.match_platform?
-        distance = levenshtein_distance gem_name, n.name.downcase.tr("_-", "")
-        next if distance >= max
-        return [n.name] if distance == 0
-        [n.name, distance]
-      end.compact
+
+      # If the length is min_length or shorter, we've done `max` deletions.
+      # This would be rejected later, so we skip it for performance.
+      next if len <= min_length
+
+      # The candidate name, normalized the same as gem_name.
+      normalized_name = n.name.downcase
+      normalized_name.tr!("_-", "")
+
+      # If the gem is "{NAME}-ruby" and "ruby-{NAME}", we want to return it.
+      # But we already removed hyphens, so we check "{NAME}ruby" and "ruby{NAME}".
+      next [n.name, 0] if normalized_name == gem_name_with_postfix
+      next [n.name, 0] if normalized_name == gem_name_with_prefix
+
+      # If the length is max_length or longer, we've done `max` insertions.
+      # This would be rejected later, so we skip it for performance.
+      next if len >= max_length
+
+      # If we found an exact match (after stripping underscores and hyphens),
+      # that's our most likely candidate.
+      # Return it immediately, and skip the rest of the loop.
+      return [n.name] if normalized_name == gem_name
+
+      distance = levenshtein_distance gem_name, normalized_name
+
+      # Skip current candidate, if the edit distance is greater than allowed.
+      next if distance >= max
+
+      # If all else fails, return the name and the calculated distance.
+      [n.name, distance]
     end
 
     matches = if matches.empty? && type != :prerelease
diff --git a/lib/rubygems/specification.rb b/lib/rubygems/specification.rb
index 0b9bf143dfb698..68ebbf8bc31454 100644
--- a/lib/rubygems/specification.rb
+++ b/lib/rubygems/specification.rb
@@ -11,6 +11,7 @@
 require_relative "basic_specification"
 require_relative "stub_specification"
 require_relative "platform"
+require_relative "specification_record"
 require_relative "util/list"
 
 require "rbconfig"
@@ -108,7 +109,7 @@ class Gem::Specification < Gem::BasicSpecification
   @load_cache = {} # :nodoc:
   @load_cache_mutex = Thread::Mutex.new
 
-  VALID_NAME_PATTERN = /\A[a-zA-Z0-9\.\-\_]+\z/.freeze # :nodoc:
+  VALID_NAME_PATTERN = /\A[a-zA-Z0-9\.\-\_]+\z/ # :nodoc:
 
   # :startdoc:
 
@@ -127,35 +128,35 @@ class Gem::Specification < Gem::BasicSpecification
   # Map of attribute names to default values.
 
   @@default_value = {
-    :authors => [],
-    :autorequire => nil,
-    :bindir => "bin",
-    :cert_chain => [],
-    :date => nil,
-    :dependencies => [],
-    :description => nil,
-    :email => nil,
-    :executables => [],
-    :extensions => [],
-    :extra_rdoc_files => [],
-    :files => [],
-    :homepage => nil,
-    :licenses => [],
-    :metadata => {},
-    :name => nil,
-    :platform => Gem::Platform::RUBY,
-    :post_install_message => nil,
-    :rdoc_options => [],
-    :require_paths => ["lib"],
-    :required_ruby_version => Gem::Requirement.default,
-    :required_rubygems_version => Gem::Requirement.default,
-    :requirements => [],
-    :rubygems_version => Gem::VERSION,
-    :signing_key => nil,
-    :specification_version => CURRENT_SPECIFICATION_VERSION,
-    :summary => nil,
-    :test_files => [],
-    :version => nil,
+    authors: [],
+    autorequire: nil,
+    bindir: "bin",
+    cert_chain: [],
+    date: nil,
+    dependencies: [],
+    description: nil,
+    email: nil,
+    executables: [],
+    extensions: [],
+    extra_rdoc_files: [],
+    files: [],
+    homepage: nil,
+    licenses: [],
+    metadata: {},
+    name: nil,
+    platform: Gem::Platform::RUBY,
+    post_install_message: nil,
+    rdoc_options: [],
+    require_paths: ["lib"],
+    required_ruby_version: Gem::Requirement.default,
+    required_rubygems_version: Gem::Requirement.default,
+    requirements: [],
+    rubygems_version: Gem::VERSION,
+    signing_key: nil,
+    specification_version: CURRENT_SPECIFICATION_VERSION,
+    summary: nil,
+    test_files: [],
+    version: nil,
   }.freeze
 
   # rubocop:disable Style/MutableConstant
@@ -174,27 +175,17 @@ class Gem::Specification < Gem::BasicSpecification
   end
 
   @@attributes = @@default_value.keys.sort_by(&:to_s)
-  @@array_attributes = @@default_value.reject {|_k,v| v != [] }.keys
+  @@array_attributes = @@default_value.select {|_k,v| v.is_a?(Array) }.keys
   @@nil_attributes, @@non_nil_attributes = @@default_value.keys.partition do |k|
     @@default_value[k].nil?
   end
 
-  def self.clear_specs # :nodoc:
-    @@all = nil
-    @@stubs = nil
-    @@stubs_by_name = {}
-    @@spec_with_requirable_file = {}
-    @@active_stub_with_requirable_file = {}
-  end
-  private_class_method :clear_specs
-
-  clear_specs
-
   # Sentinel object to represent "not found" stubs
   NOT_FOUND = Struct.new(:to_spec, :this).new # :nodoc:
+  deprecate_constant :NOT_FOUND
 
   # Tracking removed method calls to warn users during build time.
-  REMOVED_METHODS = [:rubyforge_project=].freeze # :nodoc:
+  REMOVED_METHODS = [:rubyforge_project=, :mark_version].freeze # :nodoc:
   def removed_method_calls
     @removed_method_calls ||= []
   end
@@ -301,7 +292,7 @@ def authors=(value)
   #
   # Usage:
   #
-  #   spec.description = <<-EOF
+  #   spec.description = <<~EOF
   #     Rake is a Make-like program implemented in Ruby. Tasks and
   #     dependencies are specified in standard Ruby syntax.
   #   EOF
@@ -341,7 +332,7 @@ def authors=(value)
   # https://opensource.org/licenses/ approved.
   #
   # The most commonly used OSI-approved licenses are MIT and Apache-2.0.
-  # GitHub also provides a license picker at http://choosealicense.com/.
+  # GitHub also provides a license picker at https://choosealicense.com/.
   #
   # You can also use a custom license file along with your gemspec and specify
   # a LicenseRef-<idstring>, where idstring is the name of the file containing
@@ -400,7 +391,7 @@ def licenses=(licenses)
   #     "homepage_uri"      => "https://bestgemever.example.io",
   #     "mailing_list_uri"  => "https://groups.example.com/bestgemever",
   #     "source_code_uri"   => "https://example.com/user/bestgemever",
-  #     "wiki_uri"          => "https://example.com/user/bestgemever/wiki"
+  #     "wiki_uri"          => "https://example.com/user/bestgemever/wiki",
   #     "funding_uri"       => "https://example.com/donate"
   #   }
   #
@@ -426,11 +417,11 @@ def author=(o)
   end
 
   ##
-  # The path in the gem for executable scripts.  Usually 'bin'
+  # The path in the gem for executable scripts.  Usually 'exe'
   #
   # Usage:
   #
-  #   spec.bindir = 'bin'
+  #   spec.bindir = 'exe'
 
   attr_accessor :bindir
 
@@ -473,10 +464,7 @@ def author=(o)
   #   spec.platform = Gem::Platform.local
 
   def platform=(platform)
-    if @original_platform.nil? ||
-       @original_platform == Gem::Platform::RUBY
-      @original_platform = platform
-    end
+    @original_platform = platform
 
     case platform
     when Gem::Platform::CURRENT then
@@ -530,13 +518,6 @@ def require_paths=(val)
 
   attr_reader :required_rubygems_version
 
-  ##
-  # The version of RubyGems used to create this gem.
-  #
-  # Do not set this, it is set automatically when the gem is packaged.
-
-  attr_accessor :rubygems_version
-
   ##
   # The key used to sign this gem.  See Gem::Security for details.
 
@@ -562,9 +543,9 @@ def add_development_dependency(gem, *requirements)
   #
   # Usage:
   #
-  #   spec.add_runtime_dependency 'example', '~> 1.1', '>= 1.1.4'
+  #   spec.add_dependency 'example', '~> 1.1', '>= 1.1.4'
 
-  def add_runtime_dependency(gem, *requirements)
+  def add_dependency(gem, *requirements)
     if requirements.uniq.size != requirements.size
       warn "WARNING: duplicated #{gem} dependency #{requirements}"
     end
@@ -724,6 +705,21 @@ def test_files=(files) # :nodoc:
     @test_files = Array files
   end
 
+  ######################################################################
+  # :section: Read-only attributes
+
+  ##
+  # The version of RubyGems used to create this gem.
+
+  attr_accessor :rubygems_version
+
+  ##
+  # The path where this gem installs its extensions.
+
+  def extensions_dir
+    @extensions_dir ||= super
+  end
+
   ######################################################################
   # :section: Specification internals
 
@@ -762,7 +758,7 @@ def test_files=(files) # :nodoc:
   attr_accessor :specification_version
 
   def self._all # :nodoc:
-    @@all ||= Gem.loaded_specs.values | stubs.map(&:to_spec)
+    specification_record.all
   end
 
   def self.clear_load_cache # :nodoc:
@@ -772,34 +768,22 @@ def self.clear_load_cache # :nodoc:
   end
   private_class_method :clear_load_cache
 
+  def self.gem_path # :nodoc:
+    Gem.path
+  end
+  private_class_method :gem_path
+
   def self.each_gemspec(dirs) # :nodoc:
     dirs.each do |dir|
       Gem::Util.glob_files_in_dir("*.gemspec", dir).each do |path|
-        yield path.tap(&Gem::UNTAINT)
+        yield path
       end
     end
   end
 
-  def self.gemspec_stubs_in(dir, pattern)
+  def self.gemspec_stubs_in(dir, pattern) # :nodoc:
     Gem::Util.glob_files_in_dir(pattern, dir).map {|path| yield path }.select(&:valid?)
   end
-  private_class_method :gemspec_stubs_in
-
-  def self.installed_stubs(dirs, pattern)
-    map_stubs(dirs, pattern) do |path, base_dir, gems_dir|
-      Gem::StubSpecification.gemspec_stub(path, base_dir, gems_dir)
-    end
-  end
-  private_class_method :installed_stubs
-
-  def self.map_stubs(dirs, pattern) # :nodoc:
-    dirs.flat_map do |dir|
-      base_dir = File.dirname dir
-      gems_dir = File.join base_dir, "gems"
-      gemspec_stubs_in(dir, pattern) {|path| yield path, base_dir, gems_dir }
-    end
-  end
-  private_class_method :map_stubs
 
   def self.each_spec(dirs) # :nodoc:
     each_gemspec(dirs) do |path|
@@ -812,13 +796,7 @@ def self.each_spec(dirs) # :nodoc:
   # Returns a Gem::StubSpecification for every installed gem
 
   def self.stubs
-    @@stubs ||= begin
-      pattern = "*.gemspec"
-      stubs = stubs_for_pattern(pattern, false)
-
-      @@stubs_by_name = stubs.select {|s| Gem::Platform.match_spec? s }.group_by(&:name)
-      stubs
-    end
+    specification_record.stubs
   end
 
   ##
@@ -837,13 +815,7 @@ def self.default_stubs(pattern = "*.gemspec")
   # only returns stubs that match Gem.platforms
 
   def self.stubs_for(name)
-    if @@stubs
-      @@stubs_by_name[name] || []
-    else
-      @@stubs_by_name[name] ||= stubs_for_pattern("#{name}-*.gemspec").select do |s|
-        s.name == name
-      end
-    end
+    specification_record.stubs_for(name)
   end
 
   ##
@@ -851,12 +823,7 @@ def self.stubs_for(name)
   # optionally filtering out specs not matching the current platform
   #
   def self.stubs_for_pattern(pattern, match_platform = true) # :nodoc:
-    installed_stubs = installed_stubs(Gem::Specification.dirs, pattern)
-    installed_stubs.select! {|s| Gem::Platform.match_spec? s } if match_platform
-    stubs = installed_stubs + default_stubs(pattern)
-    stubs = stubs.uniq(&:full_name)
-    _resort!(stubs)
-    stubs
+    specification_record.stubs_for_pattern(pattern, match_platform)
   end
 
   def self._resort!(specs) # :nodoc:
@@ -865,7 +832,11 @@ def self._resort!(specs) # :nodoc:
       next names if names.nonzero?
       versions = b.version <=> a.version
       next versions if versions.nonzero?
-      Gem::Platform.sort_priority(b.platform)
+      platforms = Gem::Platform.sort_priority(b.platform) <=> Gem::Platform.sort_priority(a.platform)
+      next platforms if platforms.nonzero?
+      default_gem = a.default_gem_priority <=> b.default_gem_priority
+      next default_gem if default_gem.nonzero?
+      a.base_dir_priority(gem_path) <=> b.base_dir_priority(gem_path)
     end
   end
 
@@ -885,23 +856,14 @@ def self.load_defaults
   # properly sorted.
 
   def self.add_spec(spec)
-    return if _all.include? spec
-
-    _all << spec
-    stubs << spec
-    (@@stubs_by_name[spec.name] ||= []) << spec
-
-    _resort!(@@stubs_by_name[spec.name])
-    _resort!(stubs)
+    specification_record.add_spec(spec)
   end
 
   ##
   # Removes +spec+ from the known specs.
 
   def self.remove_spec(spec)
-    _all.delete spec.to_spec
-    stubs.delete spec
-    (@@stubs_by_name[spec.name] || []).delete spec
+    specification_record.remove_spec(spec)
   end
 
   ##
@@ -909,33 +871,23 @@ def self.remove_spec(spec)
   # You probably want to use one of the Enumerable methods instead.
 
   def self.all
-    warn "NOTE: Specification.all called from #{caller.first}" unless
+    warn "NOTE: Specification.all called from #{caller(1, 1).first}" unless
       Gem::Deprecate.skip
     _all
   end
 
   ##
-  # Sets the known specs to +specs+. Not guaranteed to work for you in
-  # the future. Use at your own risk. Caveat emptor. Doomy doom doom.
-  # Etc etc.
-  #
-  #--
-  # Makes +specs+ the known specs
-  # Listen, time is a river
-  # Winter comes, code breaks
-  #
-  # -- wilsonb
+  # Sets the known specs to +specs+.
 
   def self.all=(specs)
-    @@stubs_by_name = specs.group_by(&:name)
-    @@all = @@stubs = specs
+    specification_record.all = specs
   end
 
   ##
   # Return full names of all specs in sorted order.
 
   def self.all_names
-    _all.map(&:full_name)
+    specification_record.all_names
   end
 
   ##
@@ -960,9 +912,7 @@ def self.attribute_names
   # Return the directories that Specification uses to find specs.
 
   def self.dirs
-    @@dirs ||= Gem.path.collect do |dir|
-      File.join dir.dup.tap(&Gem::UNTAINT), "specifications"
-    end
+    @@dirs ||= Gem::SpecificationRecord.dirs_from(gem_path)
   end
 
   ##
@@ -972,7 +922,7 @@ def self.dirs
   def self.dirs=(dirs)
     reset
 
-    @@dirs = Array(dirs).map {|dir| File.join dir, "specifications" }
+    @@dirs = Gem::SpecificationRecord.dirs_from(Array(dirs))
   end
 
   extend Enumerable
@@ -981,23 +931,15 @@ def self.dirs=(dirs)
   # Enumerate every known spec.  See ::dirs= and ::add_spec to set the list of
   # specs.
 
-  def self.each
-    return enum_for(:each) unless block_given?
-
-    _all.each do |x|
-      yield x
-    end
+  def self.each(&block)
+    specification_record.each(&block)
   end
 
   ##
   # Returns every spec that matches +name+ and optional +requirements+.
 
   def self.find_all_by_name(name, *requirements)
-    requirements = Gem::Requirement.default if requirements.empty?
-
-    # TODO: maybe try: find_all { |s| spec === dep }
-
-    Gem::Dependency.new(name, *requirements).matching_specs
+    specification_record.find_all_by_name(name, *requirements)
   end
 
   ##
@@ -1014,8 +956,6 @@ def self.find_all_by_full_name(full_name)
   def self.find_by_name(name, *requirements)
     requirements = Gem::Requirement.default if requirements.empty?
 
-    # TODO: maybe try: find { |s| spec === dep }
-
     Gem::Dependency.new(name, *requirements).to_spec
   end
 
@@ -1029,12 +969,7 @@ def self.find_by_full_name(full_name)
   # Return the best specification that contains the file matching +path+.
 
   def self.find_by_path(path)
-    path = path.dup.freeze
-    spec = @@spec_with_requirable_file[path] ||= stubs.find do |s|
-      s.contains_requirable_file? path
-    end || NOT_FOUND
-
-    spec.to_spec
+    specification_record.find_by_path(path)
   end
 
   ##
@@ -1042,19 +977,15 @@ def self.find_by_path(path)
   # amongst the specs that are not activated.
 
   def self.find_inactive_by_path(path)
-    stub = stubs.find do |s|
-      next if s.activated?
-      s.contains_requirable_file? path
-    end
-    stub&.to_spec
+    specification_record.find_inactive_by_path(path)
   end
 
-  def self.find_active_stub_by_path(path)
-    stub = @@active_stub_with_requirable_file[path] ||= stubs.find do |s|
-      s.activated? && s.contains_requirable_file?(path)
-    end || NOT_FOUND
+  ##
+  # Return the best specification that contains the file matching +path+, among
+  # those already activated.
 
-    stub.this
+  def self.find_active_stub_by_path(path)
+    specification_record.find_active_stub_by_path(path)
   end
 
   ##
@@ -1071,7 +1002,7 @@ def self.find_in_unresolved(path)
   def self.find_in_unresolved_tree(path)
     unresolved_specs.each do |spec|
       spec.traverse do |_from_spec, _dep, to_spec, trail|
-        if to_spec.has_conflicts? || to_spec.conficts_when_loaded_with?(trail)
+        if to_spec.has_conflicts? || to_spec.conflicts_when_loaded_with?(trail)
           :next
         else
           return trail.reverse if to_spec.contains_requirable_file? path
@@ -1083,7 +1014,7 @@ def self.find_in_unresolved_tree(path)
   end
 
   def self.unresolved_specs
-    unresolved_deps.values.map(&:to_specs).flatten
+    unresolved_deps.values.flat_map(&:to_specs)
   end
   private_class_method :unresolved_specs
 
@@ -1121,14 +1052,14 @@ def self.from_yaml(input)
   # +prerelease+ is true.
 
   def self.latest_specs(prerelease = false)
-    _latest_specs Gem::Specification.stubs, prerelease
+    specification_record.latest_specs(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 }
+    specification_record.latest_spec_for(name)
   end
 
   def self._latest_specs(specs, prerelease = false) # :nodoc:
@@ -1142,7 +1073,7 @@ def self._latest_specs(specs, prerelease = false) # :nodoc:
       result[spec.name] = spec
     end
 
-    result.map(&:last).flatten.sort_by(&:name)
+    result.flat_map(&:last).sort_by(&:name)
   end
 
   ##
@@ -1154,13 +1085,10 @@ def self.load(file)
     spec = @load_cache_mutex.synchronize { @load_cache[file] }
     return spec if spec
 
-    file = file.dup.tap(&Gem::UNTAINT)
     return unless File.file?(file)
 
     code = Gem.open_file(file, "r:UTF-8:-", &:read)
 
-    code.tap(&Gem::UNTAINT)
-
     begin
       spec = eval code, binding, file
 
@@ -1269,27 +1197,43 @@ def self.required_attributes
   def self.reset
     @@dirs = nil
     Gem.pre_reset_hooks.each(&:call)
-    clear_specs
+    @specification_record = nil
     clear_load_cache
-    unresolved = unresolved_deps
-    unless unresolved.empty?
-      warn "WARN: Unresolved or ambiguous specs during Gem::Specification.reset:"
-      unresolved.values.each do |dep|
-        warn "      #{dep}"
-
-        versions = find_all_by_name(dep.name)
-        unless versions.empty?
-          warn "      Available/installed versions of this gem:"
-          versions.each {|s| warn "      - #{s.version}" }
+
+    unless unresolved_deps.empty?
+      unresolved = unresolved_deps.filter_map do |name, dep|
+        matching_versions = find_all_by_name(name)
+        next if dep.latest_version? && matching_versions.any?(&:default_gem?)
+
+        [dep, matching_versions.uniq(&:full_name)]
+      end.to_h
+
+      unless unresolved.empty?
+        warn "WARN: Unresolved or ambiguous specs during Gem::Specification.reset:"
+        unresolved.each do |dep, versions|
+          warn "      #{dep}"
+
+          unless versions.empty?
+            warn "      Available/installed versions of this gem:"
+            versions.each {|s| warn "      - #{s.version}" }
+          end
         end
+        warn "WARN: Clearing out unresolved specs. Try 'gem cleanup <gem>'"
+        warn "Please report a bug if this causes problems."
       end
-      warn "WARN: Clearing out unresolved specs. Try 'gem cleanup <gem>'"
-      warn "Please report a bug if this causes problems."
-      unresolved.clear
+
+      unresolved_deps.clear
     end
     Gem.post_reset_hooks.each(&:call)
   end
 
+  ##
+  # Keeps track of all currently known specifications
+
+  def self.specification_record
+    @specification_record ||= Gem::SpecificationRecord.new(dirs)
+  end
+
   # DOC: This method needs documented or nodoc'd
   def self.unresolved_deps
     @unresolved_deps ||= Hash.new {|h, n| h[n] = Gem::Dependency.new n }
@@ -1300,12 +1244,13 @@ def self.unresolved_deps
 
   def self._load(str)
     Gem.load_yaml
+    Gem.load_safe_marshal
 
     yaml_set = false
     retry_count = 0
 
     array = begin
-      Marshal.load str
+      Gem::SafeMarshal.safe_load str
     rescue ArgumentError => e
       # Avoid an infinite retry loop when the argument error has nothing to do
       # with the classes not being defined.
@@ -1369,7 +1314,7 @@ def self._load(str)
     spec.instance_variable_set :@summary,                   array[5]
     spec.instance_variable_set :@required_ruby_version,     array[6]
     spec.instance_variable_set :@required_rubygems_version, array[7]
-    spec.instance_variable_set :@original_platform,         array[8]
+    spec.platform =                                         array[8]
     spec.instance_variable_set :@dependencies,              array[9]
     # offset due to rubyforge_project removal
     spec.instance_variable_set :@email,                     array[11]
@@ -1377,9 +1322,7 @@ def self._load(str)
     spec.instance_variable_set :@description,               array[13]
     spec.instance_variable_set :@homepage,                  array[14]
     spec.instance_variable_set :@has_rdoc,                  array[15]
-    spec.instance_variable_set :@new_platform,              array[16]
-    spec.instance_variable_set :@platform,                  array[16].to_s
-    spec.instance_variable_set :@license,                   array[17]
+    spec.instance_variable_set :@licenses,                  array[17]
     spec.instance_variable_set :@metadata,                  array[18]
     spec.instance_variable_set :@loaded,                    false
     spec.instance_variable_set :@activated,                 false
@@ -1472,13 +1415,11 @@ def activate_dependencies
         raise e
       end
 
-      begin
-        specs = spec_dep.to_specs
-      rescue Gem::MissingSpecError => e
-        raise Gem::MissingSpecError.new(e.name, e.requirement, "at: #{spec_file}")
-      end
+      specs = spec_dep.matching_specs(true).uniq(&:full_name)
 
-      if specs.size == 1
+      if specs.size == 0
+        raise Gem::MissingSpecError.new(spec_dep.name, spec_dep.requirement, "at: #{spec_file}")
+      elsif specs.size == 1
         specs.first.activate
       else
         name = spec_dep.name
@@ -1565,7 +1506,7 @@ def add_dependency_with_type(dependency, type, requirements)
 
   private :add_dependency_with_type
 
-  alias_method :add_dependency, :add_runtime_dependency
+  alias_method :add_runtime_dependency, :add_dependency
 
   ##
   # Adds this spec's require paths to LOAD_PATH, in the proper location.
@@ -1708,7 +1649,7 @@ def conflicts
   ##
   # return true if there will be conflict when spec if loaded together with the list of specs.
 
-  def conficts_when_loaded_with?(list_of_specs) # :nodoc:
+  def conflicts_when_loaded_with?(list_of_specs) # :nodoc:
     result = list_of_specs.any? do |spec|
       spec.runtime_dependencies.any? {|dep| (dep.name == name) && !satisfies_requirement?(dep) }
     end
@@ -1749,7 +1690,7 @@ def DateLike.===(obj) # :nodoc:
     /\A
      (\d{4})-(\d{2})-(\d{2})
      (\s+ \d{2}:\d{2}:\d{2}\.\d+ \s* (Z | [-+]\d\d:\d\d) )?
-     \Z/x.freeze
+     \Z/x
 
   ##
   # The date this gem was created
@@ -1836,7 +1777,7 @@ def dependent_gems(check_dev=true)
   # Returns all specs that matches this spec's runtime dependencies.
 
   def dependent_specs
-    runtime_dependencies.map(&:to_specs).flatten
+    runtime_dependencies.flat_map(&:to_specs)
   end
 
   ##
@@ -1872,23 +1813,15 @@ def doc_dir(type = nil)
   end
 
   def encode_with(coder) # :nodoc:
-    mark_version
-
     coder.add "name", @name
     coder.add "version", @version
-    platform = case @original_platform
-               when nil, "" then
-                 "ruby"
-               when String then
-                 @original_platform
-               else
-                 @original_platform.to_s
-    end
-    coder.add "platform", platform
+    coder.add "platform", platform.to_s
+    coder.add "original_platform", original_platform.to_s if platform.to_s != original_platform.to_s
 
     attributes = @@attributes.map(&:to_s) - %w[name version platform]
     attributes.each do |name|
-      coder.add name, instance_variable_get("@#{name}")
+      value = instance_variable_get("@#{name}")
+      coder.add name, value unless value.nil?
     end
   end
 
@@ -1975,7 +1908,8 @@ def full_name
   end
 
   ##
-  # Work around bundler removing my methods
+  # Work around old bundler versions removing my methods
+  # Can be removed once RubyGems can no longer install Bundler 2.5
 
   def gem_dir # :nodoc:
     super
@@ -2073,7 +2007,8 @@ def initialize(name = nil, version = nil)
   end
 
   ##
-  # Duplicates array_attributes from +other_spec+ so state isn't shared.
+  # Duplicates Array and Gem::Requirement attributes from +other_spec+ so state isn't shared.
+  #
 
   def initialize_copy(other_spec)
     self.class.array_attributes.each do |name|
@@ -2095,6 +2030,9 @@ def initialize_copy(other_spec)
         raise e
       end
     end
+
+    @required_ruby_version = other_spec.required_ruby_version.dup
+    @required_rubygems_version = other_spec.required_rubygems_version.dup
   end
 
   def base_dir
@@ -2163,13 +2101,6 @@ def internal_init # :nodoc:
     @spec_file     = nil
   end
 
-  ##
-  # Sets the rubygems_version to the current RubyGems version.
-
-  def mark_version
-    @rubygems_version = Gem::VERSION
-  end
-
   ##
   # Track removed method calls to warn about during build time.
   # Warn about unknown attributes while loading a spec.
@@ -2213,11 +2144,11 @@ def normalize
       @files.concat(@extra_rdoc_files)
     end
 
-    @files            = @files.uniq if @files
-    @extensions       = @extensions.uniq if @extensions
-    @test_files       = @test_files.uniq if @test_files
-    @executables      = @executables.uniq if @executables
-    @extra_rdoc_files = @extra_rdoc_files.uniq if @extra_rdoc_files
+    @files            = @files.uniq.sort if @files
+    @extensions       = @extensions.uniq.sort if @extensions
+    @test_files       = @test_files.uniq.sort if @test_files
+    @executables      = @executables.uniq.sort if @executables
+    @extra_rdoc_files = @extra_rdoc_files.uniq.sort if @extra_rdoc_files
   end
 
   ##
@@ -2362,12 +2293,12 @@ def ruby_code(obj)
     when Hash               then
       seg = obj.keys.sort.map {|k| "#{k.to_s.dump} => #{obj[k].to_s.dump}" }
       "{ #{seg.join(", ")} }"
-    when Gem::Version       then obj.to_s.dump
+    when Gem::Version       then ruby_code(obj.to_s)
     when DateLike           then obj.strftime("%Y-%m-%d").dump
     when Time               then obj.strftime("%Y-%m-%d").dump
     when Numeric            then obj.inspect
     when true, false, nil   then obj.inspect
-    when Gem::Platform      then "Gem::Platform.new(#{obj.to_a.inspect})"
+    when Gem::Platform      then "Gem::Platform.new(#{ruby_code obj.to_a})"
     when Gem::Requirement   then
       list = obj.as_list
       "Gem::Requirement.new(#{ruby_code(list.size == 1 ? obj.to_s : list)})"
@@ -2487,7 +2418,6 @@ def test_files # :nodoc:
   # still have their default values are omitted.
 
   def to_ruby
-    mark_version
     result = []
     result << "# -*- encoding: utf-8 -*-"
     result << "#{Gem::StubSpecification::PREFIX}#{name} #{version} #{platform} #{raw_require_paths.join("\0")}"
@@ -2532,12 +2462,12 @@ def to_ruby
     end
 
     if String === signing_key
-      result << "  s.signing_key = #{signing_key.dump}.freeze"
+      result << "  s.signing_key = #{ruby_code signing_key}"
     end
 
     if @installed_by_version
       result << nil
-      result << "  s.installed_by_version = \"#{Gem::VERSION}\" if s.respond_to? :installed_by_version"
+      result << "  s.installed_by_version = #{ruby_code Gem::VERSION}"
     end
 
     unless dependencies.empty?
@@ -2546,9 +2476,8 @@ def to_ruby
       result << nil
 
       dependencies.each do |dep|
-        req = dep.requirements_list.inspect
         dep.instance_variable_set :@type, :runtime if dep.type.nil? # HACK
-        result << "  s.add_#{dep.type}_dependency(%q<#{dep.name}>.freeze, #{req})"
+        result << "  s.add_#{dep.type}_dependency(%q<#{dep.name}>.freeze, #{ruby_code dep.requirements_list})"
       end
     end
 
@@ -2653,6 +2582,10 @@ def keep_only_files_and_directories
     @test_files.delete_if       {|x| File.directory?(x) && !File.symlink?(x) }
   end
 
+  def validate_for_resolution
+    Gem::SpecificationPolicy.new(self).validate_for_resolution
+  end
+
   def validate_metadata
     Gem::SpecificationPolicy.new(self).validate_metadata
   end
@@ -2669,19 +2602,12 @@ def validate_permissions
   rubygems_deprecate :validate_permissions
 
   ##
-  # Set the version to +version+, potentially also setting
-  # required_rubygems_version if +version+ indicates it is a
-  # prerelease.
+  # Set the version to +version+.
 
   def version=(version)
     @version = Gem::Version.create(version)
     return if @version.nil?
 
-    # skip to set required_ruby_version when pre-released rubygems.
-    # It caused to raise CircularDependencyError
-    if @version.prerelease? && (@name.nil? || @name.strip != "rubygems")
-      self.required_rubygems_version = "> 1.3.1"
-    end
     invalidate_memoized_attributes
   end
 
@@ -2694,14 +2620,13 @@ def yaml_initialize(tag, vals) # :nodoc:
       case ivar
       when "date"
         # Force Date to go through the extra coerce logic in date=
-        self.date = val.tap(&Gem::UNTAINT)
+        self.date = val
+      when "platform"
+        self.platform = val
       else
-        instance_variable_set "@#{ivar}", val.tap(&Gem::UNTAINT)
+        instance_variable_set "@#{ivar}", val
       end
     end
-
-    @original_platform = @platform # for backwards compatibility
-    self.platform = Gem::Platform.new @platform
   end
 
   ##
diff --git a/lib/rubygems/specification_policy.rb b/lib/rubygems/specification_policy.rb
index 057c6ccb9ec479..d79ee7df9252ae 100644
--- a/lib/rubygems/specification_policy.rb
+++ b/lib/rubygems/specification_policy.rb
@@ -5,20 +5,21 @@
 class Gem::SpecificationPolicy
   include Gem::UserInteraction
 
-  VALID_NAME_PATTERN = /\A[a-zA-Z0-9\.\-\_]+\z/.freeze # :nodoc:
+  VALID_NAME_PATTERN = /\A[a-zA-Z0-9\.\-\_]+\z/ # :nodoc:
 
-  SPECIAL_CHARACTERS = /\A[#{Regexp.escape('.-_')}]+/.freeze # :nodoc:
+  SPECIAL_CHARACTERS = /\A[#{Regexp.escape(".-_")}]+/ # :nodoc:
 
-  VALID_URI_PATTERN = %r{\Ahttps?:\/\/([^\s:@]+:[^\s:@]*@)?[A-Za-z\d\-]+(\.[A-Za-z\d\-]+)+\.?(:\d{1,5})?([\/?]\S*)?\z}.freeze # :nodoc:
+  VALID_URI_PATTERN = %r{\Ahttps?:\/\/([^\s:@]+:[^\s:@]*@)?[A-Za-z\d\-]+(\.[A-Za-z\d\-]+)+\.?(:\d{1,5})?([\/?]\S*)?\z} # :nodoc:
 
   METADATA_LINK_KEYS = %w[
-    bug_tracker_uri
-    changelog_uri
-    documentation_uri
     homepage_uri
-    mailing_list_uri
+    changelog_uri
     source_code_uri
+    documentation_uri
     wiki_uri
+    mailing_list_uri
+    bug_tracker_uri
+    download_uri
     funding_uri
   ].freeze # :nodoc:
 
@@ -44,6 +45,7 @@ def initialize(specification)
 
   def validate(strict = false)
     validate_required!
+    validate_required_metadata!
 
     validate_optional(strict) if packaging || strict
 
@@ -84,15 +86,17 @@ def validate_required!
 
     validate_authors_field
 
-    validate_metadata
-
     validate_licenses_length
 
-    validate_lazy_metadata
-
     validate_duplicate_dependencies
   end
 
+  def validate_required_metadata!
+    validate_metadata
+
+    validate_lazy_metadata
+  end
+
   def validate_optional(strict)
     validate_licenses
 
@@ -102,10 +106,14 @@ def validate_optional(strict)
 
     validate_dependencies
 
+    validate_required_ruby_version
+
     validate_extensions
 
     validate_removed_attributes
 
+    validate_unique_links
+
     if @warnings > 0
       if strict
         error "specification has warnings"
@@ -115,6 +123,13 @@ def validate_optional(strict)
     end
   end
 
+  ##
+  # Implementation for Specification#validate_for_resolution
+
+  def validate_for_resolution
+    validate_required!
+  end
+
   ##
   # Implementation for Specification#validate_metadata
 
@@ -224,6 +239,12 @@ def validate_dependencies # :nodoc:
     end
   end
 
+  def validate_required_ruby_version
+    if @specification.required_ruby_version.requirements == [Gem::Requirement::DefaultRequirement]
+      warning "make sure you specify the oldest ruby version constraint (like \">= 3.0\") that you want your gem to support by setting the `required_ruby_version` gemspec attribute"
+    end
+  end
+
   ##
   # Issues a warning for each file to be packaged which is world-readable.
   #
@@ -263,7 +284,9 @@ def validate_rubygems_version
 
     return if rubygems_version == Gem::VERSION
 
-    error "expected RubyGems version #{Gem::VERSION}, was #{rubygems_version}"
+    warning "expected RubyGems version #{Gem::VERSION}, was #{rubygems_version}"
+
+    @specification.rubygems_version = Gem::VERSION
   end
 
   def validate_required_attributes
@@ -284,7 +307,7 @@ def validate_name
     elsif !VALID_NAME_PATTERN.match?(name)
       error "invalid value for attribute name: #{name.dump} can only include letters, numbers, dashes, and underscores"
     elsif SPECIAL_CHARACTERS.match?(name)
-      error "invalid value for attribute name: #{name.dump} can not begin with a period, dash, or underscore"
+      error "invalid value for attribute name: #{name.dump} cannot begin with a period, dash, or underscore"
     end
   end
 
@@ -371,10 +394,21 @@ def validate_licenses
 
     licenses.each do |license|
       next if Gem::Licenses.match?(license) || license.nil?
+      license_id_deprecated = Gem::Licenses.deprecated_license_id?(license)
+      exception_id_deprecated = Gem::Licenses.deprecated_exception_id?(license)
       suggestions = Gem::Licenses.suggestions(license)
+
+      if license_id_deprecated
+        main_message = "License identifier '#{license}' is deprecated"
+      elsif exception_id_deprecated
+        main_message = "Exception identifier at '#{license}' is deprecated"
+      else
+        main_message = "License identifier '#{license}' is invalid"
+      end
+
       message = <<-WARNING
-license value '#{license}' is invalid.  Use a license identifier from
-http://spdx.org/licenses or '#{Gem::Licenses::NONSTANDARD}' for a nonstandard license,
+#{main_message}. Use an identifier from
+https://spdx.org/licenses or '#{Gem::Licenses::NONSTANDARD}' for a nonstandard license,
 or set it to nil if you don't want to specify a license.
       WARNING
       message += "Did you mean #{suggestions.map {|s| "'#{s}'" }.join(", ")}?\n" unless suggestions.nil?
@@ -382,15 +416,15 @@ def validate_licenses
     end
 
     warning <<-WARNING if licenses.empty?
-licenses is empty, but is recommended.  Use a license identifier from
-http://spdx.org/licenses or '#{Gem::Licenses::NONSTANDARD}' for a nonstandard license,
+licenses is empty, but is recommended. Use an license identifier from
+https://spdx.org/licenses or '#{Gem::Licenses::NONSTANDARD}' for a nonstandard license,
 or set it to nil if you don't want to specify a license.
     WARNING
   end
 
   LAZY = '"FIxxxXME" or "TOxxxDO"'.gsub(/xxx/, "")
-  LAZY_PATTERN = /\AFI XME|\ATO DO/x.freeze
-  HOMEPAGE_URI_PATTERN = /\A[a-z][a-z\d+.-]*:/i.freeze
+  LAZY_PATTERN = /\AFI XME|\ATO DO/x
+  HOMEPAGE_URI_PATTERN = /\A[a-z][a-z\d+.-]*:/i
 
   def validate_lazy_metadata
     unless @specification.authors.grep(LAZY_PATTERN).empty?
@@ -413,13 +447,13 @@ def validate_lazy_metadata
 
     # Make sure a homepage is valid HTTP/HTTPS URI
     if homepage && !homepage.empty?
-      require "uri"
+      require_relative "vendor/uri/lib/uri"
       begin
-        homepage_uri = URI.parse(homepage)
-        unless [URI::HTTP, URI::HTTPS].member? homepage_uri.class
+        homepage_uri = Gem::URI.parse(homepage)
+        unless [Gem::URI::HTTP, Gem::URI::HTTPS].member? homepage_uri.class
           error "\"#{homepage}\" is not a valid HTTP URI"
         end
-      rescue URI::InvalidURIError
+      rescue Gem::URI::InvalidURIError
         error "\"#{homepage}\" is not a valid HTTP URI"
       end
     end
@@ -483,13 +517,29 @@ def validate_rust_extensions(builder) # :nodoc:
 
   def validate_rake_extensions(builder) # :nodoc:
     rake_extension = @specification.extensions.any? {|s| builder.builder_for(s) == Gem::Ext::RakeBuilder }
-    rake_dependency = @specification.dependencies.any? {|d| d.name == "rake" }
+    rake_dependency = @specification.dependencies.any? {|d| d.name == "rake" && d.type == :runtime }
 
     warning <<-WARNING if rake_extension && !rake_dependency
-You have specified rake based extension, but rake is not added as dependency. It is recommended to add rake as a dependency in gemspec since there's no guarantee rake will be already installed.
+You have specified rake based extension, but rake is not added as runtime dependency. It is recommended to add rake as a runtime dependency in gemspec since there's no guarantee rake will be already installed.
     WARNING
   end
 
+  def validate_unique_links
+    links = @specification.metadata.slice(*METADATA_LINK_KEYS)
+    grouped = links.group_by {|_key, uri| uri }
+    grouped.each do |uri, copies|
+      next unless copies.length > 1
+      keys = copies.map(&:first).join("\n  ")
+      warning <<~WARNING
+        You have specified the uri:
+          #{uri}
+        for all of the following keys:
+          #{keys}
+        Only the first one will be shown on rubygems.org
+      WARNING
+    end
+  end
+
   def warning(statement) # :nodoc:
     @warnings += 1
 
diff --git a/lib/rubygems/specification_record.rb b/lib/rubygems/specification_record.rb
new file mode 100644
index 00000000000000..195a35549670ed
--- /dev/null
+++ b/lib/rubygems/specification_record.rb
@@ -0,0 +1,212 @@
+# frozen_string_literal: true
+
+module Gem
+  class SpecificationRecord
+    def self.dirs_from(paths)
+      paths.map do |path|
+        File.join(path, "specifications")
+      end
+    end
+
+    def self.from_path(path)
+      new(dirs_from([path]))
+    end
+
+    def initialize(dirs)
+      @all = nil
+      @stubs = nil
+      @stubs_by_name = {}
+      @spec_with_requirable_file = {}
+      @active_stub_with_requirable_file = {}
+
+      @dirs = dirs
+    end
+
+    # Sentinel object to represent "not found" stubs
+    NOT_FOUND = Struct.new(:to_spec, :this).new
+    private_constant :NOT_FOUND
+
+    ##
+    # Returns the list of all specifications in the record
+
+    def all
+      @all ||= stubs.map(&:to_spec)
+    end
+
+    ##
+    # Returns a Gem::StubSpecification for every specification in the record
+
+    def stubs
+      @stubs ||= begin
+        pattern = "*.gemspec"
+        stubs = stubs_for_pattern(pattern, false)
+
+        @stubs_by_name = stubs.select {|s| Gem::Platform.match_spec? s }.group_by(&:name)
+        stubs
+      end
+    end
+
+    ##
+    # Returns a Gem::StubSpecification for every specification in the record
+    # named +name+ only returns stubs that match Gem.platforms
+
+    def stubs_for(name)
+      if @stubs
+        @stubs_by_name[name] || []
+      else
+        @stubs_by_name[name] ||= stubs_for_pattern("#{name}-*.gemspec").select do |s|
+          s.name == name
+        end
+      end
+    end
+
+    ##
+    # Finds stub specifications matching a pattern in the record, optionally
+    # filtering out specs not matching the current platform
+
+    def stubs_for_pattern(pattern, match_platform = true)
+      installed_stubs = installed_stubs(pattern)
+      installed_stubs.select! {|s| Gem::Platform.match_spec? s } if match_platform
+      stubs = installed_stubs + Gem::Specification.default_stubs(pattern)
+      Gem::Specification._resort!(stubs)
+      stubs
+    end
+
+    ##
+    # Adds +spec+ to the the record, keeping the collection properly sorted.
+
+    def add_spec(spec)
+      return if all.include? spec
+
+      all << spec
+      stubs << spec
+      (@stubs_by_name[spec.name] ||= []) << spec
+
+      Gem::Specification._resort!(@stubs_by_name[spec.name])
+      Gem::Specification._resort!(stubs)
+    end
+
+    ##
+    # Removes +spec+ from the record.
+
+    def remove_spec(spec)
+      all.delete spec.to_spec
+      stubs.delete spec
+      (@stubs_by_name[spec.name] || []).delete spec
+    end
+
+    ##
+    # Sets the specs known by the record to +specs+.
+
+    def all=(specs)
+      @stubs_by_name = specs.group_by(&:name)
+      @all = @stubs = specs
+    end
+
+    ##
+    # Return full names of all specs in the record in sorted order.
+
+    def all_names
+      all.map(&:full_name)
+    end
+
+    include Enumerable
+
+    ##
+    # Enumerate every known spec.
+
+    def each
+      return enum_for(:each) unless block_given?
+
+      all.each do |x|
+        yield x
+      end
+    end
+
+    ##
+    # Returns every spec in the record that matches +name+ and optional +requirements+.
+
+    def find_all_by_name(name, *requirements)
+      req = Gem::Requirement.create(*requirements)
+      env_req = Gem.env_requirement(name)
+
+      matches = stubs_for(name).find_all do |spec|
+        req.satisfied_by?(spec.version) && env_req.satisfied_by?(spec.version)
+      end.map(&:to_spec)
+
+      if name == "bundler" && !req.specific?
+        require_relative "bundler_version_finder"
+        Gem::BundlerVersionFinder.prioritize!(matches)
+      end
+
+      matches
+    end
+
+    ##
+    # Return the best specification in the record that contains the file matching +path+.
+
+    def find_by_path(path)
+      path = path.dup.freeze
+      spec = @spec_with_requirable_file[path] ||= stubs.find do |s|
+        s.contains_requirable_file? path
+      end || NOT_FOUND
+
+      spec.to_spec
+    end
+
+    ##
+    # Return the best specification in the record that contains the file
+    # matching +path+ amongst the specs that are not activated.
+
+    def find_inactive_by_path(path)
+      stub = stubs.find do |s|
+        next if s.activated?
+        s.contains_requirable_file? path
+      end
+      stub&.to_spec
+    end
+
+    ##
+    # Return the best specification in the record that contains the file
+    # matching +path+, among those already activated.
+
+    def find_active_stub_by_path(path)
+      stub = @active_stub_with_requirable_file[path] ||= stubs.find do |s|
+        s.activated? && s.contains_requirable_file?(path)
+      end || NOT_FOUND
+
+      stub.this
+    end
+
+    ##
+    # Return the latest specs in the record, optionally including prerelease
+    # specs if +prerelease+ is true.
+
+    def latest_specs(prerelease)
+      Gem::Specification._latest_specs stubs, prerelease
+    end
+
+    ##
+    # Return the latest installed spec in the record for gem +name+.
+
+    def latest_spec_for(name)
+      latest_specs(true).find {|installed_spec| installed_spec.name == name }
+    end
+
+    private
+
+    def installed_stubs(pattern)
+      map_stubs(pattern) do |path, base_dir, gems_dir|
+        Gem::StubSpecification.gemspec_stub(path, base_dir, gems_dir)
+      end
+    end
+
+    def map_stubs(pattern)
+      @dirs.flat_map do |dir|
+        base_dir = File.dirname dir
+        gems_dir = File.join base_dir, "gems"
+        Gem::Specification.gemspec_stubs_in(dir, pattern) {|path| yield path, base_dir, gems_dir }
+      end
+    end
+  end
+end
diff --git a/lib/rubygems/ssl_certs/rubygems.org/GlobalSignRootCA_R3.pem b/lib/rubygems/ssl_certs/rubygems.org/GlobalSign.pem
similarity index 100%
rename from lib/rubygems/ssl_certs/rubygems.org/GlobalSignRootCA_R3.pem
rename to lib/rubygems/ssl_certs/rubygems.org/GlobalSign.pem
diff --git a/lib/rubygems/ssl_certs/rubygems.org/GlobalSignRootCA.pem b/lib/rubygems/ssl_certs/rubygems.org/GlobalSignRootCA.pem
deleted file mode 100644
index f4ce4ca43dc0a0..00000000000000
--- a/lib/rubygems/ssl_certs/rubygems.org/GlobalSignRootCA.pem
+++ /dev/null
@@ -1,21 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDdTCCAl2gAwIBAgILBAAAAAABFUtaw5QwDQYJKoZIhvcNAQEFBQAwVzELMAkG
-A1UEBhMCQkUxGTAXBgNVBAoTEEdsb2JhbFNpZ24gbnYtc2ExEDAOBgNVBAsTB1Jv
-b3QgQ0ExGzAZBgNVBAMTEkdsb2JhbFNpZ24gUm9vdCBDQTAeFw05ODA5MDExMjAw
-MDBaFw0yODAxMjgxMjAwMDBaMFcxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9i
-YWxTaWduIG52LXNhMRAwDgYDVQQLEwdSb290IENBMRswGQYDVQQDExJHbG9iYWxT
-aWduIFJvb3QgQ0EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDaDuaZ
-jc6j40+Kfvvxi4Mla+pIH/EqsLmVEQS98GPR4mdmzxzdzxtIK+6NiY6arymAZavp
-xy0Sy6scTHAHoT0KMM0VjU/43dSMUBUc71DuxC73/OlS8pF94G3VNTCOXkNz8kHp
-1Wrjsok6Vjk4bwY8iGlbKk3Fp1S4bInMm/k8yuX9ifUSPJJ4ltbcdG6TRGHRjcdG
-snUOhugZitVtbNV4FpWi6cgKOOvyJBNPc1STE4U6G7weNLWLBYy5d4ux2x8gkasJ
-U26Qzns3dLlwR5EiUWMWea6xrkEmCMgZK9FGqkjWZCrXgzT/LCrBbBlDSgeF59N8
-9iFo7+ryUp9/k5DPAgMBAAGjQjBAMA4GA1UdDwEB/wQEAwIBBjAPBgNVHRMBAf8E
-BTADAQH/MB0GA1UdDgQWBBRge2YaRQ2XyolQL30EzTSo//z9SzANBgkqhkiG9w0B
-AQUFAAOCAQEA1nPnfE920I2/7LqivjTFKDK1fPxsnCwrvQmeU79rXqoRSLblCKOz
-yj1hTdNGCbM+w6DjY1Ub8rrvrTnhQ7k4o+YviiY776BQVvnGCv04zcQLcFGUl5gE
-38NflNUVyRRBnMRddWQVDf9VMOyGj/8N7yy5Y0b2qvzfvGn9LhJIZJrglfCm7ymP
-AbEVtQwdpf5pLGkkeB6zpxxxYu7KyJesF12KwvhHhm4qxFYxldBniYUr+WymXUad
-DKqC5JlR3XC321Y9YeRq4VzW9v493kHMB65jUr9TU/Qr6cf9tveCX4XSQRjbgbME
-HMUfpIBvFSDJ3gyICh3WZlXi/EjJKSZp4A==
------END CERTIFICATE-----
diff --git a/lib/rubygems/stub_specification.rb b/lib/rubygems/stub_specification.rb
index a3793eaa205452..4f6a70ba4b4b81 100644
--- a/lib/rubygems/stub_specification.rb
+++ b/lib/rubygems/stub_specification.rb
@@ -35,7 +35,7 @@ class StubLine # :nodoc: all
 
     def initialize(data, extensions)
       parts          = data[PREFIX.length..-1].split(" ", 4)
-      @name          = parts[0].freeze
+      @name          = -parts[0]
       @version       = if Gem::Version.correct?(parts[1])
         Gem::Version.new(parts[1])
       else
@@ -69,7 +69,6 @@ def self.gemspec_stub(filename, base_dir, gems_dir)
 
   def initialize(filename, base_dir, gems_dir, default_gem)
     super()
-    filename.tap(&Gem::UNTAINT)
 
     self.loaded_from = filename
     @data            = nil
@@ -84,11 +83,7 @@ def initialize(filename, base_dir, gems_dir, default_gem)
   # True when this gem has been activated
 
   def activated?
-    @activated ||=
-      begin
-        loaded = Gem.loaded_specs[name]
-        loaded && loaded.version == version
-      end
+    @activated ||= !loaded_spec.nil?
   end
 
   def default_gem?
@@ -113,14 +108,19 @@ def data
 
         Gem.open_file loaded_from, OPEN_MODE do |file|
           file.readline # discard encoding line
-          stubline = file.readline.chomp
+          stubline = file.readline
           if stubline.start_with?(PREFIX)
-            extensions = if /\A#{PREFIX}/ =~ file.readline.chomp
-              $'.split "\0"
-            else
-              StubLine::NO_EXTENSIONS
-            end
+            extline = file.readline
+
+            extensions =
+              if extline.delete_prefix!(PREFIX)
+                extline.chomp!
+                extline.split "\0"
+              else
+                StubLine::NO_EXTENSIONS
+              end
 
+            stubline.chomp! # readline(chomp: true) allocates 3x as much as .readline.chomp!
             @data = StubLine.new stubline, extensions
           end
         rescue EOFError
@@ -183,11 +183,7 @@ def full_name
   # The full Gem::Specification for this gem, loaded from evalling its gemspec
 
   def spec
-    @spec ||= if @data
-      loaded = Gem.loaded_specs[name]
-      loaded if loaded && loaded.version == version
-    end
-
+    @spec ||= loaded_spec if @data
     @spec ||= Gem::Specification.load(loaded_from)
   end
   alias_method :to_spec, :spec
@@ -206,4 +202,34 @@ def valid?
   def stubbed?
     data.is_a? StubLine
   end
+
+  def ==(other) # :nodoc:
+    self.class === other &&
+      name == other.name &&
+      version == other.version &&
+      platform == other.platform
+  end
+
+  alias_method :eql?, :== # :nodoc:
+
+  def hash # :nodoc:
+    name.hash ^ version.hash ^ platform.hash
+  end
+
+  def <=>(other) # :nodoc:
+    sort_obj <=> other.sort_obj
+  end
+
+  def sort_obj # :nodoc:
+    [name, version, Gem::Platform.sort_priority(platform)]
+  end
+
+  private
+
+  def loaded_spec
+    spec = Gem.loaded_specs[name]
+    return unless spec && spec.version == version && spec.default_gem? == default_gem?
+
+    spec
+  end
 end
diff --git a/lib/rubygems/target_rbconfig.rb b/lib/rubygems/target_rbconfig.rb
new file mode 100644
index 00000000000000..21d90ee9db126f
--- /dev/null
+++ b/lib/rubygems/target_rbconfig.rb
@@ -0,0 +1,50 @@
+# frozen_string_literal: true
+
+require "rbconfig"
+
+##
+# A TargetConfig is a wrapper around an RbConfig object that provides a
+# consistent interface for querying configuration for *deployment target
+# platform*, where the gem being installed is intended to run on.
+#
+# The TargetConfig is typically created from the RbConfig of the running Ruby
+# process, but can also be created from an RbConfig file on disk for cross-
+# compiling gems.
+
+class Gem::TargetRbConfig
+  attr_reader :path
+
+  def initialize(rbconfig, path)
+    @rbconfig = rbconfig
+    @path = path
+  end
+
+  ##
+  # Creates a TargetRbConfig for the platform that RubyGems is running on.
+
+  def self.for_running_ruby
+    new(::RbConfig, nil)
+  end
+
+  ##
+  # Creates a TargetRbConfig from the RbConfig file at the given path.
+  # Typically used for cross-compiling gems.
+
+  def self.from_path(rbconfig_path)
+    namespace = Module.new do |m|
+      # Load the rbconfig.rb file within a new anonymous module to avoid
+      # conflicts with the rbconfig for the running platform.
+      Kernel.load rbconfig_path, m
+    end
+    rbconfig = namespace.const_get(:RbConfig)
+
+    new(rbconfig, rbconfig_path)
+  end
+
+  ##
+  # Queries the configuration for the given key.
+
+  def [](key)
+    @rbconfig::CONFIG[key]
+  end
+end
diff --git a/lib/rubygems/tsort.rb b/lib/rubygems/tsort.rb
deleted file mode 100644
index 60ebe22e810c65..00000000000000
--- a/lib/rubygems/tsort.rb
+++ /dev/null
@@ -1,3 +0,0 @@
-# frozen_string_literal: true
-
-require_relative "tsort/lib/tsort"
diff --git a/lib/rubygems/tsort/.document b/lib/rubygems/tsort/.document
deleted file mode 100644
index 0c43bbd6b38177..00000000000000
--- a/lib/rubygems/tsort/.document
+++ /dev/null
@@ -1 +0,0 @@
-# Vendored files do not need to be documented
diff --git a/lib/rubygems/tsort/lib/tsort.rb b/lib/rubygems/tsort/lib/tsort.rb
deleted file mode 100644
index f825f14257b6f9..00000000000000
--- a/lib/rubygems/tsort/lib/tsort.rb
+++ /dev/null
@@ -1,452 +0,0 @@
-# frozen_string_literal: true
-
-#--
-# tsort.rb - provides a module for topological sorting and strongly connected components.
-#++
-#
-
-#
-# Gem::TSort implements topological sorting using Tarjan's algorithm for
-# strongly connected components.
-#
-# Gem::TSort is designed to be able to be used with any object which can be
-# interpreted as a directed graph.
-#
-# Gem::TSort requires two methods to interpret an object as a graph,
-# tsort_each_node and tsort_each_child.
-#
-# * tsort_each_node is used to iterate for all nodes over a graph.
-# * tsort_each_child is used to iterate for child nodes of a given node.
-#
-# The equality of nodes are defined by eql? and hash since
-# Gem::TSort uses Hash internally.
-#
-# == A Simple Example
-#
-# The following example demonstrates how to mix the Gem::TSort module into an
-# existing class (in this case, Hash). Here, we're treating each key in
-# the hash as a node in the graph, and so we simply alias the required
-# #tsort_each_node method to Hash's #each_key method. For each key in the
-# hash, the associated value is an array of the node's child nodes. This
-# choice in turn leads to our implementation of the required #tsort_each_child
-# method, which fetches the array of child nodes and then iterates over that
-# array using the user-supplied block.
-#
-#   require 'rubygems/tsort/lib/tsort'
-#
-#   class Hash
-#     include Gem::TSort
-#     alias tsort_each_node each_key
-#     def tsort_each_child(node, &block)
-#       fetch(node).each(&block)
-#     end
-#   end
-#
-#   {1=>[2, 3], 2=>[3], 3=>[], 4=>[]}.tsort
-#   #=> [3, 2, 1, 4]
-#
-#   {1=>[2], 2=>[3, 4], 3=>[2], 4=>[]}.strongly_connected_components
-#   #=> [[4], [2, 3], [1]]
-#
-# == A More Realistic Example
-#
-# A very simple `make' like tool can be implemented as follows:
-#
-#   require 'rubygems/tsort/lib/tsort'
-#
-#   class Make
-#     def initialize
-#       @dep = {}
-#       @dep.default = []
-#     end
-#
-#     def rule(outputs, inputs=[], &block)
-#       triple = [outputs, inputs, block]
-#       outputs.each {|f| @dep[f] = [triple]}
-#       @dep[triple] = inputs
-#     end
-#
-#     def build(target)
-#       each_strongly_connected_component_from(target) {|ns|
-#         if ns.length != 1
-#           fs = ns.delete_if {|n| Array === n}
-#           raise Gem::TSort::Cyclic.new("cyclic dependencies: #{fs.join ', '}")
-#         end
-#         n = ns.first
-#         if Array === n
-#           outputs, inputs, block = n
-#           inputs_time = inputs.map {|f| File.mtime f}.max
-#           begin
-#             outputs_time = outputs.map {|f| File.mtime f}.min
-#           rescue Errno::ENOENT
-#             outputs_time = nil
-#           end
-#           if outputs_time == nil ||
-#              inputs_time != nil && outputs_time <= inputs_time
-#             sleep 1 if inputs_time != nil && inputs_time.to_i == Time.now.to_i
-#             block.call
-#           end
-#         end
-#       }
-#     end
-#
-#     def tsort_each_child(node, &block)
-#       @dep[node].each(&block)
-#     end
-#     include Gem::TSort
-#   end
-#
-#   def command(arg)
-#     print arg, "\n"
-#     system arg
-#   end
-#
-#   m = Make.new
-#   m.rule(%w[t1]) { command 'date > t1' }
-#   m.rule(%w[t2]) { command 'date > t2' }
-#   m.rule(%w[t3]) { command 'date > t3' }
-#   m.rule(%w[t4], %w[t1 t3]) { command 'cat t1 t3 > t4' }
-#   m.rule(%w[t5], %w[t4 t2]) { command 'cat t4 t2 > t5' }
-#   m.build('t5')
-#
-# == Bugs
-#
-# * 'tsort.rb' is wrong name because this library uses
-#   Tarjan's algorithm for strongly connected components.
-#   Although 'strongly_connected_components.rb' is correct but too long.
-#
-# == References
-#
-# R. E. Tarjan, "Depth First Search and Linear Graph Algorithms",
-# <em>SIAM Journal on Computing</em>, Vol. 1, No. 2, pp. 146-160, June 1972.
-#
-
-module Gem::TSort
-  class Cyclic < StandardError
-  end
-
-  # Returns a topologically sorted array of nodes.
-  # The array is sorted from children to parents, i.e.
-  # the first element has no child and the last node has no parent.
-  #
-  # If there is a cycle, Gem::TSort::Cyclic is raised.
-  #
-  #   class G
-  #     include Gem::TSort
-  #     def initialize(g)
-  #       @g = g
-  #     end
-  #     def tsort_each_child(n, &b) @g[n].each(&b) end
-  #     def tsort_each_node(&b) @g.each_key(&b) end
-  #   end
-  #
-  #   graph = G.new({1=>[2, 3], 2=>[4], 3=>[2, 4], 4=>[]})
-  #   p graph.tsort #=> [4, 2, 3, 1]
-  #
-  #   graph = G.new({1=>[2], 2=>[3, 4], 3=>[2], 4=>[]})
-  #   p graph.tsort # raises Gem::TSort::Cyclic
-  #
-  def tsort
-    each_node = method(:tsort_each_node)
-    each_child = method(:tsort_each_child)
-    Gem::TSort.tsort(each_node, each_child)
-  end
-
-  # Returns a topologically sorted array of nodes.
-  # The array is sorted from children to parents, i.e.
-  # the first element has no child and the last node has no parent.
-  #
-  # The graph is represented by _each_node_ and _each_child_.
-  # _each_node_ should have +call+ method which yields for each node in the graph.
-  # _each_child_ should have +call+ method which takes a node argument and yields for each child node.
-  #
-  # If there is a cycle, Gem::TSort::Cyclic is raised.
-  #
-  #   g = {1=>[2, 3], 2=>[4], 3=>[2, 4], 4=>[]}
-  #   each_node = lambda {|&b| g.each_key(&b) }
-  #   each_child = lambda {|n, &b| g[n].each(&b) }
-  #   p Gem::TSort.tsort(each_node, each_child) #=> [4, 2, 3, 1]
-  #
-  #   g = {1=>[2], 2=>[3, 4], 3=>[2], 4=>[]}
-  #   each_node = lambda {|&b| g.each_key(&b) }
-  #   each_child = lambda {|n, &b| g[n].each(&b) }
-  #   p Gem::TSort.tsort(each_node, each_child) # raises Gem::TSort::Cyclic
-  #
-  def self.tsort(each_node, each_child)
-    tsort_each(each_node, each_child).to_a
-  end
-
-  # The iterator version of the #tsort method.
-  # <tt><em>obj</em>.tsort_each</tt> is similar to <tt><em>obj</em>.tsort.each</tt>, but
-  # modification of _obj_ during the iteration may lead to unexpected results.
-  #
-  # #tsort_each returns +nil+.
-  # If there is a cycle, Gem::TSort::Cyclic is raised.
-  #
-  #   class G
-  #     include Gem::TSort
-  #     def initialize(g)
-  #       @g = g
-  #     end
-  #     def tsort_each_child(n, &b) @g[n].each(&b) end
-  #     def tsort_each_node(&b) @g.each_key(&b) end
-  #   end
-  #
-  #   graph = G.new({1=>[2, 3], 2=>[4], 3=>[2, 4], 4=>[]})
-  #   graph.tsort_each {|n| p n }
-  #   #=> 4
-  #   #   2
-  #   #   3
-  #   #   1
-  #
-  def tsort_each(&block) # :yields: node
-    each_node = method(:tsort_each_node)
-    each_child = method(:tsort_each_child)
-    Gem::TSort.tsort_each(each_node, each_child, &block)
-  end
-
-  # The iterator version of the Gem::TSort.tsort method.
-  #
-  # The graph is represented by _each_node_ and _each_child_.
-  # _each_node_ should have +call+ method which yields for each node in the graph.
-  # _each_child_ should have +call+ method which takes a node argument and yields for each child node.
-  #
-  #   g = {1=>[2, 3], 2=>[4], 3=>[2, 4], 4=>[]}
-  #   each_node = lambda {|&b| g.each_key(&b) }
-  #   each_child = lambda {|n, &b| g[n].each(&b) }
-  #   Gem::TSort.tsort_each(each_node, each_child) {|n| p n }
-  #   #=> 4
-  #   #   2
-  #   #   3
-  #   #   1
-  #
-  def self.tsort_each(each_node, each_child) # :yields: node
-    return to_enum(__method__, each_node, each_child) unless block_given?
-
-    each_strongly_connected_component(each_node, each_child) {|component|
-      if component.size == 1
-        yield component.first
-      else
-        raise Cyclic.new("topological sort failed: #{component.inspect}")
-      end
-    }
-  end
-
-  # Returns strongly connected components as an array of arrays of nodes.
-  # The array is sorted from children to parents.
-  # Each elements of the array represents a strongly connected component.
-  #
-  #   class G
-  #     include Gem::TSort
-  #     def initialize(g)
-  #       @g = g
-  #     end
-  #     def tsort_each_child(n, &b) @g[n].each(&b) end
-  #     def tsort_each_node(&b) @g.each_key(&b) end
-  #   end
-  #
-  #   graph = G.new({1=>[2, 3], 2=>[4], 3=>[2, 4], 4=>[]})
-  #   p graph.strongly_connected_components #=> [[4], [2], [3], [1]]
-  #
-  #   graph = G.new({1=>[2], 2=>[3, 4], 3=>[2], 4=>[]})
-  #   p graph.strongly_connected_components #=> [[4], [2, 3], [1]]
-  #
-  def strongly_connected_components
-    each_node = method(:tsort_each_node)
-    each_child = method(:tsort_each_child)
-    Gem::TSort.strongly_connected_components(each_node, each_child)
-  end
-
-  # Returns strongly connected components as an array of arrays of nodes.
-  # The array is sorted from children to parents.
-  # Each elements of the array represents a strongly connected component.
-  #
-  # The graph is represented by _each_node_ and _each_child_.
-  # _each_node_ should have +call+ method which yields for each node in the graph.
-  # _each_child_ should have +call+ method which takes a node argument and yields for each child node.
-  #
-  #   g = {1=>[2, 3], 2=>[4], 3=>[2, 4], 4=>[]}
-  #   each_node = lambda {|&b| g.each_key(&b) }
-  #   each_child = lambda {|n, &b| g[n].each(&b) }
-  #   p Gem::TSort.strongly_connected_components(each_node, each_child)
-  #   #=> [[4], [2], [3], [1]]
-  #
-  #   g = {1=>[2], 2=>[3, 4], 3=>[2], 4=>[]}
-  #   each_node = lambda {|&b| g.each_key(&b) }
-  #   each_child = lambda {|n, &b| g[n].each(&b) }
-  #   p Gem::TSort.strongly_connected_components(each_node, each_child)
-  #   #=> [[4], [2, 3], [1]]
-  #
-  def self.strongly_connected_components(each_node, each_child)
-    each_strongly_connected_component(each_node, each_child).to_a
-  end
-
-  # The iterator version of the #strongly_connected_components method.
-  # <tt><em>obj</em>.each_strongly_connected_component</tt> is similar to
-  # <tt><em>obj</em>.strongly_connected_components.each</tt>, but
-  # modification of _obj_ during the iteration may lead to unexpected results.
-  #
-  # #each_strongly_connected_component returns +nil+.
-  #
-  #   class G
-  #     include Gem::TSort
-  #     def initialize(g)
-  #       @g = g
-  #     end
-  #     def tsort_each_child(n, &b) @g[n].each(&b) end
-  #     def tsort_each_node(&b) @g.each_key(&b) end
-  #   end
-  #
-  #   graph = G.new({1=>[2, 3], 2=>[4], 3=>[2, 4], 4=>[]})
-  #   graph.each_strongly_connected_component {|scc| p scc }
-  #   #=> [4]
-  #   #   [2]
-  #   #   [3]
-  #   #   [1]
-  #
-  #   graph = G.new({1=>[2], 2=>[3, 4], 3=>[2], 4=>[]})
-  #   graph.each_strongly_connected_component {|scc| p scc }
-  #   #=> [4]
-  #   #   [2, 3]
-  #   #   [1]
-  #
-  def each_strongly_connected_component(&block) # :yields: nodes
-    each_node = method(:tsort_each_node)
-    each_child = method(:tsort_each_child)
-    Gem::TSort.each_strongly_connected_component(each_node, each_child, &block)
-  end
-
-  # The iterator version of the Gem::TSort.strongly_connected_components method.
-  #
-  # The graph is represented by _each_node_ and _each_child_.
-  # _each_node_ should have +call+ method which yields for each node in the graph.
-  # _each_child_ should have +call+ method which takes a node argument and yields for each child node.
-  #
-  #   g = {1=>[2, 3], 2=>[4], 3=>[2, 4], 4=>[]}
-  #   each_node = lambda {|&b| g.each_key(&b) }
-  #   each_child = lambda {|n, &b| g[n].each(&b) }
-  #   Gem::TSort.each_strongly_connected_component(each_node, each_child) {|scc| p scc }
-  #   #=> [4]
-  #   #   [2]
-  #   #   [3]
-  #   #   [1]
-  #
-  #   g = {1=>[2], 2=>[3, 4], 3=>[2], 4=>[]}
-  #   each_node = lambda {|&b| g.each_key(&b) }
-  #   each_child = lambda {|n, &b| g[n].each(&b) }
-  #   Gem::TSort.each_strongly_connected_component(each_node, each_child) {|scc| p scc }
-  #   #=> [4]
-  #   #   [2, 3]
-  #   #   [1]
-  #
-  def self.each_strongly_connected_component(each_node, each_child) # :yields: nodes
-    return to_enum(__method__, each_node, each_child) unless block_given?
-
-    id_map = {}
-    stack = []
-    each_node.call {|node|
-      unless id_map.include? node
-        each_strongly_connected_component_from(node, each_child, id_map, stack) {|c|
-          yield c
-        }
-      end
-    }
-    nil
-  end
-
-  # Iterates over strongly connected component in the subgraph reachable from
-  # _node_.
-  #
-  # Return value is unspecified.
-  #
-  # #each_strongly_connected_component_from doesn't call #tsort_each_node.
-  #
-  #   class G
-  #     include Gem::TSort
-  #     def initialize(g)
-  #       @g = g
-  #     end
-  #     def tsort_each_child(n, &b) @g[n].each(&b) end
-  #     def tsort_each_node(&b) @g.each_key(&b) end
-  #   end
-  #
-  #   graph = G.new({1=>[2, 3], 2=>[4], 3=>[2, 4], 4=>[]})
-  #   graph.each_strongly_connected_component_from(2) {|scc| p scc }
-  #   #=> [4]
-  #   #   [2]
-  #
-  #   graph = G.new({1=>[2], 2=>[3, 4], 3=>[2], 4=>[]})
-  #   graph.each_strongly_connected_component_from(2) {|scc| p scc }
-  #   #=> [4]
-  #   #   [2, 3]
-  #
-  def each_strongly_connected_component_from(node, id_map={}, stack=[], &block) # :yields: nodes
-    Gem::TSort.each_strongly_connected_component_from(node, method(:tsort_each_child), id_map, stack, &block)
-  end
-
-  # Iterates over strongly connected components in a graph.
-  # The graph is represented by _node_ and _each_child_.
-  #
-  # _node_ is the first node.
-  # _each_child_ should have +call+ method which takes a node argument
-  # and yields for each child node.
-  #
-  # Return value is unspecified.
-  #
-  # #Gem::TSort.each_strongly_connected_component_from is a class method and
-  # it doesn't need a class to represent a graph which includes Gem::TSort.
-  #
-  #   graph = {1=>[2], 2=>[3, 4], 3=>[2], 4=>[]}
-  #   each_child = lambda {|n, &b| graph[n].each(&b) }
-  #   Gem::TSort.each_strongly_connected_component_from(1, each_child) {|scc|
-  #     p scc
-  #   }
-  #   #=> [4]
-  #   #   [2, 3]
-  #   #   [1]
-  #
-  def self.each_strongly_connected_component_from(node, each_child, id_map={}, stack=[]) # :yields: nodes
-    return to_enum(__method__, node, each_child, id_map, stack) unless block_given?
-
-    minimum_id = node_id = id_map[node] = id_map.size
-    stack_length = stack.length
-    stack << node
-
-    each_child.call(node) {|child|
-      if id_map.include? child
-        child_id = id_map[child]
-        minimum_id = child_id if child_id && child_id < minimum_id
-      else
-        sub_minimum_id =
-          each_strongly_connected_component_from(child, each_child, id_map, stack) {|c|
-            yield c
-          }
-        minimum_id = sub_minimum_id if sub_minimum_id < minimum_id
-      end
-    }
-
-    if node_id == minimum_id
-      component = stack.slice!(stack_length .. -1)
-      component.each {|n| id_map[n] = nil}
-      yield component
-    end
-
-    minimum_id
-  end
-
-  # Should be implemented by a extended class.
-  #
-  # #tsort_each_node is used to iterate for all nodes over a graph.
-  #
-  def tsort_each_node # :yields: node
-    raise NotImplementedError.new
-  end
-
-  # Should be implemented by a extended class.
-  #
-  # #tsort_each_child is used to iterate for child nodes of _node_.
-  #
-  def tsort_each_child(node) # :yields: child
-    raise NotImplementedError.new
-  end
-end
diff --git a/lib/rubygems/uninstaller.rb b/lib/rubygems/uninstaller.rb
index c96df2a08536bb..991bc6fb95d038 100644
--- a/lib/rubygems/uninstaller.rb
+++ b/lib/rubygems/uninstaller.rb
@@ -10,7 +10,6 @@
 require_relative "../rubygems"
 require_relative "installer_uninstaller_utils"
 require_relative "dependency_list"
-require_relative "rdoc"
 require_relative "user_interaction"
 
 ##
@@ -32,7 +31,7 @@ class Gem::Uninstaller
   attr_reader :bin_dir
 
   ##
-  # The gem repository the gem will be installed into
+  # The gem repository the gem will be uninstalled from
 
   attr_reader :gem_home
 
@@ -49,8 +48,9 @@ def initialize(gem, options = {})
     # TODO: document the valid options
     @gem                = gem
     @version            = options[:version] || Gem::Requirement.default
-    @gem_home           = File.realpath(options[:install_dir] || Gem.dir)
-    @plugins_dir        = Gem.plugindir(@gem_home)
+    @install_dir        = options[:install_dir]
+    @gem_home           = File.realpath(@install_dir || Gem.dir)
+    @user_dir           = File.exist?(Gem.user_dir) ? File.realpath(Gem.user_dir) : Gem.user_dir
     @force_executables  = options[:executables]
     @force_all          = options[:all]
     @force_ignore       = options[:ignore]
@@ -70,7 +70,7 @@ def initialize(gem, options = {})
 
     # only add user directory if install_dir is not set
     @user_install = false
-    @user_install = options[:user_install] unless options[:install_dir]
+    @user_install = options[:user_install] unless @install_dir
 
     # Optimization: populated during #uninstall
     @default_specs_matching_uninstall_params = []
@@ -85,11 +85,7 @@ def uninstall
 
     list = []
 
-    dirs =
-      Gem::Specification.dirs +
-      [Gem.default_specifications_dir]
-
-    Gem::Specification.each_spec dirs do |spec|
+    specification_record.stubs.each do |spec|
       next unless dependency.matches_spec? spec
 
       list << spec
@@ -101,11 +97,11 @@ def uninstall
 
     default_specs, list = list.partition(&:default_gem?)
     warn_cannot_uninstall_default_gems(default_specs - list)
-    @default_specs_matching_uninstall_params = default_specs
+    @default_specs_matching_uninstall_params = default_specs.map(&:to_spec)
 
     list, other_repo_specs = list.partition do |spec|
       @gem_home == spec.base_dir ||
-        (@user_install && spec.base_dir == Gem.user_dir)
+        (@user_install && spec.base_dir == @user_dir)
     end
 
     list.sort!
@@ -125,7 +121,7 @@ def uninstall
       remove_all list
 
     elsif list.size > 1
-      gem_names = list.map(&:full_name)
+      gem_names = list.map(&:full_name_with_location)
       gem_names << "All versions"
 
       say
@@ -146,7 +142,9 @@ def uninstall
   ##
   # Uninstalls gem +spec+
 
-  def uninstall_gem(spec)
+  def uninstall_gem(stub)
+    spec = stub.to_spec
+
     @spec = spec
 
     unless dependencies_ok? spec
@@ -164,6 +162,8 @@ def uninstall_gem(spec)
     remove_plugins @spec
     remove @spec
 
+    specification_record.remove_spec(stub)
+
     regenerate_plugins
 
     Gem.post_uninstall_hooks.each do |hook|
@@ -177,7 +177,7 @@ def uninstall_gem(spec)
   # Removes installed executables and batch files (windows only) for +spec+.
 
   def remove_executables(spec)
-    return if spec.executables.empty?
+    return if spec.executables.empty? || default_spec_matches?(spec)
 
     executables = spec.executables.clone
 
@@ -239,7 +239,7 @@ def remove_all(list)
 
   def remove(spec)
     unless path_ok?(@gem_home, spec) ||
-           (@user_install && path_ok?(Gem.user_dir, spec))
+           (@user_install && path_ok?(@user_dir, spec))
       e = Gem::GemNotInHomeException.new \
         "Gem '#{spec.full_name}' is not installed in directory #{@gem_home}"
       e.spec = spec
@@ -250,7 +250,15 @@ def remove(spec)
     raise Gem::FilePermissionError, spec.base_dir unless
       File.writable?(spec.base_dir)
 
-    safe_delete { FileUtils.rm_r spec.full_gem_path }
+    full_gem_path = spec.full_gem_path
+    exclusions = []
+
+    if default_spec_matches?(spec) && spec.executables.any?
+      exclusions = spec.executables.map {|exe| File.join(spec.bin_dir, exe) }
+      exclusions << File.dirname(exclusions.last) until exclusions.last == full_gem_path
+    end
+
+    safe_delete { rm_r full_gem_path, exclusions: exclusions }
     safe_delete { FileUtils.rm_r spec.extension_dir }
 
     old_platform_name = spec.original_name
@@ -274,8 +282,6 @@ def remove(spec)
 
     safe_delete { FileUtils.rm_r gemspec }
     announce_deletion_of(spec)
-
-    Gem::Specification.reset
   end
 
   ##
@@ -284,17 +290,17 @@ def remove(spec)
   def remove_plugins(spec) # :nodoc:
     return if spec.plugins.empty?
 
-    remove_plugins_for(spec, @plugins_dir)
+    remove_plugins_for(spec, plugin_dir_for(spec))
   end
 
   ##
   # Regenerates plugin wrappers after removal.
 
   def regenerate_plugins
-    latest = Gem::Specification.latest_spec_for(@spec.name)
+    latest = specification_record.latest_spec_for(@spec.name)
     return if latest.nil?
 
-    regenerate_plugins_for(latest, @plugins_dir)
+    regenerate_plugins_for(latest, plugin_dir_for(@spec))
   end
 
   ##
@@ -379,6 +385,16 @@ def safe_delete(&block)
 
   private
 
+  def rm_r(path, exclusions:)
+    FileUtils::Entry_.new(path).postorder_traverse do |ent|
+      ent.remove unless exclusions.include?(ent.path)
+    end
+  end
+
+  def specification_record
+    @specification_record ||= @install_dir ? Gem::SpecificationRecord.from_path(@install_dir) : Gem::Specification.specification_record
+  end
+
   def announce_deletion_of(spec)
     name = spec.full_name
     say "Successfully uninstalled #{name}"
@@ -406,4 +422,8 @@ def warn_cannot_uninstall_default_gems(specs)
       say "Gem #{spec.full_name} cannot be uninstalled because it is a default gem"
     end
   end
+
+  def plugin_dir_for(spec)
+    Gem.plugindir(spec.base_dir)
+  end
 end
diff --git a/lib/rubygems/update_suggestion.rb b/lib/rubygems/update_suggestion.rb
index 4cf085fd4c4a38..6f3ec5f4936747 100644
--- a/lib/rubygems/update_suggestion.rb
+++ b/lib/rubygems/update_suggestion.rb
@@ -4,15 +4,6 @@
 # Mixin methods for Gem::Command to promote available RubyGems update
 
 module Gem::UpdateSuggestion
-  # list taken from https://github.com/watson/ci-info/blob/7a3c30d/index.js#L56-L66
-  CI_ENV_VARS = [
-    "CI", # Travis CI, CircleCI, Cirrus CI, Gitlab CI, Appveyor, CodeShip, dsari
-    "CONTINUOUS_INTEGRATION", # Travis CI, Cirrus CI
-    "BUILD_NUMBER", # Jenkins, TeamCity
-    "CI_APP_ID", "CI_BUILD_ID", "CI_BUILD_NUMBER", # Applfow
-    "RUN_ID" # TaskCluster, dsari
-  ].freeze
-
   ONE_WEEK = 7 * 24 * 60 * 60
 
   ##
@@ -28,9 +19,9 @@ def update_suggestion
   end
 
   ##
-  # Determines if current environment is eglible for update suggestion.
+  # Determines if current environment is eligible for update suggestion.
 
-  def eglible_for_update?
+  def eligible_for_update?
     # explicit opt-out
     return false if Gem.configuration[:prevent_update_suggestion]
     return false if ENV["RUBYGEMS_PREVENT_UPDATE_SUGGESTION"]
@@ -39,7 +30,7 @@ def eglible_for_update?
     return false unless Gem.ui.tty?
     return false if Gem.rubygems_version.prerelease?
     return false if Gem.disable_system_update_message
-    return false if ci?
+    return false if Gem::CIDetector.ci?
 
     # check makes sense only when we can store timestamp of last try
     # otherwise we will not be able to prevent "annoying" update message
@@ -53,17 +44,13 @@ def eglible_for_update?
 
     # compare current and latest version, this is the part where
     # latest rubygems spec is fetched from remote
-    (Gem.rubygems_version < Gem.latest_rubygems_version).tap do |eglible|
+    (Gem.rubygems_version < Gem.latest_rubygems_version).tap do |eligible|
       # store the time of last successful check into state file
       Gem.configuration.last_update_check = check_time
 
-      return eglible
+      return eligible
     end
   rescue StandardError # don't block install command on any problem
     false
   end
-
-  def ci?
-    CI_ENV_VARS.any? {|var| ENV.include?(var) }
-  end
 end
diff --git a/lib/rubygems/uri.rb b/lib/rubygems/uri.rb
index 4b5d035aa09f25..d729c67d26398b 100644
--- a/lib/rubygems/uri.rb
+++ b/lib/rubygems/uri.rb
@@ -16,9 +16,9 @@ def self.redact(uri)
   # Parses uri, raising if it's invalid
 
   def self.parse!(uri)
-    require "uri"
+    require_relative "vendor/uri/lib/uri"
 
-    raise URI::InvalidURIError unless uri
+    raise Gem::URI::InvalidURIError unless uri
 
     return uri unless uri.is_a?(String)
 
@@ -28,9 +28,9 @@ def self.parse!(uri)
     # as "%7BDESede%7D". If this is escaped again the percentage
     # symbols will be escaped.
     begin
-      URI.parse(uri)
-    rescue URI::InvalidURIError
-      URI.parse(URI::DEFAULT_PARSER.escape(uri))
+      Gem::URI.parse(uri)
+    rescue Gem::URI::InvalidURIError
+      Gem::URI.parse(Gem::URI::RFC2396_PARSER.escape(uri))
     end
   end
 
@@ -39,7 +39,7 @@ def self.parse!(uri)
 
   def self.parse(uri)
     parse!(uri)
-  rescue URI::InvalidURIError
+  rescue Gem::URI::InvalidURIError
     uri
   end
 
diff --git a/lib/rubygems/uri_formatter.rb b/lib/rubygems/uri_formatter.rb
index 517ce3363768ac..8856fdadd26857 100644
--- a/lib/rubygems/uri_formatter.rb
+++ b/lib/rubygems/uri_formatter.rb
@@ -17,7 +17,8 @@ class Gem::UriFormatter
   # Creates a new URI formatter for +uri+.
 
   def initialize(uri)
-    require "cgi"
+    require "cgi/escape"
+    require "cgi/util" unless defined?(CGI::EscapeExt)
 
     @uri = uri
   end
diff --git a/lib/rubygems/user_interaction.rb b/lib/rubygems/user_interaction.rb
index 1cee1555a0ac7f..0172c4ee897a40 100644
--- a/lib/rubygems/user_interaction.rb
+++ b/lib/rubygems/user_interaction.rb
@@ -193,7 +193,7 @@ class Gem::StreamUI
   # then special operations (like asking for passwords) will use the TTY
   # commands to disable character echo.
 
-  def initialize(in_stream, out_stream, err_stream=STDERR, usetty=true)
+  def initialize(in_stream, out_stream, err_stream=$stderr, usetty=true)
     @ins = in_stream
     @outs = out_stream
     @errs = err_stream
@@ -591,8 +591,8 @@ def locked_puts(message)
 end
 
 ##
-# Subclass of StreamUI that instantiates the user interaction using STDIN,
-# STDOUT, and STDERR.
+# Subclass of StreamUI that instantiates the user interaction using $stdin,
+# $stdout, and $stderr.
 
 class Gem::ConsoleUI < Gem::StreamUI
   ##
@@ -600,7 +600,7 @@ class Gem::ConsoleUI < Gem::StreamUI
   # stdin, output to stdout and warnings or errors to stderr.
 
   def initialize
-    super STDIN, STDOUT, STDERR, true
+    super $stdin, $stdout, $stderr, true
   end
 end
 
diff --git a/lib/rubygems/util.rb b/lib/rubygems/util.rb
index 5c65dcc424394c..51f9c2029f33d7 100644
--- a/lib/rubygems/util.rb
+++ b/lib/rubygems/util.rb
@@ -60,7 +60,7 @@ def self.popen(*command)
   # Invokes system, but silences all output.
 
   def self.silent_system(*command)
-    opt = { :out => IO::NULL, :err => [:child, :out] }
+    opt = { out: IO::NULL, err: [:child, :out] }
     if Hash === command.last
       opt.update(command.last)
       cmds = command[0...-1]
@@ -105,11 +105,11 @@ def self.glob_files_in_dir(glob, base_path)
   end
 
   ##
-  # Corrects +path+ (usually returned by `URI.parse().path` on Windows), that
+  # Corrects +path+ (usually returned by `Gem::URI.parse().path` on Windows), that
   # comes with a leading slash.
 
   def self.correct_for_windows_path(path)
-    if path[0].chr == "/" && path[1].chr =~ /[a-z]/i && path[2].chr == ":"
+    if path[0].chr == "/" && path[1].chr.match?(/[a-z]/i) && path[2].chr == ":"
       path[1..-1]
     else
       path
diff --git a/lib/rubygems/util/licenses.rb b/lib/rubygems/util/licenses.rb
index 77137fdc9847ae..fbb7b55075ea85 100644
--- a/lib/rubygems/util/licenses.rb
+++ b/lib/rubygems/util/licenses.rb
@@ -15,6 +15,7 @@ class Gem::Licenses
   # license identifiers
   LICENSE_IDENTIFIERS = %w[
     0BSD
+    3D-Slicer-1.0
     AAL
     ADSL
     AFL-1.1
@@ -22,14 +23,14 @@ class Gem::Licenses
     AFL-2.0
     AFL-2.1
     AFL-3.0
-    AGPL-1.0
     AGPL-1.0-only
     AGPL-1.0-or-later
-    AGPL-3.0
     AGPL-3.0-only
     AGPL-3.0-or-later
+    AMD-newlib
     AMDPLPA
     AML
+    AML-glslang
     AMPAS
     ANTLR-PD
     ANTLR-PD-fallback
@@ -44,7 +45,9 @@ class Gem::Licenses
     Abstyles
     AdaCore-doc
     Adobe-2006
+    Adobe-Display-PostScript
     Adobe-Glyph
+    Adobe-Utopia
     Afmparse
     Aladdin
     Apache-1.0
@@ -56,15 +59,19 @@ class Gem::Licenses
     Artistic-1.0-Perl
     Artistic-1.0-cl8
     Artistic-2.0
+    Artistic-dist
+    Aspell-RU
     BSD-1-Clause
     BSD-2-Clause
-    BSD-2-Clause-FreeBSD
-    BSD-2-Clause-NetBSD
+    BSD-2-Clause-Darwin
     BSD-2-Clause-Patent
     BSD-2-Clause-Views
+    BSD-2-Clause-first-lines
+    BSD-2-Clause-pkgconf-disclaimer
     BSD-3-Clause
     BSD-3-Clause-Attribution
     BSD-3-Clause-Clear
+    BSD-3-Clause-HP
     BSD-3-Clause-LBNL
     BSD-3-Clause-Modification
     BSD-3-Clause-No-Military-License
@@ -72,6 +79,9 @@ class Gem::Licenses
     BSD-3-Clause-No-Nuclear-License-2014
     BSD-3-Clause-No-Nuclear-Warranty
     BSD-3-Clause-Open-MPI
+    BSD-3-Clause-Sun
+    BSD-3-Clause-acpica
+    BSD-3-Clause-flex
     BSD-4-Clause
     BSD-4-Clause-Shortened
     BSD-4-Clause-UC
@@ -79,8 +89,12 @@ class Gem::Licenses
     BSD-4.3TAHOE
     BSD-Advertising-Acknowledgement
     BSD-Attribution-HPND-disclaimer
+    BSD-Inferno-Nettverk
     BSD-Protection
     BSD-Source-Code
+    BSD-Source-beginning-file
+    BSD-Systemics
+    BSD-Systemics-W3Works
     BSL-1.0
     BUSL-1.1
     Baekmuk
@@ -93,7 +107,9 @@ class Gem::Licenses
     Bitstream-Vera
     BlueOak-1.0.0
     Boehm-GC
+    Boehm-GC-without-fee
     Borceux
+    Brian-Gladman-2-Clause
     Brian-Gladman-3-Clause
     C-UDA-1.0
     CAL-1.0
@@ -105,6 +121,7 @@ class Gem::Licenses
     CC-BY-2.5-AU
     CC-BY-3.0
     CC-BY-3.0-AT
+    CC-BY-3.0-AU
     CC-BY-3.0-DE
     CC-BY-3.0-IGO
     CC-BY-3.0-NL
@@ -150,6 +167,8 @@ class Gem::Licenses
     CC-BY-SA-3.0-IGO
     CC-BY-SA-4.0
     CC-PDDC
+    CC-PDM-1.0
+    CC-SA-1.0
     CC0-1.0
     CDDL-1.0
     CDDL-1.1
@@ -170,6 +189,7 @@ class Gem::Licenses
     CERN-OHL-W-2.0
     CFITSIO
     CMU-Mach
+    CMU-Mach-nodoc
     CNRI-Jython
     CNRI-Python
     CNRI-Python-GPL-Compatible
@@ -179,19 +199,30 @@ class Gem::Licenses
     CPOL-1.02
     CUA-OPL-1.0
     Caldera
+    Caldera-no-preamble
+    Catharon
     ClArtistic
     Clips
     Community-Spec-1.0
     Condor-1.1
     Cornell-Lossless-JPEG
+    Cronyx
     Crossword
+    CryptoSwift
     CrystalStacker
     Cube
     D-FSL-1.0
+    DEC-3-Clause
     DL-DE-BY-2.0
+    DL-DE-ZERO-2.0
     DOC
     DRL-1.0
+    DRL-1.1
     DSDP
+    DocBook-DTD
+    DocBook-Schema
+    DocBook-Stylesheet
+    DocBook-XML
     Dotseqn
     ECL-1.0
     ECL-2.0
@@ -208,32 +239,37 @@ class Gem::Licenses
     Entessa
     ErlPL-1.1
     Eurosym
+    FBM
     FDK-AAC
     FSFAP
+    FSFAP-no-warranty-disclaimer
     FSFUL
     FSFULLR
+    FSFULLRSD
     FSFULLRWD
+    FSL-1.1-ALv2
+    FSL-1.1-MIT
     FTL
     Fair
+    Ferguson-Twofish
     Frameworx-1.0
     FreeBSD-DOC
     FreeImage
+    Furuseth
+    GCR-docs
     GD
-    GFDL-1.1
     GFDL-1.1-invariants-only
     GFDL-1.1-invariants-or-later
     GFDL-1.1-no-invariants-only
     GFDL-1.1-no-invariants-or-later
     GFDL-1.1-only
     GFDL-1.1-or-later
-    GFDL-1.2
     GFDL-1.2-invariants-only
     GFDL-1.2-invariants-or-later
     GFDL-1.2-no-invariants-only
     GFDL-1.2-no-invariants-or-later
     GFDL-1.2-only
     GFDL-1.2-or-later
-    GFDL-1.3
     GFDL-1.3-invariants-only
     GFDL-1.3-invariants-or-later
     GFDL-1.3-no-invariants-only
@@ -242,35 +278,46 @@ class Gem::Licenses
     GFDL-1.3-or-later
     GL2PS
     GLWTPL
-    GPL-1.0
-    GPL-1.0+
     GPL-1.0-only
     GPL-1.0-or-later
-    GPL-2.0
-    GPL-2.0+
     GPL-2.0-only
     GPL-2.0-or-later
-    GPL-2.0-with-GCC-exception
-    GPL-2.0-with-autoconf-exception
-    GPL-2.0-with-bison-exception
-    GPL-2.0-with-classpath-exception
-    GPL-2.0-with-font-exception
-    GPL-3.0
-    GPL-3.0+
     GPL-3.0-only
     GPL-3.0-or-later
-    GPL-3.0-with-GCC-exception
-    GPL-3.0-with-autoconf-exception
+    Game-Programming-Gems
     Giftware
     Glide
     Glulxe
     Graphics-Gems
+    Gutmann
+    HDF5
+    HIDAPI
     HP-1986
+    HP-1989
     HPND
+    HPND-DEC
+    HPND-Fenneberg-Livingston
+    HPND-INRIA-IMAG
+    HPND-Intel
+    HPND-Kevlin-Henney
+    HPND-MIT-disclaimer
     HPND-Markus-Kuhn
+    HPND-Netrek
+    HPND-Pbmplus
+    HPND-UC
+    HPND-UC-export-US
+    HPND-doc
+    HPND-doc-sell
     HPND-export-US
+    HPND-export-US-acknowledgement
+    HPND-export-US-modify
+    HPND-export2-US
+    HPND-merchantability-variant
+    HPND-sell-MIT-disclaimer-xserver
+    HPND-sell-regexpr
     HPND-sell-variant
     HPND-sell-variant-MIT-disclaimer
+    HPND-sell-variant-MIT-disclaimer-rev
     HTMLTIDY
     HaskellReport
     Hippocratic-2.1
@@ -282,10 +329,12 @@ class Gem::Licenses
     IPA
     IPL-1.0
     ISC
+    ISC-Veillard
     ImageMagick
     Imlib2
     Info-ZIP
     Inner-Net-2.0
+    InnoSetup
     Intel
     Intel-ACPI
     Interbase-1.0
@@ -294,24 +343,20 @@ class Gem::Licenses
     JSON
     Jam
     JasPer-2.0
+    Kastrup
     Kazlib
     Knuth-CTAN
     LAL-1.2
     LAL-1.3
-    LGPL-2.0
-    LGPL-2.0+
     LGPL-2.0-only
     LGPL-2.0-or-later
-    LGPL-2.1
-    LGPL-2.1+
     LGPL-2.1-only
     LGPL-2.1-or-later
-    LGPL-3.0
-    LGPL-3.0+
     LGPL-3.0-only
     LGPL-3.0-or-later
     LGPLLR
     LOOP
+    LPD-document
     LPL-1.0
     LPL-1.02
     LPPL-1.0
@@ -333,17 +378,24 @@ class Gem::Licenses
     Linux-man-pages-copyleft
     Linux-man-pages-copyleft-2-para
     Linux-man-pages-copyleft-var
+    Lucida-Bitmap-Fonts
+    MIPS
     MIT
     MIT-0
     MIT-CMU
+    MIT-Click
     MIT-Festival
+    MIT-Khronos-old
     MIT-Modern-Variant
     MIT-Wu
     MIT-advertising
     MIT-enna
     MIT-feh
     MIT-open-group
+    MIT-testregex
     MITNFA
+    MMIXware
+    MPEG-SSG
     MPL-1.0
     MPL-1.1
     MPL-2.0
@@ -352,8 +404,11 @@ class Gem::Licenses
     MS-PL
     MS-RL
     MTLL
+    Mackerras-3-Clause
+    Mackerras-3-Clause-acknowledgment
     MakeIndex
     Martin-Birgmeier
+    McPhee-slideshow
     Minpack
     MirOS
     Motosoto
@@ -364,7 +419,9 @@ class Gem::Licenses
     NAIST-2003
     NASA-1.3
     NBPL-1.0
+    NCBI-PD
     NCGL-UK-2.0
+    NCL
     NCSA
     NGPL
     NICTA-1.0
@@ -379,16 +436,16 @@ class Gem::Licenses
     NPL-1.1
     NPOSL-3.0
     NRL
+    NTIA-PD
     NTP
     NTP-0
     Naumen
-    Net-SNMP
     NetCDF
     Newsletr
     Nokia
     Noweb
-    Nunit
     O-UDA-1.0
+    OAR
     OCCT-PL
     OCLC-2.0
     ODC-By-1.0
@@ -436,12 +493,17 @@ class Gem::Licenses
     OSL-3.0
     OpenPBS-2.3
     OpenSSL
+    OpenSSL-standalone
+    OpenVision
+    PADL
     PDDL-1.0
     PHP-3.0
     PHP-3.01
+    PPL
     PSF-2.0
     Parity-6.0.0
     Parity-7.0.0
+    Pixar
     Plexus
     PolyForm-Noncommercial-1.0.0
     PolyForm-Small-Business-1.0.0
@@ -459,57 +521,78 @@ class Gem::Licenses
     RSCPL
     Rdisc
     Ruby
+    Ruby-pty
     SAX-PD
+    SAX-PD-2.0
     SCEA
     SGI-B-1.0
     SGI-B-1.1
     SGI-B-2.0
+    SGI-OpenGL
     SGP4
     SHL-0.5
     SHL-0.51
     SISSL
     SISSL-1.2
+    SL
+    SMAIL-GPL
     SMLNJ
     SMPPL
     SNIA
+    SOFA
     SPL-1.0
     SSH-OpenSSH
     SSH-short
+    SSLeay-standalone
     SSPL-1.0
+    SUL-1.0
     SWL
     Saxpath
     SchemeReport
     Sendmail
     Sendmail-8.23
+    Sendmail-Open-Source-1.1
     SimPL-2.0
     Sleepycat
+    Soundex
     Spencer-86
     Spencer-94
     Spencer-99
-    StandardML-NJ
     SugarCRM-1.1.3
+    Sun-PPP
+    Sun-PPP-2000
     SunPro
     Symlinks
     TAPR-OHL-1.0
     TCL
     TCP-wrappers
+    TGPPL-1.0
     TMate
     TORQUE-1.1
     TOSL
     TPDL
     TPL-1.0
     TTWL
+    TTYP0
     TU-Berlin-1.0
     TU-Berlin-2.0
     TermReadKey
+    ThirdEye
+    TrustedQSL
     UCAR
     UCL-1.0
+    UMich-Merit
     UPL-1.0
+    URT-RLE
+    Ubuntu-font-1.0
+    Unicode-3.0
     Unicode-DFS-2015
     Unicode-DFS-2016
     Unicode-TOU
     UnixCrypt
     Unlicense
+    Unlicense-libtelnet
+    Unlicense-libwhirlpool
     VOSTROM
     VSL-1.0
     Vim
@@ -522,6 +605,7 @@ class Gem::Licenses
     Wsuipa
     X11
     X11-distribute-modifications-variant
+    X11-swapped
     XFree86-1.1
     XSkat
     Xdebug-1.03
@@ -534,70 +618,142 @@ class Gem::Licenses
     ZPL-2.0
     ZPL-2.1
     Zed
+    Zeeff
     Zend-2.0
     Zimbra-1.3
     Zimbra-1.4
     Zlib
+    any-OSI
+    any-OSI-perl-modules
+    bcrypt-Solar-Designer
     blessing
-    bzip2-1.0.5
     bzip2-1.0.6
+    check-cvs
     checkmk
     copyleft-next-0.3.0
     copyleft-next-0.3.1
     curl
+    cve-tou
     diffmark
     dtoa
     dvipdfm
-    eCos-2.0
     eGenix
     etalab-2.0
+    fwlw
     gSOAP-1.3b
+    generic-xts
     gnuplot
+    gtkbook
+    hdparm
     iMatix
+    jove
+    libpng-1.6.35
     libpng-2.0
     libselinux-1.0
     libtiff
     libutil-David-Nugent
+    lsof
+    magaz
+    mailprio
+    man2html
     metamail
     mpi-permissive
     mpich2
     mplus
+    ngrep
+    pkgconf
+    pnmstitch
     psfrag
     psutils
+    python-ldap
+    radvd
     snprintf
+    softSurfer
+    ssh-keyscan
+    swrule
+    threeparttable
+    ulem
     w3m
-    wxWindows
+    wwl
     xinetd
+    xkeyboard-config-Zinoviev
     xlock
     xpp
+    xzoom
     zlib-acknowledgement
   ].freeze
 
+  DEPRECATED_LICENSE_IDENTIFIERS = %w[
+    AGPL-1.0
+    AGPL-3.0
+    BSD-2-Clause-FreeBSD
+    BSD-2-Clause-NetBSD
+    GFDL-1.1
+    GFDL-1.2
+    GFDL-1.3
+    GPL-1.0
+    GPL-1.0+
+    GPL-2.0
+    GPL-2.0+
+    GPL-2.0-with-GCC-exception
+    GPL-2.0-with-autoconf-exception
+    GPL-2.0-with-bison-exception
+    GPL-2.0-with-classpath-exception
+    GPL-2.0-with-font-exception
+    GPL-3.0
+    GPL-3.0+
+    GPL-3.0-with-GCC-exception
+    GPL-3.0-with-autoconf-exception
+    LGPL-2.0
+    LGPL-2.0+
+    LGPL-2.1
+    LGPL-2.1+
+    LGPL-3.0
+    LGPL-3.0+
+    Net-SNMP
+    Nunit
+    StandardML-NJ
+    bzip2-1.0.5
+    eCos-2.0
+    wxWindows
+  ].freeze
+
   # exception identifiers
   EXCEPTION_IDENTIFIERS = %w[
     389-exception
     Asterisk-exception
+    Asterisk-linking-protocols-exception
     Autoconf-exception-2.0
     Autoconf-exception-3.0
     Autoconf-exception-generic
+    Autoconf-exception-generic-3.0
     Autoconf-exception-macro
+    Bison-exception-1.24
     Bison-exception-2.2
     Bootloader-exception
+    CGAL-linking-exception
     CLISP-exception-2.0
     Classpath-exception-2.0
     DigiRule-FOSS-exception
+    Digia-Qt-LGPL-exception-1.1
     FLTK-exception
     Fawkes-Runtime-exception
     Font-exception-2.0
     GCC-exception-2.0
+    GCC-exception-2.0-note
     GCC-exception-3.1
     GNAT-exception
+    GNOME-examples-exception
+    GNU-compiler-exception
+    GPL-3.0-389-ds-base-exception
     GPL-3.0-interface-exception
     GPL-3.0-linking-exception
     GPL-3.0-linking-source-exception
     GPL-CC-1.0
     GStreamer-exception-2005
     GStreamer-exception-2008
+    Gmsh-exception
+    Independent-modules-exception
     KiCad-libraries-exception
     LGPL-3.0-linking-exception
     LLGPL
@@ -605,35 +761,50 @@ class Gem::Licenses
     LZMA-exception
     Libtool-exception
     Linux-syscall-note
-    Nokia-Qt-exception-1.1
     OCCT-exception-1.0
     OCaml-LGPL-linking-exception
     OpenJDK-assembly-exception-1.0
+    PCRE2-exception
     PS-or-PDF-font-exception-20170817
     QPL-1.0-INRIA-2004-exception
     Qt-GPL-exception-1.0
     Qt-LGPL-exception-1.1
     Qwt-exception-1.0
+    RRDtool-FLOSS-exception-2.0
+    SANE-exception
     SHL-2.0
     SHL-2.1
     SWI-exception
     Swift-exception
+    Texinfo-exception
+    UBDL-exception
     Universal-FOSS-exception-1.0
     WxWindows-exception-3.1
     cryptsetup-OpenSSL-exception
     eCos-exception-2.0
+    erlang-otp-linking-exception
+    fmt-exception
     freertos-exception-2.0
     gnu-javamail-exception
+    harbour-exception
     i2p-gpl-java-exception
     libpri-OpenH323-exception
     mif-exception
+    mxml-exception
     openvpn-openssl-exception
+    polyparse-exception
+    romic-exception
+    stunnel-exception
     u-boot-exception-2.0
     vsftpd-openssl-exception
     x11vnc-openssl-exception
   ].freeze
 
-  REGEXP = /
+  DEPRECATED_EXCEPTION_IDENTIFIERS = %w[
+    Nokia-Qt-exception-1.1
+  ].freeze
+
+  VALID_REGEXP = /
     \A
     (?:
       #{Regexp.union(LICENSE_IDENTIFIERS)}
@@ -643,10 +814,34 @@ class Gem::Licenses
       | #{LICENSE_REF}
     )
     \Z
-  /ox.freeze
+  /ox
+
+  DEPRECATED_LICENSE_REGEXP = /
+    \A
+    #{Regexp.union(DEPRECATED_LICENSE_IDENTIFIERS)}
+    \+?
+    (?:\s WITH \s .+?)?
+    \Z
+  /ox
+
+  DEPRECATED_EXCEPTION_REGEXP = /
+    \A
+    .+?
+    \+?
+    (?:\s WITH \s #{Regexp.union(DEPRECATED_EXCEPTION_IDENTIFIERS)})
+    \Z
+  /ox
 
   def self.match?(license)
-    REGEXP.match?(license)
+    VALID_REGEXP.match?(license)
+  end
+
+  def self.deprecated_license_id?(license)
+    DEPRECATED_LICENSE_REGEXP.match?(license)
+  end
+
+  def self.deprecated_exception_id?(license)
+    DEPRECATED_EXCEPTION_REGEXP.match?(license)
   end
 
   def self.suggestions(license)
diff --git a/lib/rubygems/optparse/.document b/lib/rubygems/vendor/.document
similarity index 100%
rename from lib/rubygems/optparse/.document
rename to lib/rubygems/vendor/.document
diff --git a/lib/rubygems/vendor/molinillo/lib/molinillo.rb b/lib/rubygems/vendor/molinillo/lib/molinillo.rb
new file mode 100644
index 00000000000000..dd5600c9e38c89
--- /dev/null
+++ b/lib/rubygems/vendor/molinillo/lib/molinillo.rb
@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+require_relative 'molinillo/gem_metadata'
+require_relative 'molinillo/errors'
+require_relative 'molinillo/resolver'
+require_relative 'molinillo/modules/ui'
+require_relative 'molinillo/modules/specification_provider'
+
+# Gem::Molinillo is a generic dependency resolution algorithm.
+module Gem::Molinillo
+end
diff --git a/lib/rubygems/vendor/molinillo/lib/molinillo/delegates/resolution_state.rb b/lib/rubygems/vendor/molinillo/lib/molinillo/delegates/resolution_state.rb
new file mode 100644
index 00000000000000..34842d46d5f9e4
--- /dev/null
+++ b/lib/rubygems/vendor/molinillo/lib/molinillo/delegates/resolution_state.rb
@@ -0,0 +1,57 @@
+# frozen_string_literal: true
+
+module Gem::Molinillo
+  # @!visibility private
+  module Delegates
+    # Delegates all {Gem::Molinillo::ResolutionState} methods to a `#state` property.
+    module ResolutionState
+      # (see Gem::Molinillo::ResolutionState#name)
+      def name
+        current_state = state || Gem::Molinillo::ResolutionState.empty
+        current_state.name
+      end
+
+      # (see Gem::Molinillo::ResolutionState#requirements)
+      def requirements
+        current_state = state || Gem::Molinillo::ResolutionState.empty
+        current_state.requirements
+      end
+
+      # (see Gem::Molinillo::ResolutionState#activated)
+      def activated
+        current_state = state || Gem::Molinillo::ResolutionState.empty
+        current_state.activated
+      end
+
+      # (see Gem::Molinillo::ResolutionState#requirement)
+      def requirement
+        current_state = state || Gem::Molinillo::ResolutionState.empty
+        current_state.requirement
+      end
+
+      # (see Gem::Molinillo::ResolutionState#possibilities)
+      def possibilities
+        current_state = state || Gem::Molinillo::ResolutionState.empty
+        current_state.possibilities
+      end
+
+      # (see Gem::Molinillo::ResolutionState#depth)
+      def depth
+        current_state = state || Gem::Molinillo::ResolutionState.empty
+        current_state.depth
+      end
+
+      # (see Gem::Molinillo::ResolutionState#conflicts)
+      def conflicts
+        current_state = state || Gem::Molinillo::ResolutionState.empty
+        current_state.conflicts
+      end
+
+      # (see Gem::Molinillo::ResolutionState#unused_unwind_options)
+      def unused_unwind_options
+        current_state = state || Gem::Molinillo::ResolutionState.empty
+        current_state.unused_unwind_options
+      end
+    end
+  end
+end
diff --git a/lib/rubygems/vendor/molinillo/lib/molinillo/delegates/specification_provider.rb b/lib/rubygems/vendor/molinillo/lib/molinillo/delegates/specification_provider.rb
new file mode 100644
index 00000000000000..8417721537219d
--- /dev/null
+++ b/lib/rubygems/vendor/molinillo/lib/molinillo/delegates/specification_provider.rb
@@ -0,0 +1,88 @@
+# frozen_string_literal: true
+
+module Gem::Molinillo
+  module Delegates
+    # Delegates all {Gem::Molinillo::SpecificationProvider} methods to a
+    # `#specification_provider` property.
+    module SpecificationProvider
+      # (see Gem::Molinillo::SpecificationProvider#search_for)
+      def search_for(dependency)
+        with_no_such_dependency_error_handling do
+          specification_provider.search_for(dependency)
+        end
+      end
+
+      # (see Gem::Molinillo::SpecificationProvider#dependencies_for)
+      def dependencies_for(specification)
+        with_no_such_dependency_error_handling do
+          specification_provider.dependencies_for(specification)
+        end
+      end
+
+      # (see Gem::Molinillo::SpecificationProvider#requirement_satisfied_by?)
+      def requirement_satisfied_by?(requirement, activated, spec)
+        with_no_such_dependency_error_handling do
+          specification_provider.requirement_satisfied_by?(requirement, activated, spec)
+        end
+      end
+
+      # (see Gem::Molinillo::SpecificationProvider#dependencies_equal?)
+      def dependencies_equal?(dependencies, other_dependencies)
+        with_no_such_dependency_error_handling do
+          specification_provider.dependencies_equal?(dependencies, other_dependencies)
+        end
+      end
+
+      # (see Gem::Molinillo::SpecificationProvider#name_for)
+      def name_for(dependency)
+        with_no_such_dependency_error_handling do
+          specification_provider.name_for(dependency)
+        end
+      end
+
+      # (see Gem::Molinillo::SpecificationProvider#name_for_explicit_dependency_source)
+      def name_for_explicit_dependency_source
+        with_no_such_dependency_error_handling do
+          specification_provider.name_for_explicit_dependency_source
+        end
+      end
+
+      # (see Gem::Molinillo::SpecificationProvider#name_for_locking_dependency_source)
+      def name_for_locking_dependency_source
+        with_no_such_dependency_error_handling do
+          specification_provider.name_for_locking_dependency_source
+        end
+      end
+
+      # (see Gem::Molinillo::SpecificationProvider#sort_dependencies)
+      def sort_dependencies(dependencies, activated, conflicts)
+        with_no_such_dependency_error_handling do
+          specification_provider.sort_dependencies(dependencies, activated, conflicts)
+        end
+      end
+
+      # (see Gem::Molinillo::SpecificationProvider#allow_missing?)
+      def allow_missing?(dependency)
+        with_no_such_dependency_error_handling do
+          specification_provider.allow_missing?(dependency)
+        end
+      end
+
+      private
+
+      # Ensures any raised {NoSuchDependencyError} has its
+      # {NoSuchDependencyError#required_by} set.
+      # @yield
+      def with_no_such_dependency_error_handling
+        yield
+      rescue NoSuchDependencyError => error
+        if state
+          vertex = activated.vertex_named(name_for(error.dependency))
+          error.required_by += vertex.incoming_edges.map { |e| e.origin.name }
+          error.required_by << name_for_explicit_dependency_source unless vertex.explicit_requirements.empty?
+        end
+        raise
+      end
+    end
+  end
+end
diff --git a/lib/rubygems/resolver/molinillo/lib/molinillo/dependency_graph.rb b/lib/rubygems/vendor/molinillo/lib/molinillo/dependency_graph.rb
similarity index 99%
rename from lib/rubygems/resolver/molinillo/lib/molinillo/dependency_graph.rb
rename to lib/rubygems/vendor/molinillo/lib/molinillo/dependency_graph.rb
index 731a9e3e90c343..2dbbc589dc7d5e 100644
--- a/lib/rubygems/resolver/molinillo/lib/molinillo/dependency_graph.rb
+++ b/lib/rubygems/vendor/molinillo/lib/molinillo/dependency_graph.rb
@@ -1,11 +1,11 @@
 # frozen_string_literal: true
 
-require_relative '../../../../tsort'
+require_relative '../../../../vendored_tsort'
 
 require_relative 'dependency_graph/log'
 require_relative 'dependency_graph/vertex'
 
-module Gem::Resolver::Molinillo
+module Gem::Molinillo
   # A directed acyclic graph that is tuned to hold named dependencies
   class DependencyGraph
     include Enumerable
diff --git a/lib/rubygems/resolver/molinillo/lib/molinillo/dependency_graph/action.rb b/lib/rubygems/vendor/molinillo/lib/molinillo/dependency_graph/action.rb
similarity index 96%
rename from lib/rubygems/resolver/molinillo/lib/molinillo/dependency_graph/action.rb
rename to lib/rubygems/vendor/molinillo/lib/molinillo/dependency_graph/action.rb
index cc140031b3d453..8707ec451db997 100644
--- a/lib/rubygems/resolver/molinillo/lib/molinillo/dependency_graph/action.rb
+++ b/lib/rubygems/vendor/molinillo/lib/molinillo/dependency_graph/action.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-module Gem::Resolver::Molinillo
+module Gem::Molinillo
   class DependencyGraph
     # An action that modifies a {DependencyGraph} that is reversible.
     # @abstract
diff --git a/lib/rubygems/resolver/molinillo/lib/molinillo/dependency_graph/add_edge_no_circular.rb b/lib/rubygems/vendor/molinillo/lib/molinillo/dependency_graph/add_edge_no_circular.rb
similarity index 98%
rename from lib/rubygems/resolver/molinillo/lib/molinillo/dependency_graph/add_edge_no_circular.rb
rename to lib/rubygems/vendor/molinillo/lib/molinillo/dependency_graph/add_edge_no_circular.rb
index 5570483253453c..aa9815c5ae8d8d 100644
--- a/lib/rubygems/resolver/molinillo/lib/molinillo/dependency_graph/add_edge_no_circular.rb
+++ b/lib/rubygems/vendor/molinillo/lib/molinillo/dependency_graph/add_edge_no_circular.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require_relative 'action'
-module Gem::Resolver::Molinillo
+module Gem::Molinillo
   class DependencyGraph
     # @!visibility private
     # (see DependencyGraph#add_edge_no_circular)
diff --git a/lib/rubygems/resolver/molinillo/lib/molinillo/dependency_graph/add_vertex.rb b/lib/rubygems/vendor/molinillo/lib/molinillo/dependency_graph/add_vertex.rb
similarity index 98%
rename from lib/rubygems/resolver/molinillo/lib/molinillo/dependency_graph/add_vertex.rb
rename to lib/rubygems/vendor/molinillo/lib/molinillo/dependency_graph/add_vertex.rb
index f1411d5efa1d59..9c7066a669a799 100644
--- a/lib/rubygems/resolver/molinillo/lib/molinillo/dependency_graph/add_vertex.rb
+++ b/lib/rubygems/vendor/molinillo/lib/molinillo/dependency_graph/add_vertex.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require_relative 'action'
-module Gem::Resolver::Molinillo
+module Gem::Molinillo
   class DependencyGraph
     # @!visibility private
     # (see DependencyGraph#add_vertex)
diff --git a/lib/rubygems/resolver/molinillo/lib/molinillo/dependency_graph/delete_edge.rb b/lib/rubygems/vendor/molinillo/lib/molinillo/dependency_graph/delete_edge.rb
similarity index 98%
rename from lib/rubygems/resolver/molinillo/lib/molinillo/dependency_graph/delete_edge.rb
rename to lib/rubygems/vendor/molinillo/lib/molinillo/dependency_graph/delete_edge.rb
index 3b48d77a5089d2..1e62c0a0b6442b 100644
--- a/lib/rubygems/resolver/molinillo/lib/molinillo/dependency_graph/delete_edge.rb
+++ b/lib/rubygems/vendor/molinillo/lib/molinillo/dependency_graph/delete_edge.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require_relative 'action'
-module Gem::Resolver::Molinillo
+module Gem::Molinillo
   class DependencyGraph
     # @!visibility private
     # (see DependencyGraph#delete_edge)
diff --git a/lib/rubygems/resolver/molinillo/lib/molinillo/dependency_graph/detach_vertex_named.rb b/lib/rubygems/vendor/molinillo/lib/molinillo/dependency_graph/detach_vertex_named.rb
similarity index 97%
rename from lib/rubygems/resolver/molinillo/lib/molinillo/dependency_graph/detach_vertex_named.rb
rename to lib/rubygems/vendor/molinillo/lib/molinillo/dependency_graph/detach_vertex_named.rb
index 92f60d5be854c7..6132f969b99308 100644
--- a/lib/rubygems/resolver/molinillo/lib/molinillo/dependency_graph/detach_vertex_named.rb
+++ b/lib/rubygems/vendor/molinillo/lib/molinillo/dependency_graph/detach_vertex_named.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require_relative 'action'
-module Gem::Resolver::Molinillo
+module Gem::Molinillo
   class DependencyGraph
     # @!visibility private
     # @see DependencyGraph#detach_vertex_named
diff --git a/lib/rubygems/vendor/molinillo/lib/molinillo/dependency_graph/log.rb b/lib/rubygems/vendor/molinillo/lib/molinillo/dependency_graph/log.rb
new file mode 100644
index 00000000000000..6954c4b1f8cace
--- /dev/null
+++ b/lib/rubygems/vendor/molinillo/lib/molinillo/dependency_graph/log.rb
@@ -0,0 +1,126 @@
+# frozen_string_literal: true
+
+require_relative 'add_edge_no_circular'
+require_relative 'add_vertex'
+require_relative 'delete_edge'
+require_relative 'detach_vertex_named'
+require_relative 'set_payload'
+require_relative 'tag'
+
+module Gem::Molinillo
+  class DependencyGraph
+    # A log for dependency graph actions
+    class Log
+      # Initializes an empty log
+      def initialize
+        @current_action = @first_action = nil
+      end
+
+      # @!macro [new] action
+      #   {include:DependencyGraph#$0}
+      #   @param [Graph] graph the graph to perform the action on
+      #   @param (see DependencyGraph#$0)
+      #   @return (see DependencyGraph#$0)
+
+      # @macro action
+      def tag(graph, tag)
+        push_action(graph, Tag.new(tag))
+      end
+
+      # @macro action
+      def add_vertex(graph, name, payload, root)
+        push_action(graph, AddVertex.new(name, payload, root))
+      end
+
+      # @macro action
+      def detach_vertex_named(graph, name)
+        push_action(graph, DetachVertexNamed.new(name))
+      end
+
+      # @macro action
+      def add_edge_no_circular(graph, origin, destination, requirement)
+        push_action(graph, AddEdgeNoCircular.new(origin, destination, requirement))
+      end
+
+      # {include:DependencyGraph#delete_edge}
+      # @param [Graph] graph the graph to perform the action on
+      # @param [String] origin_name
+      # @param [String] destination_name
+      # @param [Object] requirement
+      # @return (see DependencyGraph#delete_edge)
+      def delete_edge(graph, origin_name, destination_name, requirement)
+        push_action(graph, DeleteEdge.new(origin_name, destination_name, requirement))
+      end
+
+      # @macro action
+      def set_payload(graph, name, payload)
+        push_action(graph, SetPayload.new(name, payload))
+      end
+
+      # Pops the most recent action from the log and undoes the action
+      # @param [DependencyGraph] graph
+      # @return [Action] the action that was popped off the log
+      def pop!(graph)
+        return unless action = @current_action
+        unless @current_action = action.previous
+          @first_action = nil
+        end
+        action.down(graph)
+        action
+      end
+
+      extend Enumerable
+
+      # @!visibility private
+      # Enumerates each action in the log
+      # @yield [Action]
+      def each
+        return enum_for unless block_given?
+        action = @first_action
+        loop do
+          break unless action
+          yield action
+          action = action.next
+        end
+        self
+      end
+
+      # @!visibility private
+      # Enumerates each action in the log in reverse order
+      # @yield [Action]
+      def reverse_each
+        return enum_for(:reverse_each) unless block_given?
+        action = @current_action
+        loop do
+          break unless action
+          yield action
+          action = action.previous
+        end
+        self
+      end
+
+      # @macro action
+      def rewind_to(graph, tag)
+        loop do
+          action = pop!(graph)
+          raise "No tag #{tag.inspect} found" unless action
+          break if action.class.action_name == :tag && action.tag == tag
+        end
+      end
+
+      private
+
+      # Adds the given action to the log, running the action
+      # @param [DependencyGraph] graph
+      # @param [Action] action
+      # @return The value returned by `action.up`
+      def push_action(graph, action)
+        action.previous = @current_action
+        @current_action.next = action if @current_action
+        @current_action = action
+        @first_action ||= action
+        action.up(graph)
+      end
+    end
+  end
+end
diff --git a/lib/rubygems/resolver/molinillo/lib/molinillo/dependency_graph/set_payload.rb b/lib/rubygems/vendor/molinillo/lib/molinillo/dependency_graph/set_payload.rb
similarity index 97%
rename from lib/rubygems/resolver/molinillo/lib/molinillo/dependency_graph/set_payload.rb
rename to lib/rubygems/vendor/molinillo/lib/molinillo/dependency_graph/set_payload.rb
index 726292a2c37427..9bcaaae0f97a96 100644
--- a/lib/rubygems/resolver/molinillo/lib/molinillo/dependency_graph/set_payload.rb
+++ b/lib/rubygems/vendor/molinillo/lib/molinillo/dependency_graph/set_payload.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require_relative 'action'
-module Gem::Resolver::Molinillo
+module Gem::Molinillo
   class DependencyGraph
     # @!visibility private
     # @see DependencyGraph#set_payload
diff --git a/lib/rubygems/vendor/molinillo/lib/molinillo/dependency_graph/tag.rb b/lib/rubygems/vendor/molinillo/lib/molinillo/dependency_graph/tag.rb
new file mode 100644
index 00000000000000..62f243a2aff63d
--- /dev/null
+++ b/lib/rubygems/vendor/molinillo/lib/molinillo/dependency_graph/tag.rb
@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+
+require_relative 'action'
+module Gem::Molinillo
+  class DependencyGraph
+    # @!visibility private
+    # @see DependencyGraph#tag
+    class Tag < Action
+      # @!group Action
+
+      # (see Action.action_name)
+      def self.action_name
+        :tag
+      end
+
+      # (see Action#up)
+      def up(graph)
+      end
+
+      # (see Action#down)
+      def down(graph)
+      end
+
+      # @!group Tag
+
+      # @return [Object] An opaque tag
+      attr_reader :tag
+
+      # Initialize an action to tag a state of a dependency graph
+      # @param [Object] tag an opaque tag
+      def initialize(tag)
+        @tag = tag
+      end
+    end
+  end
+end
diff --git a/lib/rubygems/resolver/molinillo/lib/molinillo/dependency_graph/vertex.rb b/lib/rubygems/vendor/molinillo/lib/molinillo/dependency_graph/vertex.rb
similarity index 99%
rename from lib/rubygems/resolver/molinillo/lib/molinillo/dependency_graph/vertex.rb
rename to lib/rubygems/vendor/molinillo/lib/molinillo/dependency_graph/vertex.rb
index 77114951b251c3..074de369bed89b 100644
--- a/lib/rubygems/resolver/molinillo/lib/molinillo/dependency_graph/vertex.rb
+++ b/lib/rubygems/vendor/molinillo/lib/molinillo/dependency_graph/vertex.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-module Gem::Resolver::Molinillo
+module Gem::Molinillo
   class DependencyGraph
     # A vertex in a {DependencyGraph} that encapsulates a {#name} and a
     # {#payload}
diff --git a/lib/rubygems/vendor/molinillo/lib/molinillo/errors.rb b/lib/rubygems/vendor/molinillo/lib/molinillo/errors.rb
new file mode 100644
index 00000000000000..07ea5fdf3746c3
--- /dev/null
+++ b/lib/rubygems/vendor/molinillo/lib/molinillo/errors.rb
@@ -0,0 +1,149 @@
+# frozen_string_literal: true
+
+module Gem::Molinillo
+  # An error that occurred during the resolution process
+  class ResolverError < StandardError; end
+
+  # An error caused by searching for a dependency that is completely unknown,
+  # i.e. has no versions available whatsoever.
+  class NoSuchDependencyError < ResolverError
+    # @return [Object] the dependency that could not be found
+    attr_accessor :dependency
+
+    # @return [Array<Object>] the specifications that depended upon {#dependency}
+    attr_accessor :required_by
+
+    # Initializes a new error with the given missing dependency.
+    # @param [Object] dependency @see {#dependency}
+    # @param [Array<Object>] required_by @see {#required_by}
+    def initialize(dependency, required_by = [])
+      @dependency = dependency
+      @required_by = required_by.uniq
+      super()
+    end
+
+    # The error message for the missing dependency, including the specifications
+    # that had this dependency.
+    def message
+      sources = required_by.map { |r| "`#{r}`" }.join(' and ')
+      message = "Unable to find a specification for `#{dependency}`"
+      message += " depended upon by #{sources}" unless sources.empty?
+      message
+    end
+  end
+
+  # An error caused by attempting to fulfil a dependency that was circular
+  #
+  # @note This exception will be thrown if and only if a {Vertex} is added to a
+  #   {DependencyGraph} that has a {DependencyGraph::Vertex#path_to?} an
+  #   existing {DependencyGraph::Vertex}
+  class CircularDependencyError < ResolverError
+    # [Set<Object>] the dependencies responsible for causing the error
+    attr_reader :dependencies
+
+    # Initializes a new error with the given circular vertices.
+    # @param [Array<DependencyGraph::Vertex>] vertices the vertices in the dependency
+    #   that caused the error
+    def initialize(vertices)
+      super "There is a circular dependency between #{vertices.map(&:name).join(' and ')}"
+      @dependencies = vertices.map { |vertex| vertex.payload.possibilities.last }.to_set
+    end
+  end
+
+  # An error caused by conflicts in version
+  class VersionConflict < ResolverError
+    # @return [{String => Resolution::Conflict}] the conflicts that caused
+    #   resolution to fail
+    attr_reader :conflicts
+
+    # @return [SpecificationProvider] the specification provider used during
+    #   resolution
+    attr_reader :specification_provider
+
+    # Initializes a new error with the given version conflicts.
+    # @param [{String => Resolution::Conflict}] conflicts see {#conflicts}
+    # @param [SpecificationProvider] specification_provider see {#specification_provider}
+    def initialize(conflicts, specification_provider)
+      pairs = []
+      conflicts.values.flat_map(&:requirements).each do |conflicting|
+        conflicting.each do |source, conflict_requirements|
+          conflict_requirements.each do |c|
+            pairs << [c, source]
+          end
+        end
+      end
+
+      super "Unable to satisfy the following requirements:\n\n" \
+        "#{pairs.map { |r, d| "- `#{r}` required by `#{d}`" }.join("\n")}"
+
+      @conflicts = conflicts
+      @specification_provider = specification_provider
+    end
+
+    require_relative 'delegates/specification_provider'
+    include Delegates::SpecificationProvider
+
+    # @return [String] An error message that includes requirement trees,
+    #   which is much more detailed & customizable than the default message
+    # @param [Hash] opts the options to create a message with.
+    # @option opts [String] :solver_name The user-facing name of the solver
+    # @option opts [String] :possibility_type The generic name of a possibility
+    # @option opts [Proc] :reduce_trees A proc that reduced the list of requirement trees
+    # @option opts [Proc] :printable_requirement A proc that pretty-prints requirements
+    # @option opts [Proc] :additional_message_for_conflict A proc that appends additional
+    #   messages for each conflict
+    # @option opts [Proc] :version_for_spec A proc that returns the version number for a
+    #   possibility
+    def message_with_trees(opts = {})
+      solver_name = opts.delete(:solver_name) { self.class.name.split('::').first }
+      possibility_type = opts.delete(:possibility_type) { 'possibility named' }
+      reduce_trees = opts.delete(:reduce_trees) { proc { |trees| trees.uniq.sort_by(&:to_s) } }
+      printable_requirement = opts.delete(:printable_requirement) { proc { |req| req.to_s } }
+      additional_message_for_conflict = opts.delete(:additional_message_for_conflict) { proc {} }
+      version_for_spec = opts.delete(:version_for_spec) { proc(&:to_s) }
+      incompatible_version_message_for_conflict = opts.delete(:incompatible_version_message_for_conflict) do
+        proc do |name, _conflict|
+          %(#{solver_name} could not find compatible versions for #{possibility_type} "#{name}":)
+        end
+      end
+
+      full_message_for_conflict = opts.delete(:full_message_for_conflict) do
+        proc do |name, conflict|
+          o = "\n".dup << incompatible_version_message_for_conflict.call(name, conflict) << "\n"
+          if conflict.locked_requirement
+            o << %(  In snapshot (#{name_for_locking_dependency_source}):\n)
+            o << %(    #{printable_requirement.call(conflict.locked_requirement)}\n)
+            o << %(\n)
+          end
+          o << %(  In #{name_for_explicit_dependency_source}:\n)
+          trees = reduce_trees.call(conflict.requirement_trees)
+
+          o << trees.map do |tree|
+            t = ''.dup
+            depth = 2
+            tree.each do |req|
+              t << '  ' * depth << printable_requirement.call(req)
+              unless tree.last == req
+                if spec = conflict.activated_by_name[name_for(req)]
+                  t << %( was resolved to #{version_for_spec.call(spec)}, which)
+                end
+                t << %( depends on)
+              end
+              t << %(\n)
+              depth += 1
+            end
+            t
+          end.join("\n")
+
+          additional_message_for_conflict.call(o, name, conflict)
+
+          o
+        end
+      end
+
+      conflicts.sort.reduce(''.dup) do |o, (name, conflict)|
+        o << full_message_for_conflict.call(name, conflict)
+      end.strip
+    end
+  end
+end
diff --git a/lib/rubygems/vendor/molinillo/lib/molinillo/gem_metadata.rb b/lib/rubygems/vendor/molinillo/lib/molinillo/gem_metadata.rb
new file mode 100644
index 00000000000000..8ed3a920a2f386
--- /dev/null
+++ b/lib/rubygems/vendor/molinillo/lib/molinillo/gem_metadata.rb
@@ -0,0 +1,6 @@
+# frozen_string_literal: true
+
+module Gem::Molinillo
+  # The version of Gem::Molinillo.
+  VERSION = '0.8.0'.freeze
+end
diff --git a/lib/rubygems/vendor/molinillo/lib/molinillo/modules/specification_provider.rb b/lib/rubygems/vendor/molinillo/lib/molinillo/modules/specification_provider.rb
new file mode 100644
index 00000000000000..85860902fca563
--- /dev/null
+++ b/lib/rubygems/vendor/molinillo/lib/molinillo/modules/specification_provider.rb
@@ -0,0 +1,112 @@
+# frozen_string_literal: true
+
+module Gem::Molinillo
+  # Provides information about specifications and dependencies to the resolver,
+  # allowing the {Resolver} class to remain generic while still providing power
+  # and flexibility.
+  #
+  # This module contains the methods that users of Gem::Molinillo must to implement,
+  # using knowledge of their own model classes.
+  module SpecificationProvider
+    # Search for the specifications that match the given dependency.
+    # The specifications in the returned array will be considered in reverse
+    # order, so the latest version ought to be last.
+    # @note This method should be 'pure', i.e. the return value should depend
+    #   only on the `dependency` parameter.
+    #
+    # @param [Object] dependency
+    # @return [Array<Object>] the specifications that satisfy the given
+    #   `dependency`.
+    def search_for(dependency)
+      []
+    end
+
+    # Returns the dependencies of `specification`.
+    # @note This method should be 'pure', i.e. the return value should depend
+    #   only on the `specification` parameter.
+    #
+    # @param [Object] specification
+    # @return [Array<Object>] the dependencies that are required by the given
+    #   `specification`.
+    def dependencies_for(specification)
+      []
+    end
+
+    # Determines whether the given `requirement` is satisfied by the given
+    # `spec`, in the context of the current `activated` dependency graph.
+    #
+    # @param [Object] requirement
+    # @param [DependencyGraph] activated the current dependency graph in the
+    #   resolution process.
+    # @param [Object] spec
+    # @return [Boolean] whether `requirement` is satisfied by `spec` in the
+    #   context of the current `activated` dependency graph.
+    def requirement_satisfied_by?(requirement, activated, spec)
+      true
+    end
+
+    # Determines whether two arrays of dependencies are equal, and thus can be
+    # grouped.
+    #
+    # @param [Array<Object>] dependencies
+    # @param [Array<Object>] other_dependencies
+    # @return [Boolean] whether `dependencies` and `other_dependencies` should
+    #   be considered equal.
+    def dependencies_equal?(dependencies, other_dependencies)
+      dependencies == other_dependencies
+    end
+
+    # Returns the name for the given `dependency`.
+    # @note This method should be 'pure', i.e. the return value should depend
+    #   only on the `dependency` parameter.
+    #
+    # @param [Object] dependency
+    # @return [String] the name for the given `dependency`.
+    def name_for(dependency)
+      dependency.to_s
+    end
+
+    # @return [String] the name of the source of explicit dependencies, i.e.
+    #   those passed to {Resolver#resolve} directly.
+    def name_for_explicit_dependency_source
+      'user-specified dependency'
+    end
+
+    # @return [String] the name of the source of 'locked' dependencies, i.e.
+    #   those passed to {Resolver#resolve} directly as the `base`
+    def name_for_locking_dependency_source
+      'Lockfile'
+    end
+
+    # Sort dependencies so that the ones that are easiest to resolve are first.
+    # Easiest to resolve is (usually) defined by:
+    #   1) Is this dependency already activated?
+    #   2) How relaxed are the requirements?
+    #   3) Are there any conflicts for this dependency?
+    #   4) How many possibilities are there to satisfy this dependency?
+    #
+    # @param [Array<Object>] dependencies
+    # @param [DependencyGraph] activated the current dependency graph in the
+    #   resolution process.
+    # @param [{String => Array<Conflict>}] conflicts
+    # @return [Array<Object>] a sorted copy of `dependencies`.
+    def sort_dependencies(dependencies, activated, conflicts)
+      dependencies.sort_by do |dependency|
+        name = name_for(dependency)
+        [
+          activated.vertex_named(name).payload ? 0 : 1,
+          conflicts[name] ? 0 : 1,
+        ]
+      end
+    end
+
+    # Returns whether this dependency, which has no possible matching
+    # specifications, can safely be ignored.
+    #
+    # @param [Object] dependency
+    # @return [Boolean] whether this dependency can safely be skipped.
+    def allow_missing?(dependency)
+      false
+    end
+  end
+end
diff --git a/lib/rubygems/vendor/molinillo/lib/molinillo/modules/ui.rb b/lib/rubygems/vendor/molinillo/lib/molinillo/modules/ui.rb
new file mode 100644
index 00000000000000..464722902e24d0
--- /dev/null
+++ b/lib/rubygems/vendor/molinillo/lib/molinillo/modules/ui.rb
@@ -0,0 +1,67 @@
+# frozen_string_literal: true
+
+module Gem::Molinillo
+  # Conveys information about the resolution process to a user.
+  module UI
+    # The {IO} object that should be used to print output. `STDOUT`, by default.
+    #
+    # @return [IO]
+    def output
+      STDOUT
+    end
+
+    # Called roughly every {#progress_rate}, this method should convey progress
+    # to the user.
+    #
+    # @return [void]
+    def indicate_progress
+      output.print '.' unless debug?
+    end
+
+    # How often progress should be conveyed to the user via
+    # {#indicate_progress}, in seconds. A third of a second, by default.
+    #
+    # @return [Float]
+    def progress_rate
+      0.33
+    end
+
+    # Called before resolution begins.
+    #
+    # @return [void]
+    def before_resolution
+      output.print 'Resolving dependencies...'
+    end
+
+    # Called after resolution ends (either successfully or with an error).
+    # By default, prints a newline.
+    #
+    # @return [void]
+    def after_resolution
+      output.puts
+    end
+
+    # Conveys debug information to the user.
+    #
+    # @param [Integer] depth the current depth of the resolution process.
+    # @return [void]
+    def debug(depth = 0)
+      if debug?
+        debug_info = yield
+        debug_info = debug_info.inspect unless debug_info.is_a?(String)
+        debug_info = debug_info.split("\n").map { |s| ":#{depth.to_s.rjust 4}: #{s}" }
+        output.puts debug_info
+      end
+    end
+
+    # Whether or not debug messages should be printed.
+    # By default, whether or not the `MOLINILLO_DEBUG` environment variable is
+    # set.
+    #
+    # @return [Boolean]
+    def debug?
+      return @debug_mode if defined?(@debug_mode)
+      @debug_mode = ENV['MOLINILLO_DEBUG']
+    end
+  end
+end
diff --git a/lib/rubygems/resolver/molinillo/lib/molinillo/resolution.rb b/lib/rubygems/vendor/molinillo/lib/molinillo/resolution.rb
similarity index 99%
rename from lib/rubygems/resolver/molinillo/lib/molinillo/resolution.rb
rename to lib/rubygems/vendor/molinillo/lib/molinillo/resolution.rb
index 8b40e59e42fe43..84ec6cb095977b 100644
--- a/lib/rubygems/resolver/molinillo/lib/molinillo/resolution.rb
+++ b/lib/rubygems/vendor/molinillo/lib/molinillo/resolution.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-module Gem::Resolver::Molinillo
+module Gem::Molinillo
   class Resolver
     # A specific resolution from a given {Resolver}
     class Resolution
@@ -103,7 +103,7 @@ def reversed_requirement_tree_index
 
         # @return [Boolean] where the requirement of the state we're unwinding
         #    to directly caused the conflict. Note: in this case, it is
-        #    impossible for the state we're unwinding to to be a parent of
+        #    impossible for the state we're unwinding to be a parent of
         #    any of the other conflicting requirements (or we would have
         #    circularity)
         def unwinding_to_primary_requirement?
@@ -244,8 +244,8 @@ def end_resolution
       require_relative 'delegates/resolution_state'
       require_relative 'delegates/specification_provider'
 
-      include Gem::Resolver::Molinillo::Delegates::ResolutionState
-      include Gem::Resolver::Molinillo::Delegates::SpecificationProvider
+      include Gem::Molinillo::Delegates::ResolutionState
+      include Gem::Molinillo::Delegates::SpecificationProvider
 
       # Processes the topmost available {RequirementState} on the stack
       # @return [void]
diff --git a/lib/rubygems/vendor/molinillo/lib/molinillo/resolver.rb b/lib/rubygems/vendor/molinillo/lib/molinillo/resolver.rb
new file mode 100644
index 00000000000000..86229c3fa12046
--- /dev/null
+++ b/lib/rubygems/vendor/molinillo/lib/molinillo/resolver.rb
@@ -0,0 +1,46 @@
+# frozen_string_literal: true
+
+require_relative 'dependency_graph'
+
+module Gem::Molinillo
+  # This class encapsulates a dependency resolver.
+  # The resolver is responsible for determining which set of dependencies to
+  # activate, with feedback from the {#specification_provider}
+  #
+  #
+  class Resolver
+    require_relative 'resolution'
+
+    # @return [SpecificationProvider] the specification provider used
+    #   in the resolution process
+    attr_reader :specification_provider
+
+    # @return [UI] the UI module used to communicate back to the user
+    #   during the resolution process
+    attr_reader :resolver_ui
+
+    # Initializes a new resolver.
+    # @param  [SpecificationProvider] specification_provider
+    #   see {#specification_provider}
+    # @param  [UI] resolver_ui
+    #   see {#resolver_ui}
+    def initialize(specification_provider, resolver_ui)
+      @specification_provider = specification_provider
+      @resolver_ui = resolver_ui
+    end
+
+    # Resolves the requested dependencies into a {DependencyGraph},
+    # locking to the base dependency graph (if specified)
+    # @param [Array] requested an array of 'requested' dependencies that the
+    #   {#specification_provider} can understand
+    # @param [DependencyGraph,nil] base the base dependency graph to which
+    #   dependencies should be 'locked'
+    def resolve(requested, base = DependencyGraph.new)
+      Resolution.new(specification_provider,
+                     resolver_ui,
+                     requested,
+                     base).
+        resolve
+    end
+  end
+end
diff --git a/lib/rubygems/vendor/molinillo/lib/molinillo/state.rb b/lib/rubygems/vendor/molinillo/lib/molinillo/state.rb
new file mode 100644
index 00000000000000..c48ec6af9c1234
--- /dev/null
+++ b/lib/rubygems/vendor/molinillo/lib/molinillo/state.rb
@@ -0,0 +1,58 @@
+# frozen_string_literal: true
+
+module Gem::Molinillo
+  # A state that a {Resolution} can be in
+  # @attr [String] name the name of the current requirement
+  # @attr [Array<Object>] requirements currently unsatisfied requirements
+  # @attr [DependencyGraph] activated the graph of activated dependencies
+  # @attr [Object] requirement the current requirement
+  # @attr [Object] possibilities the possibilities to satisfy the current requirement
+  # @attr [Integer] depth the depth of the resolution
+  # @attr [Hash] conflicts unresolved conflicts, indexed by dependency name
+  # @attr [Array<UnwindDetails>] unused_unwind_options unwinds for previous conflicts that weren't explored
+  ResolutionState = Struct.new(
+    :name,
+    :requirements,
+    :activated,
+    :requirement,
+    :possibilities,
+    :depth,
+    :conflicts,
+    :unused_unwind_options
+  )
+
+  class ResolutionState
+    # Returns an empty resolution state
+    # @return [ResolutionState] an empty state
+    def self.empty
+      new(nil, [], DependencyGraph.new, nil, nil, 0, {}, [])
+    end
+  end
+
+  # A state that encapsulates a set of {#requirements} with an {Array} of
+  # possibilities
+  class DependencyState < ResolutionState
+    # Removes a possibility from `self`
+    # @return [PossibilityState] a state with a single possibility,
+    #  the possibility that was removed from `self`
+    def pop_possibility_state
+      PossibilityState.new(
+        name,
+        requirements.dup,
+        activated,
+        requirement,
+        [possibilities.pop],
+        depth + 1,
+        conflicts.dup,
+        unused_unwind_options.dup
+      ).tap do |state|
+        state.activated.tag(state)
+      end
+    end
+  end
+
+  # A state that encapsulates a single possibility to fulfill the given
+  # {#requirement}
+  class PossibilityState < ResolutionState
+  end
+end
diff --git a/lib/rubygems/vendor/net-http/lib/net/http.rb b/lib/rubygems/vendor/net-http/lib/net/http.rb
new file mode 100644
index 00000000000000..0e860566148ea6
--- /dev/null
+++ b/lib/rubygems/vendor/net-http/lib/net/http.rb
@@ -0,0 +1,2575 @@
+# frozen_string_literal: true
+#
+# = net/http.rb
+#
+# Copyright (c) 1999-2007 Yukihiro Matsumoto
+# Copyright (c) 1999-2007 Minero Aoki
+# Copyright (c) 2001 GOTOU Yuuzou
+#
+# Written and maintained by Minero Aoki <aamine@loveruby.net>.
+# HTTPS support added by GOTOU Yuuzou <gotoyuzo@notwork.org>.
+#
+# This file is derived from "http-access.rb".
+#
+# Documented by Minero Aoki; converted to RDoc by William Webber.
+#
+# This program is free software. You can re-distribute and/or
+# modify this program under the same terms of ruby itself ---
+# Ruby Distribution License or GNU General Public License.
+#
+# See Gem::Net::HTTP for an overview and examples.
+#
+
+require_relative '../../../net-protocol/lib/net/protocol'
+require_relative '../../../uri/lib/uri'
+require_relative '../../../resolv/lib/resolv'
+autoload :OpenSSL, 'openssl'
+
+module Gem::Net   #:nodoc:
+
+  # :stopdoc:
+  class HTTPBadResponse < StandardError; end
+  class HTTPHeaderSyntaxError < StandardError; end
+  # :startdoc:
+
+  # \Class \Gem::Net::HTTP provides a rich library that implements the client
+  # in a client-server model that uses the \HTTP request-response protocol.
+  # For information about \HTTP, see:
+  #
+  # - {Hypertext Transfer Protocol}[https://en.wikipedia.org/wiki/Hypertext_Transfer_Protocol].
+  # - {Technical overview}[https://en.wikipedia.org/wiki/Hypertext_Transfer_Protocol#Technical_overview].
+  #
+  # == About the Examples
+  #
+  # :include: doc/net-http/examples.rdoc
+  #
+  # == Strategies
+  #
+  # - If you will make only a few GET requests,
+  #   consider using {OpenURI}[https://docs.ruby-lang.org/en/master/OpenURI.html].
+  # - If you will make only a few requests of all kinds,
+  #   consider using the various singleton convenience methods in this class.
+  #   Each of the following methods automatically starts and finishes
+  #   a {session}[rdoc-ref:Gem::Net::HTTP@Sessions] that sends a single request:
+  #
+  #     # Return string response body.
+  #     Gem::Net::HTTP.get(hostname, path)
+  #     Gem::Net::HTTP.get(uri)
+  #
+  #     # Write string response body to $stdout.
+  #     Gem::Net::HTTP.get_print(hostname, path)
+  #     Gem::Net::HTTP.get_print(uri)
+  #
+  #     # Return response as Gem::Net::HTTPResponse object.
+  #     Gem::Net::HTTP.get_response(hostname, path)
+  #     Gem::Net::HTTP.get_response(uri)
+  #     data = '{"title": "foo", "body": "bar", "userId": 1}'
+  #     Gem::Net::HTTP.post(uri, data)
+  #     params = {title: 'foo', body: 'bar', userId: 1}
+  #     Gem::Net::HTTP.post_form(uri, params)
+  #     data = '{"title": "foo", "body": "bar", "userId": 1}'
+  #     Gem::Net::HTTP.put(uri, data)
+  #
+  # - If performance is important, consider using sessions, which lower request overhead.
+  #   This {session}[rdoc-ref:Gem::Net::HTTP@Sessions] has multiple requests for
+  #   {HTTP methods}[https://en.wikipedia.org/wiki/Hypertext_Transfer_Protocol#Request_methods]
+  #   and {WebDAV methods}[https://en.wikipedia.org/wiki/WebDAV#Implementation]:
+  #
+  #     Gem::Net::HTTP.start(hostname) do |http|
+  #       # Session started automatically before block execution.
+  #       http.get(path)
+  #       http.head(path)
+  #       body = 'Some text'
+  #       http.post(path, body)  # Can also have a block.
+  #       http.put(path, body)
+  #       http.delete(path)
+  #       http.options(path)
+  #       http.trace(path)
+  #       http.patch(path, body) # Can also have a block.
+  #       http.copy(path)
+  #       http.lock(path, body)
+  #       http.mkcol(path, body)
+  #       http.move(path)
+  #       http.propfind(path, body)
+  #       http.proppatch(path, body)
+  #       http.unlock(path, body)
+  #       # Session finished automatically at block exit.
+  #     end
+  #
+  # The methods cited above are convenience methods that, via their few arguments,
+  # allow minimal control over the requests.
+  # For greater control, consider using {request objects}[rdoc-ref:Gem::Net::HTTPRequest].
+  #
+  # == URIs
+  #
+  # On the internet, a URI
+  # ({Universal Resource Identifier}[https://en.wikipedia.org/wiki/Uniform_Resource_Identifier])
+  # is a string that identifies a particular resource.
+  # It consists of some or all of: scheme, hostname, path, query, and fragment;
+  # see {URI syntax}[https://en.wikipedia.org/wiki/Uniform_Resource_Identifier#Syntax].
+  #
+  # A Ruby {Gem::URI::Generic}[https://docs.ruby-lang.org/en/master/Gem/URI/Generic.html] object
+  # represents an internet URI.
+  # It provides, among others, methods
+  # +scheme+, +hostname+, +path+, +query+, and +fragment+.
+  #
+  # === Schemes
+  #
+  # An internet \Gem::URI has
+  # a {scheme}[https://en.wikipedia.org/wiki/List_of_URI_schemes].
+  #
+  # The two schemes supported in \Gem::Net::HTTP are <tt>'https'</tt> and <tt>'http'</tt>:
+  #
+  #   uri.scheme                       # => "https"
+  #   Gem::URI('http://example.com').scheme # => "http"
+  #
+  # === Hostnames
+  #
+  # A hostname identifies a server (host) to which requests may be sent:
+  #
+  #   hostname = uri.hostname # => "jsonplaceholder.typicode.com"
+  #   Gem::Net::HTTP.start(hostname) do |http|
+  #     # Some HTTP stuff.
+  #   end
+  #
+  # === Paths
+  #
+  # A host-specific path identifies a resource on the host:
+  #
+  #   _uri = uri.dup
+  #   _uri.path = '/todos/1'
+  #   hostname = _uri.hostname
+  #   path = _uri.path
+  #   Gem::Net::HTTP.get(hostname, path)
+  #
+  # === Queries
+  #
+  # A host-specific query adds name/value pairs to the URI:
+  #
+  #   _uri = uri.dup
+  #   params = {userId: 1, completed: false}
+  #   _uri.query = Gem::URI.encode_www_form(params)
+  #   _uri # => #<Gem::URI::HTTPS https://jsonplaceholder.typicode.com?userId=1&completed=false>
+  #   Gem::Net::HTTP.get(_uri)
+  #
+  # === Fragments
+  #
+  # A {URI fragment}[https://en.wikipedia.org/wiki/URI_fragment] has no effect
+  # in \Gem::Net::HTTP;
+  # the same data is returned, regardless of whether a fragment is included.
+  #
+  # == Request Headers
+  #
+  # Request headers may be used to pass additional information to the host,
+  # similar to arguments passed in a method call;
+  # each header is a name/value pair.
+  #
+  # Each of the \Gem::Net::HTTP methods that sends a request to the host
+  # has optional argument +headers+,
+  # where the headers are expressed as a hash of field-name/value pairs:
+  #
+  #   headers = {Accept: 'application/json', Connection: 'Keep-Alive'}
+  #   Gem::Net::HTTP.get(uri, headers)
+  #
+  # See lists of both standard request fields and common request fields at
+  # {Request Fields}[https://en.wikipedia.org/wiki/List_of_HTTP_header_fields#Request_fields].
+  # A host may also accept other custom fields.
+  #
+  # == \HTTP Sessions
+  #
+  # A _session_ is a connection between a server (host) and a client that:
+  #
+  # - Is begun by instance method Gem::Net::HTTP#start.
+  # - May contain any number of requests.
+  # - Is ended by instance method Gem::Net::HTTP#finish.
+  #
+  # See example sessions at {Strategies}[rdoc-ref:Gem::Net::HTTP@Strategies].
+  #
+  # === Session Using \Gem::Net::HTTP.start
+  #
+  # If you have many requests to make to a single host (and port),
+  # consider using singleton method Gem::Net::HTTP.start with a block;
+  # the method handles the session automatically by:
+  #
+  # - Calling #start before block execution.
+  # - Executing the block.
+  # - Calling #finish after block execution.
+  #
+  # In the block, you can use these instance methods,
+  # each of which that sends a single request:
+  #
+  # - {HTTP methods}[https://en.wikipedia.org/wiki/Hypertext_Transfer_Protocol#Request_methods]:
+  #
+  #   - #get, #request_get: GET.
+  #   - #head, #request_head: HEAD.
+  #   - #post, #request_post: POST.
+  #   - #delete: DELETE.
+  #   - #options: OPTIONS.
+  #   - #trace: TRACE.
+  #   - #patch: PATCH.
+  #
+  # - {WebDAV methods}[https://en.wikipedia.org/wiki/WebDAV#Implementation]:
+  #
+  #   - #copy: COPY.
+  #   - #lock: LOCK.
+  #   - #mkcol: MKCOL.
+  #   - #move: MOVE.
+  #   - #propfind: PROPFIND.
+  #   - #proppatch: PROPPATCH.
+  #   - #unlock: UNLOCK.
+  #
+  # === Session Using \Gem::Net::HTTP.start and \Gem::Net::HTTP.finish
+  #
+  # You can manage a session manually using methods #start and #finish:
+  #
+  #   http = Gem::Net::HTTP.new(hostname)
+  #   http.start
+  #   http.get('/todos/1')
+  #   http.get('/todos/2')
+  #   http.delete('/posts/1')
+  #   http.finish # Needed to free resources.
+  #
+  # === Single-Request Session
+  #
+  # Certain convenience methods automatically handle a session by:
+  #
+  # - Creating an \HTTP object
+  # - Starting a session.
+  # - Sending a single request.
+  # - Finishing the session.
+  # - Destroying the object.
+  #
+  # Such methods that send GET requests:
+  #
+  # - ::get: Returns the string response body.
+  # - ::get_print: Writes the string response body to $stdout.
+  # - ::get_response: Returns a Gem::Net::HTTPResponse object.
+  #
+  # Such methods that send POST requests:
+  #
+  # - ::post: Posts data to the host.
+  # - ::post_form: Posts form data to the host.
+  #
+  # == \HTTP Requests and Responses
+  #
+  # Many of the methods above are convenience methods,
+  # each of which sends a request and returns a string
+  # without directly using \Gem::Net::HTTPRequest and \Gem::Net::HTTPResponse objects.
+  #
+  # You can, however, directly create a request object, send the request,
+  # and retrieve the response object; see:
+  #
+  # - Gem::Net::HTTPRequest.
+  # - Gem::Net::HTTPResponse.
+  #
+  # == Following Redirection
+  #
+  # Each returned response is an instance of a subclass of Gem::Net::HTTPResponse.
+  # See the {response class hierarchy}[rdoc-ref:Gem::Net::HTTPResponse@Response+Subclasses].
+  #
+  # In particular, class Gem::Net::HTTPRedirection is the parent
+  # of all redirection classes.
+  # This allows you to craft a case statement to handle redirections properly:
+  #
+  #   def fetch(uri, limit = 10)
+  #     # You should choose a better exception.
+  #     raise ArgumentError, 'Too many HTTP redirects' if limit == 0
+  #
+  #     res = Gem::Net::HTTP.get_response(Gem::URI(uri))
+  #     case res
+  #     when Gem::Net::HTTPSuccess     # Any success class.
+  #       res
+  #     when Gem::Net::HTTPRedirection # Any redirection class.
+  #       location = res['Location']
+  #       warn "Redirected to #{location}"
+  #       fetch(location, limit - 1)
+  #     else                      # Any other class.
+  #       res.value
+  #     end
+  #   end
+  #
+  #   fetch(uri)
+  #
+  # == Basic Authentication
+  #
+  # Basic authentication is performed according to
+  # {RFC2617}[http://www.ietf.org/rfc/rfc2617.txt]:
+  #
+  #   req = Gem::Net::HTTP::Get.new(uri)
+  #   req.basic_auth('user', 'pass')
+  #   res = Gem::Net::HTTP.start(hostname) do |http|
+  #     http.request(req)
+  #   end
+  #
+  # == Streaming Response Bodies
+  #
+  # By default \Gem::Net::HTTP reads an entire response into memory.  If you are
+  # handling large files or wish to implement a progress bar you can instead
+  # stream the body directly to an IO.
+  #
+  #   Gem::Net::HTTP.start(hostname) do |http|
+  #     req = Gem::Net::HTTP::Get.new(uri)
+  #     http.request(req) do |res|
+  #       open('t.tmp', 'w') do |f|
+  #         res.read_body do |chunk|
+  #           f.write chunk
+  #         end
+  #       end
+  #     end
+  #   end
+  #
+  # == HTTPS
+  #
+  # HTTPS is enabled for an \HTTP connection by Gem::Net::HTTP#use_ssl=:
+  #
+  #   Gem::Net::HTTP.start(hostname, :use_ssl => true) do |http|
+  #     req = Gem::Net::HTTP::Get.new(uri)
+  #     res = http.request(req)
+  #   end
+  #
+  # Or if you simply want to make a GET request, you may pass in a URI
+  # object that has an \HTTPS URL. \Gem::Net::HTTP automatically turns on TLS
+  # verification if the URI object has a 'https' :URI scheme:
+  #
+  #   uri # => #<Gem::URI::HTTPS https://jsonplaceholder.typicode.com/>
+  #   Gem::Net::HTTP.get(uri)
+  #
+  # == Proxy Server
+  #
+  # An \HTTP object can have
+  # a {proxy server}[https://en.wikipedia.org/wiki/Proxy_server].
+  #
+  # You can create an \HTTP object with a proxy server
+  # using method Gem::Net::HTTP.new or method Gem::Net::HTTP.start.
+  #
+  # The proxy may be defined either by argument +p_addr+
+  # or by environment variable <tt>'http_proxy'</tt>.
+  #
+  # === Proxy Using Argument +p_addr+ as a \String
+  #
+  # When argument +p_addr+ is a string hostname,
+  # the returned +http+ has the given host as its proxy:
+  #
+  #   http = Gem::Net::HTTP.new(hostname, nil, 'proxy.example')
+  #   http.proxy?          # => true
+  #   http.proxy_from_env? # => false
+  #   http.proxy_address   # => "proxy.example"
+  #   # These use default values.
+  #   http.proxy_port      # => 80
+  #   http.proxy_user      # => nil
+  #   http.proxy_pass      # => nil
+  #
+  # The port, username, and password for the proxy may also be given:
+  #
+  #   http = Gem::Net::HTTP.new(hostname, nil, 'proxy.example', 8000, 'pname', 'ppass')
+  #   # => #<Gem::Net::HTTP jsonplaceholder.typicode.com:80 open=false>
+  #   http.proxy?          # => true
+  #   http.proxy_from_env? # => false
+  #   http.proxy_address   # => "proxy.example"
+  #   http.proxy_port      # => 8000
+  #   http.proxy_user      # => "pname"
+  #   http.proxy_pass      # => "ppass"
+  #
+  # === Proxy Using '<tt>ENV['http_proxy']</tt>'
+  #
+  # When environment variable <tt>'http_proxy'</tt>
+  # is set to a \Gem::URI string,
+  # the returned +http+ will have the server at that URI as its proxy;
+  # note that the \Gem::URI string must have a protocol
+  # such as <tt>'http'</tt> or <tt>'https'</tt>:
+  #
+  #   ENV['http_proxy'] = 'http://example.com'
+  #   http = Gem::Net::HTTP.new(hostname)
+  #   http.proxy?          # => true
+  #   http.proxy_from_env? # => true
+  #   http.proxy_address   # => "example.com"
+  #   # These use default values.
+  #   http.proxy_port      # => 80
+  #   http.proxy_user      # => nil
+  #   http.proxy_pass      # => nil
+  #
+  # The \Gem::URI string may include proxy username, password, and port number:
+  #
+  #   ENV['http_proxy'] = 'http://pname:ppass@example.com:8000'
+  #   http = Gem::Net::HTTP.new(hostname)
+  #   http.proxy?          # => true
+  #   http.proxy_from_env? # => true
+  #   http.proxy_address   # => "example.com"
+  #   http.proxy_port      # => 8000
+  #   http.proxy_user      # => "pname"
+  #   http.proxy_pass      # => "ppass"
+  #
+  # === Filtering Proxies
+  #
+  # With method Gem::Net::HTTP.new (but not Gem::Net::HTTP.start),
+  # you can use argument +p_no_proxy+ to filter proxies:
+  #
+  # - Reject a certain address:
+  #
+  #     http = Gem::Net::HTTP.new('example.com', nil, 'proxy.example', 8000, 'pname', 'ppass', 'proxy.example')
+  #     http.proxy_address # => nil
+  #
+  # - Reject certain domains or subdomains:
+  #
+  #     http = Gem::Net::HTTP.new('example.com', nil, 'my.proxy.example', 8000, 'pname', 'ppass', 'proxy.example')
+  #     http.proxy_address # => nil
+  #
+  # - Reject certain addresses and port combinations:
+  #
+  #     http = Gem::Net::HTTP.new('example.com', nil, 'proxy.example', 8000, 'pname', 'ppass', 'proxy.example:1234')
+  #     http.proxy_address # => "proxy.example"
+  #
+  #     http = Gem::Net::HTTP.new('example.com', nil, 'proxy.example', 8000, 'pname', 'ppass', 'proxy.example:8000')
+  #     http.proxy_address # => nil
+  #
+  # - Reject a list of the types above delimited using a comma:
+  #
+  #     http = Gem::Net::HTTP.new('example.com', nil, 'proxy.example', 8000, 'pname', 'ppass', 'my.proxy,proxy.example:8000')
+  #     http.proxy_address # => nil
+  #
+  #     http = Gem::Net::HTTP.new('example.com', nil, 'my.proxy', 8000, 'pname', 'ppass', 'my.proxy,proxy.example:8000')
+  #     http.proxy_address # => nil
+  #
+  # == Compression and Decompression
+  #
+  # \Gem::Net::HTTP does not compress the body of a request before sending.
+  #
+  # By default, \Gem::Net::HTTP adds header <tt>'Accept-Encoding'</tt>
+  # to a new {request object}[rdoc-ref:Gem::Net::HTTPRequest]:
+  #
+  #   Gem::Net::HTTP::Get.new(uri)['Accept-Encoding']
+  #   # => "gzip;q=1.0,deflate;q=0.6,identity;q=0.3"
+  #
+  # This requests the server to zip-encode the response body if there is one;
+  # the server is not required to do so.
+  #
+  # \Gem::Net::HTTP does not automatically decompress a response body
+  # if the response has header <tt>'Content-Range'</tt>.
+  #
+  # Otherwise decompression (or not) depends on the value of header
+  # {Content-Encoding}[https://en.wikipedia.org/wiki/List_of_HTTP_header_fields#content-encoding-response-header]:
+  #
+  # - <tt>'deflate'</tt>, <tt>'gzip'</tt>, or <tt>'x-gzip'</tt>:
+  #   decompresses the body and deletes the header.
+  # - <tt>'none'</tt> or <tt>'identity'</tt>:
+  #   does not decompress the body, but deletes the header.
+  # - Any other value:
+  #   leaves the body and header unchanged.
+  #
+  # == What's Here
+  #
+  # First, what's elsewhere. Class Gem::Net::HTTP:
+  #
+  # - Inherits from {class Object}[https://docs.ruby-lang.org/en/master/Object.html#class-Object-label-What-27s+Here].
+  #
+  # This is a categorized summary of methods and attributes.
+  #
+  # === \Gem::Net::HTTP Objects
+  #
+  # - {::new}[rdoc-ref:Gem::Net::HTTP.new]:
+  #   Creates a new instance.
+  # - {#inspect}[rdoc-ref:Gem::Net::HTTP#inspect]:
+  #   Returns a string representation of +self+.
+  #
+  # === Sessions
+  #
+  # - {::start}[rdoc-ref:Gem::Net::HTTP.start]:
+  #   Begins a new session in a new \Gem::Net::HTTP object.
+  # - {#started?}[rdoc-ref:Gem::Net::HTTP#started?]:
+  #   Returns whether in a session.
+  # - {#finish}[rdoc-ref:Gem::Net::HTTP#finish]:
+  #   Ends an active session.
+  # - {#start}[rdoc-ref:Gem::Net::HTTP#start]:
+  #   Begins a new session in an existing \Gem::Net::HTTP object (+self+).
+  #
+  # === Connections
+  #
+  # - {:continue_timeout}[rdoc-ref:Gem::Net::HTTP#continue_timeout]:
+  #   Returns the continue timeout.
+  # - {#continue_timeout=}[rdoc-ref:Gem::Net::HTTP#continue_timeout=]:
+  #   Sets the continue timeout seconds.
+  # - {:keep_alive_timeout}[rdoc-ref:Gem::Net::HTTP#keep_alive_timeout]:
+  #   Returns the keep-alive timeout.
+  # - {:keep_alive_timeout=}[rdoc-ref:Gem::Net::HTTP#keep_alive_timeout=]:
+  #   Sets the keep-alive timeout.
+  # - {:max_retries}[rdoc-ref:Gem::Net::HTTP#max_retries]:
+  #   Returns the maximum retries.
+  # - {#max_retries=}[rdoc-ref:Gem::Net::HTTP#max_retries=]:
+  #   Sets the maximum retries.
+  # - {:open_timeout}[rdoc-ref:Gem::Net::HTTP#open_timeout]:
+  #   Returns the open timeout.
+  # - {:open_timeout=}[rdoc-ref:Gem::Net::HTTP#open_timeout=]:
+  #   Sets the open timeout.
+  # - {:read_timeout}[rdoc-ref:Gem::Net::HTTP#read_timeout]:
+  #   Returns the open timeout.
+  # - {:read_timeout=}[rdoc-ref:Gem::Net::HTTP#read_timeout=]:
+  #   Sets the read timeout.
+  # - {:ssl_timeout}[rdoc-ref:Gem::Net::HTTP#ssl_timeout]:
+  #   Returns the ssl timeout.
+  # - {:ssl_timeout=}[rdoc-ref:Gem::Net::HTTP#ssl_timeout=]:
+  #   Sets the ssl timeout.
+  # - {:write_timeout}[rdoc-ref:Gem::Net::HTTP#write_timeout]:
+  #   Returns the write timeout.
+  # - {write_timeout=}[rdoc-ref:Gem::Net::HTTP#write_timeout=]:
+  #   Sets the write timeout.
+  #
+  # === Requests
+  #
+  # - {::get}[rdoc-ref:Gem::Net::HTTP.get]:
+  #   Sends a GET request and returns the string response body.
+  # - {::get_print}[rdoc-ref:Gem::Net::HTTP.get_print]:
+  #   Sends a GET request and write the string response body to $stdout.
+  # - {::get_response}[rdoc-ref:Gem::Net::HTTP.get_response]:
+  #   Sends a GET request and returns a response object.
+  # - {::post_form}[rdoc-ref:Gem::Net::HTTP.post_form]:
+  #   Sends a POST request with form data and returns a response object.
+  # - {::post}[rdoc-ref:Gem::Net::HTTP.post]:
+  #   Sends a POST request with data and returns a response object.
+  # - {::put}[rdoc-ref:Gem::Net::HTTP.put]:
+  #   Sends a PUT request with data and returns a response object.
+  # - {#copy}[rdoc-ref:Gem::Net::HTTP#copy]:
+  #   Sends a COPY request and returns a response object.
+  # - {#delete}[rdoc-ref:Gem::Net::HTTP#delete]:
+  #   Sends a DELETE request and returns a response object.
+  # - {#get}[rdoc-ref:Gem::Net::HTTP#get]:
+  #   Sends a GET request and returns a response object.
+  # - {#head}[rdoc-ref:Gem::Net::HTTP#head]:
+  #   Sends a HEAD request and returns a response object.
+  # - {#lock}[rdoc-ref:Gem::Net::HTTP#lock]:
+  #   Sends a LOCK request and returns a response object.
+  # - {#mkcol}[rdoc-ref:Gem::Net::HTTP#mkcol]:
+  #   Sends a MKCOL request and returns a response object.
+  # - {#move}[rdoc-ref:Gem::Net::HTTP#move]:
+  #   Sends a MOVE request and returns a response object.
+  # - {#options}[rdoc-ref:Gem::Net::HTTP#options]:
+  #   Sends a OPTIONS request and returns a response object.
+  # - {#patch}[rdoc-ref:Gem::Net::HTTP#patch]:
+  #   Sends a PATCH request and returns a response object.
+  # - {#post}[rdoc-ref:Gem::Net::HTTP#post]:
+  #   Sends a POST request and returns a response object.
+  # - {#propfind}[rdoc-ref:Gem::Net::HTTP#propfind]:
+  #   Sends a PROPFIND request and returns a response object.
+  # - {#proppatch}[rdoc-ref:Gem::Net::HTTP#proppatch]:
+  #   Sends a PROPPATCH request and returns a response object.
+  # - {#put}[rdoc-ref:Gem::Net::HTTP#put]:
+  #   Sends a PUT request and returns a response object.
+  # - {#request}[rdoc-ref:Gem::Net::HTTP#request]:
+  #   Sends a request and returns a response object.
+  # - {#request_get}[rdoc-ref:Gem::Net::HTTP#request_get]:
+  #   Sends a GET request and forms a response object;
+  #   if a block given, calls the block with the object,
+  #   otherwise returns the object.
+  # - {#request_head}[rdoc-ref:Gem::Net::HTTP#request_head]:
+  #   Sends a HEAD request and forms a response object;
+  #   if a block given, calls the block with the object,
+  #   otherwise returns the object.
+  # - {#request_post}[rdoc-ref:Gem::Net::HTTP#request_post]:
+  #   Sends a POST request and forms a response object;
+  #   if a block given, calls the block with the object,
+  #   otherwise returns the object.
+  # - {#send_request}[rdoc-ref:Gem::Net::HTTP#send_request]:
+  #   Sends a request and returns a response object.
+  # - {#trace}[rdoc-ref:Gem::Net::HTTP#trace]:
+  #   Sends a TRACE request and returns a response object.
+  # - {#unlock}[rdoc-ref:Gem::Net::HTTP#unlock]:
+  #   Sends an UNLOCK request and returns a response object.
+  #
+  # === Responses
+  #
+  # - {:close_on_empty_response}[rdoc-ref:Gem::Net::HTTP#close_on_empty_response]:
+  #   Returns whether to close connection on empty response.
+  # - {:close_on_empty_response=}[rdoc-ref:Gem::Net::HTTP#close_on_empty_response=]:
+  #   Sets whether to close connection on empty response.
+  # - {:ignore_eof}[rdoc-ref:Gem::Net::HTTP#ignore_eof]:
+  #   Returns whether to ignore end-of-file when reading a response body
+  #   with <tt>Content-Length</tt> headers.
+  # - {:ignore_eof=}[rdoc-ref:Gem::Net::HTTP#ignore_eof=]:
+  #   Sets whether to ignore end-of-file when reading a response body
+  #   with <tt>Content-Length</tt> headers.
+  # - {:response_body_encoding}[rdoc-ref:Gem::Net::HTTP#response_body_encoding]:
+  #   Returns the encoding to use for the response body.
+  # - {#response_body_encoding=}[rdoc-ref:Gem::Net::HTTP#response_body_encoding=]:
+  #   Sets the response body encoding.
+  #
+  # === Proxies
+  #
+  # - {:proxy_address}[rdoc-ref:Gem::Net::HTTP#proxy_address]:
+  #   Returns the proxy address.
+  # - {:proxy_address=}[rdoc-ref:Gem::Net::HTTP#proxy_address=]:
+  #   Sets the proxy address.
+  # - {::proxy_class?}[rdoc-ref:Gem::Net::HTTP.proxy_class?]:
+  #   Returns whether +self+ is a proxy class.
+  # - {#proxy?}[rdoc-ref:Gem::Net::HTTP#proxy?]:
+  #   Returns whether +self+ has a proxy.
+  # - {#proxy_address}[rdoc-ref:Gem::Net::HTTP#proxy_address]:
+  #   Returns the proxy address.
+  # - {#proxy_from_env?}[rdoc-ref:Gem::Net::HTTP#proxy_from_env?]:
+  #   Returns whether the proxy is taken from an environment variable.
+  # - {:proxy_from_env=}[rdoc-ref:Gem::Net::HTTP#proxy_from_env=]:
+  #   Sets whether the proxy is to be taken from an environment variable.
+  # - {:proxy_pass}[rdoc-ref:Gem::Net::HTTP#proxy_pass]:
+  #   Returns the proxy password.
+  # - {:proxy_pass=}[rdoc-ref:Gem::Net::HTTP#proxy_pass=]:
+  #   Sets the proxy password.
+  # - {:proxy_port}[rdoc-ref:Gem::Net::HTTP#proxy_port]:
+  #   Returns the proxy port.
+  # - {:proxy_port=}[rdoc-ref:Gem::Net::HTTP#proxy_port=]:
+  #   Sets the proxy port.
+  # - {#proxy_user}[rdoc-ref:Gem::Net::HTTP#proxy_user]:
+  #   Returns the proxy user name.
+  # - {:proxy_user=}[rdoc-ref:Gem::Net::HTTP#proxy_user=]:
+  #   Sets the proxy user.
+  #
+  # === Security
+  #
+  # - {:ca_file}[rdoc-ref:Gem::Net::HTTP#ca_file]:
+  #   Returns the path to a CA certification file.
+  # - {:ca_file=}[rdoc-ref:Gem::Net::HTTP#ca_file=]:
+  #   Sets the path to a CA certification file.
+  # - {:ca_path}[rdoc-ref:Gem::Net::HTTP#ca_path]:
+  #   Returns the path of to CA directory containing certification files.
+  # - {:ca_path=}[rdoc-ref:Gem::Net::HTTP#ca_path=]:
+  #   Sets the path of to CA directory containing certification files.
+  # - {:cert}[rdoc-ref:Gem::Net::HTTP#cert]:
+  #   Returns the OpenSSL::X509::Certificate object to be used for client certification.
+  # - {:cert=}[rdoc-ref:Gem::Net::HTTP#cert=]:
+  #   Sets the OpenSSL::X509::Certificate object to be used for client certification.
+  # - {:cert_store}[rdoc-ref:Gem::Net::HTTP#cert_store]:
+  #   Returns the X509::Store to be used for verifying peer certificate.
+  # - {:cert_store=}[rdoc-ref:Gem::Net::HTTP#cert_store=]:
+  #   Sets the X509::Store to be used for verifying peer certificate.
+  # - {:ciphers}[rdoc-ref:Gem::Net::HTTP#ciphers]:
+  #   Returns the available SSL ciphers.
+  # - {:ciphers=}[rdoc-ref:Gem::Net::HTTP#ciphers=]:
+  #   Sets the available SSL ciphers.
+  # - {:extra_chain_cert}[rdoc-ref:Gem::Net::HTTP#extra_chain_cert]:
+  #   Returns the extra X509 certificates to be added to the certificate chain.
+  # - {:extra_chain_cert=}[rdoc-ref:Gem::Net::HTTP#extra_chain_cert=]:
+  #   Sets the extra X509 certificates to be added to the certificate chain.
+  # - {:key}[rdoc-ref:Gem::Net::HTTP#key]:
+  #   Returns the OpenSSL::PKey::RSA or OpenSSL::PKey::DSA object.
+  # - {:key=}[rdoc-ref:Gem::Net::HTTP#key=]:
+  #   Sets the OpenSSL::PKey::RSA or OpenSSL::PKey::DSA object.
+  # - {:max_version}[rdoc-ref:Gem::Net::HTTP#max_version]:
+  #   Returns the maximum SSL version.
+  # - {:max_version=}[rdoc-ref:Gem::Net::HTTP#max_version=]:
+  #   Sets the maximum SSL version.
+  # - {:min_version}[rdoc-ref:Gem::Net::HTTP#min_version]:
+  #   Returns the minimum SSL version.
+  # - {:min_version=}[rdoc-ref:Gem::Net::HTTP#min_version=]:
+  #   Sets the minimum SSL version.
+  # - {#peer_cert}[rdoc-ref:Gem::Net::HTTP#peer_cert]:
+  #   Returns the X509 certificate chain for the session's socket peer.
+  # - {:ssl_version}[rdoc-ref:Gem::Net::HTTP#ssl_version]:
+  #   Returns the SSL version.
+  # - {:ssl_version=}[rdoc-ref:Gem::Net::HTTP#ssl_version=]:
+  #   Sets the SSL version.
+  # - {#use_ssl=}[rdoc-ref:Gem::Net::HTTP#use_ssl=]:
+  #   Sets whether a new session is to use Transport Layer Security.
+  # - {#use_ssl?}[rdoc-ref:Gem::Net::HTTP#use_ssl?]:
+  #   Returns whether +self+ uses SSL.
+  # - {:verify_callback}[rdoc-ref:Gem::Net::HTTP#verify_callback]:
+  #   Returns the callback for the server certification verification.
+  # - {:verify_callback=}[rdoc-ref:Gem::Net::HTTP#verify_callback=]:
+  #   Sets the callback for the server certification verification.
+  # - {:verify_depth}[rdoc-ref:Gem::Net::HTTP#verify_depth]:
+  #   Returns the maximum depth for the certificate chain verification.
+  # - {:verify_depth=}[rdoc-ref:Gem::Net::HTTP#verify_depth=]:
+  #   Sets the maximum depth for the certificate chain verification.
+  # - {:verify_hostname}[rdoc-ref:Gem::Net::HTTP#verify_hostname]:
+  #   Returns the flags for server the certification verification at the beginning of the SSL/TLS session.
+  # - {:verify_hostname=}[rdoc-ref:Gem::Net::HTTP#verify_hostname=]:
+  #   Sets he flags for server the certification verification at the beginning of the SSL/TLS session.
+  # - {:verify_mode}[rdoc-ref:Gem::Net::HTTP#verify_mode]:
+  #   Returns the flags for server the certification verification at the beginning of the SSL/TLS session.
+  # - {:verify_mode=}[rdoc-ref:Gem::Net::HTTP#verify_mode=]:
+  #   Sets the flags for server the certification verification at the beginning of the SSL/TLS session.
+  #
+  # === Addresses and Ports
+  #
+  # - {:address}[rdoc-ref:Gem::Net::HTTP#address]:
+  #   Returns the string host name or host IP.
+  # - {::default_port}[rdoc-ref:Gem::Net::HTTP.default_port]:
+  #   Returns integer 80, the default port to use for HTTP requests.
+  # - {::http_default_port}[rdoc-ref:Gem::Net::HTTP.http_default_port]:
+  #   Returns integer 80, the default port to use for HTTP requests.
+  # - {::https_default_port}[rdoc-ref:Gem::Net::HTTP.https_default_port]:
+  #   Returns integer 443, the default port to use for HTTPS requests.
+  # - {#ipaddr}[rdoc-ref:Gem::Net::HTTP#ipaddr]:
+  #   Returns the IP address for the connection.
+  # - {#ipaddr=}[rdoc-ref:Gem::Net::HTTP#ipaddr=]:
+  #   Sets the IP address for the connection.
+  # - {:local_host}[rdoc-ref:Gem::Net::HTTP#local_host]:
+  #   Returns the string local host used to establish the connection.
+  # - {:local_host=}[rdoc-ref:Gem::Net::HTTP#local_host=]:
+  #   Sets the string local host used to establish the connection.
+  # - {:local_port}[rdoc-ref:Gem::Net::HTTP#local_port]:
+  #   Returns the integer local port used to establish the connection.
+  # - {:local_port=}[rdoc-ref:Gem::Net::HTTP#local_port=]:
+  #   Sets the integer local port used to establish the connection.
+  # - {:port}[rdoc-ref:Gem::Net::HTTP#port]:
+  #   Returns the integer port number.
+  #
+  # === \HTTP Version
+  #
+  # - {::version_1_2?}[rdoc-ref:Gem::Net::HTTP.version_1_2?]
+  #   (aliased as {::version_1_2}[rdoc-ref:Gem::Net::HTTP.version_1_2]):
+  #   Returns true; retained for compatibility.
+  #
+  # === Debugging
+  #
+  # - {#set_debug_output}[rdoc-ref:Gem::Net::HTTP#set_debug_output]:
+  #   Sets the output stream for debugging.
+  #
+  class HTTP < Protocol
+
+    # :stopdoc:
+    VERSION = "0.6.0"
+    HTTPVersion = '1.1'
+    begin
+      require 'zlib'
+      HAVE_ZLIB=true
+    rescue LoadError
+      HAVE_ZLIB=false
+    end
+    # :startdoc:
+
+    # Returns +true+; retained for compatibility.
+    def HTTP.version_1_2
+      true
+    end
+
+    # Returns +true+; retained for compatibility.
+    def HTTP.version_1_2?
+      true
+    end
+
+    # Returns +false+; retained for compatibility.
+    def HTTP.version_1_1?  #:nodoc:
+      false
+    end
+
+    class << HTTP
+      alias is_version_1_1? version_1_1?   #:nodoc:
+      alias is_version_1_2? version_1_2?   #:nodoc:
+    end
+
+    # :call-seq:
+    #   Gem::Net::HTTP.get_print(hostname, path, port = 80) -> nil
+    #   Gem::Net::HTTP:get_print(uri, headers = {}, port = uri.port) -> nil
+    #
+    # Like Gem::Net::HTTP.get, but writes the returned body to $stdout;
+    # returns +nil+.
+    def HTTP.get_print(uri_or_host, path_or_headers = nil, port = nil)
+      get_response(uri_or_host, path_or_headers, port) {|res|
+        res.read_body do |chunk|
+          $stdout.print chunk
+        end
+      }
+      nil
+    end
+
+    # :call-seq:
+    #   Gem::Net::HTTP.get(hostname, path, port = 80) -> body
+    #   Gem::Net::HTTP:get(uri, headers = {}, port = uri.port) -> body
+    #
+    # Sends a GET request and returns the \HTTP response body as a string.
+    #
+    # With string arguments +hostname+ and +path+:
+    #
+    #   hostname = 'jsonplaceholder.typicode.com'
+    #   path = '/todos/1'
+    #   puts Gem::Net::HTTP.get(hostname, path)
+    #
+    # Output:
+    #
+    #   {
+    #     "userId": 1,
+    #     "id": 1,
+    #     "title": "delectus aut autem",
+    #     "completed": false
+    #   }
+    #
+    # With URI object +uri+ and optional hash argument +headers+:
+    #
+    #   uri = Gem::URI('https://jsonplaceholder.typicode.com/todos/1')
+    #   headers = {'Content-type' => 'application/json; charset=UTF-8'}
+    #   Gem::Net::HTTP.get(uri, headers)
+    #
+    # Related:
+    #
+    # - Gem::Net::HTTP::Get: request class for \HTTP method +GET+.
+    # - Gem::Net::HTTP#get: convenience method for \HTTP method +GET+.
+    #
+    def HTTP.get(uri_or_host, path_or_headers = nil, port = nil)
+      get_response(uri_or_host, path_or_headers, port).body
+    end
+
+    # :call-seq:
+    #   Gem::Net::HTTP.get_response(hostname, path, port = 80) -> http_response
+    #   Gem::Net::HTTP:get_response(uri, headers = {}, port = uri.port) -> http_response
+    #
+    # Like Gem::Net::HTTP.get, but returns a Gem::Net::HTTPResponse object
+    # instead of the body string.
+    def HTTP.get_response(uri_or_host, path_or_headers = nil, port = nil, &block)
+      if path_or_headers && !path_or_headers.is_a?(Hash)
+        host = uri_or_host
+        path = path_or_headers
+        new(host, port || HTTP.default_port).start {|http|
+          return http.request_get(path, &block)
+        }
+      else
+        uri = uri_or_host
+        headers = path_or_headers
+        start(uri.hostname, uri.port,
+              :use_ssl => uri.scheme == 'https') {|http|
+          return http.request_get(uri, headers, &block)
+        }
+      end
+    end
+
+    # Posts data to a host; returns a Gem::Net::HTTPResponse object.
+    #
+    # Argument +url+ must be a URL;
+    # argument +data+ must be a string:
+    #
+    #   _uri = uri.dup
+    #   _uri.path = '/posts'
+    #   data = '{"title": "foo", "body": "bar", "userId": 1}'
+    #   headers = {'content-type': 'application/json'}
+    #   res = Gem::Net::HTTP.post(_uri, data, headers) # => #<Gem::Net::HTTPCreated 201 Created readbody=true>
+    #   puts res.body
+    #
+    # Output:
+    #
+    #   {
+    #     "title": "foo",
+    #     "body": "bar",
+    #     "userId": 1,
+    #     "id": 101
+    #   }
+    #
+    # Related:
+    #
+    # - Gem::Net::HTTP::Post: request class for \HTTP method +POST+.
+    # - Gem::Net::HTTP#post: convenience method for \HTTP method +POST+.
+    #
+    def HTTP.post(url, data, header = nil)
+      start(url.hostname, url.port,
+            :use_ssl => url.scheme == 'https' ) {|http|
+        http.post(url, data, header)
+      }
+    end
+
+    # Posts data to a host; returns a Gem::Net::HTTPResponse object.
+    #
+    # Argument +url+ must be a URI;
+    # argument +data+ must be a hash:
+    #
+    #   _uri = uri.dup
+    #   _uri.path = '/posts'
+    #   data = {title: 'foo', body: 'bar', userId: 1}
+    #   res = Gem::Net::HTTP.post_form(_uri, data) # => #<Gem::Net::HTTPCreated 201 Created readbody=true>
+    #   puts res.body
+    #
+    # Output:
+    #
+    #   {
+    #     "title": "foo",
+    #     "body": "bar",
+    #     "userId": "1",
+    #     "id": 101
+    #   }
+    #
+    def HTTP.post_form(url, params)
+      req = Post.new(url)
+      req.form_data = params
+      req.basic_auth url.user, url.password if url.user
+      start(url.hostname, url.port,
+            :use_ssl => url.scheme == 'https' ) {|http|
+        http.request(req)
+      }
+    end
+
+    # Sends a PUT request to the server; returns a Gem::Net::HTTPResponse object.
+    #
+    # Argument +url+ must be a URL;
+    # argument +data+ must be a string:
+    #
+    #   _uri = uri.dup
+    #   _uri.path = '/posts'
+    #   data = '{"title": "foo", "body": "bar", "userId": 1}'
+    #   headers = {'content-type': 'application/json'}
+    #   res = Gem::Net::HTTP.put(_uri, data, headers) # => #<Gem::Net::HTTPCreated 201 Created readbody=true>
+    #   puts res.body
+    #
+    # Output:
+    #
+    #   {
+    #     "title": "foo",
+    #     "body": "bar",
+    #     "userId": 1,
+    #     "id": 101
+    #   }
+    #
+    # Related:
+    #
+    # - Gem::Net::HTTP::Put: request class for \HTTP method +PUT+.
+    # - Gem::Net::HTTP#put: convenience method for \HTTP method +PUT+.
+    #
+    def HTTP.put(url, data, header = nil)
+      start(url.hostname, url.port,
+            :use_ssl => url.scheme == 'https' ) {|http|
+        http.put(url, data, header)
+      }
+    end
+
+    #
+    # \HTTP session management
+    #
+
+    # Returns integer +80+, the default port to use for \HTTP requests:
+    #
+    #   Gem::Net::HTTP.default_port # => 80
+    #
+    def HTTP.default_port
+      http_default_port()
+    end
+
+    # Returns integer +80+, the default port to use for \HTTP requests:
+    #
+    #   Gem::Net::HTTP.http_default_port # => 80
+    #
+    def HTTP.http_default_port
+      80
+    end
+
+    # Returns integer +443+, the default port to use for HTTPS requests:
+    #
+    #   Gem::Net::HTTP.https_default_port # => 443
+    #
+    def HTTP.https_default_port
+      443
+    end
+
+    def HTTP.socket_type   #:nodoc: obsolete
+      BufferedIO
+    end
+
+    # :call-seq:
+    #   HTTP.start(address, port = nil, p_addr = :ENV, p_port = nil, p_user = nil, p_pass = nil, opts) -> http
+    #   HTTP.start(address, port = nil, p_addr = :ENV, p_port = nil, p_user = nil, p_pass = nil, opts) {|http| ... } -> object
+    #
+    # Creates a new \Gem::Net::HTTP object, +http+, via \Gem::Net::HTTP.new:
+    #
+    # - For arguments +address+ and +port+, see Gem::Net::HTTP.new.
+    # - For proxy-defining arguments +p_addr+ through +p_pass+,
+    #   see {Proxy Server}[rdoc-ref:Gem::Net::HTTP@Proxy+Server].
+    # - For argument +opts+, see below.
+    #
+    # With no block given:
+    #
+    # - Calls <tt>http.start</tt> with no block (see #start),
+    #   which opens a TCP connection and \HTTP session.
+    # - Returns +http+.
+    # - The caller should call #finish to close the session:
+    #
+    #     http = Gem::Net::HTTP.start(hostname)
+    #     http.started? # => true
+    #     http.finish
+    #     http.started? # => false
+    #
+    # With a block given:
+    #
+    # - Calls <tt>http.start</tt> with the block (see #start), which:
+    #
+    #   - Opens a TCP connection and \HTTP session.
+    #   - Calls the block,
+    #     which may make any number of requests to the host.
+    #   - Closes the \HTTP session and TCP connection on block exit.
+    #   - Returns the block's value +object+.
+    #
+    # - Returns +object+.
+    #
+    # Example:
+    #
+    #   hostname = 'jsonplaceholder.typicode.com'
+    #   Gem::Net::HTTP.start(hostname) do |http|
+    #     puts http.get('/todos/1').body
+    #     puts http.get('/todos/2').body
+    #   end
+    #
+    # Output:
+    #
+    #   {
+    #     "userId": 1,
+    #     "id": 1,
+    #     "title": "delectus aut autem",
+    #     "completed": false
+    #   }
+    #   {
+    #     "userId": 1,
+    #     "id": 2,
+    #     "title": "quis ut nam facilis et officia qui",
+    #     "completed": false
+    #   }
+    #
+    # If the last argument given is a hash, it is the +opts+ hash,
+    # where each key is a method or accessor to be called,
+    # and its value is the value to be set.
+    #
+    # The keys may include:
+    #
+    # - #ca_file
+    # - #ca_path
+    # - #cert
+    # - #cert_store
+    # - #ciphers
+    # - #close_on_empty_response
+    # - +ipaddr+ (calls #ipaddr=)
+    # - #keep_alive_timeout
+    # - #key
+    # - #open_timeout
+    # - #read_timeout
+    # - #ssl_timeout
+    # - #ssl_version
+    # - +use_ssl+ (calls #use_ssl=)
+    # - #verify_callback
+    # - #verify_depth
+    # - #verify_mode
+    # - #write_timeout
+    #
+    # Note: If +port+ is +nil+ and <tt>opts[:use_ssl]</tt> is a truthy value,
+    # the value passed to +new+ is Gem::Net::HTTP.https_default_port, not +port+.
+    #
+    def HTTP.start(address, *arg, &block) # :yield: +http+
+      arg.pop if opt = Hash.try_convert(arg[-1])
+      port, p_addr, p_port, p_user, p_pass = *arg
+      p_addr = :ENV if arg.size < 2
+      port = https_default_port if !port && opt && opt[:use_ssl]
+      http = new(address, port, p_addr, p_port, p_user, p_pass)
+      http.ipaddr = opt[:ipaddr] if opt && opt[:ipaddr]
+
+      if opt
+        if opt[:use_ssl]
+          opt = {verify_mode: OpenSSL::SSL::VERIFY_PEER}.update(opt)
+        end
+        http.methods.grep(/\A(\w+)=\z/) do |meth|
+          key = $1.to_sym
+          opt.key?(key) or next
+          http.__send__(meth, opt[key])
+        end
+      end
+
+      http.start(&block)
+    end
+
+    class << HTTP
+      alias newobj new # :nodoc:
+    end
+
+    # Returns a new \Gem::Net::HTTP object +http+
+    # (but does not open a TCP connection or \HTTP session).
+    #
+    # With only string argument +address+ given
+    # (and <tt>ENV['http_proxy']</tt> undefined or +nil+),
+    # the returned +http+:
+    #
+    # - Has the given address.
+    # - Has the default port number, Gem::Net::HTTP.default_port (80).
+    # - Has no proxy.
+    #
+    # Example:
+    #
+    #   http = Gem::Net::HTTP.new(hostname)
+    #   # => #<Gem::Net::HTTP jsonplaceholder.typicode.com:80 open=false>
+    #   http.address # => "jsonplaceholder.typicode.com"
+    #   http.port    # => 80
+    #   http.proxy?  # => false
+    #
+    # With integer argument +port+ also given,
+    # the returned +http+ has the given port:
+    #
+    #   http = Gem::Net::HTTP.new(hostname, 8000)
+    #   # => #<Gem::Net::HTTP jsonplaceholder.typicode.com:8000 open=false>
+    #   http.port # => 8000
+    #
+    # For proxy-defining arguments +p_addr+ through +p_no_proxy+,
+    # see {Proxy Server}[rdoc-ref:Gem::Net::HTTP@Proxy+Server].
+    #
+    def HTTP.new(address, port = nil, p_addr = :ENV, p_port = nil, p_user = nil, p_pass = nil, p_no_proxy = nil, p_use_ssl = nil)
+      http = super address, port
+
+      if proxy_class? then # from Gem::Net::HTTP::Proxy()
+        http.proxy_from_env = @proxy_from_env
+        http.proxy_address  = @proxy_address
+        http.proxy_port     = @proxy_port
+        http.proxy_user     = @proxy_user
+        http.proxy_pass     = @proxy_pass
+        http.proxy_use_ssl  = @proxy_use_ssl
+      elsif p_addr == :ENV then
+        http.proxy_from_env = true
+      else
+        if p_addr && p_no_proxy && !Gem::URI::Generic.use_proxy?(address, address, port, p_no_proxy)
+          p_addr = nil
+          p_port = nil
+        end
+        http.proxy_address = p_addr
+        http.proxy_port    = p_port || default_port
+        http.proxy_user    = p_user
+        http.proxy_pass    = p_pass
+        http.proxy_use_ssl = p_use_ssl
+      end
+
+      http
+    end
+
+    class << HTTP
+      # Allows to set the default configuration that will be used
+      # when creating a new connection.
+      #
+      # Example:
+      #
+      #   Gem::Net::HTTP.default_configuration = {
+      #     read_timeout: 1,
+      #     write_timeout: 1
+      #   }
+      #   http = Gem::Net::HTTP.new(hostname)
+      #   http.open_timeout   # => 60
+      #   http.read_timeout   # => 1
+      #   http.write_timeout  # => 1
+      #
+      attr_accessor :default_configuration
+    end
+
+    # Creates a new \Gem::Net::HTTP object for the specified server address,
+    # without opening the TCP connection or initializing the \HTTP session.
+    # The +address+ should be a DNS hostname or IP address.
+    def initialize(address, port = nil) # :nodoc:
+      defaults = {
+        keep_alive_timeout: 2,
+        close_on_empty_response: false,
+        open_timeout: 60,
+        read_timeout: 60,
+        write_timeout: 60,
+        continue_timeout: nil,
+        max_retries: 1,
+        debug_output: nil,
+        response_body_encoding: false,
+        ignore_eof: true
+      }
+      options = defaults.merge(self.class.default_configuration || {})
+
+      @address = address
+      @port    = (port || HTTP.default_port)
+      @ipaddr = nil
+      @local_host = nil
+      @local_port = nil
+      @curr_http_version = HTTPVersion
+      @keep_alive_timeout = options[:keep_alive_timeout]
+      @last_communicated = nil
+      @close_on_empty_response = options[:close_on_empty_response]
+      @socket  = nil
+      @started = false
+      @open_timeout = options[:open_timeout]
+      @read_timeout = options[:read_timeout]
+      @write_timeout = options[:write_timeout]
+      @continue_timeout = options[:continue_timeout]
+      @max_retries = options[:max_retries]
+      @debug_output = options[:debug_output]
+      @response_body_encoding = options[:response_body_encoding]
+      @ignore_eof = options[:ignore_eof]
+
+      @proxy_from_env = false
+      @proxy_uri      = nil
+      @proxy_address  = nil
+      @proxy_port     = nil
+      @proxy_user     = nil
+      @proxy_pass     = nil
+      @proxy_use_ssl  = nil
+
+      @use_ssl = false
+      @ssl_context = nil
+      @ssl_session = nil
+      @sspi_enabled = false
+      SSL_IVNAMES.each do |ivname|
+        instance_variable_set ivname, nil
+      end
+    end
+
+    # Returns a string representation of +self+:
+    #
+    #   Gem::Net::HTTP.new(hostname).inspect
+    #   # => "#<Gem::Net::HTTP jsonplaceholder.typicode.com:80 open=false>"
+    #
+    def inspect
+      "#<#{self.class} #{@address}:#{@port} open=#{started?}>"
+    end
+
+    # *WARNING* This method opens a serious security hole.
+    # Never use this method in production code.
+    #
+    # Sets the output stream for debugging:
+    #
+    #   http = Gem::Net::HTTP.new(hostname)
+    #   File.open('t.tmp', 'w') do |file|
+    #     http.set_debug_output(file)
+    #     http.start
+    #     http.get('/nosuch/1')
+    #     http.finish
+    #   end
+    #   puts File.read('t.tmp')
+    #
+    # Output:
+    #
+    #   opening connection to jsonplaceholder.typicode.com:80...
+    #   opened
+    #   <- "GET /nosuch/1 HTTP/1.1\r\nAccept-Encoding: gzip;q=1.0,deflate;q=0.6,identity;q=0.3\r\nAccept: */*\r\nUser-Agent: Ruby\r\nHost: jsonplaceholder.typicode.com\r\n\r\n"
+    #   -> "HTTP/1.1 404 Not Found\r\n"
+    #   -> "Date: Mon, 12 Dec 2022 21:14:11 GMT\r\n"
+    #   -> "Content-Type: application/json; charset=utf-8\r\n"
+    #   -> "Content-Length: 2\r\n"
+    #   -> "Connection: keep-alive\r\n"
+    #   -> "X-Powered-By: Express\r\n"
+    #   -> "X-Ratelimit-Limit: 1000\r\n"
+    #   -> "X-Ratelimit-Remaining: 999\r\n"
+    #   -> "X-Ratelimit-Reset: 1670879660\r\n"
+    #   -> "Vary: Origin, Accept-Encoding\r\n"
+    #   -> "Access-Control-Allow-Credentials: true\r\n"
+    #   -> "Cache-Control: max-age=43200\r\n"
+    #   -> "Pragma: no-cache\r\n"
+    #   -> "Expires: -1\r\n"
+    #   -> "X-Content-Type-Options: nosniff\r\n"
+    #   -> "Etag: W/\"2-vyGp6PvFo4RvsFtPoIWeCReyIC8\"\r\n"
+    #   -> "Via: 1.1 vegur\r\n"
+    #   -> "CF-Cache-Status: MISS\r\n"
+    #   -> "Server-Timing: cf-q-config;dur=1.3000000762986e-05\r\n"
+    #   -> "Report-To: {\"endpoints\":[{\"url\":\"https:\\/\\/a.nel.cloudflare.com\\/report\\/v3?s=yOr40jo%2BwS1KHzhTlVpl54beJ5Wx2FcG4gGV0XVrh3X9OlR5q4drUn2dkt5DGO4GDcE%2BVXT7CNgJvGs%2BZleIyMu8CLieFiDIvOviOY3EhHg94m0ZNZgrEdpKD0S85S507l1vsEwEHkoTm%2Ff19SiO\"}],\"group\":\"cf-nel\",\"max_age\":604800}\r\n"
+    #   -> "NEL: {\"success_fraction\":0,\"report_to\":\"cf-nel\",\"max_age\":604800}\r\n"
+    #   -> "Server: cloudflare\r\n"
+    #   -> "CF-RAY: 778977dc484ce591-DFW\r\n"
+    #   -> "alt-svc: h3=\":443\"; ma=86400, h3-29=\":443\"; ma=86400\r\n"
+    #   -> "\r\n"
+    #   reading 2 bytes...
+    #   -> "{}"
+    #   read 2 bytes
+    #   Conn keep-alive
+    #
+    def set_debug_output(output)
+      warn 'Gem::Net::HTTP#set_debug_output called after HTTP started', uplevel: 1 if started?
+      @debug_output = output
+    end
+
+    # Returns the string host name or host IP given as argument +address+ in ::new.
+    attr_reader :address
+
+    # Returns the integer port number given as argument +port+ in ::new.
+    attr_reader :port
+
+    # Sets or returns the string local host used to establish the connection;
+    # initially +nil+.
+    attr_accessor :local_host
+
+    # Sets or returns the integer local port used to establish the connection;
+    # initially +nil+.
+    attr_accessor :local_port
+
+    # Returns the encoding to use for the response body;
+    # see #response_body_encoding=.
+    attr_reader :response_body_encoding
+
+    # Sets the encoding to be used for the response body;
+    # returns the encoding.
+    #
+    # The given +value+ may be:
+    #
+    # - An Encoding object.
+    # - The name of an encoding.
+    # - An alias for an encoding name.
+    #
+    # See {Encoding}[https://docs.ruby-lang.org/en/master/Encoding.html].
+    #
+    # Examples:
+    #
+    #   http = Gem::Net::HTTP.new(hostname)
+    #   http.response_body_encoding = Encoding::US_ASCII # => #<Encoding:US-ASCII>
+    #   http.response_body_encoding = 'US-ASCII'         # => "US-ASCII"
+    #   http.response_body_encoding = 'ASCII'            # => "ASCII"
+    #
+    def response_body_encoding=(value)
+      value = Encoding.find(value) if value.is_a?(String)
+      @response_body_encoding = value
+    end
+
+    # Sets whether to determine the proxy from environment variable
+    # '<tt>ENV['http_proxy']</tt>';
+    # see {Proxy Using ENV['http_proxy']}[rdoc-ref:Gem::Net::HTTP@Proxy+Using+-27ENV-5B-27http_proxy-27-5D-27].
+    attr_writer :proxy_from_env
+
+    # Sets the proxy address;
+    # see {Proxy Server}[rdoc-ref:Gem::Net::HTTP@Proxy+Server].
+    attr_writer :proxy_address
+
+    # Sets the proxy port;
+    # see {Proxy Server}[rdoc-ref:Gem::Net::HTTP@Proxy+Server].
+    attr_writer :proxy_port
+
+    # Sets the proxy user;
+    # see {Proxy Server}[rdoc-ref:Gem::Net::HTTP@Proxy+Server].
+    attr_writer :proxy_user
+
+    # Sets the proxy password;
+    # see {Proxy Server}[rdoc-ref:Gem::Net::HTTP@Proxy+Server].
+    attr_writer :proxy_pass
+    attr_writer :proxy_use_ssl
+
+    # Returns the IP address for the connection.
+    #
+    # If the session has not been started,
+    # returns the value set by #ipaddr=,
+    # or +nil+ if it has not been set:
+    #
+    #   http = Gem::Net::HTTP.new(hostname)
+    #   http.ipaddr # => nil
+    #   http.ipaddr = '172.67.155.76'
+    #   http.ipaddr # => "172.67.155.76"
+    #
+    # If the session has been started,
+    # returns the IP address from the socket:
+    #
+    #   http = Gem::Net::HTTP.new(hostname)
+    #   http.start
+    #   http.ipaddr # => "172.67.155.76"
+    #   http.finish
+    #
+    def ipaddr
+      started? ?  @socket.io.peeraddr[3] : @ipaddr
+    end
+
+    # Sets the IP address for the connection:
+    #
+    #   http = Gem::Net::HTTP.new(hostname)
+    #   http.ipaddr # => nil
+    #   http.ipaddr = '172.67.155.76'
+    #   http.ipaddr # => "172.67.155.76"
+    #
+    # The IP address may not be set if the session has been started.
+    def ipaddr=(addr)
+      raise IOError, "ipaddr value changed, but session already started" if started?
+      @ipaddr = addr
+    end
+
+    # Sets or returns the numeric (\Integer or \Float) number of seconds
+    # to wait for a connection to open;
+    # initially 60.
+    # If the connection is not made in the given interval,
+    # an exception is raised.
+    attr_accessor :open_timeout
+
+    # Returns the numeric (\Integer or \Float) number of seconds
+    # to wait for one block to be read (via one read(2) call);
+    # see #read_timeout=.
+    attr_reader :read_timeout
+
+    # Returns the numeric (\Integer or \Float) number of seconds
+    # to wait for one block to be written (via one write(2) call);
+    # see #write_timeout=.
+    attr_reader :write_timeout
+
+    # Sets the maximum number of times to retry an idempotent request in case of
+    # \Gem::Net::ReadTimeout, IOError, EOFError, Errno::ECONNRESET,
+    # Errno::ECONNABORTED, Errno::EPIPE, OpenSSL::SSL::SSLError,
+    # Gem::Timeout::Error.
+    # The initial value is 1.
+    #
+    # Argument +retries+ must be a non-negative numeric value:
+    #
+    #   http = Gem::Net::HTTP.new(hostname)
+    #   http.max_retries = 2   # => 2
+    #   http.max_retries       # => 2
+    #
+    def max_retries=(retries)
+      retries = retries.to_int
+      if retries < 0
+        raise ArgumentError, 'max_retries should be non-negative integer number'
+      end
+      @max_retries = retries
+    end
+
+    # Returns the maximum number of times to retry an idempotent request;
+    # see #max_retries=.
+    attr_reader :max_retries
+
+    # Sets the read timeout, in seconds, for +self+ to integer +sec+;
+    # the initial value is 60.
+    #
+    # Argument +sec+ must be a non-negative numeric value:
+    #
+    #   http = Gem::Net::HTTP.new(hostname)
+    #   http.read_timeout # => 60
+    #   http.get('/todos/1') # => #<Gem::Net::HTTPOK 200 OK readbody=true>
+    #   http.read_timeout = 0
+    #   http.get('/todos/1') # Raises Gem::Net::ReadTimeout.
+    #
+    def read_timeout=(sec)
+      @socket.read_timeout = sec if @socket
+      @read_timeout = sec
+    end
+
+    # Sets the write timeout, in seconds, for +self+ to integer +sec+;
+    # the initial value is 60.
+    #
+    # Argument +sec+ must be a non-negative numeric value:
+    #
+    #   _uri = uri.dup
+    #   _uri.path = '/posts'
+    #   body = 'bar' * 200000
+    #   data = <<EOF
+    #   {"title": "foo", "body": "#{body}", "userId": "1"}
+    #   EOF
+    #   headers = {'content-type': 'application/json'}
+    #   http = Gem::Net::HTTP.new(hostname)
+    #   http.write_timeout # => 60
+    #   http.post(_uri.path, data, headers)
+    #   # => #<Gem::Net::HTTPCreated 201 Created readbody=true>
+    #   http.write_timeout = 0
+    #   http.post(_uri.path, data, headers) # Raises Gem::Net::WriteTimeout.
+    #
+    def write_timeout=(sec)
+      @socket.write_timeout = sec if @socket
+      @write_timeout = sec
+    end
+
+    # Returns the continue timeout value;
+    # see continue_timeout=.
+    attr_reader :continue_timeout
+
+    # Sets the continue timeout value,
+    # which is the number of seconds to wait for an expected 100 Continue response.
+    # If the \HTTP object does not receive a response in this many seconds
+    # it sends the request body.
+    def continue_timeout=(sec)
+      @socket.continue_timeout = sec if @socket
+      @continue_timeout = sec
+    end
+
+    # Sets or returns the numeric (\Integer or \Float) number of seconds
+    # to keep the connection open after a request is sent;
+    # initially 2.
+    # If a new request is made during the given interval,
+    # the still-open connection is used;
+    # otherwise the connection will have been closed
+    # and a new connection is opened.
+    attr_accessor :keep_alive_timeout
+
+    # Sets or returns whether to ignore end-of-file when reading a response body
+    # with <tt>Content-Length</tt> headers;
+    # initially +true+.
+    attr_accessor :ignore_eof
+
+    # Returns +true+ if the \HTTP session has been started:
+    #
+    #   http = Gem::Net::HTTP.new(hostname)
+    #   http.started? # => false
+    #   http.start
+    #   http.started? # => true
+    #   http.finish # => nil
+    #   http.started? # => false
+    #
+    #   Gem::Net::HTTP.start(hostname) do |http|
+    #     http.started?
+    #   end # => true
+    #   http.started? # => false
+    #
+    def started?
+      @started
+    end
+
+    alias active? started?   #:nodoc: obsolete
+
+    # Sets or returns whether to close the connection when the response is empty;
+    # initially +false+.
+    attr_accessor :close_on_empty_response
+
+    # Returns +true+ if +self+ uses SSL, +false+ otherwise.
+    # See Gem::Net::HTTP#use_ssl=.
+    def use_ssl?
+      @use_ssl
+    end
+
+    # Sets whether a new session is to use
+    # {Transport Layer Security}[https://en.wikipedia.org/wiki/Transport_Layer_Security]:
+    #
+    # Raises IOError if attempting to change during a session.
+    #
+    # Raises OpenSSL::SSL::SSLError if the port is not an HTTPS port.
+    def use_ssl=(flag)
+      flag = flag ? true : false
+      if started? and @use_ssl != flag
+        raise IOError, "use_ssl value changed, but session already started"
+      end
+      @use_ssl = flag
+    end
+
+    SSL_ATTRIBUTES = [
+      :ca_file,
+      :ca_path,
+      :cert,
+      :cert_store,
+      :ciphers,
+      :extra_chain_cert,
+      :key,
+      :ssl_timeout,
+      :ssl_version,
+      :min_version,
+      :max_version,
+      :verify_callback,
+      :verify_depth,
+      :verify_mode,
+      :verify_hostname,
+    ] # :nodoc:
+
+    SSL_IVNAMES = SSL_ATTRIBUTES.map { |a| "@#{a}".to_sym } # :nodoc:
+
+    # Sets or returns the path to a CA certification file in PEM format.
+    attr_accessor :ca_file
+
+    # Sets or returns the path of to CA directory
+    # containing certification files in PEM format.
+    attr_accessor :ca_path
+
+    # Sets or returns the OpenSSL::X509::Certificate object
+    # to be used for client certification.
+    attr_accessor :cert
+
+    # Sets or returns the X509::Store to be used for verifying peer certificate.
+    attr_accessor :cert_store
+
+    # Sets or returns the available SSL ciphers.
+    # See {OpenSSL::SSL::SSLContext#ciphers=}[OpenSSL::SSL::SSL::Context#ciphers=].
+    attr_accessor :ciphers
+
+    # Sets or returns the extra X509 certificates to be added to the certificate chain.
+    # See {OpenSSL::SSL::SSLContext#add_certificate}[OpenSSL::SSL::SSL::Context#add_certificate].
+    attr_accessor :extra_chain_cert
+
+    # Sets or returns the OpenSSL::PKey::RSA or OpenSSL::PKey::DSA object.
+    attr_accessor :key
+
+    # Sets or returns the SSL timeout seconds.
+    attr_accessor :ssl_timeout
+
+    # Sets or returns the SSL version.
+    # See {OpenSSL::SSL::SSLContext#ssl_version=}[OpenSSL::SSL::SSL::Context#ssl_version=].
+    attr_accessor :ssl_version
+
+    # Sets or returns the minimum SSL version.
+    # See {OpenSSL::SSL::SSLContext#min_version=}[OpenSSL::SSL::SSL::Context#min_version=].
+    attr_accessor :min_version
+
+    # Sets or returns the maximum SSL version.
+    # See {OpenSSL::SSL::SSLContext#max_version=}[OpenSSL::SSL::SSL::Context#max_version=].
+    attr_accessor :max_version
+
+    # Sets or returns the callback for the server certification verification.
+    attr_accessor :verify_callback
+
+    # Sets or returns the maximum depth for the certificate chain verification.
+    attr_accessor :verify_depth
+
+    # Sets or returns the flags for server the certification verification
+    # at the beginning of the SSL/TLS session.
+    # OpenSSL::SSL::VERIFY_NONE or OpenSSL::SSL::VERIFY_PEER are acceptable.
+    attr_accessor :verify_mode
+
+    # Sets or returns whether to verify that the server certificate is valid
+    # for the hostname.
+    # See {OpenSSL::SSL::SSLContext#verify_hostname=}[OpenSSL::SSL::SSL::Context#verify_hostname=].
+    attr_accessor :verify_hostname
+
+    # Returns the X509 certificate chain (an array of strings)
+    # for the session's socket peer,
+    # or +nil+ if none.
+    def peer_cert
+      if not use_ssl? or not @socket
+        return nil
+      end
+      @socket.io.peer_cert
+    end
+
+    # Starts an \HTTP session.
+    #
+    # Without a block, returns +self+:
+    #
+    #   http = Gem::Net::HTTP.new(hostname)
+    #   # => #<Gem::Net::HTTP jsonplaceholder.typicode.com:80 open=false>
+    #   http.start
+    #   # => #<Gem::Net::HTTP jsonplaceholder.typicode.com:80 open=true>
+    #   http.started? # => true
+    #   http.finish
+    #
+    # With a block, calls the block with +self+,
+    # finishes the session when the block exits,
+    # and returns the block's value:
+    #
+    #   http.start do |http|
+    #     http
+    #   end
+    #   # => #<Gem::Net::HTTP jsonplaceholder.typicode.com:80 open=false>
+    #   http.started? # => false
+    #
+    def start  # :yield: http
+      raise IOError, 'HTTP session already opened' if @started
+      if block_given?
+        begin
+          do_start
+          return yield(self)
+        ensure
+          do_finish
+        end
+      end
+      do_start
+      self
+    end
+
+    def do_start
+      connect
+      @started = true
+    end
+    private :do_start
+
+    def connect
+      if use_ssl?
+        # reference early to load OpenSSL before connecting,
+        # as OpenSSL may take time to load.
+        @ssl_context = OpenSSL::SSL::SSLContext.new
+      end
+
+      if proxy? then
+        conn_addr = proxy_address
+        conn_port = proxy_port
+      else
+        conn_addr = conn_address
+        conn_port = port
+      end
+
+      debug "opening connection to #{conn_addr}:#{conn_port}..."
+      s = Gem::Timeout.timeout(@open_timeout, Gem::Net::OpenTimeout) {
+        begin
+          TCPSocket.open(conn_addr, conn_port, @local_host, @local_port)
+        rescue => e
+          raise e, "Failed to open TCP connection to " +
+            "#{conn_addr}:#{conn_port} (#{e.message})"
+        end
+      }
+      s.setsockopt(Socket::IPPROTO_TCP, Socket::TCP_NODELAY, 1)
+      debug "opened"
+      if use_ssl?
+        if proxy?
+          if @proxy_use_ssl
+            proxy_sock = OpenSSL::SSL::SSLSocket.new(s)
+            ssl_socket_connect(proxy_sock, @open_timeout)
+          else
+            proxy_sock = s
+          end
+          proxy_sock = BufferedIO.new(proxy_sock, read_timeout: @read_timeout,
+                                      write_timeout: @write_timeout,
+                                      continue_timeout: @continue_timeout,
+                                      debug_output: @debug_output)
+          buf = +"CONNECT #{conn_address}:#{@port} HTTP/#{HTTPVersion}\r\n" \
+            "Host: #{@address}:#{@port}\r\n"
+          if proxy_user
+            credential = ["#{proxy_user}:#{proxy_pass}"].pack('m0')
+            buf << "Proxy-Authorization: Basic #{credential}\r\n"
+          end
+          buf << "\r\n"
+          proxy_sock.write(buf)
+          HTTPResponse.read_new(proxy_sock).value
+          # assuming nothing left in buffers after successful CONNECT response
+        end
+
+        ssl_parameters = Hash.new
+        iv_list = instance_variables
+        SSL_IVNAMES.each_with_index do |ivname, i|
+          if iv_list.include?(ivname)
+            value = instance_variable_get(ivname)
+            unless value.nil?
+              ssl_parameters[SSL_ATTRIBUTES[i]] = value
+            end
+          end
+        end
+        @ssl_context.set_params(ssl_parameters)
+        unless @ssl_context.session_cache_mode.nil? # a dummy method on JRuby
+          @ssl_context.session_cache_mode =
+              OpenSSL::SSL::SSLContext::SESSION_CACHE_CLIENT |
+                  OpenSSL::SSL::SSLContext::SESSION_CACHE_NO_INTERNAL_STORE
+        end
+        if @ssl_context.respond_to?(:session_new_cb) # not implemented under JRuby
+          @ssl_context.session_new_cb = proc {|sock, sess| @ssl_session = sess }
+        end
+
+        # Still do the post_connection_check below even if connecting
+        # to IP address
+        verify_hostname = @ssl_context.verify_hostname
+
+        # Server Name Indication (SNI) RFC 3546/6066
+        case @address
+        when Gem::Resolv::IPv4::Regex, Gem::Resolv::IPv6::Regex
+          # don't set SNI, as IP addresses in SNI is not valid
+          # per RFC 6066, section 3.
+
+          # Avoid openssl warning
+          @ssl_context.verify_hostname = false
+        else
+          ssl_host_address = @address
+        end
+
+        debug "starting SSL for #{conn_addr}:#{conn_port}..."
+        s = OpenSSL::SSL::SSLSocket.new(s, @ssl_context)
+        s.sync_close = true
+        s.hostname = ssl_host_address if s.respond_to?(:hostname=) && ssl_host_address
+
+        if @ssl_session and
+           Process.clock_gettime(Process::CLOCK_REALTIME) < @ssl_session.time.to_f + @ssl_session.timeout
+          s.session = @ssl_session
+        end
+        ssl_socket_connect(s, @open_timeout)
+        if (@ssl_context.verify_mode != OpenSSL::SSL::VERIFY_NONE) && verify_hostname
+          s.post_connection_check(@address)
+        end
+        debug "SSL established, protocol: #{s.ssl_version}, cipher: #{s.cipher[0]}"
+      end
+      @socket = BufferedIO.new(s, read_timeout: @read_timeout,
+                               write_timeout: @write_timeout,
+                               continue_timeout: @continue_timeout,
+                               debug_output: @debug_output)
+      @last_communicated = nil
+      on_connect
+    rescue => exception
+      if s
+        debug "Conn close because of connect error #{exception}"
+        s.close
+      end
+      raise
+    end
+    private :connect
+
+    def on_connect
+    end
+    private :on_connect
+
+    # Finishes the \HTTP session:
+    #
+    #   http = Gem::Net::HTTP.new(hostname)
+    #   http.start
+    #   http.started? # => true
+    #   http.finish   # => nil
+    #   http.started? # => false
+    #
+    # Raises IOError if not in a session.
+    def finish
+      raise IOError, 'HTTP session not yet started' unless started?
+      do_finish
+    end
+
+    def do_finish
+      @started = false
+      @socket.close if @socket
+      @socket = nil
+    end
+    private :do_finish
+
+    #
+    # proxy
+    #
+
+    public
+
+    # no proxy
+    @is_proxy_class = false
+    @proxy_from_env = false
+    @proxy_addr = nil
+    @proxy_port = nil
+    @proxy_user = nil
+    @proxy_pass = nil
+    @proxy_use_ssl = nil
+
+    # Creates an \HTTP proxy class which behaves like \Gem::Net::HTTP, but
+    # performs all access via the specified proxy.
+    #
+    # This class is obsolete.  You may pass these same parameters directly to
+    # \Gem::Net::HTTP.new.  See Gem::Net::HTTP.new for details of the arguments.
+    def HTTP.Proxy(p_addr = :ENV, p_port = nil, p_user = nil, p_pass = nil, p_use_ssl = nil) #:nodoc:
+      return self unless p_addr
+
+      Class.new(self) {
+        @is_proxy_class = true
+
+        if p_addr == :ENV then
+          @proxy_from_env = true
+          @proxy_address = nil
+          @proxy_port    = nil
+        else
+          @proxy_from_env = false
+          @proxy_address = p_addr
+          @proxy_port    = p_port || default_port
+        end
+
+        @proxy_user = p_user
+        @proxy_pass = p_pass
+        @proxy_use_ssl = p_use_ssl
+      }
+    end
+
+    class << HTTP
+      # Returns true if self is a class which was created by HTTP::Proxy.
+      def proxy_class?
+        defined?(@is_proxy_class) ? @is_proxy_class : false
+      end
+
+      # Returns the address of the proxy host, or +nil+ if none;
+      # see Gem::Net::HTTP@Proxy+Server.
+      attr_reader :proxy_address
+
+      # Returns the port number of the proxy host, or +nil+ if none;
+      # see Gem::Net::HTTP@Proxy+Server.
+      attr_reader :proxy_port
+
+      # Returns the user name for accessing the proxy, or +nil+ if none;
+      # see Gem::Net::HTTP@Proxy+Server.
+      attr_reader :proxy_user
+
+      # Returns the password for accessing the proxy, or +nil+ if none;
+      # see Gem::Net::HTTP@Proxy+Server.
+      attr_reader :proxy_pass
+
+      # Use SSL when talking to the proxy. If Gem::Net::HTTP does not use a proxy, nil.
+      attr_reader :proxy_use_ssl
+    end
+
+    # Returns +true+ if a proxy server is defined, +false+ otherwise;
+    # see {Proxy Server}[rdoc-ref:Gem::Net::HTTP@Proxy+Server].
+    def proxy?
+      !!(@proxy_from_env ? proxy_uri : @proxy_address)
+    end
+
+    # Returns +true+ if the proxy server is defined in the environment,
+    # +false+ otherwise;
+    # see {Proxy Server}[rdoc-ref:Gem::Net::HTTP@Proxy+Server].
+    def proxy_from_env?
+      @proxy_from_env
+    end
+
+    # The proxy URI determined from the environment for this connection.
+    def proxy_uri # :nodoc:
+      return if @proxy_uri == false
+      @proxy_uri ||= Gem::URI::HTTP.new(
+        "http", nil, address, port, nil, nil, nil, nil, nil
+      ).find_proxy || false
+      @proxy_uri || nil
+    end
+
+    # Returns the address of the proxy server, if defined, +nil+ otherwise;
+    # see {Proxy Server}[rdoc-ref:Gem::Net::HTTP@Proxy+Server].
+    def proxy_address
+      if @proxy_from_env then
+        proxy_uri&.hostname
+      else
+        @proxy_address
+      end
+    end
+
+    # Returns the port number of the proxy server, if defined, +nil+ otherwise;
+    # see {Proxy Server}[rdoc-ref:Gem::Net::HTTP@Proxy+Server].
+    def proxy_port
+      if @proxy_from_env then
+        proxy_uri&.port
+      else
+        @proxy_port
+      end
+    end
+
+    # Returns the user name of the proxy server, if defined, +nil+ otherwise;
+    # see {Proxy Server}[rdoc-ref:Gem::Net::HTTP@Proxy+Server].
+    def proxy_user
+      if @proxy_from_env
+        user = proxy_uri&.user
+        unescape(user) if user
+      else
+        @proxy_user
+      end
+    end
+
+    # Returns the password of the proxy server, if defined, +nil+ otherwise;
+    # see {Proxy Server}[rdoc-ref:Gem::Net::HTTP@Proxy+Server].
+    def proxy_pass
+      if @proxy_from_env
+        pass = proxy_uri&.password
+        unescape(pass) if pass
+      else
+        @proxy_pass
+      end
+    end
+
+    alias proxyaddr proxy_address   #:nodoc: obsolete
+    alias proxyport proxy_port      #:nodoc: obsolete
+
+    private
+
+    def unescape(value)
+      require 'cgi/escape'
+      require 'cgi/util' unless defined?(CGI::EscapeExt)
+      CGI.unescape(value)
+    end
+
+    # without proxy, obsolete
+
+    def conn_address # :nodoc:
+      @ipaddr || address()
+    end
+
+    def conn_port # :nodoc:
+      port()
+    end
+
+    def edit_path(path)
+      if proxy?
+        if path.start_with?("ftp://") || use_ssl?
+          path
+        else
+          "http://#{addr_port}#{path}"
+        end
+      else
+        path
+      end
+    end
+
+    #
+    # HTTP operations
+    #
+
+    public
+
+    # :call-seq:
+    #    get(path, initheader = nil) {|res| ... }
+    #
+    # Sends a GET request to the server;
+    # returns an instance of a subclass of Gem::Net::HTTPResponse.
+    #
+    # The request is based on the Gem::Net::HTTP::Get object
+    # created from string +path+ and initial headers hash +initheader+.
+    #
+    # With a block given, calls the block with the response body:
+    #
+    #   http = Gem::Net::HTTP.new(hostname)
+    #   http.get('/todos/1') do |res|
+    #     p res
+    #   end # => #<Gem::Net::HTTPOK 200 OK readbody=true>
+    #
+    # Output:
+    #
+    #   "{\n  \"userId\": 1,\n  \"id\": 1,\n  \"title\": \"delectus aut autem\",\n  \"completed\": false\n}"
+    #
+    # With no block given, simply returns the response object:
+    #
+    #   http.get('/') # => #<Gem::Net::HTTPOK 200 OK readbody=true>
+    #
+    # Related:
+    #
+    # - Gem::Net::HTTP::Get: request class for \HTTP method GET.
+    # - Gem::Net::HTTP.get: sends GET request, returns response body.
+    #
+    def get(path, initheader = nil, dest = nil, &block) # :yield: +body_segment+
+      res = nil
+
+      request(Get.new(path, initheader)) {|r|
+        r.read_body dest, &block
+        res = r
+      }
+      res
+    end
+
+    # Sends a HEAD request to the server;
+    # returns an instance of a subclass of Gem::Net::HTTPResponse.
+    #
+    # The request is based on the Gem::Net::HTTP::Head object
+    # created from string +path+ and initial headers hash +initheader+:
+    #
+    #   res = http.head('/todos/1') # => #<Gem::Net::HTTPOK 200 OK readbody=true>
+    #   res.body                    # => nil
+    #   res.to_hash.take(3)
+    #   # =>
+    #   [["date", ["Wed, 15 Feb 2023 15:25:42 GMT"]],
+    #    ["content-type", ["application/json; charset=utf-8"]],
+    #    ["connection", ["close"]]]
+    #
+    def head(path, initheader = nil)
+      request(Head.new(path, initheader))
+    end
+
+    # :call-seq:
+    #    post(path, data, initheader = nil) {|res| ... }
+    #
+    # Sends a POST request to the server;
+    # returns an instance of a subclass of Gem::Net::HTTPResponse.
+    #
+    # The request is based on the Gem::Net::HTTP::Post object
+    # created from string +path+, string +data+, and initial headers hash +initheader+.
+    #
+    # With a block given, calls the block with the response body:
+    #
+    #   data = '{"userId": 1, "id": 1, "title": "delectus aut autem", "completed": false}'
+    #   http = Gem::Net::HTTP.new(hostname)
+    #   http.post('/todos', data) do |res|
+    #     p res
+    #   end # => #<Gem::Net::HTTPCreated 201 Created readbody=true>
+    #
+    # Output:
+    #
+    #   "{\n  \"{\\\"userId\\\": 1, \\\"id\\\": 1, \\\"title\\\": \\\"delectus aut autem\\\", \\\"completed\\\": false}\": \"\",\n  \"id\": 201\n}"
+    #
+    # With no block given, simply returns the response object:
+    #
+    #   http.post('/todos', data) # => #<Gem::Net::HTTPCreated 201 Created readbody=true>
+    #
+    # Related:
+    #
+    # - Gem::Net::HTTP::Post: request class for \HTTP method POST.
+    # - Gem::Net::HTTP.post: sends POST request, returns response body.
+    #
+    def post(path, data, initheader = nil, dest = nil, &block) # :yield: +body_segment+
+      send_entity(path, data, initheader, dest, Post, &block)
+    end
+
+    # :call-seq:
+    #    patch(path, data, initheader = nil) {|res| ... }
+    #
+    # Sends a PATCH request to the server;
+    # returns an instance of a subclass of Gem::Net::HTTPResponse.
+    #
+    # The request is based on the Gem::Net::HTTP::Patch object
+    # created from string +path+, string +data+, and initial headers hash +initheader+.
+    #
+    # With a block given, calls the block with the response body:
+    #
+    #   data = '{"userId": 1, "id": 1, "title": "delectus aut autem", "completed": false}'
+    #   http = Gem::Net::HTTP.new(hostname)
+    #   http.patch('/todos/1', data) do |res|
+    #     p res
+    #   end # => #<Gem::Net::HTTPOK 200 OK readbody=true>
+    #
+    # Output:
+    #
+    #   "{\n  \"userId\": 1,\n  \"id\": 1,\n  \"title\": \"delectus aut autem\",\n  \"completed\": false,\n  \"{\\\"userId\\\": 1, \\\"id\\\": 1, \\\"title\\\": \\\"delectus aut autem\\\", \\\"completed\\\": false}\": \"\"\n}"
+    #
+    # With no block given, simply returns the response object:
+    #
+    #   http.patch('/todos/1', data) # => #<Gem::Net::HTTPCreated 201 Created readbody=true>
+    #
+    def patch(path, data, initheader = nil, dest = nil, &block) # :yield: +body_segment+
+      send_entity(path, data, initheader, dest, Patch, &block)
+    end
+
+    # Sends a PUT request to the server;
+    # returns an instance of a subclass of Gem::Net::HTTPResponse.
+    #
+    # The request is based on the Gem::Net::HTTP::Put object
+    # created from string +path+, string +data+, and initial headers hash +initheader+.
+    #
+    #   data = '{"userId": 1, "id": 1, "title": "delectus aut autem", "completed": false}'
+    #   http = Gem::Net::HTTP.new(hostname)
+    #   http.put('/todos/1', data) # => #<Gem::Net::HTTPOK 200 OK readbody=true>
+    #
+    # Related:
+    #
+    # - Gem::Net::HTTP::Put: request class for \HTTP method PUT.
+    # - Gem::Net::HTTP.put: sends PUT request, returns response body.
+    #
+    def put(path, data, initheader = nil)
+      request(Put.new(path, initheader), data)
+    end
+
+    # Sends a PROPPATCH request to the server;
+    # returns an instance of a subclass of Gem::Net::HTTPResponse.
+    #
+    # The request is based on the Gem::Net::HTTP::Proppatch object
+    # created from string +path+, string +body+, and initial headers hash +initheader+.
+    #
+    #   data = '{"userId": 1, "id": 1, "title": "delectus aut autem", "completed": false}'
+    #   http = Gem::Net::HTTP.new(hostname)
+    #   http.proppatch('/todos/1', data)
+    #
+    def proppatch(path, body, initheader = nil)
+      request(Proppatch.new(path, initheader), body)
+    end
+
+    # Sends a LOCK request to the server;
+    # returns an instance of a subclass of Gem::Net::HTTPResponse.
+    #
+    # The request is based on the Gem::Net::HTTP::Lock object
+    # created from string +path+, string +body+, and initial headers hash +initheader+.
+    #
+    #   data = '{"userId": 1, "id": 1, "title": "delectus aut autem", "completed": false}'
+    #   http = Gem::Net::HTTP.new(hostname)
+    #   http.lock('/todos/1', data)
+    #
+    def lock(path, body, initheader = nil)
+      request(Lock.new(path, initheader), body)
+    end
+
+    # Sends an UNLOCK request to the server;
+    # returns an instance of a subclass of Gem::Net::HTTPResponse.
+    #
+    # The request is based on the Gem::Net::HTTP::Unlock object
+    # created from string +path+, string +body+, and initial headers hash +initheader+.
+    #
+    #   data = '{"userId": 1, "id": 1, "title": "delectus aut autem", "completed": false}'
+    #   http = Gem::Net::HTTP.new(hostname)
+    #   http.unlock('/todos/1', data)
+    #
+    def unlock(path, body, initheader = nil)
+      request(Unlock.new(path, initheader), body)
+    end
+
+    # Sends an Options request to the server;
+    # returns an instance of a subclass of Gem::Net::HTTPResponse.
+    #
+    # The request is based on the Gem::Net::HTTP::Options object
+    # created from string +path+ and initial headers hash +initheader+.
+    #
+    #   http = Gem::Net::HTTP.new(hostname)
+    #   http.options('/')
+    #
+    def options(path, initheader = nil)
+      request(Options.new(path, initheader))
+    end
+
+    # Sends a PROPFIND request to the server;
+    # returns an instance of a subclass of Gem::Net::HTTPResponse.
+    #
+    # The request is based on the Gem::Net::HTTP::Propfind object
+    # created from string +path+, string +body+, and initial headers hash +initheader+.
+    #
+    #   data = '{"userId": 1, "id": 1, "title": "delectus aut autem", "completed": false}'
+    #   http = Gem::Net::HTTP.new(hostname)
+    #   http.propfind('/todos/1', data)
+    #
+    def propfind(path, body = nil, initheader = {'Depth' => '0'})
+      request(Propfind.new(path, initheader), body)
+    end
+
+    # Sends a DELETE request to the server;
+    # returns an instance of a subclass of Gem::Net::HTTPResponse.
+    #
+    # The request is based on the Gem::Net::HTTP::Delete object
+    # created from string +path+ and initial headers hash +initheader+.
+    #
+    #   http = Gem::Net::HTTP.new(hostname)
+    #   http.delete('/todos/1')
+    #
+    def delete(path, initheader = {'Depth' => 'Infinity'})
+      request(Delete.new(path, initheader))
+    end
+
+    # Sends a MOVE request to the server;
+    # returns an instance of a subclass of Gem::Net::HTTPResponse.
+    #
+    # The request is based on the Gem::Net::HTTP::Move object
+    # created from string +path+ and initial headers hash +initheader+.
+    #
+    #   http = Gem::Net::HTTP.new(hostname)
+    #   http.move('/todos/1')
+    #
+    def move(path, initheader = nil)
+      request(Move.new(path, initheader))
+    end
+
+    # Sends a COPY request to the server;
+    # returns an instance of a subclass of Gem::Net::HTTPResponse.
+    #
+    # The request is based on the Gem::Net::HTTP::Copy object
+    # created from string +path+ and initial headers hash +initheader+.
+    #
+    #   http = Gem::Net::HTTP.new(hostname)
+    #   http.copy('/todos/1')
+    #
+    def copy(path, initheader = nil)
+      request(Copy.new(path, initheader))
+    end
+
+    # Sends a MKCOL request to the server;
+    # returns an instance of a subclass of Gem::Net::HTTPResponse.
+    #
+    # The request is based on the Gem::Net::HTTP::Mkcol object
+    # created from string +path+, string +body+, and initial headers hash +initheader+.
+    #
+    #   data = '{"userId": 1, "id": 1, "title": "delectus aut autem", "completed": false}'
+    #   http.mkcol('/todos/1', data)
+    #   http = Gem::Net::HTTP.new(hostname)
+    #
+    def mkcol(path, body = nil, initheader = nil)
+      request(Mkcol.new(path, initheader), body)
+    end
+
+    # Sends a TRACE request to the server;
+    # returns an instance of a subclass of Gem::Net::HTTPResponse.
+    #
+    # The request is based on the Gem::Net::HTTP::Trace object
+    # created from string +path+ and initial headers hash +initheader+.
+    #
+    #   http = Gem::Net::HTTP.new(hostname)
+    #   http.trace('/todos/1')
+    #
+    def trace(path, initheader = nil)
+      request(Trace.new(path, initheader))
+    end
+
+    # Sends a GET request to the server;
+    # forms the response into a Gem::Net::HTTPResponse object.
+    #
+    # The request is based on the Gem::Net::HTTP::Get object
+    # created from string +path+ and initial headers hash +initheader+.
+    #
+    # With no block given, returns the response object:
+    #
+    #   http = Gem::Net::HTTP.new(hostname)
+    #   http.request_get('/todos') # => #<Gem::Net::HTTPOK 200 OK readbody=true>
+    #
+    # With a block given, calls the block with the response object
+    # and returns the response object:
+    #
+    #   http.request_get('/todos') do |res|
+    #     p res
+    #   end # => #<Gem::Net::HTTPOK 200 OK readbody=true>
+    #
+    # Output:
+    #
+    #   #<Gem::Net::HTTPOK 200 OK readbody=false>
+    #
+    def request_get(path, initheader = nil, &block) # :yield: +response+
+      request(Get.new(path, initheader), &block)
+    end
+
+    # Sends a HEAD request to the server;
+    # returns an instance of a subclass of Gem::Net::HTTPResponse.
+    #
+    # The request is based on the Gem::Net::HTTP::Head object
+    # created from string +path+ and initial headers hash +initheader+.
+    #
+    #   http = Gem::Net::HTTP.new(hostname)
+    #   http.head('/todos/1') # => #<Gem::Net::HTTPOK 200 OK readbody=true>
+    #
+    def request_head(path, initheader = nil, &block)
+      request(Head.new(path, initheader), &block)
+    end
+
+    # Sends a POST request to the server;
+    # forms the response into a Gem::Net::HTTPResponse object.
+    #
+    # The request is based on the Gem::Net::HTTP::Post object
+    # created from string +path+, string +data+, and initial headers hash +initheader+.
+    #
+    # With no block given, returns the response object:
+    #
+    #   http = Gem::Net::HTTP.new(hostname)
+    #   http.post('/todos', 'xyzzy')
+    #   # => #<Gem::Net::HTTPCreated 201 Created readbody=true>
+    #
+    # With a block given, calls the block with the response body
+    # and returns the response object:
+    #
+    #   http.post('/todos', 'xyzzy') do |res|
+    #     p res
+    #   end # => #<Gem::Net::HTTPCreated 201 Created readbody=true>
+    #
+    # Output:
+    #
+    #   "{\n  \"xyzzy\": \"\",\n  \"id\": 201\n}"
+    #
+    def request_post(path, data, initheader = nil, &block) # :yield: +response+
+      request Post.new(path, initheader), data, &block
+    end
+
+    # Sends a PUT request to the server;
+    # returns an instance of a subclass of Gem::Net::HTTPResponse.
+    #
+    # The request is based on the Gem::Net::HTTP::Put object
+    # created from string +path+, string +data+, and initial headers hash +initheader+.
+    #
+    #   http = Gem::Net::HTTP.new(hostname)
+    #   http.put('/todos/1', 'xyzzy')
+    #   # => #<Gem::Net::HTTPOK 200 OK readbody=true>
+    #
+    def request_put(path, data, initheader = nil, &block)   #:nodoc:
+      request Put.new(path, initheader), data, &block
+    end
+
+    alias get2   request_get    #:nodoc: obsolete
+    alias head2  request_head   #:nodoc: obsolete
+    alias post2  request_post   #:nodoc: obsolete
+    alias put2   request_put    #:nodoc: obsolete
+
+    # Sends an \HTTP request to the server;
+    # returns an instance of a subclass of Gem::Net::HTTPResponse.
+    #
+    # The request is based on the Gem::Net::HTTPRequest object
+    # created from string +path+, string +data+, and initial headers hash +header+.
+    # That object is an instance of the
+    # {subclass of Gem::Net::HTTPRequest}[rdoc-ref:Gem::Net::HTTPRequest@Request+Subclasses],
+    # that corresponds to the given uppercase string +name+,
+    # which must be
+    # an {HTTP request method}[https://en.wikipedia.org/wiki/HTTP#Request_methods]
+    # or a {WebDAV request method}[https://en.wikipedia.org/wiki/WebDAV#Implementation].
+    #
+    # Examples:
+    #
+    #   http = Gem::Net::HTTP.new(hostname)
+    #   http.send_request('GET', '/todos/1')
+    #   # => #<Gem::Net::HTTPOK 200 OK readbody=true>
+    #   http.send_request('POST', '/todos', 'xyzzy')
+    #   # => #<Gem::Net::HTTPCreated 201 Created readbody=true>
+    #
+    def send_request(name, path, data = nil, header = nil)
+      has_response_body = name != 'HEAD'
+      r = HTTPGenericRequest.new(name,(data ? true : false),has_response_body,path,header)
+      request r, data
+    end
+
+    # Sends the given request +req+ to the server;
+    # forms the response into a Gem::Net::HTTPResponse object.
+    #
+    # The given +req+ must be an instance of a
+    # {subclass of Gem::Net::HTTPRequest}[rdoc-ref:Gem::Net::HTTPRequest@Request+Subclasses].
+    # Argument +body+ should be given only if needed for the request.
+    #
+    # With no block given, returns the response object:
+    #
+    #   http = Gem::Net::HTTP.new(hostname)
+    #
+    #   req = Gem::Net::HTTP::Get.new('/todos/1')
+    #   http.request(req)
+    #   # => #<Gem::Net::HTTPOK 200 OK readbody=true>
+    #
+    #   req = Gem::Net::HTTP::Post.new('/todos')
+    #   http.request(req, 'xyzzy')
+    #   # => #<Gem::Net::HTTPCreated 201 Created readbody=true>
+    #
+    # With a block given, calls the block with the response and returns the response:
+    #
+    #   req = Gem::Net::HTTP::Get.new('/todos/1')
+    #   http.request(req) do |res|
+    #     p res
+    #   end # => #<Gem::Net::HTTPOK 200 OK readbody=true>
+    #
+    # Output:
+    #
+    #   #<Gem::Net::HTTPOK 200 OK readbody=false>
+    #
+    def request(req, body = nil, &block)  # :yield: +response+
+      unless started?
+        start {
+          req['connection'] ||= 'close'
+          return request(req, body, &block)
+        }
+      end
+      if proxy_user()
+        req.proxy_basic_auth proxy_user(), proxy_pass() unless use_ssl?
+      end
+      req.set_body_internal body
+      res = transport_request(req, &block)
+      if sspi_auth?(res)
+        sspi_auth(req)
+        res = transport_request(req, &block)
+      end
+      res
+    end
+
+    private
+
+    # Executes a request which uses a representation
+    # and returns its body.
+    def send_entity(path, data, initheader, dest, type, &block)
+      res = nil
+      request(type.new(path, initheader), data) {|r|
+        r.read_body dest, &block
+        res = r
+      }
+      res
+    end
+
+    IDEMPOTENT_METHODS_ = %w/GET HEAD PUT DELETE OPTIONS TRACE/ # :nodoc:
+
+    def transport_request(req)
+      count = 0
+      begin
+        begin_transport req
+        res = catch(:response) {
+          begin
+            req.exec @socket, @curr_http_version, edit_path(req.path)
+          rescue Errno::EPIPE
+            # Failure when writing full request, but we can probably
+            # still read the received response.
+          end
+
+          begin
+            res = HTTPResponse.read_new(@socket)
+            res.decode_content = req.decode_content
+            res.body_encoding = @response_body_encoding
+            res.ignore_eof = @ignore_eof
+          end while res.kind_of?(HTTPInformation)
+
+          res.uri = req.uri
+
+          res
+        }
+        res.reading_body(@socket, req.response_body_permitted?) {
+          if block_given?
+            count = max_retries # Don't restart in the middle of a download
+            yield res
+          end
+        }
+      rescue Gem::Net::OpenTimeout
+        raise
+      rescue Gem::Net::ReadTimeout, IOError, EOFError,
+             Errno::ECONNRESET, Errno::ECONNABORTED, Errno::EPIPE, Errno::ETIMEDOUT,
+             # avoid a dependency on OpenSSL
+             defined?(OpenSSL::SSL) ? OpenSSL::SSL::SSLError : IOError,
+             Gem::Timeout::Error => exception
+        if count < max_retries && IDEMPOTENT_METHODS_.include?(req.method)
+          count += 1
+          @socket.close if @socket
+          debug "Conn close because of error #{exception}, and retry"
+          retry
+        end
+        debug "Conn close because of error #{exception}"
+        @socket.close if @socket
+        raise
+      end
+
+      end_transport req, res
+      res
+    rescue => exception
+      debug "Conn close because of error #{exception}"
+      @socket.close if @socket
+      raise exception
+    end
+
+    def begin_transport(req)
+      if @socket.closed?
+        connect
+      elsif @last_communicated
+        if @last_communicated + @keep_alive_timeout < Process.clock_gettime(Process::CLOCK_MONOTONIC)
+          debug 'Conn close because of keep_alive_timeout'
+          @socket.close
+          connect
+        elsif @socket.io.to_io.wait_readable(0) && @socket.eof?
+          debug "Conn close because of EOF"
+          @socket.close
+          connect
+        end
+      end
+
+      if not req.response_body_permitted? and @close_on_empty_response
+        req['connection'] ||= 'close'
+      end
+
+      req.update_uri address, port, use_ssl?
+      req['host'] ||= addr_port()
+    end
+
+    def end_transport(req, res)
+      @curr_http_version = res.http_version
+      @last_communicated = nil
+      if @socket.closed?
+        debug 'Conn socket closed'
+      elsif not res.body and @close_on_empty_response
+        debug 'Conn close'
+        @socket.close
+      elsif keep_alive?(req, res)
+        debug 'Conn keep-alive'
+        @last_communicated = Process.clock_gettime(Process::CLOCK_MONOTONIC)
+      else
+        debug 'Conn close'
+        @socket.close
+      end
+    end
+
+    def keep_alive?(req, res)
+      return false if req.connection_close?
+      if @curr_http_version <= '1.0'
+        res.connection_keep_alive?
+      else   # HTTP/1.1 or later
+        not res.connection_close?
+      end
+    end
+
+    def sspi_auth?(res)
+      return false unless @sspi_enabled
+      if res.kind_of?(HTTPProxyAuthenticationRequired) and
+          proxy? and res["Proxy-Authenticate"].include?("Negotiate")
+        begin
+          require 'win32/sspi'
+          true
+        rescue LoadError
+          false
+        end
+      else
+        false
+      end
+    end
+
+    def sspi_auth(req)
+      n = Win32::SSPI::NegotiateAuth.new
+      req["Proxy-Authorization"] = "Negotiate #{n.get_initial_token}"
+      # Some versions of ISA will close the connection if this isn't present.
+      req["Connection"] = "Keep-Alive"
+      req["Proxy-Connection"] = "Keep-Alive"
+      res = transport_request(req)
+      authphrase = res["Proxy-Authenticate"]  or return res
+      req["Proxy-Authorization"] = "Negotiate #{n.complete_authentication(authphrase)}"
+    rescue => err
+      raise HTTPAuthenticationError.new('HTTP authentication failed', err)
+    end
+
+    #
+    # utils
+    #
+
+    private
+
+    def addr_port
+      addr = address
+      addr = "[#{addr}]" if addr.include?(":")
+      default_port = use_ssl? ? HTTP.https_default_port : HTTP.http_default_port
+      default_port == port ? addr : "#{addr}:#{port}"
+    end
+
+    # Adds a message to debugging output
+    def debug(msg)
+      return unless @debug_output
+      @debug_output << msg
+      @debug_output << "\n"
+    end
+
+    alias_method :D, :debug
+  end
+
+  # for backward compatibility until Ruby 3.5
+  # https://bugs.ruby-lang.org/issues/20900
+  # https://github.com/bblimke/webmock/pull/1081
+  HTTPSession = HTTP
+  deprecate_constant :HTTPSession
+end
+
+require_relative 'http/exceptions'
+
+require_relative 'http/header'
+
+require_relative 'http/generic_request'
+require_relative 'http/request'
+require_relative 'http/requests'
+
+require_relative 'http/response'
+require_relative 'http/responses'
+
+require_relative 'http/proxy_delta'
diff --git a/lib/rubygems/vendor/net-http/lib/net/http/exceptions.rb b/lib/rubygems/vendor/net-http/lib/net/http/exceptions.rb
new file mode 100644
index 00000000000000..c629c0113b1a91
--- /dev/null
+++ b/lib/rubygems/vendor/net-http/lib/net/http/exceptions.rb
@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+module Gem::Net
+  # Gem::Net::HTTP exception class.
+  # You cannot use Gem::Net::HTTPExceptions directly; instead, you must use
+  # its subclasses.
+  module HTTPExceptions
+    def initialize(msg, res)   #:nodoc:
+      super msg
+      @response = res
+    end
+    attr_reader :response
+    alias data response    #:nodoc: obsolete
+  end
+
+  class HTTPError < ProtocolError
+    include HTTPExceptions
+  end
+
+  class HTTPRetriableError < ProtoRetriableError
+    include HTTPExceptions
+  end
+
+  class HTTPClientException < ProtoServerError
+    include HTTPExceptions
+  end
+
+  class HTTPFatalError < ProtoFatalError
+    include HTTPExceptions
+  end
+
+  # We cannot use the name "HTTPServerError", it is the name of the response.
+  HTTPServerException = HTTPClientException # :nodoc:
+  deprecate_constant(:HTTPServerException)
+end
diff --git a/lib/rubygems/vendor/net-http/lib/net/http/generic_request.rb b/lib/rubygems/vendor/net-http/lib/net/http/generic_request.rb
new file mode 100644
index 00000000000000..5cfe75a7cde734
--- /dev/null
+++ b/lib/rubygems/vendor/net-http/lib/net/http/generic_request.rb
@@ -0,0 +1,414 @@
+# frozen_string_literal: true
+#
+# \HTTPGenericRequest is the parent of the Gem::Net::HTTPRequest class.
+#
+# Do not use this directly; instead, use a subclass of Gem::Net::HTTPRequest.
+#
+# == About the Examples
+#
+# :include: doc/net-http/examples.rdoc
+#
+class Gem::Net::HTTPGenericRequest
+
+  include Gem::Net::HTTPHeader
+
+  def initialize(m, reqbody, resbody, uri_or_path, initheader = nil) # :nodoc:
+    @method = m
+    @request_has_body = reqbody
+    @response_has_body = resbody
+
+    if Gem::URI === uri_or_path then
+      raise ArgumentError, "not an HTTP Gem::URI" unless Gem::URI::HTTP === uri_or_path
+      hostname = uri_or_path.hostname
+      raise ArgumentError, "no host component for Gem::URI" unless (hostname && hostname.length > 0)
+      @uri = uri_or_path.dup
+      host = @uri.hostname.dup
+      host << ":" << @uri.port.to_s if @uri.port != @uri.default_port
+      @path = uri_or_path.request_uri
+      raise ArgumentError, "no HTTP request path given" unless @path
+    else
+      @uri = nil
+      host = nil
+      raise ArgumentError, "no HTTP request path given" unless uri_or_path
+      raise ArgumentError, "HTTP request path is empty" if uri_or_path.empty?
+      @path = uri_or_path.dup
+    end
+
+    @decode_content = false
+
+    if Gem::Net::HTTP::HAVE_ZLIB then
+      if !initheader ||
+         !initheader.keys.any? { |k|
+           %w[accept-encoding range].include? k.downcase
+         } then
+        @decode_content = true if @response_has_body
+        initheader = initheader ? initheader.dup : {}
+        initheader["accept-encoding"] =
+          "gzip;q=1.0,deflate;q=0.6,identity;q=0.3"
+      end
+    end
+
+    initialize_http_header initheader
+    self['Accept'] ||= '*/*'
+    self['User-Agent'] ||= 'Ruby'
+    self['Host'] ||= host if host
+    @body = nil
+    @body_stream = nil
+    @body_data = nil
+  end
+
+  # Returns the string method name for the request:
+  #
+  #   Gem::Net::HTTP::Get.new(uri).method  # => "GET"
+  #   Gem::Net::HTTP::Post.new(uri).method # => "POST"
+  #
+  attr_reader :method
+
+  # Returns the string path for the request:
+  #
+  #   Gem::Net::HTTP::Get.new(uri).path # => "/"
+  #   Gem::Net::HTTP::Post.new('example.com').path # => "example.com"
+  #
+  attr_reader :path
+
+  # Returns the Gem::URI object for the request, or +nil+ if none:
+  #
+  #   Gem::Net::HTTP::Get.new(uri).uri
+  #   # => #<Gem::URI::HTTPS https://jsonplaceholder.typicode.com/>
+  #   Gem::Net::HTTP::Get.new('example.com').uri # => nil
+  #
+  attr_reader :uri
+
+  # Returns +false+ if the request's header <tt>'Accept-Encoding'</tt>
+  # has been set manually or deleted
+  # (indicating that the user intends to handle encoding in the response),
+  # +true+ otherwise:
+  #
+  #   req = Gem::Net::HTTP::Get.new(uri) # => #<Gem::Net::HTTP::Get GET>
+  #   req['Accept-Encoding']        # => "gzip;q=1.0,deflate;q=0.6,identity;q=0.3"
+  #   req.decode_content            # => true
+  #   req['Accept-Encoding'] = 'foo'
+  #   req.decode_content            # => false
+  #   req.delete('Accept-Encoding')
+  #   req.decode_content            # => false
+  #
+  attr_reader :decode_content
+
+  # Returns a string representation of the request:
+  #
+  #   Gem::Net::HTTP::Post.new(uri).inspect # => "#<Gem::Net::HTTP::Post POST>"
+  #
+  def inspect
+    "\#<#{self.class} #{@method}>"
+  end
+
+  ##
+  # Don't automatically decode response content-encoding if the user indicates
+  # they want to handle it.
+
+  def []=(key, val) # :nodoc:
+    @decode_content = false if key.downcase == 'accept-encoding'
+
+    super key, val
+  end
+
+  # Returns whether the request may have a body:
+  #
+  #   Gem::Net::HTTP::Post.new(uri).request_body_permitted? # => true
+  #   Gem::Net::HTTP::Get.new(uri).request_body_permitted?  # => false
+  #
+  def request_body_permitted?
+    @request_has_body
+  end
+
+  # Returns whether the response may have a body:
+  #
+  #   Gem::Net::HTTP::Post.new(uri).response_body_permitted? # => true
+  #   Gem::Net::HTTP::Head.new(uri).response_body_permitted? # => false
+  #
+  def response_body_permitted?
+    @response_has_body
+  end
+
+  def body_exist? # :nodoc:
+    warn "Gem::Net::HTTPRequest#body_exist? is obsolete; use response_body_permitted?", uplevel: 1 if $VERBOSE
+    response_body_permitted?
+  end
+
+  # Returns the string body for the request, or +nil+ if there is none:
+  #
+  #   req = Gem::Net::HTTP::Post.new(uri)
+  #   req.body # => nil
+  #   req.body = '{"title": "foo","body": "bar","userId": 1}'
+  #   req.body # => "{\"title\": \"foo\",\"body\": \"bar\",\"userId\": 1}"
+  #
+  attr_reader :body
+
+  # Sets the body for the request:
+  #
+  #   req = Gem::Net::HTTP::Post.new(uri)
+  #   req.body # => nil
+  #   req.body = '{"title": "foo","body": "bar","userId": 1}'
+  #   req.body # => "{\"title\": \"foo\",\"body\": \"bar\",\"userId\": 1}"
+  #
+  def body=(str)
+    @body = str
+    @body_stream = nil
+    @body_data = nil
+    str
+  end
+
+  # Returns the body stream object for the request, or +nil+ if there is none:
+  #
+  #   req = Gem::Net::HTTP::Post.new(uri)          # => #<Gem::Net::HTTP::Post POST>
+  #   req.body_stream                         # => nil
+  #   require 'stringio'
+  #   req.body_stream = StringIO.new('xyzzy') # => #<StringIO:0x0000027d1e5affa8>
+  #   req.body_stream                         # => #<StringIO:0x0000027d1e5affa8>
+  #
+  attr_reader :body_stream
+
+  # Sets the body stream for the request:
+  #
+  #   req = Gem::Net::HTTP::Post.new(uri)          # => #<Gem::Net::HTTP::Post POST>
+  #   req.body_stream                         # => nil
+  #   require 'stringio'
+  #   req.body_stream = StringIO.new('xyzzy') # => #<StringIO:0x0000027d1e5affa8>
+  #   req.body_stream                         # => #<StringIO:0x0000027d1e5affa8>
+  #
+  def body_stream=(input)
+    @body = nil
+    @body_stream = input
+    @body_data = nil
+    input
+  end
+
+  def set_body_internal(str)   #:nodoc: internal use only
+    raise ArgumentError, "both of body argument and HTTPRequest#body set" if str and (@body or @body_stream)
+    self.body = str if str
+    if @body.nil? && @body_stream.nil? && @body_data.nil? && request_body_permitted?
+      self.body = ''
+    end
+  end
+
+  #
+  # write
+  #
+
+  def exec(sock, ver, path)   #:nodoc: internal use only
+    if @body
+      send_request_with_body sock, ver, path, @body
+    elsif @body_stream
+      send_request_with_body_stream sock, ver, path, @body_stream
+    elsif @body_data
+      send_request_with_body_data sock, ver, path, @body_data
+    else
+      write_header sock, ver, path
+    end
+  end
+
+  def update_uri(addr, port, ssl) # :nodoc: internal use only
+    # reflect the connection and @path to @uri
+    return unless @uri
+
+    if ssl
+      scheme = 'https'
+      klass = Gem::URI::HTTPS
+    else
+      scheme = 'http'
+      klass = Gem::URI::HTTP
+    end
+
+    if host = self['host']
+      host.sub!(/:.*/m, '')
+    elsif host = @uri.host
+    else
+     host = addr
+    end
+    # convert the class of the Gem::URI
+    if @uri.is_a?(klass)
+      @uri.host = host
+      @uri.port = port
+    else
+      @uri = klass.new(
+        scheme, @uri.userinfo,
+        host, port, nil,
+        @uri.path, nil, @uri.query, nil)
+    end
+  end
+
+  private
+
+  class Chunker #:nodoc:
+    def initialize(sock)
+      @sock = sock
+      @prev = nil
+    end
+
+    def write(buf)
+      # avoid memcpy() of buf, buf can huge and eat memory bandwidth
+      rv = buf.bytesize
+      @sock.write("#{rv.to_s(16)}\r\n", buf, "\r\n")
+      rv
+    end
+
+    def finish
+      @sock.write("0\r\n\r\n")
+    end
+  end
+
+  def send_request_with_body(sock, ver, path, body)
+    self.content_length = body.bytesize
+    delete 'Transfer-Encoding'
+    supply_default_content_type
+    write_header sock, ver, path
+    wait_for_continue sock, ver if sock.continue_timeout
+    sock.write body
+  end
+
+  def send_request_with_body_stream(sock, ver, path, f)
+    unless content_length() or chunked?
+      raise ArgumentError,
+          "Content-Length not given and Transfer-Encoding is not `chunked'"
+    end
+    supply_default_content_type
+    write_header sock, ver, path
+    wait_for_continue sock, ver if sock.continue_timeout
+    if chunked?
+      chunker = Chunker.new(sock)
+      IO.copy_stream(f, chunker)
+      chunker.finish
+    else
+      IO.copy_stream(f, sock)
+    end
+  end
+
+  def send_request_with_body_data(sock, ver, path, params)
+    if /\Amultipart\/form-data\z/i !~ self.content_type
+      self.content_type = 'application/x-www-form-urlencoded'
+      return send_request_with_body(sock, ver, path, Gem::URI.encode_www_form(params))
+    end
+
+    opt = @form_option.dup
+    require 'securerandom' unless defined?(SecureRandom)
+    opt[:boundary] ||= SecureRandom.urlsafe_base64(40)
+    self.set_content_type(self.content_type, boundary: opt[:boundary])
+    if chunked?
+      write_header sock, ver, path
+      encode_multipart_form_data(sock, params, opt)
+    else
+      require 'tempfile'
+      file = Tempfile.new('multipart')
+      file.binmode
+      encode_multipart_form_data(file, params, opt)
+      file.rewind
+      self.content_length = file.size
+      write_header sock, ver, path
+      IO.copy_stream(file, sock)
+      file.close(true)
+    end
+  end
+
+  def encode_multipart_form_data(out, params, opt)
+    charset = opt[:charset]
+    boundary = opt[:boundary]
+    require 'securerandom' unless defined?(SecureRandom)
+    boundary ||= SecureRandom.urlsafe_base64(40)
+    chunked_p = chunked?
+
+    buf = +''
+    params.each do |key, value, h={}|
+      key = quote_string(key, charset)
+      filename =
+        h.key?(:filename) ? h[:filename] :
+        value.respond_to?(:to_path) ? File.basename(value.to_path) :
+        nil
+
+      buf << "--#{boundary}\r\n"
+      if filename
+        filename = quote_string(filename, charset)
+        type = h[:content_type] || 'application/octet-stream'
+        buf << "Content-Disposition: form-data; " \
+          "name=\"#{key}\"; filename=\"#{filename}\"\r\n" \
+          "Content-Type: #{type}\r\n\r\n"
+        if !out.respond_to?(:write) || !value.respond_to?(:read)
+          # if +out+ is not an IO or +value+ is not an IO
+          buf << (value.respond_to?(:read) ? value.read : value)
+        elsif value.respond_to?(:size) && chunked_p
+          # if +out+ is an IO and +value+ is a File, use IO.copy_stream
+          flush_buffer(out, buf, chunked_p)
+          out << "%x\r\n" % value.size if chunked_p
+          IO.copy_stream(value, out)
+          out << "\r\n" if chunked_p
+        else
+          # +out+ is an IO, and +value+ is not a File but an IO
+          flush_buffer(out, buf, chunked_p)
+          1 while flush_buffer(out, value.read(4096), chunked_p)
+        end
+      else
+        # non-file field:
+        #   HTML5 says, "The parts of the generated multipart/form-data
+        #   resource that correspond to non-file fields must not have a
+        #   Content-Type header specified."
+        buf << "Content-Disposition: form-data; name=\"#{key}\"\r\n\r\n"
+        buf << (value.respond_to?(:read) ? value.read : value)
+      end
+      buf << "\r\n"
+    end
+    buf << "--#{boundary}--\r\n"
+    flush_buffer(out, buf, chunked_p)
+    out << "0\r\n\r\n" if chunked_p
+  end
+
+  def quote_string(str, charset)
+    str = str.encode(charset, fallback:->(c){'&#%d;'%c.encode("UTF-8").ord}) if charset
+    str.gsub(/[\\"]/, '\\\\\&')
+  end
+
+  def flush_buffer(out, buf, chunked_p)
+    return unless buf
+    out << "%x\r\n"%buf.bytesize if chunked_p
+    out << buf
+    out << "\r\n" if chunked_p
+    buf.clear
+  end
+
+  def supply_default_content_type
+    return if content_type()
+    warn 'net/http: Content-Type did not set; using application/x-www-form-urlencoded', uplevel: 1 if $VERBOSE
+    set_content_type 'application/x-www-form-urlencoded'
+  end
+
+  ##
+  # Waits up to the continue timeout for a response from the server provided
+  # we're speaking HTTP 1.1 and are expecting a 100-continue response.
+
+  def wait_for_continue(sock, ver)
+    if ver >= '1.1' and @header['expect'] and
+        @header['expect'].include?('100-continue')
+      if sock.io.to_io.wait_readable(sock.continue_timeout)
+        res = Gem::Net::HTTPResponse.read_new(sock)
+        unless res.kind_of?(Gem::Net::HTTPContinue)
+          res.decode_content = @decode_content
+          throw :response, res
+        end
+      end
+    end
+  end
+
+  def write_header(sock, ver, path)
+    reqline = "#{@method} #{path} HTTP/#{ver}"
+    if /[\r\n]/ =~ reqline
+      raise ArgumentError, "A Request-Line must not contain CR or LF"
+    end
+    buf = +''
+    buf << reqline << "\r\n"
+    each_capitalized do |k,v|
+      buf << "#{k}: #{v}\r\n"
+    end
+    buf << "\r\n"
+    sock.write buf
+  end
+
+end
+
diff --git a/lib/rubygems/vendor/net-http/lib/net/http/header.rb b/lib/rubygems/vendor/net-http/lib/net/http/header.rb
new file mode 100644
index 00000000000000..5cb1da01ec07f6
--- /dev/null
+++ b/lib/rubygems/vendor/net-http/lib/net/http/header.rb
@@ -0,0 +1,981 @@
+# frozen_string_literal: true
+#
+# The \HTTPHeader module provides access to \HTTP headers.
+#
+# The module is included in:
+#
+# - Gem::Net::HTTPGenericRequest (and therefore Gem::Net::HTTPRequest).
+# - Gem::Net::HTTPResponse.
+#
+# The headers are a hash-like collection of key/value pairs called _fields_.
+#
+# == Request and Response Fields
+#
+# Headers may be included in:
+#
+# - A Gem::Net::HTTPRequest object:
+#   the object's headers will be sent with the request.
+#   Any fields may be defined in the request;
+#   see {Setters}[rdoc-ref:Gem::Net::HTTPHeader@Setters].
+# - A Gem::Net::HTTPResponse object:
+#   the objects headers are usually those returned from the host.
+#   Fields may be retrieved from the object;
+#   see {Getters}[rdoc-ref:Gem::Net::HTTPHeader@Getters]
+#   and {Iterators}[rdoc-ref:Gem::Net::HTTPHeader@Iterators].
+#
+# Exactly which fields should be sent or expected depends on the host;
+# see:
+#
+# - {Request fields}[https://en.wikipedia.org/wiki/List_of_HTTP_header_fields#Request_fields].
+# - {Response fields}[https://en.wikipedia.org/wiki/List_of_HTTP_header_fields#Response_fields].
+#
+# == About the Examples
+#
+# :include: doc/net-http/examples.rdoc
+#
+# == Fields
+#
+# A header field is a key/value pair.
+#
+# === Field Keys
+#
+# A field key may be:
+#
+# - A string: Key <tt>'Accept'</tt> is treated as if it were
+#   <tt>'Accept'.downcase</tt>;  i.e., <tt>'accept'</tt>.
+# - A symbol: Key <tt>:Accept</tt> is treated as if it were
+#   <tt>:Accept.to_s.downcase</tt>;  i.e., <tt>'accept'</tt>.
+#
+# Examples:
+#
+#   req = Gem::Net::HTTP::Get.new(uri)
+#   req[:accept]  # => "*/*"
+#   req['Accept'] # => "*/*"
+#   req['ACCEPT'] # => "*/*"
+#
+#   req['accept'] = 'text/html'
+#   req[:accept] = 'text/html'
+#   req['ACCEPT'] = 'text/html'
+#
+# === Field Values
+#
+# A field value may be returned as an array of strings or as a string:
+#
+# - These methods return field values as arrays:
+#
+#   - #get_fields: Returns the array value for the given key,
+#     or +nil+ if it does not exist.
+#   - #to_hash: Returns a hash of all header fields:
+#     each key is a field name; its value is the array value for the field.
+#
+# - These methods return field values as string;
+#   the string value for a field is equivalent to
+#   <tt>self[key.downcase.to_s].join(', '))</tt>:
+#
+#   - #[]: Returns the string value for the given key,
+#     or +nil+ if it does not exist.
+#   - #fetch: Like #[], but accepts a default value
+#     to be returned if the key does not exist.
+#
+# The field value may be set:
+#
+# - #[]=: Sets the value for the given key;
+#   the given value may be a string, a symbol, an array, or a hash.
+# - #add_field: Adds a given value to a value for the given key
+#   (not overwriting the existing value).
+# - #delete: Deletes the field for the given key.
+#
+# Example field values:
+#
+# - \String:
+#
+#     req['Accept'] = 'text/html' # => "text/html"
+#     req['Accept']               # => "text/html"
+#     req.get_fields('Accept')    # => ["text/html"]
+#
+# - \Symbol:
+#
+#     req['Accept'] = :text    # => :text
+#     req['Accept']            # => "text"
+#     req.get_fields('Accept') # => ["text"]
+#
+# - Simple array:
+#
+#     req[:foo] = %w[bar baz bat]
+#     req[:foo]            # => "bar, baz, bat"
+#     req.get_fields(:foo) # => ["bar", "baz", "bat"]
+#
+# - Simple hash:
+#
+#     req[:foo] = {bar: 0, baz: 1, bat: 2}
+#     req[:foo]            # => "bar, 0, baz, 1, bat, 2"
+#     req.get_fields(:foo) # => ["bar", "0", "baz", "1", "bat", "2"]
+#
+# - Nested:
+#
+#     req[:foo] = [%w[bar baz], {bat: 0, bam: 1}]
+#     req[:foo]            # => "bar, baz, bat, 0, bam, 1"
+#     req.get_fields(:foo) # => ["bar", "baz", "bat", "0", "bam", "1"]
+#
+#     req[:foo] = {bar: %w[baz bat], bam: {bah: 0, bad: 1}}
+#     req[:foo]            # => "bar, baz, bat, bam, bah, 0, bad, 1"
+#     req.get_fields(:foo) # => ["bar", "baz", "bat", "bam", "bah", "0", "bad", "1"]
+#
+# == Convenience Methods
+#
+# Various convenience methods retrieve values, set values, query values,
+# set form values, or iterate over fields.
+#
+# === Setters
+#
+# \Method #[]= can set any field, but does little to validate the new value;
+# some of the other setter methods provide some validation:
+#
+# - #[]=: Sets the string or array value for the given key.
+# - #add_field: Creates or adds to the array value for the given key.
+# - #basic_auth: Sets the string authorization header for <tt>'Authorization'</tt>.
+# - #content_length=: Sets the integer length for field <tt>'Content-Length</tt>.
+# - #content_type=: Sets the string value for field <tt>'Content-Type'</tt>.
+# - #proxy_basic_auth: Sets the string authorization header for <tt>'Proxy-Authorization'</tt>.
+# - #set_range: Sets the value for field <tt>'Range'</tt>.
+#
+# === Form Setters
+#
+# - #set_form: Sets an HTML form data set.
+# - #set_form_data: Sets header fields and a body from HTML form data.
+#
+# === Getters
+#
+# \Method #[] can retrieve the value of any field that exists,
+# but always as a string;
+# some of the other getter methods return something different
+# from the simple string value:
+#
+# - #[]: Returns the string field value for the given key.
+# - #content_length: Returns the integer value of field <tt>'Content-Length'</tt>.
+# - #content_range: Returns the Range value of field <tt>'Content-Range'</tt>.
+# - #content_type: Returns the string value of field <tt>'Content-Type'</tt>.
+# - #fetch: Returns the string field value for the given key.
+# - #get_fields: Returns the array field value for the given +key+.
+# - #main_type: Returns first part of the string value of field <tt>'Content-Type'</tt>.
+# - #sub_type: Returns second part of the string value of field <tt>'Content-Type'</tt>.
+# - #range: Returns an array of Range objects of field <tt>'Range'</tt>, or +nil+.
+# - #range_length: Returns the integer length of the range given in field <tt>'Content-Range'</tt>.
+# - #type_params: Returns the string parameters for <tt>'Content-Type'</tt>.
+#
+# === Queries
+#
+# - #chunked?: Returns whether field <tt>'Transfer-Encoding'</tt> is set to <tt>'chunked'</tt>.
+# - #connection_close?: Returns whether field <tt>'Connection'</tt> is set to <tt>'close'</tt>.
+# - #connection_keep_alive?: Returns whether field <tt>'Connection'</tt> is set to <tt>'keep-alive'</tt>.
+# - #key?: Returns whether a given key exists.
+#
+# === Iterators
+#
+# - #each_capitalized: Passes each field capitalized-name/value pair to the block.
+# - #each_capitalized_name: Passes each capitalized field name to the block.
+# - #each_header: Passes each field name/value pair to the block.
+# - #each_name: Passes each field name to the block.
+# - #each_value: Passes each string field value to the block.
+#
+module Gem::Net::HTTPHeader
+  MAX_KEY_LENGTH = 1024
+  MAX_FIELD_LENGTH = 65536
+
+  def initialize_http_header(initheader) #:nodoc:
+    @header = {}
+    return unless initheader
+    initheader.each do |key, value|
+      warn "net/http: duplicated HTTP header: #{key}", uplevel: 3 if key?(key) and $VERBOSE
+      if value.nil?
+        warn "net/http: nil HTTP header: #{key}", uplevel: 3 if $VERBOSE
+      else
+        value = value.strip # raise error for invalid byte sequences
+        if key.to_s.bytesize > MAX_KEY_LENGTH
+          raise ArgumentError, "too long (#{key.bytesize} bytes) header: #{key[0, 30].inspect}..."
+        end
+        if value.to_s.bytesize > MAX_FIELD_LENGTH
+          raise ArgumentError, "header #{key} has too long field value: #{value.bytesize}"
+        end
+        if value.count("\r\n") > 0
+          raise ArgumentError, "header #{key} has field value #{value.inspect}, this cannot include CR/LF"
+        end
+        @header[key.downcase.to_s] = [value]
+      end
+    end
+  end
+
+  def size   #:nodoc: obsolete
+    @header.size
+  end
+
+  alias length size   #:nodoc: obsolete
+
+  # Returns the string field value for the case-insensitive field +key+,
+  # or +nil+ if there is no such key;
+  # see {Fields}[rdoc-ref:Gem::Net::HTTPHeader@Fields]:
+  #
+  #   res = Gem::Net::HTTP.get_response(hostname, '/todos/1')
+  #   res['Connection'] # => "keep-alive"
+  #   res['Nosuch']     # => nil
+  #
+  # Note that some field values may be retrieved via convenience methods;
+  # see {Getters}[rdoc-ref:Gem::Net::HTTPHeader@Getters].
+  def [](key)
+    a = @header[key.downcase.to_s] or return nil
+    a.join(', ')
+  end
+
+  # Sets the value for the case-insensitive +key+ to +val+,
+  # overwriting the previous value if the field exists;
+  # see {Fields}[rdoc-ref:Gem::Net::HTTPHeader@Fields]:
+  #
+  #   req = Gem::Net::HTTP::Get.new(uri)
+  #   req['Accept'] # => "*/*"
+  #   req['Accept'] = 'text/html'
+  #   req['Accept'] # => "text/html"
+  #
+  # Note that some field values may be set via convenience methods;
+  # see {Setters}[rdoc-ref:Gem::Net::HTTPHeader@Setters].
+  def []=(key, val)
+    unless val
+      @header.delete key.downcase.to_s
+      return val
+    end
+    set_field(key, val)
+  end
+
+  # Adds value +val+ to the value array for field +key+ if the field exists;
+  # creates the field with the given +key+ and +val+ if it does not exist.
+  # see {Fields}[rdoc-ref:Gem::Net::HTTPHeader@Fields]:
+  #
+  #   req = Gem::Net::HTTP::Get.new(uri)
+  #   req.add_field('Foo', 'bar')
+  #   req['Foo']            # => "bar"
+  #   req.add_field('Foo', 'baz')
+  #   req['Foo']            # => "bar, baz"
+  #   req.add_field('Foo', %w[baz bam])
+  #   req['Foo']            # => "bar, baz, baz, bam"
+  #   req.get_fields('Foo') # => ["bar", "baz", "baz", "bam"]
+  #
+  def add_field(key, val)
+    stringified_downcased_key = key.downcase.to_s
+    if @header.key?(stringified_downcased_key)
+      append_field_value(@header[stringified_downcased_key], val)
+    else
+      set_field(key, val)
+    end
+  end
+
+  private def set_field(key, val)
+    case val
+    when Enumerable
+      ary = []
+      append_field_value(ary, val)
+      @header[key.downcase.to_s] = ary
+    else
+      val = val.to_s # for compatibility use to_s instead of to_str
+      if val.b.count("\r\n") > 0
+        raise ArgumentError, 'header field value cannot include CR/LF'
+      end
+      @header[key.downcase.to_s] = [val]
+    end
+  end
+
+  private def append_field_value(ary, val)
+    case val
+    when Enumerable
+      val.each{|x| append_field_value(ary, x)}
+    else
+      val = val.to_s
+      if /[\r\n]/n.match?(val.b)
+        raise ArgumentError, 'header field value cannot include CR/LF'
+      end
+      ary.push val
+    end
+  end
+
+  # Returns the array field value for the given +key+,
+  # or +nil+ if there is no such field;
+  # see {Fields}[rdoc-ref:Gem::Net::HTTPHeader@Fields]:
+  #
+  #   res = Gem::Net::HTTP.get_response(hostname, '/todos/1')
+  #   res.get_fields('Connection') # => ["keep-alive"]
+  #   res.get_fields('Nosuch')     # => nil
+  #
+  def get_fields(key)
+    stringified_downcased_key = key.downcase.to_s
+    return nil unless @header[stringified_downcased_key]
+    @header[stringified_downcased_key].dup
+  end
+
+  # call-seq:
+  #   fetch(key, default_val = nil) {|key| ... } -> object
+  #   fetch(key, default_val = nil) -> value or default_val
+  #
+  # With a block, returns the string value for +key+ if it exists;
+  # otherwise returns the value of the block;
+  # ignores the +default_val+;
+  # see {Fields}[rdoc-ref:Gem::Net::HTTPHeader@Fields]:
+  #
+  #   res = Gem::Net::HTTP.get_response(hostname, '/todos/1')
+  #
+  #   # Field exists; block not called.
+  #   res.fetch('Connection') do |value|
+  #     fail 'Cannot happen'
+  #   end # => "keep-alive"
+  #
+  #   # Field does not exist; block called.
+  #   res.fetch('Nosuch') do |value|
+  #     value.downcase
+  #   end # => "nosuch"
+  #
+  # With no block, returns the string value for +key+ if it exists;
+  # otherwise, returns +default_val+ if it was given;
+  # otherwise raises an exception:
+  #
+  #   res.fetch('Connection', 'Foo') # => "keep-alive"
+  #   res.fetch('Nosuch', 'Foo')     # => "Foo"
+  #   res.fetch('Nosuch')            # Raises KeyError.
+  #
+  def fetch(key, *args, &block)   #:yield: +key+
+    a = @header.fetch(key.downcase.to_s, *args, &block)
+    a.kind_of?(Array) ? a.join(', ') : a
+  end
+
+  # Calls the block with each key/value pair:
+  #
+  #   res = Gem::Net::HTTP.get_response(hostname, '/todos/1')
+  #   res.each_header do |key, value|
+  #     p [key, value] if key.start_with?('c')
+  #   end
+  #
+  # Output:
+  #
+  #   ["content-type", "application/json; charset=utf-8"]
+  #   ["connection", "keep-alive"]
+  #   ["cache-control", "max-age=43200"]
+  #   ["cf-cache-status", "HIT"]
+  #   ["cf-ray", "771d17e9bc542cf5-ORD"]
+  #
+  # Returns an enumerator if no block is given.
+  #
+  # Gem::Net::HTTPHeader#each is an alias for Gem::Net::HTTPHeader#each_header.
+  def each_header   #:yield: +key+, +value+
+    block_given? or return enum_for(__method__) { @header.size }
+    @header.each do |k,va|
+      yield k, va.join(', ')
+    end
+  end
+
+  alias each each_header
+
+  # Calls the block with each field key:
+  #
+  #   res = Gem::Net::HTTP.get_response(hostname, '/todos/1')
+  #   res.each_key do |key|
+  #     p key if key.start_with?('c')
+  #   end
+  #
+  # Output:
+  #
+  #   "content-type"
+  #   "connection"
+  #   "cache-control"
+  #   "cf-cache-status"
+  #   "cf-ray"
+  #
+  # Returns an enumerator if no block is given.
+  #
+  # Gem::Net::HTTPHeader#each_name is an alias for Gem::Net::HTTPHeader#each_key.
+  def each_name(&block)   #:yield: +key+
+    block_given? or return enum_for(__method__) { @header.size }
+    @header.each_key(&block)
+  end
+
+  alias each_key each_name
+
+  # Calls the block with each capitalized field name:
+  #
+  #   res = Gem::Net::HTTP.get_response(hostname, '/todos/1')
+  #   res.each_capitalized_name do |key|
+  #     p key if key.start_with?('C')
+  #   end
+  #
+  # Output:
+  #
+  #   "Content-Type"
+  #   "Connection"
+  #   "Cache-Control"
+  #   "Cf-Cache-Status"
+  #   "Cf-Ray"
+  #
+  # The capitalization is system-dependent;
+  # see {Case Mapping}[https://docs.ruby-lang.org/en/master/case_mapping_rdoc.html].
+  #
+  # Returns an enumerator if no block is given.
+  def each_capitalized_name  #:yield: +key+
+    block_given? or return enum_for(__method__) { @header.size }
+    @header.each_key do |k|
+      yield capitalize(k)
+    end
+  end
+
+  # Calls the block with each string field value:
+  #
+  #   res = Gem::Net::HTTP.get_response(hostname, '/todos/1')
+  #   res.each_value do |value|
+  #     p value if value.start_with?('c')
+  #   end
+  #
+  # Output:
+  #
+  #   "chunked"
+  #   "cf-q-config;dur=6.0000002122251e-06"
+  #   "cloudflare"
+  #
+  # Returns an enumerator if no block is given.
+  def each_value   #:yield: +value+
+    block_given? or return enum_for(__method__) { @header.size }
+    @header.each_value do |va|
+      yield va.join(', ')
+    end
+  end
+
+  # Removes the header for the given case-insensitive +key+
+  # (see {Fields}[rdoc-ref:Gem::Net::HTTPHeader@Fields]);
+  # returns the deleted value, or +nil+ if no such field exists:
+  #
+  #   req = Gem::Net::HTTP::Get.new(uri)
+  #   req.delete('Accept') # => ["*/*"]
+  #   req.delete('Nosuch') # => nil
+  #
+  def delete(key)
+    @header.delete(key.downcase.to_s)
+  end
+
+  # Returns +true+ if the field for the case-insensitive +key+ exists, +false+ otherwise:
+  #
+  #   req = Gem::Net::HTTP::Get.new(uri)
+  #   req.key?('Accept') # => true
+  #   req.key?('Nosuch') # => false
+  #
+  def key?(key)
+    @header.key?(key.downcase.to_s)
+  end
+
+  # Returns a hash of the key/value pairs:
+  #
+  #   req = Gem::Net::HTTP::Get.new(uri)
+  #   req.to_hash
+  #   # =>
+  #   {"accept-encoding"=>["gzip;q=1.0,deflate;q=0.6,identity;q=0.3"],
+  #    "accept"=>["*/*"],
+  #    "user-agent"=>["Ruby"],
+  #    "host"=>["jsonplaceholder.typicode.com"]}
+  #
+  def to_hash
+    @header.dup
+  end
+
+  # Like #each_header, but the keys are returned in capitalized form.
+  #
+  # Gem::Net::HTTPHeader#canonical_each is an alias for Gem::Net::HTTPHeader#each_capitalized.
+  def each_capitalized
+    block_given? or return enum_for(__method__) { @header.size }
+    @header.each do |k,v|
+      yield capitalize(k), v.join(', ')
+    end
+  end
+
+  alias canonical_each each_capitalized
+
+  def capitalize(name)
+    name.to_s.split('-'.freeze).map {|s| s.capitalize }.join('-'.freeze)
+  end
+  private :capitalize
+
+  # Returns an array of Range objects that represent
+  # the value of field <tt>'Range'</tt>,
+  # or +nil+ if there is no such field;
+  # see {Range request header}[https://en.wikipedia.org/wiki/List_of_HTTP_header_fields#range-request-header]:
+  #
+  #   req = Gem::Net::HTTP::Get.new(uri)
+  #   req['Range'] = 'bytes=0-99,200-299,400-499'
+  #   req.range # => [0..99, 200..299, 400..499]
+  #   req.delete('Range')
+  #   req.range # # => nil
+  #
+  def range
+    return nil unless @header['range']
+
+    value = self['Range']
+    # byte-range-set = *( "," OWS ) ( byte-range-spec / suffix-byte-range-spec )
+    #   *( OWS "," [ OWS ( byte-range-spec / suffix-byte-range-spec ) ] )
+    # corrected collected ABNF
+    # http://tools.ietf.org/html/draft-ietf-httpbis-p5-range-19#section-5.4.1
+    # http://tools.ietf.org/html/draft-ietf-httpbis-p5-range-19#appendix-C
+    # http://tools.ietf.org/html/draft-ietf-httpbis-p1-messaging-19#section-3.2.5
+    unless /\Abytes=((?:,[ \t]*)*(?:\d+-\d*|-\d+)(?:[ \t]*,(?:[ \t]*\d+-\d*|-\d+)?)*)\z/ =~ value
+      raise Gem::Net::HTTPHeaderSyntaxError, "invalid syntax for byte-ranges-specifier: '#{value}'"
+    end
+
+    byte_range_set = $1
+    result = byte_range_set.split(/,/).map {|spec|
+      m = /(\d+)?\s*-\s*(\d+)?/i.match(spec) or
+              raise Gem::Net::HTTPHeaderSyntaxError, "invalid byte-range-spec: '#{spec}'"
+      d1 = m[1].to_i
+      d2 = m[2].to_i
+      if m[1] and m[2]
+        if d1 > d2
+          raise Gem::Net::HTTPHeaderSyntaxError, "last-byte-pos MUST greater than or equal to first-byte-pos but '#{spec}'"
+        end
+        d1..d2
+      elsif m[1]
+        d1..-1
+      elsif m[2]
+        -d2..-1
+      else
+        raise Gem::Net::HTTPHeaderSyntaxError, 'range is not specified'
+      end
+    }
+    # if result.empty?
+    # byte-range-set must include at least one byte-range-spec or suffix-byte-range-spec
+    # but above regexp already denies it.
+    if result.size == 1 && result[0].begin == 0 && result[0].end == -1
+      raise Gem::Net::HTTPHeaderSyntaxError, 'only one suffix-byte-range-spec with zero suffix-length'
+    end
+    result
+  end
+
+  # call-seq:
+  #   set_range(length) -> length
+  #   set_range(offset, length) -> range
+  #   set_range(begin..length) -> range
+  #
+  # Sets the value for field <tt>'Range'</tt>;
+  # see {Range request header}[https://en.wikipedia.org/wiki/List_of_HTTP_header_fields#range-request-header]:
+  #
+  # With argument +length+:
+  #
+  #   req = Gem::Net::HTTP::Get.new(uri)
+  #   req.set_range(100)      # => 100
+  #   req['Range']            # => "bytes=0-99"
+  #
+  # With arguments +offset+ and +length+:
+  #
+  #   req.set_range(100, 100) # => 100...200
+  #   req['Range']            # => "bytes=100-199"
+  #
+  # With argument +range+:
+  #
+  #   req.set_range(100..199) # => 100..199
+  #   req['Range']            # => "bytes=100-199"
+  #
+  # Gem::Net::HTTPHeader#range= is an alias for Gem::Net::HTTPHeader#set_range.
+  def set_range(r, e = nil)
+    unless r
+      @header.delete 'range'
+      return r
+    end
+    r = (r...r+e) if e
+    case r
+    when Numeric
+      n = r.to_i
+      rangestr = (n > 0 ? "0-#{n-1}" : "-#{-n}")
+    when Range
+      first = r.first
+      last = r.end
+      last -= 1 if r.exclude_end?
+      if last == -1
+        rangestr = (first > 0 ? "#{first}-" : "-#{-first}")
+      else
+        raise Gem::Net::HTTPHeaderSyntaxError, 'range.first is negative' if first < 0
+        raise Gem::Net::HTTPHeaderSyntaxError, 'range.last is negative' if last < 0
+        raise Gem::Net::HTTPHeaderSyntaxError, 'must be .first < .last' if first > last
+        rangestr = "#{first}-#{last}"
+      end
+    else
+      raise TypeError, 'Range/Integer is required'
+    end
+    @header['range'] = ["bytes=#{rangestr}"]
+    r
+  end
+
+  alias range= set_range
+
+  # Returns the value of field <tt>'Content-Length'</tt> as an integer,
+  # or +nil+ if there is no such field;
+  # see {Content-Length request header}[https://en.wikipedia.org/wiki/List_of_HTTP_header_fields#content-length-request-header]:
+  #
+  #   res = Gem::Net::HTTP.get_response(hostname, '/nosuch/1')
+  #   res.content_length # => 2
+  #   res = Gem::Net::HTTP.get_response(hostname, '/todos/1')
+  #   res.content_length # => nil
+  #
+  def content_length
+    return nil unless key?('Content-Length')
+    len = self['Content-Length'].slice(/\d+/) or
+        raise Gem::Net::HTTPHeaderSyntaxError, 'wrong Content-Length format'
+    len.to_i
+  end
+
+  # Sets the value of field <tt>'Content-Length'</tt> to the given numeric;
+  # see {Content-Length response header}[https://en.wikipedia.org/wiki/List_of_HTTP_header_fields#content-length-response-header]:
+  #
+  #   _uri = uri.dup
+  #   hostname = _uri.hostname           # => "jsonplaceholder.typicode.com"
+  #   _uri.path = '/posts'               # => "/posts"
+  #   req = Gem::Net::HTTP::Post.new(_uri)    # => #<Gem::Net::HTTP::Post POST>
+  #   req.body = '{"title": "foo","body": "bar","userId": 1}'
+  #   req.content_length = req.body.size # => 42
+  #   req.content_type = 'application/json'
+  #   res = Gem::Net::HTTP.start(hostname) do |http|
+  #     http.request(req)
+  #   end # => #<Gem::Net::HTTPCreated 201 Created readbody=true>
+  #
+  def content_length=(len)
+    unless len
+      @header.delete 'content-length'
+      return nil
+    end
+    @header['content-length'] = [len.to_i.to_s]
+  end
+
+  # Returns +true+ if field <tt>'Transfer-Encoding'</tt>
+  # exists and has value <tt>'chunked'</tt>,
+  # +false+ otherwise;
+  # see {Transfer-Encoding response header}[https://en.wikipedia.org/wiki/List_of_HTTP_header_fields#transfer-encoding-response-header]:
+  #
+  #   res = Gem::Net::HTTP.get_response(hostname, '/todos/1')
+  #   res['Transfer-Encoding'] # => "chunked"
+  #   res.chunked?             # => true
+  #
+  def chunked?
+    return false unless @header['transfer-encoding']
+    field = self['Transfer-Encoding']
+    (/(?:\A|[^\-\w])chunked(?![\-\w])/i =~ field) ? true : false
+  end
+
+  # Returns a Range object representing the value of field
+  # <tt>'Content-Range'</tt>, or +nil+ if no such field exists;
+  # see {Content-Range response header}[https://en.wikipedia.org/wiki/List_of_HTTP_header_fields#content-range-response-header]:
+  #
+  #   res = Gem::Net::HTTP.get_response(hostname, '/todos/1')
+  #   res['Content-Range'] # => nil
+  #   res['Content-Range'] = 'bytes 0-499/1000'
+  #   res['Content-Range'] # => "bytes 0-499/1000"
+  #   res.content_range    # => 0..499
+  #
+  def content_range
+    return nil unless @header['content-range']
+    m = %r<\A\s*(\w+)\s+(\d+)-(\d+)/(\d+|\*)>.match(self['Content-Range']) or
+        raise Gem::Net::HTTPHeaderSyntaxError, 'wrong Content-Range format'
+    return unless m[1] == 'bytes'
+    m[2].to_i .. m[3].to_i
+  end
+
+  # Returns the integer representing length of the value of field
+  # <tt>'Content-Range'</tt>, or +nil+ if no such field exists;
+  # see {Content-Range response header}[https://en.wikipedia.org/wiki/List_of_HTTP_header_fields#content-range-response-header]:
+  #
+  #   res = Gem::Net::HTTP.get_response(hostname, '/todos/1')
+  #   res['Content-Range'] # => nil
+  #   res['Content-Range'] = 'bytes 0-499/1000'
+  #   res.range_length     # => 500
+  #
+  def range_length
+    r = content_range() or return nil
+    r.end - r.begin + 1
+  end
+
+  # Returns the {media type}[https://en.wikipedia.org/wiki/Media_type]
+  # from the value of field <tt>'Content-Type'</tt>,
+  # or +nil+ if no such field exists;
+  # see {Content-Type response header}[https://en.wikipedia.org/wiki/List_of_HTTP_header_fields#content-type-response-header]:
+  #
+  #   res = Gem::Net::HTTP.get_response(hostname, '/todos/1')
+  #   res['content-type'] # => "application/json; charset=utf-8"
+  #   res.content_type    # => "application/json"
+  #
+  def content_type
+    main = main_type()
+    return nil unless main
+
+    sub = sub_type()
+    if sub
+      "#{main}/#{sub}"
+    else
+      main
+    end
+  end
+
+  # Returns the leading ('type') part of the
+  # {media type}[https://en.wikipedia.org/wiki/Media_type]
+  # from the value of field <tt>'Content-Type'</tt>,
+  # or +nil+ if no such field exists;
+  # see {Content-Type response header}[https://en.wikipedia.org/wiki/List_of_HTTP_header_fields#content-type-response-header]:
+  #
+  #   res = Gem::Net::HTTP.get_response(hostname, '/todos/1')
+  #   res['content-type'] # => "application/json; charset=utf-8"
+  #   res.main_type       # => "application"
+  #
+  def main_type
+    return nil unless @header['content-type']
+    self['Content-Type'].split(';').first.to_s.split('/')[0].to_s.strip
+  end
+
+  # Returns the trailing ('subtype') part of the
+  # {media type}[https://en.wikipedia.org/wiki/Media_type]
+  # from the value of field <tt>'Content-Type'</tt>,
+  # or +nil+ if no such field exists;
+  # see {Content-Type response header}[https://en.wikipedia.org/wiki/List_of_HTTP_header_fields#content-type-response-header]:
+  #
+  #   res = Gem::Net::HTTP.get_response(hostname, '/todos/1')
+  #   res['content-type'] # => "application/json; charset=utf-8"
+  #   res.sub_type        # => "json"
+  #
+  def sub_type
+    return nil unless @header['content-type']
+    _, sub = *self['Content-Type'].split(';').first.to_s.split('/')
+    return nil unless sub
+    sub.strip
+  end
+
+  # Returns the trailing ('parameters') part of the value of field <tt>'Content-Type'</tt>,
+  # or +nil+ if no such field exists;
+  # see {Content-Type response header}[https://en.wikipedia.org/wiki/List_of_HTTP_header_fields#content-type-response-header]:
+  #
+  #   res = Gem::Net::HTTP.get_response(hostname, '/todos/1')
+  #   res['content-type'] # => "application/json; charset=utf-8"
+  #   res.type_params     # => {"charset"=>"utf-8"}
+  #
+  def type_params
+    result = {}
+    list = self['Content-Type'].to_s.split(';')
+    list.shift
+    list.each do |param|
+      k, v = *param.split('=', 2)
+      result[k.strip] = v.strip
+    end
+    result
+  end
+
+  # Sets the value of field <tt>'Content-Type'</tt>;
+  # returns the new value;
+  # see {Content-Type request header}[https://en.wikipedia.org/wiki/List_of_HTTP_header_fields#content-type-request-header]:
+  #
+  #   req = Gem::Net::HTTP::Get.new(uri)
+  #   req.set_content_type('application/json') # => ["application/json"]
+  #
+  # Gem::Net::HTTPHeader#content_type= is an alias for Gem::Net::HTTPHeader#set_content_type.
+  def set_content_type(type, params = {})
+    @header['content-type'] = [type + params.map{|k,v|"; #{k}=#{v}"}.join('')]
+  end
+
+  alias content_type= set_content_type
+
+  # Sets the request body to a URL-encoded string derived from argument +params+,
+  # and sets request header field <tt>'Content-Type'</tt>
+  # to <tt>'application/x-www-form-urlencoded'</tt>.
+  #
+  # The resulting request is suitable for HTTP request +POST+ or +PUT+.
+  #
+  # Argument +params+ must be suitable for use as argument +enum+ to
+  # {Gem::URI.encode_www_form}[https://docs.ruby-lang.org/en/master/Gem::URI.html#method-c-encode_www_form].
+  #
+  # With only argument +params+ given,
+  # sets the body to a URL-encoded string with the default separator <tt>'&'</tt>:
+  #
+  #   req = Gem::Net::HTTP::Post.new('example.com')
+  #
+  #   req.set_form_data(q: 'ruby', lang: 'en')
+  #   req.body            # => "q=ruby&lang=en"
+  #   req['Content-Type'] # => "application/x-www-form-urlencoded"
+  #
+  #   req.set_form_data([['q', 'ruby'], ['lang', 'en']])
+  #   req.body            # => "q=ruby&lang=en"
+  #
+  #   req.set_form_data(q: ['ruby', 'perl'], lang: 'en')
+  #   req.body            # => "q=ruby&q=perl&lang=en"
+  #
+  #   req.set_form_data([['q', 'ruby'], ['q', 'perl'], ['lang', 'en']])
+  #   req.body            # => "q=ruby&q=perl&lang=en"
+  #
+  # With string argument +sep+ also given,
+  # uses that string as the separator:
+  #
+  #   req.set_form_data({q: 'ruby', lang: 'en'}, '|')
+  #   req.body # => "q=ruby|lang=en"
+  #
+  # Gem::Net::HTTPHeader#form_data= is an alias for Gem::Net::HTTPHeader#set_form_data.
+  def set_form_data(params, sep = '&')
+    query = Gem::URI.encode_www_form(params)
+    query.gsub!(/&/, sep) if sep != '&'
+    self.body = query
+    self.content_type = 'application/x-www-form-urlencoded'
+  end
+
+  alias form_data= set_form_data
+
+  # Stores form data to be used in a +POST+ or +PUT+ request.
+  #
+  # The form data given in +params+ consists of zero or more fields;
+  # each field is:
+  #
+  # - A scalar value.
+  # - A name/value pair.
+  # - An IO stream opened for reading.
+  #
+  # Argument +params+ should be an
+  # {Enumerable}[https://docs.ruby-lang.org/en/master/Enumerable.html#module-Enumerable-label-Enumerable+in+Ruby+Classes]
+  # (method <tt>params.map</tt> will be called),
+  # and is often an array or hash.
+  #
+  # First, we set up a request:
+  #
+  #   _uri = uri.dup
+  #   _uri.path ='/posts'
+  #   req = Gem::Net::HTTP::Post.new(_uri)
+  #
+  # <b>Argument +params+ As an Array</b>
+  #
+  # When +params+ is an array,
+  # each of its elements is a subarray that defines a field;
+  # the subarray may contain:
+  #
+  # - One string:
+  #
+  #     req.set_form([['foo'], ['bar'], ['baz']])
+  #
+  # - Two strings:
+  #
+  #     req.set_form([%w[foo 0], %w[bar 1], %w[baz 2]])
+  #
+  # - When argument +enctype+ (see below) is given as
+  #   <tt>'multipart/form-data'</tt>:
+  #
+  #   - A string name and an IO stream opened for reading:
+  #
+  #       require 'stringio'
+  #       req.set_form([['file', StringIO.new('Ruby is cool.')]])
+  #
+  #   - A string name, an IO stream opened for reading,
+  #     and an options hash, which may contain these entries:
+  #
+  #     - +:filename+: The name of the file to use.
+  #     - +:content_type+: The content type of the uploaded file.
+  #
+  #     Example:
+  #
+  #       req.set_form([['file', file, {filename: "other-filename.foo"}]]
+  #
+  # The various forms may be mixed:
+  #
+  #   req.set_form(['foo', %w[bar 1], ['file', file]])
+  #
+  # <b>Argument +params+ As a Hash</b>
+  #
+  # When +params+ is a hash,
+  # each of its entries is a name/value pair that defines a field:
+  #
+  # - The name is a string.
+  # - The value may be:
+  #
+  #   - +nil+.
+  #   - Another string.
+  #   - An IO stream opened for reading
+  #     (only when argument +enctype+ -- see below -- is given as
+  #     <tt>'multipart/form-data'</tt>).
+  #
+  # Examples:
+  #
+  #   # Nil-valued fields.
+  #   req.set_form({'foo' => nil, 'bar' => nil, 'baz' => nil})
+  #
+  #   # String-valued fields.
+  #   req.set_form({'foo' => 0, 'bar' => 1, 'baz' => 2})
+  #
+  #   # IO-valued field.
+  #   require 'stringio'
+  #   req.set_form({'file' => StringIO.new('Ruby is cool.')})
+  #
+  #   # Mixture of fields.
+  #   req.set_form({'foo' => nil, 'bar' => 1, 'file' => file})
+  #
+  # Optional argument +enctype+ specifies the value to be given
+  # to field <tt>'Content-Type'</tt>, and must be one of:
+  #
+  # - <tt>'application/x-www-form-urlencoded'</tt> (the default).
+  # - <tt>'multipart/form-data'</tt>;
+  #   see {RFC 7578}[https://www.rfc-editor.org/rfc/rfc7578].
+  #
+  # Optional argument +formopt+ is a hash of options
+  # (applicable only when argument +enctype+
+  # is <tt>'multipart/form-data'</tt>)
+  # that may include the following entries:
+  #
+  # - +:boundary+: The value is the boundary string for the multipart message.
+  #   If not given, the boundary is a random string.
+  #   See {Boundary}[https://www.rfc-editor.org/rfc/rfc7578#section-4.1].
+  # - +:charset+: Value is the character set for the form submission.
+  #   Field names and values of non-file fields should be encoded with this charset.
+  #
+  def set_form(params, enctype='application/x-www-form-urlencoded', formopt={})
+    @body_data = params
+    @body = nil
+    @body_stream = nil
+    @form_option = formopt
+    case enctype
+    when /\Aapplication\/x-www-form-urlencoded\z/i,
+      /\Amultipart\/form-data\z/i
+      self.content_type = enctype
+    else
+      raise ArgumentError, "invalid enctype: #{enctype}"
+    end
+  end
+
+  # Sets header <tt>'Authorization'</tt> using the given
+  # +account+ and +password+ strings:
+  #
+  #   req.basic_auth('my_account', 'my_password')
+  #   req['Authorization']
+  #   # => "Basic bXlfYWNjb3VudDpteV9wYXNzd29yZA=="
+  #
+  def basic_auth(account, password)
+    @header['authorization'] = [basic_encode(account, password)]
+  end
+
+  # Sets header <tt>'Proxy-Authorization'</tt> using the given
+  # +account+ and +password+ strings:
+  #
+  #   req.proxy_basic_auth('my_account', 'my_password')
+  #   req['Proxy-Authorization']
+  #   # => "Basic bXlfYWNjb3VudDpteV9wYXNzd29yZA=="
+  #
+  def proxy_basic_auth(account, password)
+    @header['proxy-authorization'] = [basic_encode(account, password)]
+  end
+
+  def basic_encode(account, password)
+    'Basic ' + ["#{account}:#{password}"].pack('m0')
+  end
+  private :basic_encode
+
+# Returns whether the HTTP session is to be closed.
+  def connection_close?
+    token = /(?:\A|,)\s*close\s*(?:\z|,)/i
+    @header['connection']&.grep(token) {return true}
+    @header['proxy-connection']&.grep(token) {return true}
+    false
+  end
+
+# Returns whether the HTTP session is to be kept alive.
+  def connection_keep_alive?
+    token = /(?:\A|,)\s*keep-alive\s*(?:\z|,)/i
+    @header['connection']&.grep(token) {return true}
+    @header['proxy-connection']&.grep(token) {return true}
+    false
+  end
+
+end
diff --git a/lib/rubygems/vendor/net-http/lib/net/http/proxy_delta.rb b/lib/rubygems/vendor/net-http/lib/net/http/proxy_delta.rb
new file mode 100644
index 00000000000000..137295a883b5b1
--- /dev/null
+++ b/lib/rubygems/vendor/net-http/lib/net/http/proxy_delta.rb
@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+module Gem::Net::HTTP::ProxyDelta   #:nodoc: internal use only
+  private
+
+  def conn_address
+    proxy_address()
+  end
+
+  def conn_port
+    proxy_port()
+  end
+
+  def edit_path(path)
+    use_ssl? ? path : "http://#{addr_port()}#{path}"
+  end
+end
+
diff --git a/lib/rubygems/vendor/net-http/lib/net/http/request.rb b/lib/rubygems/vendor/net-http/lib/net/http/request.rb
new file mode 100644
index 00000000000000..495ec9be5424f5
--- /dev/null
+++ b/lib/rubygems/vendor/net-http/lib/net/http/request.rb
@@ -0,0 +1,88 @@
+# frozen_string_literal: true
+
+# This class is the base class for \Gem::Net::HTTP request classes.
+# The class should not be used directly;
+# instead you should use its subclasses, listed below.
+#
+# == Creating a Request
+#
+# An request object may be created with either a Gem::URI or a string hostname:
+#
+#   require 'rubygems/vendor/net-http/lib/net/http'
+#   uri = Gem::URI('https://jsonplaceholder.typicode.com/')
+#   req = Gem::Net::HTTP::Get.new(uri)          # => #<Gem::Net::HTTP::Get GET>
+#   req = Gem::Net::HTTP::Get.new(uri.hostname) # => #<Gem::Net::HTTP::Get GET>
+#
+# And with any of the subclasses:
+#
+#   req = Gem::Net::HTTP::Head.new(uri) # => #<Gem::Net::HTTP::Head HEAD>
+#   req = Gem::Net::HTTP::Post.new(uri) # => #<Gem::Net::HTTP::Post POST>
+#   req = Gem::Net::HTTP::Put.new(uri)  # => #<Gem::Net::HTTP::Put PUT>
+#   # ...
+#
+# The new instance is suitable for use as the argument to Gem::Net::HTTP#request.
+#
+# == Request Headers
+#
+# A new request object has these header fields by default:
+#
+#   req.to_hash
+#   # =>
+#   {"accept-encoding"=>["gzip;q=1.0,deflate;q=0.6,identity;q=0.3"],
+#   "accept"=>["*/*"],
+#   "user-agent"=>["Ruby"],
+#   "host"=>["jsonplaceholder.typicode.com"]}
+#
+# See:
+#
+# - {Request header Accept-Encoding}[https://en.wikipedia.org/wiki/List_of_HTTP_header_fields#Accept-Encoding]
+#   and {Compression and Decompression}[rdoc-ref:Gem::Net::HTTP@Compression+and+Decompression].
+# - {Request header Accept}[https://en.wikipedia.org/wiki/List_of_HTTP_header_fields#accept-request-header].
+# - {Request header User-Agent}[https://en.wikipedia.org/wiki/List_of_HTTP_header_fields#user-agent-request-header].
+# - {Request header Host}[https://en.wikipedia.org/wiki/List_of_HTTP_header_fields#host-request-header].
+#
+# You can add headers or override default headers:
+#
+#   #   res = Gem::Net::HTTP::Get.new(uri, {'foo' => '0', 'bar' => '1'})
+#
+# This class (and therefore its subclasses) also includes (indirectly)
+# module Gem::Net::HTTPHeader, which gives access to its
+# {methods for setting headers}[rdoc-ref:Gem::Net::HTTPHeader@Setters].
+#
+# == Request Subclasses
+#
+# Subclasses for HTTP requests:
+#
+# - Gem::Net::HTTP::Get
+# - Gem::Net::HTTP::Head
+# - Gem::Net::HTTP::Post
+# - Gem::Net::HTTP::Put
+# - Gem::Net::HTTP::Delete
+# - Gem::Net::HTTP::Options
+# - Gem::Net::HTTP::Trace
+# - Gem::Net::HTTP::Patch
+#
+# Subclasses for WebDAV requests:
+#
+# - Gem::Net::HTTP::Propfind
+# - Gem::Net::HTTP::Proppatch
+# - Gem::Net::HTTP::Mkcol
+# - Gem::Net::HTTP::Copy
+# - Gem::Net::HTTP::Move
+# - Gem::Net::HTTP::Lock
+# - Gem::Net::HTTP::Unlock
+#
+class Gem::Net::HTTPRequest < Gem::Net::HTTPGenericRequest
+  # Creates an HTTP request object for +path+.
+  #
+  # +initheader+ are the default headers to use.  Gem::Net::HTTP adds
+  # Accept-Encoding to enable compression of the response body unless
+  # Accept-Encoding or Range are supplied in +initheader+.
+
+  def initialize(path, initheader = nil)
+    super self.class::METHOD,
+          self.class::REQUEST_HAS_BODY,
+          self.class::RESPONSE_HAS_BODY,
+          path, initheader
+  end
+end
diff --git a/lib/rubygems/vendor/net-http/lib/net/http/requests.rb b/lib/rubygems/vendor/net-http/lib/net/http/requests.rb
new file mode 100644
index 00000000000000..45727e7f61fc0f
--- /dev/null
+++ b/lib/rubygems/vendor/net-http/lib/net/http/requests.rb
@@ -0,0 +1,430 @@
+# frozen_string_literal: true
+
+# HTTP/1.1 methods --- RFC2616
+
+# \Class for representing
+# {HTTP method GET}[https://en.wikipedia.org/w/index.php?title=Hypertext_Transfer_Protocol#GET_method]:
+#
+#   require 'rubygems/vendor/net-http/lib/net/http'
+#   uri = Gem::URI('http://example.com')
+#   hostname = uri.hostname # => "example.com"
+#   req = Gem::Net::HTTP::Get.new(uri) # => #<Gem::Net::HTTP::Get GET>
+#   res = Gem::Net::HTTP.start(hostname) do |http|
+#     http.request(req)
+#   end
+#
+# See {Request Headers}[rdoc-ref:Gem::Net::HTTPRequest@Request+Headers].
+#
+# Properties:
+#
+# - Request body: optional.
+# - Response body: yes.
+# - {Safe}[https://en.wikipedia.org/wiki/Hypertext_Transfer_Protocol#Safe_methods]: yes.
+# - {Idempotent}[https://en.wikipedia.org/wiki/Hypertext_Transfer_Protocol#Idempotent_methods]: yes.
+# - {Cacheable}[https://en.wikipedia.org/wiki/Hypertext_Transfer_Protocol#Cacheable_methods]: yes.
+#
+# Related:
+#
+# - Gem::Net::HTTP.get: sends +GET+ request, returns response body.
+# - Gem::Net::HTTP#get: sends +GET+ request, returns response object.
+#
+class Gem::Net::HTTP::Get < Gem::Net::HTTPRequest
+  METHOD = 'GET'
+  REQUEST_HAS_BODY  = false
+  RESPONSE_HAS_BODY = true
+end
+
+# \Class for representing
+# {HTTP method HEAD}[https://en.wikipedia.org/w/index.php?title=Hypertext_Transfer_Protocol#HEAD_method]:
+#
+#   require 'rubygems/vendor/net-http/lib/net/http'
+#   uri = Gem::URI('http://example.com')
+#   hostname = uri.hostname # => "example.com"
+#   req = Gem::Net::HTTP::Head.new(uri) # => #<Gem::Net::HTTP::Head HEAD>
+#   res = Gem::Net::HTTP.start(hostname) do |http|
+#     http.request(req)
+#   end
+#
+# See {Request Headers}[rdoc-ref:Gem::Net::HTTPRequest@Request+Headers].
+#
+# Properties:
+#
+# - Request body: optional.
+# - Response body: no.
+# - {Safe}[https://en.wikipedia.org/wiki/Hypertext_Transfer_Protocol#Safe_methods]: yes.
+# - {Idempotent}[https://en.wikipedia.org/wiki/Hypertext_Transfer_Protocol#Idempotent_methods]: yes.
+# - {Cacheable}[https://en.wikipedia.org/wiki/Hypertext_Transfer_Protocol#Cacheable_methods]: yes.
+#
+# Related:
+#
+# - Gem::Net::HTTP#head: sends +HEAD+ request, returns response object.
+#
+class Gem::Net::HTTP::Head < Gem::Net::HTTPRequest
+  METHOD = 'HEAD'
+  REQUEST_HAS_BODY = false
+  RESPONSE_HAS_BODY = false
+end
+
+# \Class for representing
+# {HTTP method POST}[https://en.wikipedia.org/w/index.php?title=Hypertext_Transfer_Protocol#POST_method]:
+#
+#   require 'rubygems/vendor/net-http/lib/net/http'
+#   uri = Gem::URI('http://example.com')
+#   hostname = uri.hostname # => "example.com"
+#   uri.path = '/posts'
+#   req = Gem::Net::HTTP::Post.new(uri) # => #<Gem::Net::HTTP::Post POST>
+#   req.body = '{"title": "foo","body": "bar","userId": 1}'
+#   req.content_type = 'application/json'
+#   res = Gem::Net::HTTP.start(hostname) do |http|
+#     http.request(req)
+#   end
+#
+# See {Request Headers}[rdoc-ref:Gem::Net::HTTPRequest@Request+Headers].
+#
+# Properties:
+#
+# - Request body: yes.
+# - Response body: yes.
+# - {Safe}[https://en.wikipedia.org/wiki/Hypertext_Transfer_Protocol#Safe_methods]: no.
+# - {Idempotent}[https://en.wikipedia.org/wiki/Hypertext_Transfer_Protocol#Idempotent_methods]: no.
+# - {Cacheable}[https://en.wikipedia.org/wiki/Hypertext_Transfer_Protocol#Cacheable_methods]: yes.
+#
+# Related:
+#
+# - Gem::Net::HTTP.post: sends +POST+ request, returns response object.
+# - Gem::Net::HTTP#post: sends +POST+ request, returns response object.
+#
+class Gem::Net::HTTP::Post < Gem::Net::HTTPRequest
+  METHOD = 'POST'
+  REQUEST_HAS_BODY = true
+  RESPONSE_HAS_BODY = true
+end
+
+# \Class for representing
+# {HTTP method PUT}[https://en.wikipedia.org/w/index.php?title=Hypertext_Transfer_Protocol#PUT_method]:
+#
+#   require 'rubygems/vendor/net-http/lib/net/http'
+#   uri = Gem::URI('http://example.com')
+#   hostname = uri.hostname # => "example.com"
+#   uri.path = '/posts'
+#   req = Gem::Net::HTTP::Put.new(uri) # => #<Gem::Net::HTTP::Put PUT>
+#   req.body = '{"title": "foo","body": "bar","userId": 1}'
+#   req.content_type = 'application/json'
+#   res = Gem::Net::HTTP.start(hostname) do |http|
+#     http.request(req)
+#   end
+#
+# See {Request Headers}[rdoc-ref:Gem::Net::HTTPRequest@Request+Headers].
+#
+# Properties:
+#
+# - Request body: yes.
+# - Response body: yes.
+# - {Safe}[https://en.wikipedia.org/wiki/Hypertext_Transfer_Protocol#Safe_methods]: no.
+# - {Idempotent}[https://en.wikipedia.org/wiki/Hypertext_Transfer_Protocol#Idempotent_methods]: yes.
+# - {Cacheable}[https://en.wikipedia.org/wiki/Hypertext_Transfer_Protocol#Cacheable_methods]: no.
+#
+# Related:
+#
+# - Gem::Net::HTTP.put: sends +PUT+ request, returns response object.
+# - Gem::Net::HTTP#put: sends +PUT+ request, returns response object.
+#
+class Gem::Net::HTTP::Put < Gem::Net::HTTPRequest
+  METHOD = 'PUT'
+  REQUEST_HAS_BODY = true
+  RESPONSE_HAS_BODY = true
+end
+
+# \Class for representing
+# {HTTP method DELETE}[https://en.wikipedia.org/w/index.php?title=Hypertext_Transfer_Protocol#DELETE_method]:
+#
+#   require 'rubygems/vendor/net-http/lib/net/http'
+#   uri = Gem::URI('http://example.com')
+#   hostname = uri.hostname # => "example.com"
+#   uri.path = '/posts/1'
+#   req = Gem::Net::HTTP::Delete.new(uri) # => #<Gem::Net::HTTP::Delete DELETE>
+#   res = Gem::Net::HTTP.start(hostname) do |http|
+#     http.request(req)
+#   end
+#
+# See {Request Headers}[rdoc-ref:Gem::Net::HTTPRequest@Request+Headers].
+#
+# Properties:
+#
+# - Request body: optional.
+# - Response body: yes.
+# - {Safe}[https://en.wikipedia.org/wiki/Hypertext_Transfer_Protocol#Safe_methods]: no.
+# - {Idempotent}[https://en.wikipedia.org/wiki/Hypertext_Transfer_Protocol#Idempotent_methods]: yes.
+# - {Cacheable}[https://en.wikipedia.org/wiki/Hypertext_Transfer_Protocol#Cacheable_methods]: no.
+#
+# Related:
+#
+# - Gem::Net::HTTP#delete: sends +DELETE+ request, returns response object.
+#
+class Gem::Net::HTTP::Delete < Gem::Net::HTTPRequest
+  METHOD = 'DELETE'
+  REQUEST_HAS_BODY = false
+  RESPONSE_HAS_BODY = true
+end
+
+# \Class for representing
+# {HTTP method OPTIONS}[https://en.wikipedia.org/w/index.php?title=Hypertext_Transfer_Protocol#OPTIONS_method]:
+#
+#   require 'rubygems/vendor/net-http/lib/net/http'
+#   uri = Gem::URI('http://example.com')
+#   hostname = uri.hostname # => "example.com"
+#   req = Gem::Net::HTTP::Options.new(uri) # => #<Gem::Net::HTTP::Options OPTIONS>
+#   res = Gem::Net::HTTP.start(hostname) do |http|
+#     http.request(req)
+#   end
+#
+# See {Request Headers}[rdoc-ref:Gem::Net::HTTPRequest@Request+Headers].
+#
+# Properties:
+#
+# - Request body: optional.
+# - Response body: yes.
+# - {Safe}[https://en.wikipedia.org/wiki/Hypertext_Transfer_Protocol#Safe_methods]: yes.
+# - {Idempotent}[https://en.wikipedia.org/wiki/Hypertext_Transfer_Protocol#Idempotent_methods]: yes.
+# - {Cacheable}[https://en.wikipedia.org/wiki/Hypertext_Transfer_Protocol#Cacheable_methods]: no.
+#
+# Related:
+#
+# - Gem::Net::HTTP#options: sends +OPTIONS+ request, returns response object.
+#
+class Gem::Net::HTTP::Options < Gem::Net::HTTPRequest
+  METHOD = 'OPTIONS'
+  REQUEST_HAS_BODY = false
+  RESPONSE_HAS_BODY = true
+end
+
+# \Class for representing
+# {HTTP method TRACE}[https://en.wikipedia.org/w/index.php?title=Hypertext_Transfer_Protocol#TRACE_method]:
+#
+#   require 'rubygems/vendor/net-http/lib/net/http'
+#   uri = Gem::URI('http://example.com')
+#   hostname = uri.hostname # => "example.com"
+#   req = Gem::Net::HTTP::Trace.new(uri) # => #<Gem::Net::HTTP::Trace TRACE>
+#   res = Gem::Net::HTTP.start(hostname) do |http|
+#     http.request(req)
+#   end
+#
+# See {Request Headers}[rdoc-ref:Gem::Net::HTTPRequest@Request+Headers].
+#
+# Properties:
+#
+# - Request body: no.
+# - Response body: yes.
+# - {Safe}[https://en.wikipedia.org/wiki/Hypertext_Transfer_Protocol#Safe_methods]: yes.
+# - {Idempotent}[https://en.wikipedia.org/wiki/Hypertext_Transfer_Protocol#Idempotent_methods]: yes.
+# - {Cacheable}[https://en.wikipedia.org/wiki/Hypertext_Transfer_Protocol#Cacheable_methods]: no.
+#
+# Related:
+#
+# - Gem::Net::HTTP#trace: sends +TRACE+ request, returns response object.
+#
+class Gem::Net::HTTP::Trace < Gem::Net::HTTPRequest
+  METHOD = 'TRACE'
+  REQUEST_HAS_BODY = false
+  RESPONSE_HAS_BODY = true
+end
+
+# \Class for representing
+# {HTTP method PATCH}[https://en.wikipedia.org/w/index.php?title=Hypertext_Transfer_Protocol#PATCH_method]:
+#
+#   require 'rubygems/vendor/net-http/lib/net/http'
+#   uri = Gem::URI('http://example.com')
+#   hostname = uri.hostname # => "example.com"
+#   uri.path = '/posts'
+#   req = Gem::Net::HTTP::Patch.new(uri) # => #<Gem::Net::HTTP::Patch PATCH>
+#   req.body = '{"title": "foo","body": "bar","userId": 1}'
+#   req.content_type = 'application/json'
+#   res = Gem::Net::HTTP.start(hostname) do |http|
+#     http.request(req)
+#   end
+#
+# See {Request Headers}[rdoc-ref:Gem::Net::HTTPRequest@Request+Headers].
+#
+# Properties:
+#
+# - Request body: yes.
+# - Response body: yes.
+# - {Safe}[https://en.wikipedia.org/wiki/Hypertext_Transfer_Protocol#Safe_methods]: no.
+# - {Idempotent}[https://en.wikipedia.org/wiki/Hypertext_Transfer_Protocol#Idempotent_methods]: no.
+# - {Cacheable}[https://en.wikipedia.org/wiki/Hypertext_Transfer_Protocol#Cacheable_methods]: no.
+#
+# Related:
+#
+# - Gem::Net::HTTP#patch: sends +PATCH+ request, returns response object.
+#
+class Gem::Net::HTTP::Patch < Gem::Net::HTTPRequest
+  METHOD = 'PATCH'
+  REQUEST_HAS_BODY = true
+  RESPONSE_HAS_BODY = true
+end
+
+#
+# WebDAV methods --- RFC2518
+#
+
+# \Class for representing
+# {WebDAV method PROPFIND}[http://www.webdav.org/specs/rfc4918.html#METHOD_PROPFIND]:
+#
+#   require 'rubygems/vendor/net-http/lib/net/http'
+#   uri = Gem::URI('http://example.com')
+#   hostname = uri.hostname # => "example.com"
+#   req = Gem::Net::HTTP::Propfind.new(uri) # => #<Gem::Net::HTTP::Propfind PROPFIND>
+#   res = Gem::Net::HTTP.start(hostname) do |http|
+#     http.request(req)
+#   end
+#
+# See {Request Headers}[rdoc-ref:Gem::Net::HTTPRequest@Request+Headers].
+#
+# Related:
+#
+# - Gem::Net::HTTP#propfind: sends +PROPFIND+ request, returns response object.
+#
+class Gem::Net::HTTP::Propfind < Gem::Net::HTTPRequest
+  METHOD = 'PROPFIND'
+  REQUEST_HAS_BODY = true
+  RESPONSE_HAS_BODY = true
+end
+
+# \Class for representing
+# {WebDAV method PROPPATCH}[http://www.webdav.org/specs/rfc4918.html#METHOD_PROPPATCH]:
+#
+#   require 'rubygems/vendor/net-http/lib/net/http'
+#   uri = Gem::URI('http://example.com')
+#   hostname = uri.hostname # => "example.com"
+#   req = Gem::Net::HTTP::Proppatch.new(uri) # => #<Gem::Net::HTTP::Proppatch PROPPATCH>
+#   res = Gem::Net::HTTP.start(hostname) do |http|
+#     http.request(req)
+#   end
+#
+# See {Request Headers}[rdoc-ref:Gem::Net::HTTPRequest@Request+Headers].
+#
+# Related:
+#
+# - Gem::Net::HTTP#proppatch: sends +PROPPATCH+ request, returns response object.
+#
+class Gem::Net::HTTP::Proppatch < Gem::Net::HTTPRequest
+  METHOD = 'PROPPATCH'
+  REQUEST_HAS_BODY = true
+  RESPONSE_HAS_BODY = true
+end
+
+# \Class for representing
+# {WebDAV method MKCOL}[http://www.webdav.org/specs/rfc4918.html#METHOD_MKCOL]:
+#
+#   require 'rubygems/vendor/net-http/lib/net/http'
+#   uri = Gem::URI('http://example.com')
+#   hostname = uri.hostname # => "example.com"
+#   req = Gem::Net::HTTP::Mkcol.new(uri) # => #<Gem::Net::HTTP::Mkcol MKCOL>
+#   res = Gem::Net::HTTP.start(hostname) do |http|
+#     http.request(req)
+#   end
+#
+# See {Request Headers}[rdoc-ref:Gem::Net::HTTPRequest@Request+Headers].
+#
+# Related:
+#
+# - Gem::Net::HTTP#mkcol: sends +MKCOL+ request, returns response object.
+#
+class Gem::Net::HTTP::Mkcol < Gem::Net::HTTPRequest
+  METHOD = 'MKCOL'
+  REQUEST_HAS_BODY = true
+  RESPONSE_HAS_BODY = true
+end
+
+# \Class for representing
+# {WebDAV method COPY}[http://www.webdav.org/specs/rfc4918.html#METHOD_COPY]:
+#
+#   require 'rubygems/vendor/net-http/lib/net/http'
+#   uri = Gem::URI('http://example.com')
+#   hostname = uri.hostname # => "example.com"
+#   req = Gem::Net::HTTP::Copy.new(uri) # => #<Gem::Net::HTTP::Copy COPY>
+#   res = Gem::Net::HTTP.start(hostname) do |http|
+#     http.request(req)
+#   end
+#
+# See {Request Headers}[rdoc-ref:Gem::Net::HTTPRequest@Request+Headers].
+#
+# Related:
+#
+# - Gem::Net::HTTP#copy: sends +COPY+ request, returns response object.
+#
+class Gem::Net::HTTP::Copy < Gem::Net::HTTPRequest
+  METHOD = 'COPY'
+  REQUEST_HAS_BODY = false
+  RESPONSE_HAS_BODY = true
+end
+
+# \Class for representing
+# {WebDAV method MOVE}[http://www.webdav.org/specs/rfc4918.html#METHOD_MOVE]:
+#
+#   require 'rubygems/vendor/net-http/lib/net/http'
+#   uri = Gem::URI('http://example.com')
+#   hostname = uri.hostname # => "example.com"
+#   req = Gem::Net::HTTP::Move.new(uri) # => #<Gem::Net::HTTP::Move MOVE>
+#   res = Gem::Net::HTTP.start(hostname) do |http|
+#     http.request(req)
+#   end
+#
+# See {Request Headers}[rdoc-ref:Gem::Net::HTTPRequest@Request+Headers].
+#
+# Related:
+#
+# - Gem::Net::HTTP#move: sends +MOVE+ request, returns response object.
+#
+class Gem::Net::HTTP::Move < Gem::Net::HTTPRequest
+  METHOD = 'MOVE'
+  REQUEST_HAS_BODY = false
+  RESPONSE_HAS_BODY = true
+end
+
+# \Class for representing
+# {WebDAV method LOCK}[http://www.webdav.org/specs/rfc4918.html#METHOD_LOCK]:
+#
+#   require 'rubygems/vendor/net-http/lib/net/http'
+#   uri = Gem::URI('http://example.com')
+#   hostname = uri.hostname # => "example.com"
+#   req = Gem::Net::HTTP::Lock.new(uri) # => #<Gem::Net::HTTP::Lock LOCK>
+#   res = Gem::Net::HTTP.start(hostname) do |http|
+#     http.request(req)
+#   end
+#
+# See {Request Headers}[rdoc-ref:Gem::Net::HTTPRequest@Request+Headers].
+#
+# Related:
+#
+# - Gem::Net::HTTP#lock: sends +LOCK+ request, returns response object.
+#
+class Gem::Net::HTTP::Lock < Gem::Net::HTTPRequest
+  METHOD = 'LOCK'
+  REQUEST_HAS_BODY = true
+  RESPONSE_HAS_BODY = true
+end
+
+# \Class for representing
+# {WebDAV method UNLOCK}[http://www.webdav.org/specs/rfc4918.html#METHOD_UNLOCK]:
+#
+#   require 'rubygems/vendor/net-http/lib/net/http'
+#   uri = Gem::URI('http://example.com')
+#   hostname = uri.hostname # => "example.com"
+#   req = Gem::Net::HTTP::Unlock.new(uri) # => #<Gem::Net::HTTP::Unlock UNLOCK>
+#   res = Gem::Net::HTTP.start(hostname) do |http|
+#     http.request(req)
+#   end
+#
+# See {Request Headers}[rdoc-ref:Gem::Net::HTTPRequest@Request+Headers].
+#
+# Related:
+#
+# - Gem::Net::HTTP#unlock: sends +UNLOCK+ request, returns response object.
+#
+class Gem::Net::HTTP::Unlock < Gem::Net::HTTPRequest
+  METHOD = 'UNLOCK'
+  REQUEST_HAS_BODY = true
+  RESPONSE_HAS_BODY = true
+end
+
diff --git a/lib/rubygems/vendor/net-http/lib/net/http/response.rb b/lib/rubygems/vendor/net-http/lib/net/http/response.rb
new file mode 100644
index 00000000000000..cbbd191d879ba7
--- /dev/null
+++ b/lib/rubygems/vendor/net-http/lib/net/http/response.rb
@@ -0,0 +1,738 @@
+# frozen_string_literal: true
+
+# This class is the base class for \Gem::Net::HTTP response classes.
+#
+# == About the Examples
+#
+# :include: doc/net-http/examples.rdoc
+#
+# == Returned Responses
+#
+# \Method Gem::Net::HTTP.get_response returns
+# an instance of one of the subclasses of \Gem::Net::HTTPResponse:
+#
+#   Gem::Net::HTTP.get_response(uri)
+#   # => #<Gem::Net::HTTPOK 200 OK readbody=true>
+#   Gem::Net::HTTP.get_response(hostname, '/nosuch')
+#   # => #<Gem::Net::HTTPNotFound 404 Not Found readbody=true>
+#
+# As does method Gem::Net::HTTP#request:
+#
+#   req = Gem::Net::HTTP::Get.new(uri)
+#   Gem::Net::HTTP.start(hostname) do |http|
+#     http.request(req)
+#   end # => #<Gem::Net::HTTPOK 200 OK readbody=true>
+#
+# \Class \Gem::Net::HTTPResponse includes module Gem::Net::HTTPHeader,
+# which provides access to response header values via (among others):
+#
+# - \Hash-like method <tt>[]</tt>.
+# - Specific reader methods, such as +content_type+.
+#
+# Examples:
+#
+#   res = Gem::Net::HTTP.get_response(uri) # => #<Gem::Net::HTTPOK 200 OK readbody=true>
+#   res['Content-Type']               # => "text/html; charset=UTF-8"
+#   res.content_type                  # => "text/html"
+#
+# == Response Subclasses
+#
+# \Class \Gem::Net::HTTPResponse has a subclass for each
+# {HTTP status code}[https://en.wikipedia.org/wiki/List_of_HTTP_status_codes].
+# You can look up the response class for a given code:
+#
+#   Gem::Net::HTTPResponse::CODE_TO_OBJ['200'] # => Gem::Net::HTTPOK
+#   Gem::Net::HTTPResponse::CODE_TO_OBJ['400'] # => Gem::Net::HTTPBadRequest
+#   Gem::Net::HTTPResponse::CODE_TO_OBJ['404'] # => Gem::Net::HTTPNotFound
+#
+# And you can retrieve the status code for a response object:
+#
+#   Gem::Net::HTTP.get_response(uri).code                 # => "200"
+#   Gem::Net::HTTP.get_response(hostname, '/nosuch').code # => "404"
+#
+# The response subclasses (indentation shows class hierarchy):
+#
+# - Gem::Net::HTTPUnknownResponse (for unhandled \HTTP extensions).
+#
+# - Gem::Net::HTTPInformation:
+#
+#   - Gem::Net::HTTPContinue (100)
+#   - Gem::Net::HTTPSwitchProtocol (101)
+#   - Gem::Net::HTTPProcessing (102)
+#   - Gem::Net::HTTPEarlyHints (103)
+#
+# - Gem::Net::HTTPSuccess:
+#
+#   - Gem::Net::HTTPOK (200)
+#   - Gem::Net::HTTPCreated (201)
+#   - Gem::Net::HTTPAccepted (202)
+#   - Gem::Net::HTTPNonAuthoritativeInformation (203)
+#   - Gem::Net::HTTPNoContent (204)
+#   - Gem::Net::HTTPResetContent (205)
+#   - Gem::Net::HTTPPartialContent (206)
+#   - Gem::Net::HTTPMultiStatus (207)
+#   - Gem::Net::HTTPAlreadyReported (208)
+#   - Gem::Net::HTTPIMUsed (226)
+#
+# - Gem::Net::HTTPRedirection:
+#
+#   - Gem::Net::HTTPMultipleChoices (300)
+#   - Gem::Net::HTTPMovedPermanently (301)
+#   - Gem::Net::HTTPFound (302)
+#   - Gem::Net::HTTPSeeOther (303)
+#   - Gem::Net::HTTPNotModified (304)
+#   - Gem::Net::HTTPUseProxy (305)
+#   - Gem::Net::HTTPTemporaryRedirect (307)
+#   - Gem::Net::HTTPPermanentRedirect (308)
+#
+# - Gem::Net::HTTPClientError:
+#
+#   - Gem::Net::HTTPBadRequest (400)
+#   - Gem::Net::HTTPUnauthorized (401)
+#   - Gem::Net::HTTPPaymentRequired (402)
+#   - Gem::Net::HTTPForbidden (403)
+#   - Gem::Net::HTTPNotFound (404)
+#   - Gem::Net::HTTPMethodNotAllowed (405)
+#   - Gem::Net::HTTPNotAcceptable (406)
+#   - Gem::Net::HTTPProxyAuthenticationRequired (407)
+#   - Gem::Net::HTTPRequestTimeOut (408)
+#   - Gem::Net::HTTPConflict (409)
+#   - Gem::Net::HTTPGone (410)
+#   - Gem::Net::HTTPLengthRequired (411)
+#   - Gem::Net::HTTPPreconditionFailed (412)
+#   - Gem::Net::HTTPRequestEntityTooLarge (413)
+#   - Gem::Net::HTTPRequestURITooLong (414)
+#   - Gem::Net::HTTPUnsupportedMediaType (415)
+#   - Gem::Net::HTTPRequestedRangeNotSatisfiable (416)
+#   - Gem::Net::HTTPExpectationFailed (417)
+#   - Gem::Net::HTTPMisdirectedRequest (421)
+#   - Gem::Net::HTTPUnprocessableEntity (422)
+#   - Gem::Net::HTTPLocked (423)
+#   - Gem::Net::HTTPFailedDependency (424)
+#   - Gem::Net::HTTPUpgradeRequired (426)
+#   - Gem::Net::HTTPPreconditionRequired (428)
+#   - Gem::Net::HTTPTooManyRequests (429)
+#   - Gem::Net::HTTPRequestHeaderFieldsTooLarge (431)
+#   - Gem::Net::HTTPUnavailableForLegalReasons (451)
+#
+# - Gem::Net::HTTPServerError:
+#
+#   - Gem::Net::HTTPInternalServerError (500)
+#   - Gem::Net::HTTPNotImplemented (501)
+#   - Gem::Net::HTTPBadGateway (502)
+#   - Gem::Net::HTTPServiceUnavailable (503)
+#   - Gem::Net::HTTPGatewayTimeOut (504)
+#   - Gem::Net::HTTPVersionNotSupported (505)
+#   - Gem::Net::HTTPVariantAlsoNegotiates (506)
+#   - Gem::Net::HTTPInsufficientStorage (507)
+#   - Gem::Net::HTTPLoopDetected (508)
+#   - Gem::Net::HTTPNotExtended (510)
+#   - Gem::Net::HTTPNetworkAuthenticationRequired (511)
+#
+# There is also the Gem::Net::HTTPBadResponse exception which is raised when
+# there is a protocol error.
+#
+class Gem::Net::HTTPResponse
+  class << self
+    # true if the response has a body.
+    def body_permitted?
+      self::HAS_BODY
+    end
+
+    def exception_type   # :nodoc: internal use only
+      self::EXCEPTION_TYPE
+    end
+
+    def read_new(sock)   #:nodoc: internal use only
+      httpv, code, msg = read_status_line(sock)
+      res = response_class(code).new(httpv, code, msg)
+      each_response_header(sock) do |k,v|
+        res.add_field k, v
+      end
+      res
+    end
+
+    private
+
+    def read_status_line(sock)
+      str = sock.readline
+      m = /\AHTTP(?:\/(\d+\.\d+))?\s+(\d\d\d)(?:\s+(.*))?\z/in.match(str) or
+        raise Gem::Net::HTTPBadResponse, "wrong status line: #{str.dump}"
+      m.captures
+    end
+
+    def response_class(code)
+      CODE_TO_OBJ[code] or
+      CODE_CLASS_TO_OBJ[code[0,1]] or
+      Gem::Net::HTTPUnknownResponse
+    end
+
+    def each_response_header(sock)
+      key = value = nil
+      while true
+        line = sock.readuntil("\n", true).sub(/\s+\z/, '')
+        break if line.empty?
+        if line[0] == ?\s or line[0] == ?\t and value
+          value << ' ' unless value.empty?
+          value << line.strip
+        else
+          yield key, value if key
+          key, value = line.strip.split(/\s*:\s*/, 2)
+          raise Gem::Net::HTTPBadResponse, 'wrong header line format' if value.nil?
+        end
+      end
+      yield key, value if key
+    end
+  end
+
+  # next is to fix bug in RDoc, where the private inside class << self
+  # spills out.
+  public
+
+  include Gem::Net::HTTPHeader
+
+  def initialize(httpv, code, msg)   #:nodoc: internal use only
+    @http_version = httpv
+    @code         = code
+    @message      = msg
+    initialize_http_header nil
+    @body = nil
+    @read = false
+    @uri  = nil
+    @decode_content = false
+    @body_encoding = false
+    @ignore_eof = true
+  end
+
+  # The HTTP version supported by the server.
+  attr_reader :http_version
+
+  # The HTTP result code string. For example, '302'.  You can also
+  # determine the response type by examining which response subclass
+  # the response object is an instance of.
+  attr_reader :code
+
+  # The HTTP result message sent by the server. For example, 'Not Found'.
+  attr_reader :message
+  alias msg message   # :nodoc: obsolete
+
+  # The Gem::URI used to fetch this response.  The response Gem::URI is only available
+  # if a Gem::URI was used to create the request.
+  attr_reader :uri
+
+  # Set to true automatically when the request did not contain an
+  # Accept-Encoding header from the user.
+  attr_accessor :decode_content
+
+  # Returns the value set by body_encoding=, or +false+ if none;
+  # see #body_encoding=.
+  attr_reader :body_encoding
+
+  # Sets the encoding that should be used when reading the body:
+  #
+  # - If the given value is an Encoding object, that encoding will be used.
+  # - Otherwise if the value is a string, the value of
+  #   {Encoding#find(value)}[https://docs.ruby-lang.org/en/master/Encoding.html#method-c-find]
+  #   will be used.
+  # - Otherwise an encoding will be deduced from the body itself.
+  #
+  # Examples:
+  #
+  #   http = Gem::Net::HTTP.new(hostname)
+  #   req = Gem::Net::HTTP::Get.new('/')
+  #
+  #   http.request(req) do |res|
+  #     p res.body.encoding # => #<Encoding:ASCII-8BIT>
+  #   end
+  #
+  #   http.request(req) do |res|
+  #     res.body_encoding = "UTF-8"
+  #     p res.body.encoding # => #<Encoding:UTF-8>
+  #   end
+  #
+  def body_encoding=(value)
+    value = Encoding.find(value) if value.is_a?(String)
+    @body_encoding = value
+  end
+
+  # Whether to ignore EOF when reading bodies with a specified Content-Length
+  # header.
+  attr_accessor :ignore_eof
+
+  def inspect
+    "#<#{self.class} #{@code} #{@message} readbody=#{@read}>"
+  end
+
+  #
+  # response <-> exception relationship
+  #
+
+  def code_type   #:nodoc:
+    self.class
+  end
+
+  def error!   #:nodoc:
+    message = @code
+    message = "#{message} #{@message.dump}" if @message
+    raise error_type().new(message, self)
+  end
+
+  def error_type   #:nodoc:
+    self.class::EXCEPTION_TYPE
+  end
+
+  # Raises an HTTP error if the response is not 2xx (success).
+  def value
+    error! unless self.kind_of?(Gem::Net::HTTPSuccess)
+  end
+
+  def uri= uri # :nodoc:
+    @uri = uri.dup if uri
+  end
+
+  #
+  # header (for backward compatibility only; DO NOT USE)
+  #
+
+  def response   #:nodoc:
+    warn "Gem::Net::HTTPResponse#response is obsolete", uplevel: 1 if $VERBOSE
+    self
+  end
+
+  def header   #:nodoc:
+    warn "Gem::Net::HTTPResponse#header is obsolete", uplevel: 1 if $VERBOSE
+    self
+  end
+
+  def read_header   #:nodoc:
+    warn "Gem::Net::HTTPResponse#read_header is obsolete", uplevel: 1 if $VERBOSE
+    self
+  end
+
+  #
+  # body
+  #
+
+  def reading_body(sock, reqmethodallowbody)  #:nodoc: internal use only
+    @socket = sock
+    @body_exist = reqmethodallowbody && self.class.body_permitted?
+    begin
+      yield
+      self.body   # ensure to read body
+    ensure
+      @socket = nil
+    end
+  end
+
+  # Gets the entity body returned by the remote HTTP server.
+  #
+  # If a block is given, the body is passed to the block, and
+  # the body is provided in fragments, as it is read in from the socket.
+  #
+  # If +dest+ argument is given, response is read into that variable,
+  # with <code>dest#<<</code> method (it could be String or IO, or any
+  # other object responding to <code><<</code>).
+  #
+  # Calling this method a second or subsequent time for the same
+  # HTTPResponse object will return the value already read.
+  #
+  #   http.request_get('/index.html') {|res|
+  #     puts res.read_body
+  #   }
+  #
+  #   http.request_get('/index.html') {|res|
+  #     p res.read_body.object_id   # 538149362
+  #     p res.read_body.object_id   # 538149362
+  #   }
+  #
+  #   # using iterator
+  #   http.request_get('/index.html') {|res|
+  #     res.read_body do |segment|
+  #       print segment
+  #     end
+  #   }
+  #
+  def read_body(dest = nil, &block)
+    if @read
+      raise IOError, "#{self.class}\#read_body called twice" if dest or block
+      return @body
+    end
+    to = procdest(dest, block)
+    stream_check
+    if @body_exist
+      read_body_0 to
+      @body = to
+    else
+      @body = nil
+    end
+    @read = true
+    return if @body.nil?
+
+    case enc = @body_encoding
+    when Encoding, false, nil
+      # Encoding: force given encoding
+      # false/nil: do not force encoding
+    else
+      # other value: detect encoding from body
+      enc = detect_encoding(@body)
+    end
+
+    @body.force_encoding(enc) if enc
+
+    @body
+  end
+
+  # Returns the string response body;
+  # note that repeated calls for the unmodified body return a cached string:
+  #
+  #   path = '/todos/1'
+  #   Gem::Net::HTTP.start(hostname) do |http|
+  #     res = http.get(path)
+  #     p res.body
+  #     p http.head(path).body # No body.
+  #   end
+  #
+  # Output:
+  #
+  #   "{\n  \"userId\": 1,\n  \"id\": 1,\n  \"title\": \"delectus aut autem\",\n  \"completed\": false\n}"
+  #   nil
+  #
+  def body
+    read_body()
+  end
+
+  # Sets the body of the response to the given value.
+  def body=(value)
+    @body = value
+  end
+
+  alias entity body   #:nodoc: obsolete
+
+  private
+
+  # :nodoc:
+  def detect_encoding(str, encoding=nil)
+    if encoding
+    elsif encoding = type_params['charset']
+    elsif encoding = check_bom(str)
+    else
+      encoding = case content_type&.downcase
+      when %r{text/x(?:ht)?ml|application/(?:[^+]+\+)?xml}
+        /\A<xml[ \t\r\n]+
+          version[ \t\r\n]*=[ \t\r\n]*(?:"[0-9.]+"|'[0-9.]*')[ \t\r\n]+
+          encoding[ \t\r\n]*=[ \t\r\n]*
+          (?:"([A-Za-z][\-A-Za-z0-9._]*)"|'([A-Za-z][\-A-Za-z0-9._]*)')/x =~ str
+        encoding = $1 || $2 || Encoding::UTF_8
+      when %r{text/html.*}
+        sniff_encoding(str)
+      end
+    end
+    return encoding
+  end
+
+  # :nodoc:
+  def sniff_encoding(str, encoding=nil)
+    # the encoding sniffing algorithm
+    # http://www.w3.org/TR/html5/parsing.html#determining-the-character-encoding
+    if enc = scanning_meta(str)
+      enc
+    # 6. last visited page or something
+    # 7. frequency
+    elsif str.ascii_only?
+      Encoding::US_ASCII
+    elsif str.dup.force_encoding(Encoding::UTF_8).valid_encoding?
+      Encoding::UTF_8
+    end
+    # 8. implementation-defined or user-specified
+  end
+
+  # :nodoc:
+  def check_bom(str)
+    case str.byteslice(0, 2)
+    when "\xFE\xFF"
+      return Encoding::UTF_16BE
+    when "\xFF\xFE"
+      return Encoding::UTF_16LE
+    end
+    if "\xEF\xBB\xBF" == str.byteslice(0, 3)
+      return Encoding::UTF_8
+    end
+    nil
+  end
+
+  # :nodoc:
+  def scanning_meta(str)
+    require 'strscan'
+    ss = StringScanner.new(str)
+    if ss.scan_until(/<meta[\t\n\f\r ]*/)
+      attrs = {} # attribute_list
+      got_pragma = false
+      need_pragma = nil
+      charset = nil
+
+      # step: Attributes
+      while attr = get_attribute(ss)
+        name, value = *attr
+        next if attrs[name]
+        attrs[name] = true
+        case name
+        when 'http-equiv'
+          got_pragma = true if value == 'content-type'
+        when 'content'
+          encoding = extracting_encodings_from_meta_elements(value)
+          unless charset
+            charset = encoding
+          end
+          need_pragma = true
+        when 'charset'
+          need_pragma = false
+          charset = value
+        end
+      end
+
+      # step: Processing
+      return if need_pragma.nil?
+      return if need_pragma && !got_pragma
+
+      charset = Encoding.find(charset) rescue nil
+      return unless charset
+      charset = Encoding::UTF_8 if charset == Encoding::UTF_16
+      return charset # tentative
+    end
+    nil
+  end
+
+  def get_attribute(ss)
+    ss.scan(/[\t\n\f\r \/]*/)
+    if ss.peek(1) == '>'
+      ss.getch
+      return nil
+    end
+    name = ss.scan(/[^=\t\n\f\r \/>]*/)
+    name.downcase!
+    raise if name.empty?
+    ss.skip(/[\t\n\f\r ]*/)
+    if ss.getch != '='
+      value = ''
+      return [name, value]
+    end
+    ss.skip(/[\t\n\f\r ]*/)
+    case ss.peek(1)
+    when '"'
+      ss.getch
+      value = ss.scan(/[^"]+/)
+      value.downcase!
+      ss.getch
+    when "'"
+      ss.getch
+      value = ss.scan(/[^']+/)
+      value.downcase!
+      ss.getch
+    when '>'
+      value = ''
+    else
+      value = ss.scan(/[^\t\n\f\r >]+/)
+      value.downcase!
+    end
+    [name, value]
+  end
+
+  def extracting_encodings_from_meta_elements(value)
+    # http://dev.w3.org/html5/spec/fetching-resources.html#algorithm-for-extracting-an-encoding-from-a-meta-element
+    if /charset[\t\n\f\r ]*=(?:"([^"]*)"|'([^']*)'|["']|\z|([^\t\n\f\r ;]+))/i =~ value
+      return $1 || $2 || $3
+    end
+    return nil
+  end
+
+  ##
+  # Checks for a supported Content-Encoding header and yields an Inflate
+  # wrapper for this response's socket when zlib is present.  If the
+  # Content-Encoding is not supported or zlib is missing, the plain socket is
+  # yielded.
+  #
+  # If a Content-Range header is present, a plain socket is yielded as the
+  # bytes in the range may not be a complete deflate block.
+
+  def inflater # :nodoc:
+    return yield @socket unless Gem::Net::HTTP::HAVE_ZLIB
+    return yield @socket unless @decode_content
+    return yield @socket if self['content-range']
+
+    v = self['content-encoding']
+    case v&.downcase
+    when 'deflate', 'gzip', 'x-gzip' then
+      self.delete 'content-encoding'
+
+      inflate_body_io = Inflater.new(@socket)
+
+      begin
+        yield inflate_body_io
+        success = true
+      ensure
+        begin
+          inflate_body_io.finish
+          if self['content-length']
+            self['content-length'] = inflate_body_io.bytes_inflated.to_s
+          end
+        rescue => err
+          # Ignore #finish's error if there is an exception from yield
+          raise err if success
+        end
+      end
+    when 'none', 'identity' then
+      self.delete 'content-encoding'
+
+      yield @socket
+    else
+      yield @socket
+    end
+  end
+
+  def read_body_0(dest)
+    inflater do |inflate_body_io|
+      if chunked?
+        read_chunked dest, inflate_body_io
+        return
+      end
+
+      @socket = inflate_body_io
+
+      clen = content_length()
+      if clen
+        @socket.read clen, dest, @ignore_eof
+        return
+      end
+      clen = range_length()
+      if clen
+        @socket.read clen, dest
+        return
+      end
+      @socket.read_all dest
+    end
+  end
+
+  ##
+  # read_chunked reads from +@socket+ for chunk-size, chunk-extension, CRLF,
+  # etc. and +chunk_data_io+ for chunk-data which may be deflate or gzip
+  # encoded.
+  #
+  # See RFC 2616 section 3.6.1 for definitions
+
+  def read_chunked(dest, chunk_data_io) # :nodoc:
+    total = 0
+    while true
+      line = @socket.readline
+      hexlen = line.slice(/[0-9a-fA-F]+/) or
+          raise Gem::Net::HTTPBadResponse, "wrong chunk size line: #{line}"
+      len = hexlen.hex
+      break if len == 0
+      begin
+        chunk_data_io.read len, dest
+      ensure
+        total += len
+        @socket.read 2   # \r\n
+      end
+    end
+    until @socket.readline.empty?
+      # none
+    end
+  end
+
+  def stream_check
+    raise IOError, 'attempt to read body out of block' if @socket.nil? || @socket.closed?
+  end
+
+  def procdest(dest, block)
+    raise ArgumentError, 'both arg and block given for HTTP method' if
+      dest and block
+    if block
+      Gem::Net::ReadAdapter.new(block)
+    else
+      dest || +''
+    end
+  end
+
+  ##
+  # Inflater is a wrapper around Gem::Net::BufferedIO that transparently inflates
+  # zlib and gzip streams.
+
+  class Inflater # :nodoc:
+
+    ##
+    # Creates a new Inflater wrapping +socket+
+
+    def initialize socket
+      @socket = socket
+      # zlib with automatic gzip detection
+      @inflate = Zlib::Inflate.new(32 + Zlib::MAX_WBITS)
+    end
+
+    ##
+    # Finishes the inflate stream.
+
+    def finish
+      return if @inflate.total_in == 0
+      @inflate.finish
+    end
+
+    ##
+    # The number of bytes inflated, used to update the Content-Length of
+    # the response.
+
+    def bytes_inflated
+      @inflate.total_out
+    end
+
+    ##
+    # Returns a Gem::Net::ReadAdapter that inflates each read chunk into +dest+.
+    #
+    # This allows a large response body to be inflated without storing the
+    # entire body in memory.
+
+    def inflate_adapter(dest)
+      if dest.respond_to?(:set_encoding)
+        dest.set_encoding(Encoding::ASCII_8BIT)
+      elsif dest.respond_to?(:force_encoding)
+        dest.force_encoding(Encoding::ASCII_8BIT)
+      end
+      block = proc do |compressed_chunk|
+        @inflate.inflate(compressed_chunk) do |chunk|
+          compressed_chunk.clear
+          dest << chunk
+        end
+      end
+
+      Gem::Net::ReadAdapter.new(block)
+    end
+
+    ##
+    # Reads +clen+ bytes from the socket, inflates them, then writes them to
+    # +dest+.  +ignore_eof+ is passed down to Gem::Net::BufferedIO#read
+    #
+    # Unlike Gem::Net::BufferedIO#read, this method returns more than +clen+ bytes.
+    # At this time there is no way for a user of Gem::Net::HTTPResponse to read a
+    # specific number of bytes from the HTTP response body, so this internal
+    # API does not return the same number of bytes as were requested.
+    #
+    # See https://bugs.ruby-lang.org/issues/6492 for further discussion.
+
+    def read clen, dest, ignore_eof = false
+      temp_dest = inflate_adapter(dest)
+
+      @socket.read clen, temp_dest, ignore_eof
+    end
+
+    ##
+    # Reads the rest of the socket, inflates it, then writes it to +dest+.
+
+    def read_all dest
+      temp_dest = inflate_adapter(dest)
+
+      @socket.read_all temp_dest
+    end
+
+  end
+
+end
+
diff --git a/lib/rubygems/vendor/net-http/lib/net/http/responses.rb b/lib/rubygems/vendor/net-http/lib/net/http/responses.rb
new file mode 100644
index 00000000000000..0f26ae6c26c1ab
--- /dev/null
+++ b/lib/rubygems/vendor/net-http/lib/net/http/responses.rb
@@ -0,0 +1,1174 @@
+# frozen_string_literal: true
+#--
+# https://www.iana.org/assignments/http-status-codes/http-status-codes.xhtml
+
+module Gem::Net
+
+  class HTTPUnknownResponse < HTTPResponse
+    HAS_BODY = true
+    EXCEPTION_TYPE = HTTPError                  #
+  end
+
+  # Parent class for informational (1xx) HTTP response classes.
+  #
+  # An informational response indicates that the request was received and understood.
+  #
+  # References:
+  #
+  # - {RFC 9110}[https://www.rfc-editor.org/rfc/rfc9110.html#status.1xx].
+  # - {Wikipedia}[https://en.wikipedia.org/wiki/List_of_HTTP_status_codes#1xx_informational_response].
+  #
+  class HTTPInformation < HTTPResponse
+    HAS_BODY = false
+    EXCEPTION_TYPE = HTTPError                  #
+  end
+
+  # Parent class for success (2xx) HTTP response classes.
+  #
+  # A success response indicates the action requested by the client
+  # was received, understood, and accepted.
+  #
+  # References:
+  #
+  # - {RFC 9110}[https://www.rfc-editor.org/rfc/rfc9110.html#status.2xx].
+  # - {Wikipedia}[https://en.wikipedia.org/wiki/List_of_HTTP_status_codes#2xx_success].
+  #
+  class HTTPSuccess < HTTPResponse
+    HAS_BODY = true
+    EXCEPTION_TYPE = HTTPError                  #
+  end
+
+  # Parent class for redirection (3xx) HTTP response classes.
+  #
+  # A redirection response indicates the client must take additional action
+  # to complete the request.
+  #
+  # References:
+  #
+  # - {RFC 9110}[https://www.rfc-editor.org/rfc/rfc9110.html#status.3xx].
+  # - {Wikipedia}[https://en.wikipedia.org/wiki/List_of_HTTP_status_codes#3xx_redirection].
+  #
+  class HTTPRedirection < HTTPResponse
+    HAS_BODY = true
+    EXCEPTION_TYPE = HTTPRetriableError         #
+  end
+
+  # Parent class for client error (4xx) HTTP response classes.
+  #
+  # A client error response indicates that the client may have caused an error.
+  #
+  # References:
+  #
+  # - {RFC 9110}[https://www.rfc-editor.org/rfc/rfc9110.html#status.4xx].
+  # - {Wikipedia}[https://en.wikipedia.org/wiki/List_of_HTTP_status_codes#4xx_client_errors].
+  #
+  class HTTPClientError < HTTPResponse
+    HAS_BODY = true
+    EXCEPTION_TYPE = HTTPClientException        #
+  end
+
+  # Parent class for server error (5xx) HTTP response classes.
+  #
+  # A server error response indicates that the server failed to fulfill a request.
+  #
+  # References:
+  #
+  # - {RFC 9110}[https://www.rfc-editor.org/rfc/rfc9110.html#status.5xx].
+  # - {Wikipedia}[https://en.wikipedia.org/wiki/List_of_HTTP_status_codes#5xx_server_errors].
+  #
+  class HTTPServerError < HTTPResponse
+    HAS_BODY = true
+    EXCEPTION_TYPE = HTTPFatalError             #
+  end
+
+  # Response class for +Continue+ responses (status code 100).
+  #
+  # A +Continue+ response indicates that the server has received the request headers.
+  #
+  # :include: doc/net-http/included_getters.rdoc
+  #
+  # References:
+  #
+  # - {Mozilla}[https://developer.mozilla.org/en-US/docs/Web/HTTP/Status/100].
+  # - {RFC 9110}[https://www.rfc-editor.org/rfc/rfc9110.html#name-100-continue].
+  # - {Wikipedia}[https://en.wikipedia.org/wiki/List_of_HTTP_status_codes#100].
+  #
+  class HTTPContinue < HTTPInformation
+    HAS_BODY = false
+  end
+
+  # Response class for <tt>Switching Protocol</tt> responses (status code 101).
+  #
+  # The <tt>Switching Protocol<tt> response indicates that the server has received
+  # a request to switch protocols, and has agreed to do so.
+  #
+  # :include: doc/net-http/included_getters.rdoc
+  #
+  # References:
+  #
+  # - {Mozilla}[https://developer.mozilla.org/en-US/docs/Web/HTTP/Status/101].
+  # - {RFC 9110}[https://www.rfc-editor.org/rfc/rfc9110.html#name-101-switching-protocols].
+  # - {Wikipedia}[https://en.wikipedia.org/wiki/List_of_HTTP_status_codes#101].
+  #
+  class HTTPSwitchProtocol < HTTPInformation
+    HAS_BODY = false
+  end
+
+  # Response class for +Processing+ responses (status code 102).
+  #
+  # The +Processing+ response indicates that the server has received
+  # and is processing the request, but no response is available yet.
+  #
+  # :include: doc/net-http/included_getters.rdoc
+  #
+  # References:
+  #
+  # - {RFC 2518}[https://www.rfc-editor.org/rfc/rfc2518#section-10.1].
+  # - {Wikipedia}[https://en.wikipedia.org/wiki/List_of_HTTP_status_codes#102].
+  #
+  class HTTPProcessing < HTTPInformation
+    HAS_BODY = false
+  end
+
+  # Response class for <tt>Early Hints</tt> responses (status code 103).
+  #
+  # The <tt>Early Hints</tt> indicates that the server has received
+  # and is processing the request, and contains certain headers;
+  # the final response is not available yet.
+  #
+  # :include: doc/net-http/included_getters.rdoc
+  #
+  # References:
+  #
+  # - {Mozilla}[https://developer.mozilla.org/en-US/docs/Web/HTTP/Status/103].
+  # - {RFC 8297}[https://www.rfc-editor.org/rfc/rfc8297.html#section-2].
+  # - {Wikipedia}[https://en.wikipedia.org/wiki/List_of_HTTP_status_codes#103].
+  #
+  class HTTPEarlyHints < HTTPInformation
+    HAS_BODY = false
+  end
+
+  # Response class for +OK+ responses (status code 200).
+  #
+  # The +OK+ response indicates that the server has received
+  # a request and has responded successfully.
+  #
+  # :include: doc/net-http/included_getters.rdoc
+  #
+  # References:
+  #
+  # - {Mozilla}[https://developer.mozilla.org/en-US/docs/Web/HTTP/Status/200].
+  # - {RFC 9110}[https://www.rfc-editor.org/rfc/rfc9110.html#name-200-ok].
+  # - {Wikipedia}[https://en.wikipedia.org/wiki/List_of_HTTP_status_codes#200].
+  #
+  class HTTPOK < HTTPSuccess
+    HAS_BODY = true
+  end
+
+  # Response class for +Created+ responses (status code 201).
+  #
+  # The +Created+ response indicates that the server has received
+  # and has fulfilled a request to create a new resource.
+  #
+  # :include: doc/net-http/included_getters.rdoc
+  #
+  # References:
+  #
+  # - {Mozilla}[https://developer.mozilla.org/en-US/docs/Web/HTTP/Status/201].
+  # - {RFC 9110}[https://www.rfc-editor.org/rfc/rfc9110.html#name-201-created].
+  # - {Wikipedia}[https://en.wikipedia.org/wiki/List_of_HTTP_status_codes#201].
+  #
+  class HTTPCreated < HTTPSuccess
+    HAS_BODY = true
+  end
+
+  # Response class for +Accepted+ responses (status code 202).
+  #
+  # The +Accepted+ response indicates that the server has received
+  # and is processing a request, but the processing has not yet been completed.
+  #
+  # :include: doc/net-http/included_getters.rdoc
+  #
+  # References:
+  #
+  # - {Mozilla}[https://developer.mozilla.org/en-US/docs/Web/HTTP/Status/202].
+  # - {RFC 9110}[https://www.rfc-editor.org/rfc/rfc9110.html#name-202-accepted].
+  # - {Wikipedia}[https://en.wikipedia.org/wiki/List_of_HTTP_status_codes#202].
+  #
+  class HTTPAccepted < HTTPSuccess
+    HAS_BODY = true
+  end
+
+  # Response class for <tt>Non-Authoritative Information</tt> responses (status code 203).
+  #
+  # The <tt>Non-Authoritative Information</tt> response indicates that the server
+  # is a transforming proxy (such as a Web accelerator)
+  # that received a 200 OK response from its origin,
+  # and is returning a modified version of the origin's response.
+  #
+  # :include: doc/net-http/included_getters.rdoc
+  #
+  # References:
+  #
+  # - {Mozilla}[https://developer.mozilla.org/en-US/docs/Web/HTTP/Status/203].
+  # - {RFC 9110}[https://www.rfc-editor.org/rfc/rfc9110.html#name-203-non-authoritative-infor].
+  # - {Wikipedia}[https://en.wikipedia.org/wiki/List_of_HTTP_status_codes#203].
+  #
+  class HTTPNonAuthoritativeInformation < HTTPSuccess
+    HAS_BODY = true
+  end
+
+  # Response class for <tt>No Content</tt> responses (status code 204).
+  #
+  # The <tt>No Content</tt> response indicates that the server
+  # successfully processed the request, and is not returning any content.
+  #
+  # :include: doc/net-http/included_getters.rdoc
+  #
+  # References:
+  #
+  # - {Mozilla}[https://developer.mozilla.org/en-US/docs/Web/HTTP/Status/204].
+  # - {RFC 9110}[https://www.rfc-editor.org/rfc/rfc9110.html#name-204-no-content].
+  # - {Wikipedia}[https://en.wikipedia.org/wiki/List_of_HTTP_status_codes#204].
+  #
+  class HTTPNoContent < HTTPSuccess
+    HAS_BODY = false
+  end
+
+  # Response class for <tt>Reset Content</tt> responses (status code 205).
+  #
+  # The <tt>Reset Content</tt> response indicates that the server
+  # successfully processed the request,
+  # asks that the client reset its document view, and is not returning any content.
+  #
+  # :include: doc/net-http/included_getters.rdoc
+  #
+  # References:
+  #
+  # - {Mozilla}[https://developer.mozilla.org/en-US/docs/Web/HTTP/Status/205].
+  # - {RFC 9110}[https://www.rfc-editor.org/rfc/rfc9110.html#name-205-reset-content].
+  # - {Wikipedia}[https://en.wikipedia.org/wiki/List_of_HTTP_status_codes#205].
+  #
+  class HTTPResetContent < HTTPSuccess
+    HAS_BODY = false
+  end
+
+  # Response class for <tt>Partial Content</tt> responses (status code 206).
+  #
+  # The <tt>Partial Content</tt> response indicates that the server is delivering
+  # only part of the resource (byte serving)
+  # due to a Range header in the request.
+  #
+  # :include: doc/net-http/included_getters.rdoc
+  #
+  # References:
+  #
+  # - {Mozilla}[https://developer.mozilla.org/en-US/docs/Web/HTTP/Status/206].
+  # - {RFC 9110}[https://www.rfc-editor.org/rfc/rfc9110.html#name-206-partial-content].
+  # - {Wikipedia}[https://en.wikipedia.org/wiki/List_of_HTTP_status_codes#206].
+  #
+  class HTTPPartialContent < HTTPSuccess
+    HAS_BODY = true
+  end
+
+  # Response class for <tt>Multi-Status (WebDAV)</tt> responses (status code 207).
+  #
+  # The <tt>Multi-Status (WebDAV)</tt> response indicates that the server
+  # has received the request,
+  # and that the message body can contain a number of separate response codes.
+  #
+  # :include: doc/net-http/included_getters.rdoc
+  #
+  # References:
+  #
+  # - {RFC 4818}[https://www.rfc-editor.org/rfc/rfc4918#section-11.1].
+  # - {Wikipedia}[https://en.wikipedia.org/wiki/List_of_HTTP_status_codes#207].
+  #
+  class HTTPMultiStatus < HTTPSuccess
+    HAS_BODY = true
+  end
+
+  # Response class for <tt>Already Reported (WebDAV)</tt> responses (status code 208).
+  #
+  # The <tt>Already Reported (WebDAV)</tt> response indicates that the server
+  # has received the request,
+  # and that the members of a DAV binding have already been enumerated
+  # in a preceding part of the (multi-status) response,
+  # and are not being included again.
+  #
+  # :include: doc/net-http/included_getters.rdoc
+  #
+  # References:
+  #
+  # - {RFC 5842}[https://www.rfc-editor.org/rfc/rfc5842.html#section-7.1].
+  # - {Wikipedia}[https://en.wikipedia.org/wiki/List_of_HTTP_status_codes#208].
+  #
+  class HTTPAlreadyReported < HTTPSuccess
+    HAS_BODY = true
+  end
+
+  # Response class for <tt>IM Used</tt> responses (status code 226).
+  #
+  # The <tt>IM Used</tt> response indicates that the server has fulfilled a request
+  # for the resource, and the response is a representation of the result
+  # of one or more instance-manipulations applied to the current instance.
+  #
+  # :include: doc/net-http/included_getters.rdoc
+  #
+  # References:
+  #
+  # - {RFC 3229}[https://www.rfc-editor.org/rfc/rfc3229.html#section-10.4.1].
+  # - {Wikipedia}[https://en.wikipedia.org/wiki/List_of_HTTP_status_codes#226].
+  #
+  class HTTPIMUsed < HTTPSuccess
+    HAS_BODY = true
+  end
+
+  # Response class for <tt>Multiple Choices</tt> responses (status code 300).
+  #
+  # The <tt>Multiple Choices</tt> response indicates that the server
+  # offers multiple options for the resource from which the client may choose.
+  #
+  # :include: doc/net-http/included_getters.rdoc
+  #
+  # References:
+  #
+  # - {Mozilla}[https://developer.mozilla.org/en-US/docs/Web/HTTP/Status/300].
+  # - {RFC 9110}[https://www.rfc-editor.org/rfc/rfc9110.html#name-300-multiple-choices].
+  # - {Wikipedia}[https://en.wikipedia.org/wiki/List_of_HTTP_status_codes#300].
+  #
+  class HTTPMultipleChoices < HTTPRedirection
+    HAS_BODY = true
+  end
+  HTTPMultipleChoice = HTTPMultipleChoices
+
+  # Response class for <tt>Moved Permanently</tt> responses (status code 301).
+  #
+  # The <tt>Moved Permanently</tt> response indicates that links or records
+  # returning this response should be updated to use the given URL.
+  #
+  # :include: doc/net-http/included_getters.rdoc
+  #
+  # References:
+  #
+  # - {Mozilla}[https://developer.mozilla.org/en-US/docs/Web/HTTP/Status/301].
+  # - {RFC 9110}[https://www.rfc-editor.org/rfc/rfc9110.html#name-301-moved-permanently].
+  # - {Wikipedia}[https://en.wikipedia.org/wiki/List_of_HTTP_status_codes#301].
+  #
+  class HTTPMovedPermanently < HTTPRedirection
+    HAS_BODY = true
+  end
+
+  # Response class for <tt>Found</tt> responses (status code 302).
+  #
+  # The <tt>Found</tt> response indicates that the client
+  # should look at (browse to) another URL.
+  #
+  # :include: doc/net-http/included_getters.rdoc
+  #
+  # References:
+  #
+  # - {Mozilla}[https://developer.mozilla.org/en-US/docs/Web/HTTP/Status/302].
+  # - {RFC 9110}[https://www.rfc-editor.org/rfc/rfc9110.html#name-302-found].
+  # - {Wikipedia}[https://en.wikipedia.org/wiki/List_of_HTTP_status_codes#302].
+  #
+  class HTTPFound < HTTPRedirection
+    HAS_BODY = true
+  end
+  HTTPMovedTemporarily = HTTPFound
+
+  # Response class for <tt>See Other</tt> responses (status code 303).
+  #
+  # The response to the request can be found under another Gem::URI using the GET method.
+  #
+  # :include: doc/net-http/included_getters.rdoc
+  #
+  # References:
+  #
+  # - {Mozilla}[https://developer.mozilla.org/en-US/docs/Web/HTTP/Status/303].
+  # - {RFC 9110}[https://www.rfc-editor.org/rfc/rfc9110.html#name-303-see-other].
+  # - {Wikipedia}[https://en.wikipedia.org/wiki/List_of_HTTP_status_codes#303].
+  #
+  class HTTPSeeOther < HTTPRedirection
+    HAS_BODY = true
+  end
+
+  # Response class for <tt>Not Modified</tt> responses (status code 304).
+  #
+  # Indicates that the resource has not been modified since the version
+  # specified by the request headers.
+  #
+  # :include: doc/net-http/included_getters.rdoc
+  #
+  # References:
+  #
+  # - {Mozilla}[https://developer.mozilla.org/en-US/docs/Web/HTTP/Status/304].
+  # - {RFC 9110}[https://www.rfc-editor.org/rfc/rfc9110.html#name-304-not-modified].
+  # - {Wikipedia}[https://en.wikipedia.org/wiki/List_of_HTTP_status_codes#304].
+  #
+  class HTTPNotModified < HTTPRedirection
+    HAS_BODY = false
+  end
+
+  # Response class for <tt>Use Proxy</tt> responses (status code 305).
+  #
+  # The requested resource is available only through a proxy,
+  # whose address is provided in the response.
+  #
+  # :include: doc/net-http/included_getters.rdoc
+  #
+  # References:
+  #
+  # - {RFC 9110}[https://www.rfc-editor.org/rfc/rfc9110.html#name-305-use-proxy].
+  # - {Wikipedia}[https://en.wikipedia.org/wiki/List_of_HTTP_status_codes#305].
+  #
+  class HTTPUseProxy < HTTPRedirection
+    HAS_BODY = false
+  end
+
+  # Response class for <tt>Temporary Redirect</tt> responses (status code 307).
+  #
+  # The request should be repeated with another Gem::URI;
+  # however, future requests should still use the original Gem::URI.
+  #
+  # :include: doc/net-http/included_getters.rdoc
+  #
+  # References:
+  #
+  # - {Mozilla}[https://developer.mozilla.org/en-US/docs/Web/HTTP/Status/307].
+  # - {RFC 9110}[https://www.rfc-editor.org/rfc/rfc9110.html#name-307-temporary-redirect].
+  # - {Wikipedia}[https://en.wikipedia.org/wiki/List_of_HTTP_status_codes#307].
+  #
+  class HTTPTemporaryRedirect < HTTPRedirection
+    HAS_BODY = true
+  end
+
+  # Response class for <tt>Permanent Redirect</tt> responses (status code 308).
+  #
+  # This and all future requests should be directed to the given Gem::URI.
+  #
+  # :include: doc/net-http/included_getters.rdoc
+  #
+  # References:
+  #
+  # - {Mozilla}[https://developer.mozilla.org/en-US/docs/Web/HTTP/Status/308].
+  # - {RFC 9110}[https://www.rfc-editor.org/rfc/rfc9110.html#name-308-permanent-redirect].
+  # - {Wikipedia}[https://en.wikipedia.org/wiki/List_of_HTTP_status_codes#308].
+  #
+  class HTTPPermanentRedirect < HTTPRedirection
+    HAS_BODY = true
+  end
+
+  # Response class for <tt>Bad Request</tt> responses (status code 400).
+  #
+  # The server cannot or will not process the request due to an apparent client error.
+  #
+  # :include: doc/net-http/included_getters.rdoc
+  #
+  # References:
+  #
+  # - {Mozilla}[https://developer.mozilla.org/en-US/docs/Web/HTTP/Status/400].
+  # - {RFC 9110}[https://www.rfc-editor.org/rfc/rfc9110.html#name-400-bad-request].
+  # - {Wikipedia}[https://en.wikipedia.org/wiki/List_of_HTTP_status_codes#400].
+  #
+  class HTTPBadRequest < HTTPClientError
+    HAS_BODY = true
+  end
+
+  # Response class for <tt>Unauthorized</tt> responses (status code 401).
+  #
+  # Authentication is required, but either was not provided or failed.
+  #
+  # :include: doc/net-http/included_getters.rdoc
+  #
+  # References:
+  #
+  # - {Mozilla}[https://developer.mozilla.org/en-US/docs/Web/HTTP/Status/401].
+  # - {RFC 9110}[https://www.rfc-editor.org/rfc/rfc9110.html#name-401-unauthorized].
+  # - {Wikipedia}[https://en.wikipedia.org/wiki/List_of_HTTP_status_codes#401].
+  #
+  class HTTPUnauthorized < HTTPClientError
+    HAS_BODY = true
+  end
+
+  # Response class for <tt>Payment Required</tt> responses (status code 402).
+  #
+  # Reserved for future use.
+  #
+  # :include: doc/net-http/included_getters.rdoc
+  #
+  # References:
+  #
+  # - {Mozilla}[https://developer.mozilla.org/en-US/docs/Web/HTTP/Status/402].
+  # - {RFC 9110}[https://www.rfc-editor.org/rfc/rfc9110.html#name-402-payment-required].
+  # - {Wikipedia}[https://en.wikipedia.org/wiki/List_of_HTTP_status_codes#402].
+  #
+  class HTTPPaymentRequired < HTTPClientError
+    HAS_BODY = true
+  end
+
+  # Response class for <tt>Forbidden</tt> responses (status code 403).
+  #
+  # The request contained valid data and was understood by the server,
+  # but the server is refusing action.
+  #
+  # :include: doc/net-http/included_getters.rdoc
+  #
+  # References:
+  #
+  # - {Mozilla}[https://developer.mozilla.org/en-US/docs/Web/HTTP/Status/403].
+  # - {RFC 9110}[https://www.rfc-editor.org/rfc/rfc9110.html#name-403-forbidden].
+  # - {Wikipedia}[https://en.wikipedia.org/wiki/List_of_HTTP_status_codes#403].
+  #
+  class HTTPForbidden < HTTPClientError
+    HAS_BODY = true
+  end
+
+  # Response class for <tt>Not Found</tt> responses (status code 404).
+  #
+  # The requested resource could not be found but may be available in the future.
+  #
+  # :include: doc/net-http/included_getters.rdoc
+  #
+  # References:
+  #
+  # - {Mozilla}[https://developer.mozilla.org/en-US/docs/Web/HTTP/Status/404].
+  # - {RFC 9110}[https://www.rfc-editor.org/rfc/rfc9110.html#name-404-not-found].
+  # - {Wikipedia}[https://en.wikipedia.org/wiki/List_of_HTTP_status_codes#404].
+  #
+  class HTTPNotFound < HTTPClientError
+    HAS_BODY = true
+  end
+
+  # Response class for <tt>Method Not Allowed</tt> responses (status code 405).
+  #
+  # The request method is not supported for the requested resource.
+  #
+  # :include: doc/net-http/included_getters.rdoc
+  #
+  # References:
+  #
+  # - {Mozilla}[https://developer.mozilla.org/en-US/docs/Web/HTTP/Status/405].
+  # - {RFC 9110}[https://www.rfc-editor.org/rfc/rfc9110.html#name-405-method-not-allowed].
+  # - {Wikipedia}[https://en.wikipedia.org/wiki/List_of_HTTP_status_codes#405].
+  #
+  class HTTPMethodNotAllowed < HTTPClientError
+    HAS_BODY = true
+  end
+
+  # Response class for <tt>Not Acceptable</tt> responses (status code 406).
+  #
+  # The requested resource is capable of generating only content
+  # that not acceptable according to the Accept headers sent in the request.
+  #
+  # :include: doc/net-http/included_getters.rdoc
+  #
+  # References:
+  #
+  # - {Mozilla}[https://developer.mozilla.org/en-US/docs/Web/HTTP/Status/406].
+  # - {RFC 9110}[https://www.rfc-editor.org/rfc/rfc9110.html#name-406-not-acceptable].
+  # - {Wikipedia}[https://en.wikipedia.org/wiki/List_of_HTTP_status_codes#406].
+  #
+  class HTTPNotAcceptable < HTTPClientError
+    HAS_BODY = true
+  end
+
+  # Response class for <tt>Proxy Authentication Required</tt> responses (status code 407).
+  #
+  # The client must first authenticate itself with the proxy.
+  #
+  # :include: doc/net-http/included_getters.rdoc
+  #
+  # References:
+  #
+  # - {Mozilla}[https://developer.mozilla.org/en-US/docs/Web/HTTP/Status/407].
+  # - {RFC 9110}[https://www.rfc-editor.org/rfc/rfc9110.html#name-407-proxy-authentication-re].
+  # - {Wikipedia}[https://en.wikipedia.org/wiki/List_of_HTTP_status_codes#407].
+  #
+  class HTTPProxyAuthenticationRequired < HTTPClientError
+    HAS_BODY = true
+  end
+
+  # Response class for <tt>Request Gem::Timeout</tt> responses (status code 408).
+  #
+  # The server timed out waiting for the request.
+  #
+  # :include: doc/net-http/included_getters.rdoc
+  #
+  # References:
+  #
+  # - {Mozilla}[https://developer.mozilla.org/en-US/docs/Web/HTTP/Status/408].
+  # - {RFC 9110}[https://www.rfc-editor.org/rfc/rfc9110.html#name-408-request-timeout].
+  # - {Wikipedia}[https://en.wikipedia.org/wiki/List_of_HTTP_status_codes#408].
+  #
+  class HTTPRequestTimeout < HTTPClientError
+    HAS_BODY = true
+  end
+  HTTPRequestTimeOut = HTTPRequestTimeout
+
+  # Response class for <tt>Conflict</tt> responses (status code 409).
+  #
+  # The request could not be processed because of conflict in the current state of the resource.
+  #
+  # :include: doc/net-http/included_getters.rdoc
+  #
+  # References:
+  #
+  # - {Mozilla}[https://developer.mozilla.org/en-US/docs/Web/HTTP/Status/409].
+  # - {RFC 9110}[https://www.rfc-editor.org/rfc/rfc9110.html#name-409-conflict].
+  # - {Wikipedia}[https://en.wikipedia.org/wiki/List_of_HTTP_status_codes#409].
+  #
+  class HTTPConflict < HTTPClientError
+    HAS_BODY = true
+  end
+
+  # Response class for <tt>Gone</tt> responses (status code 410).
+  #
+  # The resource requested was previously in use but is no longer available
+  # and will not be available again.
+  #
+  # :include: doc/net-http/included_getters.rdoc
+  #
+  # References:
+  #
+  # - {Mozilla}[https://developer.mozilla.org/en-US/docs/Web/HTTP/Status/410].
+  # - {RFC 9110}[https://www.rfc-editor.org/rfc/rfc9110.html#name-410-gone].
+  # - {Wikipedia}[https://en.wikipedia.org/wiki/List_of_HTTP_status_codes#410].
+  #
+  class HTTPGone < HTTPClientError
+    HAS_BODY = true
+  end
+
+  # Response class for <tt>Length Required</tt> responses (status code 411).
+  #
+  # The request did not specify the length of its content,
+  # which is required by the requested resource.
+  #
+  # :include: doc/net-http/included_getters.rdoc
+  #
+  # References:
+  #
+  # - {Mozilla}[https://developer.mozilla.org/en-US/docs/Web/HTTP/Status/411].
+  # - {RFC 9110}[https://www.rfc-editor.org/rfc/rfc9110.html#name-411-length-required].
+  # - {Wikipedia}[https://en.wikipedia.org/wiki/List_of_HTTP_status_codes#411].
+  #
+  class HTTPLengthRequired < HTTPClientError
+    HAS_BODY = true
+  end
+
+  # Response class for <tt>Precondition Failed</tt> responses (status code 412).
+  #
+  # The server does not meet one of the preconditions
+  # specified in the request headers.
+  #
+  # :include: doc/net-http/included_getters.rdoc
+  #
+  # References:
+  #
+  # - {Mozilla}[https://developer.mozilla.org/en-US/docs/Web/HTTP/Status/412].
+  # - {RFC 9110}[https://www.rfc-editor.org/rfc/rfc9110.html#name-412-precondition-failed].
+  # - {Wikipedia}[https://en.wikipedia.org/wiki/List_of_HTTP_status_codes#412].
+  #
+  class HTTPPreconditionFailed < HTTPClientError
+    HAS_BODY = true
+  end
+
+  # Response class for <tt>Payload Too Large</tt> responses (status code 413).
+  #
+  # The request is larger than the server is willing or able to process.
+  #
+  # :include: doc/net-http/included_getters.rdoc
+  #
+  # References:
+  #
+  # - {Mozilla}[https://developer.mozilla.org/en-US/docs/Web/HTTP/Status/413].
+  # - {RFC 9110}[https://www.rfc-editor.org/rfc/rfc9110.html#name-413-content-too-large].
+  # - {Wikipedia}[https://en.wikipedia.org/wiki/List_of_HTTP_status_codes#413].
+  #
+  class HTTPPayloadTooLarge < HTTPClientError
+    HAS_BODY = true
+  end
+  HTTPRequestEntityTooLarge = HTTPPayloadTooLarge
+
+  # Response class for <tt>Gem::URI Too Long</tt> responses (status code 414).
+  #
+  # The Gem::URI provided was too long for the server to process.
+  #
+  # :include: doc/net-http/included_getters.rdoc
+  #
+  # References:
+  #
+  # - {Mozilla}[https://developer.mozilla.org/en-US/docs/Web/HTTP/Status/414].
+  # - {RFC 9110}[https://www.rfc-editor.org/rfc/rfc9110.html#name-414-uri-too-long].
+  # - {Wikipedia}[https://en.wikipedia.org/wiki/List_of_HTTP_status_codes#414].
+  #
+  class HTTPURITooLong < HTTPClientError
+    HAS_BODY = true
+  end
+  HTTPRequestURITooLong = HTTPURITooLong
+  HTTPRequestURITooLarge = HTTPRequestURITooLong
+
+  # Response class for <tt>Unsupported Media Type</tt> responses (status code 415).
+  #
+  # The request entity has a media type which the server or resource does not support.
+  #
+  # :include: doc/net-http/included_getters.rdoc
+  #
+  # References:
+  #
+  # - {Mozilla}[https://developer.mozilla.org/en-US/docs/Web/HTTP/Status/415].
+  # - {RFC 9110}[https://www.rfc-editor.org/rfc/rfc9110.html#name-415-unsupported-media-type].
+  # - {Wikipedia}[https://en.wikipedia.org/wiki/List_of_HTTP_status_codes#415].
+  #
+  class HTTPUnsupportedMediaType < HTTPClientError
+    HAS_BODY = true
+  end
+
+  # Response class for <tt>Range Not Satisfiable</tt> responses (status code 416).
+  #
+  # The request entity has a media type which the server or resource does not support.
+  #
+  # :include: doc/net-http/included_getters.rdoc
+  #
+  # References:
+  #
+  # - {Mozilla}[https://developer.mozilla.org/en-US/docs/Web/HTTP/Status/416].
+  # - {RFC 9110}[https://www.rfc-editor.org/rfc/rfc9110.html#name-416-range-not-satisfiable].
+  # - {Wikipedia}[https://en.wikipedia.org/wiki/List_of_HTTP_status_codes#416].
+  #
+  class HTTPRangeNotSatisfiable < HTTPClientError
+    HAS_BODY = true
+  end
+  HTTPRequestedRangeNotSatisfiable = HTTPRangeNotSatisfiable
+
+  # Response class for <tt>Expectation Failed</tt> responses (status code 417).
+  #
+  # The server cannot meet the requirements of the Expect request-header field.
+  #
+  # :include: doc/net-http/included_getters.rdoc
+  #
+  # References:
+  #
+  # - {Mozilla}[https://developer.mozilla.org/en-US/docs/Web/HTTP/Status/417].
+  # - {RFC 9110}[https://www.rfc-editor.org/rfc/rfc9110.html#name-417-expectation-failed].
+  # - {Wikipedia}[https://en.wikipedia.org/wiki/List_of_HTTP_status_codes#417].
+  #
+  class HTTPExpectationFailed < HTTPClientError
+    HAS_BODY = true
+  end
+
+  # 418 I'm a teapot - RFC 2324; a joke RFC
+  # See https://en.wikipedia.org/wiki/List_of_HTTP_status_codes#418.
+
+  # 420 Enhance Your Calm - Twitter
+
+  # Response class for <tt>Misdirected Request</tt> responses (status code 421).
+  #
+  # The request was directed at a server that is not able to produce a response.
+  #
+  # :include: doc/net-http/included_getters.rdoc
+  #
+  # References:
+  #
+  # - {RFC 9110}[https://www.rfc-editor.org/rfc/rfc9110.html#name-421-misdirected-request].
+  # - {Wikipedia}[https://en.wikipedia.org/wiki/List_of_HTTP_status_codes#421].
+  #
+  class HTTPMisdirectedRequest < HTTPClientError
+    HAS_BODY = true
+  end
+
+  # Response class for <tt>Unprocessable Entity</tt> responses (status code 422).
+  #
+  # The request was well-formed but had semantic errors.
+  #
+  # :include: doc/net-http/included_getters.rdoc
+  #
+  # References:
+  #
+  # - {Mozilla}[https://developer.mozilla.org/en-US/docs/Web/HTTP/Status/422].
+  # - {RFC 9110}[https://www.rfc-editor.org/rfc/rfc9110.html#name-422-unprocessable-content].
+  # - {Wikipedia}[https://en.wikipedia.org/wiki/List_of_HTTP_status_codes#422].
+  #
+  class HTTPUnprocessableEntity < HTTPClientError
+    HAS_BODY = true
+  end
+
+  # Response class for <tt>Locked (WebDAV)</tt> responses (status code 423).
+  #
+  # The requested resource is locked.
+  #
+  # :include: doc/net-http/included_getters.rdoc
+  #
+  # References:
+  #
+  # - {RFC 4918}[https://www.rfc-editor.org/rfc/rfc4918#section-11.3].
+  # - {Wikipedia}[https://en.wikipedia.org/wiki/List_of_HTTP_status_codes#423].
+  #
+  class HTTPLocked < HTTPClientError
+    HAS_BODY = true
+  end
+
+  # Response class for <tt>Failed Dependency (WebDAV)</tt> responses (status code 424).
+  #
+  # The request failed because it depended on another request and that request failed.
+  # See {424 Failed Dependency (WebDAV)}[https://en.wikipedia.org/wiki/List_of_HTTP_status_codes#424].
+  #
+  # :include: doc/net-http/included_getters.rdoc
+  #
+  # References:
+  #
+  # - {RFC 4918}[https://www.rfc-editor.org/rfc/rfc4918#section-11.4].
+  # - {Wikipedia}[https://en.wikipedia.org/wiki/List_of_HTTP_status_codes#424].
+  #
+  class HTTPFailedDependency < HTTPClientError
+    HAS_BODY = true
+  end
+
+  # 425 Too Early
+  # https://en.wikipedia.org/wiki/List_of_HTTP_status_codes#425.
+
+  # Response class for <tt>Upgrade Required</tt> responses (status code 426).
+  #
+  # The client should switch to the protocol given in the Upgrade header field.
+  #
+  # :include: doc/net-http/included_getters.rdoc
+  #
+  # References:
+  #
+  # - {Mozilla}[https://developer.mozilla.org/en-US/docs/Web/HTTP/Status/426].
+  # - {RFC 9110}[https://www.rfc-editor.org/rfc/rfc9110.html#name-426-upgrade-required].
+  # - {Wikipedia}[https://en.wikipedia.org/wiki/List_of_HTTP_status_codes#426].
+  #
+  class HTTPUpgradeRequired < HTTPClientError
+    HAS_BODY = true
+  end
+
+  # Response class for <tt>Precondition Required</tt> responses (status code 428).
+  #
+  # The origin server requires the request to be conditional.
+  #
+  # :include: doc/net-http/included_getters.rdoc
+  #
+  # References:
+  #
+  # - {Mozilla}[https://developer.mozilla.org/en-US/docs/Web/HTTP/Status/428].
+  # - {RFC 6585}[https://www.rfc-editor.org/rfc/rfc6585#section-3].
+  # - {Wikipedia}[https://en.wikipedia.org/wiki/List_of_HTTP_status_codes#428].
+  #
+  class HTTPPreconditionRequired < HTTPClientError
+    HAS_BODY = true
+  end
+
+  # Response class for <tt>Too Many Requests</tt> responses (status code 429).
+  #
+  # The user has sent too many requests in a given amount of time.
+  #
+  # :include: doc/net-http/included_getters.rdoc
+  #
+  # References:
+  #
+  # - {Mozilla}[https://developer.mozilla.org/en-US/docs/Web/HTTP/Status/429].
+  # - {RFC 6585}[https://www.rfc-editor.org/rfc/rfc6585#section-4].
+  # - {Wikipedia}[https://en.wikipedia.org/wiki/List_of_HTTP_status_codes#429].
+  #
+  class HTTPTooManyRequests < HTTPClientError
+    HAS_BODY = true
+  end
+
+  # Response class for <tt>Request Header Fields Too Large</tt> responses (status code 431).
+  #
+  # An individual header field is too large,
+  # or all the header fields collectively, are too large.
+  #
+  # :include: doc/net-http/included_getters.rdoc
+  #
+  # References:
+  #
+  # - {Mozilla}[https://developer.mozilla.org/en-US/docs/Web/HTTP/Status/431].
+  # - {RFC 6585}[https://www.rfc-editor.org/rfc/rfc6585#section-5].
+  # - {Wikipedia}[https://en.wikipedia.org/wiki/List_of_HTTP_status_codes#431].
+  #
+  class HTTPRequestHeaderFieldsTooLarge < HTTPClientError
+    HAS_BODY = true
+  end
+
+  # Response class for <tt>Unavailable For Legal Reasons</tt> responses (status code 451).
+  #
+  # A server operator has received a legal demand to deny access to a resource or to a set of resources
+  # that includes the requested resource.
+  #
+  # :include: doc/net-http/included_getters.rdoc
+  #
+  # References:
+  #
+  # - {Mozilla}[https://developer.mozilla.org/en-US/docs/Web/HTTP/Status/451].
+  # - {RFC 7725}[https://www.rfc-editor.org/rfc/rfc7725.html#section-3].
+  # - {Wikipedia}[https://en.wikipedia.org/wiki/List_of_HTTP_status_codes#451].
+  #
+  class HTTPUnavailableForLegalReasons < HTTPClientError
+    HAS_BODY = true
+  end
+  # 444 No Response - Nginx
+  # 449 Retry With - Microsoft
+  # 450 Blocked by Windows Parental Controls - Microsoft
+  # 499 Client Closed Request - Nginx
+
+  # Response class for <tt>Internal Server Error</tt> responses (status code 500).
+  #
+  # An unexpected condition was encountered and no more specific message is suitable.
+  #
+  # :include: doc/net-http/included_getters.rdoc
+  #
+  # References:
+  #
+  # - {Mozilla}[https://developer.mozilla.org/en-US/docs/Web/HTTP/Status/500].
+  # - {RFC 9110}[https://www.rfc-editor.org/rfc/rfc9110.html#name-500-internal-server-error].
+  # - {Wikipedia}[https://en.wikipedia.org/wiki/List_of_HTTP_status_codes#500].
+  #
+  class HTTPInternalServerError < HTTPServerError
+    HAS_BODY = true
+  end
+
+  # Response class for <tt>Not Implemented</tt> responses (status code 501).
+  #
+  # The server either does not recognize the request method,
+  # or it lacks the ability to fulfil the request.
+  #
+  # :include: doc/net-http/included_getters.rdoc
+  #
+  # References:
+  #
+  # - {Mozilla}[https://developer.mozilla.org/en-US/docs/Web/HTTP/Status/501].
+  # - {RFC 9110}[https://www.rfc-editor.org/rfc/rfc9110.html#name-501-not-implemented].
+  # - {Wikipedia}[https://en.wikipedia.org/wiki/List_of_HTTP_status_codes#501].
+  #
+  class HTTPNotImplemented < HTTPServerError
+    HAS_BODY = true
+  end
+
+  # Response class for <tt>Bad Gateway</tt> responses (status code 502).
+  #
+  # The server was acting as a gateway or proxy
+  # and received an invalid response from the upstream server.
+  #
+  # :include: doc/net-http/included_getters.rdoc
+  #
+  # References:
+  #
+  # - {Mozilla}[https://developer.mozilla.org/en-US/docs/Web/HTTP/Status/502].
+  # - {RFC 9110}[https://www.rfc-editor.org/rfc/rfc9110.html#name-502-bad-gateway].
+  # - {Wikipedia}[https://en.wikipedia.org/wiki/List_of_HTTP_status_codes#502].
+  #
+  class HTTPBadGateway < HTTPServerError
+    HAS_BODY = true
+  end
+
+  # Response class for <tt>Service Unavailable</tt> responses (status code 503).
+  #
+  # The server cannot handle the request
+  # (because it is overloaded or down for maintenance).
+  #
+  # :include: doc/net-http/included_getters.rdoc
+  #
+  # References:
+  #
+  # - {Mozilla}[https://developer.mozilla.org/en-US/docs/Web/HTTP/Status/503].
+  # - {RFC 9110}[https://www.rfc-editor.org/rfc/rfc9110.html#name-503-service-unavailable].
+  # - {Wikipedia}[https://en.wikipedia.org/wiki/List_of_HTTP_status_codes#503].
+  #
+  class HTTPServiceUnavailable < HTTPServerError
+    HAS_BODY = true
+  end
+
+  # Response class for <tt>Gateway Gem::Timeout</tt> responses (status code 504).
+  #
+  # The server was acting as a gateway or proxy
+  # and did not receive a timely response from the upstream server.
+  #
+  # :include: doc/net-http/included_getters.rdoc
+  #
+  # References:
+  #
+  # - {Mozilla}[https://developer.mozilla.org/en-US/docs/Web/HTTP/Status/504].
+  # - {RFC 9110}[https://www.rfc-editor.org/rfc/rfc9110.html#name-504-gateway-timeout].
+  # - {Wikipedia}[https://en.wikipedia.org/wiki/List_of_HTTP_status_codes#504].
+  #
+  class HTTPGatewayTimeout < HTTPServerError
+    HAS_BODY = true
+  end
+  HTTPGatewayTimeOut = HTTPGatewayTimeout
+
+  # Response class for <tt>HTTP Version Not Supported</tt> responses (status code 505).
+  #
+  # The server does not support the HTTP version used in the request.
+  #
+  # :include: doc/net-http/included_getters.rdoc
+  #
+  # References:
+  #
+  # - {Mozilla}[https://developer.mozilla.org/en-US/docs/Web/HTTP/Status/505].
+  # - {RFC 9110}[https://www.rfc-editor.org/rfc/rfc9110.html#name-505-http-version-not-suppor].
+  # - {Wikipedia}[https://en.wikipedia.org/wiki/List_of_HTTP_status_codes#505].
+  #
+  class HTTPVersionNotSupported < HTTPServerError
+    HAS_BODY = true
+  end
+
+  # Response class for <tt>Variant Also Negotiates</tt> responses (status code 506).
+  #
+  # Transparent content negotiation for the request results in a circular reference.
+  #
+  # :include: doc/net-http/included_getters.rdoc
+  #
+  # References:
+  #
+  # - {Mozilla}[https://developer.mozilla.org/en-US/docs/Web/HTTP/Status/506].
+  # - {RFC 2295}[https://www.rfc-editor.org/rfc/rfc2295#section-8.1].
+  # - {Wikipedia}[https://en.wikipedia.org/wiki/List_of_HTTP_status_codes#506].
+  #
+  class HTTPVariantAlsoNegotiates < HTTPServerError
+    HAS_BODY = true
+  end
+
+  # Response class for <tt>Insufficient Storage (WebDAV)</tt> responses (status code 507).
+  #
+  # The server is unable to store the representation needed to complete the request.
+  #
+  # :include: doc/net-http/included_getters.rdoc
+  #
+  # References:
+  #
+  # - {Mozilla}[https://developer.mozilla.org/en-US/docs/Web/HTTP/Status/507].
+  # - {RFC 4918}[https://www.rfc-editor.org/rfc/rfc4918#section-11.5].
+  # - {Wikipedia}[https://en.wikipedia.org/wiki/List_of_HTTP_status_codes#507].
+  #
+  class HTTPInsufficientStorage < HTTPServerError
+    HAS_BODY = true
+  end
+
+  # Response class for <tt>Loop Detected (WebDAV)</tt> responses (status code 508).
+  #
+  # The server detected an infinite loop while processing the request.
+  #
+  # :include: doc/net-http/included_getters.rdoc
+  #
+  # References:
+  #
+  # - {Mozilla}[https://developer.mozilla.org/en-US/docs/Web/HTTP/Status/508].
+  # - {RFC 5942}[https://www.rfc-editor.org/rfc/rfc5842.html#section-7.2].
+  # - {Wikipedia}[https://en.wikipedia.org/wiki/List_of_HTTP_status_codes#508].
+  #
+  class HTTPLoopDetected < HTTPServerError
+    HAS_BODY = true
+  end
+  # 509 Bandwidth Limit Exceeded - Apache bw/limited extension
+
+  # Response class for <tt>Not Extended</tt> responses (status code 510).
+  #
+  # Further extensions to the request are required for the server to fulfill it.
+  #
+  # :include: doc/net-http/included_getters.rdoc
+  #
+  # References:
+  #
+  # - {Mozilla}[https://developer.mozilla.org/en-US/docs/Web/HTTP/Status/510].
+  # - {RFC 2774}[https://www.rfc-editor.org/rfc/rfc2774.html#section-7].
+  # - {Wikipedia}[https://en.wikipedia.org/wiki/List_of_HTTP_status_codes#510].
+  #
+  class HTTPNotExtended < HTTPServerError
+    HAS_BODY = true
+  end
+
+  # Response class for <tt>Network Authentication Required</tt> responses (status code 511).
+  #
+  # The client needs to authenticate to gain network access.
+  #
+  # :include: doc/net-http/included_getters.rdoc
+  #
+  # References:
+  #
+  # - {Mozilla}[https://developer.mozilla.org/en-US/docs/Web/HTTP/Status/511].
+  # - {RFC 6585}[https://www.rfc-editor.org/rfc/rfc6585#section-6].
+  # - {Wikipedia}[https://en.wikipedia.org/wiki/List_of_HTTP_status_codes#511].
+  #
+  class HTTPNetworkAuthenticationRequired < HTTPServerError
+    HAS_BODY = true
+  end
+
+end
+
+class Gem::Net::HTTPResponse
+  CODE_CLASS_TO_OBJ = {
+    '1' => Gem::Net::HTTPInformation,
+    '2' => Gem::Net::HTTPSuccess,
+    '3' => Gem::Net::HTTPRedirection,
+    '4' => Gem::Net::HTTPClientError,
+    '5' => Gem::Net::HTTPServerError
+  }
+  CODE_TO_OBJ = {
+    '100' => Gem::Net::HTTPContinue,
+    '101' => Gem::Net::HTTPSwitchProtocol,
+    '102' => Gem::Net::HTTPProcessing,
+    '103' => Gem::Net::HTTPEarlyHints,
+
+    '200' => Gem::Net::HTTPOK,
+    '201' => Gem::Net::HTTPCreated,
+    '202' => Gem::Net::HTTPAccepted,
+    '203' => Gem::Net::HTTPNonAuthoritativeInformation,
+    '204' => Gem::Net::HTTPNoContent,
+    '205' => Gem::Net::HTTPResetContent,
+    '206' => Gem::Net::HTTPPartialContent,
+    '207' => Gem::Net::HTTPMultiStatus,
+    '208' => Gem::Net::HTTPAlreadyReported,
+    '226' => Gem::Net::HTTPIMUsed,
+
+    '300' => Gem::Net::HTTPMultipleChoices,
+    '301' => Gem::Net::HTTPMovedPermanently,
+    '302' => Gem::Net::HTTPFound,
+    '303' => Gem::Net::HTTPSeeOther,
+    '304' => Gem::Net::HTTPNotModified,
+    '305' => Gem::Net::HTTPUseProxy,
+    '307' => Gem::Net::HTTPTemporaryRedirect,
+    '308' => Gem::Net::HTTPPermanentRedirect,
+
+    '400' => Gem::Net::HTTPBadRequest,
+    '401' => Gem::Net::HTTPUnauthorized,
+    '402' => Gem::Net::HTTPPaymentRequired,
+    '403' => Gem::Net::HTTPForbidden,
+    '404' => Gem::Net::HTTPNotFound,
+    '405' => Gem::Net::HTTPMethodNotAllowed,
+    '406' => Gem::Net::HTTPNotAcceptable,
+    '407' => Gem::Net::HTTPProxyAuthenticationRequired,
+    '408' => Gem::Net::HTTPRequestTimeout,
+    '409' => Gem::Net::HTTPConflict,
+    '410' => Gem::Net::HTTPGone,
+    '411' => Gem::Net::HTTPLengthRequired,
+    '412' => Gem::Net::HTTPPreconditionFailed,
+    '413' => Gem::Net::HTTPPayloadTooLarge,
+    '414' => Gem::Net::HTTPURITooLong,
+    '415' => Gem::Net::HTTPUnsupportedMediaType,
+    '416' => Gem::Net::HTTPRangeNotSatisfiable,
+    '417' => Gem::Net::HTTPExpectationFailed,
+    '421' => Gem::Net::HTTPMisdirectedRequest,
+    '422' => Gem::Net::HTTPUnprocessableEntity,
+    '423' => Gem::Net::HTTPLocked,
+    '424' => Gem::Net::HTTPFailedDependency,
+    '426' => Gem::Net::HTTPUpgradeRequired,
+    '428' => Gem::Net::HTTPPreconditionRequired,
+    '429' => Gem::Net::HTTPTooManyRequests,
+    '431' => Gem::Net::HTTPRequestHeaderFieldsTooLarge,
+    '451' => Gem::Net::HTTPUnavailableForLegalReasons,
+
+    '500' => Gem::Net::HTTPInternalServerError,
+    '501' => Gem::Net::HTTPNotImplemented,
+    '502' => Gem::Net::HTTPBadGateway,
+    '503' => Gem::Net::HTTPServiceUnavailable,
+    '504' => Gem::Net::HTTPGatewayTimeout,
+    '505' => Gem::Net::HTTPVersionNotSupported,
+    '506' => Gem::Net::HTTPVariantAlsoNegotiates,
+    '507' => Gem::Net::HTTPInsufficientStorage,
+    '508' => Gem::Net::HTTPLoopDetected,
+    '510' => Gem::Net::HTTPNotExtended,
+    '511' => Gem::Net::HTTPNetworkAuthenticationRequired,
+  }
+end
diff --git a/lib/rubygems/vendor/net-http/lib/net/http/status.rb b/lib/rubygems/vendor/net-http/lib/net/http/status.rb
new file mode 100644
index 00000000000000..9110b108b8e6ed
--- /dev/null
+++ b/lib/rubygems/vendor/net-http/lib/net/http/status.rb
@@ -0,0 +1,84 @@
+# frozen_string_literal: true
+
+require_relative '../http'
+
+if $0 == __FILE__
+  require 'open-uri'
+  File.foreach(__FILE__) do |line|
+    puts line
+    break if line.start_with?('end')
+  end
+  puts
+  puts "Gem::Net::HTTP::STATUS_CODES = {"
+  url = "https://www.iana.org/assignments/http-status-codes/http-status-codes-1.csv"
+  Gem::URI(url).read.each_line do |line|
+    code, mes, = line.split(',')
+    next if ['(Unused)', 'Unassigned', 'Description'].include?(mes)
+    puts "  #{code} => '#{mes}',"
+  end
+  puts "} # :nodoc:"
+end
+
+Gem::Net::HTTP::STATUS_CODES = {
+  100 => 'Continue',
+  101 => 'Switching Protocols',
+  102 => 'Processing',
+  103 => 'Early Hints',
+  200 => 'OK',
+  201 => 'Created',
+  202 => 'Accepted',
+  203 => 'Non-Authoritative Information',
+  204 => 'No Content',
+  205 => 'Reset Content',
+  206 => 'Partial Content',
+  207 => 'Multi-Status',
+  208 => 'Already Reported',
+  226 => 'IM Used',
+  300 => 'Multiple Choices',
+  301 => 'Moved Permanently',
+  302 => 'Found',
+  303 => 'See Other',
+  304 => 'Not Modified',
+  305 => 'Use Proxy',
+  307 => 'Temporary Redirect',
+  308 => 'Permanent Redirect',
+  400 => 'Bad Request',
+  401 => 'Unauthorized',
+  402 => 'Payment Required',
+  403 => 'Forbidden',
+  404 => 'Not Found',
+  405 => 'Method Not Allowed',
+  406 => 'Not Acceptable',
+  407 => 'Proxy Authentication Required',
+  408 => 'Request Timeout',
+  409 => 'Conflict',
+  410 => 'Gone',
+  411 => 'Length Required',
+  412 => 'Precondition Failed',
+  413 => 'Content Too Large',
+  414 => 'URI Too Long',
+  415 => 'Unsupported Media Type',
+  416 => 'Range Not Satisfiable',
+  417 => 'Expectation Failed',
+  421 => 'Misdirected Request',
+  422 => 'Unprocessable Content',
+  423 => 'Locked',
+  424 => 'Failed Dependency',
+  425 => 'Too Early',
+  426 => 'Upgrade Required',
+  428 => 'Precondition Required',
+  429 => 'Too Many Requests',
+  431 => 'Request Header Fields Too Large',
+  451 => 'Unavailable For Legal Reasons',
+  500 => 'Internal Server Error',
+  501 => 'Not Implemented',
+  502 => 'Bad Gateway',
+  503 => 'Service Unavailable',
+  504 => 'Gateway Timeout',
+  505 => 'HTTP Version Not Supported',
+  506 => 'Variant Also Negotiates',
+  507 => 'Insufficient Storage',
+  508 => 'Loop Detected',
+  510 => 'Not Extended (OBSOLETED)',
+  511 => 'Network Authentication Required',
+} # :nodoc:
diff --git a/lib/rubygems/vendor/net-http/lib/net/https.rb b/lib/rubygems/vendor/net-http/lib/net/https.rb
new file mode 100644
index 00000000000000..f104c85c8134d4
--- /dev/null
+++ b/lib/rubygems/vendor/net-http/lib/net/https.rb
@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+=begin
+
+= net/https -- SSL/TLS enhancement for Gem::Net::HTTP.
+
+  This file has been merged with net/http.  There is no longer any need to
+  require_relative 'https' to use HTTPS.
+
+  See Gem::Net::HTTP for details on how to make HTTPS connections.
+
+== Info
+  'OpenSSL for Ruby 2' project
+  Copyright (C) 2001 GOTOU Yuuzou <gotoyuzo@notwork.org>
+  All rights reserved.
+
+== Licence
+  This program is licensed under the same licence as Ruby.
+  (See the file 'LICENCE'.)
+
+=end
+
+require_relative 'http'
+require 'openssl'
diff --git a/lib/rubygems/vendor/net-protocol/lib/net/protocol.rb b/lib/rubygems/vendor/net-protocol/lib/net/protocol.rb
new file mode 100644
index 00000000000000..53d34d8d98ebc4
--- /dev/null
+++ b/lib/rubygems/vendor/net-protocol/lib/net/protocol.rb
@@ -0,0 +1,544 @@
+# frozen_string_literal: true
+#
+# = net/protocol.rb
+#
+#--
+# Copyright (c) 1999-2004 Yukihiro Matsumoto
+# Copyright (c) 1999-2004 Minero Aoki
+#
+# written and maintained by Minero Aoki <aamine@loveruby.net>
+#
+# This program is free software. You can re-distribute and/or
+# modify this program under the same terms as Ruby itself,
+# Ruby Distribute License or GNU General Public License.
+#
+# $Id$
+#++
+#
+# WARNING: This file is going to remove.
+# Do not rely on the implementation written in this file.
+#
+
+require 'socket'
+require_relative '../../../timeout/lib/timeout'
+require 'io/wait'
+
+module Gem::Net # :nodoc:
+
+  class Protocol   #:nodoc: internal use only
+    VERSION = "0.2.2"
+
+    private
+    def Protocol.protocol_param(name, val)
+      module_eval(<<-End, __FILE__, __LINE__ + 1)
+        def #{name}
+          #{val}
+        end
+      End
+    end
+
+    def ssl_socket_connect(s, timeout)
+      if timeout
+        while true
+          raise Gem::Net::OpenTimeout if timeout <= 0
+          start = Process.clock_gettime Process::CLOCK_MONOTONIC
+          # to_io is required because SSLSocket doesn't have wait_readable yet
+          case s.connect_nonblock(exception: false)
+          when :wait_readable; s.to_io.wait_readable(timeout)
+          when :wait_writable; s.to_io.wait_writable(timeout)
+          else; break
+          end
+          timeout -= Process.clock_gettime(Process::CLOCK_MONOTONIC) - start
+        end
+      else
+        s.connect
+      end
+    end
+  end
+
+
+  class ProtocolError          < StandardError; end
+  class ProtoSyntaxError       < ProtocolError; end
+  class ProtoFatalError        < ProtocolError; end
+  class ProtoUnknownError      < ProtocolError; end
+  class ProtoServerError       < ProtocolError; end
+  class ProtoAuthError         < ProtocolError; end
+  class ProtoCommandError      < ProtocolError; end
+  class ProtoRetriableError    < ProtocolError; end
+  ProtocRetryError = ProtoRetriableError
+
+  ##
+  # OpenTimeout, a subclass of Gem::Timeout::Error, is raised if a connection cannot
+  # be created within the open_timeout.
+
+  class OpenTimeout            < Gem::Timeout::Error; end
+
+  ##
+  # ReadTimeout, a subclass of Gem::Timeout::Error, is raised if a chunk of the
+  # response cannot be read within the read_timeout.
+
+  class ReadTimeout < Gem::Timeout::Error
+    def initialize(io = nil)
+      @io = io
+    end
+    attr_reader :io
+
+    def message
+      msg = super
+      if @io
+        msg = "#{msg} with #{@io.inspect}"
+      end
+      msg
+    end
+  end
+
+  ##
+  # WriteTimeout, a subclass of Gem::Timeout::Error, is raised if a chunk of the
+  # response cannot be written within the write_timeout.  Not raised on Windows.
+
+  class WriteTimeout < Gem::Timeout::Error
+    def initialize(io = nil)
+      @io = io
+    end
+    attr_reader :io
+
+    def message
+      msg = super
+      if @io
+        msg = "#{msg} with #{@io.inspect}"
+      end
+      msg
+    end
+  end
+
+
+  class BufferedIO   #:nodoc: internal use only
+    def initialize(io, read_timeout: 60, write_timeout: 60, continue_timeout: nil, debug_output: nil)
+      @io = io
+      @read_timeout = read_timeout
+      @write_timeout = write_timeout
+      @continue_timeout = continue_timeout
+      @debug_output = debug_output
+      @rbuf = ''.b
+      @rbuf_empty = true
+      @rbuf_offset = 0
+    end
+
+    attr_reader :io
+    attr_accessor :read_timeout
+    attr_accessor :write_timeout
+    attr_accessor :continue_timeout
+    attr_accessor :debug_output
+
+    def inspect
+      "#<#{self.class} io=#{@io}>"
+    end
+
+    def eof?
+      @io.eof?
+    end
+
+    def closed?
+      @io.closed?
+    end
+
+    def close
+      @io.close
+    end
+
+    #
+    # Read
+    #
+
+    public
+
+    def read(len, dest = ''.b, ignore_eof = false)
+      LOG "reading #{len} bytes..."
+      read_bytes = 0
+      begin
+        while read_bytes + rbuf_size < len
+          if s = rbuf_consume_all
+            read_bytes += s.bytesize
+            dest << s
+          end
+          rbuf_fill
+        end
+        s = rbuf_consume(len - read_bytes)
+        read_bytes += s.bytesize
+        dest << s
+      rescue EOFError
+        raise unless ignore_eof
+      end
+      LOG "read #{read_bytes} bytes"
+      dest
+    end
+
+    def read_all(dest = ''.b)
+      LOG 'reading all...'
+      read_bytes = 0
+      begin
+        while true
+          if s = rbuf_consume_all
+            read_bytes += s.bytesize
+            dest << s
+          end
+          rbuf_fill
+        end
+      rescue EOFError
+        ;
+      end
+      LOG "read #{read_bytes} bytes"
+      dest
+    end
+
+    def readuntil(terminator, ignore_eof = false)
+      offset = @rbuf_offset
+      begin
+        until idx = @rbuf.index(terminator, offset)
+          offset = @rbuf.bytesize
+          rbuf_fill
+        end
+        return rbuf_consume(idx + terminator.bytesize - @rbuf_offset)
+      rescue EOFError
+        raise unless ignore_eof
+        return rbuf_consume
+      end
+    end
+
+    def readline
+      readuntil("\n").chop
+    end
+
+    private
+
+    BUFSIZE = 1024 * 16
+
+    def rbuf_fill
+      tmp = @rbuf_empty ? @rbuf : nil
+      case rv = @io.read_nonblock(BUFSIZE, tmp, exception: false)
+      when String
+        @rbuf_empty = false
+        if rv.equal?(tmp)
+          @rbuf_offset = 0
+        else
+          @rbuf << rv
+          rv.clear
+        end
+        return
+      when :wait_readable
+        (io = @io.to_io).wait_readable(@read_timeout) or raise Gem::Net::ReadTimeout.new(io)
+        # continue looping
+      when :wait_writable
+        # OpenSSL::Buffering#read_nonblock may fail with IO::WaitWritable.
+        # http://www.openssl.org/support/faq.html#PROG10
+        (io = @io.to_io).wait_writable(@read_timeout) or raise Gem::Net::ReadTimeout.new(io)
+        # continue looping
+      when nil
+        raise EOFError, 'end of file reached'
+      end while true
+    end
+
+    def rbuf_flush
+      if @rbuf_empty
+        @rbuf.clear
+        @rbuf_offset = 0
+      end
+      nil
+    end
+
+    def rbuf_size
+      @rbuf.bytesize - @rbuf_offset
+    end
+
+    def rbuf_consume_all
+      rbuf_consume if rbuf_size > 0
+    end
+
+    def rbuf_consume(len = nil)
+      if @rbuf_offset == 0 && (len.nil? || len == @rbuf.bytesize)
+        s = @rbuf
+        @rbuf = ''.b
+        @rbuf_offset = 0
+        @rbuf_empty = true
+      elsif len.nil?
+        s = @rbuf.byteslice(@rbuf_offset..-1)
+        @rbuf = ''.b
+        @rbuf_offset = 0
+        @rbuf_empty = true
+      else
+        s = @rbuf.byteslice(@rbuf_offset, len)
+        @rbuf_offset += len
+        @rbuf_empty = @rbuf_offset == @rbuf.bytesize
+        rbuf_flush
+      end
+
+      @debug_output << %Q[-> #{s.dump}\n] if @debug_output
+      s
+    end
+
+    #
+    # Write
+    #
+
+    public
+
+    def write(*strs)
+      writing {
+        write0(*strs)
+      }
+    end
+
+    alias << write
+
+    def writeline(str)
+      writing {
+        write0 str + "\r\n"
+      }
+    end
+
+    private
+
+    def writing
+      @written_bytes = 0
+      @debug_output << '<- ' if @debug_output
+      yield
+      @debug_output << "\n" if @debug_output
+      bytes = @written_bytes
+      @written_bytes = nil
+      bytes
+    end
+
+    def write0(*strs)
+      @debug_output << strs.map(&:dump).join if @debug_output
+      orig_written_bytes = @written_bytes
+      strs.each_with_index do |str, i|
+        need_retry = true
+        case len = @io.write_nonblock(str, exception: false)
+        when Integer
+          @written_bytes += len
+          len -= str.bytesize
+          if len == 0
+            if strs.size == i+1
+              return @written_bytes - orig_written_bytes
+            else
+              need_retry = false
+              # next string
+            end
+          elsif len < 0
+            str = str.byteslice(len, -len)
+          else # len > 0
+            need_retry = false
+            # next string
+          end
+          # continue looping
+        when :wait_writable
+          (io = @io.to_io).wait_writable(@write_timeout) or raise Gem::Net::WriteTimeout.new(io)
+          # continue looping
+        end while need_retry
+      end
+    end
+
+    #
+    # Logging
+    #
+
+    private
+
+    def LOG_off
+      @save_debug_out = @debug_output
+      @debug_output = nil
+    end
+
+    def LOG_on
+      @debug_output = @save_debug_out
+    end
+
+    def LOG(msg)
+      return unless @debug_output
+      @debug_output << msg + "\n"
+    end
+  end
+
+
+  class InternetMessageIO < BufferedIO   #:nodoc: internal use only
+    def initialize(*, **)
+      super
+      @wbuf = nil
+    end
+
+    #
+    # Read
+    #
+
+    def each_message_chunk
+      LOG 'reading message...'
+      LOG_off()
+      read_bytes = 0
+      while (line = readuntil("\r\n")) != ".\r\n"
+        read_bytes += line.size
+        yield line.delete_prefix('.')
+      end
+      LOG_on()
+      LOG "read message (#{read_bytes} bytes)"
+    end
+
+    # *library private* (cannot handle 'break')
+    def each_list_item
+      while (str = readuntil("\r\n")) != ".\r\n"
+        yield str.chop
+      end
+    end
+
+    def write_message_0(src)
+      prev = @written_bytes
+      each_crlf_line(src) do |line|
+        write0 dot_stuff(line)
+      end
+      @written_bytes - prev
+    end
+
+    #
+    # Write
+    #
+
+    def write_message(src)
+      LOG "writing message from #{src.class}"
+      LOG_off()
+      len = writing {
+        using_each_crlf_line {
+          write_message_0 src
+        }
+      }
+      LOG_on()
+      LOG "wrote #{len} bytes"
+      len
+    end
+
+    def write_message_by_block(&block)
+      LOG 'writing message from block'
+      LOG_off()
+      len = writing {
+        using_each_crlf_line {
+          begin
+            block.call(WriteAdapter.new(self.method(:write_message_0)))
+          rescue LocalJumpError
+            # allow `break' from writer block
+          end
+        }
+      }
+      LOG_on()
+      LOG "wrote #{len} bytes"
+      len
+    end
+
+    private
+
+    def dot_stuff(s)
+      s.sub(/\A\./, '..')
+    end
+
+    def using_each_crlf_line
+      @wbuf = ''.b
+      yield
+      if not @wbuf.empty?   # unterminated last line
+        write0 dot_stuff(@wbuf.chomp) + "\r\n"
+      elsif @written_bytes == 0   # empty src
+        write0 "\r\n"
+      end
+      write0 ".\r\n"
+      @wbuf = nil
+    end
+
+    def each_crlf_line(src)
+      buffer_filling(@wbuf, src) do
+        while line = @wbuf.slice!(/\A[^\r\n]*(?:\n|\r(?:\n|(?!\z)))/)
+          yield line.chomp("\n") + "\r\n"
+        end
+      end
+    end
+
+    def buffer_filling(buf, src)
+      case src
+      when String    # for speeding up.
+        0.step(src.size - 1, 1024) do |i|
+          buf << src[i, 1024]
+          yield
+        end
+      when File    # for speeding up.
+        while s = src.read(1024)
+          buf << s
+          yield
+        end
+      else    # generic reader
+        src.each do |str|
+          buf << str
+          yield if buf.size > 1024
+        end
+        yield unless buf.empty?
+      end
+    end
+  end
+
+
+  #
+  # The writer adapter class
+  #
+  class WriteAdapter
+    def initialize(writer)
+      @writer = writer
+    end
+
+    def inspect
+      "#<#{self.class} writer=#{@writer.inspect}>"
+    end
+
+    def write(str)
+      @writer.call(str)
+    end
+
+    alias print write
+
+    def <<(str)
+      write str
+      self
+    end
+
+    def puts(str = '')
+      write str.chomp("\n") + "\n"
+    end
+
+    def printf(*args)
+      write sprintf(*args)
+    end
+  end
+
+
+  class ReadAdapter   #:nodoc: internal use only
+    def initialize(block)
+      @block = block
+    end
+
+    def inspect
+      "#<#{self.class}>"
+    end
+
+    def <<(str)
+      call_block(str, &@block) if @block
+    end
+
+    private
+
+    # This method is needed because @block must be called by yield,
+    # not Proc#call.  You can see difference when using `break' in
+    # the block.
+    def call_block(str)
+      yield str
+    end
+  end
+
+
+  module NetPrivate   #:nodoc: obsolete
+    Socket = ::Gem::Net::InternetMessageIO
+  end
+
+end   # module Gem::Net
diff --git a/lib/rubygems/optparse/lib/optionparser.rb b/lib/rubygems/vendor/optparse/lib/optionparser.rb
similarity index 100%
rename from lib/rubygems/optparse/lib/optionparser.rb
rename to lib/rubygems/vendor/optparse/lib/optionparser.rb
diff --git a/lib/rubygems/vendor/optparse/lib/optparse.rb b/lib/rubygems/vendor/optparse/lib/optparse.rb
new file mode 100644
index 00000000000000..537d06f2297bcf
--- /dev/null
+++ b/lib/rubygems/vendor/optparse/lib/optparse.rb
@@ -0,0 +1,2426 @@
+# frozen_string_literal: true
+#
+# optparse.rb - command-line option analysis with the Gem::OptionParser class.
+#
+# Author:: Nobu Nakada
+# Documentation:: Nobu Nakada and Gavin Sinclair.
+#
+# See Gem::OptionParser for documentation.
+#
+
+#--
+# == Developer Documentation (not for RDoc output)
+#
+# === Class tree
+#
+# - Gem::OptionParser:: front end
+# - Gem::OptionParser::Switch:: each switches
+# - Gem::OptionParser::List:: options list
+# - Gem::OptionParser::ParseError:: errors on parsing
+#   - Gem::OptionParser::AmbiguousOption
+#   - Gem::OptionParser::NeedlessArgument
+#   - Gem::OptionParser::MissingArgument
+#   - Gem::OptionParser::InvalidOption
+#   - Gem::OptionParser::InvalidArgument
+#     - Gem::OptionParser::AmbiguousArgument
+#
+# === Object relationship diagram
+#
+#   +--------------+
+#   | Gem::OptionParser |<>-----+
+#   +--------------+       |                      +--------+
+#                          |                    ,-| Switch |
+#        on_head -------->+---------------+    /  +--------+
+#        accept/reject -->| List          |<|>-
+#                         |               |<|>-  +----------+
+#        on ------------->+---------------+    `-| argument |
+#                           :           :        |  class   |
+#                         +---------------+      |==========|
+#        on_tail -------->|               |      |pattern   |
+#                         +---------------+      |----------|
+#   Gem::OptionParser.accept ->| DefaultList   |      |converter |
+#                reject   |(shared between|      +----------+
+#                         | all instances)|
+#                         +---------------+
+#
+#++
+#
+# == Gem::OptionParser
+#
+# === New to +Gem::OptionParser+?
+#
+# See the {Tutorial}[optparse/tutorial.rdoc].
+#
+# === Introduction
+#
+# Gem::OptionParser is a class for command-line option analysis.  It is much more
+# advanced, yet also easier to use, than GetoptLong, and is a more Ruby-oriented
+# solution.
+#
+# === Features
+#
+# 1. The argument specification and the code to handle it are written in the
+#    same place.
+# 2. It can output an option summary; you don't need to maintain this string
+#    separately.
+# 3. Optional and mandatory arguments are specified very gracefully.
+# 4. Arguments can be automatically converted to a specified class.
+# 5. Arguments can be restricted to a certain set.
+#
+# All of these features are demonstrated in the examples below.  See
+# #make_switch for full documentation.
+#
+# === Minimal example
+#
+#   require 'rubygems/vendor/optparse/lib/optparse'
+#
+#   options = {}
+#   Gem::OptionParser.new do |parser|
+#     parser.banner = "Usage: example.rb [options]"
+#
+#     parser.on("-v", "--[no-]verbose", "Run verbosely") do |v|
+#       options[:verbose] = v
+#     end
+#   end.parse!
+#
+#   p options
+#   p ARGV
+#
+# === Generating Help
+#
+# Gem::OptionParser can be used to automatically generate help for the commands you
+# write:
+#
+#   require 'rubygems/vendor/optparse/lib/optparse'
+#
+#   Options = Struct.new(:name)
+#
+#   class Parser
+#     def self.parse(options)
+#       args = Options.new("world")
+#
+#       opt_parser = Gem::OptionParser.new do |parser|
+#         parser.banner = "Usage: example.rb [options]"
+#
+#         parser.on("-nNAME", "--name=NAME", "Name to say hello to") do |n|
+#           args.name = n
+#         end
+#
+#         parser.on("-h", "--help", "Prints this help") do
+#           puts parser
+#           exit
+#         end
+#       end
+#
+#       opt_parser.parse!(options)
+#       return args
+#     end
+#   end
+#   options = Parser.parse %w[--help]
+#
+#   #=>
+#      # Usage: example.rb [options]
+#      #     -n, --name=NAME                  Name to say hello to
+#      #     -h, --help                       Prints this help
+#
+# === Required Arguments
+#
+# For options that require an argument, option specification strings may include an
+# option name in all caps. If an option is used without the required argument,
+# an exception will be raised.
+#
+#   require 'rubygems/vendor/optparse/lib/optparse'
+#
+#   options = {}
+#   Gem::OptionParser.new do |parser|
+#     parser.on("-r", "--require LIBRARY",
+#               "Require the LIBRARY before executing your script") do |lib|
+#       puts "You required #{lib}!"
+#     end
+#   end.parse!
+#
+# Used:
+#
+#   $ ruby optparse-test.rb -r
+#   optparse-test.rb:9:in `<main>': missing argument: -r (Gem::OptionParser::MissingArgument)
+#   $ ruby optparse-test.rb -r my-library
+#   You required my-library!
+#
+# === Type Coercion
+#
+# Gem::OptionParser supports the ability to coerce command line arguments
+# into objects for us.
+#
+# Gem::OptionParser comes with a few ready-to-use kinds of type
+# coercion. They are:
+#
+# - Date  -- Anything accepted by +Date.parse+ (need to require +optparse/date+)
+# - DateTime -- Anything accepted by +DateTime.parse+ (need to require +optparse/date+)
+# - Time -- Anything accepted by +Time.httpdate+ or +Time.parse+ (need to require +optparse/time+)
+# - URI  -- Anything accepted by +Gem::URI.parse+ (need to require +optparse/uri+)
+# - Shellwords -- Anything accepted by +Shellwords.shellwords+ (need to require +optparse/shellwords+)
+# - String -- Any non-empty string
+# - Integer -- Any integer. Will convert octal. (e.g. 124, -3, 040)
+# - Float -- Any float. (e.g. 10, 3.14, -100E+13)
+# - Numeric -- Any integer, float, or rational (1, 3.4, 1/3)
+# - DecimalInteger -- Like +Integer+, but no octal format.
+# - OctalInteger -- Like +Integer+, but no decimal format.
+# - DecimalNumeric -- Decimal integer or float.
+# - TrueClass --  Accepts '+, yes, true, -, no, false' and
+#   defaults as +true+
+# - FalseClass -- Same as +TrueClass+, but defaults to +false+
+# - Array -- Strings separated by ',' (e.g. 1,2,3)
+# - Regexp -- Regular expressions. Also includes options.
+#
+# We can also add our own coercions, which we will cover below.
+#
+# ==== Using Built-in Conversions
+#
+# As an example, the built-in +Time+ conversion is used. The other built-in
+# conversions behave in the same way.
+# Gem::OptionParser will attempt to parse the argument
+# as a +Time+. If it succeeds, that time will be passed to the
+# handler block. Otherwise, an exception will be raised.
+#
+#   require 'rubygems/vendor/optparse/lib/optparse'
+#   require 'rubygems/vendor/optparse/lib/optparse/time'
+#   Gem::OptionParser.new do |parser|
+#     parser.on("-t", "--time [TIME]", Time, "Begin execution at given time") do |time|
+#       p time
+#     end
+#   end.parse!
+#
+# Used:
+#
+#   $ ruby optparse-test.rb  -t nonsense
+#   ... invalid argument: -t nonsense (Gem::OptionParser::InvalidArgument)
+#   $ ruby optparse-test.rb  -t 10-11-12
+#   2010-11-12 00:00:00 -0500
+#   $ ruby optparse-test.rb  -t 9:30
+#   2014-08-13 09:30:00 -0400
+#
+# ==== Creating Custom Conversions
+#
+# The +accept+ method on Gem::OptionParser may be used to create converters.
+# It specifies which conversion block to call whenever a class is specified.
+# The example below uses it to fetch a +User+ object before the +on+ handler receives it.
+#
+#   require 'rubygems/vendor/optparse/lib/optparse'
+#
+#   User = Struct.new(:id, :name)
+#
+#   def find_user id
+#     not_found = ->{ raise "No User Found for id #{id}" }
+#     [ User.new(1, "Sam"),
+#       User.new(2, "Gandalf") ].find(not_found) do |u|
+#       u.id == id
+#     end
+#   end
+#
+#   op = Gem::OptionParser.new
+#   op.accept(User) do |user_id|
+#     find_user user_id.to_i
+#   end
+#
+#   op.on("--user ID", User) do |user|
+#     puts user
+#   end
+#
+#   op.parse!
+#
+# Used:
+#
+#   $ ruby optparse-test.rb --user 1
+#   #<struct User id=1, name="Sam">
+#   $ ruby optparse-test.rb --user 2
+#   #<struct User id=2, name="Gandalf">
+#   $ ruby optparse-test.rb --user 3
+#   optparse-test.rb:15:in `block in find_user': No User Found for id 3 (RuntimeError)
+#
+# === Store options to a Hash
+#
+# The +into+ option of +order+, +parse+ and so on methods stores command line options into a Hash.
+#
+#   require 'rubygems/vendor/optparse/lib/optparse'
+#
+#   options = {}
+#   Gem::OptionParser.new do |parser|
+#     parser.on('-a')
+#     parser.on('-b NUM', Integer)
+#     parser.on('-v', '--verbose')
+#   end.parse!(into: options)
+#
+#   p options
+#
+# Used:
+#
+#   $ ruby optparse-test.rb -a
+#   {:a=>true}
+#   $ ruby optparse-test.rb -a -v
+#   {:a=>true, :verbose=>true}
+#   $ ruby optparse-test.rb -a -b 100
+#   {:a=>true, :b=>100}
+#
+# === Complete example
+#
+# The following example is a complete Ruby program.  You can run it and see the
+# effect of specifying various options.  This is probably the best way to learn
+# the features of +optparse+.
+#
+#   require 'rubygems/vendor/optparse/lib/optparse'
+#   require 'rubygems/vendor/optparse/lib/optparse/time'
+#   require 'ostruct'
+#   require 'pp'
+#
+#   class OptparseExample
+#     Version = '1.0.0'
+#
+#     CODES = %w[iso-2022-jp shift_jis euc-jp utf8 binary]
+#     CODE_ALIASES = { "jis" => "iso-2022-jp", "sjis" => "shift_jis" }
+#
+#     class ScriptOptions
+#       attr_accessor :library, :inplace, :encoding, :transfer_type,
+#                     :verbose, :extension, :delay, :time, :record_separator,
+#                     :list
+#
+#       def initialize
+#         self.library = []
+#         self.inplace = false
+#         self.encoding = "utf8"
+#         self.transfer_type = :auto
+#         self.verbose = false
+#       end
+#
+#       def define_options(parser)
+#         parser.banner = "Usage: example.rb [options]"
+#         parser.separator ""
+#         parser.separator "Specific options:"
+#
+#         # add additional options
+#         perform_inplace_option(parser)
+#         delay_execution_option(parser)
+#         execute_at_time_option(parser)
+#         specify_record_separator_option(parser)
+#         list_example_option(parser)
+#         specify_encoding_option(parser)
+#         optional_option_argument_with_keyword_completion_option(parser)
+#         boolean_verbose_option(parser)
+#
+#         parser.separator ""
+#         parser.separator "Common options:"
+#         # No argument, shows at tail.  This will print an options summary.
+#         # Try it and see!
+#         parser.on_tail("-h", "--help", "Show this message") do
+#           puts parser
+#           exit
+#         end
+#         # Another typical switch to print the version.
+#         parser.on_tail("--version", "Show version") do
+#           puts Version
+#           exit
+#         end
+#       end
+#
+#       def perform_inplace_option(parser)
+#         # Specifies an optional option argument
+#         parser.on("-i", "--inplace [EXTENSION]",
+#                   "Edit ARGV files in place",
+#                   "(make backup if EXTENSION supplied)") do |ext|
+#           self.inplace = true
+#           self.extension = ext || ''
+#           self.extension.sub!(/\A\.?(?=.)/, ".")  # Ensure extension begins with dot.
+#         end
+#       end
+#
+#       def delay_execution_option(parser)
+#         # Cast 'delay' argument to a Float.
+#         parser.on("--delay N", Float, "Delay N seconds before executing") do |n|
+#           self.delay = n
+#         end
+#       end
+#
+#       def execute_at_time_option(parser)
+#         # Cast 'time' argument to a Time object.
+#         parser.on("-t", "--time [TIME]", Time, "Begin execution at given time") do |time|
+#           self.time = time
+#         end
+#       end
+#
+#       def specify_record_separator_option(parser)
+#         # Cast to octal integer.
+#         parser.on("-F", "--irs [OCTAL]", Gem::OptionParser::OctalInteger,
+#                   "Specify record separator (default \\0)") do |rs|
+#           self.record_separator = rs
+#         end
+#       end
+#
+#       def list_example_option(parser)
+#         # List of arguments.
+#         parser.on("--list x,y,z", Array, "Example 'list' of arguments") do |list|
+#           self.list = list
+#         end
+#       end
+#
+#       def specify_encoding_option(parser)
+#         # Keyword completion.  We are specifying a specific set of arguments (CODES
+#         # and CODE_ALIASES - notice the latter is a Hash), and the user may provide
+#         # the shortest unambiguous text.
+#         code_list = (CODE_ALIASES.keys + CODES).join(', ')
+#         parser.on("--code CODE", CODES, CODE_ALIASES, "Select encoding",
+#                   "(#{code_list})") do |encoding|
+#           self.encoding = encoding
+#         end
+#       end
+#
+#       def optional_option_argument_with_keyword_completion_option(parser)
+#         # Optional '--type' option argument with keyword completion.
+#         parser.on("--type [TYPE]", [:text, :binary, :auto],
+#                   "Select transfer type (text, binary, auto)") do |t|
+#           self.transfer_type = t
+#         end
+#       end
+#
+#       def boolean_verbose_option(parser)
+#         # Boolean switch.
+#         parser.on("-v", "--[no-]verbose", "Run verbosely") do |v|
+#           self.verbose = v
+#         end
+#       end
+#     end
+#
+#     #
+#     # Return a structure describing the options.
+#     #
+#     def parse(args)
+#       # The options specified on the command line will be collected in
+#       # *options*.
+#
+#       @options = ScriptOptions.new
+#       @args = Gem::OptionParser.new do |parser|
+#         @options.define_options(parser)
+#         parser.parse!(args)
+#       end
+#       @options
+#     end
+#
+#     attr_reader :parser, :options
+#   end  # class OptparseExample
+#
+#   example = OptparseExample.new
+#   options = example.parse(ARGV)
+#   pp options # example.options
+#   pp ARGV
+#
+# === Shell Completion
+#
+# For modern shells (e.g. bash, zsh, etc.), you can use shell
+# completion for command line options.
+#
+# === Further documentation
+#
+# The above examples, along with the accompanying
+# {Tutorial}[optparse/tutorial.rdoc],
+# should be enough to learn how to use this class.
+# If you have any questions, file a ticket at http://bugs.ruby-lang.org.
+#
+class Gem::OptionParser
+  # The version string
+  Gem::OptionParser::Version = "0.6.0"
+
+  # :stopdoc:
+  NoArgument = [NO_ARGUMENT = :NONE, nil].freeze
+  RequiredArgument = [REQUIRED_ARGUMENT = :REQUIRED, true].freeze
+  OptionalArgument = [OPTIONAL_ARGUMENT = :OPTIONAL, false].freeze
+  # :startdoc:
+
+  #
+  # Keyword completion module.  This allows partial arguments to be specified
+  # and resolved against a list of acceptable values.
+  #
+  module Completion
+    # :nodoc:
+
+    def self.regexp(key, icase)
+      Regexp.new('\A' + Regexp.quote(key).gsub(/\w+\b/, '\&\w*'), icase)
+    end
+
+    def self.candidate(key, icase = false, pat = nil, &block)
+      pat ||= Completion.regexp(key, icase)
+      candidates = []
+      block.call do |k, *v|
+        (if Regexp === k
+           kn = ""
+           k === key
+         else
+           kn = defined?(k.id2name) ? k.id2name : k
+           pat === kn
+         end) or next
+        v << k if v.empty?
+        candidates << [k, v, kn]
+      end
+      candidates
+    end
+
+    def candidate(key, icase = false, pat = nil, &_)
+      Completion.candidate(key, icase, pat, &method(:each))
+    end
+
+    public
+    def complete(key, icase = false, pat = nil)
+      candidates = candidate(key, icase, pat, &method(:each)).sort_by {|k, v, kn| kn.size}
+      if candidates.size == 1
+        canon, sw, * = candidates[0]
+      elsif candidates.size > 1
+        canon, sw, cn = candidates.shift
+        candidates.each do |k, v, kn|
+          next if sw == v
+          if String === cn and String === kn
+            if cn.rindex(kn, 0)
+              canon, sw, cn = k, v, kn
+              next
+            elsif kn.rindex(cn, 0)
+              next
+            end
+          end
+          throw :ambiguous, key
+        end
+      end
+      if canon
+        block_given? or return key, *sw
+        yield(key, *sw)
+      end
+    end
+
+    def convert(opt = nil, val = nil, *)
+      val
+    end
+  end
+
+
+  #
+  # Map from option/keyword string to object with completion.
+  #
+  class OptionMap < Hash
+    include Completion
+  end
+
+
+  #
+  # Individual switch class.  Not important to the user.
+  #
+  # Defined within Switch are several Switch-derived classes: NoArgument,
+  # RequiredArgument, etc.
+  #
+  class Switch
+    # :nodoc:
+
+    attr_reader :pattern, :conv, :short, :long, :arg, :desc, :block
+
+    #
+    # Guesses argument style from +arg+.  Returns corresponding
+    # Gem::OptionParser::Switch class (OptionalArgument, etc.).
+    #
+    def self.guess(arg)
+      case arg
+      when ""
+        t = self
+      when /\A=?\[/
+        t = Switch::OptionalArgument
+      when /\A\s+\[/
+        t = Switch::PlacedArgument
+      else
+        t = Switch::RequiredArgument
+      end
+      self >= t or incompatible_argument_styles(arg, t)
+      t
+    end
+
+    def self.incompatible_argument_styles(arg, t)
+      raise(ArgumentError, "#{arg}: incompatible argument styles\n  #{self}, #{t}",
+            ParseError.filter_backtrace(caller(2)))
+    end
+
+    def self.pattern
+      NilClass
+    end
+
+    def initialize(pattern = nil, conv = nil,
+                   short = nil, long = nil, arg = nil,
+                   desc = ([] if short or long), block = nil, &_block)
+      raise if Array === pattern
+      block ||= _block
+      @pattern, @conv, @short, @long, @arg, @desc, @block =
+        pattern, conv, short, long, arg, desc, block
+    end
+
+    #
+    # Parses +arg+ and returns rest of +arg+ and matched portion to the
+    # argument pattern. Yields when the pattern doesn't match substring.
+    #
+    def parse_arg(arg) # :nodoc:
+      pattern or return nil, [arg]
+      unless m = pattern.match(arg)
+        yield(InvalidArgument, arg)
+        return arg, []
+      end
+      if String === m
+        m = [s = m]
+      else
+        m = m.to_a
+        s = m[0]
+        return nil, m unless String === s
+      end
+      raise InvalidArgument, arg unless arg.rindex(s, 0)
+      return nil, m if s.length == arg.length
+      yield(InvalidArgument, arg) # didn't match whole arg
+      return arg[s.length..-1], m
+    end
+    private :parse_arg
+
+    #
+    # Parses argument, converts and returns +arg+, +block+ and result of
+    # conversion. Yields at semi-error condition instead of raising an
+    # exception.
+    #
+    def conv_arg(arg, val = []) # :nodoc:
+      if conv
+        val = conv.call(*val)
+      else
+        val = proc {|v| v}.call(*val)
+      end
+      return arg, block, val
+    end
+    private :conv_arg
+
+    #
+    # Produces the summary text. Each line of the summary is yielded to the
+    # block (without newline).
+    #
+    # +sdone+::  Already summarized short style options keyed hash.
+    # +ldone+::  Already summarized long style options keyed hash.
+    # +width+::  Width of left side (option part). In other words, the right
+    #            side (description part) starts after +width+ columns.
+    # +max+::    Maximum width of left side -> the options are filled within
+    #            +max+ columns.
+    # +indent+:: Prefix string indents all summarized lines.
+    #
+    def summarize(sdone = {}, ldone = {}, width = 1, max = width - 1, indent = "")
+      sopts, lopts = [], [], nil
+      @short.each {|s| sdone.fetch(s) {sopts << s}; sdone[s] = true} if @short
+      @long.each {|s| ldone.fetch(s) {lopts << s}; ldone[s] = true} if @long
+      return if sopts.empty? and lopts.empty? # completely hidden
+
+      left = [sopts.join(', ')]
+      right = desc.dup
+
+      while s = lopts.shift
+        l = left[-1].length + s.length
+        l += arg.length if left.size == 1 && arg
+        l < max or sopts.empty? or left << +''
+        left[-1] << (left[-1].empty? ? ' ' * 4 : ', ') << s
+      end
+
+      if arg
+        left[0] << (left[1] ? arg.sub(/\A(\[?)=/, '\1') + ',' : arg)
+      end
+      mlen = left.collect {|ss| ss.length}.max.to_i
+      while mlen > width and l = left.shift
+        mlen = left.collect {|ss| ss.length}.max.to_i if l.length == mlen
+        if l.length < width and (r = right[0]) and !r.empty?
+          l = l.to_s.ljust(width) + ' ' + r
+          right.shift
+        end
+        yield(indent + l)
+      end
+
+      while begin l = left.shift; r = right.shift; l or r end
+        l = l.to_s.ljust(width) + ' ' + r if r and !r.empty?
+        yield(indent + l)
+      end
+
+      self
+    end
+
+    def add_banner(to)  # :nodoc:
+      unless @short or @long
+        s = desc.join
+        to << " [" + s + "]..." unless s.empty?
+      end
+      to
+    end
+
+    def match_nonswitch?(str)  # :nodoc:
+      @pattern =~ str unless @short or @long
+    end
+
+    #
+    # Main name of the switch.
+    #
+    def switch_name
+      (long.first || short.first).sub(/\A-+(?:\[no-\])?/, '')
+    end
+
+    def compsys(sdone, ldone)   # :nodoc:
+      sopts, lopts = [], []
+      @short.each {|s| sdone.fetch(s) {sopts << s}; sdone[s] = true} if @short
+      @long.each {|s| ldone.fetch(s) {lopts << s}; ldone[s] = true} if @long
+      return if sopts.empty? and lopts.empty? # completely hidden
+
+      (sopts+lopts).each do |opt|
+        # "(-x -c -r)-l[left justify]"
+        if /^--\[no-\](.+)$/ =~ opt
+          o = $1
+          yield("--#{o}", desc.join(""))
+          yield("--no-#{o}", desc.join(""))
+        else
+          yield("#{opt}", desc.join(""))
+        end
+      end
+    end
+
+    def pretty_print_contents(q) # :nodoc:
+      if @block
+        q.text ":" + @block.source_location.join(":") + ":"
+        first = false
+      else
+        first = true
+      end
+      [@short, @long].each do |list|
+        list.each do |opt|
+          if first
+            q.text ":"
+            first = false
+          end
+          q.breakable
+          q.text opt
+        end
+      end
+    end
+
+    def pretty_print(q)         # :nodoc:
+      q.object_group(self) {pretty_print_contents(q)}
+    end
+
+    def omitted_argument(val)   # :nodoc:
+      val.pop if val.size == 3 and val.last.nil?
+      val
+    end
+
+    #
+    # Switch that takes no arguments.
+    #
+    class NoArgument < self
+
+      #
+      # Raises an exception if any arguments given.
+      #
+      def parse(arg, argv)
+        yield(NeedlessArgument, arg) if arg
+        conv_arg(arg)
+      end
+
+      def self.incompatible_argument_styles(*) # :nodoc:
+      end
+
+      def self.pattern          # :nodoc:
+        Object
+      end
+
+      def pretty_head           # :nodoc:
+        "NoArgument"
+      end
+    end
+
+    #
+    # Switch that takes an argument.
+    #
+    class RequiredArgument < self
+
+      #
+      # Raises an exception if argument is not present.
+      #
+      def parse(arg, argv, &_)
+        unless arg
+          raise MissingArgument if argv.empty?
+          arg = argv.shift
+        end
+        conv_arg(*parse_arg(arg, &method(:raise)))
+      end
+
+      def pretty_head           # :nodoc:
+        "Required"
+      end
+    end
+
+    #
+    # Switch that can omit argument.
+    #
+    class OptionalArgument < self
+
+      #
+      # Parses argument if given, or uses default value.
+      #
+      def parse(arg, argv, &error)
+        if arg
+          conv_arg(*parse_arg(arg, &error))
+        else
+          omitted_argument conv_arg(arg)
+        end
+      end
+
+      def pretty_head           # :nodoc:
+        "Optional"
+      end
+    end
+
+    #
+    # Switch that takes an argument, which does not begin with '-' or is '-'.
+    #
+    class PlacedArgument < self
+
+      #
+      # Returns nil if argument is not present or begins with '-' and is not '-'.
+      #
+      def parse(arg, argv, &error)
+        if !(val = arg) and (argv.empty? or /\A-./ =~ (val = argv[0]))
+          return nil, block
+        end
+        opt = (val = parse_arg(val, &error))[1]
+        val = conv_arg(*val)
+        if opt and !arg
+          argv.shift
+        else
+          omitted_argument val
+          val[0] = nil
+        end
+        val
+      end
+
+      def pretty_head           # :nodoc:
+        "Placed"
+      end
+    end
+  end
+
+  #
+  # Simple option list providing mapping from short and/or long option
+  # string to Gem::OptionParser::Switch and mapping from acceptable argument to
+  # matching pattern and converter pair. Also provides summary feature.
+  #
+  class List
+    # :nodoc:
+
+    # Map from acceptable argument types to pattern and converter pairs.
+    attr_reader :atype
+
+    # Map from short style option switches to actual switch objects.
+    attr_reader :short
+
+    # Map from long style option switches to actual switch objects.
+    attr_reader :long
+
+    # List of all switches and summary string.
+    attr_reader :list
+
+    #
+    # Just initializes all instance variables.
+    #
+    def initialize
+      @atype = {}
+      @short = OptionMap.new
+      @long = OptionMap.new
+      @list = []
+    end
+
+    def pretty_print(q)         # :nodoc:
+      q.group(1, "(", ")") do
+        @list.each do |sw|
+          next unless Switch === sw
+          q.group(1, "(" + sw.pretty_head, ")") do
+            sw.pretty_print_contents(q)
+          end
+        end
+      end
+    end
+
+    #
+    # See Gem::OptionParser.accept.
+    #
+    def accept(t, pat = /.*/m, &block)
+      if pat
+        pat.respond_to?(:match) or
+          raise TypeError, "has no 'match'", ParseError.filter_backtrace(caller(2))
+      else
+        pat = t if t.respond_to?(:match)
+      end
+      unless block
+        block = pat.method(:convert).to_proc if pat.respond_to?(:convert)
+      end
+      @atype[t] = [pat, block]
+    end
+
+    #
+    # See Gem::OptionParser.reject.
+    #
+    def reject(t)
+      @atype.delete(t)
+    end
+
+    #
+    # Adds +sw+ according to +sopts+, +lopts+ and +nlopts+.
+    #
+    # +sw+::     Gem::OptionParser::Switch instance to be added.
+    # +sopts+::  Short style option list.
+    # +lopts+::  Long style option list.
+    # +nlopts+:: Negated long style options list.
+    #
+    def update(sw, sopts, lopts, nsw = nil, nlopts = nil) # :nodoc:
+      sopts.each {|o| @short[o] = sw} if sopts
+      lopts.each {|o| @long[o] = sw} if lopts
+      nlopts.each {|o| @long[o] = nsw} if nsw and nlopts
+      used = @short.invert.update(@long.invert)
+      @list.delete_if {|o| Switch === o and !used[o]}
+    end
+    private :update
+
+    #
+    # Inserts +switch+ at the head of the list, and associates short, long
+    # and negated long options. Arguments are:
+    #
+    # +switch+::      Gem::OptionParser::Switch instance to be inserted.
+    # +short_opts+::  List of short style options.
+    # +long_opts+::   List of long style options.
+    # +nolong_opts+:: List of long style options with "no-" prefix.
+    #
+    #   prepend(switch, short_opts, long_opts, nolong_opts)
+    #
+    def prepend(*args)
+      update(*args)
+      @list.unshift(args[0])
+    end
+
+    #
+    # Appends +switch+ at the tail of the list, and associates short, long
+    # and negated long options. Arguments are:
+    #
+    # +switch+::      Gem::OptionParser::Switch instance to be inserted.
+    # +short_opts+::  List of short style options.
+    # +long_opts+::   List of long style options.
+    # +nolong_opts+:: List of long style options with "no-" prefix.
+    #
+    #   append(switch, short_opts, long_opts, nolong_opts)
+    #
+    def append(*args)
+      update(*args)
+      @list.push(args[0])
+    end
+
+    #
+    # Searches +key+ in +id+ list. The result is returned or yielded if a
+    # block is given. If it isn't found, nil is returned.
+    #
+    def search(id, key)
+      if list = __send__(id)
+        val = list.fetch(key) {return nil}
+        block_given? ? yield(val) : val
+      end
+    end
+
+    #
+    # Searches list +id+ for +opt+ and the optional patterns for completion
+    # +pat+. If +icase+ is true, the search is case insensitive. The result
+    # is returned or yielded if a block is given. If it isn't found, nil is
+    # returned.
+    #
+    def complete(id, opt, icase = false, *pat, &block)
+      __send__(id).complete(opt, icase, *pat, &block)
+    end
+
+    def get_candidates(id)
+      yield __send__(id).keys
+    end
+
+    #
+    # Iterates over each option, passing the option to the +block+.
+    #
+    def each_option(&block)
+      list.each(&block)
+    end
+
+    #
+    # Creates the summary table, passing each line to the +block+ (without
+    # newline). The arguments +args+ are passed along to the summarize
+    # method which is called on every option.
+    #
+    def summarize(*args, &block)
+      sum = []
+      list.reverse_each do |opt|
+        if opt.respond_to?(:summarize) # perhaps Gem::OptionParser::Switch
+          s = []
+          opt.summarize(*args) {|l| s << l}
+          sum.concat(s.reverse)
+        elsif !opt or opt.empty?
+          sum << ""
+        elsif opt.respond_to?(:each_line)
+          sum.concat([*opt.each_line].reverse)
+        else
+          sum.concat([*opt.each].reverse)
+        end
+      end
+      sum.reverse_each(&block)
+    end
+
+    def add_banner(to)  # :nodoc:
+      list.each do |opt|
+        if opt.respond_to?(:add_banner)
+          opt.add_banner(to)
+        end
+      end
+      to
+    end
+
+    def compsys(*args, &block)  # :nodoc:
+      list.each do |opt|
+        if opt.respond_to?(:compsys)
+          opt.compsys(*args, &block)
+        end
+      end
+    end
+  end
+
+  #
+  # Hash with completion search feature. See Gem::OptionParser::Completion.
+  #
+  class CompletingHash < Hash
+    include Completion
+
+    #
+    # Completion for hash key.
+    #
+    def match(key)
+      *values = fetch(key) {
+        raise AmbiguousArgument, catch(:ambiguous) {return complete(key)}
+      }
+      return key, *values
+    end
+  end
+
+  # :stopdoc:
+
+  #
+  # Enumeration of acceptable argument styles. Possible values are:
+  #
+  # NO_ARGUMENT::       The switch takes no arguments. (:NONE)
+  # REQUIRED_ARGUMENT:: The switch requires an argument. (:REQUIRED)
+  # OPTIONAL_ARGUMENT:: The switch requires an optional argument. (:OPTIONAL)
+  #
+  # Use like --switch=argument (long style) or -Xargument (short style). For
+  # short style, only portion matched to argument pattern is treated as
+  # argument.
+  #
+  ArgumentStyle = {}
+  NoArgument.each {|el| ArgumentStyle[el] = Switch::NoArgument}
+  RequiredArgument.each {|el| ArgumentStyle[el] = Switch::RequiredArgument}
+  OptionalArgument.each {|el| ArgumentStyle[el] = Switch::OptionalArgument}
+  ArgumentStyle.freeze
+
+  #
+  # Switches common used such as '--', and also provides default
+  # argument classes
+  #
+  DefaultList = List.new
+  DefaultList.short['-'] = Switch::NoArgument.new {}
+  DefaultList.long[''] = Switch::NoArgument.new {throw :terminate}
+
+
+  COMPSYS_HEADER = <<'XXX'      # :nodoc:
+
+typeset -A opt_args
+local context state line
+
+_arguments -s -S \
+XXX
+
+  def compsys(to, name = File.basename($0)) # :nodoc:
+    to << "#compdef #{name}\n"
+    to << COMPSYS_HEADER
+    visit(:compsys, {}, {}) {|o, d|
+      to << %Q[  "#{o}[#{d.gsub(/[\\\"\[\]]/, '\\\\\&')}]" \\\n]
+    }
+    to << "  '*:file:_files' && return 0\n"
+  end
+
+  def help_exit
+    if STDOUT.tty? && (pager = ENV.values_at(*%w[RUBY_PAGER PAGER]).find {|e| e && !e.empty?})
+      less = ENV["LESS"]
+      args = [{"LESS" => "#{!less || less.empty? ? '-' : less}Fe"}, pager, "w"]
+      print = proc do |f|
+        f.puts help
+      rescue Errno::EPIPE
+        # pager terminated
+      end
+      if Process.respond_to?(:fork) and false
+        IO.popen("-") {|f| f ? Process.exec(*args, in: f) : print.call(STDOUT)}
+        # unreachable
+      end
+      IO.popen(*args, &print)
+    else
+      puts help
+    end
+    exit
+  end
+
+  #
+  # Default options for ARGV, which never appear in option summary.
+  #
+  Officious = {}
+
+  #
+  # --help
+  # Shows option summary.
+  #
+  Officious['help'] = proc do |parser|
+    Switch::NoArgument.new do |arg|
+      parser.help_exit
+    end
+  end
+
+  #
+  # --*-completion-bash=WORD
+  # Shows candidates for command line completion.
+  #
+  Officious['*-completion-bash'] = proc do |parser|
+    Switch::RequiredArgument.new do |arg|
+      puts parser.candidate(arg)
+      exit
+    end
+  end
+
+  #
+  # --*-completion-zsh[=NAME:FILE]
+  # Creates zsh completion file.
+  #
+  Officious['*-completion-zsh'] = proc do |parser|
+    Switch::OptionalArgument.new do |arg|
+      parser.compsys(STDOUT, arg)
+      exit
+    end
+  end
+
+  #
+  # --version
+  # Shows version string if Version is defined.
+  #
+  Officious['version'] = proc do |parser|
+    Switch::OptionalArgument.new do |pkg|
+      if pkg
+        begin
+          require_relative 'optparse/version'
+        rescue LoadError
+        else
+          show_version(*pkg.split(/,/)) or
+            abort("#{parser.program_name}: no version found in package #{pkg}")
+          exit
+        end
+      end
+      v = parser.ver or abort("#{parser.program_name}: version unknown")
+      puts v
+      exit
+    end
+  end
+
+  # :startdoc:
+
+  #
+  # Class methods
+  #
+
+  #
+  # Initializes a new instance and evaluates the optional block in context
+  # of the instance. Arguments +args+ are passed to #new, see there for
+  # description of parameters.
+  #
+  # This method is *deprecated*, its behavior corresponds to the older #new
+  # method.
+  #
+  def self.with(*args, &block)
+    opts = new(*args)
+    opts.instance_eval(&block)
+    opts
+  end
+
+  #
+  # Returns an incremented value of +default+ according to +arg+.
+  #
+  def self.inc(arg, default = nil)
+    case arg
+    when Integer
+      arg.nonzero?
+    when nil
+      default.to_i + 1
+    end
+  end
+
+  #
+  # See self.inc
+  #
+  def inc(*args)
+    self.class.inc(*args)
+  end
+
+  #
+  # Initializes the instance and yields itself if called with a block.
+  #
+  # +banner+:: Banner message.
+  # +width+::  Summary width.
+  # +indent+:: Summary indent.
+  #
+  def initialize(banner = nil, width = 32, indent = ' ' * 4)
+    @stack = [DefaultList, List.new, List.new]
+    @program_name = nil
+    @banner = banner
+    @summary_width = width
+    @summary_indent = indent
+    @default_argv = ARGV
+    @require_exact = false
+    @raise_unknown = true
+    add_officious
+    yield self if block_given?
+  end
+
+  def add_officious  # :nodoc:
+    list = base()
+    Officious.each do |opt, block|
+      list.long[opt] ||= block.call(self)
+    end
+  end
+
+  #
+  # Terminates option parsing. Optional parameter +arg+ is a string pushed
+  # back to be the first non-option argument.
+  #
+  def terminate(arg = nil)
+    self.class.terminate(arg)
+  end
+  #
+  # See #terminate.
+  #
+  def self.terminate(arg = nil)
+    throw :terminate, arg
+  end
+
+  @stack = [DefaultList]
+  #
+  # Returns the global top option list.
+  #
+  # Do not use directly.
+  #
+  def self.top() DefaultList end
+
+  #
+  # Directs to accept specified class +t+. The argument string is passed to
+  # the block in which it should be converted to the desired class.
+  #
+  # +t+::   Argument class specifier, any object including Class.
+  # +pat+:: Pattern for argument, defaults to +t+ if it responds to match.
+  #
+  #   accept(t, pat, &block)
+  #
+  def accept(*args, &blk) top.accept(*args, &blk) end
+  #
+  # See #accept.
+  #
+  def self.accept(*args, &blk) top.accept(*args, &blk) end
+
+  #
+  # Directs to reject specified class argument.
+  #
+  # +type+:: Argument class specifier, any object including Class.
+  #
+  #   reject(type)
+  #
+  def reject(*args, &blk) top.reject(*args, &blk) end
+  #
+  # See #reject.
+  #
+  def self.reject(*args, &blk) top.reject(*args, &blk) end
+
+  #
+  # Instance methods
+  #
+
+  # Heading banner preceding summary.
+  attr_writer :banner
+
+  # Program name to be emitted in error message and default banner,
+  # defaults to $0.
+  attr_writer :program_name
+
+  # Width for option list portion of summary. Must be Numeric.
+  attr_accessor :summary_width
+
+  # Indentation for summary. Must be String (or have + String method).
+  attr_accessor :summary_indent
+
+  # Strings to be parsed in default.
+  attr_accessor :default_argv
+
+  # Whether to require that options match exactly (disallows providing
+  # abbreviated long option as short option).
+  attr_accessor :require_exact
+
+  # Whether to raise at unknown option.
+  attr_accessor :raise_unknown
+
+  #
+  # Heading banner preceding summary.
+  #
+  def banner
+    unless @banner
+      @banner = +"Usage: #{program_name} [options]"
+      visit(:add_banner, @banner)
+    end
+    @banner
+  end
+
+  #
+  # Program name to be emitted in error message and default banner, defaults
+  # to $0.
+  #
+  def program_name
+    @program_name || File.basename($0, '.*')
+  end
+
+  # for experimental cascading :-)
+  alias set_banner banner=
+  alias set_program_name program_name=
+  alias set_summary_width summary_width=
+  alias set_summary_indent summary_indent=
+
+  # Version
+  attr_writer :version
+  # Release code
+  attr_writer :release
+
+  #
+  # Version
+  #
+  def version
+    (defined?(@version) && @version) || (defined?(::Version) && ::Version)
+  end
+
+  #
+  # Release code
+  #
+  def release
+    (defined?(@release) && @release) || (defined?(::Release) && ::Release) || (defined?(::RELEASE) && ::RELEASE)
+  end
+
+  #
+  # Returns version string from program_name, version and release.
+  #
+  def ver
+    if v = version
+      str = +"#{program_name} #{[v].join('.')}"
+      str << " (#{v})" if v = release
+      str
+    end
+  end
+
+  #
+  # Shows warning message with the program name
+  #
+  # +mesg+:: Message, defaulted to +$!+.
+  #
+  # See Kernel#warn.
+  #
+  def warn(mesg = $!)
+    super("#{program_name}: #{mesg}")
+  end
+
+  #
+  # Shows message with the program name then aborts.
+  #
+  # +mesg+:: Message, defaulted to +$!+.
+  #
+  # See Kernel#abort.
+  #
+  def abort(mesg = $!)
+    super("#{program_name}: #{mesg}")
+  end
+
+  #
+  # Subject of #on / #on_head, #accept / #reject
+  #
+  def top
+    @stack[-1]
+  end
+
+  #
+  # Subject of #on_tail.
+  #
+  def base
+    @stack[1]
+  end
+
+  #
+  # Pushes a new List.
+  #
+  # If a block is given, yields +self+ and returns the result of the
+  # block, otherwise returns +self+.
+  #
+  def new
+    @stack.push(List.new)
+    if block_given?
+      yield self
+    else
+      self
+    end
+  end
+
+  #
+  # Removes the last List.
+  #
+  def remove
+    @stack.pop
+  end
+
+  #
+  # Puts option summary into +to+ and returns +to+. Yields each line if
+  # a block is given.
+  #
+  # +to+:: Output destination, which must have method <<. Defaults to [].
+  # +width+:: Width of left side, defaults to @summary_width.
+  # +max+:: Maximum length allowed for left side, defaults to +width+ - 1.
+  # +indent+:: Indentation, defaults to @summary_indent.
+  #
+  def summarize(to = [], width = @summary_width, max = width - 1, indent = @summary_indent, &blk)
+    nl = "\n"
+    blk ||= proc {|l| to << (l.index(nl, -1) ? l : l + nl)}
+    visit(:summarize, {}, {}, width, max, indent, &blk)
+    to
+  end
+
+  #
+  # Returns option summary string.
+  #
+  def help; summarize("#{banner}".sub(/\n?\z/, "\n")) end
+  alias to_s help
+
+  def pretty_print(q)           # :nodoc:
+    q.object_group(self) do
+      first = true
+      if @stack.size > 2
+        @stack.each_with_index do |s, i|
+          next if i < 2
+          next if s.list.empty?
+          if first
+            first = false
+            q.text ":"
+          end
+          q.breakable
+          s.pretty_print(q)
+        end
+      end
+    end
+  end
+
+  def inspect                   # :nodoc:
+    require 'pp'
+    pretty_print_inspect
+  end
+
+  #
+  # Returns option summary list.
+  #
+  def to_a; summarize("#{banner}".split(/^/)) end
+
+  #
+  # Checks if an argument is given twice, in which case an ArgumentError is
+  # raised. Called from Gem::OptionParser#switch only.
+  #
+  # +obj+:: New argument.
+  # +prv+:: Previously specified argument.
+  # +msg+:: Exception message.
+  #
+  def notwice(obj, prv, msg) # :nodoc:
+    unless !prv or prv == obj
+      raise(ArgumentError, "argument #{msg} given twice: #{obj}",
+            ParseError.filter_backtrace(caller(2)))
+    end
+    obj
+  end
+  private :notwice
+
+  SPLAT_PROC = proc {|*a| a.length <= 1 ? a.first : a} # :nodoc:
+
+  # :call-seq:
+  #   make_switch(params, block = nil)
+  #
+  # :include: ../doc/optparse/creates_option.rdoc
+  #
+  def make_switch(opts, block = nil)
+    short, long, nolong, style, pattern, conv, not_pattern, not_conv, not_style = [], [], []
+    ldesc, sdesc, desc, arg = [], [], []
+    default_style = Switch::NoArgument
+    default_pattern = nil
+    klass = nil
+    q, a = nil
+    has_arg = false
+
+    opts.each do |o|
+      # argument class
+      next if search(:atype, o) do |pat, c|
+        klass = notwice(o, klass, 'type')
+        if not_style and not_style != Switch::NoArgument
+          not_pattern, not_conv = pat, c
+        else
+          default_pattern, conv = pat, c
+        end
+      end
+
+      # directly specified pattern(any object possible to match)
+      if (!(String === o || Symbol === o)) and o.respond_to?(:match)
+        pattern = notwice(o, pattern, 'pattern')
+        if pattern.respond_to?(:convert)
+          conv = pattern.method(:convert).to_proc
+        else
+          conv = SPLAT_PROC
+        end
+        next
+      end
+
+      # anything others
+      case o
+      when Proc, Method
+        block = notwice(o, block, 'block')
+      when Array, Hash
+        case pattern
+        when CompletingHash
+        when nil
+          pattern = CompletingHash.new
+          conv = pattern.method(:convert).to_proc if pattern.respond_to?(:convert)
+        else
+          raise ArgumentError, "argument pattern given twice"
+        end
+        o.each {|pat, *v| pattern[pat] = v.fetch(0) {pat}}
+      when Module
+        raise ArgumentError, "unsupported argument type: #{o}", ParseError.filter_backtrace(caller(4))
+      when *ArgumentStyle.keys
+        style = notwice(ArgumentStyle[o], style, 'style')
+      when /^--no-([^\[\]=\s]*)(.+)?/
+        q, a = $1, $2
+        o = notwice(a ? Object : TrueClass, klass, 'type')
+        not_pattern, not_conv = search(:atype, o) unless not_style
+        not_style = (not_style || default_style).guess(arg = a) if a
+        default_style = Switch::NoArgument
+        default_pattern, conv = search(:atype, FalseClass) unless default_pattern
+        ldesc << "--no-#{q}"
+        (q = q.downcase).tr!('_', '-')
+        long << "no-#{q}"
+        nolong << q
+      when /^--\[no-\]([^\[\]=\s]*)(.+)?/
+        q, a = $1, $2
+        o = notwice(a ? Object : TrueClass, klass, 'type')
+        if a
+          default_style = default_style.guess(arg = a)
+          default_pattern, conv = search(:atype, o) unless default_pattern
+        end
+        ldesc << "--[no-]#{q}"
+        (o = q.downcase).tr!('_', '-')
+        long << o
+        not_pattern, not_conv = search(:atype, FalseClass) unless not_style
+        not_style = Switch::NoArgument
+        nolong << "no-#{o}"
+      when /^--([^\[\]=\s]*)(.+)?/
+        q, a = $1, $2
+        if a
+          o = notwice(NilClass, klass, 'type')
+          default_style = default_style.guess(arg = a)
+          default_pattern, conv = search(:atype, o) unless default_pattern
+        end
+        ldesc << "--#{q}"
+        (o = q.downcase).tr!('_', '-')
+        long << o
+      when /^-(\[\^?\]?(?:[^\\\]]|\\.)*\])(.+)?/
+        q, a = $1, $2
+        o = notwice(Object, klass, 'type')
+        if a
+          default_style = default_style.guess(arg = a)
+          default_pattern, conv = search(:atype, o) unless default_pattern
+        else
+          has_arg = true
+        end
+        sdesc << "-#{q}"
+        short << Regexp.new(q)
+      when /^-(.)(.+)?/
+        q, a = $1, $2
+        if a
+          o = notwice(NilClass, klass, 'type')
+          default_style = default_style.guess(arg = a)
+          default_pattern, conv = search(:atype, o) unless default_pattern
+        end
+        sdesc << "-#{q}"
+        short << q
+      when /^=/
+        style = notwice(default_style.guess(arg = o), style, 'style')
+        default_pattern, conv = search(:atype, Object) unless default_pattern
+      else
+        desc.push(o) if o && !o.empty?
+      end
+    end
+
+    default_pattern, conv = search(:atype, default_style.pattern) unless default_pattern
+    if !(short.empty? and long.empty?)
+      if has_arg and default_style == Switch::NoArgument
+        default_style = Switch::RequiredArgument
+      end
+      s = (style || default_style).new(pattern || default_pattern,
+                                       conv, sdesc, ldesc, arg, desc, block)
+    elsif !block
+      if style or pattern
+        raise ArgumentError, "no switch given", ParseError.filter_backtrace(caller)
+      end
+      s = desc
+    else
+      short << pattern
+      s = (style || default_style).new(pattern,
+                                       conv, nil, nil, arg, desc, block)
+    end
+    return s, short, long,
+      (not_style.new(not_pattern, not_conv, sdesc, ldesc, nil, desc, block) if not_style),
+      nolong
+  end
+
+  # ----
+  # Option definition phase methods
+  #
+  # These methods are used to define options, or to construct an
+  # Gem::OptionParser instance in other words.
+
+  # :call-seq:
+  #   define(*params, &block)
+  #
+  # :include: ../doc/optparse/creates_option.rdoc
+  #
+  def define(*opts, &block)
+    top.append(*(sw = make_switch(opts, block)))
+    sw[0]
+  end
+
+  # :call-seq:
+  #   on(*params, &block)
+  #
+  # :include: ../doc/optparse/creates_option.rdoc
+  #
+  def on(*opts, &block)
+    define(*opts, &block)
+    self
+  end
+  alias def_option define
+
+  # :call-seq:
+  #   define_head(*params, &block)
+  #
+  # :include: ../doc/optparse/creates_option.rdoc
+  #
+  def define_head(*opts, &block)
+    top.prepend(*(sw = make_switch(opts, block)))
+    sw[0]
+  end
+
+  # :call-seq:
+  #   on_head(*params, &block)
+  #
+  # :include: ../doc/optparse/creates_option.rdoc
+  #
+  # The new option is added at the head of the summary.
+  #
+  def on_head(*opts, &block)
+    define_head(*opts, &block)
+    self
+  end
+  alias def_head_option define_head
+
+  # :call-seq:
+  #   define_tail(*params, &block)
+  #
+  # :include: ../doc/optparse/creates_option.rdoc
+  #
+  def define_tail(*opts, &block)
+    base.append(*(sw = make_switch(opts, block)))
+    sw[0]
+  end
+
+  #
+  # :call-seq:
+  #   on_tail(*params, &block)
+  #
+  # :include: ../doc/optparse/creates_option.rdoc
+  #
+  # The new option is added at the tail of the summary.
+  #
+  def on_tail(*opts, &block)
+    define_tail(*opts, &block)
+    self
+  end
+  alias def_tail_option define_tail
+
+  #
+  # Add separator in summary.
+  #
+  def separator(string)
+    top.append(string, nil, nil)
+  end
+
+  # ----
+  # Arguments parse phase methods
+  #
+  # These methods parse +argv+, convert, and store the results by
+  # calling handlers.  As these methods do not modify +self+, +self+
+  # can be frozen.
+
+  #
+  # Parses command line arguments +argv+ in order. When a block is given,
+  # each non-option argument is yielded. When optional +into+ keyword
+  # argument is provided, the parsed option values are stored there via
+  # <code>[]=</code> method (so it can be Hash, or OpenStruct, or other
+  # similar object).
+  #
+  # Returns the rest of +argv+ left unparsed.
+  #
+  def order(*argv, **keywords, &nonopt)
+    argv = argv[0].dup if argv.size == 1 and Array === argv[0]
+    order!(argv, **keywords, &nonopt)
+  end
+
+  #
+  # Same as #order, but removes switches destructively.
+  # Non-option arguments remain in +argv+.
+  #
+  def order!(argv = default_argv, into: nil, **keywords, &nonopt)
+    setter = ->(name, val) {into[name.to_sym] = val} if into
+    parse_in_order(argv, setter, **keywords, &nonopt)
+  end
+
+  def parse_in_order(argv = default_argv, setter = nil, exact: require_exact, **, &nonopt)  # :nodoc:
+    opt, arg, val, rest = nil
+    nonopt ||= proc {|a| throw :terminate, a}
+    argv.unshift(arg) if arg = catch(:terminate) {
+      while arg = argv.shift
+        case arg
+        # long option
+        when /\A--([^=]*)(?:=(.*))?/m
+          opt, rest = $1, $2
+          opt.tr!('_', '-')
+          begin
+            if exact
+              sw, = search(:long, opt)
+            else
+              sw, = complete(:long, opt, true)
+            end
+          rescue ParseError
+            throw :terminate, arg unless raise_unknown
+            raise $!.set_option(arg, true)
+          else
+            unless sw
+              throw :terminate, arg unless raise_unknown
+              raise InvalidOption, arg
+            end
+          end
+          begin
+            opt, cb, val = sw.parse(rest, argv) {|*exc| raise(*exc)}
+            val = callback!(cb, 1, val) if cb
+            callback!(setter, 2, sw.switch_name, val) if setter
+          rescue ParseError
+            raise $!.set_option(arg, rest)
+          end
+
+        # short option
+        when /\A-(.)((=).*|.+)?/m
+          eq, rest, opt = $3, $2, $1
+          has_arg, val = eq, rest
+          begin
+            sw, = search(:short, opt)
+            unless sw
+              begin
+                sw, = complete(:short, opt)
+                # short option matched.
+                val = arg.delete_prefix('-')
+                has_arg = true
+              rescue InvalidOption
+                raise if exact
+                # if no short options match, try completion with long
+                # options.
+                sw, = complete(:long, opt)
+                eq ||= !rest
+              end
+            end
+          rescue ParseError
+            throw :terminate, arg unless raise_unknown
+            raise $!.set_option(arg, true)
+          end
+          begin
+            opt, cb, val = sw.parse(val, argv) {|*exc| raise(*exc) if eq}
+          rescue ParseError
+            raise $!.set_option(arg, arg.length > 2)
+          else
+            raise InvalidOption, arg if has_arg and !eq and arg == "-#{opt}"
+          end
+          begin
+            argv.unshift(opt) if opt and (!rest or (opt = opt.sub(/\A-*/, '-')) != '-')
+            val = callback!(cb, 1, val) if cb
+            callback!(setter, 2, sw.switch_name, val) if setter
+          rescue ParseError
+            raise $!.set_option(arg, arg.length > 2)
+          end
+
+        # non-option argument
+        else
+          catch(:prune) do
+            visit(:each_option) do |sw0|
+              sw = sw0
+              sw.block.call(arg) if Switch === sw and sw.match_nonswitch?(arg)
+            end
+            nonopt.call(arg)
+          end
+        end
+      end
+
+      nil
+    }
+
+    visit(:search, :short, nil) {|sw| sw.block.call(*argv) if !sw.pattern}
+
+    argv
+  end
+  private :parse_in_order
+
+  # Calls callback with _val_.
+  def callback!(cb, max_arity, *args) # :nodoc:
+    args.compact!
+
+    if (size = args.size) < max_arity and cb.to_proc.lambda?
+      (arity = cb.arity) < 0 and arity = (1-arity)
+      arity = max_arity if arity > max_arity
+      args[arity - 1] = nil if arity > size
+    end
+    cb.call(*args)
+  end
+  private :callback!
+
+  #
+  # Parses command line arguments +argv+ in permutation mode and returns
+  # list of non-option arguments. When optional +into+ keyword
+  # argument is provided, the parsed option values are stored there via
+  # <code>[]=</code> method (so it can be Hash, or OpenStruct, or other
+  # similar object).
+  #
+  def permute(*argv, **keywords)
+    argv = argv[0].dup if argv.size == 1 and Array === argv[0]
+    permute!(argv, **keywords)
+  end
+
+  #
+  # Same as #permute, but removes switches destructively.
+  # Non-option arguments remain in +argv+.
+  #
+  def permute!(argv = default_argv, **keywords)
+    nonopts = []
+    order!(argv, **keywords, &nonopts.method(:<<))
+    argv[0, 0] = nonopts
+    argv
+  end
+
+  #
+  # Parses command line arguments +argv+ in order when environment variable
+  # POSIXLY_CORRECT is set, and in permutation mode otherwise.
+  # When optional +into+ keyword argument is provided, the parsed option
+  # values are stored there via <code>[]=</code> method (so it can be Hash,
+  # or OpenStruct, or other similar object).
+  #
+  def parse(*argv, **keywords)
+    argv = argv[0].dup if argv.size == 1 and Array === argv[0]
+    parse!(argv, **keywords)
+  end
+
+  #
+  # Same as #parse, but removes switches destructively.
+  # Non-option arguments remain in +argv+.
+  #
+  def parse!(argv = default_argv, **keywords)
+    if ENV.include?('POSIXLY_CORRECT')
+      order!(argv, **keywords)
+    else
+      permute!(argv, **keywords)
+    end
+  end
+
+  #
+  # Wrapper method for getopts.rb.
+  #
+  #   params = ARGV.getopts("ab:", "foo", "bar:", "zot:Z;zot option")
+  #   # params["a"] = true   # -a
+  #   # params["b"] = "1"    # -b1
+  #   # params["foo"] = "1"  # --foo
+  #   # params["bar"] = "x"  # --bar x
+  #   # params["zot"] = "z"  # --zot Z
+  #
+  # Option +symbolize_names+ (boolean) specifies whether returned Hash keys should be Symbols; defaults to +false+ (use Strings).
+  #
+  #   params = ARGV.getopts("ab:", "foo", "bar:", "zot:Z;zot option", symbolize_names: true)
+  #   # params[:a] = true   # -a
+  #   # params[:b] = "1"    # -b1
+  #   # params[:foo] = "1"  # --foo
+  #   # params[:bar] = "x"  # --bar x
+  #   # params[:zot] = "z"  # --zot Z
+  #
+  def getopts(*args, symbolize_names: false, **keywords)
+    argv = Array === args.first ? args.shift : default_argv
+    single_options, *long_options = *args
+
+    result = {}
+
+    single_options.scan(/(.)(:)?/) do |opt, val|
+      if val
+        result[opt] = nil
+        define("-#{opt} VAL")
+      else
+        result[opt] = false
+        define("-#{opt}")
+      end
+    end if single_options
+
+    long_options.each do |arg|
+      arg, desc = arg.split(';', 2)
+      opt, val = arg.split(':', 2)
+      if val
+        result[opt] = val.empty? ? nil : val
+        define("--#{opt}=#{result[opt] || "VAL"}", *[desc].compact)
+      else
+        result[opt] = false
+        define("--#{opt}", *[desc].compact)
+      end
+    end
+
+    parse_in_order(argv, result.method(:[]=), **keywords)
+    symbolize_names ? result.transform_keys(&:to_sym) : result
+  end
+
+  #
+  # See #getopts.
+  #
+  def self.getopts(*args, symbolize_names: false)
+    new.getopts(*args, symbolize_names: symbolize_names)
+  end
+
+  #
+  # Traverses @stack, sending each element method +id+ with +args+ and
+  # +block+.
+  #
+  def visit(id, *args, &block) # :nodoc:
+    @stack.reverse_each do |el|
+      el.__send__(id, *args, &block)
+    end
+    nil
+  end
+  private :visit
+
+  #
+  # Searches +key+ in @stack for +id+ hash and returns or yields the result.
+  #
+  def search(id, key) # :nodoc:
+    block_given = block_given?
+    visit(:search, id, key) do |k|
+      return block_given ? yield(k) : k
+    end
+  end
+  private :search
+
+  #
+  # Completes shortened long style option switch and returns pair of
+  # canonical switch and switch descriptor Gem::OptionParser::Switch.
+  #
+  # +typ+::   Searching table.
+  # +opt+::   Searching key.
+  # +icase+:: Search case insensitive if true.
+  # +pat+::   Optional pattern for completion.
+  #
+  def complete(typ, opt, icase = false, *pat) # :nodoc:
+    if pat.empty?
+      search(typ, opt) {|sw| return [sw, opt]} # exact match or...
+    end
+    ambiguous = catch(:ambiguous) {
+      visit(:complete, typ, opt, icase, *pat) {|o, *sw| return sw}
+    }
+    exc = ambiguous ? AmbiguousOption : InvalidOption
+    raise exc.new(opt, additional: self.method(:additional_message).curry[typ])
+  end
+  private :complete
+
+  #
+  # Returns additional info.
+  #
+  def additional_message(typ, opt)
+    return unless typ and opt and defined?(DidYouMean::SpellChecker)
+    all_candidates = []
+    visit(:get_candidates, typ) do |candidates|
+      all_candidates.concat(candidates)
+    end
+    all_candidates.select! {|cand| cand.is_a?(String) }
+    checker = DidYouMean::SpellChecker.new(dictionary: all_candidates)
+    DidYouMean.formatter.message_for(all_candidates & checker.correct(opt))
+  end
+
+  #
+  # Return candidates for +word+.
+  #
+  def candidate(word)
+    list = []
+    case word
+    when '-'
+      long = short = true
+    when /\A--/
+      word, arg = word.split(/=/, 2)
+      argpat = Completion.regexp(arg, false) if arg and !arg.empty?
+      long = true
+    when /\A-/
+      short = true
+    end
+    pat = Completion.regexp(word, long)
+    visit(:each_option) do |opt|
+      next unless Switch === opt
+      opts = (long ? opt.long : []) + (short ? opt.short : [])
+      opts = Completion.candidate(word, true, pat, &opts.method(:each)).map(&:first) if pat
+      if /\A=/ =~ opt.arg
+        opts.map! {|sw| sw + "="}
+        if arg and CompletingHash === opt.pattern
+          if opts = opt.pattern.candidate(arg, false, argpat)
+            opts.map!(&:last)
+          end
+        end
+      end
+      list.concat(opts)
+    end
+    list
+  end
+
+  #
+  # Loads options from file names as +filename+. Does nothing when the file
+  # is not present. Returns whether successfully loaded.
+  #
+  # +filename+ defaults to basename of the program without suffix in a
+  # directory ~/.options, then the basename with '.options' suffix
+  # under XDG and Haiku standard places.
+  #
+  # The optional +into+ keyword argument works exactly like that accepted in
+  # method #parse.
+  #
+  def load(filename = nil, **keywords)
+    unless filename
+      basename = File.basename($0, '.*')
+      return true if load(File.expand_path(basename, '~/.options'), **keywords) rescue nil
+      basename << ".options"
+      return [
+        # XDG
+        ENV['XDG_CONFIG_HOME'],
+        '~/.config',
+        *ENV['XDG_CONFIG_DIRS']&.split(File::PATH_SEPARATOR),
+
+        # Haiku
+        '~/config/settings',
+      ].any? {|dir|
+        next if !dir or dir.empty?
+        load(File.expand_path(basename, dir), **keywords) rescue nil
+      }
+    end
+    begin
+      parse(*File.readlines(filename, chomp: true), **keywords)
+      true
+    rescue Errno::ENOENT, Errno::ENOTDIR
+      false
+    end
+  end
+
+  #
+  # Parses environment variable +env+ or its uppercase with splitting like a
+  # shell.
+  #
+  # +env+ defaults to the basename of the program.
+  #
+  def environment(env = File.basename($0, '.*'), **keywords)
+    env = ENV[env] || ENV[env.upcase] or return
+    require 'shellwords'
+    parse(*Shellwords.shellwords(env), **keywords)
+  end
+
+  #
+  # Acceptable argument classes
+  #
+
+  #
+  # Any string and no conversion. This is fall-back.
+  #
+  accept(Object) {|s,|s or s.nil?}
+
+  accept(NilClass) {|s,|s}
+
+  #
+  # Any non-empty string, and no conversion.
+  #
+  accept(String, /.+/m) {|s,*|s}
+
+  #
+  # Ruby/C-like integer, octal for 0-7 sequence, binary for 0b, hexadecimal
+  # for 0x, and decimal for others; with optional sign prefix. Converts to
+  # Integer.
+  #
+  decimal = '\d+(?:_\d+)*'
+  binary = 'b[01]+(?:_[01]+)*'
+  hex = 'x[\da-f]+(?:_[\da-f]+)*'
+  octal = "0(?:[0-7]+(?:_[0-7]+)*|#{binary}|#{hex})?"
+  integer = "#{octal}|#{decimal}"
+
+  accept(Integer, %r"\A[-+]?(?:#{integer})\z"io) {|s,|
+    begin
+      Integer(s)
+    rescue ArgumentError
+      raise Gem::OptionParser::InvalidArgument, s
+    end if s
+  }
+
+  #
+  # Float number format, and converts to Float.
+  #
+  float = "(?:#{decimal}(?=(.)?)(?:\\.(?:#{decimal})?)?|\\.#{decimal})(?:E[-+]?#{decimal})?"
+  floatpat = %r"\A[-+]?#{float}\z"io
+  accept(Float, floatpat) {|s,| s.to_f if s}
+
+  #
+  # Generic numeric format, converts to Integer for integer format, Float
+  # for float format, and Rational for rational format.
+  #
+  real = "[-+]?(?:#{octal}|#{float})"
+  accept(Numeric, /\A(#{real})(?:\/(#{real}))?\z/io) {|s, d, f, n,|
+    if n
+      Rational(d, n)
+    elsif f
+      Float(s)
+    else
+      Integer(s)
+    end
+  }
+
+  #
+  # Decimal integer format, to be converted to Integer.
+  #
+  DecimalInteger = /\A[-+]?#{decimal}\z/io
+  accept(DecimalInteger, DecimalInteger) {|s,|
+    begin
+      Integer(s, 10)
+    rescue ArgumentError
+      raise Gem::OptionParser::InvalidArgument, s
+    end if s
+  }
+
+  #
+  # Ruby/C like octal/hexadecimal/binary integer format, to be converted to
+  # Integer.
+  #
+  OctalInteger = /\A[-+]?(?:[0-7]+(?:_[0-7]+)*|0(?:#{binary}|#{hex}))\z/io
+  accept(OctalInteger, OctalInteger) {|s,|
+    begin
+      Integer(s, 8)
+    rescue ArgumentError
+      raise Gem::OptionParser::InvalidArgument, s
+    end if s
+  }
+
+  #
+  # Decimal integer/float number format, to be converted to Integer for
+  # integer format, Float for float format.
+  #
+  DecimalNumeric = floatpat     # decimal integer is allowed as float also.
+  accept(DecimalNumeric, floatpat) {|s, f|
+    begin
+      if f
+        Float(s)
+      else
+        Integer(s)
+      end
+    rescue ArgumentError
+      raise Gem::OptionParser::InvalidArgument, s
+    end if s
+  }
+
+  #
+  # Boolean switch, which means whether it is present or not, whether it is
+  # absent or not with prefix no-, or it takes an argument
+  # yes/no/true/false/+/-.
+  #
+  yesno = CompletingHash.new
+  %w[- no false].each {|el| yesno[el] = false}
+  %w[+ yes true].each {|el| yesno[el] = true}
+  yesno['nil'] = false          # should be nil?
+  accept(TrueClass, yesno) {|arg, val| val == nil or val}
+  #
+  # Similar to TrueClass, but defaults to false.
+  #
+  accept(FalseClass, yesno) {|arg, val| val != nil and val}
+
+  #
+  # List of strings separated by ",".
+  #
+  accept(Array) do |s, |
+    if s
+      s = s.split(',').collect {|ss| ss unless ss.empty?}
+    end
+    s
+  end
+
+  #
+  # Regular expression with options.
+  #
+  accept(Regexp, %r"\A/((?:\\.|[^\\])*)/([[:alpha:]]+)?\z|.*") do |all, s, o|
+    f = 0
+    if o
+      f |= Regexp::IGNORECASE if /i/ =~ o
+      f |= Regexp::MULTILINE if /m/ =~ o
+      f |= Regexp::EXTENDED if /x/ =~ o
+      case o = o.delete("imx")
+      when ""
+      when "u"
+        s = s.encode(Encoding::UTF_8)
+      when "e"
+        s = s.encode(Encoding::EUC_JP)
+      when "s"
+        s = s.encode(Encoding::SJIS)
+      when "n"
+        f |= Regexp::NOENCODING
+      else
+        raise Gem::OptionParser::InvalidArgument, "unknown regexp option - #{o}"
+      end
+    else
+      s ||= all
+    end
+    Regexp.new(s, f)
+  end
+
+  #
+  # Exceptions
+  #
+
+  #
+  # Base class of exceptions from Gem::OptionParser.
+  #
+  class ParseError < RuntimeError
+    # Reason which caused the error.
+    Reason = 'parse error'
+
+    # :nodoc:
+    def initialize(*args, additional: nil)
+      @additional = additional
+      @arg0, = args
+      @args = args
+      @reason = nil
+    end
+
+    attr_reader :args
+    attr_writer :reason
+    attr_accessor :additional
+
+    #
+    # Pushes back erred argument(s) to +argv+.
+    #
+    def recover(argv)
+      argv[0, 0] = @args
+      argv
+    end
+
+    def self.filter_backtrace(array)
+      unless $DEBUG
+        array.delete_if(&%r"\A#{Regexp.quote(__FILE__)}:"o.method(:=~))
+      end
+      array
+    end
+
+    def set_backtrace(array)
+      super(self.class.filter_backtrace(array))
+    end
+
+    def set_option(opt, eq)
+      if eq
+        @args[0] = opt
+      else
+        @args.unshift(opt)
+      end
+      self
+    end
+
+    #
+    # Returns error reason. Override this for I18N.
+    #
+    def reason
+      @reason || self.class::Reason
+    end
+
+    def inspect
+      "#<#{self.class}: #{args.join(' ')}>"
+    end
+
+    #
+    # Default stringizing method to emit standard error message.
+    #
+    def message
+      "#{reason}: #{args.join(' ')}#{additional[@arg0] if additional}"
+    end
+
+    alias to_s message
+  end
+
+  #
+  # Raises when ambiguously completable string is encountered.
+  #
+  class AmbiguousOption < ParseError
+    const_set(:Reason, 'ambiguous option')
+  end
+
+  #
+  # Raises when there is an argument for a switch which takes no argument.
+  #
+  class NeedlessArgument < ParseError
+    const_set(:Reason, 'needless argument')
+  end
+
+  #
+  # Raises when a switch with mandatory argument has no argument.
+  #
+  class MissingArgument < ParseError
+    const_set(:Reason, 'missing argument')
+  end
+
+  #
+  # Raises when switch is undefined.
+  #
+  class InvalidOption < ParseError
+    const_set(:Reason, 'invalid option')
+  end
+
+  #
+  # Raises when the given argument does not match required format.
+  #
+  class InvalidArgument < ParseError
+    const_set(:Reason, 'invalid argument')
+  end
+
+  #
+  # Raises when the given argument word can't be completed uniquely.
+  #
+  class AmbiguousArgument < InvalidArgument
+    const_set(:Reason, 'ambiguous argument')
+  end
+
+  #
+  # Miscellaneous
+  #
+
+  #
+  # Extends command line arguments array (ARGV) to parse itself.
+  #
+  module Arguable
+
+    #
+    # Sets Gem::OptionParser object, when +opt+ is +false+ or +nil+, methods
+    # Gem::OptionParser::Arguable#options and Gem::OptionParser::Arguable#options= are
+    # undefined. Thus, there is no ways to access the Gem::OptionParser object
+    # via the receiver object.
+    #
+    def options=(opt)
+      unless @optparse = opt
+        class << self
+          undef_method(:options)
+          undef_method(:options=)
+        end
+      end
+    end
+
+    #
+    # Actual Gem::OptionParser object, automatically created if nonexistent.
+    #
+    # If called with a block, yields the Gem::OptionParser object and returns the
+    # result of the block. If an Gem::OptionParser::ParseError exception occurs
+    # in the block, it is rescued, a error message printed to STDERR and
+    # +nil+ returned.
+    #
+    def options
+      @optparse ||= Gem::OptionParser.new
+      @optparse.default_argv = self
+      block_given? or return @optparse
+      begin
+        yield @optparse
+      rescue ParseError
+        @optparse.warn $!
+        nil
+      end
+    end
+
+    #
+    # Parses +self+ destructively in order and returns +self+ containing the
+    # rest arguments left unparsed.
+    #
+    def order!(**keywords, &blk) options.order!(self, **keywords, &blk) end
+
+    #
+    # Parses +self+ destructively in permutation mode and returns +self+
+    # containing the rest arguments left unparsed.
+    #
+    def permute!(**keywords) options.permute!(self, **keywords) end
+
+    #
+    # Parses +self+ destructively and returns +self+ containing the
+    # rest arguments left unparsed.
+    #
+    def parse!(**keywords) options.parse!(self, **keywords) end
+
+    #
+    # Substitution of getopts is possible as follows. Also see
+    # Gem::OptionParser#getopts.
+    #
+    #   def getopts(*args)
+    #     ($OPT = ARGV.getopts(*args)).each do |opt, val|
+    #       eval "$OPT_#{opt.gsub(/[^A-Za-z0-9_]/, '_')} = val"
+    #     end
+    #   rescue Gem::OptionParser::ParseError
+    #   end
+    #
+    def getopts(*args, symbolize_names: false, **keywords)
+      options.getopts(self, *args, symbolize_names: symbolize_names, **keywords)
+    end
+
+    #
+    # Initializes instance variable.
+    #
+    def self.extend_object(obj)
+      super
+      obj.instance_eval {@optparse = nil}
+    end
+
+    def initialize(*args)       # :nodoc:
+      super
+      @optparse = nil
+    end
+  end
+
+  #
+  # Acceptable argument classes. Now contains DecimalInteger, OctalInteger
+  # and DecimalNumeric. See Acceptable argument classes (in source code).
+  #
+  module Acceptables
+    const_set(:DecimalInteger, Gem::OptionParser::DecimalInteger)
+    const_set(:OctalInteger, Gem::OptionParser::OctalInteger)
+    const_set(:DecimalNumeric, Gem::OptionParser::DecimalNumeric)
+  end
+end
+
+# ARGV is arguable by Gem::OptionParser
+ARGV.extend(Gem::OptionParser::Arguable)
diff --git a/lib/rubygems/optparse/lib/optparse/ac.rb b/lib/rubygems/vendor/optparse/lib/optparse/ac.rb
similarity index 76%
rename from lib/rubygems/optparse/lib/optparse/ac.rb
rename to lib/rubygems/vendor/optparse/lib/optparse/ac.rb
index e84d01bf91f54b..28a5b1b33ef8ff 100644
--- a/lib/rubygems/optparse/lib/optparse/ac.rb
+++ b/lib/rubygems/vendor/optparse/lib/optparse/ac.rb
@@ -1,7 +1,11 @@
 # frozen_string_literal: false
 require_relative '../optparse'
 
+#
+# autoconf-like options.
+#
 class Gem::OptionParser::AC < Gem::OptionParser
+  # :stopdoc:
   private
 
   def _check_ac_args(name, block)
@@ -14,6 +18,7 @@ def _check_ac_args(name, block)
   end
 
   ARG_CONV = proc {|val| val.nil? ? true : val}
+  private_constant :ARG_CONV
 
   def _ac_arg_enable(prefix, name, help_string, block)
     _check_ac_args(name, block)
@@ -29,16 +34,27 @@ def _ac_arg_enable(prefix, name, help_string, block)
     enable
   end
 
+  # :startdoc:
+
   public
 
+  # Define <tt>--enable</tt> / <tt>--disable</tt> style option
+  #
+  # Appears as <tt>--enable-<i>name</i></tt> in help message.
   def ac_arg_enable(name, help_string, &block)
     _ac_arg_enable("enable", name, help_string, block)
   end
 
+  # Define <tt>--enable</tt> / <tt>--disable</tt> style option
+  #
+  # Appears as <tt>--disable-<i>name</i></tt> in help message.
   def ac_arg_disable(name, help_string, &block)
     _ac_arg_enable("disable", name, help_string, block)
   end
 
+  # Define <tt>--with</tt> / <tt>--without</tt> style option
+  #
+  # Appears as <tt>--with-<i>name</i></tt> in help message.
   def ac_arg_with(name, help_string, &block)
     _check_ac_args(name, block)
 
diff --git a/lib/rubygems/optparse/lib/optparse/date.rb b/lib/rubygems/vendor/optparse/lib/optparse/date.rb
similarity index 100%
rename from lib/rubygems/optparse/lib/optparse/date.rb
rename to lib/rubygems/vendor/optparse/lib/optparse/date.rb
diff --git a/lib/rubygems/vendor/optparse/lib/optparse/kwargs.rb b/lib/rubygems/vendor/optparse/lib/optparse/kwargs.rb
new file mode 100644
index 00000000000000..70762f033bf13b
--- /dev/null
+++ b/lib/rubygems/vendor/optparse/lib/optparse/kwargs.rb
@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+require_relative '../optparse'
+
+class Gem::OptionParser
+  # :call-seq:
+  #   define_by_keywords(options, method, **params)
+  #
+  # :include: ../../doc/optparse/creates_option.rdoc
+  #
+  # Defines options which set in to _options_ for keyword parameters
+  # of _method_.
+  #
+  # Parameters for each keywords are given as elements of _params_.
+  #
+  def define_by_keywords(options, method, **params)
+    method.parameters.each do |type, name|
+      case type
+      when :key, :keyreq
+        op, cl = *(type == :key ? %w"[ ]" : ["", ""])
+        define("--#{name}=#{op}#{name.upcase}#{cl}", *params[name]) do |o|
+          options[name] = o
+        end
+      end
+    end
+    options
+  end
+end
diff --git a/lib/rubygems/optparse/lib/optparse/shellwords.rb b/lib/rubygems/vendor/optparse/lib/optparse/shellwords.rb
similarity index 100%
rename from lib/rubygems/optparse/lib/optparse/shellwords.rb
rename to lib/rubygems/vendor/optparse/lib/optparse/shellwords.rb
diff --git a/lib/rubygems/optparse/lib/optparse/time.rb b/lib/rubygems/vendor/optparse/lib/optparse/time.rb
similarity index 100%
rename from lib/rubygems/optparse/lib/optparse/time.rb
rename to lib/rubygems/vendor/optparse/lib/optparse/time.rb
diff --git a/lib/rubygems/vendor/optparse/lib/optparse/uri.rb b/lib/rubygems/vendor/optparse/lib/optparse/uri.rb
new file mode 100644
index 00000000000000..398127479a20d4
--- /dev/null
+++ b/lib/rubygems/vendor/optparse/lib/optparse/uri.rb
@@ -0,0 +1,7 @@
+# frozen_string_literal: false
+# -*- ruby -*-
+
+require_relative '../optparse'
+require_relative '../../../uri/lib/uri'
+
+Gem::OptionParser.accept(Gem::URI) {|s,| Gem::URI.parse(s) if s}
diff --git a/lib/rubygems/vendor/optparse/lib/optparse/version.rb b/lib/rubygems/vendor/optparse/lib/optparse/version.rb
new file mode 100644
index 00000000000000..e39889ae87bd87
--- /dev/null
+++ b/lib/rubygems/vendor/optparse/lib/optparse/version.rb
@@ -0,0 +1,80 @@
+# frozen_string_literal: false
+# Gem::OptionParser internal utility
+
+class << Gem::OptionParser
+  #
+  # Shows version string in packages if Version is defined.
+  #
+  # +pkgs+:: package list
+  #
+  def show_version(*pkgs)
+    progname = ARGV.options.program_name
+    result = false
+    show = proc do |klass, cname, version|
+      str = "#{progname}"
+      unless klass == ::Object and cname == :VERSION
+        version = version.join(".") if Array === version
+        str << ": #{klass}" unless klass == Object
+        str << " version #{version}"
+      end
+      [:Release, :RELEASE].find do |rel|
+        if klass.const_defined?(rel)
+          str << " (#{klass.const_get(rel)})"
+        end
+      end
+      puts str
+      result = true
+    end
+    if pkgs.size == 1 and pkgs[0] == "all"
+      self.search_const(::Object, /\AV(?:ERSION|ersion)\z/) do |klass, cname, version|
+        unless cname[1] == ?e and klass.const_defined?(:Version)
+          show.call(klass, cname.intern, version)
+        end
+      end
+    else
+      pkgs.each do |pkg|
+        begin
+          pkg = pkg.split(/::|\//).inject(::Object) {|m, c| m.const_get(c)}
+          v = case
+              when pkg.const_defined?(:Version)
+                pkg.const_get(n = :Version)
+              when pkg.const_defined?(:VERSION)
+                pkg.const_get(n = :VERSION)
+              else
+                n = nil
+                "unknown"
+              end
+          show.call(pkg, n, v)
+        rescue NameError
+        end
+      end
+    end
+    result
+  end
+
+  # :stopdoc:
+
+  def each_const(path, base = ::Object)
+    path.split(/::|\//).inject(base) do |klass, name|
+      raise NameError, path unless Module === klass
+      klass.constants.grep(/#{name}/i) do |c|
+        klass.const_defined?(c) or next
+        klass.const_get(c)
+      end
+    end
+  end
+
+  def search_const(klass, name)
+    klasses = [klass]
+    while klass = klasses.shift
+      klass.constants.each do |cname|
+        klass.const_defined?(cname) or next
+        const = klass.const_get(cname)
+        yield klass, cname, const if name === cname
+        klasses << const if Module === const and const != ::Object
+      end
+    end
+  end
+
+  # :startdoc:
+end
diff --git a/lib/rubygems/vendor/resolv/lib/resolv.rb b/lib/rubygems/vendor/resolv/lib/resolv.rb
new file mode 100644
index 00000000000000..2825b1ea974ba0
--- /dev/null
+++ b/lib/rubygems/vendor/resolv/lib/resolv.rb
@@ -0,0 +1,3483 @@
+# frozen_string_literal: true
+
+require 'socket'
+require_relative '../../timeout/lib/timeout'
+require 'io/wait'
+require_relative '../../../vendored_securerandom'
+
+# Gem::Resolv is a thread-aware DNS resolver library written in Ruby.  Gem::Resolv can
+# handle multiple DNS requests concurrently without blocking the entire Ruby
+# interpreter.
+#
+# See also resolv-replace.rb to replace the libc resolver with Gem::Resolv.
+#
+# Gem::Resolv can look up various DNS resources using the DNS module directly.
+#
+# Examples:
+#
+#   p Gem::Resolv.getaddress "www.ruby-lang.org"
+#   p Gem::Resolv.getname "210.251.121.214"
+#
+#   Gem::Resolv::DNS.open do |dns|
+#     ress = dns.getresources "www.ruby-lang.org", Gem::Resolv::DNS::Resource::IN::A
+#     p ress.map(&:address)
+#     ress = dns.getresources "ruby-lang.org", Gem::Resolv::DNS::Resource::IN::MX
+#     p ress.map { |r| [r.exchange.to_s, r.preference] }
+#   end
+#
+#
+# == Bugs
+#
+# * NIS is not supported.
+# * /etc/nsswitch.conf is not supported.
+
+class Gem::Resolv
+
+  VERSION = "0.6.2"
+
+  ##
+  # Looks up the first IP address for +name+.
+
+  def self.getaddress(name)
+    DefaultResolver.getaddress(name)
+  end
+
+  ##
+  # Looks up all IP address for +name+.
+
+  def self.getaddresses(name)
+    DefaultResolver.getaddresses(name)
+  end
+
+  ##
+  # Iterates over all IP addresses for +name+.
+
+  def self.each_address(name, &block)
+    DefaultResolver.each_address(name, &block)
+  end
+
+  ##
+  # Looks up the hostname of +address+.
+
+  def self.getname(address)
+    DefaultResolver.getname(address)
+  end
+
+  ##
+  # Looks up all hostnames for +address+.
+
+  def self.getnames(address)
+    DefaultResolver.getnames(address)
+  end
+
+  ##
+  # Iterates over all hostnames for +address+.
+
+  def self.each_name(address, &proc)
+    DefaultResolver.each_name(address, &proc)
+  end
+
+  ##
+  # Creates a new Gem::Resolv using +resolvers+.
+  #
+  # If +resolvers+ is not given, a hash, or +nil+, uses a Hosts resolver and
+  # and a DNS resolver.  If +resolvers+ is a hash, uses the hash as
+  # configuration for the DNS resolver.
+
+  def initialize(resolvers=(arg_not_set = true; nil), use_ipv6: (keyword_not_set = true; nil))
+    if !keyword_not_set && !arg_not_set
+      warn "Support for separate use_ipv6 keyword is deprecated, as it is ignored if an argument is provided. Do not provide a positional argument if using the use_ipv6 keyword argument.", uplevel: 1
+    end
+
+    @resolvers = case resolvers
+    when Hash, nil
+      [Hosts.new, DNS.new(DNS::Config.default_config_hash.merge(resolvers || {}))]
+    else
+      resolvers
+    end
+  end
+
+  ##
+  # Looks up the first IP address for +name+.
+
+  def getaddress(name)
+    each_address(name) {|address| return address}
+    raise ResolvError.new("no address for #{name}")
+  end
+
+  ##
+  # Looks up all IP address for +name+.
+
+  def getaddresses(name)
+    ret = []
+    each_address(name) {|address| ret << address}
+    return ret
+  end
+
+  ##
+  # Iterates over all IP addresses for +name+.
+
+  def each_address(name)
+    if AddressRegex =~ name
+      yield name
+      return
+    end
+    yielded = false
+    @resolvers.each {|r|
+      r.each_address(name) {|address|
+        yield address.to_s
+        yielded = true
+      }
+      return if yielded
+    }
+  end
+
+  ##
+  # Looks up the hostname of +address+.
+
+  def getname(address)
+    each_name(address) {|name| return name}
+    raise ResolvError.new("no name for #{address}")
+  end
+
+  ##
+  # Looks up all hostnames for +address+.
+
+  def getnames(address)
+    ret = []
+    each_name(address) {|name| ret << name}
+    return ret
+  end
+
+  ##
+  # Iterates over all hostnames for +address+.
+
+  def each_name(address)
+    yielded = false
+    @resolvers.each {|r|
+      r.each_name(address) {|name|
+        yield name.to_s
+        yielded = true
+      }
+      return if yielded
+    }
+  end
+
+  ##
+  # Indicates a failure to resolve a name or address.
+
+  class ResolvError < StandardError; end
+
+  ##
+  # Indicates a timeout resolving a name or address.
+
+  class ResolvTimeout < Gem::Timeout::Error; end
+
+  WINDOWS = /mswin|cygwin|mingw|bccwin/ =~ RUBY_PLATFORM || ::RbConfig::CONFIG['host_os'] =~ /mswin/
+  private_constant :WINDOWS
+
+  ##
+  # Gem::Resolv::Hosts is a hostname resolver that uses the system hosts file.
+
+  class Hosts
+    if WINDOWS
+      begin
+        require 'win32/resolv' unless defined?(Win32::Resolv)
+        DefaultFileName = Win32::Resolv.get_hosts_path || IO::NULL
+      rescue LoadError
+      end
+    end
+    DefaultFileName ||= '/etc/hosts'
+
+    ##
+    # Creates a new Gem::Resolv::Hosts, using +filename+ for its data source.
+
+    def initialize(filename = DefaultFileName)
+      @filename = filename
+      @mutex = Thread::Mutex.new
+      @initialized = nil
+    end
+
+    def lazy_initialize # :nodoc:
+      @mutex.synchronize {
+        unless @initialized
+          @name2addr = {}
+          @addr2name = {}
+          File.open(@filename, 'rb') {|f|
+            f.each {|line|
+              line.sub!(/#.*/, '')
+              addr, *hostnames = line.split(/\s+/)
+              next unless addr
+              (@addr2name[addr] ||= []).concat(hostnames)
+              hostnames.each {|hostname| (@name2addr[hostname] ||= []) << addr}
+            }
+          }
+          @name2addr.each {|name, arr| arr.reverse!}
+          @initialized = true
+        end
+      }
+      self
+    end
+
+    ##
+    # Gets the IP address of +name+ from the hosts file.
+
+    def getaddress(name)
+      each_address(name) {|address| return address}
+      raise ResolvError.new("#{@filename} has no name: #{name}")
+    end
+
+    ##
+    # Gets all IP addresses for +name+ from the hosts file.
+
+    def getaddresses(name)
+      ret = []
+      each_address(name) {|address| ret << address}
+      return ret
+    end
+
+    ##
+    # Iterates over all IP addresses for +name+ retrieved from the hosts file.
+
+    def each_address(name, &proc)
+      lazy_initialize
+      @name2addr[name]&.each(&proc)
+    end
+
+    ##
+    # Gets the hostname of +address+ from the hosts file.
+
+    def getname(address)
+      each_name(address) {|name| return name}
+      raise ResolvError.new("#{@filename} has no address: #{address}")
+    end
+
+    ##
+    # Gets all hostnames for +address+ from the hosts file.
+
+    def getnames(address)
+      ret = []
+      each_name(address) {|name| ret << name}
+      return ret
+    end
+
+    ##
+    # Iterates over all hostnames for +address+ retrieved from the hosts file.
+
+    def each_name(address, &proc)
+      lazy_initialize
+      @addr2name[address]&.each(&proc)
+    end
+  end
+
+  ##
+  # Gem::Resolv::DNS is a DNS stub resolver.
+  #
+  # Information taken from the following places:
+  #
+  # * STD0013
+  # * RFC 1035
+  # * ftp://ftp.isi.edu/in-notes/iana/assignments/dns-parameters
+  # * etc.
+
+  class DNS
+
+    ##
+    # Default DNS Port
+
+    Port = 53
+
+    ##
+    # Default DNS UDP packet size
+
+    UDPSize = 512
+
+    ##
+    # Creates a new DNS resolver.  See Gem::Resolv::DNS.new for argument details.
+    #
+    # Yields the created DNS resolver to the block, if given, otherwise
+    # returns it.
+
+    def self.open(*args)
+      dns = new(*args)
+      return dns unless block_given?
+      begin
+        yield dns
+      ensure
+        dns.close
+      end
+    end
+
+    ##
+    # Creates a new DNS resolver.
+    #
+    # +config_info+ can be:
+    #
+    # nil:: Uses /etc/resolv.conf.
+    # String:: Path to a file using /etc/resolv.conf's format.
+    # Hash:: Must contain :nameserver, :search and :ndots keys.
+    # :nameserver_port can be used to specify port number of nameserver address.
+    # :raise_timeout_errors can be used to raise timeout errors
+    # as exceptions instead of treating the same as an NXDOMAIN response.
+    #
+    # The value of :nameserver should be an address string or
+    # an array of address strings.
+    # - :nameserver => '8.8.8.8'
+    # - :nameserver => ['8.8.8.8', '8.8.4.4']
+    #
+    # The value of :nameserver_port should be an array of
+    # pair of nameserver address and port number.
+    # - :nameserver_port => [['8.8.8.8', 53], ['8.8.4.4', 53]]
+    #
+    # Example:
+    #
+    #   Gem::Resolv::DNS.new(:nameserver => ['210.251.121.21'],
+    #                   :search => ['ruby-lang.org'],
+    #                   :ndots => 1)
+
+    def initialize(config_info=nil)
+      @mutex = Thread::Mutex.new
+      @config = Config.new(config_info)
+      @initialized = nil
+    end
+
+    # Sets the resolver timeouts.  This may be a single positive number
+    # or an array of positive numbers representing timeouts in seconds.
+    # If an array is specified, a DNS request will retry and wait for
+    # each successive interval in the array until a successful response
+    # is received.  Specifying +nil+ reverts to the default timeouts:
+    # [ 5, second = 5 * 2 / nameserver_count, 2 * second, 4 * second ]
+    #
+    # Example:
+    #
+    #   dns.timeouts = 3
+    #
+    def timeouts=(values)
+      @config.timeouts = values
+    end
+
+    def lazy_initialize # :nodoc:
+      @mutex.synchronize {
+        unless @initialized
+          @config.lazy_initialize
+          @initialized = true
+        end
+      }
+      self
+    end
+
+    ##
+    # Closes the DNS resolver.
+
+    def close
+      @mutex.synchronize {
+        if @initialized
+          @initialized = false
+        end
+      }
+    end
+
+    ##
+    # Gets the IP address of +name+ from the DNS resolver.
+    #
+    # +name+ can be a Gem::Resolv::DNS::Name or a String.  Retrieved address will
+    # be a Gem::Resolv::IPv4 or Gem::Resolv::IPv6
+
+    def getaddress(name)
+      each_address(name) {|address| return address}
+      raise ResolvError.new("DNS result has no information for #{name}")
+    end
+
+    ##
+    # Gets all IP addresses for +name+ from the DNS resolver.
+    #
+    # +name+ can be a Gem::Resolv::DNS::Name or a String.  Retrieved addresses will
+    # be a Gem::Resolv::IPv4 or Gem::Resolv::IPv6
+
+    def getaddresses(name)
+      ret = []
+      each_address(name) {|address| ret << address}
+      return ret
+    end
+
+    ##
+    # Iterates over all IP addresses for +name+ retrieved from the DNS
+    # resolver.
+    #
+    # +name+ can be a Gem::Resolv::DNS::Name or a String.  Retrieved addresses will
+    # be a Gem::Resolv::IPv4 or Gem::Resolv::IPv6
+
+    def each_address(name)
+      if use_ipv6?
+        each_resource(name, Resource::IN::AAAA) {|resource| yield resource.address}
+      end
+      each_resource(name, Resource::IN::A) {|resource| yield resource.address}
+    end
+
+    def use_ipv6? # :nodoc:
+      @config.lazy_initialize unless @config.instance_variable_get(:@initialized)
+
+      use_ipv6 = @config.use_ipv6?
+      unless use_ipv6.nil?
+        return use_ipv6
+      end
+
+      begin
+        list = Socket.ip_address_list
+      rescue NotImplementedError
+        return true
+      end
+      list.any? {|a| a.ipv6? && !a.ipv6_loopback? && !a.ipv6_linklocal? }
+    end
+    private :use_ipv6?
+
+    ##
+    # Gets the hostname for +address+ from the DNS resolver.
+    #
+    # +address+ must be a Gem::Resolv::IPv4, Gem::Resolv::IPv6 or a String.  Retrieved
+    # name will be a Gem::Resolv::DNS::Name.
+
+    def getname(address)
+      each_name(address) {|name| return name}
+      raise ResolvError.new("DNS result has no information for #{address}")
+    end
+
+    ##
+    # Gets all hostnames for +address+ from the DNS resolver.
+    #
+    # +address+ must be a Gem::Resolv::IPv4, Gem::Resolv::IPv6 or a String.  Retrieved
+    # names will be Gem::Resolv::DNS::Name instances.
+
+    def getnames(address)
+      ret = []
+      each_name(address) {|name| ret << name}
+      return ret
+    end
+
+    ##
+    # Iterates over all hostnames for +address+ retrieved from the DNS
+    # resolver.
+    #
+    # +address+ must be a Gem::Resolv::IPv4, Gem::Resolv::IPv6 or a String.  Retrieved
+    # names will be Gem::Resolv::DNS::Name instances.
+
+    def each_name(address)
+      case address
+      when Name
+        ptr = address
+      when IPv4, IPv6
+        ptr = address.to_name
+      when IPv4::Regex
+        ptr = IPv4.create(address).to_name
+      when IPv6::Regex
+        ptr = IPv6.create(address).to_name
+      else
+        raise ResolvError.new("cannot interpret as address: #{address}")
+      end
+      each_resource(ptr, Resource::IN::PTR) {|resource| yield resource.name}
+    end
+
+    ##
+    # Look up the +typeclass+ DNS resource of +name+.
+    #
+    # +name+ must be a Gem::Resolv::DNS::Name or a String.
+    #
+    # +typeclass+ should be one of the following:
+    #
+    # * Gem::Resolv::DNS::Resource::IN::A
+    # * Gem::Resolv::DNS::Resource::IN::AAAA
+    # * Gem::Resolv::DNS::Resource::IN::ANY
+    # * Gem::Resolv::DNS::Resource::IN::CNAME
+    # * Gem::Resolv::DNS::Resource::IN::HINFO
+    # * Gem::Resolv::DNS::Resource::IN::MINFO
+    # * Gem::Resolv::DNS::Resource::IN::MX
+    # * Gem::Resolv::DNS::Resource::IN::NS
+    # * Gem::Resolv::DNS::Resource::IN::PTR
+    # * Gem::Resolv::DNS::Resource::IN::SOA
+    # * Gem::Resolv::DNS::Resource::IN::TXT
+    # * Gem::Resolv::DNS::Resource::IN::WKS
+    #
+    # Returned resource is represented as a Gem::Resolv::DNS::Resource instance,
+    # i.e. Gem::Resolv::DNS::Resource::IN::A.
+
+    def getresource(name, typeclass)
+      each_resource(name, typeclass) {|resource| return resource}
+      raise ResolvError.new("DNS result has no information for #{name}")
+    end
+
+    ##
+    # Looks up all +typeclass+ DNS resources for +name+.  See #getresource for
+    # argument details.
+
+    def getresources(name, typeclass)
+      ret = []
+      each_resource(name, typeclass) {|resource| ret << resource}
+      return ret
+    end
+
+    ##
+    # Iterates over all +typeclass+ DNS resources for +name+.  See
+    # #getresource for argument details.
+
+    def each_resource(name, typeclass, &proc)
+      fetch_resource(name, typeclass) {|reply, reply_name|
+        extract_resources(reply, reply_name, typeclass, &proc)
+      }
+    end
+
+    def fetch_resource(name, typeclass)
+      lazy_initialize
+      truncated = {}
+      requesters = {}
+      udp_requester = begin
+        make_udp_requester
+      rescue Errno::EACCES
+        # fall back to TCP
+      end
+      senders = {}
+
+      begin
+        @config.resolv(name) do |candidate, tout, nameserver, port|
+          msg = Message.new
+          msg.rd = 1
+          msg.add_question(candidate, typeclass)
+
+          requester = requesters.fetch([nameserver, port]) do
+            if !truncated[candidate] && udp_requester
+              udp_requester
+            else
+              requesters[[nameserver, port]] = make_tcp_requester(nameserver, port)
+            end
+          end
+
+          unless sender = senders[[candidate, requester, nameserver, port]]
+            sender = requester.sender(msg, candidate, nameserver, port)
+            next if !sender
+            senders[[candidate, requester, nameserver, port]] = sender
+          end
+          reply, reply_name = requester.request(sender, tout)
+          case reply.rcode
+          when RCode::NoError
+            if reply.tc == 1 and not Requester::TCP === requester
+              # Retry via TCP:
+              truncated[candidate] = true
+              redo
+            else
+              yield(reply, reply_name)
+            end
+            return
+          when RCode::NXDomain
+            raise Config::NXDomain.new(reply_name.to_s)
+          else
+            raise Config::OtherResolvError.new(reply_name.to_s)
+          end
+        end
+      ensure
+        udp_requester&.close
+        requesters.each_value { |requester| requester&.close }
+      end
+    end
+
+    def make_udp_requester # :nodoc:
+      nameserver_port = @config.nameserver_port
+      if nameserver_port.length == 1
+        Requester::ConnectedUDP.new(*nameserver_port[0])
+      else
+        Requester::UnconnectedUDP.new(*nameserver_port)
+      end
+    end
+
+    def make_tcp_requester(host, port) # :nodoc:
+      return Requester::TCP.new(host, port)
+    rescue Errno::ECONNREFUSED
+      # Treat a refused TCP connection attempt to a nameserver like a timeout,
+      # as Gem::Resolv::DNS::Config#resolv considers ResolvTimeout exceptions as a
+      # hint to try the next nameserver:
+      raise ResolvTimeout
+    end
+
+    def extract_resources(msg, name, typeclass) # :nodoc:
+      if typeclass < Resource::ANY
+        n0 = Name.create(name)
+        msg.each_resource {|n, ttl, data|
+          yield data if n0 == n
+        }
+      end
+      yielded = false
+      n0 = Name.create(name)
+      msg.each_resource {|n, ttl, data|
+        if n0 == n
+          case data
+          when typeclass
+            yield data
+            yielded = true
+          when Resource::CNAME
+            n0 = data.name
+          end
+        end
+      }
+      return if yielded
+      msg.each_resource {|n, ttl, data|
+        if n0 == n
+          case data
+          when typeclass
+            yield data
+          end
+        end
+      }
+    end
+
+    def self.random(arg) # :nodoc:
+      begin
+        Gem::SecureRandom.random_number(arg)
+      rescue NotImplementedError
+        rand(arg)
+      end
+    end
+
+    RequestID = {} # :nodoc:
+    RequestIDMutex = Thread::Mutex.new # :nodoc:
+
+    def self.allocate_request_id(host, port) # :nodoc:
+      id = nil
+      RequestIDMutex.synchronize {
+        h = (RequestID[[host, port]] ||= {})
+        begin
+          id = random(0x0000..0xffff)
+        end while h[id]
+        h[id] = true
+      }
+      id
+    end
+
+    def self.free_request_id(host, port, id) # :nodoc:
+      RequestIDMutex.synchronize {
+        key = [host, port]
+        if h = RequestID[key]
+          h.delete id
+          if h.empty?
+            RequestID.delete key
+          end
+        end
+      }
+    end
+
+    case RUBY_PLATFORM
+    when *[
+      # https://www.rfc-editor.org/rfc/rfc6056.txt
+      # Appendix A. Survey of the Algorithms in Use by Some Popular Implementations
+      /freebsd/, /linux/, /netbsd/, /openbsd/, /solaris/,
+      /darwin/, # the same as FreeBSD
+    ] then
+      def self.bind_random_port(udpsock, bind_host="0.0.0.0") # :nodoc:
+        udpsock.bind(bind_host, 0)
+      end
+    else
+      # Sequential port assignment
+      def self.bind_random_port(udpsock, bind_host="0.0.0.0") # :nodoc:
+        # Ephemeral port number range recommended by RFC 6056
+        port = random(1024..65535)
+        udpsock.bind(bind_host, port)
+      rescue Errno::EADDRINUSE, # POSIX
+             Errno::EACCES, # SunOS: See PRIV_SYS_NFS in privileges(5)
+             Errno::EPERM # FreeBSD: security.mac.portacl.port_high is configurable.  See mac_portacl(4).
+        retry
+      end
+    end
+
+    class Requester # :nodoc:
+      def initialize
+        @senders = {}
+        @socks = nil
+      end
+
+      def request(sender, tout)
+        start = Process.clock_gettime(Process::CLOCK_MONOTONIC)
+        timelimit = start + tout
+        begin
+          sender.send
+        rescue Errno::EHOSTUNREACH, # multi-homed IPv6 may generate this
+               Errno::ENETUNREACH
+          raise ResolvTimeout
+        end
+        while true
+          before_select = Process.clock_gettime(Process::CLOCK_MONOTONIC)
+          timeout = timelimit - before_select
+          if timeout <= 0
+            raise ResolvTimeout
+          end
+          if @socks.size == 1
+            select_result = @socks[0].wait_readable(timeout) ? [ @socks ] : nil
+          else
+            select_result = IO.select(@socks, nil, nil, timeout)
+          end
+          if !select_result
+            after_select = Process.clock_gettime(Process::CLOCK_MONOTONIC)
+            next if after_select < timelimit
+            raise ResolvTimeout
+          end
+          begin
+            reply, from = recv_reply(select_result[0])
+          rescue Errno::ECONNREFUSED, # GNU/Linux, FreeBSD
+                 Errno::ECONNRESET # Windows
+            # No name server running on the server?
+            # Don't wait anymore.
+            raise ResolvTimeout
+          end
+          begin
+            msg = Message.decode(reply)
+          rescue DecodeError
+            next # broken DNS message ignored
+          end
+          if sender == sender_for(from, msg)
+            break
+          else
+            # unexpected DNS message ignored
+          end
+        end
+        return msg, sender.data
+      end
+
+      def sender_for(addr, msg)
+        @senders[[addr,msg.id]]
+      end
+
+      def close
+        socks = @socks
+        @socks = nil
+        socks&.each(&:close)
+      end
+
+      class Sender # :nodoc:
+        def initialize(msg, data, sock)
+          @msg = msg
+          @data = data
+          @sock = sock
+        end
+      end
+
+      class UnconnectedUDP < Requester # :nodoc:
+        def initialize(*nameserver_port)
+          super()
+          @nameserver_port = nameserver_port
+          @initialized = false
+          @mutex = Thread::Mutex.new
+        end
+
+        def lazy_initialize
+          @mutex.synchronize {
+            next if @initialized
+            @initialized = true
+            @socks_hash = {}
+            @socks = []
+            @nameserver_port.each {|host, port|
+              if host.index(':')
+                bind_host = "::"
+                af = Socket::AF_INET6
+              else
+                bind_host = "0.0.0.0"
+                af = Socket::AF_INET
+              end
+              next if @socks_hash[bind_host]
+              begin
+                sock = UDPSocket.new(af)
+              rescue Errno::EAFNOSUPPORT, Errno::EPROTONOSUPPORT
+                next # The kernel doesn't support the address family.
+              end
+              @socks << sock
+              @socks_hash[bind_host] = sock
+              sock.do_not_reverse_lookup = true
+              DNS.bind_random_port(sock, bind_host)
+            }
+          }
+          self
+        end
+
+        def recv_reply(readable_socks)
+          lazy_initialize
+          reply, from = readable_socks[0].recvfrom(UDPSize)
+          return reply, [from[3],from[1]]
+        end
+
+        def sender(msg, data, host, port=Port)
+          host = Addrinfo.ip(host).ip_address
+          lazy_initialize
+          sock = @socks_hash[host.index(':') ? "::" : "0.0.0.0"]
+          return nil if !sock
+          service = [host, port]
+          id = DNS.allocate_request_id(host, port)
+          request = msg.encode
+          request[0,2] = [id].pack('n')
+          return @senders[[service, id]] =
+            Sender.new(request, data, sock, host, port)
+        end
+
+        def close
+          @mutex.synchronize {
+            if @initialized
+              super
+              @senders.each_key {|service, id|
+                DNS.free_request_id(service[0], service[1], id)
+              }
+              @initialized = false
+            end
+          }
+        end
+
+        class Sender < Requester::Sender # :nodoc:
+          def initialize(msg, data, sock, host, port)
+            super(msg, data, sock)
+            @host = host
+            @port = port
+          end
+          attr_reader :data
+
+          def send
+            raise "@sock is nil." if @sock.nil?
+            @sock.send(@msg, 0, @host, @port)
+          end
+        end
+      end
+
+      class ConnectedUDP < Requester # :nodoc:
+        def initialize(host, port=Port)
+          super()
+          @host = host
+          @port = port
+          @mutex = Thread::Mutex.new
+          @initialized = false
+        end
+
+        def lazy_initialize
+          @mutex.synchronize {
+            next if @initialized
+            @initialized = true
+            is_ipv6 = @host.index(':')
+            sock = UDPSocket.new(is_ipv6 ? Socket::AF_INET6 : Socket::AF_INET)
+            @socks = [sock]
+            sock.do_not_reverse_lookup = true
+            DNS.bind_random_port(sock, is_ipv6 ? "::" : "0.0.0.0")
+            sock.connect(@host, @port)
+          }
+          self
+        end
+
+        def recv_reply(readable_socks)
+          lazy_initialize
+          reply = readable_socks[0].recv(UDPSize)
+          return reply, nil
+        end
+
+        def sender(msg, data, host=@host, port=@port)
+          lazy_initialize
+          unless host == @host && port == @port
+            raise RequestError.new("host/port don't match: #{host}:#{port}")
+          end
+          id = DNS.allocate_request_id(@host, @port)
+          request = msg.encode
+          request[0,2] = [id].pack('n')
+          return @senders[[nil,id]] = Sender.new(request, data, @socks[0])
+        end
+
+        def close
+          @mutex.synchronize do
+            if @initialized
+              super
+              @senders.each_key {|from, id|
+                DNS.free_request_id(@host, @port, id)
+              }
+              @initialized = false
+            end
+          end
+        end
+
+        class Sender < Requester::Sender # :nodoc:
+          def send
+            raise "@sock is nil." if @sock.nil?
+            @sock.send(@msg, 0)
+          end
+          attr_reader :data
+        end
+      end
+
+      class MDNSOneShot < UnconnectedUDP # :nodoc:
+        def sender(msg, data, host, port=Port)
+          lazy_initialize
+          id = DNS.allocate_request_id(host, port)
+          request = msg.encode
+          request[0,2] = [id].pack('n')
+          sock = @socks_hash[host.index(':') ? "::" : "0.0.0.0"]
+          return @senders[id] =
+            UnconnectedUDP::Sender.new(request, data, sock, host, port)
+        end
+
+        def sender_for(addr, msg)
+          lazy_initialize
+          @senders[msg.id]
+        end
+      end
+
+      class TCP < Requester # :nodoc:
+        def initialize(host, port=Port)
+          super()
+          @host = host
+          @port = port
+          sock = TCPSocket.new(@host, @port)
+          @socks = [sock]
+          @senders = {}
+        end
+
+        def recv_reply(readable_socks)
+          len = readable_socks[0].read(2).unpack('n')[0]
+          reply = @socks[0].read(len)
+          return reply, nil
+        end
+
+        def sender(msg, data, host=@host, port=@port)
+          unless host == @host && port == @port
+            raise RequestError.new("host/port don't match: #{host}:#{port}")
+          end
+          id = DNS.allocate_request_id(@host, @port)
+          request = msg.encode
+          request[0,2] = [request.length, id].pack('nn')
+          return @senders[[nil,id]] = Sender.new(request, data, @socks[0])
+        end
+
+        class Sender < Requester::Sender # :nodoc:
+          def send
+            @sock.print(@msg)
+            @sock.flush
+          end
+          attr_reader :data
+        end
+
+        def close
+          super
+          @senders.each_key {|from,id|
+            DNS.free_request_id(@host, @port, id)
+          }
+        end
+      end
+
+      ##
+      # Indicates a problem with the DNS request.
+
+      class RequestError < StandardError
+      end
+    end
+
+    class Config # :nodoc:
+      def initialize(config_info=nil)
+        @mutex = Thread::Mutex.new
+        @config_info = config_info
+        @initialized = nil
+        @timeouts = nil
+      end
+
+      def timeouts=(values)
+        if values
+          values = Array(values)
+          values.each do |t|
+            Numeric === t or raise ArgumentError, "#{t.inspect} is not numeric"
+            t > 0.0 or raise ArgumentError, "timeout=#{t} must be positive"
+          end
+          @timeouts = values
+        else
+          @timeouts = nil
+        end
+      end
+
+      def Config.parse_resolv_conf(filename)
+        nameserver = []
+        search = nil
+        ndots = 1
+        File.open(filename, 'rb') {|f|
+          f.each {|line|
+            line.sub!(/[#;].*/, '')
+            keyword, *args = line.split(/\s+/)
+            next unless keyword
+            case keyword
+            when 'nameserver'
+              nameserver.concat(args.each(&:freeze))
+            when 'domain'
+              next if args.empty?
+              search = [args[0].freeze]
+            when 'search'
+              next if args.empty?
+              search = args.each(&:freeze)
+            when 'options'
+              args.each {|arg|
+                case arg
+                when /\Andots:(\d+)\z/
+                  ndots = $1.to_i
+                end
+              }
+            end
+          }
+        }
+        return { :nameserver => nameserver.freeze, :search => search.freeze, :ndots => ndots.freeze }.freeze
+      end
+
+      def Config.default_config_hash(filename="/etc/resolv.conf")
+        if File.exist? filename
+          Config.parse_resolv_conf(filename)
+        elsif WINDOWS
+          require 'win32/resolv' unless defined?(Win32::Resolv)
+          search, nameserver = Win32::Resolv.get_resolv_info
+          config_hash = {}
+          config_hash[:nameserver] = nameserver if nameserver
+          config_hash[:search] = [search].flatten if search
+          config_hash
+        else
+          {}
+        end
+      end
+
+      def lazy_initialize
+        @mutex.synchronize {
+          unless @initialized
+            @nameserver_port = []
+            @use_ipv6 = nil
+            @search = nil
+            @ndots = 1
+            case @config_info
+            when nil
+              config_hash = Config.default_config_hash
+            when String
+              config_hash = Config.parse_resolv_conf(@config_info)
+            when Hash
+              config_hash = @config_info.dup
+              if String === config_hash[:nameserver]
+                config_hash[:nameserver] = [config_hash[:nameserver]]
+              end
+              if String === config_hash[:search]
+                config_hash[:search] = [config_hash[:search]]
+              end
+            else
+              raise ArgumentError.new("invalid resolv configuration: #{@config_info.inspect}")
+            end
+            if config_hash.include? :nameserver
+              @nameserver_port = config_hash[:nameserver].map {|ns| [ns, Port] }
+            end
+            if config_hash.include? :nameserver_port
+              @nameserver_port = config_hash[:nameserver_port].map {|ns, port| [ns, (port || Port)] }
+            end
+            if config_hash.include? :use_ipv6
+              @use_ipv6 = config_hash[:use_ipv6]
+            end
+            @search = config_hash[:search] if config_hash.include? :search
+            @ndots = config_hash[:ndots] if config_hash.include? :ndots
+            @raise_timeout_errors = config_hash[:raise_timeout_errors]
+
+            if @nameserver_port.empty?
+              @nameserver_port << ['0.0.0.0', Port]
+            end
+            if @search
+              @search = @search.map {|arg| Label.split(arg) }
+            else
+              hostname = Socket.gethostname
+              if /\./ =~ hostname
+                @search = [Label.split($')]
+              else
+                @search = [[]]
+              end
+            end
+
+            if !@nameserver_port.kind_of?(Array) ||
+               @nameserver_port.any? {|ns_port|
+                  !(Array === ns_port) ||
+                  ns_port.length != 2
+                  !(String === ns_port[0]) ||
+                  !(Integer === ns_port[1])
+               }
+              raise ArgumentError.new("invalid nameserver config: #{@nameserver_port.inspect}")
+            end
+
+            if !@search.kind_of?(Array) ||
+               !@search.all? {|ls| ls.all? {|l| Label::Str === l } }
+              raise ArgumentError.new("invalid search config: #{@search.inspect}")
+            end
+
+            if !@ndots.kind_of?(Integer)
+              raise ArgumentError.new("invalid ndots config: #{@ndots.inspect}")
+            end
+
+            @initialized = true
+          end
+        }
+        self
+      end
+
+      def single?
+        lazy_initialize
+        if @nameserver_port.length == 1
+          return @nameserver_port[0]
+        else
+          return nil
+        end
+      end
+
+      def nameserver_port
+        @nameserver_port
+      end
+
+      def use_ipv6?
+        @use_ipv6
+      end
+
+      def generate_candidates(name)
+        candidates = nil
+        name = Name.create(name)
+        if name.absolute?
+          candidates = [name]
+        else
+          if @ndots <= name.length - 1
+            candidates = [Name.new(name.to_a)]
+          else
+            candidates = []
+          end
+          candidates.concat(@search.map {|domain| Name.new(name.to_a + domain)})
+          fname = Name.create("#{name}.")
+          if !candidates.include?(fname)
+            candidates << fname
+          end
+        end
+        return candidates
+      end
+
+      InitialTimeout = 5
+
+      def generate_timeouts
+        ts = [InitialTimeout]
+        ts << ts[-1] * 2 / @nameserver_port.length
+        ts << ts[-1] * 2
+        ts << ts[-1] * 2
+        return ts
+      end
+
+      def resolv(name)
+        candidates = generate_candidates(name)
+        timeouts = @timeouts || generate_timeouts
+        timeout_error = false
+        begin
+          candidates.each {|candidate|
+            begin
+              timeouts.each {|tout|
+                @nameserver_port.each {|nameserver, port|
+                  begin
+                    yield candidate, tout, nameserver, port
+                  rescue ResolvTimeout
+                  end
+                }
+              }
+              timeout_error = true
+              raise ResolvError.new("DNS resolv timeout: #{name}")
+            rescue NXDomain
+            end
+          }
+        rescue ResolvError
+          raise if @raise_timeout_errors && timeout_error
+        end
+      end
+
+      ##
+      # Indicates no such domain was found.
+
+      class NXDomain < ResolvError
+      end
+
+      ##
+      # Indicates some other unhandled resolver error was encountered.
+
+      class OtherResolvError < ResolvError
+      end
+    end
+
+    module OpCode # :nodoc:
+      Query = 0
+      IQuery = 1
+      Status = 2
+      Notify = 4
+      Update = 5
+    end
+
+    module RCode # :nodoc:
+      NoError = 0
+      FormErr = 1
+      ServFail = 2
+      NXDomain = 3
+      NotImp = 4
+      Refused = 5
+      YXDomain = 6
+      YXRRSet = 7
+      NXRRSet = 8
+      NotAuth = 9
+      NotZone = 10
+      BADVERS = 16
+      BADSIG = 16
+      BADKEY = 17
+      BADTIME = 18
+      BADMODE = 19
+      BADNAME = 20
+      BADALG = 21
+    end
+
+    ##
+    # Indicates that the DNS response was unable to be decoded.
+
+    class DecodeError < StandardError
+    end
+
+    ##
+    # Indicates that the DNS request was unable to be encoded.
+
+    class EncodeError < StandardError
+    end
+
+    module Label # :nodoc:
+      def self.split(arg)
+        labels = []
+        arg.scan(/[^\.]+/) {labels << Str.new($&)}
+        return labels
+      end
+
+      class Str # :nodoc:
+        def initialize(string)
+          @string = string
+          # case insensivity of DNS labels doesn't apply non-ASCII characters. [RFC 4343]
+          # This assumes @string is given in ASCII compatible encoding.
+          @downcase = string.b.downcase
+        end
+        attr_reader :string, :downcase
+
+        def to_s
+          return @string
+        end
+
+        def inspect
+          return "#<#{self.class} #{self}>"
+        end
+
+        def ==(other)
+          return self.class == other.class && @downcase == other.downcase
+        end
+
+        def eql?(other)
+          return self == other
+        end
+
+        def hash
+          return @downcase.hash
+        end
+      end
+    end
+
+    ##
+    # A representation of a DNS name.
+
+    class Name
+
+      ##
+      # Creates a new DNS name from +arg+.  +arg+ can be:
+      #
+      # Name:: returns +arg+.
+      # String:: Creates a new Name.
+
+      def self.create(arg)
+        case arg
+        when Name
+          return arg
+        when String
+          return Name.new(Label.split(arg), /\.\z/ =~ arg ? true : false)
+        else
+          raise ArgumentError.new("cannot interpret as DNS name: #{arg.inspect}")
+        end
+      end
+
+      def initialize(labels, absolute=true) # :nodoc:
+        labels = labels.map {|label|
+          case label
+          when String then Label::Str.new(label)
+          when Label::Str then label
+          else
+            raise ArgumentError, "unexpected label: #{label.inspect}"
+          end
+        }
+        @labels = labels
+        @absolute = absolute
+      end
+
+      def inspect # :nodoc:
+        "#<#{self.class}: #{self}#{@absolute ? '.' : ''}>"
+      end
+
+      ##
+      # True if this name is absolute.
+
+      def absolute?
+        return @absolute
+      end
+
+      def ==(other) # :nodoc:
+        return false unless Name === other
+        return false unless @absolute == other.absolute?
+        return @labels == other.to_a
+      end
+
+      alias eql? == # :nodoc:
+
+      ##
+      # Returns true if +other+ is a subdomain.
+      #
+      # Example:
+      #
+      #   domain = Gem::Resolv::DNS::Name.create("y.z")
+      #   p Gem::Resolv::DNS::Name.create("w.x.y.z").subdomain_of?(domain) #=> true
+      #   p Gem::Resolv::DNS::Name.create("x.y.z").subdomain_of?(domain) #=> true
+      #   p Gem::Resolv::DNS::Name.create("y.z").subdomain_of?(domain) #=> false
+      #   p Gem::Resolv::DNS::Name.create("z").subdomain_of?(domain) #=> false
+      #   p Gem::Resolv::DNS::Name.create("x.y.z.").subdomain_of?(domain) #=> false
+      #   p Gem::Resolv::DNS::Name.create("w.z").subdomain_of?(domain) #=> false
+      #
+
+      def subdomain_of?(other)
+        raise ArgumentError, "not a domain name: #{other.inspect}" unless Name === other
+        return false if @absolute != other.absolute?
+        other_len = other.length
+        return false if @labels.length <= other_len
+        return @labels[-other_len, other_len] == other.to_a
+      end
+
+      def hash # :nodoc:
+        return @labels.hash ^ @absolute.hash
+      end
+
+      def to_a # :nodoc:
+        return @labels
+      end
+
+      def length # :nodoc:
+        return @labels.length
+      end
+
+      def [](i) # :nodoc:
+        return @labels[i]
+      end
+
+      ##
+      # returns the domain name as a string.
+      #
+      # The domain name doesn't have a trailing dot even if the name object is
+      # absolute.
+      #
+      # Example:
+      #
+      #   p Gem::Resolv::DNS::Name.create("x.y.z.").to_s #=> "x.y.z"
+      #   p Gem::Resolv::DNS::Name.create("x.y.z").to_s #=> "x.y.z"
+
+      def to_s
+        return @labels.join('.')
+      end
+    end
+
+    class Message # :nodoc:
+      @@identifier = -1
+
+      def initialize(id = (@@identifier += 1) & 0xffff)
+        @id = id
+        @qr = 0
+        @opcode = 0
+        @aa = 0
+        @tc = 0
+        @rd = 0 # recursion desired
+        @ra = 0 # recursion available
+        @rcode = 0
+        @question = []
+        @answer = []
+        @authority = []
+        @additional = []
+      end
+
+      attr_accessor :id, :qr, :opcode, :aa, :tc, :rd, :ra, :rcode
+      attr_reader :question, :answer, :authority, :additional
+
+      def ==(other)
+        return @id == other.id &&
+               @qr == other.qr &&
+               @opcode == other.opcode &&
+               @aa == other.aa &&
+               @tc == other.tc &&
+               @rd == other.rd &&
+               @ra == other.ra &&
+               @rcode == other.rcode &&
+               @question == other.question &&
+               @answer == other.answer &&
+               @authority == other.authority &&
+               @additional == other.additional
+      end
+
+      def add_question(name, typeclass)
+        @question << [Name.create(name), typeclass]
+      end
+
+      def each_question
+        @question.each {|name, typeclass|
+          yield name, typeclass
+        }
+      end
+
+      def add_answer(name, ttl, data)
+        @answer << [Name.create(name), ttl, data]
+      end
+
+      def each_answer
+        @answer.each {|name, ttl, data|
+          yield name, ttl, data
+        }
+      end
+
+      def add_authority(name, ttl, data)
+        @authority << [Name.create(name), ttl, data]
+      end
+
+      def each_authority
+        @authority.each {|name, ttl, data|
+          yield name, ttl, data
+        }
+      end
+
+      def add_additional(name, ttl, data)
+        @additional << [Name.create(name), ttl, data]
+      end
+
+      def each_additional
+        @additional.each {|name, ttl, data|
+          yield name, ttl, data
+        }
+      end
+
+      def each_resource
+        each_answer {|name, ttl, data| yield name, ttl, data}
+        each_authority {|name, ttl, data| yield name, ttl, data}
+        each_additional {|name, ttl, data| yield name, ttl, data}
+      end
+
+      def encode
+        return MessageEncoder.new {|msg|
+          msg.put_pack('nnnnnn',
+            @id,
+            (@qr & 1) << 15 |
+            (@opcode & 15) << 11 |
+            (@aa & 1) << 10 |
+            (@tc & 1) << 9 |
+            (@rd & 1) << 8 |
+            (@ra & 1) << 7 |
+            (@rcode & 15),
+            @question.length,
+            @answer.length,
+            @authority.length,
+            @additional.length)
+          @question.each {|q|
+            name, typeclass = q
+            msg.put_name(name)
+            msg.put_pack('nn', typeclass::TypeValue, typeclass::ClassValue)
+          }
+          [@answer, @authority, @additional].each {|rr|
+            rr.each {|r|
+              name, ttl, data = r
+              msg.put_name(name)
+              msg.put_pack('nnN', data.class::TypeValue, data.class::ClassValue, ttl)
+              msg.put_length16 {data.encode_rdata(msg)}
+            }
+          }
+        }.to_s
+      end
+
+      class MessageEncoder # :nodoc:
+        def initialize
+          @data = ''.dup
+          @names = {}
+          yield self
+        end
+
+        def to_s
+          return @data
+        end
+
+        def put_bytes(d)
+          @data << d
+        end
+
+        def put_pack(template, *d)
+          @data << d.pack(template)
+        end
+
+        def put_length16
+          length_index = @data.length
+          @data << "\0\0"
+          data_start = @data.length
+          yield
+          data_end = @data.length
+          @data[length_index, 2] = [data_end - data_start].pack("n")
+        end
+
+        def put_string(d)
+          self.put_pack("C", d.length)
+          @data << d
+        end
+
+        def put_string_list(ds)
+          ds.each {|d|
+            self.put_string(d)
+          }
+        end
+
+        def put_name(d, compress: true)
+          put_labels(d.to_a, compress: compress)
+        end
+
+        def put_labels(d, compress: true)
+          d.each_index {|i|
+            domain = d[i..-1]
+            if compress && idx = @names[domain]
+              self.put_pack("n", 0xc000 | idx)
+              return
+            else
+              if @data.length < 0x4000
+                @names[domain] = @data.length
+              end
+              self.put_label(d[i])
+            end
+          }
+          @data << "\0"
+        end
+
+        def put_label(d)
+          self.put_string(d.to_s)
+        end
+      end
+
+      def Message.decode(m)
+        o = Message.new(0)
+        MessageDecoder.new(m) {|msg|
+          id, flag, qdcount, ancount, nscount, arcount =
+            msg.get_unpack('nnnnnn')
+          o.id = id
+          o.tc = (flag >> 9) & 1
+          o.rcode = flag & 15
+          return o unless o.tc.zero?
+
+          o.qr = (flag >> 15) & 1
+          o.opcode = (flag >> 11) & 15
+          o.aa = (flag >> 10) & 1
+          o.rd = (flag >> 8) & 1
+          o.ra = (flag >> 7) & 1
+          (1..qdcount).each {
+            name, typeclass = msg.get_question
+            o.add_question(name, typeclass)
+          }
+          (1..ancount).each {
+            name, ttl, data = msg.get_rr
+            o.add_answer(name, ttl, data)
+          }
+          (1..nscount).each {
+            name, ttl, data = msg.get_rr
+            o.add_authority(name, ttl, data)
+          }
+          (1..arcount).each {
+            name, ttl, data = msg.get_rr
+            o.add_additional(name, ttl, data)
+          }
+        }
+        return o
+      end
+
+      class MessageDecoder # :nodoc:
+        def initialize(data)
+          @data = data
+          @index = 0
+          @limit = data.bytesize
+          yield self
+        end
+
+        def inspect
+          "\#<#{self.class}: #{@data.byteslice(0, @index).inspect} #{@data.byteslice(@index..-1).inspect}>"
+        end
+
+        def get_length16
+          len, = self.get_unpack('n')
+          save_limit = @limit
+          @limit = @index + len
+          d = yield(len)
+          if @index < @limit
+            raise DecodeError.new("junk exists")
+          elsif @limit < @index
+            raise DecodeError.new("limit exceeded")
+          end
+          @limit = save_limit
+          return d
+        end
+
+        def get_bytes(len = @limit - @index)
+          raise DecodeError.new("limit exceeded") if @limit < @index + len
+          d = @data.byteslice(@index, len)
+          @index += len
+          return d
+        end
+
+        def get_unpack(template)
+          len = 0
+          template.each_byte {|byte|
+            byte = "%c" % byte
+            case byte
+            when ?c, ?C
+              len += 1
+            when ?n
+              len += 2
+            when ?N
+              len += 4
+            else
+              raise StandardError.new("unsupported template: '#{byte.chr}' in '#{template}'")
+            end
+          }
+          raise DecodeError.new("limit exceeded") if @limit < @index + len
+          arr = @data.unpack("@#{@index}#{template}")
+          @index += len
+          return arr
+        end
+
+        def get_string
+          raise DecodeError.new("limit exceeded") if @limit <= @index
+          len = @data.getbyte(@index)
+          raise DecodeError.new("limit exceeded") if @limit < @index + 1 + len
+          d = @data.byteslice(@index + 1, len)
+          @index += 1 + len
+          return d
+        end
+
+        def get_string_list
+          strings = []
+          while @index < @limit
+            strings << self.get_string
+          end
+          strings
+        end
+
+        def get_list
+          [].tap do |values|
+            while @index < @limit
+              values << yield
+            end
+          end
+        end
+
+        def get_name
+          return Name.new(self.get_labels)
+        end
+
+        def get_labels
+          prev_index = @index
+          save_index = nil
+          d = []
+          size = -1
+          while true
+            raise DecodeError.new("limit exceeded") if @limit <= @index
+            case @data.getbyte(@index)
+            when 0
+              @index += 1
+              if save_index
+                @index = save_index
+              end
+              return d
+            when 192..255
+              idx = self.get_unpack('n')[0] & 0x3fff
+              if prev_index <= idx
+                raise DecodeError.new("non-backward name pointer")
+              end
+              prev_index = idx
+              if !save_index
+                save_index = @index
+              end
+              @index = idx
+            else
+              l = self.get_label
+              d << l
+              size += 1 + l.string.bytesize
+              raise DecodeError.new("name label data exceed 255 octets") if size > 255
+            end
+          end
+        end
+
+        def get_label
+          return Label::Str.new(self.get_string)
+        end
+
+        def get_question
+          name = self.get_name
+          type, klass = self.get_unpack("nn")
+          return name, Resource.get_class(type, klass)
+        end
+
+        def get_rr
+          name = self.get_name
+          type, klass, ttl = self.get_unpack('nnN')
+          typeclass = Resource.get_class(type, klass)
+          res = self.get_length16 do
+            begin
+              typeclass.decode_rdata self
+            rescue => e
+              raise DecodeError, e.message, e.backtrace
+            end
+          end
+          res.instance_variable_set :@ttl, ttl
+          return name, ttl, res
+        end
+      end
+    end
+
+    ##
+    # SvcParams for service binding RRs. [RFC9460]
+
+    class SvcParams
+      include Enumerable
+
+      ##
+      # Create a list of SvcParams with the given initial content.
+      #
+      # +params+ has to be an enumerable of +SvcParam+s.
+      # If its content has +SvcParam+s with the duplicate key,
+      # the one appears last takes precedence.
+
+      def initialize(params = [])
+        @params = {}
+
+        params.each do |param|
+          add param
+        end
+      end
+
+      ##
+      # Get SvcParam for the given +key+ in this list.
+
+      def [](key)
+        @params[canonical_key(key)]
+      end
+
+      ##
+      # Get the number of SvcParams in this list.
+
+      def count
+        @params.count
+      end
+
+      ##
+      # Get whether this list is empty.
+
+      def empty?
+        @params.empty?
+      end
+
+      ##
+      # Add the SvcParam +param+ to this list, overwriting the existing one with the same key.
+
+      def add(param)
+        @params[param.class.key_number] = param
+      end
+
+      ##
+      # Remove the +SvcParam+ with the given +key+ and return it.
+
+      def delete(key)
+        @params.delete(canonical_key(key))
+      end
+
+      ##
+      # Enumerate the +SvcParam+s in this list.
+
+      def each(&block)
+        return enum_for(:each) unless block
+        @params.each_value(&block)
+      end
+
+      def encode(msg) # :nodoc:
+        @params.keys.sort.each do |key|
+          msg.put_pack('n', key)
+          msg.put_length16 do
+            @params.fetch(key).encode(msg)
+          end
+        end
+      end
+
+      def self.decode(msg) # :nodoc:
+        params = msg.get_list do
+          key, = msg.get_unpack('n')
+          msg.get_length16 do
+            SvcParam::ClassHash[key].decode(msg)
+          end
+        end
+
+        return self.new(params)
+      end
+
+      private
+
+      def canonical_key(key) # :nodoc:
+        case key
+        when Integer
+          key
+        when /\Akey(\d+)\z/
+          Integer($1)
+        when Symbol
+          SvcParam::ClassHash[key].key_number
+        else
+          raise TypeError, 'key must be either String or Symbol'
+        end
+      end
+    end
+
+    ##
+    # Base class for SvcParam. [RFC9460]
+
+    class SvcParam
+
+      ##
+      # Get the presentation name of the SvcParamKey.
+
+      def self.key_name
+        const_get(:KeyName)
+      end
+
+      ##
+      # Get the registered number of the SvcParamKey.
+
+      def self.key_number
+        const_get(:KeyNumber)
+      end
+
+      ClassHash = Hash.new do |h, key| # :nodoc:
+        case key
+        when Integer
+          Generic.create(key)
+        when /\Akey(?<key>\d+)\z/
+          Generic.create(key.to_int)
+        when Symbol
+          raise KeyError, "unknown key #{key}"
+        else
+          raise TypeError, 'key must be either String or Symbol'
+        end
+      end
+
+      ##
+      # Generic SvcParam abstract class.
+
+      class Generic < SvcParam
+
+        ##
+        # SvcParamValue in wire-format byte string.
+
+        attr_reader :value
+
+        ##
+        # Create generic SvcParam
+
+        def initialize(value)
+          @value = value
+        end
+
+        def encode(msg) # :nodoc:
+          msg.put_bytes(@value)
+        end
+
+        def self.decode(msg) # :nodoc:
+          return self.new(msg.get_bytes)
+        end
+
+        def self.create(key_number)
+          c = Class.new(Generic)
+          key_name = :"key#{key_number}"
+          c.const_set(:KeyName, key_name)
+          c.const_set(:KeyNumber, key_number)
+          self.const_set(:"Key#{key_number}", c)
+          ClassHash[key_name] = ClassHash[key_number] = c
+          return c
+        end
+      end
+
+      ##
+      # "mandatory" SvcParam -- Mandatory keys in service binding RR
+
+      class Mandatory < SvcParam
+        KeyName = :mandatory
+        KeyNumber = 0
+        ClassHash[KeyName] = ClassHash[KeyNumber] = self # :nodoc:
+
+        ##
+        # Mandatory keys.
+
+        attr_reader :keys
+
+        ##
+        # Initialize "mandatory" ScvParam.
+
+        def initialize(keys)
+          @keys = keys.map(&:to_int)
+        end
+
+        def encode(msg) # :nodoc:
+          @keys.sort.each do |key|
+            msg.put_pack('n', key)
+          end
+        end
+
+        def self.decode(msg) # :nodoc:
+          keys = msg.get_list { msg.get_unpack('n')[0] }
+          return self.new(keys)
+        end
+      end
+
+      ##
+      # "alpn" SvcParam -- Additional supported protocols
+
+      class ALPN < SvcParam
+        KeyName = :alpn
+        KeyNumber = 1
+        ClassHash[KeyName] = ClassHash[KeyNumber] = self # :nodoc:
+
+        ##
+        # Supported protocol IDs.
+
+        attr_reader :protocol_ids
+
+        ##
+        # Initialize "alpn" ScvParam.
+
+        def initialize(protocol_ids)
+          @protocol_ids = protocol_ids.map(&:to_str)
+        end
+
+        def encode(msg) # :nodoc:
+          msg.put_string_list(@protocol_ids)
+        end
+
+        def self.decode(msg) # :nodoc:
+          return self.new(msg.get_string_list)
+        end
+      end
+
+      ##
+      # "no-default-alpn" SvcParam -- No support for default protocol
+
+      class NoDefaultALPN < SvcParam
+        KeyName = :'no-default-alpn'
+        KeyNumber = 2
+        ClassHash[KeyName] = ClassHash[KeyNumber] = self # :nodoc:
+
+        def encode(msg) # :nodoc:
+          # no payload
+        end
+
+        def self.decode(msg) # :nodoc:
+          return self.new
+        end
+      end
+
+      ##
+      # "port" SvcParam -- Port for alternative endpoint
+
+      class Port < SvcParam
+        KeyName = :port
+        KeyNumber = 3
+        ClassHash[KeyName] = ClassHash[KeyNumber] = self # :nodoc:
+
+        ##
+        # Port number.
+
+        attr_reader :port
+
+        ##
+        # Initialize "port" ScvParam.
+
+        def initialize(port)
+          @port = port.to_int
+        end
+
+        def encode(msg) # :nodoc:
+          msg.put_pack('n', @port)
+        end
+
+        def self.decode(msg) # :nodoc:
+          port, = msg.get_unpack('n')
+          return self.new(port)
+        end
+      end
+
+      ##
+      # "ipv4hint" SvcParam -- IPv4 address hints
+
+      class IPv4Hint < SvcParam
+        KeyName = :ipv4hint
+        KeyNumber = 4
+        ClassHash[KeyName] = ClassHash[KeyNumber] = self # :nodoc:
+
+        ##
+        # Set of IPv4 addresses.
+
+        attr_reader :addresses
+
+        ##
+        # Initialize "ipv4hint" ScvParam.
+
+        def initialize(addresses)
+          @addresses = addresses.map {|address| IPv4.create(address) }
+        end
+
+        def encode(msg) # :nodoc:
+          @addresses.each do |address|
+            msg.put_bytes(address.address)
+          end
+        end
+
+        def self.decode(msg) # :nodoc:
+          addresses = msg.get_list { IPv4.new(msg.get_bytes(4)) }
+          return self.new(addresses)
+        end
+      end
+
+      ##
+      # "ipv6hint" SvcParam -- IPv6 address hints
+
+      class IPv6Hint < SvcParam
+        KeyName = :ipv6hint
+        KeyNumber = 6
+        ClassHash[KeyName] = ClassHash[KeyNumber] = self # :nodoc:
+
+        ##
+        # Set of IPv6 addresses.
+
+        attr_reader :addresses
+
+        ##
+        # Initialize "ipv6hint" ScvParam.
+
+        def initialize(addresses)
+          @addresses = addresses.map {|address| IPv6.create(address) }
+        end
+
+        def encode(msg) # :nodoc:
+          @addresses.each do |address|
+            msg.put_bytes(address.address)
+          end
+        end
+
+        def self.decode(msg) # :nodoc:
+          addresses = msg.get_list { IPv6.new(msg.get_bytes(16)) }
+          return self.new(addresses)
+        end
+      end
+
+      ##
+      # "dohpath" SvcParam -- DNS over HTTPS path template [RFC9461]
+
+      class DoHPath < SvcParam
+        KeyName = :dohpath
+        KeyNumber = 7
+        ClassHash[KeyName] = ClassHash[KeyNumber] = self # :nodoc:
+
+        ##
+        # URI template for DoH queries.
+
+        attr_reader :template
+
+        ##
+        # Initialize "dohpath" ScvParam.
+
+        def initialize(template)
+          @template = template.encode('utf-8')
+        end
+
+        def encode(msg) # :nodoc:
+          msg.put_bytes(@template)
+        end
+
+        def self.decode(msg) # :nodoc:
+          template = msg.get_bytes.force_encoding('utf-8')
+          return self.new(template)
+        end
+      end
+    end
+
+    ##
+    # A DNS query abstract class.
+
+    class Query
+      def encode_rdata(msg) # :nodoc:
+        raise EncodeError.new("#{self.class} is query.")
+      end
+
+      def self.decode_rdata(msg) # :nodoc:
+        raise DecodeError.new("#{self.class} is query.")
+      end
+    end
+
+    ##
+    # A DNS resource abstract class.
+
+    class Resource < Query
+
+      ##
+      # Remaining Time To Live for this Resource.
+
+      attr_reader :ttl
+
+      ClassHash = Module.new do
+        module_function
+
+        def []=(type_class_value, klass)
+          type_value, class_value = type_class_value
+          Resource.const_set(:"Type#{type_value}_Class#{class_value}", klass)
+        end
+      end
+
+      def encode_rdata(msg) # :nodoc:
+        raise NotImplementedError.new
+      end
+
+      def self.decode_rdata(msg) # :nodoc:
+        raise NotImplementedError.new
+      end
+
+      def ==(other) # :nodoc:
+        return false unless self.class == other.class
+        s_ivars = self.instance_variables
+        s_ivars.sort!
+        s_ivars.delete :@ttl
+        o_ivars = other.instance_variables
+        o_ivars.sort!
+        o_ivars.delete :@ttl
+        return s_ivars == o_ivars &&
+          s_ivars.collect {|name| self.instance_variable_get name} ==
+            o_ivars.collect {|name| other.instance_variable_get name}
+      end
+
+      def eql?(other) # :nodoc:
+        return self == other
+      end
+
+      def hash # :nodoc:
+        h = 0
+        vars = self.instance_variables
+        vars.delete :@ttl
+        vars.each {|name|
+          h ^= self.instance_variable_get(name).hash
+        }
+        return h
+      end
+
+      def self.get_class(type_value, class_value) # :nodoc:
+        cache = :"Type#{type_value}_Class#{class_value}"
+
+        return (const_defined?(cache) && const_get(cache)) ||
+               Generic.create(type_value, class_value)
+      end
+
+      ##
+      # A generic resource abstract class.
+
+      class Generic < Resource
+
+        ##
+        # Creates a new generic resource.
+
+        def initialize(data)
+          @data = data
+        end
+
+        ##
+        # Data for this generic resource.
+
+        attr_reader :data
+
+        def encode_rdata(msg) # :nodoc:
+          msg.put_bytes(data)
+        end
+
+        def self.decode_rdata(msg) # :nodoc:
+          return self.new(msg.get_bytes)
+        end
+
+        def self.create(type_value, class_value) # :nodoc:
+          c = Class.new(Generic)
+          c.const_set(:TypeValue, type_value)
+          c.const_set(:ClassValue, class_value)
+          Generic.const_set("Type#{type_value}_Class#{class_value}", c)
+          ClassHash[[type_value, class_value]] = c
+          return c
+        end
+      end
+
+      ##
+      # Domain Name resource abstract class.
+
+      class DomainName < Resource
+
+        ##
+        # Creates a new DomainName from +name+.
+
+        def initialize(name)
+          @name = name
+        end
+
+        ##
+        # The name of this DomainName.
+
+        attr_reader :name
+
+        def encode_rdata(msg) # :nodoc:
+          msg.put_name(@name)
+        end
+
+        def self.decode_rdata(msg) # :nodoc:
+          return self.new(msg.get_name)
+        end
+      end
+
+      # Standard (class generic) RRs
+
+      ClassValue = nil # :nodoc:
+
+      ##
+      # An authoritative name server.
+
+      class NS < DomainName
+        TypeValue = 2 # :nodoc:
+      end
+
+      ##
+      # The canonical name for an alias.
+
+      class CNAME < DomainName
+        TypeValue = 5 # :nodoc:
+      end
+
+      ##
+      # Start Of Authority resource.
+
+      class SOA < Resource
+
+        TypeValue = 6 # :nodoc:
+
+        ##
+        # Creates a new SOA record.  See the attr documentation for the
+        # details of each argument.
+
+        def initialize(mname, rname, serial, refresh, retry_, expire, minimum)
+          @mname = mname
+          @rname = rname
+          @serial = serial
+          @refresh = refresh
+          @retry = retry_
+          @expire = expire
+          @minimum = minimum
+        end
+
+        ##
+        # Name of the host where the master zone file for this zone resides.
+
+        attr_reader :mname
+
+        ##
+        # The person responsible for this domain name.
+
+        attr_reader :rname
+
+        ##
+        # The version number of the zone file.
+
+        attr_reader :serial
+
+        ##
+        # How often, in seconds, a secondary name server is to check for
+        # updates from the primary name server.
+
+        attr_reader :refresh
+
+        ##
+        # How often, in seconds, a secondary name server is to retry after a
+        # failure to check for a refresh.
+
+        attr_reader :retry
+
+        ##
+        # Time in seconds that a secondary name server is to use the data
+        # before refreshing from the primary name server.
+
+        attr_reader :expire
+
+        ##
+        # The minimum number of seconds to be used for TTL values in RRs.
+
+        attr_reader :minimum
+
+        def encode_rdata(msg) # :nodoc:
+          msg.put_name(@mname)
+          msg.put_name(@rname)
+          msg.put_pack('NNNNN', @serial, @refresh, @retry, @expire, @minimum)
+        end
+
+        def self.decode_rdata(msg) # :nodoc:
+          mname = msg.get_name
+          rname = msg.get_name
+          serial, refresh, retry_, expire, minimum = msg.get_unpack('NNNNN')
+          return self.new(
+            mname, rname, serial, refresh, retry_, expire, minimum)
+        end
+      end
+
+      ##
+      # A Pointer to another DNS name.
+
+      class PTR < DomainName
+        TypeValue = 12 # :nodoc:
+      end
+
+      ##
+      # Host Information resource.
+
+      class HINFO < Resource
+
+        TypeValue = 13 # :nodoc:
+
+        ##
+        # Creates a new HINFO running +os+ on +cpu+.
+
+        def initialize(cpu, os)
+          @cpu = cpu
+          @os = os
+        end
+
+        ##
+        # CPU architecture for this resource.
+
+        attr_reader :cpu
+
+        ##
+        # Operating system for this resource.
+
+        attr_reader :os
+
+        def encode_rdata(msg) # :nodoc:
+          msg.put_string(@cpu)
+          msg.put_string(@os)
+        end
+
+        def self.decode_rdata(msg) # :nodoc:
+          cpu = msg.get_string
+          os = msg.get_string
+          return self.new(cpu, os)
+        end
+      end
+
+      ##
+      # Mailing list or mailbox information.
+
+      class MINFO < Resource
+
+        TypeValue = 14 # :nodoc:
+
+        def initialize(rmailbx, emailbx)
+          @rmailbx = rmailbx
+          @emailbx = emailbx
+        end
+
+        ##
+        # Domain name responsible for this mail list or mailbox.
+
+        attr_reader :rmailbx
+
+        ##
+        # Mailbox to use for error messages related to the mail list or mailbox.
+
+        attr_reader :emailbx
+
+        def encode_rdata(msg) # :nodoc:
+          msg.put_name(@rmailbx)
+          msg.put_name(@emailbx)
+        end
+
+        def self.decode_rdata(msg) # :nodoc:
+          rmailbx = msg.get_string
+          emailbx = msg.get_string
+          return self.new(rmailbx, emailbx)
+        end
+      end
+
+      ##
+      # Mail Exchanger resource.
+
+      class MX < Resource
+
+        TypeValue= 15 # :nodoc:
+
+        ##
+        # Creates a new MX record with +preference+, accepting mail at
+        # +exchange+.
+
+        def initialize(preference, exchange)
+          @preference = preference
+          @exchange = exchange
+        end
+
+        ##
+        # The preference for this MX.
+
+        attr_reader :preference
+
+        ##
+        # The host of this MX.
+
+        attr_reader :exchange
+
+        def encode_rdata(msg) # :nodoc:
+          msg.put_pack('n', @preference)
+          msg.put_name(@exchange)
+        end
+
+        def self.decode_rdata(msg) # :nodoc:
+          preference, = msg.get_unpack('n')
+          exchange = msg.get_name
+          return self.new(preference, exchange)
+        end
+      end
+
+      ##
+      # Unstructured text resource.
+
+      class TXT < Resource
+
+        TypeValue = 16 # :nodoc:
+
+        def initialize(first_string, *rest_strings)
+          @strings = [first_string, *rest_strings]
+        end
+
+        ##
+        # Returns an Array of Strings for this TXT record.
+
+        attr_reader :strings
+
+        ##
+        # Returns the concatenated string from +strings+.
+
+        def data
+          @strings.join("")
+        end
+
+        def encode_rdata(msg) # :nodoc:
+          msg.put_string_list(@strings)
+        end
+
+        def self.decode_rdata(msg) # :nodoc:
+          strings = msg.get_string_list
+          return self.new(*strings)
+        end
+      end
+
+      ##
+      # Location resource
+
+      class LOC < Resource
+
+        TypeValue = 29 # :nodoc:
+
+        def initialize(version, ssize, hprecision, vprecision, latitude, longitude, altitude)
+          @version    = version
+          @ssize      = Gem::Resolv::LOC::Size.create(ssize)
+          @hprecision = Gem::Resolv::LOC::Size.create(hprecision)
+          @vprecision = Gem::Resolv::LOC::Size.create(vprecision)
+          @latitude   = Gem::Resolv::LOC::Coord.create(latitude)
+          @longitude  = Gem::Resolv::LOC::Coord.create(longitude)
+          @altitude   = Gem::Resolv::LOC::Alt.create(altitude)
+        end
+
+        ##
+        # Returns the version value for this LOC record which should always be 00
+
+        attr_reader :version
+
+        ##
+        # The spherical size of this LOC
+        # in meters using scientific notation as 2 integers of XeY
+
+        attr_reader :ssize
+
+        ##
+        # The horizontal precision using ssize type values
+        # in meters using scientific notation as 2 integers of XeY
+        # for precision use value/2 e.g. 2m = +/-1m
+
+        attr_reader :hprecision
+
+        ##
+        # The vertical precision using ssize type values
+        # in meters using scientific notation as 2 integers of XeY
+        # for precision use value/2 e.g. 2m = +/-1m
+
+        attr_reader :vprecision
+
+        ##
+        # The latitude for this LOC where 2**31 is the equator
+        # in thousandths of an arc second as an unsigned 32bit integer
+
+        attr_reader :latitude
+
+        ##
+        # The longitude for this LOC where 2**31 is the prime meridian
+        # in thousandths of an arc second as an unsigned 32bit integer
+
+        attr_reader :longitude
+
+        ##
+        # The altitude of the LOC above a reference sphere whose surface sits 100km below the WGS84 spheroid
+        # in centimeters as an unsigned 32bit integer
+
+        attr_reader :altitude
+
+        def encode_rdata(msg) # :nodoc:
+          msg.put_bytes(@version)
+          msg.put_bytes(@ssize.scalar)
+          msg.put_bytes(@hprecision.scalar)
+          msg.put_bytes(@vprecision.scalar)
+          msg.put_bytes(@latitude.coordinates)
+          msg.put_bytes(@longitude.coordinates)
+          msg.put_bytes(@altitude.altitude)
+        end
+
+        def self.decode_rdata(msg) # :nodoc:
+          version    = msg.get_bytes(1)
+          ssize      = msg.get_bytes(1)
+          hprecision = msg.get_bytes(1)
+          vprecision = msg.get_bytes(1)
+          latitude   = msg.get_bytes(4)
+          longitude  = msg.get_bytes(4)
+          altitude   = msg.get_bytes(4)
+          return self.new(
+            version,
+            Gem::Resolv::LOC::Size.new(ssize),
+            Gem::Resolv::LOC::Size.new(hprecision),
+            Gem::Resolv::LOC::Size.new(vprecision),
+            Gem::Resolv::LOC::Coord.new(latitude,"lat"),
+            Gem::Resolv::LOC::Coord.new(longitude,"lon"),
+            Gem::Resolv::LOC::Alt.new(altitude)
+          )
+        end
+      end
+
+      ##
+      # A Query type requesting any RR.
+
+      class ANY < Query
+        TypeValue = 255 # :nodoc:
+      end
+
+      ##
+      # CAA resource record defined in RFC 8659
+      #
+      # These records identify certificate authority allowed to issue
+      # certificates for the given domain.
+
+      class CAA < Resource
+        TypeValue = 257
+
+        ##
+        # Creates a new CAA for +flags+, +tag+ and +value+.
+
+        def initialize(flags, tag, value)
+          unless (0..255) === flags
+            raise ArgumentError.new('flags must be an Integer between 0 and 255')
+          end
+          unless (1..15) === tag.bytesize
+            raise ArgumentError.new('length of tag must be between 1 and 15')
+          end
+
+          @flags = flags
+          @tag = tag
+          @value = value
+        end
+
+        ##
+        # Flags for this property:
+        # - Bit 0 : 0 = not critical, 1 = critical
+
+        attr_reader :flags
+
+        ##
+        # Property tag ("issue", "issuewild", "iodef"...).
+
+        attr_reader :tag
+
+        ##
+        # Property value.
+
+        attr_reader :value
+
+        ##
+        # Whether the critical flag is set on this property.
+
+        def critical?
+          flags & 0x80 != 0
+        end
+
+        def encode_rdata(msg) # :nodoc:
+          msg.put_pack('C', @flags)
+          msg.put_string(@tag)
+          msg.put_bytes(@value)
+        end
+
+        def self.decode_rdata(msg) # :nodoc:
+          flags, = msg.get_unpack('C')
+          tag = msg.get_string
+          value = msg.get_bytes
+          self.new flags, tag, value
+        end
+      end
+
+      ClassInsensitiveTypes = [ # :nodoc:
+        NS, CNAME, SOA, PTR, HINFO, MINFO, MX, TXT, LOC, ANY, CAA
+      ]
+
+      ##
+      # module IN contains ARPA Internet specific RRs.
+
+      module IN
+
+        ClassValue = 1 # :nodoc:
+
+        ClassInsensitiveTypes.each {|s|
+          c = Class.new(s)
+          c.const_set(:TypeValue, s::TypeValue)
+          c.const_set(:ClassValue, ClassValue)
+          ClassHash[[s::TypeValue, ClassValue]] = c
+          self.const_set(s.name.sub(/.*::/, ''), c)
+        }
+
+        ##
+        # IPv4 Address resource
+
+        class A < Resource
+          TypeValue = 1
+          ClassValue = IN::ClassValue
+          ClassHash[[TypeValue, ClassValue]] = self # :nodoc:
+
+          ##
+          # Creates a new A for +address+.
+
+          def initialize(address)
+            @address = IPv4.create(address)
+          end
+
+          ##
+          # The Gem::Resolv::IPv4 address for this A.
+
+          attr_reader :address
+
+          def encode_rdata(msg) # :nodoc:
+            msg.put_bytes(@address.address)
+          end
+
+          def self.decode_rdata(msg) # :nodoc:
+            return self.new(IPv4.new(msg.get_bytes(4)))
+          end
+        end
+
+        ##
+        # Well Known Service resource.
+
+        class WKS < Resource
+          TypeValue = 11
+          ClassValue = IN::ClassValue
+          ClassHash[[TypeValue, ClassValue]] = self # :nodoc:
+
+          def initialize(address, protocol, bitmap)
+            @address = IPv4.create(address)
+            @protocol = protocol
+            @bitmap = bitmap
+          end
+
+          ##
+          # The host these services run on.
+
+          attr_reader :address
+
+          ##
+          # IP protocol number for these services.
+
+          attr_reader :protocol
+
+          ##
+          # A bit map of enabled services on this host.
+          #
+          # If protocol is 6 (TCP) then the 26th bit corresponds to the SMTP
+          # service (port 25).  If this bit is set, then an SMTP server should
+          # be listening on TCP port 25; if zero, SMTP service is not
+          # supported.
+
+          attr_reader :bitmap
+
+          def encode_rdata(msg) # :nodoc:
+            msg.put_bytes(@address.address)
+            msg.put_pack("n", @protocol)
+            msg.put_bytes(@bitmap)
+          end
+
+          def self.decode_rdata(msg) # :nodoc:
+            address = IPv4.new(msg.get_bytes(4))
+            protocol, = msg.get_unpack("n")
+            bitmap = msg.get_bytes
+            return self.new(address, protocol, bitmap)
+          end
+        end
+
+        ##
+        # An IPv6 address record.
+
+        class AAAA < Resource
+          TypeValue = 28
+          ClassValue = IN::ClassValue
+          ClassHash[[TypeValue, ClassValue]] = self # :nodoc:
+
+          ##
+          # Creates a new AAAA for +address+.
+
+          def initialize(address)
+            @address = IPv6.create(address)
+          end
+
+          ##
+          # The Gem::Resolv::IPv6 address for this AAAA.
+
+          attr_reader :address
+
+          def encode_rdata(msg) # :nodoc:
+            msg.put_bytes(@address.address)
+          end
+
+          def self.decode_rdata(msg) # :nodoc:
+            return self.new(IPv6.new(msg.get_bytes(16)))
+          end
+        end
+
+        ##
+        # SRV resource record defined in RFC 2782
+        #
+        # These records identify the hostname and port that a service is
+        # available at.
+
+        class SRV < Resource
+          TypeValue = 33
+          ClassValue = IN::ClassValue
+          ClassHash[[TypeValue, ClassValue]] = self # :nodoc:
+
+          # Create a SRV resource record.
+          #
+          # See the documentation for #priority, #weight, #port and #target
+          # for +priority+, +weight+, +port and +target+ respectively.
+
+          def initialize(priority, weight, port, target)
+            @priority = priority.to_int
+            @weight = weight.to_int
+            @port = port.to_int
+            @target = Name.create(target)
+          end
+
+          # The priority of this target host.
+          #
+          # A client MUST attempt to contact the target host with the
+          # lowest-numbered priority it can reach; target hosts with the same
+          # priority SHOULD be tried in an order defined by the weight field.
+          # The range is 0-65535.  Note that it is not widely implemented and
+          # should be set to zero.
+
+          attr_reader :priority
+
+          # A server selection mechanism.
+          #
+          # The weight field specifies a relative weight for entries with the
+          # same priority. Larger weights SHOULD be given a proportionately
+          # higher probability of being selected. The range of this number is
+          # 0-65535.  Domain administrators SHOULD use Weight 0 when there
+          # isn't any server selection to do, to make the RR easier to read
+          # for humans (less noisy). Note that it is not widely implemented
+          # and should be set to zero.
+
+          attr_reader :weight
+
+          # The port on this target host of this service.
+          #
+          # The range is 0-65535.
+
+          attr_reader :port
+
+          # The domain name of the target host.
+          #
+          # A target of "." means that the service is decidedly not available
+          # at this domain.
+
+          attr_reader :target
+
+          def encode_rdata(msg) # :nodoc:
+            msg.put_pack("n", @priority)
+            msg.put_pack("n", @weight)
+            msg.put_pack("n", @port)
+            msg.put_name(@target, compress: false)
+          end
+
+          def self.decode_rdata(msg) # :nodoc:
+            priority, = msg.get_unpack("n")
+            weight,   = msg.get_unpack("n")
+            port,     = msg.get_unpack("n")
+            target    = msg.get_name
+            return self.new(priority, weight, port, target)
+          end
+        end
+
+        ##
+        # Common implementation for SVCB-compatible resource records.
+
+        class ServiceBinding
+
+          ##
+          # Create a service binding resource record.
+
+          def initialize(priority, target, params = [])
+            @priority = priority.to_int
+            @target = Name.create(target)
+            @params = SvcParams.new(params)
+          end
+
+          ##
+          # The priority of this target host.
+          #
+          # The range is 0-65535.
+          # If set to 0, this RR is in AliasMode. Otherwise, it is in ServiceMode.
+
+          attr_reader :priority
+
+          ##
+          # The domain name of the target host.
+
+          attr_reader :target
+
+          ##
+          # The service parameters for the target host.
+
+          attr_reader :params
+
+          ##
+          # Whether this RR is in AliasMode.
+
+          def alias_mode?
+            self.priority == 0
+          end
+
+          ##
+          # Whether this RR is in ServiceMode.
+
+          def service_mode?
+            !alias_mode?
+          end
+
+          def encode_rdata(msg) # :nodoc:
+            msg.put_pack("n", @priority)
+            msg.put_name(@target, compress: false)
+            @params.encode(msg)
+          end
+
+          def self.decode_rdata(msg) # :nodoc:
+            priority, = msg.get_unpack("n")
+            target    = msg.get_name
+            params    = SvcParams.decode(msg)
+            return self.new(priority, target, params)
+          end
+        end
+
+        ##
+        # SVCB resource record [RFC9460]
+
+        class SVCB < ServiceBinding
+          TypeValue = 64
+          ClassValue = IN::ClassValue
+          ClassHash[[TypeValue, ClassValue]] = self # :nodoc:
+        end
+
+        ##
+        # HTTPS resource record [RFC9460]
+
+        class HTTPS < ServiceBinding
+          TypeValue = 65
+          ClassValue = IN::ClassValue
+          ClassHash[[TypeValue, ClassValue]] = self # :nodoc:
+        end
+      end
+    end
+  end
+
+  ##
+  # A Gem::Resolv::DNS IPv4 address.
+
+  class IPv4
+
+    ##
+    # Regular expression IPv4 addresses must match.
+
+    Regex256 = /0
+               |1(?:[0-9][0-9]?)?
+               |2(?:[0-4][0-9]?|5[0-5]?|[6-9])?
+               |[3-9][0-9]?/x
+    Regex = /\A(#{Regex256})\.(#{Regex256})\.(#{Regex256})\.(#{Regex256})\z/
+
+    def self.create(arg)
+      case arg
+      when IPv4
+        return arg
+      when Regex
+        if (0..255) === (a = $1.to_i) &&
+           (0..255) === (b = $2.to_i) &&
+           (0..255) === (c = $3.to_i) &&
+           (0..255) === (d = $4.to_i)
+          return self.new([a, b, c, d].pack("CCCC"))
+        else
+          raise ArgumentError.new("IPv4 address with invalid value: " + arg)
+        end
+      else
+        raise ArgumentError.new("cannot interpret as IPv4 address: #{arg.inspect}")
+      end
+    end
+
+    def initialize(address) # :nodoc:
+      unless address.kind_of?(String)
+        raise ArgumentError, 'IPv4 address must be a string'
+      end
+      unless address.length == 4
+        raise ArgumentError, "IPv4 address expects 4 bytes but #{address.length} bytes"
+      end
+      @address = address
+    end
+
+    ##
+    # A String representation of this IPv4 address.
+
+    ##
+    # The raw IPv4 address as a String.
+
+    attr_reader :address
+
+    def to_s # :nodoc:
+      return sprintf("%d.%d.%d.%d", *@address.unpack("CCCC"))
+    end
+
+    def inspect # :nodoc:
+      return "#<#{self.class} #{self}>"
+    end
+
+    ##
+    # Turns this IPv4 address into a Gem::Resolv::DNS::Name.
+
+    def to_name
+      return DNS::Name.create(
+        '%d.%d.%d.%d.in-addr.arpa.' % @address.unpack('CCCC').reverse)
+    end
+
+    def ==(other) # :nodoc:
+      return @address == other.address
+    end
+
+    def eql?(other) # :nodoc:
+      return self == other
+    end
+
+    def hash # :nodoc:
+      return @address.hash
+    end
+  end
+
+  ##
+  # A Gem::Resolv::DNS IPv6 address.
+
+  class IPv6
+
+    ##
+    # IPv6 address format a:b:c:d:e:f:g:h
+    Regex_8Hex = /\A
+      (?:[0-9A-Fa-f]{1,4}:){7}
+         [0-9A-Fa-f]{1,4}
+      \z/x
+
+    ##
+    # Compressed IPv6 address format a::b
+
+    Regex_CompressedHex = /\A
+      ((?:[0-9A-Fa-f]{1,4}(?::[0-9A-Fa-f]{1,4})*)?) ::
+      ((?:[0-9A-Fa-f]{1,4}(?::[0-9A-Fa-f]{1,4})*)?)
+      \z/x
+
+    ##
+    # IPv4 mapped IPv6 address format a:b:c:d:e:f:w.x.y.z
+
+    Regex_6Hex4Dec = /\A
+      ((?:[0-9A-Fa-f]{1,4}:){6,6})
+      (\d+)\.(\d+)\.(\d+)\.(\d+)
+      \z/x
+
+    ##
+    # Compressed IPv4 mapped IPv6 address format a::b:w.x.y.z
+
+    Regex_CompressedHex4Dec = /\A
+      ((?:[0-9A-Fa-f]{1,4}(?::[0-9A-Fa-f]{1,4})*)?) ::
+      ((?:[0-9A-Fa-f]{1,4}:)*)
+      (\d+)\.(\d+)\.(\d+)\.(\d+)
+      \z/x
+
+    ##
+    # IPv6 link local address format fe80:b:c:d:e:f:g:h%em1
+    Regex_8HexLinkLocal = /\A
+      [Ff][Ee]80
+      (?::[0-9A-Fa-f]{1,4}){7}
+      %[-0-9A-Za-z._~]+
+      \z/x
+
+    ##
+    # Compressed IPv6 link local address format fe80::b%em1
+
+    Regex_CompressedHexLinkLocal = /\A
+      [Ff][Ee]80:
+      (?:
+        ((?:[0-9A-Fa-f]{1,4}(?::[0-9A-Fa-f]{1,4})*)?) ::
+        ((?:[0-9A-Fa-f]{1,4}(?::[0-9A-Fa-f]{1,4})*)?)
+        |
+        :((?:[0-9A-Fa-f]{1,4}(?::[0-9A-Fa-f]{1,4})*)?)
+      )?
+      :[0-9A-Fa-f]{1,4}%[-0-9A-Za-z._~]+
+      \z/x
+
+    ##
+    # A composite IPv6 address Regexp.
+
+    Regex = /
+      (?:#{Regex_8Hex}) |
+      (?:#{Regex_CompressedHex}) |
+      (?:#{Regex_6Hex4Dec}) |
+      (?:#{Regex_CompressedHex4Dec}) |
+      (?:#{Regex_8HexLinkLocal}) |
+      (?:#{Regex_CompressedHexLinkLocal})
+      /x
+
+    ##
+    # Creates a new IPv6 address from +arg+ which may be:
+    #
+    # IPv6:: returns +arg+.
+    # String:: +arg+ must match one of the IPv6::Regex* constants
+
+    def self.create(arg)
+      case arg
+      when IPv6
+        return arg
+      when String
+        address = ''.b
+        if Regex_8Hex =~ arg
+          arg.scan(/[0-9A-Fa-f]+/) {|hex| address << [hex.hex].pack('n')}
+        elsif Regex_CompressedHex =~ arg
+          prefix = $1
+          suffix = $2
+          a1 = ''.b
+          a2 = ''.b
+          prefix.scan(/[0-9A-Fa-f]+/) {|hex| a1 << [hex.hex].pack('n')}
+          suffix.scan(/[0-9A-Fa-f]+/) {|hex| a2 << [hex.hex].pack('n')}
+          omitlen = 16 - a1.length - a2.length
+          address << a1 << "\0" * omitlen << a2
+        elsif Regex_6Hex4Dec =~ arg
+          prefix, a, b, c, d = $1, $2.to_i, $3.to_i, $4.to_i, $5.to_i
+          if (0..255) === a && (0..255) === b && (0..255) === c && (0..255) === d
+            prefix.scan(/[0-9A-Fa-f]+/) {|hex| address << [hex.hex].pack('n')}
+            address << [a, b, c, d].pack('CCCC')
+          else
+            raise ArgumentError.new("not numeric IPv6 address: " + arg)
+          end
+        elsif Regex_CompressedHex4Dec =~ arg
+          prefix, suffix, a, b, c, d = $1, $2, $3.to_i, $4.to_i, $5.to_i, $6.to_i
+          if (0..255) === a && (0..255) === b && (0..255) === c && (0..255) === d
+            a1 = ''.b
+            a2 = ''.b
+            prefix.scan(/[0-9A-Fa-f]+/) {|hex| a1 << [hex.hex].pack('n')}
+            suffix.scan(/[0-9A-Fa-f]+/) {|hex| a2 << [hex.hex].pack('n')}
+            omitlen = 12 - a1.length - a2.length
+            address << a1 << "\0" * omitlen << a2 << [a, b, c, d].pack('CCCC')
+          else
+            raise ArgumentError.new("not numeric IPv6 address: " + arg)
+          end
+        else
+          raise ArgumentError.new("not numeric IPv6 address: " + arg)
+        end
+        return IPv6.new(address)
+      else
+        raise ArgumentError.new("cannot interpret as IPv6 address: #{arg.inspect}")
+      end
+    end
+
+    def initialize(address) # :nodoc:
+      unless address.kind_of?(String) && address.length == 16
+        raise ArgumentError.new('IPv6 address must be 16 bytes')
+      end
+      @address = address
+    end
+
+    ##
+    # The raw IPv6 address as a String.
+
+    attr_reader :address
+
+    def to_s # :nodoc:
+      sprintf("%x:%x:%x:%x:%x:%x:%x:%x", *@address.unpack("nnnnnnnn")).sub(/(^|:)0(:0)+(:|$)/, '::')
+    end
+
+    def inspect # :nodoc:
+      return "#<#{self.class} #{self}>"
+    end
+
+    ##
+    # Turns this IPv6 address into a Gem::Resolv::DNS::Name.
+    #--
+    # ip6.arpa should be searched too. [RFC3152]
+
+    def to_name
+      return DNS::Name.new(
+        @address.unpack("H32")[0].split(//).reverse + ['ip6', 'arpa'])
+    end
+
+    def ==(other) # :nodoc:
+      return @address == other.address
+    end
+
+    def eql?(other) # :nodoc:
+      return self == other
+    end
+
+    def hash # :nodoc:
+      return @address.hash
+    end
+  end
+
+  ##
+  # Gem::Resolv::MDNS is a one-shot Multicast DNS (mDNS) resolver.  It blindly
+  # makes queries to the mDNS addresses without understanding anything about
+  # multicast ports.
+  #
+  # Information taken form the following places:
+  #
+  # * RFC 6762
+
+  class MDNS < DNS
+
+    ##
+    # Default mDNS Port
+
+    Port = 5353
+
+    ##
+    # Default IPv4 mDNS address
+
+    AddressV4 = '224.0.0.251'
+
+    ##
+    # Default IPv6 mDNS address
+
+    AddressV6 = 'ff02::fb'
+
+    ##
+    # Default mDNS addresses
+
+    Addresses = [
+      [AddressV4, Port],
+      [AddressV6, Port],
+    ]
+
+    ##
+    # Creates a new one-shot Multicast DNS (mDNS) resolver.
+    #
+    # +config_info+ can be:
+    #
+    # nil::
+    #   Uses the default mDNS addresses
+    #
+    # Hash::
+    #   Must contain :nameserver or :nameserver_port like
+    #   Gem::Resolv::DNS#initialize.
+
+    def initialize(config_info=nil)
+      if config_info then
+        super({ nameserver_port: Addresses }.merge(config_info))
+      else
+        super(nameserver_port: Addresses)
+      end
+    end
+
+    ##
+    # Iterates over all IP addresses for +name+ retrieved from the mDNS
+    # resolver, provided name ends with "local".  If the name does not end in
+    # "local" no records will be returned.
+    #
+    # +name+ can be a Gem::Resolv::DNS::Name or a String.  Retrieved addresses will
+    # be a Gem::Resolv::IPv4 or Gem::Resolv::IPv6
+
+    def each_address(name)
+      name = Gem::Resolv::DNS::Name.create(name)
+
+      return unless name[-1].to_s == 'local'
+
+      super(name)
+    end
+
+    def make_udp_requester # :nodoc:
+      nameserver_port = @config.nameserver_port
+      Requester::MDNSOneShot.new(*nameserver_port)
+    end
+
+  end
+
+  module LOC
+
+    ##
+    # A Gem::Resolv::LOC::Size
+
+    class Size
+
+      Regex = /^(\d+\.*\d*)[m]$/
+
+      ##
+      # Creates a new LOC::Size from +arg+ which may be:
+      #
+      # LOC::Size:: returns +arg+.
+      # String:: +arg+ must match the LOC::Size::Regex constant
+
+      def self.create(arg)
+        case arg
+        when Size
+          return arg
+        when String
+          scalar = ''
+          if Regex =~ arg
+            scalar = [(($1.to_f*(1e2)).to_i.to_s[0].to_i*(2**4)+(($1.to_f*(1e2)).to_i.to_s.length-1))].pack("C")
+          else
+            raise ArgumentError.new("not a properly formed Size string: " + arg)
+          end
+          return Size.new(scalar)
+        else
+          raise ArgumentError.new("cannot interpret as Size: #{arg.inspect}")
+        end
+      end
+
+      def initialize(scalar)
+        @scalar = scalar
+      end
+
+      ##
+      # The raw size
+
+      attr_reader :scalar
+
+      def to_s # :nodoc:
+        s = @scalar.unpack("H2").join.to_s
+        return ((s[0].to_i)*(10**(s[1].to_i-2))).to_s << "m"
+      end
+
+      def inspect # :nodoc:
+        return "#<#{self.class} #{self}>"
+      end
+
+      def ==(other) # :nodoc:
+        return @scalar == other.scalar
+      end
+
+      def eql?(other) # :nodoc:
+        return self == other
+      end
+
+      def hash # :nodoc:
+        return @scalar.hash
+      end
+
+    end
+
+    ##
+    # A Gem::Resolv::LOC::Coord
+
+    class Coord
+
+      Regex = /^(\d+)\s(\d+)\s(\d+\.\d+)\s([NESW])$/
+
+      ##
+      # Creates a new LOC::Coord from +arg+ which may be:
+      #
+      # LOC::Coord:: returns +arg+.
+      # String:: +arg+ must match the LOC::Coord::Regex constant
+
+      def self.create(arg)
+        case arg
+        when Coord
+          return arg
+        when String
+          coordinates = ''
+          if Regex =~ arg && $1.to_f < 180
+            m = $~
+            hemi = (m[4][/[NE]/]) || (m[4][/[SW]/]) ? 1 : -1
+            coordinates = [ ((m[1].to_i*(36e5)) + (m[2].to_i*(6e4)) +
+                             (m[3].to_f*(1e3))) * hemi+(2**31) ].pack("N")
+            orientation = m[4][/[NS]/] ? 'lat' : 'lon'
+          else
+            raise ArgumentError.new("not a properly formed Coord string: " + arg)
+          end
+          return Coord.new(coordinates,orientation)
+        else
+          raise ArgumentError.new("cannot interpret as Coord: #{arg.inspect}")
+        end
+      end
+
+      def initialize(coordinates,orientation)
+        unless coordinates.kind_of?(String)
+          raise ArgumentError.new("Coord must be a 32bit unsigned integer in hex format: #{coordinates.inspect}")
+        end
+        unless orientation.kind_of?(String) && orientation[/^lon$|^lat$/]
+          raise ArgumentError.new('Coord expects orientation to be a String argument of "lat" or "lon"')
+        end
+        @coordinates = coordinates
+        @orientation = orientation
+      end
+
+      ##
+      # The raw coordinates
+
+      attr_reader :coordinates
+
+      ## The orientation of the hemisphere as 'lat' or 'lon'
+
+      attr_reader :orientation
+
+      def to_s # :nodoc:
+          c = @coordinates.unpack("N").join.to_i
+          val      = (c - (2**31)).abs
+          fracsecs = (val % 1e3).to_i.to_s
+          val      = val / 1e3
+          secs     = (val % 60).to_i.to_s
+          val      = val / 60
+          mins     = (val % 60).to_i.to_s
+          degs     = (val / 60).to_i.to_s
+          posi = (c >= 2**31)
+          case posi
+          when true
+            hemi = @orientation[/^lat$/] ? "N" : "E"
+          else
+            hemi = @orientation[/^lon$/] ? "W" : "S"
+          end
+          return degs << " " << mins << " " << secs << "." << fracsecs << " " << hemi
+      end
+
+      def inspect # :nodoc:
+        return "#<#{self.class} #{self}>"
+      end
+
+      def ==(other) # :nodoc:
+        return @coordinates == other.coordinates
+      end
+
+      def eql?(other) # :nodoc:
+        return self == other
+      end
+
+      def hash # :nodoc:
+        return @coordinates.hash
+      end
+
+    end
+
+    ##
+    # A Gem::Resolv::LOC::Alt
+
+    class Alt
+
+      Regex = /^([+-]*\d+\.*\d*)[m]$/
+
+      ##
+      # Creates a new LOC::Alt from +arg+ which may be:
+      #
+      # LOC::Alt:: returns +arg+.
+      # String:: +arg+ must match the LOC::Alt::Regex constant
+
+      def self.create(arg)
+        case arg
+        when Alt
+          return arg
+        when String
+          altitude = ''
+          if Regex =~ arg
+            altitude = [($1.to_f*(1e2))+(1e7)].pack("N")
+          else
+            raise ArgumentError.new("not a properly formed Alt string: " + arg)
+          end
+          return Alt.new(altitude)
+        else
+          raise ArgumentError.new("cannot interpret as Alt: #{arg.inspect}")
+        end
+      end
+
+      def initialize(altitude)
+        @altitude = altitude
+      end
+
+      ##
+      # The raw altitude
+
+      attr_reader :altitude
+
+      def to_s # :nodoc:
+        a = @altitude.unpack("N").join.to_i
+        return ((a.to_f/1e2)-1e5).to_s + "m"
+      end
+
+      def inspect # :nodoc:
+        return "#<#{self.class} #{self}>"
+      end
+
+      def ==(other) # :nodoc:
+        return @altitude == other.altitude
+      end
+
+      def eql?(other) # :nodoc:
+        return self == other
+      end
+
+      def hash # :nodoc:
+        return @altitude.hash
+      end
+
+    end
+
+  end
+
+  ##
+  # Default resolver to use for Gem::Resolv class methods.
+
+  DefaultResolver = self.new
+
+  ##
+  # Replaces the resolvers in the default resolver with +new_resolvers+.  This
+  # allows resolvers to be changed for resolv-replace.
+
+  def DefaultResolver.replace_resolvers new_resolvers
+    @resolvers = new_resolvers
+  end
+
+  ##
+  # Address Regexp to use for matching IP addresses.
+
+  AddressRegex = /(?:#{IPv4::Regex})|(?:#{IPv6::Regex})/
+
+end
diff --git a/lib/rubygems/vendor/securerandom/lib/securerandom.rb b/lib/rubygems/vendor/securerandom/lib/securerandom.rb
new file mode 100644
index 00000000000000..b6f1d71ad39408
--- /dev/null
+++ b/lib/rubygems/vendor/securerandom/lib/securerandom.rb
@@ -0,0 +1,102 @@
+# -*- coding: us-ascii -*-
+# frozen_string_literal: true
+
+require 'random/formatter'
+
+# == Secure random number generator interface.
+#
+# This library is an interface to secure random number generators which are
+# suitable for generating session keys in HTTP cookies, etc.
+#
+# You can use this library in your application by requiring it:
+#
+#   require 'rubygems/vendor/securerandom/lib/securerandom'
+#
+# It supports the following secure random number generators:
+#
+# * openssl
+# * /dev/urandom
+# * Win32
+#
+# Gem::SecureRandom is extended by the Random::Formatter module which
+# defines the following methods:
+#
+# * alphanumeric
+# * base64
+# * choose
+# * gen_random
+# * hex
+# * rand
+# * random_bytes
+# * random_number
+# * urlsafe_base64
+# * uuid
+#
+# These methods are usable as class methods of Gem::SecureRandom such as
+# +Gem::SecureRandom.hex+.
+#
+# If a secure random number generator is not available,
+# +NotImplementedError+ is raised.
+
+module Gem::SecureRandom
+
+  # The version
+  VERSION = "0.4.1"
+
+  class << self
+    # Returns a random binary string containing +size+ bytes.
+    #
+    # See Random.bytes
+    def bytes(n)
+      return gen_random(n)
+    end
+
+    # Compatibility methods for Ruby 3.2, we can remove this after dropping to support Ruby 3.2
+    def alphanumeric(n = nil, chars: ALPHANUMERIC)
+      n = 16 if n.nil?
+      choose(chars, n)
+    end if RUBY_VERSION < '3.3'
+
+    private
+
+    # :stopdoc:
+
+    # Implementation using OpenSSL
+    def gen_random_openssl(n)
+      return OpenSSL::Random.random_bytes(n)
+    end
+
+    # Implementation using system random device
+    def gen_random_urandom(n)
+      ret = Random.urandom(n)
+      unless ret
+        raise NotImplementedError, "No random device"
+      end
+      unless ret.length == n
+        raise NotImplementedError, "Unexpected partial read from random device: only #{ret.length} for #{n} bytes"
+      end
+      ret
+    end
+
+    begin
+      # Check if Random.urandom is available
+      Random.urandom(1)
+      alias gen_random gen_random_urandom
+    rescue RuntimeError
+      begin
+        require 'openssl'
+      rescue NoMethodError
+        raise NotImplementedError, "No random device"
+      else
+        alias gen_random gen_random_openssl
+      end
+    end
+
+    # :startdoc:
+
+    # Generate random data bytes for Random::Formatter
+    public :gen_random
+  end
+end
+
+Gem::SecureRandom.extend(Random::Formatter)
diff --git a/lib/rubygems/vendor/timeout/lib/timeout.rb b/lib/rubygems/vendor/timeout/lib/timeout.rb
new file mode 100644
index 00000000000000..455c504f4706cc
--- /dev/null
+++ b/lib/rubygems/vendor/timeout/lib/timeout.rb
@@ -0,0 +1,198 @@
+# frozen_string_literal: true
+# Timeout long-running blocks
+#
+# == Synopsis
+#
+#   require 'rubygems/vendor/timeout/lib/timeout'
+#   status = Gem::Timeout.timeout(5) {
+#     # Something that should be interrupted if it takes more than 5 seconds...
+#   }
+#
+# == Description
+#
+# Gem::Timeout provides a way to auto-terminate a potentially long-running
+# operation if it hasn't finished in a fixed amount of time.
+#
+# == Copyright
+#
+# Copyright:: (C) 2000  Network Applied Communication Laboratory, Inc.
+# Copyright:: (C) 2000  Information-technology Promotion Agency, Japan
+
+module Gem::Timeout
+  # The version
+  VERSION = "0.4.3"
+
+  # Internal error raised to when a timeout is triggered.
+  class ExitException < Exception
+    def exception(*) # :nodoc:
+      self
+    end
+  end
+
+  # Raised by Gem::Timeout.timeout when the block times out.
+  class Error < RuntimeError
+    def self.handle_timeout(message) # :nodoc:
+      exc = ExitException.new(message)
+
+      begin
+        yield exc
+      rescue ExitException => e
+        raise new(message) if exc.equal?(e)
+        raise
+      end
+    end
+  end
+
+  # :stopdoc:
+  CONDVAR = ConditionVariable.new
+  QUEUE = Queue.new
+  QUEUE_MUTEX = Mutex.new
+  TIMEOUT_THREAD_MUTEX = Mutex.new
+  @timeout_thread = nil
+  private_constant :CONDVAR, :QUEUE, :QUEUE_MUTEX, :TIMEOUT_THREAD_MUTEX
+
+  class Request
+    attr_reader :deadline
+
+    def initialize(thread, timeout, exception_class, message)
+      @thread = thread
+      @deadline = GET_TIME.call(Process::CLOCK_MONOTONIC) + timeout
+      @exception_class = exception_class
+      @message = message
+
+      @mutex = Mutex.new
+      @done = false # protected by @mutex
+    end
+
+    def done?
+      @mutex.synchronize do
+        @done
+      end
+    end
+
+    def expired?(now)
+      now >= @deadline
+    end
+
+    def interrupt
+      @mutex.synchronize do
+        unless @done
+          @thread.raise @exception_class, @message
+          @done = true
+        end
+      end
+    end
+
+    def finished
+      @mutex.synchronize do
+        @done = true
+      end
+    end
+  end
+  private_constant :Request
+
+  def self.create_timeout_thread
+    watcher = Thread.new do
+      requests = []
+      while true
+        until QUEUE.empty? and !requests.empty? # wait to have at least one request
+          req = QUEUE.pop
+          requests << req unless req.done?
+        end
+        closest_deadline = requests.min_by(&:deadline).deadline
+
+        now = 0.0
+        QUEUE_MUTEX.synchronize do
+          while (now = GET_TIME.call(Process::CLOCK_MONOTONIC)) < closest_deadline and QUEUE.empty?
+            CONDVAR.wait(QUEUE_MUTEX, closest_deadline - now)
+          end
+        end
+
+        requests.each do |req|
+          req.interrupt if req.expired?(now)
+        end
+        requests.reject!(&:done?)
+      end
+    end
+    ThreadGroup::Default.add(watcher) unless watcher.group.enclosed?
+    watcher.name = "Gem::Timeout stdlib thread"
+    watcher.thread_variable_set(:"\0__detached_thread__", true)
+    watcher
+  end
+  private_class_method :create_timeout_thread
+
+  def self.ensure_timeout_thread_created
+    unless @timeout_thread and @timeout_thread.alive?
+      TIMEOUT_THREAD_MUTEX.synchronize do
+        unless @timeout_thread and @timeout_thread.alive?
+          @timeout_thread = create_timeout_thread
+        end
+      end
+    end
+  end
+
+  # We keep a private reference so that time mocking libraries won't break
+  # Gem::Timeout.
+  GET_TIME = Process.method(:clock_gettime)
+  private_constant :GET_TIME
+
+  # :startdoc:
+
+  # Perform an operation in a block, raising an error if it takes longer than
+  # +sec+ seconds to complete.
+  #
+  # +sec+:: Number of seconds to wait for the block to terminate. Any non-negative number
+  #         or nil may be used, including Floats to specify fractional seconds. A
+  #         value of 0 or +nil+ will execute the block without any timeout.
+  #         Any negative number will raise an ArgumentError.
+  # +klass+:: Exception Class to raise if the block fails to terminate
+  #           in +sec+ seconds.  Omitting will use the default, Gem::Timeout::Error
+  # +message+:: Error message to raise with Exception Class.
+  #             Omitting will use the default, "execution expired"
+  #
+  # Returns the result of the block *if* the block completed before
+  # +sec+ seconds, otherwise throws an exception, based on the value of +klass+.
+  #
+  # The exception thrown to terminate the given block cannot be rescued inside
+  # the block unless +klass+ is given explicitly. However, the block can use
+  # ensure to prevent the handling of the exception.  For that reason, this
+  # method cannot be relied on to enforce timeouts for untrusted blocks.
+  #
+  # If a scheduler is defined, it will be used to handle the timeout by invoking
+  # Scheduler#timeout_after.
+  #
+  # Note that this is both a method of module Gem::Timeout, so you can <tt>include
+  # Gem::Timeout</tt> into your classes so they have a #timeout method, as well as
+  # a module method, so you can call it directly as Gem::Timeout.timeout().
+  def timeout(sec, klass = nil, message = nil, &block)   #:yield: +sec+
+    return yield(sec) if sec == nil or sec.zero?
+    raise ArgumentError, "Timeout sec must be a non-negative number" if 0 > sec
+
+    message ||= "execution expired"
+
+    if Fiber.respond_to?(:current_scheduler) && (scheduler = Fiber.current_scheduler)&.respond_to?(:timeout_after)
+      return scheduler.timeout_after(sec, klass || Error, message, &block)
+    end
+
+    Gem::Timeout.ensure_timeout_thread_created
+    perform = Proc.new do |exc|
+      request = Request.new(Thread.current, sec, exc, message)
+      QUEUE_MUTEX.synchronize do
+        QUEUE << request
+        CONDVAR.signal
+      end
+      begin
+        return yield(sec)
+      ensure
+        request.finished
+      end
+    end
+
+    if klass
+      perform.call(klass)
+    else
+      Error.handle_timeout(message, &perform)
+    end
+  end
+  module_function :timeout
+end
diff --git a/lib/rubygems/vendor/tsort/lib/tsort.rb b/lib/rubygems/vendor/tsort/lib/tsort.rb
new file mode 100644
index 00000000000000..9dd7c095216601
--- /dev/null
+++ b/lib/rubygems/vendor/tsort/lib/tsort.rb
@@ -0,0 +1,455 @@
+# frozen_string_literal: true
+
+#--
+# tsort.rb - provides a module for topological sorting and strongly connected components.
+#++
+#
+
+#
+# Gem::TSort implements topological sorting using Tarjan's algorithm for
+# strongly connected components.
+#
+# Gem::TSort is designed to be able to be used with any object which can be
+# interpreted as a directed graph.
+#
+# Gem::TSort requires two methods to interpret an object as a graph,
+# tsort_each_node and tsort_each_child.
+#
+# * tsort_each_node is used to iterate for all nodes over a graph.
+# * tsort_each_child is used to iterate for child nodes of a given node.
+#
+# The equality of nodes are defined by eql? and hash since
+# Gem::TSort uses Hash internally.
+#
+# == A Simple Example
+#
+# The following example demonstrates how to mix the Gem::TSort module into an
+# existing class (in this case, Hash). Here, we're treating each key in
+# the hash as a node in the graph, and so we simply alias the required
+# #tsort_each_node method to Hash's #each_key method. For each key in the
+# hash, the associated value is an array of the node's child nodes. This
+# choice in turn leads to our implementation of the required #tsort_each_child
+# method, which fetches the array of child nodes and then iterates over that
+# array using the user-supplied block.
+#
+#   require 'rubygems/vendor/tsort/lib/tsort'
+#
+#   class Hash
+#     include Gem::TSort
+#     alias tsort_each_node each_key
+#     def tsort_each_child(node, &block)
+#       fetch(node).each(&block)
+#     end
+#   end
+#
+#   {1=>[2, 3], 2=>[3], 3=>[], 4=>[]}.tsort
+#   #=> [3, 2, 1, 4]
+#
+#   {1=>[2], 2=>[3, 4], 3=>[2], 4=>[]}.strongly_connected_components
+#   #=> [[4], [2, 3], [1]]
+#
+# == A More Realistic Example
+#
+# A very simple `make' like tool can be implemented as follows:
+#
+#   require 'rubygems/vendor/tsort/lib/tsort'
+#
+#   class Make
+#     def initialize
+#       @dep = {}
+#       @dep.default = []
+#     end
+#
+#     def rule(outputs, inputs=[], &block)
+#       triple = [outputs, inputs, block]
+#       outputs.each {|f| @dep[f] = [triple]}
+#       @dep[triple] = inputs
+#     end
+#
+#     def build(target)
+#       each_strongly_connected_component_from(target) {|ns|
+#         if ns.length != 1
+#           fs = ns.delete_if {|n| Array === n}
+#           raise Gem::TSort::Cyclic.new("cyclic dependencies: #{fs.join ', '}")
+#         end
+#         n = ns.first
+#         if Array === n
+#           outputs, inputs, block = n
+#           inputs_time = inputs.map {|f| File.mtime f}.max
+#           begin
+#             outputs_time = outputs.map {|f| File.mtime f}.min
+#           rescue Errno::ENOENT
+#             outputs_time = nil
+#           end
+#           if outputs_time == nil ||
+#              inputs_time != nil && outputs_time <= inputs_time
+#             sleep 1 if inputs_time != nil && inputs_time.to_i == Time.now.to_i
+#             block.call
+#           end
+#         end
+#       }
+#     end
+#
+#     def tsort_each_child(node, &block)
+#       @dep[node].each(&block)
+#     end
+#     include Gem::TSort
+#   end
+#
+#   def command(arg)
+#     print arg, "\n"
+#     system arg
+#   end
+#
+#   m = Make.new
+#   m.rule(%w[t1]) { command 'date > t1' }
+#   m.rule(%w[t2]) { command 'date > t2' }
+#   m.rule(%w[t3]) { command 'date > t3' }
+#   m.rule(%w[t4], %w[t1 t3]) { command 'cat t1 t3 > t4' }
+#   m.rule(%w[t5], %w[t4 t2]) { command 'cat t4 t2 > t5' }
+#   m.build('t5')
+#
+# == Bugs
+#
+# * 'tsort.rb' is wrong name because this library uses
+#   Tarjan's algorithm for strongly connected components.
+#   Although 'strongly_connected_components.rb' is correct but too long.
+#
+# == References
+#
+# R. E. Tarjan, "Depth First Search and Linear Graph Algorithms",
+# <em>SIAM Journal on Computing</em>, Vol. 1, No. 2, pp. 146-160, June 1972.
+#
+
+module Gem::TSort
+
+  VERSION = "0.2.0"
+
+  class Cyclic < StandardError
+  end
+
+  # Returns a topologically sorted array of nodes.
+  # The array is sorted from children to parents, i.e.
+  # the first element has no child and the last node has no parent.
+  #
+  # If there is a cycle, Gem::TSort::Cyclic is raised.
+  #
+  #   class G
+  #     include Gem::TSort
+  #     def initialize(g)
+  #       @g = g
+  #     end
+  #     def tsort_each_child(n, &b) @g[n].each(&b) end
+  #     def tsort_each_node(&b) @g.each_key(&b) end
+  #   end
+  #
+  #   graph = G.new({1=>[2, 3], 2=>[4], 3=>[2, 4], 4=>[]})
+  #   p graph.tsort #=> [4, 2, 3, 1]
+  #
+  #   graph = G.new({1=>[2], 2=>[3, 4], 3=>[2], 4=>[]})
+  #   p graph.tsort # raises Gem::TSort::Cyclic
+  #
+  def tsort
+    each_node = method(:tsort_each_node)
+    each_child = method(:tsort_each_child)
+    Gem::TSort.tsort(each_node, each_child)
+  end
+
+  # Returns a topologically sorted array of nodes.
+  # The array is sorted from children to parents, i.e.
+  # the first element has no child and the last node has no parent.
+  #
+  # The graph is represented by _each_node_ and _each_child_.
+  # _each_node_ should have +call+ method which yields for each node in the graph.
+  # _each_child_ should have +call+ method which takes a node argument and yields for each child node.
+  #
+  # If there is a cycle, Gem::TSort::Cyclic is raised.
+  #
+  #   g = {1=>[2, 3], 2=>[4], 3=>[2, 4], 4=>[]}
+  #   each_node = lambda {|&b| g.each_key(&b) }
+  #   each_child = lambda {|n, &b| g[n].each(&b) }
+  #   p Gem::TSort.tsort(each_node, each_child) #=> [4, 2, 3, 1]
+  #
+  #   g = {1=>[2], 2=>[3, 4], 3=>[2], 4=>[]}
+  #   each_node = lambda {|&b| g.each_key(&b) }
+  #   each_child = lambda {|n, &b| g[n].each(&b) }
+  #   p Gem::TSort.tsort(each_node, each_child) # raises Gem::TSort::Cyclic
+  #
+  def self.tsort(each_node, each_child)
+    tsort_each(each_node, each_child).to_a
+  end
+
+  # The iterator version of the #tsort method.
+  # <tt><em>obj</em>.tsort_each</tt> is similar to <tt><em>obj</em>.tsort.each</tt>, but
+  # modification of _obj_ during the iteration may lead to unexpected results.
+  #
+  # #tsort_each returns +nil+.
+  # If there is a cycle, Gem::TSort::Cyclic is raised.
+  #
+  #   class G
+  #     include Gem::TSort
+  #     def initialize(g)
+  #       @g = g
+  #     end
+  #     def tsort_each_child(n, &b) @g[n].each(&b) end
+  #     def tsort_each_node(&b) @g.each_key(&b) end
+  #   end
+  #
+  #   graph = G.new({1=>[2, 3], 2=>[4], 3=>[2, 4], 4=>[]})
+  #   graph.tsort_each {|n| p n }
+  #   #=> 4
+  #   #   2
+  #   #   3
+  #   #   1
+  #
+  def tsort_each(&block) # :yields: node
+    each_node = method(:tsort_each_node)
+    each_child = method(:tsort_each_child)
+    Gem::TSort.tsort_each(each_node, each_child, &block)
+  end
+
+  # The iterator version of the Gem::TSort.tsort method.
+  #
+  # The graph is represented by _each_node_ and _each_child_.
+  # _each_node_ should have +call+ method which yields for each node in the graph.
+  # _each_child_ should have +call+ method which takes a node argument and yields for each child node.
+  #
+  #   g = {1=>[2, 3], 2=>[4], 3=>[2, 4], 4=>[]}
+  #   each_node = lambda {|&b| g.each_key(&b) }
+  #   each_child = lambda {|n, &b| g[n].each(&b) }
+  #   Gem::TSort.tsort_each(each_node, each_child) {|n| p n }
+  #   #=> 4
+  #   #   2
+  #   #   3
+  #   #   1
+  #
+  def self.tsort_each(each_node, each_child) # :yields: node
+    return to_enum(__method__, each_node, each_child) unless block_given?
+
+    each_strongly_connected_component(each_node, each_child) {|component|
+      if component.size == 1
+        yield component.first
+      else
+        raise Cyclic.new("topological sort failed: #{component.inspect}")
+      end
+    }
+  end
+
+  # Returns strongly connected components as an array of arrays of nodes.
+  # The array is sorted from children to parents.
+  # Each elements of the array represents a strongly connected component.
+  #
+  #   class G
+  #     include Gem::TSort
+  #     def initialize(g)
+  #       @g = g
+  #     end
+  #     def tsort_each_child(n, &b) @g[n].each(&b) end
+  #     def tsort_each_node(&b) @g.each_key(&b) end
+  #   end
+  #
+  #   graph = G.new({1=>[2, 3], 2=>[4], 3=>[2, 4], 4=>[]})
+  #   p graph.strongly_connected_components #=> [[4], [2], [3], [1]]
+  #
+  #   graph = G.new({1=>[2], 2=>[3, 4], 3=>[2], 4=>[]})
+  #   p graph.strongly_connected_components #=> [[4], [2, 3], [1]]
+  #
+  def strongly_connected_components
+    each_node = method(:tsort_each_node)
+    each_child = method(:tsort_each_child)
+    Gem::TSort.strongly_connected_components(each_node, each_child)
+  end
+
+  # Returns strongly connected components as an array of arrays of nodes.
+  # The array is sorted from children to parents.
+  # Each elements of the array represents a strongly connected component.
+  #
+  # The graph is represented by _each_node_ and _each_child_.
+  # _each_node_ should have +call+ method which yields for each node in the graph.
+  # _each_child_ should have +call+ method which takes a node argument and yields for each child node.
+  #
+  #   g = {1=>[2, 3], 2=>[4], 3=>[2, 4], 4=>[]}
+  #   each_node = lambda {|&b| g.each_key(&b) }
+  #   each_child = lambda {|n, &b| g[n].each(&b) }
+  #   p Gem::TSort.strongly_connected_components(each_node, each_child)
+  #   #=> [[4], [2], [3], [1]]
+  #
+  #   g = {1=>[2], 2=>[3, 4], 3=>[2], 4=>[]}
+  #   each_node = lambda {|&b| g.each_key(&b) }
+  #   each_child = lambda {|n, &b| g[n].each(&b) }
+  #   p Gem::TSort.strongly_connected_components(each_node, each_child)
+  #   #=> [[4], [2, 3], [1]]
+  #
+  def self.strongly_connected_components(each_node, each_child)
+    each_strongly_connected_component(each_node, each_child).to_a
+  end
+
+  # The iterator version of the #strongly_connected_components method.
+  # <tt><em>obj</em>.each_strongly_connected_component</tt> is similar to
+  # <tt><em>obj</em>.strongly_connected_components.each</tt>, but
+  # modification of _obj_ during the iteration may lead to unexpected results.
+  #
+  # #each_strongly_connected_component returns +nil+.
+  #
+  #   class G
+  #     include Gem::TSort
+  #     def initialize(g)
+  #       @g = g
+  #     end
+  #     def tsort_each_child(n, &b) @g[n].each(&b) end
+  #     def tsort_each_node(&b) @g.each_key(&b) end
+  #   end
+  #
+  #   graph = G.new({1=>[2, 3], 2=>[4], 3=>[2, 4], 4=>[]})
+  #   graph.each_strongly_connected_component {|scc| p scc }
+  #   #=> [4]
+  #   #   [2]
+  #   #   [3]
+  #   #   [1]
+  #
+  #   graph = G.new({1=>[2], 2=>[3, 4], 3=>[2], 4=>[]})
+  #   graph.each_strongly_connected_component {|scc| p scc }
+  #   #=> [4]
+  #   #   [2, 3]
+  #   #   [1]
+  #
+  def each_strongly_connected_component(&block) # :yields: nodes
+    each_node = method(:tsort_each_node)
+    each_child = method(:tsort_each_child)
+    Gem::TSort.each_strongly_connected_component(each_node, each_child, &block)
+  end
+
+  # The iterator version of the Gem::TSort.strongly_connected_components method.
+  #
+  # The graph is represented by _each_node_ and _each_child_.
+  # _each_node_ should have +call+ method which yields for each node in the graph.
+  # _each_child_ should have +call+ method which takes a node argument and yields for each child node.
+  #
+  #   g = {1=>[2, 3], 2=>[4], 3=>[2, 4], 4=>[]}
+  #   each_node = lambda {|&b| g.each_key(&b) }
+  #   each_child = lambda {|n, &b| g[n].each(&b) }
+  #   Gem::TSort.each_strongly_connected_component(each_node, each_child) {|scc| p scc }
+  #   #=> [4]
+  #   #   [2]
+  #   #   [3]
+  #   #   [1]
+  #
+  #   g = {1=>[2], 2=>[3, 4], 3=>[2], 4=>[]}
+  #   each_node = lambda {|&b| g.each_key(&b) }
+  #   each_child = lambda {|n, &b| g[n].each(&b) }
+  #   Gem::TSort.each_strongly_connected_component(each_node, each_child) {|scc| p scc }
+  #   #=> [4]
+  #   #   [2, 3]
+  #   #   [1]
+  #
+  def self.each_strongly_connected_component(each_node, each_child) # :yields: nodes
+    return to_enum(__method__, each_node, each_child) unless block_given?
+
+    id_map = {}
+    stack = []
+    each_node.call {|node|
+      unless id_map.include? node
+        each_strongly_connected_component_from(node, each_child, id_map, stack) {|c|
+          yield c
+        }
+      end
+    }
+    nil
+  end
+
+  # Iterates over strongly connected component in the subgraph reachable from
+  # _node_.
+  #
+  # Return value is unspecified.
+  #
+  # #each_strongly_connected_component_from doesn't call #tsort_each_node.
+  #
+  #   class G
+  #     include Gem::TSort
+  #     def initialize(g)
+  #       @g = g
+  #     end
+  #     def tsort_each_child(n, &b) @g[n].each(&b) end
+  #     def tsort_each_node(&b) @g.each_key(&b) end
+  #   end
+  #
+  #   graph = G.new({1=>[2, 3], 2=>[4], 3=>[2, 4], 4=>[]})
+  #   graph.each_strongly_connected_component_from(2) {|scc| p scc }
+  #   #=> [4]
+  #   #   [2]
+  #
+  #   graph = G.new({1=>[2], 2=>[3, 4], 3=>[2], 4=>[]})
+  #   graph.each_strongly_connected_component_from(2) {|scc| p scc }
+  #   #=> [4]
+  #   #   [2, 3]
+  #
+  def each_strongly_connected_component_from(node, id_map={}, stack=[], &block) # :yields: nodes
+    Gem::TSort.each_strongly_connected_component_from(node, method(:tsort_each_child), id_map, stack, &block)
+  end
+
+  # Iterates over strongly connected components in a graph.
+  # The graph is represented by _node_ and _each_child_.
+  #
+  # _node_ is the first node.
+  # _each_child_ should have +call+ method which takes a node argument
+  # and yields for each child node.
+  #
+  # Return value is unspecified.
+  #
+  # #Gem::TSort.each_strongly_connected_component_from is a class method and
+  # it doesn't need a class to represent a graph which includes Gem::TSort.
+  #
+  #   graph = {1=>[2], 2=>[3, 4], 3=>[2], 4=>[]}
+  #   each_child = lambda {|n, &b| graph[n].each(&b) }
+  #   Gem::TSort.each_strongly_connected_component_from(1, each_child) {|scc|
+  #     p scc
+  #   }
+  #   #=> [4]
+  #   #   [2, 3]
+  #   #   [1]
+  #
+  def self.each_strongly_connected_component_from(node, each_child, id_map={}, stack=[]) # :yields: nodes
+    return to_enum(__method__, node, each_child, id_map, stack) unless block_given?
+
+    minimum_id = node_id = id_map[node] = id_map.size
+    stack_length = stack.length
+    stack << node
+
+    each_child.call(node) {|child|
+      if id_map.include? child
+        child_id = id_map[child]
+        minimum_id = child_id if child_id && child_id < minimum_id
+      else
+        sub_minimum_id =
+          each_strongly_connected_component_from(child, each_child, id_map, stack) {|c|
+            yield c
+          }
+        minimum_id = sub_minimum_id if sub_minimum_id < minimum_id
+      end
+    }
+
+    if node_id == minimum_id
+      component = stack.slice!(stack_length .. -1)
+      component.each {|n| id_map[n] = nil}
+      yield component
+    end
+
+    minimum_id
+  end
+
+  # Should be implemented by a extended class.
+  #
+  # #tsort_each_node is used to iterate for all nodes over a graph.
+  #
+  def tsort_each_node # :yields: node
+    raise NotImplementedError.new
+  end
+
+  # Should be implemented by a extended class.
+  #
+  # #tsort_each_child is used to iterate for child nodes of _node_.
+  #
+  def tsort_each_child(node) # :yields: child
+    raise NotImplementedError.new
+  end
+end
diff --git a/lib/rubygems/vendor/uri/lib/uri.rb b/lib/rubygems/vendor/uri/lib/uri.rb
new file mode 100644
index 00000000000000..4691b122b26735
--- /dev/null
+++ b/lib/rubygems/vendor/uri/lib/uri.rb
@@ -0,0 +1,104 @@
+# frozen_string_literal: false
+# Gem::URI is a module providing classes to handle Uniform Resource Identifiers
+# (RFC2396[https://www.rfc-editor.org/rfc/rfc2396]).
+#
+# == Features
+#
+# * Uniform way of handling URIs.
+# * Flexibility to introduce custom Gem::URI schemes.
+# * Flexibility to have an alternate Gem::URI::Parser (or just different patterns
+#   and regexp's).
+#
+# == Basic example
+#
+#   require 'rubygems/vendor/uri/lib/uri'
+#
+#   uri = Gem::URI("http://foo.com/posts?id=30&limit=5#time=1305298413")
+#   #=> #<Gem::URI::HTTP http://foo.com/posts?id=30&limit=5#time=1305298413>
+#
+#   uri.scheme    #=> "http"
+#   uri.host      #=> "foo.com"
+#   uri.path      #=> "/posts"
+#   uri.query     #=> "id=30&limit=5"
+#   uri.fragment  #=> "time=1305298413"
+#
+#   uri.to_s      #=> "http://foo.com/posts?id=30&limit=5#time=1305298413"
+#
+# == Adding custom URIs
+#
+#   module Gem::URI
+#     class RSYNC < Generic
+#       DEFAULT_PORT = 873
+#     end
+#     register_scheme 'RSYNC', RSYNC
+#   end
+#   #=> Gem::URI::RSYNC
+#
+#   Gem::URI.scheme_list
+#   #=> {"FILE"=>Gem::URI::File, "FTP"=>Gem::URI::FTP, "HTTP"=>Gem::URI::HTTP,
+#   #    "HTTPS"=>Gem::URI::HTTPS, "LDAP"=>Gem::URI::LDAP, "LDAPS"=>Gem::URI::LDAPS,
+#   #    "MAILTO"=>Gem::URI::MailTo, "RSYNC"=>Gem::URI::RSYNC}
+#
+#   uri = Gem::URI("rsync://rsync.foo.com")
+#   #=> #<Gem::URI::RSYNC rsync://rsync.foo.com>
+#
+# == RFC References
+#
+# A good place to view an RFC spec is http://www.ietf.org/rfc.html.
+#
+# Here is a list of all related RFC's:
+# - RFC822[https://www.rfc-editor.org/rfc/rfc822]
+# - RFC1738[https://www.rfc-editor.org/rfc/rfc1738]
+# - RFC2255[https://www.rfc-editor.org/rfc/rfc2255]
+# - RFC2368[https://www.rfc-editor.org/rfc/rfc2368]
+# - RFC2373[https://www.rfc-editor.org/rfc/rfc2373]
+# - RFC2396[https://www.rfc-editor.org/rfc/rfc2396]
+# - RFC2732[https://www.rfc-editor.org/rfc/rfc2732]
+# - RFC3986[https://www.rfc-editor.org/rfc/rfc3986]
+#
+# == Class tree
+#
+# - Gem::URI::Generic (in uri/generic.rb)
+#   - Gem::URI::File - (in uri/file.rb)
+#   - Gem::URI::FTP - (in uri/ftp.rb)
+#   - Gem::URI::HTTP - (in uri/http.rb)
+#     - Gem::URI::HTTPS - (in uri/https.rb)
+#   - Gem::URI::LDAP - (in uri/ldap.rb)
+#     - Gem::URI::LDAPS - (in uri/ldaps.rb)
+#   - Gem::URI::MailTo - (in uri/mailto.rb)
+# - Gem::URI::Parser - (in uri/common.rb)
+# - Gem::URI::REGEXP - (in uri/common.rb)
+#   - Gem::URI::REGEXP::PATTERN - (in uri/common.rb)
+# - Gem::URI::Util - (in uri/common.rb)
+# - Gem::URI::Error - (in uri/common.rb)
+#   - Gem::URI::InvalidURIError - (in uri/common.rb)
+#   - Gem::URI::InvalidComponentError - (in uri/common.rb)
+#   - Gem::URI::BadURIError - (in uri/common.rb)
+#
+# == Copyright Info
+#
+# Author:: Akira Yamada <akira@ruby-lang.org>
+# Documentation::
+#   Akira Yamada <akira@ruby-lang.org>
+#   Dmitry V. Sabanin <sdmitry@lrn.ru>
+#   Vincent Batts <vbatts@hashbangbash.com>
+# License::
+#  Copyright (c) 2001 akira yamada <akira@ruby-lang.org>
+#  You can redistribute it and/or modify it under the same term as Ruby.
+#
+
+module Gem::URI
+end
+
+require_relative 'uri/version'
+require_relative 'uri/common'
+require_relative 'uri/generic'
+require_relative 'uri/file'
+require_relative 'uri/ftp'
+require_relative 'uri/http'
+require_relative 'uri/https'
+require_relative 'uri/ldap'
+require_relative 'uri/ldaps'
+require_relative 'uri/mailto'
+require_relative 'uri/ws'
+require_relative 'uri/wss'
diff --git a/lib/rubygems/vendor/uri/lib/uri/common.rb b/lib/rubygems/vendor/uri/lib/uri/common.rb
new file mode 100644
index 00000000000000..f0755f5fdcaa49
--- /dev/null
+++ b/lib/rubygems/vendor/uri/lib/uri/common.rb
@@ -0,0 +1,880 @@
+# frozen_string_literal: true
+#--
+# = uri/common.rb
+#
+# Author:: Akira Yamada <akira@ruby-lang.org>
+# License::
+#   You can redistribute it and/or modify it under the same term as Ruby.
+#
+# See Gem::URI for general documentation
+#
+
+require_relative "rfc2396_parser"
+require_relative "rfc3986_parser"
+
+module Gem::URI
+  # The default parser instance for RFC 2396.
+  RFC2396_PARSER = RFC2396_Parser.new
+  Ractor.make_shareable(RFC2396_PARSER) if defined?(Ractor)
+
+  # The default parser instance for RFC 3986.
+  RFC3986_PARSER = RFC3986_Parser.new
+  Ractor.make_shareable(RFC3986_PARSER) if defined?(Ractor)
+
+  # The default parser instance.
+  DEFAULT_PARSER = RFC3986_PARSER
+  Ractor.make_shareable(DEFAULT_PARSER) if defined?(Ractor)
+
+  # Set the default parser instance.
+  def self.parser=(parser = RFC3986_PARSER)
+    remove_const(:Parser) if defined?(::Gem::URI::Parser)
+    const_set("Parser", parser.class)
+
+    remove_const(:REGEXP) if defined?(::Gem::URI::REGEXP)
+    remove_const(:PATTERN) if defined?(::Gem::URI::PATTERN)
+    if Parser == RFC2396_Parser
+      const_set("REGEXP", Gem::URI::RFC2396_REGEXP)
+      const_set("PATTERN", Gem::URI::RFC2396_REGEXP::PATTERN)
+    end
+
+    Parser.new.regexp.each_pair do |sym, str|
+      remove_const(sym) if const_defined?(sym, false)
+      const_set(sym, str)
+    end
+  end
+  self.parser = RFC3986_PARSER
+
+  def self.const_missing(const) # :nodoc:
+    if const == :REGEXP
+      warn "Gem::URI::REGEXP is obsolete. Use Gem::URI::RFC2396_REGEXP explicitly.", uplevel: 1 if $VERBOSE
+      Gem::URI::RFC2396_REGEXP
+    elsif value = RFC2396_PARSER.regexp[const]
+      warn "Gem::URI::#{const} is obsolete. Use RFC2396_PARSER.regexp[#{const.inspect}] explicitly.", uplevel: 1 if $VERBOSE
+      value
+    elsif value = RFC2396_Parser.const_get(const)
+      warn "Gem::URI::#{const} is obsolete. Use RFC2396_Parser::#{const} explicitly.", uplevel: 1 if $VERBOSE
+      value
+    else
+      super
+    end
+  end
+
+  module Util # :nodoc:
+    def make_components_hash(klass, array_hash)
+      tmp = {}
+      if array_hash.kind_of?(Array) &&
+          array_hash.size == klass.component.size - 1
+        klass.component[1..-1].each_index do |i|
+          begin
+            tmp[klass.component[i + 1]] = array_hash[i].clone
+          rescue TypeError
+            tmp[klass.component[i + 1]] = array_hash[i]
+          end
+        end
+
+      elsif array_hash.kind_of?(Hash)
+        array_hash.each do |key, value|
+          begin
+            tmp[key] = value.clone
+          rescue TypeError
+            tmp[key] = value
+          end
+        end
+      else
+        raise ArgumentError,
+          "expected Array of or Hash of components of #{klass} (#{klass.component[1..-1].join(', ')})"
+      end
+      tmp[:scheme] = klass.to_s.sub(/\A.*::/, '').downcase
+
+      return tmp
+    end
+    module_function :make_components_hash
+  end
+
+  module Schemes # :nodoc:
+  end
+  private_constant :Schemes
+
+  # Registers the given +klass+ as the class to be instantiated
+  # when parsing a \Gem::URI with the given +scheme+:
+  #
+  #   Gem::URI.register_scheme('MS_SEARCH', Gem::URI::Generic) # => Gem::URI::Generic
+  #   Gem::URI.scheme_list['MS_SEARCH']                   # => Gem::URI::Generic
+  #
+  # Note that after calling String#upcase on +scheme+, it must be a valid
+  # constant name.
+  def self.register_scheme(scheme, klass)
+    Schemes.const_set(scheme.to_s.upcase, klass)
+  end
+
+  # Returns a hash of the defined schemes:
+  #
+  #   Gem::URI.scheme_list
+  #   # =>
+  #   {"MAILTO"=>Gem::URI::MailTo,
+  #    "LDAPS"=>Gem::URI::LDAPS,
+  #    "WS"=>Gem::URI::WS,
+  #    "HTTP"=>Gem::URI::HTTP,
+  #    "HTTPS"=>Gem::URI::HTTPS,
+  #    "LDAP"=>Gem::URI::LDAP,
+  #    "FILE"=>Gem::URI::File,
+  #    "FTP"=>Gem::URI::FTP}
+  #
+  # Related: Gem::URI.register_scheme.
+  def self.scheme_list
+    Schemes.constants.map { |name|
+      [name.to_s.upcase, Schemes.const_get(name)]
+    }.to_h
+  end
+
+  INITIAL_SCHEMES = scheme_list
+  private_constant :INITIAL_SCHEMES
+  Ractor.make_shareable(INITIAL_SCHEMES) if defined?(Ractor)
+
+  # Returns a new object constructed from the given +scheme+, +arguments+,
+  # and +default+:
+  #
+  # - The new object is an instance of <tt>Gem::URI.scheme_list[scheme.upcase]</tt>.
+  # - The object is initialized by calling the class initializer
+  #   using +scheme+ and +arguments+.
+  #   See Gem::URI::Generic.new.
+  #
+  # Examples:
+  #
+  #   values = ['john.doe', 'www.example.com', '123', nil, '/forum/questions/', nil, 'tag=networking&order=newest', 'top']
+  #   Gem::URI.for('https', *values)
+  #   # => #<Gem::URI::HTTPS https://john.doe@www.example.com:123/forum/questions/?tag=networking&order=newest#top>
+  #   Gem::URI.for('foo', *values, default: Gem::URI::HTTP)
+  #   # => #<Gem::URI::HTTP foo://john.doe@www.example.com:123/forum/questions/?tag=networking&order=newest#top>
+  #
+  def self.for(scheme, *arguments, default: Generic)
+    const_name = scheme.to_s.upcase
+
+    uri_class = INITIAL_SCHEMES[const_name]
+    uri_class ||= if /\A[A-Z]\w*\z/.match?(const_name) && Schemes.const_defined?(const_name, false)
+      Schemes.const_get(const_name, false)
+    end
+    uri_class ||= default
+
+    return uri_class.new(scheme, *arguments)
+  end
+
+  #
+  # Base class for all Gem::URI exceptions.
+  #
+  class Error < StandardError; end
+  #
+  # Not a Gem::URI.
+  #
+  class InvalidURIError < Error; end
+  #
+  # Not a Gem::URI component.
+  #
+  class InvalidComponentError < Error; end
+  #
+  # Gem::URI is valid, bad usage is not.
+  #
+  class BadURIError < Error; end
+
+  # Returns a 9-element array representing the parts of the \Gem::URI
+  # formed from the string +uri+;
+  # each array element is a string or +nil+:
+  #
+  #   names = %w[scheme userinfo host port registry path opaque query fragment]
+  #   values = Gem::URI.split('https://john.doe@www.example.com:123/forum/questions/?tag=networking&order=newest#top')
+  #   names.zip(values)
+  #   # =>
+  #   [["scheme", "https"],
+  #    ["userinfo", "john.doe"],
+  #    ["host", "www.example.com"],
+  #    ["port", "123"],
+  #    ["registry", nil],
+  #    ["path", "/forum/questions/"],
+  #    ["opaque", nil],
+  #    ["query", "tag=networking&order=newest"],
+  #    ["fragment", "top"]]
+  #
+  def self.split(uri)
+    DEFAULT_PARSER.split(uri)
+  end
+
+  # Returns a new \Gem::URI object constructed from the given string +uri+:
+  #
+  #   Gem::URI.parse('https://john.doe@www.example.com:123/forum/questions/?tag=networking&order=newest#top')
+  #   # => #<Gem::URI::HTTPS https://john.doe@www.example.com:123/forum/questions/?tag=networking&order=newest#top>
+  #   Gem::URI.parse('http://john.doe@www.example.com:123/forum/questions/?tag=networking&order=newest#top')
+  #   # => #<Gem::URI::HTTP http://john.doe@www.example.com:123/forum/questions/?tag=networking&order=newest#top>
+  #
+  # It's recommended to first ::escape string +uri+
+  # if it may contain invalid Gem::URI characters.
+  #
+  def self.parse(uri)
+    DEFAULT_PARSER.parse(uri)
+  end
+
+  # Merges the given Gem::URI strings +str+
+  # per {RFC 2396}[https://www.rfc-editor.org/rfc/rfc2396.html].
+  #
+  # Each string in +str+ is converted to an
+  # {RFC3986 Gem::URI}[https://www.rfc-editor.org/rfc/rfc3986.html] before being merged.
+  #
+  # Examples:
+  #
+  #   Gem::URI.join("http://example.com/","main.rbx")
+  #   # => #<Gem::URI::HTTP http://example.com/main.rbx>
+  #
+  #   Gem::URI.join('http://example.com', 'foo')
+  #   # => #<Gem::URI::HTTP http://example.com/foo>
+  #
+  #   Gem::URI.join('http://example.com', '/foo', '/bar')
+  #   # => #<Gem::URI::HTTP http://example.com/bar>
+  #
+  #   Gem::URI.join('http://example.com', '/foo', 'bar')
+  #   # => #<Gem::URI::HTTP http://example.com/bar>
+  #
+  #   Gem::URI.join('http://example.com', '/foo/', 'bar')
+  #   # => #<Gem::URI::HTTP http://example.com/foo/bar>
+  #
+  def self.join(*str)
+    DEFAULT_PARSER.join(*str)
+  end
+
+  #
+  # == Synopsis
+  #
+  #   Gem::URI::extract(str[, schemes][,&blk])
+  #
+  # == Args
+  #
+  # +str+::
+  #   String to extract URIs from.
+  # +schemes+::
+  #   Limit Gem::URI matching to specific schemes.
+  #
+  # == Description
+  #
+  # Extracts URIs from a string. If block given, iterates through all matched URIs.
+  # Returns nil if block given or array with matches.
+  #
+  # == Usage
+  #
+  #   require "rubygems/vendor/uri/lib/uri"
+  #
+  #   Gem::URI.extract("text here http://foo.example.org/bla and here mailto:test@example.com and here also.")
+  #   # => ["http://foo.example.com/bla", "mailto:test@example.com"]
+  #
+  def self.extract(str, schemes = nil, &block) # :nodoc:
+    warn "Gem::URI.extract is obsolete", uplevel: 1 if $VERBOSE
+    DEFAULT_PARSER.extract(str, schemes, &block)
+  end
+
+  #
+  # == Synopsis
+  #
+  #   Gem::URI::regexp([match_schemes])
+  #
+  # == Args
+  #
+  # +match_schemes+::
+  #   Array of schemes. If given, resulting regexp matches to URIs
+  #   whose scheme is one of the match_schemes.
+  #
+  # == Description
+  #
+  # Returns a Regexp object which matches to Gem::URI-like strings.
+  # The Regexp object returned by this method includes arbitrary
+  # number of capture group (parentheses).  Never rely on its number.
+  #
+  # == Usage
+  #
+  #   require 'rubygems/vendor/uri/lib/uri'
+  #
+  #   # extract first Gem::URI from html_string
+  #   html_string.slice(Gem::URI.regexp)
+  #
+  #   # remove ftp URIs
+  #   html_string.sub(Gem::URI.regexp(['ftp']), '')
+  #
+  #   # You should not rely on the number of parentheses
+  #   html_string.scan(Gem::URI.regexp) do |*matches|
+  #     p $&
+  #   end
+  #
+  def self.regexp(schemes = nil)# :nodoc:
+    warn "Gem::URI.regexp is obsolete", uplevel: 1 if $VERBOSE
+    DEFAULT_PARSER.make_regexp(schemes)
+  end
+
+  TBLENCWWWCOMP_ = {} # :nodoc:
+  256.times do |i|
+    TBLENCWWWCOMP_[-i.chr] = -('%%%02X' % i)
+  end
+  TBLENCURICOMP_ = TBLENCWWWCOMP_.dup.freeze # :nodoc:
+  TBLENCWWWCOMP_[' '] = '+'
+  TBLENCWWWCOMP_.freeze
+  TBLDECWWWCOMP_ = {} # :nodoc:
+  256.times do |i|
+    h, l = i>>4, i&15
+    TBLDECWWWCOMP_[-('%%%X%X' % [h, l])] = -i.chr
+    TBLDECWWWCOMP_[-('%%%x%X' % [h, l])] = -i.chr
+    TBLDECWWWCOMP_[-('%%%X%x' % [h, l])] = -i.chr
+    TBLDECWWWCOMP_[-('%%%x%x' % [h, l])] = -i.chr
+  end
+  TBLDECWWWCOMP_['+'] = ' '
+  TBLDECWWWCOMP_.freeze
+
+  # Returns a URL-encoded string derived from the given string +str+.
+  #
+  # The returned string:
+  #
+  # - Preserves:
+  #
+  #   - Characters <tt>'*'</tt>, <tt>'.'</tt>, <tt>'-'</tt>, and <tt>'_'</tt>.
+  #   - Character in ranges <tt>'a'..'z'</tt>, <tt>'A'..'Z'</tt>,
+  #     and <tt>'0'..'9'</tt>.
+  #
+  #   Example:
+  #
+  #     Gem::URI.encode_www_form_component('*.-_azAZ09')
+  #     # => "*.-_azAZ09"
+  #
+  # - Converts:
+  #
+  #   - Character <tt>' '</tt> to character <tt>'+'</tt>.
+  #   - Any other character to "percent notation";
+  #     the percent notation for character <i>c</i> is <tt>'%%%X' % c.ord</tt>.
+  #
+  #   Example:
+  #
+  #     Gem::URI.encode_www_form_component('Here are some punctuation characters: ,;?:')
+  #     # => "Here+are+some+punctuation+characters%3A+%2C%3B%3F%3A"
+  #
+  # Encoding:
+  #
+  # - If +str+ has encoding Encoding::ASCII_8BIT, argument +enc+ is ignored.
+  # - Otherwise +str+ is converted first to Encoding::UTF_8
+  #   (with suitable character replacements),
+  #   and then to encoding +enc+.
+  #
+  # In either case, the returned string has forced encoding Encoding::US_ASCII.
+  #
+  # Related: Gem::URI.encode_uri_component (encodes <tt>' '</tt> as <tt>'%20'</tt>).
+  def self.encode_www_form_component(str, enc=nil)
+    _encode_uri_component(/[^*\-.0-9A-Z_a-z]/, TBLENCWWWCOMP_, str, enc)
+  end
+
+  # Returns a string decoded from the given \URL-encoded string +str+.
+  #
+  # The given string is first encoded as Encoding::ASCII-8BIT (using String#b),
+  # then decoded (as below), and finally force-encoded to the given encoding +enc+.
+  #
+  # The returned string:
+  #
+  # - Preserves:
+  #
+  #   - Characters <tt>'*'</tt>, <tt>'.'</tt>, <tt>'-'</tt>, and <tt>'_'</tt>.
+  #   - Character in ranges <tt>'a'..'z'</tt>, <tt>'A'..'Z'</tt>,
+  #     and <tt>'0'..'9'</tt>.
+  #
+  #   Example:
+  #
+  #     Gem::URI.decode_www_form_component('*.-_azAZ09')
+  #     # => "*.-_azAZ09"
+  #
+  # - Converts:
+  #
+  #   - Character <tt>'+'</tt> to character <tt>' '</tt>.
+  #   - Each "percent notation" to an ASCII character.
+  #
+  #   Example:
+  #
+  #     Gem::URI.decode_www_form_component('Here+are+some+punctuation+characters%3A+%2C%3B%3F%3A')
+  #     # => "Here are some punctuation characters: ,;?:"
+  #
+  # Related: Gem::URI.decode_uri_component (preserves <tt>'+'</tt>).
+  def self.decode_www_form_component(str, enc=Encoding::UTF_8)
+    _decode_uri_component(/\+|%\h\h/, str, enc)
+  end
+
+  # Like Gem::URI.encode_www_form_component, except that <tt>' '</tt> (space)
+  # is encoded as <tt>'%20'</tt> (instead of <tt>'+'</tt>).
+  def self.encode_uri_component(str, enc=nil)
+    _encode_uri_component(/[^*\-.0-9A-Z_a-z]/, TBLENCURICOMP_, str, enc)
+  end
+
+  # Like Gem::URI.decode_www_form_component, except that <tt>'+'</tt> is preserved.
+  def self.decode_uri_component(str, enc=Encoding::UTF_8)
+    _decode_uri_component(/%\h\h/, str, enc)
+  end
+
+  def self._encode_uri_component(regexp, table, str, enc)
+    str = str.to_s.dup
+    if str.encoding != Encoding::ASCII_8BIT
+      if enc && enc != Encoding::ASCII_8BIT
+        str.encode!(Encoding::UTF_8, invalid: :replace, undef: :replace)
+        str.encode!(enc, fallback: ->(x){"&##{x.ord};"})
+      end
+      str.force_encoding(Encoding::ASCII_8BIT)
+    end
+    str.gsub!(regexp, table)
+    str.force_encoding(Encoding::US_ASCII)
+  end
+  private_class_method :_encode_uri_component
+
+  def self._decode_uri_component(regexp, str, enc)
+    raise ArgumentError, "invalid %-encoding (#{str})" if /%(?!\h\h)/.match?(str)
+    str.b.gsub(regexp, TBLDECWWWCOMP_).force_encoding(enc)
+  end
+  private_class_method :_decode_uri_component
+
+  # Returns a URL-encoded string derived from the given
+  # {Enumerable}[rdoc-ref:Enumerable@Enumerable+in+Ruby+Classes]
+  # +enum+.
+  #
+  # The result is suitable for use as form data
+  # for an \HTTP request whose <tt>Content-Type</tt> is
+  # <tt>'application/x-www-form-urlencoded'</tt>.
+  #
+  # The returned string consists of the elements of +enum+,
+  # each converted to one or more URL-encoded strings,
+  # and all joined with character <tt>'&'</tt>.
+  #
+  # Simple examples:
+  #
+  #   Gem::URI.encode_www_form([['foo', 0], ['bar', 1], ['baz', 2]])
+  #   # => "foo=0&bar=1&baz=2"
+  #   Gem::URI.encode_www_form({foo: 0, bar: 1, baz: 2})
+  #   # => "foo=0&bar=1&baz=2"
+  #
+  # The returned string is formed using method Gem::URI.encode_www_form_component,
+  # which converts certain characters:
+  #
+  #   Gem::URI.encode_www_form('f#o': '/', 'b-r': '$', 'b z': '@')
+  #   # => "f%23o=%2F&b-r=%24&b+z=%40"
+  #
+  # When +enum+ is Array-like, each element +ele+ is converted to a field:
+  #
+  # - If +ele+ is an array of two or more elements,
+  #   the field is formed from its first two elements
+  #   (and any additional elements are ignored):
+  #
+  #     name = Gem::URI.encode_www_form_component(ele[0], enc)
+  #     value = Gem::URI.encode_www_form_component(ele[1], enc)
+  #     "#{name}=#{value}"
+  #
+  #   Examples:
+  #
+  #     Gem::URI.encode_www_form([%w[foo bar], %w[baz bat bah]])
+  #     # => "foo=bar&baz=bat"
+  #     Gem::URI.encode_www_form([['foo', 0], ['bar', :baz, 'bat']])
+  #     # => "foo=0&bar=baz"
+  #
+  # - If +ele+ is an array of one element,
+  #   the field is formed from <tt>ele[0]</tt>:
+  #
+  #     Gem::URI.encode_www_form_component(ele[0])
+  #
+  #   Example:
+  #
+  #     Gem::URI.encode_www_form([['foo'], [:bar], [0]])
+  #     # => "foo&bar&0"
+  #
+  # - Otherwise the field is formed from +ele+:
+  #
+  #     Gem::URI.encode_www_form_component(ele)
+  #
+  #   Example:
+  #
+  #     Gem::URI.encode_www_form(['foo', :bar, 0])
+  #     # => "foo&bar&0"
+  #
+  # The elements of an Array-like +enum+ may be mixture:
+  #
+  #   Gem::URI.encode_www_form([['foo', 0], ['bar', 1, 2], ['baz'], :bat])
+  #   # => "foo=0&bar=1&baz&bat"
+  #
+  # When +enum+ is Hash-like,
+  # each +key+/+value+ pair is converted to one or more fields:
+  #
+  # - If +value+ is
+  #   {Array-convertible}[rdoc-ref:implicit_conversion.rdoc@Array-Convertible+Objects],
+  #   each element +ele+ in +value+ is paired with +key+ to form a field:
+  #
+  #     name = Gem::URI.encode_www_form_component(key, enc)
+  #     value = Gem::URI.encode_www_form_component(ele, enc)
+  #     "#{name}=#{value}"
+  #
+  #   Example:
+  #
+  #     Gem::URI.encode_www_form({foo: [:bar, 1], baz: [:bat, :bam, 2]})
+  #     # => "foo=bar&foo=1&baz=bat&baz=bam&baz=2"
+  #
+  # - Otherwise, +key+ and +value+ are paired to form a field:
+  #
+  #     name = Gem::URI.encode_www_form_component(key, enc)
+  #     value = Gem::URI.encode_www_form_component(value, enc)
+  #     "#{name}=#{value}"
+  #
+  #   Example:
+  #
+  #     Gem::URI.encode_www_form({foo: 0, bar: 1, baz: 2})
+  #     # => "foo=0&bar=1&baz=2"
+  #
+  # The elements of a Hash-like +enum+ may be mixture:
+  #
+  #   Gem::URI.encode_www_form({foo: [0, 1], bar: 2})
+  #   # => "foo=0&foo=1&bar=2"
+  #
+  def self.encode_www_form(enum, enc=nil)
+    enum.map do |k,v|
+      if v.nil?
+        encode_www_form_component(k, enc)
+      elsif v.respond_to?(:to_ary)
+        v.to_ary.map do |w|
+          str = encode_www_form_component(k, enc)
+          unless w.nil?
+            str << '='
+            str << encode_www_form_component(w, enc)
+          end
+        end.join('&')
+      else
+        str = encode_www_form_component(k, enc)
+        str << '='
+        str << encode_www_form_component(v, enc)
+      end
+    end.join('&')
+  end
+
+  # Returns name/value pairs derived from the given string +str+,
+  # which must be an ASCII string.
+  #
+  # The method may be used to decode the body of Net::HTTPResponse object +res+
+  # for which <tt>res['Content-Type']</tt> is <tt>'application/x-www-form-urlencoded'</tt>.
+  #
+  # The returned data is an array of 2-element subarrays;
+  # each subarray is a name/value pair (both are strings).
+  # Each returned string has encoding +enc+,
+  # and has had invalid characters removed via
+  # {String#scrub}[rdoc-ref:String#scrub].
+  #
+  # A simple example:
+  #
+  #   Gem::URI.decode_www_form('foo=0&bar=1&baz')
+  #   # => [["foo", "0"], ["bar", "1"], ["baz", ""]]
+  #
+  # The returned strings have certain conversions,
+  # similar to those performed in Gem::URI.decode_www_form_component:
+  #
+  #   Gem::URI.decode_www_form('f%23o=%2F&b-r=%24&b+z=%40')
+  #   # => [["f#o", "/"], ["b-r", "$"], ["b z", "@"]]
+  #
+  # The given string may contain consecutive separators:
+  #
+  #   Gem::URI.decode_www_form('foo=0&&bar=1&&baz=2')
+  #   # => [["foo", "0"], ["", ""], ["bar", "1"], ["", ""], ["baz", "2"]]
+  #
+  # A different separator may be specified:
+  #
+  #   Gem::URI.decode_www_form('foo=0--bar=1--baz', separator: '--')
+  #   # => [["foo", "0"], ["bar", "1"], ["baz", ""]]
+  #
+  def self.decode_www_form(str, enc=Encoding::UTF_8, separator: '&', use__charset_: false, isindex: false)
+    raise ArgumentError, "the input of #{self.name}.#{__method__} must be ASCII only string" unless str.ascii_only?
+    ary = []
+    return ary if str.empty?
+    enc = Encoding.find(enc)
+    str.b.each_line(separator) do |string|
+      string.chomp!(separator)
+      key, sep, val = string.partition('=')
+      if isindex
+        if sep.empty?
+          val = key
+          key = +''
+        end
+        isindex = false
+      end
+
+      if use__charset_ and key == '_charset_' and e = get_encoding(val)
+        enc = e
+        use__charset_ = false
+      end
+
+      key.gsub!(/\+|%\h\h/, TBLDECWWWCOMP_)
+      if val
+        val.gsub!(/\+|%\h\h/, TBLDECWWWCOMP_)
+      else
+        val = +''
+      end
+
+      ary << [key, val]
+    end
+    ary.each do |k, v|
+      k.force_encoding(enc)
+      k.scrub!
+      v.force_encoding(enc)
+      v.scrub!
+    end
+    ary
+  end
+
+  private
+=begin command for WEB_ENCODINGS_
+  curl https://encoding.spec.whatwg.org/encodings.json|
+  ruby -rjson -e 'H={}
+  h={
+    "shift_jis"=>"Windows-31J",
+    "euc-jp"=>"cp51932",
+    "iso-2022-jp"=>"cp50221",
+    "x-mac-cyrillic"=>"macCyrillic",
+  }
+  JSON($<.read).map{|x|x["encodings"]}.flatten.each{|x|
+    Encoding.find(n=h.fetch(n=x["name"].downcase,n))rescue next
+    x["labels"].each{|y|H[y]=n}
+  }
+  puts "{"
+  H.each{|k,v|puts %[  #{k.dump}=>#{v.dump},]}
+  puts "}"
+'
+=end
+  WEB_ENCODINGS_ = {
+    "unicode-1-1-utf-8"=>"utf-8",
+    "utf-8"=>"utf-8",
+    "utf8"=>"utf-8",
+    "866"=>"ibm866",
+    "cp866"=>"ibm866",
+    "csibm866"=>"ibm866",
+    "ibm866"=>"ibm866",
+    "csisolatin2"=>"iso-8859-2",
+    "iso-8859-2"=>"iso-8859-2",
+    "iso-ir-101"=>"iso-8859-2",
+    "iso8859-2"=>"iso-8859-2",
+    "iso88592"=>"iso-8859-2",
+    "iso_8859-2"=>"iso-8859-2",
+    "iso_8859-2:1987"=>"iso-8859-2",
+    "l2"=>"iso-8859-2",
+    "latin2"=>"iso-8859-2",
+    "csisolatin3"=>"iso-8859-3",
+    "iso-8859-3"=>"iso-8859-3",
+    "iso-ir-109"=>"iso-8859-3",
+    "iso8859-3"=>"iso-8859-3",
+    "iso88593"=>"iso-8859-3",
+    "iso_8859-3"=>"iso-8859-3",
+    "iso_8859-3:1988"=>"iso-8859-3",
+    "l3"=>"iso-8859-3",
+    "latin3"=>"iso-8859-3",
+    "csisolatin4"=>"iso-8859-4",
+    "iso-8859-4"=>"iso-8859-4",
+    "iso-ir-110"=>"iso-8859-4",
+    "iso8859-4"=>"iso-8859-4",
+    "iso88594"=>"iso-8859-4",
+    "iso_8859-4"=>"iso-8859-4",
+    "iso_8859-4:1988"=>"iso-8859-4",
+    "l4"=>"iso-8859-4",
+    "latin4"=>"iso-8859-4",
+    "csisolatincyrillic"=>"iso-8859-5",
+    "cyrillic"=>"iso-8859-5",
+    "iso-8859-5"=>"iso-8859-5",
+    "iso-ir-144"=>"iso-8859-5",
+    "iso8859-5"=>"iso-8859-5",
+    "iso88595"=>"iso-8859-5",
+    "iso_8859-5"=>"iso-8859-5",
+    "iso_8859-5:1988"=>"iso-8859-5",
+    "arabic"=>"iso-8859-6",
+    "asmo-708"=>"iso-8859-6",
+    "csiso88596e"=>"iso-8859-6",
+    "csiso88596i"=>"iso-8859-6",
+    "csisolatinarabic"=>"iso-8859-6",
+    "ecma-114"=>"iso-8859-6",
+    "iso-8859-6"=>"iso-8859-6",
+    "iso-8859-6-e"=>"iso-8859-6",
+    "iso-8859-6-i"=>"iso-8859-6",
+    "iso-ir-127"=>"iso-8859-6",
+    "iso8859-6"=>"iso-8859-6",
+    "iso88596"=>"iso-8859-6",
+    "iso_8859-6"=>"iso-8859-6",
+    "iso_8859-6:1987"=>"iso-8859-6",
+    "csisolatingreek"=>"iso-8859-7",
+    "ecma-118"=>"iso-8859-7",
+    "elot_928"=>"iso-8859-7",
+    "greek"=>"iso-8859-7",
+    "greek8"=>"iso-8859-7",
+    "iso-8859-7"=>"iso-8859-7",
+    "iso-ir-126"=>"iso-8859-7",
+    "iso8859-7"=>"iso-8859-7",
+    "iso88597"=>"iso-8859-7",
+    "iso_8859-7"=>"iso-8859-7",
+    "iso_8859-7:1987"=>"iso-8859-7",
+    "sun_eu_greek"=>"iso-8859-7",
+    "csiso88598e"=>"iso-8859-8",
+    "csisolatinhebrew"=>"iso-8859-8",
+    "hebrew"=>"iso-8859-8",
+    "iso-8859-8"=>"iso-8859-8",
+    "iso-8859-8-e"=>"iso-8859-8",
+    "iso-ir-138"=>"iso-8859-8",
+    "iso8859-8"=>"iso-8859-8",
+    "iso88598"=>"iso-8859-8",
+    "iso_8859-8"=>"iso-8859-8",
+    "iso_8859-8:1988"=>"iso-8859-8",
+    "visual"=>"iso-8859-8",
+    "csisolatin6"=>"iso-8859-10",
+    "iso-8859-10"=>"iso-8859-10",
+    "iso-ir-157"=>"iso-8859-10",
+    "iso8859-10"=>"iso-8859-10",
+    "iso885910"=>"iso-8859-10",
+    "l6"=>"iso-8859-10",
+    "latin6"=>"iso-8859-10",
+    "iso-8859-13"=>"iso-8859-13",
+    "iso8859-13"=>"iso-8859-13",
+    "iso885913"=>"iso-8859-13",
+    "iso-8859-14"=>"iso-8859-14",
+    "iso8859-14"=>"iso-8859-14",
+    "iso885914"=>"iso-8859-14",
+    "csisolatin9"=>"iso-8859-15",
+    "iso-8859-15"=>"iso-8859-15",
+    "iso8859-15"=>"iso-8859-15",
+    "iso885915"=>"iso-8859-15",
+    "iso_8859-15"=>"iso-8859-15",
+    "l9"=>"iso-8859-15",
+    "iso-8859-16"=>"iso-8859-16",
+    "cskoi8r"=>"koi8-r",
+    "koi"=>"koi8-r",
+    "koi8"=>"koi8-r",
+    "koi8-r"=>"koi8-r",
+    "koi8_r"=>"koi8-r",
+    "koi8-ru"=>"koi8-u",
+    "koi8-u"=>"koi8-u",
+    "dos-874"=>"windows-874",
+    "iso-8859-11"=>"windows-874",
+    "iso8859-11"=>"windows-874",
+    "iso885911"=>"windows-874",
+    "tis-620"=>"windows-874",
+    "windows-874"=>"windows-874",
+    "cp1250"=>"windows-1250",
+    "windows-1250"=>"windows-1250",
+    "x-cp1250"=>"windows-1250",
+    "cp1251"=>"windows-1251",
+    "windows-1251"=>"windows-1251",
+    "x-cp1251"=>"windows-1251",
+    "ansi_x3.4-1968"=>"windows-1252",
+    "ascii"=>"windows-1252",
+    "cp1252"=>"windows-1252",
+    "cp819"=>"windows-1252",
+    "csisolatin1"=>"windows-1252",
+    "ibm819"=>"windows-1252",
+    "iso-8859-1"=>"windows-1252",
+    "iso-ir-100"=>"windows-1252",
+    "iso8859-1"=>"windows-1252",
+    "iso88591"=>"windows-1252",
+    "iso_8859-1"=>"windows-1252",
+    "iso_8859-1:1987"=>"windows-1252",
+    "l1"=>"windows-1252",
+    "latin1"=>"windows-1252",
+    "us-ascii"=>"windows-1252",
+    "windows-1252"=>"windows-1252",
+    "x-cp1252"=>"windows-1252",
+    "cp1253"=>"windows-1253",
+    "windows-1253"=>"windows-1253",
+    "x-cp1253"=>"windows-1253",
+    "cp1254"=>"windows-1254",
+    "csisolatin5"=>"windows-1254",
+    "iso-8859-9"=>"windows-1254",
+    "iso-ir-148"=>"windows-1254",
+    "iso8859-9"=>"windows-1254",
+    "iso88599"=>"windows-1254",
+    "iso_8859-9"=>"windows-1254",
+    "iso_8859-9:1989"=>"windows-1254",
+    "l5"=>"windows-1254",
+    "latin5"=>"windows-1254",
+    "windows-1254"=>"windows-1254",
+    "x-cp1254"=>"windows-1254",
+    "cp1255"=>"windows-1255",
+    "windows-1255"=>"windows-1255",
+    "x-cp1255"=>"windows-1255",
+    "cp1256"=>"windows-1256",
+    "windows-1256"=>"windows-1256",
+    "x-cp1256"=>"windows-1256",
+    "cp1257"=>"windows-1257",
+    "windows-1257"=>"windows-1257",
+    "x-cp1257"=>"windows-1257",
+    "cp1258"=>"windows-1258",
+    "windows-1258"=>"windows-1258",
+    "x-cp1258"=>"windows-1258",
+    "x-mac-cyrillic"=>"macCyrillic",
+    "x-mac-ukrainian"=>"macCyrillic",
+    "chinese"=>"gbk",
+    "csgb2312"=>"gbk",
+    "csiso58gb231280"=>"gbk",
+    "gb2312"=>"gbk",
+    "gb_2312"=>"gbk",
+    "gb_2312-80"=>"gbk",
+    "gbk"=>"gbk",
+    "iso-ir-58"=>"gbk",
+    "x-gbk"=>"gbk",
+    "gb18030"=>"gb18030",
+    "big5"=>"big5",
+    "big5-hkscs"=>"big5",
+    "cn-big5"=>"big5",
+    "csbig5"=>"big5",
+    "x-x-big5"=>"big5",
+    "cseucpkdfmtjapanese"=>"cp51932",
+    "euc-jp"=>"cp51932",
+    "x-euc-jp"=>"cp51932",
+    "csiso2022jp"=>"cp50221",
+    "iso-2022-jp"=>"cp50221",
+    "csshiftjis"=>"Windows-31J",
+    "ms932"=>"Windows-31J",
+    "ms_kanji"=>"Windows-31J",
+    "shift-jis"=>"Windows-31J",
+    "shift_jis"=>"Windows-31J",
+    "sjis"=>"Windows-31J",
+    "windows-31j"=>"Windows-31J",
+    "x-sjis"=>"Windows-31J",
+    "cseuckr"=>"euc-kr",
+    "csksc56011987"=>"euc-kr",
+    "euc-kr"=>"euc-kr",
+    "iso-ir-149"=>"euc-kr",
+    "korean"=>"euc-kr",
+    "ks_c_5601-1987"=>"euc-kr",
+    "ks_c_5601-1989"=>"euc-kr",
+    "ksc5601"=>"euc-kr",
+    "ksc_5601"=>"euc-kr",
+    "windows-949"=>"euc-kr",
+    "utf-16be"=>"utf-16be",
+    "utf-16"=>"utf-16le",
+    "utf-16le"=>"utf-16le",
+  } # :nodoc:
+  Ractor.make_shareable(WEB_ENCODINGS_) if defined?(Ractor)
+
+  # :nodoc:
+  # return encoding or nil
+  # http://encoding.spec.whatwg.org/#concept-encoding-get
+  def self.get_encoding(label)
+    Encoding.find(WEB_ENCODINGS_[label.to_str.strip.downcase]) rescue nil
+  end
+end # module Gem::URI
+
+module Gem
+
+  #
+  # Returns a \Gem::URI object derived from the given +uri+,
+  # which may be a \Gem::URI string or an existing \Gem::URI object:
+  #
+  #   # Returns a new Gem::URI.
+  #   uri = Gem::URI('http://github.com/ruby/ruby')
+  #   # => #<Gem::URI::HTTP http://github.com/ruby/ruby>
+  #   # Returns the given Gem::URI.
+  #   Gem::URI(uri)
+  #   # => #<Gem::URI::HTTP http://github.com/ruby/ruby>
+  #
+  def URI(uri)
+    if uri.is_a?(Gem::URI::Generic)
+      uri
+    elsif uri = String.try_convert(uri)
+      Gem::URI.parse(uri)
+    else
+      raise ArgumentError,
+        "bad argument (expected Gem::URI object or Gem::URI string)"
+    end
+  end
+  module_function :URI
+end
diff --git a/lib/rubygems/vendor/uri/lib/uri/file.rb b/lib/rubygems/vendor/uri/lib/uri/file.rb
new file mode 100644
index 00000000000000..768755fc2d5b6e
--- /dev/null
+++ b/lib/rubygems/vendor/uri/lib/uri/file.rb
@@ -0,0 +1,100 @@
+# frozen_string_literal: true
+
+require_relative 'generic'
+
+module Gem::URI
+
+  #
+  # The "file" Gem::URI is defined by RFC8089.
+  #
+  class File < Generic
+    # A Default port of nil for Gem::URI::File.
+    DEFAULT_PORT = nil
+
+    #
+    # An Array of the available components for Gem::URI::File.
+    #
+    COMPONENT = [
+      :scheme,
+      :host,
+      :path
+    ].freeze
+
+    #
+    # == Description
+    #
+    # Creates a new Gem::URI::File object from components, with syntax checking.
+    #
+    # The components accepted are +host+ and +path+.
+    #
+    # The components should be provided either as an Array, or as a Hash
+    # with keys formed by preceding the component names with a colon.
+    #
+    # If an Array is used, the components must be passed in the
+    # order <code>[host, path]</code>.
+    #
+    # A path from e.g. the File class should be escaped before
+    # being passed.
+    #
+    # Examples:
+    #
+    #     require 'rubygems/vendor/uri/lib/uri'
+    #
+    #     uri1 = Gem::URI::File.build(['host.example.com', '/path/file.zip'])
+    #     uri1.to_s  # => "file://host.example.com/path/file.zip"
+    #
+    #     uri2 = Gem::URI::File.build({:host => 'host.example.com',
+    #       :path => '/ruby/src'})
+    #     uri2.to_s  # => "file://host.example.com/ruby/src"
+    #
+    #     uri3 = Gem::URI::File.build({:path => Gem::URI::escape('/path/my file.txt')})
+    #     uri3.to_s  # => "file:///path/my%20file.txt"
+    #
+    def self.build(args)
+      tmp = Util::make_components_hash(self, args)
+      super(tmp)
+    end
+
+    # Protected setter for the host component +v+.
+    #
+    # See also Gem::URI::Generic.host=.
+    #
+    def set_host(v)
+      v = "" if v.nil? || v == "localhost"
+      @host = v
+    end
+
+    # do nothing
+    def set_port(v)
+    end
+
+    # raise InvalidURIError
+    def check_userinfo(user)
+      raise Gem::URI::InvalidURIError, "cannot set userinfo for file Gem::URI"
+    end
+
+    # raise InvalidURIError
+    def check_user(user)
+      raise Gem::URI::InvalidURIError, "cannot set user for file Gem::URI"
+    end
+
+    # raise InvalidURIError
+    def check_password(user)
+      raise Gem::URI::InvalidURIError, "cannot set password for file Gem::URI"
+    end
+
+    # do nothing
+    def set_userinfo(v)
+    end
+
+    # do nothing
+    def set_user(v)
+    end
+
+    # do nothing
+    def set_password(v)
+    end
+  end
+
+  register_scheme 'FILE', File
+end
diff --git a/lib/rubygems/vendor/uri/lib/uri/ftp.rb b/lib/rubygems/vendor/uri/lib/uri/ftp.rb
new file mode 100644
index 00000000000000..7517813029f4e3
--- /dev/null
+++ b/lib/rubygems/vendor/uri/lib/uri/ftp.rb
@@ -0,0 +1,267 @@
+# frozen_string_literal: false
+# = uri/ftp.rb
+#
+# Author:: Akira Yamada <akira@ruby-lang.org>
+# License:: You can redistribute it and/or modify it under the same term as Ruby.
+#
+# See Gem::URI for general documentation
+#
+
+require_relative 'generic'
+
+module Gem::URI
+
+  #
+  # FTP Gem::URI syntax is defined by RFC1738 section 3.2.
+  #
+  # This class will be redesigned because of difference of implementations;
+  # the structure of its path. draft-hoffman-ftp-uri-04 is a draft but it
+  # is a good summary about the de facto spec.
+  # https://datatracker.ietf.org/doc/html/draft-hoffman-ftp-uri-04
+  #
+  class FTP < Generic
+    # A Default port of 21 for Gem::URI::FTP.
+    DEFAULT_PORT = 21
+
+    #
+    # An Array of the available components for Gem::URI::FTP.
+    #
+    COMPONENT = [
+      :scheme,
+      :userinfo, :host, :port,
+      :path, :typecode
+    ].freeze
+
+    #
+    # Typecode is "a", "i", or "d".
+    #
+    # * "a" indicates a text file (the FTP command was ASCII)
+    # * "i" indicates a binary file (FTP command IMAGE)
+    # * "d" indicates the contents of a directory should be displayed
+    #
+    TYPECODE = ['a', 'i', 'd'].freeze
+
+    # Typecode prefix ";type=".
+    TYPECODE_PREFIX = ';type='.freeze
+
+    def self.new2(user, password, host, port, path,
+                  typecode = nil, arg_check = true) # :nodoc:
+      # Do not use this method!  Not tested.  [Bug #7301]
+      # This methods remains just for compatibility,
+      # Keep it undocumented until the active maintainer is assigned.
+      typecode = nil if typecode.size == 0
+      if typecode && !TYPECODE.include?(typecode)
+        raise ArgumentError,
+          "bad typecode is specified: #{typecode}"
+      end
+
+      # do escape
+
+      self.new('ftp',
+               [user, password],
+               host, port, nil,
+               typecode ? path + TYPECODE_PREFIX + typecode : path,
+               nil, nil, nil, arg_check)
+    end
+
+    #
+    # == Description
+    #
+    # Creates a new Gem::URI::FTP object from components, with syntax checking.
+    #
+    # The components accepted are +userinfo+, +host+, +port+, +path+, and
+    # +typecode+.
+    #
+    # The components should be provided either as an Array, or as a Hash
+    # with keys formed by preceding the component names with a colon.
+    #
+    # If an Array is used, the components must be passed in the
+    # order <code>[userinfo, host, port, path, typecode]</code>.
+    #
+    # If the path supplied is absolute, it will be escaped in order to
+    # make it absolute in the Gem::URI.
+    #
+    # Examples:
+    #
+    #     require 'rubygems/vendor/uri/lib/uri'
+    #
+    #     uri1 = Gem::URI::FTP.build(['user:password', 'ftp.example.com', nil,
+    #       '/path/file.zip', 'i'])
+    #     uri1.to_s  # => "ftp://user:password@ftp.example.com/%2Fpath/file.zip;type=i"
+    #
+    #     uri2 = Gem::URI::FTP.build({:host => 'ftp.example.com',
+    #       :path => 'ruby/src'})
+    #     uri2.to_s  # => "ftp://ftp.example.com/ruby/src"
+    #
+    def self.build(args)
+
+      # Fix the incoming path to be generic URL syntax
+      # FTP path  ->  URL path
+      # foo/bar       /foo/bar
+      # /foo/bar      /%2Ffoo/bar
+      #
+      if args.kind_of?(Array)
+        args[3] = '/' + args[3].sub(/^\//, '%2F')
+      else
+        args[:path] = '/' + args[:path].sub(/^\//, '%2F')
+      end
+
+      tmp = Util::make_components_hash(self, args)
+
+      if tmp[:typecode]
+        if tmp[:typecode].size == 1
+          tmp[:typecode] = TYPECODE_PREFIX + tmp[:typecode]
+        end
+        tmp[:path] << tmp[:typecode]
+      end
+
+      return super(tmp)
+    end
+
+    #
+    # == Description
+    #
+    # Creates a new Gem::URI::FTP object from generic URL components with no
+    # syntax checking.
+    #
+    # Unlike build(), this method does not escape the path component as
+    # required by RFC1738; instead it is treated as per RFC2396.
+    #
+    # Arguments are +scheme+, +userinfo+, +host+, +port+, +registry+, +path+,
+    # +opaque+, +query+, and +fragment+, in that order.
+    #
+    def initialize(scheme,
+                   userinfo, host, port, registry,
+                   path, opaque,
+                   query,
+                   fragment,
+                   parser = nil,
+                   arg_check = false)
+      raise InvalidURIError unless path
+      path = path.sub(/^\//,'')
+      path.sub!(/^%2F/,'/')
+      super(scheme, userinfo, host, port, registry, path, opaque,
+            query, fragment, parser, arg_check)
+      @typecode = nil
+      if tmp = @path.index(TYPECODE_PREFIX)
+        typecode = @path[tmp + TYPECODE_PREFIX.size..-1]
+        @path = @path[0..tmp - 1]
+
+        if arg_check
+          self.typecode = typecode
+        else
+          self.set_typecode(typecode)
+        end
+      end
+    end
+
+    # typecode accessor.
+    #
+    # See Gem::URI::FTP::COMPONENT.
+    attr_reader :typecode
+
+    # Validates typecode +v+,
+    # returns +true+ or +false+.
+    #
+    def check_typecode(v)
+      if TYPECODE.include?(v)
+        return true
+      else
+        raise InvalidComponentError,
+          "bad typecode(expected #{TYPECODE.join(', ')}): #{v}"
+      end
+    end
+    private :check_typecode
+
+    # Private setter for the typecode +v+.
+    #
+    # See also Gem::URI::FTP.typecode=.
+    #
+    def set_typecode(v)
+      @typecode = v
+    end
+    protected :set_typecode
+
+    #
+    # == Args
+    #
+    # +v+::
+    #    String
+    #
+    # == Description
+    #
+    # Public setter for the typecode +v+
+    # (with validation).
+    #
+    # See also Gem::URI::FTP.check_typecode.
+    #
+    # == Usage
+    #
+    #   require 'rubygems/vendor/uri/lib/uri'
+    #
+    #   uri = Gem::URI.parse("ftp://john@ftp.example.com/my_file.img")
+    #   #=> #<Gem::URI::FTP ftp://john@ftp.example.com/my_file.img>
+    #   uri.typecode = "i"
+    #   uri
+    #   #=> #<Gem::URI::FTP ftp://john@ftp.example.com/my_file.img;type=i>
+    #
+    def typecode=(typecode)
+      check_typecode(typecode)
+      set_typecode(typecode)
+      typecode
+    end
+
+    def merge(oth) # :nodoc:
+      tmp = super(oth)
+      if self != tmp
+        tmp.set_typecode(oth.typecode)
+      end
+
+      return tmp
+    end
+
+    # Returns the path from an FTP Gem::URI.
+    #
+    # RFC 1738 specifically states that the path for an FTP Gem::URI does not
+    # include the / which separates the Gem::URI path from the Gem::URI host. Example:
+    #
+    # <code>ftp://ftp.example.com/pub/ruby</code>
+    #
+    # The above Gem::URI indicates that the client should connect to
+    # ftp.example.com then cd to pub/ruby from the initial login directory.
+    #
+    # If you want to cd to an absolute directory, you must include an
+    # escaped / (%2F) in the path. Example:
+    #
+    # <code>ftp://ftp.example.com/%2Fpub/ruby</code>
+    #
+    # This method will then return "/pub/ruby".
+    #
+    def path
+      return @path.sub(/^\//,'').sub(/^%2F/,'/')
+    end
+
+    # Private setter for the path of the Gem::URI::FTP.
+    def set_path(v)
+      super("/" + v.sub(/^\//, "%2F"))
+    end
+    protected :set_path
+
+    # Returns a String representation of the Gem::URI::FTP.
+    def to_s
+      save_path = nil
+      if @typecode
+        save_path = @path
+        @path = @path + TYPECODE_PREFIX + @typecode
+      end
+      str = super
+      if @typecode
+        @path = save_path
+      end
+
+      return str
+    end
+  end
+
+  register_scheme 'FTP', FTP
+end
diff --git a/lib/rubygems/vendor/uri/lib/uri/generic.rb b/lib/rubygems/vendor/uri/lib/uri/generic.rb
new file mode 100644
index 00000000000000..2eabe2b4e338db
--- /dev/null
+++ b/lib/rubygems/vendor/uri/lib/uri/generic.rb
@@ -0,0 +1,1579 @@
+# frozen_string_literal: true
+
+# = uri/generic.rb
+#
+# Author:: Akira Yamada <akira@ruby-lang.org>
+# License:: You can redistribute it and/or modify it under the same term as Ruby.
+#
+# See Gem::URI for general documentation
+#
+
+require_relative 'common'
+autoload :IPSocket, 'socket'
+autoload :IPAddr, 'ipaddr'
+
+module Gem::URI
+
+  #
+  # Base class for all Gem::URI classes.
+  # Implements generic Gem::URI syntax as per RFC 2396.
+  #
+  class Generic
+    include Gem::URI
+
+    #
+    # A Default port of nil for Gem::URI::Generic.
+    #
+    DEFAULT_PORT = nil
+
+    #
+    # Returns default port.
+    #
+    def self.default_port
+      self::DEFAULT_PORT
+    end
+
+    #
+    # Returns default port.
+    #
+    def default_port
+      self.class.default_port
+    end
+
+    #
+    # An Array of the available components for Gem::URI::Generic.
+    #
+    COMPONENT = [
+      :scheme,
+      :userinfo, :host, :port, :registry,
+      :path, :opaque,
+      :query,
+      :fragment
+    ].freeze
+
+    #
+    # Components of the Gem::URI in the order.
+    #
+    def self.component
+      self::COMPONENT
+    end
+
+    USE_REGISTRY = false # :nodoc:
+
+    def self.use_registry # :nodoc:
+      self::USE_REGISTRY
+    end
+
+    #
+    # == Synopsis
+    #
+    # See ::new.
+    #
+    # == Description
+    #
+    # At first, tries to create a new Gem::URI::Generic instance using
+    # Gem::URI::Generic::build. But, if exception Gem::URI::InvalidComponentError is raised,
+    # then it does Gem::URI::Escape.escape all Gem::URI components and tries again.
+    #
+    def self.build2(args)
+      begin
+        return self.build(args)
+      rescue InvalidComponentError
+        if args.kind_of?(Array)
+          return self.build(args.collect{|x|
+            if x.is_a?(String)
+              Gem::URI::RFC2396_PARSER.escape(x)
+            else
+              x
+            end
+          })
+        elsif args.kind_of?(Hash)
+          tmp = {}
+          args.each do |key, value|
+            tmp[key] = if value
+                Gem::URI::RFC2396_PARSER.escape(value)
+              else
+                value
+              end
+          end
+          return self.build(tmp)
+        end
+      end
+    end
+
+    #
+    # == Synopsis
+    #
+    # See ::new.
+    #
+    # == Description
+    #
+    # Creates a new Gem::URI::Generic instance from components of Gem::URI::Generic
+    # with check.  Components are: scheme, userinfo, host, port, registry, path,
+    # opaque, query, and fragment. You can provide arguments either by an Array or a Hash.
+    # See ::new for hash keys to use or for order of array items.
+    #
+    def self.build(args)
+      if args.kind_of?(Array) &&
+          args.size == ::Gem::URI::Generic::COMPONENT.size
+        tmp = args.dup
+      elsif args.kind_of?(Hash)
+        tmp = ::Gem::URI::Generic::COMPONENT.collect do |c|
+          if args.include?(c)
+            args[c]
+          else
+            nil
+          end
+        end
+      else
+        component = self.class.component rescue ::Gem::URI::Generic::COMPONENT
+        raise ArgumentError,
+        "expected Array of or Hash of components of #{self.class} (#{component.join(', ')})"
+      end
+
+      tmp << nil
+      tmp << true
+      return self.new(*tmp)
+    end
+
+    #
+    # == Args
+    #
+    # +scheme+::
+    #   Protocol scheme, i.e. 'http','ftp','mailto' and so on.
+    # +userinfo+::
+    #   User name and password, i.e. 'sdmitry:bla'.
+    # +host+::
+    #   Server host name.
+    # +port+::
+    #   Server port.
+    # +registry+::
+    #   Registry of naming authorities.
+    # +path+::
+    #   Path on server.
+    # +opaque+::
+    #   Opaque part.
+    # +query+::
+    #   Query data.
+    # +fragment+::
+    #   Part of the Gem::URI after '#' character.
+    # +parser+::
+    #   Parser for internal use [Gem::URI::DEFAULT_PARSER by default].
+    # +arg_check+::
+    #   Check arguments [false by default].
+    #
+    # == Description
+    #
+    # Creates a new Gem::URI::Generic instance from ``generic'' components without check.
+    #
+    def initialize(scheme,
+                   userinfo, host, port, registry,
+                   path, opaque,
+                   query,
+                   fragment,
+                   parser = DEFAULT_PARSER,
+                   arg_check = false)
+      @scheme = nil
+      @user = nil
+      @password = nil
+      @host = nil
+      @port = nil
+      @path = nil
+      @query = nil
+      @opaque = nil
+      @fragment = nil
+      @parser = parser == DEFAULT_PARSER ? nil : parser
+
+      if arg_check
+        self.scheme = scheme
+        self.userinfo = userinfo
+        self.hostname = host
+        self.port = port
+        self.path = path
+        self.query = query
+        self.opaque = opaque
+        self.fragment = fragment
+      else
+        self.set_scheme(scheme)
+        self.set_userinfo(userinfo)
+        self.set_host(host)
+        self.set_port(port)
+        self.set_path(path)
+        self.query = query
+        self.set_opaque(opaque)
+        self.fragment=(fragment)
+      end
+      if registry
+        raise InvalidURIError,
+          "the scheme #{@scheme} does not accept registry part: #{registry} (or bad hostname?)"
+      end
+
+      @scheme&.freeze
+      self.set_path('') if !@path && !@opaque # (see RFC2396 Section 5.2)
+      self.set_port(self.default_port) if self.default_port && !@port
+    end
+
+    #
+    # Returns the scheme component of the Gem::URI.
+    #
+    #   Gem::URI("http://foo/bar/baz").scheme #=> "http"
+    #
+    attr_reader :scheme
+
+    # Returns the host component of the Gem::URI.
+    #
+    #   Gem::URI("http://foo/bar/baz").host #=> "foo"
+    #
+    # It returns nil if no host component exists.
+    #
+    #   Gem::URI("mailto:foo@example.org").host #=> nil
+    #
+    # The component does not contain the port number.
+    #
+    #   Gem::URI("http://foo:8080/bar/baz").host #=> "foo"
+    #
+    # Since IPv6 addresses are wrapped with brackets in URIs,
+    # this method returns IPv6 addresses wrapped with brackets.
+    # This form is not appropriate to pass to socket methods such as TCPSocket.open.
+    # If unwrapped host names are required, use the #hostname method.
+    #
+    #   Gem::URI("http://[::1]/bar/baz").host     #=> "[::1]"
+    #   Gem::URI("http://[::1]/bar/baz").hostname #=> "::1"
+    #
+    attr_reader :host
+
+    # Returns the port component of the Gem::URI.
+    #
+    #   Gem::URI("http://foo/bar/baz").port      #=> 80
+    #   Gem::URI("http://foo:8080/bar/baz").port #=> 8080
+    #
+    attr_reader :port
+
+    def registry # :nodoc:
+      nil
+    end
+
+    # Returns the path component of the Gem::URI.
+    #
+    #   Gem::URI("http://foo/bar/baz").path #=> "/bar/baz"
+    #
+    attr_reader :path
+
+    # Returns the query component of the Gem::URI.
+    #
+    #   Gem::URI("http://foo/bar/baz?search=FooBar").query #=> "search=FooBar"
+    #
+    attr_reader :query
+
+    # Returns the opaque part of the Gem::URI.
+    #
+    #   Gem::URI("mailto:foo@example.org").opaque #=> "foo@example.org"
+    #   Gem::URI("http://foo/bar/baz").opaque     #=> nil
+    #
+    # The portion of the path that does not make use of the slash '/'.
+    # The path typically refers to an absolute path or an opaque part.
+    # (See RFC2396 Section 3 and 5.2.)
+    #
+    attr_reader :opaque
+
+    # Returns the fragment component of the Gem::URI.
+    #
+    #   Gem::URI("http://foo/bar/baz?search=FooBar#ponies").fragment #=> "ponies"
+    #
+    attr_reader :fragment
+
+    # Returns the parser to be used.
+    #
+    # Unless a Gem::URI::Parser is defined, DEFAULT_PARSER is used.
+    #
+    def parser
+      if !defined?(@parser) || !@parser
+        DEFAULT_PARSER
+      else
+        @parser || DEFAULT_PARSER
+      end
+    end
+
+    # Replaces self by other Gem::URI object.
+    #
+    def replace!(oth)
+      if self.class != oth.class
+        raise ArgumentError, "expected #{self.class} object"
+      end
+
+      component.each do |c|
+        self.__send__("#{c}=", oth.__send__(c))
+      end
+    end
+    private :replace!
+
+    #
+    # Components of the Gem::URI in the order.
+    #
+    def component
+      self.class.component
+    end
+
+    #
+    # Checks the scheme +v+ component against the Gem::URI::Parser Regexp for :SCHEME.
+    #
+    def check_scheme(v)
+      if v && parser.regexp[:SCHEME] !~ v
+        raise InvalidComponentError,
+          "bad component(expected scheme component): #{v}"
+      end
+
+      return true
+    end
+    private :check_scheme
+
+    # Protected setter for the scheme component +v+.
+    #
+    # See also Gem::URI::Generic.scheme=.
+    #
+    def set_scheme(v)
+      @scheme = v&.downcase
+    end
+    protected :set_scheme
+
+    #
+    # == Args
+    #
+    # +v+::
+    #    String
+    #
+    # == Description
+    #
+    # Public setter for the scheme component +v+
+    # (with validation).
+    #
+    # See also Gem::URI::Generic.check_scheme.
+    #
+    # == Usage
+    #
+    #   require 'rubygems/vendor/uri/lib/uri'
+    #
+    #   uri = Gem::URI.parse("http://my.example.com")
+    #   uri.scheme = "https"
+    #   uri.to_s  #=> "https://my.example.com"
+    #
+    def scheme=(v)
+      check_scheme(v)
+      set_scheme(v)
+      v
+    end
+
+    #
+    # Checks the +user+ and +password+.
+    #
+    # If +password+ is not provided, then +user+ is
+    # split, using Gem::URI::Generic.split_userinfo, to
+    # pull +user+ and +password.
+    #
+    # See also Gem::URI::Generic.check_user, Gem::URI::Generic.check_password.
+    #
+    def check_userinfo(user, password = nil)
+      if !password
+        user, password = split_userinfo(user)
+      end
+      check_user(user)
+      check_password(password, user)
+
+      return true
+    end
+    private :check_userinfo
+
+    #
+    # Checks the user +v+ component for RFC2396 compliance
+    # and against the Gem::URI::Parser Regexp for :USERINFO.
+    #
+    # Can not have a registry or opaque component defined,
+    # with a user component defined.
+    #
+    def check_user(v)
+      if @opaque
+        raise InvalidURIError,
+          "cannot set user with opaque"
+      end
+
+      return v unless v
+
+      if parser.regexp[:USERINFO] !~ v
+        raise InvalidComponentError,
+          "bad component(expected userinfo component or user component): #{v}"
+      end
+
+      return true
+    end
+    private :check_user
+
+    #
+    # Checks the password +v+ component for RFC2396 compliance
+    # and against the Gem::URI::Parser Regexp for :USERINFO.
+    #
+    # Can not have a registry or opaque component defined,
+    # with a user component defined.
+    #
+    def check_password(v, user = @user)
+      if @opaque
+        raise InvalidURIError,
+          "cannot set password with opaque"
+      end
+      return v unless v
+
+      if !user
+        raise InvalidURIError,
+          "password component depends user component"
+      end
+
+      if parser.regexp[:USERINFO] !~ v
+        raise InvalidComponentError,
+          "bad password component"
+      end
+
+      return true
+    end
+    private :check_password
+
+    #
+    # Sets userinfo, argument is string like 'name:pass'.
+    #
+    def userinfo=(userinfo)
+      if userinfo.nil?
+        return nil
+      end
+      check_userinfo(*userinfo)
+      set_userinfo(*userinfo)
+      # returns userinfo
+    end
+
+    #
+    # == Args
+    #
+    # +v+::
+    #    String
+    #
+    # == Description
+    #
+    # Public setter for the +user+ component
+    # (with validation).
+    #
+    # See also Gem::URI::Generic.check_user.
+    #
+    # == Usage
+    #
+    #   require 'rubygems/vendor/uri/lib/uri'
+    #
+    #   uri = Gem::URI.parse("http://john:S3nsit1ve@my.example.com")
+    #   uri.user = "sam"
+    #   uri.to_s  #=> "http://sam:V3ry_S3nsit1ve@my.example.com"
+    #
+    def user=(user)
+      check_user(user)
+      set_user(user)
+      # returns user
+    end
+
+    #
+    # == Args
+    #
+    # +v+::
+    #    String
+    #
+    # == Description
+    #
+    # Public setter for the +password+ component
+    # (with validation).
+    #
+    # See also Gem::URI::Generic.check_password.
+    #
+    # == Usage
+    #
+    #   require 'rubygems/vendor/uri/lib/uri'
+    #
+    #   uri = Gem::URI.parse("http://john:S3nsit1ve@my.example.com")
+    #   uri.password = "V3ry_S3nsit1ve"
+    #   uri.to_s  #=> "http://john:V3ry_S3nsit1ve@my.example.com"
+    #
+    def password=(password)
+      check_password(password)
+      set_password(password)
+      # returns password
+    end
+
+    # Protected setter for the +user+ component, and +password+ if available
+    # (with validation).
+    #
+    # See also Gem::URI::Generic.userinfo=.
+    #
+    def set_userinfo(user, password = nil)
+      unless password
+        user, password = split_userinfo(user)
+      end
+      @user     = user
+      @password = password if password
+
+      [@user, @password]
+    end
+    protected :set_userinfo
+
+    # Protected setter for the user component +v+.
+    #
+    # See also Gem::URI::Generic.user=.
+    #
+    def set_user(v)
+      set_userinfo(v, @password)
+      v
+    end
+    protected :set_user
+
+    # Protected setter for the password component +v+.
+    #
+    # See also Gem::URI::Generic.password=.
+    #
+    def set_password(v)
+      @password = v
+      # returns v
+    end
+    protected :set_password
+
+    # Returns the userinfo +ui+ as <code>[user, password]</code>
+    # if properly formatted as 'user:password'.
+    def split_userinfo(ui)
+      return nil, nil unless ui
+      user, password = ui.split(':', 2)
+
+      return user, password
+    end
+    private :split_userinfo
+
+    # Escapes 'user:password' +v+ based on RFC 1738 section 3.1.
+    def escape_userpass(v)
+      parser.escape(v, /[@:\/]/o) # RFC 1738 section 3.1 #/
+    end
+    private :escape_userpass
+
+    # Returns the userinfo, either as 'user' or 'user:password'.
+    def userinfo
+      if @user.nil?
+        nil
+      elsif @password.nil?
+        @user
+      else
+        @user + ':' + @password
+      end
+    end
+
+    # Returns the user component (without Gem::URI decoding).
+    def user
+      @user
+    end
+
+    # Returns the password component (without Gem::URI decoding).
+    def password
+      @password
+    end
+
+    # Returns the user component after Gem::URI decoding.
+    def decoded_user
+      Gem::URI.decode_uri_component(@user) if @user
+    end
+
+    # Returns the password component after Gem::URI decoding.
+    def decoded_password
+      Gem::URI.decode_uri_component(@password) if @password
+    end
+
+    #
+    # Checks the host +v+ component for RFC2396 compliance
+    # and against the Gem::URI::Parser Regexp for :HOST.
+    #
+    # Can not have a registry or opaque component defined,
+    # with a host component defined.
+    #
+    def check_host(v)
+      return v unless v
+
+      if @opaque
+        raise InvalidURIError,
+          "cannot set host with registry or opaque"
+      elsif parser.regexp[:HOST] !~ v
+        raise InvalidComponentError,
+          "bad component(expected host component): #{v}"
+      end
+
+      return true
+    end
+    private :check_host
+
+    # Protected setter for the host component +v+.
+    #
+    # See also Gem::URI::Generic.host=.
+    #
+    def set_host(v)
+      @host = v
+    end
+    protected :set_host
+
+    #
+    # == Args
+    #
+    # +v+::
+    #    String
+    #
+    # == Description
+    #
+    # Public setter for the host component +v+
+    # (with validation).
+    #
+    # See also Gem::URI::Generic.check_host.
+    #
+    # == Usage
+    #
+    #   require 'rubygems/vendor/uri/lib/uri'
+    #
+    #   uri = Gem::URI.parse("http://my.example.com")
+    #   uri.host = "foo.com"
+    #   uri.to_s  #=> "http://foo.com"
+    #
+    def host=(v)
+      check_host(v)
+      set_host(v)
+      v
+    end
+
+    # Extract the host part of the Gem::URI and unwrap brackets for IPv6 addresses.
+    #
+    # This method is the same as Gem::URI::Generic#host except
+    # brackets for IPv6 (and future IP) addresses are removed.
+    #
+    #   uri = Gem::URI("http://[::1]/bar")
+    #   uri.hostname      #=> "::1"
+    #   uri.host          #=> "[::1]"
+    #
+    def hostname
+      v = self.host
+      v&.start_with?('[') && v.end_with?(']') ? v[1..-2] : v
+    end
+
+    # Sets the host part of the Gem::URI as the argument with brackets for IPv6 addresses.
+    #
+    # This method is the same as Gem::URI::Generic#host= except
+    # the argument can be a bare IPv6 address.
+    #
+    #   uri = Gem::URI("http://foo/bar")
+    #   uri.hostname = "::1"
+    #   uri.to_s  #=> "http://[::1]/bar"
+    #
+    # If the argument seems to be an IPv6 address,
+    # it is wrapped with brackets.
+    #
+    def hostname=(v)
+      v = "[#{v}]" if !(v&.start_with?('[') && v&.end_with?(']')) && v&.index(':')
+      self.host = v
+    end
+
+    #
+    # Checks the port +v+ component for RFC2396 compliance
+    # and against the Gem::URI::Parser Regexp for :PORT.
+    #
+    # Can not have a registry or opaque component defined,
+    # with a port component defined.
+    #
+    def check_port(v)
+      return v unless v
+
+      if @opaque
+        raise InvalidURIError,
+          "cannot set port with registry or opaque"
+      elsif !v.kind_of?(Integer) && parser.regexp[:PORT] !~ v
+        raise InvalidComponentError,
+          "bad component(expected port component): #{v.inspect}"
+      end
+
+      return true
+    end
+    private :check_port
+
+    # Protected setter for the port component +v+.
+    #
+    # See also Gem::URI::Generic.port=.
+    #
+    def set_port(v)
+      v = v.empty? ? nil : v.to_i unless !v || v.kind_of?(Integer)
+      @port = v
+    end
+    protected :set_port
+
+    #
+    # == Args
+    #
+    # +v+::
+    #    String
+    #
+    # == Description
+    #
+    # Public setter for the port component +v+
+    # (with validation).
+    #
+    # See also Gem::URI::Generic.check_port.
+    #
+    # == Usage
+    #
+    #   require 'rubygems/vendor/uri/lib/uri'
+    #
+    #   uri = Gem::URI.parse("http://my.example.com")
+    #   uri.port = 8080
+    #   uri.to_s  #=> "http://my.example.com:8080"
+    #
+    def port=(v)
+      check_port(v)
+      set_port(v)
+      port
+    end
+
+    def check_registry(v) # :nodoc:
+      raise InvalidURIError, "cannot set registry"
+    end
+    private :check_registry
+
+    def set_registry(v) # :nodoc:
+      raise InvalidURIError, "cannot set registry"
+    end
+    protected :set_registry
+
+    def registry=(v) # :nodoc:
+      raise InvalidURIError, "cannot set registry"
+    end
+
+    #
+    # Checks the path +v+ component for RFC2396 compliance
+    # and against the Gem::URI::Parser Regexp
+    # for :ABS_PATH and :REL_PATH.
+    #
+    # Can not have a opaque component defined,
+    # with a path component defined.
+    #
+    def check_path(v)
+      # raise if both hier and opaque are not nil, because:
+      # absoluteURI   = scheme ":" ( hier_part | opaque_part )
+      # hier_part     = ( net_path | abs_path ) [ "?" query ]
+      if v && @opaque
+        raise InvalidURIError,
+          "path conflicts with opaque"
+      end
+
+      # If scheme is ftp, path may be relative.
+      # See RFC 1738 section 3.2.2, and RFC 2396.
+      if @scheme && @scheme != "ftp"
+        if v && v != '' && parser.regexp[:ABS_PATH] !~ v
+          raise InvalidComponentError,
+            "bad component(expected absolute path component): #{v}"
+        end
+      else
+        if v && v != '' && parser.regexp[:ABS_PATH] !~ v &&
+           parser.regexp[:REL_PATH] !~ v
+          raise InvalidComponentError,
+            "bad component(expected relative path component): #{v}"
+        end
+      end
+
+      return true
+    end
+    private :check_path
+
+    # Protected setter for the path component +v+.
+    #
+    # See also Gem::URI::Generic.path=.
+    #
+    def set_path(v)
+      @path = v
+    end
+    protected :set_path
+
+    #
+    # == Args
+    #
+    # +v+::
+    #    String
+    #
+    # == Description
+    #
+    # Public setter for the path component +v+
+    # (with validation).
+    #
+    # See also Gem::URI::Generic.check_path.
+    #
+    # == Usage
+    #
+    #   require 'rubygems/vendor/uri/lib/uri'
+    #
+    #   uri = Gem::URI.parse("http://my.example.com/pub/files")
+    #   uri.path = "/faq/"
+    #   uri.to_s  #=> "http://my.example.com/faq/"
+    #
+    def path=(v)
+      check_path(v)
+      set_path(v)
+      v
+    end
+
+    #
+    # == Args
+    #
+    # +v+::
+    #    String
+    #
+    # == Description
+    #
+    # Public setter for the query component +v+.
+    #
+    # == Usage
+    #
+    #   require 'rubygems/vendor/uri/lib/uri'
+    #
+    #   uri = Gem::URI.parse("http://my.example.com/?id=25")
+    #   uri.query = "id=1"
+    #   uri.to_s  #=> "http://my.example.com/?id=1"
+    #
+    def query=(v)
+      return @query = nil unless v
+      raise InvalidURIError, "query conflicts with opaque" if @opaque
+
+      x = v.to_str
+      v = x.dup if x.equal? v
+      v.encode!(Encoding::UTF_8) rescue nil
+      v.delete!("\t\r\n")
+      v.force_encoding(Encoding::ASCII_8BIT)
+      raise InvalidURIError, "invalid percent escape: #{$1}" if /(%\H\H)/n.match(v)
+      v.gsub!(/(?!%\h\h|[!$-&(-;=?-_a-~])./n.freeze){'%%%02X' % $&.ord}
+      v.force_encoding(Encoding::US_ASCII)
+      @query = v
+    end
+
+    #
+    # Checks the opaque +v+ component for RFC2396 compliance and
+    # against the Gem::URI::Parser Regexp for :OPAQUE.
+    #
+    # Can not have a host, port, user, or path component defined,
+    # with an opaque component defined.
+    #
+    def check_opaque(v)
+      return v unless v
+
+      # raise if both hier and opaque are not nil, because:
+      # absoluteURI   = scheme ":" ( hier_part | opaque_part )
+      # hier_part     = ( net_path | abs_path ) [ "?" query ]
+      if @host || @port || @user || @path  # userinfo = @user + ':' + @password
+        raise InvalidURIError,
+          "cannot set opaque with host, port, userinfo or path"
+      elsif v && parser.regexp[:OPAQUE] !~ v
+        raise InvalidComponentError,
+          "bad component(expected opaque component): #{v}"
+      end
+
+      return true
+    end
+    private :check_opaque
+
+    # Protected setter for the opaque component +v+.
+    #
+    # See also Gem::URI::Generic.opaque=.
+    #
+    def set_opaque(v)
+      @opaque = v
+    end
+    protected :set_opaque
+
+    #
+    # == Args
+    #
+    # +v+::
+    #    String
+    #
+    # == Description
+    #
+    # Public setter for the opaque component +v+
+    # (with validation).
+    #
+    # See also Gem::URI::Generic.check_opaque.
+    #
+    def opaque=(v)
+      check_opaque(v)
+      set_opaque(v)
+      v
+    end
+
+    #
+    # Checks the fragment +v+ component against the Gem::URI::Parser Regexp for :FRAGMENT.
+    #
+    #
+    # == Args
+    #
+    # +v+::
+    #    String
+    #
+    # == Description
+    #
+    # Public setter for the fragment component +v+
+    # (with validation).
+    #
+    # == Usage
+    #
+    #   require 'rubygems/vendor/uri/lib/uri'
+    #
+    #   uri = Gem::URI.parse("http://my.example.com/?id=25#time=1305212049")
+    #   uri.fragment = "time=1305212086"
+    #   uri.to_s  #=> "http://my.example.com/?id=25#time=1305212086"
+    #
+    def fragment=(v)
+      return @fragment = nil unless v
+
+      x = v.to_str
+      v = x.dup if x.equal? v
+      v.encode!(Encoding::UTF_8) rescue nil
+      v.delete!("\t\r\n")
+      v.force_encoding(Encoding::ASCII_8BIT)
+      v.gsub!(/(?!%\h\h|[!-~])./n){'%%%02X' % $&.ord}
+      v.force_encoding(Encoding::US_ASCII)
+      @fragment = v
+    end
+
+    #
+    # Returns true if Gem::URI is hierarchical.
+    #
+    # == Description
+    #
+    # Gem::URI has components listed in order of decreasing significance from left to right,
+    # see RFC3986 https://www.rfc-editor.org/rfc/rfc3986 1.2.3.
+    #
+    # == Usage
+    #
+    #   require 'rubygems/vendor/uri/lib/uri'
+    #
+    #   uri = Gem::URI.parse("http://my.example.com/")
+    #   uri.hierarchical?
+    #   #=> true
+    #   uri = Gem::URI.parse("mailto:joe@example.com")
+    #   uri.hierarchical?
+    #   #=> false
+    #
+    def hierarchical?
+      if @path
+        true
+      else
+        false
+      end
+    end
+
+    #
+    # Returns true if Gem::URI has a scheme (e.g. http:// or https://) specified.
+    #
+    def absolute?
+      if @scheme
+        true
+      else
+        false
+      end
+    end
+    alias absolute absolute?
+
+    #
+    # Returns true if Gem::URI does not have a scheme (e.g. http:// or https://) specified.
+    #
+    def relative?
+      !absolute?
+    end
+
+    #
+    # Returns an Array of the path split on '/'.
+    #
+    def split_path(path)
+      path.split("/", -1)
+    end
+    private :split_path
+
+    #
+    # Merges a base path +base+, with relative path +rel+,
+    # returns a modified base path.
+    #
+    def merge_path(base, rel)
+
+      # RFC2396, Section 5.2, 5)
+      # RFC2396, Section 5.2, 6)
+      base_path = split_path(base)
+      rel_path  = split_path(rel)
+
+      # RFC2396, Section 5.2, 6), a)
+      base_path << '' if base_path.last == '..'
+      while i = base_path.index('..')
+        base_path.slice!(i - 1, 2)
+      end
+
+      if (first = rel_path.first) and first.empty?
+        base_path.clear
+        rel_path.shift
+      end
+
+      # RFC2396, Section 5.2, 6), c)
+      # RFC2396, Section 5.2, 6), d)
+      rel_path.push('') if rel_path.last == '.' || rel_path.last == '..'
+      rel_path.delete('.')
+
+      # RFC2396, Section 5.2, 6), e)
+      tmp = []
+      rel_path.each do |x|
+        if x == '..' &&
+            !(tmp.empty? || tmp.last == '..')
+          tmp.pop
+        else
+          tmp << x
+        end
+      end
+
+      add_trailer_slash = !tmp.empty?
+      if base_path.empty?
+        base_path = [''] # keep '/' for root directory
+      elsif add_trailer_slash
+        base_path.pop
+      end
+      while x = tmp.shift
+        if x == '..'
+          # RFC2396, Section 4
+          # a .. or . in an absolute path has no special meaning
+          base_path.pop if base_path.size > 1
+        else
+          # if x == '..'
+          #   valid absolute (but abnormal) path "/../..."
+          # else
+          #   valid absolute path
+          # end
+          base_path << x
+          tmp.each {|t| base_path << t}
+          add_trailer_slash = false
+          break
+        end
+      end
+      base_path.push('') if add_trailer_slash
+
+      return base_path.join('/')
+    end
+    private :merge_path
+
+    #
+    # == Args
+    #
+    # +oth+::
+    #    Gem::URI or String
+    #
+    # == Description
+    #
+    # Destructive form of #merge.
+    #
+    # == Usage
+    #
+    #   require 'rubygems/vendor/uri/lib/uri'
+    #
+    #   uri = Gem::URI.parse("http://my.example.com")
+    #   uri.merge!("/main.rbx?page=1")
+    #   uri.to_s  # => "http://my.example.com/main.rbx?page=1"
+    #
+    def merge!(oth)
+      t = merge(oth)
+      if self == t
+        nil
+      else
+        replace!(t)
+        self
+      end
+    end
+
+    #
+    # == Args
+    #
+    # +oth+::
+    #    Gem::URI or String
+    #
+    # == Description
+    #
+    # Merges two URIs.
+    #
+    # == Usage
+    #
+    #   require 'rubygems/vendor/uri/lib/uri'
+    #
+    #   uri = Gem::URI.parse("http://my.example.com")
+    #   uri.merge("/main.rbx?page=1")
+    #   # => "http://my.example.com/main.rbx?page=1"
+    #
+    def merge(oth)
+      rel = parser.__send__(:convert_to_uri, oth)
+
+      if rel.absolute?
+        #raise BadURIError, "both Gem::URI are absolute" if absolute?
+        # hmm... should return oth for usability?
+        return rel
+      end
+
+      unless self.absolute?
+        raise BadURIError, "both Gem::URI are relative"
+      end
+
+      base = self.dup
+
+      authority = rel.userinfo || rel.host || rel.port
+
+      # RFC2396, Section 5.2, 2)
+      if (rel.path.nil? || rel.path.empty?) && !authority && !rel.query
+        base.fragment=(rel.fragment) if rel.fragment
+        return base
+      end
+
+      base.query = nil
+      base.fragment=(nil)
+
+      # RFC2396, Section 5.2, 4)
+      if authority
+        base.set_userinfo(rel.userinfo)
+        base.set_host(rel.host)
+        base.set_port(rel.port || base.default_port)
+        base.set_path(rel.path)
+      elsif base.path && rel.path
+        base.set_path(merge_path(base.path, rel.path))
+      end
+
+      # RFC2396, Section 5.2, 7)
+      base.query = rel.query       if rel.query
+      base.fragment=(rel.fragment) if rel.fragment
+
+      return base
+    end # merge
+    alias + merge
+
+    # :stopdoc:
+    def route_from_path(src, dst)
+      case dst
+      when src
+        # RFC2396, Section 4.2
+        return ''
+      when %r{(?:\A|/)\.\.?(?:/|\z)}
+        # dst has abnormal absolute path,
+        # like "/./", "/../", "/x/../", ...
+        return dst.dup
+      end
+
+      src_path = src.scan(%r{[^/]*/})
+      dst_path = dst.scan(%r{[^/]*/?})
+
+      # discard same parts
+      while !dst_path.empty? && dst_path.first == src_path.first
+        src_path.shift
+        dst_path.shift
+      end
+
+      tmp = dst_path.join
+
+      # calculate
+      if src_path.empty?
+        if tmp.empty?
+          return './'
+        elsif dst_path.first.include?(':') # (see RFC2396 Section 5)
+          return './' + tmp
+        else
+          return tmp
+        end
+      end
+
+      return '../' * src_path.size + tmp
+    end
+    private :route_from_path
+    # :startdoc:
+
+    # :stopdoc:
+    def route_from0(oth)
+      oth = parser.__send__(:convert_to_uri, oth)
+      if self.relative?
+        raise BadURIError,
+          "relative Gem::URI: #{self}"
+      end
+      if oth.relative?
+        raise BadURIError,
+          "relative Gem::URI: #{oth}"
+      end
+
+      if self.scheme != oth.scheme
+        return self, self.dup
+      end
+      rel = Gem::URI::Generic.new(nil, # it is relative Gem::URI
+                             self.userinfo, self.host, self.port,
+                             nil, self.path, self.opaque,
+                             self.query, self.fragment, parser)
+
+      if rel.userinfo != oth.userinfo ||
+          rel.host.to_s.downcase != oth.host.to_s.downcase ||
+          rel.port != oth.port
+
+        if self.userinfo.nil? && self.host.nil?
+          return self, self.dup
+        end
+
+        rel.set_port(nil) if rel.port == oth.default_port
+        return rel, rel
+      end
+      rel.set_userinfo(nil)
+      rel.set_host(nil)
+      rel.set_port(nil)
+
+      if rel.path && rel.path == oth.path
+        rel.set_path('')
+        rel.query = nil if rel.query == oth.query
+        return rel, rel
+      elsif rel.opaque && rel.opaque == oth.opaque
+        rel.set_opaque('')
+        rel.query = nil if rel.query == oth.query
+        return rel, rel
+      end
+
+      # you can modify `rel', but cannot `oth'.
+      return oth, rel
+    end
+    private :route_from0
+    # :startdoc:
+
+    #
+    # == Args
+    #
+    # +oth+::
+    #    Gem::URI or String
+    #
+    # == Description
+    #
+    # Calculates relative path from oth to self.
+    #
+    # == Usage
+    #
+    #   require 'rubygems/vendor/uri/lib/uri'
+    #
+    #   uri = Gem::URI.parse('http://my.example.com/main.rbx?page=1')
+    #   uri.route_from('http://my.example.com')
+    #   #=> #<Gem::URI::Generic /main.rbx?page=1>
+    #
+    def route_from(oth)
+      # you can modify `rel', but cannot `oth'.
+      begin
+        oth, rel = route_from0(oth)
+      rescue
+        raise $!.class, $!.message
+      end
+      if oth == rel
+        return rel
+      end
+
+      rel.set_path(route_from_path(oth.path, self.path))
+      if rel.path == './' && self.query
+        # "./?foo" -> "?foo"
+        rel.set_path('')
+      end
+
+      return rel
+    end
+
+    alias - route_from
+
+    #
+    # == Args
+    #
+    # +oth+::
+    #    Gem::URI or String
+    #
+    # == Description
+    #
+    # Calculates relative path to oth from self.
+    #
+    # == Usage
+    #
+    #   require 'rubygems/vendor/uri/lib/uri'
+    #
+    #   uri = Gem::URI.parse('http://my.example.com')
+    #   uri.route_to('http://my.example.com/main.rbx?page=1')
+    #   #=> #<Gem::URI::Generic /main.rbx?page=1>
+    #
+    def route_to(oth)
+      parser.__send__(:convert_to_uri, oth).route_from(self)
+    end
+
+    #
+    # Returns normalized Gem::URI.
+    #
+    #   require 'rubygems/vendor/uri/lib/uri'
+    #
+    #   Gem::URI("HTTP://my.EXAMPLE.com").normalize
+    #   #=> #<Gem::URI::HTTP http://my.example.com/>
+    #
+    # Normalization here means:
+    #
+    # * scheme and host are converted to lowercase,
+    # * an empty path component is set to "/".
+    #
+    def normalize
+      uri = dup
+      uri.normalize!
+      uri
+    end
+
+    #
+    # Destructive version of #normalize.
+    #
+    def normalize!
+      if path&.empty?
+        set_path('/')
+      end
+      if scheme && scheme != scheme.downcase
+        set_scheme(self.scheme.downcase)
+      end
+      if host && host != host.downcase
+        set_host(self.host.downcase)
+      end
+    end
+
+    #
+    # Constructs String from Gem::URI.
+    #
+    def to_s
+      str = ''.dup
+      if @scheme
+        str << @scheme
+        str << ':'
+      end
+
+      if @opaque
+        str << @opaque
+      else
+        if @host || %w[file postgres].include?(@scheme)
+          str << '//'
+        end
+        if self.userinfo
+          str << self.userinfo
+          str << '@'
+        end
+        if @host
+          str << @host
+        end
+        if @port && @port != self.default_port
+          str << ':'
+          str << @port.to_s
+        end
+        if (@host || @port) && !@path.empty? && !@path.start_with?('/')
+          str << '/'
+        end
+        str << @path
+        if @query
+          str << '?'
+          str << @query
+        end
+      end
+      if @fragment
+        str << '#'
+        str << @fragment
+      end
+      str
+    end
+    alias to_str to_s
+
+    #
+    # Compares two URIs.
+    #
+    def ==(oth)
+      if self.class == oth.class
+        self.normalize.component_ary == oth.normalize.component_ary
+      else
+        false
+      end
+    end
+
+    # Returns the hash value.
+    def hash
+      self.component_ary.hash
+    end
+
+    # Compares with _oth_ for Hash.
+    def eql?(oth)
+      self.class == oth.class &&
+      parser == oth.parser &&
+      self.component_ary.eql?(oth.component_ary)
+    end
+
+    # Returns an Array of the components defined from the COMPONENT Array.
+    def component_ary
+      component.collect do |x|
+        self.__send__(x)
+      end
+    end
+    protected :component_ary
+
+    # == Args
+    #
+    # +components+::
+    #    Multiple Symbol arguments defined in Gem::URI::HTTP.
+    #
+    # == Description
+    #
+    # Selects specified components from Gem::URI.
+    #
+    # == Usage
+    #
+    #   require 'rubygems/vendor/uri/lib/uri'
+    #
+    #   uri = Gem::URI.parse('http://myuser:mypass@my.example.com/test.rbx')
+    #   uri.select(:userinfo, :host, :path)
+    #   # => ["myuser:mypass", "my.example.com", "/test.rbx"]
+    #
+    def select(*components)
+      components.collect do |c|
+        if component.include?(c)
+          self.__send__(c)
+        else
+          raise ArgumentError,
+            "expected of components of #{self.class} (#{self.class.component.join(', ')})"
+        end
+      end
+    end
+
+    def inspect # :nodoc:
+      "#<#{self.class} #{self}>"
+    end
+
+    #
+    # == Args
+    #
+    # +v+::
+    #    Gem::URI or String
+    #
+    # == Description
+    #
+    # Attempts to parse other Gem::URI +oth+,
+    # returns [parsed_oth, self].
+    #
+    # == Usage
+    #
+    #   require 'rubygems/vendor/uri/lib/uri'
+    #
+    #   uri = Gem::URI.parse("http://my.example.com")
+    #   uri.coerce("http://foo.com")
+    #   #=> [#<Gem::URI::HTTP http://foo.com>, #<Gem::URI::HTTP http://my.example.com>]
+    #
+    def coerce(oth)
+      case oth
+      when String
+        oth = parser.parse(oth)
+      else
+        super
+      end
+
+      return oth, self
+    end
+
+    # Returns a proxy Gem::URI.
+    # The proxy Gem::URI is obtained from environment variables such as http_proxy,
+    # ftp_proxy, no_proxy, etc.
+    # If there is no proper proxy, nil is returned.
+    #
+    # If the optional parameter +env+ is specified, it is used instead of ENV.
+    #
+    # Note that capitalized variables (HTTP_PROXY, FTP_PROXY, NO_PROXY, etc.)
+    # are examined, too.
+    #
+    # But http_proxy and HTTP_PROXY is treated specially under CGI environment.
+    # It's because HTTP_PROXY may be set by Proxy: header.
+    # So HTTP_PROXY is not used.
+    # http_proxy is not used too if the variable is case insensitive.
+    # CGI_HTTP_PROXY can be used instead.
+    def find_proxy(env=ENV)
+      raise BadURIError, "relative Gem::URI: #{self}" if self.relative?
+      name = self.scheme.downcase + '_proxy'
+      proxy_uri = nil
+      if name == 'http_proxy' && env.include?('REQUEST_METHOD') # CGI?
+        # HTTP_PROXY conflicts with *_proxy for proxy settings and
+        # HTTP_* for header information in CGI.
+        # So it should be careful to use it.
+        pairs = env.reject {|k, v| /\Ahttp_proxy\z/i !~ k }
+        case pairs.length
+        when 0 # no proxy setting anyway.
+          proxy_uri = nil
+        when 1
+          k, _ = pairs.shift
+          if k == 'http_proxy' && env[k.upcase] == nil
+            # http_proxy is safe to use because ENV is case sensitive.
+            proxy_uri = env[name]
+          else
+            proxy_uri = nil
+          end
+        else # http_proxy is safe to use because ENV is case sensitive.
+          proxy_uri = env.to_hash[name]
+        end
+        if !proxy_uri
+          # Use CGI_HTTP_PROXY.  cf. libwww-perl.
+          proxy_uri = env["CGI_#{name.upcase}"]
+        end
+      elsif name == 'http_proxy'
+        if RUBY_ENGINE == 'jruby' && p_addr = ENV_JAVA['http.proxyHost']
+          p_port = ENV_JAVA['http.proxyPort']
+          if p_user = ENV_JAVA['http.proxyUser']
+            p_pass = ENV_JAVA['http.proxyPass']
+            proxy_uri = "http://#{p_user}:#{p_pass}@#{p_addr}:#{p_port}"
+          else
+            proxy_uri = "http://#{p_addr}:#{p_port}"
+          end
+        else
+          unless proxy_uri = env[name]
+            if proxy_uri = env[name.upcase]
+              warn 'The environment variable HTTP_PROXY is discouraged.  Use http_proxy.', uplevel: 1
+            end
+          end
+        end
+      else
+        proxy_uri = env[name] || env[name.upcase]
+      end
+
+      if proxy_uri.nil? || proxy_uri.empty?
+        return nil
+      end
+
+      if self.hostname
+        begin
+          addr = IPSocket.getaddress(self.hostname)
+          return nil if /\A127\.|\A::1\z/ =~ addr
+        rescue SocketError
+        end
+      end
+
+      name = 'no_proxy'
+      if no_proxy = env[name] || env[name.upcase]
+        return nil unless Gem::URI::Generic.use_proxy?(self.hostname, addr, self.port, no_proxy)
+      end
+      Gem::URI.parse(proxy_uri)
+    end
+
+    def self.use_proxy?(hostname, addr, port, no_proxy) # :nodoc:
+      hostname = hostname.downcase
+      dothostname = ".#{hostname}"
+      no_proxy.scan(/([^:,\s]+)(?::(\d+))?/) {|p_host, p_port|
+        if !p_port || port == p_port.to_i
+          if p_host.start_with?('.')
+            return false if hostname.end_with?(p_host.downcase)
+          else
+            return false if dothostname.end_with?(".#{p_host.downcase}")
+          end
+          if addr
+            begin
+              return false if IPAddr.new(p_host).include?(addr)
+            rescue IPAddr::InvalidAddressError
+              next
+            end
+          end
+        end
+      }
+      true
+    end
+  end
+end
diff --git a/lib/rubygems/vendor/uri/lib/uri/http.rb b/lib/rubygems/vendor/uri/lib/uri/http.rb
new file mode 100644
index 00000000000000..658e9941dd75ec
--- /dev/null
+++ b/lib/rubygems/vendor/uri/lib/uri/http.rb
@@ -0,0 +1,125 @@
+# frozen_string_literal: false
+# = uri/http.rb
+#
+# Author:: Akira Yamada <akira@ruby-lang.org>
+# License:: You can redistribute it and/or modify it under the same term as Ruby.
+#
+# See Gem::URI for general documentation
+#
+
+require_relative 'generic'
+
+module Gem::URI
+
+  #
+  # The syntax of HTTP URIs is defined in RFC1738 section 3.3.
+  #
+  # Note that the Ruby Gem::URI library allows HTTP URLs containing usernames and
+  # passwords. This is not legal as per the RFC, but used to be
+  # supported in Internet Explorer 5 and 6, before the MS04-004 security
+  # update. See <URL:http://support.microsoft.com/kb/834489>.
+  #
+  class HTTP < Generic
+    # A Default port of 80 for Gem::URI::HTTP.
+    DEFAULT_PORT = 80
+
+    # An Array of the available components for Gem::URI::HTTP.
+    COMPONENT = %i[
+      scheme
+      userinfo host port
+      path
+      query
+      fragment
+    ].freeze
+
+    #
+    # == Description
+    #
+    # Creates a new Gem::URI::HTTP object from components, with syntax checking.
+    #
+    # The components accepted are userinfo, host, port, path, query, and
+    # fragment.
+    #
+    # The components should be provided either as an Array, or as a Hash
+    # with keys formed by preceding the component names with a colon.
+    #
+    # If an Array is used, the components must be passed in the
+    # order <code>[userinfo, host, port, path, query, fragment]</code>.
+    #
+    # Example:
+    #
+    #     uri = Gem::URI::HTTP.build(host: 'www.example.com', path: '/foo/bar')
+    #
+    #     uri = Gem::URI::HTTP.build([nil, "www.example.com", nil, "/path",
+    #       "query", 'fragment'])
+    #
+    # Currently, if passed userinfo components this method generates
+    # invalid HTTP URIs as per RFC 1738.
+    #
+    def self.build(args)
+      tmp = Util.make_components_hash(self, args)
+      super(tmp)
+    end
+
+    #
+    # == Description
+    #
+    # Returns the full path for an HTTP request, as required by Net::HTTP::Get.
+    #
+    # If the Gem::URI contains a query, the full path is Gem::URI#path + '?' + Gem::URI#query.
+    # Otherwise, the path is simply Gem::URI#path.
+    #
+    # Example:
+    #
+    #     uri = Gem::URI::HTTP.build(path: '/foo/bar', query: 'test=true')
+    #     uri.request_uri #  => "/foo/bar?test=true"
+    #
+    def request_uri
+      return unless @path
+
+      url = @query ? "#@path?#@query" : @path.dup
+      url.start_with?(?/.freeze) ? url : ?/ + url
+    end
+
+    #
+    # == Description
+    #
+    # Returns the authority for an HTTP uri, as defined in
+    # https://www.rfc-editor.org/rfc/rfc3986#section-3.2.
+    #
+    #
+    # Example:
+    #
+    #     Gem::URI::HTTP.build(host: 'www.example.com', path: '/foo/bar').authority #=> "www.example.com"
+    #     Gem::URI::HTTP.build(host: 'www.example.com', port: 8000, path: '/foo/bar').authority #=> "www.example.com:8000"
+    #     Gem::URI::HTTP.build(host: 'www.example.com', port: 80, path: '/foo/bar').authority #=> "www.example.com"
+    #
+    def authority
+      if port == default_port
+        host
+      else
+        "#{host}:#{port}"
+      end
+    end
+
+    #
+    # == Description
+    #
+    # Returns the origin for an HTTP uri, as defined in
+    # https://www.rfc-editor.org/rfc/rfc6454.
+    #
+    #
+    # Example:
+    #
+    #     Gem::URI::HTTP.build(host: 'www.example.com', path: '/foo/bar').origin #=> "http://www.example.com"
+    #     Gem::URI::HTTP.build(host: 'www.example.com', port: 8000, path: '/foo/bar').origin #=> "http://www.example.com:8000"
+    #     Gem::URI::HTTP.build(host: 'www.example.com', port: 80, path: '/foo/bar').origin #=> "http://www.example.com"
+    #     Gem::URI::HTTPS.build(host: 'www.example.com', path: '/foo/bar').origin #=> "https://www.example.com"
+    #
+    def origin
+      "#{scheme}://#{authority}"
+    end
+  end
+
+  register_scheme 'HTTP', HTTP
+end
diff --git a/lib/rubygems/vendor/uri/lib/uri/https.rb b/lib/rubygems/vendor/uri/lib/uri/https.rb
new file mode 100644
index 00000000000000..6e8e732e1d2a49
--- /dev/null
+++ b/lib/rubygems/vendor/uri/lib/uri/https.rb
@@ -0,0 +1,23 @@
+# frozen_string_literal: false
+# = uri/https.rb
+#
+# Author:: Akira Yamada <akira@ruby-lang.org>
+# License:: You can redistribute it and/or modify it under the same term as Ruby.
+#
+# See Gem::URI for general documentation
+#
+
+require_relative 'http'
+
+module Gem::URI
+
+  # The default port for HTTPS URIs is 443, and the scheme is 'https:' rather
+  # than 'http:'. Other than that, HTTPS URIs are identical to HTTP URIs;
+  # see Gem::URI::HTTP.
+  class HTTPS < HTTP
+    # A Default port of 443 for Gem::URI::HTTPS
+    DEFAULT_PORT = 443
+  end
+
+  register_scheme 'HTTPS', HTTPS
+end
diff --git a/lib/rubygems/vendor/uri/lib/uri/ldap.rb b/lib/rubygems/vendor/uri/lib/uri/ldap.rb
new file mode 100644
index 00000000000000..1a08b5ab7ee8e6
--- /dev/null
+++ b/lib/rubygems/vendor/uri/lib/uri/ldap.rb
@@ -0,0 +1,261 @@
+# frozen_string_literal: false
+# = uri/ldap.rb
+#
+# Author::
+#  Takaaki Tateishi <ttate@jaist.ac.jp>
+#  Akira Yamada <akira@ruby-lang.org>
+# License::
+#   Gem::URI::LDAP is copyrighted free software by Takaaki Tateishi and Akira Yamada.
+#   You can redistribute it and/or modify it under the same term as Ruby.
+#
+# See Gem::URI for general documentation
+#
+
+require_relative 'generic'
+
+module Gem::URI
+
+  #
+  # LDAP Gem::URI SCHEMA (described in RFC2255).
+  #--
+  # ldap://<host>/<dn>[?<attrs>[?<scope>[?<filter>[?<extensions>]]]]
+  #++
+  class LDAP < Generic
+
+    # A Default port of 389 for Gem::URI::LDAP.
+    DEFAULT_PORT = 389
+
+    # An Array of the available components for Gem::URI::LDAP.
+    COMPONENT = [
+      :scheme,
+      :host, :port,
+      :dn,
+      :attributes,
+      :scope,
+      :filter,
+      :extensions,
+    ].freeze
+
+    # Scopes available for the starting point.
+    #
+    # * SCOPE_BASE - the Base DN
+    # * SCOPE_ONE  - one level under the Base DN, not including the base DN and
+    #   not including any entries under this
+    # * SCOPE_SUB  - subtrees, all entries at all levels
+    #
+    SCOPE = [
+      SCOPE_ONE = 'one',
+      SCOPE_SUB = 'sub',
+      SCOPE_BASE = 'base',
+    ].freeze
+
+    #
+    # == Description
+    #
+    # Creates a new Gem::URI::LDAP object from components, with syntax checking.
+    #
+    # The components accepted are host, port, dn, attributes,
+    # scope, filter, and extensions.
+    #
+    # The components should be provided either as an Array, or as a Hash
+    # with keys formed by preceding the component names with a colon.
+    #
+    # If an Array is used, the components must be passed in the
+    # order <code>[host, port, dn, attributes, scope, filter, extensions]</code>.
+    #
+    # Example:
+    #
+    #     uri = Gem::URI::LDAP.build({:host => 'ldap.example.com',
+    #       :dn => '/dc=example'})
+    #
+    #     uri = Gem::URI::LDAP.build(["ldap.example.com", nil,
+    #       "/dc=example;dc=com", "query", nil, nil, nil])
+    #
+    def self.build(args)
+      tmp = Util::make_components_hash(self, args)
+
+      if tmp[:dn]
+        tmp[:path] = tmp[:dn]
+      end
+
+      query = []
+      [:extensions, :filter, :scope, :attributes].collect do |x|
+        next if !tmp[x] && query.size == 0
+        query.unshift(tmp[x])
+      end
+
+      tmp[:query] = query.join('?')
+
+      return super(tmp)
+    end
+
+    #
+    # == Description
+    #
+    # Creates a new Gem::URI::LDAP object from generic Gem::URI components as per
+    # RFC 2396. No LDAP-specific syntax checking is performed.
+    #
+    # Arguments are +scheme+, +userinfo+, +host+, +port+, +registry+, +path+,
+    # +opaque+, +query+, and +fragment+, in that order.
+    #
+    # Example:
+    #
+    #     uri = Gem::URI::LDAP.new("ldap", nil, "ldap.example.com", nil, nil,
+    #       "/dc=example;dc=com", nil, "query", nil)
+    #
+    # See also Gem::URI::Generic.new.
+    #
+    def initialize(*arg)
+      super(*arg)
+
+      if @fragment
+        raise InvalidURIError, 'bad LDAP URL'
+      end
+
+      parse_dn
+      parse_query
+    end
+
+    # Private method to cleanup +dn+ from using the +path+ component attribute.
+    def parse_dn
+      raise InvalidURIError, 'bad LDAP URL' unless @path
+      @dn = @path[1..-1]
+    end
+    private :parse_dn
+
+    # Private method to cleanup +attributes+, +scope+, +filter+, and +extensions+
+    # from using the +query+ component attribute.
+    def parse_query
+      @attributes = nil
+      @scope      = nil
+      @filter     = nil
+      @extensions = nil
+
+      if @query
+        attrs, scope, filter, extensions = @query.split('?')
+
+        @attributes = attrs if attrs && attrs.size > 0
+        @scope      = scope if scope && scope.size > 0
+        @filter     = filter if filter && filter.size > 0
+        @extensions = extensions if extensions && extensions.size > 0
+      end
+    end
+    private :parse_query
+
+    # Private method to assemble +query+ from +attributes+, +scope+, +filter+, and +extensions+.
+    def build_path_query
+      @path = '/' + @dn
+
+      query = []
+      [@extensions, @filter, @scope, @attributes].each do |x|
+        next if !x && query.size == 0
+        query.unshift(x)
+      end
+      @query = query.join('?')
+    end
+    private :build_path_query
+
+    # Returns dn.
+    def dn
+      @dn
+    end
+
+    # Private setter for dn +val+.
+    def set_dn(val)
+      @dn = val
+      build_path_query
+      @dn
+    end
+    protected :set_dn
+
+    # Setter for dn +val+.
+    def dn=(val)
+      set_dn(val)
+      val
+    end
+
+    # Returns attributes.
+    def attributes
+      @attributes
+    end
+
+    # Private setter for attributes +val+.
+    def set_attributes(val)
+      @attributes = val
+      build_path_query
+      @attributes
+    end
+    protected :set_attributes
+
+    # Setter for attributes +val+.
+    def attributes=(val)
+      set_attributes(val)
+      val
+    end
+
+    # Returns scope.
+    def scope
+      @scope
+    end
+
+    # Private setter for scope +val+.
+    def set_scope(val)
+      @scope = val
+      build_path_query
+      @scope
+    end
+    protected :set_scope
+
+    # Setter for scope +val+.
+    def scope=(val)
+      set_scope(val)
+      val
+    end
+
+    # Returns filter.
+    def filter
+      @filter
+    end
+
+    # Private setter for filter +val+.
+    def set_filter(val)
+      @filter = val
+      build_path_query
+      @filter
+    end
+    protected :set_filter
+
+    # Setter for filter +val+.
+    def filter=(val)
+      set_filter(val)
+      val
+    end
+
+    # Returns extensions.
+    def extensions
+      @extensions
+    end
+
+    # Private setter for extensions +val+.
+    def set_extensions(val)
+      @extensions = val
+      build_path_query
+      @extensions
+    end
+    protected :set_extensions
+
+    # Setter for extensions +val+.
+    def extensions=(val)
+      set_extensions(val)
+      val
+    end
+
+    # Checks if Gem::URI has a path.
+    # For Gem::URI::LDAP this will return +false+.
+    def hierarchical?
+      false
+    end
+  end
+
+  register_scheme 'LDAP', LDAP
+end
diff --git a/lib/rubygems/vendor/uri/lib/uri/ldaps.rb b/lib/rubygems/vendor/uri/lib/uri/ldaps.rb
new file mode 100644
index 00000000000000..b7a5b50e27198e
--- /dev/null
+++ b/lib/rubygems/vendor/uri/lib/uri/ldaps.rb
@@ -0,0 +1,22 @@
+# frozen_string_literal: false
+# = uri/ldap.rb
+#
+# License:: You can redistribute it and/or modify it under the same term as Ruby.
+#
+# See Gem::URI for general documentation
+#
+
+require_relative 'ldap'
+
+module Gem::URI
+
+  # The default port for LDAPS URIs is 636, and the scheme is 'ldaps:' rather
+  # than 'ldap:'. Other than that, LDAPS URIs are identical to LDAP URIs;
+  # see Gem::URI::LDAP.
+  class LDAPS < LDAP
+    # A Default port of 636 for Gem::URI::LDAPS
+    DEFAULT_PORT = 636
+  end
+
+  register_scheme 'LDAPS', LDAPS
+end
diff --git a/lib/rubygems/vendor/uri/lib/uri/mailto.rb b/lib/rubygems/vendor/uri/lib/uri/mailto.rb
new file mode 100644
index 00000000000000..7ae544d194f0de
--- /dev/null
+++ b/lib/rubygems/vendor/uri/lib/uri/mailto.rb
@@ -0,0 +1,293 @@
+# frozen_string_literal: false
+# = uri/mailto.rb
+#
+# Author:: Akira Yamada <akira@ruby-lang.org>
+# License:: You can redistribute it and/or modify it under the same term as Ruby.
+#
+# See Gem::URI for general documentation
+#
+
+require_relative 'generic'
+
+module Gem::URI
+
+  #
+  # RFC6068, the mailto URL scheme.
+  #
+  class MailTo < Generic
+    include RFC2396_REGEXP
+
+    # A Default port of nil for Gem::URI::MailTo.
+    DEFAULT_PORT = nil
+
+    # An Array of the available components for Gem::URI::MailTo.
+    COMPONENT = [ :scheme, :to, :headers ].freeze
+
+    # :stopdoc:
+    #  "hname" and "hvalue" are encodings of an RFC 822 header name and
+    #  value, respectively. As with "to", all URL reserved characters must
+    #  be encoded.
+    #
+    #  "#mailbox" is as specified in RFC 822 [RFC822]. This means that it
+    #  consists of zero or more comma-separated mail addresses, possibly
+    #  including "phrase" and "comment" components. Note that all URL
+    #  reserved characters in "to" must be encoded: in particular,
+    #  parentheses, commas, and the percent sign ("%"), which commonly occur
+    #  in the "mailbox" syntax.
+    #
+    #  Within mailto URLs, the characters "?", "=", "&" are reserved.
+
+    # ; RFC 6068
+    # hfields      = "?" hfield *( "&" hfield )
+    # hfield       = hfname "=" hfvalue
+    # hfname       = *qchar
+    # hfvalue      = *qchar
+    # qchar        = unreserved / pct-encoded / some-delims
+    # some-delims  = "!" / "$" / "'" / "(" / ")" / "*"
+    #              / "+" / "," / ";" / ":" / "@"
+    #
+    # ; RFC3986
+    # unreserved   = ALPHA / DIGIT / "-" / "." / "_" / "~"
+    # pct-encoded  = "%" HEXDIG HEXDIG
+    HEADER_REGEXP  = /\A(?<hfield>(?:%\h\h|[!$'-.0-;@-Z_a-z~])*=(?:%\h\h|[!$'-.0-;@-Z_a-z~])*)(?:&\g<hfield>)*\z/
+    # practical regexp for email address
+    # https://html.spec.whatwg.org/multipage/input.html#valid-e-mail-address
+    EMAIL_REGEXP = /\A[a-zA-Z0-9.!\#$%&'*+\/=?^_`{|}~-]+@[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?(?:\.[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?)*\z/
+    # :startdoc:
+
+    #
+    # == Description
+    #
+    # Creates a new Gem::URI::MailTo object from components, with syntax checking.
+    #
+    # Components can be provided as an Array or Hash. If an Array is used,
+    # the components must be supplied as <code>[to, headers]</code>.
+    #
+    # If a Hash is used, the keys are the component names preceded by colons.
+    #
+    # The headers can be supplied as a pre-encoded string, such as
+    # <code>"subject=subscribe&cc=address"</code>, or as an Array of Arrays
+    # like <code>[['subject', 'subscribe'], ['cc', 'address']]</code>.
+    #
+    # Examples:
+    #
+    #    require 'rubygems/vendor/uri/lib/uri'
+    #
+    #    m1 = Gem::URI::MailTo.build(['joe@example.com', 'subject=Ruby'])
+    #    m1.to_s  # => "mailto:joe@example.com?subject=Ruby"
+    #
+    #    m2 = Gem::URI::MailTo.build(['john@example.com', [['Subject', 'Ruby'], ['Cc', 'jack@example.com']]])
+    #    m2.to_s  # => "mailto:john@example.com?Subject=Ruby&Cc=jack@example.com"
+    #
+    #    m3 = Gem::URI::MailTo.build({:to => 'listman@example.com', :headers => [['subject', 'subscribe']]})
+    #    m3.to_s  # => "mailto:listman@example.com?subject=subscribe"
+    #
+    def self.build(args)
+      tmp = Util.make_components_hash(self, args)
+
+      case tmp[:to]
+      when Array
+        tmp[:opaque] = tmp[:to].join(',')
+      when String
+        tmp[:opaque] = tmp[:to].dup
+      else
+        tmp[:opaque] = ''
+      end
+
+      if tmp[:headers]
+        query =
+          case tmp[:headers]
+          when Array
+            tmp[:headers].collect { |x|
+              if x.kind_of?(Array)
+                x[0] + '=' + x[1..-1].join
+              else
+                x.to_s
+              end
+            }.join('&')
+          when Hash
+            tmp[:headers].collect { |h,v|
+              h + '=' + v
+            }.join('&')
+          else
+            tmp[:headers].to_s
+          end
+        unless query.empty?
+          tmp[:opaque] << '?' << query
+        end
+      end
+
+      super(tmp)
+    end
+
+    #
+    # == Description
+    #
+    # Creates a new Gem::URI::MailTo object from generic URL components with
+    # no syntax checking.
+    #
+    # This method is usually called from Gem::URI::parse, which checks
+    # the validity of each component.
+    #
+    def initialize(*arg)
+      super(*arg)
+
+      @to = nil
+      @headers = []
+
+      # The RFC3986 parser does not normally populate opaque
+      @opaque = "?#{@query}" if @query && !@opaque
+
+      unless @opaque
+        raise InvalidComponentError,
+          "missing opaque part for mailto URL"
+      end
+      to, header = @opaque.split('?', 2)
+      # allow semicolon as a addr-spec separator
+      # http://support.microsoft.com/kb/820868
+      unless /\A(?:[^@,;]+@[^@,;]+(?:\z|[,;]))*\z/ =~ to
+        raise InvalidComponentError,
+          "unrecognised opaque part for mailtoURL: #{@opaque}"
+      end
+
+      if arg[10] # arg_check
+        self.to = to
+        self.headers = header
+      else
+        set_to(to)
+        set_headers(header)
+      end
+    end
+
+    # The primary e-mail address of the URL, as a String.
+    attr_reader :to
+
+    # E-mail headers set by the URL, as an Array of Arrays.
+    attr_reader :headers
+
+    # Checks the to +v+ component.
+    def check_to(v)
+      return true unless v
+      return true if v.size == 0
+
+      v.split(/[,;]/).each do |addr|
+        # check url safety as path-rootless
+        if /\A(?:%\h\h|[!$&-.0-;=@-Z_a-z~])*\z/ !~ addr
+          raise InvalidComponentError,
+            "an address in 'to' is invalid as Gem::URI #{addr.dump}"
+        end
+
+        # check addr-spec
+        # don't s/\+/ /g
+        addr.gsub!(/%\h\h/, Gem::URI::TBLDECWWWCOMP_)
+        if EMAIL_REGEXP !~ addr
+          raise InvalidComponentError,
+            "an address in 'to' is invalid as uri-escaped addr-spec #{addr.dump}"
+        end
+      end
+
+      true
+    end
+    private :check_to
+
+    # Private setter for to +v+.
+    def set_to(v)
+      @to = v
+    end
+    protected :set_to
+
+    # Setter for to +v+.
+    def to=(v)
+      check_to(v)
+      set_to(v)
+      v
+    end
+
+    # Checks the headers +v+ component against either
+    # * HEADER_REGEXP
+    def check_headers(v)
+      return true unless v
+      return true if v.size == 0
+      if HEADER_REGEXP !~ v
+        raise InvalidComponentError,
+          "bad component(expected opaque component): #{v}"
+      end
+
+      true
+    end
+    private :check_headers
+
+    # Private setter for headers +v+.
+    def set_headers(v)
+      @headers = []
+      if v
+        v.split('&').each do |x|
+          @headers << x.split(/=/, 2)
+        end
+      end
+    end
+    protected :set_headers
+
+    # Setter for headers +v+.
+    def headers=(v)
+      check_headers(v)
+      set_headers(v)
+      v
+    end
+
+    # Constructs String from Gem::URI.
+    def to_s
+      @scheme + ':' +
+        if @to
+          @to
+        else
+          ''
+        end +
+        if @headers.size > 0
+          '?' + @headers.collect{|x| x.join('=')}.join('&')
+        else
+          ''
+        end +
+        if @fragment
+          '#' + @fragment
+        else
+          ''
+        end
+    end
+
+    # Returns the RFC822 e-mail text equivalent of the URL, as a String.
+    #
+    # Example:
+    #
+    #   require 'rubygems/vendor/uri/lib/uri'
+    #
+    #   uri = Gem::URI.parse("mailto:ruby-list@ruby-lang.org?Subject=subscribe&cc=myaddr")
+    #   uri.to_mailtext
+    #   # => "To: ruby-list@ruby-lang.org\nSubject: subscribe\nCc: myaddr\n\n\n"
+    #
+    def to_mailtext
+      to = Gem::URI.decode_www_form_component(@to)
+      head = ''
+      body = ''
+      @headers.each do |x|
+        case x[0]
+        when 'body'
+          body = Gem::URI.decode_www_form_component(x[1])
+        when 'to'
+          to << ', ' + Gem::URI.decode_www_form_component(x[1])
+        else
+          head << Gem::URI.decode_www_form_component(x[0]).capitalize + ': ' +
+            Gem::URI.decode_www_form_component(x[1])  + "\n"
+        end
+      end
+
+      "To: #{to}
+#{head}
+#{body}
+"
+    end
+    alias to_rfc822text to_mailtext
+  end
+
+  register_scheme 'MAILTO', MailTo
+end
diff --git a/lib/rubygems/vendor/uri/lib/uri/rfc2396_parser.rb b/lib/rubygems/vendor/uri/lib/uri/rfc2396_parser.rb
new file mode 100644
index 00000000000000..04a1d0c86927cf
--- /dev/null
+++ b/lib/rubygems/vendor/uri/lib/uri/rfc2396_parser.rb
@@ -0,0 +1,546 @@
+# frozen_string_literal: false
+#--
+# = uri/common.rb
+#
+# Author:: Akira Yamada <akira@ruby-lang.org>
+# License::
+#   You can redistribute it and/or modify it under the same term as Ruby.
+#
+# See Gem::URI for general documentation
+#
+
+module Gem::URI
+  #
+  # Includes Gem::URI::REGEXP::PATTERN
+  #
+  module RFC2396_REGEXP
+    #
+    # Patterns used to parse Gem::URI's
+    #
+    module PATTERN
+      # :stopdoc:
+
+      # RFC 2396 (Gem::URI Generic Syntax)
+      # RFC 2732 (IPv6 Literal Addresses in URL's)
+      # RFC 2373 (IPv6 Addressing Architecture)
+
+      # alpha         = lowalpha | upalpha
+      ALPHA = "a-zA-Z"
+      # alphanum      = alpha | digit
+      ALNUM = "#{ALPHA}\\d"
+
+      # hex           = digit | "A" | "B" | "C" | "D" | "E" | "F" |
+      #                         "a" | "b" | "c" | "d" | "e" | "f"
+      HEX     = "a-fA-F\\d"
+      # escaped       = "%" hex hex
+      ESCAPED = "%[#{HEX}]{2}"
+      # mark          = "-" | "_" | "." | "!" | "~" | "*" | "'" |
+      #                 "(" | ")"
+      # unreserved    = alphanum | mark
+      UNRESERVED = "\\-_.!~*'()#{ALNUM}"
+      # reserved      = ";" | "/" | "?" | ":" | "@" | "&" | "=" | "+" |
+      #                 "$" | ","
+      # reserved      = ";" | "/" | "?" | ":" | "@" | "&" | "=" | "+" |
+      #                 "$" | "," | "[" | "]" (RFC 2732)
+      RESERVED = ";/?:@&=+$,\\[\\]"
+
+      # domainlabel   = alphanum | alphanum *( alphanum | "-" ) alphanum
+      DOMLABEL = "(?:[#{ALNUM}](?:[-#{ALNUM}]*[#{ALNUM}])?)"
+      # toplabel      = alpha | alpha *( alphanum | "-" ) alphanum
+      TOPLABEL = "(?:[#{ALPHA}](?:[-#{ALNUM}]*[#{ALNUM}])?)"
+      # hostname      = *( domainlabel "." ) toplabel [ "." ]
+      HOSTNAME = "(?:#{DOMLABEL}\\.)*#{TOPLABEL}\\.?"
+
+      # :startdoc:
+    end # PATTERN
+
+    # :startdoc:
+  end # REGEXP
+
+  # Class that parses String's into Gem::URI's.
+  #
+  # It contains a Hash set of patterns and Regexp's that match and validate.
+  #
+  class RFC2396_Parser
+    include RFC2396_REGEXP
+
+    #
+    # == Synopsis
+    #
+    #   Gem::URI::Parser.new([opts])
+    #
+    # == Args
+    #
+    # The constructor accepts a hash as options for parser.
+    # Keys of options are pattern names of Gem::URI components
+    # and values of options are pattern strings.
+    # The constructor generates set of regexps for parsing URIs.
+    #
+    # You can use the following keys:
+    #
+    #   * :ESCAPED (Gem::URI::PATTERN::ESCAPED in default)
+    #   * :UNRESERVED (Gem::URI::PATTERN::UNRESERVED in default)
+    #   * :DOMLABEL (Gem::URI::PATTERN::DOMLABEL in default)
+    #   * :TOPLABEL (Gem::URI::PATTERN::TOPLABEL in default)
+    #   * :HOSTNAME (Gem::URI::PATTERN::HOSTNAME in default)
+    #
+    # == Examples
+    #
+    #   p = Gem::URI::Parser.new(:ESCAPED => "(?:%[a-fA-F0-9]{2}|%u[a-fA-F0-9]{4})")
+    #   u = p.parse("http://example.jp/%uABCD") #=> #<Gem::URI::HTTP http://example.jp/%uABCD>
+    #   Gem::URI.parse(u.to_s) #=> raises Gem::URI::InvalidURIError
+    #
+    #   s = "http://example.com/ABCD"
+    #   u1 = p.parse(s) #=> #<Gem::URI::HTTP http://example.com/ABCD>
+    #   u2 = Gem::URI.parse(s) #=> #<Gem::URI::HTTP http://example.com/ABCD>
+    #   u1 == u2 #=> true
+    #   u1.eql?(u2) #=> false
+    #
+    def initialize(opts = {})
+      @pattern = initialize_pattern(opts)
+      @pattern.each_value(&:freeze)
+      @pattern.freeze
+
+      @regexp = initialize_regexp(@pattern)
+      @regexp.each_value(&:freeze)
+      @regexp.freeze
+    end
+
+    # The Hash of patterns.
+    #
+    # See also Gem::URI::Parser.initialize_pattern.
+    attr_reader :pattern
+
+    # The Hash of Regexp.
+    #
+    # See also Gem::URI::Parser.initialize_regexp.
+    attr_reader :regexp
+
+    # Returns a split Gem::URI against +regexp[:ABS_URI]+.
+    def split(uri)
+      case uri
+      when ''
+        # null uri
+
+      when @regexp[:ABS_URI]
+        scheme, opaque, userinfo, host, port,
+          registry, path, query, fragment = $~[1..-1]
+
+        # Gem::URI-reference = [ absoluteURI | relativeURI ] [ "#" fragment ]
+
+        # absoluteURI   = scheme ":" ( hier_part | opaque_part )
+        # hier_part     = ( net_path | abs_path ) [ "?" query ]
+        # opaque_part   = uric_no_slash *uric
+
+        # abs_path      = "/"  path_segments
+        # net_path      = "//" authority [ abs_path ]
+
+        # authority     = server | reg_name
+        # server        = [ [ userinfo "@" ] hostport ]
+
+        if !scheme
+          raise InvalidURIError,
+            "bad Gem::URI (absolute but no scheme): #{uri}"
+        end
+        if !opaque && (!path && (!host && !registry))
+          raise InvalidURIError,
+            "bad Gem::URI (absolute but no path): #{uri}"
+        end
+
+      when @regexp[:REL_URI]
+        scheme = nil
+        opaque = nil
+
+        userinfo, host, port, registry,
+          rel_segment, abs_path, query, fragment = $~[1..-1]
+        if rel_segment && abs_path
+          path = rel_segment + abs_path
+        elsif rel_segment
+          path = rel_segment
+        elsif abs_path
+          path = abs_path
+        end
+
+        # Gem::URI-reference = [ absoluteURI | relativeURI ] [ "#" fragment ]
+
+        # relativeURI   = ( net_path | abs_path | rel_path ) [ "?" query ]
+
+        # net_path      = "//" authority [ abs_path ]
+        # abs_path      = "/"  path_segments
+        # rel_path      = rel_segment [ abs_path ]
+
+        # authority     = server | reg_name
+        # server        = [ [ userinfo "@" ] hostport ]
+
+      else
+        raise InvalidURIError, "bad Gem::URI (is not Gem::URI?): #{uri}"
+      end
+
+      path = '' if !path && !opaque # (see RFC2396 Section 5.2)
+      ret = [
+        scheme,
+        userinfo, host, port,         # X
+        registry,                     # X
+        path,                         # Y
+        opaque,                       # Y
+        query,
+        fragment
+      ]
+      return ret
+    end
+
+    #
+    # == Args
+    #
+    # +uri+::
+    #    String
+    #
+    # == Description
+    #
+    # Parses +uri+ and constructs either matching Gem::URI scheme object
+    # (File, FTP, HTTP, HTTPS, LDAP, LDAPS, or MailTo) or Gem::URI::Generic.
+    #
+    # == Usage
+    #
+    #   p = Gem::URI::Parser.new
+    #   p.parse("ldap://ldap.example.com/dc=example?user=john")
+    #   #=> #<Gem::URI::LDAP ldap://ldap.example.com/dc=example?user=john>
+    #
+    def parse(uri)
+      Gem::URI.for(*self.split(uri), self)
+    end
+
+    #
+    # == Args
+    #
+    # +uris+::
+    #    an Array of Strings
+    #
+    # == Description
+    #
+    # Attempts to parse and merge a set of URIs.
+    #
+    def join(*uris)
+      uris[0] = convert_to_uri(uris[0])
+      uris.inject :merge
+    end
+
+    #
+    # :call-seq:
+    #   extract( str )
+    #   extract( str, schemes )
+    #   extract( str, schemes ) {|item| block }
+    #
+    # == Args
+    #
+    # +str+::
+    #    String to search
+    # +schemes+::
+    #    Patterns to apply to +str+
+    #
+    # == Description
+    #
+    # Attempts to parse and merge a set of URIs.
+    # If no +block+ given, then returns the result,
+    # else it calls +block+ for each element in result.
+    #
+    # See also Gem::URI::Parser.make_regexp.
+    #
+    def extract(str, schemes = nil)
+      if block_given?
+        str.scan(make_regexp(schemes)) { yield $& }
+        nil
+      else
+        result = []
+        str.scan(make_regexp(schemes)) { result.push $& }
+        result
+      end
+    end
+
+    # Returns Regexp that is default +self.regexp[:ABS_URI_REF]+,
+    # unless +schemes+ is provided. Then it is a Regexp.union with +self.pattern[:X_ABS_URI]+.
+    def make_regexp(schemes = nil)
+      unless schemes
+        @regexp[:ABS_URI_REF]
+      else
+        /(?=#{Regexp.union(*schemes)}:)#{@pattern[:X_ABS_URI]}/x
+      end
+    end
+
+    #
+    # :call-seq:
+    #   escape( str )
+    #   escape( str, unsafe )
+    #
+    # == Args
+    #
+    # +str+::
+    #    String to make safe
+    # +unsafe+::
+    #    Regexp to apply. Defaults to +self.regexp[:UNSAFE]+
+    #
+    # == Description
+    #
+    # Constructs a safe String from +str+, removing unsafe characters,
+    # replacing them with codes.
+    #
+    def escape(str, unsafe = @regexp[:UNSAFE])
+      unless unsafe.kind_of?(Regexp)
+        # perhaps unsafe is String object
+        unsafe = Regexp.new("[#{Regexp.quote(unsafe)}]", false)
+      end
+      str.gsub(unsafe) do
+        us = $&
+        tmp = ''
+        us.each_byte do |uc|
+          tmp << sprintf('%%%02X', uc)
+        end
+        tmp
+      end.force_encoding(Encoding::US_ASCII)
+    end
+
+    #
+    # :call-seq:
+    #   unescape( str )
+    #   unescape( str, escaped )
+    #
+    # == Args
+    #
+    # +str+::
+    #    String to remove escapes from
+    # +escaped+::
+    #    Regexp to apply. Defaults to +self.regexp[:ESCAPED]+
+    #
+    # == Description
+    #
+    # Removes escapes from +str+.
+    #
+    def unescape(str, escaped = @regexp[:ESCAPED])
+      enc = str.encoding
+      enc = Encoding::UTF_8 if enc == Encoding::US_ASCII
+      str.gsub(escaped) { [$&[1, 2]].pack('H2').force_encoding(enc) }
+    end
+
+    TO_S = Kernel.instance_method(:to_s) # :nodoc:
+    if TO_S.respond_to?(:bind_call)
+      def inspect # :nodoc:
+        TO_S.bind_call(self)
+      end
+    else
+      def inspect # :nodoc:
+        TO_S.bind(self).call
+      end
+    end
+
+    private
+
+    # Constructs the default Hash of patterns.
+    def initialize_pattern(opts = {})
+      ret = {}
+      ret[:ESCAPED] = escaped = (opts.delete(:ESCAPED) || PATTERN::ESCAPED)
+      ret[:UNRESERVED] = unreserved = opts.delete(:UNRESERVED) || PATTERN::UNRESERVED
+      ret[:RESERVED] = reserved = opts.delete(:RESERVED) || PATTERN::RESERVED
+      ret[:DOMLABEL] = opts.delete(:DOMLABEL) || PATTERN::DOMLABEL
+      ret[:TOPLABEL] = opts.delete(:TOPLABEL) || PATTERN::TOPLABEL
+      ret[:HOSTNAME] = hostname = opts.delete(:HOSTNAME)
+
+      # RFC 2396 (Gem::URI Generic Syntax)
+      # RFC 2732 (IPv6 Literal Addresses in URL's)
+      # RFC 2373 (IPv6 Addressing Architecture)
+
+      # uric          = reserved | unreserved | escaped
+      ret[:URIC] = uric = "(?:[#{unreserved}#{reserved}]|#{escaped})"
+      # uric_no_slash = unreserved | escaped | ";" | "?" | ":" | "@" |
+      #                 "&" | "=" | "+" | "$" | ","
+      ret[:URIC_NO_SLASH] = uric_no_slash = "(?:[#{unreserved};?:@&=+$,]|#{escaped})"
+      # query         = *uric
+      ret[:QUERY] = query = "#{uric}*"
+      # fragment      = *uric
+      ret[:FRAGMENT] = fragment = "#{uric}*"
+
+      # hostname      = *( domainlabel "." ) toplabel [ "." ]
+      # reg-name      = *( unreserved / pct-encoded / sub-delims ) # RFC3986
+      unless hostname
+        ret[:HOSTNAME] = hostname = "(?:[a-zA-Z0-9\\-.]|%\\h\\h)+"
+      end
+
+      # RFC 2373, APPENDIX B:
+      # IPv6address = hexpart [ ":" IPv4address ]
+      # IPv4address   = 1*3DIGIT "." 1*3DIGIT "." 1*3DIGIT "." 1*3DIGIT
+      # hexpart = hexseq | hexseq "::" [ hexseq ] | "::" [ hexseq ]
+      # hexseq  = hex4 *( ":" hex4)
+      # hex4    = 1*4HEXDIG
+      #
+      # XXX: This definition has a flaw. "::" + IPv4address must be
+      # allowed too.  Here is a replacement.
+      #
+      # IPv4address = 1*3DIGIT "." 1*3DIGIT "." 1*3DIGIT "." 1*3DIGIT
+      ret[:IPV4ADDR] = ipv4addr = "\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}"
+      # hex4     = 1*4HEXDIG
+      hex4 = "[#{PATTERN::HEX}]{1,4}"
+      # lastpart = hex4 | IPv4address
+      lastpart = "(?:#{hex4}|#{ipv4addr})"
+      # hexseq1  = *( hex4 ":" ) hex4
+      hexseq1 = "(?:#{hex4}:)*#{hex4}"
+      # hexseq2  = *( hex4 ":" ) lastpart
+      hexseq2 = "(?:#{hex4}:)*#{lastpart}"
+      # IPv6address = hexseq2 | [ hexseq1 ] "::" [ hexseq2 ]
+      ret[:IPV6ADDR] = ipv6addr = "(?:#{hexseq2}|(?:#{hexseq1})?::(?:#{hexseq2})?)"
+
+      # IPv6prefix  = ( hexseq1 | [ hexseq1 ] "::" [ hexseq1 ] ) "/" 1*2DIGIT
+      # unused
+
+      # ipv6reference = "[" IPv6address "]" (RFC 2732)
+      ret[:IPV6REF] = ipv6ref = "\\[#{ipv6addr}\\]"
+
+      # host          = hostname | IPv4address
+      # host          = hostname | IPv4address | IPv6reference (RFC 2732)
+      ret[:HOST] = host = "(?:#{hostname}|#{ipv4addr}|#{ipv6ref})"
+      # port          = *digit
+      ret[:PORT] = port = '\d*'
+      # hostport      = host [ ":" port ]
+      ret[:HOSTPORT] = hostport = "#{host}(?::#{port})?"
+
+      # userinfo      = *( unreserved | escaped |
+      #                    ";" | ":" | "&" | "=" | "+" | "$" | "," )
+      ret[:USERINFO] = userinfo = "(?:[#{unreserved};:&=+$,]|#{escaped})*"
+
+      # pchar         = unreserved | escaped |
+      #                 ":" | "@" | "&" | "=" | "+" | "$" | ","
+      pchar = "(?:[#{unreserved}:@&=+$,]|#{escaped})"
+      # param         = *pchar
+      param = "#{pchar}*"
+      # segment       = *pchar *( ";" param )
+      segment = "#{pchar}*(?:;#{param})*"
+      # path_segments = segment *( "/" segment )
+      ret[:PATH_SEGMENTS] = path_segments = "#{segment}(?:/#{segment})*"
+
+      # server        = [ [ userinfo "@" ] hostport ]
+      server = "(?:#{userinfo}@)?#{hostport}"
+      # reg_name      = 1*( unreserved | escaped | "$" | "," |
+      #                     ";" | ":" | "@" | "&" | "=" | "+" )
+      ret[:REG_NAME] = reg_name = "(?:[#{unreserved}$,;:@&=+]|#{escaped})+"
+      # authority     = server | reg_name
+      authority = "(?:#{server}|#{reg_name})"
+
+      # rel_segment   = 1*( unreserved | escaped |
+      #                     ";" | "@" | "&" | "=" | "+" | "$" | "," )
+      ret[:REL_SEGMENT] = rel_segment = "(?:[#{unreserved};@&=+$,]|#{escaped})+"
+
+      # scheme        = alpha *( alpha | digit | "+" | "-" | "." )
+      ret[:SCHEME] = scheme = "[#{PATTERN::ALPHA}][\\-+.#{PATTERN::ALPHA}\\d]*"
+
+      # abs_path      = "/"  path_segments
+      ret[:ABS_PATH] = abs_path = "/#{path_segments}"
+      # rel_path      = rel_segment [ abs_path ]
+      ret[:REL_PATH] = rel_path = "#{rel_segment}(?:#{abs_path})?"
+      # net_path      = "//" authority [ abs_path ]
+      ret[:NET_PATH] = net_path = "//#{authority}(?:#{abs_path})?"
+
+      # hier_part     = ( net_path | abs_path ) [ "?" query ]
+      ret[:HIER_PART] = hier_part = "(?:#{net_path}|#{abs_path})(?:\\?(?:#{query}))?"
+      # opaque_part   = uric_no_slash *uric
+      ret[:OPAQUE_PART] = opaque_part = "#{uric_no_slash}#{uric}*"
+
+      # absoluteURI   = scheme ":" ( hier_part | opaque_part )
+      ret[:ABS_URI] = abs_uri = "#{scheme}:(?:#{hier_part}|#{opaque_part})"
+      # relativeURI   = ( net_path | abs_path | rel_path ) [ "?" query ]
+      ret[:REL_URI] = rel_uri = "(?:#{net_path}|#{abs_path}|#{rel_path})(?:\\?#{query})?"
+
+      # Gem::URI-reference = [ absoluteURI | relativeURI ] [ "#" fragment ]
+      ret[:URI_REF] = "(?:#{abs_uri}|#{rel_uri})?(?:##{fragment})?"
+
+      ret[:X_ABS_URI] = "
+        (#{scheme}):                           (?# 1: scheme)
+        (?:
+           (#{opaque_part})                    (?# 2: opaque)
+        |
+           (?:(?:
+             //(?:
+                 (?:(?:(#{userinfo})@)?        (?# 3: userinfo)
+                   (?:(#{host})(?::(\\d*))?))? (?# 4: host, 5: port)
+               |
+                 (#{reg_name})                 (?# 6: registry)
+               )
+             |
+             (?!//))                           (?# XXX: '//' is the mark for hostport)
+             (#{abs_path})?                    (?# 7: path)
+           )(?:\\?(#{query}))?                 (?# 8: query)
+        )
+        (?:\\#(#{fragment}))?                  (?# 9: fragment)
+      "
+
+      ret[:X_REL_URI] = "
+        (?:
+          (?:
+            //
+            (?:
+              (?:(#{userinfo})@)?       (?# 1: userinfo)
+                (#{host})?(?::(\\d*))?  (?# 2: host, 3: port)
+            |
+              (#{reg_name})             (?# 4: registry)
+            )
+          )
+        |
+          (#{rel_segment})              (?# 5: rel_segment)
+        )?
+        (#{abs_path})?                  (?# 6: abs_path)
+        (?:\\?(#{query}))?              (?# 7: query)
+        (?:\\#(#{fragment}))?           (?# 8: fragment)
+      "
+
+      ret
+    end
+
+    # Constructs the default Hash of Regexp's.
+    def initialize_regexp(pattern)
+      ret = {}
+
+      # for Gem::URI::split
+      ret[:ABS_URI] = Regexp.new('\A\s*+' + pattern[:X_ABS_URI] + '\s*\z', Regexp::EXTENDED)
+      ret[:REL_URI] = Regexp.new('\A\s*+' + pattern[:X_REL_URI] + '\s*\z', Regexp::EXTENDED)
+
+      # for Gem::URI::extract
+      ret[:URI_REF]     = Regexp.new(pattern[:URI_REF])
+      ret[:ABS_URI_REF] = Regexp.new(pattern[:X_ABS_URI], Regexp::EXTENDED)
+      ret[:REL_URI_REF] = Regexp.new(pattern[:X_REL_URI], Regexp::EXTENDED)
+
+      # for Gem::URI::escape/unescape
+      ret[:ESCAPED] = Regexp.new(pattern[:ESCAPED])
+      ret[:UNSAFE]  = Regexp.new("[^#{pattern[:UNRESERVED]}#{pattern[:RESERVED]}]")
+
+      # for Generic#initialize
+      ret[:SCHEME]   = Regexp.new("\\A#{pattern[:SCHEME]}\\z")
+      ret[:USERINFO] = Regexp.new("\\A#{pattern[:USERINFO]}\\z")
+      ret[:HOST]     = Regexp.new("\\A#{pattern[:HOST]}\\z")
+      ret[:PORT]     = Regexp.new("\\A#{pattern[:PORT]}\\z")
+      ret[:OPAQUE]   = Regexp.new("\\A#{pattern[:OPAQUE_PART]}\\z")
+      ret[:REGISTRY] = Regexp.new("\\A#{pattern[:REG_NAME]}\\z")
+      ret[:ABS_PATH] = Regexp.new("\\A#{pattern[:ABS_PATH]}\\z")
+      ret[:REL_PATH] = Regexp.new("\\A#{pattern[:REL_PATH]}\\z")
+      ret[:QUERY]    = Regexp.new("\\A#{pattern[:QUERY]}\\z")
+      ret[:FRAGMENT] = Regexp.new("\\A#{pattern[:FRAGMENT]}\\z")
+
+      ret
+    end
+
+    def convert_to_uri(uri)
+      if uri.is_a?(Gem::URI::Generic)
+        uri
+      elsif uri = String.try_convert(uri)
+        parse(uri)
+      else
+        raise ArgumentError,
+          "bad argument (expected Gem::URI object or Gem::URI string)"
+      end
+    end
+
+  end # class Parser
+
+  # Backward compatibility for Gem::URI::REGEXP::PATTERN::*
+  RFC2396_Parser.new.pattern.each_pair do |sym, str|
+    unless RFC2396_REGEXP::PATTERN.const_defined?(sym, false)
+      RFC2396_REGEXP::PATTERN.const_set(sym, str)
+    end
+  end
+end # module Gem::URI
diff --git a/lib/rubygems/vendor/uri/lib/uri/rfc3986_parser.rb b/lib/rubygems/vendor/uri/lib/uri/rfc3986_parser.rb
new file mode 100644
index 00000000000000..3b6961abf6afbf
--- /dev/null
+++ b/lib/rubygems/vendor/uri/lib/uri/rfc3986_parser.rb
@@ -0,0 +1,206 @@
+# frozen_string_literal: true
+module Gem::URI
+  class RFC3986_Parser # :nodoc:
+    # Gem::URI defined in RFC3986
+    HOST = %r[
+      (?<IP-literal>\[(?:
+          (?<IPv6address>
+            (?:\h{1,4}:){6}
+            (?<ls32>\h{1,4}:\h{1,4}
+            | (?<IPv4address>(?<dec-octet>[1-9]\d|1\d{2}|2[0-4]\d|25[0-5]|\d)
+                \.\g<dec-octet>\.\g<dec-octet>\.\g<dec-octet>)
+            )
+          | ::(?:\h{1,4}:){5}\g<ls32>
+          | \h{1,4}?::(?:\h{1,4}:){4}\g<ls32>
+          | (?:(?:\h{1,4}:)?\h{1,4})?::(?:\h{1,4}:){3}\g<ls32>
+          | (?:(?:\h{1,4}:){,2}\h{1,4})?::(?:\h{1,4}:){2}\g<ls32>
+          | (?:(?:\h{1,4}:){,3}\h{1,4})?::\h{1,4}:\g<ls32>
+          | (?:(?:\h{1,4}:){,4}\h{1,4})?::\g<ls32>
+          | (?:(?:\h{1,4}:){,5}\h{1,4})?::\h{1,4}
+          | (?:(?:\h{1,4}:){,6}\h{1,4})?::
+          )
+        | (?<IPvFuture>v\h++\.[!$&-.0-9:;=A-Z_a-z~]++)
+        )\])
+    | \g<IPv4address>
+    | (?<reg-name>(?:%\h\h|[!$&-.0-9;=A-Z_a-z~])*+)
+    ]x
+
+    USERINFO = /(?:%\h\h|[!$&-.0-9:;=A-Z_a-z~])*+/
+
+    SCHEME = %r[[A-Za-z][+\-.0-9A-Za-z]*+].source
+    SEG = %r[(?:%\h\h|[!$&-.0-9:;=@A-Z_a-z~/])].source
+    SEG_NC = %r[(?:%\h\h|[!$&-.0-9;=@A-Z_a-z~])].source
+    FRAGMENT = %r[(?:%\h\h|[!$&-.0-9:;=@A-Z_a-z~/?])*+].source
+
+    RFC3986_URI = %r[\A
+    (?<seg>#{SEG}){0}
+    (?<Gem::URI>
+      (?<scheme>#{SCHEME}):
+      (?<hier-part>//
+        (?<authority>
+          (?:(?<userinfo>#{USERINFO.source})@)?
+          (?<host>#{HOST.source.delete(" \n")})
+          (?::(?<port>\d*+))?
+        )
+        (?<path-abempty>(?:/\g<seg>*+)?)
+      | (?<path-absolute>/((?!/)\g<seg>++)?)
+      | (?<path-rootless>(?!/)\g<seg>++)
+      | (?<path-empty>)
+      )
+      (?:\?(?<query>[^\#]*+))?
+      (?:\#(?<fragment>#{FRAGMENT}))?
+    )\z]x
+
+    RFC3986_relative_ref = %r[\A
+    (?<seg>#{SEG}){0}
+    (?<relative-ref>
+      (?<relative-part>//
+        (?<authority>
+          (?:(?<userinfo>#{USERINFO.source})@)?
+          (?<host>#{HOST.source.delete(" \n")}(?<!/))?
+          (?::(?<port>\d*+))?
+        )
+        (?<path-abempty>(?:/\g<seg>*+)?)
+      | (?<path-absolute>/\g<seg>*+)
+      | (?<path-noscheme>#{SEG_NC}++(?:/\g<seg>*+)?)
+      | (?<path-empty>)
+      )
+      (?:\?(?<query>[^#]*+))?
+      (?:\#(?<fragment>#{FRAGMENT}))?
+    )\z]x
+    attr_reader :regexp
+
+    def initialize
+      @regexp = default_regexp.each_value(&:freeze).freeze
+    end
+
+    def split(uri) #:nodoc:
+      begin
+        uri = uri.to_str
+      rescue NoMethodError
+        raise InvalidURIError, "bad Gem::URI (is not Gem::URI?): #{uri.inspect}"
+      end
+      uri.ascii_only? or
+        raise InvalidURIError, "Gem::URI must be ascii only #{uri.dump}"
+      if m = RFC3986_URI.match(uri)
+        query = m["query"]
+        scheme = m["scheme"]
+        opaque = m["path-rootless"]
+        if opaque
+          opaque << "?#{query}" if query
+          [ scheme,
+            nil, # userinfo
+            nil, # host
+            nil, # port
+            nil, # registry
+            nil, # path
+            opaque,
+            nil, # query
+            m["fragment"]
+          ]
+        else # normal
+          [ scheme,
+            m["userinfo"],
+            m["host"],
+            m["port"],
+            nil, # registry
+            (m["path-abempty"] ||
+             m["path-absolute"] ||
+             m["path-empty"]),
+            nil, # opaque
+            query,
+            m["fragment"]
+          ]
+        end
+      elsif m = RFC3986_relative_ref.match(uri)
+        [ nil, # scheme
+          m["userinfo"],
+          m["host"],
+          m["port"],
+          nil, # registry,
+          (m["path-abempty"] ||
+           m["path-absolute"] ||
+           m["path-noscheme"] ||
+           m["path-empty"]),
+          nil, # opaque
+          m["query"],
+          m["fragment"]
+        ]
+      else
+        raise InvalidURIError, "bad Gem::URI (is not Gem::URI?): #{uri.inspect}"
+      end
+    end
+
+    def parse(uri) # :nodoc:
+      Gem::URI.for(*self.split(uri), self)
+    end
+
+    def join(*uris) # :nodoc:
+      uris[0] = convert_to_uri(uris[0])
+      uris.inject :merge
+    end
+
+    # Compatibility for RFC2396 parser
+    def extract(str, schemes = nil, &block) # :nodoc:
+      warn "Gem::URI::RFC3986_PARSER.extract is obsolete. Use Gem::URI::RFC2396_PARSER.extract explicitly.", uplevel: 1 if $VERBOSE
+      RFC2396_PARSER.extract(str, schemes, &block)
+    end
+
+    # Compatibility for RFC2396 parser
+    def make_regexp(schemes = nil) # :nodoc:
+      warn "Gem::URI::RFC3986_PARSER.make_regexp is obsolete. Use Gem::URI::RFC2396_PARSER.make_regexp explicitly.", uplevel: 1 if $VERBOSE
+      RFC2396_PARSER.make_regexp(schemes)
+    end
+
+    # Compatibility for RFC2396 parser
+    def escape(str, unsafe = nil) # :nodoc:
+      warn "Gem::URI::RFC3986_PARSER.escape is obsolete. Use Gem::URI::RFC2396_PARSER.escape explicitly.", uplevel: 1 if $VERBOSE
+      unsafe ? RFC2396_PARSER.escape(str, unsafe) : RFC2396_PARSER.escape(str)
+    end
+
+    # Compatibility for RFC2396 parser
+    def unescape(str, escaped = nil) # :nodoc:
+      warn "Gem::URI::RFC3986_PARSER.unescape is obsolete. Use Gem::URI::RFC2396_PARSER.unescape explicitly.", uplevel: 1 if $VERBOSE
+      escaped ? RFC2396_PARSER.unescape(str, escaped) : RFC2396_PARSER.unescape(str)
+    end
+
+    @@to_s = Kernel.instance_method(:to_s)
+    if @@to_s.respond_to?(:bind_call)
+      def inspect
+        @@to_s.bind_call(self)
+      end
+    else
+      def inspect
+        @@to_s.bind(self).call
+      end
+    end
+
+    private
+
+    def default_regexp # :nodoc:
+      {
+        SCHEME: %r[\A#{SCHEME}\z]o,
+        USERINFO: %r[\A#{USERINFO}\z]o,
+        HOST: %r[\A#{HOST}\z]o,
+        ABS_PATH: %r[\A/#{SEG}*+\z]o,
+        REL_PATH: %r[\A(?!/)#{SEG}++\z]o,
+        QUERY: %r[\A(?:%\h\h|[!$&-.0-9:;=@A-Z_a-z~/?])*+\z],
+        FRAGMENT: %r[\A#{FRAGMENT}\z]o,
+        OPAQUE: %r[\A(?:[^/].*)?\z],
+        PORT: /\A[\x09\x0a\x0c\x0d ]*+\d*[\x09\x0a\x0c\x0d ]*\z/,
+      }
+    end
+
+    def convert_to_uri(uri)
+      if uri.is_a?(Gem::URI::Generic)
+        uri
+      elsif uri = String.try_convert(uri)
+        parse(uri)
+      else
+        raise ArgumentError,
+          "bad argument (expected Gem::URI object or Gem::URI string)"
+      end
+    end
+
+  end # class Parser
+end # module Gem::URI
diff --git a/lib/rubygems/vendor/uri/lib/uri/version.rb b/lib/rubygems/vendor/uri/lib/uri/version.rb
new file mode 100644
index 00000000000000..c2f617ce25008e
--- /dev/null
+++ b/lib/rubygems/vendor/uri/lib/uri/version.rb
@@ -0,0 +1,6 @@
+module Gem::URI
+  # :stopdoc:
+  VERSION_CODE = '010003'.freeze
+  VERSION = VERSION_CODE.scan(/../).collect{|n| n.to_i}.join('.').freeze
+  # :startdoc:
+end
diff --git a/lib/rubygems/vendor/uri/lib/uri/ws.rb b/lib/rubygems/vendor/uri/lib/uri/ws.rb
new file mode 100644
index 00000000000000..0dd2a7a1bb9449
--- /dev/null
+++ b/lib/rubygems/vendor/uri/lib/uri/ws.rb
@@ -0,0 +1,83 @@
+# frozen_string_literal: false
+# = uri/ws.rb
+#
+# Author:: Matt Muller <mamuller@amazon.com>
+# License:: You can redistribute it and/or modify it under the same term as Ruby.
+#
+# See Gem::URI for general documentation
+#
+
+require_relative 'generic'
+
+module Gem::URI
+
+  #
+  # The syntax of WS URIs is defined in RFC6455 section 3.
+  #
+  # Note that the Ruby Gem::URI library allows WS URLs containing usernames and
+  # passwords. This is not legal as per the RFC, but used to be
+  # supported in Internet Explorer 5 and 6, before the MS04-004 security
+  # update. See <URL:http://support.microsoft.com/kb/834489>.
+  #
+  class WS < Generic
+    # A Default port of 80 for Gem::URI::WS.
+    DEFAULT_PORT = 80
+
+    # An Array of the available components for Gem::URI::WS.
+    COMPONENT = %i[
+      scheme
+      userinfo host port
+      path
+      query
+    ].freeze
+
+    #
+    # == Description
+    #
+    # Creates a new Gem::URI::WS object from components, with syntax checking.
+    #
+    # The components accepted are userinfo, host, port, path, and query.
+    #
+    # The components should be provided either as an Array, or as a Hash
+    # with keys formed by preceding the component names with a colon.
+    #
+    # If an Array is used, the components must be passed in the
+    # order <code>[userinfo, host, port, path, query]</code>.
+    #
+    # Example:
+    #
+    #     uri = Gem::URI::WS.build(host: 'www.example.com', path: '/foo/bar')
+    #
+    #     uri = Gem::URI::WS.build([nil, "www.example.com", nil, "/path", "query"])
+    #
+    # Currently, if passed userinfo components this method generates
+    # invalid WS URIs as per RFC 1738.
+    #
+    def self.build(args)
+      tmp = Util.make_components_hash(self, args)
+      super(tmp)
+    end
+
+    #
+    # == Description
+    #
+    # Returns the full path for a WS Gem::URI, as required by Net::HTTP::Get.
+    #
+    # If the Gem::URI contains a query, the full path is Gem::URI#path + '?' + Gem::URI#query.
+    # Otherwise, the path is simply Gem::URI#path.
+    #
+    # Example:
+    #
+    #     uri = Gem::URI::WS.build(path: '/foo/bar', query: 'test=true')
+    #     uri.request_uri #  => "/foo/bar?test=true"
+    #
+    def request_uri
+      return unless @path
+
+      url = @query ? "#@path?#@query" : @path.dup
+      url.start_with?(?/.freeze) ? url : ?/ + url
+    end
+  end
+
+  register_scheme 'WS', WS
+end
diff --git a/lib/rubygems/vendor/uri/lib/uri/wss.rb b/lib/rubygems/vendor/uri/lib/uri/wss.rb
new file mode 100644
index 00000000000000..0b91d334bbb6d0
--- /dev/null
+++ b/lib/rubygems/vendor/uri/lib/uri/wss.rb
@@ -0,0 +1,23 @@
+# frozen_string_literal: false
+# = uri/wss.rb
+#
+# Author:: Matt Muller <mamuller@amazon.com>
+# License:: You can redistribute it and/or modify it under the same term as Ruby.
+#
+# See Gem::URI for general documentation
+#
+
+require_relative 'ws'
+
+module Gem::URI
+
+  # The default port for WSS URIs is 443, and the scheme is 'wss:' rather
+  # than 'ws:'. Other than that, WSS URIs are identical to WS URIs;
+  # see Gem::URI::WS.
+  class WSS < WS
+    # A Default port of 443 for Gem::URI::WSS
+    DEFAULT_PORT = 443
+  end
+
+  register_scheme 'WSS', WSS
+end
diff --git a/lib/rubygems/vendored_molinillo.rb b/lib/rubygems/vendored_molinillo.rb
new file mode 100644
index 00000000000000..45906c0e5c71b4
--- /dev/null
+++ b/lib/rubygems/vendored_molinillo.rb
@@ -0,0 +1,3 @@
+# frozen_string_literal: true
+
+require_relative "vendor/molinillo/lib/molinillo"
diff --git a/lib/rubygems/vendored_net_http.rb b/lib/rubygems/vendored_net_http.rb
new file mode 100644
index 00000000000000..a84c52a9470675
--- /dev/null
+++ b/lib/rubygems/vendored_net_http.rb
@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+
+# Ruby 3.3 and RubyGems 3.5 is already load Gem::Timeout from lib/rubygems/net/http.rb
+# We should avoid to load it again
+require_relative "vendor/net-http/lib/net/http" unless defined?(Gem::Net::HTTP)
diff --git a/lib/rubygems/vendored_optparse.rb b/lib/rubygems/vendored_optparse.rb
new file mode 100644
index 00000000000000..a5611d32f0d14d
--- /dev/null
+++ b/lib/rubygems/vendored_optparse.rb
@@ -0,0 +1,3 @@
+# frozen_string_literal: true
+
+require_relative "vendor/optparse/lib/optparse"
diff --git a/lib/rubygems/vendored_securerandom.rb b/lib/rubygems/vendored_securerandom.rb
new file mode 100644
index 00000000000000..859b6d7d7aacb4
--- /dev/null
+++ b/lib/rubygems/vendored_securerandom.rb
@@ -0,0 +1,3 @@
+# frozen_string_literal: true
+
+require_relative "vendor/securerandom/lib/securerandom"
diff --git a/lib/rubygems/vendored_timeout.rb b/lib/rubygems/vendored_timeout.rb
new file mode 100644
index 00000000000000..45541928e672d4
--- /dev/null
+++ b/lib/rubygems/vendored_timeout.rb
@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+
+# Ruby 3.3 and RubyGems 3.5 is already load Gem::Timeout from lib/rubygems/timeout.rb
+# We should avoid to load it again
+require_relative "vendor/timeout/lib/timeout" unless defined?(Gem::Timeout)
diff --git a/lib/rubygems/vendored_tsort.rb b/lib/rubygems/vendored_tsort.rb
new file mode 100644
index 00000000000000..c3d815650df3d4
--- /dev/null
+++ b/lib/rubygems/vendored_tsort.rb
@@ -0,0 +1,3 @@
+# frozen_string_literal: true
+
+require_relative "vendor/tsort/lib/tsort"
diff --git a/lib/rubygems/version.rb b/lib/rubygems/version.rb
index 45ff47f95ccbf9..25c412be4b6b2e 100644
--- a/lib/rubygems/version.rb
+++ b/lib/rubygems/version.rb
@@ -131,7 +131,7 @@
 #
 # == Preventing Version Catastrophe:
 #
-# From: http://blog.zenspider.com/2008/10/rubygems-howto-preventing-cata.html
+# From: https://www.zenspider.com/ruby/2008/10/rubygems-how-to-preventing-catastrophe.html
 #
 # Let's say you're depending on the fnord gem version 2.y.z. If you
 # specify your dependency as ">= 2.0.0" then, you're good, right? What
@@ -156,13 +156,13 @@ class Gem::Version
   include Comparable
 
   VERSION_PATTERN = '[0-9]+(?>\.[0-9a-zA-Z]+)*(-[0-9A-Za-z-]+(\.[0-9A-Za-z-]+)*)?' # :nodoc:
-  ANCHORED_VERSION_PATTERN = /\A\s*(#{VERSION_PATTERN})?\s*\z/.freeze # :nodoc:
+  ANCHORED_VERSION_PATTERN = /\A\s*(#{VERSION_PATTERN})?\s*\z/ # :nodoc:
 
   ##
   # A string representation of this Version.
 
   def version
-    @version.dup
+    @version
   end
 
   alias_method :to_s, :version
@@ -173,7 +173,7 @@ def version
   def self.correct?(version)
     nil_versions_are_discouraged! if version.nil?
 
-    !!(version.to_s =~ ANCHORED_VERSION_PATTERN)
+    ANCHORED_VERSION_PATTERN.match?(version.to_s)
   end
 
   ##
@@ -224,9 +224,17 @@ def initialize(version)
     end
 
     # If version is an empty string convert it to 0
-    version = 0 if version.is_a?(String) && version =~ /\A\s*\Z/
+    version = 0 if version.is_a?(String) && /\A\s*\Z/.match?(version)
+
+    @version = version.to_s
 
-    @version = version.to_s.strip.gsub("-",".pre.")
+    # optimization to avoid allocation when given an integer, since we know
+    # it's to_s won't have any spaces or dashes
+    unless version.is_a?(Integer)
+      @version = @version.strip
+      @version.gsub!("-",".pre.")
+    end
+    @version = -@version
     @segments = nil
   end
 
@@ -252,7 +260,7 @@ def bump
   # same precision. Version "1.0" is not the same as version "1".
 
   def eql?(other)
-    self.class === other && @version == other._version
+    self.class === other && @version == other.version
   end
 
   def hash # :nodoc:
@@ -280,19 +288,18 @@ def marshal_dump
   # 1.3.5 and earlier) compatibility.
 
   def marshal_load(array)
-    initialize array[0]
+    string = array[0]
+    raise TypeError, "wrong version string" unless string.is_a?(String)
+
+    initialize string
   end
 
   def yaml_initialize(tag, map) # :nodoc:
-    @version = map["version"]
+    @version = -map["version"]
     @segments = nil
     @hash = nil
   end
 
-  def to_yaml_properties # :nodoc:
-    ["@version"]
-  end
-
   def encode_with(coder) # :nodoc:
     coder.add "version", @version
   end
@@ -302,7 +309,7 @@ def encode_with(coder) # :nodoc:
 
   def prerelease?
     unless instance_variable_defined? :@prerelease
-      @prerelease = !(@version =~ /[a-zA-Z]/).nil?
+      @prerelease = /[a-zA-Z]/.match?(version)
     end
     @prerelease
   end
@@ -354,20 +361,20 @@ def <=>(other)
     return self <=> self.class.new(other) if (String === other) && self.class.correct?(other)
 
     return unless Gem::Version === other
-    return 0 if @version == other._version || canonical_segments == other.canonical_segments
+    return 0 if @version == other.version || canonical_segments == other.canonical_segments
 
     lhsegments = canonical_segments
     rhsegments = other.canonical_segments
 
     lhsize = lhsegments.size
     rhsize = rhsegments.size
-    limit  = (lhsize > rhsize ? lhsize : rhsize) - 1
+    limit  = (lhsize > rhsize ? rhsize : lhsize)
 
     i = 0
 
-    while i <= limit
-      lhs = lhsegments[i] || 0
-      rhs = rhsegments[i] || 0
+    while i < limit
+      lhs = lhsegments[i]
+      rhs = rhsegments[i]
       i += 1
 
       next      if lhs == rhs
@@ -377,42 +384,58 @@ def <=>(other)
       return lhs <=> rhs
     end
 
+    lhs = lhsegments[i]
+
+    if lhs.nil?
+      rhs = rhsegments[i]
+
+      while i < rhsize
+        return 1 if String === rhs
+        return -1 unless rhs.zero?
+        rhs = rhsegments[i += 1]
+      end
+    else
+      while i < lhsize
+        return -1 if String === lhs
+        return 1 unless lhs.zero?
+        lhs = lhsegments[i += 1]
+      end
+    end
+
     0
   end
 
+  # remove trailing zeros segments before first letter or at the end of the version
   def canonical_segments
-    @canonical_segments ||=
-      _split_segments.map! do |segments|
-        segments.reverse_each.drop_while {|s| s == 0 }.reverse
-      end.reduce(&:concat)
+    @canonical_segments ||= begin
+      # remove trailing 0 segments, using dot or letter as anchor
+      # may leave a trailing dot which will be ignored by partition_segments
+      canonical_version = @version.sub(/(?<=[a-zA-Z.])[.0]+\z/, "")
+      # remove 0 segments before the first letter in a prerelease version
+      canonical_version.sub!(/(?<=\.|\A)[0.]+(?=[a-zA-Z])/, "") if prerelease?
+      partition_segments(canonical_version)
+    end
   end
 
   def freeze
     prerelease?
+    _segments
     canonical_segments
     super
   end
 
   protected
 
-  def _version
-    @version
-  end
-
   def _segments
     # segments is lazy so it can pick up version values that come from
     # old marshaled versions, which don't go through marshal_load.
     # since this version object is cached in @@all, its @segments should be frozen
-
-    @segments ||= @version.scan(/[0-9]+|[a-z]+/i).map do |s|
-      /^\d+$/.match?(s) ? s.to_i : s
-    end.freeze
+    @segments ||= partition_segments(@version)
   end
 
-  def _split_segments
-    string_start = _segments.index {|s| s.is_a?(String) }
-    string_segments = segments
-    numeric_segments = string_segments.slice!(0, string_start || string_segments.size)
-    [numeric_segments, string_segments]
+  def partition_segments(ver)
+    ver.scan(/\d+|[a-z]+/i).map! do |s|
+      /\A\d/.match?(s) ? s.to_i : -s
+    end.freeze
   end
 end
diff --git a/lib/rubygems/yaml_serializer.rb b/lib/rubygems/yaml_serializer.rb
index a447709c745d24..f89004f32ad8e4 100644
--- a/lib/rubygems/yaml_serializer.rb
+++ b/lib/rubygems/yaml_serializer.rb
@@ -17,7 +17,11 @@ def dump_hash(hash)
         if v.is_a?(Hash)
           yaml << dump_hash(v).gsub(/^(?!$)/, "  ") # indent all non-empty lines
         elsif v.is_a?(Array) # Expected to be array of strings
-          yaml << "\n- " << v.map {|s| s.to_s.gsub(/\s+/, " ").inspect }.join("\n- ") << "\n"
+          if v.empty?
+            yaml << " []\n"
+          else
+            yaml << "\n- " << v.map {|s| s.to_s.gsub(/\s+/, " ").inspect }.join("\n- ") << "\n"
+          end
         else
           yaml << " " << v.to_s.gsub(/\s+/, " ").inspect << "\n"
         end
@@ -32,30 +36,31 @@ def dump_hash(hash)
       (.*) # value
       \1 # matching closing quote
       $
-    /xo.freeze
+    /xo
 
     HASH_REGEX = /
       ^
       ([ ]*) # indentations
-      (.+) # key
+      ([^#]+) # key excludes comment char '#'
       (?::(?=(?:\s|$))) # :  (without the lookahead the #key includes this when : is present in value)
       [ ]?
       (['"]?) # optional opening quote
       (.*) # value
       \3 # matching closing quote
       $
-    /xo.freeze
+    /xo
 
     def load(str)
       res = {}
       stack = [res]
       last_hash = nil
       last_empty_key = nil
-      str.split(/\r?\n/).each do |line|
+      str.split(/\r?\n/) do |line|
         if match = HASH_REGEX.match(line)
           indent, key, quote, val = match.captures
-          key = convert_to_backward_compatible_key(key)
-          depth = indent.scan(/  /).length
+          val = strip_comment(val)
+
+          depth = indent.size / 2
           if quote.empty? && val.empty?
             new_hash = {}
             stack[depth][key] = new_hash
@@ -63,10 +68,13 @@ def load(str)
             last_empty_key = key
             last_hash = stack[depth]
           else
+            val = [] if val == "[]" # empty array
             stack[depth][key] = val
           end
         elsif match = ARRAY_REGEX.match(line)
           _, val = match.captures
+          val = strip_comment(val)
+
           last_hash[last_empty_key] = [] unless last_hash[last_empty_key].is_a?(Array)
 
           last_hash[last_empty_key].push(val)
@@ -75,15 +83,16 @@ def load(str)
       res
     end
 
-    # for settings' keys
-    def convert_to_backward_compatible_key(key)
-      key = "#{key}/" if key =~ /https?:/i && key !~ %r{/\Z}
-      key = key.gsub(".", "__") if key.include?(".")
-      key
+    def strip_comment(val)
+      if val.include?("#") && !val.start_with?("#")
+        val.split("#", 2).first.strip
+      else
+        val
+      end
     end
 
     class << self
-      private :dump_hash, :convert_to_backward_compatible_key
+      private :dump_hash
     end
   end
 end
diff --git a/lib/securerandom.gemspec b/lib/securerandom.gemspec
index f42ddbcc97f48c..fe46c11013c02f 100644
--- a/lib/securerandom.gemspec
+++ b/lib/securerandom.gemspec
@@ -14,14 +14,20 @@ Gem::Specification.new do |spec|
   spec.summary       = %q{Interface for secure random number generator.}
   spec.description   = %q{Interface for secure random number generator.}
   spec.homepage      = "https://github.com/ruby/securerandom"
-  spec.required_ruby_version = Gem::Requirement.new(">= 2.6.0")
+  spec.required_ruby_version = Gem::Requirement.new(">= 3.1.0")
   spec.licenses      = ["Ruby", "BSD-2-Clause"]
 
+  spec.metadata["changelog_uri"] = spec.homepage + "/releases"
   spec.metadata["homepage_uri"] = spec.homepage
   spec.metadata["source_code_uri"] = spec.homepage
 
-  spec.files         = Dir.chdir(File.expand_path('..', __FILE__)) do
-    `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
+  # 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(__dir__) do
+    `git ls-files -z`.split("\x0").reject do |f|
+      (File.expand_path(f) == __FILE__) ||
+        f.start_with?(*%w[bin/ test/ spec/ features/ docs/ rakelib/ .document .git Gemfile Rakefile])
+    end
   end
   spec.bindir        = "exe"
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
diff --git a/lib/securerandom.rb b/lib/securerandom.rb
index 9faa09e4e07e3a..6079fdb5c48730 100644
--- a/lib/securerandom.rb
+++ b/lib/securerandom.rb
@@ -40,19 +40,33 @@
 
 module SecureRandom
 
-  VERSION = "0.2.2"
+  # The version
+  VERSION = "0.4.1"
 
   class << self
+    # Returns a random binary string containing +size+ bytes.
+    #
+    # See Random.bytes
     def bytes(n)
       return gen_random(n)
     end
 
+    # Compatibility methods for Ruby 3.2, we can remove this after dropping to support Ruby 3.2
+    def alphanumeric(n = nil, chars: ALPHANUMERIC)
+      n = 16 if n.nil?
+      choose(chars, n)
+    end if RUBY_VERSION < '3.3'
+
     private
 
+    # :stopdoc:
+
+    # Implementation using OpenSSL
     def gen_random_openssl(n)
       return OpenSSL::Random.random_bytes(n)
     end
 
+    # Implementation using system random device
     def gen_random_urandom(n)
       ret = Random.urandom(n)
       unless ret
@@ -78,6 +92,9 @@ def gen_random_urandom(n)
       end
     end
 
+    # :startdoc:
+
+    # Generate random data bytes for Random::Formatter
     public :gen_random
   end
 end
diff --git a/lib/set.rb b/lib/set.rb
deleted file mode 100644
index 5ac37dbf3c450f..00000000000000
--- a/lib/set.rb
+++ /dev/null
@@ -1,860 +0,0 @@
-# frozen_string_literal: true
-# :markup: markdown
-#
-# set.rb - defines the Set class
-#
-# Copyright (c) 2002-2020 Akinori MUSHA <knu@iDaemons.org>
-#
-# Documentation by Akinori MUSHA and Gavin Sinclair.
-#
-# All rights reserved.  You can redistribute and/or modify it under the same
-# terms as Ruby.
-
-
-##
-# This library provides the Set class, which implements a collection
-# of unordered values with no duplicates. It is a hybrid of Array's
-# intuitive inter-operation facilities and Hash's fast lookup.
-#
-# The method `to_set` is added to Enumerable for convenience.
-#
-# Set is easy to use with Enumerable objects (implementing `each`).
-# Most of the initializer methods and binary operators accept generic
-# Enumerable objects besides sets and arrays.  An Enumerable object
-# can be converted to Set using the `to_set` method.
-#
-# Set uses Hash as storage, so you must note the following points:
-#
-# * Equality of elements is determined according to Object#eql? and
-#   Object#hash.  Use Set#compare_by_identity to make a set compare
-#   its elements by their identity.
-# * Set assumes that the identity of each element does not change
-#   while it is stored.  Modifying an element of a set will render the
-#   set to an unreliable state.
-# * When a string is to be stored, a frozen copy of the string is
-#   stored instead unless the original string is already frozen.
-#
-# ## Comparison
-#
-# The comparison operators `<`, `>`, `<=`, and `>=` are implemented as
-# shorthand for the {proper_,}{subset?,superset?} methods.  The `<=>`
-# operator reflects this order, or return `nil` for sets that both
-# have distinct elements (`{x, y}` vs. `{x, z}` for example).
-#
-# ## Example
-#
-# ```ruby
-# require 'set'
-# s1 = Set[1, 2]                        #=> #<Set: {1, 2}>
-# s2 = [1, 2].to_set                    #=> #<Set: {1, 2}>
-# s1 == s2                              #=> true
-# s1.add("foo")                         #=> #<Set: {1, 2, "foo"}>
-# s1.merge([2, 6])                      #=> #<Set: {1, 2, "foo", 6}>
-# s1.subset?(s2)                        #=> false
-# s2.subset?(s1)                        #=> true
-# ```
-#
-# ## Contact
-#
-# - Akinori MUSHA <<knu@iDaemons.org>> (current maintainer)
-#
-# ## What's Here
-#
-#  First, what's elsewhere. \Class \Set:
-#
-# - Inherits from {class Object}[rdoc-ref:Object@What-27s+Here].
-# - Includes {module Enumerable}[rdoc-ref:Enumerable@What-27s+Here],
-#   which provides dozens of additional methods.
-#
-# In particular, class \Set does not have many methods of its own
-# for fetching or for iterating.
-# Instead, it relies on those in \Enumerable.
-#
-# Here, class \Set provides methods that are useful for:
-#
-# - [Creating a Set](#class-Set-label-Methods+for+Creating+a+Set)
-# - [Set Operations](#class-Set-label-Methods+for+Set+Operations)
-# - [Comparing](#class-Set-label-Methods+for+Comparing)
-# - [Querying](#class-Set-label-Methods+for+Querying)
-# - [Assigning](#class-Set-label-Methods+for+Assigning)
-# - [Deleting](#class-Set-label-Methods+for+Deleting)
-# - [Converting](#class-Set-label-Methods+for+Converting)
-# - [Iterating](#class-Set-label-Methods+for+Iterating)
-# - [And more....](#class-Set-label-Other+Methods)
-#
-# ### Methods for Creating a \Set
-#
-# - ::[]:
-#   Returns a new set containing the given objects.
-# - ::new:
-#   Returns a new set containing either the given objects
-#   (if no block given) or the return values from the called block
-#   (if a block given).
-#
-# ### Methods for \Set Operations
-#
-# - [|](#method-i-7C) (aliased as #union and #+):
-#   Returns a new set containing all elements from +self+
-#   and all elements from a given enumerable (no duplicates).
-# - [&](#method-i-26) (aliased as #intersection):
-#   Returns a new set containing all elements common to +self+
-#   and a given enumerable.
-# - [-](#method-i-2D) (aliased as #difference):
-#   Returns a copy of +self+ with all elements
-#   in a given enumerable removed.
-# - [\^](#method-i-5E):
-#   Returns a new set containing all elements from +self+
-#   and a given enumerable except those common to both.
-#
-# ### Methods for Comparing
-#
-# - [<=>](#method-i-3C-3D-3E):
-#   Returns -1, 0, or 1 as +self+ is less than, equal to,
-#   or greater than a given object.
-# - [==](#method-i-3D-3D):
-#   Returns whether +self+ and a given enumerable are equal,
-#   as determined by Object#eql?.
-# - \#compare_by_identity?:
-#   Returns whether the set considers only identity
-#   when comparing elements.
-#
-# ### Methods for Querying
-#
-# - \#length (aliased as #size):
-#   Returns the count of elements.
-# - \#empty?:
-#   Returns whether the set has no elements.
-# - \#include? (aliased as #member? and #===):
-#   Returns whether a given object is an element in the set.
-# - \#subset? (aliased as [<=](#method-i-3C-3D)):
-#   Returns whether a given object is a subset of the set.
-# - \#proper_subset? (aliased as [<](#method-i-3C)):
-#   Returns whether a given enumerable is a proper subset of the set.
-# - \#superset? (aliased as [>=](#method-i-3E-3D])):
-#   Returns whether a given enumerable is a superset of the set.
-# - \#proper_superset? (aliased as [>](#method-i-3E)):
-#   Returns whether a given enumerable is a proper superset of the set.
-# - \#disjoint?:
-#   Returns +true+ if the set and a given enumerable
-#   have no common elements, +false+ otherwise.
-# - \#intersect?:
-#   Returns +true+ if the set and a given enumerable:
-#   have any common elements, +false+ otherwise.
-# - \#compare_by_identity?:
-#   Returns whether the set considers only identity
-#   when comparing elements.
-#
-# ### Methods for Assigning
-#
-# - \#add (aliased as #<<):
-#   Adds a given object to the set; returns +self+.
-# - \#add?:
-#   If the given object is not an element in the set,
-#   adds it and returns +self+; otherwise, returns +nil+.
-# - \#merge:
-#   Merges the elements of each given enumerable object to the set; returns +self+.
-# - \#replace:
-#   Replaces the contents of the set with the contents
-#   of a given enumerable.
-#
-# ### Methods for Deleting
-#
-# - \#clear:
-#   Removes all elements in the set; returns +self+.
-# - \#delete:
-#   Removes a given object from the set; returns +self+.
-# - \#delete?:
-#   If the given object is an element in the set,
-#   removes it and returns +self+; otherwise, returns +nil+.
-# - \#subtract:
-#   Removes each given object from the set; returns +self+.
-# - \#delete_if - Removes elements specified by a given block.
-# - \#select! (aliased as #filter!):
-#   Removes elements not specified by a given block.
-# - \#keep_if:
-#   Removes elements not specified by a given block.
-# - \#reject!
-#   Removes elements specified by a given block.
-#
-# ### Methods for Converting
-#
-# - \#classify:
-#   Returns a hash that classifies the elements,
-#   as determined by the given block.
-# - \#collect! (aliased as #map!):
-#   Replaces each element with a block return-value.
-# - \#divide:
-#   Returns a hash that classifies the elements,
-#   as determined by the given block;
-#   differs from #classify in that the block may accept
-#   either one or two arguments.
-# - \#flatten:
-#   Returns a new set that is a recursive flattening of +self+.
-#  \#flatten!:
-#   Replaces each nested set in +self+ with the elements from that set.
-# - \#inspect (aliased as #to_s):
-#   Returns a string displaying the elements.
-# - \#join:
-#   Returns a string containing all elements, converted to strings
-#   as needed, and joined by the given record separator.
-# - \#to_a:
-#   Returns an array containing all set elements.
-# - \#to_set:
-#   Returns +self+ if given no arguments and no block;
-#   with a block given, returns a new set consisting of block
-#   return values.
-#
-# ### Methods for Iterating
-#
-# - \#each:
-#   Calls the block with each successive element; returns +self+.
-#
-# ### Other Methods
-#
-# - \#reset:
-#   Resets the internal state; useful if an object
-#   has been modified while an element in the set.
-#
-class Set
-  VERSION = "1.0.3"
-
-  include Enumerable
-
-  # Creates a new set containing the given objects.
-  #
-  #     Set[1, 2]                   # => #<Set: {1, 2}>
-  #     Set[1, 2, 1]                # => #<Set: {1, 2}>
-  #     Set[1, 'c', :s]             # => #<Set: {1, "c", :s}>
-  def self.[](*ary)
-    new(ary)
-  end
-
-  # Creates a new set containing the elements of the given enumerable
-  # object.
-  #
-  # If a block is given, the elements of enum are preprocessed by the
-  # given block.
-  #
-  #     Set.new([1, 2])                       #=> #<Set: {1, 2}>
-  #     Set.new([1, 2, 1])                    #=> #<Set: {1, 2}>
-  #     Set.new([1, 'c', :s])                 #=> #<Set: {1, "c", :s}>
-  #     Set.new(1..5)                         #=> #<Set: {1, 2, 3, 4, 5}>
-  #     Set.new([1, 2, 3]) { |x| x * x }      #=> #<Set: {1, 4, 9}>
-  def initialize(enum = nil, &block) # :yields: o
-    @hash ||= Hash.new(false)
-
-    enum.nil? and return
-
-    if block
-      do_with_enum(enum) { |o| add(block[o]) }
-    else
-      merge(enum)
-    end
-  end
-
-  # Makes the set compare its elements by their identity and returns
-  # self.  This method may not be supported by all subclasses of Set.
-  def compare_by_identity
-    if @hash.respond_to?(:compare_by_identity)
-      @hash.compare_by_identity
-      self
-    else
-      raise NotImplementedError, "#{self.class.name}\##{__method__} is not implemented"
-    end
-  end
-
-  # Returns true if the set will compare its elements by their
-  # identity.  Also see Set#compare_by_identity.
-  def compare_by_identity?
-    @hash.respond_to?(:compare_by_identity?) && @hash.compare_by_identity?
-  end
-
-  def do_with_enum(enum, &block) # :nodoc:
-    if enum.respond_to?(:each_entry)
-      enum.each_entry(&block) if block
-    elsif enum.respond_to?(:each)
-      enum.each(&block) if block
-    else
-      raise ArgumentError, "value must be enumerable"
-    end
-  end
-  private :do_with_enum
-
-  # Dup internal hash.
-  def initialize_dup(orig)
-    super
-    @hash = orig.instance_variable_get(:@hash).dup
-  end
-
-  if Kernel.instance_method(:initialize_clone).arity != 1
-    # Clone internal hash.
-    def initialize_clone(orig, **options)
-      super
-      @hash = orig.instance_variable_get(:@hash).clone(**options)
-    end
-  else
-    # Clone internal hash.
-    def initialize_clone(orig)
-      super
-      @hash = orig.instance_variable_get(:@hash).clone
-    end
-  end
-
-  def freeze    # :nodoc:
-    @hash.freeze
-    super
-  end
-
-  # Returns the number of elements.
-  def size
-    @hash.size
-  end
-  alias length size
-
-  # Returns true if the set contains no elements.
-  def empty?
-    @hash.empty?
-  end
-
-  # Removes all elements and returns self.
-  #
-  #     set = Set[1, 'c', :s]             #=> #<Set: {1, "c", :s}>
-  #     set.clear                         #=> #<Set: {}>
-  #     set                               #=> #<Set: {}>
-  def clear
-    @hash.clear
-    self
-  end
-
-  # Replaces the contents of the set with the contents of the given
-  # enumerable object and returns self.
-  #
-  #     set = Set[1, 'c', :s]             #=> #<Set: {1, "c", :s}>
-  #     set.replace([1, 2])               #=> #<Set: {1, 2}>
-  #     set                               #=> #<Set: {1, 2}>
-  def replace(enum)
-    if enum.instance_of?(self.class)
-      @hash.replace(enum.instance_variable_get(:@hash))
-      self
-    else
-      do_with_enum(enum)  # make sure enum is enumerable before calling clear
-      clear
-      merge(enum)
-    end
-  end
-
-  # Converts the set to an array.  The order of elements is uncertain.
-  #
-  #     Set[1, 2].to_a                    #=> [1, 2]
-  #     Set[1, 'c', :s].to_a              #=> [1, "c", :s]
-  def to_a
-    @hash.keys
-  end
-
-  # Returns self if no arguments are given.  Otherwise, converts the
-  # set to another with `klass.new(self, *args, &block)`.
-  #
-  # In subclasses, returns `klass.new(self, *args, &block)` unless
-  # overridden.
-  def to_set(klass = Set, *args, &block)
-    return self if instance_of?(Set) && klass == Set && block.nil? && args.empty?
-    klass.new(self, *args, &block)
-  end
-
-  def flatten_merge(set, seen = Set.new) # :nodoc:
-    set.each { |e|
-      if e.is_a?(Set)
-        if seen.include?(e_id = e.object_id)
-          raise ArgumentError, "tried to flatten recursive Set"
-        end
-
-        seen.add(e_id)
-        flatten_merge(e, seen)
-        seen.delete(e_id)
-      else
-        add(e)
-      end
-    }
-
-    self
-  end
-  protected :flatten_merge
-
-  # Returns a new set that is a copy of the set, flattening each
-  # containing set recursively.
-  def flatten
-    self.class.new.flatten_merge(self)
-  end
-
-  # Equivalent to Set#flatten, but replaces the receiver with the
-  # result in place.  Returns nil if no modifications were made.
-  def flatten!
-    replace(flatten()) if any? { |e| e.is_a?(Set) }
-  end
-
-  # Returns true if the set contains the given object.
-  #
-  # Note that <code>include?</code> and <code>member?</code> do not test member
-  # equality using <code>==</code> as do other Enumerables.
-  #
-  # See also Enumerable#include?
-  def include?(o)
-    @hash[o]
-  end
-  alias member? include?
-
-  # Returns true if the set is a superset of the given set.
-  def superset?(set)
-    case
-    when set.instance_of?(self.class) && @hash.respond_to?(:>=)
-      @hash >= set.instance_variable_get(:@hash)
-    when set.is_a?(Set)
-      size >= set.size && set.all? { |o| include?(o) }
-    else
-      raise ArgumentError, "value must be a set"
-    end
-  end
-  alias >= superset?
-
-  # Returns true if the set is a proper superset of the given set.
-  def proper_superset?(set)
-    case
-    when set.instance_of?(self.class) && @hash.respond_to?(:>)
-      @hash > set.instance_variable_get(:@hash)
-    when set.is_a?(Set)
-      size > set.size && set.all? { |o| include?(o) }
-    else
-      raise ArgumentError, "value must be a set"
-    end
-  end
-  alias > proper_superset?
-
-  # Returns true if the set is a subset of the given set.
-  def subset?(set)
-    case
-    when set.instance_of?(self.class) && @hash.respond_to?(:<=)
-      @hash <= set.instance_variable_get(:@hash)
-    when set.is_a?(Set)
-      size <= set.size && all? { |o| set.include?(o) }
-    else
-      raise ArgumentError, "value must be a set"
-    end
-  end
-  alias <= subset?
-
-  # Returns true if the set is a proper subset of the given set.
-  def proper_subset?(set)
-    case
-    when set.instance_of?(self.class) && @hash.respond_to?(:<)
-      @hash < set.instance_variable_get(:@hash)
-    when set.is_a?(Set)
-      size < set.size && all? { |o| set.include?(o) }
-    else
-      raise ArgumentError, "value must be a set"
-    end
-  end
-  alias < proper_subset?
-
-  # Returns 0 if the set are equal,
-  # -1 / +1 if the set is a proper subset / superset of the given set,
-  # or nil if they both have unique elements.
-  def <=>(set)
-    return unless set.is_a?(Set)
-
-    case size <=> set.size
-    when -1 then -1 if proper_subset?(set)
-    when +1 then +1 if proper_superset?(set)
-    else 0 if self.==(set)
-    end
-  end
-
-  # Returns true if the set and the given enumerable have at least one
-  # element in common.
-  #
-  #     Set[1, 2, 3].intersect? Set[4, 5]   #=> false
-  #     Set[1, 2, 3].intersect? Set[3, 4]   #=> true
-  #     Set[1, 2, 3].intersect? 4..5        #=> false
-  #     Set[1, 2, 3].intersect? [3, 4]      #=> true
-  def intersect?(set)
-    case set
-    when Set
-      if size < set.size
-        any? { |o| set.include?(o) }
-      else
-        set.any? { |o| include?(o) }
-      end
-    when Enumerable
-      set.any? { |o| include?(o) }
-    else
-      raise ArgumentError, "value must be enumerable"
-    end
-  end
-
-  # Returns true if the set and the given enumerable have
-  # no element in common.  This method is the opposite of `intersect?`.
-  #
-  #     Set[1, 2, 3].disjoint? Set[3, 4]   #=> false
-  #     Set[1, 2, 3].disjoint? Set[4, 5]   #=> true
-  #     Set[1, 2, 3].disjoint? [3, 4]      #=> false
-  #     Set[1, 2, 3].disjoint? 4..5        #=> true
-  def disjoint?(set)
-    !intersect?(set)
-  end
-
-  # Calls the given block once for each element in the set, passing
-  # the element as parameter.  Returns an enumerator if no block is
-  # given.
-  def each(&block)
-    block_given? or return enum_for(__method__) { size }
-    @hash.each_key(&block)
-    self
-  end
-
-  # Adds the given object to the set and returns self.  Use `merge` to
-  # add many elements at once.
-  #
-  #     Set[1, 2].add(3)                    #=> #<Set: {1, 2, 3}>
-  #     Set[1, 2].add([3, 4])               #=> #<Set: {1, 2, [3, 4]}>
-  #     Set[1, 2].add(2)                    #=> #<Set: {1, 2}>
-  def add(o)
-    @hash[o] = true
-    self
-  end
-  alias << add
-
-  # Adds the given object to the set and returns self.  If the
-  # object is already in the set, returns nil.
-  #
-  #     Set[1, 2].add?(3)                    #=> #<Set: {1, 2, 3}>
-  #     Set[1, 2].add?([3, 4])               #=> #<Set: {1, 2, [3, 4]}>
-  #     Set[1, 2].add?(2)                    #=> nil
-  def add?(o)
-    add(o) unless include?(o)
-  end
-
-  # Deletes the given object from the set and returns self.  Use
-  # `subtract` to delete many items at once.
-  def delete(o)
-    @hash.delete(o)
-    self
-  end
-
-  # Deletes the given object from the set and returns self.  If the
-  # object is not in the set, returns nil.
-  def delete?(o)
-    delete(o) if include?(o)
-  end
-
-  # Deletes every element of the set for which block evaluates to
-  # true, and returns self. Returns an enumerator if no block is
-  # given.
-  def delete_if
-    block_given? or return enum_for(__method__) { size }
-    # @hash.delete_if should be faster, but using it breaks the order
-    # of enumeration in subclasses.
-    select { |o| yield o }.each { |o| @hash.delete(o) }
-    self
-  end
-
-  # Deletes every element of the set for which block evaluates to
-  # false, and returns self. Returns an enumerator if no block is
-  # given.
-  def keep_if
-    block_given? or return enum_for(__method__) { size }
-    # @hash.keep_if should be faster, but using it breaks the order of
-    # enumeration in subclasses.
-    reject { |o| yield o }.each { |o| @hash.delete(o) }
-    self
-  end
-
-  # Replaces the elements with ones returned by `collect()`.
-  # Returns an enumerator if no block is given.
-  def collect!
-    block_given? or return enum_for(__method__) { size }
-    set = self.class.new
-    each { |o| set << yield(o) }
-    replace(set)
-  end
-  alias map! collect!
-
-  # Equivalent to Set#delete_if, but returns nil if no changes were
-  # made. Returns an enumerator if no block is given.
-  def reject!(&block)
-    block_given? or return enum_for(__method__) { size }
-    n = size
-    delete_if(&block)
-    self if size != n
-  end
-
-  # Equivalent to Set#keep_if, but returns nil if no changes were
-  # made. Returns an enumerator if no block is given.
-  def select!(&block)
-    block_given? or return enum_for(__method__) { size }
-    n = size
-    keep_if(&block)
-    self if size != n
-  end
-
-  # Equivalent to Set#select!
-  alias filter! select!
-
-  # Merges the elements of the given enumerable objects to the set and
-  # returns self.
-  def merge(*enums, **nil)
-    enums.each do |enum|
-      if enum.instance_of?(self.class)
-        @hash.update(enum.instance_variable_get(:@hash))
-      else
-        do_with_enum(enum) { |o| add(o) }
-      end
-    end
-
-    self
-  end
-
-  # Deletes every element that appears in the given enumerable object
-  # and returns self.
-  def subtract(enum)
-    do_with_enum(enum) { |o| delete(o) }
-    self
-  end
-
-  # Returns a new set built by merging the set and the elements of the
-  # given enumerable object.
-  #
-  #     Set[1, 2, 3] | Set[2, 4, 5]         #=> #<Set: {1, 2, 3, 4, 5}>
-  #     Set[1, 5, 'z'] | (1..6)             #=> #<Set: {1, 5, "z", 2, 3, 4, 6}>
-  def |(enum)
-    dup.merge(enum)
-  end
-  alias + |
-  alias union |
-
-  # Returns a new set built by duplicating the set, removing every
-  # element that appears in the given enumerable object.
-  #
-  #     Set[1, 3, 5] - Set[1, 5]                #=> #<Set: {3}>
-  #     Set['a', 'b', 'z'] - ['a', 'c']         #=> #<Set: {"b", "z"}>
-  def -(enum)
-    dup.subtract(enum)
-  end
-  alias difference -
-
-  # Returns a new set containing elements common to the set and the
-  # given enumerable object.
-  #
-  #     Set[1, 3, 5] & Set[3, 2, 1]             #=> #<Set: {3, 1}>
-  #     Set['a', 'b', 'z'] & ['a', 'b', 'c']    #=> #<Set: {"a", "b"}>
-  def &(enum)
-    n = self.class.new
-    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 &
-
-  # Returns a new set containing elements exclusive between the set
-  # and the given enumerable object.  `(set ^ enum)` is equivalent to
-  # `((set | enum) - (set & enum))`.
-  #
-  #     Set[1, 2] ^ Set[2, 3]                   #=> #<Set: {3, 1}>
-  #     Set[1, 'b', 'c'] ^ ['b', 'd']           #=> #<Set: {"d", 1, "c"}>
-  def ^(enum)
-    n = Set.new(enum)
-    each { |o| n.add(o) unless n.delete?(o) }
-    n
-  end
-
-  # Returns true if two sets are equal.  The equality of each couple
-  # of elements is defined according to Object#eql?.
-  #
-  #     Set[1, 2] == Set[2, 1]                       #=> true
-  #     Set[1, 3, 5] == Set[1, 5]                    #=> false
-  #     Set['a', 'b', 'c'] == Set['a', 'c', 'b']     #=> true
-  #     Set['a', 'b', 'c'] == ['a', 'c', 'b']        #=> false
-  def ==(other)
-    if self.equal?(other)
-      true
-    elsif other.instance_of?(self.class)
-      @hash == other.instance_variable_get(:@hash)
-    elsif other.is_a?(Set) && self.size == other.size
-      other.all? { |o| @hash.include?(o) }
-    else
-      false
-    end
-  end
-
-  def hash      # :nodoc:
-    @hash.hash
-  end
-
-  def eql?(o)   # :nodoc:
-    return false unless o.is_a?(Set)
-    @hash.eql?(o.instance_variable_get(:@hash))
-  end
-
-  # Resets the internal state after modification to existing elements
-  # and returns self.
-  #
-  # Elements will be reindexed and deduplicated.
-  def reset
-    if @hash.respond_to?(:rehash)
-      @hash.rehash # This should perform frozenness check.
-    else
-      raise FrozenError, "can't modify frozen #{self.class.name}" if frozen?
-    end
-    self
-  end
-
-  # Returns true if the given object is a member of the set,
-  # and false otherwise.
-  #
-  # Used in case statements:
-  #
-  #     require 'set'
-  #
-  #     case :apple
-  #     when Set[:potato, :carrot]
-  #       "vegetable"
-  #     when Set[:apple, :banana]
-  #       "fruit"
-  #     end
-  #     # => "fruit"
-  #
-  # Or by itself:
-  #
-  #     Set[1, 2, 3] === 2   #=> true
-  #     Set[1, 2, 3] === 4   #=> false
-  #
-  alias === include?
-
-  # Classifies the set by the return value of the given block and
-  # returns a hash of {value => set of elements} pairs.  The block is
-  # called once for each element of the set, passing the element as
-  # parameter.
-  #
-  #     require 'set'
-  #     files = Set.new(Dir.glob("*.rb"))
-  #     hash = files.classify { |f| File.mtime(f).year }
-  #     hash       #=> {2000=>#<Set: {"a.rb", "b.rb"}>,
-  #                #    2001=>#<Set: {"c.rb", "d.rb", "e.rb"}>,
-  #                #    2002=>#<Set: {"f.rb"}>}
-  #
-  # Returns an enumerator if no block is given.
-  def classify # :yields: o
-    block_given? or return enum_for(__method__) { size }
-
-    h = {}
-
-    each { |i|
-      (h[yield(i)] ||= self.class.new).add(i)
-    }
-
-    h
-  end
-
-  # Divides the set into a set of subsets according to the commonality
-  # defined by the given block.
-  #
-  # If the arity of the block is 2, elements o1 and o2 are in common
-  # if block.call(o1, o2) is true.  Otherwise, elements o1 and o2 are
-  # in common if block.call(o1) == block.call(o2).
-  #
-  #     require 'set'
-  #     numbers = Set[1, 3, 4, 6, 9, 10, 11]
-  #     set = numbers.divide { |i,j| (i - j).abs == 1 }
-  #     set        #=> #<Set: {#<Set: {1}>,
-  #                #           #<Set: {11, 9, 10}>,
-  #                #           #<Set: {3, 4}>,
-  #                #           #<Set: {6}>}>
-  #
-  # Returns an enumerator if no block is given.
-  def divide(&func)
-    func or return enum_for(__method__) { size }
-
-    if func.arity == 2
-      require 'tsort'
-
-      class << dig = {}         # :nodoc:
-        include TSort
-
-        alias tsort_each_node each_key
-        def tsort_each_child(node, &block)
-          fetch(node).each(&block)
-        end
-      end
-
-      each { |u|
-        dig[u] = a = []
-        each{ |v| func.call(u, v) and a << v }
-      }
-
-      set = Set.new()
-      dig.each_strongly_connected_component { |css|
-        set.add(self.class.new(css))
-      }
-      set
-    else
-      Set.new(classify(&func).values)
-    end
-  end
-
-  # Returns a string created by converting each element of the set to a string
-  # See also: Array#join
-  def join(separator=nil)
-    to_a.join(separator)
-  end
-
-  InspectKey = :__inspect_key__         # :nodoc:
-
-  # Returns a string containing a human-readable representation of the
-  # set ("#<Set: {element1, element2, ...}>").
-  def inspect
-    ids = (Thread.current[InspectKey] ||= [])
-
-    if ids.include?(object_id)
-      return sprintf('#<%s: {...}>', self.class.name)
-    end
-
-    ids << object_id
-    begin
-      return sprintf('#<%s: {%s}>', self.class, to_a.inspect[1..-2])
-    ensure
-      ids.pop
-    end
-  end
-
-  alias to_s inspect
-
-  def pretty_print(pp)  # :nodoc:
-    pp.group(1, sprintf('#<%s:', self.class.name), '>') {
-      pp.breakable
-      pp.group(1, '{', '}') {
-        pp.seplist(self) { |o|
-          pp.pp o
-        }
-      }
-    }
-  end
-
-  def pretty_print_cycle(pp)    # :nodoc:
-    pp.text sprintf('#<%s: {%s}>', self.class.name, empty? ? '' : '...')
-  end
-end
-
-module Enumerable
-  # Makes a set from the enumerable object with given arguments.
-  # Needs to `require "set"` to use this method.
-  def to_set(klass = Set, *args, &block)
-    klass.new(self, *args, &block)
-  end unless method_defined?(:to_set)
-end
-
-autoload :SortedSet, "#{__dir__}/set/sorted_set"
diff --git a/lib/set/set.gemspec b/lib/set/set.gemspec
deleted file mode 100644
index c415fac99c64ff..00000000000000
--- a/lib/set/set.gemspec
+++ /dev/null
@@ -1,30 +0,0 @@
-name = File.basename(__FILE__, ".gemspec")
-version = ["lib", Array.new(name.count("-")+1, "..").join("/")].find do |dir|
-  break File.foreach(File.join(__dir__, dir, "#{name.tr('-', '/')}.rb")) do |line|
-    /^\s*VERSION\s*=\s*"(.*)"/ =~ line and break $1
-  end rescue nil
-end
-
-Gem::Specification.new do |spec|
-  spec.name          = name
-  spec.version       = version
-  spec.authors       = ["Akinori MUSHA"]
-  spec.email         = ["knu@idaemons.org"]
-
-  spec.summary       = %q{Provides a class to deal with collections of unordered, unique values}
-  spec.description   = %q{Provides a class to deal with collections of unordered, unique values}
-  spec.homepage      = "https://github.com/ruby/set"
-  spec.licenses      = ["Ruby", "BSD-2-Clause"]
-  spec.required_ruby_version = Gem::Requirement.new(">= 2.7.0")
-
-  spec.metadata["homepage_uri"] = spec.homepage
-  spec.metadata["source_code_uri"] = spec.homepage
-  spec.metadata["changelog_uri"] = "https://github.com/ruby/set/blob/v#{spec.version}/CHANGELOG.md"
-
-  # 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.require_paths = ["lib"]
-end
diff --git a/lib/set/sorted_set.rb b/lib/set/sorted_set.rb
deleted file mode 100644
index bc07bc1fb0c7da..00000000000000
--- a/lib/set/sorted_set.rb
+++ /dev/null
@@ -1,6 +0,0 @@
-begin
-  require 'sorted_set'
-rescue ::LoadError
-  raise "The `SortedSet` class has been extracted from the `set` library. " \
-        "You must use the `sorted_set` gem or other alternatives."
-end
diff --git a/lib/shellwords.gemspec b/lib/shellwords.gemspec
index d60ab5f650bc28..8d0c518ca570bd 100644
--- a/lib/shellwords.gemspec
+++ b/lib/shellwords.gemspec
@@ -21,8 +21,9 @@ Gem::Specification.new do |spec|
   spec.metadata["homepage_uri"] = spec.homepage
   spec.metadata["source_code_uri"] = spec.homepage
 
-  spec.files         = Dir.chdir(File.expand_path('..', __FILE__)) do
-    `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
+  srcdir, gemspec_file = File.split(__FILE__)
+  spec.files         = Dir.chdir(srcdir) do
+    `git ls-files -z`.split("\x0").reject { |f| f.match(%r{\A(?:(?:test|spec|features)/|\.git|Rake)}) || f ==  gemspec_file}
   end
   spec.bindir        = "exe"
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
diff --git a/lib/shellwords.rb b/lib/shellwords.rb
index 58f4af26ae56cd..20a85ed9d2d395 100644
--- a/lib/shellwords.rb
+++ b/lib/shellwords.rb
@@ -5,9 +5,9 @@
 # This module manipulates strings according to the word parsing rules
 # of the UNIX Bourne shell.
 #
-# The shellwords() function was originally a port of shellwords.pl,
-# but modified to conform to the Shell & Utilities volume of the IEEE
-# Std 1003.1-2008, 2016 Edition [1].
+# The <tt>shellwords()</tt> function was originally a port of shellwords.pl, but
+# modified to conform to {the Shell & Utilities volume of the IEEE Std 1003.1-2008, 2016
+# Edition}[http://pubs.opengroup.org/onlinepubs/9699919799/utilities/contents.html]
 #
 # === Usage
 #
@@ -62,13 +62,10 @@
 #
 # === Contact
 # * Akinori MUSHA <knu@iDaemons.org> (current maintainer)
-#
-# === Resources
-#
-# 1: {IEEE Std 1003.1-2008, 2016 Edition, the Shell & Utilities volume}[http://pubs.opengroup.org/onlinepubs/9699919799/utilities/contents.html]
 
 module Shellwords
-  VERSION = "0.1.0"
+  # The version number string.
+  VERSION = "0.2.2"
 
   # Splits a string into an array of tokens in the same way the UNIX
   # Bourne shell does.
@@ -76,6 +73,9 @@ module Shellwords
   #   argv = Shellwords.split('here are "two words"')
   #   argv #=> ["here", "are", "two words"]
   #
+  # +line+ must not contain NUL characters because of nature of
+  # +exec+ system call.
+  #
   # Note, however, that this is not a command line parser.  Shell
   # metacharacters except for the single and double quotes and
   # backslash are not treated as such.
@@ -90,9 +90,14 @@ module Shellwords
   def shellsplit(line)
     words = []
     field = String.new
-    line.scan(/\G\s*(?>([^\s\\\'\"]+)|'([^\']*)'|"((?:[^\"\\]|\\.)*)"|(\\.?)|(\S))(\s|\z)?/m) do
+    line.scan(/\G\s*(?>([^\0\s\\\'\"]+)|'([^\0\']*)'|"((?:[^\0\"\\]|\\[^\0])*)"|(\\[^\0]?)|(\S))(\s|\z)?/m) do
       |word, sq, dq, esc, garbage, sep|
-      raise ArgumentError, "Unmatched quote: #{line.inspect}" if garbage
+      if garbage
+        b = $~.begin(0)
+        line = $~[0]
+        line = "..." + line if b > 0
+        raise ArgumentError, "#{garbage == "\0" ? 'Nul character' : 'Unmatched quote'} at #{b}: #{line}"
+      end
       # 2.2.3 Double-Quotes:
       #
       #   The <backslash> shall retain its special meaning as an
@@ -121,6 +126,9 @@ class << self
   # command line.  +str+ can be a non-string object that responds to
   # +to_s+.
   #
+  # +str+ must not contain NUL characters because of nature of +exec+
+  # system call.
+  #
   # Note that a resulted string should be used unquoted and is not
   # intended for use in double quotes nor in single quotes.
   #
@@ -153,6 +161,9 @@ def shellescape(str)
     # An empty argument will be skipped, so return empty quotes.
     return "''".dup if str.empty?
 
+    # Shellwords cannot contain NUL characters.
+    raise ArgumentError, "NUL character" if str.index("\0")
+
     str = str.dup
 
     # Treat multibyte characters as is.  It is the caller's responsibility
@@ -178,6 +189,7 @@ class << self
   # All elements are joined into a single string with fields separated by a
   # space, where each element is escaped for the Bourne shell and stringified
   # using +to_s+.
+  # See also Shellwords.shellescape.
   #
   #   ary = ["There's", "a", "time", "and", "place", "for", "everything"]
   #   argv = Shellwords.join(ary)
diff --git a/lib/singleton.rb b/lib/singleton.rb
index 7ed17a769c1841..b8e43a7794891d 100644
--- a/lib/singleton.rb
+++ b/lib/singleton.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 
 # The Singleton module implements the Singleton pattern.
 #
@@ -92,22 +92,25 @@
 #    p a.strip #  => nil
 #
 module Singleton
-  VERSION = "0.1.1"
+  VERSION = "0.3.0"
 
-  # Raises a TypeError to prevent cloning.
-  def clone
-    raise TypeError, "can't clone instance of singleton #{self.class}"
-  end
+  module SingletonInstanceMethods
+    # Raises a TypeError to prevent cloning.
+    def clone
+      raise TypeError, "can't clone instance of singleton #{self.class}"
+    end
 
-  # Raises a TypeError to prevent duping.
-  def dup
-    raise TypeError, "can't dup instance of singleton #{self.class}"
-  end
+    # Raises a TypeError to prevent duping.
+    def dup
+      raise TypeError, "can't dup instance of singleton #{self.class}"
+    end
 
-  # By default, do not retain any state when marshalling.
-  def _dump(depth = -1)
-    ''
+    # By default, do not retain any state when marshalling.
+    def _dump(depth = -1)
+      ''
+    end
   end
+  include SingletonInstanceMethods
 
   module SingletonClassMethods # :nodoc:
 
@@ -130,22 +133,42 @@ def inherited(sub_klass)
       super
       Singleton.__init__(sub_klass)
     end
+
+    def set_instance(val)
+      @singleton__instance__ = val
+    end
+
+    def set_mutex(val)
+      @singleton__mutex__ = val
+    end
   end
 
-  class << Singleton # :nodoc:
+  def self.module_with_class_methods
+    SingletonClassMethods
+  end
+
+  module SingletonClassProperties
+
+    def self.included(c)
+      # extending an object with Singleton is a bad idea
+      c.undef_method :extend_object
+    end
+
+    def self.extended(c)
+      # extending an object with Singleton is a bad idea
+      c.singleton_class.send(:undef_method, :extend_object)
+    end
+
     def __init__(klass) # :nodoc:
       klass.instance_eval {
-        @singleton__instance__ = nil
-        @singleton__mutex__ = Thread::Mutex.new
+        set_instance(nil)
+        set_mutex(Thread::Mutex.new)
       }
       klass
     end
 
     private
 
-    # extending an object with Singleton is a bad idea
-    undef_method :extend_object
-
     def append_features(mod)
       #  help out people counting on transitive mixins
       unless mod.instance_of?(Class)
@@ -157,10 +180,11 @@ def append_features(mod)
     def included(klass)
       super
       klass.private_class_method :new, :allocate
-      klass.extend SingletonClassMethods
+      klass.extend module_with_class_methods
       Singleton.__init__(klass)
     end
   end
+  extend SingletonClassProperties
 
   ##
   # :singleton-method: _load
@@ -170,3 +194,46 @@ def included(klass)
   # :singleton-method: instance
   #  Returns the singleton instance.
 end
+
+if defined?(Ractor)
+  module RactorLocalSingleton
+    include Singleton::SingletonInstanceMethods
+
+    module RactorLocalSingletonClassMethods
+      include Singleton::SingletonClassMethods
+      def instance
+        set_mutex(Thread::Mutex.new) if Ractor.current[mutex_key].nil?
+        return Ractor.current[instance_key] if Ractor.current[instance_key]
+        Ractor.current[mutex_key].synchronize {
+          return Ractor.current[instance_key] if Ractor.current[instance_key]
+          set_instance(new())
+        }
+        Ractor.current[instance_key]
+      end
+
+      private
+
+      def instance_key
+        :"__RactorLocalSingleton_instance_with_class_id_#{object_id}__"
+      end
+
+      def mutex_key
+        :"__RactorLocalSingleton_mutex_with_class_id_#{object_id}__"
+      end
+
+      def set_instance(val)
+        Ractor.current[instance_key] = val
+      end
+
+      def set_mutex(val)
+        Ractor.current[mutex_key] = val
+      end
+    end
+
+    def self.module_with_class_methods
+      RactorLocalSingletonClassMethods
+    end
+
+    extend Singleton::SingletonClassProperties
+  end
+end
diff --git a/lib/syntax_suggest/api.rb b/lib/syntax_suggest/api.rb
index 74e53c25637ddf..46c9c8adac8ca5 100644
--- a/lib/syntax_suggest/api.rb
+++ b/lib/syntax_suggest/api.rb
@@ -5,9 +5,28 @@
 require "tmpdir"
 require "stringio"
 require "pathname"
-require "ripper"
 require "timeout"
 
+# We need Ripper loaded for `Prism.lex_compat` even if we're using Prism
+# for lexing and parsing
+require "ripper"
+
+# Prism is the new parser, replacing Ripper
+#
+# We need to "dual boot" both for now because syntax_suggest
+# supports older rubies that do not ship with syntax suggest.
+#
+# We also need the ability to control loading of this library
+# so we can test that both modes work correctly in CI.
+if (value = ENV["SYNTAX_SUGGEST_DISABLE_PRISM"])
+  warn "Skipping loading prism due to SYNTAX_SUGGEST_DISABLE_PRISM=#{value}"
+else
+  begin
+    require "prism"
+  rescue LoadError
+  end
+end
+
 module SyntaxSuggest
   # Used to indicate a default value that cannot
   # be confused with another input.
@@ -16,6 +35,14 @@ module SyntaxSuggest
   class Error < StandardError; end
   TIMEOUT_DEFAULT = ENV.fetch("SYNTAX_SUGGEST_TIMEOUT", 1).to_i
 
+  # SyntaxSuggest.use_prism_parser? [Private]
+  #
+  # Tells us if the prism parser is available for use
+  # or if we should fallback to `Ripper`
+  def self.use_prism_parser?
+    defined?(Prism)
+  end
+
   # SyntaxSuggest.handle_error [Public]
   #
   # Takes a `SyntaxError` exception, uses the
@@ -129,11 +156,20 @@ def self.valid_without?(without_lines:, code_lines:)
   # SyntaxSuggest.invalid? [Private]
   #
   # Opposite of `SyntaxSuggest.valid?`
-  def self.invalid?(source)
-    source = source.join if source.is_a?(Array)
-    source = source.to_s
+  if defined?(Prism)
+    def self.invalid?(source)
+      source = source.join if source.is_a?(Array)
+      source = source.to_s
 
-    Ripper.new(source).tap(&:parse).error?
+      Prism.parse(source).failure?
+    end
+  else
+    def self.invalid?(source)
+      source = source.join if source.is_a?(Array)
+      source = source.to_s
+
+      Ripper.new(source).tap(&:parse).error?
+    end
   end
 
   # SyntaxSuggest.valid? [Private]
@@ -191,7 +227,7 @@ def self.valid?(source)
 require_relative "code_line"
 require_relative "code_block"
 require_relative "block_expand"
-require_relative "ripper_errors"
+require_relative "mini_stringio"
 require_relative "priority_queue"
 require_relative "unvisited_lines"
 require_relative "around_block_scan"
diff --git a/lib/syntax_suggest/around_block_scan.rb b/lib/syntax_suggest/around_block_scan.rb
index ce00431b3a08a7..dd9af729c58a66 100644
--- a/lib/syntax_suggest/around_block_scan.rb
+++ b/lib/syntax_suggest/around_block_scan.rb
@@ -118,7 +118,7 @@ def scan_while
     end
 
     # Scanning is intentionally conservative because
-    # we have no way of rolling back an agressive block (at this time)
+    # we have no way of rolling back an aggressive block (at this time)
     #
     # If a block was stopped for some trivial reason, (like an empty line)
     # but the next line would have caused it to be balanced then we
@@ -224,7 +224,7 @@ def lines
       @scanner.lines
     end
 
-    # Managable rspec errors
+    # Manageable rspec errors
     def inspect
       "#<#{self.class}:0x0000123843lol >"
     end
diff --git a/lib/syntax_suggest/block_expand.rb b/lib/syntax_suggest/block_expand.rb
index e9b486c72090be..2751ae2a64a59a 100644
--- a/lib/syntax_suggest/block_expand.rb
+++ b/lib/syntax_suggest/block_expand.rb
@@ -157,7 +157,7 @@ def expand_neighbors(block)
       end
     end
 
-    # Managable rspec errors
+    # Manageable rspec errors
     def inspect
       "#<SyntaxSuggest::CodeBlock:0x0000123843lol >"
     end
diff --git a/lib/syntax_suggest/capture_code_context.rb b/lib/syntax_suggest/capture_code_context.rb
index 6dc70471761a1d..5de9ec09cc228f 100644
--- a/lib/syntax_suggest/capture_code_context.rb
+++ b/lib/syntax_suggest/capture_code_context.rb
@@ -15,7 +15,7 @@ module SyntaxSuggest
   #
   # 1. Sanitize/format input source
   # 2. Search for invalid blocks
-  # 3. Format invalid blocks into something meaninful
+  # 3. Format invalid blocks into something meaningful
   #
   # This class handles the third part.
   #
@@ -26,7 +26,7 @@ module SyntaxSuggest
   # they can't add extra data that's not present.
   #
   # In the case of known ambiguious cases, this class adds context
-  # back to the ambiguitiy so the programmer has full information.
+  # back to the ambiguity so the programmer has full information.
   #
   # Beyond handling these ambiguities, it also captures surrounding
   # code context information:
diff --git a/lib/syntax_suggest/clean_document.rb b/lib/syntax_suggest/clean_document.rb
index 2c26061bfcb0f6..ba307af46ee375 100644
--- a/lib/syntax_suggest/clean_document.rb
+++ b/lib/syntax_suggest/clean_document.rb
@@ -10,7 +10,7 @@ module SyntaxSuggest
   #
   # 1. Sanitize/format input source
   # 2. Search for invalid blocks
-  # 3. Format invalid blocks into something meaninful
+  # 3. Format invalid blocks into something meaningful
   #
   # This class handles the first part.
   #
@@ -47,9 +47,9 @@ module SyntaxSuggest
   # ## Heredocs
   #
   # A heredoc is an way of defining a multi-line string. They can cause many
-  # problems. If left as a single line, Ripper would try to parse the contents
+  # problems. If left as a single line, the parser would try to parse the contents
   # as ruby code rather than as a string. Even without this problem, we still
-  # hit an issue with indentation
+  # hit an issue with indentation:
   #
   #    1 foo = <<~HEREDOC
   #    2  "Be yourself; everyone else is already taken.""
@@ -224,7 +224,7 @@ def join_heredoc!
     #
     def join_consecutive!
       consecutive_groups = @document.select(&:ignore_newline_not_beg?).map do |code_line|
-        take_while_including(code_line.index..-1) do |line|
+        take_while_including(code_line.index..) do |line|
           line.ignore_newline_not_beg?
         end
       end
@@ -245,7 +245,7 @@ def join_consecutive!
     #     expect(lines[1].to_s).to eq("")
     def join_trailing_slash!
       trailing_groups = @document.select(&:trailing_slash?).map do |code_line|
-        take_while_including(code_line.index..-1) { |x| x.trailing_slash? }
+        take_while_including(code_line.index..) { |x| x.trailing_slash? }
       end
       join_groups(trailing_groups)
       self
@@ -267,7 +267,7 @@ def join_groups(groups)
       groups.each do |lines|
         line = lines.first
 
-        # Handle the case of multiple groups in a a row
+        # Handle the case of multiple groups in a row
         # if one is already replaced, move on
         next if @document[line.index].empty?
 
@@ -279,7 +279,7 @@ def join_groups(groups)
         )
 
         # Hide the rest of the lines
-        lines[1..-1].each do |line|
+        lines[1..].each do |line|
           # The above lines already have newlines in them, if add more
           # then there will be double newline, use an empty line instead
           @document[line.index] = CodeLine.new(line: "", index: line.index, lex: [])
@@ -293,7 +293,7 @@ def join_groups(groups)
     # Like `take_while` except when it stops
     # iterating, it also returns the line
     # that caused it to stop
-    def take_while_including(range = 0..-1)
+    def take_while_including(range = 0..)
       take_next_and_stop = false
       @document[range].take_while do |line|
         next if take_next_and_stop
diff --git a/lib/syntax_suggest/code_block.rb b/lib/syntax_suggest/code_block.rb
index 61e7986da47146..d842890300457d 100644
--- a/lib/syntax_suggest/code_block.rb
+++ b/lib/syntax_suggest/code_block.rb
@@ -81,7 +81,7 @@ def valid?
         # lines then the result cannot be invalid
         #
         # That means there's no reason to re-check all
-        # lines with ripper (which is expensive).
+        # lines with the parser (which is expensive).
         # Benchmark in commit message
         @valid = if lines.all? { |l| l.hidden? || l.empty? }
           true
diff --git a/lib/syntax_suggest/code_frontier.rb b/lib/syntax_suggest/code_frontier.rb
index 8e93b32514e0a9..38d5375ef43570 100644
--- a/lib/syntax_suggest/code_frontier.rb
+++ b/lib/syntax_suggest/code_frontier.rb
@@ -8,7 +8,7 @@ module SyntaxSuggest
   #
   # 1. Sanitize/format input source
   # 2. Search for invalid blocks
-  # 3. Format invalid blocks into something meaninful
+  # 3. Format invalid blocks into something meaningful
   #
   # The Code frontier is a critical part of the second step
   #
@@ -117,7 +117,7 @@ def expand?
 
       if ENV["SYNTAX_SUGGEST_DEBUG"]
         puts "```"
-        puts @queue.peek.to_s
+        puts @queue.peek
         puts "```"
         puts "  @frontier indent:  #{frontier_indent}"
         puts "  @unvisited indent: #{unvisited_indent}"
diff --git a/lib/syntax_suggest/code_line.rb b/lib/syntax_suggest/code_line.rb
index a20f34afa4ed5e..58197e95d0f17c 100644
--- a/lib/syntax_suggest/code_line.rb
+++ b/lib/syntax_suggest/code_line.rb
@@ -180,12 +180,19 @@ def ignore_newline_not_beg?
     #     EOM
     #     expect(lines.first.trailing_slash?).to eq(true)
     #
-    def trailing_slash?
-      last = @lex.last
-      return false unless last
-      return false unless last.type == :on_sp
+    if SyntaxSuggest.use_prism_parser?
+      def trailing_slash?
+        last = @lex.last
+        last&.type == :on_tstring_end
+      end
+    else
+      def trailing_slash?
+        last = @lex.last
+        return false unless last
+        return false unless last.type == :on_sp
 
-      last.token == TRAILING_SLASH
+        last.token == TRAILING_SLASH
+      end
     end
 
     # Endless method detection
diff --git a/lib/syntax_suggest/code_search.rb b/lib/syntax_suggest/code_search.rb
index 2a86dfea90eb18..7628dcd1312f57 100644
--- a/lib/syntax_suggest/code_search.rb
+++ b/lib/syntax_suggest/code_search.rb
@@ -43,7 +43,7 @@ class CodeSearch
 
     def initialize(source, record_dir: DEFAULT_VALUE)
       record_dir = if record_dir == DEFAULT_VALUE
-        ENV["SYNTAX_SUGGEST_RECORD_DIR"] || ENV["SYNTAX_SUGGEST_DEBUG"] ? "tmp" : nil
+        (ENV["SYNTAX_SUGGEST_RECORD_DIR"] || ENV["SYNTAX_SUGGEST_DEBUG"]) ? "tmp" : nil
       else
         record_dir
       end
@@ -73,7 +73,7 @@ def record(block:, name: "record")
       if ENV["SYNTAX_SUGGEST_DEBUG"]
         puts "\n\n==== #{filename} ===="
         puts "\n```#{block.starts_at}..#{block.ends_at}"
-        puts block.to_s
+        puts block
         puts "```"
         puts "  block indent:      #{block.current_indent}"
       end
diff --git a/lib/syntax_suggest/core_ext.rb b/lib/syntax_suggest/core_ext.rb
index c299627bb7170e..94f57ba6054272 100644
--- a/lib/syntax_suggest/core_ext.rb
+++ b/lib/syntax_suggest/core_ext.rb
@@ -3,24 +3,6 @@
 # Ruby 3.2+ has a cleaner way to hook into Ruby that doesn't use `require`
 if SyntaxError.method_defined?(:detailed_message)
   module SyntaxSuggest
-    # Mini String IO [Private]
-    #
-    # Acts like a StringIO with reduced API, but without having to require that
-    # class.
-    class MiniStringIO
-      def initialize(isatty: $stderr.isatty)
-        @string = +""
-        @isatty = isatty
-      end
-
-      attr_reader :isatty
-      def puts(value = $/, **)
-        @string << value
-      end
-
-      attr_reader :string
-    end
-
     # SyntaxSuggest.module_for_detailed_message [Private]
     #
     # Used to monkeypatch SyntaxError via Module.prepend
diff --git a/lib/syntax_suggest/display_invalid_blocks.rb b/lib/syntax_suggest/display_invalid_blocks.rb
index 32ec0021a32b73..5e79b3a262896e 100644
--- a/lib/syntax_suggest/display_invalid_blocks.rb
+++ b/lib/syntax_suggest/display_invalid_blocks.rb
@@ -14,7 +14,7 @@ def initialize(code_lines:, blocks:, io: $stderr, filename: nil, terminal: DEFAU
       @filename = filename
       @code_lines = code_lines
 
-      @terminal = terminal == DEFAULT_VALUE ? io.isatty : terminal
+      @terminal = (terminal == DEFAULT_VALUE) ? io.isatty : terminal
     end
 
     def document_ok?
diff --git a/lib/syntax_suggest/explain_syntax.rb b/lib/syntax_suggest/explain_syntax.rb
index 142ed2e269ea14..0d80c4d8699e98 100644
--- a/lib/syntax_suggest/explain_syntax.rb
+++ b/lib/syntax_suggest/explain_syntax.rb
@@ -2,7 +2,21 @@
 
 require_relative "left_right_lex_count"
 
+if !SyntaxSuggest.use_prism_parser?
+  require_relative "ripper_errors"
+end
+
 module SyntaxSuggest
+  class GetParseErrors
+    def self.errors(source)
+      if SyntaxSuggest.use_prism_parser?
+        Prism.parse(source).errors.map(&:message)
+      else
+        RipperErrors.new(source).call.errors
+      end
+    end
+  end
+
   # Explains syntax errors based on their source
   #
   # example:
@@ -15,8 +29,8 @@ module SyntaxSuggest
   #   # => "Unmatched keyword, missing `end' ?"
   #
   # When the error cannot be determined by lexical counting
-  # then ripper is run against the input and the raw ripper
-  # errors returned.
+  # then the parser is run against the input and the raw
+  # errors are returned.
   #
   # Example:
   #
@@ -91,10 +105,10 @@ def why(miss)
     # Returns an array of syntax error messages
     #
     # If no missing pairs are found it falls back
-    # on the original ripper error messages
+    # on the original error messages
     def errors
       if missing.empty?
-        return RipperErrors.new(@code_lines.map(&:original).join).call.errors
+        return GetParseErrors.errors(@code_lines.map(&:original).join).uniq
       end
 
       missing.map { |miss| why(miss) }
diff --git a/lib/syntax_suggest/lex_all.rb b/lib/syntax_suggest/lex_all.rb
index 132cba9f5d3b4c..c16fbb52d328ab 100644
--- a/lib/syntax_suggest/lex_all.rb
+++ b/lib/syntax_suggest/lex_all.rb
@@ -3,34 +3,53 @@
 module SyntaxSuggest
   # Ripper.lex is not guaranteed to lex the entire source document
   #
-  # lex = LexAll.new(source: source)
-  # lex.each do |value|
-  #   puts value.line
-  # end
+  # This class guarantees the whole document is lex-ed by iteratively
+  # lexing the document where ripper stopped.
+  #
+  # Prism likely doesn't have the same problem. Once ripper support is removed
+  # we can likely reduce the complexity here if not remove the whole concept.
+  #
+  # Example usage:
+  #
+  #   lex = LexAll.new(source: source)
+  #   lex.each do |value|
+  #     puts value.line
+  #   end
   class LexAll
     include Enumerable
 
     def initialize(source:, source_lines: nil)
-      @lex = Ripper::Lexer.new(source, "-", 1).parse.sort_by(&:pos)
-      lineno = @lex.last.pos.first + 1
+      @lex = self.class.lex(source, 1)
+      lineno = @lex.last[0][0] + 1
       source_lines ||= source.lines
       last_lineno = source_lines.length
 
       until lineno >= last_lineno
-        lines = source_lines[lineno..-1]
+        lines = source_lines[lineno..]
 
         @lex.concat(
-          Ripper::Lexer.new(lines.join, "-", lineno + 1).parse.sort_by(&:pos)
+          self.class.lex(lines.join, lineno + 1)
         )
-        lineno = @lex.last.pos.first + 1
+
+        lineno = @lex.last[0].first + 1
       end
 
       last_lex = nil
       @lex.map! { |elem|
-        last_lex = LexValue.new(elem.pos.first, elem.event, elem.tok, elem.state, last_lex)
+        last_lex = LexValue.new(elem[0].first, elem[1], elem[2], elem[3], last_lex)
       }
     end
 
+    if SyntaxSuggest.use_prism_parser?
+      def self.lex(source, line_number)
+        Prism.lex_compat(source, line: line_number).value.sort_by { |values| values[0] }
+      end
+    else
+      def self.lex(source, line_number)
+        Ripper::Lexer.new(source, "-", line_number).parse.sort_by(&:pos)
+      end
+    end
+
     def to_a
       @lex
     end
diff --git a/lib/syntax_suggest/lex_value.rb b/lib/syntax_suggest/lex_value.rb
index 008cc105b5398c..b46a332772742c 100644
--- a/lib/syntax_suggest/lex_value.rb
+++ b/lib/syntax_suggest/lex_value.rb
@@ -28,7 +28,7 @@ def initialize(line, type, token, state, last_lex = nil)
       @is_end = false
       @is_kw = false
       return if type != :on_kw
-      #
+
       return if last_lex && last_lex.fname? # https://github.com/ruby/ruby/commit/776759e300e4659bb7468e2b97c8c2d4359a2953
 
       case token
diff --git a/lib/syntax_suggest/mini_stringio.rb b/lib/syntax_suggest/mini_stringio.rb
new file mode 100644
index 00000000000000..1a82572eeb063f
--- /dev/null
+++ b/lib/syntax_suggest/mini_stringio.rb
@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+module SyntaxSuggest
+  # Mini String IO [Private]
+  #
+  # Acts like a StringIO with reduced API, but without having to require that
+  # class.
+  #
+  # The original codebase emitted directly to $stderr, but now SyntaxError#detailed_message
+  # needs a string output. To accomplish that we kept the original print infrastructure in place and
+  # added this class to accumulate the print output into a string.
+  class MiniStringIO
+    EMPTY_ARG = Object.new
+
+    def initialize(isatty: $stderr.isatty)
+      @string = +""
+      @isatty = isatty
+    end
+
+    attr_reader :isatty
+    def puts(value = EMPTY_ARG, **)
+      if !value.equal?(EMPTY_ARG)
+        @string << value
+      end
+      @string << $/
+    end
+
+    attr_reader :string
+  end
+end
diff --git a/lib/syntax_suggest/parse_blocks_from_indent_line.rb b/lib/syntax_suggest/parse_blocks_from_indent_line.rb
index 241ed6acb4261f..39dfca55d2dc24 100644
--- a/lib/syntax_suggest/parse_blocks_from_indent_line.rb
+++ b/lib/syntax_suggest/parse_blocks_from_indent_line.rb
@@ -8,7 +8,7 @@ module SyntaxSuggest
   # grabbing one that contains only an "end". In this example:
   #
   #   def dog
-  #     begonn # mispelled `begin`
+  #     begonn # misspelled `begin`
   #     puts "bark"
   #     end
   #   end
diff --git a/lib/syntax_suggest/ripper_errors.rb b/lib/syntax_suggest/ripper_errors.rb
index 48eb206e4874b7..4e2bc90948a24a 100644
--- a/lib/syntax_suggest/ripper_errors.rb
+++ b/lib/syntax_suggest/ripper_errors.rb
@@ -1,7 +1,10 @@
 # frozen_string_literal: true
 
 module SyntaxSuggest
-  # Capture parse errors from ripper
+  # Capture parse errors from Ripper
+  #
+  # Prism returns the errors with their messages, but Ripper
+  # does not. To get them we must make a custom subclass.
   #
   # Example:
   #
diff --git a/lib/syntax_suggest/scan_history.rb b/lib/syntax_suggest/scan_history.rb
index d15597c440d267..dc36e6ba2ea376 100644
--- a/lib/syntax_suggest/scan_history.rb
+++ b/lib/syntax_suggest/scan_history.rb
@@ -118,7 +118,7 @@ def lines
     # Returns an array of all the CodeLines that exist after
     # the currently scanned block
     private def after_lines
-      @code_lines[@after_index.next..-1] || []
+      @code_lines[@after_index.next..] || []
     end
 
     private def current
diff --git a/lib/syntax_suggest/syntax_suggest.gemspec b/lib/syntax_suggest/syntax_suggest.gemspec
index 0e611c13d07eae..756a85bf6339c8 100644
--- a/lib/syntax_suggest/syntax_suggest.gemspec
+++ b/lib/syntax_suggest/syntax_suggest.gemspec
@@ -16,7 +16,7 @@ Gem::Specification.new do |spec|
   spec.description = 'When you get an "unexpected end" in your syntax this gem helps you find it'
   spec.homepage = "https://github.com/ruby/syntax_suggest.git"
   spec.license = "MIT"
-  spec.required_ruby_version = Gem::Requirement.new(">= 2.5.0")
+  spec.required_ruby_version = Gem::Requirement.new(">= 3.0.0")
 
   spec.metadata["homepage_uri"] = spec.homepage
   spec.metadata["source_code_uri"] = "https://github.com/ruby/syntax_suggest.git"
diff --git a/lib/syntax_suggest/version.rb b/lib/syntax_suggest/version.rb
index ac8c2f62e531d2..1aa908f4e5970d 100644
--- a/lib/syntax_suggest/version.rb
+++ b/lib/syntax_suggest/version.rb
@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module SyntaxSuggest
-  VERSION = "1.1.0"
+  VERSION = "2.0.2"
 end
diff --git a/lib/tempfile.gemspec b/lib/tempfile.gemspec
index a3cb11296d057e..0b362b0a86763d 100644
--- a/lib/tempfile.gemspec
+++ b/lib/tempfile.gemspec
@@ -22,8 +22,12 @@ Gem::Specification.new do |spec|
 
   # 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 2>#{IO::NULL}`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
+  gemspec = File.basename(__FILE__)
+  spec.files = IO.popen(%w[git ls-files -z], chdir: __dir__, err: IO::NULL, exception: false) do |ls|
+    ls.readlines("\x0", chomp: true).reject do |f|
+      (f == gemspec) ||
+        f.start_with?(*%w[bin/ test/ spec/ features/ .git Gemfile])
+    end
   end
   spec.require_paths = ["lib"]
 end
diff --git a/lib/tempfile.rb b/lib/tempfile.rb
index d53d8c719623b1..7292e72c252599 100644
--- a/lib/tempfile.rb
+++ b/lib/tempfile.rb
@@ -8,18 +8,61 @@
 require 'delegate'
 require 'tmpdir'
 
-# A utility class for managing temporary files. When you create a Tempfile
-# object, it will create a temporary file with a unique filename. A Tempfile
-# objects behaves just like a File object, and you can perform all the usual
-# file operations on it: reading data, writing data, changing its permissions,
-# etc. So although this class does not explicitly document all instance methods
-# supported by File, you can in fact call any File instance method on a
-# Tempfile object.
+# A utility class for managing temporary files.
+#
+# There are two kind of methods of creating a temporary file:
+#
+# - Tempfile.create (recommended)
+# - Tempfile.new and Tempfile.open (mostly for backward compatibility, not recommended)
+#
+# Tempfile.create creates a usual \File object.
+# The timing of file deletion is predictable.
+# Also, it supports open-and-unlink technique which
+# removes the temporary file immediately after creation.
+#
+# Tempfile.new and Tempfile.open creates a \Tempfile object.
+# The created file is removed by the GC (finalizer).
+# The timing of file deletion is not predictable.
 #
 # == Synopsis
 #
 #   require 'tempfile'
 #
+#   # Tempfile.create with a block
+#   # The filename are chosen automatically.
+#   # (You can specify the prefix and suffix of the filename by an optional argument.)
+#   Tempfile.create {|f|
+#     f.puts "foo"
+#     f.rewind
+#     f.read                # => "foo\n"
+#   }                       # The file is removed at block exit.
+#
+#   # Tempfile.create without a block
+#   # You need to unlink the file in non-block form.
+#   f = Tempfile.create
+#   f.puts "foo"
+#   f.close
+#   File.unlink(f.path)     # You need to unlink the file.
+#
+#   # Tempfile.create(anonymous: true) without a block
+#   f = Tempfile.create(anonymous: true)
+#   # The file is already removed because anonymous.
+#   f.path                  # => "/tmp/"  (no filename since no file)
+#   f.puts "foo"
+#   f.rewind
+#   f.read                  # => "foo\n"
+#   f.close
+#
+#   # Tempfile.create(anonymous: true) with a block
+#   Tempfile.create(anonymous: true) {|f|
+#     # The file is already removed because anonymous.
+#     f.path                # => "/tmp/"  (no filename since no file)
+#     f.puts "foo"
+#     f.rewind
+#     f.read                # => "foo\n"
+#   }
+#
+#   # Not recommended: Tempfile.new without a block
 #   file = Tempfile.new('foo')
 #   file.path      # => A unique filename in the OS's temp directory,
 #                  #    e.g.: "/tmp/foo.24722.0"
@@ -30,7 +73,27 @@
 #   file.close
 #   file.unlink    # deletes the temp file
 #
-# == Good practices
+# == About Tempfile.new and Tempfile.open
+#
+# This section does not apply to Tempfile.create because
+# it returns a File object (not a Tempfile object).
+#
+# When you create a Tempfile object,
+# it will create a temporary file with a unique filename. A Tempfile
+# objects behaves just like a File object, and you can perform all the usual
+# file operations on it: reading data, writing data, changing its permissions,
+# etc. So although this class does not explicitly document all instance methods
+# supported by File, you can in fact call any File instance method on a
+# Tempfile object.
+#
+# A Tempfile object has a finalizer to remove the temporary file.
+# This means that the temporary file is removed via GC.
+# This can cause several problems:
+#
+# - Long GC intervals and conservative GC can accumulate temporary files that are not removed.
+# - Temporary files are not removed if Ruby exits abnormally (such as SIGKILL, SEGV).
+#
+# There are legacy good practices for Tempfile.new and Tempfile.open as follows.
 #
 # === Explicit close
 #
@@ -71,12 +134,17 @@
 # be able to read from or write to the Tempfile, and you do not need to
 # know the Tempfile's filename either.
 #
+# Also, this guarantees the temporary file is removed even if Ruby exits abnormally.
+# The OS reclaims the storage for the temporary file when the file is closed or
+# the Ruby process exits (normally or abnormally).
+#
 # For example, a practical use case for unlink-after-creation would be this:
 # you need a large byte buffer that's too large to comfortably fit in RAM,
 # e.g. when you're writing a web server and you want to buffer the client's
 # file upload data.
 #
-# Please refer to #unlink for more information and a code example.
+# `Tempfile.create(anonymous: true)` supports this behavior.
+# It also works on Windows.
 #
 # == Minor notes
 #
@@ -88,7 +156,8 @@
 # mutex.
 class Tempfile < DelegateClass(File)
 
-  VERSION = "0.1.3"
+  # The version
+  VERSION = "0.3.1"
 
   # Creates a file in the underlying file system;
   # returns a new \Tempfile object based on that file.
@@ -152,26 +221,52 @@ def initialize(basename="", tmpdir=nil, mode: 0, **options)
 
     @unlinked = false
     @mode = mode|File::RDWR|File::CREAT|File::EXCL
+    tmpfile = nil
     ::Dir::Tmpname.create(basename, tmpdir, **options) do |tmpname, n, opts|
       opts[:perm] = 0600
-      @tmpfile = File.open(tmpname, @mode, **opts)
+      tmpfile = File.open(tmpname, @mode, **opts)
       @opts = opts.freeze
     end
-    ObjectSpace.define_finalizer(self, Remover.new(@tmpfile))
 
-    super(@tmpfile)
+    super(tmpfile)
+
+    @finalizer_manager = FinalizerManager.new(__getobj__.path)
+    @finalizer_manager.register(self, __getobj__)
+  end
+
+  def initialize_dup(other) # :nodoc:
+    initialize_copy_iv(other)
+    super(other)
+    @finalizer_manager.register(self, __getobj__)
+  end
+
+  def initialize_clone(other) # :nodoc:
+    initialize_copy_iv(other)
+    super(other)
+    @finalizer_manager.register(self, __getobj__)
+  end
+
+  private def initialize_copy_iv(other) # :nodoc:
+    @unlinked = other.unlinked
+    @mode = other.mode
+    @opts = other.opts
+    @finalizer_manager = other.finalizer_manager
   end
 
   # Opens or reopens the file with mode "r+".
   def open
     _close
+
     mode = @mode & ~(File::CREAT|File::EXCL)
-    @tmpfile = File.open(@tmpfile.path, mode, **@opts)
-    __setobj__(@tmpfile)
+    __setobj__(File.open(__getobj__.path, mode, **@opts))
+
+    @finalizer_manager.register(self, __getobj__)
+
+    __getobj__
   end
 
   def _close    # :nodoc:
-    @tmpfile.close
+    __getobj__.close
   end
   protected :_close
 
@@ -228,13 +323,15 @@ def close!
   def unlink
     return if @unlinked
     begin
-      File.unlink(@tmpfile.path)
+      File.unlink(__getobj__.path)
     rescue Errno::ENOENT
     rescue Errno::EACCES
       # may not be able to unlink on Windows; just ignore
       return
     end
-    ObjectSpace.undefine_finalizer(self)
+
+    @finalizer_manager.unlinked = true
+
     @unlinked = true
   end
   alias delete unlink
@@ -242,47 +339,61 @@ def unlink
   # Returns the full path name of the temporary file.
   # This will be nil if #unlink has been called.
   def path
-    @unlinked ? nil : @tmpfile.path
+    @unlinked ? nil : __getobj__.path
   end
 
   # Returns the size of the temporary file.  As a side effect, the IO
   # buffer is flushed before determining the size.
   def size
-    if !@tmpfile.closed?
-      @tmpfile.size # File#size calls rb_io_flush_raw()
+    if !__getobj__.closed?
+      __getobj__.size # File#size calls rb_io_flush_raw()
     else
-      File.size(@tmpfile.path)
+      File.size(__getobj__.path)
     end
   end
   alias length size
 
   # :stopdoc:
   def inspect
-    if @tmpfile.closed?
+    if __getobj__.closed?
       "#<#{self.class}:#{path} (closed)>"
     else
       "#<#{self.class}:#{path}>"
     end
   end
+  alias to_s inspect
 
-  class Remover # :nodoc:
-    def initialize(tmpfile)
+  protected
+
+  attr_reader :unlinked, :mode, :opts, :finalizer_manager
+
+  class FinalizerManager # :nodoc:
+    attr_accessor :unlinked
+
+    def initialize(path)
+      @open_files = {}
+      @path = path
       @pid = Process.pid
-      @tmpfile = tmpfile
+      @unlinked = false
     end
 
-    def call(*args)
-      return if @pid != Process.pid
+    def register(obj, file)
+      ObjectSpace.undefine_finalizer(obj)
+      ObjectSpace.define_finalizer(obj, self)
+      @open_files[obj.object_id] = file
+    end
 
-      $stderr.puts "removing #{@tmpfile.path}..." if $DEBUG
+    def call(object_id)
+      @open_files.delete(object_id).close
 
-      @tmpfile.close
-      begin
-        File.unlink(@tmpfile.path)
-      rescue Errno::ENOENT
+      if @open_files.empty? && !@unlinked && Process.pid == @pid
+        $stderr.puts "removing #{@path}..." if $DEBUG
+        begin
+          File.unlink(@path)
+        rescue Errno::ENOENT
+        end
+        $stderr.puts "done" if $DEBUG
       end
-
-      $stderr.puts "done" if $DEBUG
     end
   end
 
@@ -353,8 +464,9 @@ def open(*args, **kw)
 #   see {File Permissions}[rdoc-ref:File@File+Permissions].
 # - Mode is <tt>'w+'</tt> (read/write mode, positioned at the end).
 #
-# With no block, the file is not removed automatically,
-# and so should be explicitly removed.
+# The temporary file removal depends on the keyword argument +anonymous+ and
+# whether a block is given or not.
+# See the description about the +anonymous+ keyword argument later.
 #
 # Example:
 #
@@ -362,11 +474,36 @@ def open(*args, **kw)
 #   f.class                 # => File
 #   f.path                  # => "/tmp/20220505-9795-17ky6f6"
 #   f.stat.mode.to_s(8)     # => "100600"
+#   f.close
 #   File.exist?(f.path)     # => true
 #   File.unlink(f.path)
 #   File.exist?(f.path)     # => false
 #
-# Argument +basename+, if given, may be one of:
+#   Tempfile.create {|f|
+#     f.puts "foo"
+#     f.rewind
+#     f.read                # => "foo\n"
+#     f.path                # => "/tmp/20240524-380207-oma0ny"
+#     File.exist?(f.path)   # => true
+#   }                       # The file is removed at block exit.
+#
+#   f = Tempfile.create(anonymous: true)
+#   # The file is already removed because anonymous
+#   f.path                  # => "/tmp/"  (no filename since no file)
+#   f.puts "foo"
+#   f.rewind
+#   f.read                  # => "foo\n"
+#   f.close
+#
+#   Tempfile.create(anonymous: true) {|f|
+#     # The file is already removed because anonymous
+#     f.path                # => "/tmp/"  (no filename since no file)
+#     f.puts "foo"
+#     f.rewind
+#     f.read                # => "foo\n"
+#   }
+#
+# The argument +basename+, if given, may be one of the following:
 #
 # - A string: the generated filename begins with +basename+:
 #
@@ -377,27 +514,57 @@ def open(*args, **kw)
 #
 #     Tempfile.create(%w/foo .jpg/) # => #<File:/tmp/foo20220505-17839-tnjchh.jpg>
 #
-# With arguments +basename+ and +tmpdir+, the file is created in directory +tmpdir+:
+# With arguments +basename+ and +tmpdir+, the file is created in the directory +tmpdir+:
 #
 #   Tempfile.create('foo', '.') # => #<File:./foo20220505-9795-1emu6g8>
 #
-# Keyword arguments +mode+ and +options+ are passed directly to method
+# Keyword arguments +mode+ and +options+ are passed directly to the method
 # {File.open}[rdoc-ref:File.open]:
 #
-# - The value given with +mode+ must be an integer,
+# - The value given for +mode+ must be an integer
 #   and may be expressed as the logical OR of constants defined in
 #   {File::Constants}[rdoc-ref:File::Constants].
 # - For +options+, see {Open Options}[rdoc-ref:IO@Open+Options].
 #
-# With a block given, creates the file as above, passes it to the block,
-# and returns the block's value;
-# before the return, the file object is closed and the underlying file is removed:
+# The keyword argument +anonymous+ specifies when the file is removed.
+#
+# - <tt>anonymous=false</tt> (default) without a block: the file is not removed.
+# - <tt>anonymous=false</tt> (default) with a block: the file is removed after the block exits.
+# - <tt>anonymous=true</tt> without a block: the file is removed before returning.
+# - <tt>anonymous=true</tt> with a block: the file is removed before the block is called.
+#
+# In the first case (<tt>anonymous=false</tt> without a block),
+# the file is not removed automatically.
+# It should be explicitly closed.
+# It can be used to rename to the desired filename.
+# If the file is not needed, it should be explicitly removed.
+#
+# The File#path method of the created file object returns the temporary directory with a trailing slash
+# when +anonymous+ is true.
+#
+# When a block is given, it creates the file as described above, passes it to the block,
+# and returns the block's value.
+# Before the returning, the file object is closed and the underlying file is removed:
 #
 #   Tempfile.create {|file| file.path } # => "/tmp/20220505-9795-rkists"
 #
+# Implementation note:
+#
+# The keyword argument +anonymous=true+ is implemented using FILE_SHARE_DELETE on Windows.
+# O_TMPFILE is used on Linux.
+#
 # Related: Tempfile.new.
 #
-def Tempfile.create(basename="", tmpdir=nil, mode: 0, **options)
+def Tempfile.create(basename="", tmpdir=nil, mode: 0, anonymous: false, **options, &block)
+  if anonymous
+    create_anonymous(basename, tmpdir, mode: mode, **options, &block)
+  else
+    create_with_filename(basename, tmpdir, mode: mode, **options, &block)
+  end
+end
+
+class << Tempfile
+private def create_with_filename(basename="", tmpdir=nil, mode: 0, **options)
   tmpfile = nil
   Dir::Tmpname.create(basename, tmpdir, **options) do |tmpname, n, opts|
     mode |= File::RDWR|File::CREAT|File::EXCL
@@ -425,3 +592,49 @@ def Tempfile.create(basename="", tmpdir=nil, mode: 0, **options)
     tmpfile
   end
 end
+
+if RUBY_VERSION < "3.2"
+  module PathAttr               # :nodoc:
+    attr_reader :path
+
+    def self.set_path(file, path)
+      file.extend(self).instance_variable_set(:@path, path)
+    end
+  end
+end
+
+private def create_anonymous(basename="", tmpdir=nil, mode: 0, **options, &block)
+  tmpfile = nil
+  tmpdir = Dir.tmpdir() if tmpdir.nil?
+  if defined?(File::TMPFILE) # O_TMPFILE since Linux 3.11
+    begin
+      tmpfile = File.open(tmpdir, File::RDWR | File::TMPFILE, 0600)
+    rescue Errno::EISDIR, Errno::ENOENT, Errno::EOPNOTSUPP
+      # kernel or the filesystem does not support O_TMPFILE
+      # fallback to create-and-unlink
+    end
+  end
+  if tmpfile.nil?
+    mode |= File::SHARE_DELETE | File::BINARY # Windows needs them to unlink the opened file.
+    tmpfile = create_with_filename(basename, tmpdir, mode: mode, **options)
+    File.unlink(tmpfile.path)
+    tmppath = tmpfile.path
+  end
+  path = File.join(tmpdir, '')
+  unless tmppath == path
+    # clear path.
+    tmpfile.autoclose = false
+    tmpfile = File.new(tmpfile.fileno, mode: File::RDWR, path: path)
+    PathAttr.set_path(tmpfile, path) if defined?(PathAttr)
+  end
+  if block
+    begin
+      yield tmpfile
+    ensure
+      tmpfile.close
+    end
+  else
+    tmpfile
+  end
+end
+end
diff --git a/lib/time.gemspec b/lib/time.gemspec
index a9349a253fa27f..4b9f9e1218237d 100644
--- a/lib/time.gemspec
+++ b/lib/time.gemspec
@@ -20,8 +20,12 @@ Gem::Specification.new do |spec|
   spec.metadata["homepage_uri"] = spec.homepage
   spec.metadata["source_code_uri"] = spec.homepage
 
-  spec.files         = Dir.chdir(File.expand_path('..', __FILE__)) do
-    `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
+  srcdir, gemspec = File.split(__FILE__)
+  spec.files         = Dir.chdir(srcdir) do
+    `git ls-files -z`.split("\x0").reject { |f|
+      f == gemspec or
+        f.start_with?(".git", "bin/", "test/", "rakelib/", "Gemfile", "Rakefile")
+    }
   end
   spec.bindir        = "exe"
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
diff --git a/lib/time.rb b/lib/time.rb
index c572e76d7d2a56..a0fc7dfbf5d300 100644
--- a/lib/time.rb
+++ b/lib/time.rb
@@ -24,9 +24,10 @@
 
 # :startdoc:
 
+# #
 class Time
 
-  VERSION = "0.2.2"
+  VERSION = "0.4.1"             # :nodoc:
 
   class << Time
 
@@ -280,7 +281,7 @@ def make_time(date, year, yday, mon, day, hour, min, sec, sec_fraction, zone, no
     #
     # This method **does not** function as a validator.  If the input
     # string does not match valid formats strictly, you may get a
-    # cryptic result.  Should consider to use `Time.strptime` instead
+    # cryptic result.  Should consider to use Time.strptime instead
     # of this method as possible.
     #
     #     require 'time'
@@ -391,6 +392,8 @@ def parse(date, now=self.now)
     # heuristic to detect the format of the input string, you provide
     # a second argument that describes the format of the string.
     #
+    # Raises ArgumentError if the date or format is invalid.
+    #
     # If a block is given, the year described in +date+ is converted by the
     # block.  For example:
     #
@@ -405,7 +408,7 @@ def parse(date, now=self.now)
     # %c :: The preferred local date and time representation
     # %C :: Century (20 in 2009)
     # %d :: Day of the month (01..31)
-    # %D :: Date (%m/%d/%y)
+    # %D :: \Date (%m/%d/%y)
     # %e :: Day of the month, blank-padded ( 1..31)
     # %F :: Equivalent to %Y-%m-%d (the ISO 8601 date format)
     # %g :: The last two digits of the commercial year
@@ -442,8 +445,8 @@ def parse(date, now=self.now)
     # %X :: Preferred representation for the time alone, no date
     # %y :: Year without a century (00..99)
     # %Y :: Year which may include century, if provided
-    # %z :: Time zone as  hour offset from UTC (e.g. +0900)
-    # %Z :: Time zone name
+    # %z :: \Time zone as hour offset from UTC (e.g. +0900)
+    # %Z :: \Time zone name
     # %% :: Literal "%" character
     # %+ :: date(1) (%a %b %e %H:%M:%S %Z %Y)
     #
@@ -455,7 +458,7 @@ def parse(date, now=self.now)
     #
     def strptime(date, format, now=self.now)
       d = Date._strptime(date, format)
-      raise ArgumentError, "invalid date or strptime format - `#{date}' `#{format}'" unless d
+      raise ArgumentError, "invalid date or strptime format - '#{date}' '#{format}'" unless d
       if seconds = d[:seconds]
         if sec_fraction = d[:sec_fraction]
           usec = sec_fraction * 1000000
@@ -693,35 +696,36 @@ def httpdate
     getutc.strftime('%a, %d %b %Y %T GMT')
   end
 
-  #
-  # Returns a string which represents the time as a dateTime defined by XML
-  # Schema:
-  #
-  #   CCYY-MM-DDThh:mm:ssTZD
-  #   CCYY-MM-DDThh:mm:ss.sssTZD
-  #
-  # where TZD is Z or [+-]hh:mm.
-  #
-  # If self is a UTC time, Z is used as TZD.  [+-]hh:mm is used otherwise.
-  #
-  # +fraction_digits+ specifies a number of digits to use for fractional
-  # seconds.  Its default value is 0.
-  #
-  #     require 'time'
-  #
-  #     t = Time.now
-  #     t.iso8601  # => "2011-10-05T22:26:12-04:00"
-  #
-  # You must require 'time' to use this method.
-  #
-  def xmlschema(fraction_digits=0)
-    fraction_digits = fraction_digits.to_i
-    s = strftime("%FT%T")
-    if fraction_digits > 0
-      s << strftime(".%#{fraction_digits}N")
+  unless method_defined?(:xmlschema)
+    #
+    # Returns a string which represents the time as a dateTime defined by XML
+    # Schema:
+    #
+    #   CCYY-MM-DDThh:mm:ssTZD
+    #   CCYY-MM-DDThh:mm:ss.sssTZD
+    #
+    # where TZD is Z or [+-]hh:mm.
+    #
+    # If self is a UTC time, Z is used as TZD.  [+-]hh:mm is used otherwise.
+    #
+    # +fraction_digits+ specifies a number of digits to use for fractional
+    # seconds.  Its default value is 0.
+    #
+    #     require 'time'
+    #
+    #     t = Time.now
+    #     t.iso8601  # => "2011-10-05T22:26:12-04:00"
+    #
+    # You must require 'time' to use this method.
+    #
+    def xmlschema(fraction_digits=0)
+      fraction_digits = fraction_digits.to_i
+      s = strftime("%FT%T")
+      if fraction_digits > 0
+        s << strftime(".%#{fraction_digits}N")
+      end
+      s << (utc? ? 'Z' : strftime("%:z"))
     end
-    s << (utc? ? 'Z' : strftime("%:z"))
   end
-  alias iso8601 xmlschema
+  alias iso8601 xmlschema unless method_defined?(:iso8601)
 end
-
diff --git a/lib/timeout.gemspec b/lib/timeout.gemspec
index 258517c5f89910..5449494e071b2f 100644
--- a/lib/timeout.gemspec
+++ b/lib/timeout.gemspec
@@ -20,6 +20,7 @@ Gem::Specification.new do |spec|
 
   spec.metadata["homepage_uri"] = spec.homepage
   spec.metadata["source_code_uri"] = spec.homepage
+  spec.metadata["changelog_uri"] = spec.homepage + "/releases"
 
   spec.required_ruby_version = '>= 2.6.0'
 
diff --git a/lib/timeout.rb b/lib/timeout.rb
index 39c47cf2b4530e..f5f232ad2ae072 100644
--- a/lib/timeout.rb
+++ b/lib/timeout.rb
@@ -4,7 +4,7 @@
 # == Synopsis
 #
 #   require 'timeout'
-#   status = Timeout::timeout(5) {
+#   status = Timeout.timeout(5) {
 #     # Something that should be interrupted if it takes more than 5 seconds...
 #   }
 #
@@ -13,28 +13,25 @@
 # Timeout provides a way to auto-terminate a potentially long-running
 # operation if it hasn't finished in a fixed amount of time.
 #
-# Previous versions didn't use a module for namespacing, however
-# #timeout is provided for backwards compatibility.  You
-# should prefer Timeout.timeout instead.
-#
 # == Copyright
 #
 # Copyright:: (C) 2000  Network Applied Communication Laboratory, Inc.
 # Copyright:: (C) 2000  Information-technology Promotion Agency, Japan
 
 module Timeout
-  VERSION = "0.4.0"
+  # The version
+  VERSION = "0.4.3"
 
   # Internal error raised to when a timeout is triggered.
   class ExitException < Exception
-    def exception(*)
+    def exception(*) # :nodoc:
       self
     end
   end
 
   # Raised by Timeout.timeout when the block times out.
   class Error < RuntimeError
-    def self.handle_timeout(message)
+    def self.handle_timeout(message) # :nodoc:
       exc = ExitException.new(message)
 
       begin
@@ -126,6 +123,9 @@ def self.create_timeout_thread
 
   def self.ensure_timeout_thread_created
     unless @timeout_thread and @timeout_thread.alive?
+      # If the Mutex is already owned we are in a signal handler.
+      # In that case, just return and let the main thread create the @timeout_thread.
+      return if TIMEOUT_THREAD_MUTEX.owned?
       TIMEOUT_THREAD_MUTEX.synchronize do
         unless @timeout_thread and @timeout_thread.alive?
           @timeout_thread = create_timeout_thread
@@ -144,9 +144,10 @@ def self.ensure_timeout_thread_created
   # Perform an operation in a block, raising an error if it takes longer than
   # +sec+ seconds to complete.
   #
-  # +sec+:: Number of seconds to wait for the block to terminate. Any number
-  #         may be used, including Floats to specify fractional seconds. A
+  # +sec+:: Number of seconds to wait for the block to terminate. Any non-negative number
+  #         or nil may be used, including Floats to specify fractional seconds. A
   #         value of 0 or +nil+ will execute the block without any timeout.
+  #         Any negative number will raise an ArgumentError.
   # +klass+:: Exception Class to raise if the block fails to terminate
   #           in +sec+ seconds.  Omitting will use the default, Timeout::Error
   # +message+:: Error message to raise with Exception Class.
@@ -168,6 +169,7 @@ def self.ensure_timeout_thread_created
   # a module method, so you can call it directly as Timeout.timeout().
   def timeout(sec, klass = nil, message = nil, &block)   #:yield: +sec+
     return yield(sec) if sec == nil or sec.zero?
+    raise ArgumentError, "Timeout sec must be a non-negative number" if 0 > sec
 
     message ||= "execution expired"
 
diff --git a/lib/tmpdir.gemspec b/lib/tmpdir.gemspec
index a480b9c018b2bb..4935d1cb3cacb3 100644
--- a/lib/tmpdir.gemspec
+++ b/lib/tmpdir.gemspec
@@ -1,6 +1,6 @@
 Gem::Specification.new do |spec|
   spec.name          = "tmpdir"
-  spec.version       = "0.1.3"
+  spec.version       = "0.3.1"
   spec.authors       = ["Yukihiro Matsumoto"]
   spec.email         = ["matz@ruby-lang.org"]
 
@@ -15,8 +15,12 @@ Gem::Specification.new do |spec|
 
   # 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 2>#{IO::NULL}`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
+  gemspec = File.basename(__FILE__)
+  spec.files = IO.popen(%w[git ls-files -z], chdir: __dir__, err: IO::NULL, exception: false) do |ls|
+    ls.readlines("\x0", chomp: true).reject do |f|
+      (f == gemspec) ||
+        f.start_with?(*%w[bin/ test/ spec/ features/ .git Gemfile])
+    end
   end
   spec.bindir        = "exe"
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
diff --git a/lib/tmpdir.rb b/lib/tmpdir.rb
index db5ed978cd3bb7..f78fd721b7bb2a 100644
--- a/lib/tmpdir.rb
+++ b/lib/tmpdir.rb
@@ -16,15 +16,14 @@ class Dir
   # Class variables are inaccessible from non-main Ractor.
   # And instance variables too, in Ruby 3.0.
 
-  # System-wide temporary directory path
-  SYSTMPDIR = (defined?(Etc.systmpdir) ? Etc.systmpdir.freeze : '/tmp')
-  private_constant :SYSTMPDIR
-
   ##
   # Returns the operating system's temporary file path.
+  #
+  #   require 'tmpdir'
+  #   Dir.tmpdir # => "/tmp"
 
   def self.tmpdir
-    ['TMPDIR', 'TMP', 'TEMP', ['system temporary path', SYSTMPDIR], ['/tmp']*2, ['.']*2].find do |name, dir|
+    Tmpname::TMPDIR_CANDIDATES.find do |name, dir|
       unless dir
         next if !(dir = ENV[name] rescue next) or dir.empty?
       end
@@ -33,7 +32,9 @@ def self.tmpdir
       case
       when !stat.directory?
         warn "#{name} is not a directory: #{dir}"
-      when !stat.writable?
+      when !File.writable?(dir)
+        # We call File.writable?, not stat.writable?, because you can't tell if a dir is actually
+        # writable just from stat; OS mechanisms other than user/group/world bits can affect this.
         warn "#{name} is not writable: #{dir}"
       when stat.world_writable? && !stat.sticky?
         warn "#{name} is world-writable: #{dir}"
@@ -45,6 +46,11 @@ def self.tmpdir
 
   # Dir.mktmpdir creates a temporary directory.
   #
+  #   require 'tmpdir'
+  #   Dir.mktmpdir {|dir|
+  #     # use the directory
+  #   }
+  #
   # The directory is created with 0700 permission.
   # Application should not change the permission to make the temporary directory accessible from other users.
   #
@@ -88,20 +94,21 @@ def self.tmpdir
   #    FileUtils.remove_entry dir
   #  end
   #
-  def self.mktmpdir(prefix_suffix=nil, *rest, **options)
+  def self.mktmpdir(prefix_suffix=nil, *rest, **options, &block)
     base = nil
     path = Tmpname.create(prefix_suffix || "d", *rest, **options) {|path, _, _, d|
       base = d
       mkdir(path, 0700)
     }
-    if block_given?
+    if block
       begin
         yield path.dup
       ensure
         unless base
-          stat = File.stat(File.dirname(path))
+          base = File.dirname(path)
+          stat = File.stat(base)
           if stat.world_writable? and !stat.sticky?
-            raise ArgumentError, "parent directory is world writable but not sticky"
+            raise ArgumentError, "parent directory is world writable but not sticky: #{base}"
           end
         end
         FileUtils.remove_entry path
@@ -115,6 +122,18 @@ def self.mktmpdir(prefix_suffix=nil, *rest, **options)
   module Tmpname # :nodoc:
     module_function
 
+    # System-wide temporary directory path
+    systmpdir = (defined?(Etc.systmpdir) ? Etc.systmpdir.freeze : '/tmp')
+
+    # Temporary directory candidates consisting of environment variable
+    # names or description and path pairs.
+    TMPDIR_CANDIDATES = [
+      'TMPDIR', 'TMP', 'TEMP',
+      ['system temporary path', systmpdir],
+      %w[/tmp /tmp],
+      %w[. .],
+    ].each(&:freeze).freeze
+
     def tmpdir
       Dir.tmpdir
     end
@@ -138,8 +157,12 @@ def next
 
     # Generates and yields random names to create a temporary name
     def create(basename, tmpdir=nil, max_try: nil, **opts)
-      origdir = tmpdir
-      tmpdir ||= tmpdir()
+      if tmpdir
+        origdir = tmpdir = File.path(tmpdir)
+        raise ArgumentError, "empty parent path" if tmpdir.empty?
+      else
+        tmpdir = tmpdir()
+      end
       n = nil
       prefix, suffix = basename
       prefix = (String.try_convert(prefix) or
@@ -158,7 +181,7 @@ def create(basename, tmpdir=nil, max_try: nil, **opts)
         n ||= 0
         n += 1
         retry if !max_try or n < max_try
-        raise "cannot generate temporary name using `#{basename}' under `#{tmpdir}'"
+        raise "cannot generate temporary name using '#{basename}' under '#{tmpdir}'"
       end
       path
     end
diff --git a/lib/tsort.gemspec b/lib/tsort.gemspec
index 0e2f110a531df4..8970cbe8261770 100644
--- a/lib/tsort.gemspec
+++ b/lib/tsort.gemspec
@@ -20,8 +20,13 @@ Gem::Specification.new do |spec|
   spec.metadata["homepage_uri"] = spec.homepage
   spec.metadata["source_code_uri"] = spec.homepage
 
-  spec.files         = Dir.chdir(File.expand_path('..', __FILE__)) do
-    `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
+  dir, gemspec = File.split(__FILE__)
+  excludes = %W[
+    :^/.git* :^/bin/ :^/test/ :^/spec/ :^/features/ :^/Gemfile :^/Rakefile
+    :^/#{gemspec}
+  ]
+  spec.files = IO.popen(%w[git ls-files -z --] + excludes, chdir: dir) do |f|
+    f.read.split("\x0")
   end
   spec.bindir        = "exe"
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
diff --git a/lib/tsort.rb b/lib/tsort.rb
index 3a2a91a7b4f18c..3c9635baa31c23 100644
--- a/lib/tsort.rb
+++ b/lib/tsort.rb
@@ -123,8 +123,10 @@
 
 module TSort
 
-  VERSION = "0.1.1"
+  # The version string.
+  VERSION = "0.2.0"
 
+  # Exception class to be raised when a cycle is found.
   class Cyclic < StandardError
   end
 
diff --git a/lib/un.rb b/lib/un.rb
index 632960bf53b3b5..8fb3c61a93e722 100644
--- a/lib/un.rb
+++ b/lib/un.rb
@@ -30,7 +30,6 @@
 require "optparse"
 
 module FileUtils
-#  @fileutils_label = ""
   @fileutils_output = $stdout
 end
 
@@ -413,7 +412,7 @@ def help
 
 module UN # :nodoc:
 
-  VERSION = "0.2.1"
+  VERSION = "0.3.0"
 
   module_function
   def help(argv, output: $stdout)
diff --git a/lib/unicode_normalize/normalize.rb b/lib/unicode_normalize/normalize.rb
index 1caf2cc8c8a805..e67fad187a5fb1 100644
--- a/lib/unicode_normalize/normalize.rb
+++ b/lib/unicode_normalize/normalize.rb
@@ -114,6 +114,7 @@ def self.nfc_one(string)
         last_class = accent_class
       end
     end
+    accents = nfc_one(accents) if accents.length>1 # TODO: change from recursion to loop
     hangul_comp_one(start+accents)
   end
 
diff --git a/lib/unicode_normalize/tables.rb b/lib/unicode_normalize/tables.rb
index 7448fad13fa26f..b5b708defd4b01 100644
--- a/lib/unicode_normalize/tables.rb
+++ b/lib/unicode_normalize/tables.rb
@@ -1,6 +1,9 @@
 # coding: us-ascii
 # frozen_string_literal: true
 
+Encoding::UNICODE_VERSION == "16.0.0" or
+  raise "Unicode version mismatch: 16.0.0 expected but #{Encoding::UNICODE_VERSION}"
+
 # automatically generated by template/unicode_norm_gen.tmpl
 
 module UnicodeNormalize  # :nodoc:
@@ -29,7 +32,7 @@ module UnicodeNormalize  # :nodoc:
     "\u0825-\u0827" \
     "\u0829-\u082D" \
     "\u0859-\u085B" \
-    "\u0898-\u089F" \
+    "\u0897-\u089F" \
     "\u08CA-\u08E1" \
     "\u08E3-\u08FF" \
     "\u093C" \
@@ -149,6 +152,7 @@ module UnicodeNormalize  # :nodoc:
     "\u{10A3F}" \
     "\u{10AE5}\u{10AE6}" \
     "\u{10D24}-\u{10D27}" \
+    "\u{10D69}-\u{10D6D}" \
     "\u{10EAB}\u{10EAC}" \
     "\u{10EFD}-\u{10EFF}" \
     "\u{10F46}-\u{10F50}" \
@@ -171,6 +175,12 @@ module UnicodeNormalize  # :nodoc:
     "\u{11357}" \
     "\u{11366}-\u{1136C}" \
     "\u{11370}-\u{11374}" \
+    "\u{113B8}" \
+    "\u{113BB}" \
+    "\u{113C2}" \
+    "\u{113C5}" \
+    "\u{113C7}-\u{113C9}" \
+    "\u{113CE}-\u{113D0}" \
     "\u{11442}" \
     "\u{11446}" \
     "\u{1145E}" \
@@ -196,8 +206,11 @@ module UnicodeNormalize  # :nodoc:
     "\u{11D44}\u{11D45}" \
     "\u{11D97}" \
     "\u{11F41}\u{11F42}" \
+    "\u{1611E}-\u{16129}" \
+    "\u{1612F}" \
     "\u{16AF0}-\u{16AF4}" \
     "\u{16B30}-\u{16B36}" \
+    "\u{16D67}\u{16D68}" \
     "\u{16FF0}\u{16FF1}" \
     "\u{1BC9E}" \
     "\u{1D165}-\u{1D169}" \
@@ -216,6 +229,7 @@ module UnicodeNormalize  # :nodoc:
     "\u{1E2AE}" \
     "\u{1E2EC}-\u{1E2EF}" \
     "\u{1E4EC}-\u{1E4EF}" \
+    "\u{1E5EE}\u{1E5EF}" \
     "\u{1E8D0}-\u{1E8D6}" \
     "\u{1E944}-\u{1E94A}" \
     "]"
@@ -441,15 +455,25 @@ module UnicodeNormalize  # :nodoc:
     "\uFB40\uFB41" \
     "\uFB43\uFB44" \
     "\uFB46-\uFB4E" \
+    "\u{105C9}" \
+    "\u{105E4}" \
     "\u{1109A}" \
     "\u{1109C}" \
     "\u{110AB}" \
     "\u{1112E}\u{1112F}" \
     "\u{1134B}\u{1134C}" \
+    "\u{11383}" \
+    "\u{11385}" \
+    "\u{1138E}" \
+    "\u{11391}" \
+    "\u{113C5}" \
+    "\u{113C7}\u{113C8}" \
     "\u{114BB}\u{114BC}" \
     "\u{114BE}" \
     "\u{115BA}\u{115BB}" \
     "\u{11938}" \
+    "\u{16121}-\u{16128}" \
+    "\u{16D68}-\u{16D6A}" \
     "\u{1D15E}-\u{1D164}" \
     "\u{1D1BB}-\u{1D1C0}" \
     "\u{2F800}-\u{2FA1D}" \
@@ -613,14 +637,25 @@ module UnicodeNormalize  # :nodoc:
     "\u30DB" \
     "\u30EF-\u30F2" \
     "\u30FD" \
+    "\u{105D2}" \
+    "\u{105DA}" \
     "\u{11099}" \
     "\u{1109B}" \
     "\u{110A5}" \
     "\u{11131}\u{11132}" \
     "\u{11347}" \
+    "\u{11382}" \
+    "\u{11384}" \
+    "\u{1138B}" \
+    "\u{11390}" \
+    "\u{113C2}" \
     "\u{114B9}" \
     "\u{115B8}\u{115B9}" \
     "\u{11935}" \
+    "\u{1611E}" \
+    "\u{16129}" \
+    "\u{16D63}" \
+    "\u{16D67}" \
     "]?#{accents}+" \
     "|#{''  # precomposed Hangul syllables
     }" \
@@ -891,6 +926,10 @@ module UnicodeNormalize  # :nodoc:
     "\u30F4" \
     "\u30F7-\u30FA" \
     "\u30FD\u30FE" \
+    "\u{105C9}" \
+    "\u{105D2}" \
+    "\u{105DA}" \
+    "\u{105E4}" \
     "\u{11099}-\u{1109C}" \
     "\u{110A5}" \
     "\u{110AB}" \
@@ -898,12 +937,23 @@ module UnicodeNormalize  # :nodoc:
     "\u{11131}\u{11132}" \
     "\u{11347}" \
     "\u{1134B}\u{1134C}" \
+    "\u{11382}-\u{11385}" \
+    "\u{1138B}" \
+    "\u{1138E}" \
+    "\u{11390}\u{11391}" \
+    "\u{113C2}" \
+    "\u{113C5}" \
+    "\u{113C7}\u{113C8}" \
     "\u{114B9}" \
     "\u{114BB}\u{114BC}" \
     "\u{114BE}" \
     "\u{115B8}-\u{115BB}" \
     "\u{11935}" \
     "\u{11938}" \
+    "\u{1611E}" \
+    "\u{16121}-\u{16129}" \
+    "\u{16D63}" \
+    "\u{16D67}-\u{16D6A}" \
     "]?#{accents}+" \
     "|#{''  # Hangul syllables with separate trailer
     }" \
@@ -1440,6 +1490,7 @@ module UnicodeNormalize  # :nodoc:
     "\u{10781}-\u{10785}" \
     "\u{10787}-\u{107B0}" \
     "\u{107B2}-\u{107BA}" \
+    "\u{1CCD6}-\u{1CCF9}" \
     "\u{1D400}-\u{1D454}" \
     "\u{1D456}-\u{1D49C}" \
     "\u{1D49E}\u{1D49F}" \
@@ -1789,6 +1840,7 @@ module UnicodeNormalize  # :nodoc:
     "\u0859"=>220,
     "\u085A"=>220,
     "\u085B"=>220,
+    "\u0897"=>230,
     "\u0898"=>230,
     "\u0899"=>220,
     "\u089A"=>220,
@@ -2234,6 +2286,11 @@ module UnicodeNormalize  # :nodoc:
     "\u{10D25}"=>230,
     "\u{10D26}"=>230,
     "\u{10D27}"=>230,
+    "\u{10D69}"=>230,
+    "\u{10D6A}"=>230,
+    "\u{10D6B}"=>230,
+    "\u{10D6C}"=>230,
+    "\u{10D6D}"=>230,
     "\u{10EAB}"=>230,
     "\u{10EAC}"=>230,
     "\u{10EFD}"=>220,
@@ -2286,6 +2343,9 @@ module UnicodeNormalize  # :nodoc:
     "\u{11372}"=>230,
     "\u{11373}"=>230,
     "\u{11374}"=>230,
+    "\u{113CE}"=>9,
+    "\u{113CF}"=>9,
+    "\u{113D0}"=>9,
     "\u{11442}"=>9,
     "\u{11446}"=>7,
     "\u{1145E}"=>230,
@@ -2313,6 +2373,7 @@ module UnicodeNormalize  # :nodoc:
     "\u{11D97}"=>9,
     "\u{11F41}"=>9,
     "\u{11F42}"=>9,
+    "\u{1612F}"=>9,
     "\u{16AF0}"=>1,
     "\u{16AF1}"=>1,
     "\u{16AF2}"=>1,
@@ -2416,6 +2477,8 @@ module UnicodeNormalize  # :nodoc:
     "\u{1E4ED}"=>232,
     "\u{1E4EE}"=>220,
     "\u{1E4EF}"=>230,
+    "\u{1E5EE}"=>230,
+    "\u{1E5EF}"=>220,
     "\u{1E8D0}"=>220,
     "\u{1E8D1}"=>220,
     "\u{1E8D2}"=>220,
@@ -3928,6 +3991,8 @@ module UnicodeNormalize  # :nodoc:
     "\uFB4C"=>"\u05D1\u05BF",
     "\uFB4D"=>"\u05DB\u05BF",
     "\uFB4E"=>"\u05E4\u05BF",
+    "\u{105C9}"=>"\u{105D2}\u0307",
+    "\u{105E4}"=>"\u{105DA}\u0307",
     "\u{1109A}"=>"\u{11099}\u{110BA}",
     "\u{1109C}"=>"\u{1109B}\u{110BA}",
     "\u{110AB}"=>"\u{110A5}\u{110BA}",
@@ -3935,12 +4000,30 @@ module UnicodeNormalize  # :nodoc:
     "\u{1112F}"=>"\u{11132}\u{11127}",
     "\u{1134B}"=>"\u{11347}\u{1133E}",
     "\u{1134C}"=>"\u{11347}\u{11357}",
+    "\u{11383}"=>"\u{11382}\u{113C9}",
+    "\u{11385}"=>"\u{11384}\u{113BB}",
+    "\u{1138E}"=>"\u{1138B}\u{113C2}",
+    "\u{11391}"=>"\u{11390}\u{113C9}",
+    "\u{113C5}"=>"\u{113C2}\u{113C2}",
+    "\u{113C7}"=>"\u{113C2}\u{113B8}",
+    "\u{113C8}"=>"\u{113C2}\u{113C9}",
     "\u{114BB}"=>"\u{114B9}\u{114BA}",
     "\u{114BC}"=>"\u{114B9}\u{114B0}",
     "\u{114BE}"=>"\u{114B9}\u{114BD}",
     "\u{115BA}"=>"\u{115B8}\u{115AF}",
     "\u{115BB}"=>"\u{115B9}\u{115AF}",
     "\u{11938}"=>"\u{11935}\u{11930}",
+    "\u{16121}"=>"\u{1611E}\u{1611E}",
+    "\u{16122}"=>"\u{1611E}\u{16129}",
+    "\u{16123}"=>"\u{1611E}\u{1611F}",
+    "\u{16124}"=>"\u{16129}\u{1611F}",
+    "\u{16125}"=>"\u{1611E}\u{16120}",
+    "\u{16126}"=>"\u{1611E}\u{1611E}\u{1611F}",
+    "\u{16127}"=>"\u{1611E}\u{16129}\u{1611F}",
+    "\u{16128}"=>"\u{1611E}\u{1611E}\u{16120}",
+    "\u{16D68}"=>"\u{16D67}\u{16D67}",
+    "\u{16D69}"=>"\u{16D63}\u{16D67}",
+    "\u{16D6A}"=>"\u{16D63}\u{16D67}\u{16D67}",
     "\u{1D15E}"=>"\u{1D157}\u{1D165}",
     "\u{1D15F}"=>"\u{1D158}\u{1D165}",
     "\u{1D160}"=>"\u{1D158}\u{1D165}\u{1D16E}",
@@ -6950,6 +7033,42 @@ module UnicodeNormalize  # :nodoc:
     "\u{107B8}"=>"\u01C2",
     "\u{107B9}"=>"\u{1DF0A}",
     "\u{107BA}"=>"\u{1DF1E}",
+    "\u{1CCD6}"=>"A",
+    "\u{1CCD7}"=>"B",
+    "\u{1CCD8}"=>"C",
+    "\u{1CCD9}"=>"D",
+    "\u{1CCDA}"=>"E",
+    "\u{1CCDB}"=>"F",
+    "\u{1CCDC}"=>"G",
+    "\u{1CCDD}"=>"H",
+    "\u{1CCDE}"=>"I",
+    "\u{1CCDF}"=>"J",
+    "\u{1CCE0}"=>"K",
+    "\u{1CCE1}"=>"L",
+    "\u{1CCE2}"=>"M",
+    "\u{1CCE3}"=>"N",
+    "\u{1CCE4}"=>"O",
+    "\u{1CCE5}"=>"P",
+    "\u{1CCE6}"=>"Q",
+    "\u{1CCE7}"=>"R",
+    "\u{1CCE8}"=>"S",
+    "\u{1CCE9}"=>"T",
+    "\u{1CCEA}"=>"U",
+    "\u{1CCEB}"=>"V",
+    "\u{1CCEC}"=>"W",
+    "\u{1CCED}"=>"X",
+    "\u{1CCEE}"=>"Y",
+    "\u{1CCEF}"=>"Z",
+    "\u{1CCF0}"=>"0",
+    "\u{1CCF1}"=>"1",
+    "\u{1CCF2}"=>"2",
+    "\u{1CCF3}"=>"3",
+    "\u{1CCF4}"=>"4",
+    "\u{1CCF5}"=>"5",
+    "\u{1CCF6}"=>"6",
+    "\u{1CCF7}"=>"7",
+    "\u{1CCF8}"=>"8",
+    "\u{1CCF9}"=>"9",
     "\u{1D400}"=>"A",
     "\u{1D401}"=>"B",
     "\u{1D402}"=>"C",
@@ -9242,6 +9361,8 @@ module UnicodeNormalize  # :nodoc:
     "\u30F1\u3099"=>"\u30F9",
     "\u30F2\u3099"=>"\u30FA",
     "\u30FD\u3099"=>"\u30FE",
+    "\u{105D2}\u0307"=>"\u{105C9}",
+    "\u{105DA}\u0307"=>"\u{105E4}",
     "\u{11099}\u{110BA}"=>"\u{1109A}",
     "\u{1109B}\u{110BA}"=>"\u{1109C}",
     "\u{110A5}\u{110BA}"=>"\u{110AB}",
@@ -9249,11 +9370,29 @@ module UnicodeNormalize  # :nodoc:
     "\u{11132}\u{11127}"=>"\u{1112F}",
     "\u{11347}\u{1133E}"=>"\u{1134B}",
     "\u{11347}\u{11357}"=>"\u{1134C}",
+    "\u{11382}\u{113C9}"=>"\u{11383}",
+    "\u{11384}\u{113BB}"=>"\u{11385}",
+    "\u{1138B}\u{113C2}"=>"\u{1138E}",
+    "\u{11390}\u{113C9}"=>"\u{11391}",
+    "\u{113C2}\u{113C2}"=>"\u{113C5}",
+    "\u{113C2}\u{113B8}"=>"\u{113C7}",
+    "\u{113C2}\u{113C9}"=>"\u{113C8}",
     "\u{114B9}\u{114BA}"=>"\u{114BB}",
     "\u{114B9}\u{114B0}"=>"\u{114BC}",
     "\u{114B9}\u{114BD}"=>"\u{114BE}",
     "\u{115B8}\u{115AF}"=>"\u{115BA}",
     "\u{115B9}\u{115AF}"=>"\u{115BB}",
     "\u{11935}\u{11930}"=>"\u{11938}",
+    "\u{1611E}\u{1611E}"=>"\u{16121}",
+    "\u{1611E}\u{16129}"=>"\u{16122}",
+    "\u{1611E}\u{1611F}"=>"\u{16123}",
+    "\u{16129}\u{1611F}"=>"\u{16124}",
+    "\u{1611E}\u{16120}"=>"\u{16125}",
+    "\u{16121}\u{1611F}"=>"\u{16126}",
+    "\u{16122}\u{1611F}"=>"\u{16127}",
+    "\u{16121}\u{16120}"=>"\u{16128}",
+    "\u{16D67}\u{16D67}"=>"\u{16D68}",
+    "\u{16D63}\u{16D67}"=>"\u{16D69}",
+    "\u{16D69}\u{16D67}"=>"\u{16D6A}",
   }.freeze
 end
diff --git a/lib/uri.rb b/lib/uri.rb
index 59a7c4ad28dbf5..dfdb052a79057c 100644
--- a/lib/uri.rb
+++ b/lib/uri.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: false
 # URI is a module providing classes to handle Uniform Resource Identifiers
-# (RFC2396[http://tools.ietf.org/html/rfc2396]).
+# (RFC2396[https://www.rfc-editor.org/rfc/rfc2396]).
 #
 # == Features
 #
@@ -47,14 +47,14 @@
 # A good place to view an RFC spec is http://www.ietf.org/rfc.html.
 #
 # Here is a list of all related RFC's:
-# - RFC822[http://tools.ietf.org/html/rfc822]
-# - RFC1738[http://tools.ietf.org/html/rfc1738]
-# - RFC2255[http://tools.ietf.org/html/rfc2255]
-# - RFC2368[http://tools.ietf.org/html/rfc2368]
-# - RFC2373[http://tools.ietf.org/html/rfc2373]
-# - RFC2396[http://tools.ietf.org/html/rfc2396]
-# - RFC2732[http://tools.ietf.org/html/rfc2732]
-# - RFC3986[http://tools.ietf.org/html/rfc3986]
+# - RFC822[https://www.rfc-editor.org/rfc/rfc822]
+# - RFC1738[https://www.rfc-editor.org/rfc/rfc1738]
+# - RFC2255[https://www.rfc-editor.org/rfc/rfc2255]
+# - RFC2368[https://www.rfc-editor.org/rfc/rfc2368]
+# - RFC2373[https://www.rfc-editor.org/rfc/rfc2373]
+# - RFC2396[https://www.rfc-editor.org/rfc/rfc2396]
+# - RFC2732[https://www.rfc-editor.org/rfc/rfc2732]
+# - RFC3986[https://www.rfc-editor.org/rfc/rfc3986]
 #
 # == Class tree
 #
diff --git a/lib/uri/common.rb b/lib/uri/common.rb
index dce09fbc1eeabc..61221fafad1a7e 100644
--- a/lib/uri/common.rb
+++ b/lib/uri/common.rb
@@ -13,24 +13,51 @@
 require_relative "rfc3986_parser"
 
 module URI
-  include RFC2396_REGEXP
+  # The default parser instance for RFC 2396.
+  RFC2396_PARSER = RFC2396_Parser.new
+  Ractor.make_shareable(RFC2396_PARSER) if defined?(Ractor)
 
-  REGEXP = RFC2396_REGEXP
-  Parser = RFC2396_Parser
+  # The default parser instance for RFC 3986.
   RFC3986_PARSER = RFC3986_Parser.new
   Ractor.make_shareable(RFC3986_PARSER) if defined?(Ractor)
 
-  # URI::Parser.new
-  DEFAULT_PARSER = Parser.new
-  DEFAULT_PARSER.pattern.each_pair do |sym, str|
-    unless REGEXP::PATTERN.const_defined?(sym)
-      REGEXP::PATTERN.const_set(sym, str)
+  # The default parser instance.
+  DEFAULT_PARSER = RFC3986_PARSER
+  Ractor.make_shareable(DEFAULT_PARSER) if defined?(Ractor)
+
+  # Set the default parser instance.
+  def self.parser=(parser = RFC3986_PARSER)
+    remove_const(:Parser) if defined?(::URI::Parser)
+    const_set("Parser", parser.class)
+
+    remove_const(:REGEXP) if defined?(::URI::REGEXP)
+    remove_const(:PATTERN) if defined?(::URI::PATTERN)
+    if Parser == RFC2396_Parser
+      const_set("REGEXP", URI::RFC2396_REGEXP)
+      const_set("PATTERN", URI::RFC2396_REGEXP::PATTERN)
+    end
+
+    Parser.new.regexp.each_pair do |sym, str|
+      remove_const(sym) if const_defined?(sym, false)
+      const_set(sym, str)
     end
   end
-  DEFAULT_PARSER.regexp.each_pair do |sym, str|
-    const_set(sym, str)
+  self.parser = RFC3986_PARSER
+
+  def self.const_missing(const) # :nodoc:
+    if const == :REGEXP
+      warn "URI::REGEXP is obsolete. Use URI::RFC2396_REGEXP explicitly.", uplevel: 1 if $VERBOSE
+      URI::RFC2396_REGEXP
+    elsif value = RFC2396_PARSER.regexp[const]
+      warn "URI::#{const} is obsolete. Use URI::RFC2396_PARSER.regexp[#{const.inspect}] explicitly.", uplevel: 1 if $VERBOSE
+      value
+    elsif value = RFC2396_Parser.const_get(const)
+      warn "URI::#{const} is obsolete. Use URI::RFC2396_Parser::#{const} explicitly.", uplevel: 1 if $VERBOSE
+      value
+    else
+      super
+    end
   end
-  Ractor.make_shareable(DEFAULT_PARSER) if defined?(Ractor)
 
   module Util # :nodoc:
     def make_components_hash(klass, array_hash)
@@ -64,7 +91,41 @@ def make_components_hash(klass, array_hash)
     module_function :make_components_hash
   end
 
-  module Schemes
+  module Schemes # :nodoc:
+    class << self
+      ReservedChars = ".+-"
+      EscapedChars = "\u01C0\u01C1\u01C2"
+      # Use Lo category chars as escaped chars for TruffleRuby, which
+      # does not allow Symbol categories as identifiers.
+
+      def escape(name)
+        unless name and name.ascii_only?
+          return nil
+        end
+        name.upcase.tr(ReservedChars, EscapedChars)
+      end
+
+      def unescape(name)
+        name.tr(EscapedChars, ReservedChars).encode(Encoding::US_ASCII).upcase
+      end
+
+      def find(name)
+        const_get(name, false) if name and const_defined?(name, false)
+      end
+
+      def register(name, klass)
+        unless scheme = escape(name)
+          raise ArgumentError, "invalid character as scheme - #{name}"
+        end
+        const_set(scheme, klass)
+      end
+
+      def list
+        constants.map { |name|
+          [unescape(name.to_s), const_get(name)]
+        }.to_h
+      end
+    end
   end
   private_constant :Schemes
 
@@ -77,7 +138,7 @@ module Schemes
   # Note that after calling String#upcase on +scheme+, it must be a valid
   # constant name.
   def self.register_scheme(scheme, klass)
-    Schemes.const_set(scheme.to_s.upcase, klass)
+    Schemes.register(scheme, klass)
   end
 
   # Returns a hash of the defined schemes:
@@ -95,14 +156,14 @@ def self.register_scheme(scheme, klass)
   #
   # Related: URI.register_scheme.
   def self.scheme_list
-    Schemes.constants.map { |name|
-      [name.to_s.upcase, Schemes.const_get(name)]
-    }.to_h
+    Schemes.list
   end
 
+  # :stopdoc:
   INITIAL_SCHEMES = scheme_list
   private_constant :INITIAL_SCHEMES
   Ractor.make_shareable(INITIAL_SCHEMES) if defined?(Ractor)
+  # :startdoc:
 
   # Returns a new object constructed from the given +scheme+, +arguments+,
   # and +default+:
@@ -121,12 +182,10 @@ def self.scheme_list
   #   # => #<URI::HTTP foo://john.doe@www.example.com:123/forum/questions/?tag=networking&order=newest#top>
   #
   def self.for(scheme, *arguments, default: Generic)
-    const_name = scheme.to_s.upcase
+    const_name = Schemes.escape(scheme)
 
     uri_class = INITIAL_SCHEMES[const_name]
-    uri_class ||= if /\A[A-Z]\w*\z/.match?(const_name) && Schemes.const_defined?(const_name, false)
-      Schemes.const_get(const_name, false)
-    end
+    uri_class ||= Schemes.find(const_name)
     uri_class ||= default
 
     return uri_class.new(scheme, *arguments)
@@ -168,7 +227,7 @@ class BadURIError < Error; end
   #    ["fragment", "top"]]
   #
   def self.split(uri)
-    RFC3986_PARSER.split(uri)
+    DEFAULT_PARSER.split(uri)
   end
 
   # Returns a new \URI object constructed from the given string +uri+:
@@ -182,7 +241,7 @@ def self.split(uri)
   # if it may contain invalid URI characters.
   #
   def self.parse(uri)
-    RFC3986_PARSER.parse(uri)
+    DEFAULT_PARSER.parse(uri)
   end
 
   # Merges the given URI strings +str+
@@ -209,7 +268,7 @@ def self.parse(uri)
   #   # => #<URI::HTTP http://example.com/foo/bar>
   #
   def self.join(*str)
-    RFC3986_PARSER.join(*str)
+    DEFAULT_PARSER.join(*str)
   end
 
   #
@@ -282,7 +341,7 @@ def self.regexp(schemes = nil)# :nodoc:
   256.times do |i|
     TBLENCWWWCOMP_[-i.chr] = -('%%%02X' % i)
   end
-  TBLENCURICOMP_ = TBLENCWWWCOMP_.dup.freeze
+  TBLENCURICOMP_ = TBLENCWWWCOMP_.dup.freeze # :nodoc:
   TBLENCWWWCOMP_[' '] = '+'
   TBLENCWWWCOMP_.freeze
   TBLDECWWWCOMP_ = {} # :nodoc:
@@ -380,6 +439,8 @@ def self.decode_uri_component(str, enc=Encoding::UTF_8)
     _decode_uri_component(/%\h\h/, str, enc)
   end
 
+  # Returns a string derived from the given string +str+ with
+  # URI-encoded characters matching +regexp+ according to +table+.
   def self._encode_uri_component(regexp, table, str, enc)
     str = str.to_s.dup
     if str.encoding != Encoding::ASCII_8BIT
@@ -394,6 +455,8 @@ def self._encode_uri_component(regexp, table, str, enc)
   end
   private_class_method :_encode_uri_component
 
+  # Returns a string decoding characters matching +regexp+ from the
+  # given \URL-encoded string +str+.
   def self._decode_uri_component(regexp, str, enc)
     raise ArgumentError, "invalid %-encoding (#{str})" if /%(?!\h\h)/.match?(str)
     str.b.gsub(regexp, TBLDECWWWCOMP_).force_encoding(enc)
@@ -832,6 +895,7 @@ module Kernel
   # Returns a \URI object derived from the given +uri+,
   # which may be a \URI string or an existing \URI object:
   #
+  #   require 'uri'
   #   # Returns a new URI.
   #   uri = URI('http://github.com/ruby/ruby')
   #   # => #<URI::HTTP http://github.com/ruby/ruby>
@@ -839,6 +903,8 @@ module Kernel
   #   URI(uri)
   #   # => #<URI::HTTP http://github.com/ruby/ruby>
   #
+  # You must require 'uri' to use this method.
+  #
   def URI(uri)
     if uri.is_a?(URI::Generic)
       uri
diff --git a/lib/uri/file.rb b/lib/uri/file.rb
index 4ff0bc097e7c96..47b5aef067c3e3 100644
--- a/lib/uri/file.rb
+++ b/lib/uri/file.rb
@@ -47,7 +47,7 @@ class File < Generic
     #       :path => '/ruby/src'})
     #     uri2.to_s  # => "file://host.example.com/ruby/src"
     #
-    #     uri3 = URI::File.build({:path => URI::escape('/path/my file.txt')})
+    #     uri3 = URI::File.build({:path => URI::RFC2396_PARSER.escape('/path/my file.txt')})
     #     uri3.to_s  # => "file:///path/my%20file.txt"
     #
     def self.build(args)
@@ -70,17 +70,17 @@ def set_port(v)
 
     # raise InvalidURIError
     def check_userinfo(user)
-      raise URI::InvalidURIError, "can not set userinfo for file URI"
+      raise URI::InvalidURIError, "cannot set userinfo for file URI"
     end
 
     # raise InvalidURIError
     def check_user(user)
-      raise URI::InvalidURIError, "can not set user for file URI"
+      raise URI::InvalidURIError, "cannot set user for file URI"
     end
 
     # raise InvalidURIError
     def check_password(user)
-      raise URI::InvalidURIError, "can not set password for file URI"
+      raise URI::InvalidURIError, "cannot set password for file URI"
     end
 
     # do nothing
diff --git a/lib/uri/ftp.rb b/lib/uri/ftp.rb
index abad613c33375f..1c75e242ba2101 100644
--- a/lib/uri/ftp.rb
+++ b/lib/uri/ftp.rb
@@ -17,7 +17,7 @@ module URI
   # This class will be redesigned because of difference of implementations;
   # the structure of its path. draft-hoffman-ftp-uri-04 is a draft but it
   # is a good summary about the de facto spec.
-  # http://tools.ietf.org/html/draft-hoffman-ftp-uri-04
+  # https://datatracker.ietf.org/doc/html/draft-hoffman-ftp-uri-04
   #
   class FTP < Generic
     # A Default port of 21 for URI::FTP.
diff --git a/lib/uri/generic.rb b/lib/uri/generic.rb
index 69698c4e2d98f4..d811c5b9440bf1 100644
--- a/lib/uri/generic.rb
+++ b/lib/uri/generic.rb
@@ -73,7 +73,7 @@ def self.use_registry # :nodoc:
     #
     # At first, tries to create a new URI::Generic instance using
     # URI::Generic::build. But, if exception URI::InvalidComponentError is raised,
-    # then it does URI::Escape.escape all URI components and tries again.
+    # then it does URI::RFC2396_PARSER.escape all URI components and tries again.
     #
     def self.build2(args)
       begin
@@ -82,7 +82,7 @@ def self.build2(args)
         if args.kind_of?(Array)
           return self.build(args.collect{|x|
             if x.is_a?(String)
-              DEFAULT_PARSER.escape(x)
+              URI::RFC2396_PARSER.escape(x)
             else
               x
             end
@@ -91,7 +91,7 @@ def self.build2(args)
           tmp = {}
           args.each do |key, value|
             tmp[key] = if value
-                DEFAULT_PARSER.escape(value)
+                URI::RFC2396_PARSER.escape(value)
               else
                 value
               end
@@ -126,9 +126,9 @@ def self.build(args)
           end
         end
       else
-        component = self.class.component rescue ::URI::Generic::COMPONENT
+        component = self.component rescue ::URI::Generic::COMPONENT
         raise ArgumentError,
-        "expected Array of or Hash of components of #{self.class} (#{component.join(', ')})"
+              "expected Array of or Hash of components of #{self} (#{component.join(', ')})"
       end
 
       tmp << nil
@@ -284,7 +284,7 @@ def registry # :nodoc:
 
     # Returns the parser to be used.
     #
-    # Unless a URI::Parser is defined, DEFAULT_PARSER is used.
+    # Unless the +parser+ is defined, DEFAULT_PARSER is used.
     #
     def parser
       if !defined?(@parser) || !@parser
@@ -315,7 +315,7 @@ def component
     end
 
     #
-    # Checks the scheme +v+ component against the URI::Parser Regexp for :SCHEME.
+    # Checks the scheme +v+ component against the +parser+ Regexp for :SCHEME.
     #
     def check_scheme(v)
       if v && parser.regexp[:SCHEME] !~ v
@@ -385,7 +385,7 @@ def check_userinfo(user, password = nil)
 
     #
     # Checks the user +v+ component for RFC2396 compliance
-    # and against the URI::Parser Regexp for :USERINFO.
+    # and against the +parser+ Regexp for :USERINFO.
     #
     # Can not have a registry or opaque component defined,
     # with a user component defined.
@@ -393,7 +393,7 @@ def check_userinfo(user, password = nil)
     def check_user(v)
       if @opaque
         raise InvalidURIError,
-          "can not set user with opaque"
+          "cannot set user with opaque"
       end
 
       return v unless v
@@ -409,7 +409,7 @@ def check_user(v)
 
     #
     # Checks the password +v+ component for RFC2396 compliance
-    # and against the URI::Parser Regexp for :USERINFO.
+    # and against the +parser+ Regexp for :USERINFO.
     #
     # Can not have a registry or opaque component defined,
     # with a user component defined.
@@ -417,7 +417,7 @@ def check_user(v)
     def check_password(v, user = @user)
       if @opaque
         raise InvalidURIError,
-          "can not set password with opaque"
+          "cannot set password with opaque"
       end
       return v unless v
 
@@ -586,7 +586,7 @@ def decoded_password
 
     #
     # Checks the host +v+ component for RFC2396 compliance
-    # and against the URI::Parser Regexp for :HOST.
+    # and against the +parser+ Regexp for :HOST.
     #
     # Can not have a registry or opaque component defined,
     # with a host component defined.
@@ -596,7 +596,7 @@ def check_host(v)
 
       if @opaque
         raise InvalidURIError,
-          "can not set host with registry or opaque"
+          "cannot set host with registry or opaque"
       elsif parser.regexp[:HOST] !~ v
         raise InvalidComponentError,
           "bad component(expected host component): #{v}"
@@ -675,7 +675,7 @@ def hostname=(v)
 
     #
     # Checks the port +v+ component for RFC2396 compliance
-    # and against the URI::Parser Regexp for :PORT.
+    # and against the +parser+ Regexp for :PORT.
     #
     # Can not have a registry or opaque component defined,
     # with a port component defined.
@@ -685,7 +685,7 @@ def check_port(v)
 
       if @opaque
         raise InvalidURIError,
-          "can not set port with registry or opaque"
+          "cannot set port with registry or opaque"
       elsif !v.kind_of?(Integer) && parser.regexp[:PORT] !~ v
         raise InvalidComponentError,
           "bad component(expected port component): #{v.inspect}"
@@ -733,22 +733,22 @@ def port=(v)
     end
 
     def check_registry(v) # :nodoc:
-      raise InvalidURIError, "can not set registry"
+      raise InvalidURIError, "cannot set registry"
     end
     private :check_registry
 
-    def set_registry(v) #:nodoc:
-      raise InvalidURIError, "can not set registry"
+    def set_registry(v) # :nodoc:
+      raise InvalidURIError, "cannot set registry"
     end
     protected :set_registry
 
-    def registry=(v)
-      raise InvalidURIError, "can not set registry"
+    def registry=(v) # :nodoc:
+      raise InvalidURIError, "cannot set registry"
     end
 
     #
     # Checks the path +v+ component for RFC2396 compliance
-    # and against the URI::Parser Regexp
+    # and against the +parser+ Regexp
     # for :ABS_PATH and :REL_PATH.
     #
     # Can not have a opaque component defined,
@@ -853,7 +853,7 @@ def query=(v)
 
     #
     # Checks the opaque +v+ component for RFC2396 compliance and
-    # against the URI::Parser Regexp for :OPAQUE.
+    # against the +parser+ Regexp for :OPAQUE.
     #
     # Can not have a host, port, user, or path component defined,
     # with an opaque component defined.
@@ -866,7 +866,7 @@ def check_opaque(v)
       # hier_part     = ( net_path | abs_path ) [ "?" query ]
       if @host || @port || @user || @path  # userinfo = @user + ':' + @password
         raise InvalidURIError,
-          "can not set opaque with host, port, userinfo or path"
+          "cannot set opaque with host, port, userinfo or path"
       elsif v && parser.regexp[:OPAQUE] !~ v
         raise InvalidComponentError,
           "bad component(expected opaque component): #{v}"
@@ -905,7 +905,7 @@ def opaque=(v)
     end
 
     #
-    # Checks the fragment +v+ component against the URI::Parser Regexp for :FRAGMENT.
+    # Checks the fragment +v+ component against the +parser+ Regexp for :FRAGMENT.
     #
     #
     # == Args
@@ -945,7 +945,7 @@ def fragment=(v)
     # == Description
     #
     # URI has components listed in order of decreasing significance from left to right,
-    # see RFC3986 https://tools.ietf.org/html/rfc3986 1.2.3.
+    # see RFC3986 https://www.rfc-editor.org/rfc/rfc3986 1.2.3.
     #
     # == Usage
     #
@@ -1133,17 +1133,16 @@ def merge(oth)
       base.fragment=(nil)
 
       # RFC2396, Section 5.2, 4)
-      if !authority
-        base.set_path(merge_path(base.path, rel.path)) if base.path && rel.path
-      else
-        # RFC2396, Section 5.2, 4)
-        base.set_path(rel.path) if rel.path
+      if authority
+        base.set_userinfo(rel.userinfo)
+        base.set_host(rel.host)
+        base.set_port(rel.port || base.default_port)
+        base.set_path(rel.path)
+      elsif base.path && rel.path
+        base.set_path(merge_path(base.path, rel.path))
       end
 
       # RFC2396, Section 5.2, 7)
-      base.set_userinfo(rel.userinfo) if rel.userinfo
-      base.set_host(rel.host)         if rel.host
-      base.set_port(rel.port)         if rel.port
       base.query = rel.query       if rel.query
       base.fragment=(rel.fragment) if rel.fragment
 
@@ -1235,7 +1234,7 @@ def route_from0(oth)
         return rel, rel
       end
 
-      # you can modify `rel', but can not `oth'.
+      # you can modify `rel', but cannot `oth'.
       return oth, rel
     end
     private :route_from0
@@ -1260,7 +1259,7 @@ def route_from0(oth)
     #   #=> #<URI::Generic /main.rbx?page=1>
     #
     def route_from(oth)
-      # you can modify `rel', but can not `oth'.
+      # you can modify `rel', but cannot `oth'.
       begin
         oth, rel = route_from0(oth)
       rescue
@@ -1364,6 +1363,9 @@ def to_s
           str << ':'
           str << @port.to_s
         end
+        if (@host || @port) && !@path.empty? && !@path.start_with?('/')
+          str << '/'
+        end
         str << @path
         if @query
           str << '?'
@@ -1376,6 +1378,7 @@ def to_s
       end
       str
     end
+    alias to_str to_s
 
     #
     # Compares two URIs.
@@ -1388,29 +1391,18 @@ def ==(oth)
       end
     end
 
+    # Returns the hash value.
     def hash
       self.component_ary.hash
     end
 
+    # Compares with _oth_ for Hash.
     def eql?(oth)
       self.class == oth.class &&
       parser == oth.parser &&
       self.component_ary.eql?(oth.component_ary)
     end
 
-=begin
-
---- URI::Generic#===(oth)
-
-=end
-#    def ===(oth)
-#      raise NotImplementedError
-#    end
-
-=begin
-=end
-
-
     # Returns an Array of the components defined from the COMPONENT Array.
     def component_ary
       component.collect do |x|
@@ -1447,7 +1439,7 @@ def select(*components)
       end
     end
 
-    def inspect
+    def inspect # :nodoc:
       "#<#{self.class} #{self}>"
     end
 
diff --git a/lib/uri/http.rb b/lib/uri/http.rb
index 306daf19656d93..3c41cd4e93f3a4 100644
--- a/lib/uri/http.rb
+++ b/lib/uri/http.rb
@@ -61,6 +61,18 @@ def self.build(args)
       super(tmp)
     end
 
+    # Do not allow empty host names, as they are not allowed by RFC 3986.
+    def check_host(v)
+      ret = super
+
+      if ret && v.empty?
+        raise InvalidComponentError,
+          "bad component(expected host component): #{v}"
+      end
+
+      ret
+    end
+
     #
     # == Description
     #
@@ -85,7 +97,7 @@ def request_uri
     # == Description
     #
     # Returns the authority for an HTTP uri, as defined in
-    # https://datatracker.ietf.org/doc/html/rfc3986/#section-3.2.
+    # https://www.rfc-editor.org/rfc/rfc3986#section-3.2.
     #
     #
     # Example:
@@ -106,7 +118,7 @@ def authority
     # == Description
     #
     # Returns the origin for an HTTP uri, as defined in
-    # https://datatracker.ietf.org/doc/html/rfc6454.
+    # https://www.rfc-editor.org/rfc/rfc6454.
     #
     #
     # Example:
diff --git a/lib/uri/mailto.rb b/lib/uri/mailto.rb
index cb8024f301fc47..f747b79ec753b3 100644
--- a/lib/uri/mailto.rb
+++ b/lib/uri/mailto.rb
@@ -52,7 +52,11 @@ class MailTo < Generic
     HEADER_REGEXP  = /\A(?<hfield>(?:%\h\h|[!$'-.0-;@-Z_a-z~])*=(?:%\h\h|[!$'-.0-;@-Z_a-z~])*)(?:&\g<hfield>)*\z/
     # practical regexp for email address
     # https://html.spec.whatwg.org/multipage/input.html#valid-e-mail-address
-    EMAIL_REGEXP = /\A[a-zA-Z0-9.!\#$%&'*+\/=?^_`{|}~-]+@[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?(?:\.[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?)*\z/
+    EMAIL_REGEXP = %r[\A#{
+      atext = %q[(?:[a-zA-Z0-9!\#$%&'*+\/=?^_`{|}~-]+)]
+    }(?:\.#{atext})*@#{
+      label = %q[(?:[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?)]
+    }(?:\.#{label})*\z]
     # :startdoc:
 
     #
diff --git a/lib/uri/rfc2396_parser.rb b/lib/uri/rfc2396_parser.rb
index 00c66cf0422213..cefd126cc67f69 100644
--- a/lib/uri/rfc2396_parser.rb
+++ b/lib/uri/rfc2396_parser.rb
@@ -67,7 +67,7 @@ class RFC2396_Parser
     #
     # == Synopsis
     #
-    #   URI::Parser.new([opts])
+    #   URI::RFC2396_Parser.new([opts])
     #
     # == Args
     #
@@ -86,7 +86,7 @@ class RFC2396_Parser
     #
     # == Examples
     #
-    #   p = URI::Parser.new(:ESCAPED => "(?:%[a-fA-F0-9]{2}|%u[a-fA-F0-9]{4})")
+    #   p = URI::RFC2396_Parser.new(:ESCAPED => "(?:%[a-fA-F0-9]{2}|%u[a-fA-F0-9]{4})")
     #   u = p.parse("http://example.jp/%uABCD") #=> #<URI::HTTP http://example.jp/%uABCD>
     #   URI.parse(u.to_s) #=> raises URI::InvalidURIError
     #
@@ -108,12 +108,12 @@ def initialize(opts = {})
 
     # The Hash of patterns.
     #
-    # See also URI::Parser.initialize_pattern.
+    # See also #initialize_pattern.
     attr_reader :pattern
 
     # The Hash of Regexp.
     #
-    # See also URI::Parser.initialize_regexp.
+    # See also #initialize_regexp.
     attr_reader :regexp
 
     # Returns a split URI against +regexp[:ABS_URI]+.
@@ -140,11 +140,11 @@ def split(uri)
 
         if !scheme
           raise InvalidURIError,
-            "bad URI(absolute but no scheme): #{uri}"
+            "bad URI (absolute but no scheme): #{uri}"
         end
         if !opaque && (!path && (!host && !registry))
           raise InvalidURIError,
-            "bad URI(absolute but no path): #{uri}"
+            "bad URI (absolute but no path): #{uri}"
         end
 
       when @regexp[:REL_URI]
@@ -173,7 +173,7 @@ def split(uri)
         # server        = [ [ userinfo "@" ] hostport ]
 
       else
-        raise InvalidURIError, "bad URI(is not URI?): #{uri}"
+        raise InvalidURIError, "bad URI (is not URI?): #{uri}"
       end
 
       path = '' if !path && !opaque # (see RFC2396 Section 5.2)
@@ -202,8 +202,7 @@ def split(uri)
     #
     # == Usage
     #
-    #   p = URI::Parser.new
-    #   p.parse("ldap://ldap.example.com/dc=example?user=john")
+    #   URI::RFC2396_PARSER.parse("ldap://ldap.example.com/dc=example?user=john")
     #   #=> #<URI::LDAP ldap://ldap.example.com/dc=example?user=john>
     #
     def parse(uri)
@@ -244,7 +243,7 @@ def join(*uris)
     # If no +block+ given, then returns the result,
     # else it calls +block+ for each element in result.
     #
-    # See also URI::Parser.make_regexp.
+    # See also #make_regexp.
     #
     def extract(str, schemes = nil)
       if block_given?
@@ -263,7 +262,7 @@ def make_regexp(schemes = nil)
       unless schemes
         @regexp[:ABS_URI_REF]
       else
-        /(?=#{Regexp.union(*schemes)}:)#{@pattern[:X_ABS_URI]}/x
+        /(?=(?i:#{Regexp.union(*schemes).source}):)#{@pattern[:X_ABS_URI]}/x
       end
     end
 
@@ -321,14 +320,14 @@ def unescape(str, escaped = @regexp[:ESCAPED])
       str.gsub(escaped) { [$&[1, 2]].pack('H2').force_encoding(enc) }
     end
 
-    @@to_s = Kernel.instance_method(:to_s)
-    if @@to_s.respond_to?(:bind_call)
-      def inspect
-        @@to_s.bind_call(self)
+    TO_S = Kernel.instance_method(:to_s) # :nodoc:
+    if TO_S.respond_to?(:bind_call)
+      def inspect # :nodoc:
+        TO_S.bind_call(self)
       end
     else
-      def inspect
-        @@to_s.bind(self).call
+      def inspect # :nodoc:
+        TO_S.bind(self).call
       end
     end
 
@@ -524,6 +523,8 @@ def initialize_regexp(pattern)
       ret
     end
 
+    # Returns +uri+ as-is if it is URI, or convert it to URI if it is
+    # a String.
     def convert_to_uri(uri)
       if uri.is_a?(URI::Generic)
         uri
@@ -536,4 +537,11 @@ def convert_to_uri(uri)
     end
 
   end # class Parser
+
+  # Backward compatibility for URI::REGEXP::PATTERN::*
+  RFC2396_Parser.new.pattern.each_pair do |sym, str|
+    unless RFC2396_REGEXP::PATTERN.const_defined?(sym, false)
+      RFC2396_REGEXP::PATTERN.const_set(sym, str)
+    end
+  end
 end # module URI
diff --git a/lib/uri/rfc3986_parser.rb b/lib/uri/rfc3986_parser.rb
index 092a1ac89d4dcb..0b5f0c44883c56 100644
--- a/lib/uri/rfc3986_parser.rb
+++ b/lib/uri/rfc3986_parser.rb
@@ -78,7 +78,7 @@ def split(uri) #:nodoc:
       begin
         uri = uri.to_str
       rescue NoMethodError
-        raise InvalidURIError, "bad URI(is not URI?): #{uri.inspect}"
+        raise InvalidURIError, "bad URI (is not URI?): #{uri.inspect}"
       end
       uri.ascii_only? or
         raise InvalidURIError, "URI must be ascii only #{uri.dump}"
@@ -127,7 +127,7 @@ def split(uri) #:nodoc:
           m["fragment"]
         ]
       else
-        raise InvalidURIError, "bad URI(is not URI?): #{uri.inspect}"
+        raise InvalidURIError, "bad URI (is not URI?): #{uri.inspect}"
       end
     end
 
@@ -135,12 +135,35 @@ def parse(uri) # :nodoc:
       URI.for(*self.split(uri), self)
     end
 
-
     def join(*uris) # :nodoc:
       uris[0] = convert_to_uri(uris[0])
       uris.inject :merge
     end
 
+    # Compatibility for RFC2396 parser
+    def extract(str, schemes = nil, &block) # :nodoc:
+      warn "URI::RFC3986_PARSER.extract is obsolete. Use URI::RFC2396_PARSER.extract explicitly.", uplevel: 1 if $VERBOSE
+      RFC2396_PARSER.extract(str, schemes, &block)
+    end
+
+    # Compatibility for RFC2396 parser
+    def make_regexp(schemes = nil) # :nodoc:
+      warn "URI::RFC3986_PARSER.make_regexp is obsolete. Use URI::RFC2396_PARSER.make_regexp explicitly.", uplevel: 1 if $VERBOSE
+      RFC2396_PARSER.make_regexp(schemes)
+    end
+
+    # Compatibility for RFC2396 parser
+    def escape(str, unsafe = nil) # :nodoc:
+      warn "URI::RFC3986_PARSER.escape is obsolete. Use URI::RFC2396_PARSER.escape explicitly.", uplevel: 1 if $VERBOSE
+      unsafe ? RFC2396_PARSER.escape(str, unsafe) : RFC2396_PARSER.escape(str)
+    end
+
+    # Compatibility for RFC2396 parser
+    def unescape(str, escaped = nil) # :nodoc:
+      warn "URI::RFC3986_PARSER.unescape is obsolete. Use URI::RFC2396_PARSER.unescape explicitly.", uplevel: 1 if $VERBOSE
+      escaped ? RFC2396_PARSER.unescape(str, escaped) : RFC2396_PARSER.unescape(str)
+    end
+
     @@to_s = Kernel.instance_method(:to_s)
     if @@to_s.respond_to?(:bind_call)
       def inspect
diff --git a/lib/uri/uri.gemspec b/lib/uri/uri.gemspec
index 9cf0a711967f9c..0d0f897cba6b0f 100644
--- a/lib/uri/uri.gemspec
+++ b/lib/uri/uri.gemspec
@@ -30,8 +30,11 @@ Gem::Specification.new do |spec|
 
   # 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.
+  gemspec = File.basename(__FILE__)
   spec.files         = Dir.chdir(File.expand_path('..', __FILE__)) do
-    `git ls-files -z 2>#{IO::NULL}`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
+    `git ls-files -z 2>#{IO::NULL}`.split("\x0").reject do |file|
+      (file == gemspec) || file.start_with?(*%w[bin/ test/ rakelib/ .github/ .gitignore Gemfile Rakefile])
+    end
   end
   spec.bindir        = "exe"
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
diff --git a/lib/uri/version.rb b/lib/uri/version.rb
index f0aca586acab4f..b6a8ce15435601 100644
--- a/lib/uri/version.rb
+++ b/lib/uri/version.rb
@@ -1,6 +1,6 @@
 module URI
   # :stopdoc:
-  VERSION_CODE = '001202'.freeze
+  VERSION_CODE = '010003'.freeze
   VERSION = VERSION_CODE.scan(/../).collect{|n| n.to_i}.join('.').freeze
   # :startdoc:
 end
diff --git a/lib/weakref.gemspec b/lib/weakref.gemspec
index 03893f77e61d95..9d5c79851eb44f 100644
--- a/lib/weakref.gemspec
+++ b/lib/weakref.gemspec
@@ -26,8 +26,6 @@ Gem::Specification.new do |spec|
   spec.files         = Dir.chdir(File.expand_path('..', __FILE__)) do
     `git ls-files -z 2>#{IO::NULL}`.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_dependency "delegate"
diff --git a/lib/weakref.rb b/lib/weakref.rb
index 2bbadf68f989fc..0a09f7f9936d0f 100644
--- a/lib/weakref.rb
+++ b/lib/weakref.rb
@@ -17,7 +17,7 @@
 #
 
 class WeakRef < Delegator
-  VERSION = "0.1.2"
+  VERSION = "0.1.4"
 
   ##
   # RefError is raised when a referenced object has been recycled by the
@@ -41,7 +41,7 @@ def initialize(orig)
     super
   end
 
-  def __getobj__ # :nodoc:
+  def __getobj__(&_block) # :nodoc:
     @@__map[self] or defined?(@delegate_sd_obj) ? @delegate_sd_obj :
       Kernel::raise(RefError, "Invalid Reference - probably recycled", Kernel::caller(2))
   end
diff --git a/lib/yaml.rb b/lib/yaml.rb
index 3b2a80f1dfafe5..2cf11fc3dfb04e 100644
--- a/lib/yaml.rb
+++ b/lib/yaml.rb
@@ -66,5 +66,5 @@
 #
 # Syck can also be found on github: https://github.com/ruby/syck
 module YAML
-  LOADER_VERSION = "0.2.1"
+  LOADER_VERSION = "0.4.0"
 end
diff --git a/lib/yaml/dbm.rb b/lib/yaml/dbm.rb
index e2508cd74b38c1..a3cbaeccf66256 100644
--- a/lib/yaml/dbm.rb
+++ b/lib/yaml/dbm.rb
@@ -1,6 +1,10 @@
 # frozen_string_literal: false
 require 'yaml'
-require 'dbm'
+
+begin
+  require 'dbm'
+rescue LoadError
+end
 
 module YAML
 
@@ -16,7 +20,6 @@ module YAML
 #
 # See the documentation for ::DBM and ::YAML for more information.
 class DBM < ::DBM
-    VERSION = "0.1" # :nodoc:
 
     # :call-seq:
     #   ydbm[key] -> value
@@ -56,7 +59,13 @@ def []=( key, val )
     def fetch( keystr, ifnone = nil )
         begin
             val = super( keystr )
-            return YAML.load( val ) if String === val
+            if String === val
+                if YAML.respond_to?(:safe_load)
+                    return YAML.safe_load( val )
+                else
+                    return YAML.load( val )
+                end
+            end
         rescue IndexError
         end
         if block_given?
@@ -102,7 +111,11 @@ def values_at( *keys )
     def delete( key )
         v = super( key )
         if String === v
-            v = YAML.load( v )
+            if YAML.respond_to?(:safe_load)
+                v = YAML.safe_load( v )
+            else
+                v = YAML.load( v )
+            end
         end
         v
     end
@@ -149,7 +162,7 @@ def each_pair # :yields: [key, value]
     #
     # Returns +self+.
     def each_value # :yields: value
-        super { |v| yield YAML.load( v ) }
+        super { |v| yield YAML.respond_to?(:safe_load) ? YAML.safe_load( v ) : YAML.load( v ) }
         self
     end
 
@@ -158,7 +171,7 @@ def each_value # :yields: value
     #
     # Returns an array of values from the database.
     def values
-        super.collect { |v| YAML.load( v ) }
+        super.collect { |v| YAML.respond_to?(:safe_load) ? YAML.safe_load( v ) : YAML.load( v ) }
     end
 
     # :call-seq:
@@ -204,7 +217,9 @@ def replace( hsh )
     # The order in which values are removed/returned is not guaranteed.
     def shift
         a = super
-        a[1] = YAML.load( a[1] ) if a
+        if a
+          a[1] = YAML.respond_to?(:safe_load) ? YAML.safe_load( a[1] ) : YAML.load( a[1] )
+        end
         a
     end
 
@@ -277,4 +292,4 @@ def to_hash
     alias :each :each_pair
 end
 
-end
+end if defined?(DBM)
diff --git a/lib/yaml/store.rb b/lib/yaml/store.rb
index f8650b942f6c2c..27c823b9f936f1 100644
--- a/lib/yaml/store.rb
+++ b/lib/yaml/store.rb
@@ -3,7 +3,11 @@
 # YAML::Store
 #
 require 'yaml'
-require 'pstore'
+
+begin
+  require 'pstore'
+rescue LoadError
+end
 
 # YAML::Store provides the same functionality as PStore, except it uses YAML
 # to dump objects instead of Marshal.
@@ -65,8 +69,16 @@ def dump(table)
   end
 
   def load(content)
-    table = YAML.unsafe_load(content)
-    if table == false
+    table =  if YAML.respond_to?(:safe_load)
+      if Psych::VERSION >= "3.1"
+        YAML.safe_load(content, permitted_classes: [Symbol])
+      else
+        YAML.safe_load(content, [Symbol])
+      end
+    else
+      YAML.load(content)
+    end
+    if table == false || table == nil
       {}
     else
       table
@@ -83,4 +95,4 @@ def empty_marshal_data
   def empty_marshal_checksum
     CHECKSUM_ALGO.digest(empty_marshal_data)
   end
-end
+end if defined?(::PStore)
diff --git a/lib/yarp.rb b/lib/yarp.rb
deleted file mode 100644
index 769b149bcabf55..00000000000000
--- a/lib/yarp.rb
+++ /dev/null
@@ -1,618 +0,0 @@
-# frozen_string_literal: true
-
-module YARP
-  # This represents a source of Ruby code that has been parsed. It is used in
-  # conjunction with locations to allow them to resolve line numbers and source
-  # ranges.
-  class Source
-    attr_reader :source, :offsets
-
-    def initialize(source, offsets = compute_offsets(source))
-      @source = source
-      @offsets = offsets
-    end
-
-    def slice(offset, length)
-      source.byteslice(offset, length)
-    end
-
-    def line(value)
-      offsets.bsearch_index { |offset| offset > value } || offsets.length
-    end
-
-    def column(value)
-      value - offsets[line(value) - 1]
-    end
-
-    private
-
-    def compute_offsets(code)
-      offsets = [0]
-      code.b.scan("\n") { offsets << $~.end(0) }
-      offsets
-    end
-  end
-
-  # This represents a location in the source.
-  class Location
-    # A Source object that is used to determine more information from the given
-    # offset and length.
-    protected attr_reader :source
-
-    # The byte offset from the beginning of the source where this location
-    # starts.
-    attr_reader :start_offset
-
-    # The length of this location in bytes.
-    attr_reader :length
-
-    def initialize(source, start_offset, length)
-      @source = source
-      @start_offset = start_offset
-      @length = length
-    end
-
-    # Create a new location object with the given options.
-    def copy(**options)
-      Location.new(
-        options.fetch(:source) { source },
-        options.fetch(:start_offset) { start_offset },
-        options.fetch(:length) { length }
-      )
-    end
-
-    # Returns a string representation of this location.
-    def inspect
-      "#<YARP::Location @start_offset=#{@start_offset} @length=#{@length}>"
-    end
-
-    # The source code that this location represents.
-    def slice
-      source.slice(start_offset, length)
-    end
-
-    # The byte offset from the beginning of the source where this location ends.
-    def end_offset
-      start_offset + length
-    end
-
-    # The line number where this location starts.
-    def start_line
-      source.line(start_offset)
-    end
-
-    # The line number where this location ends.
-    def end_line
-      source.line(end_offset - 1)
-    end
-
-    # The column number in bytes where this location starts from the start of
-    # the line.
-    def start_column
-      source.column(start_offset)
-    end
-
-    # The column number in bytes where this location ends from the start of the
-    # line.
-    def end_column
-      source.column(end_offset)
-    end
-
-    def deconstruct_keys(keys)
-      { start_offset: start_offset, end_offset: end_offset }
-    end
-
-    def pretty_print(q)
-      q.text("(#{start_offset}...#{end_offset})")
-    end
-
-    def ==(other)
-      other.is_a?(Location) &&
-        other.start_offset == start_offset &&
-        other.end_offset == end_offset
-    end
-
-    # Returns a new location that stretches from this location to the given
-    # other location. Raises an error if this location is not before the other
-    # location or if they don't share the same source.
-    def join(other)
-      raise "Incompatible sources" if source != other.source
-      raise "Incompatible locations" if start_offset > other.start_offset
-
-      Location.new(source, start_offset, other.end_offset - start_offset)
-    end
-
-    def self.null
-      new(0, 0)
-    end
-  end
-
-  # This represents a comment that was encountered during parsing.
-  class Comment
-    TYPES = [:inline, :embdoc, :__END__]
-
-    attr_reader :type, :location
-
-    def initialize(type, location)
-      @type = type
-      @location = location
-    end
-
-    def deconstruct_keys(keys)
-      { type: type, location: location }
-    end
-
-    def inspect
-      "#<YARP::Comment @type=#{@type.inspect} @location=#{@location.inspect}>"
-    end
-  end
-
-  # This represents an error that was encountered during parsing.
-  class ParseError
-    attr_reader :message, :location
-
-    def initialize(message, location)
-      @message = message
-      @location = location
-    end
-
-    def deconstruct_keys(keys)
-      { message: message, location: location }
-    end
-
-    def inspect
-      "#<YARP::ParseError @message=#{@message.inspect} @location=#{@location.inspect}>"
-    end
-  end
-
-  # This represents a warning that was encountered during parsing.
-  class ParseWarning
-    attr_reader :message, :location
-
-    def initialize(message, location)
-      @message = message
-      @location = location
-    end
-
-    def deconstruct_keys(keys)
-      { message: message, location: location }
-    end
-
-    def inspect
-      "#<YARP::ParseWarning @message=#{@message.inspect} @location=#{@location.inspect}>"
-    end
-  end
-
-  # A class that knows how to walk down the tree. None of the individual visit
-  # methods are implemented on this visitor, so it forces the consumer to
-  # implement each one that they need. For a default implementation that
-  # continues walking the tree, see the Visitor class.
-  class BasicVisitor
-    def visit(node)
-      node&.accept(self)
-    end
-
-    def visit_all(nodes)
-      nodes.map { |node| visit(node) }
-    end
-
-    def visit_child_nodes(node)
-      visit_all(node.child_nodes)
-    end
-  end
-
-  class Visitor < BasicVisitor
-  end
-
-  # This represents the result of a call to ::parse or ::parse_file. It contains
-  # the AST, any comments that were encounters, and any errors that were
-  # encountered.
-  class ParseResult
-    attr_reader :value, :comments, :errors, :warnings, :source
-
-    def initialize(value, comments, errors, warnings, source)
-      @value = value
-      @comments = comments
-      @errors = errors
-      @warnings = warnings
-      @source = source
-    end
-
-    def deconstruct_keys(keys)
-      { value: value, comments: comments, errors: errors, warnings: warnings }
-    end
-
-    def success?
-      errors.empty?
-    end
-
-    def failure?
-      !success?
-    end
-
-    # Keep in sync with Java MarkNewlinesVisitor
-    class MarkNewlinesVisitor < YARP::Visitor
-      def initialize(newline_marked)
-        @newline_marked = newline_marked
-      end
-
-      def visit_block_node(node)
-        old_newline_marked = @newline_marked
-        @newline_marked = Array.new(old_newline_marked.size, false)
-        begin
-          super(node)
-        ensure
-          @newline_marked = old_newline_marked
-        end
-      end
-      alias_method :visit_lambda_node, :visit_block_node
-
-      def visit_if_node(node)
-        node.set_newline_flag(@newline_marked)
-        super(node)
-      end
-      alias_method :visit_unless_node, :visit_if_node
-
-      def visit_statements_node(node)
-        node.body.each do |child|
-          child.set_newline_flag(@newline_marked)
-        end
-        super(node)
-      end
-    end
-    private_constant :MarkNewlinesVisitor
-
-    def mark_newlines
-      newline_marked = Array.new(1 + @source.offsets.size, false)
-      visitor = MarkNewlinesVisitor.new(newline_marked)
-      value.accept(visitor)
-      value
-    end
-  end
-
-  # This represents a token from the Ruby source.
-  class Token
-    attr_reader :type, :value, :location
-
-    def initialize(type, value, location)
-      @type = type
-      @value = value
-      @location = location
-    end
-
-    def deconstruct_keys(keys)
-      { type: type, value: value, location: location }
-    end
-
-    def pretty_print(q)
-      q.group do
-        q.text(type.to_s)
-        self.location.pretty_print(q)
-        q.text("(")
-        q.nest(2) do
-          q.breakable("")
-          q.pp(value)
-        end
-        q.breakable("")
-        q.text(")")
-      end
-    end
-
-    def ==(other)
-      other.is_a?(Token) &&
-        other.type == type &&
-        other.value == value
-    end
-  end
-
-  # This represents a node in the tree.
-  class Node
-    attr_reader :location
-
-    def newline?
-      @newline ? true : false
-    end
-
-    def set_newline_flag(newline_marked)
-      line = location.start_line
-      unless newline_marked[line]
-        newline_marked[line] = true
-        @newline = true
-      end
-    end
-
-    # Slice the location of the node from the source.
-    def slice
-      location.slice
-    end
-
-    def pretty_print(q)
-      q.group do
-        q.text(self.class.name.split("::").last)
-        location.pretty_print(q)
-        q.text("[Li:#{location.start_line}]") if newline?
-        q.text("(")
-        q.nest(2) do
-          deconstructed = deconstruct_keys([])
-          deconstructed.delete(:location)
-          q.breakable("")
-          q.seplist(deconstructed, lambda { q.comma_breakable }, :each_value) { |value| q.pp(value) }
-        end
-        q.breakable("")
-        q.text(")")
-      end
-    end
-  end
-
-  # This object is responsible for generating the output for the inspect method
-  # implementations of child nodes.
-  class NodeInspector
-    attr_reader :prefix, :output
-
-    def initialize(prefix = "")
-      @prefix = prefix
-      @output = +""
-    end
-
-    # Appends a line to the output with the current prefix.
-    def <<(line)
-      output << "#{prefix}#{line}"
-    end
-
-    # This generates a string that is used as the header of the inspect output
-    # for any given node.
-    def header(node)
-      output = +"@ #{node.class.name.split("::").last} ("
-      output << "location: (#{node.location.start_offset}...#{node.location.end_offset})"
-      output << ", newline: true" if node.newline?
-      output << ")\n"
-      output
-    end
-
-    # Generates a string that represents a list of nodes. It handles properly
-    # using the box drawing characters to make the output look nice.
-    def list(prefix, nodes)
-      output = +"(length: #{nodes.length})\n"
-      last_index = nodes.length - 1
-
-      nodes.each_with_index do |node, index|
-        pointer, preadd = (index == last_index) ? ["└── ", "    "] : ["├── ", "│   "]
-        node_prefix = "#{prefix}#{preadd}"
-        output << node.inspect(NodeInspector.new(node_prefix)).sub(node_prefix, "#{prefix}#{pointer}")
-      end
-
-      output
-    end
-
-    # Generates a string that represents a location field on a node.
-    def location(value)
-      if value
-        "(#{value.start_offset}...#{value.end_offset}) = #{value.slice.inspect}"
-      else
-        "∅"
-      end
-    end
-
-    # Generates a string that represents a child node.
-    def child_node(node, append)
-      node.inspect(child_inspector(append)).delete_prefix(prefix)
-    end
-
-    # Returns a new inspector that can be used to inspect a child node.
-    def child_inspector(append)
-      NodeInspector.new("#{prefix}#{append}")
-    end
-
-    # Returns the output as a string.
-    def to_str
-      output
-    end
-  end
-
-  class FloatNode < Node
-    def value
-      Float(slice)
-    end
-  end
-
-  class ImaginaryNode < Node
-    def value
-      Complex(0, numeric.value)
-    end
-  end
-
-  class IntegerNode < Node
-    def value
-      Integer(slice)
-    end
-  end
-
-  class RationalNode < Node
-    def value
-      Rational(slice.chomp("r"))
-    end
-  end
-
-  # Load the serialized AST using the source as a reference into a tree.
-  def self.load(source, serialized)
-    Serialize.load(source, serialized)
-  end
-
-  # This module is used for testing and debugging and is not meant to be used by
-  # consumers of this library.
-  module Debug
-    class ISeq
-      attr_reader :parts
-
-      def initialize(parts)
-        @parts = parts
-      end
-
-      def type
-        parts[0]
-      end
-
-      def local_table
-        parts[10]
-      end
-
-      def instructions
-        parts[13]
-      end
-
-      def each_child
-        instructions.each do |instruction|
-          # Only look at arrays. Other instructions are line numbers or
-          # tracepoint events.
-          next unless instruction.is_a?(Array)
-
-          instruction.each do |opnd|
-            # Only look at arrays. Other operands are literals.
-            next unless opnd.is_a?(Array)
-
-            # Only look at instruction sequences. Other operands are literals.
-            next unless opnd[0] == "YARVInstructionSequence/SimpleDataFormat"
-
-            yield ISeq.new(opnd)
-          end
-        end
-      end
-    end
-
-    # For the given source, compiles with CRuby and returns a list of all of the
-    # sets of local variables that were encountered.
-    def self.cruby_locals(source)
-      verbose = $VERBOSE
-      $VERBOSE = nil
-
-      begin
-        locals = []
-        stack = [ISeq.new(RubyVM::InstructionSequence.compile(source).to_a)]
-
-        while (iseq = stack.pop)
-          if iseq.type != :once
-            names = iseq.local_table
-
-            # CRuby will push on a special local variable when there are keyword
-            # arguments. We get rid of that here.
-            names = names.grep_v(Integer)
-
-            # TODO: We don't support numbered local variables yet, so we get rid
-            # of those here.
-            names = names.grep_v(/^_\d$/)
-
-            # For some reason, CRuby occasionally pushes this special local
-            # variable when there are splat arguments. We get rid of that here.
-            names = names.grep_v(:"#arg_rest")
-
-            # Now push them onto the list of locals.
-            locals << names
-          end
-
-          iseq.each_child { |child| stack << child }
-        end
-
-        locals
-      ensure
-        $VERBOSE = verbose
-      end
-    end
-
-    # For the given source, parses with YARP and returns a list of all of the
-    # sets of local variables that were encountered.
-    def self.yarp_locals(source)
-      locals = []
-      stack = [YARP.parse(source).value]
-
-      while (node = stack.pop)
-        case node
-        when BlockNode, DefNode, LambdaNode
-          names = node.locals
-
-          params = node.parameters
-          params = params&.parameters unless node.is_a?(DefNode)
-
-          # YARP places parameters in the same order that they appear in the
-          # source. CRuby places them in the order that they need to appear
-          # according to their own internal calling convention. We mimic that
-          # order here so that we can compare properly.
-          if params
-            sorted = [
-              *params.requireds.grep(RequiredParameterNode).map(&:name),
-              *params.optionals.map(&:name),
-              *((params.rest.name ? params.rest.name.to_sym : :*) if params.rest && params.rest.operator != ","),
-              *params.posts.grep(RequiredParameterNode).map(&:name),
-              *params.keywords.reject(&:value).map { |param| param.name.chomp(":").to_sym },
-              *params.keywords.select(&:value).map { |param| param.name.chomp(":").to_sym }
-            ]
-
-            # TODO: When we get a ... parameter, we should be pushing * and &
-            # onto the local list. We don't do that yet, so we need to add them
-            # in here.
-            if params.keyword_rest.is_a?(ForwardingParameterNode)
-              sorted.push(:*, :&, :"...")
-            end
-
-            # Recurse down the parameter tree to find any destructured
-            # parameters and add them after the other parameters.
-            param_stack = params.requireds.concat(params.posts).grep(RequiredDestructuredParameterNode).reverse
-            while (param = param_stack.pop)
-              case param
-              when RequiredDestructuredParameterNode
-                param_stack.concat(param.parameters.reverse)
-              when RequiredParameterNode
-                sorted << param.name
-              when SplatNode
-                sorted << param.expression.name if param.expression
-              end
-            end
-
-            names = sorted.concat(names - sorted)
-          end
-
-          locals << names
-        when ClassNode, ModuleNode, ProgramNode, SingletonClassNode
-          locals << node.locals
-        when ForNode
-          locals << []
-        when PostExecutionNode
-          locals.push([], [])
-        when InterpolatedRegularExpressionNode
-          locals << [] if node.once?
-        end
-
-        stack.concat(node.child_nodes.compact)
-      end
-
-      locals
-    end
-
-    def self.newlines(source)
-      YARP.parse(source).source.offsets
-    end
-
-    def self.parse_serialize_file(filepath)
-      parse_serialize_file_metadata(filepath, [filepath.bytesize, filepath.b, 0].pack("LA*L"))
-    end
-  end
-
-  # Marking this as private so that consumers don't see it. It makes it a little
-  # annoying for testing since you have to const_get it to access the methods,
-  # but at least this way it's clear it's not meant for consumers.
-  private_constant :Debug
-end
-
-require_relative "yarp/lex_compat"
-require_relative "yarp/mutation_visitor"
-require_relative "yarp/desugar_visitor"
-require_relative "yarp/node"
-require_relative "yarp/ripper_compat"
-require_relative "yarp/serialize"
-require_relative "yarp/pack"
-require_relative "yarp/pattern"
-
-if RUBY_ENGINE == "ruby" and !ENV["YARP_FFI_BACKEND"]
-  require "yarp/yarp"
-else
-  require_relative "yarp/ffi"
-end
diff --git a/lib/yarp/desugar_visitor.rb b/lib/yarp/desugar_visitor.rb
deleted file mode 100644
index 6ee5861ac8b390..00000000000000
--- a/lib/yarp/desugar_visitor.rb
+++ /dev/null
@@ -1,204 +0,0 @@
-# frozen_string_literal: true
-
-module YARP
-  class DesugarVisitor < MutationVisitor
-    # @@foo &&= bar
-    #
-    # becomes
-    #
-    # @@foo && @@foo = bar
-    def visit_class_variable_and_write_node(node)
-      desugar_and_write_node(node, ClassVariableReadNode, ClassVariableWriteNode, node.name)
-    end
-
-    # @@foo ||= bar
-    #
-    # becomes
-    #
-    # defined?(@@foo) ? @@foo : @@foo = bar
-    def visit_class_variable_or_write_node(node)
-      desugar_or_write_defined_node(node, ClassVariableReadNode, ClassVariableWriteNode, node.name)
-    end
-
-    # @@foo += bar
-    #
-    # becomes
-    #
-    # @@foo = @@foo + bar
-    def visit_class_variable_operator_write_node(node)
-      desugar_operator_write_node(node, ClassVariableReadNode, ClassVariableWriteNode, node.name)
-    end
-
-    # Foo &&= bar
-    #
-    # becomes
-    #
-    # Foo && Foo = bar
-    def visit_constant_and_write_node(node)
-      desugar_and_write_node(node, ConstantReadNode, ConstantWriteNode, node.name)
-    end
-
-    # Foo ||= bar
-    #
-    # becomes
-    #
-    # defined?(Foo) ? Foo : Foo = bar
-    def visit_constant_or_write_node(node)
-      desugar_or_write_defined_node(node, ConstantReadNode, ConstantWriteNode, node.name)
-    end
-
-    # Foo += bar
-    #
-    # becomes
-    #
-    # Foo = Foo + bar
-    def visit_constant_operator_write_node(node)
-      desugar_operator_write_node(node, ConstantReadNode, ConstantWriteNode, node.name)
-    end
-
-    # $foo &&= bar
-    #
-    # becomes
-    #
-    # $foo && $foo = bar
-    def visit_global_variable_and_write_node(node)
-      desugar_and_write_node(node, GlobalVariableReadNode, GlobalVariableWriteNode, node.name)
-    end
-
-    # $foo ||= bar
-    #
-    # becomes
-    #
-    # defined?($foo) ? $foo : $foo = bar
-    def visit_global_variable_or_write_node(node)
-      desugar_or_write_defined_node(node, GlobalVariableReadNode, GlobalVariableWriteNode, node.name)
-    end
-
-    # $foo += bar
-    #
-    # becomes
-    #
-    # $foo = $foo + bar
-    def visit_global_variable_operator_write_node(node)
-      desugar_operator_write_node(node, GlobalVariableReadNode, GlobalVariableWriteNode, node.name)
-    end
-
-    # @foo &&= bar
-    #
-    # becomes
-    #
-    # @foo && @foo = bar
-    def visit_instance_variable_and_write_node(node)
-      desugar_and_write_node(node, InstanceVariableReadNode, InstanceVariableWriteNode, node.name)
-    end
-
-    # @foo ||= bar
-    #
-    # becomes
-    #
-    # @foo || @foo = bar
-    def visit_instance_variable_or_write_node(node)
-      desugar_or_write_node(node, InstanceVariableReadNode, InstanceVariableWriteNode, node.name)
-    end
-
-    # @foo += bar
-    #
-    # becomes
-    #
-    # @foo = @foo + bar
-    def visit_instance_variable_operator_write_node(node)
-      desugar_operator_write_node(node, InstanceVariableReadNode, InstanceVariableWriteNode, node.name)
-    end
-
-    # foo &&= bar
-    #
-    # becomes
-    #
-    # foo && foo = bar
-    def visit_local_variable_and_write_node(node)
-      desugar_and_write_node(node, LocalVariableReadNode, LocalVariableWriteNode, node.name, node.depth)
-    end
-
-    # foo ||= bar
-    #
-    # becomes
-    #
-    # foo || foo = bar
-    def visit_local_variable_or_write_node(node)
-      desugar_or_write_node(node, LocalVariableReadNode, LocalVariableWriteNode, node.name, node.depth)
-    end
-
-    # foo += bar
-    #
-    # becomes
-    #
-    # foo = foo + bar
-    def visit_local_variable_operator_write_node(node)
-      desugar_operator_write_node(node, LocalVariableReadNode, LocalVariableWriteNode, node.name, node.depth)
-    end
-
-    private
-
-    # Desugar `x &&= y` to `x && x = y`
-    def desugar_and_write_node(node, read_class, write_class, *arguments)
-      AndNode.new(
-        read_class.new(*arguments, node.name_loc),
-        write_class.new(*arguments, node.name_loc, node.value, node.operator_loc, node.location),
-        node.operator_loc,
-        node.location
-      )
-    end
-
-    # Desugar `x += y` to `x = x + y`
-    def desugar_operator_write_node(node, read_class, write_class, *arguments)
-      write_class.new(
-        *arguments,
-        node.name_loc,
-        CallNode.new(
-          read_class.new(*arguments, node.name_loc),
-          nil,
-          node.operator_loc.copy(length: node.operator_loc.length - 1),
-          nil,
-          ArgumentsNode.new([node.value], node.value.location),
-          nil,
-          nil,
-          0,
-          node.operator_loc.slice.chomp("="),
-          node.location
-        ),
-        node.operator_loc.copy(start_offset: node.operator_loc.end_offset - 1, length: 1),
-        node.location
-      )
-    end
-
-    # Desugar `x ||= y` to `x || x = y`
-    def desugar_or_write_node(node, read_class, write_class, *arguments)
-      OrNode.new(
-        read_class.new(*arguments, node.name_loc),
-        write_class.new(*arguments, node.name_loc, node.value, node.operator_loc, node.location),
-        node.operator_loc,
-        node.location
-      )
-    end
-
-    # Desugar `x ||= y` to `defined?(x) ? x : x = y`
-    def desugar_or_write_defined_node(node, read_class, write_class, *arguments)
-      IfNode.new(
-        node.operator_loc,
-        DefinedNode.new(nil, read_class.new(*arguments, node.name_loc), nil, node.operator_loc, node.name_loc),
-        StatementsNode.new([read_class.new(*arguments, node.name_loc)], node.location),
-        ElseNode.new(
-          node.operator_loc,
-          StatementsNode.new(
-            [write_class.new(*arguments, node.name_loc, node.value, node.operator_loc, node.location)],
-            node.location
-          ),
-          node.operator_loc,
-          node.location
-        ),
-        node.operator_loc,
-        node.location
-      )
-    end
-  end
-end
diff --git a/lib/yarp/ffi.rb b/lib/yarp/ffi.rb
deleted file mode 100644
index 26b6019b27f894..00000000000000
--- a/lib/yarp/ffi.rb
+++ /dev/null
@@ -1,252 +0,0 @@
-# frozen_string_literal: true
-
-# This file is responsible for mirroring the API provided by the C extension by
-# using FFI to call into the shared library.
-
-require "rbconfig"
-require "ffi"
-
-module YARP
-  BACKEND = :FFI
-
-  module LibRubyParser
-    extend FFI::Library
-
-    # Define the library that we will be pulling functions from. Note that this
-    # must align with the build shared library from make/rake.
-    ffi_lib File.expand_path("../../build/librubyparser.#{RbConfig::CONFIG["SOEXT"]}", __dir__)
-
-    # Convert a native C type declaration into a symbol that FFI understands.
-    # For example:
-    #
-    #     const char * -> :pointer
-    #     bool         -> :bool
-    #     size_t       -> :size_t
-    #     void         -> :void
-    #
-    def self.resolve_type(type)
-      type = type.strip.delete_prefix("const ")
-      type.end_with?("*") ? :pointer : type.to_sym
-    end
-
-    # Read through the given header file and find the declaration of each of the
-    # given functions. For each one, define a function with the same name and
-    # signature as the C function.
-    def self.load_exported_functions_from(header, *functions)
-      File.foreach(File.expand_path("../../include/#{header}", __dir__)) do |line|
-        # We only want to attempt to load exported functions.
-        next unless line.start_with?("YP_EXPORTED_FUNCTION ")
-
-        # We only want to load the functions that we are interested in.
-        next unless functions.any? { |function| line.include?(function) }
-
-        # Parse the function declaration.
-        unless /^YP_EXPORTED_FUNCTION (?<return_type>.+) (?<name>\w+)\((?<arg_types>.+)\);$/ =~ line
-          raise "Could not parse #{line}"
-        end
-
-        # Delete the function from the list of functions we are looking for to
-        # mark it as having been found.
-        functions.delete(name)
-
-        # Split up the argument types into an array, ensure we handle the case
-        # where there are no arguments (by explicit void).
-        arg_types = arg_types.split(",").map(&:strip)
-        arg_types = [] if arg_types == %w[void]
-
-        # Resolve the type of the argument by dropping the name of the argument
-        # first if it is present.
-        arg_types.map! { |type| resolve_type(type.sub(/\w+$/, "")) }
-
-        # Attach the function using the FFI library.
-        attach_function name, arg_types, resolve_type(return_type)
-      end
-
-      # If we didn't find all of the functions, raise an error.
-      raise "Could not find functions #{functions.inspect}" unless functions.empty?
-    end
-
-    load_exported_functions_from(
-      "yarp.h",
-      "yp_version",
-      "yp_parse_serialize",
-      "yp_lex_serialize",
-      "yp_parse_lex_serialize"
-    )
-
-    load_exported_functions_from(
-      "yarp/util/yp_buffer.h",
-      "yp_buffer_sizeof",
-      "yp_buffer_init",
-      "yp_buffer_value",
-      "yp_buffer_length",
-      "yp_buffer_free"
-    )
-
-    load_exported_functions_from(
-      "yarp/util/yp_string.h",
-      "yp_string_mapped_init",
-      "yp_string_free",
-      "yp_string_source",
-      "yp_string_length",
-      "yp_string_sizeof"
-    )
-
-    # This object represents a yp_buffer_t. We only use it as an opaque pointer,
-    # so it doesn't need to know the fields of yp_buffer_t.
-    class YPBuffer
-      SIZEOF = LibRubyParser.yp_buffer_sizeof
-
-      attr_reader :pointer
-
-      def initialize(pointer)
-        @pointer = pointer
-      end
-
-      def value
-        LibRubyParser.yp_buffer_value(pointer)
-      end
-
-      def length
-        LibRubyParser.yp_buffer_length(pointer)
-      end
-
-      def read
-        value.read_string(length)
-      end
-
-      # Initialize a new buffer and yield it to the block. The buffer will be
-      # automatically freed when the block returns.
-      def self.with(&block)
-        pointer = FFI::MemoryPointer.new(SIZEOF)
-
-        begin
-          raise unless LibRubyParser.yp_buffer_init(pointer)
-          yield new(pointer)
-        ensure
-          LibRubyParser.yp_buffer_free(pointer)
-          pointer.free
-        end
-      end
-    end
-
-    # This object represents a yp_string_t. We only use it as an opaque pointer,
-    # so it doesn't have to be an FFI::Struct.
-    class YPString
-      SIZEOF = LibRubyParser.yp_string_sizeof
-
-      attr_reader :pointer
-
-      def initialize(pointer)
-        @pointer = pointer
-      end
-
-      def source
-        LibRubyParser.yp_string_source(pointer)
-      end
-
-      def length
-        LibRubyParser.yp_string_length(pointer)
-      end
-
-      def read
-        source.read_string(length)
-      end
-
-      # Yields a yp_string_t pointer to the given block.
-      def self.with(filepath, &block)
-        pointer = FFI::MemoryPointer.new(SIZEOF)
-
-        begin
-          raise unless LibRubyParser.yp_string_mapped_init(pointer, filepath)
-          yield new(pointer)
-        ensure
-          LibRubyParser.yp_string_free(pointer)
-          pointer.free
-        end
-      end
-    end
-  end
-
-  # Mark the LibRubyParser module as private as it should only be called through
-  # the YARP module.
-  private_constant :LibRubyParser
-
-  # The version constant is set by reading the result of calling yp_version.
-  VERSION = LibRubyParser.yp_version.read_string
-
-  def self.dump_internal(source, source_size, filepath)
-    LibRubyParser::YPBuffer.with do |buffer|
-      metadata = [filepath.bytesize, filepath.b, 0].pack("LA*L") if filepath
-      LibRubyParser.yp_parse_serialize(source, source_size, buffer.pointer, metadata)
-      buffer.read
-    end
-  end
-  private_class_method :dump_internal
-
-  # Mirror the YARP.dump API by using the serialization API.
-  def self.dump(code, filepath = nil)
-    dump_internal(code, code.bytesize, filepath)
-  end
-
-  # Mirror the YARP.dump_file API by using the serialization API.
-  def self.dump_file(filepath)
-    LibRubyParser::YPString.with(filepath) do |string|
-      dump_internal(string.source, string.length, filepath)
-    end
-  end
-
-  # Mirror the YARP.lex API by using the serialization API.
-  def self.lex(code, filepath = nil)
-    LibRubyParser::YPBuffer.with do |buffer|
-      LibRubyParser.yp_lex_serialize(code, code.bytesize, filepath, buffer.pointer)
-      Serialize.load_tokens(Source.new(code), buffer.read)
-    end
-  end
-
-  # Mirror the YARP.lex_file API by using the serialization API.
-  def self.lex_file(filepath)
-    LibRubyParser::YPString.with(filepath) do |string|
-      lex(string.read, filepath)
-    end
-  end
-
-  # Mirror the YARP.parse API by using the serialization API.
-  def self.parse(code, filepath = nil)
-    YARP.load(code, dump(code, filepath))
-  end
-
-  # Mirror the YARP.parse_file API by using the serialization API. This uses
-  # native strings instead of Ruby strings because it allows us to use mmap when
-  # it is available.
-  def self.parse_file(filepath)
-    LibRubyParser::YPString.with(filepath) do |string|
-      parse(string.read, filepath)
-    end
-  end
-
-  # Mirror the YARP.parse_lex API by using the serialization API.
-  def self.parse_lex(code, filepath = nil)
-    LibRubyParser::YPBuffer.with do |buffer|
-      metadata = [filepath.bytesize, filepath.b, 0].pack("LA*L") if filepath
-      LibRubyParser.yp_parse_lex_serialize(code, code.bytesize, buffer.pointer, metadata)
-
-      source = Source.new(code)
-      loader = Serialize::Loader.new(source, buffer.read)
-
-      tokens = loader.load_tokens
-      node, comments, errors, warnings = loader.load_nodes
-
-      tokens.each { |token,| token.value.force_encoding(loader.encoding) }
-
-      ParseResult.new([node, tokens], comments, errors, warnings, source)
-    end
-  end
-
-  # Mirror the YARP.parse_lex_file API by using the serialization API.
-  def self.parse_lex_file(filepath)
-    LibRubyParser::YPString.with(filepath) do |string|
-      parse_lex(string.read, filepath)
-    end
-  end
-end
diff --git a/lib/yarp/language_server.rb b/lib/yarp/language_server.rb
deleted file mode 100644
index 5a10d484a17381..00000000000000
--- a/lib/yarp/language_server.rb
+++ /dev/null
@@ -1,166 +0,0 @@
-# frozen_string_literal: true
-
-require "cgi"
-require "json"
-require "uri"
-
-module YARP
-  # YARP additionally ships with a language server conforming to the
-  # language server protocol. It can be invoked by running the yarp-lsp
-  # bin script (bin/yarp-lsp)
-  class LanguageServer
-    GITHUB_TEMPLATE = <<~TEMPLATE
-    Reporting issue with error `%{error}`.
-
-    ## Expected behavior
-    <!-- TODO: Briefly explain what the expected behavior should be on this example. -->
-
-    ## Actual behavior
-    <!-- TODO: Describe here what actually happened. -->
-
-    ## Steps to reproduce the problem
-    <!-- TODO: Describe how we can reproduce the problem. -->
-
-    ## Additional information
-    <!-- TODO: Include any additional information, such as screenshots. -->
-
-    TEMPLATE
-
-    attr_reader :input, :output
-
-    def initialize(
-      input: $stdin,
-      output: $stdout
-    )
-      @input = input.binmode
-      @output = output.binmode
-    end
-
-    # rubocop:disable Layout/LineLength
-    def run
-      store =
-        Hash.new do |hash, uri|
-          filepath = CGI.unescape(URI.parse(uri).path)
-          File.exist?(filepath) ? (hash[uri] = File.read(filepath)) : nil
-        end
-
-      while (headers = input.gets("\r\n\r\n"))
-        source = input.read(headers[/Content-Length: (\d+)/i, 1].to_i)
-        request = JSON.parse(source, symbolize_names: true)
-
-        # stree-ignore
-        case request
-        in { method: "initialize", id: }
-          store.clear
-          write(id: id, result: { capabilities: capabilities })
-        in { method: "initialized" }
-          # ignored
-        in { method: "shutdown" } # tolerate missing ID to be a good citizen
-          store.clear
-          write(id: request[:id], result: {})
-        in { method: "exit"}
-          return
-        in { method: "textDocument/didChange", params: { textDocument: { uri: }, contentChanges: [{ text: }, *] } }
-          store[uri] = text
-        in { method: "textDocument/didOpen", params: { textDocument: { uri:, text: } } }
-          store[uri] = text
-        in { method: "textDocument/didClose", params: { textDocument: { uri: } } }
-          store.delete(uri)
-        in { method: "textDocument/diagnostic", id:, params: { textDocument: { uri: } } }
-          contents = store[uri]
-          write(id: id, result: contents ? diagnostics(contents) : nil)
-        in { method: "textDocument/codeAction", id:, params: { textDocument: { uri: }, context: { diagnostics: }}}
-          contents = store[uri]
-          write(id: id, result: contents ? code_actions(contents, diagnostics) : nil)
-        in { method: %r{\$/.+} }
-          # ignored
-        end
-      end
-    end
-    # rubocop:enable Layout/LineLength
-
-    private
-
-    def capabilities
-      {
-        codeActionProvider: {
-          codeActionKinds: [
-            'quickfix',
-          ],
-        },
-        diagnosticProvider: {
-          interFileDependencies: false,
-          workspaceDiagnostics: false,
-        },
-        textDocumentSync: {
-          change: 1,
-          openClose: true
-        },
-      }
-    end
-
-    def code_actions(source, diagnostics)
-      diagnostics.map do |diagnostic|
-        message = diagnostic[:message]
-        issue_content = URI.encode_www_form_component(GITHUB_TEMPLATE % {error: message})
-        issue_link = "https://github.com/ruby/yarp/issues/new?&labels=Bug&body=#{issue_content}"
-
-        {
-          title: "Report incorrect error: `#{diagnostic[:message]}`",
-          kind: "quickfix",
-          diagnostics: [diagnostic],
-          command: {
-            title: "Report incorrect error",
-            command: "vscode.open",
-            arguments: [issue_link]
-          }
-        }
-      end
-    end
-
-    def diagnostics(source)
-      offsets = Hash.new do |hash, key|
-        slice = source.byteslice(...key)
-        lineno = slice.count("\n")
-
-        char = slice.length
-        newline = source.rindex("\n", [char - 1, 0].max) || -1
-        hash[key] = { line: lineno, character: char - newline - 1 }
-      end
-
-      parse_output = YARP.parse(source)
-
-      {
-        kind: "full",
-        items: [
-          *parse_output.errors.map do |error|
-            {
-              range: {
-                start: offsets[error.location.start_offset],
-                end: offsets[error.location.end_offset],
-              },
-              message: error.message,
-              severity: 1,
-            }
-          end,
-          *parse_output.warnings.map do |warning|
-            {
-              range: {
-                start: offsets[warning.location.start_offset],
-                end: offsets[warning.location.end_offset],
-              },
-              message: warning.message,
-              severity: 2,
-            }
-          end,
-        ]
-      }
-    end
-
-    def write(value)
-      response = value.merge(jsonrpc: "2.0").to_json
-      output.print("Content-Length: #{response.bytesize}\r\n\r\n#{response}")
-      output.flush
-    end
-  end
-end
diff --git a/lib/yarp/pack.rb b/lib/yarp/pack.rb
deleted file mode 100644
index 83f5569923eecf..00000000000000
--- a/lib/yarp/pack.rb
+++ /dev/null
@@ -1,185 +0,0 @@
-# frozen_string_literal: true
-
-module YARP
-  module Pack
-    %i[
-      SPACE
-      COMMENT
-      INTEGER
-      UTF8
-      BER
-      FLOAT
-      STRING_SPACE_PADDED
-      STRING_NULL_PADDED
-      STRING_NULL_TERMINATED
-      STRING_MSB
-      STRING_LSB
-      STRING_HEX_HIGH
-      STRING_HEX_LOW
-      STRING_UU
-      STRING_MIME
-      STRING_BASE64
-      STRING_FIXED
-      STRING_POINTER
-      MOVE
-      BACK
-      NULL
-
-      UNSIGNED
-      SIGNED
-      SIGNED_NA
-
-      AGNOSTIC_ENDIAN
-      LITTLE_ENDIAN
-      BIG_ENDIAN
-      NATIVE_ENDIAN
-      ENDIAN_NA
-
-      SIZE_SHORT
-      SIZE_INT
-      SIZE_LONG
-      SIZE_LONG_LONG
-      SIZE_8
-      SIZE_16
-      SIZE_32
-      SIZE_64
-      SIZE_P
-      SIZE_NA
-
-      LENGTH_FIXED
-      LENGTH_MAX
-      LENGTH_RELATIVE
-      LENGTH_NA
-    ].each do |const|
-      const_set(const, const)
-    end
-
-    class Directive
-      attr_reader :version, :variant, :source, :type, :signed, :endian, :size, :length_type, :length
-
-      def initialize(version, variant, source, type, signed, endian, size, length_type, length)
-        @version = version
-        @variant = variant
-        @source = source
-        @type = type
-        @signed = signed
-        @endian = endian
-        @size = size
-        @length_type = length_type
-        @length = length
-      end
-
-      ENDIAN_DESCRIPTIONS = {
-        AGNOSTIC_ENDIAN: 'agnostic',
-        LITTLE_ENDIAN: 'little-endian (VAX)',
-        BIG_ENDIAN: 'big-endian (network)',
-        NATIVE_ENDIAN: 'native-endian',
-        ENDIAN_NA: 'n/a'
-      }
-
-      SIGNED_DESCRIPTIONS = {
-        UNSIGNED: 'unsigned',
-        SIGNED: 'signed',
-        SIGNED_NA: 'n/a'
-      }
-
-      SIZE_DESCRIPTIONS = {
-        SIZE_SHORT: 'short',
-        SIZE_INT: 'int-width',
-        SIZE_LONG: 'long',
-        SIZE_LONG_LONG: 'long long',
-        SIZE_8: '8-bit',
-        SIZE_16: '16-bit',
-        SIZE_32: '32-bit',
-        SIZE_64: '64-bit',
-        SIZE_P: 'pointer-width'
-      }
-
-      def describe
-        case type
-        when SPACE
-          'whitespace'
-        when COMMENT
-          'comment'
-        when INTEGER
-          if size == SIZE_8
-            base = "#{SIGNED_DESCRIPTIONS[signed]} #{SIZE_DESCRIPTIONS[size]} integer"
-          else
-            base = "#{SIGNED_DESCRIPTIONS[signed]} #{SIZE_DESCRIPTIONS[size]} #{ENDIAN_DESCRIPTIONS[endian]} integer"
-          end
-          case length_type
-          when LENGTH_FIXED
-            if length > 1
-              base + ", x#{length}"
-            else
-              base
-            end
-          when LENGTH_MAX
-            base + ', as many as possible'
-          end
-        when UTF8
-          'UTF-8 character'
-        when BER
-          'BER-compressed integer'
-        when FLOAT
-          "#{SIZE_DESCRIPTIONS[size]} #{ENDIAN_DESCRIPTIONS[endian]} float"
-        when STRING_SPACE_PADDED
-          'arbitrary binary string (space padded)'
-        when STRING_NULL_PADDED
-          'arbitrary binary string (null padded, count is width)'
-        when STRING_NULL_TERMINATED
-          'arbitrary binary string (null padded, count is width), except that null is added with *'
-        when STRING_MSB
-          'bit string (MSB first)'
-        when STRING_LSB
-          'bit string (LSB first)'
-        when STRING_HEX_HIGH
-          'hex string (high nibble first)'
-        when STRING_HEX_LOW
-          'hex string (low nibble first)'
-        when STRING_UU
-          'UU-encoded string'
-        when STRING_MIME
-          'quoted printable, MIME encoding'
-        when STRING_BASE64
-          'base64 encoded string'
-        when STRING_FIXED
-          'pointer to a structure (fixed-length string)'
-        when STRING_POINTER
-          'pointer to a null-terminated string'
-        when MOVE
-          'move to absolute position'
-        when BACK
-          'back up a byte'
-        when NULL
-          'null byte'
-        else
-          raise
-        end
-      end
-    end
-
-    class Format
-      attr_reader :directives, :encoding
-
-      def initialize(directives, encoding)
-        @directives = directives
-        @encoding = encoding
-      end
-
-      def describe
-        source_width = directives.map { |d| d.source.inspect.length }.max
-        directive_lines = directives.map do |directive|
-          if directive.type == SPACE
-            source = directive.source.inspect
-          else
-            source = directive.source
-          end
-          "  #{source.ljust(source_width)}  #{directive.describe}"
-        end
-
-        (['Directives:'] + directive_lines + ['Encoding:', "  #{encoding}"]).join("\n")
-      end
-    end
-  end
-end
diff --git a/lib/yarp/pattern.rb b/lib/yarp/pattern.rb
deleted file mode 100644
index 339f1506c35cb1..00000000000000
--- a/lib/yarp/pattern.rb
+++ /dev/null
@@ -1,239 +0,0 @@
-# frozen_string_literal: true
-
-module YARP
-  # A pattern is an object that wraps a Ruby pattern matching expression. The
-  # expression would normally be passed to an `in` clause within a `case`
-  # expression or a rightward assignment expression. For example, in the
-  # following snippet:
-  #
-  #     case node
-  #     in ConstantPathNode[ConstantReadNode[name: :YARP], ConstantReadNode[name: :Pattern]]
-  #     end
-  #
-  # the pattern is the `ConstantPathNode[...]` expression.
-  #
-  # The pattern gets compiled into an object that responds to #call by running
-  # the #compile method. This method itself will run back through YARP to
-  # parse the expression into a tree, then walk the tree to generate the
-  # necessary callable objects. For example, if you wanted to compile the
-  # expression above into a callable, you would:
-  #
-  #     callable = YARP::Pattern.new("ConstantPathNode[ConstantReadNode[name: :YARP], ConstantReadNode[name: :Pattern]]").compile
-  #     callable.call(node)
-  #
-  # The callable object returned by #compile is guaranteed to respond to #call
-  # with a single argument, which is the node to match against. It also is
-  # guaranteed to respond to #===, which means it itself can be used in a `case`
-  # expression, as in:
-  #
-  #     case node
-  #     when callable
-  #     end
-  #
-  # If the query given to the initializer cannot be compiled into a valid
-  # matcher (either because of a syntax error or because it is using syntax we
-  # do not yet support) then a YARP::Pattern::CompilationError will be
-  # raised.
-  class Pattern
-    # Raised when the query given to a pattern is either invalid Ruby syntax or
-    # is using syntax that we don't yet support.
-    class CompilationError < StandardError
-      def initialize(repr)
-        super(<<~ERROR)
-          YARP was unable to compile the pattern you provided into a usable
-          expression. It failed on to understand the node represented by:
-
-          #{repr}
-
-          Note that not all syntax supported by Ruby's pattern matching syntax
-          is also supported by YARP's patterns. If you're using some syntax
-          that you believe should be supported, please open an issue on
-          GitHub at https://github.com/ruby/yarp/issues/new.
-        ERROR
-      end
-    end
-
-    attr_reader :query
-
-    def initialize(query)
-      @query = query
-      @compiled = nil
-    end
-
-    def compile
-      result = YARP.parse("case nil\nin #{query}\nend")
-      compile_node(result.value.statements.body.last.conditions.last.pattern)
-    end
-
-    def scan(root)
-      return to_enum(__method__, root) unless block_given?
-
-      @compiled ||= compile
-      queue = [root]
-
-      while (node = queue.shift)
-        yield node if @compiled.call(node)
-        queue.concat(node.child_nodes.compact)
-      end
-    end
-
-    private
-
-    # Shortcut for combining two procs into one that returns true if both return
-    # true.
-    def combine_and(left, right)
-      ->(other) { left.call(other) && right.call(other) }
-    end
-
-    # Shortcut for combining two procs into one that returns true if either
-    # returns true.
-    def combine_or(left, right)
-      ->(other) { left.call(other) || right.call(other) }
-    end
-
-    # Raise an error because the given node is not supported.
-    def compile_error(node)
-      raise CompilationError, node.inspect
-    end
-
-    # in [foo, bar, baz]
-    def compile_array_pattern_node(node)
-      compile_error(node) if !node.rest.nil? || node.posts.any?
-
-      constant = node.constant
-      compiled_constant = compile_node(constant) if constant
-
-      preprocessed = node.requireds.map { |required| compile_node(required) }
-
-      compiled_requireds = ->(other) do
-        deconstructed = other.deconstruct
-
-        deconstructed.length == preprocessed.length &&
-          preprocessed
-            .zip(deconstructed)
-            .all? { |(matcher, value)| matcher.call(value) }
-      end
-
-      if compiled_constant
-        combine_and(compiled_constant, compiled_requireds)
-      else
-        compiled_requireds
-      end
-    end
-
-    # in foo | bar
-    def compile_alternation_pattern_node(node)
-      combine_or(compile_node(node.left), compile_node(node.right))
-    end
-
-    # in YARP::ConstantReadNode
-    def compile_constant_path_node(node)
-      parent = node.parent
-
-      if parent.is_a?(ConstantReadNode) && parent.slice == "YARP"
-        compile_node(node.child)
-      else
-        compile_error(node)
-      end
-    end
-
-    # in ConstantReadNode
-    # in String
-    def compile_constant_read_node(node)
-      value = node.slice
-
-      if YARP.const_defined?(value, false)
-        clazz = YARP.const_get(value)
-
-        ->(other) { clazz === other }
-      elsif Object.const_defined?(value, false)
-        clazz = Object.const_get(value)
-
-        ->(other) { clazz === other }
-      else
-        compile_error(node)
-      end
-    end
-
-    # in InstanceVariableReadNode[name: Symbol]
-    # in { name: Symbol }
-    def compile_hash_pattern_node(node)
-      compile_error(node) unless node.kwrest.nil?
-      compiled_constant = compile_node(node.constant) if node.constant
-
-      preprocessed =
-        node.assocs.to_h do |assoc|
-          [assoc.key.unescaped.to_sym, compile_node(assoc.value)]
-        end
-
-      compiled_keywords = ->(other) do
-        deconstructed = other.deconstruct_keys(preprocessed.keys)
-
-        preprocessed.all? do |keyword, matcher|
-          deconstructed.key?(keyword) && matcher.call(deconstructed[keyword])
-        end
-      end
-
-      if compiled_constant
-        combine_and(compiled_constant, compiled_keywords)
-      else
-        compiled_keywords
-      end
-    end
-
-    # in nil
-    def compile_nil_node(node)
-      ->(attribute) { attribute.nil? }
-    end
-
-    # in /foo/
-    def compile_regular_expression_node(node)
-      regexp = Regexp.new(node.unescaped, node.closing[1..])
-
-      ->(attribute) { regexp === attribute }
-    end
-
-    # in ""
-    # in "foo"
-    def compile_string_node(node)
-      string = node.unescaped
-
-      ->(attribute) { string === attribute }
-    end
-
-    # in :+
-    # in :foo
-    def compile_symbol_node(node)
-      symbol = node.unescaped.to_sym
-
-      ->(attribute) { symbol === attribute }
-    end
-
-    # Compile any kind of node. Dispatch out to the individual compilation
-    # methods based on the type of node.
-    def compile_node(node)
-      case node
-      when AlternationPatternNode
-        compile_alternation_pattern_node(node)
-      when ArrayPatternNode
-        compile_array_pattern_node(node)
-      when ConstantPathNode
-        compile_constant_path_node(node)
-      when ConstantReadNode
-        compile_constant_read_node(node)
-      when HashPatternNode
-        compile_hash_pattern_node(node)
-      when NilNode
-        compile_nil_node(node)
-      when RegularExpressionNode
-        compile_regular_expression_node(node)
-      when StringNode
-        compile_string_node(node)
-      when SymbolNode
-        compile_symbol_node(node)
-      else
-        compile_error(node)
-      end
-    end
-  end
-end
diff --git a/lib/yarp/ripper_compat.rb b/lib/yarp/ripper_compat.rb
deleted file mode 100644
index c76f3fd07ad153..00000000000000
--- a/lib/yarp/ripper_compat.rb
+++ /dev/null
@@ -1,174 +0,0 @@
-# frozen_string_literal: true
-
-require "ripper"
-
-module YARP
-  # This class is meant to provide a compatibility layer between YARP and
-  # Ripper. It functions by parsing the entire tree first and then walking it
-  # and executing each of the Ripper callbacks as it goes.
-  #
-  # This class is going to necessarily be slower than the native Ripper API. It
-  # is meant as a stopgap until developers migrate to using YARP. It is also
-  # meant as a test harness for the YARP parser.
-  class RipperCompat
-    # This class mirrors the ::Ripper::SexpBuilder subclass of ::Ripper that
-    # returns the arrays of [type, *children].
-    class SexpBuilder < RipperCompat
-      private
-
-      Ripper::PARSER_EVENTS.each do |event|
-        define_method(:"on_#{event}") do |*args|
-          [event, *args]
-        end
-      end
-
-      Ripper::SCANNER_EVENTS.each do |event|
-        define_method(:"on_#{event}") do |value|
-          [:"@#{event}", value, [lineno, column]]
-        end
-      end
-    end
-
-    # This class mirrors the ::Ripper::SexpBuilderPP subclass of ::Ripper that
-    # returns the same values as ::Ripper::SexpBuilder except with a couple of
-    # niceties that flatten linked lists into arrays.
-    class SexpBuilderPP < SexpBuilder
-      private
-
-      def _dispatch_event_new
-        []
-      end
-
-      def _dispatch_event_push(list, item)
-        list << item
-        list
-      end
-
-      Ripper::PARSER_EVENT_TABLE.each do |event, arity|
-        case event
-        when /_new\z/
-          alias_method :"on_#{event}", :_dispatch_event_new if arity == 0
-        when /_add\z/
-          alias_method :"on_#{event}", :_dispatch_event_push
-        end
-      end
-    end
-
-    attr_reader :source, :lineno, :column
-
-    def initialize(source)
-      @source = source
-      @result = nil
-      @lineno = nil
-      @column = nil
-    end
-
-    ############################################################################
-    # Public interface
-    ############################################################################
-
-    def error?
-      result.errors.any?
-    end
-
-    def parse
-      result.value.accept(self) unless error?
-    end
-
-    ############################################################################
-    # Visitor methods
-    ############################################################################
-
-    def visit(node)
-      node&.accept(self)
-    end
-
-    def visit_call_node(node)
-      if !node.opening_loc && node.arguments.arguments.length == 1
-        bounds(node.receiver.location)
-        left = visit(node.receiver)
-
-        bounds(node.arguments.arguments.first.location)
-        right = visit(node.arguments.arguments.first)
-
-        on_binary(left, source[node.message_loc.start_offset...node.message_loc.end_offset].to_sym, right)
-      else
-        raise NotImplementedError
-      end
-    end
-
-    def visit_integer_node(node)
-      bounds(node.location)
-      on_int(source[node.location.start_offset...node.location.end_offset])
-    end
-
-    def visit_statements_node(node)
-      bounds(node.location)
-      node.body.inject(on_stmts_new) do |stmts, stmt|
-        on_stmts_add(stmts, visit(stmt))
-      end
-    end
-
-    def visit_token(node)
-      bounds(node.location)
-
-      case node.type
-      when :MINUS
-        on_op(node.value)
-      when :PLUS
-        on_op(node.value)
-      else
-        raise NotImplementedError, "Unknown token: #{node.type}"
-      end
-    end
-
-    def visit_program_node(node)
-      bounds(node.location)
-      on_program(visit(node.statements))
-    end
-
-    ############################################################################
-    # Entrypoints for subclasses
-    ############################################################################
-
-    # This is a convenience method that runs the SexpBuilder subclass parser.
-    def self.sexp_raw(source)
-      SexpBuilder.new(source).parse
-    end
-
-    # This is a convenience method that runs the SexpBuilderPP subclass parser.
-    def self.sexp(source)
-      SexpBuilderPP.new(source).parse
-    end
-
-    private
-
-    # This method is responsible for updating lineno and column information
-    # to reflect the current node.
-    #
-    # This method could be drastically improved with some caching on the start
-    # of every line, but for now it's good enough.
-    def bounds(location)
-      start_offset = location.start_offset
-
-      @lineno = source[0..start_offset].count("\n") + 1
-      @column = start_offset - (source.rindex("\n", start_offset) || 0)
-    end
-
-    def result
-      @result ||= YARP.parse(source)
-    end
-
-    def _dispatch0; end
-    def _dispatch1(_); end
-    def _dispatch2(_, _); end
-    def _dispatch3(_, _, _); end
-    def _dispatch4(_, _, _, _); end
-    def _dispatch5(_, _, _, _, _); end
-    def _dispatch7(_, _, _, _, _, _, _); end
-
-    (Ripper::SCANNER_EVENT_TABLE.merge(Ripper::PARSER_EVENT_TABLE)).each do |event, arity|
-      alias_method :"on_#{event}", :"_dispatch#{arity}"
-    end
-  end
-end
diff --git a/lib/yarp/version.rb b/lib/yarp/version.rb
deleted file mode 100644
index e450bfb526f866..00000000000000
--- a/lib/yarp/version.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-# frozen_string_literal: true
-
-module YARP
-  VERSION = "0.8.0"
-end
diff --git a/lib/yarp/yarp.gemspec b/lib/yarp/yarp.gemspec
deleted file mode 100644
index 33b47d676aa25e..00000000000000
--- a/lib/yarp/yarp.gemspec
+++ /dev/null
@@ -1,103 +0,0 @@
-# frozen_string_literal: true
-
-Gem::Specification.new do |spec|
-  spec.name = "yarp"
-  spec.version = "0.10.0"
-  spec.authors = ["Shopify"]
-  spec.email = ["ruby@shopify.com"]
-
-  spec.summary = "Yet Another Ruby Parser"
-  spec.homepage = "https://github.com/ruby/yarp"
-  spec.license = "MIT"
-
-  spec.required_ruby_version = ">= 3.0.0"
-
-  spec.require_paths = ["lib"]
-  spec.files = [
-    "CHANGELOG.md",
-    "CODE_OF_CONDUCT.md",
-    "CONTRIBUTING.md",
-    "LICENSE.md",
-    "Makefile",
-    "README.md",
-    "config.yml",
-    "docs/build_system.md",
-    "docs/building.md",
-    "docs/configuration.md",
-    "docs/design.md",
-    "docs/encoding.md",
-    "docs/fuzzing.md",
-    "docs/heredocs.md",
-    "docs/mapping.md",
-    "docs/ripper.md",
-    "docs/ruby_api.md",
-    "docs/serialization.md",
-    "docs/testing.md",
-    "ext/yarp/api_node.c",
-    "ext/yarp/api_pack.c",
-    "ext/yarp/extension.c",
-    "ext/yarp/extension.h",
-    "include/yarp.h",
-    "include/yarp/ast.h",
-    "include/yarp/defines.h",
-    "include/yarp/diagnostic.h",
-    "include/yarp/enc/yp_encoding.h",
-    "include/yarp/node.h",
-    "include/yarp/pack.h",
-    "include/yarp/parser.h",
-    "include/yarp/regexp.h",
-    "include/yarp/unescape.h",
-    "include/yarp/util/yp_buffer.h",
-    "include/yarp/util/yp_char.h",
-    "include/yarp/util/yp_constant_pool.h",
-    "include/yarp/util/yp_list.h",
-    "include/yarp/util/yp_memchr.h",
-    "include/yarp/util/yp_newline_list.h",
-    "include/yarp/util/yp_state_stack.h",
-    "include/yarp/util/yp_string.h",
-    "include/yarp/util/yp_string_list.h",
-    "include/yarp/util/yp_strpbrk.h",
-    "include/yarp/version.h",
-    "lib/yarp.rb",
-    "lib/yarp/desugar_visitor.rb",
-    "lib/yarp/ffi.rb",
-    "lib/yarp/lex_compat.rb",
-    "lib/yarp/mutation_visitor.rb",
-    "lib/yarp/node.rb",
-    "lib/yarp/pack.rb",
-    "lib/yarp/pattern.rb",
-    "lib/yarp/ripper_compat.rb",
-    "lib/yarp/serialize.rb",
-    "src/diagnostic.c",
-    "src/enc/yp_big5.c",
-    "src/enc/yp_euc_jp.c",
-    "src/enc/yp_gbk.c",
-    "src/enc/yp_shift_jis.c",
-    "src/enc/yp_tables.c",
-    "src/enc/yp_unicode.c",
-    "src/enc/yp_windows_31j.c",
-    "src/node.c",
-    "src/pack.c",
-    "src/prettyprint.c",
-    "src/regexp.c",
-    "src/serialize.c",
-    "src/token_type.c",
-    "src/unescape.c",
-    "src/util/yp_buffer.c",
-    "src/util/yp_char.c",
-    "src/util/yp_constant_pool.c",
-    "src/util/yp_list.c",
-    "src/util/yp_memchr.c",
-    "src/util/yp_newline_list.c",
-    "src/util/yp_state_stack.c",
-    "src/util/yp_string.c",
-    "src/util/yp_string_list.c",
-    "src/util/yp_strncasecmp.c",
-    "src/util/yp_strpbrk.c",
-    "src/yarp.c",
-    "yarp.gemspec",
-  ]
-
-  spec.extensions = ["ext/yarp/extconf.rb"]
-  spec.metadata["allowed_push_host"] = "https://rubygems.org"
-end
diff --git a/libexec/bundle b/libexec/bundle
index 90c62627f8c726..92387bc2cf5953 100755
--- a/libexec/bundle
+++ b/libexec/bundle
@@ -15,15 +15,6 @@ end
 
 require "bundler"
 
-if Gem.rubygems_version < Gem::Version.new("3.2.3") && Gem.ruby_version < Gem::Version.new("2.7.a") && !ENV["BUNDLER_NO_OLD_RUBYGEMS_WARNING"]
-  Bundler.ui.warn \
-    "Your RubyGems version (#{Gem::VERSION}) has a bug that prevents " \
-    "`required_ruby_version` from working for Bundler. Any scripts that use " \
-    "`gem install bundler` will break as soon as Bundler drops support for " \
-    "your Ruby version. Please upgrade RubyGems to avoid future breakage " \
-    "and silence this warning by running `gem update --system 3.2.3`"
-end
-
 require "bundler/friendly_errors"
 
 Bundler.with_friendly_errors do
@@ -34,5 +25,5 @@ Bundler.with_friendly_errors do
   help_flag_used = ARGV.any? {|a| help_flags.include? a }
   args = help_flag_used ? Bundler::CLI.reformatted_help_args(ARGV) : ARGV
 
-  Bundler::CLI.start(args, :debug => true)
+  Bundler::CLI.start(args, debug: true)
 end
diff --git a/libexec/irb b/libexec/irb
deleted file mode 100755
index 12f41e4f0a1ec1..00000000000000
--- a/libexec/irb
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/usr/bin/env ruby
-#
-#   irb.rb - interactive ruby
-#   	by Keiju ISHITSUKA(keiju@ruby-lang.org)
-#
-
-require "irb"
-
-IRB.start(__FILE__)
diff --git a/libexec/rdoc b/libexec/rdoc
deleted file mode 100755
index 95b6eea2770727..00000000000000
--- a/libexec/rdoc
+++ /dev/null
@@ -1,43 +0,0 @@
-#!/usr/bin/env ruby
-#
-#  RDoc: Documentation tool for source code
-#        (see lib/rdoc/rdoc.rb for more information)
-#
-#  Copyright (c) 2003 Dave Thomas
-#  Released under the same terms as Ruby
-
-begin
-  gem 'rdoc'
-rescue NameError => e # --disable-gems
-  raise unless e.name == :gem
-rescue Gem::LoadError
-end
-
-require 'rdoc/rdoc'
-
-begin
-  r = RDoc::RDoc.new
-  r.document ARGV
-rescue Errno::ENOSPC
-  $stderr.puts 'Ran out of space creating documentation'
-  $stderr.puts
-  $stderr.puts 'Please free up some space and try again'
-rescue SystemExit
-  raise
-rescue Exception => e
-  if $DEBUG_RDOC then
-    $stderr.puts e.message
-    $stderr.puts "#{e.backtrace.join "\n\t"}"
-    $stderr.puts
-  elsif Interrupt === e then
-    $stderr.puts
-    $stderr.puts 'Interrupted'
-  else
-    $stderr.puts "uh-oh! RDoc had a problem:"
-    $stderr.puts e.message
-    $stderr.puts
-    $stderr.puts "run with --debug for full backtrace"
-  end
-
-  exit 1
-end
diff --git a/libexec/ri b/libexec/ri
deleted file mode 100755
index 7fbed0c09900f5..00000000000000
--- a/libexec/ri
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/usr/bin/env ruby
-
-begin
-  gem 'rdoc'
-rescue NameError => e # --disable-gems
-  raise unless e.name == :gem
-rescue Gem::LoadError
-end
-
-require 'rdoc/ri/driver'
-
-RDoc::RI::Driver.run ARGV
diff --git a/libexec/syntax_suggest b/libexec/syntax_suggest
index e4a0b0b658e67f..3dc8eb94d120f1 100755
--- a/libexec/syntax_suggest
+++ b/libexec/syntax_suggest
@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-require_relative "../lib/syntax_suggest/api"
+require "syntax_suggest/api"
 
 SyntaxSuggest::Cli.new(
   argv: ARGV
diff --git a/load.c b/load.c
index f9111ee6d81dd3..329b0f4b3b21ac 100644
--- a/load.c
+++ b/load.c
@@ -7,8 +7,11 @@
 #include "internal.h"
 #include "internal/dir.h"
 #include "internal/error.h"
+#include "internal/eval.h"
 #include "internal/file.h"
+#include "internal/hash.h"
 #include "internal/load.h"
+#include "internal/namespace.h"
 #include "internal/ruby_parser.h"
 #include "internal/thread.h"
 #include "internal/variable.h"
@@ -17,13 +20,57 @@
 #include "darray.h"
 #include "ruby/encoding.h"
 #include "ruby/util.h"
+#include "ractor_core.h"
+#include "vm_core.h"
 
-static VALUE ruby_dln_librefs;
+static VALUE ruby_dln_libmap;
 
 #define IS_RBEXT(e) (strcmp((e), ".rb") == 0)
 #define IS_SOEXT(e) (strcmp((e), ".so") == 0 || strcmp((e), ".o") == 0)
 #define IS_DLEXT(e) (strcmp((e), DLEXT) == 0)
 
+#if SIZEOF_VALUE <= SIZEOF_LONG
+# define SVALUE2NUM(x) LONG2NUM((long)(x))
+# define NUM2SVALUE(x) (SIGNED_VALUE)NUM2LONG(x)
+#elif SIZEOF_VALUE <= SIZEOF_LONG_LONG
+# define SVALUE2NUM(x) LL2NUM((LONG_LONG)(x))
+# define NUM2SVALUE(x) (SIGNED_VALUE)NUM2LL(x)
+#else
+# error Need integer for VALUE
+#endif
+
+#define IS_NAMESPACE(obj) (CLASS_OF(obj) == rb_cNamespace)
+
+struct vm_and_namespace_struct {
+    rb_vm_t *vm;
+    rb_namespace_t *ns;
+};
+typedef struct vm_and_namespace_struct vm_ns_t;
+#define GET_vm_ns() vm_ns_t vm_ns_v = { .vm = GET_VM(), .ns = (rb_namespace_t *)rb_current_namespace(), }; vm_ns_t *vm_ns = &vm_ns_v;
+#define GET_loading_vm_ns() vm_ns_t vm_ns_v = { .vm = GET_VM(), .ns = (rb_namespace_t *)rb_loading_namespace(), }; vm_ns_t *vm_ns = &vm_ns_v;
+
+#define CURRENT_NS_attr(vm_ns, attr) (NAMESPACE_USER_P(vm_ns->ns) ? vm_ns->ns->attr : vm_ns->vm->attr)
+#define SET_NS_attr(vm_ns, attr, value) do {                      \
+    if (NAMESPACE_USER_P(vm_ns->ns)) { vm_ns->ns->attr = value; } \
+    else { vm_ns->vm->attr = value; }                             \
+} while (0)
+
+#define SET_NS_LOAD_PATH_CHECK_CACHE(vm_ns, value) SET_NS_attr(vm_ns, load_path_check_cache, value)
+#define SET_NS_EXPANDED_LOAD_PATH(vm_ns, value)    SET_NS_attr(vm_ns, expanded_load_path, value)
+
+#define CURRENT_NS_LOAD_PATH(vm_ns)             CURRENT_NS_attr(vm_ns, load_path)
+#define CURRENT_NS_LOAD_PATH_SNAPSHOT(vm_ns)    CURRENT_NS_attr(vm_ns, load_path_snapshot)
+#define CURRENT_NS_LOAD_PATH_CHECK_CACHE(vm_ns) CURRENT_NS_attr(vm_ns, load_path_check_cache)
+#define CURRENT_NS_EXPANDED_LOAD_PATH(vm_ns)    CURRENT_NS_attr(vm_ns, expanded_load_path)
+#define CURRENT_NS_LOADING_TABLE(vm_ns)         CURRENT_NS_attr(vm_ns, loading_table)
+#define CURRENT_NS_LOADED_FEATURES(vm_ns)       CURRENT_NS_attr(vm_ns, loaded_features)
+#define CURRENT_NS_LOADED_FEATURES_SNAPSHOT(vm_ns)     CURRENT_NS_attr(vm_ns, loaded_features_snapshot)
+#define CURRENT_NS_LOADED_FEATURES_REALPATHS(vm_ns)    CURRENT_NS_attr(vm_ns, loaded_features_realpaths)
+#define CURRENT_NS_LOADED_FEATURES_REALPATH_MAP(vm_ns) CURRENT_NS_attr(vm_ns, loaded_features_realpath_map)
+#define CURRENT_NS_LOADED_FEATURES_INDEX(vm_ns)        CURRENT_NS_attr(vm_ns, loaded_features_index)
+
+#define CURRENT_NS_RUBY_DLN_LIBMAP(vm_ns, map) (NAMESPACE_USER_P(vm_ns->ns) ? vm_ns->ns->ruby_dln_libmap : map)
+
 enum {
     loadable_ext_rb = (0+ /* .rb extension is the first in both tables */
                        1) /* offset by rb_find_file_ext() */
@@ -52,10 +99,11 @@ enum expand_type {
    string objects in $LOAD_PATH are frozen.
  */
 static void
-rb_construct_expanded_load_path(rb_vm_t *vm, enum expand_type type, int *has_relative, int *has_non_cache)
+rb_construct_expanded_load_path(vm_ns_t *vm_ns, enum expand_type type, int *has_relative, int *has_non_cache)
 {
-    VALUE load_path = vm->load_path;
-    VALUE expanded_load_path = vm->expanded_load_path;
+    VALUE load_path = CURRENT_NS_LOAD_PATH(vm_ns);
+    VALUE expanded_load_path = CURRENT_NS_EXPANDED_LOAD_PATH(vm_ns);
+    VALUE snapshot;
     VALUE ary;
     long i;
 
@@ -93,109 +141,118 @@ rb_construct_expanded_load_path(rb_vm_t *vm, enum expand_type type, int *has_rel
         if (NIL_P(expanded_path)) expanded_path = as_str;
         rb_ary_push(ary, rb_fstring(expanded_path));
     }
-    rb_obj_freeze(ary);
-    vm->expanded_load_path = ary;
-    rb_ary_replace(vm->load_path_snapshot, vm->load_path);
+    rb_ary_freeze(ary);
+    SET_NS_EXPANDED_LOAD_PATH(vm_ns, ary);
+    snapshot = CURRENT_NS_LOAD_PATH_SNAPSHOT(vm_ns);
+    load_path = CURRENT_NS_LOAD_PATH(vm_ns);
+    rb_ary_replace(snapshot, load_path);
 }
 
 static VALUE
-get_expanded_load_path(rb_vm_t *vm)
+get_expanded_load_path(vm_ns_t *vm_ns)
 {
+    VALUE check_cache;
     const VALUE non_cache = Qtrue;
+    const VALUE load_path_snapshot = CURRENT_NS_LOAD_PATH_SNAPSHOT(vm_ns);
+    const VALUE load_path = CURRENT_NS_LOAD_PATH(vm_ns);
 
-    if (!rb_ary_shared_with_p(vm->load_path_snapshot, vm->load_path)) {
+    if (!rb_ary_shared_with_p(load_path_snapshot, load_path)) {
         /* The load path was modified. Rebuild the expanded load path. */
         int has_relative = 0, has_non_cache = 0;
-        rb_construct_expanded_load_path(vm, EXPAND_ALL, &has_relative, &has_non_cache);
+        rb_construct_expanded_load_path(vm_ns, EXPAND_ALL, &has_relative, &has_non_cache);
         if (has_relative) {
-            vm->load_path_check_cache = rb_dir_getwd_ospath();
+            SET_NS_LOAD_PATH_CHECK_CACHE(vm_ns, rb_dir_getwd_ospath());
         }
         else if (has_non_cache) {
             /* Non string object. */
-            vm->load_path_check_cache = non_cache;
+            SET_NS_LOAD_PATH_CHECK_CACHE(vm_ns, non_cache);
         }
         else {
-            vm->load_path_check_cache = 0;
+            SET_NS_LOAD_PATH_CHECK_CACHE(vm_ns, 0);
         }
     }
-    else if (vm->load_path_check_cache == non_cache) {
+    else if ((check_cache = CURRENT_NS_LOAD_PATH_CHECK_CACHE(vm_ns)) == non_cache) {
         int has_relative = 1, has_non_cache = 1;
         /* Expand only non-cacheable objects. */
-        rb_construct_expanded_load_path(vm, EXPAND_NON_CACHE,
+        rb_construct_expanded_load_path(vm_ns, EXPAND_NON_CACHE,
                                         &has_relative, &has_non_cache);
     }
-    else if (vm->load_path_check_cache) {
+    else if (check_cache) {
         int has_relative = 1, has_non_cache = 1;
         VALUE cwd = rb_dir_getwd_ospath();
-        if (!rb_str_equal(vm->load_path_check_cache, cwd)) {
+        if (!rb_str_equal(check_cache, cwd)) {
             /* Current working directory or filesystem encoding was changed.
                Expand relative load path and non-cacheable objects again. */
-            vm->load_path_check_cache = cwd;
-            rb_construct_expanded_load_path(vm, EXPAND_RELATIVE,
+            SET_NS_LOAD_PATH_CHECK_CACHE(vm_ns, cwd);
+            rb_construct_expanded_load_path(vm_ns, EXPAND_RELATIVE,
                                             &has_relative, &has_non_cache);
         }
         else {
             /* Expand only tilde (User HOME) and non-cacheable objects. */
-            rb_construct_expanded_load_path(vm, EXPAND_HOME,
+            rb_construct_expanded_load_path(vm_ns, EXPAND_HOME,
                                             &has_relative, &has_non_cache);
         }
     }
-    return vm->expanded_load_path;
+    return CURRENT_NS_EXPANDED_LOAD_PATH(vm_ns);
 }
 
 VALUE
 rb_get_expanded_load_path(void)
 {
-    return get_expanded_load_path(GET_VM());
+    GET_loading_vm_ns();
+    return get_expanded_load_path(vm_ns);
 }
 
 static VALUE
 load_path_getter(ID id, VALUE * p)
 {
-    rb_vm_t *vm = (void *)p;
-    return vm->load_path;
+    GET_loading_vm_ns();
+    return CURRENT_NS_LOAD_PATH(vm_ns);
 }
 
 static VALUE
-get_loaded_features(rb_vm_t *vm)
+get_loaded_features(vm_ns_t *vm_ns)
 {
-    return vm->loaded_features;
+    return CURRENT_NS_LOADED_FEATURES(vm_ns);
 }
 
 static VALUE
-get_loaded_features_realpaths(rb_vm_t *vm)
+get_loaded_features_realpaths(vm_ns_t *vm_ns)
 {
-    return vm->loaded_features_realpaths;
+    return CURRENT_NS_LOADED_FEATURES_REALPATHS(vm_ns);
 }
 
 static VALUE
-get_loaded_features_realpath_map(rb_vm_t *vm)
+get_loaded_features_realpath_map(vm_ns_t *vm_ns)
 {
-    return vm->loaded_features_realpath_map;
+    return CURRENT_NS_LOADED_FEATURES_REALPATH_MAP(vm_ns);
 }
 
 static VALUE
 get_LOADED_FEATURES(ID _x, VALUE *_y)
 {
-    return get_loaded_features(GET_VM());
+    GET_loading_vm_ns();
+    return get_loaded_features(vm_ns);
 }
 
 static void
-reset_loaded_features_snapshot(rb_vm_t *vm)
+reset_loaded_features_snapshot(vm_ns_t *vm_ns)
 {
-    rb_ary_replace(vm->loaded_features_snapshot, vm->loaded_features);
+    VALUE snapshot = CURRENT_NS_LOADED_FEATURES_SNAPSHOT(vm_ns);
+    VALUE loaded_features = CURRENT_NS_LOADED_FEATURES(vm_ns);
+    rb_ary_replace(snapshot, loaded_features);
 }
 
 static struct st_table *
-get_loaded_features_index_raw(rb_vm_t *vm)
+get_loaded_features_index_raw(vm_ns_t *vm_ns)
 {
-    return vm->loaded_features_index;
+    return CURRENT_NS_LOADED_FEATURES_INDEX(vm_ns);
 }
 
 static st_table *
-get_loading_table(rb_vm_t *vm)
+get_loading_table(vm_ns_t *vm_ns)
 {
-    return vm->loading_table;
+    return CURRENT_NS_LOADING_TABLE(vm_ns);
 }
 
 static st_data_t
@@ -216,7 +273,7 @@ is_rbext_path(VALUE feature_path)
 typedef rb_darray(long) feature_indexes_t;
 
 struct features_index_add_single_args {
-    rb_vm_t *vm;
+    vm_ns_t *vm_ns;
     VALUE offset;
     bool rb;
 };
@@ -225,7 +282,7 @@ static int
 features_index_add_single_callback(st_data_t *key, st_data_t *value, st_data_t raw_args, int existing)
 {
     struct features_index_add_single_args *args = (struct features_index_add_single_args *)raw_args;
-    rb_vm_t *vm = args->vm;
+    vm_ns_t *vm_ns = args->vm_ns;
     VALUE offset = args->offset;
     bool rb = args->rb;
 
@@ -233,7 +290,7 @@ features_index_add_single_callback(st_data_t *key, st_data_t *value, st_data_t r
         VALUE this_feature_index = *value;
 
         if (FIXNUM_P(this_feature_index)) {
-            VALUE loaded_features = get_loaded_features(vm);
+            VALUE loaded_features = get_loaded_features(vm_ns);
             VALUE this_feature_path = RARRAY_AREF(loaded_features, FIX2LONG(this_feature_index));
 
             feature_indexes_t feature_indexes;
@@ -242,9 +299,9 @@ features_index_add_single_callback(st_data_t *key, st_data_t *value, st_data_t r
             rb_darray_set(feature_indexes, top^0, FIX2LONG(this_feature_index));
             rb_darray_set(feature_indexes, top^1, FIX2LONG(offset));
 
-            assert(rb_darray_size(feature_indexes) == 2);
+            RUBY_ASSERT(rb_darray_size(feature_indexes) == 2);
             // assert feature_indexes does not look like a special const
-            assert(!SPECIAL_CONST_P((VALUE)feature_indexes));
+            RUBY_ASSERT(!SPECIAL_CONST_P((VALUE)feature_indexes));
 
             *value = (st_data_t)feature_indexes;
         }
@@ -253,7 +310,7 @@ features_index_add_single_callback(st_data_t *key, st_data_t *value, st_data_t r
             long pos = -1;
 
             if (rb) {
-                VALUE loaded_features = get_loaded_features(vm);
+                VALUE loaded_features = get_loaded_features(vm_ns);
                 for (size_t i = 0; i < rb_darray_size(feature_indexes); ++i) {
                     long idx = rb_darray_get(feature_indexes, i);
                     VALUE this_feature_path = RARRAY_AREF(loaded_features, idx);
@@ -285,7 +342,7 @@ features_index_add_single_callback(st_data_t *key, st_data_t *value, st_data_t r
 }
 
 static void
-features_index_add_single(rb_vm_t *vm, const char* str, size_t len, VALUE offset, bool rb)
+features_index_add_single(vm_ns_t *vm_ns, const char* str, size_t len, VALUE offset, bool rb)
 {
     struct st_table *features_index;
     st_data_t short_feature_key;
@@ -293,10 +350,10 @@ features_index_add_single(rb_vm_t *vm, const char* str, size_t len, VALUE offset
     Check_Type(offset, T_FIXNUM);
     short_feature_key = feature_key(str, len);
 
-    features_index = get_loaded_features_index_raw(vm);
+    features_index = get_loaded_features_index_raw(vm_ns);
 
     struct features_index_add_single_args args = {
-        .vm = vm,
+        .vm_ns = vm_ns,
         .offset = offset,
         .rb = rb,
     };
@@ -313,8 +370,10 @@ features_index_add_single(rb_vm_t *vm, const char* str, size_t len, VALUE offset
    relies on for its fast lookup.
 */
 static void
-features_index_add(rb_vm_t *vm, VALUE feature, VALUE offset)
+features_index_add(vm_ns_t *vm_ns, VALUE feature, VALUE offset)
 {
+    RUBY_ASSERT(rb_ractor_main_p());
+
     const char *feature_str, *feature_end, *ext, *p;
     bool rb = false;
 
@@ -339,14 +398,14 @@ features_index_add(rb_vm_t *vm, VALUE feature, VALUE offset)
         if (p < feature_str)
             break;
         /* Now *p == '/'.  We reach this point for every '/' in `feature`. */
-        features_index_add_single(vm, p + 1, feature_end - p - 1, offset, false);
+        features_index_add_single(vm_ns, p + 1, feature_end - p - 1, offset, false);
         if (ext) {
-            features_index_add_single(vm, p + 1, ext - p - 1, offset, rb);
+            features_index_add_single(vm_ns, p + 1, ext - p - 1, offset, rb);
         }
     }
-    features_index_add_single(vm, feature_str, feature_end - feature_str, offset, false);
+    features_index_add_single(vm_ns, feature_str, feature_end - feature_str, offset, false);
     if (ext) {
-        features_index_add_single(vm, feature_str, ext - feature_str, offset, rb);
+        features_index_add_single(vm_ns, feature_str, ext - feature_str, offset, rb);
     }
 }
 
@@ -360,23 +419,34 @@ loaded_features_index_clear_i(st_data_t key, st_data_t val, st_data_t arg)
     return ST_DELETE;
 }
 
+void
+rb_free_loaded_features_index(rb_vm_t *vm)
+{
+    /* Destructs vm->loaded_features_index directly because this is only for
+       the VM destruction */
+    st_foreach(vm->loaded_features_index, loaded_features_index_clear_i, 0);
+    st_free_table(vm->loaded_features_index);
+}
+
+
+
 static st_table *
-get_loaded_features_index(rb_vm_t *vm)
+get_loaded_features_index(vm_ns_t *vm_ns)
 {
-    VALUE features;
     int i;
+    VALUE features = CURRENT_NS_LOADED_FEATURES(vm_ns);
+    const VALUE snapshot = CURRENT_NS_LOADED_FEATURES_SNAPSHOT(vm_ns);
 
-    if (!rb_ary_shared_with_p(vm->loaded_features_snapshot, vm->loaded_features)) {
+    if (!rb_ary_shared_with_p(snapshot, features)) {
         /* The sharing was broken; something (other than us in rb_provide_feature())
            modified loaded_features.  Rebuild the index. */
-        st_foreach(vm->loaded_features_index, loaded_features_index_clear_i, 0);
+        st_foreach(CURRENT_NS_LOADED_FEATURES_INDEX(vm_ns), loaded_features_index_clear_i, 0);
 
-        VALUE realpaths = vm->loaded_features_realpaths;
-        VALUE realpath_map = vm->loaded_features_realpath_map;
+        VALUE realpaths = CURRENT_NS_LOADED_FEATURES_REALPATHS(vm_ns);
+        VALUE realpath_map = CURRENT_NS_LOADED_FEATURES_REALPATH_MAP(vm_ns);
         VALUE previous_realpath_map = rb_hash_dup(realpath_map);
         rb_hash_clear(realpaths);
         rb_hash_clear(realpath_map);
-        features = vm->loaded_features;
         for (i = 0; i < RARRAY_LEN(features); i++) {
             VALUE entry, as_str;
             as_str = entry = rb_ary_entry(features, i);
@@ -384,11 +454,11 @@ get_loaded_features_index(rb_vm_t *vm)
             as_str = rb_fstring(as_str);
             if (as_str != entry)
                 rb_ary_store(features, i, as_str);
-            features_index_add(vm, as_str, INT2FIX(i));
+            features_index_add(vm_ns, as_str, INT2FIX(i));
         }
-        reset_loaded_features_snapshot(vm);
+        reset_loaded_features_snapshot(vm_ns);
 
-        features = rb_ary_dup(vm->loaded_features_snapshot);
+        features = CURRENT_NS_LOADED_FEATURES_SNAPSHOT(vm_ns);
         long j = RARRAY_LEN(features);
         for (i = 0; i < j; i++) {
             VALUE as_str = rb_ary_entry(features, i);
@@ -402,7 +472,7 @@ get_loaded_features_index(rb_vm_t *vm)
             rb_hash_aset(realpath_map, as_str, realpath);
         }
     }
-    return vm->loaded_features_index;
+    return CURRENT_NS_LOADED_FEATURES_INDEX(vm_ns);
 }
 
 /* This searches `load_path` for a value such that
@@ -487,7 +557,7 @@ loaded_feature_path_i(st_data_t v, st_data_t b, st_data_t f)
  * 'u': unsuffixed
  */
 static int
-rb_feature_p(rb_vm_t *vm, const char *feature, const char *ext, int rb, int expanded, const char **fn)
+rb_feature_p(vm_ns_t *vm_ns, const char *feature, const char *ext, int rb, int expanded, const char **fn)
 {
     VALUE features, this_feature_index = Qnil, v, p, load_path = 0;
     const char *f, *e;
@@ -508,8 +578,8 @@ rb_feature_p(rb_vm_t *vm, const char *feature, const char *ext, int rb, int expa
         elen = 0;
         type = 0;
     }
-    features = get_loaded_features(vm);
-    features_index = get_loaded_features_index(vm);
+    features = get_loaded_features(vm_ns);
+    features_index = get_loaded_features_index(vm_ns);
 
     key = feature_key(feature, strlen(feature));
     /* We search `features` for an entry such that either
@@ -556,7 +626,7 @@ rb_feature_p(rb_vm_t *vm, const char *feature, const char *ext, int rb, int expa
             if ((n = RSTRING_LEN(v)) < len) continue;
             if (strncmp(f, feature, len) != 0) {
                 if (expanded) continue;
-                if (!load_path) load_path = get_expanded_load_path(vm);
+                if (!load_path) load_path = get_expanded_load_path(vm_ns);
                 if (!(p = loaded_feature_path(f, n, feature, len, type, load_path)))
                     continue;
                 expanded = 1;
@@ -576,14 +646,14 @@ rb_feature_p(rb_vm_t *vm, const char *feature, const char *ext, int rb, int expa
         }
     }
 
-    loading_tbl = get_loading_table(vm);
+    loading_tbl = get_loading_table(vm_ns);
     f = 0;
-    if (!expanded) {
+    if (!expanded && !rb_is_absolute_path(feature)) {
         struct loaded_feature_searching fs;
         fs.name = feature;
         fs.len = len;
         fs.type = type;
-        fs.load_path = load_path ? load_path : get_expanded_load_path(vm);
+        fs.load_path = load_path ? load_path : get_expanded_load_path(vm_ns);
         fs.result = 0;
         st_foreach(loading_tbl, loaded_feature_path_i, (st_data_t)&fs);
         if ((f = fs.result) != 0) {
@@ -638,7 +708,7 @@ rb_provided(const char *feature)
 }
 
 static int
-feature_provided(rb_vm_t *vm, const char *feature, const char **loading)
+feature_provided(vm_ns_t *vm_ns, const char *feature, const char **loading)
 {
     const char *ext = strrchr(feature, '.');
     VALUE fullpath = 0;
@@ -650,15 +720,15 @@ feature_provided(rb_vm_t *vm, const char *feature, const char **loading)
     }
     if (ext && !strchr(ext, '/')) {
         if (IS_RBEXT(ext)) {
-            if (rb_feature_p(vm, feature, ext, TRUE, FALSE, loading)) return TRUE;
+            if (rb_feature_p(vm_ns, feature, ext, TRUE, FALSE, loading)) return TRUE;
             return FALSE;
         }
         else if (IS_SOEXT(ext) || IS_DLEXT(ext)) {
-            if (rb_feature_p(vm, feature, ext, FALSE, FALSE, loading)) return TRUE;
+            if (rb_feature_p(vm_ns, feature, ext, FALSE, FALSE, loading)) return TRUE;
             return FALSE;
         }
     }
-    if (rb_feature_p(vm, feature, 0, TRUE, FALSE, loading))
+    if (rb_feature_p(vm_ns, feature, 0, TRUE, FALSE, loading))
         return TRUE;
     RB_GC_GUARD(fullpath);
     return FALSE;
@@ -667,35 +737,41 @@ feature_provided(rb_vm_t *vm, const char *feature, const char **loading)
 int
 rb_feature_provided(const char *feature, const char **loading)
 {
-    return feature_provided(GET_VM(), feature, loading);
+    GET_vm_ns();
+    return feature_provided(vm_ns, feature, loading);
 }
 
 static void
-rb_provide_feature(rb_vm_t *vm, VALUE feature)
+rb_provide_feature(vm_ns_t *vm_ns, VALUE feature)
 {
     VALUE features;
 
-    features = get_loaded_features(vm);
+    features = get_loaded_features(vm_ns);
     if (OBJ_FROZEN(features)) {
         rb_raise(rb_eRuntimeError,
                  "$LOADED_FEATURES is frozen; cannot append feature");
     }
     feature = rb_fstring(feature);
 
-    get_loaded_features_index(vm);
+    get_loaded_features_index(vm_ns);
     // If loaded_features and loaded_features_snapshot share the same backing
     // array, pushing into it would cause the whole array to be copied.
     // To avoid this we first clear loaded_features_snapshot.
-    rb_ary_clear(vm->loaded_features_snapshot);
+    rb_ary_clear(CURRENT_NS_LOADED_FEATURES_SNAPSHOT(vm_ns));
     rb_ary_push(features, feature);
-    features_index_add(vm, feature, INT2FIX(RARRAY_LEN(features)-1));
-    reset_loaded_features_snapshot(vm);
+    features_index_add(vm_ns, feature, INT2FIX(RARRAY_LEN(features)-1));
+    reset_loaded_features_snapshot(vm_ns);
 }
 
 void
 rb_provide(const char *feature)
 {
-    rb_provide_feature(GET_VM(), rb_fstring_cstr(feature));
+    /*
+     * rb_provide() must use rb_current_namespace to store provided features
+     * in the current namespace's loaded_features, etc.
+     */
+    GET_vm_ns();
+    rb_provide_feature(vm_ns, rb_fstring_cstr(feature));
 }
 
 NORETURN(static void load_failed(VALUE));
@@ -713,36 +789,96 @@ realpath_internal_cached(VALUE hash, VALUE path)
     return realpath;
 }
 
+struct iseq_eval_in_namespace_data {
+    const rb_iseq_t *iseq;
+    bool in_builtin;
+};
+
+static VALUE
+iseq_eval_in_namespace(VALUE arg)
+{
+    struct iseq_eval_in_namespace_data *data = (struct iseq_eval_in_namespace_data *)arg;
+    if (rb_namespace_available() && data->in_builtin) {
+        return rb_iseq_eval_with_refinement(data->iseq, rb_mNamespaceRefiner);
+    }
+    else {
+        return rb_iseq_eval(data->iseq);
+    }
+}
+
 static inline void
 load_iseq_eval(rb_execution_context_t *ec, VALUE fname)
 {
+    GET_loading_vm_ns();
+    const rb_namespace_t *loading_ns = rb_loading_namespace();
     const rb_iseq_t *iseq = rb_iseq_load_iseq(fname);
 
     if (!iseq) {
         rb_execution_context_t *ec = GET_EC();
         VALUE v = rb_vm_push_frame_fname(ec, fname);
-        rb_ast_t *ast;
-        VALUE parser = rb_parser_new();
-        rb_parser_set_context(parser, NULL, FALSE);
-        ast = (rb_ast_t *)rb_parser_load_file(parser, fname);
 
-        rb_thread_t *th = rb_ec_thread_ptr(ec);
-        VALUE realpath_map = get_loaded_features_realpath_map(th->vm);
+        VALUE realpath_map = get_loaded_features_realpath_map(vm_ns);
+
+        if (rb_ruby_prism_p()) {
+            pm_parse_result_t result = { 0 };
+            result.options.line = 1;
+            result.node.coverage_enabled = 1;
+
+            VALUE error = pm_load_parse_file(&result, fname, NULL);
+
+            if (error == Qnil) {
+                int error_state;
+                iseq = pm_iseq_new_top(&result.node, rb_fstring_lit("<top (required)>"), fname, realpath_internal_cached(realpath_map, fname), NULL, &error_state);
+
+                pm_parse_result_free(&result);
+
+                if (error_state) {
+                    RUBY_ASSERT(iseq == NULL);
+                    rb_jump_tag(error_state);
+                }
+            }
+            else {
+                rb_vm_pop_frame(ec);
+                RB_GC_GUARD(v);
+                pm_parse_result_free(&result);
+                rb_exc_raise(error);
+            }
+        }
+        else {
+            rb_ast_t *ast;
+            VALUE ast_value;
+            VALUE parser = rb_parser_new();
+            rb_parser_set_context(parser, NULL, FALSE);
+            ast_value = rb_parser_load_file(parser, fname);
+            ast = rb_ruby_ast_data_get(ast_value);
+
+            iseq = rb_iseq_new_top(ast_value, rb_fstring_lit("<top (required)>"),
+                                   fname, realpath_internal_cached(realpath_map, fname), NULL);
+            rb_ast_dispose(ast);
+        }
 
-        iseq = rb_iseq_new_top(&ast->body, rb_fstring_lit("<top (required)>"),
-                               fname, realpath_internal_cached(realpath_map, fname), NULL);
-        rb_ast_dispose(ast);
         rb_vm_pop_frame(ec);
         RB_GC_GUARD(v);
     }
     rb_exec_event_hook_script_compiled(ec, iseq, Qnil);
-    rb_iseq_eval(iseq);
+
+    if (loading_ns) {
+        struct iseq_eval_in_namespace_data arg = {
+            .iseq = iseq,
+            .in_builtin = NAMESPACE_BUILTIN_P(loading_ns),
+        };
+        rb_namespace_exec(loading_ns, iseq_eval_in_namespace, (VALUE)&arg);
+    }
+    else {
+        rb_iseq_eval(iseq);
+    }
 }
 
 static inline enum ruby_tag_type
 load_wrapping(rb_execution_context_t *ec, VALUE fname, VALUE load_wrapper)
 {
     enum ruby_tag_type state;
+    rb_namespace_t *ns;
     rb_thread_t *th = rb_ec_thread_ptr(ec);
     volatile VALUE wrapper = th->top_wrapper;
     volatile VALUE self = th->top_self;
@@ -753,7 +889,16 @@ load_wrapping(rb_execution_context_t *ec, VALUE fname, VALUE load_wrapper)
     ec->errinfo = Qnil; /* ensure */
 
     /* load in module as toplevel */
-    th->top_self = rb_obj_clone(rb_vm_top_self());
+    if (IS_NAMESPACE(load_wrapper)) {
+        ns = rb_get_namespace_t(load_wrapper);
+        if (!ns->top_self) {
+            ns->top_self = rb_obj_clone(rb_vm_top_self());
+        }
+        th->top_self = ns->top_self;
+    }
+    else {
+        th->top_self = rb_obj_clone(rb_vm_top_self());
+    }
     th->top_wrapper = load_wrapper;
     rb_extend_object(th->top_self, th->top_wrapper);
 
@@ -788,7 +933,9 @@ raise_load_if_failed(rb_execution_context_t *ec, enum ruby_tag_type state)
 static void
 rb_load_internal(VALUE fname, VALUE wrap)
 {
+    VALUE namespace;
     rb_execution_context_t *ec = GET_EC();
+    const rb_namespace_t *ns = rb_loading_namespace();
     enum ruby_tag_type state = TAG_NONE;
     if (RTEST(wrap)) {
         if (!RB_TYPE_P(wrap, T_MODULE)) {
@@ -796,6 +943,10 @@ rb_load_internal(VALUE fname, VALUE wrap)
         }
         state = load_wrapping(ec, fname, wrap);
     }
+    else if (NAMESPACE_OPTIONAL_P(ns)) {
+        namespace = ns->ns_object;
+        state = load_wrapping(ec, fname, namespace);
+    }
     else {
         load_iseq_eval(ec, fname);
     }
@@ -824,6 +975,40 @@ rb_load_protect(VALUE fname, int wrap, int *pstate)
     if (state != TAG_NONE) *pstate = state;
 }
 
+static VALUE
+load_entrypoint_internal(VALUE fname, VALUE wrap)
+{
+    VALUE path, orig_fname;
+
+    orig_fname = rb_get_path_check_to_string(fname);
+    fname = rb_str_encode_ospath(orig_fname);
+    RUBY_DTRACE_HOOK(LOAD_ENTRY, RSTRING_PTR(orig_fname));
+
+    path = rb_find_file(fname);
+    if (!path) {
+        if (!rb_file_load_ok(RSTRING_PTR(fname)))
+            load_failed(orig_fname);
+        path = fname;
+    }
+    rb_load_internal(path, wrap);
+
+    RUBY_DTRACE_HOOK(LOAD_RETURN, RSTRING_PTR(orig_fname));
+
+    return Qtrue;
+}
+
+VALUE
+rb_load_entrypoint(VALUE args)
+{
+    VALUE fname, wrap;
+    if (RARRAY_LEN(args) != 2) {
+        rb_bug("invalid arguments: %ld", RARRAY_LEN(args));
+    }
+    fname = rb_ary_entry(args, 0);
+    wrap = rb_ary_entry(args, 1);
+    return load_entrypoint_internal(fname, wrap);
+}
+
 /*
  *  call-seq:
  *     load(filename, wrap=false)   -> true
@@ -848,9 +1033,8 @@ rb_load_protect(VALUE fname, int wrap, int *pstate)
  *  LoadError will be raised.
  *
  *  If the optional _wrap_ parameter is +true+, the loaded script will
- *  be executed under an anonymous module, protecting the calling
- *  program's global namespace.  If the optional _wrap_ parameter is a
- *  module, the loaded script will be executed under the given module.
+ *  be executed under an anonymous module. If the optional _wrap_ parameter
+ *  is a module, the loaded script will be executed under the given module.
  *  In no circumstance will any local variables in the loaded file be
  *  propagated to the loading environment.
  */
@@ -858,32 +1042,16 @@ rb_load_protect(VALUE fname, int wrap, int *pstate)
 static VALUE
 rb_f_load(int argc, VALUE *argv, VALUE _)
 {
-    VALUE fname, wrap, path, orig_fname;
-
+    VALUE fname, wrap;
     rb_scan_args(argc, argv, "11", &fname, &wrap);
-
-    orig_fname = rb_get_path_check_to_string(fname);
-    fname = rb_str_encode_ospath(orig_fname);
-    RUBY_DTRACE_HOOK(LOAD_ENTRY, RSTRING_PTR(orig_fname));
-
-    path = rb_find_file(fname);
-    if (!path) {
-        if (!rb_file_load_ok(RSTRING_PTR(fname)))
-            load_failed(orig_fname);
-        path = fname;
-    }
-    rb_load_internal(path, wrap);
-
-    RUBY_DTRACE_HOOK(LOAD_RETURN, RSTRING_PTR(orig_fname));
-
-    return Qtrue;
+    return load_entrypoint_internal(fname, wrap);
 }
 
 static char *
-load_lock(rb_vm_t *vm, const char *ftptr, bool warn)
+load_lock(vm_ns_t *vm_ns, const char *ftptr, bool warn)
 {
     st_data_t data;
-    st_table *loading_tbl = get_loading_table(vm);
+    st_table *loading_tbl = get_loading_table(vm_ns);
 
     if (!st_lookup(loading_tbl, (st_data_t)ftptr, &data)) {
         /* partial state */
@@ -925,16 +1093,17 @@ release_thread_shield(st_data_t *key, st_data_t *value, st_data_t done, int exis
 }
 
 static void
-load_unlock(rb_vm_t *vm, const char *ftptr, int done)
+load_unlock(vm_ns_t *vm_ns, const char *ftptr, int done)
 {
     if (ftptr) {
         st_data_t key = (st_data_t)ftptr;
-        st_table *loading_tbl = get_loading_table(vm);
+        st_table *loading_tbl = get_loading_table(vm_ns);
 
         st_update(loading_tbl, key, release_thread_shield, done);
     }
 }
 
+static VALUE rb_require_string_internal(VALUE fname, bool resurrect);
 
 /*
  *  call-seq:
@@ -949,15 +1118,14 @@ load_unlock(rb_vm_t *vm, const char *ftptr, int done)
  *  If the filename starts with './' or '../', resolution is based on Dir.pwd.
  *
  *  If the filename has the extension ".rb", it is loaded as a source file; if
- *  the extension is ".so", ".o", or ".dll", or the default shared library
- *  extension on the current platform, Ruby loads the shared library as a
- *  Ruby extension.  Otherwise, Ruby tries adding ".rb", ".so", and so on
- *  to the name until found.  If the file named cannot be found, a LoadError
- *  will be raised.
+ *  the extension is ".so", ".o", or the default shared library extension on
+ *  the current platform, Ruby loads the shared library as a Ruby extension.
+ *  Otherwise, Ruby tries adding ".rb", ".so", and so on to the name until
+ *  found.  If the file named cannot be found, a LoadError will be raised.
  *
- *  For Ruby extensions the filename given may use any shared library
- *  extension.  For example, on Linux the socket extension is "socket.so" and
- *  <code>require 'socket.dll'</code> will load the socket extension.
+ *  For Ruby extensions the filename given may use ".so" or ".o".  For example,
+ *  on macOS the socket extension is "socket.bundle" and
+ *  <code>require 'socket.so'</code> will load the socket extension.
  *
  *  The absolute path of the loaded file is added to
  *  <code>$LOADED_FEATURES</code> (<code>$"</code>).  A file will not be
@@ -977,9 +1145,22 @@ load_unlock(rb_vm_t *vm, const char *ftptr, int done)
 VALUE
 rb_f_require(VALUE obj, VALUE fname)
 {
+    // const rb_namespace_t *ns = rb_loading_namespace();
+    // printf("F:current loading ns: %ld\n", ns->ns_id);
     return rb_require_string(fname);
 }
 
+VALUE
+rb_require_relative_entrypoint(VALUE fname)
+{
+    VALUE base = rb_current_realfilepath();
+    if (NIL_P(base)) {
+        rb_loaderror("cannot infer basepath");
+    }
+    base = rb_file_dirname(base);
+    return rb_require_string_internal(rb_file_absolute_path(fname, base), false);
+}
+
 /*
  * call-seq:
  *   require_relative(string) -> true or false
@@ -992,18 +1173,13 @@ rb_f_require(VALUE obj, VALUE fname)
 VALUE
 rb_f_require_relative(VALUE obj, VALUE fname)
 {
-    VALUE base = rb_current_realfilepath();
-    if (NIL_P(base)) {
-        rb_loaderror("cannot infer basepath");
-    }
-    base = rb_file_dirname(base);
-    return rb_require_string(rb_file_absolute_path(fname, base));
+    return rb_require_relative_entrypoint(fname);
 }
 
-typedef int (*feature_func)(rb_vm_t *vm, const char *feature, const char *ext, int rb, int expanded, const char **fn);
+typedef int (*feature_func)(vm_ns_t *vm_ns, const char *feature, const char *ext, int rb, int expanded, const char **fn);
 
 static int
-search_required(rb_vm_t *vm, VALUE fname, volatile VALUE *path, feature_func rb_feature_p)
+search_required(vm_ns_t *vm_ns, VALUE fname, volatile VALUE *path, feature_func rb_feature_p)
 {
     VALUE tmp;
     char *ext, *ftptr;
@@ -1014,20 +1190,20 @@ search_required(rb_vm_t *vm, VALUE fname, volatile VALUE *path, feature_func rb_
     ext = strrchr(ftptr = RSTRING_PTR(fname), '.');
     if (ext && !strchr(ext, '/')) {
         if (IS_RBEXT(ext)) {
-            if (rb_feature_p(vm, ftptr, ext, TRUE, FALSE, &loading)) {
+            if (rb_feature_p(vm_ns, ftptr, ext, TRUE, FALSE, &loading)) {
                 if (loading) *path = rb_filesystem_str_new_cstr(loading);
                 return 'r';
             }
             if ((tmp = rb_find_file(fname)) != 0) {
                 ext = strrchr(ftptr = RSTRING_PTR(tmp), '.');
-                if (!rb_feature_p(vm, ftptr, ext, TRUE, TRUE, &loading) || loading)
+                if (!rb_feature_p(vm_ns, ftptr, ext, TRUE, TRUE, &loading) || loading)
                     *path = tmp;
                 return 'r';
             }
             return 0;
         }
         else if (IS_SOEXT(ext)) {
-            if (rb_feature_p(vm, ftptr, ext, FALSE, FALSE, &loading)) {
+            if (rb_feature_p(vm_ns, ftptr, ext, FALSE, FALSE, &loading)) {
                 if (loading) *path = rb_filesystem_str_new_cstr(loading);
                 return 's';
             }
@@ -1036,25 +1212,25 @@ search_required(rb_vm_t *vm, VALUE fname, volatile VALUE *path, feature_func rb_
             OBJ_FREEZE(tmp);
             if ((tmp = rb_find_file(tmp)) != 0) {
                 ext = strrchr(ftptr = RSTRING_PTR(tmp), '.');
-                if (!rb_feature_p(vm, ftptr, ext, FALSE, TRUE, &loading) || loading)
+                if (!rb_feature_p(vm_ns, ftptr, ext, FALSE, TRUE, &loading) || loading)
                     *path = tmp;
                 return 's';
             }
         }
         else if (IS_DLEXT(ext)) {
-            if (rb_feature_p(vm, ftptr, ext, FALSE, FALSE, &loading)) {
+            if (rb_feature_p(vm_ns, ftptr, ext, FALSE, FALSE, &loading)) {
                 if (loading) *path = rb_filesystem_str_new_cstr(loading);
                 return 's';
             }
             if ((tmp = rb_find_file(fname)) != 0) {
                 ext = strrchr(ftptr = RSTRING_PTR(tmp), '.');
-                if (!rb_feature_p(vm, ftptr, ext, FALSE, TRUE, &loading) || loading)
+                if (!rb_feature_p(vm_ns, ftptr, ext, FALSE, TRUE, &loading) || loading)
                     *path = tmp;
                 return 's';
             }
         }
     }
-    else if ((ft = rb_feature_p(vm, ftptr, 0, FALSE, FALSE, &loading)) == 'r') {
+    else if ((ft = rb_feature_p(vm_ns, ftptr, 0, FALSE, FALSE, &loading)) == 'r') {
         if (loading) *path = rb_filesystem_str_new_cstr(loading);
         return 'r';
     }
@@ -1063,7 +1239,7 @@ search_required(rb_vm_t *vm, VALUE fname, volatile VALUE *path, feature_func rb_
 
     // Check if it's a statically linked extension when
     // not already a feature and not found as a dynamic library.
-    if (!ft && type != loadable_ext_rb && vm->static_ext_inits) {
+    if (!ft && type != loadable_ext_rb && vm_ns->vm->static_ext_inits) {
         VALUE lookup_name = tmp;
         // Append ".so" if not already present so for example "etc" can find "etc.so".
         // We always register statically linked extensions with a ".so" extension.
@@ -1073,8 +1249,9 @@ search_required(rb_vm_t *vm, VALUE fname, volatile VALUE *path, feature_func rb_
             rb_str_cat_cstr(lookup_name, ".so");
         }
         ftptr = RSTRING_PTR(lookup_name);
-        if (st_lookup(vm->static_ext_inits, (st_data_t)ftptr, NULL)) {
+        if (st_lookup(vm_ns->vm->static_ext_inits, (st_data_t)ftptr, NULL)) {
             *path = rb_filesystem_str_new_cstr(ftptr);
+            RB_GC_GUARD(lookup_name);
             return 's';
         }
     }
@@ -1084,7 +1261,7 @@ search_required(rb_vm_t *vm, VALUE fname, volatile VALUE *path, feature_func rb_
         if (ft)
             goto feature_present;
         ftptr = RSTRING_PTR(tmp);
-        return rb_feature_p(vm, ftptr, 0, FALSE, TRUE, 0);
+        return rb_feature_p(vm_ns, ftptr, 0, FALSE, TRUE, 0);
 
       default:
         if (ft) {
@@ -1093,7 +1270,7 @@ search_required(rb_vm_t *vm, VALUE fname, volatile VALUE *path, feature_func rb_
         /* fall through */
       case loadable_ext_rb:
         ext = strrchr(ftptr = RSTRING_PTR(tmp), '.');
-        if (rb_feature_p(vm, ftptr, ext, type == loadable_ext_rb, TRUE, &loading) && !loading)
+        if (rb_feature_p(vm_ns, ftptr, ext, type == loadable_ext_rb, TRUE, &loading) && !loading)
             break;
         *path = tmp;
     }
@@ -1111,10 +1288,15 @@ load_failed(VALUE fname)
 }
 
 static VALUE
-load_ext(VALUE path)
+load_ext(VALUE path, VALUE fname)
 {
+    VALUE loaded = path;
+    GET_loading_vm_ns();
+    if (NAMESPACE_USER_P(vm_ns->ns)) {
+        loaded = rb_namespace_local_extension(vm_ns->ns->ns_object, fname, path);
+    }
     rb_scope_visibility_set(METHOD_VISI_PUBLIC);
-    return (VALUE)dln_load(RSTRING_PTR(path));
+    return (VALUE)dln_load_feature(RSTRING_PTR(loaded), RSTRING_PTR(fname));
 }
 
 static bool
@@ -1131,7 +1313,7 @@ run_static_ext_init(rb_vm_t *vm, const char *feature)
 }
 
 static int
-no_feature_p(rb_vm_t *vm, const char *feature, const char *ext, int rb, int expanded, const char **fn)
+no_feature_p(vm_ns_t *vm_ns, const char *feature, const char *ext, int rb, int expanded, const char **fn)
 {
     return 0;
 }
@@ -1143,10 +1325,11 @@ rb_resolve_feature_path(VALUE klass, VALUE fname)
     VALUE path;
     int found;
     VALUE sym;
+    GET_loading_vm_ns();
 
     fname = rb_get_path(fname);
     path = rb_str_encode_ospath(fname);
-    found = search_required(GET_VM(), path, &path, no_feature_p);
+    found = search_required(vm_ns, path, &path, no_feature_p);
 
     switch (found) {
       case 'r':
@@ -1181,6 +1364,21 @@ rb_ext_ractor_safe(bool flag)
     GET_THREAD()->ext_config.ractor_safe = flag;
 }
 
+struct rb_vm_call_cfunc2_data {
+    VALUE recv;
+    VALUE arg1;
+    VALUE arg2;
+    VALUE block_handler;
+    VALUE filename;
+};
+
+static VALUE
+call_load_ext_in_ns(VALUE data)
+{
+    struct rb_vm_call_cfunc2_data *arg = (struct rb_vm_call_cfunc2_data *)data;
+    return rb_vm_call_cfunc2(arg->recv, load_ext, arg->arg1, arg->arg2, arg->block_handler, arg->filename);
+}
+
 /*
  * returns
  *  0: if already loaded (false)
@@ -1200,17 +1398,17 @@ require_internal(rb_execution_context_t *ec, VALUE fname, int exception, bool wa
         th->top_wrapper, th->top_self, ec->errinfo,
         ec,
     };
+    GET_loading_vm_ns();
     enum ruby_tag_type state;
     char *volatile ftptr = 0;
     VALUE path;
     volatile VALUE saved_path;
     volatile VALUE realpath = 0;
-    VALUE realpaths = get_loaded_features_realpaths(th->vm);
-    VALUE realpath_map = get_loaded_features_realpath_map(th->vm);
+    VALUE realpaths = get_loaded_features_realpaths(vm_ns);
+    VALUE realpath_map = get_loaded_features_realpath_map(vm_ns);
     volatile bool reset_ext_config = false;
     struct rb_ext_config prev_ext_config;
 
-    fname = rb_get_path(fname);
     path = rb_str_encode_ospath(fname);
     RUBY_DTRACE_HOOK(REQUIRE_ENTRY, RSTRING_PTR(fname));
     saved_path = path;
@@ -1219,16 +1417,16 @@ require_internal(rb_execution_context_t *ec, VALUE fname, int exception, bool wa
     ec->errinfo = Qnil; /* ensure */
     th->top_wrapper = 0;
     if ((state = EC_EXEC_TAG()) == TAG_NONE) {
-        long handle;
+        VALUE handle;
         int found;
 
         RUBY_DTRACE_HOOK(FIND_REQUIRE_ENTRY, RSTRING_PTR(fname));
-        found = search_required(th->vm, path, &saved_path, rb_feature_p);
+        found = search_required(vm_ns, path, &saved_path, rb_feature_p);
         RUBY_DTRACE_HOOK(FIND_REQUIRE_RETURN, RSTRING_PTR(fname));
         path = saved_path;
 
         if (found) {
-            if (!path || !(ftptr = load_lock(th->vm, RSTRING_PTR(path), warn))) {
+            if (!path || !(ftptr = load_lock(vm_ns, RSTRING_PTR(path), warn))) {
                 result = 0;
             }
             else if (!*ftptr) {
@@ -1244,15 +1442,31 @@ require_internal(rb_execution_context_t *ec, VALUE fname, int exception, bool wa
             else {
                 switch (found) {
                   case 'r':
-                    load_iseq_eval(ec, path);
+                    // iseq_eval_in_namespace will be called with the loading namespace eventually
+                    if (NAMESPACE_OPTIONAL_P(vm_ns->ns)) {
+                        // check with NAMESPACE_OPTIONAL_P (not NAMESPACE_USER_P) for NS1::xxx naming
+                        // it is not expected for the main namespace
+                        load_wrapping(saved.ec, path, vm_ns->ns->ns_object);
+                    }
+                    else {
+                        load_iseq_eval(saved.ec, path);
+                    }
                     break;
 
                   case 's':
+                    // the loading namespace must be set to the current namespace before calling load_ext
                     reset_ext_config = true;
                     ext_config_push(th, &prev_ext_config);
-                    handle = (long)rb_vm_call_cfunc(rb_vm_top_self(), load_ext,
-                                                    path, VM_BLOCK_HANDLER_NONE, path);
-                    rb_ary_push(ruby_dln_librefs, LONG2NUM(handle));
+                    struct rb_vm_call_cfunc2_data arg = {
+                        .recv = rb_vm_top_self(),
+                        .arg1 = path,
+                        .arg2 = fname,
+                        .block_handler = VM_BLOCK_HANDLER_NONE,
+                        .filename = path,
+                    };
+                    handle = rb_namespace_exec(vm_ns->ns, call_load_ext_in_ns, (VALUE)&arg);
+                    rb_hash_aset(CURRENT_NS_RUBY_DLN_LIBMAP(vm_ns, ruby_dln_libmap), path,
+                                 SVALUE2NUM((SIGNED_VALUE)handle));
                     break;
                 }
                 result = TAG_RETURN;
@@ -1268,7 +1482,7 @@ require_internal(rb_execution_context_t *ec, VALUE fname, int exception, bool wa
     if (reset_ext_config) ext_config_pop(th2, &prev_ext_config);
 
     path = saved_path;
-    if (ftptr) load_unlock(th2->vm, RSTRING_PTR(path), !state);
+    if (ftptr) load_unlock(vm_ns, RSTRING_PTR(path), !state);
 
     if (state) {
         if (state == TAG_FATAL || state == TAG_THROW) {
@@ -1294,7 +1508,7 @@ require_internal(rb_execution_context_t *ec, VALUE fname, int exception, bool wa
     }
 
     if (result == TAG_RETURN) {
-        rb_provide_feature(th2->vm, path);
+        rb_provide_feature(vm_ns, path);
         VALUE real = realpath;
         if (real) {
             real = rb_fstring(real);
@@ -1311,6 +1525,10 @@ require_internal(rb_execution_context_t *ec, VALUE fname, int exception, bool wa
 int
 rb_require_internal_silent(VALUE fname)
 {
+    if (!rb_ractor_main_p()) {
+        return NUM2INT(rb_ractor_require(fname, true));
+    }
+
     rb_execution_context_t *ec = GET_EC();
     return require_internal(ec, fname, 1, false);
 }
@@ -1335,24 +1553,41 @@ ruby_require_internal(const char *fname, unsigned int len)
 
 VALUE
 rb_require_string(VALUE fname)
+{
+    return rb_require_string_internal(FilePathValue(fname), false);
+}
+
+static VALUE
+rb_require_string_internal(VALUE fname, bool resurrect)
 {
     rb_execution_context_t *ec = GET_EC();
-    int result = require_internal(ec, fname, 1, RTEST(ruby_verbose));
 
-    if (result > TAG_RETURN) {
-        EC_JUMP_TAG(ec, result);
-    }
-    if (result < 0) {
-        load_failed(fname);
+    // main ractor check
+    if (!rb_ractor_main_p()) {
+        if (resurrect) fname = rb_str_resurrect(fname);
+        return rb_ractor_require(fname, false);
     }
+    else {
+        int result = require_internal(ec, fname, 1, RTEST(ruby_verbose));
 
-    return RBOOL(result);
+        if (result > TAG_RETURN) {
+            EC_JUMP_TAG(ec, result);
+        }
+        if (result < 0) {
+            if (resurrect) fname = rb_str_resurrect(fname);
+            load_failed(fname);
+        }
+
+        return RBOOL(result);
+    }
 }
 
 VALUE
 rb_require(const char *fname)
 {
-    return rb_require_string(rb_str_new_cstr(fname));
+    struct RString fake;
+    VALUE str = rb_setup_fake_str(&fake, fname, strlen(fname), 0);
+    return rb_require_string_internal(str, true);
 }
 
 static int
@@ -1376,15 +1611,15 @@ void
 ruby_init_ext(const char *name, void (*init)(void))
 {
     st_table *inits_table;
-    rb_vm_t *vm = GET_VM();
+    GET_loading_vm_ns();
 
-    if (feature_provided(vm, name, 0))
+    if (feature_provided(vm_ns, name, 0))
         return;
 
-    inits_table = vm->static_ext_inits;
+    inits_table = vm_ns->vm->static_ext_inits;
     if (!inits_table) {
         inits_table = st_init_strtable();
-        vm->static_ext_inits = inits_table;
+        vm_ns->vm->static_ext_inits = inits_table;
     }
     st_update(inits_table, (st_data_t)name, register_init_ext, (st_data_t)init);
 }
@@ -1402,9 +1637,12 @@ ruby_init_ext(const char *name, void (*init)(void))
  *     A.autoload(:B, "b")
  *     A::B.doit            # autoloads "b"
  *
- * If _const_ in _mod_ is defined as autoload, the file name to be
- * loaded is replaced with _filename_.  If _const_ is defined but not
- * as autoload, does nothing.
+ *  If _const_ in _mod_ is defined as autoload, the file name to be
+ *  loaded is replaced with _filename_.  If _const_ is defined but not
+ *  as autoload, does nothing.
+ *
+ *  Files that are currently being loaded must not be registered for
+ *  autoload.
  */
 
 static VALUE
@@ -1466,9 +1704,12 @@ rb_mod_autoload_p(int argc, VALUE *argv, VALUE mod)
  *
  *     autoload(:MyModule, "/usr/local/lib/modules/my_module.rb")
  *
- * If _const_ is defined as autoload, the file name to be loaded is
- * replaced with _filename_.  If _const_ is defined but not as
- * autoload, does nothing.
+ *  If _const_ is defined as autoload, the file name to be loaded is
+ *  replaced with _filename_.  If _const_ is defined but not as
+ *  autoload, does nothing.
+ *
+ *  Files that are currently being loaded must not be registered for
+ *  autoload.
  */
 
 static VALUE
@@ -1486,10 +1727,22 @@ rb_f_autoload(VALUE obj, VALUE sym, VALUE file)
  *     autoload?(name, inherit=true)   -> String or nil
  *
  *  Returns _filename_ to be loaded if _name_ is registered as
- *  +autoload+.
+ *  +autoload+ in the current namespace or one of its ancestors.
  *
  *     autoload(:B, "b")
  *     autoload?(:B)            #=> "b"
+ *
+ *     module C
+ *       autoload(:D, "d")
+ *       autoload?(:D)          #=> "d"
+ *       autoload?(:B)          #=> nil
+ *     end
+ *
+ *     class E
+ *       autoload(:F, "f")
+ *       autoload?(:F)          #=> "f"
+ *       autoload?(:B)          #=> "b"
+ *     end
  */
 
 static VALUE
@@ -1503,6 +1756,38 @@ rb_f_autoload_p(int argc, VALUE *argv, VALUE obj)
     return rb_mod_autoload_p(argc, argv, klass);
 }
 
+void *
+rb_ext_resolve_symbol(const char* fname, const char* symbol)
+{
+    VALUE handle;
+    VALUE resolved;
+    VALUE path;
+    char *ext;
+    VALUE fname_str = rb_str_new_cstr(fname);
+    GET_loading_vm_ns();
+
+    resolved = rb_resolve_feature_path((VALUE)NULL, fname_str);
+    if (NIL_P(resolved)) {
+        ext = strrchr(fname, '.');
+        if (!ext || !IS_SOEXT(ext)) {
+            rb_str_cat_cstr(fname_str, ".so");
+        }
+        if (rb_feature_p(vm_ns, fname, 0, FALSE, FALSE, 0)) {
+            return dln_symbol(NULL, symbol);
+        }
+        return NULL;
+    }
+    if (RARRAY_LEN(resolved) != 2 || rb_ary_entry(resolved, 0) != ID2SYM(rb_intern("so"))) {
+        return NULL;
+    }
+    path = rb_ary_entry(resolved, 1);
+    handle = rb_hash_lookup(CURRENT_NS_RUBY_DLN_LIBMAP(vm_ns, ruby_dln_libmap), path);
+    if (NIL_P(handle)) {
+        return NULL;
+    }
+    return dln_symbol((void *)NUM2SVALUE(handle), symbol);
+}
+
 void
 Init_load(void)
 {
@@ -1511,6 +1796,7 @@ Init_load(void)
     ID id_load_path = rb_intern2(var_load_path, sizeof(var_load_path)-1);
 
     rb_define_hooked_variable(var_load_path, (VALUE*)vm, load_path_getter, rb_gvar_readonly_setter);
+    rb_gvar_namespace_ready(var_load_path);
     rb_alias_variable(rb_intern_const("$-I"), id_load_path);
     rb_alias_variable(rb_intern_const("$LOAD_PATH"), id_load_path);
     vm->load_path = rb_ary_new();
@@ -1520,7 +1806,9 @@ Init_load(void)
     rb_define_singleton_method(vm->load_path, "resolve_feature_path", rb_resolve_feature_path, 1);
 
     rb_define_virtual_variable("$\"", get_LOADED_FEATURES, 0);
-    rb_define_virtual_variable("$LOADED_FEATURES", get_LOADED_FEATURES, 0);
+    rb_gvar_namespace_ready("$\"");
+    rb_define_virtual_variable("$LOADED_FEATURES", get_LOADED_FEATURES, 0); // TODO: rb_alias_variable ?
+    rb_gvar_namespace_ready("$LOADED_FEATURES");
     vm->loaded_features = rb_ary_new();
     vm->loaded_features_snapshot = rb_ary_hidden_new(0);
     vm->loaded_features_index = st_init_numtable();
@@ -1537,6 +1825,6 @@ Init_load(void)
     rb_define_global_function("autoload", rb_f_autoload, 2);
     rb_define_global_function("autoload?", rb_f_autoload_p, -1);
 
-    ruby_dln_librefs = rb_ary_hidden_new(0);
-    rb_gc_register_mark_object(ruby_dln_librefs);
+    ruby_dln_libmap = rb_hash_new_with_size(0);
+    rb_vm_register_global_object(ruby_dln_libmap);
 }
diff --git a/main.c b/main.c
index 072dc56dd54c11..525189db854292 100644
--- a/main.c
+++ b/main.c
@@ -20,6 +20,7 @@
 #undef RUBY_EXPORT
 #include "ruby.h"
 #include "vm_debug.h"
+#include "internal/sanitizers.h"
 #ifdef HAVE_LOCALE_H
 #include <locale.h>
 #endif
@@ -31,6 +32,8 @@
 # undef RUBY_DEBUG_ENV
 #endif
 
+RUBY_GLOBAL_SETUP
+
 static int
 rb_main(int argc, char **argv)
 {
@@ -39,9 +42,10 @@ rb_main(int argc, char **argv)
     return ruby_run_node(ruby_options(argc, argv));
 }
 
-#if defined(__wasm__) && !defined(__EMSCRIPTEN__)
-int rb_wasm_rt_start(int (main)(int argc, char **argv), int argc, char **argv);
-#define rb_main(argc, argv) rb_wasm_rt_start(rb_main, argc, argv)
+#ifdef _WIN32
+#define main(argc, argv) w32_main(argc, argv)
+static int main(int argc, char **argv);
+int wmain(void) {return main(0, NULL);}
 #endif
 
 int
@@ -55,5 +59,5 @@ main(int argc, char **argv)
 #endif
 
     ruby_sysinit(&argc, &argv);
-    return rb_main(argc, argv);
+    return ruby_start_main(rb_main, argc, argv);
 }
diff --git a/man/index.txt b/man/index.txt
deleted file mode 100644
index 400eb0226786aa..00000000000000
--- a/man/index.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-Gemfile(5)            gemfile.5
-bundle(1)             bundle.1
-bundle-add(1)         bundle-add.1
-bundle-binstubs(1)    bundle-binstubs.1
-bundle-check(1)       bundle-check.1
-bundle-clean(1)       bundle-clean.1
-bundle-config(1)      bundle-config.1
-bundle-doctor(1)      bundle-doctor.1
-bundle-exec(1)        bundle-exec.1
-bundle-gem(1)         bundle-gem.1
-bundle-info(1)        bundle-info.1
-bundle-init(1)        bundle-init.1
-bundle-inject(1)      bundle-inject.1
-bundle-install(1)     bundle-install.1
-bundle-list(1)        bundle-list.1
-bundle-lock(1)        bundle-lock.1
-bundle-open(1)        bundle-open.1
-bundle-outdated(1)    bundle-outdated.1
-bundle-package(1)     bundle-package.1
-bundle-platform(1)    bundle-platform.1
-bundle-pristine(1)    bundle-pristine.1
-bundle-remove(1)      bundle-remove.1
-bundle-show(1)        bundle-show.1
-bundle-update(1)      bundle-update.1
-bundle-viz(1)         bundle-viz.1
diff --git a/man/irb.1 b/man/irb.1
deleted file mode 100644
index c589c99c78651f..00000000000000
--- a/man/irb.1
+++ /dev/null
@@ -1,250 +0,0 @@
-.\"Ruby is copyrighted by Yukihiro Matsumoto <matz@netlab.jp>.
-.Dd August 11, 2019
-.Dt IRB \&1 "Ruby Programmer's Reference Guide"
-.Os UNIX
-.Sh NAME
-.Nm irb
-.Nd Interactive Ruby Shell
-.Sh SYNOPSIS
-.Nm
-.Op Fl -version
-.Op Fl dfUw
-.Op Fl I Ar directory
-.Op Fl r Ar library
-.Op Fl E Ar external Ns Op : Ns Ar internal
-.Op Fl W Ns Op Ar level
-.Op Fl - Ns Oo no Oc Ns inspect
-.Op Fl - Ns Oo no Oc Ns multiline
-.Op Fl - Ns Oo no Oc Ns singleline
-.Op Fl - Ns Oo no Oc Ns echo
-.Op Fl - Ns Oo no Oc Ns colorize
-.Op Fl - Ns Oo no Oc Ns autocomplete
-.Op Fl - Ns Oo no Oc Ns verbose
-.Op Fl -prompt Ar mode
-.Op Fl -prompt-mode Ar mode
-.Op Fl -inf-ruby-mode
-.Op Fl -simple-prompt
-.Op Fl -noprompt
-.Op Fl -tracer
-.Op Fl -back-trace-limit Ar n
-.Op Fl -
-.Op program_file
-.Op argument ...
-.Pp
-.Sh DESCRIPTION
-.Nm
-is the REPL(read-eval-print loop) environment for Ruby programs.
-.Pp
-.Sh OPTIONS
-.Bl -tag -width "1234567890123" -compact
-.Pp
-.It Fl -version
-Prints the version of
-.Nm .
-.Pp
-.It Fl E Ar external Ns Op : Ns Ar internal
-.It Fl -encoding Ar external Ns Op : Ns Ar internal
-Same as `ruby -E' .
-Specifies the default value(s) for external encodings and internal encoding. Values should be separated with colon (:).
-.Pp
-You can omit the one for internal encodings, then the value
-.Pf ( Li "Encoding.default_internal" ) will be nil.
-.Pp
-.It Fl I Ar path
-Same as `ruby -I' .
-Specifies
-.Li $LOAD_PATH
-directory
-.Pp
-.It Fl U
-Same as `ruby -U' .
-Sets the default value for internal encodings
-.Pf ( Li "Encoding.default_internal" ) to UTF-8.
-.Pp
-.It Fl d
-Same as `ruby -d' .
-Sets
-.Li $DEBUG
-to true.
-.Pp
-.It Fl f
-Suppresses read of
-.Pa ~/.irbrc .
-.Pp
-.It Fl w
-Same as `ruby -w' .
-.Pp
-.Pp
-.It Fl W
-Same as `ruby -W' .
-.Pp
-.It Fl h
-.It Fl -help
-Prints a summary of the options.
-.Pp
-.It Fl r Ar library
-Same as `ruby -r'.
-Causes irb to load the library using require.
-.Pp
-.It Fl -inspect
-Uses `inspect' for output (default except for bc mode)
-.Pp
-.It Fl -noinspect
-Doesn't use inspect for output
-.Pp
-.It Fl -multiline
-Uses multiline editor module.
-.Pp
-.It Fl -nomultiline
-Doesn't use multiline editor module.
-.Pp
-.It Fl -singleline
-Uses singleline editor module.
-.Pp
-.It Fl -nosingleline
-Doesn't use singleline editor module.
-.Pp
-.Pp
-.It Fl -extra-doc-dir
-Add an extra doc dir for the doc dialog.
-.Pp
-.Pp
-.It Fl -echo
-Show result (default).
-.Pp
-.It Fl -noecho
-Don't show result.
-.Pp
-.Pp
-.It Fl -echo-on-assignment
-Show result on assignment.
-.Pp
-.It Fl -noecho-on-assignment
-Don't show result on assignment.
-.Pp
-.It Fl -truncate-echo-on-assignment
-Show truncated result on assignment (default).
-.Pp
-.Pp
-.It Fl -colorize
-Use colorization.
-.Pp
-.It Fl -nocolorize
-Don't use colorization.
-.Pp
-.Pp
-.It Fl -autocomplete
-Use autocompletion.
-.Pp
-.It Fl -noautocomplete
-Don't use autocompletion.
-.Pp
-.Pp
-.It Fl -verbose
-Show details.
-.Pp
-.It Fl -noverbose
-Don't show details.
-.Pp
-.It Fl -prompt Ar mode
-.It Fl -prompt-mode Ar mode
-Switch prompt mode. Pre-defined prompt modes are
-`default', `simple', `xmp' and `inf-ruby'.
-.Pp
-.It Fl -inf-ruby-mode
-Uses prompt appropriate for inf-ruby-mode on emacs.
-Suppresses --multiline and --singleline.
-.Pp
-.It Fl -simple-prompt
-Makes prompts simple.
-.Pp
-.It Fl -noprompt
-No prompt mode.
-.Pp
-.It Fl -tracer
-Displays trace for each execution of commands.
-.Pp
-.It Fl -back-trace-limit Ar n
-Displays backtrace top
-.Ar n
-and tail
-.Ar n Ns .
-The default value is 16.
-.El
-.Pp
-.Sh ENVIRONMENT
-.Bl -tag -compact -width "XDG_CONFIG_HOME"
-.It Ev IRB_LANG
-The locale used for
-.Nm .
-.Pp
-.It Ev IRBRC
-The path to the personal initialization file.
-.Pp
-.It Ev XDG_CONFIG_HOME
-.Nm
-respects XDG_CONFIG_HOME. If this is set, load
-.Pa $XDG_CONFIG_HOME/irb/irbrc
-as a personal initialization file.
-.Pp
-.El
-.Pp
-Also
-.Nm
-depends on same variables as
-.Xr ruby 1 .
-.Pp
-.Sh FILES
-.Bl -tag -compact
-.It Pa ~/.irbrc
-Personal irb initialization. If
-.Ev IRBRC
-is set, read
-.Pa $IRBRC
-instead. If
-.Ev IRBRC
-is not set and
-.Ev XDG_CONFIG_HOME
-is set,
-.Pa $XDG_CONFIG_HOME/irb/irbrc
-is loaded.
-.Pp
-.El
-.Pp
-.Sh EXAMPLES
-.Dl % irb
-.Dl irb(main):001:0> Ic 1 + 1
-.Dl 2
-.Dl irb(main):002:0> Ic def t(x)
-.Dl irb(main):003:1> Ic   x + 1
-.Dl irb(main):004:1> Ic end
-.Dl => :t
-.Dl irb(main):005:0> Ic t(3)
-.Dl => 4
-.Dl irb(main):006:0> Ic if t(3) == 4
-.Dl irb(main):007:1> Ic p :ok
-.Dl irb(main):008:1> Ic end
-.Dl :ok
-.Dl => :ok
-.Dl irb(main):009:0> Ic quit
-.Dl %
-.Pp
-.Sh SEE ALSO
-.Xr ruby 1 .
-.Pp
-.Sh REPORTING BUGS
-.Bl -bullet
-.It
-Security vulnerabilities should be reported via an email to
-.Mt security@ruby-lang.org .
-Reported problems will be published after being fixed.
-.Pp
-.It
-Other bugs and feature requests can be reported via the
-Ruby Issue Tracking System
-.Pq Lk https://bugs.ruby-lang.org/ .
-Do not report security vulnerabilities
-via this system because it publishes the vulnerabilities immediately.
-.El
-.Sh AUTHORS
-Written by Keiju ISHITSUKA.
diff --git a/man/ri.1 b/man/ri.1
deleted file mode 100644
index 85a6dfcd53672a..00000000000000
--- a/man/ri.1
+++ /dev/null
@@ -1,247 +0,0 @@
-.\"Ruby is copyrighted by Yukihiro Matsumoto <matz@netlab.jp>.
-.Dd April 20, 2017
-.Dt RI \&1 "Ruby Programmer's Reference Guide"
-.Os UNIX
-.Sh NAME
-.Nm ri
-.Nd Ruby API reference front end
-.Sh SYNOPSIS
-.Nm
-.Op Fl ahilTv
-.Op Fl d Ar DIRNAME
-.Op Fl f Ar FORMAT
-.Op Fl w Ar WIDTH
-.Op Fl - Ns Oo Cm no- Oc Ns Cm pager
-.Op Fl -server Ns Oo = Ns Ar PORT Oc
-.Op Fl - Ns Oo Cm no- Oc Ns Cm list-doc-dirs
-.Op Fl -no-standard-docs
-.Op Fl - Ns Oo Cm no- Oc Ns Bro Cm system Ns | Ns Cm site Ns | Ns Cm gems Ns | Ns Cm home Brc
-.Op Fl - Ns Oo Cm no- Oc Ns Cm profile
-.Op Fl -dump Ns = Ns Ar CACHE
-.Op Ar name ...
-.Sh DESCRIPTION
-.Nm
-is a command-line front end for the Ruby API reference.
-You can search and read the API reference for classes and methods with
-.Nm .
-.Pp
-.Nm
-is a part of Ruby.
-.Pp
-.Ar name
-can be:
-.Bl -diag -offset indent
-.It Class | Module | Module::Class
-.Pp
-.It Class::method | Class#method | Class.method | method
-.Pp
-.It gem_name: | gem_name:README | gem_name:History
-.El
-.Pp
-All class names may be abbreviated to their minimum unambiguous form.
-If a name is ambiguous, all valid options will be listed.
-.Pp
-A
-.Ql \&.
-matches either class or instance methods, while #method
-matches only instance and ::method matches only class methods.
-.Pp
-README and other files may be displayed by prefixing them with the gem name
-they're contained in.  If the gem name is followed by a
-.Ql \&:
-all files in the gem will be shown.
-The file name extension may be omitted where it is unambiguous.
-.Pp
-For example:
-.Bd -literal -offset indent
-ri Fil
-ri File
-ri File.new
-ri zip
-ri rdoc:README
-.Ed
-.Pp
-Note that shell quoting or escaping may be required for method names
-containing punctuation:
-.Bd -literal -offset indent
-ri 'Array.[]'
-ri compact\e!
-.Ed
-.Pp
-To see the default directories
-.Nm
-will search, run:
-.Bd -literal -offset indent
-ri --list-doc-dirs
-.Ed
-.Pp
-Specifying the
-.Fl -system , Fl -site , Fl -home , Fl -gems ,
-or
-.Fl -doc-dir
-options will limit
-.Nm
-to searching only the specified directories.
-.Pp
-.Nm
-options may be set in the
-.Ev RI
-environment variable.
-.Pp
-The
-.Nm
-pager can be set with the
-.Ev RI_PAGER
-environment variable or the
-.Ev PAGER
-environment variable.
-.Pp
-.Sh OPTIONS
-.Bl -tag -width "1234567890123" -compact
-.Pp
-.It Fl i
-.It Fl - Ns Oo Cm no- Oc Ns Cm interactive
-In interactive mode you can repeatedly
-look up methods with autocomplete.
-.Pp
-.It Fl a
-.It Fl - Ns Oo Cm no- Oc Ns Cm all
-Show all documentation for a class or module.
-.Pp
-.It Fl l
-.It Fl - Ns Oo Cm no- Oc Ns Cm list
-List classes
-.Nm
-knows about.
-.Pp
-.It Fl - Ns Oo Cm no- Oc Ns Cm pager
-Send output to a pager,
-rather than directly to stdout.
-.Pp
-.It Fl T
-Synonym for
-.Fl -no-pager .
-.Pp
-.It Fl w Ar WIDTH
-.It Fl -width Ns = Ns Ar WIDTH
-Set the width of the output.
-.Pp
-.It Fl -server Ns Oo = Ns Ar PORT Oc
-Run RDoc server on the given port.
-The default port is\~8214.
-.Pp
-.It Fl f Ar FORMAT
-.It Fl -format Ns = Ns Ar FORMAT
-Use the selected formatter.
-The default formatter is
-.Li bs
-for paged output and
-.Li ansi
-otherwise.
-Valid formatters are:
-.Li ansi , Li bs , Li markdown , Li rdoc .
-.Pp
-.It Fl h
-.It Fl -help
-Show help and exit.
-.Pp
-.It Fl v
-.It Fl -version
-Output version information and exit.
-.El
-.Pp
-Data source options:
-.Bl -tag -width "1234567890123" -compact
-.Pp
-.It Fl - Ns Oo Cm no- Oc Ns Cm list-doc-dirs
-List the directories from which
-.Nm
-will source documentation on stdout and exit.
-.Pp
-.It Fl d Ar DIRNAME
-.It Fl -doc-dir Ns = Ns Ar DIRNAME
-List of directories from which to source
-documentation in addition to the standard
-directories.  May be repeated.
-.Pp
-.It Fl -no-standard-docs
-Do not include documentation from the Ruby standard library,
-.Pa site_lib ,
-installed gems, or
-.Pa ~/.rdoc .
-Use with
-.Fl -doc-dir .
-.Pp
-.It Fl - Ns Oo Cm no- Oc Ns Cm system
-Include documentation from Ruby's standard library.  Defaults to true.
-.Pp
-.It Fl - Ns Oo Cm no- Oc Ns Cm site
-Include documentation from libraries installed in
-.Pa site_lib .
-Defaults to true.
-.Pp
-.It Fl - Ns Oo Cm no- Oc Ns Cm gems
-Include documentation from RubyGems.  Defaults to true.
-.Pp
-.It Fl - Ns Oo Cm no- Oc Ns Cm home
-Include documentation stored in
-.Pa ~/.rdoc .
-Defaults to true.
-.El
-.Pp
-Debug options:
-.Bl -tag -width "1234567890123" -compact
-.Pp
-.It Fl - Ns Oo Cm no- Oc Ns Cm profile
-Run with the Ruby profiler.
-.Pp
-.It Fl -dump Ns = Ns Ar CACHE
-Dump data from an ri cache or data file.
-.El
-.Pp
-.Sh ENVIRONMENT
-.Bl -tag -width "USERPROFILE" -compact
-.Pp
-.It Ev RI
-Options to prepend to those specified on the command-line.
-.Pp
-.It Ev RI_PAGER
-.It Ev PAGER
-Pager program to use for displaying.
-.Pp
-.It Ev HOME
-.It Ev USERPROFILE
-.It Ev HOMEPATH
-Path to the user's home directory.
-.El
-.Pp
-.Sh FILES
-.Bl -tag -width "USERPROFILE" -compact
-.Pp
-.It Pa ~/.rdoc
-Path for ri data in the user's home directory.
-.Pp
-.El
-.Pp
-.Sh SEE ALSO
-.Xr ruby 1 ,
-.Xr rdoc 1 ,
-.Xr gem 1
-.Pp
-.Sh REPORTING BUGS
-.Bl -bullet
-.It
-Security vulnerabilities should be reported via an email to
-.Mt security@ruby-lang.org .
-Reported problems will be published after being fixed.
-.Pp
-.It
-Other bugs and feature requests can be reported via the
-Ruby Issue Tracking System
-.Pq Lk https://bugs.ruby-lang.org/ .
-Do not report security vulnerabilities
-via this system because it publishes the vulnerabilities immediately.
-.El
-.Sh AUTHORS
-Written by
-.An Dave Thomas Aq dave@pragmaticprogrammer.com .
diff --git a/man/ruby.1 b/man/ruby.1
index e62decbf56d752..28d7ddadfa0d51 100644
--- a/man/ruby.1
+++ b/man/ruby.1
@@ -25,6 +25,7 @@
 .Op Fl - Ns Bro Cm enable Ns | Ns Cm disable Brc Ns - Ns Ar FEATURE
 .Op Fl -dump Ns = Ns Ar target
 .Op Fl -verbose
+.Op Fl -crash-report Ns = Ns Ar template
 .Op Fl -
 .Op Ar program_file
 .Op Ar argument ...
@@ -100,10 +101,10 @@ different character encodings, without dependence on Unicode.
 .It Sy "Bignums"
 With built-in bignums, you can for example calculate factorial(400).
 .Pp
-.It Sy "Reflection and domain specific languages"
+.It Sy "Reflection and domain-specific languages"
 Class is also an instance of the Class class. Definition of classes and methods
 is an expression just as 1+1 is. So your programs can even write and modify programs.
-Thus you can write your application in your own programming language on top of Ruby.
+Thus, you can write your application in your own programming language on top of Ruby.
 .Pp
 .It Sy "Exception handling"
 As in Java(tm).
@@ -429,7 +430,7 @@ Dump some information.
 Prints the specified target.
 .Ar target
 can be one of:
-.Bl -hang -offset indent
+.Bl -hang -offset indent -width "version"
 .It Sy version
 Print version description (same as
 .Fl -version).
@@ -447,18 +448,20 @@ Check syntax (same as
 .El
 .Pp
 Or one of the following, which are intended for debugging the interpreter:
-.Bl -hang -offset indent -tag -width "parsetree_with_comment"
+.Bl -hang -offset indent -width "parsetree"
 .It Sy yydebug
 Enable compiler debug mode (same as
 .Fl -yydebug).
 .It Sy parsetree
 Print a textual representation of the Ruby AST for the program.
-.It Sy parsetree_with_comment
-Print a textual representation of the Ruby AST for the program, but with each node annoted with the associated Ruby source code.
 .It Sy insns
 Print a list of disassembled bytecode instructions.
-.It Sy insns_without_opt
-Print the list of disassembled bytecode instructions before various optimizations have been applied.
+.It Sy -optimize
+Disable various optimizations to print a list disassembled bytecode instructions.
+.It Sy +error-tolerant
+Enable error-tolerant parsing, when yydebug or parsetree.
+.It Sy +comment
+Annotate a textual representation of the Ruby AST for the program with the associated Ruby source code.
 .El
 .Pp
 .It Fl -verbose
@@ -469,6 +472,12 @@ variable to true.
 If this switch is given, and no script arguments (script file or
 .Fl e
 options) are present, Ruby quits immediately.
+.Pp
+.It Fl -crash-report Ns = Ns Ar template
+Sets the template of path name to save crash report.
+See
+.Ev RUBY_CRASH_REPORT
+environment variable for details.
 .El
 .Pp
 .Sh ENVIRONMENT
@@ -508,6 +517,36 @@ enabled for only mswin32, mingw32, and OS/2 platforms.  If this
 variable is not defined, Ruby refers to
 .Ev COMSPEC .
 .Pp
+.It Ev RUBY_FREE_AT_EXIT
+If set, Ruby tries to free all dynamically allocated memories.
+Introduced in Ruby 3.3, default: unset.
+.Pp
+.It Ev RUBY_IO_BUFFER_DEFAULT_SIZE
+The custom default buffer size of
+.Li IO::Buffer .
+.Pp
+.It Ev RUBY_MAX_CPU
+The maximum number of native threads used by M:N Threads scheduler
+Introduced in Ruby 3.3, default: 8.
+.Pp
+.It Ev RUBY_MN_THREADS
+If set to
+.Li 1 ,
+M:N Thread scheduler is enabled on the main Ractor.
+Introduced in Ruby 3.3, default: unset.
+.Pp
+.It Ev RUBY_PAGER
+The pager command that will be used for
+.Fl -help
+option.
+Introduced in Ruby 3.0, default:
+.Ev PAGER
+environment variable.
+.Pp
+.It Ev RUBY_THREAD_TIMESLICE
+Sets the default thread time slice (thread quantum) in milliseconds.
+Introduced in Ruby 3.4, default: 100ms.
+.Pp
 .It Ev PATH
 Ruby refers to the
 .Ev PATH
@@ -530,7 +569,7 @@ malloc family of C standard library calls (
 .Xr calloc 3 ,
 and
 .Xr realloc 3 ) .
-In this documentatation, the "heap" refers to the Ruby object heap
+In this documentation, the "heap" refers to the Ruby object heap
 of fixed-sized slots, while "malloc" refers to auxiliary
 allocations commonly referred to as the "process heap".
 Thus there are at least two possible ways to trigger GC:
@@ -552,14 +591,15 @@ Reaching the old malloc limit.
 .El
 .Pp
 There are currently 4 possible areas where the GC may be tuned by
-the following 11 environment variables:
-.Bl -hang -compact -width "RUBY_GC_OLDMALLOC_LIMIT_GROWTH_FACTOR"
-.It Ev RUBY_GC_HEAP_INIT_SLOTS
-Initial allocation slots. Applies to all slot sizes.  Introduced in Ruby 2.1, default: 10000.
+the following environment variables:
+.Bl -hang -compact -width "RUBY_GC_HEAP_n_INIT_SLOTS"
 .Pp
-.It Ev RUBY_GC_HEAP_%d_INIT_SLOTS
+.It Ev RUBY_GC_HEAP_ Ns Ar n Ns Ev _INIT_SLOTS
 Initial allocation of slots in a specific heap.
-The available heaps can be found in the keys of `GC.stat_heap`.
+The available heaps can be found in the keys of
+.Li GC.stat_heap .
+.Ar n
+is a decimal number between 0 and 4.
 Introduced in Ruby 3.3.
 .Pp
 .It Ev RUBY_GC_HEAP_FREE_SLOTS
@@ -582,6 +622,12 @@ where R is this factor and N is the number of old objects after the
 last full GC.
 Introduced in Ruby 2.1.1, default: 2.0
 .Pp
+.It Ev RUBY_GC_HEAP_REMEMBERED_WB_UNPROTECTED_OBJECTS_LIMIT_RATIO
+Used to calculate the
+.Li remembered_wb_unprotected_objects_limit
+using a ratio of
+.Li old_objects .
+Introduced in Ruby 3.3, default: 0.1, minimum: 0.0
 .It Ev RUBY_GC_MALLOC_LIMIT
 The initial limit of young generation allocation from the malloc-family.
 GC will start when this limit is reached.
@@ -598,6 +644,31 @@ GC frequency but increasing malloc growth until RUBY_GC_MALLOC_LIMIT_MAX
 is reached.
 Introduced in Ruby 2.1, default: 1.4, minimum: 1.0 (no growth)
 .Pp
+.It Ev RUBY_GC_HEAP_FREE_SLOTS_MIN_RATIO
+Allocate additional pages when the number of free slots is
+lower than the value
+.Li (total_slots * (this ratio)) .
+Introduced in Ruby 2.4, default: 0.2, minimum: 0.0, maximum: 1.0
+.Pp
+.It Ev RUBY_GC_HEAP_FREE_SLOTS_MAX_RATIO
+Allow to free pages when the number of free slots is greater than the value
+.Li (total_slots * (this ratio)) .
+Introduced in Ruby 2.4, default: 0.4, minimum:
+.Li RUBY_GC_HEAP_FREE_SLOTS_MIN_RATIO,
+maximum: 1.0
+.Pp
+.It Ev RUBY_GC_HEAP_FREE_SLOTS_GOAL_RATIO
+Allocate slots to satisfy this formula:
+.Li free_slots = total_slots * goal_ratio
+In other words, prepare
+.Li (total_slots * goal_ratio)
+free slots.
+if this value is 0.0, then use RUBY_GC_HEAP_GROWTH_FACTOR directly.
+Introduced in Ruby 2.4, default: 0.65, minimum:
+.Li RUBY_GC_HEAP_FREE_SLOTS_MIN_RATIO,
+maximum:
+.Li RUBY_GC_HEAP_FREE_SLOTS_MAX_RATIO
+.Pp
 .It Ev RUBY_GC_OLDMALLOC_LIMIT
 The initial limit of old generation allocation from malloc,
 a full GC will start when this limit is reached.
@@ -615,6 +686,11 @@ GC frequency but increasing malloc growth until RUBY_GC_OLDMALLOC_LIMIT_MAX
 is reached.
 Introduced in Ruby 2.1, default: 1.2, minimum: 1.0 (no growth)
 .Pp
+.It Ev RUBY_SHARED_FIBER_POOL_FREE_STACKS
+Frees stacks of pooled fibers, if set to 1.
+Do not free the stacks if set to 0.
+Introduced in Ruby 2.7, default: 1 (no growth)
+.Pp
 .El
 .Sh STACK SIZE ENVIRONMENT
 Stack size environment variables are implementation-dependent and
@@ -630,11 +706,11 @@ All values are specified in bytes.
 .Bl -hang -compact -width "RUBY_THREAD_MACHINE_STACK_SIZE"
 .It Ev RUBY_THREAD_VM_STACK_SIZE
 VM stack size used at thread creation.
-default: 524288 (32-bit CPU) or 1048575 (64-bit)
+default: 524288 (32-bit CPU) or 1048576 (64-bit)
 .Pp
 .It Ev RUBY_THREAD_MACHINE_STACK_SIZE
 Machine stack size used at thread creation.
-default: 524288 or 1048575
+default: 524288 or 1048576
 .Pp
 .It Ev RUBY_FIBER_VM_STACK_SIZE
 VM stack size used at fiber creation.
@@ -645,6 +721,72 @@ Machine stack size used at fiber creation.
 default: 262144 or 524288
 .Pp
 .El
+.Sh CRASH REPORT ENVIRONMENT
+.Pp
+.Bl -tag -compact -width "RUBY_CRASH_REPORT"
+.It Ev RUBY_CRASH_REPORT
+The template of path name to save crash report.
+default: none
+.El
+.Ss Naming crash report files
+The template can contain
+.Li \fB%\fP
+specifiers which are substituted by the following values when a crash
+report file is created:
+.Pp
+.Bl -hang -compact -width "%NNN"
+.It Li \fB%%\fP
+A single
+.Li \fB%\fP
+character.
+.It Li \fB%e\fP
+Basename of executable.
+.It Li \fB%E\fP
+Pathname of executable,
+with slashes (\fB/\fP) replaced by exclamation marks (\fB!\fP).
+.It Li \fB%f\fP
+Basename of the program name,
+.Li "$0" .
+.It Li \fB%F\fP
+Pathname of the program name,
+.Li "$0",
+with slashes (\fB/\fP) replaced by exclamation marks (\fB!\fP).
+.It Li \fB%p\fP
+PID of dumped process.
+.It Li \fB%t\fP
+Time of dump, expressed as seconds since the
+Epoch, 1970-01-01 00:00:00 +0000 (UTC).
+.It Li \fB%NNN\fP
+A character code in octal.
+.El
+.Pp
+A single
+.Li \fB%\fP
+at the end of the template is dropped from the core filename, as is
+the combination of a
+.Li \fB%\fP
+followed by any character other than those listed above.  All other
+characters in the template become a literal part of the core filename.
+The template may include \(aq/\(aq characters, which are interpreted
+as delimiters for directory names.
+.Ss Piping crash reports to a program
+If the first character of this file is a pipe symbol (\fB|\fP),
+then the remainder of the line is interpreted as the command-line for
+a program (or script) that is to be executed.
+.Pp
+The pipe template is split on spaces into an argument list before the
+template parameters are expanded.
+.Sh MISC ENVIRONMENT
+.Pp
+.Bl -hang -compact -width "RUBY_TCP_NO_FAST_FALLBACK"
+.It Ev RUBY_TCP_NO_FAST_FALLBACK
+If set to
+.Li 1 ,
+disables the fast fallback feature by default in TCPSocket.new and Socket.tcp.
+When set to
+.Li 0
+or left unset, the fast fallback feature is enabled.
+Introduced in Ruby 3.4, default: unset.
 .Sh SEE ALSO
 .Bl -hang -compact -width "https://www.ruby-toolbox.com/"
 .It Lk https://www.ruby-lang.org/
diff --git a/marshal.c b/marshal.c
index ec38c2188a7285..7db4bfc6d9122e 100644
--- a/marshal.c
+++ b/marshal.c
@@ -40,6 +40,7 @@
 #include "ruby/util.h"
 #include "builtin.h"
 #include "shape.h"
+#include "ruby/internal/attr/nonstring.h"
 
 #define BITSPERSHORT (2*CHAR_BIT)
 #define SHORTMASK ((1<<BITSPERSHORT)-1)
@@ -100,6 +101,7 @@ 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, s_ruby2_keywords_flag;
+#define s_encoding_long rb_id_encoding()
 
 #define name_s_dump	"_dump"
 #define name_s_load	"_load"
@@ -114,6 +116,7 @@ static ID s_encoding_short, s_ruby2_keywords_flag;
 #define name_s_write	"write"
 #define name_s_binmode	"binmode"
 #define name_s_encoding_short "E"
+#define name_s_encoding_long "encoding"
 #define name_s_ruby2_keywords_flag "K"
 
 typedef struct {
@@ -128,22 +131,6 @@ static VALUE compat_allocator_tbl_wrapper;
 static VALUE rb_marshal_dump_limited(VALUE obj, VALUE port, int limit);
 static VALUE rb_marshal_load_with_proc(VALUE port, VALUE proc, bool freeze);
 
-static int
-mark_marshal_compat_i(st_data_t key, st_data_t value, st_data_t _)
-{
-    marshal_compat_t *p = (marshal_compat_t *)value;
-    rb_gc_mark(p->newclass);
-    rb_gc_mark(p->oldclass);
-    return ST_CONTINUE;
-}
-
-static void
-mark_marshal_compat_t(void *tbl)
-{
-    if (!tbl) return;
-    st_foreach(tbl, mark_marshal_compat_i, 0);
-}
-
 static st_table *compat_allocator_table(void);
 
 void
@@ -156,15 +143,16 @@ rb_marshal_define_compat(VALUE newclass, VALUE oldclass, VALUE (*dumper)(VALUE),
         rb_raise(rb_eTypeError, "no allocator");
     }
 
+    compat_allocator_table();
     compat = ALLOC(marshal_compat_t);
-    compat->newclass = Qnil;
-    compat->oldclass = Qnil;
     compat->newclass = newclass;
     compat->oldclass = oldclass;
     compat->dumper = dumper;
     compat->loader = loader;
 
     st_insert(compat_allocator_table(), (st_data_t)allocator, (st_data_t)compat);
+    RB_OBJ_WRITTEN(compat_allocator_tbl_wrapper, Qundef, newclass);
+    RB_OBJ_WRITTEN(compat_allocator_tbl_wrapper, Qundef, oldclass);
 }
 
 struct dump_arg {
@@ -173,6 +161,7 @@ struct dump_arg {
     st_table *data;
     st_table *compat_tbl;
     st_table *encodings;
+    st_table *userdefs;
     st_index_t num_entries;
 };
 
@@ -221,6 +210,7 @@ mark_dump_arg(void *ptr)
     rb_mark_set(p->symbols);
     rb_mark_set(p->data);
     rb_mark_hash(p->compat_tbl);
+    rb_mark_set(p->userdefs);
     rb_gc_mark(p->str);
 }
 
@@ -228,19 +218,25 @@ static void
 free_dump_arg(void *ptr)
 {
     clear_dump_arg(ptr);
-    xfree(ptr);
 }
 
 static size_t
 memsize_dump_arg(const void *ptr)
 {
-    return sizeof(struct dump_arg);
+    const struct dump_arg *p = (struct dump_arg *)ptr;
+    size_t memsize = 0;
+    if (p->symbols) memsize += rb_st_memsize(p->symbols);
+    if (p->data) memsize += rb_st_memsize(p->data);
+    if (p->compat_tbl) memsize += rb_st_memsize(p->compat_tbl);
+    if (p->userdefs) memsize += rb_st_memsize(p->userdefs);
+    if (p->encodings) memsize += rb_st_memsize(p->encodings);
+    return memsize;
 }
 
 static const rb_data_type_t dump_arg_data = {
     "dump_arg",
     {mark_dump_arg, free_dump_arg, memsize_dump_arg,},
-    0, 0, RUBY_TYPED_FREE_IMMEDIATELY
+    0, 0, RUBY_TYPED_FREE_IMMEDIATELY | RUBY_TYPED_EMBEDDABLE
 };
 
 static VALUE
@@ -461,11 +457,36 @@ w_float(double d, struct dump_arg *arg)
             memcpy(buf + len, p, digs);
             len += digs;
         }
-        xfree(p);
+        free(p);
         w_bytes(buf, len, arg);
     }
 }
 
+
+static VALUE
+w_encivar(VALUE str, struct dump_arg *arg)
+{
+    VALUE encname = encoding_name(str, arg);
+    if (NIL_P(encname) ||
+        is_ascii_string(str)) {
+        return Qnil;
+    }
+    w_byte(TYPE_IVAR, arg);
+    return encname;
+}
+
+static void
+w_encname(VALUE encname, struct dump_arg *arg)
+{
+    if (!NIL_P(encname)) {
+        struct dump_call_arg c_arg;
+        c_arg.limit = 1;
+        c_arg.arg = arg;
+        w_long(1L, arg);
+        w_encoding(encname, &c_arg);
+    }
+}
+
 static void
 w_symbol(VALUE sym, struct dump_arg *arg)
 {
@@ -482,24 +503,11 @@ w_symbol(VALUE sym, struct dump_arg *arg)
         if (!sym) {
             rb_raise(rb_eTypeError, "can't dump anonymous ID %"PRIdVALUE, sym);
         }
-        encname = encoding_name(sym, arg);
-        if (NIL_P(encname) ||
-            is_ascii_string(sym)) {
-            encname = Qnil;
-        }
-        else {
-            w_byte(TYPE_IVAR, arg);
-        }
+        encname = w_encivar(sym, arg);
         w_byte(TYPE_SYMBOL, arg);
         w_bytes(RSTRING_PTR(sym), RSTRING_LEN(sym), arg);
         st_add_direct(arg->symbols, orig_sym, arg->symbols->num_entries);
-        if (!NIL_P(encname)) {
-            struct dump_call_arg c_arg;
-            c_arg.limit = 1;
-            c_arg.arg = arg;
-            w_long(1L, arg);
-            w_encoding(encname, &c_arg);
-        }
+        w_encname(encname, arg);
     }
 }
 
@@ -528,7 +536,7 @@ hash_each(VALUE key, VALUE value, VALUE v)
 static void
 w_extended(VALUE klass, struct dump_arg *arg, int check)
 {
-    if (check && FL_TEST(klass, FL_SINGLETON)) {
+    if (check && RCLASS_SINGLETON_P(klass)) {
         VALUE origin = RCLASS_ORIGIN(klass);
         if (SINGLETON_DUMP_UNABLE_P(klass) ||
             (origin != klass && SINGLETON_DUMP_UNABLE_P(origin))) {
@@ -537,7 +545,7 @@ w_extended(VALUE klass, struct dump_arg *arg, int check)
         klass = RCLASS_SUPER(klass);
     }
     while (BUILTIN_TYPE(klass) == T_ICLASS) {
-        if (!FL_TEST(klass, RICLASS_IS_ORIGIN) ||
+        if (!RICLASS_IS_ORIGIN_P(klass) ||
                 BUILTIN_TYPE(RBASIC(klass)->klass) != T_MODULE) {
             VALUE path = rb_class_name(RBASIC(klass)->klass);
             w_byte(TYPE_EXTENDED, arg);
@@ -590,13 +598,21 @@ rb_hash_ruby2_keywords(VALUE obj)
     RHASH(obj)->basic.flags |= RHASH_PASS_AS_KEYWORDS;
 }
 
-static inline bool
-to_be_skipped_id(const ID id)
+/*
+ * if instance variable name `id` is a special name to be skipped,
+ * returns the name of it.  otherwise it cannot be dumped (unnamed),
+ * returns `name` as-is.  returns NULL for ID that can be dumped.
+ */
+static inline const char *
+skipping_ivar_name(const ID id, const char *name)
 {
-    if (id == s_encoding_short) return true;
-    if (id == s_ruby2_keywords_flag) return true;
-    if (id == rb_id_encoding()) return true;
-    return !rb_id2str(id);
+#define IS_SKIPPED_IVAR(idname) \
+    ((id == idname) && (name = name_##idname, true))
+    if (IS_SKIPPED_IVAR(s_encoding_short)) return name;
+    if (IS_SKIPPED_IVAR(s_ruby2_keywords_flag)) return name;
+    if (IS_SKIPPED_IVAR(s_encoding_long)) return name;
+    if (!rb_id2str(id)) return name;
+    return NULL;
 }
 
 struct w_ivar_arg {
@@ -605,21 +621,16 @@ struct w_ivar_arg {
 };
 
 static int
-w_obj_each(st_data_t key, st_data_t val, st_data_t a)
+w_obj_each(ID id, VALUE value, st_data_t a)
 {
-    ID id = (ID)key;
-    VALUE value = (VALUE)val;
     struct w_ivar_arg *ivarg = (struct w_ivar_arg *)a;
     struct dump_call_arg *arg = ivarg->dump;
+    const char unnamed[] = "", *ivname = skipping_ivar_name(id, unnamed);
 
-    if (to_be_skipped_id(id)) {
-        if (id == s_encoding_short) {
-            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));
+    if (ivname) {
+        if (ivname != unnamed) {
+            rb_warn("instance variable '%s' on class %"PRIsVALUE" is not dumped",
+                    ivname, CLASS_OF(arg->obj));
         }
         return ST_CONTINUE;
     }
@@ -630,10 +641,9 @@ w_obj_each(st_data_t key, st_data_t val, st_data_t a)
 }
 
 static int
-obj_count_ivars(st_data_t key, st_data_t val, st_data_t a)
+obj_count_ivars(ID id, VALUE val, st_data_t a)
 {
-    ID id = (ID)key;
-    if (!to_be_skipped_id(id) && UNLIKELY(!++*(st_index_t *)a)) {
+    if (!skipping_ivar_name(id, "") && UNLIKELY(!++*(st_index_t *)a)) {
         rb_raise(rb_eRuntimeError, "too many instance variables");
     }
     return ST_CONTINUE;
@@ -717,20 +727,18 @@ has_ivars(VALUE obj, VALUE encname, VALUE *ivobj)
 static void
 w_ivar_each(VALUE obj, st_index_t num, struct dump_call_arg *arg)
 {
-    shape_id_t shape_id = rb_shape_get_shape_id(arg->obj);
+    shape_id_t shape_id = rb_obj_shape_id(arg->obj);
     struct w_ivar_arg ivarg = {arg, num};
     if (!num) return;
     rb_ivar_foreach(obj, w_obj_each, (st_data_t)&ivarg);
 
-    if (shape_id != rb_shape_get_shape_id(arg->obj)) {
-        rb_shape_t * expected_shape = rb_shape_get_shape_by_id(shape_id);
-        rb_shape_t * actual_shape = rb_shape_get_shape(arg->obj);
-
+    shape_id_t actual_shape_id = rb_obj_shape_id(arg->obj);
+    if (shape_id != actual_shape_id) {
         // If the shape tree got _shorter_ then we probably removed an IV
         // If the shape tree got longer, then we probably added an IV.
         // The exception message might not be accurate when someone adds and
         // removes the same number of IVs, but they will still get an exception
-        if (rb_shape_depth(expected_shape) > rb_shape_depth(actual_shape)) {
+        if (rb_shape_depth(shape_id) > rb_shape_depth(rb_obj_shape_id(arg->obj))) {
             rb_raise(rb_eRuntimeError, "instance variable removed from %"PRIsVALUE" instance",
                     CLASS_OF(arg->obj));
         }
@@ -902,6 +910,9 @@ w_object(VALUE obj, struct dump_arg *arg, int limit)
             st_index_t hasiv2;
             VALUE encname2;
 
+            if (arg->userdefs && st_is_member(arg->userdefs, (st_data_t)obj)) {
+                rb_raise(rb_eRuntimeError, "can't dump recursive object using _dump()");
+            }
             v = INT2NUM(limit);
             v = dump_funcall(arg, obj, s_dump, 1, &v);
             if (!RB_TYPE_P(v, T_STRING)) {
@@ -918,7 +929,13 @@ w_object(VALUE obj, struct dump_arg *arg, int limit)
             w_class(TYPE_USERDEF, obj, arg, FALSE);
             w_bytes(RSTRING_PTR(v), RSTRING_LEN(v), arg);
             if (hasiv) {
+                st_data_t userdefs = (st_data_t)obj;
+                if (!arg->userdefs) {
+                    arg->userdefs = rb_init_identtable();
+                }
+                st_add_direct(arg->userdefs, userdefs, 0);
                 w_ivar(hasiv, ivobj, encname, &c_arg);
+                st_delete(arg->userdefs, &userdefs, NULL);
             }
             w_remember(obj, arg);
             return;
@@ -950,19 +967,23 @@ w_object(VALUE obj, struct dump_arg *arg, int limit)
             if (FL_TEST(obj, FL_SINGLETON)) {
                 rb_raise(rb_eTypeError, "singleton class can't be dumped");
             }
-            w_byte(TYPE_CLASS, arg);
             {
                 VALUE path = class2path(obj);
+                VALUE encname = w_encivar(path, arg);
+                w_byte(TYPE_CLASS, arg);
                 w_bytes(RSTRING_PTR(path), RSTRING_LEN(path), arg);
+                w_encname(encname, arg);
                 RB_GC_GUARD(path);
             }
             break;
 
           case T_MODULE:
-            w_byte(TYPE_MODULE, arg);
             {
                 VALUE path = class2path(obj);
+                VALUE encname = w_encivar(path, arg);
+                w_byte(TYPE_MODULE, arg);
                 w_bytes(RSTRING_PTR(path), RSTRING_LEN(path), arg);
+                w_encname(encname, arg);
                 RB_GC_GUARD(path);
             }
             break;
@@ -1125,6 +1146,10 @@ clear_dump_arg(struct dump_arg *arg)
         st_free_table(arg->encodings);
         arg->encodings = 0;
     }
+    if (arg->userdefs) {
+        st_free_table(arg->userdefs);
+        arg->userdefs = 0;
+    }
 }
 
 NORETURN(static inline void io_needed(void));
@@ -1202,6 +1227,7 @@ rb_marshal_dump_limited(VALUE obj, VALUE port, int limit)
     arg->num_entries = 0;
     arg->compat_tbl = 0;
     arg->encodings = 0;
+    arg->userdefs = 0;
     arg->str = rb_str_buf_new(0);
     if (!NIL_P(port)) {
         if (!rb_respond_to(port, s_write)) {
@@ -1272,19 +1298,24 @@ static void
 free_load_arg(void *ptr)
 {
     clear_load_arg(ptr);
-    xfree(ptr);
 }
 
 static size_t
 memsize_load_arg(const void *ptr)
 {
-    return sizeof(struct load_arg);
+    const struct load_arg *p = (struct load_arg *)ptr;
+    size_t memsize = 0;
+    if (p->symbols) memsize += rb_st_memsize(p->symbols);
+    if (p->data) memsize += rb_st_memsize(p->data);
+    if (p->partial_objects) memsize += rb_st_memsize(p->partial_objects);
+    if (p->compat_tbl) memsize += rb_st_memsize(p->compat_tbl);
+    return memsize;
 }
 
 static const rb_data_type_t load_arg_data = {
     "load_arg",
     {mark_load_arg, free_load_arg, memsize_load_arg,},
-    0, 0, RUBY_TYPED_FREE_IMMEDIATELY
+    0, 0, RUBY_TYPED_FREE_IMMEDIATELY | RUBY_TYPED_EMBEDDABLE
 };
 
 #define r_entry(v, arg) r_entry0((v), (arg)->data->num_entries, (arg))
@@ -1501,7 +1532,7 @@ name_equal(const char *name, size_t nlen, const char *p, long l)
 static int
 sym2encidx(VALUE sym, VALUE val)
 {
-    static const char name_encoding[8] = "encoding";
+    RBIMPL_ATTR_NONSTRING() static const char name_encoding[8] = "encoding";
     const char *p;
     long l;
     if (rb_enc_get_index(sym) != ENCINDEX_US_ASCII) return -1;
@@ -1673,10 +1704,9 @@ r_leave(VALUE v, struct load_arg *arg, bool partial)
 }
 
 static int
-copy_ivar_i(st_data_t key, st_data_t val, st_data_t arg)
+copy_ivar_i(ID vid, VALUE value, st_data_t arg)
 {
-    VALUE obj = (VALUE)arg, value = (VALUE)val;
-    ID vid = (ID)key;
+    VALUE obj = (VALUE)arg;
 
     if (!rb_ivar_defined(obj, vid))
         rb_ivar_set(obj, vid, value);
@@ -1690,6 +1720,39 @@ r_copy_ivar(VALUE v, VALUE data)
     return v;
 }
 
+#define override_ivar_error(type, str) \
+        rb_raise(rb_eTypeError, \
+                 "can't override instance variable of "type" '%"PRIsVALUE"'", \
+                 (str))
+
+static int
+r_ivar_encoding(VALUE obj, struct load_arg *arg, VALUE sym, VALUE val)
+{
+    int idx = sym2encidx(sym, val);
+    if (idx >= 0) {
+        if (rb_enc_capable(obj)) {
+            rb_enc_associate_index(obj, idx);
+        }
+        else {
+            rb_raise(rb_eArgError, "%"PRIsVALUE" is not enc_capable", obj);
+        }
+        return TRUE;
+    }
+    return FALSE;
+}
+
+static long
+r_encname(VALUE obj, struct load_arg *arg)
+{
+    long len = r_long(arg);
+    if (len > 0) {
+        VALUE sym = r_symbol(arg);
+        VALUE val = r_object(arg);
+        len -= r_ivar_encoding(obj, arg, sym, val);
+    }
+    return len;
+}
+
 static void
 r_ivar(VALUE obj, int *has_encoding, struct load_arg *arg)
 {
@@ -1697,17 +1760,16 @@ r_ivar(VALUE obj, int *has_encoding, struct load_arg *arg)
 
     len = r_long(arg);
     if (len > 0) {
+        if (RB_TYPE_P(obj, T_MODULE)) {
+            override_ivar_error("module", rb_mod_name(obj));
+        }
+        else if (RB_TYPE_P(obj, T_CLASS)) {
+            override_ivar_error("class", rb_class_name(obj));
+        }
         do {
             VALUE sym = r_symbol(arg);
             VALUE val = r_object(arg);
-            int idx = sym2encidx(sym, val);
-            if (idx >= 0) {
-                if (rb_enc_capable(obj)) {
-                    rb_enc_associate_index(obj, idx);
-                }
-                else {
-                    rb_raise(rb_eArgError, "%"PRIsVALUE" is not enc_capable", obj);
-                }
+            if (r_ivar_encoding(obj, arg, sym, val)) {
                 if (has_encoding) *has_encoding = TRUE;
             }
             else if (symname_equal_lit(sym, name_s_ruby2_keywords_flag)) {
@@ -1789,9 +1851,7 @@ append_extmod(VALUE obj, VALUE extmod)
 
 #define prohibit_ivar(type, str) do { \
         if (!ivp || !*ivp) break; \
-        rb_raise(rb_eTypeError, \
-                 "can't override instance variable of "type" `%"PRIsVALUE"'", \
-                 (str)); \
+        override_ivar_error(type, str); \
     } while (0)
 
 static VALUE r_object_for(struct load_arg *arg, bool partial, int *ivp, VALUE extmod, int type);
@@ -1883,7 +1943,7 @@ r_object_for(struct load_arg *arg, bool partial, int *ivp, VALUE extmod, int typ
                 goto type_hash;
             }
             v = r_object_for(arg, partial, 0, extmod, type);
-            if (rb_special_const_p(v) || RB_TYPE_P(v, T_OBJECT) || RB_TYPE_P(v, T_CLASS)) {
+            if (RB_SPECIAL_CONST_P(v) || RB_TYPE_P(v, T_OBJECT) || RB_TYPE_P(v, T_CLASS)) {
                 goto format_error;
             }
             if (RB_TYPE_P(v, T_MODULE) || !RTEST(rb_class_inherited_p(c, RBASIC(v)->klass))) {
@@ -2127,7 +2187,7 @@ r_object_for(struct load_arg *arg, bool partial, int *ivp, VALUE extmod, int typ
             st_data_t d;
 
             if (!rb_obj_respond_to(klass, s_load, TRUE)) {
-                rb_raise(rb_eTypeError, "class %"PRIsVALUE" needs to have method `_load'",
+                rb_raise(rb_eTypeError, "class %"PRIsVALUE" needs to have method '_load'",
                          name);
             }
             data = r_string(arg);
@@ -2163,7 +2223,7 @@ r_object_for(struct load_arg *arg, bool partial, int *ivp, VALUE extmod, int typ
                 append_extmod(v, extmod);
             }
             if (!rb_obj_respond_to(v, s_mload, TRUE)) {
-                rb_raise(rb_eTypeError, "instance of %"PRIsVALUE" needs to have method `marshal_load'",
+                rb_raise(rb_eTypeError, "instance of %"PRIsVALUE" needs to have method 'marshal_load'",
                          name);
             }
             v = r_entry(v, arg);
@@ -2209,7 +2269,7 @@ r_object_for(struct load_arg *arg, bool partial, int *ivp, VALUE extmod, int typ
             v = r_entry(v, arg);
             if (!rb_obj_respond_to(v, s_load_data, TRUE)) {
                 rb_raise(rb_eTypeError,
-                         "class %"PRIsVALUE" needs to have instance method `_load_data'",
+                         "class %"PRIsVALUE" needs to have instance method '_load_data'",
                          name);
             }
             r = r_object0(arg, partial, 0, extmod);
@@ -2233,6 +2293,7 @@ r_object_for(struct load_arg *arg, bool partial, int *ivp, VALUE extmod, int typ
         {
             VALUE str = r_bytes(arg);
 
+            if (ivp && *ivp > 0) *ivp = r_encname(str, arg) > 0;
             v = path2class(str);
             prohibit_ivar("class", str);
             v = r_entry(v, arg);
@@ -2244,6 +2305,7 @@ r_object_for(struct load_arg *arg, bool partial, int *ivp, VALUE extmod, int typ
         {
             VALUE str = r_bytes(arg);
 
+            if (ivp && *ivp > 0) *ivp = r_encname(str, arg) > 0;
             v = path2module(str);
             prohibit_ivar("module", str);
             v = r_entry(v, arg);
@@ -2288,10 +2350,8 @@ r_object(struct load_arg *arg)
 static void
 clear_load_arg(struct load_arg *arg)
 {
-    if (arg->buf) {
-        xfree(arg->buf);
-        arg->buf = 0;
-    }
+    xfree(arg->buf);
+    arg->buf = NULL;
     arg->buflen = 0;
     arg->offset = 0;
     arg->readable = 0;
@@ -2511,16 +2571,77 @@ Init_marshal(void)
     rb_define_const(rb_mMarshal, "MINOR_VERSION", INT2FIX(MARSHAL_MINOR));
 }
 
+static int
+marshal_compat_table_mark_i(st_data_t key, st_data_t value, st_data_t _)
+{
+    marshal_compat_t *p = (marshal_compat_t *)value;
+    rb_gc_mark_movable(p->newclass);
+    rb_gc_mark_movable(p->oldclass);
+    return ST_CONTINUE;
+}
+
+static void
+marshal_compat_table_mark(void *tbl)
+{
+    if (!tbl) return;
+    st_foreach(tbl, marshal_compat_table_mark_i, 0);
+}
+
+static int
+marshal_compat_table_free_i(st_data_t key, st_data_t value, st_data_t _)
+{
+    xfree((marshal_compat_t *)value);
+    return ST_CONTINUE;
+}
+
+static void
+marshal_compat_table_free(void *data)
+{
+    st_foreach(data, marshal_compat_table_free_i, 0);
+    st_free_table(data);
+}
+
+static size_t
+marshal_compat_table_memsize(const void *data)
+{
+    return st_memsize(data) + sizeof(marshal_compat_t) * st_table_size(data);
+}
+
+static int
+marshal_compat_table_compact_i(st_data_t key, st_data_t value, st_data_t _)
+{
+    marshal_compat_t *p = (marshal_compat_t *)value;
+    p->newclass = rb_gc_location(p->newclass);
+    p->oldclass = rb_gc_location(p->oldclass);
+    return ST_CONTINUE;
+}
+
+static void
+marshal_compat_table_compact(void *tbl)
+{
+    if (!tbl) return;
+    st_foreach(tbl, marshal_compat_table_compact_i, 0);
+}
+
+static const rb_data_type_t marshal_compat_type = {
+    .wrap_struct_name = "marshal_compat_table",
+    .function = {
+        .dmark = marshal_compat_table_mark,
+        .dfree = marshal_compat_table_free,
+        .dsize = marshal_compat_table_memsize,
+        .dcompact = marshal_compat_table_compact,
+    },
+    .flags = RUBY_TYPED_WB_PROTECTED | RUBY_TYPED_FREE_IMMEDIATELY,
+};
+
 static st_table *
 compat_allocator_table(void)
 {
     if (compat_allocator_tbl) return compat_allocator_tbl;
     compat_allocator_tbl = st_init_numtable();
-#undef RUBY_UNTYPED_DATA_WARNING
-#define RUBY_UNTYPED_DATA_WARNING 0
     compat_allocator_tbl_wrapper =
-        Data_Wrap_Struct(0, mark_marshal_compat_t, 0, compat_allocator_tbl);
-    rb_gc_register_mark_object(compat_allocator_tbl_wrapper);
+        TypedData_Wrap_Struct(0, &marshal_compat_type, compat_allocator_tbl);
+    rb_vm_register_global_object(compat_allocator_tbl_wrapper);
     return compat_allocator_tbl;
 }
 
diff --git a/math.c b/math.c
index 6f0ddf9ec55882..2394fe9f588a4a 100644
--- a/math.c
+++ b/math.c
@@ -538,6 +538,7 @@ math_log_split(VALUE x, size_t *numbits)
 # define log_intermediate log2
 #else
 # define log_intermediate log10
+double log2(double x);
 #endif
 
 VALUE
@@ -561,14 +562,14 @@ rb_math_log(int argc, const VALUE *argv)
             return DBL2NUM(-0.0);
         }
         d = log_intermediate(d) / log_intermediate(b);
-        numbits -= numbits_2;
+        d += (numbits - numbits_2) / log2(b);
     }
     else {
         /* check for pole error */
         if (d == 0.0) return DBL2NUM(-HUGE_VAL);
         d = log(d);
+        d += numbits * M_LN2;
     }
-    d += numbits * M_LN2;
     return DBL2NUM(d);
 }
 
@@ -730,7 +731,7 @@ rb_math_sqrt(VALUE x)
  *    cbrt(1.0)       # => 1.0
  *    cbrt(0.0)       # => 0.0
  *    cbrt(1.0)       # => 1.0
-      cbrt(2.0)       # => 1.2599210498948732
+ *    cbrt(2.0)       # => 1.2599210498948732
  *    cbrt(8.0)       # => 2.0
  *    cbrt(27.0)      # => 3.0
  *    cbrt(INFINITY)  # => Infinity
diff --git a/memory_view.c b/memory_view.c
index 3fb79202f98b36..7bcb39972f03a8 100644
--- a/memory_view.c
+++ b/memory_view.c
@@ -51,11 +51,11 @@ exported_object_registry_mark(void *ptr)
 static void
 exported_object_registry_free(void *ptr)
 {
-    RB_VM_LOCK_ENTER();
-    st_clear(exported_object_table);
-    st_free_table(exported_object_table);
-    exported_object_table = NULL;
-    RB_VM_LOCK_LEAVE();
+    RB_VM_LOCKING() {
+        st_clear(exported_object_table);
+        st_free_table(exported_object_table);
+        exported_object_table = NULL;
+    }
 }
 
 const rb_data_type_t rb_memory_view_exported_object_registry_data_type = {
@@ -99,18 +99,18 @@ exported_object_dec_ref(st_data_t *key, st_data_t *val, st_data_t arg, int exist
 static void
 register_exported_object(VALUE obj)
 {
-    RB_VM_LOCK_ENTER();
-    st_update(exported_object_table, (st_data_t)obj, exported_object_add_ref, 0);
-    RB_VM_LOCK_LEAVE();
+    RB_VM_LOCKING() {
+        st_update(exported_object_table, (st_data_t)obj, exported_object_add_ref, 0);
+    }
 }
 
 static void
 unregister_exported_object(VALUE obj)
 {
-    RB_VM_LOCK_ENTER();
-    if (exported_object_table)
-        st_update(exported_object_table, (st_data_t)obj, exported_object_dec_ref, 0);
-    RB_VM_LOCK_LEAVE();
+    RB_VM_LOCKING() {
+        if (exported_object_table)
+            st_update(exported_object_table, (st_data_t)obj, exported_object_dec_ref, 0);
+    }
 }
 
 // MemoryView
@@ -845,9 +845,7 @@ rb_memory_view_release(rb_memory_view_t* view)
         if (rv) {
             unregister_exported_object(view->obj);
             view->obj = Qnil;
-            if (view->item_desc.components) {
-                xfree((void *)view->item_desc.components);
-            }
+            xfree((void *)view->item_desc.components);
         }
         return rv;
     }
@@ -865,7 +863,7 @@ Init_MemoryView(void)
     VALUE obj = TypedData_Wrap_Struct(
         0, &rb_memory_view_exported_object_registry_data_type,
         exported_object_table);
-    rb_gc_register_mark_object(obj);
+    rb_vm_register_global_object(obj);
     rb_memory_view_exported_object_registry = obj;
 
     id_memory_view = rb_intern_const("__memory_view__");
diff --git a/method.h b/method.h
index 6b60a49a3aac4d..6abf2495b0df38 100644
--- a/method.h
+++ b/method.h
@@ -15,6 +15,7 @@
 #include "internal/imemo.h"
 #include "internal/compilers.h"
 #include "internal/static_assert.h"
+#include "ruby/atomic.h"
 
 #ifndef END_OF_ENUMERATION
 # if defined(__GNUC__) &&! defined(__STRICT_ANSI__)
@@ -101,8 +102,9 @@ static inline void
 METHOD_ENTRY_FLAGS_COPY(rb_method_entry_t *dst, const rb_method_entry_t *src)
 {
     dst->flags =
-      (dst->flags & ~(IMEMO_FL_USER0|IMEMO_FL_USER1|IMEMO_FL_USER2)) |
-        (src->flags & (IMEMO_FL_USER0|IMEMO_FL_USER1|IMEMO_FL_USER2));
+      (dst->flags & ~(IMEMO_FL_USER0|IMEMO_FL_USER1|IMEMO_FL_USER2
+      |IMEMO_FL_USER3)) |
+        (src->flags & (IMEMO_FL_USER0|IMEMO_FL_USER1|IMEMO_FL_USER2|IMEMO_FL_USER3));
 }
 
 typedef enum {
@@ -135,8 +137,9 @@ typedef struct rb_method_iseq_struct {
     rb_cref_t * cref;          /*!< class reference, should be marked */
 } rb_method_iseq_t; /* check rb_add_method_iseq() when modify the fields */
 
+typedef VALUE (*rb_cfunc_t)(ANYARGS);
 typedef struct rb_method_cfunc_struct {
-    VALUE (*func)(ANYARGS);
+    rb_cfunc_t func;
     VALUE (*invoker)(VALUE recv, int argc, const VALUE *argv, VALUE (*func)(ANYARGS));
     int argc;
 } rb_method_cfunc_t;
@@ -152,7 +155,6 @@ typedef struct rb_method_alias_struct {
 
 typedef struct rb_method_refined_struct {
     struct rb_method_entry_struct * orig_me;
-    VALUE owner;
 } rb_method_refined_t;
 
 typedef struct rb_method_bmethod_struct {
@@ -178,9 +180,10 @@ typedef struct rb_method_optimized {
 struct rb_method_definition_struct {
     BITFIELD(rb_method_type_t, type, VM_METHOD_TYPE_MINIMUM_BITS);
     unsigned int iseq_overload: 1;
-    int alias_count : 27;
-    int complemented_count : 28;
     unsigned int no_redef_warning: 1;
+    unsigned int aliased : 1;
+
+    rb_atomic_t reference_count;
 
     union {
         rb_method_iseq_t iseq;
@@ -194,12 +197,13 @@ struct rb_method_definition_struct {
 
     ID original_id;
     uintptr_t method_serial;
+    const rb_namespace_t *ns;
 };
 
 struct rb_id_table;
 
 typedef struct rb_method_definition_struct rb_method_definition_t;
-STATIC_ASSERT(sizeof_method_def, offsetof(rb_method_definition_t, body)==8);
+STATIC_ASSERT(sizeof_method_def, offsetof(rb_method_definition_t, body) <= 8);
 
 #define UNDEFINED_METHOD_ENTRY_P(me) (!(me) || !(me)->def || (me)->def->type == VM_METHOD_TYPE_UNDEF)
 #define UNDEFINED_REFINED_METHOD_P(def) \
@@ -213,7 +217,7 @@ void rb_add_method_optimized(VALUE klass, ID mid, enum method_optimized_type, un
 void rb_add_refined_method_entry(VALUE refined_class, ID mid);
 
 rb_method_entry_t *rb_method_entry_set(VALUE klass, ID mid, const rb_method_entry_t *, rb_method_visibility_t noex);
-rb_method_entry_t *rb_method_entry_create(ID called_id, VALUE klass, rb_method_visibility_t visi, const rb_method_definition_t *def);
+rb_method_entry_t *rb_method_entry_create(ID called_id, VALUE klass, rb_method_visibility_t visi, rb_method_definition_t *def);
 
 const rb_method_entry_t *rb_method_entry_at(VALUE obj, ID id);
 
@@ -236,6 +240,7 @@ st_index_t rb_hash_method_entry(st_index_t hash, const rb_method_entry_t *me);
 
 VALUE rb_method_entry_location(const rb_method_entry_t *me);
 
+void rb_free_method_entry_vm_weak_references(const rb_method_entry_t *me);
 void rb_free_method_entry(const rb_method_entry_t *me);
 
 const rb_method_entry_t *rb_method_entry_clone(const rb_method_entry_t *me);
@@ -243,12 +248,17 @@ const rb_callable_method_entry_t *rb_method_entry_complement_defined_class(const
 void rb_method_entry_copy(rb_method_entry_t *dst, const rb_method_entry_t *src);
 
 void rb_method_table_insert(VALUE klass, struct rb_id_table *table, ID method_id, const rb_method_entry_t *me);
+void rb_method_table_insert0(VALUE klass, struct rb_id_table *table, ID method_id, const rb_method_entry_t *me, bool iclass_shared_mtbl);
 
 void rb_scope_visibility_set(rb_method_visibility_t);
 
 VALUE rb_unnamed_parameters(int arity);
 
+void rb_vm_insert_cc_refinement(const struct rb_callcache *cc);
+void rb_vm_delete_cc_refinement(const struct rb_callcache *cc);
+
 void rb_clear_method_cache(VALUE klass_or_module, ID mid);
 void rb_clear_all_refinement_method_cache(void);
+void rb_invalidate_method_caches(struct rb_id_table *cm_tbl, struct rb_id_table *cc_tbl);
 
 #endif /* RUBY_METHOD_H */
diff --git a/mini_builtin.c b/mini_builtin.c
index a0bb46c54c9226..d9827e70e472b8 100644
--- a/mini_builtin.c
+++ b/mini_builtin.c
@@ -1,101 +1,119 @@
 #include "internal.h"
 #include "internal/array.h"
+#include "internal/eval.h"
 #include "iseq.h"
 #include "vm_core.h"
 #include "builtin.h"
 
 #include "miniprelude.c"
 
-// included from miniinit.c
+static VALUE
+prelude_ast_value(VALUE name, VALUE code, int line)
+{
+    rb_ast_t *ast;
+    VALUE ast_value = rb_parser_compile_string_path(rb_parser_new(), name, code, line);
+    ast = rb_ruby_ast_data_get(ast_value);
+    if (!ast || !ast->body.root) {
+        if (ast) rb_ast_dispose(ast);
+        rb_exc_raise(rb_errinfo());
+    }
+    return ast_value;
+}
 
-#ifndef INCLUDED_BY_BUILTIN_C
-static struct st_table *loaded_builtin_table;
-#endif
+static void
+pm_prelude_load(pm_parse_result_t *result, VALUE name, VALUE code, int line)
+{
+    pm_options_line_set(&result->options, line);
+    VALUE error = pm_parse_string(result, code, name, NULL);
 
-rb_ast_t *rb_builtin_ast(const char *feature_name, VALUE *name_str);
+    if (!NIL_P(error)) {
+        pm_parse_result_free(result);
+        rb_exc_raise(error);
+    }
+}
 
 static const rb_iseq_t *
 builtin_iseq_load(const char *feature_name, const struct rb_builtin_function *table)
 {
     VALUE name_str = 0;
-    rb_ast_t *ast = rb_builtin_ast(feature_name, &name_str);
-    rb_vm_t *vm = GET_VM();
-
-    if (!ast) {
+    int start_line;
+    const rb_iseq_t *iseq;
+    VALUE code = rb_builtin_find(feature_name, &name_str, &start_line);
+    if (NIL_P(code)) {
         rb_fatal("builtin_iseq_load: can not find %s; "
                  "probably miniprelude.c is out of date",
                  feature_name);
     }
-    vm->builtin_function_table = table;
-    vm->builtin_inline_index = 0;
+
+    rb_vm_t *vm = GET_VM();
     static const rb_compile_option_t optimization = {
-        TRUE, /* unsigned int inline_const_cache; */
-        TRUE, /* unsigned int peephole_optimization; */
-        FALSE,/* unsigned int tailcall_optimization; */
-        TRUE, /* unsigned int specialized_instruction; */
-        TRUE, /* unsigned int operands_unification; */
-        TRUE, /* unsigned int instructions_unification; */
-        TRUE, /* unsigned int frozen_string_literal; */
-        FALSE, /* unsigned int debug_frozen_string_literal; */
-        FALSE, /* unsigned int coverage_enabled; */
-        0, /* int debug_level; */
+        .inline_const_cache = TRUE,
+        .peephole_optimization = TRUE,
+        .tailcall_optimization = FALSE,
+        .specialized_instruction = TRUE,
+        .operands_unification = TRUE,
+        .instructions_unification = TRUE,
+        .frozen_string_literal = TRUE,
+        .debug_frozen_string_literal = FALSE,
+        .coverage_enabled = FALSE,
+        .debug_level = 0,
     };
-    const rb_iseq_t *iseq = rb_iseq_new_with_opt(&ast->body, name_str, name_str, Qnil, 0, NULL, 0, ISEQ_TYPE_TOP, &optimization);
-    GET_VM()->builtin_function_table = NULL;
 
-    rb_ast_dispose(ast);
+    if (rb_ruby_prism_p()) {
+        pm_parse_result_t result = { 0 };
+        pm_prelude_load(&result, name_str, code, start_line);
+
+        vm->builtin_function_table = table;
+        int error_state;
+        iseq = pm_iseq_new_with_opt(&result.node, name_str, name_str, Qnil, 0, NULL, 0, ISEQ_TYPE_TOP, &optimization, &error_state);
+
+        vm->builtin_function_table = NULL;
+        pm_parse_result_free(&result);
+
+        if (error_state) {
+            RUBY_ASSERT(iseq == NULL);
+            rb_jump_tag(error_state);
+        }
+    }
+    else {
+        VALUE ast_value = prelude_ast_value(name_str, code, start_line);
+        rb_ast_t *ast = rb_ruby_ast_data_get(ast_value);
+
+        vm->builtin_function_table = table;
+        iseq = rb_iseq_new_with_opt(ast_value, name_str, name_str, Qnil, 0, NULL, 0, ISEQ_TYPE_TOP, &optimization, Qnil);
+
+        vm->builtin_function_table = NULL;
+        rb_ast_dispose(ast);
+    }
 
     // for debug
     if (0 && strcmp("prelude", feature_name) == 0) {
         rb_io_write(rb_stdout, rb_iseq_disasm((const rb_iseq_t *)iseq));
     }
 
-#ifndef INCLUDED_BY_BUILTIN_C
-    st_insert(loaded_builtin_table, (st_data_t)feature_name, (st_data_t)iseq);
-    rb_gc_register_mark_object((VALUE)iseq);
-#endif
+    BUILTIN_LOADED(feature_name, iseq);
 
     return iseq;
 }
 
-void
-rb_load_with_builtin_functions(const char *feature_name, const struct rb_builtin_function *table)
+static void
+load_with_builtin_functions(const char *feature_name, const struct rb_builtin_function *table)
 {
     const rb_iseq_t *iseq = builtin_iseq_load(feature_name, table);
-    rb_iseq_eval(iseq);
-}
-
-#ifndef INCLUDED_BY_BUILTIN_C
-
-static int
-each_builtin_i(st_data_t key, st_data_t val, st_data_t dmy)
-{
-    const char *feature = (const char *)key;
-    const rb_iseq_t *iseq = (const rb_iseq_t *)val;
-
-    rb_yield_values(2, rb_str_new2(feature), rb_iseqw_new(iseq));
-
-    return ST_CONTINUE;
-}
-
-static VALUE
-each_builtin(VALUE self)
-{
-    st_foreach(loaded_builtin_table, each_builtin_i, 0);
-    return Qnil;
+    rb_namespace_enable_builtin();
+    rb_iseq_eval_with_refinement(iseq, rb_mNamespaceRefiner);
+    rb_namespace_disable_builtin();
 }
 
 void
-Init_builtin(void)
-{
-    rb_define_singleton_method(rb_cRubyVM, "each_builtin", each_builtin, 0);
-    loaded_builtin_table = st_init_strtable();
-}
-
-void
-Init_builtin_features(void)
+rb_load_with_builtin_functions(const char *feature_name, const struct rb_builtin_function *table)
 {
-    // register for ruby
-    builtin_iseq_load("gem_prelude", NULL);
+    const rb_iseq_t *iseq;
+    if (rb_namespace_available() && rb_mNamespaceRefiner) {
+        load_with_builtin_functions(feature_name, table);
+    }
+    else {
+        iseq = builtin_iseq_load(feature_name, table);
+        rb_iseq_eval(iseq);
+    }
 }
-#endif
diff --git a/miniinit.c b/miniinit.c
index 2a14a0d1c5c667..b0adf9da2a73dc 100644
--- a/miniinit.c
+++ b/miniinit.c
@@ -48,4 +48,62 @@ Init_enc(void)
     rb_encdb_alias("ASCII", "US-ASCII");
 }
 
+/* miniruby does not support dynamic loading. */
+void
+Init_ext(void)
+{
+}
+
+static void builtin_loaded(const char *feature_name, VALUE iseq);
+#define BUILTIN_LOADED(feature_name, iseq) builtin_loaded(feature_name, (VALUE)(iseq))
+
 #include "mini_builtin.c"
+
+static struct st_table *loaded_builtin_table;
+
+static void
+builtin_loaded(const char *feature_name, VALUE iseq)
+{
+    st_insert(loaded_builtin_table, (st_data_t)feature_name, (st_data_t)iseq);
+    rb_vm_register_global_object(iseq);
+}
+
+static int
+each_builtin_i(st_data_t key, st_data_t val, st_data_t dmy)
+{
+    const char *feature = (const char *)key;
+    const rb_iseq_t *iseq = (const rb_iseq_t *)val;
+
+    rb_yield_values(2, rb_str_new2(feature), rb_iseqw_new(iseq));
+
+    return ST_CONTINUE;
+}
+
+/* :nodoc: */
+static VALUE
+each_builtin(VALUE self)
+{
+    st_foreach(loaded_builtin_table, each_builtin_i, 0);
+    return Qnil;
+}
+
+void
+Init_builtin(void)
+{
+    rb_define_singleton_method(rb_cRubyVM, "each_builtin", each_builtin, 0);
+    loaded_builtin_table = st_init_strtable();
+}
+
+void
+Init_builtin_features(void)
+{
+    // register for ruby
+    builtin_iseq_load("gem_prelude", NULL);
+}
+
+void
+rb_free_loaded_builtin_table(void)
+{
+    if (loaded_builtin_table)
+        st_free_table(loaded_builtin_table);
+}
diff --git a/misc/.vscode/settings.json b/misc/.vscode/settings.json
index 7b1a38c536eb58..c11838155efaa9 100644
--- a/misc/.vscode/settings.json
+++ b/misc/.vscode/settings.json
@@ -2,7 +2,5 @@
     "rust-analyzer.cargo.features": [
         "disasm",
     ],
-    "rust-analyzer.cargo.unsetTest": [
-        "yjit",
-    ],
+    "rust-analyzer.cfg.setTest": false,
 }
diff --git a/misc/call_fuzzer.rb b/misc/call_fuzzer.rb
new file mode 100644
index 00000000000000..c3f9f90490c0bc
--- /dev/null
+++ b/misc/call_fuzzer.rb
@@ -0,0 +1,372 @@
+require 'optparse'
+require 'set'
+
+# Number of iterations to test
+num_iters = 10_000
+
+# Parse the command-line options
+OptionParser.new do |opts|
+  opts.on("--num-iters=N") do |n|
+    num_iters = n.to_i
+  end
+end.parse!
+
+# Format large numbers with comma separators for readability
+def format_number(pad, number)
+  s = number.to_s
+  i = s.index('.') || s.size
+  s.insert(i -= 3, ',') while i > 3
+  s.rjust(pad, ' ')
+end
+
+# Wrap an integer to pass as argument
+# We use this so we can have some object arguments
+class IntWrapper
+  def initialize(v)
+    # Force the object to have a random shape
+    if rand() < 50
+      @v0 = 1
+    end
+    if rand() < 50
+      @v1 = 1
+    end
+    if rand() < 50
+      @v2 = 1
+    end
+    if rand() < 50
+      @v3 = 1
+    end
+    if rand() < 50
+      @v4 = 1
+    end
+    if rand() < 50
+      @v5 = 1
+    end
+    if rand() < 50
+      @v6 = 1
+    end
+
+    @value = v
+  end
+
+  attr_reader :value
+end
+
+# Generate a random argument value, integer or string or object
+def sample_arg()
+  c = ['int', 'string', 'object'].sample()
+
+  if c == 'int'
+    return rand(0...100)
+  end
+
+  if c == 'string'
+    return 'f' * rand(0...100)
+  end
+
+  if c == 'object'
+    return IntWrapper.new(rand(0...100))
+  end
+
+  raise "should not get here"
+end
+
+# Evaluate the value of an argument with respect to the checksum
+def arg_val(arg)
+  if arg.kind_of? Integer
+    return arg
+  end
+
+  if arg.kind_of? String
+    return arg.length
+  end
+
+  if arg.kind_of? Object
+    return arg.value
+  end
+
+  raise "unknown arg type"
+end
+
+# List of parameters/arguments for a method
+class ParamList
+  def initialize()
+    self.sample_params()
+    self.sample_args()
+  end
+
+  # Sample/generate a random set of parameters for a method
+  def sample_params()
+    # Choose how many positional arguments to use, and how many are optional
+    num_pargs = rand(10)
+    @opt_parg_idx = rand(num_pargs)
+    @num_opt_pargs = rand(num_pargs + 1 - @opt_parg_idx)
+    @num_pargs_req = num_pargs - @num_opt_pargs
+    @pargs = (0...num_pargs).map do |i|
+      {
+        :name => "p#{i}",
+        :optional => (i >= @opt_parg_idx && i < @opt_parg_idx + @num_opt_pargs)
+      }
+    end
+
+    # Choose how many kwargs to use, and how many are optional
+    num_kwargs = rand(10)
+    @kwargs = (0...num_kwargs).map do |i|
+      {
+        :name => "k#{i}",
+        :optional => rand() < 0.5
+      }
+    end
+
+    # Choose whether to have rest parameters or not
+    @has_rest = @num_opt_pargs == 0 && rand() < 0.5
+    @has_kwrest = rand() < 0.25
+
+    # Choose whether to have a named block parameter or not
+    @has_block_param = rand() < 0.25
+  end
+
+  # Sample/generate a random set of arguments corresponding to the parameters
+  def sample_args()
+    # Choose how many positional args to pass
+    num_pargs_passed = rand(@num_pargs_req..@pargs.size)
+
+    # How many optional arguments will be filled
+    opt_pargs_filled = num_pargs_passed - @num_pargs_req
+
+    @pargs.each_with_index do |parg, i|
+      if parg[:optional]
+        parg[:default] = rand(100)
+      end
+
+      if !parg[:optional] || i < @opt_parg_idx + opt_pargs_filled
+        parg[:argval] = rand(100)
+      end
+    end
+
+    @kwargs.each_with_index do |kwarg, i|
+      if kwarg[:optional]
+        kwarg[:default] = rand(100)
+      end
+
+      if !kwarg[:optional] || rand() < 0.5
+        kwarg[:argval] = rand(100)
+      end
+    end
+
+    # Randomly pass a block or not
+    @block_arg = nil
+    if rand() < 0.5
+      @block_arg = rand(100)
+    end
+  end
+
+  # Compute the expected checksum of arguments ahead of time
+  def compute_checksum()
+    checksum = 0
+
+    @pargs.each_with_index do |arg, i|
+      value = (arg.key? :argval)? arg[:argval]:arg[:default]
+      checksum += (i+1) * arg_val(value)
+    end
+
+    @kwargs.each_with_index do |arg, i|
+      value = (arg.key? :argval)? arg[:argval]:arg[:default]
+      checksum += (i+1) * arg_val(value)
+    end
+
+    if @block_arg
+      if @has_block_param
+        checksum += arg_val(@block_arg)
+      end
+
+      checksum += arg_val(@block_arg)
+    end
+
+    checksum
+  end
+
+  # Generate code for the method signature and method body
+  def gen_method_str()
+    m_str = "def m("
+
+    @pargs.each do |arg|
+      if !m_str.end_with?("(")
+        m_str += ", "
+      end
+
+      m_str += arg[:name]
+
+      # If this has a default value
+      if arg[:optional]
+        m_str += " = #{arg[:default]}"
+      end
+    end
+
+    if @has_rest
+      if !m_str.end_with?("(")
+        m_str += ", "
+      end
+      m_str += "*rest"
+    end
+
+    @kwargs.each do |arg|
+      if !m_str.end_with?("(")
+        m_str += ", "
+      end
+
+      m_str += "#{arg[:name]}:"
+
+      # If this has a default value
+      if arg[:optional]
+        m_str += " #{arg[:default]}"
+      end
+    end
+
+    if @has_kwrest
+      if !m_str.end_with?("(")
+        m_str += ", "
+      end
+      m_str += "**kwrest"
+    end
+
+    if @has_block_param
+      if !m_str.end_with?("(")
+        m_str += ", "
+      end
+
+      m_str += "&block"
+    end
+
+    m_str += ")\n"
+
+    # Add some useless locals
+    rand(0...16).times do |i|
+      m_str += "local#{i} = #{i}\n"
+    end
+
+    # Add some useless if statements
+    @pargs.each_with_index do |arg, i|
+      if rand() < 50
+        m_str += "if #{arg[:name]} > 4; end\n"
+      end
+    end
+
+    m_str += "checksum = 0\n"
+
+    @pargs.each_with_index do |arg, i|
+      m_str += "checksum += #{i+1} * arg_val(#{arg[:name]})\n"
+    end
+
+    @kwargs.each_with_index do |arg, i|
+      m_str += "checksum += #{i+1} * arg_val(#{arg[:name]})\n"
+    end
+
+    if @has_block_param
+      m_str += "if block; r = block.call; checksum += arg_val(r); end\n"
+    end
+
+    m_str += "if block_given?; r = yield; checksum += arg_val(r); end\n"
+
+    if @has_rest
+      m_str += "raise 'rest is not array' unless rest.kind_of?(Array)\n"
+      m_str += "raise 'rest size not integer' unless rest.size.kind_of?(Integer)\n"
+    end
+
+    if @has_kwrest
+      m_str += "raise 'kwrest is not a hash' unless kwrest.kind_of?(Hash)\n"
+      m_str += "raise 'kwrest size not integer' unless kwrest.size.kind_of?(Integer)\n"
+    end
+
+    m_str += "checksum\n"
+    m_str += "end"
+
+    m_str
+  end
+
+  # Generate code to call into the method and pass the arguments
+  def gen_call_str()
+    c_str = "m("
+
+    @pargs.each_with_index do |arg, i|
+      if !arg.key? :argval
+        next
+      end
+
+      if !c_str.end_with?("(")
+        c_str += ", "
+      end
+
+      c_str += "#{arg[:argval]}"
+    end
+
+    @kwargs.each_with_index do |arg, i|
+      if !arg.key? :argval
+        next
+      end
+
+      if !c_str.end_with?("(")
+        c_str += ", "
+      end
+
+      c_str += "#{arg[:name]}: #{arg[:argval]}"
+    end
+
+    c_str += ")"
+
+    # Randomly pass a block or not
+    if @block_arg
+      c_str += " { #{@block_arg} }"
+    end
+
+    c_str
+  end
+end
+
+iseqs_compiled_start = RubyVM::YJIT.runtime_stats[:compiled_iseq_entry]
+start_time = Time.now.to_f
+
+num_iters.times do |i|
+  puts "Iteration #{i}"
+
+  lst = ParamList.new()
+  m_str = lst.gen_method_str()
+  c_str = lst.gen_call_str()
+  checksum = lst.compute_checksum()
+
+  f = Object.new
+
+  # Define the method on f
+  puts "Defining"
+  p m_str
+  f.instance_eval(m_str)
+  #puts RubyVM::InstructionSequence.disasm(f.method(:m))
+  #exit 0
+
+  puts "Calling"
+  c_str = "f.#{c_str}"
+  p c_str
+  r = eval(c_str)
+  puts "checksum=#{r}"
+
+  if r != checksum
+    raise "return value #{r} doesn't match checksum #{checksum}"
+  end
+
+  puts ""
+end
+
+# Make sure that YJIT actually compiled the tests we ran
+# Should be run with --yjit-call-threshold=1
+iseqs_compiled_end = RubyVM::YJIT.runtime_stats[:compiled_iseq_entry]
+if iseqs_compiled_end - iseqs_compiled_start < num_iters
+  raise "YJIT did not compile enough ISEQs"
+end
+
+puts "Code region size: #{ format_number(0, RubyVM::YJIT.runtime_stats[:code_region_size]) }"
+
+end_time = Time.now.to_f
+itrs_per_sec = num_iters / (end_time - start_time)
+itrs_per_hour = 3600 * itrs_per_sec
+puts "#{'%.1f' % itrs_per_sec} iterations/s"
+puts "#{format_number(0, itrs_per_hour.round)} iterations/hour"
diff --git a/misc/call_fuzzer.sh b/misc/call_fuzzer.sh
new file mode 100755
index 00000000000000..cf4ec76fe825a6
--- /dev/null
+++ b/misc/call_fuzzer.sh
@@ -0,0 +1,13 @@
+# Stop at first error
+set -e
+
+# TODO
+# TODO: boost --num-iters to 1M+ for actual test
+# TODO
+export NUM_ITERS=25000
+
+# Enable code GC so we don't stop compiling when we hit the code size limit
+ruby --yjit-call-threshold=1 --yjit-code-gc misc/call_fuzzer.rb --num-iters=$NUM_ITERS
+
+# Do another pass with --verify-ctx
+ruby --yjit-call-threshold=1 --yjit-code-gc --yjit-verify-ctx misc/call_fuzzer.rb --num-iters=$NUM_ITERS
diff --git a/misc/expand_tabs.rb b/misc/expand_tabs.rb
index a94eea5046f123..d26568eefcd09c 100755
--- a/misc/expand_tabs.rb
+++ b/misc/expand_tabs.rb
@@ -59,53 +59,31 @@ def with_clean_env
 end
 
 DEFAULT_GEM_LIBS = %w[
-  abbrev
-  base64
-  benchmark
   bundler
-  cmath
-  csv
-  debug
   delegate
   did_you_mean
-  drb
   english
   erb
+  error_highlight
   fileutils
   find
   forwardable
-  getoptlong
   ipaddr
-  irb
-  logger
-  mutex_m
   net-http
   net-protocol
-  observer
   open3
   open-uri
   optparse
   ostruct
   pp
   prettyprint
-  prime
-  pstore
-  rdoc
-  readline
-  reline
+  prism
   resolv
-  resolv-replace
-  rexml
-  rinda
-  rss
   rubygems
-  scanf
   securerandom
-  set
   shellwords
   singleton
   tempfile
-  thwait
   time
   timeout
   tmpdir
@@ -117,27 +95,19 @@ def with_clean_env
 ]
 
 DEFAULT_GEM_EXTS = %w[
-  bigdecimal
-  cgi
   date
   digest
   etc
   fcntl
-  fiddle
   io-console
   io-nonblock
   io-wait
   json
-  nkf
   openssl
   pathname
   psych
-  racc
-  readline-ext
   stringio
   strscan
-  syslog
-  win32ole
   zlib
 ]
 
diff --git a/misc/lldb_cruby.py b/misc/lldb_cruby.py
old mode 100755
new mode 100644
index e667a466287ddf..b3d4fb509add14
--- a/misc/lldb_cruby.py
+++ b/misc/lldb_cruby.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 #coding: utf-8
 #
 # Usage: run `command script import -r misc/lldb_cruby.py` on LLDB
@@ -14,6 +13,7 @@
 import shlex
 import platform
 import glob
+import math
 
 from lldb_rb.constants import *
 
@@ -67,7 +67,7 @@ def vm_frame_magic(self, cfp):
         return self.VM_FRAME_MAGIC_NAME.get(frame_type, "(none)")
 
     def rb_iseq_path_str(self, iseq):
-        tRBasic = self.target.FindFirstType("struct RBasic").GetPointerType()
+        tRBasic = self.target.FindFirstType("::RBasic").GetPointerType()
 
         pathobj = iseq.GetValueForExpressionPath("->body->location.pathobj")
         pathobj = pathobj.Cast(tRBasic)
@@ -206,8 +206,7 @@ def string2cstr(rstring):
 
 def output_string(debugger, result, rstring):
     cptr, clen = string2cstr(rstring)
-    expr = "print *(const char (*)[%d])%0#x" % (clen, cptr)
-    append_command_output(debugger, expr, result)
+    append_expression(debugger, "*(const char (*)[%d])%0#x" % (clen, cptr), result)
 
 def fixnum_p(x):
     return x & RUBY_FIXNUM_FLAG != 0
@@ -226,6 +225,9 @@ def append_command_output(debugger, command, result):
     result.write(output1)
     result.write(output2)
 
+def append_expression(debugger, expression, result):
+    append_command_output(debugger, "expression " + expression, result)
+
 def lldb_rp(debugger, command, result, internal_dict):
     if not ('RUBY_Qfalse' in globals()):
         lldb_init(debugger)
@@ -257,18 +259,17 @@ def lldb_inspect(debugger, target, result, val):
     elif fixnum_p(num):
         print(num >> 1, file=result)
     elif flonum_p(num):
-        append_command_output(debugger, "print rb_float_value(%0#x)" % val.GetValueAsUnsigned(), result)
+        append_expression(debugger, "rb_float_value(%0#x)" % val.GetValueAsUnsigned(), result)
     elif static_sym_p(num):
         if num < 128:
             print("T_SYMBOL: %c" % num, file=result)
         else:
             print("T_SYMBOL: (%x)" % num, file=result)
-            append_command_output(debugger, "p rb_id2name(%0#x)" % (num >> 8), result)
+            append_expression(debugger, "rb_id2name(%0#x)" % (num >> 8), result)
     elif num & RUBY_IMMEDIATE_MASK:
         print('immediate(%x)' % num, file=result)
     else:
-        tRBasic = target.FindFirstType("struct RBasic").GetPointerType()
-        tRValue = target.FindFirstType("struct RVALUE")
+        tRBasic = target.FindFirstType("::RBasic").GetPointerType()
 
         val = val.Cast(tRBasic)
         flags = val.GetValueForExpressionPath("->flags").GetValueAsUnsigned()
@@ -291,13 +292,13 @@ def lldb_inspect(debugger, target, result, val):
             print('T_NIL: %s%s' % (flaginfo, val.Dereference()), file=result)
         elif flType == RUBY_T_OBJECT:
             result.write('T_OBJECT: %s' % flaginfo)
-            append_command_output(debugger, "print *(struct RObject*)%0#x" % val.GetValueAsUnsigned(), result)
+            append_expression(debugger, "*(struct RObject*)%0#x" % val.GetValueAsUnsigned(), result)
         elif flType == RUBY_T_CLASS or flType == RUBY_T_MODULE or flType == RUBY_T_ICLASS:
             result.write('T_%s: %s' % ('CLASS' if flType == RUBY_T_CLASS else 'MODULE' if flType == RUBY_T_MODULE else 'ICLASS', flaginfo))
-            append_command_output(debugger, "print *(struct RClass*)%0#x" % val.GetValueAsUnsigned(), result)
+            append_expression(debugger, "*(struct RClass*)%0#x" % val.GetValueAsUnsigned(), result)
             tRClass = target.FindFirstType("struct RClass")
             if not val.Cast(tRClass).GetChildMemberWithName("ptr").IsValid():
-                append_command_output(debugger, "print *(struct rb_classext_struct*)%0#x" % (val.GetValueAsUnsigned() + tRClass.GetByteSize()), result)
+                append_expression(debugger, "*(struct rb_classext_struct*)%0#x" % (val.GetValueAsUnsigned() + tRClass.GetByteSize()), result)
         elif flType == RUBY_T_STRING:
             result.write('T_STRING: %s' % flaginfo)
             encidx = ((flags & RUBY_ENCODING_MASK)>>RUBY_ENCODING_SHIFT)
@@ -311,12 +312,12 @@ def lldb_inspect(debugger, target, result, val):
             if len == 0:
                 result.write("(empty)\n")
             else:
-                append_command_output(debugger, "print *(const char (*)[%d])%0#x" % (len, ptr), result)
+                append_expression(debugger, "*(const char (*)[%d])%0#x" % (len, ptr), result)
         elif flType == RUBY_T_SYMBOL:
             result.write('T_SYMBOL: %s' % flaginfo)
             tRSymbol = target.FindFirstType("struct RSymbol").GetPointerType()
             val = val.Cast(tRSymbol)
-            append_command_output(debugger, 'print (ID)%0#x ' % val.GetValueForExpressionPath("->id").GetValueAsUnsigned(), result)
+            append_expression(debugger, '(ID)%0#x ' % val.GetValueForExpressionPath("->id").GetValueAsUnsigned(), result)
             tRString = target.FindFirstType("struct RString").GetPointerType()
             output_string(debugger, result, val.GetValueForExpressionPath("->fstr").Cast(tRString))
         elif flType == RUBY_T_ARRAY:
@@ -342,12 +343,12 @@ def lldb_inspect(debugger, target, result, val):
             else:
                 result.write("\n")
                 if ptr.GetValueAsSigned() == 0:
-                    append_command_output(debugger, "expression -fx -- ((struct RArray*)%0#x)->as.ary" % val.GetValueAsUnsigned(), result)
+                    append_expression(debugger, "-fx -- ((struct RArray*)%0#x)->as.ary" % val.GetValueAsUnsigned(), result)
                 else:
-                    append_command_output(debugger, "expression -Z %d -fx -- (const VALUE*)%0#x" % (len, ptr.GetValueAsUnsigned()), result)
+                    append_expression(debugger, "-Z %d -fx -- (const VALUE*)%0#x" % (len, ptr.GetValueAsUnsigned()), result)
         elif flType == RUBY_T_HASH:
             result.write("T_HASH: %s" % flaginfo)
-            append_command_output(debugger, "p *(struct RHash *) %0#x" % val.GetValueAsUnsigned(), result)
+            append_expression(debugger, "*(struct RHash *) %0#x" % val.GetValueAsUnsigned(), result)
         elif flType == RUBY_T_BIGNUM:
             tRBignum = target.FindFirstType("struct RBignum").GetPointerType()
             val = val.Cast(tRBignum)
@@ -355,15 +356,15 @@ def lldb_inspect(debugger, target, result, val):
             if flags & RUBY_FL_USER2:
                 len = ((flags & (RUBY_FL_USER3|RUBY_FL_USER4|RUBY_FL_USER5)) >> (RUBY_FL_USHIFT+3))
                 print("T_BIGNUM: sign=%s len=%d (embed)" % (sign, len), file=result)
-                append_command_output(debugger, "print ((struct RBignum *) %0#x)->as.ary" % val.GetValueAsUnsigned(), result)
+                append_expression(debugger, "((struct RBignum *) %0#x)->as.ary" % val.GetValueAsUnsigned(), result)
             else:
                 len = val.GetValueForExpressionPath("->as.heap.len").GetValueAsSigned()
                 print("T_BIGNUM: sign=%s len=%d" % (sign, len), file=result)
                 print(val.Dereference(), file=result)
-                append_command_output(debugger, "expression -Z %x -fx -- (const BDIGIT*)((struct RBignum*)%d)->as.heap.digits" % (len, val.GetValueAsUnsigned()), result)
-                # append_command_output(debugger, "x ((struct RBignum *) %0#x)->as.heap.digits / %d" % (val.GetValueAsUnsigned(), len), result)
+                append_expression(debugger, "-Z %x -fx -- (const BDIGIT*)((struct RBignum*)%d)->as.heap.digits" % (len, val.GetValueAsUnsigned()), result)
+                # append_expression(debugger, "((struct RBignum *) %0#x)->as.heap.digits / %d" % (val.GetValueAsUnsigned(), len), result)
         elif flType == RUBY_T_FLOAT:
-            append_command_output(debugger, "print ((struct RFloat *)%d)->float_value" % val.GetValueAsUnsigned(), result)
+            append_expression(debugger, "((struct RFloat *)%d)->float_value" % val.GetValueAsUnsigned(), result)
         elif flType == RUBY_T_RATIONAL:
             tRRational = target.FindFirstType("struct RRational").GetPointerType()
             val = val.Cast(tRRational)
@@ -396,39 +397,39 @@ def lldb_inspect(debugger, target, result, val):
             flag = val.GetValueForExpressionPath("->typed_flag")
             if flag.GetValueAsUnsigned() == 1:
                 print("T_DATA: %s" % val.GetValueForExpressionPath("->type->wrap_struct_name"), file=result)
-                append_command_output(debugger, "p *(struct RTypedData *) %0#x" % val.GetValueAsUnsigned(), result)
+                append_expression(debugger, "*(struct RTypedData *) %0#x" % val.GetValueAsUnsigned(), result)
             else:
                 print("T_DATA:", file=result)
-                append_command_output(debugger, "p *(struct RData *) %0#x" % val.GetValueAsUnsigned(), result)
+                append_expression(debugger, "*(struct RData *) %0#x" % val.GetValueAsUnsigned(), result)
         elif flType == RUBY_T_NODE:
             tRTypedData = target.FindFirstType("struct RNode").GetPointerType()
             nd_type = (flags & RUBY_NODE_TYPEMASK) >> RUBY_NODE_TYPESHIFT
-            append_command_output(debugger, "p (node_type) %d" % nd_type, result)
+            append_expression(debugger, "(node_type) %d" % nd_type, result)
             val = val.Cast(tRTypedData)
-            append_command_output(debugger, "p *(struct RNode *) %0#x" % val.GetValueAsUnsigned(), result)
+            append_expression(debugger, "*(struct RNode *) %0#x" % val.GetValueAsUnsigned(), result)
         elif flType == RUBY_T_MOVED:
             tRTypedData = target.FindFirstType("struct RMoved").GetPointerType()
             val = val.Cast(tRTypedData)
-            append_command_output(debugger, "p *(struct RMoved *) %0#x" % val.GetValueAsUnsigned(), result)
+            append_expression(debugger, "*(struct RMoved *) %0#x" % val.GetValueAsUnsigned(), result)
         elif flType == RUBY_T_MATCH:
             tRTypedData = target.FindFirstType("struct RMatch").GetPointerType()
             val = val.Cast(tRTypedData)
-            append_command_output(debugger, "p *(struct RMatch *) %0#x" % val.GetValueAsUnsigned(), result)
+            append_expression(debugger, "*(struct RMatch *) %0#x" % val.GetValueAsUnsigned(), result)
         elif flType == RUBY_T_IMEMO:
             # I'm not sure how to get IMEMO_MASK out of lldb. It's not in globals()
             imemo_type = (flags >> RUBY_FL_USHIFT) & 0x0F # IMEMO_MASK
 
             print("T_IMEMO: ", file=result)
-            append_command_output(debugger, "p (enum imemo_type) %d" % imemo_type, result)
-            append_command_output(debugger, "p *(struct MEMO *) %0#x" % val.GetValueAsUnsigned(), result)
+            append_expression(debugger, "(enum imemo_type) %d" % imemo_type, result)
+            append_expression(debugger, "*(struct MEMO *) %0#x" % val.GetValueAsUnsigned(), result)
         elif flType == RUBY_T_STRUCT:
             tRTypedData = target.FindFirstType("struct RStruct").GetPointerType()
             val = val.Cast(tRTypedData)
-            append_command_output(debugger, "p *(struct RStruct *) %0#x" % val.GetValueAsUnsigned(), result)
+            append_expression(debugger, "*(struct RStruct *) %0#x" % val.GetValueAsUnsigned(), result)
         elif flType == RUBY_T_ZOMBIE:
             tRZombie = target.FindFirstType("struct RZombie").GetPointerType()
             val = val.Cast(tRZombie)
-            append_command_output(debugger, "p *(struct RZombie *) %0#x" % val.GetValueAsUnsigned(), result)
+            append_expression(debugger, "*(struct RZombie *) %0#x" % val.GetValueAsUnsigned(), result)
         else:
             print("Not-handled type %0#x" % flType, file=result)
             print(val, file=result)
@@ -522,10 +523,11 @@ def rb_backtrace(debugger, command, result, internal_dict):
     bt.print_bt(val)
 
 def dump_bits(target, result, page, object_address, end = "\n"):
-    tRValue = target.FindFirstType("struct RVALUE")
+    slot_size = page.GetChildMemberWithName("heap").GetChildMemberWithName("slot_size").unsigned
+    byte_size = 40 ** math.floor(math.log(slot_size, 40))
     tUintPtr = target.FindFirstType("uintptr_t") # bits_t
 
-    num_in_page = (object_address & HEAP_PAGE_ALIGN_MASK) // tRValue.GetByteSize();
+    num_in_page = (object_address & HEAP_PAGE_ALIGN_MASK) // byte_size;
     bits_bitlength = tUintPtr.GetByteSize() * 8
     bitmap_index = num_in_page // bits_bitlength
     bitmap_offset = num_in_page & (bits_bitlength - 1)
@@ -545,10 +547,9 @@ def __init__(self, page, target):
         self.target = target
         self.start = page.GetChildMemberWithName('start').GetValueAsUnsigned();
         self.num_slots = page.GetChildMemberWithName('total_slots').unsigned
-        self.slot_size = page.GetChildMemberWithName('size_pool').GetChildMemberWithName('slot_size').unsigned
+        self.slot_size = page.GetChildMemberWithName('heap').GetChildMemberWithName('slot_size').unsigned
         self.counter = 0
-        self.tRBasic = target.FindFirstType("struct RBasic")
-        self.tRValue = target.FindFirstType("struct RVALUE")
+        self.tRBasic = target.FindFirstType("::RBasic")
 
     def is_valid(self):
         heap_page_header_size = self.target.FindFirstType("struct heap_page_header").GetByteSize()
@@ -580,14 +581,13 @@ def dump_page_internal(page, target, process, thread, frame, result, debugger, h
 
     freelist = []
     fl_start = page.GetChildMemberWithName('freelist').GetValueAsUnsigned()
-    tRVALUE = target.FindFirstType("struct RVALUE")
+    free_slot = target.FindFirstType("struct free_slot")
 
     while fl_start > 0:
         freelist.append(fl_start)
         obj_addr = lldb.SBAddress(fl_start, target)
-        obj = target.CreateValueFromAddress("object", obj_addr, tRVALUE)
-        fl_start = obj.GetChildMemberWithName("as").GetChildMemberWithName("free").GetChildMemberWithName("next").GetValueAsUnsigned()
-
+        obj = target.CreateValueFromAddress("object", obj_addr, free_slot)
+        fl_start = obj.GetChildMemberWithName("next").GetValueAsUnsigned()
 
     page_iter = HeapPageIter(page, target)
     if page_iter.is_valid():
diff --git a/misc/lldb_rb/commands/heap_page_command.py b/misc/lldb_rb/commands/heap_page_command.py
index edb74a415bf1bc..2eed3c3beee1e6 100644
--- a/misc/lldb_rb/commands/heap_page_command.py
+++ b/misc/lldb_rb/commands/heap_page_command.py
@@ -8,14 +8,15 @@ class HeapPageCommand(RbBaseCommand):
     help_string = "prints out 'struct heap_page' for a VALUE pointer in the page"
 
     def call(self, debugger, command, exe_ctx, result):
+        self.result = result
         self.t_heap_page_body = self.target.FindFirstType("struct heap_page_body")
         self.t_heap_page_ptr = self.target.FindFirstType("struct heap_page").GetPointerType()
 
         page = self._get_page(self.frame.EvaluateExpression(command))
         page.Cast(self.t_heap_page_ptr)
 
-        self._append_command_output(debugger, "p (struct heap_page *) %0#x" % page.GetValueAsUnsigned(), result)
-        self._append_command_output(debugger, "p *(struct heap_page *) %0#x" % page.GetValueAsUnsigned(), result)
+        self._append_expression("(struct heap_page *) %0#x" % page.GetValueAsUnsigned())
+        self._append_expression("*(struct heap_page *) %0#x" % page.GetValueAsUnsigned())
 
     def _get_page(self, val):
         addr = val.GetValueAsUnsigned()
diff --git a/misc/lldb_rb/commands/print_flags_command.py b/misc/lldb_rb/commands/print_flags_command.py
index 00da4834bf0f05..bc494ae01a1b7e 100644
--- a/misc/lldb_rb/commands/print_flags_command.py
+++ b/misc/lldb_rb/commands/print_flags_command.py
@@ -11,13 +11,13 @@ class PrintFlagsCommand(RbBaseCommand):
 
     # call is where our command logic will be implemented
     def call(self, debugger, command, exe_ctx, result):
-        rclass_t = self.target.FindFirstType("struct RBasic")
+        rclass_t = self.target.FindFirstType("::RBasic")
         rcass_ptr = self.target.EvaluateExpression(command).Cast(rclass_t.GetPointerType())
         obj_flags = rcass_ptr.GetValueForExpressionPath("->flags").GetValueAsUnsigned()
 
         flags = [
-            "RUBY_FL_WB_PROTECTED", "RUBY_FL_PROMOTED0", "RUBY_FL_PROMOTED1", "RUBY_FL_FINALIZE",
-            "RUBY_FL_SHAREABLE", "RUBY_FL_EXIVAR", "RUBY_FL_FREEZE",
+            "RUBY_FL_WB_PROTECTED", "RUBY_FL_PROMOTED", "RUBY_FL_FINALIZE",
+            "RUBY_FL_SHAREABLE", "RUBY_FL_FREEZE",
             "RUBY_FL_USER0", "RUBY_FL_USER1", "RUBY_FL_USER2", "RUBY_FL_USER3", "RUBY_FL_USER4",
             "RUBY_FL_USER5", "RUBY_FL_USER6", "RUBY_FL_USER7", "RUBY_FL_USER8", "RUBY_FL_USER9",
             "RUBY_FL_USER10", "RUBY_FL_USER11", "RUBY_FL_USER12", "RUBY_FL_USER13", "RUBY_FL_USER14",
diff --git a/misc/lldb_rb/commands/rp_command.py b/misc/lldb_rb/commands/rp_command.py
index 9da9688b96696e..06b2516d505b83 100644
--- a/misc/lldb_rb/commands/rp_command.py
+++ b/misc/lldb_rb/commands/rp_command.py
@@ -13,4 +13,3 @@ def call(self, debugger, command, exe_ctx, result):
         val = self.frame.EvaluateExpression(command)
         inspector = RbInspector(debugger, result, self.ruby_globals)
         inspector.inspect(val)
-
diff --git a/misc/lldb_rb/lldb_interface.py b/misc/lldb_rb/lldb_interface.py
index 893064db90779c..25930b2e16eb23 100644
--- a/misc/lldb_rb/lldb_interface.py
+++ b/misc/lldb_rb/lldb_interface.py
@@ -6,3 +6,13 @@ def build_environment(self, debugger):
         self.thread = self.process.GetSelectedThread()
         self.frame = self.thread.GetSelectedFrame()
 
+    def _append_command_output(self, command):
+        output1 = self.result.GetOutput()
+        self.debugger.GetCommandInterpreter().HandleCommand(command, self.result)
+        output2 = self.result.GetOutput()
+        self.result.Clear()
+        self.result.write(output1)
+        self.result.write(output2)
+
+    def _append_expression(self, expression):
+        self._append_command_output("expression " + expression)
diff --git a/misc/lldb_rb/rb_base_command.py b/misc/lldb_rb/rb_base_command.py
index 23c628971e0c04..70a5addd6df5fc 100644
--- a/misc/lldb_rb/rb_base_command.py
+++ b/misc/lldb_rb/rb_base_command.py
@@ -55,4 +55,3 @@ def get_short_help(self):
 
     def get_long_help(self):
         return self.__class__.help_string
-
diff --git a/misc/lldb_rb/rb_heap_structs.py b/misc/lldb_rb/rb_heap_structs.py
index 0428b7fc3fdd4b..798b838080a1ab 100644
--- a/misc/lldb_rb/rb_heap_structs.py
+++ b/misc/lldb_rb/rb_heap_structs.py
@@ -1,4 +1,5 @@
 import lldb
+import math
 from lldb_rb.lldb_interface import LLDBInterface
 from lldb_rb.constants import *
 
@@ -50,8 +51,7 @@ def __init__(self, ptr, debugger, ruby_globals):
         self.flUser9 = self.ruby_globals["RUBY_FL_USER9"]
         self.flUshift = self.ruby_globals["RUBY_FL_USHIFT"]
 
-        self.tRBasic = self.target.FindFirstType("struct RBasic").GetPointerType()
-        self.tRValue = self.target.FindFirstType("struct RVALUE")
+        self.tRBasic = self.target.FindFirstType("::RBasic").GetPointerType()
 
         self.val = ptr.Cast(self.tRBasic)
         self.page = HeapPage(self.debugger, self.val)
@@ -70,10 +70,12 @@ def check_bits(self, bitmap_name, bitmap_index, bitmap_bit, v):
             return ' '
 
     def dump_bits(self, result, end = "\n"):
-        tRValue = self.target.FindFirstType("struct RVALUE")
         tUintPtr = self.target.FindFirstType("uintptr_t") # bits_t
 
-        num_in_page = (self.val.GetValueAsUnsigned() & HEAP_PAGE_ALIGN_MASK) // tRValue.GetByteSize();
+        slot_size = self.page.to_heap_page_struct().GetChildMemberWithName("heap").GetChildMemberWithName("slot_size").unsigned
+        byte_size = 40 ** math.floor(math.log(slot_size, 40))
+
+        num_in_page = (self.val.GetValueAsUnsigned() & HEAP_PAGE_ALIGN_MASK) // byte_size;
         bits_bitlength = tUintPtr.GetByteSize() * 8
         bitmap_index = num_in_page // bits_bitlength
         bitmap_offset = num_in_page & (bits_bitlength - 1)
@@ -108,11 +110,22 @@ def is_type(self, type_name):
         else:
             return False
 
+    def as_type(self, type_name):
+        if type_name == "array":
+            tRarray = self.target.FindFirstType("struct RArray")
+            return self.val.Cast(tRarray.GetPointerType())
+        elif type_name == "bignum":
+            tRbignum = self.target.FindFirstType("struct RBignum")
+            return self.val.Cast(tRbignum.GetPointerType())
+        else:
+            print("as_type is not implemented for:", type_name)
+
     def ary_ptr(self):
+        rval = self.as_type("array")
         if self.flags & self.ruby_globals["RUBY_FL_USER1"]:
-            ptr = self.val.GetValueForExpressionPath("->as.ary")
+            ptr = rval.GetValueForExpressionPath("->as.ary")
         else:
-            ptr = self.val.GetValueForExpressionPath("->as.heap.ptr")
+            ptr = rval.GetValueForExpressionPath("->as.heap.ptr")
         return ptr
 
     def ary_len(self):
@@ -122,19 +135,18 @@ def ary_len(self):
                self.flUser7 | self.flUser8 | self.flUser9)
               ) >> (self.flUshift + 3))
         else:
-            len = self.val.GetValueForExpressionPath("->as.heap.len")
+            rval = self.as_type("array")
+            len = rval.GetValueForExpressionPath("->as.heap.len").GetValueAsSigned()
 
         return len
 
     def bignum_len(self):
-        if self.flags & flUser2:
+        if self.flags & self.flUser2:
             len = ((self.flags &
               (self.flUser3 | self.flUser4 | self.flUser5)
               ) >> (self.flUshift + 3))
         else:
-            len = self.val.GetValueForExpressionPath("->as.heap.len")
+            len = (self.as_type("bignum").GetValueForExpressionPath("->as.heap.len").
+                   GetValueAsUnsigned())
 
         return len
-
-
-
diff --git a/misc/lldb_rb/utils.py b/misc/lldb_rb/utils.py
index bd2c0330b8e6e8..f4775bc4f97774 100644
--- a/misc/lldb_rb/utils.py
+++ b/misc/lldb_rb/utils.py
@@ -8,14 +8,6 @@ def __init__(self, debugger, result, ruby_globals):
         self.result = result
         self.ruby_globals = ruby_globals
 
-    def _append_command_output(self, command):
-        output1 = self.result.GetOutput()
-        self.debugger.GetCommandInterpreter().HandleCommand(command, self.result)
-        output2 = self.result.GetOutput()
-        self.result.Clear()
-        self.result.write(output1)
-        self.result.write(output2)
-
     def string2cstr(self, rstring):
         """Returns the pointer to the C-string in the given String object"""
         if rstring.TypeIsPointerType():
@@ -32,8 +24,7 @@ def string2cstr(self, rstring):
 
     def output_string(self, rstring):
         cptr, clen = self.string2cstr(rstring)
-        expr = "print *(const char (*)[%d])%0#x" % (clen, cptr)
-        self._append_command_output(expr)
+        self._append_expression("*(const char (*)[%d])%0#x" % (clen, cptr))
 
     def fixnum_p(self, x):
         return x & self.ruby_globals["RUBY_FIXNUM_FLAG"] != 0
@@ -49,7 +40,7 @@ def static_sym_p(self, x):
     def generic_inspect(self, val, rtype):
         tRType = self.target.FindFirstType("struct %s" % rtype).GetPointerType()
         val = val.Cast(tRType)
-        self._append_command_output("p *(struct %s *) %0#x" % (rtype, val.GetValueAsUnsigned()))
+        self._append_expression("*(struct %s *) %0#x" % (rtype, val.GetValueAsUnsigned()))
 
     def inspect(self, val):
         rbTrue  = self.ruby_globals["RUBY_Qtrue"]
@@ -58,6 +49,9 @@ def inspect(self, val):
         rbUndef = self.ruby_globals["RUBY_Qundef"]
         rbImmediateMask = self.ruby_globals["RUBY_IMMEDIATE_MASK"]
 
+        if self.inspect_node(val):
+            return
+
         num = val.GetValueAsSigned()
         if num == rbFalse:
             print('false', file=self.result)
@@ -70,13 +64,13 @@ def inspect(self, val):
         elif self.fixnum_p(num):
             print(num >> 1, file=self.result)
         elif self.flonum_p(num):
-            self._append_command_output("print rb_float_value(%0#x)" % val.GetValueAsUnsigned())
+            self._append_expression("rb_float_value(%0#x)" % val.GetValueAsUnsigned())
         elif self.static_sym_p(num):
             if num < 128:
                 print("T_SYMBOL: %c" % num, file=self.result)
             else:
                 print("T_SYMBOL: (%x)" % num, file=self.result)
-                self._append_command_output("p rb_id2name(%0#x)" % (num >> 8))
+                self._append_expression("rb_id2name(%0#x)" % (num >> 8))
 
         elif num & rbImmediateMask:
             print('immediate(%x)' % num, file=self.result)
@@ -98,7 +92,7 @@ def inspect(self, val):
 
             elif rval.is_type("RUBY_T_OBJECT"):
                 self.result.write('T_OBJECT: %s' % flaginfo)
-                self._append_command_output("print *(struct RObject*)%0#x" % val.GetValueAsUnsigned())
+                self._append_expression("*(struct RObject*)%0#x" % val.GetValueAsUnsigned())
 
             elif (rval.is_type("RUBY_T_CLASS") or
                   rval.is_type("RUBY_T_MODULE") or
@@ -106,10 +100,10 @@ def inspect(self, val):
                 self.result.write('T_%s: %s' % (rval.type_name.split('_')[-1], flaginfo))
                 tRClass = self.target.FindFirstType("struct RClass")
 
-                self._append_command_output("print *(struct RClass*)%0#x" % val.GetValueAsUnsigned())
+                self._append_expression("*(struct RClass*)%0#x" % val.GetValueAsUnsigned())
                 if not val.Cast(tRClass).GetChildMemberWithName("ptr").IsValid():
-                    self._append_command_output(
-                        "print *(struct rb_classext_struct*)%0#x" %
+                    self._append_expression(
+                        "*(struct rb_classext_struct*)%0#x" %
                         (val.GetValueAsUnsigned() + tRClass.GetByteSize())
                     )
 
@@ -117,6 +111,10 @@ def inspect(self, val):
                 self.result.write('T_STRING: %s' % flaginfo)
                 tRString = self.target.FindFirstType("struct RString").GetPointerType()
 
+                chilled = self.ruby_globals["RUBY_FL_USER3"]
+                if (rval.flags & chilled) != 0:
+                    self.result.write("[CHILLED] ")
+
                 rb_enc_mask = self.ruby_globals["RUBY_ENCODING_MASK"]
                 rb_enc_shift = self.ruby_globals["RUBY_ENCODING_SHIFT"]
                 encidx = ((rval.flags & rb_enc_mask) >> rb_enc_shift)
@@ -129,11 +127,21 @@ def inspect(self, val):
                 else:
                     self.result.write('[enc=%d] ' % encidx)
 
+                coderange = rval.flags & self.ruby_globals["RUBY_ENC_CODERANGE_MASK"]
+                if coderange == self.ruby_globals["RUBY_ENC_CODERANGE_7BIT"]:
+                    self.result.write('[7BIT] ')
+                elif coderange == self.ruby_globals["RUBY_ENC_CODERANGE_VALID"]:
+                    self.result.write('[VALID] ')
+                elif coderange == self.ruby_globals["RUBY_ENC_CODERANGE_BROKEN"]:
+                    self.result.write('[BROKEN] ')
+                else:
+                    self.result.write('[UNKNOWN] ')
+
                 ptr, len = self.string2cstr(val.Cast(tRString))
                 if len == 0:
                     self.result.write("(empty)\n")
                 else:
-                    self._append_command_output("print *(const char (*)[%d])%0#x" % (len, ptr))
+                    self._append_expression("*(const char (*)[%d])%0#x" % (len, ptr))
 
             elif rval.is_type("RUBY_T_SYMBOL"):
                 self.result.write('T_SYMBOL: %s' % flaginfo)
@@ -141,12 +149,10 @@ def inspect(self, val):
                 tRString = self.target.FindFirstType("struct RString").GetPointerType()
 
                 val = val.Cast(tRSymbol)
-                self._append_command_output(
-                        'print (ID)%0#x ' % val.GetValueForExpressionPath("->id").GetValueAsUnsigned())
+                self._append_expression('(ID)%0#x ' % val.GetValueForExpressionPath("->id").GetValueAsUnsigned())
                 self.output_string(val.GetValueForExpressionPath("->fstr").Cast(tRString))
 
             elif rval.is_type("RUBY_T_ARRAY"):
-                tRArray = self.target.FindFirstType("struct RArray").GetPointerType()
                 len = rval.ary_len()
                 ptr = rval.ary_ptr()
 
@@ -165,19 +171,20 @@ def inspect(self, val):
                 else:
                     self.result.write("\n")
                     if ptr.GetValueAsSigned() == 0:
-                        self._append_command_output(
-                                "expression -fx -- ((struct RArray*)%0#x)->as.ary" % val.GetValueAsUnsigned())
+                        self._append_expression("-fx -- ((struct RArray*)%0#x)->as.ary" % val.GetValueAsUnsigned())
                     else:
-                        self._append_command_output(
-                                "expression -Z %d -fx -- (const VALUE*)%0#x" % (len, ptr.GetValueAsUnsigned()))
+                        self._append_expression("-Z %d -fx -- (const VALUE*)%0#x" % (len, ptr.GetValueAsUnsigned()))
 
             elif rval.is_type("RUBY_T_HASH"):
                 self.result.write("T_HASH: %s" % flaginfo)
-                self._append_command_output("p *(struct RHash *) %0#x" % val.GetValueAsUnsigned())
+                ptr = val.GetValueAsUnsigned()
+                self._append_expression("*(struct RHash *) %0#x" % ptr)
+                if rval.flags & self.ruby_globals["RUBY_FL_USER3"]:
+                    self._append_expression("*(struct st_table *) (%0#x + sizeof(struct RHash))" % ptr)
+                else:
+                    self._append_expression("*(struct ar_table *) (%0#x + sizeof(struct RHash))" % ptr)
 
             elif rval.is_type("RUBY_T_BIGNUM"):
-                tRBignum = self.target.FindFirstType("struct RBignum").GetPointerType()
-
                 sign = '-'
                 if (rval.flags & self.ruby_globals["RUBY_FL_USER1"]) != 0:
                     sign = '+'
@@ -185,17 +192,16 @@ def inspect(self, val):
 
                 if rval.flags & self.ruby_globals["RUBY_FL_USER2"]:
                     print("T_BIGNUM: sign=%s len=%d (embed)" % (sign, len), file=self.result)
-                    self._append_command_output("print ((struct RBignum *) %0#x)->as.ary"
+                    self._append_expression("((struct RBignum *) %0#x)->as.ary"
                                                 % val.GetValueAsUnsigned())
                 else:
                     print("T_BIGNUM: sign=%s len=%d" % (sign, len), file=self.result)
-                    print(val.Dereference(), file=self.result)
-                    self._append_command_output(
-                            "expression -Z %x -fx -- (const BDIGIT*)((struct RBignum*)%d)->as.heap.digits" %
-                            (len, val.GetValueAsUnsigned()))
+                    print(rval.as_type("bignum"), file=self.result)
+                    self._append_expression("-Z %d -fx -- ((struct RBignum*)%d)->as.heap.digits" %
+                                            (len, val.GetValueAsUnsigned()))
 
             elif rval.is_type("RUBY_T_FLOAT"):
-                self._append_command_output("print ((struct RFloat *)%d)->float_value"
+                self._append_expression("((struct RFloat *)%d)->float_value"
                                             % val.GetValueAsUnsigned())
 
             elif rval.is_type("RUBY_T_RATIONAL"):
@@ -236,31 +242,18 @@ def inspect(self, val):
                     print("T_DATA: %s" %
                           val.GetValueForExpressionPath("->type->wrap_struct_name"),
                           file=self.result)
-                    self._append_command_output(
-                            "p *(struct RTypedData *) %0#x" % val.GetValueAsUnsigned())
+                    self._append_expression("*(struct RTypedData *) %0#x" % val.GetValueAsUnsigned())
                 else:
                     print("T_DATA:", file=self.result)
-                    self._append_command_output(
-                            "p *(struct RData *) %0#x" % val.GetValueAsUnsigned())
-
-            elif rval.is_type("RUBY_T_NODE"):
-                tRNode = self.target.FindFirstType("struct RNode").GetPointerType()
-                rbNodeTypeMask = self.ruby_globals["RUBY_NODE_TYPEMASK"]
-                rbNodeTypeShift = self.ruby_globals["RUBY_NODE_TYPESHIFT"]
-
-                nd_type = (rval.flags & rbNodeTypeMask) >> rbNodeTypeShift
-                val = val.Cast(tRNode)
-
-                self._append_command_output("p (node_type) %d" % nd_type)
-                self._append_command_output("p *(struct RNode *) %0#x" % val.GetValueAsUnsigned())
+                    self._append_expression("*(struct RData *) %0#x" % val.GetValueAsUnsigned())
 
             elif rval.is_type("RUBY_T_IMEMO"):
                 imemo_type = ((rval.flags >> self.ruby_globals["RUBY_FL_USHIFT"])
                               & IMEMO_MASK)
                 print("T_IMEMO: ", file=self.result)
 
-                self._append_command_output("p (enum imemo_type) %d" % imemo_type)
-                self._append_command_output("p *(struct MEMO *) %0#x" % val.GetValueAsUnsigned())
+                self._append_expression("(enum imemo_type) %d" % imemo_type)
+                self._append_expression("*(struct MEMO *) %0#x" % val.GetValueAsUnsigned())
 
             elif rval.is_type("RUBY_T_FILE"):
                 self.generic_inspect(val, "RFile")
@@ -281,3 +274,229 @@ def inspect(self, val):
                 print("Not-handled type %0#x" % rval.type, file=self.result)
                 print(val, file=self.result)
 
+    def inspect_node(self, val):
+        tRNode = self.target.FindFirstType("struct RNode").GetPointerType()
+
+        # if val.GetType() != tRNode: does not work for unknown reason
+
+        if val.GetType().GetPointeeType().name != "NODE":
+            return False
+
+        rbNodeTypeMask = self.ruby_globals["RUBY_NODE_TYPEMASK"]
+        rbNodeTypeShift = self.ruby_globals["RUBY_NODE_TYPESHIFT"]
+        flags = val.Cast(tRNode).GetChildMemberWithName("flags").GetValueAsUnsigned()
+        nd_type = (flags & rbNodeTypeMask) >> rbNodeTypeShift
+
+        self._append_expression("(node_type) %d" % nd_type)
+
+        if nd_type == self.ruby_globals["NODE_SCOPE"]:
+            self._append_expression("*(rb_node_scope_t *) %0#x" % val.GetValueAsUnsigned())
+        elif nd_type == self.ruby_globals["NODE_BLOCK"]:
+            self._append_expression("*(rb_node_block_t *) %0#x" % val.GetValueAsUnsigned())
+        elif nd_type == self.ruby_globals["NODE_IF"]:
+            self._append_expression("*(rb_node_if_t *) %0#x" % val.GetValueAsUnsigned())
+        elif nd_type == self.ruby_globals["NODE_UNLESS"]:
+            self._append_expression("*(rb_node_unless_t *) %0#x" % val.GetValueAsUnsigned())
+        elif nd_type == self.ruby_globals["NODE_CASE"]:
+            self._append_expression("*(rb_node_case_t *) %0#x" % val.GetValueAsUnsigned())
+        elif nd_type == self.ruby_globals["NODE_CASE2"]:
+            self._append_expression("*(rb_node_case2_t *) %0#x" % val.GetValueAsUnsigned())
+        elif nd_type == self.ruby_globals["NODE_CASE3"]:
+            self._append_expression("*(rb_node_case3_t *) %0#x" % val.GetValueAsUnsigned())
+        elif nd_type == self.ruby_globals["NODE_WHEN"]:
+            self._append_expression("*(rb_node_when_t *) %0#x" % val.GetValueAsUnsigned())
+        elif nd_type == self.ruby_globals["NODE_IN"]:
+            self._append_expression("*(rb_node_in_t *) %0#x" % val.GetValueAsUnsigned())
+        elif nd_type == self.ruby_globals["NODE_WHILE"]:
+            self._append_expression("*(rb_node_while_t *) %0#x" % val.GetValueAsUnsigned())
+        elif nd_type == self.ruby_globals["NODE_UNTIL"]:
+            self._append_expression("*(rb_node_until_t *) %0#x" % val.GetValueAsUnsigned())
+        elif nd_type == self.ruby_globals["NODE_ITER"]:
+            self._append_expression("*(rb_node_iter_t *) %0#x" % val.GetValueAsUnsigned())
+        elif nd_type == self.ruby_globals["NODE_FOR"]:
+            self._append_expression("*(rb_node_for_t *) %0#x" % val.GetValueAsUnsigned())
+        elif nd_type == self.ruby_globals["NODE_FOR_MASGN"]:
+            self._append_expression("*(rb_node_for_masgn_t *) %0#x" % val.GetValueAsUnsigned())
+        elif nd_type == self.ruby_globals["NODE_BREAK"]:
+            self._append_expression("*(rb_node_break_t *) %0#x" % val.GetValueAsUnsigned())
+        elif nd_type == self.ruby_globals["NODE_NEXT"]:
+            self._append_expression("*(rb_node_next_t *) %0#x" % val.GetValueAsUnsigned())
+        elif nd_type == self.ruby_globals["NODE_REDO"]:
+            self._append_expression("*(rb_node_redo_t *) %0#x" % val.GetValueAsUnsigned())
+        elif nd_type == self.ruby_globals["NODE_RETRY"]:
+            self._append_expression("*(rb_node_retry_t *) %0#x" % val.GetValueAsUnsigned())
+        elif nd_type == self.ruby_globals["NODE_BEGIN"]:
+            self._append_expression("*(rb_node_begin_t *) %0#x" % val.GetValueAsUnsigned())
+        elif nd_type == self.ruby_globals["NODE_RESCUE"]:
+            self._append_expression("*(rb_node_rescue_t *) %0#x" % val.GetValueAsUnsigned())
+        elif nd_type == self.ruby_globals["NODE_RESBODY"]:
+            self._append_expression("*(rb_node_resbody_t *) %0#x" % val.GetValueAsUnsigned())
+        elif nd_type == self.ruby_globals["NODE_ENSURE"]:
+            self._append_expression("*(rb_node_ensure_t *) %0#x" % val.GetValueAsUnsigned())
+        elif nd_type == self.ruby_globals["NODE_AND"]:
+            self._append_expression("*(rb_node_and_t *) %0#x" % val.GetValueAsUnsigned())
+        elif nd_type == self.ruby_globals["NODE_OR"]:
+            self._append_expression("*(rb_node_or_t *) %0#x" % val.GetValueAsUnsigned())
+        elif nd_type == self.ruby_globals["NODE_MASGN"]:
+            self._append_expression("*(rb_node_masgn_t *) %0#x" % val.GetValueAsUnsigned())
+        elif nd_type == self.ruby_globals["NODE_LASGN"]:
+            self._append_expression("*(rb_node_lasgn_t *) %0#x" % val.GetValueAsUnsigned())
+        elif nd_type == self.ruby_globals["NODE_DASGN"]:
+            self._append_expression("*(rb_node_dasgn_t *) %0#x" % val.GetValueAsUnsigned())
+        elif nd_type == self.ruby_globals["NODE_GASGN"]:
+            self._append_expression("*(rb_node_gasgn_t *) %0#x" % val.GetValueAsUnsigned())
+        elif nd_type == self.ruby_globals["NODE_IASGN"]:
+            self._append_expression("*(rb_node_iasgn_t *) %0#x" % val.GetValueAsUnsigned())
+        elif nd_type == self.ruby_globals["NODE_CDECL"]:
+            self._append_expression("*(rb_node_cdecl_t *) %0#x" % val.GetValueAsUnsigned())
+        elif nd_type == self.ruby_globals["NODE_CVASGN"]:
+            self._append_expression("*(rb_node_cvasgn_t *) %0#x" % val.GetValueAsUnsigned())
+        elif nd_type == self.ruby_globals["NODE_OP_ASGN1"]:
+            self._append_expression("*(rb_node_op_asgn1_t *) %0#x" % val.GetValueAsUnsigned())
+        elif nd_type == self.ruby_globals["NODE_OP_ASGN2"]:
+            self._append_expression("*(rb_node_op_asgn2_t *) %0#x" % val.GetValueAsUnsigned())
+        elif nd_type == self.ruby_globals["NODE_OP_ASGN_AND"]:
+            self._append_expression("*(rb_node_op_asgn_and_t *) %0#x" % val.GetValueAsUnsigned())
+        elif nd_type == self.ruby_globals["NODE_OP_ASGN_OR"]:
+            self._append_expression("*(rb_node_op_asgn_or_t *) %0#x" % val.GetValueAsUnsigned())
+        elif nd_type == self.ruby_globals["NODE_OP_CDECL"]:
+            self._append_expression("*(rb_node_op_cdecl_t *) %0#x" % val.GetValueAsUnsigned())
+        elif nd_type == self.ruby_globals["NODE_CALL"]:
+            self._append_expression("*(rb_node_call_t *) %0#x" % val.GetValueAsUnsigned())
+        elif nd_type == self.ruby_globals["NODE_OPCALL"]:
+            self._append_expression("*(rb_node_opcall_t *) %0#x" % val.GetValueAsUnsigned())
+        elif nd_type == self.ruby_globals["NODE_FCALL"]:
+            self._append_expression("*(rb_node_fcall_t *) %0#x" % val.GetValueAsUnsigned())
+        elif nd_type == self.ruby_globals["NODE_VCALL"]:
+            self._append_expression("*(rb_node_vcall_t *) %0#x" % val.GetValueAsUnsigned())
+        elif nd_type == self.ruby_globals["NODE_QCALL"]:
+            self._append_expression("*(rb_node_qcall_t *) %0#x" % val.GetValueAsUnsigned())
+        elif nd_type == self.ruby_globals["NODE_SUPER"]:
+            self._append_expression("*(rb_node_super_t *) %0#x" % val.GetValueAsUnsigned())
+        elif nd_type == self.ruby_globals["NODE_ZSUPER"]:
+            self._append_expression("*(rb_node_zsuper_t *) %0#x" % val.GetValueAsUnsigned())
+        elif nd_type == self.ruby_globals["NODE_LIST"]:
+            self._append_expression("*(rb_node_list_t *) %0#x" % val.GetValueAsUnsigned())
+        elif nd_type == self.ruby_globals["NODE_ZLIST"]:
+            self._append_expression("*(rb_node_zlist_t *) %0#x" % val.GetValueAsUnsigned())
+        elif nd_type == self.ruby_globals["NODE_HASH"]:
+            self._append_expression("*(rb_node_hash_t *) %0#x" % val.GetValueAsUnsigned())
+        elif nd_type == self.ruby_globals["NODE_RETURN"]:
+            self._append_expression("*(rb_node_return_t *) %0#x" % val.GetValueAsUnsigned())
+        elif nd_type == self.ruby_globals["NODE_YIELD"]:
+            self._append_expression("*(rb_node_yield_t *) %0#x" % val.GetValueAsUnsigned())
+        elif nd_type == self.ruby_globals["NODE_LVAR"]:
+            self._append_expression("*(rb_node_lvar_t *) %0#x" % val.GetValueAsUnsigned())
+        elif nd_type == self.ruby_globals["NODE_DVAR"]:
+            self._append_expression("*(rb_node_dvar_t *) %0#x" % val.GetValueAsUnsigned())
+        elif nd_type == self.ruby_globals["NODE_GVAR"]:
+            self._append_expression("*(rb_node_gvar_t *) %0#x" % val.GetValueAsUnsigned())
+        elif nd_type == self.ruby_globals["NODE_CONST"]:
+            self._append_expression("*(rb_node_const_t *) %0#x" % val.GetValueAsUnsigned())
+        elif nd_type == self.ruby_globals["NODE_CVAR"]:
+            self._append_expression("*(rb_node_cvar_t *) %0#x" % val.GetValueAsUnsigned())
+        elif nd_type == self.ruby_globals["NODE_NTH_REF"]:
+            self._append_expression("*(rb_node_nth_ref_t *) %0#x" % val.GetValueAsUnsigned())
+        elif nd_type == self.ruby_globals["NODE_BACK_REF"]:
+            self._append_expression("*(rb_node_back_ref_t *) %0#x" % val.GetValueAsUnsigned())
+        elif nd_type == self.ruby_globals["NODE_MATCH"]:
+            self._append_expression("*(rb_node_match_t *) %0#x" % val.GetValueAsUnsigned())
+        elif nd_type == self.ruby_globals["NODE_MATCH2"]:
+            self._append_expression("*(rb_node_match2_t *) %0#x" % val.GetValueAsUnsigned())
+        elif nd_type == self.ruby_globals["NODE_MATCH3"]:
+            self._append_expression("*(rb_node_match3_t *) %0#x" % val.GetValueAsUnsigned())
+        elif nd_type == self.ruby_globals["NODE_STR"]:
+            self._append_expression("*(rb_node_str_t *) %0#x" % val.GetValueAsUnsigned())
+        elif nd_type == self.ruby_globals["NODE_DSTR"]:
+            self._append_expression("*(rb_node_dstr_t *) %0#x" % val.GetValueAsUnsigned())
+        elif nd_type == self.ruby_globals["NODE_XSTR"]:
+            self._append_expression("*(rb_node_xstr_t *) %0#x" % val.GetValueAsUnsigned())
+        elif nd_type == self.ruby_globals["NODE_DXSTR"]:
+            self._append_expression("*(rb_node_dxstr_t *) %0#x" % val.GetValueAsUnsigned())
+        elif nd_type == self.ruby_globals["NODE_EVSTR"]:
+            self._append_expression("*(rb_node_evstr_t *) %0#x" % val.GetValueAsUnsigned())
+        elif nd_type == self.ruby_globals["NODE_REGX"]:
+            self._append_expression("*(rb_node_regx_t *) %0#x" % val.GetValueAsUnsigned())
+        elif nd_type == self.ruby_globals["NODE_DREGX"]:
+            self._append_expression("*(rb_node_dregx_t *) %0#x" % val.GetValueAsUnsigned())
+        elif nd_type == self.ruby_globals["NODE_ONCE"]:
+            self._append_expression("*(rb_node_once_t *) %0#x" % val.GetValueAsUnsigned())
+        elif nd_type == self.ruby_globals["NODE_ARGS"]:
+            self._append_expression("*(rb_node_args_t *) %0#x" % val.GetValueAsUnsigned())
+        elif nd_type == self.ruby_globals["NODE_ARGS_AUX"]:
+            self._append_expression("*(rb_node_args_aux_t *) %0#x" % val.GetValueAsUnsigned())
+        elif nd_type == self.ruby_globals["NODE_OPT_ARG"]:
+            self._append_expression("*(rb_node_opt_arg_t *) %0#x" % val.GetValueAsUnsigned())
+        elif nd_type == self.ruby_globals["NODE_KW_ARG"]:
+            self._append_expression("*(rb_node_kw_arg_t *) %0#x" % val.GetValueAsUnsigned())
+        elif nd_type == self.ruby_globals["NODE_POSTARG"]:
+            self._append_expression("*(rb_node_postarg_t *) %0#x" % val.GetValueAsUnsigned())
+        elif nd_type == self.ruby_globals["NODE_ARGSCAT"]:
+            self._append_expression("*(rb_node_argscat_t *) %0#x" % val.GetValueAsUnsigned())
+        elif nd_type == self.ruby_globals["NODE_ARGSPUSH"]:
+            self._append_expression("*(rb_node_argspush_t *) %0#x" % val.GetValueAsUnsigned())
+        elif nd_type == self.ruby_globals["NODE_SPLAT"]:
+            self._append_expression("*(rb_node_splat_t *) %0#x" % val.GetValueAsUnsigned())
+        elif nd_type == self.ruby_globals["NODE_DEFN"]:
+            self._append_expression("*(rb_node_defn_t *) %0#x" % val.GetValueAsUnsigned())
+        elif nd_type == self.ruby_globals["NODE_DEFS"]:
+            self._append_expression("*(rb_node_defs_t *) %0#x" % val.GetValueAsUnsigned())
+        elif nd_type == self.ruby_globals["NODE_ALIAS"]:
+            self._append_expression("*(rb_node_alias_t *) %0#x" % val.GetValueAsUnsigned())
+        elif nd_type == self.ruby_globals["NODE_VALIAS"]:
+            self._append_expression("*(rb_node_valias_t *) %0#x" % val.GetValueAsUnsigned())
+        elif nd_type == self.ruby_globals["NODE_UNDEF"]:
+            self._append_expression("*(rb_node_undef_t *) %0#x" % val.GetValueAsUnsigned())
+        elif nd_type == self.ruby_globals["NODE_CLASS"]:
+            self._append_expression("*(rb_node_class_t *) %0#x" % val.GetValueAsUnsigned())
+        elif nd_type == self.ruby_globals["NODE_MODULE"]:
+            self._append_expression("*(rb_node_module_t *) %0#x" % val.GetValueAsUnsigned())
+        elif nd_type == self.ruby_globals["NODE_SCLASS"]:
+            self._append_expression("*(rb_node_sclass_t *) %0#x" % val.GetValueAsUnsigned())
+        elif nd_type == self.ruby_globals["NODE_COLON2"]:
+            self._append_expression("*(rb_node_colon2_t *) %0#x" % val.GetValueAsUnsigned())
+        elif nd_type == self.ruby_globals["NODE_COLON3"]:
+            self._append_expression("*(rb_node_colon3_t *) %0#x" % val.GetValueAsUnsigned())
+        elif nd_type == self.ruby_globals["NODE_DOT2"]:
+            self._append_expression("*(rb_node_dot2_t *) %0#x" % val.GetValueAsUnsigned())
+        elif nd_type == self.ruby_globals["NODE_DOT3"]:
+            self._append_expression("*(rb_node_dot3_t *) %0#x" % val.GetValueAsUnsigned())
+        elif nd_type == self.ruby_globals["NODE_FLIP2"]:
+            self._append_expression("*(rb_node_flip2_t *) %0#x" % val.GetValueAsUnsigned())
+        elif nd_type == self.ruby_globals["NODE_FLIP3"]:
+            self._append_expression("*(rb_node_flip3_t *) %0#x" % val.GetValueAsUnsigned())
+        elif nd_type == self.ruby_globals["NODE_SELF"]:
+            self._append_expression("*(rb_node_self_t *) %0#x" % val.GetValueAsUnsigned())
+        elif nd_type == self.ruby_globals["NODE_NIL"]:
+            self._append_expression("*(rb_node_nil_t *) %0#x" % val.GetValueAsUnsigned())
+        elif nd_type == self.ruby_globals["NODE_TRUE"]:
+            self._append_expression("*(rb_node_true_t *) %0#x" % val.GetValueAsUnsigned())
+        elif nd_type == self.ruby_globals["NODE_FALSE"]:
+            self._append_expression("*(rb_node_false_t *) %0#x" % val.GetValueAsUnsigned())
+        elif nd_type == self.ruby_globals["NODE_ERRINFO"]:
+            self._append_expression("*(rb_node_errinfo_t *) %0#x" % val.GetValueAsUnsigned())
+        elif nd_type == self.ruby_globals["NODE_DEFINED"]:
+            self._append_expression("*(rb_node_defined_t *) %0#x" % val.GetValueAsUnsigned())
+        elif nd_type == self.ruby_globals["NODE_POSTEXE"]:
+            self._append_expression("*(rb_node_postexe_t *) %0#x" % val.GetValueAsUnsigned())
+        elif nd_type == self.ruby_globals["NODE_DSYM"]:
+            self._append_expression("*(rb_node_dsym_t *) %0#x" % val.GetValueAsUnsigned())
+        elif nd_type == self.ruby_globals["NODE_ATTRASGN"]:
+            self._append_expression("*(rb_node_attrasgn_t *) %0#x" % val.GetValueAsUnsigned())
+        elif nd_type == self.ruby_globals["NODE_LAMBDA"]:
+            self._append_expression("*(rb_node_lambda_t *) %0#x" % val.GetValueAsUnsigned())
+        elif nd_type == self.ruby_globals["NODE_ARYPTN"]:
+            self._append_expression("*(rb_node_aryptn_t *) %0#x" % val.GetValueAsUnsigned())
+        elif nd_type == self.ruby_globals["NODE_HSHPTN"]:
+            self._append_expression("*(rb_node_hshptn_t *) %0#x" % val.GetValueAsUnsigned())
+        elif nd_type == self.ruby_globals["NODE_FNDPTN"]:
+            self._append_expression("*(rb_node_fndptn_t *) %0#x" % val.GetValueAsUnsigned())
+        elif nd_type == self.ruby_globals["NODE_ERROR"]:
+            self._append_expression("*(rb_node_error_t *) %0#x" % val.GetValueAsUnsigned())
+        elif nd_type == self.ruby_globals["NODE_LINE"]:
+            self._append_expression("*(rb_node_line_t *) %0#x" % val.GetValueAsUnsigned())
+        elif nd_type == self.ruby_globals["NODE_FILE"]:
+            self._append_expression("*(rb_node_file_t *) %0#x" % val.GetValueAsUnsigned())
+        else:
+            self._append_expression("*(NODE *) %0#x" % val.GetValueAsUnsigned())
+        return True
diff --git a/misc/lldb_yjit.py b/misc/lldb_yjit.py
deleted file mode 100644
index cc37b990eae939..00000000000000
--- a/misc/lldb_yjit.py
+++ /dev/null
@@ -1,47 +0,0 @@
-#!/usr/bin/env python
-#coding: utf-8
-#
-# Usage: run `command script import -r misc/lldb_yjit.py` on LLDB
-#
-
-from __future__ import print_function
-import lldb
-import os
-import shlex
-
-def list_comments(debugger, command, result, internal_dict):
-    target = debugger.GetSelectedTarget()
-    process = target.GetProcess()
-    thread = process.GetSelectedThread()
-    frame = thread.GetSelectedFrame()
-
-    # Get the different types we need
-    rb_darray_meta_t = target.FindFirstType("rb_darray_meta_t")
-    codeblock_t = target.FindFirstType("codeblock_t")
-    yjit_comment = target.FindFirstType("yjit_comment")
-
-    # Get the global variables we need
-    comments = target.FindFirstGlobalVariable("yjit_code_comments")
-    cb = target.FindFirstGlobalVariable("cb").Cast(codeblock_t.GetPointerType())
-
-    # Get the address of the memory block we're using
-    mem_addr = cb.GetChildMemberWithName("mem_block").GetValueAsUnsigned()
-
-    # Find the size of the darray comment list
-    meta = comments.Cast(rb_darray_meta_t.GetPointerType())
-    size = meta.GetChildMemberWithName("size").GetValueAsUnsigned()
-
-    # Get the address of the block following the metadata header
-    t_offset = comments.GetValueAsUnsigned() + rb_darray_meta_t.GetByteSize()
-
-    # Loop through each comment and print
-    for t in range(0, size):
-        addr = lldb.SBAddress(t_offset + (t * yjit_comment.GetByteSize()), target)
-        comment = target.CreateValueFromAddress("yjit_comment", addr, yjit_comment)
-        string = comment.GetChildMemberWithName("comment")
-        comment_offset = mem_addr + comment.GetChildMemberWithName("offset").GetValueAsUnsigned()
-        print("%0#x %s" % (comment_offset, string.GetSummary()), file = result)
-
-
-def __lldb_init_module(debugger, internal_dict):
-    debugger.HandleCommand("command script add -f lldb_yjit.list_comments lc")
diff --git a/misc/ruby-style.el b/misc/ruby-style.el
index 13aad77b3d734b..03d0830d3abe28 100644
--- a/misc/ruby-style.el
+++ b/misc/ruby-style.el
@@ -56,7 +56,9 @@
    (c-basic-offset . 4)
    (tab-width . 8)
    (indent-tabs-mode . nil)
-   (setq show-trailing-whitespace t)
+   (show-trailing-whitespace . t)
+   (c-backslash-column . 1)
+   (c-backslash-max-column . 1)
    (c-offsets-alist
     (case-label . *)
     (label . (ruby-style-label-indent *))
@@ -66,6 +68,17 @@
     (access-label /)
     )))
 
+(c-add-style
+ "prism"
+ '("bsd"
+   (c-basic-offset . 4)
+   (tab-width . 8)
+   (indent-tabs-mode . nil)
+   (show-trailing-whitespace . t)
+   (c-offsets-alist
+    (case-label . +)
+    )))
+
 ;;;###autoload
 (defun ruby-style-c-mode ()
   (interactive)
diff --git a/misc/tsan_suppressions.txt b/misc/tsan_suppressions.txt
new file mode 100644
index 00000000000000..e46f133a9e5623
--- /dev/null
+++ b/misc/tsan_suppressions.txt
@@ -0,0 +1,125 @@
+# TSan: ThreadSanitizer
+# https://github.com/google/sanitizers/wiki/threadsanitizersuppressions
+#
+# This file describes a number of places where TSAN detects problems in CRuby.
+# Many of these indicate bugs. Others are benign (ex. data races that can be
+# replaced with relaxed atomic loads)
+#
+# Usage:
+#   Configure with:
+#     ./configure cflags='-fsanitize=thread' CC=clang
+#   Build and run with:
+#     TSAN_OPTIONS="suppressions=$(pwd)/misc/tsan_suppressions.txt:die_after_fork=0"
+#
+# Other useful TSAN_OPTIONS:
+#   * halt_on_error=1
+#   * strip_path_prefix=$(pwd)/
+
+# Namespaces
+race_top:push_subclass_entry_to_list
+
+# sub_nounderflow includes non-atomic read, possibly other issue
+race:objspace_malloc_increase_body
+
+# Signals and ubf
+race:unregister_ubf_list
+
+# It's already crashing. We're doing our best
+signal:rb_vm_bugreport
+race:check_reserved_signal_
+
+race_top:rb_check_deadlock
+
+# lock_owner
+race_top:thread_sched_setup_running_threads
+race_top:vm_lock_enter
+race_top:rb_ec_vm_lock_rec
+race_top:vm_lock_enter
+race_top:vm_locked
+
+# Ractors
+race:ractor_take
+race:ractor_register_take
+race:ractor_check_take_basket
+race:ractor_selector__wait
+
+# vm->ractor.sched.grq_cnt++
+race_top:ractor_sched_enq
+race_top:ractor_sched_deq
+
+# Using VM lock instead of rb_native_mutex_unlock?
+race:vm_remove_ractor
+
+# cr->sync.wait.wakeup_status
+race_top:rb_ractor_sched_sleep
+
+# th->sched.finished at end of co_start
+race_top:rb_thread_sched_mark_zombies
+
+# Races against timer thread setting th->sched.waiting_reason.flags
+race_top:thread_sched_wait_events
+
+# At thread start
+race_top:rb_ractor_set_current_ec_
+
+# Possible deadlock between Ractor lock and UBF lock
+deadlock:ractor_sleep_interrupt
+
+# TSan reports a lock-order-inversion between thread_sched_lock_ and this lock.
+# It's unclear if that can cause a deadlock since the lock is on self
+deadlock:ractor_lock_self
+
+# TSan reports a deadlock when reacquiring the this lock after a barrier, but
+# we know the other threads have been stopped
+deadlock:rb_ractor_sched_barrier_start
+
+# RVALUE_AGE_SET manipulates flag bits on objects which may be accessed in Ractors
+race_top:RVALUE_AGE_SET
+
+# Inline caches
+race_top:vm_cc_call_set
+race_top:vm_cc_class_check
+race_top:vm_search_cc
+race_top:vm_search_method_slowpath0
+race_top:rb_vm_opt_getconstant_path
+race_top:vm_ic_attr_index_set
+
+# Shapes have problems with RCLASS_MAX_IV_COUNT and RCLASS_VARIATION_COUNT
+# which are probably benign
+race:shape_get_next
+
+# Non-atomic reads/writes
+race:gccct_method_search
+
+# Ignore exit for now
+race:rb_ec_finalize
+race:rb_ec_cleanup
+
+# TSan doesn't work well post-fork, this raises errors when creating the new
+# timer thread
+race:after_fork_ruby
+
+# object_id races
+race:object_id
+
+# Sets objspace->flags.dont_incremental while writebarrier may be running
+race_top:objspace_each_exec
+race_top:objspace_each_objects_ensure
+
+# Ractor autoload
+race:rb_ractor_autoload_load
+
+# Non-atomic lazy initialized static variable
+race_top:rbimpl_intern_const
+
+# Setting def->aliased bitfield non-atomically
+race_top:method_definition_addref
+
+# Switching to setting up tracing. Likely other ractors should be stopped for this.
+race_top:encoded_iseq_trace_instrument
+race:rb_iseq_trace_set_all
+race:rb_tracepoint_enable
+
+# We walk the machine stack looking for markable objects, a thread with the GVL
+# released could by mutating the stack with non-Ruby-objects
+race:rb_gc_mark_machine_context
diff --git a/misc/yjit_perf.py b/misc/yjit_perf.py
new file mode 100755
index 00000000000000..61434e5eb4d3e3
--- /dev/null
+++ b/misc/yjit_perf.py
@@ -0,0 +1,116 @@
+#!/usr/bin/env python3
+import os
+import sys
+from collections import Counter, defaultdict
+import os.path
+
+# Aggregating cycles per symbol and dso
+total_cycles = 0
+category_cycles = Counter()
+detailed_category_cycles = defaultdict(Counter)
+categories = set()
+
+def truncate_symbol(symbol, max_length=50):
+    """ Truncate the symbol name to a maximum length """
+    return symbol if len(symbol) <= max_length else symbol[:max_length-3] + '...'
+
+def categorize_symbol(dso, symbol):
+    """ Categorize the symbol based on the defined criteria """
+    if dso == 'sqlite3_native.so':
+        return '[sqlite3]'
+    elif 'SHA256' in symbol:
+        return '[sha256]'
+    elif symbol.startswith('[JIT] gen_send'):
+        return '[JIT send]'
+    elif symbol.startswith('[JIT]'):
+        return '[JIT code]'
+    elif '::' in symbol or symbol.startswith('yjit::') or symbol.startswith('_ZN4yjit'):
+        return '[YJIT compile]'
+    elif symbol.startswith('rb_vm_') or symbol.startswith('vm_') or symbol in {
+        "rb_call0", "callable_method_entry_or_negative", "invoke_block_from_c_bh",
+        "rb_funcallv_scope", "setup_parameters_complex", "rb_yield"}:
+        return '[interpreter]'
+    elif symbol.startswith('rb_hash_') or symbol.startswith('hash_'):
+        return '[rb_hash_*]'
+    elif symbol.startswith('rb_ary_') or symbol.startswith('ary_'):
+        return '[rb_ary_*]'
+    elif symbol.startswith('rb_str_') or symbol.startswith('str_'):
+        return '[rb_str_*]'
+    elif symbol.startswith('rb_sym') or symbol.startswith('sym_'):
+        return '[rb_sym_*]'
+    elif symbol.startswith('rb_st_') or symbol.startswith('st_'):
+        return '[rb_st_*]'
+    elif symbol.startswith('rb_ivar_') or 'shape' in symbol:
+        return '[ivars]'
+    elif 'match' in symbol or symbol.startswith('rb_reg') or symbol.startswith('onig'):
+        return '[regexp]'
+    elif 'alloc' in symbol or 'free' in symbol or 'gc' in symbol:
+        return '[GC]'
+    elif 'pthread' in symbol and 'lock' in symbol:
+        return '[pthread lock]'
+    else:
+        return symbol  # Return the symbol itself for uncategorized symbols
+
+def process_event(event):
+    global total_cycles, category_cycles, detailed_category_cycles, categories
+
+    full_dso = event.get("dso", "Unknown_dso")
+    dso = os.path.basename(full_dso)
+    symbol = event.get("symbol", "[unknown]")
+    cycles = event["sample"]["period"]
+    total_cycles += cycles
+
+    category = categorize_symbol(dso, symbol)
+    category_cycles[category] += cycles
+    detailed_category_cycles[category][(dso, symbol)] += cycles
+
+    if category.startswith('[') and category.endswith(']'):
+        categories.add(category)
+
+def trace_end():
+    if total_cycles == 0:
+        return
+
+    print("Aggregated Event Data:")
+    print("{:<20} {:<50} {:>20} {:>15}".format("[dso]", "[symbol or category]", "[top-most cycle ratio]", "[num cycles]"))
+
+    for category, cycles in category_cycles.most_common():
+        ratio = (cycles / total_cycles) * 100
+        dsos = {dso for dso, _ in detailed_category_cycles[category]}
+        dso_display = next(iter(dsos)) if len(dsos) == 1 else "Multiple DSOs"
+        print("{:<20} {:<50} {:>20.2f}% {:>15}".format(dso_display, truncate_symbol(category), ratio, cycles))
+
+    # Category breakdown
+    for category in categories:
+        symbols = detailed_category_cycles[category]
+        category_total = sum(symbols.values())
+        category_ratio = (category_total / total_cycles) * 100
+        print(f"\nCategory: {category} ({category_ratio:.2f}%)")
+        print("{:<20} {:<50} {:>20} {:>15}".format("[dso]", "[symbol]", "[top-most cycle ratio]", "[num cycles]"))
+        for (dso, symbol), cycles in symbols.most_common():
+            symbol_ratio = (cycles / category_total) * 100
+            print("{:<20} {:<50} {:>20.2f}% {:>15}".format(dso, truncate_symbol(symbol), symbol_ratio, cycles))
+
+# There are two ways to use this script:
+# 1) perf script -s misc/yjit_perf.py                     -- native interface
+# 2) perf script > perf.txt && misc/yjit_perf.py perf.txt -- hack, which doesn't require perf with Python support
+#
+# In both cases, __name__ is "__main__". The following code implements (2) when sys.argv is 2.
+if __name__ == "__main__" and len(sys.argv) == 2:
+    if len(sys.argv) != 2:
+        print("Usage: yjit_perf.py <filename>")
+        sys.exit(1)
+
+    with open(sys.argv[1], "r") as file:
+        for line in file:
+            # [Example]
+            # ruby 78207 3482.848465: 1212775 cpu_core/cycles:P/: 5c0333f682e1 [JIT] getlocal_WC_0+0x0 (/tmp/perf-78207.map)
+            row = line.split(maxsplit=6)
+
+            period = row[3] # "1212775"
+            symbol, dso = row[6].split(" (") # "[JIT] getlocal_WC_0+0x0", "/tmp/perf-78207.map)\n"
+            symbol = symbol.split("+")[0] # "[JIT] getlocal_WC_0"
+            dso = dso.split(")")[0] # "/tmp/perf-78207.map"
+
+            process_event({"dso": dso, "symbol": symbol, "sample": {"period": int(period)}})
+    trace_end()
diff --git a/missing/dtoa.c b/missing/dtoa.c
index bce2cb22a1655c..8859fcfa44f9fb 100644
--- a/missing/dtoa.c
+++ b/missing/dtoa.c
@@ -98,17 +98,6 @@
  *	if memory is available and otherwise does something you deem
  *	appropriate.  If MALLOC is undefined, malloc will be invoked
  *	directly -- and assumed always to succeed.
- * #define Omit_Private_Memory to omit logic (added Jan. 1998) for making
- *	memory allocations from a private pool of memory when possible.
- *	When used, the private pool is PRIVATE_MEM bytes long:  2304 bytes,
- *	unless #defined to be a different length.  This default length
- *	suffices to get rid of MALLOC calls except for unusual cases,
- *	such as decimal-to-binary conversion of a very long string of
- *	digits.  The longest string dtoa can return is about 751 bytes
- *	long.  For conversions by strtod of strings of 800 digits and
- *	all dtoa conversions in single-threaded executions with 8-byte
- *	pointers, PRIVATE_MEM >= 7400 appears to suffice; with 4-byte
- *	pointers, PRIVATE_MEM >= 7112 appears adequate.
  * #define INFNAN_CHECK on IEEE systems to cause strtod to check for
  *	Infinity and NaN (case insensitively).  On some systems (e.g.,
  *	some HP systems), it may be necessary to #define NAN_WORD0
@@ -235,14 +224,6 @@ extern void FREE(void*);
 #define NO_SANITIZE(x, y) y
 #endif
 
-#ifndef Omit_Private_Memory
-#ifndef PRIVATE_MEM
-#define PRIVATE_MEM 2304
-#endif
-#define PRIVATE_mem ((PRIVATE_MEM+sizeof(double)-1)/sizeof(double))
-static double private_mem[PRIVATE_mem], *pmem_next = private_mem;
-#endif
-
 #undef IEEE_Arith
 #undef Avoid_Underflow
 #ifdef IEEE_BIG_ENDIAN
@@ -527,60 +508,16 @@ struct Bigint {
 
 typedef struct Bigint Bigint;
 
-static Bigint *freelist[Kmax+1];
-
-#define BLOCKING_BIGINT ((Bigint *)(-1))
-
 static Bigint *
 Balloc(int k)
 {
     int x;
     Bigint *rv;
-#ifndef Omit_Private_Memory
-    size_t len;
-#endif
-
-    rv = 0;
-    ACQUIRE_DTOA_LOCK(0);
-    if (k <= Kmax) {
-        rv = freelist[k];
-        while (rv) {
-            Bigint *rvn = rv;
-            rv = ATOMIC_PTR_CAS(freelist[k], rv, BLOCKING_BIGINT);
-            if (LIKELY(rv != BLOCKING_BIGINT && rvn == rv)) {
-                rvn = ATOMIC_PTR_CAS(freelist[k], BLOCKING_BIGINT, rv->next);
-                assert(rvn == BLOCKING_BIGINT);
-                ASSUME(rv);
-                break;
-            }
-        }
-    }
-    if (!rv) {
-        x = 1 << k;
-#ifdef Omit_Private_Memory
-        rv = (Bigint *)MALLOC(sizeof(Bigint) + (x-1)*sizeof(ULong));
-#else
-        len = (sizeof(Bigint) + (x-1)*sizeof(ULong) + sizeof(double) - 1)
-                /sizeof(double);
-        if (k <= Kmax) {
-            double *pnext = pmem_next;
-            while (pnext - private_mem + len <= PRIVATE_mem) {
-                double *p = pnext;
-                pnext = ATOMIC_PTR_CAS(pmem_next, pnext, pnext + len);
-                if (LIKELY(p == pnext)) {
-                    rv = (Bigint*)pnext;
-                    ASSUME(rv);
-                    break;
-                }
-            }
-        }
-        if (!rv)
-            rv = (Bigint*)MALLOC(len*sizeof(double));
-#endif
-        rv->k = k;
-        rv->maxwds = x;
-    }
-    FREE_DTOA_LOCK(0);
+
+    x = 1 << k;
+    rv = (Bigint *)MALLOC(sizeof(Bigint) + (x-1)*sizeof(ULong));
+    rv->k = k;
+    rv->maxwds = x;
     rv->sign = rv->wds = 0;
     return rv;
 }
@@ -588,21 +525,7 @@ Balloc(int k)
 static void
 Bfree(Bigint *v)
 {
-    Bigint *vn;
-    if (v) {
-        if (v->k > Kmax) {
-            FREE(v);
-            return;
-        }
-        ACQUIRE_DTOA_LOCK(0);
-        do {
-            do {
-                vn = ATOMIC_PTR_CAS(freelist[v->k], 0, 0);
-            } while (UNLIKELY(vn == BLOCKING_BIGINT));
-            v->next = vn;
-        } while (UNLIKELY(ATOMIC_PTR_CAS(freelist[v->k], vn, v) != vn));
-        FREE_DTOA_LOCK(0);
-    }
+    FREE(v);
 }
 
 #define Bcopy(x,y) memcpy((char *)&(x)->sign, (char *)&(y)->sign, \
@@ -1552,7 +1475,7 @@ strtod(const char *s00, char **se)
 	    aadj = 1.0;
 	    nd0 = -4;
 
-	    if (!*++s || !(s1 = strchr(hexdigit, *s))) goto ret0;
+	    if (!*++s || (!(s1 = strchr(hexdigit, *s)) && *s != '.')) goto ret0;
 	    if (*s == '0') {
 		while (*++s == '0');
 		if (!*s) goto ret;
@@ -1566,9 +1489,7 @@ strtod(const char *s00, char **se)
 		} while (*++s && (s1 = strchr(hexdigit, *s)));
 	    }
 
-	    if (*s == '.') {
-		dsign = 1;
-		if (!*++s || !(s1 = strchr(hexdigit, *s))) goto ret0;
+	    if ((*s == '.') && *++s && (s1 = strchr(hexdigit, *s))) {
 		if (nd0 < 0) {
 		    while (*s == '0') {
 			s++;
@@ -1583,9 +1504,6 @@ strtod(const char *s00, char **se)
 		    }
 		}
 	    }
-	    else {
-		dsign = 0;
-	    }
 
 	    if (*s == 'P' || *s == 'p') {
 		dsign = 0x2C - *++s; /* +: 2B, -: 2D */
@@ -1608,9 +1526,6 @@ strtod(const char *s00, char **se)
 		} while ('0' <= c && c <= '9');
 		nd0 += nd * dsign;
 	    }
-	    else {
-		if (dsign) goto ret0;
-	    }
 	    dval(rv) = ldexp(adj, nd0);
 	    goto ret;
 	}
@@ -1647,9 +1562,9 @@ strtod(const char *s00, char **se)
     }
 #endif
     if (c == '.') {
-        if (!ISDIGIT(s[1]))
-            goto dig_done;
         c = *++s;
+        if (!ISDIGIT(c))
+            goto dig_done;
         if (!nd) {
             for (; c == '0'; c = *++s)
                 nz++;
diff --git a/missing/procstat_vm.c b/missing/procstat_vm.c
index 76fd8f61ba2b50..155ee355d1a3aa 100644
--- a/missing/procstat_vm.c
+++ b/missing/procstat_vm.c
@@ -6,7 +6,7 @@
 # define KVME_TYPE_MGTDEVICE     8
 # endif
 void
-procstat_vm(struct procstat *procstat, struct kinfo_proc *kipp)
+procstat_vm(struct procstat *procstat, struct kinfo_proc *kipp, FILE *errout)
 {
 	struct kinfo_vmentry *freep, *kve;
 	int ptrwidth;
@@ -17,7 +17,7 @@ procstat_vm(struct procstat *procstat, struct kinfo_proc *kipp)
 #else
 	ptrwidth = 2*sizeof(void *) + 2;
 #endif
-	fprintf(stderr, "%*s %*s %3s %4s %4s %3s %3s %4s %-2s %-s\n",
+	fprintf(errout, "%*s %*s %3s %4s %4s %3s %3s %4s %-2s %-s\n",
 		ptrwidth, "START", ptrwidth, "END", "PRT", "RES",
 		"P""RES", "REF", "SHD", "FL", "TP", "PATH");
 
@@ -30,20 +30,20 @@ procstat_vm(struct procstat *procstat, struct kinfo_proc *kipp)
 		return;
 	for (i = 0; i < cnt; i++) {
 		kve = &freep[i];
-		fprintf(stderr, "%#*jx ", ptrwidth, (uintmax_t)kve->kve_start);
-		fprintf(stderr, "%#*jx ", ptrwidth, (uintmax_t)kve->kve_end);
-		fprintf(stderr, "%s", kve->kve_protection & KVME_PROT_READ ? "r" : "-");
-		fprintf(stderr, "%s", kve->kve_protection & KVME_PROT_WRITE ? "w" : "-");
-		fprintf(stderr, "%s ", kve->kve_protection & KVME_PROT_EXEC ? "x" : "-");
-		fprintf(stderr, "%4d ", kve->kve_resident);
-		fprintf(stderr, "%4d ", kve->kve_private_resident);
-		fprintf(stderr, "%3d ", kve->kve_ref_count);
-		fprintf(stderr, "%3d ", kve->kve_shadow_count);
-		fprintf(stderr, "%-1s", kve->kve_flags & KVME_FLAG_COW ? "C" : "-");
-		fprintf(stderr, "%-1s", kve->kve_flags & KVME_FLAG_NEEDS_COPY ? "N" :
+		fprintf(errout, "%#*jx ", ptrwidth, (uintmax_t)kve->kve_start);
+		fprintf(errout, "%#*jx ", ptrwidth, (uintmax_t)kve->kve_end);
+		fprintf(errout, "%s", kve->kve_protection & KVME_PROT_READ ? "r" : "-");
+		fprintf(errout, "%s", kve->kve_protection & KVME_PROT_WRITE ? "w" : "-");
+		fprintf(errout, "%s ", kve->kve_protection & KVME_PROT_EXEC ? "x" : "-");
+		fprintf(errout, "%4d ", kve->kve_resident);
+		fprintf(errout, "%4d ", kve->kve_private_resident);
+		fprintf(errout, "%3d ", kve->kve_ref_count);
+		fprintf(errout, "%3d ", kve->kve_shadow_count);
+		fprintf(errout, "%-1s", kve->kve_flags & KVME_FLAG_COW ? "C" : "-");
+		fprintf(errout, "%-1s", kve->kve_flags & KVME_FLAG_NEEDS_COPY ? "N" :
 		    "-");
-		fprintf(stderr, "%-1s", kve->kve_flags & KVME_FLAG_SUPER ? "S" : "-");
-		fprintf(stderr, "%-1s ", kve->kve_flags & KVME_FLAG_GROWS_UP ? "U" :
+		fprintf(errout, "%-1s", kve->kve_flags & KVME_FLAG_SUPER ? "S" : "-");
+		fprintf(errout, "%-1s ", kve->kve_flags & KVME_FLAG_GROWS_UP ? "U" :
 		    kve->kve_flags & KVME_FLAG_GROWS_DOWN ? "D" : "-");
 		switch (kve->kve_type) {
 		case KVME_TYPE_NONE:
@@ -78,8 +78,8 @@ procstat_vm(struct procstat *procstat, struct kinfo_proc *kipp)
 			str = "??";
 			break;
 		}
-		fprintf(stderr, "%-2s ", str);
-		fprintf(stderr, "%-s\n", kve->kve_path);
+		fprintf(errout, "%-2s ", str);
+		fprintf(errout, "%-s\n", kve->kve_path);
 	}
 	free(freep);
 }
diff --git a/missing/setproctitle.c b/missing/setproctitle.c
index 811829c0600476..5b2dfa65cef4a6 100644
--- a/missing/setproctitle.c
+++ b/missing/setproctitle.c
@@ -80,10 +80,43 @@ static char **argv1_addr = NULL;
 
 #endif /* HAVE_SETPROCTITLE */
 
+#if defined(SPT_TYPE) && SPT_TYPE == SPT_REUSEARGV
+# define ALLOCATE_ENVIRON 1
+#else
+# define ALLOCATE_ENVIRON 0
+#endif
+
+#if ALLOCATE_ENVIRON
+/* system_environ is the value of environ before we allocate a custom buffer.
+ *
+ * We use this to restore environ in ruby_free_proctitle.
+ */
+static char **system_environ = NULL;
+/* orig_environ is the buffer we allocate for environ.
+ *
+ * We use this to free this buffer in ruby_free_proctitle. When we add new
+ * environment variables using setenv, the system may change environ to a
+ * different buffer and will not free the original buffer, so we need to hold
+ * onto this so we can free it in ruby_free_proctitle.
+ *
+ * We must not free any of the contents because it may change if the system
+ * updates existing environment variables.
+ */
+static char **orig_environ = NULL;
+/* alloc_environ is a copy of orig_environ.
+ *
+ * We use this to free all the original string copies that were in orig_environ.
+ * Since environ could be changed to point to strings allocated by the system
+ * if environment variables are updated, so we need this to point to the
+ * original strings.
+ */
+static char **alloc_environ = NULL;
+#endif
+
 void
 compat_init_setproctitle(int argc, char *argv[])
 {
-#if defined(SPT_TYPE) && SPT_TYPE == SPT_REUSEARGV
+#if ALLOCATE_ENVIRON
 	extern char **environ;
 	char *lastargv = NULL;
 	char *lastenvp = NULL;
@@ -100,9 +133,13 @@ compat_init_setproctitle(int argc, char *argv[])
 		return;
 
 	/* Fail if we can't allocate room for the new environment */
-	for (i = 0; envp[i] != NULL; i++)
-		;
-	if ((environ = calloc(i + 1, sizeof(*environ))) == NULL) {
+	for (i = 0; envp[i] != NULL; i++);
+
+	system_environ = environ;
+
+	alloc_environ = xcalloc(i + 1, sizeof(*environ));
+	orig_environ = environ = xcalloc(i + 1, sizeof(*environ));
+	if (environ == NULL) {
 		environ = envp;	/* put it back */
 		return;
 	}
@@ -129,12 +166,31 @@ compat_init_setproctitle(int argc, char *argv[])
 	argv_env_len = lastenvp - argv[0];
 
 	for (i = 0; envp[i] != NULL; i++)
-		environ[i] = ruby_strdup(envp[i]);
-	environ[i] = NULL;
+		alloc_environ[i] = environ[i] = ruby_strdup(envp[i]);
+	alloc_environ[i] = environ[i] = NULL;
 #endif /* SPT_REUSEARGV */
 }
 
+void
+ruby_free_proctitle(void)
+{
+#if ALLOCATE_ENVIRON
+	extern char **environ;
+
+	if (!orig_environ) return; /* environ is allocated by OS */
+
+	for (int i = 0; alloc_environ[i] != NULL; i++) {
+		xfree(alloc_environ[i]);
+	}
+	xfree(alloc_environ);
+	xfree(orig_environ);
+
+	environ = system_environ;
+#endif
+}
+
 #ifndef HAVE_SETPROCTITLE
+
 void
 setproctitle(const char *fmt, ...)
 {
diff --git a/namespace.c b/namespace.c
new file mode 100644
index 00000000000000..dd7d21c3806ffb
--- /dev/null
+++ b/namespace.c
@@ -0,0 +1,1087 @@
+/* indent-tabs-mode: nil */
+
+#include "internal.h"
+#include "internal/class.h"
+#include "internal/eval.h"
+#include "internal/error.h"
+#include "internal/file.h"
+#include "internal/gc.h"
+#include "internal/hash.h"
+#include "internal/load.h"
+#include "internal/namespace.h"
+#include "internal/st.h"
+#include "internal/variable.h"
+#include "ruby/internal/globals.h"
+#include "ruby/util.h"
+#include "vm_core.h"
+
+#include <stdio.h>
+
+VALUE rb_cNamespace = 0;
+VALUE rb_cNamespaceEntry = 0;
+VALUE rb_mNamespaceRefiner = 0;
+VALUE rb_mNamespaceLoader = 0;
+
+static rb_namespace_t builtin_namespace_data = {
+    .ns_object = Qnil,
+    .ns_id = 0,
+    .is_builtin = true,
+    .is_user = false,
+    .is_optional = false
+};
+static rb_namespace_t * const root_namespace = 0;
+static rb_namespace_t * const builtin_namespace = &builtin_namespace_data;
+static rb_namespace_t * main_namespace = 0;
+static char *tmp_dir;
+static bool tmp_dir_has_dirsep;
+
+#define NAMESPACE_TMP_PREFIX "_ruby_ns_"
+
+#ifndef MAXPATHLEN
+# define MAXPATHLEN 1024
+#endif
+
+#if defined(_WIN32)
+# define DIRSEP "\\"
+#else
+# define DIRSEP "/"
+#endif
+
+bool ruby_namespace_enabled = false; // extern
+bool ruby_namespace_init_done = false; // extern
+
+VALUE rb_resolve_feature_path(VALUE klass, VALUE fname);
+static VALUE rb_namespace_inspect(VALUE obj);
+static void namespace_push(rb_thread_t *th, VALUE namespace);
+static VALUE namespace_pop(VALUE th_value);
+
+void
+rb_namespace_init_done(void)
+{
+    ruby_namespace_init_done = true;
+}
+
+void
+rb_namespace_enable_builtin(void)
+{
+    VALUE require_stack = GET_VM()->require_stack;
+    if (require_stack) {
+        rb_ary_push(require_stack, Qnil);
+    }
+}
+
+void
+rb_namespace_disable_builtin(void)
+{
+    VALUE require_stack = GET_VM()->require_stack;
+    if (require_stack) {
+        rb_ary_pop(require_stack);
+    }
+}
+
+void
+rb_namespace_push_loading_namespace(const rb_namespace_t *ns)
+{
+    VALUE require_stack = GET_VM()->require_stack;
+    rb_ary_push(require_stack, ns->ns_object);
+}
+
+void
+rb_namespace_pop_loading_namespace(const rb_namespace_t *ns)
+{
+    VALUE require_stack = GET_VM()->require_stack;
+    long size = RARRAY_LEN(require_stack);
+    if (size == 0)
+        rb_bug("popping on the empty require_stack");
+    VALUE latest = RARRAY_AREF(require_stack, size-1);
+    if (latest != ns->ns_object)
+        rb_bug("Inconsistent loading namespace");
+    rb_ary_pop(require_stack);
+}
+
+rb_namespace_t *
+rb_root_namespace(void)
+{
+    return root_namespace;
+}
+
+const rb_namespace_t *
+rb_builtin_namespace(void)
+{
+    return (const rb_namespace_t *)builtin_namespace;
+}
+
+rb_namespace_t *
+rb_main_namespace(void)
+{
+    return main_namespace;
+}
+
+static bool
+namespace_ignore_builtin_primitive_methods_p(const rb_namespace_t *ns, rb_method_definition_t *def)
+{
+    if (!NAMESPACE_BUILTIN_P(ns)) {
+        return false;
+    }
+    /* Primitive methods (just to call C methods) covers/hides the effective
+       namespaces, so ignore the methods' namespaces to expose user code's
+       namespace to the implementation.
+     */
+    if (def->type == VM_METHOD_TYPE_ISEQ) {
+        ID mid = def->original_id;
+        const char *path = RSTRING_PTR(pathobj_path(def->body.iseq.iseqptr->body->location.pathobj));
+        if (strcmp(path, "<internal:kernel>") == 0) {
+            if (mid == rb_intern("class") || mid == rb_intern("clone") ||
+                mid == rb_intern("tag") || mid == rb_intern("then") ||
+                mid == rb_intern("yield_self") || mid == rb_intern("loop") ||
+                mid == rb_intern("Float") || mid == rb_intern("Integer")
+                ) {
+                return true;
+            }
+        }
+        else if (strcmp(path, "<internal:warning>") == 0) {
+            if (mid == rb_intern("warn")) {
+                return true;
+            }
+        }
+        else if (strcmp(path, "<internal:marshal>") == 0) {
+            if (mid == rb_intern("load"))
+                return true;
+        }
+    }
+    return false;
+}
+
+static inline const rb_namespace_t *
+block_proc_namespace(const VALUE procval)
+{
+    rb_proc_t *proc;
+
+    if (procval) {
+        GetProcPtr(procval, proc);
+        return proc->ns;
+    }
+    else {
+        return NULL;
+    }
+}
+
+static const rb_namespace_t *
+current_namespace(bool permit_calling_builtin)
+{
+    /*
+     * TODO: move this code to vm.c or somewhere else
+     *       when it's fully updated with VM_FRAME_FLAG_*
+     */
+    const rb_callable_method_entry_t *cme;
+    const rb_namespace_t *ns;
+    rb_execution_context_t *ec = GET_EC();
+    rb_control_frame_t *cfp = ec->cfp;
+    rb_thread_t *th = rb_ec_thread_ptr(ec);
+    int calling = 1;
+
+    if (!rb_namespace_available())
+        return 0;
+
+    if (th->namespaces && RARRAY_LEN(th->namespaces) > 0) {
+        // temp code to detect the context is in require/load
+        // TODO: this doesn't work well in optional namespaces
+        // calling = 0;
+    }
+    while (calling) {
+        const rb_namespace_t *proc_ns = NULL;
+        VALUE bh;
+        if (VM_FRAME_NS_SWITCH_P(cfp)) {
+            bh = rb_vm_frame_block_handler(cfp);
+            if (bh && vm_block_handler_type(bh) == block_handler_type_proc) {
+                proc_ns = block_proc_namespace(VM_BH_TO_PROC(bh));
+                if (permit_calling_builtin || NAMESPACE_USER_P(proc_ns))
+                    return proc_ns;
+            }
+        }
+        cme = rb_vm_frame_method_entry(cfp);
+        if (cme && cme->def) {
+            ns = cme->def->ns;
+            if (ns) {
+                // this method is not a built-in class/module's method
+                // or a built-in primitive (Ruby) method
+                if (!namespace_ignore_builtin_primitive_methods_p(ns, cme->def)) {
+                    if (permit_calling_builtin || (proc_ns && NAMESPACE_USER_P(proc_ns)))
+                        return ns;
+                }
+            }
+            cfp = RUBY_VM_PREVIOUS_CONTROL_FRAME(cfp);
+        }
+        else {
+            calling = 0;
+        }
+    }
+    // not in namespace-marked method calls
+    ns = th->ns;
+    if (ns) {
+        return ns;
+    }
+    if (!main_namespace) {
+        // Namespaces are not ready to be created
+        return root_namespace;
+    }
+    return main_namespace;
+}
+
+const rb_namespace_t *
+rb_current_namespace(void)
+{
+    return current_namespace(true);
+}
+
+const rb_namespace_t *
+rb_loading_namespace(void)
+{
+    VALUE namespace;
+    long len;
+    VALUE require_stack = GET_VM()->require_stack;
+
+    if (!rb_namespace_available())
+        return 0;
+
+    if (!require_stack) {
+        return current_namespace(false);
+    }
+    if ((len = RARRAY_LEN(require_stack)) == 0) {
+        return current_namespace(false);
+    }
+
+    if (!RB_TYPE_P(require_stack, T_ARRAY))
+        rb_bug("require_stack is not an array: %s", rb_type_str(BUILTIN_TYPE(require_stack)));
+
+    namespace = RARRAY_AREF(require_stack, len-1);
+    return rb_get_namespace_t(namespace);
+}
+
+const rb_namespace_t *
+rb_definition_namespace(void)
+{
+    const rb_namespace_t *ns = current_namespace(true);
+    if (NAMESPACE_BUILTIN_P(ns)) {
+        return root_namespace;
+    }
+    return ns;
+}
+
+static long namespace_id_counter = 0;
+
+static long
+namespace_generate_id(void)
+{
+    long id;
+    RB_VM_LOCKING() {
+        id = ++namespace_id_counter;
+    }
+    return id;
+}
+
+static void
+namespace_entry_initialize(rb_namespace_t *ns)
+{
+    rb_vm_t *vm = GET_VM();
+
+    // These will be updated immediately
+    ns->ns_object = 0;
+    ns->ns_id = 0;
+
+    ns->top_self = 0;
+    ns->load_path = rb_ary_dup(vm->load_path);
+    ns->expanded_load_path = rb_ary_dup(vm->expanded_load_path);
+    ns->load_path_snapshot = rb_ary_new();
+    ns->load_path_check_cache = 0;
+    ns->loaded_features = rb_ary_dup(vm->loaded_features);
+    ns->loaded_features_snapshot = rb_ary_new();
+    ns->loaded_features_index = st_init_numtable();
+    ns->loaded_features_realpaths = rb_hash_dup(vm->loaded_features_realpaths);
+    ns->loaded_features_realpath_map = rb_hash_dup(vm->loaded_features_realpath_map);
+    ns->loading_table = st_init_strtable();
+    ns->ruby_dln_libmap = rb_hash_new_with_size(0);
+    ns->gvar_tbl = rb_hash_new_with_size(0);
+
+    ns->is_builtin = false;
+    ns->is_user = true;
+    ns->is_optional = true;
+}
+
+void rb_namespace_gc_update_references(void *ptr)
+{
+    rb_namespace_t *ns = (rb_namespace_t *)ptr;
+    if (!NIL_P(ns->ns_object))
+        ns->ns_object = rb_gc_location(ns->ns_object);
+    ns->top_self = rb_gc_location(ns->top_self);
+    ns->load_path = rb_gc_location(ns->load_path);
+    ns->expanded_load_path = rb_gc_location(ns->expanded_load_path);
+    ns->load_path_snapshot = rb_gc_location(ns->load_path_snapshot);
+    if (ns->load_path_check_cache) {
+        ns->load_path_check_cache = rb_gc_location(ns->load_path_check_cache);
+    }
+    ns->loaded_features = rb_gc_location(ns->loaded_features);
+    ns->loaded_features_snapshot = rb_gc_location(ns->loaded_features_snapshot);
+    ns->loaded_features_realpaths = rb_gc_location(ns->loaded_features_realpaths);
+    ns->loaded_features_realpath_map = rb_gc_location(ns->loaded_features_realpath_map);
+    ns->ruby_dln_libmap = rb_gc_location(ns->ruby_dln_libmap);
+    ns->gvar_tbl = rb_gc_location(ns->gvar_tbl);
+}
+
+void
+rb_namespace_entry_mark(void *ptr)
+{
+    const rb_namespace_t *ns = (rb_namespace_t *)ptr;
+    rb_gc_mark(ns->ns_object);
+    rb_gc_mark(ns->top_self);
+    rb_gc_mark(ns->load_path);
+    rb_gc_mark(ns->expanded_load_path);
+    rb_gc_mark(ns->load_path_snapshot);
+    rb_gc_mark(ns->load_path_check_cache);
+    rb_gc_mark(ns->loaded_features);
+    rb_gc_mark(ns->loaded_features_snapshot);
+    rb_gc_mark(ns->loaded_features_realpaths);
+    rb_gc_mark(ns->loaded_features_realpath_map);
+    if (ns->loading_table) {
+        rb_mark_tbl(ns->loading_table);
+    }
+    rb_gc_mark(ns->ruby_dln_libmap);
+    rb_gc_mark(ns->gvar_tbl);
+}
+
+#define namespace_entry_free RUBY_TYPED_DEFAULT_FREE
+
+static size_t
+namespace_entry_memsize(const void *ptr)
+{
+    return sizeof(rb_namespace_t);
+}
+
+const rb_data_type_t rb_namespace_data_type = {
+    "Namespace::Entry",
+    {
+        rb_namespace_entry_mark,
+        namespace_entry_free,
+        namespace_entry_memsize,
+        rb_namespace_gc_update_references,
+    },
+    0, 0, RUBY_TYPED_FREE_IMMEDIATELY // TODO: enable RUBY_TYPED_WB_PROTECTED when inserting write barriers
+};
+
+VALUE
+rb_namespace_entry_alloc(VALUE klass)
+{
+    rb_namespace_t *entry;
+    VALUE obj = TypedData_Make_Struct(klass, rb_namespace_t, &rb_namespace_data_type, entry);
+    namespace_entry_initialize(entry);
+    return obj;
+}
+
+static rb_namespace_t *
+get_namespace_struct_internal(VALUE entry)
+{
+    rb_namespace_t *sval;
+    TypedData_Get_Struct(entry, rb_namespace_t, &rb_namespace_data_type, sval);
+    return sval;
+}
+
+rb_namespace_t *
+rb_get_namespace_t(VALUE namespace)
+{
+    VALUE entry;
+    ID id_namespace_entry;
+
+    if (!namespace)
+        return root_namespace;
+    if (NIL_P(namespace))
+        return builtin_namespace;
+
+    CONST_ID(id_namespace_entry, "__namespace_entry__");
+    entry = rb_attr_get(namespace, id_namespace_entry);
+    return get_namespace_struct_internal(entry);
+}
+
+VALUE
+rb_get_namespace_object(rb_namespace_t *ns)
+{
+    if (!ns) // root namespace
+        return Qfalse;
+    return ns->ns_object;
+}
+
+static void setup_pushing_loading_namespace(rb_namespace_t *ns);
+
+static VALUE
+namespace_initialize(VALUE namespace)
+{
+    rb_namespace_t *ns;
+    rb_classext_t *object_classext;
+    VALUE entry;
+    ID id_namespace_entry;
+    CONST_ID(id_namespace_entry, "__namespace_entry__");
+
+    if (!rb_namespace_available()) {
+        rb_raise(rb_eRuntimeError, "Namespace is disabled. Set RUBY_NAMESPACE=1 environment variable to use Namespace.");
+    }
+
+    entry = rb_class_new_instance_pass_kw(0, NULL, rb_cNamespaceEntry);
+    ns = get_namespace_struct_internal(entry);
+
+    ns->ns_object = namespace;
+    ns->ns_id = namespace_generate_id();
+    ns->load_path = rb_ary_dup(GET_VM()->load_path);
+    ns->is_user = true;
+    rb_define_singleton_method(ns->load_path, "resolve_feature_path", rb_resolve_feature_path, 1);
+
+    // Set the Namespace object unique/consistent from any namespaces to have just single
+    // constant table from any view of every (including main) namespace.
+    // If a code in the namespace adds a constant, the constant will be visible even from root/main.
+    RCLASS_SET_PRIME_CLASSEXT_WRITABLE(namespace, true);
+
+    // Get a clean constant table of Object even by writable one
+    // because ns was just created, so it has not touched any constants yet.
+    object_classext = RCLASS_EXT_WRITABLE_IN_NS(rb_cObject, ns);
+    RCLASS_SET_CONST_TBL(namespace, RCLASSEXT_CONST_TBL(object_classext), true);
+
+    rb_ivar_set(namespace, id_namespace_entry, entry);
+
+    setup_pushing_loading_namespace(ns);
+
+    return namespace;
+}
+
+static VALUE
+rb_namespace_s_getenabled(VALUE namespace)
+{
+    return RBOOL(rb_namespace_available());
+}
+
+static VALUE
+rb_namespace_current(VALUE klass)
+{
+    const rb_namespace_t *ns = rb_current_namespace();
+    if (NAMESPACE_USER_P(ns)) {
+        return ns->ns_object;
+    }
+    if (NAMESPACE_BUILTIN_P(ns)) {
+        return Qnil;
+    }
+    return Qfalse;
+}
+
+static VALUE
+rb_namespace_s_is_builtin_p(VALUE namespace, VALUE klass)
+{
+    if (RCLASS_PRIME_CLASSEXT_READABLE_P(klass) && !RCLASS_PRIME_CLASSEXT_WRITABLE_P(klass))
+        return Qtrue;
+    return Qfalse;
+}
+
+static VALUE
+rb_namespace_load_path(VALUE namespace)
+{
+    return rb_get_namespace_t(namespace)->load_path;
+}
+
+#ifdef _WIN32
+UINT rb_w32_system_tmpdir(WCHAR *path, UINT len);
+#endif
+
+/* Copied from mjit.c Ruby 3.0.3 */
+static char *
+system_default_tmpdir(void)
+{
+    // c.f. ext/etc/etc.c:etc_systmpdir()
+#ifdef _WIN32
+    WCHAR tmppath[_MAX_PATH];
+    UINT len = rb_w32_system_tmpdir(tmppath, numberof(tmppath));
+    if (len) {
+        int blen = WideCharToMultiByte(CP_UTF8, 0, tmppath, len, NULL, 0, NULL, NULL);
+        char *tmpdir = xmalloc(blen + 1);
+        WideCharToMultiByte(CP_UTF8, 0, tmppath, len, tmpdir, blen, NULL, NULL);
+        tmpdir[blen] = '\0';
+        return tmpdir;
+    }
+#elif defined _CS_DARWIN_USER_TEMP_DIR
+    char path[MAXPATHLEN];
+    size_t len = confstr(_CS_DARWIN_USER_TEMP_DIR, path, sizeof(path));
+    if (len > 0) {
+        char *tmpdir = xmalloc(len);
+        if (len > sizeof(path)) {
+            confstr(_CS_DARWIN_USER_TEMP_DIR, tmpdir, len);
+        }
+        else {
+            memcpy(tmpdir, path, len);
+        }
+        return tmpdir;
+    }
+#endif
+    return 0;
+}
+
+static int
+check_tmpdir(const char *dir)
+{
+    struct stat st;
+
+    if (!dir) return FALSE;
+    if (stat(dir, &st)) return FALSE;
+#ifndef S_ISDIR
+#   define S_ISDIR(m) (((m) & S_IFMT) == S_IFDIR)
+#endif
+    if (!S_ISDIR(st.st_mode)) return FALSE;
+#ifndef _WIN32
+# ifndef S_IWOTH
+#   define S_IWOTH 002
+# endif
+    if (st.st_mode & S_IWOTH) {
+# ifdef S_ISVTX
+        if (!(st.st_mode & S_ISVTX)) return FALSE;
+# else
+        return FALSE;
+# endif
+    }
+    if (access(dir, W_OK)) return FALSE;
+#endif
+    return TRUE;
+}
+
+static char *
+system_tmpdir(void)
+{
+    char *tmpdir;
+# define RETURN_ENV(name) \
+    if (check_tmpdir(tmpdir = getenv(name))) return ruby_strdup(tmpdir)
+    RETURN_ENV("TMPDIR");
+    RETURN_ENV("TMP");
+    tmpdir = system_default_tmpdir();
+    if (check_tmpdir(tmpdir)) return tmpdir;
+    return ruby_strdup("/tmp");
+# undef RETURN_ENV
+}
+
+/* end of copy */
+
+static int
+sprint_ext_filename(char *str, size_t size, long namespace_id, const char *prefix, const char *basename)
+{
+    if (tmp_dir_has_dirsep) {
+        return snprintf(str, size, "%s%sp%"PRI_PIDT_PREFIX"u_%ld_%s", tmp_dir, prefix, getpid(), namespace_id, basename);
+    }
+    return snprintf(str, size, "%s%s%sp%"PRI_PIDT_PREFIX"u_%ld_%s", tmp_dir, DIRSEP, prefix, getpid(), namespace_id, basename);
+}
+
+#ifdef _WIN32
+static const char *
+copy_ext_file_error(char *message, size_t size)
+{
+    int error = GetLastError();
+    char *p = message;
+    size_t len = snprintf(message, size, "%d: ", error);
+
+#define format_message(sublang) FormatMessage(\
+        FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS,	\
+        NULL, error, MAKELANGID(LANG_NEUTRAL, (sublang)),		\
+        message + len, size - len, NULL)
+    if (format_message(SUBLANG_ENGLISH_US) == 0)
+        format_message(SUBLANG_DEFAULT);
+    for (p = message + len; *p; p++) {
+        if (*p == '\n' || *p == '\r')
+            *p = ' ';
+    }
+    return message;
+}
+#else
+static const char *
+copy_ext_file_error(char *message, size_t size, int copy_retvalue, char *src_path, char *dst_path)
+{
+    switch (copy_retvalue) {
+    case 1:
+        snprintf(message, size, "can't open the extension path: %s", src_path);
+    case 2:
+        snprintf(message, size, "can't open the file to write: %s", dst_path);
+    case 3:
+        snprintf(message, size, "failed to read the extension path: %s", src_path);
+    case 4:
+        snprintf(message, size, "failed to write the extension path: %s", dst_path);
+    default:
+        rb_bug("unknown return value of copy_ext_file: %d", copy_retvalue);
+    }
+    return message;
+}
+#endif
+
+static int
+copy_ext_file(char *src_path, char *dst_path)
+{
+#if defined(_WIN32)
+    int rvalue;
+
+    WCHAR *w_src = rb_w32_mbstr_to_wstr(CP_UTF8, src_path, -1, NULL);
+    WCHAR *w_dst = rb_w32_mbstr_to_wstr(CP_UTF8, dst_path, -1, NULL);
+    if (!w_src || !w_dst) {
+        rb_memerror();
+    }
+
+    rvalue = CopyFileW(w_src, w_dst, FALSE) ? 0 : 1;
+    free(w_src);
+    free(w_dst);
+    return rvalue;
+#else
+    FILE *src, *dst;
+    char buffer[1024];
+    size_t read = 0, wrote, written = 0;
+    size_t maxread = sizeof(buffer);
+    int eof = 0;
+    int clean_read = 1;
+    int retvalue = 0;
+
+    src = fopen(src_path, "rb");
+    if (!src) {
+        return 1;
+    }
+    dst = fopen(dst_path, "wb");
+    if (!dst) {
+        return 2;
+    }
+    while (!eof) {
+        if (clean_read) {
+            read = fread(buffer, 1, sizeof(buffer), src);
+            written = 0;
+        }
+        if (read > 0) {
+            wrote = fwrite(buffer+written, 1, read-written, dst);
+            if (wrote < read-written) {
+                if (ferror(dst)) {
+                    retvalue = 4;
+                    break;
+                }
+                else { // partial write
+                    clean_read = 0;
+                    written += wrote;
+                }
+            }
+            else { // Wrote the entire buffer to dst, next read is clean one
+                clean_read = 1;
+            }
+        }
+        if (read < maxread) {
+            if (clean_read && feof(src)) {
+                // If it's not clean, buffer should have bytes not written yet.
+                eof = 1;
+            }
+            else if (ferror(src)) {
+                retvalue = 3;
+                // Writes could be partial/dirty, but this load is failure anyway
+                break;
+            }
+        }
+    }
+    fclose(src);
+    fclose(dst);
+    return retvalue;
+#endif
+}
+
+#if defined __CYGWIN__ || defined DOSISH
+#define isdirsep(x) ((x) == '/' || (x) == '\\')
+#else
+#define isdirsep(x) ((x) == '/')
+#endif
+
+#define IS_SOEXT(e) (strcmp((e), ".so") == 0 || strcmp((e), ".o") == 0)
+#define IS_DLEXT(e) (strcmp((e), DLEXT) == 0)
+
+static void
+fname_without_suffix(char *fname, char *rvalue)
+{
+    char *pos;
+    strcpy(rvalue, fname);
+    for (pos = rvalue + strlen(fname); pos > rvalue; pos--) {
+        if (IS_SOEXT(pos) || IS_DLEXT(pos)) {
+            *pos = '\0';
+            return;
+        }
+    }
+}
+
+static void
+escaped_basename(char *path, char *fname, char *rvalue)
+{
+    char *pos, *leaf, *found;
+    leaf = path;
+    // `leaf + 1` looks uncomfortable (when leaf == path), but fname must not be the top-dir itself
+    while ((found = strstr(leaf + 1, fname)) != NULL) {
+        leaf = found; // find the last occurrence for the path like /etc/my-crazy-lib-dir/etc.so
+    }
+    strcpy(rvalue, leaf);
+    for (pos = rvalue; *pos; pos++) {
+        if (isdirsep(*pos)) {
+            *pos = '+';
+        }
+    }
+}
+
+VALUE
+rb_namespace_local_extension(VALUE namespace, VALUE fname, VALUE path)
+{
+    char ext_path[MAXPATHLEN], fname2[MAXPATHLEN], basename[MAXPATHLEN];
+    int copy_error, wrote;
+    char *src_path = RSTRING_PTR(path), *fname_ptr = RSTRING_PTR(fname);
+    rb_namespace_t *ns = rb_get_namespace_t(namespace);
+
+    fname_without_suffix(fname_ptr, fname2);
+    escaped_basename(src_path, fname2, basename);
+
+    wrote = sprint_ext_filename(ext_path, sizeof(ext_path), ns->ns_id, NAMESPACE_TMP_PREFIX, basename);
+    if (wrote >= (int)sizeof(ext_path)) {
+        rb_bug("Extension file path in namespace was too long");
+    }
+    copy_error = copy_ext_file(src_path, ext_path);
+    if (copy_error) {
+        char message[1024];
+#if defined(_WIN32)
+        copy_ext_file_error(message, sizeof(message));
+#else
+        copy_ext_file_error(message, sizeof(message), copy_error, src_path, ext_path);
+#endif
+        rb_raise(rb_eLoadError, "can't prepare the extension file for namespaces (%s from %s): %s", ext_path, src_path, message);
+    }
+    // TODO: register the path to be clean-uped
+    return rb_str_new_cstr(ext_path);
+}
+
+// TODO: delete it just after dln_load? or delay it?
+//       At least for _WIN32, deleting extension files should be delayed until the namespace's destructor.
+//       And it requires calling dlclose before deleting it.
+
+static void
+namespace_push(rb_thread_t *th, VALUE namespace)
+{
+    if (RTEST(th->namespaces)) {
+        rb_ary_push(th->namespaces, namespace);
+    }
+    else {
+        th->namespaces = rb_ary_new_from_args(1, namespace);
+    }
+    th->ns = rb_get_namespace_t(namespace);
+}
+
+static VALUE
+namespace_pop(VALUE th_value)
+{
+    VALUE upper_ns;
+    long stack_len;
+    rb_thread_t *th = (rb_thread_t *)th_value;
+    VALUE namespaces = th->namespaces;
+    if (!namespaces) {
+        rb_bug("Too many namespace pops");
+    }
+    rb_ary_pop(namespaces);
+    stack_len = RARRAY_LEN(namespaces);
+    if (stack_len == 0) {
+        th->namespaces = 0;
+        th->ns = main_namespace;
+    }
+    else {
+        upper_ns = RARRAY_AREF(namespaces, stack_len-1);
+        th->ns = rb_get_namespace_t(upper_ns);
+    }
+    return Qnil;
+}
+
+VALUE
+rb_namespace_exec(const rb_namespace_t *ns, namespace_exec_func *func, VALUE arg)
+{
+    rb_thread_t *th = GET_THREAD();
+    namespace_push(th, ns ? ns->ns_object : Qnil);
+    return rb_ensure(func, arg, namespace_pop, (VALUE)th);
+}
+
+struct namespace_pop2_arg {
+    rb_thread_t *th;
+    rb_namespace_t *ns;
+};
+
+static VALUE
+namespace_both_pop(VALUE arg)
+{
+    struct namespace_pop2_arg *data = (struct namespace_pop2_arg *)arg;
+    namespace_pop((VALUE) data->th);
+    rb_namespace_pop_loading_namespace(data->ns);
+    return Qnil;
+}
+
+static VALUE
+rb_namespace_load(int argc, VALUE *argv, VALUE namespace)
+{
+    VALUE fname, wrap;
+    rb_thread_t *th = GET_THREAD();
+    rb_namespace_t *ns = rb_get_namespace_t(namespace);
+
+    rb_scan_args(argc, argv, "11", &fname, &wrap);
+
+    VALUE args = rb_ary_new_from_args(2, fname, wrap);
+    namespace_push(th, namespace);
+    rb_namespace_push_loading_namespace(ns);
+    struct namespace_pop2_arg arg = {
+        .th = th,
+        .ns = ns
+    };
+    return rb_ensure(rb_load_entrypoint, args, namespace_both_pop, (VALUE)&arg);
+}
+
+static VALUE
+rb_namespace_require(VALUE namespace, VALUE fname)
+{
+    rb_thread_t *th = GET_THREAD();
+    rb_namespace_t *ns = rb_get_namespace_t(namespace);
+    namespace_push(th, namespace);
+    rb_namespace_push_loading_namespace(ns);
+    struct namespace_pop2_arg arg = {
+        .th = th,
+        .ns = ns
+    };
+    return rb_ensure(rb_require_string, fname, namespace_both_pop, (VALUE)&arg);
+}
+
+static VALUE
+rb_namespace_require_relative(VALUE namespace, VALUE fname)
+{
+    rb_thread_t *th = GET_THREAD();
+    rb_namespace_t *ns = rb_get_namespace_t(namespace);
+    namespace_push(th, namespace);
+    rb_namespace_push_loading_namespace(ns);
+    struct namespace_pop2_arg arg = {
+        .th = th,
+        .ns = ns
+    };
+    return rb_ensure(rb_require_relative_entrypoint, fname, namespace_both_pop, (VALUE)&arg);
+}
+
+static VALUE
+rb_namespace_eval_string(VALUE str)
+{
+    return rb_eval_string(RSTRING_PTR(str));
+}
+
+static VALUE
+rb_namespace_eval(VALUE namespace, VALUE str)
+{
+    rb_thread_t *th = GET_THREAD();
+
+    StringValue(str);
+
+    namespace_push(th, namespace);
+    return rb_ensure(rb_namespace_eval_string, str, namespace_pop, (VALUE)th);
+}
+
+static int namespace_experimental_warned = 0;
+
+void
+rb_initialize_main_namespace(void)
+{
+    rb_namespace_t *ns;
+    rb_vm_t *vm = GET_VM();
+    rb_thread_t *th = GET_THREAD();
+    VALUE main_ns;
+
+    if (!namespace_experimental_warned) {
+        rb_category_warn(RB_WARN_CATEGORY_EXPERIMENTAL,
+                         "Namespace is experimental, and the behavior may change in the future!\n"
+                         "See doc/namespace.md for known issues, etc.");
+        namespace_experimental_warned = 1;
+    }
+
+    main_ns = rb_class_new_instance_pass_kw(0, NULL, rb_cNamespace);
+    ns = rb_get_namespace_t(main_ns);
+    ns->ns_object = main_ns;
+    ns->ns_id = namespace_generate_id();
+    ns->is_builtin = false;
+    ns->is_user = true;
+    ns->is_optional = false;
+
+    rb_const_set(rb_cNamespace, rb_intern("MAIN"), main_ns);
+
+    vm->main_namespace = th->ns = main_namespace = ns;
+}
+
+static VALUE
+rb_namespace_inspect(VALUE obj)
+{
+    rb_namespace_t *ns;
+    VALUE r;
+    if (obj == Qfalse) {
+        r = rb_str_new_cstr("#<Namespace:root>");
+        return r;
+    }
+    ns = rb_get_namespace_t(obj);
+    r = rb_str_new_cstr("#<Namespace:");
+    rb_str_concat(r, rb_funcall(LONG2NUM(ns->ns_id), rb_intern("to_s"), 0));
+    if (NAMESPACE_BUILTIN_P(ns)) {
+        rb_str_cat_cstr(r, ",builtin");
+    }
+    if (NAMESPACE_USER_P(ns)) {
+        rb_str_cat_cstr(r, ",user");
+    }
+    if (NAMESPACE_MAIN_P(ns)) {
+        rb_str_cat_cstr(r, ",main");
+    }
+    else if (NAMESPACE_OPTIONAL_P(ns)) {
+        rb_str_cat_cstr(r, ",optional");
+    }
+    rb_str_cat_cstr(r, ">");
+    return r;
+}
+
+struct refiner_calling_super_data {
+    int argc;
+    VALUE *argv;
+};
+
+static VALUE
+namespace_builtin_refiner_calling_super(VALUE arg)
+{
+    struct refiner_calling_super_data *data = (struct refiner_calling_super_data *)arg;
+    return rb_call_super(data->argc, data->argv);
+}
+
+static VALUE
+namespace_builtin_refiner_loading_func_ensure(VALUE _)
+{
+    rb_vm_t *vm = GET_VM();
+    if (!vm->require_stack)
+        rb_bug("require_stack is not ready but the namespace refiner is called");
+    rb_namespace_disable_builtin();
+    return Qnil;
+}
+
+static VALUE
+rb_namespace_builtin_refiner_loading_func(int argc, VALUE *argv, VALUE _self)
+{
+    rb_vm_t *vm = GET_VM();
+    if (!vm->require_stack)
+        rb_bug("require_stack is not ready but the namespace refiner is called");
+    rb_namespace_enable_builtin();
+    // const rb_namespace_t *ns = rb_loading_namespace();
+    // printf("N:current loading ns: %ld\n", ns->ns_id);
+    struct refiner_calling_super_data data = {
+        .argc = argc,
+        .argv = argv
+    };
+    return rb_ensure(namespace_builtin_refiner_calling_super, (VALUE)&data,
+                     namespace_builtin_refiner_loading_func_ensure, Qnil);
+}
+
+static void
+setup_builtin_refinement(VALUE mod)
+{
+    struct rb_refinements_data data;
+    rb_refinement_setup(&data, mod, rb_mKernel);
+    rb_define_method(data.refinement, "require", rb_namespace_builtin_refiner_loading_func, -1);
+    rb_define_method(data.refinement, "require_relative", rb_namespace_builtin_refiner_loading_func, -1);
+    rb_define_method(data.refinement, "load", rb_namespace_builtin_refiner_loading_func, -1);
+}
+
+static VALUE
+namespace_user_loading_func_calling_super(VALUE arg)
+{
+    struct refiner_calling_super_data *data = (struct refiner_calling_super_data *)arg;
+    return rb_call_super(data->argc, data->argv);
+}
+
+static VALUE
+namespace_user_loading_func_ensure(VALUE arg)
+{
+    rb_namespace_t *ns = (rb_namespace_t *)arg;
+    rb_namespace_pop_loading_namespace(ns);
+    return Qnil;
+}
+
+static VALUE
+rb_namespace_user_loading_func(int argc, VALUE *argv, VALUE _self)
+{
+    const rb_namespace_t *ns;
+    rb_vm_t *vm = GET_VM();
+    if (!vm->require_stack)
+        rb_bug("require_stack is not ready but require/load is called in user namespaces");
+    ns = rb_current_namespace();
+    VM_ASSERT(rb_namespace_available() || !ns);
+    rb_namespace_push_loading_namespace(ns);
+    struct refiner_calling_super_data data = {
+        .argc = argc,
+        .argv = argv
+    };
+    return rb_ensure(namespace_user_loading_func_calling_super, (VALUE)&data,
+                     namespace_user_loading_func_ensure, (VALUE)ns);
+}
+
+static VALUE
+setup_pushing_loading_namespace_include(VALUE mod)
+{
+    rb_include_module(rb_cObject, mod);
+    return Qnil;
+}
+
+static void
+setup_pushing_loading_namespace(rb_namespace_t *ns)
+{
+    rb_namespace_exec(ns, setup_pushing_loading_namespace_include, rb_mNamespaceLoader);
+}
+
+static void
+namespace_define_loader_method(const char *name)
+{
+    rb_define_private_method(rb_mNamespaceLoader, name, rb_namespace_user_loading_func, -1);
+    rb_define_singleton_method(rb_mNamespaceLoader, name, rb_namespace_user_loading_func, -1);
+}
+
+void
+Init_enable_namespace(void)
+{
+    const char *env = getenv("RUBY_NAMESPACE");
+    if (env && strlen(env) == 1 && env[0] == '1') {
+        ruby_namespace_enabled = true;
+    }
+    else {
+        ruby_namespace_init_done = true;
+    }
+}
+
+void
+Init_Namespace(void)
+{
+    tmp_dir = system_tmpdir();
+    tmp_dir_has_dirsep = (strcmp(tmp_dir + (strlen(tmp_dir) - strlen(DIRSEP)), DIRSEP) == 0);
+
+    rb_cNamespace = rb_define_class("Namespace", rb_cModule);
+    rb_define_method(rb_cNamespace, "initialize", namespace_initialize, 0);
+
+    rb_cNamespaceEntry = rb_define_class_under(rb_cNamespace, "Entry", rb_cObject);
+    rb_define_alloc_func(rb_cNamespaceEntry, rb_namespace_entry_alloc);
+
+    rb_mNamespaceRefiner = rb_define_module_under(rb_cNamespace, "Refiner");
+    if (rb_namespace_available()) {
+        setup_builtin_refinement(rb_mNamespaceRefiner);
+    }
+
+    rb_mNamespaceLoader = rb_define_module_under(rb_cNamespace, "Loader");
+    namespace_define_loader_method("require");
+    namespace_define_loader_method("require_relative");
+    namespace_define_loader_method("load");
+
+    rb_define_singleton_method(rb_cNamespace, "enabled?", rb_namespace_s_getenabled, 0);
+    rb_define_singleton_method(rb_cNamespace, "current", rb_namespace_current, 0);
+    rb_define_singleton_method(rb_cNamespace, "is_builtin?", rb_namespace_s_is_builtin_p, 1);
+
+    rb_define_method(rb_cNamespace, "load_path", rb_namespace_load_path, 0);
+    rb_define_method(rb_cNamespace, "load", rb_namespace_load, -1);
+    rb_define_method(rb_cNamespace, "require", rb_namespace_require, 1);
+    rb_define_method(rb_cNamespace, "require_relative", rb_namespace_require_relative, 1);
+    rb_define_method(rb_cNamespace, "eval", rb_namespace_eval, 1);
+
+    rb_define_method(rb_cNamespace, "inspect", rb_namespace_inspect, 0);
+
+    rb_vm_t *vm = GET_VM();
+    vm->require_stack = rb_ary_new();
+}
diff --git a/nilclass.rb b/nilclass.rb
index 5a2e19680dcae9..acd5666c71d08d 100644
--- a/nilclass.rb
+++ b/nilclass.rb
@@ -1,4 +1,30 @@
 class NilClass
+  #
+  #  call-seq:
+  #     rationalize(eps = nil)  ->  (0/1)
+  #
+  #  Returns zero as a Rational:
+  #
+  #     nil.rationalize # => (0/1)
+  #
+  #  Argument +eps+ is ignored.
+  #
+  def rationalize(eps = nil)
+    0r
+  end
+
+  #
+  #  call-seq:
+  #     to_c -> (0+0i)
+  #
+  #  Returns zero as a Complex:
+  #
+  #     nil.to_c # => (0+0i)
+  #
+  def to_c
+    0i
+  end
+
   #
   #  call-seq:
   #     nil.to_i -> 0
@@ -22,4 +48,16 @@ def to_i
   def to_f
     return 0.0
   end
+
+  #
+  #  call-seq:
+  #     to_r  ->  (0/1)
+  #
+  #  Returns zero as a Rational:
+  #
+  #     nil.to_r # => (0/1)
+  #
+  def to_r
+    0r
+  end
 end
diff --git a/node.c b/node.c
index bd03454befc799..5d00823eb67fc7 100644
--- a/node.c
+++ b/node.c
@@ -10,59 +10,79 @@
 **********************************************************************/
 
 #ifdef UNIVERSAL_PARSER
-
 #include <stddef.h>
 #include "node.h"
 #include "rubyparser.h"
-#include "internal/parse.h"
-#define T_NODE 0x1b
+#endif
 
-#define ruby_xmalloc ast->node_buffer->config->malloc
-#undef xfree
-#define xfree ast->node_buffer->config->free
-#define rb_ident_hash_new ast->node_buffer->config->ident_hash_new
-#define rb_xmalloc_mul_add ast->node_buffer->config->xmalloc_mul_add
-#define ruby_xrealloc(var,size) (ast->node_buffer->config->realloc_n((void *)var, 1, size))
-#define rb_gc_mark ast->node_buffer->config->gc_mark
-#define rb_gc_location ast->node_buffer->config->gc_location
-#define rb_gc_mark_movable ast->node_buffer->config->gc_mark_movable
-#define Qnil ast->node_buffer->config->qnil
-#define Qtrue ast->node_buffer->config->qtrue
-#define NIL_P ast->node_buffer->config->nil_p
-#define rb_hash_aset ast->node_buffer->config->hash_aset
-#define RB_OBJ_WRITE(old, slot, young) ast->node_buffer->config->obj_write((VALUE)(old), (VALUE *)(slot), (VALUE)(young))
+#include "internal/variable.h"
 
-#else
+#define NODE_BUF_DEFAULT_SIZE (sizeof(struct RNode) * 16)
 
-#include "internal.h"
-#include "internal/hash.h"
-#include "internal/variable.h"
-#include "ruby/ruby.h"
-#include "vm_core.h"
+static void
+init_node_buffer_elem(node_buffer_elem_t *nbe, size_t allocated, void *xmalloc(size_t))
+{
+    nbe->allocated = allocated;
+    nbe->used = 0;
+    nbe->len = 0;
+    nbe->nodes = xmalloc(allocated / sizeof(struct RNode) * sizeof(struct RNode *)); /* All node requires at least RNode */
+}
+
+static void
+init_node_buffer_list(node_buffer_list_t *nb, node_buffer_elem_t *head, void *xmalloc(size_t))
+{
+    init_node_buffer_elem(head, NODE_BUF_DEFAULT_SIZE, xmalloc);
+    nb->head = nb->last = head;
+    nb->head->next = NULL;
+}
+
+#ifdef UNIVERSAL_PARSER
+#define ruby_xmalloc config->malloc
+#endif
+
+#ifdef UNIVERSAL_PARSER
+static node_buffer_t *
+rb_node_buffer_new(const rb_parser_config_t *config)
+#else
+static node_buffer_t *
+rb_node_buffer_new(void)
+#endif
+{
+    const size_t bucket_size = offsetof(node_buffer_elem_t, buf) + NODE_BUF_DEFAULT_SIZE;
+    const size_t alloc_size = sizeof(node_buffer_t) + (bucket_size);
+    STATIC_ASSERT(
+        integer_overflow,
+        offsetof(node_buffer_elem_t, buf) + NODE_BUF_DEFAULT_SIZE
+        > sizeof(node_buffer_t) + sizeof(node_buffer_elem_t));
+    node_buffer_t *nb = ruby_xmalloc(alloc_size);
+    init_node_buffer_list(&nb->buffer_list, (node_buffer_elem_t*)&nb[1], ruby_xmalloc);
+    nb->local_tables = 0;
+    nb->tokens = 0;
+    return nb;
+}
 
+#ifdef UNIVERSAL_PARSER
+#undef ruby_xmalloc
+#define ruby_xmalloc ast->config->malloc
+#undef xfree
+#define xfree ast->config->free
+#define rb_xmalloc_mul_add ast->config->xmalloc_mul_add
+#define ruby_xrealloc(var,size) (ast->config->realloc_n((void *)var, 1, size))
 #endif
 
-#define NODE_BUF_DEFAULT_LEN 16
+typedef void node_itr_t(rb_ast_t *ast, void *ctx, NODE *node);
+static void iterate_node_values(rb_ast_t *ast, node_buffer_list_t *nb, node_itr_t * func, void *ctx);
 
-/* Setup NODE structure.
- * NODE is not an object managed by GC, but it imitates an object
- * so that it can work with `RB_TYPE_P(obj, T_NODE)`.
- * This dirty hack is needed because Ripper jumbles NODEs and other type
- * objects.
- */
 void
-rb_node_init(NODE *n, enum node_type type, VALUE a0, VALUE a1, VALUE a2)
+rb_node_init(NODE *n, enum node_type type)
 {
-    n->flags = T_NODE;
-    nd_init_type(n, type);
-    n->u1.value = a0;
-    n->u2.value = a1;
-    n->u3.value = a2;
-    n->nd_loc.beg_pos.lineno = 0;
-    n->nd_loc.beg_pos.column = 0;
-    n->nd_loc.end_pos.lineno = 0;
-    n->nd_loc.end_pos.column = 0;
-    n->node_id = -1;
+    RNODE(n)->flags = 0;
+    nd_init_type(RNODE(n), type);
+    RNODE(n)->nd_loc.beg_pos.lineno = 0;
+    RNODE(n)->nd_loc.beg_pos.column = 0;
+    RNODE(n)->nd_loc.end_pos.lineno = 0;
+    RNODE(n)->nd_loc.end_pos.column = 0;
+    RNODE(n)->node_id = -1;
 }
 
 const char *
@@ -92,65 +112,20 @@ ruby_node_name(int node)
 }
 #endif
 
-static void
-init_node_buffer_list(node_buffer_list_t * nb, node_buffer_elem_t *head)
-{
-    nb->idx = 0;
-    nb->len = NODE_BUF_DEFAULT_LEN;
-    nb->head = nb->last = head;
-    nb->head->len = nb->len;
-    nb->head->next = NULL;
-}
-
-#ifdef UNIVERSAL_PARSER
-static node_buffer_t *
-rb_node_buffer_new(rb_parser_config_t *config)
-{
-    const size_t bucket_size = offsetof(node_buffer_elem_t, buf) + NODE_BUF_DEFAULT_LEN * sizeof(NODE);
-    const size_t alloc_size = sizeof(node_buffer_t) + (bucket_size * 2);
-    STATIC_ASSERT(
-        integer_overflow,
-        offsetof(node_buffer_elem_t, buf) + NODE_BUF_DEFAULT_LEN * sizeof(NODE)
-        > sizeof(node_buffer_t) + 2 * sizeof(node_buffer_elem_t));
-    node_buffer_t *nb = config->malloc(alloc_size);
-    init_node_buffer_list(&nb->unmarkable, (node_buffer_elem_t*)&nb[1]);
-    init_node_buffer_list(&nb->markable, (node_buffer_elem_t*)((size_t)nb->unmarkable.head + bucket_size));
-    nb->local_tables = 0;
-    nb->mark_hash = config->qnil;
-    nb->tokens = config->qnil;
-    nb->config = config;
-    return nb;
-}
-#else
-static node_buffer_t *
-rb_node_buffer_new(void)
-{
-    const size_t bucket_size = offsetof(node_buffer_elem_t, buf) + NODE_BUF_DEFAULT_LEN * sizeof(NODE);
-    const size_t alloc_size = sizeof(node_buffer_t) + (bucket_size * 2);
-    STATIC_ASSERT(
-        integer_overflow,
-        offsetof(node_buffer_elem_t, buf) + NODE_BUF_DEFAULT_LEN * sizeof(NODE)
-        > sizeof(node_buffer_t) + 2 * sizeof(node_buffer_elem_t));
-    node_buffer_t *nb = ruby_xmalloc(alloc_size);
-    init_node_buffer_list(&nb->unmarkable, (node_buffer_elem_t*)&nb[1]);
-    init_node_buffer_list(&nb->markable, (node_buffer_elem_t*)((size_t)nb->unmarkable.head + bucket_size));
-    nb->local_tables = 0;
-    nb->mark_hash = Qnil;
-    nb->tokens = Qnil;
-    return nb;
-}
-#endif
-
 static void
 node_buffer_list_free(rb_ast_t *ast, node_buffer_list_t * nb)
 {
     node_buffer_elem_t *nbe = nb->head;
-
     while (nbe != nb->last) {
         void *buf = nbe;
+        xfree(nbe->nodes);
         nbe = nbe->next;
         xfree(buf);
     }
+
+    /* The last node_buffer_elem_t is allocated in the node_buffer_t, so we
+     * only need to free the nodes. */
+    xfree(nbe->nodes);
 }
 
 struct rb_ast_local_table_link {
@@ -161,11 +136,100 @@ struct rb_ast_local_table_link {
     // }
 };
 
+static void
+parser_string_free(rb_ast_t *ast, rb_parser_string_t *str)
+{
+    if (!str) return;
+    xfree(str->ptr);
+    xfree(str);
+}
+
+static void
+parser_ast_token_free(rb_ast_t *ast, rb_parser_ast_token_t *token)
+{
+    if (!token) return;
+    parser_string_free(ast, token->str);
+    xfree(token);
+}
+
+static void
+parser_tokens_free(rb_ast_t *ast, rb_parser_ary_t *tokens)
+{
+    for (long i = 0; i < tokens->len; i++) {
+        parser_ast_token_free(ast, tokens->data[i]);
+    }
+    xfree(tokens->data);
+    xfree(tokens);
+}
+
+static void
+parser_nodes_free(rb_ast_t *ast, rb_parser_ary_t *nodes)
+{
+    /* Do nothing for nodes because nodes are freed when rb_ast_t is freed */
+    xfree(nodes->data);
+    xfree(nodes);
+}
+
+static void
+free_ast_value(rb_ast_t *ast, void *ctx, NODE *node)
+{
+    switch (nd_type(node)) {
+      case NODE_STR:
+        parser_string_free(ast, RNODE_STR(node)->string);
+        break;
+      case NODE_DSTR:
+        parser_string_free(ast, RNODE_DSTR(node)->string);
+        break;
+      case NODE_XSTR:
+        parser_string_free(ast, RNODE_XSTR(node)->string);
+        break;
+      case NODE_DXSTR:
+        parser_string_free(ast, RNODE_DXSTR(node)->string);
+        break;
+      case NODE_SYM:
+        parser_string_free(ast, RNODE_SYM(node)->string);
+        break;
+      case NODE_REGX:
+      case NODE_MATCH:
+        parser_string_free(ast, RNODE_REGX(node)->string);
+        break;
+      case NODE_DSYM:
+        parser_string_free(ast, RNODE_DSYM(node)->string);
+        break;
+      case NODE_DREGX:
+        parser_string_free(ast, RNODE_DREGX(node)->string);
+        break;
+      case NODE_FILE:
+        parser_string_free(ast, RNODE_FILE(node)->path);
+        break;
+      case NODE_INTEGER:
+        xfree(RNODE_INTEGER(node)->val);
+        break;
+      case NODE_FLOAT:
+        xfree(RNODE_FLOAT(node)->val);
+        break;
+      case NODE_RATIONAL:
+        xfree(RNODE_RATIONAL(node)->val);
+        break;
+      case NODE_IMAGINARY:
+        xfree(RNODE_IMAGINARY(node)->val);
+        break;
+      case NODE_UNDEF:
+        parser_nodes_free(ast, RNODE_UNDEF(node)->nd_undefs);
+        break;
+      default:
+        break;
+    }
+}
+
 static void
 rb_node_buffer_free(rb_ast_t *ast, node_buffer_t *nb)
 {
-    node_buffer_list_free(ast, &nb->unmarkable);
-    node_buffer_list_free(ast, &nb->markable);
+    if (nb->tokens) {
+        parser_tokens_free(ast, nb->tokens);
+    }
+    iterate_node_values(ast, &nb->buffer_list, free_ast_value, NULL);
+    node_buffer_list_free(ast, &nb->buffer_list);
     struct rb_ast_local_table_link *local_table = nb->local_tables;
     while (local_table) {
         struct rb_ast_local_table_link *next_table = local_table->next;
@@ -175,65 +239,41 @@ rb_node_buffer_free(rb_ast_t *ast, node_buffer_t *nb)
     xfree(nb);
 }
 
+#define buf_add_offset(nbe, offset) ((char *)(nbe->buf) + (offset))
+
 static NODE *
-ast_newnode_in_bucket(rb_ast_t *ast, node_buffer_list_t *nb)
+ast_newnode_in_bucket(rb_ast_t *ast, node_buffer_list_t *nb, size_t size, size_t alignment)
 {
-    if (nb->idx >= nb->len) {
-        long n = nb->len * 2;
+    size_t padding;
+    NODE *ptr;
+
+    padding = alignment - (size_t)buf_add_offset(nb->head, nb->head->used) % alignment;
+    padding = padding == alignment ? 0 : padding;
+
+    if (nb->head->used + size + padding > nb->head->allocated) {
+        size_t n = nb->head->allocated * 2;
         node_buffer_elem_t *nbe;
-        nbe = rb_xmalloc_mul_add(n, sizeof(NODE), offsetof(node_buffer_elem_t, buf));
-        nbe->len = n;
-        nb->idx = 0;
-        nb->len = n;
+        nbe = rb_xmalloc_mul_add(n, sizeof(char *), offsetof(node_buffer_elem_t, buf));
+        init_node_buffer_elem(nbe, n, ruby_xmalloc);
         nbe->next = nb->head;
         nb->head = nbe;
+        padding = 0; /* malloc returns aligned address then no need to add padding */
     }
-    return &nb->head->buf[nb->idx++];
-}
 
-RBIMPL_ATTR_PURE()
-static bool
-nodetype_markable_p(enum node_type type)
-{
-    switch (type) {
-      case NODE_MATCH:
-      case NODE_LIT:
-      case NODE_STR:
-      case NODE_XSTR:
-      case NODE_DSTR:
-      case NODE_DXSTR:
-      case NODE_DREGX:
-      case NODE_DSYM:
-      case NODE_ARGS:
-      case NODE_ARYPTN:
-      case NODE_FNDPTN:
-        return true;
-      default:
-        return false;
-    }
+    ptr = (NODE *)buf_add_offset(nb->head, nb->head->used + padding);
+    nb->head->used += (size + padding);
+    nb->head->nodes[nb->head->len++] = ptr;
+    return ptr;
 }
 
 NODE *
-rb_ast_newnode(rb_ast_t *ast, enum node_type type)
+rb_ast_newnode(rb_ast_t *ast, enum node_type type, size_t size, size_t alignment)
 {
     node_buffer_t *nb = ast->node_buffer;
-    node_buffer_list_t *bucket =
-        (nodetype_markable_p(type) ? &nb->markable : &nb->unmarkable);
-    return ast_newnode_in_bucket(ast, bucket);
+    node_buffer_list_t *bucket = &nb->buffer_list;
+    return ast_newnode_in_bucket(ast, bucket, size, alignment);
 }
 
-#if RUBY_DEBUG
-void
-rb_ast_node_type_change(NODE *n, enum node_type type)
-{
-    enum node_type old_type = nd_type(n);
-    if (nodetype_markable_p(old_type) != nodetype_markable_p(type)) {
-        rb_bug("node type changed: %s -> %s",
-               ruby_node_name(old_type), ruby_node_name(type));
-    }
-}
-#endif
-
 rb_ast_id_table_t *
 rb_ast_new_local_table(rb_ast_t *ast, int size)
 {
@@ -268,30 +308,31 @@ rb_ast_delete_node(rb_ast_t *ast, NODE *n)
 
 #ifdef UNIVERSAL_PARSER
 rb_ast_t *
-rb_ast_new(rb_parser_config_t *config)
+rb_ast_new(const rb_parser_config_t *config)
 {
     node_buffer_t *nb = rb_node_buffer_new(config);
-    config->counter++;
-    return config->ast_new((VALUE)nb);
+    rb_ast_t *ast = (rb_ast_t *)config->calloc(1, sizeof(rb_ast_t));
+    ast->config = config;
+    ast->node_buffer = nb;
+    return ast;
 }
 #else
 rb_ast_t *
 rb_ast_new(void)
 {
     node_buffer_t *nb = rb_node_buffer_new();
-    rb_ast_t *ast = (rb_ast_t *)rb_imemo_new(imemo_ast, 0, 0, 0, (VALUE)nb);
+    rb_ast_t *ast = ruby_xcalloc(1, sizeof(rb_ast_t));
+    ast->node_buffer = nb;
     return ast;
 }
 #endif
 
-typedef void node_itr_t(rb_ast_t *ast, void *ctx, NODE * node);
-
 static void
 iterate_buffer_elements(rb_ast_t *ast, node_buffer_elem_t *nbe, long len, node_itr_t *func, void *ctx)
 {
     long cursor;
     for (cursor = 0; cursor < len; cursor++) {
-        func(ast, ctx, &nbe->buf[cursor]);
+        func(ast, ctx, nbe->nodes[cursor]);
     }
 }
 
@@ -300,10 +341,6 @@ iterate_node_values(rb_ast_t *ast, node_buffer_list_t *nb, node_itr_t * func, vo
 {
     node_buffer_elem_t *nbe = nb->head;
 
-    /* iterate over the head first because it's not full */
-    iterate_buffer_elements(ast, nbe, nb->idx, func, ctx);
-
-    nbe = nbe->next;
     while (nbe) {
         iterate_buffer_elements(ast, nbe, nbe->len, func, ctx);
         nbe = nbe->next;
@@ -311,110 +348,21 @@ iterate_node_values(rb_ast_t *ast, node_buffer_list_t *nb, node_itr_t * func, vo
 }
 
 static void
-mark_ast_value(rb_ast_t *ast, void *ctx, NODE * node)
+script_lines_free(rb_ast_t *ast, rb_parser_ary_t *script_lines)
 {
-#ifdef UNIVERSAL_PARSER
-    bug_report_func rb_bug = ast->node_buffer->config->bug;
-#endif
-
-    switch (nd_type(node)) {
-      case NODE_ARGS:
-        {
-            struct rb_args_info *args = node->nd_ainfo;
-            rb_gc_mark_movable(args->imemo);
-            break;
-        }
-      case NODE_MATCH:
-      case NODE_LIT:
-      case NODE_STR:
-      case NODE_XSTR:
-      case NODE_DSTR:
-      case NODE_DXSTR:
-      case NODE_DREGX:
-      case NODE_DSYM:
-        rb_gc_mark_movable(node->nd_lit);
-        break;
-      case NODE_ARYPTN:
-      case NODE_FNDPTN:
-        rb_gc_mark_movable(node->nd_rval);
-        break;
-      default:
-        rb_bug("unreachable node %s", ruby_node_name(nd_type(node)));
-    }
-}
-
-static void
-update_ast_value(rb_ast_t *ast, void *ctx, NODE * node)
-{
-#ifdef UNIVERSAL_PARSER
-    bug_report_func rb_bug = ast->node_buffer->config->bug;
-#endif
-
-    switch (nd_type(node)) {
-      case NODE_ARGS:
-        {
-            struct rb_args_info *args = node->nd_ainfo;
-            args->imemo = rb_gc_location(args->imemo);
-            break;
-        }
-      case NODE_MATCH:
-      case NODE_LIT:
-      case NODE_STR:
-      case NODE_XSTR:
-      case NODE_DSTR:
-      case NODE_DXSTR:
-      case NODE_DREGX:
-      case NODE_DSYM:
-        node->nd_lit = rb_gc_location(node->nd_lit);
-        break;
-      case NODE_ARYPTN:
-      case NODE_FNDPTN:
-        node->nd_rval = rb_gc_location(node->nd_rval);
-        break;
-      default:
-        rb_bug("unreachable");
-    }
-}
-
-void
-rb_ast_update_references(rb_ast_t *ast)
-{
-    if (ast->node_buffer) {
-        node_buffer_t *nb = ast->node_buffer;
-
-        iterate_node_values(ast, &nb->markable, update_ast_value, NULL);
-    }
-}
-
-void
-rb_ast_mark(rb_ast_t *ast)
-{
-    if (ast->node_buffer) {
-        rb_gc_mark(ast->node_buffer->mark_hash);
-        rb_gc_mark(ast->node_buffer->tokens);
-        node_buffer_t *nb = ast->node_buffer;
-        iterate_node_values(ast, &nb->markable, mark_ast_value, NULL);
-        if (ast->body.script_lines) rb_gc_mark(ast->body.script_lines);
+    if (!script_lines) return;
+    for (long i = 0; i < script_lines->len; i++) {
+        parser_string_free(ast, (rb_parser_string_t *)script_lines->data[i]);
     }
+    xfree(script_lines->data);
+    xfree(script_lines);
 }
 
 void
 rb_ast_free(rb_ast_t *ast)
 {
-    if (ast->node_buffer) {
-#ifdef UNIVERSAL_PARSER
-        rb_parser_config_t *config = ast->node_buffer->config;
-#endif
-
-        rb_node_buffer_free(ast, ast->node_buffer);
-        ast->node_buffer = 0;
-#ifdef UNIVERSAL_PARSER
-        config->counter--;
-        if (config->counter <= 0) {
-            rb_ruby_parser_config_free(config);
-        }
-#endif
-    }
+    rb_ast_dispose(ast);
+    xfree(ast);
 }
 
 static size_t
@@ -423,8 +371,8 @@ buffer_list_size(node_buffer_list_t *nb)
     size_t size = 0;
     node_buffer_elem_t *nbe = nb->head;
     while (nbe != nb->last) {
+        size += offsetof(node_buffer_elem_t, buf) + nbe->used;
         nbe = nbe->next;
-        size += offsetof(node_buffer_elem_t, buf) + nb->len * sizeof(NODE);
     }
     return size;
 }
@@ -432,49 +380,67 @@ buffer_list_size(node_buffer_list_t *nb)
 size_t
 rb_ast_memsize(const rb_ast_t *ast)
 {
-    size_t size = 0;
+    size_t size = sizeof(rb_ast_t);
     node_buffer_t *nb = ast->node_buffer;
+    rb_parser_ary_t *tokens = NULL;
+    struct rb_ast_local_table_link *link = NULL;
+    rb_parser_ary_t *script_lines = ast->body.script_lines;
+
+    long i;
 
     if (nb) {
-        size += sizeof(node_buffer_t) + offsetof(node_buffer_elem_t, buf) + NODE_BUF_DEFAULT_LEN * sizeof(NODE);
-        size += buffer_list_size(&nb->unmarkable);
-        size += buffer_list_size(&nb->markable);
+        size += sizeof(node_buffer_t);
+        size += buffer_list_size(&nb->buffer_list);
+        link = nb->local_tables;
+        tokens = nb->tokens;
     }
-    return size;
-}
 
-void
-rb_ast_dispose(rb_ast_t *ast)
-{
-    rb_ast_free(ast);
-}
+    while (link) {
+        size += sizeof(struct rb_ast_local_table_link);
+        size += link->size * sizeof(ID);
+        link = link->next;
+    }
 
-void
-rb_ast_add_mark_object(rb_ast_t *ast, VALUE obj)
-{
-    if (NIL_P(ast->node_buffer->mark_hash)) {
-        RB_OBJ_WRITE(ast, &ast->node_buffer->mark_hash, rb_ident_hash_new());
+    if (tokens) {
+        size += sizeof(rb_parser_ary_t);
+        for (i = 0; i < tokens->len; i++) {
+            size += sizeof(rb_parser_ast_token_t);
+            rb_parser_ast_token_t *token = tokens->data[i];
+            size += sizeof(rb_parser_string_t);
+            size += token->str->len + 1;
+        }
     }
-    rb_hash_aset(ast->node_buffer->mark_hash, obj, Qtrue);
-}
 
-VALUE
-rb_ast_tokens(rb_ast_t *ast)
-{
-    return ast->node_buffer->tokens;
+    if (script_lines) {
+        size += sizeof(rb_parser_ary_t);
+        for (i = 0; i < script_lines->len; i++) {
+            size += sizeof(rb_parser_string_t);
+            size += ((rb_parser_string_t *)script_lines->data[i])->len + 1;
+        }
+    }
+
+    return size;
 }
 
 void
-rb_ast_set_tokens(rb_ast_t *ast, VALUE tokens)
+rb_ast_dispose(rb_ast_t *ast)
 {
-    RB_OBJ_WRITE(ast, &ast->node_buffer->tokens, tokens);
+    if (ast && ast->node_buffer) {
+        script_lines_free(ast, ast->body.script_lines);
+        ast->body.script_lines = NULL;
+        rb_node_buffer_free(ast, ast->node_buffer);
+        ast->node_buffer = 0;
+    }
 }
 
 VALUE
 rb_node_set_type(NODE *n, enum node_type t)
 {
-#if RUBY_DEBUG
-    rb_ast_node_type_change(n, t);
-#endif
     return nd_init_type(n, t);
 }
+
+enum node_type
+rb_node_get_type(const NODE *n)
+{
+    return (enum node_type)nd_type(n);
+}
diff --git a/node.h b/node.h
index 1f365960fcbcc2..d8ee7dbb649d25 100644
--- a/node.h
+++ b/node.h
@@ -15,58 +15,47 @@
 #include "rubyparser.h"
 #include "ruby/backward/2/attributes.h"
 
-typedef void (*bug_report_func)(const char *fmt, ...);
-
+typedef void (*bug_report_func)(const char *fmt, ...) RUBYPARSER_ATTRIBUTE_FORMAT(1, 2);
 typedef struct node_buffer_elem_struct {
     struct node_buffer_elem_struct *next;
-    long len;
-    NODE buf[FLEX_ARY_LEN];
+    long len; /* Length of nodes */
+    size_t allocated; /* Total memory size of allocated buf */
+    size_t used; /* Current usage of buf */
+    NODE **nodes; /* Array of node pointers */
+    NODE *buf[FLEX_ARY_LEN];
 } node_buffer_elem_t;
 
 typedef struct {
-    long idx, len;
     node_buffer_elem_t *head;
     node_buffer_elem_t *last;
 } node_buffer_list_t;
 
 struct node_buffer_struct {
-    node_buffer_list_t unmarkable;
-    node_buffer_list_t markable;
+    node_buffer_list_t buffer_list;
     struct rb_ast_local_table_link *local_tables;
-    VALUE mark_hash;
     // - id (sequence number)
     // - token_type
     // - text of token
     // - location info
     // Array, whose entry is array
-    VALUE tokens;
-#ifdef UNIVERSAL_PARSER
-    rb_parser_config_t *config;
-#endif
+    rb_parser_ary_t *tokens;
 };
 
 RUBY_SYMBOL_EXPORT_BEGIN
 
 #ifdef UNIVERSAL_PARSER
-rb_ast_t *rb_ast_new(rb_parser_config_t *config);
+rb_ast_t *rb_ast_new(const rb_parser_config_t *config);
 #else
-rb_ast_t *rb_ast_new();
+rb_ast_t *rb_ast_new(void);
 #endif
 size_t rb_ast_memsize(const rb_ast_t*);
 void rb_ast_dispose(rb_ast_t*);
-VALUE rb_ast_tokens(rb_ast_t *ast);
-#if RUBY_DEBUG
-void rb_ast_node_type_change(NODE *n, enum node_type type);
-#endif
 const char *ruby_node_name(int node);
-void rb_node_init(NODE *n, enum node_type type, VALUE a0, VALUE a1, VALUE a2);
+void rb_node_init(NODE *n, enum node_type type);
 
-void rb_ast_mark(rb_ast_t*);
 void rb_ast_update_references(rb_ast_t*);
 void rb_ast_free(rb_ast_t*);
-void rb_ast_add_mark_object(rb_ast_t*, VALUE);
-void rb_ast_set_tokens(rb_ast_t*, VALUE);
-NODE *rb_ast_newnode(rb_ast_t*, enum node_type type);
+NODE *rb_ast_newnode(rb_ast_t*, enum node_type type, size_t size, size_t alignment);
 void rb_ast_delete_node(rb_ast_t*, NODE *n);
 rb_ast_id_table_t *rb_ast_new_local_table(rb_ast_t*, int);
 rb_ast_id_table_t *rb_ast_resize_latest_local_table(rb_ast_t*, int);
@@ -76,45 +65,53 @@ VALUE rb_parser_dump_tree(const NODE *node, int comment);
 const struct kwtable *rb_reserved_word(const char *, unsigned int);
 
 struct parser_params;
-void *rb_parser_malloc(struct parser_params *, size_t);
-void *rb_parser_realloc(struct parser_params *, void *, size_t);
-void *rb_parser_calloc(struct parser_params *, size_t, size_t);
-void rb_parser_free(struct parser_params *, void *);
 PRINTF_ARGS(void rb_parser_printf(struct parser_params *parser, const char *fmt, ...), 2, 3);
 VALUE rb_node_set_type(NODE *n, enum node_type t);
+enum node_type rb_node_get_type(const NODE *n);
 
 RUBY_SYMBOL_EXPORT_END
 
 #define NODE_LSHIFT (NODE_TYPESHIFT+7)
 #define NODE_LMASK  (((SIGNED_VALUE)1<<(sizeof(VALUE)*CHAR_BIT-NODE_LSHIFT))-1)
 
-#define nd_line(n) (int)(((SIGNED_VALUE)(n)->flags)>>NODE_LSHIFT)
-#define nd_set_line(n,l) \
-    (n)->flags=(((n)->flags&~((VALUE)(-1)<<NODE_LSHIFT))|((VALUE)((l)&NODE_LMASK)<<NODE_LSHIFT))
+static inline int
+nd_line(const NODE *n)
+{
+    if (!n) return -1;
+    SIGNED_VALUE flags = (SIGNED_VALUE)n->flags;
+    return (int)(flags >> NODE_LSHIFT);
+}
 
+static inline void
+nd_set_line(NODE *n, SIGNED_VALUE l)
+{
+    n->flags &= ~(~(VALUE)0 << NODE_LSHIFT);
+    n->flags |= ((VALUE)(l & NODE_LMASK) << NODE_LSHIFT);
+}
 
 #define NODE_SPECIAL_REQUIRED_KEYWORD ((NODE *)-1)
-#define NODE_REQUIRED_KEYWORD_P(node) ((node)->nd_value == NODE_SPECIAL_REQUIRED_KEYWORD)
+#define NODE_REQUIRED_KEYWORD_P(node) ((node) == NODE_SPECIAL_REQUIRED_KEYWORD)
 #define NODE_SPECIAL_NO_NAME_REST     ((NODE *)-1)
 #define NODE_NAMED_REST_P(node) ((node) != NODE_SPECIAL_NO_NAME_REST)
 #define NODE_SPECIAL_EXCESSIVE_COMMA   ((ID)1)
 #define NODE_SPECIAL_NO_REST_KEYWORD   ((NODE *)-1)
 
-#define nd_first_column(n) ((int)((n)->nd_loc.beg_pos.column))
-#define nd_set_first_column(n, v) ((n)->nd_loc.beg_pos.column = (v))
-#define nd_first_lineno(n) ((int)((n)->nd_loc.beg_pos.lineno))
-#define nd_set_first_lineno(n, v) ((n)->nd_loc.beg_pos.lineno = (v))
-#define nd_first_loc(n) ((n)->nd_loc.beg_pos)
+#define nd_code_loc(n) (&RNODE(n)->nd_loc)
+#define nd_first_column(n) ((int)(RNODE(n)->nd_loc.beg_pos.column))
+#define nd_set_first_column(n, v) (RNODE(n)->nd_loc.beg_pos.column = (v))
+#define nd_first_lineno(n) ((int)(RNODE(n)->nd_loc.beg_pos.lineno))
+#define nd_set_first_lineno(n, v) (RNODE(n)->nd_loc.beg_pos.lineno = (v))
+#define nd_first_loc(n) (RNODE(n)->nd_loc.beg_pos)
 #define nd_set_first_loc(n, v) (nd_first_loc(n) = (v))
 
-#define nd_last_column(n) ((int)((n)->nd_loc.end_pos.column))
-#define nd_set_last_column(n, v) ((n)->nd_loc.end_pos.column = (v))
-#define nd_last_lineno(n) ((int)((n)->nd_loc.end_pos.lineno))
-#define nd_set_last_lineno(n, v) ((n)->nd_loc.end_pos.lineno = (v))
-#define nd_last_loc(n) ((n)->nd_loc.end_pos)
+#define nd_last_column(n) ((int)(RNODE(n)->nd_loc.end_pos.column))
+#define nd_set_last_column(n, v) (RNODE(n)->nd_loc.end_pos.column = (v))
+#define nd_last_lineno(n) ((int)(RNODE(n)->nd_loc.end_pos.lineno))
+#define nd_set_last_lineno(n, v) (RNODE(n)->nd_loc.end_pos.lineno = (v))
+#define nd_last_loc(n) (RNODE(n)->nd_loc.end_pos)
 #define nd_set_last_loc(n, v) (nd_last_loc(n) = (v))
-#define nd_node_id(n) ((n)->node_id)
-#define nd_set_node_id(n,id) ((n)->node_id = (id))
+#define nd_node_id(n) (RNODE(n)->node_id)
+#define nd_set_node_id(n,id) (RNODE(n)->node_id = (id))
 
 static inline bool
 nd_type_p(const NODE *n, enum node_type t)
diff --git a/node_dump.c b/node_dump.c
index c13403d77ffa25..ff5cc268ecd5f5 100644
--- a/node_dump.c
+++ b/node_dump.c
@@ -10,7 +10,9 @@
 **********************************************************************/
 
 #include "internal.h"
+#include "internal/class.h"
 #include "internal/hash.h"
+#include "internal/ruby_parser.h"
 #include "internal/variable.h"
 #include "ruby/ruby.h"
 #include "vm_core.h"
@@ -25,12 +27,16 @@
 #define A_INT(val) rb_str_catf(buf, "%d", (val))
 #define A_LONG(val) rb_str_catf(buf, "%ld", (val))
 #define A_LIT(lit) AR(rb_dump_literal(lit))
+#define A_LOC(loc) \
+    rb_str_catf(buf, "(%d,%d)-(%d,%d)", \
+                loc.beg_pos.lineno, loc.beg_pos.column, \
+                loc.end_pos.lineno, loc.end_pos.column)
 #define A_NODE_HEADER(node, term) \
     rb_str_catf(buf, "@ %s (id: %d, line: %d, location: (%d,%d)-(%d,%d))%s"term, \
                 ruby_node_name(nd_type(node)), nd_node_id(node), nd_line(node), \
                 nd_first_lineno(node), nd_first_column(node), \
                 nd_last_lineno(node), nd_last_column(node), \
-                (node->flags & NODE_FL_NEWLINE ? "*" : ""))
+                (nd_fl_newline(node) ? "*" : ""))
 #define A_FIELD_HEADER(len, name, term) \
     rb_str_catf(buf, "+- %.*s:"term, (len), (name))
 #define D_FIELD_HEADER(len, name, term) (A_INDENT, A_FIELD_HEADER(len, name, term))
@@ -58,16 +64,41 @@
          field_flag; /* should be optimized away */ \
          reset, field_flag = 0)
 
+#define A_SHAREABILITY(shareability) \
+    switch (shareability) { \
+      case rb_parser_shareable_none: \
+        rb_str_cat_cstr(buf, "none"); \
+        break; \
+      case rb_parser_shareable_literal: \
+        rb_str_cat_cstr(buf, "literal"); \
+        break; \
+      case rb_parser_shareable_copy: \
+        rb_str_cat_cstr(buf, "experimental_copy"); \
+        break; \
+      case rb_parser_shareable_everything: \
+        rb_str_cat_cstr(buf, "experimental_everything"); \
+        break; \
+    }
+
 #define SIMPLE_FIELD1(name, ann)    SIMPLE_FIELD(FIELD_NAME_LEN(name, ann), FIELD_NAME_DESC(name, ann))
 #define F_CUSTOM1(name, ann)	    SIMPLE_FIELD1(#name, ann)
-#define F_ID(name, ann) 	    SIMPLE_FIELD1(#name, ann) A_ID(node->name)
-#define F_INT(name, ann)	    SIMPLE_FIELD1(#name, ann) A_INT(node->name)
-#define F_LONG(name, ann)	    SIMPLE_FIELD1(#name, ann) A_LONG(node->name)
-#define F_LIT(name, ann)	    SIMPLE_FIELD1(#name, ann) A_LIT(node->name)
+#define F_ID(name, type, ann) 	    SIMPLE_FIELD1(#name, ann) A_ID(type(node)->name)
+#define F_INT(name, type, ann)	    SIMPLE_FIELD1(#name, ann) A_INT(type(node)->name)
+#define F_LONG(name, type, ann)	    SIMPLE_FIELD1(#name, ann) A_LONG(type(node)->name)
+#define F_LIT(name, type, ann)	    SIMPLE_FIELD1(#name, ann) A_LIT(type(node)->name)
+#define F_VALUE(name, val, ann)     SIMPLE_FIELD1(#name, ann) A_LIT(val)
 #define F_MSG(name, ann, desc)	    SIMPLE_FIELD1(#name, ann) A(desc)
+#define F_LOC(name, type)           SIMPLE_FIELD1(#name, "")  A_LOC(type(node)->name)
+#define F_SHAREABILITY(name, type, ann) SIMPLE_FIELD1(#name, ann) A_SHAREABILITY(type(node)->name)
+
+#define F_NODE(name, type, ann) \
+    COMPOUND_FIELD1(#name, ann) {dump_node(buf, indent, comment, RNODE(type(node)->name));}
+
+#define F_NODE2(name, n, ann) \
+    COMPOUND_FIELD1(#name, ann) {dump_node(buf, indent, comment, n);}
 
-#define F_NODE(name, ann) \
-    COMPOUND_FIELD1(#name, ann) {dump_node(buf, indent, comment, node->name);}
+#define F_ARRAY(name, type, ann) \
+    COMPOUND_FIELD1(#name, ann) {dump_parser_array(buf, indent, comment, type(node)->name);}
 
 #define ANN(ann) \
     if (comment) { \
@@ -84,7 +115,7 @@ rb_dump_literal(VALUE lit)
         switch (RB_BUILTIN_TYPE(lit)) {
           case T_CLASS: case T_MODULE: case T_ICLASS:
             str = rb_class_path(lit);
-            if (FL_TEST(lit, FL_SINGLETON)) {
+            if (RCLASS_SINGLETON_P(lit)) {
                 str = rb_sprintf("<%"PRIsVALUE">", str);
             }
             return str;
@@ -131,14 +162,36 @@ dump_array(VALUE buf, VALUE indent, int comment, const NODE *node)
 {
     int field_flag;
     const char *next_indent = default_indent;
-    F_LONG(nd_alen, "length");
-    F_NODE(nd_head, "element");
-    while (node->nd_next && nd_type_p(node->nd_next, NODE_LIST)) {
-        node = node->nd_next;
-        F_NODE(nd_head, "element");
+    F_LONG(as.nd_alen, RNODE_LIST, "length");
+    F_NODE(nd_head, RNODE_LIST, "element");
+    while (RNODE_LIST(node)->nd_next && nd_type_p(RNODE_LIST(node)->nd_next, NODE_LIST)) {
+        node = RNODE_LIST(node)->nd_next;
+        F_NODE(nd_head, RNODE_LIST, "element");
     }
     LAST_NODE;
-    F_NODE(nd_next, "next element");
+    F_NODE(nd_next, RNODE_LIST, "next element");
+}
+
+static void
+dump_parser_array(VALUE buf, VALUE indent, int comment, const rb_parser_ary_t *ary)
+{
+    int field_flag;
+    const char *next_indent = default_indent;
+
+    if (ary->data_type != PARSER_ARY_DATA_NODE) {
+        rb_bug("unexpected rb_parser_ary_data_type: %d", ary->data_type);
+    }
+
+    F_CUSTOM1(length, "length") { A_LONG(ary->len); }
+    for (long i = 0; i < ary->len; i++) {
+        if (i == ary->len - 1) LAST_NODE;
+        A_INDENT;
+        rb_str_catf(buf, "+- element (%s%ld):\n",
+                    comment ? "statement #" : "", i);
+        D_INDENT;
+        dump_node(buf, indent, comment, ary->data[i]);
+        D_DEDENT;
+    }
 }
 
 static void
@@ -167,16 +220,16 @@ dump_node(VALUE buf, VALUE indent, int comment, const NODE * node)
             A_INDENT;
             rb_str_catf(buf, "+- nd_head (%s%d):\n",
                         comment ? "statement #" : "", ++i);
-            if (!node->nd_next) LAST_NODE;
+            if (!RNODE_BLOCK(node)->nd_next) LAST_NODE;
             D_INDENT;
-            dump_node(buf, indent, comment, node->nd_head);
+            dump_node(buf, indent, comment, RNODE_BLOCK(node)->nd_head);
             D_DEDENT;
-        } while (node->nd_next &&
-                 nd_type_p(node->nd_next, NODE_BLOCK) &&
-                 (node = node->nd_next, 1));
-        if (node->nd_next) {
+        } while (RNODE_BLOCK(node)->nd_next &&
+                 nd_type_p(RNODE_BLOCK(node)->nd_next, NODE_BLOCK) &&
+                 (node = RNODE_BLOCK(node)->nd_next, 1));
+        if (RNODE_BLOCK(node)->nd_next) {
             LAST_NODE;
-            F_NODE(nd_next, "next block");
+            F_NODE(nd_next, RNODE_BLOCK, "next block");
         }
         return;
 
@@ -184,65 +237,80 @@ dump_node(VALUE buf, VALUE indent, int comment, const NODE * node)
         ANN("if statement");
         ANN("format: if [nd_cond] then [nd_body] else [nd_else] end");
         ANN("example: if x == 1 then foo else bar end");
-        F_NODE(nd_cond, "condition expr");
-        F_NODE(nd_body, "then clause");
+        F_NODE(nd_cond, RNODE_IF, "condition expr");
+        F_NODE(nd_body, RNODE_IF, "then clause");
+        F_NODE(nd_else, RNODE_IF, "else clause");
+        F_LOC(if_keyword_loc, RNODE_IF);
+        F_LOC(then_keyword_loc, RNODE_IF);
         LAST_NODE;
-        F_NODE(nd_else, "else clause");
+        F_LOC(end_keyword_loc, RNODE_IF);
         return;
 
       case NODE_UNLESS:
         ANN("unless statement");
         ANN("format: unless [nd_cond] then [nd_body] else [nd_else] end");
         ANN("example: unless x == 1 then foo else bar end");
-        F_NODE(nd_cond, "condition expr");
-        F_NODE(nd_body, "then clause");
+        F_NODE(nd_cond, RNODE_UNLESS, "condition expr");
+        F_NODE(nd_body, RNODE_UNLESS, "then clause");
+        F_NODE(nd_else, RNODE_UNLESS, "else clause");
+        F_LOC(keyword_loc, RNODE_UNLESS);
+        F_LOC(then_keyword_loc, RNODE_UNLESS);
         LAST_NODE;
-        F_NODE(nd_else, "else clause");
+        F_LOC(end_keyword_loc, RNODE_UNLESS);
         return;
 
       case NODE_CASE:
         ANN("case statement");
         ANN("format: case [nd_head]; [nd_body]; end");
         ANN("example: case x; when 1; foo; when 2; bar; else baz; end");
-        F_NODE(nd_head, "case expr");
+        F_NODE(nd_head, RNODE_CASE, "case expr");
+        F_NODE(nd_body, RNODE_CASE, "when clauses");
+        F_LOC(case_keyword_loc, RNODE_CASE);
         LAST_NODE;
-        F_NODE(nd_body, "when clauses");
+        F_LOC(end_keyword_loc, RNODE_CASE);
         return;
       case NODE_CASE2:
         ANN("case statement with no head");
         ANN("format: case; [nd_body]; end");
         ANN("example: case; when 1; foo; when 2; bar; else baz; end");
-        F_NODE(nd_head, "case expr");
+        F_NODE(nd_head, RNODE_CASE2, "case expr");
+        F_NODE(nd_body, RNODE_CASE2, "when clauses");
+        F_LOC(case_keyword_loc, RNODE_CASE2);
         LAST_NODE;
-        F_NODE(nd_body, "when clauses");
+        F_LOC(end_keyword_loc, RNODE_CASE2);
         return;
       case NODE_CASE3:
         ANN("case statement (pattern matching)");
         ANN("format: case [nd_head]; [nd_body]; end");
         ANN("example: case x; in 1; foo; in 2; bar; else baz; end");
-        F_NODE(nd_head, "case expr");
+        F_NODE(nd_head, RNODE_CASE3, "case expr");
+        F_NODE(nd_body, RNODE_CASE3, "in clauses");
+        F_LOC(case_keyword_loc, RNODE_CASE3);
         LAST_NODE;
-        F_NODE(nd_body, "in clauses");
+        F_LOC(end_keyword_loc, RNODE_CASE3);
         return;
 
       case NODE_WHEN:
         ANN("when clause");
         ANN("format: when [nd_head]; [nd_body]; (when or else) [nd_next]");
         ANN("example: case x; when 1; foo; when 2; bar; else baz; end");
-        F_NODE(nd_head, "when value");
-        F_NODE(nd_body, "when body");
+        F_NODE(nd_head, RNODE_WHEN, "when value");
+        F_NODE(nd_body, RNODE_WHEN, "when body");
+        LAST_NODE;
+        F_NODE(nd_next, RNODE_WHEN, "next when clause");
+        F_LOC(keyword_loc, RNODE_WHEN);
         LAST_NODE;
-        F_NODE(nd_next, "next when clause");
+        F_LOC(then_keyword_loc, RNODE_WHEN);
         return;
 
       case NODE_IN:
         ANN("in clause");
         ANN("format: in [nd_head]; [nd_body]; (in or else) [nd_next]");
         ANN("example: case x; in 1; foo; in 2; bar; else baz; end");
-        F_NODE(nd_head, "in pattern");
-        F_NODE(nd_body, "in body");
+        F_NODE(nd_head, RNODE_IN, "in pattern");
+        F_NODE(nd_body, RNODE_IN, "in body");
         LAST_NODE;
-        F_NODE(nd_next, "next in clause");
+        F_NODE(nd_next, RNODE_IN, "next in clause");
         return;
 
       case NODE_WHILE:
@@ -256,27 +324,36 @@ dump_node(VALUE buf, VALUE indent, int comment, const NODE * node)
         ANN("example: until x == 1; foo; end");
       loop:
         F_CUSTOM1(nd_state, "begin-end-while?") {
-            A_INT((int)node->nd_state);
-            A((node->nd_state == 1) ? " (while-end)" : " (begin-end-while)");
+            A_INT((int)RNODE_WHILE(node)->nd_state);
+            A((RNODE_WHILE(node)->nd_state == 1) ? " (while-end)" : " (begin-end-while)");
         }
-        F_NODE(nd_cond, "condition");
+        F_NODE(nd_cond, RNODE_WHILE, "condition");
+        F_NODE(nd_body, RNODE_WHILE, "body");
+        F_LOC(keyword_loc, RNODE_WHILE);
         LAST_NODE;
-        F_NODE(nd_body, "body");
+        F_LOC(closing_loc, RNODE_WHILE);
         return;
 
       case NODE_ITER:
         ANN("method call with block");
         ANN("format: [nd_iter] { [nd_body] }");
         ANN("example: 3.times { foo }");
-        goto iter;
+        F_NODE(nd_iter, RNODE_ITER, "iteration receiver");
+        LAST_NODE;
+        F_NODE(nd_body, RNODE_ITER, "body");
+        return;
+
       case NODE_FOR:
         ANN("for statement");
         ANN("format: for * in [nd_iter] do [nd_body] end");
         ANN("example: for i in 1..3 do foo end");
-      iter:
-        F_NODE(nd_iter, "iteration receiver");
+        F_NODE(nd_iter, RNODE_FOR, "iteration receiver");
+        F_NODE(nd_body, RNODE_FOR, "body");
+        F_LOC(for_keyword_loc, RNODE_FOR);
+        F_LOC(in_keyword_loc, RNODE_FOR);
+        F_LOC(do_keyword_loc, RNODE_FOR);
         LAST_NODE;
-        F_NODE(nd_body, "body");
+        F_LOC(end_keyword_loc, RNODE_FOR);
         return;
 
       case NODE_FOR_MASGN:
@@ -284,32 +361,39 @@ dump_node(VALUE buf, VALUE indent, int comment, const NODE * node)
         ANN("format: for [nd_var] in ... do ... end");
         ANN("example: for x, y in 1..3 do foo end");
         LAST_NODE;
-        F_NODE(nd_var, "var");
+        F_NODE(nd_var, RNODE_FOR_MASGN, "var");
         return;
 
       case NODE_BREAK:
         ANN("break statement");
         ANN("format: break [nd_stts]");
         ANN("example: break 1");
-        goto jump;
+        F_NODE(nd_stts, RNODE_BREAK, "value");
+        LAST_NODE;
+        F_LOC(keyword_loc, RNODE_BREAK);
+        return;
       case NODE_NEXT:
         ANN("next statement");
         ANN("format: next [nd_stts]");
         ANN("example: next 1");
-        goto jump;
+        F_NODE(nd_stts, RNODE_NEXT, "value");
+        LAST_NODE;
+        F_LOC(keyword_loc, RNODE_NEXT);
+        return;
       case NODE_RETURN:
         ANN("return statement");
         ANN("format: return [nd_stts]");
         ANN("example: return 1");
-      jump:
+        F_NODE(nd_stts, RNODE_RETURN, "value");
         LAST_NODE;
-        F_NODE(nd_stts, "value");
+        F_LOC(keyword_loc, RNODE_RETURN);
         return;
 
       case NODE_REDO:
         ANN("redo statement");
         ANN("format: redo");
         ANN("example: redo");
+        F_LOC(keyword_loc, RNODE_REDO);
         return;
 
       case NODE_RETRY:
@@ -323,36 +407,37 @@ dump_node(VALUE buf, VALUE indent, int comment, const NODE * node)
         ANN("format: begin; [nd_body]; end");
         ANN("example: begin; 1; end");
         LAST_NODE;
-        F_NODE(nd_body, "body");
+        F_NODE(nd_body, RNODE_BEGIN, "body");
         return;
 
       case NODE_RESCUE:
         ANN("rescue clause");
         ANN("format: begin; [nd_body]; (rescue) [nd_resq]; else [nd_else]; end");
         ANN("example: begin; foo; rescue; bar; else; baz; end");
-        F_NODE(nd_head, "body");
-        F_NODE(nd_resq, "rescue clause list");
+        F_NODE(nd_head, RNODE_RESCUE, "body");
+        F_NODE(nd_resq, RNODE_RESCUE, "rescue clause list");
         LAST_NODE;
-        F_NODE(nd_else, "rescue else clause");
+        F_NODE(nd_else, RNODE_RESCUE, "rescue else clause");
         return;
 
       case NODE_RESBODY:
         ANN("rescue clause (cont'd)");
-        ANN("format: rescue [nd_args]; [nd_body]; (rescue) [nd_head]");
+        ANN("format: rescue [nd_args] (=> [nd_exc_var]); [nd_body]; (rescue) [nd_next]");
         ANN("example: begin; foo; rescue; bar; else; baz; end");
-        F_NODE(nd_args, "rescue exceptions");
-        F_NODE(nd_body, "rescue clause");
+        F_NODE(nd_args, RNODE_RESBODY, "rescue exceptions");
+        F_NODE(nd_exc_var, RNODE_RESBODY, "exception variable");
+        F_NODE(nd_body, RNODE_RESBODY, "rescue clause");
         LAST_NODE;
-        F_NODE(nd_head, "next rescue clause");
+        F_NODE(nd_next, RNODE_RESBODY, "next rescue clause");
         return;
 
       case NODE_ENSURE:
         ANN("ensure clause");
         ANN("format: begin; [nd_head]; ensure; [nd_ensr]; end");
         ANN("example: begin; foo; ensure; bar; end");
-        F_NODE(nd_head, "body");
+        F_NODE(nd_head, RNODE_ENSURE, "body");
         LAST_NODE;
-        F_NODE(nd_ensr, "ensure clause");
+        F_NODE(nd_ensr, RNODE_ENSURE, "ensure clause");
         return;
 
       case NODE_AND:
@@ -366,24 +451,25 @@ dump_node(VALUE buf, VALUE indent, int comment, const NODE * node)
         ANN("example: foo || bar");
       andor:
         while (1) {
-            F_NODE(nd_1st, "left expr");
-            if (!node->nd_2nd || !nd_type_p(node->nd_2nd, type))
+            F_NODE(nd_1st, RNODE_AND, "left expr");
+            if (!RNODE_AND(node)->nd_2nd || !nd_type_p(RNODE_AND(node)->nd_2nd, type))
                 break;
-            node = node->nd_2nd;
+            node = RNODE_AND(node)->nd_2nd;
         }
+        F_NODE(nd_2nd, RNODE_AND, "right expr");
         LAST_NODE;
-        F_NODE(nd_2nd, "right expr");
+        F_LOC(operator_loc, RNODE_AND);
         return;
 
       case NODE_MASGN:
         ANN("multiple assignment");
         ANN("format: [nd_head], [nd_args] = [nd_value]");
         ANN("example: a, b = foo");
-        F_NODE(nd_value, "rhsn");
-        F_NODE(nd_head, "lhsn");
-        if (NODE_NAMED_REST_P(node->nd_args)) {
+        F_NODE(nd_value, RNODE_MASGN, "rhsn");
+        F_NODE(nd_head, RNODE_MASGN, "lhsn");
+        if (NODE_NAMED_REST_P(RNODE_MASGN(node)->nd_args)) {
             LAST_NODE;
-            F_NODE(nd_args, "splatn");
+            F_NODE(nd_args, RNODE_MASGN, "splatn");
         }
         else {
             F_MSG(nd_args, "splatn", "NODE_SPECIAL_NO_NAME_REST (rest argument without name)");
@@ -394,13 +480,13 @@ dump_node(VALUE buf, VALUE indent, int comment, const NODE * node)
         ANN("local variable assignment");
         ANN("format: [nd_vid](lvar) = [nd_value]");
         ANN("example: x = foo");
-        F_ID(nd_vid, "local variable");
-        if (NODE_REQUIRED_KEYWORD_P(node)) {
+        F_ID(nd_vid, RNODE_LASGN, "local variable");
+        if (NODE_REQUIRED_KEYWORD_P(RNODE_LASGN(node)->nd_value)) {
             F_MSG(nd_value, "rvalue", "NODE_SPECIAL_REQUIRED_KEYWORD (required keyword argument)");
         }
         else {
             LAST_NODE;
-            F_NODE(nd_value, "rvalue");
+            F_NODE(nd_value, RNODE_LASGN, "rvalue");
         }
         return;
       case NODE_DASGN:
@@ -408,80 +494,87 @@ dump_node(VALUE buf, VALUE indent, int comment, const NODE * node)
         ANN("format: [nd_vid](dvar) = [nd_value]");
         ANN("example: x = nil; 1.times { x = foo }");
         ANN("example: 1.times { x = foo }");
-        F_ID(nd_vid, "local variable");
-        if (NODE_REQUIRED_KEYWORD_P(node)) {
+        F_ID(nd_vid, RNODE_DASGN, "local variable");
+        if (NODE_REQUIRED_KEYWORD_P(RNODE_DASGN(node)->nd_value)) {
             F_MSG(nd_value, "rvalue", "NODE_SPECIAL_REQUIRED_KEYWORD (required keyword argument)");
         }
         else {
             LAST_NODE;
-            F_NODE(nd_value, "rvalue");
+            F_NODE(nd_value, RNODE_DASGN, "rvalue");
         }
         return;
       case NODE_IASGN:
         ANN("instance variable assignment");
         ANN("format: [nd_vid](ivar) = [nd_value]");
         ANN("example: @x = foo");
-        F_ID(nd_vid, "instance variable");
+        F_ID(nd_vid, RNODE_IASGN, "instance variable");
         LAST_NODE;
-        F_NODE(nd_value, "rvalue");
+        F_NODE(nd_value, RNODE_IASGN, "rvalue");
         return;
       case NODE_CVASGN:
         ANN("class variable assignment");
         ANN("format: [nd_vid](cvar) = [nd_value]");
         ANN("example: @@x = foo");
-        F_ID(nd_vid, "class variable");
+        F_ID(nd_vid, RNODE_CVASGN, "class variable");
         LAST_NODE;
-        F_NODE(nd_value, "rvalue");
+        F_NODE(nd_value, RNODE_CVASGN, "rvalue");
         return;
       case NODE_GASGN:
         ANN("global variable assignment");
         ANN("format: [nd_vid](gvar) = [nd_value]");
         ANN("example: $x = foo");
-        F_ID(nd_vid, "global variable");
+        F_ID(nd_vid, RNODE_GASGN, "global variable");
         LAST_NODE;
-        F_NODE(nd_value, "rvalue");
+        F_NODE(nd_value, RNODE_GASGN, "rvalue");
         return;
 
       case NODE_CDECL:
         ANN("constant declaration");
         ANN("format: [nd_else]::[nd_vid](constant) = [nd_value]");
         ANN("example: X = foo");
-        if (node->nd_vid) {
-            F_ID(nd_vid, "constant");
+        if (RNODE_CDECL(node)->nd_vid) {
+            F_ID(nd_vid, RNODE_CDECL, "constant");
             F_MSG(nd_else, "extension", "not used");
         }
         else {
             F_MSG(nd_vid, "constant", "0 (see extension field)");
-            F_NODE(nd_else, "extension");
+            F_NODE(nd_else, RNODE_CDECL, "extension");
         }
+        F_SHAREABILITY(shareability, RNODE_CDECL, "shareability");
         LAST_NODE;
-        F_NODE(nd_value, "rvalue");
+        F_NODE(nd_value, RNODE_CDECL, "rvalue");
         return;
 
       case NODE_OP_ASGN1:
         ANN("array assignment with operator");
-        ANN("format: [nd_recv] [ [nd_args->nd_head] ] [nd_mid]= [nd_args->nd_body]");
+        ANN("format: [nd_recv] [ [nd_index] ] [nd_mid]= [nd_rvalue]");
         ANN("example: ary[1] += foo");
-        F_NODE(nd_recv, "receiver");
-        F_ID(nd_mid, "operator");
-        F_NODE(nd_args->nd_head, "index");
+        F_NODE(nd_recv, RNODE_OP_ASGN1, "receiver");
+        F_ID(nd_mid, RNODE_OP_ASGN1, "operator");
+        F_NODE(nd_index, RNODE_OP_ASGN1, "index");
+        F_NODE(nd_rvalue, RNODE_OP_ASGN1, "rvalue");
+        F_LOC(call_operator_loc, RNODE_OP_ASGN1);
+        F_LOC(opening_loc, RNODE_OP_ASGN1);
+        F_LOC(closing_loc, RNODE_OP_ASGN1);
         LAST_NODE;
-        F_NODE(nd_args->nd_body, "rvalue");
+        F_LOC(binary_operator_loc, RNODE_OP_ASGN1);
         return;
 
       case NODE_OP_ASGN2:
         ANN("attr assignment with operator");
-        ANN("format: [nd_recv].[attr] [nd_next->nd_mid]= [nd_value]");
-        ANN("          where [attr]: [nd_next->nd_vid]");
+        ANN("format: [nd_recv].[nd_vid] [nd_mid]= [nd_value]");
         ANN("example: struct.field += foo");
-        F_NODE(nd_recv, "receiver");
-        F_CUSTOM1(nd_next->nd_vid, "attr") {
-            if (node->nd_next->nd_aid) A("? ");
-            A_ID(node->nd_next->nd_vid);
+        F_NODE(nd_recv, RNODE_OP_ASGN2, "receiver");
+        F_CUSTOM1(nd_vid, "attr") {
+            if (RNODE_OP_ASGN2(node)->nd_aid) A("? ");
+            A_ID(RNODE_OP_ASGN2(node)->nd_vid);
         }
-        F_ID(nd_next->nd_mid, "operator");
+        F_ID(nd_mid, RNODE_OP_ASGN2, "operator");
+        F_NODE(nd_value, RNODE_OP_ASGN2, "rvalue");
+        F_LOC(call_operator_loc, RNODE_OP_ASGN2);
+        F_LOC(message_loc, RNODE_OP_ASGN2);
         LAST_NODE;
-        F_NODE(nd_value, "rvalue");
+        F_LOC(binary_operator_loc, RNODE_OP_ASGN2);
         return;
 
       case NODE_OP_ASGN_AND:
@@ -494,73 +587,77 @@ dump_node(VALUE buf, VALUE indent, int comment, const NODE * node)
         ANN("format: [nd_head] ||= [nd_value]");
         ANN("example: foo ||= bar");
       asgn_andor:
-        F_NODE(nd_head, "variable");
+        F_NODE(nd_head, RNODE_OP_ASGN_AND, "variable");
         LAST_NODE;
-        F_NODE(nd_value, "rvalue");
+        F_NODE(nd_value, RNODE_OP_ASGN_AND, "rvalue");
         return;
 
       case NODE_OP_CDECL:
         ANN("constant declaration with operator");
         ANN("format: [nd_head](constant) [nd_aid]= [nd_value]");
         ANN("example: A::B ||= 1");
-        F_NODE(nd_head, "constant");
-        F_ID(nd_aid, "operator");
+        F_NODE(nd_head, RNODE_OP_CDECL, "constant");
+        F_ID(nd_aid, RNODE_OP_CDECL, "operator");
+        F_SHAREABILITY(shareability, RNODE_OP_CDECL, "shareability");
         LAST_NODE;
-        F_NODE(nd_value, "rvalue");
+        F_NODE(nd_value, RNODE_OP_CDECL, "rvalue");
         return;
 
       case NODE_CALL:
         ANN("method invocation");
         ANN("format: [nd_recv].[nd_mid]([nd_args])");
         ANN("example: obj.foo(1)");
-        F_ID(nd_mid, "method id");
-        F_NODE(nd_recv, "receiver");
+        F_ID(nd_mid, RNODE_CALL, "method id");
+        F_NODE(nd_recv, RNODE_CALL, "receiver");
         LAST_NODE;
-        F_NODE(nd_args, "arguments");
+        F_NODE(nd_args, RNODE_CALL, "arguments");
         return;
 
       case NODE_OPCALL:
         ANN("method invocation");
         ANN("format: [nd_recv] [nd_mid] [nd_args]");
         ANN("example: foo + bar");
-        F_ID(nd_mid, "method id");
-        F_NODE(nd_recv, "receiver");
+        F_ID(nd_mid, RNODE_OPCALL, "method id");
+        F_NODE(nd_recv, RNODE_OPCALL, "receiver");
         LAST_NODE;
-        F_NODE(nd_args, "arguments");
+        F_NODE(nd_args, RNODE_OPCALL, "arguments");
         return;
 
       case NODE_FCALL:
         ANN("function call");
         ANN("format: [nd_mid]([nd_args])");
         ANN("example: foo(1)");
-        F_ID(nd_mid, "method id");
+        F_ID(nd_mid, RNODE_FCALL, "method id");
         LAST_NODE;
-        F_NODE(nd_args, "arguments");
+        F_NODE(nd_args, RNODE_FCALL, "arguments");
         return;
 
       case NODE_VCALL:
         ANN("function call with no argument");
         ANN("format: [nd_mid]");
         ANN("example: foo");
-        F_ID(nd_mid, "method id");
+        F_ID(nd_mid, RNODE_VCALL, "method id");
         return;
 
       case NODE_QCALL:
         ANN("safe method invocation");
         ANN("format: [nd_recv]&.[nd_mid]([nd_args])");
         ANN("example: obj&.foo(1)");
-        F_ID(nd_mid, "method id");
-        F_NODE(nd_recv, "receiver");
+        F_ID(nd_mid, RNODE_QCALL, "method id");
+        F_NODE(nd_recv, RNODE_QCALL, "receiver");
         LAST_NODE;
-        F_NODE(nd_args, "arguments");
+        F_NODE(nd_args, RNODE_QCALL, "arguments");
         return;
 
       case NODE_SUPER:
         ANN("super invocation");
         ANN("format: super [nd_args]");
         ANN("example: super 1");
+        F_NODE(nd_args, RNODE_SUPER, "arguments");
+        F_LOC(keyword_loc, RNODE_SUPER);
+        F_LOC(lparen_loc, RNODE_SUPER);
         LAST_NODE;
-        F_NODE(nd_args, "arguments");
+        F_LOC(rparen_loc, RNODE_SUPER);
         return;
 
       case NODE_ZSUPER:
@@ -573,12 +670,6 @@ dump_node(VALUE buf, VALUE indent, int comment, const NODE * node)
         ANN("list constructor");
         ANN("format: [ [nd_head], [nd_next].. ] (length: [nd_alen])");
         ANN("example: [1, 2, 3]");
-        goto ary;
-      case NODE_VALUES:
-        ANN("return arguments");
-        ANN("format: [ [nd_head], [nd_next].. ] (length: [nd_alen])");
-        ANN("example: return 1, 2, 3");
-      ary:
         dump_array(buf, indent, comment, node);
         return;
 
@@ -589,7 +680,7 @@ dump_node(VALUE buf, VALUE indent, int comment, const NODE * node)
         return;
 
       case NODE_HASH:
-        if (!node->nd_brace) {
+        if (!RNODE_HASH(node)->nd_brace) {
             ANN("keyword arguments");
             ANN("format: [nd_head]");
             ANN("example: a: 1, b: 2");
@@ -600,66 +691,69 @@ dump_node(VALUE buf, VALUE indent, int comment, const NODE * node)
             ANN("example: { 1 => 2, 3 => 4 }");
         }
         F_CUSTOM1(nd_brace, "keyword arguments or hash literal") {
-            switch (node->nd_brace) {
+            switch (RNODE_HASH(node)->nd_brace) {
               case 0: A("0 (keyword argument)"); break;
               case 1: A("1 (hash literal)"); break;
             }
         }
         LAST_NODE;
-        F_NODE(nd_head, "contents");
+        F_NODE(nd_head, RNODE_HASH, "contents");
         return;
 
       case NODE_YIELD:
         ANN("yield invocation");
         ANN("format: yield [nd_head]");
         ANN("example: yield 1");
+        F_NODE(nd_head, RNODE_YIELD, "arguments");
+        F_LOC(keyword_loc, RNODE_YIELD);
+        F_LOC(lparen_loc, RNODE_YIELD);
         LAST_NODE;
-        F_NODE(nd_head, "arguments");
+        F_LOC(rparen_loc, RNODE_YIELD);
         return;
 
       case NODE_LVAR:
         ANN("local variable reference");
         ANN("format: [nd_vid](lvar)");
         ANN("example: x");
-        F_ID(nd_vid, "local variable");
+        F_ID(nd_vid, RNODE_LVAR, "local variable");
         return;
       case NODE_DVAR:
         ANN("dynamic variable reference");
         ANN("format: [nd_vid](dvar)");
         ANN("example: 1.times { x = 1; x }");
-        F_ID(nd_vid, "local variable");
+        F_ID(nd_vid, RNODE_DVAR, "local variable");
         return;
       case NODE_IVAR:
         ANN("instance variable reference");
         ANN("format: [nd_vid](ivar)");
         ANN("example: @x");
-        F_ID(nd_vid, "instance variable");
+        F_ID(nd_vid, RNODE_IVAR, "instance variable");
         return;
       case NODE_CONST:
         ANN("constant reference");
         ANN("format: [nd_vid](constant)");
         ANN("example: X");
-        F_ID(nd_vid, "constant");
+        F_ID(nd_vid, RNODE_CONST, "constant");
         return;
       case NODE_CVAR:
         ANN("class variable reference");
         ANN("format: [nd_vid](cvar)");
         ANN("example: @@x");
-        F_ID(nd_vid, "class variable");
+        F_ID(nd_vid, RNODE_CVAR, "class variable");
         return;
 
       case NODE_GVAR:
         ANN("global variable reference");
         ANN("format: [nd_vid](gvar)");
         ANN("example: $x");
-        F_ID(nd_vid, "global variable");
+        F_ID(nd_vid, RNODE_GVAR, "global variable");
         return;
 
       case NODE_NTH_REF:
         ANN("nth special variable reference");
         ANN("format: $[nd_nth]");
         ANN("example: $1, $2, ..");
-        F_CUSTOM1(nd_nth, "variable") { A("$"); A_LONG(node->nd_nth); }
+        F_CUSTOM1(nd_nth, "variable") { A("$"); A_LONG(RNODE_NTH_REF(node)->nd_nth); }
         return;
 
       case NODE_BACK_REF:
@@ -668,7 +762,7 @@ dump_node(VALUE buf, VALUE indent, int comment, const NODE * node)
         ANN("example: $&, $`, $', $+");
         F_CUSTOM1(nd_nth, "variable") {
             char name[3] = "$ ";
-            name[1] = (char)node->nd_nth;
+            name[1] = (char)RNODE_BACK_REF(node)->nd_nth;
             A(name);
         }
         return;
@@ -677,19 +771,20 @@ dump_node(VALUE buf, VALUE indent, int comment, const NODE * node)
         ANN("match expression (against $_ implicitly)");
         ANN("format: [nd_lit] (in condition)");
         ANN("example: if /foo/; foo; end");
-        F_LIT(nd_lit, "regexp");
+        LAST_NODE;
+        F_VALUE(string, rb_node_regx_string_val(node), "string");
         return;
 
       case NODE_MATCH2:
         ANN("match expression (regexp first)");
         ANN("format: [nd_recv] =~ [nd_value]");
         ANN("example: /foo/ =~ 'foo'");
-        F_NODE(nd_recv, "regexp (receiver)");
-        if (!node->nd_args) LAST_NODE;
-        F_NODE(nd_value, "string (argument)");
-        if (node->nd_args) {
+        F_NODE(nd_recv, RNODE_MATCH2, "regexp (receiver)");
+        if (!RNODE_MATCH2(node)->nd_args) LAST_NODE;
+        F_NODE(nd_value, RNODE_MATCH2, "string (argument)");
+        if (RNODE_MATCH2(node)->nd_args) {
             LAST_NODE;
-            F_NODE(nd_args, "named captures");
+            F_NODE(nd_args, RNODE_MATCH2, "named captures");
         }
         return;
 
@@ -697,27 +792,61 @@ dump_node(VALUE buf, VALUE indent, int comment, const NODE * node)
         ANN("match expression (regexp second)");
         ANN("format: [nd_recv] =~ [nd_value]");
         ANN("example: 'foo' =~ /foo/");
-        F_NODE(nd_recv, "string (receiver)");
+        F_NODE(nd_recv, RNODE_MATCH3, "string (receiver)");
         LAST_NODE;
-        F_NODE(nd_value, "regexp (argument)");
+        F_NODE(nd_value, RNODE_MATCH3, "regexp (argument)");
         return;
 
-      case NODE_LIT:
-        ANN("literal");
-        ANN("format: [nd_lit]");
-        ANN("example: 1, /foo/");
-        goto lit;
       case NODE_STR:
         ANN("string literal");
         ANN("format: [nd_lit]");
         ANN("example: 'foo'");
-        goto lit;
+        goto str;
       case NODE_XSTR:
         ANN("xstring literal");
         ANN("format: [nd_lit]");
         ANN("example: `foo`");
-      lit:
-        F_LIT(nd_lit, "literal");
+      str:
+        F_VALUE(string, rb_node_str_string_val(node), "literal");
+        return;
+
+      case NODE_INTEGER:
+        ANN("integer literal");
+        ANN("format: [val]");
+        ANN("example: 1");
+        F_VALUE(val, rb_node_integer_literal_val(node), "val");
+        return;
+
+      case NODE_FLOAT:
+        ANN("float literal");
+        ANN("format: [val]");
+        ANN("example: 1.2");
+        F_VALUE(val, rb_node_float_literal_val(node), "val");
+        return;
+
+      case NODE_RATIONAL:
+        ANN("rational number literal");
+        ANN("format: [val]");
+        ANN("example: 1r");
+        F_VALUE(val, rb_node_rational_literal_val(node), "val");
+        return;
+
+      case NODE_IMAGINARY:
+        ANN("complex number literal");
+        ANN("format: [val]");
+        ANN("example: 1i");
+        F_VALUE(val, rb_node_imaginary_literal_val(node), "val");
+        return;
+
+      case NODE_REGX:
+        ANN("regexp literal");
+        ANN("format: [string]");
+        ANN("example: /foo/");
+        F_VALUE(string, rb_node_regx_string_val(node), "string");
+        F_LOC(opening_loc, RNODE_REGX);
+        F_LOC(content_loc, RNODE_REGX);
+        LAST_NODE;
+        F_LOC(closing_loc, RNODE_REGX);
         return;
 
       case NODE_ONCE:
@@ -725,8 +854,9 @@ dump_node(VALUE buf, VALUE indent, int comment, const NODE * node)
         ANN("format: [nd_body]");
         ANN("example: /foo#{ bar }baz/o");
         LAST_NODE;
-        F_NODE(nd_body, "body");
+        F_NODE(nd_body, RNODE_ONCE, "body");
         return;
+
       case NODE_DSTR:
         ANN("string literal with interpolation");
         ANN("format: [nd_lit]");
@@ -747,142 +877,169 @@ dump_node(VALUE buf, VALUE indent, int comment, const NODE * node)
         ANN("format: [nd_lit]");
         ANN("example: :\"foo#{ bar }baz\"");
       dlit:
-        F_LIT(nd_lit, "preceding string");
-        if (!node->nd_next) return;
-        F_NODE(nd_next->nd_head, "interpolation");
+        F_VALUE(string, rb_node_dstr_string_val(node), "preceding string");
+        if (!RNODE_DSTR(node)->nd_next) return;
+        F_NODE(nd_next->nd_head, RNODE_DSTR, "interpolation");
         LAST_NODE;
-        F_NODE(nd_next->nd_next, "tailing strings");
+        F_NODE(nd_next->nd_next, RNODE_DSTR, "tailing strings");
+        return;
+
+      case NODE_SYM:
+        ANN("symbol literal");
+        ANN("format: [string]");
+        ANN("example: :foo");
+        F_VALUE(string, rb_node_sym_string_val(node), "string");
         return;
 
       case NODE_EVSTR:
         ANN("interpolation expression");
         ANN("format: \"..#{ [nd_body] }..\"");
         ANN("example: \"foo#{ bar }baz\"");
+        F_NODE(nd_body, RNODE_EVSTR, "body");
+        F_LOC(opening_loc, RNODE_EVSTR);
         LAST_NODE;
-        F_NODE(nd_body, "body");
+        F_LOC(closing_loc, RNODE_EVSTR);
         return;
 
       case NODE_ARGSCAT:
         ANN("splat argument following arguments");
         ANN("format: ..(*[nd_head], [nd_body..])");
         ANN("example: foo(*ary, post_arg1, post_arg2)");
-        F_NODE(nd_head, "preceding array");
+        F_NODE(nd_head, RNODE_ARGSCAT, "preceding array");
         LAST_NODE;
-        F_NODE(nd_body, "following array");
+        F_NODE(nd_body, RNODE_ARGSCAT, "following array");
         return;
 
       case NODE_ARGSPUSH:
         ANN("splat argument following one argument");
         ANN("format: ..(*[nd_head], [nd_body])");
         ANN("example: foo(*ary, post_arg)");
-        F_NODE(nd_head, "preceding array");
+        F_NODE(nd_head, RNODE_ARGSPUSH, "preceding array");
         LAST_NODE;
-        F_NODE(nd_body, "following element");
+        F_NODE(nd_body, RNODE_ARGSPUSH, "following element");
         return;
 
       case NODE_SPLAT:
         ANN("splat argument");
         ANN("format: *[nd_head]");
         ANN("example: foo(*ary)");
+        F_NODE(nd_head, RNODE_SPLAT, "splat'ed array");
         LAST_NODE;
-        F_NODE(nd_head, "splat'ed array");
+        F_LOC(operator_loc, RNODE_SPLAT);
         return;
 
       case NODE_BLOCK_PASS:
         ANN("arguments with block argument");
         ANN("format: ..([nd_head], &[nd_body])");
         ANN("example: foo(x, &blk)");
-        F_NODE(nd_head, "other arguments");
+        F_CUSTOM1(forwarding, "arguments forwarding or not") {
+            switch (RNODE_BLOCK_PASS(node)->forwarding) {
+              case 0: A("0 (no forwarding)"); break;
+              case 1: A("1 (forwarding)"); break;
+            }
+        }
+        F_NODE(nd_head, RNODE_BLOCK_PASS, "other arguments");
+        F_NODE(nd_body, RNODE_BLOCK_PASS, "block argument");
         LAST_NODE;
-        F_NODE(nd_body, "block argument");
+        F_LOC(operator_loc, RNODE_BLOCK_PASS);
         return;
 
       case NODE_DEFN:
         ANN("method definition");
         ANN("format: def [nd_mid] [nd_defn]; end");
         ANN("example: def foo; bar; end");
-        F_ID(nd_mid, "method name");
+        F_ID(nd_mid, RNODE_DEFN, "method name");
         LAST_NODE;
-        F_NODE(nd_defn, "method definition");
+        F_NODE(nd_defn, RNODE_DEFN, "method definition");
         return;
 
       case NODE_DEFS:
         ANN("singleton method definition");
         ANN("format: def [nd_recv].[nd_mid] [nd_defn]; end");
         ANN("example: def obj.foo; bar; end");
-        F_NODE(nd_recv, "receiver");
-        F_ID(nd_mid, "method name");
+        F_NODE(nd_recv, RNODE_DEFS, "receiver");
+        F_ID(nd_mid, RNODE_DEFS, "method name");
         LAST_NODE;
-        F_NODE(nd_defn, "method definition");
+        F_NODE(nd_defn, RNODE_DEFS, "method definition");
         return;
 
       case NODE_ALIAS:
         ANN("method alias statement");
         ANN("format: alias [nd_1st] [nd_2nd]");
         ANN("example: alias bar foo");
-        F_NODE(nd_1st, "new name");
+        F_NODE(nd_1st, RNODE_ALIAS, "new name");
+        F_NODE(nd_2nd, RNODE_ALIAS, "old name");
         LAST_NODE;
-        F_NODE(nd_2nd, "old name");
+        F_LOC(keyword_loc, RNODE_ALIAS);
         return;
 
       case NODE_VALIAS:
         ANN("global variable alias statement");
         ANN("format: alias [nd_alias](gvar) [nd_orig](gvar)");
         ANN("example: alias $y $x");
-        F_ID(nd_alias, "new name");
-        F_ID(nd_orig, "old name");
+        F_ID(nd_alias, RNODE_VALIAS, "new name");
+        F_ID(nd_orig, RNODE_VALIAS, "old name");
+        F_LOC(keyword_loc, RNODE_VALIAS);
         return;
 
       case NODE_UNDEF:
         ANN("method undef statement");
-        ANN("format: undef [nd_undef]");
+        ANN("format: undef [nd_undefs]");
         ANN("example: undef foo");
         LAST_NODE;
-        F_NODE(nd_undef, "old name");
+        F_ARRAY(nd_undefs, RNODE_UNDEF, "nd_undefs");
+        F_LOC(keyword_loc, RNODE_UNDEF);
         return;
 
       case NODE_CLASS:
         ANN("class definition");
         ANN("format: class [nd_cpath] < [nd_super]; [nd_body]; end");
         ANN("example: class C2 < C; ..; end");
-        F_NODE(nd_cpath, "class path");
-        F_NODE(nd_super, "superclass");
+        F_NODE(nd_cpath, RNODE_CLASS, "class path");
+        F_NODE(nd_super, RNODE_CLASS, "superclass");
+        F_NODE(nd_body, RNODE_CLASS, "class definition");
+        F_LOC(class_keyword_loc, RNODE_CLASS);
+        F_LOC(inheritance_operator_loc, RNODE_CLASS);
         LAST_NODE;
-        F_NODE(nd_body, "class definition");
+        F_LOC(end_keyword_loc, RNODE_CLASS);
         return;
 
       case NODE_MODULE:
         ANN("module definition");
         ANN("format: module [nd_cpath]; [nd_body]; end");
         ANN("example: module M; ..; end");
-        F_NODE(nd_cpath, "module path");
+        F_NODE(nd_cpath, RNODE_MODULE, "module path");
         LAST_NODE;
-        F_NODE(nd_body, "module definition");
+        F_NODE(nd_body, RNODE_MODULE, "module definition");
         return;
 
       case NODE_SCLASS:
         ANN("singleton class definition");
         ANN("format: class << [nd_recv]; [nd_body]; end");
         ANN("example: class << obj; ..; end");
-        F_NODE(nd_recv, "receiver");
+        F_NODE(nd_recv, RNODE_SCLASS, "receiver");
         LAST_NODE;
-        F_NODE(nd_body, "singleton class definition");
+        F_NODE(nd_body, RNODE_SCLASS, "singleton class definition");
         return;
 
       case NODE_COLON2:
         ANN("scoped constant reference");
         ANN("format: [nd_head]::[nd_mid]");
         ANN("example: M::C");
-        F_ID(nd_mid, "constant name");
+        F_ID(nd_mid, RNODE_COLON2, "constant name");
+        F_NODE(nd_head, RNODE_COLON2, "receiver");
+        F_LOC(delimiter_loc, RNODE_COLON2);
         LAST_NODE;
-        F_NODE(nd_head, "receiver");
+        F_LOC(name_loc, RNODE_COLON2);
         return;
 
       case NODE_COLON3:
         ANN("top-level constant reference");
         ANN("format: ::[nd_mid]");
         ANN("example: ::Object");
-        F_ID(nd_mid, "constant name");
+        F_ID(nd_mid, RNODE_COLON3, "constant name");
+        F_LOC(delimiter_loc, RNODE_COLON3);
+        F_LOC(name_loc, RNODE_COLON3);
         return;
 
       case NODE_DOT2:
@@ -905,15 +1062,19 @@ dump_node(VALUE buf, VALUE indent, int comment, const NODE * node)
         ANN("format: [nd_beg]...[nd_end]");
         ANN("example: if (x==1)...(x==5); foo; end");
       dot:
-        F_NODE(nd_beg, "begin");
+        F_NODE(nd_beg, RNODE_DOT2, "begin");
+        F_NODE(nd_end, RNODE_DOT2, "end");
         LAST_NODE;
-        F_NODE(nd_end, "end");
+        F_LOC(operator_loc, RNODE_DOT2);
         return;
 
       case NODE_SELF:
         ANN("self");
         ANN("format: self");
         ANN("example: self");
+        F_CUSTOM1(nd_state, "nd_state") {
+            A_INT((int)RNODE_SELF(node)->nd_state);
+        }
         return;
 
       case NODE_NIL:
@@ -944,96 +1105,109 @@ dump_node(VALUE buf, VALUE indent, int comment, const NODE * node)
         ANN("defined? expression");
         ANN("format: defined?([nd_head])");
         ANN("example: defined?(foo)");
-        F_NODE(nd_head, "expr");
+        LAST_NODE;
+        F_NODE(nd_head, RNODE_DEFINED, "expr");
         return;
 
       case NODE_POSTEXE:
         ANN("post-execution");
         ANN("format: END { [nd_body] }");
         ANN("example: END { foo }");
+        F_NODE(nd_body, RNODE_POSTEXE, "END clause");
+        F_LOC(keyword_loc, RNODE_POSTEXE);
+        F_LOC(opening_loc, RNODE_POSTEXE);
         LAST_NODE;
-        F_NODE(nd_body, "END clause");
+        F_LOC(closing_loc, RNODE_POSTEXE);
         return;
 
       case NODE_ATTRASGN:
         ANN("attr assignment");
         ANN("format: [nd_recv].[nd_mid] = [nd_args]");
         ANN("example: struct.field = foo");
-        F_NODE(nd_recv, "receiver");
-        F_ID(nd_mid, "method name");
+        F_NODE(nd_recv, RNODE_ATTRASGN, "receiver");
+        F_ID(nd_mid, RNODE_ATTRASGN, "method name");
         LAST_NODE;
-        F_NODE(nd_args, "arguments");
+        F_NODE(nd_args, RNODE_ATTRASGN, "arguments");
         return;
 
       case NODE_LAMBDA:
         ANN("lambda expression");
         ANN("format: -> [nd_body]");
         ANN("example: -> { foo }");
+        F_NODE(nd_body, RNODE_LAMBDA, "lambda clause");
+        F_LOC(operator_loc, RNODE_LAMBDA);
+        F_LOC(opening_loc, RNODE_LAMBDA);
         LAST_NODE;
-        F_NODE(nd_body, "lambda clause");
+        F_LOC(closing_loc, RNODE_LAMBDA);
         return;
 
       case NODE_OPT_ARG:
         ANN("optional arguments");
         ANN("format: def method_name([nd_body=some], [nd_next..])");
         ANN("example: def foo(a, b=1, c); end");
-        F_NODE(nd_body, "body");
+        F_NODE(nd_body, RNODE_OPT_ARG, "body");
         LAST_NODE;
-        F_NODE(nd_next, "next");
+        F_NODE(nd_next, RNODE_OPT_ARG, "next");
         return;
 
       case NODE_KW_ARG:
         ANN("keyword arguments");
         ANN("format: def method_name([nd_body=some], [nd_next..])");
         ANN("example: def foo(a:1, b:2); end");
-        F_NODE(nd_body, "body");
+        F_NODE(nd_body, RNODE_KW_ARG, "body");
         LAST_NODE;
-        F_NODE(nd_next, "next");
+        F_NODE(nd_next, RNODE_KW_ARG, "next");
         return;
 
       case NODE_POSTARG:
         ANN("post arguments");
         ANN("format: *[nd_1st], [nd_2nd..] = ..");
         ANN("example: a, *rest, z = foo");
-        if (NODE_NAMED_REST_P(node->nd_1st)) {
-            F_NODE(nd_1st, "rest argument");
+        if (NODE_NAMED_REST_P(RNODE_POSTARG(node)->nd_1st)) {
+            F_NODE(nd_1st, RNODE_POSTARG, "rest argument");
         }
         else {
             F_MSG(nd_1st, "rest argument", "NODE_SPECIAL_NO_NAME_REST (rest argument without name)");
         }
         LAST_NODE;
-        F_NODE(nd_2nd, "post arguments");
+        F_NODE(nd_2nd, RNODE_POSTARG, "post arguments");
         return;
 
       case NODE_ARGS:
         ANN("method parameters");
-        ANN("format: def method_name(.., [nd_ainfo->nd_optargs], *[nd_ainfo->rest_arg], [nd_ainfo->first_post_arg], .., [nd_ainfo->kw_args], **[nd_ainfo->kw_rest_arg], &[nd_ainfo->block_arg])");
+        ANN("format: def method_name(.., [nd_ainfo.nd_optargs], *[nd_ainfo.rest_arg], [nd_ainfo.first_post_arg], .., [nd_ainfo.kw_args], **[nd_ainfo.kw_rest_arg], &[nd_ainfo.block_arg])");
         ANN("example: def foo(a, b, opt1=1, opt2=2, *rest, y, z, kw: 1, **kwrest, &blk); end");
-        F_INT(nd_ainfo->pre_args_num, "count of mandatory (pre-)arguments");
-        F_NODE(nd_ainfo->pre_init, "initialization of (pre-)arguments");
-        F_INT(nd_ainfo->post_args_num, "count of mandatory post-arguments");
-        F_NODE(nd_ainfo->post_init, "initialization of post-arguments");
-        F_ID(nd_ainfo->first_post_arg, "first post argument");
-        F_CUSTOM1(nd_ainfo->rest_arg, "rest argument") {
-            if (node->nd_ainfo->rest_arg == NODE_SPECIAL_EXCESSIVE_COMMA) {
+        F_CUSTOM1(nd_ainfo.forwarding, "arguments forwarding or not") {
+            switch (RNODE_ARGS(node)->nd_ainfo.forwarding) {
+              case 0: A("0 (no forwarding)"); break;
+              case 1: A("1 (forwarding)"); break;
+            }
+        }
+        F_INT(nd_ainfo.pre_args_num, RNODE_ARGS, "count of mandatory (pre-)arguments");
+        F_NODE(nd_ainfo.pre_init, RNODE_ARGS, "initialization of (pre-)arguments");
+        F_INT(nd_ainfo.post_args_num, RNODE_ARGS, "count of mandatory post-arguments");
+        F_NODE(nd_ainfo.post_init, RNODE_ARGS, "initialization of post-arguments");
+        F_ID(nd_ainfo.first_post_arg, RNODE_ARGS, "first post argument");
+        F_CUSTOM1(nd_ainfo.rest_arg, "rest argument") {
+            if (RNODE_ARGS(node)->nd_ainfo.rest_arg == NODE_SPECIAL_EXCESSIVE_COMMA) {
                 A("1 (excessed comma)");
             }
             else {
-                A_ID(node->nd_ainfo->rest_arg);
+                A_ID(RNODE_ARGS(node)->nd_ainfo.rest_arg);
             }
         }
-        F_ID(nd_ainfo->block_arg, "block argument");
-        F_NODE(nd_ainfo->opt_args, "optional arguments");
-        F_NODE(nd_ainfo->kw_args, "keyword arguments");
+        F_ID(nd_ainfo.block_arg, RNODE_ARGS, "block argument");
+        F_NODE(nd_ainfo.opt_args, RNODE_ARGS, "optional arguments");
+        F_NODE(nd_ainfo.kw_args, RNODE_ARGS, "keyword arguments");
         LAST_NODE;
-        F_NODE(nd_ainfo->kw_rest_arg, "keyword rest argument");
+        F_NODE(nd_ainfo.kw_rest_arg, RNODE_ARGS, "keyword rest argument");
         return;
 
       case NODE_SCOPE:
         ANN("new scope");
         ANN("format: [nd_tbl]: local table, [nd_args]: arguments, [nd_body]: body");
         F_CUSTOM1(nd_tbl, "local table") {
-            rb_ast_id_table_t *tbl = node->nd_tbl;
+            rb_ast_id_table_t *tbl = RNODE_SCOPE(node)->nd_tbl;
             int i;
             int size = tbl ? tbl->size : 0;
             if (size == 0) A("(empty)");
@@ -1041,60 +1215,81 @@ dump_node(VALUE buf, VALUE indent, int comment, const NODE * node)
                 A_ID(tbl->ids[i]); if (i < size - 1) A(",");
             }
         }
-        F_NODE(nd_args, "arguments");
+        F_NODE(nd_args, RNODE_SCOPE, "arguments");
         LAST_NODE;
-        F_NODE(nd_body, "body");
+        F_NODE(nd_body, RNODE_SCOPE, "body");
         return;
 
       case NODE_ARYPTN:
         ANN("array pattern");
         ANN("format: [nd_pconst]([pre_args], ..., *[rest_arg], [post_args], ...)");
-        F_NODE(nd_pconst, "constant");
-        F_NODE(nd_apinfo->pre_args, "pre arguments");
-        if (NODE_NAMED_REST_P(node->nd_apinfo->rest_arg)) {
-            F_NODE(nd_apinfo->rest_arg, "rest argument");
+        F_NODE(nd_pconst, RNODE_ARYPTN, "constant");
+        F_NODE(pre_args, RNODE_ARYPTN, "pre arguments");
+        if (NODE_NAMED_REST_P(RNODE_ARYPTN(node)->rest_arg)) {
+            F_NODE(rest_arg, RNODE_ARYPTN, "rest argument");
         }
         else {
-            F_MSG(nd_apinfo->rest_arg, "rest argument", "NODE_SPECIAL_NO_NAME_REST (rest argument without name)");
+            F_MSG(rest_arg, "rest argument", "NODE_SPECIAL_NO_NAME_REST (rest argument without name)");
         }
         LAST_NODE;
-        F_NODE(nd_apinfo->post_args, "post arguments");
+        F_NODE(post_args, RNODE_ARYPTN, "post arguments");
         return;
 
       case NODE_FNDPTN:
         ANN("find pattern");
         ANN("format: [nd_pconst](*[pre_rest_arg], args, ..., *[post_rest_arg])");
-        F_NODE(nd_pconst, "constant");
-        if (NODE_NAMED_REST_P(node->nd_fpinfo->pre_rest_arg)) {
-            F_NODE(nd_fpinfo->pre_rest_arg, "pre rest argument");
+        F_NODE(nd_pconst, RNODE_FNDPTN, "constant");
+        if (NODE_NAMED_REST_P(RNODE_FNDPTN(node)->pre_rest_arg)) {
+            F_NODE(pre_rest_arg, RNODE_FNDPTN, "pre rest argument");
         }
         else {
-            F_MSG(nd_fpinfo->pre_rest_arg, "pre rest argument", "NODE_SPECIAL_NO_NAME_REST (rest argument without name)");
+            F_MSG(pre_rest_arg, "pre rest argument", "NODE_SPECIAL_NO_NAME_REST (rest argument without name)");
         }
-        F_NODE(nd_fpinfo->args, "arguments");
+        F_NODE(args, RNODE_FNDPTN, "arguments");
 
         LAST_NODE;
-        if (NODE_NAMED_REST_P(node->nd_fpinfo->post_rest_arg)) {
-            F_NODE(nd_fpinfo->post_rest_arg, "post rest argument");
+        if (NODE_NAMED_REST_P(RNODE_FNDPTN(node)->post_rest_arg)) {
+            F_NODE(post_rest_arg, RNODE_FNDPTN, "post rest argument");
         }
         else {
-            F_MSG(nd_fpinfo->post_rest_arg, "post rest argument", "NODE_SPECIAL_NO_NAME_REST (rest argument without name)");
+            F_MSG(post_rest_arg, "post rest argument", "NODE_SPECIAL_NO_NAME_REST (rest argument without name)");
         }
         return;
 
       case NODE_HSHPTN:
         ANN("hash pattern");
         ANN("format: [nd_pconst]([nd_pkwargs], ..., **[nd_pkwrestarg])");
-        F_NODE(nd_pconst, "constant");
-        F_NODE(nd_pkwargs, "keyword arguments");
+        F_NODE(nd_pconst, RNODE_HSHPTN, "constant");
+        F_NODE(nd_pkwargs, RNODE_HSHPTN, "keyword arguments");
         LAST_NODE;
-        if (node->nd_pkwrestarg == NODE_SPECIAL_NO_REST_KEYWORD) {
+        if (RNODE_HSHPTN(node)->nd_pkwrestarg == NODE_SPECIAL_NO_REST_KEYWORD) {
             F_MSG(nd_pkwrestarg, "keyword rest argument", "NODE_SPECIAL_NO_REST_KEYWORD (**nil)");
         }
         else {
-            F_NODE(nd_pkwrestarg, "keyword rest argument");
+            F_NODE(nd_pkwrestarg, RNODE_HSHPTN, "keyword rest argument");
         }
         return;
+
+      case NODE_LINE:
+        ANN("line");
+        ANN("format: [lineno]");
+        ANN("example: __LINE__");
+        return;
+
+      case NODE_FILE:
+        ANN("line");
+        ANN("format: [path]");
+        ANN("example: __FILE__");
+        F_VALUE(path, rb_node_file_path_val(node), "path");
+        return;
+
+      case NODE_ENCODING:
+        ANN("encoding");
+        ANN("format: [enc]");
+        ANN("example: __ENCODING__");
+        F_VALUE(enc, rb_node_encoding_val(node), "enc");
+        return;
+
       case NODE_ERROR:
         ANN("Broken input recovered by Error Tolerant mode");
         return;
diff --git a/numeric.c b/numeric.c
index 6afb5b50dede91..d3affed8049b34 100644
--- a/numeric.c
+++ b/numeric.c
@@ -552,39 +552,6 @@ num_clone(int argc, VALUE *argv, VALUE x)
 # define num_clone rb_immutable_obj_clone
 #endif
 
-#if 0
-/*
- *  call-seq:
- *    dup -> self
- *
- *  Returns +self+.
- *
- *  Related: Numeric#clone.
- *
- */
-static VALUE
-num_dup(VALUE x)
-{
-    return x;
-}
-#else
-# define num_dup num_uplus
-#endif
-
-/*
- *  call-seq:
- *    +self -> self
- *
- *  Returns +self+.
- *
- */
-
-static VALUE
-num_uplus(VALUE num)
-{
-    return num;
-}
-
 /*
  *  call-seq:
  *    i -> complex
@@ -836,7 +803,7 @@ int_zero_p(VALUE num)
     if (FIXNUM_P(num)) {
         return FIXNUM_ZERO_P(num);
     }
-    assert(RB_BIGNUM_TYPE_P(num));
+    RUBY_ASSERT(RB_BIGNUM_TYPE_P(num));
     return rb_bigzero_p(num);
 }
 
@@ -862,6 +829,8 @@ rb_int_zero_p(VALUE num)
  *  Of the Core and Standard Library classes,
  *  Integer, Float, Rational, and Complex use this implementation.
  *
+ *  Related: #zero?
+ *
  */
 
 static VALUE
@@ -888,7 +857,7 @@ num_nonzero_p(VALUE num)
  *    Rational(1, 2).to_int # => 0
  *    Rational(2, 1).to_int # => 2
  *    Complex(2, 0).to_int  # => 2
- *    Complex(2, 1)         # Raises RangeError (non-zero imaginary part)
+ *    Complex(2, 1).to_int  # Raises RangeError (non-zero imaginary part)
  *
  */
 
@@ -957,13 +926,16 @@ num_negative_p(VALUE num)
  *
  *  You can convert certain objects to Floats with:
  *
- *  - \Method #Float.
+ *  - Method #Float.
  *
  *  == What's Here
  *
- *  First, what's elsewhere. \Class \Float:
+ *  First, what's elsewhere. Class \Float:
  *
- *  - Inherits from {class Numeric}[rdoc-ref:Numeric@What-27s+Here].
+ *  - Inherits from
+ *    {class Numeric}[rdoc-ref:Numeric@What-27s+Here]
+ *    and {class Object}[rdoc-ref:Object@What-27s+Here].
+ *  - Includes {module Comparable}[rdoc-ref:Comparable@What-27s+Here].
  *
  *  Here, class \Float provides methods for:
  *
@@ -999,7 +971,7 @@ num_negative_p(VALUE num)
  *  - #/: Returns the quotient of +self+ and the given value.
  *  - #ceil: Returns the smallest number greater than or equal to +self+.
  *  - #coerce: Returns a 2-element array containing the given value converted to a \Float
-      and +self+
+ *    and +self+
  *  - #divmod: Returns a 2-element array containing the quotient and remainder
  *    results of dividing +self+ by the given value.
  *  - #fdiv: Returns the \Float result of dividing +self+ by the given value.
@@ -1042,16 +1014,15 @@ rb_float_new_in_heap(double d)
  *  may contain:
  *
  *  - A fixed-point number.
+ *      3.14.to_s         # => "3.14"
  *  - A number in "scientific notation" (containing an exponent).
+ *      (10.1**50).to_s   # => "1.644631821843879e+50"
  *  - 'Infinity'.
+ *      (10.1**500).to_s  # => "Infinity"
  *  - '-Infinity'.
+ *      (-10.1**500).to_s # => "-Infinity"
  *  - 'NaN' (indicating not-a-number).
- *
- *    3.14.to_s         # => "3.14"
- *    (10.1**50).to_s   # => "1.644631821843879e+50"
- *    (10.1**500).to_s  # => "Infinity"
- *    (-10.1**500).to_s # => "-Infinity"
- *    (0.0/0.0).to_s    # => "NaN"
+ *      (0.0/0.0).to_s    # => "NaN"
  *
  */
 
@@ -1078,7 +1049,7 @@ flo_to_s(VALUE flt)
     s = sign ? rb_usascii_str_new_cstr("-") : rb_usascii_str_new(0, 0);
     if ((digs = (int)(e - p)) >= (int)sizeof(buf)) digs = (int)sizeof(buf) - 1;
     memcpy(buf, p, digs);
-    xfree(p);
+    free(p);
     if (decpt > 0) {
         if (decpt < digs) {
             memmove(buf + decpt + 1, buf + decpt, digs - decpt);
@@ -1550,8 +1521,8 @@ rb_float_pow(VALUE x, VALUE y)
  *    1.eql?(Rational(1, 1)) # => false
  *    1.eql?(Complex(1, 0))  # => false
  *
- *  \Method +eql?+ is different from +==+ in that +eql?+ requires matching types,
- *  while +==+ does not.
+ *  Method +eql?+ is different from <tt>==</tt> in that +eql?+ requires matching types,
+ *  while <tt>==</tt> does not.
  *
  */
 
@@ -1683,12 +1654,12 @@ rb_dbl_cmp(double a, double b)
  *  Examples:
  *
  *    2.0 <=> 2              # => 0
-      2.0 <=> 2.0            # => 0
-      2.0 <=> Rational(2, 1) # => 0
-      2.0 <=> Complex(2, 0)  # => 0
-      2.0 <=> 1.9            # => 1
-      2.0 <=> 2.1            # => -1
-      2.0 <=> 'foo'          # => nil
+ *    2.0 <=> 2.0            # => 0
+ *    2.0 <=> Rational(2, 1) # => 0
+ *    2.0 <=> Complex(2, 0)  # => 0
+ *    2.0 <=> 1.9            # => 1
+ *    2.0 <=> 2.1            # => -1
+ *    2.0 <=> 'foo'          # => nil
  *
  *  This is the basis for the tests in the Comparable module.
  *
@@ -2165,36 +2136,78 @@ flo_ndigits(int argc, VALUE *argv)
 }
 
 /*
+ *  :markup: markdown
+ *
  *  call-seq:
  *    floor(ndigits = 0) -> float or integer
  *
- *  Returns the largest number less than or equal to +self+ with
- *  a precision of +ndigits+ decimal digits.
+ *  Returns a float or integer that is a "floor" value for `self`,
+ *  as specified by `ndigits`,
+ *  which must be an
+ *  [integer-convertible object](rdoc-ref:implicit_conversion.rdoc@Integer-Convertible+Objects).
  *
- *  When +ndigits+ is positive, returns a float with +ndigits+
- *  digits after the decimal point (as available):
+ *  When `self` is zero,
+ *  returns a zero value:
+ *  a float if `ndigits` is positive,
+ *  an integer otherwise:
  *
- *    f = 12345.6789
- *    f.floor(1) # => 12345.6
- *    f.floor(3) # => 12345.678
- *    f = -12345.6789
- *    f.floor(1) # => -12345.7
- *    f.floor(3) # => -12345.679
+ *  ```
+ *  f = 0.0      # => 0.0
+ *  f.floor(20)  # => 0.0
+ *  f.floor(0)   # => 0
+ *  f.floor(-20) # => 0
+ *  ```
  *
- *  When +ndigits+ is non-positive, returns an integer with at least
- *  <code>ndigits.abs</code> trailing zeros:
+ *  When `self` is non-zero and `ndigits` is positive, returns a float with `ndigits`
+ *  digits after the decimal point (as available):
  *
- *    f = 12345.6789
- *    f.floor(0)  # => 12345
- *    f.floor(-3) # => 12000
- *    f = -12345.6789
- *    f.floor(0)  # => -12346
- *    f.floor(-3) # => -13000
+ *  ```
+ *  f = 12345.6789
+ *  f.floor(1)  # => 12345.6
+ *  f.floor(3)  # => 12345.678
+ *  f.floor(30) # => 12345.6789
+ *  f = -12345.6789
+ *  f.floor(1)  # => -12345.7
+ *  f.floor(3)  # => -12345.679
+ *  f.floor(30) # => -12345.6789
+ *  ```
+ *
+ *  When `self` is non-zero and `ndigits` is non-positive,
+ *  returns an integer value based on a computed granularity:
+ *
+ *  - The granularity is `10 ** ndigits.abs`.
+ *  - The returned value is the largest multiple of the granularity
+ *    that is less than or equal to `self`.
+ *
+ *  Examples with positive `self`:
+ *
+ *  | ndigits | Granularity | 12345.6789.floor(ndigits) |
+ *  |--------:|------------:|--------------------------:|
+ *  |       0 |           1 |                     12345 |
+ *  |      -1 |          10 |                     12340 |
+ *  |      -2 |         100 |                     12300 |
+ *  |      -3 |        1000 |                     12000 |
+ *  |      -4 |       10000 |                     10000 |
+ *  |      -5 |      100000 |                         0 |
+ *
+ *  Examples with negative `self`:
+ *
+ *  | ndigits | Granularity | -12345.6789.floor(ndigits) |
+ *  |--------:|------------:|---------------------------:|
+ *  |       0 |           1 |                     -12346 |
+ *  |      -1 |          10 |                     -12350 |
+ *  |      -2 |         100 |                     -12400 |
+ *  |      -3 |        1000 |                     -13000 |
+ *  |      -4 |       10000 |                     -20000 |
+ *  |      -5 |      100000 |                    -100000 |
+ *  |      -6 |     1000000 |                   -1000000 |
  *
  *  Note that the limited precision of floating-point arithmetic
  *  may lead to surprising results:
  *
- *     (0.3 / 0.1).floor  #=> 2 (!)
+ *  ```
+ *  (0.3 / 0.1).floor  # => 2 # Not 3, (because (0.3 / 0.1) # => 2.9999999999999996, not 3.0)
+ *  ```
  *
  *  Related: Float#ceil.
  *
@@ -2208,36 +2221,78 @@ flo_floor(int argc, VALUE *argv, VALUE num)
 }
 
 /*
+ *  :markup: markdown
+ *
  *  call-seq:
  *    ceil(ndigits = 0) -> float or integer
  *
- *  Returns the smallest number greater than or equal to +self+ with
- *  a precision of +ndigits+ decimal digits.
- *
- *  When +ndigits+ is positive, returns a float with +ndigits+
- *  digits after the decimal point (as available):
- *
- *    f = 12345.6789
- *    f.ceil(1) # => 12345.7
- *    f.ceil(3) # => 12345.679
- *    f = -12345.6789
- *    f.ceil(1) # => -12345.6
- *    f.ceil(3) # => -12345.678
- *
- *  When +ndigits+ is non-positive, returns an integer with at least
- *  <code>ndigits.abs</code> trailing zeros:
- *
- *    f = 12345.6789
- *    f.ceil(0)  # => 12346
- *    f.ceil(-3) # => 13000
- *    f = -12345.6789
- *    f.ceil(0)  # => -12345
- *    f.ceil(-3) # => -12000
+ *  Returns a numeric that is a "ceiling" value for `self`,
+ *  as specified by the given `ndigits`,
+ *  which must be an
+ *  [integer-convertible object](rdoc-ref:implicit_conversion.rdoc@Integer-Convertible+Objects).
+ *
+ *  When `ndigits` is positive, returns a Float with `ndigits`
+ *  decimal digits after the decimal point
+ *  (as available, but no fewer than 1):
+ *
+ *  ```
+ *  f = 12345.6789
+ *  f.ceil(1) # => 12345.7
+ *  f.ceil(3) # => 12345.679
+ *  f.ceil(30) # => 12345.6789
+ *  f = -12345.6789
+ *  f.ceil(1) # => -12345.6
+ *  f.ceil(3) # => -12345.678
+ *  f.ceil(30) # => -12345.6789
+ *  f = 0.0
+ *  f.ceil(1)   # => 0.0
+ *  f.ceil(100) # => 0.0
+ *  ```
+ *
+ *  When `ndigits` is non-positive,
+ *  returns an Integer based on a computed granularity:
+ *
+ *  - The granularity is `10 ** ndigits.abs`.
+ *  - The returned value is the largest multiple of the granularity
+ *    that is less than or equal to `self`.
+ *
+ *  Examples with positive `self`:
+ *
+ *  | ndigits | Granularity | 12345.6789.ceil(ndigits) |
+ *  |--------:|------------:|-------------------------:|
+ *  | 0       | 1           | 12346                    |
+ *  | -1      | 10          | 12350                    |
+ *  | -2      | 100         | 12400                    |
+ *  | -3      | 1000        | 13000                    |
+ *  | -4      | 10000       | 20000                    |
+ *  | -5      | 100000      | 100000                   |
+ *
+ *  Examples with negative `self`:
+ *
+ *  | ndigits | Granularity | -12345.6789.ceil(ndigits) |
+ *  |--------:|------------:|--------------------------:|
+ *  | 0       | 1           | -12345                    |
+ *  | -1      | 10          | -12340                    |
+ *  | -2      | 100         | -12300                    |
+ *  | -3      | 1000        | -12000                    |
+ *  | -4      | 10000       | -10000                    |
+ *  | -5      | 100000      | 0                         |
+ *
+ *  When `self` is zero and `ndigits` is non-positive,
+ *  returns Integer zero:
+ *
+ *  ```
+ *  0.0.ceil(0)  # => 0
+ *  0.0.ceil(-1) # => 0
+ *  0.0.ceil(-2) # => 0
+ *  ```
  *
  *  Note that the limited precision of floating-point arithmetic
  *  may lead to surprising results:
  *
- *     (2.1 / 0.7).ceil  #=> 4 (!)
+ *  ```
+ *  (2.1 / 0.7).ceil  #=> 4 # Not 3 (because 2.1 / 0.7 # => 3.0000000000000004, not 3.0)
+ *  ```
  *
  *  Related: Float#floor.
  *
@@ -2373,11 +2428,7 @@ rb_int_round(VALUE num, int ndigits, enum ruby_num_rounding_mode mode)
 static VALUE
 rb_int_floor(VALUE num, int ndigits)
 {
-    VALUE f;
-
-    if (int_round_zero_p(num, ndigits))
-        return INT2FIX(0);
-    f = int_pow(10, -ndigits);
+    VALUE f = int_pow(10, -ndigits);
     if (FIXNUM_P(num) && FIXNUM_P(f)) {
         SIGNED_VALUE x = FIX2LONG(num), y = FIX2LONG(f);
         int neg = x < 0;
@@ -2386,21 +2437,19 @@ rb_int_floor(VALUE num, int ndigits)
         if (neg) x = -x;
         return LONG2NUM(x);
     }
-    if (RB_FLOAT_TYPE_P(f)) {
-        /* then int_pow overflow */
-        return INT2FIX(0);
+    else {
+        bool neg = int_neg_p(num);
+        if (neg) num = rb_int_minus(rb_int_plus(rb_int_uminus(num), f), INT2FIX(1));
+        num = rb_int_mul(rb_int_div(num, f), f);
+        if (neg) num = rb_int_uminus(num);
+        return num;
     }
-    return rb_int_minus(num, rb_int_modulo(num, f));
 }
 
 static VALUE
 rb_int_ceil(VALUE num, int ndigits)
 {
-    VALUE f;
-
-    if (int_round_zero_p(num, ndigits))
-        return INT2FIX(0);
-    f = int_pow(10, -ndigits);
+    VALUE f = int_pow(10, -ndigits);
     if (FIXNUM_P(num) && FIXNUM_P(f)) {
         SIGNED_VALUE x = FIX2LONG(num), y = FIX2LONG(f);
         int neg = x < 0;
@@ -2410,11 +2459,16 @@ rb_int_ceil(VALUE num, int ndigits)
         if (neg) x = -x;
         return LONG2NUM(x);
     }
-    if (RB_FLOAT_TYPE_P(f)) {
-        /* then int_pow overflow */
-        return INT2FIX(0);
+    else {
+        bool neg = int_neg_p(num);
+        if (neg)
+            num = rb_int_uminus(num);
+        else
+            num = rb_int_plus(num, rb_int_minus(f, INT2FIX(1)));
+        num = rb_int_mul(rb_int_div(num, f), f);
+        if (neg) num = rb_int_uminus(num);
+        return num;
     }
-    return rb_int_plus(num, rb_int_minus(f, rb_int_modulo(num, f)));
 }
 
 VALUE
@@ -2449,7 +2503,7 @@ rb_int_truncate(VALUE num, int ndigits)
 
 /*
  *  call-seq:
- *    round(ndigits = 0, half: :up]) -> integer or float
+ *    round(ndigits = 0, half: :up) -> integer or float
  *
  *  Returns +self+ rounded to the nearest value with
  *  a precision of +ndigits+ decimal digits.
@@ -2651,13 +2705,16 @@ flo_truncate(int argc, VALUE *argv, VALUE num)
 
 /*
  *  call-seq:
- *    floor(digits = 0) -> integer or float
+ *    floor(ndigits = 0) -> float or integer
  *
- *  Returns the largest number that is less than or equal to +self+ with
- *  a precision of +digits+ decimal digits.
+ *  Returns the largest float or integer that is less than or equal to +self+,
+ *  as specified by the given `ndigits`,
+ *  which must be an
+ *  {integer-convertible object}[rdoc-ref:implicit_conversion.rdoc@Integer-Convertible+Objects].
  *
- *  \Numeric implements this by converting +self+ to a Float and
- *  invoking Float#floor.
+ *  Equivalent to <tt>self.to_f.floor(ndigits)</tt>.
+ *
+ *  Related: #ceil, Float#floor.
  */
 
 static VALUE
@@ -2668,13 +2725,16 @@ num_floor(int argc, VALUE *argv, VALUE num)
 
 /*
  *  call-seq:
- *    ceil(digits = 0) -> integer or float
+ *    ceil(ndigits = 0) -> float or integer
  *
- *  Returns the smallest number that is greater than or equal to +self+ with
- *  a precision of +digits+ decimal digits.
+ *  Returns the smallest float or integer that is greater than or equal to +self+,
+ *  as specified by the given `ndigits`,
+ *  which must be an
+ *  {integer-convertible object}[rdoc-ref:implicit_conversion.rdoc@Integer-Convertible+Objects].
  *
- *  \Numeric implements this by converting +self+ to a Float and
- *  invoking Float#ceil.
+ *  Equivalent to <tt>self.to_f.ceil(ndigits)</tt>.
+ *
+ *  Related: #floor, Float#ceil.
  */
 
 static VALUE
@@ -2834,7 +2894,7 @@ ruby_num_interval_step_size(VALUE from, VALUE to, VALUE step, int excl)
         }
         if (RTEST(rb_funcall(from, cmp, 1, to))) return INT2FIX(0);
         result = rb_funcall(rb_funcall(to, '-', 1, from), id_div, 1, step);
-        if (!excl || RTEST(rb_funcall(rb_funcall(from, '+', 1, rb_funcall(result, '*', 1, step)), cmp, 1, to))) {
+        if (!excl || RTEST(rb_funcall(to, cmp, 1, rb_funcall(from, '+', 1, rb_funcall(result, '*', 1, step))))) {
             result = rb_funcall(result, '+', 1, INT2FIX(1));
         }
         return result;
@@ -2946,88 +3006,88 @@ num_step_size(VALUE from, VALUE args, VALUE eobj)
  *    step(by: , to: nil) {|n| ... }    ->  self
  *    step(by: , to: nil)               ->  enumerator
  *
- *  Generates a sequence of numbers; with a block given, traverses the sequence.
+ * Generates a sequence of numbers; with a block given, traverses the sequence.
  *
- *  Of the Core and Standard Library classes,
- *  Integer, Float, and Rational use this implementation.
- *
- *  A quick example:
- *
- *    squares = []
- *    1.step(by: 2, to: 10) {|i| squares.push(i*i) }
- *    squares # => [1, 9, 25, 49, 81]
- *
- *  The generated sequence:
- *
- *  - Begins with +self+.
- *  - Continues at intervals of +step+ (which may not be zero).
- *  - Ends with the last number that is within or equal to +limit+;
- *    that is, less than or equal to +limit+ if +step+ is positive,
- *    greater than or equal to +limit+ if +step+ is negative.
- *    If +limit+ is not given, the sequence is of infinite length.
- *
- *  If a block is given, calls the block with each number in the sequence;
- *  returns +self+.  If no block is given, returns an Enumerator::ArithmeticSequence.
- *
- *  <b>Keyword Arguments</b>
- *
- *  With keyword arguments +by+ and +to+,
- *  their values (or defaults) determine the step and limit:
- *
- *    # Both keywords given.
- *    squares = []
- *    4.step(by: 2, to: 10) {|i| squares.push(i*i) }    # => 4
- *    squares # => [16, 36, 64, 100]
- *    cubes = []
- *    3.step(by: -1.5, to: -3) {|i| cubes.push(i*i*i) } # => 3
- *    cubes   # => [27.0, 3.375, 0.0, -3.375, -27.0]
- *    squares = []
- *    1.2.step(by: 0.2, to: 2.0) {|f| squares.push(f*f) }
- *    squares # => [1.44, 1.9599999999999997, 2.5600000000000005, 3.24, 4.0]
- *
- *    squares = []
- *    Rational(6/5).step(by: 0.2, to: 2.0) {|r| squares.push(r*r) }
- *    squares # => [1.0, 1.44, 1.9599999999999997, 2.5600000000000005, 3.24, 4.0]
- *
- *    # Only keyword to given.
- *    squares = []
- *    4.step(to: 10) {|i| squares.push(i*i) }           # => 4
- *    squares # => [16, 25, 36, 49, 64, 81, 100]
- *    # Only by given.
- *
- *    # Only keyword by given
- *    squares = []
- *    4.step(by:2) {|i| squares.push(i*i); break if i > 10 }
- *    squares # => [16, 36, 64, 100, 144]
- *
- *    # No block given.
- *    e = 3.step(by: -1.5, to: -3) # => (3.step(by: -1.5, to: -3))
- *    e.class                      # => Enumerator::ArithmeticSequence
- *
- *  <b>Positional Arguments</b>
- *
- *  With optional positional arguments +limit+ and +step+,
- *  their values (or defaults) determine the step and limit:
- *
- *    squares = []
- *    4.step(10, 2) {|i| squares.push(i*i) }    # => 4
- *    squares # => [16, 36, 64, 100]
- *    squares = []
- *    4.step(10) {|i| squares.push(i*i) }
- *    squares # => [16, 25, 36, 49, 64, 81, 100]
- *    squares = []
- *    4.step {|i| squares.push(i*i); break if i > 10 }  # => nil
- *    squares # => [16, 25, 36, 49, 64, 81, 100, 121]
+ * Of the Core and Standard Library classes,
+ * Integer, Float, and Rational use this implementation.
+ *
+ * A quick example:
+ *
+ *   squares = []
+ *   1.step(by: 2, to: 10) {|i| squares.push(i*i) }
+ *   squares # => [1, 9, 25, 49, 81]
+ *
+ * The generated sequence:
+ *
+ * - Begins with +self+.
+ * - Continues at intervals of +by+ (which may not be zero).
+ * - Ends with the last number that is within or equal to +to+;
+ *   that is, less than or equal to +to+ if +by+ is positive,
+ *   greater than or equal to +to+ if +by+ is negative.
+ *   If +to+ is +nil+, the sequence is of infinite length.
+ *
+ * If a block is given, calls the block with each number in the sequence;
+ * returns +self+. If no block is given, returns an Enumerator::ArithmeticSequence.
+ *
+ * <b>Keyword Arguments</b>
+ *
+ * With keyword arguments +by+ and +to+,
+ * their values (or defaults) determine the step and limit:
+ *
+ *   # Both keywords given.
+ *   squares = []
+ *   4.step(by: 2, to: 10) {|i| squares.push(i*i) }    # => 4
+ *   squares # => [16, 36, 64, 100]
+ *   cubes = []
+ *   3.step(by: -1.5, to: -3) {|i| cubes.push(i*i*i) } # => 3
+ *   cubes   # => [27.0, 3.375, 0.0, -3.375, -27.0]
+ *   squares = []
+ *   1.2.step(by: 0.2, to: 2.0) {|f| squares.push(f*f) }
+ *   squares # => [1.44, 1.9599999999999997, 2.5600000000000005, 3.24, 4.0]
+ *
+ *   squares = []
+ *   Rational(6/5).step(by: 0.2, to: 2.0) {|r| squares.push(r*r) }
+ *   squares # => [1.0, 1.44, 1.9599999999999997, 2.5600000000000005, 3.24, 4.0]
+ *
+ *   # Only keyword to given.
+ *   squares = []
+ *   4.step(to: 10) {|i| squares.push(i*i) }           # => 4
+ *   squares # => [16, 25, 36, 49, 64, 81, 100]
+ *   # Only by given.
+ *
+ *   # Only keyword by given
+ *   squares = []
+ *   4.step(by:2) {|i| squares.push(i*i); break if i > 10 }
+ *   squares # => [16, 36, 64, 100, 144]
+ *
+ *   # No block given.
+ *   e = 3.step(by: -1.5, to: -3) # => (3.step(by: -1.5, to: -3))
+ *   e.class                      # => Enumerator::ArithmeticSequence
+ *
+ * <b>Positional Arguments</b>
+ *
+ * With optional positional arguments +to+ and +by+,
+ * their values (or defaults) determine the step and limit:
+ *
+ *   squares = []
+ *   4.step(10, 2) {|i| squares.push(i*i) }    # => 4
+ *   squares # => [16, 36, 64, 100]
+ *   squares = []
+ *   4.step(10) {|i| squares.push(i*i) }
+ *   squares # => [16, 25, 36, 49, 64, 81, 100]
+ *   squares = []
+ *   4.step {|i| squares.push(i*i); break if i > 10 }  # => nil
+ *   squares # => [16, 25, 36, 49, 64, 81, 100, 121]
  *
  * <b>Implementation Notes</b>
  *
- *  If all the arguments are integers, the loop operates using an integer
- *  counter.
+ * If all the arguments are integers, the loop operates using an integer
+ * counter.
  *
- *  If any of the arguments are floating point numbers, all are converted
- *  to floats, and the loop is executed
- *  <i>floor(n + n*Float::EPSILON) + 1</i> times,
- *  where <i>n = (limit - self)/step</i>.
+ * If any of the arguments are floating point numbers, all are converted
+ * to floats, and the loop is executed
+ * <i>floor(n + n*Float::EPSILON) + 1</i> times,
+ * where <i>n = (limit - self)/step</i>.
  *
  */
 
@@ -3210,7 +3270,7 @@ rb_num2ulong(VALUE val)
 void
 rb_out_of_int(SIGNED_VALUE num)
 {
-    rb_raise(rb_eRangeError, "integer %"PRIdVALUE " too %s to convert to `int'",
+    rb_raise(rb_eRangeError, "integer %"PRIdVALUE " too %s to convert to 'int'",
              num, num < 0 ? "small" : "big");
 }
 
@@ -3229,12 +3289,12 @@ check_uint(unsigned long num, int sign)
     if (sign) {
         /* minus */
         if (num < (unsigned long)INT_MIN)
-            rb_raise(rb_eRangeError, "integer %ld too small to convert to `unsigned int'", (long)num);
+            rb_raise(rb_eRangeError, "integer %ld too small to convert to 'unsigned int'", (long)num);
     }
     else {
         /* plus */
         if (UINT_MAX < num)
-            rb_raise(rb_eRangeError, "integer %lu too big to convert to `unsigned int'", num);
+            rb_raise(rb_eRangeError, "integer %lu too big to convert to 'unsigned int'", num);
     }
 }
 
@@ -3309,7 +3369,7 @@ NORETURN(static void rb_out_of_short(SIGNED_VALUE num));
 static void
 rb_out_of_short(SIGNED_VALUE num)
 {
-    rb_raise(rb_eRangeError, "integer %"PRIdVALUE " too %s to convert to `short'",
+    rb_raise(rb_eRangeError, "integer %"PRIdVALUE " too %s to convert to 'short'",
              num, num < 0 ? "small" : "big");
 }
 
@@ -3327,12 +3387,12 @@ check_ushort(unsigned long num, int sign)
     if (sign) {
         /* minus */
         if (num < (unsigned long)SHRT_MIN)
-            rb_raise(rb_eRangeError, "integer %ld too small to convert to `unsigned short'", (long)num);
+            rb_raise(rb_eRangeError, "integer %ld too small to convert to 'unsigned short'", (long)num);
     }
     else {
         /* plus */
         if (USHRT_MAX < num)
-            rb_raise(rb_eRangeError, "integer %lu too big to convert to `unsigned short'", num);
+            rb_raise(rb_eRangeError, "integer %lu too big to convert to 'unsigned short'", num);
     }
 }
 
@@ -3479,16 +3539,19 @@ rb_num2ull(VALUE val)
  *
  * You can convert certain objects to Integers with:
  *
- * - \Method #Integer.
+ * - Method #Integer.
  *
  * An attempt to add a singleton method to an instance of this class
  * causes an exception to be raised.
  *
  * == What's Here
  *
- * First, what's elsewhere. \Class \Integer:
+ * First, what's elsewhere. Class \Integer:
  *
- * - Inherits from {class Numeric}[rdoc-ref:Numeric@What-27s+Here].
+ * - Inherits from
+ *   {class Numeric}[rdoc-ref:Numeric@What-27s+Here]
+ *   and {class Object}[rdoc-ref:Object@What-27s+Here].
+ * - Includes {module Comparable}[rdoc-ref:Comparable@What-27s+Here].
  *
  * Here, class \Integer provides methods for:
  *
@@ -3529,6 +3592,7 @@ rb_num2ull(VALUE val)
  * - #>>: Returns the value of +self+ after a rightward bit-shift.
  * - #[]: Returns a slice of bits from +self+.
  * - #^: Returns the bitwise EXCLUSIVE OR of +self+ and the given value.
+ * - #|: Returns the bitwise OR of +self+ and the given value.
  * - #ceil: Returns the smallest number greater than or equal to +self+.
  * - #chr: Returns a 1-character string containing the character
  *   represented by the value of +self+.
@@ -3548,7 +3612,6 @@ rb_num2ull(VALUE val)
  * - #to_s (aliased as #inspect): Returns a string containing the place-value
  *   representation of +self+ in the given radix.
  * - #truncate: Returns +self+ truncated to the given precision.
- * - #|: Returns the bitwise OR of +self+ and the given value.
  *
  * === Other
  *
@@ -3568,7 +3631,7 @@ rb_int_odd_p(VALUE num)
         return RBOOL(num & 2);
     }
     else {
-        assert(RB_BIGNUM_TYPE_P(num));
+        RUBY_ASSERT(RB_BIGNUM_TYPE_P(num));
         return rb_big_odd_p(num);
     }
 }
@@ -3580,7 +3643,7 @@ int_even_p(VALUE num)
         return RBOOL((num & 2) == 0);
     }
     else {
-        assert(RB_BIGNUM_TYPE_P(num));
+        RUBY_ASSERT(RB_BIGNUM_TYPE_P(num));
         return rb_big_even_p(num);
     }
 }
@@ -3837,7 +3900,7 @@ rb_int_uminus(VALUE num)
         return fix_uminus(num);
     }
     else {
-        assert(RB_BIGNUM_TYPE_P(num));
+        RUBY_ASSERT(RB_BIGNUM_TYPE_P(num));
         return rb_big_uminus(num);
     }
 }
@@ -4096,7 +4159,13 @@ static double
 fix_fdiv_double(VALUE x, VALUE y)
 {
     if (FIXNUM_P(y)) {
-        return double_div_double(FIX2LONG(x), FIX2LONG(y));
+        long iy = FIX2LONG(y);
+#if SIZEOF_LONG * CHAR_BIT > DBL_MANT_DIG
+        if ((iy < 0 ? -iy : iy) >= (1L << DBL_MANT_DIG)) {
+            return rb_big_fdiv_double(rb_int2big(FIX2LONG(x)), rb_int2big(iy));
+        }
+#endif
+        return double_div_double(FIX2LONG(x), iy);
     }
     else if (RB_BIGNUM_TYPE_P(y)) {
         return rb_big_fdiv_double(rb_int2big(FIX2LONG(x)), y);
@@ -4114,7 +4183,7 @@ rb_int_fdiv_double(VALUE x, VALUE y)
 {
     if (RB_INTEGER_TYPE_P(y) && !FIXNUM_ZERO_P(y)) {
         VALUE gcd = rb_gcd(x, y);
-        if (!FIXNUM_ZERO_P(gcd)) {
+        if (!FIXNUM_ZERO_P(gcd) && gcd != INT2FIX(1)) {
             x = rb_int_idiv(x, gcd);
             y = rb_int_idiv(y, gcd);
         }
@@ -4236,14 +4305,14 @@ fix_idiv(VALUE x, VALUE y)
  * Performs integer division; returns the integer result of dividing +self+
  * by +numeric+:
  *
- *    4.div(3)      # => 1
- *    4.div(-3)      # => -2
- *    -4.div(3)      # => -2
- *    -4.div(-3)      # => 1
- *    4.div(3.0)      # => 1
- *    4.div(Rational(3, 1))      # => 1
+ *    4.div(3)              # => 1
+ *    4.div(-3)             # => -2
+ *    -4.div(3)             # => -2
+ *    -4.div(-3)            # => 1
+ *    4.div(3.0)            # => 1
+ *    4.div(Rational(3, 1)) # => 1
  *
- *  Raises an exception if +numeric+ does not have method +div+.
+ * Raises an exception if +numeric+ does not have method +div+.
  *
  */
 
@@ -4347,7 +4416,7 @@ int_remainder(VALUE x, VALUE y)
     if (FIXNUM_P(x)) {
         if (FIXNUM_P(y)) {
             VALUE z = fix_mod(x, y);
-            assert(FIXNUM_P(z));
+            RUBY_ASSERT(FIXNUM_P(z));
             if (z != INT2FIX(0) && (SIGNED_VALUE)(x ^ y) < 0)
                 z = fix_minus(z, y);
             return z;
@@ -4697,7 +4766,7 @@ rb_int_cmp(VALUE x, VALUE y)
         return rb_big_cmp(x, y);
     }
     else {
-        rb_raise(rb_eNotImpError, "need to define `<=>' in %s", rb_obj_classname(x));
+        rb_raise(rb_eNotImpError, "need to define '<=>' in %s", rb_obj_classname(x));
     }
 }
 
@@ -5157,7 +5226,7 @@ fix_rshift(long val, unsigned long i)
  *
  */
 
-static VALUE
+VALUE
 rb_int_rshift(VALUE x, VALUE y)
 {
     if (FIXNUM_P(x)) {
@@ -5432,7 +5501,7 @@ rb_fix_digits(VALUE fix, long base)
     VALUE digits;
     long x = FIX2LONG(fix);
 
-    assert(x >= 0);
+    RUBY_ASSERT(x >= 0);
 
     if (base < 2)
         rb_raise(rb_eArgError, "invalid radix %ld", base);
@@ -5441,11 +5510,12 @@ rb_fix_digits(VALUE fix, long base)
         return rb_ary_new_from_args(1, INT2FIX(0));
 
     digits = rb_ary_new();
-    while (x > 0) {
+    while (x >= base) {
         long q = x % base;
         rb_ary_push(digits, LONG2NUM(q));
         x /= base;
     }
+    rb_ary_push(digits, LONG2NUM(x));
 
     return digits;
 }
@@ -5455,7 +5525,7 @@ rb_int_digits_bigbase(VALUE num, VALUE base)
 {
     VALUE digits, bases;
 
-    assert(!rb_num_negative_p(num));
+    RUBY_ASSERT(!rb_num_negative_p(num));
 
     if (RB_BIGNUM_TYPE_P(base))
         base = rb_big_norm(base);
@@ -5655,53 +5725,7 @@ int_downto(VALUE from, VALUE to)
 static VALUE
 int_dotimes_size(VALUE num, VALUE args, VALUE eobj)
 {
-    if (FIXNUM_P(num)) {
-        if (NUM2LONG(num) <= 0) return INT2FIX(0);
-    }
-    else {
-        if (RTEST(rb_funcall(num, '<', 1, INT2FIX(0)))) return INT2FIX(0);
-    }
-    return num;
-}
-
-/*
- *  call-seq:
- *    times {|i| ... } -> self
- *    times            -> enumerator
- *
- *  Calls the given block +self+ times with each integer in <tt>(0..self-1)</tt>:
- *
- *    a = []
- *    5.times {|i| a.push(i) } # => 5
- *    a                        # => [0, 1, 2, 3, 4]
- *
- *  With no block given, returns an Enumerator.
- *
- */
-
-static VALUE
-int_dotimes(VALUE num)
-{
-    RETURN_SIZED_ENUMERATOR(num, 0, 0, int_dotimes_size);
-
-    if (FIXNUM_P(num)) {
-        long i, end;
-
-        end = FIX2LONG(num);
-        for (i=0; i<end; i++) {
-            rb_yield_1(LONG2FIX(i));
-        }
-    }
-    else {
-        VALUE i = INT2FIX(0);
-
-        for (;;) {
-            if (!RTEST(int_le(i, num))) break;
-            rb_yield(i);
-            i = rb_int_plus(i, INT2FIX(1));
-        }
-    }
-    return num;
+    return int_neg_p(num) ? INT2FIX(0) : num;
 }
 
 /*
@@ -5770,24 +5794,56 @@ int_round(int argc, VALUE* argv, VALUE num)
 }
 
 /*
+ *  :markup: markdown
+ *
  *  call-seq:
  *    floor(ndigits = 0) -> integer
  *
- *  Returns the largest number less than or equal to +self+ with
- *  a precision of +ndigits+ decimal digits.
+ *  Returns an integer that is a "floor" value for `self`,
+ *  as specified by the given `ndigits`,
+ *  which must be an
+ *  [integer-convertible object](rdoc-ref:implicit_conversion.rdoc@Integer-Convertible+Objects).
  *
- *  When +ndigits+ is negative, the returned value
- *  has at least <tt>ndigits.abs</tt> trailing zeros:
+ *  - When `self` is zero, returns zero (regardless of the value of `ndigits`):
  *
- *    555.floor(-1)  # => 550
- *    555.floor(-2)  # => 500
- *    -555.floor(-2) # => -600
- *    555.floor(-3)  # => 0
+ *      ```
+ *      0.floor(2)  # => 0
+ *      0.floor(-2) # => 0
+ *      ```
  *
- *  Returns +self+ when +ndigits+ is zero or positive.
+ *  - When `self` is non-zero and `ndigits` is non-negative, returns `self`:
+ *
+ *      ```
+ *      555.floor     # => 555
+ *      555.floor(50) # => 555
+ *      ```
+ *
+ *  - When `self` is non-zero and `ndigits` is negative,
+ *    returns a value based on a computed granularity:
+ *
+ *      - The granularity is `10 ** ndigits.abs`.
+ *      - The returned value is the largest multiple of the granularity
+ *        that is less than or equal to `self`.
  *
- *    555.floor     # => 555
- *    555.floor(50) # => 555
+ *      Examples with positive `self`:
+ *
+ *      | ndigits | Granularity | 1234.floor(ndigits) |
+ *      |--------:|------------:|--------------------:|
+ *      | -1      | 10          | 1230                |
+ *      | -2      | 100         | 1200                |
+ *      | -3      | 1000        | 1000                |
+ *      | -4      | 10000       | 0                   |
+ *      | -5      | 100000      | 0                   |
+ *
+ *      Examples with negative `self`:
+ *
+ *      | ndigits | Granularity | -1234.floor(ndigits) |
+ *      |--------:|------------:|---------------------:|
+ *      | -1      | 10          | -1240                |
+ *      | -2      | 100         | -1300                |
+ *      | -3      | 1000        | -2000                |
+ *      | -4      | 10000       | -10000               |
+ *      | -5      | 100000      | -100000              |
  *
  *  Related: Integer#ceil.
  *
@@ -5807,27 +5863,58 @@ int_floor(int argc, VALUE* argv, VALUE num)
 }
 
 /*
+ *  :markup: markdown
+ *
  *  call-seq:
  *    ceil(ndigits = 0) -> integer
  *
- *  Returns the smallest number greater than or equal to +self+ with
- *  a precision of +ndigits+ decimal digits.
+ *  Returns an integer that is a "ceiling" value for `self`,
+ *  as specified by the given `ndigits`,
+ *  which must be an
+ *  [integer-convertible object](rdoc-ref:implicit_conversion.rdoc@Integer-Convertible+Objects).
  *
- *  When the precision is negative, the returned value is an integer
- *  with at least <code>ndigits.abs</code> trailing zeros:
+ *  - When `self` is zero, returns zero (regardless of the value of `ndigits`):
  *
- *    555.ceil(-1)  # => 560
- *    555.ceil(-2)  # => 600
- *    -555.ceil(-2) # => -500
- *    555.ceil(-3)  # => 1000
+ *      ```
+ *      0.ceil(2)  # => 0
+ *      0.ceil(-2) # => 0
+ *      ```
  *
- *  Returns +self+ when +ndigits+ is zero or positive.
+ *  - When `self` is non-zero and `ndigits` is non-negative, returns `self`:
  *
- *     555.ceil     # => 555
- *     555.ceil(50) # => 555
+ *      ```
+ *      555.ceil     # => 555
+ *      555.ceil(50) # => 555
+ *      ```
  *
- *  Related: Integer#floor.
+ *  - When `self` is non-zero and `ndigits` is negative,
+ *    returns a value based on a computed granularity:
+ *
+ *      - The granularity is `10 ** ndigits.abs`.
+ *      - The returned value is the smallest multiple of the granularity
+ *        that is greater than or equal to `self`.
+ *
+ *      Examples with positive `self`:
+ *
+ *      | ndigits | Granularity | 1234.ceil(ndigits) |
+ *      |--------:|------------:|-------------------:|
+ *      | -1      | 10          | 1240               |
+ *      | -2      | 100         | 1300               |
+ *      | -3      | 1000        | 2000               |
+ *      | -4      | 10000       | 10000              |
+ *      | -5      | 100000      | 100000             |
  *
+ *      Examples with negative `self`:
+ *
+ *      | ndigits | Granularity | -1234.ceil(ndigits) |
+ *      |--------:|------------:|--------------------:|
+ *      | -1      | 10          | -1230               |
+ *      | -2      | 100         | -1200               |
+ *      | -3      | 1000        | -1000               |
+ *      | -4      | 10000       | 0                   |
+ *      | -5      | 100000      | 0                   |
+ *
+ *  Related: Integer#floor.
  */
 
 static VALUE
@@ -5891,7 +5978,11 @@ prefix##_isqrt(argtype n) \
         while ((t = n/x) < (argtype)x) x = (rettype)((x + t) >> 1); \
         return x; \
     } \
-    return (rettype)sqrt(argtype##_TO_DOUBLE(n)); \
+    rettype x = (rettype)sqrt(argtype##_TO_DOUBLE(n)); \
+    /* libm sqrt may returns a larger approximation than actual. */ \
+    /* Our isqrt always returns a smaller approximation. */ \
+    if (x * x > n) x--; \
+    return x; \
 }
 
 #if SIZEOF_LONG*CHAR_BIT > DBL_MANT_DIG
@@ -6103,7 +6194,7 @@ int_s_try_convert(VALUE self, VALUE num)
  *
  * == What's Here
  *
- * First, what's elsewhere. \Class \Numeric:
+ * First, what's elsewhere. Class \Numeric:
  *
  * - Inherits from {class Object}[rdoc-ref:Object@What-27s+Here].
  * - Includes {module Comparable}[rdoc-ref:Comparable@What-27s+Here].
@@ -6202,10 +6293,8 @@ Init_Numeric(void)
     rb_include_module(rb_cNumeric, rb_mComparable);
     rb_define_method(rb_cNumeric, "coerce", num_coerce, 1);
     rb_define_method(rb_cNumeric, "clone", num_clone, -1);
-    rb_define_method(rb_cNumeric, "dup", num_dup, 0);
 
     rb_define_method(rb_cNumeric, "i", num_imaginary, 0);
-    rb_define_method(rb_cNumeric, "+@", num_uplus, 0);
     rb_define_method(rb_cNumeric, "-@", num_uminus, 0);
     rb_define_method(rb_cNumeric, "<=>", num_cmp, 1);
     rb_define_method(rb_cNumeric, "eql?", num_eql, 1);
@@ -6243,7 +6332,6 @@ Init_Numeric(void)
     rb_define_method(rb_cInteger, "nobits?", int_nobits_p, 1);
     rb_define_method(rb_cInteger, "upto", int_upto, 1);
     rb_define_method(rb_cInteger, "downto", int_downto, 1);
-    rb_define_method(rb_cInteger, "times", int_dotimes, 0);
     rb_define_method(rb_cInteger, "succ", int_succ, 0);
     rb_define_method(rb_cInteger, "next", int_succ, 0);
     rb_define_method(rb_cInteger, "pred", int_pred, 0);
@@ -6286,19 +6374,25 @@ Init_Numeric(void)
 
     rb_define_method(rb_cInteger, "digits", rb_int_digits, -1);
 
-    rb_fix_to_s_static[0] = rb_fstring_literal("0");
-    rb_fix_to_s_static[1] = rb_fstring_literal("1");
-    rb_fix_to_s_static[2] = rb_fstring_literal("2");
-    rb_fix_to_s_static[3] = rb_fstring_literal("3");
-    rb_fix_to_s_static[4] = rb_fstring_literal("4");
-    rb_fix_to_s_static[5] = rb_fstring_literal("5");
-    rb_fix_to_s_static[6] = rb_fstring_literal("6");
-    rb_fix_to_s_static[7] = rb_fstring_literal("7");
-    rb_fix_to_s_static[8] = rb_fstring_literal("8");
-    rb_fix_to_s_static[9] = rb_fstring_literal("9");
-    for(int i = 0; i < 10; i++) {
-        rb_gc_register_mark_object(rb_fix_to_s_static[i]);
-    }
+#define fix_to_s_static(n) do { \
+        VALUE lit = rb_fstring_literal(#n); \
+        rb_fix_to_s_static[n] = lit; \
+        rb_vm_register_global_object(lit); \
+        RB_GC_GUARD(lit); \
+    } while (0)
+
+    fix_to_s_static(0);
+    fix_to_s_static(1);
+    fix_to_s_static(2);
+    fix_to_s_static(3);
+    fix_to_s_static(4);
+    fix_to_s_static(5);
+    fix_to_s_static(6);
+    fix_to_s_static(7);
+    fix_to_s_static(8);
+    fix_to_s_static(9);
+
+#undef fix_to_s_static
 
     rb_cFloat  = rb_define_class("Float", rb_cNumeric);
 
diff --git a/numeric.rb b/numeric.rb
index 806b65becd035e..27e9951fd3bd8d 100644
--- a/numeric.rb
+++ b/numeric.rb
@@ -1,4 +1,14 @@
 class Numeric
+  #  call-seq:
+  #    dup -> self
+  #
+  #  Returns +self+.
+  #
+  #  Related: Numeric#clone.
+  #
+  def dup
+    self
+  end
 
   #  call-seq:
   #    real? -> true or false
@@ -70,6 +80,15 @@ def conjugate
   end
 
   alias conj conjugate
+
+  #  call-seq:
+  #    +self -> self
+  #
+  #  Returns +self+.
+  #
+  def +@
+    self
+  end
 end
 
 class Integer
@@ -217,6 +236,30 @@ def size
     Primitive.cexpr! 'rb_int_size(self)'
   end
 
+  # call-seq:
+  #   times {|i| ... } -> self
+  #   times            -> enumerator
+  #
+  # Calls the given block +self+ times with each integer in <tt>(0..self-1)</tt>:
+  #
+  #   a = []
+  #   5.times {|i| a.push(i) } # => 5
+  #   a                        # => [0, 1, 2, 3, 4]
+  #
+  # With no block given, returns an Enumerator.
+  def times
+    Primitive.attr! :inline_block
+    unless defined?(yield)
+      return Primitive.cexpr! 'SIZED_ENUMERATOR(self, 0, 0, int_dotimes_size)'
+    end
+    i = 0
+    while i < self
+      yield i
+      i = i.succ
+    end
+    self
+  end
+
   #  call-seq:
   #    to_i -> self
   #
@@ -278,6 +321,29 @@ def numerator
   def denominator
     1
   end
+
+  with_yjit do
+    if Primitive.rb_builtin_basic_definition_p(:downto)
+      undef :downto
+
+      def downto(to) # :nodoc:
+        Primitive.attr! :inline_block, :c_trace
+
+        # When no block is given, return an Enumerator that enumerates from `self` to `to`.
+        # Not using `block_given?` and `to_enum` to keep them unaffected by redefinitions.
+        unless defined?(yield)
+          return Primitive.cexpr! 'SIZED_ENUMERATOR(self, 1, &to, int_downto_size)'
+        end
+
+        from = self
+        while from >= to
+          yield from
+          from = from.pred
+        end
+        self
+      end
+    end
+  end
 end
 
 class Float
@@ -304,10 +370,7 @@ def abs
     Primitive.cexpr! 'rb_float_abs(self)'
   end
 
-  def magnitude
-    Primitive.attr! :leaf
-    Primitive.cexpr! 'rb_float_abs(self)'
-  end
+  alias magnitude abs
 
   # call-seq:
   #   -float -> float
diff --git a/object.c b/object.c
index c32cb82dd991e1..0ab93b7a711c02 100644
--- a/object.c
+++ b/object.c
@@ -31,6 +31,7 @@
 #include "internal/object.h"
 #include "internal/struct.h"
 #include "internal/string.h"
+#include "internal/st.h"
 #include "internal/symbol.h"
 #include "internal/variable.h"
 #include "variable.h"
@@ -41,6 +42,7 @@
 #include "ruby/assert.h"
 #include "builtin.h"
 #include "shape.h"
+#include "yjit.h"
 
 /* Flags of RObject
  *
@@ -48,10 +50,6 @@
  *           The object has its instance variables embedded (the array of
  *           instance variables directly follow the object, rather than being
  *           on a separately allocated buffer).
- * if !SHAPE_IN_BASIC_FLAGS
- * 4-19: SHAPE_FLAG_MASK
- *           Shape ID for the object.
- * endif
  */
 
 /*!
@@ -85,6 +83,7 @@ static VALUE rb_cFalseClass_to_s;
 #define id_init_dup         idInitialize_dup
 #define id_const_missing    idConst_missing
 #define id_to_f             idTo_f
+static ID id_instance_variables_to_inspect;
 
 #define CLASS_OR_MODULE_P(obj) \
     (!SPECIAL_CONST_P(obj) && \
@@ -92,6 +91,12 @@ static VALUE rb_cFalseClass_to_s;
 
 /*! \endcond */
 
+size_t
+rb_obj_embedded_size(uint32_t fields_count)
+{
+    return offsetof(struct RObject, as.ary) + (sizeof(VALUE) * fields_count);
+}
+
 VALUE
 rb_obj_hide(VALUE obj)
 {
@@ -110,10 +115,40 @@ rb_obj_reveal(VALUE obj, VALUE klass)
     return obj;
 }
 
+VALUE
+rb_class_allocate_instance(VALUE klass)
+{
+    uint32_t index_tbl_num_entries = RCLASS_MAX_IV_COUNT(klass);
+
+    size_t size = rb_obj_embedded_size(index_tbl_num_entries);
+    if (!rb_gc_size_allocatable_p(size)) {
+        size = sizeof(struct RObject);
+    }
+
+    NEWOBJ_OF(o, struct RObject, klass,
+              T_OBJECT | ROBJECT_EMBED | (RGENGC_WB_PROTECTED_OBJECT ? FL_WB_PROTECTED : 0), size, 0);
+    VALUE obj = (VALUE)o;
+
+    RUBY_ASSERT(RSHAPE_TYPE_P(RBASIC_SHAPE_ID(obj), SHAPE_ROOT));
+
+    RBASIC_SET_SHAPE_ID(obj, rb_shape_root(rb_gc_heap_id_for_size(size)));
+
+#if RUBY_DEBUG
+    RUBY_ASSERT(!rb_shape_obj_too_complex_p(obj));
+    VALUE *ptr = ROBJECT_FIELDS(obj);
+    for (size_t i = 0; i < ROBJECT_FIELDS_CAPACITY(obj); i++) {
+        ptr[i] = Qundef;
+    }
+#endif
+
+    return obj;
+}
+
 VALUE
 rb_obj_setup(VALUE obj, VALUE klass, VALUE type)
 {
-    RBASIC(obj)->flags = type;
+    VALUE ignored_flags = RUBY_FL_PROMOTED;
+    RBASIC(obj)->flags = (type & ~ignored_flags) | (RBASIC(obj)->flags & ignored_flags);
     RBASIC_SET_CLASS(obj, klass);
     return obj;
 }
@@ -248,7 +283,7 @@ VALUE
 rb_class_real(VALUE cl)
 {
     while (cl &&
-        ((RBASIC(cl)->flags & FL_SINGLETON) || BUILTIN_TYPE(cl) == T_ICLASS)) {
+        (RCLASS_SINGLETON_P(cl) || BUILTIN_TYPE(cl) == T_ICLASS)) {
         cl = RCLASS_SUPER(cl);
     }
     return cl;
@@ -288,60 +323,48 @@ void
 rb_obj_copy_ivar(VALUE dest, VALUE obj)
 {
     RUBY_ASSERT(!RB_TYPE_P(obj, T_CLASS) && !RB_TYPE_P(obj, T_MODULE));
-
     RUBY_ASSERT(BUILTIN_TYPE(dest) == BUILTIN_TYPE(obj));
-    rb_shape_t * src_shape = rb_shape_get_shape(obj);
-
-    if (rb_shape_id(src_shape) == OBJ_TOO_COMPLEX_SHAPE_ID) {
-        st_table * table = rb_st_init_numtable_with_size(rb_st_table_size(ROBJECT_IV_HASH(obj)));
-
-        rb_ivar_foreach(obj, rb_obj_evacuate_ivs_to_hash_table, (st_data_t)table);
-        rb_shape_set_too_complex(dest);
-
-        ROBJECT(dest)->as.heap.ivptr = (VALUE *)table;
 
+    unsigned long src_num_ivs = rb_ivar_count(obj);
+    if (!src_num_ivs) {
         return;
     }
 
-    uint32_t src_num_ivs = RBASIC_IV_COUNT(obj);
-    rb_shape_t * shape_to_set_on_dest = src_shape;
-    VALUE * src_buf;
-    VALUE * dest_buf;
+    shape_id_t src_shape_id = RBASIC_SHAPE_ID(obj);
 
-    if (!src_num_ivs) {
+    if (rb_shape_too_complex_p(src_shape_id)) {
+        rb_shape_copy_complex_ivars(dest, obj, src_shape_id, ROBJECT_FIELDS_HASH(obj));
         return;
     }
 
-    // The copy should be mutable, so we don't want the frozen shape
-    if (rb_shape_frozen_shape_p(src_shape)) {
-        shape_to_set_on_dest = rb_shape_get_parent(src_shape);
-    }
-
-    src_buf = ROBJECT_IVPTR(obj);
-    dest_buf = ROBJECT_IVPTR(dest);
+    shape_id_t dest_shape_id = src_shape_id;
+    shape_id_t initial_shape_id = RBASIC_SHAPE_ID(dest);
 
-    rb_shape_t * initial_shape = rb_shape_get_shape(dest);
+    RUBY_ASSERT(RSHAPE_TYPE_P(initial_shape_id, SHAPE_ROOT));
 
-    if (initial_shape->size_pool_index != src_shape->size_pool_index) {
-        RUBY_ASSERT(initial_shape->type == SHAPE_T_OBJECT);
+    dest_shape_id = rb_shape_rebuild(initial_shape_id, src_shape_id);
+    if (UNLIKELY(rb_shape_too_complex_p(dest_shape_id))) {
+        st_table *table = rb_st_init_numtable_with_size(src_num_ivs);
+        rb_obj_copy_ivs_to_hash_table(obj, table);
+        rb_obj_init_too_complex(dest, table);
 
-        shape_to_set_on_dest = rb_shape_rebuild_shape(initial_shape, src_shape);
+        return;
     }
 
-    RUBY_ASSERT(src_num_ivs <= shape_to_set_on_dest->capacity);
-    if (initial_shape->capacity < shape_to_set_on_dest->capacity) {
-        rb_ensure_iv_list_size(dest, initial_shape->capacity, shape_to_set_on_dest->capacity);
-        dest_buf = ROBJECT_IVPTR(dest);
-    }
+    VALUE *src_buf = ROBJECT_FIELDS(obj);
+    VALUE *dest_buf = ROBJECT_FIELDS(dest);
 
-    MEMCPY(dest_buf, src_buf, VALUE, src_num_ivs);
+    attr_index_t initial_capa = RSHAPE_CAPACITY(initial_shape_id);
+    attr_index_t dest_capa = RSHAPE_CAPACITY(dest_shape_id);
 
-    // Fire write barriers
-    for (uint32_t i = 0; i < src_num_ivs; i++) {
-        RB_OBJ_WRITTEN(dest, Qundef, dest_buf[i]);
+    RUBY_ASSERT(src_num_ivs <= dest_capa);
+    if (initial_capa < dest_capa) {
+        rb_ensure_iv_list_size(dest, 0, dest_capa);
+        dest_buf = ROBJECT_FIELDS(dest);
     }
 
-    rb_shape_set_shape(dest, shape_to_set_on_dest);
+    rb_shape_copy_fields(dest, dest_buf, dest_shape_id, src_buf, src_shape_id);
+    rb_obj_set_shape_id(dest, dest_shape_id);
 }
 
 static void
@@ -350,16 +373,25 @@ init_copy(VALUE dest, VALUE obj)
     if (OBJ_FROZEN(dest)) {
         rb_raise(rb_eTypeError, "[bug] frozen object (%s) allocated", rb_obj_classname(dest));
     }
-    RBASIC(dest)->flags &= ~(T_MASK|FL_EXIVAR);
+    RBASIC(dest)->flags &= ~T_MASK;
     // Copies the shape id from obj to dest
-    RBASIC(dest)->flags |= RBASIC(obj)->flags & (T_MASK|FL_EXIVAR);
-    rb_copy_wb_protected_attribute(dest, obj);
-    rb_copy_generic_ivar(dest, obj);
-    rb_gc_copy_finalizer(dest, obj);
-
-    if (RB_TYPE_P(obj, T_OBJECT)) {
-        rb_obj_copy_ivar(dest, obj);
+    RBASIC(dest)->flags |= RBASIC(obj)->flags & T_MASK;
+    switch (BUILTIN_TYPE(obj)) {
+        case T_IMEMO:
+          rb_bug("Unreachable");
+          break;
+        case T_CLASS:
+        case T_MODULE:
+          // noop: handled in class.c: rb_mod_init_copy
+          break;
+        case T_OBJECT:
+          rb_obj_copy_ivar(dest, obj);
+          break;
+        default:
+          rb_copy_generic_ivar(dest, obj);
+          break;
     }
+    rb_gc_copy_attributes(dest, obj);
 }
 
 static VALUE immutable_obj_clone(VALUE obj, VALUE kwfreeze);
@@ -442,17 +474,14 @@ immutable_obj_clone(VALUE obj, VALUE kwfreeze)
     return obj;
 }
 
-static VALUE
-mutable_obj_clone(VALUE obj, VALUE kwfreeze)
+VALUE
+rb_obj_clone_setup(VALUE obj, VALUE clone, VALUE kwfreeze)
 {
-    VALUE clone, singleton;
     VALUE argv[2];
 
-    clone = rb_obj_alloc(rb_obj_class(obj));
-
-    singleton = rb_singleton_class_clone_and_attach(obj, clone);
+    VALUE singleton = rb_singleton_class_clone_and_attach(obj, clone);
     RBASIC_SET_CLASS(clone, singleton);
-    if (FL_TEST(singleton, FL_SINGLETON)) {
+    if (RCLASS_SINGLETON_P(singleton)) {
         rb_singleton_class_attached(singleton, clone);
     }
 
@@ -462,15 +491,21 @@ mutable_obj_clone(VALUE obj, VALUE kwfreeze)
       case Qnil:
         rb_funcall(clone, id_init_clone, 1, obj);
         RBASIC(clone)->flags |= RBASIC(obj)->flags & FL_FREEZE;
+
+        if (RB_TYPE_P(obj, T_STRING)) {
+            FL_SET_RAW(clone, FL_TEST_RAW(obj, STR_CHILLED));
+        }
+
         if (RB_OBJ_FROZEN(obj)) {
-            rb_shape_transition_shape_frozen(clone);
+            shape_id_t next_shape_id = rb_shape_transition_frozen(clone);
+            rb_obj_set_shape_id(clone, next_shape_id);
         }
         break;
       case Qtrue: {
         static VALUE freeze_true_hash;
         if (!freeze_true_hash) {
             freeze_true_hash = rb_hash_new();
-            rb_gc_register_mark_object(freeze_true_hash);
+            rb_vm_register_global_object(freeze_true_hash);
             rb_hash_aset(freeze_true_hash, ID2SYM(idFreeze), Qtrue);
             rb_obj_freeze(freeze_true_hash);
         }
@@ -478,15 +513,14 @@ mutable_obj_clone(VALUE obj, VALUE kwfreeze)
         argv[0] = obj;
         argv[1] = freeze_true_hash;
         rb_funcallv_kw(clone, id_init_clone, 2, argv, RB_PASS_KEYWORDS);
-        RBASIC(clone)->flags |= FL_FREEZE;
-        rb_shape_transition_shape_frozen(clone);
+        OBJ_FREEZE(clone);
         break;
       }
       case Qfalse: {
         static VALUE freeze_false_hash;
         if (!freeze_false_hash) {
             freeze_false_hash = rb_hash_new();
-            rb_gc_register_mark_object(freeze_false_hash);
+            rb_vm_register_global_object(freeze_false_hash);
             rb_hash_aset(freeze_false_hash, ID2SYM(idFreeze), Qfalse);
             rb_obj_freeze(freeze_false_hash);
         }
@@ -503,6 +537,13 @@ mutable_obj_clone(VALUE obj, VALUE kwfreeze)
     return clone;
 }
 
+static VALUE
+mutable_obj_clone(VALUE obj, VALUE kwfreeze)
+{
+    VALUE clone = rb_obj_alloc(rb_obj_class(obj));
+    return rb_obj_clone_setup(obj, clone, kwfreeze);
+}
+
 VALUE
 rb_obj_clone(VALUE obj)
 {
@@ -510,6 +551,15 @@ rb_obj_clone(VALUE obj)
     return mutable_obj_clone(obj, Qnil);
 }
 
+VALUE
+rb_obj_dup_setup(VALUE obj, VALUE dup)
+{
+    init_copy(dup, obj);
+    rb_funcall(dup, id_init_dup, 1, obj);
+
+    return dup;
+}
+
 /*
  *  call-seq:
  *     obj.dup -> an_object
@@ -558,10 +608,7 @@ rb_obj_dup(VALUE obj)
         return obj;
     }
     dup = rb_obj_alloc(rb_obj_class(obj));
-    init_copy(dup, obj);
-    rb_funcall(dup, id_init_dup, 1, obj);
-
-    return dup;
+    return rb_obj_dup_setup(obj, dup);
 }
 
 /*
@@ -590,9 +637,9 @@ rb_obj_size(VALUE self, VALUE args, VALUE obj)
 /**
  * :nodoc:
  *--
- * Default implementation of \c #initialize_copy
- * \param[in,out] obj the receiver being initialized
- * \param[in] orig    the object to be copied from.
+ * Default implementation of `#initialize_copy`
+ * @param[in,out] obj the receiver being initialized
+ * @param[in] orig    the object to be copied from.
  *++
  */
 VALUE
@@ -606,13 +653,13 @@ rb_obj_init_copy(VALUE obj, VALUE orig)
     return obj;
 }
 
-/*!
+/**
  * :nodoc:
  *--
- * Default implementation of \c #initialize_dup
+ * Default implementation of `#initialize_dup`
  *
- * \param[in,out] obj the receiver being initialized
- * \param[in] orig    the object to be dup from.
+ * @param[in,out] obj the receiver being initialized
+ * @param[in] orig    the object to be dup from.
  *++
  **/
 VALUE
@@ -622,14 +669,14 @@ rb_obj_init_dup_clone(VALUE obj, VALUE orig)
     return obj;
 }
 
-/*!
+/**
  * :nodoc:
  *--
- * Default implementation of \c #initialize_clone
+ * Default implementation of `#initialize_clone`
  *
- * \param[in] The number of arguments
- * \param[in] The array of arguments
- * \param[in] obj the receiver being initialized
+ * @param[in] The number of arguments
+ * @param[in] The array of arguments
+ * @param[in] obj the receiver being initialized
  *++
  **/
 static VALUE
@@ -683,15 +730,19 @@ rb_inspect(VALUE obj)
 }
 
 static int
-inspect_i(st_data_t k, st_data_t v, st_data_t a)
+inspect_i(ID id, VALUE value, st_data_t a)
 {
-    ID id = (ID)k;
-    VALUE value = (VALUE)v;
-    VALUE str = (VALUE)a;
+    VALUE *args = (VALUE *)a, str = args[0], ivars = args[1];
 
     /* need not to show internal data */
     if (CLASS_OF(value) == 0) return ST_CONTINUE;
     if (!rb_is_instance_id(id)) return ST_CONTINUE;
+    if (!NIL_P(ivars)) {
+        VALUE name = ID2SYM(id);
+        for (long i = 0; RARRAY_AREF(ivars, i) != name; ) {
+            if (++i >= RARRAY_LEN(ivars)) return ST_CONTINUE;
+        }
+    }
     if (RSTRING_PTR(str)[0] == '-') { /* first element */
         RSTRING_PTR(str)[0] = '#';
         rb_str_cat2(str, " ");
@@ -706,13 +757,15 @@ inspect_i(st_data_t k, st_data_t v, st_data_t a)
 }
 
 static VALUE
-inspect_obj(VALUE obj, VALUE str, int recur)
+inspect_obj(VALUE obj, VALUE a, int recur)
 {
+    VALUE *args = (VALUE *)a, str = args[0];
+
     if (recur) {
         rb_str_cat2(str, " ...");
     }
     else {
-        rb_ivar_foreach(obj, inspect_i, str);
+        rb_ivar_foreach(obj, inspect_i, a);
     }
     rb_str_cat2(str, ">");
     RSTRING_PTR(str)[0] = '#';
@@ -745,17 +798,47 @@ inspect_obj(VALUE obj, VALUE str, int recur)
  *       end
  *     end
  *     Bar.new.inspect                  #=> "#<Bar:0x0300c868 @bar=1>"
+ *
+ * If _obj_ responds to +instance_variables_to_inspect+, then only
+ * the instance variables listed in the returned array will be included
+ * in the inspect string.
+ *
+ *
+ *     class DatabaseConfig
+ *       def initialize(host, user, password)
+ *         @host = host
+ *         @user = user
+ *         @password = password
+ *       end
+ *
+ *     private
+ *       def instance_variables_to_inspect = [:@host, :@user]
+ *     end
+ *
+ *     conf = DatabaseConfig.new("localhost", "root", "hunter2")
+ *     conf.inspect #=> #<DatabaseConfig:0x0000000104def350 @host="localhost", @user="root">
  */
 
 static VALUE
 rb_obj_inspect(VALUE obj)
 {
-    if (rb_ivar_count(obj) > 0) {
-        VALUE str;
+    VALUE ivars = rb_check_funcall(obj, id_instance_variables_to_inspect, 0, 0);
+    st_index_t n = 0;
+    if (UNDEF_P(ivars)) {
+        n = rb_ivar_count(obj);
+        ivars = Qnil;
+    }
+    else if (!NIL_P(ivars)) {
+        Check_Type(ivars, T_ARRAY);
+        n = RARRAY_LEN(ivars);
+    }
+    if (n > 0) {
         VALUE c = rb_class_name(CLASS_OF(obj));
-
-        str = rb_sprintf("-<%"PRIsVALUE":%p", c, (void*)obj);
-        return rb_exec_recursive(inspect_obj, obj, str);
+        VALUE args[2] = {
+            rb_sprintf("-<%"PRIsVALUE":%p", c, (void*)obj),
+            ivars
+        };
+        return rb_exec_recursive(inspect_obj, obj, (VALUE)args);
     }
     else {
         return rb_any_to_s(obj);
@@ -803,7 +886,7 @@ rb_obj_is_instance_of(VALUE obj, VALUE c)
     return RBOOL(rb_obj_class(obj) == c);
 }
 
-// Returns whether c is a proper (c != cl) subclass of cl
+// Returns whether c is a proper (c != cl) superclass of cl
 // Both c and cl must be T_CLASS
 static VALUE
 class_search_class_ancestor(VALUE cl, VALUE c)
@@ -816,7 +899,7 @@ class_search_class_ancestor(VALUE cl, VALUE c)
     VALUE *classes = RCLASS_SUPERCLASSES(cl);
 
     // If c's inheritance chain is longer, it cannot be an ancestor
-    // We are checking for a proper subclass so don't check if they are equal
+    // We are checking for a proper superclass so don't check if they are equal
     if (cl_depth <= c_depth)
         return Qfalse;
 
@@ -1125,6 +1208,30 @@ rb_class_search_ancestor(VALUE cl, VALUE c)
  *
  *   Added :FOO
  *
+ * If we define a class using the <tt>class</tt> keyword, <tt>const_added</tt>
+ * runs before <tt>inherited</tt>:
+ *
+ *   module M
+ *     def self.const_added(const_name)
+ *       super
+ *       p :const_added
+ *     end
+ *
+ *     parent = Class.new do
+ *       def self.inherited(subclass)
+ *         super
+ *         p :inherited
+ *       end
+ *     end
+ *
+ *     class Child < parent
+ *     end
+ *   end
+ *
+ * <em>produces:</em>
+ *
+ *   :const_added
+ *   :inherited
  */
 #define rb_obj_mod_const_added rb_obj_dummy1
 
@@ -1289,6 +1396,10 @@ rb_obj_frozen_p(VALUE obj)
  * - #to_r
  * - #to_s
  *
+ * While +nil+ doesn't have an explicitly defined #to_hash method,
+ * it can be used in <code>**</code> unpacking, not adding any
+ * keyword arguments.
+ *
  * Another method provides inspection:
  *
  * - #inspect
@@ -1679,7 +1790,7 @@ rb_mod_to_s(VALUE klass)
     ID id_defined_at;
     VALUE refined_class, defined_at;
 
-    if (FL_TEST(klass, FL_SINGLETON)) {
+    if (RCLASS_SINGLETON_P(klass)) {
         VALUE s = rb_usascii_str_new2("#<Class:");
         VALUE v = RCLASS_ATTACHED_OBJECT(klass);
 
@@ -1984,11 +2095,11 @@ rb_class_initialize(int argc, VALUE *argv, VALUE klass)
     else {
         super = argv[0];
         rb_check_inheritable(super);
-        if (super != rb_cBasicObject && !RCLASS_SUPER(super)) {
+        if (!RCLASS_INITIALIZED_P(super)) {
             rb_raise(rb_eTypeError, "can't inherit uninitialized class");
         }
     }
-    RCLASS_SET_SUPER(klass, super);
+    rb_class_set_super(klass, super);
     rb_make_metaclass(klass, RBASIC(super)->klass);
     rb_class_inherited(super, klass);
     rb_mod_initialize_exec(klass);
@@ -2029,17 +2140,6 @@ static VALUE class_call_alloc_func(rb_alloc_func_t allocator, VALUE klass);
  *
  */
 
-static VALUE
-rb_class_alloc_m(VALUE klass)
-{
-    rb_alloc_func_t allocator = class_get_alloc_func(klass);
-    if (!rb_obj_respond_to(klass, rb_intern("allocate"), 1)) {
-        rb_raise(rb_eTypeError, "calling %"PRIsVALUE".allocate is prohibited",
-                 klass);
-    }
-    return class_call_alloc_func(allocator, klass);
-}
-
 static VALUE
 rb_class_alloc(VALUE klass)
 {
@@ -2052,10 +2152,10 @@ class_get_alloc_func(VALUE klass)
 {
     rb_alloc_func_t allocator;
 
-    if (RCLASS_SUPER(klass) == 0 && klass != rb_cBasicObject) {
+    if (!RCLASS_INITIALIZED_P(klass)) {
         rb_raise(rb_eTypeError, "can't instantiate uninitialized class");
     }
-    if (FL_TEST(klass, FL_SINGLETON)) {
+    if (RCLASS_SINGLETON_P(klass)) {
         rb_raise(rb_eTypeError, "can't create instance of singleton class");
     }
     allocator = rb_get_alloc_func(klass);
@@ -2145,12 +2245,12 @@ rb_class_new_instance(int argc, const VALUE *argv, VALUE klass)
  *     BasicObject.superclass   #=> nil
  *
  *--
- * Returns the superclass of \a klass. Equivalent to \c Class\#superclass in Ruby.
+ * Returns the superclass of `klass`. Equivalent to `Class#superclass` in Ruby.
  *
  * It skips modules.
- * \param[in] klass a Class object
- * \return the superclass, or \c Qnil if \a klass does not have a parent class.
- * \sa rb_class_get_superclass
+ * @param[in] klass a Class object
+ * @return the superclass, or `Qnil` if `klass` does not have a parent class.
+ * @sa rb_class_get_superclass
  *++
  */
 
@@ -2159,19 +2259,22 @@ rb_class_superclass(VALUE klass)
 {
     RUBY_ASSERT(RB_TYPE_P(klass, T_CLASS));
 
-    VALUE super = RCLASS_SUPER(klass);
+    VALUE *superclasses = RCLASS_SUPERCLASSES(klass);
+    size_t superclasses_depth = RCLASS_SUPERCLASS_DEPTH(klass);
 
-    if (!super) {
-        if (klass == rb_cBasicObject) return Qnil;
+    if (klass == rb_cBasicObject) return Qnil;
+
+    if (!superclasses) {
+        RUBY_ASSERT(!RCLASS_SUPER(klass));
         rb_raise(rb_eTypeError, "uninitialized class");
     }
 
-    if (!RCLASS_SUPERCLASS_DEPTH(klass)) {
+    if (!superclasses_depth) {
         return Qnil;
     }
     else {
-        super = RCLASS_SUPERCLASSES(klass)[RCLASS_SUPERCLASS_DEPTH(klass) - 1];
-        RUBY_ASSERT(RB_TYPE_P(klass, T_CLASS));
+        VALUE super = superclasses[superclasses_depth - 1];
+        RUBY_ASSERT(RB_TYPE_P(super, T_CLASS));
         return super;
     }
 }
@@ -2179,13 +2282,13 @@ rb_class_superclass(VALUE klass)
 VALUE
 rb_class_get_superclass(VALUE klass)
 {
-    return RCLASS(klass)->super;
+    return RCLASS_SUPER(klass);
 }
 
-static const char bad_instance_name[] = "`%1$s' is not allowed as an instance variable name";
-static const char bad_class_name[] = "`%1$s' is not allowed as a class variable name";
+static const char bad_instance_name[] = "'%1$s' is not allowed as an instance variable name";
+static const char bad_class_name[] = "'%1$s' is not allowed as a class variable name";
 static const char bad_const_name[] = "wrong constant name %1$s";
-static const char bad_attr_name[] = "invalid attribute name `%1$s'";
+static const char bad_attr_name[] = "invalid attribute name '%1$s'";
 #define wrong_constant_name bad_const_name
 
 /*! \private */
@@ -3016,7 +3119,7 @@ rb_mod_cvar_defined(VALUE obj, VALUE iv)
 static VALUE
 rb_mod_singleton_p(VALUE klass)
 {
-    return RBOOL(RB_TYPE_P(klass, T_CLASS) && FL_TEST(klass, FL_SINGLETON));
+    return RBOOL(RCLASS_SINGLETON_P(klass));
 }
 
 /*! \private */
@@ -3170,14 +3273,22 @@ ALWAYS_INLINE(static VALUE rb_to_integer_with_id_exception(VALUE val, const char
 static inline VALUE
 rb_to_integer_with_id_exception(VALUE val, const char *method, ID mid, int raise)
 {
+    // We need to pop the lazily pushed frame when not raising an exception.
+    rb_control_frame_t *current_cfp;
     VALUE v;
 
     if (RB_INTEGER_TYPE_P(val)) return val;
+    current_cfp = GET_EC()->cfp;
+    rb_yjit_lazy_push_frame(GET_EC()->cfp->pc);
     v = try_to_int(val, mid, raise);
-    if (!raise && NIL_P(v)) return Qnil;
+    if (!raise && NIL_P(v)) {
+        GET_EC()->cfp = current_cfp;
+        return Qnil;
+    }
     if (!RB_INTEGER_TYPE_P(v)) {
         conversion_mismatch(val, "Integer", method, v);
     }
+    GET_EC()->cfp = current_cfp;
     return v;
 }
 #define rb_to_integer(val, method, mid) \
@@ -3325,8 +3436,15 @@ rb_f_integer(rb_execution_context_t *ec, VALUE obj, VALUE arg, VALUE base, VALUE
     return rb_convert_to_integer(arg, NUM2INT(base), exc);
 }
 
+static bool
+is_digit_char(unsigned char c, int base)
+{
+    int i = ruby_digit36_to_number_table[c];
+    return (i >= 0 && i < base);
+}
+
 static double
-rb_cstr_to_dbl_raise(const char *p, int badcheck, int raise, int *error)
+rb_cstr_to_dbl_raise(const char *p, rb_encoding *enc, int badcheck, int raise, int *error)
 {
     const char *q;
     char *end;
@@ -3337,6 +3455,7 @@ rb_cstr_to_dbl_raise(const char *p, int badcheck, int raise, int *error)
 #define OutOfRange() ((end - p > max_width) ? \
                       (w = max_width, ellipsis = "...") : \
                       (w = (int)(end - p), ellipsis = ""))
+    /* p...end has been parsed with strtod, should be ASCII-only */
 
     if (!p) return 0.0;
     q = p;
@@ -3365,23 +3484,37 @@ rb_cstr_to_dbl_raise(const char *p, int badcheck, int raise, int *error)
         char *e = init_e;
         char prev = 0;
         int dot_seen = FALSE;
+        int base = 10;
+        char exp_letter = 'e';
 
         switch (*p) {case '+': case '-': prev = *n++ = *p++;}
         if (*p == '0') {
             prev = *n++ = '0';
-            while (*++p == '0');
+            switch (*++p) {
+              case 'x': case 'X':
+                prev = *n++ = 'x';
+                base = 16;
+                exp_letter = 'p';
+                if (*++p != '0') break;
+                /* fallthrough */
+              case '0': /* squeeze successive zeros */
+                while (*++p == '0');
+                break;
+            }
         }
         while (p < end && n < e) prev = *n++ = *p++;
         while (*p) {
             if (*p == '_') {
                 /* remove an underscore between digits */
-                if (n == buf || !ISDIGIT(prev) || (++p, !ISDIGIT(*p))) {
+                if (n == buf ||
+                    !is_digit_char(prev, base) ||
+                    !is_digit_char(*++p, base)) {
                     if (badcheck) goto bad;
                     break;
                 }
             }
             prev = *p++;
-            if (e == init_e && (prev == 'e' || prev == 'E' || prev == 'p' || prev == 'P')) {
+            if (e == init_e && (rb_tolower(prev) == exp_letter)) {
                 e = buf + sizeof(buf) - 1;
                 *n++ = prev;
                 switch (*p) {case '+': case '-': prev = *n++ = *p++;}
@@ -3389,6 +3522,10 @@ rb_cstr_to_dbl_raise(const char *p, int badcheck, int raise, int *error)
                     prev = *n++ = '0';
                     while (*++p == '0');
                 }
+
+                /* reset base to decimal for underscore check of
+                 * binary exponent part */
+                base = 10;
                 continue;
             }
             else if (ISSPACE(prev)) {
@@ -3398,7 +3535,7 @@ rb_cstr_to_dbl_raise(const char *p, int badcheck, int raise, int *error)
                     break;
                 }
             }
-            else if (prev == '.' ? dot_seen++ : !ISDIGIT(prev)) {
+            else if (prev == '.' ? dot_seen++ : !is_digit_char(prev, base)) {
                 if (badcheck) goto bad;
                 break;
             }
@@ -3432,7 +3569,8 @@ rb_cstr_to_dbl_raise(const char *p, int badcheck, int raise, int *error)
 
   bad:
     if (raise) {
-        rb_invalid_str(q, "Float()");
+        VALUE s = rb_enc_str_new_cstr(q, enc);
+        rb_raise(rb_eArgError, "invalid value for Float(): %+"PRIsVALUE, s);
         UNREACHABLE_RETURN(nan(""));
     }
     else {
@@ -3444,7 +3582,7 @@ rb_cstr_to_dbl_raise(const char *p, int badcheck, int raise, int *error)
 double
 rb_cstr_to_dbl(const char *p, int badcheck)
 {
-    return rb_cstr_to_dbl_raise(p, badcheck, TRUE, NULL);
+    return rb_cstr_to_dbl_raise(p, NULL, badcheck, TRUE, NULL);
 }
 
 static double
@@ -3456,6 +3594,7 @@ rb_str_to_dbl_raise(VALUE str, int badcheck, int raise, int *error)
     VALUE v = 0;
 
     StringValue(str);
+    rb_must_asciicompat(str);
     s = RSTRING_PTR(str);
     len = RSTRING_LEN(str);
     if (s) {
@@ -3474,9 +3613,11 @@ rb_str_to_dbl_raise(VALUE str, int badcheck, int raise, int *error)
             s = p;
         }
     }
-    ret = rb_cstr_to_dbl_raise(s, badcheck, raise, error);
+    ret = rb_cstr_to_dbl_raise(s, rb_enc_get(str), badcheck, raise, error);
     if (v)
         ALLOCV_END(v);
+    else
+        RB_GC_GUARD(str);
     return ret;
 }
 
@@ -3742,7 +3883,7 @@ rb_String(VALUE val)
  *
  *    String([0, 1, 2])        # => "[0, 1, 2]"
  *    String(0..5)             # => "0..5"
- *    String({foo: 0, bar: 1}) # => "{:foo=>0, :bar=>1}"
+ *    String({foo: 0, bar: 1}) # => "{foo: 0, bar: 1}"
  *
  *  Raises +TypeError+ if +object+ cannot be converted to a string.
  */
@@ -3923,6 +4064,12 @@ f_sprintf(int c, const VALUE *v, VALUE _)
     return rb_f_sprintf(c, v);
 }
 
+static VALUE
+rb_f_loop_size(VALUE self, VALUE args, VALUE eobj)
+{
+    return DBL2NUM(HUGE_VAL);
+}
+
 /*
  *  Document-class: Class
  *
@@ -3985,57 +4132,51 @@ f_sprintf(int c, const VALUE *v, VALUE _)
  */
 
 
-/*  Document-class: BasicObject
+/*
+ *  Document-class: BasicObject
  *
- *  BasicObject is the parent class of all classes in Ruby.  It's an explicit
- *  blank class.
+ *  +BasicObject+ is the parent class of all classes in Ruby.
+ *  In particular, +BasicObject+ is the parent class of class Object,
+ *  which is itself the default parent class of every Ruby class:
  *
- *  BasicObject can be used for creating object hierarchies independent of
- *  Ruby's object hierarchy, proxy objects like the Delegator class, or other
- *  uses where namespace pollution from Ruby's methods and classes must be
- *  avoided.
+ *    class Foo; end
+ *    Foo.superclass    # => Object
+ *    Object.superclass # => BasicObject
  *
- *  To avoid polluting BasicObject for other users an appropriately named
- *  subclass of BasicObject should be created instead of directly modifying
- *  BasicObject:
+ *  +BasicObject+ is the only class that has no parent:
  *
- *    class MyObjectSystem < BasicObject
- *    end
+ *    BasicObject.superclass # => nil
  *
- *  BasicObject does not include Kernel (for methods like +puts+) and
- *  BasicObject is outside of the namespace of the standard library so common
- *  classes will not be found without using a full class path.
+ *  Class +BasicObject+ can be used to create an object hierarchy
+ *  (e.g., class Delegator) that is independent of Ruby's object hierarchy.
+ *  Such objects:
  *
- *  A variety of strategies can be used to provide useful portions of the
- *  standard library to subclasses of BasicObject.  A subclass could
- *  <code>include Kernel</code> to obtain +puts+, +exit+, etc.  A custom
- *  Kernel-like module could be created and included or delegation can be used
- *  via #method_missing:
+ *  - Do not have namespace "pollution" from the many methods
+ *    provided in class Object and its included module Kernel.
+ *  - Do not have definitions of common classes,
+ *    and so references to such common classes must be fully qualified
+ *    (+::String+, not +String+).
  *
- *    class MyObjectSystem < BasicObject
- *      DELEGATE = [:puts, :p]
+ *  A variety of strategies can be used to provide useful portions
+ *  of the Standard Library in subclasses of +BasicObject+:
  *
- *      def method_missing(name, *args, &block)
- *        return super unless DELEGATE.include? name
- *        ::Kernel.send(name, *args, &block)
- *      end
+ *  - The immediate subclass could <tt>include Kernel</tt>,
+ *    which would define methods such as +puts+, +exit+, etc.
+ *  - A custom Kernel-like module could be created and included.
+ *  - Delegation can be used via #method_missing:
  *
- *      def respond_to_missing?(name, include_private = false)
- *        DELEGATE.include?(name) or super
- *      end
- *    end
+ *      class MyObjectSystem < BasicObject
+ *        DELEGATE = [:puts, :p]
  *
- *  Access to classes and modules from the Ruby standard library can be
- *  obtained in a BasicObject subclass by referencing the desired constant
- *  from the root like <code>::File</code> or <code>::Enumerator</code>.
- *  Like #method_missing, #const_missing can be used to delegate constant
- *  lookup to +Object+:
+ *        def method_missing(name, *args, &block)
+ *          return super unless DELEGATE.include? name
+ *          ::Kernel.send(name, *args, &block)
+ *        end
  *
- *    class MyObjectSystem < BasicObject
- *      def self.const_missing(name)
- *        ::Object.const_get(name)
+ *        def respond_to_missing?(name, include_private = false)
+ *          DELEGATE.include?(name)
+ *        end
  *      end
- *    end
  *
  *  === What's Here
  *
@@ -4049,8 +4190,11 @@ f_sprintf(int c, const VALUE *v, VALUE _)
  *  - #__send__: Calls the method identified by the given symbol.
  *  - #equal?: Returns whether +self+ and the given object are the same object.
  *  - #instance_eval: Evaluates the given string or block in the context of +self+.
- *  - #instance_exec: Executes the given block in the context of +self+,
- *    passing the given arguments.
+ *  - #instance_exec: Executes the given block in the context of +self+, passing the given arguments.
+ *  - #method_missing: Called when +self+ is called with a method it does not define.
+ *  - #singleton_method_added: Called when a singleton method is added to +self+.
+ *  - #singleton_method_removed: Called when a singleton method is removed from +self+.
+ *  - #singleton_method_undefined: Called when a singleton method is undefined in +self+.
  *
  */
 
@@ -4074,7 +4218,7 @@ f_sprintf(int c, const VALUE *v, VALUE _)
  *
  *  == What's Here
  *
- *  First, what's elsewhere. \Class \Object:
+ *  First, what's elsewhere. Class \Object:
  *
  *  - Inherits from {class BasicObject}[rdoc-ref:BasicObject@What-27s+Here].
  *  - Includes {module Kernel}[rdoc-ref:Kernel@What-27s+Here].
@@ -4098,7 +4242,7 @@ f_sprintf(int c, const VALUE *v, VALUE _)
  *  - #instance_of?: Returns whether +self+ is an instance of the given class.
  *  - #instance_variable_defined?: Returns whether the given instance variable
  *    is defined in +self+.
- *  - #method: Returns the Method object for the given method in +self+.
+ *  - #method: Returns the +Method+ object for the given method in +self+.
  *  - #methods: Returns an array of symbol names of public and protected methods
  *    in +self+.
  *  - #nil?: Returns +false+. (Only +nil+ responds +true+ to method <tt>nil?</tt>.)
@@ -4108,12 +4252,12 @@ f_sprintf(int c, const VALUE *v, VALUE _)
  *    of the private methods in +self+.
  *  - #protected_methods: Returns an array of the symbol names
  *    of the protected methods in +self+.
- *  - #public_method: Returns the Method object for the given public method in +self+.
+ *  - #public_method: Returns the +Method+ object for the given public method in +self+.
  *  - #public_methods: Returns an array of the symbol names
  *    of the public methods in +self+.
  *  - #respond_to?: Returns whether +self+ responds to the given method.
  *  - #singleton_class: Returns the singleton class of +self+.
- *  - #singleton_method: Returns the Method object for the given singleton method
+ *  - #singleton_method: Returns the +Method+ object for the given singleton method
  *    in +self+.
  *  - #singleton_methods: Returns an array of the symbol names
  *    of the singleton methods in +self+.
@@ -4194,7 +4338,7 @@ InitVM_Object(void)
      *
      * == What's Here
      *
-     * \Module \Kernel provides methods that are useful for:
+     * Module \Kernel provides methods that are useful for:
      *
      * - {Converting}[rdoc-ref:Kernel@Converting]
      * - {Querying}[rdoc-ref:Kernel@Querying]
@@ -4262,7 +4406,7 @@ InitVM_Object(void)
      * - #print: Prints the given objects to standard output without a newline.
      * - #printf: Prints the string resulting from applying the given format string
      *   to any additional arguments.
-     * - #putc: Equivalent to <tt.$stdout.putc(object)</tt> for the given object.
+     * - #putc: Equivalent to <tt>$stdout.putc(object)</tt> for the given object.
      * - #puts: Equivalent to <tt>$stdout.puts(*objects)</tt> for the given objects.
      * - #readline: Similar to #gets, but raises an exception at the end of file.
      * - #readlines: Returns an array of the remaining lines from the current input.
@@ -4377,7 +4521,7 @@ InitVM_Object(void)
 
     rb_cNilClass = rb_define_class("NilClass", rb_cObject);
     rb_cNilClass_to_s = rb_fstring_enc_lit("", rb_usascii_encoding());
-    rb_gc_register_mark_object(rb_cNilClass_to_s);
+    rb_vm_register_global_object(rb_cNilClass_to_s);
     rb_define_method(rb_cNilClass, "to_s", rb_nil_to_s, 0);
     rb_define_method(rb_cNilClass, "to_a", nil_to_a, 0);
     rb_define_method(rb_cNilClass, "to_h", nil_to_h, 0);
@@ -4449,8 +4593,8 @@ InitVM_Object(void)
     rb_define_method(rb_cModule, "deprecate_constant", rb_mod_deprecate_constant, -1); /* in variable.c */
     rb_define_method(rb_cModule, "singleton_class?", rb_mod_singleton_p, 0);
 
-    rb_define_method(rb_singleton_class(rb_cClass), "allocate", rb_class_alloc_m, 0);
-    rb_define_method(rb_cClass, "allocate", rb_class_alloc_m, 0);
+    rb_define_method(rb_singleton_class(rb_cClass), "allocate", rb_class_alloc, 0);
+    rb_define_method(rb_cClass, "allocate", rb_class_alloc, 0);
     rb_define_method(rb_cClass, "new", rb_class_new_instance_pass_kw, -1);
     rb_define_method(rb_cClass, "initialize", rb_class_initialize, -1);
     rb_define_method(rb_cClass, "superclass", rb_class_superclass, 0);
@@ -4463,7 +4607,7 @@ InitVM_Object(void)
 
     rb_cTrueClass = rb_define_class("TrueClass", rb_cObject);
     rb_cTrueClass_to_s = rb_fstring_enc_lit("true", rb_usascii_encoding());
-    rb_gc_register_mark_object(rb_cTrueClass_to_s);
+    rb_vm_register_global_object(rb_cTrueClass_to_s);
     rb_define_method(rb_cTrueClass, "to_s", rb_true_to_s, 0);
     rb_define_alias(rb_cTrueClass, "inspect", "to_s");
     rb_define_method(rb_cTrueClass, "&", true_and, 1);
@@ -4475,7 +4619,7 @@ InitVM_Object(void)
 
     rb_cFalseClass = rb_define_class("FalseClass", rb_cObject);
     rb_cFalseClass_to_s = rb_fstring_enc_lit("false", rb_usascii_encoding());
-    rb_gc_register_mark_object(rb_cFalseClass_to_s);
+    rb_vm_register_global_object(rb_cFalseClass_to_s);
     rb_define_method(rb_cFalseClass, "to_s", rb_false_to_s, 0);
     rb_define_alias(rb_cFalseClass, "inspect", "to_s");
     rb_define_method(rb_cFalseClass, "&", false_and, 1);
@@ -4493,6 +4637,7 @@ void
 Init_Object(void)
 {
     id_dig = rb_intern_const("dig");
+    id_instance_variables_to_inspect = rb_intern_const("instance_variables_to_inspect");
     InitVM(Object);
 }
 
diff --git a/pack.c b/pack.c
index d5b78b6060935f..3a5c1bfb9677cf 100644
--- a/pack.c
+++ b/pack.c
@@ -36,10 +36,11 @@
  */
 #ifdef HAVE_TRUE_LONG_LONG
 static const char natstr[] = "sSiIlLqQjJ";
+# define endstr natstr
 #else
 static const char natstr[] = "sSiIlLjJ";
-#endif
 static const char endstr[] = "sSiIlLqQjJ";
+#endif
 
 #ifdef HAVE_TRUE_LONG_LONG
 /* It is intentional to use long long instead of LONG_LONG. */
@@ -192,20 +193,69 @@ VALUE_to_float(VALUE obj)
     }
 }
 
+static void
+str_expand_fill(VALUE res, int c, long len)
+{
+    long olen = RSTRING_LEN(res);
+    memset(RSTRING_PTR(res) + olen, c, len);
+    rb_str_set_len(res, olen + len);
+}
+
+static char *
+skip_to_eol(const char *p, const char *pend)
+{
+    p = memchr(p, '\n', pend - p);
+    return (char *)(p ? p + 1 : pend);
+}
+
+#define skip_blank(p, type) \
+    (ISSPACE(type) || (type == '#' && (p = skip_to_eol(p, pend), 1)))
+
+#ifndef NATINT_PACK
+# define pack_modifiers(p, t, n, e) pack_modifiers(p, t, e)
+#endif
+static char *
+pack_modifiers(const char *p, char type, int *natint, int *explicit_endian)
+{
+     while (1) {
+         switch (*p) {
+           case '_':
+           case '!':
+             if (strchr(natstr, type)) {
+#ifdef NATINT_PACK
+                 *natint = 1;
+#endif
+                 p++;
+             }
+             else {
+                 rb_raise(rb_eArgError, "'%c' allowed only after types %s", *p, natstr);
+             }
+             break;
+
+           case '<':
+           case '>':
+             if (!strchr(endstr, type)) {
+                 rb_raise(rb_eArgError, "'%c' allowed only after types %s", *p, endstr);
+             }
+             if (*explicit_endian) {
+                 rb_raise(rb_eRangeError, "Can't use both '<' and '>'");
+             }
+             *explicit_endian = *p++;
+             break;
+           default:
+             return (char *)p;
+         }
+    }
+}
+
 static VALUE
 pack_pack(rb_execution_context_t *ec, VALUE ary, VALUE fmt, VALUE buffer)
 {
-    static const char nul10[] = "\0\0\0\0\0\0\0\0\0\0";
-    static const char spc10[] = "          ";
     const char *p, *pend;
     VALUE res, from, associates = 0;
-    char type;
     long len, idx, plen;
     const char *ptr;
     int enc_info = 1;		/* 0 - BINARY, 1 - US-ASCII, 2 - UTF-8 */
-#ifdef NATINT_PACK
-    int natint;		/* native integer */
-#endif
     int integer_size, bigendian_p;
 
     StringValue(fmt);
@@ -232,50 +282,16 @@ pack_pack(rb_execution_context_t *ec, VALUE ary, VALUE fmt, VALUE buffer)
 
     while (p < pend) {
         int explicit_endian = 0;
-        if (RSTRING_PTR(fmt) + RSTRING_LEN(fmt) != pend) {
+        if (RSTRING_END(fmt) != pend) {
             rb_raise(rb_eRuntimeError, "format string modified");
         }
-        type = *p++;		/* get data type */
+        const char type = *p++; /* get data type */
 #ifdef NATINT_PACK
-        natint = 0;
+        int natint = 0; 	/* native integer */
 #endif
 
-        if (ISSPACE(type)) continue;
-        if (type == '#') {
-            while ((p < pend) && (*p != '\n')) {
-                p++;
-            }
-            continue;
-        }
-
-        {
-          modifiers:
-            switch (*p) {
-              case '_':
-              case '!':
-                if (strchr(natstr, type)) {
-#ifdef NATINT_PACK
-                    natint = 1;
-#endif
-                    p++;
-                }
-                else {
-                    rb_raise(rb_eArgError, "'%c' allowed only after types %s", *p, natstr);
-                }
-                goto modifiers;
-
-              case '<':
-              case '>':
-                if (!strchr(endstr, type)) {
-                    rb_raise(rb_eArgError, "'%c' allowed only after types %s", *p, endstr);
-                }
-                if (explicit_endian) {
-                    rb_raise(rb_eRangeError, "Can't use both '<' and '>'");
-                }
-                explicit_endian = *p++;
-                goto modifiers;
-            }
-        }
+        if (skip_blank(p, type)) continue;
+        p = pack_modifiers(p, type, &natint, &explicit_endian);
 
         if (*p == '*') {	/* set data length */
             len = strchr("@Xxu", type) ? 0
@@ -332,16 +348,12 @@ pack_pack(rb_execution_context_t *ec, VALUE ary, VALUE fmt, VALUE buffer)
                 if (plen >= len) {
                     rb_str_buf_cat(res, ptr, len);
                     if (p[-1] == '*' && type == 'Z')
-                        rb_str_buf_cat(res, nul10, 1);
+                        rb_str_buf_cat(res, "", 1);
                 }
                 else {
+                    rb_str_modify_expand(res, len);
                     rb_str_buf_cat(res, ptr, plen);
-                    len -= plen;
-                    while (len >= 10) {
-                        rb_str_buf_cat(res, (type == 'A')?spc10:nul10, 10);
-                        len -= 10;
-                    }
-                    rb_str_buf_cat(res, (type == 'A')?spc10:nul10, len);
+                    str_expand_fill(res, (type == 'A' ? ' ' : '\0'), len - plen);
                 }
                 break;
 
@@ -615,11 +627,8 @@ pack_pack(rb_execution_context_t *ec, VALUE ary, VALUE fmt, VALUE buffer)
 
           case 'x':		/* null byte */
           grow:
-            while (len >= 10) {
-                rb_str_buf_cat(res, nul10, 10);
-                len -= 10;
-            }
-            rb_str_buf_cat(res, nul10, len);
+            rb_str_modify_expand(res, len);
+            str_expand_fill(res, '\0', len);
             break;
 
           case 'X':		/* back up byte */
@@ -781,6 +790,12 @@ pack_pack(rb_execution_context_t *ec, VALUE ary, VALUE fmt, VALUE buffer)
     return res;
 }
 
+VALUE
+rb_ec_pack_ary(rb_execution_context_t *ec, VALUE ary, VALUE fmt, VALUE buffer)
+{
+    return pack_pack(ec, ary, fmt, buffer);
+}
+
 static const char uu_table[] =
 "`!\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_";
 static const char b64_table[] =
@@ -938,13 +953,8 @@ pack_unpack_internal(VALUE str, VALUE fmt, enum unpack_mode mode, long offset)
     char *s, *send;
     char *p, *pend;
     VALUE ary, associates = Qfalse;
-    char type;
     long len;
     AVOID_CC_BUG long tmp_len;
-    int star;
-#ifdef NATINT_PACK
-    int natint;			/* native integer */
-#endif
     int signed_p, integer_size, bigendian_p;
 #define UNPACK_PUSH(item) do {\
         VALUE item_val = (item);\
@@ -979,49 +989,14 @@ pack_unpack_internal(VALUE str, VALUE fmt, enum unpack_mode mode, long offset)
     ary = mode == UNPACK_ARRAY ? rb_ary_new() : Qnil;
     while (p < pend) {
         int explicit_endian = 0;
-        type = *p++;
-#ifdef NATINT_PACK
-        natint = 0;
-#endif
-
-        if (ISSPACE(type)) continue;
-        if (type == '#') {
-            while ((p < pend) && (*p != '\n')) {
-                p++;
-            }
-            continue;
-        }
-
-        star = 0;
-        {
-          modifiers:
-            switch (*p) {
-              case '_':
-              case '!':
-
-                if (strchr(natstr, type)) {
+        const char type = *p++;
 #ifdef NATINT_PACK
-                    natint = 1;
+        int natint = 0;		/* native integer */
 #endif
-                    p++;
-                }
-                else {
-                    rb_raise(rb_eArgError, "'%c' allowed only after types %s", *p, natstr);
-                }
-                goto modifiers;
+        int star = 0;
 
-              case '<':
-              case '>':
-                if (!strchr(endstr, type)) {
-                    rb_raise(rb_eArgError, "'%c' allowed only after types %s", *p, endstr);
-                }
-                if (explicit_endian) {
-                    rb_raise(rb_eRangeError, "Can't use both '<' and '>'");
-                }
-                explicit_endian = *p++;
-                goto modifiers;
-            }
-        }
+        if (skip_blank(p, type)) continue;
+        p = pack_modifiers(p, type, &natint, &explicit_endian);
 
         if (p >= pend)
             len = 1;
diff --git a/pack.rb b/pack.rb
index d505eaee3570ca..e70c6c7dc8b77d 100644
--- a/pack.rb
+++ b/pack.rb
@@ -11,12 +11,17 @@ def pack(fmt, buffer: nil)
 
 class String
   # call-seq:
-  #   unpack(template, offset: 0) -> array
+  #   unpack(template, offset: 0, &block) -> array
+  #
+  #  Extracts data from +self+.
+  #
+  #  If +block+ is not given, forming objects that become the elements
+  #  of a new array, and returns that array.  Otherwise, yields each
+  #  object.
   #
-  #  Extracts data from +self+, forming objects that become the elements of a new array;
-  #  returns that array.
   #  See {Packed Data}[rdoc-ref:packed_data.rdoc].
   def unpack(fmt, offset: 0)
+    Primitive.attr! :use_block
     Primitive.pack_unpack(fmt, offset)
   end
 
diff --git a/parse.y b/parse.y
index 8b88b1b38df6a8..3138061b988162 100644
--- a/parse.y
+++ b/parse.y
@@ -9,8 +9,6 @@
 
 **********************************************************************/
 
-%require "3.0"
-
 %{
 
 #if !YYPURE
@@ -19,10 +17,6 @@
 #define YYDEBUG 1
 #define YYERROR_VERBOSE 1
 #define YYSTACK_USE_ALLOCA 0
-#define YYLTYPE rb_code_location_t
-#define YYLTYPE_IS_DECLARED 1
-
-#ifdef UNIVERSAL_PARSER
 
 /* For Ripper */
 #ifdef RUBY_EXTCONF_H
@@ -32,27 +26,20 @@
 #include "ruby/internal/config.h"
 
 #include <errno.h>
+
+#ifdef UNIVERSAL_PARSER
+
 #include "internal/ruby_parser.h"
 #include "parser_node.h"
 #include "universal_parser.c"
 
 #ifdef RIPPER
-#undef T_NODE
-#define T_NODE 0x1b
 #define STATIC_ID2SYM p->config->static_id2sym
 #define rb_str_coderange_scan_restartable p->config->str_coderange_scan_restartable
 #endif
 
 #else
 
-#include "ruby/internal/config.h"
-
-#include <ctype.h>
-#include <errno.h>
-#include <stdio.h>
-
-struct lex_context;
-
 #include "internal.h"
 #include "internal/compile.h"
 #include "internal/compilers.h"
@@ -60,7 +47,6 @@ struct lex_context;
 #include "internal/encoding.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"
@@ -83,105 +69,150 @@ struct lex_context;
 #include "symbol.h"
 
 #ifndef RIPPER
-static void
-bignum_negate(VALUE b)
+static VALUE
+syntax_error_new(void)
 {
-    BIGNUM_NEGATE(b);
+    return rb_class_new_instance(0, 0, rb_eSyntaxError);
 }
+#endif
 
-static void
-rational_set_num(VALUE r, VALUE n)
-{
-    RATIONAL_SET_NUM(r, n);
-}
+static NODE *reg_named_capture_assign(struct parser_params* p, VALUE regexp, const YYLTYPE *loc, rb_parser_assignable_func assignable);
 
-static VALUE
-rational_get_num(VALUE obj)
-{
-    return RRATIONAL(obj)->num;
-}
+#define compile_callback rb_suppress_tracing
+#endif /* !UNIVERSAL_PARSER */
 
-static void
-rcomplex_set_real(VALUE cmp, VALUE r)
-{
-    RCOMPLEX_SET_REAL(cmp, r);
-}
+#define NODE_SPECIAL_EMPTY_ARGS ((NODE *)-1)
+#define NODE_EMPTY_ARGS_P(node) ((node) == NODE_SPECIAL_EMPTY_ARGS)
 
-static VALUE
-rcomplex_get_real(VALUE obj)
-{
-    return RCOMPLEX(obj)->real;
-}
+static int rb_parser_string_hash_cmp(rb_parser_string_t *str1, rb_parser_string_t *str2);
 
-static void
-rcomplex_set_imag(VALUE cmp, VALUE i)
-{
-    RCOMPLEX_SET_IMAG(cmp, i);
-}
+#ifndef RIPPER
+static rb_parser_string_t *rb_parser_string_deep_copy(struct parser_params *p, const rb_parser_string_t *original);
+#endif
 
-static VALUE
-rcomplex_get_imag(VALUE obj)
+static int
+node_integer_cmp(rb_node_integer_t *n1, rb_node_integer_t *n2)
 {
-    return RCOMPLEX(obj)->imag;
+    return (n1->minus != n2->minus ||
+            n1->base != n2->base ||
+            strcmp(n1->val, n2->val));
 }
 
-static bool
-hash_literal_key_p(VALUE k)
+static int
+node_float_cmp(rb_node_float_t *n1, rb_node_float_t *n2)
 {
-    switch (OBJ_BUILTIN_TYPE(k)) {
-      case T_NODE:
-        return false;
-      default:
-        return true;
-    }
+    return (n1->minus != n2->minus ||
+            strcmp(n1->val, n2->val));
 }
 
 static int
-literal_cmp(VALUE val, VALUE lit)
+node_rational_cmp(rb_node_rational_t *n1, rb_node_rational_t *n2)
 {
-    if (val == lit) return 0;
-    if (!hash_literal_key_p(val) || !hash_literal_key_p(lit)) return -1;
-    return rb_iseq_cdhash_cmp(val, lit);
+    return (n1->minus != n2->minus ||
+            n1->base != n2->base ||
+            n1->seen_point != n2->seen_point ||
+            strcmp(n1->val, n2->val));
 }
 
-static st_index_t
-literal_hash(VALUE a)
+static int
+node_imaginary_cmp(rb_node_imaginary_t *n1, rb_node_imaginary_t *n2)
 {
-    if (!hash_literal_key_p(a)) return (st_index_t)a;
-    return rb_iseq_cdhash_hash(a);
+    return (n1->minus != n2->minus ||
+            n1->base != n2->base ||
+            n1->seen_point != n2->seen_point ||
+            n1->type != n2->type ||
+            strcmp(n1->val, n2->val));
 }
 
-static VALUE
-syntax_error_new(void)
+static int
+rb_parser_regx_hash_cmp(rb_node_regx_t *n1, rb_node_regx_t *n2)
 {
-    return rb_class_new_instance(0, 0, rb_eSyntaxError);
+    return (n1->options != n2->options ||
+            rb_parser_string_hash_cmp(n1->string, n2->string));
 }
 
-static NODE *reg_named_capture_assign(struct parser_params* p, VALUE regexp, const YYLTYPE *loc);
-#endif /* !RIPPER */
-
-#define compile_callback rb_suppress_tracing
-VALUE rb_io_gets_internal(VALUE io);
-
-VALUE rb_node_case_when_optimizable_literal(const NODE *const node);
+static st_index_t rb_parser_str_hash(rb_parser_string_t *str);
+static st_index_t rb_char_p_hash(const char *c);
 
 static int
-strterm_is_heredoc(VALUE strterm)
+literal_cmp(st_data_t val, st_data_t lit)
 {
-    return ((rb_strterm_t *)strterm)->flags & STRTERM_HEREDOC;
+    if (val == lit) return 0;
+
+    NODE *node_val = RNODE(val);
+    NODE *node_lit = RNODE(lit);
+    enum node_type type_val = nd_type(node_val);
+    enum node_type type_lit = nd_type(node_lit);
+
+    if (type_val != type_lit) {
+        return -1;
+    }
+
+    switch (type_lit) {
+      case NODE_INTEGER:
+        return node_integer_cmp(RNODE_INTEGER(node_val), RNODE_INTEGER(node_lit));
+      case NODE_FLOAT:
+        return node_float_cmp(RNODE_FLOAT(node_val), RNODE_FLOAT(node_lit));
+      case NODE_RATIONAL:
+        return node_rational_cmp(RNODE_RATIONAL(node_val), RNODE_RATIONAL(node_lit));
+      case NODE_IMAGINARY:
+        return node_imaginary_cmp(RNODE_IMAGINARY(node_val), RNODE_IMAGINARY(node_lit));
+      case NODE_STR:
+        return rb_parser_string_hash_cmp(RNODE_STR(node_val)->string, RNODE_STR(node_lit)->string);
+      case NODE_SYM:
+        return rb_parser_string_hash_cmp(RNODE_SYM(node_val)->string, RNODE_SYM(node_lit)->string);
+      case NODE_REGX:
+        return rb_parser_regx_hash_cmp(RNODE_REGX(node_val), RNODE_REGX(node_lit));
+      case NODE_LINE:
+        return node_val->nd_loc.beg_pos.lineno != node_lit->nd_loc.beg_pos.lineno;
+      case NODE_FILE:
+        return rb_parser_string_hash_cmp(RNODE_FILE(node_val)->path, RNODE_FILE(node_lit)->path);
+      case NODE_ENCODING:
+        return RNODE_ENCODING(node_val)->enc != RNODE_ENCODING(node_lit)->enc;
+      default:
+#ifdef UNIVERSAL_PARSER
+        abort();
+#else
+        rb_bug("unexpected node: %s, %s", ruby_node_name(type_val), ruby_node_name(type_lit));
+#endif
+    }
 }
 
-static VALUE
-new_strterm(VALUE v1, VALUE v2, VALUE v3, VALUE v0, int heredoc)
+static st_index_t
+literal_hash(st_data_t a)
 {
-    rb_strterm_t *imemo = (rb_strterm_t *)rb_imemo_new(imemo_parser_strterm, v1, v2, v3, v0);
-    if (heredoc) {
-        imemo->flags |= STRTERM_HEREDOC;
-    }
+    NODE *node = (NODE *)a;
+    enum node_type type = nd_type(node);
 
-    return (VALUE)imemo;
+    switch (type) {
+      case NODE_INTEGER:
+        return rb_char_p_hash(RNODE_INTEGER(node)->val);
+      case NODE_FLOAT:
+        return rb_char_p_hash(RNODE_FLOAT(node)->val);
+      case NODE_RATIONAL:
+        return rb_char_p_hash(RNODE_RATIONAL(node)->val);
+      case NODE_IMAGINARY:
+        return rb_char_p_hash(RNODE_IMAGINARY(node)->val);
+      case NODE_STR:
+        return rb_parser_str_hash(RNODE_STR(node)->string);
+      case NODE_SYM:
+        return rb_parser_str_hash(RNODE_SYM(node)->string);
+      case NODE_REGX:
+        return rb_parser_str_hash(RNODE_REGX(node)->string);
+      case NODE_LINE:
+        return (st_index_t)node->nd_loc.beg_pos.lineno;
+      case NODE_FILE:
+        return rb_parser_str_hash(RNODE_FILE(node)->path);
+      case NODE_ENCODING:
+        return (st_index_t)RNODE_ENCODING(node)->enc;
+      default:
+#ifdef UNIVERSAL_PARSER
+        abort();
+#else
+        rb_bug("unexpected node: %s", ruby_node_name(type));
+#endif
+    }
 }
-#endif /* !UNIVERSAL_PARSER */
 
 static inline int
 parse_isascii(int c)
@@ -243,7 +274,7 @@ parse_isdigit(int c)
 static inline int
 parse_isalnum(int c)
 {
-    return parse_isalpha(c) || parse_isdigit(c);
+    return ISALPHA(c) || ISDIGIT(c);
 }
 
 #undef ISALNUM
@@ -252,7 +283,7 @@ parse_isalnum(int c)
 static inline int
 parse_isxdigit(int c)
 {
-    return parse_isdigit(c) || ('A' <= c && c <= 'F') || ('a' <= c && c <= 'f');
+    return ISDIGIT(c) || ('A' <= c && c <= 'F') || ('a' <= c && c <= 'f');
 }
 
 #undef ISXDIGIT
@@ -270,11 +301,11 @@ parse_isxdigit(int c)
 #include "ripper_init.h"
 #endif
 
-enum shareability {
-    shareable_none,
-    shareable_literal,
-    shareable_copy,
-    shareable_everything,
+enum rescue_context {
+    before_rescue,
+    after_rescue,
+    after_else,
+    after_ensure,
 };
 
 struct lex_context {
@@ -283,9 +314,13 @@ struct lex_context {
     unsigned int in_argdef: 1;
     unsigned int in_def: 1;
     unsigned int in_class: 1;
-    BITFIELD(enum shareability, shareable_constant_value, 2);
+    BITFIELD(enum rb_parser_shareability, shareable_constant_value, 2);
+    BITFIELD(enum rescue_context, in_rescue, 2);
+    unsigned int cant_return: 1;
 };
 
+typedef struct RNode_DEF_TEMP rb_node_def_temp_t;
+
 #if defined(__GNUC__) && !defined(__clang__)
 // Suppress "parameter passing for argument of type 'struct
 // lex_context' changed" notes.  `struct lex_context` is file scope,
@@ -300,8 +335,6 @@ RBIMPL_WARNING_POP()
 
 #define NO_LEX_CTXT (struct lex_context){0}
 
-#define AREF(ary, i) RARRAY_AREF(ary, i)
-
 #ifndef WARN_PAST_SCOPE
 # define WARN_PAST_SCOPE 0
 #endif
@@ -310,10 +343,6 @@ RBIMPL_WARNING_POP()
 
 #define yydebug (p->debug)	/* disable the global variable definition */
 
-#define YYMALLOC(size)		rb_parser_malloc(p, (size))
-#define YYREALLOC(ptr, size)	rb_parser_realloc(p, (ptr), (size))
-#define YYCALLOC(nelem, size)	rb_parser_calloc(p, (nelem), (size))
-#define YYFREE(ptr)		rb_parser_free(p, (ptr))
 #define YYFPRINTF(out, ...)	rb_parser_printf(p, __VA_ARGS__)
 #define YY_LOCATION_PRINT(File, loc, p) \
      rb_parser_printf(p, "%d.%d-%d.%d", \
@@ -402,13 +431,18 @@ struct local_vars {
     struct vtable *past;
 # endif
     struct local_vars *prev;
-# ifndef RIPPER
     struct {
         NODE *outer, *inner, *current;
     } numparam;
-# endif
+    NODE *it;
 };
 
+typedef struct rb_locations_lambda_body_t {
+    NODE *node;
+    YYLTYPE opening_loc;
+    YYLTYPE closing_loc;
+} rb_locations_lambda_body_t;
+
 enum {
     ORDINAL_PARAM = -1,
     NO_PARAM = 0,
@@ -427,6 +461,25 @@ typedef struct token_info {
     struct token_info *next;
 } token_info;
 
+typedef struct end_expect_token_locations {
+    const rb_code_position_t *pos;
+    struct end_expect_token_locations *prev;
+} end_expect_token_locations_t;
+
+typedef struct parser_string_buffer_elem {
+    struct parser_string_buffer_elem *next;
+    long len;  /* Total length of allocated buf */
+    long used; /* Current usage of buf */
+    rb_parser_string_t *buf[FLEX_ARY_LEN];
+} parser_string_buffer_elem_t;
+
+typedef struct parser_string_buffer {
+    parser_string_buffer_elem_t *head;
+    parser_string_buffer_elem_t *last;
+} parser_string_buffer_t;
+
+#define AFTER_HEREDOC_WITHOUT_TERMINATOR ((rb_parser_string_t *)1)
+
 /*
     Structure of Lexer Buffer:
 
@@ -437,25 +490,20 @@ typedef struct token_info {
                      token
 */
 struct parser_params {
-    rb_imemo_tmpbuf_t *heap;
-
     YYSTYPE *lval;
     YYLTYPE *yylloc;
 
     struct {
         rb_strterm_t *strterm;
-        VALUE (*gets)(struct parser_params*,VALUE);
-        VALUE input;
-        VALUE lastline;
-        VALUE nextline;
+        rb_parser_lex_gets_func *gets;
+        rb_parser_input_data input;
+        parser_string_buffer_t string_buffer;
+        rb_parser_string_t *lastline;
+        rb_parser_string_t *nextline;
         const char *pbeg;
         const char *pcur;
         const char *pend;
         const char *ptok;
-        union {
-            long ptr;
-            VALUE (*call)(VALUE, int);
-        } gets_;
         enum lex_state_e state;
         /* track the nest level of any parens "()[]{}" */
         int paren_nest;
@@ -468,7 +516,6 @@ struct parser_params {
     stack_type cmdarg_stack;
     int tokidx;
     int toksiz;
-    int tokline;
     int heredoc_end;
     int heredoc_indent;
     int heredoc_line_indent;
@@ -482,30 +529,36 @@ struct parser_params {
     VALUE ruby_sourcefile_string;
     rb_encoding *enc;
     token_info *token_info;
-    VALUE case_labels;
+    st_table *case_labels;
+    rb_node_exits_t *exits;
 
     VALUE debug_buffer;
     VALUE debug_output;
 
     struct {
-        VALUE token;
+        rb_parser_string_t *token;
         int beg_line;
         int beg_col;
         int end_line;
         int end_col;
     } delayed;
 
-    ID cur_arg;
-
     rb_ast_t *ast;
     int node_id;
 
+    st_table *warn_duplicate_keys_table;
+
     int max_numparam;
+    ID it_id;
 
     struct lex_context ctxt;
 
+    NODE *eval_tree_begin;
+    NODE *eval_tree;
+    const struct rb_iseq_struct *parent_iseq;
+
 #ifdef UNIVERSAL_PARSER
-    rb_parser_config_t *config;
+    const rb_parser_config_t *config;
 #endif
     /* compile_option */
     signed int frozen_string_literal:2; /* -1: not specified, 0: false, 1: true */
@@ -533,23 +586,26 @@ struct parser_params {
     unsigned int error_tolerant: 1;
     unsigned int keep_tokens: 1;
 
-    NODE *eval_tree_begin;
-    NODE *eval_tree;
     VALUE error_buffer;
-    VALUE debug_lines;
-    const struct rb_iseq_struct *parent_iseq;
-    /* store specific keyword locations to generate dummy end token */
-    VALUE end_expect_token_locations;
+    rb_parser_ary_t *debug_lines;
+    /*
+     * Store specific keyword locations to generate dummy end token.
+     * Refer to the tail of list element.
+     */
+    end_expect_token_locations_t *end_expect_token_locations;
     /* id for terms */
     int token_id;
     /* Array for term tokens */
-    VALUE tokens;
+    rb_parser_ary_t *tokens;
 #else
     /* Ripper only */
 
     VALUE value;
     VALUE result;
     VALUE parsing_thread;
+    VALUE s_value; /* Token VALUE */
+    VALUE s_lvalue; /* VALUE generated by rule action (reduce) */
+    VALUE s_value_stack;
 #endif
 };
 
@@ -565,22 +621,105 @@ numparam_id_p(struct parser_params *p, ID id)
 }
 static void numparam_name(struct parser_params *p, ID id);
 
+#ifdef RIPPER
+static void
+after_shift(struct parser_params *p)
+{
+    if (p->debug) {
+        rb_parser_printf(p, "after-shift: %+"PRIsVALUE"\n", p->s_value);
+    }
+    rb_ary_push(p->s_value_stack, p->s_value);
+    p->s_value = Qnil;
+}
+
+static void
+before_reduce(int len, struct parser_params *p)
+{
+    // Initialize $$ with $1.
+    if (len) p->s_lvalue = rb_ary_entry(p->s_value_stack, -len);
+}
+
+static void
+after_reduce(int len, struct parser_params *p)
+{
+    for (int i = 0; i < len; i++) {
+        VALUE tos = rb_ary_pop(p->s_value_stack);
+        if (p->debug) {
+            rb_parser_printf(p, "after-reduce pop: %+"PRIsVALUE"\n", tos);
+        }
+    }
+    if (p->debug) {
+        rb_parser_printf(p, "after-reduce push: %+"PRIsVALUE"\n", p->s_lvalue);
+    }
+    rb_ary_push(p->s_value_stack, p->s_lvalue);
+    p->s_lvalue = Qnil;
+}
+
+static void
+after_shift_error_token(struct parser_params *p)
+{
+    if (p->debug) {
+        rb_parser_printf(p, "after-shift-error-token:\n");
+    }
+    rb_ary_push(p->s_value_stack, Qnil);
+}
+
+static void
+after_pop_stack(int len, struct parser_params *p)
+{
+    for (int i = 0; i < len; i++) {
+        VALUE tos = rb_ary_pop(p->s_value_stack);
+        if (p->debug) {
+            rb_parser_printf(p, "after-pop-stack pop: %+"PRIsVALUE"\n", tos);
+        }
+    }
+}
+#else
+static void
+after_shift(struct parser_params *p)
+{
+}
+
+static void
+before_reduce(int len, struct parser_params *p)
+{
+}
+
+static void
+after_reduce(int len, struct parser_params *p)
+{
+}
+
+static void
+after_shift_error_token(struct parser_params *p)
+{
+}
+
+static void
+after_pop_stack(int len, struct parser_params *p)
+{
+}
+#endif
 
 #define intern_cstr(n,l,en) rb_intern3(n,l,en)
 
+#define STRING_NEW0() rb_parser_encoding_string_new(p,0,0,p->enc)
+
 #define STR_NEW(ptr,len) rb_enc_str_new((ptr),(len),p->enc)
 #define STR_NEW0() rb_enc_str_new(0,0,p->enc)
 #define STR_NEW2(ptr) rb_enc_str_new((ptr),strlen(ptr),p->enc)
 #define STR_NEW3(ptr,len,e,func) parser_str_new(p, (ptr),(len),(e),(func),p->enc)
 #define TOK_INTERN() intern_cstr(tok(p), toklen(p), p->enc)
+#define VALID_SYMNAME_P(s, l, enc, type) (rb_enc_symname_type(s, l, enc, (1U<<(type))) == (int)(type))
 
-static st_table *
-push_pvtbl(struct parser_params *p)
+#ifndef RIPPER
+static inline int
+char_at_end(struct parser_params *p, VALUE str, int when_empty)
 {
-    st_table *tbl = p->pvtbl;
-    p->pvtbl = st_init_numtable();
-    return tbl;
+    long len = RSTRING_LEN(str);
+    return len > 0 ? (unsigned char)RSTRING_PTR(str)[len-1] : when_empty;
 }
+#endif
 
 static void
 pop_pvtbl(struct parser_params *p, st_table *tbl)
@@ -589,14 +728,6 @@ pop_pvtbl(struct parser_params *p, st_table *tbl)
     p->pvtbl = tbl;
 }
 
-static st_table *
-push_pktbl(struct parser_params *p)
-{
-    st_table *tbl = p->pktbl;
-    p->pktbl = 0;
-    return tbl;
-}
-
 static void
 pop_pktbl(struct parser_params *p, st_table *tbl)
 {
@@ -604,6 +735,57 @@ pop_pktbl(struct parser_params *p, st_table *tbl)
     p->pktbl = tbl;
 }
 
+#define STRING_BUF_DEFAULT_LEN 16
+
+static void
+string_buffer_init(struct parser_params *p)
+{
+    parser_string_buffer_t *buf = &p->lex.string_buffer;
+    const size_t size = offsetof(parser_string_buffer_elem_t, buf) + sizeof(rb_parser_string_t *) * STRING_BUF_DEFAULT_LEN;
+
+    buf->head = buf->last = xmalloc(size);
+    buf->head->len = STRING_BUF_DEFAULT_LEN;
+    buf->head->used = 0;
+    buf->head->next = NULL;
+}
+
+static void
+string_buffer_append(struct parser_params *p, rb_parser_string_t *str)
+{
+    parser_string_buffer_t *buf = &p->lex.string_buffer;
+
+    if (buf->head->used >= buf->head->len) {
+        parser_string_buffer_elem_t *elem;
+        long n = buf->head->len * 2;
+        const size_t size = offsetof(parser_string_buffer_elem_t, buf) + sizeof(rb_parser_string_t *) * n;
+
+        elem = xmalloc(size);
+        elem->len = n;
+        elem->used = 0;
+        elem->next = NULL;
+        buf->last->next = elem;
+        buf->last = elem;
+    }
+    buf->last->buf[buf->last->used++] = str;
+}
+
+static void
+string_buffer_free(struct parser_params *p)
+{
+    parser_string_buffer_elem_t *elem = p->lex.string_buffer.head;
+
+    while (elem) {
+        parser_string_buffer_elem_t *next_elem = elem->next;
+
+        for (long i = 0; i < elem->used; i++) {
+            rb_parser_string_free(p, elem->buf[i]);
+        }
+
+        xfree(elem);
+        elem = next_elem;
+    }
+}
+
 #ifndef RIPPER
 static void flush_debug_buffer(struct parser_params *p, VALUE out, VALUE str);
 
@@ -611,8 +793,15 @@ static void
 debug_end_expect_token_locations(struct parser_params *p, const char *name)
 {
     if(p->debug) {
-        VALUE mesg = rb_sprintf("%s: ", name);
-        rb_str_catf(mesg, " %"PRIsVALUE"\n", p->end_expect_token_locations);
+        VALUE mesg = rb_sprintf("%s: [", name);
+        int i = 0;
+        for (end_expect_token_locations_t *loc = p->end_expect_token_locations; loc; loc = loc->prev) {
+            if (i > 0)
+                rb_str_cat_cstr(mesg, ", ");
+            rb_str_catf(mesg, "[%d, %d]", loc->pos->lineno, loc->pos->column);
+            i++;
+        }
+        rb_str_cat_cstr(mesg, "]\n");
         flush_debug_buffer(p, p->debug_output, mesg);
     }
 }
@@ -620,197 +809,214 @@ debug_end_expect_token_locations(struct parser_params *p, const char *name)
 static void
 push_end_expect_token_locations(struct parser_params *p, const rb_code_position_t *pos)
 {
-    if(NIL_P(p->end_expect_token_locations)) return;
-    rb_ary_push(p->end_expect_token_locations, rb_ary_new_from_args(2, INT2NUM(pos->lineno), INT2NUM(pos->column)));
+    if(!p->error_tolerant) return;
+
+    end_expect_token_locations_t *locations;
+    locations = ALLOC(end_expect_token_locations_t);
+    locations->pos = pos;
+    locations->prev = p->end_expect_token_locations;
+    p->end_expect_token_locations = locations;
+
     debug_end_expect_token_locations(p, "push_end_expect_token_locations");
 }
 
 static void
 pop_end_expect_token_locations(struct parser_params *p)
 {
-    if(NIL_P(p->end_expect_token_locations)) return;
-    rb_ary_pop(p->end_expect_token_locations);
+    if(!p->end_expect_token_locations) return;
+
+    end_expect_token_locations_t *locations = p->end_expect_token_locations->prev;
+    ruby_sized_xfree(p->end_expect_token_locations, sizeof(end_expect_token_locations_t));
+    p->end_expect_token_locations = locations;
+
     debug_end_expect_token_locations(p, "pop_end_expect_token_locations");
 }
 
-static VALUE
+static end_expect_token_locations_t *
 peek_end_expect_token_locations(struct parser_params *p)
 {
-    if(NIL_P(p->end_expect_token_locations)) return Qnil;
-    return rb_ary_last(0, 0, p->end_expect_token_locations);
+    return p->end_expect_token_locations;
 }
 
-static ID
-parser_token2id(struct parser_params *p, enum yytokentype tok)
+static const char *
+parser_token2char(struct parser_params *p, enum yytokentype tok)
 {
     switch ((int) tok) {
-#define TOKEN2ID(tok) case tok: return rb_intern(#tok);
-#define TOKEN2ID2(tok, name) case tok: return rb_intern(name);
-      TOKEN2ID2(' ', "words_sep")
-      TOKEN2ID2('!', "!")
-      TOKEN2ID2('%', "%");
-      TOKEN2ID2('&', "&");
-      TOKEN2ID2('*', "*");
-      TOKEN2ID2('+', "+");
-      TOKEN2ID2('-', "-");
-      TOKEN2ID2('/', "/");
-      TOKEN2ID2('<', "<");
-      TOKEN2ID2('=', "=");
-      TOKEN2ID2('>', ">");
-      TOKEN2ID2('?', "?");
-      TOKEN2ID2('^', "^");
-      TOKEN2ID2('|', "|");
-      TOKEN2ID2('~', "~");
-      TOKEN2ID2(':', ":");
-      TOKEN2ID2(',', ",");
-      TOKEN2ID2('.', ".");
-      TOKEN2ID2(';', ";");
-      TOKEN2ID2('`', "`");
-      TOKEN2ID2('\n', "nl");
-      TOKEN2ID2('{', "{");
-      TOKEN2ID2('}', "}");
-      TOKEN2ID2('[', "[");
-      TOKEN2ID2(']', "]");
-      TOKEN2ID2('(', "(");
-      TOKEN2ID2(')', ")");
-      TOKEN2ID2('\\', "backslash");
-      TOKEN2ID(keyword_class);
-      TOKEN2ID(keyword_module);
-      TOKEN2ID(keyword_def);
-      TOKEN2ID(keyword_undef);
-      TOKEN2ID(keyword_begin);
-      TOKEN2ID(keyword_rescue);
-      TOKEN2ID(keyword_ensure);
-      TOKEN2ID(keyword_end);
-      TOKEN2ID(keyword_if);
-      TOKEN2ID(keyword_unless);
-      TOKEN2ID(keyword_then);
-      TOKEN2ID(keyword_elsif);
-      TOKEN2ID(keyword_else);
-      TOKEN2ID(keyword_case);
-      TOKEN2ID(keyword_when);
-      TOKEN2ID(keyword_while);
-      TOKEN2ID(keyword_until);
-      TOKEN2ID(keyword_for);
-      TOKEN2ID(keyword_break);
-      TOKEN2ID(keyword_next);
-      TOKEN2ID(keyword_redo);
-      TOKEN2ID(keyword_retry);
-      TOKEN2ID(keyword_in);
-      TOKEN2ID(keyword_do);
-      TOKEN2ID(keyword_do_cond);
-      TOKEN2ID(keyword_do_block);
-      TOKEN2ID(keyword_do_LAMBDA);
-      TOKEN2ID(keyword_return);
-      TOKEN2ID(keyword_yield);
-      TOKEN2ID(keyword_super);
-      TOKEN2ID(keyword_self);
-      TOKEN2ID(keyword_nil);
-      TOKEN2ID(keyword_true);
-      TOKEN2ID(keyword_false);
-      TOKEN2ID(keyword_and);
-      TOKEN2ID(keyword_or);
-      TOKEN2ID(keyword_not);
-      TOKEN2ID(modifier_if);
-      TOKEN2ID(modifier_unless);
-      TOKEN2ID(modifier_while);
-      TOKEN2ID(modifier_until);
-      TOKEN2ID(modifier_rescue);
-      TOKEN2ID(keyword_alias);
-      TOKEN2ID(keyword_defined);
-      TOKEN2ID(keyword_BEGIN);
-      TOKEN2ID(keyword_END);
-      TOKEN2ID(keyword__LINE__);
-      TOKEN2ID(keyword__FILE__);
-      TOKEN2ID(keyword__ENCODING__);
-      TOKEN2ID(tIDENTIFIER);
-      TOKEN2ID(tFID);
-      TOKEN2ID(tGVAR);
-      TOKEN2ID(tIVAR);
-      TOKEN2ID(tCONSTANT);
-      TOKEN2ID(tCVAR);
-      TOKEN2ID(tLABEL);
-      TOKEN2ID(tINTEGER);
-      TOKEN2ID(tFLOAT);
-      TOKEN2ID(tRATIONAL);
-      TOKEN2ID(tIMAGINARY);
-      TOKEN2ID(tCHAR);
-      TOKEN2ID(tNTH_REF);
-      TOKEN2ID(tBACK_REF);
-      TOKEN2ID(tSTRING_CONTENT);
-      TOKEN2ID(tREGEXP_END);
-      TOKEN2ID(tDUMNY_END);
-      TOKEN2ID(tSP);
-      TOKEN2ID(tUPLUS);
-      TOKEN2ID(tUMINUS);
-      TOKEN2ID(tPOW);
-      TOKEN2ID(tCMP);
-      TOKEN2ID(tEQ);
-      TOKEN2ID(tEQQ);
-      TOKEN2ID(tNEQ);
-      TOKEN2ID(tGEQ);
-      TOKEN2ID(tLEQ);
-      TOKEN2ID(tANDOP);
-      TOKEN2ID(tOROP);
-      TOKEN2ID(tMATCH);
-      TOKEN2ID(tNMATCH);
-      TOKEN2ID(tDOT2);
-      TOKEN2ID(tDOT3);
-      TOKEN2ID(tBDOT2);
-      TOKEN2ID(tBDOT3);
-      TOKEN2ID(tAREF);
-      TOKEN2ID(tASET);
-      TOKEN2ID(tLSHFT);
-      TOKEN2ID(tRSHFT);
-      TOKEN2ID(tANDDOT);
-      TOKEN2ID(tCOLON2);
-      TOKEN2ID(tCOLON3);
-      TOKEN2ID(tOP_ASGN);
-      TOKEN2ID(tASSOC);
-      TOKEN2ID(tLPAREN);
-      TOKEN2ID(tLPAREN_ARG);
-      TOKEN2ID(tRPAREN);
-      TOKEN2ID(tLBRACK);
-      TOKEN2ID(tLBRACE);
-      TOKEN2ID(tLBRACE_ARG);
-      TOKEN2ID(tSTAR);
-      TOKEN2ID(tDSTAR);
-      TOKEN2ID(tAMPER);
-      TOKEN2ID(tLAMBDA);
-      TOKEN2ID(tSYMBEG);
-      TOKEN2ID(tSTRING_BEG);
-      TOKEN2ID(tXSTRING_BEG);
-      TOKEN2ID(tREGEXP_BEG);
-      TOKEN2ID(tWORDS_BEG);
-      TOKEN2ID(tQWORDS_BEG);
-      TOKEN2ID(tSYMBOLS_BEG);
-      TOKEN2ID(tQSYMBOLS_BEG);
-      TOKEN2ID(tSTRING_END);
-      TOKEN2ID(tSTRING_DEND);
-      TOKEN2ID(tSTRING_DBEG);
-      TOKEN2ID(tSTRING_DVAR);
-      TOKEN2ID(tLAMBEG);
-      TOKEN2ID(tLABEL_END);
-      TOKEN2ID(tIGNORED_NL);
-      TOKEN2ID(tCOMMENT);
-      TOKEN2ID(tEMBDOC_BEG);
-      TOKEN2ID(tEMBDOC);
-      TOKEN2ID(tEMBDOC_END);
-      TOKEN2ID(tHEREDOC_BEG);
-      TOKEN2ID(tHEREDOC_END);
-      TOKEN2ID(k__END__);
-      TOKEN2ID(tLOWEST);
-      TOKEN2ID(tUMINUS_NUM);
-      TOKEN2ID(tLAST_TOKEN);
-#undef TOKEN2ID
-#undef TOKEN2ID2
+#define TOKEN2CHAR(tok) case tok: return (#tok);
+#define TOKEN2CHAR2(tok, name) case tok: return (name);
+      TOKEN2CHAR2(' ', "word_sep");
+      TOKEN2CHAR2('!', "!")
+      TOKEN2CHAR2('%', "%");
+      TOKEN2CHAR2('&', "&");
+      TOKEN2CHAR2('*', "*");
+      TOKEN2CHAR2('+', "+");
+      TOKEN2CHAR2('-', "-");
+      TOKEN2CHAR2('/', "/");
+      TOKEN2CHAR2('<', "<");
+      TOKEN2CHAR2('=', "=");
+      TOKEN2CHAR2('>', ">");
+      TOKEN2CHAR2('?', "?");
+      TOKEN2CHAR2('^', "^");
+      TOKEN2CHAR2('|', "|");
+      TOKEN2CHAR2('~', "~");
+      TOKEN2CHAR2(':', ":");
+      TOKEN2CHAR2(',', ",");
+      TOKEN2CHAR2('.', ".");
+      TOKEN2CHAR2(';', ";");
+      TOKEN2CHAR2('`', "`");
+      TOKEN2CHAR2('\n', "nl");
+      TOKEN2CHAR2('{', "\"{\"");
+      TOKEN2CHAR2('}', "\"}\"");
+      TOKEN2CHAR2('[', "\"[\"");
+      TOKEN2CHAR2(']', "\"]\"");
+      TOKEN2CHAR2('(', "\"(\"");
+      TOKEN2CHAR2(')', "\")\"");
+      TOKEN2CHAR2('\\', "backslash");
+      TOKEN2CHAR(keyword_class);
+      TOKEN2CHAR(keyword_module);
+      TOKEN2CHAR(keyword_def);
+      TOKEN2CHAR(keyword_undef);
+      TOKEN2CHAR(keyword_begin);
+      TOKEN2CHAR(keyword_rescue);
+      TOKEN2CHAR(keyword_ensure);
+      TOKEN2CHAR(keyword_end);
+      TOKEN2CHAR(keyword_if);
+      TOKEN2CHAR(keyword_unless);
+      TOKEN2CHAR(keyword_then);
+      TOKEN2CHAR(keyword_elsif);
+      TOKEN2CHAR(keyword_else);
+      TOKEN2CHAR(keyword_case);
+      TOKEN2CHAR(keyword_when);
+      TOKEN2CHAR(keyword_while);
+      TOKEN2CHAR(keyword_until);
+      TOKEN2CHAR(keyword_for);
+      TOKEN2CHAR(keyword_break);
+      TOKEN2CHAR(keyword_next);
+      TOKEN2CHAR(keyword_redo);
+      TOKEN2CHAR(keyword_retry);
+      TOKEN2CHAR(keyword_in);
+      TOKEN2CHAR(keyword_do);
+      TOKEN2CHAR(keyword_do_cond);
+      TOKEN2CHAR(keyword_do_block);
+      TOKEN2CHAR(keyword_do_LAMBDA);
+      TOKEN2CHAR(keyword_return);
+      TOKEN2CHAR(keyword_yield);
+      TOKEN2CHAR(keyword_super);
+      TOKEN2CHAR(keyword_self);
+      TOKEN2CHAR(keyword_nil);
+      TOKEN2CHAR(keyword_true);
+      TOKEN2CHAR(keyword_false);
+      TOKEN2CHAR(keyword_and);
+      TOKEN2CHAR(keyword_or);
+      TOKEN2CHAR(keyword_not);
+      TOKEN2CHAR(modifier_if);
+      TOKEN2CHAR(modifier_unless);
+      TOKEN2CHAR(modifier_while);
+      TOKEN2CHAR(modifier_until);
+      TOKEN2CHAR(modifier_rescue);
+      TOKEN2CHAR(keyword_alias);
+      TOKEN2CHAR(keyword_defined);
+      TOKEN2CHAR(keyword_BEGIN);
+      TOKEN2CHAR(keyword_END);
+      TOKEN2CHAR(keyword__LINE__);
+      TOKEN2CHAR(keyword__FILE__);
+      TOKEN2CHAR(keyword__ENCODING__);
+      TOKEN2CHAR(tIDENTIFIER);
+      TOKEN2CHAR(tFID);
+      TOKEN2CHAR(tGVAR);
+      TOKEN2CHAR(tIVAR);
+      TOKEN2CHAR(tCONSTANT);
+      TOKEN2CHAR(tCVAR);
+      TOKEN2CHAR(tLABEL);
+      TOKEN2CHAR(tINTEGER);
+      TOKEN2CHAR(tFLOAT);
+      TOKEN2CHAR(tRATIONAL);
+      TOKEN2CHAR(tIMAGINARY);
+      TOKEN2CHAR(tCHAR);
+      TOKEN2CHAR(tNTH_REF);
+      TOKEN2CHAR(tBACK_REF);
+      TOKEN2CHAR(tSTRING_CONTENT);
+      TOKEN2CHAR(tREGEXP_END);
+      TOKEN2CHAR(tDUMNY_END);
+      TOKEN2CHAR(tSP);
+      TOKEN2CHAR(tUPLUS);
+      TOKEN2CHAR(tUMINUS);
+      TOKEN2CHAR(tPOW);
+      TOKEN2CHAR(tCMP);
+      TOKEN2CHAR(tEQ);
+      TOKEN2CHAR(tEQQ);
+      TOKEN2CHAR(tNEQ);
+      TOKEN2CHAR(tGEQ);
+      TOKEN2CHAR(tLEQ);
+      TOKEN2CHAR(tANDOP);
+      TOKEN2CHAR(tOROP);
+      TOKEN2CHAR(tMATCH);
+      TOKEN2CHAR(tNMATCH);
+      TOKEN2CHAR(tDOT2);
+      TOKEN2CHAR(tDOT3);
+      TOKEN2CHAR(tBDOT2);
+      TOKEN2CHAR(tBDOT3);
+      TOKEN2CHAR(tAREF);
+      TOKEN2CHAR(tASET);
+      TOKEN2CHAR(tLSHFT);
+      TOKEN2CHAR(tRSHFT);
+      TOKEN2CHAR(tANDDOT);
+      TOKEN2CHAR(tCOLON2);
+      TOKEN2CHAR(tCOLON3);
+      TOKEN2CHAR(tOP_ASGN);
+      TOKEN2CHAR(tASSOC);
+      TOKEN2CHAR(tLPAREN);
+      TOKEN2CHAR(tLPAREN_ARG);
+      TOKEN2CHAR(tLBRACK);
+      TOKEN2CHAR(tLBRACE);
+      TOKEN2CHAR(tLBRACE_ARG);
+      TOKEN2CHAR(tSTAR);
+      TOKEN2CHAR(tDSTAR);
+      TOKEN2CHAR(tAMPER);
+      TOKEN2CHAR(tLAMBDA);
+      TOKEN2CHAR(tSYMBEG);
+      TOKEN2CHAR(tSTRING_BEG);
+      TOKEN2CHAR(tXSTRING_BEG);
+      TOKEN2CHAR(tREGEXP_BEG);
+      TOKEN2CHAR(tWORDS_BEG);
+      TOKEN2CHAR(tQWORDS_BEG);
+      TOKEN2CHAR(tSYMBOLS_BEG);
+      TOKEN2CHAR(tQSYMBOLS_BEG);
+      TOKEN2CHAR(tSTRING_END);
+      TOKEN2CHAR(tSTRING_DEND);
+      TOKEN2CHAR(tSTRING_DBEG);
+      TOKEN2CHAR(tSTRING_DVAR);
+      TOKEN2CHAR(tLAMBEG);
+      TOKEN2CHAR(tLABEL_END);
+      TOKEN2CHAR(tIGNORED_NL);
+      TOKEN2CHAR(tCOMMENT);
+      TOKEN2CHAR(tEMBDOC_BEG);
+      TOKEN2CHAR(tEMBDOC);
+      TOKEN2CHAR(tEMBDOC_END);
+      TOKEN2CHAR(tHEREDOC_BEG);
+      TOKEN2CHAR(tHEREDOC_END);
+      TOKEN2CHAR(k__END__);
+      TOKEN2CHAR(tLOWEST);
+      TOKEN2CHAR(tUMINUS_NUM);
+      TOKEN2CHAR(tLAST_TOKEN);
+#undef TOKEN2CHAR
+#undef TOKEN2CHAR2
     }
 
     rb_bug("parser_token2id: unknown token %d", tok);
 
     UNREACHABLE_RETURN(0);
 }
+#else
+static void
+push_end_expect_token_locations(struct parser_params *p, const rb_code_position_t *pos)
+{
+}
 
+static void
+pop_end_expect_token_locations(struct parser_params *p)
+{
+}
 #endif
 
 RBIMPL_ATTR_NONNULL((1, 2, 3))
@@ -841,44 +1047,289 @@ static void token_info_drop(struct parser_params *p, const char *token, rb_code_
 
 #define token_column		((int)(p->lex.ptok - p->lex.pbeg))
 
-#define CALL_Q_P(q) ((q) == TOKEN2VAL(tANDDOT))
-#define NODE_CALL_Q(q) (CALL_Q_P(q) ? NODE_QCALL : NODE_CALL)
-#define NEW_QCALL(q,r,m,a,loc) NEW_NODE(NODE_CALL_Q(q),r,m,a,loc)
+#define CALL_Q_P(q) ((q) == tANDDOT)
+#define NEW_QCALL(q,r,m,a,loc) (CALL_Q_P(q) ? NEW_QCALL0(r,m,a,loc) : NEW_CALL(r,m,a,loc))
 
 #define lambda_beginning_p() (p->lex.lpar_beg == p->lex.paren_nest)
 
 static enum yytokentype yylex(YYSTYPE*, YYLTYPE*, struct parser_params*);
 
-#ifndef RIPPER
 static inline void
 rb_discard_node(struct parser_params *p, NODE *n)
 {
     rb_ast_delete_node(p->ast, n);
 }
-#endif
 
-#ifdef RIPPER
-static inline VALUE
-add_mark_object(struct parser_params *p, VALUE obj)
+static rb_node_scope_t *rb_node_scope_new(struct parser_params *p, rb_node_args_t *nd_args, NODE *nd_body, const YYLTYPE *loc);
+static rb_node_scope_t *rb_node_scope_new2(struct parser_params *p, rb_ast_id_table_t *nd_tbl, rb_node_args_t *nd_args, NODE *nd_body, const YYLTYPE *loc);
+static rb_node_block_t *rb_node_block_new(struct parser_params *p, NODE *nd_head, const YYLTYPE *loc);
+static rb_node_if_t *rb_node_if_new(struct parser_params *p, NODE *nd_cond, NODE *nd_body, NODE *nd_else, const YYLTYPE *loc, const YYLTYPE* if_keyword_loc, const YYLTYPE* then_keyword_loc, const YYLTYPE* end_keyword_loc);
+static rb_node_unless_t *rb_node_unless_new(struct parser_params *p, NODE *nd_cond, NODE *nd_body, NODE *nd_else, const YYLTYPE *loc, const YYLTYPE *keyword_loc, const YYLTYPE *then_keyword_loc, const YYLTYPE *end_keyword_loc);
+static rb_node_case_t *rb_node_case_new(struct parser_params *p, NODE *nd_head, NODE *nd_body, const YYLTYPE *loc, const YYLTYPE *case_keyword_loc, const YYLTYPE *end_keyword_loc);
+static rb_node_case2_t *rb_node_case2_new(struct parser_params *p, NODE *nd_body, const YYLTYPE *loc, const YYLTYPE *case_keyword_loc, const YYLTYPE *end_keyword_loc);
+static rb_node_case3_t *rb_node_case3_new(struct parser_params *p, NODE *nd_head, NODE *nd_body, const YYLTYPE *loc, const YYLTYPE *case_keyword_loc, const YYLTYPE *end_keyword_loc);
+static rb_node_when_t *rb_node_when_new(struct parser_params *p, NODE *nd_head, NODE *nd_body, NODE *nd_next, const YYLTYPE *loc, const YYLTYPE *keyword_loc, const YYLTYPE *then_keyword_loc);
+static rb_node_in_t *rb_node_in_new(struct parser_params *p, NODE *nd_head, NODE *nd_body, NODE *nd_next, const YYLTYPE *loc);
+static rb_node_while_t *rb_node_while_new(struct parser_params *p, NODE *nd_cond, NODE *nd_body, long nd_state, const YYLTYPE *loc, const YYLTYPE *keyword_loc, const YYLTYPE *closing_loc);
+static rb_node_until_t *rb_node_until_new(struct parser_params *p, NODE *nd_cond, NODE *nd_body, long nd_state, const YYLTYPE *loc, const YYLTYPE *keyword_loc, const YYLTYPE *closing_loc);
+static rb_node_iter_t *rb_node_iter_new(struct parser_params *p, rb_node_args_t *nd_args, NODE *nd_body, const YYLTYPE *loc);
+static rb_node_for_t *rb_node_for_new(struct parser_params *p, NODE *nd_iter, NODE *nd_body, const YYLTYPE *loc, const YYLTYPE *for_keyword_loc, const YYLTYPE *in_keyword_loc, const YYLTYPE *do_keyword_loc, const YYLTYPE *end_keyword_loc);
+static rb_node_for_masgn_t *rb_node_for_masgn_new(struct parser_params *p, NODE *nd_var, const YYLTYPE *loc);
+static rb_node_retry_t *rb_node_retry_new(struct parser_params *p, const YYLTYPE *loc);
+static rb_node_begin_t *rb_node_begin_new(struct parser_params *p, NODE *nd_body, const YYLTYPE *loc);
+static rb_node_rescue_t *rb_node_rescue_new(struct parser_params *p, NODE *nd_head, NODE *nd_resq, NODE *nd_else, const YYLTYPE *loc);
+static rb_node_resbody_t *rb_node_resbody_new(struct parser_params *p, NODE *nd_args, NODE *nd_exc_var, NODE *nd_body, NODE *nd_next, const YYLTYPE *loc);
+static rb_node_ensure_t *rb_node_ensure_new(struct parser_params *p, NODE *nd_head, NODE *nd_ensr, const YYLTYPE *loc);
+static rb_node_and_t *rb_node_and_new(struct parser_params *p, NODE *nd_1st, NODE *nd_2nd, const YYLTYPE *loc, const YYLTYPE *operator_loc);
+static rb_node_or_t *rb_node_or_new(struct parser_params *p, NODE *nd_1st, NODE *nd_2nd, const YYLTYPE *loc, const YYLTYPE *operator_loc);
+static rb_node_masgn_t *rb_node_masgn_new(struct parser_params *p, NODE *nd_head, NODE *nd_args, const YYLTYPE *loc);
+static rb_node_lasgn_t *rb_node_lasgn_new(struct parser_params *p, ID nd_vid, NODE *nd_value, const YYLTYPE *loc);
+static rb_node_dasgn_t *rb_node_dasgn_new(struct parser_params *p, ID nd_vid, NODE *nd_value, const YYLTYPE *loc);
+static rb_node_gasgn_t *rb_node_gasgn_new(struct parser_params *p, ID nd_vid, NODE *nd_value, const YYLTYPE *loc);
+static rb_node_iasgn_t *rb_node_iasgn_new(struct parser_params *p, ID nd_vid, NODE *nd_value, const YYLTYPE *loc);
+static rb_node_cdecl_t *rb_node_cdecl_new(struct parser_params *p, ID nd_vid, NODE *nd_value, NODE *nd_else, enum rb_parser_shareability shareability, const YYLTYPE *loc);
+static rb_node_cvasgn_t *rb_node_cvasgn_new(struct parser_params *p, ID nd_vid, NODE *nd_value, const YYLTYPE *loc);
+static rb_node_op_asgn1_t *rb_node_op_asgn1_new(struct parser_params *p, NODE *nd_recv, ID nd_mid, NODE *index, NODE *rvalue, const YYLTYPE *loc, const YYLTYPE *call_operator_loc, const YYLTYPE *opening_loc, const YYLTYPE *closing_loc, const YYLTYPE *binary_operator_loc);
+static rb_node_op_asgn2_t *rb_node_op_asgn2_new(struct parser_params *p, NODE *nd_recv, NODE *nd_value, ID nd_vid, ID nd_mid, bool nd_aid, const YYLTYPE *loc, const YYLTYPE *call_operator_loc, const YYLTYPE *message_loc, const YYLTYPE *binary_operator_loc);
+static rb_node_op_asgn_or_t *rb_node_op_asgn_or_new(struct parser_params *p, NODE *nd_head, NODE *nd_value, const YYLTYPE *loc);
+static rb_node_op_asgn_and_t *rb_node_op_asgn_and_new(struct parser_params *p, NODE *nd_head, NODE *nd_value, const YYLTYPE *loc);
+static rb_node_op_cdecl_t *rb_node_op_cdecl_new(struct parser_params *p, NODE *nd_head, NODE *nd_value, ID nd_aid, enum rb_parser_shareability shareability, const YYLTYPE *loc);
+static rb_node_call_t *rb_node_call_new(struct parser_params *p, NODE *nd_recv, ID nd_mid, NODE *nd_args, const YYLTYPE *loc);
+static rb_node_opcall_t *rb_node_opcall_new(struct parser_params *p, NODE *nd_recv, ID nd_mid, NODE *nd_args, const YYLTYPE *loc);
+static rb_node_fcall_t *rb_node_fcall_new(struct parser_params *p, ID nd_mid, NODE *nd_args, const YYLTYPE *loc);
+static rb_node_vcall_t *rb_node_vcall_new(struct parser_params *p, ID nd_mid, const YYLTYPE *loc);
+static rb_node_qcall_t *rb_node_qcall_new(struct parser_params *p, NODE *nd_recv, ID nd_mid, NODE *nd_args, const YYLTYPE *loc);
+static rb_node_super_t *rb_node_super_new(struct parser_params *p, NODE *nd_args, const YYLTYPE *loc, const YYLTYPE *keyword_loc, const YYLTYPE *lparen_loc, const YYLTYPE *rparen_loc);
+static rb_node_zsuper_t * rb_node_zsuper_new(struct parser_params *p, const YYLTYPE *loc);
+static rb_node_list_t *rb_node_list_new(struct parser_params *p, NODE *nd_head, const YYLTYPE *loc);
+static rb_node_list_t *rb_node_list_new2(struct parser_params *p, NODE *nd_head, long nd_alen, NODE *nd_next, const YYLTYPE *loc);
+static rb_node_zlist_t *rb_node_zlist_new(struct parser_params *p, const YYLTYPE *loc);
+static rb_node_hash_t *rb_node_hash_new(struct parser_params *p, NODE *nd_head, const YYLTYPE *loc);
+static rb_node_return_t *rb_node_return_new(struct parser_params *p, NODE *nd_stts, const YYLTYPE *loc, const YYLTYPE *keyword_loc);
+static rb_node_yield_t *rb_node_yield_new(struct parser_params *p, NODE *nd_head, const YYLTYPE *loc, const YYLTYPE *keyword_loc, const YYLTYPE *lparen_loc, const YYLTYPE *rparen_loc);
+static rb_node_lvar_t *rb_node_lvar_new(struct parser_params *p, ID nd_vid, const YYLTYPE *loc);
+static rb_node_dvar_t *rb_node_dvar_new(struct parser_params *p, ID nd_vid, const YYLTYPE *loc);
+static rb_node_gvar_t *rb_node_gvar_new(struct parser_params *p, ID nd_vid, const YYLTYPE *loc);
+static rb_node_ivar_t *rb_node_ivar_new(struct parser_params *p, ID nd_vid, const YYLTYPE *loc);
+static rb_node_const_t *rb_node_const_new(struct parser_params *p, ID nd_vid, const YYLTYPE *loc);
+static rb_node_cvar_t *rb_node_cvar_new(struct parser_params *p, ID nd_vid, const YYLTYPE *loc);
+static rb_node_nth_ref_t *rb_node_nth_ref_new(struct parser_params *p, long nd_nth, const YYLTYPE *loc);
+static rb_node_back_ref_t *rb_node_back_ref_new(struct parser_params *p, long nd_nth, const YYLTYPE *loc);
+static rb_node_match2_t *rb_node_match2_new(struct parser_params *p, NODE *nd_recv, NODE *nd_value, const YYLTYPE *loc);
+static rb_node_match3_t *rb_node_match3_new(struct parser_params *p, NODE *nd_recv, NODE *nd_value, const YYLTYPE *loc);
+static rb_node_integer_t * rb_node_integer_new(struct parser_params *p, char* val, int base, const YYLTYPE *loc);
+static rb_node_float_t * rb_node_float_new(struct parser_params *p, char* val, const YYLTYPE *loc);
+static rb_node_rational_t * rb_node_rational_new(struct parser_params *p, char* val, int base, int seen_point, const YYLTYPE *loc);
+static rb_node_imaginary_t * rb_node_imaginary_new(struct parser_params *p, char* val, int base, int seen_point, enum rb_numeric_type, const YYLTYPE *loc);
+static rb_node_str_t *rb_node_str_new(struct parser_params *p, rb_parser_string_t *string, const YYLTYPE *loc);
+static rb_node_dstr_t *rb_node_dstr_new0(struct parser_params *p, rb_parser_string_t *string, long nd_alen, NODE *nd_next, const YYLTYPE *loc);
+static rb_node_dstr_t *rb_node_dstr_new(struct parser_params *p, rb_parser_string_t *string, const YYLTYPE *loc);
+static rb_node_xstr_t *rb_node_xstr_new(struct parser_params *p, rb_parser_string_t *string, const YYLTYPE *loc);
+static rb_node_dxstr_t *rb_node_dxstr_new(struct parser_params *p, rb_parser_string_t *string, long nd_alen, NODE *nd_next, const YYLTYPE *loc);
+static rb_node_evstr_t *rb_node_evstr_new(struct parser_params *p, NODE *nd_body, const YYLTYPE *loc, const YYLTYPE *opening_loc, const YYLTYPE *closing_loc);
+static rb_node_regx_t *rb_node_regx_new(struct parser_params *p, rb_parser_string_t *string, int options, const YYLTYPE *loc, const YYLTYPE *opening_loc, const YYLTYPE *content_loc, const YYLTYPE *closing_loc);
+static rb_node_once_t *rb_node_once_new(struct parser_params *p, NODE *nd_body, const YYLTYPE *loc);
+static rb_node_args_t *rb_node_args_new(struct parser_params *p, const YYLTYPE *loc);
+static rb_node_args_aux_t *rb_node_args_aux_new(struct parser_params *p, ID nd_pid, int nd_plen, const YYLTYPE *loc);
+static rb_node_opt_arg_t *rb_node_opt_arg_new(struct parser_params *p, NODE *nd_body, const YYLTYPE *loc);
+static rb_node_kw_arg_t *rb_node_kw_arg_new(struct parser_params *p, NODE *nd_body, const YYLTYPE *loc);
+static rb_node_postarg_t *rb_node_postarg_new(struct parser_params *p, NODE *nd_1st, NODE *nd_2nd, const YYLTYPE *loc);
+static rb_node_argscat_t *rb_node_argscat_new(struct parser_params *p, NODE *nd_head, NODE *nd_body, const YYLTYPE *loc);
+static rb_node_argspush_t *rb_node_argspush_new(struct parser_params *p, NODE *nd_head, NODE *nd_body, const YYLTYPE *loc);
+static rb_node_splat_t *rb_node_splat_new(struct parser_params *p, NODE *nd_head, const YYLTYPE *loc, const YYLTYPE *operator_loc);
+static rb_node_block_pass_t *rb_node_block_pass_new(struct parser_params *p, NODE *nd_body, const YYLTYPE *loc, const YYLTYPE *operator_loc);
+static rb_node_defn_t *rb_node_defn_new(struct parser_params *p, ID nd_mid, NODE *nd_defn, const YYLTYPE *loc);
+static rb_node_defs_t *rb_node_defs_new(struct parser_params *p, NODE *nd_recv, ID nd_mid, NODE *nd_defn, const YYLTYPE *loc);
+static rb_node_alias_t *rb_node_alias_new(struct parser_params *p, NODE *nd_1st, NODE *nd_2nd, const YYLTYPE *loc, const YYLTYPE *keyword_loc);
+static rb_node_valias_t *rb_node_valias_new(struct parser_params *p, ID nd_alias, ID nd_orig, const YYLTYPE *loc, const YYLTYPE *keyword_loc);
+static rb_node_undef_t *rb_node_undef_new(struct parser_params *p, NODE *nd_undef, const YYLTYPE *loc);
+static rb_node_class_t *rb_node_class_new(struct parser_params *p, NODE *nd_cpath, NODE *nd_body, NODE *nd_super, const YYLTYPE *loc, const YYLTYPE *class_keyword_loc, const YYLTYPE *inheritance_operator_loc, const YYLTYPE *end_keyword_loc);
+static rb_node_module_t *rb_node_module_new(struct parser_params *p, NODE *nd_cpath, NODE *nd_body, const YYLTYPE *loc);
+static rb_node_sclass_t *rb_node_sclass_new(struct parser_params *p, NODE *nd_recv, NODE *nd_body, const YYLTYPE *loc);
+static rb_node_colon2_t *rb_node_colon2_new(struct parser_params *p, NODE *nd_head, ID nd_mid, const YYLTYPE *loc, const YYLTYPE *delimiter_loc, const YYLTYPE *name_loc);
+static rb_node_colon3_t *rb_node_colon3_new(struct parser_params *p, ID nd_mid, const YYLTYPE *loc, const YYLTYPE *delimiter_loc, const YYLTYPE *name_loc);
+static rb_node_dot2_t *rb_node_dot2_new(struct parser_params *p, NODE *nd_beg, NODE *nd_end, const YYLTYPE *loc, const YYLTYPE *operator_loc);
+static rb_node_dot3_t *rb_node_dot3_new(struct parser_params *p, NODE *nd_beg, NODE *nd_end, const YYLTYPE *loc, const YYLTYPE *operator_loc);
+static rb_node_self_t *rb_node_self_new(struct parser_params *p, const YYLTYPE *loc);
+static rb_node_nil_t *rb_node_nil_new(struct parser_params *p, const YYLTYPE *loc);
+static rb_node_true_t *rb_node_true_new(struct parser_params *p, const YYLTYPE *loc);
+static rb_node_false_t *rb_node_false_new(struct parser_params *p, const YYLTYPE *loc);
+static rb_node_errinfo_t *rb_node_errinfo_new(struct parser_params *p, const YYLTYPE *loc);
+static rb_node_defined_t *rb_node_defined_new(struct parser_params *p, NODE *nd_head, const YYLTYPE *loc);
+static rb_node_postexe_t *rb_node_postexe_new(struct parser_params *p, NODE *nd_body, const YYLTYPE *loc, const YYLTYPE *keyword_loc, const YYLTYPE *opening_loc, const YYLTYPE *closing_loc);
+static rb_node_sym_t *rb_node_sym_new(struct parser_params *p, VALUE str, const YYLTYPE *loc);
+static rb_node_dsym_t *rb_node_dsym_new(struct parser_params *p, rb_parser_string_t *string, long nd_alen, NODE *nd_next, const YYLTYPE *loc);
+static rb_node_attrasgn_t *rb_node_attrasgn_new(struct parser_params *p, NODE *nd_recv, ID nd_mid, NODE *nd_args, const YYLTYPE *loc);
+static rb_node_lambda_t *rb_node_lambda_new(struct parser_params *p, rb_node_args_t *nd_args, NODE *nd_body, const YYLTYPE *loc, const YYLTYPE *operator_loc, const YYLTYPE *opening_loc, const YYLTYPE *closing_loc);
+static rb_node_aryptn_t *rb_node_aryptn_new(struct parser_params *p, NODE *pre_args, NODE *rest_arg, NODE *post_args, const YYLTYPE *loc);
+static rb_node_hshptn_t *rb_node_hshptn_new(struct parser_params *p, NODE *nd_pconst, NODE *nd_pkwargs, NODE *nd_pkwrestarg, const YYLTYPE *loc);
+static rb_node_fndptn_t *rb_node_fndptn_new(struct parser_params *p, NODE *pre_rest_arg, NODE *args, NODE *post_rest_arg, const YYLTYPE *loc);
+static rb_node_line_t *rb_node_line_new(struct parser_params *p, const YYLTYPE *loc);
+static rb_node_file_t *rb_node_file_new(struct parser_params *p, VALUE str, const YYLTYPE *loc);
+static rb_node_error_t *rb_node_error_new(struct parser_params *p, const YYLTYPE *loc);
+
+#define NEW_SCOPE(a,b,loc) (NODE *)rb_node_scope_new(p,a,b,loc)
+#define NEW_SCOPE2(t,a,b,loc) (NODE *)rb_node_scope_new2(p,t,a,b,loc)
+#define NEW_BLOCK(a,loc) (NODE *)rb_node_block_new(p,a,loc)
+#define NEW_IF(c,t,e,loc,ik_loc,tk_loc,ek_loc) (NODE *)rb_node_if_new(p,c,t,e,loc,ik_loc,tk_loc,ek_loc)
+#define NEW_UNLESS(c,t,e,loc,k_loc,t_loc,e_loc) (NODE *)rb_node_unless_new(p,c,t,e,loc,k_loc,t_loc,e_loc)
+#define NEW_CASE(h,b,loc,ck_loc,ek_loc) (NODE *)rb_node_case_new(p,h,b,loc,ck_loc,ek_loc)
+#define NEW_CASE2(b,loc,ck_loc,ek_loc) (NODE *)rb_node_case2_new(p,b,loc,ck_loc,ek_loc)
+#define NEW_CASE3(h,b,loc,ck_loc,ek_loc) (NODE *)rb_node_case3_new(p,h,b,loc,ck_loc,ek_loc)
+#define NEW_WHEN(c,t,e,loc,k_loc,t_loc) (NODE *)rb_node_when_new(p,c,t,e,loc,k_loc,t_loc)
+#define NEW_IN(c,t,e,loc) (NODE *)rb_node_in_new(p,c,t,e,loc)
+#define NEW_WHILE(c,b,n,loc,k_loc,c_loc) (NODE *)rb_node_while_new(p,c,b,n,loc,k_loc,c_loc)
+#define NEW_UNTIL(c,b,n,loc,k_loc,c_loc) (NODE *)rb_node_until_new(p,c,b,n,loc,k_loc,c_loc)
+#define NEW_ITER(a,b,loc) (NODE *)rb_node_iter_new(p,a,b,loc)
+#define NEW_FOR(i,b,loc,f_loc,i_loc,d_loc,e_loc) (NODE *)rb_node_for_new(p,i,b,loc,f_loc,i_loc,d_loc,e_loc)
+#define NEW_FOR_MASGN(v,loc) (NODE *)rb_node_for_masgn_new(p,v,loc)
+#define NEW_RETRY(loc) (NODE *)rb_node_retry_new(p,loc)
+#define NEW_BEGIN(b,loc) (NODE *)rb_node_begin_new(p,b,loc)
+#define NEW_RESCUE(b,res,e,loc) (NODE *)rb_node_rescue_new(p,b,res,e,loc)
+#define NEW_RESBODY(a,v,ex,n,loc) (NODE *)rb_node_resbody_new(p,a,v,ex,n,loc)
+#define NEW_ENSURE(b,en,loc) (NODE *)rb_node_ensure_new(p,b,en,loc)
+#define NEW_AND(f,s,loc,op_loc) (NODE *)rb_node_and_new(p,f,s,loc,op_loc)
+#define NEW_OR(f,s,loc,op_loc) (NODE *)rb_node_or_new(p,f,s,loc,op_loc)
+#define NEW_MASGN(l,r,loc)   rb_node_masgn_new(p,l,r,loc)
+#define NEW_LASGN(v,val,loc) (NODE *)rb_node_lasgn_new(p,v,val,loc)
+#define NEW_DASGN(v,val,loc) (NODE *)rb_node_dasgn_new(p,v,val,loc)
+#define NEW_GASGN(v,val,loc) (NODE *)rb_node_gasgn_new(p,v,val,loc)
+#define NEW_IASGN(v,val,loc) (NODE *)rb_node_iasgn_new(p,v,val,loc)
+#define NEW_CDECL(v,val,path,share,loc) (NODE *)rb_node_cdecl_new(p,v,val,path,share,loc)
+#define NEW_CVASGN(v,val,loc) (NODE *)rb_node_cvasgn_new(p,v,val,loc)
+#define NEW_OP_ASGN1(r,id,idx,rval,loc,c_op_loc,o_loc,c_loc,b_op_loc) (NODE *)rb_node_op_asgn1_new(p,r,id,idx,rval,loc,c_op_loc,o_loc,c_loc,b_op_loc)
+#define NEW_OP_ASGN2(r,t,i,o,val,loc,c_op_loc,m_loc,b_op_loc) (NODE *)rb_node_op_asgn2_new(p,r,val,i,o,t,loc,c_op_loc,m_loc,b_op_loc)
+#define NEW_OP_ASGN_OR(i,val,loc) (NODE *)rb_node_op_asgn_or_new(p,i,val,loc)
+#define NEW_OP_ASGN_AND(i,val,loc) (NODE *)rb_node_op_asgn_and_new(p,i,val,loc)
+#define NEW_OP_CDECL(v,op,val,share,loc) (NODE *)rb_node_op_cdecl_new(p,v,val,op,share,loc)
+#define NEW_CALL(r,m,a,loc) (NODE *)rb_node_call_new(p,r,m,a,loc)
+#define NEW_OPCALL(r,m,a,loc) (NODE *)rb_node_opcall_new(p,r,m,a,loc)
+#define NEW_FCALL(m,a,loc) rb_node_fcall_new(p,m,a,loc)
+#define NEW_VCALL(m,loc) (NODE *)rb_node_vcall_new(p,m,loc)
+#define NEW_QCALL0(r,m,a,loc) (NODE *)rb_node_qcall_new(p,r,m,a,loc)
+#define NEW_SUPER(a,loc,k_loc,l_loc,r_loc) (NODE *)rb_node_super_new(p,a,loc,k_loc,l_loc,r_loc)
+#define NEW_ZSUPER(loc) (NODE *)rb_node_zsuper_new(p,loc)
+#define NEW_LIST(a,loc) (NODE *)rb_node_list_new(p,a,loc)
+#define NEW_LIST2(h,l,n,loc) (NODE *)rb_node_list_new2(p,h,l,n,loc)
+#define NEW_ZLIST(loc) (NODE *)rb_node_zlist_new(p,loc)
+#define NEW_HASH(a,loc) (NODE *)rb_node_hash_new(p,a,loc)
+#define NEW_RETURN(s,loc,k_loc) (NODE *)rb_node_return_new(p,s,loc,k_loc)
+#define NEW_YIELD(a,loc,k_loc,l_loc,r_loc) (NODE *)rb_node_yield_new(p,a,loc,k_loc,l_loc,r_loc)
+#define NEW_LVAR(v,loc) (NODE *)rb_node_lvar_new(p,v,loc)
+#define NEW_DVAR(v,loc) (NODE *)rb_node_dvar_new(p,v,loc)
+#define NEW_GVAR(v,loc) (NODE *)rb_node_gvar_new(p,v,loc)
+#define NEW_IVAR(v,loc) (NODE *)rb_node_ivar_new(p,v,loc)
+#define NEW_CONST(v,loc) (NODE *)rb_node_const_new(p,v,loc)
+#define NEW_CVAR(v,loc) (NODE *)rb_node_cvar_new(p,v,loc)
+#define NEW_NTH_REF(n,loc)  (NODE *)rb_node_nth_ref_new(p,n,loc)
+#define NEW_BACK_REF(n,loc) (NODE *)rb_node_back_ref_new(p,n,loc)
+#define NEW_MATCH2(n1,n2,loc) (NODE *)rb_node_match2_new(p,n1,n2,loc)
+#define NEW_MATCH3(r,n2,loc) (NODE *)rb_node_match3_new(p,r,n2,loc)
+#define NEW_INTEGER(val, base,loc) (NODE *)rb_node_integer_new(p,val,base,loc)
+#define NEW_FLOAT(val,loc) (NODE *)rb_node_float_new(p,val,loc)
+#define NEW_RATIONAL(val,base,seen_point,loc) (NODE *)rb_node_rational_new(p,val,base,seen_point,loc)
+#define NEW_IMAGINARY(val,base,seen_point,numeric_type,loc) (NODE *)rb_node_imaginary_new(p,val,base,seen_point,numeric_type,loc)
+#define NEW_STR(s,loc) (NODE *)rb_node_str_new(p,s,loc)
+#define NEW_DSTR0(s,l,n,loc) (NODE *)rb_node_dstr_new0(p,s,l,n,loc)
+#define NEW_DSTR(s,loc) (NODE *)rb_node_dstr_new(p,s,loc)
+#define NEW_XSTR(s,loc) (NODE *)rb_node_xstr_new(p,s,loc)
+#define NEW_DXSTR(s,l,n,loc) (NODE *)rb_node_dxstr_new(p,s,l,n,loc)
+#define NEW_EVSTR(n,loc,o_loc,c_loc) (NODE *)rb_node_evstr_new(p,n,loc,o_loc,c_loc)
+#define NEW_REGX(str,opts,loc,o_loc,ct_loc,c_loc) (NODE *)rb_node_regx_new(p,str,opts,loc,o_loc,ct_loc,c_loc)
+#define NEW_ONCE(b,loc) (NODE *)rb_node_once_new(p,b,loc)
+#define NEW_ARGS(loc) rb_node_args_new(p,loc)
+#define NEW_ARGS_AUX(r,b,loc) rb_node_args_aux_new(p,r,b,loc)
+#define NEW_OPT_ARG(v,loc) rb_node_opt_arg_new(p,v,loc)
+#define NEW_KW_ARG(v,loc) rb_node_kw_arg_new(p,v,loc)
+#define NEW_POSTARG(i,v,loc) (NODE *)rb_node_postarg_new(p,i,v,loc)
+#define NEW_ARGSCAT(a,b,loc) (NODE *)rb_node_argscat_new(p,a,b,loc)
+#define NEW_ARGSPUSH(a,b,loc) (NODE *)rb_node_argspush_new(p,a,b,loc)
+#define NEW_SPLAT(a,loc,op_loc) (NODE *)rb_node_splat_new(p,a,loc,op_loc)
+#define NEW_BLOCK_PASS(b,loc,o_loc) rb_node_block_pass_new(p,b,loc,o_loc)
+#define NEW_DEFN(i,s,loc) (NODE *)rb_node_defn_new(p,i,s,loc)
+#define NEW_DEFS(r,i,s,loc) (NODE *)rb_node_defs_new(p,r,i,s,loc)
+#define NEW_ALIAS(n,o,loc,k_loc) (NODE *)rb_node_alias_new(p,n,o,loc,k_loc)
+#define NEW_VALIAS(n,o,loc,k_loc) (NODE *)rb_node_valias_new(p,n,o,loc,k_loc)
+#define NEW_UNDEF(i,loc) (NODE *)rb_node_undef_new(p,i,loc)
+#define NEW_CLASS(n,b,s,loc,ck_loc,io_loc,ek_loc) (NODE *)rb_node_class_new(p,n,b,s,loc,ck_loc,io_loc,ek_loc)
+#define NEW_MODULE(n,b,loc) (NODE *)rb_node_module_new(p,n,b,loc)
+#define NEW_SCLASS(r,b,loc) (NODE *)rb_node_sclass_new(p,r,b,loc)
+#define NEW_COLON2(c,i,loc,d_loc,n_loc) (NODE *)rb_node_colon2_new(p,c,i,loc,d_loc,n_loc)
+#define NEW_COLON3(i,loc,d_loc,n_loc) (NODE *)rb_node_colon3_new(p,i,loc,d_loc,n_loc)
+#define NEW_DOT2(b,e,loc,op_loc) (NODE *)rb_node_dot2_new(p,b,e,loc,op_loc)
+#define NEW_DOT3(b,e,loc,op_loc) (NODE *)rb_node_dot3_new(p,b,e,loc,op_loc)
+#define NEW_SELF(loc) (NODE *)rb_node_self_new(p,loc)
+#define NEW_NIL(loc) (NODE *)rb_node_nil_new(p,loc)
+#define NEW_TRUE(loc) (NODE *)rb_node_true_new(p,loc)
+#define NEW_FALSE(loc) (NODE *)rb_node_false_new(p,loc)
+#define NEW_ERRINFO(loc) (NODE *)rb_node_errinfo_new(p,loc)
+#define NEW_DEFINED(e,loc) (NODE *)rb_node_defined_new(p,e,loc)
+#define NEW_POSTEXE(b,loc,k_loc,o_loc,c_loc) (NODE *)rb_node_postexe_new(p,b,loc,k_loc,o_loc,c_loc)
+#define NEW_SYM(str,loc) (NODE *)rb_node_sym_new(p,str,loc)
+#define NEW_DSYM(s,l,n,loc) (NODE *)rb_node_dsym_new(p,s,l,n,loc)
+#define NEW_ATTRASGN(r,m,a,loc) (NODE *)rb_node_attrasgn_new(p,r,m,a,loc)
+#define NEW_LAMBDA(a,b,loc,op_loc,o_loc,c_loc) (NODE *)rb_node_lambda_new(p,a,b,loc,op_loc,o_loc,c_loc)
+#define NEW_ARYPTN(pre,r,post,loc) (NODE *)rb_node_aryptn_new(p,pre,r,post,loc)
+#define NEW_HSHPTN(c,kw,kwrest,loc) (NODE *)rb_node_hshptn_new(p,c,kw,kwrest,loc)
+#define NEW_FNDPTN(pre,a,post,loc) (NODE *)rb_node_fndptn_new(p,pre,a,post,loc)
+#define NEW_LINE(loc) (NODE *)rb_node_line_new(p,loc)
+#define NEW_FILE(str,loc) (NODE *)rb_node_file_new(p,str,loc)
+#define NEW_ENCODING(loc) (NODE *)rb_node_encoding_new(p,loc)
+#define NEW_ERROR(loc) (NODE *)rb_node_error_new(p,loc)
+
+enum internal_node_type {
+    NODE_INTERNAL_ONLY = NODE_LAST,
+    NODE_DEF_TEMP,
+    NODE_EXITS,
+    NODE_INTERNAL_LAST
+};
+
+static const char *
+parser_node_name(int node)
 {
-    if (!SPECIAL_CONST_P(obj)
-        && !RB_TYPE_P(obj, T_NODE) /* Ripper jumbles NODE objects and other objects... */
-    ) {
-        rb_ast_add_mark_object(p->ast, obj);
+    switch (node) {
+      case NODE_DEF_TEMP:
+        return "NODE_DEF_TEMP";
+      case NODE_EXITS:
+        return "NODE_EXITS";
+      default:
+        return ruby_node_name(node);
     }
-    return obj;
 }
-#else
-static NODE* node_newnode_with_locals(struct parser_params *, enum node_type, VALUE, VALUE, const rb_code_location_t*);
-#endif
 
-static NODE* node_newnode(struct parser_params *, enum node_type, VALUE, VALUE, VALUE, const rb_code_location_t*);
-#define rb_node_newnode(type, a1, a2, a3, loc) node_newnode(p, (type), (a1), (a2), (a3), (loc))
+/* This node is parse.y internal */
+struct RNode_DEF_TEMP {
+    NODE node;
 
-/* Make a new temporal node, which should not be appeared in the
+    /* for NODE_DEFN/NODE_DEFS */
+
+    struct RNode *nd_def;
+    ID nd_mid;
+
+    struct {
+        int max_numparam;
+        NODE *numparam_save;
+        struct lex_context ctxt;
+    } save;
+};
+
+#define RNODE_DEF_TEMP(node) ((struct RNode_DEF_TEMP *)(node))
+
+static rb_node_break_t *rb_node_break_new(struct parser_params *p, NODE *nd_stts, const YYLTYPE *loc, const YYLTYPE *keyword_loc);
+static rb_node_next_t *rb_node_next_new(struct parser_params *p, NODE *nd_stts, const YYLTYPE *loc, const YYLTYPE *keyword_loc);
+static rb_node_redo_t *rb_node_redo_new(struct parser_params *p, const YYLTYPE *loc, const YYLTYPE *keyword_loc);
+static rb_node_def_temp_t *rb_node_def_temp_new(struct parser_params *p, const YYLTYPE *loc);
+static rb_node_def_temp_t *def_head_save(struct parser_params *p, rb_node_def_temp_t *n);
+
+#define NEW_BREAK(s,loc,k_loc) (NODE *)rb_node_break_new(p,s,loc,k_loc)
+#define NEW_NEXT(s,loc,k_loc) (NODE *)rb_node_next_new(p,s,loc,k_loc)
+#define NEW_REDO(loc,k_loc) (NODE *)rb_node_redo_new(p,loc,k_loc)
+#define NEW_DEF_TEMP(loc) rb_node_def_temp_new(p,loc)
+
+/* Make a new internal node, which should not be appeared in the
  * result AST and does not have node_id and location. */
-static NODE* node_new_temporal(struct parser_params *p, enum node_type type, VALUE a0, VALUE a1, VALUE a2);
-#define NODE_NEW_TEMPORAL(t,a0,a1,a2) node_new_temporal(p, (t),(VALUE)(a0),(VALUE)(a1),(VALUE)(a2))
+static NODE* node_new_internal(struct parser_params *p, enum node_type type, size_t size, size_t alignment);
+#define NODE_NEW_INTERNAL(ndtype, type) (type *)node_new_internal(p, (enum node_type)(ndtype), sizeof(type), RUBY_ALIGNOF(type))
 
 static NODE *nd_set_loc(NODE *nd, const YYLTYPE *loc);
 
@@ -894,11 +1345,10 @@ static void
 anddot_multiple_assignment_check(struct parser_params* p, const YYLTYPE *loc, ID id)
 {
     if (id == tANDDOT) {
-	yyerror1(loc, "&. inside multiple assignment destination");
+        yyerror1(loc, "&. inside multiple assignment destination");
     }
 }
 
-#ifndef RIPPER
 static inline void
 set_line_body(NODE *body, int line)
 {
@@ -913,18 +1363,37 @@ set_line_body(NODE *body, int line)
 static void
 set_embraced_location(NODE *node, const rb_code_location_t *beg, const rb_code_location_t *end)
 {
-    node->nd_body->nd_loc = code_loc_gen(beg, end);
+    RNODE_ITER(node)->nd_body->nd_loc = code_loc_gen(beg, end);
     nd_set_line(node, beg->end_pos.lineno);
 }
 
+static NODE *
+last_expr_node(NODE *expr)
+{
+    while (expr) {
+        if (nd_type_p(expr, NODE_BLOCK)) {
+            expr = RNODE_BLOCK(RNODE_BLOCK(expr)->nd_end)->nd_head;
+        }
+        else if (nd_type_p(expr, NODE_BEGIN) && RNODE_BEGIN(expr)->nd_body) {
+            expr = RNODE_BEGIN(expr)->nd_body;
+        }
+        else {
+            break;
+        }
+    }
+    return expr;
+}
+
+#ifndef RIPPER
 #define yyparse ruby_yyparse
+#endif
 
 static NODE* cond(struct parser_params *p, NODE *node, const YYLTYPE *loc);
 static NODE* method_cond(struct parser_params *p, NODE *node, const YYLTYPE *loc);
 #define new_nil(loc) NEW_NIL(loc)
 static NODE *new_nil_at(struct parser_params *p, const rb_code_position_t *pos);
-static NODE *new_if(struct parser_params*,NODE*,NODE*,NODE*,const YYLTYPE*);
-static NODE *new_unless(struct parser_params*,NODE*,NODE*,NODE*,const YYLTYPE*);
+static NODE *new_if(struct parser_params*,NODE*,NODE*,NODE*,const YYLTYPE*,const YYLTYPE*,const YYLTYPE*,const YYLTYPE*);
+static NODE *new_unless(struct parser_params*,NODE*,NODE*,NODE*,const YYLTYPE*,const YYLTYPE*,const YYLTYPE*,const YYLTYPE*);
 static NODE *logop(struct parser_params*,ID,NODE*,NODE*,const YYLTYPE*,const YYLTYPE*);
 
 static NODE *newline_node(NODE*);
@@ -933,7 +1402,6 @@ static void fixpos(NODE*,NODE*);
 static int value_expr_gen(struct parser_params*,NODE*);
 static void void_expr(struct parser_params*,NODE*);
 static NODE *remove_begin(NODE*);
-static NODE *remove_begin_all(NODE*);
 #define value_expr(node) value_expr_gen(p, (node))
 static NODE *void_stmts(struct parser_params*,NODE*);
 static void reduce_nodes(struct parser_params*,NODE**);
@@ -946,8 +1414,9 @@ static NODE *arg_append(struct parser_params*,NODE*,NODE*,const YYLTYPE*);
 static NODE *last_arg_append(struct parser_params *p, NODE *args, NODE *last_arg, const YYLTYPE *loc);
 static NODE *rest_arg_append(struct parser_params *p, NODE *args, NODE *rest_arg, const YYLTYPE *loc);
 static NODE *literal_concat(struct parser_params*,NODE*,NODE*,const YYLTYPE*);
-static NODE *new_evstr(struct parser_params*,NODE*,const YYLTYPE*);
+static NODE *new_evstr(struct parser_params*,NODE*,const YYLTYPE*,const YYLTYPE*,const YYLTYPE*);
 static NODE *new_dstr(struct parser_params*,NODE*,const YYLTYPE*);
+static NODE *str2dstr(struct parser_params*,NODE*);
 static NODE *evstr2dstr(struct parser_params*,NODE*);
 static NODE *splat_array(NODE*);
 static void mark_lvar_used(struct parser_params *p, NODE *rhs);
@@ -956,11 +1425,11 @@ static NODE *call_bin_op(struct parser_params*,NODE*,ID,NODE*,const YYLTYPE*,con
 static NODE *call_uni_op(struct parser_params*,NODE*,ID,const YYLTYPE*,const YYLTYPE*);
 static NODE *new_qcall(struct parser_params* p, ID atype, NODE *recv, ID mid, NODE *args, const YYLTYPE *op_loc, const YYLTYPE *loc);
 static NODE *new_command_qcall(struct parser_params* p, ID atype, NODE *recv, ID mid, NODE *args, NODE *block, const YYLTYPE *op_loc, const YYLTYPE *loc);
-static NODE *method_add_block(struct parser_params*p, NODE *m, NODE *b, const YYLTYPE *loc) {b->nd_iter = m; b->nd_loc = *loc; return b;}
+static NODE *method_add_block(struct parser_params*p, NODE *m, NODE *b, const YYLTYPE *loc) {RNODE_ITER(b)->nd_iter = m; b->nd_loc = *loc; return b;}
 
 static bool args_info_empty_p(struct rb_args_info *args);
-static NODE *new_args(struct parser_params*,NODE*,NODE*,ID,NODE*,NODE*,const YYLTYPE*);
-static NODE *new_args_tail(struct parser_params*,NODE*,ID,ID,const YYLTYPE*);
+static rb_node_args_t *new_args(struct parser_params*,rb_node_args_aux_t*,rb_node_opt_arg_t*,ID,rb_node_args_aux_t*,rb_node_args_t*,const YYLTYPE*);
+static rb_node_args_t *new_args_tail(struct parser_params*,rb_node_kw_arg_t*,ID,ID,const YYLTYPE*);
 static NODE *new_array_pattern(struct parser_params *p, NODE *constant, NODE *pre_arg, NODE *aryptn, const YYLTYPE *loc);
 static NODE *new_array_pattern_tail(struct parser_params *p, NODE *pre_args, int has_rest, NODE *rest_arg, NODE *post_args, const YYLTYPE *loc);
 static NODE *new_find_pattern(struct parser_params *p, NODE *constant, NODE *fndptn, const YYLTYPE *loc);
@@ -968,13 +1437,13 @@ static NODE *new_find_pattern_tail(struct parser_params *p, NODE *pre_rest_arg,
 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_kw_arg(struct parser_params *p, NODE *k, const YYLTYPE *loc);
-static NODE *args_with_numbered(struct parser_params*,NODE*,int);
+static rb_node_kw_arg_t *new_kw_arg(struct parser_params *p, NODE *k, const YYLTYPE *loc);
+static rb_node_args_t *args_with_numbered(struct parser_params*,rb_node_args_t*,int,ID);
 
-static VALUE negate_lit(struct parser_params*, VALUE);
+static NODE* negate_lit(struct parser_params*, NODE*);
+static void no_blockarg(struct parser_params*,NODE*);
 static NODE *ret_args(struct parser_params*,NODE*);
-static NODE *arg_blk_pass(NODE*,NODE*);
-static NODE *new_yield(struct parser_params*,NODE*,const YYLTYPE*);
+static NODE *arg_blk_pass(NODE*,rb_node_block_pass_t*);
 static NODE *dsym_node(struct parser_params*,NODE*,const YYLTYPE*);
 
 static NODE *gettable(struct parser_params*,ID,const YYLTYPE*);
@@ -983,26 +1452,26 @@ static NODE *assignable(struct parser_params*,ID,NODE*,const YYLTYPE*);
 static NODE *aryset(struct parser_params*,NODE*,NODE*,const YYLTYPE*);
 static NODE *attrset(struct parser_params*,NODE*,ID,ID,const YYLTYPE*);
 
-static void rb_backref_error(struct parser_params*,NODE*);
+static VALUE rb_backref_error(struct parser_params*,NODE*);
 static NODE *node_assign(struct parser_params*,NODE*,NODE*,struct lex_context,const YYLTYPE*);
 
 static NODE *new_op_assign(struct parser_params *p, NODE *lhs, ID op, NODE *rhs, struct lex_context, const YYLTYPE *loc);
-static NODE *new_ary_op_assign(struct parser_params *p, NODE *ary, NODE *args, ID op, NODE *rhs, const YYLTYPE *args_loc, const YYLTYPE *loc);
-static NODE *new_attr_op_assign(struct parser_params *p, NODE *lhs, ID atype, ID attr, ID op, NODE *rhs, const YYLTYPE *loc);
+static NODE *new_ary_op_assign(struct parser_params *p, NODE *ary, NODE *args, ID op, NODE *rhs, const YYLTYPE *args_loc, const YYLTYPE *loc, const YYLTYPE *call_operator_loc, const YYLTYPE *opening_loc, const YYLTYPE *closing_loc, const YYLTYPE *binary_operator_loc);
+static NODE *new_attr_op_assign(struct parser_params *p, NODE *lhs, ID atype, ID attr, ID op, NODE *rhs, const YYLTYPE *loc, const YYLTYPE *call_operator_loc, const YYLTYPE *message_loc, const YYLTYPE *binary_operator_loc);
 static NODE *new_const_op_assign(struct parser_params *p, NODE *lhs, ID op, NODE *rhs, struct lex_context, const YYLTYPE *loc);
 static NODE *new_bodystmt(struct parser_params *p, NODE *head, NODE *rescue, NODE *rescue_else, NODE *ensure, const YYLTYPE *loc);
 
 static NODE *const_decl(struct parser_params *p, NODE* path, const YYLTYPE *loc);
 
-static NODE *opt_arg_append(NODE*, NODE*);
-static NODE *kwd_append(NODE*, NODE*);
+static rb_node_opt_arg_t *opt_arg_append(rb_node_opt_arg_t*, rb_node_opt_arg_t*);
+static rb_node_kw_arg_t *kwd_append(rb_node_kw_arg_t*, rb_node_kw_arg_t*);
 
 static NODE *new_hash(struct parser_params *p, NODE *hash, const YYLTYPE *loc);
 static NODE *new_unique_key_hash(struct parser_params *p, NODE *hash, const YYLTYPE *loc);
 
 static NODE *new_defined(struct parser_params *p, NODE *expr, const YYLTYPE *loc);
 
-static NODE *new_regexp(struct parser_params *, NODE *, int, const YYLTYPE *);
+static NODE *new_regexp(struct parser_params *, NODE *, int, const YYLTYPE *, const YYLTYPE *, const YYLTYPE *, const YYLTYPE *);
 
 #define make_list(list, loc) ((list) ? (nd_set_loc(list, loc), list) : NEW_ZLIST(loc))
 
@@ -1014,86 +1483,26 @@ static NODE *match_op(struct parser_params*,NODE*,NODE*,const YYLTYPE*,const YYL
 
 static rb_ast_id_table_t *local_tbl(struct parser_params*);
 
-static VALUE reg_compile(struct parser_params*, VALUE, int);
-static void reg_fragment_setenc(struct parser_params*, VALUE, int);
-static int reg_fragment_check(struct parser_params*, VALUE, int);
+static VALUE reg_compile(struct parser_params*, rb_parser_string_t*, int);
+static void reg_fragment_setenc(struct parser_params*, rb_parser_string_t*, int);
 
-static int literal_concat0(struct parser_params *p, VALUE head, VALUE tail);
+static int literal_concat0(struct parser_params *p, rb_parser_string_t *head, rb_parser_string_t *tail);
 static NODE *heredoc_dedent(struct parser_params*,NODE*);
 
 static void check_literal_when(struct parser_params *p, NODE *args, const YYLTYPE *loc);
 
-#define get_id(id) (id)
-#define get_value(val) (val)
-#define get_num(num) (num)
-#else  /* RIPPER */
-#define NODE_RIPPER NODE_CDECL
-#define NEW_RIPPER(a,b,c,loc) (VALUE)NEW_CDECL(a,b,c,loc)
-#define NODE_RIPPER2 NODE_OP_CDECL
-#define NEW_RIPPER2(a,b,c,loc) (VALUE)NEW_OP_CDECL(a,c,b,loc)
-
-static inline int ripper_is_node_yylval(struct parser_params *p, VALUE n);
-
-static inline VALUE
-ripper_new_yylval(struct parser_params *p, ID a, VALUE b, VALUE c)
-{
-    if (ripper_is_node_yylval(p, c)) c = RNODE(c)->nd_cval;
-    add_mark_object(p, b);
-    add_mark_object(p, c);
-    return NEW_RIPPER(a, b, c, &NULL_LOC);
-}
-
-static inline VALUE
-ripper_new_yylval2(struct parser_params *p, VALUE a, VALUE b, VALUE c)
-{
-    add_mark_object(p, a);
-    add_mark_object(p, b);
-    add_mark_object(p, c);
-    return NEW_RIPPER2(a, b, c, &NULL_LOC);
-}
-
-static inline int
-ripper_is_node_yylval(struct parser_params *p, VALUE n)
-{
-    return RB_TYPE_P(n, T_NODE) && nd_type_p(RNODE(n), NODE_RIPPER);
-}
-
-#define value_expr(node) ((void)(node))
-#define remove_begin(node) (node)
-#define void_stmts(p,x) (x)
-#undef rb_dvar_defined
-#define rb_dvar_defined(id, base) 0
-#undef rb_local_defined
-#define rb_local_defined(id, base) 0
-#define get_id(id) ripper_get_id(id)
-#define get_value(val) ripper_get_value(val)
-#define get_num(num) (int)get_id(num)
-static VALUE assignable(struct parser_params*,VALUE);
-static int id_is_var(struct parser_params *p, ID id);
-
-#define method_cond(p,node,loc) (node)
-#define call_bin_op(p, recv,id,arg1,op_loc,loc) dispatch3(binary, (recv), STATIC_ID2SYM(id), (arg1))
-#define match_op(p,node1,node2,op_loc,loc) call_bin_op(0, (node1), idEqTilde, (node2), op_loc, loc)
-#define call_uni_op(p, recv,id,op_loc,loc) dispatch2(unary, STATIC_ID2SYM(id), (recv))
-#define logop(p,id,node1,node2,op_loc,loc) call_bin_op(0, (node1), (id), (node2), op_loc, loc)
-
-#define new_nil(loc) Qnil
-
-static VALUE new_regexp(struct parser_params *, VALUE, VALUE, const YYLTYPE *);
-
-static VALUE const_decl(struct parser_params *p, VALUE path);
+static rb_locations_lambda_body_t* new_locations_lambda_body(struct parser_params *p, NODE *node, const YYLTYPE *loc, const YYLTYPE *opening_loc, const YYLTYPE *closing_loc);
 
-static VALUE var_field(struct parser_params *p, VALUE a);
+#ifdef RIPPER
+#define get_value(idx) (rb_ary_entry(p->s_value_stack, idx))
+#define set_value(val) (p->s_lvalue = val)
 static VALUE assign_error(struct parser_params *p, const char *mesg, VALUE a);
-
-static VALUE parser_reg_compile(struct parser_params*, VALUE, int, VALUE *);
-
-static VALUE backref_error(struct parser_params*, NODE *, VALUE);
-#endif /* !RIPPER */
+static int id_is_var(struct parser_params *p, ID id);
+#endif
 
 RUBY_SYMBOL_EXPORT_BEGIN
 VALUE rb_parser_reg_compile(struct parser_params* p, VALUE str, int options);
-int rb_reg_fragment_setenc(struct parser_params*, VALUE, int);
+int rb_reg_fragment_setenc(struct parser_params*, rb_parser_string_t *, int);
 enum lex_state_e rb_parser_trace_lex_state(struct parser_params *, enum lex_state_e, enum lex_state_e, int);
 VALUE rb_parser_lex_state_name(struct parser_params *p, enum lex_state_e state);
 void rb_parser_show_bitstack(struct parser_params *, stack_type, const char *, int);
@@ -1104,15 +1513,13 @@ YYLTYPE *rb_parser_set_location_of_heredoc_end(struct parser_params *p, YYLTYPE
 YYLTYPE *rb_parser_set_location_of_dummy_end(struct parser_params *p, YYLTYPE *yylloc);
 YYLTYPE *rb_parser_set_location_of_none(struct parser_params *p, YYLTYPE *yylloc);
 YYLTYPE *rb_parser_set_location(struct parser_params *p, YYLTYPE *yylloc);
+void ruby_show_error_line(struct parser_params *p, VALUE errbuf, const YYLTYPE *yylloc, int lineno, rb_parser_string_t *str);
 RUBY_SYMBOL_EXPORT_END
 
+static void flush_string_content(struct parser_params *p, rb_encoding *enc, size_t back);
 static void error_duplicate_pattern_variable(struct parser_params *p, ID id, const YYLTYPE *loc);
 static void error_duplicate_pattern_key(struct parser_params *p, ID id, const YYLTYPE *loc);
-#ifndef RIPPER
-static ID formal_argument(struct parser_params*, ID);
-#else
-static ID formal_argument(struct parser_params*, VALUE);
-#endif
+static VALUE formal_argument_error(struct parser_params*, ID);
 static ID shadowing_lvar(struct parser_params*,ID);
 static void new_bv(struct parser_params*,ID);
 
@@ -1122,19 +1529,20 @@ static void local_var(struct parser_params*, ID);
 static void arg_var(struct parser_params*, ID);
 static int  local_id(struct parser_params *p, ID id);
 static int  local_id_ref(struct parser_params*, ID, ID **);
-#ifndef RIPPER
-static ID   internal_id(struct parser_params*);
+#define internal_id rb_parser_internal_id
+ID internal_id(struct parser_params*);
 static NODE *new_args_forward_call(struct parser_params*, NODE*, const YYLTYPE*, const YYLTYPE*);
-#endif
 static int check_forwarding_args(struct parser_params*);
 static void add_forwarding_args(struct parser_params *p);
+static void forwarding_arg_check(struct parser_params *p, ID arg, ID all, const char *var);
 
 static const struct vtable *dyna_push(struct parser_params *);
 static void dyna_pop(struct parser_params*, const struct vtable *);
 static int dyna_in_block(struct parser_params*);
 #define dyna_var(p, id) local_var(p, id)
 static int dvar_defined(struct parser_params*, ID);
-static int dvar_defined_ref(struct parser_params*, ID, ID**);
+#define dvar_defined_ref rb_parser_dvar_defined_ref
+int dvar_defined_ref(struct parser_params*, ID, ID**);
 static int dvar_curr(struct parser_params*,ID);
 
 static int lvar_defined(struct parser_params*, ID);
@@ -1142,23 +1550,17 @@ static int lvar_defined(struct parser_params*, ID);
 static NODE *numparam_push(struct parser_params *p);
 static void numparam_pop(struct parser_params *p, NODE *prev_inner);
 
-#ifdef RIPPER
-# define METHOD_NOT idNOT
-#else
-# define METHOD_NOT '!'
-#endif
+#define METHOD_NOT '!'
 
 #define idFWD_REST   '*'
 #define idFWD_KWREST idPow /* Use simple "**", as tDSTAR is "**arg" */
 #define idFWD_BLOCK  '&'
 #define idFWD_ALL    idDot3
-#ifdef RIPPER
-#define arg_FWD_BLOCK Qnone
-#else
 #define arg_FWD_BLOCK idFWD_BLOCK
-#endif
-#define FORWARD_ARGS_WITH_RUBY2_KEYWORDS
 
+#define RE_ONIG_OPTION_IGNORECASE 1
+#define RE_ONIG_OPTION_EXTEND     (RE_ONIG_OPTION_IGNORECASE<<1)
+#define RE_ONIG_OPTION_MULTILINE  (RE_ONIG_OPTION_EXTEND<<1)
 #define RE_OPTION_ONCE (1<<16)
 #define RE_OPTION_ENCODING_SHIFT 8
 #define RE_OPTION_ENCODING(e) (((e)&0xff)<<RE_OPTION_ENCODING_SHIFT)
@@ -1167,8 +1569,11 @@ static void numparam_pop(struct parser_params *p, NODE *prev_inner);
 #define RE_OPTION_MASK  0xff
 #define RE_OPTION_ARG_ENCODING_NONE 32
 
+#define CHECK_LITERAL_WHEN (st_table *)1
+#define CASE_LABELS_ENABLED_P(case_labels) (case_labels && case_labels != CHECK_LITERAL_WHEN)
+
 #define yytnamerr(yyres, yystr) (YYSIZE_T)rb_yytnamerr(p, yyres, yystr)
-size_t rb_yytnamerr(struct parser_params *p, char *yyres, const char *yystr);
+RUBY_FUNC_EXPORTED size_t rb_yytnamerr(struct parser_params *p, char *yyres, const char *yystr);
 
 #define TOKEN2ID(tok) ( \
     tTOKEN_LOCAL_BEGIN<(tok)&&(tok)<tTOKEN_LOCAL_END ? TOKEN2LOCALID(tok) : \
@@ -1197,55 +1602,19 @@ static VALUE ripper_dispatch5(struct parser_params*,ID,VALUE,VALUE,VALUE,VALUE,V
 static VALUE ripper_dispatch7(struct parser_params*,ID,VALUE,VALUE,VALUE,VALUE,VALUE,VALUE,VALUE);
 void ripper_error(struct parser_params *p);
 
-#define dispatch0(n)            ripper_dispatch0(p, TOKEN_PASTE(ripper_id_, n))
-#define dispatch1(n,a)          ripper_dispatch1(p, TOKEN_PASTE(ripper_id_, n), (a))
-#define dispatch2(n,a,b)        ripper_dispatch2(p, TOKEN_PASTE(ripper_id_, n), (a), (b))
-#define dispatch3(n,a,b,c)      ripper_dispatch3(p, TOKEN_PASTE(ripper_id_, n), (a), (b), (c))
-#define dispatch4(n,a,b,c,d)    ripper_dispatch4(p, TOKEN_PASTE(ripper_id_, n), (a), (b), (c), (d))
-#define dispatch5(n,a,b,c,d,e)  ripper_dispatch5(p, TOKEN_PASTE(ripper_id_, n), (a), (b), (c), (d), (e))
-#define dispatch7(n,a,b,c,d,e,f,g) ripper_dispatch7(p, TOKEN_PASTE(ripper_id_, n), (a), (b), (c), (d), (e), (f), (g))
+#define dispatch0(n)            ripper_dispatch0(p, RIPPER_ID(n))
+#define dispatch1(n,a)          ripper_dispatch1(p, RIPPER_ID(n), (a))
+#define dispatch2(n,a,b)        ripper_dispatch2(p, RIPPER_ID(n), (a), (b))
+#define dispatch3(n,a,b,c)      ripper_dispatch3(p, RIPPER_ID(n), (a), (b), (c))
+#define dispatch4(n,a,b,c,d)    ripper_dispatch4(p, RIPPER_ID(n), (a), (b), (c), (d))
+#define dispatch5(n,a,b,c,d,e)  ripper_dispatch5(p, RIPPER_ID(n), (a), (b), (c), (d), (e))
+#define dispatch7(n,a,b,c,d,e,f,g) ripper_dispatch7(p, RIPPER_ID(n), (a), (b), (c), (d), (e), (f), (g))
 
 #define yyparse ripper_yyparse
 
-#define ID2VAL(id) STATIC_ID2SYM(id)
-#define TOKEN2VAL(t) ID2VAL(TOKEN2ID(t))
-#define KWD2EID(t, v) ripper_new_yylval(p, keyword_##t, get_value(v), 0)
-
-#define params_new(pars, opts, rest, pars2, kws, kwrest, blk) \
-        dispatch7(params, (pars), (opts), (rest), (pars2), (kws), (kwrest), (blk))
-
-#define escape_Qundef(x) ((x)==Qundef ? Qnil : (x))
-
-static inline VALUE
-new_args(struct parser_params *p, VALUE pre_args, VALUE opt_args, VALUE rest_arg, VALUE post_args, VALUE tail, YYLTYPE *loc)
-{
-    NODE *t = (NODE *)tail;
-    VALUE kw_args = t->u1.value, kw_rest_arg = t->u2.value, block = t->u3.value;
-    return params_new(pre_args, opt_args, rest_arg, post_args, kw_args, kw_rest_arg, escape_Qundef(block));
-}
-
-static inline VALUE
-new_args_tail(struct parser_params *p, VALUE kw_args, VALUE kw_rest_arg, VALUE block, YYLTYPE *loc)
-{
-    NODE *t = rb_node_newnode(NODE_ARGS_AUX, kw_args, kw_rest_arg, block, &NULL_LOC);
-    add_mark_object(p, kw_args);
-    add_mark_object(p, kw_rest_arg);
-    add_mark_object(p, block);
-    return (VALUE)t;
-}
-
-static inline VALUE
-args_with_numbered(struct parser_params *p, VALUE args, int max_numparam)
-{
-    return args;
-}
-
 static VALUE
-new_array_pattern(struct parser_params *p, VALUE constant, VALUE pre_arg, VALUE aryptn, const YYLTYPE *loc)
+aryptn_pre_args(struct parser_params *p, VALUE pre_arg, VALUE pre_args)
 {
-    NODE *t = (NODE *)aryptn;
-    VALUE pre_args = t->u1.value, rest_arg = t->u2.value, post_args = t->u3.value;
-
     if (!NIL_P(pre_arg)) {
         if (!NIL_P(pre_args)) {
             rb_ary_unshift(pre_args, pre_arg);
@@ -1254,75 +1623,22 @@ new_array_pattern(struct parser_params *p, VALUE constant, VALUE pre_arg, VALUE
             pre_args = rb_ary_new_from_args(1, pre_arg);
         }
     }
-    return dispatch4(aryptn, constant, pre_args, rest_arg, post_args);
-}
-
-static VALUE
-new_array_pattern_tail(struct parser_params *p, VALUE pre_args, VALUE has_rest, VALUE rest_arg, VALUE post_args, const YYLTYPE *loc)
-{
-    return ripper_new_yylval2(p, pre_args, rest_arg, post_args);
-}
-
-static VALUE
-new_find_pattern(struct parser_params *p, VALUE constant, VALUE fndptn, const YYLTYPE *loc)
-{
-    NODE *t = (NODE *)fndptn;
-    VALUE pre_rest_arg = t->u1.value, args = t->u2.value, post_rest_arg = t->u3.value;
-
-    return dispatch4(fndptn, constant, pre_rest_arg, args, post_rest_arg);
-}
-
-static VALUE
-new_find_pattern_tail(struct parser_params *p, VALUE pre_rest_arg, VALUE args, VALUE post_rest_arg, const YYLTYPE *loc)
-{
-    return ripper_new_yylval2(p, pre_rest_arg, args, post_rest_arg);
-}
-
-#define new_hash(p,h,l) rb_ary_new_from_args(0)
-
-static VALUE
-new_unique_key_hash(struct parser_params *p, VALUE ary, const YYLTYPE *loc)
-{
-    return ary;
-}
-
-static VALUE
-new_hash_pattern(struct parser_params *p, VALUE constant, VALUE hshptn, const YYLTYPE *loc)
-{
-    NODE *t = (NODE *)hshptn;
-    VALUE kw_args = t->u1.value, kw_rest_arg = t->u2.value;
-    return dispatch3(hshptn, constant, kw_args, kw_rest_arg);
-}
-
-static VALUE
-new_hash_pattern_tail(struct parser_params *p, VALUE kw_args, VALUE kw_rest_arg, const YYLTYPE *loc)
-{
-    if (kw_rest_arg) {
-        kw_rest_arg = dispatch1(var_field, kw_rest_arg);
-    }
-    else {
-        kw_rest_arg = Qnil;
-    }
-    return ripper_new_yylval2(p, kw_args, kw_rest_arg, Qnil);
+    return pre_args;
 }
 
-#define new_defined(p,expr,loc) dispatch1(defined, (expr))
-
-static VALUE heredoc_dedent(struct parser_params*,VALUE);
+#define ID2VAL(id) STATIC_ID2SYM(id)
+#define TOKEN2VAL(t) ID2VAL(TOKEN2ID(t))
+#endif /* RIPPER */
 
-#else
-#define ID2VAL(id) (id)
-#define TOKEN2VAL(t) ID2VAL(t)
 #define KWD2EID(t, v) keyword_##t
 
 static NODE *
-set_defun_body(struct parser_params *p, NODE *n, NODE *args, NODE *body, const YYLTYPE *loc)
+new_scope_body(struct parser_params *p, rb_node_args_t *args, NODE *body, const YYLTYPE *loc)
 {
     body = remove_begin(body);
     reduce_nodes(p, &body);
-    n->nd_defn = NEW_SCOPE(args, body, loc);
-    n->nd_loc = *loc;
-    nd_set_line(n->nd_defn, loc->end_pos.lineno);
+    NODE *n = NEW_SCOPE(args, body, loc);
+    nd_set_line(n, loc->end_pos.lineno);
     set_line_body(body, loc->beg_pos.lineno);
     return n;
 }
@@ -1332,32 +1648,39 @@ rescued_expr(struct parser_params *p, NODE *arg, NODE *rescue,
              const YYLTYPE *arg_loc, const YYLTYPE *mod_loc, const YYLTYPE *res_loc)
 {
     YYLTYPE loc = code_loc_gen(mod_loc, res_loc);
-    rescue = NEW_RESBODY(0, remove_begin(rescue), 0, &loc);
+    rescue = NEW_RESBODY(0, 0, remove_begin(rescue), 0, &loc);
     loc.beg_pos = arg_loc->beg_pos;
     return NEW_RESCUE(arg, rescue, 0, &loc);
 }
 
-#endif /* RIPPER */
+static NODE *add_block_exit(struct parser_params *p, NODE *node);
+static rb_node_exits_t *init_block_exit(struct parser_params *p);
+static rb_node_exits_t *allow_block_exit(struct parser_params *p);
+static void restore_block_exit(struct parser_params *p, rb_node_exits_t *exits);
+static void clear_block_exit(struct parser_params *p, bool error);
 
 static void
-restore_defun(struct parser_params *p, NODE *name)
+next_rescue_context(struct lex_context *next, const struct lex_context *outer, enum rescue_context def)
 {
-    NODE *save = name->nd_next;
-    YYSTYPE c = {.val = save->nd_cval};
-    p->cur_arg = name->nd_vid;
-    p->ctxt.in_def = c.ctxt.in_def;
-    p->ctxt.shareable_constant_value = c.ctxt.shareable_constant_value;
-    p->max_numparam = (int)save->nd_nth;
-    numparam_pop(p, save->nd_head);
+    next->in_rescue = outer->in_rescue == after_rescue ? after_rescue : def;
 }
 
 static void
-endless_method_name(struct parser_params *p, NODE *defn, const YYLTYPE *loc)
+restore_defun(struct parser_params *p, rb_node_def_temp_t *temp)
+{
+    /* See: def_name action */
+    struct lex_context ctxt = temp->save.ctxt;
+    p->ctxt.in_def = ctxt.in_def;
+    p->ctxt.shareable_constant_value = ctxt.shareable_constant_value;
+    p->ctxt.in_rescue = ctxt.in_rescue;
+    p->max_numparam = temp->save.max_numparam;
+    numparam_pop(p, temp->save.numparam_save);
+    clear_block_exit(p, true);
+}
+
+static void
+endless_method_name(struct parser_params *p, ID mid, const YYLTYPE *loc)
 {
-#ifdef RIPPER
-    defn = defn->nd_defn;
-#endif
-    ID mid = defn->nd_mid;
     if (is_attrset_id(mid)) {
         yyerror1(loc, "setter method cannot be defined in an endless method definition");
     }
@@ -1374,14 +1697,29 @@ endless_method_name(struct parser_params *p, NODE *defn, const YYLTYPE *loc)
         } \
     } while (0)
 
+#define begin_definition(k, loc_beg, loc_end) \
+    do { \
+        if (!(p->ctxt.in_class = (k)[0] != 0)) { \
+            /* singleton class */ \
+            p->ctxt.cant_return = !p->ctxt.in_def; \
+            p->ctxt.in_def = 0; \
+        } \
+        else if (p->ctxt.in_def) { \
+            YYLTYPE loc = code_loc_gen(loc_beg, loc_end); \
+            yyerror1(&loc, k " definition in method body"); \
+        } \
+        else { \
+            p->ctxt.cant_return = 1; \
+        } \
+        local_push(p, 0); \
+    } while (0)
+
 #ifndef RIPPER
-# define Qnone 0
-# define Qnull 0
 # define ifndef_ripper(x) (x)
+# define ifdef_ripper(r,x) (x)
 #else
-# define Qnone Qnil
-# define Qnull Qundef
 # define ifndef_ripper(x)
+# define ifdef_ripper(r,x) (r)
 #endif
 
 # define rb_warn0(fmt)         WARN_CALL(WARN_ARGS(fmt, 1))
@@ -1411,9 +1749,7 @@ extern const ID id_warn, id_warning, id_gets, id_assoc;
 # define WARN_S(s) STR_NEW2(s)
 # define WARN_I(i) INT2NUM(i)
 # define WARN_ID(i) rb_id2str(i)
-# define WARN_IVAL(i) i
-# define PRIsWARN "s"
-# define rb_warn0L_experimental(l,fmt)         WARN_CALL(WARN_ARGS_L(l, fmt, 1))
+# define PRIsWARN PRIsVALUE
 # define WARN_ARGS(fmt,n) p->value, id_warn, n, rb_usascii_str_new_lit(fmt)
 # define WARN_ARGS_L(l,fmt,n) WARN_ARGS(fmt,n)
 # ifdef HAVE_VA_ARGS_MACRO
@@ -1434,9188 +1770,10641 @@ extern const ID id_warn, id_warning, id_gets, id_assoc;
 # define WARN_S(s) s
 # define WARN_I(i) i
 # define WARN_ID(i) rb_id2name(i)
-# define WARN_IVAL(i) NUM2INT(i)
 # define PRIsWARN PRIsVALUE
 # define WARN_ARGS(fmt,n) WARN_ARGS_L(p->ruby_sourceline,fmt,n)
 # define WARN_ARGS_L(l,fmt,n) p->ruby_sourcefile, (l), (fmt)
 # define WARN_CALL rb_compile_warn
-# define rb_warn0L_experimental(l,fmt) rb_category_compile_warn(RB_WARN_CATEGORY_EXPERIMENTAL, WARN_ARGS_L(l, fmt, 1))
 # define WARNING_ARGS(fmt,n) WARN_ARGS(fmt,n)
 # define WARNING_ARGS_L(l,fmt,n) WARN_ARGS_L(l,fmt,n)
 # define WARNING_CALL rb_compile_warning
-PRINTF_ARGS(static void parser_compile_error(struct parser_params*, const char *fmt, ...), 2, 3);
-# define compile_error parser_compile_error
+PRINTF_ARGS(static void parser_compile_error(struct parser_params*, const rb_code_location_t *loc, const char *fmt, ...), 3, 4);
+# define compile_error(p, ...) parser_compile_error(p, NULL, __VA_ARGS__)
 #endif
 
+#define RNODE_EXITS(node) ((rb_node_exits_t*)(node))
+
+static NODE *
+add_block_exit(struct parser_params *p, NODE *node)
+{
+    if (!node) {
+        compile_error(p, "unexpected null node");
+        return 0;
+    }
+    switch (nd_type(node)) {
+      case NODE_BREAK: case NODE_NEXT: case NODE_REDO: break;
+      default:
+        compile_error(p, "add_block_exit: unexpected node: %s", parser_node_name(nd_type(node)));
+        return node;
+    }
+    if (!p->ctxt.in_defined) {
+        rb_node_exits_t *exits = p->exits;
+        if (exits) {
+            RNODE_EXITS(exits->nd_stts)->nd_chain = node;
+            exits->nd_stts = node;
+        }
+    }
+    return node;
+}
+
+static rb_node_exits_t *
+init_block_exit(struct parser_params *p)
+{
+    rb_node_exits_t *old = p->exits;
+    rb_node_exits_t *exits = NODE_NEW_INTERNAL(NODE_EXITS, rb_node_exits_t);
+    exits->nd_chain = 0;
+    exits->nd_stts = RNODE(exits);
+    p->exits = exits;
+    return old;
+}
+
+static rb_node_exits_t *
+allow_block_exit(struct parser_params *p)
+{
+    rb_node_exits_t *exits = p->exits;
+    p->exits = 0;
+    return exits;
+}
+
+static void
+restore_block_exit(struct parser_params *p, rb_node_exits_t *exits)
+{
+    p->exits = exits;
+}
+
+static void
+clear_block_exit(struct parser_params *p, bool error)
+{
+    rb_node_exits_t *exits = p->exits;
+    if (!exits) return;
+    if (error) {
+        for (NODE *e = RNODE(exits); (e = RNODE_EXITS(e)->nd_chain) != 0; ) {
+            switch (nd_type(e)) {
+              case NODE_BREAK:
+                yyerror1(&e->nd_loc, "Invalid break");
+                break;
+              case NODE_NEXT:
+                yyerror1(&e->nd_loc, "Invalid next");
+                break;
+              case NODE_REDO:
+                yyerror1(&e->nd_loc, "Invalid redo");
+                break;
+              default:
+                yyerror1(&e->nd_loc, "unexpected node");
+                goto end_checks; /* no nd_chain */
+            }
+        }
+      end_checks:;
+    }
+    exits->nd_stts = RNODE(exits);
+    exits->nd_chain = 0;
+}
+
 #define WARN_EOL(tok) \
     (looking_at_eol_p(p) ? \
-     (void)rb_warning0("`" tok "' at the end of line without an expression") : \
+     (void)rb_warning0("'" tok "' at the end of line without an expression") : \
      (void)0)
 static int looking_at_eol_p(struct parser_params *p);
-%}
 
-%expect 0
-%define api.pure
-%define parse.error verbose
-%printer {
-#ifndef RIPPER
-    if ($$ == (NODE *)-1) {
-        rb_parser_printf(p, "NODE_SPECIAL");
+static NODE *
+get_nd_value(struct parser_params *p, NODE *node)
+{
+    switch (nd_type(node)) {
+      case NODE_GASGN:
+        return RNODE_GASGN(node)->nd_value;
+      case NODE_IASGN:
+        return RNODE_IASGN(node)->nd_value;
+      case NODE_LASGN:
+        return RNODE_LASGN(node)->nd_value;
+      case NODE_DASGN:
+        return RNODE_DASGN(node)->nd_value;
+      case NODE_MASGN:
+        return RNODE_MASGN(node)->nd_value;
+      case NODE_CVASGN:
+        return RNODE_CVASGN(node)->nd_value;
+      case NODE_CDECL:
+        return RNODE_CDECL(node)->nd_value;
+      default:
+        compile_error(p, "get_nd_value: unexpected node: %s", parser_node_name(nd_type(node)));
+        return 0;
     }
-    else if ($$) {
-        rb_parser_printf(p, "%s", ruby_node_name(nd_type($$)));
+}
+
+static void
+set_nd_value(struct parser_params *p, NODE *node, NODE *rhs)
+{
+    switch (nd_type(node)) {
+      case NODE_CDECL:
+        RNODE_CDECL(node)->nd_value = rhs;
+        break;
+      case NODE_GASGN:
+        RNODE_GASGN(node)->nd_value = rhs;
+        break;
+      case NODE_IASGN:
+        RNODE_IASGN(node)->nd_value = rhs;
+        break;
+      case NODE_LASGN:
+        RNODE_LASGN(node)->nd_value = rhs;
+        break;
+      case NODE_DASGN:
+        RNODE_DASGN(node)->nd_value = rhs;
+        break;
+      case NODE_MASGN:
+        RNODE_MASGN(node)->nd_value = rhs;
+        break;
+      case NODE_CVASGN:
+        RNODE_CVASGN(node)->nd_value = rhs;
+        break;
+      default:
+        compile_error(p, "set_nd_value: unexpected node: %s", parser_node_name(nd_type(node)));
+        break;
     }
-#else
-#endif
-} <node>
-%printer {
-#ifndef RIPPER
-    rb_parser_printf(p, "%"PRIsVALUE, rb_id2str($$));
-#else
-    rb_parser_printf(p, "%"PRIsVALUE, RNODE($$)->nd_rval);
-#endif
-} tIDENTIFIER tFID tGVAR tIVAR tCONSTANT tCVAR tLABEL tOP_ASGN
-%printer {
-#ifndef RIPPER
-    rb_parser_printf(p, "%+"PRIsVALUE, $$->nd_lit);
-#else
-    rb_parser_printf(p, "%+"PRIsVALUE, get_value($$));
-#endif
-} tINTEGER tFLOAT tRATIONAL tIMAGINARY tSTRING_CONTENT tCHAR
-%printer {
-#ifndef RIPPER
-    rb_parser_printf(p, "$%ld", $$->nd_nth);
-#else
-    rb_parser_printf(p, "%"PRIsVALUE, $$);
-#endif
-} tNTH_REF
-%printer {
+}
+
+static ID
+get_nd_vid(struct parser_params *p, NODE *node)
+{
+    switch (nd_type(node)) {
+      case NODE_CDECL:
+        return RNODE_CDECL(node)->nd_vid;
+      case NODE_GASGN:
+        return RNODE_GASGN(node)->nd_vid;
+      case NODE_IASGN:
+        return RNODE_IASGN(node)->nd_vid;
+      case NODE_LASGN:
+        return RNODE_LASGN(node)->nd_vid;
+      case NODE_DASGN:
+        return RNODE_DASGN(node)->nd_vid;
+      case NODE_CVASGN:
+        return RNODE_CVASGN(node)->nd_vid;
+      default:
+        compile_error(p, "get_nd_vid: unexpected node: %s", parser_node_name(nd_type(node)));
+        return 0;
+    }
+}
+
+static NODE *
+get_nd_args(struct parser_params *p, NODE *node)
+{
+    switch (nd_type(node)) {
+      case NODE_CALL:
+        return RNODE_CALL(node)->nd_args;
+      case NODE_OPCALL:
+        return RNODE_OPCALL(node)->nd_args;
+      case NODE_FCALL:
+        return RNODE_FCALL(node)->nd_args;
+      case NODE_QCALL:
+        return RNODE_QCALL(node)->nd_args;
+      case NODE_SUPER:
+        return RNODE_SUPER(node)->nd_args;
+      case NODE_VCALL:
+      case NODE_ZSUPER:
+      case NODE_YIELD:
+      case NODE_RETURN:
+      case NODE_BREAK:
+      case NODE_NEXT:
+        return 0;
+      default:
+        compile_error(p, "get_nd_args: unexpected node: %s", parser_node_name(nd_type(node)));
+        return 0;
+    }
+}
+
+static st_index_t
+djb2(const uint8_t *str, size_t len)
+{
+    st_index_t hash = 5381;
+
+    for (size_t i = 0; i < len; i++) {
+        hash = ((hash << 5) + hash) + str[i];
+    }
+
+    return hash;
+}
+
+static st_index_t
+parser_memhash(const void *ptr, long len)
+{
+    return djb2(ptr, len);
+}
+
+#define PARSER_STRING_PTR(str) (str->ptr)
+#define PARSER_STRING_LEN(str) (str->len)
+#define PARSER_STRING_END(str) (&str->ptr[str->len])
+#define STRING_SIZE(str) ((size_t)str->len + 1)
+#define STRING_TERM_LEN(str) (1)
+#define STRING_TERM_FILL(str) (str->ptr[str->len] = '\0')
+#define PARSER_STRING_RESIZE_CAPA_TERM(p,str,capacity,termlen) do {\
+    SIZED_REALLOC_N(str->ptr, char, (size_t)total + termlen, STRING_SIZE(str)); \
+    str->len = total; \
+} while (0)
+#define STRING_SET_LEN(str, n) do { \
+    (str)->len = (n); \
+} while (0)
+#define PARSER_STRING_GETMEM(str, ptrvar, lenvar) \
+    ((ptrvar) = str->ptr,                            \
+     (lenvar) = str->len)
+
+static inline int
+parser_string_char_at_end(struct parser_params *p, rb_parser_string_t *str, int when_empty)
+{
+    return PARSER_STRING_LEN(str) > 0 ? (unsigned char)PARSER_STRING_END(str)[-1] : when_empty;
+}
+
+static rb_parser_string_t *
+rb_parser_string_new(rb_parser_t *p, const char *ptr, long len)
+{
+    rb_parser_string_t *str;
+
+    if (len < 0) {
+        rb_bug("negative string size (or size too big): %ld", len);
+    }
+
+    str = xcalloc(1, sizeof(rb_parser_string_t));
+    str->ptr = xcalloc(len + 1, sizeof(char));
+
+    if (ptr) {
+        memcpy(PARSER_STRING_PTR(str), ptr, len);
+    }
+    STRING_SET_LEN(str, len);
+    STRING_TERM_FILL(str);
+    return str;
+}
+
+static rb_parser_string_t *
+rb_parser_encoding_string_new(rb_parser_t *p, const char *ptr, long len, rb_encoding *enc)
+{
+    rb_parser_string_t *str = rb_parser_string_new(p, ptr, len);
+    str->coderange = RB_PARSER_ENC_CODERANGE_UNKNOWN;
+    str->enc = enc;
+    return str;
+}
+
 #ifndef RIPPER
-    rb_parser_printf(p, "$%c", (int)$$->nd_nth);
-#else
-    rb_parser_printf(p, "%"PRIsVALUE, $$);
+rb_parser_string_t *
+rb_str_to_parser_string(rb_parser_t *p, VALUE str)
+{
+    /* Type check */
+    rb_parser_string_t *ret = rb_parser_encoding_string_new(p, RSTRING_PTR(str), RSTRING_LEN(str), rb_enc_get(str));
+    RB_GC_GUARD(str);
+    return ret;
+}
+
+void
+rb_parser_string_free(rb_parser_t *p, rb_parser_string_t *str)
+{
+    if (!str) return;
+    xfree(PARSER_STRING_PTR(str));
+    xfree(str);
+}
 #endif
-} tBACK_REF
 
-%lex-param {struct parser_params *p}
-%parse-param {struct parser_params *p}
-%initial-action
+static st_index_t
+rb_parser_str_hash(rb_parser_string_t *str)
 {
-    RUBY_SET_YYLLOC_OF_NONE(@$);
-};
+    return parser_memhash((const void *)PARSER_STRING_PTR(str), PARSER_STRING_LEN(str));
+}
 
-%union {
-    VALUE val;
-    NODE *node;
-    ID id;
-    int num;
-    st_table *tbl;
-    const struct vtable *vars;
-    struct rb_strterm_struct *strterm;
-    struct lex_context ctxt;
+static st_index_t
+rb_char_p_hash(const char *c)
+{
+    return parser_memhash((const void *)c, strlen(c));
 }
 
-%token <id>
-        keyword_class        "`class'"
-        keyword_module       "`module'"
-        keyword_def          "`def'"
-        keyword_undef        "`undef'"
-        keyword_begin        "`begin'"
-        keyword_rescue       "`rescue'"
-        keyword_ensure       "`ensure'"
-        keyword_end          "`end'"
-        keyword_if           "`if'"
-        keyword_unless       "`unless'"
-        keyword_then         "`then'"
-        keyword_elsif        "`elsif'"
-        keyword_else         "`else'"
-        keyword_case         "`case'"
-        keyword_when         "`when'"
-        keyword_while        "`while'"
-        keyword_until        "`until'"
-        keyword_for          "`for'"
-        keyword_break        "`break'"
-        keyword_next         "`next'"
-        keyword_redo         "`redo'"
-        keyword_retry        "`retry'"
-        keyword_in           "`in'"
-        keyword_do           "`do'"
-        keyword_do_cond      "`do' for condition"
-        keyword_do_block     "`do' for block"
-        keyword_do_LAMBDA    "`do' for lambda"
-        keyword_return       "`return'"
-        keyword_yield        "`yield'"
-        keyword_super        "`super'"
-        keyword_self         "`self'"
-        keyword_nil          "`nil'"
-        keyword_true         "`true'"
-        keyword_false        "`false'"
-        keyword_and          "`and'"
-        keyword_or           "`or'"
-        keyword_not          "`not'"
-        modifier_if          "`if' modifier"
-        modifier_unless      "`unless' modifier"
-        modifier_while       "`while' modifier"
-        modifier_until       "`until' modifier"
-        modifier_rescue      "`rescue' modifier"
-        keyword_alias        "`alias'"
-        keyword_defined      "`defined?'"
-        keyword_BEGIN        "`BEGIN'"
-        keyword_END          "`END'"
-        keyword__LINE__      "`__LINE__'"
-        keyword__FILE__      "`__FILE__'"
-        keyword__ENCODING__  "`__ENCODING__'"
+static size_t
+rb_parser_str_capacity(rb_parser_string_t *str, const int termlen)
+{
+    return PARSER_STRING_LEN(str);
+}
 
-%token <id>   tIDENTIFIER    "local variable or method"
-%token <id>   tFID           "method"
-%token <id>   tGVAR          "global variable"
-%token <id>   tIVAR          "instance variable"
-%token <id>   tCONSTANT      "constant"
-%token <id>   tCVAR          "class variable"
-%token <id>   tLABEL         "label"
-%token <node> tINTEGER       "integer literal"
-%token <node> tFLOAT         "float literal"
-%token <node> tRATIONAL      "rational literal"
-%token <node> tIMAGINARY     "imaginary literal"
-%token <node> tCHAR          "char literal"
-%token <node> tNTH_REF       "numbered reference"
-%token <node> tBACK_REF      "back reference"
-%token <node> tSTRING_CONTENT "literal content"
-%token <num>  tREGEXP_END
-%token <num>  tDUMNY_END     "dummy end"
-
-%type <node> singleton strings string string1 xstring regexp
-%type <node> string_contents xstring_contents regexp_contents string_content
-%type <node> words symbols symbol_list qwords qsymbols word_list qword_list qsym_list word
-%type <node> literal numeric simple_numeric ssym dsym symbol cpath def_name defn_head defs_head
-%type <node> top_compstmt top_stmts top_stmt begin_block endless_arg endless_command
-%type <node> bodystmt compstmt stmts stmt_or_begin stmt expr arg primary command command_call method_call
-%type <node> expr_value expr_value_do arg_value primary_value fcall rel_expr
-%type <node> if_tail opt_else case_body case_args cases opt_rescue exc_list exc_var opt_ensure
-%type <node> args call_args opt_call_args
-%type <node> paren_args opt_paren_args args_tail opt_args_tail block_args_tail opt_block_args_tail
-%type <node> command_args aref_args opt_block_arg block_arg var_ref var_lhs
-%type <node> command_rhs arg_rhs
-%type <node> command_asgn mrhs mrhs_arg superclass block_call block_command
-%type <node> f_block_optarg f_block_opt
-%type <node> f_arglist f_opt_paren_args f_paren_args f_args f_arg f_arg_item
-%type <node> f_optarg f_marg f_marg_list f_margs f_rest_marg
-%type <node> assoc_list assocs assoc undef_list backref string_dvar for_var
-%type <node> block_param opt_block_param block_param_def f_opt
-%type <node> f_kwarg f_kw f_block_kwarg f_block_kw
-%type <node> bv_decls opt_bv_decl bvar
-%type <node> lambda f_larglist lambda_body brace_body do_body
-%type <node> brace_block cmd_brace_block do_block lhs none fitem
-%type <node> mlhs mlhs_head mlhs_basic mlhs_item mlhs_node mlhs_post mlhs_inner
-%type <node> p_case_body p_cases p_top_expr p_top_expr_body
-%type <node> p_expr p_as p_alt p_expr_basic p_find
-%type <node> p_args p_args_head p_args_tail p_args_post p_arg p_rest
-%type <node> p_value p_primitive p_variable p_var_ref p_expr_ref p_const
-%type <node> p_kwargs p_kwarg p_kw
-%type <id>   keyword_variable user_variable sym operation operation2 operation3
-%type <id>   cname fname op f_rest_arg f_block_arg opt_f_block_arg f_norm_arg f_bad_arg
-%type <id>   f_kwrest f_label f_arg_asgn call_op call_op2 reswords relop dot_or_colon
-%type <id>   p_kwrest p_kwnorest p_any_kwrest p_kw_label
-%type <id>   f_no_kwarg f_any_kwrest args_forward excessed_comma nonlocal_var
- %type <ctxt> lex_ctxt /* keep <ctxt> in ripper */
-%token END_OF_INPUT 0	"end-of-input"
-%token <id> '.'
-/* escaped chars, should be ignored otherwise */
-%token <id> '\\'	"backslash"
-%token tSP		"escaped space"
-%token <id> '\t' 	"escaped horizontal tab"
-%token <id> '\f'	"escaped form feed"
-%token <id> '\r'	"escaped carriage return"
-%token <id> '\13'	"escaped vertical tab"
-%token tUPLUS		RUBY_TOKEN(UPLUS)  "unary+"
-%token tUMINUS		RUBY_TOKEN(UMINUS) "unary-"
-%token tPOW		RUBY_TOKEN(POW)    "**"
-%token tCMP		RUBY_TOKEN(CMP)    "<=>"
-%token tEQ		RUBY_TOKEN(EQ)     "=="
-%token tEQQ		RUBY_TOKEN(EQQ)    "==="
-%token tNEQ		RUBY_TOKEN(NEQ)    "!="
-%token tGEQ		RUBY_TOKEN(GEQ)    ">="
-%token tLEQ		RUBY_TOKEN(LEQ)    "<="
-%token tANDOP		RUBY_TOKEN(ANDOP)  "&&"
-%token tOROP		RUBY_TOKEN(OROP)   "||"
-%token tMATCH		RUBY_TOKEN(MATCH)  "=~"
-%token tNMATCH		RUBY_TOKEN(NMATCH) "!~"
-%token tDOT2		RUBY_TOKEN(DOT2)   ".."
-%token tDOT3		RUBY_TOKEN(DOT3)   "..."
-%token tBDOT2		RUBY_TOKEN(BDOT2)   "(.."
-%token tBDOT3		RUBY_TOKEN(BDOT3)   "(..."
-%token tAREF		RUBY_TOKEN(AREF)   "[]"
-%token tASET		RUBY_TOKEN(ASET)   "[]="
-%token tLSHFT		RUBY_TOKEN(LSHFT)  "<<"
-%token tRSHFT		RUBY_TOKEN(RSHFT)  ">>"
-%token <id> tANDDOT	RUBY_TOKEN(ANDDOT) "&."
-%token <id> tCOLON2	RUBY_TOKEN(COLON2) "::"
-%token tCOLON3		":: at EXPR_BEG"
-%token <id> tOP_ASGN	"operator-assignment" /* +=, -=  etc. */
-%token tASSOC		"=>"
-%token tLPAREN		"("
-%token tLPAREN_ARG	"( arg"
-%token tRPAREN		")"
-%token tLBRACK		"["
-%token tLBRACE		"{"
-%token tLBRACE_ARG	"{ arg"
-%token tSTAR		"*"
-%token tDSTAR		"**arg"
-%token tAMPER		"&"
-%token tLAMBDA		"->"
-%token tSYMBEG		"symbol literal"
-%token tSTRING_BEG	"string literal"
-%token tXSTRING_BEG	"backtick literal"
-%token tREGEXP_BEG	"regexp literal"
-%token tWORDS_BEG	"word list"
-%token tQWORDS_BEG	"verbatim word list"
-%token tSYMBOLS_BEG	"symbol list"
-%token tQSYMBOLS_BEG	"verbatim symbol list"
-%token tSTRING_END	"terminator"
-%token tSTRING_DEND	"'}'"
-%token tSTRING_DBEG tSTRING_DVAR tLAMBEG tLABEL_END
+#ifndef RIPPER
+static char *
+rb_parser_string_end(rb_parser_string_t *str)
+{
+    return &str->ptr[str->len];
+}
+#endif
 
-%token tIGNORED_NL tCOMMENT tEMBDOC_BEG tEMBDOC tEMBDOC_END
-%token tHEREDOC_BEG tHEREDOC_END k__END__
+static void
+rb_parser_string_set_encoding(rb_parser_string_t *str, rb_encoding *enc)
+{
+    str->enc = enc;
+}
 
-/*
- *	precedence table
- */
+static rb_encoding *
+rb_parser_str_get_encoding(rb_parser_string_t *str)
+{
+    return str->enc;
+}
 
-%nonassoc tLOWEST
-%nonassoc tLBRACE_ARG
+#ifndef RIPPER
+static bool
+PARSER_ENCODING_IS_ASCII8BIT(struct parser_params *p, rb_parser_string_t *str)
+{
+    return rb_parser_str_get_encoding(str) == rb_ascii8bit_encoding();
+}
+#endif
 
-%nonassoc  modifier_if modifier_unless modifier_while modifier_until keyword_in
-%left  keyword_or keyword_and
-%right keyword_not
-%nonassoc keyword_defined
-%right '=' tOP_ASGN
-%left modifier_rescue
-%right '?' ':'
-%nonassoc tDOT2 tDOT3 tBDOT2 tBDOT3
-%left  tOROP
-%left  tANDOP
-%nonassoc  tCMP tEQ tEQQ tNEQ tMATCH tNMATCH
-%left  '>' tGEQ '<' tLEQ
-%left  '|' '^'
-%left  '&'
-%left  tLSHFT tRSHFT
-%left  '+' '-'
-%left  '*' '/' '%'
-%right tUMINUS_NUM tUMINUS
-%right tPOW
-%right '!' '~' tUPLUS
+static int
+PARSER_ENC_CODERANGE(rb_parser_string_t *str)
+{
+    return str->coderange;
+}
 
-%token tLAST_TOKEN
+static void
+PARSER_ENC_CODERANGE_SET(rb_parser_string_t *str, int coderange)
+{
+    str->coderange = coderange;
+}
 
-%%
-program		:  {
-                        SET_LEX_STATE(EXPR_BEG);
-                        local_push(p, ifndef_ripper(1)+0);
-                    }
-                  top_compstmt
-                    {
-                    /*%%%*/
-                        if ($2 && !compile_for_eval) {
-                            NODE *node = $2;
-                            /* last expression should not be void */
-                            if (nd_type_p(node, NODE_BLOCK)) {
-                                while (node->nd_next) {
-                                    node = node->nd_next;
-                                }
-                                node = node->nd_head;
-                            }
-                            node = remove_begin(node);
-                            void_expr(p, node);
-                        }
-                        p->eval_tree = NEW_SCOPE(0, block_append(p, p->eval_tree, $2), &@$);
-                    /*% %*/
-                    /*% ripper[final]: program!($2) %*/
-                        local_pop(p);
-                    }
-                ;
+static void
+PARSER_ENCODING_CODERANGE_SET(rb_parser_string_t *str, rb_encoding *enc, enum rb_parser_string_coderange_type cr)
+{
+    rb_parser_string_set_encoding(str, enc);
+    PARSER_ENC_CODERANGE_SET(str, cr);
+}
 
-top_compstmt	: top_stmts opt_terms
-                    {
-                        $$ = void_stmts(p, $1);
-                    }
-                ;
+static void
+PARSER_ENC_CODERANGE_CLEAR(rb_parser_string_t *str)
+{
+    str->coderange = RB_PARSER_ENC_CODERANGE_UNKNOWN;
+}
 
-top_stmts	: none
-                    {
-                    /*%%%*/
-                        $$ = NEW_BEGIN(0, &@$);
-                    /*% %*/
-                    /*% ripper: stmts_add!(stmts_new!, void_stmt!) %*/
-                    }
-                | top_stmt
-                    {
-                    /*%%%*/
-                        $$ = newline_node($1);
-                    /*% %*/
-                    /*% ripper: stmts_add!(stmts_new!, $1) %*/
-                    }
-                | top_stmts terms top_stmt
-                    {
-                    /*%%%*/
-                        $$ = block_append(p, $1, newline_node($3));
-                    /*% %*/
-                    /*% ripper: stmts_add!($1, $3) %*/
-                    }
-                ;
+static bool
+PARSER_ENC_CODERANGE_ASCIIONLY(rb_parser_string_t *str)
+{
+    return PARSER_ENC_CODERANGE(str) == RB_PARSER_ENC_CODERANGE_7BIT;
+}
 
-top_stmt	: stmt
-                | keyword_BEGIN begin_block
-                    {
-                        $$ = $2;
-                    }
-                ;
+static bool
+PARSER_ENC_CODERANGE_CLEAN_P(int cr)
+{
+    return cr == RB_PARSER_ENC_CODERANGE_7BIT || cr == RB_PARSER_ENC_CODERANGE_VALID;
+}
 
-begin_block	: '{' top_compstmt '}'
-                    {
-                    /*%%%*/
-                        p->eval_tree_begin = block_append(p, p->eval_tree_begin,
-                                                          NEW_BEGIN($2, &@$));
-                        $$ = NEW_BEGIN(0, &@$);
-                    /*% %*/
-                    /*% ripper: BEGIN!($2) %*/
-                    }
-                ;
+static const char *
+rb_parser_search_nonascii(const char *p, const char *e)
+{
+    const char *s = p;
 
-bodystmt	: compstmt
-                  opt_rescue
-                  k_else {if (!$2) {yyerror1(&@3, "else without rescue is useless");}}
-                  compstmt
-                  opt_ensure
-                    {
-                    /*%%%*/
-                        $$ = new_bodystmt(p, $1, $2, $5, $6, &@$);
-                    /*% %*/
-                    /*% ripper: bodystmt!(escape_Qundef($1), escape_Qundef($2), escape_Qundef($5), escape_Qundef($6)) %*/
-                    }
-                | compstmt
-                  opt_rescue
-                  opt_ensure
-                    {
-                    /*%%%*/
-                        $$ = new_bodystmt(p, $1, $2, 0, $3, &@$);
-                    /*% %*/
-                    /*% ripper: bodystmt!(escape_Qundef($1), escape_Qundef($2), Qnil, escape_Qundef($3)) %*/
-                    }
-                ;
+    for (; s < e; s++) {
+        if (*s & 0x80) return s;
+    }
 
-compstmt	: stmts opt_terms
-                    {
-                        $$ = void_stmts(p, $1);
-                    }
-                ;
+    return NULL;
+}
 
-stmts		: none
-                    {
-                    /*%%%*/
-                        $$ = NEW_BEGIN(0, &@$);
-                    /*% %*/
-                    /*% ripper: stmts_add!(stmts_new!, void_stmt!) %*/
-                    }
-                | stmt_or_begin
-                    {
-                    /*%%%*/
-                        $$ = newline_node($1);
-                    /*% %*/
-                    /*% ripper: stmts_add!(stmts_new!, $1) %*/
-                    }
-                | stmts terms stmt_or_begin
-                    {
-                    /*%%%*/
-                        $$ = block_append(p, $1, newline_node($3));
-                    /*% %*/
-                    /*% ripper: stmts_add!($1, $3) %*/
-                    }
-                ;
+static int
+rb_parser_coderange_scan(struct parser_params *p, const char *ptr, long len, rb_encoding *enc)
+{
+    const char *e = ptr + len;
 
-stmt_or_begin	: stmt
-                    {
-                        $$ = $1;
-                    }
-                | keyword_BEGIN
-                    {
-                        yyerror1(&@1, "BEGIN is permitted only at toplevel");
-                    }
-                  begin_block
-                    {
-                        $$ = $3;
-                    }
-                ;
+    if (enc == rb_ascii8bit_encoding()) {
+        /* enc is ASCII-8BIT.  ASCII-8BIT string never be broken. */
+        ptr = rb_parser_search_nonascii(ptr, e);
+        return ptr ? RB_PARSER_ENC_CODERANGE_VALID : RB_PARSER_ENC_CODERANGE_7BIT;
+    }
+
+    /* parser string encoding is always asciicompat */
+    ptr = rb_parser_search_nonascii(ptr, e);
+    if (!ptr) return RB_PARSER_ENC_CODERANGE_7BIT;
+    for (;;) {
+        int ret = rb_enc_precise_mbclen(ptr, e, enc);
+        if (!MBCLEN_CHARFOUND_P(ret)) return RB_PARSER_ENC_CODERANGE_BROKEN;
+        ptr += MBCLEN_CHARFOUND_LEN(ret);
+        if (ptr == e) break;
+        ptr = rb_parser_search_nonascii(ptr, e);
+        if (!ptr) break;
+    }
+
+    return RB_PARSER_ENC_CODERANGE_VALID;
+}
+
+static int
+rb_parser_enc_coderange_scan(struct parser_params *p, rb_parser_string_t *str, rb_encoding *enc)
+{
+    return rb_parser_coderange_scan(p, PARSER_STRING_PTR(str), PARSER_STRING_LEN(str), enc);
+}
+
+static int
+rb_parser_enc_str_coderange(struct parser_params *p, rb_parser_string_t *str)
+{
+    int cr = PARSER_ENC_CODERANGE(str);
+
+    if (cr == RB_PARSER_ENC_CODERANGE_UNKNOWN) {
+        cr = rb_parser_enc_coderange_scan(p, str, rb_parser_str_get_encoding(str));
+        PARSER_ENC_CODERANGE_SET(str, cr);
+    }
+
+    return cr;
+}
+
+static rb_parser_string_t *
+rb_parser_enc_associate(struct parser_params *p, rb_parser_string_t *str, rb_encoding *enc)
+{
+    if (rb_parser_str_get_encoding(str) == enc)
+        return str;
+    if (!PARSER_ENC_CODERANGE_ASCIIONLY(str)) {
+        PARSER_ENC_CODERANGE_CLEAR(str);
+    }
+    rb_parser_string_set_encoding(str, enc);
+    return str;
+}
+
+static bool
+rb_parser_is_ascii_string(struct parser_params *p, rb_parser_string_t *str)
+{
+    return rb_parser_enc_str_coderange(p, str) == RB_PARSER_ENC_CODERANGE_7BIT;
+}
+
+static rb_encoding *
+rb_parser_enc_compatible(struct parser_params *p, rb_parser_string_t *str1, rb_parser_string_t *str2)
+{
+    rb_encoding *enc1 = rb_parser_str_get_encoding(str1);
+    rb_encoding *enc2 = rb_parser_str_get_encoding(str2);
+
+    if (enc1 == NULL || enc2 == NULL)
+        return 0;
+
+    if (enc1 == enc2) {
+        return enc1;
+    }
+
+    if (PARSER_STRING_LEN(str2) == 0)
+        return enc1;
+    if (PARSER_STRING_LEN(str1) == 0)
+        return rb_parser_is_ascii_string(p, str2) ? enc1 : enc2;
+
+    int cr1, cr2;
+
+    cr1 = rb_parser_enc_str_coderange(p, str1);
+    cr2 = rb_parser_enc_str_coderange(p, str2);
+
+    if (cr1 != cr2) {
+        if (cr1 == RB_PARSER_ENC_CODERANGE_7BIT) return enc2;
+        if (cr2 == RB_PARSER_ENC_CODERANGE_7BIT) return enc1;
+    }
+
+    if (cr2 == RB_PARSER_ENC_CODERANGE_7BIT) {
+        return enc1;
+    }
+
+    if (cr1 == RB_PARSER_ENC_CODERANGE_7BIT) {
+        return enc2;
+    }
+
+    return 0;
+}
+
+static void
+rb_parser_str_modify(rb_parser_string_t *str)
+{
+    PARSER_ENC_CODERANGE_CLEAR(str);
+}
+
+static void
+rb_parser_str_set_len(struct parser_params *p, rb_parser_string_t *str, long len)
+{
+    long capa;
+    const int termlen = STRING_TERM_LEN(str);
+
+    if (len > (capa = (long)(rb_parser_str_capacity(str, termlen))) || len < 0) {
+        rb_bug("probable buffer overflow: %ld for %ld", len, capa);
+    }
+
+    int cr = PARSER_ENC_CODERANGE(str);
+    if (cr == RB_PARSER_ENC_CODERANGE_UNKNOWN) {
+        /* Leave unknown. */
+    }
+    else if (len > PARSER_STRING_LEN(str)) {
+        PARSER_ENC_CODERANGE_SET(str, RB_PARSER_ENC_CODERANGE_UNKNOWN);
+    }
+    else if (len < PARSER_STRING_LEN(str)) {
+        if (cr != RB_PARSER_ENC_CODERANGE_7BIT) {
+            /* ASCII-only string is keeping after truncated.  Valid
+             * and broken may be invalid or valid, leave unknown. */
+            PARSER_ENC_CODERANGE_SET(str, RB_PARSER_ENC_CODERANGE_UNKNOWN);
+        }
+    }
+
+    STRING_SET_LEN(str, len);
+    STRING_TERM_FILL(str);
+}
+
+static rb_parser_string_t *
+rb_parser_str_buf_cat(struct parser_params *p, rb_parser_string_t *str, const char *ptr, long len)
+{
+    rb_parser_str_modify(str);
+    if (len == 0) return 0;
+
+    long total, olen, off = -1;
+    char *sptr;
+    const int termlen = STRING_TERM_LEN(str);
+
+    PARSER_STRING_GETMEM(str, sptr, olen);
+    if (ptr >= sptr && ptr <= sptr + olen) {
+        off = ptr - sptr;
+    }
+
+    if (olen > LONG_MAX - len) {
+        compile_error(p, "string sizes too big");
+        return 0;
+    }
+    total = olen + len;
+    PARSER_STRING_RESIZE_CAPA_TERM(p, str, total, termlen);
+    sptr = PARSER_STRING_PTR(str);
+    if (off != -1) {
+        ptr = sptr + off;
+    }
+    memcpy(sptr + olen, ptr, len);
+    STRING_SET_LEN(str, total);
+    STRING_TERM_FILL(str);
+
+    return str;
+}
+
+#define parser_str_cat(str, ptr, len) rb_parser_str_buf_cat(p, str, ptr, len)
+#define parser_str_cat_cstr(str, lit) rb_parser_str_buf_cat(p, str, lit, strlen(lit))
+
+static rb_parser_string_t *
+rb_parser_enc_cr_str_buf_cat(struct parser_params *p, rb_parser_string_t *str, const char *ptr, long len,
+    rb_encoding *ptr_enc, int ptr_cr, int *ptr_cr_ret)
+{
+    int str_cr, res_cr;
+    rb_encoding *str_enc, *res_enc;
+
+    str_enc = rb_parser_str_get_encoding(str);
+    str_cr = PARSER_STRING_LEN(str) ? PARSER_ENC_CODERANGE(str) : RB_PARSER_ENC_CODERANGE_7BIT;
+
+    if (str_enc == ptr_enc) {
+        if (str_cr != RB_PARSER_ENC_CODERANGE_UNKNOWN && ptr_cr == RB_PARSER_ENC_CODERANGE_UNKNOWN) {
+            ptr_cr = rb_parser_coderange_scan(p, ptr, len, ptr_enc);
+        }
+    }
+    else {
+        /* parser string encoding is always asciicompat */
+        if (ptr_cr == RB_PARSER_ENC_CODERANGE_UNKNOWN) {
+            ptr_cr = rb_parser_coderange_scan(p, ptr, len, ptr_enc);
+        }
+        if (str_cr == RB_PARSER_ENC_CODERANGE_UNKNOWN) {
+            if (str_enc == rb_ascii8bit_encoding() || ptr_cr != RB_PARSER_ENC_CODERANGE_7BIT) {
+                str_cr = rb_parser_enc_str_coderange(p, str);
+            }
+        }
+    }
+    if (ptr_cr_ret)
+        *ptr_cr_ret = ptr_cr;
+
+    if (str_enc != ptr_enc &&
+        str_cr != RB_PARSER_ENC_CODERANGE_7BIT &&
+        ptr_cr != RB_PARSER_ENC_CODERANGE_7BIT) {
+        goto incompatible;
+    }
+
+    if (str_cr == RB_PARSER_ENC_CODERANGE_UNKNOWN) {
+        res_enc = str_enc;
+        res_cr = RB_PARSER_ENC_CODERANGE_UNKNOWN;
+    }
+    else if (str_cr == RB_PARSER_ENC_CODERANGE_7BIT) {
+        if (ptr_cr == RB_PARSER_ENC_CODERANGE_7BIT) {
+            res_enc = str_enc;
+            res_cr = RB_PARSER_ENC_CODERANGE_7BIT;
+        }
+        else {
+            res_enc = ptr_enc;
+            res_cr = ptr_cr;
+        }
+    }
+    else if (str_cr == RB_PARSER_ENC_CODERANGE_VALID) {
+        res_enc = str_enc;
+        if (PARSER_ENC_CODERANGE_CLEAN_P(ptr_cr))
+            res_cr = str_cr;
+        else
+            res_cr = ptr_cr;
+    }
+    else { /* str_cr == RB_PARSER_ENC_CODERANGE_BROKEN */
+        res_enc = str_enc;
+        res_cr = str_cr;
+        if (0 < len) res_cr = RB_PARSER_ENC_CODERANGE_UNKNOWN;
+    }
+
+    if (len < 0) {
+        compile_error(p, "negative string size (or size too big)");
+    }
+    parser_str_cat(str, ptr, len);
+    PARSER_ENCODING_CODERANGE_SET(str, res_enc, res_cr);
+    return str;
+
+  incompatible:
+    compile_error(p, "incompatible character encodings: %s and %s",
+                  rb_enc_name(str_enc), rb_enc_name(ptr_enc));
+    UNREACHABLE_RETURN(0);
+
+}
+
+static rb_parser_string_t *
+rb_parser_enc_str_buf_cat(struct parser_params *p, rb_parser_string_t *str, const char *ptr, long len,
+    rb_encoding *ptr_enc)
+{
+    return rb_parser_enc_cr_str_buf_cat(p, str, ptr, len, ptr_enc, RB_PARSER_ENC_CODERANGE_UNKNOWN, NULL);
+}
+
+static rb_parser_string_t *
+rb_parser_str_buf_append(struct parser_params *p, rb_parser_string_t *str, rb_parser_string_t *str2)
+{
+    int str2_cr = rb_parser_enc_str_coderange(p, str2);
+
+    rb_parser_enc_cr_str_buf_cat(p, str, PARSER_STRING_PTR(str2), PARSER_STRING_LEN(str2),
+        rb_parser_str_get_encoding(str2), str2_cr, &str2_cr);
+
+    PARSER_ENC_CODERANGE_SET(str2, str2_cr);
+
+    return str;
+}
+
+static rb_parser_string_t *
+rb_parser_str_resize(struct parser_params *p, rb_parser_string_t *str, long len)
+{
+    if (len < 0) {
+        rb_bug("negative string size (or size too big)");
+    }
+
+    long slen = PARSER_STRING_LEN(str);
+
+    if (slen > len && PARSER_ENC_CODERANGE(str) != RB_PARSER_ENC_CODERANGE_7BIT) {
+        PARSER_ENC_CODERANGE_CLEAR(str);
+    }
+
+    {
+        long capa;
+        const int termlen = STRING_TERM_LEN(str);
+
+        if ((capa = slen) < len) {
+            SIZED_REALLOC_N(str->ptr, char, (size_t)len + termlen, STRING_SIZE(str));
+        }
+        else if (len == slen) return str;
+        STRING_SET_LEN(str, len);
+        STRING_TERM_FILL(str);
+    }
+    return str;
+}
+
+# define PARSER_ENC_STRING_GETMEM(str, ptrvar, lenvar, encvar) \
+    ((ptrvar) = str->ptr,                            \
+     (lenvar) = str->len,                            \
+     (encvar) = str->enc)
+
+static int
+rb_parser_string_hash_cmp(rb_parser_string_t *str1, rb_parser_string_t *str2)
+{
+    long len1, len2;
+    const char *ptr1, *ptr2;
+    rb_encoding *enc1, *enc2;
+
+    PARSER_ENC_STRING_GETMEM(str1, ptr1, len1, enc1);
+    PARSER_ENC_STRING_GETMEM(str2, ptr2, len2, enc2);
+
+    return (len1 != len2 ||
+            enc1 != enc2 ||
+            memcmp(ptr1, ptr2, len1) != 0);
+}
+
+static void
+rb_parser_ary_extend(rb_parser_t *p, rb_parser_ary_t *ary, long len)
+{
+    long i;
+    if (ary->capa < len) {
+        ary->capa = len;
+        ary->data = (rb_parser_ary_data *)xrealloc(ary->data, sizeof(rb_parser_ary_data) * len);
+        for (i = ary->len; i < len; i++) {
+            ary->data[i] = 0;
+        }
+    }
+}
+
+/*
+ * Do not call this directly.
+ * Use rb_parser_ary_new_capa_for_XXX() instead.
+ */
+static rb_parser_ary_t *
+parser_ary_new_capa(rb_parser_t *p, long len)
+{
+    if (len < 0) {
+        rb_bug("negative array size (or size too big): %ld", len);
+    }
+    rb_parser_ary_t *ary = xcalloc(1, sizeof(rb_parser_ary_t));
+    ary->data_type = 0;
+    ary->len = 0;
+    ary->capa = len;
+    if (0 < len) {
+        ary->data = (rb_parser_ary_data *)xcalloc(len, sizeof(rb_parser_ary_data));
+    }
+    else {
+        ary->data = NULL;
+    }
+    return ary;
+}
+
+#ifndef RIPPER
+static rb_parser_ary_t *
+rb_parser_ary_new_capa_for_script_line(rb_parser_t *p, long len)
+{
+    rb_parser_ary_t *ary = parser_ary_new_capa(p, len);
+    ary->data_type = PARSER_ARY_DATA_SCRIPT_LINE;
+    return ary;
+}
+
+static rb_parser_ary_t *
+rb_parser_ary_new_capa_for_ast_token(rb_parser_t *p, long len)
+{
+    rb_parser_ary_t *ary = parser_ary_new_capa(p, len);
+    ary->data_type = PARSER_ARY_DATA_AST_TOKEN;
+    return ary;
+}
+#endif
+
+static rb_parser_ary_t *
+rb_parser_ary_new_capa_for_node(rb_parser_t *p, long len)
+{
+    rb_parser_ary_t *ary = parser_ary_new_capa(p, len);
+    ary->data_type = PARSER_ARY_DATA_NODE;
+    return ary;
+}
+
+/*
+ * Do not call this directly.
+ * Use rb_parser_ary_push_XXX() instead.
+ */
+static rb_parser_ary_t *
+parser_ary_push(rb_parser_t *p, rb_parser_ary_t *ary, rb_parser_ary_data val)
+{
+    if (ary->len == ary->capa) {
+        rb_parser_ary_extend(p, ary, ary->len == 0 ? 1 : ary->len * 2);
+    }
+    ary->data[ary->len++] = val;
+    return ary;
+}
+
+#ifndef RIPPER
+static rb_parser_ary_t *
+rb_parser_ary_push_ast_token(rb_parser_t *p, rb_parser_ary_t *ary, rb_parser_ast_token_t *val)
+{
+    if (ary->data_type != PARSER_ARY_DATA_AST_TOKEN) {
+        rb_bug("unexpected rb_parser_ary_data_type: %d", ary->data_type);
+    }
+    return parser_ary_push(p, ary, val);
+}
+
+static rb_parser_ary_t *
+rb_parser_ary_push_script_line(rb_parser_t *p, rb_parser_ary_t *ary, rb_parser_string_t *val)
+{
+    if (ary->data_type != PARSER_ARY_DATA_SCRIPT_LINE) {
+        rb_bug("unexpected rb_parser_ary_data_type: %d", ary->data_type);
+    }
+    return parser_ary_push(p, ary, val);
+}
+#endif
+
+static rb_parser_ary_t *
+rb_parser_ary_push_node(rb_parser_t *p, rb_parser_ary_t *ary, NODE *val)
+{
+    if (ary->data_type != PARSER_ARY_DATA_NODE) {
+        rb_bug("unexpected rb_parser_ary_data_type: %d", ary->data_type);
+    }
+    return parser_ary_push(p, ary, val);
+}
+
+#ifndef RIPPER
+static void
+rb_parser_ast_token_free(rb_parser_t *p, rb_parser_ast_token_t *token)
+{
+    if (!token) return;
+    rb_parser_string_free(p, token->str);
+    xfree(token);
+}
+
+static void
+rb_parser_ary_free(rb_parser_t *p, rb_parser_ary_t *ary)
+{
+# define foreach_ary(ptr) \
+    for (rb_parser_ary_data *ptr = ary->data, *const end_ary_data = ptr + ary->len; \
+         ptr < end_ary_data; ptr++)
+    switch (ary->data_type) {
+      case PARSER_ARY_DATA_AST_TOKEN:
+        foreach_ary(data) {rb_parser_ast_token_free(p, *data);}
+        break;
+      case PARSER_ARY_DATA_SCRIPT_LINE:
+        foreach_ary(data) {rb_parser_string_free(p, *data);}
+        break;
+      case PARSER_ARY_DATA_NODE:
+        /* Do nothing because nodes are freed when rb_ast_t is freed */
+        break;
+      default:
+        rb_bug("unexpected rb_parser_ary_data_type: %d", ary->data_type);
+        break;
+    }
+# undef foreach_ary
+    xfree(ary->data);
+    xfree(ary);
+}
+
+#endif /* !RIPPER */
+%}
+
+%expect 0
+%define api.pure
+%define parse.error verbose
+%printer {
+    if ((NODE *)$$ == (NODE *)-1) {
+        rb_parser_printf(p, "NODE_SPECIAL");
+    }
+    else if ($$) {
+        rb_parser_printf(p, "%s", parser_node_name(nd_type(RNODE($$))));
+    }
+} <node> <node_fcall> <node_args> <node_args_aux> <node_opt_arg>
+  <node_kw_arg> <node_block_pass> <node_masgn> <node_def_temp> <node_exits>
+%printer {
+    rb_parser_printf(p, "%"PRIsVALUE, rb_id2str($$));
+} <id>
+%printer {
+    switch (nd_type(RNODE($$))) {
+      case NODE_INTEGER:
+        rb_parser_printf(p, "%+"PRIsVALUE, rb_node_integer_literal_val($$));
+        break;
+      case NODE_FLOAT:
+        rb_parser_printf(p, "%+"PRIsVALUE, rb_node_float_literal_val($$));
+        break;
+      case NODE_RATIONAL:
+        rb_parser_printf(p, "%+"PRIsVALUE, rb_node_rational_literal_val($$));
+        break;
+      case NODE_IMAGINARY:
+        rb_parser_printf(p, "%+"PRIsVALUE, rb_node_imaginary_literal_val($$));
+        break;
+      default:
+        break;
+    }
+} tINTEGER tFLOAT tRATIONAL tIMAGINARY tSTRING_CONTENT tCHAR
+%printer {
+    rb_parser_printf(p, "$%ld", RNODE_NTH_REF($$)->nd_nth);
+} tNTH_REF
+%printer {
+    rb_parser_printf(p, "$%c", (int)RNODE_BACK_REF($$)->nd_nth);
+} tBACK_REF
+
+%destructor {
+    if (CASE_LABELS_ENABLED_P($$)) st_free_table($$);
+} <labels>
+
+%lex-param {struct parser_params *p}
+%parse-param {struct parser_params *p}
+%initial-action
+{
+    RUBY_SET_YYLLOC_OF_NONE(@$);
+};
+%after-shift after_shift
+%before-reduce before_reduce
+%after-reduce after_reduce
+%after-shift-error-token after_shift_error_token
+%after-pop-stack after_pop_stack
+
+%union {
+    NODE *node;
+    rb_node_fcall_t *node_fcall;
+    rb_node_args_t *node_args;
+    rb_node_args_aux_t *node_args_aux;
+    rb_node_opt_arg_t *node_opt_arg;
+    rb_node_kw_arg_t *node_kw_arg;
+    rb_node_block_pass_t *node_block_pass;
+    rb_node_masgn_t *node_masgn;
+    rb_node_def_temp_t *node_def_temp;
+    rb_node_exits_t *node_exits;
+    struct rb_locations_lambda_body_t *locations_lambda_body;
+    ID id;
+    int num;
+    st_table *tbl;
+    st_table *labels;
+    const struct vtable *vars;
+    struct rb_strterm_struct *strterm;
+    struct lex_context ctxt;
+    enum lex_state_e state;
+}
+
+%token <id>
+        keyword_class        "'class'"
+        keyword_module       "'module'"
+        keyword_def          "'def'"
+        keyword_undef        "'undef'"
+        keyword_begin        "'begin'"
+        keyword_rescue       "'rescue'"
+        keyword_ensure       "'ensure'"
+        keyword_end          "'end'"
+        keyword_if           "'if'"
+        keyword_unless       "'unless'"
+        keyword_then         "'then'"
+        keyword_elsif        "'elsif'"
+        keyword_else         "'else'"
+        keyword_case         "'case'"
+        keyword_when         "'when'"
+        keyword_while        "'while'"
+        keyword_until        "'until'"
+        keyword_for          "'for'"
+        keyword_break        "'break'"
+        keyword_next         "'next'"
+        keyword_redo         "'redo'"
+        keyword_retry        "'retry'"
+        keyword_in           "'in'"
+        keyword_do           "'do'"
+        keyword_do_cond      "'do' for condition"
+        keyword_do_block     "'do' for block"
+        keyword_do_LAMBDA    "'do' for lambda"
+        keyword_return       "'return'"
+        keyword_yield        "'yield'"
+        keyword_super        "'super'"
+        keyword_self         "'self'"
+        keyword_nil          "'nil'"
+        keyword_true         "'true'"
+        keyword_false        "'false'"
+        keyword_and          "'and'"
+        keyword_or           "'or'"
+        keyword_not          "'not'"
+        modifier_if          "'if' modifier"
+        modifier_unless      "'unless' modifier"
+        modifier_while       "'while' modifier"
+        modifier_until       "'until' modifier"
+        modifier_rescue      "'rescue' modifier"
+        keyword_alias        "'alias'"
+        keyword_defined      "'defined?'"
+        keyword_BEGIN        "'BEGIN'"
+        keyword_END          "'END'"
+        keyword__LINE__      "'__LINE__'"
+        keyword__FILE__      "'__FILE__'"
+        keyword__ENCODING__  "'__ENCODING__'"
+
+%token <id>   tIDENTIFIER    "local variable or method"
+%token <id>   tFID           "method"
+%token <id>   tGVAR          "global variable"
+%token <id>   tIVAR          "instance variable"
+%token <id>   tCONSTANT      "constant"
+%token <id>   tCVAR          "class variable"
+%token <id>   tLABEL         "label"
+%token <node> tINTEGER       "integer literal"
+%token <node> tFLOAT         "float literal"
+%token <node> tRATIONAL      "rational literal"
+%token <node> tIMAGINARY     "imaginary literal"
+%token <node> tCHAR          "char literal"
+%token <node> tNTH_REF       "numbered reference"
+%token <node> tBACK_REF      "back reference"
+%token <node> tSTRING_CONTENT "literal content"
+%token <num>  tREGEXP_END
+%token <num>  tDUMNY_END     "dummy end"
+
+%type <node> singleton singleton_expr strings string string1 xstring regexp
+%type <node> string_contents xstring_contents regexp_contents string_content
+%type <node> words symbols symbol_list qwords qsymbols word_list qword_list qsym_list word
+%type <node> literal numeric simple_numeric ssym dsym symbol cpath
+%type <node_def_temp> defn_head defs_head k_def
+%type <node_exits> block_open k_while k_until k_for allow_exits
+%type <node> top_stmts top_stmt begin_block endless_arg endless_command
+%type <node> bodystmt stmts stmt_or_begin stmt expr arg ternary primary
+%type <node> command command_call command_call_value method_call
+%type <node> expr_value expr_value_do arg_value primary_value rel_expr
+%type <node_fcall> fcall
+%type <node> if_tail opt_else case_body case_args cases opt_rescue exc_list exc_var opt_ensure
+%type <node> args arg_splat call_args opt_call_args
+%type <node> paren_args opt_paren_args
+%type <node_args> args_tail block_args_tail
+%type <node> command_args aref_args
+%type <node_block_pass> opt_block_arg block_arg
+%type <node> var_ref var_lhs
+%type <node> command_rhs arg_rhs
+%type <node> command_asgn mrhs mrhs_arg superclass block_call block_command
+%type <node_args> f_arglist f_opt_paren_args f_paren_args f_args
+%type <node_args_aux> f_arg f_arg_item
+%type <node> f_marg f_rest_marg
+%type <node_masgn> f_margs
+%type <node> assoc_list assocs assoc undef_list backref string_dvar for_var
+%type <node_args> block_param opt_block_param_def block_param_def opt_block_param
+%type <id> do bv_decls opt_bv_decl bvar
+%type <node> lambda brace_body do_body
+%type <locations_lambda_body> lambda_body
+%type <node_args> f_larglist
+%type <node> brace_block cmd_brace_block do_block lhs none fitem
+%type <node> mlhs_head mlhs_item mlhs_node
+%type <node_masgn> mlhs mlhs_basic mlhs_inner
+%type <node> p_case_body p_cases p_top_expr p_top_expr_body
+%type <node> p_expr p_as p_alt p_expr_basic p_find
+%type <node> p_args p_args_head p_args_tail p_args_post p_arg p_rest
+%type <node> p_value p_primitive p_variable p_var_ref p_expr_ref p_const
+%type <node> p_kwargs p_kwarg p_kw
+%type <id>   keyword_variable user_variable sym operation2 operation3
+%type <id>   cname fname op f_rest_arg f_block_arg opt_f_block_arg f_norm_arg f_bad_arg
+%type <id>   f_kwrest f_label f_arg_asgn call_op call_op2 reswords relop dot_or_colon
+%type <id>   p_kwrest p_kwnorest p_any_kwrest p_kw_label
+%type <id>   f_no_kwarg f_any_kwrest args_forward excessed_comma nonlocal_var def_name
+%type <ctxt> lex_ctxt begin_defined k_class k_module k_END k_rescue k_ensure after_rescue
+%type <ctxt> p_in_kwarg
+%type <tbl>  p_lparen p_lbracket p_pktbl p_pvtbl
+%type <num>  max_numparam
+%type <node> numparam
+%type <id>   it_id
+%token END_OF_INPUT 0	"end-of-input"
+%token <id> '.'
+
+/* escaped chars, should be ignored otherwise */
+%token <id> '\\'	"backslash"
+%token tSP		"escaped space"
+%token <id> '\t' 	"escaped horizontal tab"
+%token <id> '\f'	"escaped form feed"
+%token <id> '\r'	"escaped carriage return"
+%token <id> '\13'	"escaped vertical tab"
+%token tUPLUS		RUBY_TOKEN(UPLUS)  "unary+"
+%token tUMINUS		RUBY_TOKEN(UMINUS) "unary-"
+%token tPOW		RUBY_TOKEN(POW)    "**"
+%token tCMP		RUBY_TOKEN(CMP)    "<=>"
+%token tEQ		RUBY_TOKEN(EQ)     "=="
+%token tEQQ		RUBY_TOKEN(EQQ)    "==="
+%token tNEQ		RUBY_TOKEN(NEQ)    "!="
+%token tGEQ		RUBY_TOKEN(GEQ)    ">="
+%token tLEQ		RUBY_TOKEN(LEQ)    "<="
+%token tANDOP		RUBY_TOKEN(ANDOP)  "&&"
+%token tOROP		RUBY_TOKEN(OROP)   "||"
+%token tMATCH		RUBY_TOKEN(MATCH)  "=~"
+%token tNMATCH		RUBY_TOKEN(NMATCH) "!~"
+%token tDOT2		RUBY_TOKEN(DOT2)   ".."
+%token tDOT3		RUBY_TOKEN(DOT3)   "..."
+%token tBDOT2		RUBY_TOKEN(BDOT2)   "(.."
+%token tBDOT3		RUBY_TOKEN(BDOT3)   "(..."
+%token tAREF		RUBY_TOKEN(AREF)   "[]"
+%token tASET		RUBY_TOKEN(ASET)   "[]="
+%token tLSHFT		RUBY_TOKEN(LSHFT)  "<<"
+%token tRSHFT		RUBY_TOKEN(RSHFT)  ">>"
+%token <id> tANDDOT	RUBY_TOKEN(ANDDOT) "&."
+%token <id> tCOLON2	RUBY_TOKEN(COLON2) "::"
+%token tCOLON3		":: at EXPR_BEG"
+%token <id> tOP_ASGN	"operator-assignment" /* +=, -=  etc. */
+%token tASSOC		"=>"
+%token tLPAREN		"("
+%token tLPAREN_ARG	"( arg"
+%token tLBRACK		"["
+%token tLBRACE		"{"
+%token tLBRACE_ARG	"{ arg"
+%token tSTAR		"*"
+%token tDSTAR		"**arg"
+%token tAMPER		"&"
+%token <num> tLAMBDA	"->"
+%token tSYMBEG		"symbol literal"
+%token tSTRING_BEG	"string literal"
+%token tXSTRING_BEG	"backtick literal"
+%token tREGEXP_BEG	"regexp literal"
+%token tWORDS_BEG	"word list"
+%token tQWORDS_BEG	"verbatim word list"
+%token tSYMBOLS_BEG	"symbol list"
+%token tQSYMBOLS_BEG	"verbatim symbol list"
+%token tSTRING_END	"terminator"
+%token tSTRING_DEND	"'}'"
+%token <state> tSTRING_DBEG "'#{'"
+%token tSTRING_DVAR tLAMBEG tLABEL_END
+
+%token tIGNORED_NL tCOMMENT tEMBDOC_BEG tEMBDOC tEMBDOC_END
+%token tHEREDOC_BEG tHEREDOC_END k__END__
+
+/*
+ *	precedence table
+ */
+
+%nonassoc tLOWEST
+%nonassoc tLBRACE_ARG
+
+%nonassoc  modifier_if modifier_unless modifier_while modifier_until keyword_in
+%left  keyword_or keyword_and
+%right keyword_not
+%nonassoc keyword_defined
+%right '=' tOP_ASGN
+%left modifier_rescue
+%right '?' ':'
+%nonassoc tDOT2 tDOT3 tBDOT2 tBDOT3
+%left  tOROP
+%left  tANDOP
+%nonassoc  tCMP tEQ tEQQ tNEQ tMATCH tNMATCH
+%left  '>' tGEQ '<' tLEQ
+%left  '|' '^'
+%left  '&'
+%left  tLSHFT tRSHFT
+%left  '+' '-'
+%left  '*' '/' '%'
+%right tUMINUS_NUM tUMINUS
+%right tPOW
+%right '!' '~' tUPLUS
+
+%token tLAST_TOKEN
+
+/*
+ *	inlining rules
+ */
+%rule %inline ident_or_const
+                : tIDENTIFIER
+                | tCONSTANT
+                ;
+
+%rule %inline user_or_keyword_variable
+                : user_variable
+                | keyword_variable
+                ;
+
+/*
+ *	parameterizing rules
+ */
+%rule asgn(rhs) <node>
+                : lhs '=' lex_ctxt rhs
+                    {
+                        $$ = node_assign(p, (NODE *)$lhs, $rhs, $lex_ctxt, &@$);
+                    /*% ripper: assign!($:1, $:4) %*/
+                    }
+                ;
+
+%rule args_tail_basic(value) <node_args>
+                : f_kwarg(value) ',' f_kwrest opt_f_block_arg
+                    {
+                        $$ = new_args_tail(p, $1, $3, $4, &@3);
+                    /*% ripper: [$:1, $:3, $:4] %*/
+                    }
+                | f_kwarg(value) opt_f_block_arg
+                    {
+                        $$ = new_args_tail(p, $1, 0, $2, &@1);
+                    /*% ripper: [$:1, Qnil, $:2] %*/
+                    }
+                | f_any_kwrest opt_f_block_arg
+                    {
+                        $$ = new_args_tail(p, 0, $1, $2, &@1);
+                    /*% ripper: [Qnil, $:1, $:2] %*/
+                    }
+                | f_block_arg
+                    {
+                        $$ = new_args_tail(p, 0, 0, $1, &@1);
+                    /*% ripper: [Qnil, Qnil, $:1] %*/
+                    }
+
+%rule def_endless_method(bodystmt) <node>
+                : defn_head[head] f_opt_paren_args[args] '=' bodystmt
+                    {
+                        endless_method_name(p, $head->nd_mid, &@head);
+                        restore_defun(p, $head);
+                        $bodystmt = new_scope_body(p, $args, $bodystmt, &@$);
+                        ($$ = $head->nd_def)->nd_loc = @$;
+                        RNODE_DEFN($$)->nd_defn = $bodystmt;
+                    /*% ripper: bodystmt!($:bodystmt, Qnil, Qnil, Qnil) %*/
+                    /*% ripper: def!($:head, $:args, $:$) %*/
+                        local_pop(p);
+                    }
+                | defs_head[head] f_opt_paren_args[args] '=' bodystmt
+                    {
+                        endless_method_name(p, $head->nd_mid, &@head);
+                        restore_defun(p, $head);
+                        $bodystmt = new_scope_body(p, $args, $bodystmt, &@$);
+                        ($$ = $head->nd_def)->nd_loc = @$;
+                        RNODE_DEFS($$)->nd_defn = $bodystmt;
+                    /*% ripper: bodystmt!($:bodystmt, Qnil, Qnil, Qnil) %*/
+                    /*% ripper: defs!(*$:head[0..2], $:args, $:$) %*/
+                        local_pop(p);
+                    }
+                ;
+
+%rule compstmt(stmts) <node>
+                    : stmts terms?
+                        {
+                            void_stmts(p, $$ = $stmts);
+                        }
+                    ;
+
+%rule f_opt(value) <node_opt_arg>
+                : f_arg_asgn f_eq value
+                    {
+                        p->ctxt.in_argdef = 1;
+                        $$ = NEW_OPT_ARG(assignable(p, $f_arg_asgn, $value, &@$), &@$);
+                    /*% ripper: [$:$, $:3] %*/
+                    }
+                ;
+
+%rule f_opt_arg(value) <node_opt_arg>
+                : f_opt(value)
+                    {
+                        $$ = $f_opt;
+                    /*% ripper: rb_ary_new3(1, $:1) %*/
+                    }
+                | f_opt_arg(value) ',' f_opt(value)
+                    {
+                        $$ = opt_arg_append($f_opt_arg, $f_opt);
+                    /*% ripper: rb_ary_push($:1, $:3) %*/
+                    }
+                ;
+
+%rule f_kw(value) <node_kw_arg>
+                : f_label value
+                    {
+                        p->ctxt.in_argdef = 1;
+                        $$ = new_kw_arg(p, assignable(p, $f_label, $value, &@$), &@$);
+                    /*% ripper: [$:$, $:value] %*/
+                    }
+                | f_label
+                    {
+                        p->ctxt.in_argdef = 1;
+                        $$ = new_kw_arg(p, assignable(p, $f_label, NODE_SPECIAL_REQUIRED_KEYWORD, &@$), &@$);
+                    /*% ripper: [$:$, 0] %*/
+                    }
+                ;
+
+%rule f_kwarg(value) <node_kw_arg>
+                : f_kw(value)
+                    {
+                        $$ = $f_kw;
+                    /*% ripper: rb_ary_new3(1, $:1) %*/
+                    }
+                | f_kwarg(value) ',' f_kw(value)
+                    {
+                        $$ = kwd_append($f_kwarg, $f_kw);
+                    /*% ripper: rb_ary_push($:1, $:3) %*/
+                    }
+                ;
+
+%rule mlhs(item) <node>
+                : item
+                    {
+                        $$ = NEW_LIST($1, &@$);
+                    /*% ripper: mlhs_add!(mlhs_new!, $:1) %*/
+                    }
+                | mlhs(item) ',' item
+                    {
+                        $$ = list_append(p, $1, $3);
+                    /*% ripper: mlhs_add!($:1, $:3) %*/
+                    }
+                ;
+
+%rule op_asgn(rhs) <node>
+                : var_lhs tOP_ASGN lex_ctxt rhs
+                    {
+                        $$ = new_op_assign(p, $var_lhs, $tOP_ASGN, $rhs, $lex_ctxt, &@$);
+                    /*% ripper: opassign!($:1, $:2, $:4) %*/
+                    }
+                | primary_value '['[lbracket] opt_call_args rbracket tOP_ASGN lex_ctxt rhs
+                    {
+                        $$ = new_ary_op_assign(p, $primary_value, $opt_call_args, $tOP_ASGN, $rhs, &@opt_call_args, &@$, &NULL_LOC, &@lbracket, &@rbracket, &@tOP_ASGN);
+                    /*% ripper: opassign!(aref_field!($:1, $:3), $:5, $:7) %*/
+                    }
+                | primary_value call_op tIDENTIFIER tOP_ASGN lex_ctxt rhs
+                    {
+                        $$ = new_attr_op_assign(p, $primary_value, $call_op, $tIDENTIFIER, $tOP_ASGN, $rhs, &@$, &@call_op, &@tIDENTIFIER, &@tOP_ASGN);
+                    /*% ripper: opassign!(field!($:1, $:2, $:3), $:4, $:6) %*/
+                    }
+                | primary_value call_op tCONSTANT tOP_ASGN lex_ctxt rhs
+                    {
+                        $$ = new_attr_op_assign(p, $primary_value, $call_op, $tCONSTANT, $tOP_ASGN, $rhs, &@$, &@call_op, &@tCONSTANT, &@tOP_ASGN);
+                    /*% ripper: opassign!(field!($:1, $:2, $:3), $:4, $:6) %*/
+                    }
+                | primary_value tCOLON2 tIDENTIFIER tOP_ASGN lex_ctxt rhs
+                    {
+                        $$ = new_attr_op_assign(p, $primary_value, idCOLON2, $tIDENTIFIER, $tOP_ASGN, $rhs, &@$, &@tCOLON2, &@tIDENTIFIER, &@tOP_ASGN);
+                    /*% ripper: opassign!(field!($:1, $:2, $:3), $:4, $:6) %*/
+                    }
+                | primary_value tCOLON2 tCONSTANT tOP_ASGN lex_ctxt rhs
+                    {
+                        YYLTYPE loc = code_loc_gen(&@primary_value, &@tCONSTANT);
+                        $$ = new_const_op_assign(p, NEW_COLON2($primary_value, $tCONSTANT, &loc, &@tCOLON2, &@tCONSTANT), $tOP_ASGN, $rhs, $lex_ctxt, &@$);
+                    /*% ripper: opassign!(const_path_field!($:1, $:3), $:4, $:6) %*/
+                    }
+                | tCOLON3 tCONSTANT tOP_ASGN lex_ctxt rhs
+                    {
+                        YYLTYPE loc = code_loc_gen(&@tCOLON3, &@tCONSTANT);
+                        $$ = new_const_op_assign(p, NEW_COLON3($tCONSTANT, &loc, &@tCOLON3, &@tCONSTANT), $tOP_ASGN, $rhs, $lex_ctxt, &@$);
+                    /*% ripper: opassign!(top_const_field!($:2), $:3, $:5) %*/
+                    }
+                | backref tOP_ASGN lex_ctxt rhs
+                    {
+                        VALUE MAYBE_UNUSED(e) = rb_backref_error(p, $backref);
+                        $$ = NEW_ERROR(&@$);
+                    /*% ripper[error]: assign_error!(?e, opassign!(var_field!($:1), $:2, $:4)) %*/
+                    }
+                ;
+
+%rule opt_args_tail(tail) <node_args>
+                : ',' tail
+                    {
+                        $$ = $tail;
+                    /*% ripper: $:2 %*/
+                    }
+                | /* none */
+                    {
+                        $$ = new_args_tail(p, 0, 0, 0, &@0);
+                    /*% ripper: [Qnil, Qnil, Qnil] %*/
+                    }
+                ;
+
+%rule range_expr(range) <node>
+                : range tDOT2 range
+                    {
+                        value_expr($1);
+                        value_expr($3);
+                        $$ = NEW_DOT2($1, $3, &@$, &@2);
+                    /*% ripper: dot2!($:1, $:3) %*/
+                    }
+                | range tDOT3 range
+                    {
+                        value_expr($1);
+                        value_expr($3);
+                        $$ = NEW_DOT3($1, $3, &@$, &@2);
+                    /*% ripper: dot3!($:1, $:3) %*/
+                    }
+                | range tDOT2
+                    {
+                        value_expr($1);
+                        $$ = NEW_DOT2($1, new_nil_at(p, &@2.end_pos), &@$, &@2);
+                    /*% ripper: dot2!($:1, Qnil) %*/
+                    }
+                | range tDOT3
+                    {
+                        value_expr($1);
+                        $$ = NEW_DOT3($1, new_nil_at(p, &@2.end_pos), &@$, &@2);
+                    /*% ripper: dot3!($:1, Qnil) %*/
+                    }
+                | tBDOT2 range
+                    {
+                        value_expr($2);
+                        $$ = NEW_DOT2(new_nil_at(p, &@1.beg_pos), $2, &@$, &@1);
+                    /*% ripper: dot2!(Qnil, $:2) %*/
+                    }
+                | tBDOT3 range
+                    {
+                        value_expr($2);
+                        $$ = NEW_DOT3(new_nil_at(p, &@1.beg_pos), $2, &@$, &@1);
+                    /*% ripper: dot3!(Qnil, $:2) %*/
+                    }
+                ;
+
+%rule value_expr(value) <node>
+                : value
+                    {
+                        value_expr($1);
+                        $$ = $1;
+                    }
+                ;
+
+%rule words(begin, word_list) <node>
+                : begin ' '+ word_list tSTRING_END
+                    {
+                        $$ = make_list($word_list, &@$);
+                    /*% ripper: array!($:3) %*/
+                    }
+                ;
+
+%%
+program		:  {
+                        SET_LEX_STATE(EXPR_BEG);
+                        local_push(p, ifndef_ripper(1)+0);
+                        /* jumps are possible in the top-level loop. */
+                        if (!ifndef_ripper(p->do_loop) + 0) init_block_exit(p);
+                    }
+                  compstmt(top_stmts)
+                    {
+                        if ($2 && !compile_for_eval) {
+                            NODE *node = $2;
+                            /* last expression should not be void */
+                            if (nd_type_p(node, NODE_BLOCK)) {
+                                while (RNODE_BLOCK(node)->nd_next) {
+                                    node = RNODE_BLOCK(node)->nd_next;
+                                }
+                                node = RNODE_BLOCK(node)->nd_head;
+                            }
+                            node = remove_begin(node);
+                            void_expr(p, node);
+                        }
+                        p->eval_tree = NEW_SCOPE(0, block_append(p, p->eval_tree, $2), &@$);
+                    /*% ripper[final]: program!($:2) %*/
+                        local_pop(p);
+                    }
+                ;
+
+top_stmts	: none
+                    {
+                        $$ = NEW_BEGIN(0, &@$);
+                    /*% ripper: stmts_add!(stmts_new!, void_stmt!) %*/
+                    }
+                | top_stmt
+                    {
+                        $$ = newline_node($1);
+                    /*% ripper: stmts_add!(stmts_new!, $:1) %*/
+                    }
+                | top_stmts terms top_stmt
+                    {
+                        $$ = block_append(p, $1, newline_node($3));
+                    /*% ripper: stmts_add!($:1, $:3) %*/
+                    }
+                ;
+
+top_stmt	: stmt
+                    {
+                        clear_block_exit(p, true);
+                        $$ = $1;
+                    }
+                | keyword_BEGIN begin_block
+                    {
+                        $$ = $2;
+                    /*% ripper: $:2 %*/
+                    }
+                ;
+
+block_open	: '{' {$$ = init_block_exit(p);};
+
+begin_block	: block_open compstmt(top_stmts) '}'
+                    {
+                        restore_block_exit(p, $block_open);
+                        p->eval_tree_begin = block_append(p, p->eval_tree_begin,
+                                                          NEW_BEGIN($2, &@$));
+                        $$ = NEW_BEGIN(0, &@$);
+                    /*% ripper: BEGIN!($:2) %*/
+                    }
+                ;
+
+bodystmt	: compstmt(stmts)[body]
+                  lex_ctxt[ctxt]
+                  opt_rescue
+                  k_else
+                    {
+                        if (!$opt_rescue) yyerror1(&@k_else, "else without rescue is useless");
+                        next_rescue_context(&p->ctxt, &$ctxt, after_else);
+                    }
+                  compstmt(stmts)[elsebody]
+                    {
+                        next_rescue_context(&p->ctxt, &$ctxt, after_ensure);
+                    }
+                  opt_ensure
+                    {
+                        $$ = new_bodystmt(p, $body, $opt_rescue, $elsebody, $opt_ensure, &@$);
+                    /*% ripper: bodystmt!($:body, $:opt_rescue, $:elsebody, $:opt_ensure) %*/
+                    }
+                | compstmt(stmts)[body]
+                  lex_ctxt[ctxt]
+                  opt_rescue
+                    {
+                        next_rescue_context(&p->ctxt, &$ctxt, after_ensure);
+                    }
+                  opt_ensure
+                    {
+                        $$ = new_bodystmt(p, $body, $opt_rescue, 0, $opt_ensure, &@$);
+                    /*% ripper: bodystmt!($:body, $:opt_rescue, Qnil, $:opt_ensure) %*/
+                    }
+                ;
+
+stmts		: none
+                    {
+                        $$ = NEW_BEGIN(0, &@$);
+                    /*% ripper: stmts_add!(stmts_new!, void_stmt!) %*/
+                    }
+                | stmt_or_begin
+                    {
+                        $$ = newline_node($1);
+                    /*% ripper: stmts_add!(stmts_new!, $:1) %*/
+                    }
+                | stmts terms stmt_or_begin
+                    {
+                        $$ = block_append(p, $1, newline_node($3));
+                    /*% ripper: stmts_add!($:1, $:3) %*/
+                    }
+                ;
+
+stmt_or_begin	: stmt
+                | keyword_BEGIN
+                    {
+                        yyerror1(&@1, "BEGIN is permitted only at toplevel");
+                    }
+                  begin_block
+                    {
+                        $$ = $3;
+                    }
+                ;
+
+allow_exits	: {$$ = allow_block_exit(p);};
+
+k_END		: keyword_END lex_ctxt
+                    {
+                        $$ = $2;
+                        p->ctxt.in_rescue = before_rescue;
+                    /*% ripper: $:2 %*/
+                    };
 
 stmt		: keyword_alias fitem {SET_LEX_STATE(EXPR_FNAME|EXPR_FITEM);} fitem
                     {
-                    /*%%%*/
-                        $$ = NEW_ALIAS($2, $4, &@$);
-                    /*% %*/
-                    /*% ripper: alias!($2, $4) %*/
+                        $$ = NEW_ALIAS($2, $4, &@$, &@1);
+                    /*% ripper: alias!($:2, $:4) %*/
+                    }
+                | keyword_alias tGVAR tGVAR
+                    {
+                        $$ = NEW_VALIAS($2, $3, &@$, &@1);
+                    /*% ripper: var_alias!($:2, $:3) %*/
+                    }
+                | keyword_alias tGVAR tBACK_REF
+                    {
+                        char buf[2];
+                        buf[0] = '$';
+                        buf[1] = (char)RNODE_BACK_REF($3)->nd_nth;
+                        $$ = NEW_VALIAS($2, rb_intern2(buf, 2), &@$, &@1);
+                    /*% ripper: var_alias!($:2, $:3) %*/
+                    }
+                | keyword_alias tGVAR tNTH_REF
+                    {
+                        static const char mesg[] = "can't make alias for the number variables";
+                    /*%%%*/
+                        yyerror1(&@3, mesg);
+                    /*% %*/
+                        $$ = NEW_ERROR(&@$);
+                    /*% ripper[error]: alias_error!(ERR_MESG(), $:3) %*/
+                    }
+                | keyword_undef undef_list
+                    {
+                        nd_set_first_loc($2, @1.beg_pos);
+                        RNODE_UNDEF($2)->keyword_loc = @1;
+                        $$ = $2;
+                    /*% ripper: undef!($:2) %*/
+                    }
+                | stmt modifier_if expr_value
+                    {
+                        $$ = new_if(p, $3, remove_begin($1), 0, &@$, &@2, &NULL_LOC, &NULL_LOC);
+                        fixpos($$, $3);
+                    /*% ripper: if_mod!($:3, $:1) %*/
+                    }
+                | stmt modifier_unless expr_value
+                    {
+                        $$ = new_unless(p, $3, remove_begin($1), 0, &@$, &@2, &NULL_LOC, &NULL_LOC);
+                        fixpos($$, $3);
+                    /*% ripper: unless_mod!($:3, $:1) %*/
+                    }
+                | stmt modifier_while expr_value
+                    {
+                        clear_block_exit(p, false);
+                        if ($1 && nd_type_p($1, NODE_BEGIN)) {
+                            $$ = NEW_WHILE(cond(p, $3, &@3), RNODE_BEGIN($1)->nd_body, 0, &@$, &@2, &NULL_LOC);
+                        }
+                        else {
+                            $$ = NEW_WHILE(cond(p, $3, &@3), $1, 1, &@$, &@2, &NULL_LOC);
+                        }
+                    /*% ripper: while_mod!($:3, $:1) %*/
+                    }
+                | stmt modifier_until expr_value
+                    {
+                        clear_block_exit(p, false);
+                        if ($1 && nd_type_p($1, NODE_BEGIN)) {
+                            $$ = NEW_UNTIL(cond(p, $3, &@3), RNODE_BEGIN($1)->nd_body, 0, &@$, &@2, &NULL_LOC);
+                        }
+                        else {
+                            $$ = NEW_UNTIL(cond(p, $3, &@3), $1, 1, &@$, &@2, &NULL_LOC);
+                        }
+                    /*% ripper: until_mod!($:3, $:1) %*/
+                    }
+                | stmt modifier_rescue after_rescue stmt
+                    {
+                        p->ctxt.in_rescue = $3.in_rescue;
+                        NODE *resq;
+                        YYLTYPE loc = code_loc_gen(&@2, &@4);
+                        resq = NEW_RESBODY(0, 0, remove_begin($4), 0, &loc);
+                        $$ = NEW_RESCUE(remove_begin($1), resq, 0, &@$);
+                    /*% ripper: rescue_mod!($:1, $:4) %*/
+                    }
+                | k_END allow_exits '{' compstmt(stmts) '}'
+                    {
+                        if (p->ctxt.in_def) {
+                            rb_warn0("END in method; use at_exit");
+                        }
+                        restore_block_exit(p, $allow_exits);
+                        p->ctxt = $k_END;
+                        {
+                            NODE *scope = NEW_SCOPE2(0 /* tbl */, 0 /* args */, $compstmt /* body */, &@$);
+                            $$ = NEW_POSTEXE(scope, &@$, &@1, &@3, &@5);
+                        }
+                    /*% ripper: END!($:compstmt) %*/
+                    }
+                | command_asgn
+                | mlhs '=' lex_ctxt command_call_value
+                    {
+                        $$ = node_assign(p, (NODE *)$1, $4, $3, &@$);
+                    /*% ripper: massign!($:1, $:4) %*/
+                    }
+                | asgn(mrhs)
+                | mlhs '=' lex_ctxt mrhs_arg modifier_rescue
+                  after_rescue stmt[resbody]
+                    {
+                        p->ctxt.in_rescue = $3.in_rescue;
+                        YYLTYPE loc = code_loc_gen(&@modifier_rescue, &@resbody);
+                        $resbody = NEW_RESBODY(0, 0, remove_begin($resbody), 0, &loc);
+                        loc.beg_pos = @mrhs_arg.beg_pos;
+                        $mrhs_arg = NEW_RESCUE($mrhs_arg, $resbody, 0, &loc);
+                        $$ = node_assign(p, (NODE *)$mlhs, $mrhs_arg, $lex_ctxt, &@$);
+                    /*% ripper: massign!($:1, rescue_mod!($:4, $:7)) %*/
+                    }
+                | mlhs '=' lex_ctxt mrhs_arg
+                    {
+                        $$ = node_assign(p, (NODE *)$1, $4, $3, &@$);
+                    /*% ripper: massign!($:1, $:4) %*/
+                    }
+                | expr
+                | error
+                    {
+                        (void)yynerrs;
+                        $$ = NEW_ERROR(&@$);
+                    }
+                ;
+
+command_asgn	: asgn(command_rhs)
+                | op_asgn(command_rhs)
+                | def_endless_method(endless_command)
+                ;
+
+endless_command : command
+                | endless_command modifier_rescue after_rescue arg
+                    {
+                        p->ctxt.in_rescue = $3.in_rescue;
+                        $$ = rescued_expr(p, $1, $4, &@1, &@2, &@4);
+                    /*% ripper: rescue_mod!($:1, $:4) %*/
+                    }
+                | keyword_not '\n'? endless_command
+                    {
+                        $$ = call_uni_op(p, method_cond(p, $3, &@3), METHOD_NOT, &@1, &@$);
+                    /*% ripper: unary!(ID2VAL(idNOT), $:3) %*/
+                    }
+                ;
+
+command_rhs	: command_call_value   %prec tOP_ASGN
+                | command_call_value modifier_rescue after_rescue stmt
+                    {
+                        p->ctxt.in_rescue = $3.in_rescue;
+                        YYLTYPE loc = code_loc_gen(&@2, &@4);
+                        $$ = NEW_RESCUE($1, NEW_RESBODY(0, 0, remove_begin($4), 0, &loc), 0, &@$);
+                    /*% ripper: rescue_mod!($:1, $:4) %*/
+                    }
+                | command_asgn
+                ;
+
+expr		: command_call
+                | expr keyword_and expr
+                    {
+                        $$ = logop(p, idAND, $1, $3, &@2, &@$);
+                    /*% ripper: binary!($:1, ID2VAL(idAND), $:3) %*/
+                    }
+                | expr keyword_or expr
+                    {
+                        $$ = logop(p, idOR, $1, $3, &@2, &@$);
+                    /*% ripper: binary!($:1, ID2VAL(idOR), $:3) %*/
+                    }
+                | keyword_not '\n'? expr
+                    {
+                        $$ = call_uni_op(p, method_cond(p, $3, &@3), METHOD_NOT, &@1, &@$);
+                    /*% ripper: unary!(ID2VAL(idNOT), $:3) %*/
+                    }
+                | '!' command_call
+                    {
+                        $$ = call_uni_op(p, method_cond(p, $2, &@2), '!', &@1, &@$);
+                    /*% ripper: unary!(ID2VAL('\'!\''), $:2) %*/
+                    }
+                | arg tASSOC
+                    {
+                        value_expr($arg);
+                    }
+                  p_in_kwarg[ctxt] p_pvtbl p_pktbl
+                  p_top_expr_body[body]
+                    {
+                        pop_pktbl(p, $p_pktbl);
+                        pop_pvtbl(p, $p_pvtbl);
+                        p->ctxt.in_kwarg = $ctxt.in_kwarg;
+                        $$ = NEW_CASE3($arg, NEW_IN($body, 0, 0, &@body), &@$, &NULL_LOC, &NULL_LOC);
+                    /*% ripper: case!($:arg, in!($:body, Qnil, Qnil)) %*/
+                    }
+                | arg keyword_in
+                    {
+                        value_expr($arg);
+                    }
+                  p_in_kwarg[ctxt] p_pvtbl p_pktbl
+                  p_top_expr_body[body]
+                    {
+                        pop_pktbl(p, $p_pktbl);
+                        pop_pvtbl(p, $p_pvtbl);
+                        p->ctxt.in_kwarg = $ctxt.in_kwarg;
+                        $$ = NEW_CASE3($arg, NEW_IN($body, NEW_TRUE(&@body), NEW_FALSE(&@body), &@body), &@$, &NULL_LOC, &NULL_LOC);
+                    /*% ripper: case!($:arg, in!($:body, Qnil, Qnil)) %*/
+                    }
+                | arg %prec tLBRACE_ARG
+                ;
+
+def_name	: fname
+                    {
+                        numparam_name(p, $fname);
+                        local_push(p, 0);
+                        p->ctxt.in_def = 1;
+                        p->ctxt.in_rescue = before_rescue;
+                        p->ctxt.cant_return = 0;
+                        $$ = $fname;
+                    }
+                ;
+
+defn_head	: k_def def_name
+                    {
+                        $$ = def_head_save(p, $k_def);
+                        $$->nd_mid = $def_name;
+                        $$->nd_def = NEW_DEFN($def_name, 0, &@$);
+                    /*% ripper: $:def_name %*/
+                    }
+                ;
+
+defs_head	: k_def singleton dot_or_colon
+                    {
+                        SET_LEX_STATE(EXPR_FNAME);
+                    }
+                  def_name
+                    {
+                        SET_LEX_STATE(EXPR_ENDFN|EXPR_LABEL); /* force for args */
+                        $$ = def_head_save(p, $k_def);
+                        $$->nd_mid = $def_name;
+                        $$->nd_def = NEW_DEFS($singleton, $def_name, 0, &@$);
+                    /*% ripper: [$:singleton, $:dot_or_colon, $:def_name] %*/
+                    }
+                ;
+
+expr_value	: value_expr(expr)
+                | error
+                    {
+                        $$ = NEW_ERROR(&@$);
+                    }
+                ;
+
+expr_value_do	: {COND_PUSH(1);} expr_value do {COND_POP();}
+                    {
+                        $$ = $2;
+                    /*% ripper: $:2 %*/
+                    }
+                ;
+
+command_call	: command
+                | block_command
+                ;
+
+command_call_value	: value_expr(command_call)
+                    ;
+
+block_command	: block_call
+                | block_call call_op2 operation2 command_args
+                    {
+                        $$ = new_qcall(p, $2, $1, $3, $4, &@3, &@$);
+                    /*% ripper: method_add_arg!(call!($:1, $:2, $:3), $:4) %*/
+                    }
+                ;
+
+cmd_brace_block	: tLBRACE_ARG brace_body '}'
+                    {
+                        $$ = $2;
+                        set_embraced_location($$, &@1, &@3);
+                    /*% ripper: $:2 %*/
+                    }
+                ;
+
+fcall		: operation
+                    {
+                        $$ = NEW_FCALL($1, 0, &@$);
+                    /*% ripper: $:1 %*/
+                    }
+                ;
+
+command		: fcall command_args       %prec tLOWEST
+                    {
+                        $1->nd_args = $2;
+                        nd_set_last_loc($1, @2.end_pos);
+                        $$ = (NODE *)$1;
+                    /*% ripper: command!($:1, $:2) %*/
+                    }
+                | fcall command_args cmd_brace_block
+                    {
+                        block_dup_check(p, $2, $3);
+                        $1->nd_args = $2;
+                        $$ = method_add_block(p, (NODE *)$1, $3, &@$);
+                        fixpos($$, RNODE($1));
+                        nd_set_last_loc($1, @2.end_pos);
+                    /*% ripper: method_add_block!(command!($:1, $:2), $:3) %*/
+                    }
+                | primary_value call_op operation2 command_args	%prec tLOWEST
+                    {
+                        $$ = new_command_qcall(p, $2, $1, $3, $4, 0, &@3, &@$);
+                    /*% ripper: command_call!($:1, $:2, $:3, $:4) %*/
+                    }
+                | primary_value call_op operation2 command_args cmd_brace_block
+                    {
+                        $$ = new_command_qcall(p, $2, $1, $3, $4, $5, &@3, &@$);
+                    /*% ripper: method_add_block!(command_call!($:1, $:2, $:3, $:4), $:5) %*/
+                    }
+                | primary_value tCOLON2 operation2 command_args	%prec tLOWEST
+                    {
+                        $$ = new_command_qcall(p, idCOLON2, $1, $3, $4, 0, &@3, &@$);
+                    /*% ripper: command_call!($:1, $:2, $:3, $:4) %*/
+                    }
+                | primary_value tCOLON2 operation2 command_args cmd_brace_block
+                    {
+                        $$ = new_command_qcall(p, idCOLON2, $1, $3, $4, $5, &@3, &@$);
+                    /*% ripper: method_add_block!(command_call!($:1, $:2, $:3, $:4), $:5) %*/
+                   }
+                | primary_value tCOLON2 tCONSTANT '{' brace_body '}'
+                    {
+                        set_embraced_location($5, &@4, &@6);
+                        $$ = new_command_qcall(p, idCOLON2, $1, $3, 0, $5, &@3, &@$);
+                    /*% ripper: method_add_block!(command_call!($:1, $:2, $:3, Qnil), $:5) %*/
+                   }
+                | keyword_super command_args
+                    {
+                        $$ = NEW_SUPER($2, &@$, &@1, &NULL_LOC, &NULL_LOC);
+                        fixpos($$, $2);
+                    /*% ripper: super!($:2) %*/
+                    }
+                | k_yield command_args
+                    {
+                        $$ = NEW_YIELD($2, &@$, &@1, &NULL_LOC, &NULL_LOC);
+                        fixpos($$, $2);
+                    /*% ripper: yield!($:2) %*/
+                    }
+                | k_return call_args
+                    {
+                        $$ = NEW_RETURN(ret_args(p, $2), &@$, &@1);
+                    /*% ripper: return!($:2) %*/
+                    }
+                | keyword_break call_args
+                    {
+                        NODE *args = 0;
+                        args = ret_args(p, $2);
+                        $$ = add_block_exit(p, NEW_BREAK(args, &@$, &@1));
+                    /*% ripper: break!($:2) %*/
+                    }
+                | keyword_next call_args
+                    {
+                        NODE *args = 0;
+                        args = ret_args(p, $2);
+                        $$ = add_block_exit(p, NEW_NEXT(args, &@$, &@1));
+                    /*% ripper: next!($:2) %*/
+                    }
+                ;
+
+mlhs		: mlhs_basic
+                | tLPAREN mlhs_inner rparen
+                    {
+                        $$ = $2;
+                    /*% ripper: mlhs_paren!($:2) %*/
+                    }
+                ;
+
+mlhs_inner	: mlhs_basic
+                | tLPAREN mlhs_inner rparen
+                    {
+                        $$ = NEW_MASGN(NEW_LIST((NODE *)$2, &@$), 0, &@$);
+                    /*% ripper: mlhs_paren!($:2) %*/
+                    }
+                ;
+
+mlhs_basic	: mlhs_head
+                    {
+                        $$ = NEW_MASGN($1, 0, &@$);
+                    /*% ripper: $:1 %*/
+                    }
+                | mlhs_head mlhs_item
+                    {
+                        $$ = NEW_MASGN(list_append(p, $1, $2), 0, &@$);
+                    /*% ripper: mlhs_add!($:1, $:2) %*/
+                    }
+                | mlhs_head tSTAR mlhs_node
+                    {
+                        $$ = NEW_MASGN($1, $3, &@$);
+                    /*% ripper: mlhs_add_star!($:1, $:3) %*/
+                    }
+                | mlhs_head tSTAR mlhs_node ',' mlhs(mlhs_item)
+                    {
+                        $$ = NEW_MASGN($1, NEW_POSTARG($3,$5,&@$), &@$);
+                    /*% ripper: mlhs_add_post!(mlhs_add_star!($:1, $:3), $:5) %*/
+                    }
+                | mlhs_head tSTAR
+                    {
+                        $$ = NEW_MASGN($1, NODE_SPECIAL_NO_NAME_REST, &@$);
+                    /*% ripper: mlhs_add_star!($:1, Qnil) %*/
+                    }
+                | mlhs_head tSTAR ',' mlhs(mlhs_item)
+                    {
+                        $$ = NEW_MASGN($1, NEW_POSTARG(NODE_SPECIAL_NO_NAME_REST, $4, &@$), &@$);
+                    /*% ripper: mlhs_add_post!(mlhs_add_star!($:1, Qnil), $:4) %*/
+                    }
+                | tSTAR mlhs_node
+                    {
+                        $$ = NEW_MASGN(0, $2, &@$);
+                    /*% ripper: mlhs_add_star!(mlhs_new!, $:2) %*/
+                    }
+                | tSTAR mlhs_node ',' mlhs(mlhs_item)
+                    {
+                        $$ = NEW_MASGN(0, NEW_POSTARG($2,$4,&@$), &@$);
+                    /*% ripper: mlhs_add_post!(mlhs_add_star!(mlhs_new!, $:2), $:4) %*/
+                    }
+                | tSTAR
+                    {
+                        $$ = NEW_MASGN(0, NODE_SPECIAL_NO_NAME_REST, &@$);
+                    /*% ripper: mlhs_add_star!(mlhs_new!, Qnil) %*/
+                    }
+                | tSTAR ',' mlhs(mlhs_item)
+                    {
+                        $$ = NEW_MASGN(0, NEW_POSTARG(NODE_SPECIAL_NO_NAME_REST, $3, &@$), &@$);
+                    /*% ripper: mlhs_add_post!(mlhs_add_star!(mlhs_new!, Qnil), $:3) %*/
+                    }
+                ;
+
+mlhs_item	: mlhs_node
+                | tLPAREN mlhs_inner rparen
+                    {
+                        $$ = (NODE *)$2;
+                    /*% ripper: mlhs_paren!($:2) %*/
+                    }
+                ;
+
+mlhs_head	: mlhs_item ','
+                    {
+                        $$ = NEW_LIST($1, &@1);
+                    /*% ripper: mlhs_add!(mlhs_new!, $:1) %*/
+                    }
+                | mlhs_head mlhs_item ','
+                    {
+                        $$ = list_append(p, $1, $2);
+                    /*% ripper: mlhs_add!($:1, $:2) %*/
+                    }
+                ;
+
+
+mlhs_node	: user_or_keyword_variable
+                    {
+                    /*% ripper: var_field!($:1) %*/
+                        $$ = assignable(p, $1, 0, &@$);
+                    }
+                | primary_value '[' opt_call_args rbracket
+                    {
+                        $$ = aryset(p, $1, $3, &@$);
+                    /*% ripper: aref_field!($:1, $:3) %*/
+                    }
+                | primary_value call_op ident_or_const
+                    {
+                        anddot_multiple_assignment_check(p, &@2, $2);
+                        $$ = attrset(p, $1, $2, $3, &@$);
+                    /*% ripper: field!($:1, $:2, $:3) %*/
+                    }
+                | primary_value tCOLON2 tIDENTIFIER
+                    {
+                        $$ = attrset(p, $1, idCOLON2, $3, &@$);
+                    /*% ripper: const_path_field!($:1, $:3) %*/
+                    }
+                | primary_value tCOLON2 tCONSTANT
+                    {
+                    /*% ripper: const_path_field!($:1, $:3) %*/
+                        $$ = const_decl(p, NEW_COLON2($1, $3, &@$, &@2, &@3), &@$);
+                    }
+                | tCOLON3 tCONSTANT
+                    {
+                    /*% ripper: top_const_field!($:2) %*/
+                        $$ = const_decl(p, NEW_COLON3($2, &@$, &@1, &@2), &@$);
+                    }
+                | backref
+                    {
+                        VALUE MAYBE_UNUSED(e) = rb_backref_error(p, $1);
+                        $$ = NEW_ERROR(&@$);
+                    /*% ripper[error]: assign_error!(?e, var_field!($:1)) %*/
+                    }
+                ;
+
+lhs		: user_or_keyword_variable
+                    {
+                    /*% ripper: var_field!($:1) %*/
+                        $$ = assignable(p, $1, 0, &@$);
+                    }
+                | primary_value '[' opt_call_args rbracket
+                    {
+                        $$ = aryset(p, $1, $3, &@$);
+                    /*% ripper: aref_field!($:1, $:3) %*/
+                    }
+                | primary_value call_op ident_or_const
+                    {
+                        $$ = attrset(p, $1, $2, $3, &@$);
+                    /*% ripper: field!($:1, $:2, $:3) %*/
+                    }
+                | primary_value tCOLON2 tIDENTIFIER
+                    {
+                        $$ = attrset(p, $1, idCOLON2, $3, &@$);
+                    /*% ripper: field!($:1, $:2, $:3) %*/
+                    }
+                | primary_value tCOLON2 tCONSTANT
+                    {
+                    /*% ripper: const_path_field!($:1, $:3) %*/
+                        $$ = const_decl(p, NEW_COLON2($1, $3, &@$, &@2, &@3), &@$);
+                    }
+                | tCOLON3 tCONSTANT
+                    {
+                    /*% ripper: top_const_field!($:2) %*/
+                        $$ = const_decl(p, NEW_COLON3($2, &@$, &@1, &@2), &@$);
+                    }
+                | backref
+                    {
+                        VALUE MAYBE_UNUSED(e) = rb_backref_error(p, $1);
+                        $$ = NEW_ERROR(&@$);
+                    /*% ripper[error]: assign_error!(?e, var_field!($:1)) %*/
+                    }
+                ;
+
+cname		: tIDENTIFIER
+                    {
+                        static const char mesg[] = "class/module name must be CONSTANT";
+                    /*%%%*/
+                        yyerror1(&@1, mesg);
+                    /*% %*/
+                    /*% ripper[error]: class_name_error!(ERR_MESG(), $:1) %*/
+                    }
+                | tCONSTANT
+                ;
+
+cpath		: tCOLON3 cname
+                    {
+                        $$ = NEW_COLON3($2, &@$, &@1, &@2);
+                    /*% ripper: top_const_ref!($:2) %*/
+                    }
+                | cname
+                    {
+                        $$ = NEW_COLON2(0, $1, &@$, &NULL_LOC, &@1);
+                    /*% ripper: const_ref!($:1) %*/
+                    }
+                | primary_value tCOLON2 cname
+                    {
+                        $$ = NEW_COLON2($1, $3, &@$, &@2, &@3);
+                    /*% ripper: const_path_ref!($:1, $:3) %*/
+                    }
+                ;
+
+fname		: operation
+                | op
+                    {
+                        SET_LEX_STATE(EXPR_ENDFN);
+                        $$ = $1;
+                    }
+                | reswords
+                ;
+
+fitem		: fname
+                    {
+                        $$ = NEW_SYM(rb_id2str($1), &@$);
+                    /*% ripper: symbol_literal!($:1) %*/
+                    }
+                | symbol
+                ;
+
+undef_list	: fitem
+                    {
+                        $$ = NEW_UNDEF($1, &@$);
+                    /*% ripper: rb_ary_new3(1, $:1) %*/
+                    }
+                | undef_list ',' {SET_LEX_STATE(EXPR_FNAME|EXPR_FITEM);} fitem
+                    {
+                        nd_set_last_loc($1, @4.end_pos);
+                        rb_parser_ary_push_node(p, RNODE_UNDEF($1)->nd_undefs, $4);
+                    /*% ripper: rb_ary_push($:1, $:4) %*/
+                    }
+                ;
+
+op		: '|'		{ $$ = '|'; }
+                | '^'		{ $$ = '^'; }
+                | '&'		{ $$ = '&'; }
+                | tCMP		{ $$ = tCMP; }
+                | tEQ		{ $$ = tEQ; }
+                | tEQQ		{ $$ = tEQQ; }
+                | tMATCH	{ $$ = tMATCH; }
+                | tNMATCH	{ $$ = tNMATCH; }
+                | '>'		{ $$ = '>'; }
+                | tGEQ		{ $$ = tGEQ; }
+                | '<'		{ $$ = '<'; }
+                | tLEQ		{ $$ = tLEQ; }
+                | tNEQ		{ $$ = tNEQ; }
+                | tLSHFT	{ $$ = tLSHFT; }
+                | tRSHFT	{ $$ = tRSHFT; }
+                | '+'		{ $$ = '+'; }
+                | '-'		{ $$ = '-'; }
+                | '*'		{ $$ = '*'; }
+                | tSTAR		{ $$ = '*'; }
+                | '/'		{ $$ = '/'; }
+                | '%'		{ $$ = '%'; }
+                | tPOW		{ $$ = tPOW; }
+                | tDSTAR	{ $$ = tDSTAR; }
+                | '!'		{ $$ = '!'; }
+                | '~'		{ $$ = '~'; }
+                | tUPLUS	{ $$ = tUPLUS; }
+                | tUMINUS	{ $$ = tUMINUS; }
+                | tAREF		{ $$ = tAREF; }
+                | tASET		{ $$ = tASET; }
+                | '`'		{ $$ = '`'; }
+                ;
+
+reswords	: keyword__LINE__ | keyword__FILE__ | keyword__ENCODING__
+                | keyword_BEGIN | keyword_END
+                | keyword_alias | keyword_and | keyword_begin
+                | keyword_break | keyword_case | keyword_class | keyword_def
+                | keyword_defined | keyword_do | keyword_else | keyword_elsif
+                | keyword_end | keyword_ensure | keyword_false
+                | keyword_for | keyword_in | keyword_module | keyword_next
+                | keyword_nil | keyword_not | keyword_or | keyword_redo
+                | keyword_rescue | keyword_retry | keyword_return | keyword_self
+                | keyword_super | keyword_then | keyword_true | keyword_undef
+                | keyword_when | keyword_yield | keyword_if | keyword_unless
+                | keyword_while | keyword_until
+                ;
+
+arg		: asgn(arg_rhs)
+                | op_asgn(arg_rhs)
+                | range_expr(arg)
+                | arg '+' arg
+                    {
+                        $$ = call_bin_op(p, $1, '+', $3, &@2, &@$);
+                    /*% ripper: binary!($:1, ID2VAL('\'+\''), $:3) %*/
+                    }
+                | arg '-' arg
+                    {
+                        $$ = call_bin_op(p, $1, '-', $3, &@2, &@$);
+                    /*% ripper: binary!($:1, ID2VAL('\'-\''), $:3) %*/
+                    }
+                | arg '*' arg
+                    {
+                        $$ = call_bin_op(p, $1, '*', $3, &@2, &@$);
+                    /*% ripper: binary!($:1, ID2VAL('\'*\''), $:3) %*/
+                    }
+                | arg '/' arg
+                    {
+                        $$ = call_bin_op(p, $1, '/', $3, &@2, &@$);
+                    /*% ripper: binary!($:1, ID2VAL('\'/\''), $:3) %*/
+                    }
+                | arg '%' arg
+                    {
+                        $$ = call_bin_op(p, $1, '%', $3, &@2, &@$);
+                    /*% ripper: binary!($:1, ID2VAL('\'%\''), $:3) %*/
+                    }
+                | arg tPOW arg
+                    {
+                        $$ = call_bin_op(p, $1, idPow, $3, &@2, &@$);
+                    /*% ripper: binary!($:1, ID2VAL(idPow), $:3) %*/
+                    }
+                | tUMINUS_NUM simple_numeric tPOW arg
+                    {
+                        $$ = call_uni_op(p, call_bin_op(p, $2, idPow, $4, &@2, &@$), idUMinus, &@1, &@$);
+                    /*% ripper: unary!(ID2VAL(idUMinus), binary!($:2, ID2VAL(idPow), $:4)) %*/
+                    }
+                | tUPLUS arg
+                    {
+                        $$ = call_uni_op(p, $2, idUPlus, &@1, &@$);
+                    /*% ripper: unary!(ID2VAL(idUPlus), $:2) %*/
+                    }
+                | tUMINUS arg
+                    {
+                        $$ = call_uni_op(p, $2, idUMinus, &@1, &@$);
+                    /*% ripper: unary!(ID2VAL(idUMinus), $:2) %*/
+                    }
+                | arg '|' arg
+                    {
+                        $$ = call_bin_op(p, $1, '|', $3, &@2, &@$);
+                    /*% ripper: binary!($:1, ID2VAL('\'|\''), $:3) %*/
+                    }
+                | arg '^' arg
+                    {
+                        $$ = call_bin_op(p, $1, '^', $3, &@2, &@$);
+                    /*% ripper: binary!($:1, ID2VAL('\'^\''), $:3) %*/
+                    }
+                | arg '&' arg
+                    {
+                        $$ = call_bin_op(p, $1, '&', $3, &@2, &@$);
+                    /*% ripper: binary!($:1, ID2VAL('\'&\''), $:3) %*/
+                    }
+                | arg tCMP arg
+                    {
+                        $$ = call_bin_op(p, $1, idCmp, $3, &@2, &@$);
+                    /*% ripper: binary!($:1, ID2VAL(idCmp), $:3) %*/
+                    }
+                | rel_expr   %prec tCMP
+                | arg tEQ arg
+                    {
+                        $$ = call_bin_op(p, $1, idEq, $3, &@2, &@$);
+                    /*% ripper: binary!($:1, ID2VAL(idEq), $:3) %*/
+                    }
+                | arg tEQQ arg
+                    {
+                        $$ = call_bin_op(p, $1, idEqq, $3, &@2, &@$);
+                    /*% ripper: binary!($:1, ID2VAL(idEqq), $:3) %*/
+                    }
+                | arg tNEQ arg
+                    {
+                        $$ = call_bin_op(p, $1, idNeq, $3, &@2, &@$);
+                    /*% ripper: binary!($:1, ID2VAL(idNeq), $:3) %*/
+                    }
+                | arg tMATCH arg
+                    {
+                        $$ = match_op(p, $1, $3, &@2, &@$);
+                    /*% ripper: binary!($:1, ID2VAL(idEqTilde), $:3) %*/
+                    }
+                | arg tNMATCH arg
+                    {
+                        $$ = call_bin_op(p, $1, idNeqTilde, $3, &@2, &@$);
+                    /*% ripper: binary!($:1, ID2VAL(idNeqTilde), $:3) %*/
+                    }
+                | '!' arg
+                    {
+                        $$ = call_uni_op(p, method_cond(p, $2, &@2), '!', &@1, &@$);
+                    /*% ripper: unary!(ID2VAL('\'!\''), $:2) %*/
+                    }
+                | '~' arg
+                    {
+                        $$ = call_uni_op(p, $2, '~', &@1, &@$);
+                    /*% ripper: unary!(ID2VAL('\'~\''), $:2) %*/
+                    }
+                | arg tLSHFT arg
+                    {
+                        $$ = call_bin_op(p, $1, idLTLT, $3, &@2, &@$);
+                    /*% ripper: binary!($:1, ID2VAL(idLTLT), $:3) %*/
+                    }
+                | arg tRSHFT arg
+                    {
+                        $$ = call_bin_op(p, $1, idGTGT, $3, &@2, &@$);
+                    /*% ripper: binary!($:1, ID2VAL(idGTGT), $:3) %*/
+                    }
+                | arg tANDOP arg
+                    {
+                        $$ = logop(p, idANDOP, $1, $3, &@2, &@$);
+                    /*% ripper: binary!($:1, ID2VAL(idANDOP), $:3) %*/
+                    }
+                | arg tOROP arg
+                    {
+                        $$ = logop(p, idOROP, $1, $3, &@2, &@$);
+                    /*% ripper: binary!($:1, ID2VAL(idOROP), $:3) %*/
+                    }
+                | keyword_defined '\n'? begin_defined arg
+                    {
+                        p->ctxt.in_defined = $3.in_defined;
+                        $$ = new_defined(p, $4, &@$);
+                    /*% ripper: defined!($:4) %*/
+                    }
+                | def_endless_method(endless_arg)
+                | ternary
+                | primary
+                ;
+
+ternary		: arg '?' arg '\n'? ':' arg
+                    {
+                        value_expr($1);
+                        $$ = new_if(p, $1, $3, $6, &@$, &NULL_LOC, &@5, &NULL_LOC);
+                        fixpos($$, $1);
+                    /*% ripper: ifop!($:1, $:3, $:6) %*/
+                    }
+                ;
+
+endless_arg	: arg %prec modifier_rescue
+                | endless_arg modifier_rescue after_rescue arg
+                    {
+                        p->ctxt.in_rescue = $3.in_rescue;
+                        $$ = rescued_expr(p, $1, $4, &@1, &@2, &@4);
+                    /*% ripper: rescue_mod!($:1, $:4) %*/
+                    }
+                | keyword_not '\n'? endless_arg
+                    {
+                        $$ = call_uni_op(p, method_cond(p, $3, &@3), METHOD_NOT, &@1, &@$);
+                    /*% ripper: unary!(ID2VAL(idNOT), $:3) %*/
+                    }
+                ;
+
+relop		: '>'  {$$ = '>';}
+                | '<'  {$$ = '<';}
+                | tGEQ {$$ = idGE;}
+                | tLEQ {$$ = idLE;}
+                ;
+
+rel_expr	: arg relop arg   %prec '>'
+                    {
+                        $$ = call_bin_op(p, $1, $2, $3, &@2, &@$);
+                    /*% ripper: binary!($:1, ID2VAL($2), $:3) %*/
+                    }
+                | rel_expr relop arg   %prec '>'
+                    {
+                        rb_warning1("comparison '%s' after comparison", WARN_ID($2));
+                        $$ = call_bin_op(p, $1, $2, $3, &@2, &@$);
+                    /*% ripper: binary!($:1, ID2VAL($2), $:3) %*/
+                    }
+                ;
+
+lex_ctxt	: none
+                    {
+                        $$ = p->ctxt;
                     }
-                | keyword_alias tGVAR tGVAR
+                ;
+
+begin_defined	: lex_ctxt
                     {
-                    /*%%%*/
-                        $$ = NEW_VALIAS($2, $3, &@$);
-                    /*% %*/
-                    /*% ripper: var_alias!($2, $3) %*/
+                        p->ctxt.in_defined = 1;
+                        $$ = $1;
                     }
-                | keyword_alias tGVAR tBACK_REF
+                ;
+
+after_rescue	: lex_ctxt
                     {
-                    /*%%%*/
-                        char buf[2];
-                        buf[0] = '$';
-                        buf[1] = (char)$3->nd_nth;
-                        $$ = NEW_VALIAS($2, rb_intern2(buf, 2), &@$);
-                    /*% %*/
-                    /*% ripper: var_alias!($2, $3) %*/
+                        p->ctxt.in_rescue = after_rescue;
+                        $$ = $1;
                     }
-                | keyword_alias tGVAR tNTH_REF
+                ;
+
+arg_value	: value_expr(arg)
+                ;
+
+aref_args	: none
+                | args trailer
+                | args ',' assocs trailer
                     {
-                        static const char mesg[] = "can't make alias for the number variables";
-                    /*%%%*/
-                        yyerror1(&@3, mesg);
-                        $$ = NEW_BEGIN(0, &@$);
-                    /*% %*/
-                    /*% ripper[error]: alias_error!(ERR_MESG(), $3) %*/
+                        $$ = $3 ? arg_append(p, $1, new_hash(p, $3, &@3), &@$) : $1;
+                    /*% ripper: args_add!($:1, bare_assoc_hash!($:3)) %*/
                     }
-                | keyword_undef undef_list
+                | assocs trailer
                     {
-                    /*%%%*/
-                        $$ = $2;
-                    /*% %*/
-                    /*% ripper: undef!($2) %*/
+                        $$ = $1 ? NEW_LIST(new_hash(p, $1, &@1), &@$) : 0;
+                    /*% ripper: args_add!(args_new!, bare_assoc_hash!($:1)) %*/
                     }
-                | stmt modifier_if expr_value
+                ;
+
+arg_rhs 	: arg   %prec tOP_ASGN
                     {
-                    /*%%%*/
-                        $$ = new_if(p, $3, remove_begin($1), 0, &@$);
-                        fixpos($$, $3);
-                    /*% %*/
-                    /*% ripper: if_mod!($3, $1) %*/
+                        value_expr($1);
+                        $$ = $1;
                     }
-                | stmt modifier_unless expr_value
+                | arg modifier_rescue after_rescue arg
                     {
-                    /*%%%*/
-                        $$ = new_unless(p, $3, remove_begin($1), 0, &@$);
-                        fixpos($$, $3);
-                    /*% %*/
-                    /*% ripper: unless_mod!($3, $1) %*/
+                        p->ctxt.in_rescue = $3.in_rescue;
+                        value_expr($1);
+                        $$ = rescued_expr(p, $1, $4, &@1, &@2, &@4);
+                    /*% ripper: rescue_mod!($:1, $:4) %*/
                     }
-                | stmt modifier_while expr_value
+                ;
+
+paren_args	: '(' opt_call_args rparen
                     {
-                    /*%%%*/
-                        if ($1 && nd_type_p($1, NODE_BEGIN)) {
-                            $$ = NEW_WHILE(cond(p, $3, &@3), $1->nd_body, 0, &@$);
+                        $$ = $2;
+                    /*% ripper: arg_paren!($:2) %*/
+                    }
+                | '(' args ',' args_forward rparen
+                    {
+                        if (!check_forwarding_args(p)) {
+                            $$ = 0;
                         }
                         else {
-                            $$ = NEW_WHILE(cond(p, $3, &@3), $1, 1, &@$);
+                            $$ = new_args_forward_call(p, $2, &@4, &@$);
+                        /*% ripper: arg_paren!(args_add!($:2, $:4)) %*/
                         }
-                    /*% %*/
-                    /*% ripper: while_mod!($3, $1) %*/
                     }
-                | stmt modifier_until expr_value
+                | '(' args_forward rparen
                     {
-                    /*%%%*/
-                        if ($1 && nd_type_p($1, NODE_BEGIN)) {
-                            $$ = NEW_UNTIL(cond(p, $3, &@3), $1->nd_body, 0, &@$);
+                        if (!check_forwarding_args(p)) {
+                            $$ = 0;
                         }
                         else {
-                            $$ = NEW_UNTIL(cond(p, $3, &@3), $1, 1, &@$);
+                            $$ = new_args_forward_call(p, 0, &@2, &@$);
+                        /*% ripper: arg_paren!($:2) %*/
                         }
-                    /*% %*/
-                    /*% ripper: until_mod!($3, $1) %*/
                     }
-                | stmt modifier_rescue stmt
+                ;
+
+opt_paren_args	: none
+                | paren_args
                     {
-                    /*%%%*/
-                        NODE *resq;
-                        YYLTYPE loc = code_loc_gen(&@2, &@3);
-                        resq = NEW_RESBODY(0, remove_begin($3), 0, &loc);
-                        $$ = NEW_RESCUE(remove_begin($1), resq, 0, &@$);
-                    /*% %*/
-                    /*% ripper: rescue_mod!($1, $3) %*/
+                        $$ = $1 ? $1 : NODE_SPECIAL_EMPTY_ARGS;
                     }
-                | keyword_END '{' compstmt '}'
+                ;
+
+opt_call_args	: none
+                | call_args
+                | args ','
+                | args ',' assocs ','
                     {
-                        if (p->ctxt.in_def) {
-                            rb_warn0("END in method; use at_exit");
+                        $$ = $3 ? arg_append(p, $1, new_hash(p, $3, &@3), &@$) : $1;
+                    /*% ripper: args_add!($:1, bare_assoc_hash!($:3)) %*/
+                    }
+                | assocs ','
+                    {
+                        $$ = $1 ? NEW_LIST(new_hash(p, $1, &@1), &@1) : 0;
+                    /*% ripper: args_add!(args_new!, bare_assoc_hash!($:1)) %*/
+                    }
+                ;
+
+call_args	: value_expr(command)
+                    {
+                        $$ = NEW_LIST($1, &@$);
+                    /*% ripper: args_add!(args_new!, $:1) %*/
+                    }
+                | args opt_block_arg
+                    {
+                        $$ = arg_blk_pass($1, $2);
+                    /*% ripper: args_add_block!($:1, $:2) %*/
+                    }
+                | assocs opt_block_arg
+                    {
+                        $$ = $1 ? NEW_LIST(new_hash(p, $1, &@1), &@1) : 0;
+                        $$ = arg_blk_pass($$, $2);
+                    /*% ripper: args_add_block!(args_add!(args_new!, bare_assoc_hash!($:1)), $:2) %*/
+                    }
+                | args ',' assocs opt_block_arg
+                    {
+                        $$ = $3 ? arg_append(p, $1, new_hash(p, $3, &@3), &@$) : $1;
+                        $$ = arg_blk_pass($$, $4);
+                    /*% ripper: args_add_block!(args_add!($:1, bare_assoc_hash!($:3)), $:4) %*/
+                    }
+                | block_arg
+                    /*% ripper: args_add_block!(args_new!, $:1) %*/
+                ;
+
+command_args	:   {
+                        /* If call_args starts with a open paren '(' or '[',
+                         * look-ahead reading of the letters calls CMDARG_PUSH(0),
+                         * but the push must be done after CMDARG_PUSH(1).
+                         * So this code makes them consistent by first cancelling
+                         * the premature CMDARG_PUSH(0), doing CMDARG_PUSH(1),
+                         * and finally redoing CMDARG_PUSH(0).
+                         */
+                        int lookahead = 0;
+                        switch (yychar) {
+                          case '(': case tLPAREN: case tLPAREN_ARG: case '[': case tLBRACK:
+                            lookahead = 1;
                         }
-                    /*%%%*/
-                        {
-                            NODE *scope = NEW_NODE(
-                                NODE_SCOPE, 0 /* tbl */, $3 /* body */, 0 /* args */, &@$);
-                            $$ = NEW_POSTEXE(scope, &@$);
+                        if (lookahead) CMDARG_POP();
+                        CMDARG_PUSH(1);
+                        if (lookahead) CMDARG_PUSH(0);
+                    }
+                  call_args
+                    {
+                        /* call_args can be followed by tLBRACE_ARG (that does CMDARG_PUSH(0) in the lexer)
+                         * but the push must be done after CMDARG_POP() in the parser.
+                         * So this code does CMDARG_POP() to pop 0 pushed by tLBRACE_ARG,
+                         * CMDARG_POP() to pop 1 pushed by command_args,
+                         * and CMDARG_PUSH(0) to restore back the flag set by tLBRACE_ARG.
+                         */
+                        int lookahead = 0;
+                        switch (yychar) {
+                          case tLBRACE_ARG:
+                            lookahead = 1;
                         }
-                    /*% %*/
-                    /*% ripper: END!($3) %*/
+                        if (lookahead) CMDARG_POP();
+                        CMDARG_POP();
+                        if (lookahead) CMDARG_PUSH(0);
+                        $$ = $2;
+                    /*% ripper: $:2 %*/
                     }
-                | command_asgn
-                | mlhs '=' lex_ctxt command_call
+                ;
+
+block_arg	: tAMPER arg_value
                     {
-                    /*%%%*/
-                        value_expr($4);
-                        $$ = node_assign(p, $1, $4, $3, &@$);
-                    /*% %*/
-                    /*% ripper: massign!($1, $4) %*/
+                        $$ = NEW_BLOCK_PASS($2, &@$, &@1);
+                    /*% ripper: $:2 %*/
                     }
-                | lhs '=' lex_ctxt mrhs
+                | tAMPER
                     {
-                    /*%%%*/
-                        $$ = node_assign(p, $1, $4, $3, &@$);
-                    /*% %*/
-                    /*% ripper: assign!($1, $4) %*/
+                        forwarding_arg_check(p, idFWD_BLOCK, idFWD_ALL, "block");
+                        $$ = NEW_BLOCK_PASS(NEW_LVAR(idFWD_BLOCK, &@1), &@$, &@1);
+                    /*% ripper: Qnil %*/
+                    }
+                ;
+
+opt_block_arg	: ',' block_arg
+                    {
+                        $$ = $2;
+                    /*% ripper: $:2 %*/
                     }
-                | mlhs '=' lex_ctxt mrhs_arg modifier_rescue stmt
+                | none
                     {
-                    /*%%%*/
-                        YYLTYPE loc = code_loc_gen(&@5, &@6);
-                        $$ = node_assign(p, $1, NEW_RESCUE($4, NEW_RESBODY(0, remove_begin($6), 0, &loc), 0, &@$), $3, &@$);
-                    /*% %*/
-                    /*% ripper: massign!($1, rescue_mod!($4, $6)) %*/
+                        $$ = 0;
+                    /*% ripper: Qfalse %*/
+                    }
+                ;
+
+/* value */
+args		: arg_value
+                    {
+                        $$ = NEW_LIST($arg_value, &@$);
+                    /*% ripper: args_add!(args_new!, $:arg_value) %*/
+                    }
+                | arg_splat
+                    {
+                        $$ = $arg_splat;
+                    /*% ripper: args_add_star!(args_new!, $:arg_splat) %*/
+                    }
+                | args[non_last_args] ',' arg_value
+                    {
+                        $$ = last_arg_append(p, $non_last_args, $arg_value, &@$);
+                    /*% ripper: args_add!($:non_last_args, $:arg_value) %*/
+                    }
+                | args[non_last_args] ',' arg_splat
+                    {
+                        $$ = rest_arg_append(p, $non_last_args, RNODE_SPLAT($arg_splat)->nd_head, &@$);
+                    /*% ripper: args_add_star!($:non_last_args, $:arg_splat) %*/
+                    }
+                ;
+
+/* value */
+arg_splat	: tSTAR arg_value
+                    {
+                        $$ = NEW_SPLAT($arg_value, &@$, &@tSTAR);
+                    /*% ripper: $:arg_value %*/
+                    }
+                | tSTAR /* none */
+                    {
+                        forwarding_arg_check(p, idFWD_REST, idFWD_ALL, "rest");
+                        $$ = NEW_SPLAT(NEW_LVAR(idFWD_REST, &@tSTAR), &@$, &@tSTAR);
+                    /*% ripper: Qnil %*/
+                    }
+                ;
+
+/* value */
+mrhs_arg	: mrhs
+                | arg_value
+                ;
+
+/* value */
+mrhs		: args ',' arg_value
+                    {
+                        $$ = last_arg_append(p, $args, $arg_value, &@$);
+                    /*% ripper: mrhs_add!(mrhs_new_from_args!($:args), $:arg_value) %*/
+                    }
+                | args ',' tSTAR arg_value
+                    {
+                        $$ = rest_arg_append(p, $args, $arg_value, &@$);
+                    /*% ripper: mrhs_add_star!(mrhs_new_from_args!($:args), $:arg_value) %*/
+                    }
+                | tSTAR arg_value
+                    {
+                        $$ = NEW_SPLAT($arg_value, &@$, &@tSTAR);
+                    /*% ripper: mrhs_add_star!(mrhs_new!, $:arg_value) %*/
+                    }
+                ;
+
+%rule %inline inline_primary
+                : literal
+                | strings
+                | xstring
+                | regexp
+                | words
+                | qwords
+                | symbols
+                | qsymbols
+                ;
+
+primary		: inline_primary
+            | var_ref
+            | backref
+            | tFID
+                {
+                    $$ = (NODE *)NEW_FCALL($1, 0, &@$);
+                /*% ripper: method_add_arg!(fcall!($:1), args_new!) %*/
+                }
+            | k_begin
+                {
+                    CMDARG_PUSH(0);
+                }
+              bodystmt
+              k_end
+                {
+                    CMDARG_POP();
+                    set_line_body($3, @1.end_pos.lineno);
+                    $$ = NEW_BEGIN($3, &@$);
+                    nd_set_line($$, @1.end_pos.lineno);
+                /*% ripper: begin!($:3) %*/
+                }
+            | tLPAREN_ARG compstmt(stmts) {SET_LEX_STATE(EXPR_ENDARG);} ')'
+                {
+                    if (nd_type_p($2, NODE_SELF)) RNODE_SELF($2)->nd_state = 0;
+                    $$ = $2;
+                /*% ripper: paren!($:2) %*/
+                }
+            | tLPAREN compstmt(stmts) ')'
+                {
+                    if (nd_type_p($2, NODE_SELF)) RNODE_SELF($2)->nd_state = 0;
+                    $$ = NEW_BLOCK($2, &@$);
+                /*% ripper: paren!($:2) %*/
+                }
+            | primary_value tCOLON2 tCONSTANT
+                {
+                    $$ = NEW_COLON2($1, $3, &@$, &@2, &@3);
+                /*% ripper: const_path_ref!($:1, $:3) %*/
+                }
+            | tCOLON3 tCONSTANT
+                {
+                    $$ = NEW_COLON3($2, &@$, &@1, &@2);
+                /*% ripper: top_const_ref!($:2) %*/
+                }
+            | tLBRACK aref_args ']'
+                {
+                    $$ = make_list($2, &@$);
+                /*% ripper: array!($:2) %*/
+                }
+            | tLBRACE assoc_list '}'
+                {
+                    $$ = new_hash(p, $2, &@$);
+                    RNODE_HASH($$)->nd_brace = TRUE;
+                /*% ripper: hash!($:2) %*/
+                }
+            | k_return
+                {
+                    $$ = NEW_RETURN(0, &@$, &@1);
+                /*% ripper: return0! %*/
+                }
+            | k_yield '(' call_args rparen
+                {
+                    $$ = NEW_YIELD($3, &@$, &@1, &@2, &@4);
+                /*% ripper: yield!(paren!($:3)) %*/
+                }
+            | k_yield '(' rparen
+                {
+                    $$ = NEW_YIELD(0, &@$, &@1, &@2, &@3);
+                /*% ripper: yield!(paren!(args_new!)) %*/
+                }
+            | k_yield
+                {
+                    $$ = NEW_YIELD(0, &@$, &@1, &NULL_LOC, &NULL_LOC);
+                /*% ripper: yield0! %*/
+                }
+            | keyword_defined '\n'? '(' begin_defined expr rparen
+                {
+                    p->ctxt.in_defined = $4.in_defined;
+                    $$ = new_defined(p, $5, &@$);
+                /*% ripper: defined!($:5) %*/
+                }
+            | keyword_not '(' expr rparen
+                {
+                    $$ = call_uni_op(p, method_cond(p, $3, &@3), METHOD_NOT, &@1, &@$);
+                /*% ripper: unary!(ID2VAL(idNOT), $:3) %*/
+                }
+            | keyword_not '(' rparen
+                {
+                    $$ = call_uni_op(p, method_cond(p, new_nil(&@2), &@2), METHOD_NOT, &@1, &@$);
+                /*% ripper: unary!(ID2VAL(idNOT), Qnil) %*/
+                }
+            | fcall brace_block
+                {
+                    $$ = method_add_block(p, (NODE *)$1, $2, &@$);
+                /*% ripper: method_add_block!(method_add_arg!(fcall!($:1), args_new!), $:2) %*/
+                }
+            | method_call
+            | method_call brace_block
+                {
+                    block_dup_check(p, get_nd_args(p, $1), $2);
+                    $$ = method_add_block(p, $1, $2, &@$);
+                /*% ripper: method_add_block!($:1, $:2) %*/
+                }
+            | lambda
+            | k_if expr_value then
+              compstmt(stmts)
+              if_tail
+              k_end
+                {
+                    if ($5 && nd_type_p($5, NODE_IF))
+                        RNODE_IF($5)->end_keyword_loc = @6;
+
+                    $$ = new_if(p, $2, $4, $5, &@$, &@1, &@3, &@6);
+                    fixpos($$, $2);
+                /*% ripper: if!($:2, $:4, $:5) %*/
+                }
+            | k_unless expr_value then
+              compstmt(stmts)
+              opt_else
+              k_end
+                {
+                    $$ = new_unless(p, $2, $4, $5, &@$, &@1, &@3, &@6);
+                    fixpos($$, $2);
+                /*% ripper: unless!($:2, $:4, $:5) %*/
+                }
+            | k_while expr_value_do
+              compstmt(stmts)
+              k_end
+                {
+                    restore_block_exit(p, $1);
+                    $$ = NEW_WHILE(cond(p, $2, &@2), $3, 1, &@$, &@1, &@4);
+                    fixpos($$, $2);
+                /*% ripper: while!($:2, $:3) %*/
+                }
+            | k_until expr_value_do
+              compstmt(stmts)
+              k_end
+                {
+                    restore_block_exit(p, $1);
+                    $$ = NEW_UNTIL(cond(p, $2, &@2), $3, 1, &@$, &@1, &@4);
+                    fixpos($$, $2);
+                /*% ripper: until!($:2, $:3) %*/
+                }
+            | k_case expr_value terms?
+                {
+                    $$ = p->case_labels;
+                    p->case_labels = CHECK_LITERAL_WHEN;
+                }<labels>
+              case_body
+              k_end
+                {
+                    if (CASE_LABELS_ENABLED_P(p->case_labels)) st_free_table(p->case_labels);
+                    p->case_labels = $4;
+                    $$ = NEW_CASE($2, $5, &@$, &@1, &@6);
+                    fixpos($$, $2);
+                /*% ripper: case!($:2, $:5) %*/
+                }
+            | k_case terms?
+                {
+                    $$ = p->case_labels;
+                    p->case_labels = 0;
+                }<labels>
+              case_body
+              k_end
+                {
+                    if (p->case_labels) st_free_table(p->case_labels);
+                    p->case_labels = $3;
+                    $$ = NEW_CASE2($4, &@$, &@1, &@5);
+                /*% ripper: case!(Qnil, $:4) %*/
+                }
+            | k_case expr_value terms?
+              p_case_body
+              k_end
+                {
+                    $$ = NEW_CASE3($2, $4, &@$, &@1, &@5);
+                /*% ripper: case!($:2, $:4) %*/
+                }
+            | k_for for_var keyword_in
+              {COND_PUSH(1);} expr_value do {COND_POP();}
+              compstmt(stmts)
+              k_end
+                {
+                    restore_block_exit(p, $k_for);
+                    /*
+                     *  for a, b, c in e
+                     *  #=>
+                     *  e.each{|*x| a, b, c = x}
+                     *
+                     *  for a in e
+                     *  #=>
+                     *  e.each{|x| a, = x}
+                     */
+                    ID id = internal_id(p);
+                    rb_node_args_aux_t *m = NEW_ARGS_AUX(0, 0, &NULL_LOC);
+                    rb_node_args_t *args;
+                    NODE *scope, *internal_var = NEW_DVAR(id, &@for_var);
+                    rb_ast_id_table_t *tbl = rb_ast_new_local_table(p->ast, 1);
+                    tbl->ids[0] = id; /* internal id */
+
+                    switch (nd_type($for_var)) {
+                      case NODE_LASGN:
+                      case NODE_DASGN: /* e.each {|internal_var| a = internal_var; ... } */
+                        set_nd_value(p, $for_var, internal_var);
+                        id = 0;
+                        m->nd_plen = 1;
+                        m->nd_next = $for_var;
+                        break;
+                        case NODE_MASGN: /* e.each {|*internal_var| a, b, c = (internal_var.length == 1 && Array === (tmp = internal_var[0]) ? tmp : internal_var); ... } */
+                        m->nd_next = node_assign(p, $for_var, NEW_FOR_MASGN(internal_var, &@for_var), NO_LEX_CTXT, &@for_var);
+                        break;
+                        default: /* e.each {|*internal_var| @a, B, c[1], d.attr = internal_val; ... } */
+                        m->nd_next = node_assign(p, (NODE *)NEW_MASGN(NEW_LIST($for_var, &@for_var), 0, &@for_var), internal_var, NO_LEX_CTXT, &@for_var);
+                    }
+                    /* {|*internal_id| <m> = internal_id; ... } */
+                    args = new_args(p, m, 0, id, 0, new_args_tail(p, 0, 0, 0, &@for_var), &@for_var);
+                    scope = NEW_SCOPE2(tbl, args, $compstmt, &@$);
+                    YYLTYPE do_keyword_loc = $do == keyword_do_cond ? @do : NULL_LOC;
+                    $$ = NEW_FOR($5, scope, &@$, &@k_for, &@keyword_in, &do_keyword_loc, &@k_end);
+                    fixpos($$, $for_var);
+                /*% ripper: for!($:for_var, $:expr_value, $:compstmt) %*/
+                }
+            | k_class cpath superclass
+                {
+                    begin_definition("class", &@k_class, &@cpath);
+                }
+              bodystmt
+              k_end
+                {
+                    YYLTYPE inheritance_operator_loc = NULL_LOC;
+                    if ($superclass) {
+                        inheritance_operator_loc = @superclass;
+                        inheritance_operator_loc.end_pos.column = inheritance_operator_loc.beg_pos.column + 1;
+                    }
+                    $$ = NEW_CLASS($cpath, $bodystmt, $superclass, &@$, &@k_class, &inheritance_operator_loc, &@k_end);
+                    nd_set_line(RNODE_CLASS($$)->nd_body, @k_end.end_pos.lineno);
+                    set_line_body($bodystmt, @superclass.end_pos.lineno);
+                    nd_set_line($$, @superclass.end_pos.lineno);
+                /*% ripper: class!($:cpath, $:superclass, $:bodystmt) %*/
+                    local_pop(p);
+                    p->ctxt.in_class = $k_class.in_class;
+                    p->ctxt.cant_return = $k_class.cant_return;
+                    p->ctxt.shareable_constant_value = $k_class.shareable_constant_value;
+                }
+            | k_class tLSHFT expr_value
+                {
+                    begin_definition("", &@k_class, &@tLSHFT);
+                }
+              term
+              bodystmt
+              k_end
+                {
+                    $$ = NEW_SCLASS($expr_value, $bodystmt, &@$);
+                    nd_set_line(RNODE_SCLASS($$)->nd_body, @k_end.end_pos.lineno);
+                    set_line_body($bodystmt, nd_line($expr_value));
+                    fixpos($$, $expr_value);
+                /*% ripper: sclass!($:expr_value, $:bodystmt) %*/
+                    local_pop(p);
+                    p->ctxt.in_def = $k_class.in_def;
+                    p->ctxt.in_class = $k_class.in_class;
+                    p->ctxt.cant_return = $k_class.cant_return;
+                    p->ctxt.shareable_constant_value = $k_class.shareable_constant_value;
+                }
+            | k_module cpath
+                {
+                    begin_definition("module", &@k_module, &@cpath);
+                }
+              bodystmt
+              k_end
+                {
+                    $$ = NEW_MODULE($cpath, $bodystmt, &@$);
+                    nd_set_line(RNODE_MODULE($$)->nd_body, @k_end.end_pos.lineno);
+                    set_line_body($bodystmt, @cpath.end_pos.lineno);
+                    nd_set_line($$, @cpath.end_pos.lineno);
+                /*% ripper: module!($:cpath, $:bodystmt) %*/
+                    local_pop(p);
+                    p->ctxt.in_class = $k_module.in_class;
+                    p->ctxt.cant_return = $k_module.cant_return;
+                    p->ctxt.shareable_constant_value = $k_module.shareable_constant_value;
+                }
+            | defn_head[head]
+              f_arglist[args]
+                {
+                    push_end_expect_token_locations(p, &@head.beg_pos);
+                }
+              bodystmt
+              k_end
+                {
+                    restore_defun(p, $head);
+                    $bodystmt = new_scope_body(p, $args, $bodystmt, &@$);
+                    ($$ = $head->nd_def)->nd_loc = @$;
+                    RNODE_DEFN($$)->nd_defn = $bodystmt;
+                /*% ripper: def!($:head, $:args, $:bodystmt) %*/
+                    local_pop(p);
+                }
+            | defs_head[head]
+              f_arglist[args]
+                {
+                    push_end_expect_token_locations(p, &@head.beg_pos);
+                }
+              bodystmt
+              k_end
+                {
+                    restore_defun(p, $head);
+                    $bodystmt = new_scope_body(p, $args, $bodystmt, &@$);
+                    ($$ = $head->nd_def)->nd_loc = @$;
+                    RNODE_DEFS($$)->nd_defn = $bodystmt;
+                /*% ripper: defs!(*$:head[0..2], $:args, $:bodystmt) %*/
+                    local_pop(p);
+                }
+            | keyword_break
+                {
+                    $$ = add_block_exit(p, NEW_BREAK(0, &@$, &@1));
+                /*% ripper: break!(args_new!) %*/
+                }
+            | keyword_next
+                {
+                    $$ = add_block_exit(p, NEW_NEXT(0, &@$, &@1));
+                /*% ripper: next!(args_new!) %*/
+                }
+            | keyword_redo
+                {
+                    $$ = add_block_exit(p, NEW_REDO(&@$, &@1));
+                /*% ripper: redo! %*/
+                }
+            | keyword_retry
+                {
+                    if (!p->ctxt.in_defined) {
+                        switch (p->ctxt.in_rescue) {
+                          case before_rescue: yyerror1(&@1, "Invalid retry without rescue"); break;
+                            case after_rescue: /* ok */ break;
+                          case after_else: yyerror1(&@1, "Invalid retry after else"); break;
+                          case after_ensure: yyerror1(&@1, "Invalid retry after ensure"); break;
+                        }
                     }
-                | mlhs '=' lex_ctxt mrhs_arg
+                    $$ = NEW_RETRY(&@$);
+                /*% ripper: retry! %*/
+                }
+            ;
+
+primary_value	: value_expr(primary)
+                ;
+
+k_begin		: keyword_begin
                     {
-                    /*%%%*/
-                        $$ = node_assign(p, $1, $4, $3, &@$);
-                    /*% %*/
-                    /*% ripper: massign!($1, $4) %*/
+                        token_info_push(p, "begin", &@$);
+                        push_end_expect_token_locations(p, &@1.beg_pos);
                     }
-                | expr
-                | error
+                ;
+
+k_if		: keyword_if
                     {
-                        (void)yynerrs;
-                    /*%%%*/
-                        $$ = NEW_ERROR(&@$);
-                    /*% %*/
+                        WARN_EOL("if");
+                        token_info_push(p, "if", &@$);
+                        if (p->token_info && p->token_info->nonspc &&
+                            p->token_info->next && !strcmp(p->token_info->next->token, "else")) {
+                            const char *tok = p->lex.ptok - rb_strlen_lit("if");
+                            const char *beg = p->lex.pbeg + p->token_info->next->beg.column;
+                            beg += rb_strlen_lit("else");
+                            while (beg < tok && ISSPACE(*beg)) beg++;
+                            if (beg == tok) {
+                                p->token_info->nonspc = 0;
+                            }
+                        }
+                        push_end_expect_token_locations(p, &@1.beg_pos);
                     }
                 ;
 
-command_asgn	: lhs '=' lex_ctxt command_rhs
+k_unless	: keyword_unless
                     {
-                    /*%%%*/
-                        $$ = node_assign(p, $1, $4, $3, &@$);
-                    /*% %*/
-                    /*% ripper: assign!($1, $4) %*/
+                        token_info_push(p, "unless", &@$);
+                        push_end_expect_token_locations(p, &@1.beg_pos);
                     }
-                | var_lhs tOP_ASGN lex_ctxt command_rhs
+                ;
+
+k_while		: keyword_while allow_exits
                     {
-                    /*%%%*/
-                        $$ = new_op_assign(p, $1, $2, $4, $3, &@$);
-                    /*% %*/
-                    /*% ripper: opassign!($1, $2, $4) %*/
+                        $$ = $allow_exits;
+                        token_info_push(p, "while", &@$);
+                        push_end_expect_token_locations(p, &@1.beg_pos);
                     }
-                | primary_value '[' opt_call_args rbracket tOP_ASGN lex_ctxt command_rhs
-                    {
-                    /*%%%*/
-                        $$ = new_ary_op_assign(p, $1, $3, $5, $7, &@3, &@$);
-                    /*% %*/
-                    /*% ripper: opassign!(aref_field!($1, escape_Qundef($3)), $5, $7) %*/
+                ;
 
-                    }
-                | primary_value call_op tIDENTIFIER tOP_ASGN lex_ctxt command_rhs
+k_until		: keyword_until allow_exits
                     {
-                    /*%%%*/
-                        $$ = new_attr_op_assign(p, $1, $2, $3, $4, $6, &@$);
-                    /*% %*/
-                    /*% ripper: opassign!(field!($1, $2, $3), $4, $6) %*/
+                        $$ = $allow_exits;
+                        token_info_push(p, "until", &@$);
+                        push_end_expect_token_locations(p, &@1.beg_pos);
                     }
-                | primary_value call_op tCONSTANT tOP_ASGN lex_ctxt command_rhs
+                ;
+
+k_case		: keyword_case
                     {
-                    /*%%%*/
-                        $$ = new_attr_op_assign(p, $1, $2, $3, $4, $6, &@$);
-                    /*% %*/
-                    /*% ripper: opassign!(field!($1, $2, $3), $4, $6) %*/
+                        token_info_push(p, "case", &@$);
+                        push_end_expect_token_locations(p, &@1.beg_pos);
                     }
-                | primary_value tCOLON2 tCONSTANT tOP_ASGN lex_ctxt command_rhs
+                ;
+
+k_for		: keyword_for allow_exits
                     {
-                    /*%%%*/
-                        YYLTYPE loc = code_loc_gen(&@1, &@3);
-                        $$ = new_const_op_assign(p, NEW_COLON2($1, $3, &loc), $4, $6, $5, &@$);
-                    /*% %*/
-                    /*% ripper: opassign!(const_path_field!($1, $3), $4, $6) %*/
+                        $$ = $allow_exits;
+                        token_info_push(p, "for", &@$);
+                        push_end_expect_token_locations(p, &@1.beg_pos);
                     }
-                | primary_value tCOLON2 tIDENTIFIER tOP_ASGN lex_ctxt command_rhs
+                ;
+
+k_class		: keyword_class
                     {
-                    /*%%%*/
-                        $$ = new_attr_op_assign(p, $1, ID2VAL(idCOLON2), $3, $4, $6, &@$);
-                    /*% %*/
-                    /*% ripper: opassign!(field!($1, $2, $3), $4, $6) %*/
+                        token_info_push(p, "class", &@$);
+                        $$ = p->ctxt;
+                        p->ctxt.in_rescue = before_rescue;
+                        push_end_expect_token_locations(p, &@1.beg_pos);
                     }
-                | defn_head f_opt_paren_args '=' endless_command
+                ;
+
+k_module	: keyword_module
                     {
-                        endless_method_name(p, $<node>1, &@1);
-                        restore_defun(p, $<node>1->nd_defn);
-                    /*%%%*/
-                        $$ = set_defun_body(p, $1, $2, $4, &@$);
-                    /*% %*/
-                    /*% ripper: def!(get_value($1), $2, bodystmt!($4, Qnil, Qnil, Qnil)) %*/
-                        local_pop(p);
+                        token_info_push(p, "module", &@$);
+                        $$ = p->ctxt;
+                        p->ctxt.in_rescue = before_rescue;
+                        push_end_expect_token_locations(p, &@1.beg_pos);
                     }
-                | defs_head f_opt_paren_args '=' endless_command
+                ;
+
+k_def		: keyword_def
                     {
-                        endless_method_name(p, $<node>1, &@1);
-                        restore_defun(p, $<node>1->nd_defn);
-                    /*%%%*/
-                        $$ = set_defun_body(p, $1, $2, $4, &@$);
-                    /*%
-                        $1 = get_value($1);
-                    %*/
-                    /*% ripper: defs!(AREF($1, 0), AREF($1, 1), AREF($1, 2), $2, bodystmt!($4, Qnil, Qnil, Qnil)) %*/
-                        local_pop(p);
+                        token_info_push(p, "def", &@$);
+                        $$ = NEW_DEF_TEMP(&@$);
+                        p->ctxt.in_argdef = 1;
                     }
-                | backref tOP_ASGN lex_ctxt command_rhs
+                ;
+
+k_do		: keyword_do
                     {
-                    /*%%%*/
-                        rb_backref_error(p, $1);
-                        $$ = NEW_BEGIN(0, &@$);
-                    /*% %*/
-                    /*% ripper[error]: backref_error(p, RNODE($1), assign!(var_field(p, $1), $4)) %*/
+                        token_info_push(p, "do", &@$);
+                        push_end_expect_token_locations(p, &@1.beg_pos);
                     }
                 ;
 
-endless_command : command
-                | endless_command modifier_rescue arg
+k_do_block	: keyword_do_block
                     {
-                    /*%%%*/
-                        $$ = rescued_expr(p, $1, $3, &@1, &@2, &@3);
-                    /*% %*/
-                    /*% ripper: rescue_mod!($1, $3) %*/
+                        token_info_push(p, "do", &@$);
+                        push_end_expect_token_locations(p, &@1.beg_pos);
                     }
-                | keyword_not opt_nl endless_command
+                ;
+
+k_rescue	: keyword_rescue
                     {
-                        $$ = call_uni_op(p, method_cond(p, $3, &@3), METHOD_NOT, &@1, &@$);
+                        token_info_warn(p, "rescue", p->token_info, 1, &@$);
+                        $$ = p->ctxt;
+                        p->ctxt.in_rescue = after_rescue;
                     }
                 ;
 
-command_rhs	: command_call   %prec tOP_ASGN
+k_ensure	: keyword_ensure
                     {
-                        value_expr($1);
-                        $$ = $1;
+                        token_info_warn(p, "ensure", p->token_info, 1, &@$);
+                        $$ = p->ctxt;
                     }
-                | command_call modifier_rescue stmt
+                ;
+
+k_when		: keyword_when
                     {
-                    /*%%%*/
-                        YYLTYPE loc = code_loc_gen(&@2, &@3);
-                        value_expr($1);
-                        $$ = NEW_RESCUE($1, NEW_RESBODY(0, remove_begin($3), 0, &loc), 0, &@$);
-                    /*% %*/
-                    /*% ripper: rescue_mod!($1, $3) %*/
+                        token_info_warn(p, "when", p->token_info, 0, &@$);
                     }
-                | command_asgn
                 ;
 
-expr		: command_call
-                | expr keyword_and expr
+k_else		: keyword_else
                     {
-                        $$ = logop(p, idAND, $1, $3, &@2, &@$);
+                        token_info *ptinfo_beg = p->token_info;
+                        int same = ptinfo_beg && strcmp(ptinfo_beg->token, "case") != 0;
+                        token_info_warn(p, "else", p->token_info, same, &@$);
+                        if (same) {
+                            token_info e;
+                            e.next = ptinfo_beg->next;
+                            e.token = "else";
+                            token_info_setup(&e, p->lex.pbeg, &@$);
+                            if (!e.nonspc) *ptinfo_beg = e;
+                        }
                     }
-                | expr keyword_or expr
+                ;
+
+k_elsif 	: keyword_elsif
                     {
-                        $$ = logop(p, idOR, $1, $3, &@2, &@$);
+                        WARN_EOL("elsif");
+                        token_info_warn(p, "elsif", p->token_info, 1, &@$);
                     }
-                | keyword_not opt_nl expr
+                ;
+
+k_end		: keyword_end
                     {
-                        $$ = call_uni_op(p, method_cond(p, $3, &@3), METHOD_NOT, &@1, &@$);
+                        token_info_pop(p, "end", &@$);
+                        pop_end_expect_token_locations(p);
                     }
-                | '!' command_call
+                | tDUMNY_END
                     {
-                        $$ = call_uni_op(p, method_cond(p, $2, &@2), '!', &@1, &@$);
+                        compile_error(p, "syntax error, unexpected end-of-input");
                     }
-                | arg tASSOC
+                ;
+
+k_return	: keyword_return
                     {
-                        value_expr($1);
-                        SET_LEX_STATE(EXPR_BEG|EXPR_LABEL);
-                        p->command_start = FALSE;
-                        $<ctxt>2 = p->ctxt;
-                        p->ctxt.in_kwarg = 1;
-                        $<tbl>$ = push_pvtbl(p);
+                        if (p->ctxt.cant_return && !dyna_in_block(p))
+                            yyerror1(&@1, "Invalid return in class/module body");
                     }
+                ;
+
+k_yield 	: keyword_yield
                     {
-                        $<tbl>$ = push_pktbl(p);
+                        if (!p->ctxt.in_defined && !p->ctxt.in_def && !compile_for_eval)
+                            yyerror1(&@1, "Invalid yield");
                     }
-                  p_top_expr_body
+                ;
+
+then		: term
+                | keyword_then
+                | term keyword_then
+                ;
+
+do		: term
+                | keyword_do_cond { $$ = keyword_do_cond; }
+                ;
+
+if_tail		: opt_else
+                | k_elsif expr_value then
+                  compstmt(stmts)
+                  if_tail
                     {
-                        pop_pktbl(p, $<tbl>4);
-                        pop_pvtbl(p, $<tbl>3);
-                        p->ctxt.in_kwarg = $<ctxt>2.in_kwarg;
-                    /*%%%*/
-                        $$ = NEW_CASE3($1, NEW_IN($5, 0, 0, &@5), &@$);
-                    /*% %*/
-                    /*% ripper: case!($1, in!($5, Qnil, Qnil)) %*/
+                        $$ = new_if(p, $2, $4, $5, &@$, &@1, &@3, &NULL_LOC);
+                        fixpos($$, $2);
+                    /*% ripper: elsif!($:2, $:4, $:5) %*/
                     }
-                | arg keyword_in
+                ;
+
+opt_else	: none
+                | k_else compstmt(stmts)
                     {
-                        value_expr($1);
-                        SET_LEX_STATE(EXPR_BEG|EXPR_LABEL);
-                        p->command_start = FALSE;
-                        $<ctxt>2 = p->ctxt;
-                        p->ctxt.in_kwarg = 1;
-                        $<tbl>$ = push_pvtbl(p);
+                        $$ = $2;
+                    /*% ripper: else!($:2) %*/
                     }
+                ;
+
+for_var		: lhs
+                | mlhs
+                ;
+
+f_marg		: f_norm_arg
                     {
-                        $<tbl>$ = push_pktbl(p);
+                        $$ = assignable(p, $1, 0, &@$);
+                        mark_lvar_used(p, $$);
                     }
-                  p_top_expr_body
+                | tLPAREN f_margs rparen
                     {
-                        pop_pktbl(p, $<tbl>4);
-                        pop_pvtbl(p, $<tbl>3);
-                        p->ctxt.in_kwarg = $<ctxt>2.in_kwarg;
-                    /*%%%*/
-                        $$ = NEW_CASE3($1, NEW_IN($5, NEW_TRUE(&@5), NEW_FALSE(&@5), &@5), &@$);
-                    /*% %*/
-                    /*% ripper: case!($1, in!($5, Qnil, Qnil)) %*/
+                        $$ = (NODE *)$2;
+                    /*% ripper: mlhs_paren!($:2) %*/
                     }
-                | arg %prec tLBRACE_ARG
                 ;
 
-def_name	: fname
+
+f_margs		: mlhs(f_marg)
                     {
-                        ID fname = get_id($1);
-                        ID cur_arg = p->cur_arg;
-                        YYSTYPE c = {.ctxt = p->ctxt};
-                        numparam_name(p, fname);
-                        NODE *save =
-                            NODE_NEW_TEMPORAL(NODE_SELF,
-                                              /*head*/numparam_push(p),
-                                              /*nth*/p->max_numparam,
-                                              /*cval*/c.val);
-                        local_push(p, 0);
-                        p->cur_arg = 0;
-                        p->ctxt.in_def = 1;
-                        $<node>$ = NEW_NODE(NODE_SELF, /*vid*/cur_arg, /*mid*/fname, /*args*/save, &@$);
-                    /*%%%*/
-                    /*%
-                        $$ = NEW_RIPPER(fname, get_value($1), $$, &NULL_LOC);
-                    %*/
+                        $$ = NEW_MASGN($1, 0, &@$);
+                    /*% ripper: $:1 %*/
                     }
-                ;
-
-defn_head	: k_def def_name
+                | mlhs(f_marg) ',' f_rest_marg
                     {
-                        $$ = $2;
-                    /*%%%*/
-                        $$ = NEW_NODE(NODE_DEFN, 0, $$->nd_mid, $$, &@$);
-                    /*% %*/
+                        $$ = NEW_MASGN($1, $3, &@$);
+                    /*% ripper: mlhs_add_star!($:1, $:3) %*/
                     }
-                ;
-
-defs_head	: k_def singleton dot_or_colon
+                | mlhs(f_marg) ',' f_rest_marg ',' mlhs(f_marg)
                     {
-                        SET_LEX_STATE(EXPR_FNAME);
-                        p->ctxt.in_argdef = 1;
+                        $$ = NEW_MASGN($1, NEW_POSTARG($3, $5, &@$), &@$);
+                    /*% ripper: mlhs_add_post!(mlhs_add_star!($:1, $:3), $:5) %*/
                     }
-                  def_name
+                | f_rest_marg
                     {
-                        SET_LEX_STATE(EXPR_ENDFN|EXPR_LABEL); /* force for args */
-                        $$ = $5;
-                    /*%%%*/
-                        $$ = NEW_NODE(NODE_DEFS, $2, $$->nd_mid, $$, &@$);
-                    /*%
-                        VALUE ary = rb_ary_new_from_args(3, $2, $3, get_value($$));
-                        add_mark_object(p, ary);
-                        $<node>$->nd_rval = ary;
-                    %*/
+                        $$ = NEW_MASGN(0, $1, &@$);
+                    /*% ripper: mlhs_add_star!(mlhs_new!, $:1) %*/
+                    }
+                | f_rest_marg ',' mlhs(f_marg)
+                    {
+                        $$ = NEW_MASGN(0, NEW_POSTARG($1, $3, &@$), &@$);
+                    /*% ripper: mlhs_add_post!(mlhs_add_star!(mlhs_new!, $:1), $:3) %*/
                     }
                 ;
 
-expr_value	: expr
+f_rest_marg	: tSTAR f_norm_arg
                     {
-                        value_expr($1);
-                        $$ = $1;
+                    /*% ripper: $:2 %*/
+                        $$ = assignable(p, $2, 0, &@$);
+                        mark_lvar_used(p, $$);
                     }
-                | error
+                | tSTAR
                     {
-                    /*%%%*/
-                        $$ = NEW_ERROR(&@$);
-                    /*% %*/
+                        $$ = NODE_SPECIAL_NO_NAME_REST;
+                    /*% ripper: Qnil %*/
                     }
                 ;
 
-expr_value_do	: {COND_PUSH(1);} expr_value do {COND_POP();}
+f_any_kwrest	: f_kwrest
+                | f_no_kwarg
                     {
-                        $$ = $2;
+                        $$ = idNil;
+                    /*% ripper: ID2VAL(idNil) %*/
                     }
                 ;
 
-command_call	: command
-                | block_command
+f_eq		: {p->ctxt.in_argdef = 0;} '=';
+
+block_args_tail	: args_tail_basic(primary_value)
                 ;
 
-block_command	: block_call
-                | block_call call_op2 operation2 command_args
+excessed_comma	: ','
                     {
-                    /*%%%*/
-                        $$ = new_qcall(p, $2, $1, $3, $4, &@3, &@$);
-                    /*% %*/
-                    /*% ripper: method_add_arg!(call!($1, $2, $3), $4) %*/
+                        /* magic number for rest_id in iseq_set_arguments() */
+                        $$ = NODE_SPECIAL_EXCESSIVE_COMMA;
+                    /*% ripper: excessed_comma! %*/
                     }
                 ;
 
-cmd_brace_block	: tLBRACE_ARG brace_body '}'
+block_param	: f_arg ',' f_opt_arg(primary_value) ',' f_rest_arg opt_args_tail(block_args_tail)
                     {
-                        $$ = $2;
-                    /*%%%*/
-                        set_embraced_location($$, &@1, &@3);
-                    /*% %*/
+                        $$ = new_args(p, $1, $3, $5, 0, $6, &@$);
+                    /*% ripper: params!($:1, $:3, $:5, Qnil, *$:6[0..2]) %*/
                     }
-                ;
-
-fcall		: operation
+                | f_arg ',' f_opt_arg(primary_value) ',' f_rest_arg ',' f_arg opt_args_tail(block_args_tail)
                     {
-                    /*%%%*/
-                        $$ = NEW_FCALL($1, 0, &@$);
-                        nd_set_line($$, p->tokline);
-                    /*% %*/
-                    /*% ripper: $1 %*/
+                        $$ = new_args(p, $1, $3, $5, $7, $8, &@$);
+                    /*% ripper: params!($:1, $:3, $:5, $:7, *$:8[0..2]) %*/
                     }
-                ;
-
-command		: fcall command_args       %prec tLOWEST
+                | f_arg ',' f_opt_arg(primary_value) opt_args_tail(block_args_tail)
                     {
-                    /*%%%*/
-                        $1->nd_args = $2;
-                        nd_set_last_loc($1, @2.end_pos);
-                        $$ = $1;
-                    /*% %*/
-                    /*% ripper: command!($1, $2) %*/
+                        $$ = new_args(p, $1, $3, 0, 0, $4, &@$);
+                    /*% ripper: params!($:1, $:3, Qnil, Qnil, *$:4[0..2]) %*/
                     }
-                | fcall command_args cmd_brace_block
+                | f_arg ',' f_opt_arg(primary_value) ',' f_arg opt_args_tail(block_args_tail)
                     {
-                    /*%%%*/
-                        block_dup_check(p, $2, $3);
-                        $1->nd_args = $2;
-                        $$ = method_add_block(p, $1, $3, &@$);
-                        fixpos($$, $1);
-                        nd_set_last_loc($1, @2.end_pos);
-                    /*% %*/
-                    /*% ripper: method_add_block!(command!($1, $2), $3) %*/
+                        $$ = new_args(p, $1, $3, 0, $5, $6, &@$);
+                    /*% ripper: params!($:1, $:3, Qnil, $:5, *$:6[0..2]) %*/
                     }
-                | primary_value call_op operation2 command_args	%prec tLOWEST
+                | f_arg ',' f_rest_arg opt_args_tail(block_args_tail)
                     {
-                    /*%%%*/
-                        $$ = new_command_qcall(p, $2, $1, $3, $4, Qnull, &@3, &@$);
-                    /*% %*/
-                    /*% ripper: command_call!($1, $2, $3, $4) %*/
+                        $$ = new_args(p, $1, 0, $3, 0, $4, &@$);
+                    /*% ripper: params!($:1, Qnil, $:3, Qnil, *$:4[0..2]) %*/
                     }
-                | primary_value call_op operation2 command_args cmd_brace_block
+                | f_arg excessed_comma
                     {
-                    /*%%%*/
-                        $$ = new_command_qcall(p, $2, $1, $3, $4, $5, &@3, &@$);
-                    /*% %*/
-                    /*% ripper: method_add_block!(command_call!($1, $2, $3, $4), $5) %*/
+                        $$ = new_args_tail(p, 0, 0, 0, &@2);
+                        $$ = new_args(p, $1, 0, $2, 0, $$, &@$);
+                    /*% ripper: params!($:1, Qnil, $:2, Qnil, Qnil, Qnil, Qnil) %*/
                     }
-                | primary_value tCOLON2 operation2 command_args	%prec tLOWEST
+                | f_arg ',' f_rest_arg ',' f_arg opt_args_tail(block_args_tail)
                     {
-                    /*%%%*/
-                        $$ = new_command_qcall(p, ID2VAL(idCOLON2), $1, $3, $4, Qnull, &@3, &@$);
-                    /*% %*/
-                    /*% ripper: command_call!($1, $2, $3, $4) %*/
+                        $$ = new_args(p, $1, 0, $3, $5, $6, &@$);
+                    /*% ripper: params!($:1, Qnil, $:3, $:5, *$:6[0..2]) %*/
                     }
-                | primary_value tCOLON2 operation2 command_args cmd_brace_block
+                | f_arg opt_args_tail(block_args_tail)
                     {
-                    /*%%%*/
-                        $$ = new_command_qcall(p, ID2VAL(idCOLON2), $1, $3, $4, $5, &@3, &@$);
-                    /*% %*/
-                    /*% ripper: method_add_block!(command_call!($1, $2, $3, $4), $5) %*/
-                   }
-                | primary_value tCOLON2 tCONSTANT '{' brace_body '}'
+                        $$ = new_args(p, $1, 0, 0, 0, $2, &@$);
+                    /*% ripper: params!($:1, Qnil, Qnil, Qnil, *$:2[0..2]) %*/
+                    }
+                | f_opt_arg(primary_value) ',' f_rest_arg opt_args_tail(block_args_tail)
                     {
-                    /*%%%*/
-                        set_embraced_location($5, &@4, &@6);
-                        $$ = new_command_qcall(p, ID2VAL(idCOLON2), $1, $3, Qnull, $5, &@3, &@$);
-                    /*% %*/
-                    /*% ripper: method_add_block!(command_call!($1, $2, $3, Qnull), $5) %*/
-                   }
-                | keyword_super command_args
+                        $$ = new_args(p, 0, $1, $3, 0, $4, &@$);
+                    /*% ripper: params!(Qnil, $:1, $:3, Qnil, *$:4[0..2]) %*/
+                    }
+                | f_opt_arg(primary_value) ',' f_rest_arg ',' f_arg opt_args_tail(block_args_tail)
                     {
-                    /*%%%*/
-                        $$ = NEW_SUPER($2, &@$);
-                        fixpos($$, $2);
-                    /*% %*/
-                    /*% ripper: super!($2) %*/
+                        $$ = new_args(p, 0, $1, $3, $5, $6, &@$);
+                    /*% ripper: params!(Qnil, $:1, $:3, $:5, *$:6[0..2]) %*/
                     }
-                | keyword_yield command_args
+                | f_opt_arg(primary_value) opt_args_tail(block_args_tail)
                     {
-                    /*%%%*/
-                        $$ = new_yield(p, $2, &@$);
-                        fixpos($$, $2);
-                    /*% %*/
-                    /*% ripper: yield!($2) %*/
+                        $$ = new_args(p, 0, $1, 0, 0, $2, &@$);
+                    /*% ripper: params!(Qnil, $:1, Qnil, Qnil, *$:2[0..2]) %*/
                     }
-                | k_return call_args
+                | f_opt_arg(primary_value) ',' f_arg opt_args_tail(block_args_tail)
                     {
-                    /*%%%*/
-                        $$ = NEW_RETURN(ret_args(p, $2), &@$);
-                    /*% %*/
-                    /*% ripper: return!($2) %*/
+                        $$ = new_args(p, 0, $1, 0, $3, $4, &@$);
+                    /*% ripper: params!(Qnil, $:1, Qnil, $:3, *$:4[0..2]) %*/
                     }
-                | keyword_break call_args
+                | f_rest_arg opt_args_tail(block_args_tail)
                     {
-                    /*%%%*/
-                        $$ = NEW_BREAK(ret_args(p, $2), &@$);
-                    /*% %*/
-                    /*% ripper: break!($2) %*/
+                        $$ = new_args(p, 0, 0, $1, 0, $2, &@$);
+                    /*% ripper: params!(Qnil, Qnil, $:1, Qnil, *$:2[0..2]) %*/
                     }
-                | keyword_next call_args
+                | f_rest_arg ',' f_arg opt_args_tail(block_args_tail)
                     {
-                    /*%%%*/
-                        $$ = NEW_NEXT(ret_args(p, $2), &@$);
-                    /*% %*/
-                    /*% ripper: next!($2) %*/
+                        $$ = new_args(p, 0, 0, $1, $3, $4, &@$);
+                    /*% ripper: params!(Qnil, Qnil, $:1, $:3, *$:4[0..2]) %*/
+                    }
+                | block_args_tail
+                    {
+                        $$ = new_args(p, 0, 0, 0, 0, $1, &@$);
+                    /*% ripper: params!(Qnil, Qnil, Qnil, Qnil, *$:1[0..2]) %*/
                     }
                 ;
 
-mlhs		: mlhs_basic
-                | tLPAREN mlhs_inner rparen
+opt_block_param_def	: none
+                    | block_param_def
+                        {
+                            p->command_start = TRUE;
+                        }
+                    ;
+
+block_param_def	: '|' opt_block_param opt_bv_decl '|'
                     {
-                    /*%%%*/
+                        p->max_numparam = ORDINAL_PARAM;
+                        p->ctxt.in_argdef = 0;
                         $$ = $2;
-                    /*% %*/
-                    /*% ripper: mlhs_paren!($2) %*/
+                    /*% ripper: block_var!($:2, $:3) %*/
                     }
                 ;
 
-mlhs_inner	: mlhs_basic
-                | tLPAREN mlhs_inner rparen
+opt_block_param	: /* none */
                     {
-                    /*%%%*/
-                        $$ = NEW_MASGN(NEW_LIST($2, &@$), 0, &@$);
-                    /*% %*/
-                    /*% ripper: mlhs_paren!($2) %*/
+                        $$ = 0;
+                    /*% ripper: params!(Qnil,Qnil,Qnil,Qnil,Qnil,Qnil,Qnil) %*/
                     }
+                | block_param
                 ;
 
-mlhs_basic	: mlhs_head
+opt_bv_decl	: '\n'?
                     {
-                    /*%%%*/
-                        $$ = NEW_MASGN($1, 0, &@$);
-                    /*% %*/
-                    /*% ripper: $1 %*/
+                        $$ = 0;
+                    /*% ripper: Qfalse %*/
                     }
-                | mlhs_head mlhs_item
+                | '\n'? ';' bv_decls '\n'?
                     {
-                    /*%%%*/
-                        $$ = NEW_MASGN(list_append(p, $1,$2), 0, &@$);
-                    /*% %*/
-                    /*% ripper: mlhs_add!($1, $2) %*/
+                        $$ = 0;
+                    /*% ripper: $:3 %*/
                     }
-                | mlhs_head tSTAR mlhs_node
+                ;
+
+bv_decls	: bvar
+                    /*% ripper[brace]: rb_ary_new3(1, $:1) %*/
+                | bv_decls ',' bvar
+                    /*% ripper[brace]: rb_ary_push($:1, $:3) %*/
+                ;
+
+bvar		: tIDENTIFIER
                     {
-                    /*%%%*/
-                        $$ = NEW_MASGN($1, $3, &@$);
-                    /*% %*/
-                    /*% ripper: mlhs_add_star!($1, $3) %*/
+                        new_bv(p, $1);
+                    /*% ripper: $:1 %*/
+                    }
+                | f_bad_arg
+                ;
+
+max_numparam	:   {
+                        $$ = p->max_numparam;
+                        p->max_numparam = 0;
+                    }
+                ;
+
+numparam	:   {
+                        $$ = numparam_push(p);
                     }
-                | mlhs_head tSTAR mlhs_node ',' mlhs_post
+                ;
+
+it_id		:   {
+                    $$ = p->it_id;
+                    p->it_id = 0;
+                }
+            ;
+
+lambda		: tLAMBDA[lpar]
                     {
-                    /*%%%*/
-                        $$ = NEW_MASGN($1, NEW_POSTARG($3,$5,&@$), &@$);
-                    /*% %*/
-                    /*% ripper: mlhs_add_post!(mlhs_add_star!($1, $3), $5) %*/
+                        token_info_push(p, "->", &@1);
+                        $$ = dyna_push(p);
+                    }[dyna]<vars>
+                  max_numparam numparam it_id allow_exits
+                  f_larglist[args]
+                    {
+                        CMDARG_PUSH(0);
                     }
-                | mlhs_head tSTAR
+                  lambda_body[body]
                     {
-                    /*%%%*/
-                        $$ = NEW_MASGN($1, NODE_SPECIAL_NO_NAME_REST, &@$);
-                    /*% %*/
-                    /*% ripper: mlhs_add_star!($1, Qnil) %*/
+                        int max_numparam = p->max_numparam;
+                        ID it_id = p->it_id;
+                        p->lex.lpar_beg = $lpar;
+                        p->max_numparam = $max_numparam;
+                        p->it_id = $it_id;
+                        restore_block_exit(p, $allow_exits);
+                        CMDARG_POP();
+                        $args = args_with_numbered(p, $args, max_numparam, it_id);
+                        {
+                            YYLTYPE loc = code_loc_gen(&@args, &@body);
+                            $$ = NEW_LAMBDA($args, $body->node, &loc, &@lpar, &$body->opening_loc, &$body->closing_loc);
+                            nd_set_line(RNODE_LAMBDA($$)->nd_body, @body.end_pos.lineno);
+                            nd_set_line($$, @args.end_pos.lineno);
+                            nd_set_first_loc($$, @1.beg_pos);
+                            xfree($body);
+                        }
+                    /*% ripper: lambda!($:args, $:body) %*/
+                        numparam_pop(p, $numparam);
+                        dyna_pop(p, $dyna);
                     }
-                | mlhs_head tSTAR ',' mlhs_post
+                ;
+
+f_larglist	: '(' f_args opt_bv_decl ')'
                     {
-                    /*%%%*/
-                        $$ = NEW_MASGN($1, NEW_POSTARG(NODE_SPECIAL_NO_NAME_REST, $4, &@$), &@$);
-                    /*% %*/
-                    /*% ripper: mlhs_add_post!(mlhs_add_star!($1, Qnil), $4) %*/
+                        p->ctxt.in_argdef = 0;
+                        $$ = $f_args;
+                        p->max_numparam = ORDINAL_PARAM;
+                    /*% ripper: paren!($:2) %*/
                     }
-                | tSTAR mlhs_node
+                | f_args
                     {
-                    /*%%%*/
-                        $$ = NEW_MASGN(0, $2, &@$);
-                    /*% %*/
-                    /*% ripper: mlhs_add_star!(mlhs_new!, $2) %*/
+                        p->ctxt.in_argdef = 0;
+                        if (!args_info_empty_p(&$1->nd_ainfo))
+                            p->max_numparam = ORDINAL_PARAM;
+                        $$ = $f_args;
                     }
-                | tSTAR mlhs_node ',' mlhs_post
+                ;
+
+lambda_body	: tLAMBEG compstmt(stmts) '}'
                     {
-                    /*%%%*/
-                        $$ = NEW_MASGN(0, NEW_POSTARG($2,$4,&@$), &@$);
-                    /*% %*/
-                    /*% ripper: mlhs_add_post!(mlhs_add_star!(mlhs_new!, $2), $4) %*/
+                        token_info_pop(p, "}", &@3);
+                        $$ = new_locations_lambda_body(p, $2, &@2, &@1, &@3);
+                    /*% ripper: $:2 %*/
                     }
-                | tSTAR
+                | keyword_do_LAMBDA
                     {
-                    /*%%%*/
-                        $$ = NEW_MASGN(0, NODE_SPECIAL_NO_NAME_REST, &@$);
-                    /*% %*/
-                    /*% ripper: mlhs_add_star!(mlhs_new!, Qnil) %*/
+                        push_end_expect_token_locations(p, &@1.beg_pos);
                     }
-                | tSTAR ',' mlhs_post
+                  bodystmt k_end
                     {
-                    /*%%%*/
-                        $$ = NEW_MASGN(0, NEW_POSTARG(NODE_SPECIAL_NO_NAME_REST, $3, &@$), &@$);
-                    /*% %*/
-                    /*% ripper: mlhs_add_post!(mlhs_add_star!(mlhs_new!, Qnil), $3) %*/
+                        $$ = new_locations_lambda_body(p, $3, &@3, &@1, &@4);
+                    /*% ripper: $:3 %*/
                     }
                 ;
 
-mlhs_item	: mlhs_node
-                | tLPAREN mlhs_inner rparen
+do_block	: k_do_block do_body k_end
                     {
-                    /*%%%*/
                         $$ = $2;
-                    /*% %*/
-                    /*% ripper: mlhs_paren!($2) %*/
+                        set_embraced_location($$, &@1, &@3);
+                    /*% ripper: $:2 %*/
                     }
                 ;
 
-mlhs_head	: mlhs_item ','
+block_call	: command do_block
                     {
-                    /*%%%*/
-                        $$ = NEW_LIST($1, &@1);
-                    /*% %*/
-                    /*% ripper: mlhs_add!(mlhs_new!, $1) %*/
+                        if (nd_type_p($1, NODE_YIELD)) {
+                            compile_error(p, "block given to yield");
+                        }
+                        else {
+                            block_dup_check(p, get_nd_args(p, $1), $2);
+                        }
+                        $$ = method_add_block(p, $1, $2, &@$);
+                        fixpos($$, $1);
+                    /*% ripper: method_add_block!($:1, $:2) %*/
                     }
-                | mlhs_head mlhs_item ','
+                | block_call call_op2 operation2 opt_paren_args
                     {
-                    /*%%%*/
-                        $$ = list_append(p, $1, $2);
-                    /*% %*/
-                    /*% ripper: mlhs_add!($1, $2) %*/
+                        bool has_args = $4 != 0;
+                        if (NODE_EMPTY_ARGS_P($4)) $4 = 0;
+                        $$ = new_qcall(p, $2, $1, $3, $4, &@3, &@$);
+                    /*% ripper: call!($:1, $:2, $:3) %*/
+                        if (has_args) {
+                        /*% ripper: method_add_arg!($:$, $:4) %*/
+                        }
                     }
-                ;
-
-mlhs_post	: mlhs_item
+                | block_call call_op2 operation2 opt_paren_args brace_block
                     {
-                    /*%%%*/
-                        $$ = NEW_LIST($1, &@$);
-                    /*% %*/
-                    /*% ripper: mlhs_add!(mlhs_new!, $1) %*/
+                        if (NODE_EMPTY_ARGS_P($4)) $4 = 0;
+                        $$ = new_command_qcall(p, $2, $1, $3, $4, $5, &@3, &@$);
+                    /*% ripper: command_call!($:1, $:2, $:3, $:4) %*/
+                        if ($5) {
+                        /*% ripper: method_add_block!($:$, $:5) %*/
+                        }
                     }
-                | mlhs_post ',' mlhs_item
+                | block_call call_op2 operation2 command_args do_block
                     {
-                    /*%%%*/
-                        $$ = list_append(p, $1, $3);
-                    /*% %*/
-                    /*% ripper: mlhs_add!($1, $3) %*/
+                        $$ = new_command_qcall(p, $2, $1, $3, $4, $5, &@3, &@$);
+                    /*% ripper: method_add_block!(command_call!($:1, $:2, $:3, $:4), $:5) %*/
                     }
                 ;
 
-mlhs_node	: user_variable
+method_call	: fcall paren_args
                     {
-                    /*%%%*/
-                        $$ = assignable(p, $1, 0, &@$);
-                    /*% %*/
-                    /*% ripper: assignable(p, var_field(p, $1)) %*/
+                        $1->nd_args = $2;
+                        $$ = (NODE *)$1;
+                        nd_set_last_loc($1, @2.end_pos);
+                    /*% ripper: method_add_arg!(fcall!($:1), $:2) %*/
                     }
-                | keyword_variable
+                | primary_value call_op operation2 opt_paren_args
                     {
-                    /*%%%*/
-                        $$ = assignable(p, $1, 0, &@$);
-                    /*% %*/
-                    /*% ripper: assignable(p, var_field(p, $1)) %*/
+                        bool has_args = $4 != 0;
+                        if (NODE_EMPTY_ARGS_P($4)) $4 = 0;
+                        $$ = new_qcall(p, $2, $1, $3, $4, &@3, &@$);
+                        nd_set_line($$, @3.end_pos.lineno);
+                    /*% ripper: call!($:1, $:2, $:3) %*/
+                        if (has_args) {
+                        /*% ripper: method_add_arg!($:$, $:4) %*/
+                        }
                     }
-                | primary_value '[' opt_call_args rbracket
+                | primary_value tCOLON2 operation2 paren_args
                     {
-                    /*%%%*/
-                        $$ = aryset(p, $1, $3, &@$);
-                    /*% %*/
-                    /*% ripper: aref_field!($1, escape_Qundef($3)) %*/
+                        $$ = new_qcall(p, idCOLON2, $1, $3, $4, &@3, &@$);
+                        nd_set_line($$, @3.end_pos.lineno);
+                    /*% ripper: method_add_arg!(call!($:1, $:2, $:3), $:4) %*/
                     }
-                | primary_value call_op tIDENTIFIER
+                | primary_value tCOLON2 operation3
                     {
-                        anddot_multiple_assignment_check(p, &@2, $2);
-                    /*%%%*/
-                        $$ = attrset(p, $1, $2, $3, &@$);
-                    /*% %*/
-                    /*% ripper: field!($1, $2, $3) %*/
+                        $$ = new_qcall(p, idCOLON2, $1, $3, 0, &@3, &@$);
+                    /*% ripper: call!($:1, $:2, $:3) %*/
                     }
-                | primary_value tCOLON2 tIDENTIFIER
+                | primary_value call_op2 paren_args
                     {
-                    /*%%%*/
-                        $$ = attrset(p, $1, idCOLON2, $3, &@$);
-                    /*% %*/
-                    /*% ripper: const_path_field!($1, $3) %*/
+                        $$ = new_qcall(p, $2, $1, idCall, $3, &@2, &@$);
+                        nd_set_line($$, @2.end_pos.lineno);
+                    /*% ripper: method_add_arg!(call!($:1, $:2, ID2VAL(idCall)), $:3) %*/
                     }
-                | primary_value call_op tCONSTANT
+                | keyword_super paren_args
                     {
-                        anddot_multiple_assignment_check(p, &@2, $2);
-                    /*%%%*/
-                        $$ = attrset(p, $1, $2, $3, &@$);
-                    /*% %*/
-                    /*% ripper: field!($1, $2, $3) %*/
+                        rb_code_location_t lparen_loc = @2;
+                        rb_code_location_t rparen_loc = @2;
+                        lparen_loc.end_pos.column = lparen_loc.beg_pos.column + 1;
+                        rparen_loc.beg_pos.column = rparen_loc.end_pos.column - 1;
+
+                        $$ = NEW_SUPER($2, &@$, &@1, &lparen_loc, &rparen_loc);
+                    /*% ripper: super!($:2) %*/
                     }
-                | primary_value tCOLON2 tCONSTANT
+                | keyword_super
+                    {
+                        $$ = NEW_ZSUPER(&@$);
+                    /*% ripper: zsuper! %*/
+                    }
+                | primary_value '[' opt_call_args rbracket
                     {
-                    /*%%%*/
-                        $$ = const_decl(p, NEW_COLON2($1, $3, &@$), &@$);
-                    /*% %*/
-                    /*% ripper: const_decl(p, const_path_field!($1, $3)) %*/
+                        $$ = NEW_CALL($1, tAREF, $3, &@$);
+                        fixpos($$, $1);
+                    /*% ripper: aref!($:1, $:3) %*/
                     }
-                | tCOLON3 tCONSTANT
+                ;
+
+brace_block	: '{' brace_body '}'
                     {
-                    /*%%%*/
-                        $$ = const_decl(p, NEW_COLON3($2, &@$), &@$);
-                    /*% %*/
-                    /*% ripper: const_decl(p, top_const_field!($2)) %*/
+                        $$ = $2;
+                        set_embraced_location($$, &@1, &@3);
+                    /*% ripper: $:2 %*/
                     }
-                | backref
+                | k_do do_body k_end
                     {
-                    /*%%%*/
-                        rb_backref_error(p, $1);
-                        $$ = NEW_BEGIN(0, &@$);
-                    /*% %*/
-                    /*% ripper[error]: backref_error(p, RNODE($1), var_field(p, $1)) %*/
+                        $$ = $2;
+                        set_embraced_location($$, &@1, &@3);
+                    /*% ripper: $:2 %*/
                     }
                 ;
 
-lhs		: user_variable
+brace_body	: {$$ = dyna_push(p);}[dyna]<vars>
+                  max_numparam numparam it_id allow_exits
+                  opt_block_param_def[args] compstmt(stmts)
                     {
-                    /*%%%*/
-                        $$ = assignable(p, $1, 0, &@$);
-                    /*% %*/
-                    /*% ripper: assignable(p, var_field(p, $1)) %*/
+                        int max_numparam = p->max_numparam;
+                        ID it_id = p->it_id;
+                        p->max_numparam = $max_numparam;
+                        p->it_id = $it_id;
+                        $args = args_with_numbered(p, $args, max_numparam, it_id);
+                        $$ = NEW_ITER($args, $compstmt, &@$);
+                    /*% ripper: brace_block!($:args, $:compstmt) %*/
+                        restore_block_exit(p, $allow_exits);
+                        numparam_pop(p, $numparam);
+                        dyna_pop(p, $dyna);
                     }
-                | keyword_variable
+                ;
+
+do_body 	:   {
+                        $$ = dyna_push(p);
+                        CMDARG_PUSH(0);
+                    }[dyna]<vars>
+                  max_numparam numparam it_id allow_exits
+                  opt_block_param_def[args] bodystmt
                     {
-                    /*%%%*/
-                        $$ = assignable(p, $1, 0, &@$);
-                    /*% %*/
-                    /*% ripper: assignable(p, var_field(p, $1)) %*/
+                        int max_numparam = p->max_numparam;
+                        ID it_id = p->it_id;
+                        p->max_numparam = $max_numparam;
+                        p->it_id = $it_id;
+                        $args = args_with_numbered(p, $args, max_numparam, it_id);
+                        $$ = NEW_ITER($args, $bodystmt, &@$);
+                    /*% ripper: do_block!($:args, $:bodystmt) %*/
+                        CMDARG_POP();
+                        restore_block_exit(p, $allow_exits);
+                        numparam_pop(p, $numparam);
+                        dyna_pop(p, $dyna);
                     }
-                | primary_value '[' opt_call_args rbracket
+                ;
+
+case_args	: arg_value
                     {
-                    /*%%%*/
-                        $$ = aryset(p, $1, $3, &@$);
-                    /*% %*/
-                    /*% ripper: aref_field!($1, escape_Qundef($3)) %*/
+                        check_literal_when(p, $arg_value, &@arg_value);
+                        $$ = NEW_LIST($arg_value, &@$);
+                    /*% ripper: args_add!(args_new!, $:arg_value) %*/
                     }
-                | primary_value call_op tIDENTIFIER
+                | tSTAR arg_value
                     {
-                    /*%%%*/
-                        $$ = attrset(p, $1, $2, $3, &@$);
-                    /*% %*/
-                    /*% ripper: field!($1, $2, $3) %*/
+                        $$ = NEW_SPLAT($arg_value, &@$, &@tSTAR);
+                    /*% ripper: args_add_star!(args_new!, $:arg_value) %*/
                     }
-                | primary_value tCOLON2 tIDENTIFIER
+                | case_args[non_last_args] ',' arg_value
                     {
-                    /*%%%*/
-                        $$ = attrset(p, $1, idCOLON2, $3, &@$);
-                    /*% %*/
-                    /*% ripper: field!($1, $2, $3) %*/
+                        check_literal_when(p, $arg_value, &@arg_value);
+                        $$ = last_arg_append(p, $non_last_args, $arg_value, &@$);
+                    /*% ripper: args_add!($:non_last_args, $:arg_value) %*/
                     }
-                | primary_value call_op tCONSTANT
+                | case_args[non_last_args] ',' tSTAR arg_value
                     {
-                    /*%%%*/
-                        $$ = attrset(p, $1, $2, $3, &@$);
-                    /*% %*/
-                    /*% ripper: field!($1, $2, $3) %*/
+                        $$ = rest_arg_append(p, $non_last_args, $arg_value, &@$);
+                    /*% ripper: args_add_star!($:non_last_args, $:arg_value) %*/
                     }
-                | primary_value tCOLON2 tCONSTANT
+                ;
+
+case_body	: k_when case_args then
+                  compstmt(stmts)
+                  cases
                     {
-                    /*%%%*/
-                        $$ = const_decl(p, NEW_COLON2($1, $3, &@$), &@$);
-                    /*% %*/
-                    /*% ripper: const_decl(p, const_path_field!($1, $3)) %*/
+                        $$ = NEW_WHEN($2, $4, $5, &@$, &@1, &@3);
+                        fixpos($$, $2);
+                    /*% ripper: when!($:2, $:4, $:5) %*/
                     }
-                | tCOLON3 tCONSTANT
+                ;
+
+cases		: opt_else
+                | case_body
+                ;
+
+p_pvtbl 	: {$$ = p->pvtbl; p->pvtbl = st_init_numtable();};
+p_pktbl 	: {$$ = p->pktbl; p->pktbl = 0;};
+
+p_in_kwarg	:   {
+                        $$ = p->ctxt;
+                        SET_LEX_STATE(EXPR_BEG|EXPR_LABEL);
+                        p->command_start = FALSE;
+                        p->ctxt.in_kwarg = 1;
+                    }
+                ;
+
+p_case_body	: keyword_in
+                  p_in_kwarg[ctxt] p_pvtbl p_pktbl
+                  p_top_expr[expr] then
                     {
-                    /*%%%*/
-                        $$ = const_decl(p, NEW_COLON3($2, &@$), &@$);
-                    /*% %*/
-                    /*% ripper: const_decl(p, top_const_field!($2)) %*/
+                        pop_pktbl(p, $p_pktbl);
+                        pop_pvtbl(p, $p_pvtbl);
+                        p->ctxt.in_kwarg = $ctxt.in_kwarg;
                     }
-                | backref
+                  compstmt(stmts)
+                  p_cases[cases]
                     {
-                    /*%%%*/
-                        rb_backref_error(p, $1);
-                        $$ = NEW_BEGIN(0, &@$);
-                    /*% %*/
-                    /*% ripper[error]: backref_error(p, RNODE($1), var_field(p, $1)) %*/
+                        $$ = NEW_IN($expr, $compstmt, $cases, &@$);
+                    /*% ripper: in!($:expr, $:compstmt, $:cases) %*/
                     }
                 ;
 
-cname		: tIDENTIFIER
+p_cases 	: opt_else
+                | p_case_body
+                ;
+
+p_top_expr	: p_top_expr_body
+                | p_top_expr_body modifier_if expr_value
                     {
-                        static const char mesg[] = "class/module name must be CONSTANT";
-                    /*%%%*/
-                        yyerror1(&@1, mesg);
-                    /*% %*/
-                    /*% ripper[error]: class_name_error!(ERR_MESG(), $1) %*/
+                        $$ = new_if(p, $3, $1, 0, &@$, &@2, &NULL_LOC, &NULL_LOC);
+                        fixpos($$, $3);
+                    /*% ripper: if_mod!($:3, $:1) %*/
+                    }
+                | p_top_expr_body modifier_unless expr_value
+                    {
+                        $$ = new_unless(p, $3, $1, 0, &@$, &@2, &NULL_LOC, &NULL_LOC);
+                        fixpos($$, $3);
+                    /*% ripper: unless_mod!($:3, $:1) %*/
                     }
-                | tCONSTANT
                 ;
 
-cpath		: tCOLON3 cname
+p_top_expr_body	: p_expr
+                | p_expr ','
                     {
-                    /*%%%*/
-                        $$ = NEW_COLON3($2, &@$);
-                    /*% %*/
-                    /*% ripper: top_const_ref!($2) %*/
+                        $$ = new_array_pattern_tail(p, 0, 1, 0, 0, &@$);
+                        $$ = new_array_pattern(p, 0, $1, $$, &@$);
+                    /*% ripper: aryptn!(Qnil, [$:1], Qnil, Qnil) %*/
                     }
-                | cname
+                | p_expr ',' p_args
                     {
-                    /*%%%*/
-                        $$ = NEW_COLON2(0, $$, &@$);
-                    /*% %*/
-                    /*% ripper: const_ref!($1) %*/
+                        $$ = new_array_pattern(p, 0, $1, $3, &@$);
+                        nd_set_first_loc($$, @1.beg_pos);
+                    /*% ripper: aryptn!(Qnil, aryptn_pre_args(p, $:1, $:3[0]), *$:3[1..2]) %*/
                     }
-                | primary_value tCOLON2 cname
+                | p_find
                     {
-                    /*%%%*/
-                        $$ = NEW_COLON2($1, $3, &@$);
-                    /*% %*/
-                    /*% ripper: const_path_ref!($1, $3) %*/
+                        $$ = new_find_pattern(p, 0, $1, &@$);
+                    /*% ripper: fndptn!(Qnil, *$:1[0..2]) %*/
+                    }
+                | p_args_tail
+                    {
+                        $$ = new_array_pattern(p, 0, 0, $1, &@$);
+                    /*% ripper: aryptn!(Qnil, *$:1[0..2]) %*/
+                    }
+                | p_kwargs
+                    {
+                        $$ = new_hash_pattern(p, 0, $1, &@$);
+                    /*% ripper: hshptn!(Qnil, *$:1[0..1]) %*/
                     }
                 ;
 
-fname		: tIDENTIFIER
-                | tCONSTANT
-                | tFID
-                | op
+p_expr		: p_as
+                ;
+
+p_as		: p_expr tASSOC p_variable
                     {
-                        SET_LEX_STATE(EXPR_ENDFN);
-                        $$ = $1;
+                        NODE *n = NEW_LIST($1, &@$);
+                        n = list_append(p, n, $3);
+                        $$ = new_hash(p, n, &@$);
+                    /*% ripper: binary!($:1, ID2VAL((id_assoc)), $:3) %*/
                     }
-                | reswords
+                | p_alt
                 ;
 
-fitem		: fname
+p_alt		: p_alt '|' p_expr_basic
                     {
-                    /*%%%*/
-                        $$ = NEW_LIT(ID2SYM($1), &@$);
-                    /*% %*/
-                    /*% ripper: symbol_literal!($1) %*/
+                        $$ = NEW_OR($1, $3, &@$, &@2);
+                    /*% ripper: binary!($:1, ID2VAL(idOr), $:3) %*/
                     }
-                | symbol
+                | p_expr_basic
                 ;
 
-undef_list	: fitem
+p_lparen	: '(' p_pktbl
                     {
-                    /*%%%*/
-                        $$ = NEW_UNDEF($1, &@$);
-                    /*% %*/
-                    /*% ripper: rb_ary_new3(1, get_value($1)) %*/
+                        $$ = $2;
+                    /*% ripper: $:2 %*/
                     }
-                | undef_list ',' {SET_LEX_STATE(EXPR_FNAME|EXPR_FITEM);} fitem
-                    {
-                    /*%%%*/
-                        NODE *undef = NEW_UNDEF($4, &@4);
-                        $$ = block_append(p, $1, undef);
-                    /*% %*/
-                    /*% ripper: rb_ary_push($1, get_value($4)) %*/
-                    }
-                ;
-
-op		: '|'		{ ifndef_ripper($$ = '|'); }
-                | '^'		{ ifndef_ripper($$ = '^'); }
-                | '&'		{ ifndef_ripper($$ = '&'); }
-                | tCMP		{ ifndef_ripper($$ = tCMP); }
-                | tEQ		{ ifndef_ripper($$ = tEQ); }
-                | tEQQ		{ ifndef_ripper($$ = tEQQ); }
-                | tMATCH	{ ifndef_ripper($$ = tMATCH); }
-                | tNMATCH	{ ifndef_ripper($$ = tNMATCH); }
-                | '>'		{ ifndef_ripper($$ = '>'); }
-                | tGEQ		{ ifndef_ripper($$ = tGEQ); }
-                | '<'		{ ifndef_ripper($$ = '<'); }
-                | tLEQ		{ ifndef_ripper($$ = tLEQ); }
-                | tNEQ		{ ifndef_ripper($$ = tNEQ); }
-                | tLSHFT	{ ifndef_ripper($$ = tLSHFT); }
-                | tRSHFT	{ ifndef_ripper($$ = tRSHFT); }
-                | '+'		{ ifndef_ripper($$ = '+'); }
-                | '-'		{ ifndef_ripper($$ = '-'); }
-                | '*'		{ ifndef_ripper($$ = '*'); }
-                | tSTAR		{ ifndef_ripper($$ = '*'); }
-                | '/'		{ ifndef_ripper($$ = '/'); }
-                | '%'		{ ifndef_ripper($$ = '%'); }
-                | tPOW		{ ifndef_ripper($$ = tPOW); }
-                | tDSTAR	{ ifndef_ripper($$ = tDSTAR); }
-                | '!'		{ ifndef_ripper($$ = '!'); }
-                | '~'		{ ifndef_ripper($$ = '~'); }
-                | tUPLUS	{ ifndef_ripper($$ = tUPLUS); }
-                | tUMINUS	{ ifndef_ripper($$ = tUMINUS); }
-                | tAREF		{ ifndef_ripper($$ = tAREF); }
-                | tASET		{ ifndef_ripper($$ = tASET); }
-                | '`'		{ ifndef_ripper($$ = '`'); }
                 ;
 
-reswords	: keyword__LINE__ | keyword__FILE__ | keyword__ENCODING__
-                | keyword_BEGIN | keyword_END
-                | keyword_alias | keyword_and | keyword_begin
-                | keyword_break | keyword_case | keyword_class | keyword_def
-                | keyword_defined | keyword_do | keyword_else | keyword_elsif
-                | keyword_end | keyword_ensure | keyword_false
-                | keyword_for | keyword_in | keyword_module | keyword_next
-                | keyword_nil | keyword_not | keyword_or | keyword_redo
-                | keyword_rescue | keyword_retry | keyword_return | keyword_self
-                | keyword_super | keyword_then | keyword_true | keyword_undef
-                | keyword_when | keyword_yield | keyword_if | keyword_unless
-                | keyword_while | keyword_until
+p_lbracket	: '[' p_pktbl
+                    {
+                        $$ = $2;
+                    /*% ripper: $:2 %*/
+                    }
                 ;
 
-arg		: lhs '=' lex_ctxt arg_rhs
+p_expr_basic	: p_value
+                | p_variable
+                | p_const p_lparen[p_pktbl] p_args rparen
                     {
-                    /*%%%*/
-                        $$ = node_assign(p, $1, $4, $3, &@$);
-                    /*% %*/
-                    /*% ripper: assign!($1, $4) %*/
+                        pop_pktbl(p, $p_pktbl);
+                        $$ = new_array_pattern(p, $p_const, 0, $p_args, &@$);
+                        nd_set_first_loc($$, @p_const.beg_pos);
+                    /*% ripper: aryptn!($:p_const, *$:p_args[0..2]) %*/
                     }
-                | var_lhs tOP_ASGN lex_ctxt arg_rhs
+                | p_const p_lparen[p_pktbl] p_find rparen
                     {
-                    /*%%%*/
-                        $$ = new_op_assign(p, $1, $2, $4, $3, &@$);
-                    /*% %*/
-                    /*% ripper: opassign!($1, $2, $4) %*/
+                        pop_pktbl(p, $p_pktbl);
+                        $$ = new_find_pattern(p, $p_const, $p_find, &@$);
+                        nd_set_first_loc($$, @p_const.beg_pos);
+                    /*% ripper: fndptn!($:p_const, *$:p_find[0..2]) %*/
                     }
-                | primary_value '[' opt_call_args rbracket tOP_ASGN lex_ctxt arg_rhs
+                | p_const p_lparen[p_pktbl] p_kwargs rparen
                     {
-                    /*%%%*/
-                        $$ = new_ary_op_assign(p, $1, $3, $5, $7, &@3, &@$);
-                    /*% %*/
-                    /*% ripper: opassign!(aref_field!($1, escape_Qundef($3)), $5, $7) %*/
+                        pop_pktbl(p, $p_pktbl);
+                        $$ = new_hash_pattern(p, $p_const, $p_kwargs, &@$);
+                        nd_set_first_loc($$, @p_const.beg_pos);
+                    /*% ripper: hshptn!($:p_const, *$:p_kwargs[0..1]) %*/
                     }
-                | primary_value call_op tIDENTIFIER tOP_ASGN lex_ctxt arg_rhs
+                | p_const '(' rparen
                     {
-                    /*%%%*/
-                        $$ = new_attr_op_assign(p, $1, $2, $3, $4, $6, &@$);
-                    /*% %*/
-                    /*% ripper: opassign!(field!($1, $2, $3), $4, $6) %*/
+                        $$ = new_array_pattern_tail(p, 0, 0, 0, 0, &@$);
+                        $$ = new_array_pattern(p, $p_const, 0, $$, &@$);
+                        /*% ripper: aryptn!($:p_const, Qnil, Qnil, Qnil) %*/
                     }
-                | primary_value call_op tCONSTANT tOP_ASGN lex_ctxt arg_rhs
+                | p_const p_lbracket[p_pktbl] p_args rbracket
                     {
-                    /*%%%*/
-                        $$ = new_attr_op_assign(p, $1, $2, $3, $4, $6, &@$);
-                    /*% %*/
-                    /*% ripper: opassign!(field!($1, $2, $3), $4, $6) %*/
+                        pop_pktbl(p, $p_pktbl);
+                        $$ = new_array_pattern(p, $p_const, 0, $p_args, &@$);
+                        nd_set_first_loc($$, @p_const.beg_pos);
+                    /*% ripper: aryptn!($:p_const, *$:p_args[0..2]) %*/
                     }
-                | primary_value tCOLON2 tIDENTIFIER tOP_ASGN lex_ctxt arg_rhs
+                | p_const p_lbracket[p_pktbl] p_find rbracket
                     {
-                    /*%%%*/
-                        $$ = new_attr_op_assign(p, $1, ID2VAL(idCOLON2), $3, $4, $6, &@$);
-                    /*% %*/
-                    /*% ripper: opassign!(field!($1, $2, $3), $4, $6) %*/
+                        pop_pktbl(p, $p_pktbl);
+                        $$ = new_find_pattern(p, $p_const, $p_find, &@$);
+                        nd_set_first_loc($$, @p_const.beg_pos);
+                    /*% ripper: fndptn!($:p_const, *$:p_find[0..2]) %*/
                     }
-                | primary_value tCOLON2 tCONSTANT tOP_ASGN lex_ctxt arg_rhs
+                | p_const p_lbracket[p_pktbl] p_kwargs rbracket
                     {
-                    /*%%%*/
-                        YYLTYPE loc = code_loc_gen(&@1, &@3);
-                        $$ = new_const_op_assign(p, NEW_COLON2($1, $3, &loc), $4, $6, $5, &@$);
-                    /*% %*/
-                    /*% ripper: opassign!(const_path_field!($1, $3), $4, $6) %*/
+                        pop_pktbl(p, $p_pktbl);
+                        $$ = new_hash_pattern(p, $p_const, $p_kwargs, &@$);
+                        nd_set_first_loc($$, @p_const.beg_pos);
+                    /*% ripper: hshptn!($:p_const, *$:p_kwargs[0..1]) %*/
                     }
-                | tCOLON3 tCONSTANT tOP_ASGN lex_ctxt arg_rhs
+                | p_const '[' rbracket
                     {
-                    /*%%%*/
-                        YYLTYPE loc = code_loc_gen(&@1, &@2);
-                        $$ = new_const_op_assign(p, NEW_COLON3($2, &loc), $3, $5, $4, &@$);
-                    /*% %*/
-                    /*% ripper: opassign!(top_const_field!($2), $3, $5) %*/
+                        $$ = new_array_pattern_tail(p, 0, 0, 0, 0, &@$);
+                        $$ = new_array_pattern(p, $1, 0, $$, &@$);
+                    /*% ripper: aryptn!($:1, Qnil, Qnil, Qnil) %*/
                     }
-                | backref tOP_ASGN lex_ctxt arg_rhs
+                | tLBRACK p_args rbracket
                     {
-                    /*%%%*/
-                        rb_backref_error(p, $1);
-                        $$ = NEW_BEGIN(0, &@$);
-                    /*% %*/
-                    /*% ripper[error]: backref_error(p, RNODE($1), opassign!(var_field(p, $1), $2, $4)) %*/
+                        $$ = new_array_pattern(p, 0, 0, $p_args, &@$);
+                    /*% ripper: aryptn!(Qnil, *$:p_args[0..2]) %*/
                     }
-                | arg tDOT2 arg
+                | tLBRACK p_find rbracket
                     {
-                    /*%%%*/
-                        value_expr($1);
-                        value_expr($3);
-                        $$ = NEW_DOT2($1, $3, &@$);
-                    /*% %*/
-                    /*% ripper: dot2!($1, $3) %*/
+                        $$ = new_find_pattern(p, 0, $p_find, &@$);
+                    /*% ripper: fndptn!(Qnil, *$:p_find[0..2]) %*/
                     }
-                | arg tDOT3 arg
+                | tLBRACK rbracket
                     {
-                    /*%%%*/
-                        value_expr($1);
-                        value_expr($3);
-                        $$ = NEW_DOT3($1, $3, &@$);
-                    /*% %*/
-                    /*% ripper: dot3!($1, $3) %*/
+                        $$ = new_array_pattern_tail(p, 0, 0, 0, 0, &@$);
+                        $$ = new_array_pattern(p, 0, 0, $$, &@$);
+                    /*% ripper: aryptn!(Qnil, Qnil, Qnil, Qnil) %*/
                     }
-                | arg tDOT2
+                | tLBRACE p_pktbl lex_ctxt[ctxt]
                     {
-                    /*%%%*/
-                        value_expr($1);
-                        $$ = NEW_DOT2($1, new_nil_at(p, &@2.end_pos), &@$);
-                    /*% %*/
-                    /*% ripper: dot2!($1, Qnil) %*/
+                        p->ctxt.in_kwarg = 0;
                     }
-                | arg tDOT3
+                  p_kwargs rbrace
                     {
-                    /*%%%*/
-                        value_expr($1);
-                        $$ = NEW_DOT3($1, new_nil_at(p, &@2.end_pos), &@$);
-                    /*% %*/
-                    /*% ripper: dot3!($1, Qnil) %*/
+                        pop_pktbl(p, $p_pktbl);
+                        p->ctxt.in_kwarg = $ctxt.in_kwarg;
+                        $$ = new_hash_pattern(p, 0, $p_kwargs, &@$);
+                    /*% ripper: hshptn!(Qnil, *$:p_kwargs[0..1]) %*/
                     }
-                | tBDOT2 arg
+                | tLBRACE rbrace
                     {
-                    /*%%%*/
-                        value_expr($2);
-                        $$ = NEW_DOT2(new_nil_at(p, &@1.beg_pos), $2, &@$);
-                    /*% %*/
-                    /*% ripper: dot2!(Qnil, $2) %*/
+                        $$ = new_hash_pattern_tail(p, 0, 0, &@$);
+                        $$ = new_hash_pattern(p, 0, $$, &@$);
+                    /*% ripper: hshptn!(Qnil, Qnil, Qnil) %*/
                     }
-                | tBDOT3 arg
+                | tLPAREN p_pktbl p_expr rparen
                     {
-                    /*%%%*/
-                        value_expr($2);
-                        $$ = NEW_DOT3(new_nil_at(p, &@1.beg_pos), $2, &@$);
-                    /*% %*/
-                    /*% ripper: dot3!(Qnil, $2) %*/
+                        pop_pktbl(p, $p_pktbl);
+                        $$ = $p_expr;
+                    /*% ripper: $:p_expr %*/
                     }
-                | arg '+' arg
+                ;
+
+p_args		: p_expr
                     {
-                        $$ = call_bin_op(p, $1, '+', $3, &@2, &@$);
+                        NODE *pre_args = NEW_LIST($1, &@$);
+                        $$ = new_array_pattern_tail(p, pre_args, 0, 0, 0, &@$);
+                    /*% ripper: [[$:1], Qnil, Qnil] %*/
                     }
-                | arg '-' arg
+                | p_args_head
                     {
-                        $$ = call_bin_op(p, $1, '-', $3, &@2, &@$);
+                        $$ = new_array_pattern_tail(p, $1, 1, 0, 0, &@$);
+                    /*% ripper: [$:1, Qnil, Qnil] %*/
                     }
-                | arg '*' arg
+                | p_args_head p_arg
                     {
-                        $$ = call_bin_op(p, $1, '*', $3, &@2, &@$);
+                        $$ = new_array_pattern_tail(p, list_concat($1, $2), 0, 0, 0, &@$);
+                    /*% ripper: [rb_ary_concat($:1, $:2), Qnil, Qnil] %*/
                     }
-                | arg '/' arg
+                | p_args_head p_rest
+                    {
+                        $$ = new_array_pattern_tail(p, $1, 1, $2, 0, &@$);
+                    /*% ripper: [$:1, $:2, Qnil] %*/
+                    }
+                | p_args_head p_rest ',' p_args_post
+                    {
+                        $$ = new_array_pattern_tail(p, $1, 1, $2, $4, &@$);
+                    /*% ripper: [$:1, $:2, $:4] %*/
+                    }
+                | p_args_tail
+                ;
+
+p_args_head	: p_arg ','
+                | p_args_head p_arg ','
+                    {
+                        $$ = list_concat($1, $2);
+                    /*% ripper: rb_ary_concat($:1, $:2) %*/
+                    }
+                ;
+
+p_args_tail	: p_rest
+                    {
+                        $$ = new_array_pattern_tail(p, 0, 1, $1, 0, &@$);
+                    /*% ripper: [Qnil, $:1, Qnil] %*/
+                    }
+                | p_rest ',' p_args_post
+                    {
+                        $$ = new_array_pattern_tail(p, 0, 1, $1, $3, &@$);
+                    /*% ripper: [Qnil, $:1, $:3] %*/
+                    }
+                ;
+
+p_find		: p_rest ',' p_args_post ',' p_rest
+                    {
+                        $$ = new_find_pattern_tail(p, $1, $3, $5, &@$);
+                    /*% ripper: [$:1, $:3, $:5] %*/
+                    }
+                ;
+
+
+p_rest		: tSTAR tIDENTIFIER
                     {
-                        $$ = call_bin_op(p, $1, '/', $3, &@2, &@$);
+                        error_duplicate_pattern_variable(p, $2, &@2);
+                    /*% ripper: var_field!($:2) %*/
+                        $$ = assignable(p, $2, 0, &@$);
                     }
-                | arg '%' arg
+                | tSTAR
                     {
-                        $$ = call_bin_op(p, $1, '%', $3, &@2, &@$);
+                        $$ = 0;
+                    /*% ripper: var_field!(Qnil) %*/
                     }
-                | arg tPOW arg
+                ;
+
+p_args_post	: p_arg
+                | p_args_post ',' p_arg
                     {
-                        $$ = call_bin_op(p, $1, idPow, $3, &@2, &@$);
+                        $$ = list_concat($1, $3);
+                    /*% ripper: rb_ary_concat($:1, $:3) %*/
                     }
-                | tUMINUS_NUM simple_numeric tPOW arg
+                ;
+
+p_arg		: p_expr
                     {
-                        $$ = call_uni_op(p, call_bin_op(p, $2, idPow, $4, &@2, &@$), idUMinus, &@1, &@$);
+                        $$ = NEW_LIST($1, &@$);
+                    /*% ripper: [$:1] %*/
                     }
-                | tUPLUS arg
+                ;
+
+p_kwargs	: p_kwarg ',' p_any_kwrest
                     {
-                        $$ = call_uni_op(p, $2, idUPlus, &@1, &@$);
+                        $$ =  new_hash_pattern_tail(p, new_unique_key_hash(p, $1, &@$), $3, &@$);
+                    /*% ripper: [$:1, $:3] %*/
                     }
-                | tUMINUS arg
+                | p_kwarg
                     {
-                        $$ = call_uni_op(p, $2, idUMinus, &@1, &@$);
+                        $$ =  new_hash_pattern_tail(p, new_unique_key_hash(p, $1, &@$), 0, &@$);
+                    /*% ripper: [$:1, Qnil] %*/
                     }
-                | arg '|' arg
+                | p_kwarg ','
                     {
-                        $$ = call_bin_op(p, $1, '|', $3, &@2, &@$);
+                        $$ =  new_hash_pattern_tail(p, new_unique_key_hash(p, $1, &@$), 0, &@$);
+                    /*% ripper: [$:1, Qnil] %*/
                     }
-                | arg '^' arg
+                | p_any_kwrest
                     {
-                        $$ = call_bin_op(p, $1, '^', $3, &@2, &@$);
+                        $$ =  new_hash_pattern_tail(p, new_hash(p, 0, &@$), $1, &@$);
+                    /*% ripper: [[], $:1] %*/
                     }
-                | arg '&' arg
+                ;
+
+p_kwarg 	: p_kw
+                    /*% ripper[brace]: [$:1] %*/
+                | p_kwarg ',' p_kw
                     {
-                        $$ = call_bin_op(p, $1, '&', $3, &@2, &@$);
+                        $$ = list_concat($1, $3);
+                    /*% ripper: rb_ary_push($:1, $:3) %*/
                     }
-                | arg tCMP arg
+                ;
+
+p_kw		: p_kw_label p_expr
                     {
-                        $$ = call_bin_op(p, $1, idCmp, $3, &@2, &@$);
+                        error_duplicate_pattern_key(p, $1, &@1);
+                        $$ = list_append(p, NEW_LIST(NEW_SYM(rb_id2str($1), &@1), &@$), $2);
+                    /*% ripper: [$:1, $:2] %*/
                     }
-                | rel_expr   %prec tCMP
-                | arg tEQ arg
+                | p_kw_label
                     {
-                        $$ = call_bin_op(p, $1, idEq, $3, &@2, &@$);
+                        error_duplicate_pattern_key(p, $1, &@1);
+                        if ($1 && !is_local_id($1)) {
+                            yyerror1(&@1, "key must be valid as local variables");
+                        }
+                        error_duplicate_pattern_variable(p, $1, &@1);
+                        $$ = list_append(p, NEW_LIST(NEW_SYM(rb_id2str($1), &@$), &@$), assignable(p, $1, 0, &@$));
+                    /*% ripper: [$:1, Qnil] %*/
                     }
-                | arg tEQQ arg
+                ;
+
+p_kw_label	: tLABEL
+                | tSTRING_BEG string_contents tLABEL_END
                     {
-                        $$ = call_bin_op(p, $1, idEqq, $3, &@2, &@$);
+                        YYLTYPE loc = code_loc_gen(&@1, &@3);
+                        if (!$2 || nd_type_p($2, NODE_STR)) {
+                            NODE *node = dsym_node(p, $2, &loc);
+                            $$ = rb_sym2id(rb_node_sym_string_val(node));
+                        }
+                        else {
+                            yyerror1(&loc, "symbol literal with interpolation is not allowed");
+                            $$ = rb_intern_str(STR_NEW0());
+                        }
+                    /*% ripper: $:2 %*/
                     }
-                | arg tNEQ arg
+                ;
+
+p_kwrest	: kwrest_mark tIDENTIFIER
                     {
-                        $$ = call_bin_op(p, $1, idNeq, $3, &@2, &@$);
+                        $$ = $2;
+                    /*% ripper: var_field!($:2) %*/
                     }
-                | arg tMATCH arg
+                | kwrest_mark
                     {
-                        $$ = match_op(p, $1, $3, &@2, &@$);
+                        $$ = 0;
+                    /*% ripper: Qnil %*/
                     }
-                | arg tNMATCH arg
+                ;
+
+p_kwnorest	: kwrest_mark keyword_nil
                     {
-                        $$ = call_bin_op(p, $1, idNeqTilde, $3, &@2, &@$);
+                        $$ = 0;
                     }
-                | '!' arg
+                ;
+
+p_any_kwrest	: p_kwrest
+                | p_kwnorest
                     {
-                        $$ = call_uni_op(p, method_cond(p, $2, &@2), '!', &@1, &@$);
+                        $$ = idNil;
+                    /*% ripper: var_field!(ID2VAL(idNil)) %*/
                     }
-                | '~' arg
+                ;
+
+p_value 	: p_primitive
+                | range_expr(p_primitive)
+                | p_var_ref
+                | p_expr_ref
+                | p_const
+                ;
+
+p_primitive		: inline_primary
+                | keyword_variable
                     {
-                        $$ = call_uni_op(p, $2, '~', &@1, &@$);
+                        if (!($$ = gettable(p, $1, &@$))) $$ = NEW_ERROR(&@$);
+                    /*% ripper: var_ref!($:1) %*/
                     }
-                | arg tLSHFT arg
+                | lambda
+                ;
+
+p_variable	: tIDENTIFIER
                     {
-                        $$ = call_bin_op(p, $1, idLTLT, $3, &@2, &@$);
+                        error_duplicate_pattern_variable(p, $1, &@1);
+                    /*% ripper: var_field!($:1) %*/
+                        $$ = assignable(p, $1, 0, &@$);
                     }
-                | arg tRSHFT arg
+                ;
+
+p_var_ref	: '^' tIDENTIFIER
                     {
-                        $$ = call_bin_op(p, $1, idGTGT, $3, &@2, &@$);
+                        NODE *n = gettable(p, $2, &@$);
+                        if (!n) {
+                            n = NEW_ERROR(&@$);
+                        }
+                        else if (!(nd_type_p(n, NODE_LVAR) || nd_type_p(n, NODE_DVAR))) {
+                            compile_error(p, "%"PRIsVALUE": no such local variable", rb_id2str($2));
+                        }
+                        $$ = n;
+                    /*% ripper: var_ref!($:2) %*/
                     }
-                | arg tANDOP arg
+                | '^' nonlocal_var
                     {
-                        $$ = logop(p, idANDOP, $1, $3, &@2, &@$);
+                        if (!($$ = gettable(p, $2, &@$))) $$ = NEW_ERROR(&@$);
+                    /*% ripper: var_ref!($:2) %*/
                     }
-                | arg tOROP arg
+                ;
+
+p_expr_ref	: '^' tLPAREN expr_value rparen
                     {
-                        $$ = logop(p, idOROP, $1, $3, &@2, &@$);
+                        $$ = NEW_BLOCK($3, &@$);
+                    /*% ripper: begin!($:3) %*/
                     }
-                | keyword_defined opt_nl {p->ctxt.in_defined = 1;} arg
+                ;
+
+p_const 	: tCOLON3 cname
                     {
-                        p->ctxt.in_defined = 0;
-                        $$ = new_defined(p, $4, &@$);
+                        $$ = NEW_COLON3($2, &@$, &@1, &@2);
+                    /*% ripper: top_const_ref!($:2) %*/
                     }
-                | arg '?' arg opt_nl ':' arg
+                | p_const tCOLON2 cname
                     {
-                    /*%%%*/
-                        value_expr($1);
-                        $$ = new_if(p, $1, $3, $6, &@$);
-                        fixpos($$, $1);
-                    /*% %*/
-                    /*% ripper: ifop!($1, $3, $6) %*/
+                        $$ = NEW_COLON2($1, $3, &@$, &@2, &@3);
+                    /*% ripper: const_path_ref!($:1, $:3) %*/
                     }
-                | defn_head f_opt_paren_args '=' endless_arg
+                | tCONSTANT
+                   {
+                        $$ = gettable(p, $1, &@$);
+                    /*% ripper: var_ref!($:1) %*/
+                   }
+                ;
+
+opt_rescue	: k_rescue exc_list exc_var then
+                  compstmt(stmts)
+                  opt_rescue
                     {
-                        endless_method_name(p, $<node>1, &@1);
-                        restore_defun(p, $<node>1->nd_defn);
-                    /*%%%*/
-                        $$ = set_defun_body(p, $1, $2, $4, &@$);
-                    /*% %*/
-                    /*% ripper: def!(get_value($1), $2, bodystmt!($4, Qnil, Qnil, Qnil)) %*/
-                        local_pop(p);
+                        NODE *err = $3;
+                        if ($3) {
+                            err = NEW_ERRINFO(&@3);
+                            err = node_assign(p, $3, err, NO_LEX_CTXT, &@3);
+                        }
+                        $$ = NEW_RESBODY($2, $3, $5, $6, &@$);
+                        if ($2) {
+                            fixpos($$, $2);
+                        }
+                        else if ($3) {
+                            fixpos($$, $3);
+                        }
+                        else {
+                            fixpos($$, $5);
+                        }
+                    /*% ripper: rescue!($:2, $:3, $:5, $:6) %*/
                     }
-                | defs_head f_opt_paren_args '=' endless_arg
+                | none
+                ;
+
+exc_list	: arg_value
                     {
-                        endless_method_name(p, $<node>1, &@1);
-                        restore_defun(p, $<node>1->nd_defn);
-                    /*%%%*/
-                        $$ = set_defun_body(p, $1, $2, $4, &@$);
-                    /*%
-                        $1 = get_value($1);
-                    %*/
-                    /*% ripper: defs!(AREF($1, 0), AREF($1, 1), AREF($1, 2), $2, bodystmt!($4, Qnil, Qnil, Qnil)) %*/
-                        local_pop(p);
+                        $$ = NEW_LIST($1, &@$);
+                    /*% ripper: rb_ary_new3(1, $:1) %*/
                     }
-                | primary
+                | mrhs
                     {
-                        $$ = $1;
+                        if (!($$ = splat_array($1))) $$ = $1;
                     }
+                | none
                 ;
 
-endless_arg	: arg %prec modifier_rescue
-                | endless_arg modifier_rescue arg
+exc_var		: tASSOC lhs
                     {
-                    /*%%%*/
-                        $$ = rescued_expr(p, $1, $3, &@1, &@2, &@3);
-                    /*% %*/
-                    /*% ripper: rescue_mod!($1, $3) %*/
+                        $$ = $2;
+                    /*% ripper: $:2 %*/
                     }
-                | keyword_not opt_nl endless_arg
+                | none
+                ;
+
+opt_ensure	: k_ensure stmts terms?
                     {
-                        $$ = call_uni_op(p, method_cond(p, $3, &@3), METHOD_NOT, &@1, &@$);
+                        p->ctxt.in_rescue = $1.in_rescue;
+                        $$ = $2;
+                        void_expr(p, void_stmts(p, $$));
+                    /*% ripper: ensure!($:2) %*/
                     }
+                | none
                 ;
 
-relop		: '>'  {$$ = '>';}
-                | '<'  {$$ = '<';}
-                | tGEQ {$$ = idGE;}
-                | tLEQ {$$ = idLE;}
+literal		: numeric
+                | symbol
                 ;
 
-rel_expr	: arg relop arg   %prec '>'
-                    {
-                        $$ = call_bin_op(p, $1, $2, $3, &@2, &@$);
-                    }
-                | rel_expr relop arg   %prec '>'
+strings		: string
                     {
-                        rb_warning1("comparison '%s' after comparison", WARN_ID($2));
-                        $$ = call_bin_op(p, $1, $2, $3, &@2, &@$);
+                        if (!$1) {
+                            $$ = NEW_STR(STRING_NEW0(), &@$);
+                        } else {
+                            $$ = evstr2dstr(p, $1);
+                        }
+                    /*% ripper: $:1 %*/
                     }
                 ;
 
-lex_ctxt	: none
+string		: tCHAR
+                | string1
+                | string string1
                     {
-                        $$ = p->ctxt;
+                        $$ = literal_concat(p, $1, $2, &@$);
+                    /*% ripper: string_concat!($:1, $:2) %*/
                     }
                 ;
 
-arg_value	: arg
+string1		: tSTRING_BEG string_contents tSTRING_END
                     {
-                        value_expr($1);
-                        $$ = $1;
+                        $$ = heredoc_dedent(p, $2);
+                        if ($$) nd_set_loc($$, &@$);
+                    /*% ripper: $:2 %*/
+                        if (p->heredoc_indent > 0) {
+                        /*% ripper: heredoc_dedent!($:$, INT2NUM(%{p->heredoc_indent})) %*/
+                            p->heredoc_indent = 0;
+                        }
+                    /*% ripper: string_literal!($:$) %*/
                     }
                 ;
 
-aref_args	: none
-                | args trailer
-                    {
-                        $$ = $1;
-                    }
-                | args ',' assocs trailer
+xstring		: tXSTRING_BEG xstring_contents tSTRING_END
                     {
-                    /*%%%*/
-                        $$ = $3 ? arg_append(p, $1, new_hash(p, $3, &@3), &@$) : $1;
-                    /*% %*/
-                    /*% ripper: args_add!($1, bare_assoc_hash!($3)) %*/
+                        $$ = new_xstring(p, heredoc_dedent(p, $2), &@$);
+                    /*% ripper: $:2 %*/
+                        if (p->heredoc_indent > 0) {
+                        /*% ripper: heredoc_dedent!($:$, INT2NUM(%{p->heredoc_indent})) %*/
+                            p->heredoc_indent = 0;
+                        }
+                    /*% ripper: xstring_literal!($:$) %*/
                     }
-                | assocs trailer
+                ;
+
+regexp		: tREGEXP_BEG regexp_contents tREGEXP_END
                     {
-                    /*%%%*/
-                        $$ = $1 ? NEW_LIST(new_hash(p, $1, &@1), &@$) : 0;
-                    /*% %*/
-                    /*% ripper: args_add!(args_new!, bare_assoc_hash!($1)) %*/
+                        $$ = new_regexp(p, $2, $3, &@$, &@1, &@2, &@3);
+                    /*% ripper: regexp_literal!($:2, $:3) %*/
                     }
                 ;
 
-arg_rhs 	: arg   %prec tOP_ASGN
+words		: words(tWORDS_BEG, word_list)
+                ;
+
+word_list	: /* none */
                     {
-                        value_expr($1);
-                        $$ = $1;
+                        $$ = 0;
+                    /*% ripper: words_new! %*/
                     }
-                | arg modifier_rescue arg
+                | word_list word ' '+
                     {
-                    /*%%%*/
-                        value_expr($1);
-                        $$ = rescued_expr(p, $1, $3, &@1, &@2, &@3);
-                    /*% %*/
-                    /*% ripper: rescue_mod!($1, $3) %*/
+                        $$ = list_append(p, $1, evstr2dstr(p, $2));
+                    /*% ripper: words_add!($:1, $:2) %*/
                     }
                 ;
 
-paren_args	: '(' opt_call_args rparen
+word		: string_content
+                    /*% ripper[brace]: word_add!(word_new!, $:1) %*/
+                | word string_content
                     {
-                    /*%%%*/
-                        $$ = $2;
-                    /*% %*/
-                    /*% ripper: arg_paren!(escape_Qundef($2)) %*/
+                        $$ = literal_concat(p, $1, $2, &@$);
+                    /*% ripper: word_add!($:1, $:2) %*/
                     }
-                | '(' args ',' args_forward rparen
-                    {
-                        if (!check_forwarding_args(p)) {
-                            $$ = Qnone;
-                        }
-                        else {
-                        /*%%%*/
-                            $$ = new_args_forward_call(p, $2, &@4, &@$);
-                        /*% %*/
-                        /*% ripper: arg_paren!(args_add!($2, $4)) %*/
-                        }
+                ;
+
+symbols 	: words(tSYMBOLS_BEG, symbol_list)
+                ;
+
+symbol_list	: /* none */
+                    {
+                        $$ = 0;
+                    /*% ripper: symbols_new! %*/
                     }
-                | '(' args_forward rparen
+                | symbol_list word ' '+
                     {
-                        if (!check_forwarding_args(p)) {
-                            $$ = Qnone;
-                        }
-                        else {
-                        /*%%%*/
-                            $$ = new_args_forward_call(p, 0, &@2, &@$);
-                        /*% %*/
-                        /*% ripper: arg_paren!($2) %*/
-                        }
+                        $$ = symbol_append(p, $1, evstr2dstr(p, $2));
+                    /*% ripper: symbols_add!($:1, $:2) %*/
                     }
                 ;
 
-opt_paren_args	: none
-                | paren_args
+qwords		: words(tQWORDS_BEG, qword_list)
                 ;
 
-opt_call_args	: none
-                | call_args
-                | args ','
+qsymbols	: words(tQSYMBOLS_BEG, qsym_list)
+                ;
+
+qword_list	: /* none */
                     {
-                      $$ = $1;
+                        $$ = 0;
+                    /*% ripper: qwords_new! %*/
                     }
-                | args ',' assocs ','
+                | qword_list tSTRING_CONTENT ' '+
                     {
-                    /*%%%*/
-                        $$ = $3 ? arg_append(p, $1, new_hash(p, $3, &@3), &@$) : $1;
-                    /*% %*/
-                    /*% ripper: args_add!($1, bare_assoc_hash!($3)) %*/
+                        $$ = list_append(p, $1, $2);
+                    /*% ripper: qwords_add!($:1, $:2) %*/
                     }
-                | assocs ','
+                ;
+
+qsym_list	: /* none */
                     {
-                    /*%%%*/
-                        $$ = $1 ? NEW_LIST(new_hash(p, $1, &@1), &@1) : 0;
-                    /*% %*/
-                    /*% ripper: args_add!(args_new!, bare_assoc_hash!($1)) %*/
+                        $$ = 0;
+                    /*% ripper: qsymbols_new! %*/
+                    }
+                | qsym_list tSTRING_CONTENT ' '+
+                    {
+                        $$ = symbol_append(p, $1, $2);
+                    /*% ripper: qsymbols_add!($:1, $:2) %*/
                     }
                 ;
 
-call_args	: command
+string_contents	: /* none */
                     {
-                    /*%%%*/
-                        value_expr($1);
-                        $$ = NEW_LIST($1, &@$);
-                    /*% %*/
-                    /*% ripper: args_add!(args_new!, $1) %*/
+                        $$ = 0;
+                    /*% ripper: string_content! %*/
                     }
-                | args opt_block_arg
+                | string_contents string_content
                     {
-                    /*%%%*/
-                        $$ = arg_blk_pass($1, $2);
-                    /*% %*/
-                    /*% ripper: args_add_block!($1, $2) %*/
+                        $$ = literal_concat(p, $1, $2, &@$);
+                    /*% ripper: string_add!($:1, $:2) %*/
                     }
-                | assocs opt_block_arg
+                ;
+
+xstring_contents: /* none */
                     {
-                    /*%%%*/
-                        $$ = $1 ? NEW_LIST(new_hash(p, $1, &@1), &@1) : 0;
-                        $$ = arg_blk_pass($$, $2);
-                    /*% %*/
-                    /*% ripper: args_add_block!(args_add!(args_new!, bare_assoc_hash!($1)), $2) %*/
+                        $$ = 0;
+                    /*% ripper: xstring_new! %*/
                     }
-                | args ',' assocs opt_block_arg
+                | xstring_contents string_content
                     {
-                    /*%%%*/
-                        $$ = $3 ? arg_append(p, $1, new_hash(p, $3, &@3), &@$) : $1;
-                        $$ = arg_blk_pass($$, $4);
-                    /*% %*/
-                    /*% ripper: args_add_block!(args_add!($1, bare_assoc_hash!($3)), $4) %*/
+                        $$ = literal_concat(p, $1, $2, &@$);
+                    /*% ripper: xstring_add!($:1, $:2) %*/
                     }
-                | block_arg
-                    /*% ripper[brace]: args_add_block!(args_new!, $1) %*/
                 ;
 
-command_args	:   {
-                        /* If call_args starts with a open paren '(' or '[',
-                         * look-ahead reading of the letters calls CMDARG_PUSH(0),
-                         * but the push must be done after CMDARG_PUSH(1).
-                         * So this code makes them consistent by first cancelling
-                         * the premature CMDARG_PUSH(0), doing CMDARG_PUSH(1),
-                         * and finally redoing CMDARG_PUSH(0).
-                         */
-                        int lookahead = 0;
-                        switch (yychar) {
-                          case '(': case tLPAREN: case tLPAREN_ARG: case '[': case tLBRACK:
-                            lookahead = 1;
-                        }
-                        if (lookahead) CMDARG_POP();
-                        CMDARG_PUSH(1);
-                        if (lookahead) CMDARG_PUSH(0);
+regexp_contents: /* none */
+                    {
+                        $$ = 0;
+                    /*% ripper: regexp_new! %*/
                     }
-                  call_args
+                | regexp_contents string_content
                     {
-                        /* call_args can be followed by tLBRACE_ARG (that does CMDARG_PUSH(0) in the lexer)
-                         * but the push must be done after CMDARG_POP() in the parser.
-                         * So this code does CMDARG_POP() to pop 0 pushed by tLBRACE_ARG,
-                         * CMDARG_POP() to pop 1 pushed by command_args,
-                         * and CMDARG_PUSH(0) to restore back the flag set by tLBRACE_ARG.
-                         */
-                        int lookahead = 0;
-                        switch (yychar) {
-                          case tLBRACE_ARG:
-                            lookahead = 1;
+                        NODE *head = $1, *tail = $2;
+                        if (!head) {
+                            $$ = tail;
                         }
-                        if (lookahead) CMDARG_POP();
-                        CMDARG_POP();
-                        if (lookahead) CMDARG_PUSH(0);
-                        $$ = $2;
+                        else if (!tail) {
+                            $$ = head;
+                        }
+                        else {
+                            switch (nd_type(head)) {
+                              case NODE_STR:
+                                head = str2dstr(p, head);
+                                break;
+                              case NODE_DSTR:
+                                break;
+                              default:
+                                head = list_append(p, NEW_DSTR(0, &@$), head);
+                                break;
+                            }
+                            $$ = list_append(p, head, tail);
+                        }
+                    /*% ripper: regexp_add!($:1, $:2) %*/
                     }
                 ;
 
-block_arg	: tAMPER arg_value
+string_content	: tSTRING_CONTENT
+                    /*% ripper[brace]: $:1 %*/
+                | tSTRING_DVAR
                     {
-                    /*%%%*/
-                        $$ = NEW_BLOCK_PASS($2, &@$);
-                    /*% %*/
-                    /*% ripper: $2 %*/
+                        /* need to backup p->lex.strterm so that a string literal `%&foo,#$&,bar&` can be parsed */
+                        $$ = p->lex.strterm;
+                        p->lex.strterm = 0;
+                        SET_LEX_STATE(EXPR_BEG);
+                    }<strterm>
+                  string_dvar
+                    {
+                        p->lex.strterm = $2;
+                        $$ = NEW_EVSTR($3, &@$, &@1, &NULL_LOC);
+                        nd_set_line($$, @3.end_pos.lineno);
+                    /*% ripper: string_dvar!($:3) %*/
                     }
-                | tAMPER
+                | tSTRING_DBEG[state]
                     {
-                        if (!local_id(p, idFWD_BLOCK)) {
-                            compile_error(p, "no anonymous block parameter");
-                        }
-                    /*%%%*/
-                        $$ = NEW_BLOCK_PASS(NEW_LVAR(idFWD_BLOCK, &@1), &@$);
-                    /*% %*/
-                    /*% ripper: Qnil %*/
+                        CMDARG_PUSH(0);
+                        COND_PUSH(0);
+                        /* need to backup p->lex.strterm so that a string literal `%!foo,#{ !0 },bar!` can be parsed */
+                        $$ = p->lex.strterm;
+                        p->lex.strterm = 0;
+                        SET_LEX_STATE(EXPR_BEG);
+                    }[term]<strterm>
+                    {
+                        $$ = p->lex.brace_nest;
+                        p->lex.brace_nest = 0;
+                    }[brace]<num>
+                    {
+                        $$ = p->heredoc_indent;
+                        p->heredoc_indent = 0;
+                    }[indent]<num>
+                  compstmt(stmts) string_dend
+                    {
+                        COND_POP();
+                        CMDARG_POP();
+                        p->lex.strterm = $term;
+                        SET_LEX_STATE($state);
+                        p->lex.brace_nest = $brace;
+                        p->heredoc_indent = $indent;
+                        p->heredoc_line_indent = -1;
+                        if ($compstmt) nd_unset_fl_newline($compstmt);
+                        $$ = new_evstr(p, $compstmt, &@$, &@state, &@string_dend);
+                    /*% ripper: string_embexpr!($:compstmt) %*/
                     }
                 ;
 
-opt_block_arg	: ',' block_arg
+string_dend	: tSTRING_DEND
+                | END_OF_INPUT
+                ;
+
+string_dvar	: nonlocal_var
                     {
-                        $$ = $2;
+                        if (!($$ = gettable(p, $1, &@$))) $$ = NEW_ERROR(&@$);
+                    /*% ripper: var_ref!($:1) %*/
                     }
-                | none
+                | backref
+                ;
+
+symbol		: ssym
+                | dsym
+                ;
+
+ssym		: tSYMBEG sym
                     {
-                        $$ = 0;
+                        SET_LEX_STATE(EXPR_END);
+                        VALUE str = rb_id2str($2);
+                        /*
+                         * TODO:
+                         *   set_yylval_noname sets invalid id to yylval.
+                         *   This branch can be removed once yylval is changed to
+                         *   hold lexed string.
+                         */
+                        if (!str) str = STR_NEW0();
+                        $$ = NEW_SYM(str, &@$);
+                    /*% ripper: symbol_literal!(symbol!($:2)) %*/
                     }
                 ;
 
-/* value */
-args		: arg_value
+sym		: fname
+                | nonlocal_var
+                ;
+
+dsym		: tSYMBEG string_contents tSTRING_END
                     {
-                    /*%%%*/
-                        $$ = NEW_LIST($1, &@$);
-                    /*% %*/
-                    /*% ripper: args_add!(args_new!, $1) %*/
+                        SET_LEX_STATE(EXPR_END);
+                        $$ = dsym_node(p, $2, &@$);
+                    /*% ripper: dyna_symbol!($:2) %*/
                     }
-                | tSTAR arg_value
+                ;
+
+numeric 	: simple_numeric
+                | tUMINUS_NUM simple_numeric   %prec tLOWEST
                     {
-                    /*%%%*/
-                        $$ = NEW_SPLAT($2, &@$);
-                    /*% %*/
-                    /*% ripper: args_add_star!(args_new!, $2) %*/
+                        $$ = $2;
+                        negate_lit(p, $$);
+                    /*% ripper: unary!(ID2VAL(idUMinus), $:2) %*/
                     }
-                | tSTAR
+                ;
+
+simple_numeric	: tINTEGER
+                | tFLOAT
+                | tRATIONAL
+                | tIMAGINARY
+                ;
+
+nonlocal_var	: tIVAR
+                | tGVAR
+                | tCVAR
+                ;
+
+user_variable	: ident_or_const
+                | nonlocal_var
+                ;
+
+keyword_variable	: keyword_nil {$$ = KWD2EID(nil, $1);}
+                    | keyword_self {$$ = KWD2EID(self, $1);}
+                    | keyword_true {$$ = KWD2EID(true, $1);}
+                    | keyword_false {$$ = KWD2EID(false, $1);}
+                    | keyword__FILE__ {$$ = KWD2EID(_FILE__, $1);}
+                    | keyword__LINE__ {$$ = KWD2EID(_LINE__, $1);}
+                    | keyword__ENCODING__ {$$ = KWD2EID(_ENCODING__, $1);}
+                    ;
+
+var_ref		: user_variable
                     {
-                        if (!local_id(p, idFWD_REST) ||
-                            local_id(p, idFWD_ALL)) {
-                            compile_error(p, "no anonymous rest parameter");
+                        if (!($$ = gettable(p, $1, &@$))) $$ = NEW_ERROR(&@$);
+                        if (ifdef_ripper(id_is_var(p, $1), false)) {
+                        /*% ripper: var_ref!($:1) %*/
+                        }
+                        else {
+                        /*% ripper: vcall!($:1) %*/
                         }
-                    /*%%%*/
-                        $$ = NEW_SPLAT(NEW_LVAR(idFWD_REST, &@1), &@$);
-                    /*% %*/
-                    /*% ripper: args_add_star!(args_new!, Qnil) %*/
-                    }
-                | args ',' arg_value
-                    {
-                    /*%%%*/
-                        $$ = last_arg_append(p, $1, $3, &@$);
-                    /*% %*/
-                    /*% ripper: args_add!($1, $3) %*/
                     }
-                | args ',' tSTAR arg_value
+                | keyword_variable
                     {
-                    /*%%%*/
-                        $$ = rest_arg_append(p, $1, $4, &@$);
-                    /*% %*/
-                    /*% ripper: args_add_star!($1, $4) %*/
+                        if (!($$ = gettable(p, $1, &@$))) $$ = NEW_ERROR(&@$);
+                    /*% ripper: var_ref!($:1) %*/
                     }
-                | args ',' tSTAR
+                ;
+
+var_lhs		: user_or_keyword_variable
                     {
-                        if (!local_id(p, idFWD_REST) ||
-                            local_id(p, idFWD_ALL)) {
-                            compile_error(p, "no anonymous rest parameter");
-                        }
-                    /*%%%*/
-                        $$ = rest_arg_append(p, $1, NEW_LVAR(idFWD_REST, &@3), &@$);
-                    /*% %*/
-                    /*% ripper: args_add_star!($1, Qnil) %*/
+                    /*% ripper: var_field!($:1) %*/
+                        $$ = assignable(p, $1, 0, &@$);
                     }
                 ;
 
-/* value */
-mrhs_arg	: mrhs
-                | arg_value
+backref		: tNTH_REF
+                | tBACK_REF
                 ;
 
-/* value */
-mrhs		: args ',' arg_value
+superclass	: '<'
                     {
-                    /*%%%*/
-                        $$ = last_arg_append(p, $1, $3, &@$);
-                    /*% %*/
-                    /*% ripper: mrhs_add!(mrhs_new_from_args!($1), $3) %*/
+                        SET_LEX_STATE(EXPR_BEG);
+                        p->command_start = TRUE;
                     }
-                | args ',' tSTAR arg_value
+                  expr_value term
                     {
-                    /*%%%*/
-                        $$ = rest_arg_append(p, $1, $4, &@$);
-                    /*% %*/
-                    /*% ripper: mrhs_add_star!(mrhs_new_from_args!($1), $4) %*/
+                        $$ = $3;
+                    /*% ripper: $:3 %*/
                     }
-                | tSTAR arg_value
+                | none
+                ;
+
+f_opt_paren_args: f_paren_args
+                | none
                     {
-                    /*%%%*/
-                        $$ = NEW_SPLAT($2, &@$);
-                    /*% %*/
-                    /*% ripper: mrhs_add_star!(mrhs_new!, $2) %*/
+                        p->ctxt.in_argdef = 0;
+                        $$ = new_args_tail(p, 0, 0, 0, &@0);
+                        $$ = new_args(p, 0, 0, 0, 0, $$, &@0);
+                    /*% ripper: params!(Qnil, Qnil, Qnil, Qnil, Qnil, Qnil, Qnil) %*/
+                    }
+                ;
+
+f_paren_args	: '(' f_args rparen
+                    {
+                        $$ = $2;
+                    /*% ripper: paren!($:2) %*/
+                        SET_LEX_STATE(EXPR_BEG);
+                        p->command_start = TRUE;
+                        p->ctxt.in_argdef = 0;
                     }
                 ;
 
-primary		: literal
-                | strings
-                | xstring
-                | regexp
-                | words
-                | qwords
-                | symbols
-                | qsymbols
-                | var_ref
-                | backref
-                | tFID
+f_arglist	: f_paren_args
+                |   {
+                        $$ = p->ctxt;
+                        p->ctxt.in_kwarg = 1;
+                        p->ctxt.in_argdef = 1;
+                        SET_LEX_STATE(p->lex.state|EXPR_LABEL); /* force for args */
+                    }<ctxt>
+                  f_args term
                     {
-                    /*%%%*/
-                        $$ = NEW_FCALL($1, 0, &@$);
-                    /*% %*/
-                    /*% ripper: method_add_arg!(fcall!($1), args_new!) %*/
+                        p->ctxt.in_kwarg = $1.in_kwarg;
+                        p->ctxt.in_argdef = 0;
+                        $$ = $2;
+                        SET_LEX_STATE(EXPR_BEG);
+                        p->command_start = TRUE;
+                    /*% ripper: $:2 %*/
                     }
-                | k_begin
+                ;
+
+args_tail	: args_tail_basic(arg_value)
+                | args_forward
                     {
-                        CMDARG_PUSH(0);
+                        ID fwd = $args_forward;
+                        if (lambda_beginning_p() ||
+                            (p->lex.lpar_beg >= 0 && p->lex.lpar_beg+1 == p->lex.paren_nest)) {
+                            yyerror0("unexpected ... in lambda argument");
+                            fwd = 0;
+                        }
+                        else {
+                            add_forwarding_args(p);
+                        }
+                        $$ = new_args_tail(p, 0, fwd, arg_FWD_BLOCK, &@1);
+                        $$->nd_ainfo.forwarding = 1;
+                    /*% ripper: [Qnil, $:1, Qnil] %*/
                     }
-                  bodystmt
-                  k_end
+                ;
+
+f_args		: f_arg ',' f_opt_arg(arg_value) ',' f_rest_arg opt_args_tail(args_tail)
                     {
-                        CMDARG_POP();
-                    /*%%%*/
-                        set_line_body($3, @1.end_pos.lineno);
-                        $$ = NEW_BEGIN($3, &@$);
-                        nd_set_line($$, @1.end_pos.lineno);
-                    /*% %*/
-                    /*% ripper: begin!($3) %*/
+                        $$ = new_args(p, $1, $3, $5, 0, $6, &@$);
+                    /*% ripper: params!($:1, $:3, $:5, Qnil, *$:6[0..2]) %*/
                     }
-                | tLPAREN_ARG compstmt {SET_LEX_STATE(EXPR_ENDARG);} ')'
+                | f_arg ',' f_opt_arg(arg_value) ',' f_rest_arg ',' f_arg opt_args_tail(args_tail)
                     {
-                    /*%%%*/
-                        if (nd_type_p($2, NODE_SELF)) $2->nd_state = 0;
-                        $$ = $2;
-                    /*% %*/
-                    /*% ripper: paren!($2) %*/
+                        $$ = new_args(p, $1, $3, $5, $7, $8, &@$);
+                    /*% ripper: params!($:1, $:3, $:5, $:7, *$:8[0..2]) %*/
                     }
-                | tLPAREN compstmt ')'
+                | f_arg ',' f_opt_arg(arg_value) opt_args_tail(args_tail)
                     {
-                    /*%%%*/
-                        if (nd_type_p($2, NODE_SELF)) $2->nd_state = 0;
-                        $$ = $2;
-                    /*% %*/
-                    /*% ripper: paren!($2) %*/
+                        $$ = new_args(p, $1, $3, 0, 0, $4, &@$);
+                    /*% ripper: params!($:1, $:3, Qnil, Qnil, *$:4[0..2]) %*/
                     }
-                | primary_value tCOLON2 tCONSTANT
+                | f_arg ',' f_opt_arg(arg_value) ',' f_arg opt_args_tail(args_tail)
                     {
-                    /*%%%*/
-                        $$ = NEW_COLON2($1, $3, &@$);
-                    /*% %*/
-                    /*% ripper: const_path_ref!($1, $3) %*/
+                        $$ = new_args(p, $1, $3, 0, $5, $6, &@$);
+                    /*% ripper: params!($:1, $:3, Qnil, $:5, *$:6[0..2]) %*/
                     }
-                | tCOLON3 tCONSTANT
+                | f_arg ',' f_rest_arg opt_args_tail(args_tail)
                     {
-                    /*%%%*/
-                        $$ = NEW_COLON3($2, &@$);
-                    /*% %*/
-                    /*% ripper: top_const_ref!($2) %*/
+                        $$ = new_args(p, $1, 0, $3, 0, $4, &@$);
+                    /*% ripper: params!($:1, Qnil, $:3, Qnil, *$:4[0..2]) %*/
                     }
-                | tLBRACK aref_args ']'
+                | f_arg ',' f_rest_arg ',' f_arg opt_args_tail(args_tail)
                     {
-                    /*%%%*/
-                        $$ = make_list($2, &@$);
-                    /*% %*/
-                    /*% ripper: array!(escape_Qundef($2)) %*/
+                        $$ = new_args(p, $1, 0, $3, $5, $6, &@$);
+                    /*% ripper: params!($:1, Qnil, $:3, $:5, *$:6[0..2]) %*/
                     }
-                | tLBRACE assoc_list '}'
+                | f_arg opt_args_tail(args_tail)
                     {
-                    /*%%%*/
-                        $$ = new_hash(p, $2, &@$);
-                        $$->nd_brace = TRUE;
-                    /*% %*/
-                    /*% ripper: hash!(escape_Qundef($2)) %*/
+                        $$ = new_args(p, $1, 0, 0, 0, $2, &@$);
+                    /*% ripper: params!($:1, Qnil, Qnil, Qnil, *$:2[0..2]) %*/
                     }
-                | k_return
+                | f_opt_arg(arg_value) ',' f_rest_arg opt_args_tail(args_tail)
                     {
-                    /*%%%*/
-                        $$ = NEW_RETURN(0, &@$);
-                    /*% %*/
-                    /*% ripper: return0! %*/
+                        $$ = new_args(p, 0, $1, $3, 0, $4, &@$);
+                    /*% ripper: params!(Qnil, $:1, $:3, Qnil, *$:4[0..2]) %*/
                     }
-                | keyword_yield '(' call_args rparen
+                | f_opt_arg(arg_value) ',' f_rest_arg ',' f_arg opt_args_tail(args_tail)
                     {
-                    /*%%%*/
-                        $$ = new_yield(p, $3, &@$);
-                    /*% %*/
-                    /*% ripper: yield!(paren!($3)) %*/
+                        $$ = new_args(p, 0, $1, $3, $5, $6, &@$);
+                    /*% ripper: params!(Qnil, $:1, $:3, $:5, *$:6[0..2]) %*/
                     }
-                | keyword_yield '(' rparen
+                | f_opt_arg(arg_value) opt_args_tail(args_tail)
                     {
-                    /*%%%*/
-                        $$ = NEW_YIELD(0, &@$);
-                    /*% %*/
-                    /*% ripper: yield!(paren!(args_new!)) %*/
+                        $$ = new_args(p, 0, $1, 0, 0, $2, &@$);
+                    /*% ripper: params!(Qnil, $:1, Qnil, Qnil, *$:2[0..2]) %*/
                     }
-                | keyword_yield
+                | f_opt_arg(arg_value) ',' f_arg opt_args_tail(args_tail)
                     {
-                    /*%%%*/
-                        $$ = NEW_YIELD(0, &@$);
-                    /*% %*/
-                    /*% ripper: yield0! %*/
+                        $$ = new_args(p, 0, $1, 0, $3, $4, &@$);
+                    /*% ripper: params!(Qnil, $:1, Qnil, $:3, *$:4[0..2]) %*/
                     }
-                | keyword_defined opt_nl '(' {p->ctxt.in_defined = 1;} expr rparen
+                | f_rest_arg opt_args_tail(args_tail)
                     {
-                        p->ctxt.in_defined = 0;
-                        $$ = new_defined(p, $5, &@$);
+                        $$ = new_args(p, 0, 0, $1, 0, $2, &@$);
+                    /*% ripper: params!(Qnil, Qnil, $:1, Qnil, *$:2[0..2]) %*/
                     }
-                | keyword_not '(' expr rparen
+                | f_rest_arg ',' f_arg opt_args_tail(args_tail)
                     {
-                        $$ = call_uni_op(p, method_cond(p, $3, &@3), METHOD_NOT, &@1, &@$);
+                        $$ = new_args(p, 0, 0, $1, $3, $4, &@$);
+                    /*% ripper: params!(Qnil, Qnil, $:1, $:3, *$:4[0..2]) %*/
                     }
-                | keyword_not '(' rparen
+                | args_tail
                     {
-                        $$ = call_uni_op(p, method_cond(p, new_nil(&@2), &@2), METHOD_NOT, &@1, &@$);
+                        $$ = new_args(p, 0, 0, 0, 0, $1, &@$);
+                    /*% ripper: params!(Qnil, Qnil, Qnil, Qnil, *$:1[0..2]) %*/
                     }
-                | fcall brace_block
+                | /* none */
                     {
-                    /*%%%*/
-                        $$ = method_add_block(p, $1, $2, &@$);
-                    /*% %*/
-                    /*% ripper: method_add_block!(method_add_arg!(fcall!($1), args_new!), $2) %*/
+                        $$ = new_args_tail(p, 0, 0, 0, &@0);
+                        $$ = new_args(p, 0, 0, 0, 0, $$, &@0);
+                    /*% ripper: params!(Qnil, Qnil, Qnil, Qnil, Qnil, Qnil, Qnil) %*/
                     }
-                | method_call
-                | method_call brace_block
+                ;
+
+args_forward	: tBDOT3
                     {
-                    /*%%%*/
-                        block_dup_check(p, $1->nd_args, $2);
-                        $$ = method_add_block(p, $1, $2, &@$);
-                    /*% %*/
-                    /*% ripper: method_add_block!($1, $2) %*/
+#ifdef FORWARD_ARGS_WITH_RUBY2_KEYWORDS
+                        $$ = 0;
+#else
+                        $$ = idFWD_KWREST;
+#endif
+                    /*% ripper: args_forward! %*/
                     }
-                | lambda
-                | k_if expr_value then
-                  compstmt
-                  if_tail
-                  k_end
+                ;
+
+f_bad_arg	: tCONSTANT
                     {
+                        static const char mesg[] = "formal argument cannot be a constant";
                     /*%%%*/
-                        $$ = new_if(p, $2, $4, $5, &@$);
-                        fixpos($$, $2);
+                        yyerror1(&@1, mesg);
                     /*% %*/
-                    /*% ripper: if!($2, $4, escape_Qundef($5)) %*/
+                        $$ = 0;
+                    /*% ripper[error]: param_error!(ERR_MESG(), $:1) %*/
                     }
-                | k_unless expr_value then
-                  compstmt
-                  opt_else
-                  k_end
+                | tIVAR
                     {
+                        static const char mesg[] = "formal argument cannot be an instance variable";
                     /*%%%*/
-                        $$ = new_unless(p, $2, $4, $5, &@$);
-                        fixpos($$, $2);
+                        yyerror1(&@1, mesg);
                     /*% %*/
-                    /*% ripper: unless!($2, $4, escape_Qundef($5)) %*/
+                        $$ = 0;
+                    /*% ripper[error]: param_error!(ERR_MESG(), $:1) %*/
                     }
-                | k_while expr_value_do
-                  compstmt
-                  k_end
+                | tGVAR
                     {
+                        static const char mesg[] = "formal argument cannot be a global variable";
                     /*%%%*/
-                        $$ = NEW_WHILE(cond(p, $2, &@2), $3, 1, &@$);
-                        fixpos($$, $2);
+                        yyerror1(&@1, mesg);
                     /*% %*/
-                    /*% ripper: while!($2, $3) %*/
+                        $$ = 0;
+                    /*% ripper[error]: param_error!(ERR_MESG(), $:1) %*/
                     }
-                | k_until expr_value_do
-                  compstmt
-                  k_end
+                | tCVAR
                     {
+                        static const char mesg[] = "formal argument cannot be a class variable";
                     /*%%%*/
-                        $$ = NEW_UNTIL(cond(p, $2, &@2), $3, 1, &@$);
-                        fixpos($$, $2);
+                        yyerror1(&@1, mesg);
                     /*% %*/
-                    /*% ripper: until!($2, $3) %*/
+                        $$ = 0;
+                    /*% ripper[error]: param_error!(ERR_MESG(), $:1) %*/
                     }
-                | k_case expr_value opt_terms
+                ;
+
+f_norm_arg	: f_bad_arg
+                | tIDENTIFIER
                     {
-                        $<val>$ = p->case_labels;
-                        p->case_labels = Qnil;
+                        VALUE e = formal_argument_error(p, $$ = $1);
+                        if (e) {
+                            /*% ripper[error]: param_error!(?e, $:1) %*/
+                        }
+                        p->max_numparam = ORDINAL_PARAM;
                     }
-                  case_body
-                  k_end
+                ;
+
+f_arg_asgn	: f_norm_arg
                     {
-                        if (RTEST(p->case_labels)) rb_hash_clear(p->case_labels);
-                        p->case_labels = $<val>4;
-                    /*%%%*/
-                        $$ = NEW_CASE($2, $5, &@$);
-                        fixpos($$, $2);
-                    /*% %*/
-                    /*% ripper: case!($2, $5) %*/
+                        arg_var(p, $1);
+                        $$ = $1;
                     }
-                | k_case opt_terms
+                ;
+
+f_arg_item	: f_arg_asgn
                     {
-                        $<val>$ = p->case_labels;
-                        p->case_labels = 0;
+                        $$ = NEW_ARGS_AUX($1, 1, &NULL_LOC);
+                    /*% ripper: $:1 %*/
                     }
-                  case_body
-                  k_end
+                | tLPAREN f_margs rparen
                     {
-                        if (RTEST(p->case_labels)) rb_hash_clear(p->case_labels);
-                        p->case_labels = $<val>3;
-                    /*%%%*/
-                        $$ = NEW_CASE2($4, &@$);
-                    /*% %*/
-                    /*% ripper: case!(Qnil, $4) %*/
+                        ID tid = internal_id(p);
+                        YYLTYPE loc;
+                        loc.beg_pos = @2.beg_pos;
+                        loc.end_pos = @2.beg_pos;
+                        arg_var(p, tid);
+                        if (dyna_in_block(p)) {
+                            $2->nd_value = NEW_DVAR(tid, &loc);
+                        }
+                        else {
+                            $2->nd_value = NEW_LVAR(tid, &loc);
+                        }
+                        $$ = NEW_ARGS_AUX(tid, 1, &NULL_LOC);
+                        $$->nd_next = (NODE *)$2;
+                    /*% ripper: mlhs_paren!($:2) %*/
                     }
-                | k_case expr_value opt_terms
-                  p_case_body
-                  k_end
+                ;
+
+f_arg		: f_arg_item
+                    /*% ripper[brace]: rb_ary_new3(1, $:1) %*/
+                | f_arg ',' f_arg_item
                     {
-                    /*%%%*/
-                        $$ = NEW_CASE3($2, $4, &@$);
-                    /*% %*/
-                    /*% ripper: case!($2, $4) %*/
+                        $$ = $1;
+                        $$->nd_plen++;
+                        $$->nd_next = block_append(p, $$->nd_next, $3->nd_next);
+                        rb_discard_node(p, (NODE *)$3);
+                    /*% ripper: rb_ary_push($:1, $:3) %*/
                     }
-                | k_for for_var keyword_in expr_value_do
-                  compstmt
-                  k_end
+                ;
+
+
+f_label 	: tLABEL
                     {
-                    /*%%%*/
+                        VALUE e = formal_argument_error(p, $$ = $1);
+                        if (e) {
+                            $$ = 0;
+                            /*% ripper[error]: param_error!(?e, $:1) %*/
+                        }
                         /*
-                         *  for a, b, c in e
-                         *  #=>
-                         *  e.each{|*x| a, b, c = x}
+                         * Workaround for Prism::ParseTest#test_filepath for
+                         * "unparser/corpus/literal/def.txt"
                          *
-                         *  for a in e
-                         *  #=>
-                         *  e.each{|x| a, = x}
+                         * See the discussion on https://github.com/ruby/ruby/pull/9923
                          */
-                        ID id = internal_id(p);
-                        NODE *m = NEW_ARGS_AUX(0, 0, &NULL_LOC);
-                        NODE *args, *scope, *internal_var = NEW_DVAR(id, &@2);
-                        rb_ast_id_table_t *tbl = rb_ast_new_local_table(p->ast, 1);
-                        tbl->ids[0] = id; /* internal id */
-
-                        switch (nd_type($2)) {
-                          case NODE_LASGN:
-                          case NODE_DASGN: /* e.each {|internal_var| a = internal_var; ... } */
-                            $2->nd_value = internal_var;
-                            id = 0;
-                            m->nd_plen = 1;
-                            m->nd_next = $2;
-                            break;
-                          case NODE_MASGN: /* e.each {|*internal_var| a, b, c = (internal_var.length == 1 && Array === (tmp = internal_var[0]) ? tmp : internal_var); ... } */
-                            m->nd_next = node_assign(p, $2, NEW_FOR_MASGN(internal_var, &@2), NO_LEX_CTXT, &@2);
-                            break;
-                          default: /* e.each {|*internal_var| @a, B, c[1], d.attr = internal_val; ... } */
-                            m->nd_next = node_assign(p, NEW_MASGN(NEW_LIST($2, &@2), 0, &@2), internal_var, NO_LEX_CTXT, &@2);
-                        }
-                        /* {|*internal_id| <m> = internal_id; ... } */
-                        args = new_args(p, m, 0, id, 0, new_args_tail(p, 0, 0, 0, &@2), &@2);
-                        scope = NEW_NODE(NODE_SCOPE, tbl, $5, args, &@$);
-                        $$ = NEW_FOR($4, scope, &@$);
-                        fixpos($$, $2);
-                    /*% %*/
-                    /*% ripper: for!($2, $4, $5) %*/
+                        arg_var(p, ifdef_ripper(0, $1));
+                        /*% ripper: $:1 %*/
+                        p->max_numparam = ORDINAL_PARAM;
+                        p->ctxt.in_argdef = 0;
                     }
-                | k_class cpath superclass
+                ;
+
+kwrest_mark	: tPOW
+                | tDSTAR
+                ;
+
+f_no_kwarg	: p_kwnorest
                     {
-                        if (p->ctxt.in_def) {
-                            YYLTYPE loc = code_loc_gen(&@1, &@2);
-                            yyerror1(&loc, "class definition in method body");
-                        }
-                        p->ctxt.in_class = 1;
-                        local_push(p, 0);
+                    /*% ripper: nokw_param!(Qnil) %*/
                     }
-                  bodystmt
-                  k_end
+                ;
+
+f_kwrest	: kwrest_mark tIDENTIFIER
                     {
-                    /*%%%*/
-                        $$ = NEW_CLASS($2, $5, $3, &@$);
-                        nd_set_line($$->nd_body, @6.end_pos.lineno);
-                        set_line_body($5, @3.end_pos.lineno);
-                        nd_set_line($$, @3.end_pos.lineno);
-                    /*% %*/
-                    /*% ripper: class!($2, $3, $5) %*/
-                        local_pop(p);
-                        p->ctxt.in_class = $<ctxt>1.in_class;
-                        p->ctxt.shareable_constant_value = $<ctxt>1.shareable_constant_value;
+                        arg_var(p, shadowing_lvar(p, $2));
+                        $$ = $2;
+                    /*% ripper: kwrest_param!($:2) %*/
                     }
-                | k_class tLSHFT expr
+                | kwrest_mark
                     {
-                        p->ctxt.in_def = 0;
-                        p->ctxt.in_class = 0;
-                        local_push(p, 0);
+                        arg_var(p, idFWD_KWREST);
+                        $$ = idFWD_KWREST;
+                    /*% ripper: kwrest_param!(Qnil) %*/
+                    }
+                ;
+
+restarg_mark	: '*'
+                | tSTAR
+                ;
+
+f_rest_arg	: restarg_mark tIDENTIFIER
+                    {
+                        arg_var(p, shadowing_lvar(p, $2));
+                        $$ = $2;
+                    /*% ripper: rest_param!($:2) %*/
                     }
-                  term
-                  bodystmt
-                  k_end
+                | restarg_mark
                     {
-                    /*%%%*/
-                        $$ = NEW_SCLASS($3, $6, &@$);
-                        nd_set_line($$->nd_body, @7.end_pos.lineno);
-                        set_line_body($6, nd_line($3));
-                        fixpos($$, $3);
-                    /*% %*/
-                    /*% ripper: sclass!($3, $6) %*/
-                        local_pop(p);
-                        p->ctxt.in_def = $<ctxt>1.in_def;
-                        p->ctxt.in_class = $<ctxt>1.in_class;
-                        p->ctxt.shareable_constant_value = $<ctxt>1.shareable_constant_value;
+                        arg_var(p, idFWD_REST);
+                        $$ = idFWD_REST;
+                    /*% ripper: rest_param!(Qnil) %*/
+                    }
+                ;
+
+blkarg_mark	: '&'
+                | tAMPER
+                ;
+
+f_block_arg	: blkarg_mark tIDENTIFIER
+                    {
+                        arg_var(p, shadowing_lvar(p, $2));
+                        $$ = $2;
+                    /*% ripper: blockarg!($:2) %*/
                     }
-                | k_module cpath
+                | blkarg_mark
                     {
-                        if (p->ctxt.in_def) {
-                            YYLTYPE loc = code_loc_gen(&@1, &@2);
-                            yyerror1(&loc, "module definition in method body");
+                        arg_var(p, idFWD_BLOCK);
+                        $$ = idFWD_BLOCK;
+                    /*% ripper: blockarg!(Qnil) %*/
+                    }
+                ;
+
+opt_f_block_arg	: ',' f_block_arg
+                    {
+                        $$ = $2;
+                    /*% ripper: $:2 %*/
+                    }
+                | none
+                ;
+
+
+singleton	: value_expr(singleton_expr)
+                    {
+                        NODE *expr = last_expr_node($1);
+                        switch (nd_type(expr)) {
+                          case NODE_STR:
+                          case NODE_DSTR:
+                          case NODE_XSTR:
+                          case NODE_DXSTR:
+                          case NODE_REGX:
+                          case NODE_DREGX:
+                          case NODE_SYM:
+                          case NODE_LINE:
+                          case NODE_FILE:
+                          case NODE_ENCODING:
+                          case NODE_INTEGER:
+                          case NODE_FLOAT:
+                          case NODE_RATIONAL:
+                          case NODE_IMAGINARY:
+                          case NODE_DSYM:
+                          case NODE_LIST:
+                          case NODE_ZLIST:
+                            yyerror1(&expr->nd_loc, "can't define singleton method for literals");
+                            break;
+                          default:
+                            break;
                         }
-                        p->ctxt.in_class = 1;
-                        local_push(p, 0);
+                        $$ = $1;
                     }
-                  bodystmt
-                  k_end
+                ;
+
+singleton_expr	: var_ref
+                | '('
                     {
-                    /*%%%*/
-                        $$ = NEW_MODULE($2, $4, &@$);
-                        nd_set_line($$->nd_body, @5.end_pos.lineno);
-                        set_line_body($4, @2.end_pos.lineno);
-                        nd_set_line($$, @2.end_pos.lineno);
-                    /*% %*/
-                    /*% ripper: module!($2, $4) %*/
-                        local_pop(p);
-                        p->ctxt.in_class = $<ctxt>1.in_class;
-                        p->ctxt.shareable_constant_value = $<ctxt>1.shareable_constant_value;
+                        SET_LEX_STATE(EXPR_BEG);
+                        p->ctxt.in_argdef = 0;
+                    }
+                  expr rparen
+                    {
+                        p->ctxt.in_argdef = 1;
+                        $$ = $3;
+                    /*% ripper: paren!($:3) %*/
                     }
-                | defn_head
-                  f_arglist
+                ;
+
+assoc_list	: none
+                | assocs trailer
                     {
-                    /*%%%*/
-                        push_end_expect_token_locations(p, &@1.beg_pos);
-                    /*% %*/
+                        $$ = $1;
+                    /*% ripper: assoclist_from_args!($:1) %*/
                     }
-                  bodystmt
-                  k_end
+                ;
+
+assocs		: assoc
+                    /*% ripper[brace]: rb_ary_new3(1, $:1) %*/
+                | assocs ',' assoc
                     {
-                        restore_defun(p, $<node>1->nd_defn);
-                    /*%%%*/
-                        $$ = set_defun_body(p, $1, $2, $4, &@$);
-                    /*% %*/
-                    /*% ripper: def!(get_value($1), $2, $4) %*/
-                        local_pop(p);
+                        NODE *assocs = $1;
+                        NODE *tail = $3;
+                        if (!assocs) {
+                            assocs = tail;
+                        }
+                        else if (tail) {
+                            if (RNODE_LIST(assocs)->nd_head) {
+                                NODE *n = RNODE_LIST(tail)->nd_next;
+                                if (!RNODE_LIST(tail)->nd_head && nd_type_p(n, NODE_LIST) &&
+                                    nd_type_p((n = RNODE_LIST(n)->nd_head), NODE_HASH)) {
+                                    /* DSTAR */
+                                    tail = RNODE_HASH(n)->nd_head;
+                                }
+                            }
+                            if (tail) {
+                                assocs = list_concat(assocs, tail);
+                            }
+                        }
+                        $$ = assocs;
+                    /*% ripper: rb_ary_push($:1, $:3) %*/
                     }
-                | defs_head
-                  f_arglist
+                ;
+
+assoc		: arg_value tASSOC arg_value
                     {
-                    /*%%%*/
-                        push_end_expect_token_locations(p, &@1.beg_pos);
-                    /*% %*/
+                        $$ = list_append(p, NEW_LIST($1, &@$), $3);
+                    /*% ripper: assoc_new!($:1, $:3) %*/
                     }
-                  bodystmt
-                  k_end
+                | tLABEL arg_value
                     {
-                        restore_defun(p, $<node>1->nd_defn);
-                    /*%%%*/
-                        $$ = set_defun_body(p, $1, $2, $4, &@$);
-                    /*%
-                        $1 = get_value($1);
-                    %*/
-                    /*% ripper: defs!(AREF($1, 0), AREF($1, 1), AREF($1, 2), $2, $4) %*/
-                        local_pop(p);
+                        $$ = list_append(p, NEW_LIST(NEW_SYM(rb_id2str($1), &@1), &@$), $2);
+                    /*% ripper: assoc_new!($:1, $:2) %*/
                     }
-                | keyword_break
+                | tLABEL
                     {
-                    /*%%%*/
-                        $$ = NEW_BREAK(0, &@$);
-                    /*% %*/
-                    /*% ripper: break!(args_new!) %*/
+                        NODE *val = gettable(p, $1, &@$);
+                        if (!val) val = NEW_ERROR(&@$);
+                        $$ = list_append(p, NEW_LIST(NEW_SYM(rb_id2str($1), &@1), &@$), val);
+                    /*% ripper: assoc_new!($:1, Qnil) %*/
                     }
-                | keyword_next
+                | tSTRING_BEG string_contents tLABEL_END arg_value
                     {
-                    /*%%%*/
-                        $$ = NEW_NEXT(0, &@$);
-                    /*% %*/
-                    /*% ripper: next!(args_new!) %*/
+                        YYLTYPE loc = code_loc_gen(&@1, &@3);
+                        $$ = list_append(p, NEW_LIST(dsym_node(p, $2, &loc), &loc), $4);
+                    /*% ripper: assoc_new!(dyna_symbol!($:2), $:4) %*/
                     }
-                | keyword_redo
+                | tDSTAR arg_value
                     {
-                    /*%%%*/
-                        $$ = NEW_REDO(&@$);
-                    /*% %*/
-                    /*% ripper: redo! %*/
+                        $$ = list_append(p, NEW_LIST(0, &@$), $2);
+                    /*% ripper: assoc_splat!($:2) %*/
                     }
-                | keyword_retry
+                | tDSTAR
                     {
-                    /*%%%*/
-                        $$ = NEW_RETRY(&@$);
-                    /*% %*/
-                    /*% ripper: retry! %*/
+                        forwarding_arg_check(p, idFWD_KWREST, idFWD_ALL, "keyword rest");
+                        $$ = list_append(p, NEW_LIST(0, &@$),
+                                         NEW_LVAR(idFWD_KWREST, &@$));
+                    /*% ripper: assoc_splat!(Qnil) %*/
                     }
                 ;
 
-primary_value	: primary
-                    {
-                        value_expr($1);
-                        $$ = $1;
-                    }
+%rule %inline operation : ident_or_const
+                        | tFID
+                        ;
+
+operation2	: operation
+                | op
                 ;
 
-k_begin		: keyword_begin
-                    {
-                        token_info_push(p, "begin", &@$);
-                    /*%%%*/
-                        push_end_expect_token_locations(p, &@1.beg_pos);
-                    /*% %*/
-                    }
+operation3	: tIDENTIFIER
+                | tFID
+                | op
                 ;
 
-k_if		: keyword_if
-                    {
-                        WARN_EOL("if");
-                        token_info_push(p, "if", &@$);
-                        if (p->token_info && p->token_info->nonspc &&
-                            p->token_info->next && !strcmp(p->token_info->next->token, "else")) {
-                            const char *tok = p->lex.ptok - rb_strlen_lit("if");
-                            const char *beg = p->lex.pbeg + p->token_info->next->beg.column;
-                            beg += rb_strlen_lit("else");
-                            while (beg < tok && ISSPACE(*beg)) beg++;
-                            if (beg == tok) {
-                                p->token_info->nonspc = 0;
-                            }
-                        }
-                    /*%%%*/
-                        push_end_expect_token_locations(p, &@1.beg_pos);
-                    /*% %*/
-                    }
+dot_or_colon	: '.'
+                | tCOLON2
                 ;
 
-k_unless	: keyword_unless
+call_op 	: '.'
+                | tANDDOT
+                ;
+
+call_op2	: call_op
+                | tCOLON2
+                ;
+
+rparen		: '\n'? ')'
+                ;
+
+rbracket	: '\n'? ']'
+                ;
+
+rbrace		: '\n'? '}'
+                ;
+
+trailer		: '\n'?
+                | ','
+                ;
+
+term		: ';' {yyerrok;token_flush(p);}
+                | '\n'
                     {
-                        token_info_push(p, "unless", &@$);
-                    /*%%%*/
-                        push_end_expect_token_locations(p, &@1.beg_pos);
-                    /*% %*/
+                        @$.end_pos = @$.beg_pos;
+                        token_flush(p);
                     }
                 ;
 
-k_while		: keyword_while
+terms		: term
+                | terms ';' {yyerrok;}
+                ;
+
+none		: /* none */
                     {
-                        token_info_push(p, "while", &@$);
-                    /*%%%*/
-                        push_end_expect_token_locations(p, &@1.beg_pos);
-                    /*% %*/
+                        $$ = 0;
+                    /*% ripper: Qnil %*/
                     }
                 ;
+%%
+# undef p
+# undef yylex
+# undef yylval
+# define yylval  (*p->lval)
+
+static int regx_options(struct parser_params*);
+static int tokadd_string(struct parser_params*,int,int,int,long*,rb_encoding**,rb_encoding**);
+static void tokaddmbc(struct parser_params *p, int c, rb_encoding *enc);
+static enum yytokentype parse_string(struct parser_params*,rb_strterm_literal_t*);
+static enum yytokentype here_document(struct parser_params*,rb_strterm_heredoc_t*);
+
+#define set_parser_s_value(x) (ifdef_ripper(p->s_value = (x), (void)0))
+
+# define set_yylval_node(x) {				\
+  YYLTYPE _cur_loc;					\
+  rb_parser_set_location(p, &_cur_loc);			\
+  yylval.node = (x);					\
+  set_parser_s_value(STR_NEW(p->lex.ptok, p->lex.pcur-p->lex.ptok)); \
+}
+# define set_yylval_str(x) \
+do { \
+  set_yylval_node(NEW_STR(x, &_cur_loc)); \
+  set_parser_s_value(rb_str_new_mutable_parser_string(x)); \
+} while(0)
+# define set_yylval_num(x) { \
+  yylval.num = (x); \
+  set_parser_s_value(x); \
+}
+# define set_yylval_id(x) (yylval.id = (x))
+# define set_yylval_name(x) { \
+  (yylval.id = (x)); \
+  set_parser_s_value(ID2SYM(x)); \
+}
+# define yylval_id() (yylval.id)
+
+#define set_yylval_noname() set_yylval_id(keyword_nil)
+#define has_delayed_token(p) (p->delayed.token != NULL)
+
+#ifndef RIPPER
+#define literal_flush(p, ptr) ((p)->lex.ptok = (ptr))
+#define dispatch_scan_event(p, t) parser_dispatch_scan_event(p, t, __LINE__)
+
+static bool
+parser_has_token(struct parser_params *p)
+{
+    const char *const pcur = p->lex.pcur;
+    const char *const ptok = p->lex.ptok;
+    if (p->keep_tokens && (pcur < ptok)) {
+        rb_bug("lex.pcur < lex.ptok. (line: %d) %"PRIdPTRDIFF"|%"PRIdPTRDIFF"|%"PRIdPTRDIFF"",
+               p->ruby_sourceline, ptok - p->lex.pbeg, pcur - ptok, p->lex.pend - pcur);
+    }
+    return pcur > ptok;
+}
+
+static const char *
+escaped_char(int c)
+{
+    switch (c) {
+      case '"': return "\\\"";
+      case '\\': return "\\\\";
+      case '\0': return "\\0";
+      case '\n': return "\\n";
+      case '\r': return "\\r";
+      case '\t': return "\\t";
+      case '\f': return "\\f";
+      case '\013': return "\\v";
+      case '\010': return "\\b";
+      case '\007': return "\\a";
+      case '\033': return "\\e";
+      case '\x7f': return "\\c?";
+    }
+    return NULL;
+}
+
+static rb_parser_string_t *
+rb_parser_str_escape(struct parser_params *p, rb_parser_string_t *str)
+{
+    rb_encoding *enc = p->enc;
+    const char *ptr = str->ptr;
+    const char *pend = ptr + str->len;
+    const char *prev = ptr;
+    char charbuf[5] = {'\\', 'x', 0, 0, 0};
+    rb_parser_string_t * result = rb_parser_string_new(p, 0, 0);
+
+    while (ptr < pend) {
+        unsigned int c;
+        const char *cc;
+        int n = rb_enc_precise_mbclen(ptr, pend, enc);
+        if (!MBCLEN_CHARFOUND_P(n)) {
+            if (ptr > prev) parser_str_cat(result, prev, ptr - prev);
+            n = rb_enc_mbminlen(enc);
+            if (pend < ptr + n)
+                n = (int)(pend - ptr);
+            while (n--) {
+                c = *ptr & 0xf0 >> 4;
+                charbuf[2] = (c < 10) ? '0' + c : 'A' + c - 10;
+                c = *ptr & 0x0f;
+                charbuf[3] = (c < 10) ? '0' + c : 'A' + c - 10;
+                parser_str_cat(result, charbuf, 4);
+                prev = ++ptr;
+            }
+            continue;
+        }
+        n = MBCLEN_CHARFOUND_LEN(n);
+        c = rb_enc_mbc_to_codepoint(ptr, pend, enc);
+        ptr += n;
+        cc = escaped_char(c);
+        if (cc) {
+            if (ptr - n > prev) parser_str_cat(result, prev, ptr - n - prev);
+            parser_str_cat_cstr(result, cc);
+            prev = ptr;
+        }
+        else if (rb_enc_isascii(c, enc) && ISPRINT(c)) {
+        }
+        else {
+            if (ptr - n > prev) {
+                parser_str_cat(result, prev, ptr - n - prev);
+                prev = ptr - n;
+            }
+            parser_str_cat(result, prev, ptr - prev);
+            prev = ptr;
+        }
+    }
+    if (ptr > prev) parser_str_cat(result, prev, ptr - prev);
+
+    return result;
+}
+
+static void
+parser_append_tokens(struct parser_params *p, rb_parser_string_t *str, enum yytokentype t, int line)
+{
+    rb_parser_ast_token_t *token = xcalloc(1, sizeof(rb_parser_ast_token_t));
+    token->id = p->token_id;
+    token->type_name = parser_token2char(p, t);
+    token->str = str;
+    token->loc.beg_pos = p->yylloc->beg_pos;
+    token->loc.end_pos = p->yylloc->end_pos;
+    rb_parser_ary_push_ast_token(p, p->tokens, token);
+    p->token_id++;
+
+    if (p->debug) {
+        rb_parser_string_t *str_escaped = rb_parser_str_escape(p, str);
+        rb_parser_printf(p, "Append tokens (line: %d) [%d, :%s, \"%s\", [%d, %d, %d, %d]]\n",
+                            line, token->id, token->type_name, str_escaped->ptr,
+                            token->loc.beg_pos.lineno, token->loc.beg_pos.column,
+                            token->loc.end_pos.lineno, token->loc.end_pos.column);
+        rb_parser_string_free(p, str_escaped);
+    }
+}
+
+static void
+parser_dispatch_scan_event(struct parser_params *p, enum yytokentype t, int line)
+{
+    debug_token_line(p, "parser_dispatch_scan_event", line);
+
+    if (!parser_has_token(p)) return;
+
+    RUBY_SET_YYLLOC(*p->yylloc);
+
+    if (p->keep_tokens) {
+        rb_parser_string_t *str = rb_parser_encoding_string_new(p, p->lex.ptok, p->lex.pcur - p->lex.ptok, p->enc);
+        parser_append_tokens(p, str, t, line);
+    }
+
+    token_flush(p);
+}
+
+#define dispatch_delayed_token(p, t) parser_dispatch_delayed_token(p, t, __LINE__)
+static void
+parser_dispatch_delayed_token(struct parser_params *p, enum yytokentype t, int line)
+{
+    debug_token_line(p, "parser_dispatch_delayed_token", line);
+
+    if (!has_delayed_token(p)) return;
+
+    RUBY_SET_YYLLOC_OF_DELAYED_TOKEN(*p->yylloc);
+
+    if (p->keep_tokens) {
+        /* p->delayed.token is freed by rb_parser_tokens_free */
+        parser_append_tokens(p, p->delayed.token, t, line);
+    } else {
+        rb_parser_string_free(p, p->delayed.token);
+    }
+
+    p->delayed.token = NULL;
+}
+#else
+#define literal_flush(p, ptr) ((void)(ptr))
+
+static int
+ripper_has_scan_event(struct parser_params *p)
+{
+    if (p->lex.pcur < p->lex.ptok) rb_raise(rb_eRuntimeError, "lex.pcur < lex.ptok");
+    return p->lex.pcur > p->lex.ptok;
+}
+
+static VALUE
+ripper_scan_event_val(struct parser_params *p, enum yytokentype t)
+{
+    VALUE str = STR_NEW(p->lex.ptok, p->lex.pcur - p->lex.ptok);
+    VALUE rval = ripper_dispatch1(p, ripper_token2eventid(t), str);
+    RUBY_SET_YYLLOC(*p->yylloc);
+    token_flush(p);
+    return rval;
+}
+
+static void
+ripper_dispatch_scan_event(struct parser_params *p, enum yytokentype t)
+{
+    if (!ripper_has_scan_event(p)) return;
+
+    set_parser_s_value(ripper_scan_event_val(p, t));
+}
+#define dispatch_scan_event(p, t) ripper_dispatch_scan_event(p, t)
 
-k_until		: keyword_until
-                    {
-                        token_info_push(p, "until", &@$);
-                    /*%%%*/
-                        push_end_expect_token_locations(p, &@1.beg_pos);
-                    /*% %*/
-                    }
-                ;
+static void
+ripper_dispatch_delayed_token(struct parser_params *p, enum yytokentype t)
+{
+    /* save and adjust the location to delayed token for callbacks */
+    int saved_line = p->ruby_sourceline;
+    const char *saved_tokp = p->lex.ptok;
+    VALUE s_value, str;
 
-k_case		: keyword_case
-                    {
-                        token_info_push(p, "case", &@$);
-                    /*%%%*/
-                        push_end_expect_token_locations(p, &@1.beg_pos);
-                    /*% %*/
-                    }
-                ;
+    if (!has_delayed_token(p)) return;
+    p->ruby_sourceline = p->delayed.beg_line;
+    p->lex.ptok = p->lex.pbeg + p->delayed.beg_col;
+    str = rb_str_new_mutable_parser_string(p->delayed.token);
+    rb_parser_string_free(p, p->delayed.token);
+    s_value = ripper_dispatch1(p, ripper_token2eventid(t), str);
+    set_parser_s_value(s_value);
+    p->delayed.token = NULL;
+    p->ruby_sourceline = saved_line;
+    p->lex.ptok = saved_tokp;
+}
+#define dispatch_delayed_token(p, t) ripper_dispatch_delayed_token(p, t)
+#endif /* RIPPER */
 
-k_for		: keyword_for
-                    {
-                        token_info_push(p, "for", &@$);
-                    /*%%%*/
-                        push_end_expect_token_locations(p, &@1.beg_pos);
-                    /*% %*/
-                    }
-                ;
+static inline int
+is_identchar(struct parser_params *p, const char *ptr, const char *MAYBE_UNUSED(ptr_end), rb_encoding *enc)
+{
+    return rb_enc_isalnum((unsigned char)*ptr, enc) || *ptr == '_' || !ISASCII(*ptr);
+}
 
-k_class		: keyword_class
-                    {
-                        token_info_push(p, "class", &@$);
-                        $<ctxt>$ = p->ctxt;
-                    /*%%%*/
-                        push_end_expect_token_locations(p, &@1.beg_pos);
-                    /*% %*/
-                    }
-                ;
+static inline int
+parser_is_identchar(struct parser_params *p)
+{
+    return !(p)->eofp && is_identchar(p, p->lex.pcur-1, p->lex.pend, p->enc);
+}
 
-k_module	: keyword_module
-                    {
-                        token_info_push(p, "module", &@$);
-                        $<ctxt>$ = p->ctxt;
-                    /*%%%*/
-                        push_end_expect_token_locations(p, &@1.beg_pos);
-                    /*% %*/
-                    }
-                ;
+static inline int
+parser_isascii(struct parser_params *p)
+{
+    return ISASCII(*(p->lex.pcur-1));
+}
 
-k_def		: keyword_def
-                    {
-                        token_info_push(p, "def", &@$);
-                        p->ctxt.in_argdef = 1;
-                    }
-                ;
+static void
+token_info_setup(token_info *ptinfo, const char *ptr, const rb_code_location_t *loc)
+{
+    int column = 1, nonspc = 0, i;
+    for (i = 0; i < loc->beg_pos.column; i++, ptr++) {
+        if (*ptr == '\t') {
+            column = (((column - 1) / TAB_WIDTH) + 1) * TAB_WIDTH;
+        }
+        column++;
+        if (*ptr != ' ' && *ptr != '\t') {
+            nonspc = 1;
+        }
+    }
 
-k_do		: keyword_do
-                    {
-                        token_info_push(p, "do", &@$);
-                    /*%%%*/
-                        push_end_expect_token_locations(p, &@1.beg_pos);
-                    /*% %*/
+    ptinfo->beg = loc->beg_pos;
+    ptinfo->indent = column;
+    ptinfo->nonspc = nonspc;
+}
 
-                    }
-                ;
+static void
+token_info_push(struct parser_params *p, const char *token, const rb_code_location_t *loc)
+{
+    token_info *ptinfo;
 
-k_do_block	: keyword_do_block
-                    {
-                        token_info_push(p, "do", &@$);
-                    /*%%%*/
-                        push_end_expect_token_locations(p, &@1.beg_pos);
-                    /*% %*/
-                    }
-                ;
+    if (!p->token_info_enabled) return;
+    ptinfo = ALLOC(token_info);
+    ptinfo->token = token;
+    ptinfo->next = p->token_info;
+    token_info_setup(ptinfo, p->lex.pbeg, loc);
 
-k_rescue	: keyword_rescue
-                    {
-                        token_info_warn(p, "rescue", p->token_info, 1, &@$);
-                    }
-                ;
+    p->token_info = ptinfo;
+}
 
-k_ensure	: keyword_ensure
-                    {
-                        token_info_warn(p, "ensure", p->token_info, 1, &@$);
-                    }
-                ;
+static void
+token_info_pop(struct parser_params *p, const char *token, const rb_code_location_t *loc)
+{
+    token_info *ptinfo_beg = p->token_info;
 
-k_when		: keyword_when
-                    {
-                        token_info_warn(p, "when", p->token_info, 0, &@$);
-                    }
-                ;
+    if (!ptinfo_beg) return;
 
-k_else		: keyword_else
-                    {
-                        token_info *ptinfo_beg = p->token_info;
-                        int same = ptinfo_beg && strcmp(ptinfo_beg->token, "case") != 0;
-                        token_info_warn(p, "else", p->token_info, same, &@$);
-                        if (same) {
-                            token_info e;
-                            e.next = ptinfo_beg->next;
-                            e.token = "else";
-                            token_info_setup(&e, p->lex.pbeg, &@$);
-                            if (!e.nonspc) *ptinfo_beg = e;
-                        }
-                    }
-                ;
+    /* indentation check of matched keywords (begin..end, if..end, etc.) */
+    token_info_warn(p, token, ptinfo_beg, 1, loc);
 
-k_elsif 	: keyword_elsif
-                    {
-                        WARN_EOL("elsif");
-                        token_info_warn(p, "elsif", p->token_info, 1, &@$);
-                    }
-                ;
+    p->token_info = ptinfo_beg->next;
+    ruby_sized_xfree(ptinfo_beg, sizeof(*ptinfo_beg));
+}
 
-k_end		: keyword_end
-                    {
-                        token_info_pop(p, "end", &@$);
-                    /*%%%*/
-                        pop_end_expect_token_locations(p);
-                    /*% %*/
-                    }
-                | tDUMNY_END
-                    {
-                        compile_error(p, "syntax error, unexpected end-of-input");
-                    }
-                ;
+static void
+token_info_drop(struct parser_params *p, const char *token, rb_code_position_t beg_pos)
+{
+    token_info *ptinfo_beg = p->token_info;
 
-k_return	: keyword_return
-                    {
-                        if (p->ctxt.in_class && !p->ctxt.in_def && !dyna_in_block(p))
-                            yyerror1(&@1, "Invalid return in class/module body");
-                    }
-                ;
+    if (!ptinfo_beg) return;
+    p->token_info = ptinfo_beg->next;
 
-then		: term
-                | keyword_then
-                | term keyword_then
-                ;
+    if (ptinfo_beg->beg.lineno != beg_pos.lineno ||
+        ptinfo_beg->beg.column != beg_pos.column ||
+        strcmp(ptinfo_beg->token, token)) {
+        compile_error(p, "token position mismatch: %d:%d:%s expected but %d:%d:%s",
+                      beg_pos.lineno, beg_pos.column, token,
+                      ptinfo_beg->beg.lineno, ptinfo_beg->beg.column,
+                      ptinfo_beg->token);
+    }
 
-do		: term
-                | keyword_do_cond
-                ;
+    ruby_sized_xfree(ptinfo_beg, sizeof(*ptinfo_beg));
+}
 
-if_tail		: opt_else
-                | k_elsif expr_value then
-                  compstmt
-                  if_tail
-                    {
-                    /*%%%*/
-                        $$ = new_if(p, $2, $4, $5, &@$);
-                        fixpos($$, $2);
-                    /*% %*/
-                    /*% ripper: elsif!($2, $4, escape_Qundef($5)) %*/
-                    }
-                ;
+static void
+token_info_warn(struct parser_params *p, const char *token, token_info *ptinfo_beg, int same, const rb_code_location_t *loc)
+{
+    token_info ptinfo_end_body, *ptinfo_end = &ptinfo_end_body;
+    if (!p->token_info_enabled) return;
+    if (!ptinfo_beg) return;
+    token_info_setup(ptinfo_end, p->lex.pbeg, loc);
+    if (ptinfo_beg->beg.lineno == ptinfo_end->beg.lineno) return; /* ignore one-line block */
+    if (ptinfo_beg->nonspc || ptinfo_end->nonspc) return; /* ignore keyword in the middle of a line */
+    if (ptinfo_beg->indent == ptinfo_end->indent) return; /* the indents are matched */
+    if (!same && ptinfo_beg->indent < ptinfo_end->indent) return;
+    rb_warn3L(ptinfo_end->beg.lineno,
+              "mismatched indentations at '%s' with '%s' at %d",
+              WARN_S(token), WARN_S(ptinfo_beg->token), WARN_I(ptinfo_beg->beg.lineno));
+}
 
-opt_else	: none
-                | k_else compstmt
-                    {
-                    /*%%%*/
-                        $$ = $2;
-                    /*% %*/
-                    /*% ripper: else!($2) %*/
-                    }
-                ;
+static int
+parser_precise_mbclen(struct parser_params *p, const char *ptr)
+{
+    int len = rb_enc_precise_mbclen(ptr, p->lex.pend, p->enc);
+    if (!MBCLEN_CHARFOUND_P(len)) {
+        compile_error(p, "invalid multibyte char (%s)", rb_enc_name(p->enc));
+        return -1;
+    }
+    return len;
+}
+
+#ifndef RIPPER
+static inline void
+parser_show_error_line(struct parser_params *p, const YYLTYPE *yylloc)
+{
+    rb_parser_string_t *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, p->error_buffer, yylloc, lineno, str);
+}
 
-for_var		: lhs
-                | mlhs
-                ;
+static int
+parser_yyerror(struct parser_params *p, const rb_code_location_t *yylloc, const char *msg)
+{
+#if 0
+    YYLTYPE current;
 
-f_marg		: f_norm_arg
-                    {
-                    /*%%%*/
-                        $$ = assignable(p, $1, 0, &@$);
-                        mark_lvar_used(p, $$);
-                    /*% %*/
-                    /*% ripper: assignable(p, $1) %*/
-                    }
-                | tLPAREN f_margs rparen
-                    {
-                    /*%%%*/
-                        $$ = $2;
-                    /*% %*/
-                    /*% ripper: mlhs_paren!($2) %*/
-                    }
-                ;
+    if (!yylloc) {
+        yylloc = RUBY_SET_YYLLOC(current);
+    }
+    else if ((p->ruby_sourceline != yylloc->beg_pos.lineno &&
+              p->ruby_sourceline != yylloc->end_pos.lineno)) {
+        yylloc = 0;
+    }
+#endif
+    parser_compile_error(p, yylloc, "%s", msg);
+    parser_show_error_line(p, yylloc);
+    return 0;
+}
 
-f_marg_list	: f_marg
-                    {
-                    /*%%%*/
-                        $$ = NEW_LIST($1, &@$);
-                    /*% %*/
-                    /*% ripper: mlhs_add!(mlhs_new!, $1) %*/
-                    }
-                | f_marg_list ',' f_marg
-                    {
-                    /*%%%*/
-                        $$ = list_append(p, $1, $3);
-                    /*% %*/
-                    /*% ripper: mlhs_add!($1, $3) %*/
-                    }
-                ;
+static int
+parser_yyerror0(struct parser_params *p, const char *msg)
+{
+    YYLTYPE current;
+    return parser_yyerror(p, RUBY_SET_YYLLOC(current), msg);
+}
 
-f_margs		: f_marg_list
-                    {
-                    /*%%%*/
-                        $$ = NEW_MASGN($1, 0, &@$);
-                    /*% %*/
-                    /*% ripper: $1 %*/
-                    }
-                | f_marg_list ',' f_rest_marg
-                    {
-                    /*%%%*/
-                        $$ = NEW_MASGN($1, $3, &@$);
-                    /*% %*/
-                    /*% ripper: mlhs_add_star!($1, $3) %*/
-                    }
-                | f_marg_list ',' f_rest_marg ',' f_marg_list
-                    {
-                    /*%%%*/
-                        $$ = NEW_MASGN($1, NEW_POSTARG($3, $5, &@$), &@$);
-                    /*% %*/
-                    /*% ripper: mlhs_add_post!(mlhs_add_star!($1, $3), $5) %*/
-                    }
-                | f_rest_marg
-                    {
-                    /*%%%*/
-                        $$ = NEW_MASGN(0, $1, &@$);
-                    /*% %*/
-                    /*% ripper: mlhs_add_star!(mlhs_new!, $1) %*/
-                    }
-                | f_rest_marg ',' f_marg_list
-                    {
-                    /*%%%*/
-                        $$ = NEW_MASGN(0, NEW_POSTARG($1, $3, &@$), &@$);
-                    /*% %*/
-                    /*% ripper: mlhs_add_post!(mlhs_add_star!(mlhs_new!, $1), $3) %*/
-                    }
-                ;
+void
+ruby_show_error_line(struct parser_params *p, VALUE errbuf, const YYLTYPE *yylloc, int lineno, rb_parser_string_t *str)
+{
+    VALUE mesg;
+    const int max_line_margin = 30;
+    const char *ptr, *ptr_end, *pt, *pb;
+    const char *pre = "", *post = "", *pend;
+    const char *code = "", *caret = "";
+    const char *lim;
+    const char *const pbeg = PARSER_STRING_PTR(str);
+    char *buf;
+    long len;
+    int i;
 
-f_rest_marg	: tSTAR f_norm_arg
-                    {
-                    /*%%%*/
-                        $$ = assignable(p, $2, 0, &@$);
-                        mark_lvar_used(p, $$);
-                    /*% %*/
-                    /*% ripper: assignable(p, $2) %*/
-                    }
-                | tSTAR
-                    {
-                    /*%%%*/
-                        $$ = NODE_SPECIAL_NO_NAME_REST;
-                    /*% %*/
-                    /*% ripper: Qnil %*/
-                    }
-                ;
+    if (!yylloc) return;
+    pend = rb_parser_string_end(str);
+    if (pend > pbeg && pend[-1] == '\n') {
+        if (--pend > pbeg && pend[-1] == '\r') --pend;
+    }
 
-f_any_kwrest	: f_kwrest
-                | f_no_kwarg {$$ = ID2VAL(idNil);}
-                ;
+    pt = pend;
+    if (lineno == yylloc->end_pos.lineno &&
+        (pend - pbeg) > yylloc->end_pos.column) {
+        pt = pbeg + yylloc->end_pos.column;
+    }
 
-f_eq		: {p->ctxt.in_argdef = 0;} '=';
+    ptr = ptr_end = pt;
+    lim = ptr - pbeg > max_line_margin ? ptr - max_line_margin : pbeg;
+    while ((lim < ptr) && (*(ptr-1) != '\n')) ptr--;
 
-block_args_tail	: f_block_kwarg ',' f_kwrest opt_f_block_arg
-                    {
-                        $$ = new_args_tail(p, $1, $3, $4, &@3);
-                    }
-                | f_block_kwarg opt_f_block_arg
-                    {
-                        $$ = new_args_tail(p, $1, Qnone, $2, &@1);
-                    }
-                | f_any_kwrest opt_f_block_arg
-                    {
-                        $$ = new_args_tail(p, Qnone, $1, $2, &@1);
-                    }
-                | f_block_arg
-                    {
-                        $$ = new_args_tail(p, Qnone, Qnone, $1, &@1);
-                    }
-                ;
+    lim = pend - ptr_end > max_line_margin ? ptr_end + max_line_margin : pend;
+    while ((ptr_end < lim) && (*ptr_end != '\n') && (*ptr_end != '\r')) ptr_end++;
 
-opt_block_args_tail : ',' block_args_tail
-                    {
-                        $$ = $2;
-                    }
-                | /* none */
-                    {
-                        $$ = new_args_tail(p, Qnone, Qnone, Qnone, &@0);
-                    }
-                ;
+    len = ptr_end - ptr;
+    if (len > 4) {
+        if (ptr > pbeg) {
+            ptr = rb_enc_prev_char(pbeg, ptr, pt, rb_parser_str_get_encoding(str));
+            if (ptr > pbeg) pre = "...";
+        }
+        if (ptr_end < pend) {
+            ptr_end = rb_enc_prev_char(pt, ptr_end, pend, rb_parser_str_get_encoding(str));
+            if (ptr_end < pend) post = "...";
+        }
+    }
+    pb = pbeg;
+    if (lineno == yylloc->beg_pos.lineno) {
+        pb += yylloc->beg_pos.column;
+        if (pb > pt) pb = pt;
+    }
+    if (pb < ptr) pb = ptr;
+    if (len <= 4 && yylloc->beg_pos.lineno == yylloc->end_pos.lineno) {
+        return;
+    }
+    if (RTEST(errbuf)) {
+        mesg = rb_attr_get(errbuf, idMesg);
+        if (char_at_end(p, mesg, '\n') != '\n')
+            rb_str_cat_cstr(mesg, "\n");
+    }
+    else {
+        mesg = rb_enc_str_new(0, 0, rb_parser_str_get_encoding(str));
+    }
+    if (!errbuf && rb_stderr_tty_p()) {
+#define CSI_BEGIN "\033["
+#define CSI_SGR "m"
+        rb_str_catf(mesg,
+                    CSI_BEGIN""CSI_SGR"%s" /* pre */
+                    CSI_BEGIN"1"CSI_SGR"%.*s"
+                    CSI_BEGIN"1;4"CSI_SGR"%.*s"
+                    CSI_BEGIN";1"CSI_SGR"%.*s"
+                    CSI_BEGIN""CSI_SGR"%s" /* post */
+                    "\n",
+                    pre,
+                    (int)(pb - ptr), ptr,
+                    (int)(pt - pb), pb,
+                    (int)(ptr_end - pt), pt,
+                    post);
+    }
+    else {
+        char *p2;
 
-excessed_comma	: ','
-                    {
-                        /* magic number for rest_id in iseq_set_arguments() */
-                    /*%%%*/
-                        $$ = NODE_SPECIAL_EXCESSIVE_COMMA;
-                    /*% %*/
-                    /*% ripper: excessed_comma! %*/
-                    }
-                ;
+        len = ptr_end - ptr;
+        lim = pt < pend ? pt : pend;
+        i = (int)(lim - ptr);
+        buf = ALLOCA_N(char, i+2);
+        code = ptr;
+        caret = p2 = buf;
+        if (ptr <= pb) {
+            while (ptr < pb) {
+                *p2++ = *ptr++ == '\t' ? '\t' : ' ';
+            }
+            *p2++ = '^';
+            ptr++;
+        }
+        if (lim > ptr) {
+            memset(p2, '~', (lim - ptr));
+            p2 += (lim - ptr);
+        }
+        *p2 = '\0';
+        rb_str_catf(mesg, "%s%.*s%s\n""%s%s\n",
+                    pre, (int)len, code, post,
+                    pre, caret);
+    }
+    if (!errbuf) rb_write_error_str(mesg);
+}
+#else
 
-block_param	: f_arg ',' f_block_optarg ',' f_rest_arg opt_block_args_tail
-                    {
-                        $$ = new_args(p, $1, $3, $5, Qnone, $6, &@$);
-                    }
-                | f_arg ',' f_block_optarg ',' f_rest_arg ',' f_arg opt_block_args_tail
-                    {
-                        $$ = new_args(p, $1, $3, $5, $7, $8, &@$);
-                    }
-                | f_arg ',' f_block_optarg opt_block_args_tail
-                    {
-                        $$ = new_args(p, $1, $3, Qnone, Qnone, $4, &@$);
-                    }
-                | f_arg ',' f_block_optarg ',' f_arg opt_block_args_tail
-                    {
-                        $$ = new_args(p, $1, $3, Qnone, $5, $6, &@$);
-                    }
-                | f_arg ',' f_rest_arg opt_block_args_tail
-                    {
-                        $$ = new_args(p, $1, Qnone, $3, Qnone, $4, &@$);
-                    }
-                | f_arg excessed_comma
-                    {
-                        $$ = new_args_tail(p, Qnone, Qnone, Qnone, &@2);
-                        $$ = new_args(p, $1, Qnone, $2, Qnone, $$, &@$);
-                    }
-                | f_arg ',' f_rest_arg ',' f_arg opt_block_args_tail
-                    {
-                        $$ = new_args(p, $1, Qnone, $3, $5, $6, &@$);
-                    }
-                | f_arg opt_block_args_tail
-                    {
-                        $$ = new_args(p, $1, Qnone, Qnone, Qnone, $2, &@$);
-                    }
-                | f_block_optarg ',' f_rest_arg opt_block_args_tail
-                    {
-                        $$ = new_args(p, Qnone, $1, $3, Qnone, $4, &@$);
-                    }
-                | f_block_optarg ',' f_rest_arg ',' f_arg opt_block_args_tail
-                    {
-                        $$ = new_args(p, Qnone, $1, $3, $5, $6, &@$);
-                    }
-                | f_block_optarg opt_block_args_tail
-                    {
-                        $$ = new_args(p, Qnone, $1, Qnone, Qnone, $2, &@$);
-                    }
-                | f_block_optarg ',' f_arg opt_block_args_tail
-                    {
-                        $$ = new_args(p, Qnone, $1, Qnone, $3, $4, &@$);
-                    }
-                | f_rest_arg opt_block_args_tail
-                    {
-                        $$ = new_args(p, Qnone, Qnone, $1, Qnone, $2, &@$);
-                    }
-                | f_rest_arg ',' f_arg opt_block_args_tail
-                    {
-                        $$ = new_args(p, Qnone, Qnone, $1, $3, $4, &@$);
-                    }
-                | block_args_tail
-                    {
-                        $$ = new_args(p, Qnone, Qnone, Qnone, Qnone, $1, &@$);
-                    }
-                ;
+static int
+parser_yyerror(struct parser_params *p, const YYLTYPE *yylloc, const char *msg)
+{
+    const char *pcur = 0, *ptok = 0;
+    if (p->ruby_sourceline == yylloc->beg_pos.lineno &&
+        p->ruby_sourceline == yylloc->end_pos.lineno) {
+        pcur = p->lex.pcur;
+        ptok = p->lex.ptok;
+        p->lex.ptok = p->lex.pbeg + yylloc->beg_pos.column;
+        p->lex.pcur = p->lex.pbeg + yylloc->end_pos.column;
+    }
+    parser_yyerror0(p, msg);
+    if (pcur) {
+        p->lex.ptok = ptok;
+        p->lex.pcur = pcur;
+    }
+    return 0;
+}
 
-opt_block_param	: none
-                | block_param_def
-                    {
-                        p->command_start = TRUE;
-                    }
-                ;
+static int
+parser_yyerror0(struct parser_params *p, const char *msg)
+{
+    dispatch1(parse_error, STR_NEW2(msg));
+    ripper_error(p);
+    return 0;
+}
 
-block_param_def	: '|' opt_bv_decl '|'
-                    {
-                        p->cur_arg = 0;
-                        p->max_numparam = ORDINAL_PARAM;
-                        p->ctxt.in_argdef = 0;
-                    /*%%%*/
-                        $$ = 0;
-                    /*% %*/
-                    /*% ripper: block_var!(params!(Qnil,Qnil,Qnil,Qnil,Qnil,Qnil,Qnil), escape_Qundef($2)) %*/
-                    }
-                | '|' block_param opt_bv_decl '|'
-                    {
-                        p->cur_arg = 0;
-                        p->max_numparam = ORDINAL_PARAM;
-                        p->ctxt.in_argdef = 0;
-                    /*%%%*/
-                        $$ = $2;
-                    /*% %*/
-                    /*% ripper: block_var!(escape_Qundef($2), escape_Qundef($3)) %*/
-                    }
-                ;
+static inline void
+parser_show_error_line(struct parser_params *p, const YYLTYPE *yylloc)
+{
+}
+#endif /* !RIPPER */
 
+static int
+vtable_size(const struct vtable *tbl)
+{
+    if (!DVARS_TERMINAL_P(tbl)) {
+        return tbl->pos;
+    }
+    else {
+        return 0;
+    }
+}
 
-opt_bv_decl	: opt_nl
-                    {
-                        $$ = 0;
-                    }
-                | opt_nl ';' bv_decls opt_nl
-                    {
-                    /*%%%*/
-                        $$ = 0;
-                    /*% %*/
-                    /*% ripper: $3 %*/
-                    }
-                ;
+static struct vtable *
+vtable_alloc_gen(struct parser_params *p, int line, struct vtable *prev)
+{
+    struct vtable *tbl = ALLOC(struct vtable);
+    tbl->pos = 0;
+    tbl->capa = 8;
+    tbl->tbl = ALLOC_N(ID, tbl->capa);
+    tbl->prev = prev;
+#ifndef RIPPER
+    if (p->debug) {
+        rb_parser_printf(p, "vtable_alloc:%d: %p\n", line, (void *)tbl);
+    }
+#endif
+    return tbl;
+}
+#define vtable_alloc(prev) vtable_alloc_gen(p, __LINE__, prev)
 
-bv_decls	: bvar
-                    /*% ripper[brace]: rb_ary_new3(1, get_value($1)) %*/
-                | bv_decls ',' bvar
-                    /*% ripper[brace]: rb_ary_push($1, get_value($3)) %*/
-                ;
+static void
+vtable_free_gen(struct parser_params *p, int line, const char *name,
+                struct vtable *tbl)
+{
+#ifndef RIPPER
+    if (p->debug) {
+        rb_parser_printf(p, "vtable_free:%d: %s(%p)\n", line, name, (void *)tbl);
+    }
+#endif
+    if (!DVARS_TERMINAL_P(tbl)) {
+        if (tbl->tbl) {
+            ruby_sized_xfree(tbl->tbl, tbl->capa * sizeof(ID));
+        }
+        ruby_sized_xfree(tbl, sizeof(*tbl));
+    }
+}
+#define vtable_free(tbl) vtable_free_gen(p, __LINE__, #tbl, tbl)
 
-bvar		: tIDENTIFIER
-                    {
-                        new_bv(p, get_id($1));
-                    /*% ripper: get_value($1) %*/
-                    }
-                | f_bad_arg
-                    {
-                        $$ = 0;
-                    }
-                ;
+static void
+vtable_add_gen(struct parser_params *p, int line, const char *name,
+               struct vtable *tbl, ID id)
+{
+#ifndef RIPPER
+    if (p->debug) {
+        rb_parser_printf(p, "vtable_add:%d: %s(%p), %s\n",
+                         line, name, (void *)tbl, rb_id2name(id));
+    }
+#endif
+    if (DVARS_TERMINAL_P(tbl)) {
+        rb_parser_fatal(p, "vtable_add: vtable is not allocated (%p)", (void *)tbl);
+        return;
+    }
+    if (tbl->pos == tbl->capa) {
+        tbl->capa = tbl->capa * 2;
+        SIZED_REALLOC_N(tbl->tbl, ID, tbl->capa, tbl->pos);
+    }
+    tbl->tbl[tbl->pos++] = id;
+}
+#define vtable_add(tbl, id) vtable_add_gen(p, __LINE__, #tbl, tbl, id)
 
-lambda		: tLAMBDA
-                    {
-                        token_info_push(p, "->", &@1);
-                        $<vars>1 = dyna_push(p);
-                        $<num>$ = p->lex.lpar_beg;
-                        p->lex.lpar_beg = p->lex.paren_nest;
-                    }
-                    {
-                        $<num>$ = p->max_numparam;
-                        p->max_numparam = 0;
-                    }
-                    {
-                        $<node>$ = numparam_push(p);
-                    }
-                  f_larglist
-                    {
-                        CMDARG_PUSH(0);
-                    }
-                  lambda_body
-                    {
-                        int max_numparam = p->max_numparam;
-                        p->lex.lpar_beg = $<num>2;
-                        p->max_numparam = $<num>3;
-                        CMDARG_POP();
-                        $5 = args_with_numbered(p, $5, max_numparam);
-                    /*%%%*/
-                        {
-                            YYLTYPE loc = code_loc_gen(&@5, &@7);
-                            $$ = NEW_LAMBDA($5, $7, &loc);
-                            nd_set_line($$->nd_body, @7.end_pos.lineno);
-                            nd_set_line($$, @5.end_pos.lineno);
-                            nd_set_first_loc($$, @1.beg_pos);
-                        }
-                    /*% %*/
-                    /*% ripper: lambda!($5, $7) %*/
-                        numparam_pop(p, $<node>4);
-                        dyna_pop(p, $<vars>1);
-                    }
-                ;
+static void
+vtable_pop_gen(struct parser_params *p, int line, const char *name,
+               struct vtable *tbl, int n)
+{
+    if (p->debug) {
+        rb_parser_printf(p, "vtable_pop:%d: %s(%p), %d\n",
+                         line, name, (void *)tbl, n);
+    }
+    if (tbl->pos < n) {
+        rb_parser_fatal(p, "vtable_pop: unreachable (%d < %d)", tbl->pos, n);
+        return;
+    }
+    tbl->pos -= n;
+}
+#define vtable_pop(tbl, n) vtable_pop_gen(p, __LINE__, #tbl, tbl, n)
 
-f_larglist	: '(' f_args opt_bv_decl ')'
-                    {
-                        p->ctxt.in_argdef = 0;
-                    /*%%%*/
-                        $$ = $2;
-                        p->max_numparam = ORDINAL_PARAM;
-                    /*% %*/
-                    /*% ripper: paren!($2) %*/
-                    }
-                | f_args
-                    {
-                        p->ctxt.in_argdef = 0;
-                    /*%%%*/
-                        if (!args_info_empty_p($1->nd_ainfo))
-                            p->max_numparam = ORDINAL_PARAM;
-                    /*% %*/
-                        $$ = $1;
-                    }
-                ;
+static int
+vtable_included(const struct vtable * tbl, ID id)
+{
+    int i;
 
-lambda_body	: tLAMBEG compstmt '}'
-                    {
-                        token_info_pop(p, "}", &@3);
-                        $$ = $2;
-                    }
-                | keyword_do_LAMBDA
-                    {
-                    /*%%%*/
-                        push_end_expect_token_locations(p, &@1.beg_pos);
-                    /*% %*/
-                    }
-                  bodystmt k_end
-                    {
-                        $$ = $3;
-                    }
-                ;
+    if (!DVARS_TERMINAL_P(tbl)) {
+        for (i = 0; i < tbl->pos; i++) {
+            if (tbl->tbl[i] == id) {
+                return i+1;
+            }
+        }
+    }
+    return 0;
+}
 
-do_block	: k_do_block do_body k_end
-                    {
-                        $$ = $2;
-                    /*%%%*/
-                        set_embraced_location($$, &@1, &@3);
-                    /*% %*/
-                    }
-                ;
+static void parser_prepare(struct parser_params *p);
 
-block_call	: command do_block
-                    {
-                    /*%%%*/
-                        if (nd_type_p($1, NODE_YIELD)) {
-                            compile_error(p, "block given to yield");
-                        }
-                        else {
-                            block_dup_check(p, $1->nd_args, $2);
-                        }
-                        $$ = method_add_block(p, $1, $2, &@$);
-                        fixpos($$, $1);
-                    /*% %*/
-                    /*% ripper: method_add_block!($1, $2) %*/
-                    }
-                | block_call call_op2 operation2 opt_paren_args
-                    {
-                    /*%%%*/
-                        $$ = new_qcall(p, $2, $1, $3, $4, &@3, &@$);
-                    /*% %*/
-                    /*% ripper: opt_event(:method_add_arg!, call!($1, $2, $3), $4) %*/
-                    }
-                | block_call call_op2 operation2 opt_paren_args brace_block
-                    {
-                    /*%%%*/
-                        $$ = new_command_qcall(p, $2, $1, $3, $4, $5, &@3, &@$);
-                    /*% %*/
-                    /*% ripper: opt_event(:method_add_block!, command_call!($1, $2, $3, $4), $5) %*/
-                    }
-                | block_call call_op2 operation2 command_args do_block
-                    {
-                    /*%%%*/
-                        $$ = new_command_qcall(p, $2, $1, $3, $4, $5, &@3, &@$);
-                    /*% %*/
-                    /*% ripper: method_add_block!(command_call!($1, $2, $3, $4), $5) %*/
-                    }
-                ;
+static int
+e_option_supplied(struct parser_params *p)
+{
+    return strcmp(p->ruby_sourcefile, "-e") == 0;
+}
+
+#ifndef RIPPER
+static NODE *parser_append_options(struct parser_params *p, NODE *node);
 
-method_call	: fcall paren_args
-                    {
-                    /*%%%*/
-                        $$ = $1;
-                        $$->nd_args = $2;
-                        nd_set_last_loc($1, @2.end_pos);
-                    /*% %*/
-                    /*% ripper: method_add_arg!(fcall!($1), $2) %*/
-                    }
-                | primary_value call_op operation2 opt_paren_args
-                    {
-                    /*%%%*/
-                        $$ = new_qcall(p, $2, $1, $3, $4, &@3, &@$);
-                        nd_set_line($$, @3.end_pos.lineno);
-                    /*% %*/
-                    /*% ripper: opt_event(:method_add_arg!, call!($1, $2, $3), $4) %*/
-                    }
-                | primary_value tCOLON2 operation2 paren_args
-                    {
-                    /*%%%*/
-                        $$ = new_qcall(p, ID2VAL(idCOLON2), $1, $3, $4, &@3, &@$);
-                        nd_set_line($$, @3.end_pos.lineno);
-                    /*% %*/
-                    /*% ripper: method_add_arg!(call!($1, $2, $3), $4) %*/
-                    }
-                | primary_value tCOLON2 operation3
-                    {
-                    /*%%%*/
-                        $$ = new_qcall(p, ID2VAL(idCOLON2), $1, $3, Qnull, &@3, &@$);
-                    /*% %*/
-                    /*% ripper: call!($1, $2, $3) %*/
-                    }
-                | primary_value call_op paren_args
-                    {
-                    /*%%%*/
-                        $$ = new_qcall(p, $2, $1, ID2VAL(idCall), $3, &@2, &@$);
-                        nd_set_line($$, @2.end_pos.lineno);
-                    /*% %*/
-                    /*% ripper: method_add_arg!(call!($1, $2, ID2VAL(idCall)), $3) %*/
-                    }
-                | primary_value tCOLON2 paren_args
-                    {
-                    /*%%%*/
-                        $$ = new_qcall(p, ID2VAL(idCOLON2), $1, ID2VAL(idCall), $3, &@2, &@$);
-                        nd_set_line($$, @2.end_pos.lineno);
-                    /*% %*/
-                    /*% ripper: method_add_arg!(call!($1, $2, ID2VAL(idCall)), $3) %*/
-                    }
-                | keyword_super paren_args
-                    {
-                    /*%%%*/
-                        $$ = NEW_SUPER($2, &@$);
-                    /*% %*/
-                    /*% ripper: super!($2) %*/
-                    }
-                | keyword_super
-                    {
-                    /*%%%*/
-                        $$ = NEW_ZSUPER(&@$);
-                    /*% %*/
-                    /*% ripper: zsuper! %*/
-                    }
-                | primary_value '[' opt_call_args rbracket
-                    {
-                    /*%%%*/
-                        $$ = NEW_CALL($1, tAREF, $3, &@$);
-                        fixpos($$, $1);
-                    /*% %*/
-                    /*% ripper: aref!($1, escape_Qundef($3)) %*/
-                    }
-                ;
+static VALUE
+yycompile0(VALUE arg)
+{
+    int n;
+    NODE *tree;
+    struct parser_params *p = (struct parser_params *)arg;
+    int cov = FALSE;
 
-brace_block	: '{' brace_body '}'
-                    {
-                        $$ = $2;
-                    /*%%%*/
-                        set_embraced_location($$, &@1, &@3);
-                    /*% %*/
-                    }
-                | k_do do_body k_end
-                    {
-                        $$ = $2;
-                    /*%%%*/
-                        set_embraced_location($$, &@1, &@3);
-                    /*% %*/
-                    }
-                ;
+    if (!compile_for_eval && !NIL_P(p->ruby_sourcefile_string) && !e_option_supplied(p)) {
+        cov = TRUE;
+    }
 
-brace_body	: {$<vars>$ = dyna_push(p);}
-                    {
-                        $<num>$ = p->max_numparam;
-                        p->max_numparam = 0;
-                    }
-                    {
-                        $<node>$ = numparam_push(p);
-                    }
-                  opt_block_param compstmt
-                    {
-                        int max_numparam = p->max_numparam;
-                        p->max_numparam = $<num>2;
-                        $4 = args_with_numbered(p, $4, max_numparam);
-                    /*%%%*/
-                        $$ = NEW_ITER($4, $5, &@$);
-                    /*% %*/
-                    /*% ripper: brace_block!(escape_Qundef($4), $5) %*/
-                        numparam_pop(p, $<node>3);
-                        dyna_pop(p, $<vars>1);
-                    }
-                ;
+    if (p->debug_lines) {
+        p->ast->body.script_lines = p->debug_lines;
+    }
 
-do_body 	: {$<vars>$ = dyna_push(p);}
-                    {
-                        $<num>$ = p->max_numparam;
-                        p->max_numparam = 0;
-                    }
-                    {
-                        $<node>$ = numparam_push(p);
-                        CMDARG_PUSH(0);
-                    }
-                  opt_block_param bodystmt
-                    {
-                        int max_numparam = p->max_numparam;
-                        p->max_numparam = $<num>2;
-                        $4 = args_with_numbered(p, $4, max_numparam);
-                    /*%%%*/
-                        $$ = NEW_ITER($4, $5, &@$);
-                    /*% %*/
-                    /*% ripper: do_block!(escape_Qundef($4), $5) %*/
-                        CMDARG_POP();
-                        numparam_pop(p, $<node>3);
-                        dyna_pop(p, $<vars>1);
-                    }
-                ;
+    parser_prepare(p);
+#define RUBY_DTRACE_PARSE_HOOK(name) \
+    if (RUBY_DTRACE_PARSE_##name##_ENABLED()) { \
+        RUBY_DTRACE_PARSE_##name(p->ruby_sourcefile, p->ruby_sourceline); \
+    }
+    RUBY_DTRACE_PARSE_HOOK(BEGIN);
+    n = yyparse(p);
+    RUBY_DTRACE_PARSE_HOOK(END);
 
-case_args	: arg_value
-                    {
-                    /*%%%*/
-                        check_literal_when(p, $1, &@1);
-                        $$ = NEW_LIST($1, &@$);
-                    /*% %*/
-                    /*% ripper: args_add!(args_new!, $1) %*/
-                    }
-                | tSTAR arg_value
-                    {
-                    /*%%%*/
-                        $$ = NEW_SPLAT($2, &@$);
-                    /*% %*/
-                    /*% ripper: args_add_star!(args_new!, $2) %*/
-                    }
-                | case_args ',' arg_value
-                    {
-                    /*%%%*/
-                        check_literal_when(p, $3, &@3);
-                        $$ = last_arg_append(p, $1, $3, &@$);
-                    /*% %*/
-                    /*% ripper: args_add!($1, $3) %*/
-                    }
-                | case_args ',' tSTAR arg_value
-                    {
-                    /*%%%*/
-                        $$ = rest_arg_append(p, $1, $4, &@$);
-                    /*% %*/
-                    /*% ripper: args_add_star!($1, $4) %*/
-                    }
-                ;
+    p->debug_lines = 0;
 
-case_body	: k_when case_args then
-                  compstmt
-                  cases
-                    {
-                    /*%%%*/
-                        $$ = NEW_WHEN($2, $4, $5, &@$);
-                        fixpos($$, $2);
-                    /*% %*/
-                    /*% ripper: when!($2, $4, escape_Qundef($5)) %*/
-                    }
-                ;
+    xfree(p->lex.strterm);
+    p->lex.strterm = 0;
+    p->lex.pcur = p->lex.pbeg = p->lex.pend = 0;
+    if (n || p->error_p) {
+        VALUE mesg = p->error_buffer;
+        if (!mesg) {
+            mesg = syntax_error_new();
+        }
+        if (!p->error_tolerant) {
+            rb_set_errinfo(mesg);
+            return FALSE;
+        }
+    }
+    tree = p->eval_tree;
+    if (!tree) {
+        tree = NEW_NIL(&NULL_LOC);
+    }
+    else {
+        rb_parser_ary_t *tokens = p->tokens;
+        NODE *prelude;
+        NODE *body = parser_append_options(p, RNODE_SCOPE(tree)->nd_body);
+        prelude = block_append(p, p->eval_tree_begin, body);
+        RNODE_SCOPE(tree)->nd_body = prelude;
+        p->ast->body.frozen_string_literal = p->frozen_string_literal;
+        p->ast->body.coverage_enabled = cov;
+        if (p->keep_tokens) {
+            p->ast->node_buffer->tokens = tokens;
+            p->tokens = NULL;
+        }
+    }
+    p->ast->body.root = tree;
+    p->ast->body.line_count = p->line_count;
+    return TRUE;
+}
 
-cases		: opt_else
-                | case_body
-                ;
+static rb_ast_t *
+yycompile(struct parser_params *p, VALUE fname, int line)
+{
+    rb_ast_t *ast;
+    if (NIL_P(fname)) {
+        p->ruby_sourcefile_string = Qnil;
+        p->ruby_sourcefile = "(none)";
+    }
+    else {
+        p->ruby_sourcefile_string = rb_str_to_interned_str(fname);
+        p->ruby_sourcefile = StringValueCStr(fname);
+    }
+    p->ruby_sourceline = line - 1;
 
-p_case_body	: keyword_in
-                    {
-                        SET_LEX_STATE(EXPR_BEG|EXPR_LABEL);
-                        p->command_start = FALSE;
-                        $<ctxt>1 = p->ctxt;
-                        p->ctxt.in_kwarg = 1;
-                        $<tbl>$ = push_pvtbl(p);
-                    }
-                    {
-                        $<tbl>$ = push_pktbl(p);
-                    }
-                  p_top_expr then
-                    {
-                        pop_pktbl(p, $<tbl>3);
-                        pop_pvtbl(p, $<tbl>2);
-                        p->ctxt.in_kwarg = $<ctxt>1.in_kwarg;
-                    }
-                  compstmt
-                  p_cases
-                    {
-                    /*%%%*/
-                        $$ = NEW_IN($4, $7, $8, &@$);
-                    /*% %*/
-                    /*% ripper: in!($4, $7, escape_Qundef($8)) %*/
-                    }
-                ;
+    p->lvtbl = NULL;
 
-p_cases 	: opt_else
-                | p_case_body
-                ;
+    p->ast = ast = rb_ast_new();
+    compile_callback(yycompile0, (VALUE)p);
+    p->ast = 0;
 
-p_top_expr	: p_top_expr_body
-                | p_top_expr_body modifier_if expr_value
-                    {
-                    /*%%%*/
-                        $$ = new_if(p, $3, $1, 0, &@$);
-                        fixpos($$, $3);
-                    /*% %*/
-                    /*% ripper: if_mod!($3, $1) %*/
-                    }
-                | p_top_expr_body modifier_unless expr_value
-                    {
-                    /*%%%*/
-                        $$ = new_unless(p, $3, $1, 0, &@$);
-                        fixpos($$, $3);
-                    /*% %*/
-                    /*% ripper: unless_mod!($3, $1) %*/
-                    }
-                ;
+    while (p->lvtbl) {
+        local_pop(p);
+    }
+
+    return ast;
+}
+#endif /* !RIPPER */
+
+static rb_encoding *
+must_be_ascii_compatible(struct parser_params *p, rb_parser_string_t *s)
+{
+    rb_encoding *enc = rb_parser_str_get_encoding(s);
+    if (!rb_enc_asciicompat(enc)) {
+        rb_raise(rb_eArgError, "invalid source encoding");
+    }
+    return enc;
+}
+
+static rb_parser_string_t *
+lex_getline(struct parser_params *p)
+{
+    rb_parser_string_t *line = (*p->lex.gets)(p, p->lex.input, p->line_count);
+    if (!line) return 0;
+    p->line_count++;
+    string_buffer_append(p, line);
+    must_be_ascii_compatible(p, line);
+    return line;
+}
+
+#ifndef RIPPER
+rb_ast_t*
+rb_parser_compile(rb_parser_t *p, rb_parser_lex_gets_func *gets, VALUE fname, rb_parser_input_data input, int line)
+{
+    p->lex.gets = gets;
+    p->lex.input = input;
+    p->lex.pbeg = p->lex.pcur = p->lex.pend = 0;
+
+    return yycompile(p, fname, line);
+}
+#endif  /* !RIPPER */
+
+#define STR_FUNC_ESCAPE 0x01
+#define STR_FUNC_EXPAND 0x02
+#define STR_FUNC_REGEXP 0x04
+#define STR_FUNC_QWORDS 0x08
+#define STR_FUNC_SYMBOL 0x10
+#define STR_FUNC_INDENT 0x20
+#define STR_FUNC_LABEL  0x40
+#define STR_FUNC_LIST   0x4000
+#define STR_FUNC_TERM   0x8000
 
-p_top_expr_body : p_expr
-                | p_expr ','
-                    {
-                        $$ = new_array_pattern_tail(p, Qnone, 1, Qnone, Qnone, &@$);
-                        $$ = new_array_pattern(p, Qnone, get_value($1), $$, &@$);
-                    }
-                | p_expr ',' p_args
-                    {
-                        $$ = new_array_pattern(p, Qnone, get_value($1), $3, &@$);
-                    /*%%%*/
-                        nd_set_first_loc($$, @1.beg_pos);
-                    /*%
-                    %*/
-                    }
-                | p_find
-                    {
-                        $$ = new_find_pattern(p, Qnone, $1, &@$);
-                    }
-                | p_args_tail
-                    {
-                        $$ = new_array_pattern(p, Qnone, Qnone, $1, &@$);
-                    }
-                | p_kwargs
-                    {
-                        $$ = new_hash_pattern(p, Qnone, $1, &@$);
-                    }
-                ;
+enum string_type {
+    str_label  = STR_FUNC_LABEL,
+    str_squote = (0),
+    str_dquote = (STR_FUNC_EXPAND),
+    str_xquote = (STR_FUNC_EXPAND),
+    str_regexp = (STR_FUNC_REGEXP|STR_FUNC_ESCAPE|STR_FUNC_EXPAND),
+    str_sword  = (STR_FUNC_QWORDS|STR_FUNC_LIST),
+    str_dword  = (STR_FUNC_QWORDS|STR_FUNC_EXPAND|STR_FUNC_LIST),
+    str_ssym   = (STR_FUNC_SYMBOL),
+    str_dsym   = (STR_FUNC_SYMBOL|STR_FUNC_EXPAND)
+};
 
-p_expr		: p_as
-                ;
+static rb_parser_string_t *
+parser_str_new(struct parser_params *p, const char *ptr, long len, rb_encoding *enc, int func, rb_encoding *enc0)
+{
+    rb_parser_string_t *pstr;
 
-p_as		: p_expr tASSOC p_variable
-                    {
-                    /*%%%*/
-                        NODE *n = NEW_LIST($1, &@$);
-                        n = list_append(p, n, $3);
-                        $$ = new_hash(p, n, &@$);
-                    /*% %*/
-                    /*% ripper: binary!($1, STATIC_ID2SYM((id_assoc)), $3) %*/
-                    }
-                | p_alt
-                ;
+    pstr = rb_parser_encoding_string_new(p, ptr, len, enc);
 
-p_alt		: p_alt '|' p_expr_basic
-                    {
-                    /*%%%*/
-                        $$ = NEW_NODE(NODE_OR, $1, $3, 0, &@$);
-                    /*% %*/
-                    /*% ripper: binary!($1, STATIC_ID2SYM(idOr), $3) %*/
-                    }
-                | p_expr_basic
-                ;
+    if (!(func & STR_FUNC_REGEXP)) {
+        if (rb_parser_is_ascii_string(p, pstr)) {
+        }
+        else if (rb_is_usascii_enc((void *)enc0) && enc != rb_utf8_encoding()) {
+            /* everything is valid in ASCII-8BIT */
+            enc = rb_ascii8bit_encoding();
+            PARSER_ENCODING_CODERANGE_SET(pstr, enc, RB_PARSER_ENC_CODERANGE_VALID);
+        }
+    }
 
-p_lparen	: '(' {$<tbl>$ = push_pktbl(p);};
-p_lbracket	: '[' {$<tbl>$ = push_pktbl(p);};
+    return pstr;
+}
 
-p_expr_basic	: p_value
-                | p_variable
-                | p_const p_lparen p_args rparen
-                    {
-                        pop_pktbl(p, $<tbl>2);
-                        $$ = new_array_pattern(p, $1, Qnone, $3, &@$);
-                    /*%%%*/
-                        nd_set_first_loc($$, @1.beg_pos);
-                    /*%
-                    %*/
-                    }
-                | p_const p_lparen p_find rparen
-                    {
-                        pop_pktbl(p, $<tbl>2);
-                        $$ = new_find_pattern(p, $1, $3, &@$);
-                    /*%%%*/
-                        nd_set_first_loc($$, @1.beg_pos);
-                    /*%
-                    %*/
-                    }
-                | p_const p_lparen p_kwargs rparen
-                    {
-                        pop_pktbl(p, $<tbl>2);
-                        $$ = new_hash_pattern(p, $1, $3, &@$);
-                    /*%%%*/
-                        nd_set_first_loc($$, @1.beg_pos);
-                    /*%
-                    %*/
-                    }
-                | p_const '(' rparen
-                    {
-                        $$ = new_array_pattern_tail(p, Qnone, 0, Qnone, Qnone, &@$);
-                        $$ = new_array_pattern(p, $1, Qnone, $$, &@$);
-                    }
-                | p_const p_lbracket p_args rbracket
-                    {
-                        pop_pktbl(p, $<tbl>2);
-                        $$ = new_array_pattern(p, $1, Qnone, $3, &@$);
-                    /*%%%*/
-                        nd_set_first_loc($$, @1.beg_pos);
-                    /*%
-                    %*/
-                    }
-                | p_const p_lbracket p_find rbracket
-                    {
-                        pop_pktbl(p, $<tbl>2);
-                        $$ = new_find_pattern(p, $1, $3, &@$);
-                    /*%%%*/
-                        nd_set_first_loc($$, @1.beg_pos);
-                    /*%
-                    %*/
-                    }
-                | p_const p_lbracket p_kwargs rbracket
-                    {
-                        pop_pktbl(p, $<tbl>2);
-                        $$ = new_hash_pattern(p, $1, $3, &@$);
-                    /*%%%*/
-                        nd_set_first_loc($$, @1.beg_pos);
-                    /*%
-                    %*/
-                    }
-                | p_const '[' rbracket
-                    {
-                        $$ = new_array_pattern_tail(p, Qnone, 0, Qnone, Qnone, &@$);
-                        $$ = new_array_pattern(p, $1, Qnone, $$, &@$);
-                    }
-                | tLBRACK p_args rbracket
-                    {
-                        $$ = new_array_pattern(p, Qnone, Qnone, $2, &@$);
-                    }
-                | tLBRACK p_find rbracket
-                    {
-                        $$ = new_find_pattern(p, Qnone, $2, &@$);
-                    }
-                | tLBRACK rbracket
-                    {
-                        $$ = new_array_pattern_tail(p, Qnone, 0, Qnone, Qnone, &@$);
-                        $$ = new_array_pattern(p, Qnone, Qnone, $$, &@$);
-                    }
-                | tLBRACE
-                    {
-                        $<tbl>$ = push_pktbl(p);
-                        $<ctxt>1 = p->ctxt;
-                        p->ctxt.in_kwarg = 0;
-                    }
-                  p_kwargs rbrace
-                    {
-                        pop_pktbl(p, $<tbl>2);
-                        p->ctxt.in_kwarg = $<ctxt>1.in_kwarg;
-                        $$ = new_hash_pattern(p, Qnone, $3, &@$);
-                    }
-                | tLBRACE rbrace
-                    {
-                        $$ = new_hash_pattern_tail(p, Qnone, 0, &@$);
-                        $$ = new_hash_pattern(p, Qnone, $$, &@$);
-                    }
-                | tLPAREN {$<tbl>$ = push_pktbl(p);} p_expr rparen
-                    {
-                        pop_pktbl(p, $<tbl>2);
-                        $$ = $3;
-                    }
-                ;
+static int
+strterm_is_heredoc(rb_strterm_t *strterm)
+{
+    return strterm->heredoc;
+}
 
-p_args		: p_expr
-                    {
-                    /*%%%*/
-                        NODE *pre_args = NEW_LIST($1, &@$);
-                        $$ = new_array_pattern_tail(p, pre_args, 0, Qnone, Qnone, &@$);
-                    /*%
-                        $$ = new_array_pattern_tail(p, rb_ary_new_from_args(1, get_value($1)), 0, Qnone, Qnone, &@$);
-                    %*/
-                    }
-                | p_args_head
-                    {
-                        $$ = new_array_pattern_tail(p, $1, 1, Qnone, Qnone, &@$);
-                    }
-                | p_args_head p_arg
-                    {
-                    /*%%%*/
-                        $$ = new_array_pattern_tail(p, list_concat($1, $2), 0, Qnone, Qnone, &@$);
-                    /*%
-                        VALUE pre_args = rb_ary_concat($1, get_value($2));
-                        $$ = new_array_pattern_tail(p, pre_args, 0, Qnone, Qnone, &@$);
-                    %*/
-                    }
-                | p_args_head p_rest
-                    {
-                        $$ = new_array_pattern_tail(p, $1, 1, $2, Qnone, &@$);
-                    }
-                | p_args_head p_rest ',' p_args_post
-                    {
-                        $$ = new_array_pattern_tail(p, $1, 1, $2, $4, &@$);
-                    }
-                | p_args_tail
-                ;
+static rb_strterm_t *
+new_strterm(struct parser_params *p, int func, int term, int paren)
+{
+    rb_strterm_t *strterm = ZALLOC(rb_strterm_t);
+    strterm->u.literal.func = func;
+    strterm->u.literal.term = term;
+    strterm->u.literal.paren = paren;
+    return strterm;
+}
 
-p_args_head	: p_arg ','
-                    {
-                        $$ = $1;
-                    }
-                | p_args_head p_arg ','
-                    {
-                    /*%%%*/
-                        $$ = list_concat($1, $2);
-                    /*% %*/
-                    /*% ripper: rb_ary_concat($1, get_value($2)) %*/
-                    }
-                ;
+static rb_strterm_t *
+new_heredoc(struct parser_params *p)
+{
+    rb_strterm_t *strterm = ZALLOC(rb_strterm_t);
+    strterm->heredoc = true;
+    return strterm;
+}
 
-p_args_tail	: p_rest
-                    {
-                        $$ = new_array_pattern_tail(p, Qnone, 1, $1, Qnone, &@$);
-                    }
-                | p_rest ',' p_args_post
-                    {
-                        $$ = new_array_pattern_tail(p, Qnone, 1, $1, $3, &@$);
-                    }
-                ;
+#define peek(p,c) peek_n(p, (c), 0)
+#define peek_n(p,c,n) (!lex_eol_n_p(p, n) && (c) == (unsigned char)(p)->lex.pcur[n])
+#define peekc(p) peekc_n(p, 0)
+#define peekc_n(p,n) (lex_eol_n_p(p, n) ? -1 : (unsigned char)(p)->lex.pcur[n])
 
-p_find		: p_rest ',' p_args_post ',' p_rest
-                    {
-                        $$ = new_find_pattern_tail(p, $1, $3, $5, &@$);
-                    }
-                ;
+#define add_delayed_token(p, tok, end) parser_add_delayed_token(p, tok, end, __LINE__)
+static void
+parser_add_delayed_token(struct parser_params *p, const char *tok, const char *end, int line)
+{
+    debug_token_line(p, "add_delayed_token", line);
 
+    if (tok < end) {
+        if (has_delayed_token(p)) {
+            bool next_line = parser_string_char_at_end(p, p->delayed.token, 0) == '\n';
+            int end_line = (next_line ? 1 : 0) + p->delayed.end_line;
+            int end_col = (next_line ? 0 : p->delayed.end_col);
+            if (end_line != p->ruby_sourceline || end_col != tok - p->lex.pbeg) {
+                dispatch_delayed_token(p, tSTRING_CONTENT);
+            }
+        }
+        if (!has_delayed_token(p)) {
+            p->delayed.token = rb_parser_string_new(p, 0, 0);
+            rb_parser_enc_associate(p, p->delayed.token, p->enc);
+            p->delayed.beg_line = p->ruby_sourceline;
+            p->delayed.beg_col = rb_long2int(tok - p->lex.pbeg);
+        }
+        parser_str_cat(p->delayed.token, tok, end - tok);
+        p->delayed.end_line = p->ruby_sourceline;
+        p->delayed.end_col = rb_long2int(end - p->lex.pbeg);
+        p->lex.ptok = end;
+    }
+}
 
-p_rest		: tSTAR tIDENTIFIER
-                    {
-                    /*%%%*/
-                        error_duplicate_pattern_variable(p, $2, &@2);
-                        $$ = assignable(p, $2, 0, &@$);
-                    /*% %*/
-                    /*% ripper: assignable(p, var_field(p, $2)) %*/
-                    }
-                | tSTAR
-                    {
-                    /*%%%*/
-                        $$ = 0;
-                    /*% %*/
-                    /*% ripper: var_field(p, Qnil) %*/
-                    }
-                ;
+static void
+set_lastline(struct parser_params *p, rb_parser_string_t *str)
+{
+    p->lex.pbeg = p->lex.pcur = PARSER_STRING_PTR(str);
+    p->lex.pend = p->lex.pcur + PARSER_STRING_LEN(str);
+    p->lex.lastline = str;
+}
 
-p_args_post	: p_arg
-                | p_args_post ',' p_arg
-                    {
-                    /*%%%*/
-                        $$ = list_concat($1, $3);
-                    /*% %*/
-                    /*% ripper: rb_ary_concat($1, get_value($3)) %*/
-                    }
-                ;
+static int
+nextline(struct parser_params *p, int set_encoding)
+{
+    rb_parser_string_t *str = p->lex.nextline;
+    p->lex.nextline = 0;
+    if (!str) {
+        if (p->eofp)
+            return -1;
 
-p_arg		: p_expr
-                    {
-                    /*%%%*/
-                        $$ = NEW_LIST($1, &@$);
-                    /*% %*/
-                    /*% ripper: rb_ary_new_from_args(1, get_value($1)) %*/
-                    }
-                ;
+        if (!lex_eol_ptr_p(p, p->lex.pbeg) && *(p->lex.pend-1) != '\n') {
+            goto end_of_input;
+        }
 
-p_kwargs	: p_kwarg ',' p_any_kwrest
-                    {
-                        $$ =  new_hash_pattern_tail(p, new_unique_key_hash(p, $1, &@$), $3, &@$);
-                    }
-                | p_kwarg
-                    {
-                        $$ =  new_hash_pattern_tail(p, new_unique_key_hash(p, $1, &@$), 0, &@$);
-                    }
-                | p_kwarg ','
-                    {
-                        $$ =  new_hash_pattern_tail(p, new_unique_key_hash(p, $1, &@$), 0, &@$);
-                    }
-                | p_any_kwrest
-                    {
-                        $$ =  new_hash_pattern_tail(p, new_hash(p, Qnone, &@$), $1, &@$);
-                    }
-                ;
+        if (!p->lex.input || !(str = lex_getline(p))) {
+          end_of_input:
+            p->eofp = 1;
+            lex_goto_eol(p);
+            return -1;
+        }
+#ifndef RIPPER
+        if (p->debug_lines) {
+            if (set_encoding) rb_parser_enc_associate(p, str, p->enc);
+            rb_parser_string_t *copy = rb_parser_string_deep_copy(p, str);
+            rb_parser_ary_push_script_line(p, p->debug_lines, copy);
+        }
+#endif
+        p->cr_seen = FALSE;
+    }
+    else if (str == AFTER_HEREDOC_WITHOUT_TERMINATOR) {
+        /* after here-document without terminator */
+        goto end_of_input;
+    }
+    add_delayed_token(p, p->lex.ptok, p->lex.pend);
+    if (p->heredoc_end > 0) {
+        p->ruby_sourceline = p->heredoc_end;
+        p->heredoc_end = 0;
+    }
+    p->ruby_sourceline++;
+    set_lastline(p, str);
+    token_flush(p);
+    return 0;
+}
 
-p_kwarg 	: p_kw
-                    /*% ripper[brace]: rb_ary_new_from_args(1, $1) %*/
-                | p_kwarg ',' p_kw
-                    {
-                    /*%%%*/
-                        $$ = list_concat($1, $3);
-                    /*% %*/
-                    /*% ripper: rb_ary_push($1, $3) %*/
-                    }
-                ;
+static int
+parser_cr(struct parser_params *p, int c)
+{
+    if (peek(p, '\n')) {
+        p->lex.pcur++;
+        c = '\n';
+    }
+    return c;
+}
 
-p_kw		: p_kw_label p_expr
-                    {
-                        error_duplicate_pattern_key(p, get_id($1), &@1);
-                    /*%%%*/
-                        $$ = list_append(p, NEW_LIST(NEW_LIT(ID2SYM($1), &@1), &@$), $2);
-                    /*% %*/
-                    /*% ripper: rb_ary_new_from_args(2, get_value($1), get_value($2)) %*/
-                    }
-                | p_kw_label
-                    {
-                        error_duplicate_pattern_key(p, get_id($1), &@1);
-                        if ($1 && !is_local_id(get_id($1))) {
-                            yyerror1(&@1, "key must be valid as local variables");
-                        }
-                        error_duplicate_pattern_variable(p, get_id($1), &@1);
-                    /*%%%*/
-                        $$ = list_append(p, NEW_LIST(NEW_LIT(ID2SYM($1), &@$), &@$), assignable(p, $1, 0, &@$));
-                    /*% %*/
-                    /*% ripper: rb_ary_new_from_args(2, get_value(assignable(p, $1)), Qnil) %*/
-                    }
-                ;
+static inline int
+nextc0(struct parser_params *p, int set_encoding)
+{
+    int c;
 
-p_kw_label	: tLABEL
-                | tSTRING_BEG string_contents tLABEL_END
-                    {
-                        YYLTYPE loc = code_loc_gen(&@1, &@3);
-                    /*%%%*/
-                        if (!$2 || nd_type_p($2, NODE_STR)) {
-                            NODE *node = dsym_node(p, $2, &loc);
-                            $$ = SYM2ID(node->nd_lit);
-                        }
-                    /*%
-                        if (ripper_is_node_yylval(p, $2) && RNODE($2)->nd_cval) {
-                            VALUE label = RNODE($2)->nd_cval;
-                            VALUE rval = RNODE($2)->nd_rval;
-                            $$ = ripper_new_yylval(p, rb_intern_str(label), rval, label);
-                            RNODE($$)->nd_loc = loc;
-                        }
-                    %*/
-                        else {
-                            yyerror1(&loc, "symbol literal with interpolation is not allowed");
-                            $$ = 0;
-                        }
-                    }
-                ;
+    if (UNLIKELY(lex_eol_p(p) || p->eofp || p->lex.nextline > AFTER_HEREDOC_WITHOUT_TERMINATOR)) {
+        if (nextline(p, set_encoding)) return -1;
+    }
+    c = (unsigned char)*p->lex.pcur++;
+    if (UNLIKELY(c == '\r')) {
+        c = parser_cr(p, c);
+    }
 
-p_kwrest	: kwrest_mark tIDENTIFIER
-                    {
-                        $$ = $2;
-                    }
-                | kwrest_mark
-                    {
-                        $$ = 0;
-                    }
-                ;
+    return c;
+}
+#define nextc(p) nextc0(p, TRUE)
 
-p_kwnorest	: kwrest_mark keyword_nil
-                    {
-                        $$ = 0;
-                    }
-                ;
+static void
+pushback(struct parser_params *p, int c)
+{
+    if (c == -1) return;
+    p->eofp = 0;
+    p->lex.pcur--;
+    if (p->lex.pcur > p->lex.pbeg && p->lex.pcur[0] == '\n' && p->lex.pcur[-1] == '\r') {
+        p->lex.pcur--;
+    }
+}
 
-p_any_kwrest	: p_kwrest
-                | p_kwnorest {$$ = ID2VAL(idNil);}
-                ;
+#define was_bol(p) ((p)->lex.pcur == (p)->lex.pbeg + 1)
 
-p_value 	: p_primitive
-                | p_primitive tDOT2 p_primitive
-                    {
-                    /*%%%*/
-                        value_expr($1);
-                        value_expr($3);
-                        $$ = NEW_DOT2($1, $3, &@$);
-                    /*% %*/
-                    /*% ripper: dot2!($1, $3) %*/
-                    }
-                | p_primitive tDOT3 p_primitive
-                    {
-                    /*%%%*/
-                        value_expr($1);
-                        value_expr($3);
-                        $$ = NEW_DOT3($1, $3, &@$);
-                    /*% %*/
-                    /*% ripper: dot3!($1, $3) %*/
-                    }
-                | p_primitive tDOT2
-                    {
-                    /*%%%*/
-                        value_expr($1);
-                        $$ = NEW_DOT2($1, new_nil_at(p, &@2.end_pos), &@$);
-                    /*% %*/
-                    /*% ripper: dot2!($1, Qnil) %*/
-                    }
-                | p_primitive tDOT3
-                    {
-                    /*%%%*/
-                        value_expr($1);
-                        $$ = NEW_DOT3($1, new_nil_at(p, &@2.end_pos), &@$);
-                    /*% %*/
-                    /*% ripper: dot3!($1, Qnil) %*/
-                    }
-                | p_var_ref
-                | p_expr_ref
-                | p_const
-                | tBDOT2 p_primitive
-                    {
-                    /*%%%*/
-                        value_expr($2);
-                        $$ = NEW_DOT2(new_nil_at(p, &@1.beg_pos), $2, &@$);
-                    /*% %*/
-                    /*% ripper: dot2!(Qnil, $2) %*/
-                    }
-                | tBDOT3 p_primitive
-                    {
-                    /*%%%*/
-                        value_expr($2);
-                        $$ = NEW_DOT3(new_nil_at(p, &@1.beg_pos), $2, &@$);
-                    /*% %*/
-                    /*% ripper: dot3!(Qnil, $2) %*/
-                    }
-                ;
+#define tokfix(p) ((p)->tokenbuf[(p)->tokidx]='\0')
+#define tok(p) (p)->tokenbuf
+#define toklen(p) (p)->tokidx
 
-p_primitive	: literal
-                | strings
-                | xstring
-                | regexp
-                | words
-                | qwords
-                | symbols
-                | qsymbols
-                | keyword_variable
-                    {
-                    /*%%%*/
-                        if (!($$ = gettable(p, $1, &@$))) $$ = NEW_BEGIN(0, &@$);
-                    /*% %*/
-                    /*% ripper: var_ref!($1) %*/
-                    }
-                | lambda
-                ;
+static int
+looking_at_eol_p(struct parser_params *p)
+{
+    const char *ptr = p->lex.pcur;
+    while (!lex_eol_ptr_p(p, ptr)) {
+        int c = (unsigned char)*ptr++;
+        int eol = (c == '\n' || c == '#');
+        if (eol || !ISSPACE(c)) {
+            return eol;
+        }
+    }
+    return TRUE;
+}
 
-p_variable	: tIDENTIFIER
-                    {
-                    /*%%%*/
-                        error_duplicate_pattern_variable(p, $1, &@1);
-                        $$ = assignable(p, $1, 0, &@$);
-                    /*% %*/
-                    /*% ripper: assignable(p, var_field(p, $1)) %*/
-                    }
-                ;
+static char*
+newtok(struct parser_params *p)
+{
+    p->tokidx = 0;
+    if (!p->tokenbuf) {
+        p->toksiz = 60;
+        p->tokenbuf = ALLOC_N(char, 60);
+    }
+    if (p->toksiz > 4096) {
+        p->toksiz = 60;
+        REALLOC_N(p->tokenbuf, char, 60);
+    }
+    return p->tokenbuf;
+}
 
-p_var_ref	: '^' tIDENTIFIER
-                    {
-                    /*%%%*/
-                        NODE *n = gettable(p, $2, &@$);
-                        if (!(nd_type_p(n, NODE_LVAR) || nd_type_p(n, NODE_DVAR))) {
-                            compile_error(p, "%"PRIsVALUE": no such local variable", rb_id2str($2));
-                        }
-                        $$ = n;
-                    /*% %*/
-                    /*% ripper: var_ref!($2) %*/
-                    }
-                | '^' nonlocal_var
-                    {
-                    /*%%%*/
-                        if (!($$ = gettable(p, $2, &@$))) $$ = NEW_BEGIN(0, &@$);
-                    /*% %*/
-                    /*% ripper: var_ref!($2) %*/
-                    }
-                ;
+static char *
+tokspace(struct parser_params *p, int n)
+{
+    p->tokidx += n;
 
-p_expr_ref	: '^' tLPAREN expr_value rparen
-                    {
-                    /*%%%*/
-                        $$ = NEW_BEGIN($3, &@$);
-                    /*% %*/
-                    /*% ripper: begin!($3) %*/
-                    }
-                ;
+    if (p->tokidx >= p->toksiz) {
+        do {p->toksiz *= 2;} while (p->toksiz < p->tokidx);
+        REALLOC_N(p->tokenbuf, char, p->toksiz);
+    }
+    return &p->tokenbuf[p->tokidx-n];
+}
 
-p_const 	: tCOLON3 cname
-                    {
-                    /*%%%*/
-                        $$ = NEW_COLON3($2, &@$);
-                    /*% %*/
-                    /*% ripper: top_const_ref!($2) %*/
-                    }
-                | p_const tCOLON2 cname
-                    {
-                    /*%%%*/
-                        $$ = NEW_COLON2($1, $3, &@$);
-                    /*% %*/
-                    /*% ripper: const_path_ref!($1, $3) %*/
-                    }
-                | tCONSTANT
-                   {
-                    /*%%%*/
-                        $$ = gettable(p, $1, &@$);
-                    /*% %*/
-                    /*% ripper: var_ref!($1) %*/
-                   }
-                ;
+static void
+tokadd(struct parser_params *p, int c)
+{
+    p->tokenbuf[p->tokidx++] = (char)c;
+    if (p->tokidx >= p->toksiz) {
+        p->toksiz *= 2;
+        REALLOC_N(p->tokenbuf, char, p->toksiz);
+    }
+}
 
-opt_rescue	: k_rescue exc_list exc_var then
-                  compstmt
-                  opt_rescue
-                    {
-                    /*%%%*/
-                        $$ = NEW_RESBODY($2,
-                                         $3 ? block_append(p, node_assign(p, $3, NEW_ERRINFO(&@3), NO_LEX_CTXT, &@3), $5) : $5,
-                                         $6, &@$);
+static int
+tok_hex(struct parser_params *p, size_t *numlen)
+{
+    int c;
+
+    c = (int)ruby_scan_hex(p->lex.pcur, 2, numlen);
+    if (!*numlen) {
+        flush_string_content(p, p->enc, rb_strlen_lit("\\x"));
+        yyerror0("invalid hex escape");
+        dispatch_scan_event(p, tSTRING_CONTENT);
+        return 0;
+    }
+    p->lex.pcur += *numlen;
+    return c;
+}
 
-                        if ($2) {
-                            fixpos($$, $2);
-                        }
-                        else if ($3) {
-                            fixpos($$, $3);
-                        }
-                        else {
-                            fixpos($$, $5);
-                        }
-                    /*% %*/
-                    /*% ripper: rescue!(escape_Qundef($2), escape_Qundef($3), escape_Qundef($5), escape_Qundef($6)) %*/
-                    }
-                | none
-                ;
+#define tokcopy(p, n) memcpy(tokspace(p, n), (p)->lex.pcur - (n), (n))
 
-exc_list	: arg_value
-                    {
-                    /*%%%*/
-                        $$ = NEW_LIST($1, &@$);
-                    /*% %*/
-                    /*% ripper: rb_ary_new3(1, get_value($1)) %*/
-                    }
-                | mrhs
-                    {
-                    /*%%%*/
-                        if (!($$ = splat_array($1))) $$ = $1;
-                    /*% %*/
-                    /*% ripper: $1 %*/
-                    }
-                | none
-                ;
+static int
+escaped_control_code(int c)
+{
+    int c2 = 0;
+    switch (c) {
+      case ' ':
+        c2 = 's';
+        break;
+      case '\n':
+        c2 = 'n';
+        break;
+      case '\t':
+        c2 = 't';
+        break;
+      case '\v':
+        c2 = 'v';
+        break;
+      case '\r':
+        c2 = 'r';
+        break;
+      case '\f':
+        c2 = 'f';
+        break;
+    }
+    return c2;
+}
 
-exc_var		: tASSOC lhs
-                    {
-                        $$ = $2;
-                    }
-                | none
-                ;
+#define WARN_SPACE_CHAR(c, prefix) \
+    rb_warn1("invalid character syntax; use "prefix"\\%c", WARN_I(c))
 
-opt_ensure	: k_ensure compstmt
-                    {
-                    /*%%%*/
-                        $$ = $2;
-                    /*% %*/
-                    /*% ripper: ensure!($2) %*/
-                    }
-                | none
-                ;
+static int
+tokadd_codepoint(struct parser_params *p, rb_encoding **encp,
+                 int regexp_literal, const char *begin)
+{
+    const int wide = !begin;
+    size_t numlen;
+    int codepoint = (int)ruby_scan_hex(p->lex.pcur, wide ? p->lex.pend - p->lex.pcur : 4, &numlen);
 
-literal		: numeric
-                | symbol
-                ;
+    p->lex.pcur += numlen;
+    if (p->lex.strterm == NULL ||
+        strterm_is_heredoc(p->lex.strterm) ||
+        (p->lex.strterm->u.literal.func != str_regexp)) {
+        if (!begin) begin = p->lex.pcur;
+        if (wide ? (numlen == 0 || numlen > 6) : (numlen < 4))  {
+            flush_string_content(p, rb_utf8_encoding(), p->lex.pcur - begin);
+            yyerror0("invalid Unicode escape");
+            dispatch_scan_event(p, tSTRING_CONTENT);
+            return wide && numlen > 0;
+        }
+        if (codepoint > 0x10ffff) {
+            flush_string_content(p, rb_utf8_encoding(), p->lex.pcur - begin);
+            yyerror0("invalid Unicode codepoint (too large)");
+            dispatch_scan_event(p, tSTRING_CONTENT);
+            return wide;
+        }
+        if ((codepoint & 0xfffff800) == 0xd800) {
+            flush_string_content(p, rb_utf8_encoding(), p->lex.pcur - begin);
+            yyerror0("invalid Unicode codepoint");
+            dispatch_scan_event(p, tSTRING_CONTENT);
+            return wide;
+        }
+    }
+    if (regexp_literal) {
+        tokcopy(p, (int)numlen);
+    }
+    else if (codepoint >= 0x80) {
+        rb_encoding *utf8 = rb_utf8_encoding();
+        if (*encp && utf8 != *encp) {
+            YYLTYPE loc = RUBY_INIT_YYLLOC();
+            compile_error(p, "UTF-8 mixed within %s source", rb_enc_name(*encp));
+            parser_show_error_line(p, &loc);
+            return wide;
+        }
+        *encp = utf8;
+        tokaddmbc(p, codepoint, *encp);
+    }
+    else {
+        tokadd(p, codepoint);
+    }
+    return TRUE;
+}
 
-strings		: string
-                    {
-                    /*%%%*/
-                        NODE *node = $1;
-                        if (!node) {
-                            node = NEW_STR(STR_NEW0(), &@$);
-                            RB_OBJ_WRITTEN(p->ast, Qnil, node->nd_lit);
-                        }
-                        else {
-                            node = evstr2dstr(p, node);
-                        }
-                        $$ = node;
-                    /*% %*/
-                    /*% ripper: $1 %*/
-                    }
-                ;
+static int tokadd_mbchar(struct parser_params *p, int c);
 
-string		: tCHAR
-                | string1
-                | string string1
-                    {
-                    /*%%%*/
-                        $$ = literal_concat(p, $1, $2, &@$);
-                    /*% %*/
-                    /*% ripper: string_concat!($1, $2) %*/
-                    }
-                ;
+static int
+tokskip_mbchar(struct parser_params *p)
+{
+    int len = parser_precise_mbclen(p, p->lex.pcur-1);
+    if (len > 0) {
+        p->lex.pcur += len - 1;
+    }
+    return len;
+}
 
-string1		: tSTRING_BEG string_contents tSTRING_END
-                    {
-                    /*%%%*/
-                        $$ = heredoc_dedent(p, $2);
-                        if ($$) nd_set_loc($$, &@$);
-                    /*% %*/
-                    /*% ripper: string_literal!(heredoc_dedent(p, $2)) %*/
-                    }
-                ;
+/* return value is for ?\u3042 */
+static void
+tokadd_utf8(struct parser_params *p, rb_encoding **encp,
+            int term, int symbol_literal, int regexp_literal)
+{
+    /*
+     * If `term` is not -1, then we allow multiple codepoints in \u{}
+     * upto `term` byte, otherwise we're parsing a character literal.
+     * And then add the codepoints to the current token.
+     */
+    static const char multiple_codepoints[] = "Multiple codepoints at single character literal";
 
-xstring		: tXSTRING_BEG xstring_contents tSTRING_END
-                    {
-                    /*%%%*/
-                        $$ = new_xstring(p, heredoc_dedent(p, $2), &@$);
-                    /*% %*/
-                    /*% ripper: xstring_literal!(heredoc_dedent(p, $2)) %*/
-                    }
-                ;
+    const int open_brace = '{', close_brace = '}';
 
-regexp		: tREGEXP_BEG regexp_contents tREGEXP_END
-                    {
-                        $$ = new_regexp(p, $2, $3, &@$);
-                    }
-                ;
+    if (regexp_literal) { tokadd(p, '\\'); tokadd(p, 'u'); }
 
-words_sep	: ' ' {}
-                | words_sep ' '
-                ;
+    if (peek(p, open_brace)) {  /* handle \u{...} form */
+        if (regexp_literal && p->lex.strterm->u.literal.func == str_regexp) {
+            /*
+             * Skip parsing validation code and copy bytes as-is until term or
+             * closing brace, in order to correctly handle extended regexps where
+             * invalid unicode escapes are allowed in comments. The regexp parser
+             * does its own validation and will catch any issues.
+             */
+            tokadd(p, open_brace);
+            while (!lex_eol_ptr_p(p, ++p->lex.pcur)) {
+                int c = peekc(p);
+                if (c == close_brace) {
+                    tokadd(p, c);
+                    ++p->lex.pcur;
+                    break;
+                }
+                else if (c == term) {
+                    break;
+                }
+                if (c == '\\' && !lex_eol_n_p(p, 1)) {
+                    tokadd(p, c);
+                    c = *++p->lex.pcur;
+                }
+                tokadd_mbchar(p, c);
+            }
+        }
+        else {
+            const char *second = NULL;
+            int c, last = nextc(p);
+            if (lex_eol_p(p)) goto unterminated;
+            while (ISSPACE(c = peekc(p)) && !lex_eol_ptr_p(p, ++p->lex.pcur));
+            while (c != close_brace) {
+                if (c == term) goto unterminated;
+                if (second == multiple_codepoints)
+                    second = p->lex.pcur;
+                if (regexp_literal) tokadd(p, last);
+                if (!tokadd_codepoint(p, encp, regexp_literal, NULL)) {
+                    break;
+                }
+                while (ISSPACE(c = peekc(p))) {
+                    if (lex_eol_ptr_p(p, ++p->lex.pcur)) goto unterminated;
+                    last = c;
+                }
+                if (term == -1 && !second)
+                    second = multiple_codepoints;
+            }
 
-words		: tWORDS_BEG words_sep word_list tSTRING_END
-                    {
-                    /*%%%*/
-                        $$ = make_list($3, &@$);
-                    /*% %*/
-                    /*% ripper: array!($3) %*/
-                    }
-                ;
+            if (c != close_brace) {
+              unterminated:
+                flush_string_content(p, rb_utf8_encoding(), 0);
+                yyerror0("unterminated Unicode escape");
+                dispatch_scan_event(p, tSTRING_CONTENT);
+                return;
+            }
+            if (second && second != multiple_codepoints) {
+                const char *pcur = p->lex.pcur;
+                p->lex.pcur = second;
+                dispatch_scan_event(p, tSTRING_CONTENT);
+                token_flush(p);
+                p->lex.pcur = pcur;
+                yyerror0(multiple_codepoints);
+                token_flush(p);
+            }
 
-word_list	: /* none */
-                    {
-                    /*%%%*/
-                        $$ = 0;
-                    /*% %*/
-                    /*% ripper: words_new! %*/
-                    }
-                | word_list word words_sep
-                    {
-                    /*%%%*/
-                        $$ = list_append(p, $1, evstr2dstr(p, $2));
-                    /*% %*/
-                    /*% ripper: words_add!($1, $2) %*/
-                    }
-                ;
+            if (regexp_literal) tokadd(p, close_brace);
+            nextc(p);
+        }
+    }
+    else {			/* handle \uxxxx form */
+        if (!tokadd_codepoint(p, encp, regexp_literal, p->lex.pcur - rb_strlen_lit("\\u"))) {
+            token_flush(p);
+            return;
+        }
+    }
+}
 
-word		: string_content
-                    /*% ripper[brace]: word_add!(word_new!, $1) %*/
-                | word string_content
-                    {
-                    /*%%%*/
-                        $$ = literal_concat(p, $1, $2, &@$);
-                    /*% %*/
-                    /*% ripper: word_add!($1, $2) %*/
-                    }
-                ;
+#define ESCAPE_CONTROL 1
+#define ESCAPE_META    2
 
-symbols 	: tSYMBOLS_BEG words_sep symbol_list tSTRING_END
-                    {
-                    /*%%%*/
-                        $$ = make_list($3, &@$);
-                    /*% %*/
-                    /*% ripper: array!($3) %*/
-                    }
-                ;
+static int
+read_escape(struct parser_params *p, int flags, const char *begin)
+{
+    int c;
+    size_t numlen;
 
-symbol_list	: /* none */
-                    {
-                    /*%%%*/
-                        $$ = 0;
-                    /*% %*/
-                    /*% ripper: symbols_new! %*/
-                    }
-                | symbol_list word words_sep
-                    {
-                    /*%%%*/
-                        $$ = symbol_append(p, $1, evstr2dstr(p, $2));
-                    /*% %*/
-                    /*% ripper: symbols_add!($1, $2) %*/
-                    }
-                ;
+    switch (c = nextc(p)) {
+      case '\\':	/* Backslash */
+        return c;
 
-qwords		: tQWORDS_BEG words_sep qword_list tSTRING_END
-                    {
-                    /*%%%*/
-                        $$ = make_list($3, &@$);
-                    /*% %*/
-                    /*% ripper: array!($3) %*/
-                    }
-                ;
+      case 'n':	/* newline */
+        return '\n';
 
-qsymbols	: tQSYMBOLS_BEG words_sep qsym_list tSTRING_END
-                    {
-                    /*%%%*/
-                        $$ = make_list($3, &@$);
-                    /*% %*/
-                    /*% ripper: array!($3) %*/
-                    }
-                ;
+      case 't':	/* horizontal tab */
+        return '\t';
 
-qword_list	: /* none */
-                    {
-                    /*%%%*/
-                        $$ = 0;
-                    /*% %*/
-                    /*% ripper: qwords_new! %*/
-                    }
-                | qword_list tSTRING_CONTENT words_sep
-                    {
-                    /*%%%*/
-                        $$ = list_append(p, $1, $2);
-                    /*% %*/
-                    /*% ripper: qwords_add!($1, $2) %*/
-                    }
-                ;
+      case 'r':	/* carriage-return */
+        return '\r';
 
-qsym_list	: /* none */
-                    {
-                    /*%%%*/
-                        $$ = 0;
-                    /*% %*/
-                    /*% ripper: qsymbols_new! %*/
-                    }
-                | qsym_list tSTRING_CONTENT words_sep
-                    {
-                    /*%%%*/
-                        $$ = symbol_append(p, $1, $2);
-                    /*% %*/
-                    /*% ripper: qsymbols_add!($1, $2) %*/
-                    }
-                ;
+      case 'f':	/* form-feed */
+        return '\f';
 
-string_contents : /* none */
-                    {
-                    /*%%%*/
-                        $$ = 0;
-                    /*% %*/
-                    /*% ripper: string_content! %*/
-                    /*%%%*/
-                    /*%
-                        $$ = ripper_new_yylval(p, 0, $$, 0);
-                    %*/
-                    }
-                | string_contents string_content
-                    {
-                    /*%%%*/
-                        $$ = literal_concat(p, $1, $2, &@$);
-                    /*% %*/
-                    /*% ripper: string_add!($1, $2) %*/
-                    /*%%%*/
-                    /*%
-                        if (ripper_is_node_yylval(p, $1) && ripper_is_node_yylval(p, $2) &&
-                            !RNODE($1)->nd_cval) {
-                            RNODE($1)->nd_cval = RNODE($2)->nd_cval;
-                            RNODE($1)->nd_rval = add_mark_object(p, $$);
-                            $$ = $1;
-                        }
-                    %*/
-                    }
-                ;
+      case 'v':	/* vertical tab */
+        return '\13';
 
-xstring_contents: /* none */
-                    {
-                    /*%%%*/
-                        $$ = 0;
-                    /*% %*/
-                    /*% ripper: xstring_new! %*/
-                    }
-                | xstring_contents string_content
-                    {
-                    /*%%%*/
-                        $$ = literal_concat(p, $1, $2, &@$);
-                    /*% %*/
-                    /*% ripper: xstring_add!($1, $2) %*/
-                    }
-                ;
+      case 'a':	/* alarm(bell) */
+        return '\007';
 
-regexp_contents: /* none */
-                    {
-                    /*%%%*/
-                        $$ = 0;
-                    /*% %*/
-                    /*% ripper: regexp_new! %*/
-                    /*%%%*/
-                    /*%
-                        $$ = ripper_new_yylval(p, 0, $$, 0);
-                    %*/
-                    }
-                | regexp_contents string_content
-                    {
-                    /*%%%*/
-                        NODE *head = $1, *tail = $2;
-                        if (!head) {
-                            $$ = tail;
-                        }
-                        else if (!tail) {
-                            $$ = head;
-                        }
-                        else {
-                            switch (nd_type(head)) {
-                              case NODE_STR:
-                                nd_set_type(head, NODE_DSTR);
-                                break;
-                              case NODE_DSTR:
-                                break;
-                              default:
-                                head = list_append(p, NEW_DSTR(Qnil, &@$), head);
-                                break;
-                            }
-                            $$ = list_append(p, head, tail);
-                        }
-                    /*%
-                        VALUE s1 = 1, s2 = 0, n1 = $1, n2 = $2;
-                        if (ripper_is_node_yylval(p, n1)) {
-                            s1 = RNODE(n1)->nd_cval;
-                            n1 = RNODE(n1)->nd_rval;
-                        }
-                        if (ripper_is_node_yylval(p, n2)) {
-                            s2 = RNODE(n2)->nd_cval;
-                            n2 = RNODE(n2)->nd_rval;
-                        }
-                        $$ = dispatch2(regexp_add, n1, n2);
-                        if (!s1 && s2) {
-                            $$ = ripper_new_yylval(p, 0, $$, s2);
-                        }
-                    %*/
-                    }
-                ;
+      case 'e':	/* escape */
+        return 033;
 
-string_content	: tSTRING_CONTENT
-                    /*% ripper[brace]: ripper_new_yylval(p, 0, get_value($1), $1) %*/
-                | tSTRING_DVAR
-                    {
-                        /* need to backup p->lex.strterm so that a string literal `%&foo,#$&,bar&` can be parsed */
-                        $<strterm>$ = p->lex.strterm;
-                        p->lex.strterm = 0;
-                        SET_LEX_STATE(EXPR_BEG);
-                    }
-                  string_dvar
-                    {
-                        p->lex.strterm = $<strterm>2;
-                    /*%%%*/
-                        $$ = NEW_EVSTR($3, &@$);
-                        nd_set_line($$, @3.end_pos.lineno);
-                    /*% %*/
-                    /*% ripper: string_dvar!($3) %*/
-                    }
-                | tSTRING_DBEG
-                    {
-                        CMDARG_PUSH(0);
-                        COND_PUSH(0);
-                    }
-                    {
-                        /* need to backup p->lex.strterm so that a string literal `%!foo,#{ !0 },bar!` can be parsed */
-                        $<strterm>$ = p->lex.strterm;
-                        p->lex.strterm = 0;
-                    }
-                    {
-                        $<num>$ = p->lex.state;
-                        SET_LEX_STATE(EXPR_BEG);
-                    }
-                    {
-                        $<num>$ = p->lex.brace_nest;
-                        p->lex.brace_nest = 0;
-                    }
-                    {
-                        $<num>$ = p->heredoc_indent;
-                        p->heredoc_indent = 0;
-                    }
-                  compstmt string_dend
-                    {
-                        COND_POP();
-                        CMDARG_POP();
-                        p->lex.strterm = $<strterm>3;
-                        SET_LEX_STATE($<num>4);
-                        p->lex.brace_nest = $<num>5;
-                        p->heredoc_indent = $<num>6;
-                        p->heredoc_line_indent = -1;
-                    /*%%%*/
-                        if ($7) $7->flags &= ~NODE_FL_NEWLINE;
-                        $$ = new_evstr(p, $7, &@$);
-                    /*% %*/
-                    /*% ripper: string_embexpr!($7) %*/
-                    }
-                ;
+      case '0': case '1': case '2': case '3': /* octal constant */
+      case '4': case '5': case '6': case '7':
+        pushback(p, c);
+        c = (int)ruby_scan_oct(p->lex.pcur, 3, &numlen);
+        p->lex.pcur += numlen;
+        return c;
 
-string_dend	: tSTRING_DEND
-                | END_OF_INPUT
-                ;
+      case 'x':	/* hex constant */
+        c = tok_hex(p, &numlen);
+        if (numlen == 0) return 0;
+        return c;
 
-string_dvar	: tGVAR
-                    {
-                    /*%%%*/
-                        $$ = NEW_GVAR($1, &@$);
-                    /*% %*/
-                    /*% ripper: var_ref!($1) %*/
+      case 'b':	/* backspace */
+        return '\010';
+
+      case 's':	/* space */
+        return ' ';
+
+      case 'M':
+        if (flags & ESCAPE_META) goto eof;
+        if ((c = nextc(p)) != '-') {
+            goto eof;
+        }
+        if ((c = nextc(p)) == '\\') {
+            switch (peekc(p)) {
+              case 'u': case 'U':
+                nextc(p);
+                goto eof;
+            }
+            return read_escape(p, flags|ESCAPE_META, begin) | 0x80;
+        }
+        else if (c == -1) goto eof;
+        else if (!ISASCII(c)) {
+            tokskip_mbchar(p);
+            goto eof;
+        }
+        else {
+            int c2 = escaped_control_code(c);
+            if (c2) {
+                if (ISCNTRL(c) || !(flags & ESCAPE_CONTROL)) {
+                    WARN_SPACE_CHAR(c2, "\\M-");
+                }
+                else {
+                    WARN_SPACE_CHAR(c2, "\\C-\\M-");
+                }
+            }
+            else if (ISCNTRL(c)) goto eof;
+            return ((c & 0xff) | 0x80);
+        }
+
+      case 'C':
+        if ((c = nextc(p)) != '-') {
+            goto eof;
+        }
+      case 'c':
+        if (flags & ESCAPE_CONTROL) goto eof;
+        if ((c = nextc(p))== '\\') {
+            switch (peekc(p)) {
+              case 'u': case 'U':
+                nextc(p);
+                goto eof;
+            }
+            c = read_escape(p, flags|ESCAPE_CONTROL, begin);
+        }
+        else if (c == '?')
+            return 0177;
+        else if (c == -1) goto eof;
+        else if (!ISASCII(c)) {
+            tokskip_mbchar(p);
+            goto eof;
+        }
+        else {
+            int c2 = escaped_control_code(c);
+            if (c2) {
+                if (ISCNTRL(c)) {
+                    if (flags & ESCAPE_META) {
+                        WARN_SPACE_CHAR(c2, "\\M-");
                     }
-                | tIVAR
-                    {
-                    /*%%%*/
-                        $$ = NEW_IVAR($1, &@$);
-                    /*% %*/
-                    /*% ripper: var_ref!($1) %*/
+                    else {
+                        WARN_SPACE_CHAR(c2, "");
                     }
-                | tCVAR
-                    {
-                    /*%%%*/
-                        $$ = NEW_CVAR($1, &@$);
-                    /*% %*/
-                    /*% ripper: var_ref!($1) %*/
+                }
+                else {
+                    if (flags & ESCAPE_META) {
+                        WARN_SPACE_CHAR(c2, "\\M-\\C-");
                     }
-                | backref
-                ;
+                    else {
+                        WARN_SPACE_CHAR(c2, "\\C-");
+                    }
+                }
+            }
+            else if (ISCNTRL(c)) goto eof;
+        }
+        return c & 0x9f;
 
-symbol		: ssym
-                | dsym
-                ;
+      eof:
+      case -1:
+        flush_string_content(p, p->enc, p->lex.pcur - begin);
+        yyerror0("Invalid escape character syntax");
+        dispatch_scan_event(p, tSTRING_CONTENT);
+        return '\0';
 
-ssym		: tSYMBEG sym
-                    {
-                        SET_LEX_STATE(EXPR_END);
-                    /*%%%*/
-                        $$ = NEW_LIT(ID2SYM($2), &@$);
-                    /*% %*/
-                    /*% ripper: symbol_literal!(symbol!($2)) %*/
-                    }
-                ;
+      default:
+        if (!ISASCII(c)) {
+            tokskip_mbchar(p);
+            goto eof;
+        }
+        return c;
+    }
+}
 
-sym		: fname
-                | nonlocal_var
-                ;
+static void
+tokaddmbc(struct parser_params *p, int c, rb_encoding *enc)
+{
+    int len = rb_enc_codelen(c, enc);
+    rb_enc_mbcput(c, tokspace(p, len), enc);
+}
 
-dsym		: tSYMBEG string_contents tSTRING_END
-                    {
-                        SET_LEX_STATE(EXPR_END);
-                    /*%%%*/
-                        $$ = dsym_node(p, $2, &@$);
-                    /*% %*/
-                    /*% ripper: dyna_symbol!($2) %*/
-                    }
-                ;
+static int
+tokadd_escape(struct parser_params *p)
+{
+    int c;
+    size_t numlen;
+    const char *begin = p->lex.pcur;
 
-numeric 	: simple_numeric
-                | tUMINUS_NUM simple_numeric   %prec tLOWEST
-                    {
-                    /*%%%*/
-                        $$ = $2;
-                        RB_OBJ_WRITE(p->ast, &$$->nd_lit, negate_lit(p, $$->nd_lit));
-                    /*% %*/
-                    /*% ripper: unary!(ID2VAL(idUMinus), $2) %*/
-                    }
-                ;
+    switch (c = nextc(p)) {
+      case '\n':
+        return 0;		/* just ignore */
 
-simple_numeric	: tINTEGER
-                | tFLOAT
-                | tRATIONAL
-                | tIMAGINARY
-                ;
+      case '0': case '1': case '2': case '3': /* octal constant */
+      case '4': case '5': case '6': case '7':
+        {
+            ruby_scan_oct(--p->lex.pcur, 3, &numlen);
+            if (numlen == 0) goto eof;
+            p->lex.pcur += numlen;
+            tokcopy(p, (int)numlen + 1);
+        }
+        return 0;
 
-nonlocal_var    : tIVAR
-                | tGVAR
-                | tCVAR
-                ;
+      case 'x':	/* hex constant */
+        {
+            tok_hex(p, &numlen);
+            if (numlen == 0) return -1;
+            tokcopy(p, (int)numlen + 2);
+        }
+        return 0;
 
-user_variable	: tIDENTIFIER
-                | tCONSTANT
-                | nonlocal_var
-                ;
+      eof:
+      case -1:
+        flush_string_content(p, p->enc, p->lex.pcur - begin);
+        yyerror0("Invalid escape character syntax");
+        token_flush(p);
+        return -1;
 
-keyword_variable: keyword_nil {$$ = KWD2EID(nil, $1);}
-                | keyword_self {$$ = KWD2EID(self, $1);}
-                | keyword_true {$$ = KWD2EID(true, $1);}
-                | keyword_false {$$ = KWD2EID(false, $1);}
-                | keyword__FILE__ {$$ = KWD2EID(_FILE__, $1);}
-                | keyword__LINE__ {$$ = KWD2EID(_LINE__, $1);}
-                | keyword__ENCODING__ {$$ = KWD2EID(_ENCODING__, $1);}
-                ;
+      default:
+        tokadd(p, '\\');
+        tokadd(p, c);
+    }
+    return 0;
+}
 
-var_ref		: user_variable
-                    {
-                    /*%%%*/
-                        if (!($$ = gettable(p, $1, &@$))) $$ = NEW_BEGIN(0, &@$);
-                    /*%
-                        if (id_is_var(p, get_id($1))) {
-                            $$ = dispatch1(var_ref, $1);
-                        }
-                        else {
-                            $$ = dispatch1(vcall, $1);
-                        }
-                    %*/
-                    }
-                | keyword_variable
-                    {
-                    /*%%%*/
-                        if (!($$ = gettable(p, $1, &@$))) $$ = NEW_BEGIN(0, &@$);
-                    /*% %*/
-                    /*% ripper: var_ref!($1) %*/
-                    }
-                ;
+static int
+char_to_option(int c)
+{
+    int val;
 
-var_lhs		: user_variable
-                    {
-                    /*%%%*/
-                        $$ = assignable(p, $1, 0, &@$);
-                    /*% %*/
-                    /*% ripper: assignable(p, var_field(p, $1)) %*/
-                    }
-                | keyword_variable
-                    {
-                    /*%%%*/
-                        $$ = assignable(p, $1, 0, &@$);
-                    /*% %*/
-                    /*% ripper: assignable(p, var_field(p, $1)) %*/
-                    }
-                ;
+    switch (c) {
+      case 'i':
+        val = RE_ONIG_OPTION_IGNORECASE;
+        break;
+      case 'x':
+        val = RE_ONIG_OPTION_EXTEND;
+        break;
+      case 'm':
+        val = RE_ONIG_OPTION_MULTILINE;
+        break;
+      default:
+        val = 0;
+        break;
+    }
+    return val;
+}
 
-backref		: tNTH_REF
-                | tBACK_REF
-                ;
+#define ARG_ENCODING_FIXED   16
+#define ARG_ENCODING_NONE    32
+#define ENC_ASCII8BIT   1
+#define ENC_EUC_JP      2
+#define ENC_Windows_31J 3
+#define ENC_UTF8        4
 
-superclass	: '<'
-                    {
-                        SET_LEX_STATE(EXPR_BEG);
-                        p->command_start = TRUE;
-                    }
-                  expr_value term
-                    {
-                        $$ = $3;
-                    }
-                | /* none */
-                    {
-                    /*%%%*/
-                        $$ = 0;
-                    /*% %*/
-                    /*% ripper: Qnil %*/
-                    }
-                ;
+static int
+char_to_option_kcode(int c, int *option, int *kcode)
+{
+    *option = 0;
 
-f_opt_paren_args: f_paren_args
-                | none
-                    {
-                        p->ctxt.in_argdef = 0;
-                        $$ = new_args_tail(p, Qnone, Qnone, Qnone, &@0);
-                        $$ = new_args(p, Qnone, Qnone, Qnone, Qnone, $$, &@0);
-                    }
-                ;
+    switch (c) {
+      case 'n':
+        *kcode = ENC_ASCII8BIT;
+        return (*option = ARG_ENCODING_NONE);
+      case 'e':
+        *kcode = ENC_EUC_JP;
+        break;
+      case 's':
+        *kcode = ENC_Windows_31J;
+        break;
+      case 'u':
+        *kcode = ENC_UTF8;
+        break;
+      default:
+        *kcode = -1;
+        return (*option = char_to_option(c));
+    }
+    *option = ARG_ENCODING_FIXED;
+    return 1;
+}
 
-f_paren_args	: '(' f_args rparen
-                    {
-                    /*%%%*/
-                        $$ = $2;
-                    /*% %*/
-                    /*% ripper: paren!($2) %*/
-                        SET_LEX_STATE(EXPR_BEG);
-                        p->command_start = TRUE;
-                        p->ctxt.in_argdef = 0;
-                    }
-                ;
+static int
+regx_options(struct parser_params *p)
+{
+    int kcode = 0;
+    int kopt = 0;
+    int options = 0;
+    int c, opt, kc;
 
-f_arglist	: f_paren_args
-                |   {
-                        $<ctxt>$ = p->ctxt;
-                        p->ctxt.in_kwarg = 1;
-                        p->ctxt.in_argdef = 1;
-                        SET_LEX_STATE(p->lex.state|EXPR_LABEL); /* force for args */
-                    }
-                  f_args term
-                    {
-                        p->ctxt.in_kwarg = $<ctxt>1.in_kwarg;
-                        p->ctxt.in_argdef = 0;
-                        $$ = $2;
-                        SET_LEX_STATE(EXPR_BEG);
-                        p->command_start = TRUE;
-                    }
-                ;
+    newtok(p);
+    while (c = nextc(p), ISALPHA(c)) {
+        if (c == 'o') {
+            options |= RE_OPTION_ONCE;
+        }
+        else if (char_to_option_kcode(c, &opt, &kc)) {
+            if (kc >= 0) {
+                if (kc != ENC_ASCII8BIT) kcode = c;
+                kopt = opt;
+            }
+            else {
+                options |= opt;
+            }
+        }
+        else {
+            tokadd(p, c);
+        }
+    }
+    options |= kopt;
+    pushback(p, c);
+    if (toklen(p)) {
+        YYLTYPE loc = RUBY_INIT_YYLLOC();
+        tokfix(p);
+        compile_error(p, "unknown regexp option%s - %*s",
+                      toklen(p) > 1 ? "s" : "", toklen(p), tok(p));
+        parser_show_error_line(p, &loc);
+    }
+    return options | RE_OPTION_ENCODING(kcode);
+}
+
+static int
+tokadd_mbchar(struct parser_params *p, int c)
+{
+    int len = parser_precise_mbclen(p, p->lex.pcur-1);
+    if (len < 0) return -1;
+    tokadd(p, c);
+    p->lex.pcur += --len;
+    if (len > 0) tokcopy(p, len);
+    return c;
+}
 
-args_tail	: f_kwarg ',' f_kwrest opt_f_block_arg
-                    {
-                        $$ = new_args_tail(p, $1, $3, $4, &@3);
-                    }
-                | f_kwarg opt_f_block_arg
-                    {
-                        $$ = new_args_tail(p, $1, Qnone, $2, &@1);
-                    }
-                | f_any_kwrest opt_f_block_arg
-                    {
-                        $$ = new_args_tail(p, Qnone, $1, $2, &@1);
-                    }
-                | f_block_arg
-                    {
-                        $$ = new_args_tail(p, Qnone, Qnone, $1, &@1);
-                    }
-                | args_forward
-                    {
-                        add_forwarding_args(p);
-                        $$ = new_args_tail(p, Qnone, $1, arg_FWD_BLOCK, &@1);
-                    /*%%%*/
-                        ($$->nd_ainfo)->forwarding = 1;
-                    /*% %*/
-                    }
-                ;
+static inline int
+simple_re_meta(int c)
+{
+    switch (c) {
+      case '$': case '*': case '+': case '.':
+      case '?': case '^': case '|':
+      case ')': case ']': case '}': case '>':
+        return TRUE;
+      default:
+        return FALSE;
+    }
+}
 
-opt_args_tail	: ',' args_tail
-                    {
-                        $$ = $2;
-                    }
-                | /* none */
-                    {
-                        $$ = new_args_tail(p, Qnone, Qnone, Qnone, &@0);
-                    }
-                ;
+static int
+parser_update_heredoc_indent(struct parser_params *p, int c)
+{
+    if (p->heredoc_line_indent == -1) {
+        if (c == '\n') p->heredoc_line_indent = 0;
+    }
+    else {
+        if (c == ' ') {
+            p->heredoc_line_indent++;
+            return TRUE;
+        }
+        else if (c == '\t') {
+            int w = (p->heredoc_line_indent / TAB_WIDTH) + 1;
+            p->heredoc_line_indent = w * TAB_WIDTH;
+            return TRUE;
+        }
+        else if (c != '\n') {
+            if (p->heredoc_indent > p->heredoc_line_indent) {
+                p->heredoc_indent = p->heredoc_line_indent;
+            }
+            p->heredoc_line_indent = -1;
+        }
+        else {
+            /* Whitespace only line has no indentation */
+            p->heredoc_line_indent = 0;
+        }
+    }
+    return FALSE;
+}
 
-f_args		: f_arg ',' f_optarg ',' f_rest_arg opt_args_tail
-                    {
-                        $$ = new_args(p, $1, $3, $5, Qnone, $6, &@$);
-                    }
-                | f_arg ',' f_optarg ',' f_rest_arg ',' f_arg opt_args_tail
-                    {
-                        $$ = new_args(p, $1, $3, $5, $7, $8, &@$);
-                    }
-                | f_arg ',' f_optarg opt_args_tail
-                    {
-                        $$ = new_args(p, $1, $3, Qnone, Qnone, $4, &@$);
-                    }
-                | f_arg ',' f_optarg ',' f_arg opt_args_tail
-                    {
-                        $$ = new_args(p, $1, $3, Qnone, $5, $6, &@$);
-                    }
-                | f_arg ',' f_rest_arg opt_args_tail
-                    {
-                        $$ = new_args(p, $1, Qnone, $3, Qnone, $4, &@$);
-                    }
-                | f_arg ',' f_rest_arg ',' f_arg opt_args_tail
-                    {
-                        $$ = new_args(p, $1, Qnone, $3, $5, $6, &@$);
-                    }
-                | f_arg opt_args_tail
-                    {
-                        $$ = new_args(p, $1, Qnone, Qnone, Qnone, $2, &@$);
-                    }
-                | f_optarg ',' f_rest_arg opt_args_tail
-                    {
-                        $$ = new_args(p, Qnone, $1, $3, Qnone, $4, &@$);
-                    }
-                | f_optarg ',' f_rest_arg ',' f_arg opt_args_tail
-                    {
-                        $$ = new_args(p, Qnone, $1, $3, $5, $6, &@$);
-                    }
-                | f_optarg opt_args_tail
-                    {
-                        $$ = new_args(p, Qnone, $1, Qnone, Qnone, $2, &@$);
-                    }
-                | f_optarg ',' f_arg opt_args_tail
-                    {
-                        $$ = new_args(p, Qnone, $1, Qnone, $3, $4, &@$);
-                    }
-                | f_rest_arg opt_args_tail
-                    {
-                        $$ = new_args(p, Qnone, Qnone, $1, Qnone, $2, &@$);
-                    }
-                | f_rest_arg ',' f_arg opt_args_tail
-                    {
-                        $$ = new_args(p, Qnone, Qnone, $1, $3, $4, &@$);
-                    }
-                | args_tail
-                    {
-                        $$ = new_args(p, Qnone, Qnone, Qnone, Qnone, $1, &@$);
-                    }
-                | /* none */
-                    {
-                        $$ = new_args_tail(p, Qnone, Qnone, Qnone, &@0);
-                        $$ = new_args(p, Qnone, Qnone, Qnone, Qnone, $$, &@0);
-                    }
-                ;
+static void
+parser_mixed_error(struct parser_params *p, rb_encoding *enc1, rb_encoding *enc2)
+{
+    YYLTYPE loc = RUBY_INIT_YYLLOC();
+    const char *n1 = rb_enc_name(enc1), *n2 = rb_enc_name(enc2);
+    compile_error(p, "%s mixed within %s source", n1, n2);
+    parser_show_error_line(p, &loc);
+}
 
-args_forward	: tBDOT3
-                    {
-                    /*%%%*/
-#ifdef FORWARD_ARGS_WITH_RUBY2_KEYWORDS
-                        $$ = 0;
-#else
-                        $$ = idFWD_KWREST;
-#endif
-                    /*% %*/
-                    /*% ripper: args_forward! %*/
-                    }
-                ;
+static void
+parser_mixed_escape(struct parser_params *p, const char *beg, rb_encoding *enc1, rb_encoding *enc2)
+{
+    const char *pos = p->lex.pcur;
+    p->lex.pcur = beg;
+    parser_mixed_error(p, enc1, enc2);
+    p->lex.pcur = pos;
+}
 
-f_bad_arg	: tCONSTANT
-                    {
-                        static const char mesg[] = "formal argument cannot be a constant";
-                    /*%%%*/
-                        yyerror1(&@1, mesg);
-                        $$ = 0;
-                    /*% %*/
-                    /*% ripper[error]: param_error!(ERR_MESG(), $1) %*/
-                    }
-                | tIVAR
-                    {
-                        static const char mesg[] = "formal argument cannot be an instance variable";
-                    /*%%%*/
-                        yyerror1(&@1, mesg);
-                        $$ = 0;
-                    /*% %*/
-                    /*% ripper[error]: param_error!(ERR_MESG(), $1) %*/
-                    }
-                | tGVAR
-                    {
-                        static const char mesg[] = "formal argument cannot be a global variable";
-                    /*%%%*/
-                        yyerror1(&@1, mesg);
-                        $$ = 0;
-                    /*% %*/
-                    /*% ripper[error]: param_error!(ERR_MESG(), $1) %*/
-                    }
-                | tCVAR
-                    {
-                        static const char mesg[] = "formal argument cannot be a class variable";
-                    /*%%%*/
-                        yyerror1(&@1, mesg);
-                        $$ = 0;
-                    /*% %*/
-                    /*% ripper[error]: param_error!(ERR_MESG(), $1) %*/
-                    }
-                ;
+static inline char
+nibble_char_upper(unsigned int c)
+{
+    c &= 0xf;
+    return c + (c < 10 ? '0' : 'A' - 10);
+}
 
-f_norm_arg	: f_bad_arg
-                | tIDENTIFIER
-                    {
-                        formal_argument(p, $1);
-                        p->max_numparam = ORDINAL_PARAM;
-                        $$ = $1;
-                    }
-                ;
+static int
+tokadd_string(struct parser_params *p,
+              int func, int term, int paren, long *nest,
+              rb_encoding **encp, rb_encoding **enc)
+{
+    int c;
+    bool erred = false;
+#ifdef RIPPER
+    const int heredoc_end = (p->heredoc_end ? p->heredoc_end + 1 : 0);
+    int top_of_line = FALSE;
+#endif
 
-f_arg_asgn	: f_norm_arg
-                    {
-                        ID id = get_id($1);
-                        arg_var(p, id);
-                        p->cur_arg = id;
-                        $$ = $1;
-                    }
-                ;
+#define mixed_error(enc1, enc2) \
+    (void)(erred || (parser_mixed_error(p, enc1, enc2), erred = true))
+#define mixed_escape(beg, enc1, enc2) \
+    (void)(erred || (parser_mixed_escape(p, beg, enc1, enc2), erred = true))
 
-f_arg_item	: f_arg_asgn
-                    {
-                        p->cur_arg = 0;
-                    /*%%%*/
-                        $$ = NEW_ARGS_AUX($1, 1, &NULL_LOC);
-                    /*% %*/
-                    /*% ripper: get_value($1) %*/
-                    }
-                | tLPAREN f_margs rparen
-                    {
-                    /*%%%*/
-                        ID tid = internal_id(p);
-                        YYLTYPE loc;
-                        loc.beg_pos = @2.beg_pos;
-                        loc.end_pos = @2.beg_pos;
-                        arg_var(p, tid);
-                        if (dyna_in_block(p)) {
-                            $2->nd_value = NEW_DVAR(tid, &loc);
-                        }
-                        else {
-                            $2->nd_value = NEW_LVAR(tid, &loc);
-                        }
-                        $$ = NEW_ARGS_AUX(tid, 1, &NULL_LOC);
-                        $$->nd_next = $2;
-                    /*% %*/
-                    /*% ripper: mlhs_paren!($2) %*/
-                    }
-                ;
+    while ((c = nextc(p)) != -1) {
+        if (p->heredoc_indent > 0) {
+            parser_update_heredoc_indent(p, c);
+        }
+#ifdef RIPPER
+        if (top_of_line && heredoc_end == p->ruby_sourceline) {
+            pushback(p, c);
+            break;
+        }
+#endif
 
-f_arg		: f_arg_item
-                    /*% ripper[brace]: rb_ary_new3(1, get_value($1)) %*/
-                | f_arg ',' f_arg_item
-                    {
-                    /*%%%*/
-                        $$ = $1;
-                        $$->nd_plen++;
-                        $$->nd_next = block_append(p, $$->nd_next, $3->nd_next);
-                        rb_discard_node(p, $3);
-                    /*% %*/
-                    /*% ripper: rb_ary_push($1, get_value($3)) %*/
+        if (paren && c == paren) {
+            ++*nest;
+        }
+        else if (c == term) {
+            if (!nest || !*nest) {
+                pushback(p, c);
+                break;
+            }
+            --*nest;
+        }
+        else if ((func & STR_FUNC_EXPAND) && c == '#' && !lex_eol_p(p)) {
+            unsigned char c2 = *p->lex.pcur;
+            if (c2 == '$' || c2 == '@' || c2 == '{') {
+                pushback(p, c);
+                break;
+            }
+        }
+        else if (c == '\\') {
+            c = nextc(p);
+            switch (c) {
+              case '\n':
+                if (func & STR_FUNC_QWORDS) break;
+                if (func & STR_FUNC_EXPAND) {
+                    if (!(func & STR_FUNC_INDENT) || (p->heredoc_indent < 0))
+                        continue;
+                    if (c == term) {
+                        c = '\\';
+                        goto terminate;
                     }
-                ;
+                }
+                tokadd(p, '\\');
+                break;
 
+              case '\\':
+                if (func & STR_FUNC_ESCAPE) tokadd(p, c);
+                break;
 
-f_label 	: tLABEL
-                    {
-                        arg_var(p, formal_argument(p, $1));
-                        p->cur_arg = get_id($1);
-                        p->max_numparam = ORDINAL_PARAM;
-                        p->ctxt.in_argdef = 0;
-                        $$ = $1;
-                    }
-                ;
+              case 'u':
+                if ((func & STR_FUNC_EXPAND) == 0) {
+                    tokadd(p, '\\');
+                    break;
+                }
+                tokadd_utf8(p, enc, term,
+                            func & STR_FUNC_SYMBOL,
+                            func & STR_FUNC_REGEXP);
+                continue;
 
-f_kw		: f_label arg_value
-                    {
-                        p->cur_arg = 0;
-                        p->ctxt.in_argdef = 1;
-                    /*%%%*/
-                        $$ = new_kw_arg(p, assignable(p, $1, $2, &@$), &@$);
-                    /*% %*/
-                    /*% ripper: rb_assoc_new(get_value(assignable(p, $1)), get_value($2)) %*/
-                    }
-                | f_label
-                    {
-                        p->cur_arg = 0;
-                        p->ctxt.in_argdef = 1;
-                    /*%%%*/
-                        $$ = new_kw_arg(p, assignable(p, $1, NODE_SPECIAL_REQUIRED_KEYWORD, &@$), &@$);
-                    /*% %*/
-                    /*% ripper: rb_assoc_new(get_value(assignable(p, $1)), 0) %*/
-                    }
-                ;
+              default:
+                if (c == -1) return -1;
+                if (!ISASCII(c)) {
+                    if ((func & STR_FUNC_EXPAND) == 0) tokadd(p, '\\');
+                    goto non_ascii;
+                }
+                if (func & STR_FUNC_REGEXP) {
+                    switch (c) {
+                      case 'c':
+                      case 'C':
+                      case 'M': {
+                        pushback(p, c);
+                        c = read_escape(p, 0, p->lex.pcur - 1);
 
-f_block_kw	: f_label primary_value
-                    {
-                        p->ctxt.in_argdef = 1;
-                    /*%%%*/
-                        $$ = new_kw_arg(p, assignable(p, $1, $2, &@$), &@$);
-                    /*% %*/
-                    /*% ripper: rb_assoc_new(get_value(assignable(p, $1)), get_value($2)) %*/
-                    }
-                | f_label
-                    {
-                        p->ctxt.in_argdef = 1;
-                    /*%%%*/
-                        $$ = new_kw_arg(p, assignable(p, $1, NODE_SPECIAL_REQUIRED_KEYWORD, &@$), &@$);
-                    /*% %*/
-                    /*% ripper: rb_assoc_new(get_value(assignable(p, $1)), 0) %*/
+                        char *t = tokspace(p, rb_strlen_lit("\\x00"));
+                        *t++ = '\\';
+                        *t++ = 'x';
+                        *t++ = nibble_char_upper(c >> 4);
+                        *t++ = nibble_char_upper(c);
+                        continue;
+                      }
                     }
-                ;
 
-f_block_kwarg	: f_block_kw
-                    {
-                    /*%%%*/
-                        $$ = $1;
-                    /*% %*/
-                    /*% ripper: rb_ary_new3(1, get_value($1)) %*/
+                    if (c == term && !simple_re_meta(c)) {
+                        tokadd(p, c);
+                        continue;
                     }
-                | f_block_kwarg ',' f_block_kw
-                    {
-                    /*%%%*/
-                        $$ = kwd_append($1, $3);
-                    /*% %*/
-                    /*% ripper: rb_ary_push($1, get_value($3)) %*/
+                    pushback(p, c);
+                    if ((c = tokadd_escape(p)) < 0)
+                        return -1;
+                    if (*enc && *enc != *encp) {
+                        mixed_escape(p->lex.ptok+2, *enc, *encp);
                     }
-                ;
-
+                    continue;
+                }
+                else if (func & STR_FUNC_EXPAND) {
+                    pushback(p, c);
+                    if (func & STR_FUNC_ESCAPE) tokadd(p, '\\');
+                    c = read_escape(p, 0, p->lex.pcur - 1);
+                }
+                else if ((func & STR_FUNC_QWORDS) && ISSPACE(c)) {
+                    /* ignore backslashed spaces in %w */
+                }
+                else if (c != term && !(paren && c == paren)) {
+                    tokadd(p, '\\');
+                    pushback(p, c);
+                    continue;
+                }
+            }
+        }
+        else if (!parser_isascii(p)) {
+          non_ascii:
+            if (!*enc) {
+                *enc = *encp;
+            }
+            else if (*enc != *encp) {
+                mixed_error(*enc, *encp);
+                continue;
+            }
+            if (tokadd_mbchar(p, c) == -1) return -1;
+            continue;
+        }
+        else if ((func & STR_FUNC_QWORDS) && ISSPACE(c)) {
+            pushback(p, c);
+            break;
+        }
+        if (c & 0x80) {
+            if (!*enc) {
+                *enc = *encp;
+            }
+            else if (*enc != *encp) {
+                mixed_error(*enc, *encp);
+                continue;
+            }
+        }
+        tokadd(p, c);
+#ifdef RIPPER
+        top_of_line = (c == '\n');
+#endif
+    }
+  terminate:
+    if (*enc) *encp = *enc;
+    return c;
+}
 
-f_kwarg		: f_kw
-                    {
-                    /*%%%*/
-                        $$ = $1;
-                    /*% %*/
-                    /*% ripper: rb_ary_new3(1, get_value($1)) %*/
-                    }
-                | f_kwarg ',' f_kw
-                    {
-                    /*%%%*/
-                        $$ = kwd_append($1, $3);
-                    /*% %*/
-                    /*% ripper: rb_ary_push($1, get_value($3)) %*/
-                    }
-                ;
+#define NEW_STRTERM(func, term, paren) new_strterm(p, func, term, paren)
 
-kwrest_mark	: tPOW
-                | tDSTAR
-                ;
+static void
+flush_string_content(struct parser_params *p, rb_encoding *enc, size_t back)
+{
+    p->lex.pcur -= back;
+    if (has_delayed_token(p)) {
+        ptrdiff_t len = p->lex.pcur - p->lex.ptok;
+        if (len > 0) {
+            rb_parser_enc_str_buf_cat(p, p->delayed.token, p->lex.ptok, len, enc);
+            p->delayed.end_line = p->ruby_sourceline;
+            p->delayed.end_col = rb_long2int(p->lex.pcur - p->lex.pbeg);
+        }
+        dispatch_delayed_token(p, tSTRING_CONTENT);
+        p->lex.ptok = p->lex.pcur;
+    }
+    dispatch_scan_event(p, tSTRING_CONTENT);
+    p->lex.pcur += back;
+}
 
-f_no_kwarg	: p_kwnorest
-                    {
-                    /*%%%*/
-                    /*% %*/
-                    /*% ripper: nokw_param!(Qnil) %*/
-                    }
-                ;
+/* this can be shared with ripper, since it's independent from struct
+ * parser_params. */
+#ifndef RIPPER
+#define BIT(c, idx) (((c) / 32 - 1 == idx) ? (1U << ((c) % 32)) : 0)
+#define SPECIAL_PUNCT(idx) ( \
+        BIT('~', idx) | BIT('*', idx) | BIT('$', idx) | BIT('?', idx) | \
+        BIT('!', idx) | BIT('@', idx) | BIT('/', idx) | BIT('\\', idx) | \
+        BIT(';', idx) | BIT(',', idx) | BIT('.', idx) | BIT('=', idx) | \
+        BIT(':', idx) | BIT('<', idx) | BIT('>', idx) | BIT('\"', idx) | \
+        BIT('&', idx) | BIT('`', idx) | BIT('\'', idx) | BIT('+', idx) | \
+        BIT('0', idx))
+const uint_least32_t ruby_global_name_punct_bits[] = {
+    SPECIAL_PUNCT(0),
+    SPECIAL_PUNCT(1),
+    SPECIAL_PUNCT(2),
+};
+#undef BIT
+#undef SPECIAL_PUNCT
+#endif
 
-f_kwrest	: kwrest_mark tIDENTIFIER
-                    {
-                        arg_var(p, shadowing_lvar(p, get_id($2)));
-                    /*%%%*/
-                        $$ = $2;
-                    /*% %*/
-                    /*% ripper: kwrest_param!($2) %*/
-                    }
-                | kwrest_mark
-                    {
-                        arg_var(p, idFWD_KWREST);
-                    /*%%%*/
-                        $$ = idFWD_KWREST;
-                    /*% %*/
-                    /*% ripper: kwrest_param!(Qnil) %*/
-                    }
-                ;
+static enum yytokentype
+parser_peek_variable_name(struct parser_params *p)
+{
+    int c;
+    const char *ptr = p->lex.pcur;
 
-f_opt		: f_arg_asgn f_eq arg_value
-                    {
-                        p->cur_arg = 0;
-                        p->ctxt.in_argdef = 1;
-                    /*%%%*/
-                        $$ = NEW_OPT_ARG(0, assignable(p, $1, $3, &@$), &@$);
-                    /*% %*/
-                    /*% ripper: rb_assoc_new(get_value(assignable(p, $1)), get_value($3)) %*/
-                    }
-                ;
+    if (lex_eol_ptr_n_p(p, ptr, 1)) return 0;
+    c = *ptr++;
+    switch (c) {
+      case '$':
+        if ((c = *ptr) == '-') {
+            if (lex_eol_ptr_p(p, ++ptr)) return 0;
+            c = *ptr;
+        }
+        else if (is_global_name_punct(c) || ISDIGIT(c)) {
+            return tSTRING_DVAR;
+        }
+        break;
+      case '@':
+        if ((c = *ptr) == '@') {
+            if (lex_eol_ptr_p(p, ++ptr)) return 0;
+            c = *ptr;
+        }
+        break;
+      case '{':
+        p->lex.pcur = ptr;
+        p->command_start = TRUE;
+        yylval.state = p->lex.state;
+        return tSTRING_DBEG;
+      default:
+        return 0;
+    }
+    if (!ISASCII(c) || c == '_' || ISALPHA(c))
+        return tSTRING_DVAR;
+    return 0;
+}
 
-f_block_opt	: f_arg_asgn f_eq primary_value
-                    {
-                        p->cur_arg = 0;
-                        p->ctxt.in_argdef = 1;
-                    /*%%%*/
-                        $$ = NEW_OPT_ARG(0, assignable(p, $1, $3, &@$), &@$);
-                    /*% %*/
-                    /*% ripper: rb_assoc_new(get_value(assignable(p, $1)), get_value($3)) %*/
-                    }
-                ;
+#define IS_ARG() IS_lex_state(EXPR_ARG_ANY)
+#define IS_END() IS_lex_state(EXPR_END_ANY)
+#define IS_BEG() (IS_lex_state(EXPR_BEG_ANY) || IS_lex_state_all(EXPR_ARG|EXPR_LABELED))
+#define IS_SPCARG(c) (IS_ARG() && space_seen && !ISSPACE(c))
+#define IS_LABEL_POSSIBLE() (\
+        (IS_lex_state(EXPR_LABEL|EXPR_ENDFN) && !cmd_state) || \
+        IS_ARG())
+#define IS_LABEL_SUFFIX(n) (peek_n(p, ':',(n)) && !peek_n(p, ':', (n)+1))
+#define IS_AFTER_OPERATOR() IS_lex_state(EXPR_FNAME | EXPR_DOT)
 
-f_block_optarg	: f_block_opt
-                    {
-                    /*%%%*/
-                        $$ = $1;
-                    /*% %*/
-                    /*% ripper: rb_ary_new3(1, get_value($1)) %*/
-                    }
-                | f_block_optarg ',' f_block_opt
-                    {
-                    /*%%%*/
-                        $$ = opt_arg_append($1, $3);
-                    /*% %*/
-                    /*% ripper: rb_ary_push($1, get_value($3)) %*/
-                    }
-                ;
+static inline enum yytokentype
+parser_string_term(struct parser_params *p, int func)
+{
+    xfree(p->lex.strterm);
+    p->lex.strterm = 0;
+    if (func & STR_FUNC_REGEXP) {
+        set_yylval_num(regx_options(p));
+        dispatch_scan_event(p, tREGEXP_END);
+        SET_LEX_STATE(EXPR_END);
+        return tREGEXP_END;
+    }
+    if ((func & STR_FUNC_LABEL) && IS_LABEL_SUFFIX(0)) {
+        nextc(p);
+        SET_LEX_STATE(EXPR_ARG|EXPR_LABELED);
+        return tLABEL_END;
+    }
+    SET_LEX_STATE(EXPR_END);
+    return tSTRING_END;
+}
 
-f_optarg	: f_opt
-                    {
-                    /*%%%*/
-                        $$ = $1;
-                    /*% %*/
-                    /*% ripper: rb_ary_new3(1, get_value($1)) %*/
-                    }
-                | f_optarg ',' f_opt
-                    {
-                    /*%%%*/
-                        $$ = opt_arg_append($1, $3);
-                    /*% %*/
-                    /*% ripper: rb_ary_push($1, get_value($3)) %*/
-                    }
-                ;
+static enum yytokentype
+parse_string(struct parser_params *p, rb_strterm_literal_t *quote)
+{
+    int func = quote->func;
+    int term = quote->term;
+    int paren = quote->paren;
+    int c, space = 0;
+    rb_encoding *enc = p->enc;
+    rb_encoding *base_enc = 0;
+    rb_parser_string_t *lit;
 
-restarg_mark	: '*'
-                | tSTAR
-                ;
+    if (func & STR_FUNC_TERM) {
+        if (func & STR_FUNC_QWORDS) nextc(p); /* delayed term */
+        SET_LEX_STATE(EXPR_END);
+        xfree(p->lex.strterm);
+        p->lex.strterm = 0;
+        return func & STR_FUNC_REGEXP ? tREGEXP_END : tSTRING_END;
+    }
+    c = nextc(p);
+    if ((func & STR_FUNC_QWORDS) && ISSPACE(c)) {
+        while (c != '\n' && ISSPACE(c = nextc(p)));
+        space = 1;
+    }
+    if (func & STR_FUNC_LIST) {
+        quote->func &= ~STR_FUNC_LIST;
+        space = 1;
+    }
+    if (c == term && !quote->nest) {
+        if (func & STR_FUNC_QWORDS) {
+            quote->func |= STR_FUNC_TERM;
+            pushback(p, c); /* dispatch the term at tSTRING_END */
+            add_delayed_token(p, p->lex.ptok, p->lex.pcur);
+            return ' ';
+        }
+        return parser_string_term(p, func);
+    }
+    if (space) {
+        if (!ISSPACE(c)) pushback(p, c);
+        add_delayed_token(p, p->lex.ptok, p->lex.pcur);
+        return ' ';
+    }
+    newtok(p);
+    if ((func & STR_FUNC_EXPAND) && c == '#') {
+        enum yytokentype t = parser_peek_variable_name(p);
+        if (t) return t;
+        tokadd(p, '#');
+        c = nextc(p);
+    }
+    pushback(p, c);
+    if (tokadd_string(p, func, term, paren, &quote->nest,
+                      &enc, &base_enc) == -1) {
+        if (p->eofp) {
+#ifndef RIPPER
+# define unterminated_literal(mesg) yyerror0(mesg)
+#else
+# define unterminated_literal(mesg) compile_error(p, mesg)
+#endif
+            literal_flush(p, p->lex.pcur);
+            if (func & STR_FUNC_QWORDS) {
+                /* no content to add, bailing out here */
+                unterminated_literal("unterminated list meets end of file");
+                xfree(p->lex.strterm);
+                p->lex.strterm = 0;
+                return tSTRING_END;
+            }
+            if (func & STR_FUNC_REGEXP) {
+                unterminated_literal("unterminated regexp meets end of file");
+            }
+            else {
+                unterminated_literal("unterminated string meets end of file");
+            }
+            quote->func |= STR_FUNC_TERM;
+        }
+    }
 
-f_rest_arg	: restarg_mark tIDENTIFIER
-                    {
-                        arg_var(p, shadowing_lvar(p, get_id($2)));
-                    /*%%%*/
-                        $$ = $2;
-                    /*% %*/
-                    /*% ripper: rest_param!($2) %*/
-                    }
-                | restarg_mark
-                    {
-                        arg_var(p, idFWD_REST);
-                    /*%%%*/
-                        $$ = idFWD_REST;
-                    /*% %*/
-                    /*% ripper: rest_param!(Qnil) %*/
-                    }
-                ;
+    tokfix(p);
+    lit = STR_NEW3(tok(p), toklen(p), enc, func);
+    set_yylval_str(lit);
+    flush_string_content(p, enc, 0);
 
-blkarg_mark	: '&'
-                | tAMPER
-                ;
+    return tSTRING_CONTENT;
+}
 
-f_block_arg	: blkarg_mark tIDENTIFIER
-                    {
-                        arg_var(p, shadowing_lvar(p, get_id($2)));
-                    /*%%%*/
-                        $$ = $2;
-                    /*% %*/
-                    /*% ripper: blockarg!($2) %*/
-                    }
-                | blkarg_mark
-                    {
-                        arg_var(p, idFWD_BLOCK);
-                    /*%%%*/
-                        $$ = idFWD_BLOCK;
-                    /*% %*/
-                    /*% ripper: blockarg!(Qnil) %*/
-                    }
-                ;
+static enum yytokentype
+heredoc_identifier(struct parser_params *p)
+{
+    /*
+     * term_len is length of `<<"END"` except `END`,
+     * in this case term_len is 4 (<, <, " and ").
+     */
+    long len, offset = p->lex.pcur - p->lex.pbeg;
+    int c = nextc(p), term, func = 0, quote = 0;
+    enum yytokentype token = tSTRING_BEG;
+    int indent = 0;
 
-opt_f_block_arg	: ',' f_block_arg
-                    {
-                        $$ = $2;
-                    }
-                | none
-                    {
-                        $$ = Qnull;
-                    }
-                ;
+    if (c == '-') {
+        c = nextc(p);
+        func = STR_FUNC_INDENT;
+        offset++;
+    }
+    else if (c == '~') {
+        c = nextc(p);
+        func = STR_FUNC_INDENT;
+        offset++;
+        indent = INT_MAX;
+    }
+    switch (c) {
+      case '\'':
+        func |= str_squote; goto quoted;
+      case '"':
+        func |= str_dquote; goto quoted;
+      case '`':
+        token = tXSTRING_BEG;
+        func |= str_xquote; goto quoted;
 
-singleton	: var_ref
-                    {
-                        value_expr($1);
-                        $$ = $1;
-                    }
-                | '(' {SET_LEX_STATE(EXPR_BEG);} expr rparen
-                    {
-                    /*%%%*/
-                        switch (nd_type($3)) {
-                          case NODE_STR:
-                          case NODE_DSTR:
-                          case NODE_XSTR:
-                          case NODE_DXSTR:
-                          case NODE_DREGX:
-                          case NODE_LIT:
-                          case NODE_LIST:
-                          case NODE_ZLIST:
-                            yyerror1(&@3, "can't define singleton method for literals");
-                            break;
-                          default:
-                            value_expr($3);
-                            break;
-                        }
-                        $$ = $3;
-                    /*% %*/
-                    /*% ripper: paren!($3) %*/
-                    }
-                ;
+      quoted:
+        quote++;
+        offset++;
+        term = c;
+        len = 0;
+        while ((c = nextc(p)) != term) {
+            if (c == -1 || c == '\r' || c == '\n') {
+                yyerror0("unterminated here document identifier");
+                return -1;
+            }
+        }
+        break;
 
-assoc_list	: none
-                | assocs trailer
-                    {
-                    /*%%%*/
-                        $$ = $1;
-                    /*% %*/
-                    /*% ripper: assoclist_from_args!($1) %*/
-                    }
-                ;
+      default:
+        if (!parser_is_identchar(p)) {
+            pushback(p, c);
+            if (func & STR_FUNC_INDENT) {
+                pushback(p, indent > 0 ? '~' : '-');
+            }
+            return 0;
+        }
+        func |= str_dquote;
+        do {
+            int n = parser_precise_mbclen(p, p->lex.pcur-1);
+            if (n < 0) return 0;
+            p->lex.pcur += --n;
+        } while ((c = nextc(p)) != -1 && parser_is_identchar(p));
+        pushback(p, c);
+        break;
+    }
 
-assocs		: assoc
-                    /*% ripper[brace]: rb_ary_new3(1, get_value($1)) %*/
-                | assocs ',' assoc
-                    {
-                    /*%%%*/
-                        NODE *assocs = $1;
-                        NODE *tail = $3;
-                        if (!assocs) {
-                            assocs = tail;
-                        }
-                        else if (tail) {
-                            if (assocs->nd_head &&
-                                !tail->nd_head && nd_type_p(tail->nd_next, NODE_LIST) &&
-                                nd_type_p(tail->nd_next->nd_head, NODE_HASH)) {
-                                /* DSTAR */
-                                tail = tail->nd_next->nd_head->nd_head;
-                            }
-                            assocs = list_concat(assocs, tail);
-                        }
-                        $$ = assocs;
-                    /*% %*/
-                    /*% ripper: rb_ary_push($1, get_value($3)) %*/
-                    }
-                ;
+    len = p->lex.pcur - (p->lex.pbeg + offset) - quote;
+    if ((unsigned long)len >= HERETERM_LENGTH_MAX)
+        yyerror0("too long here document identifier");
+    dispatch_scan_event(p, tHEREDOC_BEG);
+    lex_goto_eol(p);
 
-assoc		: arg_value tASSOC arg_value
-                    {
-                    /*%%%*/
-                        if (nd_type_p($1, NODE_STR)) {
-                            nd_set_type($1, NODE_LIT);
-                            RB_OBJ_WRITE(p->ast, &$1->nd_lit, rb_fstring($1->nd_lit));
-                        }
-                        $$ = list_append(p, NEW_LIST($1, &@$), $3);
-                    /*% %*/
-                    /*% ripper: assoc_new!($1, $3) %*/
-                    }
-                | tLABEL arg_value
-                    {
-                    /*%%%*/
-                        $$ = list_append(p, NEW_LIST(NEW_LIT(ID2SYM($1), &@1), &@$), $2);
-                    /*% %*/
-                    /*% ripper: assoc_new!($1, $2) %*/
-                    }
-                | tLABEL
-                    {
-                    /*%%%*/
-                        NODE *val = gettable(p, $1, &@$);
-                        if (!val) val = NEW_BEGIN(0, &@$);
-                        $$ = list_append(p, NEW_LIST(NEW_LIT(ID2SYM($1), &@1), &@$), val);
-                    /*% %*/
-                    /*% ripper: assoc_new!($1, Qnil) %*/
-                    }
-                | tSTRING_BEG string_contents tLABEL_END arg_value
-                    {
-                    /*%%%*/
-                        YYLTYPE loc = code_loc_gen(&@1, &@3);
-                        $$ = list_append(p, NEW_LIST(dsym_node(p, $2, &loc), &loc), $4);
-                    /*% %*/
-                    /*% ripper: assoc_new!(dyna_symbol!($2), $4) %*/
-                    }
-                | tDSTAR arg_value
-                    {
-                    /*%%%*/
-                        if (nd_type_p($2, NODE_HASH) &&
-                            !($2->nd_head && $2->nd_head->nd_alen)) {
-                            static VALUE empty_hash;
-                            if (!empty_hash) {
-                                empty_hash = rb_obj_freeze(rb_hash_new());
-                                rb_gc_register_mark_object(empty_hash);
-                            }
-                            $$ = list_append(p, NEW_LIST(0, &@$), NEW_LIT(empty_hash, &@$));
-                        }
-                        else
-                            $$ = list_append(p, NEW_LIST(0, &@$), $2);
-                    /*% %*/
-                    /*% ripper: assoc_splat!($2) %*/
-                    }
-                | tDSTAR
-                    {
-                        if (!local_id(p, idFWD_KWREST) ||
-                            local_id(p, idFWD_ALL)) {
-                            compile_error(p, "no anonymous keyword rest parameter");
-                        }
-                    /*%%%*/
-                        $$ = list_append(p, NEW_LIST(0, &@$),
-                                         NEW_LVAR(idFWD_KWREST, &@$));
-                    /*% %*/
-                    /*% ripper: assoc_splat!(Qnil) %*/
-                    }
-                ;
+    p->lex.strterm = new_heredoc(p);
+    rb_strterm_heredoc_t *here = &p->lex.strterm->u.heredoc;
+    here->offset = offset;
+    here->sourceline = p->ruby_sourceline;
+    here->length = (unsigned)len;
+    here->quote = quote;
+    here->func = func;
+    here->lastline = p->lex.lastline;
 
-operation	: tIDENTIFIER
-                | tCONSTANT
-                | tFID
-                ;
+    token_flush(p);
+    p->heredoc_indent = indent;
+    p->heredoc_line_indent = 0;
+    return token;
+}
 
-operation2	: operation
-                | op
-                ;
+static void
+heredoc_restore(struct parser_params *p, rb_strterm_heredoc_t *here)
+{
+    rb_parser_string_t *line;
+    rb_strterm_t *term = p->lex.strterm;
 
-operation3	: tIDENTIFIER
-                | tFID
-                | op
-                ;
+    p->lex.strterm = 0;
+    line = here->lastline;
+    p->lex.lastline = line;
+    p->lex.pbeg = PARSER_STRING_PTR(line);
+    p->lex.pend = p->lex.pbeg + PARSER_STRING_LEN(line);
+    p->lex.pcur = p->lex.pbeg + here->offset + here->length + here->quote;
+    p->lex.ptok = p->lex.pbeg + here->offset - here->quote;
+    p->heredoc_end = p->ruby_sourceline;
+    p->ruby_sourceline = (int)here->sourceline;
+    if (p->eofp) p->lex.nextline = AFTER_HEREDOC_WITHOUT_TERMINATOR;
+    p->eofp = 0;
+    xfree(term);
+}
 
-dot_or_colon	: '.'
-                | tCOLON2
-                ;
+static int
+dedent_string_column(const char *str, long len, int width)
+{
+    int i, col = 0;
 
-call_op 	: '.'
-                | tANDDOT
-                ;
+    for (i = 0; i < len && col < width; i++) {
+        if (str[i] == ' ') {
+            col++;
+        }
+        else if (str[i] == '\t') {
+            int n = TAB_WIDTH * (col / TAB_WIDTH + 1);
+            if (n > width) break;
+            col = n;
+        }
+        else {
+            break;
+        }
+    }
 
-call_op2	: call_op
-                | tCOLON2
-                ;
+    return i;
+}
 
-opt_terms	: /* none */
-                | terms
-                ;
+static int
+dedent_string(struct parser_params *p, rb_parser_string_t *string, int width)
+{
+    char *str;
+    long len;
+    int i;
 
-opt_nl		: /* none */
-                | '\n'
-                ;
+    len = PARSER_STRING_LEN(string);
+    str = PARSER_STRING_PTR(string);
 
-rparen		: opt_nl ')'
-                ;
+    i = dedent_string_column(str, len, width);
+    if (!i) return 0;
 
-rbracket	: opt_nl ']'
-                ;
+    rb_parser_str_modify(string);
+    str = PARSER_STRING_PTR(string);
+    if (PARSER_STRING_LEN(string) != len)
+        rb_fatal("literal string changed: %s", PARSER_STRING_PTR(string));
+    MEMMOVE(str, str + i, char, len - i);
+    rb_parser_str_set_len(p, string, len - i);
+    return i;
+}
 
-rbrace		: opt_nl '}'
-                ;
+static NODE *
+heredoc_dedent(struct parser_params *p, NODE *root)
+{
+    NODE *node, *str_node, *prev_node;
+    int indent = p->heredoc_indent;
+    rb_parser_string_t *prev_lit = 0;
 
-trailer		: opt_nl
-                | ','
-                ;
+    if (indent <= 0) return root;
+    if (!root) return root;
 
-term		: ';' {yyerrok;token_flush(p);}
-                | '\n'
-                    {
-                        @$.end_pos = @$.beg_pos;
-                        token_flush(p);
-                    }
-                ;
+    prev_node = node = str_node = root;
+    if (nd_type_p(root, NODE_LIST)) str_node = RNODE_LIST(root)->nd_head;
 
-terms		: term
-                | terms ';' {yyerrok;}
-                ;
+    while (str_node) {
+        rb_parser_string_t *lit = RNODE_STR(str_node)->string;
+        if (nd_fl_newline(str_node)) {
+            dedent_string(p, lit, indent);
+        }
+        if (!prev_lit) {
+            prev_lit = lit;
+        }
+        else if (!literal_concat0(p, prev_lit, lit)) {
+            return 0;
+        }
+        else {
+            NODE *end = RNODE_LIST(node)->as.nd_end;
+            node = RNODE_LIST(prev_node)->nd_next = RNODE_LIST(node)->nd_next;
+            if (!node) {
+                if (nd_type_p(prev_node, NODE_DSTR))
+                    nd_set_type(prev_node, NODE_STR);
+                break;
+            }
+            RNODE_LIST(node)->as.nd_end = end;
+            goto next_str;
+        }
 
-none		: /* none */
-                    {
-                        $$ = Qnull;
-                    }
-                ;
-%%
-# undef p
-# undef yylex
-# undef yylval
-# define yylval  (*p->lval)
+        str_node = 0;
+        while ((nd_type_p(node, NODE_LIST) || nd_type_p(node, NODE_DSTR)) && (node = RNODE_LIST(prev_node = node)->nd_next) != 0) {
+          next_str:
+            if (!nd_type_p(node, NODE_LIST)) break;
+            if ((str_node = RNODE_LIST(node)->nd_head) != 0) {
+                enum node_type type = nd_type(str_node);
+                if (type == NODE_STR || type == NODE_DSTR) break;
+                prev_lit = 0;
+                str_node = 0;
+            }
+        }
+    }
+    return root;
+}
 
-static int regx_options(struct parser_params*);
-static int tokadd_string(struct parser_params*,int,int,int,long*,rb_encoding**,rb_encoding**);
-static void tokaddmbc(struct parser_params *p, int c, rb_encoding *enc);
-static enum yytokentype parse_string(struct parser_params*,rb_strterm_literal_t*);
-static enum yytokentype here_document(struct parser_params*,rb_strterm_heredoc_t*);
+static int
+whole_match_p(struct parser_params *p, const char *eos, long len, int indent)
+{
+    const char *beg = p->lex.pbeg;
+    const char *ptr = p->lex.pend;
 
-#ifndef RIPPER
-# define set_yylval_node(x) {				\
-  YYLTYPE _cur_loc;					\
-  rb_parser_set_location(p, &_cur_loc);			\
-  yylval.node = (x);					\
+    if (ptr - beg < len) return FALSE;
+    if (ptr > beg && ptr[-1] == '\n') {
+        if (--ptr > beg && ptr[-1] == '\r') --ptr;
+        if (ptr - beg < len) return FALSE;
+    }
+    if (strncmp(eos, ptr -= len, len)) return FALSE;
+    if (indent) {
+        while (beg < ptr && ISSPACE(*beg)) beg++;
+    }
+    return beg == ptr;
 }
-# define set_yylval_str(x) \
-do { \
-  set_yylval_node(NEW_STR(x, &_cur_loc)); \
-  RB_OBJ_WRITTEN(p->ast, Qnil, x); \
-} while(0)
-# define set_yylval_literal(x) \
-do { \
-  set_yylval_node(NEW_LIT(x, &_cur_loc)); \
-  RB_OBJ_WRITTEN(p->ast, Qnil, x); \
-} while(0)
-# define set_yylval_num(x) (yylval.num = (x))
-# define set_yylval_id(x)  (yylval.id = (x))
-# define set_yylval_name(x)  (yylval.id = (x))
-# define yylval_id() (yylval.id)
-#else
-static inline VALUE
-ripper_yylval_id(struct parser_params *p, ID x)
-{
-    return ripper_new_yylval(p, x, ID2SYM(x), 0);
-}
-# define set_yylval_str(x) (yylval.val = add_mark_object(p, (x)))
-# define set_yylval_num(x) (yylval.val = ripper_new_yylval(p, (x), 0, 0))
-# define set_yylval_id(x)  (void)(x)
-# define set_yylval_name(x) (void)(yylval.val = ripper_yylval_id(p, x))
-# define set_yylval_literal(x) add_mark_object(p, (x))
-# define set_yylval_node(x) (yylval.val = ripper_new_yylval(p, 0, 0, STR_NEW(p->lex.ptok, p->lex.pcur-p->lex.ptok)))
-# define yylval_id() yylval.id
-# define _cur_loc NULL_LOC /* dummy */
-#endif
 
-#define set_yylval_noname() set_yylval_id(keyword_nil)
-#define has_delayed_token(p) (!NIL_P(p->delayed.token))
+static int
+word_match_p(struct parser_params *p, const char *word, long len)
+{
+    if (strncmp(p->lex.pcur, word, len)) return 0;
+    if (lex_eol_n_p(p, len)) return 1;
+    int c = (unsigned char)p->lex.pcur[len];
+    if (ISSPACE(c)) return 1;
+    switch (c) {
+      case '\0': case '\004': case '\032': return 1;
+    }
+    return 0;
+}
 
-#ifndef RIPPER
-#define literal_flush(p, ptr) ((p)->lex.ptok = (ptr))
-#define dispatch_scan_event(p, t) parser_dispatch_scan_event(p, t, __LINE__)
+#define NUM_SUFFIX_R   (1<<0)
+#define NUM_SUFFIX_I   (1<<1)
+#define NUM_SUFFIX_ALL 3
 
-static bool
-parser_has_token(struct parser_params *p)
+static int
+number_literal_suffix(struct parser_params *p, int mask)
 {
-    const char *const pcur = p->lex.pcur;
-    const char *const ptok = p->lex.ptok;
-    if (p->keep_tokens && (pcur < ptok)) {
-        rb_bug("lex.pcur < lex.ptok. (line: %d) %"PRIdPTRDIFF"|%"PRIdPTRDIFF"|%"PRIdPTRDIFF"",
-               p->ruby_sourceline, ptok - p->lex.pbeg, pcur - ptok, p->lex.pend - pcur);
+    int c, result = 0;
+    const char *lastp = p->lex.pcur;
+
+    while ((c = nextc(p)) != -1) {
+        if ((mask & NUM_SUFFIX_I) && c == 'i') {
+            result |= (mask & NUM_SUFFIX_I);
+            mask &= ~NUM_SUFFIX_I;
+            /* r after i, rational of complex is disallowed */
+            mask &= ~NUM_SUFFIX_R;
+            continue;
+        }
+        if ((mask & NUM_SUFFIX_R) && c == 'r') {
+            result |= (mask & NUM_SUFFIX_R);
+            mask &= ~NUM_SUFFIX_R;
+            continue;
+        }
+        if (!ISASCII(c) || ISALPHA(c) || c == '_') {
+            p->lex.pcur = lastp;
+            literal_flush(p, p->lex.pcur);
+            return 0;
+        }
+        pushback(p, c);
+        break;
     }
-    return pcur > ptok;
+    return result;
 }
 
-static VALUE
-code_loc_to_ary(struct parser_params *p, const rb_code_location_t *loc)
+static enum yytokentype
+set_number_literal(struct parser_params *p, enum yytokentype type, int suffix, int base, int seen_point)
 {
-    VALUE ary = rb_ary_new_from_args(4,
-        INT2NUM(loc->beg_pos.lineno), INT2NUM(loc->beg_pos.column),
-        INT2NUM(loc->end_pos.lineno), INT2NUM(loc->end_pos.column));
-    rb_obj_freeze(ary);
-
-    return ary;
-}
+    enum rb_numeric_type numeric_type = integer_literal;
 
-static void
-parser_append_tokens(struct parser_params *p, VALUE str, enum yytokentype t, int line)
-{
-    VALUE ary;
-    int token_id;
+    if (type == tFLOAT) {
+        numeric_type = float_literal;
+    }
 
-    ary = rb_ary_new2(4);
-    token_id = p->token_id;
-    rb_ary_push(ary, INT2FIX(token_id));
-    rb_ary_push(ary, ID2SYM(parser_token2id(p, t)));
-    rb_ary_push(ary, str);
-    rb_ary_push(ary, code_loc_to_ary(p, p->yylloc));
-    rb_obj_freeze(ary);
-    rb_ary_push(p->tokens, ary);
-    p->token_id++;
+    if (suffix & NUM_SUFFIX_R) {
+        type = tRATIONAL;
+        numeric_type = rational_literal;
+    }
+    if (suffix & NUM_SUFFIX_I) {
+        type = tIMAGINARY;
+    }
 
-    if (p->debug) {
-        rb_parser_printf(p, "Append tokens (line: %d) %"PRIsVALUE"\n", line, ary);
+    switch (type) {
+      case tINTEGER:
+        set_yylval_node(NEW_INTEGER(strdup(tok(p)), base, &_cur_loc));
+        break;
+      case tFLOAT:
+        set_yylval_node(NEW_FLOAT(strdup(tok(p)), &_cur_loc));
+        break;
+      case tRATIONAL:
+        set_yylval_node(NEW_RATIONAL(strdup(tok(p)), base, seen_point, &_cur_loc));
+        break;
+      case tIMAGINARY:
+        set_yylval_node(NEW_IMAGINARY(strdup(tok(p)), base, seen_point, numeric_type, &_cur_loc));
+        (void)numeric_type;     /* for ripper */
+        break;
+      default:
+        rb_bug("unexpected token: %d", type);
     }
+    SET_LEX_STATE(EXPR_END);
+    return type;
 }
 
+#define dispatch_heredoc_end(p) parser_dispatch_heredoc_end(p, __LINE__)
 static void
-parser_dispatch_scan_event(struct parser_params *p, enum yytokentype t, int line)
+parser_dispatch_heredoc_end(struct parser_params *p, int line)
 {
-    debug_token_line(p, "parser_dispatch_scan_event", line);
-
-    if (!parser_has_token(p)) return;
-
-    RUBY_SET_YYLLOC(*p->yylloc);
+    if (has_delayed_token(p))
+        dispatch_delayed_token(p, tSTRING_CONTENT);
 
+#ifdef RIPPER
+    VALUE str = STR_NEW(p->lex.ptok, p->lex.pend - p->lex.ptok);
+    ripper_dispatch1(p, ripper_token2eventid(tHEREDOC_END), str);
+#else
     if (p->keep_tokens) {
-        VALUE str = STR_NEW(p->lex.ptok, p->lex.pcur - p->lex.ptok);
-        parser_append_tokens(p, str, t, line);
+        rb_parser_string_t *str = rb_parser_encoding_string_new(p, p->lex.ptok, p->lex.pend - p->lex.ptok, p->enc);
+        RUBY_SET_YYLLOC_OF_HEREDOC_END(*p->yylloc);
+        parser_append_tokens(p, str, tHEREDOC_END, line);
     }
+#endif
 
+    RUBY_SET_YYLLOC_FROM_STRTERM_HEREDOC(*p->yylloc);
+    lex_goto_eol(p);
     token_flush(p);
 }
 
-#define dispatch_delayed_token(p, t) parser_dispatch_delayed_token(p, t, __LINE__)
-static void
-parser_dispatch_delayed_token(struct parser_params *p, enum yytokentype t, int line)
+static enum yytokentype
+here_document(struct parser_params *p, rb_strterm_heredoc_t *here)
 {
-    int saved_line = p->ruby_sourceline;
-    const char *saved_tokp = p->lex.ptok;
-
-    debug_token_line(p, "parser_dispatch_delayed_token", line);
-
-    if (!has_delayed_token(p)) return;
+    int c, func, indent = 0;
+    const char *eos, *ptr, *ptr_end;
+    long len;
+    rb_parser_string_t *str = 0;
+    rb_encoding *enc = p->enc;
+    rb_encoding *base_enc = 0;
+    int bol;
+#ifdef RIPPER
+    VALUE s_value;
+#endif
 
-    RUBY_SET_YYLLOC_OF_DELAYED_TOKEN(*p->yylloc);
+    eos = PARSER_STRING_PTR(here->lastline) + here->offset;
+    len = here->length;
+    indent = (func = here->func) & STR_FUNC_INDENT;
 
-    if (p->keep_tokens) {
-        p->ruby_sourceline = p->delayed.beg_line;
-        p->lex.ptok = p->lex.pbeg + p->delayed.beg_col;
-        parser_append_tokens(p, p->delayed.token, t, line);
-        p->ruby_sourceline = saved_line;
-        p->lex.ptok = saved_tokp;
+    if ((c = nextc(p)) == -1) {
+      error:
+#ifdef RIPPER
+        if (!has_delayed_token(p)) {
+            dispatch_scan_event(p, tSTRING_CONTENT);
+        }
+        else if (p->delayed.end_line + 1 == p->ruby_sourceline) {
+            if ((len = p->lex.pcur - p->lex.ptok) > 0) {
+                if (!(func & STR_FUNC_REGEXP)) {
+                    int cr = ENC_CODERANGE_UNKNOWN;
+                    rb_str_coderange_scan_restartable(p->lex.ptok, p->lex.pcur, enc, &cr);
+                    if (cr != ENC_CODERANGE_7BIT &&
+                        rb_is_usascii_enc(p->enc) &&
+                        enc != rb_utf8_encoding()) {
+                        enc = rb_ascii8bit_encoding();
+                    }
+                }
+                rb_parser_enc_str_buf_cat(p, p->delayed.token, p->lex.ptok, len, enc);
+            }
+            dispatch_delayed_token(p, tSTRING_CONTENT);
+        }
+        else {
+            dispatch_delayed_token(p, tSTRING_CONTENT);
+            dispatch_scan_event(p, tSTRING_CONTENT);
+        }
+        lex_goto_eol(p);
+#endif
+        heredoc_restore(p, &p->lex.strterm->u.heredoc);
+        compile_error(p, "can't find string \"%.*s\" anywhere before EOF",
+                      (int)len, eos);
+        token_flush(p);
+        SET_LEX_STATE(EXPR_END);
+        return tSTRING_END;
+    }
+    bol = was_bol(p);
+    if (!bol) {
+        /* not beginning of line, cannot be the terminator */
+    }
+    else if (p->heredoc_line_indent == -1) {
+        /* `heredoc_line_indent == -1` means
+         * - "after an interpolation in the same line", or
+         * - "in a continuing line"
+         */
+        p->heredoc_line_indent = 0;
+    }
+    else if (whole_match_p(p, eos, len, indent)) {
+        dispatch_heredoc_end(p);
+      restore:
+        heredoc_restore(p, &p->lex.strterm->u.heredoc);
+        token_flush(p);
+        SET_LEX_STATE(EXPR_END);
+        return tSTRING_END;
     }
 
-    p->delayed.token = Qnil;
-}
-#else
-#define literal_flush(p, ptr) ((void)(ptr))
-
-#define yylval_rval (*(RB_TYPE_P(yylval.val, T_NODE) ? &yylval.node->nd_rval : &yylval.val))
+    if (!(func & STR_FUNC_EXPAND)) {
+        do {
+            ptr = PARSER_STRING_PTR(p->lex.lastline);
+            ptr_end = p->lex.pend;
+            if (ptr_end > ptr) {
+                switch (ptr_end[-1]) {
+                  case '\n':
+                    if (--ptr_end == ptr || ptr_end[-1] != '\r') {
+                        ptr_end++;
+                        break;
+                    }
+                  case '\r':
+                    --ptr_end;
+                }
+            }
 
-static int
-ripper_has_scan_event(struct parser_params *p)
-{
-    if (p->lex.pcur < p->lex.ptok) rb_raise(rb_eRuntimeError, "lex.pcur < lex.ptok");
-    return p->lex.pcur > p->lex.ptok;
-}
+            if (p->heredoc_indent > 0) {
+                long i = 0;
+                while (ptr + i < ptr_end && parser_update_heredoc_indent(p, ptr[i]))
+                    i++;
+                p->heredoc_line_indent = 0;
+            }
 
-static VALUE
-ripper_scan_event_val(struct parser_params *p, enum yytokentype t)
-{
-    VALUE str = STR_NEW(p->lex.ptok, p->lex.pcur - p->lex.ptok);
-    VALUE rval = ripper_dispatch1(p, ripper_token2eventid(t), str);
-    RUBY_SET_YYLLOC(*p->yylloc);
+            if (str)
+                parser_str_cat(str, ptr, ptr_end - ptr);
+            else
+                str = rb_parser_encoding_string_new(p, ptr, ptr_end - ptr, enc);
+            if (!lex_eol_ptr_p(p, ptr_end)) parser_str_cat_cstr(str, "\n");
+            lex_goto_eol(p);
+            if (p->heredoc_indent > 0) {
+                goto flush_str;
+            }
+            if (nextc(p) == -1) {
+                if (str) {
+                    rb_parser_string_free(p, str);
+                    str = 0;
+                }
+                goto error;
+            }
+        } while (!whole_match_p(p, eos, len, indent));
+    }
+    else {
+        /*	int mb = ENC_CODERANGE_7BIT, *mbp = &mb;*/
+        newtok(p);
+        if (c == '#') {
+            enum yytokentype t = parser_peek_variable_name(p);
+            if (p->heredoc_line_indent != -1) {
+                if (p->heredoc_indent > p->heredoc_line_indent) {
+                    p->heredoc_indent = p->heredoc_line_indent;
+                }
+                p->heredoc_line_indent = -1;
+            }
+            if (t) return t;
+            tokadd(p, '#');
+            c = nextc(p);
+        }
+        do {
+            pushback(p, c);
+            enc = p->enc;
+            if ((c = tokadd_string(p, func, '\n', 0, NULL, &enc, &base_enc)) == -1) {
+                if (p->eofp) goto error;
+                goto restore;
+            }
+            if (c != '\n') {
+                if (c == '\\') p->heredoc_line_indent = -1;
+              flush:
+                str = STR_NEW3(tok(p), toklen(p), enc, func);
+              flush_str:
+                set_yylval_str(str);
+#ifndef RIPPER
+                if (bol) nd_set_fl_newline(yylval.node);
+#endif
+                flush_string_content(p, enc, 0);
+                return tSTRING_CONTENT;
+            }
+            tokadd(p, nextc(p));
+            if (p->heredoc_indent > 0) {
+                lex_goto_eol(p);
+                goto flush;
+            }
+            /*	    if (mbp && mb == ENC_CODERANGE_UNKNOWN) mbp = 0;*/
+            if ((c = nextc(p)) == -1) goto error;
+        } while (!whole_match_p(p, eos, len, indent));
+        str = STR_NEW3(tok(p), toklen(p), enc, func);
+    }
+    dispatch_heredoc_end(p);
+    heredoc_restore(p, &p->lex.strterm->u.heredoc);
     token_flush(p);
-    return rval;
-}
-
-static void
-ripper_dispatch_scan_event(struct parser_params *p, enum yytokentype t)
-{
-    if (!ripper_has_scan_event(p)) return;
-    add_mark_object(p, yylval_rval = ripper_scan_event_val(p, t));
-}
-#define dispatch_scan_event(p, t) ripper_dispatch_scan_event(p, t)
-
-static void
-ripper_dispatch_delayed_token(struct parser_params *p, enum yytokentype t)
-{
-    int saved_line = p->ruby_sourceline;
-    const char *saved_tokp = p->lex.ptok;
-
-    if (!has_delayed_token(p)) return;
-    p->ruby_sourceline = p->delayed.beg_line;
-    p->lex.ptok = p->lex.pbeg + p->delayed.beg_col;
-    add_mark_object(p, yylval_rval = ripper_dispatch1(p, ripper_token2eventid(t), p->delayed.token));
-    p->delayed.token = Qnil;
-    p->ruby_sourceline = saved_line;
-    p->lex.ptok = saved_tokp;
-}
-#define dispatch_delayed_token(p, t) ripper_dispatch_delayed_token(p, t)
-#endif /* RIPPER */
-
-static inline int
-is_identchar(struct parser_params *p, const char *ptr, const char *MAYBE_UNUSED(ptr_end), rb_encoding *enc)
-{
-    return rb_enc_isalnum((unsigned char)*ptr, enc) || *ptr == '_' || !ISASCII(*ptr);
-}
-
-static inline int
-parser_is_identchar(struct parser_params *p)
-{
-    return !(p)->eofp && is_identchar(p, p->lex.pcur-1, p->lex.pend, p->enc);
-}
+    p->lex.strterm = NEW_STRTERM(func | STR_FUNC_TERM, 0, 0);
+#ifdef RIPPER
+    /* Preserve s_value for set_yylval_str */
+    s_value = p->s_value;
+#endif
+    set_yylval_str(str);
+#ifdef RIPPER
+    set_parser_s_value(s_value);
+#endif
 
-static inline int
-parser_isascii(struct parser_params *p)
-{
-    return ISASCII(*(p->lex.pcur-1));
+#ifndef RIPPER
+    if (bol) nd_set_fl_newline(yylval.node);
+#endif
+    return tSTRING_CONTENT;
 }
 
-static void
-token_info_setup(token_info *ptinfo, const char *ptr, const rb_code_location_t *loc)
+#include "lex.c"
+
+static int
+arg_ambiguous(struct parser_params *p, char c)
 {
-    int column = 1, nonspc = 0, i;
-    for (i = 0; i < loc->beg_pos.column; i++, ptr++) {
-        if (*ptr == '\t') {
-            column = (((column - 1) / TAB_WIDTH) + 1) * TAB_WIDTH;
-        }
-        column++;
-        if (*ptr != ' ' && *ptr != '\t') {
-            nonspc = 1;
-        }
+#ifndef RIPPER
+    if (c == '/') {
+        rb_warning1("ambiguity between regexp and two divisions: wrap regexp in parentheses or add a space after '%c' operator", WARN_I(c));
     }
-
-    ptinfo->beg = loc->beg_pos;
-    ptinfo->indent = column;
-    ptinfo->nonspc = nonspc;
+    else {
+        rb_warning1("ambiguous first argument; put parentheses or a space even after '%c' operator", WARN_I(c));
+    }
+#else
+    dispatch1(arg_ambiguous, rb_usascii_str_new(&c, 1));
+#endif
+    return TRUE;
 }
 
-static void
-token_info_push(struct parser_params *p, const char *token, const rb_code_location_t *loc)
+/* returns true value if formal argument error;
+ * Qtrue, or error message if ripper */
+static VALUE
+formal_argument_error(struct parser_params *p, ID id)
 {
-    token_info *ptinfo;
-
-    if (!p->token_info_enabled) return;
-    ptinfo = ALLOC(token_info);
-    ptinfo->token = token;
-    ptinfo->next = p->token_info;
-    token_info_setup(ptinfo, p->lex.pbeg, loc);
+    switch (id_type(id)) {
+      case ID_LOCAL:
+        break;
+#ifndef RIPPER
+# define ERR(mesg) (yyerror0(mesg), Qtrue)
+#else
+# define ERR(mesg) WARN_S(mesg)
+#endif
+      case ID_CONST:
+        return ERR("formal argument cannot be a constant");
+      case ID_INSTANCE:
+        return ERR("formal argument cannot be an instance variable");
+      case ID_GLOBAL:
+        return ERR("formal argument cannot be a global variable");
+      case ID_CLASS:
+        return ERR("formal argument cannot be a class variable");
+      default:
+        return ERR("formal argument must be local variable");
+#undef ERR
+    }
+    shadowing_lvar(p, id);
 
-    p->token_info = ptinfo;
+    return Qfalse;
 }
 
-static void
-token_info_pop(struct parser_params *p, const char *token, const rb_code_location_t *loc)
+static int
+lvar_defined(struct parser_params *p, ID id)
 {
-    token_info *ptinfo_beg = p->token_info;
-
-    if (!ptinfo_beg) return;
-    p->token_info = ptinfo_beg->next;
-
-    /* indentation check of matched keywords (begin..end, if..end, etc.) */
-    token_info_warn(p, token, ptinfo_beg, 1, loc);
-    ruby_sized_xfree(ptinfo_beg, sizeof(*ptinfo_beg));
+    return (dyna_in_block(p) && dvar_defined(p, id)) || local_id(p, id);
 }
 
-static void
-token_info_drop(struct parser_params *p, const char *token, rb_code_position_t beg_pos)
+/* emacsen -*- hack */
+static long
+parser_encode_length(struct parser_params *p, const char *name, long len)
 {
-    token_info *ptinfo_beg = p->token_info;
-
-    if (!ptinfo_beg) return;
-    p->token_info = ptinfo_beg->next;
+    long nlen;
 
-    if (ptinfo_beg->beg.lineno != beg_pos.lineno ||
-        ptinfo_beg->beg.column != beg_pos.column ||
-        strcmp(ptinfo_beg->token, token)) {
-        compile_error(p, "token position mismatch: %d:%d:%s expected but %d:%d:%s",
-                      beg_pos.lineno, beg_pos.column, token,
-                      ptinfo_beg->beg.lineno, ptinfo_beg->beg.column,
-                      ptinfo_beg->token);
+    if (len > 5 && name[nlen = len - 5] == '-') {
+        if (rb_memcicmp(name + nlen + 1, "unix", 4) == 0)
+            return nlen;
     }
-
-    ruby_sized_xfree(ptinfo_beg, sizeof(*ptinfo_beg));
+    if (len > 4 && name[nlen = len - 4] == '-') {
+        if (rb_memcicmp(name + nlen + 1, "dos", 3) == 0)
+            return nlen;
+        if (rb_memcicmp(name + nlen + 1, "mac", 3) == 0 &&
+            !(len == 8 && rb_memcicmp(name, "utf8-mac", len) == 0))
+            /* exclude UTF8-MAC because the encoding named "UTF8" doesn't exist in Ruby */
+            return nlen;
+    }
+    return len;
 }
 
 static void
-token_info_warn(struct parser_params *p, const char *token, token_info *ptinfo_beg, int same, const rb_code_location_t *loc)
+parser_set_encode(struct parser_params *p, const char *name)
 {
-    token_info ptinfo_end_body, *ptinfo_end = &ptinfo_end_body;
-    if (!p->token_info_enabled) return;
-    if (!ptinfo_beg) return;
-    token_info_setup(ptinfo_end, p->lex.pbeg, loc);
-    if (ptinfo_beg->beg.lineno == ptinfo_end->beg.lineno) return; /* ignore one-line block */
-    if (ptinfo_beg->nonspc || ptinfo_end->nonspc) return; /* ignore keyword in the middle of a line */
-    if (ptinfo_beg->indent == ptinfo_end->indent) return; /* the indents are matched */
-    if (!same && ptinfo_beg->indent < ptinfo_end->indent) return;
-    rb_warn3L(ptinfo_end->beg.lineno,
-              "mismatched indentations at '%s' with '%s' at %d",
-              WARN_S(token), WARN_S(ptinfo_beg->token), WARN_I(ptinfo_beg->beg.lineno));
-}
+    rb_encoding *enc;
+    VALUE excargs[3];
+    int idx = 0;
 
-static int
-parser_precise_mbclen(struct parser_params *p, const char *ptr)
-{
-    int len = rb_enc_precise_mbclen(ptr, p->lex.pend, p->enc);
-    if (!MBCLEN_CHARFOUND_P(len)) {
-        compile_error(p, "invalid multibyte char (%s)", rb_enc_name(p->enc));
-        return -1;
+    const char *wrong = 0;
+    switch (*name) {
+      case 'e': case 'E': wrong = "external"; break;
+      case 'i': case 'I': wrong = "internal"; break;
+      case 'f': case 'F': wrong = "filesystem"; break;
+      case 'l': case 'L': wrong = "locale"; break;
     }
-    return len;
-}
+    if (wrong && STRCASECMP(name, wrong) == 0) goto unknown;
+    idx = rb_enc_find_index(name);
+    if (idx < 0) {
+      unknown:
+        excargs[1] = rb_sprintf("unknown encoding name: %s", name);
+      error:
+        excargs[0] = rb_eArgError;
+        excargs[2] = rb_make_backtrace();
+        rb_ary_unshift(excargs[2], rb_sprintf("%"PRIsVALUE":%d", p->ruby_sourcefile_string, p->ruby_sourceline));
+        VALUE exc = rb_make_exception(3, excargs);
+        ruby_show_error_line(p, exc, &(YYLTYPE)RUBY_INIT_YYLLOC(), p->ruby_sourceline, p->lex.lastline);
 
-#ifndef RIPPER
-static void ruby_show_error_line(struct parser_params *p, VALUE errbuf, const YYLTYPE *yylloc, int lineno, VALUE str);
+        rb_ast_free(p->ast);
+        p->ast = NULL;
 
-static inline void
-parser_show_error_line(struct parser_params *p, const YYLTYPE *yylloc)
-{
-    VALUE str;
-    int lineno = p->ruby_sourceline;
-    if (!yylloc) {
-        return;
-    }
-    else if (yylloc->beg_pos.lineno == lineno) {
-        str = p->lex.lastline;
+        rb_exc_raise(exc);
     }
-    else {
-        return;
-    }
-    ruby_show_error_line(p, p->error_buffer, yylloc, lineno, str);
-}
-
-static int
-parser_yyerror(struct parser_params *p, const YYLTYPE *yylloc, const char *msg)
-{
-#if 0
-    YYLTYPE current;
-
-    if (!yylloc) {
-        yylloc = RUBY_SET_YYLLOC(current);
+    enc = rb_enc_from_index(idx);
+    if (!rb_enc_asciicompat(enc)) {
+        excargs[1] = rb_sprintf("%s is not ASCII compatible", rb_enc_name(enc));
+        goto error;
     }
-    else if ((p->ruby_sourceline != yylloc->beg_pos.lineno &&
-              p->ruby_sourceline != yylloc->end_pos.lineno)) {
-        yylloc = 0;
+    p->enc = enc;
+#ifndef RIPPER
+    if (p->debug_lines) {
+        long i;
+        for (i = 0; i < p->debug_lines->len; i++) {
+            rb_parser_enc_associate(p, p->debug_lines->data[i], enc);
+        }
     }
 #endif
-    compile_error(p, "%s", msg);
-    parser_show_error_line(p, yylloc);
-    return 0;
 }
 
-static int
-parser_yyerror0(struct parser_params *p, const char *msg)
+static bool
+comment_at_top(struct parser_params *p)
 {
-    YYLTYPE current;
-    return parser_yyerror(p, RUBY_SET_YYLLOC(current), msg);
+    if (p->token_seen) return false;
+    return (p->line_count == (p->has_shebang ? 2 : 1));
 }
 
-static void
-ruby_show_error_line(struct parser_params *p, VALUE errbuf, const YYLTYPE *yylloc, int lineno, VALUE str)
-{
-    VALUE mesg;
-    const int max_line_margin = 30;
-    const char *ptr, *ptr_end, *pt, *pb;
-    const char *pre = "", *post = "", *pend;
-    const char *code = "", *caret = "";
-    const char *lim;
-    const char *const pbeg = RSTRING_PTR(str);
-    char *buf;
-    long len;
-    int i;
-
-    if (!yylloc) return;
-    pend = RSTRING_END(str);
-    if (pend > pbeg && pend[-1] == '\n') {
-        if (--pend > pbeg && pend[-1] == '\r') --pend;
-    }
-
-    pt = pend;
-    if (lineno == yylloc->end_pos.lineno &&
-        (pend - pbeg) > yylloc->end_pos.column) {
-        pt = pbeg + yylloc->end_pos.column;
-    }
-
-    ptr = ptr_end = pt;
-    lim = ptr - pbeg > max_line_margin ? ptr - max_line_margin : pbeg;
-    while ((lim < ptr) && (*(ptr-1) != '\n')) ptr--;
+typedef long (*rb_magic_comment_length_t)(struct parser_params *p, const char *name, long len);
+typedef void (*rb_magic_comment_setter_t)(struct parser_params *p, const char *name, const char *val);
 
-    lim = pend - ptr_end > max_line_margin ? ptr_end + max_line_margin : pend;
-    while ((ptr_end < lim) && (*ptr_end != '\n') && (*ptr_end != '\r')) ptr_end++;
+static int parser_invalid_pragma_value(struct parser_params *p, const char *name, const char *val);
 
-    len = ptr_end - ptr;
-    if (len > 4) {
-        if (ptr > pbeg) {
-            ptr = rb_enc_prev_char(pbeg, ptr, pt, rb_enc_get(str));
-            if (ptr > pbeg) pre = "...";
-        }
-        if (ptr_end < pend) {
-            ptr_end = rb_enc_prev_char(pt, ptr_end, pend, rb_enc_get(str));
-            if (ptr_end < pend) post = "...";
-        }
-    }
-    pb = pbeg;
-    if (lineno == yylloc->beg_pos.lineno) {
-        pb += yylloc->beg_pos.column;
-        if (pb > pt) pb = pt;
-    }
-    if (pb < ptr) pb = ptr;
-    if (len <= 4 && yylloc->beg_pos.lineno == yylloc->end_pos.lineno) {
+static void
+magic_comment_encoding(struct parser_params *p, const char *name, const char *val)
+{
+    if (!comment_at_top(p)) {
         return;
     }
-    if (RTEST(errbuf)) {
-        mesg = rb_attr_get(errbuf, idMesg);
-        if (RSTRING_LEN(mesg) > 0 && *(RSTRING_END(mesg)-1) != '\n')
-            rb_str_cat_cstr(mesg, "\n");
-    }
-    else {
-        mesg = rb_enc_str_new(0, 0, rb_enc_get(str));
-    }
-    if (!errbuf && rb_stderr_tty_p()) {
-#define CSI_BEGIN "\033["
-#define CSI_SGR "m"
-        rb_str_catf(mesg,
-                    CSI_BEGIN""CSI_SGR"%s" /* pre */
-                    CSI_BEGIN"1"CSI_SGR"%.*s"
-                    CSI_BEGIN"1;4"CSI_SGR"%.*s"
-                    CSI_BEGIN";1"CSI_SGR"%.*s"
-                    CSI_BEGIN""CSI_SGR"%s" /* post */
-                    "\n",
-                    pre,
-                    (int)(pb - ptr), ptr,
-                    (int)(pt - pb), pb,
-                    (int)(ptr_end - pt), pt,
-                    post);
-    }
-    else {
-        char *p2;
+    parser_set_encode(p, val);
+}
 
-        len = ptr_end - ptr;
-        lim = pt < pend ? pt : pend;
-        i = (int)(lim - ptr);
-        buf = ALLOCA_N(char, i+2);
-        code = ptr;
-        caret = p2 = buf;
-        if (ptr <= pb) {
-            while (ptr < pb) {
-                *p2++ = *ptr++ == '\t' ? '\t' : ' ';
-            }
-            *p2++ = '^';
-            ptr++;
+static int
+parser_get_bool(struct parser_params *p, const char *name, const char *val)
+{
+    switch (*val) {
+      case 't': case 'T':
+        if (STRCASECMP(val, "true") == 0) {
+            return TRUE;
         }
-        if (lim > ptr) {
-            memset(p2, '~', (lim - ptr));
-            p2 += (lim - ptr);
+        break;
+      case 'f': case 'F':
+        if (STRCASECMP(val, "false") == 0) {
+            return FALSE;
         }
-        *p2 = '\0';
-        rb_str_catf(mesg, "%s%.*s%s\n""%s%s\n",
-                    pre, (int)len, code, post,
-                    pre, caret);
+        break;
     }
-    if (!errbuf) rb_write_error_str(mesg);
+    return parser_invalid_pragma_value(p, name, val);
 }
-#else
+
 static int
-parser_yyerror(struct parser_params *p, const YYLTYPE *yylloc, const char *msg)
+parser_invalid_pragma_value(struct parser_params *p, const char *name, const char *val)
 {
-    const char *pcur = 0, *ptok = 0;
-    if (p->ruby_sourceline == yylloc->beg_pos.lineno &&
-        p->ruby_sourceline == yylloc->end_pos.lineno) {
-        pcur = p->lex.pcur;
-        ptok = p->lex.ptok;
-        p->lex.ptok = p->lex.pbeg + yylloc->beg_pos.column;
-        p->lex.pcur = p->lex.pbeg + yylloc->end_pos.column;
+    rb_warning2("invalid value for %s: %s", WARN_S(name), WARN_S(val));
+    return -1;
+}
+
+static void
+parser_set_token_info(struct parser_params *p, const char *name, const char *val)
+{
+    int b = parser_get_bool(p, name, val);
+    if (b >= 0) p->token_info_enabled = b;
+}
+
+static void
+parser_set_frozen_string_literal(struct parser_params *p, const char *name, const char *val)
+{
+    int b;
+
+    if (p->token_seen) {
+        rb_warning1("'%s' is ignored after any tokens", WARN_S(name));
+        return;
     }
-    parser_yyerror0(p, msg);
-    if (pcur) {
-        p->lex.ptok = ptok;
-        p->lex.pcur = pcur;
+
+    b = parser_get_bool(p, name, val);
+    if (b < 0) return;
+
+    p->frozen_string_literal = b;
+}
+
+static void
+parser_set_shareable_constant_value(struct parser_params *p, const char *name, const char *val)
+{
+    for (const char *s = p->lex.pbeg, *e = p->lex.pcur; s < e; ++s) {
+        if (*s == ' ' || *s == '\t') continue;
+        if (*s == '#') break;
+        rb_warning1("'%s' is ignored unless in comment-only line", WARN_S(name));
+        return;
     }
-    return 0;
+
+    switch (*val) {
+      case 'n': case 'N':
+        if (STRCASECMP(val, "none") == 0) {
+            p->ctxt.shareable_constant_value = rb_parser_shareable_none;
+            return;
+        }
+        break;
+      case 'l': case 'L':
+        if (STRCASECMP(val, "literal") == 0) {
+            p->ctxt.shareable_constant_value = rb_parser_shareable_literal;
+            return;
+        }
+        break;
+      case 'e': case 'E':
+        if (STRCASECMP(val, "experimental_copy") == 0) {
+            p->ctxt.shareable_constant_value = rb_parser_shareable_copy;
+            return;
+        }
+        if (STRCASECMP(val, "experimental_everything") == 0) {
+            p->ctxt.shareable_constant_value = rb_parser_shareable_everything;
+            return;
+        }
+        break;
+    }
+    parser_invalid_pragma_value(p, name, val);
 }
 
-static int
-parser_yyerror0(struct parser_params *p, const char *msg)
+# if WARN_PAST_SCOPE
+static void
+parser_set_past_scope(struct parser_params *p, const char *name, const char *val)
 {
-    dispatch1(parse_error, STR_NEW2(msg));
-    ripper_error(p);
-    return 0;
+    int b = parser_get_bool(p, name, val);
+    if (b >= 0) p->past_scope_enabled = b;
 }
+# endif
 
-static inline void
-parser_show_error_line(struct parser_params *p, const YYLTYPE *yylloc)
+struct magic_comment {
+    const char *name;
+    rb_magic_comment_setter_t func;
+    rb_magic_comment_length_t length;
+};
+
+static const struct magic_comment magic_comments[] = {
+    {"coding", magic_comment_encoding, parser_encode_length},
+    {"encoding", magic_comment_encoding, parser_encode_length},
+    {"frozen_string_literal", parser_set_frozen_string_literal},
+    {"shareable_constant_value", parser_set_shareable_constant_value},
+    {"warn_indent", parser_set_token_info},
+# if WARN_PAST_SCOPE
+    {"warn_past_scope", parser_set_past_scope},
+# endif
+};
+
+static const char *
+magic_comment_marker(const char *str, long len)
 {
+    long i = 2;
+
+    while (i < len) {
+        switch (str[i]) {
+          case '-':
+            if (str[i-1] == '*' && str[i-2] == '-') {
+                return str + i + 1;
+            }
+            i += 2;
+            break;
+          case '*':
+            if (i + 1 >= len) return 0;
+            if (str[i+1] != '-') {
+                i += 4;
+            }
+            else if (str[i-1] != '-') {
+                i += 2;
+            }
+            else {
+                return str + i + 2;
+            }
+            break;
+          default:
+            i += 3;
+            break;
+        }
+    }
+    return 0;
 }
-#endif /* !RIPPER */
 
-#ifndef RIPPER
 static int
-vtable_size(const struct vtable *tbl)
+parser_magic_comment(struct parser_params *p, const char *str, long len)
 {
-    if (!DVARS_TERMINAL_P(tbl)) {
-        return tbl->pos;
-    }
-    else {
-        return 0;
+    int indicator = 0;
+    VALUE name = 0, val = 0;
+    const char *beg, *end, *vbeg, *vend;
+#define str_copy(_s, _p, _n) ((_s) \
+        ? (void)(rb_str_resize((_s), (_n)), \
+           MEMCPY(RSTRING_PTR(_s), (_p), char, (_n)), (_s)) \
+        : (void)((_s) = STR_NEW((_p), (_n))))
+
+    if (len <= 7) return FALSE;
+    if (!!(beg = magic_comment_marker(str, len))) {
+        if (!(end = magic_comment_marker(beg, str + len - beg)))
+            return FALSE;
+        indicator = TRUE;
+        str = beg;
+        len = end - beg - 3;
     }
-}
+
+    /* %r"([^\\s\'\":;]+)\\s*:\\s*(\"(?:\\\\.|[^\"])*\"|[^\"\\s;]+)[\\s;]*" */
+    while (len > 0) {
+        const struct magic_comment *mc = magic_comments;
+        char *s;
+        int i;
+        long n = 0;
+
+        for (; len > 0 && *str; str++, --len) {
+            switch (*str) {
+              case '\'': case '"': case ':': case ';':
+                continue;
+            }
+            if (!ISSPACE(*str)) break;
+        }
+        for (beg = str; len > 0; str++, --len) {
+            switch (*str) {
+              case '\'': case '"': case ':': case ';':
+                break;
+              default:
+                if (ISSPACE(*str)) break;
+                continue;
+            }
+            break;
+        }
+        for (end = str; len > 0 && ISSPACE(*str); str++, --len);
+        if (!len) break;
+        if (*str != ':') {
+            if (!indicator) return FALSE;
+            continue;
+        }
+
+        do str++; while (--len > 0 && ISSPACE(*str));
+        if (!len) break;
+        const char *tok_beg = str;
+        if (*str == '"') {
+            for (vbeg = ++str; --len > 0 && *str != '"'; str++) {
+                if (*str == '\\') {
+                    --len;
+                    ++str;
+                }
+            }
+            vend = str;
+            if (len) {
+                --len;
+                ++str;
+            }
+        }
+        else {
+            for (vbeg = str; len > 0 && *str != '"' && *str != ';' && !ISSPACE(*str); --len, str++);
+            vend = str;
+        }
+        const char *tok_end = str;
+        if (indicator) {
+            while (len > 0 && (*str == ';' || ISSPACE(*str))) --len, str++;
+        }
+        else {
+            while (len > 0 && (ISSPACE(*str))) --len, str++;
+            if (len) return FALSE;
+        }
+
+        n = end - beg;
+        str_copy(name, beg, n);
+        s = RSTRING_PTR(name);
+        for (i = 0; i < n; ++i) {
+            if (s[i] == '-') s[i] = '_';
+        }
+        do {
+            if (STRNCASECMP(mc->name, s, n) == 0 && !mc->name[n]) {
+                n = vend - vbeg;
+                if (mc->length) {
+                    n = (*mc->length)(p, vbeg, n);
+                }
+                str_copy(val, vbeg, n);
+                p->lex.ptok = tok_beg;
+                p->lex.pcur = tok_end;
+                (*mc->func)(p, mc->name, RSTRING_PTR(val));
+                break;
+            }
+        } while (++mc < magic_comments + numberof(magic_comments));
+#ifdef RIPPER
+        str_copy(val, vbeg, vend - vbeg);
+        dispatch2(magic_comment, name, val);
 #endif
-
-static struct vtable *
-vtable_alloc_gen(struct parser_params *p, int line, struct vtable *prev)
-{
-    struct vtable *tbl = ALLOC(struct vtable);
-    tbl->pos = 0;
-    tbl->capa = 8;
-    tbl->tbl = ALLOC_N(ID, tbl->capa);
-    tbl->prev = prev;
-#ifndef RIPPER
-    if (p->debug) {
-        rb_parser_printf(p, "vtable_alloc:%d: %p\n", line, (void *)tbl);
     }
-#endif
-    return tbl;
+
+    return TRUE;
 }
-#define vtable_alloc(prev) vtable_alloc_gen(p, __LINE__, prev)
 
 static void
-vtable_free_gen(struct parser_params *p, int line, const char *name,
-                struct vtable *tbl)
+set_file_encoding(struct parser_params *p, const char *str, const char *send)
 {
-#ifndef RIPPER
-    if (p->debug) {
-        rb_parser_printf(p, "vtable_free:%d: %s(%p)\n", line, name, (void *)tbl);
-    }
-#endif
-    if (!DVARS_TERMINAL_P(tbl)) {
-        if (tbl->tbl) {
-            ruby_sized_xfree(tbl->tbl, tbl->capa * sizeof(ID));
+    int sep = 0;
+    const char *beg = str;
+    VALUE s;
+
+    for (;;) {
+        if (send - str <= 6) return;
+        switch (str[6]) {
+          case 'C': case 'c': str += 6; continue;
+          case 'O': case 'o': str += 5; continue;
+          case 'D': case 'd': str += 4; continue;
+          case 'I': case 'i': str += 3; continue;
+          case 'N': case 'n': str += 2; continue;
+          case 'G': case 'g': str += 1; continue;
+          case '=': case ':':
+            sep = 1;
+            str += 6;
+            break;
+          default:
+            str += 6;
+            if (ISSPACE(*str)) break;
+            continue;
         }
-        ruby_sized_xfree(tbl, sizeof(*tbl));
+        if (STRNCASECMP(str-6, "coding", 6) == 0) break;
+        sep = 0;
+    }
+    for (;;) {
+        do {
+            if (++str >= send) return;
+        } while (ISSPACE(*str));
+        if (sep) break;
+        if (*str != '=' && *str != ':') return;
+        sep = 1;
+        str++;
     }
+    beg = str;
+    while ((*str == '-' || *str == '_' || ISALNUM(*str)) && ++str < send);
+    s = rb_str_new(beg, parser_encode_length(p, beg, str - beg));
+    p->lex.ptok = beg;
+    p->lex.pcur = str;
+    parser_set_encode(p, RSTRING_PTR(s));
+    rb_str_resize(s, 0);
 }
-#define vtable_free(tbl) vtable_free_gen(p, __LINE__, #tbl, tbl)
 
 static void
-vtable_add_gen(struct parser_params *p, int line, const char *name,
-               struct vtable *tbl, ID id)
+parser_prepare(struct parser_params *p)
 {
+    int c = nextc0(p, FALSE);
+    p->token_info_enabled = !compile_for_eval && RTEST(ruby_verbose);
+    switch (c) {
+      case '#':
+        if (peek(p, '!')) p->has_shebang = 1;
+        break;
+      case 0xef:		/* UTF-8 BOM marker */
+        if (!lex_eol_n_p(p, 2) &&
+            (unsigned char)p->lex.pcur[0] == 0xbb &&
+            (unsigned char)p->lex.pcur[1] == 0xbf) {
+            p->enc = rb_utf8_encoding();
+            p->lex.pcur += 2;
 #ifndef RIPPER
-    if (p->debug) {
-        rb_parser_printf(p, "vtable_add:%d: %s(%p), %s\n",
-                         line, name, (void *)tbl, rb_id2name(id));
-    }
+            if (p->debug_lines) {
+                rb_parser_string_set_encoding(p->lex.lastline, p->enc);
+            }
 #endif
-    if (DVARS_TERMINAL_P(tbl)) {
-        rb_parser_fatal(p, "vtable_add: vtable is not allocated (%p)", (void *)tbl);
+            p->lex.pbeg = p->lex.pcur;
+            token_flush(p);
+            return;
+        }
+        break;
+      case -1:   /* end of script. */
         return;
     }
-    if (tbl->pos == tbl->capa) {
-        tbl->capa = tbl->capa * 2;
-        SIZED_REALLOC_N(tbl->tbl, ID, tbl->capa, tbl->pos);
-    }
-    tbl->tbl[tbl->pos++] = id;
+    pushback(p, c);
+    p->enc = rb_parser_str_get_encoding(p->lex.lastline);
 }
-#define vtable_add(tbl, id) vtable_add_gen(p, __LINE__, #tbl, tbl, id)
 
 #ifndef RIPPER
-static void
-vtable_pop_gen(struct parser_params *p, int line, const char *name,
-               struct vtable *tbl, int n)
-{
-    if (p->debug) {
-        rb_parser_printf(p, "vtable_pop:%d: %s(%p), %d\n",
-                         line, name, (void *)tbl, n);
-    }
-    if (tbl->pos < n) {
-        rb_parser_fatal(p, "vtable_pop: unreachable (%d < %d)", tbl->pos, n);
-        return;
-    }
-    tbl->pos -= n;
-}
-#define vtable_pop(tbl, n) vtable_pop_gen(p, __LINE__, #tbl, tbl, n)
+#define ambiguous_operator(tok, op, syn) ( \
+    rb_warning0("'"op"' after local variable or literal is interpreted as binary operator"), \
+    rb_warning0("even though it seems like "syn""))
+#else
+#define ambiguous_operator(tok, op, syn) \
+    dispatch2(operator_ambiguous, TOKEN2VAL(tok), rb_str_new_cstr(syn))
 #endif
+#define warn_balanced(tok, op, syn) ((void) \
+    (!IS_lex_state_for(last_state, EXPR_CLASS|EXPR_DOT|EXPR_FNAME|EXPR_ENDFN) && \
+     space_seen && !ISSPACE(c) && \
+     (ambiguous_operator(tok, op, syn), 0)), \
+     (enum yytokentype)(tok))
 
-static int
-vtable_included(const struct vtable * tbl, ID id)
-{
-    int i;
-
-    if (!DVARS_TERMINAL_P(tbl)) {
-        for (i = 0; i < tbl->pos; i++) {
-            if (tbl->tbl[i] == id) {
-                return i+1;
-            }
-        }
-    }
-    return 0;
-}
-
-static void parser_prepare(struct parser_params *p);
-
-#ifndef RIPPER
-static NODE *parser_append_options(struct parser_params *p, NODE *node);
-
-static int
-e_option_supplied(struct parser_params *p)
+static enum yytokentype
+no_digits(struct parser_params *p)
 {
-    return strcmp(p->ruby_sourcefile, "-e") == 0;
+    yyerror0("numeric literal without digits");
+    if (peek(p, '_')) nextc(p);
+    /* dummy 0, for tUMINUS_NUM at numeric */
+    return set_number_literal(p, tINTEGER, 0, 10, 0);
 }
 
-static VALUE
-yycompile0(VALUE arg)
+static enum yytokentype
+parse_numeric(struct parser_params *p, int c)
 {
-    int n;
-    NODE *tree;
-    struct parser_params *p = (struct parser_params *)arg;
-    int cov = FALSE;
+    int is_float, seen_point, seen_e, nondigit;
+    int suffix;
 
-    if (!compile_for_eval && !NIL_P(p->ruby_sourcefile_string)) {
-        if (p->debug_lines && p->ruby_sourceline > 0) {
-            VALUE str = rb_default_rs;
-            n = p->ruby_sourceline;
-            do {
-                rb_ary_push(p->debug_lines, str);
-            } while (--n);
+    is_float = seen_point = seen_e = nondigit = 0;
+    SET_LEX_STATE(EXPR_END);
+    newtok(p);
+    if (c == '-' || c == '+') {
+        tokadd(p, c);
+        c = nextc(p);
+    }
+    if (c == '0') {
+        int start = toklen(p);
+        c = nextc(p);
+        if (c == 'x' || c == 'X') {
+            /* hexadecimal */
+            c = nextc(p);
+            if (c != -1 && ISXDIGIT(c)) {
+                do {
+                    if (c == '_') {
+                        if (nondigit) break;
+                        nondigit = c;
+                        continue;
+                    }
+                    if (!ISXDIGIT(c)) break;
+                    nondigit = 0;
+                    tokadd(p, c);
+                } while ((c = nextc(p)) != -1);
+            }
+            pushback(p, c);
+            tokfix(p);
+            if (toklen(p) == start) {
+                return no_digits(p);
+            }
+            else if (nondigit) goto trailing_uc;
+            suffix = number_literal_suffix(p, NUM_SUFFIX_ALL);
+            return set_number_literal(p, tINTEGER, suffix, 16, 0);
+        }
+        if (c == 'b' || c == 'B') {
+            /* binary */
+            c = nextc(p);
+            if (c == '0' || c == '1') {
+                do {
+                    if (c == '_') {
+                        if (nondigit) break;
+                        nondigit = c;
+                        continue;
+                    }
+                    if (c != '0' && c != '1') break;
+                    nondigit = 0;
+                    tokadd(p, c);
+                } while ((c = nextc(p)) != -1);
+            }
+            pushback(p, c);
+            tokfix(p);
+            if (toklen(p) == start) {
+                return no_digits(p);
+            }
+            else if (nondigit) goto trailing_uc;
+            suffix = number_literal_suffix(p, NUM_SUFFIX_ALL);
+            return set_number_literal(p, tINTEGER, suffix, 2, 0);
+        }
+        if (c == 'd' || c == 'D') {
+            /* decimal */
+            c = nextc(p);
+            if (c != -1 && ISDIGIT(c)) {
+                do {
+                    if (c == '_') {
+                        if (nondigit) break;
+                        nondigit = c;
+                        continue;
+                    }
+                    if (!ISDIGIT(c)) break;
+                    nondigit = 0;
+                    tokadd(p, c);
+                } while ((c = nextc(p)) != -1);
+            }
+            pushback(p, c);
+            tokfix(p);
+            if (toklen(p) == start) {
+                return no_digits(p);
+            }
+            else if (nondigit) goto trailing_uc;
+            suffix = number_literal_suffix(p, NUM_SUFFIX_ALL);
+            return set_number_literal(p, tINTEGER, suffix, 10, 0);
         }
-
-        if (!e_option_supplied(p)) {
-            cov = TRUE;
+        if (c == '_') {
+            /* 0_0 */
+            goto octal_number;
         }
-    }
-
-    if (p->debug_lines) {
-        RB_OBJ_WRITE(p->ast, &p->ast->body.script_lines, p->debug_lines);
-    }
-
-    parser_prepare(p);
-#define RUBY_DTRACE_PARSE_HOOK(name) \
-    if (RUBY_DTRACE_PARSE_##name##_ENABLED()) { \
-        RUBY_DTRACE_PARSE_##name(p->ruby_sourcefile, p->ruby_sourceline); \
-    }
-    RUBY_DTRACE_PARSE_HOOK(BEGIN);
-    n = yyparse(p);
-    RUBY_DTRACE_PARSE_HOOK(END);
-    p->debug_lines = 0;
-
-    p->lex.strterm = 0;
-    p->lex.pcur = p->lex.pbeg = p->lex.pend = 0;
-    if (n || p->error_p) {
-        VALUE mesg = p->error_buffer;
-        if (!mesg) {
-            mesg = syntax_error_new();
+        if (c == 'o' || c == 'O') {
+            /* prefixed octal */
+            c = nextc(p);
+            if (c == -1 || c == '_' || !ISDIGIT(c)) {
+                tokfix(p);
+                return no_digits(p);
+            }
         }
-        if (!p->error_tolerant) {
-            rb_set_errinfo(mesg);
-            return FALSE;
+        if (c >= '0' && c <= '7') {
+            /* octal */
+          octal_number:
+            do {
+                if (c == '_') {
+                    if (nondigit) break;
+                    nondigit = c;
+                    continue;
+                }
+                if (c < '0' || c > '9') break;
+                if (c > '7') goto invalid_octal;
+                nondigit = 0;
+                tokadd(p, c);
+            } while ((c = nextc(p)) != -1);
+            if (toklen(p) > start) {
+                pushback(p, c);
+                tokfix(p);
+                if (nondigit) goto trailing_uc;
+                suffix = number_literal_suffix(p, NUM_SUFFIX_ALL);
+                return set_number_literal(p, tINTEGER, suffix, 8, 0);
+            }
+            if (nondigit) {
+                pushback(p, c);
+                goto trailing_uc;
+            }
         }
-    }
-    tree = p->eval_tree;
-    if (!tree) {
-        tree = NEW_NIL(&NULL_LOC);
-    }
-    else {
-        VALUE tokens = p->tokens;
-        NODE *prelude;
-        NODE *body = parser_append_options(p, tree->nd_body);
-        prelude = block_append(p, p->eval_tree_begin, body);
-        tree->nd_body = prelude;
-        p->ast->body.frozen_string_literal = p->frozen_string_literal;
-        p->ast->body.coverage_enabled = cov;
-        if (p->keep_tokens) {
-            rb_obj_freeze(tokens);
-            rb_ast_set_tokens(p->ast, tokens);
+        if (c > '7' && c <= '9') {
+          invalid_octal:
+            yyerror0("Invalid octal digit");
+        }
+        else if (c == '.' || c == 'e' || c == 'E') {
+            tokadd(p, '0');
+        }
+        else {
+            pushback(p, c);
+            tokfix(p);
+            suffix = number_literal_suffix(p, NUM_SUFFIX_ALL);
+            return set_number_literal(p, tINTEGER, suffix, 10, 0);
         }
     }
-    p->ast->body.root = tree;
-    if (!p->ast->body.script_lines) p->ast->body.script_lines = INT2FIX(p->line_count);
-    return TRUE;
-}
-
-static rb_ast_t *
-yycompile(struct parser_params *p, VALUE fname, int line)
-{
-    rb_ast_t *ast;
-    if (NIL_P(fname)) {
-        p->ruby_sourcefile_string = Qnil;
-        p->ruby_sourcefile = "(none)";
-    }
-    else {
-        p->ruby_sourcefile_string = rb_fstring(fname);
-        p->ruby_sourcefile = StringValueCStr(fname);
-    }
-    p->ruby_sourceline = line - 1;
 
-    p->lvtbl = NULL;
+    for (;;) {
+        switch (c) {
+          case '0': case '1': case '2': case '3': case '4':
+          case '5': case '6': case '7': case '8': case '9':
+            nondigit = 0;
+            tokadd(p, c);
+            break;
 
-    p->ast = ast = rb_ast_new();
-    compile_callback(yycompile0, (VALUE)p);
-    p->ast = 0;
+          case '.':
+            if (nondigit) goto trailing_uc;
+            if (seen_point || seen_e) {
+                goto decode_num;
+            }
+            else {
+                int c0 = nextc(p);
+                if (c0 == -1 || !ISDIGIT(c0)) {
+                    pushback(p, c0);
+                    goto decode_num;
+                }
+                c = c0;
+            }
+            seen_point = toklen(p);
+            tokadd(p, '.');
+            tokadd(p, c);
+            is_float++;
+            nondigit = 0;
+            break;
 
-    while (p->lvtbl) {
-        local_pop(p);
-    }
+          case 'e':
+          case 'E':
+            if (nondigit) {
+                pushback(p, c);
+                c = nondigit;
+                goto decode_num;
+            }
+            if (seen_e) {
+                goto decode_num;
+            }
+            nondigit = c;
+            c = nextc(p);
+            if (c != '-' && c != '+' && !ISDIGIT(c)) {
+                pushback(p, c);
+                c = nondigit;
+                nondigit = 0;
+                goto decode_num;
+            }
+            tokadd(p, nondigit);
+            seen_e++;
+            is_float++;
+            tokadd(p, c);
+            nondigit = (c == '-' || c == '+') ? c : 0;
+            break;
 
-    return ast;
-}
-#endif /* !RIPPER */
+          case '_':	/* `_' in number just ignored */
+            if (nondigit) goto decode_num;
+            nondigit = c;
+            break;
 
-static rb_encoding *
-must_be_ascii_compatible(struct parser_params *p, VALUE s)
-{
-    rb_encoding *enc = rb_enc_get(s);
-    if (!rb_enc_asciicompat(enc)) {
-        rb_raise(rb_eArgError, "invalid source encoding");
+          default:
+            goto decode_num;
+        }
+        c = nextc(p);
     }
-    return enc;
-}
-
-static VALUE
-lex_get_str(struct parser_params *p, VALUE s)
-{
-    char *beg, *end, *start;
-    long len;
 
-    beg = RSTRING_PTR(s);
-    len = RSTRING_LEN(s);
-    start = beg;
-    if (p->lex.gets_.ptr) {
-        if (len == p->lex.gets_.ptr) return Qnil;
-        beg += p->lex.gets_.ptr;
-        len -= p->lex.gets_.ptr;
+  decode_num:
+    pushback(p, c);
+    if (nondigit) {
+      trailing_uc:
+        literal_flush(p, p->lex.pcur - 1);
+        YYLTYPE loc = RUBY_INIT_YYLLOC();
+        compile_error(p, "trailing '%c' in number", nondigit);
+        parser_show_error_line(p, &loc);
     }
-    end = memchr(beg, '\n', len);
-    if (end) len = ++end - beg;
-    p->lex.gets_.ptr += len;
-    return rb_str_subseq(s, beg - start, len);
-}
-
-static VALUE
-lex_getline(struct parser_params *p)
-{
-    VALUE line = (*p->lex.gets)(p, p->lex.input);
-    if (NIL_P(line)) return line;
-    must_be_ascii_compatible(p, line);
-    if (RB_OBJ_FROZEN(line)) line = rb_str_dup(line); // needed for RubyVM::AST.of because script_lines in iseq is deep-frozen
-    p->line_count++;
-    return line;
-}
-
-#ifndef RIPPER
-static rb_ast_t*
-parser_compile_string(rb_parser_t *p, VALUE fname, VALUE s, int line)
-{
-    p->lex.gets = lex_get_str;
-    p->lex.gets_.ptr = 0;
-    p->lex.input = rb_str_new_frozen(s);
-    p->lex.pbeg = p->lex.pcur = p->lex.pend = 0;
-
-    return yycompile(p, fname, line);
-}
-
-rb_ast_t*
-rb_ruby_parser_compile_string_path(rb_parser_t *p, VALUE f, VALUE s, int line)
-{
-    must_be_ascii_compatible(p, s);
-    return parser_compile_string(p, f, s, line);
-}
-
-rb_ast_t*
-rb_ruby_parser_compile_string(rb_parser_t *p, const char *f, VALUE s, int line)
-{
-    return rb_ruby_parser_compile_string_path(p, rb_filesystem_str_new_cstr(f), s, line);
-}
-
-static VALUE
-lex_io_gets(struct parser_params *p, VALUE io)
-{
-    return rb_io_gets_internal(io);
-}
-
-rb_ast_t*
-rb_ruby_parser_compile_file_path(rb_parser_t *p, VALUE fname, VALUE file, int start)
-{
-    p->lex.gets = lex_io_gets;
-    p->lex.input = file;
-    p->lex.pbeg = p->lex.pcur = p->lex.pend = 0;
-
-    return yycompile(p, fname, start);
-}
-
-static VALUE
-lex_generic_gets(struct parser_params *p, VALUE input)
-{
-    return (*p->lex.gets_.call)(input, p->line_count);
-}
-
-rb_ast_t*
-rb_ruby_parser_compile_generic(rb_parser_t *p, VALUE (*lex_gets)(VALUE, int), VALUE fname, VALUE input, int start)
-{
-    p->lex.gets = lex_generic_gets;
-    p->lex.gets_.call = lex_gets;
-    p->lex.input = input;
-    p->lex.pbeg = p->lex.pcur = p->lex.pend = 0;
-
-    return yycompile(p, fname, start);
-}
-#endif  /* !RIPPER */
-
-#define STR_FUNC_ESCAPE 0x01
-#define STR_FUNC_EXPAND 0x02
-#define STR_FUNC_REGEXP 0x04
-#define STR_FUNC_QWORDS 0x08
-#define STR_FUNC_SYMBOL 0x10
-#define STR_FUNC_INDENT 0x20
-#define STR_FUNC_LABEL  0x40
-#define STR_FUNC_LIST   0x4000
-#define STR_FUNC_TERM   0x8000
-
-enum string_type {
-    str_label  = STR_FUNC_LABEL,
-    str_squote = (0),
-    str_dquote = (STR_FUNC_EXPAND),
-    str_xquote = (STR_FUNC_EXPAND),
-    str_regexp = (STR_FUNC_REGEXP|STR_FUNC_ESCAPE|STR_FUNC_EXPAND),
-    str_sword  = (STR_FUNC_QWORDS|STR_FUNC_LIST),
-    str_dword  = (STR_FUNC_QWORDS|STR_FUNC_EXPAND|STR_FUNC_LIST),
-    str_ssym   = (STR_FUNC_SYMBOL),
-    str_dsym   = (STR_FUNC_SYMBOL|STR_FUNC_EXPAND)
-};
-
-static VALUE
-parser_str_new(struct parser_params *p, const char *ptr, long len, rb_encoding *enc, int func, rb_encoding *enc0)
-{
-    VALUE str;
+    tokfix(p);
+    if (is_float) {
+        enum yytokentype type = tFLOAT;
 
-    str = rb_enc_str_new(ptr, len, enc);
-    if (!(func & STR_FUNC_REGEXP) && rb_enc_asciicompat(enc)) {
-        if (is_ascii_string(str)) {
+        suffix = number_literal_suffix(p, seen_e ? NUM_SUFFIX_I : NUM_SUFFIX_ALL);
+        if (suffix & NUM_SUFFIX_R) {
+            type = tRATIONAL;
         }
-        else if (rb_is_usascii_enc((void *)enc0) && enc != rb_utf8_encoding()) {
-            rb_enc_associate(str, rb_ascii8bit_encoding());
+        else {
+            strtod(tok(p), 0);
+            if (errno == ERANGE) {
+                rb_warning1("Float %s out of range", WARN_S(tok(p)));
+                errno = 0;
+            }
         }
+        return set_number_literal(p, type, suffix, 0, seen_point);
     }
-
-    return str;
+    suffix = number_literal_suffix(p, NUM_SUFFIX_ALL);
+    return set_number_literal(p, tINTEGER, suffix, 10, 0);
 }
 
-#define peek(p,c) peek_n(p, (c), 0)
-#define peek_n(p,c,n) (!lex_eol_n_p(p, n) && (c) == (unsigned char)(p)->lex.pcur[n])
-#define peekc(p) peekc_n(p, 0)
-#define peekc_n(p,n) (lex_eol_n_p(p, n) ? -1 : (unsigned char)(p)->lex.pcur[n])
-
-static void
-add_delayed_token(struct parser_params *p, const char *tok, const char *end, int line)
+static enum yytokentype
+parse_qmark(struct parser_params *p, int space_seen)
 {
-#ifndef RIPPER
-    debug_token_line(p, "add_delayed_token", line);
-#endif
+    rb_encoding *enc;
+    register int c;
+    rb_parser_string_t *lit;
+    const char *start = p->lex.pcur;
 
-    if (tok < end) {
-        if (!has_delayed_token(p)) {
-            p->delayed.token = rb_str_buf_new(end - tok);
-            rb_enc_associate(p->delayed.token, p->enc);
-            p->delayed.beg_line = p->ruby_sourceline;
-            p->delayed.beg_col = rb_long2int(tok - p->lex.pbeg);
+    if (IS_END()) {
+        SET_LEX_STATE(EXPR_VALUE);
+        return '?';
+    }
+    c = nextc(p);
+    if (c == -1) {
+        compile_error(p, "incomplete character syntax");
+        return 0;
+    }
+    if (rb_enc_isspace(c, p->enc)) {
+        if (!IS_ARG()) {
+            int c2 = escaped_control_code(c);
+            if (c2) {
+                WARN_SPACE_CHAR(c2, "?");
+            }
         }
-        rb_str_buf_cat(p->delayed.token, tok, end - tok);
-        p->delayed.end_line = p->ruby_sourceline;
-        p->delayed.end_col = rb_long2int(end - p->lex.pbeg);
-        p->lex.ptok = end;
+      ternary:
+        pushback(p, c);
+        SET_LEX_STATE(EXPR_VALUE);
+        return '?';
     }
-}
-
-static void
-set_lastline(struct parser_params *p, VALUE v)
-{
-    p->lex.pbeg = p->lex.pcur = RSTRING_PTR(v);
-    p->lex.pend = p->lex.pcur + RSTRING_LEN(v);
-    p->lex.lastline = v;
-}
-
-static int
-nextline(struct parser_params *p, int set_encoding)
-{
-    VALUE v = p->lex.nextline;
-    p->lex.nextline = 0;
-    if (!v) {
-        if (p->eofp)
-            return -1;
-
-        if (!lex_eol_ptr_p(p, p->lex.pbeg) && *(p->lex.pend-1) != '\n') {
-            goto end_of_input;
+    newtok(p);
+    enc = p->enc;
+    int w = parser_precise_mbclen(p, start);
+    if (is_identchar(p, start, p->lex.pend, p->enc) &&
+        !(lex_eol_ptr_n_p(p, start, w) || !is_identchar(p, start + w, p->lex.pend, p->enc))) {
+        if (space_seen) {
+            const char *ptr = start;
+            do {
+                int n = parser_precise_mbclen(p, ptr);
+                if (n < 0) return -1;
+                ptr += n;
+            } while (!lex_eol_ptr_p(p, ptr) && is_identchar(p, ptr, p->lex.pend, p->enc));
+            rb_warn2("'?' just followed by '%.*s' is interpreted as" \
+                     " a conditional operator, put a space after '?'",
+                     WARN_I((int)(ptr - start)), WARN_S_L(start, (ptr - start)));
         }
-
-        if (!p->lex.input || NIL_P(v = lex_getline(p))) {
-          end_of_input:
-            p->eofp = 1;
-            lex_goto_eol(p);
-            return -1;
+        goto ternary;
+    }
+    else if (c == '\\') {
+        if (peek(p, 'u')) {
+            nextc(p);
+            enc = rb_utf8_encoding();
+            tokadd_utf8(p, &enc, -1, 0, 0);
         }
-#ifndef RIPPER
-        if (p->debug_lines) {
-            if (set_encoding) rb_enc_associate(v, p->enc);
-            rb_ary_push(p->debug_lines, v);
+        else if (!ISASCII(c = peekc(p)) && c != -1) {
+            nextc(p);
+            if (tokadd_mbchar(p, c) == -1) return 0;
+        }
+        else {
+            c = read_escape(p, 0, p->lex.pcur - rb_strlen_lit("?\\"));
+            tokadd(p, c);
         }
-#endif
-        p->cr_seen = FALSE;
-    }
-    else if (NIL_P(v)) {
-        /* after here-document without terminator */
-        goto end_of_input;
     }
-    add_delayed_token(p, p->lex.ptok, p->lex.pend, __LINE__);
-    if (p->heredoc_end > 0) {
-        p->ruby_sourceline = p->heredoc_end;
-        p->heredoc_end = 0;
+    else {
+        if (tokadd_mbchar(p, c) == -1) return 0;
     }
-    p->ruby_sourceline++;
-    set_lastline(p, v);
-    token_flush(p);
-    return 0;
+    tokfix(p);
+    lit = STR_NEW3(tok(p), toklen(p), enc, 0);
+    set_yylval_str(lit);
+    SET_LEX_STATE(EXPR_END);
+    return tCHAR;
 }
 
-static int
-parser_cr(struct parser_params *p, int c)
+static enum yytokentype
+parse_percent(struct parser_params *p, const int space_seen, const enum lex_state_e last_state)
 {
-    if (peek(p, '\n')) {
-        p->lex.pcur++;
-        c = '\n';
-    }
-    return c;
-}
+    register int c;
+    const char *ptok = p->lex.pcur;
 
-static inline int
-nextc0(struct parser_params *p, int set_encoding)
-{
-    int c;
+    if (IS_BEG()) {
+        int term;
+        int paren;
 
-    if (UNLIKELY(lex_eol_p(p) || p->eofp || RTEST(p->lex.nextline))) {
-        if (nextline(p, set_encoding)) return -1;
-    }
-    c = (unsigned char)*p->lex.pcur++;
-    if (UNLIKELY(c == '\r')) {
-        c = parser_cr(p, c);
-    }
+        c = nextc(p);
+      quotation:
+        if (c == -1) goto unterminated;
+        if (!ISALNUM(c)) {
+            term = c;
+            if (!ISASCII(c)) goto unknown;
+            c = 'Q';
+        }
+        else {
+            term = nextc(p);
+            if (rb_enc_isalnum(term, p->enc) || !parser_isascii(p)) {
+              unknown:
+                pushback(p, term);
+                c = parser_precise_mbclen(p, p->lex.pcur);
+                if (c < 0) return 0;
+                p->lex.pcur += c;
+                yyerror0("unknown type of %string");
+                return 0;
+            }
+        }
+        if (term == -1) {
+          unterminated:
+            compile_error(p, "unterminated quoted string meets end of file");
+            return 0;
+        }
+        paren = term;
+        if (term == '(') term = ')';
+        else if (term == '[') term = ']';
+        else if (term == '{') term = '}';
+        else if (term == '<') term = '>';
+        else paren = 0;
 
-    return c;
-}
-#define nextc(p) nextc0(p, TRUE)
+        p->lex.ptok = ptok-1;
+        switch (c) {
+          case 'Q':
+            p->lex.strterm = NEW_STRTERM(str_dquote, term, paren);
+            return tSTRING_BEG;
 
-static void
-pushback(struct parser_params *p, int c)
-{
-    if (c == -1) return;
-    p->eofp = 0;
-    p->lex.pcur--;
-    if (p->lex.pcur > p->lex.pbeg && p->lex.pcur[0] == '\n' && p->lex.pcur[-1] == '\r') {
-        p->lex.pcur--;
-    }
-}
+          case 'q':
+            p->lex.strterm = NEW_STRTERM(str_squote, term, paren);
+            return tSTRING_BEG;
 
-#define was_bol(p) ((p)->lex.pcur == (p)->lex.pbeg + 1)
+          case 'W':
+            p->lex.strterm = NEW_STRTERM(str_dword, term, paren);
+            return tWORDS_BEG;
 
-#define tokfix(p) ((p)->tokenbuf[(p)->tokidx]='\0')
-#define tok(p) (p)->tokenbuf
-#define toklen(p) (p)->tokidx
+          case 'w':
+            p->lex.strterm = NEW_STRTERM(str_sword, term, paren);
+            return tQWORDS_BEG;
 
-static int
-looking_at_eol_p(struct parser_params *p)
-{
-    const char *ptr = p->lex.pcur;
-    while (!lex_eol_ptr_p(p, ptr)) {
-        int c = (unsigned char)*ptr++;
-        int eol = (c == '\n' || c == '#');
-        if (eol || !ISSPACE(c)) {
-            return eol;
-        }
-    }
-    return TRUE;
-}
+          case 'I':
+            p->lex.strterm = NEW_STRTERM(str_dword, term, paren);
+            return tSYMBOLS_BEG;
 
-static char*
-newtok(struct parser_params *p)
-{
-    p->tokidx = 0;
-    p->tokline = p->ruby_sourceline;
-    if (!p->tokenbuf) {
-        p->toksiz = 60;
-        p->tokenbuf = ALLOC_N(char, 60);
-    }
-    if (p->toksiz > 4096) {
-        p->toksiz = 60;
-        REALLOC_N(p->tokenbuf, char, 60);
-    }
-    return p->tokenbuf;
-}
+          case 'i':
+            p->lex.strterm = NEW_STRTERM(str_sword, term, paren);
+            return tQSYMBOLS_BEG;
 
-static char *
-tokspace(struct parser_params *p, int n)
-{
-    p->tokidx += n;
+          case 'x':
+            p->lex.strterm = NEW_STRTERM(str_xquote, term, paren);
+            return tXSTRING_BEG;
 
-    if (p->tokidx >= p->toksiz) {
-        do {p->toksiz *= 2;} while (p->toksiz < p->tokidx);
-        REALLOC_N(p->tokenbuf, char, p->toksiz);
+          case 'r':
+            p->lex.strterm = NEW_STRTERM(str_regexp, term, paren);
+            return tREGEXP_BEG;
+
+          case 's':
+            p->lex.strterm = NEW_STRTERM(str_ssym, term, paren);
+            SET_LEX_STATE(EXPR_FNAME|EXPR_FITEM);
+            return tSYMBEG;
+
+          default:
+            yyerror0("unknown type of %string");
+            return 0;
+        }
     }
-    return &p->tokenbuf[p->tokidx-n];
-}
-
-static void
-tokadd(struct parser_params *p, int c)
-{
-    p->tokenbuf[p->tokidx++] = (char)c;
-    if (p->tokidx >= p->toksiz) {
-        p->toksiz *= 2;
-        REALLOC_N(p->tokenbuf, char, p->toksiz);
+    if ((c = nextc(p)) == '=') {
+        set_yylval_id('%');
+        SET_LEX_STATE(EXPR_BEG);
+        return tOP_ASGN;
+    }
+    if (IS_SPCARG(c) || (IS_lex_state(EXPR_FITEM) && c == 's')) {
+        goto quotation;
     }
+    SET_LEX_STATE(IS_AFTER_OPERATOR() ? EXPR_ARG : EXPR_BEG);
+    pushback(p, c);
+    return warn_balanced('%', "%%", "string literal");
 }
 
 static int
-tok_hex(struct parser_params *p, size_t *numlen)
+tokadd_ident(struct parser_params *p, int c)
 {
-    int c;
-
-    c = (int)ruby_scan_hex(p->lex.pcur, 2, numlen);
-    if (!*numlen) {
-        yyerror0("invalid hex escape");
-        token_flush(p);
-        return 0;
-    }
-    p->lex.pcur += *numlen;
-    return c;
+    do {
+        if (tokadd_mbchar(p, c) == -1) return -1;
+        c = nextc(p);
+    } while (parser_is_identchar(p));
+    pushback(p, c);
+    return 0;
 }
 
-#define tokcopy(p, n) memcpy(tokspace(p, n), (p)->lex.pcur - (n), (n))
-
-static int
-escaped_control_code(int c)
+static ID
+tokenize_ident(struct parser_params *p)
 {
-    int c2 = 0;
-    switch (c) {
-      case ' ':
-        c2 = 's';
-        break;
-      case '\n':
-        c2 = 'n';
-        break;
-      case '\t':
-        c2 = 't';
-        break;
-      case '\v':
-        c2 = 'v';
-        break;
-      case '\r':
-        c2 = 'r';
-        break;
-      case '\f':
-        c2 = 'f';
-        break;
-    }
-    return c2;
-}
+    ID ident = TOK_INTERN();
 
-#define WARN_SPACE_CHAR(c, prefix) \
-    rb_warn1("invalid character syntax; use "prefix"\\%c", WARN_I(c2))
+    set_yylval_name(ident);
+
+    return ident;
+}
 
 static int
-tokadd_codepoint(struct parser_params *p, rb_encoding **encp,
-                 int regexp_literal, int wide)
+parse_numvar(struct parser_params *p)
 {
-    size_t numlen;
-    int codepoint = (int)ruby_scan_hex(p->lex.pcur, wide ? p->lex.pend - p->lex.pcur : 4, &numlen);
-    p->lex.pcur += numlen;
-    if (p->lex.strterm == NULL ||
-        (strterm_is_heredoc((VALUE)p->lex.strterm)) ||
-        (p->lex.strterm->u.literal.u1.func != str_regexp)) {
-        if (wide ? (numlen == 0 || numlen > 6) : (numlen < 4))  {
-            literal_flush(p, p->lex.pcur);
-            yyerror0("invalid Unicode escape");
-            return wide && numlen > 0;
-        }
-        if (codepoint > 0x10ffff) {
-            literal_flush(p, p->lex.pcur);
-            yyerror0("invalid Unicode codepoint (too large)");
-            return wide;
-        }
-        if ((codepoint & 0xfffff800) == 0xd800) {
-            literal_flush(p, p->lex.pcur);
-            yyerror0("invalid Unicode codepoint");
-            return wide;
-        }
-    }
-    if (regexp_literal) {
-        tokcopy(p, (int)numlen);
-    }
-    else if (codepoint >= 0x80) {
-        rb_encoding *utf8 = rb_utf8_encoding();
-        if (*encp && utf8 != *encp) {
-            YYLTYPE loc = RUBY_INIT_YYLLOC();
-            compile_error(p, "UTF-8 mixed within %s source", rb_enc_name(*encp));
-            parser_show_error_line(p, &loc);
-            return wide;
-        }
-        *encp = utf8;
-        tokaddmbc(p, codepoint, *encp);
+    size_t len;
+    int overflow;
+    unsigned long n = ruby_scan_digits(tok(p)+1, toklen(p)-1, 10, &len, &overflow);
+    const unsigned long nth_ref_max =
+        ((FIXNUM_MAX < INT_MAX) ? FIXNUM_MAX : INT_MAX) >> 1;
+    /* NTH_REF is left-shifted to be ORed with back-ref flag and
+     * turned into a Fixnum, in compile.c */
+
+    if (overflow || n > nth_ref_max) {
+        /* compile_error()? */
+        rb_warn1("'%s' is too big for a number variable, always nil", WARN_S(tok(p)));
+        return 0;		/* $0 is $PROGRAM_NAME, not NTH_REF */
     }
     else {
-        tokadd(p, codepoint);
+        return (int)n;
     }
-    return TRUE;
 }
 
-static int tokadd_mbchar(struct parser_params *p, int c);
-
-/* return value is for ?\u3042 */
-static void
-tokadd_utf8(struct parser_params *p, rb_encoding **encp,
-            int term, int symbol_literal, int regexp_literal)
+static enum yytokentype
+parse_gvar(struct parser_params *p, const enum lex_state_e last_state)
 {
-    /*
-     * If `term` is not -1, then we allow multiple codepoints in \u{}
-     * upto `term` byte, otherwise we're parsing a character literal.
-     * And then add the codepoints to the current token.
-     */
-    static const char multiple_codepoints[] = "Multiple codepoints at single character literal";
+    const char *ptr = p->lex.pcur;
+    register int c;
 
-    const int open_brace = '{', close_brace = '}';
+    SET_LEX_STATE(EXPR_END);
+    p->lex.ptok = ptr - 1; /* from '$' */
+    newtok(p);
+    c = nextc(p);
+    switch (c) {
+      case '_':		/* $_: last read line string */
+        c = nextc(p);
+        if (parser_is_identchar(p)) {
+            tokadd(p, '$');
+            tokadd(p, '_');
+            break;
+        }
+        pushback(p, c);
+        c = '_';
+        /* fall through */
+      case '~': 	/* $~: match-data */
+      case '*': 	/* $*: argv */
+      case '$': 	/* $$: pid */
+      case '?': 	/* $?: last status */
+      case '!': 	/* $!: error string */
+      case '@': 	/* $@: error position */
+      case '/': 	/* $/: input record separator */
+      case '\\':	/* $\: output record separator */
+      case ';': 	/* $;: field separator */
+      case ',': 	/* $,: output field separator */
+      case '.': 	/* $.: last read line number */
+      case '=': 	/* $=: ignorecase */
+      case ':': 	/* $:: load path */
+      case '<': 	/* $<: default input handle */
+      case '>': 	/* $>: default output handle */
+      case '\"':	/* $": already loaded files */
+        tokadd(p, '$');
+        tokadd(p, c);
+        goto gvar;
 
-    if (regexp_literal) { tokadd(p, '\\'); tokadd(p, 'u'); }
+      case '-':
+        tokadd(p, '$');
+        tokadd(p, c);
+        c = nextc(p);
+        if (parser_is_identchar(p)) {
+            if (tokadd_mbchar(p, c) == -1) return 0;
+        }
+        else {
+            pushback(p, c);
+            pushback(p, '-');
+            return '$';
+        }
+      gvar:
+        tokenize_ident(p);
+        return tGVAR;
 
-    if (peek(p, open_brace)) {  /* handle \u{...} form */
-        if (regexp_literal && p->lex.strterm->u.literal.u1.func == str_regexp) {
-            /*
-             * Skip parsing validation code and copy bytes as-is until term or
-             * closing brace, in order to correctly handle extended regexps where
-             * invalid unicode escapes are allowed in comments. The regexp parser
-             * does its own validation and will catch any issues.
-             */
-            int c = *p->lex.pcur;
+      case '&': 	/* $&: last match */
+      case '`': 	/* $`: string before last match */
+      case '\'':	/* $': string after last match */
+      case '+': 	/* $+: string matches last paren. */
+        if (IS_lex_state_for(last_state, EXPR_FNAME)) {
+            tokadd(p, '$');
             tokadd(p, c);
-            for (c = *++p->lex.pcur; p->lex.pcur < p->lex.pend; c = *++p->lex.pcur) {
-                if (c == close_brace) {
-                    tokadd(p, c);
-                    ++p->lex.pcur;
-                    break;
-                }
-                else if (c == term) {
-                    break;
-                }
-                if (c == '\\' && p->lex.pcur + 1 < p->lex.pend) {
-                    tokadd(p, c);
-                    c = *++p->lex.pcur;
-                }
-                tokadd_mbchar(p, c);
-            }
+            goto gvar;
         }
-        else {
-            const char *second = NULL;
-            int c, last = nextc(p);
-            if (lex_eol_p(p)) goto unterminated;
-            while (ISSPACE(c = peekc(p)) && !lex_eol_ptr_p(p, ++p->lex.pcur));
-            while (c != close_brace) {
-                if (c == term) goto unterminated;
-                if (second == multiple_codepoints)
-                    second = p->lex.pcur;
-                if (regexp_literal) tokadd(p, last);
-                if (!tokadd_codepoint(p, encp, regexp_literal, TRUE)) {
-                    break;
-                }
-                while (ISSPACE(c = peekc(p))) {
-                    if (lex_eol_ptr_p(p, ++p->lex.pcur)) goto unterminated;
-                    last = c;
-                }
-                if (term == -1 && !second)
-                    second = multiple_codepoints;
-            }
+        set_yylval_node(NEW_BACK_REF(c, &_cur_loc));
+        return tBACK_REF;
 
-            if (c != close_brace) {
-              unterminated:
-                token_flush(p);
-                yyerror0("unterminated Unicode escape");
-                return;
+      case '1': case '2': case '3':
+      case '4': case '5': case '6':
+      case '7': case '8': case '9':
+        tokadd(p, '$');
+        do {
+            tokadd(p, c);
+            c = nextc(p);
+        } while (c != -1 && ISDIGIT(c));
+        pushback(p, c);
+        if (IS_lex_state_for(last_state, EXPR_FNAME)) goto gvar;
+        tokfix(p);
+        c = parse_numvar(p);
+        set_yylval_node(NEW_NTH_REF(c, &_cur_loc));
+        return tNTH_REF;
+
+      default:
+        if (!parser_is_identchar(p)) {
+            YYLTYPE loc = RUBY_INIT_YYLLOC();
+            if (c == -1 || ISSPACE(c)) {
+                compile_error(p, "'$' without identifiers is not allowed as a global variable name");
             }
-            if (second && second != multiple_codepoints) {
-                const char *pcur = p->lex.pcur;
-                p->lex.pcur = second;
-                dispatch_scan_event(p, tSTRING_CONTENT);
-                token_flush(p);
-                p->lex.pcur = pcur;
-                yyerror0(multiple_codepoints);
-                token_flush(p);
+            else {
+                pushback(p, c);
+                compile_error(p, "'$%c' is not allowed as a global variable name", c);
             }
-
-            if (regexp_literal) tokadd(p, close_brace);
-            nextc(p);
+            parser_show_error_line(p, &loc);
+            set_yylval_noname();
+            return tGVAR;
         }
+        /* fall through */
+      case '0':
+        tokadd(p, '$');
     }
-    else {			/* handle \uxxxx form */
-        if (!tokadd_codepoint(p, encp, regexp_literal, FALSE)) {
-            token_flush(p);
-            return;
-        }
+
+    if (tokadd_ident(p, c)) return 0;
+    SET_LEX_STATE(EXPR_END);
+    if (VALID_SYMNAME_P(tok(p), toklen(p), p->enc, ID_GLOBAL)) {
+        tokenize_ident(p);
+    }
+    else {
+        compile_error(p, "'%.*s' is not allowed as a global variable name", toklen(p), tok(p));
+        set_yylval_noname();
     }
+    return tGVAR;
 }
 
-#define ESCAPE_CONTROL 1
-#define ESCAPE_META    2
-
-static int
-read_escape(struct parser_params *p, int flags, rb_encoding **encp)
+static bool
+parser_numbered_param(struct parser_params *p, int n)
 {
-    int c;
-    size_t numlen;
-
-    switch (c = nextc(p)) {
-      case '\\':	/* Backslash */
-        return c;
-
-      case 'n':	/* newline */
-        return '\n';
-
-      case 't':	/* horizontal tab */
-        return '\t';
-
-      case 'r':	/* carriage-return */
-        return '\r';
-
-      case 'f':	/* form-feed */
-        return '\f';
-
-      case 'v':	/* vertical tab */
-        return '\13';
+    if (n < 0) return false;
 
-      case 'a':	/* alarm(bell) */
-        return '\007';
+    if (DVARS_TERMINAL_P(p->lvtbl->args) || DVARS_TERMINAL_P(p->lvtbl->args->prev)) {
+        return false;
+    }
+    if (p->max_numparam == ORDINAL_PARAM) {
+        compile_error(p, "ordinary parameter is defined");
+        return false;
+    }
+    struct vtable *args = p->lvtbl->args;
+    if (p->max_numparam < n) {
+        p->max_numparam = n;
+    }
+    while (n > args->pos) {
+        vtable_add(args, NUMPARAM_IDX_TO_ID(args->pos+1));
+    }
+    return true;
+}
 
-      case 'e':	/* escape */
-        return 033;
+static enum yytokentype
+parse_atmark(struct parser_params *p, const enum lex_state_e last_state)
+{
+    const char *ptr = p->lex.pcur;
+    enum yytokentype result = tIVAR;
+    register int c = nextc(p);
+    YYLTYPE loc;
 
-      case '0': case '1': case '2': case '3': /* octal constant */
-      case '4': case '5': case '6': case '7':
+    p->lex.ptok = ptr - 1; /* from '@' */
+    newtok(p);
+    tokadd(p, '@');
+    if (c == '@') {
+        result = tCVAR;
+        tokadd(p, '@');
+        c = nextc(p);
+    }
+    SET_LEX_STATE(IS_lex_state_for(last_state, EXPR_FNAME) ? EXPR_ENDFN : EXPR_END);
+    if (c == -1 || !parser_is_identchar(p)) {
         pushback(p, c);
-        c = (int)ruby_scan_oct(p->lex.pcur, 3, &numlen);
-        p->lex.pcur += numlen;
-        return c;
-
-      case 'x':	/* hex constant */
-        c = tok_hex(p, &numlen);
-        if (numlen == 0) return 0;
-        return c;
-
-      case 'b':	/* backspace */
-        return '\010';
-
-      case 's':	/* space */
-        return ' ';
-
-      case 'M':
-        if (flags & ESCAPE_META) goto eof;
-        if ((c = nextc(p)) != '-') {
-            goto eof;
-        }
-        if ((c = nextc(p)) == '\\') {
-            switch (peekc(p)) {
-              case 'u': case 'U':
-                nextc(p);
-                goto eof;
-            }
-            return read_escape(p, flags|ESCAPE_META, encp) | 0x80;
+        RUBY_SET_YYLLOC(loc);
+        if (result == tIVAR) {
+            compile_error(p, "'@' without identifiers is not allowed as an instance variable name");
         }
-        else if (c == -1 || !ISASCII(c)) goto eof;
         else {
-            int c2 = escaped_control_code(c);
-            if (c2) {
-                if (ISCNTRL(c) || !(flags & ESCAPE_CONTROL)) {
-                    WARN_SPACE_CHAR(c2, "\\M-");
-                }
-                else {
-                    WARN_SPACE_CHAR(c2, "\\C-\\M-");
-                }
-            }
-            else if (ISCNTRL(c)) goto eof;
-            return ((c & 0xff) | 0x80);
-        }
-
-      case 'C':
-        if ((c = nextc(p)) != '-') {
-            goto eof;
+            compile_error(p, "'@@' without identifiers is not allowed as a class variable name");
         }
-      case 'c':
-        if (flags & ESCAPE_CONTROL) goto eof;
-        if ((c = nextc(p))== '\\') {
-            switch (peekc(p)) {
-              case 'u': case 'U':
-                nextc(p);
-                goto eof;
-            }
-            c = read_escape(p, flags|ESCAPE_CONTROL, encp);
+        parser_show_error_line(p, &loc);
+        set_yylval_noname();
+        SET_LEX_STATE(EXPR_END);
+        return result;
+    }
+    else if (ISDIGIT(c)) {
+        pushback(p, c);
+        RUBY_SET_YYLLOC(loc);
+        if (result == tIVAR) {
+            compile_error(p, "'@%c' is not allowed as an instance variable name", c);
         }
-        else if (c == '?')
-            return 0177;
-        else if (c == -1 || !ISASCII(c)) goto eof;
         else {
-            int c2 = escaped_control_code(c);
-            if (c2) {
-                if (ISCNTRL(c)) {
-                    if (flags & ESCAPE_META) {
-                        WARN_SPACE_CHAR(c2, "\\M-");
-                    }
-                    else {
-                        WARN_SPACE_CHAR(c2, "");
-                    }
-                }
-                else {
-                    if (flags & ESCAPE_META) {
-                        WARN_SPACE_CHAR(c2, "\\M-\\C-");
-                    }
-                    else {
-                        WARN_SPACE_CHAR(c2, "\\C-");
-                    }
-                }
-            }
-            else if (ISCNTRL(c)) goto eof;
+            compile_error(p, "'@@%c' is not allowed as a class variable name", c);
         }
-        return c & 0x9f;
-
-      eof:
-      case -1:
-        yyerror0("Invalid escape character syntax");
-        token_flush(p);
-        return '\0';
-
-      default:
-        return c;
+        parser_show_error_line(p, &loc);
+        set_yylval_noname();
+        SET_LEX_STATE(EXPR_END);
+        return result;
     }
-}
 
-static void
-tokaddmbc(struct parser_params *p, int c, rb_encoding *enc)
-{
-    int len = rb_enc_codelen(c, enc);
-    rb_enc_mbcput(c, tokspace(p, len), enc);
+    if (tokadd_ident(p, c)) return 0;
+    tokenize_ident(p);
+    return result;
 }
 
-static int
-tokadd_escape(struct parser_params *p, rb_encoding **encp)
+static enum yytokentype
+parse_ident(struct parser_params *p, int c, int cmd_state)
 {
-    int c;
-    size_t numlen;
+    enum yytokentype result;
+    bool is_ascii = true;
+    const enum lex_state_e last_state = p->lex.state;
+    ID ident;
+    int enforce_keyword_end = 0;
 
-    switch (c = nextc(p)) {
-      case '\n':
-        return 0;		/* just ignore */
+    do {
+        if (!ISASCII(c)) is_ascii = false;
+        if (tokadd_mbchar(p, c) == -1) return 0;
+        c = nextc(p);
+    } while (parser_is_identchar(p));
+    if ((c == '!' || c == '?') && !peek(p, '=')) {
+        result = tFID;
+        tokadd(p, c);
+    }
+    else if (c == '=' && IS_lex_state(EXPR_FNAME) &&
+             (!peek(p, '~') && !peek(p, '>') && (!peek(p, '=') || (peek_n(p, '>', 1))))) {
+        result = tIDENTIFIER;
+        tokadd(p, c);
+    }
+    else {
+        result = tCONSTANT;	/* assume provisionally */
+        pushback(p, c);
+    }
+    tokfix(p);
 
-      case '0': case '1': case '2': case '3': /* octal constant */
-      case '4': case '5': case '6': case '7':
-        {
-            ruby_scan_oct(--p->lex.pcur, 3, &numlen);
-            if (numlen == 0) goto eof;
-            p->lex.pcur += numlen;
-            tokcopy(p, (int)numlen + 1);
+    if (IS_LABEL_POSSIBLE()) {
+        if (IS_LABEL_SUFFIX(0)) {
+            SET_LEX_STATE(EXPR_ARG|EXPR_LABELED);
+            nextc(p);
+            tokenize_ident(p);
+            return tLABEL;
         }
-        return 0;
+    }
 
-      case 'x':	/* hex constant */
-        {
-            tok_hex(p, &numlen);
-            if (numlen == 0) return -1;
-            tokcopy(p, (int)numlen + 2);
-        }
-        return 0;
+#ifndef RIPPER
+    if (peek_end_expect_token_locations(p)) {
+        const rb_code_position_t *end_pos;
+        int lineno, column;
+        int beg_pos = (int)(p->lex.ptok - p->lex.pbeg);
 
-      eof:
-      case -1:
-        yyerror0("Invalid escape character syntax");
-        token_flush(p);
-        return -1;
+        end_pos = peek_end_expect_token_locations(p)->pos;
+        lineno = end_pos->lineno;
+        column = end_pos->column;
 
-      default:
-        tokadd(p, '\\');
-        tokadd(p, c);
-    }
-    return 0;
-}
+        if (p->debug) {
+            rb_parser_printf(p, "enforce_keyword_end check. current: (%d, %d), peek: (%d, %d)\n",
+                                p->ruby_sourceline, beg_pos, lineno, column);
+        }
 
-static int
-regx_options(struct parser_params *p)
-{
-    int kcode = 0;
-    int kopt = 0;
-    int options = 0;
-    int c, opt, kc;
+        if ((p->ruby_sourceline > lineno) && (beg_pos <= column)) {
+            const struct kwtable *kw;
 
-    newtok(p);
-    while (c = nextc(p), ISALPHA(c)) {
-        if (c == 'o') {
-            options |= RE_OPTION_ONCE;
+            if ((IS_lex_state(EXPR_DOT)) && (kw = rb_reserved_word(tok(p), toklen(p))) && (kw && kw->id[0] == keyword_end)) {
+                if (p->debug) rb_parser_printf(p, "enforce_keyword_end is enabled\n");
+                enforce_keyword_end = 1;
+            }
         }
-        else if (rb_char_to_option_kcode(c, &opt, &kc)) {
-            if (kc >= 0) {
-                if (kc != rb_ascii8bit_encindex()) kcode = c;
-                kopt = opt;
+    }
+#endif
+
+    if (is_ascii && (!IS_lex_state(EXPR_DOT) || enforce_keyword_end)) {
+        const struct kwtable *kw;
+
+        /* See if it is a reserved word.  */
+        kw = rb_reserved_word(tok(p), toklen(p));
+        if (kw) {
+            enum lex_state_e state = p->lex.state;
+            if (IS_lex_state_for(state, EXPR_FNAME)) {
+                SET_LEX_STATE(EXPR_ENDFN);
+                set_yylval_name(rb_intern2(tok(p), toklen(p)));
+                return kw->id[0];
+            }
+            SET_LEX_STATE(kw->state);
+            if (IS_lex_state(EXPR_BEG)) {
+                p->command_start = TRUE;
+            }
+            if (kw->id[0] == keyword_do) {
+                if (lambda_beginning_p()) {
+                    p->lex.lpar_beg = -1; /* make lambda_beginning_p() == FALSE in the body of "-> do ... end" */
+                    return keyword_do_LAMBDA;
+                }
+                if (COND_P()) return keyword_do_cond;
+                if (CMDARG_P() && !IS_lex_state_for(state, EXPR_CMDARG))
+                    return keyword_do_block;
+                return keyword_do;
             }
+            if (IS_lex_state_for(state, (EXPR_BEG | EXPR_LABELED | EXPR_CLASS)))
+                return kw->id[0];
             else {
-                options |= opt;
+                if (kw->id[0] != kw->id[1])
+                    SET_LEX_STATE(EXPR_BEG | EXPR_LABEL);
+                return kw->id[1];
             }
         }
-        else {
-            tokadd(p, c);
-        }
-    }
-    options |= kopt;
-    pushback(p, c);
-    if (toklen(p)) {
-        YYLTYPE loc = RUBY_INIT_YYLLOC();
-        tokfix(p);
-        compile_error(p, "unknown regexp option%s - %*s",
-                      toklen(p) > 1 ? "s" : "", toklen(p), tok(p));
-        parser_show_error_line(p, &loc);
     }
-    return options | RE_OPTION_ENCODING(kcode);
-}
-
-static int
-tokadd_mbchar(struct parser_params *p, int c)
-{
-    int len = parser_precise_mbclen(p, p->lex.pcur-1);
-    if (len < 0) return -1;
-    tokadd(p, c);
-    p->lex.pcur += --len;
-    if (len > 0) tokcopy(p, len);
-    return c;
-}
 
-static inline int
-simple_re_meta(int c)
-{
-    switch (c) {
-      case '$': case '*': case '+': case '.':
-      case '?': case '^': case '|':
-      case ')': case ']': case '}': case '>':
-        return TRUE;
-      default:
-        return FALSE;
+    if (IS_lex_state(EXPR_BEG_ANY | EXPR_ARG_ANY | EXPR_DOT)) {
+        if (cmd_state) {
+            SET_LEX_STATE(EXPR_CMDARG);
+        }
+        else {
+            SET_LEX_STATE(EXPR_ARG);
+        }
     }
-}
-
-static int
-parser_update_heredoc_indent(struct parser_params *p, int c)
-{
-    if (p->heredoc_line_indent == -1) {
-        if (c == '\n') p->heredoc_line_indent = 0;
+    else if (p->lex.state == EXPR_FNAME) {
+        SET_LEX_STATE(EXPR_ENDFN);
     }
     else {
-        if (c == ' ') {
-            p->heredoc_line_indent++;
-            return TRUE;
-        }
-        else if (c == '\t') {
-            int w = (p->heredoc_line_indent / TAB_WIDTH) + 1;
-            p->heredoc_line_indent = w * TAB_WIDTH;
-            return TRUE;
-        }
-        else if (c != '\n') {
-            if (p->heredoc_indent > p->heredoc_line_indent) {
-                p->heredoc_indent = p->heredoc_line_indent;
-            }
-            p->heredoc_line_indent = -1;
-        }
+        SET_LEX_STATE(EXPR_END);
     }
-    return FALSE;
-}
 
-static void
-parser_mixed_error(struct parser_params *p, rb_encoding *enc1, rb_encoding *enc2)
-{
-    YYLTYPE loc = RUBY_INIT_YYLLOC();
-    const char *n1 = rb_enc_name(enc1), *n2 = rb_enc_name(enc2);
-    compile_error(p, "%s mixed within %s source", n1, n2);
-    parser_show_error_line(p, &loc);
+    ident = tokenize_ident(p);
+    if (result == tCONSTANT && is_local_id(ident)) result = tIDENTIFIER;
+    if (!IS_lex_state_for(last_state, EXPR_DOT|EXPR_FNAME) &&
+        (result == tIDENTIFIER) && /* not EXPR_FNAME, not attrasgn */
+        (lvar_defined(p, ident) || NUMPARAM_ID_P(ident))) {
+        SET_LEX_STATE(EXPR_END|EXPR_LABEL);
+    }
+    return result;
 }
 
 static void
-parser_mixed_escape(struct parser_params *p, const char *beg, rb_encoding *enc1, rb_encoding *enc2)
+warn_cr(struct parser_params *p)
 {
-    const char *pos = p->lex.pcur;
-    p->lex.pcur = beg;
-    parser_mixed_error(p, enc1, enc2);
-    p->lex.pcur = pos;
+    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");
+    }
 }
 
-static inline char
-nibble_char_upper(unsigned int c)
+static enum yytokentype
+parser_yylex(struct parser_params *p)
 {
-    c &= 0xf;
-    return c + (c < 10 ? '0' : 'A' - 10);
-}
+    register int c;
+    int space_seen = 0;
+    int cmd_state;
+    int label;
+    enum lex_state_e last_state;
+    int fallthru = FALSE;
+    int token_seen = p->token_seen;
 
-static int
-tokadd_string(struct parser_params *p,
-              int func, int term, int paren, long *nest,
-              rb_encoding **encp, rb_encoding **enc)
-{
-    int c;
-    bool erred = false;
-#ifdef RIPPER
-    const int heredoc_end = (p->heredoc_end ? p->heredoc_end + 1 : 0);
-    int top_of_line = FALSE;
+    if (p->lex.strterm) {
+        if (strterm_is_heredoc(p->lex.strterm)) {
+            token_flush(p);
+            return here_document(p, &p->lex.strterm->u.heredoc);
+        }
+        else {
+            token_flush(p);
+            return parse_string(p, &p->lex.strterm->u.literal);
+        }
+    }
+    cmd_state = p->command_start;
+    p->command_start = FALSE;
+    p->token_seen = TRUE;
+#ifndef RIPPER
+    token_flush(p);
+#endif
+  retry:
+    last_state = p->lex.state;
+    switch (c = nextc(p)) {
+      case '\0':		/* NUL */
+      case '\004':		/* ^D */
+      case '\032':		/* ^Z */
+      case -1:			/* end of script. */
+        p->eofp = 1;
+#ifndef RIPPER
+        if (p->end_expect_token_locations) {
+            pop_end_expect_token_locations(p);
+            RUBY_SET_YYLLOC_OF_DUMMY_END(*p->yylloc);
+            return tDUMNY_END;
+        }
 #endif
+        /* Set location for end-of-input because dispatch_scan_event is not called. */
+        RUBY_SET_YYLLOC(*p->yylloc);
+        return END_OF_INPUT;
 
-#define mixed_error(enc1, enc2) \
-    (void)(erred || (parser_mixed_error(p, enc1, enc2), erred = true))
-#define mixed_escape(beg, enc1, enc2) \
-    (void)(erred || (parser_mixed_escape(p, beg, enc1, enc2), erred = true))
+        /* white spaces */
+      case '\r':
+        warn_cr(p);
+        /* fall through */
+      case ' ': case '\t': case '\f':
+      case '\13': /* '\v' */
+        space_seen = 1;
+        while ((c = nextc(p))) {
+            switch (c) {
+              case '\r':
+                warn_cr(p);
+                /* fall through */
+              case ' ': case '\t': case '\f':
+              case '\13': /* '\v' */
+                break;
+              default:
+                goto outofloop;
+            }
+        }
+      outofloop:
+        pushback(p, c);
+        dispatch_scan_event(p, tSP);
+#ifndef RIPPER
+        token_flush(p);
+#endif
+        goto retry;
 
-    while ((c = nextc(p)) != -1) {
-        if (p->heredoc_indent > 0) {
-            parser_update_heredoc_indent(p, c);
+      case '#':		/* it's a comment */
+        p->token_seen = token_seen;
+        const char *const pcur = p->lex.pcur, *const ptok = p->lex.ptok;
+        /* no magic_comment in shebang line */
+        if (!parser_magic_comment(p, p->lex.pcur, p->lex.pend - p->lex.pcur)) {
+            if (comment_at_top(p)) {
+                set_file_encoding(p, p->lex.pcur, p->lex.pend);
+            }
+        }
+        p->lex.pcur = pcur, p->lex.ptok = ptok;
+        lex_goto_eol(p);
+        dispatch_scan_event(p, tCOMMENT);
+        fallthru = TRUE;
+        /* fall through */
+      case '\n':
+        p->token_seen = token_seen;
+        rb_parser_string_t *prevline = p->lex.lastline;
+        c = (IS_lex_state(EXPR_BEG|EXPR_CLASS|EXPR_FNAME|EXPR_DOT) &&
+             !IS_lex_state(EXPR_LABELED));
+        if (c || IS_lex_state_all(EXPR_ARG|EXPR_LABELED)) {
+            if (!fallthru) {
+                dispatch_scan_event(p, tIGNORED_NL);
+            }
+            fallthru = FALSE;
+            if (!c && p->ctxt.in_kwarg) {
+                goto normal_newline;
+            }
+            goto retry;
         }
-#ifdef RIPPER
-        if (top_of_line && heredoc_end == p->ruby_sourceline) {
-            pushback(p, c);
-            break;
+        while (1) {
+            switch (c = nextc(p)) {
+              case ' ': case '\t': case '\f': case '\r':
+              case '\13': /* '\v' */
+                space_seen = 1;
+                break;
+              case '#':
+                pushback(p, c);
+                if (space_seen) {
+                    dispatch_scan_event(p, tSP);
+                    token_flush(p);
+                }
+                goto retry;
+              case '&':
+              case '.': {
+                dispatch_delayed_token(p, tIGNORED_NL);
+                if (peek(p, '.') == (c == '&')) {
+                    pushback(p, c);
+                    dispatch_scan_event(p, tSP);
+                    goto retry;
+                }
+              }
+              default:
+                p->ruby_sourceline--;
+                p->lex.nextline = p->lex.lastline;
+                set_lastline(p, prevline);
+              case -1:		/* EOF no decrement*/
+                if (c == -1 && space_seen) {
+                    dispatch_scan_event(p, tSP);
+                }
+                lex_goto_eol(p);
+                if (c != -1) {
+                    token_flush(p);
+                    RUBY_SET_YYLLOC(*p->yylloc);
+                }
+                goto normal_newline;
+            }
         }
-#endif
+      normal_newline:
+        p->command_start = TRUE;
+        SET_LEX_STATE(EXPR_BEG);
+        return '\n';
 
-        if (paren && c == paren) {
-            ++*nest;
-        }
-        else if (c == term) {
-            if (!nest || !*nest) {
-                pushback(p, c);
-                break;
+      case '*':
+        if ((c = nextc(p)) == '*') {
+            if ((c = nextc(p)) == '=') {
+                set_yylval_id(idPow);
+                SET_LEX_STATE(EXPR_BEG);
+                return tOP_ASGN;
+            }
+            pushback(p, c);
+            if (IS_SPCARG(c)) {
+                rb_warning0("'**' interpreted as argument prefix");
+                c = tDSTAR;
+            }
+            else if (IS_BEG()) {
+                c = tDSTAR;
+            }
+            else {
+                c = warn_balanced((enum ruby_method_ids)tPOW, "**", "argument prefix");
             }
-            --*nest;
         }
-        else if ((func & STR_FUNC_EXPAND) && c == '#' && !lex_eol_p(p)) {
-            int c2 = *p->lex.pcur;
-            if (c2 == '$' || c2 == '@' || c2 == '{') {
-                pushback(p, c);
-                break;
+        else {
+            if (c == '=') {
+                set_yylval_id('*');
+                SET_LEX_STATE(EXPR_BEG);
+                return tOP_ASGN;
+            }
+            pushback(p, c);
+            if (IS_SPCARG(c)) {
+                rb_warning0("'*' interpreted as argument prefix");
+                c = tSTAR;
+            }
+            else if (IS_BEG()) {
+                c = tSTAR;
+            }
+            else {
+                c = warn_balanced('*', "*", "argument prefix");
             }
         }
-        else if (c == '\\') {
-            c = nextc(p);
-            switch (c) {
-              case '\n':
-                if (func & STR_FUNC_QWORDS) break;
-                if (func & STR_FUNC_EXPAND) {
-                    if (!(func & STR_FUNC_INDENT) || (p->heredoc_indent < 0))
-                        continue;
-                    if (c == term) {
-                        c = '\\';
-                        goto terminate;
-                    }
-                }
-                tokadd(p, '\\');
-                break;
-
-              case '\\':
-                if (func & STR_FUNC_ESCAPE) tokadd(p, c);
-                break;
+        SET_LEX_STATE(IS_AFTER_OPERATOR() ? EXPR_ARG : EXPR_BEG);
+        return c;
 
-              case 'u':
-                if ((func & STR_FUNC_EXPAND) == 0) {
-                    tokadd(p, '\\');
-                    break;
-                }
-                tokadd_utf8(p, enc, term,
-                            func & STR_FUNC_SYMBOL,
-                            func & STR_FUNC_REGEXP);
-                continue;
+      case '!':
+        c = nextc(p);
+        if (IS_AFTER_OPERATOR()) {
+            SET_LEX_STATE(EXPR_ARG);
+            if (c == '@') {
+                return '!';
+            }
+        }
+        else {
+            SET_LEX_STATE(EXPR_BEG);
+        }
+        if (c == '=') {
+            return tNEQ;
+        }
+        if (c == '~') {
+            return tNMATCH;
+        }
+        pushback(p, c);
+        return '!';
 
-              default:
-                if (c == -1) return -1;
-                if (!ISASCII(c)) {
-                    if ((func & STR_FUNC_EXPAND) == 0) tokadd(p, '\\');
-                    goto non_ascii;
-                }
-                if (func & STR_FUNC_REGEXP) {
-                    switch (c) {
-                      case 'c':
-                      case 'C':
-                      case 'M': {
-                        pushback(p, c);
-                        c = read_escape(p, 0, enc);
+      case '=':
+        if (was_bol(p)) {
+            /* skip embedded rd document */
+            if (word_match_p(p, "begin", 5)) {
+                int first_p = TRUE;
 
-                        char *t = tokspace(p, rb_strlen_lit("\\x00"));
-                        *t++ = '\\';
-                        *t++ = 'x';
-                        *t++ = nibble_char_upper(c >> 4);
-                        *t++ = nibble_char_upper(c);
-                        continue;
-                      }
+                lex_goto_eol(p);
+                dispatch_scan_event(p, tEMBDOC_BEG);
+                for (;;) {
+                    lex_goto_eol(p);
+                    if (!first_p) {
+                        dispatch_scan_event(p, tEMBDOC);
                     }
-
-                    if (c == term && !simple_re_meta(c)) {
-                        tokadd(p, c);
-                        continue;
+                    first_p = FALSE;
+                    c = nextc(p);
+                    if (c == -1) {
+                        compile_error(p, "embedded document meets end of file");
+                        return END_OF_INPUT;
                     }
-                    pushback(p, c);
-                    if ((c = tokadd_escape(p, enc)) < 0)
-                        return -1;
-                    if (*enc && *enc != *encp) {
-                        mixed_escape(p->lex.ptok+2, *enc, *encp);
+                    if (c == '=' && word_match_p(p, "end", 3)) {
+                        break;
                     }
-                    continue;
-                }
-                else if (func & STR_FUNC_EXPAND) {
-                    pushback(p, c);
-                    if (func & STR_FUNC_ESCAPE) tokadd(p, '\\');
-                    c = read_escape(p, 0, enc);
-                }
-                else if ((func & STR_FUNC_QWORDS) && ISSPACE(c)) {
-                    /* ignore backslashed spaces in %w */
-                }
-                else if (c != term && !(paren && c == paren)) {
-                    tokadd(p, '\\');
                     pushback(p, c);
-                    continue;
                 }
+                lex_goto_eol(p);
+                dispatch_scan_event(p, tEMBDOC_END);
+                goto retry;
             }
         }
-        else if (!parser_isascii(p)) {
-          non_ascii:
-            if (!*enc) {
-                *enc = *encp;
-            }
-            else if (*enc != *encp) {
-                mixed_error(*enc, *encp);
-                continue;
+
+        SET_LEX_STATE(IS_AFTER_OPERATOR() ? EXPR_ARG : EXPR_BEG);
+        if ((c = nextc(p)) == '=') {
+            if ((c = nextc(p)) == '=') {
+                return tEQQ;
             }
-            if (tokadd_mbchar(p, c) == -1) return -1;
-            continue;
-        }
-        else if ((func & STR_FUNC_QWORDS) && ISSPACE(c)) {
             pushback(p, c);
-            break;
+            return tEQ;
         }
-        if (c & 0x80) {
-            if (!*enc) {
-                *enc = *encp;
+        if (c == '~') {
+            return tMATCH;
+        }
+        else if (c == '>') {
+            return tASSOC;
+        }
+        pushback(p, c);
+        return '=';
+
+      case '<':
+        c = nextc(p);
+        if (c == '<' &&
+            !IS_lex_state(EXPR_DOT | EXPR_CLASS) &&
+            !IS_END() &&
+            (!IS_ARG() || IS_lex_state(EXPR_LABELED) || space_seen)) {
+            enum  yytokentype token = heredoc_identifier(p);
+            if (token) return token < 0 ? 0 : token;
+        }
+        if (IS_AFTER_OPERATOR()) {
+            SET_LEX_STATE(EXPR_ARG);
+        }
+        else {
+            if (IS_lex_state(EXPR_CLASS))
+                p->command_start = TRUE;
+            SET_LEX_STATE(EXPR_BEG);
+        }
+        if (c == '=') {
+            if ((c = nextc(p)) == '>') {
+                return tCMP;
             }
-            else if (*enc != *encp) {
-                mixed_error(*enc, *encp);
-                continue;
+            pushback(p, c);
+            return tLEQ;
+        }
+        if (c == '<') {
+            if ((c = nextc(p)) == '=') {
+                set_yylval_id(idLTLT);
+                SET_LEX_STATE(EXPR_BEG);
+                return tOP_ASGN;
             }
+            pushback(p, c);
+            return warn_balanced((enum ruby_method_ids)tLSHFT, "<<", "here document");
         }
-        tokadd(p, c);
-#ifdef RIPPER
-        top_of_line = (c == '\n');
-#endif
-    }
-  terminate:
-    if (*enc) *encp = *enc;
-    return c;
-}
-
-/* imemo_parser_strterm for literal */
-#define NEW_STRTERM(func, term, paren) \
-    (rb_strterm_t *)new_strterm((VALUE)(func), (VALUE)(paren), (VALUE)(term), 0, 0)
+        pushback(p, c);
+        return '<';
 
-#ifdef RIPPER
-static void
-flush_string_content(struct parser_params *p, rb_encoding *enc)
-{
-    VALUE content = yylval.val;
-    if (!ripper_is_node_yylval(p, content))
-        content = ripper_new_yylval(p, 0, 0, content);
-    if (has_delayed_token(p)) {
-        ptrdiff_t len = p->lex.pcur - p->lex.ptok;
-        if (len > 0) {
-            rb_enc_str_buf_cat(p->delayed.token, p->lex.ptok, len, enc);
+      case '>':
+        SET_LEX_STATE(IS_AFTER_OPERATOR() ? EXPR_ARG : EXPR_BEG);
+        if ((c = nextc(p)) == '=') {
+            return tGEQ;
         }
-        dispatch_delayed_token(p, tSTRING_CONTENT);
-        p->lex.ptok = p->lex.pcur;
-        RNODE(content)->nd_rval = yylval.val;
-    }
-    dispatch_scan_event(p, tSTRING_CONTENT);
-    if (yylval.val != content)
-        RNODE(content)->nd_rval = yylval.val;
-    yylval.val = content;
-}
-#else
-static void
-flush_string_content(struct parser_params *p, rb_encoding *enc)
-{
-    if (has_delayed_token(p)) {
-        ptrdiff_t len = p->lex.pcur - p->lex.ptok;
-        if (len > 0) {
-            rb_enc_str_buf_cat(p->delayed.token, p->lex.ptok, len, enc);
-            p->delayed.end_line = p->ruby_sourceline;
-            p->delayed.end_col = rb_long2int(p->lex.pcur - p->lex.pbeg);
+        if (c == '>') {
+            if ((c = nextc(p)) == '=') {
+                set_yylval_id(idGTGT);
+                SET_LEX_STATE(EXPR_BEG);
+                return tOP_ASGN;
+            }
+            pushback(p, c);
+            return tRSHFT;
         }
-        dispatch_delayed_token(p, tSTRING_CONTENT);
-        p->lex.ptok = p->lex.pcur;
-    }
-    dispatch_scan_event(p, tSTRING_CONTENT);
-}
-#endif
-
-RUBY_FUNC_EXPORTED const uint_least32_t ruby_global_name_punct_bits[(0x7e - 0x20 + 31) / 32];
-/* this can be shared with ripper, since it's independent from struct
- * parser_params. */
-#ifndef RIPPER
-#define BIT(c, idx) (((c) / 32 - 1 == idx) ? (1U << ((c) % 32)) : 0)
-#define SPECIAL_PUNCT(idx) ( \
-        BIT('~', idx) | BIT('*', idx) | BIT('$', idx) | BIT('?', idx) | \
-        BIT('!', idx) | BIT('@', idx) | BIT('/', idx) | BIT('\\', idx) | \
-        BIT(';', idx) | BIT(',', idx) | BIT('.', idx) | BIT('=', idx) | \
-        BIT(':', idx) | BIT('<', idx) | BIT('>', idx) | BIT('\"', idx) | \
-        BIT('&', idx) | BIT('`', idx) | BIT('\'', idx) | BIT('+', idx) | \
-        BIT('0', idx))
-const uint_least32_t ruby_global_name_punct_bits[] = {
-    SPECIAL_PUNCT(0),
-    SPECIAL_PUNCT(1),
-    SPECIAL_PUNCT(2),
-};
-#undef BIT
-#undef SPECIAL_PUNCT
-#endif
+        pushback(p, c);
+        return '>';
 
-static enum yytokentype
-parser_peek_variable_name(struct parser_params *p)
-{
-    int c;
-    const char *ptr = p->lex.pcur;
+      case '"':
+        label = (IS_LABEL_POSSIBLE() ? str_label : 0);
+        p->lex.strterm = NEW_STRTERM(str_dquote | label, '"', 0);
+        p->lex.ptok = p->lex.pcur-1;
+        return tSTRING_BEG;
 
-    if (lex_eol_ptr_n_p(p, ptr, 1)) return 0;
-    c = *ptr++;
-    switch (c) {
-      case '$':
-        if ((c = *ptr) == '-') {
-            if (lex_eol_ptr_p(p, ++ptr)) return 0;
-            c = *ptr;
-        }
-        else if (is_global_name_punct(c) || ISDIGIT(c)) {
-            return tSTRING_DVAR;
+      case '`':
+        if (IS_lex_state(EXPR_FNAME)) {
+            SET_LEX_STATE(EXPR_ENDFN);
+            return c;
         }
-        break;
-      case '@':
-        if ((c = *ptr) == '@') {
-            if (lex_eol_ptr_p(p, ++ptr)) return 0;
-            c = *ptr;
+        if (IS_lex_state(EXPR_DOT)) {
+            if (cmd_state)
+                SET_LEX_STATE(EXPR_CMDARG);
+            else
+                SET_LEX_STATE(EXPR_ARG);
+            return c;
         }
-        break;
-      case '{':
-        p->lex.pcur = ptr;
-        p->command_start = TRUE;
-        return tSTRING_DBEG;
-      default:
-        return 0;
-    }
-    if (!ISASCII(c) || c == '_' || ISALPHA(c))
-        return tSTRING_DVAR;
-    return 0;
-}
-
-#define IS_ARG() IS_lex_state(EXPR_ARG_ANY)
-#define IS_END() IS_lex_state(EXPR_END_ANY)
-#define IS_BEG() (IS_lex_state(EXPR_BEG_ANY) || IS_lex_state_all(EXPR_ARG|EXPR_LABELED))
-#define IS_SPCARG(c) (IS_ARG() && space_seen && !ISSPACE(c))
-#define IS_LABEL_POSSIBLE() (\
-        (IS_lex_state(EXPR_LABEL|EXPR_ENDFN) && !cmd_state) || \
-        IS_ARG())
-#define IS_LABEL_SUFFIX(n) (peek_n(p, ':',(n)) && !peek_n(p, ':', (n)+1))
-#define IS_AFTER_OPERATOR() IS_lex_state(EXPR_FNAME | EXPR_DOT)
+        p->lex.strterm = NEW_STRTERM(str_xquote, '`', 0);
+        return tXSTRING_BEG;
 
-static inline enum yytokentype
-parser_string_term(struct parser_params *p, int func)
-{
-    p->lex.strterm = 0;
-    if (func & STR_FUNC_REGEXP) {
-        set_yylval_num(regx_options(p));
-        dispatch_scan_event(p, tREGEXP_END);
-        SET_LEX_STATE(EXPR_END);
-        return tREGEXP_END;
-    }
-    if ((func & STR_FUNC_LABEL) && IS_LABEL_SUFFIX(0)) {
-        nextc(p);
-        SET_LEX_STATE(EXPR_ARG|EXPR_LABELED);
-        return tLABEL_END;
-    }
-    SET_LEX_STATE(EXPR_END);
-    return tSTRING_END;
-}
+      case '\'':
+        label = (IS_LABEL_POSSIBLE() ? str_label : 0);
+        p->lex.strterm = NEW_STRTERM(str_squote | label, '\'', 0);
+        p->lex.ptok = p->lex.pcur-1;
+        return tSTRING_BEG;
 
-static enum yytokentype
-parse_string(struct parser_params *p, rb_strterm_literal_t *quote)
-{
-    int func = (int)quote->u1.func;
-    int term = (int)quote->u3.term;
-    int paren = (int)quote->u2.paren;
-    int c, space = 0;
-    rb_encoding *enc = p->enc;
-    rb_encoding *base_enc = 0;
-    VALUE lit;
+      case '?':
+        return parse_qmark(p, space_seen);
 
-    if (func & STR_FUNC_TERM) {
-        if (func & STR_FUNC_QWORDS) nextc(p); /* delayed term */
-        SET_LEX_STATE(EXPR_END);
-        p->lex.strterm = 0;
-        return func & STR_FUNC_REGEXP ? tREGEXP_END : tSTRING_END;
-    }
-    c = nextc(p);
-    if ((func & STR_FUNC_QWORDS) && ISSPACE(c)) {
-        while (c != '\n' && ISSPACE(c = nextc(p)));
-        space = 1;
-    }
-    if (func & STR_FUNC_LIST) {
-        quote->u1.func &= ~STR_FUNC_LIST;
-        space = 1;
-    }
-    if (c == term && !quote->u0.nest) {
-        if (func & STR_FUNC_QWORDS) {
-            quote->u1.func |= STR_FUNC_TERM;
-            pushback(p, c); /* dispatch the term at tSTRING_END */
-            add_delayed_token(p, p->lex.ptok, p->lex.pcur, __LINE__);
-            return ' ';
+      case '&':
+        if ((c = nextc(p)) == '&') {
+            SET_LEX_STATE(EXPR_BEG);
+            if ((c = nextc(p)) == '=') {
+                set_yylval_id(idANDOP);
+                SET_LEX_STATE(EXPR_BEG);
+                return tOP_ASGN;
+            }
+            pushback(p, c);
+            return tANDOP;
         }
-        return parser_string_term(p, func);
-    }
-    if (space) {
-        if (!ISSPACE(c)) pushback(p, c);
-        add_delayed_token(p, p->lex.ptok, p->lex.pcur, __LINE__);
-        return ' ';
-    }
-    newtok(p);
-    if ((func & STR_FUNC_EXPAND) && c == '#') {
-        int t = parser_peek_variable_name(p);
-        if (t) return t;
-        tokadd(p, '#');
-        c = nextc(p);
-    }
-    pushback(p, c);
-    if (tokadd_string(p, func, term, paren, &quote->u0.nest,
-                      &enc, &base_enc) == -1) {
-        if (p->eofp) {
-#ifndef RIPPER
-# define unterminated_literal(mesg) yyerror0(mesg)
-#else
-# define unterminated_literal(mesg) compile_error(p,  mesg)
-#endif
-            literal_flush(p, p->lex.pcur);
-            if (func & STR_FUNC_QWORDS) {
-                /* no content to add, bailing out here */
-                unterminated_literal("unterminated list meets end of file");
-                p->lex.strterm = 0;
-                return tSTRING_END;
+        else if (c == '=') {
+            set_yylval_id('&');
+            SET_LEX_STATE(EXPR_BEG);
+            return tOP_ASGN;
+        }
+        else if (c == '.') {
+            set_yylval_id(idANDDOT);
+            SET_LEX_STATE(EXPR_DOT);
+            return tANDDOT;
+        }
+        pushback(p, c);
+        if (IS_SPCARG(c)) {
+            if ((c != ':') ||
+                (c = peekc_n(p, 1)) == -1 ||
+                !(c == '\'' || c == '"' ||
+                  is_identchar(p, (p->lex.pcur+1), p->lex.pend, p->enc))) {
+                rb_warning0("'&' interpreted as argument prefix");
             }
-            if (func & STR_FUNC_REGEXP) {
-                unterminated_literal("unterminated regexp meets end of file");
+            c = tAMPER;
+        }
+        else if (IS_BEG()) {
+            c = tAMPER;
+        }
+        else {
+            c = warn_balanced('&', "&", "argument prefix");
+        }
+        SET_LEX_STATE(IS_AFTER_OPERATOR() ? EXPR_ARG : EXPR_BEG);
+        return c;
+
+      case '|':
+        if ((c = nextc(p)) == '|') {
+            SET_LEX_STATE(EXPR_BEG);
+            if ((c = nextc(p)) == '=') {
+                set_yylval_id(idOROP);
+                SET_LEX_STATE(EXPR_BEG);
+                return tOP_ASGN;
             }
-            else {
-                unterminated_literal("unterminated string meets end of file");
+            pushback(p, c);
+            if (IS_lex_state_for(last_state, EXPR_BEG)) {
+                c = '|';
+                pushback(p, '|');
+                return c;
             }
-            quote->u1.func |= STR_FUNC_TERM;
+            return tOROP;
         }
-    }
-
-    tokfix(p);
-    lit = STR_NEW3(tok(p), toklen(p), enc, func);
-    set_yylval_str(lit);
-    flush_string_content(p, enc);
-
-    return tSTRING_CONTENT;
-}
-
-static enum yytokentype
-heredoc_identifier(struct parser_params *p)
-{
-    /*
-     * term_len is length of `<<"END"` except `END`,
-     * in this case term_len is 4 (<, <, " and ").
-     */
-    long len, offset = p->lex.pcur - p->lex.pbeg;
-    int c = nextc(p), term, func = 0, quote = 0;
-    enum yytokentype token = tSTRING_BEG;
-    int indent = 0;
+        if (c == '=') {
+            set_yylval_id('|');
+            SET_LEX_STATE(EXPR_BEG);
+            return tOP_ASGN;
+        }
+        SET_LEX_STATE(IS_AFTER_OPERATOR() ? EXPR_ARG : EXPR_BEG|EXPR_LABEL);
+        pushback(p, c);
+        return '|';
 
-    if (c == '-') {
-        c = nextc(p);
-        func = STR_FUNC_INDENT;
-        offset++;
-    }
-    else if (c == '~') {
+      case '+':
         c = nextc(p);
-        func = STR_FUNC_INDENT;
-        offset++;
-        indent = INT_MAX;
-    }
-    switch (c) {
-      case '\'':
-        func |= str_squote; goto quoted;
-      case '"':
-        func |= str_dquote; goto quoted;
-      case '`':
-        token = tXSTRING_BEG;
-        func |= str_xquote; goto quoted;
-
-      quoted:
-        quote++;
-        offset++;
-        term = c;
-        len = 0;
-        while ((c = nextc(p)) != term) {
-            if (c == -1 || c == '\r' || c == '\n') {
-                yyerror0("unterminated here document identifier");
-                return -1;
+        if (IS_AFTER_OPERATOR()) {
+            SET_LEX_STATE(EXPR_ARG);
+            if (c == '@') {
+                return tUPLUS;
             }
+            pushback(p, c);
+            return '+';
         }
-        break;
+        if (c == '=') {
+            set_yylval_id('+');
+            SET_LEX_STATE(EXPR_BEG);
+            return tOP_ASGN;
+        }
+        if (IS_BEG() || (IS_SPCARG(c) && arg_ambiguous(p, '+'))) {
+            SET_LEX_STATE(EXPR_BEG);
+            pushback(p, c);
+            if (c != -1 && ISDIGIT(c)) {
+                return parse_numeric(p, '+');
+            }
+            return tUPLUS;
+        }
+        SET_LEX_STATE(EXPR_BEG);
+        pushback(p, c);
+        return warn_balanced('+', "+", "unary operator");
 
-      default:
-        if (!parser_is_identchar(p)) {
+      case '-':
+        c = nextc(p);
+        if (IS_AFTER_OPERATOR()) {
+            SET_LEX_STATE(EXPR_ARG);
+            if (c == '@') {
+                return tUMINUS;
+            }
             pushback(p, c);
-            if (func & STR_FUNC_INDENT) {
-                pushback(p, indent > 0 ? '~' : '-');
+            return '-';
+        }
+        if (c == '=') {
+            set_yylval_id('-');
+            SET_LEX_STATE(EXPR_BEG);
+            return tOP_ASGN;
+        }
+        if (c == '>') {
+            SET_LEX_STATE(EXPR_ENDFN);
+            yylval.num = p->lex.lpar_beg;
+            p->lex.lpar_beg = p->lex.paren_nest;
+            return tLAMBDA;
+        }
+        if (IS_BEG() || (IS_SPCARG(c) && arg_ambiguous(p, '-'))) {
+            SET_LEX_STATE(EXPR_BEG);
+            pushback(p, c);
+            if (c != -1 && ISDIGIT(c)) {
+                return tUMINUS_NUM;
             }
-            return 0;
+            return tUMINUS;
         }
-        func |= str_dquote;
-        do {
-            int n = parser_precise_mbclen(p, p->lex.pcur-1);
-            if (n < 0) return 0;
-            p->lex.pcur += --n;
-        } while ((c = nextc(p)) != -1 && parser_is_identchar(p));
+        SET_LEX_STATE(EXPR_BEG);
         pushback(p, c);
-        break;
-    }
+        return warn_balanced('-', "-", "unary operator");
 
-    len = p->lex.pcur - (p->lex.pbeg + offset) - quote;
-    if ((unsigned long)len >= HERETERM_LENGTH_MAX)
-        yyerror0("too long here document identifier");
-    dispatch_scan_event(p, tHEREDOC_BEG);
-    lex_goto_eol(p);
+      case '.': {
+        int is_beg = IS_BEG();
+        SET_LEX_STATE(EXPR_BEG);
+        if ((c = nextc(p)) == '.') {
+            if ((c = nextc(p)) == '.') {
+                if (p->ctxt.in_argdef || IS_LABEL_POSSIBLE()) {
+                    SET_LEX_STATE(EXPR_ENDARG);
+                    return tBDOT3;
+                }
+                if (p->lex.paren_nest == 0 && looking_at_eol_p(p)) {
+                    rb_warn0("... at EOL, should be parenthesized?");
+                }
+                return is_beg ? tBDOT3 : tDOT3;
+            }
+            pushback(p, c);
+            return is_beg ? tBDOT2 : tDOT2;
+        }
+        pushback(p, c);
+        if (c != -1 && ISDIGIT(c)) {
+            char prev = p->lex.pcur-1 > p->lex.pbeg ? *(p->lex.pcur-2) : 0;
+            parse_numeric(p, '.');
+            if (ISDIGIT(prev)) {
+                yyerror0("unexpected fraction part after numeric literal");
+            }
+            else {
+                yyerror0("no .<digit> floating literal anymore; put 0 before dot");
+            }
+            SET_LEX_STATE(EXPR_END);
+            p->lex.ptok = p->lex.pcur;
+            goto retry;
+        }
+        set_yylval_id('.');
+        SET_LEX_STATE(EXPR_DOT);
+        return '.';
+      }
 
-    p->lex.strterm = (rb_strterm_t *)new_strterm(0, 0, 0, p->lex.lastline, 1);
-    rb_strterm_heredoc_t *here = &p->lex.strterm->u.heredoc;
-    here->offset = offset;
-    here->sourceline = p->ruby_sourceline;
-    here->length = (int)len;
-    here->quote = quote;
-    here->func = func;
+      case '0': case '1': case '2': case '3': case '4':
+      case '5': case '6': case '7': case '8': case '9':
+        return parse_numeric(p, c);
 
-    token_flush(p);
-    p->heredoc_indent = indent;
-    p->heredoc_line_indent = 0;
-    return token;
-}
+      case ')':
+        COND_POP();
+        CMDARG_POP();
+        SET_LEX_STATE(EXPR_ENDFN);
+        p->lex.paren_nest--;
+        return c;
 
-static void
-heredoc_restore(struct parser_params *p, rb_strterm_heredoc_t *here)
-{
-    VALUE line;
+      case ']':
+        COND_POP();
+        CMDARG_POP();
+        SET_LEX_STATE(EXPR_END);
+        p->lex.paren_nest--;
+        return c;
 
-    p->lex.strterm = 0;
-    line = here->lastline;
-    p->lex.lastline = line;
-    p->lex.pbeg = RSTRING_PTR(line);
-    p->lex.pend = p->lex.pbeg + RSTRING_LEN(line);
-    p->lex.pcur = p->lex.pbeg + here->offset + here->length + here->quote;
-    p->lex.ptok = p->lex.pbeg + here->offset - here->quote;
-    p->heredoc_end = p->ruby_sourceline;
-    p->ruby_sourceline = (int)here->sourceline;
-    if (p->eofp) p->lex.nextline = Qnil;
-    p->eofp = 0;
-}
+      case '}':
+        /* tSTRING_DEND does COND_POP and CMDARG_POP in the yacc's rule */
+        if (!p->lex.brace_nest--) return tSTRING_DEND;
+        COND_POP();
+        CMDARG_POP();
+        SET_LEX_STATE(EXPR_END);
+        p->lex.paren_nest--;
+        return c;
 
-static int
-dedent_string(struct parser_params *p, VALUE string, int width)
-{
-    char *str;
-    long len;
-    int i, col = 0;
+      case ':':
+        c = nextc(p);
+        if (c == ':') {
+            if (IS_BEG() || IS_lex_state(EXPR_CLASS) || IS_SPCARG(-1)) {
+                SET_LEX_STATE(EXPR_BEG);
+                return tCOLON3;
+            }
+            set_yylval_id(idCOLON2);
+            SET_LEX_STATE(EXPR_DOT);
+            return tCOLON2;
+        }
+        if (IS_END() || ISSPACE(c) || c == '#') {
+            pushback(p, c);
+            c = warn_balanced(':', ":", "symbol literal");
+            SET_LEX_STATE(EXPR_BEG);
+            return c;
+        }
+        switch (c) {
+          case '\'':
+            p->lex.strterm = NEW_STRTERM(str_ssym, c, 0);
+            break;
+          case '"':
+            p->lex.strterm = NEW_STRTERM(str_dsym, c, 0);
+            break;
+          default:
+            pushback(p, c);
+            break;
+        }
+        SET_LEX_STATE(EXPR_FNAME);
+        return tSYMBEG;
 
-    RSTRING_GETMEM(string, str, len);
-    for (i = 0; i < len && col < width; i++) {
-        if (str[i] == ' ') {
-            col++;
+      case '/':
+        if (IS_BEG()) {
+            p->lex.strterm = NEW_STRTERM(str_regexp, '/', 0);
+            return tREGEXP_BEG;
+        }
+        if ((c = nextc(p)) == '=') {
+            set_yylval_id('/');
+            SET_LEX_STATE(EXPR_BEG);
+            return tOP_ASGN;
         }
-        else if (str[i] == '\t') {
-            int n = TAB_WIDTH * (col / TAB_WIDTH + 1);
-            if (n > width) break;
-            col = n;
+        pushback(p, c);
+        if (IS_SPCARG(c)) {
+            arg_ambiguous(p, '/');
+            p->lex.strterm = NEW_STRTERM(str_regexp, '/', 0);
+            return tREGEXP_BEG;
         }
-        else {
-            break;
+        SET_LEX_STATE(IS_AFTER_OPERATOR() ? EXPR_ARG : EXPR_BEG);
+        return warn_balanced('/', "/", "regexp literal");
+
+      case '^':
+        if ((c = nextc(p)) == '=') {
+            set_yylval_id('^');
+            SET_LEX_STATE(EXPR_BEG);
+            return tOP_ASGN;
         }
-    }
-    if (!i) return 0;
-    rb_str_modify(string);
-    str = RSTRING_PTR(string);
-    if (RSTRING_LEN(string) != len)
-        rb_fatal("literal string changed: %+"PRIsVALUE, string);
-    MEMMOVE(str, str + i, char, len - i);
-    rb_str_set_len(string, len - i);
-    return i;
-}
+        SET_LEX_STATE(IS_AFTER_OPERATOR() ? EXPR_ARG : EXPR_BEG);
+        pushback(p, c);
+        return '^';
 
-#ifndef RIPPER
-static NODE *
-heredoc_dedent(struct parser_params *p, NODE *root)
-{
-    NODE *node, *str_node, *prev_node;
-    int indent = p->heredoc_indent;
-    VALUE prev_lit = 0;
+      case ';':
+        SET_LEX_STATE(EXPR_BEG);
+        p->command_start = TRUE;
+        return ';';
 
-    if (indent <= 0) return root;
-    p->heredoc_indent = 0;
-    if (!root) return root;
+      case ',':
+        SET_LEX_STATE(EXPR_BEG|EXPR_LABEL);
+        return ',';
 
-    prev_node = node = str_node = root;
-    if (nd_type_p(root, NODE_LIST)) str_node = root->nd_head;
+      case '~':
+        if (IS_AFTER_OPERATOR()) {
+            if ((c = nextc(p)) != '@') {
+                pushback(p, c);
+            }
+            SET_LEX_STATE(EXPR_ARG);
+        }
+        else {
+            SET_LEX_STATE(EXPR_BEG);
+        }
+        return '~';
 
-    while (str_node) {
-        VALUE lit = str_node->nd_lit;
-        if (str_node->flags & NODE_FL_NEWLINE) {
-            dedent_string(p, lit, indent);
+      case '(':
+        if (IS_BEG()) {
+            c = tLPAREN;
         }
-        if (!prev_lit) {
-            prev_lit = lit;
+        else if (!space_seen) {
+            /* foo( ... ) => method call, no ambiguity */
         }
-        else if (!literal_concat0(p, prev_lit, lit)) {
-            return 0;
+        else if (IS_ARG() || IS_lex_state_all(EXPR_END|EXPR_LABEL)) {
+            c = tLPAREN_ARG;
         }
-        else {
-            NODE *end = node->nd_end;
-            node = prev_node->nd_next = node->nd_next;
-            if (!node) {
-                if (nd_type_p(prev_node, NODE_DSTR))
-                    nd_set_type(prev_node, NODE_STR);
-                break;
-            }
-            node->nd_end = end;
-            goto next_str;
+        else if (IS_lex_state(EXPR_ENDFN) && !lambda_beginning_p()) {
+            rb_warning0("parentheses after method name is interpreted as "
+                        "an argument list, not a decomposed argument");
         }
+        p->lex.paren_nest++;
+        COND_PUSH(0);
+        CMDARG_PUSH(0);
+        SET_LEX_STATE(EXPR_BEG|EXPR_LABEL);
+        return c;
 
-        str_node = 0;
-        while ((node = (prev_node = node)->nd_next) != 0) {
-          next_str:
-            if (!nd_type_p(node, NODE_LIST)) break;
-            if ((str_node = node->nd_head) != 0) {
-                enum node_type type = nd_type(str_node);
-                if (type == NODE_STR || type == NODE_DSTR) break;
-                prev_lit = 0;
-                str_node = 0;
+      case '[':
+        p->lex.paren_nest++;
+        if (IS_AFTER_OPERATOR()) {
+            if ((c = nextc(p)) == ']') {
+                p->lex.paren_nest--;
+                SET_LEX_STATE(EXPR_ARG);
+                if ((c = nextc(p)) == '=') {
+                    return tASET;
+                }
+                pushback(p, c);
+                return tAREF;
             }
+            pushback(p, c);
+            SET_LEX_STATE(EXPR_ARG|EXPR_LABEL);
+            return '[';
         }
-    }
-    return root;
-}
-#else /* RIPPER */
-static VALUE
-heredoc_dedent(struct parser_params *p, VALUE array)
-{
-    int indent = p->heredoc_indent;
-
-    if (indent <= 0) return array;
-    p->heredoc_indent = 0;
-    dispatch2(heredoc_dedent, array, INT2NUM(indent));
-    return array;
-}
-#endif
-
-static int
-whole_match_p(struct parser_params *p, const char *eos, long len, int indent)
-{
-    const char *beg = p->lex.pbeg;
-    const char *ptr = p->lex.pend;
-
-    if (ptr - beg < len) return FALSE;
-    if (ptr > beg && ptr[-1] == '\n') {
-        if (--ptr > beg && ptr[-1] == '\r') --ptr;
-        if (ptr - beg < len) return FALSE;
-    }
-    if (strncmp(eos, ptr -= len, len)) return FALSE;
-    if (indent) {
-        while (beg < ptr && ISSPACE(*beg)) beg++;
-    }
-    return beg == ptr;
-}
-
-static int
-word_match_p(struct parser_params *p, const char *word, long len)
-{
-    if (strncmp(p->lex.pcur, word, len)) return 0;
-    if (lex_eol_n_p(p, len)) return 1;
-    int c = (unsigned char)p->lex.pcur[len];
-    if (ISSPACE(c)) return 1;
-    switch (c) {
-      case '\0': case '\004': case '\032': return 1;
-    }
-    return 0;
-}
-
-#define NUM_SUFFIX_R   (1<<0)
-#define NUM_SUFFIX_I   (1<<1)
-#define NUM_SUFFIX_ALL 3
-
-static int
-number_literal_suffix(struct parser_params *p, int mask)
-{
-    int c, result = 0;
-    const char *lastp = p->lex.pcur;
+        else if (IS_BEG()) {
+            c = tLBRACK;
+        }
+        else if (IS_ARG() && (space_seen || IS_lex_state(EXPR_LABELED))) {
+            c = tLBRACK;
+        }
+        SET_LEX_STATE(EXPR_BEG|EXPR_LABEL);
+        COND_PUSH(0);
+        CMDARG_PUSH(0);
+        return c;
 
-    while ((c = nextc(p)) != -1) {
-        if ((mask & NUM_SUFFIX_I) && c == 'i') {
-            result |= (mask & NUM_SUFFIX_I);
-            mask &= ~NUM_SUFFIX_I;
-            /* r after i, rational of complex is disallowed */
-            mask &= ~NUM_SUFFIX_R;
-            continue;
+      case '{':
+        ++p->lex.brace_nest;
+        if (lambda_beginning_p())
+            c = tLAMBEG;
+        else if (IS_lex_state(EXPR_LABELED))
+            c = tLBRACE;      /* hash */
+        else if (IS_lex_state(EXPR_ARG_ANY | EXPR_END | EXPR_ENDFN))
+            c = '{';          /* block (primary) */
+        else if (IS_lex_state(EXPR_ENDARG))
+            c = tLBRACE_ARG;  /* block (expr) */
+        else
+            c = tLBRACE;      /* hash */
+        if (c != tLBRACE) {
+            p->command_start = TRUE;
+            SET_LEX_STATE(EXPR_BEG);
         }
-        if ((mask & NUM_SUFFIX_R) && c == 'r') {
-            result |= (mask & NUM_SUFFIX_R);
-            mask &= ~NUM_SUFFIX_R;
-            continue;
+        else {
+            SET_LEX_STATE(EXPR_BEG|EXPR_LABEL);
         }
-        if (!ISASCII(c) || ISALPHA(c) || c == '_') {
-            p->lex.pcur = lastp;
-            literal_flush(p, p->lex.pcur);
-            return 0;
+        ++p->lex.paren_nest;  /* after lambda_beginning_p() */
+        COND_PUSH(0);
+        CMDARG_PUSH(0);
+        return c;
+
+      case '\\':
+        c = nextc(p);
+        if (c == '\n') {
+            space_seen = 1;
+            dispatch_scan_event(p, tSP);
+            goto retry; /* skip \\n */
         }
+        if (c == ' ') return tSP;
+        if (ISSPACE(c)) return c;
         pushback(p, c);
-        break;
-    }
-    return result;
-}
+        return '\\';
 
-static enum yytokentype
-set_number_literal(struct parser_params *p, VALUE v,
-                   enum yytokentype type, int suffix)
-{
-    if (suffix & NUM_SUFFIX_I) {
-        v = rb_complex_raw(INT2FIX(0), v);
-        type = tIMAGINARY;
-    }
-    set_yylval_literal(v);
-    SET_LEX_STATE(EXPR_END);
-    return type;
-}
+      case '%':
+        return parse_percent(p, space_seen, last_state);
 
-static enum yytokentype
-set_integer_literal(struct parser_params *p, VALUE v, int suffix)
-{
-    enum yytokentype type = tINTEGER;
-    if (suffix & NUM_SUFFIX_R) {
-        v = rb_rational_raw1(v);
-        type = tRATIONAL;
-    }
-    return set_number_literal(p, v, type, suffix);
-}
+      case '$':
+        return parse_gvar(p, last_state);
+
+      case '@':
+        return parse_atmark(p, last_state);
 
+      case '_':
+        if (was_bol(p) && whole_match_p(p, "__END__", 7, 0)) {
+            p->ruby__end__seen = 1;
+            p->eofp = 1;
 #ifdef RIPPER
-static void
-dispatch_heredoc_end(struct parser_params *p)
-{
-    VALUE str;
-    if (has_delayed_token(p))
-        dispatch_delayed_token(p, tSTRING_CONTENT);
-    str = STR_NEW(p->lex.ptok, p->lex.pend - p->lex.ptok);
-    ripper_dispatch1(p, ripper_token2eventid(tHEREDOC_END), str);
-    RUBY_SET_YYLLOC_FROM_STRTERM_HEREDOC(*p->yylloc);
-    lex_goto_eol(p);
-    token_flush(p);
-}
+            lex_goto_eol(p);
+            dispatch_scan_event(p, k__END__);
+#endif
+            return END_OF_INPUT;
+        }
+        newtok(p);
+        break;
 
-#else
-#define dispatch_heredoc_end(p) parser_dispatch_heredoc_end(p, __LINE__)
-static void
-parser_dispatch_heredoc_end(struct parser_params *p, int line)
-{
-    if (has_delayed_token(p))
-        dispatch_delayed_token(p, tSTRING_CONTENT);
+      default:
+        if (!parser_is_identchar(p)) {
+            compile_error(p, "Invalid char '\\x%02X' in expression", c);
+            token_flush(p);
+            goto retry;
+        }
 
-    if (p->keep_tokens) {
-        VALUE str = STR_NEW(p->lex.ptok, p->lex.pend - p->lex.ptok);
-        RUBY_SET_YYLLOC_OF_HEREDOC_END(*p->yylloc);
-        parser_append_tokens(p, str, tHEREDOC_END, line);
+        newtok(p);
+        break;
     }
 
-    RUBY_SET_YYLLOC_FROM_STRTERM_HEREDOC(*p->yylloc);
-    lex_goto_eol(p);
-    token_flush(p);
+    return parse_ident(p, c, cmd_state);
 }
-#endif
 
 static enum yytokentype
-here_document(struct parser_params *p, rb_strterm_heredoc_t *here)
+yylex(YYSTYPE *lval, YYLTYPE *yylloc, struct parser_params *p)
 {
-    int c, func, indent = 0;
-    const char *eos, *ptr, *ptr_end;
-    long len;
-    VALUE str = 0;
-    rb_encoding *enc = p->enc;
-    rb_encoding *base_enc = 0;
-    int bol;
+    enum yytokentype t;
 
-    eos = RSTRING_PTR(here->lastline) + here->offset;
-    len = here->length;
-    indent = (func = here->func) & STR_FUNC_INDENT;
+    p->lval = lval;
+    lval->node = 0;
+    p->yylloc = yylloc;
 
-    if ((c = nextc(p)) == -1) {
-      error:
-#ifdef RIPPER
-        if (!has_delayed_token(p)) {
-            dispatch_scan_event(p, tSTRING_CONTENT);
-        }
-        else {
-            if ((len = p->lex.pcur - p->lex.ptok) > 0) {
-                if (!(func & STR_FUNC_REGEXP) && rb_enc_asciicompat(enc)) {
-                    int cr = ENC_CODERANGE_UNKNOWN;
-                    rb_str_coderange_scan_restartable(p->lex.ptok, p->lex.pcur, enc, &cr);
-                    if (cr != ENC_CODERANGE_7BIT &&
-                        rb_is_usascii_enc(p->enc) &&
-                        enc != rb_utf8_encoding()) {
-                        enc = rb_ascii8bit_encoding();
-                    }
-                }
-                rb_enc_str_buf_cat(p->delayed.token, p->lex.ptok, len, enc);
-            }
-            dispatch_delayed_token(p, tSTRING_CONTENT);
-        }
-        lex_goto_eol(p);
-#endif
-        heredoc_restore(p, &p->lex.strterm->u.heredoc);
-        compile_error(p, "can't find string \"%.*s\" anywhere before EOF",
-                      (int)len, eos);
-        token_flush(p);
-        p->lex.strterm = 0;
-        SET_LEX_STATE(EXPR_END);
-        return tSTRING_END;
-    }
-    bol = was_bol(p);
-    if (!bol) {
-        /* not beginning of line, cannot be the terminator */
-    }
-    else if (p->heredoc_line_indent == -1) {
-        /* `heredoc_line_indent == -1` means
-         * - "after an interpolation in the same line", or
-         * - "in a continuing line"
-         */
-        p->heredoc_line_indent = 0;
-    }
-    else if (whole_match_p(p, eos, len, indent)) {
-        dispatch_heredoc_end(p);
-      restore:
-        heredoc_restore(p, &p->lex.strterm->u.heredoc);
-        token_flush(p);
-        p->lex.strterm = 0;
-        SET_LEX_STATE(EXPR_END);
-        return tSTRING_END;
-    }
+    t = parser_yylex(p);
 
-    if (!(func & STR_FUNC_EXPAND)) {
-        do {
-            ptr = RSTRING_PTR(p->lex.lastline);
-            ptr_end = p->lex.pend;
-            if (ptr_end > ptr) {
-                switch (ptr_end[-1]) {
-                  case '\n':
-                    if (--ptr_end == ptr || ptr_end[-1] != '\r') {
-                        ptr_end++;
-                        break;
-                    }
-                  case '\r':
-                    --ptr_end;
-                }
-            }
+    if (has_delayed_token(p))
+        dispatch_delayed_token(p, t);
+    else if (t != END_OF_INPUT)
+        dispatch_scan_event(p, t);
 
-            if (p->heredoc_indent > 0) {
-                long i = 0;
-                while (ptr + i < ptr_end && parser_update_heredoc_indent(p, ptr[i]))
-                    i++;
-                p->heredoc_line_indent = 0;
-            }
+    return t;
+}
 
-            if (str)
-                rb_str_cat(str, ptr, ptr_end - ptr);
-            else
-                str = STR_NEW(ptr, ptr_end - ptr);
-            if (!lex_eol_ptr_p(p, ptr_end)) rb_str_cat(str, "\n", 1);
-            lex_goto_eol(p);
-            if (p->heredoc_indent > 0) {
-                goto flush_str;
-            }
-            if (nextc(p) == -1) {
-                if (str) {
-                    str = 0;
-                }
-                goto error;
-            }
-        } while (!whole_match_p(p, eos, len, indent));
-    }
-    else {
-        /*	int mb = ENC_CODERANGE_7BIT, *mbp = &mb;*/
-        newtok(p);
-        if (c == '#') {
-            int t = parser_peek_variable_name(p);
-            if (p->heredoc_line_indent != -1) {
-                if (p->heredoc_indent > p->heredoc_line_indent) {
-                    p->heredoc_indent = p->heredoc_line_indent;
-                }
-                p->heredoc_line_indent = -1;
-            }
-            if (t) return t;
-            tokadd(p, '#');
-            c = nextc(p);
-        }
-        do {
-            pushback(p, c);
-            enc = p->enc;
-            if ((c = tokadd_string(p, func, '\n', 0, NULL, &enc, &base_enc)) == -1) {
-                if (p->eofp) goto error;
-                goto restore;
-            }
-            if (c != '\n') {
-                if (c == '\\') p->heredoc_line_indent = -1;
-              flush:
-                str = STR_NEW3(tok(p), toklen(p), enc, func);
-              flush_str:
-                set_yylval_str(str);
-#ifndef RIPPER
-                if (bol) yylval.node->flags |= NODE_FL_NEWLINE;
-#endif
-                flush_string_content(p, enc);
-                return tSTRING_CONTENT;
-            }
-            tokadd(p, nextc(p));
-            if (p->heredoc_indent > 0) {
-                lex_goto_eol(p);
-                goto flush;
-            }
-            /*	    if (mbp && mb == ENC_CODERANGE_UNKNOWN) mbp = 0;*/
-            if ((c = nextc(p)) == -1) goto error;
-        } while (!whole_match_p(p, eos, len, indent));
-        str = STR_NEW3(tok(p), toklen(p), enc, func);
-    }
-    dispatch_heredoc_end(p);
-#ifdef RIPPER
-    str = ripper_new_yylval(p, ripper_token2eventid(tSTRING_CONTENT),
-                            yylval.val, str);
-#endif
-    heredoc_restore(p, &p->lex.strterm->u.heredoc);
-    token_flush(p);
-    p->lex.strterm = NEW_STRTERM(func | STR_FUNC_TERM, 0, 0);
-    set_yylval_str(str);
-#ifndef RIPPER
-    if (bol) yylval.node->flags |= NODE_FL_NEWLINE;
-#endif
-    return tSTRING_CONTENT;
+#define LVAR_USED ((ID)1 << (sizeof(ID) * CHAR_BIT - 1))
+
+static NODE*
+node_new_internal(struct parser_params *p, enum node_type type, size_t size, size_t alignment)
+{
+    NODE *n = rb_ast_newnode(p->ast, type, size, alignment);
+
+    rb_node_init(n, type);
+    return n;
 }
 
-#include "lex.c"
+static NODE *
+nd_set_loc(NODE *nd, const YYLTYPE *loc)
+{
+    nd->nd_loc = *loc;
+    nd_set_line(nd, loc->beg_pos.lineno);
+    return nd;
+}
 
-static int
-arg_ambiguous(struct parser_params *p, char c)
+static NODE*
+node_newnode(struct parser_params *p, enum node_type type, size_t size, size_t alignment, const rb_code_location_t *loc)
 {
-#ifndef RIPPER
-    if (c == '/') {
-        rb_warning1("ambiguity between regexp and two divisions: wrap regexp in parentheses or add a space after `%c' operator", WARN_I(c));
-    }
-    else {
-        rb_warning1("ambiguous first argument; put parentheses or a space even after `%c' operator", WARN_I(c));
-    }
-#else
-    dispatch1(arg_ambiguous, rb_usascii_str_new(&c, 1));
-#endif
-    return TRUE;
+    NODE *n = node_new_internal(p, type, size, alignment);
+
+    nd_set_loc(n, loc);
+    nd_set_node_id(n, parser_get_node_id(p));
+    return n;
 }
 
-static ID
-#ifndef RIPPER
-formal_argument(struct parser_params *p, ID lhs)
-#else
-formal_argument(struct parser_params *p, VALUE lhs)
-#endif
+#define NODE_NEWNODE(node_type, type, loc) (type *)(node_newnode(p, node_type, sizeof(type), RUBY_ALIGNOF(type), loc))
+
+static rb_node_scope_t *
+rb_node_scope_new(struct parser_params *p, rb_node_args_t *nd_args, NODE *nd_body, const YYLTYPE *loc)
 {
-    ID id = get_id(lhs);
+    rb_ast_id_table_t *nd_tbl;
+    nd_tbl = local_tbl(p);
+    rb_node_scope_t *n = NODE_NEWNODE(NODE_SCOPE, rb_node_scope_t, loc);
+    n->nd_tbl = nd_tbl;
+    n->nd_body = nd_body;
+    n->nd_args = nd_args;
 
-    switch (id_type(id)) {
-      case ID_LOCAL:
-        break;
-#ifndef RIPPER
-# define ERR(mesg) yyerror0(mesg)
-#else
-# define ERR(mesg) (dispatch2(param_error, WARN_S(mesg), lhs), ripper_error(p))
-#endif
-      case ID_CONST:
-        ERR("formal argument cannot be a constant");
-        return 0;
-      case ID_INSTANCE:
-        ERR("formal argument cannot be an instance variable");
-        return 0;
-      case ID_GLOBAL:
-        ERR("formal argument cannot be a global variable");
-        return 0;
-      case ID_CLASS:
-        ERR("formal argument cannot be a class variable");
-        return 0;
-      default:
-        ERR("formal argument must be local variable");
-        return 0;
-#undef ERR
-    }
-    shadowing_lvar(p, id);
-    return lhs;
+    return n;
 }
 
-static int
-lvar_defined(struct parser_params *p, ID id)
+static rb_node_scope_t *
+rb_node_scope_new2(struct parser_params *p, rb_ast_id_table_t *nd_tbl, rb_node_args_t *nd_args, NODE *nd_body, const YYLTYPE *loc)
 {
-    return (dyna_in_block(p) && dvar_defined(p, id)) || local_id(p, id);
+    rb_node_scope_t *n = NODE_NEWNODE(NODE_SCOPE, rb_node_scope_t, loc);
+    n->nd_tbl = nd_tbl;
+    n->nd_body = nd_body;
+    n->nd_args = nd_args;
+
+    return n;
 }
 
-/* emacsen -*- hack */
-static long
-parser_encode_length(struct parser_params *p, const char *name, long len)
+static rb_node_defn_t *
+rb_node_defn_new(struct parser_params *p, ID nd_mid, NODE *nd_defn, const YYLTYPE *loc)
 {
-    long nlen;
+    rb_node_defn_t *n = NODE_NEWNODE(NODE_DEFN, rb_node_defn_t, loc);
+    n->nd_mid = nd_mid;
+    n->nd_defn = nd_defn;
 
-    if (len > 5 && name[nlen = len - 5] == '-') {
-        if (rb_memcicmp(name + nlen + 1, "unix", 4) == 0)
-            return nlen;
-    }
-    if (len > 4 && name[nlen = len - 4] == '-') {
-        if (rb_memcicmp(name + nlen + 1, "dos", 3) == 0)
-            return nlen;
-        if (rb_memcicmp(name + nlen + 1, "mac", 3) == 0 &&
-            !(len == 8 && rb_memcicmp(name, "utf8-mac", len) == 0))
-            /* exclude UTF8-MAC because the encoding named "UTF8" doesn't exist in Ruby */
-            return nlen;
-    }
-    return len;
+    return n;
 }
 
-static void
-parser_set_encode(struct parser_params *p, const char *name)
+static rb_node_defs_t *
+rb_node_defs_new(struct parser_params *p, NODE *nd_recv, ID nd_mid, NODE *nd_defn, const YYLTYPE *loc)
 {
-    int idx = rb_enc_find_index(name);
-    rb_encoding *enc;
-    VALUE excargs[3];
+    rb_node_defs_t *n = NODE_NEWNODE(NODE_DEFS, rb_node_defs_t, loc);
+    n->nd_recv = nd_recv;
+    n->nd_mid = nd_mid;
+    n->nd_defn = nd_defn;
 
-    if (idx < 0) {
-        excargs[1] = rb_sprintf("unknown encoding name: %s", name);
-      error:
-        excargs[0] = rb_eArgError;
-        excargs[2] = rb_make_backtrace();
-        rb_ary_unshift(excargs[2], rb_sprintf("%"PRIsVALUE":%d", p->ruby_sourcefile_string, p->ruby_sourceline));
-        rb_exc_raise(rb_make_exception(3, excargs));
-    }
-    enc = rb_enc_from_index(idx);
-    if (!rb_enc_asciicompat(enc)) {
-        excargs[1] = rb_sprintf("%s is not ASCII compatible", rb_enc_name(enc));
-        goto error;
-    }
-    p->enc = enc;
-#ifndef RIPPER
-    if (p->debug_lines) {
-        VALUE lines = p->debug_lines;
-        long i, n = RARRAY_LEN(lines);
-        for (i = 0; i < n; ++i) {
-            rb_enc_associate_index(RARRAY_AREF(lines, i), idx);
-        }
-    }
-#endif
+    return n;
 }
 
-static int
-comment_at_top(struct parser_params *p)
+static rb_node_block_t *
+rb_node_block_new(struct parser_params *p, NODE *nd_head, const YYLTYPE *loc)
 {
-    const char *ptr = p->lex.pbeg, *ptr_end = p->lex.pcur - 1;
-    if (p->line_count != (p->has_shebang ? 2 : 1)) return 0;
-    while (ptr < ptr_end) {
-        if (!ISSPACE(*ptr)) return 0;
-        ptr++;
-    }
-    return 1;
+    rb_node_block_t *n = NODE_NEWNODE(NODE_BLOCK, rb_node_block_t, loc);
+    n->nd_head = nd_head;
+    n->nd_end = (NODE *)n;
+    n->nd_next = 0;
+
+    return n;
 }
 
-typedef long (*rb_magic_comment_length_t)(struct parser_params *p, const char *name, long len);
-typedef void (*rb_magic_comment_setter_t)(struct parser_params *p, const char *name, const char *val);
+static rb_node_for_t *
+rb_node_for_new(struct parser_params *p, NODE *nd_iter, NODE *nd_body, const YYLTYPE *loc, const YYLTYPE *for_keyword_loc, const YYLTYPE *in_keyword_loc, const YYLTYPE *do_keyword_loc, const YYLTYPE *end_keyword_loc)
+{
+    rb_node_for_t *n = NODE_NEWNODE(NODE_FOR, rb_node_for_t, loc);
+    n->nd_body = nd_body;
+    n->nd_iter = nd_iter;
+    n->for_keyword_loc = *for_keyword_loc;
+    n->in_keyword_loc = *in_keyword_loc;
+    n->do_keyword_loc = *do_keyword_loc;
+    n->end_keyword_loc = *end_keyword_loc;
 
-static int parser_invalid_pragma_value(struct parser_params *p, const char *name, const char *val);
+    return n;
+}
 
-static void
-magic_comment_encoding(struct parser_params *p, const char *name, const char *val)
+static rb_node_for_masgn_t *
+rb_node_for_masgn_new(struct parser_params *p, NODE *nd_var, const YYLTYPE *loc)
 {
-    if (!comment_at_top(p)) {
-        return;
-    }
-    parser_set_encode(p, val);
+    rb_node_for_masgn_t *n = NODE_NEWNODE(NODE_FOR_MASGN, rb_node_for_masgn_t, loc);
+    n->nd_var = nd_var;
+
+    return n;
 }
 
-static int
-parser_get_bool(struct parser_params *p, const char *name, const char *val)
+static rb_node_retry_t *
+rb_node_retry_new(struct parser_params *p, const YYLTYPE *loc)
 {
-    switch (*val) {
-      case 't': case 'T':
-        if (STRCASECMP(val, "true") == 0) {
-            return TRUE;
-        }
-        break;
-      case 'f': case 'F':
-        if (STRCASECMP(val, "false") == 0) {
-            return FALSE;
-        }
-        break;
-    }
-    return parser_invalid_pragma_value(p, name, val);
+    rb_node_retry_t *n = NODE_NEWNODE(NODE_RETRY, rb_node_retry_t, loc);
+
+    return n;
 }
 
-static int
-parser_invalid_pragma_value(struct parser_params *p, const char *name, const char *val)
+static rb_node_begin_t *
+rb_node_begin_new(struct parser_params *p, NODE *nd_body, const YYLTYPE *loc)
 {
-    rb_warning2("invalid value for %s: %s", WARN_S(name), WARN_S(val));
-    return -1;
+    rb_node_begin_t *n = NODE_NEWNODE(NODE_BEGIN, rb_node_begin_t, loc);
+    n->nd_body = nd_body;
+
+    return n;
 }
 
-static void
-parser_set_token_info(struct parser_params *p, const char *name, const char *val)
+static rb_node_rescue_t *
+rb_node_rescue_new(struct parser_params *p, NODE *nd_head, NODE *nd_resq, NODE *nd_else, const YYLTYPE *loc)
 {
-    int b = parser_get_bool(p, name, val);
-    if (b >= 0) p->token_info_enabled = b;
+    rb_node_rescue_t *n = NODE_NEWNODE(NODE_RESCUE, rb_node_rescue_t, loc);
+    n->nd_head = nd_head;
+    n->nd_resq = nd_resq;
+    n->nd_else = nd_else;
+
+    return n;
 }
 
-static void
-parser_set_frozen_string_literal(struct parser_params *p, const char *name, const char *val)
+static rb_node_resbody_t *
+rb_node_resbody_new(struct parser_params *p, NODE *nd_args, NODE *nd_exc_var, NODE *nd_body, NODE *nd_next, const YYLTYPE *loc)
 {
-    int b;
+    rb_node_resbody_t *n = NODE_NEWNODE(NODE_RESBODY, rb_node_resbody_t, loc);
+    n->nd_args = nd_args;
+    n->nd_exc_var = nd_exc_var;
+    n->nd_body = nd_body;
+    n->nd_next = nd_next;
 
-    if (p->token_seen) {
-        rb_warning1("`%s' is ignored after any tokens", WARN_S(name));
-        return;
-    }
+    return n;
+}
 
-    b = parser_get_bool(p, name, val);
-    if (b < 0) return;
+static rb_node_ensure_t *
+rb_node_ensure_new(struct parser_params *p, NODE *nd_head, NODE *nd_ensr, const YYLTYPE *loc)
+{
+    rb_node_ensure_t *n = NODE_NEWNODE(NODE_ENSURE, rb_node_ensure_t, loc);
+    n->nd_head = nd_head;
+    n->nd_ensr = nd_ensr;
 
-    p->frozen_string_literal = b;
+    return n;
 }
 
-static void
-parser_set_shareable_constant_value(struct parser_params *p, const char *name, const char *val)
+static rb_node_and_t *
+rb_node_and_new(struct parser_params *p, NODE *nd_1st, NODE *nd_2nd, const YYLTYPE *loc, const YYLTYPE *operator_loc)
 {
-    for (const char *s = p->lex.pbeg, *e = p->lex.pcur; s < e; ++s) {
-        if (*s == ' ' || *s == '\t') continue;
-        if (*s == '#') break;
-        rb_warning1("`%s' is ignored unless in comment-only line", WARN_S(name));
-        return;
-    }
+    rb_node_and_t *n = NODE_NEWNODE(NODE_AND, rb_node_and_t, loc);
+    n->nd_1st = nd_1st;
+    n->nd_2nd = nd_2nd;
+    n->operator_loc = *operator_loc;
 
-    switch (*val) {
-      case 'n': case 'N':
-        if (STRCASECMP(val, "none") == 0) {
-            p->ctxt.shareable_constant_value = shareable_none;
-            return;
-        }
-        break;
-      case 'l': case 'L':
-        if (STRCASECMP(val, "literal") == 0) {
-            p->ctxt.shareable_constant_value = shareable_literal;
-            return;
-        }
-        break;
-      case 'e': case 'E':
-        if (STRCASECMP(val, "experimental_copy") == 0) {
-            p->ctxt.shareable_constant_value = shareable_copy;
-            return;
-        }
-        if (STRCASECMP(val, "experimental_everything") == 0) {
-            p->ctxt.shareable_constant_value = shareable_everything;
-            return;
-        }
-        break;
-    }
-    parser_invalid_pragma_value(p, name, val);
+    return n;
 }
 
-# if WARN_PAST_SCOPE
-static void
-parser_set_past_scope(struct parser_params *p, const char *name, const char *val)
+static rb_node_or_t *
+rb_node_or_new(struct parser_params *p, NODE *nd_1st, NODE *nd_2nd, const YYLTYPE *loc, const YYLTYPE *operator_loc)
 {
-    int b = parser_get_bool(p, name, val);
-    if (b >= 0) p->past_scope_enabled = b;
-}
-# endif
+    rb_node_or_t *n = NODE_NEWNODE(NODE_OR, rb_node_or_t, loc);
+    n->nd_1st = nd_1st;
+    n->nd_2nd = nd_2nd;
+    n->operator_loc = *operator_loc;
 
-struct magic_comment {
-    const char *name;
-    rb_magic_comment_setter_t func;
-    rb_magic_comment_length_t length;
-};
+    return n;
+}
 
-static const struct magic_comment magic_comments[] = {
-    {"coding", magic_comment_encoding, parser_encode_length},
-    {"encoding", magic_comment_encoding, parser_encode_length},
-    {"frozen_string_literal", parser_set_frozen_string_literal},
-    {"shareable_constant_value", parser_set_shareable_constant_value},
-    {"warn_indent", parser_set_token_info},
-# if WARN_PAST_SCOPE
-    {"warn_past_scope", parser_set_past_scope},
-# endif
-};
+static rb_node_return_t *
+rb_node_return_new(struct parser_params *p, NODE *nd_stts, const YYLTYPE *loc, const YYLTYPE *keyword_loc)
+{
+    rb_node_return_t *n = NODE_NEWNODE(NODE_RETURN, rb_node_return_t, loc);
+    n->nd_stts = nd_stts;
+    n->keyword_loc = *keyword_loc;
+    return n;
+}
 
-static const char *
-magic_comment_marker(const char *str, long len)
+static rb_node_yield_t *
+rb_node_yield_new(struct parser_params *p, NODE *nd_head, const YYLTYPE *loc, const YYLTYPE *keyword_loc, const YYLTYPE *lparen_loc, const YYLTYPE *rparen_loc)
 {
-    long i = 2;
+    if (nd_head) no_blockarg(p, nd_head);
 
-    while (i < len) {
-        switch (str[i]) {
-          case '-':
-            if (str[i-1] == '*' && str[i-2] == '-') {
-                return str + i + 1;
-            }
-            i += 2;
-            break;
-          case '*':
-            if (i + 1 >= len) return 0;
-            if (str[i+1] != '-') {
-                i += 4;
-            }
-            else if (str[i-1] != '-') {
-                i += 2;
-            }
-            else {
-                return str + i + 2;
-            }
-            break;
-          default:
-            i += 3;
-            break;
-        }
-    }
-    return 0;
+    rb_node_yield_t *n = NODE_NEWNODE(NODE_YIELD, rb_node_yield_t, loc);
+    n->nd_head = nd_head;
+    n->keyword_loc = *keyword_loc;
+    n->lparen_loc = *lparen_loc;
+    n->rparen_loc = *rparen_loc;
+
+    return n;
 }
 
-static int
-parser_magic_comment(struct parser_params *p, const char *str, long len)
+static rb_node_if_t *
+rb_node_if_new(struct parser_params *p, NODE *nd_cond, NODE *nd_body, NODE *nd_else, const YYLTYPE *loc, const YYLTYPE* if_keyword_loc, const YYLTYPE* then_keyword_loc, const YYLTYPE* end_keyword_loc)
 {
-    int indicator = 0;
-    VALUE name = 0, val = 0;
-    const char *beg, *end, *vbeg, *vend;
-#define str_copy(_s, _p, _n) ((_s) \
-        ? (void)(rb_str_resize((_s), (_n)), \
-           MEMCPY(RSTRING_PTR(_s), (_p), char, (_n)), (_s)) \
-        : (void)((_s) = STR_NEW((_p), (_n))))
+    rb_node_if_t *n = NODE_NEWNODE(NODE_IF, rb_node_if_t, loc);
+    n->nd_cond = nd_cond;
+    n->nd_body = nd_body;
+    n->nd_else = nd_else;
+    n->if_keyword_loc = *if_keyword_loc;
+    n->then_keyword_loc = *then_keyword_loc;
+    n->end_keyword_loc = *end_keyword_loc;
 
-    if (len <= 7) return FALSE;
-    if (!!(beg = magic_comment_marker(str, len))) {
-        if (!(end = magic_comment_marker(beg, str + len - beg)))
-            return FALSE;
-        indicator = TRUE;
-        str = beg;
-        len = end - beg - 3;
-    }
+    return n;
+}
 
-    /* %r"([^\\s\'\":;]+)\\s*:\\s*(\"(?:\\\\.|[^\"])*\"|[^\"\\s;]+)[\\s;]*" */
-    while (len > 0) {
-        const struct magic_comment *mc = magic_comments;
-        char *s;
-        int i;
-        long n = 0;
+static rb_node_unless_t *
+rb_node_unless_new(struct parser_params *p, NODE *nd_cond, NODE *nd_body, NODE *nd_else, const YYLTYPE *loc, const YYLTYPE *keyword_loc, const YYLTYPE *then_keyword_loc, const YYLTYPE *end_keyword_loc)
+{
+    rb_node_unless_t *n = NODE_NEWNODE(NODE_UNLESS, rb_node_unless_t, loc);
+    n->nd_cond = nd_cond;
+    n->nd_body = nd_body;
+    n->nd_else = nd_else;
+    n->keyword_loc = *keyword_loc;
+    n->then_keyword_loc = *then_keyword_loc;
+    n->end_keyword_loc = *end_keyword_loc;
 
-        for (; len > 0 && *str; str++, --len) {
-            switch (*str) {
-              case '\'': case '"': case ':': case ';':
-                continue;
-            }
-            if (!ISSPACE(*str)) break;
-        }
-        for (beg = str; len > 0; str++, --len) {
-            switch (*str) {
-              case '\'': case '"': case ':': case ';':
-                break;
-              default:
-                if (ISSPACE(*str)) break;
-                continue;
-            }
-            break;
-        }
-        for (end = str; len > 0 && ISSPACE(*str); str++, --len);
-        if (!len) break;
-        if (*str != ':') {
-            if (!indicator) return FALSE;
-            continue;
-        }
+    return n;
+}
 
-        do str++; while (--len > 0 && ISSPACE(*str));
-        if (!len) break;
-        if (*str == '"') {
-            for (vbeg = ++str; --len > 0 && *str != '"'; str++) {
-                if (*str == '\\') {
-                    --len;
-                    ++str;
-                }
-            }
-            vend = str;
-            if (len) {
-                --len;
-                ++str;
-            }
-        }
-        else {
-            for (vbeg = str; len > 0 && *str != '"' && *str != ';' && !ISSPACE(*str); --len, str++);
-            vend = str;
-        }
-        if (indicator) {
-            while (len > 0 && (*str == ';' || ISSPACE(*str))) --len, str++;
-        }
-        else {
-            while (len > 0 && (ISSPACE(*str))) --len, str++;
-            if (len) return FALSE;
-        }
+static rb_node_class_t *
+rb_node_class_new(struct parser_params *p, NODE *nd_cpath, NODE *nd_body, NODE *nd_super, const YYLTYPE *loc, const YYLTYPE *class_keyword_loc, const YYLTYPE *inheritance_operator_loc, const YYLTYPE *end_keyword_loc)
+{
+    /* Keep the order of node creation */
+    NODE *scope = NEW_SCOPE(0, nd_body, loc);
+    rb_node_class_t *n = NODE_NEWNODE(NODE_CLASS, rb_node_class_t, loc);
+    n->nd_cpath = nd_cpath;
+    n->nd_body = scope;
+    n->nd_super = nd_super;
+    n->class_keyword_loc = *class_keyword_loc;
+    n->inheritance_operator_loc = *inheritance_operator_loc;
+    n->end_keyword_loc = *end_keyword_loc;
+
+    return n;
+}
 
-        n = end - beg;
-        str_copy(name, beg, n);
-        s = RSTRING_PTR(name);
-        for (i = 0; i < n; ++i) {
-            if (s[i] == '-') s[i] = '_';
-        }
-        do {
-            if (STRNCASECMP(mc->name, s, n) == 0 && !mc->name[n]) {
-                n = vend - vbeg;
-                if (mc->length) {
-                    n = (*mc->length)(p, vbeg, n);
-                }
-                str_copy(val, vbeg, n);
-                (*mc->func)(p, mc->name, RSTRING_PTR(val));
-                break;
-            }
-        } while (++mc < magic_comments + numberof(magic_comments));
-#ifdef RIPPER
-        str_copy(val, vbeg, vend - vbeg);
-        dispatch2(magic_comment, name, val);
-#endif
-    }
+static rb_node_sclass_t *
+rb_node_sclass_new(struct parser_params *p, NODE *nd_recv, NODE *nd_body, const YYLTYPE *loc)
+{
+    /* Keep the order of node creation */
+    NODE *scope = NEW_SCOPE(0, nd_body, loc);
+    rb_node_sclass_t *n = NODE_NEWNODE(NODE_SCLASS, rb_node_sclass_t, loc);
+    n->nd_recv = nd_recv;
+    n->nd_body = scope;
 
-    return TRUE;
+    return n;
 }
 
-static void
-set_file_encoding(struct parser_params *p, const char *str, const char *send)
+static rb_node_module_t *
+rb_node_module_new(struct parser_params *p, NODE *nd_cpath, NODE *nd_body, const YYLTYPE *loc)
 {
-    int sep = 0;
-    const char *beg = str;
-    VALUE s;
+    /* Keep the order of node creation */
+    NODE *scope = NEW_SCOPE(0, nd_body, loc);
+    rb_node_module_t *n = NODE_NEWNODE(NODE_MODULE, rb_node_module_t, loc);
+    n->nd_cpath = nd_cpath;
+    n->nd_body = scope;
 
-    for (;;) {
-        if (send - str <= 6) return;
-        switch (str[6]) {
-          case 'C': case 'c': str += 6; continue;
-          case 'O': case 'o': str += 5; continue;
-          case 'D': case 'd': str += 4; continue;
-          case 'I': case 'i': str += 3; continue;
-          case 'N': case 'n': str += 2; continue;
-          case 'G': case 'g': str += 1; continue;
-          case '=': case ':':
-            sep = 1;
-            str += 6;
-            break;
-          default:
-            str += 6;
-            if (ISSPACE(*str)) break;
-            continue;
-        }
-        if (STRNCASECMP(str-6, "coding", 6) == 0) break;
-        sep = 0;
-    }
-    for (;;) {
-        do {
-            if (++str >= send) return;
-        } while (ISSPACE(*str));
-        if (sep) break;
-        if (*str != '=' && *str != ':') return;
-        sep = 1;
-        str++;
-    }
-    beg = str;
-    while ((*str == '-' || *str == '_' || ISALNUM(*str)) && ++str < send);
-    s = rb_str_new(beg, parser_encode_length(p, beg, str - beg));
-    parser_set_encode(p, RSTRING_PTR(s));
-    rb_str_resize(s, 0);
+    return n;
 }
 
-static void
-parser_prepare(struct parser_params *p)
+static rb_node_iter_t *
+rb_node_iter_new(struct parser_params *p, rb_node_args_t *nd_args, NODE *nd_body, const YYLTYPE *loc)
 {
-    int c = nextc0(p, FALSE);
-    p->token_info_enabled = !compile_for_eval && RTEST(ruby_verbose);
-    switch (c) {
-      case '#':
-        if (peek(p, '!')) p->has_shebang = 1;
-        break;
-      case 0xef:		/* UTF-8 BOM marker */
-        if (!lex_eol_n_p(p, 2) &&
-            (unsigned char)p->lex.pcur[0] == 0xbb &&
-            (unsigned char)p->lex.pcur[1] == 0xbf) {
-            p->enc = rb_utf8_encoding();
-            p->lex.pcur += 2;
-#ifndef RIPPER
-            if (p->debug_lines) {
-                rb_enc_associate(p->lex.lastline, p->enc);
-            }
-#endif
-            p->lex.pbeg = p->lex.pcur;
-            token_flush(p);
-            return;
-        }
-        break;
-      case EOF:
-        return;
-    }
-    pushback(p, c);
-    p->enc = rb_enc_get(p->lex.lastline);
+    /* Keep the order of node creation */
+    NODE *scope = NEW_SCOPE(nd_args, nd_body, loc);
+    rb_node_iter_t *n = NODE_NEWNODE(NODE_ITER, rb_node_iter_t, loc);
+    n->nd_body = scope;
+    n->nd_iter = 0;
+
+    return n;
 }
 
-#ifndef RIPPER
-#define ambiguous_operator(tok, op, syn) ( \
-    rb_warning0("`"op"' after local variable or literal is interpreted as binary operator"), \
-    rb_warning0("even though it seems like "syn""))
-#else
-#define ambiguous_operator(tok, op, syn) \
-    dispatch2(operator_ambiguous, TOKEN2VAL(tok), rb_str_new_cstr(syn))
-#endif
-#define warn_balanced(tok, op, syn) ((void) \
-    (!IS_lex_state_for(last_state, EXPR_CLASS|EXPR_DOT|EXPR_FNAME|EXPR_ENDFN) && \
-     space_seen && !ISSPACE(c) && \
-     (ambiguous_operator(tok, op, syn), 0)), \
-     (enum yytokentype)(tok))
+static rb_node_lambda_t *
+rb_node_lambda_new(struct parser_params *p, rb_node_args_t *nd_args, NODE *nd_body, const YYLTYPE *loc, const YYLTYPE *operator_loc, const YYLTYPE *opening_loc, const YYLTYPE *closing_loc)
+{
+    /* Keep the order of node creation */
+    NODE *scope = NEW_SCOPE(nd_args, nd_body, loc);
+    YYLTYPE lambda_loc = code_loc_gen(operator_loc, closing_loc);
+    rb_node_lambda_t *n = NODE_NEWNODE(NODE_LAMBDA, rb_node_lambda_t, &lambda_loc);
+    n->nd_body = scope;
+    n->operator_loc = *operator_loc;
+    n->opening_loc = *opening_loc;
+    n->closing_loc = *closing_loc;
 
-static VALUE
-parse_rational(struct parser_params *p, char *str, int len, int seen_point)
+    return n;
+}
+
+static rb_node_case_t *
+rb_node_case_new(struct parser_params *p, NODE *nd_head, NODE *nd_body, const YYLTYPE *loc, const YYLTYPE *case_keyword_loc, const YYLTYPE *end_keyword_loc)
 {
-    VALUE v;
-    char *point = &str[seen_point];
-    size_t fraclen = len-seen_point-1;
-    memmove(point, point+1, fraclen+1);
-    v = rb_cstr_to_inum(str, 10, FALSE);
-    return rb_rational_new(v, rb_int_positive_pow(10, fraclen));
+    rb_node_case_t *n = NODE_NEWNODE(NODE_CASE, rb_node_case_t, loc);
+    n->nd_head = nd_head;
+    n->nd_body = nd_body;
+    n->case_keyword_loc = *case_keyword_loc;
+    n->end_keyword_loc = *end_keyword_loc;
+
+    return n;
 }
 
-static enum yytokentype
-no_digits(struct parser_params *p)
+static rb_node_case2_t *
+rb_node_case2_new(struct parser_params *p, NODE *nd_body, const YYLTYPE *loc, const YYLTYPE *case_keyword_loc, const YYLTYPE *end_keyword_loc)
 {
-    yyerror0("numeric literal without digits");
-    if (peek(p, '_')) nextc(p);
-    /* dummy 0, for tUMINUS_NUM at numeric */
-    return set_integer_literal(p, INT2FIX(0), 0);
+    rb_node_case2_t *n = NODE_NEWNODE(NODE_CASE2, rb_node_case2_t, loc);
+    n->nd_head = 0;
+    n->nd_body = nd_body;
+    n->case_keyword_loc = *case_keyword_loc;
+    n->end_keyword_loc = *end_keyword_loc;
+
+    return n;
 }
 
-static enum yytokentype
-parse_numeric(struct parser_params *p, int c)
+static rb_node_case3_t *
+rb_node_case3_new(struct parser_params *p, NODE *nd_head, NODE *nd_body, const YYLTYPE *loc, const YYLTYPE *case_keyword_loc, const YYLTYPE *end_keyword_loc)
 {
-    int is_float, seen_point, seen_e, nondigit;
-    int suffix;
+    rb_node_case3_t *n = NODE_NEWNODE(NODE_CASE3, rb_node_case3_t, loc);
+    n->nd_head = nd_head;
+    n->nd_body = nd_body;
+    n->case_keyword_loc = *case_keyword_loc;
+    n->end_keyword_loc = *end_keyword_loc;
 
-    is_float = seen_point = seen_e = nondigit = 0;
-    SET_LEX_STATE(EXPR_END);
-    newtok(p);
-    if (c == '-' || c == '+') {
-        tokadd(p, c);
-        c = nextc(p);
-    }
-    if (c == '0') {
-        int start = toklen(p);
-        c = nextc(p);
-        if (c == 'x' || c == 'X') {
-            /* hexadecimal */
-            c = nextc(p);
-            if (c != -1 && ISXDIGIT(c)) {
-                do {
-                    if (c == '_') {
-                        if (nondigit) break;
-                        nondigit = c;
-                        continue;
-                    }
-                    if (!ISXDIGIT(c)) break;
-                    nondigit = 0;
-                    tokadd(p, c);
-                } while ((c = nextc(p)) != -1);
-            }
-            pushback(p, c);
-            tokfix(p);
-            if (toklen(p) == start) {
-                return no_digits(p);
-            }
-            else if (nondigit) goto trailing_uc;
-            suffix = number_literal_suffix(p, NUM_SUFFIX_ALL);
-            return set_integer_literal(p, rb_cstr_to_inum(tok(p), 16, FALSE), suffix);
-        }
-        if (c == 'b' || c == 'B') {
-            /* binary */
-            c = nextc(p);
-            if (c == '0' || c == '1') {
-                do {
-                    if (c == '_') {
-                        if (nondigit) break;
-                        nondigit = c;
-                        continue;
-                    }
-                    if (c != '0' && c != '1') break;
-                    nondigit = 0;
-                    tokadd(p, c);
-                } while ((c = nextc(p)) != -1);
-            }
-            pushback(p, c);
-            tokfix(p);
-            if (toklen(p) == start) {
-                return no_digits(p);
-            }
-            else if (nondigit) goto trailing_uc;
-            suffix = number_literal_suffix(p, NUM_SUFFIX_ALL);
-            return set_integer_literal(p, rb_cstr_to_inum(tok(p), 2, FALSE), suffix);
-        }
-        if (c == 'd' || c == 'D') {
-            /* decimal */
-            c = nextc(p);
-            if (c != -1 && ISDIGIT(c)) {
-                do {
-                    if (c == '_') {
-                        if (nondigit) break;
-                        nondigit = c;
-                        continue;
-                    }
-                    if (!ISDIGIT(c)) break;
-                    nondigit = 0;
-                    tokadd(p, c);
-                } while ((c = nextc(p)) != -1);
-            }
-            pushback(p, c);
-            tokfix(p);
-            if (toklen(p) == start) {
-                return no_digits(p);
-            }
-            else if (nondigit) goto trailing_uc;
-            suffix = number_literal_suffix(p, NUM_SUFFIX_ALL);
-            return set_integer_literal(p, rb_cstr_to_inum(tok(p), 10, FALSE), suffix);
-        }
-        if (c == '_') {
-            /* 0_0 */
-            goto octal_number;
-        }
-        if (c == 'o' || c == 'O') {
-            /* prefixed octal */
-            c = nextc(p);
-            if (c == -1 || c == '_' || !ISDIGIT(c)) {
-                return no_digits(p);
-            }
-        }
-        if (c >= '0' && c <= '7') {
-            /* octal */
-          octal_number:
-            do {
-                if (c == '_') {
-                    if (nondigit) break;
-                    nondigit = c;
-                    continue;
-                }
-                if (c < '0' || c > '9') break;
-                if (c > '7') goto invalid_octal;
-                nondigit = 0;
-                tokadd(p, c);
-            } while ((c = nextc(p)) != -1);
-            if (toklen(p) > start) {
-                pushback(p, c);
-                tokfix(p);
-                if (nondigit) goto trailing_uc;
-                suffix = number_literal_suffix(p, NUM_SUFFIX_ALL);
-                return set_integer_literal(p, rb_cstr_to_inum(tok(p), 8, FALSE), suffix);
-            }
-            if (nondigit) {
-                pushback(p, c);
-                goto trailing_uc;
-            }
-        }
-        if (c > '7' && c <= '9') {
-          invalid_octal:
-            yyerror0("Invalid octal digit");
-        }
-        else if (c == '.' || c == 'e' || c == 'E') {
-            tokadd(p, '0');
-        }
-        else {
-            pushback(p, c);
-            suffix = number_literal_suffix(p, NUM_SUFFIX_ALL);
-            return set_integer_literal(p, INT2FIX(0), suffix);
-        }
-    }
+    return n;
+}
+
+static rb_node_when_t *
+rb_node_when_new(struct parser_params *p, NODE *nd_head, NODE *nd_body, NODE *nd_next, const YYLTYPE *loc, const YYLTYPE *keyword_loc, const YYLTYPE *then_keyword_loc)
+{
+    rb_node_when_t *n = NODE_NEWNODE(NODE_WHEN, rb_node_when_t, loc);
+    n->nd_head = nd_head;
+    n->nd_body = nd_body;
+    n->nd_next = nd_next;
+    n->keyword_loc = *keyword_loc;
+    n->then_keyword_loc = *then_keyword_loc;
+
+    return n;
+}
 
-    for (;;) {
-        switch (c) {
-          case '0': case '1': case '2': case '3': case '4':
-          case '5': case '6': case '7': case '8': case '9':
-            nondigit = 0;
-            tokadd(p, c);
-            break;
+static rb_node_in_t *
+rb_node_in_new(struct parser_params *p, NODE *nd_head, NODE *nd_body, NODE *nd_next, const YYLTYPE *loc)
+{
+    rb_node_in_t *n = NODE_NEWNODE(NODE_IN, rb_node_in_t, loc);
+    n->nd_head = nd_head;
+    n->nd_body = nd_body;
+    n->nd_next = nd_next;
 
-          case '.':
-            if (nondigit) goto trailing_uc;
-            if (seen_point || seen_e) {
-                goto decode_num;
-            }
-            else {
-                int c0 = nextc(p);
-                if (c0 == -1 || !ISDIGIT(c0)) {
-                    pushback(p, c0);
-                    goto decode_num;
-                }
-                c = c0;
-            }
-            seen_point = toklen(p);
-            tokadd(p, '.');
-            tokadd(p, c);
-            is_float++;
-            nondigit = 0;
-            break;
+    return n;
+}
 
-          case 'e':
-          case 'E':
-            if (nondigit) {
-                pushback(p, c);
-                c = nondigit;
-                goto decode_num;
-            }
-            if (seen_e) {
-                goto decode_num;
-            }
-            nondigit = c;
-            c = nextc(p);
-            if (c != '-' && c != '+' && !ISDIGIT(c)) {
-                pushback(p, c);
-                c = nondigit;
-                nondigit = 0;
-                goto decode_num;
-            }
-            tokadd(p, nondigit);
-            seen_e++;
-            is_float++;
-            tokadd(p, c);
-            nondigit = (c == '-' || c == '+') ? c : 0;
-            break;
+static rb_node_while_t *
+rb_node_while_new(struct parser_params *p, NODE *nd_cond, NODE *nd_body, long nd_state, const YYLTYPE *loc, const YYLTYPE *keyword_loc, const YYLTYPE *closing_loc)
+{
+    rb_node_while_t *n = NODE_NEWNODE(NODE_WHILE, rb_node_while_t, loc);
+    n->nd_cond = nd_cond;
+    n->nd_body = nd_body;
+    n->nd_state = nd_state;
+    n->keyword_loc = *keyword_loc;
+    n->closing_loc = *closing_loc;
 
-          case '_':	/* `_' in number just ignored */
-            if (nondigit) goto decode_num;
-            nondigit = c;
-            break;
+    return n;
+}
 
-          default:
-            goto decode_num;
-        }
-        c = nextc(p);
-    }
+static rb_node_until_t *
+rb_node_until_new(struct parser_params *p, NODE *nd_cond, NODE *nd_body, long nd_state, const YYLTYPE *loc, const YYLTYPE *keyword_loc, const YYLTYPE *closing_loc)
+{
+    rb_node_until_t *n = NODE_NEWNODE(NODE_UNTIL, rb_node_until_t, loc);
+    n->nd_cond = nd_cond;
+    n->nd_body = nd_body;
+    n->nd_state = nd_state;
+    n->keyword_loc = *keyword_loc;
+    n->closing_loc = *closing_loc;
 
-  decode_num:
-    pushback(p, c);
-    if (nondigit) {
-      trailing_uc:
-        literal_flush(p, p->lex.pcur - 1);
-        YYLTYPE loc = RUBY_INIT_YYLLOC();
-        compile_error(p, "trailing `%c' in number", nondigit);
-        parser_show_error_line(p, &loc);
-    }
-    tokfix(p);
-    if (is_float) {
-        enum yytokentype type = tFLOAT;
-        VALUE v;
+    return n;
+}
 
-        suffix = number_literal_suffix(p, seen_e ? NUM_SUFFIX_I : NUM_SUFFIX_ALL);
-        if (suffix & NUM_SUFFIX_R) {
-            type = tRATIONAL;
-            v = parse_rational(p, tok(p), toklen(p), seen_point);
-        }
-        else {
-            double d = strtod(tok(p), 0);
-            if (errno == ERANGE) {
-                rb_warning1("Float %s out of range", WARN_S(tok(p)));
-                errno = 0;
-            }
-            v = DBL2NUM(d);
-        }
-        return set_number_literal(p, v, type, suffix);
-    }
-    suffix = number_literal_suffix(p, NUM_SUFFIX_ALL);
-    return set_integer_literal(p, rb_cstr_to_inum(tok(p), 10, FALSE), suffix);
+static rb_node_colon2_t *
+rb_node_colon2_new(struct parser_params *p, NODE *nd_head, ID nd_mid, const YYLTYPE *loc, const YYLTYPE *delimiter_loc, const YYLTYPE *name_loc)
+{
+    rb_node_colon2_t *n = NODE_NEWNODE(NODE_COLON2, rb_node_colon2_t, loc);
+    n->nd_head = nd_head;
+    n->nd_mid = nd_mid;
+    n->delimiter_loc = *delimiter_loc;
+    n->name_loc = *name_loc;
+
+    return n;
 }
 
-static enum yytokentype
-parse_qmark(struct parser_params *p, int space_seen)
+static rb_node_colon3_t *
+rb_node_colon3_new(struct parser_params *p, ID nd_mid, const YYLTYPE *loc, const YYLTYPE *delimiter_loc, const YYLTYPE *name_loc)
 {
-    rb_encoding *enc;
-    register int c;
-    VALUE lit;
+    rb_node_colon3_t *n = NODE_NEWNODE(NODE_COLON3, rb_node_colon3_t, loc);
+    n->nd_mid = nd_mid;
+    n->delimiter_loc = *delimiter_loc;
+    n->name_loc = *name_loc;
 
-    if (IS_END()) {
-        SET_LEX_STATE(EXPR_VALUE);
-        return '?';
-    }
-    c = nextc(p);
-    if (c == -1) {
-        compile_error(p, "incomplete character syntax");
-        return 0;
-    }
-    if (rb_enc_isspace(c, p->enc)) {
-        if (!IS_ARG()) {
-            int c2 = escaped_control_code(c);
-            if (c2) {
-                WARN_SPACE_CHAR(c2, "?");
-            }
-        }
-      ternary:
-        pushback(p, c);
-        SET_LEX_STATE(EXPR_VALUE);
-        return '?';
-    }
-    newtok(p);
-    enc = p->enc;
-    if (!parser_isascii(p)) {
-        if (tokadd_mbchar(p, c) == -1) return 0;
-    }
-    else if ((rb_enc_isalnum(c, p->enc) || c == '_') &&
-             !lex_eol_p(p) && is_identchar(p, p->lex.pcur, p->lex.pend, p->enc)) {
-        if (space_seen) {
-            const char *start = p->lex.pcur - 1, *ptr = start;
-            do {
-                int n = parser_precise_mbclen(p, ptr);
-                if (n < 0) return -1;
-                ptr += n;
-            } while (!lex_eol_ptr_p(p, ptr) && is_identchar(p, ptr, p->lex.pend, p->enc));
-            rb_warn2("`?' just followed by `%.*s' is interpreted as" \
-                     " a conditional operator, put a space after `?'",
-                     WARN_I((int)(ptr - start)), WARN_S_L(start, (ptr - start)));
-        }
-        goto ternary;
-    }
-    else if (c == '\\') {
-        if (peek(p, 'u')) {
-            nextc(p);
-            enc = rb_utf8_encoding();
-            tokadd_utf8(p, &enc, -1, 0, 0);
-        }
-        else if (!lex_eol_p(p) && !(c = *p->lex.pcur, ISASCII(c))) {
-            nextc(p);
-            if (tokadd_mbchar(p, c) == -1) return 0;
-        }
-        else {
-            c = read_escape(p, 0, &enc);
-            tokadd(p, c);
-        }
-    }
-    else {
-        tokadd(p, c);
-    }
-    tokfix(p);
-    lit = STR_NEW3(tok(p), toklen(p), enc, 0);
-    set_yylval_str(lit);
-    SET_LEX_STATE(EXPR_END);
-    return tCHAR;
+    return n;
+}
+
+static rb_node_dot2_t *
+rb_node_dot2_new(struct parser_params *p, NODE *nd_beg, NODE *nd_end, const YYLTYPE *loc, const YYLTYPE *operator_loc)
+{
+    rb_node_dot2_t *n = NODE_NEWNODE(NODE_DOT2, rb_node_dot2_t, loc);
+    n->nd_beg = nd_beg;
+    n->nd_end = nd_end;
+    n->operator_loc = *operator_loc;
+
+    return n;
+}
+
+static rb_node_dot3_t *
+rb_node_dot3_new(struct parser_params *p, NODE *nd_beg, NODE *nd_end, const YYLTYPE *loc, const YYLTYPE *operator_loc)
+{
+    rb_node_dot3_t *n = NODE_NEWNODE(NODE_DOT3, rb_node_dot3_t, loc);
+    n->nd_beg = nd_beg;
+    n->nd_end = nd_end;
+    n->operator_loc = *operator_loc;
+
+    return n;
+}
+
+static rb_node_self_t *
+rb_node_self_new(struct parser_params *p, const YYLTYPE *loc)
+{
+    rb_node_self_t *n = NODE_NEWNODE(NODE_SELF, rb_node_self_t, loc);
+    n->nd_state = 1;
+
+    return n;
+}
+
+static rb_node_nil_t *
+rb_node_nil_new(struct parser_params *p, const YYLTYPE *loc)
+{
+    rb_node_nil_t *n = NODE_NEWNODE(NODE_NIL, rb_node_nil_t, loc);
+
+    return n;
+}
+
+static rb_node_true_t *
+rb_node_true_new(struct parser_params *p, const YYLTYPE *loc)
+{
+    rb_node_true_t *n = NODE_NEWNODE(NODE_TRUE, rb_node_true_t, loc);
+
+    return n;
+}
+
+static rb_node_false_t *
+rb_node_false_new(struct parser_params *p, const YYLTYPE *loc)
+{
+    rb_node_false_t *n = NODE_NEWNODE(NODE_FALSE, rb_node_false_t, loc);
+
+    return n;
+}
+
+static rb_node_super_t *
+rb_node_super_new(struct parser_params *p, NODE *nd_args, const YYLTYPE *loc,
+                  const YYLTYPE *keyword_loc, const YYLTYPE *lparen_loc, const YYLTYPE *rparen_loc)
+{
+    rb_node_super_t *n = NODE_NEWNODE(NODE_SUPER, rb_node_super_t, loc);
+    n->nd_args = nd_args;
+    n->keyword_loc = *keyword_loc;
+    n->lparen_loc = *lparen_loc;
+    n->rparen_loc = *rparen_loc;
+
+    return n;
+}
+
+static rb_node_zsuper_t *
+rb_node_zsuper_new(struct parser_params *p, const YYLTYPE *loc)
+{
+    rb_node_zsuper_t *n = NODE_NEWNODE(NODE_ZSUPER, rb_node_zsuper_t, loc);
+
+    return n;
+}
+
+static rb_node_match2_t *
+rb_node_match2_new(struct parser_params *p, NODE *nd_recv, NODE *nd_value, const YYLTYPE *loc)
+{
+    rb_node_match2_t *n = NODE_NEWNODE(NODE_MATCH2, rb_node_match2_t, loc);
+    n->nd_recv = nd_recv;
+    n->nd_value = nd_value;
+    n->nd_args = 0;
+
+    return n;
+}
+
+static rb_node_match3_t *
+rb_node_match3_new(struct parser_params *p, NODE *nd_recv, NODE *nd_value, const YYLTYPE *loc)
+{
+    rb_node_match3_t *n = NODE_NEWNODE(NODE_MATCH3, rb_node_match3_t, loc);
+    n->nd_recv = nd_recv;
+    n->nd_value = nd_value;
+
+    return n;
+}
+
+/* TODO: Use union for NODE_LIST2 */
+static rb_node_list_t *
+rb_node_list_new(struct parser_params *p, NODE *nd_head, const YYLTYPE *loc)
+{
+    rb_node_list_t *n = NODE_NEWNODE(NODE_LIST, rb_node_list_t, loc);
+    n->nd_head = nd_head;
+    n->as.nd_alen = 1;
+    n->nd_next = 0;
+
+    return n;
+}
+
+static rb_node_list_t *
+rb_node_list_new2(struct parser_params *p, NODE *nd_head, long nd_alen, NODE *nd_next, const YYLTYPE *loc)
+{
+    rb_node_list_t *n = NODE_NEWNODE(NODE_LIST, rb_node_list_t, loc);
+    n->nd_head = nd_head;
+    n->as.nd_alen = nd_alen;
+    n->nd_next = nd_next;
+
+    return n;
+}
+
+static rb_node_zlist_t *
+rb_node_zlist_new(struct parser_params *p, const YYLTYPE *loc)
+{
+    rb_node_zlist_t *n = NODE_NEWNODE(NODE_ZLIST, rb_node_zlist_t, loc);
+
+    return n;
+}
+
+static rb_node_hash_t *
+rb_node_hash_new(struct parser_params *p, NODE *nd_head, const YYLTYPE *loc)
+{
+    rb_node_hash_t *n = NODE_NEWNODE(NODE_HASH, rb_node_hash_t, loc);
+    n->nd_head = nd_head;
+    n->nd_brace = 0;
+
+    return n;
+}
+
+static rb_node_masgn_t *
+rb_node_masgn_new(struct parser_params *p, NODE *nd_head, NODE *nd_args, const YYLTYPE *loc)
+{
+    rb_node_masgn_t *n = NODE_NEWNODE(NODE_MASGN, rb_node_masgn_t, loc);
+    n->nd_head = nd_head;
+    n->nd_value = 0;
+    n->nd_args = nd_args;
+
+    return n;
+}
+
+static rb_node_gasgn_t *
+rb_node_gasgn_new(struct parser_params *p, ID nd_vid, NODE *nd_value, const YYLTYPE *loc)
+{
+    rb_node_gasgn_t *n = NODE_NEWNODE(NODE_GASGN, rb_node_gasgn_t, loc);
+    n->nd_vid = nd_vid;
+    n->nd_value = nd_value;
+
+    return n;
+}
+
+static rb_node_lasgn_t *
+rb_node_lasgn_new(struct parser_params *p, ID nd_vid, NODE *nd_value, const YYLTYPE *loc)
+{
+    rb_node_lasgn_t *n = NODE_NEWNODE(NODE_LASGN, rb_node_lasgn_t, loc);
+    n->nd_vid = nd_vid;
+    n->nd_value = nd_value;
+
+    return n;
+}
+
+static rb_node_dasgn_t *
+rb_node_dasgn_new(struct parser_params *p, ID nd_vid, NODE *nd_value, const YYLTYPE *loc)
+{
+    rb_node_dasgn_t *n = NODE_NEWNODE(NODE_DASGN, rb_node_dasgn_t, loc);
+    n->nd_vid = nd_vid;
+    n->nd_value = nd_value;
+
+    return n;
+}
+
+static rb_node_iasgn_t *
+rb_node_iasgn_new(struct parser_params *p, ID nd_vid, NODE *nd_value, const YYLTYPE *loc)
+{
+    rb_node_iasgn_t *n = NODE_NEWNODE(NODE_IASGN, rb_node_iasgn_t, loc);
+    n->nd_vid = nd_vid;
+    n->nd_value = nd_value;
+
+    return n;
+}
+
+static rb_node_cvasgn_t *
+rb_node_cvasgn_new(struct parser_params *p, ID nd_vid, NODE *nd_value, const YYLTYPE *loc)
+{
+    rb_node_cvasgn_t *n = NODE_NEWNODE(NODE_CVASGN, rb_node_cvasgn_t, loc);
+    n->nd_vid = nd_vid;
+    n->nd_value = nd_value;
+
+    return n;
 }
 
-static enum yytokentype
-parse_percent(struct parser_params *p, const int space_seen, const enum lex_state_e last_state)
+static rb_node_op_asgn1_t *
+rb_node_op_asgn1_new(struct parser_params *p, NODE *nd_recv, ID nd_mid, NODE *index, NODE *rvalue, const YYLTYPE *loc, const YYLTYPE *call_operator_loc, const YYLTYPE *opening_loc, const YYLTYPE *closing_loc, const YYLTYPE *binary_operator_loc)
 {
-    register int c;
-    const char *ptok = p->lex.pcur;
+    rb_node_op_asgn1_t *n = NODE_NEWNODE(NODE_OP_ASGN1, rb_node_op_asgn1_t, loc);
+    n->nd_recv = nd_recv;
+    n->nd_mid = nd_mid;
+    n->nd_index = index;
+    n->nd_rvalue = rvalue;
+    n->call_operator_loc = *call_operator_loc;
+    n->opening_loc = *opening_loc;
+    n->closing_loc = *closing_loc;
+    n->binary_operator_loc = *binary_operator_loc;
 
-    if (IS_BEG()) {
-        int term;
-        int paren;
+    return n;
+}
 
-        c = nextc(p);
-      quotation:
-        if (c == -1) goto unterminated;
-        if (!ISALNUM(c)) {
-            term = c;
-            if (!ISASCII(c)) goto unknown;
-            c = 'Q';
-        }
-        else {
-            term = nextc(p);
-            if (rb_enc_isalnum(term, p->enc) || !parser_isascii(p)) {
-              unknown:
-                pushback(p, term);
-                c = parser_precise_mbclen(p, p->lex.pcur);
-                if (c < 0) return 0;
-                p->lex.pcur += c;
-                yyerror0("unknown type of %string");
-                return 0;
-            }
-        }
-        if (term == -1) {
-          unterminated:
-            compile_error(p, "unterminated quoted string meets end of file");
-            return 0;
-        }
-        paren = term;
-        if (term == '(') term = ')';
-        else if (term == '[') term = ']';
-        else if (term == '{') term = '}';
-        else if (term == '<') term = '>';
-        else paren = 0;
+static rb_node_op_asgn2_t *
+rb_node_op_asgn2_new(struct parser_params *p, NODE *nd_recv, NODE *nd_value, ID nd_vid, ID nd_mid, bool nd_aid, const YYLTYPE *loc, const YYLTYPE *call_operator_loc, const YYLTYPE *message_loc, const YYLTYPE *binary_operator_loc)
+{
+    rb_node_op_asgn2_t *n = NODE_NEWNODE(NODE_OP_ASGN2, rb_node_op_asgn2_t, loc);
+    n->nd_recv = nd_recv;
+    n->nd_value = nd_value;
+    n->nd_vid = nd_vid;
+    n->nd_mid = nd_mid;
+    n->nd_aid = nd_aid;
+    n->call_operator_loc = *call_operator_loc;
+    n->message_loc = *message_loc;
+    n->binary_operator_loc = *binary_operator_loc;
 
-        p->lex.ptok = ptok-1;
-        switch (c) {
-          case 'Q':
-            p->lex.strterm = NEW_STRTERM(str_dquote, term, paren);
-            return tSTRING_BEG;
+    return n;
+}
 
-          case 'q':
-            p->lex.strterm = NEW_STRTERM(str_squote, term, paren);
-            return tSTRING_BEG;
+static rb_node_op_asgn_or_t *
+rb_node_op_asgn_or_new(struct parser_params *p, NODE *nd_head, NODE *nd_value, const YYLTYPE *loc)
+{
+    rb_node_op_asgn_or_t *n = NODE_NEWNODE(NODE_OP_ASGN_OR, rb_node_op_asgn_or_t, loc);
+    n->nd_head = nd_head;
+    n->nd_value = nd_value;
 
-          case 'W':
-            p->lex.strterm = NEW_STRTERM(str_dword, term, paren);
-            return tWORDS_BEG;
+    return n;
+}
 
-          case 'w':
-            p->lex.strterm = NEW_STRTERM(str_sword, term, paren);
-            return tQWORDS_BEG;
+static rb_node_op_asgn_and_t *
+rb_node_op_asgn_and_new(struct parser_params *p, NODE *nd_head, NODE *nd_value, const YYLTYPE *loc)
+{
+    rb_node_op_asgn_and_t *n = NODE_NEWNODE(NODE_OP_ASGN_AND, rb_node_op_asgn_and_t, loc);
+    n->nd_head = nd_head;
+    n->nd_value = nd_value;
 
-          case 'I':
-            p->lex.strterm = NEW_STRTERM(str_dword, term, paren);
-            return tSYMBOLS_BEG;
+    return n;
+}
 
-          case 'i':
-            p->lex.strterm = NEW_STRTERM(str_sword, term, paren);
-            return tQSYMBOLS_BEG;
+static rb_node_gvar_t *
+rb_node_gvar_new(struct parser_params *p, ID nd_vid, const YYLTYPE *loc)
+{
+    rb_node_gvar_t *n = NODE_NEWNODE(NODE_GVAR, rb_node_gvar_t, loc);
+    n->nd_vid = nd_vid;
 
-          case 'x':
-            p->lex.strterm = NEW_STRTERM(str_xquote, term, paren);
-            return tXSTRING_BEG;
+    return n;
+}
 
-          case 'r':
-            p->lex.strterm = NEW_STRTERM(str_regexp, term, paren);
-            return tREGEXP_BEG;
+static rb_node_lvar_t *
+rb_node_lvar_new(struct parser_params *p, ID nd_vid, const YYLTYPE *loc)
+{
+    rb_node_lvar_t *n = NODE_NEWNODE(NODE_LVAR, rb_node_lvar_t, loc);
+    n->nd_vid = nd_vid;
 
-          case 's':
-            p->lex.strterm = NEW_STRTERM(str_ssym, term, paren);
-            SET_LEX_STATE(EXPR_FNAME|EXPR_FITEM);
-            return tSYMBEG;
+    return n;
+}
 
-          default:
-            yyerror0("unknown type of %string");
-            return 0;
-        }
-    }
-    if ((c = nextc(p)) == '=') {
-        set_yylval_id('%');
-        SET_LEX_STATE(EXPR_BEG);
-        return tOP_ASGN;
-    }
-    if (IS_SPCARG(c) || (IS_lex_state(EXPR_FITEM) && c == 's')) {
-        goto quotation;
-    }
-    SET_LEX_STATE(IS_AFTER_OPERATOR() ? EXPR_ARG : EXPR_BEG);
-    pushback(p, c);
-    return warn_balanced('%', "%%", "string literal");
+static rb_node_dvar_t *
+rb_node_dvar_new(struct parser_params *p, ID nd_vid, const YYLTYPE *loc)
+{
+    rb_node_dvar_t *n = NODE_NEWNODE(NODE_DVAR, rb_node_dvar_t, loc);
+    n->nd_vid = nd_vid;
+
+    return n;
 }
 
-static int
-tokadd_ident(struct parser_params *p, int c)
+static rb_node_ivar_t *
+rb_node_ivar_new(struct parser_params *p, ID nd_vid, const YYLTYPE *loc)
 {
-    do {
-        if (tokadd_mbchar(p, c) == -1) return -1;
-        c = nextc(p);
-    } while (parser_is_identchar(p));
-    pushback(p, c);
-    return 0;
+    rb_node_ivar_t *n = NODE_NEWNODE(NODE_IVAR, rb_node_ivar_t, loc);
+    n->nd_vid = nd_vid;
+
+    return n;
 }
 
-static ID
-tokenize_ident(struct parser_params *p)
+static rb_node_const_t *
+rb_node_const_new(struct parser_params *p, ID nd_vid, const YYLTYPE *loc)
 {
-    ID ident = TOK_INTERN();
+    rb_node_const_t *n = NODE_NEWNODE(NODE_CONST, rb_node_const_t, loc);
+    n->nd_vid = nd_vid;
 
-    set_yylval_name(ident);
+    return n;
+}
 
-    return ident;
+static rb_node_cvar_t *
+rb_node_cvar_new(struct parser_params *p, ID nd_vid, const YYLTYPE *loc)
+{
+    rb_node_cvar_t *n = NODE_NEWNODE(NODE_CVAR, rb_node_cvar_t, loc);
+    n->nd_vid = nd_vid;
+
+    return n;
 }
 
-static int
-parse_numvar(struct parser_params *p)
+static rb_node_nth_ref_t *
+rb_node_nth_ref_new(struct parser_params *p, long nd_nth, const YYLTYPE *loc)
 {
-    size_t len;
-    int overflow;
-    unsigned long n = ruby_scan_digits(tok(p)+1, toklen(p)-1, 10, &len, &overflow);
-    const unsigned long nth_ref_max =
-        ((FIXNUM_MAX < INT_MAX) ? FIXNUM_MAX : INT_MAX) >> 1;
-    /* NTH_REF is left-shifted to be ORed with back-ref flag and
-     * turned into a Fixnum, in compile.c */
+    rb_node_nth_ref_t *n = NODE_NEWNODE(NODE_NTH_REF, rb_node_nth_ref_t, loc);
+    n->nd_nth = nd_nth;
 
-    if (overflow || n > nth_ref_max) {
-        /* compile_error()? */
-        rb_warn1("`%s' is too big for a number variable, always nil", WARN_S(tok(p)));
-        return 0;		/* $0 is $PROGRAM_NAME, not NTH_REF */
-    }
-    else {
-        return (int)n;
-    }
+    return n;
 }
 
-static enum yytokentype
-parse_gvar(struct parser_params *p, const enum lex_state_e last_state)
+static rb_node_back_ref_t *
+rb_node_back_ref_new(struct parser_params *p, long nd_nth, const YYLTYPE *loc)
 {
-    const char *ptr = p->lex.pcur;
-    register int c;
+    rb_node_back_ref_t *n = NODE_NEWNODE(NODE_BACK_REF, rb_node_back_ref_t, loc);
+    n->nd_nth = nd_nth;
 
-    SET_LEX_STATE(EXPR_END);
-    p->lex.ptok = ptr - 1; /* from '$' */
-    newtok(p);
-    c = nextc(p);
-    switch (c) {
-      case '_':		/* $_: last read line string */
-        c = nextc(p);
-        if (parser_is_identchar(p)) {
-            tokadd(p, '$');
-            tokadd(p, '_');
-            break;
-        }
-        pushback(p, c);
-        c = '_';
-        /* fall through */
-      case '~':		/* $~: match-data */
-      case '*':		/* $*: argv */
-      case '$':		/* $$: pid */
-      case '?':		/* $?: last status */
-      case '!':		/* $!: error string */
-      case '@':		/* $@: error position */
-      case '/':		/* $/: input record separator */
-      case '\\':		/* $\: output record separator */
-      case ';':		/* $;: field separator */
-      case ',':		/* $,: output field separator */
-      case '.':		/* $.: last read line number */
-      case '=':		/* $=: ignorecase */
-      case ':':		/* $:: load path */
-      case '<':		/* $<: reading filename */
-      case '>':		/* $>: default output handle */
-      case '\"':		/* $": already loaded files */
-        tokadd(p, '$');
-        tokadd(p, c);
-        goto gvar;
+    return n;
+}
 
-      case '-':
-        tokadd(p, '$');
-        tokadd(p, c);
-        c = nextc(p);
-        if (parser_is_identchar(p)) {
-            if (tokadd_mbchar(p, c) == -1) return 0;
-        }
-        else {
-            pushback(p, c);
-            pushback(p, '-');
-            return '$';
-        }
-      gvar:
-        set_yylval_name(TOK_INTERN());
-        return tGVAR;
+static rb_node_integer_t *
+rb_node_integer_new(struct parser_params *p, char* val, int base, const YYLTYPE *loc)
+{
+    rb_node_integer_t *n = NODE_NEWNODE(NODE_INTEGER, rb_node_integer_t, loc);
+    n->val = val;
+    n->minus = FALSE;
+    n->base = base;
 
-      case '&':		/* $&: last match */
-      case '`':		/* $`: string before last match */
-      case '\'':		/* $': string after last match */
-      case '+':		/* $+: string matches last paren. */
-        if (IS_lex_state_for(last_state, EXPR_FNAME)) {
-            tokadd(p, '$');
-            tokadd(p, c);
-            goto gvar;
-        }
-        set_yylval_node(NEW_BACK_REF(c, &_cur_loc));
-        return tBACK_REF;
+    return n;
+}
 
-      case '1': case '2': case '3':
-      case '4': case '5': case '6':
-      case '7': case '8': case '9':
-        tokadd(p, '$');
-        do {
-            tokadd(p, c);
-            c = nextc(p);
-        } while (c != -1 && ISDIGIT(c));
-        pushback(p, c);
-        if (IS_lex_state_for(last_state, EXPR_FNAME)) goto gvar;
-        tokfix(p);
-        c = parse_numvar(p);
-        set_yylval_node(NEW_NTH_REF(c, &_cur_loc));
-        return tNTH_REF;
+static rb_node_float_t *
+rb_node_float_new(struct parser_params *p, char* val, const YYLTYPE *loc)
+{
+    rb_node_float_t *n = NODE_NEWNODE(NODE_FLOAT, rb_node_float_t, loc);
+    n->val = val;
+    n->minus = FALSE;
 
-      default:
-        if (!parser_is_identchar(p)) {
-            YYLTYPE loc = RUBY_INIT_YYLLOC();
-            if (c == -1 || ISSPACE(c)) {
-                compile_error(p, "`$' without identifiers is not allowed as a global variable name");
-            }
-            else {
-                pushback(p, c);
-                compile_error(p, "`$%c' is not allowed as a global variable name", c);
-            }
-            parser_show_error_line(p, &loc);
-            set_yylval_noname();
-            return tGVAR;
-        }
-        /* fall through */
-      case '0':
-        tokadd(p, '$');
-    }
+    return n;
+}
 
-    if (tokadd_ident(p, c)) return 0;
-    SET_LEX_STATE(EXPR_END);
-    tokenize_ident(p);
-    return tGVAR;
+static rb_node_rational_t *
+rb_node_rational_new(struct parser_params *p, char* val, int base, int seen_point, const YYLTYPE *loc)
+{
+    rb_node_rational_t *n = NODE_NEWNODE(NODE_RATIONAL, rb_node_rational_t, loc);
+    n->val = val;
+    n->minus = FALSE;
+    n->base = base;
+    n->seen_point = seen_point;
+
+    return n;
 }
 
-#ifndef RIPPER
-static bool
-parser_numbered_param(struct parser_params *p, int n)
+static rb_node_imaginary_t *
+rb_node_imaginary_new(struct parser_params *p, char* val, int base, int seen_point, enum rb_numeric_type numeric_type, const YYLTYPE *loc)
 {
-    if (n < 0) return false;
+    rb_node_imaginary_t *n = NODE_NEWNODE(NODE_IMAGINARY, rb_node_imaginary_t, loc);
+    n->val = val;
+    n->minus = FALSE;
+    n->base = base;
+    n->seen_point = seen_point;
+    n->type = numeric_type;
 
-    if (DVARS_TERMINAL_P(p->lvtbl->args) || DVARS_TERMINAL_P(p->lvtbl->args->prev)) {
-        return false;
-    }
-    if (p->max_numparam == ORDINAL_PARAM) {
-        compile_error(p, "ordinary parameter is defined");
-        return false;
-    }
-    struct vtable *args = p->lvtbl->args;
-    if (p->max_numparam < n) {
-        p->max_numparam = n;
-    }
-    while (n > args->pos) {
-        vtable_add(args, NUMPARAM_IDX_TO_ID(args->pos+1));
-    }
-    return true;
+    return n;
+}
+
+static rb_node_str_t *
+rb_node_str_new(struct parser_params *p, rb_parser_string_t *string, const YYLTYPE *loc)
+{
+    rb_node_str_t *n = NODE_NEWNODE(NODE_STR, rb_node_str_t, loc);
+    n->string = string;
+
+    return n;
 }
-#endif
 
-static enum yytokentype
-parse_atmark(struct parser_params *p, const enum lex_state_e last_state)
+/* TODO; Use union for NODE_DSTR2 */
+static rb_node_dstr_t *
+rb_node_dstr_new0(struct parser_params *p, rb_parser_string_t *string, long nd_alen, NODE *nd_next, const YYLTYPE *loc)
 {
-    const char *ptr = p->lex.pcur;
-    enum yytokentype result = tIVAR;
-    register int c = nextc(p);
-    YYLTYPE loc;
+    rb_node_dstr_t *n = NODE_NEWNODE(NODE_DSTR, rb_node_dstr_t, loc);
+    n->string = string;
+    n->as.nd_alen = nd_alen;
+    n->nd_next = (rb_node_list_t *)nd_next;
 
-    p->lex.ptok = ptr - 1; /* from '@' */
-    newtok(p);
-    tokadd(p, '@');
-    if (c == '@') {
-        result = tCVAR;
-        tokadd(p, '@');
-        c = nextc(p);
-    }
-    SET_LEX_STATE(IS_lex_state_for(last_state, EXPR_FNAME) ? EXPR_ENDFN : EXPR_END);
-    if (c == -1 || !parser_is_identchar(p)) {
-        pushback(p, c);
-        RUBY_SET_YYLLOC(loc);
-        if (result == tIVAR) {
-            compile_error(p, "`@' without identifiers is not allowed as an instance variable name");
-        }
-        else {
-            compile_error(p, "`@@' without identifiers is not allowed as a class variable name");
-        }
-        parser_show_error_line(p, &loc);
-        set_yylval_noname();
-        SET_LEX_STATE(EXPR_END);
-        return result;
-    }
-    else if (ISDIGIT(c)) {
-        pushback(p, c);
-        RUBY_SET_YYLLOC(loc);
-        if (result == tIVAR) {
-            compile_error(p, "`@%c' is not allowed as an instance variable name", c);
-        }
-        else {
-            compile_error(p, "`@@%c' is not allowed as a class variable name", c);
-        }
-        parser_show_error_line(p, &loc);
-        set_yylval_noname();
-        SET_LEX_STATE(EXPR_END);
-        return result;
-    }
+    return n;
+}
 
-    if (tokadd_ident(p, c)) return 0;
-    tokenize_ident(p);
-    return result;
+static rb_node_dstr_t *
+rb_node_dstr_new(struct parser_params *p, rb_parser_string_t *string, const YYLTYPE *loc)
+{
+    return rb_node_dstr_new0(p, string, 1, 0, loc);
 }
 
-static enum yytokentype
-parse_ident(struct parser_params *p, int c, int cmd_state)
+static rb_node_xstr_t *
+rb_node_xstr_new(struct parser_params *p, rb_parser_string_t *string, const YYLTYPE *loc)
 {
-    enum yytokentype result;
-    int mb = ENC_CODERANGE_7BIT;
-    const enum lex_state_e last_state = p->lex.state;
-    ID ident;
-    int enforce_keyword_end = 0;
+    rb_node_xstr_t *n = NODE_NEWNODE(NODE_XSTR, rb_node_xstr_t, loc);
+    n->string = string;
 
-    do {
-        if (!ISASCII(c)) mb = ENC_CODERANGE_UNKNOWN;
-        if (tokadd_mbchar(p, c) == -1) return 0;
-        c = nextc(p);
-    } while (parser_is_identchar(p));
-    if ((c == '!' || c == '?') && !peek(p, '=')) {
-        result = tFID;
-        tokadd(p, c);
-    }
-    else if (c == '=' && IS_lex_state(EXPR_FNAME) &&
-             (!peek(p, '~') && !peek(p, '>') && (!peek(p, '=') || (peek_n(p, '>', 1))))) {
-        result = tIDENTIFIER;
-        tokadd(p, c);
-    }
-    else {
-        result = tCONSTANT;	/* assume provisionally */
-        pushback(p, c);
-    }
-    tokfix(p);
+    return n;
+}
 
-    if (IS_LABEL_POSSIBLE()) {
-        if (IS_LABEL_SUFFIX(0)) {
-            SET_LEX_STATE(EXPR_ARG|EXPR_LABELED);
-            nextc(p);
-            set_yylval_name(TOK_INTERN());
-            return tLABEL;
-        }
-    }
+static rb_node_dxstr_t *
+rb_node_dxstr_new(struct parser_params *p, rb_parser_string_t *string, long nd_alen, NODE *nd_next, const YYLTYPE *loc)
+{
+    rb_node_dxstr_t *n = NODE_NEWNODE(NODE_DXSTR, rb_node_dxstr_t, loc);
+    n->string = string;
+    n->as.nd_alen = nd_alen;
+    n->nd_next = (rb_node_list_t *)nd_next;
 
-#ifndef RIPPER
-    if (!NIL_P(peek_end_expect_token_locations(p))) {
-        VALUE end_loc;
-        int lineno, column;
-        int beg_pos = (int)(p->lex.ptok - p->lex.pbeg);
+    return n;
+}
 
-        end_loc = peek_end_expect_token_locations(p);
-        lineno = NUM2INT(rb_ary_entry(end_loc, 0));
-        column = NUM2INT(rb_ary_entry(end_loc, 1));
+static rb_node_sym_t *
+rb_node_sym_new(struct parser_params *p, VALUE str, const YYLTYPE *loc)
+{
+    rb_node_sym_t *n = NODE_NEWNODE(NODE_SYM, rb_node_sym_t, loc);
+    n->string = rb_str_to_parser_string(p, str);
 
-        if (p->debug) {
-            rb_parser_printf(p, "enforce_keyword_end check. current: (%d, %d), peek: (%d, %d)\n",
-                                p->ruby_sourceline, beg_pos, lineno, column);
-        }
+    return n;
+}
 
-        if ((p->ruby_sourceline > lineno) && (beg_pos <= column)) {
-            const struct kwtable *kw;
+static rb_node_dsym_t *
+rb_node_dsym_new(struct parser_params *p, rb_parser_string_t *string, long nd_alen, NODE *nd_next, const YYLTYPE *loc)
+{
+    rb_node_dsym_t *n = NODE_NEWNODE(NODE_DSYM, rb_node_dsym_t, loc);
+    n->string = string;
+    n->as.nd_alen = nd_alen;
+    n->nd_next = (rb_node_list_t *)nd_next;
 
-            if ((IS_lex_state(EXPR_DOT)) && (kw = rb_reserved_word(tok(p), toklen(p))) && (kw && kw->id[0] == keyword_end)) {
-                if (p->debug) rb_parser_printf(p, "enforce_keyword_end is enabled\n");
-                enforce_keyword_end = 1;
-            }
-        }
-    }
-#endif
+    return n;
+}
 
-    if (mb == ENC_CODERANGE_7BIT && (!IS_lex_state(EXPR_DOT) || enforce_keyword_end)) {
-        const struct kwtable *kw;
+static rb_node_evstr_t *
+rb_node_evstr_new(struct parser_params *p, NODE *nd_body, const YYLTYPE *loc, const YYLTYPE *opening_loc, const YYLTYPE *closing_loc)
+{
+    rb_node_evstr_t *n = NODE_NEWNODE(NODE_EVSTR, rb_node_evstr_t, loc);
+    n->nd_body = nd_body;
+    n->opening_loc = *opening_loc;
+    n->closing_loc = *closing_loc;
 
-        /* See if it is a reserved word.  */
-        kw = rb_reserved_word(tok(p), toklen(p));
-        if (kw) {
-            enum lex_state_e state = p->lex.state;
-            if (IS_lex_state_for(state, EXPR_FNAME)) {
-                SET_LEX_STATE(EXPR_ENDFN);
-                set_yylval_name(rb_intern2(tok(p), toklen(p)));
-                return kw->id[0];
-            }
-            SET_LEX_STATE(kw->state);
-            if (IS_lex_state(EXPR_BEG)) {
-                p->command_start = TRUE;
-            }
-            if (kw->id[0] == keyword_do) {
-                if (lambda_beginning_p()) {
-                    p->lex.lpar_beg = -1; /* make lambda_beginning_p() == FALSE in the body of "-> do ... end" */
-                    return keyword_do_LAMBDA;
-                }
-                if (COND_P()) return keyword_do_cond;
-                if (CMDARG_P() && !IS_lex_state_for(state, EXPR_CMDARG))
-                    return keyword_do_block;
-                return keyword_do;
-            }
-            if (IS_lex_state_for(state, (EXPR_BEG | EXPR_LABELED | EXPR_CLASS)))
-                return kw->id[0];
-            else {
-                if (kw->id[0] != kw->id[1])
-                    SET_LEX_STATE(EXPR_BEG | EXPR_LABEL);
-                return kw->id[1];
-            }
-        }
-    }
+    return n;
+}
 
-    if (IS_lex_state(EXPR_BEG_ANY | EXPR_ARG_ANY | EXPR_DOT)) {
-        if (cmd_state) {
-            SET_LEX_STATE(EXPR_CMDARG);
-        }
-        else {
-            SET_LEX_STATE(EXPR_ARG);
-        }
-    }
-    else if (p->lex.state == EXPR_FNAME) {
-        SET_LEX_STATE(EXPR_ENDFN);
-    }
-    else {
-        SET_LEX_STATE(EXPR_END);
-    }
+static rb_node_regx_t *
+rb_node_regx_new(struct parser_params *p, rb_parser_string_t *string, int options, const YYLTYPE *loc, const YYLTYPE *opening_loc, const YYLTYPE *content_loc, const YYLTYPE *closing_loc)
+{
+    rb_node_regx_t *n = NODE_NEWNODE(NODE_REGX, rb_node_regx_t, loc);
+    n->string = string;
+    n->options = options & RE_OPTION_MASK;
+    n->opening_loc = *opening_loc;
+    n->content_loc = *content_loc;
+    n->closing_loc = *closing_loc;
 
-    ident = tokenize_ident(p);
-    if (result == tCONSTANT && is_local_id(ident)) result = tIDENTIFIER;
-    if (!IS_lex_state_for(last_state, EXPR_DOT|EXPR_FNAME) &&
-        (result == tIDENTIFIER) && /* not EXPR_FNAME, not attrasgn */
-        (lvar_defined(p, ident) || NUMPARAM_ID_P(ident))) {
-        SET_LEX_STATE(EXPR_END|EXPR_LABEL);
-    }
-    return result;
+    return n;
 }
 
-static void
-warn_cr(struct parser_params *p)
+static rb_node_call_t *
+rb_node_call_new(struct parser_params *p, NODE *nd_recv, ID nd_mid, NODE *nd_args, const YYLTYPE *loc)
 {
-    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");
-    }
+    rb_node_call_t *n = NODE_NEWNODE(NODE_CALL, rb_node_call_t, loc);
+    n->nd_recv = nd_recv;
+    n->nd_mid = nd_mid;
+    n->nd_args = nd_args;
+
+    return n;
 }
 
-static enum yytokentype
-parser_yylex(struct parser_params *p)
+static rb_node_opcall_t *
+rb_node_opcall_new(struct parser_params *p, NODE *nd_recv, ID nd_mid, NODE *nd_args, const YYLTYPE *loc)
 {
-    register int c;
-    int space_seen = 0;
-    int cmd_state;
-    int label;
-    enum lex_state_e last_state;
-    int fallthru = FALSE;
-    int token_seen = p->token_seen;
+    rb_node_opcall_t *n = NODE_NEWNODE(NODE_OPCALL, rb_node_opcall_t, loc);
+    n->nd_recv = nd_recv;
+    n->nd_mid = nd_mid;
+    n->nd_args = nd_args;
 
-    if (p->lex.strterm) {
-        if (strterm_is_heredoc((VALUE)p->lex.strterm)) {
-            token_flush(p);
-            return here_document(p, &p->lex.strterm->u.heredoc);
-        }
-        else {
-            token_flush(p);
-            return parse_string(p, &p->lex.strterm->u.literal);
-        }
-    }
-    cmd_state = p->command_start;
-    p->command_start = FALSE;
-    p->token_seen = TRUE;
-#ifndef RIPPER
-    token_flush(p);
-#endif
-  retry:
-    last_state = p->lex.state;
-    switch (c = nextc(p)) {
-      case '\0':		/* NUL */
-      case '\004':		/* ^D */
-      case '\032':		/* ^Z */
-      case -1:			/* end of script. */
-        p->eofp  = 1;
-#ifndef RIPPER
-        if (!NIL_P(p->end_expect_token_locations) && RARRAY_LEN(p->end_expect_token_locations) > 0) {
-            pop_end_expect_token_locations(p);
-            RUBY_SET_YYLLOC_OF_DUMMY_END(*p->yylloc);
-            return tDUMNY_END;
-        }
-#endif
-        /* Set location for end-of-input because dispatch_scan_event is not called. */
-        RUBY_SET_YYLLOC(*p->yylloc);
-        return END_OF_INPUT;
+    return n;
+}
 
-        /* white spaces */
-      case '\r':
-        warn_cr(p);
-        /* fall through */
-      case ' ': case '\t': case '\f':
-      case '\13': /* '\v' */
-        space_seen = 1;
-        while ((c = nextc(p))) {
-            switch (c) {
-              case '\r':
-                warn_cr(p);
-                /* fall through */
-              case ' ': case '\t': case '\f':
-              case '\13': /* '\v' */
-                break;
-              default:
-                goto outofloop;
-            }
-        }
-      outofloop:
-        pushback(p, c);
-        dispatch_scan_event(p, tSP);
-#ifndef RIPPER
-        token_flush(p);
-#endif
-        goto retry;
+static rb_node_fcall_t *
+rb_node_fcall_new(struct parser_params *p, ID nd_mid, NODE *nd_args, const YYLTYPE *loc)
+{
+    rb_node_fcall_t *n = NODE_NEWNODE(NODE_FCALL, rb_node_fcall_t, loc);
+    n->nd_mid = nd_mid;
+    n->nd_args = nd_args;
+
+    return n;
+}
+
+static rb_node_qcall_t *
+rb_node_qcall_new(struct parser_params *p, NODE *nd_recv, ID nd_mid, NODE *nd_args, const YYLTYPE *loc)
+{
+    rb_node_qcall_t *n = NODE_NEWNODE(NODE_QCALL, rb_node_qcall_t, loc);
+    n->nd_recv = nd_recv;
+    n->nd_mid = nd_mid;
+    n->nd_args = nd_args;
+
+    return n;
+}
+
+static rb_node_vcall_t *
+rb_node_vcall_new(struct parser_params *p, ID nd_mid, const YYLTYPE *loc)
+{
+    rb_node_vcall_t *n = NODE_NEWNODE(NODE_VCALL, rb_node_vcall_t, loc);
+    n->nd_mid = nd_mid;
+
+    return n;
+}
+
+static rb_node_once_t *
+rb_node_once_new(struct parser_params *p, NODE *nd_body, const YYLTYPE *loc)
+{
+    rb_node_once_t *n = NODE_NEWNODE(NODE_ONCE, rb_node_once_t, loc);
+    n->nd_body = nd_body;
 
-      case '#':		/* it's a comment */
-        p->token_seen = token_seen;
-        /* no magic_comment in shebang line */
-        if (!parser_magic_comment(p, p->lex.pcur, p->lex.pend - p->lex.pcur)) {
-            if (comment_at_top(p)) {
-                set_file_encoding(p, p->lex.pcur, p->lex.pend);
-            }
-        }
-        lex_goto_eol(p);
-        dispatch_scan_event(p, tCOMMENT);
-        fallthru = TRUE;
-        /* fall through */
-      case '\n':
-        p->token_seen = token_seen;
-        VALUE prevline = p->lex.lastline;
-        c = (IS_lex_state(EXPR_BEG|EXPR_CLASS|EXPR_FNAME|EXPR_DOT) &&
-             !IS_lex_state(EXPR_LABELED));
-        if (c || IS_lex_state_all(EXPR_ARG|EXPR_LABELED)) {
-            if (!fallthru) {
-                dispatch_scan_event(p, tIGNORED_NL);
-            }
-            fallthru = FALSE;
-            if (!c && p->ctxt.in_kwarg) {
-                goto normal_newline;
-            }
-            goto retry;
-        }
-        while (1) {
-            switch (c = nextc(p)) {
-              case ' ': case '\t': case '\f': case '\r':
-              case '\13': /* '\v' */
-                space_seen = 1;
-                break;
-              case '#':
-                pushback(p, c);
-                if (space_seen) {
-                    dispatch_scan_event(p, tSP);
-                    token_flush(p);
-                }
-                goto retry;
-              case '&':
-              case '.': {
-                dispatch_delayed_token(p, tIGNORED_NL);
-                if (peek(p, '.') == (c == '&')) {
-                    pushback(p, c);
-                    dispatch_scan_event(p, tSP);
-                    goto retry;
-                }
-              }
-              default:
-                p->ruby_sourceline--;
-                p->lex.nextline = p->lex.lastline;
-                set_lastline(p, prevline);
-              case -1:		/* EOF no decrement*/
-                lex_goto_eol(p);
-                if (c != -1) {
-                    token_flush(p);
-                    RUBY_SET_YYLLOC(*p->yylloc);
-                }
-                goto normal_newline;
-            }
-        }
-      normal_newline:
-        p->command_start = TRUE;
-        SET_LEX_STATE(EXPR_BEG);
-        return '\n';
+    return n;
+}
 
-      case '*':
-        if ((c = nextc(p)) == '*') {
-            if ((c = nextc(p)) == '=') {
-                set_yylval_id(idPow);
-                SET_LEX_STATE(EXPR_BEG);
-                return tOP_ASGN;
-            }
-            pushback(p, c);
-            if (IS_SPCARG(c)) {
-                rb_warning0("`**' interpreted as argument prefix");
-                c = tDSTAR;
-            }
-            else if (IS_BEG()) {
-                c = tDSTAR;
-            }
-            else {
-                c = warn_balanced((enum ruby_method_ids)tPOW, "**", "argument prefix");
-            }
-        }
-        else {
-            if (c == '=') {
-                set_yylval_id('*');
-                SET_LEX_STATE(EXPR_BEG);
-                return tOP_ASGN;
-            }
-            pushback(p, c);
-            if (IS_SPCARG(c)) {
-                rb_warning0("`*' interpreted as argument prefix");
-                c = tSTAR;
-            }
-            else if (IS_BEG()) {
-                c = tSTAR;
-            }
-            else {
-                c = warn_balanced('*', "*", "argument prefix");
-            }
-        }
-        SET_LEX_STATE(IS_AFTER_OPERATOR() ? EXPR_ARG : EXPR_BEG);
-        return c;
+static rb_node_args_t *
+rb_node_args_new(struct parser_params *p, const YYLTYPE *loc)
+{
+    rb_node_args_t *n = NODE_NEWNODE(NODE_ARGS, rb_node_args_t, loc);
+    MEMZERO(&n->nd_ainfo, struct rb_args_info, 1);
 
-      case '!':
-        c = nextc(p);
-        if (IS_AFTER_OPERATOR()) {
-            SET_LEX_STATE(EXPR_ARG);
-            if (c == '@') {
-                return '!';
-            }
-        }
-        else {
-            SET_LEX_STATE(EXPR_BEG);
-        }
-        if (c == '=') {
-            return tNEQ;
-        }
-        if (c == '~') {
-            return tNMATCH;
-        }
-        pushback(p, c);
-        return '!';
+    return n;
+}
 
-      case '=':
-        if (was_bol(p)) {
-            /* skip embedded rd document */
-            if (word_match_p(p, "begin", 5)) {
-                int first_p = TRUE;
+static rb_node_args_aux_t *
+rb_node_args_aux_new(struct parser_params *p, ID nd_pid, int nd_plen, const YYLTYPE *loc)
+{
+    rb_node_args_aux_t *n = NODE_NEWNODE(NODE_ARGS_AUX, rb_node_args_aux_t, loc);
+    n->nd_pid = nd_pid;
+    n->nd_plen = nd_plen;
+    n->nd_next = 0;
 
-                lex_goto_eol(p);
-                dispatch_scan_event(p, tEMBDOC_BEG);
-                for (;;) {
-                    lex_goto_eol(p);
-                    if (!first_p) {
-                        dispatch_scan_event(p, tEMBDOC);
-                    }
-                    first_p = FALSE;
-                    c = nextc(p);
-                    if (c == -1) {
-                        compile_error(p, "embedded document meets end of file");
-                        return END_OF_INPUT;
-                    }
-                    if (c == '=' && word_match_p(p, "end", 3)) {
-                        break;
-                    }
-                    pushback(p, c);
-                }
-                lex_goto_eol(p);
-                dispatch_scan_event(p, tEMBDOC_END);
-                goto retry;
-            }
-        }
+    return n;
+}
 
-        SET_LEX_STATE(IS_AFTER_OPERATOR() ? EXPR_ARG : EXPR_BEG);
-        if ((c = nextc(p)) == '=') {
-            if ((c = nextc(p)) == '=') {
-                return tEQQ;
-            }
-            pushback(p, c);
-            return tEQ;
-        }
-        if (c == '~') {
-            return tMATCH;
-        }
-        else if (c == '>') {
-            return tASSOC;
-        }
-        pushback(p, c);
-        return '=';
+static rb_node_opt_arg_t *
+rb_node_opt_arg_new(struct parser_params *p, NODE *nd_body, const YYLTYPE *loc)
+{
+    rb_node_opt_arg_t *n = NODE_NEWNODE(NODE_OPT_ARG, rb_node_opt_arg_t, loc);
+    n->nd_body = nd_body;
+    n->nd_next = 0;
 
-      case '<':
-        c = nextc(p);
-        if (c == '<' &&
-            !IS_lex_state(EXPR_DOT | EXPR_CLASS) &&
-            !IS_END() &&
-            (!IS_ARG() || IS_lex_state(EXPR_LABELED) || space_seen)) {
-            int token = heredoc_identifier(p);
-            if (token) return token < 0 ? 0 : token;
-        }
-        if (IS_AFTER_OPERATOR()) {
-            SET_LEX_STATE(EXPR_ARG);
-        }
-        else {
-            if (IS_lex_state(EXPR_CLASS))
-                p->command_start = TRUE;
-            SET_LEX_STATE(EXPR_BEG);
-        }
-        if (c == '=') {
-            if ((c = nextc(p)) == '>') {
-                return tCMP;
-            }
-            pushback(p, c);
-            return tLEQ;
-        }
-        if (c == '<') {
-            if ((c = nextc(p)) == '=') {
-                set_yylval_id(idLTLT);
-                SET_LEX_STATE(EXPR_BEG);
-                return tOP_ASGN;
-            }
-            pushback(p, c);
-            return warn_balanced((enum ruby_method_ids)tLSHFT, "<<", "here document");
-        }
-        pushback(p, c);
-        return '<';
+    return n;
+}
 
-      case '>':
-        SET_LEX_STATE(IS_AFTER_OPERATOR() ? EXPR_ARG : EXPR_BEG);
-        if ((c = nextc(p)) == '=') {
-            return tGEQ;
-        }
-        if (c == '>') {
-            if ((c = nextc(p)) == '=') {
-                set_yylval_id(idGTGT);
-                SET_LEX_STATE(EXPR_BEG);
-                return tOP_ASGN;
-            }
-            pushback(p, c);
-            return tRSHFT;
-        }
-        pushback(p, c);
-        return '>';
+static rb_node_kw_arg_t *
+rb_node_kw_arg_new(struct parser_params *p, NODE *nd_body, const YYLTYPE *loc)
+{
+    rb_node_kw_arg_t *n = NODE_NEWNODE(NODE_KW_ARG, rb_node_kw_arg_t, loc);
+    n->nd_body = nd_body;
+    n->nd_next = 0;
 
-      case '"':
-        label = (IS_LABEL_POSSIBLE() ? str_label : 0);
-        p->lex.strterm = NEW_STRTERM(str_dquote | label, '"', 0);
-        p->lex.ptok = p->lex.pcur-1;
-        return tSTRING_BEG;
+    return n;
+}
 
-      case '`':
-        if (IS_lex_state(EXPR_FNAME)) {
-            SET_LEX_STATE(EXPR_ENDFN);
-            return c;
-        }
-        if (IS_lex_state(EXPR_DOT)) {
-            if (cmd_state)
-                SET_LEX_STATE(EXPR_CMDARG);
-            else
-                SET_LEX_STATE(EXPR_ARG);
-            return c;
-        }
-        p->lex.strterm = NEW_STRTERM(str_xquote, '`', 0);
-        return tXSTRING_BEG;
+static rb_node_postarg_t *
+rb_node_postarg_new(struct parser_params *p, NODE *nd_1st, NODE *nd_2nd, const YYLTYPE *loc)
+{
+    rb_node_postarg_t *n = NODE_NEWNODE(NODE_POSTARG, rb_node_postarg_t, loc);
+    n->nd_1st = nd_1st;
+    n->nd_2nd = nd_2nd;
+
+    return n;
+}
+
+static rb_node_argscat_t *
+rb_node_argscat_new(struct parser_params *p, NODE *nd_head, NODE *nd_body, const YYLTYPE *loc)
+{
+    rb_node_argscat_t *n = NODE_NEWNODE(NODE_ARGSCAT, rb_node_argscat_t, loc);
+    n->nd_head = nd_head;
+    n->nd_body = nd_body;
+
+    return n;
+}
 
-      case '\'':
-        label = (IS_LABEL_POSSIBLE() ? str_label : 0);
-        p->lex.strterm = NEW_STRTERM(str_squote | label, '\'', 0);
-        p->lex.ptok = p->lex.pcur-1;
-        return tSTRING_BEG;
+static rb_node_argspush_t *
+rb_node_argspush_new(struct parser_params *p, NODE *nd_head, NODE *nd_body, const YYLTYPE *loc)
+{
+    rb_node_argspush_t *n = NODE_NEWNODE(NODE_ARGSPUSH, rb_node_argspush_t, loc);
+    n->nd_head = nd_head;
+    n->nd_body = nd_body;
 
-      case '?':
-        return parse_qmark(p, space_seen);
+    return n;
+}
 
-      case '&':
-        if ((c = nextc(p)) == '&') {
-            SET_LEX_STATE(EXPR_BEG);
-            if ((c = nextc(p)) == '=') {
-                set_yylval_id(idANDOP);
-                SET_LEX_STATE(EXPR_BEG);
-                return tOP_ASGN;
-            }
-            pushback(p, c);
-            return tANDOP;
-        }
-        else if (c == '=') {
-            set_yylval_id('&');
-            SET_LEX_STATE(EXPR_BEG);
-            return tOP_ASGN;
-        }
-        else if (c == '.') {
-            set_yylval_id(idANDDOT);
-            SET_LEX_STATE(EXPR_DOT);
-            return tANDDOT;
-        }
-        pushback(p, c);
-        if (IS_SPCARG(c)) {
-            if ((c != ':') ||
-                (c = peekc_n(p, 1)) == -1 ||
-                !(c == '\'' || c == '"' ||
-                  is_identchar(p, (p->lex.pcur+1), p->lex.pend, p->enc))) {
-                rb_warning0("`&' interpreted as argument prefix");
-            }
-            c = tAMPER;
-        }
-        else if (IS_BEG()) {
-            c = tAMPER;
-        }
-        else {
-            c = warn_balanced('&', "&", "argument prefix");
-        }
-        SET_LEX_STATE(IS_AFTER_OPERATOR() ? EXPR_ARG : EXPR_BEG);
-        return c;
+static rb_node_splat_t *
+rb_node_splat_new(struct parser_params *p, NODE *nd_head, const YYLTYPE *loc, const YYLTYPE *operator_loc)
+{
+    rb_node_splat_t *n = NODE_NEWNODE(NODE_SPLAT, rb_node_splat_t, loc);
+    n->nd_head = nd_head;
+    n->operator_loc = *operator_loc;
 
-      case '|':
-        if ((c = nextc(p)) == '|') {
-            SET_LEX_STATE(EXPR_BEG);
-            if ((c = nextc(p)) == '=') {
-                set_yylval_id(idOROP);
-                SET_LEX_STATE(EXPR_BEG);
-                return tOP_ASGN;
-            }
-            pushback(p, c);
-            if (IS_lex_state_for(last_state, EXPR_BEG)) {
-                c = '|';
-                pushback(p, '|');
-                return c;
-            }
-            return tOROP;
-        }
-        if (c == '=') {
-            set_yylval_id('|');
-            SET_LEX_STATE(EXPR_BEG);
-            return tOP_ASGN;
-        }
-        SET_LEX_STATE(IS_AFTER_OPERATOR() ? EXPR_ARG : EXPR_BEG|EXPR_LABEL);
-        pushback(p, c);
-        return '|';
+    return n;
+}
 
-      case '+':
-        c = nextc(p);
-        if (IS_AFTER_OPERATOR()) {
-            SET_LEX_STATE(EXPR_ARG);
-            if (c == '@') {
-                return tUPLUS;
-            }
-            pushback(p, c);
-            return '+';
-        }
-        if (c == '=') {
-            set_yylval_id('+');
-            SET_LEX_STATE(EXPR_BEG);
-            return tOP_ASGN;
-        }
-        if (IS_BEG() || (IS_SPCARG(c) && arg_ambiguous(p, '+'))) {
-            SET_LEX_STATE(EXPR_BEG);
-            pushback(p, c);
-            if (c != -1 && ISDIGIT(c)) {
-                return parse_numeric(p, '+');
-            }
-            return tUPLUS;
-        }
-        SET_LEX_STATE(EXPR_BEG);
-        pushback(p, c);
-        return warn_balanced('+', "+", "unary operator");
+static rb_node_block_pass_t *
+rb_node_block_pass_new(struct parser_params *p, NODE *nd_body, const YYLTYPE *loc, const YYLTYPE *operator_loc)
+{
+    rb_node_block_pass_t *n = NODE_NEWNODE(NODE_BLOCK_PASS, rb_node_block_pass_t, loc);
+    n->forwarding = 0;
+    n->nd_head = 0;
+    n->nd_body = nd_body;
+    n->operator_loc = *operator_loc;
 
-      case '-':
-        c = nextc(p);
-        if (IS_AFTER_OPERATOR()) {
-            SET_LEX_STATE(EXPR_ARG);
-            if (c == '@') {
-                return tUMINUS;
-            }
-            pushback(p, c);
-            return '-';
-        }
-        if (c == '=') {
-            set_yylval_id('-');
-            SET_LEX_STATE(EXPR_BEG);
-            return tOP_ASGN;
-        }
-        if (c == '>') {
-            SET_LEX_STATE(EXPR_ENDFN);
-            return tLAMBDA;
-        }
-        if (IS_BEG() || (IS_SPCARG(c) && arg_ambiguous(p, '-'))) {
-            SET_LEX_STATE(EXPR_BEG);
-            pushback(p, c);
-            if (c != -1 && ISDIGIT(c)) {
-                return tUMINUS_NUM;
-            }
-            return tUMINUS;
-        }
-        SET_LEX_STATE(EXPR_BEG);
-        pushback(p, c);
-        return warn_balanced('-', "-", "unary operator");
+    return n;
+}
 
-      case '.': {
-        int is_beg = IS_BEG();
-        SET_LEX_STATE(EXPR_BEG);
-        if ((c = nextc(p)) == '.') {
-            if ((c = nextc(p)) == '.') {
-                if (p->ctxt.in_argdef) {
-                    SET_LEX_STATE(EXPR_ENDARG);
-                    return tBDOT3;
-                }
-                if (p->lex.paren_nest == 0 && looking_at_eol_p(p)) {
-                    rb_warn0("... at EOL, should be parenthesized?");
-                }
-                else if (p->lex.lpar_beg >= 0 && p->lex.lpar_beg+1 == p->lex.paren_nest) {
-                    if (IS_lex_state_for(last_state, EXPR_LABEL))
-                        return tDOT3;
-                }
-                return is_beg ? tBDOT3 : tDOT3;
-            }
-            pushback(p, c);
-            return is_beg ? tBDOT2 : tDOT2;
-        }
-        pushback(p, c);
-        if (c != -1 && ISDIGIT(c)) {
-            char prev = p->lex.pcur-1 > p->lex.pbeg ? *(p->lex.pcur-2) : 0;
-            parse_numeric(p, '.');
-            if (ISDIGIT(prev)) {
-                yyerror0("unexpected fraction part after numeric literal");
-            }
-            else {
-                yyerror0("no .<digit> floating literal anymore; put 0 before dot");
-            }
-            SET_LEX_STATE(EXPR_END);
-            p->lex.ptok = p->lex.pcur;
-            goto retry;
-        }
-        set_yylval_id('.');
-        SET_LEX_STATE(EXPR_DOT);
-        return '.';
-      }
+static rb_node_alias_t *
+rb_node_alias_new(struct parser_params *p, NODE *nd_1st, NODE *nd_2nd, const YYLTYPE *loc, const YYLTYPE *keyword_loc)
+{
+    rb_node_alias_t *n = NODE_NEWNODE(NODE_ALIAS, rb_node_alias_t, loc);
+    n->nd_1st = nd_1st;
+    n->nd_2nd = nd_2nd;
+    n->keyword_loc = *keyword_loc;
 
-      case '0': case '1': case '2': case '3': case '4':
-      case '5': case '6': case '7': case '8': case '9':
-        return parse_numeric(p, c);
+    return n;
+}
 
-      case ')':
-        COND_POP();
-        CMDARG_POP();
-        SET_LEX_STATE(EXPR_ENDFN);
-        p->lex.paren_nest--;
-        return c;
+static rb_node_valias_t *
+rb_node_valias_new(struct parser_params *p, ID nd_alias, ID nd_orig, const YYLTYPE *loc, const YYLTYPE *keyword_loc)
+{
+    rb_node_valias_t *n = NODE_NEWNODE(NODE_VALIAS, rb_node_valias_t, loc);
+    n->nd_alias = nd_alias;
+    n->nd_orig = nd_orig;
+    n->keyword_loc = *keyword_loc;
 
-      case ']':
-        COND_POP();
-        CMDARG_POP();
-        SET_LEX_STATE(EXPR_END);
-        p->lex.paren_nest--;
-        return c;
+    return n;
+}
 
-      case '}':
-        /* tSTRING_DEND does COND_POP and CMDARG_POP in the yacc's rule */
-        if (!p->lex.brace_nest--) return tSTRING_DEND;
-        COND_POP();
-        CMDARG_POP();
-        SET_LEX_STATE(EXPR_END);
-        p->lex.paren_nest--;
-        return c;
+static rb_node_undef_t *
+rb_node_undef_new(struct parser_params *p, NODE *nd_undef, const YYLTYPE *loc)
+{
+    rb_node_undef_t *n = NODE_NEWNODE(NODE_UNDEF, rb_node_undef_t, loc);
+    n->nd_undefs = rb_parser_ary_new_capa_for_node(p, 1);
+    n->keyword_loc = NULL_LOC;
+    rb_parser_ary_push_node(p, n->nd_undefs, nd_undef);
 
-      case ':':
-        c = nextc(p);
-        if (c == ':') {
-            if (IS_BEG() || IS_lex_state(EXPR_CLASS) || IS_SPCARG(-1)) {
-                SET_LEX_STATE(EXPR_BEG);
-                return tCOLON3;
-            }
-            set_yylval_id(idCOLON2);
-            SET_LEX_STATE(EXPR_DOT);
-            return tCOLON2;
-        }
-        if (IS_END() || ISSPACE(c) || c == '#') {
-            pushback(p, c);
-            c = warn_balanced(':', ":", "symbol literal");
-            SET_LEX_STATE(EXPR_BEG);
-            return c;
-        }
-        switch (c) {
-          case '\'':
-            p->lex.strterm = NEW_STRTERM(str_ssym, c, 0);
-            break;
-          case '"':
-            p->lex.strterm = NEW_STRTERM(str_dsym, c, 0);
-            break;
-          default:
-            pushback(p, c);
-            break;
-        }
-        SET_LEX_STATE(EXPR_FNAME);
-        return tSYMBEG;
+    return n;
+}
 
-      case '/':
-        if (IS_BEG()) {
-            p->lex.strterm = NEW_STRTERM(str_regexp, '/', 0);
-            return tREGEXP_BEG;
-        }
-        if ((c = nextc(p)) == '=') {
-            set_yylval_id('/');
-            SET_LEX_STATE(EXPR_BEG);
-            return tOP_ASGN;
-        }
-        pushback(p, c);
-        if (IS_SPCARG(c)) {
-            arg_ambiguous(p, '/');
-            p->lex.strterm = NEW_STRTERM(str_regexp, '/', 0);
-            return tREGEXP_BEG;
-        }
-        SET_LEX_STATE(IS_AFTER_OPERATOR() ? EXPR_ARG : EXPR_BEG);
-        return warn_balanced('/', "/", "regexp literal");
+static rb_node_errinfo_t *
+rb_node_errinfo_new(struct parser_params *p, const YYLTYPE *loc)
+{
+    rb_node_errinfo_t *n = NODE_NEWNODE(NODE_ERRINFO, rb_node_errinfo_t, loc);
+
+    return n;
+}
+
+static rb_node_defined_t *
+rb_node_defined_new(struct parser_params *p, NODE *nd_head, const YYLTYPE *loc)
+{
+    rb_node_defined_t *n = NODE_NEWNODE(NODE_DEFINED, rb_node_defined_t, loc);
+    n->nd_head = nd_head;
 
-      case '^':
-        if ((c = nextc(p)) == '=') {
-            set_yylval_id('^');
-            SET_LEX_STATE(EXPR_BEG);
-            return tOP_ASGN;
-        }
-        SET_LEX_STATE(IS_AFTER_OPERATOR() ? EXPR_ARG : EXPR_BEG);
-        pushback(p, c);
-        return '^';
+    return n;
+}
 
-      case ';':
-        SET_LEX_STATE(EXPR_BEG);
-        p->command_start = TRUE;
-        return ';';
+static rb_node_postexe_t *
+rb_node_postexe_new(struct parser_params *p, NODE *nd_body, const YYLTYPE *loc, const YYLTYPE *keyword_loc, const YYLTYPE *opening_loc, const YYLTYPE *closing_loc)
+{
+    rb_node_postexe_t *n = NODE_NEWNODE(NODE_POSTEXE, rb_node_postexe_t, loc);
+    n->nd_body = nd_body;
+    n->keyword_loc = *keyword_loc;
+    n->opening_loc = *opening_loc;
+    n->closing_loc = *closing_loc;
 
-      case ',':
-        SET_LEX_STATE(EXPR_BEG|EXPR_LABEL);
-        return ',';
+    return n;
+}
 
-      case '~':
-        if (IS_AFTER_OPERATOR()) {
-            if ((c = nextc(p)) != '@') {
-                pushback(p, c);
-            }
-            SET_LEX_STATE(EXPR_ARG);
-        }
-        else {
-            SET_LEX_STATE(EXPR_BEG);
-        }
-        return '~';
+static rb_node_attrasgn_t *
+rb_node_attrasgn_new(struct parser_params *p, NODE *nd_recv, ID nd_mid, NODE *nd_args, const YYLTYPE *loc)
+{
+    rb_node_attrasgn_t *n = NODE_NEWNODE(NODE_ATTRASGN, rb_node_attrasgn_t, loc);
+    n->nd_recv = nd_recv;
+    n->nd_mid = nd_mid;
+    n->nd_args = nd_args;
 
-      case '(':
-        if (IS_BEG()) {
-            c = tLPAREN;
-        }
-        else if (!space_seen) {
-            /* foo( ... ) => method call, no ambiguity */
-        }
-        else if (IS_ARG() || IS_lex_state_all(EXPR_END|EXPR_LABEL)) {
-            c = tLPAREN_ARG;
-        }
-        else if (IS_lex_state(EXPR_ENDFN) && !lambda_beginning_p()) {
-            rb_warning0("parentheses after method name is interpreted as "
-                        "an argument list, not a decomposed argument");
-        }
-        p->lex.paren_nest++;
-        COND_PUSH(0);
-        CMDARG_PUSH(0);
-        SET_LEX_STATE(EXPR_BEG|EXPR_LABEL);
-        return c;
+    return n;
+}
 
-      case '[':
-        p->lex.paren_nest++;
-        if (IS_AFTER_OPERATOR()) {
-            if ((c = nextc(p)) == ']') {
-                p->lex.paren_nest--;
-                SET_LEX_STATE(EXPR_ARG);
-                if ((c = nextc(p)) == '=') {
-                    return tASET;
-                }
-                pushback(p, c);
-                return tAREF;
-            }
-            pushback(p, c);
-            SET_LEX_STATE(EXPR_ARG|EXPR_LABEL);
-            return '[';
-        }
-        else if (IS_BEG()) {
-            c = tLBRACK;
-        }
-        else if (IS_ARG() && (space_seen || IS_lex_state(EXPR_LABELED))) {
-            c = tLBRACK;
-        }
-        SET_LEX_STATE(EXPR_BEG|EXPR_LABEL);
-        COND_PUSH(0);
-        CMDARG_PUSH(0);
-        return c;
+static rb_node_aryptn_t *
+rb_node_aryptn_new(struct parser_params *p, NODE *pre_args, NODE *rest_arg, NODE *post_args, const YYLTYPE *loc)
+{
+    rb_node_aryptn_t *n = NODE_NEWNODE(NODE_ARYPTN, rb_node_aryptn_t, loc);
+    n->nd_pconst = 0;
+    n->pre_args = pre_args;
+    n->rest_arg = rest_arg;
+    n->post_args = post_args;
 
-      case '{':
-        ++p->lex.brace_nest;
-        if (lambda_beginning_p())
-            c = tLAMBEG;
-        else if (IS_lex_state(EXPR_LABELED))
-            c = tLBRACE;      /* hash */
-        else if (IS_lex_state(EXPR_ARG_ANY | EXPR_END | EXPR_ENDFN))
-            c = '{';          /* block (primary) */
-        else if (IS_lex_state(EXPR_ENDARG))
-            c = tLBRACE_ARG;  /* block (expr) */
-        else
-            c = tLBRACE;      /* hash */
-        if (c != tLBRACE) {
-            p->command_start = TRUE;
-            SET_LEX_STATE(EXPR_BEG);
-        }
-        else {
-            SET_LEX_STATE(EXPR_BEG|EXPR_LABEL);
-        }
-        ++p->lex.paren_nest;  /* after lambda_beginning_p() */
-        COND_PUSH(0);
-        CMDARG_PUSH(0);
-        return c;
+    return n;
+}
 
-      case '\\':
-        c = nextc(p);
-        if (c == '\n') {
-            space_seen = 1;
-            dispatch_scan_event(p, tSP);
-            goto retry; /* skip \\n */
-        }
-        if (c == ' ') return tSP;
-        if (ISSPACE(c)) return c;
-        pushback(p, c);
-        return '\\';
+static rb_node_hshptn_t *
+rb_node_hshptn_new(struct parser_params *p, NODE *nd_pconst, NODE *nd_pkwargs, NODE *nd_pkwrestarg, const YYLTYPE *loc)
+{
+    rb_node_hshptn_t *n = NODE_NEWNODE(NODE_HSHPTN, rb_node_hshptn_t, loc);
+    n->nd_pconst = nd_pconst;
+    n->nd_pkwargs = nd_pkwargs;
+    n->nd_pkwrestarg = nd_pkwrestarg;
 
-      case '%':
-        return parse_percent(p, space_seen, last_state);
+    return n;
+}
 
-      case '$':
-        return parse_gvar(p, last_state);
+static rb_node_fndptn_t *
+rb_node_fndptn_new(struct parser_params *p, NODE *pre_rest_arg, NODE *args, NODE *post_rest_arg, const YYLTYPE *loc)
+{
+    rb_node_fndptn_t *n = NODE_NEWNODE(NODE_FNDPTN, rb_node_fndptn_t, loc);
+    n->nd_pconst = 0;
+    n->pre_rest_arg = pre_rest_arg;
+    n->args = args;
+    n->post_rest_arg = post_rest_arg;
 
-      case '@':
-        return parse_atmark(p, last_state);
+    return n;
+}
 
-      case '_':
-        if (was_bol(p) && whole_match_p(p, "__END__", 7, 0)) {
-            p->ruby__end__seen = 1;
-            p->eofp = 1;
-#ifdef RIPPER
-            lex_goto_eol(p);
-            dispatch_scan_event(p, k__END__);
-#endif
-            return END_OF_INPUT;
-        }
-        newtok(p);
-        break;
+static rb_node_line_t *
+rb_node_line_new(struct parser_params *p, const YYLTYPE *loc)
+{
+    rb_node_line_t *n = NODE_NEWNODE(NODE_LINE, rb_node_line_t, loc);
 
-      default:
-        if (!parser_is_identchar(p)) {
-            compile_error(p, "Invalid char `\\x%02X' in expression", c);
-            token_flush(p);
-            goto retry;
-        }
+    return n;
+}
 
-        newtok(p);
-        break;
-    }
+static rb_node_file_t *
+rb_node_file_new(struct parser_params *p, VALUE str, const YYLTYPE *loc)
+{
+    rb_node_file_t *n = NODE_NEWNODE(NODE_FILE, rb_node_file_t, loc);
+    n->path = rb_str_to_parser_string(p, str);
 
-    return parse_ident(p, c, cmd_state);
+    return n;
 }
 
-static enum yytokentype
-yylex(YYSTYPE *lval, YYLTYPE *yylloc, struct parser_params *p)
+static rb_node_encoding_t *
+rb_node_encoding_new(struct parser_params *p, const YYLTYPE *loc)
 {
-    enum yytokentype t;
+    rb_node_encoding_t *n = NODE_NEWNODE(NODE_ENCODING, rb_node_encoding_t, loc);
+    n->enc = p->enc;
 
-    p->lval = lval;
-    lval->val = Qundef;
-    p->yylloc = yylloc;
+    return n;
+}
 
-    t = parser_yylex(p);
+static rb_node_cdecl_t *
+rb_node_cdecl_new(struct parser_params *p, ID nd_vid, NODE *nd_value, NODE *nd_else, enum rb_parser_shareability shareability, const YYLTYPE *loc)
+{
+    rb_node_cdecl_t *n = NODE_NEWNODE(NODE_CDECL, rb_node_cdecl_t, loc);
+    n->nd_vid = nd_vid;
+    n->nd_value = nd_value;
+    n->nd_else = nd_else;
+    n->shareability = shareability;
 
-    if (has_delayed_token(p))
-        dispatch_delayed_token(p, t);
-    else if (t != END_OF_INPUT)
-        dispatch_scan_event(p, t);
+    return n;
+}
 
-    return t;
+static rb_node_op_cdecl_t *
+rb_node_op_cdecl_new(struct parser_params *p, NODE *nd_head, NODE *nd_value, ID nd_aid, enum rb_parser_shareability shareability, const YYLTYPE *loc)
+{
+    rb_node_op_cdecl_t *n = NODE_NEWNODE(NODE_OP_CDECL, rb_node_op_cdecl_t, loc);
+    n->nd_head = nd_head;
+    n->nd_value = nd_value;
+    n->nd_aid = nd_aid;
+    n->shareability = shareability;
+
+    return n;
 }
 
-#define LVAR_USED ((ID)1 << (sizeof(ID) * CHAR_BIT - 1))
+static rb_node_error_t *
+rb_node_error_new(struct parser_params *p, const YYLTYPE *loc)
+{
+    rb_node_error_t *n = NODE_NEWNODE(NODE_ERROR, rb_node_error_t, loc);
 
-static NODE*
-node_new_temporal(struct parser_params *p, enum node_type type, VALUE a0, VALUE a1, VALUE a2)
+    return n;
+}
+
+static rb_node_break_t *
+rb_node_break_new(struct parser_params *p, NODE *nd_stts, const YYLTYPE *loc, const YYLTYPE *keyword_loc)
 {
-    NODE *n = rb_ast_newnode(p->ast, type);
+    rb_node_break_t *n = NODE_NEWNODE(NODE_BREAK, rb_node_break_t, loc);
+    n->nd_stts = nd_stts;
+    n->nd_chain = 0;
+    n->keyword_loc = *keyword_loc;
 
-    rb_node_init(n, type, a0, a1, a2);
     return n;
 }
 
-static NODE*
-node_newnode(struct parser_params *p, enum node_type type, VALUE a0, VALUE a1, VALUE a2, const rb_code_location_t *loc)
+static rb_node_next_t *
+rb_node_next_new(struct parser_params *p, NODE *nd_stts, const YYLTYPE *loc, const YYLTYPE *keyword_loc)
 {
-    NODE *n = node_new_temporal(p, type, a0, a1, a2);
+    rb_node_next_t *n = NODE_NEWNODE(NODE_NEXT, rb_node_next_t, loc);
+    n->nd_stts = nd_stts;
+    n->nd_chain = 0;
+    n->keyword_loc = *keyword_loc;
 
-    nd_set_loc(n, loc);
-    nd_set_node_id(n, parser_get_node_id(p));
     return n;
 }
 
-static NODE *
-nd_set_loc(NODE *nd, const YYLTYPE *loc)
+static rb_node_redo_t *
+rb_node_redo_new(struct parser_params *p, const YYLTYPE *loc, const YYLTYPE *keyword_loc)
 {
-    nd->nd_loc = *loc;
-    nd_set_line(nd, loc->beg_pos.lineno);
-    return nd;
+    rb_node_redo_t *n = NODE_NEWNODE(NODE_REDO, rb_node_redo_t, loc);
+    n->nd_chain = 0;
+    n->keyword_loc = *keyword_loc;
+
+    return n;
+}
+
+static rb_node_def_temp_t *
+rb_node_def_temp_new(struct parser_params *p, const YYLTYPE *loc)
+{
+    rb_node_def_temp_t *n = NODE_NEWNODE((enum node_type)NODE_DEF_TEMP, rb_node_def_temp_t, loc);
+    n->save.numparam_save = 0;
+    n->save.max_numparam = 0;
+    n->save.ctxt = p->ctxt;
+    n->nd_def = 0;
+    n->nd_mid = 0;
+
+    return n;
+}
+
+static rb_node_def_temp_t *
+def_head_save(struct parser_params *p, rb_node_def_temp_t *n)
+{
+    n->save.numparam_save = numparam_push(p);
+    n->save.max_numparam = p->max_numparam;
+    return n;
 }
 
 #ifndef RIPPER
@@ -10630,13 +12419,14 @@ nodeline(NODE *node)
 {
     return nd_line(node);
 }
+#endif
 
 static NODE*
 newline_node(NODE *node)
 {
     if (node) {
         node = remove_begin(node);
-        node->flags |= NODE_FL_NEWLINE;
+        nd_set_fl_newline(node);
     }
     return node;
 }
@@ -10649,18 +12439,6 @@ fixpos(NODE *node, NODE *orig)
     nd_set_line(node, nd_line(orig));
 }
 
-static void
-parser_warning(struct parser_params *p, NODE *node, const char *mesg)
-{
-    rb_compile_warning(p->ruby_sourcefile, nd_line(node), "%s", mesg);
-}
-
-static void
-parser_warn(struct parser_params *p, NODE *node, const char *mesg)
-{
-    rb_compile_warn(p->ruby_sourcefile, nd_line(node), "%s", mesg);
-}
-
 static NODE*
 block_append(struct parser_params *p, NODE *head, NODE *tail)
 {
@@ -10670,34 +12448,23 @@ block_append(struct parser_params *p, NODE *head, NODE *tail)
 
     if (h == 0) return tail;
     switch (nd_type(h)) {
-      case NODE_LIT:
-      case NODE_STR:
-      case NODE_SELF:
-      case NODE_TRUE:
-      case NODE_FALSE:
-      case NODE_NIL:
-        parser_warning(p, h, "unused literal ignored");
-        return tail;
       default:
         h = end = NEW_BLOCK(head, &head->nd_loc);
-        end->nd_end = end;
         head = end;
         break;
       case NODE_BLOCK:
-        end = h->nd_end;
+        end = RNODE_BLOCK(h)->nd_end;
         break;
     }
 
-    nd = end->nd_head;
+    nd = RNODE_BLOCK(end)->nd_head;
     switch (nd_type(nd)) {
       case NODE_RETURN:
       case NODE_BREAK:
       case NODE_NEXT:
       case NODE_REDO:
       case NODE_RETRY:
-        if (RTEST(ruby_verbose)) {
-            parser_warning(p, tail, "statement not reached");
-        }
+        rb_warning0L(nd_line(tail), "statement not reached");
         break;
 
       default:
@@ -10706,10 +12473,9 @@ block_append(struct parser_params *p, NODE *head, NODE *tail)
 
     if (!nd_type_p(tail, NODE_BLOCK)) {
         tail = NEW_BLOCK(tail, &tail->nd_loc);
-        tail->nd_end = tail;
     }
-    end->nd_next = tail;
-    h->nd_end = tail->nd_end;
+    RNODE_BLOCK(end)->nd_next = tail;
+    RNODE_BLOCK(h)->nd_end = RNODE_BLOCK(tail)->nd_end;
     nd_set_last_loc(head, nd_last_loc(tail));
     return head;
 }
@@ -10721,16 +12487,16 @@ list_append(struct parser_params *p, NODE *list, NODE *item)
     NODE *last;
 
     if (list == 0) return NEW_LIST(item, &item->nd_loc);
-    if (list->nd_next) {
-        last = list->nd_next->nd_end;
+    if (RNODE_LIST(list)->nd_next) {
+        last = RNODE_LIST(RNODE_LIST(list)->nd_next)->as.nd_end;
     }
     else {
         last = list;
     }
 
-    list->nd_alen += 1;
-    last->nd_next = NEW_LIST(item, &item->nd_loc);
-    list->nd_next->nd_end = last->nd_next;
+    RNODE_LIST(list)->as.nd_alen += 1;
+    RNODE_LIST(last)->nd_next = NEW_LIST(item, &item->nd_loc);
+    RNODE_LIST(RNODE_LIST(list)->nd_next)->as.nd_end = RNODE_LIST(last)->nd_next;
 
     nd_set_last_loc(list, nd_last_loc(item));
 
@@ -10743,20 +12509,20 @@ list_concat(NODE *head, NODE *tail)
 {
     NODE *last;
 
-    if (head->nd_next) {
-        last = head->nd_next->nd_end;
+    if (RNODE_LIST(head)->nd_next) {
+        last = RNODE_LIST(RNODE_LIST(head)->nd_next)->as.nd_end;
     }
     else {
         last = head;
     }
 
-    head->nd_alen += tail->nd_alen;
-    last->nd_next = tail;
-    if (tail->nd_next) {
-        head->nd_next->nd_end = tail->nd_next->nd_end;
+    RNODE_LIST(head)->as.nd_alen += RNODE_LIST(tail)->as.nd_alen;
+    RNODE_LIST(last)->nd_next = tail;
+    if (RNODE_LIST(tail)->nd_next) {
+        RNODE_LIST(RNODE_LIST(head)->nd_next)->as.nd_end = RNODE_LIST(RNODE_LIST(tail)->nd_next)->as.nd_end;
     }
     else {
-        head->nd_next->nd_end = tail;
+        RNODE_LIST(RNODE_LIST(head)->nd_next)->as.nd_end = tail;
     }
 
     nd_set_last_loc(head, nd_last_loc(tail));
@@ -10765,40 +12531,53 @@ list_concat(NODE *head, NODE *tail)
 }
 
 static int
-literal_concat0(struct parser_params *p, VALUE head, VALUE tail)
+literal_concat0(struct parser_params *p, rb_parser_string_t *head, rb_parser_string_t *tail)
 {
-    if (NIL_P(tail)) return 1;
-    if (!rb_enc_compatible(head, tail)) {
+    if (!tail) return 1;
+    if (!rb_parser_enc_compatible(p, head, tail)) {
         compile_error(p, "string literal encodings differ (%s / %s)",
-                      rb_enc_name(rb_enc_get(head)),
-                      rb_enc_name(rb_enc_get(tail)));
-        rb_str_resize(head, 0);
-        rb_str_resize(tail, 0);
+                      rb_enc_name(rb_parser_str_get_encoding(head)),
+                      rb_enc_name(rb_parser_str_get_encoding(tail)));
+        rb_parser_str_resize(p, head, 0);
+        rb_parser_str_resize(p, tail, 0);
         return 0;
     }
-    rb_str_buf_append(head, tail);
+    rb_parser_str_buf_append(p, head, tail);
     return 1;
 }
 
-static VALUE
+static rb_parser_string_t *
 string_literal_head(struct parser_params *p, enum node_type htype, NODE *head)
 {
-    if (htype != NODE_DSTR) return Qfalse;
-    if (head->nd_next) {
-        head = head->nd_next->nd_end->nd_head;
-        if (!head || !nd_type_p(head, NODE_STR)) return Qfalse;
+    if (htype != NODE_DSTR) return NULL;
+    if (RNODE_DSTR(head)->nd_next) {
+        head = RNODE_LIST(RNODE_LIST(RNODE_DSTR(head)->nd_next)->as.nd_end)->nd_head;
+        if (!head || !nd_type_p(head, NODE_STR)) return NULL;
     }
-    const VALUE lit = head->nd_lit;
-    ASSUME(lit != Qfalse);
+    rb_parser_string_t *lit = RNODE_DSTR(head)->string;
+    ASSUME(lit);
     return lit;
 }
 
+#ifndef RIPPER
+static rb_parser_string_t *
+rb_parser_string_deep_copy(struct parser_params *p, const rb_parser_string_t *orig)
+{
+    rb_parser_string_t *copy;
+    if (!orig) return NULL;
+    copy = rb_parser_string_new(p, PARSER_STRING_PTR(orig), PARSER_STRING_LEN(orig));
+    copy->coderange = orig->coderange;
+    copy->enc = orig->enc;
+    return copy;
+}
+#endif
+
 /* concat two string literals */
 static NODE *
 literal_concat(struct parser_params *p, NODE *head, NODE *tail, const YYLTYPE *loc)
 {
     enum node_type htype;
-    VALUE lit;
+    rb_parser_string_t *lit;
 
     if (!head) return tail;
     if (!tail) return head;
@@ -10811,7 +12590,7 @@ literal_concat(struct parser_params *p, NODE *head, NODE *tail, const YYLTYPE *l
     if (p->heredoc_indent > 0) {
         switch (htype) {
           case NODE_STR:
-            nd_set_type(head, NODE_DSTR);
+            head = str2dstr(p, head);
           case NODE_DSTR:
             return list_append(p, head, tail);
           default:
@@ -10820,14 +12599,14 @@ literal_concat(struct parser_params *p, NODE *head, NODE *tail, const YYLTYPE *l
     }
     switch (nd_type(tail)) {
       case NODE_STR:
-        if ((lit = string_literal_head(p, htype, head)) != Qfalse) {
+        if ((lit = string_literal_head(p, htype, head)) != false) {
             htype = NODE_STR;
         }
         else {
-            lit = head->nd_lit;
+            lit = RNODE_DSTR(head)->string;
         }
         if (htype == NODE_STR) {
-            if (!literal_concat0(p, lit, tail->nd_lit)) {
+            if (!literal_concat0(p, lit, RNODE_STR(tail)->string)) {
               error:
                 rb_discard_node(p, head);
                 rb_discard_node(p, tail);
@@ -10842,39 +12621,43 @@ literal_concat(struct parser_params *p, NODE *head, NODE *tail, const YYLTYPE *l
 
       case NODE_DSTR:
         if (htype == NODE_STR) {
-            if (!literal_concat0(p, head->nd_lit, tail->nd_lit))
+            if (!literal_concat0(p, RNODE_STR(head)->string, RNODE_DSTR(tail)->string))
                 goto error;
-            tail->nd_lit = head->nd_lit;
+            rb_parser_string_free(p, RNODE_DSTR(tail)->string);
+            RNODE_DSTR(tail)->string = RNODE_STR(head)->string;
+            RNODE_STR(head)->string = NULL;
             rb_discard_node(p, head);
             head = tail;
         }
-        else if (NIL_P(tail->nd_lit)) {
+        else if (!RNODE_DSTR(tail)->string) {
           append:
-            head->nd_alen += tail->nd_alen - 1;
-            if (!head->nd_next) {
-                head->nd_next = tail->nd_next;
+            RNODE_DSTR(head)->as.nd_alen += RNODE_DSTR(tail)->as.nd_alen - 1;
+            if (!RNODE_DSTR(head)->nd_next) {
+                RNODE_DSTR(head)->nd_next = RNODE_DSTR(tail)->nd_next;
             }
-            else if (tail->nd_next) {
-                head->nd_next->nd_end->nd_next = tail->nd_next;
-                head->nd_next->nd_end = tail->nd_next->nd_end;
+            else if (RNODE_DSTR(tail)->nd_next) {
+                RNODE_DSTR(RNODE_DSTR(RNODE_DSTR(head)->nd_next)->as.nd_end)->nd_next = RNODE_DSTR(tail)->nd_next;
+                RNODE_DSTR(RNODE_DSTR(head)->nd_next)->as.nd_end = RNODE_DSTR(RNODE_DSTR(tail)->nd_next)->as.nd_end;
             }
             rb_discard_node(p, tail);
         }
-        else if ((lit = string_literal_head(p, htype, head)) != Qfalse) {
-            if (!literal_concat0(p, lit, tail->nd_lit))
+        else if ((lit = string_literal_head(p, htype, head)) != false) {
+            if (!literal_concat0(p, lit, RNODE_DSTR(tail)->string))
                 goto error;
-            tail->nd_lit = Qnil;
+            rb_parser_string_free(p, RNODE_DSTR(tail)->string);
+            RNODE_DSTR(tail)->string = 0;
             goto append;
         }
         else {
-            list_concat(head, NEW_NODE(NODE_LIST, NEW_STR(tail->nd_lit, loc), tail->nd_alen, tail->nd_next, loc));
+            list_concat(head, NEW_LIST2(NEW_STR(RNODE_DSTR(tail)->string, loc), RNODE_DSTR(tail)->as.nd_alen, (NODE *)RNODE_DSTR(tail)->nd_next, loc));
+            RNODE_DSTR(tail)->string = 0;
         }
         break;
 
       case NODE_EVSTR:
         if (htype == NODE_STR) {
-            nd_set_type(head, NODE_DSTR);
-            head->nd_alen = 1;
+            head = str2dstr(p, head);
+            RNODE_DSTR(head)->as.nd_alen = 1;
         }
         list_append(p, head, tail);
         break;
@@ -10882,6 +12665,44 @@ literal_concat(struct parser_params *p, NODE *head, NODE *tail, const YYLTYPE *l
     return head;
 }
 
+static void
+nd_copy_flag(NODE *new_node, NODE *old_node)
+{
+    if (nd_fl_newline(old_node)) nd_set_fl_newline(new_node);
+    nd_set_line(new_node, nd_line(old_node));
+    new_node->nd_loc = old_node->nd_loc;
+    new_node->node_id = old_node->node_id;
+}
+
+static NODE *
+str2dstr(struct parser_params *p, NODE *node)
+{
+    NODE *new_node = (NODE *)NODE_NEW_INTERNAL(NODE_DSTR, rb_node_dstr_t);
+    nd_copy_flag(new_node, node);
+    RNODE_DSTR(new_node)->string = RNODE_STR(node)->string;
+    RNODE_DSTR(new_node)->as.nd_alen = 0;
+    RNODE_DSTR(new_node)->nd_next = 0;
+    RNODE_STR(node)->string = 0;
+
+    return new_node;
+}
+
+static NODE *
+str2regx(struct parser_params *p, NODE *node, int options, const YYLTYPE *loc, const YYLTYPE *opening_loc, const YYLTYPE *content_loc, const YYLTYPE *closing_loc)
+{
+    NODE *new_node = (NODE *)NODE_NEW_INTERNAL(NODE_REGX, rb_node_regx_t);
+    nd_copy_flag(new_node, node);
+    RNODE_REGX(new_node)->string = RNODE_STR(node)->string;
+    RNODE_REGX(new_node)->options = options;
+    nd_set_loc(new_node, loc);
+    RNODE_REGX(new_node)->opening_loc = *opening_loc;
+    RNODE_REGX(new_node)->content_loc = *content_loc;
+    RNODE_REGX(new_node)->closing_loc = *closing_loc;
+    RNODE_STR(node)->string = 0;
+
+    return new_node;
+}
+
 static NODE *
 evstr2dstr(struct parser_params *p, NODE *node)
 {
@@ -10892,30 +12713,27 @@ evstr2dstr(struct parser_params *p, NODE *node)
 }
 
 static NODE *
-new_evstr(struct parser_params *p, NODE *node, const YYLTYPE *loc)
+new_evstr(struct parser_params *p, NODE *node, const YYLTYPE *loc, const YYLTYPE *opening_loc, const YYLTYPE *closing_loc)
 {
     NODE *head = node;
 
     if (node) {
         switch (nd_type(node)) {
           case NODE_STR:
-            nd_set_type(node, NODE_DSTR);
-            return node;
+            return str2dstr(p, node);
           case NODE_DSTR:
             break;
           case NODE_EVSTR:
             return node;
         }
     }
-    return NEW_EVSTR(head, loc);
+    return NEW_EVSTR(head, loc, opening_loc, closing_loc);
 }
 
 static NODE *
 new_dstr(struct parser_params *p, NODE *node, const YYLTYPE *loc)
 {
-    VALUE lit = STR_NEW0();
-    NODE *dstr = NEW_DSTR(lit, loc);
-    RB_OBJ_WRITTEN(p->ast, Qnil, lit);
+    NODE *dstr = NEW_DSTR(STRING_NEW0(), loc);
     return list_append(p, dstr, node);
 }
 
@@ -10960,7 +12778,25 @@ new_command_qcall(struct parser_params* p, ID atype, NODE *recv, ID mid, NODE *a
     return ret;
 }
 
-#define nd_once_body(node) (nd_type_p((node), NODE_ONCE) ? (node)->nd_body : node)
+static rb_locations_lambda_body_t*
+new_locations_lambda_body(struct parser_params* p, NODE *node, const YYLTYPE *loc, const YYLTYPE *opening_loc, const YYLTYPE *closing_loc)
+{
+    rb_locations_lambda_body_t *body = xcalloc(1, sizeof(rb_locations_lambda_body_t));
+    body->node = node;
+    body->opening_loc = *opening_loc;
+    body->closing_loc = *closing_loc;
+    return body;
+}
+
+#define nd_once_body(node) (nd_type_p((node), NODE_ONCE) ? RNODE_ONCE(node)->nd_body : node)
+
+static NODE*
+last_expr_once_body(NODE *node)
+{
+    if (!node) return 0;
+    return nd_once_body(node);
+}
+
 static NODE*
 match_op(struct parser_params *p, NODE *node1, NODE *node2, const YYLTYPE *op_loc, const YYLTYPE *loc)
 {
@@ -10969,7 +12805,8 @@ match_op(struct parser_params *p, NODE *node1, NODE *node2, const YYLTYPE *op_lo
 
     value_expr(node1);
     value_expr(node2);
-    if (node1 && (n = nd_once_body(node1)) != 0) {
+
+    if ((n = last_expr_once_body(node1)) != 0) {
         switch (nd_type(n)) {
           case NODE_DREGX:
             {
@@ -10978,24 +12815,23 @@ match_op(struct parser_params *p, NODE *node1, NODE *node2, const YYLTYPE *op_lo
                 return match;
             }
 
-          case NODE_LIT:
-            if (RB_TYPE_P(n->nd_lit, T_REGEXP)) {
-                const VALUE lit = n->nd_lit;
-                NODE *match = NEW_MATCH2(node1, node2, loc);
-                match->nd_args = reg_named_capture_assign(p, lit, loc);
-                nd_set_line(match, line);
-                return match;
+          case NODE_REGX:
+            {
+                const VALUE lit = rb_node_regx_string_val(n);
+                if (!NIL_P(lit)) {
+                    NODE *match = NEW_MATCH2(node1, node2, loc);
+                    RNODE_MATCH2(match)->nd_args = reg_named_capture_assign(p, lit, loc, assignable);
+                    nd_set_line(match, line);
+                    return match;
+                }
             }
         }
     }
 
-    if (node2 && (n = nd_once_body(node2)) != 0) {
+    if ((n = last_expr_once_body(node2)) != 0) {
         NODE *match3;
 
         switch (nd_type(n)) {
-          case NODE_LIT:
-            if (!RB_TYPE_P(n->nd_lit, T_REGEXP)) break;
-            /* fallthru */
           case NODE_DREGX:
             match3 = NEW_MATCH3(node2, node1, loc);
             return match3;
@@ -11028,16 +12864,44 @@ numparam_nested_p(struct parser_params *p)
     NODE *inner = local->numparam.inner;
     if (outer || inner) {
         NODE *used = outer ? outer : inner;
-        compile_error(p, "numbered parameter is already used in\n"
-                      "%s:%d: %s block here",
-                      p->ruby_sourcefile, nd_line(used),
-                      outer ? "outer" : "inner");
+        compile_error(p, "numbered parameter is already used in %s block\n"
+                      "%s:%d: numbered parameter is already used here",
+                      outer ? "outer" : "inner",
+                      p->ruby_sourcefile, nd_line(used));
         parser_show_error_line(p, &used->nd_loc);
         return 1;
     }
     return 0;
 }
 
+static int
+numparam_used_p(struct parser_params *p)
+{
+    NODE *numparam = p->lvtbl->numparam.current;
+    if (numparam) {
+        compile_error(p, "'it' is not allowed when a numbered parameter is already used\n"
+                      "%s:%d: numbered parameter is already used here",
+                      p->ruby_sourcefile, nd_line(numparam));
+        parser_show_error_line(p, &numparam->nd_loc);
+        return 1;
+    }
+    return 0;
+}
+
+static int
+it_used_p(struct parser_params *p)
+{
+    NODE *it = p->lvtbl->it;
+    if (it) {
+        compile_error(p, "numbered parameters are not allowed when 'it' is already used\n"
+                      "%s:%d: 'it' is already used here",
+                      p->ruby_sourcefile, nd_line(it));
+        parser_show_error_line(p, &it->nd_loc);
+        return 1;
+    }
+    return 0;
+}
+
 static NODE*
 gettable(struct parser_params *p, ID id, const YYLTYPE *loc)
 {
@@ -11057,44 +12921,31 @@ gettable(struct parser_params *p, ID id, const YYLTYPE *loc)
             VALUE file = p->ruby_sourcefile_string;
             if (NIL_P(file))
                 file = rb_str_new(0, 0);
-            else
-                file = rb_str_dup(file);
-            node = NEW_STR(file, loc);
-            RB_OBJ_WRITTEN(p->ast, Qnil, file);
+            node = NEW_FILE(file, loc);
         }
         return node;
       case keyword__LINE__:
-        return NEW_LIT(INT2FIX(p->tokline), loc);
+        return NEW_LINE(loc);
       case keyword__ENCODING__:
-        node = NEW_LIT(rb_enc_from_encoding(p->enc), loc);
-        RB_OBJ_WRITTEN(p->ast, Qnil, node->nd_lit);
-        return node;
+        return NEW_ENCODING(loc);
 
     }
     switch (id_type(id)) {
       case ID_LOCAL:
         if (dyna_in_block(p) && dvar_defined_ref(p, id, &vidp)) {
-            if (NUMPARAM_ID_P(id) && numparam_nested_p(p)) return 0;
-            if (id == p->cur_arg) {
-                compile_error(p, "circular argument reference - %"PRIsWARN, rb_id2str(id));
-                return 0;
-            }
+            if (NUMPARAM_ID_P(id) && (numparam_nested_p(p) || it_used_p(p))) return 0;
             if (vidp) *vidp |= LVAR_USED;
             node = NEW_DVAR(id, loc);
             return node;
         }
         if (local_id_ref(p, id, &vidp)) {
-            if (id == p->cur_arg) {
-                compile_error(p, "circular argument reference - %"PRIsWARN, rb_id2str(id));
-                return 0;
-            }
             if (vidp) *vidp |= LVAR_USED;
             node = NEW_LVAR(id, loc);
             return node;
         }
         if (dyna_in_block(p) && NUMPARAM_ID_P(id) &&
             parser_numbered_param(p, NUMPARAM_ID_TO_IDX(id))) {
-            if (numparam_nested_p(p)) return 0;
+            if (numparam_nested_p(p) || it_used_p(p)) return 0;
             node = NEW_DVAR(id, loc);
             struct local_vars *local = p->lvtbl;
             if (!local->numparam.current) local->numparam.current = node;
@@ -11106,6 +12957,20 @@ gettable(struct parser_params *p, ID id, const YYLTYPE *loc)
         }
 # endif
         /* method call without arguments */
+        if (dyna_in_block(p) && id == rb_intern("it") && !(DVARS_TERMINAL_P(p->lvtbl->args) || DVARS_TERMINAL_P(p->lvtbl->args->prev))) {
+            if (numparam_used_p(p)) return 0;
+            if (p->max_numparam == ORDINAL_PARAM) {
+                compile_error(p, "ordinary parameter is defined");
+                return 0;
+            }
+            if (!p->it_id) {
+                p->it_id = internal_id(p);
+                vtable_add(p->lvtbl->args, p->it_id);
+            }
+            NODE *node = NEW_DVAR(p->it_id, loc);
+            if (!p->lvtbl->it) p->lvtbl->it = node;
+            return node;
+        }
         return NEW_VCALL(id, loc);
       case ID_GLOBAL:
         return NEW_GVAR(id, loc);
@@ -11120,26 +12985,27 @@ gettable(struct parser_params *p, ID id, const YYLTYPE *loc)
     return 0;
 }
 
-static NODE *
-opt_arg_append(NODE *opt_list, NODE *opt)
+static rb_node_opt_arg_t *
+opt_arg_append(rb_node_opt_arg_t *opt_list, rb_node_opt_arg_t *opt)
 {
-    NODE *opts = opt_list;
-    opts->nd_loc.end_pos = opt->nd_loc.end_pos;
+    rb_node_opt_arg_t *opts = opt_list;
+    RNODE(opts)->nd_loc.end_pos = RNODE(opt)->nd_loc.end_pos;
 
     while (opts->nd_next) {
         opts = opts->nd_next;
-        opts->nd_loc.end_pos = opt->nd_loc.end_pos;
+        RNODE(opts)->nd_loc.end_pos = RNODE(opt)->nd_loc.end_pos;
     }
     opts->nd_next = opt;
 
     return opt_list;
 }
 
-static NODE *
-kwd_append(NODE *kwlist, NODE *kw)
+static rb_node_kw_arg_t *
+kwd_append(rb_node_kw_arg_t *kwlist, rb_node_kw_arg_t *kw)
 {
     if (kwlist) {
-        opt_arg_append(kwlist, kw);
+        /* Assume rb_node_kw_arg_t and rb_node_opt_arg_t has same structure */
+        opt_arg_append(RNODE_OPT_ARG(kwlist), RNODE_OPT_ARG(kw));
     }
     return kwlist;
 }
@@ -11147,7 +13013,34 @@ kwd_append(NODE *kwlist, NODE *kw)
 static NODE *
 new_defined(struct parser_params *p, NODE *expr, const YYLTYPE *loc)
 {
-    return NEW_DEFINED(remove_begin_all(expr), loc);
+    NODE *n = expr;
+    while (n) {
+        if (nd_type_p(n, NODE_BEGIN)) {
+            n = RNODE_BEGIN(n)->nd_body;
+        }
+        else if (nd_type_p(n, NODE_BLOCK) && RNODE_BLOCK(n)->nd_end == n) {
+            n = RNODE_BLOCK(n)->nd_head;
+        }
+        else {
+            break;
+        }
+    }
+    return NEW_DEFINED(n, loc);
+}
+
+static NODE*
+str_to_sym_node(struct parser_params *p, NODE *node, const YYLTYPE *loc)
+{
+    VALUE lit;
+    rb_parser_string_t *str = RNODE_STR(node)->string;
+    if (rb_parser_enc_str_coderange(p, str) == RB_PARSER_ENC_CODERANGE_BROKEN) {
+        yyerror1(loc, "invalid symbol");
+        lit = STR_NEW0();
+    }
+    else {
+        lit = rb_str_new_parser_string(str);
+    }
+    return NEW_SYM(lit, loc);
 }
 
 static NODE*
@@ -11159,83 +13052,69 @@ symbol_append(struct parser_params *p, NODE *symbols, NODE *symbol)
         nd_set_type(symbol, NODE_DSYM);
         break;
       case NODE_STR:
-        nd_set_type(symbol, NODE_LIT);
-        RB_OBJ_WRITTEN(p->ast, Qnil, symbol->nd_lit = rb_str_intern(symbol->nd_lit));
+        symbol = str_to_sym_node(p, symbol, &RNODE(symbol)->nd_loc);
         break;
       default:
-        compile_error(p, "unexpected node as symbol: %s", ruby_node_name(type));
+        compile_error(p, "unexpected node as symbol: %s", parser_node_name(type));
     }
     return list_append(p, symbols, symbol);
 }
 
-static NODE *
-new_regexp(struct parser_params *p, NODE *node, int options, const YYLTYPE *loc)
+static void
+dregex_fragment_setenc(struct parser_params *p, rb_node_dregx_t *const dreg, int options)
 {
-    NODE *list, *prev;
-    VALUE lit;
+    if (dreg->string) {
+        reg_fragment_setenc(p, dreg->string, options);
+    }
+    for (struct RNode_LIST *list = dreg->nd_next; list; list = RNODE_LIST(list->nd_next)) {
+        NODE *frag = list->nd_head;
+        if (nd_type_p(frag, NODE_STR)) {
+            reg_fragment_setenc(p, RNODE_STR(frag)->string, options);
+        }
+        else if (nd_type_p(frag, NODE_DSTR)) {
+            dregex_fragment_setenc(p, RNODE_DSTR(frag), options);
+        }
+    }
+}
 
+static NODE *
+new_regexp(struct parser_params *p, NODE *node, int options, const YYLTYPE *loc, const YYLTYPE *opening_loc, const YYLTYPE *content_loc, const YYLTYPE *closing_loc)
+{
     if (!node) {
-        node = NEW_LIT(reg_compile(p, STR_NEW0(), options), loc);
-        RB_OBJ_WRITTEN(p->ast, Qnil, node->nd_lit);
+        /* Check string is valid regex */
+        rb_parser_string_t *str = STRING_NEW0();
+        reg_compile(p, str, options);
+        node = NEW_REGX(str, options, loc, opening_loc, content_loc, closing_loc);
         return node;
     }
     switch (nd_type(node)) {
       case NODE_STR:
         {
-            VALUE src = node->nd_lit;
-            nd_set_type(node, NODE_LIT);
-            nd_set_loc(node, loc);
-            RB_OBJ_WRITTEN(p->ast, Qnil, node->nd_lit = reg_compile(p, src, options));
+            /* Check string is valid regex */
+            reg_compile(p, RNODE_STR(node)->string, options);
+            node = str2regx(p, node, options, loc, opening_loc, content_loc, closing_loc);
         }
         break;
       default:
-        lit = STR_NEW0();
-        node = NEW_NODE(NODE_DSTR, lit, 1, NEW_LIST(node, loc), loc);
-        RB_OBJ_WRITTEN(p->ast, Qnil, lit);
+        node = NEW_DSTR0(STRING_NEW0(), 1, NEW_LIST(node, loc), loc);
         /* fall through */
       case NODE_DSTR:
         nd_set_type(node, NODE_DREGX);
         nd_set_loc(node, loc);
-        node->nd_cflag = options & RE_OPTION_MASK;
-        if (!NIL_P(node->nd_lit)) reg_fragment_check(p, node->nd_lit, options);
-        for (list = (prev = node)->nd_next; list; list = list->nd_next) {
-            NODE *frag = list->nd_head;
-            enum node_type type = nd_type(frag);
-            if (type == NODE_STR || (type == NODE_DSTR && !frag->nd_next)) {
-                VALUE tail = frag->nd_lit;
-                if (reg_fragment_check(p, tail, options) && prev && !NIL_P(prev->nd_lit)) {
-                    VALUE lit = prev == node ? prev->nd_lit : prev->nd_head->nd_lit;
-                    if (!literal_concat0(p, lit, tail)) {
-                        return NEW_NIL(loc); /* dummy node on error */
-                    }
-                    rb_str_resize(tail, 0);
-                    prev->nd_next = list->nd_next;
-                    rb_discard_node(p, list->nd_head);
-                    rb_discard_node(p, list);
-                    list = prev;
-                }
-                else {
-                    prev = list;
-                }
-            }
-            else {
-                prev = 0;
-            }
-        }
-        if (!node->nd_next) {
-            VALUE src = node->nd_lit;
-            nd_set_type(node, NODE_LIT);
-            RB_OBJ_WRITTEN(p->ast, Qnil, node->nd_lit = reg_compile(p, src, options));
+        rb_node_dregx_t *const dreg = RNODE_DREGX(node);
+        dreg->as.nd_cflag = options & RE_OPTION_MASK;
+        if (dreg->nd_next) {
+            dregex_fragment_setenc(p, dreg, options);
         }
         if (options & RE_OPTION_ONCE) {
-            node = NEW_NODE(NODE_ONCE, 0, node, 0, loc);
+            node = NEW_ONCE(node, loc);
         }
         break;
     }
     return node;
 }
 
-static NODE *
+static rb_node_kw_arg_t *
 new_kw_arg(struct parser_params *p, NODE *k, const YYLTYPE *loc)
 {
     if (!k) return 0;
@@ -11246,9 +13125,7 @@ static NODE *
 new_xstring(struct parser_params *p, NODE *node, const YYLTYPE *loc)
 {
     if (!node) {
-        VALUE lit = STR_NEW0();
-        NODE *xstr = NEW_XSTR(lit, loc);
-        RB_OBJ_WRITTEN(p->ast, Qnil, lit);
+        NODE *xstr = NEW_XSTR(STRING_NEW0(), loc);
         return xstr;
     }
     switch (nd_type(node)) {
@@ -11261,40 +13138,42 @@ new_xstring(struct parser_params *p, NODE *node, const YYLTYPE *loc)
         nd_set_loc(node, loc);
         break;
       default:
-        node = NEW_NODE(NODE_DXSTR, Qnil, 1, NEW_LIST(node, loc), loc);
+        node = NEW_DXSTR(0, 1, NEW_LIST(node, loc), loc);
         break;
     }
     return node;
 }
 
+static const
+struct st_hash_type literal_type = {
+    literal_cmp,
+    literal_hash,
+};
+
+static int nd_type_st_key_enable_p(NODE *node);
+
 static void
 check_literal_when(struct parser_params *p, NODE *arg, const YYLTYPE *loc)
 {
-    VALUE lit;
-
+    /* See https://bugs.ruby-lang.org/issues/20331 for discussion about what is warned. */
     if (!arg || !p->case_labels) return;
+    if (!nd_type_st_key_enable_p(arg)) return;
 
-    lit = rb_node_case_when_optimizable_literal(arg);
-    if (UNDEF_P(lit)) return;
-    if (nd_type_p(arg, NODE_STR)) {
-        RB_OBJ_WRITTEN(p->ast, Qnil, arg->nd_lit = lit);
-    }
-
-    if (NIL_P(p->case_labels)) {
-        p->case_labels = rb_obj_hide(rb_hash_new());
+    if (p->case_labels == CHECK_LITERAL_WHEN) {
+        p->case_labels = st_init_table(&literal_type);
     }
     else {
-        VALUE line = rb_hash_lookup(p->case_labels, lit);
-        if (!NIL_P(line)) {
-            rb_warning1("duplicated `when' clause with line %d is ignored",
-                        WARN_IVAL(line));
+        st_data_t line;
+        if (st_lookup(p->case_labels, (st_data_t)arg, &line)) {
+            rb_warning2("'when' clause on line %d duplicates 'when' clause on line %d and is ignored",
+                        WARN_I((int)nd_line(arg)), WARN_I((int)line));
             return;
         }
     }
-    rb_hash_aset(p->case_labels, lit, INT2NUM(p->ruby_sourceline));
+    st_insert(p->case_labels, (st_data_t)arg, (st_data_t)p->ruby_sourceline);
 }
 
-#else  /* !RIPPER */
+#ifdef RIPPER
 static int
 id_is_var(struct parser_params *p, ID id)
 {
@@ -11314,26 +13193,7 @@ id_is_var(struct parser_params *p, ID id)
     compile_error(p, "identifier %"PRIsVALUE" is not valid to get", rb_id2str(id));
     return 0;
 }
-
-static VALUE
-new_regexp(struct parser_params *p, VALUE re, VALUE opt, const YYLTYPE *loc)
-{
-    VALUE src = 0, err = 0;
-    int options = 0;
-    if (ripper_is_node_yylval(p, re)) {
-        src = RNODE(re)->nd_cval;
-        re = RNODE(re)->nd_rval;
-    }
-    if (ripper_is_node_yylval(p, opt)) {
-        options = (int)RNODE(opt)->nd_tag;
-        opt = RNODE(opt)->nd_rval;
-    }
-    if (src && NIL_P(parser_reg_compile(p, src, options, &err))) {
-        compile_error(p, "%"PRIsVALUE, err);
-    }
-    return dispatch2(regexp_literal, re, opt);
-}
-#endif /* !RIPPER */
+#endif
 
 static inline enum lex_state_e
 parser_set_lex_state(struct parser_params *p, enum lex_state_e ls, int line)
@@ -11345,6 +13205,20 @@ parser_set_lex_state(struct parser_params *p, enum lex_state_e ls, int line)
 }
 
 #ifndef RIPPER
+static void
+flush_debug_buffer(struct parser_params *p, VALUE out, VALUE str)
+{
+    VALUE mesg = p->debug_buffer;
+
+    if (!NIL_P(mesg) && RSTRING_LEN(mesg)) {
+        p->debug_buffer = Qnil;
+        rb_io_puts(1, &mesg, out);
+    }
+    if (!NIL_P(str) && RSTRING_LEN(str)) {
+        rb_io_write(p->debug_output, str);
+    }
+}
+
 static const char rb_parser_lex_state_names[][8] = {
     "BEG",    "END",    "ENDARG", "ENDFN",  "ARG",
     "CMDARG", "MID",    "FNAME",  "DOT",    "CLASS",
@@ -11373,20 +13247,6 @@ append_lex_state_name(struct parser_params *p, enum lex_state_e state, VALUE buf
     return buf;
 }
 
-static void
-flush_debug_buffer(struct parser_params *p, VALUE out, VALUE str)
-{
-    VALUE mesg = p->debug_buffer;
-
-    if (!NIL_P(mesg) && RSTRING_LEN(mesg)) {
-        p->debug_buffer = Qnil;
-        rb_io_puts(1, &mesg, out);
-    }
-    if (!NIL_P(str) && RSTRING_LEN(str)) {
-        rb_io_write(p->debug_output, str);
-    }
-}
-
 enum lex_state_e
 rb_parser_trace_lex_state(struct parser_params *p, enum lex_state_e from,
                           enum lex_state_e to, int line)
@@ -11404,7 +13264,7 @@ rb_parser_trace_lex_state(struct parser_params *p, enum lex_state_e from,
 VALUE
 rb_parser_lex_state_name(struct parser_params *p, enum lex_state_e state)
 {
-    return rb_fstring(append_lex_state_name(p, state, rb_str_new(0, 0)));
+    return rb_str_to_interned_str(append_lex_state_name(p, state, rb_str_new(0, 0)));
 }
 
 static void
@@ -11583,7 +13443,6 @@ assignable0(struct parser_params *p, ID id, const char **err)
     return -1;
 }
 
-#ifndef RIPPER
 static NODE*
 assignable(struct parser_params *p, ID id, NODE *val, const YYLTYPE *loc)
 {
@@ -11594,22 +13453,17 @@ assignable(struct parser_params *p, ID id, NODE *val, const YYLTYPE *loc)
       case NODE_LASGN: return NEW_LASGN(id, val, loc);
       case NODE_GASGN: return NEW_GASGN(id, val, loc);
       case NODE_IASGN: return NEW_IASGN(id, val, loc);
-      case NODE_CDECL: return NEW_CDECL(id, val, 0, loc);
+      case NODE_CDECL: return NEW_CDECL(id, val, 0, p->ctxt.shareable_constant_value, loc);
       case NODE_CVASGN: return NEW_CVASGN(id, val, loc);
     }
+/* TODO: FIXME */
+#ifndef RIPPER
     if (err) yyerror1(loc, err);
-    return NEW_BEGIN(0, loc);
-}
 #else
-static VALUE
-assignable(struct parser_params *p, VALUE lhs)
-{
-    const char *err = 0;
-    assignable0(p, get_id(lhs), &err);
-    if (err) lhs = assign_error(p, err, lhs);
-    return lhs;
-}
+    if (err) set_value(assign_error(p, err, p->s_lvalue));
 #endif
+    return NEW_ERROR(loc);
+}
 
 static int
 is_private_local_id(struct parser_params *p, ID name)
@@ -11665,12 +13519,44 @@ new_bv(struct parser_params *p, ID name)
     }
     if (!shadowing_lvar_0(p, name)) return;
     dyna_var(p, name);
+    ID *vidp = 0;
+    if (dvar_defined_ref(p, name, &vidp)) {
+        if (vidp) *vidp |= LVAR_USED;
+    }
+}
+
+static void
+aryset_check(struct parser_params *p, NODE *args)
+{
+    NODE *block = 0, *kwds = 0;
+    if (args && nd_type_p(args, NODE_BLOCK_PASS)) {
+        block = RNODE_BLOCK_PASS(args)->nd_body;
+        args = RNODE_BLOCK_PASS(args)->nd_head;
+    }
+    if (args && nd_type_p(args, NODE_ARGSCAT)) {
+        args = RNODE_ARGSCAT(args)->nd_body;
+    }
+    if (args && nd_type_p(args, NODE_ARGSPUSH)) {
+        kwds = RNODE_ARGSPUSH(args)->nd_body;
+    }
+    else {
+        for (NODE *next = args; next && nd_type_p(next, NODE_LIST);
+             next = RNODE_LIST(next)->nd_next) {
+            kwds = RNODE_LIST(next)->nd_head;
+        }
+    }
+    if (kwds && nd_type_p(kwds, NODE_HASH) && !RNODE_HASH(kwds)->nd_brace) {
+        yyerror1(&kwds->nd_loc, "keyword arg given in index assignment");
+    }
+    if (block) {
+        yyerror1(&block->nd_loc, "block arg given in index assignment");
+    }
 }
 
-#ifndef RIPPER
 static NODE *
 aryset(struct parser_params *p, NODE *recv, NODE *idx, const YYLTYPE *loc)
 {
+    aryset_check(p, idx);
     return NEW_ATTRASGN(recv, tASET, idx, loc);
 }
 
@@ -11689,29 +13575,24 @@ attrset(struct parser_params *p, NODE *recv, ID atype, ID id, const YYLTYPE *loc
     return NEW_ATTRASGN(recv, id, 0, loc);
 }
 
-static void
+static VALUE
 rb_backref_error(struct parser_params *p, NODE *node)
 {
+#ifndef RIPPER
+# define ERR(...) (compile_error(p, __VA_ARGS__), Qtrue)
+#else
+# define ERR(...) rb_sprintf(__VA_ARGS__)
+#endif
     switch (nd_type(node)) {
       case NODE_NTH_REF:
-        compile_error(p, "Can't set variable $%ld", node->nd_nth);
-        break;
+        return ERR("Can't set variable $%ld", RNODE_NTH_REF(node)->nd_nth);
       case NODE_BACK_REF:
-        compile_error(p, "Can't set variable $%c", (int)node->nd_nth);
-        break;
+        return ERR("Can't set variable $%c", (int)RNODE_BACK_REF(node)->nd_nth);
     }
+#undef ERR
+    UNREACHABLE_RETURN(Qfalse); /* only called on syntax error */
 }
-#else
-static VALUE
-backref_error(struct parser_params *p, NODE *ref, VALUE expr)
-{
-    VALUE mesg = rb_str_new_cstr("Can't set variable ");
-    rb_str_append(mesg, ref->nd_cval);
-    return dispatch2(assign_error, mesg, expr);
-}
-#endif
 
-#ifndef RIPPER
 static NODE *
 arg_append(struct parser_params *p, NODE *node1, NODE *node2, const YYLTYPE *loc)
 {
@@ -11720,18 +13601,18 @@ arg_append(struct parser_params *p, NODE *node1, NODE *node2, const YYLTYPE *loc
       case NODE_LIST:
         return list_append(p, node1, node2);
       case NODE_BLOCK_PASS:
-        node1->nd_head = arg_append(p, node1->nd_head, node2, loc);
-        node1->nd_loc.end_pos = node1->nd_head->nd_loc.end_pos;
+        RNODE_BLOCK_PASS(node1)->nd_head = arg_append(p, RNODE_BLOCK_PASS(node1)->nd_head, node2, loc);
+        node1->nd_loc.end_pos = RNODE_BLOCK_PASS(node1)->nd_head->nd_loc.end_pos;
         return node1;
       case NODE_ARGSPUSH:
-        node1->nd_body = list_append(p, NEW_LIST(node1->nd_body, &node1->nd_body->nd_loc), node2);
-        node1->nd_loc.end_pos = node1->nd_body->nd_loc.end_pos;
+        RNODE_ARGSPUSH(node1)->nd_body = list_append(p, NEW_LIST(RNODE_ARGSPUSH(node1)->nd_body, &RNODE_ARGSPUSH(node1)->nd_body->nd_loc), node2);
+        node1->nd_loc.end_pos = RNODE_ARGSPUSH(node1)->nd_body->nd_loc.end_pos;
         nd_set_type(node1, NODE_ARGSCAT);
         return node1;
       case NODE_ARGSCAT:
-        if (!nd_type_p(node1->nd_body, NODE_LIST)) break;
-        node1->nd_body = list_append(p, node1->nd_body, node2);
-        node1->nd_loc.end_pos = node1->nd_body->nd_loc.end_pos;
+        if (!nd_type_p(RNODE_ARGSCAT(node1)->nd_body, NODE_LIST)) break;
+        RNODE_ARGSCAT(node1)->nd_body = list_append(p, RNODE_ARGSCAT(node1)->nd_body, node2);
+        node1->nd_loc.end_pos = RNODE_ARGSCAT(node1)->nd_body->nd_loc.end_pos;
         return node1;
     }
     return NEW_ARGSPUSH(node1, node2, loc);
@@ -11743,20 +13624,20 @@ arg_concat(struct parser_params *p, NODE *node1, NODE *node2, const YYLTYPE *loc
     if (!node2) return node1;
     switch (nd_type(node1)) {
       case NODE_BLOCK_PASS:
-        if (node1->nd_head)
-            node1->nd_head = arg_concat(p, node1->nd_head, node2, loc);
+        if (RNODE_BLOCK_PASS(node1)->nd_head)
+            RNODE_BLOCK_PASS(node1)->nd_head = arg_concat(p, RNODE_BLOCK_PASS(node1)->nd_head, node2, loc);
         else
-            node1->nd_head = NEW_LIST(node2, loc);
+            RNODE_LIST(node1)->nd_head = NEW_LIST(node2, loc);
         return node1;
       case NODE_ARGSPUSH:
         if (!nd_type_p(node2, NODE_LIST)) break;
-        node1->nd_body = list_concat(NEW_LIST(node1->nd_body, loc), node2);
+        RNODE_ARGSPUSH(node1)->nd_body = list_concat(NEW_LIST(RNODE_ARGSPUSH(node1)->nd_body, loc), node2);
         nd_set_type(node1, NODE_ARGSCAT);
         return node1;
       case NODE_ARGSCAT:
         if (!nd_type_p(node2, NODE_LIST) ||
-            !nd_type_p(node1->nd_body, NODE_LIST)) break;
-        node1->nd_body = list_concat(node1->nd_body, node2);
+            !nd_type_p(RNODE_ARGSCAT(node1)->nd_body, NODE_LIST)) break;
+        RNODE_ARGSCAT(node1)->nd_body = list_concat(RNODE_ARGSCAT(node1)->nd_body, node2);
         return node1;
     }
     return NEW_ARGSCAT(node1, node2, loc);
@@ -11785,281 +13666,39 @@ rest_arg_append(struct parser_params *p, NODE *args, NODE *rest_arg, const YYLTY
 static NODE *
 splat_array(NODE* node)
 {
-    if (nd_type_p(node, NODE_SPLAT)) node = node->nd_head;
-    if (nd_type_p(node, NODE_LIST)) return node;
-    return 0;
-}
-
-static void
-mark_lvar_used(struct parser_params *p, NODE *rhs)
-{
-    ID *vidp = NULL;
-    if (!rhs) return;
-    switch (nd_type(rhs)) {
-      case NODE_LASGN:
-        if (local_id_ref(p, rhs->nd_vid, &vidp)) {
-            if (vidp) *vidp |= LVAR_USED;
-        }
-        break;
-      case NODE_DASGN:
-        if (dvar_defined_ref(p, rhs->nd_vid, &vidp)) {
-            if (vidp) *vidp |= LVAR_USED;
-        }
-        break;
-#if 0
-      case NODE_MASGN:
-        for (rhs = rhs->nd_head; rhs; rhs = rhs->nd_next) {
-            mark_lvar_used(p, rhs->nd_head);
-        }
-        break;
-#endif
-    }
-}
-
-static NODE *
-const_decl_path(struct parser_params *p, NODE **dest)
-{
-    NODE *n = *dest;
-    if (!nd_type_p(n, NODE_CALL)) {
-        const YYLTYPE *loc = &n->nd_loc;
-        VALUE path;
-        if (n->nd_vid) {
-             path = rb_id2str(n->nd_vid);
-        }
-        else {
-            n = n->nd_else;
-            path = rb_ary_new();
-            for (; n && nd_type_p(n, NODE_COLON2); n = n->nd_head) {
-                rb_ary_push(path, rb_id2str(n->nd_mid));
-            }
-            if (n && nd_type_p(n, NODE_CONST)) {
-                // Const::Name
-                rb_ary_push(path, rb_id2str(n->nd_vid));
-            }
-            else if (n && nd_type_p(n, NODE_COLON3)) {
-                // ::Const::Name
-                rb_ary_push(path, rb_str_new(0, 0));
-            }
-            else {
-                // expression::Name
-                rb_ary_push(path, rb_str_new_cstr("..."));
-            }
-            path = rb_ary_join(rb_ary_reverse(path), rb_str_new_cstr("::"));
-            path = rb_fstring(path);
-        }
-        *dest = n = NEW_LIT(path, loc);
-        RB_OBJ_WRITTEN(p->ast, Qnil, n->nd_lit);
-    }
-    return n;
-}
-
-static NODE *
-make_shareable_node(struct parser_params *p, NODE *value, bool copy, const YYLTYPE *loc)
-{
-    NODE *fcore = NEW_LIT(rb_mRubyVMFrozenCore, loc);
-
-    if (copy) {
-        return NEW_CALL(fcore, rb_intern("make_shareable_copy"),
-                        NEW_LIST(value, loc), loc);
-    }
-    else {
-        return NEW_CALL(fcore, rb_intern("make_shareable"),
-                        NEW_LIST(value, loc), loc);
-    }
-}
-
-static NODE *
-ensure_shareable_node(struct parser_params *p, NODE **dest, NODE *value, const YYLTYPE *loc)
-{
-    NODE *fcore = NEW_LIT(rb_mRubyVMFrozenCore, loc);
-    NODE *args = NEW_LIST(value, loc);
-    args = list_append(p, args, const_decl_path(p, dest));
-    return NEW_CALL(fcore, rb_intern("ensure_shareable"), args, loc);
-}
-
-static int is_static_content(NODE *node);
-
-static VALUE
-shareable_literal_value(struct parser_params *p, NODE *node)
-{
-    if (!node) return Qnil;
-    enum node_type type = nd_type(node);
-    switch (type) {
-      case NODE_TRUE:
-        return Qtrue;
-      case NODE_FALSE:
-        return Qfalse;
-      case NODE_NIL:
-        return Qnil;
-      case NODE_LIT:
-        return node->nd_lit;
-      default:
-        return Qundef;
-    }
-}
-
-#ifndef SHAREABLE_BARE_EXPRESSION
-#define SHAREABLE_BARE_EXPRESSION 1
-#endif
-
-static NODE *
-shareable_literal_constant(struct parser_params *p, enum shareability shareable,
-                           NODE **dest, NODE *value, const YYLTYPE *loc, size_t level)
-{
-# define shareable_literal_constant_next(n) \
-    shareable_literal_constant(p, shareable, dest, (n), &(n)->nd_loc, level+1)
-    VALUE lit = Qnil;
-
-    if (!value) return 0;
-    enum node_type type = nd_type(value);
-    switch (type) {
-      case NODE_TRUE:
-      case NODE_FALSE:
-      case NODE_NIL:
-      case NODE_LIT:
-        return value;
-
-      case NODE_DSTR:
-        if (shareable == shareable_literal) {
-            value = NEW_CALL(value, idUMinus, 0, loc);
-        }
-        return value;
-
-      case NODE_STR:
-        lit = rb_fstring(value->nd_lit);
-        nd_set_type(value, NODE_LIT);
-        RB_OBJ_WRITE(p->ast, &value->nd_lit, lit);
-        return value;
-
-      case NODE_ZLIST:
-        lit = rb_ary_new();
-        OBJ_FREEZE_RAW(lit);
-        NODE *n = NEW_LIT(lit, loc);
-        RB_OBJ_WRITTEN(p->ast, Qnil, n->nd_lit);
-        return n;
-
-      case NODE_LIST:
-        lit = rb_ary_new();
-        for (NODE *n = value; n; n = n->nd_next) {
-            NODE *elt = n->nd_head;
-            if (elt) {
-                elt = shareable_literal_constant_next(elt);
-                if (elt) {
-                    n->nd_head = elt;
-                }
-                else if (RTEST(lit)) {
-                    rb_ary_clear(lit);
-                    lit = Qfalse;
-                }
-            }
-            if (RTEST(lit)) {
-                VALUE e = shareable_literal_value(p, elt);
-                if (!UNDEF_P(e)) {
-                    rb_ary_push(lit, e);
-                }
-                else {
-                    rb_ary_clear(lit);
-                    lit = Qnil;	/* make shareable at runtime */
-                }
-            }
-        }
-        break;
-
-      case NODE_HASH:
-        if (!value->nd_brace) return 0;
-        lit = rb_hash_new();
-        for (NODE *n = value->nd_head; n; n = n->nd_next->nd_next) {
-            NODE *key = n->nd_head;
-            NODE *val = n->nd_next->nd_head;
-            if (key) {
-                key = shareable_literal_constant_next(key);
-                if (key) {
-                    n->nd_head = key;
-                }
-                else if (RTEST(lit)) {
-                    rb_hash_clear(lit);
-                    lit = Qfalse;
-                }
-            }
-            if (val) {
-                val = shareable_literal_constant_next(val);
-                if (val) {
-                    n->nd_next->nd_head = val;
-                }
-                else if (RTEST(lit)) {
-                    rb_hash_clear(lit);
-                    lit = Qfalse;
-                }
-            }
-            if (RTEST(lit)) {
-                VALUE k = shareable_literal_value(p, key);
-                VALUE v = shareable_literal_value(p, val);
-                if (!UNDEF_P(k) && !UNDEF_P(v)) {
-                    rb_hash_aset(lit, k, v);
-                }
-                else {
-                    rb_hash_clear(lit);
-                    lit = Qnil;	/* make shareable at runtime */
-                }
-            }
-        }
-        break;
-
-      default:
-        if (shareable == shareable_literal &&
-            (SHAREABLE_BARE_EXPRESSION || level > 0)) {
-            return ensure_shareable_node(p, dest, value, loc);
-        }
-        return 0;
-    }
-
-    /* Array or Hash */
-    if (!lit) return 0;
-    if (NIL_P(lit)) {
-        // if shareable_literal, all elements should have been ensured
-        // as shareable
-        value = make_shareable_node(p, value, false, loc);
-    }
-    else {
-        value = NEW_LIT(rb_ractor_make_shareable(lit), loc);
-        RB_OBJ_WRITTEN(p->ast, Qnil, value->nd_lit);
-    }
-
-    return value;
-# undef shareable_literal_constant_next
+    if (nd_type_p(node, NODE_SPLAT)) node = RNODE_SPLAT(node)->nd_head;
+    if (nd_type_p(node, NODE_LIST)) return node;
+    return 0;
 }
 
-static NODE *
-shareable_constant_value(struct parser_params *p, enum shareability shareable,
-                         NODE *lhs, NODE *value, const YYLTYPE *loc)
+static void
+mark_lvar_used(struct parser_params *p, NODE *rhs)
 {
-    if (!value) return 0;
-    switch (shareable) {
-      case shareable_none:
-        return value;
-
-      case shareable_literal:
-        {
-            NODE *lit = shareable_literal_constant(p, shareable, &lhs, value, loc, 0);
-            if (lit) return lit;
-            return value;
+    ID *vidp = NULL;
+    if (!rhs) return;
+    switch (nd_type(rhs)) {
+      case NODE_LASGN:
+        if (local_id_ref(p, RNODE_LASGN(rhs)->nd_vid, &vidp)) {
+            if (vidp) *vidp |= LVAR_USED;
         }
         break;
-
-      case shareable_copy:
-      case shareable_everything:
-        {
-            NODE *lit = shareable_literal_constant(p, shareable, &lhs, value, loc, 0);
-            if (lit) return lit;
-            return make_shareable_node(p, value, shareable == shareable_copy, loc);
+      case NODE_DASGN:
+        if (dvar_defined_ref(p, RNODE_DASGN(rhs)->nd_vid, &vidp)) {
+            if (vidp) *vidp |= LVAR_USED;
         }
         break;
-
-      default:
-        UNREACHABLE_RETURN(0);
+#if 0
+      case NODE_MASGN:
+        for (rhs = rhs->nd_head; rhs; rhs = rhs->nd_next) {
+            mark_lvar_used(p, rhs->nd_head);
+        }
+        break;
+#endif
     }
 }
 
+static int is_static_content(NODE *node);
+
 static NODE *
 node_assign(struct parser_params *p, NODE *lhs, NODE *rhs, struct lex_context ctxt, const YYLTYPE *loc)
 {
@@ -12067,21 +13706,18 @@ node_assign(struct parser_params *p, NODE *lhs, NODE *rhs, struct lex_context ct
 
     switch (nd_type(lhs)) {
       case NODE_CDECL:
-        rhs = shareable_constant_value(p, ctxt.shareable_constant_value, lhs, rhs, loc);
-        /* fallthru */
-
       case NODE_GASGN:
       case NODE_IASGN:
       case NODE_LASGN:
       case NODE_DASGN:
       case NODE_MASGN:
       case NODE_CVASGN:
-        lhs->nd_value = rhs;
+        set_nd_value(p, lhs, rhs);
         nd_set_loc(lhs, loc);
         break;
 
       case NODE_ATTRASGN:
-        lhs->nd_args = arg_append(p, lhs->nd_args, rhs, loc);
+        RNODE_ATTRASGN(lhs)->nd_args = arg_append(p, RNODE_ATTRASGN(lhs)->nd_args, rhs, loc);
         nd_set_loc(lhs, loc);
         break;
 
@@ -12103,52 +13739,81 @@ value_expr_check(struct parser_params *p, NODE *node)
     }
     while (node) {
         switch (nd_type(node)) {
+          case NODE_ENSURE:
+            vn = RNODE_ENSURE(node)->nd_head;
+            node = RNODE_ENSURE(node)->nd_ensr;
+            /* nd_ensr should not be NULL, check it out next */
+            if (vn && (vn = value_expr_check(p, vn))) {
+                goto found;
+            }
+            break;
+
+          case NODE_RESCUE:
+            /* void only if all children are void */
+            vn = RNODE_RESCUE(node)->nd_head;
+            if (!vn || !(vn = value_expr_check(p, vn))) return NULL;
+            if (!void_node) void_node = vn;
+            for (NODE *r = RNODE_RESCUE(node)->nd_resq; r; r = RNODE_RESBODY(r)->nd_next) {
+                if (!nd_type_p(r, NODE_RESBODY)) {
+                    compile_error(p, "unexpected node");
+                    return NULL;
+                }
+                if (!(vn = value_expr_check(p, RNODE_RESBODY(r)->nd_body))) {
+                    void_node = 0;
+                    break;
+                }
+                if (!void_node) void_node = vn;
+            }
+            node = RNODE_RESCUE(node)->nd_else;
+            if (!node) return void_node;
+            break;
+
           case NODE_RETURN:
           case NODE_BREAK:
           case NODE_NEXT:
           case NODE_REDO:
           case NODE_RETRY:
-            return void_node ? void_node : node;
+            goto found;
 
           case NODE_CASE3:
-            if (!node->nd_body || !nd_type_p(node->nd_body, NODE_IN)) {
+            if (!RNODE_CASE3(node)->nd_body || !nd_type_p(RNODE_CASE3(node)->nd_body, NODE_IN)) {
                 compile_error(p, "unexpected node");
                 return NULL;
             }
-            if (node->nd_body->nd_body) {
+            if (RNODE_IN(RNODE_CASE3(node)->nd_body)->nd_body) {
                 return NULL;
             }
             /* single line pattern matching with "=>" operator */
-            return void_node ? void_node : node;
+            goto found;
 
           case NODE_BLOCK:
-            while (node->nd_next) {
-                node = node->nd_next;
+            while (RNODE_BLOCK(node)->nd_next) {
+                node = RNODE_BLOCK(node)->nd_next;
             }
-            node = node->nd_head;
+            node = RNODE_BLOCK(node)->nd_head;
             break;
 
           case NODE_BEGIN:
-            node = node->nd_body;
+            node = RNODE_BEGIN(node)->nd_body;
             break;
 
           case NODE_IF:
           case NODE_UNLESS:
-            if (!node->nd_body) {
+            if (!RNODE_IF(node)->nd_body) {
                 return NULL;
             }
-            else if (!node->nd_else) {
+            else if (!RNODE_IF(node)->nd_else) {
                 return NULL;
             }
-            vn = value_expr_check(p, node->nd_body);
+            vn = value_expr_check(p, RNODE_IF(node)->nd_body);
             if (!vn) return NULL;
             if (!void_node) void_node = vn;
-            node = node->nd_else;
+            node = RNODE_IF(node)->nd_else;
             break;
 
           case NODE_AND:
           case NODE_OR:
-            node = node->nd_1st;
+            node = RNODE_AND(node)->nd_1st;
             break;
 
           case NODE_LASGN:
@@ -12163,6 +13828,10 @@ value_expr_check(struct parser_params *p, NODE *node)
     }
 
     return NULL;
+
+  found:
+    /* return the first found node */
+    return void_node ? void_node : node;
 }
 
 static int
@@ -12176,6 +13845,7 @@ value_expr_gen(struct parser_params *p, NODE *node)
     }
     return TRUE;
 }
+
 static void
 void_expr(struct parser_params *p, NODE *node)
 {
@@ -12186,7 +13856,7 @@ void_expr(struct parser_params *p, NODE *node)
     if (!node || !(node = nd_once_body(node))) return;
     switch (nd_type(node)) {
       case NODE_OPCALL:
-        switch (node->nd_mid) {
+        switch (RNODE_OPCALL(node)->nd_mid) {
           case '+':
           case '-':
           case '*':
@@ -12205,7 +13875,7 @@ void_expr(struct parser_params *p, NODE *node)
           case tLEQ:
           case tEQ:
           case tNEQ:
-            useless = rb_id2name(node->nd_mid);
+            useless = rb_id2name(RNODE_OPCALL(node)->nd_mid);
             break;
         }
         break;
@@ -12222,9 +13892,17 @@ void_expr(struct parser_params *p, NODE *node)
       case NODE_CONST:
         useless = "a constant";
         break;
-      case NODE_LIT:
+      case NODE_SYM:
+      case NODE_LINE:
+      case NODE_FILE:
+      case NODE_ENCODING:
+      case NODE_INTEGER:
+      case NODE_FLOAT:
+      case NODE_RATIONAL:
+      case NODE_IMAGINARY:
       case NODE_STR:
       case NODE_DSTR:
+      case NODE_REGX:
       case NODE_DREGX:
         useless = "a literal";
         break;
@@ -12260,6 +13938,7 @@ void_expr(struct parser_params *p, NODE *node)
     }
 }
 
+/* warns useless use of block and returns the last statement node */
 static NODE *
 void_stmts(struct parser_params *p, NODE *node)
 {
@@ -12268,29 +13947,19 @@ void_stmts(struct parser_params *p, NODE *node)
     if (!node) return n;
     if (!nd_type_p(node, NODE_BLOCK)) return n;
 
-    while (node->nd_next) {
-        void_expr(p, node->nd_head);
-        node = node->nd_next;
+    while (RNODE_BLOCK(node)->nd_next) {
+        void_expr(p, RNODE_BLOCK(node)->nd_head);
+        node = RNODE_BLOCK(node)->nd_next;
     }
-    return n;
+    return RNODE_BLOCK(node)->nd_head;
 }
 
 static NODE *
 remove_begin(NODE *node)
 {
     NODE **n = &node, *n1 = node;
-    while (n1 && nd_type_p(n1, NODE_BEGIN) && n1->nd_body) {
-        *n = n1 = n1->nd_body;
-    }
-    return node;
-}
-
-static NODE *
-remove_begin_all(NODE *node)
-{
-    NODE **n = &node, *n1 = node;
-    while (n1 && nd_type_p(n1, NODE_BEGIN)) {
-        *n = n1 = n1->nd_body;
+    while (n1 && nd_type_p(n1, NODE_BEGIN) && RNODE_BEGIN(n1)->nd_body) {
+        *n = n1 = RNODE_BEGIN(n1)->nd_body;
     }
     return node;
 }
@@ -12304,55 +13973,51 @@ reduce_nodes(struct parser_params *p, NODE **body)
         *body = NEW_NIL(&NULL_LOC);
         return;
     }
-#define subnodes(n1, n2) \
-    ((!node->n1) ? (node->n2 ? (body = &node->n2, 1) : 0) : \
-     (!node->n2) ? (body = &node->n1, 1) : \
-     (reduce_nodes(p, &node->n1), body = &node->n2, 1))
+#define subnodes(type, n1, n2) \
+    ((!type(node)->n1) ? (type(node)->n2 ? (body = &type(node)->n2, 1) : 0) : \
+     (!type(node)->n2) ? (body = &type(node)->n1, 1) : \
+     (reduce_nodes(p, &type(node)->n1), body = &type(node)->n2, 1))
 
     while (node) {
-        int newline = (int)(node->flags & NODE_FL_NEWLINE);
+        int newline = (int)nd_fl_newline(node);
         switch (nd_type(node)) {
           end:
           case NODE_NIL:
             *body = 0;
             return;
-          case NODE_RETURN:
-            *body = node = node->nd_stts;
-            if (newline && node) node->flags |= NODE_FL_NEWLINE;
-            continue;
           case NODE_BEGIN:
-            *body = node = node->nd_body;
-            if (newline && node) node->flags |= NODE_FL_NEWLINE;
+            *body = node = RNODE_BEGIN(node)->nd_body;
+            if (newline && node) nd_set_fl_newline(node);
             continue;
           case NODE_BLOCK:
-            body = &node->nd_end->nd_head;
+            body = &RNODE_BLOCK(RNODE_BLOCK(node)->nd_end)->nd_head;
             break;
           case NODE_IF:
           case NODE_UNLESS:
-            if (subnodes(nd_body, nd_else)) break;
+            if (subnodes(RNODE_IF, nd_body, nd_else)) break;
             return;
           case NODE_CASE:
-            body = &node->nd_body;
+            body = &RNODE_CASE(node)->nd_body;
             break;
           case NODE_WHEN:
-            if (!subnodes(nd_body, nd_next)) goto end;
+            if (!subnodes(RNODE_WHEN, nd_body, nd_next)) goto end;
             break;
           case NODE_ENSURE:
-            if (!subnodes(nd_head, nd_resq)) goto end;
+            body = &RNODE_ENSURE(node)->nd_head;
             break;
           case NODE_RESCUE:
             newline = 0; // RESBODY should not be a NEWLINE
-            if (node->nd_else) {
-                body = &node->nd_resq;
+            if (RNODE_RESCUE(node)->nd_else) {
+                body = &RNODE_RESCUE(node)->nd_resq;
                 break;
             }
-            if (!subnodes(nd_head, nd_resq)) goto end;
+            if (!subnodes(RNODE_RESCUE, nd_head, nd_resq)) goto end;
             break;
           default:
             return;
         }
         node = *body;
-        if (newline && node) node->flags |= NODE_FL_NEWLINE;
+        if (newline && node) nd_set_fl_newline(node);
     }
 
 #undef subnodes
@@ -12364,12 +14029,20 @@ is_static_content(NODE *node)
     if (!node) return 1;
     switch (nd_type(node)) {
       case NODE_HASH:
-        if (!(node = node->nd_head)) break;
+        if (!(node = RNODE_HASH(node)->nd_head)) break;
       case NODE_LIST:
         do {
-            if (!is_static_content(node->nd_head)) return 0;
-        } while ((node = node->nd_next) != 0);
-      case NODE_LIT:
+            if (!is_static_content(RNODE_LIST(node)->nd_head)) return 0;
+        } while ((node = RNODE_LIST(node)->nd_next) != 0);
+      case NODE_SYM:
+      case NODE_REGX:
+      case NODE_LINE:
+      case NODE_FILE:
+      case NODE_ENCODING:
+      case NODE_INTEGER:
+      case NODE_FLOAT:
+      case NODE_RATIONAL:
+      case NODE_IMAGINARY:
       case NODE_STR:
       case NODE_NIL:
       case NODE_TRUE:
@@ -12391,16 +14064,18 @@ assign_in_cond(struct parser_params *p, NODE *node)
       case NODE_DASGN:
       case NODE_GASGN:
       case NODE_IASGN:
+      case NODE_CVASGN:
+      case NODE_CDECL:
         break;
 
       default:
         return 0;
     }
 
-    if (!node->nd_value) return 1;
-    if (is_static_content(node->nd_value)) {
+    if (!get_nd_value(p, node)) return 1;
+    if (is_static_content(get_nd_value(p, node))) {
         /* reports always */
-        parser_warn(p, node->nd_value, "found `= literal' in conditional, should be ==");
+        rb_warn0L(nd_line(get_nd_value(p, node)), "found '= literal' in conditional, should be ==");
     }
     return 1;
 }
@@ -12411,14 +14086,15 @@ enum cond_type {
     COND_IN_FF
 };
 
-#define SWITCH_BY_COND_TYPE(t, w, arg) \
+#define SWITCH_BY_COND_TYPE(t, w, arg) do { \
     switch (t) { \
       case COND_IN_OP: break; \
       case COND_IN_COND: rb_##w##0(arg "literal in condition"); break; \
       case COND_IN_FF: rb_##w##0(arg "literal in flip-flop"); break; \
-    }
+    } \
+} while (0)
 
-static NODE *cond0(struct parser_params*,NODE*,enum cond_type,const YYLTYPE*);
+static NODE *cond0(struct parser_params*,NODE*,enum cond_type,const YYLTYPE*,bool);
 
 static NODE*
 range_op(struct parser_params *p, NODE *node, const YYLTYPE *loc)
@@ -12429,67 +14105,91 @@ range_op(struct parser_params *p, NODE *node, const YYLTYPE *loc)
 
     type = nd_type(node);
     value_expr(node);
-    if (type == NODE_LIT && FIXNUM_P(node->nd_lit)) {
-        if (!e_option_supplied(p)) parser_warn(p, node, "integer literal in flip-flop");
+    if (type == NODE_INTEGER) {
+        if (!e_option_supplied(p)) rb_warn0L(nd_line(node), "integer literal in flip-flop");
         ID lineno = rb_intern("$.");
         return NEW_CALL(node, tEQ, NEW_LIST(NEW_GVAR(lineno, loc), loc), loc);
     }
-    return cond0(p, node, COND_IN_FF, loc);
+    return cond0(p, node, COND_IN_FF, loc, true);
 }
 
 static NODE*
-cond0(struct parser_params *p, NODE *node, enum cond_type type, const YYLTYPE *loc)
+cond0(struct parser_params *p, NODE *node, enum cond_type type, const YYLTYPE *loc, bool top)
 {
     if (node == 0) return 0;
     if (!(node = nd_once_body(node))) return 0;
     assign_in_cond(p, node);
 
     switch (nd_type(node)) {
+      case NODE_BEGIN:
+        RNODE_BEGIN(node)->nd_body = cond0(p, RNODE_BEGIN(node)->nd_body, type, loc, top);
+        break;
+
       case NODE_DSTR:
       case NODE_EVSTR:
       case NODE_STR:
-        SWITCH_BY_COND_TYPE(type, warn, "string ")
+      case NODE_FILE:
+        SWITCH_BY_COND_TYPE(type, warn, "string ");
+        break;
+
+      case NODE_REGX:
+        if (!e_option_supplied(p)) SWITCH_BY_COND_TYPE(type, warn, "regex ");
+        nd_set_type(node, NODE_MATCH);
         break;
 
       case NODE_DREGX:
-        if (!e_option_supplied(p)) SWITCH_BY_COND_TYPE(type, warning, "regex ")
+        if (!e_option_supplied(p)) SWITCH_BY_COND_TYPE(type, warning, "regex ");
 
         return NEW_MATCH2(node, NEW_GVAR(idLASTLINE, loc), loc);
 
+      case NODE_BLOCK:
+        {
+            NODE *end = RNODE_BLOCK(node)->nd_end;
+            NODE **expr = &RNODE_BLOCK(end)->nd_head;
+            if (top) top = node == end;
+            *expr = cond0(p, *expr, type, loc, top);
+        }
+        break;
+
       case NODE_AND:
       case NODE_OR:
-        node->nd_1st = cond0(p, node->nd_1st, COND_IN_COND, loc);
-        node->nd_2nd = cond0(p, node->nd_2nd, COND_IN_COND, loc);
+        RNODE_AND(node)->nd_1st = cond0(p, RNODE_AND(node)->nd_1st, COND_IN_COND, loc, true);
+        RNODE_AND(node)->nd_2nd = cond0(p, RNODE_AND(node)->nd_2nd, COND_IN_COND, loc, true);
         break;
 
       case NODE_DOT2:
       case NODE_DOT3:
-        node->nd_beg = range_op(p, node->nd_beg, loc);
-        node->nd_end = range_op(p, node->nd_end, loc);
-        if (nd_type_p(node, NODE_DOT2)) nd_set_type(node,NODE_FLIP2);
-        else if (nd_type_p(node, NODE_DOT3)) nd_set_type(node, NODE_FLIP3);
+        if (!top) break;
+        RNODE_DOT2(node)->nd_beg = range_op(p, RNODE_DOT2(node)->nd_beg, loc);
+        RNODE_DOT2(node)->nd_end = range_op(p, RNODE_DOT2(node)->nd_end, loc);
+        switch (nd_type(node)) {
+          case NODE_DOT2:
+            nd_set_type(node,NODE_FLIP2);
+            rb_node_flip2_t *flip2 = RNODE_FLIP2(node); /* for debug info */
+            (void)flip2;
+            break;
+          case NODE_DOT3:
+            nd_set_type(node, NODE_FLIP3);
+            rb_node_flip3_t *flip3 = RNODE_FLIP3(node); /* for debug info */
+            (void)flip3;
+            break;
+        }
         break;
 
+      case NODE_SYM:
       case NODE_DSYM:
-      warn_symbol:
-        SWITCH_BY_COND_TYPE(type, warning, "symbol ")
+        SWITCH_BY_COND_TYPE(type, warning, "symbol ");
+        break;
+
+      case NODE_LINE:
+      case NODE_ENCODING:
+      case NODE_INTEGER:
+      case NODE_FLOAT:
+      case NODE_RATIONAL:
+      case NODE_IMAGINARY:
+        SWITCH_BY_COND_TYPE(type, warning, "");
         break;
 
-      case NODE_LIT:
-        if (RB_TYPE_P(node->nd_lit, T_REGEXP)) {
-            if (!e_option_supplied(p)) SWITCH_BY_COND_TYPE(type, warn, "regex ")
-            nd_set_type(node, NODE_MATCH);
-        }
-        else if (node->nd_lit == Qtrue ||
-                 node->nd_lit == Qfalse) {
-            /* booleans are OK, e.g., while true */
-        }
-        else if (SYMBOL_P(node->nd_lit)) {
-            goto warn_symbol;
-        }
-        else {
-            SWITCH_BY_COND_TYPE(type, warning, "")
-        }
       default:
         break;
     }
@@ -12500,14 +14200,14 @@ static NODE*
 cond(struct parser_params *p, NODE *node, const YYLTYPE *loc)
 {
     if (node == 0) return 0;
-    return cond0(p, node, COND_IN_COND, loc);
+    return cond0(p, node, COND_IN_COND, loc, true);
 }
 
 static NODE*
 method_cond(struct parser_params *p, NODE *node, const YYLTYPE *loc)
 {
     if (node == 0) return 0;
-    return cond0(p, node, COND_IN_OP, loc);
+    return cond0(p, node, COND_IN_OP, loc, true);
 }
 
 static NODE*
@@ -12518,21 +14218,23 @@ new_nil_at(struct parser_params *p, const rb_code_position_t *pos)
 }
 
 static NODE*
-new_if(struct parser_params *p, NODE *cc, NODE *left, NODE *right, const YYLTYPE *loc)
+new_if(struct parser_params *p, NODE *cc, NODE *left, NODE *right, const YYLTYPE *loc, const YYLTYPE* if_keyword_loc, const YYLTYPE* then_keyword_loc, const YYLTYPE* end_keyword_loc)
 {
     if (!cc) return right;
-    cc = cond0(p, cc, COND_IN_COND, loc);
-    return newline_node(NEW_IF(cc, left, right, loc));
+    cc = cond0(p, cc, COND_IN_COND, loc, true);
+    return newline_node(NEW_IF(cc, left, right, loc, if_keyword_loc, then_keyword_loc, end_keyword_loc));
 }
 
 static NODE*
-new_unless(struct parser_params *p, NODE *cc, NODE *left, NODE *right, const YYLTYPE *loc)
+new_unless(struct parser_params *p, NODE *cc, NODE *left, NODE *right, const YYLTYPE *loc, const YYLTYPE *keyword_loc, const YYLTYPE *then_keyword_loc, const YYLTYPE *end_keyword_loc)
 {
     if (!cc) return right;
-    cc = cond0(p, cc, COND_IN_COND, loc);
-    return newline_node(NEW_UNLESS(cc, left, right, loc));
+    cc = cond0(p, cc, COND_IN_COND, loc, true);
+    return newline_node(NEW_UNLESS(cc, left, right, loc, keyword_loc, then_keyword_loc, end_keyword_loc));
 }
 
+#define NEW_AND_OR(type, f, s, loc, op_loc) (type == NODE_AND ? NEW_AND(f,s,loc,op_loc) : NEW_OR(f,s,loc,op_loc))
+
 static NODE*
 logop(struct parser_params *p, ID id, NODE *left, NODE *right,
           const YYLTYPE *op_loc, const YYLTYPE *loc)
@@ -12542,19 +14244,21 @@ logop(struct parser_params *p, ID id, NODE *left, NODE *right,
     value_expr(left);
     if (left && nd_type_p(left, type)) {
         NODE *node = left, *second;
-        while ((second = node->nd_2nd) != 0 && nd_type_p(second, type)) {
+        while ((second = RNODE_AND(node)->nd_2nd) != 0 && nd_type_p(second, type)) {
             node = second;
         }
-        node->nd_2nd = NEW_NODE(type, second, right, 0, loc);
-        nd_set_line(node->nd_2nd, op_loc->beg_pos.lineno);
+        RNODE_AND(node)->nd_2nd = NEW_AND_OR(type, second, right, loc, op_loc);
+        nd_set_line(RNODE_AND(node)->nd_2nd, op_loc->beg_pos.lineno);
         left->nd_loc.end_pos = loc->end_pos;
         return left;
     }
-    op = NEW_NODE(type, left, right, 0, loc);
+    op = NEW_AND_OR(type, left, right, loc, op_loc);
     nd_set_line(op, op_loc->beg_pos.lineno);
     return op;
 }
 
+#undef NEW_AND_OR
+
 static void
 no_blockarg(struct parser_params *p, NODE *node)
 {
@@ -12568,73 +14272,42 @@ ret_args(struct parser_params *p, NODE *node)
 {
     if (node) {
         no_blockarg(p, node);
-        if (nd_type_p(node, NODE_LIST)) {
-            if (node->nd_next == 0) {
-                node = node->nd_head;
-            }
-            else {
-                nd_set_type(node, NODE_VALUES);
-            }
+        if (nd_type_p(node, NODE_LIST) && !RNODE_LIST(node)->nd_next) {
+            node = RNODE_LIST(node)->nd_head;
         }
     }
     return node;
 }
 
-static NODE *
-new_yield(struct parser_params *p, NODE *node, const YYLTYPE *loc)
-{
-    if (node) no_blockarg(p, node);
-
-    return NEW_YIELD(node, loc);
-}
-
-static VALUE
-negate_lit(struct parser_params *p, VALUE lit)
+static NODE*
+negate_lit(struct parser_params *p, NODE* node)
 {
-    if (FIXNUM_P(lit)) {
-        return LONG2FIX(-FIX2LONG(lit));
-    }
-    if (SPECIAL_CONST_P(lit)) {
-#if USE_FLONUM
-        if (FLONUM_P(lit)) {
-            return DBL2NUM(-RFLOAT_VALUE(lit));
-        }
-#endif
-        goto unknown;
-    }
-    switch (BUILTIN_TYPE(lit)) {
-      case T_BIGNUM:
-        bignum_negate(lit);
-        lit = rb_big_norm(lit);
-        break;
-      case T_RATIONAL:
-        rational_set_num(lit, negate_lit(p, rational_get_num(lit)));
+    switch (nd_type(node)) {
+      case NODE_INTEGER:
+        RNODE_INTEGER(node)->minus = TRUE;
         break;
-      case T_COMPLEX:
-        rcomplex_set_real(lit, negate_lit(p, rcomplex_get_real(lit)));
-        rcomplex_set_imag(lit, negate_lit(p, rcomplex_get_imag(lit)));
+      case NODE_FLOAT:
+        RNODE_FLOAT(node)->minus = TRUE;
         break;
-      case T_FLOAT:
-        lit = DBL2NUM(-RFLOAT_VALUE(lit));
+      case NODE_RATIONAL:
+        RNODE_RATIONAL(node)->minus = TRUE;
         break;
-      unknown:
-      default:
-        rb_parser_fatal(p, "unknown literal type (%s) passed to negate_lit",
-                        rb_builtin_class_name(lit));
+      case NODE_IMAGINARY:
+        RNODE_IMAGINARY(node)->minus = TRUE;
         break;
     }
-    return lit;
+    return node;
 }
 
 static NODE *
-arg_blk_pass(NODE *node1, NODE *node2)
+arg_blk_pass(NODE *node1, rb_node_block_pass_t *node2)
 {
     if (node2) {
-        if (!node1) return node2;
+        if (!node1) return (NODE *)node2;
         node2->nd_head = node1;
         nd_set_first_lineno(node2, nd_first_lineno(node1));
         nd_set_first_column(node2, nd_first_column(node1));
-        return node2;
+        return (NODE *)node2;
     }
     return node1;
 }
@@ -12652,24 +14325,23 @@ args_info_empty_p(struct rb_args_info *args)
     return true;
 }
 
-static NODE*
-new_args(struct parser_params *p, NODE *pre_args, NODE *opt_args, ID rest_arg, NODE *post_args, NODE *tail, const YYLTYPE *loc)
+static rb_node_args_t *
+new_args(struct parser_params *p, rb_node_args_aux_t *pre_args, rb_node_opt_arg_t *opt_args, ID rest_arg, rb_node_args_aux_t *post_args, rb_node_args_t *tail, const YYLTYPE *loc)
 {
-    int saved_line = p->ruby_sourceline;
-    struct rb_args_info *args = tail->nd_ainfo;
+    struct rb_args_info *args = &tail->nd_ainfo;
 
     if (args->forwarding) {
         if (rest_arg) {
-            yyerror1(&tail->nd_loc, "... after rest argument");
+            yyerror1(&RNODE(tail)->nd_loc, "... after rest argument");
             return tail;
         }
         rest_arg = idFWD_REST;
     }
 
-    args->pre_args_num   = pre_args ? rb_long2int(pre_args->nd_plen) : 0;
+    args->pre_args_num   = pre_args ? pre_args->nd_plen : 0;
     args->pre_init       = pre_args ? pre_args->nd_next : 0;
 
-    args->post_args_num  = post_args ? rb_long2int(post_args->nd_plen) : 0;
+    args->post_args_num  = post_args ? post_args->nd_plen : 0;
     args->post_init      = post_args ? post_args->nd_next : 0;
     args->first_post_arg = post_args ? post_args->nd_pid : 0;
 
@@ -12683,23 +14355,16 @@ new_args(struct parser_params *p, NODE *pre_args, NODE *opt_args, ID rest_arg, N
     args->ruby2_keywords = 0;
 #endif
 
-    p->ruby_sourceline = saved_line;
-    nd_set_loc(tail, loc);
+    nd_set_loc(RNODE(tail), loc);
 
     return tail;
 }
 
-static NODE*
-new_args_tail(struct parser_params *p, NODE *kw_args, ID kw_rest_arg, ID block, const YYLTYPE *kw_rest_loc)
+static rb_node_args_t *
+new_args_tail(struct parser_params *p, rb_node_kw_arg_t *kw_args, ID kw_rest_arg, ID block, const YYLTYPE *kw_rest_loc)
 {
-    int saved_line = p->ruby_sourceline;
-    NODE *node;
-    VALUE tmpbuf = rb_imemo_tmpbuf_auto_free_pointer();
-    struct rb_args_info *args = ZALLOC(struct rb_args_info);
-    rb_imemo_tmpbuf_set_ptr(tmpbuf, args);
-    args->imemo = tmpbuf;
-    node = NEW_NODE(NODE_ARGS, 0, 0, args, &NULL_LOC);
-    RB_OBJ_WRITTEN(p->ast, Qnil, tmpbuf);
+    rb_node_args_t *node = NEW_ARGS(&NULL_LOC);
+    struct rb_args_info *args = &node->nd_ainfo;
     if (p->error_p) return node;
 
     args->block_arg      = block;
@@ -12714,21 +14379,21 @@ new_args_tail(struct parser_params *p, NODE *kw_args, ID kw_rest_arg, ID block,
          */
         ID kw_bits = internal_id(p), *required_kw_vars, *kw_vars;
         struct vtable *vtargs = p->lvtbl->args;
-        NODE *kwn = kw_args;
+        rb_node_kw_arg_t *kwn = kw_args;
 
         if (block) block = vtargs->tbl[vtargs->pos-1];
         vtable_pop(vtargs, !!block + !!kw_rest_arg);
         required_kw_vars = kw_vars = &vtargs->tbl[vtargs->pos];
         while (kwn) {
-            if (!NODE_REQUIRED_KEYWORD_P(kwn->nd_body))
+            if (!NODE_REQUIRED_KEYWORD_P(get_nd_value(p, kwn->nd_body)))
                 --kw_vars;
             --required_kw_vars;
             kwn = kwn->nd_next;
         }
 
         for (kwn = kw_args; kwn; kwn = kwn->nd_next) {
-            ID vid = kwn->nd_body->nd_vid;
-            if (NODE_REQUIRED_KEYWORD_P(kwn->nd_body)) {
+            ID vid = get_nd_vid(p, kwn->nd_body);
+            if (NODE_REQUIRED_KEYWORD_P(get_nd_value(p, kwn->nd_body))) {
                 *required_kw_vars++ = vid;
             }
             else {
@@ -12749,20 +14414,19 @@ new_args_tail(struct parser_params *p, NODE *kw_args, ID kw_rest_arg, ID block,
         args->kw_rest_arg = NEW_DVAR(kw_rest_arg, kw_rest_loc);
     }
 
-    p->ruby_sourceline = saved_line;
     return node;
 }
 
-static NODE *
-args_with_numbered(struct parser_params *p, NODE *args, int max_numparam)
+static rb_node_args_t *
+args_with_numbered(struct parser_params *p, rb_node_args_t *args, int max_numparam, ID it_id)
 {
-    if (max_numparam > NO_PARAM) {
+    if (max_numparam > NO_PARAM || it_id) {
         if (!args) {
             YYLTYPE loc = RUBY_INIT_YYLLOC();
             args = new_args_tail(p, 0, 0, 0, 0);
-            nd_set_loc(args, &loc);
+            nd_set_loc(RNODE(args), &loc);
         }
-        args->nd_ainfo->pre_args_num = max_numparam;
+        args->nd_ainfo.pre_args_num = it_id ? 1 : max_numparam;
     }
     return args;
 }
@@ -12770,17 +14434,15 @@ args_with_numbered(struct parser_params *p, NODE *args, int max_numparam)
 static NODE*
 new_array_pattern(struct parser_params *p, NODE *constant, NODE *pre_arg, NODE *aryptn, const YYLTYPE *loc)
 {
-    struct rb_ary_pattern_info *apinfo = aryptn->nd_apinfo;
-
-    aryptn->nd_pconst = constant;
+    RNODE_ARYPTN(aryptn)->nd_pconst = constant;
 
     if (pre_arg) {
         NODE *pre_args = NEW_LIST(pre_arg, loc);
-        if (apinfo->pre_args) {
-            apinfo->pre_args = list_concat(pre_args, apinfo->pre_args);
+        if (RNODE_ARYPTN(aryptn)->pre_args) {
+            RNODE_ARYPTN(aryptn)->pre_args = list_concat(pre_args, RNODE_ARYPTN(aryptn)->pre_args);
         }
         else {
-            apinfo->pre_args = pre_args;
+            RNODE_ARYPTN(aryptn)->pre_args = pre_args;
         }
     }
     return aryptn;
@@ -12789,33 +14451,21 @@ new_array_pattern(struct parser_params *p, NODE *constant, NODE *pre_arg, NODE *
 static NODE*
 new_array_pattern_tail(struct parser_params *p, NODE *pre_args, int has_rest, NODE *rest_arg, NODE *post_args, const YYLTYPE *loc)
 {
-    int saved_line = p->ruby_sourceline;
-    NODE *node;
-    VALUE tmpbuf = rb_imemo_tmpbuf_auto_free_pointer();
-    struct rb_ary_pattern_info *apinfo = ZALLOC(struct rb_ary_pattern_info);
-    rb_imemo_tmpbuf_set_ptr(tmpbuf, apinfo);
-    node = NEW_NODE(NODE_ARYPTN, 0, tmpbuf, apinfo, loc);
-    RB_OBJ_WRITTEN(p->ast, Qnil, tmpbuf);
-
-    apinfo->pre_args = pre_args;
-
     if (has_rest) {
-        apinfo->rest_arg = rest_arg ? rest_arg : NODE_SPECIAL_NO_NAME_REST;
+        rest_arg = rest_arg ? rest_arg : NODE_SPECIAL_NO_NAME_REST;
     }
     else {
-        apinfo->rest_arg = NULL;
+        rest_arg = NULL;
     }
+    NODE *node = NEW_ARYPTN(pre_args, rest_arg, post_args, loc);
 
-    apinfo->post_args = post_args;
-
-    p->ruby_sourceline = saved_line;
     return node;
 }
 
 static NODE*
 new_find_pattern(struct parser_params *p, NODE *constant, NODE *fndptn, const YYLTYPE *loc)
 {
-    fndptn->nd_pconst = constant;
+    RNODE_FNDPTN(fndptn)->nd_pconst = constant;
 
     return fndptn;
 }
@@ -12823,33 +14473,23 @@ new_find_pattern(struct parser_params *p, NODE *constant, NODE *fndptn, const YY
 static NODE*
 new_find_pattern_tail(struct parser_params *p, NODE *pre_rest_arg, NODE *args, NODE *post_rest_arg, const YYLTYPE *loc)
 {
-    int saved_line = p->ruby_sourceline;
-    NODE *node;
-    VALUE tmpbuf = rb_imemo_tmpbuf_auto_free_pointer();
-    struct rb_fnd_pattern_info *fpinfo = ZALLOC(struct rb_fnd_pattern_info);
-    rb_imemo_tmpbuf_set_ptr(tmpbuf, fpinfo);
-    node = NEW_NODE(NODE_FNDPTN, 0, tmpbuf, fpinfo, loc);
-    RB_OBJ_WRITTEN(p->ast, Qnil, tmpbuf);
-
-    fpinfo->pre_rest_arg = pre_rest_arg ? pre_rest_arg : NODE_SPECIAL_NO_NAME_REST;
-    fpinfo->args = args;
-    fpinfo->post_rest_arg = post_rest_arg ? post_rest_arg : NODE_SPECIAL_NO_NAME_REST;
+    pre_rest_arg = pre_rest_arg ? pre_rest_arg : NODE_SPECIAL_NO_NAME_REST;
+    post_rest_arg = post_rest_arg ? post_rest_arg : NODE_SPECIAL_NO_NAME_REST;
+    NODE *node = NEW_FNDPTN(pre_rest_arg, args, post_rest_arg, loc);
 
-    p->ruby_sourceline = saved_line;
     return node;
 }
 
 static NODE*
 new_hash_pattern(struct parser_params *p, NODE *constant, NODE *hshptn, const YYLTYPE *loc)
 {
-    hshptn->nd_pconst = constant;
+    RNODE_HSHPTN(hshptn)->nd_pconst = constant;
     return hshptn;
 }
 
 static NODE*
 new_hash_pattern_tail(struct parser_params *p, NODE *kw_args, ID kw_rest_arg, const YYLTYPE *loc)
 {
-    int saved_line = p->ruby_sourceline;
     NODE *node, *kw_rest_arg_node;
 
     if (kw_rest_arg == idNil) {
@@ -12862,19 +14502,16 @@ new_hash_pattern_tail(struct parser_params *p, NODE *kw_args, ID kw_rest_arg, co
         kw_rest_arg_node = NULL;
     }
 
-    node = NEW_NODE(NODE_HSHPTN, 0, kw_args, kw_rest_arg_node, loc);
+    node = NEW_HSHPTN(0, kw_args, kw_rest_arg_node, loc);
 
-    p->ruby_sourceline = saved_line;
     return node;
 }
 
 static NODE*
 dsym_node(struct parser_params *p, NODE *node, const YYLTYPE *loc)
 {
-    VALUE lit;
-
     if (!node) {
-        return NEW_LIT(ID2SYM(idNULL), loc);
+        return NEW_SYM(STR_NEW0(), loc);
     }
 
     switch (nd_type(node)) {
@@ -12883,86 +14520,104 @@ dsym_node(struct parser_params *p, NODE *node, const YYLTYPE *loc)
         nd_set_loc(node, loc);
         break;
       case NODE_STR:
-        lit = node->nd_lit;
-        RB_OBJ_WRITTEN(p->ast, Qnil, node->nd_lit = ID2SYM(rb_intern_str(lit)));
-        nd_set_type(node, NODE_LIT);
-        nd_set_loc(node, loc);
+        node = str_to_sym_node(p, node, loc);
         break;
       default:
-        node = NEW_NODE(NODE_DSYM, Qnil, 1, NEW_LIST(node, loc), loc);
+        node = NEW_DSYM(0, 1, NEW_LIST(node, loc), loc);
         break;
     }
     return node;
 }
 
 static int
-append_literal_keys(st_data_t k, st_data_t v, st_data_t h)
-{
-    NODE *node = (NODE *)v;
-    NODE **result = (NODE **)h;
-    node->nd_alen = 2;
-    node->nd_next->nd_end = node->nd_next;
-    node->nd_next->nd_next = 0;
-    if (*result)
-        list_concat(*result, node);
-    else
-        *result = node;
-    return ST_CONTINUE;
+nd_type_st_key_enable_p(NODE *node)
+{
+    switch (nd_type(node)) {
+      case NODE_INTEGER:
+      case NODE_FLOAT:
+      case NODE_RATIONAL:
+      case NODE_IMAGINARY:
+      case NODE_STR:
+      case NODE_SYM:
+      case NODE_REGX:
+      case NODE_LINE:
+      case NODE_FILE:
+      case NODE_ENCODING:
+        return true;
+      default:
+        return false;
+    }
 }
 
-static NODE *
-remove_duplicate_keys(struct parser_params *p, NODE *hash)
-{
-    struct st_hash_type literal_type = {
-        literal_cmp,
-        literal_hash,
-    };
-
-    st_table *literal_keys = st_init_table_with_size(&literal_type, hash->nd_alen / 2);
-    NODE *result = 0;
-    NODE *last_expr = 0;
-    rb_code_location_t loc = hash->nd_loc;
-    while (hash && hash->nd_head && hash->nd_next) {
-        NODE *head = hash->nd_head;
-        NODE *value = hash->nd_next;
-        NODE *next = value->nd_next;
-        st_data_t key = (st_data_t)head;
+static VALUE
+nd_value(struct parser_params *p, NODE *node)
+{
+    switch (nd_type(node)) {
+      case NODE_STR:
+        return rb_node_str_string_val(node);
+      case NODE_INTEGER:
+        return rb_node_integer_literal_val(node);
+      case NODE_FLOAT:
+        return rb_node_float_literal_val(node);
+      case NODE_RATIONAL:
+        return rb_node_rational_literal_val(node);
+      case NODE_IMAGINARY:
+        return rb_node_imaginary_literal_val(node);
+      case NODE_SYM:
+        return rb_node_sym_string_val(node);
+      case NODE_REGX:
+        return rb_node_regx_string_val(node);
+      case NODE_LINE:
+        return rb_node_line_lineno_val(node);
+      case NODE_ENCODING:
+        return rb_node_encoding_val(node);
+      case NODE_FILE:
+        return rb_node_file_path_val(node);
+      default:
+        rb_bug("unexpected node: %s", ruby_node_name(nd_type(node)));
+        UNREACHABLE_RETURN(0);
+    }
+}
+
+static void
+warn_duplicate_keys(struct parser_params *p, NODE *hash)
+{
+    /* See https://bugs.ruby-lang.org/issues/20331 for discussion about what is warned. */
+    p->warn_duplicate_keys_table = st_init_table_with_size(&literal_type, RNODE_LIST(hash)->as.nd_alen / 2);
+    while (hash && RNODE_LIST(hash)->nd_next) {
+        NODE *head = RNODE_LIST(hash)->nd_head;
+        NODE *value = RNODE_LIST(hash)->nd_next;
+        NODE *next = RNODE_LIST(value)->nd_next;
+        st_data_t key;
         st_data_t data;
-        value->nd_next = 0;
-        if (nd_type_p(head, NODE_LIT) &&
-            st_delete(literal_keys, (key = (st_data_t)head->nd_lit, &key), &data)) {
-            NODE *dup_value = ((NODE *)data)->nd_next;
-            rb_compile_warn(p->ruby_sourcefile, nd_line((NODE *)data),
-                            "key %+"PRIsVALUE" is duplicated and overwritten on line %d",
-                            head->nd_lit, nd_line(head));
-            if (dup_value == last_expr) {
-                value->nd_head = block_append(p, dup_value->nd_head, value->nd_head);
-            }
-            else {
-                last_expr->nd_head = block_append(p, dup_value->nd_head, last_expr->nd_head);
+
+        /* keyword splat, e.g. {k: 1, **z, k: 2} */
+        if (!head) {
+            head = value;
+        }
+
+        if (nd_type_st_key_enable_p(head)) {
+            key = (st_data_t)head;
+
+            if (st_delete(p->warn_duplicate_keys_table, &key, &data)) {
+                rb_warn2L(nd_line((NODE *)data),
+                          "key %+"PRIsWARN" is duplicated and overwritten on line %d",
+                          nd_value(p, head), WARN_I(nd_line(head)));
             }
+            st_insert(p->warn_duplicate_keys_table, (st_data_t)key, (st_data_t)hash);
         }
-        st_insert(literal_keys, (st_data_t)key, (st_data_t)hash);
-        last_expr = nd_type_p(head, NODE_LIT) ? value : head;
         hash = next;
     }
-    st_foreach(literal_keys, append_literal_keys, (st_data_t)&result);
-    st_free_table(literal_keys);
-    if (hash) {
-        if (!result) result = hash;
-        else list_concat(result, hash);
-    }
-    result->nd_loc = loc;
-    return result;
+    st_free_table(p->warn_duplicate_keys_table);
+    p->warn_duplicate_keys_table = NULL;
 }
 
 static NODE *
 new_hash(struct parser_params *p, NODE *hash, const YYLTYPE *loc)
 {
-    if (hash) hash = remove_duplicate_keys(p, hash);
+    if (hash) warn_duplicate_keys(p, hash);
     return NEW_HASH(hash, loc);
 }
-#endif
 
 static void
 error_duplicate_pattern_variable(struct parser_params *p, ID id, const YYLTYPE *loc)
@@ -12991,98 +14646,65 @@ error_duplicate_pattern_key(struct parser_params *p, VALUE key, const YYLTYPE *l
     st_insert(p->pktbl, (st_data_t)key, 0);
 }
 
-#ifndef RIPPER
 static NODE *
 new_unique_key_hash(struct parser_params *p, NODE *hash, const YYLTYPE *loc)
 {
     return NEW_HASH(hash, loc);
 }
-#endif /* !RIPPER */
 
-#ifndef RIPPER
 static NODE *
 new_op_assign(struct parser_params *p, NODE *lhs, ID op, NODE *rhs, struct lex_context ctxt, const YYLTYPE *loc)
 {
     NODE *asgn;
 
     if (lhs) {
-        ID vid = lhs->nd_vid;
+        ID vid = get_nd_vid(p, lhs);
         YYLTYPE lhs_loc = lhs->nd_loc;
-        int shareable = ctxt.shareable_constant_value;
-        if (shareable) {
-            switch (nd_type(lhs)) {
-              case NODE_CDECL:
-              case NODE_COLON2:
-              case NODE_COLON3:
-                break;
-              default:
-                shareable = 0;
-                break;
-            }
-        }
         if (op == tOROP) {
-            rhs = shareable_constant_value(p, shareable, lhs, rhs, &rhs->nd_loc);
-            lhs->nd_value = rhs;
+            set_nd_value(p, lhs, rhs);
             nd_set_loc(lhs, loc);
             asgn = NEW_OP_ASGN_OR(gettable(p, vid, &lhs_loc), lhs, loc);
-            if (is_notop_id(vid)) {
-                switch (id_type(vid)) {
-                  case ID_GLOBAL:
-                  case ID_INSTANCE:
-                  case ID_CLASS:
-                    asgn->nd_aid = vid;
-                }
-            }
         }
         else if (op == tANDOP) {
-            if (shareable) {
-                rhs = shareable_constant_value(p, shareable, lhs, rhs, &rhs->nd_loc);
-            }
-            lhs->nd_value = rhs;
+            set_nd_value(p, lhs, rhs);
             nd_set_loc(lhs, loc);
             asgn = NEW_OP_ASGN_AND(gettable(p, vid, &lhs_loc), lhs, loc);
         }
         else {
             asgn = lhs;
             rhs = NEW_CALL(gettable(p, vid, &lhs_loc), op, NEW_LIST(rhs, &rhs->nd_loc), loc);
-            if (shareable) {
-                rhs = shareable_constant_value(p, shareable, lhs, rhs, &rhs->nd_loc);
-            }
-            asgn->nd_value = rhs;
+            set_nd_value(p, asgn, rhs);
             nd_set_loc(asgn, loc);
         }
     }
     else {
-        asgn = NEW_BEGIN(0, loc);
+        asgn = NEW_ERROR(loc);
     }
     return asgn;
 }
 
 static NODE *
 new_ary_op_assign(struct parser_params *p, NODE *ary,
-                  NODE *args, ID op, NODE *rhs, const YYLTYPE *args_loc, const YYLTYPE *loc)
+                  NODE *args, ID op, NODE *rhs, const YYLTYPE *args_loc, const YYLTYPE *loc,
+                  const YYLTYPE *call_operator_loc, const YYLTYPE *opening_loc, const YYLTYPE *closing_loc, const YYLTYPE *binary_operator_loc)
 {
     NODE *asgn;
 
+    aryset_check(p, args);
     args = make_list(args, args_loc);
-    if (nd_type_p(args, NODE_BLOCK_PASS)) {
-        args = NEW_ARGSCAT(args, rhs, loc);
-    }
-    else {
-        args = arg_concat(p, args, rhs, loc);
-    }
-    asgn = NEW_OP_ASGN1(ary, op, args, loc);
+    asgn = NEW_OP_ASGN1(ary, op, args, rhs, loc, call_operator_loc, opening_loc, closing_loc, binary_operator_loc);
     fixpos(asgn, ary);
     return asgn;
 }
 
 static NODE *
 new_attr_op_assign(struct parser_params *p, NODE *lhs,
-                   ID atype, ID attr, ID op, NODE *rhs, const YYLTYPE *loc)
+                   ID atype, ID attr, ID op, NODE *rhs, const YYLTYPE *loc,
+                   const YYLTYPE *call_operator_loc, const YYLTYPE *message_loc, const YYLTYPE *binary_operator_loc)
 {
     NODE *asgn;
 
-    asgn = NEW_OP_ASGN2(lhs, CALL_Q_P(atype), attr, op, rhs, loc);
+    asgn = NEW_OP_ASGN2(lhs, CALL_Q_P(atype), attr, op, rhs, loc, call_operator_loc, message_loc, binary_operator_loc);
     fixpos(asgn, lhs);
     return asgn;
 }
@@ -13093,11 +14715,10 @@ new_const_op_assign(struct parser_params *p, NODE *lhs, ID op, NODE *rhs, struct
     NODE *asgn;
 
     if (lhs) {
-        rhs = shareable_constant_value(p, ctxt.shareable_constant_value, lhs, rhs, loc);
-        asgn = NEW_OP_CDECL(lhs, op, rhs, loc);
+        asgn = NEW_OP_CDECL(lhs, op, rhs, ctxt.shareable_constant_value, loc);
     }
     else {
-        asgn = NEW_BEGIN(0, loc);
+        asgn = NEW_ERROR(loc);
     }
     fixpos(asgn, lhs);
     return asgn;
@@ -13107,20 +14728,16 @@ static NODE *
 const_decl(struct parser_params *p, NODE *path, const YYLTYPE *loc)
 {
     if (p->ctxt.in_def) {
+#ifndef RIPPER
         yyerror1(loc, "dynamic constant assignment");
-    }
-    return NEW_CDECL(0, 0, (path), loc);
-}
 #else
-static VALUE
-const_decl(struct parser_params *p, VALUE path)
-{
-    if (p->ctxt.in_def) {
-        path = assign_error(p, "dynamic constant assignment", path);
+        set_value(assign_error(p, "dynamic constant assignment", p->s_lvalue));
+#endif
     }
-    return path;
+    return NEW_CDECL(0, 0, (path), p->ctxt.shareable_constant_value, loc);
 }
 
+#ifdef RIPPER
 static VALUE
 assign_error(struct parser_params *p, const char *mesg, VALUE a)
 {
@@ -13128,15 +14745,8 @@ assign_error(struct parser_params *p, const char *mesg, VALUE a)
     ripper_error(p);
     return a;
 }
-
-static VALUE
-var_field(struct parser_params *p, VALUE a)
-{
-    return ripper_new_yylval(p, get_id(a), dispatch1(var_field, a), 0);
-}
 #endif
 
-#ifndef RIPPER
 static NODE *
 new_bodystmt(struct parser_params *p, NODE *head, NODE *rescue, NODE *rescue_else, NODE *ensure, const YYLTYPE *loc)
 {
@@ -13148,16 +14758,12 @@ new_bodystmt(struct parser_params *p, NODE *head, NODE *rescue, NODE *rescue_els
         result = NEW_RESCUE(head, rescue, rescue_else, &rescue_loc);
         nd_set_line(result, rescue->nd_loc.beg_pos.lineno);
     }
-    else if (rescue_else) {
-        result = block_append(p, result, rescue_else);
-    }
     if (ensure) {
         result = NEW_ENSURE(result, ensure, loc);
     }
     fixpos(result, head);
     return result;
 }
-#endif
 
 static void
 warn_unused_var(struct parser_params *p, struct local_vars *local)
@@ -13194,10 +14800,11 @@ local_push(struct parser_params *p, int toplevel_scope)
 #ifndef RIPPER
     if (toplevel_scope && compile_for_eval) warn_unused_vars = 0;
     if (toplevel_scope && e_option_supplied(p)) warn_unused_vars = 0;
+#endif
     local->numparam.outer = 0;
     local->numparam.inner = 0;
     local->numparam.current = 0;
-#endif
+    local->it = 0;
     local->used = warn_unused_vars ? vtable_alloc(0) : 0;
 
 # if WARN_PAST_SCOPE
@@ -13248,7 +14855,6 @@ local_pop(struct parser_params *p)
     COND_POP();
 }
 
-#ifndef RIPPER
 static rb_ast_id_table_t *
 local_tbl(struct parser_params *p)
 {
@@ -13275,19 +14881,6 @@ local_tbl(struct parser_params *p)
     return tbl;
 }
 
-static NODE*
-node_newnode_with_locals(struct parser_params *p, enum node_type type, VALUE a1, VALUE a2, const rb_code_location_t *loc)
-{
-    rb_ast_id_table_t *a0;
-    NODE *n;
-
-    a0 = local_tbl(p);
-    n = NEW_NODE(type, a0, a1, a2, loc);
-    return n;
-}
-
-#endif
-
 static void
 numparam_name(struct parser_params *p, ID id)
 {
@@ -13313,6 +14906,14 @@ local_var(struct parser_params *p, ID id)
     }
 }
 
+#ifndef RIPPER
+int
+rb_parser_local_defined(struct parser_params *p, ID id, const struct rb_iseq_struct *iseq)
+{
+    return rb_local_defined(id, iseq);
+}
+#endif
+
 static int
 local_id_ref(struct parser_params *p, ID id, ID **vidrefp)
 {
@@ -13329,7 +14930,7 @@ local_id_ref(struct parser_params *p, ID id, ID **vidrefp)
     }
 
     if (vars && vars->prev == DVARS_INHERIT) {
-        return rb_local_defined(id, p->parent_iseq);
+        return rb_parser_local_defined(p, id, p->parent_iseq);
     }
     else if (vtable_included(args, id)) {
         return 1;
@@ -13366,7 +14967,40 @@ add_forwarding_args(struct parser_params *p)
     arg_var(p, idFWD_ALL);
 }
 
-#ifndef RIPPER
+static void
+forwarding_arg_check(struct parser_params *p, ID arg, ID all, const char *var)
+{
+    bool conflict = false;
+
+    struct vtable *vars, *args;
+
+    vars = p->lvtbl->vars;
+    args = p->lvtbl->args;
+
+    while (vars && !DVARS_TERMINAL_P(vars->prev)) {
+        conflict |= (vtable_included(args, arg) && !(all && vtable_included(args, all)));
+        vars = vars->prev;
+        args = args->prev;
+    }
+
+    bool found = false;
+    if (vars && vars->prev == DVARS_INHERIT && !found) {
+        found = (rb_parser_local_defined(p, arg, p->parent_iseq) &&
+                 !(all && rb_parser_local_defined(p, all, p->parent_iseq)));
+    }
+    else {
+        found = (vtable_included(args, arg) &&
+                 !(all && vtable_included(args, all)));
+    }
+
+    if (!found) {
+        compile_error(p, "no anonymous %s parameter", var);
+    }
+    else if (conflict) {
+        compile_error(p, "anonymous %s parameter is also used within block", var);
+    }
+}
+
 static NODE *
 new_args_forward_call(struct parser_params *p, NODE *leading, const YYLTYPE *loc, const YYLTYPE *argsloc)
 {
@@ -13374,19 +15008,18 @@ new_args_forward_call(struct parser_params *p, NODE *leading, const YYLTYPE *loc
 #ifndef FORWARD_ARGS_WITH_RUBY2_KEYWORDS
     NODE *kwrest = list_append(p, NEW_LIST(0, loc), NEW_LVAR(idFWD_KWREST, loc));
 #endif
-    NODE *block = NEW_BLOCK_PASS(NEW_LVAR(idFWD_BLOCK, loc), loc);
-    NODE *args = leading ? rest_arg_append(p, leading, rest, argsloc) : NEW_SPLAT(rest, loc);
+    rb_node_block_pass_t *block = NEW_BLOCK_PASS(NEW_LVAR(idFWD_BLOCK, loc), argsloc, &NULL_LOC);
+    NODE *args = leading ? rest_arg_append(p, leading, rest, argsloc) : NEW_SPLAT(rest, loc, &NULL_LOC);
+    block->forwarding = TRUE;
 #ifndef FORWARD_ARGS_WITH_RUBY2_KEYWORDS
-    args = arg_append(p, args, new_hash(p, kwrest, loc), loc);
+    args = arg_append(p, args, new_hash(p, kwrest, loc), argsloc);
 #endif
     return arg_blk_pass(args, block);
 }
-#endif
 
 static NODE *
 numparam_push(struct parser_params *p)
 {
-#ifndef RIPPER
     struct local_vars *local = p->lvtbl;
     NODE *inner = local->numparam.inner;
     if (!local->numparam.outer) {
@@ -13394,16 +15027,13 @@ numparam_push(struct parser_params *p)
     }
     local->numparam.inner = 0;
     local->numparam.current = 0;
+    local->it = 0;
     return inner;
-#else
-    return 0;
-#endif
 }
 
 static void
 numparam_pop(struct parser_params *p, NODE *prev_inner)
 {
-#ifndef RIPPER
     struct local_vars *local = p->lvtbl;
     if (prev_inner) {
         /* prefer first one */
@@ -13422,7 +15052,7 @@ numparam_pop(struct parser_params *p, NODE *prev_inner)
         /* no numbered parameter */
         local->numparam.current = 0;
     }
-#endif
+    local->it = 0;
 }
 
 static const struct vtable *
@@ -13485,7 +15115,8 @@ dyna_in_block(struct parser_params *p)
     return !DVARS_TERMINAL_P(p->lvtbl->vars) && p->lvtbl->vars->prev != DVARS_TOPSCOPE;
 }
 
-static int
+#ifndef RIPPER
+int
 dvar_defined_ref(struct parser_params *p, ID id, ID **vidrefp)
 {
     struct vtable *vars, *args, *used;
@@ -13515,6 +15146,7 @@ dvar_defined_ref(struct parser_params *p, ID id, ID **vidrefp)
 
     return 0;
 }
+#endif
 
 static int
 dvar_defined(struct parser_params *p, ID id)
@@ -13529,79 +15161,101 @@ dvar_curr(struct parser_params *p, ID id)
             vtable_included(p->lvtbl->vars, id));
 }
 
-static void
-reg_fragment_enc_error(struct parser_params* p, VALUE str, int c)
-{
-    compile_error(p,
-        "regexp encoding option '%c' differs from source encoding '%s'",
-        c, rb_enc_name(rb_enc_get(str)));
+static void
+reg_fragment_enc_error(struct parser_params* p, rb_parser_string_t *str, int c)
+{
+    compile_error(p,
+        "regexp encoding option '%c' differs from source encoding '%s'",
+        c, rb_enc_name(rb_parser_str_get_encoding(str)));
+}
+
+#ifndef RIPPER
+static rb_encoding *
+find_enc(struct parser_params* p, const char *name)
+{
+    int idx = rb_enc_find_index(name);
+    if (idx < 0) {
+        rb_bug("unknown encoding name: %s", name);
+    }
+
+    return rb_enc_from_index(idx);
+}
+
+static rb_encoding *
+kcode_to_enc(struct parser_params* p, int kcode)
+{
+    rb_encoding *enc;
+
+    switch (kcode) {
+      case ENC_ASCII8BIT:
+        enc = rb_ascii8bit_encoding();
+        break;
+      case ENC_EUC_JP:
+        enc = find_enc(p, "EUC-JP");
+        break;
+      case ENC_Windows_31J:
+        enc = find_enc(p, "Windows-31J");
+        break;
+      case ENC_UTF8:
+        enc = rb_utf8_encoding();
+        break;
+      default:
+        enc = NULL;
+        break;
+    }
+
+    return enc;
 }
 
-#ifndef RIPPER
 int
-rb_reg_fragment_setenc(struct parser_params* p, VALUE str, int options)
+rb_reg_fragment_setenc(struct parser_params* p, rb_parser_string_t *str, int options)
 {
     int c = RE_OPTION_ENCODING_IDX(options);
 
     if (c) {
         int opt, idx;
-        rb_char_to_option_kcode(c, &opt, &idx);
-        if (idx != ENCODING_GET(str) &&
-            !is_ascii_string(str)) {
+        rb_encoding *enc;
+
+        char_to_option_kcode(c, &opt, &idx);
+        enc = kcode_to_enc(p, idx);
+        if (enc != rb_parser_str_get_encoding(str) &&
+            !rb_parser_is_ascii_string(p, str)) {
             goto error;
         }
-        ENCODING_SET(str, idx);
+        rb_parser_string_set_encoding(str, enc);
     }
     else if (RE_OPTION_ENCODING_NONE(options)) {
-        if (!ENCODING_IS_ASCII8BIT(str) &&
-            !is_ascii_string(str)) {
+        if (!PARSER_ENCODING_IS_ASCII8BIT(p, str) &&
+            !rb_parser_is_ascii_string(p, str)) {
             c = 'n';
             goto error;
         }
-        rb_enc_associate(str, rb_ascii8bit_encoding());
+        rb_parser_enc_associate(p, str, rb_ascii8bit_encoding());
     }
     else if (rb_is_usascii_enc(p->enc)) {
-        if (!is_ascii_string(str)) {
-            /* raise in re.c */
-            rb_enc_associate(str, rb_usascii_encoding());
-        }
-        else {
-            rb_enc_associate(str, rb_ascii8bit_encoding());
-        }
+        rb_parser_enc_associate(p, str, rb_ascii8bit_encoding());
     }
     return 0;
 
   error:
     return c;
 }
+#endif
 
 static void
-reg_fragment_setenc(struct parser_params* p, VALUE str, int options)
+reg_fragment_setenc(struct parser_params* p, rb_parser_string_t *str, int options)
 {
     int c = rb_reg_fragment_setenc(p, str, options);
     if (c) reg_fragment_enc_error(p, str, c);
 }
 
-static int
-reg_fragment_check(struct parser_params* p, VALUE str, int options)
-{
-    VALUE err;
-    reg_fragment_setenc(p, str, options);
-    err = rb_reg_check_preprocess(str);
-    if (err != Qnil) {
-        err = rb_obj_as_string(err);
-        compile_error(p, "%"PRIsVALUE, err);
-        return 0;
-    }
-    return 1;
-}
-
 #ifndef UNIVERSAL_PARSER
 typedef struct {
     struct parser_params* parser;
     rb_encoding *enc;
     NODE *succ_block;
     const YYLTYPE *loc;
+    rb_parser_assignable_func assignable;
 } reg_named_capture_assign_t;
 
 static int
@@ -13613,27 +15267,12 @@ reg_named_capture_assign_iter(const OnigUChar *name, const OnigUChar *name_end,
     rb_encoding *enc = arg->enc;
     long len = name_end - name;
     const char *s = (const char *)name;
-    ID var;
-    NODE *node, *succ;
-
-    if (!len) return ST_CONTINUE;
-    if (rb_enc_symname_type(s, len, enc, (1U<<ID_LOCAL)) != ID_LOCAL)
-        return ST_CONTINUE;
 
-    var = intern_cstr(s, len, enc);
-    if (len < MAX_WORD_LENGTH && rb_reserved_word(s, (int)len)) {
-        if (!lvar_defined(p, var)) return ST_CONTINUE;
-    }
-    node = node_assign(p, assignable(p, var, 0, arg->loc), NEW_LIT(ID2SYM(var), arg->loc), NO_LEX_CTXT, arg->loc);
-    succ = arg->succ_block;
-    if (!succ) succ = NEW_BEGIN(0, arg->loc);
-    succ = block_append(p, succ, node);
-    arg->succ_block = succ;
-    return ST_CONTINUE;
+    return rb_reg_named_capture_assign_iter_impl(p, s, len, enc, &arg->succ_block, arg->loc, arg->assignable);
 }
 
 static NODE *
-reg_named_capture_assign(struct parser_params* p, VALUE regexp, const YYLTYPE *loc)
+reg_named_capture_assign(struct parser_params* p, VALUE regexp, const YYLTYPE *loc, rb_parser_assignable_func assignable)
 {
     reg_named_capture_assign_t arg;
 
@@ -13641,51 +15280,64 @@ reg_named_capture_assign(struct parser_params* p, VALUE regexp, const YYLTYPE *l
     arg.enc = rb_enc_get(regexp);
     arg.succ_block = 0;
     arg.loc = loc;
+    arg.assignable = assignable;
     onig_foreach_name(RREGEXP_PTR(regexp), reg_named_capture_assign_iter, &arg);
 
     if (!arg.succ_block) return 0;
-    return arg.succ_block->nd_next;
+    return RNODE_BLOCK(arg.succ_block)->nd_next;
 }
 #endif
 
+#ifndef RIPPER
+NODE *
+rb_parser_assignable(struct parser_params *p, ID id, NODE *val, const YYLTYPE *loc)
+{
+    return assignable(p, id, val, loc);
+}
+
 int
 rb_reg_named_capture_assign_iter_impl(struct parser_params *p, const char *s, long len,
-          rb_encoding *enc, NODE **succ_block, const rb_code_location_t *loc)
+                                      rb_encoding *enc, NODE **succ_block, const rb_code_location_t *loc, rb_parser_assignable_func assignable)
 {
     ID var;
     NODE *node, *succ;
 
     if (!len) return ST_CONTINUE;
-    if (rb_enc_symname_type(s, len, enc, (1U<<ID_LOCAL)) != ID_LOCAL)
+    if (!VALID_SYMNAME_P(s, len, enc, ID_LOCAL))
         return ST_CONTINUE;
 
     var = intern_cstr(s, len, enc);
     if (len < MAX_WORD_LENGTH && rb_reserved_word(s, (int)len)) {
         if (!lvar_defined(p, var)) return ST_CONTINUE;
     }
-    node = node_assign(p, assignable(p, var, 0, loc), NEW_LIT(ID2SYM(var), loc), NO_LEX_CTXT, loc);
+    node = node_assign(p, assignable(p, var, 0, loc), NEW_SYM(rb_id2str(var), loc), NO_LEX_CTXT, loc);
     succ = *succ_block;
-    if (!succ) succ = NEW_BEGIN(0, loc);
+    if (!succ) succ = NEW_ERROR(loc);
     succ = block_append(p, succ, node);
     *succ_block = succ;
     return ST_CONTINUE;
 }
+#endif
 
 static VALUE
-parser_reg_compile(struct parser_params* p, VALUE str, int options)
+parser_reg_compile(struct parser_params* p, rb_parser_string_t *str, int options)
 {
+    VALUE str2;
     reg_fragment_setenc(p, str, options);
-    return rb_parser_reg_compile(p, str, options);
+    str2 = rb_str_new_parser_string(str);
+    return rb_parser_reg_compile(p, str2, options);
 }
 
+#ifndef RIPPER
 VALUE
 rb_parser_reg_compile(struct parser_params* p, VALUE str, int options)
 {
     return rb_reg_compile(str, options & RE_OPTION_MASK, p->ruby_sourcefile, p->ruby_sourceline);
 }
+#endif
 
 static VALUE
-reg_compile(struct parser_params* p, VALUE str, int options)
+reg_compile(struct parser_params* p, rb_parser_string_t *str, int options)
 {
     VALUE re;
     VALUE err;
@@ -13700,23 +15352,6 @@ reg_compile(struct parser_params* p, VALUE str, int options)
     }
     return re;
 }
-#else
-static VALUE
-parser_reg_compile(struct parser_params* p, VALUE str, int options, VALUE *errmsg)
-{
-    VALUE err = rb_errinfo();
-    VALUE re;
-    str = ripper_is_node_yylval(p, str) ? RNODE(str)->nd_cval : str;
-    int c = rb_reg_fragment_setenc(p, str, options);
-    if (c) reg_fragment_enc_error(p, str, c);
-    re = rb_parser_reg_compile(p, str, options);
-    if (NIL_P(re)) {
-        *errmsg = rb_attr_get(rb_errinfo(), idMesg);
-        rb_set_errinfo(err);
-    }
-    return re;
-}
-#endif
 
 #ifndef RIPPER
 void
@@ -13735,7 +15370,7 @@ parser_append_options(struct parser_params *p, NODE *node)
     const YYLTYPE *const LOC = &default_location;
 
     if (p->do_print) {
-        NODE *print = NEW_FCALL(rb_intern("print"),
+        NODE *print = (NODE *)NEW_FCALL(rb_intern("print"),
                                 NEW_LIST(NEW_GVAR(idLASTLINE, LOC), LOC),
                                 LOC);
         node = block_append(p, node, print);
@@ -13755,12 +15390,12 @@ parser_append_options(struct parser_params *p, NODE *node)
             node = block_append(p, split, node);
         }
         if (p->do_chomp) {
-            NODE *chomp = NEW_LIT(ID2SYM(rb_intern("chomp")), LOC);
+            NODE *chomp = NEW_SYM(rb_str_new_cstr("chomp"), LOC);
             chomp = list_append(p, NEW_LIST(chomp, LOC), NEW_TRUE(LOC));
             irs = list_append(p, irs, NEW_HASH(chomp, LOC));
         }
 
-        node = NEW_WHILE(NEW_FCALL(idGets, irs, LOC), node, 1, LOC);
+        node = NEW_WHILE((NODE *)NEW_FCALL(idGets, irs, LOC), node, 1, LOC, &NULL_LOC, &NULL_LOC);
     }
 
     return node;
@@ -13774,7 +15409,7 @@ rb_init_parse(void)
     (void)nodeline;
 }
 
-static ID
+ID
 internal_id(struct parser_params *p)
 {
     return rb_make_temporary_id(vtable_size(p->lvtbl->args) + vtable_size(p->lvtbl->vars));
@@ -13788,21 +15423,26 @@ parser_initialize(struct parser_params *p)
     p->command_start = TRUE;
     p->ruby_sourcefile_string = Qnil;
     p->lex.lpar_beg = -1; /* make lambda_beginning_p() == FALSE at first */
+    string_buffer_init(p);
     p->node_id = 0;
-    p->delayed.token = Qnil;
+    p->delayed.token = NULL;
     p->frozen_string_literal = -1; /* not specified */
-#ifdef RIPPER
-    p->result = Qnil;
-    p->parsing_thread = Qnil;
-#else
+#ifndef RIPPER
     p->error_buffer = Qfalse;
-    p->end_expect_token_locations = Qnil;
+    p->end_expect_token_locations = NULL;
     p->token_id = 0;
-    p->tokens = Qnil;
+    p->tokens = NULL;
+#else
+    p->result = Qnil;
+    p->parsing_thread = Qnil;
+    p->s_value = Qnil;
+    p->s_lvalue = Qnil;
+    p->s_value_stack = rb_ary_new();
 #endif
     p->debug_buffer = Qnil;
     p->debug_output = rb_ractor_stdout();
     p->enc = rb_utf8_encoding();
+    p->exits = 0;
 }
 
 #ifdef RIPPER
@@ -13816,29 +15456,19 @@ rb_ruby_parser_mark(void *ptr)
 {
     struct parser_params *p = (struct parser_params*)ptr;
 
-    rb_gc_mark(p->lex.input);
-    rb_gc_mark(p->lex.lastline);
-    rb_gc_mark(p->lex.nextline);
     rb_gc_mark(p->ruby_sourcefile_string);
-    rb_gc_mark((VALUE)p->lex.strterm);
-    rb_gc_mark((VALUE)p->ast);
-    rb_gc_mark(p->case_labels);
-    rb_gc_mark(p->delayed.token);
 #ifndef RIPPER
-    rb_gc_mark(p->debug_lines);
     rb_gc_mark(p->error_buffer);
-    rb_gc_mark(p->end_expect_token_locations);
-    rb_gc_mark(p->tokens);
 #else
     rb_gc_mark(p->value);
     rb_gc_mark(p->result);
     rb_gc_mark(p->parsing_thread);
+    rb_gc_mark(p->s_value);
+    rb_gc_mark(p->s_lvalue);
+    rb_gc_mark(p->s_value_stack);
 #endif
     rb_gc_mark(p->debug_buffer);
     rb_gc_mark(p->debug_output);
-#ifdef YYMALLOC
-    rb_gc_mark((VALUE)p->heap);
-#endif
 }
 
 void
@@ -13846,8 +15476,19 @@ rb_ruby_parser_free(void *ptr)
 {
     struct parser_params *p = (struct parser_params*)ptr;
     struct local_vars *local, *prev;
-#ifdef UNIVERSAL_PARSER
-    rb_parser_config_t *config = p->config;
+
+    if (p->ast) {
+        rb_ast_free(p->ast);
+    }
+
+    if (p->warn_duplicate_keys_table) {
+        st_free_table(p->warn_duplicate_keys_table);
+    }
+
+#ifndef RIPPER
+    if (p->tokens) {
+        rb_parser_ary_free(p, p->tokens);
+    }
 #endif
 
     if (p->tokenbuf) {
@@ -13866,14 +15507,20 @@ rb_ruby_parser_free(void *ptr)
             xfree(ptinfo);
         }
     }
-    xfree(ptr);
+    string_buffer_free(p);
 
-#ifdef UNIVERSAL_PARSER
-    config->counter--;
-    if (config->counter <= 0) {
-        rb_ruby_parser_config_free(config);
+    if (p->pvtbl) {
+        st_free_table(p->pvtbl);
     }
-#endif
+
+    if (CASE_LABELS_ENABLED_P(p->case_labels)) {
+        st_free_table(p->case_labels);
+    }
+
+    xfree(p->lex.strterm);
+    p->lex.strterm = 0;
+
+    xfree(ptr);
 }
 
 size_t
@@ -13891,34 +15538,6 @@ rb_ruby_parser_memsize(const void *ptr)
     return size;
 }
 
-#ifdef UNIVERSAL_PARSER
-rb_parser_config_t *
-rb_ruby_parser_config_new(void *(*malloc)(size_t size))
-{
-    return (rb_parser_config_t *)malloc(sizeof(rb_parser_config_t));
-}
-
-void
-rb_ruby_parser_config_free(rb_parser_config_t *config)
-{
-    config->free(config);
-}
-#endif
-
-#ifndef UNIVERSAL_PARSER
-#ifndef RIPPER
-static const rb_data_type_t parser_data_type = {
-    "parser",
-    {
-        rb_ruby_parser_mark,
-        rb_ruby_parser_free,
-        rb_ruby_parser_memsize,
-    },
-    0, 0, RUBY_TYPED_FREE_IMMEDIATELY
-};
-#endif
-#endif
-
 #ifndef RIPPER
 #undef rb_reserved_word
 
@@ -13930,23 +15549,39 @@ rb_reserved_word(const char *str, unsigned int len)
 
 #ifdef UNIVERSAL_PARSER
 rb_parser_t *
-rb_ruby_parser_allocate(rb_parser_config_t *config)
+rb_ruby_parser_allocate(const rb_parser_config_t *config)
 {
     /* parser_initialize expects fields to be set to 0 */
     rb_parser_t *p = (rb_parser_t *)config->calloc(1, sizeof(rb_parser_t));
     p->config = config;
-    p->config->counter++;
     return p;
 }
 
 rb_parser_t *
-rb_ruby_parser_new(rb_parser_config_t *config)
+rb_ruby_parser_new(const rb_parser_config_t *config)
 {
     /* parser_initialize expects fields to be set to 0 */
     rb_parser_t *p = rb_ruby_parser_allocate(config);
     parser_initialize(p);
     return p;
 }
+#else
+rb_parser_t *
+rb_ruby_parser_allocate(void)
+{
+    /* parser_initialize expects fields to be set to 0 */
+    rb_parser_t *p = (rb_parser_t *)ruby_xcalloc(1, sizeof(rb_parser_t));
+    return p;
+}
+
+rb_parser_t *
+rb_ruby_parser_new(void)
+{
+    /* parser_initialize expects fields to be set to 0 */
+    rb_parser_t *p = rb_ruby_parser_allocate();
+    parser_initialize(p);
+    return p;
+}
 #endif
 
 rb_parser_t *
@@ -13958,177 +15593,28 @@ rb_ruby_parser_set_context(rb_parser_t *p, const struct rb_iseq_struct *base, in
 }
 
 void
-rb_ruby_parser_set_script_lines(rb_parser_t *p, VALUE lines)
+rb_ruby_parser_set_script_lines(rb_parser_t *p)
 {
-    if (!RTEST(lines)) {
-        lines = Qfalse;
-    }
-    else if (lines == Qtrue) {
-        lines = rb_ary_new();
-    }
-    else {
-        Check_Type(lines, T_ARRAY);
-        rb_ary_modify(lines);
-    }
-    p->debug_lines = lines;
+    p->debug_lines = rb_parser_ary_new_capa_for_script_line(p, 10);
 }
 
 void
 rb_ruby_parser_error_tolerant(rb_parser_t *p)
 {
     p->error_tolerant = 1;
-    // TODO
-    p->end_expect_token_locations = rb_ary_new();
 }
 
 void
 rb_ruby_parser_keep_tokens(rb_parser_t *p)
 {
     p->keep_tokens = 1;
-    // TODO
-    p->tokens = rb_ary_new();
-}
-
-#ifndef UNIVERSAL_PARSER
-rb_ast_t*
-rb_parser_compile_file_path(VALUE vparser, VALUE fname, VALUE file, int start)
-{
-    struct parser_params *p;
-
-    TypedData_Get_Struct(vparser, struct parser_params, &parser_data_type, p);
-    RB_GC_GUARD(vparser); /* prohibit tail call optimization */
-    return rb_ruby_parser_compile_file_path(p, fname, file, start);
-}
-
-rb_ast_t*
-rb_parser_compile_generic(VALUE vparser, VALUE (*lex_gets)(VALUE, int), VALUE fname, VALUE input, int start)
-{
-    struct parser_params *p;
-
-    TypedData_Get_Struct(vparser, struct parser_params, &parser_data_type, p);
-    RB_GC_GUARD(vparser); /* prohibit tail call optimization */
-    return rb_ruby_parser_compile_generic(p, lex_gets, fname, input, start);
-}
-
-rb_ast_t*
-rb_parser_compile_string(VALUE vparser, const char *f, VALUE s, int line)
-{
-    struct parser_params *p;
-
-    TypedData_Get_Struct(vparser, struct parser_params, &parser_data_type, p);
-    RB_GC_GUARD(vparser); /* prohibit tail call optimization */
-    return rb_ruby_parser_compile_string(p, f, s, line);
-}
-
-rb_ast_t*
-rb_parser_compile_string_path(VALUE vparser, VALUE f, VALUE s, int line)
-{
-    struct parser_params *p;
-
-    TypedData_Get_Struct(vparser, struct parser_params, &parser_data_type, p);
-    RB_GC_GUARD(vparser); /* prohibit tail call optimization */
-    return rb_ruby_parser_compile_string_path(p, f, s, line);
-}
-
-VALUE
-rb_parser_encoding(VALUE vparser)
-{
-    struct parser_params *p;
-
-    TypedData_Get_Struct(vparser, struct parser_params, &parser_data_type, p);
-    return rb_ruby_parser_encoding(p);
-}
-
-VALUE
-rb_parser_end_seen_p(VALUE vparser)
-{
-    struct parser_params *p;
-
-    TypedData_Get_Struct(vparser, struct parser_params, &parser_data_type, p);
-    return RBOOL(rb_ruby_parser_end_seen_p(p));
-}
-
-void
-rb_parser_error_tolerant(VALUE vparser)
-{
-    struct parser_params *p;
-
-    TypedData_Get_Struct(vparser, struct parser_params, &parser_data_type, p);
-    rb_ruby_parser_error_tolerant(p);
-}
-
-void
-rb_parser_set_script_lines(VALUE vparser, VALUE lines)
-{
-    struct parser_params *p;
-
-    TypedData_Get_Struct(vparser, struct parser_params, &parser_data_type, p);
-    rb_ruby_parser_set_script_lines(p, lines);
-}
-
-void
-rb_parser_keep_tokens(VALUE vparser)
-{
-    struct parser_params *p;
-
-    TypedData_Get_Struct(vparser, struct parser_params, &parser_data_type, p);
-    rb_ruby_parser_keep_tokens(p);
-}
-
-VALUE
-rb_parser_new(void)
-{
-    struct parser_params *p;
-    VALUE parser = TypedData_Make_Struct(0, struct parser_params,
-                                         &parser_data_type, p);
-    parser_initialize(p);
-    return parser;
-}
-
-VALUE
-rb_parser_set_context(VALUE vparser, const struct rb_iseq_struct *base, int main)
-{
-    struct parser_params *p;
-
-    TypedData_Get_Struct(vparser, struct parser_params, &parser_data_type, p);
-    rb_ruby_parser_set_context(p, base, main);
-    return vparser;
-}
-
-void
-rb_parser_set_options(VALUE vparser, int print, int loop, int chomp, int split)
-{
-    struct parser_params *p;
-
-    TypedData_Get_Struct(vparser, struct parser_params, &parser_data_type, p);
-    rb_ruby_parser_set_options(p, print, loop, chomp, split);
-}
-
-VALUE
-rb_parser_set_yydebug(VALUE self, VALUE flag)
-{
-    struct parser_params *p;
-
-    TypedData_Get_Struct(self, struct parser_params, &parser_data_type, p);
-    rb_ruby_parser_set_yydebug(p, RTEST(flag));
-    return flag;
-}
-
-void
-rb_strterm_mark(VALUE obj)
-{
-    rb_strterm_t *strterm = (rb_strterm_t*)obj;
-    if (RBASIC(obj)->flags & STRTERM_HEREDOC) {
-        rb_strterm_heredoc_t *heredoc = &strterm->u.heredoc;
-        rb_gc_mark(heredoc->lastline);
-    }
+    p->tokens = rb_parser_ary_new_capa_for_ast_token(p, 10);
 }
-#endif /* !UNIVERSAL_PARSER */
 
-VALUE
+rb_encoding *
 rb_ruby_parser_encoding(rb_parser_t *p)
 {
-    return rb_enc_from_encoding(p->enc);
+    return p->enc;
 }
 
 int
@@ -14189,7 +15675,7 @@ rb_ruby_parser_set_parsing_thread(rb_parser_t *p, VALUE parsing_thread)
 }
 
 void
-rb_ruby_parser_ripper_initialize(rb_parser_t *p, VALUE (*gets)(struct parser_params*,VALUE), VALUE input, VALUE sourcefile_string, const char *sourcefile, int sourceline)
+rb_ruby_parser_ripper_initialize(rb_parser_t *p, rb_parser_lex_gets_func *gets, rb_parser_input_data input, VALUE sourcefile_string, const char *sourcefile, int sourceline)
 {
     p->lex.gets = gets;
     p->lex.input = input;
@@ -14235,22 +15721,18 @@ rb_ruby_ripper_parse0(rb_parser_t *p)
     parser_prepare(p);
     p->ast = rb_ast_new();
     ripper_yyparse((void*)p);
-    rb_ast_dispose(p->ast);
+    rb_ast_free(p->ast);
     p->ast = 0;
+    p->eval_tree = 0;
+    p->eval_tree_begin = 0;
 }
 
 int
-rb_ruby_ripper_dedent_string(rb_parser_t *p, VALUE string, int width)
+rb_ruby_ripper_dedent_string(rb_parser_t *p, rb_parser_string_t *string, int width)
 {
     return dedent_string(p, string, width);
 }
 
-VALUE
-rb_ruby_ripper_lex_get_str(rb_parser_t *p, VALUE s)
-{
-    return lex_get_str(p, s);
-}
-
 int
 rb_ruby_ripper_initialized_p(rb_parser_t *p)
 {
@@ -14275,7 +15757,7 @@ rb_ruby_ripper_token_len(rb_parser_t *p)
     return p->lex.pcur - p->lex.ptok;
 }
 
-VALUE
+rb_parser_string_t *
 rb_ruby_ripper_lex_lastline(rb_parser_t *p)
 {
     return p->lex.lastline;
@@ -14287,6 +15769,16 @@ rb_ruby_ripper_lex_state_name(struct parser_params *p, int state)
     return rb_parser_lex_state_name(p, (enum lex_state_e)state);
 }
 
+#ifdef UNIVERSAL_PARSER
+rb_parser_t *
+rb_ripper_parser_params_allocate(const rb_parser_config_t *config)
+{
+    rb_parser_t *p = (rb_parser_t *)config->calloc(1, sizeof(rb_parser_t));
+    p->config = config;
+    return p;
+}
+#endif
+
 struct parser_params*
 rb_ruby_ripper_parser_allocate(void)
 {
@@ -14295,69 +15787,6 @@ rb_ruby_ripper_parser_allocate(void)
 #endif /* RIPPER */
 
 #ifndef RIPPER
-#ifdef YYMALLOC
-#define HEAPCNT(n, size) ((n) * (size) / sizeof(YYSTYPE))
-/* Keep the order; NEWHEAP then xmalloc and ADD2HEAP to get rid of
- * potential memory leak */
-#define NEWHEAP() rb_imemo_tmpbuf_parser_heap(0, p->heap, 0)
-#define ADD2HEAP(new, cnt, ptr) ((p->heap = (new))->ptr = (ptr), \
-                           (new)->cnt = (cnt), (ptr))
-
-void *
-rb_parser_malloc(struct parser_params *p, size_t size)
-{
-    size_t cnt = HEAPCNT(1, size);
-    rb_imemo_tmpbuf_t *n = NEWHEAP();
-    void *ptr = xmalloc(size);
-
-    return ADD2HEAP(n, cnt, ptr);
-}
-
-void *
-rb_parser_calloc(struct parser_params *p, size_t nelem, size_t size)
-{
-    size_t cnt = HEAPCNT(nelem, size);
-    rb_imemo_tmpbuf_t *n = NEWHEAP();
-    void *ptr = xcalloc(nelem, size);
-
-    return ADD2HEAP(n, cnt, ptr);
-}
-
-void *
-rb_parser_realloc(struct parser_params *p, void *ptr, size_t size)
-{
-    rb_imemo_tmpbuf_t *n;
-    size_t cnt = HEAPCNT(1, size);
-
-    if (ptr && (n = p->heap) != NULL) {
-        do {
-            if (n->ptr == ptr) {
-                n->ptr = ptr = xrealloc(ptr, size);
-                if (n->cnt) n->cnt = cnt;
-                return ptr;
-            }
-        } while ((n = n->next) != NULL);
-    }
-    n = NEWHEAP();
-    ptr = xrealloc(ptr, size);
-    return ADD2HEAP(n, cnt, ptr);
-}
-
-void
-rb_parser_free(struct parser_params *p, void *ptr)
-{
-    rb_imemo_tmpbuf_t **prev = &p->heap, *n;
-
-    while ((n = *prev) != NULL) {
-        if (n->ptr == ptr) {
-            *prev = n->next;
-            break;
-        }
-        prev = &n->next;
-    }
-}
-#endif
-
 void
 rb_parser_printf(struct parser_params *p, const char *fmt, ...)
 {
@@ -14368,16 +15797,26 @@ rb_parser_printf(struct parser_params *p, const char *fmt, ...)
     va_start(ap, fmt);
     rb_str_vcatf(mesg, fmt, ap);
     va_end(ap);
-    if (RSTRING_END(mesg)[-1] == '\n') {
+    if (char_at_end(p, mesg, 0) == '\n') {
         rb_io_write(p->debug_output, mesg);
         p->debug_buffer = Qnil;
     }
 }
 
 static void
-parser_compile_error(struct parser_params *p, const char *fmt, ...)
+parser_compile_error(struct parser_params *p, const rb_code_location_t *loc, const char *fmt, ...)
 {
     va_list ap;
+    int lineno, column;
+
+    if (loc) {
+        lineno = loc->end_pos.lineno;
+        column = loc->end_pos.column;
+    }
+    else {
+        lineno = p->ruby_sourceline;
+        column = rb_long2int(p->lex.pcur - p->lex.pbeg);
+    }
 
     rb_io_flush(p->debug_output);
     p->error_p = 1;
@@ -14385,8 +15824,7 @@ parser_compile_error(struct parser_params *p, const char *fmt, ...)
     p->error_buffer =
         rb_syntax_error_append(p->error_buffer,
                                p->ruby_sourcefile_string,
-                               p->ruby_sourceline,
-                               rb_long2int(p->lex.pcur - p->lex.pbeg),
+                               lineno, column,
                                p->enc, fmt, ap);
     va_end(ap);
 }
@@ -14405,7 +15843,7 @@ count_char(const char *str, int c)
  *
  *  "\"`class' keyword\"" => "`class' keyword"
  */
-RUBY_FUNC_EXPORTED size_t
+size_t
 rb_yytnamerr(struct parser_params *p, char *yyres, const char *yystr)
 {
     if (*yystr == '"') {
@@ -14414,31 +15852,30 @@ rb_yytnamerr(struct parser_params *p, char *yyres, const char *yystr)
 
         while (*++yyp) {
             switch (*yyp) {
-              case '`':
+              case '\'':
                 if (!bquote) {
-                    bquote = count_char(yyp+1, '`') + 1;
+                    bquote = count_char(yyp+1, '\'') + 1;
                     if (yyres) memcpy(&yyres[yyn], yyp, bquote);
                     yyn += bquote;
                     yyp += bquote - 1;
                     break;
                 }
-                goto default_char;
-
-              case '\'':
-                if (bquote && count_char(yyp+1, '\'') + 1 == bquote) {
-                    if (yyres) memcpy(yyres + yyn, yyp, bquote);
-                    yyn += bquote;
-                    yyp += bquote - 1;
-                    bquote = 0;
-                    break;
-                }
-                if (yyp[1] && yyp[1] != '\'' && yyp[2] == '\'') {
-                    if (yyres) memcpy(yyres + yyn, yyp, 3);
-                    yyn += 3;
-                    yyp += 2;
-                    break;
+                else {
+                    if (bquote && count_char(yyp+1, '\'') + 1 == bquote) {
+                        if (yyres) memcpy(yyres + yyn, yyp, bquote);
+                        yyn += bquote;
+                        yyp += bquote - 1;
+                        bquote = 0;
+                        break;
+                    }
+                    if (yyp[1] && yyp[1] != '\'' && yyp[2] == '\'') {
+                        if (yyres) memcpy(yyres + yyn, yyp, 3);
+                        yyn += 3;
+                        yyp += 2;
+                        break;
+                    }
+                    goto do_not_strip_quotes;
                 }
-                goto do_not_strip_quotes;
 
               case ',':
                 goto do_not_strip_quotes;
@@ -14447,7 +15884,6 @@ rb_yytnamerr(struct parser_params *p, char *yyres, const char *yystr)
                 if (*++yyp != '\\')
                     goto do_not_strip_quotes;
                 /* Fall through.  */
-              default_char:
               default:
                 if (yyres)
                     yyres[yyn] = *yyp;
@@ -14471,46 +15907,7 @@ rb_yytnamerr(struct parser_params *p, char *yyres, const char *yystr)
 #endif
 
 #ifdef RIPPER
-#ifdef RIPPER_DEBUG
-/* :nodoc: */
-static VALUE
-ripper_validate_object(VALUE self, VALUE x)
-{
-    if (x == Qfalse) return x;
-    if (x == Qtrue) return x;
-    if (NIL_P(x)) return x;
-    if (UNDEF_P(x))
-        rb_raise(rb_eArgError, "Qundef given");
-    if (FIXNUM_P(x)) return x;
-    if (SYMBOL_P(x)) return x;
-    switch (BUILTIN_TYPE(x)) {
-      case T_STRING:
-      case T_OBJECT:
-      case T_ARRAY:
-      case T_BIGNUM:
-      case T_FLOAT:
-      case T_COMPLEX:
-      case T_RATIONAL:
-        break;
-      case T_NODE:
-        if (!nd_type_p((NODE *)x, NODE_RIPPER)) {
-            rb_raise(rb_eArgError, "NODE given: %p", (void *)x);
-        }
-        x = ((NODE *)x)->nd_rval;
-        break;
-      default:
-        rb_raise(rb_eArgError, "wrong type of ruby object: %p (%s)",
-                 (void *)x, rb_obj_classname(x));
-    }
-    if (!RBASIC_CLASS(x)) {
-        rb_raise(rb_eArgError, "hidden ruby object: %p (%s)",
-                 (void *)x, rb_builtin_type_name(TYPE(x)));
-    }
-    return x;
-}
-#endif
-
-#define validate(x) ((x) = get_value(x))
+#define validate(x) (void)(x)
 
 static VALUE
 ripper_dispatch0(struct parser_params *p, ID mid)
diff --git a/parser_node.h b/parser_node.h
index 886f9af7d28051..29557206762811 100644
--- a/parser_node.h
+++ b/parser_node.h
@@ -22,107 +22,6 @@ code_loc_gen(const rb_code_location_t *loc1, const rb_code_location_t *loc2)
     return loc;
 }
 
-#define RNODE(obj)  ((struct RNode *)(obj))
-
-
-#define NEW_NODE(t,a0,a1,a2,loc) rb_node_newnode((t),(VALUE)(a0),(VALUE)(a1),(VALUE)(a2),loc)
-#define NEW_NODE_WITH_LOCALS(t,a1,a2,loc) node_newnode_with_locals(p, (t),(VALUE)(a1),(VALUE)(a2),loc)
-
-#define NEW_DEFN(i,a,d,loc) NEW_NODE(NODE_DEFN,0,i,NEW_SCOPE(a,d,loc),loc)
-#define NEW_DEFS(r,i,a,d,loc) NEW_NODE(NODE_DEFS,r,i,NEW_SCOPE(a,d,loc),loc)
-#define NEW_SCOPE(a,b,loc) NEW_NODE_WITH_LOCALS(NODE_SCOPE,b,a,loc)
-#define NEW_BLOCK(a,loc) NEW_NODE(NODE_BLOCK,a,0,0,loc)
-#define NEW_IF(c,t,e,loc) NEW_NODE(NODE_IF,c,t,e,loc)
-#define NEW_UNLESS(c,t,e,loc) NEW_NODE(NODE_UNLESS,c,t,e,loc)
-#define NEW_CASE(h,b,loc) NEW_NODE(NODE_CASE,h,b,0,loc)
-#define NEW_CASE2(b,loc) NEW_NODE(NODE_CASE2,0,b,0,loc)
-#define NEW_CASE3(h,b,loc) NEW_NODE(NODE_CASE3,h,b,0,loc)
-#define NEW_WHEN(c,t,e,loc) NEW_NODE(NODE_WHEN,c,t,e,loc)
-#define NEW_IN(c,t,e,loc) NEW_NODE(NODE_IN,c,t,e,loc)
-#define NEW_WHILE(c,b,n,loc) NEW_NODE(NODE_WHILE,c,b,n,loc)
-#define NEW_UNTIL(c,b,n,loc) NEW_NODE(NODE_UNTIL,c,b,n,loc)
-#define NEW_FOR(i,b,loc) NEW_NODE(NODE_FOR,0,b,i,loc)
-#define NEW_FOR_MASGN(v,loc) NEW_NODE(NODE_FOR_MASGN,v,0,0,loc)
-#define NEW_ITER(a,b,loc) NEW_NODE(NODE_ITER,0,NEW_SCOPE(a,b,loc),0,loc)
-#define NEW_LAMBDA(a,b,loc) NEW_NODE(NODE_LAMBDA,0,NEW_SCOPE(a,b,loc),0,loc)
-#define NEW_BREAK(s,loc) NEW_NODE(NODE_BREAK,s,0,0,loc)
-#define NEW_NEXT(s,loc) NEW_NODE(NODE_NEXT,s,0,0,loc)
-#define NEW_REDO(loc) NEW_NODE(NODE_REDO,0,0,0,loc)
-#define NEW_RETRY(loc) NEW_NODE(NODE_RETRY,0,0,0,loc)
-#define NEW_BEGIN(b,loc) NEW_NODE(NODE_BEGIN,0,b,0,loc)
-#define NEW_RESCUE(b,res,e,loc) NEW_NODE(NODE_RESCUE,b,res,e,loc)
-#define NEW_RESBODY(a,ex,n,loc) NEW_NODE(NODE_RESBODY,n,ex,a,loc)
-#define NEW_ENSURE(b,en,loc) NEW_NODE(NODE_ENSURE,b,0,en,loc)
-#define NEW_RETURN(s,loc) NEW_NODE(NODE_RETURN,s,0,0,loc)
-#define NEW_YIELD(a,loc) NEW_NODE(NODE_YIELD,a,0,0,loc)
-#define NEW_LIST(a,loc) NEW_NODE(NODE_LIST,a,1,0,loc)
-#define NEW_ZLIST(loc) NEW_NODE(NODE_ZLIST,0,0,0,loc)
-#define NEW_HASH(a,loc)  NEW_NODE(NODE_HASH,a,0,0,loc)
-#define NEW_MASGN(l,r,loc)   NEW_NODE(NODE_MASGN,l,0,r,loc)
-#define NEW_GASGN(v,val,loc) NEW_NODE(NODE_GASGN,v,val,0,loc)
-#define NEW_LASGN(v,val,loc) NEW_NODE(NODE_LASGN,v,val,0,loc)
-#define NEW_DASGN(v,val,loc) NEW_NODE(NODE_DASGN,v,val,0,loc)
-#define NEW_IASGN(v,val,loc) NEW_NODE(NODE_IASGN,v,val,0,loc)
-#define NEW_CDECL(v,val,path,loc) NEW_NODE(NODE_CDECL,v,val,path,loc)
-#define NEW_CVASGN(v,val,loc) NEW_NODE(NODE_CVASGN,v,val,0,loc)
-#define NEW_OP_ASGN1(p,id,a,loc) NEW_NODE(NODE_OP_ASGN1,p,id,a,loc)
-#define NEW_OP_ASGN2(r,t,i,o,val,loc) NEW_NODE(NODE_OP_ASGN2,r,val,NEW_OP_ASGN22(i,o,t,loc),loc)
-#define NEW_OP_ASGN22(i,o,t,loc) NEW_NODE(NODE_OP_ASGN2,i,o,t,loc)
-#define NEW_OP_ASGN_OR(i,val,loc) NEW_NODE(NODE_OP_ASGN_OR,i,val,0,loc)
-#define NEW_OP_ASGN_AND(i,val,loc) NEW_NODE(NODE_OP_ASGN_AND,i,val,0,loc)
-#define NEW_OP_CDECL(v,op,val,loc) NEW_NODE(NODE_OP_CDECL,v,val,op,loc)
-#define NEW_GVAR(v,loc) NEW_NODE(NODE_GVAR,v,0,0,loc)
-#define NEW_LVAR(v,loc) NEW_NODE(NODE_LVAR,v,0,0,loc)
-#define NEW_DVAR(v,loc) NEW_NODE(NODE_DVAR,v,0,0,loc)
-#define NEW_IVAR(v,loc) NEW_NODE(NODE_IVAR,v,0,0,loc)
-#define NEW_CONST(v,loc) NEW_NODE(NODE_CONST,v,0,0,loc)
-#define NEW_CVAR(v,loc) NEW_NODE(NODE_CVAR,v,0,0,loc)
-#define NEW_NTH_REF(n,loc)  NEW_NODE(NODE_NTH_REF,0,n,0,loc)
-#define NEW_BACK_REF(n,loc) NEW_NODE(NODE_BACK_REF,0,n,0,loc)
-#define NEW_MATCH(c,loc) NEW_NODE(NODE_MATCH,c,0,0,loc)
-#define NEW_MATCH2(n1,n2,loc) NEW_NODE(NODE_MATCH2,n1,n2,0,loc)
-#define NEW_MATCH3(r,n2,loc) NEW_NODE(NODE_MATCH3,r,n2,0,loc)
-#define NEW_LIT(l,loc) NEW_NODE(NODE_LIT,l,0,0,loc)
-#define NEW_STR(s,loc) NEW_NODE(NODE_STR,s,0,0,loc)
-#define NEW_DSTR(s,loc) NEW_NODE(NODE_DSTR,s,1,0,loc)
-#define NEW_XSTR(s,loc) NEW_NODE(NODE_XSTR,s,0,0,loc)
-#define NEW_DXSTR(s,loc) NEW_NODE(NODE_DXSTR,s,0,0,loc)
-#define NEW_DSYM(s,loc) NEW_NODE(NODE_DSYM,s,0,0,loc)
-#define NEW_EVSTR(n,loc) NEW_NODE(NODE_EVSTR,0,(n),0,loc)
-#define NEW_CALL(r,m,a,loc) NEW_NODE(NODE_CALL,r,m,a,loc)
-#define NEW_OPCALL(r,m,a,loc) NEW_NODE(NODE_OPCALL,r,m,a,loc)
-#define NEW_FCALL(m,a,loc) NEW_NODE(NODE_FCALL,0,m,a,loc)
-#define NEW_VCALL(m,loc) NEW_NODE(NODE_VCALL,0,m,0,loc)
-#define NEW_SUPER(a,loc) NEW_NODE(NODE_SUPER,0,0,a,loc)
-#define NEW_ZSUPER(loc) NEW_NODE(NODE_ZSUPER,0,0,0,loc)
-#define NEW_ARGS_AUX(r,b,loc) NEW_NODE(NODE_ARGS_AUX,r,b,0,loc)
-#define NEW_OPT_ARG(i,v,loc) NEW_NODE(NODE_OPT_ARG,i,v,0,loc)
-#define NEW_KW_ARG(v,loc) NEW_NODE(NODE_KW_ARG,0,v,0,loc)
-#define NEW_POSTARG(i,v,loc) NEW_NODE(NODE_POSTARG,i,v,0,loc)
-#define NEW_ARGSCAT(a,b,loc) NEW_NODE(NODE_ARGSCAT,a,b,0,loc)
-#define NEW_ARGSPUSH(a,b,loc) NEW_NODE(NODE_ARGSPUSH,a,b,0,loc)
-#define NEW_SPLAT(a,loc) NEW_NODE(NODE_SPLAT,a,0,0,loc)
-#define NEW_BLOCK_PASS(b,loc) NEW_NODE(NODE_BLOCK_PASS,0,b,0,loc)
-#define NEW_ALIAS(n,o,loc) NEW_NODE(NODE_ALIAS,n,o,0,loc)
-#define NEW_VALIAS(n,o,loc) NEW_NODE(NODE_VALIAS,n,o,0,loc)
-#define NEW_UNDEF(i,loc) NEW_NODE(NODE_UNDEF,0,i,0,loc)
-#define NEW_CLASS(n,b,s,loc) NEW_NODE(NODE_CLASS,n,NEW_SCOPE(0,b,loc),(s),loc)
-#define NEW_SCLASS(r,b,loc) NEW_NODE(NODE_SCLASS,r,NEW_SCOPE(0,b,loc),0,loc)
-#define NEW_MODULE(n,b,loc) NEW_NODE(NODE_MODULE,n,NEW_SCOPE(0,b,loc),0,loc)
-#define NEW_COLON2(c,i,loc) NEW_NODE(NODE_COLON2,c,i,0,loc)
-#define NEW_COLON3(i,loc) NEW_NODE(NODE_COLON3,0,i,0,loc)
-#define NEW_DOT2(b,e,loc) NEW_NODE(NODE_DOT2,b,e,0,loc)
-#define NEW_DOT3(b,e,loc) NEW_NODE(NODE_DOT3,b,e,0,loc)
-#define NEW_SELF(loc) NEW_NODE(NODE_SELF,0,0,1,loc)
-#define NEW_NIL(loc) NEW_NODE(NODE_NIL,0,0,0,loc)
-#define NEW_TRUE(loc) NEW_NODE(NODE_TRUE,0,0,0,loc)
-#define NEW_FALSE(loc) NEW_NODE(NODE_FALSE,0,0,0,loc)
-#define NEW_ERRINFO(loc) NEW_NODE(NODE_ERRINFO,0,0,0,loc)
-#define NEW_DEFINED(e,loc) NEW_NODE(NODE_DEFINED,e,0,0,loc)
-#define NEW_POSTEXE(b,loc) NEW_NODE(NODE_POSTEXE,0,b,0,loc)
-#define NEW_ATTRASGN(r,m,a,loc) NEW_NODE(NODE_ATTRASGN,r,m,a,loc)
-#define NEW_ERROR(loc) NEW_NODE(NODE_ERROR,0,0,0,loc)
-
 #if defined(__cplusplus)
 #if 0
 { /* satisfy cc-mode */
diff --git a/parser_st.c b/parser_st.c
index c7a45d25e6e974..c2340261226d91 100644
--- a/parser_st.c
+++ b/parser_st.c
@@ -107,6 +107,7 @@ nonempty_memcpy(void *dest, const void *src, size_t n)
 #define st_get_key rb_parser_st_get_key
 #undef st_add_direct
 #define st_add_direct rb_parser_st_add_direct
+#define rb_st_add_direct_with_hash rb_parser_st_add_direct_with_hash
 #undef st_insert2
 #define st_insert2 rb_parser_st_insert2
 #undef st_replace
@@ -153,7 +154,8 @@ nonempty_memcpy(void *dest, const void *src, size_t n)
     _Pragma("GCC diagnostic push") \
     _Pragma("GCC diagnostic ignored \"-Wattributes\"") \
     __attribute__((__no_sanitize__(x))) y; \
-    _Pragma("GCC diagnostic pop")
+    _Pragma("GCC diagnostic pop") \
+    y
 #endif
 
 #ifndef NO_SANITIZE
diff --git a/prelude.rb b/prelude.rb
index ee78b44cc5267f..f49cada637968e 100644
--- a/prelude.rb
+++ b/prelude.rb
@@ -1,8 +1,13 @@
 class Binding
   # :nodoc:
-  def irb
-    require 'irb'
-    irb
+  def irb(...)
+    begin
+      require 'irb'
+    rescue LoadError, Gem::LoadError
+      Gem::BUNDLED_GEMS.force_activate 'irb'
+      require 'irb'
+    end
+    irb(...)
   end
 
   # suppress redefinition warning
@@ -21,11 +26,16 @@ def pp(*objs)
   private :pp
 end
 
-autoload :Set, 'set'
-
 module Enumerable
   # Makes a set from the enumerable object with given arguments.
-  def to_set(klass = Set, *args, &block)
+  # Passing arguments to this method is deprecated.
+  def to_set(*args, &block)
+    klass = if args.empty?
+      Set
+    else
+      warn "passing arguments to Enumerable#to_set is deprecated", uplevel: 1
+      args.shift
+    end
     klass.new(self, *args, &block)
-  end unless instance_methods.include?(:to_set) # RJIT could already load this from builtin prelude
+  end
 end
diff --git a/prism/api_pack.c b/prism/api_pack.c
new file mode 100644
index 00000000000000..98509ae65ccae0
--- /dev/null
+++ b/prism/api_pack.c
@@ -0,0 +1,276 @@
+#include "prism/extension.h"
+
+#ifdef PRISM_EXCLUDE_PACK
+
+void
+Init_prism_pack(void) {}
+
+#else
+
+static VALUE rb_cPrism;
+static VALUE rb_cPrismPack;
+static VALUE rb_cPrismPackDirective;
+static VALUE rb_cPrismPackFormat;
+
+static VALUE v3_2_0_symbol;
+static VALUE pack_symbol;
+static VALUE unpack_symbol;
+
+#if SIZEOF_UINT64_T == SIZEOF_LONG_LONG
+# define UINT64T2NUM(x) ULL2NUM(x)
+# define NUM2UINT64T(x) (uint64_t)NUM2ULL(x)
+#elif SIZEOF_UINT64_T == SIZEOF_LONG
+# define UINT64T2NUM(x) ULONG2NUM(x)
+# define NUM2UINT64T(x) (uint64_t)NUM2ULONG(x)
+#else
+// error No uint64_t conversion
+#endif
+
+static VALUE
+pack_type_to_symbol(pm_pack_type type) {
+    switch (type) {
+        case PM_PACK_SPACE:
+            return ID2SYM(rb_intern("SPACE"));
+        case PM_PACK_COMMENT:
+            return ID2SYM(rb_intern("COMMENT"));
+        case PM_PACK_INTEGER:
+            return ID2SYM(rb_intern("INTEGER"));
+        case PM_PACK_UTF8:
+            return ID2SYM(rb_intern("UTF8"));
+        case PM_PACK_BER:
+            return ID2SYM(rb_intern("BER"));
+        case PM_PACK_FLOAT:
+            return ID2SYM(rb_intern("FLOAT"));
+        case PM_PACK_STRING_SPACE_PADDED:
+            return ID2SYM(rb_intern("STRING_SPACE_PADDED"));
+        case PM_PACK_STRING_NULL_PADDED:
+            return ID2SYM(rb_intern("STRING_NULL_PADDED"));
+        case PM_PACK_STRING_NULL_TERMINATED:
+            return ID2SYM(rb_intern("STRING_NULL_TERMINATED"));
+        case PM_PACK_STRING_MSB:
+            return ID2SYM(rb_intern("STRING_MSB"));
+        case PM_PACK_STRING_LSB:
+            return ID2SYM(rb_intern("STRING_LSB"));
+        case PM_PACK_STRING_HEX_HIGH:
+            return ID2SYM(rb_intern("STRING_HEX_HIGH"));
+        case PM_PACK_STRING_HEX_LOW:
+            return ID2SYM(rb_intern("STRING_HEX_LOW"));
+        case PM_PACK_STRING_UU:
+            return ID2SYM(rb_intern("STRING_UU"));
+        case PM_PACK_STRING_MIME:
+            return ID2SYM(rb_intern("STRING_MIME"));
+        case PM_PACK_STRING_BASE64:
+            return ID2SYM(rb_intern("STRING_BASE64"));
+        case PM_PACK_STRING_FIXED:
+            return ID2SYM(rb_intern("STRING_FIXED"));
+        case PM_PACK_STRING_POINTER:
+            return ID2SYM(rb_intern("STRING_POINTER"));
+        case PM_PACK_MOVE:
+            return ID2SYM(rb_intern("MOVE"));
+        case PM_PACK_BACK:
+            return ID2SYM(rb_intern("BACK"));
+        case PM_PACK_NULL:
+            return ID2SYM(rb_intern("NULL"));
+        default:
+            return Qnil;
+    }
+}
+
+static VALUE
+pack_signed_to_symbol(pm_pack_signed signed_type) {
+    switch (signed_type) {
+        case PM_PACK_UNSIGNED:
+            return ID2SYM(rb_intern("UNSIGNED"));
+        case PM_PACK_SIGNED:
+            return ID2SYM(rb_intern("SIGNED"));
+        case PM_PACK_SIGNED_NA:
+            return ID2SYM(rb_intern("SIGNED_NA"));
+        default:
+            return Qnil;
+    }
+}
+
+static VALUE
+pack_endian_to_symbol(pm_pack_endian endian) {
+    switch (endian) {
+        case PM_PACK_AGNOSTIC_ENDIAN:
+            return ID2SYM(rb_intern("AGNOSTIC_ENDIAN"));
+        case PM_PACK_LITTLE_ENDIAN:
+            return ID2SYM(rb_intern("LITTLE_ENDIAN"));
+        case PM_PACK_BIG_ENDIAN:
+            return ID2SYM(rb_intern("BIG_ENDIAN"));
+        case PM_PACK_NATIVE_ENDIAN:
+            return ID2SYM(rb_intern("NATIVE_ENDIAN"));
+        case PM_PACK_ENDIAN_NA:
+            return ID2SYM(rb_intern("ENDIAN_NA"));
+        default:
+            return Qnil;
+    }
+}
+
+static VALUE
+pack_size_to_symbol(pm_pack_size size) {
+    switch (size) {
+        case PM_PACK_SIZE_SHORT:
+            return ID2SYM(rb_intern("SIZE_SHORT"));
+        case PM_PACK_SIZE_INT:
+            return ID2SYM(rb_intern("SIZE_INT"));
+        case PM_PACK_SIZE_LONG:
+            return ID2SYM(rb_intern("SIZE_LONG"));
+        case PM_PACK_SIZE_LONG_LONG:
+            return ID2SYM(rb_intern("SIZE_LONG_LONG"));
+        case PM_PACK_SIZE_8:
+            return ID2SYM(rb_intern("SIZE_8"));
+        case PM_PACK_SIZE_16:
+            return ID2SYM(rb_intern("SIZE_16"));
+        case PM_PACK_SIZE_32:
+            return ID2SYM(rb_intern("SIZE_32"));
+        case PM_PACK_SIZE_64:
+            return ID2SYM(rb_intern("SIZE_64"));
+        case PM_PACK_SIZE_P:
+            return ID2SYM(rb_intern("SIZE_P"));
+        case PM_PACK_SIZE_NA:
+            return ID2SYM(rb_intern("SIZE_NA"));
+        default:
+            return Qnil;
+    }
+}
+
+static VALUE
+pack_length_type_to_symbol(pm_pack_length_type length_type) {
+    switch (length_type) {
+        case PM_PACK_LENGTH_FIXED:
+            return ID2SYM(rb_intern("LENGTH_FIXED"));
+        case PM_PACK_LENGTH_MAX:
+            return ID2SYM(rb_intern("LENGTH_MAX"));
+        case PM_PACK_LENGTH_RELATIVE:
+            return ID2SYM(rb_intern("LENGTH_RELATIVE"));
+        case PM_PACK_LENGTH_NA:
+            return ID2SYM(rb_intern("LENGTH_NA"));
+        default:
+            return Qnil;
+    }
+}
+
+static VALUE
+pack_encoding_to_ruby(pm_pack_encoding encoding) {
+    int index;
+    switch (encoding) {
+        case PM_PACK_ENCODING_ASCII_8BIT:
+            index = rb_ascii8bit_encindex();
+            break;
+        case PM_PACK_ENCODING_US_ASCII:
+            index = rb_usascii_encindex();
+            break;
+        case PM_PACK_ENCODING_UTF_8:
+            index = rb_utf8_encindex();
+            break;
+        default:
+            return Qnil;
+    }
+    return rb_enc_from_encoding(rb_enc_from_index(index));
+}
+
+/**
+ * call-seq:
+ *   Pack::parse(version, variant, source) -> Format
+ *
+ * Parse the given source and return a format object.
+ */
+static VALUE
+pack_parse(VALUE self, VALUE version_symbol, VALUE variant_symbol, VALUE format_string) {
+    if (version_symbol != v3_2_0_symbol) {
+        rb_raise(rb_eArgError, "invalid version");
+    }
+
+    pm_pack_variant variant;
+    if (variant_symbol == pack_symbol) {
+        variant = PM_PACK_VARIANT_PACK;
+    } else if (variant_symbol == unpack_symbol) {
+        variant = PM_PACK_VARIANT_UNPACK;
+    } else {
+        rb_raise(rb_eArgError, "invalid variant");
+    }
+
+    StringValue(format_string);
+
+    const char *format = RSTRING_PTR(format_string);
+    const char *format_end = format + RSTRING_LEN(format_string);
+    pm_pack_encoding encoding = PM_PACK_ENCODING_START;
+
+    VALUE directives_array = rb_ary_new();
+
+    while (format < format_end) {
+        pm_pack_type type;
+        pm_pack_signed signed_type;
+        pm_pack_endian endian;
+        pm_pack_size size;
+        pm_pack_length_type length_type;
+        uint64_t length;
+
+        const char *directive_start = format;
+
+        pm_pack_result parse_result = pm_pack_parse(variant, &format, format_end, &type, &signed_type, &endian,
+                                                    &size, &length_type, &length, &encoding);
+
+        const char *directive_end = format;
+
+        switch (parse_result) {
+            case PM_PACK_OK:
+                break;
+            case PM_PACK_ERROR_UNSUPPORTED_DIRECTIVE:
+                rb_raise(rb_eArgError, "unsupported directive");
+            case PM_PACK_ERROR_UNKNOWN_DIRECTIVE:
+                rb_raise(rb_eArgError, "unsupported directive");
+            case PM_PACK_ERROR_LENGTH_TOO_BIG:
+                rb_raise(rb_eRangeError, "pack length too big");
+            case PM_PACK_ERROR_BANG_NOT_ALLOWED:
+                rb_raise(rb_eRangeError, "bang not allowed");
+            case PM_PACK_ERROR_DOUBLE_ENDIAN:
+                rb_raise(rb_eRangeError, "double endian");
+            default:
+                rb_bug("parse result");
+        }
+
+        if (type == PM_PACK_END) {
+            break;
+        }
+
+        VALUE directive_args[9] = {
+            version_symbol,
+            variant_symbol,
+            rb_usascii_str_new(directive_start, directive_end - directive_start),
+            pack_type_to_symbol(type),
+            pack_signed_to_symbol(signed_type),
+            pack_endian_to_symbol(endian),
+            pack_size_to_symbol(size),
+            pack_length_type_to_symbol(length_type),
+            UINT64T2NUM(length)
+        };
+
+        rb_ary_push(directives_array, rb_class_new_instance(9, directive_args, rb_cPrismPackDirective));
+    }
+
+    VALUE format_args[2];
+    format_args[0] = directives_array;
+    format_args[1] = pack_encoding_to_ruby(encoding);
+    return rb_class_new_instance(2, format_args, rb_cPrismPackFormat);
+}
+
+/**
+ * The function that gets called when Ruby initializes the prism extension.
+ */
+void
+Init_prism_pack(void) {
+    rb_cPrism = rb_define_module("Prism");
+    rb_cPrismPack = rb_define_module_under(rb_cPrism, "Pack");
+    rb_cPrismPackDirective = rb_define_class_under(rb_cPrismPack, "Directive", rb_cObject);
+    rb_cPrismPackFormat = rb_define_class_under(rb_cPrismPack, "Format", rb_cObject);
+    rb_define_singleton_method(rb_cPrismPack, "parse", pack_parse, 3);
+
+    v3_2_0_symbol = ID2SYM(rb_intern("v3_2_0"));
+    pack_symbol = ID2SYM(rb_intern("pack"));
+    unpack_symbol = ID2SYM(rb_intern("unpack"));
+}
+
+#endif
diff --git a/prism/config.yml b/prism/config.yml
new file mode 100644
index 00000000000000..cb154500b3fa09
--- /dev/null
+++ b/prism/config.yml
@@ -0,0 +1,4516 @@
+errors:
+  - ALIAS_ARGUMENT
+  - ALIAS_ARGUMENT_NUMBERED_REFERENCE
+  - AMPAMPEQ_MULTI_ASSIGN
+  - ARGUMENT_AFTER_BLOCK
+  - ARGUMENT_AFTER_FORWARDING_ELLIPSES
+  - ARGUMENT_BARE_HASH
+  - ARGUMENT_BLOCK_FORWARDING
+  - ARGUMENT_BLOCK_MULTI
+  - ARGUMENT_CONFLICT_AMPERSAND
+  - ARGUMENT_CONFLICT_STAR
+  - ARGUMENT_CONFLICT_STAR_STAR
+  - ARGUMENT_FORMAL_CLASS
+  - ARGUMENT_FORMAL_CONSTANT
+  - ARGUMENT_FORMAL_GLOBAL
+  - ARGUMENT_FORMAL_IVAR
+  - ARGUMENT_FORWARDING_UNBOUND
+  - ARGUMENT_NO_FORWARDING_AMPERSAND
+  - ARGUMENT_NO_FORWARDING_ELLIPSES
+  - ARGUMENT_NO_FORWARDING_STAR
+  - ARGUMENT_NO_FORWARDING_STAR_STAR
+  - ARGUMENT_SPLAT_AFTER_ASSOC_SPLAT
+  - ARGUMENT_SPLAT_AFTER_SPLAT
+  - ARGUMENT_TERM_PAREN
+  - ARGUMENT_UNEXPECTED_BLOCK
+  - ARRAY_ELEMENT
+  - ARRAY_EXPRESSION
+  - ARRAY_EXPRESSION_AFTER_STAR
+  - ARRAY_SEPARATOR
+  - ARRAY_TERM
+  - BEGIN_LONELY_ELSE
+  - BEGIN_TERM
+  - BEGIN_UPCASE_BRACE
+  - BEGIN_UPCASE_TERM
+  - BEGIN_UPCASE_TOPLEVEL
+  - BLOCK_PARAM_LOCAL_VARIABLE
+  - BLOCK_PARAM_PIPE_TERM
+  - BLOCK_TERM_BRACE
+  - BLOCK_TERM_END
+  - CANNOT_PARSE_EXPRESSION
+  - CANNOT_PARSE_STRING_PART
+  - CASE_EXPRESSION_AFTER_CASE
+  - CASE_EXPRESSION_AFTER_WHEN
+  - CASE_MATCH_MISSING_PREDICATE
+  - CASE_MISSING_CONDITIONS
+  - CASE_TERM
+  - CLASS_IN_METHOD
+  - CLASS_NAME
+  - CLASS_SUPERCLASS
+  - CLASS_TERM
+  - CLASS_UNEXPECTED_END
+  - CLASS_VARIABLE_BARE
+  - CONDITIONAL_ELSIF_PREDICATE
+  - CONDITIONAL_IF_PREDICATE
+  - CONDITIONAL_PREDICATE_TERM
+  - CONDITIONAL_TERM
+  - CONDITIONAL_TERM_ELSE
+  - CONDITIONAL_UNLESS_PREDICATE
+  - CONDITIONAL_UNTIL_PREDICATE
+  - CONDITIONAL_WHILE_PREDICATE
+  - CONSTANT_PATH_COLON_COLON_CONSTANT
+  - DEF_ENDLESS
+  - DEF_ENDLESS_SETTER
+  - DEF_NAME
+  - DEF_PARAMS_TERM
+  - DEF_PARAMS_TERM_PAREN
+  - DEF_RECEIVER
+  - DEF_RECEIVER_TERM
+  - DEF_TERM
+  - DEFINED_EXPRESSION
+  - EMBDOC_TERM
+  - EMBEXPR_END
+  - EMBVAR_INVALID
+  - END_UPCASE_BRACE
+  - END_UPCASE_TERM
+  - ESCAPE_INVALID_CONTROL
+  - ESCAPE_INVALID_CONTROL_REPEAT
+  - ESCAPE_INVALID_HEXADECIMAL
+  - ESCAPE_INVALID_META
+  - ESCAPE_INVALID_META_REPEAT
+  - ESCAPE_INVALID_UNICODE
+  - ESCAPE_INVALID_UNICODE_CM_FLAGS
+  - ESCAPE_INVALID_UNICODE_LIST
+  - ESCAPE_INVALID_UNICODE_LITERAL
+  - ESCAPE_INVALID_UNICODE_LONG
+  - ESCAPE_INVALID_UNICODE_SHORT
+  - ESCAPE_INVALID_UNICODE_TERM
+  - EXPECT_ARGUMENT
+  - EXPECT_EOL_AFTER_STATEMENT
+  - EXPECT_EXPRESSION_AFTER_AMPAMPEQ
+  - EXPECT_EXPRESSION_AFTER_COMMA
+  - EXPECT_EXPRESSION_AFTER_EQUAL
+  - EXPECT_EXPRESSION_AFTER_LESS_LESS
+  - EXPECT_EXPRESSION_AFTER_LPAREN
+  - EXPECT_EXPRESSION_AFTER_OPERATOR
+  - EXPECT_EXPRESSION_AFTER_PIPEPIPEEQ
+  - EXPECT_EXPRESSION_AFTER_QUESTION
+  - EXPECT_EXPRESSION_AFTER_SPLAT
+  - EXPECT_EXPRESSION_AFTER_SPLAT_HASH
+  - EXPECT_EXPRESSION_AFTER_STAR
+  - EXPECT_FOR_DELIMITER
+  - EXPECT_IDENT_REQ_PARAMETER
+  - EXPECT_IN_DELIMITER
+  - EXPECT_LPAREN_REQ_PARAMETER
+  - EXPECT_MESSAGE
+  - EXPECT_RBRACKET
+  - EXPECT_RPAREN
+  - EXPECT_RPAREN_AFTER_MULTI
+  - EXPECT_RPAREN_REQ_PARAMETER
+  - EXPECT_SINGLETON_CLASS_DELIMITER
+  - EXPECT_STRING_CONTENT
+  - EXPECT_WHEN_DELIMITER
+  - EXPRESSION_BARE_HASH
+  - EXPRESSION_NOT_WRITABLE
+  - EXPRESSION_NOT_WRITABLE_ENCODING
+  - EXPRESSION_NOT_WRITABLE_FALSE
+  - EXPRESSION_NOT_WRITABLE_FILE
+  - EXPRESSION_NOT_WRITABLE_LINE
+  - EXPRESSION_NOT_WRITABLE_NIL
+  - EXPRESSION_NOT_WRITABLE_NUMBERED
+  - EXPRESSION_NOT_WRITABLE_SELF
+  - EXPRESSION_NOT_WRITABLE_TRUE
+  - FLOAT_PARSE
+  - FOR_COLLECTION
+  - FOR_IN
+  - FOR_INDEX
+  - FOR_TERM
+  - GLOBAL_VARIABLE_BARE
+  - HASH_EXPRESSION_AFTER_LABEL
+  - HASH_KEY
+  - HASH_ROCKET
+  - HASH_TERM
+  - HASH_VALUE
+  - HEREDOC_IDENTIFIER
+  - HEREDOC_TERM
+  - INCOMPLETE_QUESTION_MARK
+  - INCOMPLETE_VARIABLE_CLASS
+  - INCOMPLETE_VARIABLE_CLASS_3_3
+  - INCOMPLETE_VARIABLE_INSTANCE
+  - INCOMPLETE_VARIABLE_INSTANCE_3_3
+  - INSTANCE_VARIABLE_BARE
+  - INVALID_BLOCK_EXIT
+  - INVALID_CHARACTER
+  - INVALID_COMMA
+  - INVALID_ENCODING_MAGIC_COMMENT
+  - INVALID_ESCAPE_CHARACTER
+  - INVALID_FLOAT_EXPONENT
+  - INVALID_LOCAL_VARIABLE_READ
+  - INVALID_LOCAL_VARIABLE_WRITE
+  - INVALID_MULTIBYTE_CHAR
+  - INVALID_MULTIBYTE_CHARACTER
+  - INVALID_MULTIBYTE_ESCAPE
+  - INVALID_NUMBER_BINARY
+  - INVALID_NUMBER_DECIMAL
+  - INVALID_NUMBER_FRACTION
+  - INVALID_NUMBER_HEXADECIMAL
+  - INVALID_NUMBER_OCTAL
+  - INVALID_NUMBER_UNDERSCORE_INNER
+  - INVALID_NUMBER_UNDERSCORE_TRAILING
+  - INVALID_PERCENT
+  - INVALID_PERCENT_EOF
+  - INVALID_PRINTABLE_CHARACTER
+  - INVALID_RETRY_AFTER_ELSE
+  - INVALID_RETRY_AFTER_ENSURE
+  - INVALID_RETRY_WITHOUT_RESCUE
+  - INVALID_SYMBOL
+  - INVALID_VARIABLE_GLOBAL
+  - INVALID_VARIABLE_GLOBAL_3_3
+  - INVALID_YIELD
+  - IT_NOT_ALLOWED_NUMBERED
+  - IT_NOT_ALLOWED_ORDINARY
+  - LAMBDA_OPEN
+  - LAMBDA_TERM_BRACE
+  - LAMBDA_TERM_END
+  - LIST_I_LOWER_ELEMENT
+  - LIST_I_LOWER_TERM
+  - LIST_I_UPPER_ELEMENT
+  - LIST_I_UPPER_TERM
+  - LIST_W_LOWER_ELEMENT
+  - LIST_W_LOWER_TERM
+  - LIST_W_UPPER_ELEMENT
+  - LIST_W_UPPER_TERM
+  - MALLOC_FAILED
+  - MIXED_ENCODING
+  - MODULE_IN_METHOD
+  - MODULE_NAME
+  - MODULE_TERM
+  - MULTI_ASSIGN_MULTI_SPLATS
+  - MULTI_ASSIGN_UNEXPECTED_REST
+  - NESTING_TOO_DEEP
+  - NO_LOCAL_VARIABLE
+  - NON_ASSOCIATIVE_OPERATOR
+  - NOT_EXPRESSION
+  - NUMBER_LITERAL_UNDERSCORE
+  - NUMBERED_PARAMETER_INNER_BLOCK
+  - NUMBERED_PARAMETER_IT
+  - NUMBERED_PARAMETER_ORDINARY
+  - NUMBERED_PARAMETER_OUTER_BLOCK
+  - OPERATOR_MULTI_ASSIGN
+  - OPERATOR_WRITE_ARGUMENTS
+  - OPERATOR_WRITE_BLOCK
+  - PARAMETER_ASSOC_SPLAT_MULTI
+  - PARAMETER_BLOCK_MULTI
+  - PARAMETER_CIRCULAR
+  - PARAMETER_FORWARDING_AFTER_REST
+  - PARAMETER_METHOD_NAME
+  - PARAMETER_NAME_DUPLICATED
+  - PARAMETER_NO_DEFAULT
+  - PARAMETER_NO_DEFAULT_KW
+  - PARAMETER_NUMBERED_RESERVED
+  - PARAMETER_ORDER
+  - PARAMETER_SPLAT_MULTI
+  - PARAMETER_STAR
+  - PARAMETER_UNEXPECTED_FWD
+  - PARAMETER_UNEXPECTED_NO_KW
+  - PARAMETER_WILD_LOOSE_COMMA
+  - PATTERN_ARRAY_MULTIPLE_RESTS
+  - PATTERN_CAPTURE_DUPLICATE
+  - PATTERN_EXPRESSION_AFTER_BRACKET
+  - PATTERN_EXPRESSION_AFTER_COMMA
+  - PATTERN_EXPRESSION_AFTER_HROCKET
+  - PATTERN_EXPRESSION_AFTER_IN
+  - PATTERN_EXPRESSION_AFTER_KEY
+  - PATTERN_EXPRESSION_AFTER_PAREN
+  - PATTERN_EXPRESSION_AFTER_PIN
+  - PATTERN_EXPRESSION_AFTER_PIPE
+  - PATTERN_EXPRESSION_AFTER_RANGE
+  - PATTERN_EXPRESSION_AFTER_REST
+  - PATTERN_FIND_MISSING_INNER
+  - PATTERN_HASH_IMPLICIT
+  - PATTERN_HASH_KEY
+  - PATTERN_HASH_KEY_DUPLICATE
+  - PATTERN_HASH_KEY_INTERPOLATED
+  - PATTERN_HASH_KEY_LABEL
+  - PATTERN_HASH_KEY_LOCALS
+  - PATTERN_IDENT_AFTER_HROCKET
+  - PATTERN_LABEL_AFTER_COMMA
+  - PATTERN_REST
+  - PATTERN_TERM_BRACE
+  - PATTERN_TERM_BRACKET
+  - PATTERN_TERM_PAREN
+  - PIPEPIPEEQ_MULTI_ASSIGN
+  - REGEXP_ENCODING_OPTION_MISMATCH
+  - REGEXP_INCOMPAT_CHAR_ENCODING
+  - REGEXP_INVALID_UNICODE_RANGE
+  - REGEXP_NON_ESCAPED_MBC
+  - REGEXP_PARSE_ERROR
+  - REGEXP_TERM
+  - REGEXP_UNKNOWN_OPTIONS
+  - REGEXP_UTF8_CHAR_NON_UTF8_REGEXP
+  - RESCUE_EXPRESSION
+  - RESCUE_MODIFIER_VALUE
+  - RESCUE_TERM
+  - RESCUE_VARIABLE
+  - RETURN_INVALID
+  - SCRIPT_NOT_FOUND
+  - SINGLETON_FOR_LITERALS
+  - STATEMENT_ALIAS
+  - STATEMENT_POSTEXE_END
+  - STATEMENT_PREEXE_BEGIN
+  - STATEMENT_UNDEF
+  - STRING_CONCATENATION
+  - STRING_INTERPOLATED_TERM
+  - STRING_LITERAL_EOF
+  - STRING_LITERAL_TERM
+  - SYMBOL_INVALID
+  - SYMBOL_TERM_DYNAMIC
+  - SYMBOL_TERM_INTERPOLATED
+  - TERNARY_COLON
+  - TERNARY_EXPRESSION_FALSE
+  - TERNARY_EXPRESSION_TRUE
+  - UNARY_DISALLOWED
+  - UNARY_RECEIVER
+  - UNDEF_ARGUMENT
+  - UNEXPECTED_BLOCK_ARGUMENT
+  - UNEXPECTED_INDEX_BLOCK
+  - UNEXPECTED_INDEX_KEYWORDS
+  - UNEXPECTED_LABEL
+  - UNEXPECTED_MULTI_WRITE
+  - UNEXPECTED_RANGE_OPERATOR
+  - UNEXPECTED_SAFE_NAVIGATION
+  - UNEXPECTED_TOKEN_CLOSE_CONTEXT
+  - UNEXPECTED_TOKEN_IGNORE
+  - UNTIL_TERM
+  - VOID_EXPRESSION
+  - WHILE_TERM
+  - WRITE_TARGET_IN_METHOD
+  - WRITE_TARGET_READONLY
+  - WRITE_TARGET_UNEXPECTED
+  - XSTRING_TERM
+warnings:
+  - AMBIGUOUS_BINARY_OPERATOR
+  - AMBIGUOUS_FIRST_ARGUMENT_MINUS
+  - AMBIGUOUS_FIRST_ARGUMENT_PLUS
+  - AMBIGUOUS_PREFIX_AMPERSAND
+  - AMBIGUOUS_PREFIX_STAR
+  - AMBIGUOUS_PREFIX_STAR_STAR
+  - AMBIGUOUS_SLASH
+  - COMPARISON_AFTER_COMPARISON
+  - DOT_DOT_DOT_EOL
+  - EQUAL_IN_CONDITIONAL
+  - EQUAL_IN_CONDITIONAL_3_3
+  - END_IN_METHOD
+  - DUPLICATED_HASH_KEY
+  - DUPLICATED_WHEN_CLAUSE
+  - FLOAT_OUT_OF_RANGE
+  - IGNORED_FROZEN_STRING_LITERAL
+  - INDENTATION_MISMATCH
+  - INTEGER_IN_FLIP_FLOP
+  - INVALID_CHARACTER
+  - INVALID_MAGIC_COMMENT_VALUE
+  - INVALID_NUMBERED_REFERENCE
+  - KEYWORD_EOL
+  - LITERAL_IN_CONDITION_DEFAULT
+  - LITERAL_IN_CONDITION_VERBOSE
+  - SHAREABLE_CONSTANT_VALUE_LINE
+  - SHEBANG_CARRIAGE_RETURN
+  - UNEXPECTED_CARRIAGE_RETURN
+  - UNREACHABLE_STATEMENT
+  - UNUSED_LOCAL_VARIABLE
+  - VOID_STATEMENT
+tokens:
+  - name: EOF
+    value: 1
+    comment: final token in the file
+  - name: MISSING
+    comment: "a token that was expected but not found"
+  - name: NOT_PROVIDED
+    comment: "a token that was not present but it is okay"
+  - name: AMPERSAND
+    comment: "&"
+  - name: AMPERSAND_AMPERSAND
+    comment: "&&"
+  - name: AMPERSAND_AMPERSAND_EQUAL
+    comment: "&&="
+  - name: AMPERSAND_DOT
+    comment: "&."
+  - name: AMPERSAND_EQUAL
+    comment: "&="
+  - name: BACKTICK
+    comment: "`"
+  - name: BACK_REFERENCE
+    comment: "a back reference"
+  - name: BANG
+    comment: "! or !@"
+  - name: BANG_EQUAL
+    comment: "!="
+  - name: BANG_TILDE
+    comment: "!~"
+  - name: BRACE_LEFT
+    comment: "{"
+  - name: BRACE_RIGHT
+    comment: "}"
+  - name: BRACKET_LEFT
+    comment: "["
+  - name: BRACKET_LEFT_ARRAY
+    comment: "[ for the beginning of an array"
+  - name: BRACKET_LEFT_RIGHT
+    comment: "[]"
+  - name: BRACKET_LEFT_RIGHT_EQUAL
+    comment: "[]="
+  - name: BRACKET_RIGHT
+    comment: "]"
+  - name: CARET
+    comment: "^"
+  - name: CARET_EQUAL
+    comment: "^="
+  - name: CHARACTER_LITERAL
+    comment: "a character literal"
+  - name: CLASS_VARIABLE
+    comment: "a class variable"
+  - name: COLON
+    comment: ":"
+  - name: COLON_COLON
+    comment: "::"
+  - name: COMMA
+    comment: ","
+  - name: COMMENT
+    comment: "a comment"
+  - name: CONSTANT
+    comment: "a constant"
+  - name: DOT
+    comment: "the . call operator"
+  - name: DOT_DOT
+    comment: "the .. range operator"
+  - name: DOT_DOT_DOT
+    comment: "the ... range operator or forwarding parameter"
+  - name: EMBDOC_BEGIN
+    comment: "=begin"
+  - name: EMBDOC_END
+    comment: "=end"
+  - name: EMBDOC_LINE
+    comment: "a line inside of embedded documentation"
+  - name: EMBEXPR_BEGIN
+    comment: "#{"
+  - name: EMBEXPR_END
+    comment: "}"
+  - name: EMBVAR
+    comment: "#"
+  - name: EQUAL
+    comment: "="
+  - name: EQUAL_EQUAL
+    comment: "=="
+  - name: EQUAL_EQUAL_EQUAL
+    comment: "==="
+  - name: EQUAL_GREATER
+    comment: "=>"
+  - name: EQUAL_TILDE
+    comment: "=~"
+  - name: FLOAT
+    comment: "a floating point number"
+  - name: FLOAT_IMAGINARY
+    comment: "a floating pointer number with an imaginary suffix"
+  - name: FLOAT_RATIONAL
+    comment: "a floating pointer number with a rational suffix"
+  - name: FLOAT_RATIONAL_IMAGINARY
+    comment: "a floating pointer number with a rational and imaginary suffix"
+  - name: GLOBAL_VARIABLE
+    comment: "a global variable"
+  - name: GREATER
+    comment: ">"
+  - name: GREATER_EQUAL
+    comment: ">="
+  - name: GREATER_GREATER
+    comment: ">>"
+  - name: GREATER_GREATER_EQUAL
+    comment: ">>="
+  - name: HEREDOC_END
+    comment: "the end of a heredoc"
+  - name: HEREDOC_START
+    comment: "the start of a heredoc"
+  - name: IDENTIFIER
+    comment: "an identifier"
+  - name: IGNORED_NEWLINE
+    comment: "an ignored newline"
+  - name: INSTANCE_VARIABLE
+    comment: "an instance variable"
+  - name: INTEGER
+    comment: "an integer (any base)"
+  - name: INTEGER_IMAGINARY
+    comment: "an integer with an imaginary suffix"
+  - name: INTEGER_RATIONAL
+    comment: "an integer with a rational suffix"
+  - name: INTEGER_RATIONAL_IMAGINARY
+    comment: "an integer with a rational and imaginary suffix"
+  - name: KEYWORD_ALIAS
+    comment: "alias"
+  - name: KEYWORD_AND
+    comment: "and"
+  - name: KEYWORD_BEGIN
+    comment: "begin"
+  - name: KEYWORD_BEGIN_UPCASE
+    comment: "BEGIN"
+  - name: KEYWORD_BREAK
+    comment: "break"
+  - name: KEYWORD_CASE
+    comment: "case"
+  - name: KEYWORD_CLASS
+    comment: "class"
+  - name: KEYWORD_DEF
+    comment: "def"
+  - name: KEYWORD_DEFINED
+    comment: "defined?"
+  - name: KEYWORD_DO
+    comment: "do"
+  - name: KEYWORD_DO_LOOP
+    comment: "do keyword for a predicate in a while, until, or for loop"
+  - name: KEYWORD_ELSE
+    comment: "else"
+  - name: KEYWORD_ELSIF
+    comment: "elsif"
+  - name: KEYWORD_END
+    comment: "end"
+  - name: KEYWORD_END_UPCASE
+    comment: "END"
+  - name: KEYWORD_ENSURE
+    comment: "ensure"
+  - name: KEYWORD_FALSE
+    comment: "false"
+  - name: KEYWORD_FOR
+    comment: "for"
+  - name: KEYWORD_IF
+    comment: "if"
+  - name: KEYWORD_IF_MODIFIER
+    comment: "if in the modifier form"
+  - name: KEYWORD_IN
+    comment: "in"
+  - name: KEYWORD_MODULE
+    comment: "module"
+  - name: KEYWORD_NEXT
+    comment: "next"
+  - name: KEYWORD_NIL
+    comment: "nil"
+  - name: KEYWORD_NOT
+    comment: "not"
+  - name: KEYWORD_OR
+    comment: "or"
+  - name: KEYWORD_REDO
+    comment: "redo"
+  - name: KEYWORD_RESCUE
+    comment: "rescue"
+  - name: KEYWORD_RESCUE_MODIFIER
+    comment: "rescue in the modifier form"
+  - name: KEYWORD_RETRY
+    comment: "retry"
+  - name: KEYWORD_RETURN
+    comment: "return"
+  - name: KEYWORD_SELF
+    comment: "self"
+  - name: KEYWORD_SUPER
+    comment: "super"
+  - name: KEYWORD_THEN
+    comment: "then"
+  - name: KEYWORD_TRUE
+    comment: "true"
+  - name: KEYWORD_UNDEF
+    comment: "undef"
+  - name: KEYWORD_UNLESS
+    comment: "unless"
+  - name: KEYWORD_UNLESS_MODIFIER
+    comment: "unless in the modifier form"
+  - name: KEYWORD_UNTIL
+    comment: "until"
+  - name: KEYWORD_UNTIL_MODIFIER
+    comment: "until in the modifier form"
+  - name: KEYWORD_WHEN
+    comment: "when"
+  - name: KEYWORD_WHILE
+    comment: "while"
+  - name: KEYWORD_WHILE_MODIFIER
+    comment: "while in the modifier form"
+  - name: KEYWORD_YIELD
+    comment: "yield"
+  - name: KEYWORD___ENCODING__
+    comment: "__ENCODING__"
+  - name: KEYWORD___FILE__
+    comment: "__FILE__"
+  - name: KEYWORD___LINE__
+    comment: "__LINE__"
+  - name: LABEL
+    comment: "a label"
+  - name: LABEL_END
+    comment: "the end of a label"
+  - name: LAMBDA_BEGIN
+    comment: "{"
+  - name: LESS
+    comment: "<"
+  - name: LESS_EQUAL
+    comment: "<="
+  - name: LESS_EQUAL_GREATER
+    comment: "<=>"
+  - name: LESS_LESS
+    comment: "<<"
+  - name: LESS_LESS_EQUAL
+    comment: "<<="
+  - name: METHOD_NAME
+    comment: "a method name"
+  - name: MINUS
+    comment: "-"
+  - name: MINUS_EQUAL
+    comment: "-="
+  - name: MINUS_GREATER
+    comment: "->"
+  - name: NEWLINE
+    comment: "a newline character outside of other tokens"
+  - name: NUMBERED_REFERENCE
+    comment: "a numbered reference to a capture group in the previous regular expression match"
+  - name: PARENTHESIS_LEFT
+    comment: "("
+  - name: PARENTHESIS_LEFT_PARENTHESES
+    comment: "( for a parentheses node"
+  - name: PARENTHESIS_RIGHT
+    comment: ")"
+  - name: PERCENT
+    comment: "%"
+  - name: PERCENT_EQUAL
+    comment: "%="
+  - name: PERCENT_LOWER_I
+    comment: "%i"
+  - name: PERCENT_LOWER_W
+    comment: "%w"
+  - name: PERCENT_LOWER_X
+    comment: "%x"
+  - name: PERCENT_UPPER_I
+    comment: "%I"
+  - name: PERCENT_UPPER_W
+    comment: "%W"
+  - name: PIPE
+    comment: "|"
+  - name: PIPE_EQUAL
+    comment: "|="
+  - name: PIPE_PIPE
+    comment: "||"
+  - name: PIPE_PIPE_EQUAL
+    comment: "||="
+  - name: PLUS
+    comment: "+"
+  - name: PLUS_EQUAL
+    comment: "+="
+  - name: QUESTION_MARK
+    comment: "?"
+  - name: REGEXP_BEGIN
+    comment: "the beginning of a regular expression"
+  - name: REGEXP_END
+    comment: "the end of a regular expression"
+  - name: SEMICOLON
+    comment: ";"
+  - name: SLASH
+    comment: "/"
+  - name: SLASH_EQUAL
+    comment: "/="
+  - name: STAR
+    comment: "*"
+  - name: STAR_EQUAL
+    comment: "*="
+  - name: STAR_STAR
+    comment: "**"
+  - name: STAR_STAR_EQUAL
+    comment: "**="
+  - name: STRING_BEGIN
+    comment: "the beginning of a string"
+  - name: STRING_CONTENT
+    comment: "the contents of a string"
+  - name: STRING_END
+    comment: "the end of a string"
+  - name: SYMBOL_BEGIN
+    comment: "the beginning of a symbol"
+  - name: TILDE
+    comment: "~ or ~@"
+  - name: UAMPERSAND
+    comment: "unary &"
+  - name: UCOLON_COLON
+    comment: "unary ::"
+  - name: UDOT_DOT
+    comment: "unary .. operator"
+  - name: UDOT_DOT_DOT
+    comment: "unary ... operator"
+  - name: UMINUS
+    comment: "-@"
+  - name: UMINUS_NUM
+    comment: "-@ for a number"
+  - name: UPLUS
+    comment: "+@"
+  - name: USTAR
+    comment: "unary *"
+  - name: USTAR_STAR
+    comment: "unary **"
+  - name: WORDS_SEP
+    comment: "a separator between words in a list"
+  - name: __END__
+    comment: "marker for the point in the file at which the parser should stop"
+flags:
+  - name: ArgumentsNodeFlags
+    values:
+      - name: CONTAINS_FORWARDING
+        comment: "if the arguments contain forwarding"
+      - name: CONTAINS_KEYWORDS
+        comment: "if the arguments contain keywords"
+      - name: CONTAINS_KEYWORD_SPLAT
+        comment: "if the arguments contain a keyword splat"
+      - name: CONTAINS_SPLAT
+        comment: "if the arguments contain a splat"
+      - name: CONTAINS_MULTIPLE_SPLATS
+        comment: "if the arguments contain multiple splats"
+    comment: Flags for arguments nodes.
+  - name: ArrayNodeFlags
+    values:
+      - name: CONTAINS_SPLAT
+        comment: "if array contains splat nodes"
+    comment: Flags for array nodes.
+  - name: CallNodeFlags
+    values:
+      - name: SAFE_NAVIGATION
+        comment: "&. operator"
+      - name: VARIABLE_CALL
+        comment: "a call that could have been a local variable"
+      - name: ATTRIBUTE_WRITE
+        comment: "a call that is an attribute write, so the value being written should be returned"
+      - name: IGNORE_VISIBILITY
+        comment: "a call that ignores method visibility"
+    comment: Flags for call nodes.
+  - name: EncodingFlags
+    values:
+      - name: FORCED_UTF8_ENCODING
+        comment: "internal bytes forced the encoding to UTF-8"
+      - name: FORCED_BINARY_ENCODING
+        comment: "internal bytes forced the encoding to binary"
+    comment: Flags for nodes that have unescaped content.
+  - name: IntegerBaseFlags
+    values:
+      - name: BINARY
+        comment: "0b prefix"
+      - name: DECIMAL
+        comment: "0d or no prefix"
+      - name: OCTAL
+        comment: "0o or 0 prefix"
+      - name: HEXADECIMAL
+        comment: "0x prefix"
+    comment: Flags for integer nodes that correspond to the base of the integer.
+  - name: InterpolatedStringNodeFlags
+    values:
+      - name: FROZEN
+        comment: "frozen by virtue of a `frozen_string_literal: true` comment or `--enable-frozen-string-literal`; only for adjacent string literals like `'a' 'b'`"
+      - name: MUTABLE
+        comment: "mutable by virtue of a `frozen_string_literal: false` comment or `--disable-frozen-string-literal`; only for adjacent string literals like `'a' 'b'`"
+    comment: Flags for interpolated string nodes that indicated mutability if they are also marked as literals.
+  - name: KeywordHashNodeFlags
+    values:
+      - name: SYMBOL_KEYS
+        comment: "a keyword hash which only has `AssocNode` elements all with symbol keys, which means the elements can be treated as keyword arguments"
+    comment: Flags for keyword hash nodes.
+  - name: LoopFlags
+    values:
+      - name: BEGIN_MODIFIER
+        comment: "a loop after a begin statement, so the body is executed first before the condition"
+    comment: Flags for while and until loop nodes.
+  - name: ParameterFlags
+    values:
+      - name: REPEATED_PARAMETER
+        comment: "a parameter name that has been repeated in the method signature"
+    comment: Flags for parameter nodes.
+  - name: ParenthesesNodeFlags
+    values:
+      - name: MULTIPLE_STATEMENTS
+        comment: "parentheses that contain multiple potentially void statements"
+    comment: Flags for parentheses nodes.
+  - name: RangeFlags
+    values:
+      - name: EXCLUDE_END
+        comment: "... operator"
+    comment: Flags for range and flip-flop nodes.
+  - name: RegularExpressionFlags
+    values:
+      - name: IGNORE_CASE
+        comment: "i - ignores the case of characters when matching"
+      - name: EXTENDED
+        comment: "x - ignores whitespace and allows comments in regular expressions"
+      - name: MULTI_LINE
+        comment: "m - allows $ to match the end of lines within strings"
+      - name: ONCE
+        comment: "o - only interpolates values into the regular expression once"
+      - name: EUC_JP
+        comment: "e - forces the EUC-JP encoding"
+      - name: ASCII_8BIT
+        comment: "n - forces the ASCII-8BIT encoding"
+      - name: WINDOWS_31J
+        comment: "s - forces the Windows-31J encoding"
+      - name: UTF_8
+        comment: "u - forces the UTF-8 encoding"
+      - name: FORCED_UTF8_ENCODING
+        comment: "internal bytes forced the encoding to UTF-8"
+      - name: FORCED_BINARY_ENCODING
+        comment: "internal bytes forced the encoding to binary"
+      - name: FORCED_US_ASCII_ENCODING
+        comment: "internal bytes forced the encoding to US-ASCII"
+    comment: Flags for regular expression and match last line nodes.
+  - name: ShareableConstantNodeFlags
+    values:
+      - name: LITERAL
+        comment: "constant writes that should be modified with shareable constant value literal"
+      - name: EXPERIMENTAL_EVERYTHING
+        comment: "constant writes that should be modified with shareable constant value experimental everything"
+      - name: EXPERIMENTAL_COPY
+        comment: "constant writes that should be modified with shareable constant value experimental copy"
+    comment: Flags for shareable constant nodes.
+  - name: StringFlags
+    values:
+      - name: FORCED_UTF8_ENCODING
+        comment: "internal bytes forced the encoding to UTF-8"
+      - name: FORCED_BINARY_ENCODING
+        comment: "internal bytes forced the encoding to binary"
+      - name: FROZEN
+        comment: "frozen by virtue of a `frozen_string_literal: true` comment or `--enable-frozen-string-literal`"
+      - name: MUTABLE
+        comment: "mutable by virtue of a `frozen_string_literal: false` comment or `--disable-frozen-string-literal`"
+    comment: Flags for string nodes.
+  - name: SymbolFlags
+    values:
+      - name: FORCED_UTF8_ENCODING
+        comment: "internal bytes forced the encoding to UTF-8"
+      - name: FORCED_BINARY_ENCODING
+        comment: "internal bytes forced the encoding to binary"
+      - name: FORCED_US_ASCII_ENCODING
+        comment: "internal bytes forced the encoding to US-ASCII"
+    comment: Flags for symbol nodes.
+nodes:
+  - name: AliasGlobalVariableNode
+    fields:
+      - name: new_name
+        type: node
+        kind:
+          - GlobalVariableReadNode
+          - BackReferenceReadNode
+          - NumberedReferenceReadNode
+        comment: |
+          Represents the new name of the global variable that can be used after aliasing.
+
+              alias $foo $bar
+                    ^^^^
+      - name: old_name
+        type: node
+        kind:
+          - GlobalVariableReadNode
+          - BackReferenceReadNode
+          - NumberedReferenceReadNode
+          - on error: SymbolNode # alias $a b
+          - on error: MissingNode # alias $a 42
+        comment: |
+          Represents the old name of the global variable that can be used before aliasing.
+
+              alias $foo $bar
+                         ^^^^
+      - name: keyword_loc
+        type: location
+        comment: |
+          The location of the `alias` keyword.
+
+              alias $foo $bar
+              ^^^^^
+    comment: |
+      Represents the use of the `alias` keyword to alias a global variable.
+
+          alias $foo $bar
+          ^^^^^^^^^^^^^^^
+  - name: AliasMethodNode
+    fields:
+      - name: new_name
+        type: node
+        kind:
+          - SymbolNode
+          - InterpolatedSymbolNode
+        comment: |
+          Represents the new name of the method that will be aliased.
+
+              alias foo bar
+                    ^^^
+
+              alias :foo :bar
+                    ^^^^
+
+              alias :"#{foo}" :"#{bar}"
+                    ^^^^^^^^^
+      - name: old_name
+        type: node
+        kind:
+          - SymbolNode
+          - InterpolatedSymbolNode
+          - on error: GlobalVariableReadNode # alias a $b
+          - on error: MissingNode # alias a 42
+        comment: |
+          Represents the old name of the method that will be aliased.
+
+              alias foo bar
+                        ^^^
+
+              alias :foo :bar
+                         ^^^^
+
+              alias :"#{foo}" :"#{bar}"
+                              ^^^^^^^^^
+      - name: keyword_loc
+        type: location
+        comment: |
+          Represents the location of the `alias` keyword.
+
+              alias foo bar
+              ^^^^^
+    comment: |
+      Represents the use of the `alias` keyword to alias a method.
+
+          alias foo bar
+          ^^^^^^^^^^^^^
+  - name: AlternationPatternNode
+    fields:
+      - name: left
+        type: node
+        kind: pattern expression
+        comment: |
+          Represents the left side of the expression.
+
+              foo => bar | baz
+                     ^^^
+      - name: right
+        type: node
+        kind: pattern expression
+        comment: |
+          Represents the right side of the expression.
+
+              foo => bar | baz
+                           ^^^
+      - name: operator_loc
+        type: location
+        comment: |
+          Represents the alternation operator location.
+
+              foo => bar | baz
+                         ^
+    comment: |
+      Represents an alternation pattern in pattern matching.
+
+          foo => bar | baz
+                 ^^^^^^^^^
+  - name: AndNode
+    fields:
+      - name: left
+        type: node
+        kind: non-void expression
+        comment: |
+          Represents the left side of the expression. It can be any [non-void expression](https://github.com/ruby/prism/blob/main/docs/parsing_rules.md#non-void-expression).
+
+              left and right
+              ^^^^
+
+              1 && 2
+              ^
+      - name: right
+        type: node
+        kind: Node
+        comment: |
+          Represents the right side of the expression.
+
+              left && right
+                      ^^^^^
+
+              1 and 2
+                    ^
+      - name: operator_loc
+        type: location
+        comment: |
+          The location of the `and` keyword or the `&&` operator.
+
+              left and right
+                   ^^^
+    comment: |
+      Represents the use of the `&&` operator or the `and` keyword.
+
+          left and right
+          ^^^^^^^^^^^^^^
+  - name: ArgumentsNode
+    flags: ArgumentsNodeFlags
+    fields:
+      - name: arguments
+        type: node[]
+        kind: non-void expression
+        comment: |
+          The list of arguments, if present. These can be any [non-void expressions](https://github.com/ruby/prism/blob/main/docs/parsing_rules.md#non-void-expression).
+
+              foo(bar, baz)
+                  ^^^^^^^^
+    comment: |
+      Represents a set of arguments to a method or a keyword.
+
+          return foo, bar, baz
+                 ^^^^^^^^^^^^^
+  - name: ArrayNode
+    flags: ArrayNodeFlags
+    fields:
+      - name: elements
+        type: node[]
+        kind: non-void expression
+        comment: Represent the list of zero or more [non-void expressions](https://github.com/ruby/prism/blob/main/docs/parsing_rules.md#non-void-expression) within the array.
+      - name: opening_loc
+        type: location?
+        comment: |
+          Represents the optional source location for the opening token.
+
+              [1,2,3]                 # "["
+              %w[foo bar baz]         # "%w["
+              %I(apple orange banana) # "%I("
+              foo = 1, 2, 3           # nil
+      - name: closing_loc
+        type: location?
+        comment: |
+          Represents the optional source location for the closing token.
+
+              [1,2,3]                 # "]"
+              %w[foo bar baz]         # "]"
+              %I(apple orange banana) # ")"
+              foo = 1, 2, 3           # nil
+    comment: |
+      Represents an array literal. This can be a regular array using brackets or a special array using % like %w or %i.
+
+          [1, 2, 3]
+          ^^^^^^^^^
+  - name: ArrayPatternNode
+    fields:
+      - name: constant
+        type: node?
+        kind:
+          - ConstantReadNode
+          - ConstantPathNode
+      - name: requireds
+        type: node[]
+        kind: pattern expression
+        comment: |
+          Represents the required elements of the array pattern.
+
+              foo in [1, 2]
+                      ^  ^
+      - name: rest
+        type: node?
+        kind: pattern expression
+        comment: |
+          Represents the rest element of the array pattern.
+
+              foo in *bar
+                     ^^^^
+      - name: posts
+        type: node[]
+        kind: pattern expression
+        comment: |
+          Represents the elements after the rest element of the array pattern.
+
+              foo in *bar, baz
+                           ^^^
+      - name: opening_loc
+        type: location?
+        comment: |
+          Represents the opening location of the array pattern.
+
+              foo in [1, 2]
+                     ^
+      - name: closing_loc
+        type: location?
+        comment: |
+          Represents the closing location of the array pattern.
+
+              foo in [1, 2]
+                          ^
+    comment: |
+      Represents an array pattern in pattern matching.
+
+          foo in 1, 2
+          ^^^^^^^^^^^
+
+          foo in [1, 2]
+          ^^^^^^^^^^^^^
+
+          foo in *bar
+          ^^^^^^^^^^^
+
+          foo in Bar[]
+          ^^^^^^^^^^^^
+
+          foo in Bar[1, 2, 3]
+          ^^^^^^^^^^^^^^^^^^^
+  - name: AssocNode
+    fields:
+      - name: key
+        type: node
+        kind: non-void expression
+        comment: |
+          The key of the association. This can be any [non-void expression](https://github.com/ruby/prism/blob/main/docs/parsing_rules.md#non-void-expression).
+
+              { a: b }
+                ^
+
+              { foo => bar }
+                ^^^
+
+              { def a; end => 1 }
+                ^^^^^^^^^^
+      - name: value
+        type: node
+        kind: non-void expression
+        comment: |
+          The value of the association, if present. This can be any [non-void expression](https://github.com/ruby/prism/blob/main/docs/parsing_rules.md#non-void-expression).
+
+              { foo => bar }
+                       ^^^
+
+              { x: 1 }
+                   ^
+      - name: operator_loc
+        type: location?
+        comment: |
+          The location of the `=>` operator, if present.
+
+              { foo => bar }
+                    ^^
+    comment: |
+      Represents a hash key/value pair.
+
+          { a => b }
+            ^^^^^^
+  - name: AssocSplatNode
+    fields:
+      - name: value
+        type: node?
+        kind: non-void expression
+        comment: |
+          The value to be splatted, if present. Will be missing when keyword rest argument forwarding is used.
+
+              { **foo }
+                  ^^^
+      - name: operator_loc
+        type: location
+        comment: |
+          The location of the `**` operator.
+
+              { **x }
+                ^^
+    comment: |
+      Represents a splat in a hash literal.
+
+          { **foo }
+            ^^^^^
+  - name: BackReferenceReadNode
+    fields:
+      - name: name
+        type: constant
+        comment: |
+          The name of the back-reference variable, including the leading `$`.
+
+              $& # name `:$&`
+
+              $+ # name `:$+`
+    comment: |
+      Represents reading a reference to a field in the previous match.
+
+          $'
+          ^^
+  - name: BeginNode
+    fields:
+      - name: begin_keyword_loc
+        type: location?
+        comment: |
+          Represents the location of the `begin` keyword.
+
+              begin x end
+              ^^^^^
+      - name: statements
+        type: node?
+        kind: StatementsNode
+        comment: |
+          Represents the statements within the begin block.
+
+              begin x end
+                    ^
+      - name: rescue_clause
+        type: node?
+        kind: RescueNode
+        comment: |
+          Represents the rescue clause within the begin block.
+
+              begin x; rescue y; end
+                       ^^^^^^^^
+      - name: else_clause
+        type: node?
+        kind: ElseNode
+        comment: |
+          Represents the else clause within the begin block.
+
+              begin x; rescue y; else z; end
+                                 ^^^^^^
+      - name: ensure_clause
+        type: node?
+        kind: EnsureNode
+        comment: |
+          Represents the ensure clause within the begin block.
+
+              begin x; ensure y; end
+                       ^^^^^^^^
+      - name: end_keyword_loc
+        type: location?
+        comment: |
+          Represents the location of the `end` keyword.
+
+              begin x end
+                      ^^^
+    newline: false
+    comment: |
+      Represents a begin statement.
+
+          begin
+            foo
+          end
+          ^^^^^
+  - name: BlockArgumentNode
+    fields:
+      - name: expression
+        type: node?
+        kind: non-void expression
+        comment: |
+          The expression that is being passed as a block argument. This can be any [non-void expression](https://github.com/ruby/prism/blob/main/docs/parsing_rules.md#non-void-expression).
+
+              foo(&args)
+                  ^^^^^
+      - name: operator_loc
+        type: location
+        comment: |
+          Represents the location of the `&` operator.
+
+              foo(&args)
+                  ^
+    comment: |
+      Represents a block argument using `&`.
+
+          bar(&args)
+          ^^^^^^^^^^
+  - name: BlockLocalVariableNode
+    flags: ParameterFlags
+    fields:
+      - name: name
+        type: constant
+        comment: |
+          The name of the block local variable.
+
+              a { |; b| } # name `:b`
+                     ^
+    comment: |
+      Represents a block local variable.
+
+          a { |; b| }
+                 ^
+  - name: BlockNode
+    fields:
+      - name: locals
+        type: constant[]
+        comment: |
+          The local variables declared in the block.
+
+              [1, 2, 3].each { |i| puts x } # locals: [:i]
+                                ^
+      - name: parameters
+        type: node?
+        kind:
+          - BlockParametersNode
+          - NumberedParametersNode
+          - ItParametersNode
+        comment: |
+          The parameters of the block.
+
+              [1, 2, 3].each { |i| puts x }
+                               ^^^
+              [1, 2, 3].each { puts _1 }
+                             ^^^^^^^^^^^
+              [1, 2, 3].each { puts it }
+                             ^^^^^^^^^^^
+      - name: body
+        type: node?
+        kind:
+          - StatementsNode
+          - BeginNode
+        comment: |
+          The body of the block.
+
+              [1, 2, 3].each { |i| puts x }
+                                   ^^^^^^
+      - name: opening_loc
+        type: location
+        comment: |
+          Represents the location of the opening `|`.
+
+              [1, 2, 3].each { |i| puts x }
+                               ^
+      - name: closing_loc
+        type: location
+        comment: |
+          Represents the location of the closing `|`.
+
+              [1, 2, 3].each { |i| puts x }
+                                 ^
+    comment: |
+      Represents a block of ruby code.
+
+          [1, 2, 3].each { |i| puts x }
+                         ^^^^^^^^^^^^^^
+  - name: BlockParameterNode
+    flags: ParameterFlags
+    fields:
+      - name: name
+        type: constant?
+        comment: |
+          The name of the block parameter.
+
+              def a(&b) # name `:b`
+                     ^
+              end
+      - name: name_loc
+        type: location?
+        comment: |
+          Represents the location of the block parameter name.
+
+              def a(&b)
+                     ^
+      - name: operator_loc
+        type: location
+        comment: |
+          Represents the location of the `&` operator.
+
+              def a(&b)
+                    ^
+              end
+    comment: |
+      Represents a block parameter of a method, block, or lambda definition.
+
+          def a(&b)
+                ^^
+          end
+  - name: BlockParametersNode
+    fields:
+      - name: parameters
+        type: node?
+        kind: ParametersNode
+        comment: |
+          Represents the parameters of the block.
+
+              -> (a, b = 1; local) { }
+                  ^^^^^^^^
+
+              foo do |a, b = 1; local|
+                      ^^^^^^^^
+              end
+      - name: locals
+        type: node[]
+        kind: BlockLocalVariableNode
+        comment: |
+          Represents the local variables of the block.
+
+              -> (a, b = 1; local) { }
+                            ^^^^^
+
+              foo do |a, b = 1; local|
+                                ^^^^^
+              end
+      - name: opening_loc
+        type: location?
+        comment: |
+          Represents the opening location of the block parameters.
+
+              -> (a, b = 1; local) { }
+                 ^
+
+              foo do |a, b = 1; local|
+                     ^
+              end
+      - name: closing_loc
+        type: location?
+        comment: |
+          Represents the closing location of the block parameters.
+
+              -> (a, b = 1; local) { }
+                                 ^
+
+              foo do |a, b = 1; local|
+                                     ^
+              end
+    comment: |
+      Represents a block's parameters declaration.
+
+          -> (a, b = 1; local) { }
+             ^^^^^^^^^^^^^^^^^
+
+          foo do |a, b = 1; local|
+                 ^^^^^^^^^^^^^^^^^
+          end
+  - name: BreakNode
+    fields:
+      - name: arguments
+        type: node?
+        kind: ArgumentsNode
+        comment: |
+          The arguments to the break statement, if present. These can be any [non-void expressions](https://github.com/ruby/prism/blob/main/docs/parsing_rules.md#non-void-expression).
+
+              break foo
+                    ^^^
+      - name: keyword_loc
+        type: location
+        comment: |
+          The location of the `break` keyword.
+
+              break foo
+              ^^^^^
+    comment: |
+      Represents the use of the `break` keyword.
+
+          break foo
+          ^^^^^^^^^
+  - name: CallAndWriteNode
+    flags: CallNodeFlags
+    fields:
+      - name: receiver
+        type: node?
+        kind: non-void expression
+        comment: |
+          The object that the method is being called on. This can be either `nil` or any [non-void expression](https://github.com/ruby/prism/blob/main/docs/parsing_rules.md#non-void-expression).
+
+              foo.bar &&= value
+              ^^^
+      - name: call_operator_loc
+        type: location?
+        comment: |
+          Represents the location of the call operator.
+
+              foo.bar &&= value
+                 ^
+      - name: message_loc
+        type: location?
+        comment: |
+          Represents the location of the message.
+
+              foo.bar &&= value
+                  ^^^
+      - name: read_name
+        type: constant
+        comment: |
+          Represents the name of the method being called.
+
+              foo.bar &&= value # read_name `:bar`
+                  ^^^
+      - name: write_name
+        type: constant
+        comment: |
+          Represents the name of the method being written to.
+
+              foo.bar &&= value # write_name `:bar=`
+                  ^^^
+      - name: operator_loc
+        type: location
+        comment: |
+          Represents the location of the operator.
+
+              foo.bar &&= value
+                      ^^^
+      - name: value
+        type: node
+        kind: non-void expression
+        comment: |
+          Represents the value being assigned.
+
+              foo.bar &&= value
+                          ^^^^^
+    comment: |
+      Represents the use of the `&&=` operator on a call.
+
+          foo.bar &&= value
+          ^^^^^^^^^^^^^^^^^
+  - name: CallNode
+    flags: CallNodeFlags
+    fields:
+      - name: receiver
+        type: node?
+        kind: non-void expression
+        comment: |
+          The object that the method is being called on. This can be either `nil` or any [non-void expression](https://github.com/ruby/prism/blob/main/docs/parsing_rules.md#non-void-expression).
+
+              foo.bar
+              ^^^
+
+              +foo
+               ^^^
+
+              foo + bar
+              ^^^
+      - name: call_operator_loc
+        type: location?
+        comment: |
+          Represents the location of the call operator.
+
+              foo.bar
+                 ^
+
+              foo&.bar
+                 ^^
+      - name: name
+        type: constant
+        comment: |
+          Represents the name of the method being called.
+
+              foo.bar # name `:foo`
+              ^^^
+      - name: message_loc
+        type: location?
+        comment: |
+          Represents the location of the message.
+
+              foo.bar
+                  ^^^
+      - name: opening_loc
+        type: location?
+        comment: |
+          Represents the location of the left parenthesis.
+              foo(bar)
+                 ^
+      - name: arguments
+        type: node?
+        kind: ArgumentsNode
+        comment: |
+          Represents the arguments to the method call. These can be any [non-void expressions](https://github.com/ruby/prism/blob/main/docs/parsing_rules.md#non-void-expression).
+
+              foo(bar)
+                  ^^^
+      - name: closing_loc
+        type: location?
+        comment: |
+          Represents the location of the right parenthesis.
+
+              foo(bar)
+                     ^
+      - name: block
+        type: node?
+        kind:
+          - BlockNode
+          - BlockArgumentNode
+        comment: |
+          Represents the block that is being passed to the method.
+
+              foo { |a| a }
+                  ^^^^^^^^^
+    comment: |
+      Represents a method call, in all of the various forms that can take.
+
+          foo
+          ^^^
+
+          foo()
+          ^^^^^
+
+          +foo
+          ^^^^
+
+          foo + bar
+          ^^^^^^^^^
+
+          foo.bar
+          ^^^^^^^
+
+          foo&.bar
+          ^^^^^^^^
+  - name: CallOperatorWriteNode
+    flags: CallNodeFlags
+    fields:
+      - name: receiver
+        type: node?
+        kind: non-void expression
+        comment: |
+          The object that the method is being called on. This can be either `nil` or any [non-void expressions](https://github.com/ruby/prism/blob/main/docs/parsing_rules.md#non-void-expression).
+
+              foo.bar += value
+              ^^^
+      - name: call_operator_loc
+        type: location?
+        comment: |
+          Represents the location of the call operator.
+
+              foo.bar += value
+                 ^
+      - name: message_loc
+        type: location?
+        comment: |
+          Represents the location of the message.
+
+              foo.bar += value
+                  ^^^
+      - name: read_name
+        type: constant
+        comment: |
+          Represents the name of the method being called.
+
+              foo.bar += value # read_name `:bar`
+                  ^^^
+      - name: write_name
+        type: constant
+        comment: |
+          Represents the name of the method being written to.
+
+              foo.bar += value # write_name `:bar=`
+                  ^^^
+      - name: binary_operator
+        type: constant
+        comment: |
+          Represents the binary operator being used.
+
+              foo.bar += value # binary_operator `:+`
+                      ^
+      - name: binary_operator_loc
+        type: location
+        comment: |
+          Represents the location of the binary operator.
+
+              foo.bar += value
+                      ^^
+      - name: value
+        type: node
+        kind: non-void expression
+        comment: |
+          Represents the value being assigned.
+
+              foo.bar += value
+                         ^^^^^
+    comment: |
+      Represents the use of an assignment operator on a call.
+
+          foo.bar += baz
+          ^^^^^^^^^^^^^^
+  - name: CallOrWriteNode
+    flags: CallNodeFlags
+    fields:
+      - name: receiver
+        type: node?
+        kind: non-void expression
+        comment: |
+          The object that the method is being called on. This can be either `nil` or any [non-void expressions](https://github.com/ruby/prism/blob/main/docs/parsing_rules.md#non-void-expression).
+
+              foo.bar ||= value
+              ^^^
+      - name: call_operator_loc
+        type: location?
+        comment: |
+          Represents the location of the call operator.
+
+              foo.bar ||= value
+                 ^
+      - name: message_loc
+        type: location?
+        comment: |
+          Represents the location of the message.
+
+              foo.bar ||= value
+                  ^^^
+      - name: read_name
+        type: constant
+        comment: |
+          Represents the name of the method being called.
+
+              foo.bar ||= value # read_name `:bar`
+                  ^^^
+      - name: write_name
+        type: constant
+        comment: |
+          Represents the name of the method being written to.
+
+              foo.bar ||= value # write_name `:bar=`
+                  ^^^
+      - name: operator_loc
+        type: location
+        comment: |
+          Represents the location of the operator.
+
+              foo.bar ||= value
+                      ^^^
+      - name: value
+        type: node
+        kind: non-void expression
+        comment: |
+          Represents the value being assigned.
+
+              foo.bar ||= value
+                          ^^^^^
+    comment: |
+      Represents the use of the `||=` operator on a call.
+
+          foo.bar ||= value
+          ^^^^^^^^^^^^^^^^^
+  - name: CallTargetNode
+    flags: CallNodeFlags
+    fields:
+      - name: receiver
+        type: node
+        kind: non-void expression
+        comment: |
+          The object that the method is being called on. This can be any [non-void expression](https://github.com/ruby/prism/blob/main/docs/parsing_rules.md#non-void-expression).
+
+              foo.bar = 1
+              ^^^
+      - name: call_operator_loc
+        type: location
+        comment: |
+          Represents the location of the call operator.
+
+              foo.bar = 1
+                 ^
+      - name: name
+        type: constant
+        comment: |
+          Represents the name of the method being called.
+
+              foo.bar = 1 # name `:foo`
+              ^^^
+      - name: message_loc
+        type: location
+        comment: |
+          Represents the location of the message.
+
+              foo.bar = 1
+                  ^^^
+    comment: |
+      Represents assigning to a method call.
+
+          foo.bar, = 1
+          ^^^^^^^
+
+          begin
+          rescue => foo.bar
+                    ^^^^^^^
+          end
+
+          for foo.bar in baz do end
+              ^^^^^^^
+  - name: CapturePatternNode
+    fields:
+      - name: value
+        type: node
+        kind: pattern expression
+        comment: |
+          Represents the value to capture.
+
+              foo => bar
+                     ^^^
+      - name: target
+        type: node
+        kind: LocalVariableTargetNode
+        comment: |
+          Represents the target of the capture.
+
+              foo => bar
+              ^^^
+      - name: operator_loc
+        type: location
+        comment: |
+          Represents the location of the `=>` operator.
+
+              foo => bar
+                  ^^
+    comment: |
+      Represents assigning to a local variable in pattern matching.
+
+          foo => [bar => baz]
+                 ^^^^^^^^^^^^
+  - name: CaseMatchNode
+    fields:
+      - name: predicate
+        type: node?
+        kind: non-void expression
+        comment: |
+          Represents the predicate of the case match. This can be either `nil` or any [non-void expressions](https://github.com/ruby/prism/blob/main/docs/parsing_rules.md#non-void-expression).
+
+              case true; in false; end
+              ^^^^
+      - name: conditions
+        type: node[]
+        kind: InNode
+        comment: |
+          Represents the conditions of the case match.
+
+              case true; in false; end
+                         ^^^^^^^^
+      - name: else_clause
+        type: node?
+        kind: ElseNode
+        comment: |
+          Represents the else clause of the case match.
+
+              case true; in false; else; end
+                                   ^^^^
+      - name: case_keyword_loc
+        type: location
+        comment: |
+          Represents the location of the `case` keyword.
+
+              case true; in false; end
+              ^^^^
+      - name: end_keyword_loc
+        type: location
+        comment: |
+          Represents the location of the `end` keyword.
+
+              case true; in false; end
+                                   ^^^
+    comment: |
+      Represents the use of a case statement for pattern matching.
+
+          case true
+          in false
+          end
+          ^^^^^^^^^
+  - name: CaseNode
+    fields:
+      - name: predicate
+        type: node?
+        kind: non-void expression
+        comment: |
+          Represents the predicate of the case statement. This can be either `nil` or any [non-void expressions](https://github.com/ruby/prism/blob/main/docs/parsing_rules.md#non-void-expression).
+
+              case true; when false; end
+              ^^^^
+      - name: conditions
+        type: node[]
+        kind: WhenNode
+        comment: |
+          Represents the conditions of the case statement.
+
+              case true; when false; end
+                         ^^^^^^^^^^
+      - name: else_clause
+        type: node?
+        kind: ElseNode
+        comment: |
+          Represents the else clause of the case statement.
+
+              case true; when false; else; end
+                                     ^^^^
+      - name: case_keyword_loc
+        type: location
+        comment: |
+          Represents the location of the `case` keyword.
+
+              case true; when false; end
+              ^^^^
+      - name: end_keyword_loc
+        type: location
+        comment: |
+          Represents the location of the `end` keyword.
+
+              case true; when false; end
+                                     ^^^
+    comment: |
+      Represents the use of a case statement.
+
+          case true
+          when false
+          end
+          ^^^^^^^^^^
+  - name: ClassNode
+    fields:
+      - name: locals
+        type: constant[]
+      - name: class_keyword_loc
+        type: location
+        comment: |
+          Represents the location of the `class` keyword.
+
+              class Foo end
+              ^^^^^
+      - name: constant_path
+        type: node
+        kind:
+          - ConstantReadNode
+          - ConstantPathNode
+          - on error: CallNode # class 0.X end
+      - name: inheritance_operator_loc
+        type: location?
+        comment: |
+          Represents the location of the `<` operator.
+
+              class Foo < Bar
+                        ^
+      - name: superclass
+        type: node?
+        kind: non-void expression
+        comment: |
+          Represents the superclass of the class.
+
+              class Foo < Bar
+                          ^^^
+      - name: body
+        type: node?
+        kind:
+          - StatementsNode
+          - BeginNode
+        comment: |
+          Represents the body of the class.
+
+              class Foo
+                foo
+                ^^^
+      - name: end_keyword_loc
+        type: location
+        comment: |
+          Represents the location of the `end` keyword.
+
+              class Foo end
+                        ^^^
+      - name: name
+        type: constant
+        comment: |
+          The name of the class.
+
+              class Foo end # name `:Foo`
+    comment: |
+      Represents a class declaration involving the `class` keyword.
+
+          class Foo end
+          ^^^^^^^^^^^^^
+  - name: ClassVariableAndWriteNode
+    fields:
+      - name: name
+        type: constant
+        comment: |
+          The name of the class variable, which is a `@@` followed by an [identifier](https://github.com/ruby/prism/blob/main/docs/parsing_rules.md#identifiers).
+
+              @@target &&= value # name `:@@target`
+              ^^^^^^^^
+      - name: name_loc
+        type: location
+        comment: |
+          Represents the location of the variable name.
+
+              @@target &&= value
+              ^^^^^^^^
+      - name: operator_loc
+        type: location
+        comment: |
+          Represents the location of the `&&=` operator.
+
+              @@target &&= value
+                       ^^^
+      - name: value
+        type: node
+        kind: non-void expression
+        comment: |
+          Represents the value being assigned. This can be any [non-void expression](https://github.com/ruby/prism/blob/main/docs/parsing_rules.md#non-void-expression).
+
+              @@target &&= value
+                           ^^^^^
+    comment: |
+      Represents the use of the `&&=` operator for assignment to a class variable.
+
+          @@target &&= value
+          ^^^^^^^^^^^^^^^^^^
+  - name: ClassVariableOperatorWriteNode
+    fields:
+      - name: name
+        type: constant
+      - name: name_loc
+        type: location
+      - name: binary_operator_loc
+        type: location
+      - name: value
+        type: node
+        kind: non-void expression
+      - name: binary_operator
+        type: constant
+    comment: |
+      Represents assigning to a class variable using an operator that isn't `=`.
+
+          @@target += value
+          ^^^^^^^^^^^^^^^^^
+  - name: ClassVariableOrWriteNode
+    fields:
+      - name: name
+        type: constant
+      - name: name_loc
+        type: location
+      - name: operator_loc
+        type: location
+      - name: value
+        type: node
+        kind: non-void expression
+    comment: |
+      Represents the use of the `||=` operator for assignment to a class variable.
+
+          @@target ||= value
+          ^^^^^^^^^^^^^^^^^^
+  - name: ClassVariableReadNode
+    fields:
+      - name: name
+        type: constant
+        comment: |
+          The name of the class variable, which is a `@@` followed by an [identifier](https://github.com/ruby/prism/blob/main/docs/parsing_rules.md#identifiers).
+
+              @@abc   # name `:@@abc`
+
+              @@_test # name `:@@_test`
+    comment: |
+      Represents referencing a class variable.
+
+          @@foo
+          ^^^^^
+  - name: ClassVariableTargetNode
+    fields:
+      - name: name
+        type: constant
+    comment: |
+      Represents writing to a class variable in a context that doesn't have an explicit value.
+
+          @@foo, @@bar = baz
+          ^^^^^  ^^^^^
+  - name: ClassVariableWriteNode
+    fields:
+      - name: name
+        type: constant
+        comment: |
+          The name of the class variable, which is a `@@` followed by an [identifier](https://github.com/ruby/prism/blob/main/docs/parsing_rules.md#identifiers).
+
+              @@abc = 123     # name `@@abc`
+
+              @@_test = :test # name `@@_test`
+      - name: name_loc
+        type: location
+        comment: |
+          The location of the variable name.
+
+              @@foo = :bar
+              ^^^^^
+      - name: value
+        type: node
+        kind: non-void expression
+        comment: |
+          The value to write to the class variable. This can be any [non-void expression](https://github.com/ruby/prism/blob/main/docs/parsing_rules.md#non-void-expression).
+
+              @@foo = :bar
+                      ^^^^
+
+              @@_xyz = 123
+                       ^^^
+      - name: operator_loc
+        type: location
+        comment: |
+          The location of the `=` operator.
+
+              @@foo = :bar
+                    ^
+    comment: |
+      Represents writing to a class variable.
+
+          @@foo = 1
+          ^^^^^^^^^
+  - name: ConstantAndWriteNode
+    fields:
+      - name: name
+        type: constant
+      - name: name_loc
+        type: location
+      - name: operator_loc
+        type: location
+      - name: value
+        type: node
+        kind: non-void expression
+    comment: |
+      Represents the use of the `&&=` operator for assignment to a constant.
+
+          Target &&= value
+          ^^^^^^^^^^^^^^^^
+  - name: ConstantOperatorWriteNode
+    fields:
+      - name: name
+        type: constant
+      - name: name_loc
+        type: location
+      - name: binary_operator_loc
+        type: location
+      - name: value
+        type: node
+        kind: non-void expression
+      - name: binary_operator
+        type: constant
+    comment: |
+      Represents assigning to a constant using an operator that isn't `=`.
+
+          Target += value
+          ^^^^^^^^^^^^^^^
+  - name: ConstantOrWriteNode
+    fields:
+      - name: name
+        type: constant
+      - name: name_loc
+        type: location
+      - name: operator_loc
+        type: location
+      - name: value
+        type: node
+        kind: non-void expression
+    comment: |
+      Represents the use of the `||=` operator for assignment to a constant.
+
+          Target ||= value
+          ^^^^^^^^^^^^^^^^
+  - name: ConstantPathAndWriteNode
+    fields:
+      - name: target
+        type: node
+        kind: ConstantPathNode
+      - name: operator_loc
+        type: location
+      - name: value
+        type: node
+        kind: non-void expression
+    comment: |
+      Represents the use of the `&&=` operator for assignment to a constant path.
+
+          Parent::Child &&= value
+          ^^^^^^^^^^^^^^^^^^^^^^^
+  - name: ConstantPathNode
+    fields:
+      - name: parent
+        type: node?
+        kind: non-void expression
+        comment: |
+          The left-hand node of the path, if present. It can be `nil` or any [non-void expression](https://github.com/ruby/prism/blob/main/docs/parsing_rules.md#non-void-expression). It will be `nil` when the constant lookup is at the root of the module tree.
+
+              Foo::Bar
+              ^^^
+
+              self::Test
+              ^^^^
+
+              a.b::C
+              ^^^
+      - name: name
+        type: constant?
+        comment: The name of the constant being accessed. This could be `nil` in the event of a syntax error.
+      - name: delimiter_loc
+        type: location
+        comment: |
+          The location of the `::` delimiter.
+
+              ::Foo
+              ^^
+
+              One::Two
+                 ^^
+      - name: name_loc
+        type: location
+        comment: |
+          The location of the name of the constant.
+
+              ::Foo
+                ^^^
+
+              One::Two
+                   ^^^
+    comment: |
+      Represents accessing a constant through a path of `::` operators.
+
+          Foo::Bar
+          ^^^^^^^^
+  - name: ConstantPathOperatorWriteNode
+    fields:
+      - name: target
+        type: node
+        kind: ConstantPathNode
+      - name: binary_operator_loc
+        type: location
+      - name: value
+        type: node
+        kind: non-void expression
+      - name: binary_operator
+        type: constant
+    comment: |
+      Represents assigning to a constant path using an operator that isn't `=`.
+
+          Parent::Child += value
+          ^^^^^^^^^^^^^^^^^^^^^^
+  - name: ConstantPathOrWriteNode
+    fields:
+      - name: target
+        type: node
+        kind: ConstantPathNode
+      - name: operator_loc
+        type: location
+      - name: value
+        type: node
+        kind: non-void expression
+    comment: |
+      Represents the use of the `||=` operator for assignment to a constant path.
+
+          Parent::Child ||= value
+          ^^^^^^^^^^^^^^^^^^^^^^^
+  - name: ConstantPathTargetNode
+    fields:
+      - name: parent
+        type: node?
+        kind: non-void expression
+      - name: name
+        type: constant?
+      - name: delimiter_loc
+        type: location
+      - name: name_loc
+        type: location
+    comment: |
+      Represents writing to a constant path in a context that doesn't have an explicit value.
+
+          Foo::Foo, Bar::Bar = baz
+          ^^^^^^^^  ^^^^^^^^
+  - name: ConstantPathWriteNode
+    fields:
+      - name: target
+        type: node
+        kind: ConstantPathNode
+        comment: |
+          A node representing the constant path being written to.
+
+              Foo::Bar = 1
+              ^^^^^^^^
+
+              ::Foo = :abc
+              ^^^^^
+      - name: operator_loc
+        type: location
+        comment: |
+          The location of the `=` operator.
+
+              ::ABC = 123
+                    ^
+      - name: value
+        type: node
+        kind: non-void expression
+        comment: |
+          The value to write to the constant path. It can be any [non-void expression](https://github.com/ruby/prism/blob/main/docs/parsing_rules.md#non-void-expression).
+
+              FOO::BAR = :abc
+                         ^^^^
+    comment: |
+      Represents writing to a constant path.
+
+          ::Foo = 1
+          ^^^^^^^^^
+
+          Foo::Bar = 1
+          ^^^^^^^^^^^^
+
+          ::Foo::Bar = 1
+          ^^^^^^^^^^^^^^
+  - name: ConstantReadNode
+    fields:
+      - name: name
+        type: constant
+        comment: |
+          The name of the [constant](https://github.com/ruby/prism/blob/main/docs/parsing_rules.md#constants).
+
+              X              # name `:X`
+
+              SOME_CONSTANT  # name `:SOME_CONSTANT`
+    comment: |
+      Represents referencing a constant.
+
+          Foo
+          ^^^
+  - name: ConstantTargetNode
+    fields:
+      - name: name
+        type: constant
+    comment: |
+      Represents writing to a constant in a context that doesn't have an explicit value.
+
+          Foo, Bar = baz
+          ^^^  ^^^
+  - name: ConstantWriteNode
+    fields:
+      - name: name
+        type: constant
+        comment: |
+          The name of the [constant](https://github.com/ruby/prism/blob/main/docs/parsing_rules.md#constants).
+
+              Foo = :bar # name `:Foo`
+
+              XYZ = 1    # name `:XYZ`
+      - name: name_loc
+        type: location
+        comment: |
+          The location of the constant name.
+
+              FOO = 1
+              ^^^
+      - name: value
+        type: node
+        kind: non-void expression
+        comment: |
+          The value to write to the constant. It can be any [non-void expression](https://github.com/ruby/prism/blob/main/docs/parsing_rules.md#non-void-expression).
+
+              FOO = :bar
+                    ^^^^
+
+              MyClass = Class.new
+                        ^^^^^^^^^
+      - name: operator_loc
+        type: location
+        comment: |
+          The location of the `=` operator.
+
+              FOO = :bar
+                  ^
+    comment: |
+      Represents writing to a constant.
+
+          Foo = 1
+          ^^^^^^^
+  - name: DefNode
+    fields:
+      - name: name
+        type: constant
+      - name: name_loc
+        type: location
+      - name: receiver
+        type: node?
+        kind: non-void expression
+      - name: parameters
+        type: node?
+        kind: ParametersNode
+      - name: body
+        type: node?
+        kind:
+          - StatementsNode
+          - BeginNode
+      - name: locals
+        type: constant[]
+      - name: def_keyword_loc
+        type: location
+      - name: operator_loc
+        type: location?
+      - name: lparen_loc
+        type: location?
+      - name: rparen_loc
+        type: location?
+      - name: equal_loc
+        type: location?
+      - name: end_keyword_loc
+        type: location?
+    comment: |
+      Represents a method definition.
+
+          def method
+          end
+          ^^^^^^^^^^
+  - name: DefinedNode
+    fields:
+      - name: lparen_loc
+        type: location?
+      - name: value
+        type: node
+        kind: Node # More than non-void expression as defined?(return) is allowed, yet defined?(BEGIN{}) is SyntaxError
+      - name: rparen_loc
+        type: location?
+      - name: keyword_loc
+        type: location
+    comment: |
+      Represents the use of the `defined?` keyword.
+
+          defined?(a)
+          ^^^^^^^^^^^
+  - name: ElseNode
+    fields:
+      - name: else_keyword_loc
+        type: location
+      - name: statements
+        type: node?
+        kind: StatementsNode
+      - name: end_keyword_loc
+        type: location?
+    comment: |
+      Represents an `else` clause in a `case`, `if`, or `unless` statement.
+
+          if a then b else c end
+                      ^^^^^^^^^^
+  - name: EmbeddedStatementsNode
+    fields:
+      - name: opening_loc
+        type: location
+      - name: statements
+        type: node?
+        kind: StatementsNode
+      - name: closing_loc
+        type: location
+    comment: |
+      Represents an interpolated set of statements.
+
+          "foo #{bar}"
+               ^^^^^^
+  - name: EmbeddedVariableNode
+    fields:
+      - name: operator_loc
+        type: location
+      - name: variable
+        type: node
+        kind:
+          - InstanceVariableReadNode
+          - ClassVariableReadNode
+          - GlobalVariableReadNode
+          - BackReferenceReadNode
+          - NumberedReferenceReadNode
+    comment: |
+      Represents an interpolated variable.
+
+          "foo #@bar"
+               ^^^^^
+  - name: EnsureNode
+    fields:
+      - name: ensure_keyword_loc
+        type: location
+      - name: statements
+        type: node?
+        kind: StatementsNode
+      - name: end_keyword_loc
+        type: location
+    comment: |
+      Represents an `ensure` clause in a `begin` statement.
+
+          begin
+            foo
+          ensure
+          ^^^^^^
+            bar
+          end
+  - name: FalseNode
+    comment: |
+      Represents the use of the literal `false` keyword.
+
+          false
+          ^^^^^
+  - name: FindPatternNode
+    fields:
+      - name: constant
+        type: node?
+        kind:
+          - ConstantReadNode
+          - ConstantPathNode
+      - name: left
+        type: node
+        kind: SplatNode
+      - name: requireds
+        type: node[]
+        kind: pattern expression
+      - name: right
+        type: node
+        kind:
+          - SplatNode
+          - on error: MissingNode
+      - name: opening_loc
+        type: location?
+      - name: closing_loc
+        type: location?
+    comment: |
+      Represents a find pattern in pattern matching.
+
+          foo in *bar, baz, *qux
+                 ^^^^^^^^^^^^^^^
+
+          foo in [*bar, baz, *qux]
+                 ^^^^^^^^^^^^^^^^^
+
+          foo in Foo(*bar, baz, *qux)
+                 ^^^^^^^^^^^^^^^^^^^^
+  - name: FlipFlopNode
+    flags: RangeFlags
+    fields:
+      - name: left
+        type: node?
+        kind: non-void expression
+      - name: right
+        type: node?
+        kind: non-void expression
+      - name: operator_loc
+        type: location
+    comment: |
+      Represents the use of the `..` or `...` operators to create flip flops.
+
+          baz if foo .. bar
+                 ^^^^^^^^^^
+  - name: FloatNode
+    fields:
+      - name: value
+        type: double
+        comment: The value of the floating point number as a Float.
+    comment: |
+      Represents a floating point number literal.
+
+          1.0
+          ^^^
+  - name: ForNode
+    fields:
+      - name: index
+        type: node
+        kind:
+          - LocalVariableTargetNode
+          - InstanceVariableTargetNode
+          - ClassVariableTargetNode
+          - GlobalVariableTargetNode
+          - ConstantTargetNode
+          - ConstantPathTargetNode
+          - CallTargetNode
+          - IndexTargetNode
+          - MultiTargetNode
+          - on error: BackReferenceReadNode # for $& in a end
+          - on error: NumberedReferenceReadNode # for $1 in a end
+          - on error: MissingNode # for in 1..10; end
+        comment: |
+          The index expression for `for` loops.
+
+              for i in a end
+                  ^
+      - name: collection
+        type: node
+        kind: non-void expression
+        comment: |
+          The collection to iterate over.
+
+              for i in a end
+                       ^
+      - name: statements
+        type: node?
+        kind: StatementsNode
+        comment: |
+          Represents the body of statements to execute for each iteration of the loop.
+
+              for i in a
+                foo(i)
+                ^^^^^^
+              end
+      - name: for_keyword_loc
+        type: location
+        comment: |
+          The location of the `for` keyword.
+
+              for i in a end
+              ^^^
+      - name: in_keyword_loc
+        type: location
+        comment: |
+          The location of the `in` keyword.
+
+              for i in a end
+                    ^^
+      - name: do_keyword_loc
+        type: location?
+        comment: |
+          The location of the `do` keyword, if present.
+
+              for i in a do end
+                         ^^
+      - name: end_keyword_loc
+        type: location
+        comment: |
+          The location of the `end` keyword.
+
+              for i in a end
+                         ^^^
+    comment: |
+      Represents the use of the `for` keyword.
+
+          for i in a end
+          ^^^^^^^^^^^^^^
+  - name: ForwardingArgumentsNode
+    comment: |
+      Represents forwarding all arguments to this method to another method.
+
+          def foo(...)
+            bar(...)
+                ^^^
+          end
+  - name: ForwardingParameterNode
+    comment: |
+      Represents the use of the forwarding parameter in a method, block, or lambda declaration.
+
+          def foo(...)
+                  ^^^
+          end
+  - name: ForwardingSuperNode
+    fields:
+      - name: block
+        type: node?
+        kind: BlockNode
+    comment: |
+      Represents the use of the `super` keyword without parentheses or arguments.
+
+          super
+          ^^^^^
+  - name: GlobalVariableAndWriteNode
+    fields:
+      - name: name
+        type: constant
+      - name: name_loc
+        type: location
+      - name: operator_loc
+        type: location
+      - name: value
+        type: node
+        kind: non-void expression
+    comment: |
+      Represents the use of the `&&=` operator for assignment to a global variable.
+
+          $target &&= value
+          ^^^^^^^^^^^^^^^^^
+  - name: GlobalVariableOperatorWriteNode
+    fields:
+      - name: name
+        type: constant
+      - name: name_loc
+        type: location
+      - name: binary_operator_loc
+        type: location
+      - name: value
+        type: node
+        kind: non-void expression
+      - name: binary_operator
+        type: constant
+    comment: |
+      Represents assigning to a global variable using an operator that isn't `=`.
+
+          $target += value
+          ^^^^^^^^^^^^^^^^
+  - name: GlobalVariableOrWriteNode
+    fields:
+      - name: name
+        type: constant
+      - name: name_loc
+        type: location
+      - name: operator_loc
+        type: location
+      - name: value
+        type: node
+        kind: non-void expression
+    comment: |
+      Represents the use of the `||=` operator for assignment to a global variable.
+
+          $target ||= value
+          ^^^^^^^^^^^^^^^^^
+  - name: GlobalVariableReadNode
+    fields:
+      - name: name
+        type: constant
+        comment: |
+          The name of the global variable, which is a `$` followed by an [identifier](https://github.com/ruby/prism/blob/main/docs/parsing_rules.md#identifier). Alternatively, it can be one of the special global variables designated by a symbol.
+
+              $foo   # name `:$foo`
+
+              $_Test # name `:$_Test`
+    comment: |
+      Represents referencing a global variable.
+
+          $foo
+          ^^^^
+  - name: GlobalVariableTargetNode
+    fields:
+      - name: name
+        type: constant
+    comment: |
+      Represents writing to a global variable in a context that doesn't have an explicit value.
+
+          $foo, $bar = baz
+          ^^^^  ^^^^
+  - name: GlobalVariableWriteNode
+    fields:
+      - name: name
+        type: constant
+        comment: |
+          The name of the global variable, which is a `$` followed by an [identifier](https://github.com/ruby/prism/blob/main/docs/parsing_rules.md#identifier). Alternatively, it can be one of the special global variables designated by a symbol.
+
+              $foo = :bar  # name `:$foo`
+
+              $_Test = 123 # name `:$_Test`
+      - name: name_loc
+        type: location
+        comment: |
+          The location of the global variable's name.
+
+              $foo = :bar
+              ^^^^
+      - name: value
+        type: node
+        kind: non-void expression
+        comment: |
+          The value to write to the global variable. It can be any [non-void expression](https://github.com/ruby/prism/blob/main/docs/parsing_rules.md#non-void-expression).
+
+              $foo = :bar
+                     ^^^^
+
+              $-xyz = 123
+                      ^^^
+      - name: operator_loc
+        type: location
+        comment: |
+          The location of the `=` operator.
+
+              $foo = :bar
+                   ^
+    comment: |
+      Represents writing to a global variable.
+
+          $foo = 1
+          ^^^^^^^^
+  - name: HashNode
+    fields:
+      - name: opening_loc
+        type: location
+        comment: |
+          The location of the opening brace.
+
+              { a => b }
+              ^
+      - name: elements
+        type: node[]
+        kind:
+          - AssocNode
+          - AssocSplatNode
+        comment: |
+          The elements of the hash. These can be either `AssocNode`s or `AssocSplatNode`s.
+
+              { a: b }
+                ^^^^
+
+              { **foo }
+                ^^^^^
+      - name: closing_loc
+        type: location
+        comment: |
+          The location of the closing brace.
+
+              { a => b }
+                       ^
+    comment: |
+      Represents a hash literal.
+
+          { a => b }
+          ^^^^^^^^^^
+  - name: HashPatternNode
+    fields:
+      - name: constant
+        type: node?
+        kind:
+          - ConstantReadNode
+          - ConstantPathNode
+      - name: elements
+        type: node[]
+        kind: AssocNode
+      - name: rest
+        type: node?
+        kind:
+          - AssocSplatNode
+          - NoKeywordsParameterNode
+      - name: opening_loc
+        type: location?
+      - name: closing_loc
+        type: location?
+    comment: |
+      Represents a hash pattern in pattern matching.
+
+          foo => { a: 1, b: 2 }
+                 ^^^^^^^^^^^^^^
+
+          foo => { a: 1, b: 2, **c }
+                 ^^^^^^^^^^^^^^^^^^^
+  - name: IfNode
+    fields:
+      - name: if_keyword_loc
+        type: location?
+        comment: |
+          The location of the `if` keyword if present.
+
+              bar if foo
+                  ^^
+
+          The `if_keyword_loc` field will be `nil` when the `IfNode` represents a ternary expression.
+      - name: predicate
+        type: node
+        kind: non-void expression
+        comment: |
+          The node for the condition the `IfNode` is testing.
+
+              if foo
+                 ^^^
+                bar
+              end
+
+              bar if foo
+                     ^^^
+
+              foo ? bar : baz
+              ^^^
+      - name: then_keyword_loc
+        type: location?
+        comment: |
+          The location of the `then` keyword (if present) or the `?` in a ternary expression, `nil` otherwise.
+
+              if foo then bar end
+                     ^^^^
+
+              a ? b : c
+                ^
+      - name: statements
+        type: node?
+        kind: StatementsNode
+        comment: |
+          Represents the body of statements that will be executed when the predicate is evaluated as truthy. Will be `nil` when no body is provided.
+
+              if foo
+                bar
+                ^^^
+                baz
+                ^^^
+              end
+      - name: subsequent
+        type: node?
+        kind:
+          - ElseNode
+          - IfNode
+        comment: |
+          Represents an `ElseNode` or an `IfNode` when there is an `else` or an `elsif` in the `if` statement.
+
+              if foo
+                bar
+              elsif baz
+              ^^^^^^^^^
+                qux
+                ^^^
+              end
+              ^^^
+
+              if foo then bar else baz end
+                              ^^^^^^^^^^^^
+      - name: end_keyword_loc
+        type: location?
+        comment: |
+          The location of the `end` keyword if present, `nil` otherwise.
+
+              if foo
+                bar
+              end
+              ^^^
+    newline: predicate
+    comment: |
+      Represents the use of the `if` keyword, either in the block form or the modifier form, or a ternary expression.
+
+          bar if foo
+          ^^^^^^^^^^
+
+          if foo then bar end
+          ^^^^^^^^^^^^^^^^^^^
+
+          foo ? bar : baz
+          ^^^^^^^^^^^^^^^
+  - name: ImaginaryNode
+    fields:
+      - name: numeric
+        type: node
+        kind:
+          - FloatNode
+          - IntegerNode
+          - RationalNode
+    comment: |
+      Represents an imaginary number literal.
+
+          1.0i
+          ^^^^
+  - name: ImplicitNode
+    fields:
+      - name: value
+        type: node
+        kind:
+          - LocalVariableReadNode
+          - CallNode
+          - ConstantReadNode
+          - LocalVariableTargetNode
+    comment: |
+      Represents a node that is implicitly being added to the tree but doesn't correspond directly to a node in the source.
+
+          { foo: }
+            ^^^^
+
+          { Foo: }
+            ^^^^
+
+          foo in { bar: }
+                   ^^^^
+  - name: ImplicitRestNode
+    comment: |
+      Represents using a trailing comma to indicate an implicit rest parameter.
+
+          foo { |bar,| }
+                    ^
+
+          foo in [bar,]
+                     ^
+
+          for foo, in bar do end
+                 ^
+
+          foo, = bar
+             ^
+  - name: InNode
+    fields:
+      - name: pattern
+        type: node
+        kind: pattern expression
+      - name: statements
+        type: node?
+        kind: StatementsNode
+      - name: in_loc
+        type: location
+      - name: then_loc
+        type: location?
+    comment: |
+      Represents the use of the `in` keyword in a case statement.
+
+          case a; in b then c end
+                  ^^^^^^^^^^^
+  - name: IndexAndWriteNode
+    flags: CallNodeFlags
+    fields:
+      - name: receiver
+        type: node?
+        kind: non-void expression
+      - name: call_operator_loc
+        type: location?
+      - name: opening_loc
+        type: location
+      - name: arguments
+        type: node?
+        kind: ArgumentsNode
+      - name: closing_loc
+        type: location
+      - name: block
+        type: node?
+        kind: BlockArgumentNode # foo[&b] &&= value, only valid on Ruby < 3.4
+      - name: operator_loc
+        type: location
+      - name: value
+        type: node
+        kind: non-void expression
+    comment: |
+      Represents the use of the `&&=` operator on a call to the `[]` method.
+
+          foo.bar[baz] &&= value
+          ^^^^^^^^^^^^^^^^^^^^^^
+  - name: IndexOperatorWriteNode
+    flags: CallNodeFlags
+    fields:
+      - name: receiver
+        type: node?
+        kind: non-void expression
+      - name: call_operator_loc
+        type: location?
+      - name: opening_loc
+        type: location
+      - name: arguments
+        type: node?
+        kind: ArgumentsNode
+      - name: closing_loc
+        type: location
+      - name: block
+        type: node?
+        kind: BlockArgumentNode # foo[&b] += value, only valid on Ruby < 3.4
+      - name: binary_operator
+        type: constant
+      - name: binary_operator_loc
+        type: location
+      - name: value
+        type: node
+        kind: non-void expression
+    comment: |
+      Represents the use of an assignment operator on a call to `[]`.
+
+          foo.bar[baz] += value
+          ^^^^^^^^^^^^^^^^^^^^^
+  - name: IndexOrWriteNode
+    flags: CallNodeFlags
+    fields:
+      - name: receiver
+        type: node?
+        kind: non-void expression
+      - name: call_operator_loc
+        type: location?
+      - name: opening_loc
+        type: location
+      - name: arguments
+        type: node?
+        kind: ArgumentsNode
+      - name: closing_loc
+        type: location
+      - name: block
+        type: node?
+        kind: BlockArgumentNode # foo[&b] ||= value, only valid on Ruby < 3.4
+      - name: operator_loc
+        type: location
+      - name: value
+        type: node
+        kind: non-void expression
+    comment: |
+      Represents the use of the `||=` operator on a call to `[]`.
+
+          foo.bar[baz] ||= value
+          ^^^^^^^^^^^^^^^^^^^^^^
+  - name: IndexTargetNode
+    flags: CallNodeFlags
+    fields:
+      - name: receiver
+        type: node
+        kind: non-void expression
+      - name: opening_loc
+        type: location
+      - name: arguments
+        type: node?
+        kind: ArgumentsNode
+      - name: closing_loc
+        type: location
+      - name: block
+        type: node?
+        kind: BlockArgumentNode # foo[&b], = 1, only valid on Ruby < 3.4
+    comment: |
+      Represents assigning to an index.
+
+          foo[bar], = 1
+          ^^^^^^^^
+
+          begin
+          rescue => foo[bar]
+                    ^^^^^^^^
+          end
+
+          for foo[bar] in baz do end
+              ^^^^^^^^
+  - name: InstanceVariableAndWriteNode
+    fields:
+      - name: name
+        type: constant
+      - name: name_loc
+        type: location
+      - name: operator_loc
+        type: location
+      - name: value
+        type: node
+        kind: non-void expression
+    comment: |
+      Represents the use of the `&&=` operator for assignment to an instance variable.
+
+          @target &&= value
+          ^^^^^^^^^^^^^^^^^
+  - name: InstanceVariableOperatorWriteNode
+    fields:
+      - name: name
+        type: constant
+      - name: name_loc
+        type: location
+      - name: binary_operator_loc
+        type: location
+      - name: value
+        type: node
+        kind: non-void expression
+      - name: binary_operator
+        type: constant
+    comment: |
+      Represents assigning to an instance variable using an operator that isn't `=`.
+
+          @target += value
+          ^^^^^^^^^^^^^^^^
+  - name: InstanceVariableOrWriteNode
+    fields:
+      - name: name
+        type: constant
+      - name: name_loc
+        type: location
+      - name: operator_loc
+        type: location
+      - name: value
+        type: node
+        kind: non-void expression
+    comment: |
+      Represents the use of the `||=` operator for assignment to an instance variable.
+
+          @target ||= value
+          ^^^^^^^^^^^^^^^^^
+  - name: InstanceVariableReadNode
+    fields:
+      - name: name
+        type: constant
+        comment: |
+          The name of the instance variable, which is a `@` followed by an [identifier](https://github.com/ruby/prism/blob/main/docs/parsing_rules.md#identifiers).
+
+              @x     # name `:@x`
+
+              @_test # name `:@_test`
+    comment: |
+      Represents referencing an instance variable.
+
+          @foo
+          ^^^^
+  - name: InstanceVariableTargetNode
+    fields:
+      - name: name
+        type: constant
+    comment: |
+      Represents writing to an instance variable in a context that doesn't have an explicit value.
+
+          @foo, @bar = baz
+          ^^^^  ^^^^
+  - name: InstanceVariableWriteNode
+    fields:
+      - name: name
+        type: constant
+        comment: |
+          The name of the instance variable, which is a `@` followed by an [identifier](https://github.com/ruby/prism/blob/main/docs/parsing_rules.md#identifiers).
+
+              @x = :y       # name `:@x`
+
+              @_foo = "bar" # name `@_foo`
+      - name: name_loc
+        type: location
+        comment: |
+          The location of the variable name.
+
+              @_x = 1
+              ^^^
+      - name: value
+        type: node
+        kind: non-void expression
+        comment: |
+          The value to write to the instance variable. It can be any [non-void expression](https://github.com/ruby/prism/blob/main/docs/parsing_rules.md#non-void-expression).
+
+              @foo = :bar
+                     ^^^^
+
+              @_x = 1234
+                    ^^^^
+      - name: operator_loc
+        type: location
+        comment: |
+          The location of the `=` operator.
+
+              @x = y
+                 ^
+    comment: |
+      Represents writing to an instance variable.
+
+          @foo = 1
+          ^^^^^^^^
+  - name: IntegerNode
+    flags: IntegerBaseFlags
+    fields:
+      - name: value
+        type: integer
+        comment: The value of the integer literal as a number.
+    comment: |
+      Represents an integer number literal.
+
+          1
+          ^
+  - name: InterpolatedMatchLastLineNode
+    flags: RegularExpressionFlags
+    fields:
+      - name: opening_loc
+        type: location
+      - name: parts
+        type: node[]
+        kind:
+          - StringNode
+          - EmbeddedStatementsNode
+          - EmbeddedVariableNode
+      - name: closing_loc
+        type: location
+    newline: parts
+    comment: |
+      Represents a regular expression literal that contains interpolation that is being used in the predicate of a conditional to implicitly match against the last line read by an IO object.
+
+          if /foo #{bar} baz/ then end
+             ^^^^^^^^^^^^^^^^
+  - name: InterpolatedRegularExpressionNode
+    flags: RegularExpressionFlags
+    fields:
+      - name: opening_loc
+        type: location
+      - name: parts
+        type: node[]
+        kind:
+          - StringNode
+          - EmbeddedStatementsNode
+          - EmbeddedVariableNode
+      - name: closing_loc
+        type: location
+    newline: parts
+    comment: |
+      Represents a regular expression literal that contains interpolation.
+
+          /foo #{bar} baz/
+          ^^^^^^^^^^^^^^^^
+  - name: InterpolatedStringNode
+    flags: InterpolatedStringNodeFlags
+    fields:
+      - name: opening_loc
+        type: location?
+      - name: parts
+        type: node[]
+        kind:
+          - StringNode
+          - EmbeddedStatementsNode
+          - EmbeddedVariableNode
+          - InterpolatedStringNode # `"a" "#{b}"`
+          - on error: XStringNode # `<<`FOO` "bar"
+      - name: closing_loc
+        type: location?
+    newline: parts
+    comment: |
+      Represents a string literal that contains interpolation.
+
+          "foo #{bar} baz"
+          ^^^^^^^^^^^^^^^^
+  - name: InterpolatedSymbolNode
+    fields:
+      - name: opening_loc
+        type: location?
+      - name: parts
+        type: node[]
+        kind:
+          - StringNode
+          - EmbeddedStatementsNode
+          - EmbeddedVariableNode
+      - name: closing_loc
+        type: location?
+    newline: parts
+    comment: |
+      Represents a symbol literal that contains interpolation.
+
+          :"foo #{bar} baz"
+          ^^^^^^^^^^^^^^^^^
+  - name: InterpolatedXStringNode
+    fields:
+      - name: opening_loc
+        type: location
+      - name: parts
+        type: node[]
+        kind:
+          - StringNode
+          - EmbeddedStatementsNode
+          - EmbeddedVariableNode
+      - name: closing_loc
+        type: location
+    newline: parts
+    comment: |
+      Represents an xstring literal that contains interpolation.
+
+          `foo #{bar} baz`
+          ^^^^^^^^^^^^^^^^
+  - name: ItLocalVariableReadNode
+    comment: |
+      Represents reading from the implicit `it` local variable.
+
+          -> { it }
+               ^^
+  - name: ItParametersNode
+    comment: |
+      Represents an implicit set of parameters through the use of the `it` keyword within a block or lambda.
+
+          -> { it + it }
+          ^^^^^^^^^^^^^^
+  - name: KeywordHashNode
+    flags: KeywordHashNodeFlags
+    fields:
+      - name: elements
+        type: node[]
+        kind:
+          - AssocNode
+          - AssocSplatNode
+    comment: |
+      Represents a hash literal without opening and closing braces.
+
+          foo(a: b)
+              ^^^^
+  - name: KeywordRestParameterNode
+    flags: ParameterFlags
+    fields:
+      - name: name
+        type: constant?
+      - name: name_loc
+        type: location?
+      - name: operator_loc
+        type: location
+    comment: |
+      Represents a keyword rest parameter to a method, block, or lambda definition.
+
+          def a(**b)
+                ^^^
+          end
+  - name: LambdaNode
+    fields:
+      - name: locals
+        type: constant[]
+      - name: operator_loc
+        type: location
+      - name: opening_loc
+        type: location
+      - name: closing_loc
+        type: location
+      - name: parameters
+        type: node?
+        kind:
+          - BlockParametersNode
+          - NumberedParametersNode
+          - ItParametersNode
+      - name: body
+        type: node?
+        kind:
+          - StatementsNode
+          - BeginNode
+    comment: |
+      Represents using a lambda literal (not the lambda method call).
+
+          ->(value) { value * 2 }
+          ^^^^^^^^^^^^^^^^^^^^^^^
+  - name: LocalVariableAndWriteNode
+    fields:
+      - name: name_loc
+        type: location
+      - name: operator_loc
+        type: location
+      - name: value
+        type: node
+        kind: non-void expression
+      - name: name
+        type: constant
+      - name: depth
+        type: uint32
+    comment: |
+      Represents the use of the `&&=` operator for assignment to a local variable.
+
+          target &&= value
+          ^^^^^^^^^^^^^^^^
+  - name: LocalVariableOperatorWriteNode
+    fields:
+      - name: name_loc
+        type: location
+      - name: binary_operator_loc
+        type: location
+      - name: value
+        type: node
+        kind: non-void expression
+      - name: name
+        type: constant
+      - name: binary_operator
+        type: constant
+      - name: depth
+        type: uint32
+    comment: |
+      Represents assigning to a local variable using an operator that isn't `=`.
+
+          target += value
+          ^^^^^^^^^^^^^^^
+  - name: LocalVariableOrWriteNode
+    fields:
+      - name: name_loc
+        type: location
+      - name: operator_loc
+        type: location
+      - name: value
+        type: node
+        kind: non-void expression
+      - name: name
+        type: constant
+      - name: depth
+        type: uint32
+    comment: |
+      Represents the use of the `||=` operator for assignment to a local variable.
+
+          target ||= value
+          ^^^^^^^^^^^^^^^^
+  - name: LocalVariableReadNode
+    fields:
+      - name: name
+        type: constant
+        comment: |
+          The name of the local variable, which is an [identifier](https://github.com/ruby/prism/blob/main/docs/parsing_rules.md#identifiers).
+
+              x      # name `:x`
+
+              _Test  # name `:_Test`
+
+          Note that this can also be an underscore followed by a number for the default block parameters.
+
+              _1     # name `:_1`
+
+      - name: depth
+        type: uint32
+        comment: |
+          The number of visible scopes that should be searched to find the origin of this local variable.
+
+              foo = 1; foo # depth 0
+
+              bar = 2; tap { bar } # depth 1
+
+          The specific rules for calculating the depth may differ from individual Ruby implementations, as they are not specified by the language. For more information, see [the Prism documentation](https://github.com/ruby/prism/blob/main/docs/local_variable_depth.md).
+    comment: |
+      Represents reading a local variable. Note that this requires that a local variable of the same name has already been written to in the same scope, otherwise it is parsed as a method call.
+
+          foo
+          ^^^
+  - name: LocalVariableTargetNode
+    fields:
+      - name: name
+        type: constant
+      - name: depth
+        type: uint32
+    comment: |
+      Represents writing to a local variable in a context that doesn't have an explicit value.
+
+          foo, bar = baz
+          ^^^  ^^^
+  - name: LocalVariableWriteNode
+    fields:
+      - name: name
+        type: constant
+        comment: |
+          The name of the local variable, which is an [identifier](https://github.com/ruby/prism/blob/main/docs/parsing_rules.md#identifiers).
+
+              foo = :bar # name `:foo`
+
+              abc = 123  # name `:abc`
+      - name: depth
+        type: uint32
+        comment: |
+          The number of semantic scopes we have to traverse to find the declaration of this variable.
+
+              foo = 1         # depth 0
+
+              tap { foo = 1 } # depth 1
+
+          The specific rules for calculating the depth may differ from individual Ruby implementations, as they are not specified by the language. For more information, see [the Prism documentation](https://github.com/ruby/prism/blob/main/docs/local_variable_depth.md).
+      - name: name_loc
+        type: location
+        comment: |
+          The location of the variable name.
+
+              foo = :bar
+              ^^^
+      - name: value
+        type: node
+        kind: non-void expression
+        comment: |
+          The value to write to the local variable. It can be any [non-void expression](https://github.com/ruby/prism/blob/main/docs/parsing_rules.md#non-void-expression).
+
+              foo = :bar
+                    ^^^^
+
+              abc = 1234
+                    ^^^^
+
+          Note that since the name of a local variable is known before the value is parsed, it is valid for a local variable to appear within the value of its own write.
+
+              foo = foo
+      - name: operator_loc
+        type: location
+        comment: |
+          The location of the `=` operator.
+
+              x = :y
+                ^
+    comment: |
+      Represents writing to a local variable.
+
+          foo = 1
+          ^^^^^^^
+  - name: MatchLastLineNode
+    flags: RegularExpressionFlags
+    fields:
+      - name: opening_loc
+        type: location
+      - name: content_loc
+        type: location
+      - name: closing_loc
+        type: location
+      - name: unescaped
+        type: string
+    comment: |
+      Represents a regular expression literal used in the predicate of a conditional to implicitly match against the last line read by an IO object.
+
+          if /foo/i then end
+             ^^^^^^
+  - name: MatchPredicateNode
+    fields:
+      - name: value
+        type: node
+        kind: non-void expression
+      - name: pattern
+        type: node
+        kind: pattern expression
+      - name: operator_loc
+        type: location
+    comment: |
+      Represents the use of the modifier `in` operator.
+
+          foo in bar
+          ^^^^^^^^^^
+  - name: MatchRequiredNode
+    fields:
+      - name: value
+        type: node
+        kind: non-void expression
+      - name: pattern
+        type: node
+        kind: pattern expression
+      - name: operator_loc
+        type: location
+    comment: |
+      Represents the use of the `=>` operator.
+
+          foo => bar
+          ^^^^^^^^^^
+  - name: MatchWriteNode
+    fields:
+      - name: call
+        type: node
+        kind: CallNode
+      - name: targets
+        type: node[]
+        kind: LocalVariableTargetNode
+    comment: |
+      Represents writing local variables using a regular expression match with named capture groups.
+
+          /(?<foo>bar)/ =~ baz
+          ^^^^^^^^^^^^^^^^^^^^
+  - name: MissingNode
+    comment: |
+      Represents a node that is missing from the source and results in a syntax error.
+  - name: ModuleNode
+    fields:
+      - name: locals
+        type: constant[]
+      - name: module_keyword_loc
+        type: location
+      - name: constant_path
+        type: node
+        kind:
+          - ConstantReadNode
+          - ConstantPathNode
+          - on error: MissingNode # module Parent module end
+      - name: body
+        type: node?
+        kind:
+          - StatementsNode
+          - BeginNode
+      - name: end_keyword_loc
+        type: location
+      - name: name
+        type: constant
+    comment: |
+      Represents a module declaration involving the `module` keyword.
+
+          module Foo end
+          ^^^^^^^^^^^^^^
+  - name: MultiTargetNode
+    fields:
+      - name: lefts
+        type: node[]
+        kind:
+          - LocalVariableTargetNode
+          - InstanceVariableTargetNode
+          - ClassVariableTargetNode
+          - GlobalVariableTargetNode
+          - ConstantTargetNode
+          - ConstantPathTargetNode
+          - CallTargetNode
+          - IndexTargetNode
+          - MultiTargetNode
+          - RequiredParameterNode # def m((a,b)); end
+          - on error: BackReferenceReadNode # a, (b, $&) = z
+          - on error: NumberedReferenceReadNode # a, (b, $1) = z
+        comment: |
+          Represents the targets expressions before a splat node.
+
+              a, (b, c, *) = 1, 2, 3, 4, 5
+                  ^^^^
+
+          The splat node can be absent, in that case all target expressions are in the left field.
+
+              a, (b, c) = 1, 2, 3, 4, 5
+                  ^^^^
+      - name: rest
+        type: node?
+        kind:
+          - ImplicitRestNode
+          - SplatNode
+        comment: |
+          Represents a splat node in the target expression.
+
+              a, (b, *c) = 1, 2, 3, 4
+                     ^^
+
+          The variable can be empty, this results in a `SplatNode` with a `nil` expression field.
+
+              a, (b, *) = 1, 2, 3, 4
+                     ^
+
+          If the `*` is omitted, this field will contain an `ImplicitRestNode`
+
+              a, (b,) = 1, 2, 3, 4
+                   ^
+      - name: rights
+        type: node[]
+        kind:
+          - LocalVariableTargetNode
+          - InstanceVariableTargetNode
+          - ClassVariableTargetNode
+          - GlobalVariableTargetNode
+          - ConstantTargetNode
+          - ConstantPathTargetNode
+          - CallTargetNode
+          - IndexTargetNode
+          - MultiTargetNode
+          - RequiredParameterNode # def m((*,b)); end
+          - on error: BackReferenceReadNode # a, (*, $&) = z
+          - on error: NumberedReferenceReadNode # a, (*, $1) = z
+        comment: |
+          Represents the targets expressions after a splat node.
+
+              a, (*, b, c) = 1, 2, 3, 4, 5
+                     ^^^^
+      - name: lparen_loc
+        type: location?
+        comment: |
+          The location of the opening parenthesis.
+
+              a, (b, c) = 1, 2, 3
+                 ^
+      - name: rparen_loc
+        type: location?
+        comment: |
+          The location of the closing parenthesis.
+
+              a, (b, c) = 1, 2, 3
+                      ^
+    comment: |
+      Represents a multi-target expression.
+
+          a, (b, c) = 1, 2, 3
+             ^^^^^^
+
+      This can be a part of `MultiWriteNode` as above, or the target of a `for` loop
+
+          for a, b in [[1, 2], [3, 4]]
+              ^^^^
+  - name: MultiWriteNode
+    fields:
+      - name: lefts
+        type: node[]
+        kind:
+          - LocalVariableTargetNode
+          - InstanceVariableTargetNode
+          - ClassVariableTargetNode
+          - GlobalVariableTargetNode
+          - ConstantTargetNode
+          - ConstantPathTargetNode
+          - CallTargetNode
+          - IndexTargetNode
+          - MultiTargetNode
+          - on error: BackReferenceReadNode # $&, = z
+          - on error: NumberedReferenceReadNode # $1, = z
+        comment: |
+          Represents the targets expressions before a splat node.
+
+              a, b, * = 1, 2, 3, 4, 5
+              ^^^^
+
+          The splat node can be absent, in that case all target expressions are in the left field.
+
+              a, b, c = 1, 2, 3, 4, 5
+              ^^^^^^^
+      - name: rest
+        type: node?
+        kind:
+          - ImplicitRestNode
+          - SplatNode
+        comment: |
+          Represents a splat node in the target expression.
+
+              a, b, *c = 1, 2, 3, 4
+                    ^^
+
+          The variable can be empty, this results in a `SplatNode` with a `nil` expression field.
+
+              a, b, * = 1, 2, 3, 4
+                    ^
+
+          If the `*` is omitted, this field will contain an `ImplicitRestNode`
+
+              a, b, = 1, 2, 3, 4
+                  ^
+      - name: rights
+        type: node[]
+        kind:
+          - LocalVariableTargetNode
+          - InstanceVariableTargetNode
+          - ClassVariableTargetNode
+          - GlobalVariableTargetNode
+          - ConstantTargetNode
+          - ConstantPathTargetNode
+          - CallTargetNode
+          - IndexTargetNode
+          - MultiTargetNode
+          - on error: BackReferenceReadNode # *, $& = z
+          - on error: NumberedReferenceReadNode # *, $1 = z
+        comment: |
+          Represents the targets expressions after a splat node.
+
+              a, *, b, c = 1, 2, 3, 4, 5
+                    ^^^^
+      - name: lparen_loc
+        type: location?
+        comment: |
+          The location of the opening parenthesis.
+
+              (a, b, c) = 1, 2, 3
+              ^
+      - name: rparen_loc
+        type: location?
+        comment: |
+          The location of the closing parenthesis.
+
+              (a, b, c) = 1, 2, 3
+                      ^
+      - name: operator_loc
+        type: location
+        comment: |
+          The location of the operator.
+
+              a, b, c = 1, 2, 3
+                      ^
+      - name: value
+        type: node
+        kind: non-void expression
+        comment: |
+          The value to write to the targets. It can be any [non-void expression](https://github.com/ruby/prism/blob/main/docs/parsing_rules.md#non-void-expression).
+
+              a, b, c = 1, 2, 3
+                        ^^^^^^^
+    comment: |
+      Represents a write to a multi-target expression.
+
+          a, b, c = 1, 2, 3
+          ^^^^^^^^^^^^^^^^^
+  - name: NextNode
+    fields:
+      - name: arguments
+        type: node?
+        kind: ArgumentsNode
+      - name: keyword_loc
+        type: location
+    comment: |
+      Represents the use of the `next` keyword.
+
+          next 1
+          ^^^^^^
+  - name: NilNode
+    comment: |
+      Represents the use of the `nil` keyword.
+
+          nil
+          ^^^
+  - name: NoKeywordsParameterNode
+    fields:
+      - name: operator_loc
+        type: location
+      - name: keyword_loc
+        type: location
+    comment: |
+      Represents the use of `**nil` inside method arguments.
+
+          def a(**nil)
+                ^^^^^
+          end
+  - name: NumberedParametersNode
+    fields:
+      - name: maximum
+        type: uint8
+    comment: |
+      Represents an implicit set of parameters through the use of numbered parameters within a block or lambda.
+
+          -> { _1 + _2 }
+          ^^^^^^^^^^^^^^
+  - name: NumberedReferenceReadNode
+    fields:
+      - name: number
+        type: uint32
+        comment: |
+          The (1-indexed, from the left) number of the capture group. Numbered references that are too large result in this value being `0`.
+
+              $1          # number `1`
+
+              $5432       # number `5432`
+
+              $4294967296 # number `0`
+    comment: |
+      Represents reading a numbered reference to a capture in the previous match.
+
+          $1
+          ^^
+  - name: OptionalKeywordParameterNode
+    flags: ParameterFlags
+    fields:
+      - name: name
+        type: constant
+      - name: name_loc
+        type: location
+      - name: value
+        type: node
+        kind: non-void expression
+    comment: |
+      Represents an optional keyword parameter to a method, block, or lambda definition.
+
+          def a(b: 1)
+                ^^^^
+          end
+  - name: OptionalParameterNode
+    flags: ParameterFlags
+    fields:
+      - name: name
+        type: constant
+      - name: name_loc
+        type: location
+      - name: operator_loc
+        type: location
+      - name: value
+        type: node
+        kind: non-void expression
+    comment: |
+      Represents an optional parameter to a method, block, or lambda definition.
+
+          def a(b = 1)
+                ^^^^^
+          end
+  - name: OrNode
+    fields:
+      - name: left
+        type: node
+        kind: non-void expression
+        comment: |
+          Represents the left side of the expression. It can be any [non-void expression](https://github.com/ruby/prism/blob/main/docs/parsing_rules.md#non-void-expression).
+
+              left or right
+              ^^^^
+
+              1 || 2
+              ^
+      - name: right
+        type: node
+        kind: Node
+        comment: |
+          Represents the right side of the expression.
+
+              left || right
+                      ^^^^^
+
+              1 or 2
+                   ^
+      - name: operator_loc
+        type: location
+        comment: |
+          The location of the `or` keyword or the `||` operator.
+
+              left or right
+                   ^^
+    comment: |
+      Represents the use of the `||` operator or the `or` keyword.
+
+          left or right
+          ^^^^^^^^^^^^^
+  - name: ParametersNode
+    fields:
+      - name: requireds
+        type: node[]
+        kind:
+          - RequiredParameterNode
+          - MultiTargetNode
+      - name: optionals
+        type: node[]
+        kind: OptionalParameterNode
+      - name: rest
+        type: node?
+        kind:
+          - RestParameterNode
+          - ImplicitRestNode # Only in block parameters
+      - name: posts
+        type: node[]
+        kind:
+          - RequiredParameterNode
+          - MultiTargetNode
+          # On parsing error of `f(**kwargs, ...)` or `f(**nil, ...)`, the keyword_rest value is moved here:
+          - on error: KeywordRestParameterNode
+          - on error: NoKeywordsParameterNode
+          # On parsing error of `f(..., ...)`, the first forwarding parameter is moved here:
+          - on error: ForwardingParameterNode
+      - name: keywords
+        type: node[]
+        kind:
+          - RequiredKeywordParameterNode
+          - OptionalKeywordParameterNode
+      - name: keyword_rest
+        type: node?
+        kind:
+          - KeywordRestParameterNode
+          - ForwardingParameterNode
+          - NoKeywordsParameterNode
+      - name: block
+        type: node?
+        kind: BlockParameterNode
+    comment: |
+      Represents the list of parameters on a method, block, or lambda definition.
+
+          def a(b, c, d)
+                ^^^^^^^
+          end
+  - name: ParenthesesNode
+    flags: ParenthesesNodeFlags
+    fields:
+      - name: body
+        type: node?
+        kind: non-void expression # Usually a StatementsNode but not always e.g. `1 in (..10)`
+      - name: opening_loc
+        type: location
+      - name: closing_loc
+        type: location
+    newline: false
+    comment: |
+      Represents a parenthesized expression
+
+          (10 + 34)
+          ^^^^^^^^^
+  - name: PinnedExpressionNode
+    fields:
+      - name: expression
+        type: node
+        kind: non-void expression
+      - name: operator_loc
+        type: location
+      - name: lparen_loc
+        type: location
+      - name: rparen_loc
+        type: location
+    comment: |
+      Represents the use of the `^` operator for pinning an expression in a pattern matching expression.
+
+          foo in ^(bar)
+                 ^^^^^^
+  - name: PinnedVariableNode
+    fields:
+      - name: variable
+        type: node
+        kind:
+          - LocalVariableReadNode
+          - InstanceVariableReadNode
+          - ClassVariableReadNode
+          - GlobalVariableReadNode # foo in ^$a
+          - BackReferenceReadNode # foo in ^$&
+          - NumberedReferenceReadNode # foo in ^$1
+          - ItLocalVariableReadNode # proc { 1 in ^it }
+          - on error: MissingNode # foo in ^Bar
+      - name: operator_loc
+        type: location
+    comment: |
+      Represents the use of the `^` operator for pinning a variable in a pattern matching expression.
+
+          foo in ^bar
+                 ^^^^
+  - name: PostExecutionNode
+    fields:
+      - name: statements
+        type: node?
+        kind: StatementsNode
+      - name: keyword_loc
+        type: location
+      - name: opening_loc
+        type: location
+      - name: closing_loc
+        type: location
+    comment: |
+      Represents the use of the `END` keyword.
+
+          END { foo }
+          ^^^^^^^^^^^
+  - name: PreExecutionNode
+    fields:
+      - name: statements
+        type: node?
+        kind: StatementsNode
+      - name: keyword_loc
+        type: location
+      - name: opening_loc
+        type: location
+      - name: closing_loc
+        type: location
+    comment: |
+      Represents the use of the `BEGIN` keyword.
+
+          BEGIN { foo }
+          ^^^^^^^^^^^^^
+  - name: ProgramNode
+    fields:
+      - name: locals
+        type: constant[]
+      - name: statements
+        type: node
+        kind: StatementsNode
+    comment: The top level node of any parse tree.
+  - name: RangeNode
+    flags: RangeFlags
+    fields:
+      - name: left
+        type: node?
+        kind: non-void expression
+        comment: |
+          The left-hand side of the range, if present. It can be either `nil` or any [non-void expression](https://github.com/ruby/prism/blob/main/docs/parsing_rules.md#non-void-expression).
+
+              1...
+              ^
+
+              hello...goodbye
+              ^^^^^
+      - name: right
+        type: node?
+        kind: non-void expression
+        comment: |
+          The right-hand side of the range, if present. It can be either `nil` or any [non-void expression](https://github.com/ruby/prism/blob/main/docs/parsing_rules.md#non-void-expression).
+
+              ..5
+                ^
+
+              1...foo
+                  ^^^
+          If neither right-hand or left-hand side was included, this will be a MissingNode.
+      - name: operator_loc
+        type: location
+        comment: |
+          The location of the `..` or `...` operator.
+    comment: |
+      Represents the use of the `..` or `...` operators.
+
+          1..2
+          ^^^^
+
+          c if a =~ /left/ ... b =~ /right/
+               ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+  - name: RationalNode
+    flags: IntegerBaseFlags
+    fields:
+      - name: numerator
+        type: integer
+        comment: |
+          The numerator of the rational number.
+
+              1.5r # numerator 3
+      - name: denominator
+        type: integer
+        comment: |
+          The denominator of the rational number.
+
+              1.5r # denominator 2
+    comment: |
+      Represents a rational number literal.
+
+          1.0r
+          ^^^^
+  - name: RedoNode
+    comment: |
+      Represents the use of the `redo` keyword.
+
+          redo
+          ^^^^
+  - name: RegularExpressionNode
+    flags: RegularExpressionFlags
+    fields:
+      - name: opening_loc
+        type: location
+      - name: content_loc
+        type: location
+      - name: closing_loc
+        type: location
+      - name: unescaped
+        type: string
+    comment: |
+      Represents a regular expression literal with no interpolation.
+
+          /foo/i
+          ^^^^^^
+  - name: RequiredKeywordParameterNode
+    flags: ParameterFlags
+    fields:
+      - name: name
+        type: constant
+      - name: name_loc
+        type: location
+    comment: |
+      Represents a required keyword parameter to a method, block, or lambda definition.
+
+          def a(b: )
+                ^^
+          end
+  - name: RequiredParameterNode
+    flags: ParameterFlags
+    fields:
+      - name: name
+        type: constant
+    comment: |
+      Represents a required parameter to a method, block, or lambda definition.
+
+          def a(b)
+                ^
+          end
+  - name: RescueModifierNode
+    fields:
+      - name: expression
+        type: node
+        kind: Node
+      - name: keyword_loc
+        type: location
+      - name: rescue_expression
+        type: node
+        kind: Node
+    newline: expression
+    comment: |
+      Represents an expression modified with a rescue.
+
+          foo rescue nil
+          ^^^^^^^^^^^^^^
+  - name: RescueNode
+    fields:
+      - name: keyword_loc
+        type: location
+      - name: exceptions
+        type: node[]
+        kind: non-void expression
+      - name: operator_loc
+        type: location?
+      - name: reference
+        type: node?
+        kind:
+          - LocalVariableTargetNode
+          - InstanceVariableTargetNode
+          - ClassVariableTargetNode
+          - GlobalVariableTargetNode
+          - ConstantTargetNode
+          - ConstantPathTargetNode
+          - CallTargetNode
+          - IndexTargetNode
+          - on error: BackReferenceReadNode # => begin; rescue => $&; end
+          - on error: NumberedReferenceReadNode # => begin; rescue => $1; end
+          - on error: MissingNode # begin; rescue =>; end
+      - name: then_keyword_loc
+        type: location?
+      - name: statements
+        type: node?
+        kind: StatementsNode
+      - name: subsequent
+        type: node?
+        kind: RescueNode
+    comment: |
+      Represents a rescue statement.
+
+          begin
+          rescue Foo, *splat, Bar => ex
+            foo
+          ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+          end
+
+      `Foo, *splat, Bar` are in the `exceptions` field. `ex` is in the `reference` field.
+  - name: RestParameterNode
+    flags: ParameterFlags
+    fields:
+      - name: name
+        type: constant?
+      - name: name_loc
+        type: location?
+      - name: operator_loc
+        type: location
+    comment: |
+      Represents a rest parameter to a method, block, or lambda definition.
+
+          def a(*b)
+                ^^
+          end
+  - name: RetryNode
+    comment: |
+      Represents the use of the `retry` keyword.
+
+          retry
+          ^^^^^
+  - name: ReturnNode
+    fields:
+      - name: keyword_loc
+        type: location
+      - name: arguments
+        type: node?
+        kind: ArgumentsNode
+    comment: |
+      Represents the use of the `return` keyword.
+
+          return 1
+          ^^^^^^^^
+  - name: SelfNode
+    comment: |
+      Represents the `self` keyword.
+
+          self
+          ^^^^
+  - name: ShareableConstantNode
+    flags: ShareableConstantNodeFlags
+    fields:
+      - name: write
+        type: node
+        kind:
+          - ConstantWriteNode
+          - ConstantAndWriteNode
+          - ConstantOrWriteNode
+          - ConstantOperatorWriteNode
+          - ConstantPathWriteNode
+          - ConstantPathAndWriteNode
+          - ConstantPathOrWriteNode
+          - ConstantPathOperatorWriteNode
+        comment: The constant write that should be modified with the shareability state.
+    comment: |
+      This node wraps a constant write to indicate that when the value is written, it should have its shareability state modified.
+
+          # shareable_constant_value: literal
+          C = { a: 1 }
+          ^^^^^^^^^^^^
+  - name: SingletonClassNode
+    fields:
+      - name: locals
+        type: constant[]
+      - name: class_keyword_loc
+        type: location
+      - name: operator_loc
+        type: location
+      - name: expression
+        type: node
+        kind: non-void expression
+      - name: body
+        type: node?
+        kind:
+          - StatementsNode
+          - BeginNode
+      - name: end_keyword_loc
+        type: location
+    comment: |
+      Represents a singleton class declaration involving the `class` keyword.
+
+          class << self end
+          ^^^^^^^^^^^^^^^^^
+  - name: SourceEncodingNode
+    comment: |
+      Represents the use of the `__ENCODING__` keyword.
+
+          __ENCODING__
+          ^^^^^^^^^^^^
+  - name: SourceFileNode
+    flags: StringFlags
+    fields:
+      - name: filepath
+        type: string
+        comment: Represents the file path being parsed. This corresponds directly to the `filepath` option given to the various `Prism::parse*` APIs.
+    comment: |
+      Represents the use of the `__FILE__` keyword.
+
+          __FILE__
+          ^^^^^^^^
+  - name: SourceLineNode
+    comment: |
+      Represents the use of the `__LINE__` keyword.
+
+          __LINE__
+          ^^^^^^^^
+  - name: SplatNode
+    fields:
+      - name: operator_loc
+        type: location
+      - name: expression
+        type: node?
+        kind: non-void expression
+    comment: |
+      Represents the use of the splat operator.
+
+          [*a]
+           ^^
+  - name: StatementsNode
+    fields:
+      - name: body
+        type: node[]
+        kind: Node
+    comment: |
+      Represents a set of statements contained within some scope.
+
+          foo; bar; baz
+          ^^^^^^^^^^^^^
+  - name: StringNode
+    flags: StringFlags
+    fields:
+      - name: opening_loc
+        type: location?
+      - name: content_loc
+        type: location
+      - name: closing_loc
+        type: location?
+      - name: unescaped
+        type: string
+    comment: |
+      Represents a string literal, a string contained within a `%w` list, or plain string content within an interpolated string.
+
+          "foo"
+          ^^^^^
+
+          %w[foo]
+             ^^^
+
+          "foo #{bar} baz"
+           ^^^^      ^^^^
+  - name: SuperNode
+    fields:
+      - name: keyword_loc
+        type: location
+      - name: lparen_loc
+        type: location?
+      - name: arguments
+        type: node?
+        kind: ArgumentsNode
+      - name: rparen_loc
+        type: location?
+      - name: block
+        type: node?
+        kind:
+          - BlockNode
+          - BlockArgumentNode
+    comment: |
+      Represents the use of the `super` keyword with parentheses or arguments.
+
+          super()
+          ^^^^^^^
+
+          super foo, bar
+          ^^^^^^^^^^^^^^
+  - name: SymbolNode
+    flags: SymbolFlags
+    fields:
+      - name: opening_loc
+        type: location?
+      - name: value_loc
+        type: location?
+      - name: closing_loc
+        type: location?
+      - name: unescaped
+        type: string
+    comment: |
+      Represents a symbol literal or a symbol contained within a `%i` list.
+
+          :foo
+          ^^^^
+
+          %i[foo]
+             ^^^
+  - name: TrueNode
+    comment: |
+      Represents the use of the literal `true` keyword.
+
+          true
+          ^^^^
+  - name: UndefNode
+    fields:
+      - name: names
+        type: node[]
+        kind:
+          - SymbolNode
+          - InterpolatedSymbolNode
+      - name: keyword_loc
+        type: location
+    comment: |
+      Represents the use of the `undef` keyword.
+
+          undef :foo, :bar, :baz
+          ^^^^^^^^^^^^^^^^^^^^^^
+  - name: UnlessNode
+    fields:
+      - name: keyword_loc
+        type: location
+        comment: |
+          The location of the `unless` keyword.
+
+              unless cond then bar end
+              ^^^^^^
+
+              bar unless cond
+                  ^^^^^^
+      - name: predicate
+        type: node
+        kind: non-void expression
+        comment: |
+          The condition to be evaluated for the unless expression. It can be any [non-void expression](https://github.com/ruby/prism/blob/main/docs/parsing_rules.md#non-void-expression).
+
+              unless cond then bar end
+                     ^^^^
+
+              bar unless cond
+                         ^^^^
+      - name: then_keyword_loc
+        type: location?
+        comment: |
+          The location of the `then` keyword, if present.
+
+              unless cond then bar end
+                          ^^^^
+      - name: statements
+        type: node?
+        kind: StatementsNode
+        comment: |
+          The body of statements that will executed if the unless condition is
+          falsey. Will be `nil` if no body is provided.
+
+              unless cond then bar end
+                               ^^^
+      - name: else_clause
+        type: node?
+        kind: ElseNode
+        comment: |
+          The else clause of the unless expression, if present.
+
+              unless cond then bar else baz end
+                                   ^^^^^^^^
+      - name: end_keyword_loc
+        type: location?
+        comment: |
+          The location of the `end` keyword, if present.
+
+              unless cond then bar end
+                                   ^^^
+    newline: predicate
+    comment: |
+      Represents the use of the `unless` keyword, either in the block form or the modifier form.
+
+          bar unless foo
+          ^^^^^^^^^^^^^^
+
+          unless foo then bar end
+          ^^^^^^^^^^^^^^^^^^^^^^^
+  - name: UntilNode
+    flags: LoopFlags
+    fields:
+      - name: keyword_loc
+        type: location
+      - name: do_keyword_loc
+        type: location?
+      - name: closing_loc
+        type: location?
+      - name: predicate
+        type: node
+        kind: non-void expression
+      - name: statements
+        type: node?
+        kind: StatementsNode
+    newline: predicate
+    comment: |
+      Represents the use of the `until` keyword, either in the block form or the modifier form.
+
+          bar until foo
+          ^^^^^^^^^^^^^
+
+          until foo do bar end
+          ^^^^^^^^^^^^^^^^^^^^
+  - name: WhenNode
+    fields:
+      - name: keyword_loc
+        type: location
+      - name: conditions
+        type: node[]
+        kind: non-void expression
+      - name: then_keyword_loc
+        type: location?
+      - name: statements
+        type: node?
+        kind: StatementsNode
+    comment: |
+      Represents the use of the `when` keyword within a case statement.
+
+          case true
+          when true
+          ^^^^^^^^^
+          end
+  - name: WhileNode
+    flags: LoopFlags
+    fields:
+      - name: keyword_loc
+        type: location
+      - name: do_keyword_loc
+        type: location?
+      - name: closing_loc
+        type: location?
+      - name: predicate
+        type: node
+        kind: non-void expression
+      - name: statements
+        type: node?
+        kind: StatementsNode
+    newline: predicate
+    comment: |
+      Represents the use of the `while` keyword, either in the block form or the modifier form.
+
+          bar while foo
+          ^^^^^^^^^^^^^
+
+          while foo do bar end
+          ^^^^^^^^^^^^^^^^^^^^
+  - name: XStringNode
+    flags: EncodingFlags
+    fields:
+      - name: opening_loc
+        type: location
+      - name: content_loc
+        type: location
+      - name: closing_loc
+        type: location
+      - name: unescaped
+        type: string
+    comment: |
+      Represents an xstring literal with no interpolation.
+
+          `foo`
+          ^^^^^
+  - name: YieldNode
+    fields:
+      - name: keyword_loc
+        type: location
+      - name: lparen_loc
+        type: location?
+      - name: arguments
+        type: node?
+        kind: ArgumentsNode
+      - name: rparen_loc
+        type: location?
+    comment: |
+      Represents the use of the `yield` keyword.
+
+          yield 1
+          ^^^^^^^
diff --git a/prism/defines.h b/prism/defines.h
new file mode 100644
index 00000000000000..e31429c7896dc5
--- /dev/null
+++ b/prism/defines.h
@@ -0,0 +1,260 @@
+/**
+ * @file defines.h
+ *
+ * Macro definitions used throughout the prism library.
+ *
+ * This file should be included first by any *.h or *.c in prism for consistency
+ * and to ensure that the macros are defined before they are used.
+ */
+#ifndef PRISM_DEFINES_H
+#define PRISM_DEFINES_H
+
+#include <ctype.h>
+#include <limits.h>
+#include <math.h>
+#include <stdarg.h>
+#include <stddef.h>
+#include <stdint.h>
+#include <stdio.h>
+#include <string.h>
+
+/**
+ * We want to be able to use the PRI* macros for printing out integers, but on
+ * some platforms they aren't included unless this is already defined.
+ */
+#define __STDC_FORMAT_MACROS
+// Include sys/types.h before inttypes.h to work around issue with
+// certain versions of GCC and newlib which causes omission of PRIx64
+#include <sys/types.h>
+#include <inttypes.h>
+
+/**
+ * When we are parsing using recursive descent, we want to protect against
+ * malicious payloads that could attempt to crash our parser. We do this by
+ * specifying a maximum depth to which we are allowed to recurse.
+ */
+#ifndef PRISM_DEPTH_MAXIMUM
+    #define PRISM_DEPTH_MAXIMUM 10000
+#endif
+
+/**
+ * By default, we compile with -fvisibility=hidden. When this is enabled, we
+ * need to mark certain functions as being publically-visible. This macro does
+ * that in a compiler-agnostic way.
+ */
+#ifndef PRISM_EXPORTED_FUNCTION
+#   ifdef PRISM_EXPORT_SYMBOLS
+#       ifdef _WIN32
+#          define PRISM_EXPORTED_FUNCTION __declspec(dllexport) extern
+#       else
+#          define PRISM_EXPORTED_FUNCTION __attribute__((__visibility__("default"))) extern
+#       endif
+#   else
+#       define PRISM_EXPORTED_FUNCTION
+#   endif
+#endif
+
+/**
+ * Certain compilers support specifying that a function accepts variadic
+ * parameters that look like printf format strings to provide a better developer
+ * experience when someone is using the function. This macro does that in a
+ * compiler-agnostic way.
+ */
+#if defined(__GNUC__)
+#   if defined(__MINGW_PRINTF_FORMAT)
+#       define PRISM_ATTRIBUTE_FORMAT(string_index, argument_index) __attribute__((format(__MINGW_PRINTF_FORMAT, string_index, argument_index)))
+#   else
+#       define PRISM_ATTRIBUTE_FORMAT(string_index, argument_index) __attribute__((format(printf, string_index, argument_index)))
+#   endif
+#elif defined(__clang__)
+#   define PRISM_ATTRIBUTE_FORMAT(string_index, argument_index) __attribute__((__format__(__printf__, string_index, argument_index)))
+#else
+#   define PRISM_ATTRIBUTE_FORMAT(string_index, argument_index)
+#endif
+
+/**
+ * GCC will warn if you specify a function or parameter that is unused at
+ * runtime. This macro allows you to mark a function or parameter as unused in a
+ * compiler-agnostic way.
+ */
+#if defined(__GNUC__)
+#   define PRISM_ATTRIBUTE_UNUSED __attribute__((unused))
+#else
+#   define PRISM_ATTRIBUTE_UNUSED
+#endif
+
+/**
+ * Old Visual Studio versions do not support the inline keyword, so we need to
+ * define it to be __inline.
+ */
+#if defined(_MSC_VER) && !defined(inline)
+#   define inline __inline
+#endif
+
+/**
+ * Old Visual Studio versions before 2015 do not implement sprintf, but instead
+ * implement _snprintf. We standard that here.
+ */
+#if !defined(snprintf) && defined(_MSC_VER) && (_MSC_VER < 1900)
+#   define snprintf _snprintf
+#endif
+
+/**
+ * A simple utility macro to concatenate two tokens together, necessary when one
+ * of the tokens is itself a macro.
+ */
+#define PM_CONCATENATE(left, right) left ## right
+
+/**
+ * We want to be able to use static assertions, but they weren't standardized
+ * until C11. As such, we polyfill it here by making a hacky typedef that will
+ * fail to compile due to a negative array size if the condition is false.
+ */
+#if defined(_Static_assert)
+#   define PM_STATIC_ASSERT(line, condition, message) _Static_assert(condition, message)
+#else
+#   define PM_STATIC_ASSERT(line, condition, message) typedef char PM_CONCATENATE(static_assert_, line)[(condition) ? 1 : -1]
+#endif
+
+/**
+ * In general, libc for embedded systems does not support memory-mapped files.
+ * If the target platform is POSIX or Windows, we can map a file in memory and
+ * read it in a more efficient manner.
+ */
+#ifdef _WIN32
+#   define PRISM_HAS_MMAP
+#else
+#   include <unistd.h>
+#   ifdef _POSIX_MAPPED_FILES
+#       define PRISM_HAS_MMAP
+#   endif
+#endif
+
+/**
+ * If PRISM_HAS_NO_FILESYSTEM is defined, then we want to exclude all filesystem
+ * related code from the library. All filesystem related code should be guarded
+ * by PRISM_HAS_FILESYSTEM.
+ */
+#ifndef PRISM_HAS_NO_FILESYSTEM
+#   define PRISM_HAS_FILESYSTEM
+#endif
+
+/**
+ * isinf on POSIX systems it accepts a float, a double, or a long double.
+ * But mingw didn't provide an isinf macro, only an isinf function that only
+ * accepts floats, so we need to use _finite instead.
+ */
+#ifdef __MINGW64__
+    #include <float.h>
+    #define PRISM_ISINF(x) (!_finite(x))
+#else
+    #define PRISM_ISINF(x) isinf(x)
+#endif
+
+/**
+ * If you build prism with a custom allocator, configure it with
+ * "-D PRISM_XALLOCATOR" to use your own allocator that defines xmalloc,
+ * xrealloc, xcalloc, and xfree.
+ *
+ * For example, your `prism_xallocator.h` file could look like this:
+ *
+ * ```
+ * #ifndef PRISM_XALLOCATOR_H
+ * #define PRISM_XALLOCATOR_H
+ * #define xmalloc      my_malloc
+ * #define xrealloc     my_realloc
+ * #define xcalloc      my_calloc
+ * #define xfree        my_free
+ * #endif
+ * ```
+ */
+#ifdef PRISM_XALLOCATOR
+    #include "prism_xallocator.h"
+#else
+    #ifndef xmalloc
+        /**
+         * The malloc function that should be used. This can be overridden with
+         * the PRISM_XALLOCATOR define.
+         */
+        #define xmalloc malloc
+    #endif
+
+    #ifndef xrealloc
+        /**
+         * The realloc function that should be used. This can be overridden with
+         * the PRISM_XALLOCATOR define.
+         */
+        #define xrealloc realloc
+    #endif
+
+    #ifndef xcalloc
+        /**
+         * The calloc function that should be used. This can be overridden with
+         * the PRISM_XALLOCATOR define.
+         */
+        #define xcalloc calloc
+    #endif
+
+    #ifndef xfree
+        /**
+         * The free function that should be used. This can be overridden with the
+         * PRISM_XALLOCATOR define.
+         */
+        #define xfree free
+    #endif
+#endif
+
+/**
+ * If PRISM_BUILD_MINIMAL is defined, then we're going to define every possible
+ * switch that will turn off certain features of prism.
+ */
+#ifdef PRISM_BUILD_MINIMAL
+    /** Exclude the serialization API. */
+    #define PRISM_EXCLUDE_SERIALIZATION
+
+    /** Exclude the JSON serialization API. */
+    #define PRISM_EXCLUDE_JSON
+
+    /** Exclude the Array#pack parser API. */
+    #define PRISM_EXCLUDE_PACK
+
+    /** Exclude the prettyprint API. */
+    #define PRISM_EXCLUDE_PRETTYPRINT
+
+    /** Exclude the full set of encodings, using the minimal only. */
+    #define PRISM_ENCODING_EXCLUDE_FULL
+#endif
+
+/**
+ * Support PRISM_LIKELY and PRISM_UNLIKELY to help the compiler optimize its
+ * branch predication.
+ */
+#if defined(__GNUC__) || defined(__clang__)
+    /** The compiler should predicate that this branch will be taken. */
+    #define PRISM_LIKELY(x) __builtin_expect(!!(x), 1)
+
+    /** The compiler should predicate that this branch will not be taken. */
+    #define PRISM_UNLIKELY(x) __builtin_expect(!!(x), 0)
+#else
+    /** Void because this platform does not support branch prediction hints. */
+    #define PRISM_LIKELY(x)   (x)
+
+    /** Void because this platform does not support branch prediction hints. */
+    #define PRISM_UNLIKELY(x) (x)
+#endif
+
+/**
+ * We use -Wimplicit-fallthrough to guard potentially unintended fall-through between cases of a switch.
+ * Use PRISM_FALLTHROUGH to explicitly annotate cases where the fallthrough is intentional.
+ */
+#if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 202311L // C23 or later
+    #define PRISM_FALLTHROUGH [[fallthrough]];
+#elif defined(__GNUC__) || defined(__clang__)
+    #define PRISM_FALLTHROUGH __attribute__((fallthrough));
+#elif defined(_MSC_VER)
+    #define PRISM_FALLTHROUGH __fallthrough;
+#else
+    #define PRISM_FALLTHROUGH
+#endif
+
+#endif
diff --git a/prism/encoding.c b/prism/encoding.c
new file mode 100644
index 00000000000000..a4aeed104f89b9
--- /dev/null
+++ b/prism/encoding.c
@@ -0,0 +1,5235 @@
+#include "prism/encoding.h"
+
+typedef uint32_t pm_unicode_codepoint_t;
+
+#define UNICODE_ALPHA_CODEPOINTS_LENGTH 1450
+static const pm_unicode_codepoint_t unicode_alpha_codepoints[UNICODE_ALPHA_CODEPOINTS_LENGTH] = {
+    0x100, 0x2C1,
+    0x2C6, 0x2D1,
+    0x2E0, 0x2E4,
+    0x2EC, 0x2EC,
+    0x2EE, 0x2EE,
+    0x345, 0x345,
+    0x370, 0x374,
+    0x376, 0x377,
+    0x37A, 0x37D,
+    0x37F, 0x37F,
+    0x386, 0x386,
+    0x388, 0x38A,
+    0x38C, 0x38C,
+    0x38E, 0x3A1,
+    0x3A3, 0x3F5,
+    0x3F7, 0x481,
+    0x48A, 0x52F,
+    0x531, 0x556,
+    0x559, 0x559,
+    0x560, 0x588,
+    0x5B0, 0x5BD,
+    0x5BF, 0x5BF,
+    0x5C1, 0x5C2,
+    0x5C4, 0x5C5,
+    0x5C7, 0x5C7,
+    0x5D0, 0x5EA,
+    0x5EF, 0x5F2,
+    0x610, 0x61A,
+    0x620, 0x657,
+    0x659, 0x65F,
+    0x66E, 0x6D3,
+    0x6D5, 0x6DC,
+    0x6E1, 0x6E8,
+    0x6ED, 0x6EF,
+    0x6FA, 0x6FC,
+    0x6FF, 0x6FF,
+    0x710, 0x73F,
+    0x74D, 0x7B1,
+    0x7CA, 0x7EA,
+    0x7F4, 0x7F5,
+    0x7FA, 0x7FA,
+    0x800, 0x817,
+    0x81A, 0x82C,
+    0x840, 0x858,
+    0x860, 0x86A,
+    0x870, 0x887,
+    0x889, 0x88E,
+    0x8A0, 0x8C9,
+    0x8D4, 0x8DF,
+    0x8E3, 0x8E9,
+    0x8F0, 0x93B,
+    0x93D, 0x94C,
+    0x94E, 0x950,
+    0x955, 0x963,
+    0x971, 0x983,
+    0x985, 0x98C,
+    0x98F, 0x990,
+    0x993, 0x9A8,
+    0x9AA, 0x9B0,
+    0x9B2, 0x9B2,
+    0x9B6, 0x9B9,
+    0x9BD, 0x9C4,
+    0x9C7, 0x9C8,
+    0x9CB, 0x9CC,
+    0x9CE, 0x9CE,
+    0x9D7, 0x9D7,
+    0x9DC, 0x9DD,
+    0x9DF, 0x9E3,
+    0x9F0, 0x9F1,
+    0x9FC, 0x9FC,
+    0xA01, 0xA03,
+    0xA05, 0xA0A,
+    0xA0F, 0xA10,
+    0xA13, 0xA28,
+    0xA2A, 0xA30,
+    0xA32, 0xA33,
+    0xA35, 0xA36,
+    0xA38, 0xA39,
+    0xA3E, 0xA42,
+    0xA47, 0xA48,
+    0xA4B, 0xA4C,
+    0xA51, 0xA51,
+    0xA59, 0xA5C,
+    0xA5E, 0xA5E,
+    0xA70, 0xA75,
+    0xA81, 0xA83,
+    0xA85, 0xA8D,
+    0xA8F, 0xA91,
+    0xA93, 0xAA8,
+    0xAAA, 0xAB0,
+    0xAB2, 0xAB3,
+    0xAB5, 0xAB9,
+    0xABD, 0xAC5,
+    0xAC7, 0xAC9,
+    0xACB, 0xACC,
+    0xAD0, 0xAD0,
+    0xAE0, 0xAE3,
+    0xAF9, 0xAFC,
+    0xB01, 0xB03,
+    0xB05, 0xB0C,
+    0xB0F, 0xB10,
+    0xB13, 0xB28,
+    0xB2A, 0xB30,
+    0xB32, 0xB33,
+    0xB35, 0xB39,
+    0xB3D, 0xB44,
+    0xB47, 0xB48,
+    0xB4B, 0xB4C,
+    0xB56, 0xB57,
+    0xB5C, 0xB5D,
+    0xB5F, 0xB63,
+    0xB71, 0xB71,
+    0xB82, 0xB83,
+    0xB85, 0xB8A,
+    0xB8E, 0xB90,
+    0xB92, 0xB95,
+    0xB99, 0xB9A,
+    0xB9C, 0xB9C,
+    0xB9E, 0xB9F,
+    0xBA3, 0xBA4,
+    0xBA8, 0xBAA,
+    0xBAE, 0xBB9,
+    0xBBE, 0xBC2,
+    0xBC6, 0xBC8,
+    0xBCA, 0xBCC,
+    0xBD0, 0xBD0,
+    0xBD7, 0xBD7,
+    0xC00, 0xC0C,
+    0xC0E, 0xC10,
+    0xC12, 0xC28,
+    0xC2A, 0xC39,
+    0xC3D, 0xC44,
+    0xC46, 0xC48,
+    0xC4A, 0xC4C,
+    0xC55, 0xC56,
+    0xC58, 0xC5A,
+    0xC5D, 0xC5D,
+    0xC60, 0xC63,
+    0xC80, 0xC83,
+    0xC85, 0xC8C,
+    0xC8E, 0xC90,
+    0xC92, 0xCA8,
+    0xCAA, 0xCB3,
+    0xCB5, 0xCB9,
+    0xCBD, 0xCC4,
+    0xCC6, 0xCC8,
+    0xCCA, 0xCCC,
+    0xCD5, 0xCD6,
+    0xCDD, 0xCDE,
+    0xCE0, 0xCE3,
+    0xCF1, 0xCF3,
+    0xD00, 0xD0C,
+    0xD0E, 0xD10,
+    0xD12, 0xD3A,
+    0xD3D, 0xD44,
+    0xD46, 0xD48,
+    0xD4A, 0xD4C,
+    0xD4E, 0xD4E,
+    0xD54, 0xD57,
+    0xD5F, 0xD63,
+    0xD7A, 0xD7F,
+    0xD81, 0xD83,
+    0xD85, 0xD96,
+    0xD9A, 0xDB1,
+    0xDB3, 0xDBB,
+    0xDBD, 0xDBD,
+    0xDC0, 0xDC6,
+    0xDCF, 0xDD4,
+    0xDD6, 0xDD6,
+    0xDD8, 0xDDF,
+    0xDF2, 0xDF3,
+    0xE01, 0xE3A,
+    0xE40, 0xE46,
+    0xE4D, 0xE4D,
+    0xE81, 0xE82,
+    0xE84, 0xE84,
+    0xE86, 0xE8A,
+    0xE8C, 0xEA3,
+    0xEA5, 0xEA5,
+    0xEA7, 0xEB9,
+    0xEBB, 0xEBD,
+    0xEC0, 0xEC4,
+    0xEC6, 0xEC6,
+    0xECD, 0xECD,
+    0xEDC, 0xEDF,
+    0xF00, 0xF00,
+    0xF40, 0xF47,
+    0xF49, 0xF6C,
+    0xF71, 0xF83,
+    0xF88, 0xF97,
+    0xF99, 0xFBC,
+    0x1000, 0x1036,
+    0x1038, 0x1038,
+    0x103B, 0x103F,
+    0x1050, 0x108F,
+    0x109A, 0x109D,
+    0x10A0, 0x10C5,
+    0x10C7, 0x10C7,
+    0x10CD, 0x10CD,
+    0x10D0, 0x10FA,
+    0x10FC, 0x1248,
+    0x124A, 0x124D,
+    0x1250, 0x1256,
+    0x1258, 0x1258,
+    0x125A, 0x125D,
+    0x1260, 0x1288,
+    0x128A, 0x128D,
+    0x1290, 0x12B0,
+    0x12B2, 0x12B5,
+    0x12B8, 0x12BE,
+    0x12C0, 0x12C0,
+    0x12C2, 0x12C5,
+    0x12C8, 0x12D6,
+    0x12D8, 0x1310,
+    0x1312, 0x1315,
+    0x1318, 0x135A,
+    0x1380, 0x138F,
+    0x13A0, 0x13F5,
+    0x13F8, 0x13FD,
+    0x1401, 0x166C,
+    0x166F, 0x167F,
+    0x1681, 0x169A,
+    0x16A0, 0x16EA,
+    0x16EE, 0x16F8,
+    0x1700, 0x1713,
+    0x171F, 0x1733,
+    0x1740, 0x1753,
+    0x1760, 0x176C,
+    0x176E, 0x1770,
+    0x1772, 0x1773,
+    0x1780, 0x17B3,
+    0x17B6, 0x17C8,
+    0x17D7, 0x17D7,
+    0x17DC, 0x17DC,
+    0x1820, 0x1878,
+    0x1880, 0x18AA,
+    0x18B0, 0x18F5,
+    0x1900, 0x191E,
+    0x1920, 0x192B,
+    0x1930, 0x1938,
+    0x1950, 0x196D,
+    0x1970, 0x1974,
+    0x1980, 0x19AB,
+    0x19B0, 0x19C9,
+    0x1A00, 0x1A1B,
+    0x1A20, 0x1A5E,
+    0x1A61, 0x1A74,
+    0x1AA7, 0x1AA7,
+    0x1ABF, 0x1AC0,
+    0x1ACC, 0x1ACE,
+    0x1B00, 0x1B33,
+    0x1B35, 0x1B43,
+    0x1B45, 0x1B4C,
+    0x1B80, 0x1BA9,
+    0x1BAC, 0x1BAF,
+    0x1BBA, 0x1BE5,
+    0x1BE7, 0x1BF1,
+    0x1C00, 0x1C36,
+    0x1C4D, 0x1C4F,
+    0x1C5A, 0x1C7D,
+    0x1C80, 0x1C88,
+    0x1C90, 0x1CBA,
+    0x1CBD, 0x1CBF,
+    0x1CE9, 0x1CEC,
+    0x1CEE, 0x1CF3,
+    0x1CF5, 0x1CF6,
+    0x1CFA, 0x1CFA,
+    0x1D00, 0x1DBF,
+    0x1DE7, 0x1DF4,
+    0x1E00, 0x1F15,
+    0x1F18, 0x1F1D,
+    0x1F20, 0x1F45,
+    0x1F48, 0x1F4D,
+    0x1F50, 0x1F57,
+    0x1F59, 0x1F59,
+    0x1F5B, 0x1F5B,
+    0x1F5D, 0x1F5D,
+    0x1F5F, 0x1F7D,
+    0x1F80, 0x1FB4,
+    0x1FB6, 0x1FBC,
+    0x1FBE, 0x1FBE,
+    0x1FC2, 0x1FC4,
+    0x1FC6, 0x1FCC,
+    0x1FD0, 0x1FD3,
+    0x1FD6, 0x1FDB,
+    0x1FE0, 0x1FEC,
+    0x1FF2, 0x1FF4,
+    0x1FF6, 0x1FFC,
+    0x2071, 0x2071,
+    0x207F, 0x207F,
+    0x2090, 0x209C,
+    0x2102, 0x2102,
+    0x2107, 0x2107,
+    0x210A, 0x2113,
+    0x2115, 0x2115,
+    0x2119, 0x211D,
+    0x2124, 0x2124,
+    0x2126, 0x2126,
+    0x2128, 0x2128,
+    0x212A, 0x212D,
+    0x212F, 0x2139,
+    0x213C, 0x213F,
+    0x2145, 0x2149,
+    0x214E, 0x214E,
+    0x2160, 0x2188,
+    0x24B6, 0x24E9,
+    0x2C00, 0x2CE4,
+    0x2CEB, 0x2CEE,
+    0x2CF2, 0x2CF3,
+    0x2D00, 0x2D25,
+    0x2D27, 0x2D27,
+    0x2D2D, 0x2D2D,
+    0x2D30, 0x2D67,
+    0x2D6F, 0x2D6F,
+    0x2D80, 0x2D96,
+    0x2DA0, 0x2DA6,
+    0x2DA8, 0x2DAE,
+    0x2DB0, 0x2DB6,
+    0x2DB8, 0x2DBE,
+    0x2DC0, 0x2DC6,
+    0x2DC8, 0x2DCE,
+    0x2DD0, 0x2DD6,
+    0x2DD8, 0x2DDE,
+    0x2DE0, 0x2DFF,
+    0x2E2F, 0x2E2F,
+    0x3005, 0x3007,
+    0x3021, 0x3029,
+    0x3031, 0x3035,
+    0x3038, 0x303C,
+    0x3041, 0x3096,
+    0x309D, 0x309F,
+    0x30A1, 0x30FA,
+    0x30FC, 0x30FF,
+    0x3105, 0x312F,
+    0x3131, 0x318E,
+    0x31A0, 0x31BF,
+    0x31F0, 0x31FF,
+    0x3400, 0x4DBF,
+    0x4E00, 0xA48C,
+    0xA4D0, 0xA4FD,
+    0xA500, 0xA60C,
+    0xA610, 0xA61F,
+    0xA62A, 0xA62B,
+    0xA640, 0xA66E,
+    0xA674, 0xA67B,
+    0xA67F, 0xA6EF,
+    0xA717, 0xA71F,
+    0xA722, 0xA788,
+    0xA78B, 0xA7CA,
+    0xA7D0, 0xA7D1,
+    0xA7D3, 0xA7D3,
+    0xA7D5, 0xA7D9,
+    0xA7F2, 0xA805,
+    0xA807, 0xA827,
+    0xA840, 0xA873,
+    0xA880, 0xA8C3,
+    0xA8C5, 0xA8C5,
+    0xA8F2, 0xA8F7,
+    0xA8FB, 0xA8FB,
+    0xA8FD, 0xA8FF,
+    0xA90A, 0xA92A,
+    0xA930, 0xA952,
+    0xA960, 0xA97C,
+    0xA980, 0xA9B2,
+    0xA9B4, 0xA9BF,
+    0xA9CF, 0xA9CF,
+    0xA9E0, 0xA9EF,
+    0xA9FA, 0xA9FE,
+    0xAA00, 0xAA36,
+    0xAA40, 0xAA4D,
+    0xAA60, 0xAA76,
+    0xAA7A, 0xAABE,
+    0xAAC0, 0xAAC0,
+    0xAAC2, 0xAAC2,
+    0xAADB, 0xAADD,
+    0xAAE0, 0xAAEF,
+    0xAAF2, 0xAAF5,
+    0xAB01, 0xAB06,
+    0xAB09, 0xAB0E,
+    0xAB11, 0xAB16,
+    0xAB20, 0xAB26,
+    0xAB28, 0xAB2E,
+    0xAB30, 0xAB5A,
+    0xAB5C, 0xAB69,
+    0xAB70, 0xABEA,
+    0xAC00, 0xD7A3,
+    0xD7B0, 0xD7C6,
+    0xD7CB, 0xD7FB,
+    0xF900, 0xFA6D,
+    0xFA70, 0xFAD9,
+    0xFB00, 0xFB06,
+    0xFB13, 0xFB17,
+    0xFB1D, 0xFB28,
+    0xFB2A, 0xFB36,
+    0xFB38, 0xFB3C,
+    0xFB3E, 0xFB3E,
+    0xFB40, 0xFB41,
+    0xFB43, 0xFB44,
+    0xFB46, 0xFBB1,
+    0xFBD3, 0xFD3D,
+    0xFD50, 0xFD8F,
+    0xFD92, 0xFDC7,
+    0xFDF0, 0xFDFB,
+    0xFE70, 0xFE74,
+    0xFE76, 0xFEFC,
+    0xFF21, 0xFF3A,
+    0xFF41, 0xFF5A,
+    0xFF66, 0xFFBE,
+    0xFFC2, 0xFFC7,
+    0xFFCA, 0xFFCF,
+    0xFFD2, 0xFFD7,
+    0xFFDA, 0xFFDC,
+    0x10000, 0x1000B,
+    0x1000D, 0x10026,
+    0x10028, 0x1003A,
+    0x1003C, 0x1003D,
+    0x1003F, 0x1004D,
+    0x10050, 0x1005D,
+    0x10080, 0x100FA,
+    0x10140, 0x10174,
+    0x10280, 0x1029C,
+    0x102A0, 0x102D0,
+    0x10300, 0x1031F,
+    0x1032D, 0x1034A,
+    0x10350, 0x1037A,
+    0x10380, 0x1039D,
+    0x103A0, 0x103C3,
+    0x103C8, 0x103CF,
+    0x103D1, 0x103D5,
+    0x10400, 0x1049D,
+    0x104B0, 0x104D3,
+    0x104D8, 0x104FB,
+    0x10500, 0x10527,
+    0x10530, 0x10563,
+    0x10570, 0x1057A,
+    0x1057C, 0x1058A,
+    0x1058C, 0x10592,
+    0x10594, 0x10595,
+    0x10597, 0x105A1,
+    0x105A3, 0x105B1,
+    0x105B3, 0x105B9,
+    0x105BB, 0x105BC,
+    0x10600, 0x10736,
+    0x10740, 0x10755,
+    0x10760, 0x10767,
+    0x10780, 0x10785,
+    0x10787, 0x107B0,
+    0x107B2, 0x107BA,
+    0x10800, 0x10805,
+    0x10808, 0x10808,
+    0x1080A, 0x10835,
+    0x10837, 0x10838,
+    0x1083C, 0x1083C,
+    0x1083F, 0x10855,
+    0x10860, 0x10876,
+    0x10880, 0x1089E,
+    0x108E0, 0x108F2,
+    0x108F4, 0x108F5,
+    0x10900, 0x10915,
+    0x10920, 0x10939,
+    0x10980, 0x109B7,
+    0x109BE, 0x109BF,
+    0x10A00, 0x10A03,
+    0x10A05, 0x10A06,
+    0x10A0C, 0x10A13,
+    0x10A15, 0x10A17,
+    0x10A19, 0x10A35,
+    0x10A60, 0x10A7C,
+    0x10A80, 0x10A9C,
+    0x10AC0, 0x10AC7,
+    0x10AC9, 0x10AE4,
+    0x10B00, 0x10B35,
+    0x10B40, 0x10B55,
+    0x10B60, 0x10B72,
+    0x10B80, 0x10B91,
+    0x10C00, 0x10C48,
+    0x10C80, 0x10CB2,
+    0x10CC0, 0x10CF2,
+    0x10D00, 0x10D27,
+    0x10E80, 0x10EA9,
+    0x10EAB, 0x10EAC,
+    0x10EB0, 0x10EB1,
+    0x10F00, 0x10F1C,
+    0x10F27, 0x10F27,
+    0x10F30, 0x10F45,
+    0x10F70, 0x10F81,
+    0x10FB0, 0x10FC4,
+    0x10FE0, 0x10FF6,
+    0x11000, 0x11045,
+    0x11071, 0x11075,
+    0x11080, 0x110B8,
+    0x110C2, 0x110C2,
+    0x110D0, 0x110E8,
+    0x11100, 0x11132,
+    0x11144, 0x11147,
+    0x11150, 0x11172,
+    0x11176, 0x11176,
+    0x11180, 0x111BF,
+    0x111C1, 0x111C4,
+    0x111CE, 0x111CF,
+    0x111DA, 0x111DA,
+    0x111DC, 0x111DC,
+    0x11200, 0x11211,
+    0x11213, 0x11234,
+    0x11237, 0x11237,
+    0x1123E, 0x11241,
+    0x11280, 0x11286,
+    0x11288, 0x11288,
+    0x1128A, 0x1128D,
+    0x1128F, 0x1129D,
+    0x1129F, 0x112A8,
+    0x112B0, 0x112E8,
+    0x11300, 0x11303,
+    0x11305, 0x1130C,
+    0x1130F, 0x11310,
+    0x11313, 0x11328,
+    0x1132A, 0x11330,
+    0x11332, 0x11333,
+    0x11335, 0x11339,
+    0x1133D, 0x11344,
+    0x11347, 0x11348,
+    0x1134B, 0x1134C,
+    0x11350, 0x11350,
+    0x11357, 0x11357,
+    0x1135D, 0x11363,
+    0x11400, 0x11441,
+    0x11443, 0x11445,
+    0x11447, 0x1144A,
+    0x1145F, 0x11461,
+    0x11480, 0x114C1,
+    0x114C4, 0x114C5,
+    0x114C7, 0x114C7,
+    0x11580, 0x115B5,
+    0x115B8, 0x115BE,
+    0x115D8, 0x115DD,
+    0x11600, 0x1163E,
+    0x11640, 0x11640,
+    0x11644, 0x11644,
+    0x11680, 0x116B5,
+    0x116B8, 0x116B8,
+    0x11700, 0x1171A,
+    0x1171D, 0x1172A,
+    0x11740, 0x11746,
+    0x11800, 0x11838,
+    0x118A0, 0x118DF,
+    0x118FF, 0x11906,
+    0x11909, 0x11909,
+    0x1190C, 0x11913,
+    0x11915, 0x11916,
+    0x11918, 0x11935,
+    0x11937, 0x11938,
+    0x1193B, 0x1193C,
+    0x1193F, 0x11942,
+    0x119A0, 0x119A7,
+    0x119AA, 0x119D7,
+    0x119DA, 0x119DF,
+    0x119E1, 0x119E1,
+    0x119E3, 0x119E4,
+    0x11A00, 0x11A32,
+    0x11A35, 0x11A3E,
+    0x11A50, 0x11A97,
+    0x11A9D, 0x11A9D,
+    0x11AB0, 0x11AF8,
+    0x11C00, 0x11C08,
+    0x11C0A, 0x11C36,
+    0x11C38, 0x11C3E,
+    0x11C40, 0x11C40,
+    0x11C72, 0x11C8F,
+    0x11C92, 0x11CA7,
+    0x11CA9, 0x11CB6,
+    0x11D00, 0x11D06,
+    0x11D08, 0x11D09,
+    0x11D0B, 0x11D36,
+    0x11D3A, 0x11D3A,
+    0x11D3C, 0x11D3D,
+    0x11D3F, 0x11D41,
+    0x11D43, 0x11D43,
+    0x11D46, 0x11D47,
+    0x11D60, 0x11D65,
+    0x11D67, 0x11D68,
+    0x11D6A, 0x11D8E,
+    0x11D90, 0x11D91,
+    0x11D93, 0x11D96,
+    0x11D98, 0x11D98,
+    0x11EE0, 0x11EF6,
+    0x11F00, 0x11F10,
+    0x11F12, 0x11F3A,
+    0x11F3E, 0x11F40,
+    0x11FB0, 0x11FB0,
+    0x12000, 0x12399,
+    0x12400, 0x1246E,
+    0x12480, 0x12543,
+    0x12F90, 0x12FF0,
+    0x13000, 0x1342F,
+    0x13441, 0x13446,
+    0x14400, 0x14646,
+    0x16800, 0x16A38,
+    0x16A40, 0x16A5E,
+    0x16A70, 0x16ABE,
+    0x16AD0, 0x16AED,
+    0x16B00, 0x16B2F,
+    0x16B40, 0x16B43,
+    0x16B63, 0x16B77,
+    0x16B7D, 0x16B8F,
+    0x16E40, 0x16E7F,
+    0x16F00, 0x16F4A,
+    0x16F4F, 0x16F87,
+    0x16F8F, 0x16F9F,
+    0x16FE0, 0x16FE1,
+    0x16FE3, 0x16FE3,
+    0x16FF0, 0x16FF1,
+    0x17000, 0x187F7,
+    0x18800, 0x18CD5,
+    0x18D00, 0x18D08,
+    0x1AFF0, 0x1AFF3,
+    0x1AFF5, 0x1AFFB,
+    0x1AFFD, 0x1AFFE,
+    0x1B000, 0x1B122,
+    0x1B132, 0x1B132,
+    0x1B150, 0x1B152,
+    0x1B155, 0x1B155,
+    0x1B164, 0x1B167,
+    0x1B170, 0x1B2FB,
+    0x1BC00, 0x1BC6A,
+    0x1BC70, 0x1BC7C,
+    0x1BC80, 0x1BC88,
+    0x1BC90, 0x1BC99,
+    0x1BC9E, 0x1BC9E,
+    0x1D400, 0x1D454,
+    0x1D456, 0x1D49C,
+    0x1D49E, 0x1D49F,
+    0x1D4A2, 0x1D4A2,
+    0x1D4A5, 0x1D4A6,
+    0x1D4A9, 0x1D4AC,
+    0x1D4AE, 0x1D4B9,
+    0x1D4BB, 0x1D4BB,
+    0x1D4BD, 0x1D4C3,
+    0x1D4C5, 0x1D505,
+    0x1D507, 0x1D50A,
+    0x1D50D, 0x1D514,
+    0x1D516, 0x1D51C,
+    0x1D51E, 0x1D539,
+    0x1D53B, 0x1D53E,
+    0x1D540, 0x1D544,
+    0x1D546, 0x1D546,
+    0x1D54A, 0x1D550,
+    0x1D552, 0x1D6A5,
+    0x1D6A8, 0x1D6C0,
+    0x1D6C2, 0x1D6DA,
+    0x1D6DC, 0x1D6FA,
+    0x1D6FC, 0x1D714,
+    0x1D716, 0x1D734,
+    0x1D736, 0x1D74E,
+    0x1D750, 0x1D76E,
+    0x1D770, 0x1D788,
+    0x1D78A, 0x1D7A8,
+    0x1D7AA, 0x1D7C2,
+    0x1D7C4, 0x1D7CB,
+    0x1DF00, 0x1DF1E,
+    0x1DF25, 0x1DF2A,
+    0x1E000, 0x1E006,
+    0x1E008, 0x1E018,
+    0x1E01B, 0x1E021,
+    0x1E023, 0x1E024,
+    0x1E026, 0x1E02A,
+    0x1E030, 0x1E06D,
+    0x1E08F, 0x1E08F,
+    0x1E100, 0x1E12C,
+    0x1E137, 0x1E13D,
+    0x1E14E, 0x1E14E,
+    0x1E290, 0x1E2AD,
+    0x1E2C0, 0x1E2EB,
+    0x1E4D0, 0x1E4EB,
+    0x1E7E0, 0x1E7E6,
+    0x1E7E8, 0x1E7EB,
+    0x1E7ED, 0x1E7EE,
+    0x1E7F0, 0x1E7FE,
+    0x1E800, 0x1E8C4,
+    0x1E900, 0x1E943,
+    0x1E947, 0x1E947,
+    0x1E94B, 0x1E94B,
+    0x1EE00, 0x1EE03,
+    0x1EE05, 0x1EE1F,
+    0x1EE21, 0x1EE22,
+    0x1EE24, 0x1EE24,
+    0x1EE27, 0x1EE27,
+    0x1EE29, 0x1EE32,
+    0x1EE34, 0x1EE37,
+    0x1EE39, 0x1EE39,
+    0x1EE3B, 0x1EE3B,
+    0x1EE42, 0x1EE42,
+    0x1EE47, 0x1EE47,
+    0x1EE49, 0x1EE49,
+    0x1EE4B, 0x1EE4B,
+    0x1EE4D, 0x1EE4F,
+    0x1EE51, 0x1EE52,
+    0x1EE54, 0x1EE54,
+    0x1EE57, 0x1EE57,
+    0x1EE59, 0x1EE59,
+    0x1EE5B, 0x1EE5B,
+    0x1EE5D, 0x1EE5D,
+    0x1EE5F, 0x1EE5F,
+    0x1EE61, 0x1EE62,
+    0x1EE64, 0x1EE64,
+    0x1EE67, 0x1EE6A,
+    0x1EE6C, 0x1EE72,
+    0x1EE74, 0x1EE77,
+    0x1EE79, 0x1EE7C,
+    0x1EE7E, 0x1EE7E,
+    0x1EE80, 0x1EE89,
+    0x1EE8B, 0x1EE9B,
+    0x1EEA1, 0x1EEA3,
+    0x1EEA5, 0x1EEA9,
+    0x1EEAB, 0x1EEBB,
+    0x1F130, 0x1F149,
+    0x1F150, 0x1F169,
+    0x1F170, 0x1F189,
+    0x20000, 0x2A6DF,
+    0x2A700, 0x2B739,
+    0x2B740, 0x2B81D,
+    0x2B820, 0x2CEA1,
+    0x2CEB0, 0x2EBE0,
+    0x2F800, 0x2FA1D,
+    0x30000, 0x3134A,
+    0x31350, 0x323AF,
+};
+
+#define UNICODE_ALNUM_CODEPOINTS_LENGTH 1528
+static const pm_unicode_codepoint_t unicode_alnum_codepoints[UNICODE_ALNUM_CODEPOINTS_LENGTH] = {
+    0x100, 0x2C1,
+    0x2C6, 0x2D1,
+    0x2E0, 0x2E4,
+    0x2EC, 0x2EC,
+    0x2EE, 0x2EE,
+    0x345, 0x345,
+    0x370, 0x374,
+    0x376, 0x377,
+    0x37A, 0x37D,
+    0x37F, 0x37F,
+    0x386, 0x386,
+    0x388, 0x38A,
+    0x38C, 0x38C,
+    0x38E, 0x3A1,
+    0x3A3, 0x3F5,
+    0x3F7, 0x481,
+    0x48A, 0x52F,
+    0x531, 0x556,
+    0x559, 0x559,
+    0x560, 0x588,
+    0x5B0, 0x5BD,
+    0x5BF, 0x5BF,
+    0x5C1, 0x5C2,
+    0x5C4, 0x5C5,
+    0x5C7, 0x5C7,
+    0x5D0, 0x5EA,
+    0x5EF, 0x5F2,
+    0x610, 0x61A,
+    0x620, 0x657,
+    0x659, 0x669,
+    0x66E, 0x6D3,
+    0x6D5, 0x6DC,
+    0x6E1, 0x6E8,
+    0x6ED, 0x6FC,
+    0x6FF, 0x6FF,
+    0x710, 0x73F,
+    0x74D, 0x7B1,
+    0x7C0, 0x7EA,
+    0x7F4, 0x7F5,
+    0x7FA, 0x7FA,
+    0x800, 0x817,
+    0x81A, 0x82C,
+    0x840, 0x858,
+    0x860, 0x86A,
+    0x870, 0x887,
+    0x889, 0x88E,
+    0x8A0, 0x8C9,
+    0x8D4, 0x8DF,
+    0x8E3, 0x8E9,
+    0x8F0, 0x93B,
+    0x93D, 0x94C,
+    0x94E, 0x950,
+    0x955, 0x963,
+    0x966, 0x96F,
+    0x971, 0x983,
+    0x985, 0x98C,
+    0x98F, 0x990,
+    0x993, 0x9A8,
+    0x9AA, 0x9B0,
+    0x9B2, 0x9B2,
+    0x9B6, 0x9B9,
+    0x9BD, 0x9C4,
+    0x9C7, 0x9C8,
+    0x9CB, 0x9CC,
+    0x9CE, 0x9CE,
+    0x9D7, 0x9D7,
+    0x9DC, 0x9DD,
+    0x9DF, 0x9E3,
+    0x9E6, 0x9F1,
+    0x9FC, 0x9FC,
+    0xA01, 0xA03,
+    0xA05, 0xA0A,
+    0xA0F, 0xA10,
+    0xA13, 0xA28,
+    0xA2A, 0xA30,
+    0xA32, 0xA33,
+    0xA35, 0xA36,
+    0xA38, 0xA39,
+    0xA3E, 0xA42,
+    0xA47, 0xA48,
+    0xA4B, 0xA4C,
+    0xA51, 0xA51,
+    0xA59, 0xA5C,
+    0xA5E, 0xA5E,
+    0xA66, 0xA75,
+    0xA81, 0xA83,
+    0xA85, 0xA8D,
+    0xA8F, 0xA91,
+    0xA93, 0xAA8,
+    0xAAA, 0xAB0,
+    0xAB2, 0xAB3,
+    0xAB5, 0xAB9,
+    0xABD, 0xAC5,
+    0xAC7, 0xAC9,
+    0xACB, 0xACC,
+    0xAD0, 0xAD0,
+    0xAE0, 0xAE3,
+    0xAE6, 0xAEF,
+    0xAF9, 0xAFC,
+    0xB01, 0xB03,
+    0xB05, 0xB0C,
+    0xB0F, 0xB10,
+    0xB13, 0xB28,
+    0xB2A, 0xB30,
+    0xB32, 0xB33,
+    0xB35, 0xB39,
+    0xB3D, 0xB44,
+    0xB47, 0xB48,
+    0xB4B, 0xB4C,
+    0xB56, 0xB57,
+    0xB5C, 0xB5D,
+    0xB5F, 0xB63,
+    0xB66, 0xB6F,
+    0xB71, 0xB71,
+    0xB82, 0xB83,
+    0xB85, 0xB8A,
+    0xB8E, 0xB90,
+    0xB92, 0xB95,
+    0xB99, 0xB9A,
+    0xB9C, 0xB9C,
+    0xB9E, 0xB9F,
+    0xBA3, 0xBA4,
+    0xBA8, 0xBAA,
+    0xBAE, 0xBB9,
+    0xBBE, 0xBC2,
+    0xBC6, 0xBC8,
+    0xBCA, 0xBCC,
+    0xBD0, 0xBD0,
+    0xBD7, 0xBD7,
+    0xBE6, 0xBEF,
+    0xC00, 0xC0C,
+    0xC0E, 0xC10,
+    0xC12, 0xC28,
+    0xC2A, 0xC39,
+    0xC3D, 0xC44,
+    0xC46, 0xC48,
+    0xC4A, 0xC4C,
+    0xC55, 0xC56,
+    0xC58, 0xC5A,
+    0xC5D, 0xC5D,
+    0xC60, 0xC63,
+    0xC66, 0xC6F,
+    0xC80, 0xC83,
+    0xC85, 0xC8C,
+    0xC8E, 0xC90,
+    0xC92, 0xCA8,
+    0xCAA, 0xCB3,
+    0xCB5, 0xCB9,
+    0xCBD, 0xCC4,
+    0xCC6, 0xCC8,
+    0xCCA, 0xCCC,
+    0xCD5, 0xCD6,
+    0xCDD, 0xCDE,
+    0xCE0, 0xCE3,
+    0xCE6, 0xCEF,
+    0xCF1, 0xCF3,
+    0xD00, 0xD0C,
+    0xD0E, 0xD10,
+    0xD12, 0xD3A,
+    0xD3D, 0xD44,
+    0xD46, 0xD48,
+    0xD4A, 0xD4C,
+    0xD4E, 0xD4E,
+    0xD54, 0xD57,
+    0xD5F, 0xD63,
+    0xD66, 0xD6F,
+    0xD7A, 0xD7F,
+    0xD81, 0xD83,
+    0xD85, 0xD96,
+    0xD9A, 0xDB1,
+    0xDB3, 0xDBB,
+    0xDBD, 0xDBD,
+    0xDC0, 0xDC6,
+    0xDCF, 0xDD4,
+    0xDD6, 0xDD6,
+    0xDD8, 0xDDF,
+    0xDE6, 0xDEF,
+    0xDF2, 0xDF3,
+    0xE01, 0xE3A,
+    0xE40, 0xE46,
+    0xE4D, 0xE4D,
+    0xE50, 0xE59,
+    0xE81, 0xE82,
+    0xE84, 0xE84,
+    0xE86, 0xE8A,
+    0xE8C, 0xEA3,
+    0xEA5, 0xEA5,
+    0xEA7, 0xEB9,
+    0xEBB, 0xEBD,
+    0xEC0, 0xEC4,
+    0xEC6, 0xEC6,
+    0xECD, 0xECD,
+    0xED0, 0xED9,
+    0xEDC, 0xEDF,
+    0xF00, 0xF00,
+    0xF20, 0xF29,
+    0xF40, 0xF47,
+    0xF49, 0xF6C,
+    0xF71, 0xF83,
+    0xF88, 0xF97,
+    0xF99, 0xFBC,
+    0x1000, 0x1036,
+    0x1038, 0x1038,
+    0x103B, 0x1049,
+    0x1050, 0x109D,
+    0x10A0, 0x10C5,
+    0x10C7, 0x10C7,
+    0x10CD, 0x10CD,
+    0x10D0, 0x10FA,
+    0x10FC, 0x1248,
+    0x124A, 0x124D,
+    0x1250, 0x1256,
+    0x1258, 0x1258,
+    0x125A, 0x125D,
+    0x1260, 0x1288,
+    0x128A, 0x128D,
+    0x1290, 0x12B0,
+    0x12B2, 0x12B5,
+    0x12B8, 0x12BE,
+    0x12C0, 0x12C0,
+    0x12C2, 0x12C5,
+    0x12C8, 0x12D6,
+    0x12D8, 0x1310,
+    0x1312, 0x1315,
+    0x1318, 0x135A,
+    0x1380, 0x138F,
+    0x13A0, 0x13F5,
+    0x13F8, 0x13FD,
+    0x1401, 0x166C,
+    0x166F, 0x167F,
+    0x1681, 0x169A,
+    0x16A0, 0x16EA,
+    0x16EE, 0x16F8,
+    0x1700, 0x1713,
+    0x171F, 0x1733,
+    0x1740, 0x1753,
+    0x1760, 0x176C,
+    0x176E, 0x1770,
+    0x1772, 0x1773,
+    0x1780, 0x17B3,
+    0x17B6, 0x17C8,
+    0x17D7, 0x17D7,
+    0x17DC, 0x17DC,
+    0x17E0, 0x17E9,
+    0x1810, 0x1819,
+    0x1820, 0x1878,
+    0x1880, 0x18AA,
+    0x18B0, 0x18F5,
+    0x1900, 0x191E,
+    0x1920, 0x192B,
+    0x1930, 0x1938,
+    0x1946, 0x196D,
+    0x1970, 0x1974,
+    0x1980, 0x19AB,
+    0x19B0, 0x19C9,
+    0x19D0, 0x19D9,
+    0x1A00, 0x1A1B,
+    0x1A20, 0x1A5E,
+    0x1A61, 0x1A74,
+    0x1A80, 0x1A89,
+    0x1A90, 0x1A99,
+    0x1AA7, 0x1AA7,
+    0x1ABF, 0x1AC0,
+    0x1ACC, 0x1ACE,
+    0x1B00, 0x1B33,
+    0x1B35, 0x1B43,
+    0x1B45, 0x1B4C,
+    0x1B50, 0x1B59,
+    0x1B80, 0x1BA9,
+    0x1BAC, 0x1BE5,
+    0x1BE7, 0x1BF1,
+    0x1C00, 0x1C36,
+    0x1C40, 0x1C49,
+    0x1C4D, 0x1C7D,
+    0x1C80, 0x1C88,
+    0x1C90, 0x1CBA,
+    0x1CBD, 0x1CBF,
+    0x1CE9, 0x1CEC,
+    0x1CEE, 0x1CF3,
+    0x1CF5, 0x1CF6,
+    0x1CFA, 0x1CFA,
+    0x1D00, 0x1DBF,
+    0x1DE7, 0x1DF4,
+    0x1E00, 0x1F15,
+    0x1F18, 0x1F1D,
+    0x1F20, 0x1F45,
+    0x1F48, 0x1F4D,
+    0x1F50, 0x1F57,
+    0x1F59, 0x1F59,
+    0x1F5B, 0x1F5B,
+    0x1F5D, 0x1F5D,
+    0x1F5F, 0x1F7D,
+    0x1F80, 0x1FB4,
+    0x1FB6, 0x1FBC,
+    0x1FBE, 0x1FBE,
+    0x1FC2, 0x1FC4,
+    0x1FC6, 0x1FCC,
+    0x1FD0, 0x1FD3,
+    0x1FD6, 0x1FDB,
+    0x1FE0, 0x1FEC,
+    0x1FF2, 0x1FF4,
+    0x1FF6, 0x1FFC,
+    0x2071, 0x2071,
+    0x207F, 0x207F,
+    0x2090, 0x209C,
+    0x2102, 0x2102,
+    0x2107, 0x2107,
+    0x210A, 0x2113,
+    0x2115, 0x2115,
+    0x2119, 0x211D,
+    0x2124, 0x2124,
+    0x2126, 0x2126,
+    0x2128, 0x2128,
+    0x212A, 0x212D,
+    0x212F, 0x2139,
+    0x213C, 0x213F,
+    0x2145, 0x2149,
+    0x214E, 0x214E,
+    0x2160, 0x2188,
+    0x24B6, 0x24E9,
+    0x2C00, 0x2CE4,
+    0x2CEB, 0x2CEE,
+    0x2CF2, 0x2CF3,
+    0x2D00, 0x2D25,
+    0x2D27, 0x2D27,
+    0x2D2D, 0x2D2D,
+    0x2D30, 0x2D67,
+    0x2D6F, 0x2D6F,
+    0x2D80, 0x2D96,
+    0x2DA0, 0x2DA6,
+    0x2DA8, 0x2DAE,
+    0x2DB0, 0x2DB6,
+    0x2DB8, 0x2DBE,
+    0x2DC0, 0x2DC6,
+    0x2DC8, 0x2DCE,
+    0x2DD0, 0x2DD6,
+    0x2DD8, 0x2DDE,
+    0x2DE0, 0x2DFF,
+    0x2E2F, 0x2E2F,
+    0x3005, 0x3007,
+    0x3021, 0x3029,
+    0x3031, 0x3035,
+    0x3038, 0x303C,
+    0x3041, 0x3096,
+    0x309D, 0x309F,
+    0x30A1, 0x30FA,
+    0x30FC, 0x30FF,
+    0x3105, 0x312F,
+    0x3131, 0x318E,
+    0x31A0, 0x31BF,
+    0x31F0, 0x31FF,
+    0x3400, 0x4DBF,
+    0x4E00, 0xA48C,
+    0xA4D0, 0xA4FD,
+    0xA500, 0xA60C,
+    0xA610, 0xA62B,
+    0xA640, 0xA66E,
+    0xA674, 0xA67B,
+    0xA67F, 0xA6EF,
+    0xA717, 0xA71F,
+    0xA722, 0xA788,
+    0xA78B, 0xA7CA,
+    0xA7D0, 0xA7D1,
+    0xA7D3, 0xA7D3,
+    0xA7D5, 0xA7D9,
+    0xA7F2, 0xA805,
+    0xA807, 0xA827,
+    0xA840, 0xA873,
+    0xA880, 0xA8C3,
+    0xA8C5, 0xA8C5,
+    0xA8D0, 0xA8D9,
+    0xA8F2, 0xA8F7,
+    0xA8FB, 0xA8FB,
+    0xA8FD, 0xA92A,
+    0xA930, 0xA952,
+    0xA960, 0xA97C,
+    0xA980, 0xA9B2,
+    0xA9B4, 0xA9BF,
+    0xA9CF, 0xA9D9,
+    0xA9E0, 0xA9FE,
+    0xAA00, 0xAA36,
+    0xAA40, 0xAA4D,
+    0xAA50, 0xAA59,
+    0xAA60, 0xAA76,
+    0xAA7A, 0xAABE,
+    0xAAC0, 0xAAC0,
+    0xAAC2, 0xAAC2,
+    0xAADB, 0xAADD,
+    0xAAE0, 0xAAEF,
+    0xAAF2, 0xAAF5,
+    0xAB01, 0xAB06,
+    0xAB09, 0xAB0E,
+    0xAB11, 0xAB16,
+    0xAB20, 0xAB26,
+    0xAB28, 0xAB2E,
+    0xAB30, 0xAB5A,
+    0xAB5C, 0xAB69,
+    0xAB70, 0xABEA,
+    0xABF0, 0xABF9,
+    0xAC00, 0xD7A3,
+    0xD7B0, 0xD7C6,
+    0xD7CB, 0xD7FB,
+    0xF900, 0xFA6D,
+    0xFA70, 0xFAD9,
+    0xFB00, 0xFB06,
+    0xFB13, 0xFB17,
+    0xFB1D, 0xFB28,
+    0xFB2A, 0xFB36,
+    0xFB38, 0xFB3C,
+    0xFB3E, 0xFB3E,
+    0xFB40, 0xFB41,
+    0xFB43, 0xFB44,
+    0xFB46, 0xFBB1,
+    0xFBD3, 0xFD3D,
+    0xFD50, 0xFD8F,
+    0xFD92, 0xFDC7,
+    0xFDF0, 0xFDFB,
+    0xFE70, 0xFE74,
+    0xFE76, 0xFEFC,
+    0xFF10, 0xFF19,
+    0xFF21, 0xFF3A,
+    0xFF41, 0xFF5A,
+    0xFF66, 0xFFBE,
+    0xFFC2, 0xFFC7,
+    0xFFCA, 0xFFCF,
+    0xFFD2, 0xFFD7,
+    0xFFDA, 0xFFDC,
+    0x10000, 0x1000B,
+    0x1000D, 0x10026,
+    0x10028, 0x1003A,
+    0x1003C, 0x1003D,
+    0x1003F, 0x1004D,
+    0x10050, 0x1005D,
+    0x10080, 0x100FA,
+    0x10140, 0x10174,
+    0x10280, 0x1029C,
+    0x102A0, 0x102D0,
+    0x10300, 0x1031F,
+    0x1032D, 0x1034A,
+    0x10350, 0x1037A,
+    0x10380, 0x1039D,
+    0x103A0, 0x103C3,
+    0x103C8, 0x103CF,
+    0x103D1, 0x103D5,
+    0x10400, 0x1049D,
+    0x104A0, 0x104A9,
+    0x104B0, 0x104D3,
+    0x104D8, 0x104FB,
+    0x10500, 0x10527,
+    0x10530, 0x10563,
+    0x10570, 0x1057A,
+    0x1057C, 0x1058A,
+    0x1058C, 0x10592,
+    0x10594, 0x10595,
+    0x10597, 0x105A1,
+    0x105A3, 0x105B1,
+    0x105B3, 0x105B9,
+    0x105BB, 0x105BC,
+    0x10600, 0x10736,
+    0x10740, 0x10755,
+    0x10760, 0x10767,
+    0x10780, 0x10785,
+    0x10787, 0x107B0,
+    0x107B2, 0x107BA,
+    0x10800, 0x10805,
+    0x10808, 0x10808,
+    0x1080A, 0x10835,
+    0x10837, 0x10838,
+    0x1083C, 0x1083C,
+    0x1083F, 0x10855,
+    0x10860, 0x10876,
+    0x10880, 0x1089E,
+    0x108E0, 0x108F2,
+    0x108F4, 0x108F5,
+    0x10900, 0x10915,
+    0x10920, 0x10939,
+    0x10980, 0x109B7,
+    0x109BE, 0x109BF,
+    0x10A00, 0x10A03,
+    0x10A05, 0x10A06,
+    0x10A0C, 0x10A13,
+    0x10A15, 0x10A17,
+    0x10A19, 0x10A35,
+    0x10A60, 0x10A7C,
+    0x10A80, 0x10A9C,
+    0x10AC0, 0x10AC7,
+    0x10AC9, 0x10AE4,
+    0x10B00, 0x10B35,
+    0x10B40, 0x10B55,
+    0x10B60, 0x10B72,
+    0x10B80, 0x10B91,
+    0x10C00, 0x10C48,
+    0x10C80, 0x10CB2,
+    0x10CC0, 0x10CF2,
+    0x10D00, 0x10D27,
+    0x10D30, 0x10D39,
+    0x10E80, 0x10EA9,
+    0x10EAB, 0x10EAC,
+    0x10EB0, 0x10EB1,
+    0x10F00, 0x10F1C,
+    0x10F27, 0x10F27,
+    0x10F30, 0x10F45,
+    0x10F70, 0x10F81,
+    0x10FB0, 0x10FC4,
+    0x10FE0, 0x10FF6,
+    0x11000, 0x11045,
+    0x11066, 0x1106F,
+    0x11071, 0x11075,
+    0x11080, 0x110B8,
+    0x110C2, 0x110C2,
+    0x110D0, 0x110E8,
+    0x110F0, 0x110F9,
+    0x11100, 0x11132,
+    0x11136, 0x1113F,
+    0x11144, 0x11147,
+    0x11150, 0x11172,
+    0x11176, 0x11176,
+    0x11180, 0x111BF,
+    0x111C1, 0x111C4,
+    0x111CE, 0x111DA,
+    0x111DC, 0x111DC,
+    0x11200, 0x11211,
+    0x11213, 0x11234,
+    0x11237, 0x11237,
+    0x1123E, 0x11241,
+    0x11280, 0x11286,
+    0x11288, 0x11288,
+    0x1128A, 0x1128D,
+    0x1128F, 0x1129D,
+    0x1129F, 0x112A8,
+    0x112B0, 0x112E8,
+    0x112F0, 0x112F9,
+    0x11300, 0x11303,
+    0x11305, 0x1130C,
+    0x1130F, 0x11310,
+    0x11313, 0x11328,
+    0x1132A, 0x11330,
+    0x11332, 0x11333,
+    0x11335, 0x11339,
+    0x1133D, 0x11344,
+    0x11347, 0x11348,
+    0x1134B, 0x1134C,
+    0x11350, 0x11350,
+    0x11357, 0x11357,
+    0x1135D, 0x11363,
+    0x11400, 0x11441,
+    0x11443, 0x11445,
+    0x11447, 0x1144A,
+    0x11450, 0x11459,
+    0x1145F, 0x11461,
+    0x11480, 0x114C1,
+    0x114C4, 0x114C5,
+    0x114C7, 0x114C7,
+    0x114D0, 0x114D9,
+    0x11580, 0x115B5,
+    0x115B8, 0x115BE,
+    0x115D8, 0x115DD,
+    0x11600, 0x1163E,
+    0x11640, 0x11640,
+    0x11644, 0x11644,
+    0x11650, 0x11659,
+    0x11680, 0x116B5,
+    0x116B8, 0x116B8,
+    0x116C0, 0x116C9,
+    0x11700, 0x1171A,
+    0x1171D, 0x1172A,
+    0x11730, 0x11739,
+    0x11740, 0x11746,
+    0x11800, 0x11838,
+    0x118A0, 0x118E9,
+    0x118FF, 0x11906,
+    0x11909, 0x11909,
+    0x1190C, 0x11913,
+    0x11915, 0x11916,
+    0x11918, 0x11935,
+    0x11937, 0x11938,
+    0x1193B, 0x1193C,
+    0x1193F, 0x11942,
+    0x11950, 0x11959,
+    0x119A0, 0x119A7,
+    0x119AA, 0x119D7,
+    0x119DA, 0x119DF,
+    0x119E1, 0x119E1,
+    0x119E3, 0x119E4,
+    0x11A00, 0x11A32,
+    0x11A35, 0x11A3E,
+    0x11A50, 0x11A97,
+    0x11A9D, 0x11A9D,
+    0x11AB0, 0x11AF8,
+    0x11C00, 0x11C08,
+    0x11C0A, 0x11C36,
+    0x11C38, 0x11C3E,
+    0x11C40, 0x11C40,
+    0x11C50, 0x11C59,
+    0x11C72, 0x11C8F,
+    0x11C92, 0x11CA7,
+    0x11CA9, 0x11CB6,
+    0x11D00, 0x11D06,
+    0x11D08, 0x11D09,
+    0x11D0B, 0x11D36,
+    0x11D3A, 0x11D3A,
+    0x11D3C, 0x11D3D,
+    0x11D3F, 0x11D41,
+    0x11D43, 0x11D43,
+    0x11D46, 0x11D47,
+    0x11D50, 0x11D59,
+    0x11D60, 0x11D65,
+    0x11D67, 0x11D68,
+    0x11D6A, 0x11D8E,
+    0x11D90, 0x11D91,
+    0x11D93, 0x11D96,
+    0x11D98, 0x11D98,
+    0x11DA0, 0x11DA9,
+    0x11EE0, 0x11EF6,
+    0x11F00, 0x11F10,
+    0x11F12, 0x11F3A,
+    0x11F3E, 0x11F40,
+    0x11F50, 0x11F59,
+    0x11FB0, 0x11FB0,
+    0x12000, 0x12399,
+    0x12400, 0x1246E,
+    0x12480, 0x12543,
+    0x12F90, 0x12FF0,
+    0x13000, 0x1342F,
+    0x13441, 0x13446,
+    0x14400, 0x14646,
+    0x16800, 0x16A38,
+    0x16A40, 0x16A5E,
+    0x16A60, 0x16A69,
+    0x16A70, 0x16ABE,
+    0x16AC0, 0x16AC9,
+    0x16AD0, 0x16AED,
+    0x16B00, 0x16B2F,
+    0x16B40, 0x16B43,
+    0x16B50, 0x16B59,
+    0x16B63, 0x16B77,
+    0x16B7D, 0x16B8F,
+    0x16E40, 0x16E7F,
+    0x16F00, 0x16F4A,
+    0x16F4F, 0x16F87,
+    0x16F8F, 0x16F9F,
+    0x16FE0, 0x16FE1,
+    0x16FE3, 0x16FE3,
+    0x16FF0, 0x16FF1,
+    0x17000, 0x187F7,
+    0x18800, 0x18CD5,
+    0x18D00, 0x18D08,
+    0x1AFF0, 0x1AFF3,
+    0x1AFF5, 0x1AFFB,
+    0x1AFFD, 0x1AFFE,
+    0x1B000, 0x1B122,
+    0x1B132, 0x1B132,
+    0x1B150, 0x1B152,
+    0x1B155, 0x1B155,
+    0x1B164, 0x1B167,
+    0x1B170, 0x1B2FB,
+    0x1BC00, 0x1BC6A,
+    0x1BC70, 0x1BC7C,
+    0x1BC80, 0x1BC88,
+    0x1BC90, 0x1BC99,
+    0x1BC9E, 0x1BC9E,
+    0x1D400, 0x1D454,
+    0x1D456, 0x1D49C,
+    0x1D49E, 0x1D49F,
+    0x1D4A2, 0x1D4A2,
+    0x1D4A5, 0x1D4A6,
+    0x1D4A9, 0x1D4AC,
+    0x1D4AE, 0x1D4B9,
+    0x1D4BB, 0x1D4BB,
+    0x1D4BD, 0x1D4C3,
+    0x1D4C5, 0x1D505,
+    0x1D507, 0x1D50A,
+    0x1D50D, 0x1D514,
+    0x1D516, 0x1D51C,
+    0x1D51E, 0x1D539,
+    0x1D53B, 0x1D53E,
+    0x1D540, 0x1D544,
+    0x1D546, 0x1D546,
+    0x1D54A, 0x1D550,
+    0x1D552, 0x1D6A5,
+    0x1D6A8, 0x1D6C0,
+    0x1D6C2, 0x1D6DA,
+    0x1D6DC, 0x1D6FA,
+    0x1D6FC, 0x1D714,
+    0x1D716, 0x1D734,
+    0x1D736, 0x1D74E,
+    0x1D750, 0x1D76E,
+    0x1D770, 0x1D788,
+    0x1D78A, 0x1D7A8,
+    0x1D7AA, 0x1D7C2,
+    0x1D7C4, 0x1D7CB,
+    0x1D7CE, 0x1D7FF,
+    0x1DF00, 0x1DF1E,
+    0x1DF25, 0x1DF2A,
+    0x1E000, 0x1E006,
+    0x1E008, 0x1E018,
+    0x1E01B, 0x1E021,
+    0x1E023, 0x1E024,
+    0x1E026, 0x1E02A,
+    0x1E030, 0x1E06D,
+    0x1E08F, 0x1E08F,
+    0x1E100, 0x1E12C,
+    0x1E137, 0x1E13D,
+    0x1E140, 0x1E149,
+    0x1E14E, 0x1E14E,
+    0x1E290, 0x1E2AD,
+    0x1E2C0, 0x1E2EB,
+    0x1E2F0, 0x1E2F9,
+    0x1E4D0, 0x1E4EB,
+    0x1E4F0, 0x1E4F9,
+    0x1E7E0, 0x1E7E6,
+    0x1E7E8, 0x1E7EB,
+    0x1E7ED, 0x1E7EE,
+    0x1E7F0, 0x1E7FE,
+    0x1E800, 0x1E8C4,
+    0x1E900, 0x1E943,
+    0x1E947, 0x1E947,
+    0x1E94B, 0x1E94B,
+    0x1E950, 0x1E959,
+    0x1EE00, 0x1EE03,
+    0x1EE05, 0x1EE1F,
+    0x1EE21, 0x1EE22,
+    0x1EE24, 0x1EE24,
+    0x1EE27, 0x1EE27,
+    0x1EE29, 0x1EE32,
+    0x1EE34, 0x1EE37,
+    0x1EE39, 0x1EE39,
+    0x1EE3B, 0x1EE3B,
+    0x1EE42, 0x1EE42,
+    0x1EE47, 0x1EE47,
+    0x1EE49, 0x1EE49,
+    0x1EE4B, 0x1EE4B,
+    0x1EE4D, 0x1EE4F,
+    0x1EE51, 0x1EE52,
+    0x1EE54, 0x1EE54,
+    0x1EE57, 0x1EE57,
+    0x1EE59, 0x1EE59,
+    0x1EE5B, 0x1EE5B,
+    0x1EE5D, 0x1EE5D,
+    0x1EE5F, 0x1EE5F,
+    0x1EE61, 0x1EE62,
+    0x1EE64, 0x1EE64,
+    0x1EE67, 0x1EE6A,
+    0x1EE6C, 0x1EE72,
+    0x1EE74, 0x1EE77,
+    0x1EE79, 0x1EE7C,
+    0x1EE7E, 0x1EE7E,
+    0x1EE80, 0x1EE89,
+    0x1EE8B, 0x1EE9B,
+    0x1EEA1, 0x1EEA3,
+    0x1EEA5, 0x1EEA9,
+    0x1EEAB, 0x1EEBB,
+    0x1F130, 0x1F149,
+    0x1F150, 0x1F169,
+    0x1F170, 0x1F189,
+    0x1FBF0, 0x1FBF9,
+    0x20000, 0x2A6DF,
+    0x2A700, 0x2B739,
+    0x2B740, 0x2B81D,
+    0x2B820, 0x2CEA1,
+    0x2CEB0, 0x2EBE0,
+    0x2F800, 0x2FA1D,
+    0x30000, 0x3134A,
+    0x31350, 0x323AF,
+};
+
+#define UNICODE_ISUPPER_CODEPOINTS_LENGTH 1302
+static const pm_unicode_codepoint_t unicode_isupper_codepoints[UNICODE_ISUPPER_CODEPOINTS_LENGTH] = {
+    0x100, 0x100,
+    0x102, 0x102,
+    0x104, 0x104,
+    0x106, 0x106,
+    0x108, 0x108,
+    0x10A, 0x10A,
+    0x10C, 0x10C,
+    0x10E, 0x10E,
+    0x110, 0x110,
+    0x112, 0x112,
+    0x114, 0x114,
+    0x116, 0x116,
+    0x118, 0x118,
+    0x11A, 0x11A,
+    0x11C, 0x11C,
+    0x11E, 0x11E,
+    0x120, 0x120,
+    0x122, 0x122,
+    0x124, 0x124,
+    0x126, 0x126,
+    0x128, 0x128,
+    0x12A, 0x12A,
+    0x12C, 0x12C,
+    0x12E, 0x12E,
+    0x130, 0x130,
+    0x132, 0x132,
+    0x134, 0x134,
+    0x136, 0x136,
+    0x139, 0x139,
+    0x13B, 0x13B,
+    0x13D, 0x13D,
+    0x13F, 0x13F,
+    0x141, 0x141,
+    0x143, 0x143,
+    0x145, 0x145,
+    0x147, 0x147,
+    0x14A, 0x14A,
+    0x14C, 0x14C,
+    0x14E, 0x14E,
+    0x150, 0x150,
+    0x152, 0x152,
+    0x154, 0x154,
+    0x156, 0x156,
+    0x158, 0x158,
+    0x15A, 0x15A,
+    0x15C, 0x15C,
+    0x15E, 0x15E,
+    0x160, 0x160,
+    0x162, 0x162,
+    0x164, 0x164,
+    0x166, 0x166,
+    0x168, 0x168,
+    0x16A, 0x16A,
+    0x16C, 0x16C,
+    0x16E, 0x16E,
+    0x170, 0x170,
+    0x172, 0x172,
+    0x174, 0x174,
+    0x176, 0x176,
+    0x178, 0x179,
+    0x17B, 0x17B,
+    0x17D, 0x17D,
+    0x181, 0x182,
+    0x184, 0x184,
+    0x186, 0x187,
+    0x189, 0x18B,
+    0x18E, 0x191,
+    0x193, 0x194,
+    0x196, 0x198,
+    0x19C, 0x19D,
+    0x19F, 0x1A0,
+    0x1A2, 0x1A2,
+    0x1A4, 0x1A4,
+    0x1A6, 0x1A7,
+    0x1A9, 0x1A9,
+    0x1AC, 0x1AC,
+    0x1AE, 0x1AF,
+    0x1B1, 0x1B3,
+    0x1B5, 0x1B5,
+    0x1B7, 0x1B8,
+    0x1BC, 0x1BC,
+    0x1C4, 0x1C5,
+    0x1C7, 0x1C8,
+    0x1CA, 0x1CB,
+    0x1CD, 0x1CD,
+    0x1CF, 0x1CF,
+    0x1D1, 0x1D1,
+    0x1D3, 0x1D3,
+    0x1D5, 0x1D5,
+    0x1D7, 0x1D7,
+    0x1D9, 0x1D9,
+    0x1DB, 0x1DB,
+    0x1DE, 0x1DE,
+    0x1E0, 0x1E0,
+    0x1E2, 0x1E2,
+    0x1E4, 0x1E4,
+    0x1E6, 0x1E6,
+    0x1E8, 0x1E8,
+    0x1EA, 0x1EA,
+    0x1EC, 0x1EC,
+    0x1EE, 0x1EE,
+    0x1F1, 0x1F2,
+    0x1F4, 0x1F4,
+    0x1F6, 0x1F8,
+    0x1FA, 0x1FA,
+    0x1FC, 0x1FC,
+    0x1FE, 0x1FE,
+    0x200, 0x200,
+    0x202, 0x202,
+    0x204, 0x204,
+    0x206, 0x206,
+    0x208, 0x208,
+    0x20A, 0x20A,
+    0x20C, 0x20C,
+    0x20E, 0x20E,
+    0x210, 0x210,
+    0x212, 0x212,
+    0x214, 0x214,
+    0x216, 0x216,
+    0x218, 0x218,
+    0x21A, 0x21A,
+    0x21C, 0x21C,
+    0x21E, 0x21E,
+    0x220, 0x220,
+    0x222, 0x222,
+    0x224, 0x224,
+    0x226, 0x226,
+    0x228, 0x228,
+    0x22A, 0x22A,
+    0x22C, 0x22C,
+    0x22E, 0x22E,
+    0x230, 0x230,
+    0x232, 0x232,
+    0x23A, 0x23B,
+    0x23D, 0x23E,
+    0x241, 0x241,
+    0x243, 0x246,
+    0x248, 0x248,
+    0x24A, 0x24A,
+    0x24C, 0x24C,
+    0x24E, 0x24E,
+    0x370, 0x370,
+    0x372, 0x372,
+    0x376, 0x376,
+    0x37F, 0x37F,
+    0x386, 0x386,
+    0x388, 0x38A,
+    0x38C, 0x38C,
+    0x38E, 0x38F,
+    0x391, 0x3A1,
+    0x3A3, 0x3AB,
+    0x3CF, 0x3CF,
+    0x3D2, 0x3D4,
+    0x3D8, 0x3D8,
+    0x3DA, 0x3DA,
+    0x3DC, 0x3DC,
+    0x3DE, 0x3DE,
+    0x3E0, 0x3E0,
+    0x3E2, 0x3E2,
+    0x3E4, 0x3E4,
+    0x3E6, 0x3E6,
+    0x3E8, 0x3E8,
+    0x3EA, 0x3EA,
+    0x3EC, 0x3EC,
+    0x3EE, 0x3EE,
+    0x3F4, 0x3F4,
+    0x3F7, 0x3F7,
+    0x3F9, 0x3FA,
+    0x3FD, 0x42F,
+    0x460, 0x460,
+    0x462, 0x462,
+    0x464, 0x464,
+    0x466, 0x466,
+    0x468, 0x468,
+    0x46A, 0x46A,
+    0x46C, 0x46C,
+    0x46E, 0x46E,
+    0x470, 0x470,
+    0x472, 0x472,
+    0x474, 0x474,
+    0x476, 0x476,
+    0x478, 0x478,
+    0x47A, 0x47A,
+    0x47C, 0x47C,
+    0x47E, 0x47E,
+    0x480, 0x480,
+    0x48A, 0x48A,
+    0x48C, 0x48C,
+    0x48E, 0x48E,
+    0x490, 0x490,
+    0x492, 0x492,
+    0x494, 0x494,
+    0x496, 0x496,
+    0x498, 0x498,
+    0x49A, 0x49A,
+    0x49C, 0x49C,
+    0x49E, 0x49E,
+    0x4A0, 0x4A0,
+    0x4A2, 0x4A2,
+    0x4A4, 0x4A4,
+    0x4A6, 0x4A6,
+    0x4A8, 0x4A8,
+    0x4AA, 0x4AA,
+    0x4AC, 0x4AC,
+    0x4AE, 0x4AE,
+    0x4B0, 0x4B0,
+    0x4B2, 0x4B2,
+    0x4B4, 0x4B4,
+    0x4B6, 0x4B6,
+    0x4B8, 0x4B8,
+    0x4BA, 0x4BA,
+    0x4BC, 0x4BC,
+    0x4BE, 0x4BE,
+    0x4C0, 0x4C1,
+    0x4C3, 0x4C3,
+    0x4C5, 0x4C5,
+    0x4C7, 0x4C7,
+    0x4C9, 0x4C9,
+    0x4CB, 0x4CB,
+    0x4CD, 0x4CD,
+    0x4D0, 0x4D0,
+    0x4D2, 0x4D2,
+    0x4D4, 0x4D4,
+    0x4D6, 0x4D6,
+    0x4D8, 0x4D8,
+    0x4DA, 0x4DA,
+    0x4DC, 0x4DC,
+    0x4DE, 0x4DE,
+    0x4E0, 0x4E0,
+    0x4E2, 0x4E2,
+    0x4E4, 0x4E4,
+    0x4E6, 0x4E6,
+    0x4E8, 0x4E8,
+    0x4EA, 0x4EA,
+    0x4EC, 0x4EC,
+    0x4EE, 0x4EE,
+    0x4F0, 0x4F0,
+    0x4F2, 0x4F2,
+    0x4F4, 0x4F4,
+    0x4F6, 0x4F6,
+    0x4F8, 0x4F8,
+    0x4FA, 0x4FA,
+    0x4FC, 0x4FC,
+    0x4FE, 0x4FE,
+    0x500, 0x500,
+    0x502, 0x502,
+    0x504, 0x504,
+    0x506, 0x506,
+    0x508, 0x508,
+    0x50A, 0x50A,
+    0x50C, 0x50C,
+    0x50E, 0x50E,
+    0x510, 0x510,
+    0x512, 0x512,
+    0x514, 0x514,
+    0x516, 0x516,
+    0x518, 0x518,
+    0x51A, 0x51A,
+    0x51C, 0x51C,
+    0x51E, 0x51E,
+    0x520, 0x520,
+    0x522, 0x522,
+    0x524, 0x524,
+    0x526, 0x526,
+    0x528, 0x528,
+    0x52A, 0x52A,
+    0x52C, 0x52C,
+    0x52E, 0x52E,
+    0x531, 0x556,
+    0x10A0, 0x10C5,
+    0x10C7, 0x10C7,
+    0x10CD, 0x10CD,
+    0x13A0, 0x13F5,
+    0x1C90, 0x1CBA,
+    0x1CBD, 0x1CBF,
+    0x1E00, 0x1E00,
+    0x1E02, 0x1E02,
+    0x1E04, 0x1E04,
+    0x1E06, 0x1E06,
+    0x1E08, 0x1E08,
+    0x1E0A, 0x1E0A,
+    0x1E0C, 0x1E0C,
+    0x1E0E, 0x1E0E,
+    0x1E10, 0x1E10,
+    0x1E12, 0x1E12,
+    0x1E14, 0x1E14,
+    0x1E16, 0x1E16,
+    0x1E18, 0x1E18,
+    0x1E1A, 0x1E1A,
+    0x1E1C, 0x1E1C,
+    0x1E1E, 0x1E1E,
+    0x1E20, 0x1E20,
+    0x1E22, 0x1E22,
+    0x1E24, 0x1E24,
+    0x1E26, 0x1E26,
+    0x1E28, 0x1E28,
+    0x1E2A, 0x1E2A,
+    0x1E2C, 0x1E2C,
+    0x1E2E, 0x1E2E,
+    0x1E30, 0x1E30,
+    0x1E32, 0x1E32,
+    0x1E34, 0x1E34,
+    0x1E36, 0x1E36,
+    0x1E38, 0x1E38,
+    0x1E3A, 0x1E3A,
+    0x1E3C, 0x1E3C,
+    0x1E3E, 0x1E3E,
+    0x1E40, 0x1E40,
+    0x1E42, 0x1E42,
+    0x1E44, 0x1E44,
+    0x1E46, 0x1E46,
+    0x1E48, 0x1E48,
+    0x1E4A, 0x1E4A,
+    0x1E4C, 0x1E4C,
+    0x1E4E, 0x1E4E,
+    0x1E50, 0x1E50,
+    0x1E52, 0x1E52,
+    0x1E54, 0x1E54,
+    0x1E56, 0x1E56,
+    0x1E58, 0x1E58,
+    0x1E5A, 0x1E5A,
+    0x1E5C, 0x1E5C,
+    0x1E5E, 0x1E5E,
+    0x1E60, 0x1E60,
+    0x1E62, 0x1E62,
+    0x1E64, 0x1E64,
+    0x1E66, 0x1E66,
+    0x1E68, 0x1E68,
+    0x1E6A, 0x1E6A,
+    0x1E6C, 0x1E6C,
+    0x1E6E, 0x1E6E,
+    0x1E70, 0x1E70,
+    0x1E72, 0x1E72,
+    0x1E74, 0x1E74,
+    0x1E76, 0x1E76,
+    0x1E78, 0x1E78,
+    0x1E7A, 0x1E7A,
+    0x1E7C, 0x1E7C,
+    0x1E7E, 0x1E7E,
+    0x1E80, 0x1E80,
+    0x1E82, 0x1E82,
+    0x1E84, 0x1E84,
+    0x1E86, 0x1E86,
+    0x1E88, 0x1E88,
+    0x1E8A, 0x1E8A,
+    0x1E8C, 0x1E8C,
+    0x1E8E, 0x1E8E,
+    0x1E90, 0x1E90,
+    0x1E92, 0x1E92,
+    0x1E94, 0x1E94,
+    0x1E9E, 0x1E9E,
+    0x1EA0, 0x1EA0,
+    0x1EA2, 0x1EA2,
+    0x1EA4, 0x1EA4,
+    0x1EA6, 0x1EA6,
+    0x1EA8, 0x1EA8,
+    0x1EAA, 0x1EAA,
+    0x1EAC, 0x1EAC,
+    0x1EAE, 0x1EAE,
+    0x1EB0, 0x1EB0,
+    0x1EB2, 0x1EB2,
+    0x1EB4, 0x1EB4,
+    0x1EB6, 0x1EB6,
+    0x1EB8, 0x1EB8,
+    0x1EBA, 0x1EBA,
+    0x1EBC, 0x1EBC,
+    0x1EBE, 0x1EBE,
+    0x1EC0, 0x1EC0,
+    0x1EC2, 0x1EC2,
+    0x1EC4, 0x1EC4,
+    0x1EC6, 0x1EC6,
+    0x1EC8, 0x1EC8,
+    0x1ECA, 0x1ECA,
+    0x1ECC, 0x1ECC,
+    0x1ECE, 0x1ECE,
+    0x1ED0, 0x1ED0,
+    0x1ED2, 0x1ED2,
+    0x1ED4, 0x1ED4,
+    0x1ED6, 0x1ED6,
+    0x1ED8, 0x1ED8,
+    0x1EDA, 0x1EDA,
+    0x1EDC, 0x1EDC,
+    0x1EDE, 0x1EDE,
+    0x1EE0, 0x1EE0,
+    0x1EE2, 0x1EE2,
+    0x1EE4, 0x1EE4,
+    0x1EE6, 0x1EE6,
+    0x1EE8, 0x1EE8,
+    0x1EEA, 0x1EEA,
+    0x1EEC, 0x1EEC,
+    0x1EEE, 0x1EEE,
+    0x1EF0, 0x1EF0,
+    0x1EF2, 0x1EF2,
+    0x1EF4, 0x1EF4,
+    0x1EF6, 0x1EF6,
+    0x1EF8, 0x1EF8,
+    0x1EFA, 0x1EFA,
+    0x1EFC, 0x1EFC,
+    0x1EFE, 0x1EFE,
+    0x1F08, 0x1F0F,
+    0x1F18, 0x1F1D,
+    0x1F28, 0x1F2F,
+    0x1F38, 0x1F3F,
+    0x1F48, 0x1F4D,
+    0x1F59, 0x1F59,
+    0x1F5B, 0x1F5B,
+    0x1F5D, 0x1F5D,
+    0x1F5F, 0x1F5F,
+    0x1F68, 0x1F6F,
+    0x1F88, 0x1F8F,
+    0x1F98, 0x1F9F,
+    0x1FA8, 0x1FAF,
+    0x1FB8, 0x1FBC,
+    0x1FC8, 0x1FCC,
+    0x1FD8, 0x1FDB,
+    0x1FE8, 0x1FEC,
+    0x1FF8, 0x1FFC,
+    0x2102, 0x2102,
+    0x2107, 0x2107,
+    0x210B, 0x210D,
+    0x2110, 0x2112,
+    0x2115, 0x2115,
+    0x2119, 0x211D,
+    0x2124, 0x2124,
+    0x2126, 0x2126,
+    0x2128, 0x2128,
+    0x212A, 0x212D,
+    0x2130, 0x2133,
+    0x213E, 0x213F,
+    0x2145, 0x2145,
+    0x2160, 0x216F,
+    0x2183, 0x2183,
+    0x24B6, 0x24CF,
+    0x2C00, 0x2C2F,
+    0x2C60, 0x2C60,
+    0x2C62, 0x2C64,
+    0x2C67, 0x2C67,
+    0x2C69, 0x2C69,
+    0x2C6B, 0x2C6B,
+    0x2C6D, 0x2C70,
+    0x2C72, 0x2C72,
+    0x2C75, 0x2C75,
+    0x2C7E, 0x2C80,
+    0x2C82, 0x2C82,
+    0x2C84, 0x2C84,
+    0x2C86, 0x2C86,
+    0x2C88, 0x2C88,
+    0x2C8A, 0x2C8A,
+    0x2C8C, 0x2C8C,
+    0x2C8E, 0x2C8E,
+    0x2C90, 0x2C90,
+    0x2C92, 0x2C92,
+    0x2C94, 0x2C94,
+    0x2C96, 0x2C96,
+    0x2C98, 0x2C98,
+    0x2C9A, 0x2C9A,
+    0x2C9C, 0x2C9C,
+    0x2C9E, 0x2C9E,
+    0x2CA0, 0x2CA0,
+    0x2CA2, 0x2CA2,
+    0x2CA4, 0x2CA4,
+    0x2CA6, 0x2CA6,
+    0x2CA8, 0x2CA8,
+    0x2CAA, 0x2CAA,
+    0x2CAC, 0x2CAC,
+    0x2CAE, 0x2CAE,
+    0x2CB0, 0x2CB0,
+    0x2CB2, 0x2CB2,
+    0x2CB4, 0x2CB4,
+    0x2CB6, 0x2CB6,
+    0x2CB8, 0x2CB8,
+    0x2CBA, 0x2CBA,
+    0x2CBC, 0x2CBC,
+    0x2CBE, 0x2CBE,
+    0x2CC0, 0x2CC0,
+    0x2CC2, 0x2CC2,
+    0x2CC4, 0x2CC4,
+    0x2CC6, 0x2CC6,
+    0x2CC8, 0x2CC8,
+    0x2CCA, 0x2CCA,
+    0x2CCC, 0x2CCC,
+    0x2CCE, 0x2CCE,
+    0x2CD0, 0x2CD0,
+    0x2CD2, 0x2CD2,
+    0x2CD4, 0x2CD4,
+    0x2CD6, 0x2CD6,
+    0x2CD8, 0x2CD8,
+    0x2CDA, 0x2CDA,
+    0x2CDC, 0x2CDC,
+    0x2CDE, 0x2CDE,
+    0x2CE0, 0x2CE0,
+    0x2CE2, 0x2CE2,
+    0x2CEB, 0x2CEB,
+    0x2CED, 0x2CED,
+    0x2CF2, 0x2CF2,
+    0xA640, 0xA640,
+    0xA642, 0xA642,
+    0xA644, 0xA644,
+    0xA646, 0xA646,
+    0xA648, 0xA648,
+    0xA64A, 0xA64A,
+    0xA64C, 0xA64C,
+    0xA64E, 0xA64E,
+    0xA650, 0xA650,
+    0xA652, 0xA652,
+    0xA654, 0xA654,
+    0xA656, 0xA656,
+    0xA658, 0xA658,
+    0xA65A, 0xA65A,
+    0xA65C, 0xA65C,
+    0xA65E, 0xA65E,
+    0xA660, 0xA660,
+    0xA662, 0xA662,
+    0xA664, 0xA664,
+    0xA666, 0xA666,
+    0xA668, 0xA668,
+    0xA66A, 0xA66A,
+    0xA66C, 0xA66C,
+    0xA680, 0xA680,
+    0xA682, 0xA682,
+    0xA684, 0xA684,
+    0xA686, 0xA686,
+    0xA688, 0xA688,
+    0xA68A, 0xA68A,
+    0xA68C, 0xA68C,
+    0xA68E, 0xA68E,
+    0xA690, 0xA690,
+    0xA692, 0xA692,
+    0xA694, 0xA694,
+    0xA696, 0xA696,
+    0xA698, 0xA698,
+    0xA69A, 0xA69A,
+    0xA722, 0xA722,
+    0xA724, 0xA724,
+    0xA726, 0xA726,
+    0xA728, 0xA728,
+    0xA72A, 0xA72A,
+    0xA72C, 0xA72C,
+    0xA72E, 0xA72E,
+    0xA732, 0xA732,
+    0xA734, 0xA734,
+    0xA736, 0xA736,
+    0xA738, 0xA738,
+    0xA73A, 0xA73A,
+    0xA73C, 0xA73C,
+    0xA73E, 0xA73E,
+    0xA740, 0xA740,
+    0xA742, 0xA742,
+    0xA744, 0xA744,
+    0xA746, 0xA746,
+    0xA748, 0xA748,
+    0xA74A, 0xA74A,
+    0xA74C, 0xA74C,
+    0xA74E, 0xA74E,
+    0xA750, 0xA750,
+    0xA752, 0xA752,
+    0xA754, 0xA754,
+    0xA756, 0xA756,
+    0xA758, 0xA758,
+    0xA75A, 0xA75A,
+    0xA75C, 0xA75C,
+    0xA75E, 0xA75E,
+    0xA760, 0xA760,
+    0xA762, 0xA762,
+    0xA764, 0xA764,
+    0xA766, 0xA766,
+    0xA768, 0xA768,
+    0xA76A, 0xA76A,
+    0xA76C, 0xA76C,
+    0xA76E, 0xA76E,
+    0xA779, 0xA779,
+    0xA77B, 0xA77B,
+    0xA77D, 0xA77E,
+    0xA780, 0xA780,
+    0xA782, 0xA782,
+    0xA784, 0xA784,
+    0xA786, 0xA786,
+    0xA78B, 0xA78B,
+    0xA78D, 0xA78D,
+    0xA790, 0xA790,
+    0xA792, 0xA792,
+    0xA796, 0xA796,
+    0xA798, 0xA798,
+    0xA79A, 0xA79A,
+    0xA79C, 0xA79C,
+    0xA79E, 0xA79E,
+    0xA7A0, 0xA7A0,
+    0xA7A2, 0xA7A2,
+    0xA7A4, 0xA7A4,
+    0xA7A6, 0xA7A6,
+    0xA7A8, 0xA7A8,
+    0xA7AA, 0xA7AE,
+    0xA7B0, 0xA7B4,
+    0xA7B6, 0xA7B6,
+    0xA7B8, 0xA7B8,
+    0xA7BA, 0xA7BA,
+    0xA7BC, 0xA7BC,
+    0xA7BE, 0xA7BE,
+    0xA7C0, 0xA7C0,
+    0xA7C2, 0xA7C2,
+    0xA7C4, 0xA7C7,
+    0xA7C9, 0xA7C9,
+    0xA7D0, 0xA7D0,
+    0xA7D6, 0xA7D6,
+    0xA7D8, 0xA7D8,
+    0xA7F5, 0xA7F5,
+    0xFF21, 0xFF3A,
+    0x10400, 0x10427,
+    0x104B0, 0x104D3,
+    0x10570, 0x1057A,
+    0x1057C, 0x1058A,
+    0x1058C, 0x10592,
+    0x10594, 0x10595,
+    0x10C80, 0x10CB2,
+    0x118A0, 0x118BF,
+    0x16E40, 0x16E5F,
+    0x1D400, 0x1D419,
+    0x1D434, 0x1D44D,
+    0x1D468, 0x1D481,
+    0x1D49C, 0x1D49C,
+    0x1D49E, 0x1D49F,
+    0x1D4A2, 0x1D4A2,
+    0x1D4A5, 0x1D4A6,
+    0x1D4A9, 0x1D4AC,
+    0x1D4AE, 0x1D4B5,
+    0x1D4D0, 0x1D4E9,
+    0x1D504, 0x1D505,
+    0x1D507, 0x1D50A,
+    0x1D50D, 0x1D514,
+    0x1D516, 0x1D51C,
+    0x1D538, 0x1D539,
+    0x1D53B, 0x1D53E,
+    0x1D540, 0x1D544,
+    0x1D546, 0x1D546,
+    0x1D54A, 0x1D550,
+    0x1D56C, 0x1D585,
+    0x1D5A0, 0x1D5B9,
+    0x1D5D4, 0x1D5ED,
+    0x1D608, 0x1D621,
+    0x1D63C, 0x1D655,
+    0x1D670, 0x1D689,
+    0x1D6A8, 0x1D6C0,
+    0x1D6E2, 0x1D6FA,
+    0x1D71C, 0x1D734,
+    0x1D756, 0x1D76E,
+    0x1D790, 0x1D7A8,
+    0x1D7CA, 0x1D7CA,
+    0x1E900, 0x1E921,
+    0x1F130, 0x1F149,
+    0x1F150, 0x1F169,
+    0x1F170, 0x1F189,
+};
+
+/**
+ * Each element of the following table contains a bitfield that indicates a
+ * piece of information about the corresponding unicode codepoint. Note that
+ * this table is different from other encodings where we used a lookup table
+ * because the indices of those tables are the byte representations, not the
+ * codepoints themselves.
+ */
+const uint8_t pm_encoding_unicode_table[256] = {
+//  0  1  2  3  4  5  6  7  8  9  A  B  C  D  E  F
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 0x
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 1x
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 2x
+    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 0, 0, 0, 0, 0, 0, // 3x
+    0, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, // 4x
+    7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 0, 0, 0, 0, 0, // 5x
+    0, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, // 6x
+    3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 0, 0, 0, 0, 0, // 7x
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 8x
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 9x
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 0, 0, 0, 0, 0, // Ax
+    0, 0, 0, 0, 0, 3, 0, 0, 0, 0, 3, 0, 0, 0, 0, 0, // Bx
+    7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, // Cx
+    7, 7, 7, 7, 7, 7, 7, 0, 7, 7, 7, 7, 7, 7, 7, 3, // Dx
+    3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, // Ex
+    3, 3, 3, 3, 3, 3, 3, 0, 3, 3, 3, 3, 3, 3, 3, 3, // Fx
+};
+
+/**
+ * Binary search through the given list of codepoints to see if the given
+ * codepoint is in the list.
+ */
+static bool
+pm_unicode_codepoint_match(pm_unicode_codepoint_t codepoint, const pm_unicode_codepoint_t *codepoints, size_t size) {
+    size_t start = 0;
+    size_t end = size;
+
+    while (start < end) {
+        size_t middle = start + (end - start) / 2;
+        if ((middle % 2) != 0) middle--;
+
+        if (codepoint >= codepoints[middle] && codepoint <= codepoints[middle + 1]) {
+            return true;
+        }
+
+        if (codepoint < codepoints[middle]) {
+            end = middle;
+        } else {
+            start = middle + 2;
+        }
+    }
+
+    return false;
+}
+
+/**
+ * A state transition table for decoding UTF-8.
+ *
+ * Copyright (c) 2008-2009 Bjoern Hoehrmann <bjoern@hoehrmann.de>
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+static const uint8_t pm_utf_8_dfa[] = {
+    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, // 00..1f
+    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, // 20..3f
+    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, // 40..5f
+    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, // 60..7f
+    1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9, // 80..9f
+    7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7, // a0..bf
+    8,8,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2, // c0..df
+    0xa,0x3,0x3,0x3,0x3,0x3,0x3,0x3,0x3,0x3,0x3,0x3,0x3,0x4,0x3,0x3, // e0..ef
+    0xb,0x6,0x6,0x6,0x5,0x8,0x8,0x8,0x8,0x8,0x8,0x8,0x8,0x8,0x8,0x8, // f0..ff
+    0x0,0x1,0x2,0x3,0x5,0x8,0x7,0x1,0x1,0x1,0x4,0x6,0x1,0x1,0x1,0x1, // s0..s0
+    1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,1,1,1,1,1,0,1,0,1,1,1,1,1,1, // s1..s2
+    1,2,1,1,1,1,1,2,1,2,1,1,1,1,1,1,1,1,1,1,1,1,1,2,1,1,1,1,1,1,1,1, // s3..s4
+    1,2,1,1,1,1,1,1,1,2,1,1,1,1,1,1,1,1,1,1,1,1,1,3,1,3,1,1,1,1,1,1, // s5..s6
+    1,3,1,1,1,1,1,3,1,3,1,1,1,1,1,1,1,3,1,1,1,1,1,1,1,1,1,1,1,1,1,1, // s7..s8
+};
+
+/**
+ * Given a pointer to a string and the number of bytes remaining in the string,
+ * decode the next UTF-8 codepoint and return it. The number of bytes consumed
+ * is returned in the width out parameter.
+ */
+static pm_unicode_codepoint_t
+pm_utf_8_codepoint(const uint8_t *b, ptrdiff_t n, size_t *width) {
+    assert(n >= 0);
+
+    size_t maximum = (n > 4) ? 4 : ((size_t) n);
+    uint32_t codepoint;
+    uint32_t state = 0;
+
+    for (size_t index = 0; index < maximum; index++) {
+        uint32_t byte = b[index];
+        uint32_t type = pm_utf_8_dfa[byte];
+
+        codepoint = (state != 0) ?
+            (byte & 0x3fu) | (codepoint << 6) :
+            (0xffu >> type) & (byte);
+
+        state = pm_utf_8_dfa[256 + (state * 16) + type];
+        if (state == 0) {
+            *width = index + 1;
+            return (pm_unicode_codepoint_t) codepoint;
+        }
+    }
+
+    *width = 0;
+    return 0;
+}
+
+/**
+ * Return the size of the next character in the UTF-8 encoding.
+ */
+size_t
+pm_encoding_utf_8_char_width(const uint8_t *b, ptrdiff_t n) {
+    assert(n >= 0);
+
+    size_t maximum = (n > 4) ? 4 : ((size_t) n);
+    uint32_t state = 0;
+
+    for (size_t index = 0; index < maximum; index++) {
+        state = pm_utf_8_dfa[256 + (state * 16) + pm_utf_8_dfa[b[index]]];
+        if (state == 0) return index + 1;
+    }
+
+    return 0;
+}
+
+/**
+ * Return the size of the next character in the UTF-8 encoding if it is an
+ * alphabetical character.
+ */
+size_t
+pm_encoding_utf_8_alpha_char(const uint8_t *b, ptrdiff_t n) {
+    if (*b < 0x80) {
+        return (pm_encoding_unicode_table[*b] & PRISM_ENCODING_ALPHABETIC_BIT) ? 1 : 0;
+    }
+
+    size_t width;
+    pm_unicode_codepoint_t codepoint = pm_utf_8_codepoint(b, n, &width);
+
+    if (codepoint <= 0xFF) {
+        return (pm_encoding_unicode_table[(uint8_t) codepoint] & PRISM_ENCODING_ALPHABETIC_BIT) ? width : 0;
+    } else {
+        return pm_unicode_codepoint_match(codepoint, unicode_alpha_codepoints, UNICODE_ALPHA_CODEPOINTS_LENGTH) ? width : 0;
+    }
+}
+
+/**
+ * Return the size of the next character in the UTF-8 encoding if it is an
+ * alphanumeric character.
+ */
+size_t
+pm_encoding_utf_8_alnum_char(const uint8_t *b, ptrdiff_t n) {
+    if (*b < 0x80) {
+        return (pm_encoding_unicode_table[*b] & (PRISM_ENCODING_ALPHANUMERIC_BIT)) ? 1 : 0;
+    }
+
+    size_t width;
+    pm_unicode_codepoint_t codepoint = pm_utf_8_codepoint(b, n, &width);
+
+    if (codepoint <= 0xFF) {
+        return (pm_encoding_unicode_table[(uint8_t) codepoint] & (PRISM_ENCODING_ALPHANUMERIC_BIT)) ? width : 0;
+    } else {
+        return pm_unicode_codepoint_match(codepoint, unicode_alnum_codepoints, UNICODE_ALNUM_CODEPOINTS_LENGTH) ? width : 0;
+    }
+}
+
+/**
+ * Return true if the next character in the UTF-8 encoding if it is an uppercase
+ * character.
+ */
+bool
+pm_encoding_utf_8_isupper_char(const uint8_t *b, ptrdiff_t n) {
+    if (*b < 0x80) {
+        return (pm_encoding_unicode_table[*b] & PRISM_ENCODING_UPPERCASE_BIT) ? true : false;
+    }
+
+    size_t width;
+    pm_unicode_codepoint_t codepoint = pm_utf_8_codepoint(b, n, &width);
+
+    if (codepoint <= 0xFF) {
+        return (pm_encoding_unicode_table[(uint8_t) codepoint] & PRISM_ENCODING_UPPERCASE_BIT) ? true : false;
+    } else {
+        return pm_unicode_codepoint_match(codepoint, unicode_isupper_codepoints, UNICODE_ISUPPER_CODEPOINTS_LENGTH) ? true : false;
+    }
+}
+
+#ifndef PRISM_ENCODING_EXCLUDE_FULL
+
+static pm_unicode_codepoint_t
+pm_cesu_8_codepoint(const uint8_t *b, ptrdiff_t n, size_t *width) {
+    if (b[0] < 0x80) {
+        *width = 1;
+        return (pm_unicode_codepoint_t) b[0];
+    }
+
+    if (n > 1 && b[0] >= 0xC2 && b[0] <= 0xDF && b[1] >= 0x80 && b[1] <= 0xBF) {
+        *width = 2;
+
+        // 110xxxxx 10xxxxxx
+        return (pm_unicode_codepoint_t) (((b[0] & 0x1F) << 6) | (b[1] & 0x3F));
+    }
+
+    if (n > 5 && b[0] == 0xED && b[1] >= 0xA0 && b[1] <= 0xAF && b[2] >= 0x80 && b[2] <= 0xBF && b[3] == 0xED && b[4] >= 0xB0 && b[4] <= 0xBF && b[5] >= 0x80 && b[5] <= 0xBF) {
+        *width = 6;
+
+        // 11101101 1010xxxx 10xxxxxx 11101101 1011xxxx 10xxxxxx
+        return (pm_unicode_codepoint_t) (0x10000 + (((b[1] & 0xF) << 16) | ((b[2] & 0x3F) << 10) | ((b[4] & 0xF) << 6) | (b[5] & 0x3F)));
+    }
+
+    if (n > 2 && b[0] == 0xED && b[1] >= 0xA0 && b[1] <= 0xBF) {
+        *width = 3;
+
+        // 11101101 1010xxxx 10xxxxx
+        return (pm_unicode_codepoint_t) (0x10000 + (((b[0] & 0x03) << 16) | ((b[1] & 0x3F) << 10) | (b[2] & 0x3F)));
+    }
+
+    if (n > 2 && ((b[0] == 0xE0 && b[1] >= 0xA0) || (b[0] >= 0xE1 && b[0] <= 0xEF && b[1] >= 0x80)) && b[1] <= 0xBF && b[2] >= 0x80 && b[2] <= 0xBF) {
+        *width = 3;
+
+        // 1110xxxx 10xxxxxx 10xxxxx
+        return (pm_unicode_codepoint_t) (((b[0] & 0xF) << 12) | ((b[1] & 0x3F) << 6) | (b[2] & 0x3F));
+    }
+
+    *width = 0;
+    return 0;
+}
+
+static size_t
+pm_encoding_cesu_8_char_width(const uint8_t *b, ptrdiff_t n) {
+    size_t width;
+    pm_cesu_8_codepoint(b, n, &width);
+    return width;
+}
+
+static size_t
+pm_encoding_cesu_8_alpha_char(const uint8_t *b, ptrdiff_t n) {
+    if (*b < 0x80) {
+        return (pm_encoding_unicode_table[*b] & PRISM_ENCODING_ALPHABETIC_BIT) ? 1 : 0;
+    }
+
+    size_t width;
+    pm_unicode_codepoint_t codepoint = pm_cesu_8_codepoint(b, n, &width);
+
+    if (codepoint <= 0xFF) {
+        return (pm_encoding_unicode_table[(uint8_t) codepoint] & PRISM_ENCODING_ALPHABETIC_BIT) ? width : 0;
+    } else {
+        return pm_unicode_codepoint_match(codepoint, unicode_alpha_codepoints, UNICODE_ALPHA_CODEPOINTS_LENGTH) ? width : 0;
+    }
+}
+
+static size_t
+pm_encoding_cesu_8_alnum_char(const uint8_t *b, ptrdiff_t n) {
+    if (*b < 0x80) {
+        return (pm_encoding_unicode_table[*b] & (PRISM_ENCODING_ALPHANUMERIC_BIT)) ? 1 : 0;
+    }
+
+    size_t width;
+    pm_unicode_codepoint_t codepoint = pm_cesu_8_codepoint(b, n, &width);
+
+    if (codepoint <= 0xFF) {
+        return (pm_encoding_unicode_table[(uint8_t) codepoint] & (PRISM_ENCODING_ALPHANUMERIC_BIT)) ? width : 0;
+    } else {
+        return pm_unicode_codepoint_match(codepoint, unicode_alnum_codepoints, UNICODE_ALNUM_CODEPOINTS_LENGTH) ? width : 0;
+    }
+}
+
+static bool
+pm_encoding_cesu_8_isupper_char(const uint8_t *b, ptrdiff_t n) {
+    if (*b < 0x80) {
+        return (pm_encoding_unicode_table[*b] & PRISM_ENCODING_UPPERCASE_BIT) ? true : false;
+    }
+
+    size_t width;
+    pm_unicode_codepoint_t codepoint = pm_cesu_8_codepoint(b, n, &width);
+
+    if (codepoint <= 0xFF) {
+        return (pm_encoding_unicode_table[(uint8_t) codepoint] & PRISM_ENCODING_UPPERCASE_BIT) ? true : false;
+    } else {
+        return pm_unicode_codepoint_match(codepoint, unicode_isupper_codepoints, UNICODE_ISUPPER_CODEPOINTS_LENGTH) ? true : false;
+    }
+}
+
+#endif
+
+#undef UNICODE_ALPHA_CODEPOINTS_LENGTH
+#undef UNICODE_ALNUM_CODEPOINTS_LENGTH
+#undef UNICODE_ISUPPER_CODEPOINTS_LENGTH
+
+/**
+ * Each element of the following table contains a bitfield that indicates a
+ * piece of information about the corresponding US-ASCII character.
+ */
+static const uint8_t pm_encoding_ascii_table[256] = {
+//  0  1  2  3  4  5  6  7  8  9  A  B  C  D  E  F
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 0x
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 1x
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 2x
+    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 0, 0, 0, 0, 0, 0, // 3x
+    0, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, // 4x
+    7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 0, 0, 0, 0, 0, // 5x
+    0, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, // 6x
+    3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 0, 0, 0, 0, 0, // 7x
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 8x
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 9x
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // Ax
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // Bx
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // Cx
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // Dx
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // Ex
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // Fx
+};
+
+#ifndef PRISM_ENCODING_EXCLUDE_FULL
+
+/**
+ * Each element of the following table contains a bitfield that indicates a
+ * piece of information about the corresponding CP850 character.
+ */
+static const uint8_t pm_encoding_cp850_table[256] = {
+//  0  1  2  3  4  5  6  7  8  9  A  B  C  D  E  F
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 0x
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 1x
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 2x
+    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 0, 0, 0, 0, 0, 0, // 3x
+    0, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, // 4x
+    7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 0, 0, 0, 0, 0, // 5x
+    0, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, // 6x
+    3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 0, 0, 0, 0, 0, // 7x
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 8x
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 9x
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // Ax
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // Bx
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // Cx
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // Dx
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // Ex
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // Fx
+};
+
+/**
+ * Each element of the following table contains a bitfield that indicates a
+ * piece of information about the corresponding CP852 character.
+ */
+static const uint8_t pm_encoding_cp852_table[256] = {
+//  0  1  2  3  4  5  6  7  8  9  A  B  C  D  E  F
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 0x
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 1x
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 2x
+    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 0, 0, 0, 0, 0, 0, // 3x
+    0, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, // 4x
+    7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 0, 0, 0, 0, 0, // 5x
+    0, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, // 6x
+    3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 0, 0, 0, 0, 0, // 7x
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 8x
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 9x
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // Ax
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // Bx
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // Cx
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // Dx
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // Ex
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // Fx
+};
+
+/**
+ * Each element of the following table contains a bitfield that indicates a
+ * piece of information about the corresponding CP855 character.
+ */
+static const uint8_t pm_encoding_cp855_table[256] = {
+//  0  1  2  3  4  5  6  7  8  9  A  B  C  D  E  F
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 0x
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 1x
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 2x
+    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 0, 0, 0, 0, 0, 0, // 3x
+    0, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, // 4x
+    7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 0, 0, 0, 0, 0, // 5x
+    0, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, // 6x
+    3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 0, 0, 0, 0, 0, // 7x
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 8x
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 9x
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // Ax
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // Bx
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // Cx
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // Dx
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // Ex
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // Fx
+};
+
+/**
+ * Each element of the following table contains a bitfield that indicates a
+ * piece of information about the corresponding GB1988 character.
+ */
+static const uint8_t pm_encoding_gb1988_table[256] = {
+//  0  1  2  3  4  5  6  7  8  9  A  B  C  D  E  F
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 0x
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 1x
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 2x
+    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 0, 0, 0, 0, 0, 0, // 3x
+    0, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, // 4x
+    7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 0, 0, 0, 0, 0, // 5x
+    0, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, // 6x
+    3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 0, 0, 0, 0, 0, // 7x
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 8x
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 9x
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // Ax
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // Bx
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // Cx
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // Dx
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // Ex
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // Fx
+};
+
+/**
+ * Each element of the following table contains a bitfield that indicates a
+ * piece of information about the corresponding IBM437 character.
+ */
+static const uint8_t pm_encoding_ibm437_table[256] = {
+//  0  1  2  3  4  5  6  7  8  9  A  B  C  D  E  F
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 0x
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 1x
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 2x
+    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 0, 0, 0, 0, 0, 0, // 3x
+    0, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, // 4x
+    7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 0, 0, 0, 0, 0, // 5x
+    0, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, // 6x
+    3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 0, 0, 0, 0, 0, // 7x
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 8x
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 9x
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // Ax
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // Bx
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // Cx
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // Dx
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // Ex
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // Fx
+};
+
+/**
+ * Each element of the following table contains a bitfield that indicates a
+ * piece of information about the corresponding IBM720 character.
+ */
+static const uint8_t pm_encoding_ibm720_table[256] = {
+//  0  1  2  3  4  5  6  7  8  9  A  B  C  D  E  F
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 0x
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 1x
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 2x
+    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 0, 0, 0, 0, 0, 0, // 3x
+    0, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, // 4x
+    7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 0, 0, 0, 0, 0, // 5x
+    0, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, // 6x
+    3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 0, 0, 0, 0, 0, // 7x
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 8x
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 9x
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // Ax
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // Bx
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // Cx
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // Dx
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // Ex
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // Fx
+};
+
+/**
+ * Each element of the following table contains a bitfield that indicates a
+ * piece of information about the corresponding IBM737 character.
+ */
+static const uint8_t pm_encoding_ibm737_table[256] = {
+//  0  1  2  3  4  5  6  7  8  9  A  B  C  D  E  F
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 0x
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 1x
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 2x
+    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 0, 0, 0, 0, 0, 0, // 3x
+    0, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, // 4x
+    7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 0, 0, 0, 0, 0, // 5x
+    0, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, // 6x
+    3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 0, 0, 0, 0, 0, // 7x
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 8x
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 9x
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // Ax
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // Bx
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // Cx
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // Dx
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // Ex
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // Fx
+};
+
+/**
+ * Each element of the following table contains a bitfield that indicates a
+ * piece of information about the corresponding IBM775 character.
+ */
+static const uint8_t pm_encoding_ibm775_table[256] = {
+//  0  1  2  3  4  5  6  7  8  9  A  B  C  D  E  F
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 0x
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 1x
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 2x
+    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 0, 0, 0, 0, 0, 0, // 3x
+    0, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, // 4x
+    7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 0, 0, 0, 0, 0, // 5x
+    0, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, // 6x
+    3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 0, 0, 0, 0, 0, // 7x
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 8x
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 9x
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // Ax
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // Bx
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // Cx
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // Dx
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // Ex
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // Fx
+};
+
+/**
+ * Each element of the following table contains a bitfield that indicates a
+ * piece of information about the corresponding IBM852 character.
+ */
+static const uint8_t pm_encoding_ibm852_table[256] = {
+//  0  1  2  3  4  5  6  7  8  9  A  B  C  D  E  F
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 0x
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 1x
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 2x
+    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 0, 0, 0, 0, 0, 0, // 3x
+    0, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, // 4x
+    7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 0, 0, 0, 0, 0, // 5x
+    0, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, // 6x
+    3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 0, 0, 0, 0, 0, // 7x
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 8x
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 9x
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // Ax
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // Bx
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // Cx
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // Dx
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // Ex
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // Fx
+};
+
+/**
+ * Each element of the following table contains a bitfield that indicates a
+ * piece of information about the corresponding IBM855 character.
+ */
+static const uint8_t pm_encoding_ibm855_table[256] = {
+//  0  1  2  3  4  5  6  7  8  9  A  B  C  D  E  F
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 0x
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 1x
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 2x
+    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 0, 0, 0, 0, 0, 0, // 3x
+    0, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, // 4x
+    7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 0, 0, 0, 0, 0, // 5x
+    0, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, // 6x
+    3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 0, 0, 0, 0, 0, // 7x
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 8x
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 9x
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // Ax
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // Bx
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // Cx
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // Dx
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // Ex
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // Fx
+};
+
+/**
+ * Each element of the following table contains a bitfield that indicates a
+ * piece of information about the corresponding IBM857 character.
+ */
+static const uint8_t pm_encoding_ibm857_table[256] = {
+//  0  1  2  3  4  5  6  7  8  9  A  B  C  D  E  F
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 0x
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 1x
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 2x
+    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 0, 0, 0, 0, 0, 0, // 3x
+    0, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, // 4x
+    7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 0, 0, 0, 0, 0, // 5x
+    0, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, // 6x
+    3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 0, 0, 0, 0, 0, // 7x
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 8x
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 9x
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // Ax
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // Bx
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // Cx
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // Dx
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // Ex
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // Fx
+};
+
+/**
+ * Each element of the following table contains a bitfield that indicates a
+ * piece of information about the corresponding IBM860 character.
+ */
+static const uint8_t pm_encoding_ibm860_table[256] = {
+//  0  1  2  3  4  5  6  7  8  9  A  B  C  D  E  F
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 0x
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 1x
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 2x
+    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 0, 0, 0, 0, 0, 0, // 3x
+    0, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, // 4x
+    7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 0, 0, 0, 0, 0, // 5x
+    0, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, // 6x
+    3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 0, 0, 0, 0, 0, // 7x
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 8x
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 9x
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // Ax
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // Bx
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // Cx
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // Dx
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // Ex
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // Fx
+};
+
+/**
+ * Each element of the following table contains a bitfield that indicates a
+ * piece of information about the corresponding IBM861 character.
+ */
+static const uint8_t pm_encoding_ibm861_table[256] = {
+//  0  1  2  3  4  5  6  7  8  9  A  B  C  D  E  F
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 0x
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 1x
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 2x
+    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 0, 0, 0, 0, 0, 0, // 3x
+    0, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, // 4x
+    7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 0, 0, 0, 0, 0, // 5x
+    0, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, // 6x
+    3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 0, 0, 0, 0, 0, // 7x
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 8x
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 9x
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // Ax
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // Bx
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // Cx
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // Dx
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // Ex
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // Fx
+};
+
+/**
+ * Each element of the following table contains a bitfield that indicates a
+ * piece of information about the corresponding IBM862 character.
+ */
+static const uint8_t pm_encoding_ibm862_table[256] = {
+//  0  1  2  3  4  5  6  7  8  9  A  B  C  D  E  F
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 0x
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 1x
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 2x
+    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 0, 0, 0, 0, 0, 0, // 3x
+    0, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, // 4x
+    7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 0, 0, 0, 0, 0, // 5x
+    0, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, // 6x
+    3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 0, 0, 0, 0, 0, // 7x
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 8x
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 9x
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // Ax
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // Bx
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // Cx
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // Dx
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // Ex
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // Fx
+};
+
+/**
+ * Each element of the following table contains a bitfield that indicates a
+ * piece of information about the corresponding IBM863 character.
+ */
+static const uint8_t pm_encoding_ibm863_table[256] = {
+//  0  1  2  3  4  5  6  7  8  9  A  B  C  D  E  F
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 0x
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 1x
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 2x
+    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 0, 0, 0, 0, 0, 0, // 3x
+    0, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, // 4x
+    7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 0, 0, 0, 0, 0, // 5x
+    0, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, // 6x
+    3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 0, 0, 0, 0, 0, // 7x
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 8x
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 9x
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // Ax
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // Bx
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // Cx
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // Dx
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // Ex
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // Fx
+};
+
+/**
+ * Each element of the following table contains a bitfield that indicates a
+ * piece of information about the corresponding IBM864 character.
+ */
+static const uint8_t pm_encoding_ibm864_table[256] = {
+//  0  1  2  3  4  5  6  7  8  9  A  B  C  D  E  F
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 0x
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 1x
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 2x
+    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 0, 0, 0, 0, 0, 0, // 3x
+    0, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, // 4x
+    7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 0, 0, 0, 0, 0, // 5x
+    0, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, // 6x
+    3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 0, 0, 0, 0, 0, // 7x
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 8x
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 9x
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // Ax
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // Bx
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // Cx
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // Dx
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // Ex
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // Fx
+};
+
+/**
+ * Each element of the following table contains a bitfield that indicates a
+ * piece of information about the corresponding IBM865 character.
+ */
+static const uint8_t pm_encoding_ibm865_table[256] = {
+//  0  1  2  3  4  5  6  7  8  9  A  B  C  D  E  F
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 0x
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 1x
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 2x
+    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 0, 0, 0, 0, 0, 0, // 3x
+    0, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, // 4x
+    7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 0, 0, 0, 0, 0, // 5x
+    0, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, // 6x
+    3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 0, 0, 0, 0, 0, // 7x
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 8x
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 9x
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // Ax
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // Bx
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // Cx
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // Dx
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // Ex
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // Fx
+};
+
+/**
+ * Each element of the following table contains a bitfield that indicates a
+ * piece of information about the corresponding IBM866 character.
+ */
+static const uint8_t pm_encoding_ibm866_table[256] = {
+//  0  1  2  3  4  5  6  7  8  9  A  B  C  D  E  F
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 0x
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 1x
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 2x
+    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 0, 0, 0, 0, 0, 0, // 3x
+    0, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, // 4x
+    7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 0, 0, 0, 0, 0, // 5x
+    0, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, // 6x
+    3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 0, 0, 0, 0, 0, // 7x
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 8x
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 9x
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // Ax
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // Bx
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // Cx
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // Dx
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // Ex
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // Fx
+};
+
+/**
+ * Each element of the following table contains a bitfield that indicates a
+ * piece of information about the corresponding IBM869 character.
+ */
+static const uint8_t pm_encoding_ibm869_table[256] = {
+//  0  1  2  3  4  5  6  7  8  9  A  B  C  D  E  F
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 0x
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 1x
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 2x
+    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 0, 0, 0, 0, 0, 0, // 3x
+    0, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, // 4x
+    7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 0, 0, 0, 0, 0, // 5x
+    0, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, // 6x
+    3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 0, 0, 0, 0, 0, // 7x
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 8x
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 9x
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // Ax
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // Bx
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // Cx
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // Dx
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // Ex
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // Fx
+};
+
+/**
+ * Each element of the following table contains a bitfield that indicates a
+ * piece of information about the corresponding ISO-8859-1 character.
+ */
+static const uint8_t pm_encoding_iso_8859_1_table[256] = {
+//  0  1  2  3  4  5  6  7  8  9  A  B  C  D  E  F
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 0x
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 1x
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 2x
+    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 0, 0, 0, 0, 0, 0, // 3x
+    0, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, // 4x
+    7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 0, 0, 0, 0, 0, // 5x
+    0, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, // 6x
+    3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 0, 0, 0, 0, 0, // 7x
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 8x
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 9x
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 0, 0, 0, 0, 0, // Ax
+    0, 0, 0, 0, 0, 3, 0, 0, 0, 0, 3, 0, 0, 0, 0, 0, // Bx
+    7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, // Cx
+    7, 7, 7, 7, 7, 7, 7, 0, 7, 7, 7, 7, 7, 7, 7, 3, // Dx
+    3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, // Ex
+    3, 3, 3, 3, 3, 3, 3, 0, 3, 3, 3, 3, 3, 3, 3, 3, // Fx
+};
+
+/**
+ * Each element of the following table contains a bitfield that indicates a
+ * piece of information about the corresponding ISO-8859-2 character.
+ */
+static const uint8_t pm_encoding_iso_8859_2_table[256] = {
+//  0  1  2  3  4  5  6  7  8  9  A  B  C  D  E  F
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 0x
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 1x
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 2x
+    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 0, 0, 0, 0, 0, 0, // 3x
+    0, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, // 4x
+    7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 0, 0, 0, 0, 0, // 5x
+    0, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, // 6x
+    3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 0, 0, 0, 0, 0, // 7x
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 8x
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 9x
+    0, 7, 0, 7, 0, 7, 7, 0, 0, 7, 7, 7, 7, 0, 7, 7, // Ax
+    0, 3, 0, 3, 0, 3, 3, 0, 0, 3, 3, 3, 3, 0, 3, 3, // Bx
+    7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, // Cx
+    7, 7, 7, 7, 7, 7, 7, 0, 7, 7, 7, 7, 7, 7, 7, 3, // Dx
+    3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, // Ex
+    3, 3, 3, 3, 3, 3, 3, 0, 3, 3, 3, 3, 3, 3, 3, 0, // Fx
+};
+
+/**
+ * Each element of the following table contains a bitfield that indicates a
+ * piece of information about the corresponding ISO-8859-3 character.
+ */
+static const uint8_t pm_encoding_iso_8859_3_table[256] = {
+//  0  1  2  3  4  5  6  7  8  9  A  B  C  D  E  F
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 0x
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 1x
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 2x
+    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 0, 0, 0, 0, 0, 0, // 3x
+    0, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, // 4x
+    7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 0, 0, 0, 0, 0, // 5x
+    0, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, // 6x
+    3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 0, 0, 0, 0, 0, // 7x
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 8x
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 9x
+    0, 7, 0, 0, 0, 0, 7, 0, 0, 7, 7, 7, 7, 0, 0, 7, // Ax
+    0, 3, 0, 0, 0, 3, 3, 0, 0, 3, 3, 3, 3, 0, 0, 3, // Bx
+    7, 7, 7, 0, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, // Cx
+    0, 7, 7, 7, 7, 7, 7, 0, 7, 7, 7, 7, 7, 7, 7, 3, // Dx
+    3, 3, 3, 0, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, // Ex
+    0, 3, 3, 3, 3, 3, 3, 0, 3, 3, 3, 3, 3, 3, 3, 0, // Fx
+};
+
+/**
+ * Each element of the following table contains a bitfield that indicates a
+ * piece of information about the corresponding ISO-8859-4 character.
+ */
+static const uint8_t pm_encoding_iso_8859_4_table[256] = {
+//  0  1  2  3  4  5  6  7  8  9  A  B  C  D  E  F
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 0x
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 1x
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 2x
+    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 0, 0, 0, 0, 0, 0, // 3x
+    0, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, // 4x
+    7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 0, 0, 0, 0, 0, // 5x
+    0, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, // 6x
+    3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 0, 0, 0, 0, 0, // 7x
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 8x
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 9x
+    0, 7, 3, 7, 0, 7, 7, 0, 0, 7, 7, 7, 7, 0, 7, 0, // Ax
+    0, 3, 0, 3, 0, 3, 3, 0, 0, 3, 3, 3, 3, 7, 3, 3, // Bx
+    7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, // Cx
+    7, 7, 7, 7, 7, 7, 7, 0, 7, 7, 7, 7, 7, 7, 7, 3, // Dx
+    3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, // Ex
+    3, 3, 3, 3, 3, 3, 3, 0, 3, 3, 3, 3, 3, 3, 3, 0, // Fx
+};
+
+/**
+ * Each element of the following table contains a bitfield that indicates a
+ * piece of information about the corresponding ISO-8859-5 character.
+ */
+static const uint8_t pm_encoding_iso_8859_5_table[256] = {
+//  0  1  2  3  4  5  6  7  8  9  A  B  C  D  E  F
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 0x
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 1x
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 2x
+    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 0, 0, 0, 0, 0, 0, // 3x
+    0, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, // 4x
+    7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 0, 0, 0, 0, 0, // 5x
+    0, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, // 6x
+    3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 0, 0, 0, 0, 0, // 7x
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 8x
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 9x
+    0, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 0, 7, 7, // Ax
+    7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, // Bx
+    7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, // Cx
+    3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, // Dx
+    3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, // Ex
+    0, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 0, 3, 3, // Fx
+};
+
+/**
+ * Each element of the following table contains a bitfield that indicates a
+ * piece of information about the corresponding ISO-8859-6 character.
+ */
+static const uint8_t pm_encoding_iso_8859_6_table[256] = {
+//  0  1  2  3  4  5  6  7  8  9  A  B  C  D  E  F
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 0x
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 1x
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 2x
+    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 0, 0, 0, 0, 0, 0, // 3x
+    0, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, // 4x
+    7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 0, 0, 0, 0, 0, // 5x
+    0, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, // 6x
+    3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 0, 0, 0, 0, 0, // 7x
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 8x
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 9x
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // Ax
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // Bx
+    0, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, // Cx
+    3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 0, 0, 0, 0, 0, // Dx
+    3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, // Ex
+    3, 3, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // Fx
+};
+
+/**
+ * Each element of the following table contains a bitfield that indicates a
+ * piece of information about the corresponding ISO-8859-7 character.
+ */
+static const uint8_t pm_encoding_iso_8859_7_table[256] = {
+//  0  1  2  3  4  5  6  7  8  9  A  B  C  D  E  F
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 0x
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 1x
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 2x
+    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 0, 0, 0, 0, 0, 0, // 3x
+    0, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, // 4x
+    7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 0, 0, 0, 0, 0, // 5x
+    0, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, // 6x
+    3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 0, 0, 0, 0, 0, // 7x
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 8x
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 9x
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // Ax
+    0, 0, 0, 0, 0, 0, 7, 0, 7, 7, 7, 0, 7, 0, 7, 7, // Bx
+    3, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, // Cx
+    7, 7, 0, 7, 7, 7, 7, 7, 7, 7, 7, 7, 3, 3, 3, 3, // Dx
+    3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, // Ex
+    3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 0, // Fx
+};
+
+/**
+ * Each element of the following table contains a bitfield that indicates a
+ * piece of information about the corresponding ISO-8859-8 character.
+ */
+static const uint8_t pm_encoding_iso_8859_8_table[256] = {
+//  0  1  2  3  4  5  6  7  8  9  A  B  C  D  E  F
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 0x
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 1x
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 2x
+    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 0, 0, 0, 0, 0, 0, // 3x
+    0, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, // 4x
+    7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 0, 0, 0, 0, 0, // 5x
+    0, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, // 6x
+    3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 0, 0, 0, 0, 0, // 7x
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 8x
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 9x
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // Ax
+    0, 0, 0, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // Bx
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // Cx
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // Dx
+    3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, // Ex
+    3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 0, 0, 0, 0, 0, // Fx
+};
+
+/**
+ * Each element of the following table contains a bitfield that indicates a
+ * piece of information about the corresponding ISO-8859-9 character.
+ */
+static const uint8_t pm_encoding_iso_8859_9_table[256] = {
+//  0  1  2  3  4  5  6  7  8  9  A  B  C  D  E  F
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 0x
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 1x
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 2x
+    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 0, 0, 0, 0, 0, 0, // 3x
+    0, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, // 4x
+    7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 0, 0, 0, 0, 0, // 5x
+    0, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, // 6x
+    3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 0, 0, 0, 0, 0, // 7x
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 8x
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 9x
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 0, 0, 0, 0, 0, // Ax
+    0, 0, 0, 0, 0, 3, 0, 0, 0, 0, 3, 0, 0, 0, 0, 0, // Bx
+    7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, // Cx
+    7, 7, 7, 7, 7, 7, 7, 0, 7, 7, 7, 7, 7, 7, 7, 3, // Dx
+    3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, // Ex
+    3, 3, 3, 3, 3, 3, 3, 0, 3, 3, 3, 3, 3, 3, 3, 3, // Fx
+};
+
+/**
+ * Each element of the following table contains a bitfield that indicates a
+ * piece of information about the corresponding ISO-8859-10 character.
+ */
+static const uint8_t pm_encoding_iso_8859_10_table[256] = {
+//  0  1  2  3  4  5  6  7  8  9  A  B  C  D  E  F
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 0x
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 1x
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 2x
+    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 0, 0, 0, 0, 0, 0, // 3x
+    0, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, // 4x
+    7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 0, 0, 0, 0, 0, // 5x
+    0, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, // 6x
+    3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 0, 0, 0, 0, 0, // 7x
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 8x
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 9x
+    0, 7, 7, 7, 7, 7, 7, 0, 7, 7, 7, 7, 7, 0, 7, 7, // Ax
+    0, 3, 3, 3, 3, 3, 3, 0, 3, 3, 3, 3, 3, 0, 3, 3, // Bx
+    7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, // Cx
+    7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 3, // Dx
+    3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, // Ex
+    3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, // Fx
+};
+
+/**
+ * Each element of the following table contains a bitfield that indicates a
+ * piece of information about the corresponding ISO-8859-11 character.
+ */
+static const uint8_t pm_encoding_iso_8859_11_table[256] = {
+//  0  1  2  3  4  5  6  7  8  9  A  B  C  D  E  F
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 0x
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 1x
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 2x
+    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 0, 0, 0, 0, 0, 0, // 3x
+    0, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, // 4x
+    7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 0, 0, 0, 0, 0, // 5x
+    0, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, // 6x
+    3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 0, 0, 0, 0, 0, // 7x
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 8x
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 9x
+    0, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, // Ax
+    3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, // Bx
+    3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, // Cx
+    3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 0, 0, 0, 0, 3, // Dx
+    3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, // Ex
+    3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 0, 0, 0, 0, // Fx
+};
+
+/**
+ * Each element of the following table contains a bitfield that indicates a
+ * piece of information about the corresponding ISO-8859-13 character.
+ */
+static const uint8_t pm_encoding_iso_8859_13_table[256] = {
+//  0  1  2  3  4  5  6  7  8  9  A  B  C  D  E  F
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 0x
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 1x
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 2x
+    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 0, 0, 0, 0, 0, 0, // 3x
+    0, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, // 4x
+    7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 0, 0, 0, 0, 0, // 5x
+    0, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, // 6x
+    3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 0, 0, 0, 0, 0, // 7x
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 8x
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 9x
+    0, 0, 0, 0, 0, 0, 0, 0, 7, 0, 7, 0, 0, 0, 0, 7, // Ax
+    0, 0, 0, 0, 0, 3, 0, 0, 3, 0, 3, 0, 0, 0, 0, 3, // Bx
+    7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, // Cx
+    7, 7, 7, 7, 7, 7, 7, 0, 7, 7, 7, 7, 7, 7, 7, 3, // Dx
+    3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, // Ex
+    3, 3, 3, 3, 3, 3, 3, 0, 3, 3, 3, 3, 3, 3, 3, 0, // Fx
+};
+
+/**
+ * Each element of the following table contains a bitfield that indicates a
+ * piece of information about the corresponding ISO-8859-14 character.
+ */
+static const uint8_t pm_encoding_iso_8859_14_table[256] = {
+//  0  1  2  3  4  5  6  7  8  9  A  B  C  D  E  F
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 0x
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 1x
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 2x
+    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 0, 0, 0, 0, 0, 0, // 3x
+    0, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, // 4x
+    7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 0, 0, 0, 0, 0, // 5x
+    0, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, // 6x
+    3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 0, 0, 0, 0, 0, // 7x
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 8x
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 9x
+    0, 7, 3, 0, 7, 3, 7, 0, 7, 0, 7, 3, 7, 0, 0, 7, // Ax
+    7, 3, 7, 3, 7, 3, 0, 7, 3, 3, 3, 7, 3, 7, 3, 3, // Bx
+    7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, // Cx
+    7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 3, // Dx
+    3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, // Ex
+    3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, // Fx
+};
+
+/**
+ * Each element of the following table contains a bitfield that indicates a
+ * piece of information about the corresponding ISO-8859-15 character.
+ */
+static const uint8_t pm_encoding_iso_8859_15_table[256] = {
+//  0  1  2  3  4  5  6  7  8  9  A  B  C  D  E  F
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 0x
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 1x
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 2x
+    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 0, 0, 0, 0, 0, 0, // 3x
+    0, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, // 4x
+    7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 0, 0, 0, 0, 0, // 5x
+    0, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, // 6x
+    3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 0, 0, 0, 0, 0, // 7x
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 8x
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 9x
+    0, 0, 0, 0, 0, 0, 7, 0, 3, 0, 3, 0, 0, 0, 0, 0, // Ax
+    0, 0, 0, 0, 7, 3, 0, 0, 3, 0, 3, 0, 7, 3, 7, 0, // Bx
+    7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, // Cx
+    7, 7, 7, 7, 7, 7, 7, 0, 7, 7, 7, 7, 7, 7, 7, 3, // Dx
+    3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, // Ex
+    3, 3, 3, 3, 3, 3, 3, 0, 3, 3, 3, 3, 3, 3, 3, 3, // Fx
+};
+
+/**
+ * Each element of the following table contains a bitfield that indicates a
+ * piece of information about the corresponding ISO-8859-16 character.
+ */
+static const uint8_t pm_encoding_iso_8859_16_table[256] = {
+//  0  1  2  3  4  5  6  7  8  9  A  B  C  D  E  F
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 0x
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 1x
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 2x
+    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 0, 0, 0, 0, 0, 0, // 3x
+    0, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, // 4x
+    7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 0, 0, 0, 0, 0, // 5x
+    0, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, // 6x
+    3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 0, 0, 0, 0, 0, // 7x
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 8x
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 9x
+    0, 7, 3, 7, 0, 0, 7, 0, 3, 0, 7, 0, 7, 0, 3, 7, // Ax
+    0, 0, 7, 3, 7, 0, 0, 0, 3, 3, 3, 0, 7, 3, 7, 3, // Bx
+    7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, // Cx
+    7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 3, // Dx
+    3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, // Ex
+    3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, // Fx
+};
+
+/**
+ * Each element of the following table contains a bitfield that indicates a
+ * piece of information about the corresponding KOI8-R character.
+ */
+static const uint8_t pm_encoding_koi8_r_table[256] = {
+//  0  1  2  3  4  5  6  7  8  9  A  B  C  D  E  F
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 0x
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 1x
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 2x
+    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 0, 0, 0, 0, 0, 0, // 3x
+    0, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, // 4x
+    7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 0, 0, 0, 0, 0, // 5x
+    0, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, // 6x
+    3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 0, 0, 0, 0, 0, // 7x
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 8x
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 9x
+    0, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // Ax
+    0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // Bx
+    3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, // Cx
+    3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, // Dx
+    7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, // Ex
+    7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, // Fx
+};
+
+/**
+ * Each element of the following table contains a bitfield that indicates a
+ * piece of information about the corresponding KOI8-U character.
+ */
+static const uint8_t pm_encoding_koi8_u_table[256] = {
+//  0  1  2  3  4  5  6  7  8  9  A  B  C  D  E  F
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 0x
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 1x
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 2x
+    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 0, 0, 0, 0, 0, 0, // 3x
+    0, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, // 4x
+    7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 0, 0, 0, 0, 0, // 5x
+    0, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, // 6x
+    3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 0, 0, 0, 0, 0, // 7x
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 8x
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 9x
+    0, 0, 0, 3, 3, 0, 3, 3, 0, 0, 0, 0, 0, 3, 0, 0, // Ax
+    0, 0, 0, 7, 7, 0, 7, 7, 0, 0, 0, 0, 0, 7, 0, 0, // Bx
+    3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, // Cx
+    3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, // Dx
+    7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, // Ex
+    7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, // Fx
+};
+
+/**
+ * Each element of the following table contains a bitfield that indicates a
+ * piece of information about the corresponding macCentEuro character.
+ */
+static const uint8_t pm_encoding_mac_cent_euro_table[256] = {
+//  0  1  2  3  4  5  6  7  8  9  A  B  C  D  E  F
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 0x
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 1x
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 2x
+    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 0, 0, 0, 0, 0, 0, // 3x
+    0, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, // 4x
+    7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 0, 0, 0, 0, 0, // 5x
+    0, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, // 6x
+    3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 0, 0, 0, 0, 0, // 7x
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 8x
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 9x
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // Ax
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // Bx
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // Cx
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // Dx
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // Ex
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // Fx
+};
+
+/**
+ * Each element of the following table contains a bitfield that indicates a
+ * piece of information about the corresponding macCroatian character.
+ */
+static const uint8_t pm_encoding_mac_croatian_table[256] = {
+//  0  1  2  3  4  5  6  7  8  9  A  B  C  D  E  F
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 0x
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 1x
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 2x
+    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 0, 0, 0, 0, 0, 0, // 3x
+    0, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, // 4x
+    7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 0, 0, 0, 0, 0, // 5x
+    0, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, // 6x
+    3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 0, 0, 0, 0, 0, // 7x
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 8x
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 9x
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // Ax
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // Bx
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // Cx
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // Dx
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // Ex
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // Fx
+};
+
+ /**
+ * Each element of the following table contains a bitfield that indicates a
+ * piece of information about the corresponding macCyrillic character.
+ */
+static const uint8_t pm_encoding_mac_cyrillic_table[256] = {
+//  0  1  2  3  4  5  6  7  8  9  A  B  C  D  E  F
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 0x
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 1x
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 2x
+    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 0, 0, 0, 0, 0, 0, // 3x
+    0, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, // 4x
+    7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 0, 0, 0, 0, 0, // 5x
+    0, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, // 6x
+    3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 0, 0, 0, 0, 0, // 7x
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 8x
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 9x
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // Ax
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // Bx
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // Cx
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // Dx
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // Ex
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // Fx
+};
+
+/**
+ * Each element of the following table contains a bitfield that indicates a
+ * piece of information about the corresponding macGreek character.
+ */
+static const uint8_t pm_encoding_mac_greek_table[256] = {
+//  0  1  2  3  4  5  6  7  8  9  A  B  C  D  E  F
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 0x
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 1x
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 2x
+    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 0, 0, 0, 0, 0, 0, // 3x
+    0, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, // 4x
+    7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 0, 0, 0, 0, 0, // 5x
+    0, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, // 6x
+    3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 0, 0, 0, 0, 0, // 7x
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 8x
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 9x
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // Ax
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // Bx
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // Cx
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // Dx
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // Ex
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // Fx
+};
+
+/**
+ * Each element of the following table contains a bitfield that indicates a
+ * piece of information about the corresponding macIceland character.
+ */
+static const uint8_t pm_encoding_mac_iceland_table[256] = {
+//  0  1  2  3  4  5  6  7  8  9  A  B  C  D  E  F
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 0x
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 1x
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 2x
+    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 0, 0, 0, 0, 0, 0, // 3x
+    0, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, // 4x
+    7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 0, 0, 0, 0, 0, // 5x
+    0, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, // 6x
+    3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 0, 0, 0, 0, 0, // 7x
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 8x
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 9x
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // Ax
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // Bx
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // Cx
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // Dx
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // Ex
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // Fx
+};
+
+/**
+ * Each element of the following table contains a bitfield that indicates a
+ * piece of information about the corresponding macRoman character.
+ */
+static const uint8_t pm_encoding_mac_roman_table[256] = {
+//  0  1  2  3  4  5  6  7  8  9  A  B  C  D  E  F
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 0x
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 1x
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 2x
+    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 0, 0, 0, 0, 0, 0, // 3x
+    0, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, // 4x
+    7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 0, 0, 0, 0, 0, // 5x
+    0, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, // 6x
+    3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 0, 0, 0, 0, 0, // 7x
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 8x
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 9x
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // Ax
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // Bx
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // Cx
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // Dx
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // Ex
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // Fx
+};
+
+/**
+ * Each element of the following table contains a bitfield that indicates a
+ * piece of information about the corresponding macRomania character.
+ */
+static const uint8_t pm_encoding_mac_romania_table[256] = {
+//  0  1  2  3  4  5  6  7  8  9  A  B  C  D  E  F
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 0x
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 1x
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 2x
+    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 0, 0, 0, 0, 0, 0, // 3x
+    0, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, // 4x
+    7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 0, 0, 0, 0, 0, // 5x
+    0, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, // 6x
+    3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 0, 0, 0, 0, 0, // 7x
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 8x
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 9x
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // Ax
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // Bx
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // Cx
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // Dx
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // Ex
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // Fx
+};
+
+/**
+ * Each element of the following table contains a bitfield that indicates a
+ * piece of information about the corresponding macThai character.
+ */
+static const uint8_t pm_encoding_mac_thai_table[256] = {
+//  0  1  2  3  4  5  6  7  8  9  A  B  C  D  E  F
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 0x
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 1x
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 2x
+    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 0, 0, 0, 0, 0, 0, // 3x
+    0, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, // 4x
+    7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 0, 0, 0, 0, 0, // 5x
+    0, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, // 6x
+    3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 0, 0, 0, 0, 0, // 7x
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 8x
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 9x
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // Ax
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // Bx
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // Cx
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // Dx
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // Ex
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // Fx
+};
+
+/**
+ * Each element of the following table contains a bitfield that indicates a
+ * piece of information about the corresponding TIS-620 character.
+ */
+static const uint8_t pm_encoding_tis_620_table[256] = {
+//  0  1  2  3  4  5  6  7  8  9  A  B  C  D  E  F
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 0x
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 1x
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 2x
+    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 0, 0, 0, 0, 0, 0, // 3x
+    0, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, // 4x
+    7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 0, 0, 0, 0, 0, // 5x
+    0, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, // 6x
+    3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 0, 0, 0, 0, 0, // 7x
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 8x
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 9x
+    0, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, // Ax
+    3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, // Bx
+    3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, // Cx
+    3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 0, 0, 0, 0, 3, // Dx
+    3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, // Ex
+    3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 0, 0, 0, 0, // Fx
+};
+
+/**
+ * Each element of the following table contains a bitfield that indicates a
+ * piece of information about the corresponding macTurkish character.
+ */
+static const uint8_t pm_encoding_mac_turkish_table[256] = {
+//  0  1  2  3  4  5  6  7  8  9  A  B  C  D  E  F
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 0x
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 1x
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 2x
+    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 0, 0, 0, 0, 0, 0, // 3x
+    0, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, // 4x
+    7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 0, 0, 0, 0, 0, // 5x
+    0, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, // 6x
+    3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 0, 0, 0, 0, 0, // 7x
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 8x
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 9x
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // Ax
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // Bx
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // Cx
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // Dx
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // Ex
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // Fx
+};
+
+/**
+ * Each element of the following table contains a bitfield that indicates a
+ * piece of information about the corresponding macUkraine character.
+ */
+static const uint8_t pm_encoding_mac_ukraine_table[256] = {
+//  0  1  2  3  4  5  6  7  8  9  A  B  C  D  E  F
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 0x
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 1x
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 2x
+    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 0, 0, 0, 0, 0, 0, // 3x
+    0, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, // 4x
+    7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 0, 0, 0, 0, 0, // 5x
+    0, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, // 6x
+    3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 0, 0, 0, 0, 0, // 7x
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 8x
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 9x
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // Ax
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // Bx
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // Cx
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // Dx
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // Ex
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // Fx
+};
+
+/**
+ * Each element of the following table contains a bitfield that indicates a
+ * piece of information about the corresponding windows-1250 character.
+ */
+static const uint8_t pm_encoding_windows_1250_table[256] = {
+//  0  1  2  3  4  5  6  7  8  9  A  B  C  D  E  F
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 0x
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 1x
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 2x
+    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 0, 0, 0, 0, 0, 0, // 3x
+    0, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, // 4x
+    7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 0, 0, 0, 0, 0, // 5x
+    0, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, // 6x
+    3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 0, 0, 0, 0, 0, // 7x
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 0, 7, 7, 7, 7, // 8x
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 0, 3, 3, 3, 3, // 9x
+    0, 0, 0, 7, 0, 7, 0, 0, 0, 0, 7, 0, 0, 0, 0, 7, // Ax
+    0, 0, 0, 3, 0, 3, 0, 0, 0, 3, 3, 0, 7, 0, 3, 3, // Bx
+    7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, // Cx
+    7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 3, // Dx
+    3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, // Ex
+    3, 3, 3, 3, 3, 3, 3, 0, 3, 3, 3, 3, 3, 3, 3, 0, // Fx
+};
+
+/**
+ * Each element of the following table contains a bitfield that indicates a
+ * piece of information about the corresponding windows-1251 character.
+ */
+static const uint8_t pm_encoding_windows_1251_table[256] = {
+//  0  1  2  3  4  5  6  7  8  9  A  B  C  D  E  F
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 0x
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 1x
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 2x
+    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 0, 0, 0, 0, 0, 0, // 3x
+    0, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, // 4x
+    7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 0, 0, 0, 0, 0, // 5x
+    0, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, // 6x
+    3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 0, 0, 0, 0, 0, // 7x
+    7, 7, 0, 3, 0, 0, 0, 0, 0, 0, 7, 0, 7, 7, 7, 7, // 8x
+    3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 0, 3, 3, 3, 3, // 9x
+    0, 7, 3, 7, 0, 7, 0, 0, 7, 0, 7, 0, 0, 0, 0, 7, // Ax
+    0, 0, 7, 3, 3, 3, 0, 0, 3, 0, 3, 0, 3, 7, 3, 3, // Bx
+    7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, // Cx
+    7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, // Dx
+    3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, // Ex
+    3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, // Fx
+};
+
+/**
+ * Each element of the following table contains a bitfield that indicates a
+ * piece of information about the corresponding windows-1252 character.
+ */
+static const uint8_t pm_encoding_windows_1252_table[256] = {
+//  0  1  2  3  4  5  6  7  8  9  A  B  C  D  E  F
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 0x
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 1x
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 2x
+    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 0, 0, 0, 0, 0, 0, // 3x
+    0, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, // 4x
+    7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 0, 0, 0, 0, 0, // 5x
+    0, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, // 6x
+    3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 0, 0, 0, 0, 0, // 7x
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 0, 7, 0, 7, 0, // 8x
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 0, 3, 0, 3, 7, // 9x
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 0, 0, 0, 0, 0, // Ax
+    0, 0, 0, 0, 0, 3, 0, 0, 0, 0, 3, 0, 0, 0, 0, 0, // Bx
+    7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, // Cx
+    7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 3, // Dx
+    3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, // Ex
+    3, 3, 3, 3, 3, 3, 3, 0, 3, 3, 3, 3, 3, 3, 3, 3, // Fx
+};
+
+/**
+ * Each element of the following table contains a bitfield that indicates a
+ * piece of information about the corresponding windows-1253 character.
+ */
+static const uint8_t pm_encoding_windows_1253_table[256] = {
+//  0  1  2  3  4  5  6  7  8  9  A  B  C  D  E  F
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 0x
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 1x
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 2x
+    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 0, 0, 0, 0, 0, 0, // 3x
+    0, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, // 4x
+    7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 0, 0, 0, 0, 0, // 5x
+    0, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, // 6x
+    3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 0, 0, 0, 0, 0, // 7x
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 8x
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 9x
+    0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // Ax
+    0, 0, 0, 0, 0, 3, 7, 0, 7, 7, 7, 0, 7, 0, 7, 7, // Bx
+    3, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, // Cx
+    7, 7, 0, 7, 7, 7, 7, 7, 7, 7, 7, 7, 3, 3, 3, 3, // Dx
+    3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, // Ex
+    3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 0, // Fx
+};
+
+/**
+ * Each element of the following table contains a bitfield that indicates a
+ * piece of information about the corresponding windows-1254 character.
+ */
+static const uint8_t pm_encoding_windows_1254_table[256] = {
+//  0  1  2  3  4  5  6  7  8  9  A  B  C  D  E  F
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 0x
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 1x
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 2x
+    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 0, 0, 0, 0, 0, 0, // 3x
+    0, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, // 4x
+    7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 0, 0, 0, 0, 0, // 5x
+    0, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, // 6x
+    3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 0, 0, 0, 0, 0, // 7x
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 0, 7, 0, 0, 0, // 8x
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 0, 3, 0, 0, 7, // 9x
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 0, 0, 0, 0, 0, // Ax
+    0, 0, 0, 0, 0, 3, 0, 0, 0, 0, 3, 0, 0, 0, 0, 0, // Bx
+    7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, // Cx
+    7, 7, 7, 7, 7, 7, 7, 0, 7, 7, 7, 7, 7, 7, 7, 3, // Dx
+    3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, // Ex
+    3, 3, 3, 3, 3, 3, 3, 0, 3, 3, 3, 3, 3, 3, 3, 3, // Fx
+};
+
+/**
+ * Each element of the following table contains a bitfield that indicates a
+ * piece of information about the corresponding windows-1255 character.
+ */
+static const uint8_t pm_encoding_windows_1255_table[256] = {
+//  0  1  2  3  4  5  6  7  8  9  A  B  C  D  E  F
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 0x
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 1x
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 2x
+    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 0, 0, 0, 0, 0, 0, // 3x
+    0, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, // 4x
+    7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 0, 0, 0, 0, 0, // 5x
+    0, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, // 6x
+    3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 0, 0, 0, 0, 0, // 7x
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 8x
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 9x
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // Ax
+    0, 0, 0, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // Bx
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // Cx
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // Dx
+    3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, // Ex
+    3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 0, 0, 0, 0, 0, // Fx
+};
+
+/**
+ * Each element of the following table contains a bitfield that indicates a
+ * piece of information about the corresponding windows-1256 character.
+ */
+static const uint8_t pm_encoding_windows_1256_table[256] = {
+//  0  1  2  3  4  5  6  7  8  9  A  B  C  D  E  F
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 0x
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 1x
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 2x
+    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 0, 0, 0, 0, 0, 0, // 3x
+    0, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, // 4x
+    7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 0, 0, 0, 0, 0, // 5x
+    0, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, // 6x
+    3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 0, 0, 0, 0, 0, // 7x
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 8x
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 9x
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // Ax
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // Bx
+    0, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, // Cx
+    3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 0, 0, 0, 0, 0, // Dx
+    3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, // Ex
+    3, 3, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // Fx
+};
+
+/**
+ * Each element of the following table contains a bitfield that indicates a
+ * piece of information about the corresponding windows-1257 character.
+ */
+static const uint8_t pm_encoding_windows_1257_table[256] = {
+//  0  1  2  3  4  5  6  7  8  9  A  B  C  D  E  F
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 0x
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 1x
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 2x
+    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 0, 0, 0, 0, 0, 0, // 3x
+    0, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, // 4x
+    7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 0, 0, 0, 0, 0, // 5x
+    0, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, // 6x
+    3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 0, 0, 0, 0, 0, // 7x
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 8x
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 9x
+    0, 0, 0, 0, 0, 0, 0, 0, 7, 0, 7, 0, 0, 0, 0, 7, // Ax
+    0, 0, 0, 0, 0, 3, 0, 0, 3, 0, 3, 0, 0, 0, 0, 3, // Bx
+    7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, // Cx
+    7, 7, 7, 7, 7, 7, 7, 0, 7, 7, 7, 7, 7, 7, 7, 3, // Dx
+    3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, // Ex
+    3, 3, 3, 3, 3, 3, 3, 0, 3, 3, 3, 3, 3, 3, 3, 0, // Fx
+};
+
+/**
+ * Each element of the following table contains a bitfield that indicates a
+ * piece of information about the corresponding windows-1258 character.
+ */
+static const uint8_t pm_encoding_windows_1258_table[256] = {
+//  0  1  2  3  4  5  6  7  8  9  A  B  C  D  E  F
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 0x
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 1x
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 2x
+    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 0, 0, 0, 0, 0, 0, // 3x
+    0, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, // 4x
+    7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 0, 0, 0, 0, 0, // 5x
+    0, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, // 6x
+    3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 0, 0, 0, 0, 0, // 7x
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 8x
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 9x
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // Ax
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // Bx
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // Cx
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // Dx
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // Ex
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // Fx
+};
+
+/**
+ * Each element of the following table contains a bitfield that indicates a
+ * piece of information about the corresponding windows-874 character.
+ */
+static const uint8_t pm_encoding_windows_874_table[256] = {
+//  0  1  2  3  4  5  6  7  8  9  A  B  C  D  E  F
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 0x
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 1x
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 2x
+    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 0, 0, 0, 0, 0, 0, // 3x
+    0, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, // 4x
+    7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 0, 0, 0, 0, 0, // 5x
+    0, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, // 6x
+    3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 0, 0, 0, 0, 0, // 7x
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 8x
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 9x
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // Ax
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // Bx
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // Cx
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // Dx
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // Ex
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // Fx
+};
+
+#define PRISM_ENCODING_TABLE(name) \
+    static size_t pm_encoding_ ##name ## _alpha_char(const uint8_t *b, PRISM_ATTRIBUTE_UNUSED ptrdiff_t n) {           \
+        return (pm_encoding_ ##name ## _table[*b] & PRISM_ENCODING_ALPHABETIC_BIT);           \
+    }                                                                                                         \
+    static size_t pm_encoding_ ##name ## _alnum_char(const uint8_t *b, PRISM_ATTRIBUTE_UNUSED ptrdiff_t n) {           \
+        return (pm_encoding_ ##name ## _table[*b] & PRISM_ENCODING_ALPHANUMERIC_BIT) ? 1 : 0; \
+    }                                                                                                         \
+    static bool pm_encoding_ ##name ## _isupper_char(const uint8_t *b, PRISM_ATTRIBUTE_UNUSED ptrdiff_t n) {           \
+        return (pm_encoding_ ##name ## _table[*b] & PRISM_ENCODING_UPPERCASE_BIT);            \
+    }
+
+PRISM_ENCODING_TABLE(cp850)
+PRISM_ENCODING_TABLE(cp852)
+PRISM_ENCODING_TABLE(cp855)
+PRISM_ENCODING_TABLE(gb1988)
+PRISM_ENCODING_TABLE(ibm437)
+PRISM_ENCODING_TABLE(ibm720)
+PRISM_ENCODING_TABLE(ibm737)
+PRISM_ENCODING_TABLE(ibm775)
+PRISM_ENCODING_TABLE(ibm852)
+PRISM_ENCODING_TABLE(ibm855)
+PRISM_ENCODING_TABLE(ibm857)
+PRISM_ENCODING_TABLE(ibm860)
+PRISM_ENCODING_TABLE(ibm861)
+PRISM_ENCODING_TABLE(ibm862)
+PRISM_ENCODING_TABLE(ibm863)
+PRISM_ENCODING_TABLE(ibm864)
+PRISM_ENCODING_TABLE(ibm865)
+PRISM_ENCODING_TABLE(ibm866)
+PRISM_ENCODING_TABLE(ibm869)
+PRISM_ENCODING_TABLE(iso_8859_1)
+PRISM_ENCODING_TABLE(iso_8859_2)
+PRISM_ENCODING_TABLE(iso_8859_3)
+PRISM_ENCODING_TABLE(iso_8859_4)
+PRISM_ENCODING_TABLE(iso_8859_5)
+PRISM_ENCODING_TABLE(iso_8859_6)
+PRISM_ENCODING_TABLE(iso_8859_7)
+PRISM_ENCODING_TABLE(iso_8859_8)
+PRISM_ENCODING_TABLE(iso_8859_9)
+PRISM_ENCODING_TABLE(iso_8859_10)
+PRISM_ENCODING_TABLE(iso_8859_11)
+PRISM_ENCODING_TABLE(iso_8859_13)
+PRISM_ENCODING_TABLE(iso_8859_14)
+PRISM_ENCODING_TABLE(iso_8859_15)
+PRISM_ENCODING_TABLE(iso_8859_16)
+PRISM_ENCODING_TABLE(koi8_r)
+PRISM_ENCODING_TABLE(koi8_u)
+PRISM_ENCODING_TABLE(mac_cent_euro)
+PRISM_ENCODING_TABLE(mac_croatian)
+PRISM_ENCODING_TABLE(mac_cyrillic)
+PRISM_ENCODING_TABLE(mac_greek)
+PRISM_ENCODING_TABLE(mac_iceland)
+PRISM_ENCODING_TABLE(mac_roman)
+PRISM_ENCODING_TABLE(mac_romania)
+PRISM_ENCODING_TABLE(mac_thai)
+PRISM_ENCODING_TABLE(mac_turkish)
+PRISM_ENCODING_TABLE(mac_ukraine)
+PRISM_ENCODING_TABLE(tis_620)
+PRISM_ENCODING_TABLE(windows_1250)
+PRISM_ENCODING_TABLE(windows_1251)
+PRISM_ENCODING_TABLE(windows_1252)
+PRISM_ENCODING_TABLE(windows_1253)
+PRISM_ENCODING_TABLE(windows_1254)
+PRISM_ENCODING_TABLE(windows_1255)
+PRISM_ENCODING_TABLE(windows_1256)
+PRISM_ENCODING_TABLE(windows_1257)
+PRISM_ENCODING_TABLE(windows_1258)
+PRISM_ENCODING_TABLE(windows_874)
+
+#undef PRISM_ENCODING_TABLE
+#endif
+
+/**
+ * Returns the size of the next character in the ASCII encoding. This basically
+ * means that if the top bit is not set, the character is 1 byte long.
+ */
+static size_t
+pm_encoding_ascii_char_width(const uint8_t *b, PRISM_ATTRIBUTE_UNUSED ptrdiff_t n) {
+    return *b < 0x80 ? 1 : 0;
+}
+
+/**
+ * Return the size of the next character in the ASCII encoding if it is an
+ * alphabetical character.
+ */
+static size_t
+pm_encoding_ascii_alpha_char(const uint8_t *b, PRISM_ATTRIBUTE_UNUSED ptrdiff_t n) {
+    return (pm_encoding_ascii_table[*b] & PRISM_ENCODING_ALPHABETIC_BIT);
+}
+
+/**
+ * Certain encodings are equivalent to ASCII below 0x80, so it works for our
+ * purposes to have a function here that first checks the bounds and then falls
+ * back to checking the ASCII lookup table.
+ */
+static size_t
+pm_encoding_ascii_alpha_char_7bit(const uint8_t *b, ptrdiff_t n) {
+    return (*b < 0x80) ? pm_encoding_ascii_alpha_char(b, n) : 0;
+}
+
+/**
+ * Return the size of the next character in the ASCII encoding if it is an
+ * alphanumeric character.
+ */
+static size_t
+pm_encoding_ascii_alnum_char(const uint8_t *b, PRISM_ATTRIBUTE_UNUSED ptrdiff_t n) {
+    return (pm_encoding_ascii_table[*b] & PRISM_ENCODING_ALPHANUMERIC_BIT) ? 1 : 0;
+}
+
+/**
+ * Certain encodings are equivalent to ASCII below 0x80, so it works for our
+ * purposes to have a function here that first checks the bounds and then falls
+ * back to checking the ASCII lookup table.
+ */
+static size_t
+pm_encoding_ascii_alnum_char_7bit(const uint8_t *b, ptrdiff_t n) {
+    return (*b < 0x80) ? pm_encoding_ascii_alnum_char(b, n) : 0;
+}
+
+/**
+ * Return true if the next character in the ASCII encoding if it is an uppercase
+ * character.
+ */
+static bool
+pm_encoding_ascii_isupper_char(const uint8_t *b, PRISM_ATTRIBUTE_UNUSED ptrdiff_t n) {
+    return (pm_encoding_ascii_table[*b] & PRISM_ENCODING_UPPERCASE_BIT);
+}
+
+/**
+ * For a lot of encodings the default is that they are a single byte long no
+ * matter what the codepoint, so this function is shared between them.
+ */
+static size_t
+pm_encoding_single_char_width(PRISM_ATTRIBUTE_UNUSED const uint8_t *b, PRISM_ATTRIBUTE_UNUSED ptrdiff_t n) {
+    return 1;
+}
+
+/**
+ * Returns the size of the next character in the EUC-JP encoding, or 0 if a
+ * character cannot be decoded from the given bytes.
+ */
+static size_t
+pm_encoding_euc_jp_char_width(const uint8_t *b, ptrdiff_t n) {
+    // These are the single byte characters.
+    if (*b < 0x80) {
+        return 1;
+    }
+
+    // These are the double byte characters.
+    if ((n > 1) && ((b[0] == 0x8E) || (b[0] >= 0xA1 && b[0] <= 0xFE)) && (b[1] >= 0xA1 && b[1] <= 0xFE)) {
+        return 2;
+    }
+
+    // These are the triple byte characters.
+    if ((n > 2) && (b[0] == 0x8F) && (b[1] >= 0xA1 && b[2] <= 0xFE) && (b[2] >= 0xA1 && b[2] <= 0xFE)) {
+        return 3;
+    }
+
+    return 0;
+}
+
+/**
+ * Returns the size of the next character in the EUC-JP encoding if it is an
+ * uppercase character.
+ */
+static bool
+pm_encoding_euc_jp_isupper_char(const uint8_t *b, ptrdiff_t n) {
+    size_t width = pm_encoding_euc_jp_char_width(b, n);
+
+    if (width == 1) {
+        return pm_encoding_ascii_isupper_char(b, n);
+    } else if (width == 2) {
+        return (
+            (b[0] == 0xA3 && b[1] >= 0xC1 && b[1] <= 0xDA) ||
+            (b[0] == 0xA6 && b[1] >= 0xA1 && b[1] <= 0xB8) ||
+            (b[0] == 0xA7 && b[1] >= 0xA1 && b[1] <= 0xC1)
+        );
+    } else {
+        return false;
+    }
+}
+
+/**
+ * Returns the size of the next character in the Shift_JIS encoding, or 0 if a
+ * character cannot be decoded from the given bytes.
+ */
+static size_t
+pm_encoding_shift_jis_char_width(const uint8_t *b, ptrdiff_t n) {
+    // These are the single byte characters.
+    if (b[0] < 0x80 || (b[0] >= 0xA1 && b[0] <= 0xDF)) {
+        return 1;
+    }
+
+    // These are the double byte characters.
+    if ((n > 1) && ((b[0] >= 0x81 && b[0] <= 0x9F) || (b[0] >= 0xE0 && b[0] <= 0xFC)) && (b[1] >= 0x40 && b[1] <= 0xFC && b[1] != 0x7F)) {
+        return 2;
+    }
+
+    return 0;
+}
+
+/**
+ * Returns the size of the next character in the Shift_JIS encoding if it is an
+ * alphanumeric character.
+ */
+static size_t
+pm_encoding_shift_jis_alnum_char(const uint8_t *b, ptrdiff_t n) {
+    size_t width = pm_encoding_shift_jis_char_width(b, n);
+    return width == 1 ? ((b[0] >= 0x80) || pm_encoding_ascii_alnum_char(b, n)) : width;
+}
+
+/**
+ * Returns the size of the next character in the Shift_JIS encoding if it is an
+ * alphabetical character.
+ */
+static size_t
+pm_encoding_shift_jis_alpha_char(const uint8_t *b, ptrdiff_t n) {
+    size_t width = pm_encoding_shift_jis_char_width(b, n);
+    return width == 1 ? ((b[0] >= 0x80) || pm_encoding_ascii_alpha_char(b, n)) : width;
+}
+
+/**
+ * Returns the size of the next character in the Shift_JIS encoding if it is an
+ * uppercase character.
+ */
+static bool
+pm_encoding_shift_jis_isupper_char(const uint8_t *b, ptrdiff_t n) {
+    size_t width = pm_encoding_shift_jis_char_width(b, n);
+
+    if (width == 1) {
+        return pm_encoding_ascii_isupper_char(b, n);
+    } else if (width == 2) {
+        return (
+            ((b[0] == 0x82) && (b[1] >= 0x60 && b[1] <= 0x79)) ||
+            ((b[0] == 0x83) && (b[1] >= 0x9F && b[1] <= 0xB6)) ||
+            ((b[0] == 0x84) && (b[1] >= 0x40 && b[1] <= 0x60))
+        );
+    } else {
+        return width;
+    }
+}
+
+#ifndef PRISM_ENCODING_EXCLUDE_FULL
+
+/**
+ * Certain encodings are equivalent to ASCII below 0x80, so it works for our
+ * purposes to have a function here that first checks the bounds and then falls
+ * back to checking the ASCII lookup table.
+ */
+static bool
+pm_encoding_ascii_isupper_char_7bit(const uint8_t *b, ptrdiff_t n) {
+    return (*b < 0x80) && pm_encoding_ascii_isupper_char(b, n);
+}
+
+/**
+ * Returns the size of the next character in the Big5 encoding, or 0 if a
+ * character cannot be decoded from the given bytes.
+ */
+static size_t
+pm_encoding_big5_char_width(const uint8_t *b, ptrdiff_t n) {
+    // These are the single byte characters.
+    if (*b < 0x80) {
+        return 1;
+    }
+
+    // These are the double byte characters.
+    if ((n > 1) && (b[0] >= 0xA1 && b[0] <= 0xFE) && ((b[1] >= 0x40 && b[1] <= 0x7E) || (b[1] >= 0xA1 && b[1] <= 0xFE))) {
+        return 2;
+    }
+
+    return 0;
+}
+
+/**
+ * Returns the size of the next character in the CP949 encoding, or 0 if a
+ * character cannot be decoded from the given bytes.
+ */
+static size_t
+pm_encoding_cp949_char_width(const uint8_t *b, ptrdiff_t n) {
+    // These are the single byte characters
+    if (*b <= 0x80) {
+        return 1;
+    }
+
+    // These are the double byte characters
+    if ((n > 1) && (b[0] >= 0x81 && b[0] <= 0xFE) && ((b[1] >= 0x41 && b[1] <= 0x5A) || (b[1] >= 0x61 && b[1] <= 0x7A) || (b[1] >= 0x81 && b[1] <= 0xFE))) {
+        return 2;
+    }
+
+    return 0;
+}
+
+/**
+ * Returns the size of the next character in the Emacs MULE encoding, or 0 if a
+ * character cannot be decoded from the given bytes.
+ */
+static size_t
+pm_encoding_emacs_mule_char_width(const uint8_t *b, ptrdiff_t n) {
+    // These are the 1 byte characters.
+    if (*b < 0x80) {
+        return 1;
+    }
+
+    // These are the 2 byte characters.
+    if ((n > 1) && (b[0] >= 0x81 && b[0] <= 0x8F) && (b[1] >= 0xA0)) {
+        return 2;
+    }
+
+    // These are the 3 byte characters.
+    if (
+        (n > 2) &&
+        (
+            ((b[0] >= 0x90 && b[0] <= 0x99) && (b[1] >= 0xA0)) ||
+            ((b[0] == 0x9A || b[0] == 0x9B) && (b[1] >= 0xE0 && b[1] <= 0xEF))
+        ) &&
+        (b[2] >= 0xA0)
+    ) {
+        return 3;
+    }
+
+    // These are the 4 byte characters.
+    if (
+        (n > 3) &&
+        (
+            ((b[0] == 0x9C) && (b[1] >= 0xF0) && (b[1] <= 0xF4)) ||
+            ((b[0] == 0x9D) && (b[1] >= 0xF5) && (b[1] <= 0xFE))
+        ) &&
+        (b[2] >= 0xA0) && (b[3] >= 0xA0)
+    ) {
+        return 4;
+    }
+
+    return 0;
+}
+
+/**
+ * Returns the size of the next character in the EUC-KR encoding, or 0 if a
+ * character cannot be decoded from the given bytes.
+ */
+static size_t
+pm_encoding_euc_kr_char_width(const uint8_t *b, ptrdiff_t n) {
+    // These are the single byte characters.
+    if (*b < 0x80) {
+        return 1;
+    }
+
+    // These are the double byte characters.
+    if ((n > 1) && (b[0] >= 0xA1 && b[0] <= 0xFE) && (b[1] >= 0xA1 && b[1] <= 0xFE)) {
+        return 2;
+    }
+
+    return 0;
+}
+
+/**
+ * Returns the size of the next character in the EUC-TW encoding, or 0 if a
+ * character cannot be decoded from the given bytes.
+ */
+static size_t
+pm_encoding_euc_tw_char_width(const uint8_t *b, ptrdiff_t n) {
+    // These are the single byte characters.
+    if (*b < 0x80) {
+        return 1;
+    }
+
+    // These are the double byte characters.
+    if ((n > 1) && (b[0] >= 0xA1) && (b[0] <= 0xFE) && (b[1] >= 0xA1) && (b[1] <= 0xFE)) {
+        return 2;
+    }
+
+    // These are the quadruple byte characters.
+    if ((n > 3) && (b[0] == 0x8E) && (b[1] >= 0xA1) && (b[1] <= 0xB0) && (b[2] >= 0xA1) && (b[2] <= 0xFE) && (b[3] >= 0xA1) && (b[3] <= 0xFE)) {
+        return 4;
+    }
+
+    return 0;
+}
+
+/**
+ * Returns the size of the next character in the GB18030 encoding, or 0 if a
+ * character cannot be decoded from the given bytes.
+ */
+static size_t
+pm_encoding_gb18030_char_width(const uint8_t *b, ptrdiff_t n) {
+    // These are the 1 byte characters.
+    if (*b < 0x80) {
+        return 1;
+    }
+
+    // These are the 2 byte characters.
+    if ((n > 1) && (b[0] >= 0x81 && b[0] <= 0xFE) && (b[1] >= 0x40 && b[1] <= 0xFE && b[1] != 0x7F)) {
+        return 2;
+    }
+
+    // These are the 4 byte characters.
+    if ((n > 3) && ((b[0] >= 0x81 && b[0] <= 0xFE) && (b[1] >= 0x30 && b[1] <= 0x39) && (b[2] >= 0x81 && b[2] <= 0xFE) && (b[3] >= 0x30 && b[3] <= 0x39))) {
+        return 4;
+    }
+
+    return 0;
+}
+
+/**
+ * Returns the size of the next character in the GBK encoding, or 0 if a
+ * character cannot be decoded from the given bytes.
+ */
+static size_t
+pm_encoding_gbk_char_width(const uint8_t *b, ptrdiff_t n) {
+    // These are the single byte characters.
+    if (*b <= 0x80) {
+        return 1;
+    }
+
+    // These are the double byte characters.
+    if (
+        (n > 1) &&
+        (
+            ((b[0] >= 0xA1 && b[0] <= 0xA9) && (b[1] >= 0xA1 && b[1] <= 0xFE)) || // GBK/1
+            ((b[0] >= 0xB0 && b[0] <= 0xF7) && (b[1] >= 0xA1 && b[1] <= 0xFE)) || // GBK/2
+            ((b[0] >= 0x81 && b[0] <= 0xA0) && (b[1] >= 0x40 && b[1] <= 0xFE) && (b[1] != 0x7F)) || // GBK/3
+            ((b[0] >= 0xAA && b[0] <= 0xFE) && (b[1] >= 0x40 && b[1] <= 0xA0) && (b[1] != 0x7F)) || // GBK/4
+            ((b[0] >= 0xA8 && b[0] <= 0xA9) && (b[1] >= 0x40 && b[1] <= 0xA0) && (b[1] != 0x7F)) || // GBK/5
+            ((b[0] >= 0xAA && b[0] <= 0xAF) && (b[1] >= 0xA1 && b[1] <= 0xFE)) || // user-defined 1
+            ((b[0] >= 0xF8 && b[0] <= 0xFE) && (b[1] >= 0xA1 && b[1] <= 0xFE)) || // user-defined 2
+            ((b[0] >= 0xA1 && b[0] <= 0xA7) && (b[1] >= 0x40 && b[1] <= 0xA0) && (b[1] != 0x7F)) // user-defined 3
+        )
+    ) {
+        return 2;
+    }
+
+    return 0;
+}
+
+#endif
+
+/**
+ * This is the table of all of the encodings that prism supports.
+ */
+const pm_encoding_t pm_encodings[] = {
+    [PM_ENCODING_UTF_8] = {
+        .name = "UTF-8",
+        .char_width = pm_encoding_utf_8_char_width,
+        .alnum_char = pm_encoding_utf_8_alnum_char,
+        .alpha_char = pm_encoding_utf_8_alpha_char,
+        .isupper_char = pm_encoding_utf_8_isupper_char,
+        .multibyte = true
+    },
+    [PM_ENCODING_US_ASCII] = {
+        .name = "US-ASCII",
+        .char_width = pm_encoding_ascii_char_width,
+        .alnum_char = pm_encoding_ascii_alnum_char,
+        .alpha_char = pm_encoding_ascii_alpha_char,
+        .isupper_char = pm_encoding_ascii_isupper_char,
+        .multibyte = false
+    },
+    [PM_ENCODING_ASCII_8BIT] = {
+        .name = "ASCII-8BIT",
+        .char_width = pm_encoding_single_char_width,
+        .alnum_char = pm_encoding_ascii_alnum_char,
+        .alpha_char = pm_encoding_ascii_alpha_char,
+        .isupper_char = pm_encoding_ascii_isupper_char,
+        .multibyte = false
+    },
+    [PM_ENCODING_EUC_JP] = {
+        .name = "EUC-JP",
+        .char_width = pm_encoding_euc_jp_char_width,
+        .alnum_char = pm_encoding_ascii_alnum_char_7bit,
+        .alpha_char = pm_encoding_ascii_alpha_char_7bit,
+        .isupper_char = pm_encoding_euc_jp_isupper_char,
+        .multibyte = true
+    },
+    [PM_ENCODING_WINDOWS_31J] = {
+        .name = "Windows-31J",
+        .char_width = pm_encoding_shift_jis_char_width,
+        .alnum_char = pm_encoding_shift_jis_alnum_char,
+        .alpha_char = pm_encoding_shift_jis_alpha_char,
+        .isupper_char = pm_encoding_shift_jis_isupper_char,
+        .multibyte = true
+    },
+
+#ifndef PRISM_ENCODING_EXCLUDE_FULL
+    [PM_ENCODING_BIG5] = {
+        .name = "Big5",
+        .char_width = pm_encoding_big5_char_width,
+        .alnum_char = pm_encoding_ascii_alnum_char_7bit,
+        .alpha_char = pm_encoding_ascii_alpha_char_7bit,
+        .isupper_char = pm_encoding_ascii_isupper_char_7bit,
+        .multibyte = true
+    },
+    [PM_ENCODING_BIG5_HKSCS] = {
+        .name = "Big5-HKSCS",
+        .char_width = pm_encoding_big5_char_width,
+        .alnum_char = pm_encoding_ascii_alnum_char_7bit,
+        .alpha_char = pm_encoding_ascii_alpha_char_7bit,
+        .isupper_char = pm_encoding_ascii_isupper_char_7bit,
+        .multibyte = true
+    },
+    [PM_ENCODING_BIG5_UAO] = {
+        .name = "Big5-UAO",
+        .char_width = pm_encoding_big5_char_width,
+        .alnum_char = pm_encoding_ascii_alnum_char_7bit,
+        .alpha_char = pm_encoding_ascii_alpha_char_7bit,
+        .isupper_char = pm_encoding_ascii_isupper_char_7bit,
+        .multibyte = true
+    },
+    [PM_ENCODING_CESU_8] = {
+        .name = "CESU-8",
+        .char_width = pm_encoding_cesu_8_char_width,
+        .alnum_char = pm_encoding_cesu_8_alnum_char,
+        .alpha_char = pm_encoding_cesu_8_alpha_char,
+        .isupper_char = pm_encoding_cesu_8_isupper_char,
+        .multibyte = true
+    },
+    [PM_ENCODING_CP51932] = {
+        .name = "CP51932",
+        .char_width = pm_encoding_euc_jp_char_width,
+        .alnum_char = pm_encoding_ascii_alnum_char_7bit,
+        .alpha_char = pm_encoding_ascii_alpha_char_7bit,
+        .isupper_char = pm_encoding_euc_jp_isupper_char,
+        .multibyte = true
+    },
+    [PM_ENCODING_CP850] = {
+        .name = "CP850",
+        .char_width = pm_encoding_single_char_width,
+        .alnum_char = pm_encoding_cp850_alnum_char,
+        .alpha_char = pm_encoding_cp850_alpha_char,
+        .isupper_char = pm_encoding_cp850_isupper_char,
+        .multibyte = false
+    },
+    [PM_ENCODING_CP852] = {
+        .name = "CP852",
+        .char_width = pm_encoding_single_char_width,
+        .alnum_char = pm_encoding_cp852_alnum_char,
+        .alpha_char = pm_encoding_cp852_alpha_char,
+        .isupper_char = pm_encoding_cp852_isupper_char,
+        .multibyte = false
+    },
+    [PM_ENCODING_CP855] = {
+        .name = "CP855",
+        .char_width = pm_encoding_single_char_width,
+        .alnum_char = pm_encoding_cp855_alnum_char,
+        .alpha_char = pm_encoding_cp855_alpha_char,
+        .isupper_char = pm_encoding_cp855_isupper_char,
+        .multibyte = false
+    },
+    [PM_ENCODING_CP949] = {
+        .name = "CP949",
+        .char_width = pm_encoding_cp949_char_width,
+        .alnum_char = pm_encoding_ascii_alnum_char_7bit,
+        .alpha_char = pm_encoding_ascii_alpha_char_7bit,
+        .isupper_char = pm_encoding_ascii_isupper_char_7bit,
+        .multibyte = true
+    },
+    [PM_ENCODING_CP950] = {
+        .name = "CP950",
+        .char_width = pm_encoding_big5_char_width,
+        .alnum_char = pm_encoding_ascii_alnum_char_7bit,
+        .alpha_char = pm_encoding_ascii_alpha_char_7bit,
+        .isupper_char = pm_encoding_ascii_isupper_char_7bit,
+        .multibyte = true
+    },
+    [PM_ENCODING_CP951] = {
+        .name = "CP951",
+        .char_width = pm_encoding_big5_char_width,
+        .alnum_char = pm_encoding_ascii_alnum_char_7bit,
+        .alpha_char = pm_encoding_ascii_alpha_char_7bit,
+        .isupper_char = pm_encoding_ascii_isupper_char_7bit,
+        .multibyte = true
+    },
+    [PM_ENCODING_EMACS_MULE] = {
+        .name = "Emacs-Mule",
+        .char_width = pm_encoding_emacs_mule_char_width,
+        .alnum_char = pm_encoding_ascii_alnum_char_7bit,
+        .alpha_char = pm_encoding_ascii_alpha_char_7bit,
+        .isupper_char = pm_encoding_ascii_isupper_char_7bit,
+        .multibyte = true
+    },
+    [PM_ENCODING_EUC_JP_MS] = {
+        .name = "eucJP-ms",
+        .char_width = pm_encoding_euc_jp_char_width,
+        .alnum_char = pm_encoding_ascii_alnum_char_7bit,
+        .alpha_char = pm_encoding_ascii_alpha_char_7bit,
+        .isupper_char = pm_encoding_euc_jp_isupper_char,
+        .multibyte = true
+    },
+    [PM_ENCODING_EUC_JIS_2004] = {
+        .name = "EUC-JIS-2004",
+        .char_width = pm_encoding_euc_jp_char_width,
+        .alnum_char = pm_encoding_ascii_alnum_char_7bit,
+        .alpha_char = pm_encoding_ascii_alpha_char_7bit,
+        .isupper_char = pm_encoding_euc_jp_isupper_char,
+        .multibyte = true
+    },
+    [PM_ENCODING_EUC_KR] = {
+        .name = "EUC-KR",
+        .char_width = pm_encoding_euc_kr_char_width,
+        .alnum_char = pm_encoding_ascii_alnum_char_7bit,
+        .alpha_char = pm_encoding_ascii_alpha_char_7bit,
+        .isupper_char = pm_encoding_ascii_isupper_char_7bit,
+        .multibyte = true
+    },
+    [PM_ENCODING_EUC_TW] = {
+        .name = "EUC-TW",
+        .char_width = pm_encoding_euc_tw_char_width,
+        .alnum_char = pm_encoding_ascii_alnum_char_7bit,
+        .alpha_char = pm_encoding_ascii_alpha_char_7bit,
+        .isupper_char = pm_encoding_ascii_isupper_char_7bit,
+        .multibyte = true
+    },
+    [PM_ENCODING_GB12345] = {
+        .name = "GB12345",
+        .char_width = pm_encoding_euc_kr_char_width,
+        .alnum_char = pm_encoding_ascii_alnum_char_7bit,
+        .alpha_char = pm_encoding_ascii_alpha_char_7bit,
+        .isupper_char = pm_encoding_ascii_isupper_char_7bit,
+        .multibyte = true
+    },
+    [PM_ENCODING_GB18030] = {
+        .name = "GB18030",
+        .char_width = pm_encoding_gb18030_char_width,
+        .alnum_char = pm_encoding_ascii_alnum_char_7bit,
+        .alpha_char = pm_encoding_ascii_alpha_char_7bit,
+        .isupper_char = pm_encoding_ascii_isupper_char_7bit,
+        .multibyte = true
+    },
+    [PM_ENCODING_GB1988] = {
+        .name = "GB1988",
+        .char_width = pm_encoding_single_char_width,
+        .alnum_char = pm_encoding_gb1988_alnum_char,
+        .alpha_char = pm_encoding_gb1988_alpha_char,
+        .isupper_char = pm_encoding_gb1988_isupper_char,
+        .multibyte = false
+    },
+    [PM_ENCODING_GB2312] = {
+        .name = "GB2312",
+        .char_width = pm_encoding_euc_kr_char_width,
+        .alnum_char = pm_encoding_ascii_alnum_char_7bit,
+        .alpha_char = pm_encoding_ascii_alpha_char_7bit,
+        .isupper_char = pm_encoding_ascii_isupper_char_7bit,
+        .multibyte = true
+    },
+    [PM_ENCODING_GBK] = {
+        .name = "GBK",
+        .char_width = pm_encoding_gbk_char_width,
+        .alnum_char = pm_encoding_ascii_alnum_char_7bit,
+        .alpha_char = pm_encoding_ascii_alpha_char_7bit,
+        .isupper_char = pm_encoding_ascii_isupper_char_7bit,
+        .multibyte = true
+    },
+    [PM_ENCODING_IBM437] = {
+        .name = "IBM437",
+        .char_width = pm_encoding_single_char_width,
+        .alnum_char = pm_encoding_ibm437_alnum_char,
+        .alpha_char = pm_encoding_ibm437_alpha_char,
+        .isupper_char = pm_encoding_ibm437_isupper_char,
+        .multibyte = false
+    },
+    [PM_ENCODING_IBM720] = {
+        .name = "IBM720",
+        .char_width = pm_encoding_single_char_width,
+        .alnum_char = pm_encoding_ibm720_alnum_char,
+        .alpha_char = pm_encoding_ibm720_alpha_char,
+        .isupper_char = pm_encoding_ibm720_isupper_char,
+        .multibyte = false
+    },
+    [PM_ENCODING_IBM737] = {
+        .name = "IBM737",
+        .char_width = pm_encoding_single_char_width,
+        .alnum_char = pm_encoding_ibm737_alnum_char,
+        .alpha_char = pm_encoding_ibm737_alpha_char,
+        .isupper_char = pm_encoding_ibm737_isupper_char,
+        .multibyte = false
+    },
+    [PM_ENCODING_IBM775] = {
+        .name = "IBM775",
+        .char_width = pm_encoding_single_char_width,
+        .alnum_char = pm_encoding_ibm775_alnum_char,
+        .alpha_char = pm_encoding_ibm775_alpha_char,
+        .isupper_char = pm_encoding_ibm775_isupper_char,
+        .multibyte = false
+    },
+    [PM_ENCODING_IBM852] = {
+        .name = "IBM852",
+        .char_width = pm_encoding_single_char_width,
+        .alnum_char = pm_encoding_ibm852_alnum_char,
+        .alpha_char = pm_encoding_ibm852_alpha_char,
+        .isupper_char = pm_encoding_ibm852_isupper_char,
+        .multibyte = false
+    },
+    [PM_ENCODING_IBM855] = {
+        .name = "IBM855",
+        .char_width = pm_encoding_single_char_width,
+        .alnum_char = pm_encoding_ibm855_alnum_char,
+        .alpha_char = pm_encoding_ibm855_alpha_char,
+        .isupper_char = pm_encoding_ibm855_isupper_char,
+        .multibyte = false
+    },
+    [PM_ENCODING_IBM857] = {
+        .name = "IBM857",
+        .char_width = pm_encoding_single_char_width,
+        .alnum_char = pm_encoding_ibm857_alnum_char,
+        .alpha_char = pm_encoding_ibm857_alpha_char,
+        .isupper_char = pm_encoding_ibm857_isupper_char,
+        .multibyte = false
+    },
+    [PM_ENCODING_IBM860] = {
+        .name = "IBM860",
+        .char_width = pm_encoding_single_char_width,
+        .alnum_char = pm_encoding_ibm860_alnum_char,
+        .alpha_char = pm_encoding_ibm860_alpha_char,
+        .isupper_char = pm_encoding_ibm860_isupper_char,
+        .multibyte = false
+    },
+    [PM_ENCODING_IBM861] = {
+        .name = "IBM861",
+        .char_width = pm_encoding_single_char_width,
+        .alnum_char = pm_encoding_ibm861_alnum_char,
+        .alpha_char = pm_encoding_ibm861_alpha_char,
+        .isupper_char = pm_encoding_ibm861_isupper_char,
+        .multibyte = false
+    },
+    [PM_ENCODING_IBM862] = {
+        .name = "IBM862",
+        .char_width = pm_encoding_single_char_width,
+        .alnum_char = pm_encoding_ibm862_alnum_char,
+        .alpha_char = pm_encoding_ibm862_alpha_char,
+        .isupper_char = pm_encoding_ibm862_isupper_char,
+        .multibyte = false
+    },
+    [PM_ENCODING_IBM863] = {
+        .name = "IBM863",
+        .char_width = pm_encoding_single_char_width,
+        .alnum_char = pm_encoding_ibm863_alnum_char,
+        .alpha_char = pm_encoding_ibm863_alpha_char,
+        .isupper_char = pm_encoding_ibm863_isupper_char,
+        .multibyte = false
+    },
+    [PM_ENCODING_IBM864] = {
+        .name = "IBM864",
+        .char_width = pm_encoding_single_char_width,
+        .alnum_char = pm_encoding_ibm864_alnum_char,
+        .alpha_char = pm_encoding_ibm864_alpha_char,
+        .isupper_char = pm_encoding_ibm864_isupper_char,
+        .multibyte = false
+    },
+    [PM_ENCODING_IBM865] = {
+        .name = "IBM865",
+        .char_width = pm_encoding_single_char_width,
+        .alnum_char = pm_encoding_ibm865_alnum_char,
+        .alpha_char = pm_encoding_ibm865_alpha_char,
+        .isupper_char = pm_encoding_ibm865_isupper_char,
+        .multibyte = false
+    },
+    [PM_ENCODING_IBM866] = {
+        .name = "IBM866",
+        .char_width = pm_encoding_single_char_width,
+        .alnum_char = pm_encoding_ibm866_alnum_char,
+        .alpha_char = pm_encoding_ibm866_alpha_char,
+        .isupper_char = pm_encoding_ibm866_isupper_char,
+        .multibyte = false
+    },
+    [PM_ENCODING_IBM869] = {
+        .name = "IBM869",
+        .char_width = pm_encoding_single_char_width,
+        .alnum_char = pm_encoding_ibm869_alnum_char,
+        .alpha_char = pm_encoding_ibm869_alpha_char,
+        .isupper_char = pm_encoding_ibm869_isupper_char,
+        .multibyte = false
+    },
+    [PM_ENCODING_ISO_8859_1] = {
+        .name = "ISO-8859-1",
+        .char_width = pm_encoding_single_char_width,
+        .alnum_char = pm_encoding_iso_8859_1_alnum_char,
+        .alpha_char = pm_encoding_iso_8859_1_alpha_char,
+        .isupper_char = pm_encoding_iso_8859_1_isupper_char,
+        .multibyte = false
+    },
+    [PM_ENCODING_ISO_8859_2] = {
+        .name = "ISO-8859-2",
+        .char_width = pm_encoding_single_char_width,
+        .alnum_char = pm_encoding_iso_8859_2_alnum_char,
+        .alpha_char = pm_encoding_iso_8859_2_alpha_char,
+        .isupper_char = pm_encoding_iso_8859_2_isupper_char,
+        .multibyte = false
+    },
+    [PM_ENCODING_ISO_8859_3] = {
+        .name = "ISO-8859-3",
+        .char_width = pm_encoding_single_char_width,
+        .alnum_char = pm_encoding_iso_8859_3_alnum_char,
+        .alpha_char = pm_encoding_iso_8859_3_alpha_char,
+        .isupper_char = pm_encoding_iso_8859_3_isupper_char,
+        .multibyte = false
+    },
+    [PM_ENCODING_ISO_8859_4] = {
+        .name = "ISO-8859-4",
+        .char_width = pm_encoding_single_char_width,
+        .alnum_char = pm_encoding_iso_8859_4_alnum_char,
+        .alpha_char = pm_encoding_iso_8859_4_alpha_char,
+        .isupper_char = pm_encoding_iso_8859_4_isupper_char,
+        .multibyte = false
+    },
+    [PM_ENCODING_ISO_8859_5] = {
+        .name = "ISO-8859-5",
+        .char_width = pm_encoding_single_char_width,
+        .alnum_char = pm_encoding_iso_8859_5_alnum_char,
+        .alpha_char = pm_encoding_iso_8859_5_alpha_char,
+        .isupper_char = pm_encoding_iso_8859_5_isupper_char,
+        .multibyte = false
+    },
+    [PM_ENCODING_ISO_8859_6] = {
+        .name = "ISO-8859-6",
+        .char_width = pm_encoding_single_char_width,
+        .alnum_char = pm_encoding_iso_8859_6_alnum_char,
+        .alpha_char = pm_encoding_iso_8859_6_alpha_char,
+        .isupper_char = pm_encoding_iso_8859_6_isupper_char,
+        .multibyte = false
+    },
+    [PM_ENCODING_ISO_8859_7] = {
+        .name = "ISO-8859-7",
+        .char_width = pm_encoding_single_char_width,
+        .alnum_char = pm_encoding_iso_8859_7_alnum_char,
+        .alpha_char = pm_encoding_iso_8859_7_alpha_char,
+        .isupper_char = pm_encoding_iso_8859_7_isupper_char,
+        .multibyte = false
+    },
+    [PM_ENCODING_ISO_8859_8] = {
+        .name = "ISO-8859-8",
+        .char_width = pm_encoding_single_char_width,
+        .alnum_char = pm_encoding_iso_8859_8_alnum_char,
+        .alpha_char = pm_encoding_iso_8859_8_alpha_char,
+        .isupper_char = pm_encoding_iso_8859_8_isupper_char,
+        .multibyte = false
+    },
+    [PM_ENCODING_ISO_8859_9] = {
+        .name = "ISO-8859-9",
+        .char_width = pm_encoding_single_char_width,
+        .alnum_char = pm_encoding_iso_8859_9_alnum_char,
+        .alpha_char = pm_encoding_iso_8859_9_alpha_char,
+        .isupper_char = pm_encoding_iso_8859_9_isupper_char,
+        .multibyte = false
+    },
+    [PM_ENCODING_ISO_8859_10] = {
+        .name = "ISO-8859-10",
+        .char_width = pm_encoding_single_char_width,
+        .alnum_char = pm_encoding_iso_8859_10_alnum_char,
+        .alpha_char = pm_encoding_iso_8859_10_alpha_char,
+        .isupper_char = pm_encoding_iso_8859_10_isupper_char,
+        .multibyte = false
+    },
+    [PM_ENCODING_ISO_8859_11] = {
+        .name = "ISO-8859-11",
+        .char_width = pm_encoding_single_char_width,
+        .alnum_char = pm_encoding_iso_8859_11_alnum_char,
+        .alpha_char = pm_encoding_iso_8859_11_alpha_char,
+        .isupper_char = pm_encoding_iso_8859_11_isupper_char,
+        .multibyte = false
+    },
+    [PM_ENCODING_ISO_8859_13] = {
+        .name = "ISO-8859-13",
+        .char_width = pm_encoding_single_char_width,
+        .alnum_char = pm_encoding_iso_8859_13_alnum_char,
+        .alpha_char = pm_encoding_iso_8859_13_alpha_char,
+        .isupper_char = pm_encoding_iso_8859_13_isupper_char,
+        .multibyte = false
+    },
+    [PM_ENCODING_ISO_8859_14] = {
+        .name = "ISO-8859-14",
+        .char_width = pm_encoding_single_char_width,
+        .alnum_char = pm_encoding_iso_8859_14_alnum_char,
+        .alpha_char = pm_encoding_iso_8859_14_alpha_char,
+        .isupper_char = pm_encoding_iso_8859_14_isupper_char,
+        .multibyte = false
+    },
+    [PM_ENCODING_ISO_8859_15] = {
+        .name = "ISO-8859-15",
+        .char_width = pm_encoding_single_char_width,
+        .alnum_char = pm_encoding_iso_8859_15_alnum_char,
+        .alpha_char = pm_encoding_iso_8859_15_alpha_char,
+        .isupper_char = pm_encoding_iso_8859_15_isupper_char,
+        .multibyte = false
+    },
+    [PM_ENCODING_ISO_8859_16] = {
+        .name = "ISO-8859-16",
+        .char_width = pm_encoding_single_char_width,
+        .alnum_char = pm_encoding_iso_8859_16_alnum_char,
+        .alpha_char = pm_encoding_iso_8859_16_alpha_char,
+        .isupper_char = pm_encoding_iso_8859_16_isupper_char,
+        .multibyte = false
+    },
+    [PM_ENCODING_KOI8_R] = {
+        .name = "KOI8-R",
+        .char_width = pm_encoding_single_char_width,
+        .alnum_char = pm_encoding_koi8_r_alnum_char,
+        .alpha_char = pm_encoding_koi8_r_alpha_char,
+        .isupper_char = pm_encoding_koi8_r_isupper_char,
+        .multibyte = false
+    },
+    [PM_ENCODING_KOI8_U] = {
+        .name = "KOI8-U",
+        .char_width = pm_encoding_single_char_width,
+        .alnum_char = pm_encoding_koi8_u_alnum_char,
+        .alpha_char = pm_encoding_koi8_u_alpha_char,
+        .isupper_char = pm_encoding_koi8_u_isupper_char,
+        .multibyte = false
+    },
+    [PM_ENCODING_MAC_CENT_EURO] = {
+        .name = "macCentEuro",
+        .char_width = pm_encoding_single_char_width,
+        .alnum_char = pm_encoding_mac_cent_euro_alnum_char,
+        .alpha_char = pm_encoding_mac_cent_euro_alpha_char,
+        .isupper_char = pm_encoding_mac_cent_euro_isupper_char,
+        .multibyte = false
+    },
+    [PM_ENCODING_MAC_CROATIAN] = {
+        .name = "macCroatian",
+        .char_width = pm_encoding_single_char_width,
+        .alnum_char = pm_encoding_mac_croatian_alnum_char,
+        .alpha_char = pm_encoding_mac_croatian_alpha_char,
+        .isupper_char = pm_encoding_mac_croatian_isupper_char,
+        .multibyte = false
+    },
+    [PM_ENCODING_MAC_CYRILLIC] = {
+        .name = "macCyrillic",
+        .char_width = pm_encoding_single_char_width,
+        .alnum_char = pm_encoding_mac_cyrillic_alnum_char,
+        .alpha_char = pm_encoding_mac_cyrillic_alpha_char,
+        .isupper_char = pm_encoding_mac_cyrillic_isupper_char,
+        .multibyte = false
+    },
+    [PM_ENCODING_MAC_GREEK] = {
+        .name = "macGreek",
+        .char_width = pm_encoding_single_char_width,
+        .alnum_char = pm_encoding_mac_greek_alnum_char,
+        .alpha_char = pm_encoding_mac_greek_alpha_char,
+        .isupper_char = pm_encoding_mac_greek_isupper_char,
+        .multibyte = false
+    },
+    [PM_ENCODING_MAC_ICELAND] = {
+        .name = "macIceland",
+        .char_width = pm_encoding_single_char_width,
+        .alnum_char = pm_encoding_mac_iceland_alnum_char,
+        .alpha_char = pm_encoding_mac_iceland_alpha_char,
+        .isupper_char = pm_encoding_mac_iceland_isupper_char,
+        .multibyte = false
+    },
+    [PM_ENCODING_MAC_JAPANESE] = {
+        .name = "MacJapanese",
+        .char_width = pm_encoding_shift_jis_char_width,
+        .alnum_char = pm_encoding_shift_jis_alnum_char,
+        .alpha_char = pm_encoding_shift_jis_alpha_char,
+        .isupper_char = pm_encoding_shift_jis_isupper_char,
+        .multibyte = true
+    },
+    [PM_ENCODING_MAC_ROMAN] = {
+        .name = "macRoman",
+        .char_width = pm_encoding_single_char_width,
+        .alnum_char = pm_encoding_mac_roman_alnum_char,
+        .alpha_char = pm_encoding_mac_roman_alpha_char,
+        .isupper_char = pm_encoding_mac_roman_isupper_char,
+        .multibyte = false
+    },
+    [PM_ENCODING_MAC_ROMANIA] = {
+        .name = "macRomania",
+        .char_width = pm_encoding_single_char_width,
+        .alnum_char = pm_encoding_mac_romania_alnum_char,
+        .alpha_char = pm_encoding_mac_romania_alpha_char,
+        .isupper_char = pm_encoding_mac_romania_isupper_char,
+        .multibyte = false
+    },
+    [PM_ENCODING_MAC_THAI] = {
+        .name = "macThai",
+        .char_width = pm_encoding_single_char_width,
+        .alnum_char = pm_encoding_mac_thai_alnum_char,
+        .alpha_char = pm_encoding_mac_thai_alpha_char,
+        .isupper_char = pm_encoding_mac_thai_isupper_char,
+        .multibyte = false
+    },
+    [PM_ENCODING_MAC_TURKISH] = {
+        .name = "macTurkish",
+        .char_width = pm_encoding_single_char_width,
+        .alnum_char = pm_encoding_mac_turkish_alnum_char,
+        .alpha_char = pm_encoding_mac_turkish_alpha_char,
+        .isupper_char = pm_encoding_mac_turkish_isupper_char,
+        .multibyte = false
+    },
+    [PM_ENCODING_MAC_UKRAINE] = {
+        .name = "macUkraine",
+        .char_width = pm_encoding_single_char_width,
+        .alnum_char = pm_encoding_mac_ukraine_alnum_char,
+        .alpha_char = pm_encoding_mac_ukraine_alpha_char,
+        .isupper_char = pm_encoding_mac_ukraine_isupper_char,
+        .multibyte = false
+    },
+    [PM_ENCODING_SHIFT_JIS] = {
+        .name = "Shift_JIS",
+        .char_width = pm_encoding_shift_jis_char_width,
+        .alnum_char = pm_encoding_shift_jis_alnum_char,
+        .alpha_char = pm_encoding_shift_jis_alpha_char,
+        .isupper_char = pm_encoding_shift_jis_isupper_char,
+        .multibyte = true
+    },
+    [PM_ENCODING_SJIS_DOCOMO] = {
+        .name = "SJIS-DoCoMo",
+        .char_width = pm_encoding_shift_jis_char_width,
+        .alnum_char = pm_encoding_shift_jis_alnum_char,
+        .alpha_char = pm_encoding_shift_jis_alpha_char,
+        .isupper_char = pm_encoding_shift_jis_isupper_char,
+        .multibyte = true
+    },
+    [PM_ENCODING_SJIS_KDDI] = {
+        .name = "SJIS-KDDI",
+        .char_width = pm_encoding_shift_jis_char_width,
+        .alnum_char = pm_encoding_shift_jis_alnum_char,
+        .alpha_char = pm_encoding_shift_jis_alpha_char,
+        .isupper_char = pm_encoding_shift_jis_isupper_char,
+        .multibyte = true
+    },
+    [PM_ENCODING_SJIS_SOFTBANK] = {
+        .name = "SJIS-SoftBank",
+        .char_width = pm_encoding_shift_jis_char_width,
+        .alnum_char = pm_encoding_shift_jis_alnum_char,
+        .alpha_char = pm_encoding_shift_jis_alpha_char,
+        .isupper_char = pm_encoding_shift_jis_isupper_char,
+        .multibyte = true
+    },
+    [PM_ENCODING_STATELESS_ISO_2022_JP] = {
+        .name = "stateless-ISO-2022-JP",
+        .char_width = pm_encoding_emacs_mule_char_width,
+        .alnum_char = pm_encoding_ascii_alnum_char_7bit,
+        .alpha_char = pm_encoding_ascii_alpha_char_7bit,
+        .isupper_char = pm_encoding_ascii_isupper_char_7bit,
+        .multibyte = true
+    },
+    [PM_ENCODING_STATELESS_ISO_2022_JP_KDDI] = {
+        .name = "stateless-ISO-2022-JP-KDDI",
+        .char_width = pm_encoding_emacs_mule_char_width,
+        .alnum_char = pm_encoding_ascii_alnum_char_7bit,
+        .alpha_char = pm_encoding_ascii_alpha_char_7bit,
+        .isupper_char = pm_encoding_ascii_isupper_char_7bit,
+        .multibyte = true
+    },
+    [PM_ENCODING_TIS_620] = {
+        .name = "TIS-620",
+        .char_width = pm_encoding_single_char_width,
+        .alnum_char = pm_encoding_tis_620_alnum_char,
+        .alpha_char = pm_encoding_tis_620_alpha_char,
+        .isupper_char = pm_encoding_tis_620_isupper_char,
+        .multibyte = false
+    },
+    [PM_ENCODING_UTF8_MAC] = {
+        .name = "UTF8-MAC",
+        .char_width = pm_encoding_utf_8_char_width,
+        .alnum_char = pm_encoding_utf_8_alnum_char,
+        .alpha_char = pm_encoding_utf_8_alpha_char,
+        .isupper_char = pm_encoding_utf_8_isupper_char,
+        .multibyte = true
+    },
+    [PM_ENCODING_UTF8_DOCOMO] = {
+        .name = "UTF8-DoCoMo",
+        .char_width = pm_encoding_utf_8_char_width,
+        .alnum_char = pm_encoding_utf_8_alnum_char,
+        .alpha_char = pm_encoding_utf_8_alpha_char,
+        .isupper_char = pm_encoding_utf_8_isupper_char,
+        .multibyte = true
+    },
+    [PM_ENCODING_UTF8_KDDI] = {
+        .name = "UTF8-KDDI",
+        .char_width = pm_encoding_utf_8_char_width,
+        .alnum_char = pm_encoding_utf_8_alnum_char,
+        .alpha_char = pm_encoding_utf_8_alpha_char,
+        .isupper_char = pm_encoding_utf_8_isupper_char,
+        .multibyte = true
+    },
+    [PM_ENCODING_UTF8_SOFTBANK] = {
+        .name = "UTF8-SoftBank",
+        .char_width = pm_encoding_utf_8_char_width,
+        .alnum_char = pm_encoding_utf_8_alnum_char,
+        .alpha_char = pm_encoding_utf_8_alpha_char,
+        .isupper_char = pm_encoding_utf_8_isupper_char,
+        .multibyte = true
+    },
+    [PM_ENCODING_WINDOWS_1250] = {
+        .name = "Windows-1250",
+        .char_width = pm_encoding_single_char_width,
+        .alnum_char = pm_encoding_windows_1250_alnum_char,
+        .alpha_char = pm_encoding_windows_1250_alpha_char,
+        .isupper_char = pm_encoding_windows_1250_isupper_char,
+        .multibyte = false
+    },
+    [PM_ENCODING_WINDOWS_1251] = {
+        .name = "Windows-1251",
+        .char_width = pm_encoding_single_char_width,
+        .alnum_char = pm_encoding_windows_1251_alnum_char,
+        .alpha_char = pm_encoding_windows_1251_alpha_char,
+        .isupper_char = pm_encoding_windows_1251_isupper_char,
+        .multibyte = false
+    },
+    [PM_ENCODING_WINDOWS_1252] = {
+        .name = "Windows-1252",
+        .char_width = pm_encoding_single_char_width,
+        .alnum_char = pm_encoding_windows_1252_alnum_char,
+        .alpha_char = pm_encoding_windows_1252_alpha_char,
+        .isupper_char = pm_encoding_windows_1252_isupper_char,
+        .multibyte = false
+    },
+    [PM_ENCODING_WINDOWS_1253] = {
+        .name = "Windows-1253",
+        .char_width = pm_encoding_single_char_width,
+        .alnum_char = pm_encoding_windows_1253_alnum_char,
+        .alpha_char = pm_encoding_windows_1253_alpha_char,
+        .isupper_char = pm_encoding_windows_1253_isupper_char,
+        .multibyte = false
+    },
+    [PM_ENCODING_WINDOWS_1254] = {
+        .name = "Windows-1254",
+        .char_width = pm_encoding_single_char_width,
+        .alnum_char = pm_encoding_windows_1254_alnum_char,
+        .alpha_char = pm_encoding_windows_1254_alpha_char,
+        .isupper_char = pm_encoding_windows_1254_isupper_char,
+        .multibyte = false
+    },
+    [PM_ENCODING_WINDOWS_1255] = {
+        .name = "Windows-1255",
+        .char_width = pm_encoding_single_char_width,
+        .alnum_char = pm_encoding_windows_1255_alnum_char,
+        .alpha_char = pm_encoding_windows_1255_alpha_char,
+        .isupper_char = pm_encoding_windows_1255_isupper_char,
+        .multibyte = false
+    },
+    [PM_ENCODING_WINDOWS_1256] = {
+        .name = "Windows-1256",
+        .char_width = pm_encoding_single_char_width,
+        .alnum_char = pm_encoding_windows_1256_alnum_char,
+        .alpha_char = pm_encoding_windows_1256_alpha_char,
+        .isupper_char = pm_encoding_windows_1256_isupper_char,
+        .multibyte = false
+    },
+    [PM_ENCODING_WINDOWS_1257] = {
+        .name = "Windows-1257",
+        .char_width = pm_encoding_single_char_width,
+        .alnum_char = pm_encoding_windows_1257_alnum_char,
+        .alpha_char = pm_encoding_windows_1257_alpha_char,
+        .isupper_char = pm_encoding_windows_1257_isupper_char,
+        .multibyte = false
+    },
+    [PM_ENCODING_WINDOWS_1258] = {
+        .name = "Windows-1258",
+        .char_width = pm_encoding_single_char_width,
+        .alnum_char = pm_encoding_windows_1258_alnum_char,
+        .alpha_char = pm_encoding_windows_1258_alpha_char,
+        .isupper_char = pm_encoding_windows_1258_isupper_char,
+        .multibyte = false
+    },
+    [PM_ENCODING_WINDOWS_874] = {
+        .name = "Windows-874",
+        .char_width = pm_encoding_single_char_width,
+        .alnum_char = pm_encoding_windows_874_alnum_char,
+        .alpha_char = pm_encoding_windows_874_alpha_char,
+        .isupper_char = pm_encoding_windows_874_isupper_char,
+        .multibyte = false
+    }
+#endif
+};
+
+/**
+ * Parse the given name of an encoding and return a pointer to the corresponding
+ * encoding struct if one can be found, otherwise return NULL.
+ */
+const pm_encoding_t *
+pm_encoding_find(const uint8_t *start, const uint8_t *end) {
+    size_t width = (size_t) (end - start);
+
+    // First, we're going to check for UTF-8. This is the most common encoding.
+    // UTF-8 can contain extra information at the end about the platform it is
+    // encoded on, such as UTF-8-MAC or UTF-8-UNIX. We'll ignore those suffixes.
+    if ((start + 5 <= end) && (pm_strncasecmp(start, (const uint8_t *) "UTF-8", 5) == 0)) {
+#ifndef PRISM_ENCODING_EXCLUDE_FULL
+        // We need to explicitly handle UTF-8-HFS, as that one needs to switch
+        // over to being UTF8-MAC.
+        if (width == 9 && (pm_strncasecmp(start + 5, (const uint8_t *) "-HFS", 4) == 0)) {
+            return &pm_encodings[PM_ENCODING_UTF8_MAC];
+        }
+#endif
+
+        // Otherwise we'll return the default UTF-8 encoding.
+        return PM_ENCODING_UTF_8_ENTRY;
+    }
+
+    // Next, we're going to loop through each of the encodings that we handle
+    // explicitly. If we found one that we understand, we'll use that value.
+#define ENCODING1(name, encoding) if (width == sizeof(name) - 1 && pm_strncasecmp(start, (const uint8_t *) name, width) == 0) return &pm_encodings[encoding];
+#define ENCODING2(name1, name2, encoding) ENCODING1(name1, encoding) ENCODING1(name2, encoding)
+
+    if (width >= 3) {
+        switch (*start) {
+            case 'A': case 'a':
+                ENCODING1("ASCII", PM_ENCODING_US_ASCII);
+                ENCODING1("ASCII-8BIT", PM_ENCODING_ASCII_8BIT);
+                ENCODING1("ANSI_X3.4-1968", PM_ENCODING_US_ASCII);
+                break;
+            case 'B': case 'b':
+                ENCODING1("BINARY", PM_ENCODING_ASCII_8BIT);
+#ifndef PRISM_ENCODING_EXCLUDE_FULL
+                ENCODING1("Big5", PM_ENCODING_BIG5);
+                ENCODING2("Big5-HKSCS", "Big5-HKSCS:2008", PM_ENCODING_BIG5_HKSCS);
+                ENCODING1("Big5-UAO", PM_ENCODING_BIG5_UAO);
+#endif
+                break;
+            case 'C': case 'c':
+                ENCODING1("CP65001", PM_ENCODING_UTF_8);
+                ENCODING2("CP932", "csWindows31J", PM_ENCODING_WINDOWS_31J);
+#ifndef PRISM_ENCODING_EXCLUDE_FULL
+                ENCODING1("CESU-8", PM_ENCODING_CESU_8);
+                ENCODING1("CP437", PM_ENCODING_IBM437);
+                ENCODING1("CP720", PM_ENCODING_IBM720);
+                ENCODING1("CP737", PM_ENCODING_IBM737);
+                ENCODING1("CP775", PM_ENCODING_IBM775);
+                ENCODING1("CP850", PM_ENCODING_CP850);
+                ENCODING1("CP852", PM_ENCODING_CP852);
+                ENCODING1("CP855", PM_ENCODING_CP855);
+                ENCODING1("CP857", PM_ENCODING_IBM857);
+                ENCODING1("CP860", PM_ENCODING_IBM860);
+                ENCODING1("CP861", PM_ENCODING_IBM861);
+                ENCODING1("CP862", PM_ENCODING_IBM862);
+                ENCODING1("CP864", PM_ENCODING_IBM864);
+                ENCODING1("CP865", PM_ENCODING_IBM865);
+                ENCODING1("CP866", PM_ENCODING_IBM866);
+                ENCODING1("CP869", PM_ENCODING_IBM869);
+                ENCODING1("CP874", PM_ENCODING_WINDOWS_874);
+                ENCODING1("CP878", PM_ENCODING_KOI8_R);
+                ENCODING1("CP863", PM_ENCODING_IBM863);
+                ENCODING1("CP936", PM_ENCODING_GBK);
+                ENCODING1("CP949", PM_ENCODING_CP949);
+                ENCODING1("CP950", PM_ENCODING_CP950);
+                ENCODING1("CP951", PM_ENCODING_CP951);
+                ENCODING1("CP1250", PM_ENCODING_WINDOWS_1250);
+                ENCODING1("CP1251", PM_ENCODING_WINDOWS_1251);
+                ENCODING1("CP1252", PM_ENCODING_WINDOWS_1252);
+                ENCODING1("CP1253", PM_ENCODING_WINDOWS_1253);
+                ENCODING1("CP1254", PM_ENCODING_WINDOWS_1254);
+                ENCODING1("CP1255", PM_ENCODING_WINDOWS_1255);
+                ENCODING1("CP1256", PM_ENCODING_WINDOWS_1256);
+                ENCODING1("CP1257", PM_ENCODING_WINDOWS_1257);
+                ENCODING1("CP1258", PM_ENCODING_WINDOWS_1258);
+                ENCODING1("CP51932", PM_ENCODING_CP51932);
+#endif
+                break;
+            case 'E': case 'e':
+                ENCODING2("EUC-JP", "eucJP", PM_ENCODING_EUC_JP);
+#ifndef PRISM_ENCODING_EXCLUDE_FULL
+                ENCODING2("eucJP-ms", "euc-jp-ms", PM_ENCODING_EUC_JP_MS);
+                ENCODING2("EUC-JIS-2004", "EUC-JISX0213", PM_ENCODING_EUC_JIS_2004);
+                ENCODING2("EUC-KR", "eucKR", PM_ENCODING_EUC_KR);
+                ENCODING2("EUC-CN", "eucCN", PM_ENCODING_GB2312);
+                ENCODING2("EUC-TW", "eucTW", PM_ENCODING_EUC_TW);
+                ENCODING1("Emacs-Mule", PM_ENCODING_EMACS_MULE);
+#endif
+                break;
+            case 'G': case 'g':
+#ifndef PRISM_ENCODING_EXCLUDE_FULL
+                ENCODING1("GBK", PM_ENCODING_GBK);
+                ENCODING1("GB12345", PM_ENCODING_GB12345);
+                ENCODING1("GB18030", PM_ENCODING_GB18030);
+                ENCODING1("GB1988", PM_ENCODING_GB1988);
+                ENCODING1("GB2312", PM_ENCODING_GB2312);
+#endif
+                break;
+            case 'I': case 'i':
+#ifndef PRISM_ENCODING_EXCLUDE_FULL
+                ENCODING1("IBM437", PM_ENCODING_IBM437);
+                ENCODING1("IBM720", PM_ENCODING_IBM720);
+                ENCODING1("IBM737", PM_ENCODING_IBM737);
+                ENCODING1("IBM775", PM_ENCODING_IBM775);
+                ENCODING1("IBM850", PM_ENCODING_CP850);
+                ENCODING1("IBM852", PM_ENCODING_IBM852);
+                ENCODING1("IBM855", PM_ENCODING_IBM855);
+                ENCODING1("IBM857", PM_ENCODING_IBM857);
+                ENCODING1("IBM860", PM_ENCODING_IBM860);
+                ENCODING1("IBM861", PM_ENCODING_IBM861);
+                ENCODING1("IBM862", PM_ENCODING_IBM862);
+                ENCODING1("IBM863", PM_ENCODING_IBM863);
+                ENCODING1("IBM864", PM_ENCODING_IBM864);
+                ENCODING1("IBM865", PM_ENCODING_IBM865);
+                ENCODING1("IBM866", PM_ENCODING_IBM866);
+                ENCODING1("IBM869", PM_ENCODING_IBM869);
+                ENCODING2("ISO-8859-1", "ISO8859-1", PM_ENCODING_ISO_8859_1);
+                ENCODING2("ISO-8859-2", "ISO8859-2", PM_ENCODING_ISO_8859_2);
+                ENCODING2("ISO-8859-3", "ISO8859-3", PM_ENCODING_ISO_8859_3);
+                ENCODING2("ISO-8859-4", "ISO8859-4", PM_ENCODING_ISO_8859_4);
+                ENCODING2("ISO-8859-5", "ISO8859-5", PM_ENCODING_ISO_8859_5);
+                ENCODING2("ISO-8859-6", "ISO8859-6", PM_ENCODING_ISO_8859_6);
+                ENCODING2("ISO-8859-7", "ISO8859-7", PM_ENCODING_ISO_8859_7);
+                ENCODING2("ISO-8859-8", "ISO8859-8", PM_ENCODING_ISO_8859_8);
+                ENCODING2("ISO-8859-9", "ISO8859-9", PM_ENCODING_ISO_8859_9);
+                ENCODING2("ISO-8859-10", "ISO8859-10", PM_ENCODING_ISO_8859_10);
+                ENCODING2("ISO-8859-11", "ISO8859-11", PM_ENCODING_ISO_8859_11);
+                ENCODING2("ISO-8859-13", "ISO8859-13", PM_ENCODING_ISO_8859_13);
+                ENCODING2("ISO-8859-14", "ISO8859-14", PM_ENCODING_ISO_8859_14);
+                ENCODING2("ISO-8859-15", "ISO8859-15", PM_ENCODING_ISO_8859_15);
+                ENCODING2("ISO-8859-16", "ISO8859-16", PM_ENCODING_ISO_8859_16);
+#endif
+                break;
+            case 'K': case 'k':
+#ifndef PRISM_ENCODING_EXCLUDE_FULL
+                ENCODING1("KOI8-R", PM_ENCODING_KOI8_R);
+                ENCODING1("KOI8-U", PM_ENCODING_KOI8_U);
+#endif
+                break;
+            case 'M': case 'm':
+#ifndef PRISM_ENCODING_EXCLUDE_FULL
+                ENCODING1("macCentEuro", PM_ENCODING_MAC_CENT_EURO);
+                ENCODING1("macCroatian", PM_ENCODING_MAC_CROATIAN);
+                ENCODING1("macCyrillic", PM_ENCODING_MAC_CYRILLIC);
+                ENCODING1("macGreek", PM_ENCODING_MAC_GREEK);
+                ENCODING1("macIceland", PM_ENCODING_MAC_ICELAND);
+                ENCODING1("MacJapanese", PM_ENCODING_MAC_JAPANESE);
+                ENCODING1("MacJapan", PM_ENCODING_MAC_JAPANESE);
+                ENCODING1("macRoman", PM_ENCODING_MAC_ROMAN);
+                ENCODING1("macRomania", PM_ENCODING_MAC_ROMANIA);
+                ENCODING1("macThai", PM_ENCODING_MAC_THAI);
+                ENCODING1("macTurkish", PM_ENCODING_MAC_TURKISH);
+                ENCODING1("macUkraine", PM_ENCODING_MAC_UKRAINE);
+#endif
+                break;
+            case 'P': case 'p':
+                ENCODING1("PCK", PM_ENCODING_WINDOWS_31J);
+                break;
+            case 'S': case 's':
+                ENCODING1("SJIS", PM_ENCODING_WINDOWS_31J);
+#ifndef PRISM_ENCODING_EXCLUDE_FULL
+                ENCODING1("Shift_JIS", PM_ENCODING_SHIFT_JIS);
+                ENCODING1("SJIS-DoCoMo", PM_ENCODING_SJIS_DOCOMO);
+                ENCODING1("SJIS-KDDI", PM_ENCODING_SJIS_KDDI);
+                ENCODING1("SJIS-SoftBank", PM_ENCODING_SJIS_SOFTBANK);
+                ENCODING1("stateless-ISO-2022-JP", PM_ENCODING_STATELESS_ISO_2022_JP);
+                ENCODING1("stateless-ISO-2022-JP-KDDI", PM_ENCODING_STATELESS_ISO_2022_JP_KDDI);
+#endif
+                break;
+            case 'T': case 't':
+#ifndef PRISM_ENCODING_EXCLUDE_FULL
+                ENCODING1("TIS-620", PM_ENCODING_TIS_620);
+#endif
+                break;
+            case 'U': case 'u':
+                ENCODING1("US-ASCII", PM_ENCODING_US_ASCII);
+#ifndef PRISM_ENCODING_EXCLUDE_FULL
+                ENCODING2("UTF8-MAC", "UTF-8-HFS", PM_ENCODING_UTF8_MAC);
+                ENCODING1("UTF8-DoCoMo", PM_ENCODING_UTF8_DOCOMO);
+                ENCODING1("UTF8-KDDI", PM_ENCODING_UTF8_KDDI);
+                ENCODING1("UTF8-SoftBank", PM_ENCODING_UTF8_SOFTBANK);
+#endif
+                break;
+            case 'W': case 'w':
+                ENCODING1("Windows-31J", PM_ENCODING_WINDOWS_31J);
+#ifndef PRISM_ENCODING_EXCLUDE_FULL
+                ENCODING1("Windows-874", PM_ENCODING_WINDOWS_874);
+                ENCODING1("Windows-1250", PM_ENCODING_WINDOWS_1250);
+                ENCODING1("Windows-1251", PM_ENCODING_WINDOWS_1251);
+                ENCODING1("Windows-1252", PM_ENCODING_WINDOWS_1252);
+                ENCODING1("Windows-1253", PM_ENCODING_WINDOWS_1253);
+                ENCODING1("Windows-1254", PM_ENCODING_WINDOWS_1254);
+                ENCODING1("Windows-1255", PM_ENCODING_WINDOWS_1255);
+                ENCODING1("Windows-1256", PM_ENCODING_WINDOWS_1256);
+                ENCODING1("Windows-1257", PM_ENCODING_WINDOWS_1257);
+                ENCODING1("Windows-1258", PM_ENCODING_WINDOWS_1258);
+#endif
+                break;
+            case '6':
+                ENCODING1("646", PM_ENCODING_US_ASCII);
+                break;
+        }
+    }
+
+#undef ENCODING2
+#undef ENCODING1
+
+    // If we didn't match any encodings, return NULL.
+    return NULL;
+}
diff --git a/prism/encoding.h b/prism/encoding.h
new file mode 100644
index 00000000000000..5f7724821f5b31
--- /dev/null
+++ b/prism/encoding.h
@@ -0,0 +1,283 @@
+/**
+ * @file encoding.h
+ *
+ * The encoding interface and implementations used by the parser.
+ */
+#ifndef PRISM_ENCODING_H
+#define PRISM_ENCODING_H
+
+#include "prism/defines.h"
+#include "prism/util/pm_strncasecmp.h"
+
+#include <assert.h>
+#include <stdbool.h>
+#include <stddef.h>
+#include <stdint.h>
+
+/**
+ * This struct defines the functions necessary to implement the encoding
+ * interface so we can determine how many bytes the subsequent character takes.
+ * Each callback should return the number of bytes, or 0 if the next bytes are
+ * invalid for the encoding and type.
+ */
+typedef struct {
+    /**
+     * Return the number of bytes that the next character takes if it is valid
+     * in the encoding. Does not read more than n bytes. It is assumed that n is
+     * at least 1.
+     */
+    size_t (*char_width)(const uint8_t *b, ptrdiff_t n);
+
+    /**
+     * Return the number of bytes that the next character takes if it is valid
+     * in the encoding and is alphabetical. Does not read more than n bytes. It
+     * is assumed that n is at least 1.
+     */
+    size_t (*alpha_char)(const uint8_t *b, ptrdiff_t n);
+
+    /**
+     * Return the number of bytes that the next character takes if it is valid
+     * in the encoding and is alphanumeric. Does not read more than n bytes. It
+     * is assumed that n is at least 1.
+     */
+    size_t (*alnum_char)(const uint8_t *b, ptrdiff_t n);
+
+    /**
+     * Return true if the next character is valid in the encoding and is an
+     * uppercase character. Does not read more than n bytes. It is assumed that
+     * n is at least 1.
+     */
+    bool (*isupper_char)(const uint8_t *b, ptrdiff_t n);
+
+    /**
+     * The name of the encoding. This should correspond to a value that can be
+     * passed to Encoding.find in Ruby.
+     */
+    const char *name;
+
+    /**
+     * Return true if the encoding is a multibyte encoding.
+     */
+    bool multibyte;
+} pm_encoding_t;
+
+/**
+ * All of the lookup tables use the first bit of each embedded byte to indicate
+ * whether the codepoint is alphabetical.
+ */
+#define PRISM_ENCODING_ALPHABETIC_BIT 1 << 0
+
+/**
+ * All of the lookup tables use the second bit of each embedded byte to indicate
+ * whether the codepoint is alphanumeric.
+ */
+#define PRISM_ENCODING_ALPHANUMERIC_BIT 1 << 1
+
+/**
+ * All of the lookup tables use the third bit of each embedded byte to indicate
+ * whether the codepoint is uppercase.
+ */
+#define PRISM_ENCODING_UPPERCASE_BIT 1 << 2
+
+/**
+ * Return the size of the next character in the UTF-8 encoding.
+ *
+ * @param b The bytes to read.
+ * @param n The number of bytes that can be read.
+ * @returns The number of bytes that the next character takes if it is valid in
+ *     the encoding, or 0 if it is not.
+ */
+size_t pm_encoding_utf_8_char_width(const uint8_t *b, ptrdiff_t n);
+
+/**
+ * Return the size of the next character in the UTF-8 encoding if it is an
+ * alphabetical character.
+ *
+ * @param b The bytes to read.
+ * @param n The number of bytes that can be read.
+ * @returns The number of bytes that the next character takes if it is valid in
+ *     the encoding, or 0 if it is not.
+ */
+size_t pm_encoding_utf_8_alpha_char(const uint8_t *b, ptrdiff_t n);
+
+/**
+ * Return the size of the next character in the UTF-8 encoding if it is an
+ * alphanumeric character.
+ *
+ * @param b The bytes to read.
+ * @param n The number of bytes that can be read.
+ * @returns The number of bytes that the next character takes if it is valid in
+ *     the encoding, or 0 if it is not.
+ */
+size_t pm_encoding_utf_8_alnum_char(const uint8_t *b, ptrdiff_t n);
+
+/**
+ * Return true if the next character in the UTF-8 encoding if it is an uppercase
+ * character.
+ *
+ * @param b The bytes to read.
+ * @param n The number of bytes that can be read.
+ * @returns True if the next character is valid in the encoding and is an
+ *     uppercase character, or false if it is not.
+ */
+bool pm_encoding_utf_8_isupper_char(const uint8_t *b, ptrdiff_t n);
+
+/**
+ * This lookup table is referenced in both the UTF-8 encoding file and the
+ * parser directly in order to speed up the default encoding processing. It is
+ * used to indicate whether a character is alphabetical, alphanumeric, or
+ * uppercase in unicode mappings.
+ */
+extern const uint8_t pm_encoding_unicode_table[256];
+
+/**
+ * These are all of the encodings that prism supports.
+ */
+typedef enum {
+    PM_ENCODING_UTF_8 = 0,
+    PM_ENCODING_US_ASCII,
+    PM_ENCODING_ASCII_8BIT,
+    PM_ENCODING_EUC_JP,
+    PM_ENCODING_WINDOWS_31J,
+
+// We optionally support excluding the full set of encodings to only support the
+// minimum necessary to process Ruby code without encoding comments.
+#ifndef PRISM_ENCODING_EXCLUDE_FULL
+    PM_ENCODING_BIG5,
+    PM_ENCODING_BIG5_HKSCS,
+    PM_ENCODING_BIG5_UAO,
+    PM_ENCODING_CESU_8,
+    PM_ENCODING_CP51932,
+    PM_ENCODING_CP850,
+    PM_ENCODING_CP852,
+    PM_ENCODING_CP855,
+    PM_ENCODING_CP949,
+    PM_ENCODING_CP950,
+    PM_ENCODING_CP951,
+    PM_ENCODING_EMACS_MULE,
+    PM_ENCODING_EUC_JP_MS,
+    PM_ENCODING_EUC_JIS_2004,
+    PM_ENCODING_EUC_KR,
+    PM_ENCODING_EUC_TW,
+    PM_ENCODING_GB12345,
+    PM_ENCODING_GB18030,
+    PM_ENCODING_GB1988,
+    PM_ENCODING_GB2312,
+    PM_ENCODING_GBK,
+    PM_ENCODING_IBM437,
+    PM_ENCODING_IBM720,
+    PM_ENCODING_IBM737,
+    PM_ENCODING_IBM775,
+    PM_ENCODING_IBM852,
+    PM_ENCODING_IBM855,
+    PM_ENCODING_IBM857,
+    PM_ENCODING_IBM860,
+    PM_ENCODING_IBM861,
+    PM_ENCODING_IBM862,
+    PM_ENCODING_IBM863,
+    PM_ENCODING_IBM864,
+    PM_ENCODING_IBM865,
+    PM_ENCODING_IBM866,
+    PM_ENCODING_IBM869,
+    PM_ENCODING_ISO_8859_1,
+    PM_ENCODING_ISO_8859_2,
+    PM_ENCODING_ISO_8859_3,
+    PM_ENCODING_ISO_8859_4,
+    PM_ENCODING_ISO_8859_5,
+    PM_ENCODING_ISO_8859_6,
+    PM_ENCODING_ISO_8859_7,
+    PM_ENCODING_ISO_8859_8,
+    PM_ENCODING_ISO_8859_9,
+    PM_ENCODING_ISO_8859_10,
+    PM_ENCODING_ISO_8859_11,
+    PM_ENCODING_ISO_8859_13,
+    PM_ENCODING_ISO_8859_14,
+    PM_ENCODING_ISO_8859_15,
+    PM_ENCODING_ISO_8859_16,
+    PM_ENCODING_KOI8_R,
+    PM_ENCODING_KOI8_U,
+    PM_ENCODING_MAC_CENT_EURO,
+    PM_ENCODING_MAC_CROATIAN,
+    PM_ENCODING_MAC_CYRILLIC,
+    PM_ENCODING_MAC_GREEK,
+    PM_ENCODING_MAC_ICELAND,
+    PM_ENCODING_MAC_JAPANESE,
+    PM_ENCODING_MAC_ROMAN,
+    PM_ENCODING_MAC_ROMANIA,
+    PM_ENCODING_MAC_THAI,
+    PM_ENCODING_MAC_TURKISH,
+    PM_ENCODING_MAC_UKRAINE,
+    PM_ENCODING_SHIFT_JIS,
+    PM_ENCODING_SJIS_DOCOMO,
+    PM_ENCODING_SJIS_KDDI,
+    PM_ENCODING_SJIS_SOFTBANK,
+    PM_ENCODING_STATELESS_ISO_2022_JP,
+    PM_ENCODING_STATELESS_ISO_2022_JP_KDDI,
+    PM_ENCODING_TIS_620,
+    PM_ENCODING_UTF8_MAC,
+    PM_ENCODING_UTF8_DOCOMO,
+    PM_ENCODING_UTF8_KDDI,
+    PM_ENCODING_UTF8_SOFTBANK,
+    PM_ENCODING_WINDOWS_1250,
+    PM_ENCODING_WINDOWS_1251,
+    PM_ENCODING_WINDOWS_1252,
+    PM_ENCODING_WINDOWS_1253,
+    PM_ENCODING_WINDOWS_1254,
+    PM_ENCODING_WINDOWS_1255,
+    PM_ENCODING_WINDOWS_1256,
+    PM_ENCODING_WINDOWS_1257,
+    PM_ENCODING_WINDOWS_1258,
+    PM_ENCODING_WINDOWS_874,
+#endif
+
+    PM_ENCODING_MAXIMUM
+} pm_encoding_type_t;
+
+/**
+ * This is the table of all of the encodings that prism supports.
+ */
+extern const pm_encoding_t pm_encodings[PM_ENCODING_MAXIMUM];
+
+/**
+ * This is the default UTF-8 encoding. We need a reference to it to quickly
+ * create parsers.
+ */
+#define PM_ENCODING_UTF_8_ENTRY (&pm_encodings[PM_ENCODING_UTF_8])
+
+/**
+ * This is the US-ASCII encoding. We need a reference to it to be able to
+ * compare against it when a string is being created because it could possibly
+ * need to fall back to ASCII-8BIT.
+ */
+#define PM_ENCODING_US_ASCII_ENTRY (&pm_encodings[PM_ENCODING_US_ASCII])
+
+/**
+ * This is the ASCII-8BIT encoding. We need a reference to it so that pm_strpbrk
+ * can compare against it because invalid multibyte characters are not a thing
+ * in this encoding. It is also needed for handling Regexp encoding flags.
+ */
+#define PM_ENCODING_ASCII_8BIT_ENTRY (&pm_encodings[PM_ENCODING_ASCII_8BIT])
+
+/**
+ * This is the EUC-JP encoding. We need a reference to it to quickly process
+ * regular expression modifiers.
+ */
+#define PM_ENCODING_EUC_JP_ENTRY (&pm_encodings[PM_ENCODING_EUC_JP])
+
+/**
+ * This is the Windows-31J encoding. We need a reference to it to quickly
+ * process regular expression modifiers.
+ */
+#define PM_ENCODING_WINDOWS_31J_ENTRY (&pm_encodings[PM_ENCODING_WINDOWS_31J])
+
+/**
+ * Parse the given name of an encoding and return a pointer to the corresponding
+ * encoding struct if one can be found, otherwise return NULL.
+ *
+ * @param start A pointer to the first byte of the name.
+ * @param end A pointer to the last byte of the name.
+ * @returns A pointer to the encoding struct if one is found, otherwise NULL.
+ */
+const pm_encoding_t * pm_encoding_find(const uint8_t *start, const uint8_t *end);
+
+#endif
diff --git a/prism/extension.c b/prism/extension.c
new file mode 100644
index 00000000000000..1533ca7bb379c1
--- /dev/null
+++ b/prism/extension.c
@@ -0,0 +1,1411 @@
+#include "prism/extension.h"
+
+#ifdef _WIN32
+#include <ruby/win32.h>
+#endif
+
+// NOTE: this file should contain only bindings. All non-trivial logic should be
+// in libprism so it can be shared its the various callers.
+
+VALUE rb_cPrism;
+VALUE rb_cPrismNode;
+VALUE rb_cPrismSource;
+VALUE rb_cPrismToken;
+VALUE rb_cPrismLocation;
+
+VALUE rb_cPrismComment;
+VALUE rb_cPrismInlineComment;
+VALUE rb_cPrismEmbDocComment;
+VALUE rb_cPrismMagicComment;
+VALUE rb_cPrismParseError;
+VALUE rb_cPrismParseWarning;
+VALUE rb_cPrismResult;
+VALUE rb_cPrismParseResult;
+VALUE rb_cPrismLexResult;
+VALUE rb_cPrismParseLexResult;
+VALUE rb_cPrismStringQuery;
+VALUE rb_cPrismScope;
+
+VALUE rb_cPrismDebugEncoding;
+
+ID rb_id_option_command_line;
+ID rb_id_option_encoding;
+ID rb_id_option_filepath;
+ID rb_id_option_freeze;
+ID rb_id_option_frozen_string_literal;
+ID rb_id_option_line;
+ID rb_id_option_main_script;
+ID rb_id_option_partial_script;
+ID rb_id_option_scopes;
+ID rb_id_option_version;
+ID rb_id_source_for;
+ID rb_id_forwarding_positionals;
+ID rb_id_forwarding_keywords;
+ID rb_id_forwarding_block;
+ID rb_id_forwarding_all;
+
+/******************************************************************************/
+/* IO of Ruby code                                                            */
+/******************************************************************************/
+
+/**
+ * Check if the given VALUE is a string. If it's not a string, then raise a
+ * TypeError. Otherwise return the VALUE as a C string.
+ */
+static const char *
+check_string(VALUE value) {
+    // Check if the value is a string. If it's not, then raise a type error.
+    if (!RB_TYPE_P(value, T_STRING)) {
+        rb_raise(rb_eTypeError, "wrong argument type %" PRIsVALUE " (expected String)", rb_obj_class(value));
+    }
+
+    // Otherwise, return the value as a C string.
+    return RSTRING_PTR(value);
+}
+
+/**
+ * Load the contents and size of the given string into the given pm_string_t.
+ */
+static void
+input_load_string(pm_string_t *input, VALUE string) {
+    // Check if the string is a string. If it's not, then raise a type error.
+    if (!RB_TYPE_P(string, T_STRING)) {
+        rb_raise(rb_eTypeError, "wrong argument type %" PRIsVALUE " (expected String)", rb_obj_class(string));
+    }
+
+    pm_string_constant_init(input, RSTRING_PTR(string), RSTRING_LEN(string));
+}
+
+/******************************************************************************/
+/* Building C options from Ruby options                                       */
+/******************************************************************************/
+
+/**
+ * Build the scopes associated with the provided Ruby keyword value.
+ */
+static void
+build_options_scopes(pm_options_t *options, VALUE scopes) {
+    // Check if the value is an array. If it's not, then raise a type error.
+    if (!RB_TYPE_P(scopes, T_ARRAY)) {
+        rb_raise(rb_eTypeError, "wrong argument type %"PRIsVALUE" (expected Array)", rb_obj_class(scopes));
+    }
+
+    // Initialize the scopes array.
+    size_t scopes_count = RARRAY_LEN(scopes);
+    if (!pm_options_scopes_init(options, scopes_count)) {
+        rb_raise(rb_eNoMemError, "failed to allocate memory");
+    }
+
+    // Iterate over the scopes and add them to the options.
+    for (size_t scope_index = 0; scope_index < scopes_count; scope_index++) {
+        VALUE scope = rb_ary_entry(scopes, scope_index);
+
+        // The scope can be either an array or it can be a Prism::Scope object.
+        // Parse out the correct values here from either.
+        VALUE locals;
+        uint8_t forwarding = PM_OPTIONS_SCOPE_FORWARDING_NONE;
+
+        if (RB_TYPE_P(scope, T_ARRAY)) {
+            locals = scope;
+        } else if (rb_obj_is_kind_of(scope, rb_cPrismScope)) {
+            locals = rb_ivar_get(scope, rb_intern("@locals"));
+            if (!RB_TYPE_P(locals, T_ARRAY)) {
+                rb_raise(rb_eTypeError, "wrong argument type %"PRIsVALUE" (expected Array)", rb_obj_class(locals));
+            }
+
+            VALUE names = rb_ivar_get(scope, rb_intern("@forwarding"));
+            if (!RB_TYPE_P(names, T_ARRAY)) {
+                rb_raise(rb_eTypeError, "wrong argument type %"PRIsVALUE" (expected Array)", rb_obj_class(names));
+            }
+
+            size_t names_count = RARRAY_LEN(names);
+            for (size_t name_index = 0; name_index < names_count; name_index++) {
+                VALUE name = rb_ary_entry(names, name_index);
+
+                // Check that the name is a symbol. If it's not, then raise
+                // a type error.
+                if (!RB_TYPE_P(name, T_SYMBOL)) {
+                    rb_raise(rb_eTypeError, "wrong argument type %"PRIsVALUE" (expected Symbol)", rb_obj_class(name));
+                }
+
+                ID id = SYM2ID(name);
+                if (id == rb_id_forwarding_positionals) {
+                    forwarding |= PM_OPTIONS_SCOPE_FORWARDING_POSITIONALS;
+                } else if (id == rb_id_forwarding_keywords) {
+                    forwarding |= PM_OPTIONS_SCOPE_FORWARDING_KEYWORDS;
+                } else if (id == rb_id_forwarding_block) {
+                    forwarding |= PM_OPTIONS_SCOPE_FORWARDING_BLOCK;
+                } else if (id == rb_id_forwarding_all) {
+                    forwarding |= PM_OPTIONS_SCOPE_FORWARDING_ALL;
+                } else {
+                    rb_raise(rb_eArgError, "invalid forwarding value: %" PRIsVALUE, name);
+                }
+            }
+        } else {
+            rb_raise(rb_eTypeError, "wrong argument type %"PRIsVALUE" (expected Array or Prism::Scope)", rb_obj_class(scope));
+        }
+
+        // Initialize the scope array.
+        size_t locals_count = RARRAY_LEN(locals);
+        pm_options_scope_t *options_scope = &options->scopes[scope_index];
+        if (!pm_options_scope_init(options_scope, locals_count)) {
+            rb_raise(rb_eNoMemError, "failed to allocate memory");
+        }
+
+        // Iterate over the locals and add them to the scope.
+        for (size_t local_index = 0; local_index < locals_count; local_index++) {
+            VALUE local = rb_ary_entry(locals, local_index);
+
+            // Check that the local is a symbol. If it's not, then raise a
+            // type error.
+            if (!RB_TYPE_P(local, T_SYMBOL)) {
+                rb_raise(rb_eTypeError, "wrong argument type %"PRIsVALUE" (expected Symbol)", rb_obj_class(local));
+            }
+
+            // Add the local to the scope.
+            pm_string_t *scope_local = &options_scope->locals[local_index];
+            const char *name = rb_id2name(SYM2ID(local));
+            pm_string_constant_init(scope_local, name, strlen(name));
+        }
+
+        // Now set the forwarding options.
+        pm_options_scope_forwarding_set(options_scope, forwarding);
+    }
+}
+
+/**
+ * An iterator function that is called for each key-value in the keywords hash.
+ */
+static int
+build_options_i(VALUE key, VALUE value, VALUE argument) {
+    pm_options_t *options = (pm_options_t *) argument;
+    ID key_id = SYM2ID(key);
+
+    if (key_id == rb_id_option_filepath) {
+        if (!NIL_P(value)) pm_options_filepath_set(options, check_string(value));
+    } else if (key_id == rb_id_option_encoding) {
+        if (!NIL_P(value)) {
+            if (value == Qfalse) {
+                pm_options_encoding_locked_set(options, true);
+            } else {
+                pm_options_encoding_set(options, rb_enc_name(rb_to_encoding(value)));
+            }
+        }
+    } else if (key_id == rb_id_option_line) {
+        if (!NIL_P(value)) pm_options_line_set(options, NUM2INT(value));
+    } else if (key_id == rb_id_option_frozen_string_literal) {
+        if (!NIL_P(value)) pm_options_frozen_string_literal_set(options, RTEST(value));
+    } else if (key_id == rb_id_option_version) {
+        if (!NIL_P(value)) {
+            const char *version = check_string(value);
+
+            if (!pm_options_version_set(options, version, RSTRING_LEN(value))) {
+                rb_raise(rb_eArgError, "invalid version: %" PRIsVALUE, value);
+            }
+        }
+    } else if (key_id == rb_id_option_scopes) {
+        if (!NIL_P(value)) build_options_scopes(options, value);
+    } else if (key_id == rb_id_option_command_line) {
+        if (!NIL_P(value)) {
+            const char *string = check_string(value);
+            uint8_t command_line = 0;
+
+            for (size_t index = 0; index < strlen(string); index++) {
+                switch (string[index]) {
+                    case 'a': command_line |= PM_OPTIONS_COMMAND_LINE_A; break;
+                    case 'e': command_line |= PM_OPTIONS_COMMAND_LINE_E; break;
+                    case 'l': command_line |= PM_OPTIONS_COMMAND_LINE_L; break;
+                    case 'n': command_line |= PM_OPTIONS_COMMAND_LINE_N; break;
+                    case 'p': command_line |= PM_OPTIONS_COMMAND_LINE_P; break;
+                    case 'x': command_line |= PM_OPTIONS_COMMAND_LINE_X; break;
+                    default: rb_raise(rb_eArgError, "invalid command line flag: '%c'", string[index]); break;
+                }
+            }
+
+            pm_options_command_line_set(options, command_line);
+        }
+    } else if (key_id == rb_id_option_main_script) {
+        if (!NIL_P(value)) pm_options_main_script_set(options, RTEST(value));
+    } else if (key_id == rb_id_option_partial_script) {
+        if (!NIL_P(value)) pm_options_partial_script_set(options, RTEST(value));
+    } else if (key_id == rb_id_option_freeze) {
+        if (!NIL_P(value)) pm_options_freeze_set(options, RTEST(value));
+    } else {
+        rb_raise(rb_eArgError, "unknown keyword: %" PRIsVALUE, key);
+    }
+
+    return ST_CONTINUE;
+}
+
+/**
+ * We need a struct here to pass through rb_protect and it has to be a single
+ * value. Because the sizeof(VALUE) == sizeof(void *), we're going to pass this
+ * through as an opaque pointer and cast it on both sides.
+ */
+struct build_options_data {
+    pm_options_t *options;
+    VALUE keywords;
+};
+
+/**
+ * Build the set of options from the given keywords. Note that this can raise a
+ * Ruby error if the options are not valid.
+ */
+static VALUE
+build_options(VALUE argument) {
+    struct build_options_data *data = (struct build_options_data *) argument;
+    rb_hash_foreach(data->keywords, build_options_i, (VALUE) data->options);
+    return Qnil;
+}
+
+/**
+ * Extract the options from the given keyword arguments.
+ */
+static void
+extract_options(pm_options_t *options, VALUE filepath, VALUE keywords) {
+    options->line = 1; // default
+
+    if (!NIL_P(keywords)) {
+        struct build_options_data data = { .options = options, .keywords = keywords };
+        struct build_options_data *argument = &data;
+
+        int state = 0;
+        rb_protect(build_options, (VALUE) argument, &state);
+
+        if (state != 0) {
+            pm_options_free(options);
+            rb_jump_tag(state);
+        }
+    }
+
+    if (!NIL_P(filepath)) {
+        if (!RB_TYPE_P(filepath, T_STRING)) {
+            pm_options_free(options);
+            rb_raise(rb_eTypeError, "wrong argument type %"PRIsVALUE" (expected String)", rb_obj_class(filepath));
+        }
+
+        pm_options_filepath_set(options, RSTRING_PTR(filepath));
+    }
+}
+
+/**
+ * Read options for methods that look like (source, **options).
+ */
+static void
+string_options(int argc, VALUE *argv, pm_string_t *input, pm_options_t *options) {
+    VALUE string;
+    VALUE keywords;
+    rb_scan_args(argc, argv, "1:", &string, &keywords);
+
+    extract_options(options, Qnil, keywords);
+    input_load_string(input, string);
+}
+
+/**
+ * Read options for methods that look like (filepath, **options).
+ */
+static void
+file_options(int argc, VALUE *argv, pm_string_t *input, pm_options_t *options, VALUE *encoded_filepath) {
+    VALUE filepath;
+    VALUE keywords;
+    rb_scan_args(argc, argv, "1:", &filepath, &keywords);
+
+    Check_Type(filepath, T_STRING);
+    *encoded_filepath = rb_str_encode_ospath(filepath);
+    extract_options(options, *encoded_filepath, keywords);
+
+    const char *source = (const char *) pm_string_source(&options->filepath);
+    pm_string_init_result_t result;
+
+    switch (result = pm_string_file_init(input, source)) {
+        case PM_STRING_INIT_SUCCESS:
+            break;
+        case PM_STRING_INIT_ERROR_GENERIC: {
+            pm_options_free(options);
+
+#ifdef _WIN32
+            int e = rb_w32_map_errno(GetLastError());
+#else
+            int e = errno;
+#endif
+
+            rb_syserr_fail(e, source);
+            break;
+        }
+        case PM_STRING_INIT_ERROR_DIRECTORY:
+            pm_options_free(options);
+            rb_syserr_fail(EISDIR, source);
+            break;
+        default:
+            pm_options_free(options);
+            rb_raise(rb_eRuntimeError, "Unknown error (%d) initializing file: %s", result, source);
+            break;
+    }
+}
+
+#ifndef PRISM_EXCLUDE_SERIALIZATION
+
+/******************************************************************************/
+/* Serializing the AST                                                        */
+/******************************************************************************/
+
+/**
+ * Dump the AST corresponding to the given input to a string.
+ */
+static VALUE
+dump_input(pm_string_t *input, const pm_options_t *options) {
+    pm_buffer_t buffer;
+    if (!pm_buffer_init(&buffer)) {
+        rb_raise(rb_eNoMemError, "failed to allocate memory");
+    }
+
+    pm_parser_t parser;
+    pm_parser_init(&parser, pm_string_source(input), pm_string_length(input), options);
+
+    pm_node_t *node = pm_parse(&parser);
+    pm_serialize(&parser, node, &buffer);
+
+    VALUE result = rb_str_new(pm_buffer_value(&buffer), pm_buffer_length(&buffer));
+    pm_node_destroy(&parser, node);
+    pm_buffer_free(&buffer);
+    pm_parser_free(&parser);
+
+    return result;
+}
+
+/**
+ * call-seq:
+ *   Prism::dump(source, **options) -> String
+ *
+ * Dump the AST corresponding to the given string to a string. For supported
+ * options, see Prism::parse.
+ */
+static VALUE
+dump(int argc, VALUE *argv, VALUE self) {
+    pm_string_t input;
+    pm_options_t options = { 0 };
+    string_options(argc, argv, &input, &options);
+
+#ifdef PRISM_BUILD_DEBUG
+    size_t length = pm_string_length(&input);
+    char* dup = xmalloc(length);
+    memcpy(dup, pm_string_source(&input), length);
+    pm_string_constant_init(&input, dup, length);
+#endif
+
+    VALUE value = dump_input(&input, &options);
+    if (options.freeze) rb_obj_freeze(value);
+
+#ifdef PRISM_BUILD_DEBUG
+    xfree(dup);
+#endif
+
+    pm_string_free(&input);
+    pm_options_free(&options);
+
+    return value;
+}
+
+/**
+ * call-seq:
+ *   Prism::dump_file(filepath, **options) -> String
+ *
+ * Dump the AST corresponding to the given file to a string. For supported
+ * options, see Prism::parse.
+ */
+static VALUE
+dump_file(int argc, VALUE *argv, VALUE self) {
+    pm_string_t input;
+    pm_options_t options = { 0 };
+
+    VALUE encoded_filepath;
+    file_options(argc, argv, &input, &options, &encoded_filepath);
+
+    VALUE value = dump_input(&input, &options);
+    pm_string_free(&input);
+    pm_options_free(&options);
+
+    return value;
+}
+
+#endif
+
+/******************************************************************************/
+/* Extracting values for the parse result                                     */
+/******************************************************************************/
+
+/**
+ * The same as rb_class_new_instance, but accepts an additional boolean to
+ * indicate whether or not the resulting class instance should be frozen.
+ */
+static inline VALUE
+rb_class_new_instance_freeze(int argc, const VALUE *argv, VALUE klass, bool freeze) {
+    VALUE value = rb_class_new_instance(argc, argv, klass);
+    if (freeze) rb_obj_freeze(value);
+    return value;
+}
+
+/**
+ * Create a new Location instance from the given parser and bounds.
+ */
+static inline VALUE
+parser_location(const pm_parser_t *parser, VALUE source, bool freeze, const uint8_t *start, size_t length) {
+    VALUE argv[] = { source, LONG2FIX(start - parser->start), LONG2FIX(length) };
+    return rb_class_new_instance_freeze(3, argv, rb_cPrismLocation, freeze);
+}
+
+/**
+ * Create a new Location instance from the given parser and location.
+ */
+#define PARSER_LOCATION_LOC(parser, source, freeze, loc) \
+    parser_location(parser, source, freeze, loc.start, (size_t) (loc.end - loc.start))
+
+/**
+ * Build a new Comment instance from the given parser and comment.
+ */
+static inline VALUE
+parser_comment(const pm_parser_t *parser, VALUE source, bool freeze, const pm_comment_t *comment) {
+    VALUE argv[] = { PARSER_LOCATION_LOC(parser, source, freeze, comment->location) };
+    VALUE type = (comment->type == PM_COMMENT_EMBDOC) ? rb_cPrismEmbDocComment : rb_cPrismInlineComment;
+    return rb_class_new_instance_freeze(1, argv, type, freeze);
+}
+
+/**
+ * Extract the comments out of the parser into an array.
+ */
+static VALUE
+parser_comments(const pm_parser_t *parser, VALUE source, bool freeze) {
+    VALUE comments = rb_ary_new_capa(parser->comment_list.size);
+
+    for (
+        const pm_comment_t *comment = (const pm_comment_t *) parser->comment_list.head;
+        comment != NULL;
+        comment = (const pm_comment_t *) comment->node.next
+    ) {
+        VALUE value = parser_comment(parser, source, freeze, comment);
+        rb_ary_push(comments, value);
+    }
+
+    if (freeze) rb_obj_freeze(comments);
+    return comments;
+}
+
+/**
+ * Build a new MagicComment instance from the given parser and magic comment.
+ */
+static inline VALUE
+parser_magic_comment(const pm_parser_t *parser, VALUE source, bool freeze, const pm_magic_comment_t *magic_comment) {
+    VALUE key_loc = parser_location(parser, source, freeze, magic_comment->key_start, magic_comment->key_length);
+    VALUE value_loc = parser_location(parser, source, freeze, magic_comment->value_start, magic_comment->value_length);
+    VALUE argv[] = { key_loc, value_loc };
+    return rb_class_new_instance_freeze(2, argv, rb_cPrismMagicComment, freeze);
+}
+
+/**
+ * Extract the magic comments out of the parser into an array.
+ */
+static VALUE
+parser_magic_comments(const pm_parser_t *parser, VALUE source, bool freeze) {
+    VALUE magic_comments = rb_ary_new_capa(parser->magic_comment_list.size);
+
+    for (
+        const pm_magic_comment_t *magic_comment = (const pm_magic_comment_t *) parser->magic_comment_list.head;
+        magic_comment != NULL;
+        magic_comment = (const pm_magic_comment_t *) magic_comment->node.next
+    ) {
+        VALUE value = parser_magic_comment(parser, source, freeze, magic_comment);
+        rb_ary_push(magic_comments, value);
+    }
+
+    if (freeze) rb_obj_freeze(magic_comments);
+    return magic_comments;
+}
+
+/**
+ * Extract out the data location from the parser into a Location instance if one
+ * exists.
+ */
+static VALUE
+parser_data_loc(const pm_parser_t *parser, VALUE source, bool freeze) {
+    if (parser->data_loc.end == NULL) {
+        return Qnil;
+    } else {
+        return PARSER_LOCATION_LOC(parser, source, freeze, parser->data_loc);
+    }
+}
+
+/**
+ * Extract the errors out of the parser into an array.
+ */
+static VALUE
+parser_errors(const pm_parser_t *parser, rb_encoding *encoding, VALUE source, bool freeze) {
+    VALUE errors = rb_ary_new_capa(parser->error_list.size);
+
+    for (
+        const pm_diagnostic_t *error = (const pm_diagnostic_t *) parser->error_list.head;
+        error != NULL;
+        error = (const pm_diagnostic_t *) error->node.next
+    ) {
+        VALUE type = ID2SYM(rb_intern(pm_diagnostic_id_human(error->diag_id)));
+        VALUE message = rb_obj_freeze(rb_enc_str_new_cstr(error->message, encoding));
+        VALUE location = PARSER_LOCATION_LOC(parser, source, freeze, error->location);
+
+        VALUE level = Qnil;
+        switch (error->level) {
+            case PM_ERROR_LEVEL_SYNTAX:
+                level = ID2SYM(rb_intern("syntax"));
+                break;
+            case PM_ERROR_LEVEL_ARGUMENT:
+                level = ID2SYM(rb_intern("argument"));
+                break;
+            case PM_ERROR_LEVEL_LOAD:
+                level = ID2SYM(rb_intern("load"));
+                break;
+            default:
+                rb_raise(rb_eRuntimeError, "Unknown level: %" PRIu8, error->level);
+        }
+
+        VALUE argv[] = { type, message, location, level };
+        VALUE value = rb_class_new_instance_freeze(4, argv, rb_cPrismParseError, freeze);
+        rb_ary_push(errors, value);
+    }
+
+    if (freeze) rb_obj_freeze(errors);
+    return errors;
+}
+
+/**
+ * Extract the warnings out of the parser into an array.
+ */
+static VALUE
+parser_warnings(const pm_parser_t *parser, rb_encoding *encoding, VALUE source, bool freeze) {
+    VALUE warnings = rb_ary_new_capa(parser->warning_list.size);
+
+    for (
+        const pm_diagnostic_t *warning = (const pm_diagnostic_t *) parser->warning_list.head;
+        warning != NULL;
+        warning = (const pm_diagnostic_t *) warning->node.next
+    ) {
+        VALUE type = ID2SYM(rb_intern(pm_diagnostic_id_human(warning->diag_id)));
+        VALUE message = rb_obj_freeze(rb_enc_str_new_cstr(warning->message, encoding));
+        VALUE location = PARSER_LOCATION_LOC(parser, source, freeze, warning->location);
+
+        VALUE level = Qnil;
+        switch (warning->level) {
+            case PM_WARNING_LEVEL_DEFAULT:
+                level = ID2SYM(rb_intern("default"));
+                break;
+            case PM_WARNING_LEVEL_VERBOSE:
+                level = ID2SYM(rb_intern("verbose"));
+                break;
+            default:
+                rb_raise(rb_eRuntimeError, "Unknown level: %" PRIu8, warning->level);
+        }
+
+        VALUE argv[] = { type, message, location, level };
+        VALUE value = rb_class_new_instance_freeze(4, argv, rb_cPrismParseWarning, freeze);
+        rb_ary_push(warnings, value);
+    }
+
+    if (freeze) rb_obj_freeze(warnings);
+    return warnings;
+}
+
+/**
+ * Create a new parse result from the given parser, value, encoding, and source.
+ */
+static VALUE
+parse_result_create(VALUE class, const pm_parser_t *parser, VALUE value, rb_encoding *encoding, VALUE source, bool freeze) {
+    VALUE result_argv[] = {
+        value,
+        parser_comments(parser, source, freeze),
+        parser_magic_comments(parser, source, freeze),
+        parser_data_loc(parser, source, freeze),
+        parser_errors(parser, encoding, source, freeze),
+        parser_warnings(parser, encoding, source, freeze),
+        source
+    };
+
+    return rb_class_new_instance_freeze(7, result_argv, class, freeze);
+}
+
+/******************************************************************************/
+/* Lexing Ruby code                                                           */
+/******************************************************************************/
+
+/**
+ * This struct gets stored in the parser and passed in to the lex callback any
+ * time a new token is found. We use it to store the necessary information to
+ * initialize a Token instance.
+ */
+typedef struct {
+    VALUE source;
+    VALUE tokens;
+    rb_encoding *encoding;
+    bool freeze;
+} parse_lex_data_t;
+
+/**
+ * This is passed as a callback to the parser. It gets called every time a new
+ * token is found. Once found, we initialize a new instance of Token and push it
+ * onto the tokens array.
+ */
+static void
+parse_lex_token(void *data, pm_parser_t *parser, pm_token_t *token) {
+    parse_lex_data_t *parse_lex_data = (parse_lex_data_t *) parser->lex_callback->data;
+
+    VALUE value = pm_token_new(parser, token, parse_lex_data->encoding, parse_lex_data->source, parse_lex_data->freeze);
+    VALUE yields = rb_assoc_new(value, INT2FIX(parser->lex_state));
+
+    if (parse_lex_data->freeze) {
+        rb_obj_freeze(value);
+        rb_obj_freeze(yields);
+    }
+
+    rb_ary_push(parse_lex_data->tokens, yields);
+}
+
+/**
+ * This is called whenever the encoding changes based on the magic comment at
+ * the top of the file. We use it to update the encoding that we are using to
+ * create tokens.
+ */
+static void
+parse_lex_encoding_changed_callback(pm_parser_t *parser) {
+    parse_lex_data_t *parse_lex_data = (parse_lex_data_t *) parser->lex_callback->data;
+    parse_lex_data->encoding = rb_enc_find(parser->encoding->name);
+
+    // Since the encoding changed, we need to go back and change the encoding of
+    // the tokens that were already lexed. This is only going to end up being
+    // one or two tokens, since the encoding can only change at the top of the
+    // file.
+    VALUE tokens = parse_lex_data->tokens;
+    VALUE next_tokens = rb_ary_new();
+
+    for (long index = 0; index < RARRAY_LEN(tokens); index++) {
+        VALUE yields = rb_ary_entry(tokens, index);
+        VALUE token = rb_ary_entry(yields, 0);
+
+        VALUE value = rb_ivar_get(token, rb_intern("@value"));
+        VALUE next_value = rb_str_dup(value);
+
+        rb_enc_associate(next_value, parse_lex_data->encoding);
+        if (parse_lex_data->freeze) rb_obj_freeze(next_value);
+
+        VALUE next_token_argv[] = {
+            parse_lex_data->source,
+            rb_ivar_get(token, rb_intern("@type")),
+            next_value,
+            rb_ivar_get(token, rb_intern("@location"))
+        };
+
+        VALUE next_token = rb_class_new_instance(4, next_token_argv, rb_cPrismToken);
+        VALUE next_yields = rb_assoc_new(next_token, rb_ary_entry(yields, 1));
+
+        if (parse_lex_data->freeze) {
+            rb_obj_freeze(next_token);
+            rb_obj_freeze(next_yields);
+        }
+
+        rb_ary_push(next_tokens, next_yields);
+    }
+
+    rb_ary_replace(parse_lex_data->tokens, next_tokens);
+}
+
+/**
+ * Parse the given input and return a ParseResult containing just the tokens or
+ * the nodes and tokens.
+ */
+static VALUE
+parse_lex_input(pm_string_t *input, const pm_options_t *options, bool return_nodes) {
+    pm_parser_t parser;
+    pm_parser_init(&parser, pm_string_source(input), pm_string_length(input), options);
+    pm_parser_register_encoding_changed_callback(&parser, parse_lex_encoding_changed_callback);
+
+    VALUE source_string = rb_str_new((const char *) pm_string_source(input), pm_string_length(input));
+    VALUE offsets = rb_ary_new_capa(parser.newline_list.size);
+    VALUE source = rb_funcall(rb_cPrismSource, rb_id_source_for, 3, source_string, LONG2NUM(parser.start_line), offsets);
+
+    parse_lex_data_t parse_lex_data = {
+        .source = source,
+        .tokens = rb_ary_new(),
+        .encoding = rb_utf8_encoding(),
+        .freeze = options->freeze,
+    };
+
+    parse_lex_data_t *data = &parse_lex_data;
+    pm_lex_callback_t lex_callback = (pm_lex_callback_t) {
+        .data = (void *) data,
+        .callback = parse_lex_token,
+    };
+
+    parser.lex_callback = &lex_callback;
+    pm_node_t *node = pm_parse(&parser);
+
+    // Here we need to update the Source object to have the correct
+    // encoding for the source string and the correct newline offsets.
+    // We do it here because we've already created the Source object and given
+    // it over to all of the tokens, and both of these are only set after pm_parse().
+    rb_encoding *encoding = rb_enc_find(parser.encoding->name);
+    rb_enc_associate(source_string, encoding);
+
+    for (size_t index = 0; index < parser.newline_list.size; index++) {
+        rb_ary_push(offsets, ULONG2NUM(parser.newline_list.offsets[index]));
+    }
+
+    if (options->freeze) {
+        rb_obj_freeze(source_string);
+        rb_obj_freeze(offsets);
+        rb_obj_freeze(source);
+        rb_obj_freeze(parse_lex_data.tokens);
+    }
+
+    VALUE result;
+    if (return_nodes) {
+        VALUE value = rb_ary_new_capa(2);
+        rb_ary_push(value, pm_ast_new(&parser, node, parse_lex_data.encoding, source, options->freeze));
+        rb_ary_push(value, parse_lex_data.tokens);
+        if (options->freeze) rb_obj_freeze(value);
+        result = parse_result_create(rb_cPrismParseLexResult, &parser, value, parse_lex_data.encoding, source, options->freeze);
+    } else {
+        result = parse_result_create(rb_cPrismLexResult, &parser, parse_lex_data.tokens, parse_lex_data.encoding, source, options->freeze);
+    }
+
+    pm_node_destroy(&parser, node);
+    pm_parser_free(&parser);
+
+    return result;
+}
+
+/**
+ * call-seq:
+ *   Prism::lex(source, **options) -> LexResult
+ *
+ * Return a LexResult instance that contains an array of Token instances
+ * corresponding to the given string. For supported options, see Prism::parse.
+ */
+static VALUE
+lex(int argc, VALUE *argv, VALUE self) {
+    pm_string_t input;
+    pm_options_t options = { 0 };
+    string_options(argc, argv, &input, &options);
+
+    VALUE result = parse_lex_input(&input, &options, false);
+    pm_string_free(&input);
+    pm_options_free(&options);
+
+    return result;
+}
+
+/**
+ * call-seq:
+ *   Prism::lex_file(filepath, **options) -> LexResult
+ *
+ * Return a LexResult instance that contains an array of Token instances
+ * corresponding to the given file. For supported options, see Prism::parse.
+ */
+static VALUE
+lex_file(int argc, VALUE *argv, VALUE self) {
+    pm_string_t input;
+    pm_options_t options = { 0 };
+
+    VALUE encoded_filepath;
+    file_options(argc, argv, &input, &options, &encoded_filepath);
+
+    VALUE value = parse_lex_input(&input, &options, false);
+    pm_string_free(&input);
+    pm_options_free(&options);
+
+    return value;
+}
+
+/******************************************************************************/
+/* Parsing Ruby code                                                          */
+/******************************************************************************/
+
+/**
+ * Parse the given input and return a ParseResult instance.
+ */
+static VALUE
+parse_input(pm_string_t *input, const pm_options_t *options) {
+    pm_parser_t parser;
+    pm_parser_init(&parser, pm_string_source(input), pm_string_length(input), options);
+
+    pm_node_t *node = pm_parse(&parser);
+    rb_encoding *encoding = rb_enc_find(parser.encoding->name);
+
+    VALUE source = pm_source_new(&parser, encoding, options->freeze);
+    VALUE value = pm_ast_new(&parser, node, encoding, source, options->freeze);
+    VALUE result = parse_result_create(rb_cPrismParseResult, &parser, value, encoding, source, options->freeze);
+
+    if (options->freeze) {
+        rb_obj_freeze(source);
+    }
+
+    pm_node_destroy(&parser, node);
+    pm_parser_free(&parser);
+
+    return result;
+}
+
+/**
+ * call-seq:
+ *   Prism::parse(source, **options) -> ParseResult
+ *
+ * Parse the given string and return a ParseResult instance. The options that
+ * are supported are:
+ *
+ * * `command_line` - either nil or a string of the various options that were
+ *       set on the command line. Valid values are combinations of "a", "l",
+ *       "n", "p", and "x".
+ * * `encoding` - the encoding of the source being parsed. This should be an
+ *       encoding or nil.
+ * * `filepath` - the filepath of the source being parsed. This should be a
+ *       string or nil.
+ * * `freeze` - whether or not to deeply freeze the AST. This should be a
+ *       boolean or nil.
+ * * `frozen_string_literal` - whether or not the frozen string literal pragma
+ *       has been set. This should be a boolean or nil.
+ * * `line` - the line number that the parse starts on. This should be an
+ *       integer or nil. Note that this is 1-indexed.
+ * * `main_script` - a boolean indicating whether or not the source being parsed
+ *       is the main script being run by the interpreter. This controls whether
+ *       or not shebangs are parsed for additional flags and whether or not the
+ *       parser will attempt to find a matching shebang if the first one does
+ *       not contain the word "ruby".
+ * * `partial_script` - when the file being parsed is considered a "partial"
+ *       script, jumps will not be marked as errors if they are not contained
+ *       within loops/blocks. This is used in the case that you're parsing a
+ *       script that you know will be embedded inside another script later, but
+ *       you do not have that context yet. For example, when parsing an ERB
+ *       template that will be evaluated inside another script.
+ * * `scopes` - the locals that are in scope surrounding the code that is being
+ *       parsed. This should be an array of arrays of symbols or nil. Scopes are
+ *       ordered from the outermost scope to the innermost one.
+ * * `version` - the version of Ruby syntax that prism should used to parse Ruby
+ *       code. By default prism assumes you want to parse with the latest
+ *       version of Ruby syntax (which you can trigger with `nil` or
+ *       `"latest"`). You may also restrict the syntax to a specific version of
+ *       Ruby, e.g., with `"3.3.0"`. To parse with the same syntax version that
+ *       the current Ruby is running use `version: RUBY_VERSION`. Raises
+ *       ArgumentError if the version is not currently supported by Prism.
+ */
+static VALUE
+parse(int argc, VALUE *argv, VALUE self) {
+    pm_string_t input;
+    pm_options_t options = { 0 };
+    string_options(argc, argv, &input, &options);
+
+#ifdef PRISM_BUILD_DEBUG
+    size_t length = pm_string_length(&input);
+    char* dup = xmalloc(length);
+    memcpy(dup, pm_string_source(&input), length);
+    pm_string_constant_init(&input, dup, length);
+#endif
+
+    VALUE value = parse_input(&input, &options);
+
+#ifdef PRISM_BUILD_DEBUG
+    xfree(dup);
+#endif
+
+    pm_string_free(&input);
+    pm_options_free(&options);
+    return value;
+}
+
+/**
+ * call-seq:
+ *   Prism::parse_file(filepath, **options) -> ParseResult
+ *
+ * Parse the given file and return a ParseResult instance. For supported
+ * options, see Prism::parse.
+ */
+static VALUE
+parse_file(int argc, VALUE *argv, VALUE self) {
+    pm_string_t input;
+    pm_options_t options = { 0 };
+
+    VALUE encoded_filepath;
+    file_options(argc, argv, &input, &options, &encoded_filepath);
+
+    VALUE value = parse_input(&input, &options);
+    pm_string_free(&input);
+    pm_options_free(&options);
+
+    return value;
+}
+
+/**
+ * Parse the given input and return nothing.
+ */
+static void
+profile_input(pm_string_t *input, const pm_options_t *options) {
+    pm_parser_t parser;
+    pm_parser_init(&parser, pm_string_source(input), pm_string_length(input), options);
+
+    pm_node_t *node = pm_parse(&parser);
+    pm_node_destroy(&parser, node);
+    pm_parser_free(&parser);
+}
+
+/**
+ * call-seq:
+ *   Prism::profile(source, **options) -> nil
+ *
+ * Parse the given string and return nothing. This method is meant to allow
+ * profilers to avoid the overhead of reifying the AST to Ruby. For supported
+ * options, see Prism::parse.
+ */
+static VALUE
+profile(int argc, VALUE *argv, VALUE self) {
+    pm_string_t input;
+    pm_options_t options = { 0 };
+
+    string_options(argc, argv, &input, &options);
+    profile_input(&input, &options);
+    pm_string_free(&input);
+    pm_options_free(&options);
+
+    return Qnil;
+}
+
+/**
+ * call-seq:
+ *   Prism::profile_file(filepath, **options) -> nil
+ *
+ * Parse the given file and return nothing. This method is meant to allow
+ * profilers to avoid the overhead of reifying the AST to Ruby. For supported
+ * options, see Prism::parse.
+ */
+static VALUE
+profile_file(int argc, VALUE *argv, VALUE self) {
+    pm_string_t input;
+    pm_options_t options = { 0 };
+
+    VALUE encoded_filepath;
+    file_options(argc, argv, &input, &options, &encoded_filepath);
+
+    profile_input(&input, &options);
+    pm_string_free(&input);
+    pm_options_free(&options);
+
+    return Qnil;
+}
+
+/**
+ * An implementation of fgets that is suitable for use with Ruby IO objects.
+ */
+static char *
+parse_stream_fgets(char *string, int size, void *stream) {
+    RUBY_ASSERT(size > 0);
+
+    VALUE line = rb_funcall((VALUE) stream, rb_intern("gets"), 1, INT2FIX(size - 1));
+    if (NIL_P(line)) {
+        return NULL;
+    }
+
+    const char *cstr = RSTRING_PTR(line);
+    long length = RSTRING_LEN(line);
+
+    memcpy(string, cstr, length);
+    string[length] = '\0';
+
+    return string;
+}
+
+/**
+ * call-seq:
+ *   Prism::parse_stream(stream, **options) -> ParseResult
+ *
+ * Parse the given object that responds to `gets` and return a ParseResult
+ * instance. The options that are supported are the same as Prism::parse.
+ */
+static VALUE
+parse_stream(int argc, VALUE *argv, VALUE self) {
+    VALUE stream;
+    VALUE keywords;
+    rb_scan_args(argc, argv, "1:", &stream, &keywords);
+
+    pm_options_t options = { 0 };
+    extract_options(&options, Qnil, keywords);
+
+    pm_parser_t parser;
+    pm_buffer_t buffer;
+
+    pm_node_t *node = pm_parse_stream(&parser, &buffer, (void *) stream, parse_stream_fgets, &options);
+    rb_encoding *encoding = rb_enc_find(parser.encoding->name);
+
+    VALUE source = pm_source_new(&parser, encoding, options.freeze);
+    VALUE value = pm_ast_new(&parser, node, encoding, source, options.freeze);
+    VALUE result = parse_result_create(rb_cPrismParseResult, &parser, value, encoding, source, options.freeze);
+
+    pm_node_destroy(&parser, node);
+    pm_buffer_free(&buffer);
+    pm_parser_free(&parser);
+
+    return result;
+}
+
+/**
+ * Parse the given input and return an array of Comment objects.
+ */
+static VALUE
+parse_input_comments(pm_string_t *input, const pm_options_t *options) {
+    pm_parser_t parser;
+    pm_parser_init(&parser, pm_string_source(input), pm_string_length(input), options);
+
+    pm_node_t *node = pm_parse(&parser);
+    rb_encoding *encoding = rb_enc_find(parser.encoding->name);
+
+    VALUE source = pm_source_new(&parser, encoding, options->freeze);
+    VALUE comments = parser_comments(&parser, source, options->freeze);
+
+    pm_node_destroy(&parser, node);
+    pm_parser_free(&parser);
+
+    return comments;
+}
+
+/**
+ * call-seq:
+ *   Prism::parse_comments(source, **options) -> Array
+ *
+ * Parse the given string and return an array of Comment objects. For supported
+ * options, see Prism::parse.
+ */
+static VALUE
+parse_comments(int argc, VALUE *argv, VALUE self) {
+    pm_string_t input;
+    pm_options_t options = { 0 };
+    string_options(argc, argv, &input, &options);
+
+    VALUE result = parse_input_comments(&input, &options);
+    pm_string_free(&input);
+    pm_options_free(&options);
+
+    return result;
+}
+
+/**
+ * call-seq:
+ *   Prism::parse_file_comments(filepath, **options) -> Array
+ *
+ * Parse the given file and return an array of Comment objects. For supported
+ * options, see Prism::parse.
+ */
+static VALUE
+parse_file_comments(int argc, VALUE *argv, VALUE self) {
+    pm_string_t input;
+    pm_options_t options = { 0 };
+
+    VALUE encoded_filepath;
+    file_options(argc, argv, &input, &options, &encoded_filepath);
+
+    VALUE value = parse_input_comments(&input, &options);
+    pm_string_free(&input);
+    pm_options_free(&options);
+
+    return value;
+}
+
+/**
+ * call-seq:
+ *   Prism::parse_lex(source, **options) -> ParseLexResult
+ *
+ * Parse the given string and return a ParseLexResult instance that contains a
+ * 2-element array, where the first element is the AST and the second element is
+ * an array of Token instances.
+ *
+ * This API is only meant to be used in the case where you need both the AST and
+ * the tokens. If you only need one or the other, use either Prism::parse or
+ * Prism::lex.
+ *
+ * For supported options, see Prism::parse.
+ */
+static VALUE
+parse_lex(int argc, VALUE *argv, VALUE self) {
+    pm_string_t input;
+    pm_options_t options = { 0 };
+    string_options(argc, argv, &input, &options);
+
+    VALUE value = parse_lex_input(&input, &options, true);
+    pm_string_free(&input);
+    pm_options_free(&options);
+
+    return value;
+}
+
+/**
+ * call-seq:
+ *   Prism::parse_lex_file(filepath, **options) -> ParseLexResult
+ *
+ * Parse the given file and return a ParseLexResult instance that contains a
+ * 2-element array, where the first element is the AST and the second element is
+ * an array of Token instances.
+ *
+ * This API is only meant to be used in the case where you need both the AST and
+ * the tokens. If you only need one or the other, use either Prism::parse_file
+ * or Prism::lex_file.
+ *
+ * For supported options, see Prism::parse.
+ */
+static VALUE
+parse_lex_file(int argc, VALUE *argv, VALUE self) {
+    pm_string_t input;
+    pm_options_t options = { 0 };
+
+    VALUE encoded_filepath;
+    file_options(argc, argv, &input, &options, &encoded_filepath);
+
+    VALUE value = parse_lex_input(&input, &options, true);
+    pm_string_free(&input);
+    pm_options_free(&options);
+
+    return value;
+}
+
+/**
+ * Parse the given input and return true if it parses without errors.
+ */
+static VALUE
+parse_input_success_p(pm_string_t *input, const pm_options_t *options) {
+    pm_parser_t parser;
+    pm_parser_init(&parser, pm_string_source(input), pm_string_length(input), options);
+
+    pm_node_t *node = pm_parse(&parser);
+    pm_node_destroy(&parser, node);
+
+    VALUE result = parser.error_list.size == 0 ? Qtrue : Qfalse;
+    pm_parser_free(&parser);
+
+    return result;
+}
+
+/**
+ * call-seq:
+ *   Prism::parse_success?(source, **options) -> bool
+ *
+ * Parse the given string and return true if it parses without errors. For
+ * supported options, see Prism::parse.
+ */
+static VALUE
+parse_success_p(int argc, VALUE *argv, VALUE self) {
+    pm_string_t input;
+    pm_options_t options = { 0 };
+    string_options(argc, argv, &input, &options);
+
+    VALUE result = parse_input_success_p(&input, &options);
+    pm_string_free(&input);
+    pm_options_free(&options);
+
+    return result;
+}
+
+/**
+ * call-seq:
+ *   Prism::parse_failure?(source, **options) -> bool
+ *
+ * Parse the given string and return true if it parses with errors. For
+ * supported options, see Prism::parse.
+ */
+static VALUE
+parse_failure_p(int argc, VALUE *argv, VALUE self) {
+    return RTEST(parse_success_p(argc, argv, self)) ? Qfalse : Qtrue;
+}
+
+/**
+ * call-seq:
+ *   Prism::parse_file_success?(filepath, **options) -> bool
+ *
+ * Parse the given file and return true if it parses without errors. For
+ * supported options, see Prism::parse.
+ */
+static VALUE
+parse_file_success_p(int argc, VALUE *argv, VALUE self) {
+    pm_string_t input;
+    pm_options_t options = { 0 };
+
+    VALUE encoded_filepath;
+    file_options(argc, argv, &input, &options, &encoded_filepath);
+
+    VALUE result = parse_input_success_p(&input, &options);
+    pm_string_free(&input);
+    pm_options_free(&options);
+
+    return result;
+}
+
+/**
+ * call-seq:
+ *   Prism::parse_file_failure?(filepath, **options) -> bool
+ *
+ * Parse the given file and return true if it parses with errors. For
+ * supported options, see Prism::parse.
+ */
+static VALUE
+parse_file_failure_p(int argc, VALUE *argv, VALUE self) {
+    return RTEST(parse_file_success_p(argc, argv, self)) ? Qfalse : Qtrue;
+}
+
+/******************************************************************************/
+/* String query methods                                                       */
+/******************************************************************************/
+
+/**
+ * Process the result of a call to a string query method and return an
+ * appropriate value.
+ */
+static VALUE
+string_query(pm_string_query_t result) {
+    switch (result) {
+        case PM_STRING_QUERY_ERROR:
+            rb_raise(rb_eArgError, "Invalid or non ascii-compatible encoding");
+            return Qfalse;
+        case PM_STRING_QUERY_FALSE:
+            return Qfalse;
+        case PM_STRING_QUERY_TRUE:
+            return Qtrue;
+    }
+    return Qfalse;
+}
+
+/**
+ * call-seq:
+ *   Prism::StringQuery::local?(string) -> bool
+ *
+ * Returns true if the string constitutes a valid local variable name. Note that
+ * this means the names that can be set through Binding#local_variable_set, not
+ * necessarily the ones that can be set through a local variable assignment.
+ */
+static VALUE
+string_query_local_p(VALUE self, VALUE string) {
+    const uint8_t *source = (const uint8_t *) check_string(string);
+    return string_query(pm_string_query_local(source, RSTRING_LEN(string), rb_enc_get(string)->name));
+}
+
+/**
+ * call-seq:
+ *   Prism::StringQuery::constant?(string) -> bool
+ *
+ * Returns true if the string constitutes a valid constant name. Note that this
+ * means the names that can be set through Module#const_set, not necessarily the
+ * ones that can be set through a constant assignment.
+ */
+static VALUE
+string_query_constant_p(VALUE self, VALUE string) {
+    const uint8_t *source = (const uint8_t *) check_string(string);
+    return string_query(pm_string_query_constant(source, RSTRING_LEN(string), rb_enc_get(string)->name));
+}
+
+/**
+ * call-seq:
+ *   Prism::StringQuery::method_name?(string) -> bool
+ *
+ * Returns true if the string constitutes a valid method name.
+ */
+static VALUE
+string_query_method_name_p(VALUE self, VALUE string) {
+    const uint8_t *source = (const uint8_t *) check_string(string);
+    return string_query(pm_string_query_method_name(source, RSTRING_LEN(string), rb_enc_get(string)->name));
+}
+
+/******************************************************************************/
+/* Initialization of the extension                                            */
+/******************************************************************************/
+
+/**
+ * The init function that Ruby calls when loading this extension.
+ */
+RUBY_FUNC_EXPORTED void
+Init_prism(void) {
+    // Make sure that the prism library version matches the expected version.
+    // Otherwise something was compiled incorrectly.
+    if (strcmp(pm_version(), EXPECTED_PRISM_VERSION) != 0) {
+        rb_raise(
+            rb_eRuntimeError,
+            "The prism library version (%s) does not match the expected version (%s)",
+            pm_version(),
+            EXPECTED_PRISM_VERSION
+        );
+    }
+
+#ifdef HAVE_RB_EXT_RACTOR_SAFE
+    // Mark this extension as Ractor-safe.
+    rb_ext_ractor_safe(true);
+#endif
+
+    // Grab up references to all of the constants that we're going to need to
+    // reference throughout this extension.
+    rb_cPrism = rb_define_module("Prism");
+    rb_cPrismNode = rb_define_class_under(rb_cPrism, "Node", rb_cObject);
+    rb_cPrismSource = rb_define_class_under(rb_cPrism, "Source", rb_cObject);
+    rb_cPrismToken = rb_define_class_under(rb_cPrism, "Token", rb_cObject);
+    rb_cPrismLocation = rb_define_class_under(rb_cPrism, "Location", rb_cObject);
+    rb_cPrismComment = rb_define_class_under(rb_cPrism, "Comment", rb_cObject);
+    rb_cPrismInlineComment = rb_define_class_under(rb_cPrism, "InlineComment", rb_cPrismComment);
+    rb_cPrismEmbDocComment = rb_define_class_under(rb_cPrism, "EmbDocComment", rb_cPrismComment);
+    rb_cPrismMagicComment = rb_define_class_under(rb_cPrism, "MagicComment", rb_cObject);
+    rb_cPrismParseError = rb_define_class_under(rb_cPrism, "ParseError", rb_cObject);
+    rb_cPrismParseWarning = rb_define_class_under(rb_cPrism, "ParseWarning", rb_cObject);
+    rb_cPrismResult = rb_define_class_under(rb_cPrism, "Result", rb_cObject);
+    rb_cPrismParseResult = rb_define_class_under(rb_cPrism, "ParseResult", rb_cPrismResult);
+    rb_cPrismLexResult = rb_define_class_under(rb_cPrism, "LexResult", rb_cPrismResult);
+    rb_cPrismParseLexResult = rb_define_class_under(rb_cPrism, "ParseLexResult", rb_cPrismResult);
+    rb_cPrismStringQuery = rb_define_class_under(rb_cPrism, "StringQuery", rb_cObject);
+    rb_cPrismScope = rb_define_class_under(rb_cPrism, "Scope", rb_cObject);
+
+    // Intern all of the IDs eagerly that we support so that we don't have to do
+    // it every time we parse.
+    rb_id_option_command_line = rb_intern_const("command_line");
+    rb_id_option_encoding = rb_intern_const("encoding");
+    rb_id_option_filepath = rb_intern_const("filepath");
+    rb_id_option_freeze = rb_intern_const("freeze");
+    rb_id_option_frozen_string_literal = rb_intern_const("frozen_string_literal");
+    rb_id_option_line = rb_intern_const("line");
+    rb_id_option_main_script = rb_intern_const("main_script");
+    rb_id_option_partial_script = rb_intern_const("partial_script");
+    rb_id_option_scopes = rb_intern_const("scopes");
+    rb_id_option_version = rb_intern_const("version");
+    rb_id_source_for = rb_intern("for");
+    rb_id_forwarding_positionals = rb_intern("*");
+    rb_id_forwarding_keywords = rb_intern("**");
+    rb_id_forwarding_block = rb_intern("&");
+    rb_id_forwarding_all = rb_intern("...");
+
+    /**
+     * The version of the prism library.
+     */
+    rb_define_const(rb_cPrism, "VERSION", rb_str_freeze(rb_str_new_cstr(EXPECTED_PRISM_VERSION)));
+
+    // First, the functions that have to do with lexing and parsing.
+    rb_define_singleton_method(rb_cPrism, "lex", lex, -1);
+    rb_define_singleton_method(rb_cPrism, "lex_file", lex_file, -1);
+    rb_define_singleton_method(rb_cPrism, "parse", parse, -1);
+    rb_define_singleton_method(rb_cPrism, "parse_file", parse_file, -1);
+    rb_define_singleton_method(rb_cPrism, "profile", profile, -1);
+    rb_define_singleton_method(rb_cPrism, "profile_file", profile_file, -1);
+    rb_define_singleton_method(rb_cPrism, "parse_stream", parse_stream, -1);
+    rb_define_singleton_method(rb_cPrism, "parse_comments", parse_comments, -1);
+    rb_define_singleton_method(rb_cPrism, "parse_file_comments", parse_file_comments, -1);
+    rb_define_singleton_method(rb_cPrism, "parse_lex", parse_lex, -1);
+    rb_define_singleton_method(rb_cPrism, "parse_lex_file", parse_lex_file, -1);
+    rb_define_singleton_method(rb_cPrism, "parse_success?", parse_success_p, -1);
+    rb_define_singleton_method(rb_cPrism, "parse_failure?", parse_failure_p, -1);
+    rb_define_singleton_method(rb_cPrism, "parse_file_success?", parse_file_success_p, -1);
+    rb_define_singleton_method(rb_cPrism, "parse_file_failure?", parse_file_failure_p, -1);
+
+#ifndef PRISM_EXCLUDE_SERIALIZATION
+    rb_define_singleton_method(rb_cPrism, "dump", dump, -1);
+    rb_define_singleton_method(rb_cPrism, "dump_file", dump_file, -1);
+#endif
+
+    rb_define_singleton_method(rb_cPrismStringQuery, "local?", string_query_local_p, 1);
+    rb_define_singleton_method(rb_cPrismStringQuery, "constant?", string_query_constant_p, 1);
+    rb_define_singleton_method(rb_cPrismStringQuery, "method_name?", string_query_method_name_p, 1);
+
+    // Next, initialize the other APIs.
+    Init_prism_api_node();
+    Init_prism_pack();
+}
diff --git a/prism/extension.h b/prism/extension.h
new file mode 100644
index 00000000000000..506da2fd6f079e
--- /dev/null
+++ b/prism/extension.h
@@ -0,0 +1,19 @@
+#ifndef PRISM_EXT_NODE_H
+#define PRISM_EXT_NODE_H
+
+#define EXPECTED_PRISM_VERSION "1.4.0"
+
+#include <ruby.h>
+#include <ruby/encoding.h>
+#include "prism.h"
+
+VALUE pm_source_new(const pm_parser_t *parser, rb_encoding *encoding, bool freeze);
+VALUE pm_token_new(const pm_parser_t *parser, const pm_token_t *token, rb_encoding *encoding, VALUE source, bool freeze);
+VALUE pm_ast_new(const pm_parser_t *parser, const pm_node_t *node, rb_encoding *encoding, VALUE source, bool freeze);
+VALUE pm_integer_new(const pm_integer_t *integer);
+
+void Init_prism_api_node(void);
+void Init_prism_pack(void);
+RUBY_FUNC_EXPORTED void Init_prism(void);
+
+#endif
diff --git a/prism/node.h b/prism/node.h
new file mode 100644
index 00000000000000..e8686a327c7c95
--- /dev/null
+++ b/prism/node.h
@@ -0,0 +1,129 @@
+/**
+ * @file node.h
+ *
+ * Functions related to nodes in the AST.
+ */
+#ifndef PRISM_NODE_H
+#define PRISM_NODE_H
+
+#include "prism/defines.h"
+#include "prism/parser.h"
+#include "prism/util/pm_buffer.h"
+
+/**
+ * Loop through each node in the node list, writing each node to the given
+ * pm_node_t pointer.
+ */
+#define PM_NODE_LIST_FOREACH(list, index, node) \
+    for (size_t index = 0; index < (list)->size && ((node) = (list)->nodes[index]); index++)
+
+/**
+ * Append a new node onto the end of the node list.
+ *
+ * @param list The list to append to.
+ * @param node The node to append.
+ */
+void pm_node_list_append(pm_node_list_t *list, pm_node_t *node);
+
+/**
+ * Prepend a new node onto the beginning of the node list.
+ *
+ * @param list The list to prepend to.
+ * @param node The node to prepend.
+ */
+void pm_node_list_prepend(pm_node_list_t *list, pm_node_t *node);
+
+/**
+ * Concatenate the given node list onto the end of the other node list.
+ *
+ * @param list The list to concatenate onto.
+ * @param other The list to concatenate.
+ */
+void pm_node_list_concat(pm_node_list_t *list, pm_node_list_t *other);
+
+/**
+ * Free the internal memory associated with the given node list.
+ *
+ * @param list The list to free.
+ */
+void pm_node_list_free(pm_node_list_t *list);
+
+/**
+ * Deallocate a node and all of its children.
+ *
+ * @param parser The parser that owns the node.
+ * @param node The node to deallocate.
+ */
+PRISM_EXPORTED_FUNCTION void pm_node_destroy(pm_parser_t *parser, struct pm_node *node);
+
+/**
+ * Returns a string representation of the given node type.
+ *
+ * @param node_type The node type to convert to a string.
+ * @return A string representation of the given node type.
+ */
+PRISM_EXPORTED_FUNCTION const char * pm_node_type_to_str(pm_node_type_t node_type);
+
+/**
+ * Visit each of the nodes in this subtree using the given visitor callback. The
+ * callback function will be called for each node in the subtree. If it returns
+ * false, then that node's children will not be visited. If it returns true,
+ * then the children will be visited. The data parameter is treated as an opaque
+ * pointer and is passed to the visitor callback for consumers to use as they
+ * see fit.
+ *
+ * As an example:
+ *
+ * ```c
+ * #include "prism.h"
+ *
+ * bool visit(const pm_node_t *node, void *data) {
+ *     size_t *indent = (size_t *) data;
+ *     for (size_t i = 0; i < *indent * 2; i++) putc(' ', stdout);
+ *     printf("%s\n", pm_node_type_to_str(node->type));
+ *
+ *     size_t next_indent = *indent + 1;
+ *     size_t *next_data = &next_indent;
+ *     pm_visit_child_nodes(node, visit, next_data);
+ *
+ *     return false;
+ * }
+ *
+ * int main(void) {
+ *     const char *source = "1 + 2; 3 + 4";
+ *     size_t size = strlen(source);
+ *
+ *     pm_parser_t parser;
+ *     pm_options_t options = { 0 };
+ *     pm_parser_init(&parser, (const uint8_t *) source, size, &options);
+ *
+ *     size_t indent = 0;
+ *     pm_node_t *node = pm_parse(&parser);
+ *
+ *     size_t *data = &indent;
+ *     pm_visit_node(node, visit, data);
+ *
+ *     pm_node_destroy(&parser, node);
+ *     pm_parser_free(&parser);
+ *     return EXIT_SUCCESS;
+ * }
+ * ```
+ *
+ * @param node The root node to start visiting from.
+ * @param visitor The callback to call for each node in the subtree.
+ * @param data An opaque pointer that is passed to the visitor callback.
+ */
+PRISM_EXPORTED_FUNCTION void pm_visit_node(const pm_node_t *node, bool (*visitor)(const pm_node_t *node, void *data), void *data);
+
+/**
+ * Visit the children of the given node with the given callback. This is the
+ * default behavior for walking the tree that is called from pm_visit_node if
+ * the callback returns true.
+ *
+ * @param node The node to visit the children of.
+ * @param visitor The callback to call for each child node.
+ * @param data An opaque pointer that is passed to the visitor callback.
+ */
+PRISM_EXPORTED_FUNCTION void pm_visit_child_nodes(const pm_node_t *node, bool (*visitor)(const pm_node_t *node, void *data), void *data);
+
+#endif
diff --git a/prism/options.c b/prism/options.c
new file mode 100644
index 00000000000000..a457178ce85757
--- /dev/null
+++ b/prism/options.c
@@ -0,0 +1,328 @@
+#include "prism/options.h"
+
+/**
+ * Set the shebang callback option on the given options struct.
+ */
+PRISM_EXPORTED_FUNCTION void
+pm_options_shebang_callback_set(pm_options_t *options, pm_options_shebang_callback_t shebang_callback, void *shebang_callback_data) {
+    options->shebang_callback = shebang_callback;
+    options->shebang_callback_data = shebang_callback_data;
+}
+
+/**
+ * Set the filepath option on the given options struct.
+ */
+PRISM_EXPORTED_FUNCTION void
+pm_options_filepath_set(pm_options_t *options, const char *filepath) {
+    pm_string_constant_init(&options->filepath, filepath, strlen(filepath));
+}
+
+/**
+ * Set the encoding option on the given options struct.
+ */
+PRISM_EXPORTED_FUNCTION void
+pm_options_encoding_set(pm_options_t *options, const char *encoding) {
+    pm_string_constant_init(&options->encoding, encoding, strlen(encoding));
+}
+
+/**
+ * Set the encoding_locked option on the given options struct.
+ */
+PRISM_EXPORTED_FUNCTION void
+pm_options_encoding_locked_set(pm_options_t *options, bool encoding_locked) {
+    options->encoding_locked = encoding_locked;
+}
+
+/**
+ * Set the line option on the given options struct.
+ */
+PRISM_EXPORTED_FUNCTION void
+pm_options_line_set(pm_options_t *options, int32_t line) {
+    options->line = line;
+}
+
+/**
+ * Set the frozen string literal option on the given options struct.
+ */
+PRISM_EXPORTED_FUNCTION void
+pm_options_frozen_string_literal_set(pm_options_t *options, bool frozen_string_literal) {
+    options->frozen_string_literal = frozen_string_literal ? PM_OPTIONS_FROZEN_STRING_LITERAL_ENABLED : PM_OPTIONS_FROZEN_STRING_LITERAL_DISABLED;
+}
+
+/**
+ * Sets the command line option on the given options struct.
+ */
+PRISM_EXPORTED_FUNCTION void
+pm_options_command_line_set(pm_options_t *options, uint8_t command_line) {
+    options->command_line = command_line;
+}
+
+/**
+ * Checks if the given slice represents a number.
+ */
+static inline bool
+is_number(const char *string, size_t length) {
+    return pm_strspn_decimal_digit((const uint8_t *) string, (ptrdiff_t) length) == length;
+}
+
+/**
+ * Set the version option on the given options struct by parsing the given
+ * string. If the string contains an invalid option, this returns false.
+ * Otherwise, it returns true.
+ */
+PRISM_EXPORTED_FUNCTION bool
+pm_options_version_set(pm_options_t *options, const char *version, size_t length) {
+    if (version == NULL) {
+        options->version = PM_OPTIONS_VERSION_LATEST;
+        return true;
+    }
+
+    if (length == 3) {
+        if (strncmp(version, "3.3", 3) == 0) {
+            options->version = PM_OPTIONS_VERSION_CRUBY_3_3;
+            return true;
+        }
+
+        if (strncmp(version, "3.4", 3) == 0) {
+            options->version = PM_OPTIONS_VERSION_CRUBY_3_4;
+            return true;
+        }
+
+        if (strncmp(version, "3.5", 3) == 0) {
+            options->version = PM_OPTIONS_VERSION_LATEST;
+            return true;
+        }
+
+        return false;
+    }
+
+    if (length >= 4) {
+        if (strncmp(version, "3.3.", 4) == 0 && is_number(version + 4, length - 4)) {
+            options->version = PM_OPTIONS_VERSION_CRUBY_3_3;
+            return true;
+        }
+
+        if (strncmp(version, "3.4.", 4) == 0 && is_number(version + 4, length - 4)) {
+            options->version = PM_OPTIONS_VERSION_CRUBY_3_4;
+            return true;
+        }
+
+        if (strncmp(version, "3.5.", 4) == 0 && is_number(version + 4, length - 4)) {
+            options->version = PM_OPTIONS_VERSION_LATEST;
+            return true;
+        }
+    }
+
+    if (length >= 6) {
+        if (strncmp(version, "latest", 7) == 0) { // 7 to compare the \0 as well
+            options->version = PM_OPTIONS_VERSION_LATEST;
+            return true;
+        }
+    }
+
+    return false;
+}
+
+/**
+ * Set the main script option on the given options struct.
+ */
+PRISM_EXPORTED_FUNCTION void
+pm_options_main_script_set(pm_options_t *options, bool main_script) {
+    options->main_script = main_script;
+}
+
+/**
+ * Set the partial script option on the given options struct.
+ */
+PRISM_EXPORTED_FUNCTION void
+pm_options_partial_script_set(pm_options_t *options, bool partial_script) {
+    options->partial_script = partial_script;
+}
+
+/**
+ * Set the freeze option on the given options struct.
+ */
+PRISM_EXPORTED_FUNCTION void
+pm_options_freeze_set(pm_options_t *options, bool freeze) {
+    options->freeze = freeze;
+}
+
+// For some reason, GCC analyzer thinks we're leaking allocated scopes and
+// locals here, even though we definitely aren't. This is a false positive.
+// Ideally we wouldn't need to suppress this.
+#if defined(__GNUC__) && (__GNUC__ >= 10)
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wanalyzer-malloc-leak"
+#endif
+
+/**
+ * Allocate and zero out the scopes array on the given options struct.
+ */
+PRISM_EXPORTED_FUNCTION bool
+pm_options_scopes_init(pm_options_t *options, size_t scopes_count) {
+    options->scopes_count = scopes_count;
+    options->scopes = xcalloc(scopes_count, sizeof(pm_options_scope_t));
+    return options->scopes != NULL;
+}
+
+/**
+ * Return a pointer to the scope at the given index within the given options.
+ */
+PRISM_EXPORTED_FUNCTION const pm_options_scope_t *
+pm_options_scope_get(const pm_options_t *options, size_t index) {
+    return &options->scopes[index];
+}
+
+/**
+ * Create a new options scope struct. This will hold a set of locals that are in
+ * scope surrounding the code that is being parsed.
+ */
+PRISM_EXPORTED_FUNCTION bool
+pm_options_scope_init(pm_options_scope_t *scope, size_t locals_count) {
+    scope->locals_count = locals_count;
+    scope->locals = xcalloc(locals_count, sizeof(pm_string_t));
+    scope->forwarding = PM_OPTIONS_SCOPE_FORWARDING_NONE;
+    return scope->locals != NULL;
+}
+
+/**
+ * Return a pointer to the local at the given index within the given scope.
+ */
+PRISM_EXPORTED_FUNCTION const pm_string_t *
+pm_options_scope_local_get(const pm_options_scope_t *scope, size_t index) {
+    return &scope->locals[index];
+}
+
+/**
+ * Set the forwarding option on the given scope struct.
+ */
+PRISM_EXPORTED_FUNCTION void
+pm_options_scope_forwarding_set(pm_options_scope_t *scope, uint8_t forwarding) {
+    scope->forwarding = forwarding;
+}
+
+/**
+ * Free the internal memory associated with the options.
+ */
+PRISM_EXPORTED_FUNCTION void
+pm_options_free(pm_options_t *options) {
+    pm_string_free(&options->filepath);
+    pm_string_free(&options->encoding);
+
+    for (size_t scope_index = 0; scope_index < options->scopes_count; scope_index++) {
+        pm_options_scope_t *scope = &options->scopes[scope_index];
+
+        for (size_t local_index = 0; local_index < scope->locals_count; local_index++) {
+            pm_string_free(&scope->locals[local_index]);
+        }
+
+        xfree(scope->locals);
+    }
+
+    xfree(options->scopes);
+}
+
+/**
+ * Read a 32-bit unsigned integer from a pointer. This function is used to read
+ * the options that are passed into the parser from the Ruby implementation. It
+ * handles aligned and unaligned reads.
+ */
+static uint32_t
+pm_options_read_u32(const char *data) {
+    if (((uintptr_t) data) % sizeof(uint32_t) == 0) {
+        return *((uint32_t *) data);
+    } else {
+        uint32_t value;
+        memcpy(&value, data, sizeof(uint32_t));
+        return value;
+    }
+}
+
+/**
+ * Read a 32-bit signed integer from a pointer. This function is used to read
+ * the options that are passed into the parser from the Ruby implementation. It
+ * handles aligned and unaligned reads.
+ */
+static int32_t
+pm_options_read_s32(const char *data) {
+    if (((uintptr_t) data) % sizeof(int32_t) == 0) {
+        return *((int32_t *) data);
+    } else {
+        int32_t value;
+        memcpy(&value, data, sizeof(int32_t));
+        return value;
+    }
+}
+
+/**
+ * Deserialize an options struct from the given binary string. This is used to
+ * pass options to the parser from an FFI call so that consumers of the library
+ * from an FFI perspective don't have to worry about the structure of our
+ * options structs. Since the source of these calls will be from Ruby
+ * implementation internals we assume it is from a trusted source.
+ */
+void
+pm_options_read(pm_options_t *options, const char *data) {
+    options->line = 1; // default
+    if (data == NULL) return;
+
+    uint32_t filepath_length = pm_options_read_u32(data);
+    data += 4;
+
+    if (filepath_length > 0) {
+        pm_string_constant_init(&options->filepath, data, filepath_length);
+        data += filepath_length;
+    }
+
+    options->line = pm_options_read_s32(data);
+    data += 4;
+
+    uint32_t encoding_length = pm_options_read_u32(data);
+    data += 4;
+
+    if (encoding_length > 0) {
+        pm_string_constant_init(&options->encoding, data, encoding_length);
+        data += encoding_length;
+    }
+
+    options->frozen_string_literal = (int8_t) *data++;
+    options->command_line = (uint8_t) *data++;
+    options->version = (pm_options_version_t) *data++;
+    options->encoding_locked = ((uint8_t) *data++) > 0;
+    options->main_script = ((uint8_t) *data++) > 0;
+    options->partial_script = ((uint8_t) *data++) > 0;
+    options->freeze = ((uint8_t) *data++) > 0;
+
+    uint32_t scopes_count = pm_options_read_u32(data);
+    data += 4;
+
+    if (scopes_count > 0) {
+        if (!pm_options_scopes_init(options, scopes_count)) return;
+
+        for (size_t scope_index = 0; scope_index < scopes_count; scope_index++) {
+            uint32_t locals_count = pm_options_read_u32(data);
+            data += 4;
+
+            pm_options_scope_t *scope = &options->scopes[scope_index];
+            if (!pm_options_scope_init(scope, locals_count)) {
+                pm_options_free(options);
+                return;
+            }
+
+            uint8_t forwarding = (uint8_t) *data++;
+            pm_options_scope_forwarding_set(&options->scopes[scope_index], forwarding);
+
+            for (size_t local_index = 0; local_index < locals_count; local_index++) {
+                uint32_t local_length = pm_options_read_u32(data);
+                data += 4;
+
+                pm_string_constant_init(&scope->locals[local_index], data, local_length);
+                data += local_length;
+            }
+        }
+    }
+}
+
+#if defined(__GNUC__) && (__GNUC__ >= 10)
+#pragma GCC diagnostic pop
+#endif
diff --git a/prism/options.h b/prism/options.h
new file mode 100644
index 00000000000000..2f64701b0c20ea
--- /dev/null
+++ b/prism/options.h
@@ -0,0 +1,442 @@
+/**
+ * @file options.h
+ *
+ * The options that can be passed to parsing.
+ */
+#ifndef PRISM_OPTIONS_H
+#define PRISM_OPTIONS_H
+
+#include "prism/defines.h"
+#include "prism/util/pm_char.h"
+#include "prism/util/pm_string.h"
+
+#include <stdbool.h>
+#include <stddef.h>
+#include <stdint.h>
+
+/**
+ * String literals should be made frozen.
+ */
+#define PM_OPTIONS_FROZEN_STRING_LITERAL_DISABLED   ((int8_t) -1)
+
+/**
+ * String literals may be frozen or mutable depending on the implementation
+ * default.
+ */
+#define PM_OPTIONS_FROZEN_STRING_LITERAL_UNSET      ((int8_t)  0)
+
+/**
+ * String literals should be made mutable.
+ */
+#define PM_OPTIONS_FROZEN_STRING_LITERAL_ENABLED    ((int8_t)  1)
+
+/**
+ * A scope of locals surrounding the code that is being parsed.
+ */
+typedef struct pm_options_scope {
+    /** The number of locals in the scope. */
+    size_t locals_count;
+
+    /** The names of the locals in the scope. */
+    pm_string_t *locals;
+
+    /** Flags for the set of forwarding parameters in this scope. */
+    uint8_t forwarding;
+} pm_options_scope_t;
+
+/** The default value for parameters. */
+static const uint8_t PM_OPTIONS_SCOPE_FORWARDING_NONE = 0x0;
+
+/** When the scope is fowarding with the * parameter. */
+static const uint8_t PM_OPTIONS_SCOPE_FORWARDING_POSITIONALS = 0x1;
+
+/** When the scope is fowarding with the ** parameter. */
+static const uint8_t PM_OPTIONS_SCOPE_FORWARDING_KEYWORDS = 0x2;
+
+/** When the scope is fowarding with the & parameter. */
+static const uint8_t PM_OPTIONS_SCOPE_FORWARDING_BLOCK = 0x4;
+
+/** When the scope is fowarding with the ... parameter. */
+static const uint8_t PM_OPTIONS_SCOPE_FORWARDING_ALL = 0x8;
+
+// Forward declaration needed by the callback typedef.
+struct pm_options;
+
+/**
+ * The callback called when additional switches are found in a shebang comment
+ * that need to be processed by the runtime.
+ *
+ * @param options The options struct that may be updated by this callback.
+ *   Certain fields will be checked for changes, specifically encoding,
+ *   command_line, and frozen_string_literal.
+ * @param source The source of the shebang comment.
+ * @param length The length of the source.
+ * @param shebang_callback_data Any additional data that should be passed along
+ *   to the callback.
+ */
+typedef void (*pm_options_shebang_callback_t)(struct pm_options *options, const uint8_t *source, size_t length, void *shebang_callback_data);
+
+/**
+ * The version of Ruby syntax that we should be parsing with. This is used to
+ * allow consumers to specify which behavior they want in case they need to
+ * parse in the same way as a specific version of CRuby would have.
+ */
+typedef enum {
+    /** The current version of prism. */
+    PM_OPTIONS_VERSION_LATEST = 0,
+
+    /** The vendored version of prism in CRuby 3.3.x. */
+    PM_OPTIONS_VERSION_CRUBY_3_3 = 1,
+
+    /** The vendored version of prism in CRuby 3.4.x. */
+    PM_OPTIONS_VERSION_CRUBY_3_4 = 2
+} pm_options_version_t;
+
+/**
+ * The options that can be passed to the parser.
+ */
+typedef struct pm_options {
+    /**
+     * The callback to call when additional switches are found in a shebang
+     * comment.
+     */
+    pm_options_shebang_callback_t shebang_callback;
+
+    /**
+     * Any additional data that should be passed along to the shebang callback
+     * if one was set.
+     */
+    void *shebang_callback_data;
+
+    /** The name of the file that is currently being parsed. */
+    pm_string_t filepath;
+
+    /**
+     * The line within the file that the parse starts on. This value is
+     * 1-indexed.
+     */
+    int32_t line;
+
+    /**
+     * The name of the encoding that the source file is in. Note that this must
+     * correspond to a name that can be found with Encoding.find in Ruby.
+     */
+    pm_string_t encoding;
+
+    /**
+     * The number of scopes surrounding the code that is being parsed.
+     */
+    size_t scopes_count;
+
+    /**
+     * The scopes surrounding the code that is being parsed. For most parses
+     * this will be NULL, but for evals it will be the locals that are in scope
+     * surrounding the eval. Scopes are ordered from the outermost scope to the
+     * innermost one.
+     */
+    pm_options_scope_t *scopes;
+
+    /**
+     * The version of prism that we should be parsing with. This is used to
+     * allow consumers to specify which behavior they want in case they need to
+     * parse exactly as a specific version of CRuby.
+     */
+    pm_options_version_t version;
+
+    /** A bitset of the various options that were set on the command line. */
+    uint8_t command_line;
+
+    /**
+    * Whether or not the frozen string literal option has been set.
+    * May be:
+    *  - PM_OPTIONS_FROZEN_STRING_LITERAL_DISABLED
+    *  - PM_OPTIONS_FROZEN_STRING_LITERAL_ENABLED
+    *  - PM_OPTIONS_FROZEN_STRING_LITERAL_UNSET
+    */
+    int8_t frozen_string_literal;
+
+    /**
+     * Whether or not the encoding magic comments should be respected. This is a
+     * niche use-case where you want to parse a file with a specific encoding
+     * but ignore any encoding magic comments at the top of the file.
+     */
+    bool encoding_locked;
+
+    /**
+     * When the file being parsed is the main script, the shebang will be
+     * considered for command-line flags (or for implicit -x). The caller needs
+     * to pass this information to the parser so that it can behave correctly.
+     */
+    bool main_script;
+
+    /**
+     * When the file being parsed is considered a "partial" script, jumps will
+     * not be marked as errors if they are not contained within loops/blocks.
+     * This is used in the case that you're parsing a script that you know will
+     * be embedded inside another script later, but you do not have that context
+     * yet. For example, when parsing an ERB template that will be evaluated
+     * inside another script.
+     */
+    bool partial_script;
+
+    /**
+     * Whether or not the parser should freeze the nodes that it creates. This
+     * makes it possible to have a deeply frozen AST that is safe to share
+     * between concurrency primitives.
+     */
+    bool freeze;
+} pm_options_t;
+
+/**
+ * A bit representing whether or not the command line -a option was set. -a
+ * splits the input line $_ into $F.
+ */
+static const uint8_t PM_OPTIONS_COMMAND_LINE_A = 0x1;
+
+/**
+ * A bit representing whether or not the command line -e option was set. -e
+ * allow the user to specify a script to be executed. This is necessary for
+ * prism to know because certain warnings are not generated when -e is used.
+ */
+static const uint8_t PM_OPTIONS_COMMAND_LINE_E = 0x2;
+
+/**
+ * A bit representing whether or not the command line -l option was set. -l
+ * chomps the input line by default.
+ */
+static const uint8_t PM_OPTIONS_COMMAND_LINE_L = 0x4;
+
+/**
+ * A bit representing whether or not the command line -n option was set. -n
+ * wraps the script in a while gets loop.
+ */
+static const uint8_t PM_OPTIONS_COMMAND_LINE_N = 0x8;
+
+/**
+ * A bit representing whether or not the command line -p option was set. -p
+ * prints the value of $_ at the end of each loop.
+ */
+static const uint8_t PM_OPTIONS_COMMAND_LINE_P = 0x10;
+
+/**
+ * A bit representing whether or not the command line -x option was set. -x
+ * searches the input file for a shebang that matches the current Ruby engine.
+ */
+static const uint8_t PM_OPTIONS_COMMAND_LINE_X = 0x20;
+
+/**
+ * Set the shebang callback option on the given options struct.
+ *
+ * @param options The options struct to set the shebang callback on.
+ * @param shebang_callback The shebang callback to set.
+ * @param shebang_callback_data Any additional data that should be passed along
+ *   to the callback.
+ */
+PRISM_EXPORTED_FUNCTION void pm_options_shebang_callback_set(pm_options_t *options, pm_options_shebang_callback_t shebang_callback, void *shebang_callback_data);
+
+/**
+ * Set the filepath option on the given options struct.
+ *
+ * @param options The options struct to set the filepath on.
+ * @param filepath The filepath to set.
+ */
+PRISM_EXPORTED_FUNCTION void pm_options_filepath_set(pm_options_t *options, const char *filepath);
+
+/**
+ * Set the line option on the given options struct.
+ *
+ * @param options The options struct to set the line on.
+ * @param line The line to set.
+ */
+PRISM_EXPORTED_FUNCTION void pm_options_line_set(pm_options_t *options, int32_t line);
+
+/**
+ * Set the encoding option on the given options struct.
+ *
+ * @param options The options struct to set the encoding on.
+ * @param encoding The encoding to set.
+ */
+PRISM_EXPORTED_FUNCTION void pm_options_encoding_set(pm_options_t *options, const char *encoding);
+
+/**
+ * Set the encoding_locked option on the given options struct.
+ *
+ * @param options The options struct to set the encoding_locked value on.
+ * @param encoding_locked The encoding_locked value to set.
+ */
+PRISM_EXPORTED_FUNCTION void pm_options_encoding_locked_set(pm_options_t *options, bool encoding_locked);
+
+/**
+ * Set the frozen string literal option on the given options struct.
+ *
+ * @param options The options struct to set the frozen string literal value on.
+ * @param frozen_string_literal The frozen string literal value to set.
+ */
+PRISM_EXPORTED_FUNCTION void pm_options_frozen_string_literal_set(pm_options_t *options, bool frozen_string_literal);
+
+/**
+ * Sets the command line option on the given options struct.
+ *
+ * @param options The options struct to set the command line option on.
+ * @param command_line The command_line value to set.
+ */
+PRISM_EXPORTED_FUNCTION void pm_options_command_line_set(pm_options_t *options, uint8_t command_line);
+
+/**
+ * Set the version option on the given options struct by parsing the given
+ * string. If the string contains an invalid option, this returns false.
+ * Otherwise, it returns true.
+ *
+ * @param options The options struct to set the version on.
+ * @param version The version to set.
+ * @param length The length of the version string.
+ * @return Whether or not the version was parsed successfully.
+ */
+PRISM_EXPORTED_FUNCTION bool pm_options_version_set(pm_options_t *options, const char *version, size_t length);
+
+/**
+ * Set the main script option on the given options struct.
+ *
+ * @param options The options struct to set the main script value on.
+ * @param main_script The main script value to set.
+ */
+PRISM_EXPORTED_FUNCTION void pm_options_main_script_set(pm_options_t *options, bool main_script);
+
+/**
+ * Set the partial script option on the given options struct.
+ *
+ * @param options The options struct to set the partial script value on.
+ * @param partial_script The partial script value to set.
+ */
+PRISM_EXPORTED_FUNCTION void pm_options_partial_script_set(pm_options_t *options, bool partial_script);
+
+/**
+ * Set the freeze option on the given options struct.
+ *
+ * @param options The options struct to set the freeze value on.
+ * @param freeze The freeze value to set.
+ */
+PRISM_EXPORTED_FUNCTION void pm_options_freeze_set(pm_options_t *options, bool freeze);
+
+/**
+ * Allocate and zero out the scopes array on the given options struct.
+ *
+ * @param options The options struct to initialize the scopes array on.
+ * @param scopes_count The number of scopes to allocate.
+ * @return Whether or not the scopes array was initialized successfully.
+ */
+PRISM_EXPORTED_FUNCTION bool pm_options_scopes_init(pm_options_t *options, size_t scopes_count);
+
+/**
+ * Return a pointer to the scope at the given index within the given options.
+ *
+ * @param options The options struct to get the scope from.
+ * @param index The index of the scope to get.
+ * @return A pointer to the scope at the given index.
+ */
+PRISM_EXPORTED_FUNCTION const pm_options_scope_t * pm_options_scope_get(const pm_options_t *options, size_t index);
+
+/**
+ * Create a new options scope struct. This will hold a set of locals that are in
+ * scope surrounding the code that is being parsed.
+ *
+ * @param scope The scope struct to initialize.
+ * @param locals_count The number of locals to allocate.
+ * @return Whether or not the scope was initialized successfully.
+ */
+PRISM_EXPORTED_FUNCTION bool pm_options_scope_init(pm_options_scope_t *scope, size_t locals_count);
+
+/**
+ * Return a pointer to the local at the given index within the given scope.
+ *
+ * @param scope The scope struct to get the local from.
+ * @param index The index of the local to get.
+ * @return A pointer to the local at the given index.
+ */
+PRISM_EXPORTED_FUNCTION const pm_string_t * pm_options_scope_local_get(const pm_options_scope_t *scope, size_t index);
+
+/**
+ * Set the forwarding option on the given scope struct.
+ *
+ * @param scope The scope struct to set the forwarding on.
+ * @param forwarding The forwarding value to set.
+ */
+PRISM_EXPORTED_FUNCTION void pm_options_scope_forwarding_set(pm_options_scope_t *scope, uint8_t forwarding);
+
+/**
+ * Free the internal memory associated with the options.
+ *
+ * @param options The options struct whose internal memory should be freed.
+ */
+PRISM_EXPORTED_FUNCTION void pm_options_free(pm_options_t *options);
+
+/**
+ * Deserialize an options struct from the given binary string. This is used to
+ * pass options to the parser from an FFI call so that consumers of the library
+ * from an FFI perspective don't have to worry about the structure of our
+ * options structs. Since the source of these calls will be from Ruby
+ * implementation internals we assume it is from a trusted source.
+ *
+ * `data` is assumed to be a valid pointer pointing to well-formed data. The
+ * layout of this data should be the same every time, and is described below:
+ *
+ * | # bytes | field                      |
+ * | ------- | -------------------------- |
+ * | `4`     | the length of the filepath |
+ * | ...     | the filepath bytes         |
+ * | `4`     | the line number            |
+ * | `4`     | the length the encoding    |
+ * | ...     | the encoding bytes         |
+ * | `1`     | frozen string literal      |
+ * | `1`     | -p command line option     |
+ * | `1`     | -n command line option     |
+ * | `1`     | -l command line option     |
+ * | `1`     | -a command line option     |
+ * | `1`     | the version                |
+ * | `1`     | encoding locked            |
+ * | `1`     | main script                |
+ * | `1`     | partial script             |
+ * | `1`     | freeze                     |
+ * | `4`     | the number of scopes       |
+ * | ...     | the scopes                 |
+ *
+ * The version field is an enum, so it should be one of the following values:
+ *
+ * | value | version                   |
+ * | ----- | ------------------------- |
+ * | `0`   | use the latest version of prism |
+ * | `1`   | use the version of prism that is vendored in CRuby 3.3.0 |
+ *
+ * Each scope is laid out as follows:
+ *
+ * | # bytes | field                      |
+ * | ------- | -------------------------- |
+ * | `4`     | the number of locals       |
+ * | `1`     | the forwarding flags       |
+ * | ...     | the locals                 |
+ *
+ * Each local is laid out as follows:
+ *
+ * | # bytes | field                      |
+ * | ------- | -------------------------- |
+ * | `4`     | the length of the local    |
+ * | ...     | the local bytes            |
+ *
+ * Some additional things to note about this layout:
+ *
+ * * The filepath can have a length of 0, in which case we'll consider it an
+ *   empty string.
+ * * The line number should be 0-indexed.
+ * * The encoding can have a length of 0, in which case we'll use the default
+ *   encoding (UTF-8). If it's not 0, it should correspond to a name of an
+ *   encoding that can be passed to `Encoding.find` in Ruby.
+ * * The frozen string literal, encoding locked, main script, and partial script
+ *   fields are booleans, so their values should be either 0 or 1.
+ * * The number of scopes can be 0.
+ *
+ * @param options The options struct to deserialize into.
+ * @param data The binary string to deserialize from.
+ */
+void pm_options_read(pm_options_t *options, const char *data);
+
+#endif
diff --git a/prism/pack.c b/prism/pack.c
new file mode 100644
index 00000000000000..1388ca8a3b5210
--- /dev/null
+++ b/prism/pack.c
@@ -0,0 +1,509 @@
+#include "prism/pack.h"
+
+// We optionally support parsing String#pack templates. For systems that don't
+// want or need this functionality, it can be turned off with the
+// PRISM_EXCLUDE_PACK define.
+#ifdef PRISM_EXCLUDE_PACK
+
+void pm_pack_parse(void) {}
+
+#else
+
+#include <stdbool.h>
+#include <errno.h>
+
+static uintmax_t
+strtoumaxc(const char **format) {
+    uintmax_t value = 0;
+    while (**format >= '0' && **format <= '9') {
+        if (value > UINTMAX_MAX / 10) {
+            errno = ERANGE;
+        }
+        value = value * 10 + ((uintmax_t) (**format - '0'));
+        (*format)++;
+    }
+    return value;
+}
+
+PRISM_EXPORTED_FUNCTION pm_pack_result
+pm_pack_parse(
+    pm_pack_variant variant,
+    const char **format,
+    const char *format_end,
+    pm_pack_type *type,
+    pm_pack_signed *signed_type,
+    pm_pack_endian *endian,
+    pm_pack_size *size,
+    pm_pack_length_type *length_type,
+    uint64_t *length,
+    pm_pack_encoding *encoding
+) {
+    if (*encoding == PM_PACK_ENCODING_START) {
+        *encoding = PM_PACK_ENCODING_US_ASCII;
+    }
+
+    if (*format == format_end) {
+            *type = PM_PACK_END;
+            *signed_type = PM_PACK_SIGNED_NA;
+            *endian = PM_PACK_ENDIAN_NA;
+            *size = PM_PACK_SIZE_NA;
+            *length_type = PM_PACK_LENGTH_NA;
+            return PM_PACK_OK;
+    }
+
+    *length_type = PM_PACK_LENGTH_FIXED;
+    *length = 1;
+    bool length_changed_allowed = true;
+
+    char directive = **format;
+    (*format)++;
+    switch (directive) {
+        case ' ':
+        case '\t':
+        case '\n':
+        case '\v':
+        case '\f':
+        case '\r':
+            *type = PM_PACK_SPACE;
+            *signed_type = PM_PACK_SIGNED_NA;
+            *endian = PM_PACK_ENDIAN_NA;
+            *size = PM_PACK_SIZE_NA;
+            *length_type = PM_PACK_LENGTH_NA;
+            *length = 0;
+            return PM_PACK_OK;
+        case '#':
+            while ((*format < format_end) && (**format != '\n')) {
+                (*format)++;
+            }
+            *type = PM_PACK_COMMENT;
+            *signed_type = PM_PACK_SIGNED_NA;
+            *endian = PM_PACK_ENDIAN_NA;
+            *size = PM_PACK_SIZE_NA;
+            *length_type = PM_PACK_LENGTH_NA;
+            *length = 0;
+            return PM_PACK_OK;
+        case 'C':
+            *type = PM_PACK_INTEGER;
+            *signed_type = PM_PACK_UNSIGNED;
+            *endian = PM_PACK_AGNOSTIC_ENDIAN;
+            *size = PM_PACK_SIZE_8;
+            break;
+        case 'S':
+            *type = PM_PACK_INTEGER;
+            *signed_type = PM_PACK_UNSIGNED;
+            *endian = PM_PACK_NATIVE_ENDIAN;
+            *size = PM_PACK_SIZE_16;
+            break;
+        case 'L':
+            *type = PM_PACK_INTEGER;
+            *signed_type = PM_PACK_UNSIGNED;
+            *endian = PM_PACK_NATIVE_ENDIAN;
+            *size = PM_PACK_SIZE_32;
+            break;
+        case 'Q':
+            *type = PM_PACK_INTEGER;
+            *signed_type = PM_PACK_UNSIGNED;
+            *endian = PM_PACK_NATIVE_ENDIAN;
+            *size = PM_PACK_SIZE_64;
+            break;
+        case 'J':
+            *type = PM_PACK_INTEGER;
+            *signed_type = PM_PACK_UNSIGNED;
+            *endian = PM_PACK_NATIVE_ENDIAN;
+            *size = PM_PACK_SIZE_P;
+            break;
+        case 'c':
+            *type = PM_PACK_INTEGER;
+            *signed_type = PM_PACK_SIGNED;
+            *endian = PM_PACK_AGNOSTIC_ENDIAN;
+            *size = PM_PACK_SIZE_8;
+            break;
+        case 's':
+            *type = PM_PACK_INTEGER;
+            *signed_type = PM_PACK_SIGNED;
+            *endian = PM_PACK_NATIVE_ENDIAN;
+            *size = PM_PACK_SIZE_16;
+            break;
+        case 'l':
+            *type = PM_PACK_INTEGER;
+            *signed_type = PM_PACK_SIGNED;
+            *endian = PM_PACK_NATIVE_ENDIAN;
+            *size = PM_PACK_SIZE_32;
+            break;
+        case 'q':
+            *type = PM_PACK_INTEGER;
+            *signed_type = PM_PACK_SIGNED;
+            *endian = PM_PACK_NATIVE_ENDIAN;
+            *size = PM_PACK_SIZE_64;
+            break;
+        case 'j':
+            *type = PM_PACK_INTEGER;
+            *signed_type = PM_PACK_SIGNED;
+            *endian = PM_PACK_NATIVE_ENDIAN;
+            *size = PM_PACK_SIZE_P;
+            break;
+        case 'I':
+            *type = PM_PACK_INTEGER;
+            *signed_type = PM_PACK_UNSIGNED;
+            *endian = PM_PACK_NATIVE_ENDIAN;
+            *size = PM_PACK_SIZE_INT;
+            break;
+        case 'i':
+            *type = PM_PACK_INTEGER;
+            *signed_type = PM_PACK_SIGNED;
+            *endian = PM_PACK_NATIVE_ENDIAN;
+            *size = PM_PACK_SIZE_INT;
+            break;
+        case 'n':
+            *type = PM_PACK_INTEGER;
+            *signed_type = PM_PACK_UNSIGNED;
+            *endian = PM_PACK_BIG_ENDIAN;
+            *size = PM_PACK_SIZE_16;
+            length_changed_allowed = false;
+            break;
+        case 'N':
+            *type = PM_PACK_INTEGER;
+            *signed_type = PM_PACK_UNSIGNED;
+            *endian = PM_PACK_BIG_ENDIAN;
+            *size = PM_PACK_SIZE_32;
+            length_changed_allowed = false;
+            break;
+        case 'v':
+            *type = PM_PACK_INTEGER;
+            *signed_type = PM_PACK_UNSIGNED;
+            *endian = PM_PACK_LITTLE_ENDIAN;
+            *size = PM_PACK_SIZE_16;
+            length_changed_allowed = false;
+            break;
+        case 'V':
+            *type = PM_PACK_INTEGER;
+            *signed_type = PM_PACK_UNSIGNED;
+            *endian = PM_PACK_LITTLE_ENDIAN;
+            *size = PM_PACK_SIZE_32;
+            length_changed_allowed = false;
+            break;
+        case 'U':
+            *type = PM_PACK_UTF8;
+            *signed_type = PM_PACK_SIGNED_NA;
+            *endian = PM_PACK_ENDIAN_NA;
+            *size = PM_PACK_SIZE_NA;
+            break;
+        case 'w':
+            *type = PM_PACK_BER;
+            *signed_type = PM_PACK_SIGNED_NA;
+            *endian = PM_PACK_ENDIAN_NA;
+            *size = PM_PACK_SIZE_NA;
+            break;
+        case 'D':
+        case 'd':
+            *type = PM_PACK_FLOAT;
+            *signed_type = PM_PACK_SIGNED_NA;
+            *endian = PM_PACK_NATIVE_ENDIAN;
+            *size = PM_PACK_SIZE_64;
+            break;
+        case 'F':
+        case 'f':
+            *type = PM_PACK_FLOAT;
+            *signed_type = PM_PACK_SIGNED_NA;
+            *endian = PM_PACK_NATIVE_ENDIAN;
+            *size = PM_PACK_SIZE_32;
+            break;
+        case 'E':
+            *type = PM_PACK_FLOAT;
+            *signed_type = PM_PACK_SIGNED_NA;
+            *endian = PM_PACK_LITTLE_ENDIAN;
+            *size = PM_PACK_SIZE_64;
+            break;
+        case 'e':
+            *type = PM_PACK_FLOAT;
+            *signed_type = PM_PACK_SIGNED_NA;
+            *endian = PM_PACK_LITTLE_ENDIAN;
+            *size = PM_PACK_SIZE_32;
+            break;
+        case 'G':
+            *type = PM_PACK_FLOAT;
+            *signed_type = PM_PACK_SIGNED_NA;
+            *endian = PM_PACK_BIG_ENDIAN;
+            *size = PM_PACK_SIZE_64;
+            break;
+        case 'g':
+            *type = PM_PACK_FLOAT;
+            *signed_type = PM_PACK_SIGNED_NA;
+            *endian = PM_PACK_BIG_ENDIAN;
+            *size = PM_PACK_SIZE_32;
+            break;
+        case 'A':
+            *type = PM_PACK_STRING_SPACE_PADDED;
+            *signed_type = PM_PACK_SIGNED_NA;
+            *endian = PM_PACK_ENDIAN_NA;
+            *size = PM_PACK_SIZE_NA;
+            break;
+        case 'a':
+            *type = PM_PACK_STRING_NULL_PADDED;
+            *signed_type = PM_PACK_SIGNED_NA;
+            *endian = PM_PACK_ENDIAN_NA;
+            *size = PM_PACK_SIZE_NA;
+            break;
+        case 'Z':
+            *type = PM_PACK_STRING_NULL_TERMINATED;
+            *signed_type = PM_PACK_SIGNED_NA;
+            *endian = PM_PACK_ENDIAN_NA;
+            *size = PM_PACK_SIZE_NA;
+            break;
+        case 'B':
+            *type = PM_PACK_STRING_MSB;
+            *signed_type = PM_PACK_SIGNED_NA;
+            *endian = PM_PACK_ENDIAN_NA;
+            *size = PM_PACK_SIZE_NA;
+            break;
+        case 'b':
+            *type = PM_PACK_STRING_LSB;
+            *signed_type = PM_PACK_SIGNED_NA;
+            *endian = PM_PACK_ENDIAN_NA;
+            *size = PM_PACK_SIZE_NA;
+            break;
+        case 'H':
+            *type = PM_PACK_STRING_HEX_HIGH;
+            *signed_type = PM_PACK_SIGNED_NA;
+            *endian = PM_PACK_ENDIAN_NA;
+            *size = PM_PACK_SIZE_NA;
+            break;
+        case 'h':
+            *type = PM_PACK_STRING_HEX_LOW;
+            *signed_type = PM_PACK_SIGNED_NA;
+            *endian = PM_PACK_ENDIAN_NA;
+            *size = PM_PACK_SIZE_NA;
+            break;
+        case 'u':
+            *type = PM_PACK_STRING_UU;
+            *signed_type = PM_PACK_SIGNED_NA;
+            *endian = PM_PACK_ENDIAN_NA;
+            *size = PM_PACK_SIZE_NA;
+            break;
+        case 'M':
+            *type = PM_PACK_STRING_MIME;
+            *signed_type = PM_PACK_SIGNED_NA;
+            *endian = PM_PACK_ENDIAN_NA;
+            *size = PM_PACK_SIZE_NA;
+            break;
+        case 'm':
+            *type = PM_PACK_STRING_BASE64;
+            *signed_type = PM_PACK_SIGNED_NA;
+            *endian = PM_PACK_ENDIAN_NA;
+            *size = PM_PACK_SIZE_NA;
+            break;
+        case 'P':
+            *type = PM_PACK_STRING_FIXED;
+            *signed_type = PM_PACK_SIGNED_NA;
+            *endian = PM_PACK_ENDIAN_NA;
+            *size = PM_PACK_SIZE_NA;
+            break;
+        case 'p':
+            *type = PM_PACK_STRING_POINTER;
+            *signed_type = PM_PACK_SIGNED_NA;
+            *endian = PM_PACK_ENDIAN_NA;
+            *size = PM_PACK_SIZE_NA;
+            break;
+        case '@':
+            *type = PM_PACK_MOVE;
+            *signed_type = PM_PACK_SIGNED_NA;
+            *endian = PM_PACK_ENDIAN_NA;
+            *size = PM_PACK_SIZE_NA;
+            break;
+        case 'X':
+            *type = PM_PACK_BACK;
+            *signed_type = PM_PACK_SIGNED_NA;
+            *endian = PM_PACK_ENDIAN_NA;
+            *size = PM_PACK_SIZE_NA;
+            break;
+        case 'x':
+            *type = PM_PACK_NULL;
+            *signed_type = PM_PACK_SIGNED_NA;
+            *endian = PM_PACK_ENDIAN_NA;
+            *size = PM_PACK_SIZE_NA;
+            break;
+        case '%':
+            return PM_PACK_ERROR_UNSUPPORTED_DIRECTIVE;
+        default:
+            return PM_PACK_ERROR_UNKNOWN_DIRECTIVE;
+    }
+
+    bool explicit_endian = false;
+
+    while (*format < format_end) {
+        switch (**format) {
+            case '_':
+            case '!':
+                (*format)++;
+                if (*type != PM_PACK_INTEGER || !length_changed_allowed) {
+                    return PM_PACK_ERROR_BANG_NOT_ALLOWED;
+                }
+                switch (*size) {
+                    case PM_PACK_SIZE_SHORT:
+                    case PM_PACK_SIZE_INT:
+                    case PM_PACK_SIZE_LONG:
+                    case PM_PACK_SIZE_LONG_LONG:
+                        break;
+                    case PM_PACK_SIZE_16:
+                        *size = PM_PACK_SIZE_SHORT;
+                        break;
+                    case PM_PACK_SIZE_32:
+                        *size = PM_PACK_SIZE_LONG;
+                        break;
+                    case PM_PACK_SIZE_64:
+                        *size = PM_PACK_SIZE_LONG_LONG;
+                        break;
+                    case PM_PACK_SIZE_P:
+                        break;
+                    default:
+                        return PM_PACK_ERROR_BANG_NOT_ALLOWED;
+                }
+                break;
+            case '<':
+                (*format)++;
+                if (explicit_endian) {
+                    return PM_PACK_ERROR_DOUBLE_ENDIAN;
+                }
+                *endian = PM_PACK_LITTLE_ENDIAN;
+                explicit_endian = true;
+                break;
+            case '>':
+                (*format)++;
+                if (explicit_endian) {
+                    return PM_PACK_ERROR_DOUBLE_ENDIAN;
+                }
+                *endian = PM_PACK_BIG_ENDIAN;
+                explicit_endian = true;
+                break;
+            default:
+                goto exit_modifier_loop;
+        }
+    }
+
+exit_modifier_loop:
+
+    if (variant == PM_PACK_VARIANT_UNPACK && *type == PM_PACK_MOVE) {
+        *length = 0;
+    }
+
+    if (*format < format_end) {
+        if (**format == '*') {
+            switch (*type) {
+                case PM_PACK_NULL:
+                case PM_PACK_BACK:
+                    switch (variant) {
+                        case PM_PACK_VARIANT_PACK:
+                            *length_type = PM_PACK_LENGTH_FIXED;
+                            break;
+                        case PM_PACK_VARIANT_UNPACK:
+                            *length_type = PM_PACK_LENGTH_MAX;
+                            break;
+                    }
+                    *length = 0;
+                    break;
+
+                case PM_PACK_MOVE:
+                    switch (variant) {
+                        case PM_PACK_VARIANT_PACK:
+                            *length_type = PM_PACK_LENGTH_FIXED;
+                            break;
+                        case PM_PACK_VARIANT_UNPACK:
+                            *length_type = PM_PACK_LENGTH_RELATIVE;
+                            break;
+                    }
+                    *length = 0;
+                    break;
+
+                case PM_PACK_STRING_UU:
+                    *length_type = PM_PACK_LENGTH_FIXED;
+                    *length = 0;
+                    break;
+
+                case PM_PACK_STRING_FIXED:
+                    switch (variant) {
+                        case PM_PACK_VARIANT_PACK:
+                            *length_type = PM_PACK_LENGTH_FIXED;
+                            *length = 1;
+                            break;
+                        case PM_PACK_VARIANT_UNPACK:
+                            *length_type = PM_PACK_LENGTH_MAX;
+                            *length = 0;
+                            break;
+                    }
+                    break;
+
+                case PM_PACK_STRING_MIME:
+                case PM_PACK_STRING_BASE64:
+                    *length_type = PM_PACK_LENGTH_FIXED;
+                    *length = 1;
+                    break;
+
+                default:
+                    *length_type = PM_PACK_LENGTH_MAX;
+                    *length = 0;
+                    break;
+            }
+
+            (*format)++;
+        } else if (**format >= '0' && **format <= '9') {
+            errno = 0;
+            *length_type = PM_PACK_LENGTH_FIXED;
+            #if UINTMAX_MAX < UINT64_MAX
+                #error "prism's design assumes uintmax_t is at least as large as uint64_t"
+            #endif
+            uintmax_t length_max = strtoumaxc(format);
+            if (errno || length_max > UINT64_MAX) {
+                return PM_PACK_ERROR_LENGTH_TOO_BIG;
+            }
+            *length = (uint64_t) length_max;
+        }
+    }
+
+    switch (*type) {
+        case PM_PACK_UTF8:
+            /* if encoding is US-ASCII, upgrade to UTF-8 */
+            if (*encoding == PM_PACK_ENCODING_US_ASCII) {
+                *encoding = PM_PACK_ENCODING_UTF_8;
+            }
+            break;
+        case PM_PACK_STRING_MIME:
+        case PM_PACK_STRING_BASE64:
+        case PM_PACK_STRING_UU:
+            /* keep US-ASCII (do nothing) */
+            break;
+        default:
+            /* fall back to BINARY */
+            *encoding = PM_PACK_ENCODING_ASCII_8BIT;
+            break;
+    }
+
+    return PM_PACK_OK;
+}
+
+PRISM_EXPORTED_FUNCTION size_t
+pm_size_to_native(pm_pack_size size) {
+    switch (size) {
+        case PM_PACK_SIZE_SHORT:
+            return sizeof(short);
+        case PM_PACK_SIZE_INT:
+            return sizeof(int);
+        case PM_PACK_SIZE_LONG:
+            return sizeof(long);
+        case PM_PACK_SIZE_LONG_LONG:
+            return sizeof(long long);
+        case PM_PACK_SIZE_8:
+            return 1;
+        case PM_PACK_SIZE_16:
+            return 2;
+        case PM_PACK_SIZE_32:
+            return 4;
+        case PM_PACK_SIZE_64:
+            return 8;
+        case PM_PACK_SIZE_P:
+            return sizeof(void *);
+        default:
+            return 0;
+    }
+}
+
+#endif
diff --git a/prism/pack.h b/prism/pack.h
new file mode 100644
index 00000000000000..0b0b4b19cc85d4
--- /dev/null
+++ b/prism/pack.h
@@ -0,0 +1,163 @@
+/**
+ * @file pack.h
+ *
+ * A pack template string parser.
+ */
+#ifndef PRISM_PACK_H
+#define PRISM_PACK_H
+
+#include "prism/defines.h"
+
+// We optionally support parsing String#pack templates. For systems that don't
+// want or need this functionality, it can be turned off with the
+// PRISM_EXCLUDE_PACK define.
+#ifdef PRISM_EXCLUDE_PACK
+
+void pm_pack_parse(void);
+
+#else
+
+#include <stdint.h>
+#include <stdlib.h>
+
+/** The version of the pack template language that we are parsing. */
+typedef enum pm_pack_version {
+    PM_PACK_VERSION_3_2_0
+} pm_pack_version;
+
+/** The type of pack template we are parsing. */
+typedef enum pm_pack_variant {
+    PM_PACK_VARIANT_PACK,
+    PM_PACK_VARIANT_UNPACK
+} pm_pack_variant;
+
+/** A directive within the pack template. */
+typedef enum pm_pack_type {
+    PM_PACK_SPACE,
+    PM_PACK_COMMENT,
+    PM_PACK_INTEGER,
+    PM_PACK_UTF8,
+    PM_PACK_BER,
+    PM_PACK_FLOAT,
+    PM_PACK_STRING_SPACE_PADDED,
+    PM_PACK_STRING_NULL_PADDED,
+    PM_PACK_STRING_NULL_TERMINATED,
+    PM_PACK_STRING_MSB,
+    PM_PACK_STRING_LSB,
+    PM_PACK_STRING_HEX_HIGH,
+    PM_PACK_STRING_HEX_LOW,
+    PM_PACK_STRING_UU,
+    PM_PACK_STRING_MIME,
+    PM_PACK_STRING_BASE64,
+    PM_PACK_STRING_FIXED,
+    PM_PACK_STRING_POINTER,
+    PM_PACK_MOVE,
+    PM_PACK_BACK,
+    PM_PACK_NULL,
+    PM_PACK_END
+} pm_pack_type;
+
+/** The signness of a pack directive. */
+typedef enum pm_pack_signed {
+    PM_PACK_UNSIGNED,
+    PM_PACK_SIGNED,
+    PM_PACK_SIGNED_NA
+} pm_pack_signed;
+
+/** The endianness of a pack directive. */
+typedef enum pm_pack_endian {
+    PM_PACK_AGNOSTIC_ENDIAN,
+    PM_PACK_LITTLE_ENDIAN,      // aka 'VAX', or 'V'
+    PM_PACK_BIG_ENDIAN,         // aka 'network', or 'N'
+    PM_PACK_NATIVE_ENDIAN,
+    PM_PACK_ENDIAN_NA
+} pm_pack_endian;
+
+/** The size of an integer pack directive. */
+typedef enum pm_pack_size {
+    PM_PACK_SIZE_SHORT,
+    PM_PACK_SIZE_INT,
+    PM_PACK_SIZE_LONG,
+    PM_PACK_SIZE_LONG_LONG,
+    PM_PACK_SIZE_8,
+    PM_PACK_SIZE_16,
+    PM_PACK_SIZE_32,
+    PM_PACK_SIZE_64,
+    PM_PACK_SIZE_P,
+    PM_PACK_SIZE_NA
+} pm_pack_size;
+
+/** The type of length of a pack directive. */
+typedef enum pm_pack_length_type {
+    PM_PACK_LENGTH_FIXED,
+    PM_PACK_LENGTH_MAX,
+    PM_PACK_LENGTH_RELATIVE,  // special case for unpack @*
+    PM_PACK_LENGTH_NA
+} pm_pack_length_type;
+
+/** The type of encoding for a pack template string. */
+typedef enum pm_pack_encoding {
+    PM_PACK_ENCODING_START,
+    PM_PACK_ENCODING_ASCII_8BIT,
+    PM_PACK_ENCODING_US_ASCII,
+    PM_PACK_ENCODING_UTF_8
+} pm_pack_encoding;
+
+/** The result of parsing a pack template. */
+typedef enum pm_pack_result {
+    PM_PACK_OK,
+    PM_PACK_ERROR_UNSUPPORTED_DIRECTIVE,
+    PM_PACK_ERROR_UNKNOWN_DIRECTIVE,
+    PM_PACK_ERROR_LENGTH_TOO_BIG,
+    PM_PACK_ERROR_BANG_NOT_ALLOWED,
+    PM_PACK_ERROR_DOUBLE_ENDIAN
+} pm_pack_result;
+
+/**
+ * Parse a single directive from a pack or unpack format string.
+ *
+ * @param variant (in) pack or unpack
+ * @param format (in, out) the start of the next directive to parse on calling,
+ *     and advanced beyond the parsed directive on return, or as much of it as
+ *     was consumed until an error was encountered
+ * @param format_end (in) the end of the format string
+ * @param type (out) the type of the directive
+ * @param signed_type (out) whether the value is signed
+ * @param endian (out) the endianness of the value
+ * @param size (out) the size of the value
+ * @param length_type (out) what kind of length is specified
+ * @param length (out) the length of the directive
+ * @param encoding (in, out) takes the current encoding of the string which
+ *     would result from parsing the whole format string, and returns a possibly
+ *     changed directive - the encoding should be `PM_PACK_ENCODING_START` when
+ *     pm_pack_parse is called for the first directive in a format string
+ *
+ * @return `PM_PACK_OK` on success or `PM_PACK_ERROR_*` on error
+ * @note Consult Ruby documentation for the meaning of directives.
+ */
+PRISM_EXPORTED_FUNCTION pm_pack_result
+pm_pack_parse(
+    pm_pack_variant variant,
+    const char **format,
+    const char *format_end,
+    pm_pack_type *type,
+    pm_pack_signed *signed_type,
+    pm_pack_endian *endian,
+    pm_pack_size *size,
+    pm_pack_length_type *length_type,
+    uint64_t *length,
+    pm_pack_encoding *encoding
+);
+
+/**
+ * Prism abstracts sizes away from the native system - this converts an abstract
+ * size to a native size.
+ *
+ * @param size The abstract size to convert.
+ * @return The native size.
+ */
+PRISM_EXPORTED_FUNCTION size_t pm_size_to_native(pm_pack_size size);
+
+#endif
+
+#endif
diff --git a/prism/parser.h b/prism/parser.h
new file mode 100644
index 00000000000000..992729d6555b1e
--- /dev/null
+++ b/prism/parser.h
@@ -0,0 +1,933 @@
+/**
+ * @file parser.h
+ *
+ * The parser used to parse Ruby source.
+ */
+#ifndef PRISM_PARSER_H
+#define PRISM_PARSER_H
+
+#include "prism/defines.h"
+#include "prism/ast.h"
+#include "prism/encoding.h"
+#include "prism/options.h"
+#include "prism/static_literals.h"
+#include "prism/util/pm_constant_pool.h"
+#include "prism/util/pm_list.h"
+#include "prism/util/pm_newline_list.h"
+#include "prism/util/pm_string.h"
+
+#include <stdbool.h>
+
+/**
+ * This enum provides various bits that represent different kinds of states that
+ * the lexer can track. This is used to determine which kind of token to return
+ * based on the context of the parser.
+ */
+typedef enum {
+    PM_LEX_STATE_BIT_BEG,
+    PM_LEX_STATE_BIT_END,
+    PM_LEX_STATE_BIT_ENDARG,
+    PM_LEX_STATE_BIT_ENDFN,
+    PM_LEX_STATE_BIT_ARG,
+    PM_LEX_STATE_BIT_CMDARG,
+    PM_LEX_STATE_BIT_MID,
+    PM_LEX_STATE_BIT_FNAME,
+    PM_LEX_STATE_BIT_DOT,
+    PM_LEX_STATE_BIT_CLASS,
+    PM_LEX_STATE_BIT_LABEL,
+    PM_LEX_STATE_BIT_LABELED,
+    PM_LEX_STATE_BIT_FITEM
+} pm_lex_state_bit_t;
+
+/**
+ * This enum combines the various bits from the above enum into individual
+ * values that represent the various states of the lexer.
+ */
+typedef enum {
+    PM_LEX_STATE_NONE = 0,
+    PM_LEX_STATE_BEG = (1 << PM_LEX_STATE_BIT_BEG),
+    PM_LEX_STATE_END = (1 << PM_LEX_STATE_BIT_END),
+    PM_LEX_STATE_ENDARG = (1 << PM_LEX_STATE_BIT_ENDARG),
+    PM_LEX_STATE_ENDFN = (1 << PM_LEX_STATE_BIT_ENDFN),
+    PM_LEX_STATE_ARG = (1 << PM_LEX_STATE_BIT_ARG),
+    PM_LEX_STATE_CMDARG = (1 << PM_LEX_STATE_BIT_CMDARG),
+    PM_LEX_STATE_MID = (1 << PM_LEX_STATE_BIT_MID),
+    PM_LEX_STATE_FNAME = (1 << PM_LEX_STATE_BIT_FNAME),
+    PM_LEX_STATE_DOT = (1 << PM_LEX_STATE_BIT_DOT),
+    PM_LEX_STATE_CLASS = (1 << PM_LEX_STATE_BIT_CLASS),
+    PM_LEX_STATE_LABEL = (1 << PM_LEX_STATE_BIT_LABEL),
+    PM_LEX_STATE_LABELED = (1 << PM_LEX_STATE_BIT_LABELED),
+    PM_LEX_STATE_FITEM = (1 << PM_LEX_STATE_BIT_FITEM),
+    PM_LEX_STATE_BEG_ANY = PM_LEX_STATE_BEG | PM_LEX_STATE_MID | PM_LEX_STATE_CLASS,
+    PM_LEX_STATE_ARG_ANY = PM_LEX_STATE_ARG | PM_LEX_STATE_CMDARG,
+    PM_LEX_STATE_END_ANY = PM_LEX_STATE_END | PM_LEX_STATE_ENDARG | PM_LEX_STATE_ENDFN
+} pm_lex_state_t;
+
+/**
+ * The type of quote that a heredoc uses.
+ */
+typedef enum {
+    PM_HEREDOC_QUOTE_NONE,
+    PM_HEREDOC_QUOTE_SINGLE = '\'',
+    PM_HEREDOC_QUOTE_DOUBLE = '"',
+    PM_HEREDOC_QUOTE_BACKTICK = '`',
+} pm_heredoc_quote_t;
+
+/**
+ * The type of indentation that a heredoc uses.
+ */
+typedef enum {
+    PM_HEREDOC_INDENT_NONE,
+    PM_HEREDOC_INDENT_DASH,
+    PM_HEREDOC_INDENT_TILDE,
+} pm_heredoc_indent_t;
+
+/**
+ * All of the information necessary to store to lexing a heredoc.
+ */
+typedef struct {
+    /** A pointer to the start of the heredoc identifier. */
+    const uint8_t *ident_start;
+
+    /** The length of the heredoc identifier. */
+    size_t ident_length;
+
+    /** The type of quote that the heredoc uses. */
+    pm_heredoc_quote_t quote;
+
+    /** The type of indentation that the heredoc uses. */
+    pm_heredoc_indent_t indent;
+} pm_heredoc_lex_mode_t;
+
+/**
+ * When lexing Ruby source, the lexer has a small amount of state to tell which
+ * kind of token it is currently lexing. For example, when we find the start of
+ * a string, the first token that we return is a TOKEN_STRING_BEGIN token. After
+ * that the lexer is now in the PM_LEX_STRING mode, and will return tokens that
+ * are found as part of a string.
+ */
+typedef struct pm_lex_mode {
+    /** The type of this lex mode. */
+    enum {
+        /** This state is used when any given token is being lexed. */
+        PM_LEX_DEFAULT,
+
+        /**
+         * This state is used when we're lexing as normal but inside an embedded
+         * expression of a string.
+         */
+        PM_LEX_EMBEXPR,
+
+        /**
+         * This state is used when we're lexing a variable that is embedded
+         * directly inside of a string with the # shorthand.
+         */
+        PM_LEX_EMBVAR,
+
+        /** This state is used when you are inside the content of a heredoc. */
+        PM_LEX_HEREDOC,
+
+        /**
+         * This state is used when we are lexing a list of tokens, as in a %w
+         * word list literal or a %i symbol list literal.
+         */
+        PM_LEX_LIST,
+
+        /**
+         * This state is used when a regular expression has been begun and we
+         * are looking for the terminator.
+         */
+        PM_LEX_REGEXP,
+
+        /**
+         * This state is used when we are lexing a string or a string-like
+         * token, as in string content with either quote or an xstring.
+         */
+        PM_LEX_STRING
+    } mode;
+
+    /** The data associated with this type of lex mode. */
+    union {
+        struct {
+            /** This keeps track of the nesting level of the list. */
+            size_t nesting;
+
+            /** Whether or not interpolation is allowed in this list. */
+            bool interpolation;
+
+            /**
+             * When lexing a list, it takes into account balancing the
+             * terminator if the terminator is one of (), [], {}, or <>.
+             */
+            uint8_t incrementor;
+
+            /** This is the terminator of the list literal. */
+            uint8_t terminator;
+
+            /**
+             * This is the character set that should be used to delimit the
+             * tokens within the list.
+             */
+            uint8_t breakpoints[11];
+        } list;
+
+        struct {
+            /**
+             * This keeps track of the nesting level of the regular expression.
+             */
+            size_t nesting;
+
+            /**
+             * When lexing a regular expression, it takes into account balancing
+             * the terminator if the terminator is one of (), [], {}, or <>.
+             */
+            uint8_t incrementor;
+
+            /** This is the terminator of the regular expression. */
+            uint8_t terminator;
+
+            /**
+             * This is the character set that should be used to delimit the
+             * tokens within the regular expression.
+             */
+            uint8_t breakpoints[7];
+        } regexp;
+
+        struct {
+            /** This keeps track of the nesting level of the string. */
+            size_t nesting;
+
+            /** Whether or not interpolation is allowed in this string. */
+            bool interpolation;
+
+            /**
+             * Whether or not at the end of the string we should allow a :,
+             * which would indicate this was a dynamic symbol instead of a
+             * string.
+             */
+            bool label_allowed;
+
+            /**
+             * When lexing a string, it takes into account balancing the
+             * terminator if the terminator is one of (), [], {}, or <>.
+             */
+            uint8_t incrementor;
+
+            /**
+             * This is the terminator of the string. It is typically either a
+             * single or double quote.
+             */
+            uint8_t terminator;
+
+            /**
+             * This is the character set that should be used to delimit the
+             * tokens within the string.
+             */
+            uint8_t breakpoints[7];
+        } string;
+
+        struct {
+            /**
+             * All of the data necessary to lex a heredoc.
+             */
+            pm_heredoc_lex_mode_t base;
+
+            /**
+             * This is the pointer to the character where lexing should resume
+             * once the heredoc has been completely processed.
+             */
+            const uint8_t *next_start;
+
+            /**
+             * This is used to track the amount of common whitespace on each
+             * line so that we know how much to dedent each line in the case of
+             * a tilde heredoc.
+             */
+            size_t *common_whitespace;
+
+            /** True if the previous token ended with a line continuation. */
+            bool line_continuation;
+        } heredoc;
+    } as;
+
+    /** The previous lex state so that it knows how to pop. */
+    struct pm_lex_mode *prev;
+} pm_lex_mode_t;
+
+/**
+ * We pre-allocate a certain number of lex states in order to avoid having to
+ * call malloc too many times while parsing. You really shouldn't need more than
+ * this because you only really nest deeply when doing string interpolation.
+ */
+#define PM_LEX_STACK_SIZE 4
+
+/**
+ * The parser used to parse Ruby source.
+ */
+typedef struct pm_parser pm_parser_t;
+
+/**
+ * While parsing, we keep track of a stack of contexts. This is helpful for
+ * error recovery so that we can pop back to a previous context when we hit a
+ * token that is understood by a parent context but not by the current context.
+ */
+typedef enum {
+    /** a null context, used for returning a value from a function */
+    PM_CONTEXT_NONE = 0,
+
+    /** a begin statement */
+    PM_CONTEXT_BEGIN,
+
+    /** an ensure statement with an explicit begin */
+    PM_CONTEXT_BEGIN_ENSURE,
+
+    /** a rescue else statement with an explicit begin */
+    PM_CONTEXT_BEGIN_ELSE,
+
+    /** a rescue statement with an explicit begin */
+    PM_CONTEXT_BEGIN_RESCUE,
+
+    /** expressions in block arguments using braces */
+    PM_CONTEXT_BLOCK_BRACES,
+
+    /** expressions in block arguments using do..end */
+    PM_CONTEXT_BLOCK_KEYWORDS,
+
+    /** an ensure statement within a do..end block */
+    PM_CONTEXT_BLOCK_ENSURE,
+
+    /** a rescue else statement within a do..end block */
+    PM_CONTEXT_BLOCK_ELSE,
+
+    /** a rescue statement within a do..end block */
+    PM_CONTEXT_BLOCK_RESCUE,
+
+    /** a case when statements */
+    PM_CONTEXT_CASE_WHEN,
+
+    /** a case in statements */
+    PM_CONTEXT_CASE_IN,
+
+    /** a class declaration */
+    PM_CONTEXT_CLASS,
+
+    /** an ensure statement within a class statement */
+    PM_CONTEXT_CLASS_ENSURE,
+
+    /** a rescue else statement within a class statement */
+    PM_CONTEXT_CLASS_ELSE,
+
+    /** a rescue statement within a class statement */
+    PM_CONTEXT_CLASS_RESCUE,
+
+    /** a method definition */
+    PM_CONTEXT_DEF,
+
+    /** an ensure statement within a method definition */
+    PM_CONTEXT_DEF_ENSURE,
+
+    /** a rescue else statement within a method definition */
+    PM_CONTEXT_DEF_ELSE,
+
+    /** a rescue statement within a method definition */
+    PM_CONTEXT_DEF_RESCUE,
+
+    /** a method definition's parameters */
+    PM_CONTEXT_DEF_PARAMS,
+
+    /** a defined? expression */
+    PM_CONTEXT_DEFINED,
+
+    /** a method definition's default parameter */
+    PM_CONTEXT_DEFAULT_PARAMS,
+
+    /** an else clause */
+    PM_CONTEXT_ELSE,
+
+    /** an elsif clause */
+    PM_CONTEXT_ELSIF,
+
+    /** an interpolated expression */
+    PM_CONTEXT_EMBEXPR,
+
+    /** a for loop */
+    PM_CONTEXT_FOR,
+
+    /** a for loop's index */
+    PM_CONTEXT_FOR_INDEX,
+
+    /** an if statement */
+    PM_CONTEXT_IF,
+
+    /** a lambda expression with braces */
+    PM_CONTEXT_LAMBDA_BRACES,
+
+    /** a lambda expression with do..end */
+    PM_CONTEXT_LAMBDA_DO_END,
+
+    /** an ensure statement within a lambda expression */
+    PM_CONTEXT_LAMBDA_ENSURE,
+
+    /** a rescue else statement within a lambda expression */
+    PM_CONTEXT_LAMBDA_ELSE,
+
+    /** a rescue statement within a lambda expression */
+    PM_CONTEXT_LAMBDA_RESCUE,
+
+    /** the predicate clause of a loop statement */
+    PM_CONTEXT_LOOP_PREDICATE,
+
+    /** the top level context */
+    PM_CONTEXT_MAIN,
+
+    /** a module declaration */
+    PM_CONTEXT_MODULE,
+
+    /** an ensure statement within a module statement */
+    PM_CONTEXT_MODULE_ENSURE,
+
+    /** a rescue else statement within a module statement */
+    PM_CONTEXT_MODULE_ELSE,
+
+    /** a rescue statement within a module statement */
+    PM_CONTEXT_MODULE_RESCUE,
+
+    /** a multiple target expression */
+    PM_CONTEXT_MULTI_TARGET,
+
+    /** a parenthesized expression */
+    PM_CONTEXT_PARENS,
+
+    /** an END block */
+    PM_CONTEXT_POSTEXE,
+
+    /** a predicate inside an if/elsif/unless statement */
+    PM_CONTEXT_PREDICATE,
+
+    /** a BEGIN block */
+    PM_CONTEXT_PREEXE,
+
+    /** a modifier rescue clause */
+    PM_CONTEXT_RESCUE_MODIFIER,
+
+    /** a singleton class definition */
+    PM_CONTEXT_SCLASS,
+
+    /** an ensure statement with a singleton class */
+    PM_CONTEXT_SCLASS_ENSURE,
+
+    /** a rescue else statement with a singleton class */
+    PM_CONTEXT_SCLASS_ELSE,
+
+    /** a rescue statement with a singleton class */
+    PM_CONTEXT_SCLASS_RESCUE,
+
+    /** a ternary expression */
+    PM_CONTEXT_TERNARY,
+
+    /** an unless statement */
+    PM_CONTEXT_UNLESS,
+
+    /** an until statement */
+    PM_CONTEXT_UNTIL,
+
+    /** a while statement */
+    PM_CONTEXT_WHILE,
+} pm_context_t;
+
+/** This is a node in a linked list of contexts. */
+typedef struct pm_context_node {
+    /** The context that this node represents. */
+    pm_context_t context;
+
+    /** A pointer to the previous context in the linked list. */
+    struct pm_context_node *prev;
+} pm_context_node_t;
+
+/** This is the type of a comment that we've found while parsing. */
+typedef enum {
+    PM_COMMENT_INLINE,
+    PM_COMMENT_EMBDOC
+} pm_comment_type_t;
+
+/**
+ * This is a node in the linked list of comments that we've found while parsing.
+ *
+ * @extends pm_list_node_t
+ */
+typedef struct pm_comment {
+    /** The embedded base node. */
+    pm_list_node_t node;
+
+    /** The location of the comment in the source. */
+    pm_location_t location;
+
+    /** The type of comment that we've found. */
+    pm_comment_type_t type;
+} pm_comment_t;
+
+/**
+ * This is a node in the linked list of magic comments that we've found while
+ * parsing.
+ *
+ * @extends pm_list_node_t
+ */
+typedef struct {
+    /** The embedded base node. */
+    pm_list_node_t node;
+
+    /** A pointer to the start of the key in the source. */
+    const uint8_t *key_start;
+
+    /** A pointer to the start of the value in the source. */
+    const uint8_t *value_start;
+
+    /** The length of the key in the source. */
+    uint32_t key_length;
+
+    /** The length of the value in the source. */
+    uint32_t value_length;
+} pm_magic_comment_t;
+
+/**
+ * When the encoding that is being used to parse the source is changed by prism,
+ * we provide the ability here to call out to a user-defined function.
+ */
+typedef void (*pm_encoding_changed_callback_t)(pm_parser_t *parser);
+
+/**
+ * When you are lexing through a file, the lexer needs all of the information
+ * that the parser additionally provides (for example, the local table). So if
+ * you want to properly lex Ruby, you need to actually lex it in the context of
+ * the parser. In order to provide this functionality, we optionally allow a
+ * struct to be attached to the parser that calls back out to a user-provided
+ * callback when each token is lexed.
+ */
+typedef struct {
+    /**
+     * This opaque pointer is used to provide whatever information the user
+     * deemed necessary to the callback. In our case we use it to pass the array
+     * that the tokens get appended into.
+     */
+    void *data;
+
+    /**
+     * This is the callback that is called when a token is lexed. It is passed
+     * the opaque data pointer, the parser, and the token that was lexed.
+     */
+    void (*callback)(void *data, pm_parser_t *parser, pm_token_t *token);
+} pm_lex_callback_t;
+
+/** The type of shareable constant value that can be set. */
+typedef uint8_t pm_shareable_constant_value_t;
+static const pm_shareable_constant_value_t PM_SCOPE_SHAREABLE_CONSTANT_NONE = 0x0;
+static const pm_shareable_constant_value_t PM_SCOPE_SHAREABLE_CONSTANT_LITERAL = PM_SHAREABLE_CONSTANT_NODE_FLAGS_LITERAL;
+static const pm_shareable_constant_value_t PM_SCOPE_SHAREABLE_CONSTANT_EXPERIMENTAL_EVERYTHING = PM_SHAREABLE_CONSTANT_NODE_FLAGS_EXPERIMENTAL_EVERYTHING;
+static const pm_shareable_constant_value_t PM_SCOPE_SHAREABLE_CONSTANT_EXPERIMENTAL_COPY = PM_SHAREABLE_CONSTANT_NODE_FLAGS_EXPERIMENTAL_COPY;
+
+/**
+ * This tracks an individual local variable in a certain lexical context, as
+ * well as the number of times is it read.
+ */
+typedef struct {
+    /** The name of the local variable. */
+    pm_constant_id_t name;
+
+    /** The location of the local variable in the source. */
+    pm_location_t location;
+
+    /** The index of the local variable in the local table. */
+    uint32_t index;
+
+    /** The number of times the local variable is read. */
+    uint32_t reads;
+
+    /** The hash of the local variable. */
+    uint32_t hash;
+} pm_local_t;
+
+/**
+ * This is a set of local variables in a certain lexical context (method, class,
+ * module, etc.). We need to track how many times these variables are read in
+ * order to warn if they only get written.
+ */
+typedef struct pm_locals {
+    /** The number of local variables in the set. */
+    uint32_t size;
+
+    /** The capacity of the local variables set. */
+    uint32_t capacity;
+
+    /** The nullable allocated memory for the local variables in the set. */
+    pm_local_t *locals;
+} pm_locals_t;
+
+/** The flags about scope parameters that can be set. */
+typedef uint8_t pm_scope_parameters_t;
+static const pm_scope_parameters_t PM_SCOPE_PARAMETERS_NONE = 0x0;
+static const pm_scope_parameters_t PM_SCOPE_PARAMETERS_FORWARDING_POSITIONALS = 0x1;
+static const pm_scope_parameters_t PM_SCOPE_PARAMETERS_FORWARDING_KEYWORDS = 0x2;
+static const pm_scope_parameters_t PM_SCOPE_PARAMETERS_FORWARDING_BLOCK = 0x4;
+static const pm_scope_parameters_t PM_SCOPE_PARAMETERS_FORWARDING_ALL = 0x8;
+static const pm_scope_parameters_t PM_SCOPE_PARAMETERS_IMPLICIT_DISALLOWED = 0x10;
+static const pm_scope_parameters_t PM_SCOPE_PARAMETERS_NUMBERED_INNER = 0x20;
+static const pm_scope_parameters_t PM_SCOPE_PARAMETERS_NUMBERED_FOUND = 0x40;
+
+/**
+ * This struct represents a node in a linked list of scopes. Some scopes can see
+ * into their parent scopes, while others cannot.
+ */
+typedef struct pm_scope {
+    /** A pointer to the previous scope in the linked list. */
+    struct pm_scope *previous;
+
+    /** The IDs of the locals in the given scope. */
+    pm_locals_t locals;
+
+    /**
+     * This is a list of the implicit parameters contained within the block.
+     * These will be processed after the block is parsed to determine the kind
+     * of parameters node that should be used and to check if any errors need to
+     * be added.
+     */
+    pm_node_list_t implicit_parameters;
+
+    /**
+     * This is a bitfield that indicates the parameters that are being used in
+     * this scope. It is a combination of the PM_SCOPE_PARAMETERS_* constants.
+     * There are three different kinds of parameters that can be used in a
+     * scope:
+     *
+     * - Ordinary parameters (e.g., def foo(bar); end)
+     * - Numbered parameters (e.g., def foo; _1; end)
+     * - The it parameter (e.g., def foo; it; end)
+     *
+     * If ordinary parameters are being used, then certain parameters can be
+     * forwarded to another method/structure. Those are indicated by four
+     * additional bits in the params field. For example, some combinations of:
+     *
+     * - def foo(*); end
+     * - def foo(**); end
+     * - def foo(&); end
+     * - def foo(...); end
+     */
+    pm_scope_parameters_t parameters;
+
+    /**
+     * The current state of constant shareability for this scope. This is
+     * changed by magic shareable_constant_value comments.
+     */
+    pm_shareable_constant_value_t shareable_constant;
+
+    /**
+     * A boolean indicating whether or not this scope can see into its parent.
+     * If closed is true, then the scope cannot see into its parent.
+     */
+    bool closed;
+} pm_scope_t;
+
+/**
+ * A struct that represents a stack of boolean values.
+ */
+typedef uint32_t pm_state_stack_t;
+
+/**
+ * This struct represents the overall parser. It contains a reference to the
+ * source file, as well as pointers that indicate where in the source it's
+ * currently parsing. It also contains the most recent and current token that
+ * it's considering.
+ */
+struct pm_parser {
+    /**
+     * The next node identifier that will be assigned. This is a unique
+     * identifier used to track nodes such that the syntax tree can be dropped
+     * but the node can be found through another parse.
+     */
+    uint32_t node_id;
+
+    /** The current state of the lexer. */
+    pm_lex_state_t lex_state;
+
+    /** Tracks the current nesting of (), [], and {}. */
+    int enclosure_nesting;
+
+    /**
+     * Used to temporarily track the nesting of enclosures to determine if a {
+     * is the beginning of a lambda following the parameters of a lambda.
+     */
+    int lambda_enclosure_nesting;
+
+    /**
+     * Used to track the nesting of braces to ensure we get the correct value
+     * when we are interpolating blocks with braces.
+     */
+    int brace_nesting;
+
+    /**
+     * The stack used to determine if a do keyword belongs to the predicate of a
+     * while, until, or for loop.
+     */
+    pm_state_stack_t do_loop_stack;
+
+    /**
+     * The stack used to determine if a do keyword belongs to the beginning of a
+     * block.
+     */
+    pm_state_stack_t accepts_block_stack;
+
+    /** A stack of lex modes. */
+    struct {
+        /** The current mode of the lexer. */
+        pm_lex_mode_t *current;
+
+        /** The stack of lexer modes. */
+        pm_lex_mode_t stack[PM_LEX_STACK_SIZE];
+
+        /** The current index into the lexer mode stack. */
+        size_t index;
+    } lex_modes;
+
+    /** The pointer to the start of the source. */
+    const uint8_t *start;
+
+    /** The pointer to the end of the source. */
+    const uint8_t *end;
+
+    /** The previous token we were considering. */
+    pm_token_t previous;
+
+    /** The current token we're considering. */
+    pm_token_t current;
+
+    /**
+     * This is a special field set on the parser when we need the parser to jump
+     * to a specific location when lexing the next token, as opposed to just
+     * using the end of the previous token. Normally this is NULL.
+     */
+    const uint8_t *next_start;
+
+    /**
+     * This field indicates the end of a heredoc whose identifier was found on
+     * the current line. If another heredoc is found on the same line, then this
+     * will be moved forward to the end of that heredoc. If no heredocs are
+     * found on a line then this is NULL.
+     */
+    const uint8_t *heredoc_end;
+
+    /** The list of comments that have been found while parsing. */
+    pm_list_t comment_list;
+
+    /** The list of magic comments that have been found while parsing. */
+    pm_list_t magic_comment_list;
+
+    /**
+     * An optional location that represents the location of the __END__ marker
+     * and the rest of the content of the file. This content is loaded into the
+     * DATA constant when the file being parsed is the main file being executed.
+     */
+    pm_location_t data_loc;
+
+    /** The list of warnings that have been found while parsing. */
+    pm_list_t warning_list;
+
+    /** The list of errors that have been found while parsing. */
+    pm_list_t error_list;
+
+    /** The current local scope. */
+    pm_scope_t *current_scope;
+
+    /** The current parsing context. */
+    pm_context_node_t *current_context;
+
+    /**
+     * The hash keys for the hash that is currently being parsed. This is not
+     * usually necessary because it can pass it down the various call chains,
+     * but in the event that you're parsing a hash that is being directly
+     * pushed into another hash with **, we need to share the hash keys so that
+     * we can warn for the nested hash as well.
+     */
+    pm_static_literals_t *current_hash_keys;
+
+    /**
+     * The encoding functions for the current file is attached to the parser as
+     * it's parsing so that it can change with a magic comment.
+     */
+    const pm_encoding_t *encoding;
+
+    /**
+     * When the encoding that is being used to parse the source is changed by
+     * prism, we provide the ability here to call out to a user-defined
+     * function.
+     */
+    pm_encoding_changed_callback_t encoding_changed_callback;
+
+    /**
+     * This pointer indicates where a comment must start if it is to be
+     * considered an encoding comment.
+     */
+    const uint8_t *encoding_comment_start;
+
+    /**
+     * This is an optional callback that can be attached to the parser that will
+     * be called whenever a new token is lexed by the parser.
+     */
+    pm_lex_callback_t *lex_callback;
+
+    /**
+     * This is the path of the file being parsed. We use the filepath when
+     * constructing SourceFileNodes.
+     */
+    pm_string_t filepath;
+
+    /**
+     * This constant pool keeps all of the constants defined throughout the file
+     * so that we can reference them later.
+     */
+    pm_constant_pool_t constant_pool;
+
+    /** This is the list of newline offsets in the source file. */
+    pm_newline_list_t newline_list;
+
+    /**
+     * We want to add a flag to integer nodes that indicates their base. We only
+     * want to parse these once, but we don't have space on the token itself to
+     * communicate this information. So we store it here and pass it through
+     * when we find tokens that we need it for.
+     */
+    pm_node_flags_t integer_base;
+
+    /**
+     * This string is used to pass information from the lexer to the parser. It
+     * is particularly necessary because of escape sequences.
+     */
+    pm_string_t current_string;
+
+    /**
+     * The line number at the start of the parse. This will be used to offset
+     * the line numbers of all of the locations.
+     */
+    int32_t start_line;
+
+    /**
+     * When a string-like expression is being lexed, any byte or escape sequence
+     * that resolves to a value whose top bit is set (i.e., >= 0x80) will
+     * explicitly set the encoding to the same encoding as the source.
+     * Alternatively, if a unicode escape sequence is used (e.g., \\u{80}) that
+     * resolves to a value whose top bit is set, then the encoding will be
+     * explicitly set to UTF-8.
+     *
+     * The _next_ time this happens, if the encoding that is about to become the
+     * explicitly set encoding does not match the previously set explicit
+     * encoding, a mixed encoding error will be emitted.
+     *
+     * When the expression is finished being lexed, the explicit encoding
+     * controls the encoding of the expression. For the most part this means
+     * that the expression will either be encoded in the source encoding or
+     * UTF-8. This holds for all encodings except US-ASCII. If the source is
+     * US-ASCII and an explicit encoding was set that was _not_ UTF-8, then the
+     * expression will be encoded as ASCII-8BIT.
+     *
+     * Note that if the expression is a list, different elements within the same
+     * list can have different encodings, so this will get reset between each
+     * element. Furthermore all of this only applies to lists that support
+     * interpolation, because otherwise escapes that could change the encoding
+     * are ignored.
+     *
+     * At first glance, it may make more sense for this to live on the lexer
+     * mode, but we need it here to communicate back to the parser for character
+     * literals that do not push a new lexer mode.
+     */
+    const pm_encoding_t *explicit_encoding;
+
+    /**
+     * When parsing block exits (e.g., break, next, redo), we need to validate
+     * that they are in correct contexts. For the most part we can do this by
+     * looking at our parent contexts. However, modifier while and until
+     * expressions can change that context to make block exits valid. In these
+     * cases, we need to keep track of the block exits and then validate them
+     * after the expression has been parsed.
+     *
+     * We use a pointer here because we don't want to keep a whole list attached
+     * since this will only be used in the context of begin/end expressions.
+     */
+    pm_node_list_t *current_block_exits;
+
+    /** The version of prism that we should use to parse. */
+    pm_options_version_t version;
+
+    /** The command line flags given from the options. */
+    uint8_t command_line;
+
+    /**
+     * Whether or not we have found a frozen_string_literal magic comment with
+     * a true or false value.
+     * May be:
+     *  - PM_OPTIONS_FROZEN_STRING_LITERAL_DISABLED
+     *  - PM_OPTIONS_FROZEN_STRING_LITERAL_ENABLED
+     *  - PM_OPTIONS_FROZEN_STRING_LITERAL_UNSET
+     */
+    int8_t frozen_string_literal;
+
+    /**
+     * Whether or not we are parsing an eval string. This impacts whether or not
+     * we should evaluate if block exits/yields are valid.
+     */
+    bool parsing_eval;
+
+    /**
+     * Whether or not we are parsing a "partial" script, which is a script that
+     * will be evaluated in the context of another script, so we should not
+     * check jumps (next/break/etc.) for validity.
+     */
+    bool partial_script;
+
+    /** Whether or not we're at the beginning of a command. */
+    bool command_start;
+
+    /** Whether or not we're currently recovering from a syntax error. */
+    bool recovering;
+
+    /**
+     * This is very specialized behavior for when you want to parse in a context
+     * that does not respect encoding comments. Its main use case is translating
+     * into the whitequark/parser AST which re-encodes source files in UTF-8
+     * before they are parsed and ignores encoding comments.
+     */
+    bool encoding_locked;
+
+    /**
+     * Whether or not the encoding has been changed by a magic comment. We use
+     * this to provide a fast path for the lexer instead of going through the
+     * function pointer.
+     */
+    bool encoding_changed;
+
+    /**
+     * This flag indicates that we are currently parsing a pattern matching
+     * expression and impacts that calculation of newlines.
+     */
+    bool pattern_matching_newlines;
+
+    /** This flag indicates that we are currently parsing a keyword argument. */
+    bool in_keyword_arg;
+
+    /**
+     * Whether or not the parser has seen a token that has semantic meaning
+     * (i.e., a token that is not a comment or whitespace).
+     */
+    bool semantic_token_seen;
+
+    /**
+     * True if the current regular expression being lexed contains only ASCII
+     * characters.
+     */
+    bool current_regular_expression_ascii_only;
+
+    /**
+     * By default, Ruby always warns about mismatched indentation. This can be
+     * toggled with a magic comment.
+     */
+    bool warn_mismatched_indentation;
+};
+
+#endif
diff --git a/prism/prettyprint.h b/prism/prettyprint.h
new file mode 100644
index 00000000000000..5a52b2b6b8eb43
--- /dev/null
+++ b/prism/prettyprint.h
@@ -0,0 +1,34 @@
+/**
+ * @file prettyprint.h
+ *
+ * An AST node pretty-printer.
+ */
+#ifndef PRISM_PRETTYPRINT_H
+#define PRISM_PRETTYPRINT_H
+
+#include "prism/defines.h"
+
+#ifdef PRISM_EXCLUDE_PRETTYPRINT
+
+void pm_prettyprint(void);
+
+#else
+
+#include <stdio.h>
+
+#include "prism/ast.h"
+#include "prism/parser.h"
+#include "prism/util/pm_buffer.h"
+
+/**
+ * Pretty-prints the AST represented by the given node to the given buffer.
+ *
+ * @param output_buffer The buffer to write the pretty-printed AST to.
+ * @param parser The parser that parsed the AST.
+ * @param node The root node of the AST to pretty-print.
+ */
+PRISM_EXPORTED_FUNCTION void pm_prettyprint(pm_buffer_t *output_buffer, const pm_parser_t *parser, const pm_node_t *node);
+
+#endif
+
+#endif
diff --git a/prism/prism.c b/prism/prism.c
new file mode 100644
index 00000000000000..ffe874fe08b475
--- /dev/null
+++ b/prism/prism.c
@@ -0,0 +1,23193 @@
+#include "prism.h"
+
+/**
+ * The prism version and the serialization format.
+ */
+const char *
+pm_version(void) {
+    return PRISM_VERSION;
+}
+
+/**
+ * In heredocs, tabs automatically complete up to the next 8 spaces. This is
+ * defined in CRuby as TAB_WIDTH.
+ */
+#define PM_TAB_WHITESPACE_SIZE 8
+
+// Macros for min/max.
+#define MIN(a,b) (((a)<(b))?(a):(b))
+#define MAX(a,b) (((a)>(b))?(a):(b))
+
+/******************************************************************************/
+/* Lex mode manipulations                                                     */
+/******************************************************************************/
+
+/**
+ * Returns the incrementor character that should be used to increment the
+ * nesting count if one is possible.
+ */
+static inline uint8_t
+lex_mode_incrementor(const uint8_t start) {
+    switch (start) {
+        case '(':
+        case '[':
+        case '{':
+        case '<':
+            return start;
+        default:
+            return '\0';
+    }
+}
+
+/**
+ * Returns the matching character that should be used to terminate a list
+ * beginning with the given character.
+ */
+static inline uint8_t
+lex_mode_terminator(const uint8_t start) {
+    switch (start) {
+        case '(':
+            return ')';
+        case '[':
+            return ']';
+        case '{':
+            return '}';
+        case '<':
+            return '>';
+        default:
+            return start;
+    }
+}
+
+/**
+ * Push a new lex state onto the stack. If we're still within the pre-allocated
+ * space of the lex state stack, then we'll just use a new slot. Otherwise we'll
+ * allocate a new pointer and use that.
+ */
+static bool
+lex_mode_push(pm_parser_t *parser, pm_lex_mode_t lex_mode) {
+    lex_mode.prev = parser->lex_modes.current;
+    parser->lex_modes.index++;
+
+    if (parser->lex_modes.index > PM_LEX_STACK_SIZE - 1) {
+        parser->lex_modes.current = (pm_lex_mode_t *) xmalloc(sizeof(pm_lex_mode_t));
+        if (parser->lex_modes.current == NULL) return false;
+
+        *parser->lex_modes.current = lex_mode;
+    } else {
+        parser->lex_modes.stack[parser->lex_modes.index] = lex_mode;
+        parser->lex_modes.current = &parser->lex_modes.stack[parser->lex_modes.index];
+    }
+
+    return true;
+}
+
+/**
+ * Push on a new list lex mode.
+ */
+static inline bool
+lex_mode_push_list(pm_parser_t *parser, bool interpolation, uint8_t delimiter) {
+    uint8_t incrementor = lex_mode_incrementor(delimiter);
+    uint8_t terminator = lex_mode_terminator(delimiter);
+
+    pm_lex_mode_t lex_mode = {
+        .mode = PM_LEX_LIST,
+        .as.list = {
+            .nesting = 0,
+            .interpolation = interpolation,
+            .incrementor = incrementor,
+            .terminator = terminator
+        }
+    };
+
+    // These are the places where we need to split up the content of the list.
+    // We'll use strpbrk to find the first of these characters.
+    uint8_t *breakpoints = lex_mode.as.list.breakpoints;
+    memcpy(breakpoints, "\\ \t\f\r\v\n\0\0\0", sizeof(lex_mode.as.list.breakpoints));
+    size_t index = 7;
+
+    // Now we'll add the terminator to the list of breakpoints. If the
+    // terminator is not already a NULL byte, add it to the list.
+    if (terminator != '\0') {
+        breakpoints[index++] = terminator;
+    }
+
+    // If interpolation is allowed, then we're going to check for the #
+    // character. Otherwise we'll only look for escapes and the terminator.
+    if (interpolation) {
+        breakpoints[index++] = '#';
+    }
+
+    // If there is an incrementor, then we'll check for that as well.
+    if (incrementor != '\0') {
+        breakpoints[index++] = incrementor;
+    }
+
+    parser->explicit_encoding = NULL;
+    return lex_mode_push(parser, lex_mode);
+}
+
+/**
+ * Push on a new list lex mode that is only used for compatibility. This is
+ * called when we're at the end of the file. We want the parser to be able to
+ * perform its normal error tolerance.
+ */
+static inline bool
+lex_mode_push_list_eof(pm_parser_t *parser) {
+    return lex_mode_push_list(parser, false, '\0');
+}
+
+/**
+ * Push on a new regexp lex mode.
+ */
+static inline bool
+lex_mode_push_regexp(pm_parser_t *parser, uint8_t incrementor, uint8_t terminator) {
+    pm_lex_mode_t lex_mode = {
+        .mode = PM_LEX_REGEXP,
+        .as.regexp = {
+            .nesting = 0,
+            .incrementor = incrementor,
+            .terminator = terminator
+        }
+    };
+
+    // These are the places where we need to split up the content of the
+    // regular expression. We'll use strpbrk to find the first of these
+    // characters.
+    uint8_t *breakpoints = lex_mode.as.regexp.breakpoints;
+    memcpy(breakpoints, "\r\n\\#\0\0", sizeof(lex_mode.as.regexp.breakpoints));
+    size_t index = 4;
+
+    // First we'll add the terminator.
+    if (terminator != '\0') {
+        breakpoints[index++] = terminator;
+    }
+
+    // Next, if there is an incrementor, then we'll check for that as well.
+    if (incrementor != '\0') {
+        breakpoints[index++] = incrementor;
+    }
+
+    parser->explicit_encoding = NULL;
+    return lex_mode_push(parser, lex_mode);
+}
+
+/**
+ * Push on a new string lex mode.
+ */
+static inline bool
+lex_mode_push_string(pm_parser_t *parser, bool interpolation, bool label_allowed, uint8_t incrementor, uint8_t terminator) {
+    pm_lex_mode_t lex_mode = {
+        .mode = PM_LEX_STRING,
+        .as.string = {
+            .nesting = 0,
+            .interpolation = interpolation,
+            .label_allowed = label_allowed,
+            .incrementor = incrementor,
+            .terminator = terminator
+        }
+    };
+
+    // These are the places where we need to split up the content of the
+    // string. We'll use strpbrk to find the first of these characters.
+    uint8_t *breakpoints = lex_mode.as.string.breakpoints;
+    memcpy(breakpoints, "\r\n\\\0\0\0", sizeof(lex_mode.as.string.breakpoints));
+    size_t index = 3;
+
+    // Now add in the terminator. If the terminator is not already a NULL byte,
+    // then we'll add it.
+    if (terminator != '\0') {
+        breakpoints[index++] = terminator;
+    }
+
+    // If interpolation is allowed, then we're going to check for the #
+    // character. Otherwise we'll only look for escapes and the terminator.
+    if (interpolation) {
+        breakpoints[index++] = '#';
+    }
+
+    // If we have an incrementor, then we'll add that in as a breakpoint as
+    // well.
+    if (incrementor != '\0') {
+        breakpoints[index++] = incrementor;
+    }
+
+    parser->explicit_encoding = NULL;
+    return lex_mode_push(parser, lex_mode);
+}
+
+/**
+ * Push on a new string lex mode that is only used for compatibility. This is
+ * called when we're at the end of the file. We want the parser to be able to
+ * perform its normal error tolerance.
+ */
+static inline bool
+lex_mode_push_string_eof(pm_parser_t *parser) {
+    return lex_mode_push_string(parser, false, false, '\0', '\0');
+}
+
+/**
+ * Pop the current lex state off the stack. If we're within the pre-allocated
+ * space of the lex state stack, then we'll just decrement the index. Otherwise
+ * we'll free the current pointer and use the previous pointer.
+ */
+static void
+lex_mode_pop(pm_parser_t *parser) {
+    if (parser->lex_modes.index == 0) {
+        parser->lex_modes.current->mode = PM_LEX_DEFAULT;
+    } else if (parser->lex_modes.index < PM_LEX_STACK_SIZE) {
+        parser->lex_modes.index--;
+        parser->lex_modes.current = &parser->lex_modes.stack[parser->lex_modes.index];
+    } else {
+        parser->lex_modes.index--;
+        pm_lex_mode_t *prev = parser->lex_modes.current->prev;
+        xfree(parser->lex_modes.current);
+        parser->lex_modes.current = prev;
+    }
+}
+
+/**
+ * This is the equivalent of IS_lex_state is CRuby.
+ */
+static inline bool
+lex_state_p(const pm_parser_t *parser, pm_lex_state_t state) {
+    return parser->lex_state & state;
+}
+
+typedef enum {
+    PM_IGNORED_NEWLINE_NONE = 0,
+    PM_IGNORED_NEWLINE_ALL,
+    PM_IGNORED_NEWLINE_PATTERN
+} pm_ignored_newline_type_t;
+
+static inline pm_ignored_newline_type_t
+lex_state_ignored_p(pm_parser_t *parser) {
+    bool ignored = lex_state_p(parser, PM_LEX_STATE_BEG | PM_LEX_STATE_CLASS | PM_LEX_STATE_FNAME | PM_LEX_STATE_DOT) && !lex_state_p(parser, PM_LEX_STATE_LABELED);
+
+    if (ignored) {
+        return PM_IGNORED_NEWLINE_ALL;
+    } else if ((parser->lex_state & ~((unsigned int) PM_LEX_STATE_LABEL)) == (PM_LEX_STATE_ARG | PM_LEX_STATE_LABELED)) {
+        return PM_IGNORED_NEWLINE_PATTERN;
+    } else {
+        return PM_IGNORED_NEWLINE_NONE;
+    }
+}
+
+static inline bool
+lex_state_beg_p(pm_parser_t *parser) {
+    return lex_state_p(parser, PM_LEX_STATE_BEG_ANY) || ((parser->lex_state & (PM_LEX_STATE_ARG | PM_LEX_STATE_LABELED)) == (PM_LEX_STATE_ARG | PM_LEX_STATE_LABELED));
+}
+
+static inline bool
+lex_state_arg_p(pm_parser_t *parser) {
+    return lex_state_p(parser, PM_LEX_STATE_ARG_ANY);
+}
+
+static inline bool
+lex_state_spcarg_p(pm_parser_t *parser, bool space_seen) {
+    if (parser->current.end >= parser->end) {
+        return false;
+    }
+    return lex_state_arg_p(parser) && space_seen && !pm_char_is_whitespace(*parser->current.end);
+}
+
+static inline bool
+lex_state_end_p(pm_parser_t *parser) {
+    return lex_state_p(parser, PM_LEX_STATE_END_ANY);
+}
+
+/**
+ * This is the equivalent of IS_AFTER_OPERATOR in CRuby.
+ */
+static inline bool
+lex_state_operator_p(pm_parser_t *parser) {
+    return lex_state_p(parser, PM_LEX_STATE_FNAME | PM_LEX_STATE_DOT);
+}
+
+/**
+ * Set the state of the lexer. This is defined as a function to be able to put a
+ * breakpoint in it.
+ */
+static inline void
+lex_state_set(pm_parser_t *parser, pm_lex_state_t state) {
+    parser->lex_state = state;
+}
+
+#ifndef PM_DEBUG_LOGGING
+/**
+ * Debugging logging will print additional information to stdout whenever the
+ * lexer state changes.
+ */
+#define PM_DEBUG_LOGGING 0
+#endif
+
+#if PM_DEBUG_LOGGING
+PRISM_ATTRIBUTE_UNUSED static void
+debug_state(pm_parser_t *parser) {
+    fprintf(stderr, "STATE: ");
+    bool first = true;
+
+    if (parser->lex_state == PM_LEX_STATE_NONE) {
+        fprintf(stderr, "NONE\n");
+        return;
+    }
+
+#define CHECK_STATE(state) \
+    if (parser->lex_state & state) { \
+        if (!first) fprintf(stderr, "|"); \
+        fprintf(stderr, "%s", #state); \
+        first = false; \
+    }
+
+    CHECK_STATE(PM_LEX_STATE_BEG)
+    CHECK_STATE(PM_LEX_STATE_END)
+    CHECK_STATE(PM_LEX_STATE_ENDARG)
+    CHECK_STATE(PM_LEX_STATE_ENDFN)
+    CHECK_STATE(PM_LEX_STATE_ARG)
+    CHECK_STATE(PM_LEX_STATE_CMDARG)
+    CHECK_STATE(PM_LEX_STATE_MID)
+    CHECK_STATE(PM_LEX_STATE_FNAME)
+    CHECK_STATE(PM_LEX_STATE_DOT)
+    CHECK_STATE(PM_LEX_STATE_CLASS)
+    CHECK_STATE(PM_LEX_STATE_LABEL)
+    CHECK_STATE(PM_LEX_STATE_LABELED)
+    CHECK_STATE(PM_LEX_STATE_FITEM)
+
+#undef CHECK_STATE
+
+    fprintf(stderr, "\n");
+}
+
+static void
+debug_lex_state_set(pm_parser_t *parser, pm_lex_state_t state, char const * caller_name, int line_number) {
+    fprintf(stderr, "Caller: %s:%d\nPrevious: ", caller_name, line_number);
+    debug_state(parser);
+    lex_state_set(parser, state);
+    fprintf(stderr, "Now: ");
+    debug_state(parser);
+    fprintf(stderr, "\n");
+}
+
+#define lex_state_set(parser, state) debug_lex_state_set(parser, state, __func__, __LINE__)
+#endif
+
+/******************************************************************************/
+/* Command-line macro helpers                                                 */
+/******************************************************************************/
+
+/** True if the parser has the given command-line option. */
+#define PM_PARSER_COMMAND_LINE_OPTION(parser, option) ((parser)->command_line & (option))
+
+/** True if the -a command line option was given. */
+#define PM_PARSER_COMMAND_LINE_OPTION_A(parser) PM_PARSER_COMMAND_LINE_OPTION(parser, PM_OPTIONS_COMMAND_LINE_A)
+
+/** True if the -e command line option was given. */
+#define PM_PARSER_COMMAND_LINE_OPTION_E(parser) PM_PARSER_COMMAND_LINE_OPTION(parser, PM_OPTIONS_COMMAND_LINE_E)
+
+/** True if the -l command line option was given. */
+#define PM_PARSER_COMMAND_LINE_OPTION_L(parser) PM_PARSER_COMMAND_LINE_OPTION(parser, PM_OPTIONS_COMMAND_LINE_L)
+
+/** True if the -n command line option was given. */
+#define PM_PARSER_COMMAND_LINE_OPTION_N(parser) PM_PARSER_COMMAND_LINE_OPTION(parser, PM_OPTIONS_COMMAND_LINE_N)
+
+/** True if the -p command line option was given. */
+#define PM_PARSER_COMMAND_LINE_OPTION_P(parser) PM_PARSER_COMMAND_LINE_OPTION(parser, PM_OPTIONS_COMMAND_LINE_P)
+
+/** True if the -x command line option was given. */
+#define PM_PARSER_COMMAND_LINE_OPTION_X(parser) PM_PARSER_COMMAND_LINE_OPTION(parser, PM_OPTIONS_COMMAND_LINE_X)
+
+/******************************************************************************/
+/* Diagnostic-related functions                                               */
+/******************************************************************************/
+
+/**
+ * Append an error to the list of errors on the parser.
+ */
+static inline void
+pm_parser_err(pm_parser_t *parser, const uint8_t *start, const uint8_t *end, pm_diagnostic_id_t diag_id) {
+    pm_diagnostic_list_append(&parser->error_list, start, end, diag_id);
+}
+
+/**
+ * Append an error to the list of errors on the parser using a format string.
+ */
+#define PM_PARSER_ERR_FORMAT(parser, start, end, diag_id, ...) \
+    pm_diagnostic_list_append_format(&parser->error_list, start, end, diag_id, __VA_ARGS__)
+
+/**
+ * Append an error to the list of errors on the parser using the location of the
+ * current token.
+ */
+static inline void
+pm_parser_err_current(pm_parser_t *parser, pm_diagnostic_id_t diag_id) {
+    pm_parser_err(parser, parser->current.start, parser->current.end, diag_id);
+}
+
+/**
+ * Append an error to the list of errors on the parser using the given location
+ * using a format string.
+ */
+#define PM_PARSER_ERR_LOCATION_FORMAT(parser, location, diag_id, ...) \
+    PM_PARSER_ERR_FORMAT(parser, (location)->start, (location)->end, diag_id, __VA_ARGS__)
+
+/**
+ * Append an error to the list of errors on the parser using the location of the
+ * given node.
+ */
+static inline void
+pm_parser_err_node(pm_parser_t *parser, const pm_node_t *node, pm_diagnostic_id_t diag_id) {
+    pm_parser_err(parser, node->location.start, node->location.end, diag_id);
+}
+
+/**
+ * Append an error to the list of errors on the parser using the location of the
+ * given node and a format string.
+ */
+#define PM_PARSER_ERR_NODE_FORMAT(parser, node, diag_id, ...) \
+    PM_PARSER_ERR_FORMAT(parser, (node)->location.start, (node)->location.end, diag_id, __VA_ARGS__)
+
+/**
+ * Append an error to the list of errors on the parser using the location of the
+ * given node and a format string, and add on the content of the node.
+ */
+#define PM_PARSER_ERR_NODE_FORMAT_CONTENT(parser, node, diag_id) \
+    PM_PARSER_ERR_NODE_FORMAT(parser, node, diag_id, (int) ((node)->location.end - (node)->location.start), (const char *) (node)->location.start)
+
+/**
+ * Append an error to the list of errors on the parser using the location of the
+ * previous token.
+ */
+static inline void
+pm_parser_err_previous(pm_parser_t *parser, pm_diagnostic_id_t diag_id) {
+    pm_parser_err(parser, parser->previous.start, parser->previous.end, diag_id);
+}
+
+/**
+ * Append an error to the list of errors on the parser using the location of the
+ * given token.
+ */
+static inline void
+pm_parser_err_token(pm_parser_t *parser, const pm_token_t *token, pm_diagnostic_id_t diag_id) {
+    pm_parser_err(parser, token->start, token->end, diag_id);
+}
+
+/**
+ * Append an error to the list of errors on the parser using the location of the
+ * given token and a format string.
+ */
+#define PM_PARSER_ERR_TOKEN_FORMAT(parser, token, diag_id, ...) \
+    PM_PARSER_ERR_FORMAT(parser, (token).start, (token).end, diag_id, __VA_ARGS__)
+
+/**
+ * Append an error to the list of errors on the parser using the location of the
+ * given token and a format string, and add on the content of the token.
+ */
+#define PM_PARSER_ERR_TOKEN_FORMAT_CONTENT(parser, token, diag_id) \
+    PM_PARSER_ERR_TOKEN_FORMAT(parser, token, diag_id, (int) ((token).end - (token).start), (const char *) (token).start)
+
+/**
+ * Append a warning to the list of warnings on the parser.
+ */
+static inline void
+pm_parser_warn(pm_parser_t *parser, const uint8_t *start, const uint8_t *end, pm_diagnostic_id_t diag_id) {
+    pm_diagnostic_list_append(&parser->warning_list, start, end, diag_id);
+}
+
+/**
+ * Append a warning to the list of warnings on the parser using the location of
+ * the given token.
+ */
+static inline void
+pm_parser_warn_token(pm_parser_t *parser, const pm_token_t *token, pm_diagnostic_id_t diag_id) {
+    pm_parser_warn(parser, token->start, token->end, diag_id);
+}
+
+/**
+ * Append a warning to the list of warnings on the parser using the location of
+ * the given node.
+ */
+static inline void
+pm_parser_warn_node(pm_parser_t *parser, const pm_node_t *node, pm_diagnostic_id_t diag_id) {
+    pm_parser_warn(parser, node->location.start, node->location.end, diag_id);
+}
+
+/**
+ * Append a warning to the list of warnings on the parser using a format string.
+ */
+#define PM_PARSER_WARN_FORMAT(parser, start, end, diag_id, ...) \
+    pm_diagnostic_list_append_format(&parser->warning_list, start, end, diag_id, __VA_ARGS__)
+
+/**
+ * Append a warning to the list of warnings on the parser using the location of
+ * the given token and a format string.
+ */
+#define PM_PARSER_WARN_TOKEN_FORMAT(parser, token, diag_id, ...) \
+    PM_PARSER_WARN_FORMAT(parser, (token).start, (token).end, diag_id, __VA_ARGS__)
+
+/**
+ * Append a warning to the list of warnings on the parser using the location of
+ * the given token and a format string, and add on the content of the token.
+ */
+#define PM_PARSER_WARN_TOKEN_FORMAT_CONTENT(parser, token, diag_id) \
+    PM_PARSER_WARN_TOKEN_FORMAT(parser, token, diag_id, (int) ((token).end - (token).start), (const char *) (token).start)
+
+/**
+ * Append a warning to the list of warnings on the parser using the location of
+ * the given node and a format string.
+ */
+#define PM_PARSER_WARN_NODE_FORMAT(parser, node, diag_id, ...) \
+    PM_PARSER_WARN_FORMAT(parser, (node)->location.start, (node)->location.end, diag_id, __VA_ARGS__)
+
+/**
+ * Add an error for an expected heredoc terminator. This is a special function
+ * only because it grabs its location off of a lex mode instead of a node or a
+ * token.
+ */
+static void
+pm_parser_err_heredoc_term(pm_parser_t *parser, const uint8_t *ident_start, size_t ident_length) {
+    PM_PARSER_ERR_FORMAT(
+        parser,
+        ident_start,
+        ident_start + ident_length,
+        PM_ERR_HEREDOC_TERM,
+        (int) ident_length,
+        (const char *) ident_start
+    );
+}
+
+/******************************************************************************/
+/* Scope-related functions                                                    */
+/******************************************************************************/
+
+/**
+ * Allocate and initialize a new scope. Push it onto the scope stack.
+ */
+static bool
+pm_parser_scope_push(pm_parser_t *parser, bool closed) {
+    pm_scope_t *scope = (pm_scope_t *) xmalloc(sizeof(pm_scope_t));
+    if (scope == NULL) return false;
+
+    *scope = (pm_scope_t) {
+        .previous = parser->current_scope,
+        .locals = { 0 },
+        .parameters = PM_SCOPE_PARAMETERS_NONE,
+        .implicit_parameters = { 0 },
+        .shareable_constant = parser->current_scope == NULL ? PM_SCOPE_SHAREABLE_CONSTANT_NONE : parser->current_scope->shareable_constant,
+        .closed = closed
+    };
+
+    parser->current_scope = scope;
+    return true;
+}
+
+/**
+ * Determine if the current scope is at the top level. This means it is either
+ * the top-level scope or it is open to the top-level.
+ */
+static bool
+pm_parser_scope_toplevel_p(pm_parser_t *parser) {
+    pm_scope_t *scope = parser->current_scope;
+
+    do {
+        if (scope->previous == NULL) return true;
+        if (scope->closed) return false;
+    } while ((scope = scope->previous) != NULL);
+
+    assert(false && "unreachable");
+    return true;
+}
+
+/**
+ * Retrieve the scope at the given depth.
+ */
+static pm_scope_t *
+pm_parser_scope_find(pm_parser_t *parser, uint32_t depth) {
+    pm_scope_t *scope = parser->current_scope;
+
+    while (depth-- > 0) {
+        assert(scope != NULL);
+        scope = scope->previous;
+    }
+
+    return scope;
+}
+
+typedef enum {
+    PM_SCOPE_FORWARDING_PARAM_CHECK_RESULT_PASS,
+    PM_SCOPE_FORWARDING_PARAM_CHECK_RESULT_CONFLICT,
+    PM_SCOPE_FORWARDING_PARAM_CHECK_RESULT_FAIL
+} pm_scope_forwarding_param_check_result_t;
+
+static pm_scope_forwarding_param_check_result_t
+pm_parser_scope_forwarding_param_check(pm_parser_t *parser, const uint8_t mask) {
+    pm_scope_t *scope = parser->current_scope;
+    bool conflict = false;
+
+    while (scope != NULL) {
+        if (scope->parameters & mask) {
+            if (scope->closed) {
+                if (conflict) {
+                    return PM_SCOPE_FORWARDING_PARAM_CHECK_RESULT_CONFLICT;
+                } else {
+                    return PM_SCOPE_FORWARDING_PARAM_CHECK_RESULT_PASS;
+                }
+            }
+
+            conflict = true;
+        }
+
+        if (scope->closed) break;
+        scope = scope->previous;
+    }
+
+    return PM_SCOPE_FORWARDING_PARAM_CHECK_RESULT_FAIL;
+}
+
+static void
+pm_parser_scope_forwarding_block_check(pm_parser_t *parser, const pm_token_t * token) {
+    switch (pm_parser_scope_forwarding_param_check(parser, PM_SCOPE_PARAMETERS_FORWARDING_BLOCK)) {
+        case PM_SCOPE_FORWARDING_PARAM_CHECK_RESULT_PASS:
+            // Pass.
+            break;
+        case PM_SCOPE_FORWARDING_PARAM_CHECK_RESULT_CONFLICT:
+            pm_parser_err_token(parser, token, PM_ERR_ARGUMENT_CONFLICT_AMPERSAND);
+            break;
+        case PM_SCOPE_FORWARDING_PARAM_CHECK_RESULT_FAIL:
+            pm_parser_err_token(parser, token, PM_ERR_ARGUMENT_NO_FORWARDING_AMPERSAND);
+            break;
+    }
+}
+
+static void
+pm_parser_scope_forwarding_positionals_check(pm_parser_t *parser, const pm_token_t * token) {
+    switch (pm_parser_scope_forwarding_param_check(parser, PM_SCOPE_PARAMETERS_FORWARDING_POSITIONALS)) {
+        case PM_SCOPE_FORWARDING_PARAM_CHECK_RESULT_PASS:
+            // Pass.
+            break;
+        case PM_SCOPE_FORWARDING_PARAM_CHECK_RESULT_CONFLICT:
+            pm_parser_err_token(parser, token, PM_ERR_ARGUMENT_CONFLICT_STAR);
+            break;
+        case PM_SCOPE_FORWARDING_PARAM_CHECK_RESULT_FAIL:
+            pm_parser_err_token(parser, token, PM_ERR_ARGUMENT_NO_FORWARDING_STAR);
+            break;
+    }
+}
+
+static void
+pm_parser_scope_forwarding_all_check(pm_parser_t *parser, const pm_token_t *token) {
+    switch (pm_parser_scope_forwarding_param_check(parser, PM_SCOPE_PARAMETERS_FORWARDING_ALL)) {
+        case PM_SCOPE_FORWARDING_PARAM_CHECK_RESULT_PASS:
+            // Pass.
+            break;
+        case PM_SCOPE_FORWARDING_PARAM_CHECK_RESULT_CONFLICT:
+            // This shouldn't happen, because ... is not allowed in the
+            // declaration of blocks. If we get here, we assume we already have
+            // an error for this.
+            break;
+        case PM_SCOPE_FORWARDING_PARAM_CHECK_RESULT_FAIL:
+            pm_parser_err_token(parser, token, PM_ERR_ARGUMENT_NO_FORWARDING_ELLIPSES);
+            break;
+    }
+}
+
+static void
+pm_parser_scope_forwarding_keywords_check(pm_parser_t *parser, const pm_token_t * token) {
+    switch (pm_parser_scope_forwarding_param_check(parser, PM_SCOPE_PARAMETERS_FORWARDING_KEYWORDS)) {
+        case PM_SCOPE_FORWARDING_PARAM_CHECK_RESULT_PASS:
+            // Pass.
+            break;
+        case PM_SCOPE_FORWARDING_PARAM_CHECK_RESULT_CONFLICT:
+            pm_parser_err_token(parser, token, PM_ERR_ARGUMENT_CONFLICT_STAR_STAR);
+            break;
+        case PM_SCOPE_FORWARDING_PARAM_CHECK_RESULT_FAIL:
+            pm_parser_err_token(parser, token, PM_ERR_ARGUMENT_NO_FORWARDING_STAR_STAR);
+            break;
+    }
+}
+
+/**
+ * Get the current state of constant shareability.
+ */
+static inline pm_shareable_constant_value_t
+pm_parser_scope_shareable_constant_get(pm_parser_t *parser) {
+    return parser->current_scope->shareable_constant;
+}
+
+/**
+ * Set the current state of constant shareability. We'll set it on all of the
+ * open scopes so that reads are quick.
+ */
+static void
+pm_parser_scope_shareable_constant_set(pm_parser_t *parser, pm_shareable_constant_value_t shareable_constant) {
+    pm_scope_t *scope = parser->current_scope;
+
+    do {
+        scope->shareable_constant = shareable_constant;
+    } while (!scope->closed && (scope = scope->previous) != NULL);
+}
+
+/******************************************************************************/
+/* Local variable-related functions                                           */
+/******************************************************************************/
+
+/**
+ * The point at which the set of locals switches from being a list to a hash.
+ */
+#define PM_LOCALS_HASH_THRESHOLD 9
+
+static void
+pm_locals_free(pm_locals_t *locals) {
+    if (locals->capacity > 0) {
+        xfree(locals->locals);
+    }
+}
+
+/**
+ * Use as simple and fast a hash function as we can that still properly mixes
+ * the bits.
+ */
+static uint32_t
+pm_locals_hash(pm_constant_id_t name) {
+    name = ((name >> 16) ^ name) * 0x45d9f3b;
+    name = ((name >> 16) ^ name) * 0x45d9f3b;
+    name = (name >> 16) ^ name;
+    return name;
+}
+
+/**
+ * Resize the locals list to be twice its current size. If the next capacity is
+ * above the threshold for switching to a hash, then we'll switch to a hash.
+ */
+static void
+pm_locals_resize(pm_locals_t *locals) {
+    uint32_t next_capacity = locals->capacity == 0 ? 4 : (locals->capacity * 2);
+    assert(next_capacity > locals->capacity);
+
+    pm_local_t *next_locals = xcalloc(next_capacity, sizeof(pm_local_t));
+    if (next_locals == NULL) abort();
+
+    if (next_capacity < PM_LOCALS_HASH_THRESHOLD) {
+        if (locals->size > 0) {
+            memcpy(next_locals, locals->locals, locals->size * sizeof(pm_local_t));
+        }
+    } else {
+        // If we just switched from a list to a hash, then we need to fill in
+        // the hash values of all of the locals.
+        bool hash_needed = (locals->capacity <= PM_LOCALS_HASH_THRESHOLD);
+        uint32_t mask = next_capacity - 1;
+
+        for (uint32_t index = 0; index < locals->capacity; index++) {
+            pm_local_t *local = &locals->locals[index];
+
+            if (local->name != PM_CONSTANT_ID_UNSET) {
+                if (hash_needed) local->hash = pm_locals_hash(local->name);
+
+                uint32_t hash = local->hash;
+                while (next_locals[hash & mask].name != PM_CONSTANT_ID_UNSET) hash++;
+                next_locals[hash & mask] = *local;
+            }
+        }
+    }
+
+    pm_locals_free(locals);
+    locals->locals = next_locals;
+    locals->capacity = next_capacity;
+}
+
+/**
+ * Add a new local to the set of locals. This will automatically rehash the
+ * locals if the size is greater than 3/4 of the capacity.
+ *
+ * @param locals The set of locals to add to.
+ * @param name The name of the local.
+ * @param start The source location that represents the start of the local. This
+ *   is used for the location of the warning in case this local is not read.
+ * @param end The source location that represents the end of the local. This is
+ *   used for the location of the warning in case this local is not read.
+ * @param reads The initial number of reads for this local. Usually this is set
+ *   to 0, but for some locals (like parameters) we want to initialize it with
+ *   1 so that we never warn on unused parameters.
+ * @return True if the local was added, and false if the local already exists.
+ */
+static bool
+pm_locals_write(pm_locals_t *locals, pm_constant_id_t name, const uint8_t *start, const uint8_t *end, uint32_t reads) {
+    if (locals->size >= (locals->capacity / 4 * 3)) {
+        pm_locals_resize(locals);
+    }
+
+    if (locals->capacity < PM_LOCALS_HASH_THRESHOLD) {
+        for (uint32_t index = 0; index < locals->capacity; index++) {
+            pm_local_t *local = &locals->locals[index];
+
+            if (local->name == PM_CONSTANT_ID_UNSET) {
+                *local = (pm_local_t) {
+                    .name = name,
+                    .location = { .start = start, .end = end },
+                    .index = locals->size++,
+                    .reads = reads,
+                    .hash = 0
+                };
+                return true;
+            } else if (local->name == name) {
+                return false;
+            }
+        }
+    } else {
+        uint32_t mask = locals->capacity - 1;
+        uint32_t hash = pm_locals_hash(name);
+        uint32_t initial_hash = hash;
+
+        do {
+            pm_local_t *local = &locals->locals[hash & mask];
+
+            if (local->name == PM_CONSTANT_ID_UNSET) {
+                *local = (pm_local_t) {
+                    .name = name,
+                    .location = { .start = start, .end = end },
+                    .index = locals->size++,
+                    .reads = reads,
+                    .hash = initial_hash
+                };
+                return true;
+            } else if (local->name == name) {
+                return false;
+            } else {
+                hash++;
+            }
+        } while ((hash & mask) != initial_hash);
+    }
+
+    assert(false && "unreachable");
+    return true;
+}
+
+/**
+ * Finds the index of a local variable in the locals set. If it is not found,
+ * this returns UINT32_MAX.
+ */
+static uint32_t
+pm_locals_find(pm_locals_t *locals, pm_constant_id_t name) {
+    if (locals->capacity < PM_LOCALS_HASH_THRESHOLD) {
+        for (uint32_t index = 0; index < locals->size; index++) {
+            pm_local_t *local = &locals->locals[index];
+            if (local->name == name) return index;
+        }
+    } else {
+        uint32_t mask = locals->capacity - 1;
+        uint32_t hash = pm_locals_hash(name);
+        uint32_t initial_hash = hash & mask;
+
+        do {
+            pm_local_t *local = &locals->locals[hash & mask];
+
+            if (local->name == PM_CONSTANT_ID_UNSET) {
+                return UINT32_MAX;
+            } else if (local->name == name) {
+                return hash & mask;
+            } else {
+                hash++;
+            }
+        } while ((hash & mask) != initial_hash);
+    }
+
+    return UINT32_MAX;
+}
+
+/**
+ * Called when a variable is read in a certain lexical context. Tracks the read
+ * by adding to the reads count.
+ */
+static void
+pm_locals_read(pm_locals_t *locals, pm_constant_id_t name) {
+    uint32_t index = pm_locals_find(locals, name);
+    assert(index != UINT32_MAX);
+
+    pm_local_t *local = &locals->locals[index];
+    assert(local->reads < UINT32_MAX);
+
+    local->reads++;
+}
+
+/**
+ * Called when a variable read is transformed into a variable write, because a
+ * write operator is found after the variable name.
+ */
+static void
+pm_locals_unread(pm_locals_t *locals, pm_constant_id_t name) {
+    uint32_t index = pm_locals_find(locals, name);
+    assert(index != UINT32_MAX);
+
+    pm_local_t *local = &locals->locals[index];
+    assert(local->reads > 0);
+
+    local->reads--;
+}
+
+/**
+ * Returns the current number of reads for a local variable.
+ */
+static uint32_t
+pm_locals_reads(pm_locals_t *locals, pm_constant_id_t name) {
+    uint32_t index = pm_locals_find(locals, name);
+    assert(index != UINT32_MAX);
+
+    return locals->locals[index].reads;
+}
+
+/**
+ * Write out the locals into the given list of constant ids in the correct
+ * order. This is used to set the list of locals on the nodes in the tree once
+ * we're sure no additional locals will be added to the set.
+ *
+ * This function is also responsible for warning when a local variable has been
+ * written but not read in certain contexts.
+ */
+static void
+pm_locals_order(PRISM_ATTRIBUTE_UNUSED pm_parser_t *parser, pm_locals_t *locals, pm_constant_id_list_t *list, bool toplevel) {
+    pm_constant_id_list_init_capacity(list, locals->size);
+
+    // If we're still below the threshold for switching to a hash, then we only
+    // need to loop over the locals until we hit the size because the locals are
+    // stored in a list.
+    uint32_t capacity = locals->capacity < PM_LOCALS_HASH_THRESHOLD ? locals->size : locals->capacity;
+
+    // We will only warn for unused variables if we're not at the top level, or
+    // if we're parsing a file outside of eval or -e.
+    bool warn_unused = !toplevel || (!parser->parsing_eval && !PM_PARSER_COMMAND_LINE_OPTION_E(parser));
+
+    for (uint32_t index = 0; index < capacity; index++) {
+        pm_local_t *local = &locals->locals[index];
+
+        if (local->name != PM_CONSTANT_ID_UNSET) {
+            pm_constant_id_list_insert(list, (size_t) local->index, local->name);
+
+            if (warn_unused && local->reads == 0 && ((parser->start_line >= 0) || (pm_newline_list_line(&parser->newline_list, local->location.start, parser->start_line) >= 0))) {
+                pm_constant_t *constant = pm_constant_pool_id_to_constant(&parser->constant_pool, local->name);
+
+                if (constant->length >= 1 && *constant->start != '_') {
+                    PM_PARSER_WARN_FORMAT(
+                        parser,
+                        local->location.start,
+                        local->location.end,
+                        PM_WARN_UNUSED_LOCAL_VARIABLE,
+                        (int) constant->length,
+                        (const char *) constant->start
+                    );
+                }
+            }
+        }
+    }
+}
+
+/******************************************************************************/
+/* Node-related functions                                                     */
+/******************************************************************************/
+
+/**
+ * Retrieve the constant pool id for the given location.
+ */
+static inline pm_constant_id_t
+pm_parser_constant_id_location(pm_parser_t *parser, const uint8_t *start, const uint8_t *end) {
+    return pm_constant_pool_insert_shared(&parser->constant_pool, start, (size_t) (end - start));
+}
+
+/**
+ * Retrieve the constant pool id for the given string.
+ */
+static inline pm_constant_id_t
+pm_parser_constant_id_owned(pm_parser_t *parser, uint8_t *start, size_t length) {
+    return pm_constant_pool_insert_owned(&parser->constant_pool, start, length);
+}
+
+/**
+ * Retrieve the constant pool id for the given static literal C string.
+ */
+static inline pm_constant_id_t
+pm_parser_constant_id_constant(pm_parser_t *parser, const char *start, size_t length) {
+    return pm_constant_pool_insert_constant(&parser->constant_pool, (const uint8_t *) start, length);
+}
+
+/**
+ * Retrieve the constant pool id for the given token.
+ */
+static inline pm_constant_id_t
+pm_parser_constant_id_token(pm_parser_t *parser, const pm_token_t *token) {
+    return pm_parser_constant_id_location(parser, token->start, token->end);
+}
+
+/**
+ * Retrieve the constant pool id for the given token. If the token is not
+ * provided, then return 0.
+ */
+static inline pm_constant_id_t
+pm_parser_optional_constant_id_token(pm_parser_t *parser, const pm_token_t *token) {
+    return token->type == PM_TOKEN_NOT_PROVIDED ? 0 : pm_parser_constant_id_token(parser, token);
+}
+
+/**
+ * Check whether or not the given node is value expression.
+ * If the node is value node, it returns NULL.
+ * If not, it returns the pointer to the node to be inspected as "void expression".
+ */
+static pm_node_t *
+pm_check_value_expression(pm_parser_t *parser, pm_node_t *node) {
+    pm_node_t *void_node = NULL;
+
+    while (node != NULL) {
+        switch (PM_NODE_TYPE(node)) {
+            case PM_RETURN_NODE:
+            case PM_BREAK_NODE:
+            case PM_NEXT_NODE:
+            case PM_REDO_NODE:
+            case PM_RETRY_NODE:
+            case PM_MATCH_REQUIRED_NODE:
+                return void_node != NULL ? void_node : node;
+            case PM_MATCH_PREDICATE_NODE:
+                return NULL;
+            case PM_BEGIN_NODE: {
+                pm_begin_node_t *cast = (pm_begin_node_t *) node;
+
+                if (cast->ensure_clause != NULL) {
+                    if (cast->rescue_clause != NULL) {
+                        pm_node_t *vn = pm_check_value_expression(parser, (pm_node_t *) cast->rescue_clause);
+                        if (vn != NULL) return vn;
+                    }
+
+                    if (cast->statements != NULL) {
+                        pm_node_t *vn = pm_check_value_expression(parser, (pm_node_t *) cast->statements);
+                        if (vn != NULL) return vn;
+                    }
+
+                    node = (pm_node_t *) cast->ensure_clause;
+                } else if (cast->rescue_clause != NULL) {
+                    if (cast->statements == NULL) return NULL;
+
+                    pm_node_t *vn = pm_check_value_expression(parser, (pm_node_t *) cast->statements);
+                    if (vn == NULL) return NULL;
+                    if (void_node == NULL) void_node = vn;
+
+                    for (pm_rescue_node_t *rescue_clause = cast->rescue_clause; rescue_clause != NULL; rescue_clause = rescue_clause->subsequent) {
+                        pm_node_t *vn = pm_check_value_expression(parser, (pm_node_t *) rescue_clause->statements);
+                        if (vn == NULL) {
+                            void_node = NULL;
+                            break;
+                        }
+                        if (void_node == NULL) {
+                            void_node = vn;
+                        }
+                    }
+
+                    if (cast->else_clause != NULL) {
+                        node = (pm_node_t *) cast->else_clause;
+                    } else {
+                        return void_node;
+                    }
+                } else {
+                    node = (pm_node_t *) cast->statements;
+                }
+
+                break;
+            }
+            case PM_ENSURE_NODE: {
+                pm_ensure_node_t *cast = (pm_ensure_node_t *) node;
+                node = (pm_node_t *) cast->statements;
+                break;
+            }
+            case PM_PARENTHESES_NODE: {
+                pm_parentheses_node_t *cast = (pm_parentheses_node_t *) node;
+                node = (pm_node_t *) cast->body;
+                break;
+            }
+            case PM_STATEMENTS_NODE: {
+                pm_statements_node_t *cast = (pm_statements_node_t *) node;
+                node = cast->body.nodes[cast->body.size - 1];
+                break;
+            }
+            case PM_IF_NODE: {
+                pm_if_node_t *cast = (pm_if_node_t *) node;
+                if (cast->statements == NULL || cast->subsequent == NULL) {
+                    return NULL;
+                }
+                pm_node_t *vn = pm_check_value_expression(parser, (pm_node_t *) cast->statements);
+                if (vn == NULL) {
+                    return NULL;
+                }
+                if (void_node == NULL) {
+                    void_node = vn;
+                }
+                node = cast->subsequent;
+                break;
+            }
+            case PM_UNLESS_NODE: {
+                pm_unless_node_t *cast = (pm_unless_node_t *) node;
+                if (cast->statements == NULL || cast->else_clause == NULL) {
+                    return NULL;
+                }
+                pm_node_t *vn = pm_check_value_expression(parser, (pm_node_t *) cast->statements);
+                if (vn == NULL) {
+                    return NULL;
+                }
+                if (void_node == NULL) {
+                    void_node = vn;
+                }
+                node = (pm_node_t *) cast->else_clause;
+                break;
+            }
+            case PM_ELSE_NODE: {
+                pm_else_node_t *cast = (pm_else_node_t *) node;
+                node = (pm_node_t *) cast->statements;
+                break;
+            }
+            case PM_AND_NODE: {
+                pm_and_node_t *cast = (pm_and_node_t *) node;
+                node = cast->left;
+                break;
+            }
+            case PM_OR_NODE: {
+                pm_or_node_t *cast = (pm_or_node_t *) node;
+                node = cast->left;
+                break;
+            }
+            case PM_LOCAL_VARIABLE_WRITE_NODE: {
+                pm_local_variable_write_node_t *cast = (pm_local_variable_write_node_t *) node;
+
+                pm_scope_t *scope = parser->current_scope;
+                for (uint32_t depth = 0; depth < cast->depth; depth++) scope = scope->previous;
+
+                pm_locals_read(&scope->locals, cast->name);
+                return NULL;
+            }
+            default:
+                return NULL;
+        }
+    }
+
+    return NULL;
+}
+
+static inline void
+pm_assert_value_expression(pm_parser_t *parser, pm_node_t *node) {
+    pm_node_t *void_node = pm_check_value_expression(parser, node);
+    if (void_node != NULL) {
+        pm_parser_err_node(parser, void_node, PM_ERR_VOID_EXPRESSION);
+    }
+}
+
+/**
+ * Warn if the given node is a "void" statement.
+ */
+static void
+pm_void_statement_check(pm_parser_t *parser, const pm_node_t *node) {
+    const char *type = NULL;
+    int length = 0;
+
+    switch (PM_NODE_TYPE(node)) {
+        case PM_BACK_REFERENCE_READ_NODE:
+        case PM_CLASS_VARIABLE_READ_NODE:
+        case PM_GLOBAL_VARIABLE_READ_NODE:
+        case PM_INSTANCE_VARIABLE_READ_NODE:
+        case PM_LOCAL_VARIABLE_READ_NODE:
+        case PM_NUMBERED_REFERENCE_READ_NODE:
+            type = "a variable";
+            length = 10;
+            break;
+        case PM_CALL_NODE: {
+            const pm_call_node_t *cast = (const pm_call_node_t *) node;
+            if (cast->call_operator_loc.start != NULL || cast->message_loc.start == NULL) break;
+
+            const pm_constant_t *message = pm_constant_pool_id_to_constant(&parser->constant_pool, cast->name);
+            switch (message->length) {
+                case 1:
+                    switch (message->start[0]) {
+                        case '+':
+                        case '-':
+                        case '*':
+                        case '/':
+                        case '%':
+                        case '|':
+                        case '^':
+                        case '&':
+                        case '>':
+                        case '<':
+                            type = (const char *) message->start;
+                            length = 1;
+                            break;
+                    }
+                    break;
+                case 2:
+                    switch (message->start[1]) {
+                        case '=':
+                            if (message->start[0] == '<' || message->start[0] == '>' || message->start[0] == '!' || message->start[0] == '=') {
+                                type = (const char *) message->start;
+                                length = 2;
+                            }
+                            break;
+                        case '@':
+                            if (message->start[0] == '+' || message->start[0] == '-') {
+                                type = (const char *) message->start;
+                                length = 2;
+                            }
+                            break;
+                        case '*':
+                            if (message->start[0] == '*') {
+                                type = (const char *) message->start;
+                                length = 2;
+                            }
+                            break;
+                    }
+                    break;
+                case 3:
+                    if (memcmp(message->start, "<=>", 3) == 0) {
+                        type = "<=>";
+                        length = 3;
+                    }
+                    break;
+            }
+
+            break;
+        }
+        case PM_CONSTANT_PATH_NODE:
+            type = "::";
+            length = 2;
+            break;
+        case PM_CONSTANT_READ_NODE:
+            type = "a constant";
+            length = 10;
+            break;
+        case PM_DEFINED_NODE:
+            type = "defined?";
+            length = 8;
+            break;
+        case PM_FALSE_NODE:
+            type = "false";
+            length = 5;
+            break;
+        case PM_FLOAT_NODE:
+        case PM_IMAGINARY_NODE:
+        case PM_INTEGER_NODE:
+        case PM_INTERPOLATED_REGULAR_EXPRESSION_NODE:
+        case PM_INTERPOLATED_STRING_NODE:
+        case PM_RATIONAL_NODE:
+        case PM_REGULAR_EXPRESSION_NODE:
+        case PM_SOURCE_ENCODING_NODE:
+        case PM_SOURCE_FILE_NODE:
+        case PM_SOURCE_LINE_NODE:
+        case PM_STRING_NODE:
+        case PM_SYMBOL_NODE:
+            type = "a literal";
+            length = 9;
+            break;
+        case PM_NIL_NODE:
+            type = "nil";
+            length = 3;
+            break;
+        case PM_RANGE_NODE: {
+            const pm_range_node_t *cast = (const pm_range_node_t *) node;
+
+            if (PM_NODE_FLAG_P(cast, PM_RANGE_FLAGS_EXCLUDE_END)) {
+                type = "...";
+                length = 3;
+            } else {
+                type = "..";
+                length = 2;
+            }
+
+            break;
+        }
+        case PM_SELF_NODE:
+            type = "self";
+            length = 4;
+            break;
+        case PM_TRUE_NODE:
+            type = "true";
+            length = 4;
+            break;
+        default:
+            break;
+    }
+
+    if (type != NULL) {
+        PM_PARSER_WARN_NODE_FORMAT(parser, node, PM_WARN_VOID_STATEMENT, length, type);
+    }
+}
+
+/**
+ * Warn if any of the statements that are not the last statement in the list are
+ * a "void" statement.
+ */
+static void
+pm_void_statements_check(pm_parser_t *parser, const pm_statements_node_t *node, bool last_value) {
+    assert(node->body.size > 0);
+    const size_t size = node->body.size - (last_value ? 1 : 0);
+    for (size_t index = 0; index < size; index++) {
+        pm_void_statement_check(parser, node->body.nodes[index]);
+    }
+}
+
+/**
+ * When we're handling the predicate of a conditional, we need to know our
+ * context in order to determine the kind of warning we should deliver to the
+ * user.
+ */
+typedef enum {
+    PM_CONDITIONAL_PREDICATE_TYPE_CONDITIONAL,
+    PM_CONDITIONAL_PREDICATE_TYPE_FLIP_FLOP,
+    PM_CONDITIONAL_PREDICATE_TYPE_NOT
+} pm_conditional_predicate_type_t;
+
+/**
+ * Add a warning to the parser if the predicate of a conditional is a literal.
+ */
+static void
+pm_parser_warn_conditional_predicate_literal(pm_parser_t *parser, pm_node_t *node, pm_conditional_predicate_type_t type, pm_diagnostic_id_t diag_id, const char *prefix) {
+    switch (type) {
+        case PM_CONDITIONAL_PREDICATE_TYPE_CONDITIONAL:
+            PM_PARSER_WARN_NODE_FORMAT(parser, node, diag_id, prefix, "condition");
+            break;
+        case PM_CONDITIONAL_PREDICATE_TYPE_FLIP_FLOP:
+            PM_PARSER_WARN_NODE_FORMAT(parser, node, diag_id, prefix, "flip-flop");
+            break;
+        case PM_CONDITIONAL_PREDICATE_TYPE_NOT:
+            break;
+    }
+}
+
+/**
+ * Return true if the value being written within the predicate of a conditional
+ * is a literal value.
+ */
+static bool
+pm_conditional_predicate_warn_write_literal_p(const pm_node_t *node) {
+    switch (PM_NODE_TYPE(node)) {
+        case PM_ARRAY_NODE: {
+            if (PM_NODE_FLAG_P(node, PM_NODE_FLAG_STATIC_LITERAL)) return true;
+
+            const pm_array_node_t *cast = (const pm_array_node_t *) node;
+            for (size_t index = 0; index < cast->elements.size; index++) {
+                if (!pm_conditional_predicate_warn_write_literal_p(cast->elements.nodes[index])) return false;
+            }
+
+            return true;
+        }
+        case PM_HASH_NODE: {
+            if (PM_NODE_FLAG_P(node, PM_NODE_FLAG_STATIC_LITERAL)) return true;
+
+            const pm_hash_node_t *cast = (const pm_hash_node_t *) node;
+            for (size_t index = 0; index < cast->elements.size; index++) {
+                const pm_node_t *element = cast->elements.nodes[index];
+                if (!PM_NODE_TYPE_P(element, PM_ASSOC_NODE)) return false;
+
+                const pm_assoc_node_t *assoc = (const pm_assoc_node_t *) element;
+                if (!pm_conditional_predicate_warn_write_literal_p(assoc->key) || !pm_conditional_predicate_warn_write_literal_p(assoc->value)) return false;
+            }
+
+            return true;
+        }
+        case PM_FALSE_NODE:
+        case PM_FLOAT_NODE:
+        case PM_IMAGINARY_NODE:
+        case PM_INTEGER_NODE:
+        case PM_NIL_NODE:
+        case PM_RATIONAL_NODE:
+        case PM_REGULAR_EXPRESSION_NODE:
+        case PM_SOURCE_ENCODING_NODE:
+        case PM_SOURCE_FILE_NODE:
+        case PM_SOURCE_LINE_NODE:
+        case PM_STRING_NODE:
+        case PM_SYMBOL_NODE:
+        case PM_TRUE_NODE:
+            return true;
+        default:
+            return false;
+    }
+}
+
+/**
+ * Add a warning to the parser if the value that is being written inside of a
+ * predicate to a conditional is a literal.
+ */
+static inline void
+pm_conditional_predicate_warn_write_literal(pm_parser_t *parser, const pm_node_t *node) {
+    if (pm_conditional_predicate_warn_write_literal_p(node)) {
+        pm_parser_warn_node(parser, node, parser->version == PM_OPTIONS_VERSION_CRUBY_3_3 ? PM_WARN_EQUAL_IN_CONDITIONAL_3_3 : PM_WARN_EQUAL_IN_CONDITIONAL);
+    }
+}
+
+/**
+ * The predicate of conditional nodes can change what would otherwise be regular
+ * nodes into specialized nodes. For example:
+ *
+ * if foo .. bar         => RangeNode becomes FlipFlopNode
+ * if foo and bar .. baz => RangeNode becomes FlipFlopNode
+ * if /foo/              => RegularExpressionNode becomes MatchLastLineNode
+ * if /foo #{bar}/       => InterpolatedRegularExpressionNode becomes InterpolatedMatchLastLineNode
+ *
+ * We also want to warn the user if they're using a static literal as a
+ * predicate or writing a static literal as the predicate.
+ */
+static void
+pm_conditional_predicate(pm_parser_t *parser, pm_node_t *node, pm_conditional_predicate_type_t type) {
+    switch (PM_NODE_TYPE(node)) {
+        case PM_AND_NODE: {
+            pm_and_node_t *cast = (pm_and_node_t *) node;
+            pm_conditional_predicate(parser, cast->left, PM_CONDITIONAL_PREDICATE_TYPE_CONDITIONAL);
+            pm_conditional_predicate(parser, cast->right, PM_CONDITIONAL_PREDICATE_TYPE_CONDITIONAL);
+            break;
+        }
+        case PM_OR_NODE: {
+            pm_or_node_t *cast = (pm_or_node_t *) node;
+            pm_conditional_predicate(parser, cast->left, PM_CONDITIONAL_PREDICATE_TYPE_CONDITIONAL);
+            pm_conditional_predicate(parser, cast->right, PM_CONDITIONAL_PREDICATE_TYPE_CONDITIONAL);
+            break;
+        }
+        case PM_PARENTHESES_NODE: {
+            pm_parentheses_node_t *cast = (pm_parentheses_node_t *) node;
+
+            if ((cast->body != NULL) && PM_NODE_TYPE_P(cast->body, PM_STATEMENTS_NODE)) {
+                pm_statements_node_t *statements = (pm_statements_node_t *) cast->body;
+                if (statements->body.size == 1) pm_conditional_predicate(parser, statements->body.nodes[0], type);
+            }
+
+            break;
+        }
+        case PM_BEGIN_NODE: {
+            pm_begin_node_t *cast = (pm_begin_node_t *) node;
+            if (cast->statements != NULL) {
+                pm_statements_node_t *statements = cast->statements;
+                if (statements->body.size == 1) pm_conditional_predicate(parser, statements->body.nodes[0], type);
+            }
+            break;
+        }
+        case PM_RANGE_NODE: {
+            pm_range_node_t *cast = (pm_range_node_t *) node;
+
+            if (cast->left != NULL) pm_conditional_predicate(parser, cast->left, PM_CONDITIONAL_PREDICATE_TYPE_FLIP_FLOP);
+            if (cast->right != NULL) pm_conditional_predicate(parser, cast->right, PM_CONDITIONAL_PREDICATE_TYPE_FLIP_FLOP);
+
+            // Here we change the range node into a flip flop node. We can do
+            // this since the nodes are exactly the same except for the type.
+            // We're only asserting against the size when we should probably
+            // assert against the entire layout, but we'll assume tests will
+            // catch this.
+            assert(sizeof(pm_range_node_t) == sizeof(pm_flip_flop_node_t));
+            node->type = PM_FLIP_FLOP_NODE;
+
+            break;
+        }
+        case PM_REGULAR_EXPRESSION_NODE:
+            // Here we change the regular expression node into a match last line
+            // node. We can do this since the nodes are exactly the same except
+            // for the type.
+            assert(sizeof(pm_regular_expression_node_t) == sizeof(pm_match_last_line_node_t));
+            node->type = PM_MATCH_LAST_LINE_NODE;
+
+            if (!PM_PARSER_COMMAND_LINE_OPTION_E(parser)) {
+                pm_parser_warn_conditional_predicate_literal(parser, node, type, PM_WARN_LITERAL_IN_CONDITION_DEFAULT, "regex ");
+            }
+
+            break;
+        case PM_INTERPOLATED_REGULAR_EXPRESSION_NODE:
+            // Here we change the interpolated regular expression node into an
+            // interpolated match last line node. We can do this since the nodes
+            // are exactly the same except for the type.
+            assert(sizeof(pm_interpolated_regular_expression_node_t) == sizeof(pm_interpolated_match_last_line_node_t));
+            node->type = PM_INTERPOLATED_MATCH_LAST_LINE_NODE;
+
+            if (!PM_PARSER_COMMAND_LINE_OPTION_E(parser)) {
+                pm_parser_warn_conditional_predicate_literal(parser, node, type, PM_WARN_LITERAL_IN_CONDITION_VERBOSE, "regex ");
+            }
+
+            break;
+        case PM_INTEGER_NODE:
+            if (type == PM_CONDITIONAL_PREDICATE_TYPE_FLIP_FLOP) {
+                if (!PM_PARSER_COMMAND_LINE_OPTION_E(parser)) {
+                    pm_parser_warn_node(parser, node, PM_WARN_INTEGER_IN_FLIP_FLOP);
+                }
+            } else {
+                pm_parser_warn_conditional_predicate_literal(parser, node, type, PM_WARN_LITERAL_IN_CONDITION_VERBOSE, "");
+            }
+            break;
+        case PM_STRING_NODE:
+        case PM_SOURCE_FILE_NODE:
+        case PM_INTERPOLATED_STRING_NODE:
+            pm_parser_warn_conditional_predicate_literal(parser, node, type, PM_WARN_LITERAL_IN_CONDITION_DEFAULT, "string ");
+            break;
+        case PM_SYMBOL_NODE:
+        case PM_INTERPOLATED_SYMBOL_NODE:
+            pm_parser_warn_conditional_predicate_literal(parser, node, type, PM_WARN_LITERAL_IN_CONDITION_VERBOSE, "symbol ");
+            break;
+        case PM_SOURCE_LINE_NODE:
+        case PM_SOURCE_ENCODING_NODE:
+        case PM_FLOAT_NODE:
+        case PM_RATIONAL_NODE:
+        case PM_IMAGINARY_NODE:
+            pm_parser_warn_conditional_predicate_literal(parser, node, type, PM_WARN_LITERAL_IN_CONDITION_VERBOSE, "");
+            break;
+        case PM_CLASS_VARIABLE_WRITE_NODE:
+            pm_conditional_predicate_warn_write_literal(parser, ((pm_class_variable_write_node_t *) node)->value);
+            break;
+        case PM_CONSTANT_WRITE_NODE:
+            pm_conditional_predicate_warn_write_literal(parser, ((pm_constant_write_node_t *) node)->value);
+            break;
+        case PM_GLOBAL_VARIABLE_WRITE_NODE:
+            pm_conditional_predicate_warn_write_literal(parser, ((pm_global_variable_write_node_t *) node)->value);
+            break;
+        case PM_INSTANCE_VARIABLE_WRITE_NODE:
+            pm_conditional_predicate_warn_write_literal(parser, ((pm_instance_variable_write_node_t *) node)->value);
+            break;
+        case PM_LOCAL_VARIABLE_WRITE_NODE:
+            pm_conditional_predicate_warn_write_literal(parser, ((pm_local_variable_write_node_t *) node)->value);
+            break;
+        case PM_MULTI_WRITE_NODE:
+            pm_conditional_predicate_warn_write_literal(parser, ((pm_multi_write_node_t *) node)->value);
+            break;
+        default:
+            break;
+    }
+}
+
+/**
+ * In a lot of places in the tree you can have tokens that are not provided but
+ * that do not cause an error. For example, this happens in a method call
+ * without parentheses. In these cases we set the token to the "not provided" type.
+ * For example:
+ *
+ *     pm_token_t token = not_provided(parser);
+ */
+static inline pm_token_t
+not_provided(pm_parser_t *parser) {
+    return (pm_token_t) { .type = PM_TOKEN_NOT_PROVIDED, .start = parser->start, .end = parser->start };
+}
+
+#define PM_LOCATION_NULL_VALUE(parser) ((pm_location_t) { .start = (parser)->start, .end = (parser)->start })
+#define PM_LOCATION_TOKEN_VALUE(token) ((pm_location_t) { .start = (token)->start, .end = (token)->end })
+#define PM_LOCATION_NODE_VALUE(node) ((pm_location_t) { .start = (node)->location.start, .end = (node)->location.end })
+#define PM_LOCATION_NODE_BASE_VALUE(node) ((pm_location_t) { .start = (node)->base.location.start, .end = (node)->base.location.end })
+#define PM_OPTIONAL_LOCATION_NOT_PROVIDED_VALUE ((pm_location_t) { .start = NULL, .end = NULL })
+#define PM_OPTIONAL_LOCATION_TOKEN_VALUE(token) ((token)->type == PM_TOKEN_NOT_PROVIDED ? PM_OPTIONAL_LOCATION_NOT_PROVIDED_VALUE : PM_LOCATION_TOKEN_VALUE(token))
+
+/**
+ * This is a special out parameter to the parse_arguments_list function that
+ * includes opening and closing parentheses in addition to the arguments since
+ * it's so common. It is handy to use when passing argument information to one
+ * of the call node creation functions.
+ */
+typedef struct {
+    /** The optional location of the opening parenthesis or bracket. */
+    pm_location_t opening_loc;
+
+    /** The lazily-allocated optional arguments node. */
+    pm_arguments_node_t *arguments;
+
+    /** The optional location of the closing parenthesis or bracket. */
+    pm_location_t closing_loc;
+
+    /** The optional block attached to the call. */
+    pm_node_t *block;
+
+    /** The flag indicating whether this arguments list has forwarding argument. */
+    bool has_forwarding;
+} pm_arguments_t;
+
+/**
+ * Retrieve the end location of a `pm_arguments_t` object.
+ */
+static inline const uint8_t *
+pm_arguments_end(pm_arguments_t *arguments) {
+    if (arguments->block != NULL) {
+        const uint8_t *end = arguments->block->location.end;
+        if (arguments->closing_loc.start != NULL && arguments->closing_loc.end > end) {
+            end = arguments->closing_loc.end;
+        }
+        return end;
+    }
+    if (arguments->closing_loc.start != NULL) {
+        return arguments->closing_loc.end;
+    }
+    if (arguments->arguments != NULL) {
+        return arguments->arguments->base.location.end;
+    }
+    return arguments->closing_loc.end;
+}
+
+/**
+ * Check that we're not about to attempt to attach a brace block to a call that
+ * has arguments without parentheses.
+ */
+static void
+pm_arguments_validate_block(pm_parser_t *parser, pm_arguments_t *arguments, pm_block_node_t *block) {
+    // First, check that we have arguments and that we don't have a closing
+    // location for them.
+    if (arguments->arguments == NULL || arguments->closing_loc.start != NULL) {
+        return;
+    }
+
+    // Next, check that we don't have a single parentheses argument. This would
+    // look like:
+    //
+    //     foo (1) {}
+    //
+    // In this case, it's actually okay for the block to be attached to the
+    // call, even though it looks like it's attached to the argument.
+    if (arguments->arguments->arguments.size == 1 && PM_NODE_TYPE_P(arguments->arguments->arguments.nodes[0], PM_PARENTHESES_NODE)) {
+        return;
+    }
+
+    // If we didn't hit a case before this check, then at this point we need to
+    // add a syntax error.
+    pm_parser_err_node(parser, (pm_node_t *) block, PM_ERR_ARGUMENT_UNEXPECTED_BLOCK);
+}
+
+/******************************************************************************/
+/* Basic character checks                                                     */
+/******************************************************************************/
+
+/**
+ * This function is used extremely frequently to lex all of the identifiers in a
+ * source file, so it's important that it be as fast as possible. For this
+ * reason we have the encoding_changed boolean to check if we need to go through
+ * the function pointer or can just directly use the UTF-8 functions.
+ */
+static inline size_t
+char_is_identifier_start(const pm_parser_t *parser, const uint8_t *b, ptrdiff_t n) {
+    if (n <= 0) return 0;
+
+    if (parser->encoding_changed) {
+        size_t width;
+
+        if ((width = parser->encoding->alpha_char(b, n)) != 0) {
+            return width;
+        } else if (*b == '_') {
+            return 1;
+        } else if (*b >= 0x80) {
+            return parser->encoding->char_width(b, n);
+        } else {
+            return 0;
+        }
+    } else if (*b < 0x80) {
+        return (pm_encoding_unicode_table[*b] & PRISM_ENCODING_ALPHABETIC_BIT ? 1 : 0) || (*b == '_');
+    } else {
+        return pm_encoding_utf_8_char_width(b, n);
+    }
+}
+
+/**
+ * Similar to char_is_identifier but this function assumes that the encoding
+ * has not been changed.
+ */
+static inline size_t
+char_is_identifier_utf8(const uint8_t *b, ptrdiff_t n) {
+    if (n <= 0) {
+        return 0;
+    } else if (*b < 0x80) {
+        return (*b == '_') || (pm_encoding_unicode_table[*b] & PRISM_ENCODING_ALPHANUMERIC_BIT ? 1 : 0);
+    } else {
+        return pm_encoding_utf_8_char_width(b, n);
+    }
+}
+
+/**
+ * Like the above, this function is also used extremely frequently to lex all of
+ * the identifiers in a source file once the first character has been found. So
+ * it's important that it be as fast as possible.
+ */
+static inline size_t
+char_is_identifier(const pm_parser_t *parser, const uint8_t *b, ptrdiff_t n) {
+    if (n <= 0) {
+        return 0;
+    } else if (parser->encoding_changed) {
+        size_t width;
+
+        if ((width = parser->encoding->alnum_char(b, n)) != 0) {
+            return width;
+        } else if (*b == '_') {
+            return 1;
+        } else if (*b >= 0x80) {
+            return parser->encoding->char_width(b, n);
+        } else {
+            return 0;
+        }
+    } else {
+        return char_is_identifier_utf8(b, n);
+    }
+}
+
+// Here we're defining a perfect hash for the characters that are allowed in
+// global names. This is used to quickly check the next character after a $ to
+// see if it's a valid character for a global name.
+#define BIT(c, idx) (((c) / 32 - 1 == idx) ? (1U << ((c) % 32)) : 0)
+#define PUNCT(idx) ( \
+                BIT('~', idx) | BIT('*', idx) | BIT('$', idx) | BIT('?', idx) | \
+                BIT('!', idx) | BIT('@', idx) | BIT('/', idx) | BIT('\\', idx) | \
+                BIT(';', idx) | BIT(',', idx) | BIT('.', idx) | BIT('=', idx) | \
+                BIT(':', idx) | BIT('<', idx) | BIT('>', idx) | BIT('\"', idx) | \
+                BIT('&', idx) | BIT('`', idx) | BIT('\'', idx) | BIT('+', idx) | \
+                BIT('0', idx))
+
+const unsigned int pm_global_name_punctuation_hash[(0x7e - 0x20 + 31) / 32] = { PUNCT(0), PUNCT(1), PUNCT(2) };
+
+#undef BIT
+#undef PUNCT
+
+static inline bool
+char_is_global_name_punctuation(const uint8_t b) {
+    const unsigned int i = (const unsigned int) b;
+    if (i <= 0x20 || 0x7e < i) return false;
+
+    return (pm_global_name_punctuation_hash[(i - 0x20) / 32] >> (i % 32)) & 1;
+}
+
+static inline bool
+token_is_setter_name(pm_token_t *token) {
+    return (
+        (token->type == PM_TOKEN_BRACKET_LEFT_RIGHT_EQUAL) ||
+        ((token->type == PM_TOKEN_IDENTIFIER) &&
+        (token->end - token->start >= 2) &&
+        (token->end[-1] == '='))
+    );
+}
+
+/**
+ * Returns true if the given local variable is a keyword.
+ */
+static bool
+pm_local_is_keyword(const char *source, size_t length) {
+#define KEYWORD(name) if (memcmp(source, name, length) == 0) return true
+
+    switch (length) {
+        case 2:
+            switch (source[0]) {
+                case 'd': KEYWORD("do"); return false;
+                case 'i': KEYWORD("if"); KEYWORD("in"); return false;
+                case 'o': KEYWORD("or"); return false;
+                default: return false;
+            }
+        case 3:
+            switch (source[0]) {
+                case 'a': KEYWORD("and"); return false;
+                case 'd': KEYWORD("def"); return false;
+                case 'e': KEYWORD("end"); return false;
+                case 'f': KEYWORD("for"); return false;
+                case 'n': KEYWORD("nil"); KEYWORD("not"); return false;
+                default: return false;
+            }
+        case 4:
+            switch (source[0]) {
+                case 'c': KEYWORD("case"); return false;
+                case 'e': KEYWORD("else"); return false;
+                case 'n': KEYWORD("next"); return false;
+                case 'r': KEYWORD("redo"); return false;
+                case 's': KEYWORD("self"); return false;
+                case 't': KEYWORD("then");  KEYWORD("true"); return false;
+                case 'w': KEYWORD("when"); return false;
+                default: return false;
+            }
+        case 5:
+            switch (source[0]) {
+                case 'a': KEYWORD("alias"); return false;
+                case 'b': KEYWORD("begin"); KEYWORD("break"); return false;
+                case 'c': KEYWORD("class"); return false;
+                case 'e': KEYWORD("elsif"); return false;
+                case 'f': KEYWORD("false"); return false;
+                case 'r': KEYWORD("retry"); return false;
+                case 's': KEYWORD("super"); return false;
+                case 'u': KEYWORD("undef"); KEYWORD("until"); return false;
+                case 'w': KEYWORD("while"); return false;
+                case 'y': KEYWORD("yield"); return false;
+                default: return false;
+            }
+        case 6:
+            switch (source[0]) {
+                case 'e': KEYWORD("ensure"); return false;
+                case 'm': KEYWORD("module"); return false;
+                case 'r': KEYWORD("rescue"); KEYWORD("return"); return false;
+                case 'u': KEYWORD("unless"); return false;
+                default: return false;
+            }
+        case 8:
+            KEYWORD("__LINE__");
+            KEYWORD("__FILE__");
+            return false;
+        case 12:
+            KEYWORD("__ENCODING__");
+            return false;
+        default:
+            return false;
+    }
+
+#undef KEYWORD
+}
+
+/******************************************************************************/
+/* Node flag handling functions                                               */
+/******************************************************************************/
+
+/**
+ * Set the given flag on the given node.
+ */
+static inline void
+pm_node_flag_set(pm_node_t *node, pm_node_flags_t flag) {
+    node->flags |= flag;
+}
+
+/**
+ * Remove the given flag from the given node.
+ */
+static inline void
+pm_node_flag_unset(pm_node_t *node, pm_node_flags_t flag) {
+    node->flags &= (pm_node_flags_t) ~flag;
+}
+
+/**
+ * Set the repeated parameter flag on the given node.
+ */
+static inline void
+pm_node_flag_set_repeated_parameter(pm_node_t *node) {
+    assert(PM_NODE_TYPE(node) == PM_BLOCK_LOCAL_VARIABLE_NODE ||
+            PM_NODE_TYPE(node) == PM_BLOCK_PARAMETER_NODE ||
+            PM_NODE_TYPE(node) == PM_KEYWORD_REST_PARAMETER_NODE ||
+            PM_NODE_TYPE(node) == PM_OPTIONAL_KEYWORD_PARAMETER_NODE ||
+            PM_NODE_TYPE(node) == PM_OPTIONAL_PARAMETER_NODE ||
+            PM_NODE_TYPE(node) == PM_REQUIRED_KEYWORD_PARAMETER_NODE ||
+            PM_NODE_TYPE(node) == PM_REQUIRED_PARAMETER_NODE ||
+            PM_NODE_TYPE(node) == PM_REST_PARAMETER_NODE);
+
+    pm_node_flag_set(node, PM_PARAMETER_FLAGS_REPEATED_PARAMETER);
+}
+
+/******************************************************************************/
+/* Node creation functions                                                    */
+/******************************************************************************/
+
+/**
+ * When you have an encoding flag on a regular expression, it takes precedence
+ * over all of the previously set encoding flags. So we need to mask off any
+ * previously set encoding flags before setting the new one.
+ */
+#define PM_REGULAR_EXPRESSION_ENCODING_MASK ~(PM_REGULAR_EXPRESSION_FLAGS_EUC_JP | PM_REGULAR_EXPRESSION_FLAGS_ASCII_8BIT | PM_REGULAR_EXPRESSION_FLAGS_WINDOWS_31J | PM_REGULAR_EXPRESSION_FLAGS_UTF_8)
+
+/**
+ * Parse out the options for a regular expression.
+ */
+static inline pm_node_flags_t
+pm_regular_expression_flags_create(pm_parser_t *parser, const pm_token_t *closing) {
+    pm_node_flags_t flags = 0;
+
+    if (closing->type == PM_TOKEN_REGEXP_END) {
+        pm_buffer_t unknown_flags = { 0 };
+
+        for (const uint8_t *flag = closing->start + 1; flag < closing->end; flag++) {
+            switch (*flag) {
+                case 'i': flags |= PM_REGULAR_EXPRESSION_FLAGS_IGNORE_CASE; break;
+                case 'm': flags |= PM_REGULAR_EXPRESSION_FLAGS_MULTI_LINE; break;
+                case 'x': flags |= PM_REGULAR_EXPRESSION_FLAGS_EXTENDED; break;
+                case 'o': flags |= PM_REGULAR_EXPRESSION_FLAGS_ONCE; break;
+
+                case 'e': flags = (pm_node_flags_t) (((pm_node_flags_t) (flags & PM_REGULAR_EXPRESSION_ENCODING_MASK)) | PM_REGULAR_EXPRESSION_FLAGS_EUC_JP); break;
+                case 'n': flags = (pm_node_flags_t) (((pm_node_flags_t) (flags & PM_REGULAR_EXPRESSION_ENCODING_MASK)) | PM_REGULAR_EXPRESSION_FLAGS_ASCII_8BIT); break;
+                case 's': flags = (pm_node_flags_t) (((pm_node_flags_t) (flags & PM_REGULAR_EXPRESSION_ENCODING_MASK)) | PM_REGULAR_EXPRESSION_FLAGS_WINDOWS_31J); break;
+                case 'u': flags = (pm_node_flags_t) (((pm_node_flags_t) (flags & PM_REGULAR_EXPRESSION_ENCODING_MASK)) | PM_REGULAR_EXPRESSION_FLAGS_UTF_8); break;
+
+                default: pm_buffer_append_byte(&unknown_flags, *flag);
+            }
+        }
+
+        size_t unknown_flags_length = pm_buffer_length(&unknown_flags);
+        if (unknown_flags_length != 0) {
+            const char *word = unknown_flags_length >= 2 ? "options" : "option";
+            PM_PARSER_ERR_TOKEN_FORMAT(parser, parser->previous, PM_ERR_REGEXP_UNKNOWN_OPTIONS, word, unknown_flags_length, pm_buffer_value(&unknown_flags));
+        }
+        pm_buffer_free(&unknown_flags);
+    }
+
+    return flags;
+}
+
+#undef PM_REGULAR_EXPRESSION_ENCODING_MASK
+
+static pm_statements_node_t *
+pm_statements_node_create(pm_parser_t *parser);
+
+static void
+pm_statements_node_body_append(pm_parser_t *parser, pm_statements_node_t *node, pm_node_t *statement, bool newline);
+
+static size_t
+pm_statements_node_body_length(pm_statements_node_t *node);
+
+/**
+ * This function is here to allow us a place to extend in the future when we
+ * implement our own arena allocation.
+ */
+static inline void *
+pm_node_alloc(PRISM_ATTRIBUTE_UNUSED pm_parser_t *parser, size_t size) {
+    void *memory = xcalloc(1, size);
+    if (memory == NULL) {
+        fprintf(stderr, "Failed to allocate %d bytes\n", (int) size);
+        abort();
+    }
+    return memory;
+}
+
+#define PM_NODE_ALLOC(parser, type) (type *) pm_node_alloc(parser, sizeof(type))
+#define PM_NODE_IDENTIFY(parser) (++parser->node_id)
+
+/**
+ * Allocate a new MissingNode node.
+ */
+static pm_missing_node_t *
+pm_missing_node_create(pm_parser_t *parser, const uint8_t *start, const uint8_t *end) {
+    pm_missing_node_t *node = PM_NODE_ALLOC(parser, pm_missing_node_t);
+
+    *node = (pm_missing_node_t) {{
+        .type = PM_MISSING_NODE,
+        .node_id = PM_NODE_IDENTIFY(parser),
+        .location = { .start = start, .end = end }
+    }};
+
+    return node;
+}
+
+/**
+ * Allocate and initialize a new AliasGlobalVariableNode node.
+ */
+static pm_alias_global_variable_node_t *
+pm_alias_global_variable_node_create(pm_parser_t *parser, const pm_token_t *keyword, pm_node_t *new_name, pm_node_t *old_name) {
+    assert(keyword->type == PM_TOKEN_KEYWORD_ALIAS);
+    pm_alias_global_variable_node_t *node = PM_NODE_ALLOC(parser, pm_alias_global_variable_node_t);
+
+    *node = (pm_alias_global_variable_node_t) {
+        {
+            .type = PM_ALIAS_GLOBAL_VARIABLE_NODE,
+            .node_id = PM_NODE_IDENTIFY(parser),
+            .location = {
+                .start = keyword->start,
+                .end = old_name->location.end
+            },
+        },
+        .new_name = new_name,
+        .old_name = old_name,
+        .keyword_loc = PM_LOCATION_TOKEN_VALUE(keyword)
+    };
+
+    return node;
+}
+
+/**
+ * Allocate and initialize a new AliasMethodNode node.
+ */
+static pm_alias_method_node_t *
+pm_alias_method_node_create(pm_parser_t *parser, const pm_token_t *keyword, pm_node_t *new_name, pm_node_t *old_name) {
+    assert(keyword->type == PM_TOKEN_KEYWORD_ALIAS);
+    pm_alias_method_node_t *node = PM_NODE_ALLOC(parser, pm_alias_method_node_t);
+
+    *node = (pm_alias_method_node_t) {
+        {
+            .type = PM_ALIAS_METHOD_NODE,
+            .node_id = PM_NODE_IDENTIFY(parser),
+            .location = {
+                .start = keyword->start,
+                .end = old_name->location.end
+            },
+        },
+        .new_name = new_name,
+        .old_name = old_name,
+        .keyword_loc = PM_LOCATION_TOKEN_VALUE(keyword)
+    };
+
+    return node;
+}
+
+/**
+ * Allocate a new AlternationPatternNode node.
+ */
+static pm_alternation_pattern_node_t *
+pm_alternation_pattern_node_create(pm_parser_t *parser, pm_node_t *left, pm_node_t *right, const pm_token_t *operator) {
+    pm_alternation_pattern_node_t *node = PM_NODE_ALLOC(parser, pm_alternation_pattern_node_t);
+
+    *node = (pm_alternation_pattern_node_t) {
+        {
+            .type = PM_ALTERNATION_PATTERN_NODE,
+            .node_id = PM_NODE_IDENTIFY(parser),
+            .location = {
+                .start = left->location.start,
+                .end = right->location.end
+            },
+        },
+        .left = left,
+        .right = right,
+        .operator_loc = PM_LOCATION_TOKEN_VALUE(operator)
+    };
+
+    return node;
+}
+
+/**
+ * Allocate and initialize a new and node.
+ */
+static pm_and_node_t *
+pm_and_node_create(pm_parser_t *parser, pm_node_t *left, const pm_token_t *operator, pm_node_t *right) {
+    pm_assert_value_expression(parser, left);
+
+    pm_and_node_t *node = PM_NODE_ALLOC(parser, pm_and_node_t);
+
+    *node = (pm_and_node_t) {
+        {
+            .type = PM_AND_NODE,
+            .node_id = PM_NODE_IDENTIFY(parser),
+            .location = {
+                .start = left->location.start,
+                .end = right->location.end
+            },
+        },
+        .left = left,
+        .operator_loc = PM_LOCATION_TOKEN_VALUE(operator),
+        .right = right
+    };
+
+    return node;
+}
+
+/**
+ * Allocate an initialize a new arguments node.
+ */
+static pm_arguments_node_t *
+pm_arguments_node_create(pm_parser_t *parser) {
+    pm_arguments_node_t *node = PM_NODE_ALLOC(parser, pm_arguments_node_t);
+
+    *node = (pm_arguments_node_t) {
+        {
+            .type = PM_ARGUMENTS_NODE,
+            .node_id = PM_NODE_IDENTIFY(parser),
+            .location = PM_LOCATION_NULL_VALUE(parser)
+        },
+        .arguments = { 0 }
+    };
+
+    return node;
+}
+
+/**
+ * Return the size of the given arguments node.
+ */
+static size_t
+pm_arguments_node_size(pm_arguments_node_t *node) {
+    return node->arguments.size;
+}
+
+/**
+ * Append an argument to an arguments node.
+ */
+static void
+pm_arguments_node_arguments_append(pm_arguments_node_t *node, pm_node_t *argument) {
+    if (pm_arguments_node_size(node) == 0) {
+        node->base.location.start = argument->location.start;
+    }
+
+    node->base.location.end = argument->location.end;
+    pm_node_list_append(&node->arguments, argument);
+
+    if (PM_NODE_TYPE_P(argument, PM_SPLAT_NODE)) {
+        if (PM_NODE_FLAG_P(node, PM_ARGUMENTS_NODE_FLAGS_CONTAINS_SPLAT)) {
+            pm_node_flag_set((pm_node_t *) node, PM_ARGUMENTS_NODE_FLAGS_CONTAINS_MULTIPLE_SPLATS);
+        } else {
+            pm_node_flag_set((pm_node_t *) node, PM_ARGUMENTS_NODE_FLAGS_CONTAINS_SPLAT);
+        }
+    }
+}
+
+/**
+ * Allocate and initialize a new ArrayNode node.
+ */
+static pm_array_node_t *
+pm_array_node_create(pm_parser_t *parser, const pm_token_t *opening) {
+    pm_array_node_t *node = PM_NODE_ALLOC(parser, pm_array_node_t);
+
+    *node = (pm_array_node_t) {
+        {
+            .type = PM_ARRAY_NODE,
+            .flags = PM_NODE_FLAG_STATIC_LITERAL,
+            .node_id = PM_NODE_IDENTIFY(parser),
+            .location = PM_LOCATION_TOKEN_VALUE(opening)
+        },
+        .opening_loc = PM_OPTIONAL_LOCATION_TOKEN_VALUE(opening),
+        .closing_loc = PM_OPTIONAL_LOCATION_TOKEN_VALUE(opening),
+        .elements = { 0 }
+    };
+
+    return node;
+}
+
+/**
+ * Append an argument to an array node.
+ */
+static inline void
+pm_array_node_elements_append(pm_array_node_t *node, pm_node_t *element) {
+    if (!node->elements.size && !node->opening_loc.start) {
+        node->base.location.start = element->location.start;
+    }
+
+    pm_node_list_append(&node->elements, element);
+    node->base.location.end = element->location.end;
+
+    // If the element is not a static literal, then the array is not a static
+    // literal. Turn that flag off.
+    if (PM_NODE_TYPE_P(element, PM_ARRAY_NODE) || PM_NODE_TYPE_P(element, PM_HASH_NODE) || PM_NODE_TYPE_P(element, PM_RANGE_NODE) || !PM_NODE_FLAG_P(element, PM_NODE_FLAG_STATIC_LITERAL)) {
+        pm_node_flag_unset((pm_node_t *)node, PM_NODE_FLAG_STATIC_LITERAL);
+    }
+
+    if (PM_NODE_TYPE_P(element, PM_SPLAT_NODE)) {
+        pm_node_flag_set((pm_node_t *)node, PM_ARRAY_NODE_FLAGS_CONTAINS_SPLAT);
+    }
+}
+
+/**
+ * Set the closing token and end location of an array node.
+ */
+static void
+pm_array_node_close_set(pm_array_node_t *node, const pm_token_t *closing) {
+    assert(closing->type == PM_TOKEN_BRACKET_RIGHT || closing->type == PM_TOKEN_STRING_END || closing->type == PM_TOKEN_MISSING || closing->type == PM_TOKEN_NOT_PROVIDED);
+    node->base.location.end = closing->end;
+    node->closing_loc = PM_LOCATION_TOKEN_VALUE(closing);
+}
+
+/**
+ * Allocate and initialize a new array pattern node. The node list given in the
+ * nodes parameter is guaranteed to have at least two nodes.
+ */
+static pm_array_pattern_node_t *
+pm_array_pattern_node_node_list_create(pm_parser_t *parser, pm_node_list_t *nodes) {
+    pm_array_pattern_node_t *node = PM_NODE_ALLOC(parser, pm_array_pattern_node_t);
+
+    *node = (pm_array_pattern_node_t) {
+        {
+            .type = PM_ARRAY_PATTERN_NODE,
+            .node_id = PM_NODE_IDENTIFY(parser),
+            .location = {
+                .start = nodes->nodes[0]->location.start,
+                .end = nodes->nodes[nodes->size - 1]->location.end
+            },
+        },
+        .constant = NULL,
+        .rest = NULL,
+        .requireds = { 0 },
+        .posts = { 0 },
+        .opening_loc = PM_OPTIONAL_LOCATION_NOT_PROVIDED_VALUE,
+        .closing_loc = PM_OPTIONAL_LOCATION_NOT_PROVIDED_VALUE
+    };
+
+    // For now we're going to just copy over each pointer manually. This could be
+    // much more efficient, as we could instead resize the node list.
+    bool found_rest = false;
+    pm_node_t *child;
+
+    PM_NODE_LIST_FOREACH(nodes, index, child) {
+        if (!found_rest && (PM_NODE_TYPE_P(child, PM_SPLAT_NODE) || PM_NODE_TYPE_P(child, PM_IMPLICIT_REST_NODE))) {
+            node->rest = child;
+            found_rest = true;
+        } else if (found_rest) {
+            pm_node_list_append(&node->posts, child);
+        } else {
+            pm_node_list_append(&node->requireds, child);
+        }
+    }
+
+    return node;
+}
+
+/**
+ * Allocate and initialize a new array pattern node from a single rest node.
+ */
+static pm_array_pattern_node_t *
+pm_array_pattern_node_rest_create(pm_parser_t *parser, pm_node_t *rest) {
+    pm_array_pattern_node_t *node = PM_NODE_ALLOC(parser, pm_array_pattern_node_t);
+
+    *node = (pm_array_pattern_node_t) {
+        {
+            .type = PM_ARRAY_PATTERN_NODE,
+            .node_id = PM_NODE_IDENTIFY(parser),
+            .location = rest->location,
+        },
+        .constant = NULL,
+        .rest = rest,
+        .requireds = { 0 },
+        .posts = { 0 },
+        .opening_loc = PM_OPTIONAL_LOCATION_NOT_PROVIDED_VALUE,
+        .closing_loc = PM_OPTIONAL_LOCATION_NOT_PROVIDED_VALUE
+    };
+
+    return node;
+}
+
+/**
+ * Allocate and initialize a new array pattern node from a constant and opening
+ * and closing tokens.
+ */
+static pm_array_pattern_node_t *
+pm_array_pattern_node_constant_create(pm_parser_t *parser, pm_node_t *constant, const pm_token_t *opening, const pm_token_t *closing) {
+    pm_array_pattern_node_t *node = PM_NODE_ALLOC(parser, pm_array_pattern_node_t);
+
+    *node = (pm_array_pattern_node_t) {
+        {
+            .type = PM_ARRAY_PATTERN_NODE,
+            .node_id = PM_NODE_IDENTIFY(parser),
+            .location = {
+                .start = constant->location.start,
+                .end = closing->end
+            },
+        },
+        .constant = constant,
+        .rest = NULL,
+        .opening_loc = PM_LOCATION_TOKEN_VALUE(opening),
+        .closing_loc = PM_LOCATION_TOKEN_VALUE(closing),
+        .requireds = { 0 },
+        .posts = { 0 }
+    };
+
+    return node;
+}
+
+/**
+ * Allocate and initialize a new array pattern node from an opening and closing
+ * token.
+ */
+static pm_array_pattern_node_t *
+pm_array_pattern_node_empty_create(pm_parser_t *parser, const pm_token_t *opening, const pm_token_t *closing) {
+    pm_array_pattern_node_t *node = PM_NODE_ALLOC(parser, pm_array_pattern_node_t);
+
+    *node = (pm_array_pattern_node_t) {
+        {
+            .type = PM_ARRAY_PATTERN_NODE,
+            .node_id = PM_NODE_IDENTIFY(parser),
+            .location = {
+                .start = opening->start,
+                .end = closing->end
+            },
+        },
+        .constant = NULL,
+        .rest = NULL,
+        .opening_loc = PM_LOCATION_TOKEN_VALUE(opening),
+        .closing_loc = PM_LOCATION_TOKEN_VALUE(closing),
+        .requireds = { 0 },
+        .posts = { 0 }
+    };
+
+    return node;
+}
+
+static inline void
+pm_array_pattern_node_requireds_append(pm_array_pattern_node_t *node, pm_node_t *inner) {
+    pm_node_list_append(&node->requireds, inner);
+}
+
+/**
+ * Allocate and initialize a new assoc node.
+ */
+static pm_assoc_node_t *
+pm_assoc_node_create(pm_parser_t *parser, pm_node_t *key, const pm_token_t *operator, pm_node_t *value) {
+    pm_assoc_node_t *node = PM_NODE_ALLOC(parser, pm_assoc_node_t);
+    const uint8_t *end;
+
+    if (value != NULL && value->location.end > key->location.end) {
+        end = value->location.end;
+    } else if (operator->type != PM_TOKEN_NOT_PROVIDED) {
+        end = operator->end;
+    } else {
+        end = key->location.end;
+    }
+
+    // Hash string keys will be frozen, so we can mark them as frozen here so
+    // that the compiler picks them up and also when we check for static literal
+    // on the keys it gets factored in.
+    if (PM_NODE_TYPE_P(key, PM_STRING_NODE)) {
+        key->flags |= PM_STRING_FLAGS_FROZEN | PM_NODE_FLAG_STATIC_LITERAL;
+    }
+
+    // If the key and value of this assoc node are both static literals, then
+    // we can mark this node as a static literal.
+    pm_node_flags_t flags = 0;
+    if (
+        !PM_NODE_TYPE_P(key, PM_ARRAY_NODE) && !PM_NODE_TYPE_P(key, PM_HASH_NODE) && !PM_NODE_TYPE_P(key, PM_RANGE_NODE) &&
+        value && !PM_NODE_TYPE_P(value, PM_ARRAY_NODE) && !PM_NODE_TYPE_P(value, PM_HASH_NODE) && !PM_NODE_TYPE_P(value, PM_RANGE_NODE)
+    ) {
+        flags = key->flags & value->flags & PM_NODE_FLAG_STATIC_LITERAL;
+    }
+
+    *node = (pm_assoc_node_t) {
+        {
+            .type = PM_ASSOC_NODE,
+            .flags = flags,
+            .node_id = PM_NODE_IDENTIFY(parser),
+            .location = {
+                .start = key->location.start,
+                .end = end
+            },
+        },
+        .key = key,
+        .operator_loc = PM_OPTIONAL_LOCATION_TOKEN_VALUE(operator),
+        .value = value
+    };
+
+    return node;
+}
+
+/**
+ * Allocate and initialize a new assoc splat node.
+ */
+static pm_assoc_splat_node_t *
+pm_assoc_splat_node_create(pm_parser_t *parser, pm_node_t *value, const pm_token_t *operator) {
+    assert(operator->type == PM_TOKEN_USTAR_STAR);
+    pm_assoc_splat_node_t *node = PM_NODE_ALLOC(parser, pm_assoc_splat_node_t);
+
+    *node = (pm_assoc_splat_node_t) {
+        {
+            .type = PM_ASSOC_SPLAT_NODE,
+            .node_id = PM_NODE_IDENTIFY(parser),
+            .location = {
+                .start = operator->start,
+                .end = value == NULL ? operator->end : value->location.end
+            },
+        },
+        .value = value,
+        .operator_loc = PM_LOCATION_TOKEN_VALUE(operator)
+    };
+
+    return node;
+}
+
+/**
+ * Allocate a new BackReferenceReadNode node.
+ */
+static pm_back_reference_read_node_t *
+pm_back_reference_read_node_create(pm_parser_t *parser, const pm_token_t *name) {
+    assert(name->type == PM_TOKEN_BACK_REFERENCE);
+    pm_back_reference_read_node_t *node = PM_NODE_ALLOC(parser, pm_back_reference_read_node_t);
+
+    *node = (pm_back_reference_read_node_t) {
+        {
+            .type = PM_BACK_REFERENCE_READ_NODE,
+            .node_id = PM_NODE_IDENTIFY(parser),
+            .location = PM_LOCATION_TOKEN_VALUE(name),
+        },
+        .name = pm_parser_constant_id_token(parser, name)
+    };
+
+    return node;
+}
+
+/**
+ * Allocate and initialize new a begin node.
+ */
+static pm_begin_node_t *
+pm_begin_node_create(pm_parser_t *parser, const pm_token_t *begin_keyword, pm_statements_node_t *statements) {
+    pm_begin_node_t *node = PM_NODE_ALLOC(parser, pm_begin_node_t);
+
+    *node = (pm_begin_node_t) {
+        {
+            .type = PM_BEGIN_NODE,
+            .node_id = PM_NODE_IDENTIFY(parser),
+            .location = {
+                .start = begin_keyword->start,
+                .end = statements == NULL ? begin_keyword->end : statements->base.location.end
+            },
+        },
+        .begin_keyword_loc = PM_OPTIONAL_LOCATION_TOKEN_VALUE(begin_keyword),
+        .statements = statements,
+        .end_keyword_loc = PM_OPTIONAL_LOCATION_NOT_PROVIDED_VALUE
+    };
+
+    return node;
+}
+
+/**
+ * Set the rescue clause, optionally start, and end location of a begin node.
+ */
+static void
+pm_begin_node_rescue_clause_set(pm_begin_node_t *node, pm_rescue_node_t *rescue_clause) {
+    // If the begin keyword doesn't exist, we set the start on the begin_node
+    if (!node->begin_keyword_loc.start) {
+        node->base.location.start = rescue_clause->base.location.start;
+    }
+    node->base.location.end = rescue_clause->base.location.end;
+    node->rescue_clause = rescue_clause;
+}
+
+/**
+ * Set the else clause and end location of a begin node.
+ */
+static void
+pm_begin_node_else_clause_set(pm_begin_node_t *node, pm_else_node_t *else_clause) {
+    node->base.location.end = else_clause->base.location.end;
+    node->else_clause = else_clause;
+}
+
+/**
+ * Set the ensure clause and end location of a begin node.
+ */
+static void
+pm_begin_node_ensure_clause_set(pm_begin_node_t *node, pm_ensure_node_t *ensure_clause) {
+    node->base.location.end = ensure_clause->base.location.end;
+    node->ensure_clause = ensure_clause;
+}
+
+/**
+ * Set the end keyword and end location of a begin node.
+ */
+static void
+pm_begin_node_end_keyword_set(pm_begin_node_t *node, const pm_token_t *end_keyword) {
+    assert(end_keyword->type == PM_TOKEN_KEYWORD_END || end_keyword->type == PM_TOKEN_MISSING);
+
+    node->base.location.end = end_keyword->end;
+    node->end_keyword_loc = PM_OPTIONAL_LOCATION_TOKEN_VALUE(end_keyword);
+}
+
+/**
+ * Allocate and initialize a new BlockArgumentNode node.
+ */
+static pm_block_argument_node_t *
+pm_block_argument_node_create(pm_parser_t *parser, const pm_token_t *operator, pm_node_t *expression) {
+    pm_block_argument_node_t *node = PM_NODE_ALLOC(parser, pm_block_argument_node_t);
+
+    *node = (pm_block_argument_node_t) {
+        {
+            .type = PM_BLOCK_ARGUMENT_NODE,
+            .node_id = PM_NODE_IDENTIFY(parser),
+            .location = {
+                .start = operator->start,
+                .end = expression == NULL ? operator->end : expression->location.end
+            },
+        },
+        .expression = expression,
+        .operator_loc = PM_LOCATION_TOKEN_VALUE(operator)
+    };
+
+    return node;
+}
+
+/**
+ * Allocate and initialize a new BlockNode node.
+ */
+static pm_block_node_t *
+pm_block_node_create(pm_parser_t *parser, pm_constant_id_list_t *locals, const pm_token_t *opening, pm_node_t *parameters, pm_node_t *body, const pm_token_t *closing) {
+    pm_block_node_t *node = PM_NODE_ALLOC(parser, pm_block_node_t);
+
+    *node = (pm_block_node_t) {
+        {
+            .type = PM_BLOCK_NODE,
+            .node_id = PM_NODE_IDENTIFY(parser),
+            .location = { .start = opening->start, .end = closing->end },
+        },
+        .locals = *locals,
+        .parameters = parameters,
+        .body = body,
+        .opening_loc = PM_LOCATION_TOKEN_VALUE(opening),
+        .closing_loc = PM_LOCATION_TOKEN_VALUE(closing)
+    };
+
+    return node;
+}
+
+/**
+ * Allocate and initialize a new BlockParameterNode node.
+ */
+static pm_block_parameter_node_t *
+pm_block_parameter_node_create(pm_parser_t *parser, const pm_token_t *name, const pm_token_t *operator) {
+    assert(operator->type == PM_TOKEN_NOT_PROVIDED || operator->type == PM_TOKEN_UAMPERSAND || operator->type == PM_TOKEN_AMPERSAND);
+    pm_block_parameter_node_t *node = PM_NODE_ALLOC(parser, pm_block_parameter_node_t);
+
+    *node = (pm_block_parameter_node_t) {
+        {
+            .type = PM_BLOCK_PARAMETER_NODE,
+            .node_id = PM_NODE_IDENTIFY(parser),
+            .location = {
+                .start = operator->start,
+                .end = (name->type == PM_TOKEN_NOT_PROVIDED ? operator->end : name->end)
+            },
+        },
+        .name = pm_parser_optional_constant_id_token(parser, name),
+        .name_loc = PM_OPTIONAL_LOCATION_TOKEN_VALUE(name),
+        .operator_loc = PM_LOCATION_TOKEN_VALUE(operator)
+    };
+
+    return node;
+}
+
+/**
+ * Allocate and initialize a new BlockParametersNode node.
+ */
+static pm_block_parameters_node_t *
+pm_block_parameters_node_create(pm_parser_t *parser, pm_parameters_node_t *parameters, const pm_token_t *opening) {
+    pm_block_parameters_node_t *node = PM_NODE_ALLOC(parser, pm_block_parameters_node_t);
+
+    const uint8_t *start;
+    if (opening->type != PM_TOKEN_NOT_PROVIDED) {
+        start = opening->start;
+    } else if (parameters != NULL) {
+        start = parameters->base.location.start;
+    } else {
+        start = NULL;
+    }
+
+    const uint8_t *end;
+    if (parameters != NULL) {
+        end = parameters->base.location.end;
+    } else if (opening->type != PM_TOKEN_NOT_PROVIDED) {
+        end = opening->end;
+    } else {
+        end = NULL;
+    }
+
+    *node = (pm_block_parameters_node_t) {
+        {
+            .type = PM_BLOCK_PARAMETERS_NODE,
+            .node_id = PM_NODE_IDENTIFY(parser),
+            .location = {
+                .start = start,
+                .end = end
+            }
+        },
+        .parameters = parameters,
+        .opening_loc = PM_OPTIONAL_LOCATION_TOKEN_VALUE(opening),
+        .closing_loc = PM_OPTIONAL_LOCATION_NOT_PROVIDED_VALUE,
+        .locals = { 0 }
+    };
+
+    return node;
+}
+
+/**
+ * Set the closing location of a BlockParametersNode node.
+ */
+static void
+pm_block_parameters_node_closing_set(pm_block_parameters_node_t *node, const pm_token_t *closing) {
+    assert(closing->type == PM_TOKEN_PIPE || closing->type == PM_TOKEN_PARENTHESIS_RIGHT || closing->type == PM_TOKEN_MISSING);
+
+    node->base.location.end = closing->end;
+    node->closing_loc = PM_LOCATION_TOKEN_VALUE(closing);
+}
+
+/**
+ * Allocate and initialize a new BlockLocalVariableNode node.
+ */
+static pm_block_local_variable_node_t *
+pm_block_local_variable_node_create(pm_parser_t *parser, const pm_token_t *name) {
+    pm_block_local_variable_node_t *node = PM_NODE_ALLOC(parser, pm_block_local_variable_node_t);
+
+    *node = (pm_block_local_variable_node_t) {
+        {
+            .type = PM_BLOCK_LOCAL_VARIABLE_NODE,
+            .node_id = PM_NODE_IDENTIFY(parser),
+            .location = PM_LOCATION_TOKEN_VALUE(name),
+        },
+        .name = pm_parser_constant_id_token(parser, name)
+    };
+
+    return node;
+}
+
+/**
+ * Append a new block-local variable to a BlockParametersNode node.
+ */
+static void
+pm_block_parameters_node_append_local(pm_block_parameters_node_t *node, const pm_block_local_variable_node_t *local) {
+    pm_node_list_append(&node->locals, (pm_node_t *) local);
+
+    if (node->base.location.start == NULL) node->base.location.start = local->base.location.start;
+    node->base.location.end = local->base.location.end;
+}
+
+/**
+ * Allocate and initialize a new BreakNode node.
+ */
+static pm_break_node_t *
+pm_break_node_create(pm_parser_t *parser, const pm_token_t *keyword, pm_arguments_node_t *arguments) {
+    assert(keyword->type == PM_TOKEN_KEYWORD_BREAK);
+    pm_break_node_t *node = PM_NODE_ALLOC(parser, pm_break_node_t);
+
+    *node = (pm_break_node_t) {
+        {
+            .type = PM_BREAK_NODE,
+            .node_id = PM_NODE_IDENTIFY(parser),
+            .location = {
+                .start = keyword->start,
+                .end = (arguments == NULL ? keyword->end : arguments->base.location.end)
+            },
+        },
+        .arguments = arguments,
+        .keyword_loc = PM_LOCATION_TOKEN_VALUE(keyword)
+    };
+
+    return node;
+}
+
+// There are certain flags that we want to use internally but don't want to
+// expose because they are not relevant beyond parsing. Therefore we'll define
+// them here and not define them in config.yml/a header file.
+static const pm_node_flags_t PM_WRITE_NODE_FLAGS_IMPLICIT_ARRAY = 0x4;
+static const pm_node_flags_t PM_CALL_NODE_FLAGS_IMPLICIT_ARRAY = 0x40;
+static const pm_node_flags_t PM_CALL_NODE_FLAGS_COMPARISON = 0x80;
+static const pm_node_flags_t PM_CALL_NODE_FLAGS_INDEX = 0x100;
+
+/**
+ * Allocate and initialize a new CallNode node. This sets everything to NULL or
+ * PM_TOKEN_NOT_PROVIDED as appropriate such that its values can be overridden
+ * in the various specializations of this function.
+ */
+static pm_call_node_t *
+pm_call_node_create(pm_parser_t *parser, pm_node_flags_t flags) {
+    pm_call_node_t *node = PM_NODE_ALLOC(parser, pm_call_node_t);
+
+    *node = (pm_call_node_t) {
+        {
+            .type = PM_CALL_NODE,
+            .flags = flags,
+            .node_id = PM_NODE_IDENTIFY(parser),
+            .location = PM_LOCATION_NULL_VALUE(parser),
+        },
+        .receiver = NULL,
+        .call_operator_loc = PM_OPTIONAL_LOCATION_NOT_PROVIDED_VALUE,
+        .message_loc = PM_OPTIONAL_LOCATION_NOT_PROVIDED_VALUE,
+        .opening_loc = PM_OPTIONAL_LOCATION_NOT_PROVIDED_VALUE,
+        .arguments = NULL,
+        .closing_loc = PM_OPTIONAL_LOCATION_NOT_PROVIDED_VALUE,
+        .block = NULL,
+        .name = 0
+    };
+
+    return node;
+}
+
+/**
+ * Returns the value that the ignore visibility flag should be set to for the
+ * given receiver.
+ */
+static inline pm_node_flags_t
+pm_call_node_ignore_visibility_flag(const pm_node_t *receiver) {
+    return PM_NODE_TYPE_P(receiver, PM_SELF_NODE) ? PM_CALL_NODE_FLAGS_IGNORE_VISIBILITY : 0;
+}
+
+/**
+ * Allocate and initialize a new CallNode node from an aref or an aset
+ * expression.
+ */
+static pm_call_node_t *
+pm_call_node_aref_create(pm_parser_t *parser, pm_node_t *receiver, pm_arguments_t *arguments) {
+    pm_assert_value_expression(parser, receiver);
+
+    pm_node_flags_t flags = pm_call_node_ignore_visibility_flag(receiver);
+    if (arguments->block == NULL || PM_NODE_TYPE_P(arguments->block, PM_BLOCK_ARGUMENT_NODE)) {
+        flags |= PM_CALL_NODE_FLAGS_INDEX;
+    }
+
+    pm_call_node_t *node = pm_call_node_create(parser, flags);
+
+    node->base.location.start = receiver->location.start;
+    node->base.location.end = pm_arguments_end(arguments);
+
+    node->receiver = receiver;
+    node->message_loc.start = arguments->opening_loc.start;
+    node->message_loc.end = arguments->closing_loc.end;
+
+    node->opening_loc = arguments->opening_loc;
+    node->arguments = arguments->arguments;
+    node->closing_loc = arguments->closing_loc;
+    node->block = arguments->block;
+
+    node->name = pm_parser_constant_id_constant(parser, "[]", 2);
+    return node;
+}
+
+/**
+ * Allocate and initialize a new CallNode node from a binary expression.
+ */
+static pm_call_node_t *
+pm_call_node_binary_create(pm_parser_t *parser, pm_node_t *receiver, pm_token_t *operator, pm_node_t *argument, pm_node_flags_t flags) {
+    pm_assert_value_expression(parser, receiver);
+    pm_assert_value_expression(parser, argument);
+
+    pm_call_node_t *node = pm_call_node_create(parser, pm_call_node_ignore_visibility_flag(receiver) | flags);
+
+    node->base.location.start = MIN(receiver->location.start, argument->location.start);
+    node->base.location.end = MAX(receiver->location.end, argument->location.end);
+
+    node->receiver = receiver;
+    node->message_loc = PM_OPTIONAL_LOCATION_TOKEN_VALUE(operator);
+
+    pm_arguments_node_t *arguments = pm_arguments_node_create(parser);
+    pm_arguments_node_arguments_append(arguments, argument);
+    node->arguments = arguments;
+
+    node->name = pm_parser_constant_id_token(parser, operator);
+    return node;
+}
+
+/**
+ * Allocate and initialize a new CallNode node from a call expression.
+ */
+static pm_call_node_t *
+pm_call_node_call_create(pm_parser_t *parser, pm_node_t *receiver, pm_token_t *operator, pm_token_t *message, pm_arguments_t *arguments) {
+    pm_assert_value_expression(parser, receiver);
+
+    pm_call_node_t *node = pm_call_node_create(parser, pm_call_node_ignore_visibility_flag(receiver));
+
+    node->base.location.start = receiver->location.start;
+    const uint8_t *end = pm_arguments_end(arguments);
+    if (end == NULL) {
+        end = message->end;
+    }
+    node->base.location.end = end;
+
+    node->receiver = receiver;
+    node->call_operator_loc = PM_OPTIONAL_LOCATION_TOKEN_VALUE(operator);
+    node->message_loc = PM_OPTIONAL_LOCATION_TOKEN_VALUE(message);
+    node->opening_loc = arguments->opening_loc;
+    node->arguments = arguments->arguments;
+    node->closing_loc = arguments->closing_loc;
+    node->block = arguments->block;
+
+    if (operator->type == PM_TOKEN_AMPERSAND_DOT) {
+        pm_node_flag_set((pm_node_t *)node, PM_CALL_NODE_FLAGS_SAFE_NAVIGATION);
+    }
+
+    node->name = pm_parser_constant_id_token(parser, message);
+    return node;
+}
+
+/**
+ * Allocate and initialize a new synthesized CallNode node from a call expression.
+ */
+static pm_call_node_t *
+pm_call_node_call_synthesized_create(pm_parser_t *parser, pm_node_t *receiver, const char *message, pm_arguments_node_t *arguments) {
+    pm_call_node_t *node = pm_call_node_create(parser, 0);
+    node->base.location.start = parser->start;
+    node->base.location.end = parser->end;
+
+    node->receiver = receiver;
+    node->call_operator_loc = (pm_location_t) { .start = NULL, .end = NULL };
+    node->message_loc = (pm_location_t) { .start = NULL, .end = NULL };
+    node->arguments = arguments;
+
+    node->name = pm_parser_constant_id_constant(parser, message, strlen(message));
+    return node;
+}
+
+/**
+ * Allocate and initialize a new CallNode node from a call to a method name
+ * without a receiver that could not have been a local variable read.
+ */
+static pm_call_node_t *
+pm_call_node_fcall_create(pm_parser_t *parser, pm_token_t *message, pm_arguments_t *arguments) {
+    pm_call_node_t *node = pm_call_node_create(parser, PM_CALL_NODE_FLAGS_IGNORE_VISIBILITY);
+
+    node->base.location.start = message->start;
+    node->base.location.end = pm_arguments_end(arguments);
+
+    node->message_loc = PM_OPTIONAL_LOCATION_TOKEN_VALUE(message);
+    node->opening_loc = arguments->opening_loc;
+    node->arguments = arguments->arguments;
+    node->closing_loc = arguments->closing_loc;
+    node->block = arguments->block;
+
+    node->name = pm_parser_constant_id_token(parser, message);
+    return node;
+}
+
+/**
+ * Allocate and initialize a new CallNode node from a synthesized call to a
+ * method name with the given arguments.
+ */
+static pm_call_node_t *
+pm_call_node_fcall_synthesized_create(pm_parser_t *parser, pm_arguments_node_t *arguments, pm_constant_id_t name) {
+    pm_call_node_t *node = pm_call_node_create(parser, PM_CALL_NODE_FLAGS_IGNORE_VISIBILITY);
+
+    node->base.location = PM_LOCATION_NULL_VALUE(parser);
+    node->arguments = arguments;
+
+    node->name = name;
+    return node;
+}
+
+/**
+ * Allocate and initialize a new CallNode node from a not expression.
+ */
+static pm_call_node_t *
+pm_call_node_not_create(pm_parser_t *parser, pm_node_t *receiver, pm_token_t *message, pm_arguments_t *arguments) {
+    pm_assert_value_expression(parser, receiver);
+    if (receiver != NULL) pm_conditional_predicate(parser, receiver, PM_CONDITIONAL_PREDICATE_TYPE_NOT);
+
+    pm_call_node_t *node = pm_call_node_create(parser, receiver == NULL ? 0 : pm_call_node_ignore_visibility_flag(receiver));
+
+    node->base.location.start = message->start;
+    if (arguments->closing_loc.start != NULL) {
+        node->base.location.end = arguments->closing_loc.end;
+    } else {
+        assert(receiver != NULL);
+        node->base.location.end = receiver->location.end;
+    }
+
+    node->receiver = receiver;
+    node->message_loc = PM_OPTIONAL_LOCATION_TOKEN_VALUE(message);
+    node->opening_loc = arguments->opening_loc;
+    node->arguments = arguments->arguments;
+    node->closing_loc = arguments->closing_loc;
+
+    node->name = pm_parser_constant_id_constant(parser, "!", 1);
+    return node;
+}
+
+/**
+ * Allocate and initialize a new CallNode node from a call shorthand expression.
+ */
+static pm_call_node_t *
+pm_call_node_shorthand_create(pm_parser_t *parser, pm_node_t *receiver, pm_token_t *operator, pm_arguments_t *arguments) {
+    pm_assert_value_expression(parser, receiver);
+
+    pm_call_node_t *node = pm_call_node_create(parser, pm_call_node_ignore_visibility_flag(receiver));
+
+    node->base.location.start = receiver->location.start;
+    node->base.location.end = pm_arguments_end(arguments);
+
+    node->receiver = receiver;
+    node->call_operator_loc = PM_OPTIONAL_LOCATION_TOKEN_VALUE(operator);
+    node->opening_loc = arguments->opening_loc;
+    node->arguments = arguments->arguments;
+    node->closing_loc = arguments->closing_loc;
+    node->block = arguments->block;
+
+    if (operator->type == PM_TOKEN_AMPERSAND_DOT) {
+        pm_node_flag_set((pm_node_t *)node, PM_CALL_NODE_FLAGS_SAFE_NAVIGATION);
+    }
+
+    node->name = pm_parser_constant_id_constant(parser, "call", 4);
+    return node;
+}
+
+/**
+ * Allocate and initialize a new CallNode node from a unary operator expression.
+ */
+static pm_call_node_t *
+pm_call_node_unary_create(pm_parser_t *parser, pm_token_t *operator, pm_node_t *receiver, const char *name) {
+    pm_assert_value_expression(parser, receiver);
+
+    pm_call_node_t *node = pm_call_node_create(parser, pm_call_node_ignore_visibility_flag(receiver));
+
+    node->base.location.start = operator->start;
+    node->base.location.end = receiver->location.end;
+
+    node->receiver = receiver;
+    node->message_loc = PM_OPTIONAL_LOCATION_TOKEN_VALUE(operator);
+
+    node->name = pm_parser_constant_id_constant(parser, name, strlen(name));
+    return node;
+}
+
+/**
+ * Allocate and initialize a new CallNode node from a call to a method name
+ * without a receiver that could also have been a local variable read.
+ */
+static pm_call_node_t *
+pm_call_node_variable_call_create(pm_parser_t *parser, pm_token_t *message) {
+    pm_call_node_t *node = pm_call_node_create(parser, PM_CALL_NODE_FLAGS_IGNORE_VISIBILITY);
+
+    node->base.location = PM_LOCATION_TOKEN_VALUE(message);
+    node->message_loc = PM_OPTIONAL_LOCATION_TOKEN_VALUE(message);
+
+    node->name = pm_parser_constant_id_token(parser, message);
+    return node;
+}
+
+/**
+ * Returns whether or not this call can be used on the left-hand side of an
+ * operator assignment.
+ */
+static inline bool
+pm_call_node_writable_p(const pm_parser_t *parser, const pm_call_node_t *node) {
+    return (
+        (node->message_loc.start != NULL) &&
+        (node->message_loc.end[-1] != '!') &&
+        (node->message_loc.end[-1] != '?') &&
+        char_is_identifier_start(parser, node->message_loc.start, parser->end - node->message_loc.start) &&
+        (node->opening_loc.start == NULL) &&
+        (node->arguments == NULL) &&
+        (node->block == NULL)
+    );
+}
+
+/**
+ * Initialize the read name by reading the write name and chopping off the '='.
+ */
+static void
+pm_call_write_read_name_init(pm_parser_t *parser, pm_constant_id_t *read_name, pm_constant_id_t *write_name) {
+    pm_constant_t *write_constant = pm_constant_pool_id_to_constant(&parser->constant_pool, *write_name);
+
+    if (write_constant->length > 0) {
+        size_t length = write_constant->length - 1;
+
+        void *memory = xmalloc(length);
+        memcpy(memory, write_constant->start, length);
+
+        *read_name = pm_constant_pool_insert_owned(&parser->constant_pool, (uint8_t *) memory, length);
+    } else {
+        // We can get here if the message was missing because of a syntax error.
+        *read_name = pm_parser_constant_id_constant(parser, "", 0);
+    }
+}
+
+/**
+ * Allocate and initialize a new CallAndWriteNode node.
+ */
+static pm_call_and_write_node_t *
+pm_call_and_write_node_create(pm_parser_t *parser, pm_call_node_t *target, const pm_token_t *operator, pm_node_t *value) {
+    assert(target->block == NULL);
+    assert(operator->type == PM_TOKEN_AMPERSAND_AMPERSAND_EQUAL);
+    pm_call_and_write_node_t *node = PM_NODE_ALLOC(parser, pm_call_and_write_node_t);
+
+    *node = (pm_call_and_write_node_t) {
+        {
+            .type = PM_CALL_AND_WRITE_NODE,
+            .flags = target->base.flags,
+            .node_id = PM_NODE_IDENTIFY(parser),
+            .location = {
+                .start = target->base.location.start,
+                .end = value->location.end
+            }
+        },
+        .receiver = target->receiver,
+        .call_operator_loc = target->call_operator_loc,
+        .message_loc = target->message_loc,
+        .read_name = 0,
+        .write_name = target->name,
+        .operator_loc = PM_LOCATION_TOKEN_VALUE(operator),
+        .value = value
+    };
+
+    pm_call_write_read_name_init(parser, &node->read_name, &node->write_name);
+
+    // Here we're going to free the target, since it is no longer necessary.
+    // However, we don't want to call `pm_node_destroy` because we want to keep
+    // around all of its children since we just reused them.
+    xfree(target);
+
+    return node;
+}
+
+/**
+ * Validate that index expressions do not have keywords or blocks if we are
+ * parsing as Ruby 3.4+.
+ */
+static void
+pm_index_arguments_check(pm_parser_t *parser, const pm_arguments_node_t *arguments, const pm_node_t *block) {
+    if (parser->version != PM_OPTIONS_VERSION_CRUBY_3_3) {
+        if (arguments != NULL && PM_NODE_FLAG_P(arguments, PM_ARGUMENTS_NODE_FLAGS_CONTAINS_KEYWORDS)) {
+            pm_node_t *node;
+            PM_NODE_LIST_FOREACH(&arguments->arguments, index, node) {
+                if (PM_NODE_TYPE_P(node, PM_KEYWORD_HASH_NODE)) {
+                    pm_parser_err_node(parser, node, PM_ERR_UNEXPECTED_INDEX_KEYWORDS);
+                    break;
+                }
+            }
+        }
+
+        if (block != NULL) {
+            pm_parser_err_node(parser, block, PM_ERR_UNEXPECTED_INDEX_BLOCK);
+        }
+    }
+}
+
+/**
+ * Allocate and initialize a new IndexAndWriteNode node.
+ */
+static pm_index_and_write_node_t *
+pm_index_and_write_node_create(pm_parser_t *parser, pm_call_node_t *target, const pm_token_t *operator, pm_node_t *value) {
+    assert(operator->type == PM_TOKEN_AMPERSAND_AMPERSAND_EQUAL);
+    pm_index_and_write_node_t *node = PM_NODE_ALLOC(parser, pm_index_and_write_node_t);
+
+    pm_index_arguments_check(parser, target->arguments, target->block);
+
+    assert(!target->block || PM_NODE_TYPE_P(target->block, PM_BLOCK_ARGUMENT_NODE));
+    *node = (pm_index_and_write_node_t) {
+        {
+            .type = PM_INDEX_AND_WRITE_NODE,
+            .flags = target->base.flags,
+            .node_id = PM_NODE_IDENTIFY(parser),
+            .location = {
+                .start = target->base.location.start,
+                .end = value->location.end
+            }
+        },
+        .receiver = target->receiver,
+        .call_operator_loc = target->call_operator_loc,
+        .opening_loc = target->opening_loc,
+        .arguments = target->arguments,
+        .closing_loc = target->closing_loc,
+        .block = (pm_block_argument_node_t *) target->block,
+        .operator_loc = PM_LOCATION_TOKEN_VALUE(operator),
+        .value = value
+    };
+
+    // Here we're going to free the target, since it is no longer necessary.
+    // However, we don't want to call `pm_node_destroy` because we want to keep
+    // around all of its children since we just reused them.
+    xfree(target);
+
+    return node;
+}
+
+/**
+ * Allocate a new CallOperatorWriteNode node.
+ */
+static pm_call_operator_write_node_t *
+pm_call_operator_write_node_create(pm_parser_t *parser, pm_call_node_t *target, const pm_token_t *operator, pm_node_t *value) {
+    assert(target->block == NULL);
+    pm_call_operator_write_node_t *node = PM_NODE_ALLOC(parser, pm_call_operator_write_node_t);
+
+    *node = (pm_call_operator_write_node_t) {
+        {
+            .type = PM_CALL_OPERATOR_WRITE_NODE,
+            .flags = target->base.flags,
+            .node_id = PM_NODE_IDENTIFY(parser),
+            .location = {
+                .start = target->base.location.start,
+                .end = value->location.end
+            }
+        },
+        .receiver = target->receiver,
+        .call_operator_loc = target->call_operator_loc,
+        .message_loc = target->message_loc,
+        .read_name = 0,
+        .write_name = target->name,
+        .binary_operator = pm_parser_constant_id_location(parser, operator->start, operator->end - 1),
+        .binary_operator_loc = PM_LOCATION_TOKEN_VALUE(operator),
+        .value = value
+    };
+
+    pm_call_write_read_name_init(parser, &node->read_name, &node->write_name);
+
+    // Here we're going to free the target, since it is no longer necessary.
+    // However, we don't want to call `pm_node_destroy` because we want to keep
+    // around all of its children since we just reused them.
+    xfree(target);
+
+    return node;
+}
+
+/**
+ * Allocate a new IndexOperatorWriteNode node.
+ */
+static pm_index_operator_write_node_t *
+pm_index_operator_write_node_create(pm_parser_t *parser, pm_call_node_t *target, const pm_token_t *operator, pm_node_t *value) {
+    pm_index_operator_write_node_t *node = PM_NODE_ALLOC(parser, pm_index_operator_write_node_t);
+
+    pm_index_arguments_check(parser, target->arguments, target->block);
+
+    assert(!target->block || PM_NODE_TYPE_P(target->block, PM_BLOCK_ARGUMENT_NODE));
+    *node = (pm_index_operator_write_node_t) {
+        {
+            .type = PM_INDEX_OPERATOR_WRITE_NODE,
+            .flags = target->base.flags,
+            .node_id = PM_NODE_IDENTIFY(parser),
+            .location = {
+                .start = target->base.location.start,
+                .end = value->location.end
+            }
+        },
+        .receiver = target->receiver,
+        .call_operator_loc = target->call_operator_loc,
+        .opening_loc = target->opening_loc,
+        .arguments = target->arguments,
+        .closing_loc = target->closing_loc,
+        .block = (pm_block_argument_node_t *) target->block,
+        .binary_operator = pm_parser_constant_id_location(parser, operator->start, operator->end - 1),
+        .binary_operator_loc = PM_LOCATION_TOKEN_VALUE(operator),
+        .value = value
+    };
+
+    // Here we're going to free the target, since it is no longer necessary.
+    // However, we don't want to call `pm_node_destroy` because we want to keep
+    // around all of its children since we just reused them.
+    xfree(target);
+
+    return node;
+}
+
+/**
+ * Allocate and initialize a new CallOrWriteNode node.
+ */
+static pm_call_or_write_node_t *
+pm_call_or_write_node_create(pm_parser_t *parser, pm_call_node_t *target, const pm_token_t *operator, pm_node_t *value) {
+    assert(target->block == NULL);
+    assert(operator->type == PM_TOKEN_PIPE_PIPE_EQUAL);
+    pm_call_or_write_node_t *node = PM_NODE_ALLOC(parser, pm_call_or_write_node_t);
+
+    *node = (pm_call_or_write_node_t) {
+        {
+            .type = PM_CALL_OR_WRITE_NODE,
+            .flags = target->base.flags,
+            .node_id = PM_NODE_IDENTIFY(parser),
+            .location = {
+                .start = target->base.location.start,
+                .end = value->location.end
+            }
+        },
+        .receiver = target->receiver,
+        .call_operator_loc = target->call_operator_loc,
+        .message_loc = target->message_loc,
+        .read_name = 0,
+        .write_name = target->name,
+        .operator_loc = PM_LOCATION_TOKEN_VALUE(operator),
+        .value = value
+    };
+
+    pm_call_write_read_name_init(parser, &node->read_name, &node->write_name);
+
+    // Here we're going to free the target, since it is no longer necessary.
+    // However, we don't want to call `pm_node_destroy` because we want to keep
+    // around all of its children since we just reused them.
+    xfree(target);
+
+    return node;
+}
+
+/**
+ * Allocate and initialize a new IndexOrWriteNode node.
+ */
+static pm_index_or_write_node_t *
+pm_index_or_write_node_create(pm_parser_t *parser, pm_call_node_t *target, const pm_token_t *operator, pm_node_t *value) {
+    assert(operator->type == PM_TOKEN_PIPE_PIPE_EQUAL);
+    pm_index_or_write_node_t *node = PM_NODE_ALLOC(parser, pm_index_or_write_node_t);
+
+    pm_index_arguments_check(parser, target->arguments, target->block);
+
+    assert(!target->block || PM_NODE_TYPE_P(target->block, PM_BLOCK_ARGUMENT_NODE));
+    *node = (pm_index_or_write_node_t) {
+        {
+            .type = PM_INDEX_OR_WRITE_NODE,
+            .flags = target->base.flags,
+            .node_id = PM_NODE_IDENTIFY(parser),
+            .location = {
+                .start = target->base.location.start,
+                .end = value->location.end
+            }
+        },
+        .receiver = target->receiver,
+        .call_operator_loc = target->call_operator_loc,
+        .opening_loc = target->opening_loc,
+        .arguments = target->arguments,
+        .closing_loc = target->closing_loc,
+        .block = (pm_block_argument_node_t *) target->block,
+        .operator_loc = PM_LOCATION_TOKEN_VALUE(operator),
+        .value = value
+    };
+
+    // Here we're going to free the target, since it is no longer necessary.
+    // However, we don't want to call `pm_node_destroy` because we want to keep
+    // around all of its children since we just reused them.
+    xfree(target);
+
+    return node;
+}
+
+/**
+ * Allocate and initialize a new CallTargetNode node from an existing call
+ * node.
+ */
+static pm_call_target_node_t *
+pm_call_target_node_create(pm_parser_t *parser, pm_call_node_t *target) {
+    pm_call_target_node_t *node = PM_NODE_ALLOC(parser, pm_call_target_node_t);
+
+    *node = (pm_call_target_node_t) {
+        {
+            .type = PM_CALL_TARGET_NODE,
+            .flags = target->base.flags,
+            .node_id = PM_NODE_IDENTIFY(parser),
+            .location = target->base.location
+        },
+        .receiver = target->receiver,
+        .call_operator_loc = target->call_operator_loc,
+        .name = target->name,
+        .message_loc = target->message_loc
+    };
+
+    // Here we're going to free the target, since it is no longer necessary.
+    // However, we don't want to call `pm_node_destroy` because we want to keep
+    // around all of its children since we just reused them.
+    xfree(target);
+
+    return node;
+}
+
+/**
+ * Allocate and initialize a new IndexTargetNode node from an existing call
+ * node.
+ */
+static pm_index_target_node_t *
+pm_index_target_node_create(pm_parser_t *parser, pm_call_node_t *target) {
+    pm_index_target_node_t *node = PM_NODE_ALLOC(parser, pm_index_target_node_t);
+    pm_node_flags_t flags = target->base.flags;
+
+    pm_index_arguments_check(parser, target->arguments, target->block);
+
+    assert(!target->block || PM_NODE_TYPE_P(target->block, PM_BLOCK_ARGUMENT_NODE));
+    *node = (pm_index_target_node_t) {
+        {
+            .type = PM_INDEX_TARGET_NODE,
+            .flags = flags | PM_CALL_NODE_FLAGS_ATTRIBUTE_WRITE,
+            .node_id = PM_NODE_IDENTIFY(parser),
+            .location = target->base.location
+        },
+        .receiver = target->receiver,
+        .opening_loc = target->opening_loc,
+        .arguments = target->arguments,
+        .closing_loc = target->closing_loc,
+        .block = (pm_block_argument_node_t *) target->block,
+    };
+
+    // Here we're going to free the target, since it is no longer necessary.
+    // However, we don't want to call `pm_node_destroy` because we want to keep
+    // around all of its children since we just reused them.
+    xfree(target);
+
+    return node;
+}
+
+/**
+ * Allocate and initialize a new CapturePatternNode node.
+ */
+static pm_capture_pattern_node_t *
+pm_capture_pattern_node_create(pm_parser_t *parser, pm_node_t *value, pm_local_variable_target_node_t *target, const pm_token_t *operator) {
+    pm_capture_pattern_node_t *node = PM_NODE_ALLOC(parser, pm_capture_pattern_node_t);
+
+    *node = (pm_capture_pattern_node_t) {
+        {
+            .type = PM_CAPTURE_PATTERN_NODE,
+            .node_id = PM_NODE_IDENTIFY(parser),
+            .location = {
+                .start = value->location.start,
+                .end = target->base.location.end
+            },
+        },
+        .value = value,
+        .target = target,
+        .operator_loc = PM_LOCATION_TOKEN_VALUE(operator)
+    };
+
+    return node;
+}
+
+/**
+ * Allocate and initialize a new CaseNode node.
+ */
+static pm_case_node_t *
+pm_case_node_create(pm_parser_t *parser, const pm_token_t *case_keyword, pm_node_t *predicate, const pm_token_t *end_keyword) {
+    pm_case_node_t *node = PM_NODE_ALLOC(parser, pm_case_node_t);
+
+    *node = (pm_case_node_t) {
+        {
+            .type = PM_CASE_NODE,
+            .node_id = PM_NODE_IDENTIFY(parser),
+            .location = {
+                .start = case_keyword->start,
+                .end = end_keyword->end
+            },
+        },
+        .predicate = predicate,
+        .else_clause = NULL,
+        .case_keyword_loc = PM_LOCATION_TOKEN_VALUE(case_keyword),
+        .end_keyword_loc = PM_LOCATION_TOKEN_VALUE(end_keyword),
+        .conditions = { 0 }
+    };
+
+    return node;
+}
+
+/**
+ * Append a new condition to a CaseNode node.
+ */
+static void
+pm_case_node_condition_append(pm_case_node_t *node, pm_node_t *condition) {
+    assert(PM_NODE_TYPE_P(condition, PM_WHEN_NODE));
+
+    pm_node_list_append(&node->conditions, condition);
+    node->base.location.end = condition->location.end;
+}
+
+/**
+ * Set the else clause of a CaseNode node.
+ */
+static void
+pm_case_node_else_clause_set(pm_case_node_t *node, pm_else_node_t *else_clause) {
+    node->else_clause = else_clause;
+    node->base.location.end = else_clause->base.location.end;
+}
+
+/**
+ * Set the end location for a CaseNode node.
+ */
+static void
+pm_case_node_end_keyword_loc_set(pm_case_node_t *node, const pm_token_t *end_keyword) {
+    node->base.location.end = end_keyword->end;
+    node->end_keyword_loc = PM_LOCATION_TOKEN_VALUE(end_keyword);
+}
+
+/**
+ * Allocate and initialize a new CaseMatchNode node.
+ */
+static pm_case_match_node_t *
+pm_case_match_node_create(pm_parser_t *parser, const pm_token_t *case_keyword, pm_node_t *predicate, const pm_token_t *end_keyword) {
+    pm_case_match_node_t *node = PM_NODE_ALLOC(parser, pm_case_match_node_t);
+
+    *node = (pm_case_match_node_t) {
+        {
+            .type = PM_CASE_MATCH_NODE,
+            .node_id = PM_NODE_IDENTIFY(parser),
+            .location = {
+                .start = case_keyword->start,
+                .end = end_keyword->end
+            },
+        },
+        .predicate = predicate,
+        .else_clause = NULL,
+        .case_keyword_loc = PM_LOCATION_TOKEN_VALUE(case_keyword),
+        .end_keyword_loc = PM_LOCATION_TOKEN_VALUE(end_keyword),
+        .conditions = { 0 }
+    };
+
+    return node;
+}
+
+/**
+ * Append a new condition to a CaseMatchNode node.
+ */
+static void
+pm_case_match_node_condition_append(pm_case_match_node_t *node, pm_node_t *condition) {
+    assert(PM_NODE_TYPE_P(condition, PM_IN_NODE));
+
+    pm_node_list_append(&node->conditions, condition);
+    node->base.location.end = condition->location.end;
+}
+
+/**
+ * Set the else clause of a CaseMatchNode node.
+ */
+static void
+pm_case_match_node_else_clause_set(pm_case_match_node_t *node, pm_else_node_t *else_clause) {
+    node->else_clause = else_clause;
+    node->base.location.end = else_clause->base.location.end;
+}
+
+/**
+ * Set the end location for a CaseMatchNode node.
+ */
+static void
+pm_case_match_node_end_keyword_loc_set(pm_case_match_node_t *node, const pm_token_t *end_keyword) {
+    node->base.location.end = end_keyword->end;
+    node->end_keyword_loc = PM_LOCATION_TOKEN_VALUE(end_keyword);
+}
+
+/**
+ * Allocate a new ClassNode node.
+ */
+static pm_class_node_t *
+pm_class_node_create(pm_parser_t *parser, pm_constant_id_list_t *locals, const pm_token_t *class_keyword, pm_node_t *constant_path, const pm_token_t *name, const pm_token_t *inheritance_operator, pm_node_t *superclass, pm_node_t *body, const pm_token_t *end_keyword) {
+    pm_class_node_t *node = PM_NODE_ALLOC(parser, pm_class_node_t);
+
+    *node = (pm_class_node_t) {
+        {
+            .type = PM_CLASS_NODE,
+            .node_id = PM_NODE_IDENTIFY(parser),
+            .location = { .start = class_keyword->start, .end = end_keyword->end },
+        },
+        .locals = *locals,
+        .class_keyword_loc = PM_LOCATION_TOKEN_VALUE(class_keyword),
+        .constant_path = constant_path,
+        .inheritance_operator_loc = PM_OPTIONAL_LOCATION_TOKEN_VALUE(inheritance_operator),
+        .superclass = superclass,
+        .body = body,
+        .end_keyword_loc = PM_LOCATION_TOKEN_VALUE(end_keyword),
+        .name = pm_parser_constant_id_token(parser, name)
+    };
+
+    return node;
+}
+
+/**
+ * Allocate and initialize a new ClassVariableAndWriteNode node.
+ */
+static pm_class_variable_and_write_node_t *
+pm_class_variable_and_write_node_create(pm_parser_t *parser, pm_class_variable_read_node_t *target, const pm_token_t *operator, pm_node_t *value) {
+    assert(operator->type == PM_TOKEN_AMPERSAND_AMPERSAND_EQUAL);
+    pm_class_variable_and_write_node_t *node = PM_NODE_ALLOC(parser, pm_class_variable_and_write_node_t);
+
+    *node = (pm_class_variable_and_write_node_t) {
+        {
+            .type = PM_CLASS_VARIABLE_AND_WRITE_NODE,
+            .node_id = PM_NODE_IDENTIFY(parser),
+            .location = {
+                .start = target->base.location.start,
+                .end = value->location.end
+            }
+        },
+        .name = target->name,
+        .name_loc = target->base.location,
+        .operator_loc = PM_LOCATION_TOKEN_VALUE(operator),
+        .value = value
+    };
+
+    return node;
+}
+
+/**
+ * Allocate and initialize a new ClassVariableOperatorWriteNode node.
+ */
+static pm_class_variable_operator_write_node_t *
+pm_class_variable_operator_write_node_create(pm_parser_t *parser, pm_class_variable_read_node_t *target, const pm_token_t *operator, pm_node_t *value) {
+    pm_class_variable_operator_write_node_t *node = PM_NODE_ALLOC(parser, pm_class_variable_operator_write_node_t);
+
+    *node = (pm_class_variable_operator_write_node_t) {
+        {
+            .type = PM_CLASS_VARIABLE_OPERATOR_WRITE_NODE,
+            .node_id = PM_NODE_IDENTIFY(parser),
+            .location = {
+                .start = target->base.location.start,
+                .end = value->location.end
+            }
+        },
+        .name = target->name,
+        .name_loc = target->base.location,
+        .binary_operator_loc = PM_LOCATION_TOKEN_VALUE(operator),
+        .value = value,
+        .binary_operator = pm_parser_constant_id_location(parser, operator->start, operator->end - 1)
+    };
+
+    return node;
+}
+
+/**
+ * Allocate and initialize a new ClassVariableOrWriteNode node.
+ */
+static pm_class_variable_or_write_node_t *
+pm_class_variable_or_write_node_create(pm_parser_t *parser, pm_class_variable_read_node_t *target, const pm_token_t *operator, pm_node_t *value) {
+    assert(operator->type == PM_TOKEN_PIPE_PIPE_EQUAL);
+    pm_class_variable_or_write_node_t *node = PM_NODE_ALLOC(parser, pm_class_variable_or_write_node_t);
+
+    *node = (pm_class_variable_or_write_node_t) {
+        {
+            .type = PM_CLASS_VARIABLE_OR_WRITE_NODE,
+            .node_id = PM_NODE_IDENTIFY(parser),
+            .location = {
+                .start = target->base.location.start,
+                .end = value->location.end
+            }
+        },
+        .name = target->name,
+        .name_loc = target->base.location,
+        .operator_loc = PM_LOCATION_TOKEN_VALUE(operator),
+        .value = value
+    };
+
+    return node;
+}
+
+/**
+ * Allocate and initialize a new ClassVariableReadNode node.
+ */
+static pm_class_variable_read_node_t *
+pm_class_variable_read_node_create(pm_parser_t *parser, const pm_token_t *token) {
+    assert(token->type == PM_TOKEN_CLASS_VARIABLE);
+    pm_class_variable_read_node_t *node = PM_NODE_ALLOC(parser, pm_class_variable_read_node_t);
+
+    *node = (pm_class_variable_read_node_t) {
+        {
+            .type = PM_CLASS_VARIABLE_READ_NODE,
+            .node_id = PM_NODE_IDENTIFY(parser),
+            .location = PM_LOCATION_TOKEN_VALUE(token)
+        },
+        .name = pm_parser_constant_id_token(parser, token)
+    };
+
+    return node;
+}
+
+/**
+ * True if the given node is an implicit array node on a write, as in:
+ *
+ *     a = *b
+ *     a = 1, 2, 3
+ */
+static inline pm_node_flags_t
+pm_implicit_array_write_flags(const pm_node_t *node, pm_node_flags_t flags) {
+    if (PM_NODE_TYPE_P(node, PM_ARRAY_NODE) && ((const pm_array_node_t *) node)->opening_loc.start == NULL) {
+        return flags;
+    }
+    return 0;
+}
+
+/**
+ * Initialize a new ClassVariableWriteNode node from a ClassVariableRead node.
+ */
+static pm_class_variable_write_node_t *
+pm_class_variable_write_node_create(pm_parser_t *parser, pm_class_variable_read_node_t *read_node, pm_token_t *operator, pm_node_t *value) {
+    pm_class_variable_write_node_t *node = PM_NODE_ALLOC(parser, pm_class_variable_write_node_t);
+
+    *node = (pm_class_variable_write_node_t) {
+        {
+            .type = PM_CLASS_VARIABLE_WRITE_NODE,
+            .flags = pm_implicit_array_write_flags(value, PM_WRITE_NODE_FLAGS_IMPLICIT_ARRAY),
+            .node_id = PM_NODE_IDENTIFY(parser),
+            .location = {
+                .start = read_node->base.location.start,
+                .end = value->location.end
+            },
+        },
+        .name = read_node->name,
+        .name_loc = PM_LOCATION_NODE_VALUE((pm_node_t *) read_node),
+        .operator_loc = PM_LOCATION_TOKEN_VALUE(operator),
+        .value = value
+    };
+
+    return node;
+}
+
+/**
+ * Allocate and initialize a new ConstantPathAndWriteNode node.
+ */
+static pm_constant_path_and_write_node_t *
+pm_constant_path_and_write_node_create(pm_parser_t *parser, pm_constant_path_node_t *target, const pm_token_t *operator, pm_node_t *value) {
+    assert(operator->type == PM_TOKEN_AMPERSAND_AMPERSAND_EQUAL);
+    pm_constant_path_and_write_node_t *node = PM_NODE_ALLOC(parser, pm_constant_path_and_write_node_t);
+
+    *node = (pm_constant_path_and_write_node_t) {
+        {
+            .type = PM_CONSTANT_PATH_AND_WRITE_NODE,
+            .node_id = PM_NODE_IDENTIFY(parser),
+            .location = {
+                .start = target->base.location.start,
+                .end = value->location.end
+            }
+        },
+        .target = target,
+        .operator_loc = PM_LOCATION_TOKEN_VALUE(operator),
+        .value = value
+    };
+
+    return node;
+}
+
+/**
+ * Allocate and initialize a new ConstantPathOperatorWriteNode node.
+ */
+static pm_constant_path_operator_write_node_t *
+pm_constant_path_operator_write_node_create(pm_parser_t *parser, pm_constant_path_node_t *target, const pm_token_t *operator, pm_node_t *value) {
+    pm_constant_path_operator_write_node_t *node = PM_NODE_ALLOC(parser, pm_constant_path_operator_write_node_t);
+
+    *node = (pm_constant_path_operator_write_node_t) {
+        {
+            .type = PM_CONSTANT_PATH_OPERATOR_WRITE_NODE,
+            .node_id = PM_NODE_IDENTIFY(parser),
+            .location = {
+                .start = target->base.location.start,
+                .end = value->location.end
+            }
+        },
+        .target = target,
+        .binary_operator_loc = PM_LOCATION_TOKEN_VALUE(operator),
+        .value = value,
+        .binary_operator = pm_parser_constant_id_location(parser, operator->start, operator->end - 1)
+    };
+
+    return node;
+}
+
+/**
+ * Allocate and initialize a new ConstantPathOrWriteNode node.
+ */
+static pm_constant_path_or_write_node_t *
+pm_constant_path_or_write_node_create(pm_parser_t *parser, pm_constant_path_node_t *target, const pm_token_t *operator, pm_node_t *value) {
+    assert(operator->type == PM_TOKEN_PIPE_PIPE_EQUAL);
+    pm_constant_path_or_write_node_t *node = PM_NODE_ALLOC(parser, pm_constant_path_or_write_node_t);
+
+    *node = (pm_constant_path_or_write_node_t) {
+        {
+            .type = PM_CONSTANT_PATH_OR_WRITE_NODE,
+            .node_id = PM_NODE_IDENTIFY(parser),
+            .location = {
+                .start = target->base.location.start,
+                .end = value->location.end
+            }
+        },
+        .target = target,
+        .operator_loc = PM_LOCATION_TOKEN_VALUE(operator),
+        .value = value
+    };
+
+    return node;
+}
+
+/**
+ * Allocate and initialize a new ConstantPathNode node.
+ */
+static pm_constant_path_node_t *
+pm_constant_path_node_create(pm_parser_t *parser, pm_node_t *parent, const pm_token_t *delimiter, const pm_token_t *name_token) {
+    pm_assert_value_expression(parser, parent);
+    pm_constant_path_node_t *node = PM_NODE_ALLOC(parser, pm_constant_path_node_t);
+
+    pm_constant_id_t name = PM_CONSTANT_ID_UNSET;
+    if (name_token->type == PM_TOKEN_CONSTANT) {
+        name = pm_parser_constant_id_token(parser, name_token);
+    }
+
+    *node = (pm_constant_path_node_t) {
+        {
+            .type = PM_CONSTANT_PATH_NODE,
+            .node_id = PM_NODE_IDENTIFY(parser),
+            .location = {
+                .start = parent == NULL ? delimiter->start : parent->location.start,
+                .end = name_token->end
+            },
+        },
+        .parent = parent,
+        .name = name,
+        .delimiter_loc = PM_LOCATION_TOKEN_VALUE(delimiter),
+        .name_loc = PM_LOCATION_TOKEN_VALUE(name_token)
+    };
+
+    return node;
+}
+
+/**
+ * Allocate a new ConstantPathWriteNode node.
+ */
+static pm_constant_path_write_node_t *
+pm_constant_path_write_node_create(pm_parser_t *parser, pm_constant_path_node_t *target, const pm_token_t *operator, pm_node_t *value) {
+    pm_constant_path_write_node_t *node = PM_NODE_ALLOC(parser, pm_constant_path_write_node_t);
+
+    *node = (pm_constant_path_write_node_t) {
+        {
+            .type = PM_CONSTANT_PATH_WRITE_NODE,
+            .flags = pm_implicit_array_write_flags(value, PM_WRITE_NODE_FLAGS_IMPLICIT_ARRAY),
+            .node_id = PM_NODE_IDENTIFY(parser),
+            .location = {
+                .start = target->base.location.start,
+                .end = value->location.end
+            },
+        },
+        .target = target,
+        .operator_loc = PM_OPTIONAL_LOCATION_TOKEN_VALUE(operator),
+        .value = value
+    };
+
+    return node;
+}
+
+/**
+ * Allocate and initialize a new ConstantAndWriteNode node.
+ */
+static pm_constant_and_write_node_t *
+pm_constant_and_write_node_create(pm_parser_t *parser, pm_constant_read_node_t *target, const pm_token_t *operator, pm_node_t *value) {
+    assert(operator->type == PM_TOKEN_AMPERSAND_AMPERSAND_EQUAL);
+    pm_constant_and_write_node_t *node = PM_NODE_ALLOC(parser, pm_constant_and_write_node_t);
+
+    *node = (pm_constant_and_write_node_t) {
+        {
+            .type = PM_CONSTANT_AND_WRITE_NODE,
+            .node_id = PM_NODE_IDENTIFY(parser),
+            .location = {
+                .start = target->base.location.start,
+                .end = value->location.end
+            }
+        },
+        .name = target->name,
+        .name_loc = target->base.location,
+        .operator_loc = PM_LOCATION_TOKEN_VALUE(operator),
+        .value = value
+    };
+
+    return node;
+}
+
+/**
+ * Allocate and initialize a new ConstantOperatorWriteNode node.
+ */
+static pm_constant_operator_write_node_t *
+pm_constant_operator_write_node_create(pm_parser_t *parser, pm_constant_read_node_t *target, const pm_token_t *operator, pm_node_t *value) {
+    pm_constant_operator_write_node_t *node = PM_NODE_ALLOC(parser, pm_constant_operator_write_node_t);
+
+    *node = (pm_constant_operator_write_node_t) {
+        {
+            .type = PM_CONSTANT_OPERATOR_WRITE_NODE,
+            .node_id = PM_NODE_IDENTIFY(parser),
+            .location = {
+                .start = target->base.location.start,
+                .end = value->location.end
+            }
+        },
+        .name = target->name,
+        .name_loc = target->base.location,
+        .binary_operator_loc = PM_LOCATION_TOKEN_VALUE(operator),
+        .value = value,
+        .binary_operator = pm_parser_constant_id_location(parser, operator->start, operator->end - 1)
+    };
+
+    return node;
+}
+
+/**
+ * Allocate and initialize a new ConstantOrWriteNode node.
+ */
+static pm_constant_or_write_node_t *
+pm_constant_or_write_node_create(pm_parser_t *parser, pm_constant_read_node_t *target, const pm_token_t *operator, pm_node_t *value) {
+    assert(operator->type == PM_TOKEN_PIPE_PIPE_EQUAL);
+    pm_constant_or_write_node_t *node = PM_NODE_ALLOC(parser, pm_constant_or_write_node_t);
+
+    *node = (pm_constant_or_write_node_t) {
+        {
+            .type = PM_CONSTANT_OR_WRITE_NODE,
+            .node_id = PM_NODE_IDENTIFY(parser),
+            .location = {
+                .start = target->base.location.start,
+                .end = value->location.end
+            }
+        },
+        .name = target->name,
+        .name_loc = target->base.location,
+        .operator_loc = PM_LOCATION_TOKEN_VALUE(operator),
+        .value = value
+    };
+
+    return node;
+}
+
+/**
+ * Allocate and initialize a new ConstantReadNode node.
+ */
+static pm_constant_read_node_t *
+pm_constant_read_node_create(pm_parser_t *parser, const pm_token_t *name) {
+    assert(name->type == PM_TOKEN_CONSTANT || name->type == PM_TOKEN_MISSING);
+    pm_constant_read_node_t *node = PM_NODE_ALLOC(parser, pm_constant_read_node_t);
+
+    *node = (pm_constant_read_node_t) {
+        {
+            .type = PM_CONSTANT_READ_NODE,
+            .node_id = PM_NODE_IDENTIFY(parser),
+            .location = PM_LOCATION_TOKEN_VALUE(name)
+        },
+        .name = pm_parser_constant_id_token(parser, name)
+    };
+
+    return node;
+}
+
+/**
+ * Allocate a new ConstantWriteNode node.
+ */
+static pm_constant_write_node_t *
+pm_constant_write_node_create(pm_parser_t *parser, pm_constant_read_node_t *target, const pm_token_t *operator, pm_node_t *value) {
+    pm_constant_write_node_t *node = PM_NODE_ALLOC(parser, pm_constant_write_node_t);
+
+    *node = (pm_constant_write_node_t) {
+        {
+            .type = PM_CONSTANT_WRITE_NODE,
+            .flags = pm_implicit_array_write_flags(value, PM_WRITE_NODE_FLAGS_IMPLICIT_ARRAY),
+            .node_id = PM_NODE_IDENTIFY(parser),
+            .location = {
+                .start = target->base.location.start,
+                .end = value->location.end
+            }
+        },
+        .name = target->name,
+        .name_loc = target->base.location,
+        .operator_loc = PM_OPTIONAL_LOCATION_TOKEN_VALUE(operator),
+        .value = value
+    };
+
+    return node;
+}
+
+/**
+ * Check if the receiver of a `def` node is allowed.
+ */
+static void
+pm_def_node_receiver_check(pm_parser_t *parser, const pm_node_t *node) {
+    switch (PM_NODE_TYPE(node)) {
+        case PM_BEGIN_NODE: {
+            const pm_begin_node_t *cast = (pm_begin_node_t *) node;
+            if (cast->statements != NULL) pm_def_node_receiver_check(parser, (pm_node_t *) cast->statements);
+            break;
+        }
+        case PM_PARENTHESES_NODE: {
+            const pm_parentheses_node_t *cast = (const pm_parentheses_node_t *) node;
+            if (cast->body != NULL) pm_def_node_receiver_check(parser, cast->body);
+            break;
+        }
+        case PM_STATEMENTS_NODE: {
+            const pm_statements_node_t *cast = (const pm_statements_node_t *) node;
+            pm_def_node_receiver_check(parser, cast->body.nodes[cast->body.size - 1]);
+            break;
+        }
+        case PM_ARRAY_NODE:
+        case PM_FLOAT_NODE:
+        case PM_IMAGINARY_NODE:
+        case PM_INTEGER_NODE:
+        case PM_INTERPOLATED_REGULAR_EXPRESSION_NODE:
+        case PM_INTERPOLATED_STRING_NODE:
+        case PM_INTERPOLATED_SYMBOL_NODE:
+        case PM_INTERPOLATED_X_STRING_NODE:
+        case PM_RATIONAL_NODE:
+        case PM_REGULAR_EXPRESSION_NODE:
+        case PM_SOURCE_ENCODING_NODE:
+        case PM_SOURCE_FILE_NODE:
+        case PM_SOURCE_LINE_NODE:
+        case PM_STRING_NODE:
+        case PM_SYMBOL_NODE:
+        case PM_X_STRING_NODE:
+            pm_parser_err_node(parser, node, PM_ERR_SINGLETON_FOR_LITERALS);
+            break;
+        default:
+            break;
+    }
+}
+
+/**
+ * Allocate and initialize a new DefNode node.
+ */
+static pm_def_node_t *
+pm_def_node_create(
+    pm_parser_t *parser,
+    pm_constant_id_t name,
+    const pm_token_t *name_loc,
+    pm_node_t *receiver,
+    pm_parameters_node_t *parameters,
+    pm_node_t *body,
+    pm_constant_id_list_t *locals,
+    const pm_token_t *def_keyword,
+    const pm_token_t *operator,
+    const pm_token_t *lparen,
+    const pm_token_t *rparen,
+    const pm_token_t *equal,
+    const pm_token_t *end_keyword
+) {
+    pm_def_node_t *node = PM_NODE_ALLOC(parser, pm_def_node_t);
+    const uint8_t *end;
+
+    if (end_keyword->type == PM_TOKEN_NOT_PROVIDED) {
+        end = body->location.end;
+    } else {
+        end = end_keyword->end;
+    }
+
+    if (receiver != NULL) {
+        pm_def_node_receiver_check(parser, receiver);
+    }
+
+    *node = (pm_def_node_t) {
+        {
+            .type = PM_DEF_NODE,
+            .node_id = PM_NODE_IDENTIFY(parser),
+            .location = { .start = def_keyword->start, .end = end },
+        },
+        .name = name,
+        .name_loc = PM_LOCATION_TOKEN_VALUE(name_loc),
+        .receiver = receiver,
+        .parameters = parameters,
+        .body = body,
+        .locals = *locals,
+        .def_keyword_loc = PM_LOCATION_TOKEN_VALUE(def_keyword),
+        .operator_loc = PM_OPTIONAL_LOCATION_TOKEN_VALUE(operator),
+        .lparen_loc = PM_OPTIONAL_LOCATION_TOKEN_VALUE(lparen),
+        .rparen_loc = PM_OPTIONAL_LOCATION_TOKEN_VALUE(rparen),
+        .equal_loc = PM_OPTIONAL_LOCATION_TOKEN_VALUE(equal),
+        .end_keyword_loc = PM_OPTIONAL_LOCATION_TOKEN_VALUE(end_keyword)
+    };
+
+    return node;
+}
+
+/**
+ * Allocate a new DefinedNode node.
+ */
+static pm_defined_node_t *
+pm_defined_node_create(pm_parser_t *parser, const pm_token_t *lparen, pm_node_t *value, const pm_token_t *rparen, const pm_location_t *keyword_loc) {
+    pm_defined_node_t *node = PM_NODE_ALLOC(parser, pm_defined_node_t);
+
+    *node = (pm_defined_node_t) {
+        {
+            .type = PM_DEFINED_NODE,
+            .node_id = PM_NODE_IDENTIFY(parser),
+            .location = {
+                .start = keyword_loc->start,
+                .end = (rparen->type == PM_TOKEN_NOT_PROVIDED ? value->location.end : rparen->end)
+            },
+        },
+        .lparen_loc = PM_OPTIONAL_LOCATION_TOKEN_VALUE(lparen),
+        .value = value,
+        .rparen_loc = PM_OPTIONAL_LOCATION_TOKEN_VALUE(rparen),
+        .keyword_loc = *keyword_loc
+    };
+
+    return node;
+}
+
+/**
+ * Allocate and initialize a new ElseNode node.
+ */
+static pm_else_node_t *
+pm_else_node_create(pm_parser_t *parser, const pm_token_t *else_keyword, pm_statements_node_t *statements, const pm_token_t *end_keyword) {
+    pm_else_node_t *node = PM_NODE_ALLOC(parser, pm_else_node_t);
+    const uint8_t *end = NULL;
+    if ((end_keyword->type == PM_TOKEN_NOT_PROVIDED) && (statements != NULL)) {
+        end = statements->base.location.end;
+    } else {
+        end = end_keyword->end;
+    }
+
+    *node = (pm_else_node_t) {
+        {
+            .type = PM_ELSE_NODE,
+            .node_id = PM_NODE_IDENTIFY(parser),
+            .location = {
+                .start = else_keyword->start,
+                .end = end,
+            },
+        },
+        .else_keyword_loc = PM_LOCATION_TOKEN_VALUE(else_keyword),
+        .statements = statements,
+        .end_keyword_loc = PM_OPTIONAL_LOCATION_TOKEN_VALUE(end_keyword)
+    };
+
+    return node;
+}
+
+/**
+ * Allocate and initialize a new EmbeddedStatementsNode node.
+ */
+static pm_embedded_statements_node_t *
+pm_embedded_statements_node_create(pm_parser_t *parser, const pm_token_t *opening, pm_statements_node_t *statements, const pm_token_t *closing) {
+    pm_embedded_statements_node_t *node = PM_NODE_ALLOC(parser, pm_embedded_statements_node_t);
+
+    *node = (pm_embedded_statements_node_t) {
+        {
+            .type = PM_EMBEDDED_STATEMENTS_NODE,
+            .node_id = PM_NODE_IDENTIFY(parser),
+            .location = {
+                .start = opening->start,
+                .end = closing->end
+            }
+        },
+        .opening_loc = PM_LOCATION_TOKEN_VALUE(opening),
+        .statements = statements,
+        .closing_loc = PM_LOCATION_TOKEN_VALUE(closing)
+    };
+
+    return node;
+}
+
+/**
+ * Allocate and initialize a new EmbeddedVariableNode node.
+ */
+static pm_embedded_variable_node_t *
+pm_embedded_variable_node_create(pm_parser_t *parser, const pm_token_t *operator, pm_node_t *variable) {
+    pm_embedded_variable_node_t *node = PM_NODE_ALLOC(parser, pm_embedded_variable_node_t);
+
+    *node = (pm_embedded_variable_node_t) {
+        {
+            .type = PM_EMBEDDED_VARIABLE_NODE,
+            .node_id = PM_NODE_IDENTIFY(parser),
+            .location = {
+                .start = operator->start,
+                .end = variable->location.end
+            }
+        },
+        .operator_loc = PM_LOCATION_TOKEN_VALUE(operator),
+        .variable = variable
+    };
+
+    return node;
+}
+
+/**
+ * Allocate a new EnsureNode node.
+ */
+static pm_ensure_node_t *
+pm_ensure_node_create(pm_parser_t *parser, const pm_token_t *ensure_keyword, pm_statements_node_t *statements, const pm_token_t *end_keyword) {
+    pm_ensure_node_t *node = PM_NODE_ALLOC(parser, pm_ensure_node_t);
+
+    *node = (pm_ensure_node_t) {
+        {
+            .type = PM_ENSURE_NODE,
+            .node_id = PM_NODE_IDENTIFY(parser),
+            .location = {
+                .start = ensure_keyword->start,
+                .end = end_keyword->end
+            },
+        },
+        .ensure_keyword_loc = PM_LOCATION_TOKEN_VALUE(ensure_keyword),
+        .statements = statements,
+        .end_keyword_loc = PM_LOCATION_TOKEN_VALUE(end_keyword)
+    };
+
+    return node;
+}
+
+/**
+ * Allocate and initialize a new FalseNode node.
+ */
+static pm_false_node_t *
+pm_false_node_create(pm_parser_t *parser, const pm_token_t *token) {
+    assert(token->type == PM_TOKEN_KEYWORD_FALSE);
+    pm_false_node_t *node = PM_NODE_ALLOC(parser, pm_false_node_t);
+
+    *node = (pm_false_node_t) {{
+        .type = PM_FALSE_NODE,
+        .flags = PM_NODE_FLAG_STATIC_LITERAL,
+        .node_id = PM_NODE_IDENTIFY(parser),
+        .location = PM_LOCATION_TOKEN_VALUE(token)
+    }};
+
+    return node;
+}
+
+/**
+ * Allocate and initialize a new find pattern node. The node list given in the
+ * nodes parameter is guaranteed to have at least two nodes.
+ */
+static pm_find_pattern_node_t *
+pm_find_pattern_node_create(pm_parser_t *parser, pm_node_list_t *nodes) {
+    pm_find_pattern_node_t *node = PM_NODE_ALLOC(parser, pm_find_pattern_node_t);
+
+    pm_node_t *left = nodes->nodes[0];
+    assert(PM_NODE_TYPE_P(left, PM_SPLAT_NODE));
+    pm_splat_node_t *left_splat_node = (pm_splat_node_t *) left;
+
+    pm_node_t *right;
+
+    if (nodes->size == 1) {
+        right = (pm_node_t *) pm_missing_node_create(parser, left->location.end, left->location.end);
+    } else {
+        right = nodes->nodes[nodes->size - 1];
+        assert(PM_NODE_TYPE_P(right, PM_SPLAT_NODE));
+    }
+
+#if PRISM_SERIALIZE_ONLY_SEMANTICS_FIELDS
+    // FindPatternNode#right is typed as SplatNode in this case, so replace the potential MissingNode with a SplatNode.
+    // The resulting AST will anyway be ignored, but this file still needs to compile.
+    pm_splat_node_t *right_splat_node = PM_NODE_TYPE_P(right, PM_SPLAT_NODE) ? (pm_splat_node_t *) right : left_splat_node;
+#else
+    pm_node_t *right_splat_node = right;
+#endif
+    *node = (pm_find_pattern_node_t) {
+        {
+            .type = PM_FIND_PATTERN_NODE,
+            .node_id = PM_NODE_IDENTIFY(parser),
+            .location = {
+                .start = left->location.start,
+                .end = right->location.end,
+            },
+        },
+        .constant = NULL,
+        .left = left_splat_node,
+        .right = right_splat_node,
+        .requireds = { 0 },
+        .opening_loc = PM_OPTIONAL_LOCATION_NOT_PROVIDED_VALUE,
+        .closing_loc = PM_OPTIONAL_LOCATION_NOT_PROVIDED_VALUE
+    };
+
+    // For now we're going to just copy over each pointer manually. This could be
+    // much more efficient, as we could instead resize the node list to only point
+    // to 1...-1.
+    for (size_t index = 1; index < nodes->size - 1; index++) {
+        pm_node_list_append(&node->requireds, nodes->nodes[index]);
+    }
+
+    return node;
+}
+
+/**
+ * Parse the value of a double, add appropriate errors if there is an issue, and
+ * return the value that should be saved on the PM_FLOAT_NODE node.
+ */
+static double
+pm_double_parse(pm_parser_t *parser, const pm_token_t *token) {
+    ptrdiff_t diff = token->end - token->start;
+    if (diff <= 0) return 0.0;
+
+    // First, get a buffer of the content.
+    size_t length = (size_t) diff;
+    char *buffer = xmalloc(sizeof(char) * (length + 1));
+    memcpy((void *) buffer, token->start, length);
+
+    // Next, determine if we need to replace the decimal point because of
+    // locale-specific options, and then normalize them if we have to.
+    char decimal_point = *localeconv()->decimal_point;
+    if (decimal_point != '.') {
+        for (size_t index = 0; index < length; index++) {
+            if (buffer[index] == '.') buffer[index] = decimal_point;
+        }
+    }
+
+    // Next, handle underscores by removing them from the buffer.
+    for (size_t index = 0; index < length; index++) {
+        if (buffer[index] == '_') {
+            memmove((void *) (buffer + index), (void *) (buffer + index + 1), length - index);
+            length--;
+        }
+    }
+
+    // Null-terminate the buffer so that strtod cannot read off the end.
+    buffer[length] = '\0';
+
+    // Now, call strtod to parse the value. Note that CRuby has their own
+    // version of strtod which avoids locales. We're okay using the locale-aware
+    // version because we've already validated through the parser that the token
+    // is in a valid format.
+    errno = 0;
+    char *eptr;
+    double value = strtod(buffer, &eptr);
+
+    // This should never happen, because we've already checked that the token
+    // is in a valid format. However it's good to be safe.
+    if ((eptr != buffer + length) || (errno != 0 && errno != ERANGE)) {
+        PM_PARSER_ERR_TOKEN_FORMAT_CONTENT(parser, (*token), PM_ERR_FLOAT_PARSE);
+        xfree((void *) buffer);
+        return 0.0;
+    }
+
+    // If errno is set, then it should only be ERANGE. At this point we need to
+    // check if it's infinity (it should be).
+    if (errno == ERANGE && PRISM_ISINF(value)) {
+        int warn_width;
+        const char *ellipsis;
+
+        if (length > 20) {
+            warn_width = 20;
+            ellipsis = "...";
+        } else {
+            warn_width = (int) length;
+            ellipsis = "";
+        }
+
+        pm_diagnostic_list_append_format(&parser->warning_list, token->start, token->end, PM_WARN_FLOAT_OUT_OF_RANGE, warn_width, (const char *) token->start, ellipsis);
+        value = (value < 0.0) ? -HUGE_VAL : HUGE_VAL;
+    }
+
+    // Finally we can free the buffer and return the value.
+    xfree((void *) buffer);
+    return value;
+}
+
+/**
+ * Allocate and initialize a new FloatNode node.
+ */
+static pm_float_node_t *
+pm_float_node_create(pm_parser_t *parser, const pm_token_t *token) {
+    assert(token->type == PM_TOKEN_FLOAT);
+    pm_float_node_t *node = PM_NODE_ALLOC(parser, pm_float_node_t);
+
+    *node = (pm_float_node_t) {
+        {
+            .type = PM_FLOAT_NODE,
+            .flags = PM_NODE_FLAG_STATIC_LITERAL,
+            .node_id = PM_NODE_IDENTIFY(parser),
+            .location = PM_LOCATION_TOKEN_VALUE(token)
+        },
+        .value = pm_double_parse(parser, token)
+    };
+
+    return node;
+}
+
+/**
+ * Allocate and initialize a new FloatNode node from a FLOAT_IMAGINARY token.
+ */
+static pm_imaginary_node_t *
+pm_float_node_imaginary_create(pm_parser_t *parser, const pm_token_t *token) {
+    assert(token->type == PM_TOKEN_FLOAT_IMAGINARY);
+
+    pm_imaginary_node_t *node = PM_NODE_ALLOC(parser, pm_imaginary_node_t);
+    *node = (pm_imaginary_node_t) {
+        {
+            .type = PM_IMAGINARY_NODE,
+            .flags = PM_NODE_FLAG_STATIC_LITERAL,
+            .node_id = PM_NODE_IDENTIFY(parser),
+            .location = PM_LOCATION_TOKEN_VALUE(token)
+        },
+        .numeric = (pm_node_t *) pm_float_node_create(parser, &((pm_token_t) {
+            .type = PM_TOKEN_FLOAT,
+            .start = token->start,
+            .end = token->end - 1
+        }))
+    };
+
+    return node;
+}
+
+/**
+ * Allocate and initialize a new RationalNode node from a FLOAT_RATIONAL token.
+ */
+static pm_rational_node_t *
+pm_float_node_rational_create(pm_parser_t *parser, const pm_token_t *token) {
+    assert(token->type == PM_TOKEN_FLOAT_RATIONAL);
+
+    pm_rational_node_t *node = PM_NODE_ALLOC(parser, pm_rational_node_t);
+    *node = (pm_rational_node_t) {
+        {
+            .type = PM_RATIONAL_NODE,
+            .flags = PM_INTEGER_BASE_FLAGS_DECIMAL | PM_NODE_FLAG_STATIC_LITERAL,
+            .node_id = PM_NODE_IDENTIFY(parser),
+            .location = PM_LOCATION_TOKEN_VALUE(token)
+        },
+        .numerator = { 0 },
+        .denominator = { 0 }
+    };
+
+    const uint8_t *start = token->start;
+    const uint8_t *end = token->end - 1; // r
+
+    while (start < end && *start == '0') start++; // 0.1 -> .1
+    while (end > start && end[-1] == '0') end--; // 1.0 -> 1.
+
+    size_t length = (size_t) (end - start);
+    if (length == 1) {
+        node->denominator.value = 1;
+        return node;
+    }
+
+    const uint8_t *point = memchr(start, '.', length);
+    assert(point && "should have a decimal point");
+
+    uint8_t *digits = xmalloc(length);
+    if (digits == NULL) {
+        fputs("[pm_float_node_rational_create] Failed to allocate memory", stderr);
+        abort();
+    }
+
+    memcpy(digits, start, (unsigned long) (point - start));
+    memcpy(digits + (point - start), point + 1, (unsigned long) (end - point - 1));
+    pm_integer_parse(&node->numerator, PM_INTEGER_BASE_DEFAULT, digits, digits + length - 1);
+
+    digits[0] = '1';
+    if (end - point > 1) memset(digits + 1, '0', (size_t) (end - point - 1));
+    pm_integer_parse(&node->denominator, PM_INTEGER_BASE_DEFAULT, digits, digits + (end - point));
+    xfree(digits);
+
+    pm_integers_reduce(&node->numerator, &node->denominator);
+    return node;
+}
+
+/**
+ * Allocate and initialize a new FloatNode node from a FLOAT_RATIONAL_IMAGINARY
+ * token.
+ */
+static pm_imaginary_node_t *
+pm_float_node_rational_imaginary_create(pm_parser_t *parser, const pm_token_t *token) {
+    assert(token->type == PM_TOKEN_FLOAT_RATIONAL_IMAGINARY);
+
+    pm_imaginary_node_t *node = PM_NODE_ALLOC(parser, pm_imaginary_node_t);
+    *node = (pm_imaginary_node_t) {
+        {
+            .type = PM_IMAGINARY_NODE,
+            .flags = PM_NODE_FLAG_STATIC_LITERAL,
+            .node_id = PM_NODE_IDENTIFY(parser),
+            .location = PM_LOCATION_TOKEN_VALUE(token)
+        },
+        .numeric = (pm_node_t *) pm_float_node_rational_create(parser, &((pm_token_t) {
+            .type = PM_TOKEN_FLOAT_RATIONAL,
+            .start = token->start,
+            .end = token->end - 1
+        }))
+    };
+
+    return node;
+}
+
+/**
+ * Allocate and initialize a new ForNode node.
+ */
+static pm_for_node_t *
+pm_for_node_create(
+    pm_parser_t *parser,
+    pm_node_t *index,
+    pm_node_t *collection,
+    pm_statements_node_t *statements,
+    const pm_token_t *for_keyword,
+    const pm_token_t *in_keyword,
+    const pm_token_t *do_keyword,
+    const pm_token_t *end_keyword
+) {
+    pm_for_node_t *node = PM_NODE_ALLOC(parser, pm_for_node_t);
+
+    *node = (pm_for_node_t) {
+        {
+            .type = PM_FOR_NODE,
+            .node_id = PM_NODE_IDENTIFY(parser),
+            .location = {
+                .start = for_keyword->start,
+                .end = end_keyword->end
+            },
+        },
+        .index = index,
+        .collection = collection,
+        .statements = statements,
+        .for_keyword_loc = PM_LOCATION_TOKEN_VALUE(for_keyword),
+        .in_keyword_loc = PM_LOCATION_TOKEN_VALUE(in_keyword),
+        .do_keyword_loc = PM_OPTIONAL_LOCATION_TOKEN_VALUE(do_keyword),
+        .end_keyword_loc = PM_LOCATION_TOKEN_VALUE(end_keyword)
+    };
+
+    return node;
+}
+
+/**
+ * Allocate and initialize a new ForwardingArgumentsNode node.
+ */
+static pm_forwarding_arguments_node_t *
+pm_forwarding_arguments_node_create(pm_parser_t *parser, const pm_token_t *token) {
+    assert(token->type == PM_TOKEN_UDOT_DOT_DOT);
+    pm_forwarding_arguments_node_t *node = PM_NODE_ALLOC(parser, pm_forwarding_arguments_node_t);
+
+    *node = (pm_forwarding_arguments_node_t) {{
+        .type = PM_FORWARDING_ARGUMENTS_NODE,
+        .node_id = PM_NODE_IDENTIFY(parser),
+        .location = PM_LOCATION_TOKEN_VALUE(token)
+    }};
+
+    return node;
+}
+
+/**
+ * Allocate and initialize a new ForwardingParameterNode node.
+ */
+static pm_forwarding_parameter_node_t *
+pm_forwarding_parameter_node_create(pm_parser_t *parser, const pm_token_t *token) {
+    assert(token->type == PM_TOKEN_UDOT_DOT_DOT);
+    pm_forwarding_parameter_node_t *node = PM_NODE_ALLOC(parser, pm_forwarding_parameter_node_t);
+
+    *node = (pm_forwarding_parameter_node_t) {{
+        .type = PM_FORWARDING_PARAMETER_NODE,
+        .node_id = PM_NODE_IDENTIFY(parser),
+        .location = PM_LOCATION_TOKEN_VALUE(token)
+    }};
+
+    return node;
+}
+
+/**
+ * Allocate and initialize a new ForwardingSuper node.
+ */
+static pm_forwarding_super_node_t *
+pm_forwarding_super_node_create(pm_parser_t *parser, const pm_token_t *token, pm_arguments_t *arguments) {
+    assert(arguments->block == NULL || PM_NODE_TYPE_P(arguments->block, PM_BLOCK_NODE));
+    assert(token->type == PM_TOKEN_KEYWORD_SUPER);
+    pm_forwarding_super_node_t *node = PM_NODE_ALLOC(parser, pm_forwarding_super_node_t);
+
+    pm_block_node_t *block = NULL;
+    if (arguments->block != NULL) {
+        block = (pm_block_node_t *) arguments->block;
+    }
+
+    *node = (pm_forwarding_super_node_t) {
+        {
+            .type = PM_FORWARDING_SUPER_NODE,
+            .node_id = PM_NODE_IDENTIFY(parser),
+            .location = {
+                .start = token->start,
+                .end = block != NULL ? block->base.location.end : token->end
+            },
+        },
+        .block = block
+    };
+
+    return node;
+}
+
+/**
+ * Allocate and initialize a new hash pattern node from an opening and closing
+ * token.
+ */
+static pm_hash_pattern_node_t *
+pm_hash_pattern_node_empty_create(pm_parser_t *parser, const pm_token_t *opening, const pm_token_t *closing) {
+    pm_hash_pattern_node_t *node = PM_NODE_ALLOC(parser, pm_hash_pattern_node_t);
+
+    *node = (pm_hash_pattern_node_t) {
+        {
+            .type = PM_HASH_PATTERN_NODE,
+            .node_id = PM_NODE_IDENTIFY(parser),
+            .location = {
+                .start = opening->start,
+                .end = closing->end
+            },
+        },
+        .constant = NULL,
+        .opening_loc = PM_LOCATION_TOKEN_VALUE(opening),
+        .closing_loc = PM_LOCATION_TOKEN_VALUE(closing),
+        .elements = { 0 },
+        .rest = NULL
+    };
+
+    return node;
+}
+
+/**
+ * Allocate and initialize a new hash pattern node.
+ */
+static pm_hash_pattern_node_t *
+pm_hash_pattern_node_node_list_create(pm_parser_t *parser, pm_node_list_t *elements, pm_node_t *rest) {
+    pm_hash_pattern_node_t *node = PM_NODE_ALLOC(parser, pm_hash_pattern_node_t);
+
+    const uint8_t *start;
+    const uint8_t *end;
+
+    if (elements->size > 0) {
+        if (rest) {
+            start = elements->nodes[0]->location.start;
+            end = rest->location.end;
+        } else {
+            start = elements->nodes[0]->location.start;
+            end = elements->nodes[elements->size - 1]->location.end;
+        }
+    } else {
+        assert(rest != NULL);
+        start = rest->location.start;
+        end = rest->location.end;
+    }
+
+    *node = (pm_hash_pattern_node_t) {
+        {
+            .type = PM_HASH_PATTERN_NODE,
+            .node_id = PM_NODE_IDENTIFY(parser),
+            .location = {
+                .start = start,
+                .end = end
+            },
+        },
+        .constant = NULL,
+        .elements = { 0 },
+        .rest = rest,
+        .opening_loc = PM_OPTIONAL_LOCATION_NOT_PROVIDED_VALUE,
+        .closing_loc = PM_OPTIONAL_LOCATION_NOT_PROVIDED_VALUE
+    };
+
+    pm_node_t *element;
+    PM_NODE_LIST_FOREACH(elements, index, element) {
+        pm_node_list_append(&node->elements, element);
+    }
+
+    return node;
+}
+
+/**
+ * Retrieve the name from a node that will become a global variable write node.
+ */
+static pm_constant_id_t
+pm_global_variable_write_name(pm_parser_t *parser, const pm_node_t *target) {
+    switch (PM_NODE_TYPE(target)) {
+        case PM_GLOBAL_VARIABLE_READ_NODE:
+            return ((pm_global_variable_read_node_t *) target)->name;
+        case PM_BACK_REFERENCE_READ_NODE:
+            return ((pm_back_reference_read_node_t *) target)->name;
+        case PM_NUMBERED_REFERENCE_READ_NODE:
+            // This will only ever happen in the event of a syntax error, but we
+            // still need to provide something for the node.
+            return pm_parser_constant_id_location(parser, target->location.start, target->location.end);
+        default:
+            assert(false && "unreachable");
+            return (pm_constant_id_t) -1;
+    }
+}
+
+/**
+ * Allocate and initialize a new GlobalVariableAndWriteNode node.
+ */
+static pm_global_variable_and_write_node_t *
+pm_global_variable_and_write_node_create(pm_parser_t *parser, pm_node_t *target, const pm_token_t *operator, pm_node_t *value) {
+    assert(operator->type == PM_TOKEN_AMPERSAND_AMPERSAND_EQUAL);
+    pm_global_variable_and_write_node_t *node = PM_NODE_ALLOC(parser, pm_global_variable_and_write_node_t);
+
+    *node = (pm_global_variable_and_write_node_t) {
+        {
+            .type = PM_GLOBAL_VARIABLE_AND_WRITE_NODE,
+            .node_id = PM_NODE_IDENTIFY(parser),
+            .location = {
+                .start = target->location.start,
+                .end = value->location.end
+            }
+        },
+        .name = pm_global_variable_write_name(parser, target),
+        .name_loc = target->location,
+        .operator_loc = PM_LOCATION_TOKEN_VALUE(operator),
+        .value = value
+    };
+
+    return node;
+}
+
+/**
+ * Allocate and initialize a new GlobalVariableOperatorWriteNode node.
+ */
+static pm_global_variable_operator_write_node_t *
+pm_global_variable_operator_write_node_create(pm_parser_t *parser, pm_node_t *target, const pm_token_t *operator, pm_node_t *value) {
+    pm_global_variable_operator_write_node_t *node = PM_NODE_ALLOC(parser, pm_global_variable_operator_write_node_t);
+
+    *node = (pm_global_variable_operator_write_node_t) {
+        {
+            .type = PM_GLOBAL_VARIABLE_OPERATOR_WRITE_NODE,
+            .node_id = PM_NODE_IDENTIFY(parser),
+            .location = {
+                .start = target->location.start,
+                .end = value->location.end
+            }
+        },
+        .name = pm_global_variable_write_name(parser, target),
+        .name_loc = target->location,
+        .binary_operator_loc = PM_LOCATION_TOKEN_VALUE(operator),
+        .value = value,
+        .binary_operator = pm_parser_constant_id_location(parser, operator->start, operator->end - 1)
+    };
+
+    return node;
+}
+
+/**
+ * Allocate and initialize a new GlobalVariableOrWriteNode node.
+ */
+static pm_global_variable_or_write_node_t *
+pm_global_variable_or_write_node_create(pm_parser_t *parser, pm_node_t *target, const pm_token_t *operator, pm_node_t *value) {
+    assert(operator->type == PM_TOKEN_PIPE_PIPE_EQUAL);
+    pm_global_variable_or_write_node_t *node = PM_NODE_ALLOC(parser, pm_global_variable_or_write_node_t);
+
+    *node = (pm_global_variable_or_write_node_t) {
+        {
+            .type = PM_GLOBAL_VARIABLE_OR_WRITE_NODE,
+            .node_id = PM_NODE_IDENTIFY(parser),
+            .location = {
+                .start = target->location.start,
+                .end = value->location.end
+            }
+        },
+        .name = pm_global_variable_write_name(parser, target),
+        .name_loc = target->location,
+        .operator_loc = PM_LOCATION_TOKEN_VALUE(operator),
+        .value = value
+    };
+
+    return node;
+}
+
+/**
+ * Allocate a new GlobalVariableReadNode node.
+ */
+static pm_global_variable_read_node_t *
+pm_global_variable_read_node_create(pm_parser_t *parser, const pm_token_t *name) {
+    pm_global_variable_read_node_t *node = PM_NODE_ALLOC(parser, pm_global_variable_read_node_t);
+
+    *node = (pm_global_variable_read_node_t) {
+        {
+            .type = PM_GLOBAL_VARIABLE_READ_NODE,
+            .node_id = PM_NODE_IDENTIFY(parser),
+            .location = PM_LOCATION_TOKEN_VALUE(name),
+        },
+        .name = pm_parser_constant_id_token(parser, name)
+    };
+
+    return node;
+}
+
+/**
+ * Allocate and initialize a new synthesized GlobalVariableReadNode node.
+ */
+static pm_global_variable_read_node_t *
+pm_global_variable_read_node_synthesized_create(pm_parser_t *parser, pm_constant_id_t name) {
+    pm_global_variable_read_node_t *node = PM_NODE_ALLOC(parser, pm_global_variable_read_node_t);
+
+    *node = (pm_global_variable_read_node_t) {
+        {
+            .type = PM_GLOBAL_VARIABLE_READ_NODE,
+            .node_id = PM_NODE_IDENTIFY(parser),
+            .location = PM_LOCATION_NULL_VALUE(parser)
+        },
+        .name = name
+    };
+
+    return node;
+}
+
+/**
+ * Allocate and initialize a new GlobalVariableWriteNode node.
+ */
+static pm_global_variable_write_node_t *
+pm_global_variable_write_node_create(pm_parser_t *parser, pm_node_t *target, const pm_token_t *operator, pm_node_t *value) {
+    pm_global_variable_write_node_t *node = PM_NODE_ALLOC(parser, pm_global_variable_write_node_t);
+
+    *node = (pm_global_variable_write_node_t) {
+        {
+            .type = PM_GLOBAL_VARIABLE_WRITE_NODE,
+            .node_id = PM_NODE_IDENTIFY(parser),
+            .flags = pm_implicit_array_write_flags(value, PM_WRITE_NODE_FLAGS_IMPLICIT_ARRAY),
+            .location = {
+                .start = target->location.start,
+                .end = value->location.end
+            },
+        },
+        .name = pm_global_variable_write_name(parser, target),
+        .name_loc = PM_LOCATION_NODE_VALUE(target),
+        .operator_loc = PM_OPTIONAL_LOCATION_TOKEN_VALUE(operator),
+        .value = value
+    };
+
+    return node;
+}
+
+/**
+ * Allocate and initialize a new synthesized GlobalVariableWriteNode node.
+ */
+static pm_global_variable_write_node_t *
+pm_global_variable_write_node_synthesized_create(pm_parser_t *parser, pm_constant_id_t name, pm_node_t *value) {
+    pm_global_variable_write_node_t *node = PM_NODE_ALLOC(parser, pm_global_variable_write_node_t);
+
+    *node = (pm_global_variable_write_node_t) {
+        {
+            .type = PM_GLOBAL_VARIABLE_WRITE_NODE,
+            .node_id = PM_NODE_IDENTIFY(parser),
+            .location = PM_LOCATION_NULL_VALUE(parser)
+        },
+        .name = name,
+        .name_loc = PM_LOCATION_NULL_VALUE(parser),
+        .operator_loc = PM_LOCATION_NULL_VALUE(parser),
+        .value = value
+    };
+
+    return node;
+}
+
+/**
+ * Allocate a new HashNode node.
+ */
+static pm_hash_node_t *
+pm_hash_node_create(pm_parser_t *parser, const pm_token_t *opening) {
+    assert(opening != NULL);
+    pm_hash_node_t *node = PM_NODE_ALLOC(parser, pm_hash_node_t);
+
+    *node = (pm_hash_node_t) {
+        {
+            .type = PM_HASH_NODE,
+            .flags = PM_NODE_FLAG_STATIC_LITERAL,
+            .node_id = PM_NODE_IDENTIFY(parser),
+            .location = PM_LOCATION_TOKEN_VALUE(opening)
+        },
+        .opening_loc = PM_LOCATION_TOKEN_VALUE(opening),
+        .closing_loc = PM_LOCATION_NULL_VALUE(parser),
+        .elements = { 0 }
+    };
+
+    return node;
+}
+
+/**
+ * Append a new element to a hash node.
+ */
+static inline void
+pm_hash_node_elements_append(pm_hash_node_t *hash, pm_node_t *element) {
+    pm_node_list_append(&hash->elements, element);
+
+    bool static_literal = PM_NODE_TYPE_P(element, PM_ASSOC_NODE);
+    if (static_literal) {
+        pm_assoc_node_t *assoc = (pm_assoc_node_t *) element;
+        static_literal = !PM_NODE_TYPE_P(assoc->key, PM_ARRAY_NODE) && !PM_NODE_TYPE_P(assoc->key, PM_HASH_NODE) && !PM_NODE_TYPE_P(assoc->key, PM_RANGE_NODE);
+        static_literal = static_literal && PM_NODE_FLAG_P(assoc->key, PM_NODE_FLAG_STATIC_LITERAL);
+        static_literal = static_literal && PM_NODE_FLAG_P(assoc, PM_NODE_FLAG_STATIC_LITERAL);
+    }
+
+    if (!static_literal) {
+        pm_node_flag_unset((pm_node_t *)hash, PM_NODE_FLAG_STATIC_LITERAL);
+    }
+}
+
+static inline void
+pm_hash_node_closing_loc_set(pm_hash_node_t *hash, pm_token_t *token) {
+    hash->base.location.end = token->end;
+    hash->closing_loc = PM_LOCATION_TOKEN_VALUE(token);
+}
+
+/**
+ * Allocate a new IfNode node.
+ */
+static pm_if_node_t *
+pm_if_node_create(pm_parser_t *parser,
+    const pm_token_t *if_keyword,
+    pm_node_t *predicate,
+    const pm_token_t *then_keyword,
+    pm_statements_node_t *statements,
+    pm_node_t *subsequent,
+    const pm_token_t *end_keyword
+) {
+    pm_conditional_predicate(parser, predicate, PM_CONDITIONAL_PREDICATE_TYPE_CONDITIONAL);
+    pm_if_node_t *node = PM_NODE_ALLOC(parser, pm_if_node_t);
+
+    const uint8_t *end;
+    if (end_keyword->type != PM_TOKEN_NOT_PROVIDED) {
+        end = end_keyword->end;
+    } else if (subsequent != NULL) {
+        end = subsequent->location.end;
+    } else if (pm_statements_node_body_length(statements) != 0) {
+        end = statements->base.location.end;
+    } else {
+        end = predicate->location.end;
+    }
+
+    *node = (pm_if_node_t) {
+        {
+            .type = PM_IF_NODE,
+            .flags = PM_NODE_FLAG_NEWLINE,
+            .node_id = PM_NODE_IDENTIFY(parser),
+            .location = {
+                .start = if_keyword->start,
+                .end = end
+            },
+        },
+        .if_keyword_loc = PM_LOCATION_TOKEN_VALUE(if_keyword),
+        .predicate = predicate,
+        .then_keyword_loc = PM_OPTIONAL_LOCATION_TOKEN_VALUE(then_keyword),
+        .statements = statements,
+        .subsequent = subsequent,
+        .end_keyword_loc = PM_OPTIONAL_LOCATION_TOKEN_VALUE(end_keyword)
+    };
+
+    return node;
+}
+
+/**
+ * Allocate and initialize new IfNode node in the modifier form.
+ */
+static pm_if_node_t *
+pm_if_node_modifier_create(pm_parser_t *parser, pm_node_t *statement, const pm_token_t *if_keyword, pm_node_t *predicate) {
+    pm_conditional_predicate(parser, predicate, PM_CONDITIONAL_PREDICATE_TYPE_CONDITIONAL);
+    pm_if_node_t *node = PM_NODE_ALLOC(parser, pm_if_node_t);
+
+    pm_statements_node_t *statements = pm_statements_node_create(parser);
+    pm_statements_node_body_append(parser, statements, statement, true);
+
+    *node = (pm_if_node_t) {
+        {
+            .type = PM_IF_NODE,
+            .flags = PM_NODE_FLAG_NEWLINE,
+            .node_id = PM_NODE_IDENTIFY(parser),
+            .location = {
+                .start = statement->location.start,
+                .end = predicate->location.end
+            },
+        },
+        .if_keyword_loc = PM_LOCATION_TOKEN_VALUE(if_keyword),
+        .predicate = predicate,
+        .then_keyword_loc = PM_OPTIONAL_LOCATION_NOT_PROVIDED_VALUE,
+        .statements = statements,
+        .subsequent = NULL,
+        .end_keyword_loc = PM_OPTIONAL_LOCATION_NOT_PROVIDED_VALUE
+    };
+
+    return node;
+}
+
+/**
+ * Allocate and initialize an if node from a ternary expression.
+ */
+static pm_if_node_t *
+pm_if_node_ternary_create(pm_parser_t *parser, pm_node_t *predicate, const pm_token_t *qmark, pm_node_t *true_expression, const pm_token_t *colon, pm_node_t *false_expression) {
+    pm_assert_value_expression(parser, predicate);
+    pm_conditional_predicate(parser, predicate, PM_CONDITIONAL_PREDICATE_TYPE_CONDITIONAL);
+
+    pm_statements_node_t *if_statements = pm_statements_node_create(parser);
+    pm_statements_node_body_append(parser, if_statements, true_expression, true);
+
+    pm_statements_node_t *else_statements = pm_statements_node_create(parser);
+    pm_statements_node_body_append(parser, else_statements, false_expression, true);
+
+    pm_token_t end_keyword = not_provided(parser);
+    pm_else_node_t *else_node = pm_else_node_create(parser, colon, else_statements, &end_keyword);
+
+    pm_if_node_t *node = PM_NODE_ALLOC(parser, pm_if_node_t);
+
+    *node = (pm_if_node_t) {
+        {
+            .type = PM_IF_NODE,
+            .flags = PM_NODE_FLAG_NEWLINE,
+            .node_id = PM_NODE_IDENTIFY(parser),
+            .location = {
+                .start = predicate->location.start,
+                .end = false_expression->location.end,
+            },
+        },
+        .if_keyword_loc = PM_OPTIONAL_LOCATION_NOT_PROVIDED_VALUE,
+        .predicate = predicate,
+        .then_keyword_loc = PM_LOCATION_TOKEN_VALUE(qmark),
+        .statements = if_statements,
+        .subsequent = (pm_node_t *) else_node,
+        .end_keyword_loc = PM_OPTIONAL_LOCATION_NOT_PROVIDED_VALUE
+    };
+
+    return node;
+
+}
+
+static inline void
+pm_if_node_end_keyword_loc_set(pm_if_node_t *node, const pm_token_t *keyword) {
+    node->base.location.end = keyword->end;
+    node->end_keyword_loc = PM_LOCATION_TOKEN_VALUE(keyword);
+}
+
+static inline void
+pm_else_node_end_keyword_loc_set(pm_else_node_t *node, const pm_token_t *keyword) {
+    node->base.location.end = keyword->end;
+    node->end_keyword_loc = PM_LOCATION_TOKEN_VALUE(keyword);
+}
+
+/**
+ * Allocate and initialize a new ImplicitNode node.
+ */
+static pm_implicit_node_t *
+pm_implicit_node_create(pm_parser_t *parser, pm_node_t *value) {
+    pm_implicit_node_t *node = PM_NODE_ALLOC(parser, pm_implicit_node_t);
+
+    *node = (pm_implicit_node_t) {
+        {
+            .type = PM_IMPLICIT_NODE,
+            .node_id = PM_NODE_IDENTIFY(parser),
+            .location = value->location
+        },
+        .value = value
+    };
+
+    return node;
+}
+
+/**
+ * Allocate and initialize a new ImplicitRestNode node.
+ */
+static pm_implicit_rest_node_t *
+pm_implicit_rest_node_create(pm_parser_t *parser, const pm_token_t *token) {
+    assert(token->type == PM_TOKEN_COMMA);
+
+    pm_implicit_rest_node_t *node = PM_NODE_ALLOC(parser, pm_implicit_rest_node_t);
+
+    *node = (pm_implicit_rest_node_t) {
+        {
+            .type = PM_IMPLICIT_REST_NODE,
+            .node_id = PM_NODE_IDENTIFY(parser),
+            .location = PM_LOCATION_TOKEN_VALUE(token)
+        }
+    };
+
+    return node;
+}
+
+/**
+ * Allocate and initialize a new IntegerNode node.
+ */
+static pm_integer_node_t *
+pm_integer_node_create(pm_parser_t *parser, pm_node_flags_t base, const pm_token_t *token) {
+    assert(token->type == PM_TOKEN_INTEGER);
+    pm_integer_node_t *node = PM_NODE_ALLOC(parser, pm_integer_node_t);
+
+    *node = (pm_integer_node_t) {
+        {
+            .type = PM_INTEGER_NODE,
+            .flags = base | PM_NODE_FLAG_STATIC_LITERAL,
+            .node_id = PM_NODE_IDENTIFY(parser),
+            .location = PM_LOCATION_TOKEN_VALUE(token)
+        },
+        .value = { 0 }
+    };
+
+    pm_integer_base_t integer_base = PM_INTEGER_BASE_DECIMAL;
+    switch (base) {
+        case PM_INTEGER_BASE_FLAGS_BINARY: integer_base = PM_INTEGER_BASE_BINARY; break;
+        case PM_INTEGER_BASE_FLAGS_OCTAL: integer_base = PM_INTEGER_BASE_OCTAL; break;
+        case PM_INTEGER_BASE_FLAGS_DECIMAL: break;
+        case PM_INTEGER_BASE_FLAGS_HEXADECIMAL: integer_base = PM_INTEGER_BASE_HEXADECIMAL; break;
+        default: assert(false && "unreachable"); break;
+    }
+
+    pm_integer_parse(&node->value, integer_base, token->start, token->end);
+    return node;
+}
+
+/**
+ * Allocate and initialize a new IntegerNode node from an INTEGER_IMAGINARY
+ * token.
+ */
+static pm_imaginary_node_t *
+pm_integer_node_imaginary_create(pm_parser_t *parser, pm_node_flags_t base, const pm_token_t *token) {
+    assert(token->type == PM_TOKEN_INTEGER_IMAGINARY);
+
+    pm_imaginary_node_t *node = PM_NODE_ALLOC(parser, pm_imaginary_node_t);
+    *node = (pm_imaginary_node_t) {
+        {
+            .type = PM_IMAGINARY_NODE,
+            .flags = PM_NODE_FLAG_STATIC_LITERAL,
+            .node_id = PM_NODE_IDENTIFY(parser),
+            .location = PM_LOCATION_TOKEN_VALUE(token)
+        },
+        .numeric = (pm_node_t *) pm_integer_node_create(parser, base, &((pm_token_t) {
+            .type = PM_TOKEN_INTEGER,
+            .start = token->start,
+            .end = token->end - 1
+        }))
+    };
+
+    return node;
+}
+
+/**
+ * Allocate and initialize a new RationalNode node from an INTEGER_RATIONAL
+ * token.
+ */
+static pm_rational_node_t *
+pm_integer_node_rational_create(pm_parser_t *parser, pm_node_flags_t base, const pm_token_t *token) {
+    assert(token->type == PM_TOKEN_INTEGER_RATIONAL);
+
+    pm_rational_node_t *node = PM_NODE_ALLOC(parser, pm_rational_node_t);
+    *node = (pm_rational_node_t) {
+        {
+            .type = PM_RATIONAL_NODE,
+            .flags = base | PM_NODE_FLAG_STATIC_LITERAL,
+            .node_id = PM_NODE_IDENTIFY(parser),
+            .location = PM_LOCATION_TOKEN_VALUE(token)
+        },
+        .numerator = { 0 },
+        .denominator = { .value = 1, 0 }
+    };
+
+    pm_integer_base_t integer_base = PM_INTEGER_BASE_DECIMAL;
+    switch (base) {
+        case PM_INTEGER_BASE_FLAGS_BINARY: integer_base = PM_INTEGER_BASE_BINARY; break;
+        case PM_INTEGER_BASE_FLAGS_OCTAL: integer_base = PM_INTEGER_BASE_OCTAL; break;
+        case PM_INTEGER_BASE_FLAGS_DECIMAL: break;
+        case PM_INTEGER_BASE_FLAGS_HEXADECIMAL: integer_base = PM_INTEGER_BASE_HEXADECIMAL; break;
+        default: assert(false && "unreachable"); break;
+    }
+
+    pm_integer_parse(&node->numerator, integer_base, token->start, token->end - 1);
+
+    return node;
+}
+
+/**
+ * Allocate and initialize a new IntegerNode node from an
+ * INTEGER_RATIONAL_IMAGINARY token.
+ */
+static pm_imaginary_node_t *
+pm_integer_node_rational_imaginary_create(pm_parser_t *parser, pm_node_flags_t base, const pm_token_t *token) {
+    assert(token->type == PM_TOKEN_INTEGER_RATIONAL_IMAGINARY);
+
+    pm_imaginary_node_t *node = PM_NODE_ALLOC(parser, pm_imaginary_node_t);
+    *node = (pm_imaginary_node_t) {
+        {
+            .type = PM_IMAGINARY_NODE,
+            .flags = PM_NODE_FLAG_STATIC_LITERAL,
+            .node_id = PM_NODE_IDENTIFY(parser),
+            .location = PM_LOCATION_TOKEN_VALUE(token)
+        },
+        .numeric = (pm_node_t *) pm_integer_node_rational_create(parser, base, &((pm_token_t) {
+            .type = PM_TOKEN_INTEGER_RATIONAL,
+            .start = token->start,
+            .end = token->end - 1
+        }))
+    };
+
+    return node;
+}
+
+/**
+ * Allocate and initialize a new InNode node.
+ */
+static pm_in_node_t *
+pm_in_node_create(pm_parser_t *parser, pm_node_t *pattern, pm_statements_node_t *statements, const pm_token_t *in_keyword, const pm_token_t *then_keyword) {
+    pm_in_node_t *node = PM_NODE_ALLOC(parser, pm_in_node_t);
+
+    const uint8_t *end;
+    if (statements != NULL) {
+        end = statements->base.location.end;
+    } else if (then_keyword->type != PM_TOKEN_NOT_PROVIDED) {
+        end = then_keyword->end;
+    } else {
+        end = pattern->location.end;
+    }
+
+    *node = (pm_in_node_t) {
+        {
+            .type = PM_IN_NODE,
+            .node_id = PM_NODE_IDENTIFY(parser),
+            .location = {
+                .start = in_keyword->start,
+                .end = end
+            },
+        },
+        .pattern = pattern,
+        .statements = statements,
+        .in_loc = PM_LOCATION_TOKEN_VALUE(in_keyword),
+        .then_loc = PM_OPTIONAL_LOCATION_TOKEN_VALUE(then_keyword)
+    };
+
+    return node;
+}
+
+/**
+ * Allocate and initialize a new InstanceVariableAndWriteNode node.
+ */
+static pm_instance_variable_and_write_node_t *
+pm_instance_variable_and_write_node_create(pm_parser_t *parser, pm_instance_variable_read_node_t *target, const pm_token_t *operator, pm_node_t *value) {
+    assert(operator->type == PM_TOKEN_AMPERSAND_AMPERSAND_EQUAL);
+    pm_instance_variable_and_write_node_t *node = PM_NODE_ALLOC(parser, pm_instance_variable_and_write_node_t);
+
+    *node = (pm_instance_variable_and_write_node_t) {
+        {
+            .type = PM_INSTANCE_VARIABLE_AND_WRITE_NODE,
+            .node_id = PM_NODE_IDENTIFY(parser),
+            .location = {
+                .start = target->base.location.start,
+                .end = value->location.end
+            }
+        },
+        .name = target->name,
+        .name_loc = target->base.location,
+        .operator_loc = PM_LOCATION_TOKEN_VALUE(operator),
+        .value = value
+    };
+
+    return node;
+}
+
+/**
+ * Allocate and initialize a new InstanceVariableOperatorWriteNode node.
+ */
+static pm_instance_variable_operator_write_node_t *
+pm_instance_variable_operator_write_node_create(pm_parser_t *parser, pm_instance_variable_read_node_t *target, const pm_token_t *operator, pm_node_t *value) {
+    pm_instance_variable_operator_write_node_t *node = PM_NODE_ALLOC(parser, pm_instance_variable_operator_write_node_t);
+
+    *node = (pm_instance_variable_operator_write_node_t) {
+        {
+            .type = PM_INSTANCE_VARIABLE_OPERATOR_WRITE_NODE,
+            .node_id = PM_NODE_IDENTIFY(parser),
+            .location = {
+                .start = target->base.location.start,
+                .end = value->location.end
+            }
+        },
+        .name = target->name,
+        .name_loc = target->base.location,
+        .binary_operator_loc = PM_LOCATION_TOKEN_VALUE(operator),
+        .value = value,
+        .binary_operator = pm_parser_constant_id_location(parser, operator->start, operator->end - 1)
+    };
+
+    return node;
+}
+
+/**
+ * Allocate and initialize a new InstanceVariableOrWriteNode node.
+ */
+static pm_instance_variable_or_write_node_t *
+pm_instance_variable_or_write_node_create(pm_parser_t *parser, pm_instance_variable_read_node_t *target, const pm_token_t *operator, pm_node_t *value) {
+    assert(operator->type == PM_TOKEN_PIPE_PIPE_EQUAL);
+    pm_instance_variable_or_write_node_t *node = PM_NODE_ALLOC(parser, pm_instance_variable_or_write_node_t);
+
+    *node = (pm_instance_variable_or_write_node_t) {
+        {
+            .type = PM_INSTANCE_VARIABLE_OR_WRITE_NODE,
+            .node_id = PM_NODE_IDENTIFY(parser),
+            .location = {
+                .start = target->base.location.start,
+                .end = value->location.end
+            }
+        },
+        .name = target->name,
+        .name_loc = target->base.location,
+        .operator_loc = PM_LOCATION_TOKEN_VALUE(operator),
+        .value = value
+    };
+
+    return node;
+}
+
+/**
+ * Allocate and initialize a new InstanceVariableReadNode node.
+ */
+static pm_instance_variable_read_node_t *
+pm_instance_variable_read_node_create(pm_parser_t *parser, const pm_token_t *token) {
+    assert(token->type == PM_TOKEN_INSTANCE_VARIABLE);
+    pm_instance_variable_read_node_t *node = PM_NODE_ALLOC(parser, pm_instance_variable_read_node_t);
+
+    *node = (pm_instance_variable_read_node_t) {
+        {
+            .type = PM_INSTANCE_VARIABLE_READ_NODE,
+            .node_id = PM_NODE_IDENTIFY(parser),
+            .location = PM_LOCATION_TOKEN_VALUE(token)
+        },
+        .name = pm_parser_constant_id_token(parser, token)
+    };
+
+    return node;
+}
+
+/**
+ * Initialize a new InstanceVariableWriteNode node from an InstanceVariableRead
+ * node.
+ */
+static pm_instance_variable_write_node_t *
+pm_instance_variable_write_node_create(pm_parser_t *parser, pm_instance_variable_read_node_t *read_node, pm_token_t *operator, pm_node_t *value) {
+    pm_instance_variable_write_node_t *node = PM_NODE_ALLOC(parser, pm_instance_variable_write_node_t);
+    *node = (pm_instance_variable_write_node_t) {
+        {
+            .type = PM_INSTANCE_VARIABLE_WRITE_NODE,
+            .flags = pm_implicit_array_write_flags(value, PM_WRITE_NODE_FLAGS_IMPLICIT_ARRAY),
+            .node_id = PM_NODE_IDENTIFY(parser),
+            .location = {
+                .start = read_node->base.location.start,
+                .end = value->location.end
+            }
+        },
+        .name = read_node->name,
+        .name_loc = PM_LOCATION_NODE_BASE_VALUE(read_node),
+        .operator_loc = PM_OPTIONAL_LOCATION_TOKEN_VALUE(operator),
+        .value = value
+    };
+
+    return node;
+}
+
+/**
+ * Append a part into a list of string parts. Importantly this handles nested
+ * interpolated strings by not necessarily removing the marker for static
+ * literals.
+ */
+static void
+pm_interpolated_node_append(pm_node_t *node, pm_node_list_t *parts, pm_node_t *part) {
+    switch (PM_NODE_TYPE(part)) {
+        case PM_STRING_NODE:
+            pm_node_flag_set(part, PM_NODE_FLAG_STATIC_LITERAL | PM_STRING_FLAGS_FROZEN);
+            break;
+        case PM_EMBEDDED_STATEMENTS_NODE: {
+            pm_embedded_statements_node_t *cast = (pm_embedded_statements_node_t *) part;
+            pm_node_t *embedded = (cast->statements != NULL && cast->statements->body.size == 1) ? cast->statements->body.nodes[0] : NULL;
+
+            if (embedded == NULL) {
+                // If there are no statements or more than one statement, then
+                // we lose the static literal flag.
+                pm_node_flag_unset(node, PM_NODE_FLAG_STATIC_LITERAL);
+            } else if (PM_NODE_TYPE_P(embedded, PM_STRING_NODE)) {
+                // If the embedded statement is a string, then we can keep the
+                // static literal flag and mark the string as frozen.
+                pm_node_flag_set(embedded, PM_NODE_FLAG_STATIC_LITERAL | PM_STRING_FLAGS_FROZEN);
+            } else if (PM_NODE_TYPE_P(embedded, PM_INTERPOLATED_STRING_NODE) && PM_NODE_FLAG_P(embedded, PM_NODE_FLAG_STATIC_LITERAL)) {
+                // If the embedded statement is an interpolated string and it's
+                // a static literal, then we can keep the static literal flag.
+            } else {
+                // Otherwise we lose the static literal flag.
+                pm_node_flag_unset(node, PM_NODE_FLAG_STATIC_LITERAL);
+            }
+
+            break;
+        }
+        case PM_EMBEDDED_VARIABLE_NODE:
+            pm_node_flag_unset((pm_node_t *) node, PM_NODE_FLAG_STATIC_LITERAL);
+            break;
+        default:
+            assert(false && "unexpected node type");
+            break;
+    }
+
+    pm_node_list_append(parts, part);
+}
+
+/**
+ * Allocate a new InterpolatedRegularExpressionNode node.
+ */
+static pm_interpolated_regular_expression_node_t *
+pm_interpolated_regular_expression_node_create(pm_parser_t *parser, const pm_token_t *opening) {
+    pm_interpolated_regular_expression_node_t *node = PM_NODE_ALLOC(parser, pm_interpolated_regular_expression_node_t);
+
+    *node = (pm_interpolated_regular_expression_node_t) {
+        {
+            .type = PM_INTERPOLATED_REGULAR_EXPRESSION_NODE,
+            .flags = PM_NODE_FLAG_STATIC_LITERAL,
+            .node_id = PM_NODE_IDENTIFY(parser),
+            .location = {
+                .start = opening->start,
+                .end = NULL,
+            },
+        },
+        .opening_loc = PM_LOCATION_TOKEN_VALUE(opening),
+        .closing_loc = PM_LOCATION_TOKEN_VALUE(opening),
+        .parts = { 0 }
+    };
+
+    return node;
+}
+
+static inline void
+pm_interpolated_regular_expression_node_append(pm_interpolated_regular_expression_node_t *node, pm_node_t *part) {
+    if (node->base.location.start > part->location.start) {
+        node->base.location.start = part->location.start;
+    }
+    if (node->base.location.end < part->location.end) {
+        node->base.location.end = part->location.end;
+    }
+
+    pm_interpolated_node_append((pm_node_t *) node, &node->parts, part);
+}
+
+static inline void
+pm_interpolated_regular_expression_node_closing_set(pm_parser_t *parser, pm_interpolated_regular_expression_node_t *node, const pm_token_t *closing) {
+    node->closing_loc = PM_LOCATION_TOKEN_VALUE(closing);
+    node->base.location.end = closing->end;
+    pm_node_flag_set((pm_node_t *) node, pm_regular_expression_flags_create(parser, closing));
+}
+
+/**
+ * Append a part to an InterpolatedStringNode node.
+ *
+ * This has some somewhat complicated semantics, because we need to update
+ * multiple flags that have somewhat confusing interactions.
+ *
+ * PM_NODE_FLAG_STATIC_LITERAL indicates that the node should be treated as a
+ * single static literal string that can be pushed onto the stack on its own.
+ * Note that this doesn't necessarily mean that the string will be frozen or
+ * not; the instructions in CRuby will be either putobject or putstring,
+ * depending on the combination of `--enable-frozen-string-literal`,
+ * `# frozen_string_literal: true`, and whether or not there is interpolation.
+ *
+ * PM_INTERPOLATED_STRING_NODE_FLAGS_FROZEN indicates that the string should be
+ * explicitly frozen. This will only happen if the string is comprised entirely
+ * of string parts that are themselves static literals and frozen.
+ *
+ * PM_INTERPOLATED_STRING_NODE_FLAGS_MUTABLE indicates that the string should
+ * be explicitly marked as mutable. This will happen from
+ * `--disable-frozen-string-literal` or `# frozen_string_literal: false`. This
+ * is necessary to indicate that the string should be left up to the runtime,
+ * which could potentially use a chilled string otherwise.
+ */
+static inline void
+pm_interpolated_string_node_append(pm_interpolated_string_node_t *node, pm_node_t *part) {
+#define CLEAR_FLAGS(node) \
+    node->base.flags = (pm_node_flags_t) (node->base.flags & ~(PM_NODE_FLAG_STATIC_LITERAL | PM_INTERPOLATED_STRING_NODE_FLAGS_FROZEN | PM_INTERPOLATED_STRING_NODE_FLAGS_MUTABLE))
+
+#define MUTABLE_FLAGS(node) \
+    node->base.flags = (pm_node_flags_t) ((node->base.flags | PM_INTERPOLATED_STRING_NODE_FLAGS_MUTABLE) & ~PM_INTERPOLATED_STRING_NODE_FLAGS_FROZEN);
+
+    if (node->parts.size == 0 && node->opening_loc.start == NULL) {
+        node->base.location.start = part->location.start;
+    }
+
+    node->base.location.end = MAX(node->base.location.end, part->location.end);
+
+    switch (PM_NODE_TYPE(part)) {
+        case PM_STRING_NODE:
+            part->flags = (pm_node_flags_t) ((part->flags | PM_NODE_FLAG_STATIC_LITERAL | PM_STRING_FLAGS_FROZEN) & ~PM_STRING_FLAGS_MUTABLE);
+            break;
+        case PM_INTERPOLATED_STRING_NODE:
+            if (PM_NODE_FLAG_P(part, PM_NODE_FLAG_STATIC_LITERAL)) {
+                // If the string that we're concatenating is a static literal,
+                // then we can keep the static literal flag for this string.
+            } else {
+                // Otherwise, we lose the static literal flag here and we should
+                // also clear the mutability flags.
+                CLEAR_FLAGS(node);
+            }
+            break;
+        case PM_EMBEDDED_STATEMENTS_NODE: {
+            pm_embedded_statements_node_t *cast = (pm_embedded_statements_node_t *) part;
+            pm_node_t *embedded = (cast->statements != NULL && cast->statements->body.size == 1) ? cast->statements->body.nodes[0] : NULL;
+
+            if (embedded == NULL) {
+                // If we're embedding multiple statements or no statements, then
+                // the string is not longer a static literal.
+                CLEAR_FLAGS(node);
+            } else if (PM_NODE_TYPE_P(embedded, PM_STRING_NODE)) {
+                // If the embedded statement is a string, then we can make that
+                // string as frozen and static literal, and not touch the static
+                // literal status of this string.
+                embedded->flags = (pm_node_flags_t) ((embedded->flags | PM_NODE_FLAG_STATIC_LITERAL | PM_STRING_FLAGS_FROZEN) & ~PM_STRING_FLAGS_MUTABLE);
+
+                if (PM_NODE_FLAG_P(node, PM_NODE_FLAG_STATIC_LITERAL)) {
+                    MUTABLE_FLAGS(node);
+                }
+            } else if (PM_NODE_TYPE_P(embedded, PM_INTERPOLATED_STRING_NODE) && PM_NODE_FLAG_P(embedded, PM_NODE_FLAG_STATIC_LITERAL)) {
+                // If the embedded statement is an interpolated string, but that
+                // string is marked as static literal, then we can keep our
+                // static literal status for this string.
+                if (PM_NODE_FLAG_P(node, PM_NODE_FLAG_STATIC_LITERAL)) {
+                    MUTABLE_FLAGS(node);
+                }
+            } else {
+                // In all other cases, we lose the static literal flag here and
+                // become mutable.
+                CLEAR_FLAGS(node);
+            }
+
+            break;
+        }
+        case PM_EMBEDDED_VARIABLE_NODE:
+            // Embedded variables clear static literal, which means we also
+            // should clear the mutability flags.
+            CLEAR_FLAGS(node);
+            break;
+        case PM_X_STRING_NODE:
+        case PM_INTERPOLATED_X_STRING_NODE:
+            // If this is an x string, then this is a syntax error. But we want
+            // to handle it here so that we don't fail the assertion.
+            CLEAR_FLAGS(node);
+            break;
+        default:
+            assert(false && "unexpected node type");
+            break;
+    }
+
+    pm_node_list_append(&node->parts, part);
+
+#undef CLEAR_FLAGS
+#undef MUTABLE_FLAGS
+}
+
+/**
+ * Allocate and initialize a new InterpolatedStringNode node.
+ */
+static pm_interpolated_string_node_t *
+pm_interpolated_string_node_create(pm_parser_t *parser, const pm_token_t *opening, const pm_node_list_t *parts, const pm_token_t *closing) {
+    pm_interpolated_string_node_t *node = PM_NODE_ALLOC(parser, pm_interpolated_string_node_t);
+    pm_node_flags_t flags = PM_NODE_FLAG_STATIC_LITERAL;
+
+    switch (parser->frozen_string_literal) {
+        case PM_OPTIONS_FROZEN_STRING_LITERAL_DISABLED:
+            flags |= PM_INTERPOLATED_STRING_NODE_FLAGS_MUTABLE;
+            break;
+        case PM_OPTIONS_FROZEN_STRING_LITERAL_ENABLED:
+            flags |= PM_INTERPOLATED_STRING_NODE_FLAGS_FROZEN;
+            break;
+    }
+
+    *node = (pm_interpolated_string_node_t) {
+        {
+            .type = PM_INTERPOLATED_STRING_NODE,
+            .flags = flags,
+            .node_id = PM_NODE_IDENTIFY(parser),
+            .location = {
+                .start = opening->start,
+                .end = closing->end,
+            },
+        },
+        .opening_loc = PM_OPTIONAL_LOCATION_TOKEN_VALUE(opening),
+        .closing_loc = PM_OPTIONAL_LOCATION_TOKEN_VALUE(closing),
+        .parts = { 0 }
+    };
+
+    if (parts != NULL) {
+        pm_node_t *part;
+        PM_NODE_LIST_FOREACH(parts, index, part) {
+            pm_interpolated_string_node_append(node, part);
+        }
+    }
+
+    return node;
+}
+
+/**
+ * Set the closing token of the given InterpolatedStringNode node.
+ */
+static void
+pm_interpolated_string_node_closing_set(pm_interpolated_string_node_t *node, const pm_token_t *closing) {
+    node->closing_loc = PM_OPTIONAL_LOCATION_TOKEN_VALUE(closing);
+    node->base.location.end = closing->end;
+}
+
+static void
+pm_interpolated_symbol_node_append(pm_interpolated_symbol_node_t *node, pm_node_t *part) {
+    if (node->parts.size == 0 && node->opening_loc.start == NULL) {
+        node->base.location.start = part->location.start;
+    }
+
+    pm_interpolated_node_append((pm_node_t *) node, &node->parts, part);
+    node->base.location.end = MAX(node->base.location.end, part->location.end);
+}
+
+static void
+pm_interpolated_symbol_node_closing_loc_set(pm_interpolated_symbol_node_t *node, const pm_token_t *closing) {
+    node->closing_loc = PM_OPTIONAL_LOCATION_TOKEN_VALUE(closing);
+    node->base.location.end = closing->end;
+}
+
+/**
+ * Allocate and initialize a new InterpolatedSymbolNode node.
+ */
+static pm_interpolated_symbol_node_t *
+pm_interpolated_symbol_node_create(pm_parser_t *parser, const pm_token_t *opening, const pm_node_list_t *parts, const pm_token_t *closing) {
+    pm_interpolated_symbol_node_t *node = PM_NODE_ALLOC(parser, pm_interpolated_symbol_node_t);
+
+    *node = (pm_interpolated_symbol_node_t) {
+        {
+            .type = PM_INTERPOLATED_SYMBOL_NODE,
+            .flags = PM_NODE_FLAG_STATIC_LITERAL,
+            .node_id = PM_NODE_IDENTIFY(parser),
+            .location = {
+                .start = opening->start,
+                .end = closing->end,
+            },
+        },
+        .opening_loc = PM_OPTIONAL_LOCATION_TOKEN_VALUE(opening),
+        .closing_loc = PM_OPTIONAL_LOCATION_TOKEN_VALUE(closing),
+        .parts = { 0 }
+    };
+
+    if (parts != NULL) {
+        pm_node_t *part;
+        PM_NODE_LIST_FOREACH(parts, index, part) {
+            pm_interpolated_symbol_node_append(node, part);
+        }
+    }
+
+    return node;
+}
+
+/**
+ * Allocate a new InterpolatedXStringNode node.
+ */
+static pm_interpolated_x_string_node_t *
+pm_interpolated_xstring_node_create(pm_parser_t *parser, const pm_token_t *opening, const pm_token_t *closing) {
+    pm_interpolated_x_string_node_t *node = PM_NODE_ALLOC(parser, pm_interpolated_x_string_node_t);
+
+    *node = (pm_interpolated_x_string_node_t) {
+        {
+            .type = PM_INTERPOLATED_X_STRING_NODE,
+            .node_id = PM_NODE_IDENTIFY(parser),
+            .location = {
+                .start = opening->start,
+                .end = closing->end
+            },
+        },
+        .opening_loc = PM_OPTIONAL_LOCATION_TOKEN_VALUE(opening),
+        .closing_loc = PM_OPTIONAL_LOCATION_TOKEN_VALUE(closing),
+        .parts = { 0 }
+    };
+
+    return node;
+}
+
+static inline void
+pm_interpolated_xstring_node_append(pm_interpolated_x_string_node_t *node, pm_node_t *part) {
+    pm_interpolated_node_append((pm_node_t *) node, &node->parts, part);
+    node->base.location.end = part->location.end;
+}
+
+static inline void
+pm_interpolated_xstring_node_closing_set(pm_interpolated_x_string_node_t *node, const pm_token_t *closing) {
+    node->closing_loc = PM_OPTIONAL_LOCATION_TOKEN_VALUE(closing);
+    node->base.location.end = closing->end;
+}
+
+/**
+ * Create a local variable read that is reading the implicit 'it' variable.
+ */
+static pm_it_local_variable_read_node_t *
+pm_it_local_variable_read_node_create(pm_parser_t *parser, const pm_token_t *name) {
+    pm_it_local_variable_read_node_t *node = PM_NODE_ALLOC(parser, pm_it_local_variable_read_node_t);
+
+    *node = (pm_it_local_variable_read_node_t) {
+        {
+            .type = PM_IT_LOCAL_VARIABLE_READ_NODE,
+            .node_id = PM_NODE_IDENTIFY(parser),
+            .location = PM_LOCATION_TOKEN_VALUE(name)
+        }
+    };
+
+    return node;
+}
+
+/**
+ * Allocate and initialize a new ItParametersNode node.
+ */
+static pm_it_parameters_node_t *
+pm_it_parameters_node_create(pm_parser_t *parser, const pm_token_t *opening, const pm_token_t *closing) {
+    pm_it_parameters_node_t *node = PM_NODE_ALLOC(parser, pm_it_parameters_node_t);
+
+    *node = (pm_it_parameters_node_t) {
+        {
+            .type = PM_IT_PARAMETERS_NODE,
+            .node_id = PM_NODE_IDENTIFY(parser),
+            .location = {
+                .start = opening->start,
+                .end = closing->end
+            }
+        }
+    };
+
+    return node;
+}
+
+/**
+ * Allocate a new KeywordHashNode node.
+ */
+static pm_keyword_hash_node_t *
+pm_keyword_hash_node_create(pm_parser_t *parser) {
+    pm_keyword_hash_node_t *node = PM_NODE_ALLOC(parser, pm_keyword_hash_node_t);
+
+    *node = (pm_keyword_hash_node_t) {
+        .base = {
+            .type = PM_KEYWORD_HASH_NODE,
+            .flags = PM_KEYWORD_HASH_NODE_FLAGS_SYMBOL_KEYS,
+            .node_id = PM_NODE_IDENTIFY(parser),
+            .location = PM_OPTIONAL_LOCATION_NOT_PROVIDED_VALUE
+        },
+        .elements = { 0 }
+    };
+
+    return node;
+}
+
+/**
+ * Append an element to a KeywordHashNode node.
+ */
+static void
+pm_keyword_hash_node_elements_append(pm_keyword_hash_node_t *hash, pm_node_t *element) {
+    // If the element being added is not an AssocNode or does not have a symbol
+    // key, then we want to turn the SYMBOL_KEYS flag off.
+    if (!PM_NODE_TYPE_P(element, PM_ASSOC_NODE) || !PM_NODE_TYPE_P(((pm_assoc_node_t *) element)->key, PM_SYMBOL_NODE)) {
+        pm_node_flag_unset((pm_node_t *)hash, PM_KEYWORD_HASH_NODE_FLAGS_SYMBOL_KEYS);
+    }
+
+    pm_node_list_append(&hash->elements, element);
+    if (hash->base.location.start == NULL) {
+        hash->base.location.start = element->location.start;
+    }
+    hash->base.location.end = element->location.end;
+}
+
+/**
+ * Allocate and initialize a new RequiredKeywordParameterNode node.
+ */
+static pm_required_keyword_parameter_node_t *
+pm_required_keyword_parameter_node_create(pm_parser_t *parser, const pm_token_t *name) {
+    pm_required_keyword_parameter_node_t *node = PM_NODE_ALLOC(parser, pm_required_keyword_parameter_node_t);
+
+    *node = (pm_required_keyword_parameter_node_t) {
+        {
+            .type = PM_REQUIRED_KEYWORD_PARAMETER_NODE,
+            .node_id = PM_NODE_IDENTIFY(parser),
+            .location = {
+                .start = name->start,
+                .end = name->end
+            },
+        },
+        .name = pm_parser_constant_id_location(parser, name->start, name->end - 1),
+        .name_loc = PM_LOCATION_TOKEN_VALUE(name),
+    };
+
+    return node;
+}
+
+/**
+ * Allocate a new OptionalKeywordParameterNode node.
+ */
+static pm_optional_keyword_parameter_node_t *
+pm_optional_keyword_parameter_node_create(pm_parser_t *parser, const pm_token_t *name, pm_node_t *value) {
+    pm_optional_keyword_parameter_node_t *node = PM_NODE_ALLOC(parser, pm_optional_keyword_parameter_node_t);
+
+    *node = (pm_optional_keyword_parameter_node_t) {
+        {
+            .type = PM_OPTIONAL_KEYWORD_PARAMETER_NODE,
+            .node_id = PM_NODE_IDENTIFY(parser),
+            .location = {
+                .start = name->start,
+                .end = value->location.end
+            },
+        },
+        .name = pm_parser_constant_id_location(parser, name->start, name->end - 1),
+        .name_loc = PM_LOCATION_TOKEN_VALUE(name),
+        .value = value
+    };
+
+    return node;
+}
+
+/**
+ * Allocate a new KeywordRestParameterNode node.
+ */
+static pm_keyword_rest_parameter_node_t *
+pm_keyword_rest_parameter_node_create(pm_parser_t *parser, const pm_token_t *operator, const pm_token_t *name) {
+    pm_keyword_rest_parameter_node_t *node = PM_NODE_ALLOC(parser, pm_keyword_rest_parameter_node_t);
+
+    *node = (pm_keyword_rest_parameter_node_t) {
+        {
+            .type = PM_KEYWORD_REST_PARAMETER_NODE,
+            .node_id = PM_NODE_IDENTIFY(parser),
+            .location = {
+                .start = operator->start,
+                .end = (name->type == PM_TOKEN_NOT_PROVIDED ? operator->end : name->end)
+            },
+        },
+        .name = pm_parser_optional_constant_id_token(parser, name),
+        .name_loc = PM_OPTIONAL_LOCATION_TOKEN_VALUE(name),
+        .operator_loc = PM_LOCATION_TOKEN_VALUE(operator)
+    };
+
+    return node;
+}
+
+/**
+ * Allocate a new LambdaNode node.
+ */
+static pm_lambda_node_t *
+pm_lambda_node_create(
+    pm_parser_t *parser,
+    pm_constant_id_list_t *locals,
+    const pm_token_t *operator,
+    const pm_token_t *opening,
+    const pm_token_t *closing,
+    pm_node_t *parameters,
+    pm_node_t *body
+) {
+    pm_lambda_node_t *node = PM_NODE_ALLOC(parser, pm_lambda_node_t);
+
+    *node = (pm_lambda_node_t) {
+        {
+            .type = PM_LAMBDA_NODE,
+            .node_id = PM_NODE_IDENTIFY(parser),
+            .location = {
+                .start = operator->start,
+                .end = closing->end
+            },
+        },
+        .locals = *locals,
+        .operator_loc = PM_LOCATION_TOKEN_VALUE(operator),
+        .opening_loc = PM_LOCATION_TOKEN_VALUE(opening),
+        .closing_loc = PM_LOCATION_TOKEN_VALUE(closing),
+        .parameters = parameters,
+        .body = body
+    };
+
+    return node;
+}
+
+/**
+ * Allocate and initialize a new LocalVariableAndWriteNode node.
+ */
+static pm_local_variable_and_write_node_t *
+pm_local_variable_and_write_node_create(pm_parser_t *parser, pm_node_t *target, const pm_token_t *operator, pm_node_t *value, pm_constant_id_t name, uint32_t depth) {
+    assert(PM_NODE_TYPE_P(target, PM_LOCAL_VARIABLE_READ_NODE) || PM_NODE_TYPE_P(target, PM_IT_LOCAL_VARIABLE_READ_NODE) || PM_NODE_TYPE_P(target, PM_CALL_NODE));
+    assert(operator->type == PM_TOKEN_AMPERSAND_AMPERSAND_EQUAL);
+    pm_local_variable_and_write_node_t *node = PM_NODE_ALLOC(parser, pm_local_variable_and_write_node_t);
+
+    *node = (pm_local_variable_and_write_node_t) {
+        {
+            .type = PM_LOCAL_VARIABLE_AND_WRITE_NODE,
+            .node_id = PM_NODE_IDENTIFY(parser),
+            .location = {
+                .start = target->location.start,
+                .end = value->location.end
+            }
+        },
+        .name_loc = target->location,
+        .operator_loc = PM_LOCATION_TOKEN_VALUE(operator),
+        .value = value,
+        .name = name,
+        .depth = depth
+    };
+
+    return node;
+}
+
+/**
+ * Allocate and initialize a new LocalVariableOperatorWriteNode node.
+ */
+static pm_local_variable_operator_write_node_t *
+pm_local_variable_operator_write_node_create(pm_parser_t *parser, pm_node_t *target, const pm_token_t *operator, pm_node_t *value, pm_constant_id_t name, uint32_t depth) {
+    pm_local_variable_operator_write_node_t *node = PM_NODE_ALLOC(parser, pm_local_variable_operator_write_node_t);
+
+    *node = (pm_local_variable_operator_write_node_t) {
+        {
+            .type = PM_LOCAL_VARIABLE_OPERATOR_WRITE_NODE,
+            .node_id = PM_NODE_IDENTIFY(parser),
+            .location = {
+                .start = target->location.start,
+                .end = value->location.end
+            }
+        },
+        .name_loc = target->location,
+        .binary_operator_loc = PM_LOCATION_TOKEN_VALUE(operator),
+        .value = value,
+        .name = name,
+        .binary_operator = pm_parser_constant_id_location(parser, operator->start, operator->end - 1),
+        .depth = depth
+    };
+
+    return node;
+}
+
+/**
+ * Allocate and initialize a new LocalVariableOrWriteNode node.
+ */
+static pm_local_variable_or_write_node_t *
+pm_local_variable_or_write_node_create(pm_parser_t *parser, pm_node_t *target, const pm_token_t *operator, pm_node_t *value, pm_constant_id_t name, uint32_t depth) {
+    assert(PM_NODE_TYPE_P(target, PM_LOCAL_VARIABLE_READ_NODE) || PM_NODE_TYPE_P(target, PM_IT_LOCAL_VARIABLE_READ_NODE) || PM_NODE_TYPE_P(target, PM_CALL_NODE));
+    assert(operator->type == PM_TOKEN_PIPE_PIPE_EQUAL);
+    pm_local_variable_or_write_node_t *node = PM_NODE_ALLOC(parser, pm_local_variable_or_write_node_t);
+
+    *node = (pm_local_variable_or_write_node_t) {
+        {
+            .type = PM_LOCAL_VARIABLE_OR_WRITE_NODE,
+            .node_id = PM_NODE_IDENTIFY(parser),
+            .location = {
+                .start = target->location.start,
+                .end = value->location.end
+            }
+        },
+        .name_loc = target->location,
+        .operator_loc = PM_LOCATION_TOKEN_VALUE(operator),
+        .value = value,
+        .name = name,
+        .depth = depth
+    };
+
+    return node;
+}
+
+/**
+ * Allocate a new LocalVariableReadNode node with constant_id.
+ */
+static pm_local_variable_read_node_t *
+pm_local_variable_read_node_create_constant_id(pm_parser_t *parser, const pm_token_t *name, pm_constant_id_t name_id, uint32_t depth, bool missing) {
+    if (!missing) pm_locals_read(&pm_parser_scope_find(parser, depth)->locals, name_id);
+
+    pm_local_variable_read_node_t *node = PM_NODE_ALLOC(parser, pm_local_variable_read_node_t);
+
+    *node = (pm_local_variable_read_node_t) {
+        {
+            .type = PM_LOCAL_VARIABLE_READ_NODE,
+            .node_id = PM_NODE_IDENTIFY(parser),
+            .location = PM_LOCATION_TOKEN_VALUE(name)
+        },
+        .name = name_id,
+        .depth = depth
+    };
+
+    return node;
+}
+
+/**
+ * Allocate and initialize a new LocalVariableReadNode node.
+ */
+static pm_local_variable_read_node_t *
+pm_local_variable_read_node_create(pm_parser_t *parser, const pm_token_t *name, uint32_t depth) {
+    pm_constant_id_t name_id = pm_parser_constant_id_token(parser, name);
+    return pm_local_variable_read_node_create_constant_id(parser, name, name_id, depth, false);
+}
+
+/**
+ * Allocate and initialize a new LocalVariableReadNode node for a missing local
+ * variable. (This will only happen when there is a syntax error.)
+ */
+static pm_local_variable_read_node_t *
+pm_local_variable_read_node_missing_create(pm_parser_t *parser, const pm_token_t *name, uint32_t depth) {
+    pm_constant_id_t name_id = pm_parser_constant_id_token(parser, name);
+    return pm_local_variable_read_node_create_constant_id(parser, name, name_id, depth, true);
+}
+
+/**
+ * Allocate and initialize a new LocalVariableWriteNode node.
+ */
+static pm_local_variable_write_node_t *
+pm_local_variable_write_node_create(pm_parser_t *parser, pm_constant_id_t name, uint32_t depth, pm_node_t *value, const pm_location_t *name_loc, const pm_token_t *operator) {
+    pm_local_variable_write_node_t *node = PM_NODE_ALLOC(parser, pm_local_variable_write_node_t);
+
+    *node = (pm_local_variable_write_node_t) {
+        {
+            .type = PM_LOCAL_VARIABLE_WRITE_NODE,
+            .flags = pm_implicit_array_write_flags(value, PM_WRITE_NODE_FLAGS_IMPLICIT_ARRAY),
+            .node_id = PM_NODE_IDENTIFY(parser),
+            .location = {
+                .start = name_loc->start,
+                .end = value->location.end
+            }
+        },
+        .name = name,
+        .depth = depth,
+        .value = value,
+        .name_loc = *name_loc,
+        .operator_loc = PM_OPTIONAL_LOCATION_TOKEN_VALUE(operator)
+    };
+
+    return node;
+}
+
+/**
+ * Returns true if the given bounds comprise `it`.
+ */
+static inline bool
+pm_token_is_it(const uint8_t *start, const uint8_t *end) {
+    return (end - start == 2) && (start[0] == 'i') && (start[1] == 't');
+}
+
+/**
+ * Returns true if the given bounds comprise a numbered parameter (i.e., they
+ * are of the form /^_\d$/).
+ */
+static inline bool
+pm_token_is_numbered_parameter(const uint8_t *start, const uint8_t *end) {
+    return (end - start == 2) && (start[0] == '_') && (start[1] != '0') && (pm_char_is_decimal_digit(start[1]));
+}
+
+/**
+ * Ensure the given bounds do not comprise a numbered parameter. If they do, add
+ * an appropriate error message to the parser.
+ */
+static inline void
+pm_refute_numbered_parameter(pm_parser_t *parser, const uint8_t *start, const uint8_t *end) {
+    if (pm_token_is_numbered_parameter(start, end)) {
+        PM_PARSER_ERR_FORMAT(parser, start, end, PM_ERR_PARAMETER_NUMBERED_RESERVED, start);
+    }
+}
+
+/**
+ * Allocate and initialize a new LocalVariableTargetNode node with the given
+ * name and depth.
+ */
+static pm_local_variable_target_node_t *
+pm_local_variable_target_node_create(pm_parser_t *parser, const pm_location_t *location, pm_constant_id_t name, uint32_t depth) {
+    pm_refute_numbered_parameter(parser, location->start, location->end);
+    pm_local_variable_target_node_t *node = PM_NODE_ALLOC(parser, pm_local_variable_target_node_t);
+
+    *node = (pm_local_variable_target_node_t) {
+        {
+            .type = PM_LOCAL_VARIABLE_TARGET_NODE,
+            .node_id = PM_NODE_IDENTIFY(parser),
+            .location = *location
+        },
+        .name = name,
+        .depth = depth
+    };
+
+    return node;
+}
+
+/**
+ * Allocate and initialize a new MatchPredicateNode node.
+ */
+static pm_match_predicate_node_t *
+pm_match_predicate_node_create(pm_parser_t *parser, pm_node_t *value, pm_node_t *pattern, const pm_token_t *operator) {
+    pm_assert_value_expression(parser, value);
+
+    pm_match_predicate_node_t *node = PM_NODE_ALLOC(parser, pm_match_predicate_node_t);
+
+    *node = (pm_match_predicate_node_t) {
+        {
+            .type = PM_MATCH_PREDICATE_NODE,
+            .node_id = PM_NODE_IDENTIFY(parser),
+            .location = {
+                .start = value->location.start,
+                .end = pattern->location.end
+            }
+        },
+        .value = value,
+        .pattern = pattern,
+        .operator_loc = PM_LOCATION_TOKEN_VALUE(operator)
+    };
+
+    return node;
+}
+
+/**
+ * Allocate and initialize a new MatchRequiredNode node.
+ */
+static pm_match_required_node_t *
+pm_match_required_node_create(pm_parser_t *parser, pm_node_t *value, pm_node_t *pattern, const pm_token_t *operator) {
+    pm_assert_value_expression(parser, value);
+
+    pm_match_required_node_t *node = PM_NODE_ALLOC(parser, pm_match_required_node_t);
+
+    *node = (pm_match_required_node_t) {
+        {
+            .type = PM_MATCH_REQUIRED_NODE,
+            .node_id = PM_NODE_IDENTIFY(parser),
+            .location = {
+                .start = value->location.start,
+                .end = pattern->location.end
+            }
+        },
+        .value = value,
+        .pattern = pattern,
+        .operator_loc = PM_LOCATION_TOKEN_VALUE(operator)
+    };
+
+    return node;
+}
+
+/**
+ * Allocate and initialize a new MatchWriteNode node.
+ */
+static pm_match_write_node_t *
+pm_match_write_node_create(pm_parser_t *parser, pm_call_node_t *call) {
+    pm_match_write_node_t *node = PM_NODE_ALLOC(parser, pm_match_write_node_t);
+
+    *node = (pm_match_write_node_t) {
+        {
+            .type = PM_MATCH_WRITE_NODE,
+            .node_id = PM_NODE_IDENTIFY(parser),
+            .location = call->base.location
+        },
+        .call = call,
+        .targets = { 0 }
+    };
+
+    return node;
+}
+
+/**
+ * Allocate a new ModuleNode node.
+ */
+static pm_module_node_t *
+pm_module_node_create(pm_parser_t *parser, pm_constant_id_list_t *locals, const pm_token_t *module_keyword, pm_node_t *constant_path, const pm_token_t *name, pm_node_t *body, const pm_token_t *end_keyword) {
+    pm_module_node_t *node = PM_NODE_ALLOC(parser, pm_module_node_t);
+
+    *node = (pm_module_node_t) {
+        {
+            .type = PM_MODULE_NODE,
+            .node_id = PM_NODE_IDENTIFY(parser),
+            .location = {
+                .start = module_keyword->start,
+                .end = end_keyword->end
+            }
+        },
+        .locals = (locals == NULL ? ((pm_constant_id_list_t) { .ids = NULL, .size = 0, .capacity = 0 }) : *locals),
+        .module_keyword_loc = PM_LOCATION_TOKEN_VALUE(module_keyword),
+        .constant_path = constant_path,
+        .body = body,
+        .end_keyword_loc = PM_LOCATION_TOKEN_VALUE(end_keyword),
+        .name = pm_parser_constant_id_token(parser, name)
+    };
+
+    return node;
+}
+
+/**
+ * Allocate and initialize new MultiTargetNode node.
+ */
+static pm_multi_target_node_t *
+pm_multi_target_node_create(pm_parser_t *parser) {
+    pm_multi_target_node_t *node = PM_NODE_ALLOC(parser, pm_multi_target_node_t);
+
+    *node = (pm_multi_target_node_t) {
+        {
+            .type = PM_MULTI_TARGET_NODE,
+            .node_id = PM_NODE_IDENTIFY(parser),
+            .location = { .start = NULL, .end = NULL }
+        },
+        .lefts = { 0 },
+        .rest = NULL,
+        .rights = { 0 },
+        .lparen_loc = PM_OPTIONAL_LOCATION_NOT_PROVIDED_VALUE,
+        .rparen_loc = PM_OPTIONAL_LOCATION_NOT_PROVIDED_VALUE
+    };
+
+    return node;
+}
+
+/**
+ * Append a target to a MultiTargetNode node.
+ */
+static void
+pm_multi_target_node_targets_append(pm_parser_t *parser, pm_multi_target_node_t *node, pm_node_t *target) {
+    if (PM_NODE_TYPE_P(target, PM_SPLAT_NODE)) {
+        if (node->rest == NULL) {
+            node->rest = target;
+        } else {
+            pm_parser_err_node(parser, target, PM_ERR_MULTI_ASSIGN_MULTI_SPLATS);
+            pm_node_list_append(&node->rights, target);
+        }
+    } else if (PM_NODE_TYPE_P(target, PM_IMPLICIT_REST_NODE)) {
+        if (node->rest == NULL) {
+            node->rest = target;
+        } else {
+            PM_PARSER_ERR_TOKEN_FORMAT_CONTENT(parser, parser->current, PM_ERR_MULTI_ASSIGN_UNEXPECTED_REST);
+            pm_node_list_append(&node->rights, target);
+        }
+    } else if (node->rest == NULL) {
+        pm_node_list_append(&node->lefts, target);
+    } else {
+        pm_node_list_append(&node->rights, target);
+    }
+
+    if (node->base.location.start == NULL || (node->base.location.start > target->location.start)) {
+        node->base.location.start = target->location.start;
+    }
+
+    if (node->base.location.end == NULL || (node->base.location.end < target->location.end)) {
+        node->base.location.end = target->location.end;
+    }
+}
+
+/**
+ * Set the opening of a MultiTargetNode node.
+ */
+static void
+pm_multi_target_node_opening_set(pm_multi_target_node_t *node, const pm_token_t *lparen) {
+    node->base.location.start = lparen->start;
+    node->lparen_loc = PM_LOCATION_TOKEN_VALUE(lparen);
+}
+
+/**
+ * Set the closing of a MultiTargetNode node.
+ */
+static void
+pm_multi_target_node_closing_set(pm_multi_target_node_t *node, const pm_token_t *rparen) {
+    node->base.location.end = rparen->end;
+    node->rparen_loc = PM_LOCATION_TOKEN_VALUE(rparen);
+}
+
+/**
+ * Allocate a new MultiWriteNode node.
+ */
+static pm_multi_write_node_t *
+pm_multi_write_node_create(pm_parser_t *parser, pm_multi_target_node_t *target, const pm_token_t *operator, pm_node_t *value) {
+    pm_multi_write_node_t *node = PM_NODE_ALLOC(parser, pm_multi_write_node_t);
+
+    *node = (pm_multi_write_node_t) {
+        {
+            .type = PM_MULTI_WRITE_NODE,
+            .flags = pm_implicit_array_write_flags(value, PM_WRITE_NODE_FLAGS_IMPLICIT_ARRAY),
+            .node_id = PM_NODE_IDENTIFY(parser),
+            .location = {
+                .start = target->base.location.start,
+                .end = value->location.end
+            }
+        },
+        .lefts = target->lefts,
+        .rest = target->rest,
+        .rights = target->rights,
+        .lparen_loc = target->lparen_loc,
+        .rparen_loc = target->rparen_loc,
+        .operator_loc = PM_LOCATION_TOKEN_VALUE(operator),
+        .value = value
+    };
+
+    // Explicitly do not call pm_node_destroy here because we want to keep
+    // around all of the information within the MultiWriteNode node.
+    xfree(target);
+
+    return node;
+}
+
+/**
+ * Allocate and initialize a new NextNode node.
+ */
+static pm_next_node_t *
+pm_next_node_create(pm_parser_t *parser, const pm_token_t *keyword, pm_arguments_node_t *arguments) {
+    assert(keyword->type == PM_TOKEN_KEYWORD_NEXT);
+    pm_next_node_t *node = PM_NODE_ALLOC(parser, pm_next_node_t);
+
+    *node = (pm_next_node_t) {
+        {
+            .type = PM_NEXT_NODE,
+            .node_id = PM_NODE_IDENTIFY(parser),
+            .location = {
+                .start = keyword->start,
+                .end = (arguments == NULL ? keyword->end : arguments->base.location.end)
+            }
+        },
+        .keyword_loc = PM_LOCATION_TOKEN_VALUE(keyword),
+        .arguments = arguments
+    };
+
+    return node;
+}
+
+/**
+ * Allocate and initialize a new NilNode node.
+ */
+static pm_nil_node_t *
+pm_nil_node_create(pm_parser_t *parser, const pm_token_t *token) {
+    assert(token->type == PM_TOKEN_KEYWORD_NIL);
+    pm_nil_node_t *node = PM_NODE_ALLOC(parser, pm_nil_node_t);
+
+    *node = (pm_nil_node_t) {{
+        .type = PM_NIL_NODE,
+        .flags = PM_NODE_FLAG_STATIC_LITERAL,
+        .node_id = PM_NODE_IDENTIFY(parser),
+        .location = PM_LOCATION_TOKEN_VALUE(token)
+    }};
+
+    return node;
+}
+
+/**
+ * Allocate and initialize a new NoKeywordsParameterNode node.
+ */
+static pm_no_keywords_parameter_node_t *
+pm_no_keywords_parameter_node_create(pm_parser_t *parser, const pm_token_t *operator, const pm_token_t *keyword) {
+    assert(operator->type == PM_TOKEN_USTAR_STAR || operator->type == PM_TOKEN_STAR_STAR);
+    assert(keyword->type == PM_TOKEN_KEYWORD_NIL);
+    pm_no_keywords_parameter_node_t *node = PM_NODE_ALLOC(parser, pm_no_keywords_parameter_node_t);
+
+    *node = (pm_no_keywords_parameter_node_t) {
+        {
+            .type = PM_NO_KEYWORDS_PARAMETER_NODE,
+            .node_id = PM_NODE_IDENTIFY(parser),
+            .location = {
+                .start = operator->start,
+                .end = keyword->end
+            }
+        },
+        .operator_loc = PM_LOCATION_TOKEN_VALUE(operator),
+        .keyword_loc = PM_LOCATION_TOKEN_VALUE(keyword)
+    };
+
+    return node;
+}
+
+/**
+ * Allocate and initialize a new NumberedParametersNode node.
+ */
+static pm_numbered_parameters_node_t *
+pm_numbered_parameters_node_create(pm_parser_t *parser, const pm_location_t *location, uint8_t maximum) {
+    pm_numbered_parameters_node_t *node = PM_NODE_ALLOC(parser, pm_numbered_parameters_node_t);
+
+    *node = (pm_numbered_parameters_node_t) {
+        {
+            .type = PM_NUMBERED_PARAMETERS_NODE,
+            .node_id = PM_NODE_IDENTIFY(parser),
+            .location = *location
+        },
+        .maximum = maximum
+    };
+
+    return node;
+}
+
+/**
+ * The maximum numbered reference value is defined as the maximum value that an
+ * integer can hold minus 1 bit for CRuby instruction sequence operand tagging.
+ */
+#define NTH_REF_MAX ((uint32_t) (INT_MAX >> 1))
+
+/**
+ * Parse the decimal number represented by the range of bytes. Returns
+ * 0 if the number fails to parse or if the number is greater than the maximum
+ * value representable by a numbered reference. This function assumes that the
+ * range of bytes has already been validated to contain only decimal digits.
+ */
+static uint32_t
+pm_numbered_reference_read_node_number(pm_parser_t *parser, const pm_token_t *token) {
+    const uint8_t *start = token->start + 1;
+    const uint8_t *end = token->end;
+
+    ptrdiff_t diff = end - start;
+    assert(diff > 0);
+#if PTRDIFF_MAX > SIZE_MAX
+    assert(diff < (ptrdiff_t) SIZE_MAX);
+#endif
+    size_t length = (size_t) diff;
+
+    char *digits = xcalloc(length + 1, sizeof(char));
+    memcpy(digits, start, length);
+    digits[length] = '\0';
+
+    char *endptr;
+    errno = 0;
+    unsigned long value = strtoul(digits, &endptr, 10);
+
+    if ((digits == endptr) || (*endptr != '\0')) {
+        pm_parser_err(parser, start, end, PM_ERR_INVALID_NUMBER_DECIMAL);
+        value = 0;
+    }
+
+    xfree(digits);
+
+    if ((errno == ERANGE) || (value > NTH_REF_MAX)) {
+        PM_PARSER_WARN_FORMAT(parser, start, end, PM_WARN_INVALID_NUMBERED_REFERENCE, (int) (length + 1), (const char *) token->start);
+        value = 0;
+    }
+
+    return (uint32_t) value;
+}
+
+#undef NTH_REF_MAX
+
+/**
+ * Allocate and initialize a new NthReferenceReadNode node.
+ */
+static pm_numbered_reference_read_node_t *
+pm_numbered_reference_read_node_create(pm_parser_t *parser, const pm_token_t *name) {
+    assert(name->type == PM_TOKEN_NUMBERED_REFERENCE);
+    pm_numbered_reference_read_node_t *node = PM_NODE_ALLOC(parser, pm_numbered_reference_read_node_t);
+
+    *node = (pm_numbered_reference_read_node_t) {
+        {
+            .type = PM_NUMBERED_REFERENCE_READ_NODE,
+            .node_id = PM_NODE_IDENTIFY(parser),
+            .location = PM_LOCATION_TOKEN_VALUE(name),
+        },
+        .number = pm_numbered_reference_read_node_number(parser, name)
+    };
+
+    return node;
+}
+
+/**
+ * Allocate a new OptionalParameterNode node.
+ */
+static pm_optional_parameter_node_t *
+pm_optional_parameter_node_create(pm_parser_t *parser, const pm_token_t *name, const pm_token_t *operator, pm_node_t *value) {
+    pm_optional_parameter_node_t *node = PM_NODE_ALLOC(parser, pm_optional_parameter_node_t);
+
+    *node = (pm_optional_parameter_node_t) {
+        {
+            .type = PM_OPTIONAL_PARAMETER_NODE,
+            .node_id = PM_NODE_IDENTIFY(parser),
+            .location = {
+                .start = name->start,
+                .end = value->location.end
+            }
+        },
+        .name = pm_parser_constant_id_token(parser, name),
+        .name_loc = PM_LOCATION_TOKEN_VALUE(name),
+        .operator_loc = PM_LOCATION_TOKEN_VALUE(operator),
+        .value = value
+    };
+
+    return node;
+}
+
+/**
+ * Allocate and initialize a new OrNode node.
+ */
+static pm_or_node_t *
+pm_or_node_create(pm_parser_t *parser, pm_node_t *left, const pm_token_t *operator, pm_node_t *right) {
+    pm_assert_value_expression(parser, left);
+
+    pm_or_node_t *node = PM_NODE_ALLOC(parser, pm_or_node_t);
+
+    *node = (pm_or_node_t) {
+        {
+            .type = PM_OR_NODE,
+            .node_id = PM_NODE_IDENTIFY(parser),
+            .location = {
+                .start = left->location.start,
+                .end = right->location.end
+            }
+        },
+        .left = left,
+        .right = right,
+        .operator_loc = PM_LOCATION_TOKEN_VALUE(operator)
+    };
+
+    return node;
+}
+
+/**
+ * Allocate and initialize a new ParametersNode node.
+ */
+static pm_parameters_node_t *
+pm_parameters_node_create(pm_parser_t *parser) {
+    pm_parameters_node_t *node = PM_NODE_ALLOC(parser, pm_parameters_node_t);
+
+    *node = (pm_parameters_node_t) {
+        {
+            .type = PM_PARAMETERS_NODE,
+            .node_id = PM_NODE_IDENTIFY(parser),
+            .location = PM_LOCATION_TOKEN_VALUE(&parser->current)
+        },
+        .rest = NULL,
+        .keyword_rest = NULL,
+        .block = NULL,
+        .requireds = { 0 },
+        .optionals = { 0 },
+        .posts = { 0 },
+        .keywords = { 0 }
+    };
+
+    return node;
+}
+
+/**
+ * Set the location properly for the parameters node.
+ */
+static void
+pm_parameters_node_location_set(pm_parameters_node_t *params, pm_node_t *param) {
+    if (params->base.location.start == NULL) {
+        params->base.location.start = param->location.start;
+    } else {
+        params->base.location.start = params->base.location.start < param->location.start ? params->base.location.start : param->location.start;
+    }
+
+    if (params->base.location.end == NULL) {
+        params->base.location.end = param->location.end;
+    } else {
+        params->base.location.end = params->base.location.end > param->location.end ? params->base.location.end : param->location.end;
+    }
+}
+
+/**
+ * Append a required parameter to a ParametersNode node.
+ */
+static void
+pm_parameters_node_requireds_append(pm_parameters_node_t *params, pm_node_t *param) {
+    pm_parameters_node_location_set(params, param);
+    pm_node_list_append(&params->requireds, param);
+}
+
+/**
+ * Append an optional parameter to a ParametersNode node.
+ */
+static void
+pm_parameters_node_optionals_append(pm_parameters_node_t *params, pm_optional_parameter_node_t *param) {
+    pm_parameters_node_location_set(params, (pm_node_t *) param);
+    pm_node_list_append(&params->optionals, (pm_node_t *) param);
+}
+
+/**
+ * Append a post optional arguments parameter to a ParametersNode node.
+ */
+static void
+pm_parameters_node_posts_append(pm_parameters_node_t *params, pm_node_t *param) {
+    pm_parameters_node_location_set(params, param);
+    pm_node_list_append(&params->posts, param);
+}
+
+/**
+ * Set the rest parameter on a ParametersNode node.
+ */
+static void
+pm_parameters_node_rest_set(pm_parameters_node_t *params, pm_node_t *param) {
+    pm_parameters_node_location_set(params, param);
+    params->rest = param;
+}
+
+/**
+ * Append a keyword parameter to a ParametersNode node.
+ */
+static void
+pm_parameters_node_keywords_append(pm_parameters_node_t *params, pm_node_t *param) {
+    pm_parameters_node_location_set(params, param);
+    pm_node_list_append(&params->keywords, param);
+}
+
+/**
+ * Set the keyword rest parameter on a ParametersNode node.
+ */
+static void
+pm_parameters_node_keyword_rest_set(pm_parameters_node_t *params, pm_node_t *param) {
+    assert(params->keyword_rest == NULL);
+    pm_parameters_node_location_set(params, param);
+    params->keyword_rest = param;
+}
+
+/**
+ * Set the block parameter on a ParametersNode node.
+ */
+static void
+pm_parameters_node_block_set(pm_parameters_node_t *params, pm_block_parameter_node_t *param) {
+    assert(params->block == NULL);
+    pm_parameters_node_location_set(params, (pm_node_t *) param);
+    params->block = param;
+}
+
+/**
+ * Allocate a new ProgramNode node.
+ */
+static pm_program_node_t *
+pm_program_node_create(pm_parser_t *parser, pm_constant_id_list_t *locals, pm_statements_node_t *statements) {
+    pm_program_node_t *node = PM_NODE_ALLOC(parser, pm_program_node_t);
+
+    *node = (pm_program_node_t) {
+        {
+            .type = PM_PROGRAM_NODE,
+            .node_id = PM_NODE_IDENTIFY(parser),
+            .location = {
+                .start = statements == NULL ? parser->start : statements->base.location.start,
+                .end = statements == NULL ? parser->end : statements->base.location.end
+            }
+        },
+        .locals = *locals,
+        .statements = statements
+    };
+
+    return node;
+}
+
+/**
+ * Allocate and initialize new ParenthesesNode node.
+ */
+static pm_parentheses_node_t *
+pm_parentheses_node_create(pm_parser_t *parser, const pm_token_t *opening, pm_node_t *body, const pm_token_t *closing, pm_node_flags_t flags) {
+    pm_parentheses_node_t *node = PM_NODE_ALLOC(parser, pm_parentheses_node_t);
+
+    *node = (pm_parentheses_node_t) {
+        {
+            .type = PM_PARENTHESES_NODE,
+            .flags = flags,
+            .node_id = PM_NODE_IDENTIFY(parser),
+            .location = {
+                .start = opening->start,
+                .end = closing->end
+            }
+        },
+        .body = body,
+        .opening_loc = PM_LOCATION_TOKEN_VALUE(opening),
+        .closing_loc = PM_LOCATION_TOKEN_VALUE(closing)
+    };
+
+    return node;
+}
+
+/**
+ * Allocate and initialize a new PinnedExpressionNode node.
+ */
+static pm_pinned_expression_node_t *
+pm_pinned_expression_node_create(pm_parser_t *parser, pm_node_t *expression, const pm_token_t *operator, const pm_token_t *lparen, const pm_token_t *rparen) {
+    pm_pinned_expression_node_t *node = PM_NODE_ALLOC(parser, pm_pinned_expression_node_t);
+
+    *node = (pm_pinned_expression_node_t) {
+        {
+            .type = PM_PINNED_EXPRESSION_NODE,
+            .node_id = PM_NODE_IDENTIFY(parser),
+            .location = {
+                .start = operator->start,
+                .end = rparen->end
+            }
+        },
+        .expression = expression,
+        .operator_loc = PM_LOCATION_TOKEN_VALUE(operator),
+        .lparen_loc = PM_LOCATION_TOKEN_VALUE(lparen),
+        .rparen_loc = PM_LOCATION_TOKEN_VALUE(rparen)
+    };
+
+    return node;
+}
+
+/**
+ * Allocate and initialize a new PinnedVariableNode node.
+ */
+static pm_pinned_variable_node_t *
+pm_pinned_variable_node_create(pm_parser_t *parser, const pm_token_t *operator, pm_node_t *variable) {
+    pm_pinned_variable_node_t *node = PM_NODE_ALLOC(parser, pm_pinned_variable_node_t);
+
+    *node = (pm_pinned_variable_node_t) {
+        {
+            .type = PM_PINNED_VARIABLE_NODE,
+            .node_id = PM_NODE_IDENTIFY(parser),
+            .location = {
+                .start = operator->start,
+                .end = variable->location.end
+            }
+        },
+        .variable = variable,
+        .operator_loc = PM_LOCATION_TOKEN_VALUE(operator)
+    };
+
+    return node;
+}
+
+/**
+ * Allocate and initialize a new PostExecutionNode node.
+ */
+static pm_post_execution_node_t *
+pm_post_execution_node_create(pm_parser_t *parser, const pm_token_t *keyword, const pm_token_t *opening, pm_statements_node_t *statements, const pm_token_t *closing) {
+    pm_post_execution_node_t *node = PM_NODE_ALLOC(parser, pm_post_execution_node_t);
+
+    *node = (pm_post_execution_node_t) {
+        {
+            .type = PM_POST_EXECUTION_NODE,
+            .node_id = PM_NODE_IDENTIFY(parser),
+            .location = {
+                .start = keyword->start,
+                .end = closing->end
+            }
+        },
+        .statements = statements,
+        .keyword_loc = PM_LOCATION_TOKEN_VALUE(keyword),
+        .opening_loc = PM_LOCATION_TOKEN_VALUE(opening),
+        .closing_loc = PM_LOCATION_TOKEN_VALUE(closing)
+    };
+
+    return node;
+}
+
+/**
+ * Allocate and initialize a new PreExecutionNode node.
+ */
+static pm_pre_execution_node_t *
+pm_pre_execution_node_create(pm_parser_t *parser, const pm_token_t *keyword, const pm_token_t *opening, pm_statements_node_t *statements, const pm_token_t *closing) {
+    pm_pre_execution_node_t *node = PM_NODE_ALLOC(parser, pm_pre_execution_node_t);
+
+    *node = (pm_pre_execution_node_t) {
+        {
+            .type = PM_PRE_EXECUTION_NODE,
+            .node_id = PM_NODE_IDENTIFY(parser),
+            .location = {
+                .start = keyword->start,
+                .end = closing->end
+            }
+        },
+        .statements = statements,
+        .keyword_loc = PM_LOCATION_TOKEN_VALUE(keyword),
+        .opening_loc = PM_LOCATION_TOKEN_VALUE(opening),
+        .closing_loc = PM_LOCATION_TOKEN_VALUE(closing)
+    };
+
+    return node;
+}
+
+/**
+ * Allocate and initialize new RangeNode node.
+ */
+static pm_range_node_t *
+pm_range_node_create(pm_parser_t *parser, pm_node_t *left, const pm_token_t *operator, pm_node_t *right) {
+    pm_assert_value_expression(parser, left);
+    pm_assert_value_expression(parser, right);
+
+    pm_range_node_t *node = PM_NODE_ALLOC(parser, pm_range_node_t);
+    pm_node_flags_t flags = 0;
+
+    // Indicate that this node is an exclusive range if the operator is `...`.
+    if (operator->type == PM_TOKEN_DOT_DOT_DOT || operator->type == PM_TOKEN_UDOT_DOT_DOT) {
+        flags |= PM_RANGE_FLAGS_EXCLUDE_END;
+    }
+
+    // Indicate that this node is a static literal (i.e., can be compiled with
+    // a putobject in CRuby) if the left and right are implicit nil, explicit
+    // nil, or integers.
+    if (
+        (left == NULL || PM_NODE_TYPE_P(left, PM_NIL_NODE) || PM_NODE_TYPE_P(left, PM_INTEGER_NODE)) &&
+        (right == NULL || PM_NODE_TYPE_P(right, PM_NIL_NODE) || PM_NODE_TYPE_P(right, PM_INTEGER_NODE))
+    ) {
+        flags |= PM_NODE_FLAG_STATIC_LITERAL;
+    }
+
+    *node = (pm_range_node_t) {
+        {
+            .type = PM_RANGE_NODE,
+            .flags = flags,
+            .node_id = PM_NODE_IDENTIFY(parser),
+            .location = {
+                .start = (left == NULL ? operator->start : left->location.start),
+                .end = (right == NULL ? operator->end : right->location.end)
+            }
+        },
+        .left = left,
+        .right = right,
+        .operator_loc = PM_LOCATION_TOKEN_VALUE(operator)
+    };
+
+    return node;
+}
+
+/**
+ * Allocate and initialize a new RedoNode node.
+ */
+static pm_redo_node_t *
+pm_redo_node_create(pm_parser_t *parser, const pm_token_t *token) {
+    assert(token->type == PM_TOKEN_KEYWORD_REDO);
+    pm_redo_node_t *node = PM_NODE_ALLOC(parser, pm_redo_node_t);
+
+    *node = (pm_redo_node_t) {{
+        .type = PM_REDO_NODE,
+        .node_id = PM_NODE_IDENTIFY(parser),
+        .location = PM_LOCATION_TOKEN_VALUE(token)
+    }};
+
+    return node;
+}
+
+/**
+ * Allocate a new initialize a new RegularExpressionNode node with the given
+ * unescaped string.
+ */
+static pm_regular_expression_node_t *
+pm_regular_expression_node_create_unescaped(pm_parser_t *parser, const pm_token_t *opening, const pm_token_t *content, const pm_token_t *closing, const pm_string_t *unescaped) {
+    pm_regular_expression_node_t *node = PM_NODE_ALLOC(parser, pm_regular_expression_node_t);
+
+    *node = (pm_regular_expression_node_t) {
+        {
+            .type = PM_REGULAR_EXPRESSION_NODE,
+            .flags = pm_regular_expression_flags_create(parser, closing) | PM_NODE_FLAG_STATIC_LITERAL,
+            .node_id = PM_NODE_IDENTIFY(parser),
+            .location = {
+                .start = MIN(opening->start, closing->start),
+                .end = MAX(opening->end, closing->end)
+            }
+        },
+        .opening_loc = PM_LOCATION_TOKEN_VALUE(opening),
+        .content_loc = PM_LOCATION_TOKEN_VALUE(content),
+        .closing_loc = PM_LOCATION_TOKEN_VALUE(closing),
+        .unescaped = *unescaped
+    };
+
+    return node;
+}
+
+/**
+ * Allocate a new initialize a new RegularExpressionNode node.
+ */
+static inline pm_regular_expression_node_t *
+pm_regular_expression_node_create(pm_parser_t *parser, const pm_token_t *opening, const pm_token_t *content, const pm_token_t *closing) {
+    return pm_regular_expression_node_create_unescaped(parser, opening, content, closing, &PM_STRING_EMPTY);
+}
+
+/**
+ * Allocate a new RequiredParameterNode node.
+ */
+static pm_required_parameter_node_t *
+pm_required_parameter_node_create(pm_parser_t *parser, const pm_token_t *token) {
+    pm_required_parameter_node_t *node = PM_NODE_ALLOC(parser, pm_required_parameter_node_t);
+
+    *node = (pm_required_parameter_node_t) {
+        {
+            .type = PM_REQUIRED_PARAMETER_NODE,
+            .node_id = PM_NODE_IDENTIFY(parser),
+            .location = PM_LOCATION_TOKEN_VALUE(token)
+        },
+        .name = pm_parser_constant_id_token(parser, token)
+    };
+
+    return node;
+}
+
+/**
+ * Allocate a new RescueModifierNode node.
+ */
+static pm_rescue_modifier_node_t *
+pm_rescue_modifier_node_create(pm_parser_t *parser, pm_node_t *expression, const pm_token_t *keyword, pm_node_t *rescue_expression) {
+    pm_rescue_modifier_node_t *node = PM_NODE_ALLOC(parser, pm_rescue_modifier_node_t);
+
+    *node = (pm_rescue_modifier_node_t) {
+        {
+            .type = PM_RESCUE_MODIFIER_NODE,
+            .node_id = PM_NODE_IDENTIFY(parser),
+            .location = {
+                .start = expression->location.start,
+                .end = rescue_expression->location.end
+            }
+        },
+        .expression = expression,
+        .keyword_loc = PM_LOCATION_TOKEN_VALUE(keyword),
+        .rescue_expression = rescue_expression
+    };
+
+    return node;
+}
+
+/**
+ * Allocate and initialize a new RescueNode node.
+ */
+static pm_rescue_node_t *
+pm_rescue_node_create(pm_parser_t *parser, const pm_token_t *keyword) {
+    pm_rescue_node_t *node = PM_NODE_ALLOC(parser, pm_rescue_node_t);
+
+    *node = (pm_rescue_node_t) {
+        {
+            .type = PM_RESCUE_NODE,
+            .node_id = PM_NODE_IDENTIFY(parser),
+            .location = PM_LOCATION_TOKEN_VALUE(keyword)
+        },
+        .keyword_loc = PM_LOCATION_TOKEN_VALUE(keyword),
+        .operator_loc = PM_OPTIONAL_LOCATION_NOT_PROVIDED_VALUE,
+        .then_keyword_loc = PM_OPTIONAL_LOCATION_NOT_PROVIDED_VALUE,
+        .reference = NULL,
+        .statements = NULL,
+        .subsequent = NULL,
+        .exceptions = { 0 }
+    };
+
+    return node;
+}
+
+static inline void
+pm_rescue_node_operator_set(pm_rescue_node_t *node, const pm_token_t *operator) {
+    node->operator_loc = PM_OPTIONAL_LOCATION_TOKEN_VALUE(operator);
+}
+
+/**
+ * Set the reference of a rescue node, and update the location of the node.
+ */
+static void
+pm_rescue_node_reference_set(pm_rescue_node_t *node, pm_node_t *reference) {
+    node->reference = reference;
+    node->base.location.end = reference->location.end;
+}
+
+/**
+ * Set the statements of a rescue node, and update the location of the node.
+ */
+static void
+pm_rescue_node_statements_set(pm_rescue_node_t *node, pm_statements_node_t *statements) {
+    node->statements = statements;
+    if (pm_statements_node_body_length(statements) > 0) {
+        node->base.location.end = statements->base.location.end;
+    }
+}
+
+/**
+ * Set the subsequent of a rescue node, and update the location.
+ */
+static void
+pm_rescue_node_subsequent_set(pm_rescue_node_t *node, pm_rescue_node_t *subsequent) {
+    node->subsequent = subsequent;
+    node->base.location.end = subsequent->base.location.end;
+}
+
+/**
+ * Append an exception node to a rescue node, and update the location.
+ */
+static void
+pm_rescue_node_exceptions_append(pm_rescue_node_t *node, pm_node_t *exception) {
+    pm_node_list_append(&node->exceptions, exception);
+    node->base.location.end = exception->location.end;
+}
+
+/**
+ * Allocate a new RestParameterNode node.
+ */
+static pm_rest_parameter_node_t *
+pm_rest_parameter_node_create(pm_parser_t *parser, const pm_token_t *operator, const pm_token_t *name) {
+    pm_rest_parameter_node_t *node = PM_NODE_ALLOC(parser, pm_rest_parameter_node_t);
+
+    *node = (pm_rest_parameter_node_t) {
+        {
+            .type = PM_REST_PARAMETER_NODE,
+            .node_id = PM_NODE_IDENTIFY(parser),
+            .location = {
+                .start = operator->start,
+                .end = (name->type == PM_TOKEN_NOT_PROVIDED ? operator->end : name->end)
+            }
+        },
+        .name = pm_parser_optional_constant_id_token(parser, name),
+        .name_loc = PM_OPTIONAL_LOCATION_TOKEN_VALUE(name),
+        .operator_loc = PM_LOCATION_TOKEN_VALUE(operator)
+    };
+
+    return node;
+}
+
+/**
+ * Allocate and initialize a new RetryNode node.
+ */
+static pm_retry_node_t *
+pm_retry_node_create(pm_parser_t *parser, const pm_token_t *token) {
+    assert(token->type == PM_TOKEN_KEYWORD_RETRY);
+    pm_retry_node_t *node = PM_NODE_ALLOC(parser, pm_retry_node_t);
+
+    *node = (pm_retry_node_t) {{
+        .type = PM_RETRY_NODE,
+        .node_id = PM_NODE_IDENTIFY(parser),
+        .location = PM_LOCATION_TOKEN_VALUE(token)
+    }};
+
+    return node;
+}
+
+/**
+ * Allocate a new ReturnNode node.
+ */
+static pm_return_node_t *
+pm_return_node_create(pm_parser_t *parser, const pm_token_t *keyword, pm_arguments_node_t *arguments) {
+    pm_return_node_t *node = PM_NODE_ALLOC(parser, pm_return_node_t);
+
+    *node = (pm_return_node_t) {
+        {
+            .type = PM_RETURN_NODE,
+            .node_id = PM_NODE_IDENTIFY(parser),
+            .location = {
+                .start = keyword->start,
+                .end = (arguments == NULL ? keyword->end : arguments->base.location.end)
+            }
+        },
+        .keyword_loc = PM_LOCATION_TOKEN_VALUE(keyword),
+        .arguments = arguments
+    };
+
+    return node;
+}
+
+/**
+ * Allocate and initialize a new SelfNode node.
+ */
+static pm_self_node_t *
+pm_self_node_create(pm_parser_t *parser, const pm_token_t *token) {
+    assert(token->type == PM_TOKEN_KEYWORD_SELF);
+    pm_self_node_t *node = PM_NODE_ALLOC(parser, pm_self_node_t);
+
+    *node = (pm_self_node_t) {{
+        .type = PM_SELF_NODE,
+        .node_id = PM_NODE_IDENTIFY(parser),
+        .location = PM_LOCATION_TOKEN_VALUE(token)
+    }};
+
+    return node;
+}
+
+/**
+ * Allocate and initialize a new ShareableConstantNode node.
+ */
+static pm_shareable_constant_node_t *
+pm_shareable_constant_node_create(pm_parser_t *parser, pm_node_t *write, pm_shareable_constant_value_t value) {
+    pm_shareable_constant_node_t *node = PM_NODE_ALLOC(parser, pm_shareable_constant_node_t);
+
+    *node = (pm_shareable_constant_node_t) {
+        {
+            .type = PM_SHAREABLE_CONSTANT_NODE,
+            .flags = (pm_node_flags_t) value,
+            .node_id = PM_NODE_IDENTIFY(parser),
+            .location = PM_LOCATION_NODE_VALUE(write)
+        },
+        .write = write
+    };
+
+    return node;
+}
+
+/**
+ * Allocate a new SingletonClassNode node.
+ */
+static pm_singleton_class_node_t *
+pm_singleton_class_node_create(pm_parser_t *parser, pm_constant_id_list_t *locals, const pm_token_t *class_keyword, const pm_token_t *operator, pm_node_t *expression, pm_node_t *body, const pm_token_t *end_keyword) {
+    pm_singleton_class_node_t *node = PM_NODE_ALLOC(parser, pm_singleton_class_node_t);
+
+    *node = (pm_singleton_class_node_t) {
+        {
+            .type = PM_SINGLETON_CLASS_NODE,
+            .node_id = PM_NODE_IDENTIFY(parser),
+            .location = {
+                .start = class_keyword->start,
+                .end = end_keyword->end
+            }
+        },
+        .locals = *locals,
+        .class_keyword_loc = PM_LOCATION_TOKEN_VALUE(class_keyword),
+        .operator_loc = PM_LOCATION_TOKEN_VALUE(operator),
+        .expression = expression,
+        .body = body,
+        .end_keyword_loc = PM_LOCATION_TOKEN_VALUE(end_keyword)
+    };
+
+    return node;
+}
+
+/**
+ * Allocate and initialize a new SourceEncodingNode node.
+ */
+static pm_source_encoding_node_t *
+pm_source_encoding_node_create(pm_parser_t *parser, const pm_token_t *token) {
+    assert(token->type == PM_TOKEN_KEYWORD___ENCODING__);
+    pm_source_encoding_node_t *node = PM_NODE_ALLOC(parser, pm_source_encoding_node_t);
+
+    *node = (pm_source_encoding_node_t) {{
+        .type = PM_SOURCE_ENCODING_NODE,
+        .flags = PM_NODE_FLAG_STATIC_LITERAL,
+        .node_id = PM_NODE_IDENTIFY(parser),
+        .location = PM_LOCATION_TOKEN_VALUE(token)
+    }};
+
+    return node;
+}
+
+/**
+ * Allocate and initialize a new SourceFileNode node.
+ */
+static pm_source_file_node_t*
+pm_source_file_node_create(pm_parser_t *parser, const pm_token_t *file_keyword) {
+    pm_source_file_node_t *node = PM_NODE_ALLOC(parser, pm_source_file_node_t);
+    assert(file_keyword->type == PM_TOKEN_KEYWORD___FILE__);
+
+    pm_node_flags_t flags = 0;
+
+    switch (parser->frozen_string_literal) {
+        case PM_OPTIONS_FROZEN_STRING_LITERAL_DISABLED:
+            flags |= PM_STRING_FLAGS_MUTABLE;
+            break;
+        case PM_OPTIONS_FROZEN_STRING_LITERAL_ENABLED:
+            flags |= PM_NODE_FLAG_STATIC_LITERAL | PM_STRING_FLAGS_FROZEN;
+            break;
+    }
+
+    *node = (pm_source_file_node_t) {
+        {
+            .type = PM_SOURCE_FILE_NODE,
+            .flags = flags,
+            .node_id = PM_NODE_IDENTIFY(parser),
+            .location = PM_LOCATION_TOKEN_VALUE(file_keyword),
+        },
+        .filepath = parser->filepath
+    };
+
+    return node;
+}
+
+/**
+ * Allocate and initialize a new SourceLineNode node.
+ */
+static pm_source_line_node_t *
+pm_source_line_node_create(pm_parser_t *parser, const pm_token_t *token) {
+    assert(token->type == PM_TOKEN_KEYWORD___LINE__);
+    pm_source_line_node_t *node = PM_NODE_ALLOC(parser, pm_source_line_node_t);
+
+    *node = (pm_source_line_node_t) {{
+        .type = PM_SOURCE_LINE_NODE,
+        .flags = PM_NODE_FLAG_STATIC_LITERAL,
+        .node_id = PM_NODE_IDENTIFY(parser),
+        .location = PM_LOCATION_TOKEN_VALUE(token)
+    }};
+
+    return node;
+}
+
+/**
+ * Allocate a new SplatNode node.
+ */
+static pm_splat_node_t *
+pm_splat_node_create(pm_parser_t *parser, const pm_token_t *operator, pm_node_t *expression) {
+    pm_splat_node_t *node = PM_NODE_ALLOC(parser, pm_splat_node_t);
+
+    *node = (pm_splat_node_t) {
+        {
+            .type = PM_SPLAT_NODE,
+            .node_id = PM_NODE_IDENTIFY(parser),
+            .location = {
+                .start = operator->start,
+                .end = (expression == NULL ? operator->end : expression->location.end)
+            }
+        },
+        .operator_loc = PM_LOCATION_TOKEN_VALUE(operator),
+        .expression = expression
+    };
+
+    return node;
+}
+
+/**
+ * Allocate and initialize a new StatementsNode node.
+ */
+static pm_statements_node_t *
+pm_statements_node_create(pm_parser_t *parser) {
+    pm_statements_node_t *node = PM_NODE_ALLOC(parser, pm_statements_node_t);
+
+    *node = (pm_statements_node_t) {
+        {
+            .type = PM_STATEMENTS_NODE,
+            .node_id = PM_NODE_IDENTIFY(parser),
+            .location = PM_LOCATION_NULL_VALUE(parser)
+        },
+        .body = { 0 }
+    };
+
+    return node;
+}
+
+/**
+ * Get the length of the given StatementsNode node's body.
+ */
+static size_t
+pm_statements_node_body_length(pm_statements_node_t *node) {
+    return node && node->body.size;
+}
+
+/**
+ * Set the location of the given StatementsNode.
+ */
+static void
+pm_statements_node_location_set(pm_statements_node_t *node, const uint8_t *start, const uint8_t *end) {
+    node->base.location = (pm_location_t) { .start = start, .end = end };
+}
+
+/**
+ * Update the location of the statements node based on the statement that is
+ * being added to the list.
+ */
+static inline void
+pm_statements_node_body_update(pm_statements_node_t *node, pm_node_t *statement) {
+    if (pm_statements_node_body_length(node) == 0 || statement->location.start < node->base.location.start) {
+        node->base.location.start = statement->location.start;
+    }
+
+    if (statement->location.end > node->base.location.end) {
+        node->base.location.end = statement->location.end;
+    }
+}
+
+/**
+ * Append a new node to the given StatementsNode node's body.
+ */
+static void
+pm_statements_node_body_append(pm_parser_t *parser, pm_statements_node_t *node, pm_node_t *statement, bool newline) {
+    pm_statements_node_body_update(node, statement);
+
+    if (node->body.size > 0) {
+        const pm_node_t *previous = node->body.nodes[node->body.size - 1];
+
+        switch (PM_NODE_TYPE(previous)) {
+            case PM_BREAK_NODE:
+            case PM_NEXT_NODE:
+            case PM_REDO_NODE:
+            case PM_RETRY_NODE:
+            case PM_RETURN_NODE:
+                pm_parser_warn_node(parser, statement, PM_WARN_UNREACHABLE_STATEMENT);
+                break;
+            default:
+                break;
+        }
+    }
+
+    pm_node_list_append(&node->body, statement);
+    if (newline) pm_node_flag_set(statement, PM_NODE_FLAG_NEWLINE);
+}
+
+/**
+ * Prepend a new node to the given StatementsNode node's body.
+ */
+static void
+pm_statements_node_body_prepend(pm_statements_node_t *node, pm_node_t *statement) {
+    pm_statements_node_body_update(node, statement);
+    pm_node_list_prepend(&node->body, statement);
+    pm_node_flag_set(statement, PM_NODE_FLAG_NEWLINE);
+}
+
+/**
+ * Allocate a new StringNode node with the current string on the parser.
+ */
+static inline pm_string_node_t *
+pm_string_node_create_unescaped(pm_parser_t *parser, const pm_token_t *opening, const pm_token_t *content, const pm_token_t *closing, const pm_string_t *string) {
+    pm_string_node_t *node = PM_NODE_ALLOC(parser, pm_string_node_t);
+    pm_node_flags_t flags = 0;
+
+    switch (parser->frozen_string_literal) {
+        case PM_OPTIONS_FROZEN_STRING_LITERAL_DISABLED:
+            flags = PM_STRING_FLAGS_MUTABLE;
+            break;
+        case PM_OPTIONS_FROZEN_STRING_LITERAL_ENABLED:
+            flags = PM_NODE_FLAG_STATIC_LITERAL | PM_STRING_FLAGS_FROZEN;
+            break;
+    }
+
+    *node = (pm_string_node_t) {
+        {
+            .type = PM_STRING_NODE,
+            .flags = flags,
+            .node_id = PM_NODE_IDENTIFY(parser),
+            .location = {
+                .start = (opening->type == PM_TOKEN_NOT_PROVIDED ? content->start : opening->start),
+                .end = (closing->type == PM_TOKEN_NOT_PROVIDED ? content->end : closing->end)
+            }
+        },
+        .opening_loc = PM_OPTIONAL_LOCATION_TOKEN_VALUE(opening),
+        .content_loc = PM_LOCATION_TOKEN_VALUE(content),
+        .closing_loc = PM_OPTIONAL_LOCATION_TOKEN_VALUE(closing),
+        .unescaped = *string
+    };
+
+    return node;
+}
+
+/**
+ * Allocate a new StringNode node.
+ */
+static pm_string_node_t *
+pm_string_node_create(pm_parser_t *parser, const pm_token_t *opening, const pm_token_t *content, const pm_token_t *closing) {
+    return pm_string_node_create_unescaped(parser, opening, content, closing, &PM_STRING_EMPTY);
+}
+
+/**
+ * Allocate a new StringNode node and create it using the current string on the
+ * parser.
+ */
+static pm_string_node_t *
+pm_string_node_create_current_string(pm_parser_t *parser, const pm_token_t *opening, const pm_token_t *content, const pm_token_t *closing) {
+    pm_string_node_t *node = pm_string_node_create_unescaped(parser, opening, content, closing, &parser->current_string);
+    parser->current_string = PM_STRING_EMPTY;
+    return node;
+}
+
+/**
+ * Allocate and initialize a new SuperNode node.
+ */
+static pm_super_node_t *
+pm_super_node_create(pm_parser_t *parser, const pm_token_t *keyword, pm_arguments_t *arguments) {
+    assert(keyword->type == PM_TOKEN_KEYWORD_SUPER);
+    pm_super_node_t *node = PM_NODE_ALLOC(parser, pm_super_node_t);
+
+    const uint8_t *end = pm_arguments_end(arguments);
+    if (end == NULL) {
+        assert(false && "unreachable");
+    }
+
+    *node = (pm_super_node_t) {
+        {
+            .type = PM_SUPER_NODE,
+            .node_id = PM_NODE_IDENTIFY(parser),
+            .location = {
+                .start = keyword->start,
+                .end = end,
+            }
+        },
+        .keyword_loc = PM_LOCATION_TOKEN_VALUE(keyword),
+        .lparen_loc = arguments->opening_loc,
+        .arguments = arguments->arguments,
+        .rparen_loc = arguments->closing_loc,
+        .block = arguments->block
+    };
+
+    return node;
+}
+
+/**
+ * Read through the contents of a string and check if it consists solely of
+ * US-ASCII code points.
+ */
+static bool
+pm_ascii_only_p(const pm_string_t *contents) {
+    const size_t length = pm_string_length(contents);
+    const uint8_t *source = pm_string_source(contents);
+
+    for (size_t index = 0; index < length; index++) {
+        if (source[index] & 0x80) return false;
+    }
+
+    return true;
+}
+
+/**
+ * Validate that the contents of the given symbol are all valid UTF-8.
+ */
+static void
+parse_symbol_encoding_validate_utf8(pm_parser_t *parser, const pm_token_t *location, const pm_string_t *contents) {
+    for (const uint8_t *cursor = pm_string_source(contents), *end = cursor + pm_string_length(contents); cursor < end;) {
+        size_t width = pm_encoding_utf_8_char_width(cursor, end - cursor);
+
+        if (width == 0) {
+            pm_parser_err(parser, location->start, location->end, PM_ERR_INVALID_SYMBOL);
+            break;
+        }
+
+        cursor += width;
+    }
+}
+
+/**
+ * Validate that the contents of the given symbol are all valid in the encoding
+ * of the parser.
+ */
+static void
+parse_symbol_encoding_validate_other(pm_parser_t *parser, const pm_token_t *location, const pm_string_t *contents) {
+    const pm_encoding_t *encoding = parser->encoding;
+
+    for (const uint8_t *cursor = pm_string_source(contents), *end = cursor + pm_string_length(contents); cursor < end;) {
+        size_t width = encoding->char_width(cursor, end - cursor);
+
+        if (width == 0) {
+            pm_parser_err(parser, location->start, location->end, PM_ERR_INVALID_SYMBOL);
+            break;
+        }
+
+        cursor += width;
+    }
+}
+
+/**
+ * Ruby "downgrades" the encoding of Symbols to US-ASCII if the associated
+ * encoding is ASCII-compatible and the Symbol consists only of US-ASCII code
+ * points. Otherwise, the encoding may be explicitly set with an escape
+ * sequence.
+ *
+ * If the validate flag is set, then it will check the contents of the symbol
+ * to ensure that all characters are valid in the encoding.
+ */
+static inline pm_node_flags_t
+parse_symbol_encoding(pm_parser_t *parser, const pm_token_t *location, const pm_string_t *contents, bool validate) {
+    if (parser->explicit_encoding != NULL) {
+        // A Symbol may optionally have its encoding explicitly set. This will
+        // happen if an escape sequence results in a non-ASCII code point.
+        if (parser->explicit_encoding == PM_ENCODING_UTF_8_ENTRY) {
+            if (validate) parse_symbol_encoding_validate_utf8(parser, location, contents);
+            return PM_SYMBOL_FLAGS_FORCED_UTF8_ENCODING;
+        } else if (parser->encoding == PM_ENCODING_US_ASCII_ENTRY) {
+            return PM_SYMBOL_FLAGS_FORCED_BINARY_ENCODING;
+        } else if (validate) {
+            parse_symbol_encoding_validate_other(parser, location, contents);
+        }
+    } else if (pm_ascii_only_p(contents)) {
+        // Ruby stipulates that all source files must use an ASCII-compatible
+        // encoding. Thus, all symbols appearing in source are eligible for
+        // "downgrading" to US-ASCII.
+        return PM_SYMBOL_FLAGS_FORCED_US_ASCII_ENCODING;
+    } else if (validate) {
+        parse_symbol_encoding_validate_other(parser, location, contents);
+    }
+
+    return 0;
+}
+
+static pm_node_flags_t
+parse_and_validate_regular_expression_encoding_modifier(pm_parser_t *parser, const pm_string_t *source, bool ascii_only, pm_node_flags_t flags, char modifier, const pm_encoding_t *modifier_encoding) {
+    assert ((modifier == 'n' && modifier_encoding == PM_ENCODING_ASCII_8BIT_ENTRY) ||
+            (modifier == 'u' && modifier_encoding == PM_ENCODING_UTF_8_ENTRY) ||
+            (modifier == 'e' && modifier_encoding == PM_ENCODING_EUC_JP_ENTRY) ||
+            (modifier == 's' && modifier_encoding == PM_ENCODING_WINDOWS_31J_ENTRY));
+
+    // There's special validation logic used if a string does not contain any character escape sequences.
+    if (parser->explicit_encoding == NULL) {
+        // If an ASCII-only string without character escapes is used with an encoding modifier, then resulting Regexp
+        // has the modifier encoding, unless the ASCII-8BIT modifier is used, in which case the Regexp "downgrades" to
+        // the US-ASCII encoding.
+        if (ascii_only) {
+            return modifier == 'n' ? PM_REGULAR_EXPRESSION_FLAGS_FORCED_US_ASCII_ENCODING : flags;
+        }
+
+        if (parser->encoding == PM_ENCODING_US_ASCII_ENTRY) {
+            if (!ascii_only) {
+                PM_PARSER_ERR_TOKEN_FORMAT(parser, parser->current, PM_ERR_INVALID_MULTIBYTE_CHAR, parser->encoding->name);
+            }
+        } else if (parser->encoding != modifier_encoding) {
+            PM_PARSER_ERR_TOKEN_FORMAT(parser, parser->current, PM_ERR_REGEXP_ENCODING_OPTION_MISMATCH, modifier, parser->encoding->name);
+
+            if (modifier == 'n' && !ascii_only) {
+                PM_PARSER_ERR_TOKEN_FORMAT(parser, parser->current, PM_ERR_REGEXP_NON_ESCAPED_MBC, (int) pm_string_length(source), (const char *) pm_string_source(source));
+            }
+        }
+
+        return flags;
+    }
+
+    // TODO (nirvdrum 21-Feb-2024): To validate regexp sources with character escape sequences we need to know whether hex or Unicode escape sequences were used and Prism doesn't currently provide that data. We handle a subset of unambiguous cases in the meanwhile.
+    bool mixed_encoding = false;
+
+    if (mixed_encoding) {
+        PM_PARSER_ERR_TOKEN_FORMAT(parser, parser->current, PM_ERR_INVALID_MULTIBYTE_ESCAPE, (int) pm_string_length(source), (const char *) pm_string_source(source));
+    } else if (modifier != 'n' && parser->explicit_encoding == PM_ENCODING_ASCII_8BIT_ENTRY) {
+        // TODO (nirvdrum 21-Feb-2024): Validate the content is valid in the modifier encoding. Do this on-demand so we don't pay the cost of computation unnecessarily.
+        bool valid_string_in_modifier_encoding = true;
+
+        if (!valid_string_in_modifier_encoding) {
+            PM_PARSER_ERR_TOKEN_FORMAT(parser, parser->current, PM_ERR_INVALID_MULTIBYTE_ESCAPE, (int) pm_string_length(source), (const char *) pm_string_source(source));
+        }
+    } else if (modifier != 'u' && parser->explicit_encoding == PM_ENCODING_UTF_8_ENTRY) {
+        // TODO (nirvdrum 21-Feb-2024): There's currently no way to tell if the source used hex or Unicode character escapes from `explicit_encoding` alone. If the source encoding was already UTF-8, both character escape types would set `explicit_encoding` to UTF-8, but need to be processed differently. Skip for now.
+        if (parser->encoding != PM_ENCODING_UTF_8_ENTRY) {
+            PM_PARSER_ERR_TOKEN_FORMAT(parser, parser->current, PM_ERR_REGEXP_INCOMPAT_CHAR_ENCODING, (int) pm_string_length(source), (const char *) pm_string_source(source));
+        }
+    }
+
+    // We've determined the encoding would naturally be EUC-JP and there is no need to force the encoding to anything else.
+    return flags;
+}
+
+/**
+ * Ruby "downgrades" the encoding of Regexps to US-ASCII if the associated encoding is ASCII-compatible and
+ * the unescaped representation of a Regexp source consists only of US-ASCII code points. This is true even
+ * when the Regexp is explicitly given an ASCII-8BIT encoding via the (/n) modifier. Otherwise, the encoding
+ * may be explicitly set with an escape sequence.
+ */
+static pm_node_flags_t
+parse_and_validate_regular_expression_encoding(pm_parser_t *parser, const pm_string_t *source, bool ascii_only, pm_node_flags_t flags) {
+    // TODO (nirvdrum 22-Feb-2024): CRuby reports a special Regexp-specific error for invalid Unicode ranges. We either need to scan again or modify the "invalid Unicode escape sequence" message we already report.
+    bool valid_unicode_range = true;
+    if (parser->explicit_encoding == PM_ENCODING_UTF_8_ENTRY && !valid_unicode_range) {
+        PM_PARSER_ERR_TOKEN_FORMAT(parser, parser->current, PM_ERR_REGEXP_INVALID_UNICODE_RANGE, (int) pm_string_length(source), (const char *) pm_string_source(source));
+        return flags;
+    }
+
+    // US-ASCII strings do not admit multi-byte character literals. However, character escape sequences corresponding
+    // to multi-byte characters are allowed.
+    if (parser->encoding == PM_ENCODING_US_ASCII_ENTRY && parser->explicit_encoding == NULL && !ascii_only) {
+        // CRuby will continue processing even though a SyntaxError has already been detected. It may result in the
+        // following error message appearing twice. We do the same for compatibility.
+        PM_PARSER_ERR_TOKEN_FORMAT(parser, parser->current, PM_ERR_INVALID_MULTIBYTE_CHAR, parser->encoding->name);
+    }
+
+    /**
+     * Start checking modifier flags. We need to process these before considering any explicit encodings that may have
+     * been set by character literals. The order in which the encoding modifiers is checked does not matter. In the
+     * event that both an encoding modifier and an explicit encoding would result in the same encoding we do not set
+     * the corresponding "forced_<encoding>" flag. Instead, the caller should check the encoding modifier flag and
+     * determine the encoding that way.
+     */
+
+    if (flags & PM_REGULAR_EXPRESSION_FLAGS_ASCII_8BIT) {
+        return parse_and_validate_regular_expression_encoding_modifier(parser, source, ascii_only, flags, 'n', PM_ENCODING_ASCII_8BIT_ENTRY);
+    }
+
+    if (flags & PM_REGULAR_EXPRESSION_FLAGS_UTF_8) {
+        return parse_and_validate_regular_expression_encoding_modifier(parser, source, ascii_only, flags, 'u', PM_ENCODING_UTF_8_ENTRY);
+    }
+
+    if (flags & PM_REGULAR_EXPRESSION_FLAGS_EUC_JP) {
+        return parse_and_validate_regular_expression_encoding_modifier(parser, source, ascii_only, flags, 'e', PM_ENCODING_EUC_JP_ENTRY);
+    }
+
+    if (flags & PM_REGULAR_EXPRESSION_FLAGS_WINDOWS_31J) {
+        return parse_and_validate_regular_expression_encoding_modifier(parser, source, ascii_only, flags, 's', PM_ENCODING_WINDOWS_31J_ENTRY);
+    }
+
+    // At this point no encoding modifiers will be present on the regular expression as they would have already
+    // been processed. Ruby stipulates that all source files must use an ASCII-compatible encoding. Thus, all
+    // regular expressions without an encoding modifier appearing in source are eligible for "downgrading" to US-ASCII.
+    if (ascii_only) {
+        return PM_REGULAR_EXPRESSION_FLAGS_FORCED_US_ASCII_ENCODING;
+    }
+
+    // A Regexp may optionally have its encoding explicitly set via a character escape sequence in the source string
+    // or by specifying a modifier.
+    //
+    // NB: an explicitly set encoding is ignored by Ruby if the Regexp consists of only US ASCII code points.
+    if (parser->explicit_encoding != NULL) {
+        if (parser->explicit_encoding == PM_ENCODING_UTF_8_ENTRY) {
+            return PM_REGULAR_EXPRESSION_FLAGS_FORCED_UTF8_ENCODING;
+        } else if (parser->encoding == PM_ENCODING_US_ASCII_ENTRY) {
+            return PM_REGULAR_EXPRESSION_FLAGS_FORCED_BINARY_ENCODING;
+        }
+    }
+
+    return 0;
+}
+
+/**
+ * Allocate and initialize a new SymbolNode node with the given unescaped
+ * string.
+ */
+static pm_symbol_node_t *
+pm_symbol_node_create_unescaped(pm_parser_t *parser, const pm_token_t *opening, const pm_token_t *value, const pm_token_t *closing, const pm_string_t *unescaped, pm_node_flags_t flags) {
+    pm_symbol_node_t *node = PM_NODE_ALLOC(parser, pm_symbol_node_t);
+
+    *node = (pm_symbol_node_t) {
+        {
+            .type = PM_SYMBOL_NODE,
+            .flags = PM_NODE_FLAG_STATIC_LITERAL | flags,
+            .node_id = PM_NODE_IDENTIFY(parser),
+            .location = {
+                .start = (opening->type == PM_TOKEN_NOT_PROVIDED ? value->start : opening->start),
+                .end = (closing->type == PM_TOKEN_NOT_PROVIDED ? value->end : closing->end)
+            }
+        },
+        .opening_loc = PM_OPTIONAL_LOCATION_TOKEN_VALUE(opening),
+        .value_loc = PM_LOCATION_TOKEN_VALUE(value),
+        .closing_loc = PM_OPTIONAL_LOCATION_TOKEN_VALUE(closing),
+        .unescaped = *unescaped
+    };
+
+    return node;
+}
+
+/**
+ * Allocate and initialize a new SymbolNode node.
+ */
+static inline pm_symbol_node_t *
+pm_symbol_node_create(pm_parser_t *parser, const pm_token_t *opening, const pm_token_t *value, const pm_token_t *closing) {
+    return pm_symbol_node_create_unescaped(parser, opening, value, closing, &PM_STRING_EMPTY, 0);
+}
+
+/**
+ * Allocate and initialize a new SymbolNode node with the current string.
+ */
+static pm_symbol_node_t *
+pm_symbol_node_create_current_string(pm_parser_t *parser, const pm_token_t *opening, const pm_token_t *value, const pm_token_t *closing) {
+    pm_symbol_node_t *node = pm_symbol_node_create_unescaped(parser, opening, value, closing, &parser->current_string, parse_symbol_encoding(parser, value, &parser->current_string, false));
+    parser->current_string = PM_STRING_EMPTY;
+    return node;
+}
+
+/**
+ * Allocate and initialize a new SymbolNode node from a label.
+ */
+static pm_symbol_node_t *
+pm_symbol_node_label_create(pm_parser_t *parser, const pm_token_t *token) {
+    pm_symbol_node_t *node;
+
+    switch (token->type) {
+        case PM_TOKEN_LABEL: {
+            pm_token_t opening = not_provided(parser);
+            pm_token_t closing = { .type = PM_TOKEN_LABEL_END, .start = token->end - 1, .end = token->end };
+
+            pm_token_t label = { .type = PM_TOKEN_LABEL, .start = token->start, .end = token->end - 1 };
+            node = pm_symbol_node_create(parser, &opening, &label, &closing);
+
+            assert((label.end - label.start) >= 0);
+            pm_string_shared_init(&node->unescaped, label.start, label.end);
+            pm_node_flag_set((pm_node_t *) node, parse_symbol_encoding(parser, &label, &node->unescaped, false));
+
+            break;
+        }
+        case PM_TOKEN_MISSING: {
+            pm_token_t opening = not_provided(parser);
+            pm_token_t closing = not_provided(parser);
+
+            pm_token_t label = { .type = PM_TOKEN_LABEL, .start = token->start, .end = token->end };
+            node = pm_symbol_node_create(parser, &opening, &label, &closing);
+            break;
+        }
+        default:
+            assert(false && "unreachable");
+            node = NULL;
+            break;
+    }
+
+    return node;
+}
+
+/**
+ * Allocate and initialize a new synthesized SymbolNode node.
+ */
+static pm_symbol_node_t *
+pm_symbol_node_synthesized_create(pm_parser_t *parser, const char *content) {
+    pm_symbol_node_t *node = PM_NODE_ALLOC(parser, pm_symbol_node_t);
+
+    *node = (pm_symbol_node_t) {
+        {
+            .type = PM_SYMBOL_NODE,
+            .flags = PM_NODE_FLAG_STATIC_LITERAL | PM_SYMBOL_FLAGS_FORCED_US_ASCII_ENCODING,
+            .node_id = PM_NODE_IDENTIFY(parser),
+            .location = PM_LOCATION_NULL_VALUE(parser)
+        },
+        .value_loc = PM_LOCATION_NULL_VALUE(parser),
+        .unescaped = { 0 }
+    };
+
+    pm_string_constant_init(&node->unescaped, content, strlen(content));
+    return node;
+}
+
+/**
+ * Check if the given node is a label in a hash.
+ */
+static bool
+pm_symbol_node_label_p(pm_node_t *node) {
+    const uint8_t *end = NULL;
+
+    switch (PM_NODE_TYPE(node)) {
+        case PM_SYMBOL_NODE:
+            end = ((pm_symbol_node_t *) node)->closing_loc.end;
+            break;
+        case PM_INTERPOLATED_SYMBOL_NODE:
+            end = ((pm_interpolated_symbol_node_t *) node)->closing_loc.end;
+            break;
+        default:
+            return false;
+    }
+
+    return (end != NULL) && (end[-1] == ':');
+}
+
+/**
+ * Convert the given StringNode node to a SymbolNode node.
+ */
+static pm_symbol_node_t *
+pm_string_node_to_symbol_node(pm_parser_t *parser, pm_string_node_t *node, const pm_token_t *opening, const pm_token_t *closing) {
+    pm_symbol_node_t *new_node = PM_NODE_ALLOC(parser, pm_symbol_node_t);
+
+    *new_node = (pm_symbol_node_t) {
+        {
+            .type = PM_SYMBOL_NODE,
+            .flags = PM_NODE_FLAG_STATIC_LITERAL,
+            .node_id = PM_NODE_IDENTIFY(parser),
+            .location = {
+                .start = opening->start,
+                .end = closing->end
+            }
+        },
+        .opening_loc = PM_OPTIONAL_LOCATION_TOKEN_VALUE(opening),
+        .value_loc = node->content_loc,
+        .closing_loc = PM_OPTIONAL_LOCATION_TOKEN_VALUE(closing),
+        .unescaped = node->unescaped
+    };
+
+    pm_token_t content = { .type = PM_TOKEN_IDENTIFIER, .start = node->content_loc.start, .end = node->content_loc.end };
+    pm_node_flag_set((pm_node_t *) new_node, parse_symbol_encoding(parser, &content, &node->unescaped, true));
+
+    // We are explicitly _not_ using pm_node_destroy here because we don't want
+    // to trash the unescaped string. We could instead copy the string if we
+    // know that it is owned, but we're taking the fast path for now.
+    xfree(node);
+
+    return new_node;
+}
+
+/**
+ * Convert the given SymbolNode node to a StringNode node.
+ */
+static pm_string_node_t *
+pm_symbol_node_to_string_node(pm_parser_t *parser, pm_symbol_node_t *node) {
+    pm_string_node_t *new_node = PM_NODE_ALLOC(parser, pm_string_node_t);
+    pm_node_flags_t flags = 0;
+
+    switch (parser->frozen_string_literal) {
+        case PM_OPTIONS_FROZEN_STRING_LITERAL_DISABLED:
+            flags = PM_STRING_FLAGS_MUTABLE;
+            break;
+        case PM_OPTIONS_FROZEN_STRING_LITERAL_ENABLED:
+            flags = PM_NODE_FLAG_STATIC_LITERAL | PM_STRING_FLAGS_FROZEN;
+            break;
+    }
+
+    *new_node = (pm_string_node_t) {
+        {
+            .type = PM_STRING_NODE,
+            .flags = flags,
+            .node_id = PM_NODE_IDENTIFY(parser),
+            .location = node->base.location
+        },
+        .opening_loc = node->opening_loc,
+        .content_loc = node->value_loc,
+        .closing_loc = node->closing_loc,
+        .unescaped = node->unescaped
+    };
+
+    // We are explicitly _not_ using pm_node_destroy here because we don't want
+    // to trash the unescaped string. We could instead copy the string if we
+    // know that it is owned, but we're taking the fast path for now.
+    xfree(node);
+
+    return new_node;
+}
+
+/**
+ * Allocate and initialize a new TrueNode node.
+ */
+static pm_true_node_t *
+pm_true_node_create(pm_parser_t *parser, const pm_token_t *token) {
+    assert(token->type == PM_TOKEN_KEYWORD_TRUE);
+    pm_true_node_t *node = PM_NODE_ALLOC(parser, pm_true_node_t);
+
+    *node = (pm_true_node_t) {{
+        .type = PM_TRUE_NODE,
+        .flags = PM_NODE_FLAG_STATIC_LITERAL,
+        .node_id = PM_NODE_IDENTIFY(parser),
+        .location = PM_LOCATION_TOKEN_VALUE(token)
+    }};
+
+    return node;
+}
+
+/**
+ * Allocate and initialize a new synthesized TrueNode node.
+ */
+static pm_true_node_t *
+pm_true_node_synthesized_create(pm_parser_t *parser) {
+    pm_true_node_t *node = PM_NODE_ALLOC(parser, pm_true_node_t);
+
+    *node = (pm_true_node_t) {{
+        .type = PM_TRUE_NODE,
+        .flags = PM_NODE_FLAG_STATIC_LITERAL,
+        .node_id = PM_NODE_IDENTIFY(parser),
+        .location = { .start = parser->start, .end = parser->end }
+    }};
+
+    return node;
+}
+
+/**
+ * Allocate and initialize a new UndefNode node.
+ */
+static pm_undef_node_t *
+pm_undef_node_create(pm_parser_t *parser, const pm_token_t *token) {
+    assert(token->type == PM_TOKEN_KEYWORD_UNDEF);
+    pm_undef_node_t *node = PM_NODE_ALLOC(parser, pm_undef_node_t);
+
+    *node = (pm_undef_node_t) {
+        {
+            .type = PM_UNDEF_NODE,
+            .node_id = PM_NODE_IDENTIFY(parser),
+            .location = PM_LOCATION_TOKEN_VALUE(token),
+        },
+        .keyword_loc = PM_LOCATION_TOKEN_VALUE(token),
+        .names = { 0 }
+    };
+
+    return node;
+}
+
+/**
+ * Append a name to an undef node.
+ */
+static void
+pm_undef_node_append(pm_undef_node_t *node, pm_node_t *name) {
+    node->base.location.end = name->location.end;
+    pm_node_list_append(&node->names, name);
+}
+
+/**
+ * Allocate a new UnlessNode node.
+ */
+static pm_unless_node_t *
+pm_unless_node_create(pm_parser_t *parser, const pm_token_t *keyword, pm_node_t *predicate, const pm_token_t *then_keyword, pm_statements_node_t *statements) {
+    pm_conditional_predicate(parser, predicate, PM_CONDITIONAL_PREDICATE_TYPE_CONDITIONAL);
+    pm_unless_node_t *node = PM_NODE_ALLOC(parser, pm_unless_node_t);
+
+    const uint8_t *end;
+    if (statements != NULL) {
+        end = statements->base.location.end;
+    } else {
+        end = predicate->location.end;
+    }
+
+    *node = (pm_unless_node_t) {
+        {
+            .type = PM_UNLESS_NODE,
+            .flags = PM_NODE_FLAG_NEWLINE,
+            .node_id = PM_NODE_IDENTIFY(parser),
+            .location = {
+                .start = keyword->start,
+                .end = end
+            },
+        },
+        .keyword_loc = PM_LOCATION_TOKEN_VALUE(keyword),
+        .predicate = predicate,
+        .then_keyword_loc = PM_OPTIONAL_LOCATION_TOKEN_VALUE(then_keyword),
+        .statements = statements,
+        .else_clause = NULL,
+        .end_keyword_loc = PM_OPTIONAL_LOCATION_NOT_PROVIDED_VALUE
+    };
+
+    return node;
+}
+
+/**
+ * Allocate and initialize new UnlessNode node in the modifier form.
+ */
+static pm_unless_node_t *
+pm_unless_node_modifier_create(pm_parser_t *parser, pm_node_t *statement, const pm_token_t *unless_keyword, pm_node_t *predicate) {
+    pm_conditional_predicate(parser, predicate, PM_CONDITIONAL_PREDICATE_TYPE_CONDITIONAL);
+    pm_unless_node_t *node = PM_NODE_ALLOC(parser, pm_unless_node_t);
+
+    pm_statements_node_t *statements = pm_statements_node_create(parser);
+    pm_statements_node_body_append(parser, statements, statement, true);
+
+    *node = (pm_unless_node_t) {
+        {
+            .type = PM_UNLESS_NODE,
+            .flags = PM_NODE_FLAG_NEWLINE,
+            .node_id = PM_NODE_IDENTIFY(parser),
+            .location = {
+                .start = statement->location.start,
+                .end = predicate->location.end
+            },
+        },
+        .keyword_loc = PM_LOCATION_TOKEN_VALUE(unless_keyword),
+        .predicate = predicate,
+        .then_keyword_loc = PM_OPTIONAL_LOCATION_NOT_PROVIDED_VALUE,
+        .statements = statements,
+        .else_clause = NULL,
+        .end_keyword_loc = PM_OPTIONAL_LOCATION_NOT_PROVIDED_VALUE
+    };
+
+    return node;
+}
+
+static inline void
+pm_unless_node_end_keyword_loc_set(pm_unless_node_t *node, const pm_token_t *end_keyword) {
+    node->end_keyword_loc = PM_LOCATION_TOKEN_VALUE(end_keyword);
+    node->base.location.end = end_keyword->end;
+}
+
+/**
+ * Loop modifiers could potentially modify an expression that contains block
+ * exits. In this case we need to loop through them and remove them from the
+ * list of block exits so that they do not later get marked as invalid.
+ */
+static void
+pm_loop_modifier_block_exits(pm_parser_t *parser, pm_statements_node_t *statements) {
+    assert(parser->current_block_exits != NULL);
+
+    // All of the block exits that we want to remove should be within the
+    // statements, and since we are modifying the statements, we shouldn't have
+    // to check the end location.
+    const uint8_t *start = statements->base.location.start;
+
+    for (size_t index = parser->current_block_exits->size; index > 0; index--) {
+        pm_node_t *block_exit = parser->current_block_exits->nodes[index - 1];
+        if (block_exit->location.start < start) break;
+
+        // Implicitly remove from the list by lowering the size.
+        parser->current_block_exits->size--;
+    }
+}
+
+/**
+ * Allocate a new UntilNode node.
+ */
+static pm_until_node_t *
+pm_until_node_create(pm_parser_t *parser, const pm_token_t *keyword, const pm_token_t *do_keyword, const pm_token_t *closing, pm_node_t *predicate, pm_statements_node_t *statements, pm_node_flags_t flags) {
+    pm_until_node_t *node = PM_NODE_ALLOC(parser, pm_until_node_t);
+    pm_conditional_predicate(parser, predicate, PM_CONDITIONAL_PREDICATE_TYPE_CONDITIONAL);
+
+    *node = (pm_until_node_t) {
+        {
+            .type = PM_UNTIL_NODE,
+            .flags = flags,
+            .node_id = PM_NODE_IDENTIFY(parser),
+            .location = {
+                .start = keyword->start,
+                .end = closing->end,
+            },
+        },
+        .keyword_loc = PM_LOCATION_TOKEN_VALUE(keyword),
+        .do_keyword_loc = PM_OPTIONAL_LOCATION_TOKEN_VALUE(do_keyword),
+        .closing_loc = PM_OPTIONAL_LOCATION_TOKEN_VALUE(closing),
+        .predicate = predicate,
+        .statements = statements
+    };
+
+    return node;
+}
+
+/**
+ * Allocate a new UntilNode node.
+ */
+static pm_until_node_t *
+pm_until_node_modifier_create(pm_parser_t *parser, const pm_token_t *keyword, pm_node_t *predicate, pm_statements_node_t *statements, pm_node_flags_t flags) {
+    pm_until_node_t *node = PM_NODE_ALLOC(parser, pm_until_node_t);
+    pm_conditional_predicate(parser, predicate, PM_CONDITIONAL_PREDICATE_TYPE_CONDITIONAL);
+    pm_loop_modifier_block_exits(parser, statements);
+
+    *node = (pm_until_node_t) {
+        {
+            .type = PM_UNTIL_NODE,
+            .flags = flags,
+            .node_id = PM_NODE_IDENTIFY(parser),
+            .location = {
+                .start = statements->base.location.start,
+                .end = predicate->location.end,
+            },
+        },
+        .keyword_loc = PM_LOCATION_TOKEN_VALUE(keyword),
+        .do_keyword_loc = PM_OPTIONAL_LOCATION_NOT_PROVIDED_VALUE,
+        .closing_loc = PM_OPTIONAL_LOCATION_NOT_PROVIDED_VALUE,
+        .predicate = predicate,
+        .statements = statements
+    };
+
+    return node;
+}
+
+/**
+ * Allocate and initialize a new WhenNode node.
+ */
+static pm_when_node_t *
+pm_when_node_create(pm_parser_t *parser, const pm_token_t *keyword) {
+    pm_when_node_t *node = PM_NODE_ALLOC(parser, pm_when_node_t);
+
+    *node = (pm_when_node_t) {
+        {
+            .type = PM_WHEN_NODE,
+            .node_id = PM_NODE_IDENTIFY(parser),
+            .location = {
+                .start = keyword->start,
+                .end = NULL
+            }
+        },
+        .keyword_loc = PM_LOCATION_TOKEN_VALUE(keyword),
+        .statements = NULL,
+        .then_keyword_loc = PM_OPTIONAL_LOCATION_NOT_PROVIDED_VALUE,
+        .conditions = { 0 }
+    };
+
+    return node;
+}
+
+/**
+ * Append a new condition to a when node.
+ */
+static void
+pm_when_node_conditions_append(pm_when_node_t *node, pm_node_t *condition) {
+    node->base.location.end = condition->location.end;
+    pm_node_list_append(&node->conditions, condition);
+}
+
+/**
+ * Set the location of the then keyword of a when node.
+ */
+static inline void
+pm_when_node_then_keyword_loc_set(pm_when_node_t *node, const pm_token_t *then_keyword) {
+    node->base.location.end = then_keyword->end;
+    node->then_keyword_loc = PM_LOCATION_TOKEN_VALUE(then_keyword);
+}
+
+/**
+ * Set the statements list of a when node.
+ */
+static void
+pm_when_node_statements_set(pm_when_node_t *node, pm_statements_node_t *statements) {
+    if (statements->base.location.end > node->base.location.end) {
+        node->base.location.end = statements->base.location.end;
+    }
+
+    node->statements = statements;
+}
+
+/**
+ * Allocate a new WhileNode node.
+ */
+static pm_while_node_t *
+pm_while_node_create(pm_parser_t *parser, const pm_token_t *keyword, const pm_token_t *do_keyword, const pm_token_t *closing, pm_node_t *predicate, pm_statements_node_t *statements, pm_node_flags_t flags) {
+    pm_while_node_t *node = PM_NODE_ALLOC(parser, pm_while_node_t);
+    pm_conditional_predicate(parser, predicate, PM_CONDITIONAL_PREDICATE_TYPE_CONDITIONAL);
+
+    *node = (pm_while_node_t) {
+        {
+            .type = PM_WHILE_NODE,
+            .flags = flags,
+            .node_id = PM_NODE_IDENTIFY(parser),
+            .location = {
+                .start = keyword->start,
+                .end = closing->end
+            },
+        },
+        .keyword_loc = PM_LOCATION_TOKEN_VALUE(keyword),
+        .do_keyword_loc = PM_OPTIONAL_LOCATION_TOKEN_VALUE(do_keyword),
+        .closing_loc = PM_OPTIONAL_LOCATION_TOKEN_VALUE(closing),
+        .predicate = predicate,
+        .statements = statements
+    };
+
+    return node;
+}
+
+/**
+ * Allocate a new WhileNode node.
+ */
+static pm_while_node_t *
+pm_while_node_modifier_create(pm_parser_t *parser, const pm_token_t *keyword, pm_node_t *predicate, pm_statements_node_t *statements, pm_node_flags_t flags) {
+    pm_while_node_t *node = PM_NODE_ALLOC(parser, pm_while_node_t);
+    pm_conditional_predicate(parser, predicate, PM_CONDITIONAL_PREDICATE_TYPE_CONDITIONAL);
+    pm_loop_modifier_block_exits(parser, statements);
+
+    *node = (pm_while_node_t) {
+        {
+            .type = PM_WHILE_NODE,
+            .flags = flags,
+            .node_id = PM_NODE_IDENTIFY(parser),
+            .location = {
+                .start = statements->base.location.start,
+                .end = predicate->location.end
+            },
+        },
+        .keyword_loc = PM_LOCATION_TOKEN_VALUE(keyword),
+        .do_keyword_loc = PM_OPTIONAL_LOCATION_NOT_PROVIDED_VALUE,
+        .closing_loc = PM_OPTIONAL_LOCATION_NOT_PROVIDED_VALUE,
+        .predicate = predicate,
+        .statements = statements
+    };
+
+    return node;
+}
+
+/**
+ * Allocate and initialize a new synthesized while loop.
+ */
+static pm_while_node_t *
+pm_while_node_synthesized_create(pm_parser_t *parser, pm_node_t *predicate, pm_statements_node_t *statements) {
+    pm_while_node_t *node = PM_NODE_ALLOC(parser, pm_while_node_t);
+
+    *node = (pm_while_node_t) {
+        {
+            .type = PM_WHILE_NODE,
+            .node_id = PM_NODE_IDENTIFY(parser),
+            .location = PM_LOCATION_NULL_VALUE(parser)
+        },
+        .keyword_loc = PM_LOCATION_NULL_VALUE(parser),
+        .do_keyword_loc = PM_LOCATION_NULL_VALUE(parser),
+        .closing_loc = PM_LOCATION_NULL_VALUE(parser),
+        .predicate = predicate,
+        .statements = statements
+    };
+
+    return node;
+}
+
+/**
+ * Allocate and initialize a new XStringNode node with the given unescaped
+ * string.
+ */
+static pm_x_string_node_t *
+pm_xstring_node_create_unescaped(pm_parser_t *parser, const pm_token_t *opening, const pm_token_t *content, const pm_token_t *closing, const pm_string_t *unescaped) {
+    pm_x_string_node_t *node = PM_NODE_ALLOC(parser, pm_x_string_node_t);
+
+    *node = (pm_x_string_node_t) {
+        {
+            .type = PM_X_STRING_NODE,
+            .flags = PM_STRING_FLAGS_FROZEN,
+            .node_id = PM_NODE_IDENTIFY(parser),
+            .location = {
+                .start = opening->start,
+                .end = closing->end
+            },
+        },
+        .opening_loc = PM_LOCATION_TOKEN_VALUE(opening),
+        .content_loc = PM_LOCATION_TOKEN_VALUE(content),
+        .closing_loc = PM_LOCATION_TOKEN_VALUE(closing),
+        .unescaped = *unescaped
+    };
+
+    return node;
+}
+
+/**
+ * Allocate and initialize a new XStringNode node.
+ */
+static inline pm_x_string_node_t *
+pm_xstring_node_create(pm_parser_t *parser, const pm_token_t *opening, const pm_token_t *content, const pm_token_t *closing) {
+    return pm_xstring_node_create_unescaped(parser, opening, content, closing, &PM_STRING_EMPTY);
+}
+
+/**
+ * Allocate a new YieldNode node.
+ */
+static pm_yield_node_t *
+pm_yield_node_create(pm_parser_t *parser, const pm_token_t *keyword, const pm_location_t *lparen_loc, pm_arguments_node_t *arguments, const pm_location_t *rparen_loc) {
+    pm_yield_node_t *node = PM_NODE_ALLOC(parser, pm_yield_node_t);
+
+    const uint8_t *end;
+    if (rparen_loc->start != NULL) {
+        end = rparen_loc->end;
+    } else if (arguments != NULL) {
+        end = arguments->base.location.end;
+    } else if (lparen_loc->start != NULL) {
+        end = lparen_loc->end;
+    } else {
+        end = keyword->end;
+    }
+
+    *node = (pm_yield_node_t) {
+        {
+            .type = PM_YIELD_NODE,
+            .node_id = PM_NODE_IDENTIFY(parser),
+            .location = {
+                .start = keyword->start,
+                .end = end
+            },
+        },
+        .keyword_loc = PM_LOCATION_TOKEN_VALUE(keyword),
+        .lparen_loc = *lparen_loc,
+        .arguments = arguments,
+        .rparen_loc = *rparen_loc
+    };
+
+    return node;
+}
+
+#undef PM_NODE_ALLOC
+#undef PM_NODE_IDENTIFY
+
+/**
+ * Check if any of the currently visible scopes contain a local variable
+ * described by the given constant id.
+ */
+static int
+pm_parser_local_depth_constant_id(pm_parser_t *parser, pm_constant_id_t constant_id) {
+    pm_scope_t *scope = parser->current_scope;
+    int depth = 0;
+
+    while (scope != NULL) {
+        if (pm_locals_find(&scope->locals, constant_id) != UINT32_MAX) return depth;
+        if (scope->closed) break;
+
+        scope = scope->previous;
+        depth++;
+    }
+
+    return -1;
+}
+
+/**
+ * Check if any of the currently visible scopes contain a local variable
+ * described by the given token. This function implicitly inserts a constant
+ * into the constant pool.
+ */
+static inline int
+pm_parser_local_depth(pm_parser_t *parser, pm_token_t *token) {
+    return pm_parser_local_depth_constant_id(parser, pm_parser_constant_id_token(parser, token));
+}
+
+/**
+ * Add a constant id to the local table of the current scope.
+ */
+static inline void
+pm_parser_local_add(pm_parser_t *parser, pm_constant_id_t constant_id, const uint8_t *start, const uint8_t *end, uint32_t reads) {
+    pm_locals_write(&parser->current_scope->locals, constant_id, start, end, reads);
+}
+
+/**
+ * Add a local variable from a location to the current scope.
+ */
+static pm_constant_id_t
+pm_parser_local_add_location(pm_parser_t *parser, const uint8_t *start, const uint8_t *end, uint32_t reads) {
+    pm_constant_id_t constant_id = pm_parser_constant_id_location(parser, start, end);
+    if (constant_id != 0) pm_parser_local_add(parser, constant_id, start, end, reads);
+    return constant_id;
+}
+
+/**
+ * Add a local variable from a token to the current scope.
+ */
+static inline pm_constant_id_t
+pm_parser_local_add_token(pm_parser_t *parser, pm_token_t *token, uint32_t reads) {
+    return pm_parser_local_add_location(parser, token->start, token->end, reads);
+}
+
+/**
+ * Add a local variable from an owned string to the current scope.
+ */
+static pm_constant_id_t
+pm_parser_local_add_owned(pm_parser_t *parser, uint8_t *start, size_t length) {
+    pm_constant_id_t constant_id = pm_parser_constant_id_owned(parser, start, length);
+    if (constant_id != 0) pm_parser_local_add(parser, constant_id, parser->start, parser->start, 1);
+    return constant_id;
+}
+
+/**
+ * Add a local variable from a constant string to the current scope.
+ */
+static pm_constant_id_t
+pm_parser_local_add_constant(pm_parser_t *parser, const char *start, size_t length) {
+    pm_constant_id_t constant_id = pm_parser_constant_id_constant(parser, start, length);
+    if (constant_id != 0) pm_parser_local_add(parser, constant_id, parser->start, parser->start, 1);
+    return constant_id;
+}
+
+/**
+ * Add a parameter name to the current scope and check whether the name of the
+ * parameter is unique or not.
+ *
+ * Returns `true` if this is a duplicate parameter name, otherwise returns
+ * false.
+ */
+static bool
+pm_parser_parameter_name_check(pm_parser_t *parser, const pm_token_t *name) {
+    // We want to check whether the parameter name is a numbered parameter or
+    // not.
+    pm_refute_numbered_parameter(parser, name->start, name->end);
+
+    // Otherwise we'll fetch the constant id for the parameter name and check
+    // whether it's already in the current scope.
+    pm_constant_id_t constant_id = pm_parser_constant_id_token(parser, name);
+
+    if (pm_locals_find(&parser->current_scope->locals, constant_id) != UINT32_MAX) {
+        // Add an error if the parameter doesn't start with _ and has been seen before
+        if ((name->start < name->end) && (*name->start != '_')) {
+            pm_parser_err_token(parser, name, PM_ERR_PARAMETER_NAME_DUPLICATED);
+        }
+        return true;
+    }
+    return false;
+}
+
+/**
+ * Pop the current scope off the scope stack.
+ */
+static void
+pm_parser_scope_pop(pm_parser_t *parser) {
+    pm_scope_t *scope = parser->current_scope;
+    parser->current_scope = scope->previous;
+    pm_locals_free(&scope->locals);
+    pm_node_list_free(&scope->implicit_parameters);
+    xfree(scope);
+}
+
+/******************************************************************************/
+/* Stack helpers                                                              */
+/******************************************************************************/
+
+/**
+ * Pushes a value onto the stack.
+ */
+static inline void
+pm_state_stack_push(pm_state_stack_t *stack, bool value) {
+    *stack = (*stack << 1) | (value & 1);
+}
+
+/**
+ * Pops a value off the stack.
+ */
+static inline void
+pm_state_stack_pop(pm_state_stack_t *stack) {
+    *stack >>= 1;
+}
+
+/**
+ * Returns the value at the top of the stack.
+ */
+static inline bool
+pm_state_stack_p(const pm_state_stack_t *stack) {
+    return *stack & 1;
+}
+
+static inline void
+pm_accepts_block_stack_push(pm_parser_t *parser, bool value) {
+    // Use the negation of the value to prevent stack overflow.
+    pm_state_stack_push(&parser->accepts_block_stack, !value);
+}
+
+static inline void
+pm_accepts_block_stack_pop(pm_parser_t *parser) {
+    pm_state_stack_pop(&parser->accepts_block_stack);
+}
+
+static inline bool
+pm_accepts_block_stack_p(pm_parser_t *parser) {
+    return !pm_state_stack_p(&parser->accepts_block_stack);
+}
+
+static inline void
+pm_do_loop_stack_push(pm_parser_t *parser, bool value) {
+    pm_state_stack_push(&parser->do_loop_stack, value);
+}
+
+static inline void
+pm_do_loop_stack_pop(pm_parser_t *parser) {
+    pm_state_stack_pop(&parser->do_loop_stack);
+}
+
+static inline bool
+pm_do_loop_stack_p(pm_parser_t *parser) {
+    return pm_state_stack_p(&parser->do_loop_stack);
+}
+
+/******************************************************************************/
+/* Lexer check helpers                                                        */
+/******************************************************************************/
+
+/**
+ * Get the next character in the source starting from +cursor+. If that position
+ * is beyond the end of the source then return '\0'.
+ */
+static inline uint8_t
+peek_at(const pm_parser_t *parser, const uint8_t *cursor) {
+    if (cursor < parser->end) {
+        return *cursor;
+    } else {
+        return '\0';
+    }
+}
+
+/**
+ * Get the next character in the source starting from parser->current.end and
+ * adding the given offset. If that position is beyond the end of the source
+ * then return '\0'.
+ */
+static inline uint8_t
+peek_offset(pm_parser_t *parser, ptrdiff_t offset) {
+    return peek_at(parser, parser->current.end + offset);
+}
+
+/**
+ * Get the next character in the source starting from parser->current.end. If
+ * that position is beyond the end of the source then return '\0'.
+ */
+static inline uint8_t
+peek(const pm_parser_t *parser) {
+    return peek_at(parser, parser->current.end);
+}
+
+/**
+ * If the character to be read matches the given value, then returns true and
+ * advances the current pointer.
+ */
+static inline bool
+match(pm_parser_t *parser, uint8_t value) {
+    if (peek(parser) == value) {
+        parser->current.end++;
+        return true;
+    }
+    return false;
+}
+
+/**
+ * Return the length of the line ending string starting at +cursor+, or 0 if it
+ * is not a line ending. This function is intended to be CRLF/LF agnostic.
+ */
+static inline size_t
+match_eol_at(pm_parser_t *parser, const uint8_t *cursor) {
+    if (peek_at(parser, cursor) == '\n') {
+        return 1;
+    }
+    if (peek_at(parser, cursor) == '\r' && peek_at(parser, cursor + 1) == '\n') {
+        return 2;
+    }
+    return 0;
+}
+
+/**
+ * Return the length of the line ending string starting at
+ * `parser->current.end + offset`, or 0 if it is not a line ending. This
+ * function is intended to be CRLF/LF agnostic.
+ */
+static inline size_t
+match_eol_offset(pm_parser_t *parser, ptrdiff_t offset) {
+    return match_eol_at(parser, parser->current.end + offset);
+}
+
+/**
+ * Return the length of the line ending string starting at parser->current.end,
+ * or 0 if it is not a line ending. This function is intended to be CRLF/LF
+ * agnostic.
+ */
+static inline size_t
+match_eol(pm_parser_t *parser) {
+    return match_eol_at(parser, parser->current.end);
+}
+
+/**
+ * Skip to the next newline character or NUL byte.
+ */
+static inline const uint8_t *
+next_newline(const uint8_t *cursor, ptrdiff_t length) {
+    assert(length >= 0);
+
+    // Note that it's okay for us to use memchr here to look for \n because none
+    // of the encodings that we support have \n as a component of a multi-byte
+    // character.
+    return memchr(cursor, '\n', (size_t) length);
+}
+
+/**
+ * This is equivalent to the predicate of warn_balanced in CRuby.
+ */
+static inline bool
+ambiguous_operator_p(const pm_parser_t *parser, bool space_seen) {
+    return !lex_state_p(parser, PM_LEX_STATE_CLASS | PM_LEX_STATE_DOT | PM_LEX_STATE_FNAME | PM_LEX_STATE_ENDFN) && space_seen && !pm_char_is_whitespace(peek(parser));
+}
+
+/**
+ * Here we're going to check if this is a "magic" comment, and perform whatever
+ * actions are necessary for it here.
+ */
+static bool
+parser_lex_magic_comment_encoding_value(pm_parser_t *parser, const uint8_t *start, const uint8_t *end) {
+    const pm_encoding_t *encoding = pm_encoding_find(start, end);
+
+    if (encoding != NULL) {
+        if (parser->encoding != encoding) {
+            parser->encoding = encoding;
+            if (parser->encoding_changed_callback != NULL) parser->encoding_changed_callback(parser);
+        }
+
+        parser->encoding_changed = (encoding != PM_ENCODING_UTF_8_ENTRY);
+        return true;
+    }
+
+    return false;
+}
+
+/**
+ * Look for a specific pattern of "coding" and potentially set the encoding on
+ * the parser.
+ */
+static void
+parser_lex_magic_comment_encoding(pm_parser_t *parser) {
+    const uint8_t *cursor = parser->current.start + 1;
+    const uint8_t *end = parser->current.end;
+
+    bool separator = false;
+    while (true) {
+        if (end - cursor <= 6) return;
+        switch (cursor[6]) {
+            case 'C': case 'c': cursor += 6; continue;
+            case 'O': case 'o': cursor += 5; continue;
+            case 'D': case 'd': cursor += 4; continue;
+            case 'I': case 'i': cursor += 3; continue;
+            case 'N': case 'n': cursor += 2; continue;
+            case 'G': case 'g': cursor += 1; continue;
+            case '=': case ':':
+                separator = true;
+                cursor += 6;
+                break;
+            default:
+                cursor += 6;
+                if (pm_char_is_whitespace(*cursor)) break;
+                continue;
+        }
+        if (pm_strncasecmp(cursor - 6, (const uint8_t *) "coding", 6) == 0) break;
+        separator = false;
+    }
+
+    while (true) {
+        do {
+            if (++cursor >= end) return;
+        } while (pm_char_is_whitespace(*cursor));
+
+        if (separator) break;
+        if (*cursor != '=' && *cursor != ':') return;
+
+        separator = true;
+        cursor++;
+    }
+
+    const uint8_t *value_start = cursor;
+    while ((*cursor == '-' || *cursor == '_' || parser->encoding->alnum_char(cursor, 1)) && ++cursor < end);
+
+    if (!parser_lex_magic_comment_encoding_value(parser, value_start, cursor)) {
+        // If we were unable to parse the encoding value, then we've got an
+        // issue because we didn't understand the encoding that the user was
+        // trying to use. In this case we'll keep using the default encoding but
+        // add an error to the parser to indicate an unsuccessful parse.
+        pm_parser_err(parser, value_start, cursor, PM_ERR_INVALID_ENCODING_MAGIC_COMMENT);
+    }
+}
+
+typedef enum {
+    PM_MAGIC_COMMENT_BOOLEAN_VALUE_TRUE,
+    PM_MAGIC_COMMENT_BOOLEAN_VALUE_FALSE,
+    PM_MAGIC_COMMENT_BOOLEAN_VALUE_INVALID
+} pm_magic_comment_boolean_value_t;
+
+/**
+ * Check if this is a magic comment that includes the frozen_string_literal
+ * pragma. If it does, set that field on the parser.
+ */
+static pm_magic_comment_boolean_value_t
+parser_lex_magic_comment_boolean_value(const uint8_t *value_start, uint32_t value_length) {
+    if (value_length == 4 && pm_strncasecmp(value_start, (const uint8_t *) "true", 4) == 0) {
+        return PM_MAGIC_COMMENT_BOOLEAN_VALUE_TRUE;
+    } else if (value_length == 5 && pm_strncasecmp(value_start, (const uint8_t *) "false", 5) == 0) {
+        return PM_MAGIC_COMMENT_BOOLEAN_VALUE_FALSE;
+    } else {
+        return PM_MAGIC_COMMENT_BOOLEAN_VALUE_INVALID;
+    }
+}
+
+static inline bool
+pm_char_is_magic_comment_key_delimiter(const uint8_t b) {
+    return b == '\'' || b == '"' || b == ':' || b == ';';
+}
+
+/**
+ * Find an emacs magic comment marker (-*-) within the given bounds. If one is
+ * found, it returns a pointer to the start of the marker. Otherwise it returns
+ * NULL.
+ */
+static inline const uint8_t *
+parser_lex_magic_comment_emacs_marker(pm_parser_t *parser, const uint8_t *cursor, const uint8_t *end) {
+    while ((cursor + 3 <= end) && (cursor = pm_memchr(cursor, '-', (size_t) (end - cursor), parser->encoding_changed, parser->encoding)) != NULL) {
+        if (cursor + 3 <= end && cursor[1] == '*' && cursor[2] == '-') {
+            return cursor;
+        }
+        cursor++;
+    }
+    return NULL;
+}
+
+/**
+ * Parse the current token on the parser to see if it's a magic comment and
+ * potentially perform some action based on that. A regular expression that this
+ * function is effectively matching is:
+ *
+ *     %r"([^\\s\'\":;]+)\\s*:\\s*(\"(?:\\\\.|[^\"])*\"|[^\"\\s;]+)[\\s;]*"
+ *
+ * It returns true if it consumes the entire comment. Otherwise it returns
+ * false.
+ */
+static inline bool
+parser_lex_magic_comment(pm_parser_t *parser, bool semantic_token_seen) {
+    bool result = true;
+
+    const uint8_t *start = parser->current.start + 1;
+    const uint8_t *end = parser->current.end;
+    if (end - start <= 7) return false;
+
+    const uint8_t *cursor;
+    bool indicator = false;
+
+    if ((cursor = parser_lex_magic_comment_emacs_marker(parser, start, end)) != NULL) {
+        start = cursor + 3;
+
+        if ((cursor = parser_lex_magic_comment_emacs_marker(parser, start, end)) != NULL) {
+            end = cursor;
+            indicator = true;
+        } else {
+            // If we have a start marker but not an end marker, then we cannot
+            // have a magic comment.
+            return false;
+        }
+    }
+
+    cursor = start;
+    while (cursor < end) {
+        while (cursor < end && (pm_char_is_magic_comment_key_delimiter(*cursor) || pm_char_is_whitespace(*cursor))) cursor++;
+
+        const uint8_t *key_start = cursor;
+        while (cursor < end && (!pm_char_is_magic_comment_key_delimiter(*cursor) && !pm_char_is_whitespace(*cursor))) cursor++;
+
+        const uint8_t *key_end = cursor;
+        while (cursor < end && pm_char_is_whitespace(*cursor)) cursor++;
+        if (cursor == end) break;
+
+        if (*cursor == ':') {
+            cursor++;
+        } else {
+            if (!indicator) return false;
+            continue;
+        }
+
+        while (cursor < end && pm_char_is_whitespace(*cursor)) cursor++;
+        if (cursor == end) break;
+
+        const uint8_t *value_start;
+        const uint8_t *value_end;
+
+        if (*cursor == '"') {
+            value_start = ++cursor;
+            for (; cursor < end && *cursor != '"'; cursor++) {
+                if (*cursor == '\\' && (cursor + 1 < end)) cursor++;
+            }
+            value_end = cursor;
+            if (*cursor == '"') cursor++;
+        } else {
+            value_start = cursor;
+            while (cursor < end && *cursor != '"' && *cursor != ';' && !pm_char_is_whitespace(*cursor)) cursor++;
+            value_end = cursor;
+        }
+
+        if (indicator) {
+            while (cursor < end && (*cursor == ';' || pm_char_is_whitespace(*cursor))) cursor++;
+        } else {
+            while (cursor < end && pm_char_is_whitespace(*cursor)) cursor++;
+            if (cursor != end) return false;
+        }
+
+        // Here, we need to do some processing on the key to swap out dashes for
+        // underscores. We only need to do this if there _is_ a dash in the key.
+        pm_string_t key;
+        const size_t key_length = (size_t) (key_end - key_start);
+        const uint8_t *dash = pm_memchr(key_start, '-', key_length, parser->encoding_changed, parser->encoding);
+
+        if (dash == NULL) {
+            pm_string_shared_init(&key, key_start, key_end);
+        } else {
+            uint8_t *buffer = xmalloc(key_length);
+            if (buffer == NULL) break;
+
+            memcpy(buffer, key_start, key_length);
+            buffer[dash - key_start] = '_';
+
+            while ((dash = pm_memchr(dash + 1, '-', (size_t) (key_end - dash - 1), parser->encoding_changed, parser->encoding)) != NULL) {
+                buffer[dash - key_start] = '_';
+            }
+
+            pm_string_owned_init(&key, buffer, key_length);
+        }
+
+        // Finally, we can start checking the key against the list of known
+        // magic comment keys, and potentially change state based on that.
+        const uint8_t *key_source = pm_string_source(&key);
+        uint32_t value_length = (uint32_t) (value_end - value_start);
+
+        // We only want to attempt to compare against encoding comments if it's
+        // the first line in the file (or the second in the case of a shebang).
+        if (parser->current.start == parser->encoding_comment_start && !parser->encoding_locked) {
+            if (
+                (key_length == 8 && pm_strncasecmp(key_source, (const uint8_t *) "encoding", 8) == 0) ||
+                (key_length == 6 && pm_strncasecmp(key_source, (const uint8_t *) "coding", 6) == 0)
+            ) {
+                result = parser_lex_magic_comment_encoding_value(parser, value_start, value_end);
+            }
+        }
+
+        if (key_length == 11) {
+            if (pm_strncasecmp(key_source, (const uint8_t *) "warn_indent", 11) == 0) {
+                switch (parser_lex_magic_comment_boolean_value(value_start, value_length)) {
+                    case PM_MAGIC_COMMENT_BOOLEAN_VALUE_INVALID:
+                        PM_PARSER_WARN_TOKEN_FORMAT(
+                            parser,
+                            parser->current,
+                            PM_WARN_INVALID_MAGIC_COMMENT_VALUE,
+                            (int) key_length,
+                            (const char *) key_source,
+                            (int) value_length,
+                            (const char *) value_start
+                        );
+                        break;
+                    case PM_MAGIC_COMMENT_BOOLEAN_VALUE_FALSE:
+                        parser->warn_mismatched_indentation = false;
+                        break;
+                    case PM_MAGIC_COMMENT_BOOLEAN_VALUE_TRUE:
+                        parser->warn_mismatched_indentation = true;
+                        break;
+                }
+            }
+        } else if (key_length == 21) {
+            if (pm_strncasecmp(key_source, (const uint8_t *) "frozen_string_literal", 21) == 0) {
+                // We only want to handle frozen string literal comments if it's
+                // before any semantic tokens have been seen.
+                if (semantic_token_seen) {
+                    pm_parser_warn_token(parser, &parser->current, PM_WARN_IGNORED_FROZEN_STRING_LITERAL);
+                } else {
+                    switch (parser_lex_magic_comment_boolean_value(value_start, value_length)) {
+                        case PM_MAGIC_COMMENT_BOOLEAN_VALUE_INVALID:
+                            PM_PARSER_WARN_TOKEN_FORMAT(
+                                parser,
+                                parser->current,
+                                PM_WARN_INVALID_MAGIC_COMMENT_VALUE,
+                                (int) key_length,
+                                (const char *) key_source,
+                                (int) value_length,
+                                (const char *) value_start
+                            );
+                            break;
+                        case PM_MAGIC_COMMENT_BOOLEAN_VALUE_FALSE:
+                            parser->frozen_string_literal = PM_OPTIONS_FROZEN_STRING_LITERAL_DISABLED;
+                            break;
+                        case PM_MAGIC_COMMENT_BOOLEAN_VALUE_TRUE:
+                            parser->frozen_string_literal = PM_OPTIONS_FROZEN_STRING_LITERAL_ENABLED;
+                            break;
+                    }
+                }
+            }
+        } else if (key_length == 24) {
+            if (pm_strncasecmp(key_source, (const uint8_t *) "shareable_constant_value", 24) == 0) {
+                const uint8_t *cursor = parser->current.start;
+                while ((cursor > parser->start) && ((cursor[-1] == ' ') || (cursor[-1] == '\t'))) cursor--;
+
+                if (!((cursor == parser->start) || (cursor[-1] == '\n'))) {
+                    pm_parser_warn_token(parser, &parser->current, PM_WARN_SHAREABLE_CONSTANT_VALUE_LINE);
+                } else if (value_length == 4 && pm_strncasecmp(value_start, (const uint8_t *) "none", 4) == 0) {
+                    pm_parser_scope_shareable_constant_set(parser, PM_SCOPE_SHAREABLE_CONSTANT_NONE);
+                } else if (value_length == 7 && pm_strncasecmp(value_start, (const uint8_t *) "literal", 7) == 0) {
+                    pm_parser_scope_shareable_constant_set(parser, PM_SCOPE_SHAREABLE_CONSTANT_LITERAL);
+                } else if (value_length == 23 && pm_strncasecmp(value_start, (const uint8_t *) "experimental_everything", 23) == 0) {
+                    pm_parser_scope_shareable_constant_set(parser, PM_SCOPE_SHAREABLE_CONSTANT_EXPERIMENTAL_EVERYTHING);
+                } else if (value_length == 17 && pm_strncasecmp(value_start, (const uint8_t *) "experimental_copy", 17) == 0) {
+                    pm_parser_scope_shareable_constant_set(parser, PM_SCOPE_SHAREABLE_CONSTANT_EXPERIMENTAL_COPY);
+                } else {
+                    PM_PARSER_WARN_TOKEN_FORMAT(
+                        parser,
+                        parser->current,
+                        PM_WARN_INVALID_MAGIC_COMMENT_VALUE,
+                        (int) key_length,
+                        (const char *) key_source,
+                        (int) value_length,
+                        (const char *) value_start
+                    );
+                }
+            }
+        }
+
+        // When we're done, we want to free the string in case we had to
+        // allocate memory for it.
+        pm_string_free(&key);
+
+        // Allocate a new magic comment node to append to the parser's list.
+        pm_magic_comment_t *magic_comment;
+        if ((magic_comment = (pm_magic_comment_t *) xcalloc(1, sizeof(pm_magic_comment_t))) != NULL) {
+            magic_comment->key_start = key_start;
+            magic_comment->value_start = value_start;
+            magic_comment->key_length = (uint32_t) key_length;
+            magic_comment->value_length = value_length;
+            pm_list_append(&parser->magic_comment_list, (pm_list_node_t *) magic_comment);
+        }
+    }
+
+    return result;
+}
+
+/******************************************************************************/
+/* Context manipulations                                                      */
+/******************************************************************************/
+
+static bool
+context_terminator(pm_context_t context, pm_token_t *token) {
+    switch (context) {
+        case PM_CONTEXT_MAIN:
+        case PM_CONTEXT_DEF_PARAMS:
+        case PM_CONTEXT_DEFINED:
+        case PM_CONTEXT_MULTI_TARGET:
+        case PM_CONTEXT_TERNARY:
+        case PM_CONTEXT_RESCUE_MODIFIER:
+            return token->type == PM_TOKEN_EOF;
+        case PM_CONTEXT_DEFAULT_PARAMS:
+            return token->type == PM_TOKEN_COMMA || token->type == PM_TOKEN_PARENTHESIS_RIGHT;
+        case PM_CONTEXT_PREEXE:
+        case PM_CONTEXT_POSTEXE:
+            return token->type == PM_TOKEN_BRACE_RIGHT;
+        case PM_CONTEXT_MODULE:
+        case PM_CONTEXT_CLASS:
+        case PM_CONTEXT_SCLASS:
+        case PM_CONTEXT_LAMBDA_DO_END:
+        case PM_CONTEXT_DEF:
+        case PM_CONTEXT_BLOCK_KEYWORDS:
+            return token->type == PM_TOKEN_KEYWORD_END || token->type == PM_TOKEN_KEYWORD_RESCUE || token->type == PM_TOKEN_KEYWORD_ENSURE;
+        case PM_CONTEXT_WHILE:
+        case PM_CONTEXT_UNTIL:
+        case PM_CONTEXT_ELSE:
+        case PM_CONTEXT_FOR:
+        case PM_CONTEXT_BEGIN_ENSURE:
+        case PM_CONTEXT_BLOCK_ENSURE:
+        case PM_CONTEXT_CLASS_ENSURE:
+        case PM_CONTEXT_DEF_ENSURE:
+        case PM_CONTEXT_LAMBDA_ENSURE:
+        case PM_CONTEXT_MODULE_ENSURE:
+        case PM_CONTEXT_SCLASS_ENSURE:
+            return token->type == PM_TOKEN_KEYWORD_END;
+        case PM_CONTEXT_LOOP_PREDICATE:
+            return token->type == PM_TOKEN_KEYWORD_DO || token->type == PM_TOKEN_KEYWORD_THEN;
+        case PM_CONTEXT_FOR_INDEX:
+            return token->type == PM_TOKEN_KEYWORD_IN;
+        case PM_CONTEXT_CASE_WHEN:
+            return token->type == PM_TOKEN_KEYWORD_WHEN || token->type == PM_TOKEN_KEYWORD_END || token->type == PM_TOKEN_KEYWORD_ELSE;
+        case PM_CONTEXT_CASE_IN:
+            return token->type == PM_TOKEN_KEYWORD_IN || token->type == PM_TOKEN_KEYWORD_END || token->type == PM_TOKEN_KEYWORD_ELSE;
+        case PM_CONTEXT_IF:
+        case PM_CONTEXT_ELSIF:
+            return token->type == PM_TOKEN_KEYWORD_ELSE || token->type == PM_TOKEN_KEYWORD_ELSIF || token->type == PM_TOKEN_KEYWORD_END;
+        case PM_CONTEXT_UNLESS:
+            return token->type == PM_TOKEN_KEYWORD_ELSE || token->type == PM_TOKEN_KEYWORD_END;
+        case PM_CONTEXT_EMBEXPR:
+            return token->type == PM_TOKEN_EMBEXPR_END;
+        case PM_CONTEXT_BLOCK_BRACES:
+            return token->type == PM_TOKEN_BRACE_RIGHT;
+        case PM_CONTEXT_PARENS:
+            return token->type == PM_TOKEN_PARENTHESIS_RIGHT;
+        case PM_CONTEXT_BEGIN:
+        case PM_CONTEXT_BEGIN_RESCUE:
+        case PM_CONTEXT_BLOCK_RESCUE:
+        case PM_CONTEXT_CLASS_RESCUE:
+        case PM_CONTEXT_DEF_RESCUE:
+        case PM_CONTEXT_LAMBDA_RESCUE:
+        case PM_CONTEXT_MODULE_RESCUE:
+        case PM_CONTEXT_SCLASS_RESCUE:
+            return token->type == PM_TOKEN_KEYWORD_ENSURE || token->type == PM_TOKEN_KEYWORD_RESCUE || token->type == PM_TOKEN_KEYWORD_ELSE || token->type == PM_TOKEN_KEYWORD_END;
+        case PM_CONTEXT_BEGIN_ELSE:
+        case PM_CONTEXT_BLOCK_ELSE:
+        case PM_CONTEXT_CLASS_ELSE:
+        case PM_CONTEXT_DEF_ELSE:
+        case PM_CONTEXT_LAMBDA_ELSE:
+        case PM_CONTEXT_MODULE_ELSE:
+        case PM_CONTEXT_SCLASS_ELSE:
+            return token->type == PM_TOKEN_KEYWORD_ENSURE || token->type == PM_TOKEN_KEYWORD_END;
+        case PM_CONTEXT_LAMBDA_BRACES:
+            return token->type == PM_TOKEN_BRACE_RIGHT;
+        case PM_CONTEXT_PREDICATE:
+            return token->type == PM_TOKEN_KEYWORD_THEN || token->type == PM_TOKEN_NEWLINE || token->type == PM_TOKEN_SEMICOLON;
+        case PM_CONTEXT_NONE:
+            return false;
+    }
+
+    return false;
+}
+
+/**
+ * Returns the context that the given token is found to be terminating, or
+ * returns PM_CONTEXT_NONE.
+ */
+static pm_context_t
+context_recoverable(const pm_parser_t *parser, pm_token_t *token) {
+    pm_context_node_t *context_node = parser->current_context;
+
+    while (context_node != NULL) {
+        if (context_terminator(context_node->context, token)) return context_node->context;
+        context_node = context_node->prev;
+    }
+
+    return PM_CONTEXT_NONE;
+}
+
+static bool
+context_push(pm_parser_t *parser, pm_context_t context) {
+    pm_context_node_t *context_node = (pm_context_node_t *) xmalloc(sizeof(pm_context_node_t));
+    if (context_node == NULL) return false;
+
+    *context_node = (pm_context_node_t) { .context = context, .prev = NULL };
+
+    if (parser->current_context == NULL) {
+        parser->current_context = context_node;
+    } else {
+        context_node->prev = parser->current_context;
+        parser->current_context = context_node;
+    }
+
+    return true;
+}
+
+static void
+context_pop(pm_parser_t *parser) {
+    pm_context_node_t *prev = parser->current_context->prev;
+    xfree(parser->current_context);
+    parser->current_context = prev;
+}
+
+static bool
+context_p(const pm_parser_t *parser, pm_context_t context) {
+    pm_context_node_t *context_node = parser->current_context;
+
+    while (context_node != NULL) {
+        if (context_node->context == context) return true;
+        context_node = context_node->prev;
+    }
+
+    return false;
+}
+
+static bool
+context_def_p(const pm_parser_t *parser) {
+    pm_context_node_t *context_node = parser->current_context;
+
+    while (context_node != NULL) {
+        switch (context_node->context) {
+            case PM_CONTEXT_DEF:
+            case PM_CONTEXT_DEF_PARAMS:
+            case PM_CONTEXT_DEF_ENSURE:
+            case PM_CONTEXT_DEF_RESCUE:
+            case PM_CONTEXT_DEF_ELSE:
+                return true;
+            case PM_CONTEXT_CLASS:
+            case PM_CONTEXT_CLASS_ENSURE:
+            case PM_CONTEXT_CLASS_RESCUE:
+            case PM_CONTEXT_CLASS_ELSE:
+            case PM_CONTEXT_MODULE:
+            case PM_CONTEXT_MODULE_ENSURE:
+            case PM_CONTEXT_MODULE_RESCUE:
+            case PM_CONTEXT_MODULE_ELSE:
+            case PM_CONTEXT_SCLASS:
+            case PM_CONTEXT_SCLASS_ENSURE:
+            case PM_CONTEXT_SCLASS_RESCUE:
+            case PM_CONTEXT_SCLASS_ELSE:
+                return false;
+            default:
+                context_node = context_node->prev;
+        }
+    }
+
+    return false;
+}
+
+/**
+ * Returns a human readable string for the given context, used in error
+ * messages.
+ */
+static const char *
+context_human(pm_context_t context) {
+    switch (context) {
+        case PM_CONTEXT_NONE:
+            assert(false && "unreachable");
+            return "";
+        case PM_CONTEXT_BEGIN: return "begin statement";
+        case PM_CONTEXT_BLOCK_BRACES: return "'{'..'}' block";
+        case PM_CONTEXT_BLOCK_KEYWORDS: return "'do'..'end' block";
+        case PM_CONTEXT_CASE_WHEN: return "'when' clause";
+        case PM_CONTEXT_CASE_IN: return "'in' clause";
+        case PM_CONTEXT_CLASS: return "class definition";
+        case PM_CONTEXT_DEF: return "method definition";
+        case PM_CONTEXT_DEF_PARAMS: return "method parameters";
+        case PM_CONTEXT_DEFAULT_PARAMS: return "parameter default value";
+        case PM_CONTEXT_DEFINED: return "'defined?' expression";
+        case PM_CONTEXT_ELSE:
+        case PM_CONTEXT_BEGIN_ELSE:
+        case PM_CONTEXT_BLOCK_ELSE:
+        case PM_CONTEXT_CLASS_ELSE:
+        case PM_CONTEXT_DEF_ELSE:
+        case PM_CONTEXT_LAMBDA_ELSE:
+        case PM_CONTEXT_MODULE_ELSE:
+        case PM_CONTEXT_SCLASS_ELSE: return "'else' clause";
+        case PM_CONTEXT_ELSIF: return "'elsif' clause";
+        case PM_CONTEXT_EMBEXPR: return "embedded expression";
+        case PM_CONTEXT_BEGIN_ENSURE:
+        case PM_CONTEXT_BLOCK_ENSURE:
+        case PM_CONTEXT_CLASS_ENSURE:
+        case PM_CONTEXT_DEF_ENSURE:
+        case PM_CONTEXT_LAMBDA_ENSURE:
+        case PM_CONTEXT_MODULE_ENSURE:
+        case PM_CONTEXT_SCLASS_ENSURE: return "'ensure' clause";
+        case PM_CONTEXT_FOR: return "for loop";
+        case PM_CONTEXT_FOR_INDEX: return "for loop index";
+        case PM_CONTEXT_IF: return "if statement";
+        case PM_CONTEXT_LAMBDA_BRACES: return "'{'..'}' lambda block";
+        case PM_CONTEXT_LAMBDA_DO_END: return "'do'..'end' lambda block";
+        case PM_CONTEXT_LOOP_PREDICATE: return "loop predicate";
+        case PM_CONTEXT_MAIN: return "top level context";
+        case PM_CONTEXT_MODULE: return "module definition";
+        case PM_CONTEXT_MULTI_TARGET: return "multiple targets";
+        case PM_CONTEXT_PARENS: return "parentheses";
+        case PM_CONTEXT_POSTEXE: return "'END' block";
+        case PM_CONTEXT_PREDICATE: return "predicate";
+        case PM_CONTEXT_PREEXE: return "'BEGIN' block";
+        case PM_CONTEXT_BEGIN_RESCUE:
+        case PM_CONTEXT_BLOCK_RESCUE:
+        case PM_CONTEXT_CLASS_RESCUE:
+        case PM_CONTEXT_DEF_RESCUE:
+        case PM_CONTEXT_LAMBDA_RESCUE:
+        case PM_CONTEXT_MODULE_RESCUE:
+        case PM_CONTEXT_RESCUE_MODIFIER:
+        case PM_CONTEXT_SCLASS_RESCUE: return "'rescue' clause";
+        case PM_CONTEXT_SCLASS: return "singleton class definition";
+        case PM_CONTEXT_TERNARY: return "ternary expression";
+        case PM_CONTEXT_UNLESS: return "unless statement";
+        case PM_CONTEXT_UNTIL: return "until statement";
+        case PM_CONTEXT_WHILE: return "while statement";
+    }
+
+    assert(false && "unreachable");
+    return "";
+}
+
+/******************************************************************************/
+/* Specific token lexers                                                      */
+/******************************************************************************/
+
+static inline void
+pm_strspn_number_validate(pm_parser_t *parser, const uint8_t *string, size_t length, const uint8_t *invalid) {
+    if (invalid != NULL) {
+        pm_diagnostic_id_t diag_id = (invalid == (string + length - 1)) ? PM_ERR_INVALID_NUMBER_UNDERSCORE_TRAILING : PM_ERR_INVALID_NUMBER_UNDERSCORE_INNER;
+        pm_parser_err(parser, invalid, invalid + 1, diag_id);
+    }
+}
+
+static size_t
+pm_strspn_binary_number_validate(pm_parser_t *parser, const uint8_t *string) {
+    const uint8_t *invalid = NULL;
+    size_t length = pm_strspn_binary_number(string, parser->end - string, &invalid);
+    pm_strspn_number_validate(parser, string, length, invalid);
+    return length;
+}
+
+static size_t
+pm_strspn_octal_number_validate(pm_parser_t *parser, const uint8_t *string) {
+    const uint8_t *invalid = NULL;
+    size_t length = pm_strspn_octal_number(string, parser->end - string, &invalid);
+    pm_strspn_number_validate(parser, string, length, invalid);
+    return length;
+}
+
+static size_t
+pm_strspn_decimal_number_validate(pm_parser_t *parser, const uint8_t *string) {
+    const uint8_t *invalid = NULL;
+    size_t length = pm_strspn_decimal_number(string, parser->end - string, &invalid);
+    pm_strspn_number_validate(parser, string, length, invalid);
+    return length;
+}
+
+static size_t
+pm_strspn_hexadecimal_number_validate(pm_parser_t *parser, const uint8_t *string) {
+    const uint8_t *invalid = NULL;
+    size_t length = pm_strspn_hexadecimal_number(string, parser->end - string, &invalid);
+    pm_strspn_number_validate(parser, string, length, invalid);
+    return length;
+}
+
+static pm_token_type_t
+lex_optional_float_suffix(pm_parser_t *parser, bool* seen_e) {
+    pm_token_type_t type = PM_TOKEN_INTEGER;
+
+    // Here we're going to attempt to parse the optional decimal portion of a
+    // float. If it's not there, then it's okay and we'll just continue on.
+    if (peek(parser) == '.') {
+        if (pm_char_is_decimal_digit(peek_offset(parser, 1))) {
+            parser->current.end += 2;
+            parser->current.end += pm_strspn_decimal_number_validate(parser, parser->current.end);
+            type = PM_TOKEN_FLOAT;
+        } else {
+            // If we had a . and then something else, then it's not a float
+            // suffix on a number it's a method call or something else.
+            return type;
+        }
+    }
+
+    // Here we're going to attempt to parse the optional exponent portion of a
+    // float. If it's not there, it's okay and we'll just continue on.
+    if ((peek(parser) == 'e') || (peek(parser) == 'E')) {
+        if ((peek_offset(parser, 1) == '+') || (peek_offset(parser, 1) == '-')) {
+            parser->current.end += 2;
+
+            if (pm_char_is_decimal_digit(peek(parser))) {
+                parser->current.end++;
+                parser->current.end += pm_strspn_decimal_number_validate(parser, parser->current.end);
+            } else {
+                pm_parser_err_current(parser, PM_ERR_INVALID_FLOAT_EXPONENT);
+            }
+        } else if (pm_char_is_decimal_digit(peek_offset(parser, 1))) {
+            parser->current.end++;
+            parser->current.end += pm_strspn_decimal_number_validate(parser, parser->current.end);
+        } else {
+            return type;
+        }
+
+        *seen_e = true;
+        type = PM_TOKEN_FLOAT;
+    }
+
+    return type;
+}
+
+static pm_token_type_t
+lex_numeric_prefix(pm_parser_t *parser, bool* seen_e) {
+    pm_token_type_t type = PM_TOKEN_INTEGER;
+    *seen_e = false;
+
+    if (peek_offset(parser, -1) == '0') {
+        switch (*parser->current.end) {
+            // 0d1111 is a decimal number
+            case 'd':
+            case 'D':
+                parser->current.end++;
+                if (pm_char_is_decimal_digit(peek(parser))) {
+                    parser->current.end += pm_strspn_decimal_number_validate(parser, parser->current.end);
+                } else {
+                    match(parser, '_');
+                    pm_parser_err_current(parser, PM_ERR_INVALID_NUMBER_DECIMAL);
+                }
+
+                break;
+
+            // 0b1111 is a binary number
+            case 'b':
+            case 'B':
+                parser->current.end++;
+                if (pm_char_is_binary_digit(peek(parser))) {
+                    parser->current.end += pm_strspn_binary_number_validate(parser, parser->current.end);
+                } else {
+                    match(parser, '_');
+                    pm_parser_err_current(parser, PM_ERR_INVALID_NUMBER_BINARY);
+                }
+
+                parser->integer_base = PM_INTEGER_BASE_FLAGS_BINARY;
+                break;
+
+            // 0o1111 is an octal number
+            case 'o':
+            case 'O':
+                parser->current.end++;
+                if (pm_char_is_octal_digit(peek(parser))) {
+                    parser->current.end += pm_strspn_octal_number_validate(parser, parser->current.end);
+                } else {
+                    match(parser, '_');
+                    pm_parser_err_current(parser, PM_ERR_INVALID_NUMBER_OCTAL);
+                }
+
+                parser->integer_base = PM_INTEGER_BASE_FLAGS_OCTAL;
+                break;
+
+            // 01111 is an octal number
+            case '_':
+            case '0':
+            case '1':
+            case '2':
+            case '3':
+            case '4':
+            case '5':
+            case '6':
+            case '7':
+                parser->current.end += pm_strspn_octal_number_validate(parser, parser->current.end);
+                parser->integer_base = PM_INTEGER_BASE_FLAGS_OCTAL;
+                break;
+
+            // 0x1111 is a hexadecimal number
+            case 'x':
+            case 'X':
+                parser->current.end++;
+                if (pm_char_is_hexadecimal_digit(peek(parser))) {
+                    parser->current.end += pm_strspn_hexadecimal_number_validate(parser, parser->current.end);
+                } else {
+                    match(parser, '_');
+                    pm_parser_err_current(parser, PM_ERR_INVALID_NUMBER_HEXADECIMAL);
+                }
+
+                parser->integer_base = PM_INTEGER_BASE_FLAGS_HEXADECIMAL;
+                break;
+
+            // 0.xxx is a float
+            case '.': {
+                type = lex_optional_float_suffix(parser, seen_e);
+                break;
+            }
+
+            // 0exxx is a float
+            case 'e':
+            case 'E': {
+                type = lex_optional_float_suffix(parser, seen_e);
+                break;
+            }
+        }
+    } else {
+        // If it didn't start with a 0, then we'll lex as far as we can into a
+        // decimal number.
+        parser->current.end += pm_strspn_decimal_number_validate(parser, parser->current.end);
+
+        // Afterward, we'll lex as far as we can into an optional float suffix.
+        type = lex_optional_float_suffix(parser, seen_e);
+    }
+
+    // At this point we have a completed number, but we want to provide the user
+    // with a good experience if they put an additional .xxx fractional
+    // component on the end, so we'll check for that here.
+    if (peek_offset(parser, 0) == '.' && pm_char_is_decimal_digit(peek_offset(parser, 1))) {
+        const uint8_t *fraction_start = parser->current.end;
+        const uint8_t *fraction_end = parser->current.end + 2;
+        fraction_end += pm_strspn_decimal_digit(fraction_end, parser->end - fraction_end);
+        pm_parser_err(parser, fraction_start, fraction_end, PM_ERR_INVALID_NUMBER_FRACTION);
+    }
+
+    return type;
+}
+
+static pm_token_type_t
+lex_numeric(pm_parser_t *parser) {
+    pm_token_type_t type = PM_TOKEN_INTEGER;
+    parser->integer_base = PM_INTEGER_BASE_FLAGS_DECIMAL;
+
+    if (parser->current.end < parser->end) {
+        bool seen_e = false;
+        type = lex_numeric_prefix(parser, &seen_e);
+
+        const uint8_t *end = parser->current.end;
+        pm_token_type_t suffix_type = type;
+
+        if (type == PM_TOKEN_INTEGER) {
+            if (match(parser, 'r')) {
+                suffix_type = PM_TOKEN_INTEGER_RATIONAL;
+
+                if (match(parser, 'i')) {
+                    suffix_type = PM_TOKEN_INTEGER_RATIONAL_IMAGINARY;
+                }
+            } else if (match(parser, 'i')) {
+                suffix_type = PM_TOKEN_INTEGER_IMAGINARY;
+            }
+        } else {
+            if (!seen_e && match(parser, 'r')) {
+                suffix_type = PM_TOKEN_FLOAT_RATIONAL;
+
+                if (match(parser, 'i')) {
+                    suffix_type = PM_TOKEN_FLOAT_RATIONAL_IMAGINARY;
+                }
+            } else if (match(parser, 'i')) {
+                suffix_type = PM_TOKEN_FLOAT_IMAGINARY;
+            }
+        }
+
+        const uint8_t b = peek(parser);
+        if (b != '\0' && (b >= 0x80 || ((b >= 'a' && b <= 'z') || (b >= 'A' && b <= 'Z')) || b == '_')) {
+            parser->current.end = end;
+        } else {
+            type = suffix_type;
+        }
+    }
+
+    return type;
+}
+
+static pm_token_type_t
+lex_global_variable(pm_parser_t *parser) {
+    if (parser->current.end >= parser->end) {
+        pm_parser_err_token(parser, &parser->current, PM_ERR_GLOBAL_VARIABLE_BARE);
+        return PM_TOKEN_GLOBAL_VARIABLE;
+    }
+
+    // True if multiple characters are allowed after the declaration of the
+    // global variable. Not true when it starts with "$-".
+    bool allow_multiple = true;
+
+    switch (*parser->current.end) {
+        case '~':  // $~: match-data
+        case '*':  // $*: argv
+        case '$':  // $$: pid
+        case '?':  // $?: last status
+        case '!':  // $!: error string
+        case '@':  // $@: error position
+        case '/':  // $/: input record separator
+        case '\\': // $\: output record separator
+        case ';':  // $;: field separator
+        case ',':  // $,: output field separator
+        case '.':  // $.: last read line number
+        case '=':  // $=: ignorecase
+        case ':':  // $:: load path
+        case '<':  // $<: reading filename
+        case '>':  // $>: default output handle
+        case '\"': // $": already loaded files
+            parser->current.end++;
+            return PM_TOKEN_GLOBAL_VARIABLE;
+
+        case '&':  // $&: last match
+        case '`':  // $`: string before last match
+        case '\'': // $': string after last match
+        case '+':  // $+: string matches last paren.
+            parser->current.end++;
+            return lex_state_p(parser, PM_LEX_STATE_FNAME) ? PM_TOKEN_GLOBAL_VARIABLE : PM_TOKEN_BACK_REFERENCE;
+
+        case '0': {
+            parser->current.end++;
+            size_t width;
+
+            if ((width = char_is_identifier(parser, parser->current.end, parser->end - parser->current.end)) > 0) {
+                do {
+                    parser->current.end += width;
+                } while ((width = char_is_identifier(parser, parser->current.end, parser->end - parser->current.end)) > 0);
+
+                // $0 isn't allowed to be followed by anything.
+                pm_diagnostic_id_t diag_id = parser->version == PM_OPTIONS_VERSION_CRUBY_3_3 ? PM_ERR_INVALID_VARIABLE_GLOBAL_3_3 : PM_ERR_INVALID_VARIABLE_GLOBAL;
+                PM_PARSER_ERR_TOKEN_FORMAT_CONTENT(parser, parser->current, diag_id);
+            }
+
+            return PM_TOKEN_GLOBAL_VARIABLE;
+        }
+
+        case '1':
+        case '2':
+        case '3':
+        case '4':
+        case '5':
+        case '6':
+        case '7':
+        case '8':
+        case '9':
+            parser->current.end += pm_strspn_decimal_digit(parser->current.end, parser->end - parser->current.end);
+            return lex_state_p(parser, PM_LEX_STATE_FNAME) ? PM_TOKEN_GLOBAL_VARIABLE : PM_TOKEN_NUMBERED_REFERENCE;
+
+        case '-':
+            parser->current.end++;
+            allow_multiple = false;
+            PRISM_FALLTHROUGH
+        default: {
+            size_t width;
+
+            if ((width = char_is_identifier(parser, parser->current.end, parser->end - parser->current.end)) > 0) {
+                do {
+                    parser->current.end += width;
+                } while (allow_multiple && (width = char_is_identifier(parser, parser->current.end, parser->end - parser->current.end)) > 0);
+            } else if (pm_char_is_whitespace(peek(parser))) {
+                // If we get here, then we have a $ followed by whitespace,
+                // which is not allowed.
+                pm_parser_err_token(parser, &parser->current, PM_ERR_GLOBAL_VARIABLE_BARE);
+            } else {
+                // If we get here, then we have a $ followed by something that
+                // isn't recognized as a global variable.
+                pm_diagnostic_id_t diag_id = parser->version == PM_OPTIONS_VERSION_CRUBY_3_3 ? PM_ERR_INVALID_VARIABLE_GLOBAL_3_3 : PM_ERR_INVALID_VARIABLE_GLOBAL;
+                const uint8_t *end = parser->current.end + parser->encoding->char_width(parser->current.end, parser->end - parser->current.end);
+                PM_PARSER_ERR_FORMAT(parser, parser->current.start, end, diag_id, (int) (end - parser->current.start), (const char *) parser->current.start);
+            }
+
+            return PM_TOKEN_GLOBAL_VARIABLE;
+        }
+    }
+}
+
+/**
+ * This function checks if the current token matches a keyword. If it does, it
+ * returns the token type. Otherwise, it returns PM_TOKEN_EOF. The arguments are as follows:
+ *
+ * * `parser` - the parser object
+ * * `current_start` - pointer to the start of the current token
+ * * `value` - the literal string that we're checking for
+ * * `vlen` - the length of the token
+ * * `state` - the state that we should transition to if the token matches
+ * * `type` - the expected token type
+ * * `modifier_type` - the expected modifier token type
+ */
+static inline pm_token_type_t
+lex_keyword(pm_parser_t *parser, const uint8_t *current_start, const char *value, size_t vlen, pm_lex_state_t state, pm_token_type_t type, pm_token_type_t modifier_type) {
+    if (memcmp(current_start, value, vlen) == 0) {
+        pm_lex_state_t last_state = parser->lex_state;
+
+        if (parser->lex_state & PM_LEX_STATE_FNAME) {
+            lex_state_set(parser, PM_LEX_STATE_ENDFN);
+        } else {
+            lex_state_set(parser, state);
+            if (state == PM_LEX_STATE_BEG) {
+                parser->command_start = true;
+            }
+
+            if ((modifier_type != PM_TOKEN_EOF) && !(last_state & (PM_LEX_STATE_BEG | PM_LEX_STATE_LABELED | PM_LEX_STATE_CLASS))) {
+                lex_state_set(parser, PM_LEX_STATE_BEG | PM_LEX_STATE_LABEL);
+                return modifier_type;
+            }
+        }
+
+        return type;
+    }
+
+    return PM_TOKEN_EOF;
+}
+
+static pm_token_type_t
+lex_identifier(pm_parser_t *parser, bool previous_command_start) {
+    // Lex as far as we can into the current identifier.
+    size_t width;
+    const uint8_t *end = parser->end;
+    const uint8_t *current_start = parser->current.start;
+    const uint8_t *current_end = parser->current.end;
+    bool encoding_changed = parser->encoding_changed;
+
+    if (encoding_changed) {
+        while ((width = char_is_identifier(parser, current_end, end - current_end)) > 0) {
+            current_end += width;
+        }
+    } else {
+        while ((width = char_is_identifier_utf8(current_end, end - current_end)) > 0) {
+            current_end += width;
+        }
+    }
+    parser->current.end = current_end;
+
+    // Now cache the length of the identifier so that we can quickly compare it
+    // against known keywords.
+    width = (size_t) (current_end - current_start);
+
+    if (current_end < end) {
+        if (((current_end + 1 >= end) || (current_end[1] != '=')) && (match(parser, '!') || match(parser, '?'))) {
+            // First we'll attempt to extend the identifier by a ! or ?. Then we'll
+            // check if we're returning the defined? keyword or just an identifier.
+            width++;
+
+            if (
+                ((lex_state_p(parser, PM_LEX_STATE_LABEL | PM_LEX_STATE_ENDFN) && !previous_command_start) || lex_state_arg_p(parser)) &&
+                (peek(parser) == ':') && (peek_offset(parser, 1) != ':')
+            ) {
+                // If we're in a position where we can accept a : at the end of an
+                // identifier, then we'll optionally accept it.
+                lex_state_set(parser, PM_LEX_STATE_ARG | PM_LEX_STATE_LABELED);
+                (void) match(parser, ':');
+                return PM_TOKEN_LABEL;
+            }
+
+            if (parser->lex_state != PM_LEX_STATE_DOT) {
+                if (width == 8 && (lex_keyword(parser, current_start, "defined?", width, PM_LEX_STATE_ARG, PM_TOKEN_KEYWORD_DEFINED, PM_TOKEN_EOF) != PM_TOKEN_EOF)) {
+                    return PM_TOKEN_KEYWORD_DEFINED;
+                }
+            }
+
+            return PM_TOKEN_METHOD_NAME;
+        }
+
+        if (lex_state_p(parser, PM_LEX_STATE_FNAME) && peek_offset(parser, 1) != '~' && peek_offset(parser, 1) != '>' && (peek_offset(parser, 1) != '=' || peek_offset(parser, 2) == '>') && match(parser, '=')) {
+            // If we're in a position where we can accept a = at the end of an
+            // identifier, then we'll optionally accept it.
+            return PM_TOKEN_IDENTIFIER;
+        }
+
+        if (
+            ((lex_state_p(parser, PM_LEX_STATE_LABEL | PM_LEX_STATE_ENDFN) && !previous_command_start) || lex_state_arg_p(parser)) &&
+            peek(parser) == ':' && peek_offset(parser, 1) != ':'
+        ) {
+            // If we're in a position where we can accept a : at the end of an
+            // identifier, then we'll optionally accept it.
+            lex_state_set(parser, PM_LEX_STATE_ARG | PM_LEX_STATE_LABELED);
+            (void) match(parser, ':');
+            return PM_TOKEN_LABEL;
+        }
+    }
+
+    if (parser->lex_state != PM_LEX_STATE_DOT) {
+        pm_token_type_t type;
+        switch (width) {
+            case 2:
+                if (lex_keyword(parser, current_start, "do", width, PM_LEX_STATE_BEG, PM_TOKEN_KEYWORD_DO, PM_TOKEN_EOF) != PM_TOKEN_EOF) {
+                    if (pm_do_loop_stack_p(parser)) {
+                        return PM_TOKEN_KEYWORD_DO_LOOP;
+                    }
+                    return PM_TOKEN_KEYWORD_DO;
+                }
+
+                if ((type = lex_keyword(parser, current_start, "if", width, PM_LEX_STATE_BEG, PM_TOKEN_KEYWORD_IF, PM_TOKEN_KEYWORD_IF_MODIFIER)) != PM_TOKEN_EOF) return type;
+                if ((type = lex_keyword(parser, current_start, "in", width, PM_LEX_STATE_BEG, PM_TOKEN_KEYWORD_IN, PM_TOKEN_EOF)) != PM_TOKEN_EOF) return type;
+                if ((type = lex_keyword(parser, current_start, "or", width, PM_LEX_STATE_BEG, PM_TOKEN_KEYWORD_OR, PM_TOKEN_EOF)) != PM_TOKEN_EOF) return type;
+                break;
+            case 3:
+                if ((type = lex_keyword(parser, current_start, "and", width, PM_LEX_STATE_BEG, PM_TOKEN_KEYWORD_AND, PM_TOKEN_EOF)) != PM_TOKEN_EOF) return type;
+                if ((type = lex_keyword(parser, current_start, "def", width, PM_LEX_STATE_FNAME, PM_TOKEN_KEYWORD_DEF, PM_TOKEN_EOF)) != PM_TOKEN_EOF) return type;
+                if ((type = lex_keyword(parser, current_start, "end", width, PM_LEX_STATE_END, PM_TOKEN_KEYWORD_END, PM_TOKEN_EOF)) != PM_TOKEN_EOF) return type;
+                if ((type = lex_keyword(parser, current_start, "END", width, PM_LEX_STATE_END, PM_TOKEN_KEYWORD_END_UPCASE, PM_TOKEN_EOF)) != PM_TOKEN_EOF) return type;
+                if ((type = lex_keyword(parser, current_start, "for", width, PM_LEX_STATE_BEG, PM_TOKEN_KEYWORD_FOR, PM_TOKEN_EOF)) != PM_TOKEN_EOF) return type;
+                if ((type = lex_keyword(parser, current_start, "nil", width, PM_LEX_STATE_END, PM_TOKEN_KEYWORD_NIL, PM_TOKEN_EOF)) != PM_TOKEN_EOF) return type;
+                if ((type = lex_keyword(parser, current_start, "not", width, PM_LEX_STATE_ARG, PM_TOKEN_KEYWORD_NOT, PM_TOKEN_EOF)) != PM_TOKEN_EOF) return type;
+                break;
+            case 4:
+                if ((type = lex_keyword(parser, current_start, "case", width, PM_LEX_STATE_BEG, PM_TOKEN_KEYWORD_CASE, PM_TOKEN_EOF)) != PM_TOKEN_EOF) return type;
+                if ((type = lex_keyword(parser, current_start, "else", width, PM_LEX_STATE_BEG, PM_TOKEN_KEYWORD_ELSE, PM_TOKEN_EOF)) != PM_TOKEN_EOF) return type;
+                if ((type = lex_keyword(parser, current_start, "next", width, PM_LEX_STATE_MID, PM_TOKEN_KEYWORD_NEXT, PM_TOKEN_EOF)) != PM_TOKEN_EOF) return type;
+                if ((type = lex_keyword(parser, current_start, "redo", width, PM_LEX_STATE_END, PM_TOKEN_KEYWORD_REDO, PM_TOKEN_EOF)) != PM_TOKEN_EOF) return type;
+                if ((type = lex_keyword(parser, current_start, "self", width, PM_LEX_STATE_END, PM_TOKEN_KEYWORD_SELF, PM_TOKEN_EOF)) != PM_TOKEN_EOF) return type;
+                if ((type = lex_keyword(parser, current_start, "then", width, PM_LEX_STATE_BEG, PM_TOKEN_KEYWORD_THEN, PM_TOKEN_EOF)) != PM_TOKEN_EOF) return type;
+                if ((type = lex_keyword(parser, current_start, "true", width, PM_LEX_STATE_END, PM_TOKEN_KEYWORD_TRUE, PM_TOKEN_EOF)) != PM_TOKEN_EOF) return type;
+                if ((type = lex_keyword(parser, current_start, "when", width, PM_LEX_STATE_BEG, PM_TOKEN_KEYWORD_WHEN, PM_TOKEN_EOF)) != PM_TOKEN_EOF) return type;
+                break;
+            case 5:
+                if ((type = lex_keyword(parser, current_start, "alias", width, PM_LEX_STATE_FNAME | PM_LEX_STATE_FITEM, PM_TOKEN_KEYWORD_ALIAS, PM_TOKEN_EOF)) != PM_TOKEN_EOF) return type;
+                if ((type = lex_keyword(parser, current_start, "begin", width, PM_LEX_STATE_BEG, PM_TOKEN_KEYWORD_BEGIN, PM_TOKEN_EOF)) != PM_TOKEN_EOF) return type;
+                if ((type = lex_keyword(parser, current_start, "BEGIN", width, PM_LEX_STATE_END, PM_TOKEN_KEYWORD_BEGIN_UPCASE, PM_TOKEN_EOF)) != PM_TOKEN_EOF) return type;
+                if ((type = lex_keyword(parser, current_start, "break", width, PM_LEX_STATE_MID, PM_TOKEN_KEYWORD_BREAK, PM_TOKEN_EOF)) != PM_TOKEN_EOF) return type;
+                if ((type = lex_keyword(parser, current_start, "class", width, PM_LEX_STATE_CLASS, PM_TOKEN_KEYWORD_CLASS, PM_TOKEN_EOF)) != PM_TOKEN_EOF) return type;
+                if ((type = lex_keyword(parser, current_start, "elsif", width, PM_LEX_STATE_BEG, PM_TOKEN_KEYWORD_ELSIF, PM_TOKEN_EOF)) != PM_TOKEN_EOF) return type;
+                if ((type = lex_keyword(parser, current_start, "false", width, PM_LEX_STATE_END, PM_TOKEN_KEYWORD_FALSE, PM_TOKEN_EOF)) != PM_TOKEN_EOF) return type;
+                if ((type = lex_keyword(parser, current_start, "retry", width, PM_LEX_STATE_END, PM_TOKEN_KEYWORD_RETRY, PM_TOKEN_EOF)) != PM_TOKEN_EOF) return type;
+                if ((type = lex_keyword(parser, current_start, "super", width, PM_LEX_STATE_ARG, PM_TOKEN_KEYWORD_SUPER, PM_TOKEN_EOF)) != PM_TOKEN_EOF) return type;
+                if ((type = lex_keyword(parser, current_start, "undef", width, PM_LEX_STATE_FNAME | PM_LEX_STATE_FITEM, PM_TOKEN_KEYWORD_UNDEF, PM_TOKEN_EOF)) != PM_TOKEN_EOF) return type;
+                if ((type = lex_keyword(parser, current_start, "until", width, PM_LEX_STATE_BEG, PM_TOKEN_KEYWORD_UNTIL, PM_TOKEN_KEYWORD_UNTIL_MODIFIER)) != PM_TOKEN_EOF) return type;
+                if ((type = lex_keyword(parser, current_start, "while", width, PM_LEX_STATE_BEG, PM_TOKEN_KEYWORD_WHILE, PM_TOKEN_KEYWORD_WHILE_MODIFIER)) != PM_TOKEN_EOF) return type;
+                if ((type = lex_keyword(parser, current_start, "yield", width, PM_LEX_STATE_ARG, PM_TOKEN_KEYWORD_YIELD, PM_TOKEN_EOF)) != PM_TOKEN_EOF) return type;
+                break;
+            case 6:
+                if ((type = lex_keyword(parser, current_start, "ensure", width, PM_LEX_STATE_BEG, PM_TOKEN_KEYWORD_ENSURE, PM_TOKEN_EOF)) != PM_TOKEN_EOF) return type;
+                if ((type = lex_keyword(parser, current_start, "module", width, PM_LEX_STATE_BEG, PM_TOKEN_KEYWORD_MODULE, PM_TOKEN_EOF)) != PM_TOKEN_EOF) return type;
+                if ((type = lex_keyword(parser, current_start, "rescue", width, PM_LEX_STATE_MID, PM_TOKEN_KEYWORD_RESCUE, PM_TOKEN_KEYWORD_RESCUE_MODIFIER)) != PM_TOKEN_EOF) return type;
+                if ((type = lex_keyword(parser, current_start, "return", width, PM_LEX_STATE_MID, PM_TOKEN_KEYWORD_RETURN, PM_TOKEN_EOF)) != PM_TOKEN_EOF) return type;
+                if ((type = lex_keyword(parser, current_start, "unless", width, PM_LEX_STATE_BEG, PM_TOKEN_KEYWORD_UNLESS, PM_TOKEN_KEYWORD_UNLESS_MODIFIER)) != PM_TOKEN_EOF) return type;
+                break;
+            case 8:
+                if ((type = lex_keyword(parser, current_start, "__LINE__", width, PM_LEX_STATE_END, PM_TOKEN_KEYWORD___LINE__, PM_TOKEN_EOF)) != PM_TOKEN_EOF) return type;
+                if ((type = lex_keyword(parser, current_start, "__FILE__", width, PM_LEX_STATE_END, PM_TOKEN_KEYWORD___FILE__, PM_TOKEN_EOF)) != PM_TOKEN_EOF) return type;
+                break;
+            case 12:
+                if ((type = lex_keyword(parser, current_start, "__ENCODING__", width, PM_LEX_STATE_END, PM_TOKEN_KEYWORD___ENCODING__, PM_TOKEN_EOF)) != PM_TOKEN_EOF) return type;
+                break;
+        }
+    }
+
+    if (encoding_changed) {
+        return parser->encoding->isupper_char(current_start, end - current_start) ? PM_TOKEN_CONSTANT : PM_TOKEN_IDENTIFIER;
+    }
+    return pm_encoding_utf_8_isupper_char(current_start, end - current_start) ? PM_TOKEN_CONSTANT : PM_TOKEN_IDENTIFIER;
+}
+
+/**
+ * Returns true if the current token that the parser is considering is at the
+ * beginning of a line or the beginning of the source.
+ */
+static bool
+current_token_starts_line(pm_parser_t *parser) {
+    return (parser->current.start == parser->start) || (parser->current.start[-1] == '\n');
+}
+
+/**
+ * When we hit a # while lexing something like a string, we need to potentially
+ * handle interpolation. This function performs that check. It returns a token
+ * type representing what it found. Those cases are:
+ *
+ * * PM_TOKEN_NOT_PROVIDED - No interpolation was found at this point. The
+ *     caller should keep lexing.
+ * * PM_TOKEN_STRING_CONTENT - No interpolation was found at this point. The
+ *     caller should return this token type.
+ * * PM_TOKEN_EMBEXPR_BEGIN - An embedded expression was found. The caller
+ *     should return this token type.
+ * * PM_TOKEN_EMBVAR - An embedded variable was found. The caller should return
+ *     this token type.
+ */
+static pm_token_type_t
+lex_interpolation(pm_parser_t *parser, const uint8_t *pound) {
+    // If there is no content following this #, then we're at the end of
+    // the string and we can safely return string content.
+    if (pound + 1 >= parser->end) {
+        parser->current.end = pound + 1;
+        return PM_TOKEN_STRING_CONTENT;
+    }
+
+    // Now we'll check against the character that follows the #. If it constitutes
+    // valid interplation, we'll handle that, otherwise we'll return
+    // PM_TOKEN_NOT_PROVIDED.
+    switch (pound[1]) {
+        case '@': {
+            // In this case we may have hit an embedded instance or class variable.
+            if (pound + 2 >= parser->end) {
+                parser->current.end = pound + 1;
+                return PM_TOKEN_STRING_CONTENT;
+            }
+
+            // If we're looking at a @ and there's another @, then we'll skip past the
+            // second @.
+            const uint8_t *variable = pound + 2;
+            if (*variable == '@' && pound + 3 < parser->end) variable++;
+
+            if (char_is_identifier_start(parser, variable, parser->end - variable)) {
+                // At this point we're sure that we've either hit an embedded instance
+                // or class variable. In this case we'll first need to check if we've
+                // already consumed content.
+                if (pound > parser->current.start) {
+                    parser->current.end = pound;
+                    return PM_TOKEN_STRING_CONTENT;
+                }
+
+                // Otherwise we need to return the embedded variable token
+                // and then switch to the embedded variable lex mode.
+                lex_mode_push(parser, (pm_lex_mode_t) { .mode = PM_LEX_EMBVAR });
+                parser->current.end = pound + 1;
+                return PM_TOKEN_EMBVAR;
+            }
+
+            // If we didn't get a valid interpolation, then this is just regular
+            // string content. This is like if we get "#@-". In this case the caller
+            // should keep lexing.
+            parser->current.end = pound + 1;
+            return PM_TOKEN_NOT_PROVIDED;
+        }
+        case '$':
+            // In this case we may have hit an embedded global variable. If there's
+            // not enough room, then we'll just return string content.
+            if (pound + 2 >= parser->end) {
+                parser->current.end = pound + 1;
+                return PM_TOKEN_STRING_CONTENT;
+            }
+
+            // This is the character that we're going to check to see if it is the
+            // start of an identifier that would indicate that this is a global
+            // variable.
+            const uint8_t *check = pound + 2;
+
+            if (pound[2] == '-') {
+                if (pound + 3 >= parser->end) {
+                    parser->current.end = pound + 2;
+                    return PM_TOKEN_STRING_CONTENT;
+                }
+
+                check++;
+            }
+
+            // If the character that we're going to check is the start of an
+            // identifier, or we don't have a - and the character is a decimal number
+            // or a global name punctuation character, then we've hit an embedded
+            // global variable.
+            if (
+                char_is_identifier_start(parser, check, parser->end - check) ||
+                (pound[2] != '-' && (pm_char_is_decimal_digit(pound[2]) || char_is_global_name_punctuation(pound[2])))
+            ) {
+                // In this case we've hit an embedded global variable. First check to
+                // see if we've already consumed content. If we have, then we need to
+                // return that content as string content first.
+                if (pound > parser->current.start) {
+                    parser->current.end = pound;
+                    return PM_TOKEN_STRING_CONTENT;
+                }
+
+                // Otherwise, we need to return the embedded variable token and switch
+                // to the embedded variable lex mode.
+                lex_mode_push(parser, (pm_lex_mode_t) { .mode = PM_LEX_EMBVAR });
+                parser->current.end = pound + 1;
+                return PM_TOKEN_EMBVAR;
+            }
+
+            // In this case we've hit a #$ that does not indicate a global variable.
+            // In this case we'll continue lexing past it.
+            parser->current.end = pound + 1;
+            return PM_TOKEN_NOT_PROVIDED;
+        case '{':
+            // In this case it's the start of an embedded expression. If we have
+            // already consumed content, then we need to return that content as string
+            // content first.
+            if (pound > parser->current.start) {
+                parser->current.end = pound;
+                return PM_TOKEN_STRING_CONTENT;
+            }
+
+            parser->enclosure_nesting++;
+
+            // Otherwise we'll skip past the #{ and begin lexing the embedded
+            // expression.
+            lex_mode_push(parser, (pm_lex_mode_t) { .mode = PM_LEX_EMBEXPR });
+            parser->current.end = pound + 2;
+            parser->command_start = true;
+            pm_do_loop_stack_push(parser, false);
+            return PM_TOKEN_EMBEXPR_BEGIN;
+        default:
+            // In this case we've hit a # that doesn't constitute interpolation. We'll
+            // mark that by returning the not provided token type. This tells the
+            // consumer to keep lexing forward.
+            parser->current.end = pound + 1;
+            return PM_TOKEN_NOT_PROVIDED;
+    }
+}
+
+static const uint8_t PM_ESCAPE_FLAG_NONE = 0x0;
+static const uint8_t PM_ESCAPE_FLAG_CONTROL = 0x1;
+static const uint8_t PM_ESCAPE_FLAG_META = 0x2;
+static const uint8_t PM_ESCAPE_FLAG_SINGLE = 0x4;
+static const uint8_t PM_ESCAPE_FLAG_REGEXP = 0x8;
+
+/**
+ * This is a lookup table for whether or not an ASCII character is printable.
+ */
+static const bool ascii_printable_chars[] = {
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1,
+    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0
+};
+
+static inline bool
+char_is_ascii_printable(const uint8_t b) {
+    return (b < 0x80) && ascii_printable_chars[b];
+}
+
+/**
+ * Return the value that a hexadecimal digit character represents. For example,
+ * transform 'a' into 10, 'b' into 11, etc.
+ */
+static inline uint8_t
+escape_hexadecimal_digit(const uint8_t value) {
+    return (uint8_t) ((value <= '9') ? (value - '0') : (value & 0x7) + 9);
+}
+
+/**
+ * Scan the 4 digits of a Unicode escape into the value. Returns the number of
+ * digits scanned. This function assumes that the characters have already been
+ * validated.
+ */
+static inline uint32_t
+escape_unicode(pm_parser_t *parser, const uint8_t *string, size_t length) {
+    uint32_t value = 0;
+    for (size_t index = 0; index < length; index++) {
+        if (index != 0) value <<= 4;
+        value |= escape_hexadecimal_digit(string[index]);
+    }
+
+    // Here we're going to verify that the value is actually a valid Unicode
+    // codepoint and not a surrogate pair.
+    if (value >= 0xD800 && value <= 0xDFFF) {
+        pm_parser_err(parser, string, string + length, PM_ERR_ESCAPE_INVALID_UNICODE);
+        return 0xFFFD;
+    }
+
+    return value;
+}
+
+/**
+ * Escape a single character value based on the given flags.
+ */
+static inline uint8_t
+escape_byte(uint8_t value, const uint8_t flags) {
+    if (flags & PM_ESCAPE_FLAG_CONTROL) value &= 0x9f;
+    if (flags & PM_ESCAPE_FLAG_META) value |= 0x80;
+    return value;
+}
+
+/**
+ * Write a unicode codepoint to the given buffer.
+ */
+static inline void
+escape_write_unicode(pm_parser_t *parser, pm_buffer_t *buffer, const uint8_t flags, const uint8_t *start, const uint8_t *end, uint32_t value) {
+    // \u escape sequences in string-like structures implicitly change the
+    // encoding to UTF-8 if they are >= 0x80 or if they are used in a character
+    // literal.
+    if (value >= 0x80 || flags & PM_ESCAPE_FLAG_SINGLE) {
+        if (parser->explicit_encoding != NULL && parser->explicit_encoding != PM_ENCODING_UTF_8_ENTRY) {
+            PM_PARSER_ERR_FORMAT(parser, start, end, PM_ERR_MIXED_ENCODING, parser->explicit_encoding->name);
+        }
+
+        parser->explicit_encoding = PM_ENCODING_UTF_8_ENTRY;
+    }
+
+    if (!pm_buffer_append_unicode_codepoint(buffer, value)) {
+        pm_parser_err(parser, start, end, PM_ERR_ESCAPE_INVALID_UNICODE);
+        pm_buffer_append_byte(buffer, 0xEF);
+        pm_buffer_append_byte(buffer, 0xBF);
+        pm_buffer_append_byte(buffer, 0xBD);
+    }
+}
+
+/**
+ * When you're writing a byte to the unescape buffer, if the byte is non-ASCII
+ * (i.e., the top bit is set) then it locks in the encoding.
+ */
+static inline void
+escape_write_byte_encoded(pm_parser_t *parser, pm_buffer_t *buffer, uint8_t byte) {
+    if (byte >= 0x80) {
+        if (parser->explicit_encoding != NULL && parser->explicit_encoding == PM_ENCODING_UTF_8_ENTRY && parser->encoding != PM_ENCODING_UTF_8_ENTRY) {
+            PM_PARSER_ERR_TOKEN_FORMAT(parser, parser->current, PM_ERR_MIXED_ENCODING, parser->encoding->name);
+        }
+
+        parser->explicit_encoding = parser->encoding;
+    }
+
+    pm_buffer_append_byte(buffer, byte);
+}
+
+/**
+ * The regular expression engine doesn't support the same escape sequences as
+ * Ruby does. So first we have to read the escape sequence, and then we have to
+ * format it like the regular expression engine expects it. For example, in Ruby
+ * if we have:
+ *
+ *     /\M-\C-?/
+ *
+ * then the first byte is actually 255, so we have to rewrite this as:
+ *
+ *     /\xFF/
+ *
+ * Note that in this case there is a literal \ byte in the regular expression
+ * source so that the regular expression engine will perform its own unescaping.
+ */
+static inline void
+escape_write_byte(pm_parser_t *parser, pm_buffer_t *buffer, pm_buffer_t *regular_expression_buffer, uint8_t flags, uint8_t byte) {
+    if (flags & PM_ESCAPE_FLAG_REGEXP) {
+        pm_buffer_append_format(regular_expression_buffer, "\\x%02X", byte);
+    }
+
+    escape_write_byte_encoded(parser, buffer, byte);
+}
+
+/**
+ * Write each byte of the given escaped character into the buffer.
+ */
+static inline void
+escape_write_escape_encoded(pm_parser_t *parser, pm_buffer_t *buffer, pm_buffer_t *regular_expression_buffer, uint8_t flags) {
+    size_t width;
+    if (parser->encoding_changed) {
+        width = parser->encoding->char_width(parser->current.end, parser->end - parser->current.end);
+    } else {
+        width = pm_encoding_utf_8_char_width(parser->current.end, parser->end - parser->current.end);
+    }
+
+    if (width == 1) {
+        escape_write_byte(parser, buffer, regular_expression_buffer, flags, escape_byte(*parser->current.end++, flags));
+    } else if (width > 1) {
+        // Valid multibyte character.  Just ignore escape.
+        pm_buffer_t *b = (flags & PM_ESCAPE_FLAG_REGEXP) ? regular_expression_buffer : buffer;
+        pm_buffer_append_bytes(b, parser->current.end, width);
+        parser->current.end += width;
+    } else {
+        // Assume the next character wasn't meant to be part of this escape
+        // sequence since it is invalid. Add an error and move on.
+        parser->current.end++;
+        pm_parser_err_current(parser, PM_ERR_ESCAPE_INVALID_CONTROL);
+    }
+}
+
+/**
+ * Warn about using a space or a tab character in an escape, as opposed to using
+ * \\s or \\t. Note that we can quite copy the source because the warning
+ * message replaces \\c with \\C.
+ */
+static void
+escape_read_warn(pm_parser_t *parser, uint8_t flags, uint8_t flag, const char *type) {
+#define FLAG(value) ((value & PM_ESCAPE_FLAG_CONTROL) ? "\\C-" : (value & PM_ESCAPE_FLAG_META) ? "\\M-" : "")
+
+    PM_PARSER_WARN_TOKEN_FORMAT(
+        parser,
+        parser->current,
+        PM_WARN_INVALID_CHARACTER,
+        FLAG(flags),
+        FLAG(flag),
+        type
+    );
+
+#undef FLAG
+}
+
+/**
+ * Read the value of an escape into the buffer.
+ */
+static void
+escape_read(pm_parser_t *parser, pm_buffer_t *buffer, pm_buffer_t *regular_expression_buffer, uint8_t flags) {
+    uint8_t peeked = peek(parser);
+    switch (peeked) {
+        case '\\': {
+            parser->current.end++;
+            escape_write_byte(parser, buffer, regular_expression_buffer, flags, escape_byte('\\', flags));
+            return;
+        }
+        case '\'': {
+            parser->current.end++;
+            escape_write_byte(parser, buffer, regular_expression_buffer, flags, escape_byte('\'', flags));
+            return;
+        }
+        case 'a': {
+            parser->current.end++;
+            escape_write_byte(parser, buffer, regular_expression_buffer, flags, escape_byte('\a', flags));
+            return;
+        }
+        case 'b': {
+            parser->current.end++;
+            escape_write_byte(parser, buffer, regular_expression_buffer, flags, escape_byte('\b', flags));
+            return;
+        }
+        case 'e': {
+            parser->current.end++;
+            escape_write_byte(parser, buffer, regular_expression_buffer, flags, escape_byte('\033', flags));
+            return;
+        }
+        case 'f': {
+            parser->current.end++;
+            escape_write_byte(parser, buffer, regular_expression_buffer, flags, escape_byte('\f', flags));
+            return;
+        }
+        case 'n': {
+            parser->current.end++;
+            escape_write_byte(parser, buffer, regular_expression_buffer, flags, escape_byte('\n', flags));
+            return;
+        }
+        case 'r': {
+            parser->current.end++;
+            escape_write_byte(parser, buffer, regular_expression_buffer, flags, escape_byte('\r', flags));
+            return;
+        }
+        case 's': {
+            parser->current.end++;
+            escape_write_byte(parser, buffer, regular_expression_buffer, flags, escape_byte(' ', flags));
+            return;
+        }
+        case 't': {
+            parser->current.end++;
+            escape_write_byte(parser, buffer, regular_expression_buffer, flags, escape_byte('\t', flags));
+            return;
+        }
+        case 'v': {
+            parser->current.end++;
+            escape_write_byte(parser, buffer, regular_expression_buffer, flags, escape_byte('\v', flags));
+            return;
+        }
+        case '0': case '1': case '2': case '3': case '4': case '5': case '6': case '7': {
+            uint8_t value = (uint8_t) (*parser->current.end - '0');
+            parser->current.end++;
+
+            if (pm_char_is_octal_digit(peek(parser))) {
+                value = ((uint8_t) (value << 3)) | ((uint8_t) (*parser->current.end - '0'));
+                parser->current.end++;
+
+                if (pm_char_is_octal_digit(peek(parser))) {
+                    value = ((uint8_t) (value << 3)) | ((uint8_t) (*parser->current.end - '0'));
+                    parser->current.end++;
+                }
+            }
+
+            value = escape_byte(value, flags);
+            escape_write_byte(parser, buffer, regular_expression_buffer, flags, value);
+            return;
+        }
+        case 'x': {
+            const uint8_t *start = parser->current.end - 1;
+
+            parser->current.end++;
+            uint8_t byte = peek(parser);
+
+            if (pm_char_is_hexadecimal_digit(byte)) {
+                uint8_t value = escape_hexadecimal_digit(byte);
+                parser->current.end++;
+
+                byte = peek(parser);
+                if (pm_char_is_hexadecimal_digit(byte)) {
+                    value = (uint8_t) ((value << 4) | escape_hexadecimal_digit(byte));
+                    parser->current.end++;
+                }
+
+                value = escape_byte(value, flags);
+                if (flags & PM_ESCAPE_FLAG_REGEXP) {
+                    if (flags & (PM_ESCAPE_FLAG_CONTROL | PM_ESCAPE_FLAG_META)) {
+                        pm_buffer_append_format(regular_expression_buffer, "\\x%02X", value);
+                    } else {
+                        pm_buffer_append_bytes(regular_expression_buffer, start, (size_t) (parser->current.end - start));
+                    }
+                }
+
+                escape_write_byte_encoded(parser, buffer, value);
+            } else {
+                pm_parser_err_current(parser, PM_ERR_ESCAPE_INVALID_HEXADECIMAL);
+            }
+
+            return;
+        }
+        case 'u': {
+            const uint8_t *start = parser->current.end - 1;
+            parser->current.end++;
+
+            if (parser->current.end == parser->end) {
+                const uint8_t *start = parser->current.end - 2;
+                PM_PARSER_ERR_FORMAT(parser, start, parser->current.end, PM_ERR_ESCAPE_INVALID_UNICODE_SHORT, 2, start);
+            } else if (peek(parser) == '{') {
+                const uint8_t *unicode_codepoints_start = parser->current.end - 2;
+                parser->current.end++;
+
+                size_t whitespace;
+                while (true) {
+                    if ((whitespace = pm_strspn_inline_whitespace(parser->current.end, parser->end - parser->current.end)) > 0) {
+                        parser->current.end += whitespace;
+                    } else if (peek(parser) == '\\' && peek_offset(parser, 1) == 'n') {
+                        // This is super hacky, but it gets us nicer error
+                        // messages because we can still pass it off to the
+                        // regular expression engine even if we hit an
+                        // unterminated regular expression.
+                        parser->current.end += 2;
+                    } else {
+                        break;
+                    }
+                }
+
+                const uint8_t *extra_codepoints_start = NULL;
+                int codepoints_count = 0;
+
+                while ((parser->current.end < parser->end) && (*parser->current.end != '}')) {
+                    const uint8_t *unicode_start = parser->current.end;
+                    size_t hexadecimal_length = pm_strspn_hexadecimal_digit(parser->current.end, parser->end - parser->current.end);
+
+                    if (hexadecimal_length > 6) {
+                        // \u{nnnn} character literal allows only 1-6 hexadecimal digits
+                        pm_parser_err(parser, unicode_start, unicode_start + hexadecimal_length, PM_ERR_ESCAPE_INVALID_UNICODE_LONG);
+                    } else if (hexadecimal_length == 0) {
+                        // there are not hexadecimal characters
+
+                        if (flags & PM_ESCAPE_FLAG_REGEXP) {
+                            // If this is a regular expression, we are going to
+                            // let the regular expression engine handle this
+                            // error instead of us.
+                            pm_buffer_append_bytes(regular_expression_buffer, start, (size_t) (parser->current.end - start));
+                        } else {
+                            pm_parser_err(parser, parser->current.end, parser->current.end, PM_ERR_ESCAPE_INVALID_UNICODE);
+                            pm_parser_err(parser, parser->current.end, parser->current.end, PM_ERR_ESCAPE_INVALID_UNICODE_TERM);
+                        }
+
+                        return;
+                    }
+
+                    parser->current.end += hexadecimal_length;
+                    codepoints_count++;
+                    if (flags & PM_ESCAPE_FLAG_SINGLE && codepoints_count == 2) {
+                        extra_codepoints_start = unicode_start;
+                    }
+
+                    uint32_t value = escape_unicode(parser, unicode_start, hexadecimal_length);
+                    escape_write_unicode(parser, buffer, flags, unicode_start, parser->current.end, value);
+
+                    parser->current.end += pm_strspn_inline_whitespace(parser->current.end, parser->end - parser->current.end);
+                }
+
+                // ?\u{nnnn} character literal should contain only one codepoint
+                // and cannot be like ?\u{nnnn mmmm}.
+                if (flags & PM_ESCAPE_FLAG_SINGLE && codepoints_count > 1) {
+                    pm_parser_err(parser, extra_codepoints_start, parser->current.end - 1, PM_ERR_ESCAPE_INVALID_UNICODE_LITERAL);
+                }
+
+                if (parser->current.end == parser->end) {
+                    PM_PARSER_ERR_FORMAT(parser, start, parser->current.end, PM_ERR_ESCAPE_INVALID_UNICODE_LIST, (int) (parser->current.end - start), start);
+                } else if (peek(parser) == '}') {
+                    parser->current.end++;
+                } else {
+                    if (flags & PM_ESCAPE_FLAG_REGEXP) {
+                        // If this is a regular expression, we are going to let
+                        // the regular expression engine handle this error
+                        // instead of us.
+                        pm_buffer_append_bytes(regular_expression_buffer, start, (size_t) (parser->current.end - start));
+                    } else {
+                        pm_parser_err(parser, unicode_codepoints_start, parser->current.end, PM_ERR_ESCAPE_INVALID_UNICODE_TERM);
+                    }
+                }
+
+                if (flags & PM_ESCAPE_FLAG_REGEXP) {
+                    pm_buffer_append_bytes(regular_expression_buffer, unicode_codepoints_start, (size_t) (parser->current.end - unicode_codepoints_start));
+                }
+            } else {
+                size_t length = pm_strspn_hexadecimal_digit(parser->current.end, MIN(parser->end - parser->current.end, 4));
+
+                if (length == 0) {
+                    if (flags & PM_ESCAPE_FLAG_REGEXP) {
+                        pm_buffer_append_bytes(regular_expression_buffer, start, (size_t) (parser->current.end - start));
+                    } else {
+                        const uint8_t *start = parser->current.end - 2;
+                        PM_PARSER_ERR_FORMAT(parser, start, parser->current.end, PM_ERR_ESCAPE_INVALID_UNICODE_SHORT, 2, start);
+                    }
+                } else if (length == 4) {
+                    uint32_t value = escape_unicode(parser, parser->current.end, 4);
+
+                    if (flags & PM_ESCAPE_FLAG_REGEXP) {
+                        pm_buffer_append_bytes(regular_expression_buffer, start, (size_t) (parser->current.end + 4 - start));
+                    }
+
+                    escape_write_unicode(parser, buffer, flags, start, parser->current.end + 4, value);
+                    parser->current.end += 4;
+                } else {
+                    parser->current.end += length;
+
+                    if (flags & PM_ESCAPE_FLAG_REGEXP) {
+                        // If this is a regular expression, we are going to let
+                        // the regular expression engine handle this error
+                        // instead of us.
+                        pm_buffer_append_bytes(regular_expression_buffer, start, (size_t) (parser->current.end - start));
+                    } else {
+                        pm_parser_err_current(parser, PM_ERR_ESCAPE_INVALID_UNICODE);
+                    }
+                }
+            }
+
+            return;
+        }
+        case 'c': {
+            parser->current.end++;
+            if (flags & PM_ESCAPE_FLAG_CONTROL) {
+                pm_parser_err_current(parser, PM_ERR_ESCAPE_INVALID_CONTROL_REPEAT);
+            }
+
+            if (parser->current.end == parser->end) {
+                pm_parser_err_current(parser, PM_ERR_ESCAPE_INVALID_CONTROL);
+                return;
+            }
+
+            uint8_t peeked = peek(parser);
+            switch (peeked) {
+                case '?': {
+                    parser->current.end++;
+                    escape_write_byte(parser, buffer, regular_expression_buffer, flags, escape_byte(0x7f, flags));
+                    return;
+                }
+                case '\\':
+                    parser->current.end++;
+
+                    if (match(parser, 'u') || match(parser, 'U')) {
+                        pm_parser_err(parser, parser->current.start, parser->current.end, PM_ERR_INVALID_ESCAPE_CHARACTER);
+                        return;
+                    }
+
+                    escape_read(parser, buffer, regular_expression_buffer, flags | PM_ESCAPE_FLAG_CONTROL);
+                    return;
+                case ' ':
+                    parser->current.end++;
+                    escape_read_warn(parser, flags, PM_ESCAPE_FLAG_CONTROL, "\\s");
+                    escape_write_byte(parser, buffer, regular_expression_buffer, flags, escape_byte(peeked, flags | PM_ESCAPE_FLAG_CONTROL));
+                    return;
+                case '\t':
+                    parser->current.end++;
+                    escape_read_warn(parser, flags, 0, "\\t");
+                    escape_write_byte(parser, buffer, regular_expression_buffer, flags, escape_byte(peeked, flags | PM_ESCAPE_FLAG_CONTROL));
+                    return;
+                default: {
+                    if (!char_is_ascii_printable(peeked)) {
+                        pm_parser_err_current(parser, PM_ERR_ESCAPE_INVALID_CONTROL);
+                        return;
+                    }
+
+                    parser->current.end++;
+                    escape_write_byte(parser, buffer, regular_expression_buffer, flags, escape_byte(peeked, flags | PM_ESCAPE_FLAG_CONTROL));
+                    return;
+                }
+            }
+        }
+        case 'C': {
+            parser->current.end++;
+            if (flags & PM_ESCAPE_FLAG_CONTROL) {
+                pm_parser_err_current(parser, PM_ERR_ESCAPE_INVALID_CONTROL_REPEAT);
+            }
+
+            if (peek(parser) != '-') {
+                size_t width = parser->encoding->char_width(parser->current.end, parser->end - parser->current.end);
+                pm_parser_err(parser, parser->current.start, parser->current.end + width, PM_ERR_ESCAPE_INVALID_CONTROL);
+                return;
+            }
+
+            parser->current.end++;
+            if (parser->current.end == parser->end) {
+                pm_parser_err_current(parser, PM_ERR_ESCAPE_INVALID_CONTROL);
+                return;
+            }
+
+            uint8_t peeked = peek(parser);
+            switch (peeked) {
+                case '?': {
+                    parser->current.end++;
+                    escape_write_byte(parser, buffer, regular_expression_buffer, flags, escape_byte(0x7f, flags));
+                    return;
+                }
+                case '\\':
+                    parser->current.end++;
+
+                    if (match(parser, 'u') || match(parser, 'U')) {
+                        pm_parser_err(parser, parser->current.start, parser->current.end, PM_ERR_INVALID_ESCAPE_CHARACTER);
+                        return;
+                    }
+
+                    escape_read(parser, buffer, regular_expression_buffer, flags | PM_ESCAPE_FLAG_CONTROL);
+                    return;
+                case ' ':
+                    parser->current.end++;
+                    escape_read_warn(parser, flags, PM_ESCAPE_FLAG_CONTROL, "\\s");
+                    escape_write_byte(parser, buffer, regular_expression_buffer, flags, escape_byte(peeked, flags | PM_ESCAPE_FLAG_CONTROL));
+                    return;
+                case '\t':
+                    parser->current.end++;
+                    escape_read_warn(parser, flags, 0, "\\t");
+                    escape_write_byte(parser, buffer, regular_expression_buffer, flags, escape_byte(peeked, flags | PM_ESCAPE_FLAG_CONTROL));
+                    return;
+                default: {
+                    if (!char_is_ascii_printable(peeked)) {
+                        size_t width = parser->encoding->char_width(parser->current.end, parser->end - parser->current.end);
+                        pm_parser_err(parser, parser->current.start, parser->current.end + width, PM_ERR_ESCAPE_INVALID_CONTROL);
+                        return;
+                    }
+
+                    parser->current.end++;
+                    escape_write_byte(parser, buffer, regular_expression_buffer, flags, escape_byte(peeked, flags | PM_ESCAPE_FLAG_CONTROL));
+                    return;
+                }
+            }
+        }
+        case 'M': {
+            parser->current.end++;
+            if (flags & PM_ESCAPE_FLAG_META) {
+                pm_parser_err_current(parser, PM_ERR_ESCAPE_INVALID_META_REPEAT);
+            }
+
+            if (peek(parser) != '-') {
+                size_t width = parser->encoding->char_width(parser->current.end, parser->end - parser->current.end);
+                pm_parser_err(parser, parser->current.start, parser->current.end + width, PM_ERR_ESCAPE_INVALID_META);
+                return;
+            }
+
+            parser->current.end++;
+            if (parser->current.end == parser->end) {
+                pm_parser_err_current(parser, PM_ERR_ESCAPE_INVALID_META);
+                return;
+            }
+
+            uint8_t peeked = peek(parser);
+            switch (peeked) {
+                case '\\':
+                    parser->current.end++;
+
+                    if (match(parser, 'u') || match(parser, 'U')) {
+                        pm_parser_err(parser, parser->current.start, parser->current.end, PM_ERR_INVALID_ESCAPE_CHARACTER);
+                        return;
+                    }
+
+                    escape_read(parser, buffer, regular_expression_buffer, flags | PM_ESCAPE_FLAG_META);
+                    return;
+                case ' ':
+                    parser->current.end++;
+                    escape_read_warn(parser, flags, PM_ESCAPE_FLAG_META, "\\s");
+                    escape_write_byte(parser, buffer, regular_expression_buffer, flags, escape_byte(peeked, flags | PM_ESCAPE_FLAG_META));
+                    return;
+                case '\t':
+                    parser->current.end++;
+                    escape_read_warn(parser, flags & ((uint8_t) ~PM_ESCAPE_FLAG_CONTROL), PM_ESCAPE_FLAG_META, "\\t");
+                    escape_write_byte(parser, buffer, regular_expression_buffer, flags, escape_byte(peeked, flags | PM_ESCAPE_FLAG_META));
+                    return;
+                default:
+                    if (!char_is_ascii_printable(peeked)) {
+                        size_t width = parser->encoding->char_width(parser->current.end, parser->end - parser->current.end);
+                        pm_parser_err(parser, parser->current.start, parser->current.end + width, PM_ERR_ESCAPE_INVALID_META);
+                        return;
+                    }
+
+                    parser->current.end++;
+                    escape_write_byte(parser, buffer, regular_expression_buffer, flags, escape_byte(peeked, flags | PM_ESCAPE_FLAG_META));
+                    return;
+            }
+        }
+        case '\r': {
+            if (peek_offset(parser, 1) == '\n') {
+                parser->current.end += 2;
+                escape_write_byte_encoded(parser, buffer, escape_byte('\n', flags));
+                return;
+            }
+            PRISM_FALLTHROUGH
+        }
+        default: {
+            if ((flags & (PM_ESCAPE_FLAG_CONTROL | PM_ESCAPE_FLAG_META)) && !char_is_ascii_printable(peeked)) {
+                size_t width = parser->encoding->char_width(parser->current.end, parser->end - parser->current.end);
+                pm_parser_err(parser, parser->current.start, parser->current.end + width, PM_ERR_ESCAPE_INVALID_META);
+                return;
+            }
+            if (parser->current.end < parser->end) {
+                escape_write_escape_encoded(parser, buffer, regular_expression_buffer, flags);
+            } else {
+                pm_parser_err_current(parser, PM_ERR_INVALID_ESCAPE_CHARACTER);
+            }
+            return;
+        }
+    }
+}
+
+/**
+ * This function is responsible for lexing either a character literal or the ?
+ * operator. The supported character literals are described below.
+ *
+ * \\a            bell, ASCII 07h (BEL)
+ * \\b            backspace, ASCII 08h (BS)
+ * \t             horizontal tab, ASCII 09h (TAB)
+ * \\n            newline (line feed), ASCII 0Ah (LF)
+ * \v             vertical tab, ASCII 0Bh (VT)
+ * \f             form feed, ASCII 0Ch (FF)
+ * \r             carriage return, ASCII 0Dh (CR)
+ * \\e            escape, ASCII 1Bh (ESC)
+ * \s             space, ASCII 20h (SPC)
+ * \\             backslash
+ * \nnn           octal bit pattern, where nnn is 1-3 octal digits ([0-7])
+ * \xnn           hexadecimal bit pattern, where nn is 1-2 hexadecimal digits ([0-9a-fA-F])
+ * \unnnn         Unicode character, where nnnn is exactly 4 hexadecimal digits ([0-9a-fA-F])
+ * \u{nnnn ...}   Unicode character(s), where each nnnn is 1-6 hexadecimal digits ([0-9a-fA-F])
+ * \cx or \C-x    control character, where x is an ASCII printable character
+ * \M-x           meta character, where x is an ASCII printable character
+ * \M-\C-x        meta control character, where x is an ASCII printable character
+ * \M-\cx         same as above
+ * \\c\M-x        same as above
+ * \\c? or \C-?   delete, ASCII 7Fh (DEL)
+ */
+static pm_token_type_t
+lex_question_mark(pm_parser_t *parser) {
+    if (lex_state_end_p(parser)) {
+        lex_state_set(parser, PM_LEX_STATE_BEG);
+        return PM_TOKEN_QUESTION_MARK;
+    }
+
+    if (parser->current.end >= parser->end) {
+        pm_parser_err_current(parser, PM_ERR_INCOMPLETE_QUESTION_MARK);
+        pm_string_shared_init(&parser->current_string, parser->current.start + 1, parser->current.end);
+        return PM_TOKEN_CHARACTER_LITERAL;
+    }
+
+    if (pm_char_is_whitespace(*parser->current.end)) {
+        lex_state_set(parser, PM_LEX_STATE_BEG);
+        return PM_TOKEN_QUESTION_MARK;
+    }
+
+    lex_state_set(parser, PM_LEX_STATE_BEG);
+
+    if (match(parser, '\\')) {
+        lex_state_set(parser, PM_LEX_STATE_END);
+
+        pm_buffer_t buffer;
+        pm_buffer_init_capacity(&buffer, 3);
+
+        escape_read(parser, &buffer, NULL, PM_ESCAPE_FLAG_SINGLE);
+        pm_string_owned_init(&parser->current_string, (uint8_t *) buffer.value, buffer.length);
+
+        return PM_TOKEN_CHARACTER_LITERAL;
+    } else {
+        size_t encoding_width = parser->encoding->char_width(parser->current.end, parser->end - parser->current.end);
+
+        // Ternary operators can have a ? immediately followed by an identifier
+        // which starts with an underscore. We check for this case here.
+        if (
+            !(parser->encoding->alnum_char(parser->current.end, parser->end - parser->current.end) || peek(parser) == '_') ||
+            (
+                (parser->current.end + encoding_width >= parser->end) ||
+                !char_is_identifier(parser, parser->current.end + encoding_width, parser->end - (parser->current.end + encoding_width))
+            )
+        ) {
+            lex_state_set(parser, PM_LEX_STATE_END);
+            parser->current.end += encoding_width;
+            pm_string_shared_init(&parser->current_string, parser->current.start + 1, parser->current.end);
+            return PM_TOKEN_CHARACTER_LITERAL;
+        }
+    }
+
+    return PM_TOKEN_QUESTION_MARK;
+}
+
+/**
+ * Lex a variable that starts with an @ sign (either an instance or class
+ * variable).
+ */
+static pm_token_type_t
+lex_at_variable(pm_parser_t *parser) {
+    pm_token_type_t type = match(parser, '@') ? PM_TOKEN_CLASS_VARIABLE : PM_TOKEN_INSTANCE_VARIABLE;
+    const uint8_t *end = parser->end;
+
+    size_t width;
+    if ((width = char_is_identifier_start(parser, parser->current.end, end - parser->current.end)) > 0) {
+        parser->current.end += width;
+
+        while ((width = char_is_identifier(parser, parser->current.end, end - parser->current.end)) > 0) {
+            parser->current.end += width;
+        }
+    } else if (parser->current.end < end && pm_char_is_decimal_digit(*parser->current.end)) {
+        pm_diagnostic_id_t diag_id = (type == PM_TOKEN_CLASS_VARIABLE) ? PM_ERR_INCOMPLETE_VARIABLE_CLASS : PM_ERR_INCOMPLETE_VARIABLE_INSTANCE;
+        if (parser->version == PM_OPTIONS_VERSION_CRUBY_3_3) {
+            diag_id = (type == PM_TOKEN_CLASS_VARIABLE) ? PM_ERR_INCOMPLETE_VARIABLE_CLASS_3_3 : PM_ERR_INCOMPLETE_VARIABLE_INSTANCE_3_3;
+        }
+
+        size_t width = parser->encoding->char_width(parser->current.end, end - parser->current.end);
+        PM_PARSER_ERR_TOKEN_FORMAT(parser, parser->current, diag_id, (int) ((parser->current.end + width) - parser->current.start), (const char *) parser->current.start);
+    } else {
+        pm_diagnostic_id_t diag_id = (type == PM_TOKEN_CLASS_VARIABLE) ? PM_ERR_CLASS_VARIABLE_BARE : PM_ERR_INSTANCE_VARIABLE_BARE;
+        pm_parser_err_token(parser, &parser->current, diag_id);
+    }
+
+    // If we're lexing an embedded variable, then we need to pop back into the
+    // parent lex context.
+    if (parser->lex_modes.current->mode == PM_LEX_EMBVAR) {
+        lex_mode_pop(parser);
+    }
+
+    return type;
+}
+
+/**
+ * Optionally call out to the lex callback if one is provided.
+ */
+static inline void
+parser_lex_callback(pm_parser_t *parser) {
+    if (parser->lex_callback) {
+        parser->lex_callback->callback(parser->lex_callback->data, parser, &parser->current);
+    }
+}
+
+/**
+ * Return a new comment node of the specified type.
+ */
+static inline pm_comment_t *
+parser_comment(pm_parser_t *parser, pm_comment_type_t type) {
+    pm_comment_t *comment = (pm_comment_t *) xcalloc(1, sizeof(pm_comment_t));
+    if (comment == NULL) return NULL;
+
+    *comment = (pm_comment_t) {
+        .type = type,
+        .location = { parser->current.start, parser->current.end }
+    };
+
+    return comment;
+}
+
+/**
+ * Lex out embedded documentation, and return when we have either hit the end of
+ * the file or the end of the embedded documentation. This calls the callback
+ * manually because only the lexer should see these tokens, not the parser.
+ */
+static pm_token_type_t
+lex_embdoc(pm_parser_t *parser) {
+    // First, lex out the EMBDOC_BEGIN token.
+    const uint8_t *newline = next_newline(parser->current.end, parser->end - parser->current.end);
+
+    if (newline == NULL) {
+        parser->current.end = parser->end;
+    } else {
+        pm_newline_list_append(&parser->newline_list, newline);
+        parser->current.end = newline + 1;
+    }
+
+    parser->current.type = PM_TOKEN_EMBDOC_BEGIN;
+    parser_lex_callback(parser);
+
+    // Now, create a comment that is going to be attached to the parser.
+    pm_comment_t *comment = parser_comment(parser, PM_COMMENT_EMBDOC);
+    if (comment == NULL) return PM_TOKEN_EOF;
+
+    // Now, loop until we find the end of the embedded documentation or the end
+    // of the file.
+    while (parser->current.end + 4 <= parser->end) {
+        parser->current.start = parser->current.end;
+
+        // If we've hit the end of the embedded documentation then we'll return
+        // that token here.
+        if (
+            (memcmp(parser->current.end, "=end", 4) == 0) &&
+            (
+                (parser->current.end + 4 == parser->end) || // end of file
+                pm_char_is_whitespace(parser->current.end[4]) || // whitespace
+                (parser->current.end[4] == '\0') || // NUL or end of script
+                (parser->current.end[4] == '\004') || // ^D
+                (parser->current.end[4] == '\032') // ^Z
+            )
+        ) {
+            const uint8_t *newline = next_newline(parser->current.end, parser->end - parser->current.end);
+
+            if (newline == NULL) {
+                parser->current.end = parser->end;
+            } else {
+                pm_newline_list_append(&parser->newline_list, newline);
+                parser->current.end = newline + 1;
+            }
+
+            parser->current.type = PM_TOKEN_EMBDOC_END;
+            parser_lex_callback(parser);
+
+            comment->location.end = parser->current.end;
+            pm_list_append(&parser->comment_list, (pm_list_node_t *) comment);
+
+            return PM_TOKEN_EMBDOC_END;
+        }
+
+        // Otherwise, we'll parse until the end of the line and return a line of
+        // embedded documentation.
+        const uint8_t *newline = next_newline(parser->current.end, parser->end - parser->current.end);
+
+        if (newline == NULL) {
+            parser->current.end = parser->end;
+        } else {
+            pm_newline_list_append(&parser->newline_list, newline);
+            parser->current.end = newline + 1;
+        }
+
+        parser->current.type = PM_TOKEN_EMBDOC_LINE;
+        parser_lex_callback(parser);
+    }
+
+    pm_parser_err_current(parser, PM_ERR_EMBDOC_TERM);
+
+    comment->location.end = parser->current.end;
+    pm_list_append(&parser->comment_list, (pm_list_node_t *) comment);
+
+    return PM_TOKEN_EOF;
+}
+
+/**
+ * Set the current type to an ignored newline and then call the lex callback.
+ * This happens in a couple places depending on whether or not we have already
+ * lexed a comment.
+ */
+static inline void
+parser_lex_ignored_newline(pm_parser_t *parser) {
+    parser->current.type = PM_TOKEN_IGNORED_NEWLINE;
+    parser_lex_callback(parser);
+}
+
+/**
+ * This function will be called when a newline is encountered. In some newlines,
+ * we need to check if there is a heredoc or heredocs that we have already lexed
+ * the body of that we need to now skip past. That will be indicated by the
+ * heredoc_end field on the parser.
+ *
+ * If it is set, then we need to skip past the heredoc body and then clear the
+ * heredoc_end field.
+ */
+static inline void
+parser_flush_heredoc_end(pm_parser_t *parser) {
+    assert(parser->heredoc_end <= parser->end);
+    parser->next_start = parser->heredoc_end;
+    parser->heredoc_end = NULL;
+}
+
+/**
+ * Returns true if the parser has lexed the last token on the current line.
+*/
+static bool
+parser_end_of_line_p(const pm_parser_t *parser) {
+    const uint8_t *cursor = parser->current.end;
+
+    while (cursor < parser->end && *cursor != '\n' && *cursor != '#') {
+        if (!pm_char_is_inline_whitespace(*cursor++)) return false;
+    }
+
+    return true;
+}
+
+/**
+ * When we're lexing certain types (strings, symbols, lists, etc.) we have
+ * string content associated with the tokens. For example:
+ *
+ *     "foo"
+ *
+ * In this case, the string content is foo. Since there is no escaping, there's
+ * no need to track additional information and the token can be returned as
+ * normal. However, if we have escape sequences:
+ *
+ *     "foo\n"
+ *
+ * then the bytes in the string are "f", "o", "o", "\", "n", but we want to
+ * provide our consumers with the string content "f", "o", "o", "\n". In these
+ * cases, when we find the first escape sequence, we initialize a pm_buffer_t
+ * to keep track of the string content. Then in the parser, it will
+ * automatically attach the string content to the node that it belongs to.
+ */
+typedef struct {
+    /**
+     * The buffer that we're using to keep track of the string content. It will
+     * only be initialized if we receive an escape sequence.
+     */
+    pm_buffer_t buffer;
+
+    /**
+     * The cursor into the source string that points to how far we have
+     * currently copied into the buffer.
+     */
+    const uint8_t *cursor;
+} pm_token_buffer_t;
+
+/**
+ * In order to properly set a regular expression's encoding and to validate
+ * the byte sequence for the underlying encoding we must process any escape
+ * sequences. The unescaped byte sequence will be stored in `buffer` just like
+ * for other string-like types. However, we also need to store the regular
+ * expression's source string. That string may be different from what we see
+ * during lexing because some escape sequences rewrite the source.
+ *
+ * This value will only be initialized for regular expressions and only if we
+ * receive an escape sequence. It will contain the regular expression's source
+ * string's byte sequence.
+ */
+typedef struct {
+    /** The embedded base buffer. */
+    pm_token_buffer_t base;
+
+    /** The buffer holding the regexp source. */
+    pm_buffer_t regexp_buffer;
+} pm_regexp_token_buffer_t;
+
+/**
+ * Push the given byte into the token buffer.
+ */
+static inline void
+pm_token_buffer_push_byte(pm_token_buffer_t *token_buffer, uint8_t byte) {
+    pm_buffer_append_byte(&token_buffer->buffer, byte);
+}
+
+static inline void
+pm_regexp_token_buffer_push_byte(pm_regexp_token_buffer_t *token_buffer, uint8_t byte) {
+    pm_buffer_append_byte(&token_buffer->regexp_buffer, byte);
+}
+
+/**
+ * Return the width of the character at the end of the current token.
+ */
+static inline size_t
+parser_char_width(const pm_parser_t *parser) {
+    size_t width;
+    if (parser->encoding_changed) {
+        width = parser->encoding->char_width(parser->current.end, parser->end - parser->current.end);
+    } else {
+        width = pm_encoding_utf_8_char_width(parser->current.end, parser->end - parser->current.end);
+    }
+
+    // TODO: If the character is invalid in the given encoding, then we'll just
+    // push one byte into the buffer. This should actually be an error.
+    return (width == 0 ? 1 : width);
+}
+
+/**
+ * Push an escaped character into the token buffer.
+ */
+static void
+pm_token_buffer_push_escaped(pm_token_buffer_t *token_buffer, pm_parser_t *parser) {
+    size_t width = parser_char_width(parser);
+    pm_buffer_append_bytes(&token_buffer->buffer, parser->current.end, width);
+    parser->current.end += width;
+}
+
+static void
+pm_regexp_token_buffer_push_escaped(pm_regexp_token_buffer_t *token_buffer, pm_parser_t *parser) {
+    size_t width = parser_char_width(parser);
+    pm_buffer_append_bytes(&token_buffer->base.buffer, parser->current.end, width);
+    pm_buffer_append_bytes(&token_buffer->regexp_buffer, parser->current.end, width);
+    parser->current.end += width;
+}
+
+static bool
+pm_slice_ascii_only_p(const uint8_t *value, size_t length) {
+    for (size_t index = 0; index < length; index++) {
+        if (value[index] & 0x80) return false;
+    }
+
+    return true;
+}
+
+/**
+ * When we're about to return from lexing the current token and we know for sure
+ * that we have found an escape sequence, this function is called to copy the
+ * contents of the token buffer into the current string on the parser so that it
+ * can be attached to the correct node.
+ */
+static inline void
+pm_token_buffer_copy(pm_parser_t *parser, pm_token_buffer_t *token_buffer) {
+    pm_string_owned_init(&parser->current_string, (uint8_t *) pm_buffer_value(&token_buffer->buffer), pm_buffer_length(&token_buffer->buffer));
+}
+
+static inline void
+pm_regexp_token_buffer_copy(pm_parser_t *parser, pm_regexp_token_buffer_t *token_buffer) {
+    pm_string_owned_init(&parser->current_string, (uint8_t *) pm_buffer_value(&token_buffer->base.buffer), pm_buffer_length(&token_buffer->base.buffer));
+    parser->current_regular_expression_ascii_only = pm_slice_ascii_only_p((const uint8_t *) pm_buffer_value(&token_buffer->regexp_buffer), pm_buffer_length(&token_buffer->regexp_buffer));
+    pm_buffer_free(&token_buffer->regexp_buffer);
+}
+
+/**
+ * When we're about to return from lexing the current token, we need to flush
+ * all of the content that we have pushed into the buffer into the current
+ * string. If we haven't pushed anything into the buffer, this means that we
+ * never found an escape sequence, so we can directly reference the bounds of
+ * the current string. Either way, at the return of this function it is expected
+ * that parser->current_string is established in such a way that it can be
+ * attached to a node.
+ */
+static void
+pm_token_buffer_flush(pm_parser_t *parser, pm_token_buffer_t *token_buffer) {
+    if (token_buffer->cursor == NULL) {
+        pm_string_shared_init(&parser->current_string, parser->current.start, parser->current.end);
+    } else {
+        pm_buffer_append_bytes(&token_buffer->buffer, token_buffer->cursor, (size_t) (parser->current.end - token_buffer->cursor));
+        pm_token_buffer_copy(parser, token_buffer);
+    }
+}
+
+static void
+pm_regexp_token_buffer_flush(pm_parser_t *parser, pm_regexp_token_buffer_t *token_buffer) {
+    if (token_buffer->base.cursor == NULL) {
+        pm_string_shared_init(&parser->current_string, parser->current.start, parser->current.end);
+        parser->current_regular_expression_ascii_only = pm_slice_ascii_only_p(parser->current.start, (size_t) (parser->current.end - parser->current.start));
+    } else {
+        pm_buffer_append_bytes(&token_buffer->base.buffer, token_buffer->base.cursor, (size_t) (parser->current.end - token_buffer->base.cursor));
+        pm_buffer_append_bytes(&token_buffer->regexp_buffer, token_buffer->base.cursor, (size_t) (parser->current.end - token_buffer->base.cursor));
+        pm_regexp_token_buffer_copy(parser, token_buffer);
+    }
+}
+
+#define PM_TOKEN_BUFFER_DEFAULT_SIZE 16
+
+/**
+ * When we've found an escape sequence, we need to copy everything up to this
+ * point into the buffer because we're about to provide a string that has
+ * different content than a direct slice of the source.
+ *
+ * It is expected that the parser's current token end will be pointing at one
+ * byte past the backslash that starts the escape sequence.
+ */
+static void
+pm_token_buffer_escape(pm_parser_t *parser, pm_token_buffer_t *token_buffer) {
+    const uint8_t *start;
+    if (token_buffer->cursor == NULL) {
+        pm_buffer_init_capacity(&token_buffer->buffer, PM_TOKEN_BUFFER_DEFAULT_SIZE);
+        start = parser->current.start;
+    } else {
+        start = token_buffer->cursor;
+    }
+
+    const uint8_t *end = parser->current.end - 1;
+    assert(end >= start);
+    pm_buffer_append_bytes(&token_buffer->buffer, start, (size_t) (end - start));
+
+    token_buffer->cursor = end;
+}
+
+static void
+pm_regexp_token_buffer_escape(pm_parser_t *parser, pm_regexp_token_buffer_t *token_buffer) {
+    const uint8_t *start;
+    if (token_buffer->base.cursor == NULL) {
+        pm_buffer_init_capacity(&token_buffer->base.buffer, PM_TOKEN_BUFFER_DEFAULT_SIZE);
+        pm_buffer_init_capacity(&token_buffer->regexp_buffer, PM_TOKEN_BUFFER_DEFAULT_SIZE);
+        start = parser->current.start;
+    } else {
+        start = token_buffer->base.cursor;
+    }
+
+    const uint8_t *end = parser->current.end - 1;
+    pm_buffer_append_bytes(&token_buffer->base.buffer, start, (size_t) (end - start));
+    pm_buffer_append_bytes(&token_buffer->regexp_buffer, start, (size_t) (end - start));
+
+    token_buffer->base.cursor = end;
+}
+
+#undef PM_TOKEN_BUFFER_DEFAULT_SIZE
+
+/**
+ * Effectively the same thing as pm_strspn_inline_whitespace, but in the case of
+ * a tilde heredoc expands out tab characters to the nearest tab boundaries.
+ */
+static inline size_t
+pm_heredoc_strspn_inline_whitespace(pm_parser_t *parser, const uint8_t **cursor, pm_heredoc_indent_t indent) {
+    size_t whitespace = 0;
+
+    switch (indent) {
+        case PM_HEREDOC_INDENT_NONE:
+            // Do nothing, we can't match a terminator with
+            // indentation and there's no need to calculate common
+            // whitespace.
+            break;
+        case PM_HEREDOC_INDENT_DASH:
+            // Skip past inline whitespace.
+            *cursor += pm_strspn_inline_whitespace(*cursor, parser->end - *cursor);
+            break;
+        case PM_HEREDOC_INDENT_TILDE:
+            // Skip past inline whitespace and calculate common
+            // whitespace.
+            while (*cursor < parser->end && pm_char_is_inline_whitespace(**cursor)) {
+                if (**cursor == '\t') {
+                    whitespace = (whitespace / PM_TAB_WHITESPACE_SIZE + 1) * PM_TAB_WHITESPACE_SIZE;
+                } else {
+                    whitespace++;
+                }
+                (*cursor)++;
+            }
+
+            break;
+    }
+
+    return whitespace;
+}
+
+/**
+ * Lex past the delimiter of a percent literal. Handle newlines and heredocs
+ * appropriately.
+ */
+static uint8_t
+pm_lex_percent_delimiter(pm_parser_t *parser) {
+    size_t eol_length = match_eol(parser);
+
+    if (eol_length) {
+        if (parser->heredoc_end) {
+            // If we have already lexed a heredoc, then the newline has already
+            // been added to the list. In this case we want to just flush the
+            // heredoc end.
+            parser_flush_heredoc_end(parser);
+        } else {
+            // Otherwise, we'll add the newline to the list of newlines.
+            pm_newline_list_append(&parser->newline_list, parser->current.end + eol_length - 1);
+        }
+
+        uint8_t delimiter = *parser->current.end;
+
+        // If our delimiter is \r\n, we want to treat it as if it's \n.
+        // For example, %\r\nfoo\r\n should be "foo"
+        if (eol_length == 2) {
+            delimiter = *(parser->current.end + 1);
+        }
+
+        parser->current.end += eol_length;
+        return delimiter;
+    }
+
+    return *parser->current.end++;
+}
+
+/**
+ * This is a convenience macro that will set the current token type, call the
+ * lex callback, and then return from the parser_lex function.
+ */
+#define LEX(token_type) parser->current.type = token_type; parser_lex_callback(parser); return
+
+/**
+ * Called when the parser requires a new token. The parser maintains a moving
+ * window of two tokens at a time: parser.previous and parser.current. This
+ * function will move the current token into the previous token and then
+ * lex a new token into the current token.
+ */
+static void
+parser_lex(pm_parser_t *parser) {
+    assert(parser->current.end <= parser->end);
+    parser->previous = parser->current;
+
+    // This value mirrors cmd_state from CRuby.
+    bool previous_command_start = parser->command_start;
+    parser->command_start = false;
+
+    // This is used to communicate to the newline lexing function that we've
+    // already seen a comment.
+    bool lexed_comment = false;
+
+    // Here we cache the current value of the semantic token seen flag. This is
+    // used to reset it in case we find a token that shouldn't flip this flag.
+    unsigned int semantic_token_seen = parser->semantic_token_seen;
+    parser->semantic_token_seen = true;
+
+    switch (parser->lex_modes.current->mode) {
+        case PM_LEX_DEFAULT:
+        case PM_LEX_EMBEXPR:
+        case PM_LEX_EMBVAR:
+
+        // We have a specific named label here because we are going to jump back to
+        // this location in the event that we have lexed a token that should not be
+        // returned to the parser. This includes comments, ignored newlines, and
+        // invalid tokens of some form.
+        lex_next_token: {
+            // If we have the special next_start pointer set, then we're going to jump
+            // to that location and start lexing from there.
+            if (parser->next_start != NULL) {
+                parser->current.end = parser->next_start;
+                parser->next_start = NULL;
+            }
+
+            // This value mirrors space_seen from CRuby. It tracks whether or not
+            // space has been eaten before the start of the next token.
+            bool space_seen = false;
+
+            // First, we're going to skip past any whitespace at the front of the next
+            // token.
+            bool chomping = true;
+            while (parser->current.end < parser->end && chomping) {
+                switch (*parser->current.end) {
+                    case ' ':
+                    case '\t':
+                    case '\f':
+                    case '\v':
+                        parser->current.end++;
+                        space_seen = true;
+                        break;
+                    case '\r':
+                        if (match_eol_offset(parser, 1)) {
+                            chomping = false;
+                        } else {
+                            pm_parser_warn(parser, parser->current.end, parser->current.end + 1, PM_WARN_UNEXPECTED_CARRIAGE_RETURN);
+                            parser->current.end++;
+                            space_seen = true;
+                        }
+                        break;
+                    case '\\': {
+                        size_t eol_length = match_eol_offset(parser, 1);
+                        if (eol_length) {
+                            if (parser->heredoc_end) {
+                                parser->current.end = parser->heredoc_end;
+                                parser->heredoc_end = NULL;
+                            } else {
+                                parser->current.end += eol_length + 1;
+                                pm_newline_list_append(&parser->newline_list, parser->current.end - 1);
+                                space_seen = true;
+                            }
+                        } else if (pm_char_is_inline_whitespace(*parser->current.end)) {
+                            parser->current.end += 2;
+                        } else {
+                            chomping = false;
+                        }
+
+                        break;
+                    }
+                    default:
+                        chomping = false;
+                        break;
+                }
+            }
+
+            // Next, we'll set to start of this token to be the current end.
+            parser->current.start = parser->current.end;
+
+            // We'll check if we're at the end of the file. If we are, then we
+            // need to return the EOF token.
+            if (parser->current.end >= parser->end) {
+                // If we hit EOF, but the EOF came immediately after a newline,
+                // set the start of the token to the newline.  This way any EOF
+                // errors will be reported as happening on that line rather than
+                // a line after.  For example "foo(\n" should report an error
+                // on line 1 even though EOF technically occurs on line 2.
+                if (parser->current.start > parser->start && (*(parser->current.start - 1) == '\n')) {
+                    parser->current.start -= 1;
+                }
+                LEX(PM_TOKEN_EOF);
+            }
+
+            // Finally, we'll check the current character to determine the next
+            // token.
+            switch (*parser->current.end++) {
+                case '\0':   // NUL or end of script
+                case '\004': // ^D
+                case '\032': // ^Z
+                    parser->current.end--;
+                    LEX(PM_TOKEN_EOF);
+
+                case '#': { // comments
+                    const uint8_t *ending = next_newline(parser->current.end, parser->end - parser->current.end);
+                    parser->current.end = ending == NULL ? parser->end : ending;
+
+                    // If we found a comment while lexing, then we're going to
+                    // add it to the list of comments in the file and keep
+                    // lexing.
+                    pm_comment_t *comment = parser_comment(parser, PM_COMMENT_INLINE);
+                    pm_list_append(&parser->comment_list, (pm_list_node_t *) comment);
+
+                    if (ending) parser->current.end++;
+                    parser->current.type = PM_TOKEN_COMMENT;
+                    parser_lex_callback(parser);
+
+                    // Here, parse the comment to see if it's a magic comment
+                    // and potentially change state on the parser.
+                    if (!parser_lex_magic_comment(parser, semantic_token_seen) && (parser->current.start == parser->encoding_comment_start)) {
+                        ptrdiff_t length = parser->current.end - parser->current.start;
+
+                        // If we didn't find a magic comment within the first
+                        // pass and we're at the start of the file, then we need
+                        // to do another pass to potentially find other patterns
+                        // for encoding comments.
+                        if (length >= 10 && !parser->encoding_locked) {
+                            parser_lex_magic_comment_encoding(parser);
+                        }
+                    }
+
+                    lexed_comment = true;
+                }
+                PRISM_FALLTHROUGH
+                case '\r':
+                case '\n': {
+                    parser->semantic_token_seen = semantic_token_seen & 0x1;
+                    size_t eol_length = match_eol_at(parser, parser->current.end - 1);
+
+                    if (eol_length) {
+                        // The only way you can have carriage returns in this
+                        // particular loop is if you have a carriage return
+                        // followed by a newline. In that case we'll just skip
+                        // over the carriage return and continue lexing, in
+                        // order to make it so that the newline token
+                        // encapsulates both the carriage return and the
+                        // newline. Note that we need to check that we haven't
+                        // already lexed a comment here because that falls
+                        // through into here as well.
+                        if (!lexed_comment) {
+                            parser->current.end += eol_length - 1; // skip CR
+                        }
+
+                        if (parser->heredoc_end == NULL) {
+                            pm_newline_list_append(&parser->newline_list, parser->current.end - 1);
+                        }
+                    }
+
+                    if (parser->heredoc_end) {
+                        parser_flush_heredoc_end(parser);
+                    }
+
+                    // If this is an ignored newline, then we can continue lexing after
+                    // calling the callback with the ignored newline token.
+                    switch (lex_state_ignored_p(parser)) {
+                        case PM_IGNORED_NEWLINE_NONE:
+                            break;
+                        case PM_IGNORED_NEWLINE_PATTERN:
+                            if (parser->pattern_matching_newlines || parser->in_keyword_arg) {
+                                if (!lexed_comment) parser_lex_ignored_newline(parser);
+                                lex_state_set(parser, PM_LEX_STATE_BEG);
+                                parser->command_start = true;
+                                parser->current.type = PM_TOKEN_NEWLINE;
+                                return;
+                            }
+                            PRISM_FALLTHROUGH
+                        case PM_IGNORED_NEWLINE_ALL:
+                            if (!lexed_comment) parser_lex_ignored_newline(parser);
+                            lexed_comment = false;
+                            goto lex_next_token;
+                    }
+
+                    // Here we need to look ahead and see if there is a call operator
+                    // (either . or &.) that starts the next line. If there is, then this
+                    // is going to become an ignored newline and we're going to instead
+                    // return the call operator.
+                    const uint8_t *next_content = parser->next_start == NULL ? parser->current.end : parser->next_start;
+                    next_content += pm_strspn_inline_whitespace(next_content, parser->end - next_content);
+
+                    if (next_content < parser->end) {
+                        // If we hit a comment after a newline, then we're going to check
+                        // if it's ignored or if it's followed by a method call ('.').
+                        // If it is, then we're going to call the
+                        // callback with an ignored newline and then continue lexing.
+                        // Otherwise we'll return a regular newline.
+                        if (next_content[0] == '#') {
+                            // Here we look for a "." or "&." following a "\n".
+                            const uint8_t *following = next_newline(next_content, parser->end - next_content);
+
+                            while (following && (following + 1 < parser->end)) {
+                                following++;
+                                following += pm_strspn_inline_whitespace(following, parser->end - following);
+
+                                // If this is not followed by a comment, then we can break out
+                                // of this loop.
+                                if (peek_at(parser, following) != '#') break;
+
+                                // If there is a comment, then we need to find the end of the
+                                // comment and continue searching from there.
+                                following = next_newline(following, parser->end - following);
+                            }
+
+                            // If the lex state was ignored, or we hit a '.' or a '&.',
+                            // we will lex the ignored newline
+                            if (
+                                lex_state_ignored_p(parser) ||
+                                (following && (
+                                    (peek_at(parser, following) == '.') ||
+                                    (peek_at(parser, following) == '&' && peek_at(parser, following + 1) == '.')
+                                ))
+                            ) {
+                                if (!lexed_comment) parser_lex_ignored_newline(parser);
+                                lexed_comment = false;
+                                goto lex_next_token;
+                            }
+                        }
+
+                        // If we hit a . after a newline, then we're in a call chain and
+                        // we need to return the call operator.
+                        if (next_content[0] == '.') {
+                            // To match ripper, we need to emit an ignored newline even though
+                            // it's a real newline in the case that we have a beginless range
+                            // on a subsequent line.
+                            if (peek_at(parser, next_content + 1) == '.') {
+                                if (!lexed_comment) parser_lex_ignored_newline(parser);
+                                lex_state_set(parser, PM_LEX_STATE_BEG);
+                                parser->command_start = true;
+                                parser->current.type = PM_TOKEN_NEWLINE;
+                                return;
+                            }
+
+                            if (!lexed_comment) parser_lex_ignored_newline(parser);
+                            lex_state_set(parser, PM_LEX_STATE_DOT);
+                            parser->current.start = next_content;
+                            parser->current.end = next_content + 1;
+                            parser->next_start = NULL;
+                            LEX(PM_TOKEN_DOT);
+                        }
+
+                        // If we hit a &. after a newline, then we're in a call chain and
+                        // we need to return the call operator.
+                        if (peek_at(parser, next_content) == '&' && peek_at(parser, next_content + 1) == '.') {
+                            if (!lexed_comment) parser_lex_ignored_newline(parser);
+                            lex_state_set(parser, PM_LEX_STATE_DOT);
+                            parser->current.start = next_content;
+                            parser->current.end = next_content + 2;
+                            parser->next_start = NULL;
+                            LEX(PM_TOKEN_AMPERSAND_DOT);
+                        }
+                    }
+
+                    // At this point we know this is a regular newline, and we can set the
+                    // necessary state and return the token.
+                    lex_state_set(parser, PM_LEX_STATE_BEG);
+                    parser->command_start = true;
+                    parser->current.type = PM_TOKEN_NEWLINE;
+                    if (!lexed_comment) parser_lex_callback(parser);
+                    return;
+                }
+
+                // ,
+                case ',':
+                    if ((parser->previous.type == PM_TOKEN_COMMA) && (parser->enclosure_nesting > 0)) {
+                        PM_PARSER_ERR_TOKEN_FORMAT(parser, parser->current, PM_ERR_ARRAY_TERM, pm_token_type_human(parser->current.type));
+                    }
+
+                    lex_state_set(parser, PM_LEX_STATE_BEG | PM_LEX_STATE_LABEL);
+                    LEX(PM_TOKEN_COMMA);
+
+                // (
+                case '(': {
+                    pm_token_type_t type = PM_TOKEN_PARENTHESIS_LEFT;
+
+                    if (space_seen && (lex_state_arg_p(parser) || parser->lex_state == (PM_LEX_STATE_END | PM_LEX_STATE_LABEL))) {
+                        type = PM_TOKEN_PARENTHESIS_LEFT_PARENTHESES;
+                    }
+
+                    parser->enclosure_nesting++;
+                    lex_state_set(parser, PM_LEX_STATE_BEG | PM_LEX_STATE_LABEL);
+                    pm_do_loop_stack_push(parser, false);
+                    LEX(type);
+                }
+
+                // )
+                case ')':
+                    parser->enclosure_nesting--;
+                    lex_state_set(parser, PM_LEX_STATE_ENDFN);
+                    pm_do_loop_stack_pop(parser);
+                    LEX(PM_TOKEN_PARENTHESIS_RIGHT);
+
+                // ;
+                case ';':
+                    lex_state_set(parser, PM_LEX_STATE_BEG);
+                    parser->command_start = true;
+                    LEX(PM_TOKEN_SEMICOLON);
+
+                // [ [] []=
+                case '[':
+                    parser->enclosure_nesting++;
+                    pm_token_type_t type = PM_TOKEN_BRACKET_LEFT;
+
+                    if (lex_state_operator_p(parser)) {
+                        if (match(parser, ']')) {
+                            parser->enclosure_nesting--;
+                            lex_state_set(parser, PM_LEX_STATE_ARG);
+                            LEX(match(parser, '=') ? PM_TOKEN_BRACKET_LEFT_RIGHT_EQUAL : PM_TOKEN_BRACKET_LEFT_RIGHT);
+                        }
+
+                        lex_state_set(parser, PM_LEX_STATE_ARG | PM_LEX_STATE_LABEL);
+                        LEX(type);
+                    }
+
+                    if (lex_state_beg_p(parser) || (lex_state_arg_p(parser) && (space_seen || lex_state_p(parser, PM_LEX_STATE_LABELED)))) {
+                        type = PM_TOKEN_BRACKET_LEFT_ARRAY;
+                    }
+
+                    lex_state_set(parser, PM_LEX_STATE_BEG | PM_LEX_STATE_LABEL);
+                    pm_do_loop_stack_push(parser, false);
+                    LEX(type);
+
+                // ]
+                case ']':
+                    parser->enclosure_nesting--;
+                    lex_state_set(parser, PM_LEX_STATE_END);
+                    pm_do_loop_stack_pop(parser);
+                    LEX(PM_TOKEN_BRACKET_RIGHT);
+
+                // {
+                case '{': {
+                    pm_token_type_t type = PM_TOKEN_BRACE_LEFT;
+
+                    if (parser->enclosure_nesting == parser->lambda_enclosure_nesting) {
+                        // This { begins a lambda
+                        parser->command_start = true;
+                        lex_state_set(parser, PM_LEX_STATE_BEG);
+                        type = PM_TOKEN_LAMBDA_BEGIN;
+                    } else if (lex_state_p(parser, PM_LEX_STATE_LABELED)) {
+                        // This { begins a hash literal
+                        lex_state_set(parser, PM_LEX_STATE_BEG | PM_LEX_STATE_LABEL);
+                    } else if (lex_state_p(parser, PM_LEX_STATE_ARG_ANY | PM_LEX_STATE_END | PM_LEX_STATE_ENDFN)) {
+                        // This { begins a block
+                        parser->command_start = true;
+                        lex_state_set(parser, PM_LEX_STATE_BEG);
+                    } else if (lex_state_p(parser, PM_LEX_STATE_ENDARG)) {
+                        // This { begins a block on a command
+                        parser->command_start = true;
+                        lex_state_set(parser, PM_LEX_STATE_BEG);
+                    } else {
+                        // This { begins a hash literal
+                        lex_state_set(parser, PM_LEX_STATE_BEG | PM_LEX_STATE_LABEL);
+                    }
+
+                    parser->enclosure_nesting++;
+                    parser->brace_nesting++;
+                    pm_do_loop_stack_push(parser, false);
+
+                    LEX(type);
+                }
+
+                // }
+                case '}':
+                    parser->enclosure_nesting--;
+                    pm_do_loop_stack_pop(parser);
+
+                    if ((parser->lex_modes.current->mode == PM_LEX_EMBEXPR) && (parser->brace_nesting == 0)) {
+                        lex_mode_pop(parser);
+                        LEX(PM_TOKEN_EMBEXPR_END);
+                    }
+
+                    parser->brace_nesting--;
+                    lex_state_set(parser, PM_LEX_STATE_END);
+                    LEX(PM_TOKEN_BRACE_RIGHT);
+
+                // * ** **= *=
+                case '*': {
+                    if (match(parser, '*')) {
+                        if (match(parser, '=')) {
+                            lex_state_set(parser, PM_LEX_STATE_BEG);
+                            LEX(PM_TOKEN_STAR_STAR_EQUAL);
+                        }
+
+                        pm_token_type_t type = PM_TOKEN_STAR_STAR;
+
+                        if (lex_state_spcarg_p(parser, space_seen)) {
+                            pm_parser_warn_token(parser, &parser->current, PM_WARN_AMBIGUOUS_PREFIX_STAR_STAR);
+                            type = PM_TOKEN_USTAR_STAR;
+                        } else if (lex_state_beg_p(parser)) {
+                            type = PM_TOKEN_USTAR_STAR;
+                        } else if (ambiguous_operator_p(parser, space_seen)) {
+                            PM_PARSER_WARN_TOKEN_FORMAT(parser, parser->current, PM_WARN_AMBIGUOUS_BINARY_OPERATOR, "**", "argument prefix");
+                        }
+
+                        if (lex_state_operator_p(parser)) {
+                            lex_state_set(parser, PM_LEX_STATE_ARG);
+                        } else {
+                            lex_state_set(parser, PM_LEX_STATE_BEG);
+                        }
+
+                        LEX(type);
+                    }
+
+                    if (match(parser, '=')) {
+                        lex_state_set(parser, PM_LEX_STATE_BEG);
+                        LEX(PM_TOKEN_STAR_EQUAL);
+                    }
+
+                    pm_token_type_t type = PM_TOKEN_STAR;
+
+                    if (lex_state_spcarg_p(parser, space_seen)) {
+                        pm_parser_warn_token(parser, &parser->current, PM_WARN_AMBIGUOUS_PREFIX_STAR);
+                        type = PM_TOKEN_USTAR;
+                    } else if (lex_state_beg_p(parser)) {
+                        type = PM_TOKEN_USTAR;
+                    } else if (ambiguous_operator_p(parser, space_seen)) {
+                        PM_PARSER_WARN_TOKEN_FORMAT(parser, parser->current, PM_WARN_AMBIGUOUS_BINARY_OPERATOR, "*", "argument prefix");
+                    }
+
+                    if (lex_state_operator_p(parser)) {
+                        lex_state_set(parser, PM_LEX_STATE_ARG);
+                    } else {
+                        lex_state_set(parser, PM_LEX_STATE_BEG);
+                    }
+
+                    LEX(type);
+                }
+
+                // ! != !~ !@
+                case '!':
+                    if (lex_state_operator_p(parser)) {
+                        lex_state_set(parser, PM_LEX_STATE_ARG);
+                        if (match(parser, '@')) {
+                            LEX(PM_TOKEN_BANG);
+                        }
+                    } else {
+                        lex_state_set(parser, PM_LEX_STATE_BEG);
+                    }
+
+                    if (match(parser, '=')) {
+                        LEX(PM_TOKEN_BANG_EQUAL);
+                    }
+
+                    if (match(parser, '~')) {
+                        LEX(PM_TOKEN_BANG_TILDE);
+                    }
+
+                    LEX(PM_TOKEN_BANG);
+
+                // = => =~ == === =begin
+                case '=':
+                    if (
+                        current_token_starts_line(parser) &&
+                        (parser->current.end + 5 <= parser->end) &&
+                        memcmp(parser->current.end, "begin", 5) == 0 &&
+                        (pm_char_is_whitespace(peek_offset(parser, 5)) || (peek_offset(parser, 5) == '\0'))
+                    ) {
+                        pm_token_type_t type = lex_embdoc(parser);
+                        if (type == PM_TOKEN_EOF) {
+                            LEX(type);
+                        }
+
+                        goto lex_next_token;
+                    }
+
+                    if (lex_state_operator_p(parser)) {
+                        lex_state_set(parser, PM_LEX_STATE_ARG);
+                    } else {
+                        lex_state_set(parser, PM_LEX_STATE_BEG);
+                    }
+
+                    if (match(parser, '>')) {
+                        LEX(PM_TOKEN_EQUAL_GREATER);
+                    }
+
+                    if (match(parser, '~')) {
+                        LEX(PM_TOKEN_EQUAL_TILDE);
+                    }
+
+                    if (match(parser, '=')) {
+                        LEX(match(parser, '=') ? PM_TOKEN_EQUAL_EQUAL_EQUAL : PM_TOKEN_EQUAL_EQUAL);
+                    }
+
+                    LEX(PM_TOKEN_EQUAL);
+
+                // < << <<= <= <=>
+                case '<':
+                    if (match(parser, '<')) {
+                        if (
+                            !lex_state_p(parser, PM_LEX_STATE_DOT | PM_LEX_STATE_CLASS) &&
+                            !lex_state_end_p(parser) &&
+                            (!lex_state_p(parser, PM_LEX_STATE_ARG_ANY) || lex_state_p(parser, PM_LEX_STATE_LABELED) || space_seen)
+                        ) {
+                            const uint8_t *end = parser->current.end;
+
+                            pm_heredoc_quote_t quote = PM_HEREDOC_QUOTE_NONE;
+                            pm_heredoc_indent_t indent = PM_HEREDOC_INDENT_NONE;
+
+                            if (match(parser, '-')) {
+                                indent = PM_HEREDOC_INDENT_DASH;
+                            }
+                            else if (match(parser, '~')) {
+                                indent = PM_HEREDOC_INDENT_TILDE;
+                            }
+
+                            if (match(parser, '`')) {
+                                quote = PM_HEREDOC_QUOTE_BACKTICK;
+                            }
+                            else if (match(parser, '"')) {
+                                quote = PM_HEREDOC_QUOTE_DOUBLE;
+                            }
+                            else if (match(parser, '\'')) {
+                                quote = PM_HEREDOC_QUOTE_SINGLE;
+                            }
+
+                            const uint8_t *ident_start = parser->current.end;
+                            size_t width = 0;
+
+                            if (parser->current.end >= parser->end) {
+                                parser->current.end = end;
+                            } else if (quote == PM_HEREDOC_QUOTE_NONE && (width = char_is_identifier(parser, parser->current.end, parser->end - parser->current.end)) == 0) {
+                                parser->current.end = end;
+                            } else {
+                                if (quote == PM_HEREDOC_QUOTE_NONE) {
+                                    parser->current.end += width;
+
+                                    while ((width = char_is_identifier(parser, parser->current.end, parser->end - parser->current.end))) {
+                                        parser->current.end += width;
+                                    }
+                                } else {
+                                    // If we have quotes, then we're going to go until we find the
+                                    // end quote.
+                                    while ((parser->current.end < parser->end) && quote != (pm_heredoc_quote_t) (*parser->current.end)) {
+                                        if (*parser->current.end == '\r' || *parser->current.end == '\n') break;
+                                        parser->current.end++;
+                                    }
+                                }
+
+                                size_t ident_length = (size_t) (parser->current.end - ident_start);
+                                bool ident_error = false;
+
+                                if (quote != PM_HEREDOC_QUOTE_NONE && !match(parser, (uint8_t) quote)) {
+                                    pm_parser_err(parser, ident_start, ident_start + ident_length, PM_ERR_HEREDOC_IDENTIFIER);
+                                    ident_error = true;
+                                }
+
+                                parser->explicit_encoding = NULL;
+                                lex_mode_push(parser, (pm_lex_mode_t) {
+                                    .mode = PM_LEX_HEREDOC,
+                                    .as.heredoc = {
+                                        .base = {
+                                            .ident_start = ident_start,
+                                            .ident_length = ident_length,
+                                            .quote = quote,
+                                            .indent = indent
+                                        },
+                                        .next_start = parser->current.end,
+                                        .common_whitespace = NULL,
+                                        .line_continuation = false
+                                    }
+                                });
+
+                                if (parser->heredoc_end == NULL) {
+                                    const uint8_t *body_start = next_newline(parser->current.end, parser->end - parser->current.end);
+
+                                    if (body_start == NULL) {
+                                        // If there is no newline after the heredoc identifier, then
+                                        // this is not a valid heredoc declaration. In this case we
+                                        // will add an error, but we will still return a heredoc
+                                        // start.
+                                        if (!ident_error) pm_parser_err_heredoc_term(parser, ident_start, ident_length);
+                                        body_start = parser->end;
+                                    } else {
+                                        // Otherwise, we want to indicate that the body of the
+                                        // heredoc starts on the character after the next newline.
+                                        pm_newline_list_append(&parser->newline_list, body_start);
+                                        body_start++;
+                                    }
+
+                                    parser->next_start = body_start;
+                                } else {
+                                    parser->next_start = parser->heredoc_end;
+                                }
+
+                                LEX(PM_TOKEN_HEREDOC_START);
+                            }
+                        }
+
+                        if (match(parser, '=')) {
+                            lex_state_set(parser, PM_LEX_STATE_BEG);
+                            LEX(PM_TOKEN_LESS_LESS_EQUAL);
+                        }
+
+                        if (ambiguous_operator_p(parser, space_seen)) {
+                            PM_PARSER_WARN_TOKEN_FORMAT(parser, parser->current, PM_WARN_AMBIGUOUS_BINARY_OPERATOR, "<<", "here document");
+                        }
+
+                        if (lex_state_operator_p(parser)) {
+                            lex_state_set(parser, PM_LEX_STATE_ARG);
+                        } else {
+                            if (lex_state_p(parser, PM_LEX_STATE_CLASS)) parser->command_start = true;
+                            lex_state_set(parser, PM_LEX_STATE_BEG);
+                        }
+
+                        LEX(PM_TOKEN_LESS_LESS);
+                    }
+
+                    if (lex_state_operator_p(parser)) {
+                        lex_state_set(parser, PM_LEX_STATE_ARG);
+                    } else {
+                        if (lex_state_p(parser, PM_LEX_STATE_CLASS)) parser->command_start = true;
+                        lex_state_set(parser, PM_LEX_STATE_BEG);
+                    }
+
+                    if (match(parser, '=')) {
+                        if (match(parser, '>')) {
+                            LEX(PM_TOKEN_LESS_EQUAL_GREATER);
+                        }
+
+                        LEX(PM_TOKEN_LESS_EQUAL);
+                    }
+
+                    LEX(PM_TOKEN_LESS);
+
+                // > >> >>= >=
+                case '>':
+                    if (match(parser, '>')) {
+                        if (lex_state_operator_p(parser)) {
+                            lex_state_set(parser, PM_LEX_STATE_ARG);
+                        } else {
+                            lex_state_set(parser, PM_LEX_STATE_BEG);
+                        }
+                        LEX(match(parser, '=') ? PM_TOKEN_GREATER_GREATER_EQUAL : PM_TOKEN_GREATER_GREATER);
+                    }
+
+                    if (lex_state_operator_p(parser)) {
+                        lex_state_set(parser, PM_LEX_STATE_ARG);
+                    } else {
+                        lex_state_set(parser, PM_LEX_STATE_BEG);
+                    }
+
+                    LEX(match(parser, '=') ? PM_TOKEN_GREATER_EQUAL : PM_TOKEN_GREATER);
+
+                // double-quoted string literal
+                case '"': {
+                    bool label_allowed = (lex_state_p(parser, PM_LEX_STATE_LABEL | PM_LEX_STATE_ENDFN) && !previous_command_start) || lex_state_arg_p(parser);
+                    lex_mode_push_string(parser, true, label_allowed, '\0', '"');
+                    LEX(PM_TOKEN_STRING_BEGIN);
+                }
+
+                // xstring literal
+                case '`': {
+                    if (lex_state_p(parser, PM_LEX_STATE_FNAME)) {
+                        lex_state_set(parser, PM_LEX_STATE_ENDFN);
+                        LEX(PM_TOKEN_BACKTICK);
+                    }
+
+                    if (lex_state_p(parser, PM_LEX_STATE_DOT)) {
+                        if (previous_command_start) {
+                            lex_state_set(parser, PM_LEX_STATE_CMDARG);
+                        } else {
+                            lex_state_set(parser, PM_LEX_STATE_ARG);
+                        }
+
+                        LEX(PM_TOKEN_BACKTICK);
+                    }
+
+                    lex_mode_push_string(parser, true, false, '\0', '`');
+                    LEX(PM_TOKEN_BACKTICK);
+                }
+
+                // single-quoted string literal
+                case '\'': {
+                    bool label_allowed = (lex_state_p(parser, PM_LEX_STATE_LABEL | PM_LEX_STATE_ENDFN) && !previous_command_start) || lex_state_arg_p(parser);
+                    lex_mode_push_string(parser, false, label_allowed, '\0', '\'');
+                    LEX(PM_TOKEN_STRING_BEGIN);
+                }
+
+                // ? character literal
+                case '?':
+                    LEX(lex_question_mark(parser));
+
+                // & && &&= &=
+                case '&': {
+                    if (match(parser, '&')) {
+                        lex_state_set(parser, PM_LEX_STATE_BEG);
+
+                        if (match(parser, '=')) {
+                            LEX(PM_TOKEN_AMPERSAND_AMPERSAND_EQUAL);
+                        }
+
+                        LEX(PM_TOKEN_AMPERSAND_AMPERSAND);
+                    }
+
+                    if (match(parser, '=')) {
+                        lex_state_set(parser, PM_LEX_STATE_BEG);
+                        LEX(PM_TOKEN_AMPERSAND_EQUAL);
+                    }
+
+                    if (match(parser, '.')) {
+                        lex_state_set(parser, PM_LEX_STATE_DOT);
+                        LEX(PM_TOKEN_AMPERSAND_DOT);
+                    }
+
+                    pm_token_type_t type = PM_TOKEN_AMPERSAND;
+                    if (lex_state_spcarg_p(parser, space_seen)) {
+                        if ((peek(parser) != ':') || (peek_offset(parser, 1) == '\0')) {
+                            pm_parser_warn_token(parser, &parser->current, PM_WARN_AMBIGUOUS_PREFIX_AMPERSAND);
+                        } else {
+                            const uint8_t delim = peek_offset(parser, 1);
+
+                            if ((delim != '\'') && (delim != '"') && !char_is_identifier(parser, parser->current.end + 1, parser->end - (parser->current.end + 1))) {
+                                pm_parser_warn_token(parser, &parser->current, PM_WARN_AMBIGUOUS_PREFIX_AMPERSAND);
+                            }
+                        }
+
+                        type = PM_TOKEN_UAMPERSAND;
+                    } else if (lex_state_beg_p(parser)) {
+                        type = PM_TOKEN_UAMPERSAND;
+                    } else if (ambiguous_operator_p(parser, space_seen)) {
+                        PM_PARSER_WARN_TOKEN_FORMAT(parser, parser->current, PM_WARN_AMBIGUOUS_BINARY_OPERATOR, "&", "argument prefix");
+                    }
+
+                    if (lex_state_operator_p(parser)) {
+                        lex_state_set(parser, PM_LEX_STATE_ARG);
+                    } else {
+                        lex_state_set(parser, PM_LEX_STATE_BEG);
+                    }
+
+                    LEX(type);
+                }
+
+                // | || ||= |=
+                case '|':
+                    if (match(parser, '|')) {
+                        if (match(parser, '=')) {
+                            lex_state_set(parser, PM_LEX_STATE_BEG);
+                            LEX(PM_TOKEN_PIPE_PIPE_EQUAL);
+                        }
+
+                        if (lex_state_p(parser, PM_LEX_STATE_BEG)) {
+                            parser->current.end--;
+                            LEX(PM_TOKEN_PIPE);
+                        }
+
+                        lex_state_set(parser, PM_LEX_STATE_BEG);
+                        LEX(PM_TOKEN_PIPE_PIPE);
+                    }
+
+                    if (match(parser, '=')) {
+                        lex_state_set(parser, PM_LEX_STATE_BEG);
+                        LEX(PM_TOKEN_PIPE_EQUAL);
+                    }
+
+                    if (lex_state_operator_p(parser)) {
+                        lex_state_set(parser, PM_LEX_STATE_ARG);
+                    } else {
+                        lex_state_set(parser, PM_LEX_STATE_BEG | PM_LEX_STATE_LABEL);
+                    }
+
+                    LEX(PM_TOKEN_PIPE);
+
+                // + += +@
+                case '+': {
+                    if (lex_state_operator_p(parser)) {
+                        lex_state_set(parser, PM_LEX_STATE_ARG);
+
+                        if (match(parser, '@')) {
+                            LEX(PM_TOKEN_UPLUS);
+                        }
+
+                        LEX(PM_TOKEN_PLUS);
+                    }
+
+                    if (match(parser, '=')) {
+                        lex_state_set(parser, PM_LEX_STATE_BEG);
+                        LEX(PM_TOKEN_PLUS_EQUAL);
+                    }
+
+                    if (
+                        lex_state_beg_p(parser) ||
+                        (lex_state_spcarg_p(parser, space_seen) ? (pm_parser_warn_token(parser, &parser->current, PM_WARN_AMBIGUOUS_FIRST_ARGUMENT_PLUS), true) : false)
+                    ) {
+                        lex_state_set(parser, PM_LEX_STATE_BEG);
+
+                        if (pm_char_is_decimal_digit(peek(parser))) {
+                            parser->current.end++;
+                            pm_token_type_t type = lex_numeric(parser);
+                            lex_state_set(parser, PM_LEX_STATE_END);
+                            LEX(type);
+                        }
+
+                        LEX(PM_TOKEN_UPLUS);
+                    }
+
+                    if (ambiguous_operator_p(parser, space_seen)) {
+                        PM_PARSER_WARN_TOKEN_FORMAT(parser, parser->current, PM_WARN_AMBIGUOUS_BINARY_OPERATOR, "+", "unary operator");
+                    }
+
+                    lex_state_set(parser, PM_LEX_STATE_BEG);
+                    LEX(PM_TOKEN_PLUS);
+                }
+
+                // - -= -@
+                case '-': {
+                    if (lex_state_operator_p(parser)) {
+                        lex_state_set(parser, PM_LEX_STATE_ARG);
+
+                        if (match(parser, '@')) {
+                            LEX(PM_TOKEN_UMINUS);
+                        }
+
+                        LEX(PM_TOKEN_MINUS);
+                    }
+
+                    if (match(parser, '=')) {
+                        lex_state_set(parser, PM_LEX_STATE_BEG);
+                        LEX(PM_TOKEN_MINUS_EQUAL);
+                    }
+
+                    if (match(parser, '>')) {
+                        lex_state_set(parser, PM_LEX_STATE_ENDFN);
+                        LEX(PM_TOKEN_MINUS_GREATER);
+                    }
+
+                    bool spcarg = lex_state_spcarg_p(parser, space_seen);
+                    bool is_beg = lex_state_beg_p(parser);
+                    if (!is_beg && spcarg) {
+                        pm_parser_warn_token(parser, &parser->current, PM_WARN_AMBIGUOUS_FIRST_ARGUMENT_MINUS);
+                    }
+
+                    if (is_beg || spcarg) {
+                        lex_state_set(parser, PM_LEX_STATE_BEG);
+                        LEX(pm_char_is_decimal_digit(peek(parser)) ? PM_TOKEN_UMINUS_NUM : PM_TOKEN_UMINUS);
+                    }
+
+                    if (ambiguous_operator_p(parser, space_seen)) {
+                        PM_PARSER_WARN_TOKEN_FORMAT(parser, parser->current, PM_WARN_AMBIGUOUS_BINARY_OPERATOR, "-", "unary operator");
+                    }
+
+                    lex_state_set(parser, PM_LEX_STATE_BEG);
+                    LEX(PM_TOKEN_MINUS);
+                }
+
+                // . .. ...
+                case '.': {
+                    bool beg_p = lex_state_beg_p(parser);
+
+                    if (match(parser, '.')) {
+                        if (match(parser, '.')) {
+                            // If we're _not_ inside a range within default parameters
+                            if (!context_p(parser, PM_CONTEXT_DEFAULT_PARAMS) && context_p(parser, PM_CONTEXT_DEF_PARAMS)) {
+                                if (lex_state_p(parser, PM_LEX_STATE_END)) {
+                                    lex_state_set(parser, PM_LEX_STATE_BEG);
+                                } else {
+                                    lex_state_set(parser, PM_LEX_STATE_ENDARG);
+                                }
+                                LEX(PM_TOKEN_UDOT_DOT_DOT);
+                            }
+
+                            if (parser->enclosure_nesting == 0 && parser_end_of_line_p(parser)) {
+                                pm_parser_warn_token(parser, &parser->current, PM_WARN_DOT_DOT_DOT_EOL);
+                            }
+
+                            lex_state_set(parser, PM_LEX_STATE_BEG);
+                            LEX(beg_p ? PM_TOKEN_UDOT_DOT_DOT : PM_TOKEN_DOT_DOT_DOT);
+                        }
+
+                        lex_state_set(parser, PM_LEX_STATE_BEG);
+                        LEX(beg_p ? PM_TOKEN_UDOT_DOT : PM_TOKEN_DOT_DOT);
+                    }
+
+                    lex_state_set(parser, PM_LEX_STATE_DOT);
+                    LEX(PM_TOKEN_DOT);
+                }
+
+                // integer
+                case '0':
+                case '1':
+                case '2':
+                case '3':
+                case '4':
+                case '5':
+                case '6':
+                case '7':
+                case '8':
+                case '9': {
+                    pm_token_type_t type = lex_numeric(parser);
+                    lex_state_set(parser, PM_LEX_STATE_END);
+                    LEX(type);
+                }
+
+                // :: symbol
+                case ':':
+                    if (match(parser, ':')) {
+                        if (lex_state_beg_p(parser) || lex_state_p(parser, PM_LEX_STATE_CLASS) || (lex_state_p(parser, PM_LEX_STATE_ARG_ANY) && space_seen)) {
+                            lex_state_set(parser, PM_LEX_STATE_BEG);
+                            LEX(PM_TOKEN_UCOLON_COLON);
+                        }
+
+                        lex_state_set(parser, PM_LEX_STATE_DOT);
+                        LEX(PM_TOKEN_COLON_COLON);
+                    }
+
+                    if (lex_state_end_p(parser) || pm_char_is_whitespace(peek(parser)) || peek(parser) == '#') {
+                        lex_state_set(parser, PM_LEX_STATE_BEG);
+                        LEX(PM_TOKEN_COLON);
+                    }
+
+                    if (peek(parser) == '"' || peek(parser) == '\'') {
+                        lex_mode_push_string(parser, peek(parser) == '"', false, '\0', *parser->current.end);
+                        parser->current.end++;
+                    }
+
+                    lex_state_set(parser, PM_LEX_STATE_FNAME);
+                    LEX(PM_TOKEN_SYMBOL_BEGIN);
+
+                // / /=
+                case '/':
+                    if (lex_state_beg_p(parser)) {
+                        lex_mode_push_regexp(parser, '\0', '/');
+                        LEX(PM_TOKEN_REGEXP_BEGIN);
+                    }
+
+                    if (match(parser, '=')) {
+                        lex_state_set(parser, PM_LEX_STATE_BEG);
+                        LEX(PM_TOKEN_SLASH_EQUAL);
+                    }
+
+                    if (lex_state_spcarg_p(parser, space_seen)) {
+                        pm_parser_warn_token(parser, &parser->current, PM_WARN_AMBIGUOUS_SLASH);
+                        lex_mode_push_regexp(parser, '\0', '/');
+                        LEX(PM_TOKEN_REGEXP_BEGIN);
+                    }
+
+                    if (ambiguous_operator_p(parser, space_seen)) {
+                        PM_PARSER_WARN_TOKEN_FORMAT(parser, parser->current, PM_WARN_AMBIGUOUS_BINARY_OPERATOR, "/", "regexp literal");
+                    }
+
+                    if (lex_state_operator_p(parser)) {
+                        lex_state_set(parser, PM_LEX_STATE_ARG);
+                    } else {
+                        lex_state_set(parser, PM_LEX_STATE_BEG);
+                    }
+
+                    LEX(PM_TOKEN_SLASH);
+
+                // ^ ^=
+                case '^':
+                    if (lex_state_operator_p(parser)) {
+                        lex_state_set(parser, PM_LEX_STATE_ARG);
+                    } else {
+                        lex_state_set(parser, PM_LEX_STATE_BEG);
+                    }
+                    LEX(match(parser, '=') ? PM_TOKEN_CARET_EQUAL : PM_TOKEN_CARET);
+
+                // ~ ~@
+                case '~':
+                    if (lex_state_operator_p(parser)) {
+                        (void) match(parser, '@');
+                        lex_state_set(parser, PM_LEX_STATE_ARG);
+                    } else {
+                        lex_state_set(parser, PM_LEX_STATE_BEG);
+                    }
+
+                    LEX(PM_TOKEN_TILDE);
+
+                // % %= %i %I %q %Q %w %W
+                case '%': {
+                    // If there is no subsequent character then we have an
+                    // invalid token. We're going to say it's the percent
+                    // operator because we don't want to move into the string
+                    // lex mode unnecessarily.
+                    if ((lex_state_beg_p(parser) || lex_state_arg_p(parser)) && (parser->current.end >= parser->end)) {
+                        pm_parser_err_current(parser, PM_ERR_INVALID_PERCENT_EOF);
+                        LEX(PM_TOKEN_PERCENT);
+                    }
+
+                    if (!lex_state_beg_p(parser) && match(parser, '=')) {
+                        lex_state_set(parser, PM_LEX_STATE_BEG);
+                        LEX(PM_TOKEN_PERCENT_EQUAL);
+                    } else if (
+                        lex_state_beg_p(parser) ||
+                        (lex_state_p(parser, PM_LEX_STATE_FITEM) && (peek(parser) == 's')) ||
+                        lex_state_spcarg_p(parser, space_seen)
+                    ) {
+                        if (!parser->encoding->alnum_char(parser->current.end, parser->end - parser->current.end)) {
+                            if (*parser->current.end >= 0x80) {
+                                pm_parser_err_current(parser, PM_ERR_INVALID_PERCENT);
+                            }
+
+                            const uint8_t delimiter = pm_lex_percent_delimiter(parser);
+                            lex_mode_push_string(parser, true, false, lex_mode_incrementor(delimiter), lex_mode_terminator(delimiter));
+                            LEX(PM_TOKEN_STRING_BEGIN);
+                        }
+
+                        // Delimiters for %-literals cannot be alphanumeric. We
+                        // validate that here.
+                        uint8_t delimiter = peek_offset(parser, 1);
+                        if (delimiter >= 0x80 || parser->encoding->alnum_char(&delimiter, 1)) {
+                            pm_parser_err_current(parser, PM_ERR_INVALID_PERCENT);
+                            goto lex_next_token;
+                        }
+
+                        switch (peek(parser)) {
+                            case 'i': {
+                                parser->current.end++;
+
+                                if (parser->current.end < parser->end) {
+                                    lex_mode_push_list(parser, false, pm_lex_percent_delimiter(parser));
+                                } else {
+                                    lex_mode_push_list_eof(parser);
+                                }
+
+                                LEX(PM_TOKEN_PERCENT_LOWER_I);
+                            }
+                            case 'I': {
+                                parser->current.end++;
+
+                                if (parser->current.end < parser->end) {
+                                    lex_mode_push_list(parser, true, pm_lex_percent_delimiter(parser));
+                                } else {
+                                    lex_mode_push_list_eof(parser);
+                                }
+
+                                LEX(PM_TOKEN_PERCENT_UPPER_I);
+                            }
+                            case 'r': {
+                                parser->current.end++;
+
+                                if (parser->current.end < parser->end) {
+                                    const uint8_t delimiter = pm_lex_percent_delimiter(parser);
+                                    lex_mode_push_regexp(parser, lex_mode_incrementor(delimiter), lex_mode_terminator(delimiter));
+                                } else {
+                                    lex_mode_push_regexp(parser, '\0', '\0');
+                                }
+
+                                LEX(PM_TOKEN_REGEXP_BEGIN);
+                            }
+                            case 'q': {
+                                parser->current.end++;
+
+                                if (parser->current.end < parser->end) {
+                                    const uint8_t delimiter = pm_lex_percent_delimiter(parser);
+                                    lex_mode_push_string(parser, false, false, lex_mode_incrementor(delimiter), lex_mode_terminator(delimiter));
+                                } else {
+                                    lex_mode_push_string_eof(parser);
+                                }
+
+                                LEX(PM_TOKEN_STRING_BEGIN);
+                            }
+                            case 'Q': {
+                                parser->current.end++;
+
+                                if (parser->current.end < parser->end) {
+                                    const uint8_t delimiter = pm_lex_percent_delimiter(parser);
+                                    lex_mode_push_string(parser, true, false, lex_mode_incrementor(delimiter), lex_mode_terminator(delimiter));
+                                } else {
+                                    lex_mode_push_string_eof(parser);
+                                }
+
+                                LEX(PM_TOKEN_STRING_BEGIN);
+                            }
+                            case 's': {
+                                parser->current.end++;
+
+                                if (parser->current.end < parser->end) {
+                                    const uint8_t delimiter = pm_lex_percent_delimiter(parser);
+                                    lex_mode_push_string(parser, false, false, lex_mode_incrementor(delimiter), lex_mode_terminator(delimiter));
+                                    lex_state_set(parser, PM_LEX_STATE_FNAME | PM_LEX_STATE_FITEM);
+                                } else {
+                                    lex_mode_push_string_eof(parser);
+                                }
+
+                                LEX(PM_TOKEN_SYMBOL_BEGIN);
+                            }
+                            case 'w': {
+                                parser->current.end++;
+
+                                if (parser->current.end < parser->end) {
+                                    lex_mode_push_list(parser, false, pm_lex_percent_delimiter(parser));
+                                } else {
+                                    lex_mode_push_list_eof(parser);
+                                }
+
+                                LEX(PM_TOKEN_PERCENT_LOWER_W);
+                            }
+                            case 'W': {
+                                parser->current.end++;
+
+                                if (parser->current.end < parser->end) {
+                                    lex_mode_push_list(parser, true, pm_lex_percent_delimiter(parser));
+                                } else {
+                                    lex_mode_push_list_eof(parser);
+                                }
+
+                                LEX(PM_TOKEN_PERCENT_UPPER_W);
+                            }
+                            case 'x': {
+                                parser->current.end++;
+
+                                if (parser->current.end < parser->end) {
+                                    const uint8_t delimiter = pm_lex_percent_delimiter(parser);
+                                    lex_mode_push_string(parser, true, false, lex_mode_incrementor(delimiter), lex_mode_terminator(delimiter));
+                                } else {
+                                    lex_mode_push_string_eof(parser);
+                                }
+
+                                LEX(PM_TOKEN_PERCENT_LOWER_X);
+                            }
+                            default:
+                                // If we get to this point, then we have a % that is completely
+                                // unparsable. In this case we'll just drop it from the parser
+                                // and skip past it and hope that the next token is something
+                                // that we can parse.
+                                pm_parser_err_current(parser, PM_ERR_INVALID_PERCENT);
+                                goto lex_next_token;
+                        }
+                    }
+
+                    if (ambiguous_operator_p(parser, space_seen)) {
+                        PM_PARSER_WARN_TOKEN_FORMAT(parser, parser->current, PM_WARN_AMBIGUOUS_BINARY_OPERATOR, "%", "string literal");
+                    }
+
+                    lex_state_set(parser, lex_state_operator_p(parser) ? PM_LEX_STATE_ARG : PM_LEX_STATE_BEG);
+                    LEX(PM_TOKEN_PERCENT);
+                }
+
+                // global variable
+                case '$': {
+                    pm_token_type_t type = lex_global_variable(parser);
+
+                    // If we're lexing an embedded variable, then we need to pop back into
+                    // the parent lex context.
+                    if (parser->lex_modes.current->mode == PM_LEX_EMBVAR) {
+                        lex_mode_pop(parser);
+                    }
+
+                    lex_state_set(parser, PM_LEX_STATE_END);
+                    LEX(type);
+                }
+
+                // instance variable, class variable
+                case '@':
+                    lex_state_set(parser, parser->lex_state & PM_LEX_STATE_FNAME ? PM_LEX_STATE_ENDFN : PM_LEX_STATE_END);
+                    LEX(lex_at_variable(parser));
+
+                default: {
+                    if (*parser->current.start != '_') {
+                        size_t width = char_is_identifier_start(parser, parser->current.start, parser->end - parser->current.start);
+
+                        // If this isn't the beginning of an identifier, then
+                        // it's an invalid token as we've exhausted all of the
+                        // other options. We'll skip past it and return the next
+                        // token after adding an appropriate error message.
+                        if (!width) {
+                            if (*parser->current.start >= 0x80) {
+                                PM_PARSER_ERR_TOKEN_FORMAT(parser, parser->current, PM_ERR_INVALID_MULTIBYTE_CHARACTER, *parser->current.start);
+                            } else if (*parser->current.start == '\\') {
+                                switch (peek_at(parser, parser->current.start + 1)) {
+                                    case ' ':
+                                        parser->current.end++;
+                                        PM_PARSER_ERR_TOKEN_FORMAT(parser, parser->current, PM_ERR_UNEXPECTED_TOKEN_IGNORE, "escaped space");
+                                        break;
+                                    case '\f':
+                                        parser->current.end++;
+                                        PM_PARSER_ERR_TOKEN_FORMAT(parser, parser->current, PM_ERR_UNEXPECTED_TOKEN_IGNORE, "escaped form feed");
+                                        break;
+                                    case '\t':
+                                        parser->current.end++;
+                                        PM_PARSER_ERR_TOKEN_FORMAT(parser, parser->current, PM_ERR_UNEXPECTED_TOKEN_IGNORE, "escaped horizontal tab");
+                                        break;
+                                    case '\v':
+                                        parser->current.end++;
+                                        PM_PARSER_ERR_TOKEN_FORMAT(parser, parser->current, PM_ERR_UNEXPECTED_TOKEN_IGNORE, "escaped vertical tab");
+                                        break;
+                                    case '\r':
+                                        if (peek_at(parser, parser->current.start + 2) != '\n') {
+                                            parser->current.end++;
+                                            PM_PARSER_ERR_TOKEN_FORMAT(parser, parser->current, PM_ERR_UNEXPECTED_TOKEN_IGNORE, "escaped carriage return");
+                                            break;
+                                        }
+                                        PRISM_FALLTHROUGH
+                                    default:
+                                        PM_PARSER_ERR_TOKEN_FORMAT(parser, parser->current, PM_ERR_UNEXPECTED_TOKEN_IGNORE, "backslash");
+                                        break;
+                                }
+                            } else if (char_is_ascii_printable(*parser->current.start)) {
+                                PM_PARSER_ERR_TOKEN_FORMAT(parser, parser->current, PM_ERR_INVALID_PRINTABLE_CHARACTER, *parser->current.start);
+                            } else {
+                                PM_PARSER_ERR_TOKEN_FORMAT(parser, parser->current, PM_ERR_INVALID_CHARACTER, *parser->current.start);
+                            }
+
+                            goto lex_next_token;
+                        }
+
+                        parser->current.end = parser->current.start + width;
+                    }
+
+                    pm_token_type_t type = lex_identifier(parser, previous_command_start);
+
+                    // If we've hit a __END__ and it was at the start of the
+                    // line or the start of the file and it is followed by
+                    // either a \n or a \r\n, then this is the last token of the
+                    // file.
+                    if (
+                        ((parser->current.end - parser->current.start) == 7) &&
+                        current_token_starts_line(parser) &&
+                        (memcmp(parser->current.start, "__END__", 7) == 0) &&
+                        (parser->current.end == parser->end || match_eol(parser))
+                    ) {
+                        // Since we know we're about to add an __END__ comment,
+                        // we know we need to add all of the newlines to get the
+                        // correct column information for it.
+                        const uint8_t *cursor = parser->current.end;
+                        while ((cursor = next_newline(cursor, parser->end - cursor)) != NULL) {
+                            pm_newline_list_append(&parser->newline_list, cursor++);
+                        }
+
+                        parser->current.end = parser->end;
+                        parser->current.type = PM_TOKEN___END__;
+                        parser_lex_callback(parser);
+
+                        parser->data_loc.start = parser->current.start;
+                        parser->data_loc.end = parser->current.end;
+
+                        LEX(PM_TOKEN_EOF);
+                    }
+
+                    pm_lex_state_t last_state = parser->lex_state;
+
+                    if (type == PM_TOKEN_IDENTIFIER || type == PM_TOKEN_CONSTANT || type == PM_TOKEN_METHOD_NAME) {
+                        if (lex_state_p(parser, PM_LEX_STATE_BEG_ANY | PM_LEX_STATE_ARG_ANY | PM_LEX_STATE_DOT)) {
+                            if (previous_command_start) {
+                                lex_state_set(parser, PM_LEX_STATE_CMDARG);
+                            } else {
+                                lex_state_set(parser, PM_LEX_STATE_ARG);
+                            }
+                        } else if (parser->lex_state == PM_LEX_STATE_FNAME) {
+                            lex_state_set(parser, PM_LEX_STATE_ENDFN);
+                        } else {
+                            lex_state_set(parser, PM_LEX_STATE_END);
+                        }
+                    }
+
+                    if (
+                        !(last_state & (PM_LEX_STATE_DOT | PM_LEX_STATE_FNAME)) &&
+                        (type == PM_TOKEN_IDENTIFIER) &&
+                        ((pm_parser_local_depth(parser, &parser->current) != -1) ||
+                         pm_token_is_numbered_parameter(parser->current.start, parser->current.end))
+                    ) {
+                        lex_state_set(parser, PM_LEX_STATE_END | PM_LEX_STATE_LABEL);
+                    }
+
+                    LEX(type);
+                }
+            }
+        }
+        case PM_LEX_LIST: {
+            if (parser->next_start != NULL) {
+                parser->current.end = parser->next_start;
+                parser->next_start = NULL;
+            }
+
+            // First we'll set the beginning of the token.
+            parser->current.start = parser->current.end;
+
+            // If there's any whitespace at the start of the list, then we're
+            // going to trim it off the beginning and create a new token.
+            size_t whitespace;
+
+            if (parser->heredoc_end) {
+                whitespace = pm_strspn_inline_whitespace(parser->current.end, parser->end - parser->current.end);
+                if (peek_offset(parser, (ptrdiff_t)whitespace) == '\n') {
+                    whitespace += 1;
+                }
+            } else {
+                whitespace = pm_strspn_whitespace_newlines(parser->current.end, parser->end - parser->current.end, &parser->newline_list);
+            }
+
+            if (whitespace > 0) {
+                parser->current.end += whitespace;
+                if (peek_offset(parser, -1) == '\n') {
+                    // mutates next_start
+                    parser_flush_heredoc_end(parser);
+                }
+                LEX(PM_TOKEN_WORDS_SEP);
+            }
+
+            // We'll check if we're at the end of the file. If we are, then we
+            // need to return the EOF token.
+            if (parser->current.end >= parser->end) {
+                LEX(PM_TOKEN_EOF);
+            }
+
+            // Here we'll get a list of the places where strpbrk should break,
+            // and then find the first one.
+            pm_lex_mode_t *lex_mode = parser->lex_modes.current;
+            const uint8_t *breakpoints = lex_mode->as.list.breakpoints;
+            const uint8_t *breakpoint = pm_strpbrk(parser, parser->current.end, breakpoints, parser->end - parser->current.end, true);
+
+            // If we haven't found an escape yet, then this buffer will be
+            // unallocated since we can refer directly to the source string.
+            pm_token_buffer_t token_buffer = { 0 };
+
+            while (breakpoint != NULL) {
+                // If we hit whitespace, then we must have received content by
+                // now, so we can return an element of the list.
+                if (pm_char_is_whitespace(*breakpoint)) {
+                    parser->current.end = breakpoint;
+                    pm_token_buffer_flush(parser, &token_buffer);
+                    LEX(PM_TOKEN_STRING_CONTENT);
+                }
+
+                // If we hit the terminator, we need to check which token to
+                // return.
+                if (*breakpoint == lex_mode->as.list.terminator) {
+                    // If this terminator doesn't actually close the list, then
+                    // we need to continue on past it.
+                    if (lex_mode->as.list.nesting > 0) {
+                        parser->current.end = breakpoint + 1;
+                        breakpoint = pm_strpbrk(parser, parser->current.end, breakpoints, parser->end - parser->current.end, true);
+                        lex_mode->as.list.nesting--;
+                        continue;
+                    }
+
+                    // If we've hit the terminator and we've already skipped
+                    // past content, then we can return a list node.
+                    if (breakpoint > parser->current.start) {
+                        parser->current.end = breakpoint;
+                        pm_token_buffer_flush(parser, &token_buffer);
+                        LEX(PM_TOKEN_STRING_CONTENT);
+                    }
+
+                    // Otherwise, switch back to the default state and return
+                    // the end of the list.
+                    parser->current.end = breakpoint + 1;
+                    lex_mode_pop(parser);
+                    lex_state_set(parser, PM_LEX_STATE_END);
+                    LEX(PM_TOKEN_STRING_END);
+                }
+
+                // If we hit a null byte, skip directly past it.
+                if (*breakpoint == '\0') {
+                    breakpoint = pm_strpbrk(parser, breakpoint + 1, breakpoints, parser->end - (breakpoint + 1), true);
+                    continue;
+                }
+
+                // If we hit escapes, then we need to treat the next token
+                // literally. In this case we'll skip past the next character
+                // and find the next breakpoint.
+                if (*breakpoint == '\\') {
+                    parser->current.end = breakpoint + 1;
+
+                    // If we've hit the end of the file, then break out of the
+                    // loop by setting the breakpoint to NULL.
+                    if (parser->current.end == parser->end) {
+                        breakpoint = NULL;
+                        continue;
+                    }
+
+                    pm_token_buffer_escape(parser, &token_buffer);
+                    uint8_t peeked = peek(parser);
+
+                    switch (peeked) {
+                        case ' ':
+                        case '\f':
+                        case '\t':
+                        case '\v':
+                        case '\\':
+                            pm_token_buffer_push_byte(&token_buffer, peeked);
+                            parser->current.end++;
+                            break;
+                        case '\r':
+                            parser->current.end++;
+                            if (peek(parser) != '\n') {
+                                pm_token_buffer_push_byte(&token_buffer, '\r');
+                                break;
+                            }
+                        PRISM_FALLTHROUGH
+                        case '\n':
+                            pm_token_buffer_push_byte(&token_buffer, '\n');
+
+                            if (parser->heredoc_end) {
+                                // ... if we are on the same line as a heredoc,
+                                // flush the heredoc and continue parsing after
+                                // heredoc_end.
+                                parser_flush_heredoc_end(parser);
+                                pm_token_buffer_copy(parser, &token_buffer);
+                                LEX(PM_TOKEN_STRING_CONTENT);
+                            } else {
+                                // ... else track the newline.
+                                pm_newline_list_append(&parser->newline_list, parser->current.end);
+                            }
+
+                            parser->current.end++;
+                            break;
+                        default:
+                            if (peeked == lex_mode->as.list.incrementor || peeked == lex_mode->as.list.terminator) {
+                                pm_token_buffer_push_byte(&token_buffer, peeked);
+                                parser->current.end++;
+                            } else if (lex_mode->as.list.interpolation) {
+                                escape_read(parser, &token_buffer.buffer, NULL, PM_ESCAPE_FLAG_NONE);
+                            } else {
+                                pm_token_buffer_push_byte(&token_buffer, '\\');
+                                pm_token_buffer_push_escaped(&token_buffer, parser);
+                            }
+
+                            break;
+                    }
+
+                    token_buffer.cursor = parser->current.end;
+                    breakpoint = pm_strpbrk(parser, parser->current.end, breakpoints, parser->end - parser->current.end, true);
+                    continue;
+                }
+
+                // If we hit a #, then we will attempt to lex interpolation.
+                if (*breakpoint == '#') {
+                    pm_token_type_t type = lex_interpolation(parser, breakpoint);
+
+                    if (type == PM_TOKEN_NOT_PROVIDED) {
+                        // If we haven't returned at this point then we had something
+                        // that looked like an interpolated class or instance variable
+                        // like "#@" but wasn't actually. In this case we'll just skip
+                        // to the next breakpoint.
+                        breakpoint = pm_strpbrk(parser, parser->current.end, breakpoints, parser->end - parser->current.end, true);
+                        continue;
+                    }
+
+                    if (type == PM_TOKEN_STRING_CONTENT) {
+                        pm_token_buffer_flush(parser, &token_buffer);
+                    }
+
+                    LEX(type);
+                }
+
+                // If we've hit the incrementor, then we need to skip past it
+                // and find the next breakpoint.
+                assert(*breakpoint == lex_mode->as.list.incrementor);
+                parser->current.end = breakpoint + 1;
+                breakpoint = pm_strpbrk(parser, parser->current.end, breakpoints, parser->end - parser->current.end, true);
+                lex_mode->as.list.nesting++;
+                continue;
+            }
+
+            if (parser->current.end > parser->current.start) {
+                pm_token_buffer_flush(parser, &token_buffer);
+                LEX(PM_TOKEN_STRING_CONTENT);
+            }
+
+            // If we were unable to find a breakpoint, then this token hits the
+            // end of the file.
+            parser->current.end = parser->end;
+            pm_token_buffer_flush(parser, &token_buffer);
+            LEX(PM_TOKEN_STRING_CONTENT);
+        }
+        case PM_LEX_REGEXP: {
+            // First, we'll set to start of this token to be the current end.
+            if (parser->next_start == NULL) {
+                parser->current.start = parser->current.end;
+            } else {
+                parser->current.start = parser->next_start;
+                parser->current.end = parser->next_start;
+                parser->next_start = NULL;
+            }
+
+            // We'll check if we're at the end of the file. If we are, then we
+            // need to return the EOF token.
+            if (parser->current.end >= parser->end) {
+                LEX(PM_TOKEN_EOF);
+            }
+
+            // Get a reference to the current mode.
+            pm_lex_mode_t *lex_mode = parser->lex_modes.current;
+
+            // These are the places where we need to split up the content of the
+            // regular expression. We'll use strpbrk to find the first of these
+            // characters.
+            const uint8_t *breakpoints = lex_mode->as.regexp.breakpoints;
+            const uint8_t *breakpoint = pm_strpbrk(parser, parser->current.end, breakpoints, parser->end - parser->current.end, false);
+            pm_regexp_token_buffer_t token_buffer = { 0 };
+
+            while (breakpoint != NULL) {
+                uint8_t term = lex_mode->as.regexp.terminator;
+                bool is_terminator = (*breakpoint == term);
+
+                // If the terminator is newline, we need to consider \r\n _also_ a newline
+                // For example: `%\nfoo\r\n`
+                // The string should be "foo", not "foo\r"
+                if (*breakpoint == '\r' && peek_at(parser, breakpoint + 1) == '\n') {
+                    if (term == '\n') {
+                        is_terminator = true;
+                    }
+
+                    // If the terminator is a CR, but we see a CRLF, we need to
+                    // treat the CRLF as a newline, meaning this is _not_ the
+                    // terminator
+                    if (term == '\r') {
+                        is_terminator = false;
+                    }
+                }
+
+                // If we hit the terminator, we need to determine what kind of
+                // token to return.
+                if (is_terminator) {
+                    if (lex_mode->as.regexp.nesting > 0) {
+                        parser->current.end = breakpoint + 1;
+                        breakpoint = pm_strpbrk(parser, parser->current.end, breakpoints, parser->end - parser->current.end, false);
+                        lex_mode->as.regexp.nesting--;
+                        continue;
+                    }
+
+                    // Here we've hit the terminator. If we have already consumed
+                    // content then we need to return that content as string content
+                    // first.
+                    if (breakpoint > parser->current.start) {
+                        parser->current.end = breakpoint;
+                        pm_regexp_token_buffer_flush(parser, &token_buffer);
+                        LEX(PM_TOKEN_STRING_CONTENT);
+                    }
+
+                    // Check here if we need to track the newline.
+                    size_t eol_length = match_eol_at(parser, breakpoint);
+                    if (eol_length) {
+                        parser->current.end = breakpoint + eol_length;
+                        pm_newline_list_append(&parser->newline_list, parser->current.end - 1);
+                    } else {
+                        parser->current.end = breakpoint + 1;
+                    }
+
+                    // Since we've hit the terminator of the regular expression,
+                    // we now need to parse the options.
+                    parser->current.end += pm_strspn_regexp_option(parser->current.end, parser->end - parser->current.end);
+
+                    lex_mode_pop(parser);
+                    lex_state_set(parser, PM_LEX_STATE_END);
+                    LEX(PM_TOKEN_REGEXP_END);
+                }
+
+                // If we've hit the incrementor, then we need to skip past it
+                // and find the next breakpoint.
+                if (*breakpoint && *breakpoint == lex_mode->as.regexp.incrementor) {
+                    parser->current.end = breakpoint + 1;
+                    breakpoint = pm_strpbrk(parser, parser->current.end, breakpoints, parser->end - parser->current.end, false);
+                    lex_mode->as.regexp.nesting++;
+                    continue;
+                }
+
+                switch (*breakpoint) {
+                    case '\0':
+                        // If we hit a null byte, skip directly past it.
+                        parser->current.end = breakpoint + 1;
+                        breakpoint = pm_strpbrk(parser, parser->current.end, breakpoints, parser->end - parser->current.end, false);
+                        break;
+                    case '\r':
+                        if (peek_at(parser, breakpoint + 1) != '\n') {
+                            parser->current.end = breakpoint + 1;
+                            breakpoint = pm_strpbrk(parser, parser->current.end, breakpoints, parser->end - parser->current.end, false);
+                            break;
+                        }
+
+                        breakpoint++;
+                        parser->current.end = breakpoint;
+                        pm_regexp_token_buffer_escape(parser, &token_buffer);
+                        token_buffer.base.cursor = breakpoint;
+
+                        PRISM_FALLTHROUGH
+                    case '\n':
+                        // If we've hit a newline, then we need to track that in
+                        // the list of newlines.
+                        if (parser->heredoc_end == NULL) {
+                            pm_newline_list_append(&parser->newline_list, breakpoint);
+                            parser->current.end = breakpoint + 1;
+                            breakpoint = pm_strpbrk(parser, parser->current.end, breakpoints, parser->end - parser->current.end, false);
+                            break;
+                        }
+
+                        parser->current.end = breakpoint + 1;
+                        parser_flush_heredoc_end(parser);
+                        pm_regexp_token_buffer_flush(parser, &token_buffer);
+                        LEX(PM_TOKEN_STRING_CONTENT);
+                    case '\\': {
+                        // If we hit escapes, then we need to treat the next
+                        // token literally. In this case we'll skip past the
+                        // next character and find the next breakpoint.
+                        parser->current.end = breakpoint + 1;
+
+                        // If we've hit the end of the file, then break out of
+                        // the loop by setting the breakpoint to NULL.
+                        if (parser->current.end == parser->end) {
+                            breakpoint = NULL;
+                            break;
+                        }
+
+                        pm_regexp_token_buffer_escape(parser, &token_buffer);
+                        uint8_t peeked = peek(parser);
+
+                        switch (peeked) {
+                            case '\r':
+                                parser->current.end++;
+                                if (peek(parser) != '\n') {
+                                    if (lex_mode->as.regexp.terminator != '\r') {
+                                        pm_token_buffer_push_byte(&token_buffer.base, '\\');
+                                    }
+                                    pm_regexp_token_buffer_push_byte(&token_buffer, '\r');
+                                    pm_token_buffer_push_byte(&token_buffer.base, '\r');
+                                    break;
+                                }
+                            PRISM_FALLTHROUGH
+                            case '\n':
+                                if (parser->heredoc_end) {
+                                    // ... if we are on the same line as a heredoc,
+                                    // flush the heredoc and continue parsing after
+                                    // heredoc_end.
+                                    parser_flush_heredoc_end(parser);
+                                    pm_regexp_token_buffer_copy(parser, &token_buffer);
+                                    LEX(PM_TOKEN_STRING_CONTENT);
+                                } else {
+                                    // ... else track the newline.
+                                    pm_newline_list_append(&parser->newline_list, parser->current.end);
+                                }
+
+                                parser->current.end++;
+                                break;
+                            case 'c':
+                            case 'C':
+                            case 'M':
+                            case 'u':
+                            case 'x':
+                                escape_read(parser, &token_buffer.regexp_buffer, &token_buffer.base.buffer, PM_ESCAPE_FLAG_REGEXP);
+                                break;
+                            default:
+                                if (lex_mode->as.regexp.terminator == peeked) {
+                                    // Some characters when they are used as the
+                                    // terminator also receive an escape. They are
+                                    // enumerated here.
+                                    switch (peeked) {
+                                        case '$': case ')': case '*': case '+':
+                                        case '.': case '>': case '?': case ']':
+                                        case '^': case '|': case '}':
+                                            pm_token_buffer_push_byte(&token_buffer.base, '\\');
+                                            break;
+                                        default:
+                                            break;
+                                    }
+
+                                    pm_regexp_token_buffer_push_byte(&token_buffer, peeked);
+                                    pm_token_buffer_push_byte(&token_buffer.base, peeked);
+                                    parser->current.end++;
+                                    break;
+                                }
+
+                                if (peeked < 0x80) pm_token_buffer_push_byte(&token_buffer.base, '\\');
+                                pm_regexp_token_buffer_push_escaped(&token_buffer, parser);
+                                break;
+                        }
+
+                        token_buffer.base.cursor = parser->current.end;
+                        breakpoint = pm_strpbrk(parser, parser->current.end, breakpoints, parser->end - parser->current.end, false);
+                        break;
+                    }
+                    case '#': {
+                        // If we hit a #, then we will attempt to lex
+                        // interpolation.
+                        pm_token_type_t type = lex_interpolation(parser, breakpoint);
+
+                        if (type == PM_TOKEN_NOT_PROVIDED) {
+                            // If we haven't returned at this point then we had
+                            // something that looked like an interpolated class or
+                            // instance variable like "#@" but wasn't actually. In
+                            // this case we'll just skip to the next breakpoint.
+                            breakpoint = pm_strpbrk(parser, parser->current.end, breakpoints, parser->end - parser->current.end, false);
+                            break;
+                        }
+
+                        if (type == PM_TOKEN_STRING_CONTENT) {
+                            pm_regexp_token_buffer_flush(parser, &token_buffer);
+                        }
+
+                        LEX(type);
+                    }
+                    default:
+                        assert(false && "unreachable");
+                        break;
+                }
+            }
+
+            if (parser->current.end > parser->current.start) {
+                pm_regexp_token_buffer_flush(parser, &token_buffer);
+                LEX(PM_TOKEN_STRING_CONTENT);
+            }
+
+            // If we were unable to find a breakpoint, then this token hits the
+            // end of the file.
+            parser->current.end = parser->end;
+            pm_regexp_token_buffer_flush(parser, &token_buffer);
+            LEX(PM_TOKEN_STRING_CONTENT);
+        }
+        case PM_LEX_STRING: {
+            // First, we'll set to start of this token to be the current end.
+            if (parser->next_start == NULL) {
+                parser->current.start = parser->current.end;
+            } else {
+                parser->current.start = parser->next_start;
+                parser->current.end = parser->next_start;
+                parser->next_start = NULL;
+            }
+
+            // We'll check if we're at the end of the file. If we are, then we need to
+            // return the EOF token.
+            if (parser->current.end >= parser->end) {
+                LEX(PM_TOKEN_EOF);
+            }
+
+            // These are the places where we need to split up the content of the
+            // string. We'll use strpbrk to find the first of these characters.
+            pm_lex_mode_t *lex_mode = parser->lex_modes.current;
+            const uint8_t *breakpoints = lex_mode->as.string.breakpoints;
+            const uint8_t *breakpoint = pm_strpbrk(parser, parser->current.end, breakpoints, parser->end - parser->current.end, true);
+
+            // If we haven't found an escape yet, then this buffer will be
+            // unallocated since we can refer directly to the source string.
+            pm_token_buffer_t token_buffer = { 0 };
+
+            while (breakpoint != NULL) {
+                // If we hit the incrementor, then we'll increment then nesting and
+                // continue lexing.
+                if (lex_mode->as.string.incrementor != '\0' && *breakpoint == lex_mode->as.string.incrementor) {
+                    lex_mode->as.string.nesting++;
+                    parser->current.end = breakpoint + 1;
+                    breakpoint = pm_strpbrk(parser, parser->current.end, breakpoints, parser->end - parser->current.end, true);
+                    continue;
+                }
+
+                uint8_t term = lex_mode->as.string.terminator;
+                bool is_terminator = (*breakpoint == term);
+
+                // If the terminator is newline, we need to consider \r\n _also_ a newline
+                // For example: `%r\nfoo\r\n`
+                // The string should be /foo/, not /foo\r/
+                if (*breakpoint == '\r' && peek_at(parser, breakpoint + 1) == '\n') {
+                    if (term == '\n') {
+                        is_terminator = true;
+                    }
+
+                    // If the terminator is a CR, but we see a CRLF, we need to
+                    // treat the CRLF as a newline, meaning this is _not_ the
+                    // terminator
+                    if (term == '\r') {
+                        is_terminator = false;
+                    }
+                }
+
+                // Note that we have to check the terminator here first because we could
+                // potentially be parsing a % string that has a # character as the
+                // terminator.
+                if (is_terminator) {
+                    // If this terminator doesn't actually close the string, then we need
+                    // to continue on past it.
+                    if (lex_mode->as.string.nesting > 0) {
+                        parser->current.end = breakpoint + 1;
+                        breakpoint = pm_strpbrk(parser, parser->current.end, breakpoints, parser->end - parser->current.end, true);
+                        lex_mode->as.string.nesting--;
+                        continue;
+                    }
+
+                    // Here we've hit the terminator. If we have already consumed content
+                    // then we need to return that content as string content first.
+                    if (breakpoint > parser->current.start) {
+                        parser->current.end = breakpoint;
+                        pm_token_buffer_flush(parser, &token_buffer);
+                        LEX(PM_TOKEN_STRING_CONTENT);
+                    }
+
+                    // Otherwise we need to switch back to the parent lex mode and
+                    // return the end of the string.
+                    size_t eol_length = match_eol_at(parser, breakpoint);
+                    if (eol_length) {
+                        parser->current.end = breakpoint + eol_length;
+                        pm_newline_list_append(&parser->newline_list, parser->current.end - 1);
+                    } else {
+                        parser->current.end = breakpoint + 1;
+                    }
+
+                    if (lex_mode->as.string.label_allowed && (peek(parser) == ':') && (peek_offset(parser, 1) != ':')) {
+                        parser->current.end++;
+                        lex_state_set(parser, PM_LEX_STATE_ARG | PM_LEX_STATE_LABELED);
+                        lex_mode_pop(parser);
+                        LEX(PM_TOKEN_LABEL_END);
+                    }
+
+                    lex_state_set(parser, PM_LEX_STATE_END);
+                    lex_mode_pop(parser);
+                    LEX(PM_TOKEN_STRING_END);
+                }
+
+                switch (*breakpoint) {
+                    case '\0':
+                        // Skip directly past the null character.
+                        parser->current.end = breakpoint + 1;
+                        breakpoint = pm_strpbrk(parser, parser->current.end, breakpoints, parser->end - parser->current.end, true);
+                        break;
+                    case '\r':
+                        if (peek_at(parser, breakpoint + 1) != '\n') {
+                            parser->current.end = breakpoint + 1;
+                            breakpoint = pm_strpbrk(parser, parser->current.end, breakpoints, parser->end - parser->current.end, true);
+                            break;
+                        }
+
+                        // If we hit a \r\n sequence, then we need to treat it
+                        // as a newline.
+                        breakpoint++;
+                        parser->current.end = breakpoint;
+                        pm_token_buffer_escape(parser, &token_buffer);
+                        token_buffer.cursor = breakpoint;
+
+                        PRISM_FALLTHROUGH
+                    case '\n':
+                        // When we hit a newline, we need to flush any potential
+                        // heredocs. Note that this has to happen after we check
+                        // for the terminator in case the terminator is a
+                        // newline character.
+                        if (parser->heredoc_end == NULL) {
+                            pm_newline_list_append(&parser->newline_list, breakpoint);
+                            parser->current.end = breakpoint + 1;
+                            breakpoint = pm_strpbrk(parser, parser->current.end, breakpoints, parser->end - parser->current.end, true);
+                            break;
+                        }
+
+                        parser->current.end = breakpoint + 1;
+                        parser_flush_heredoc_end(parser);
+                        pm_token_buffer_flush(parser, &token_buffer);
+                        LEX(PM_TOKEN_STRING_CONTENT);
+                    case '\\': {
+                        // Here we hit escapes.
+                        parser->current.end = breakpoint + 1;
+
+                        // If we've hit the end of the file, then break out of
+                        // the loop by setting the breakpoint to NULL.
+                        if (parser->current.end == parser->end) {
+                            breakpoint = NULL;
+                            continue;
+                        }
+
+                        pm_token_buffer_escape(parser, &token_buffer);
+                        uint8_t peeked = peek(parser);
+
+                        switch (peeked) {
+                            case '\\':
+                                pm_token_buffer_push_byte(&token_buffer, '\\');
+                                parser->current.end++;
+                                break;
+                            case '\r':
+                                parser->current.end++;
+                                if (peek(parser) != '\n') {
+                                    if (!lex_mode->as.string.interpolation) {
+                                        pm_token_buffer_push_byte(&token_buffer, '\\');
+                                    }
+                                    pm_token_buffer_push_byte(&token_buffer, '\r');
+                                    break;
+                                }
+                            PRISM_FALLTHROUGH
+                            case '\n':
+                                if (!lex_mode->as.string.interpolation) {
+                                    pm_token_buffer_push_byte(&token_buffer, '\\');
+                                    pm_token_buffer_push_byte(&token_buffer, '\n');
+                                }
+
+                                if (parser->heredoc_end) {
+                                    // ... if we are on the same line as a heredoc,
+                                    // flush the heredoc and continue parsing after
+                                    // heredoc_end.
+                                    parser_flush_heredoc_end(parser);
+                                    pm_token_buffer_copy(parser, &token_buffer);
+                                    LEX(PM_TOKEN_STRING_CONTENT);
+                                } else {
+                                    // ... else track the newline.
+                                    pm_newline_list_append(&parser->newline_list, parser->current.end);
+                                }
+
+                                parser->current.end++;
+                                break;
+                            default:
+                                if (lex_mode->as.string.incrementor != '\0' && peeked == lex_mode->as.string.incrementor) {
+                                    pm_token_buffer_push_byte(&token_buffer, peeked);
+                                    parser->current.end++;
+                                } else if (lex_mode->as.string.terminator != '\0' && peeked == lex_mode->as.string.terminator) {
+                                    pm_token_buffer_push_byte(&token_buffer, peeked);
+                                    parser->current.end++;
+                                } else if (lex_mode->as.string.interpolation) {
+                                    escape_read(parser, &token_buffer.buffer, NULL, PM_ESCAPE_FLAG_NONE);
+                                } else {
+                                    pm_token_buffer_push_byte(&token_buffer, '\\');
+                                    pm_token_buffer_push_escaped(&token_buffer, parser);
+                                }
+
+                                break;
+                        }
+
+                        token_buffer.cursor = parser->current.end;
+                        breakpoint = pm_strpbrk(parser, parser->current.end, breakpoints, parser->end - parser->current.end, true);
+                        break;
+                    }
+                    case '#': {
+                        pm_token_type_t type = lex_interpolation(parser, breakpoint);
+
+                        if (type == PM_TOKEN_NOT_PROVIDED) {
+                            // If we haven't returned at this point then we had something that
+                            // looked like an interpolated class or instance variable like "#@"
+                            // but wasn't actually. In this case we'll just skip to the next
+                            // breakpoint.
+                            breakpoint = pm_strpbrk(parser, parser->current.end, breakpoints, parser->end - parser->current.end, true);
+                            break;
+                        }
+
+                        if (type == PM_TOKEN_STRING_CONTENT) {
+                            pm_token_buffer_flush(parser, &token_buffer);
+                        }
+
+                        LEX(type);
+                    }
+                    default:
+                        assert(false && "unreachable");
+                }
+            }
+
+            if (parser->current.end > parser->current.start) {
+                pm_token_buffer_flush(parser, &token_buffer);
+                LEX(PM_TOKEN_STRING_CONTENT);
+            }
+
+            // If we've hit the end of the string, then this is an unterminated
+            // string. In that case we'll return a string content token.
+            parser->current.end = parser->end;
+            pm_token_buffer_flush(parser, &token_buffer);
+            LEX(PM_TOKEN_STRING_CONTENT);
+        }
+        case PM_LEX_HEREDOC: {
+            // First, we'll set to start of this token.
+            if (parser->next_start == NULL) {
+                parser->current.start = parser->current.end;
+            } else {
+                parser->current.start = parser->next_start;
+                parser->current.end = parser->next_start;
+                parser->heredoc_end = NULL;
+                parser->next_start = NULL;
+            }
+
+            // Now let's grab the information about the identifier off of the
+            // current lex mode.
+            pm_lex_mode_t *lex_mode = parser->lex_modes.current;
+            pm_heredoc_lex_mode_t *heredoc_lex_mode = &lex_mode->as.heredoc.base;
+
+            bool line_continuation = lex_mode->as.heredoc.line_continuation;
+            lex_mode->as.heredoc.line_continuation = false;
+
+            // We'll check if we're at the end of the file. If we are, then we
+            // will add an error (because we weren't able to find the
+            // terminator) but still continue parsing so that content after the
+            // declaration of the heredoc can be parsed.
+            if (parser->current.end >= parser->end) {
+                pm_parser_err_heredoc_term(parser, heredoc_lex_mode->ident_start, heredoc_lex_mode->ident_length);
+                parser->next_start = lex_mode->as.heredoc.next_start;
+                parser->heredoc_end = parser->current.end;
+                lex_state_set(parser, PM_LEX_STATE_END);
+                lex_mode_pop(parser);
+                LEX(PM_TOKEN_HEREDOC_END);
+            }
+
+            const uint8_t *ident_start = heredoc_lex_mode->ident_start;
+            size_t ident_length = heredoc_lex_mode->ident_length;
+
+            // If we are immediately following a newline and we have hit the
+            // terminator, then we need to return the ending of the heredoc.
+            if (current_token_starts_line(parser)) {
+                const uint8_t *start = parser->current.start;
+
+                if (!line_continuation && (start + ident_length <= parser->end)) {
+                    const uint8_t *newline = next_newline(start, parser->end - start);
+                    const uint8_t *ident_end = newline;
+                    const uint8_t *terminator_end = newline;
+
+                    if (newline == NULL) {
+                        terminator_end = parser->end;
+                        ident_end = parser->end;
+                    } else {
+                        terminator_end++;
+                        if (newline[-1] == '\r') {
+                            ident_end--; // Remove \r
+                        }
+                    }
+
+                    const uint8_t *terminator_start = ident_end - ident_length;
+                    const uint8_t *cursor = start;
+
+                    if (heredoc_lex_mode->indent == PM_HEREDOC_INDENT_DASH || heredoc_lex_mode->indent == PM_HEREDOC_INDENT_TILDE) {
+                        while (cursor < terminator_start && pm_char_is_inline_whitespace(*cursor)) {
+                            cursor++;
+                        }
+                    }
+
+                    if (
+                        (cursor == terminator_start) &&
+                        (memcmp(terminator_start, ident_start, ident_length) == 0)
+                    ) {
+                        if (newline != NULL) {
+                            pm_newline_list_append(&parser->newline_list, newline);
+                        }
+
+                        parser->current.end = terminator_end;
+                        if (*lex_mode->as.heredoc.next_start == '\\') {
+                            parser->next_start = NULL;
+                        } else {
+                            parser->next_start = lex_mode->as.heredoc.next_start;
+                            parser->heredoc_end = parser->current.end;
+                        }
+
+                        lex_state_set(parser, PM_LEX_STATE_END);
+                        lex_mode_pop(parser);
+                        LEX(PM_TOKEN_HEREDOC_END);
+                    }
+                }
+
+                size_t whitespace = pm_heredoc_strspn_inline_whitespace(parser, &start, heredoc_lex_mode->indent);
+                if (
+                    heredoc_lex_mode->indent == PM_HEREDOC_INDENT_TILDE &&
+                    lex_mode->as.heredoc.common_whitespace != NULL &&
+                    (*lex_mode->as.heredoc.common_whitespace > whitespace) &&
+                    peek_at(parser, start) != '\n'
+                ) {
+                    *lex_mode->as.heredoc.common_whitespace = whitespace;
+                }
+            }
+
+            // Otherwise we'll be parsing string content. These are the places
+            // where we need to split up the content of the heredoc. We'll use
+            // strpbrk to find the first of these characters.
+            uint8_t breakpoints[] = "\r\n\\#";
+
+            pm_heredoc_quote_t quote = heredoc_lex_mode->quote;
+            if (quote == PM_HEREDOC_QUOTE_SINGLE) {
+                breakpoints[3] = '\0';
+            }
+
+            const uint8_t *breakpoint = pm_strpbrk(parser, parser->current.end, breakpoints, parser->end - parser->current.end, true);
+            pm_token_buffer_t token_buffer = { 0 };
+            bool was_line_continuation = false;
+
+            while (breakpoint != NULL) {
+                switch (*breakpoint) {
+                    case '\0':
+                        // Skip directly past the null character.
+                        parser->current.end = breakpoint + 1;
+                        breakpoint = pm_strpbrk(parser, parser->current.end, breakpoints, parser->end - parser->current.end, true);
+                        break;
+                    case '\r':
+                        parser->current.end = breakpoint + 1;
+
+                        if (peek_at(parser, breakpoint + 1) != '\n') {
+                            breakpoint = pm_strpbrk(parser, parser->current.end, breakpoints, parser->end - parser->current.end, true);
+                            break;
+                        }
+
+                        // If we hit a \r\n sequence, then we want to replace it
+                        // with a single \n character in the final string.
+                        breakpoint++;
+                        pm_token_buffer_escape(parser, &token_buffer);
+                        token_buffer.cursor = breakpoint;
+
+                        PRISM_FALLTHROUGH
+                    case '\n': {
+                        if (parser->heredoc_end != NULL && (parser->heredoc_end > breakpoint)) {
+                            parser_flush_heredoc_end(parser);
+                            parser->current.end = breakpoint + 1;
+                            pm_token_buffer_flush(parser, &token_buffer);
+                            LEX(PM_TOKEN_STRING_CONTENT);
+                        }
+
+                        pm_newline_list_append(&parser->newline_list, breakpoint);
+
+                        // If we have a - or ~ heredoc, then we can match after
+                        // some leading whitespace.
+                        const uint8_t *start = breakpoint + 1;
+
+                        if (!was_line_continuation && (start + ident_length <= parser->end)) {
+                            // We want to match the terminator starting from the end of the line in case
+                            // there is whitespace in the ident such as <<-'   DOC' or <<~'   DOC'.
+                            const uint8_t *newline = next_newline(start, parser->end - start);
+
+                            if (newline == NULL) {
+                                newline = parser->end;
+                            } else if (newline[-1] == '\r') {
+                                newline--; // Remove \r
+                            }
+
+                            // Start of a possible terminator.
+                            const uint8_t *terminator_start = newline - ident_length;
+
+                            // Cursor to check for the leading whitespace. We skip the
+                            // leading whitespace if we have a - or ~ heredoc.
+                            const uint8_t *cursor = start;
+
+                            if (heredoc_lex_mode->indent == PM_HEREDOC_INDENT_DASH || heredoc_lex_mode->indent == PM_HEREDOC_INDENT_TILDE) {
+                                while (cursor < terminator_start && pm_char_is_inline_whitespace(*cursor)) {
+                                    cursor++;
+                                }
+                            }
+
+                            if (
+                                cursor == terminator_start &&
+                                (memcmp(terminator_start, ident_start, ident_length) == 0)
+                            ) {
+                                parser->current.end = breakpoint + 1;
+                                pm_token_buffer_flush(parser, &token_buffer);
+                                LEX(PM_TOKEN_STRING_CONTENT);
+                            }
+                        }
+
+                        size_t whitespace = pm_heredoc_strspn_inline_whitespace(parser, &start, lex_mode->as.heredoc.base.indent);
+
+                        // If we have hit a newline that is followed by a valid
+                        // terminator, then we need to return the content of the
+                        // heredoc here as string content. Then, the next time a
+                        // token is lexed, it will match again and return the
+                        // end of the heredoc.
+                        if (lex_mode->as.heredoc.base.indent == PM_HEREDOC_INDENT_TILDE) {
+                            if ((lex_mode->as.heredoc.common_whitespace != NULL) && (*lex_mode->as.heredoc.common_whitespace > whitespace) && peek_at(parser, start) != '\n') {
+                                *lex_mode->as.heredoc.common_whitespace = whitespace;
+                            }
+
+                            parser->current.end = breakpoint + 1;
+                            pm_token_buffer_flush(parser, &token_buffer);
+                            LEX(PM_TOKEN_STRING_CONTENT);
+                        }
+
+                        // Otherwise we hit a newline and it wasn't followed by
+                        // a terminator, so we can continue parsing.
+                        parser->current.end = breakpoint + 1;
+                        breakpoint = pm_strpbrk(parser, parser->current.end, breakpoints, parser->end - parser->current.end, true);
+                        break;
+                    }
+                    case '\\': {
+                        // If we hit an escape, then we need to skip past
+                        // however many characters the escape takes up. However
+                        // it's important that if \n or \r\n are escaped, we
+                        // stop looping before the newline and not after the
+                        // newline so that we can still potentially find the
+                        // terminator of the heredoc.
+                        parser->current.end = breakpoint + 1;
+
+                        // If we've hit the end of the file, then break out of
+                        // the loop by setting the breakpoint to NULL.
+                        if (parser->current.end == parser->end) {
+                            breakpoint = NULL;
+                            continue;
+                        }
+
+                        pm_token_buffer_escape(parser, &token_buffer);
+                        uint8_t peeked = peek(parser);
+
+                        if (quote == PM_HEREDOC_QUOTE_SINGLE) {
+                            switch (peeked) {
+                                case '\r':
+                                    parser->current.end++;
+                                    if (peek(parser) != '\n') {
+                                        pm_token_buffer_push_byte(&token_buffer, '\\');
+                                        pm_token_buffer_push_byte(&token_buffer, '\r');
+                                        break;
+                                    }
+                                PRISM_FALLTHROUGH
+                                case '\n':
+                                    pm_token_buffer_push_byte(&token_buffer, '\\');
+                                    pm_token_buffer_push_byte(&token_buffer, '\n');
+                                    token_buffer.cursor = parser->current.end + 1;
+                                    breakpoint = parser->current.end;
+                                    continue;
+                                default:
+                                    pm_token_buffer_push_byte(&token_buffer, '\\');
+                                    pm_token_buffer_push_escaped(&token_buffer, parser);
+                                    break;
+                            }
+                        } else {
+                            switch (peeked) {
+                                case '\r':
+                                    parser->current.end++;
+                                    if (peek(parser) != '\n') {
+                                        pm_token_buffer_push_byte(&token_buffer, '\r');
+                                        break;
+                                    }
+                                PRISM_FALLTHROUGH
+                                case '\n':
+                                    // If we are in a tilde here, we should
+                                    // break out of the loop and return the
+                                    // string content.
+                                    if (heredoc_lex_mode->indent == PM_HEREDOC_INDENT_TILDE) {
+                                        const uint8_t *end = parser->current.end;
+                                        pm_newline_list_append(&parser->newline_list, end);
+
+                                        // Here we want the buffer to only
+                                        // include up to the backslash.
+                                        parser->current.end = breakpoint;
+                                        pm_token_buffer_flush(parser, &token_buffer);
+
+                                        // Now we can advance the end of the
+                                        // token past the newline.
+                                        parser->current.end = end + 1;
+                                        lex_mode->as.heredoc.line_continuation = true;
+                                        LEX(PM_TOKEN_STRING_CONTENT);
+                                    }
+
+                                    was_line_continuation = true;
+                                    token_buffer.cursor = parser->current.end + 1;
+                                    breakpoint = parser->current.end;
+                                    continue;
+                                default:
+                                    escape_read(parser, &token_buffer.buffer, NULL, PM_ESCAPE_FLAG_NONE);
+                                    break;
+                            }
+                        }
+
+                        token_buffer.cursor = parser->current.end;
+                        breakpoint = pm_strpbrk(parser, parser->current.end, breakpoints, parser->end - parser->current.end, true);
+                        break;
+                    }
+                    case '#': {
+                        pm_token_type_t type = lex_interpolation(parser, breakpoint);
+
+                        if (type == PM_TOKEN_NOT_PROVIDED) {
+                            // If we haven't returned at this point then we had
+                            // something that looked like an interpolated class
+                            // or instance variable like "#@" but wasn't
+                            // actually. In this case we'll just skip to the
+                            // next breakpoint.
+                            breakpoint = pm_strpbrk(parser, parser->current.end, breakpoints, parser->end - parser->current.end, true);
+                            break;
+                        }
+
+                        if (type == PM_TOKEN_STRING_CONTENT) {
+                            pm_token_buffer_flush(parser, &token_buffer);
+                        }
+
+                        LEX(type);
+                    }
+                    default:
+                        assert(false && "unreachable");
+                }
+
+                was_line_continuation = false;
+            }
+
+            if (parser->current.end > parser->current.start) {
+                parser->current.end = parser->end;
+                pm_token_buffer_flush(parser, &token_buffer);
+                LEX(PM_TOKEN_STRING_CONTENT);
+            }
+
+            // If we've hit the end of the string, then this is an unterminated
+            // heredoc. In that case we'll return a string content token.
+            parser->current.end = parser->end;
+            pm_token_buffer_flush(parser, &token_buffer);
+            LEX(PM_TOKEN_STRING_CONTENT);
+        }
+    }
+
+    assert(false && "unreachable");
+}
+
+#undef LEX
+
+/******************************************************************************/
+/* Parse functions                                                            */
+/******************************************************************************/
+
+/**
+ * These are the various precedence rules. Because we are using a Pratt parser,
+ * they are named binding power to represent the manner in which nodes are bound
+ * together in the stack.
+ *
+ * We increment by 2 because we want to leave room for the infix operators to
+ * specify their associativity by adding or subtracting one.
+ */
+typedef enum {
+    PM_BINDING_POWER_UNSET =             0, // used to indicate this token cannot be used as an infix operator
+    PM_BINDING_POWER_STATEMENT =         2,
+    PM_BINDING_POWER_MODIFIER_RESCUE =   4, // rescue
+    PM_BINDING_POWER_MODIFIER =          6, // if unless until while
+    PM_BINDING_POWER_COMPOSITION =       8, // and or
+    PM_BINDING_POWER_NOT =              10, // not
+    PM_BINDING_POWER_MATCH =            12, // => in
+    PM_BINDING_POWER_DEFINED =          14, // defined?
+    PM_BINDING_POWER_MULTI_ASSIGNMENT = 16, // =
+    PM_BINDING_POWER_ASSIGNMENT =       18, // = += -= *= /= %= &= |= ^= &&= ||= <<= >>= **=
+    PM_BINDING_POWER_TERNARY =          20, // ?:
+    PM_BINDING_POWER_RANGE =            22, // .. ...
+    PM_BINDING_POWER_LOGICAL_OR =       24, // ||
+    PM_BINDING_POWER_LOGICAL_AND =      26, // &&
+    PM_BINDING_POWER_EQUALITY =         28, // <=> == === != =~ !~
+    PM_BINDING_POWER_COMPARISON =       30, // > >= < <=
+    PM_BINDING_POWER_BITWISE_OR =       32, // | ^
+    PM_BINDING_POWER_BITWISE_AND =      34, // &
+    PM_BINDING_POWER_SHIFT =            36, // << >>
+    PM_BINDING_POWER_TERM =             38, // + -
+    PM_BINDING_POWER_FACTOR =           40, // * / %
+    PM_BINDING_POWER_UMINUS =           42, // -@
+    PM_BINDING_POWER_EXPONENT =         44, // **
+    PM_BINDING_POWER_UNARY =            46, // ! ~ +@
+    PM_BINDING_POWER_INDEX =            48, // [] []=
+    PM_BINDING_POWER_CALL =             50, // :: .
+    PM_BINDING_POWER_MAX =              52
+} pm_binding_power_t;
+
+/**
+ * This struct represents a set of binding powers used for a given token. They
+ * are combined in this way to make it easier to represent associativity.
+ */
+typedef struct {
+    /** The left binding power. */
+    pm_binding_power_t left;
+
+    /** The right binding power. */
+    pm_binding_power_t right;
+
+    /** Whether or not this token can be used as a binary operator. */
+    bool binary;
+
+    /**
+     * Whether or not this token can be used as non-associative binary operator.
+     * Non-associative operators (e.g. in and =>) need special treatment in parse_expression.
+     */
+    bool nonassoc;
+} pm_binding_powers_t;
+
+#define BINDING_POWER_ASSIGNMENT { PM_BINDING_POWER_UNARY, PM_BINDING_POWER_ASSIGNMENT, true, false }
+#define LEFT_ASSOCIATIVE(precedence) { precedence, precedence + 1, true, false }
+#define RIGHT_ASSOCIATIVE(precedence) { precedence, precedence, true, false }
+#define NON_ASSOCIATIVE(precedence) { precedence, precedence + 1, true, true }
+#define RIGHT_ASSOCIATIVE_UNARY(precedence) { precedence, precedence, false, false }
+
+pm_binding_powers_t pm_binding_powers[PM_TOKEN_MAXIMUM] = {
+    // rescue
+    [PM_TOKEN_KEYWORD_RESCUE_MODIFIER] = { PM_BINDING_POWER_MODIFIER_RESCUE, PM_BINDING_POWER_COMPOSITION, true, false },
+
+    // if unless until while
+    [PM_TOKEN_KEYWORD_IF_MODIFIER] = LEFT_ASSOCIATIVE(PM_BINDING_POWER_MODIFIER),
+    [PM_TOKEN_KEYWORD_UNLESS_MODIFIER] = LEFT_ASSOCIATIVE(PM_BINDING_POWER_MODIFIER),
+    [PM_TOKEN_KEYWORD_UNTIL_MODIFIER] = LEFT_ASSOCIATIVE(PM_BINDING_POWER_MODIFIER),
+    [PM_TOKEN_KEYWORD_WHILE_MODIFIER] = LEFT_ASSOCIATIVE(PM_BINDING_POWER_MODIFIER),
+
+    // and or
+    [PM_TOKEN_KEYWORD_AND] = LEFT_ASSOCIATIVE(PM_BINDING_POWER_COMPOSITION),
+    [PM_TOKEN_KEYWORD_OR] = LEFT_ASSOCIATIVE(PM_BINDING_POWER_COMPOSITION),
+
+    // => in
+    [PM_TOKEN_EQUAL_GREATER] = NON_ASSOCIATIVE(PM_BINDING_POWER_MATCH),
+    [PM_TOKEN_KEYWORD_IN] = NON_ASSOCIATIVE(PM_BINDING_POWER_MATCH),
+
+    // &&= &= ^= = >>= <<= -= %= |= ||= += /= *= **=
+    [PM_TOKEN_AMPERSAND_AMPERSAND_EQUAL] = BINDING_POWER_ASSIGNMENT,
+    [PM_TOKEN_AMPERSAND_EQUAL] = BINDING_POWER_ASSIGNMENT,
+    [PM_TOKEN_CARET_EQUAL] = BINDING_POWER_ASSIGNMENT,
+    [PM_TOKEN_EQUAL] = BINDING_POWER_ASSIGNMENT,
+    [PM_TOKEN_GREATER_GREATER_EQUAL] = BINDING_POWER_ASSIGNMENT,
+    [PM_TOKEN_LESS_LESS_EQUAL] = BINDING_POWER_ASSIGNMENT,
+    [PM_TOKEN_MINUS_EQUAL] = BINDING_POWER_ASSIGNMENT,
+    [PM_TOKEN_PERCENT_EQUAL] = BINDING_POWER_ASSIGNMENT,
+    [PM_TOKEN_PIPE_EQUAL] = BINDING_POWER_ASSIGNMENT,
+    [PM_TOKEN_PIPE_PIPE_EQUAL] = BINDING_POWER_ASSIGNMENT,
+    [PM_TOKEN_PLUS_EQUAL] = BINDING_POWER_ASSIGNMENT,
+    [PM_TOKEN_SLASH_EQUAL] = BINDING_POWER_ASSIGNMENT,
+    [PM_TOKEN_STAR_EQUAL] = BINDING_POWER_ASSIGNMENT,
+    [PM_TOKEN_STAR_STAR_EQUAL] = BINDING_POWER_ASSIGNMENT,
+
+    // ?:
+    [PM_TOKEN_QUESTION_MARK] = RIGHT_ASSOCIATIVE(PM_BINDING_POWER_TERNARY),
+
+    // .. ...
+    [PM_TOKEN_DOT_DOT] = NON_ASSOCIATIVE(PM_BINDING_POWER_RANGE),
+    [PM_TOKEN_DOT_DOT_DOT] = NON_ASSOCIATIVE(PM_BINDING_POWER_RANGE),
+    [PM_TOKEN_UDOT_DOT] = RIGHT_ASSOCIATIVE_UNARY(PM_BINDING_POWER_LOGICAL_OR),
+    [PM_TOKEN_UDOT_DOT_DOT] = RIGHT_ASSOCIATIVE_UNARY(PM_BINDING_POWER_LOGICAL_OR),
+
+    // ||
+    [PM_TOKEN_PIPE_PIPE] = LEFT_ASSOCIATIVE(PM_BINDING_POWER_LOGICAL_OR),
+
+    // &&
+    [PM_TOKEN_AMPERSAND_AMPERSAND] = LEFT_ASSOCIATIVE(PM_BINDING_POWER_LOGICAL_AND),
+
+    // != !~ == === =~ <=>
+    [PM_TOKEN_BANG_EQUAL] = NON_ASSOCIATIVE(PM_BINDING_POWER_EQUALITY),
+    [PM_TOKEN_BANG_TILDE] = NON_ASSOCIATIVE(PM_BINDING_POWER_EQUALITY),
+    [PM_TOKEN_EQUAL_EQUAL] = NON_ASSOCIATIVE(PM_BINDING_POWER_EQUALITY),
+    [PM_TOKEN_EQUAL_EQUAL_EQUAL] = NON_ASSOCIATIVE(PM_BINDING_POWER_EQUALITY),
+    [PM_TOKEN_EQUAL_TILDE] = NON_ASSOCIATIVE(PM_BINDING_POWER_EQUALITY),
+    [PM_TOKEN_LESS_EQUAL_GREATER] = NON_ASSOCIATIVE(PM_BINDING_POWER_EQUALITY),
+
+    // > >= < <=
+    [PM_TOKEN_GREATER] = LEFT_ASSOCIATIVE(PM_BINDING_POWER_COMPARISON),
+    [PM_TOKEN_GREATER_EQUAL] = LEFT_ASSOCIATIVE(PM_BINDING_POWER_COMPARISON),
+    [PM_TOKEN_LESS] = LEFT_ASSOCIATIVE(PM_BINDING_POWER_COMPARISON),
+    [PM_TOKEN_LESS_EQUAL] = LEFT_ASSOCIATIVE(PM_BINDING_POWER_COMPARISON),
+
+    // ^ |
+    [PM_TOKEN_CARET] = LEFT_ASSOCIATIVE(PM_BINDING_POWER_BITWISE_OR),
+    [PM_TOKEN_PIPE] = LEFT_ASSOCIATIVE(PM_BINDING_POWER_BITWISE_OR),
+
+    // &
+    [PM_TOKEN_AMPERSAND] = LEFT_ASSOCIATIVE(PM_BINDING_POWER_BITWISE_AND),
+
+    // >> <<
+    [PM_TOKEN_GREATER_GREATER] = LEFT_ASSOCIATIVE(PM_BINDING_POWER_SHIFT),
+    [PM_TOKEN_LESS_LESS] = LEFT_ASSOCIATIVE(PM_BINDING_POWER_SHIFT),
+
+    // - +
+    [PM_TOKEN_MINUS] = LEFT_ASSOCIATIVE(PM_BINDING_POWER_TERM),
+    [PM_TOKEN_PLUS] = LEFT_ASSOCIATIVE(PM_BINDING_POWER_TERM),
+
+    // % / *
+    [PM_TOKEN_PERCENT] = LEFT_ASSOCIATIVE(PM_BINDING_POWER_FACTOR),
+    [PM_TOKEN_SLASH] = LEFT_ASSOCIATIVE(PM_BINDING_POWER_FACTOR),
+    [PM_TOKEN_STAR] = LEFT_ASSOCIATIVE(PM_BINDING_POWER_FACTOR),
+    [PM_TOKEN_USTAR] = RIGHT_ASSOCIATIVE_UNARY(PM_BINDING_POWER_FACTOR),
+
+    // -@
+    [PM_TOKEN_UMINUS] = RIGHT_ASSOCIATIVE_UNARY(PM_BINDING_POWER_UMINUS),
+    [PM_TOKEN_UMINUS_NUM] = { PM_BINDING_POWER_UMINUS, PM_BINDING_POWER_MAX, false, false },
+
+    // **
+    [PM_TOKEN_STAR_STAR] = RIGHT_ASSOCIATIVE(PM_BINDING_POWER_EXPONENT),
+    [PM_TOKEN_USTAR_STAR] = RIGHT_ASSOCIATIVE_UNARY(PM_BINDING_POWER_UNARY),
+
+    // ! ~ +@
+    [PM_TOKEN_BANG] = RIGHT_ASSOCIATIVE_UNARY(PM_BINDING_POWER_UNARY),
+    [PM_TOKEN_TILDE] = RIGHT_ASSOCIATIVE_UNARY(PM_BINDING_POWER_UNARY),
+    [PM_TOKEN_UPLUS] = RIGHT_ASSOCIATIVE_UNARY(PM_BINDING_POWER_UNARY),
+
+    // [
+    [PM_TOKEN_BRACKET_LEFT] = LEFT_ASSOCIATIVE(PM_BINDING_POWER_INDEX),
+
+    // :: . &.
+    [PM_TOKEN_COLON_COLON] = RIGHT_ASSOCIATIVE(PM_BINDING_POWER_CALL),
+    [PM_TOKEN_DOT] = RIGHT_ASSOCIATIVE(PM_BINDING_POWER_CALL),
+    [PM_TOKEN_AMPERSAND_DOT] = RIGHT_ASSOCIATIVE(PM_BINDING_POWER_CALL)
+};
+
+#undef BINDING_POWER_ASSIGNMENT
+#undef LEFT_ASSOCIATIVE
+#undef RIGHT_ASSOCIATIVE
+#undef RIGHT_ASSOCIATIVE_UNARY
+
+/**
+ * Returns true if the current token is of the given type.
+ */
+static inline bool
+match1(const pm_parser_t *parser, pm_token_type_t type) {
+    return parser->current.type == type;
+}
+
+/**
+ * Returns true if the current token is of either of the given types.
+ */
+static inline bool
+match2(const pm_parser_t *parser, pm_token_type_t type1, pm_token_type_t type2) {
+    return match1(parser, type1) || match1(parser, type2);
+}
+
+/**
+ * Returns true if the current token is any of the three given types.
+ */
+static inline bool
+match3(const pm_parser_t *parser, pm_token_type_t type1, pm_token_type_t type2, pm_token_type_t type3) {
+    return match1(parser, type1) || match1(parser, type2) || match1(parser, type3);
+}
+
+/**
+ * Returns true if the current token is any of the four given types.
+ */
+static inline bool
+match4(const pm_parser_t *parser, pm_token_type_t type1, pm_token_type_t type2, pm_token_type_t type3, pm_token_type_t type4) {
+    return match1(parser, type1) || match1(parser, type2) || match1(parser, type3) || match1(parser, type4);
+}
+
+/**
+ * Returns true if the current token is any of the seven given types.
+ */
+static inline bool
+match7(const pm_parser_t *parser, pm_token_type_t type1, pm_token_type_t type2, pm_token_type_t type3, pm_token_type_t type4, pm_token_type_t type5, pm_token_type_t type6, pm_token_type_t type7) {
+    return match1(parser, type1) || match1(parser, type2) || match1(parser, type3) || match1(parser, type4) || match1(parser, type5) || match1(parser, type6) || match1(parser, type7);
+}
+
+/**
+ * Returns true if the current token is any of the eight given types.
+ */
+static inline bool
+match8(const pm_parser_t *parser, pm_token_type_t type1, pm_token_type_t type2, pm_token_type_t type3, pm_token_type_t type4, pm_token_type_t type5, pm_token_type_t type6, pm_token_type_t type7, pm_token_type_t type8) {
+    return match1(parser, type1) || match1(parser, type2) || match1(parser, type3) || match1(parser, type4) || match1(parser, type5) || match1(parser, type6) || match1(parser, type7) || match1(parser, type8);
+}
+
+/**
+ * Returns true if the current token is any of the nine given types.
+ */
+static inline bool
+match9(const pm_parser_t *parser, pm_token_type_t type1, pm_token_type_t type2, pm_token_type_t type3, pm_token_type_t type4, pm_token_type_t type5, pm_token_type_t type6, pm_token_type_t type7, pm_token_type_t type8, pm_token_type_t type9) {
+    return match1(parser, type1) || match1(parser, type2) || match1(parser, type3) || match1(parser, type4) || match1(parser, type5) || match1(parser, type6) || match1(parser, type7) || match1(parser, type8) || match1(parser, type9);
+}
+
+/**
+ * If the current token is of the specified type, lex forward by one token and
+ * return true. Otherwise, return false. For example:
+ *
+ *     if (accept1(parser, PM_TOKEN_COLON)) { ... }
+ */
+static bool
+accept1(pm_parser_t *parser, pm_token_type_t type) {
+    if (match1(parser, type)) {
+        parser_lex(parser);
+        return true;
+    }
+    return false;
+}
+
+/**
+ * If the current token is either of the two given types, lex forward by one
+ * token and return true. Otherwise return false.
+ */
+static inline bool
+accept2(pm_parser_t *parser, pm_token_type_t type1, pm_token_type_t type2) {
+    if (match2(parser, type1, type2)) {
+        parser_lex(parser);
+        return true;
+    }
+    return false;
+}
+
+/**
+ * This function indicates that the parser expects a token in a specific
+ * position. For example, if you're parsing a BEGIN block, you know that a { is
+ * expected immediately after the keyword. In that case you would call this
+ * function to indicate that that token should be found.
+ *
+ * If we didn't find the token that we were expecting, then we're going to add
+ * an error to the parser's list of errors (to indicate that the tree is not
+ * valid) and create an artificial token instead. This allows us to recover from
+ * the fact that the token isn't present and continue parsing.
+ */
+static void
+expect1(pm_parser_t *parser, pm_token_type_t type, pm_diagnostic_id_t diag_id) {
+    if (accept1(parser, type)) return;
+
+    const uint8_t *location = parser->previous.end;
+    pm_parser_err(parser, location, location, diag_id);
+
+    parser->previous.start = location;
+    parser->previous.type = PM_TOKEN_MISSING;
+}
+
+/**
+ * This function is the same as expect1, but it expects either of two token
+ * types.
+ */
+static void
+expect2(pm_parser_t *parser, pm_token_type_t type1, pm_token_type_t type2, pm_diagnostic_id_t diag_id) {
+    if (accept2(parser, type1, type2)) return;
+
+    const uint8_t *location = parser->previous.end;
+    pm_parser_err(parser, location, location, diag_id);
+
+    parser->previous.start = location;
+    parser->previous.type = PM_TOKEN_MISSING;
+}
+
+/**
+ * A special expect1 that expects a heredoc terminator and handles popping the
+ * lex mode accordingly.
+ */
+static void
+expect1_heredoc_term(pm_parser_t *parser, const uint8_t *ident_start, size_t ident_length) {
+    if (match1(parser, PM_TOKEN_HEREDOC_END)) {
+        parser_lex(parser);
+    } else {
+        pm_parser_err_heredoc_term(parser, ident_start, ident_length);
+        parser->previous.start = parser->previous.end;
+        parser->previous.type = PM_TOKEN_MISSING;
+    }
+}
+
+static pm_node_t *
+parse_expression(pm_parser_t *parser, pm_binding_power_t binding_power, bool accepts_command_call, bool accepts_label, pm_diagnostic_id_t diag_id, uint16_t depth);
+
+/**
+ * This is a wrapper of parse_expression, which also checks whether the
+ * resulting node is a value expression.
+ */
+static pm_node_t *
+parse_value_expression(pm_parser_t *parser, pm_binding_power_t binding_power, bool accepts_command_call, bool accepts_label, pm_diagnostic_id_t diag_id, uint16_t depth) {
+    pm_node_t *node = parse_expression(parser, binding_power, accepts_command_call, accepts_label, diag_id, depth);
+    pm_assert_value_expression(parser, node);
+    return node;
+}
+
+/**
+ * This function controls whether or not we will attempt to parse an expression
+ * beginning at the subsequent token. It is used when we are in a context where
+ * an expression is optional.
+ *
+ * For example, looking at a range object when we've already lexed the operator,
+ * we need to know if we should attempt to parse an expression on the right.
+ *
+ * For another example, if we've parsed an identifier or a method call and we do
+ * not have parentheses, then the next token may be the start of an argument or
+ * it may not.
+ *
+ * CRuby parsers that are generated would resolve this by using a lookahead and
+ * potentially backtracking. We attempt to do this by just looking at the next
+ * token and making a decision based on that. I am not sure if this is going to
+ * work in all cases, it may need to be refactored later. But it appears to work
+ * for now.
+ */
+static inline bool
+token_begins_expression_p(pm_token_type_t type) {
+    switch (type) {
+        case PM_TOKEN_EQUAL_GREATER:
+        case PM_TOKEN_KEYWORD_IN:
+            // We need to special case this because it is a binary operator that
+            // should not be marked as beginning an expression.
+            return false;
+        case PM_TOKEN_BRACE_RIGHT:
+        case PM_TOKEN_BRACKET_RIGHT:
+        case PM_TOKEN_COLON:
+        case PM_TOKEN_COMMA:
+        case PM_TOKEN_EMBEXPR_END:
+        case PM_TOKEN_EOF:
+        case PM_TOKEN_LAMBDA_BEGIN:
+        case PM_TOKEN_KEYWORD_DO:
+        case PM_TOKEN_KEYWORD_DO_LOOP:
+        case PM_TOKEN_KEYWORD_END:
+        case PM_TOKEN_KEYWORD_ELSE:
+        case PM_TOKEN_KEYWORD_ELSIF:
+        case PM_TOKEN_KEYWORD_ENSURE:
+        case PM_TOKEN_KEYWORD_THEN:
+        case PM_TOKEN_KEYWORD_RESCUE:
+        case PM_TOKEN_KEYWORD_WHEN:
+        case PM_TOKEN_NEWLINE:
+        case PM_TOKEN_PARENTHESIS_RIGHT:
+        case PM_TOKEN_SEMICOLON:
+            // The reason we need this short-circuit is because we're using the
+            // binding powers table to tell us if the subsequent token could
+            // potentially be the start of an expression. If there _is_ a binding
+            // power for one of these tokens, then we should remove it from this list
+            // and let it be handled by the default case below.
+            assert(pm_binding_powers[type].left == PM_BINDING_POWER_UNSET);
+            return false;
+        case PM_TOKEN_UAMPERSAND:
+            // This is a special case because this unary operator cannot appear
+            // as a general operator, it only appears in certain circumstances.
+            return false;
+        case PM_TOKEN_UCOLON_COLON:
+        case PM_TOKEN_UMINUS:
+        case PM_TOKEN_UMINUS_NUM:
+        case PM_TOKEN_UPLUS:
+        case PM_TOKEN_BANG:
+        case PM_TOKEN_TILDE:
+        case PM_TOKEN_UDOT_DOT:
+        case PM_TOKEN_UDOT_DOT_DOT:
+            // These unary tokens actually do have binding power associated with them
+            // so that we can correctly place them into the precedence order. But we
+            // want them to be marked as beginning an expression, so we need to
+            // special case them here.
+            return true;
+        default:
+            return pm_binding_powers[type].left == PM_BINDING_POWER_UNSET;
+    }
+}
+
+/**
+ * Parse an expression with the given binding power that may be optionally
+ * prefixed by the * operator.
+ */
+static pm_node_t *
+parse_starred_expression(pm_parser_t *parser, pm_binding_power_t binding_power, bool accepts_command_call, pm_diagnostic_id_t diag_id, uint16_t depth) {
+    if (accept1(parser, PM_TOKEN_USTAR)) {
+        pm_token_t operator = parser->previous;
+        pm_node_t *expression = parse_value_expression(parser, binding_power, false, false, PM_ERR_EXPECT_EXPRESSION_AFTER_STAR, (uint16_t) (depth + 1));
+        return (pm_node_t *) pm_splat_node_create(parser, &operator, expression);
+    }
+
+    return parse_value_expression(parser, binding_power, accepts_command_call, false, diag_id, depth);
+}
+
+/**
+ * Convert the name of a method into the corresponding write method name. For
+ * example, foo would be turned into foo=.
+ */
+static void
+parse_write_name(pm_parser_t *parser, pm_constant_id_t *name_field) {
+    // The method name needs to change. If we previously had
+    // foo, we now need foo=. In this case we'll allocate a new
+    // owned string, copy the previous method name in, and
+    // append an =.
+    pm_constant_t *constant = pm_constant_pool_id_to_constant(&parser->constant_pool, *name_field);
+    size_t length = constant->length;
+    uint8_t *name = xcalloc(length + 1, sizeof(uint8_t));
+    if (name == NULL) return;
+
+    memcpy(name, constant->start, length);
+    name[length] = '=';
+
+    // Now switch the name to the new string.
+    // This silences clang analyzer warning about leak of memory pointed by `name`.
+    // NOLINTNEXTLINE(clang-analyzer-*)
+    *name_field = pm_constant_pool_insert_owned(&parser->constant_pool, name, length + 1);
+}
+
+/**
+ * Certain expressions are not targetable, but in order to provide a better
+ * experience we give a specific error message. In order to maintain as much
+ * information in the tree as possible, we replace them with local variable
+ * writes.
+ */
+static pm_node_t *
+parse_unwriteable_target(pm_parser_t *parser, pm_node_t *target) {
+    switch (PM_NODE_TYPE(target)) {
+        case PM_SOURCE_ENCODING_NODE: pm_parser_err_node(parser, target, PM_ERR_EXPRESSION_NOT_WRITABLE_ENCODING); break;
+        case PM_FALSE_NODE: pm_parser_err_node(parser, target, PM_ERR_EXPRESSION_NOT_WRITABLE_FALSE); break;
+        case PM_SOURCE_FILE_NODE: pm_parser_err_node(parser, target, PM_ERR_EXPRESSION_NOT_WRITABLE_FILE); break;
+        case PM_SOURCE_LINE_NODE: pm_parser_err_node(parser, target, PM_ERR_EXPRESSION_NOT_WRITABLE_LINE); break;
+        case PM_NIL_NODE: pm_parser_err_node(parser, target, PM_ERR_EXPRESSION_NOT_WRITABLE_NIL); break;
+        case PM_SELF_NODE: pm_parser_err_node(parser, target, PM_ERR_EXPRESSION_NOT_WRITABLE_SELF); break;
+        case PM_TRUE_NODE: pm_parser_err_node(parser, target, PM_ERR_EXPRESSION_NOT_WRITABLE_TRUE); break;
+        default: break;
+    }
+
+    pm_constant_id_t name = pm_parser_constant_id_location(parser, target->location.start, target->location.end);
+    pm_local_variable_target_node_t *result = pm_local_variable_target_node_create(parser, &target->location, name, 0);
+
+    pm_node_destroy(parser, target);
+    return (pm_node_t *) result;
+}
+
+/**
+ * When an implicit local variable is written to or targeted, it becomes a
+ * regular, named local variable. This function removes it from the list of
+ * implicit parameters when that happens.
+ */
+static void
+parse_target_implicit_parameter(pm_parser_t *parser, pm_node_t *node) {
+    pm_node_list_t *implicit_parameters = &parser->current_scope->implicit_parameters;
+
+    for (size_t index = 0; index < implicit_parameters->size; index++) {
+        if (implicit_parameters->nodes[index] == node) {
+            // If the node is not the last one in the list, we need to shift the
+            // remaining nodes down to fill the gap. This is extremely unlikely
+            // to happen.
+            if (index != implicit_parameters->size - 1) {
+                memcpy(&implicit_parameters->nodes[index], &implicit_parameters->nodes[index + 1], (implicit_parameters->size - index - 1) * sizeof(pm_node_t *));
+            }
+
+            implicit_parameters->size--;
+            break;
+        }
+    }
+}
+
+/**
+ * Convert the given node into a valid target node.
+ *
+ * @param multiple Whether or not this target is part of a larger set of
+ *   targets. If it is, then the &. operator is not allowed.
+ * @param splat Whether or not this target is a child of a splat target. If it
+ *   is, then fewer patterns are allowed.
+ */
+static pm_node_t *
+parse_target(pm_parser_t *parser, pm_node_t *target, bool multiple, bool splat_parent) {
+    switch (PM_NODE_TYPE(target)) {
+        case PM_MISSING_NODE:
+            return target;
+        case PM_SOURCE_ENCODING_NODE:
+        case PM_FALSE_NODE:
+        case PM_SOURCE_FILE_NODE:
+        case PM_SOURCE_LINE_NODE:
+        case PM_NIL_NODE:
+        case PM_SELF_NODE:
+        case PM_TRUE_NODE: {
+            // In these special cases, we have specific error messages and we
+            // will replace them with local variable writes.
+            return parse_unwriteable_target(parser, target);
+        }
+        case PM_CLASS_VARIABLE_READ_NODE:
+            assert(sizeof(pm_class_variable_target_node_t) == sizeof(pm_class_variable_read_node_t));
+            target->type = PM_CLASS_VARIABLE_TARGET_NODE;
+            return target;
+        case PM_CONSTANT_PATH_NODE:
+            if (context_def_p(parser)) {
+                pm_parser_err_node(parser, target, PM_ERR_WRITE_TARGET_IN_METHOD);
+            }
+
+            assert(sizeof(pm_constant_path_target_node_t) == sizeof(pm_constant_path_node_t));
+            target->type = PM_CONSTANT_PATH_TARGET_NODE;
+
+            return target;
+        case PM_CONSTANT_READ_NODE:
+            if (context_def_p(parser)) {
+                pm_parser_err_node(parser, target, PM_ERR_WRITE_TARGET_IN_METHOD);
+            }
+
+            assert(sizeof(pm_constant_target_node_t) == sizeof(pm_constant_read_node_t));
+            target->type = PM_CONSTANT_TARGET_NODE;
+
+            return target;
+        case PM_BACK_REFERENCE_READ_NODE:
+        case PM_NUMBERED_REFERENCE_READ_NODE:
+            PM_PARSER_ERR_NODE_FORMAT_CONTENT(parser, target, PM_ERR_WRITE_TARGET_READONLY);
+            return target;
+        case PM_GLOBAL_VARIABLE_READ_NODE:
+            assert(sizeof(pm_global_variable_target_node_t) == sizeof(pm_global_variable_read_node_t));
+            target->type = PM_GLOBAL_VARIABLE_TARGET_NODE;
+            return target;
+        case PM_LOCAL_VARIABLE_READ_NODE: {
+            if (pm_token_is_numbered_parameter(target->location.start, target->location.end)) {
+                PM_PARSER_ERR_FORMAT(parser, target->location.start, target->location.end, PM_ERR_PARAMETER_NUMBERED_RESERVED, target->location.start);
+                parse_target_implicit_parameter(parser, target);
+            }
+
+            const pm_local_variable_read_node_t *cast = (const pm_local_variable_read_node_t *) target;
+            uint32_t name = cast->name;
+            uint32_t depth = cast->depth;
+            pm_locals_unread(&pm_parser_scope_find(parser, depth)->locals, name);
+
+            assert(sizeof(pm_local_variable_target_node_t) == sizeof(pm_local_variable_read_node_t));
+            target->type = PM_LOCAL_VARIABLE_TARGET_NODE;
+
+            return target;
+        }
+        case PM_IT_LOCAL_VARIABLE_READ_NODE: {
+            pm_constant_id_t name = pm_parser_local_add_constant(parser, "it", 2);
+            pm_node_t *node = (pm_node_t *) pm_local_variable_target_node_create(parser, &target->location, name, 0);
+
+            parse_target_implicit_parameter(parser, target);
+            pm_node_destroy(parser, target);
+
+            return node;
+        }
+        case PM_INSTANCE_VARIABLE_READ_NODE:
+            assert(sizeof(pm_instance_variable_target_node_t) == sizeof(pm_instance_variable_read_node_t));
+            target->type = PM_INSTANCE_VARIABLE_TARGET_NODE;
+            return target;
+        case PM_MULTI_TARGET_NODE:
+            if (splat_parent) {
+                // Multi target is not accepted in all positions. If this is one
+                // of them, then we need to add an error.
+                pm_parser_err_node(parser, target, PM_ERR_WRITE_TARGET_UNEXPECTED);
+            }
+
+            return target;
+        case PM_SPLAT_NODE: {
+            pm_splat_node_t *splat = (pm_splat_node_t *) target;
+
+            if (splat->expression != NULL) {
+                splat->expression = parse_target(parser, splat->expression, multiple, true);
+            }
+
+            return (pm_node_t *) splat;
+        }
+        case PM_CALL_NODE: {
+            pm_call_node_t *call = (pm_call_node_t *) target;
+
+            // If we have no arguments to the call node and we need this to be a
+            // target then this is either a method call or a local variable
+            // write.
+            if (
+                (call->message_loc.start != NULL) &&
+                (call->message_loc.end[-1] != '!') &&
+                (call->message_loc.end[-1] != '?') &&
+                (call->opening_loc.start == NULL) &&
+                (call->arguments == NULL) &&
+                (call->block == NULL)
+            ) {
+                if (call->receiver == NULL) {
+                    // When we get here, we have a local variable write, because it
+                    // was previously marked as a method call but now we have an =.
+                    // This looks like:
+                    //
+                    //     foo = 1
+                    //
+                    // When it was parsed in the prefix position, foo was seen as a
+                    // method call with no receiver and no arguments. Now we have an
+                    // =, so we know it's a local variable write.
+                    const pm_location_t message_loc = call->message_loc;
+
+                    pm_constant_id_t name = pm_parser_local_add_location(parser, message_loc.start, message_loc.end, 0);
+                    pm_node_destroy(parser, target);
+
+                    return (pm_node_t *) pm_local_variable_target_node_create(parser, &message_loc, name, 0);
+                }
+
+                if (*call->message_loc.start == '_' || parser->encoding->alnum_char(call->message_loc.start, call->message_loc.end - call->message_loc.start)) {
+                    if (multiple && PM_NODE_FLAG_P(call, PM_CALL_NODE_FLAGS_SAFE_NAVIGATION)) {
+                        pm_parser_err_node(parser, (const pm_node_t *) call, PM_ERR_UNEXPECTED_SAFE_NAVIGATION);
+                    }
+
+                    parse_write_name(parser, &call->name);
+                    return (pm_node_t *) pm_call_target_node_create(parser, call);
+                }
+            }
+
+            // If there is no call operator and the message is "[]" then this is
+            // an aref expression, and we can transform it into an aset
+            // expression.
+            if (PM_NODE_FLAG_P(call, PM_CALL_NODE_FLAGS_INDEX)) {
+                return (pm_node_t *) pm_index_target_node_create(parser, call);
+            }
+        }
+        PRISM_FALLTHROUGH
+        default:
+            // In this case we have a node that we don't know how to convert
+            // into a target. We need to treat it as an error. For now, we'll
+            // mark it as an error and just skip right past it.
+            pm_parser_err_node(parser, target, PM_ERR_WRITE_TARGET_UNEXPECTED);
+            return target;
+    }
+}
+
+/**
+ * Parse a write target and validate that it is in a valid position for
+ * assignment.
+ */
+static pm_node_t *
+parse_target_validate(pm_parser_t *parser, pm_node_t *target, bool multiple) {
+    pm_node_t *result = parse_target(parser, target, multiple, false);
+
+    // Ensure that we have one of an =, an 'in' in for indexes, and a ')' in
+    // parens after the targets.
+    if (
+        !match1(parser, PM_TOKEN_EQUAL) &&
+        !(context_p(parser, PM_CONTEXT_FOR_INDEX) && match1(parser, PM_TOKEN_KEYWORD_IN)) &&
+        !(context_p(parser, PM_CONTEXT_PARENS) && match1(parser, PM_TOKEN_PARENTHESIS_RIGHT))
+    ) {
+        pm_parser_err_node(parser, result, PM_ERR_WRITE_TARGET_UNEXPECTED);
+    }
+
+    return result;
+}
+
+/**
+ * Potentially wrap a constant write node in a shareable constant node depending
+ * on the current state.
+ */
+static pm_node_t *
+parse_shareable_constant_write(pm_parser_t *parser, pm_node_t *write) {
+    pm_shareable_constant_value_t shareable_constant = pm_parser_scope_shareable_constant_get(parser);
+
+    if (shareable_constant != PM_SCOPE_SHAREABLE_CONSTANT_NONE) {
+        return (pm_node_t *) pm_shareable_constant_node_create(parser, write, shareable_constant);
+    }
+
+    return write;
+}
+
+/**
+ * Convert the given node into a valid write node.
+ */
+static pm_node_t *
+parse_write(pm_parser_t *parser, pm_node_t *target, pm_token_t *operator, pm_node_t *value) {
+    switch (PM_NODE_TYPE(target)) {
+        case PM_MISSING_NODE:
+            pm_node_destroy(parser, value);
+            return target;
+        case PM_CLASS_VARIABLE_READ_NODE: {
+            pm_class_variable_write_node_t *node = pm_class_variable_write_node_create(parser, (pm_class_variable_read_node_t *) target, operator, value);
+            pm_node_destroy(parser, target);
+            return (pm_node_t *) node;
+        }
+        case PM_CONSTANT_PATH_NODE: {
+            pm_node_t *node = (pm_node_t *) pm_constant_path_write_node_create(parser, (pm_constant_path_node_t *) target, operator, value);
+
+            if (context_def_p(parser)) {
+                pm_parser_err_node(parser, node, PM_ERR_WRITE_TARGET_IN_METHOD);
+            }
+
+            return parse_shareable_constant_write(parser, node);
+        }
+        case PM_CONSTANT_READ_NODE: {
+            pm_node_t *node = (pm_node_t *) pm_constant_write_node_create(parser, (pm_constant_read_node_t *) target, operator, value);
+
+            if (context_def_p(parser)) {
+                pm_parser_err_node(parser, node, PM_ERR_WRITE_TARGET_IN_METHOD);
+            }
+
+            pm_node_destroy(parser, target);
+            return parse_shareable_constant_write(parser, node);
+        }
+        case PM_BACK_REFERENCE_READ_NODE:
+        case PM_NUMBERED_REFERENCE_READ_NODE:
+            PM_PARSER_ERR_NODE_FORMAT_CONTENT(parser, target, PM_ERR_WRITE_TARGET_READONLY);
+            PRISM_FALLTHROUGH
+        case PM_GLOBAL_VARIABLE_READ_NODE: {
+            pm_global_variable_write_node_t *node = pm_global_variable_write_node_create(parser, target, operator, value);
+            pm_node_destroy(parser, target);
+            return (pm_node_t *) node;
+        }
+        case PM_LOCAL_VARIABLE_READ_NODE: {
+            pm_local_variable_read_node_t *local_read = (pm_local_variable_read_node_t *) target;
+
+            pm_constant_id_t name = local_read->name;
+            pm_location_t name_loc = target->location;
+
+            uint32_t depth = local_read->depth;
+            pm_scope_t *scope = pm_parser_scope_find(parser, depth);
+
+            if (pm_token_is_numbered_parameter(target->location.start, target->location.end)) {
+                pm_diagnostic_id_t diag_id = (scope->parameters & PM_SCOPE_PARAMETERS_NUMBERED_FOUND) ? PM_ERR_EXPRESSION_NOT_WRITABLE_NUMBERED : PM_ERR_PARAMETER_NUMBERED_RESERVED;
+                PM_PARSER_ERR_FORMAT(parser, target->location.start, target->location.end, diag_id, target->location.start);
+                parse_target_implicit_parameter(parser, target);
+            }
+
+            pm_locals_unread(&scope->locals, name);
+            pm_node_destroy(parser, target);
+
+            return (pm_node_t *) pm_local_variable_write_node_create(parser, name, depth, value, &name_loc, operator);
+        }
+        case PM_IT_LOCAL_VARIABLE_READ_NODE: {
+            pm_constant_id_t name = pm_parser_local_add_constant(parser, "it", 2);
+            pm_node_t *node = (pm_node_t *) pm_local_variable_write_node_create(parser, name, 0, value, &target->location, operator);
+
+            parse_target_implicit_parameter(parser, target);
+            pm_node_destroy(parser, target);
+
+            return node;
+        }
+        case PM_INSTANCE_VARIABLE_READ_NODE: {
+            pm_node_t *write_node = (pm_node_t *) pm_instance_variable_write_node_create(parser, (pm_instance_variable_read_node_t *) target, operator, value);
+            pm_node_destroy(parser, target);
+            return write_node;
+        }
+        case PM_MULTI_TARGET_NODE:
+            return (pm_node_t *) pm_multi_write_node_create(parser, (pm_multi_target_node_t *) target, operator, value);
+        case PM_SPLAT_NODE: {
+            pm_splat_node_t *splat = (pm_splat_node_t *) target;
+
+            if (splat->expression != NULL) {
+                splat->expression = parse_write(parser, splat->expression, operator, value);
+            }
+
+            pm_multi_target_node_t *multi_target = pm_multi_target_node_create(parser);
+            pm_multi_target_node_targets_append(parser, multi_target, (pm_node_t *) splat);
+
+            return (pm_node_t *) pm_multi_write_node_create(parser, multi_target, operator, value);
+        }
+        case PM_CALL_NODE: {
+            pm_call_node_t *call = (pm_call_node_t *) target;
+
+            // If we have no arguments to the call node and we need this to be a
+            // target then this is either a method call or a local variable
+            // write.
+            if (
+                (call->message_loc.start != NULL) &&
+                (call->message_loc.end[-1] != '!') &&
+                (call->message_loc.end[-1] != '?') &&
+                (call->opening_loc.start == NULL) &&
+                (call->arguments == NULL) &&
+                (call->block == NULL)
+            ) {
+                if (call->receiver == NULL) {
+                    // When we get here, we have a local variable write, because it
+                    // was previously marked as a method call but now we have an =.
+                    // This looks like:
+                    //
+                    //     foo = 1
+                    //
+                    // When it was parsed in the prefix position, foo was seen as a
+                    // method call with no receiver and no arguments. Now we have an
+                    // =, so we know it's a local variable write.
+                    const pm_location_t message = call->message_loc;
+
+                    pm_parser_local_add_location(parser, message.start, message.end, 0);
+                    pm_node_destroy(parser, target);
+
+                    pm_constant_id_t constant_id = pm_parser_constant_id_location(parser, message.start, message.end);
+                    target = (pm_node_t *) pm_local_variable_write_node_create(parser, constant_id, 0, value, &message, operator);
+
+                    pm_refute_numbered_parameter(parser, message.start, message.end);
+                    return target;
+                }
+
+                if (char_is_identifier_start(parser, call->message_loc.start, parser->end - call->message_loc.start)) {
+                    // When we get here, we have a method call, because it was
+                    // previously marked as a method call but now we have an =. This
+                    // looks like:
+                    //
+                    //     foo.bar = 1
+                    //
+                    // When it was parsed in the prefix position, foo.bar was seen as a
+                    // method call with no arguments. Now we have an =, so we know it's
+                    // a method call with an argument. In this case we will create the
+                    // arguments node, parse the argument, and add it to the list.
+                    pm_arguments_node_t *arguments = pm_arguments_node_create(parser);
+                    call->arguments = arguments;
+
+                    pm_arguments_node_arguments_append(arguments, value);
+                    call->base.location.end = arguments->base.location.end;
+
+                    parse_write_name(parser, &call->name);
+                    pm_node_flag_set((pm_node_t *) call, PM_CALL_NODE_FLAGS_ATTRIBUTE_WRITE | pm_implicit_array_write_flags(value, PM_CALL_NODE_FLAGS_IMPLICIT_ARRAY));
+
+                    return (pm_node_t *) call;
+                }
+            }
+
+            // If there is no call operator and the message is "[]" then this is
+            // an aref expression, and we can transform it into an aset
+            // expression.
+            if (PM_NODE_FLAG_P(call, PM_CALL_NODE_FLAGS_INDEX)) {
+                if (call->arguments == NULL) {
+                    call->arguments = pm_arguments_node_create(parser);
+                }
+
+                pm_arguments_node_arguments_append(call->arguments, value);
+                target->location.end = value->location.end;
+
+                // Replace the name with "[]=".
+                call->name = pm_parser_constant_id_constant(parser, "[]=", 3);
+
+                // Ensure that the arguments for []= don't contain keywords
+                pm_index_arguments_check(parser, call->arguments, call->block);
+                pm_node_flag_set((pm_node_t *) call, PM_CALL_NODE_FLAGS_ATTRIBUTE_WRITE | pm_implicit_array_write_flags(value, PM_CALL_NODE_FLAGS_IMPLICIT_ARRAY));
+
+                return target;
+            }
+
+            // If there are arguments on the call node, then it can't be a method
+            // call ending with = or a local variable write, so it must be a
+            // syntax error. In this case we'll fall through to our default
+            // handling. We need to free the value that we parsed because there
+            // is no way for us to attach it to the tree at this point.
+            pm_node_destroy(parser, value);
+        }
+        PRISM_FALLTHROUGH
+        default:
+            // In this case we have a node that we don't know how to convert into a
+            // target. We need to treat it as an error. For now, we'll mark it as an
+            // error and just skip right past it.
+            pm_parser_err_token(parser, operator, PM_ERR_WRITE_TARGET_UNEXPECTED);
+            return target;
+    }
+}
+
+/**
+ * Certain expressions are not writable, but in order to provide a better
+ * experience we give a specific error message. In order to maintain as much
+ * information in the tree as possible, we replace them with local variable
+ * writes.
+ */
+static pm_node_t *
+parse_unwriteable_write(pm_parser_t *parser, pm_node_t *target, const pm_token_t *equals, pm_node_t *value) {
+    switch (PM_NODE_TYPE(target)) {
+        case PM_SOURCE_ENCODING_NODE: pm_parser_err_token(parser, equals, PM_ERR_EXPRESSION_NOT_WRITABLE_ENCODING); break;
+        case PM_FALSE_NODE: pm_parser_err_token(parser, equals, PM_ERR_EXPRESSION_NOT_WRITABLE_FALSE); break;
+        case PM_SOURCE_FILE_NODE: pm_parser_err_token(parser, equals, PM_ERR_EXPRESSION_NOT_WRITABLE_FILE); break;
+        case PM_SOURCE_LINE_NODE: pm_parser_err_token(parser, equals, PM_ERR_EXPRESSION_NOT_WRITABLE_LINE); break;
+        case PM_NIL_NODE: pm_parser_err_token(parser, equals, PM_ERR_EXPRESSION_NOT_WRITABLE_NIL); break;
+        case PM_SELF_NODE: pm_parser_err_token(parser, equals, PM_ERR_EXPRESSION_NOT_WRITABLE_SELF); break;
+        case PM_TRUE_NODE: pm_parser_err_token(parser, equals, PM_ERR_EXPRESSION_NOT_WRITABLE_TRUE); break;
+        default: break;
+    }
+
+    pm_constant_id_t name = pm_parser_local_add_location(parser, target->location.start, target->location.end, 1);
+    pm_local_variable_write_node_t *result = pm_local_variable_write_node_create(parser, name, 0, value, &target->location, equals);
+
+    pm_node_destroy(parser, target);
+    return (pm_node_t *) result;
+}
+
+/**
+ * Parse a list of targets for assignment. This is used in the case of a for
+ * loop or a multi-assignment. For example, in the following code:
+ *
+ *     for foo, bar in baz
+ *         ^^^^^^^^
+ *
+ * The targets are `foo` and `bar`. This function will either return a single
+ * target node or a multi-target node.
+ */
+static pm_node_t *
+parse_targets(pm_parser_t *parser, pm_node_t *first_target, pm_binding_power_t binding_power, uint16_t depth) {
+    bool has_rest = PM_NODE_TYPE_P(first_target, PM_SPLAT_NODE);
+
+    pm_multi_target_node_t *result = pm_multi_target_node_create(parser);
+    pm_multi_target_node_targets_append(parser, result, parse_target(parser, first_target, true, false));
+
+    while (accept1(parser, PM_TOKEN_COMMA)) {
+        if (accept1(parser, PM_TOKEN_USTAR)) {
+            // Here we have a splat operator. It can have a name or be
+            // anonymous. It can be the final target or be in the middle if
+            // there haven't been any others yet.
+            if (has_rest) {
+                pm_parser_err_previous(parser, PM_ERR_MULTI_ASSIGN_MULTI_SPLATS);
+            }
+
+            pm_token_t star_operator = parser->previous;
+            pm_node_t *name = NULL;
+
+            if (token_begins_expression_p(parser->current.type)) {
+                name = parse_expression(parser, binding_power, false, false, PM_ERR_EXPECT_EXPRESSION_AFTER_STAR, (uint16_t) (depth + 1));
+                name = parse_target(parser, name, true, true);
+            }
+
+            pm_node_t *splat = (pm_node_t *) pm_splat_node_create(parser, &star_operator, name);
+            pm_multi_target_node_targets_append(parser, result, splat);
+            has_rest = true;
+        } else if (match1(parser, PM_TOKEN_PARENTHESIS_LEFT)) {
+            context_push(parser, PM_CONTEXT_MULTI_TARGET);
+            pm_node_t *target = parse_expression(parser, binding_power, false, false, PM_ERR_EXPECT_EXPRESSION_AFTER_COMMA, (uint16_t) (depth + 1));
+            target = parse_target(parser, target, true, false);
+
+            pm_multi_target_node_targets_append(parser, result, target);
+            context_pop(parser);
+        } else if (token_begins_expression_p(parser->current.type)) {
+            pm_node_t *target = parse_expression(parser, binding_power, false, false, PM_ERR_EXPECT_EXPRESSION_AFTER_COMMA, (uint16_t) (depth + 1));
+            target = parse_target(parser, target, true, false);
+
+            pm_multi_target_node_targets_append(parser, result, target);
+        } else if (!match1(parser, PM_TOKEN_EOF)) {
+            // If we get here, then we have a trailing , in a multi target node.
+            // We'll add an implicit rest node to represent this.
+            pm_node_t *rest = (pm_node_t *) pm_implicit_rest_node_create(parser, &parser->previous);
+            pm_multi_target_node_targets_append(parser, result, rest);
+            break;
+        }
+    }
+
+    return (pm_node_t *) result;
+}
+
+/**
+ * Parse a list of targets and validate that it is in a valid position for
+ * assignment.
+ */
+static pm_node_t *
+parse_targets_validate(pm_parser_t *parser, pm_node_t *first_target, pm_binding_power_t binding_power, uint16_t depth) {
+    pm_node_t *result = parse_targets(parser, first_target, binding_power, depth);
+    accept1(parser, PM_TOKEN_NEWLINE);
+
+    // Ensure that we have either an = or a ) after the targets.
+    if (!match2(parser, PM_TOKEN_EQUAL, PM_TOKEN_PARENTHESIS_RIGHT)) {
+        pm_parser_err_node(parser, result, PM_ERR_WRITE_TARGET_UNEXPECTED);
+    }
+
+    return result;
+}
+
+/**
+ * Parse a list of statements separated by newlines or semicolons.
+ */
+static pm_statements_node_t *
+parse_statements(pm_parser_t *parser, pm_context_t context, uint16_t depth) {
+    // First, skip past any optional terminators that might be at the beginning
+    // of the statements.
+    while (accept2(parser, PM_TOKEN_SEMICOLON, PM_TOKEN_NEWLINE));
+
+    // If we have a terminator, then we can just return NULL.
+    if (context_terminator(context, &parser->current)) return NULL;
+
+    pm_statements_node_t *statements = pm_statements_node_create(parser);
+
+    // At this point we know we have at least one statement, and that it
+    // immediately follows the current token.
+    context_push(parser, context);
+
+    while (true) {
+        pm_node_t *node = parse_expression(parser, PM_BINDING_POWER_STATEMENT, true, false, PM_ERR_CANNOT_PARSE_EXPRESSION, (uint16_t) (depth + 1));
+        pm_statements_node_body_append(parser, statements, node, true);
+
+        // If we're recovering from a syntax error, then we need to stop parsing
+        // the statements now.
+        if (parser->recovering) {
+            // If this is the level of context where the recovery has happened,
+            // then we can mark the parser as done recovering.
+            if (context_terminator(context, &parser->current)) parser->recovering = false;
+            break;
+        }
+
+        // If we have a terminator, then we will parse all consecutive
+        // terminators and then continue parsing the statements list.
+        if (accept2(parser, PM_TOKEN_NEWLINE, PM_TOKEN_SEMICOLON)) {
+            // If we have a terminator, then we will continue parsing the
+            // statements list.
+            while (accept2(parser, PM_TOKEN_NEWLINE, PM_TOKEN_SEMICOLON));
+            if (context_terminator(context, &parser->current)) break;
+
+            // Now we can continue parsing the list of statements.
+            continue;
+        }
+
+        // At this point we have a list of statements that are not terminated by
+        // a newline or semicolon. At this point we need to check if we're at
+        // the end of the statements list. If we are, then we should break out
+        // of the loop.
+        if (context_terminator(context, &parser->current)) break;
+
+        // At this point, we have a syntax error, because the statement was not
+        // terminated by a newline or semicolon, and we're not at the end of the
+        // statements list. Ideally we should scan forward to determine if we
+        // should insert a missing terminator or break out of parsing the
+        // statements list at this point.
+        //
+        // We don't have that yet, so instead we'll do a more naive approach. If
+        // we were unable to parse an expression, then we will skip past this
+        // token and continue parsing the statements list. Otherwise we'll add
+        // an error and continue parsing the statements list.
+        if (PM_NODE_TYPE_P(node, PM_MISSING_NODE)) {
+            parser_lex(parser);
+
+            // If we are at the end of the file, then we need to stop parsing
+            // the statements entirely at this point. Mark the parser as
+            // recovering, as we know that EOF closes the top-level context, and
+            // then break out of the loop.
+            if (match1(parser, PM_TOKEN_EOF)) {
+                parser->recovering = true;
+                break;
+            }
+
+            while (accept2(parser, PM_TOKEN_NEWLINE, PM_TOKEN_SEMICOLON));
+            if (context_terminator(context, &parser->current)) break;
+        } else if (!accept2(parser, PM_TOKEN_NEWLINE, PM_TOKEN_EOF)) {
+            // This is an inlined version of accept1 because the error that we
+            // want to add has varargs. If this happens again, we should
+            // probably extract a helper function.
+            PM_PARSER_ERR_TOKEN_FORMAT(parser, parser->current, PM_ERR_EXPECT_EOL_AFTER_STATEMENT, pm_token_type_human(parser->current.type));
+            parser->previous.start = parser->previous.end;
+            parser->previous.type = PM_TOKEN_MISSING;
+        }
+    }
+
+    context_pop(parser);
+    bool last_value = true;
+    switch (context) {
+        case PM_CONTEXT_BEGIN_ENSURE:
+        case PM_CONTEXT_DEF_ENSURE:
+            last_value = false;
+            break;
+        default:
+            break;
+    }
+    pm_void_statements_check(parser, statements, last_value);
+
+    return statements;
+}
+
+/**
+ * Add a node to a set of static literals that holds a set of hash keys. If the
+ * node is a duplicate, then add an appropriate warning.
+ */
+static void
+pm_hash_key_static_literals_add(pm_parser_t *parser, pm_static_literals_t *literals, pm_node_t *node) {
+    const pm_node_t *duplicated = pm_static_literals_add(&parser->newline_list, parser->start_line, literals, node, true);
+
+    if (duplicated != NULL) {
+        pm_buffer_t buffer = { 0 };
+        pm_static_literal_inspect(&buffer, &parser->newline_list, parser->start_line, parser->encoding->name, duplicated);
+
+        pm_diagnostic_list_append_format(
+            &parser->warning_list,
+            duplicated->location.start,
+            duplicated->location.end,
+            PM_WARN_DUPLICATED_HASH_KEY,
+            (int) pm_buffer_length(&buffer),
+            pm_buffer_value(&buffer),
+            pm_newline_list_line_column(&parser->newline_list, node->location.start, parser->start_line).line
+        );
+
+        pm_buffer_free(&buffer);
+    }
+}
+
+/**
+ * Add a node to a set of static literals that holds a set of hash keys. If the
+ * node is a duplicate, then add an appropriate warning.
+ */
+static void
+pm_when_clause_static_literals_add(pm_parser_t *parser, pm_static_literals_t *literals, pm_node_t *node) {
+    pm_node_t *previous;
+
+    if ((previous = pm_static_literals_add(&parser->newline_list, parser->start_line, literals, node, false)) != NULL) {
+        pm_diagnostic_list_append_format(
+            &parser->warning_list,
+            node->location.start,
+            node->location.end,
+            PM_WARN_DUPLICATED_WHEN_CLAUSE,
+            pm_newline_list_line_column(&parser->newline_list, node->location.start, parser->start_line).line,
+            pm_newline_list_line_column(&parser->newline_list, previous->location.start, parser->start_line).line
+        );
+    }
+}
+
+/**
+ * Parse all of the elements of a hash. Return true if a double splat was found.
+ */
+static bool
+parse_assocs(pm_parser_t *parser, pm_static_literals_t *literals, pm_node_t *node, uint16_t depth) {
+    assert(PM_NODE_TYPE_P(node, PM_HASH_NODE) || PM_NODE_TYPE_P(node, PM_KEYWORD_HASH_NODE));
+    bool contains_keyword_splat = false;
+
+    while (true) {
+        pm_node_t *element;
+
+        switch (parser->current.type) {
+            case PM_TOKEN_USTAR_STAR: {
+                parser_lex(parser);
+                pm_token_t operator = parser->previous;
+                pm_node_t *value = NULL;
+
+                if (match1(parser, PM_TOKEN_BRACE_LEFT)) {
+                    // If we're about to parse a nested hash that is being
+                    // pushed into this hash directly with **, then we want the
+                    // inner hash to share the static literals with the outer
+                    // hash.
+                    parser->current_hash_keys = literals;
+                    value = parse_value_expression(parser, PM_BINDING_POWER_DEFINED, false, false, PM_ERR_EXPECT_EXPRESSION_AFTER_SPLAT_HASH, (uint16_t) (depth + 1));
+                } else if (token_begins_expression_p(parser->current.type)) {
+                    value = parse_value_expression(parser, PM_BINDING_POWER_DEFINED, false, false, PM_ERR_EXPECT_EXPRESSION_AFTER_SPLAT_HASH, (uint16_t) (depth + 1));
+                } else {
+                    pm_parser_scope_forwarding_keywords_check(parser, &operator);
+                }
+
+                element = (pm_node_t *) pm_assoc_splat_node_create(parser, value, &operator);
+                contains_keyword_splat = true;
+                break;
+            }
+            case PM_TOKEN_LABEL: {
+                pm_token_t label = parser->current;
+                parser_lex(parser);
+
+                pm_node_t *key = (pm_node_t *) pm_symbol_node_label_create(parser, &label);
+                pm_hash_key_static_literals_add(parser, literals, key);
+
+                pm_token_t operator = not_provided(parser);
+                pm_node_t *value = NULL;
+
+                if (token_begins_expression_p(parser->current.type)) {
+                    value = parse_value_expression(parser, PM_BINDING_POWER_DEFINED, false, false, PM_ERR_HASH_EXPRESSION_AFTER_LABEL, (uint16_t) (depth + 1));
+                } else {
+                    if (parser->encoding->isupper_char(label.start, (label.end - 1) - label.start)) {
+                        pm_token_t constant = { .type = PM_TOKEN_CONSTANT, .start = label.start, .end = label.end - 1 };
+                        value = (pm_node_t *) pm_constant_read_node_create(parser, &constant);
+                    } else {
+                        int depth = -1;
+                        pm_token_t identifier = { .type = PM_TOKEN_IDENTIFIER, .start = label.start, .end = label.end - 1 };
+
+                        if (identifier.end[-1] == '!' || identifier.end[-1] == '?') {
+                            PM_PARSER_ERR_TOKEN_FORMAT_CONTENT(parser, identifier, PM_ERR_INVALID_LOCAL_VARIABLE_READ);
+                        } else {
+                            depth = pm_parser_local_depth(parser, &identifier);
+                        }
+
+                        if (depth == -1) {
+                            value = (pm_node_t *) pm_call_node_variable_call_create(parser, &identifier);
+                        } else {
+                            value = (pm_node_t *) pm_local_variable_read_node_create(parser, &identifier, (uint32_t) depth);
+                        }
+                    }
+
+                    value->location.end++;
+                    value = (pm_node_t *) pm_implicit_node_create(parser, value);
+                }
+
+                element = (pm_node_t *) pm_assoc_node_create(parser, key, &operator, value);
+                break;
+            }
+            default: {
+                pm_node_t *key = parse_value_expression(parser, PM_BINDING_POWER_DEFINED, false, true, PM_ERR_HASH_KEY, (uint16_t) (depth + 1));
+
+                // Hash keys that are strings are automatically frozen. We will
+                // mark that here.
+                if (PM_NODE_TYPE_P(key, PM_STRING_NODE)) {
+                    pm_node_flag_set(key, PM_STRING_FLAGS_FROZEN | PM_NODE_FLAG_STATIC_LITERAL);
+                }
+
+                pm_hash_key_static_literals_add(parser, literals, key);
+
+                pm_token_t operator;
+                if (pm_symbol_node_label_p(key)) {
+                    operator = not_provided(parser);
+                } else {
+                    expect1(parser, PM_TOKEN_EQUAL_GREATER, PM_ERR_HASH_ROCKET);
+                    operator = parser->previous;
+                }
+
+                pm_node_t *value = parse_value_expression(parser, PM_BINDING_POWER_DEFINED, false, false, PM_ERR_HASH_VALUE, (uint16_t) (depth + 1));
+                element = (pm_node_t *) pm_assoc_node_create(parser, key, &operator, value);
+                break;
+            }
+        }
+
+        if (PM_NODE_TYPE_P(node, PM_HASH_NODE)) {
+            pm_hash_node_elements_append((pm_hash_node_t *) node, element);
+        } else {
+            pm_keyword_hash_node_elements_append((pm_keyword_hash_node_t *) node, element);
+        }
+
+        // If there's no comma after the element, then we're done.
+        if (!accept1(parser, PM_TOKEN_COMMA)) break;
+
+        // If the next element starts with a label or a **, then we know we have
+        // another element in the hash, so we'll continue parsing.
+        if (match2(parser, PM_TOKEN_USTAR_STAR, PM_TOKEN_LABEL)) continue;
+
+        // Otherwise we need to check if the subsequent token begins an expression.
+        // If it does, then we'll continue parsing.
+        if (token_begins_expression_p(parser->current.type)) continue;
+
+        // Otherwise by default we will exit out of this loop.
+        break;
+    }
+
+    return contains_keyword_splat;
+}
+
+/**
+ * Append an argument to a list of arguments.
+ */
+static inline void
+parse_arguments_append(pm_parser_t *parser, pm_arguments_t *arguments, pm_node_t *argument) {
+    if (arguments->arguments == NULL) {
+        arguments->arguments = pm_arguments_node_create(parser);
+    }
+
+    pm_arguments_node_arguments_append(arguments->arguments, argument);
+}
+
+/**
+ * Parse a list of arguments.
+ */
+static void
+parse_arguments(pm_parser_t *parser, pm_arguments_t *arguments, bool accepts_forwarding, pm_token_type_t terminator, uint16_t depth) {
+    pm_binding_power_t binding_power = pm_binding_powers[parser->current.type].left;
+
+    // First we need to check if the next token is one that could be the start
+    // of an argument. If it's not, then we can just return.
+    if (
+        match2(parser, terminator, PM_TOKEN_EOF) ||
+        (binding_power != PM_BINDING_POWER_UNSET && binding_power < PM_BINDING_POWER_RANGE) ||
+        context_terminator(parser->current_context->context, &parser->current)
+    ) {
+        return;
+    }
+
+    bool parsed_first_argument = false;
+    bool parsed_bare_hash = false;
+    bool parsed_block_argument = false;
+    bool parsed_forwarding_arguments = false;
+
+    while (!match1(parser, PM_TOKEN_EOF)) {
+        if (parsed_forwarding_arguments) {
+            pm_parser_err_current(parser, PM_ERR_ARGUMENT_AFTER_FORWARDING_ELLIPSES);
+        }
+
+        pm_node_t *argument = NULL;
+
+        switch (parser->current.type) {
+            case PM_TOKEN_USTAR_STAR:
+            case PM_TOKEN_LABEL: {
+                if (parsed_bare_hash) {
+                    pm_parser_err_current(parser, PM_ERR_ARGUMENT_BARE_HASH);
+                }
+
+                pm_keyword_hash_node_t *hash = pm_keyword_hash_node_create(parser);
+                argument = (pm_node_t *) hash;
+
+                pm_static_literals_t hash_keys = { 0 };
+                bool contains_keyword_splat = parse_assocs(parser, &hash_keys, (pm_node_t *) hash, (uint16_t) (depth + 1));
+
+                parse_arguments_append(parser, arguments, argument);
+
+                pm_node_flags_t flags = PM_ARGUMENTS_NODE_FLAGS_CONTAINS_KEYWORDS;
+                if (contains_keyword_splat) flags |= PM_ARGUMENTS_NODE_FLAGS_CONTAINS_KEYWORD_SPLAT;
+                pm_node_flag_set((pm_node_t *) arguments->arguments, flags);
+
+                pm_static_literals_free(&hash_keys);
+                parsed_bare_hash = true;
+
+                break;
+            }
+            case PM_TOKEN_UAMPERSAND: {
+                parser_lex(parser);
+                pm_token_t operator = parser->previous;
+                pm_node_t *expression = NULL;
+
+                if (token_begins_expression_p(parser->current.type)) {
+                    expression = parse_value_expression(parser, PM_BINDING_POWER_DEFINED, false, false, PM_ERR_EXPECT_ARGUMENT, (uint16_t) (depth + 1));
+                } else {
+                    pm_parser_scope_forwarding_block_check(parser, &operator);
+                }
+
+                argument = (pm_node_t *) pm_block_argument_node_create(parser, &operator, expression);
+                if (parsed_block_argument) {
+                    parse_arguments_append(parser, arguments, argument);
+                } else {
+                    arguments->block = argument;
+                }
+
+                if (match1(parser, PM_TOKEN_COMMA)) {
+                    pm_parser_err_current(parser, PM_ERR_ARGUMENT_AFTER_BLOCK);
+                }
+
+                parsed_block_argument = true;
+                break;
+            }
+            case PM_TOKEN_USTAR: {
+                parser_lex(parser);
+                pm_token_t operator = parser->previous;
+
+                if (match4(parser, PM_TOKEN_PARENTHESIS_RIGHT, PM_TOKEN_COMMA, PM_TOKEN_SEMICOLON, PM_TOKEN_BRACKET_RIGHT)) {
+                    pm_parser_scope_forwarding_positionals_check(parser, &operator);
+                    argument = (pm_node_t *) pm_splat_node_create(parser, &operator, NULL);
+                    if (parsed_bare_hash) {
+                        pm_parser_err_previous(parser, PM_ERR_ARGUMENT_SPLAT_AFTER_ASSOC_SPLAT);
+                    }
+                } else {
+                    pm_node_t *expression = parse_value_expression(parser, PM_BINDING_POWER_DEFINED, false, false, PM_ERR_EXPECT_EXPRESSION_AFTER_SPLAT, (uint16_t) (depth + 1));
+
+                    if (parsed_bare_hash) {
+                        pm_parser_err(parser, operator.start, expression->location.end, PM_ERR_ARGUMENT_SPLAT_AFTER_ASSOC_SPLAT);
+                    }
+
+                    argument = (pm_node_t *) pm_splat_node_create(parser, &operator, expression);
+                }
+
+                parse_arguments_append(parser, arguments, argument);
+                break;
+            }
+            case PM_TOKEN_UDOT_DOT_DOT: {
+                if (accepts_forwarding) {
+                    parser_lex(parser);
+
+                    if (token_begins_expression_p(parser->current.type)) {
+                        // If the token begins an expression then this ... was
+                        // not actually argument forwarding but was instead a
+                        // range.
+                        pm_token_t operator = parser->previous;
+                        pm_node_t *right = parse_expression(parser, PM_BINDING_POWER_RANGE, false, false, PM_ERR_EXPECT_EXPRESSION_AFTER_OPERATOR, (uint16_t) (depth + 1));
+
+                        // If we parse a range, we need to validate that we
+                        // didn't accidentally violate the nonassoc rules of the
+                        // ... operator.
+                        if (PM_NODE_TYPE_P(right, PM_RANGE_NODE)) {
+                            pm_range_node_t *range = (pm_range_node_t *) right;
+                            pm_parser_err(parser, range->operator_loc.start, range->operator_loc.end, PM_ERR_UNEXPECTED_RANGE_OPERATOR);
+                        }
+
+                        argument = (pm_node_t *) pm_range_node_create(parser, NULL, &operator, right);
+                    } else {
+                        pm_parser_scope_forwarding_all_check(parser, &parser->previous);
+                        if (parsed_first_argument && terminator == PM_TOKEN_EOF) {
+                            pm_parser_err_previous(parser, PM_ERR_ARGUMENT_FORWARDING_UNBOUND);
+                        }
+
+                        argument = (pm_node_t *) pm_forwarding_arguments_node_create(parser, &parser->previous);
+                        parse_arguments_append(parser, arguments, argument);
+                        pm_node_flag_set((pm_node_t *) arguments->arguments, PM_ARGUMENTS_NODE_FLAGS_CONTAINS_FORWARDING);
+                        arguments->has_forwarding = true;
+                        parsed_forwarding_arguments = true;
+                        break;
+                    }
+                }
+            }
+            PRISM_FALLTHROUGH
+            default: {
+                if (argument == NULL) {
+                    argument = parse_value_expression(parser, PM_BINDING_POWER_DEFINED, !parsed_first_argument, true, PM_ERR_EXPECT_ARGUMENT, (uint16_t) (depth + 1));
+                }
+
+                bool contains_keywords = false;
+                bool contains_keyword_splat = false;
+
+                if (pm_symbol_node_label_p(argument) || accept1(parser, PM_TOKEN_EQUAL_GREATER)) {
+                    if (parsed_bare_hash) {
+                        pm_parser_err_previous(parser, PM_ERR_ARGUMENT_BARE_HASH);
+                    }
+
+                    pm_token_t operator;
+                    if (parser->previous.type == PM_TOKEN_EQUAL_GREATER) {
+                        operator = parser->previous;
+                    } else {
+                        operator = not_provided(parser);
+                    }
+
+                    pm_keyword_hash_node_t *bare_hash = pm_keyword_hash_node_create(parser);
+                    contains_keywords = true;
+
+                    // Create the set of static literals for this hash.
+                    pm_static_literals_t hash_keys = { 0 };
+                    pm_hash_key_static_literals_add(parser, &hash_keys, argument);
+
+                    // Finish parsing the one we are part way through.
+                    pm_node_t *value = parse_value_expression(parser, PM_BINDING_POWER_DEFINED, false, false, PM_ERR_HASH_VALUE, (uint16_t) (depth + 1));
+                    argument = (pm_node_t *) pm_assoc_node_create(parser, argument, &operator, value);
+
+                    pm_keyword_hash_node_elements_append(bare_hash, argument);
+                    argument = (pm_node_t *) bare_hash;
+
+                    // Then parse more if we have a comma
+                    if (accept1(parser, PM_TOKEN_COMMA) && (
+                        token_begins_expression_p(parser->current.type) ||
+                        match2(parser, PM_TOKEN_USTAR_STAR, PM_TOKEN_LABEL)
+                    )) {
+                        contains_keyword_splat = parse_assocs(parser, &hash_keys, (pm_node_t *) bare_hash, (uint16_t) (depth + 1));
+                    }
+
+                    pm_static_literals_free(&hash_keys);
+                    parsed_bare_hash = true;
+                }
+
+                parse_arguments_append(parser, arguments, argument);
+
+                pm_node_flags_t flags = 0;
+                if (contains_keywords) flags |= PM_ARGUMENTS_NODE_FLAGS_CONTAINS_KEYWORDS;
+                if (contains_keyword_splat) flags |= PM_ARGUMENTS_NODE_FLAGS_CONTAINS_KEYWORD_SPLAT;
+                pm_node_flag_set((pm_node_t *) arguments->arguments, flags);
+
+                break;
+            }
+        }
+
+        parsed_first_argument = true;
+
+        // If parsing the argument failed, we need to stop parsing arguments.
+        if (PM_NODE_TYPE_P(argument, PM_MISSING_NODE) || parser->recovering) break;
+
+        // If the terminator of these arguments is not EOF, then we have a
+        // specific token we're looking for. In that case we can accept a
+        // newline here because it is not functioning as a statement terminator.
+        bool accepted_newline = false;
+        if (terminator != PM_TOKEN_EOF) {
+            accepted_newline = accept1(parser, PM_TOKEN_NEWLINE);
+        }
+
+        if (parser->previous.type == PM_TOKEN_COMMA && parsed_bare_hash) {
+            // If we previously were on a comma and we just parsed a bare hash,
+            // then we want to continue parsing arguments. This is because the
+            // comma was grabbed up by the hash parser.
+        } else if (accept1(parser, PM_TOKEN_COMMA)) {
+            // If there was a comma, then we need to check if we also accepted a
+            // newline. If we did, then this is a syntax error.
+            if (accepted_newline) {
+                pm_parser_err_previous(parser, PM_ERR_INVALID_COMMA);
+            }
+        } else {
+            // If there is no comma at the end of the argument list then we're
+            // done parsing arguments and can break out of this loop.
+            break;
+        }
+
+        // If we hit the terminator, then that means we have a trailing comma so
+        // we can accept that output as well.
+        if (match1(parser, terminator)) break;
+    }
+}
+
+/**
+ * Required parameters on method, block, and lambda declarations can be
+ * destructured using parentheses. This looks like:
+ *
+ *     def foo((bar, baz))
+ *     end
+ *
+ *
+ * It can recurse infinitely down, and splats are allowed to group arguments.
+ */
+static pm_multi_target_node_t *
+parse_required_destructured_parameter(pm_parser_t *parser) {
+    expect1(parser, PM_TOKEN_PARENTHESIS_LEFT, PM_ERR_EXPECT_LPAREN_REQ_PARAMETER);
+
+    pm_multi_target_node_t *node = pm_multi_target_node_create(parser);
+    pm_multi_target_node_opening_set(node, &parser->previous);
+
+    do {
+        pm_node_t *param;
+
+        // If we get here then we have a trailing comma, which isn't allowed in
+        // the grammar. In other places, multi targets _do_ allow trailing
+        // commas, so here we'll assume this is a mistake of the user not
+        // knowing it's not allowed here.
+        if (node->lefts.size > 0 && match1(parser, PM_TOKEN_PARENTHESIS_RIGHT)) {
+            param = (pm_node_t *) pm_implicit_rest_node_create(parser, &parser->previous);
+            pm_multi_target_node_targets_append(parser, node, param);
+            pm_parser_err_current(parser, PM_ERR_PARAMETER_WILD_LOOSE_COMMA);
+            break;
+        }
+
+        if (match1(parser, PM_TOKEN_PARENTHESIS_LEFT)) {
+            param = (pm_node_t *) parse_required_destructured_parameter(parser);
+        } else if (accept1(parser, PM_TOKEN_USTAR)) {
+            pm_token_t star = parser->previous;
+            pm_node_t *value = NULL;
+
+            if (accept1(parser, PM_TOKEN_IDENTIFIER)) {
+                pm_token_t name = parser->previous;
+                value = (pm_node_t *) pm_required_parameter_node_create(parser, &name);
+                if (pm_parser_parameter_name_check(parser, &name)) {
+                    pm_node_flag_set_repeated_parameter(value);
+                }
+                pm_parser_local_add_token(parser, &name, 1);
+            }
+
+            param = (pm_node_t *) pm_splat_node_create(parser, &star, value);
+        } else {
+            expect1(parser, PM_TOKEN_IDENTIFIER, PM_ERR_EXPECT_IDENT_REQ_PARAMETER);
+            pm_token_t name = parser->previous;
+
+            param = (pm_node_t *) pm_required_parameter_node_create(parser, &name);
+            if (pm_parser_parameter_name_check(parser, &name)) {
+                pm_node_flag_set_repeated_parameter(param);
+            }
+            pm_parser_local_add_token(parser, &name, 1);
+        }
+
+        pm_multi_target_node_targets_append(parser, node, param);
+    } while (accept1(parser, PM_TOKEN_COMMA));
+
+    accept1(parser, PM_TOKEN_NEWLINE);
+    expect1(parser, PM_TOKEN_PARENTHESIS_RIGHT, PM_ERR_EXPECT_RPAREN_REQ_PARAMETER);
+    pm_multi_target_node_closing_set(node, &parser->previous);
+
+    return node;
+}
+
+/**
+ * This represents the different order states we can be in when parsing
+ * method parameters.
+ */
+typedef enum {
+    PM_PARAMETERS_NO_CHANGE = 0, // Extra state for tokens that should not change the state
+    PM_PARAMETERS_ORDER_NOTHING_AFTER = 1,
+    PM_PARAMETERS_ORDER_KEYWORDS_REST,
+    PM_PARAMETERS_ORDER_KEYWORDS,
+    PM_PARAMETERS_ORDER_REST,
+    PM_PARAMETERS_ORDER_AFTER_OPTIONAL,
+    PM_PARAMETERS_ORDER_OPTIONAL,
+    PM_PARAMETERS_ORDER_NAMED,
+    PM_PARAMETERS_ORDER_NONE,
+} pm_parameters_order_t;
+
+/**
+ * This matches parameters tokens with parameters state.
+ */
+static pm_parameters_order_t parameters_ordering[PM_TOKEN_MAXIMUM] = {
+    [0] = PM_PARAMETERS_NO_CHANGE,
+    [PM_TOKEN_UAMPERSAND] = PM_PARAMETERS_ORDER_NOTHING_AFTER,
+    [PM_TOKEN_AMPERSAND] = PM_PARAMETERS_ORDER_NOTHING_AFTER,
+    [PM_TOKEN_UDOT_DOT_DOT] = PM_PARAMETERS_ORDER_NOTHING_AFTER,
+    [PM_TOKEN_IDENTIFIER] = PM_PARAMETERS_ORDER_NAMED,
+    [PM_TOKEN_PARENTHESIS_LEFT] = PM_PARAMETERS_ORDER_NAMED,
+    [PM_TOKEN_EQUAL] = PM_PARAMETERS_ORDER_OPTIONAL,
+    [PM_TOKEN_LABEL] = PM_PARAMETERS_ORDER_KEYWORDS,
+    [PM_TOKEN_USTAR] = PM_PARAMETERS_ORDER_AFTER_OPTIONAL,
+    [PM_TOKEN_STAR] = PM_PARAMETERS_ORDER_AFTER_OPTIONAL,
+    [PM_TOKEN_USTAR_STAR] = PM_PARAMETERS_ORDER_KEYWORDS_REST,
+    [PM_TOKEN_STAR_STAR] = PM_PARAMETERS_ORDER_KEYWORDS_REST
+};
+
+/**
+ * Check if current parameter follows valid parameters ordering. If not it adds
+ * an error to the list without stopping the parsing, otherwise sets the
+ * parameters state to the one corresponding to the current parameter.
+ *
+ * It returns true if it was successful, and false otherwise.
+ */
+static bool
+update_parameter_state(pm_parser_t *parser, pm_token_t *token, pm_parameters_order_t *current) {
+    pm_parameters_order_t state = parameters_ordering[token->type];
+    if (state == PM_PARAMETERS_NO_CHANGE) return true;
+
+    // If we see another ordered argument after a optional argument
+    // we only continue parsing ordered arguments until we stop seeing ordered arguments.
+    if (*current == PM_PARAMETERS_ORDER_OPTIONAL && state == PM_PARAMETERS_ORDER_NAMED) {
+        *current = PM_PARAMETERS_ORDER_AFTER_OPTIONAL;
+        return true;
+    } else if (*current == PM_PARAMETERS_ORDER_AFTER_OPTIONAL && state == PM_PARAMETERS_ORDER_NAMED) {
+        return true;
+    }
+
+    if (token->type == PM_TOKEN_USTAR && *current == PM_PARAMETERS_ORDER_AFTER_OPTIONAL) {
+        pm_parser_err_token(parser, token, PM_ERR_PARAMETER_STAR);
+        return false;
+    } else if (token->type == PM_TOKEN_UDOT_DOT_DOT && (*current >= PM_PARAMETERS_ORDER_KEYWORDS_REST && *current <= PM_PARAMETERS_ORDER_AFTER_OPTIONAL)) {
+        pm_parser_err_token(parser, token, *current == PM_PARAMETERS_ORDER_AFTER_OPTIONAL ? PM_ERR_PARAMETER_FORWARDING_AFTER_REST : PM_ERR_PARAMETER_ORDER);
+        return false;
+    } else if (*current == PM_PARAMETERS_ORDER_NOTHING_AFTER || state > *current) {
+        // We know what transition we failed on, so we can provide a better error here.
+        pm_parser_err_token(parser, token, PM_ERR_PARAMETER_ORDER);
+        return false;
+    }
+
+    if (state < *current) *current = state;
+    return true;
+}
+
+/**
+ * Parse a list of parameters on a method definition.
+ */
+static pm_parameters_node_t *
+parse_parameters(
+    pm_parser_t *parser,
+    pm_binding_power_t binding_power,
+    bool uses_parentheses,
+    bool allows_trailing_comma,
+    bool allows_forwarding_parameters,
+    bool accepts_blocks_in_defaults,
+    bool in_block,
+    uint16_t depth
+) {
+    pm_do_loop_stack_push(parser, false);
+
+    pm_parameters_node_t *params = pm_parameters_node_create(parser);
+    pm_parameters_order_t order = PM_PARAMETERS_ORDER_NONE;
+
+    while (true) {
+        bool parsing = true;
+
+        switch (parser->current.type) {
+            case PM_TOKEN_PARENTHESIS_LEFT: {
+                update_parameter_state(parser, &parser->current, &order);
+                pm_node_t *param = (pm_node_t *) parse_required_destructured_parameter(parser);
+
+                if (order > PM_PARAMETERS_ORDER_AFTER_OPTIONAL) {
+                    pm_parameters_node_requireds_append(params, param);
+                } else {
+                    pm_parameters_node_posts_append(params, param);
+                }
+                break;
+            }
+            case PM_TOKEN_UAMPERSAND:
+            case PM_TOKEN_AMPERSAND: {
+                update_parameter_state(parser, &parser->current, &order);
+                parser_lex(parser);
+
+                pm_token_t operator = parser->previous;
+                pm_token_t name;
+
+                bool repeated = false;
+                if (accept1(parser, PM_TOKEN_IDENTIFIER)) {
+                    name = parser->previous;
+                    repeated = pm_parser_parameter_name_check(parser, &name);
+                    pm_parser_local_add_token(parser, &name, 1);
+                } else {
+                    name = not_provided(parser);
+                    parser->current_scope->parameters |= PM_SCOPE_PARAMETERS_FORWARDING_BLOCK;
+                }
+
+                pm_block_parameter_node_t *param = pm_block_parameter_node_create(parser, &name, &operator);
+                if (repeated) {
+                    pm_node_flag_set_repeated_parameter((pm_node_t *)param);
+                }
+                if (params->block == NULL) {
+                    pm_parameters_node_block_set(params, param);
+                } else {
+                    pm_parser_err_node(parser, (pm_node_t *) param, PM_ERR_PARAMETER_BLOCK_MULTI);
+                    pm_parameters_node_posts_append(params, (pm_node_t *) param);
+                }
+
+                break;
+            }
+            case PM_TOKEN_UDOT_DOT_DOT: {
+                if (!allows_forwarding_parameters) {
+                    pm_parser_err_current(parser, PM_ERR_ARGUMENT_NO_FORWARDING_ELLIPSES);
+                }
+
+                bool succeeded = update_parameter_state(parser, &parser->current, &order);
+                parser_lex(parser);
+
+                parser->current_scope->parameters |= PM_SCOPE_PARAMETERS_FORWARDING_ALL;
+                pm_forwarding_parameter_node_t *param = pm_forwarding_parameter_node_create(parser, &parser->previous);
+
+                if (params->keyword_rest != NULL) {
+                    // If we already have a keyword rest parameter, then we replace it with the
+                    // forwarding parameter and move the keyword rest parameter to the posts list.
+                    pm_node_t *keyword_rest = params->keyword_rest;
+                    pm_parameters_node_posts_append(params, keyword_rest);
+                    if (succeeded) pm_parser_err_previous(parser, PM_ERR_PARAMETER_UNEXPECTED_FWD);
+                    params->keyword_rest = NULL;
+                }
+
+                pm_parameters_node_keyword_rest_set(params, (pm_node_t *) param);
+                break;
+            }
+            case PM_TOKEN_CLASS_VARIABLE:
+            case PM_TOKEN_IDENTIFIER:
+            case PM_TOKEN_CONSTANT:
+            case PM_TOKEN_INSTANCE_VARIABLE:
+            case PM_TOKEN_GLOBAL_VARIABLE:
+            case PM_TOKEN_METHOD_NAME: {
+                parser_lex(parser);
+                switch (parser->previous.type) {
+                    case PM_TOKEN_CONSTANT:
+                        pm_parser_err_previous(parser, PM_ERR_ARGUMENT_FORMAL_CONSTANT);
+                        break;
+                    case PM_TOKEN_INSTANCE_VARIABLE:
+                        pm_parser_err_previous(parser, PM_ERR_ARGUMENT_FORMAL_IVAR);
+                        break;
+                    case PM_TOKEN_GLOBAL_VARIABLE:
+                        pm_parser_err_previous(parser, PM_ERR_ARGUMENT_FORMAL_GLOBAL);
+                        break;
+                    case PM_TOKEN_CLASS_VARIABLE:
+                        pm_parser_err_previous(parser, PM_ERR_ARGUMENT_FORMAL_CLASS);
+                        break;
+                    case PM_TOKEN_METHOD_NAME:
+                        pm_parser_err_previous(parser, PM_ERR_PARAMETER_METHOD_NAME);
+                        break;
+                    default: break;
+                }
+
+                if (parser->current.type == PM_TOKEN_EQUAL) {
+                    update_parameter_state(parser, &parser->current, &order);
+                } else {
+                    update_parameter_state(parser, &parser->previous, &order);
+                }
+
+                pm_token_t name = parser->previous;
+                bool repeated = pm_parser_parameter_name_check(parser, &name);
+                pm_parser_local_add_token(parser, &name, 1);
+
+                if (match1(parser, PM_TOKEN_EQUAL)) {
+                    pm_token_t operator = parser->current;
+                    context_push(parser, PM_CONTEXT_DEFAULT_PARAMS);
+                    parser_lex(parser);
+
+                    pm_constant_id_t name_id = pm_parser_constant_id_token(parser, &name);
+                    uint32_t reads = parser->version == PM_OPTIONS_VERSION_CRUBY_3_3 ? pm_locals_reads(&parser->current_scope->locals, name_id) : 0;
+
+                    if (accepts_blocks_in_defaults) pm_accepts_block_stack_push(parser, true);
+                    pm_node_t *value = parse_value_expression(parser, binding_power, false, false, PM_ERR_PARAMETER_NO_DEFAULT, (uint16_t) (depth + 1));
+                    if (accepts_blocks_in_defaults) pm_accepts_block_stack_pop(parser);
+
+                    pm_optional_parameter_node_t *param = pm_optional_parameter_node_create(parser, &name, &operator, value);
+
+                    if (repeated) {
+                        pm_node_flag_set_repeated_parameter((pm_node_t *) param);
+                    }
+                    pm_parameters_node_optionals_append(params, param);
+
+                    // If the value of the parameter increased the number of
+                    // reads of that parameter, then we need to warn that we
+                    // have a circular definition.
+                    if ((parser->version == PM_OPTIONS_VERSION_CRUBY_3_3) && (pm_locals_reads(&parser->current_scope->locals, name_id) != reads)) {
+                        PM_PARSER_ERR_TOKEN_FORMAT_CONTENT(parser, name, PM_ERR_PARAMETER_CIRCULAR);
+                    }
+
+                    context_pop(parser);
+
+                    // If parsing the value of the parameter resulted in error recovery,
+                    // then we can put a missing node in its place and stop parsing the
+                    // parameters entirely now.
+                    if (parser->recovering) {
+                        parsing = false;
+                        break;
+                    }
+                } else if (order > PM_PARAMETERS_ORDER_AFTER_OPTIONAL) {
+                    pm_required_parameter_node_t *param = pm_required_parameter_node_create(parser, &name);
+                    if (repeated) {
+                        pm_node_flag_set_repeated_parameter((pm_node_t *)param);
+                    }
+                    pm_parameters_node_requireds_append(params, (pm_node_t *) param);
+                } else {
+                    pm_required_parameter_node_t *param = pm_required_parameter_node_create(parser, &name);
+                    if (repeated) {
+                        pm_node_flag_set_repeated_parameter((pm_node_t *)param);
+                    }
+                    pm_parameters_node_posts_append(params, (pm_node_t *) param);
+                }
+
+                break;
+            }
+            case PM_TOKEN_LABEL: {
+                if (!uses_parentheses && !in_block) parser->in_keyword_arg = true;
+                update_parameter_state(parser, &parser->current, &order);
+
+                context_push(parser, PM_CONTEXT_DEFAULT_PARAMS);
+                parser_lex(parser);
+
+                pm_token_t name = parser->previous;
+                pm_token_t local = name;
+                local.end -= 1;
+
+                if (parser->encoding_changed ? parser->encoding->isupper_char(local.start, local.end - local.start) : pm_encoding_utf_8_isupper_char(local.start, local.end - local.start)) {
+                    pm_parser_err(parser, local.start, local.end, PM_ERR_ARGUMENT_FORMAL_CONSTANT);
+                } else if (local.end[-1] == '!' || local.end[-1] == '?') {
+                    PM_PARSER_ERR_TOKEN_FORMAT_CONTENT(parser, local, PM_ERR_INVALID_LOCAL_VARIABLE_WRITE);
+                }
+
+                bool repeated = pm_parser_parameter_name_check(parser, &local);
+                pm_parser_local_add_token(parser, &local, 1);
+
+                switch (parser->current.type) {
+                    case PM_TOKEN_COMMA:
+                    case PM_TOKEN_PARENTHESIS_RIGHT:
+                    case PM_TOKEN_PIPE: {
+                        context_pop(parser);
+
+                        pm_node_t *param = (pm_node_t *) pm_required_keyword_parameter_node_create(parser, &name);
+                        if (repeated) {
+                            pm_node_flag_set_repeated_parameter(param);
+                        }
+
+                        pm_parameters_node_keywords_append(params, param);
+                        break;
+                    }
+                    case PM_TOKEN_SEMICOLON:
+                    case PM_TOKEN_NEWLINE: {
+                        context_pop(parser);
+
+                        if (uses_parentheses) {
+                            parsing = false;
+                            break;
+                        }
+
+                        pm_node_t *param = (pm_node_t *) pm_required_keyword_parameter_node_create(parser, &name);
+                        if (repeated) {
+                            pm_node_flag_set_repeated_parameter(param);
+                        }
+
+                        pm_parameters_node_keywords_append(params, param);
+                        break;
+                    }
+                    default: {
+                        pm_node_t *param;
+
+                        if (token_begins_expression_p(parser->current.type)) {
+                            pm_constant_id_t name_id = pm_parser_constant_id_token(parser, &local);
+                            uint32_t reads = parser->version == PM_OPTIONS_VERSION_CRUBY_3_3 ? pm_locals_reads(&parser->current_scope->locals, name_id) : 0;
+
+                            if (accepts_blocks_in_defaults) pm_accepts_block_stack_push(parser, true);
+                            pm_node_t *value = parse_value_expression(parser, binding_power, false, false, PM_ERR_PARAMETER_NO_DEFAULT_KW, (uint16_t) (depth + 1));
+                            if (accepts_blocks_in_defaults) pm_accepts_block_stack_pop(parser);
+
+                            if (parser->version == PM_OPTIONS_VERSION_CRUBY_3_3 && (pm_locals_reads(&parser->current_scope->locals, name_id) != reads)) {
+                                PM_PARSER_ERR_TOKEN_FORMAT_CONTENT(parser, local, PM_ERR_PARAMETER_CIRCULAR);
+                            }
+
+                            param = (pm_node_t *) pm_optional_keyword_parameter_node_create(parser, &name, value);
+                        }
+                        else {
+                            param = (pm_node_t *) pm_required_keyword_parameter_node_create(parser, &name);
+                        }
+
+                        if (repeated) {
+                            pm_node_flag_set_repeated_parameter(param);
+                        }
+
+                        context_pop(parser);
+                        pm_parameters_node_keywords_append(params, param);
+
+                        // If parsing the value of the parameter resulted in error recovery,
+                        // then we can put a missing node in its place and stop parsing the
+                        // parameters entirely now.
+                        if (parser->recovering) {
+                            parsing = false;
+                            break;
+                        }
+                    }
+                }
+
+                parser->in_keyword_arg = false;
+                break;
+            }
+            case PM_TOKEN_USTAR:
+            case PM_TOKEN_STAR: {
+                update_parameter_state(parser, &parser->current, &order);
+                parser_lex(parser);
+
+                pm_token_t operator = parser->previous;
+                pm_token_t name;
+                bool repeated = false;
+
+                if (accept1(parser, PM_TOKEN_IDENTIFIER)) {
+                    name = parser->previous;
+                    repeated = pm_parser_parameter_name_check(parser, &name);
+                    pm_parser_local_add_token(parser, &name, 1);
+                } else {
+                    name = not_provided(parser);
+                    parser->current_scope->parameters |= PM_SCOPE_PARAMETERS_FORWARDING_POSITIONALS;
+                }
+
+                pm_node_t *param = (pm_node_t *) pm_rest_parameter_node_create(parser, &operator, &name);
+                if (repeated) {
+                    pm_node_flag_set_repeated_parameter(param);
+                }
+
+                if (params->rest == NULL) {
+                    pm_parameters_node_rest_set(params, param);
+                } else {
+                    pm_parser_err_node(parser, param, PM_ERR_PARAMETER_SPLAT_MULTI);
+                    pm_parameters_node_posts_append(params, param);
+                }
+
+                break;
+            }
+            case PM_TOKEN_STAR_STAR:
+            case PM_TOKEN_USTAR_STAR: {
+                pm_parameters_order_t previous_order = order;
+                update_parameter_state(parser, &parser->current, &order);
+                parser_lex(parser);
+
+                pm_token_t operator = parser->previous;
+                pm_node_t *param;
+
+                if (accept1(parser, PM_TOKEN_KEYWORD_NIL)) {
+                    if (previous_order <= PM_PARAMETERS_ORDER_KEYWORDS) {
+                        pm_parser_err_previous(parser, PM_ERR_PARAMETER_UNEXPECTED_NO_KW);
+                    }
+
+                    param = (pm_node_t *) pm_no_keywords_parameter_node_create(parser, &operator, &parser->previous);
+                } else {
+                    pm_token_t name;
+
+                    bool repeated = false;
+                    if (accept1(parser, PM_TOKEN_IDENTIFIER)) {
+                        name = parser->previous;
+                        repeated = pm_parser_parameter_name_check(parser, &name);
+                        pm_parser_local_add_token(parser, &name, 1);
+                    } else {
+                        name = not_provided(parser);
+                        parser->current_scope->parameters |= PM_SCOPE_PARAMETERS_FORWARDING_KEYWORDS;
+                    }
+
+                    param = (pm_node_t *) pm_keyword_rest_parameter_node_create(parser, &operator, &name);
+                    if (repeated) {
+                        pm_node_flag_set_repeated_parameter(param);
+                    }
+                }
+
+                if (params->keyword_rest == NULL) {
+                    pm_parameters_node_keyword_rest_set(params, param);
+                } else {
+                    pm_parser_err_node(parser, param, PM_ERR_PARAMETER_ASSOC_SPLAT_MULTI);
+                    pm_parameters_node_posts_append(params, param);
+                }
+
+                break;
+            }
+            default:
+                if (parser->previous.type == PM_TOKEN_COMMA) {
+                    if (allows_trailing_comma && order >= PM_PARAMETERS_ORDER_NAMED) {
+                        // If we get here, then we have a trailing comma in a
+                        // block parameter list.
+                        pm_node_t *param = (pm_node_t *) pm_implicit_rest_node_create(parser, &parser->previous);
+
+                        if (params->rest == NULL) {
+                            pm_parameters_node_rest_set(params, param);
+                        } else {
+                            pm_parser_err_node(parser, (pm_node_t *) param, PM_ERR_PARAMETER_SPLAT_MULTI);
+                            pm_parameters_node_posts_append(params, (pm_node_t *) param);
+                        }
+                    } else {
+                        pm_parser_err_previous(parser, PM_ERR_PARAMETER_WILD_LOOSE_COMMA);
+                    }
+                }
+
+                parsing = false;
+                break;
+        }
+
+        // If we hit some kind of issue while parsing the parameter, this would
+        // have been set to false. In that case, we need to break out of the
+        // loop.
+        if (!parsing) break;
+
+        bool accepted_newline = false;
+        if (uses_parentheses) {
+            accepted_newline = accept1(parser, PM_TOKEN_NEWLINE);
+        }
+
+        if (accept1(parser, PM_TOKEN_COMMA)) {
+            // If there was a comma, but we also accepted a newline, then this
+            // is a syntax error.
+            if (accepted_newline) {
+                pm_parser_err_previous(parser, PM_ERR_INVALID_COMMA);
+            }
+        } else {
+            // If there was no comma, then we're done parsing parameters.
+            break;
+        }
+    }
+
+    pm_do_loop_stack_pop(parser);
+
+    // If we don't have any parameters, return `NULL` instead of an empty `ParametersNode`.
+    if (params->base.location.start == params->base.location.end) {
+        pm_node_destroy(parser, (pm_node_t *) params);
+        return NULL;
+    }
+
+    return params;
+}
+
+/**
+ * Accepts a parser returns the index of the last newline in the file that was
+ * ecorded before the current token within the newline list.
+ */
+static size_t
+token_newline_index(const pm_parser_t *parser) {
+    if (parser->heredoc_end == NULL) {
+        // This is the common case. In this case we can look at the previously
+        // recorded newline in the newline list and subtract from the current
+        // offset.
+        return parser->newline_list.size - 1;
+    } else {
+        // This is unlikely. This is the case that we have already parsed the
+        // start of a heredoc, so we cannot rely on looking at the previous
+        // offset of the newline list, and instead must go through the whole
+        // process of a binary search for the line number.
+        return (size_t) pm_newline_list_line(&parser->newline_list, parser->current.start, 0);
+    }
+}
+
+/**
+ * Accepts a parser, a newline index, and a token and returns the column. The
+ * important piece of this is that it expands tabs out to the next tab stop.
+ */
+static int64_t
+token_column(const pm_parser_t *parser, size_t newline_index, const pm_token_t *token, bool break_on_non_space) {
+    const uint8_t *cursor = parser->start + parser->newline_list.offsets[newline_index];
+    const uint8_t *end = token->start;
+
+    // Skip over the BOM if it is present.
+    if (
+        newline_index == 0 &&
+        parser->start[0] == 0xef &&
+        parser->start[1] == 0xbb &&
+        parser->start[2] == 0xbf
+    ) cursor += 3;
+
+    int64_t column = 0;
+    for (; cursor < end; cursor++) {
+        switch (*cursor) {
+            case '\t':
+                column = ((column / PM_TAB_WHITESPACE_SIZE) + 1) * PM_TAB_WHITESPACE_SIZE;
+                break;
+            case ' ':
+                column++;
+                break;
+            default:
+                column++;
+                if (break_on_non_space) return -1;
+                break;
+        }
+    }
+
+    return column;
+}
+
+/**
+ * Accepts a parser, two newline indices, and pointers to two tokens. This
+ * function warns if the indentation of the two tokens does not match.
+ */
+static void
+parser_warn_indentation_mismatch(pm_parser_t *parser, size_t opening_newline_index, const pm_token_t *opening_token, bool if_after_else, bool allow_indent) {
+    // If these warnings are disabled (unlikely), then we can just return.
+    if (!parser->warn_mismatched_indentation) return;
+
+    // If the tokens are on the same line, we do not warn.
+    size_t closing_newline_index = token_newline_index(parser);
+    if (opening_newline_index == closing_newline_index) return;
+
+    // If the opening token has anything other than spaces or tabs before it,
+    // then we do not warn. This is unless we are matching up an `if`/`end` pair
+    // and the `if` immediately follows an `else` keyword.
+    int64_t opening_column = token_column(parser, opening_newline_index, opening_token, !if_after_else);
+    if (!if_after_else && (opening_column == -1)) return;
+
+    // Get a reference to the closing token off the current parser. This assumes
+    // that the caller has placed this in the correct position.
+    pm_token_t *closing_token = &parser->current;
+
+    // If the tokens are at the same indentation, we do not warn.
+    int64_t closing_column = token_column(parser, closing_newline_index, closing_token, true);
+    if ((closing_column == -1) || (opening_column == closing_column)) return;
+
+    // If the closing column is greater than the opening column and we are
+    // allowing indentation, then we do not warn.
+    if (allow_indent && (closing_column > opening_column)) return;
+
+    // Otherwise, add a warning.
+    PM_PARSER_WARN_FORMAT(
+        parser,
+        closing_token->start,
+        closing_token->end,
+        PM_WARN_INDENTATION_MISMATCH,
+        (int) (closing_token->end - closing_token->start),
+        (const char *) closing_token->start,
+        (int) (opening_token->end - opening_token->start),
+        (const char *) opening_token->start,
+        ((int32_t) opening_newline_index) + parser->start_line
+    );
+}
+
+typedef enum {
+    PM_RESCUES_BEGIN = 1,
+    PM_RESCUES_BLOCK,
+    PM_RESCUES_CLASS,
+    PM_RESCUES_DEF,
+    PM_RESCUES_LAMBDA,
+    PM_RESCUES_MODULE,
+    PM_RESCUES_SCLASS
+} pm_rescues_type_t;
+
+/**
+ * Parse any number of rescue clauses. This will form a linked list of if
+ * nodes pointing to each other from the top.
+ */
+static inline void
+parse_rescues(pm_parser_t *parser, size_t opening_newline_index, const pm_token_t *opening, pm_begin_node_t *parent_node, pm_rescues_type_t type, uint16_t depth) {
+    pm_rescue_node_t *current = NULL;
+
+    while (match1(parser, PM_TOKEN_KEYWORD_RESCUE)) {
+        if (opening != NULL) parser_warn_indentation_mismatch(parser, opening_newline_index, opening, false, false);
+        parser_lex(parser);
+
+        pm_rescue_node_t *rescue = pm_rescue_node_create(parser, &parser->previous);
+
+        switch (parser->current.type) {
+            case PM_TOKEN_EQUAL_GREATER: {
+                // Here we have an immediate => after the rescue keyword, in which case
+                // we're going to have an empty list of exceptions to rescue (which
+                // implies StandardError).
+                parser_lex(parser);
+                pm_rescue_node_operator_set(rescue, &parser->previous);
+
+                pm_node_t *reference = parse_expression(parser, PM_BINDING_POWER_INDEX, false, false, PM_ERR_RESCUE_VARIABLE, (uint16_t) (depth + 1));
+                reference = parse_target(parser, reference, false, false);
+
+                pm_rescue_node_reference_set(rescue, reference);
+                break;
+            }
+            case PM_TOKEN_NEWLINE:
+            case PM_TOKEN_SEMICOLON:
+            case PM_TOKEN_KEYWORD_THEN:
+                // Here we have a terminator for the rescue keyword, in which
+                // case we're going to just continue on.
+                break;
+            default: {
+                if (token_begins_expression_p(parser->current.type) || match1(parser, PM_TOKEN_USTAR)) {
+                    // Here we have something that could be an exception expression, so
+                    // we'll attempt to parse it here and any others delimited by commas.
+
+                    do {
+                        pm_node_t *expression = parse_starred_expression(parser, PM_BINDING_POWER_DEFINED, false, PM_ERR_RESCUE_EXPRESSION, (uint16_t) (depth + 1));
+                        pm_rescue_node_exceptions_append(rescue, expression);
+
+                        // If we hit a newline, then this is the end of the rescue expression. We
+                        // can continue on to parse the statements.
+                        if (match3(parser, PM_TOKEN_NEWLINE, PM_TOKEN_SEMICOLON, PM_TOKEN_KEYWORD_THEN)) break;
+
+                        // If we hit a `=>` then we're going to parse the exception variable. Once
+                        // we've done that, we'll break out of the loop and parse the statements.
+                        if (accept1(parser, PM_TOKEN_EQUAL_GREATER)) {
+                            pm_rescue_node_operator_set(rescue, &parser->previous);
+
+                            pm_node_t *reference = parse_expression(parser, PM_BINDING_POWER_INDEX, false, false, PM_ERR_RESCUE_VARIABLE, (uint16_t) (depth + 1));
+                            reference = parse_target(parser, reference, false, false);
+
+                            pm_rescue_node_reference_set(rescue, reference);
+                            break;
+                        }
+                    } while (accept1(parser, PM_TOKEN_COMMA));
+                }
+            }
+        }
+
+        if (accept2(parser, PM_TOKEN_NEWLINE, PM_TOKEN_SEMICOLON)) {
+            if (accept1(parser, PM_TOKEN_KEYWORD_THEN)) {
+                rescue->then_keyword_loc = PM_OPTIONAL_LOCATION_TOKEN_VALUE(&parser->previous);
+            }
+        } else {
+            expect1(parser, PM_TOKEN_KEYWORD_THEN, PM_ERR_RESCUE_TERM);
+            rescue->then_keyword_loc = PM_OPTIONAL_LOCATION_TOKEN_VALUE(&parser->previous);
+        }
+
+        if (!match3(parser, PM_TOKEN_KEYWORD_ELSE, PM_TOKEN_KEYWORD_ENSURE, PM_TOKEN_KEYWORD_END)) {
+            pm_accepts_block_stack_push(parser, true);
+            pm_context_t context;
+
+            switch (type) {
+                case PM_RESCUES_BEGIN: context = PM_CONTEXT_BEGIN_RESCUE; break;
+                case PM_RESCUES_BLOCK: context = PM_CONTEXT_BLOCK_RESCUE; break;
+                case PM_RESCUES_CLASS: context = PM_CONTEXT_CLASS_RESCUE; break;
+                case PM_RESCUES_DEF: context = PM_CONTEXT_DEF_RESCUE; break;
+                case PM_RESCUES_LAMBDA: context = PM_CONTEXT_LAMBDA_RESCUE; break;
+                case PM_RESCUES_MODULE: context = PM_CONTEXT_MODULE_RESCUE; break;
+                case PM_RESCUES_SCLASS: context = PM_CONTEXT_SCLASS_RESCUE; break;
+                default: assert(false && "unreachable"); context = PM_CONTEXT_BEGIN_RESCUE; break;
+            }
+
+            pm_statements_node_t *statements = parse_statements(parser, context, (uint16_t) (depth + 1));
+            if (statements != NULL) pm_rescue_node_statements_set(rescue, statements);
+
+            pm_accepts_block_stack_pop(parser);
+            accept2(parser, PM_TOKEN_NEWLINE, PM_TOKEN_SEMICOLON);
+        }
+
+        if (current == NULL) {
+            pm_begin_node_rescue_clause_set(parent_node, rescue);
+        } else {
+            pm_rescue_node_subsequent_set(current, rescue);
+        }
+
+        current = rescue;
+    }
+
+    // The end node locations on rescue nodes will not be set correctly
+    // since we won't know the end until we've found all subsequent
+    // clauses. This sets the end location on all rescues once we know it.
+    if (current != NULL) {
+        const uint8_t *end_to_set = current->base.location.end;
+        pm_rescue_node_t *clause = parent_node->rescue_clause;
+
+        while (clause != NULL) {
+            clause->base.location.end = end_to_set;
+            clause = clause->subsequent;
+        }
+    }
+
+    pm_token_t else_keyword;
+    if (match1(parser, PM_TOKEN_KEYWORD_ELSE)) {
+        if (opening != NULL) parser_warn_indentation_mismatch(parser, opening_newline_index, opening, false, false);
+        opening_newline_index = token_newline_index(parser);
+
+        else_keyword = parser->current;
+        opening = &else_keyword;
+
+        parser_lex(parser);
+        accept2(parser, PM_TOKEN_NEWLINE, PM_TOKEN_SEMICOLON);
+
+        pm_statements_node_t *else_statements = NULL;
+        if (!match2(parser, PM_TOKEN_KEYWORD_END, PM_TOKEN_KEYWORD_ENSURE)) {
+            pm_accepts_block_stack_push(parser, true);
+            pm_context_t context;
+
+            switch (type) {
+                case PM_RESCUES_BEGIN: context = PM_CONTEXT_BEGIN_ELSE; break;
+                case PM_RESCUES_BLOCK: context = PM_CONTEXT_BLOCK_ELSE; break;
+                case PM_RESCUES_CLASS: context = PM_CONTEXT_CLASS_ELSE; break;
+                case PM_RESCUES_DEF: context = PM_CONTEXT_DEF_ELSE; break;
+                case PM_RESCUES_LAMBDA: context = PM_CONTEXT_LAMBDA_ELSE; break;
+                case PM_RESCUES_MODULE: context = PM_CONTEXT_MODULE_ELSE; break;
+                case PM_RESCUES_SCLASS: context = PM_CONTEXT_SCLASS_ELSE; break;
+                default: assert(false && "unreachable"); context = PM_CONTEXT_BEGIN_ELSE; break;
+            }
+
+            else_statements = parse_statements(parser, context, (uint16_t) (depth + 1));
+            pm_accepts_block_stack_pop(parser);
+
+            accept2(parser, PM_TOKEN_NEWLINE, PM_TOKEN_SEMICOLON);
+        }
+
+        pm_else_node_t *else_clause = pm_else_node_create(parser, &else_keyword, else_statements, &parser->current);
+        pm_begin_node_else_clause_set(parent_node, else_clause);
+
+        // If we don't have a `current` rescue node, then this is a dangling
+        // else, and it's an error.
+        if (current == NULL) pm_parser_err_node(parser, (pm_node_t *) else_clause, PM_ERR_BEGIN_LONELY_ELSE);
+    }
+
+    if (match1(parser, PM_TOKEN_KEYWORD_ENSURE)) {
+        if (opening != NULL) parser_warn_indentation_mismatch(parser, opening_newline_index, opening, false, false);
+        pm_token_t ensure_keyword = parser->current;
+
+        parser_lex(parser);
+        accept2(parser, PM_TOKEN_NEWLINE, PM_TOKEN_SEMICOLON);
+
+        pm_statements_node_t *ensure_statements = NULL;
+        if (!match1(parser, PM_TOKEN_KEYWORD_END)) {
+            pm_accepts_block_stack_push(parser, true);
+            pm_context_t context;
+
+            switch (type) {
+                case PM_RESCUES_BEGIN: context = PM_CONTEXT_BEGIN_ENSURE; break;
+                case PM_RESCUES_BLOCK: context = PM_CONTEXT_BLOCK_ENSURE; break;
+                case PM_RESCUES_CLASS: context = PM_CONTEXT_CLASS_ENSURE; break;
+                case PM_RESCUES_DEF: context = PM_CONTEXT_DEF_ENSURE; break;
+                case PM_RESCUES_LAMBDA: context = PM_CONTEXT_LAMBDA_ENSURE; break;
+                case PM_RESCUES_MODULE: context = PM_CONTEXT_MODULE_ENSURE; break;
+                case PM_RESCUES_SCLASS: context = PM_CONTEXT_SCLASS_ENSURE; break;
+                default: assert(false && "unreachable"); context = PM_CONTEXT_BEGIN_RESCUE; break;
+            }
+
+            ensure_statements = parse_statements(parser, context, (uint16_t) (depth + 1));
+            pm_accepts_block_stack_pop(parser);
+
+            accept2(parser, PM_TOKEN_NEWLINE, PM_TOKEN_SEMICOLON);
+        }
+
+        pm_ensure_node_t *ensure_clause = pm_ensure_node_create(parser, &ensure_keyword, ensure_statements, &parser->current);
+        pm_begin_node_ensure_clause_set(parent_node, ensure_clause);
+    }
+
+    if (match1(parser, PM_TOKEN_KEYWORD_END)) {
+        if (opening != NULL) parser_warn_indentation_mismatch(parser, opening_newline_index, opening, false, false);
+        pm_begin_node_end_keyword_set(parent_node, &parser->current);
+    } else {
+        pm_token_t end_keyword = (pm_token_t) { .type = PM_TOKEN_MISSING, .start = parser->previous.end, .end = parser->previous.end };
+        pm_begin_node_end_keyword_set(parent_node, &end_keyword);
+    }
+}
+
+/**
+ * Parse a set of rescue clauses with an implicit begin (for example when on a
+ * class, module, def, etc.).
+ */
+static pm_begin_node_t *
+parse_rescues_implicit_begin(pm_parser_t *parser, size_t opening_newline_index, const pm_token_t *opening, const uint8_t *start, pm_statements_node_t *statements, pm_rescues_type_t type, uint16_t depth) {
+    pm_token_t begin_keyword = not_provided(parser);
+    pm_begin_node_t *node = pm_begin_node_create(parser, &begin_keyword, statements);
+
+    parse_rescues(parser, opening_newline_index, opening, node, type, (uint16_t) (depth + 1));
+    node->base.location.start = start;
+
+    return node;
+}
+
+/**
+ * Parse a list of parameters and local on a block definition.
+ */
+static pm_block_parameters_node_t *
+parse_block_parameters(
+    pm_parser_t *parser,
+    bool allows_trailing_comma,
+    const pm_token_t *opening,
+    bool is_lambda_literal,
+    bool accepts_blocks_in_defaults,
+    uint16_t depth
+) {
+    pm_parameters_node_t *parameters = NULL;
+    if (!match1(parser, PM_TOKEN_SEMICOLON)) {
+        parameters = parse_parameters(
+            parser,
+            is_lambda_literal ? PM_BINDING_POWER_DEFINED : PM_BINDING_POWER_INDEX,
+            false,
+            allows_trailing_comma,
+            false,
+            accepts_blocks_in_defaults,
+            true,
+            (uint16_t) (depth + 1)
+        );
+    }
+
+    pm_block_parameters_node_t *block_parameters = pm_block_parameters_node_create(parser, parameters, opening);
+    if ((opening->type != PM_TOKEN_NOT_PROVIDED)) {
+        accept1(parser, PM_TOKEN_NEWLINE);
+
+        if (accept1(parser, PM_TOKEN_SEMICOLON)) {
+            do {
+                switch (parser->current.type) {
+                    case PM_TOKEN_CONSTANT:
+                        pm_parser_err_current(parser, PM_ERR_ARGUMENT_FORMAL_CONSTANT);
+                        parser_lex(parser);
+                        break;
+                    case PM_TOKEN_INSTANCE_VARIABLE:
+                        pm_parser_err_current(parser, PM_ERR_ARGUMENT_FORMAL_IVAR);
+                        parser_lex(parser);
+                        break;
+                    case PM_TOKEN_GLOBAL_VARIABLE:
+                        pm_parser_err_current(parser, PM_ERR_ARGUMENT_FORMAL_GLOBAL);
+                        parser_lex(parser);
+                        break;
+                    case PM_TOKEN_CLASS_VARIABLE:
+                        pm_parser_err_current(parser, PM_ERR_ARGUMENT_FORMAL_CLASS);
+                        parser_lex(parser);
+                        break;
+                    default:
+                        expect1(parser, PM_TOKEN_IDENTIFIER, PM_ERR_BLOCK_PARAM_LOCAL_VARIABLE);
+                        break;
+                }
+
+                bool repeated = pm_parser_parameter_name_check(parser, &parser->previous);
+                pm_parser_local_add_token(parser, &parser->previous, 1);
+
+                pm_block_local_variable_node_t *local = pm_block_local_variable_node_create(parser, &parser->previous);
+                if (repeated) pm_node_flag_set_repeated_parameter((pm_node_t *) local);
+
+                pm_block_parameters_node_append_local(block_parameters, local);
+            } while (accept1(parser, PM_TOKEN_COMMA));
+        }
+    }
+
+    return block_parameters;
+}
+
+/**
+ * Return true if any of the visible scopes to the current context are using
+ * numbered parameters.
+ */
+static bool
+outer_scope_using_numbered_parameters_p(pm_parser_t *parser) {
+    for (pm_scope_t *scope = parser->current_scope->previous; scope != NULL && !scope->closed; scope = scope->previous) {
+        if (scope->parameters & PM_SCOPE_PARAMETERS_NUMBERED_FOUND) return true;
+    }
+
+    return false;
+}
+
+/**
+ * These are the names of the various numbered parameters. We have them here so
+ * that when we insert them into the constant pool we can use a constant string
+ * and not have to allocate.
+ */
+static const char * const pm_numbered_parameter_names[] = {
+    "_1", "_2", "_3", "_4", "_5", "_6", "_7", "_8", "_9"
+};
+
+/**
+ * Return the node that should be used in the parameters field of a block-like
+ * (block or lambda) node, depending on the kind of parameters that were
+ * declared in the current scope.
+ */
+static pm_node_t *
+parse_blocklike_parameters(pm_parser_t *parser, pm_node_t *parameters, const pm_token_t *opening, const pm_token_t *closing) {
+    pm_node_list_t *implicit_parameters = &parser->current_scope->implicit_parameters;
+
+    // If we have ordinary parameters, then we will return them as the set of
+    // parameters.
+    if (parameters != NULL) {
+        // If we also have implicit parameters, then this is an error.
+        if (implicit_parameters->size > 0) {
+            pm_node_t *node = implicit_parameters->nodes[0];
+
+            if (PM_NODE_TYPE_P(node, PM_LOCAL_VARIABLE_READ_NODE)) {
+                pm_parser_err_node(parser, node, PM_ERR_NUMBERED_PARAMETER_ORDINARY);
+            } else if (PM_NODE_TYPE_P(node, PM_IT_LOCAL_VARIABLE_READ_NODE)) {
+                pm_parser_err_node(parser, node, PM_ERR_IT_NOT_ALLOWED_ORDINARY);
+            } else {
+                assert(false && "unreachable");
+            }
+        }
+
+        return parameters;
+    }
+
+    // If we don't have any implicit parameters, then the set of parameters is
+    // NULL.
+    if (implicit_parameters->size == 0) {
+        return NULL;
+    }
+
+    // If we don't have ordinary parameters, then we now must validate our set
+    // of implicit parameters. We can only have numbered parameters or it, but
+    // they cannot be mixed.
+    uint8_t numbered_parameter = 0;
+    bool it_parameter = false;
+
+    for (size_t index = 0; index < implicit_parameters->size; index++) {
+        pm_node_t *node = implicit_parameters->nodes[index];
+
+        if (PM_NODE_TYPE_P(node, PM_LOCAL_VARIABLE_READ_NODE)) {
+            if (it_parameter) {
+                pm_parser_err_node(parser, node, PM_ERR_NUMBERED_PARAMETER_IT);
+            } else if (outer_scope_using_numbered_parameters_p(parser)) {
+                pm_parser_err_node(parser, node, PM_ERR_NUMBERED_PARAMETER_OUTER_BLOCK);
+            } else if (parser->current_scope->parameters & PM_SCOPE_PARAMETERS_NUMBERED_INNER) {
+                pm_parser_err_node(parser, node, PM_ERR_NUMBERED_PARAMETER_INNER_BLOCK);
+            } else if (pm_token_is_numbered_parameter(node->location.start, node->location.end)) {
+                numbered_parameter = MAX(numbered_parameter, (uint8_t) (node->location.start[1] - '0'));
+            } else {
+                assert(false && "unreachable");
+            }
+        } else if (PM_NODE_TYPE_P(node, PM_IT_LOCAL_VARIABLE_READ_NODE)) {
+            if (numbered_parameter > 0) {
+                pm_parser_err_node(parser, node, PM_ERR_IT_NOT_ALLOWED_NUMBERED);
+            } else {
+                it_parameter = true;
+            }
+        }
+    }
+
+    if (numbered_parameter > 0) {
+        // Go through the parent scopes and mark them as being disallowed from
+        // using numbered parameters because this inner scope is using them.
+        for (pm_scope_t *scope = parser->current_scope->previous; scope != NULL && !scope->closed; scope = scope->previous) {
+            scope->parameters |= PM_SCOPE_PARAMETERS_NUMBERED_INNER;
+        }
+
+        const pm_location_t location = { .start = opening->start, .end = closing->end };
+        return (pm_node_t *) pm_numbered_parameters_node_create(parser, &location, numbered_parameter);
+    }
+
+    if (it_parameter) {
+        return (pm_node_t *) pm_it_parameters_node_create(parser, opening, closing);
+    }
+
+    return NULL;
+}
+
+/**
+ * Parse a block.
+ */
+static pm_block_node_t *
+parse_block(pm_parser_t *parser, uint16_t depth) {
+    pm_token_t opening = parser->previous;
+    accept1(parser, PM_TOKEN_NEWLINE);
+
+    pm_accepts_block_stack_push(parser, true);
+    pm_parser_scope_push(parser, false);
+
+    pm_block_parameters_node_t *block_parameters = NULL;
+
+    if (accept1(parser, PM_TOKEN_PIPE)) {
+        pm_token_t block_parameters_opening = parser->previous;
+        if (match1(parser, PM_TOKEN_PIPE)) {
+            block_parameters = pm_block_parameters_node_create(parser, NULL, &block_parameters_opening);
+            parser->command_start = true;
+            parser_lex(parser);
+        } else {
+            block_parameters = parse_block_parameters(parser, true, &block_parameters_opening, false, true, (uint16_t) (depth + 1));
+            accept1(parser, PM_TOKEN_NEWLINE);
+            parser->command_start = true;
+            expect1(parser, PM_TOKEN_PIPE, PM_ERR_BLOCK_PARAM_PIPE_TERM);
+        }
+
+        pm_block_parameters_node_closing_set(block_parameters, &parser->previous);
+    }
+
+    accept1(parser, PM_TOKEN_NEWLINE);
+    pm_node_t *statements = NULL;
+
+    if (opening.type == PM_TOKEN_BRACE_LEFT) {
+        if (!match1(parser, PM_TOKEN_BRACE_RIGHT)) {
+            statements = (pm_node_t *) parse_statements(parser, PM_CONTEXT_BLOCK_BRACES, (uint16_t) (depth + 1));
+        }
+
+        expect1(parser, PM_TOKEN_BRACE_RIGHT, PM_ERR_BLOCK_TERM_BRACE);
+    } else {
+        if (!match1(parser, PM_TOKEN_KEYWORD_END)) {
+            if (!match3(parser, PM_TOKEN_KEYWORD_RESCUE, PM_TOKEN_KEYWORD_ELSE, PM_TOKEN_KEYWORD_ENSURE)) {
+                pm_accepts_block_stack_push(parser, true);
+                statements = (pm_node_t *) parse_statements(parser, PM_CONTEXT_BLOCK_KEYWORDS, (uint16_t) (depth + 1));
+                pm_accepts_block_stack_pop(parser);
+            }
+
+            if (match2(parser, PM_TOKEN_KEYWORD_RESCUE, PM_TOKEN_KEYWORD_ENSURE)) {
+                assert(statements == NULL || PM_NODE_TYPE_P(statements, PM_STATEMENTS_NODE));
+                statements = (pm_node_t *) parse_rescues_implicit_begin(parser, 0, NULL, opening.start, (pm_statements_node_t *) statements, PM_RESCUES_BLOCK, (uint16_t) (depth + 1));
+            }
+        }
+
+        expect1(parser, PM_TOKEN_KEYWORD_END, PM_ERR_BLOCK_TERM_END);
+    }
+
+    pm_constant_id_list_t locals;
+    pm_locals_order(parser, &parser->current_scope->locals, &locals, pm_parser_scope_toplevel_p(parser));
+    pm_node_t *parameters = parse_blocklike_parameters(parser, (pm_node_t *) block_parameters, &opening, &parser->previous);
+
+    pm_parser_scope_pop(parser);
+    pm_accepts_block_stack_pop(parser);
+
+    return pm_block_node_create(parser, &locals, &opening, parameters, statements, &parser->previous);
+}
+
+/**
+ * Parse a list of arguments and their surrounding parentheses if they are
+ * present. It returns true if it found any pieces of arguments (parentheses,
+ * arguments, or blocks).
+ */
+static bool
+parse_arguments_list(pm_parser_t *parser, pm_arguments_t *arguments, bool accepts_block, bool accepts_command_call, uint16_t depth) {
+    bool found = false;
+
+    if (accept1(parser, PM_TOKEN_PARENTHESIS_LEFT)) {
+        found |= true;
+        arguments->opening_loc = PM_LOCATION_TOKEN_VALUE(&parser->previous);
+
+        if (accept1(parser, PM_TOKEN_PARENTHESIS_RIGHT)) {
+            arguments->closing_loc = PM_LOCATION_TOKEN_VALUE(&parser->previous);
+        } else {
+            pm_accepts_block_stack_push(parser, true);
+            parse_arguments(parser, arguments, accepts_block, PM_TOKEN_PARENTHESIS_RIGHT, (uint16_t) (depth + 1));
+
+            if (!accept1(parser, PM_TOKEN_PARENTHESIS_RIGHT)) {
+                PM_PARSER_ERR_TOKEN_FORMAT(parser, parser->current, PM_ERR_ARGUMENT_TERM_PAREN, pm_token_type_human(parser->current.type));
+                parser->previous.start = parser->previous.end;
+                parser->previous.type = PM_TOKEN_MISSING;
+            }
+
+            pm_accepts_block_stack_pop(parser);
+            arguments->closing_loc = PM_LOCATION_TOKEN_VALUE(&parser->previous);
+        }
+    } else if (accepts_command_call && (token_begins_expression_p(parser->current.type) || match3(parser, PM_TOKEN_USTAR, PM_TOKEN_USTAR_STAR, PM_TOKEN_UAMPERSAND)) && !match1(parser, PM_TOKEN_BRACE_LEFT)) {
+        found |= true;
+        pm_accepts_block_stack_push(parser, false);
+
+        // If we get here, then the subsequent token cannot be used as an infix
+        // operator. In this case we assume the subsequent token is part of an
+        // argument to this method call.
+        parse_arguments(parser, arguments, accepts_block, PM_TOKEN_EOF, (uint16_t) (depth + 1));
+
+        // If we have done with the arguments and still not consumed the comma,
+        // then we have a trailing comma where we need to check whether it is
+        // allowed or not.
+        if (parser->previous.type == PM_TOKEN_COMMA && !match1(parser, PM_TOKEN_SEMICOLON)) {
+            PM_PARSER_ERR_TOKEN_FORMAT(parser, parser->previous, PM_ERR_EXPECT_ARGUMENT, pm_token_type_human(parser->current.type));
+        }
+
+        pm_accepts_block_stack_pop(parser);
+    }
+
+    // If we're at the end of the arguments, we can now check if there is a block
+    // node that starts with a {. If there is, then we can parse it and add it to
+    // the arguments.
+    if (accepts_block) {
+        pm_block_node_t *block = NULL;
+
+        if (accept1(parser, PM_TOKEN_BRACE_LEFT)) {
+            found |= true;
+            block = parse_block(parser, (uint16_t) (depth + 1));
+            pm_arguments_validate_block(parser, arguments, block);
+        } else if (pm_accepts_block_stack_p(parser) && accept1(parser, PM_TOKEN_KEYWORD_DO)) {
+            found |= true;
+            block = parse_block(parser, (uint16_t) (depth + 1));
+        }
+
+        if (block != NULL) {
+            if (arguments->block == NULL && !arguments->has_forwarding) {
+                arguments->block = (pm_node_t *) block;
+            } else {
+                pm_parser_err_node(parser, (pm_node_t *) block, PM_ERR_ARGUMENT_BLOCK_MULTI);
+
+                if (arguments->block != NULL) {
+                    if (arguments->arguments == NULL) {
+                        arguments->arguments = pm_arguments_node_create(parser);
+                    }
+                    pm_arguments_node_arguments_append(arguments->arguments, arguments->block);
+                }
+                arguments->block = (pm_node_t *) block;
+            }
+        }
+    }
+
+    return found;
+}
+
+/**
+ * Check that the return is allowed in the current context. If it isn't, add an
+ * error to the parser.
+ */
+static void
+parse_return(pm_parser_t *parser, pm_node_t *node) {
+    bool in_sclass = false;
+    for (pm_context_node_t *context_node = parser->current_context; context_node != NULL; context_node = context_node->prev) {
+        switch (context_node->context) {
+            case PM_CONTEXT_BEGIN_ELSE:
+            case PM_CONTEXT_BEGIN_ENSURE:
+            case PM_CONTEXT_BEGIN_RESCUE:
+            case PM_CONTEXT_BEGIN:
+            case PM_CONTEXT_CASE_IN:
+            case PM_CONTEXT_CASE_WHEN:
+            case PM_CONTEXT_DEFAULT_PARAMS:
+            case PM_CONTEXT_DEFINED:
+            case PM_CONTEXT_ELSE:
+            case PM_CONTEXT_ELSIF:
+            case PM_CONTEXT_EMBEXPR:
+            case PM_CONTEXT_FOR_INDEX:
+            case PM_CONTEXT_FOR:
+            case PM_CONTEXT_IF:
+            case PM_CONTEXT_LOOP_PREDICATE:
+            case PM_CONTEXT_MAIN:
+            case PM_CONTEXT_MULTI_TARGET:
+            case PM_CONTEXT_PARENS:
+            case PM_CONTEXT_POSTEXE:
+            case PM_CONTEXT_PREDICATE:
+            case PM_CONTEXT_PREEXE:
+            case PM_CONTEXT_RESCUE_MODIFIER:
+            case PM_CONTEXT_TERNARY:
+            case PM_CONTEXT_UNLESS:
+            case PM_CONTEXT_UNTIL:
+            case PM_CONTEXT_WHILE:
+                // Keep iterating up the lists of contexts, because returns can
+                // see through these.
+                continue;
+            case PM_CONTEXT_SCLASS_ELSE:
+            case PM_CONTEXT_SCLASS_ENSURE:
+            case PM_CONTEXT_SCLASS_RESCUE:
+            case PM_CONTEXT_SCLASS:
+                in_sclass = true;
+                continue;
+            case PM_CONTEXT_CLASS_ELSE:
+            case PM_CONTEXT_CLASS_ENSURE:
+            case PM_CONTEXT_CLASS_RESCUE:
+            case PM_CONTEXT_CLASS:
+            case PM_CONTEXT_MODULE_ELSE:
+            case PM_CONTEXT_MODULE_ENSURE:
+            case PM_CONTEXT_MODULE_RESCUE:
+            case PM_CONTEXT_MODULE:
+                // These contexts are invalid for a return.
+                pm_parser_err_node(parser, node, PM_ERR_RETURN_INVALID);
+                return;
+            case PM_CONTEXT_BLOCK_BRACES:
+            case PM_CONTEXT_BLOCK_ELSE:
+            case PM_CONTEXT_BLOCK_ENSURE:
+            case PM_CONTEXT_BLOCK_KEYWORDS:
+            case PM_CONTEXT_BLOCK_RESCUE:
+            case PM_CONTEXT_DEF_ELSE:
+            case PM_CONTEXT_DEF_ENSURE:
+            case PM_CONTEXT_DEF_PARAMS:
+            case PM_CONTEXT_DEF_RESCUE:
+            case PM_CONTEXT_DEF:
+            case PM_CONTEXT_LAMBDA_BRACES:
+            case PM_CONTEXT_LAMBDA_DO_END:
+            case PM_CONTEXT_LAMBDA_ELSE:
+            case PM_CONTEXT_LAMBDA_ENSURE:
+            case PM_CONTEXT_LAMBDA_RESCUE:
+                // These contexts are valid for a return, and we should not
+                // continue to loop.
+                return;
+            case PM_CONTEXT_NONE:
+                // This case should never happen.
+                assert(false && "unreachable");
+                break;
+        }
+    }
+    if (in_sclass) {
+        pm_parser_err_node(parser, node, PM_ERR_RETURN_INVALID);
+    }
+}
+
+/**
+ * Check that the block exit (next, break, redo) is allowed in the current
+ * context. If it isn't, add an error to the parser.
+ */
+static void
+parse_block_exit(pm_parser_t *parser, pm_node_t *node) {
+    for (pm_context_node_t *context_node = parser->current_context; context_node != NULL; context_node = context_node->prev) {
+        switch (context_node->context) {
+            case PM_CONTEXT_BLOCK_BRACES:
+            case PM_CONTEXT_BLOCK_KEYWORDS:
+            case PM_CONTEXT_BLOCK_ELSE:
+            case PM_CONTEXT_BLOCK_ENSURE:
+            case PM_CONTEXT_BLOCK_RESCUE:
+            case PM_CONTEXT_DEFINED:
+            case PM_CONTEXT_FOR:
+            case PM_CONTEXT_LAMBDA_BRACES:
+            case PM_CONTEXT_LAMBDA_DO_END:
+            case PM_CONTEXT_LAMBDA_ELSE:
+            case PM_CONTEXT_LAMBDA_ENSURE:
+            case PM_CONTEXT_LAMBDA_RESCUE:
+            case PM_CONTEXT_LOOP_PREDICATE:
+            case PM_CONTEXT_POSTEXE:
+            case PM_CONTEXT_UNTIL:
+            case PM_CONTEXT_WHILE:
+                // These are the good cases. We're allowed to have a block exit
+                // in these contexts.
+                return;
+            case PM_CONTEXT_DEF:
+            case PM_CONTEXT_DEF_PARAMS:
+            case PM_CONTEXT_DEF_ELSE:
+            case PM_CONTEXT_DEF_ENSURE:
+            case PM_CONTEXT_DEF_RESCUE:
+            case PM_CONTEXT_MAIN:
+            case PM_CONTEXT_PREEXE:
+            case PM_CONTEXT_SCLASS:
+            case PM_CONTEXT_SCLASS_ELSE:
+            case PM_CONTEXT_SCLASS_ENSURE:
+            case PM_CONTEXT_SCLASS_RESCUE:
+                // These are the bad cases. We're not allowed to have a block
+                // exit in these contexts.
+                //
+                // If we get here, then we're about to mark this block exit
+                // as invalid. However, it could later _become_ valid if we
+                // find a trailing while/until on the expression. In this
+                // case instead of adding the error here, we'll add the
+                // block exit to the list of exits for the expression, and
+                // the node parsing will handle validating it instead.
+                assert(parser->current_block_exits != NULL);
+                pm_node_list_append(parser->current_block_exits, node);
+                return;
+            case PM_CONTEXT_BEGIN_ELSE:
+            case PM_CONTEXT_BEGIN_ENSURE:
+            case PM_CONTEXT_BEGIN_RESCUE:
+            case PM_CONTEXT_BEGIN:
+            case PM_CONTEXT_CASE_IN:
+            case PM_CONTEXT_CASE_WHEN:
+            case PM_CONTEXT_CLASS_ELSE:
+            case PM_CONTEXT_CLASS_ENSURE:
+            case PM_CONTEXT_CLASS_RESCUE:
+            case PM_CONTEXT_CLASS:
+            case PM_CONTEXT_DEFAULT_PARAMS:
+            case PM_CONTEXT_ELSE:
+            case PM_CONTEXT_ELSIF:
+            case PM_CONTEXT_EMBEXPR:
+            case PM_CONTEXT_FOR_INDEX:
+            case PM_CONTEXT_IF:
+            case PM_CONTEXT_MODULE_ELSE:
+            case PM_CONTEXT_MODULE_ENSURE:
+            case PM_CONTEXT_MODULE_RESCUE:
+            case PM_CONTEXT_MODULE:
+            case PM_CONTEXT_MULTI_TARGET:
+            case PM_CONTEXT_PARENS:
+            case PM_CONTEXT_PREDICATE:
+            case PM_CONTEXT_RESCUE_MODIFIER:
+            case PM_CONTEXT_TERNARY:
+            case PM_CONTEXT_UNLESS:
+                // In these contexts we should continue walking up the list of
+                // contexts.
+                break;
+            case PM_CONTEXT_NONE:
+                // This case should never happen.
+                assert(false && "unreachable");
+                break;
+        }
+    }
+}
+
+/**
+ * When we hit an expression that could contain block exits, we need to stash
+ * the previous set and create a new one.
+ */
+static pm_node_list_t *
+push_block_exits(pm_parser_t *parser, pm_node_list_t *current_block_exits) {
+    pm_node_list_t *previous_block_exits = parser->current_block_exits;
+    parser->current_block_exits = current_block_exits;
+    return previous_block_exits;
+}
+
+/**
+ * If we did not match a trailing while/until and this was the last chance to do
+ * so, then all of the block exits in the list are invalid and we need to add an
+ * error for each of them.
+ */
+static void
+flush_block_exits(pm_parser_t *parser, pm_node_list_t *previous_block_exits) {
+    pm_node_t *block_exit;
+    PM_NODE_LIST_FOREACH(parser->current_block_exits, index, block_exit) {
+        const char *type;
+
+        switch (PM_NODE_TYPE(block_exit)) {
+            case PM_BREAK_NODE: type = "break"; break;
+            case PM_NEXT_NODE: type = "next"; break;
+            case PM_REDO_NODE: type = "redo"; break;
+            default: assert(false && "unreachable"); type = ""; break;
+        }
+
+        PM_PARSER_ERR_NODE_FORMAT(parser, block_exit, PM_ERR_INVALID_BLOCK_EXIT, type);
+    }
+
+    parser->current_block_exits = previous_block_exits;
+}
+
+/**
+ * Pop the current level of block exits from the parser, and add errors to the
+ * parser if any of them are deemed to be invalid.
+ */
+static void
+pop_block_exits(pm_parser_t *parser, pm_node_list_t *previous_block_exits) {
+    if (match2(parser, PM_TOKEN_KEYWORD_WHILE_MODIFIER, PM_TOKEN_KEYWORD_UNTIL_MODIFIER)) {
+        // If we matched a trailing while/until, then all of the block exits in
+        // the contained list are valid. In this case we do not need to do
+        // anything.
+        parser->current_block_exits = previous_block_exits;
+    } else if (previous_block_exits != NULL) {
+        // If we did not matching a trailing while/until, then all of the block
+        // exits contained in the list are invalid for this specific context.
+        // However, they could still become valid in a higher level context if
+        // there is another list above this one. In this case we'll push all of
+        // the block exits up to the previous list.
+        pm_node_list_concat(previous_block_exits, parser->current_block_exits);
+        parser->current_block_exits = previous_block_exits;
+    } else {
+        // If we did not match a trailing while/until and this was the last
+        // chance to do so, then all of the block exits in the list are invalid
+        // and we need to add an error for each of them.
+        flush_block_exits(parser, previous_block_exits);
+    }
+}
+
+static inline pm_node_t *
+parse_predicate(pm_parser_t *parser, pm_binding_power_t binding_power, pm_context_t context, pm_token_t *then_keyword, uint16_t depth) {
+    context_push(parser, PM_CONTEXT_PREDICATE);
+    pm_diagnostic_id_t error_id = context == PM_CONTEXT_IF ? PM_ERR_CONDITIONAL_IF_PREDICATE : PM_ERR_CONDITIONAL_UNLESS_PREDICATE;
+    pm_node_t *predicate = parse_value_expression(parser, binding_power, true, false, error_id, (uint16_t) (depth + 1));
+
+    // Predicates are closed by a term, a "then", or a term and then a "then".
+    bool predicate_closed = accept2(parser, PM_TOKEN_NEWLINE, PM_TOKEN_SEMICOLON);
+
+    if (accept1(parser, PM_TOKEN_KEYWORD_THEN)) {
+        predicate_closed = true;
+        *then_keyword = parser->previous;
+    }
+
+    if (!predicate_closed) {
+        pm_parser_err_current(parser, PM_ERR_CONDITIONAL_PREDICATE_TERM);
+    }
+
+    context_pop(parser);
+    return predicate;
+}
+
+static inline pm_node_t *
+parse_conditional(pm_parser_t *parser, pm_context_t context, size_t opening_newline_index, bool if_after_else, uint16_t depth) {
+    pm_node_list_t current_block_exits = { 0 };
+    pm_node_list_t *previous_block_exits = push_block_exits(parser, &current_block_exits);
+
+    pm_token_t keyword = parser->previous;
+    pm_token_t then_keyword = not_provided(parser);
+
+    pm_node_t *predicate = parse_predicate(parser, PM_BINDING_POWER_MODIFIER, context, &then_keyword, (uint16_t) (depth + 1));
+    pm_statements_node_t *statements = NULL;
+
+    if (!match3(parser, PM_TOKEN_KEYWORD_ELSIF, PM_TOKEN_KEYWORD_ELSE, PM_TOKEN_KEYWORD_END)) {
+        pm_accepts_block_stack_push(parser, true);
+        statements = parse_statements(parser, context, (uint16_t) (depth + 1));
+        pm_accepts_block_stack_pop(parser);
+        accept2(parser, PM_TOKEN_NEWLINE, PM_TOKEN_SEMICOLON);
+    }
+
+    pm_token_t end_keyword = not_provided(parser);
+    pm_node_t *parent = NULL;
+
+    switch (context) {
+        case PM_CONTEXT_IF:
+            parent = (pm_node_t *) pm_if_node_create(parser, &keyword, predicate, &then_keyword, statements, NULL, &end_keyword);
+            break;
+        case PM_CONTEXT_UNLESS:
+            parent = (pm_node_t *) pm_unless_node_create(parser, &keyword, predicate, &then_keyword, statements);
+            break;
+        default:
+            assert(false && "unreachable");
+            break;
+    }
+
+    pm_node_t *current = parent;
+
+    // Parse any number of elsif clauses. This will form a linked list of if
+    // nodes pointing to each other from the top.
+    if (context == PM_CONTEXT_IF) {
+        while (match1(parser, PM_TOKEN_KEYWORD_ELSIF)) {
+            if (parser_end_of_line_p(parser)) {
+                PM_PARSER_WARN_TOKEN_FORMAT_CONTENT(parser, parser->current, PM_WARN_KEYWORD_EOL);
+            }
+
+            parser_warn_indentation_mismatch(parser, opening_newline_index, &keyword, false, false);
+            pm_token_t elsif_keyword = parser->current;
+            parser_lex(parser);
+
+            pm_node_t *predicate = parse_predicate(parser, PM_BINDING_POWER_MODIFIER, PM_CONTEXT_ELSIF, &then_keyword, (uint16_t) (depth + 1));
+            pm_accepts_block_stack_push(parser, true);
+
+            pm_statements_node_t *statements = parse_statements(parser, PM_CONTEXT_ELSIF, (uint16_t) (depth + 1));
+            pm_accepts_block_stack_pop(parser);
+            accept2(parser, PM_TOKEN_NEWLINE, PM_TOKEN_SEMICOLON);
+
+            pm_node_t *elsif = (pm_node_t *) pm_if_node_create(parser, &elsif_keyword, predicate, &then_keyword, statements, NULL, &end_keyword);
+            ((pm_if_node_t *) current)->subsequent = elsif;
+            current = elsif;
+        }
+    }
+
+    if (match1(parser, PM_TOKEN_KEYWORD_ELSE)) {
+        parser_warn_indentation_mismatch(parser, opening_newline_index, &keyword, false, false);
+        opening_newline_index = token_newline_index(parser);
+
+        parser_lex(parser);
+        pm_token_t else_keyword = parser->previous;
+
+        pm_accepts_block_stack_push(parser, true);
+        pm_statements_node_t *else_statements = parse_statements(parser, PM_CONTEXT_ELSE, (uint16_t) (depth + 1));
+        pm_accepts_block_stack_pop(parser);
+
+        accept2(parser, PM_TOKEN_NEWLINE, PM_TOKEN_SEMICOLON);
+        parser_warn_indentation_mismatch(parser, opening_newline_index, &else_keyword, false, false);
+        expect1(parser, PM_TOKEN_KEYWORD_END, PM_ERR_CONDITIONAL_TERM_ELSE);
+
+        pm_else_node_t *else_node = pm_else_node_create(parser, &else_keyword, else_statements, &parser->previous);
+
+        switch (context) {
+            case PM_CONTEXT_IF:
+                ((pm_if_node_t *) current)->subsequent = (pm_node_t *) else_node;
+                break;
+            case PM_CONTEXT_UNLESS:
+                ((pm_unless_node_t *) parent)->else_clause = else_node;
+                break;
+            default:
+                assert(false && "unreachable");
+                break;
+        }
+    } else {
+        parser_warn_indentation_mismatch(parser, opening_newline_index, &keyword, if_after_else, false);
+        expect1(parser, PM_TOKEN_KEYWORD_END, PM_ERR_CONDITIONAL_TERM);
+    }
+
+    // Set the appropriate end location for all of the nodes in the subtree.
+    switch (context) {
+        case PM_CONTEXT_IF: {
+            pm_node_t *current = parent;
+            bool recursing = true;
+
+            while (recursing) {
+                switch (PM_NODE_TYPE(current)) {
+                    case PM_IF_NODE:
+                        pm_if_node_end_keyword_loc_set((pm_if_node_t *) current, &parser->previous);
+                        current = ((pm_if_node_t *) current)->subsequent;
+                        recursing = current != NULL;
+                        break;
+                    case PM_ELSE_NODE:
+                        pm_else_node_end_keyword_loc_set((pm_else_node_t *) current, &parser->previous);
+                        recursing = false;
+                        break;
+                    default: {
+                        recursing = false;
+                        break;
+                    }
+                }
+            }
+            break;
+        }
+        case PM_CONTEXT_UNLESS:
+            pm_unless_node_end_keyword_loc_set((pm_unless_node_t *) parent, &parser->previous);
+            break;
+        default:
+            assert(false && "unreachable");
+            break;
+    }
+
+    pop_block_exits(parser, previous_block_exits);
+    pm_node_list_free(&current_block_exits);
+
+    return parent;
+}
+
+/**
+ * This macro allows you to define a case statement for all of the keywords.
+ * It's meant to be used in a switch statement.
+ */
+#define PM_CASE_KEYWORD PM_TOKEN_KEYWORD___ENCODING__: case PM_TOKEN_KEYWORD___FILE__: case PM_TOKEN_KEYWORD___LINE__: \
+    case PM_TOKEN_KEYWORD_ALIAS: case PM_TOKEN_KEYWORD_AND: case PM_TOKEN_KEYWORD_BEGIN: case PM_TOKEN_KEYWORD_BEGIN_UPCASE: \
+    case PM_TOKEN_KEYWORD_BREAK: case PM_TOKEN_KEYWORD_CASE: case PM_TOKEN_KEYWORD_CLASS: case PM_TOKEN_KEYWORD_DEF: \
+    case PM_TOKEN_KEYWORD_DEFINED: case PM_TOKEN_KEYWORD_DO: case PM_TOKEN_KEYWORD_DO_LOOP: case PM_TOKEN_KEYWORD_ELSE: \
+    case PM_TOKEN_KEYWORD_ELSIF: case PM_TOKEN_KEYWORD_END: case PM_TOKEN_KEYWORD_END_UPCASE: case PM_TOKEN_KEYWORD_ENSURE: \
+    case PM_TOKEN_KEYWORD_FALSE: case PM_TOKEN_KEYWORD_FOR: case PM_TOKEN_KEYWORD_IF: case PM_TOKEN_KEYWORD_IN: \
+    case PM_TOKEN_KEYWORD_MODULE: case PM_TOKEN_KEYWORD_NEXT: case PM_TOKEN_KEYWORD_NIL: case PM_TOKEN_KEYWORD_NOT: \
+    case PM_TOKEN_KEYWORD_OR: case PM_TOKEN_KEYWORD_REDO: case PM_TOKEN_KEYWORD_RESCUE: case PM_TOKEN_KEYWORD_RETRY: \
+    case PM_TOKEN_KEYWORD_RETURN: case PM_TOKEN_KEYWORD_SELF: case PM_TOKEN_KEYWORD_SUPER: case PM_TOKEN_KEYWORD_THEN: \
+    case PM_TOKEN_KEYWORD_TRUE: case PM_TOKEN_KEYWORD_UNDEF: case PM_TOKEN_KEYWORD_UNLESS: case PM_TOKEN_KEYWORD_UNTIL: \
+    case PM_TOKEN_KEYWORD_WHEN: case PM_TOKEN_KEYWORD_WHILE: case PM_TOKEN_KEYWORD_YIELD
+
+/**
+ * This macro allows you to define a case statement for all of the operators.
+ * It's meant to be used in a switch statement.
+ */
+#define PM_CASE_OPERATOR PM_TOKEN_AMPERSAND: case PM_TOKEN_BACKTICK: case PM_TOKEN_BANG_EQUAL: \
+    case PM_TOKEN_BANG_TILDE: case PM_TOKEN_BANG: case PM_TOKEN_BRACKET_LEFT_RIGHT_EQUAL: \
+    case PM_TOKEN_BRACKET_LEFT_RIGHT: case PM_TOKEN_CARET: case PM_TOKEN_EQUAL_EQUAL_EQUAL: case PM_TOKEN_EQUAL_EQUAL: \
+    case PM_TOKEN_EQUAL_TILDE: case PM_TOKEN_GREATER_EQUAL: case PM_TOKEN_GREATER_GREATER: case PM_TOKEN_GREATER: \
+    case PM_TOKEN_LESS_EQUAL_GREATER: case PM_TOKEN_LESS_EQUAL: case PM_TOKEN_LESS_LESS: case PM_TOKEN_LESS: \
+    case PM_TOKEN_MINUS: case PM_TOKEN_PERCENT: case PM_TOKEN_PIPE: case PM_TOKEN_PLUS: case PM_TOKEN_SLASH: \
+    case PM_TOKEN_STAR_STAR: case PM_TOKEN_STAR: case PM_TOKEN_TILDE: case PM_TOKEN_UAMPERSAND: case PM_TOKEN_UMINUS: \
+    case PM_TOKEN_UMINUS_NUM: case PM_TOKEN_UPLUS: case PM_TOKEN_USTAR: case PM_TOKEN_USTAR_STAR
+
+/**
+ * This macro allows you to define a case statement for all of the token types
+ * that represent the beginning of nodes that are "primitives" in a pattern
+ * matching expression.
+ */
+#define PM_CASE_PRIMITIVE PM_TOKEN_INTEGER: case PM_TOKEN_INTEGER_IMAGINARY: case PM_TOKEN_INTEGER_RATIONAL: \
+    case PM_TOKEN_INTEGER_RATIONAL_IMAGINARY: case PM_TOKEN_FLOAT: case PM_TOKEN_FLOAT_IMAGINARY: \
+    case PM_TOKEN_FLOAT_RATIONAL: case PM_TOKEN_FLOAT_RATIONAL_IMAGINARY: case PM_TOKEN_SYMBOL_BEGIN: \
+    case PM_TOKEN_REGEXP_BEGIN: case PM_TOKEN_BACKTICK: case PM_TOKEN_PERCENT_LOWER_X: case PM_TOKEN_PERCENT_LOWER_I: \
+    case PM_TOKEN_PERCENT_LOWER_W: case PM_TOKEN_PERCENT_UPPER_I: case PM_TOKEN_PERCENT_UPPER_W: \
+    case PM_TOKEN_STRING_BEGIN: case PM_TOKEN_KEYWORD_NIL: case PM_TOKEN_KEYWORD_SELF: case PM_TOKEN_KEYWORD_TRUE: \
+    case PM_TOKEN_KEYWORD_FALSE: case PM_TOKEN_KEYWORD___FILE__: case PM_TOKEN_KEYWORD___LINE__: \
+    case PM_TOKEN_KEYWORD___ENCODING__: case PM_TOKEN_MINUS_GREATER: case PM_TOKEN_HEREDOC_START: \
+    case PM_TOKEN_UMINUS_NUM: case PM_TOKEN_CHARACTER_LITERAL
+
+/**
+ * This macro allows you to define a case statement for all of the token types
+ * that could begin a parameter.
+ */
+#define PM_CASE_PARAMETER PM_TOKEN_UAMPERSAND: case PM_TOKEN_AMPERSAND: case PM_TOKEN_UDOT_DOT_DOT: \
+    case PM_TOKEN_IDENTIFIER: case PM_TOKEN_LABEL: case PM_TOKEN_USTAR: case PM_TOKEN_STAR: case PM_TOKEN_STAR_STAR: \
+    case PM_TOKEN_USTAR_STAR: case PM_TOKEN_CONSTANT: case PM_TOKEN_INSTANCE_VARIABLE: case PM_TOKEN_GLOBAL_VARIABLE: \
+    case PM_TOKEN_CLASS_VARIABLE
+
+/**
+ * This macro allows you to define a case statement for all of the nodes that
+ * can be transformed into write targets.
+ */
+#define PM_CASE_WRITABLE PM_CLASS_VARIABLE_READ_NODE: case PM_CONSTANT_PATH_NODE: \
+    case PM_CONSTANT_READ_NODE: case PM_GLOBAL_VARIABLE_READ_NODE: case PM_LOCAL_VARIABLE_READ_NODE: \
+    case PM_INSTANCE_VARIABLE_READ_NODE: case PM_MULTI_TARGET_NODE: case PM_BACK_REFERENCE_READ_NODE: \
+    case PM_NUMBERED_REFERENCE_READ_NODE: case PM_IT_LOCAL_VARIABLE_READ_NODE
+
+// Assert here that the flags are the same so that we can safely switch the type
+// of the node without having to move the flags.
+PM_STATIC_ASSERT(__LINE__, ((int) PM_STRING_FLAGS_FORCED_UTF8_ENCODING) == ((int) PM_ENCODING_FLAGS_FORCED_UTF8_ENCODING), "Expected the flags to match.");
+
+/**
+ * If the encoding was explicitly set through the lexing process, then we need
+ * to potentially mark the string's flags to indicate how to encode it.
+ */
+static inline pm_node_flags_t
+parse_unescaped_encoding(const pm_parser_t *parser) {
+    if (parser->explicit_encoding != NULL) {
+        if (parser->explicit_encoding == PM_ENCODING_UTF_8_ENTRY) {
+            // If the there's an explicit encoding and it's using a UTF-8 escape
+            // sequence, then mark the string as UTF-8.
+            return PM_STRING_FLAGS_FORCED_UTF8_ENCODING;
+        } else if (parser->encoding == PM_ENCODING_US_ASCII_ENTRY) {
+            // If there's a non-UTF-8 escape sequence being used, then the
+            // string uses the source encoding, unless the source is marked as
+            // US-ASCII. In that case the string is forced as ASCII-8BIT in
+            // order to keep the string valid.
+            return PM_STRING_FLAGS_FORCED_BINARY_ENCODING;
+        }
+    }
+    return 0;
+}
+
+/**
+ * Parse a node that is part of a string. If the subsequent tokens cannot be
+ * parsed as a string part, then NULL is returned.
+ */
+static pm_node_t *
+parse_string_part(pm_parser_t *parser, uint16_t depth) {
+    switch (parser->current.type) {
+        // Here the lexer has returned to us plain string content. In this case
+        // we'll create a string node that has no opening or closing and return that
+        // as the part. These kinds of parts look like:
+        //
+        //     "aaa #{bbb} #@ccc ddd"
+        //      ^^^^      ^     ^^^^
+        case PM_TOKEN_STRING_CONTENT: {
+            pm_token_t opening = not_provided(parser);
+            pm_token_t closing = not_provided(parser);
+
+            pm_node_t *node = (pm_node_t *) pm_string_node_create_current_string(parser, &opening, &parser->current, &closing);
+            pm_node_flag_set(node, parse_unescaped_encoding(parser));
+
+            parser_lex(parser);
+            return node;
+        }
+        // Here the lexer has returned the beginning of an embedded expression. In
+        // that case we'll parse the inner statements and return that as the part.
+        // These kinds of parts look like:
+        //
+        //     "aaa #{bbb} #@ccc ddd"
+        //          ^^^^^^
+        case PM_TOKEN_EMBEXPR_BEGIN: {
+            // Ruby disallows seeing encoding around interpolation in strings,
+            // even though it is known at parse time.
+            parser->explicit_encoding = NULL;
+
+            pm_lex_state_t state = parser->lex_state;
+            int brace_nesting = parser->brace_nesting;
+
+            parser->brace_nesting = 0;
+            lex_state_set(parser, PM_LEX_STATE_BEG);
+            parser_lex(parser);
+
+            pm_token_t opening = parser->previous;
+            pm_statements_node_t *statements = NULL;
+
+            if (!match1(parser, PM_TOKEN_EMBEXPR_END)) {
+                pm_accepts_block_stack_push(parser, true);
+                statements = parse_statements(parser, PM_CONTEXT_EMBEXPR, (uint16_t) (depth + 1));
+                pm_accepts_block_stack_pop(parser);
+            }
+
+            parser->brace_nesting = brace_nesting;
+            lex_state_set(parser, state);
+
+            expect1(parser, PM_TOKEN_EMBEXPR_END, PM_ERR_EMBEXPR_END);
+            pm_token_t closing = parser->previous;
+
+            // If this set of embedded statements only contains a single
+            // statement, then Ruby does not consider it as a possible statement
+            // that could emit a line event.
+            if (statements != NULL && statements->body.size == 1) {
+                pm_node_flag_unset(statements->body.nodes[0], PM_NODE_FLAG_NEWLINE);
+            }
+
+            return (pm_node_t *) pm_embedded_statements_node_create(parser, &opening, statements, &closing);
+        }
+
+        // Here the lexer has returned the beginning of an embedded variable.
+        // In that case we'll parse the variable and create an appropriate node
+        // for it and then return that node. These kinds of parts look like:
+        //
+        //     "aaa #{bbb} #@ccc ddd"
+        //                 ^^^^^
+        case PM_TOKEN_EMBVAR: {
+            // Ruby disallows seeing encoding around interpolation in strings,
+            // even though it is known at parse time.
+            parser->explicit_encoding = NULL;
+
+            lex_state_set(parser, PM_LEX_STATE_BEG);
+            parser_lex(parser);
+
+            pm_token_t operator = parser->previous;
+            pm_node_t *variable;
+
+            switch (parser->current.type) {
+                // In this case a back reference is being interpolated. We'll
+                // create a global variable read node.
+                case PM_TOKEN_BACK_REFERENCE:
+                    parser_lex(parser);
+                    variable = (pm_node_t *) pm_back_reference_read_node_create(parser, &parser->previous);
+                    break;
+                // In this case an nth reference is being interpolated. We'll
+                // create a global variable read node.
+                case PM_TOKEN_NUMBERED_REFERENCE:
+                    parser_lex(parser);
+                    variable = (pm_node_t *) pm_numbered_reference_read_node_create(parser, &parser->previous);
+                    break;
+                // In this case a global variable is being interpolated. We'll
+                // create a global variable read node.
+                case PM_TOKEN_GLOBAL_VARIABLE:
+                    parser_lex(parser);
+                    variable = (pm_node_t *) pm_global_variable_read_node_create(parser, &parser->previous);
+                    break;
+                // In this case an instance variable is being interpolated.
+                // We'll create an instance variable read node.
+                case PM_TOKEN_INSTANCE_VARIABLE:
+                    parser_lex(parser);
+                    variable = (pm_node_t *) pm_instance_variable_read_node_create(parser, &parser->previous);
+                    break;
+                // In this case a class variable is being interpolated. We'll
+                // create a class variable read node.
+                case PM_TOKEN_CLASS_VARIABLE:
+                    parser_lex(parser);
+                    variable = (pm_node_t *) pm_class_variable_read_node_create(parser, &parser->previous);
+                    break;
+                // We can hit here if we got an invalid token. In that case
+                // we'll not attempt to lex this token and instead just return a
+                // missing node.
+                default:
+                    expect1(parser, PM_TOKEN_IDENTIFIER, PM_ERR_EMBVAR_INVALID);
+                    variable = (pm_node_t *) pm_missing_node_create(parser, parser->current.start, parser->current.end);
+                    break;
+            }
+
+            return (pm_node_t *) pm_embedded_variable_node_create(parser, &operator, variable);
+        }
+        default:
+            parser_lex(parser);
+            pm_parser_err_previous(parser, PM_ERR_CANNOT_PARSE_STRING_PART);
+            return NULL;
+    }
+}
+
+/**
+ * When creating a symbol, unary operators that cannot be binary operators
+ * automatically drop trailing `@` characters. This happens at the parser level,
+ * such that `~@` is parsed as `~` and `!@` is parsed as `!`. We do that here.
+ */
+static const uint8_t *
+parse_operator_symbol_name(const pm_token_t *name) {
+    switch (name->type) {
+        case PM_TOKEN_TILDE:
+        case PM_TOKEN_BANG:
+            if (name->end[-1] == '@') return name->end - 1;
+        PRISM_FALLTHROUGH
+        default:
+            return name->end;
+    }
+}
+
+static pm_node_t *
+parse_operator_symbol(pm_parser_t *parser, const pm_token_t *opening, pm_lex_state_t next_state) {
+    pm_token_t closing = not_provided(parser);
+    pm_symbol_node_t *symbol = pm_symbol_node_create(parser, opening, &parser->current, &closing);
+
+    const uint8_t *end = parse_operator_symbol_name(&parser->current);
+
+    if (next_state != PM_LEX_STATE_NONE) lex_state_set(parser, next_state);
+    parser_lex(parser);
+
+    pm_string_shared_init(&symbol->unescaped, parser->previous.start, end);
+    pm_node_flag_set((pm_node_t *) symbol, PM_SYMBOL_FLAGS_FORCED_US_ASCII_ENCODING);
+
+    return (pm_node_t *) symbol;
+}
+
+/**
+ * Parse a symbol node. This function will get called immediately after finding
+ * a symbol opening token. This handles parsing bare symbols and interpolated
+ * symbols.
+ */
+static pm_node_t *
+parse_symbol(pm_parser_t *parser, pm_lex_mode_t *lex_mode, pm_lex_state_t next_state, uint16_t depth) {
+    const pm_token_t opening = parser->previous;
+
+    if (lex_mode->mode != PM_LEX_STRING) {
+        if (next_state != PM_LEX_STATE_NONE) lex_state_set(parser, next_state);
+
+        switch (parser->current.type) {
+            case PM_CASE_OPERATOR:
+                return parse_operator_symbol(parser, &opening, next_state == PM_LEX_STATE_NONE ? PM_LEX_STATE_ENDFN : next_state);
+            case PM_TOKEN_IDENTIFIER:
+            case PM_TOKEN_CONSTANT:
+            case PM_TOKEN_INSTANCE_VARIABLE:
+            case PM_TOKEN_METHOD_NAME:
+            case PM_TOKEN_CLASS_VARIABLE:
+            case PM_TOKEN_GLOBAL_VARIABLE:
+            case PM_TOKEN_NUMBERED_REFERENCE:
+            case PM_TOKEN_BACK_REFERENCE:
+            case PM_CASE_KEYWORD:
+                parser_lex(parser);
+                break;
+            default:
+                expect2(parser, PM_TOKEN_IDENTIFIER, PM_TOKEN_METHOD_NAME, PM_ERR_SYMBOL_INVALID);
+                break;
+        }
+
+        pm_token_t closing = not_provided(parser);
+        pm_symbol_node_t *symbol = pm_symbol_node_create(parser, &opening, &parser->previous, &closing);
+
+        pm_string_shared_init(&symbol->unescaped, parser->previous.start, parser->previous.end);
+        pm_node_flag_set((pm_node_t *) symbol, parse_symbol_encoding(parser, &parser->previous, &symbol->unescaped, false));
+
+        return (pm_node_t *) symbol;
+    }
+
+    if (lex_mode->as.string.interpolation) {
+        // If we have the end of the symbol, then we can return an empty symbol.
+        if (match1(parser, PM_TOKEN_STRING_END)) {
+            if (next_state != PM_LEX_STATE_NONE) lex_state_set(parser, next_state);
+            parser_lex(parser);
+
+            pm_token_t content = not_provided(parser);
+            pm_token_t closing = parser->previous;
+            return (pm_node_t *) pm_symbol_node_create(parser, &opening, &content, &closing);
+        }
+
+        // Now we can parse the first part of the symbol.
+        pm_node_t *part = parse_string_part(parser, (uint16_t) (depth + 1));
+
+        // If we got a string part, then it's possible that we could transform
+        // what looks like an interpolated symbol into a regular symbol.
+        if (part && PM_NODE_TYPE_P(part, PM_STRING_NODE) && match2(parser, PM_TOKEN_STRING_END, PM_TOKEN_EOF)) {
+            if (next_state != PM_LEX_STATE_NONE) lex_state_set(parser, next_state);
+            expect1(parser, PM_TOKEN_STRING_END, PM_ERR_SYMBOL_TERM_INTERPOLATED);
+
+            return (pm_node_t *) pm_string_node_to_symbol_node(parser, (pm_string_node_t *) part, &opening, &parser->previous);
+        }
+
+        pm_interpolated_symbol_node_t *symbol = pm_interpolated_symbol_node_create(parser, &opening, NULL, &opening);
+        if (part) pm_interpolated_symbol_node_append(symbol, part);
+
+        while (!match2(parser, PM_TOKEN_STRING_END, PM_TOKEN_EOF)) {
+            if ((part = parse_string_part(parser, (uint16_t) (depth + 1))) != NULL) {
+                pm_interpolated_symbol_node_append(symbol, part);
+            }
+        }
+
+        if (next_state != PM_LEX_STATE_NONE) lex_state_set(parser, next_state);
+        if (match1(parser, PM_TOKEN_EOF)) {
+            pm_parser_err_token(parser, &opening, PM_ERR_SYMBOL_TERM_INTERPOLATED);
+        } else {
+            expect1(parser, PM_TOKEN_STRING_END, PM_ERR_SYMBOL_TERM_INTERPOLATED);
+        }
+
+        pm_interpolated_symbol_node_closing_loc_set(symbol, &parser->previous);
+        return (pm_node_t *) symbol;
+    }
+
+    pm_token_t content;
+    pm_string_t unescaped;
+
+    if (match1(parser, PM_TOKEN_STRING_CONTENT)) {
+        content = parser->current;
+        unescaped = parser->current_string;
+        parser_lex(parser);
+
+        // If we have two string contents in a row, then the content of this
+        // symbol is split because of heredoc contents. This looks like:
+        //
+        // <<A; :'a
+        // A
+        // b'
+        //
+        // In this case, the best way we have to represent this is as an
+        // interpolated string node, so that's what we'll do here.
+        if (match1(parser, PM_TOKEN_STRING_CONTENT)) {
+            pm_interpolated_symbol_node_t *symbol = pm_interpolated_symbol_node_create(parser, &opening, NULL, &opening);
+            pm_token_t bounds = not_provided(parser);
+
+            pm_node_t *part = (pm_node_t *) pm_string_node_create_unescaped(parser, &bounds, &content, &bounds, &unescaped);
+            pm_interpolated_symbol_node_append(symbol, part);
+
+            part = (pm_node_t *) pm_string_node_create_unescaped(parser, &bounds, &parser->current, &bounds, &parser->current_string);
+            pm_interpolated_symbol_node_append(symbol, part);
+
+            if (next_state != PM_LEX_STATE_NONE) {
+                lex_state_set(parser, next_state);
+            }
+
+            parser_lex(parser);
+            expect1(parser, PM_TOKEN_STRING_END, PM_ERR_SYMBOL_TERM_DYNAMIC);
+
+            pm_interpolated_symbol_node_closing_loc_set(symbol, &parser->previous);
+            return (pm_node_t *) symbol;
+        }
+    } else {
+        content = (pm_token_t) { .type = PM_TOKEN_STRING_CONTENT, .start = parser->previous.end, .end = parser->previous.end };
+        pm_string_shared_init(&unescaped, content.start, content.end);
+    }
+
+    if (next_state != PM_LEX_STATE_NONE) {
+        lex_state_set(parser, next_state);
+    }
+
+    if (match1(parser, PM_TOKEN_EOF)) {
+        pm_parser_err_token(parser, &opening, PM_ERR_SYMBOL_TERM_DYNAMIC);
+    } else {
+        expect1(parser, PM_TOKEN_STRING_END, PM_ERR_SYMBOL_TERM_DYNAMIC);
+    }
+
+    return (pm_node_t *) pm_symbol_node_create_unescaped(parser, &opening, &content, &parser->previous, &unescaped, parse_symbol_encoding(parser, &content, &unescaped, false));
+}
+
+/**
+ * Parse an argument to undef which can either be a bare word, a symbol, a
+ * constant, or an interpolated symbol.
+ */
+static inline pm_node_t *
+parse_undef_argument(pm_parser_t *parser, uint16_t depth) {
+    switch (parser->current.type) {
+        case PM_CASE_OPERATOR: {
+            const pm_token_t opening = not_provided(parser);
+            return parse_operator_symbol(parser, &opening, PM_LEX_STATE_NONE);
+        }
+        case PM_CASE_KEYWORD:
+        case PM_TOKEN_CONSTANT:
+        case PM_TOKEN_IDENTIFIER:
+        case PM_TOKEN_METHOD_NAME: {
+            parser_lex(parser);
+
+            pm_token_t opening = not_provided(parser);
+            pm_token_t closing = not_provided(parser);
+            pm_symbol_node_t *symbol = pm_symbol_node_create(parser, &opening, &parser->previous, &closing);
+
+            pm_string_shared_init(&symbol->unescaped, parser->previous.start, parser->previous.end);
+            pm_node_flag_set((pm_node_t *) symbol, parse_symbol_encoding(parser, &parser->previous, &symbol->unescaped, false));
+
+            return (pm_node_t *) symbol;
+        }
+        case PM_TOKEN_SYMBOL_BEGIN: {
+            pm_lex_mode_t lex_mode = *parser->lex_modes.current;
+            parser_lex(parser);
+
+            return parse_symbol(parser, &lex_mode, PM_LEX_STATE_NONE, (uint16_t) (depth + 1));
+        }
+        default:
+            pm_parser_err_current(parser, PM_ERR_UNDEF_ARGUMENT);
+            return (pm_node_t *) pm_missing_node_create(parser, parser->current.start, parser->current.end);
+    }
+}
+
+/**
+ * Parse an argument to alias which can either be a bare word, a symbol, an
+ * interpolated symbol or a global variable. If this is the first argument, then
+ * we need to set the lex state to PM_LEX_STATE_FNAME | PM_LEX_STATE_FITEM
+ * between the first and second arguments.
+ */
+static inline pm_node_t *
+parse_alias_argument(pm_parser_t *parser, bool first, uint16_t depth) {
+    switch (parser->current.type) {
+        case PM_CASE_OPERATOR: {
+            const pm_token_t opening = not_provided(parser);
+            return parse_operator_symbol(parser, &opening, first ? PM_LEX_STATE_FNAME | PM_LEX_STATE_FITEM : PM_LEX_STATE_NONE);
+        }
+        case PM_CASE_KEYWORD:
+        case PM_TOKEN_CONSTANT:
+        case PM_TOKEN_IDENTIFIER:
+        case PM_TOKEN_METHOD_NAME: {
+            if (first) lex_state_set(parser, PM_LEX_STATE_FNAME | PM_LEX_STATE_FITEM);
+            parser_lex(parser);
+
+            pm_token_t opening = not_provided(parser);
+            pm_token_t closing = not_provided(parser);
+            pm_symbol_node_t *symbol = pm_symbol_node_create(parser, &opening, &parser->previous, &closing);
+
+            pm_string_shared_init(&symbol->unescaped, parser->previous.start, parser->previous.end);
+            pm_node_flag_set((pm_node_t *) symbol, parse_symbol_encoding(parser, &parser->previous, &symbol->unescaped, false));
+
+            return (pm_node_t *) symbol;
+        }
+        case PM_TOKEN_SYMBOL_BEGIN: {
+            pm_lex_mode_t lex_mode = *parser->lex_modes.current;
+            parser_lex(parser);
+
+            return parse_symbol(parser, &lex_mode, first ? PM_LEX_STATE_FNAME | PM_LEX_STATE_FITEM : PM_LEX_STATE_NONE, (uint16_t) (depth + 1));
+        }
+        case PM_TOKEN_BACK_REFERENCE:
+            parser_lex(parser);
+            return (pm_node_t *) pm_back_reference_read_node_create(parser, &parser->previous);
+        case PM_TOKEN_NUMBERED_REFERENCE:
+            parser_lex(parser);
+            return (pm_node_t *) pm_numbered_reference_read_node_create(parser, &parser->previous);
+        case PM_TOKEN_GLOBAL_VARIABLE:
+            parser_lex(parser);
+            return (pm_node_t *) pm_global_variable_read_node_create(parser, &parser->previous);
+        default:
+            pm_parser_err_current(parser, PM_ERR_ALIAS_ARGUMENT);
+            return (pm_node_t *) pm_missing_node_create(parser, parser->current.start, parser->current.end);
+    }
+}
+
+/**
+ * Parse an identifier into either a local variable read. If the local variable
+ * is not found, it returns NULL instead.
+ */
+static pm_node_t *
+parse_variable(pm_parser_t *parser) {
+    pm_constant_id_t name_id = pm_parser_constant_id_token(parser, &parser->previous);
+    int depth;
+    bool is_numbered_param = pm_token_is_numbered_parameter(parser->previous.start, parser->previous.end);
+
+    if (!is_numbered_param && ((depth = pm_parser_local_depth_constant_id(parser, name_id)) != -1)) {
+        return (pm_node_t *) pm_local_variable_read_node_create_constant_id(parser, &parser->previous, name_id, (uint32_t) depth, false);
+    }
+
+    pm_scope_t *current_scope = parser->current_scope;
+    if (!current_scope->closed && !(current_scope->parameters & PM_SCOPE_PARAMETERS_IMPLICIT_DISALLOWED)) {
+        if (is_numbered_param) {
+            // When you use a numbered parameter, it implies the existence of
+            // all of the locals that exist before it. For example, referencing
+            // _2 means that _1 must exist. Therefore here we loop through all
+            // of the possibilities and add them into the constant pool.
+            uint8_t maximum = (uint8_t) (parser->previous.start[1] - '0');
+            for (uint8_t number = 1; number <= maximum; number++) {
+                pm_parser_local_add_constant(parser, pm_numbered_parameter_names[number - 1], 2);
+            }
+
+            if (!match1(parser, PM_TOKEN_EQUAL)) {
+                parser->current_scope->parameters |= PM_SCOPE_PARAMETERS_NUMBERED_FOUND;
+            }
+
+            pm_node_t *node = (pm_node_t *) pm_local_variable_read_node_create_constant_id(parser, &parser->previous, name_id, 0, false);
+            pm_node_list_append(&current_scope->implicit_parameters, node);
+
+            return node;
+        } else if ((parser->version != PM_OPTIONS_VERSION_CRUBY_3_3) && pm_token_is_it(parser->previous.start, parser->previous.end)) {
+            pm_node_t *node = (pm_node_t *) pm_it_local_variable_read_node_create(parser, &parser->previous);
+            pm_node_list_append(&current_scope->implicit_parameters, node);
+
+            return node;
+        }
+    }
+
+    return NULL;
+}
+
+/**
+ * Parse an identifier into either a local variable read or a call.
+ */
+static pm_node_t *
+parse_variable_call(pm_parser_t *parser) {
+    pm_node_flags_t flags = 0;
+
+    if (!match1(parser, PM_TOKEN_PARENTHESIS_LEFT) && (parser->previous.end[-1] != '!') && (parser->previous.end[-1] != '?')) {
+        pm_node_t *node = parse_variable(parser);
+        if (node != NULL) return node;
+        flags |= PM_CALL_NODE_FLAGS_VARIABLE_CALL;
+    }
+
+    pm_call_node_t *node = pm_call_node_variable_call_create(parser, &parser->previous);
+    pm_node_flag_set((pm_node_t *)node, flags);
+
+    return (pm_node_t *) node;
+}
+
+/**
+ * Parse the method definition name based on the current token available on the
+ * parser. If it does not match a valid method definition name, then a missing
+ * token is returned.
+ */
+static inline pm_token_t
+parse_method_definition_name(pm_parser_t *parser) {
+    switch (parser->current.type) {
+        case PM_CASE_KEYWORD:
+        case PM_TOKEN_CONSTANT:
+        case PM_TOKEN_METHOD_NAME:
+            parser_lex(parser);
+            return parser->previous;
+        case PM_TOKEN_IDENTIFIER:
+            pm_refute_numbered_parameter(parser, parser->current.start, parser->current.end);
+            parser_lex(parser);
+            return parser->previous;
+        case PM_CASE_OPERATOR:
+            lex_state_set(parser, PM_LEX_STATE_ENDFN);
+            parser_lex(parser);
+            return parser->previous;
+        default:
+            PM_PARSER_ERR_TOKEN_FORMAT(parser, parser->current, PM_ERR_DEF_NAME, pm_token_type_human(parser->current.type));
+            return (pm_token_t) { .type = PM_TOKEN_MISSING, .start = parser->current.start, .end = parser->current.end };
+    }
+}
+
+static void
+parse_heredoc_dedent_string(pm_string_t *string, size_t common_whitespace) {
+    // Get a reference to the string struct that is being held by the string
+    // node. This is the value we're going to actually manipulate.
+    pm_string_ensure_owned(string);
+
+    // Now get the bounds of the existing string. We'll use this as a
+    // destination to move bytes into. We'll also use it for bounds checking
+    // since we don't require that these strings be null terminated.
+    size_t dest_length = pm_string_length(string);
+    const uint8_t *source_cursor = (uint8_t *) string->source;
+    const uint8_t *source_end = source_cursor + dest_length;
+
+    // We're going to move bytes backward in the string when we get leading
+    // whitespace, so we'll maintain a pointer to the current position in the
+    // string that we're writing to.
+    size_t trimmed_whitespace = 0;
+
+    // While we haven't reached the amount of common whitespace that we need to
+    // trim and we haven't reached the end of the string, we'll keep trimming
+    // whitespace. Trimming in this context means skipping over these bytes such
+    // that they aren't copied into the new string.
+    while ((source_cursor < source_end) && pm_char_is_inline_whitespace(*source_cursor) && trimmed_whitespace < common_whitespace) {
+        if (*source_cursor == '\t') {
+            trimmed_whitespace = (trimmed_whitespace / PM_TAB_WHITESPACE_SIZE + 1) * PM_TAB_WHITESPACE_SIZE;
+            if (trimmed_whitespace > common_whitespace) break;
+        } else {
+            trimmed_whitespace++;
+        }
+
+        source_cursor++;
+        dest_length--;
+    }
+
+    memmove((uint8_t *) string->source, source_cursor, (size_t) (source_end - source_cursor));
+    string->length = dest_length;
+}
+
+/**
+ * Take a heredoc node that is indented by a ~ and trim the leading whitespace.
+ */
+static void
+parse_heredoc_dedent(pm_parser_t *parser, pm_node_list_t *nodes, size_t common_whitespace) {
+    // The next node should be dedented if it's the first node in the list or if
+    // it follows a string node.
+    bool dedent_next = true;
+
+    // Iterate over all nodes, and trim whitespace accordingly. We're going to
+    // keep around two indices: a read and a write. If we end up trimming all of
+    // the whitespace from a node, then we'll drop it from the list entirely.
+    size_t write_index = 0;
+
+    pm_node_t *node;
+    PM_NODE_LIST_FOREACH(nodes, read_index, node) {
+        // We're not manipulating child nodes that aren't strings. In this case
+        // we'll skip past it and indicate that the subsequent node should not
+        // be dedented.
+        if (!PM_NODE_TYPE_P(node, PM_STRING_NODE)) {
+            nodes->nodes[write_index++] = node;
+            dedent_next = false;
+            continue;
+        }
+
+        pm_string_node_t *string_node = ((pm_string_node_t *) node);
+        if (dedent_next) {
+            parse_heredoc_dedent_string(&string_node->unescaped, common_whitespace);
+        }
+
+        if (string_node->unescaped.length == 0) {
+            pm_node_destroy(parser, node);
+        } else {
+            nodes->nodes[write_index++] = node;
+        }
+
+        // We always dedent the next node if it follows a string node.
+        dedent_next = true;
+    }
+
+    nodes->size = write_index;
+}
+
+/**
+ * Return a string content token at a particular location that is empty.
+ */
+static pm_token_t
+parse_strings_empty_content(const uint8_t *location) {
+    return (pm_token_t) { .type = PM_TOKEN_STRING_CONTENT, .start = location, .end = location };
+}
+
+/**
+ * Parse a set of strings that could be concatenated together.
+ */
+static inline pm_node_t *
+parse_strings(pm_parser_t *parser, pm_node_t *current, bool accepts_label, uint16_t depth) {
+    assert(parser->current.type == PM_TOKEN_STRING_BEGIN);
+    bool concating = false;
+
+    while (match1(parser, PM_TOKEN_STRING_BEGIN)) {
+        pm_node_t *node = NULL;
+
+        // Here we have found a string literal. We'll parse it and add it to
+        // the list of strings.
+        const pm_lex_mode_t *lex_mode = parser->lex_modes.current;
+        assert(lex_mode->mode == PM_LEX_STRING);
+        bool lex_interpolation = lex_mode->as.string.interpolation;
+        bool label_allowed = lex_mode->as.string.label_allowed && accepts_label;
+
+        pm_token_t opening = parser->current;
+        parser_lex(parser);
+
+        if (match2(parser, PM_TOKEN_STRING_END, PM_TOKEN_EOF)) {
+            expect1(parser, PM_TOKEN_STRING_END, PM_ERR_STRING_LITERAL_EOF);
+            // If we get here, then we have an end immediately after a
+            // start. In that case we'll create an empty content token and
+            // return an uninterpolated string.
+            pm_token_t content = parse_strings_empty_content(parser->previous.start);
+            pm_string_node_t *string = pm_string_node_create(parser, &opening, &content, &parser->previous);
+
+            pm_string_shared_init(&string->unescaped, content.start, content.end);
+            node = (pm_node_t *) string;
+        } else if (accept1(parser, PM_TOKEN_LABEL_END)) {
+            // If we get here, then we have an end of a label immediately
+            // after a start. In that case we'll create an empty symbol
+            // node.
+            pm_token_t content = parse_strings_empty_content(parser->previous.start);
+            pm_symbol_node_t *symbol = pm_symbol_node_create(parser, &opening, &content, &parser->previous);
+
+            pm_string_shared_init(&symbol->unescaped, content.start, content.end);
+            node = (pm_node_t *) symbol;
+
+            if (!label_allowed) pm_parser_err_node(parser, node, PM_ERR_UNEXPECTED_LABEL);
+        } else if (!lex_interpolation) {
+            // If we don't accept interpolation then we expect the string to
+            // start with a single string content node.
+            pm_string_t unescaped;
+            pm_token_t content;
+
+            if (match1(parser, PM_TOKEN_EOF)) {
+                unescaped = PM_STRING_EMPTY;
+                content = not_provided(parser);
+            } else {
+                unescaped = parser->current_string;
+                expect1(parser, PM_TOKEN_STRING_CONTENT, PM_ERR_EXPECT_STRING_CONTENT);
+                content = parser->previous;
+            }
+
+            // It is unfortunately possible to have multiple string content
+            // nodes in a row in the case that there's heredoc content in
+            // the middle of the string, like this cursed example:
+            //
+            // <<-END+'b
+            //  a
+            // END
+            //  c'+'d'
+            //
+            // In that case we need to switch to an interpolated string to
+            // be able to contain all of the parts.
+            if (match1(parser, PM_TOKEN_STRING_CONTENT)) {
+                pm_node_list_t parts = { 0 };
+
+                pm_token_t delimiters = not_provided(parser);
+                pm_node_t *part = (pm_node_t *) pm_string_node_create_unescaped(parser, &delimiters, &content, &delimiters, &unescaped);
+                pm_node_list_append(&parts, part);
+
+                do {
+                    part = (pm_node_t *) pm_string_node_create_current_string(parser, &delimiters, &parser->current, &delimiters);
+                    pm_node_list_append(&parts, part);
+                    parser_lex(parser);
+                } while (match1(parser, PM_TOKEN_STRING_CONTENT));
+
+                expect1(parser, PM_TOKEN_STRING_END, PM_ERR_STRING_LITERAL_EOF);
+                node = (pm_node_t *) pm_interpolated_string_node_create(parser, &opening, &parts, &parser->previous);
+
+                pm_node_list_free(&parts);
+            } else if (accept1(parser, PM_TOKEN_LABEL_END)) {
+                node = (pm_node_t *) pm_symbol_node_create_unescaped(parser, &opening, &content, &parser->previous, &unescaped, parse_symbol_encoding(parser, &content, &unescaped, true));
+                if (!label_allowed) pm_parser_err_node(parser, node, PM_ERR_UNEXPECTED_LABEL);
+            } else if (match1(parser, PM_TOKEN_EOF)) {
+                pm_parser_err_token(parser, &opening, PM_ERR_STRING_LITERAL_EOF);
+                node = (pm_node_t *) pm_string_node_create_unescaped(parser, &opening, &content, &parser->current, &unescaped);
+            } else if (accept1(parser, PM_TOKEN_STRING_END)) {
+                node = (pm_node_t *) pm_string_node_create_unescaped(parser, &opening, &content, &parser->previous, &unescaped);
+            } else {
+                PM_PARSER_ERR_TOKEN_FORMAT(parser, parser->previous, PM_ERR_STRING_LITERAL_TERM, pm_token_type_human(parser->previous.type));
+                parser->previous.start = parser->previous.end;
+                parser->previous.type = PM_TOKEN_MISSING;
+                node = (pm_node_t *) pm_string_node_create_unescaped(parser, &opening, &content, &parser->previous, &unescaped);
+            }
+        } else if (match1(parser, PM_TOKEN_STRING_CONTENT)) {
+            // In this case we've hit string content so we know the string
+            // at least has something in it. We'll need to check if the
+            // following token is the end (in which case we can return a
+            // plain string) or if it's not then it has interpolation.
+            pm_token_t content = parser->current;
+            pm_string_t unescaped = parser->current_string;
+            parser_lex(parser);
+
+            if (match2(parser, PM_TOKEN_STRING_END, PM_TOKEN_EOF)) {
+                node = (pm_node_t *) pm_string_node_create_unescaped(parser, &opening, &content, &parser->current, &unescaped);
+                pm_node_flag_set(node, parse_unescaped_encoding(parser));
+
+                // Kind of odd behavior, but basically if we have an
+                // unterminated string and it ends in a newline, we back up one
+                // character so that the error message is on the last line of
+                // content in the string.
+                if (!accept1(parser, PM_TOKEN_STRING_END)) {
+                    const uint8_t *location = parser->previous.end;
+                    if (location > parser->start && location[-1] == '\n') location--;
+                    pm_parser_err(parser, location, location, PM_ERR_STRING_LITERAL_EOF);
+
+                    parser->previous.start = parser->previous.end;
+                    parser->previous.type = PM_TOKEN_MISSING;
+                }
+            } else if (accept1(parser, PM_TOKEN_LABEL_END)) {
+                node = (pm_node_t *) pm_symbol_node_create_unescaped(parser, &opening, &content, &parser->previous, &unescaped, parse_symbol_encoding(parser, &content, &unescaped, true));
+                if (!label_allowed) pm_parser_err_node(parser, node, PM_ERR_UNEXPECTED_LABEL);
+            } else {
+                // If we get here, then we have interpolation so we'll need
+                // to create a string or symbol node with interpolation.
+                pm_node_list_t parts = { 0 };
+                pm_token_t string_opening = not_provided(parser);
+                pm_token_t string_closing = not_provided(parser);
+
+                pm_node_t *part = (pm_node_t *) pm_string_node_create_unescaped(parser, &string_opening, &parser->previous, &string_closing, &unescaped);
+                pm_node_flag_set(part, parse_unescaped_encoding(parser));
+                pm_node_list_append(&parts, part);
+
+                while (!match3(parser, PM_TOKEN_STRING_END, PM_TOKEN_LABEL_END, PM_TOKEN_EOF)) {
+                    if ((part = parse_string_part(parser, (uint16_t) (depth + 1))) != NULL) {
+                        pm_node_list_append(&parts, part);
+                    }
+                }
+
+                if (accept1(parser, PM_TOKEN_LABEL_END)) {
+                    node = (pm_node_t *) pm_interpolated_symbol_node_create(parser, &opening, &parts, &parser->previous);
+                    if (!label_allowed) pm_parser_err_node(parser, node, PM_ERR_UNEXPECTED_LABEL);
+                } else if (match1(parser, PM_TOKEN_EOF)) {
+                    pm_parser_err_token(parser, &opening, PM_ERR_STRING_INTERPOLATED_TERM);
+                    node = (pm_node_t *) pm_interpolated_string_node_create(parser, &opening, &parts, &parser->current);
+                } else {
+                    expect1(parser, PM_TOKEN_STRING_END, PM_ERR_STRING_INTERPOLATED_TERM);
+                    node = (pm_node_t *) pm_interpolated_string_node_create(parser, &opening, &parts, &parser->previous);
+                }
+
+                pm_node_list_free(&parts);
+            }
+        } else {
+            // If we get here, then the first part of the string is not plain
+            // string content, in which case we need to parse the string as an
+            // interpolated string.
+            pm_node_list_t parts = { 0 };
+            pm_node_t *part;
+
+            while (!match3(parser, PM_TOKEN_STRING_END, PM_TOKEN_LABEL_END, PM_TOKEN_EOF)) {
+                if ((part = parse_string_part(parser, (uint16_t) (depth + 1))) != NULL) {
+                    pm_node_list_append(&parts, part);
+                }
+            }
+
+            if (accept1(parser, PM_TOKEN_LABEL_END)) {
+                node = (pm_node_t *) pm_interpolated_symbol_node_create(parser, &opening, &parts, &parser->previous);
+                if (!label_allowed) pm_parser_err_node(parser, node, PM_ERR_UNEXPECTED_LABEL);
+            } else if (match1(parser, PM_TOKEN_EOF)) {
+                pm_parser_err_token(parser, &opening, PM_ERR_STRING_INTERPOLATED_TERM);
+                node = (pm_node_t *) pm_interpolated_string_node_create(parser, &opening, &parts, &parser->current);
+            } else {
+                expect1(parser, PM_TOKEN_STRING_END, PM_ERR_STRING_INTERPOLATED_TERM);
+                node = (pm_node_t *) pm_interpolated_string_node_create(parser, &opening, &parts, &parser->previous);
+            }
+
+            pm_node_list_free(&parts);
+        }
+
+        if (current == NULL) {
+            // If the node we just parsed is a symbol node, then we can't
+            // concatenate it with anything else, so we can now return that
+            // node.
+            if (PM_NODE_TYPE_P(node, PM_SYMBOL_NODE) || PM_NODE_TYPE_P(node, PM_INTERPOLATED_SYMBOL_NODE)) {
+                return node;
+            }
+
+            // If we don't already have a node, then it's fine and we can just
+            // set the result to be the node we just parsed.
+            current = node;
+        } else {
+            // Otherwise we need to check the type of the node we just parsed.
+            // If it cannot be concatenated with the previous node, then we'll
+            // need to add a syntax error.
+            if (!PM_NODE_TYPE_P(node, PM_STRING_NODE) && !PM_NODE_TYPE_P(node, PM_INTERPOLATED_STRING_NODE)) {
+                pm_parser_err_node(parser, node, PM_ERR_STRING_CONCATENATION);
+            }
+
+            // If we haven't already created our container for concatenation,
+            // we'll do that now.
+            if (!concating) {
+                if (!PM_NODE_TYPE_P(current, PM_STRING_NODE) && !PM_NODE_TYPE_P(current, PM_INTERPOLATED_STRING_NODE)) {
+                    pm_parser_err_node(parser, current, PM_ERR_STRING_CONCATENATION);
+                }
+
+                concating = true;
+                pm_token_t bounds = not_provided(parser);
+
+                pm_interpolated_string_node_t *container = pm_interpolated_string_node_create(parser, &bounds, NULL, &bounds);
+                pm_interpolated_string_node_append(container, current);
+                current = (pm_node_t *) container;
+            }
+
+            pm_interpolated_string_node_append((pm_interpolated_string_node_t *) current, node);
+        }
+    }
+
+    return current;
+}
+
+#define PM_PARSE_PATTERN_SINGLE 0
+#define PM_PARSE_PATTERN_TOP 1
+#define PM_PARSE_PATTERN_MULTI 2
+
+static pm_node_t *
+parse_pattern(pm_parser_t *parser, pm_constant_id_list_t *captures, uint8_t flags, pm_diagnostic_id_t diag_id, uint16_t depth);
+
+/**
+ * Add the newly created local to the list of captures for this pattern matching
+ * expression. If it is duplicated from a previous local, then we'll need to add
+ * an error to the parser.
+ */
+static void
+parse_pattern_capture(pm_parser_t *parser, pm_constant_id_list_t *captures, pm_constant_id_t capture, const pm_location_t *location) {
+    // Skip this capture if it starts with an underscore.
+    if (*location->start == '_') return;
+
+    if (pm_constant_id_list_includes(captures, capture)) {
+        pm_parser_err(parser, location->start, location->end, PM_ERR_PATTERN_CAPTURE_DUPLICATE);
+    } else {
+        pm_constant_id_list_append(captures, capture);
+    }
+}
+
+/**
+ * Accept any number of constants joined by :: delimiters.
+ */
+static pm_node_t *
+parse_pattern_constant_path(pm_parser_t *parser, pm_constant_id_list_t *captures, pm_node_t *node, uint16_t depth) {
+    // Now, if there are any :: operators that follow, parse them as constant
+    // path nodes.
+    while (accept1(parser, PM_TOKEN_COLON_COLON)) {
+        pm_token_t delimiter = parser->previous;
+        expect1(parser, PM_TOKEN_CONSTANT, PM_ERR_CONSTANT_PATH_COLON_COLON_CONSTANT);
+        node = (pm_node_t *) pm_constant_path_node_create(parser, node, &delimiter, &parser->previous);
+    }
+
+    // If there is a [ or ( that follows, then this is part of a larger pattern
+    // expression. We'll parse the inner pattern here, then modify the returned
+    // inner pattern with our constant path attached.
+    if (!match2(parser, PM_TOKEN_BRACKET_LEFT, PM_TOKEN_PARENTHESIS_LEFT)) {
+        return node;
+    }
+
+    pm_token_t opening;
+    pm_token_t closing;
+    pm_node_t *inner = NULL;
+
+    if (accept1(parser, PM_TOKEN_BRACKET_LEFT)) {
+        opening = parser->previous;
+        accept1(parser, PM_TOKEN_NEWLINE);
+
+        if (!accept1(parser, PM_TOKEN_BRACKET_RIGHT)) {
+            inner = parse_pattern(parser, captures, PM_PARSE_PATTERN_TOP | PM_PARSE_PATTERN_MULTI, PM_ERR_PATTERN_EXPRESSION_AFTER_BRACKET, (uint16_t) (depth + 1));
+            accept1(parser, PM_TOKEN_NEWLINE);
+            expect1(parser, PM_TOKEN_BRACKET_RIGHT, PM_ERR_PATTERN_TERM_BRACKET);
+        }
+
+        closing = parser->previous;
+    } else {
+        parser_lex(parser);
+        opening = parser->previous;
+        accept1(parser, PM_TOKEN_NEWLINE);
+
+        if (!accept1(parser, PM_TOKEN_PARENTHESIS_RIGHT)) {
+            inner = parse_pattern(parser, captures, PM_PARSE_PATTERN_TOP | PM_PARSE_PATTERN_MULTI, PM_ERR_PATTERN_EXPRESSION_AFTER_PAREN, (uint16_t) (depth + 1));
+            accept1(parser, PM_TOKEN_NEWLINE);
+            expect1(parser, PM_TOKEN_PARENTHESIS_RIGHT, PM_ERR_PATTERN_TERM_PAREN);
+        }
+
+        closing = parser->previous;
+    }
+
+    if (!inner) {
+        // If there was no inner pattern, then we have something like Foo() or
+        // Foo[]. In that case we'll create an array pattern with no requireds.
+        return (pm_node_t *) pm_array_pattern_node_constant_create(parser, node, &opening, &closing);
+    }
+
+    // Now that we have the inner pattern, check to see if it's an array, find,
+    // or hash pattern. If it is, then we'll attach our constant path to it if
+    // it doesn't already have a constant. If it's not one of those node types
+    // or it does have a constant, then we'll create an array pattern.
+    switch (PM_NODE_TYPE(inner)) {
+        case PM_ARRAY_PATTERN_NODE: {
+            pm_array_pattern_node_t *pattern_node = (pm_array_pattern_node_t *) inner;
+
+            if (pattern_node->constant == NULL && pattern_node->opening_loc.start == NULL) {
+                pattern_node->base.location.start = node->location.start;
+                pattern_node->base.location.end = closing.end;
+
+                pattern_node->constant = node;
+                pattern_node->opening_loc = PM_LOCATION_TOKEN_VALUE(&opening);
+                pattern_node->closing_loc = PM_LOCATION_TOKEN_VALUE(&closing);
+
+                return (pm_node_t *) pattern_node;
+            }
+
+            break;
+        }
+        case PM_FIND_PATTERN_NODE: {
+            pm_find_pattern_node_t *pattern_node = (pm_find_pattern_node_t *) inner;
+
+            if (pattern_node->constant == NULL && pattern_node->opening_loc.start == NULL) {
+                pattern_node->base.location.start = node->location.start;
+                pattern_node->base.location.end = closing.end;
+
+                pattern_node->constant = node;
+                pattern_node->opening_loc = PM_LOCATION_TOKEN_VALUE(&opening);
+                pattern_node->closing_loc = PM_LOCATION_TOKEN_VALUE(&closing);
+
+                return (pm_node_t *) pattern_node;
+            }
+
+            break;
+        }
+        case PM_HASH_PATTERN_NODE: {
+            pm_hash_pattern_node_t *pattern_node = (pm_hash_pattern_node_t *) inner;
+
+            if (pattern_node->constant == NULL && pattern_node->opening_loc.start == NULL) {
+                pattern_node->base.location.start = node->location.start;
+                pattern_node->base.location.end = closing.end;
+
+                pattern_node->constant = node;
+                pattern_node->opening_loc = PM_LOCATION_TOKEN_VALUE(&opening);
+                pattern_node->closing_loc = PM_LOCATION_TOKEN_VALUE(&closing);
+
+                return (pm_node_t *) pattern_node;
+            }
+
+            break;
+        }
+        default:
+            break;
+    }
+
+    // If we got here, then we didn't return one of the inner patterns by
+    // attaching its constant. In this case we'll create an array pattern and
+    // attach our constant to it.
+    pm_array_pattern_node_t *pattern_node = pm_array_pattern_node_constant_create(parser, node, &opening, &closing);
+    pm_array_pattern_node_requireds_append(pattern_node, inner);
+    return (pm_node_t *) pattern_node;
+}
+
+/**
+ * Parse a rest pattern.
+ */
+static pm_splat_node_t *
+parse_pattern_rest(pm_parser_t *parser, pm_constant_id_list_t *captures) {
+    assert(parser->previous.type == PM_TOKEN_USTAR);
+    pm_token_t operator = parser->previous;
+    pm_node_t *name = NULL;
+
+    // Rest patterns don't necessarily have a name associated with them. So we
+    // will check for that here. If they do, then we'll add it to the local
+    // table since this pattern will cause it to become a local variable.
+    if (accept1(parser, PM_TOKEN_IDENTIFIER)) {
+        pm_token_t identifier = parser->previous;
+        pm_constant_id_t constant_id = pm_parser_constant_id_token(parser, &identifier);
+
+        int depth;
+        if ((depth = pm_parser_local_depth_constant_id(parser, constant_id)) == -1) {
+            pm_parser_local_add(parser, constant_id, identifier.start, identifier.end, 0);
+        }
+
+        parse_pattern_capture(parser, captures, constant_id, &PM_LOCATION_TOKEN_VALUE(&identifier));
+        name = (pm_node_t *) pm_local_variable_target_node_create(
+            parser,
+            &PM_LOCATION_TOKEN_VALUE(&identifier),
+            constant_id,
+            (uint32_t) (depth == -1 ? 0 : depth)
+        );
+    }
+
+    // Finally we can return the created node.
+    return pm_splat_node_create(parser, &operator, name);
+}
+
+/**
+ * Parse a keyword rest node.
+ */
+static pm_node_t *
+parse_pattern_keyword_rest(pm_parser_t *parser, pm_constant_id_list_t *captures) {
+    assert(parser->current.type == PM_TOKEN_USTAR_STAR);
+    parser_lex(parser);
+
+    pm_token_t operator = parser->previous;
+    pm_node_t *value = NULL;
+
+    if (accept1(parser, PM_TOKEN_KEYWORD_NIL)) {
+        return (pm_node_t *) pm_no_keywords_parameter_node_create(parser, &operator, &parser->previous);
+    }
+
+    if (accept1(parser, PM_TOKEN_IDENTIFIER)) {
+        pm_constant_id_t constant_id = pm_parser_constant_id_token(parser, &parser->previous);
+
+        int depth;
+        if ((depth = pm_parser_local_depth_constant_id(parser, constant_id)) == -1) {
+            pm_parser_local_add(parser, constant_id, parser->previous.start, parser->previous.end, 0);
+        }
+
+        parse_pattern_capture(parser, captures, constant_id, &PM_LOCATION_TOKEN_VALUE(&parser->previous));
+        value = (pm_node_t *) pm_local_variable_target_node_create(
+            parser,
+            &PM_LOCATION_TOKEN_VALUE(&parser->previous),
+            constant_id,
+            (uint32_t) (depth == -1 ? 0 : depth)
+        );
+    }
+
+    return (pm_node_t *) pm_assoc_splat_node_create(parser, value, &operator);
+}
+
+/**
+ * Check that the slice of the source given by the bounds parameters constitutes
+ * a valid local variable name.
+ */
+static bool
+pm_slice_is_valid_local(const pm_parser_t *parser, const uint8_t *start, const uint8_t *end) {
+    ptrdiff_t length = end - start;
+    if (length == 0) return false;
+
+    // First ensure that it starts with a valid identifier starting character.
+    size_t width = char_is_identifier_start(parser, start, end - start);
+    if (width == 0) return false;
+
+    // Next, ensure that it's not an uppercase character.
+    if (parser->encoding_changed) {
+        if (parser->encoding->isupper_char(start, length)) return false;
+    } else {
+        if (pm_encoding_utf_8_isupper_char(start, length)) return false;
+    }
+
+    // Next, iterate through all of the bytes of the string to ensure that they
+    // are all valid identifier characters.
+    const uint8_t *cursor = start + width;
+    while ((width = char_is_identifier(parser, cursor, end - cursor))) cursor += width;
+    return cursor == end;
+}
+
+/**
+ * Create an implicit node for the value of a hash pattern that has omitted the
+ * value. This will use an implicit local variable target.
+ */
+static pm_node_t *
+parse_pattern_hash_implicit_value(pm_parser_t *parser, pm_constant_id_list_t *captures, pm_symbol_node_t *key) {
+    const pm_location_t *value_loc = &((pm_symbol_node_t *) key)->value_loc;
+
+    pm_constant_id_t constant_id = pm_parser_constant_id_location(parser, value_loc->start, value_loc->end);
+    int depth = -1;
+
+    if (pm_slice_is_valid_local(parser, value_loc->start, value_loc->end)) {
+        depth = pm_parser_local_depth_constant_id(parser, constant_id);
+    } else {
+        pm_parser_err(parser, key->base.location.start, key->base.location.end, PM_ERR_PATTERN_HASH_KEY_LOCALS);
+
+        if ((value_loc->end > value_loc->start) && ((value_loc->end[-1] == '!') || (value_loc->end[-1] == '?'))) {
+            PM_PARSER_ERR_LOCATION_FORMAT(parser, value_loc, PM_ERR_INVALID_LOCAL_VARIABLE_WRITE, (int) (value_loc->end - value_loc->start), (const char *) value_loc->start);
+        }
+    }
+
+    if (depth == -1) {
+        pm_parser_local_add(parser, constant_id, value_loc->start, value_loc->end, 0);
+    }
+
+    parse_pattern_capture(parser, captures, constant_id, value_loc);
+    pm_local_variable_target_node_t *target = pm_local_variable_target_node_create(
+        parser,
+        value_loc,
+        constant_id,
+        (uint32_t) (depth == -1 ? 0 : depth)
+    );
+
+    return (pm_node_t *) pm_implicit_node_create(parser, (pm_node_t *) target);
+}
+
+/**
+ * Add a node to the list of keys for a hash pattern, and if it is a duplicate
+ * then add an error to the parser.
+ */
+static void
+parse_pattern_hash_key(pm_parser_t *parser, pm_static_literals_t *keys, pm_node_t *node) {
+    if (pm_static_literals_add(&parser->newline_list, parser->start_line, keys, node, true) != NULL) {
+        pm_parser_err_node(parser, node, PM_ERR_PATTERN_HASH_KEY_DUPLICATE);
+    }
+}
+
+/**
+ * Parse a hash pattern.
+ */
+static pm_hash_pattern_node_t *
+parse_pattern_hash(pm_parser_t *parser, pm_constant_id_list_t *captures, pm_node_t *first_node, uint16_t depth) {
+    pm_node_list_t assocs = { 0 };
+    pm_static_literals_t keys = { 0 };
+    pm_node_t *rest = NULL;
+
+    switch (PM_NODE_TYPE(first_node)) {
+        case PM_ASSOC_SPLAT_NODE:
+        case PM_NO_KEYWORDS_PARAMETER_NODE:
+            rest = first_node;
+            break;
+        case PM_SYMBOL_NODE: {
+            if (pm_symbol_node_label_p(first_node)) {
+                parse_pattern_hash_key(parser, &keys, first_node);
+                pm_node_t *value;
+
+                if (match8(parser, PM_TOKEN_COMMA, PM_TOKEN_KEYWORD_THEN, PM_TOKEN_BRACE_RIGHT, PM_TOKEN_BRACKET_RIGHT, PM_TOKEN_PARENTHESIS_RIGHT, PM_TOKEN_NEWLINE, PM_TOKEN_SEMICOLON, PM_TOKEN_EOF)) {
+                    // Otherwise, we will create an implicit local variable
+                    // target for the value.
+                    value = parse_pattern_hash_implicit_value(parser, captures, (pm_symbol_node_t *) first_node);
+                } else {
+                    // Here we have a value for the first assoc in the list, so
+                    // we will parse it now.
+                    value = parse_pattern(parser, captures, PM_PARSE_PATTERN_SINGLE, PM_ERR_PATTERN_EXPRESSION_AFTER_KEY, (uint16_t) (depth + 1));
+                }
+
+                pm_token_t operator = not_provided(parser);
+                pm_node_t *assoc = (pm_node_t *) pm_assoc_node_create(parser, first_node, &operator, value);
+
+                pm_node_list_append(&assocs, assoc);
+                break;
+            }
+        }
+        PRISM_FALLTHROUGH
+        default: {
+            // If we get anything else, then this is an error. For this we'll
+            // create a missing node for the value and create an assoc node for
+            // the first node in the list.
+            pm_diagnostic_id_t diag_id = PM_NODE_TYPE_P(first_node, PM_INTERPOLATED_SYMBOL_NODE) ? PM_ERR_PATTERN_HASH_KEY_INTERPOLATED : PM_ERR_PATTERN_HASH_KEY_LABEL;
+            pm_parser_err_node(parser, first_node, diag_id);
+
+            pm_token_t operator = not_provided(parser);
+            pm_node_t *value = (pm_node_t *) pm_missing_node_create(parser, first_node->location.start, first_node->location.end);
+            pm_node_t *assoc = (pm_node_t *) pm_assoc_node_create(parser, first_node, &operator, value);
+
+            pm_node_list_append(&assocs, assoc);
+            break;
+        }
+    }
+
+    // If there are any other assocs, then we'll parse them now.
+    while (accept1(parser, PM_TOKEN_COMMA)) {
+        // Here we need to break to support trailing commas.
+        if (match7(parser, PM_TOKEN_KEYWORD_THEN, PM_TOKEN_BRACE_RIGHT, PM_TOKEN_BRACKET_RIGHT, PM_TOKEN_PARENTHESIS_RIGHT, PM_TOKEN_NEWLINE, PM_TOKEN_SEMICOLON, PM_TOKEN_EOF)) {
+            // Trailing commas are not allowed to follow a rest pattern.
+            if (rest != NULL) {
+                pm_parser_err_token(parser, &parser->current, PM_ERR_PATTERN_EXPRESSION_AFTER_REST);
+            }
+
+            break;
+        }
+
+        if (match1(parser, PM_TOKEN_USTAR_STAR)) {
+            pm_node_t *assoc = parse_pattern_keyword_rest(parser, captures);
+
+            if (rest == NULL) {
+                rest = assoc;
+            } else {
+                pm_parser_err_node(parser, assoc, PM_ERR_PATTERN_EXPRESSION_AFTER_REST);
+                pm_node_list_append(&assocs, assoc);
+            }
+        } else {
+            pm_node_t *key;
+
+            if (match1(parser, PM_TOKEN_STRING_BEGIN)) {
+                key = parse_strings(parser, NULL, true, (uint16_t) (depth + 1));
+
+                if (PM_NODE_TYPE_P(key, PM_INTERPOLATED_SYMBOL_NODE)) {
+                    pm_parser_err_node(parser, key, PM_ERR_PATTERN_HASH_KEY_INTERPOLATED);
+                } else if (!pm_symbol_node_label_p(key)) {
+                    pm_parser_err_node(parser, key, PM_ERR_PATTERN_LABEL_AFTER_COMMA);
+                }
+            } else {
+                expect1(parser, PM_TOKEN_LABEL, PM_ERR_PATTERN_LABEL_AFTER_COMMA);
+                key = (pm_node_t *) pm_symbol_node_label_create(parser, &parser->previous);
+            }
+
+            parse_pattern_hash_key(parser, &keys, key);
+            pm_node_t *value = NULL;
+
+            if (match7(parser, PM_TOKEN_COMMA, PM_TOKEN_KEYWORD_THEN, PM_TOKEN_BRACE_RIGHT, PM_TOKEN_BRACKET_RIGHT, PM_TOKEN_PARENTHESIS_RIGHT, PM_TOKEN_NEWLINE, PM_TOKEN_SEMICOLON)) {
+                value = parse_pattern_hash_implicit_value(parser, captures, (pm_symbol_node_t *) key);
+            } else {
+                value = parse_pattern(parser, captures, PM_PARSE_PATTERN_SINGLE, PM_ERR_PATTERN_EXPRESSION_AFTER_KEY, (uint16_t) (depth + 1));
+            }
+
+            pm_token_t operator = not_provided(parser);
+            pm_node_t *assoc = (pm_node_t *) pm_assoc_node_create(parser, key, &operator, value);
+
+            if (rest != NULL) {
+                pm_parser_err_node(parser, assoc, PM_ERR_PATTERN_EXPRESSION_AFTER_REST);
+            }
+
+            pm_node_list_append(&assocs, assoc);
+        }
+    }
+
+    pm_hash_pattern_node_t *node = pm_hash_pattern_node_node_list_create(parser, &assocs, rest);
+    xfree(assocs.nodes);
+
+    pm_static_literals_free(&keys);
+    return node;
+}
+
+/**
+ * Parse a pattern expression primitive.
+ */
+static pm_node_t *
+parse_pattern_primitive(pm_parser_t *parser, pm_constant_id_list_t *captures, pm_diagnostic_id_t diag_id, uint16_t depth) {
+    switch (parser->current.type) {
+        case PM_TOKEN_IDENTIFIER:
+        case PM_TOKEN_METHOD_NAME: {
+            parser_lex(parser);
+            pm_constant_id_t constant_id = pm_parser_constant_id_token(parser, &parser->previous);
+
+            int depth;
+            if ((depth = pm_parser_local_depth_constant_id(parser, constant_id)) == -1) {
+                pm_parser_local_add(parser, constant_id, parser->previous.start, parser->previous.end, 0);
+            }
+
+            parse_pattern_capture(parser, captures, constant_id, &PM_LOCATION_TOKEN_VALUE(&parser->previous));
+            return (pm_node_t *) pm_local_variable_target_node_create(
+                parser,
+                &PM_LOCATION_TOKEN_VALUE(&parser->previous),
+                constant_id,
+                (uint32_t) (depth == -1 ? 0 : depth)
+            );
+        }
+        case PM_TOKEN_BRACKET_LEFT_ARRAY: {
+            pm_token_t opening = parser->current;
+            parser_lex(parser);
+
+            if (accept1(parser, PM_TOKEN_BRACKET_RIGHT)) {
+                // If we have an empty array pattern, then we'll just return a new
+                // array pattern node.
+                return (pm_node_t *) pm_array_pattern_node_empty_create(parser, &opening, &parser->previous);
+            }
+
+            // Otherwise, we'll parse the inner pattern, then deal with it depending
+            // on the type it returns.
+            pm_node_t *inner = parse_pattern(parser, captures, PM_PARSE_PATTERN_MULTI, PM_ERR_PATTERN_EXPRESSION_AFTER_BRACKET, (uint16_t) (depth + 1));
+
+            accept1(parser, PM_TOKEN_NEWLINE);
+            expect1(parser, PM_TOKEN_BRACKET_RIGHT, PM_ERR_PATTERN_TERM_BRACKET);
+            pm_token_t closing = parser->previous;
+
+            switch (PM_NODE_TYPE(inner)) {
+                case PM_ARRAY_PATTERN_NODE: {
+                    pm_array_pattern_node_t *pattern_node = (pm_array_pattern_node_t *) inner;
+                    if (pattern_node->opening_loc.start == NULL) {
+                        pattern_node->base.location.start = opening.start;
+                        pattern_node->base.location.end = closing.end;
+
+                        pattern_node->opening_loc = PM_LOCATION_TOKEN_VALUE(&opening);
+                        pattern_node->closing_loc = PM_LOCATION_TOKEN_VALUE(&closing);
+
+                        return (pm_node_t *) pattern_node;
+                    }
+
+                    break;
+                }
+                case PM_FIND_PATTERN_NODE: {
+                    pm_find_pattern_node_t *pattern_node = (pm_find_pattern_node_t *) inner;
+                    if (pattern_node->opening_loc.start == NULL) {
+                        pattern_node->base.location.start = opening.start;
+                        pattern_node->base.location.end = closing.end;
+
+                        pattern_node->opening_loc = PM_LOCATION_TOKEN_VALUE(&opening);
+                        pattern_node->closing_loc = PM_LOCATION_TOKEN_VALUE(&closing);
+
+                        return (pm_node_t *) pattern_node;
+                    }
+
+                    break;
+                }
+                default:
+                    break;
+            }
+
+            pm_array_pattern_node_t *node = pm_array_pattern_node_empty_create(parser, &opening, &closing);
+            pm_array_pattern_node_requireds_append(node, inner);
+            return (pm_node_t *) node;
+        }
+        case PM_TOKEN_BRACE_LEFT: {
+            bool previous_pattern_matching_newlines = parser->pattern_matching_newlines;
+            parser->pattern_matching_newlines = false;
+
+            pm_hash_pattern_node_t *node;
+            pm_token_t opening = parser->current;
+            parser_lex(parser);
+
+            if (accept1(parser, PM_TOKEN_BRACE_RIGHT)) {
+                // If we have an empty hash pattern, then we'll just return a new hash
+                // pattern node.
+                node = pm_hash_pattern_node_empty_create(parser, &opening, &parser->previous);
+            } else {
+                pm_node_t *first_node;
+
+                switch (parser->current.type) {
+                    case PM_TOKEN_LABEL:
+                        parser_lex(parser);
+                        first_node = (pm_node_t *) pm_symbol_node_label_create(parser, &parser->previous);
+                        break;
+                    case PM_TOKEN_USTAR_STAR:
+                        first_node = parse_pattern_keyword_rest(parser, captures);
+                        break;
+                    case PM_TOKEN_STRING_BEGIN:
+                        first_node = parse_expression(parser, PM_BINDING_POWER_MAX, false, true, PM_ERR_PATTERN_HASH_KEY_LABEL, (uint16_t) (depth + 1));
+                        break;
+                    default: {
+                        PM_PARSER_ERR_TOKEN_FORMAT(parser, parser->current, PM_ERR_PATTERN_HASH_KEY, pm_token_type_human(parser->current.type));
+                        parser_lex(parser);
+
+                        first_node = (pm_node_t *) pm_missing_node_create(parser, parser->previous.start, parser->previous.end);
+                        break;
+                    }
+                }
+
+                node = parse_pattern_hash(parser, captures, first_node, (uint16_t) (depth + 1));
+
+                accept1(parser, PM_TOKEN_NEWLINE);
+                expect1(parser, PM_TOKEN_BRACE_RIGHT, PM_ERR_PATTERN_TERM_BRACE);
+                pm_token_t closing = parser->previous;
+
+                node->base.location.start = opening.start;
+                node->base.location.end = closing.end;
+
+                node->opening_loc = PM_LOCATION_TOKEN_VALUE(&opening);
+                node->closing_loc = PM_LOCATION_TOKEN_VALUE(&closing);
+            }
+
+            parser->pattern_matching_newlines = previous_pattern_matching_newlines;
+            return (pm_node_t *) node;
+        }
+        case PM_TOKEN_UDOT_DOT:
+        case PM_TOKEN_UDOT_DOT_DOT: {
+            pm_token_t operator = parser->current;
+            parser_lex(parser);
+
+            // Since we have a unary range operator, we need to parse the subsequent
+            // expression as the right side of the range.
+            switch (parser->current.type) {
+                case PM_CASE_PRIMITIVE: {
+                    pm_node_t *right = parse_expression(parser, PM_BINDING_POWER_MAX, false, false, PM_ERR_PATTERN_EXPRESSION_AFTER_RANGE, (uint16_t) (depth + 1));
+                    return (pm_node_t *) pm_range_node_create(parser, NULL, &operator, right);
+                }
+                default: {
+                    pm_parser_err_token(parser, &operator, PM_ERR_PATTERN_EXPRESSION_AFTER_RANGE);
+                    pm_node_t *right = (pm_node_t *) pm_missing_node_create(parser, operator.start, operator.end);
+                    return (pm_node_t *) pm_range_node_create(parser, NULL, &operator, right);
+                }
+            }
+        }
+        case PM_CASE_PRIMITIVE: {
+            pm_node_t *node = parse_expression(parser, PM_BINDING_POWER_MAX, false, true, diag_id, (uint16_t) (depth + 1));
+
+            // If we found a label, we need to immediately return to the caller.
+            if (pm_symbol_node_label_p(node)) return node;
+
+            // Now that we have a primitive, we need to check if it's part of a range.
+            if (accept2(parser, PM_TOKEN_DOT_DOT, PM_TOKEN_DOT_DOT_DOT)) {
+                pm_token_t operator = parser->previous;
+
+                // Now that we have the operator, we need to check if this is followed
+                // by another expression. If it is, then we will create a full range
+                // node. Otherwise, we'll create an endless range.
+                switch (parser->current.type) {
+                    case PM_CASE_PRIMITIVE: {
+                        pm_node_t *right = parse_expression(parser, PM_BINDING_POWER_MAX, false, false, PM_ERR_PATTERN_EXPRESSION_AFTER_RANGE, (uint16_t) (depth + 1));
+                        return (pm_node_t *) pm_range_node_create(parser, node, &operator, right);
+                    }
+                    default:
+                        return (pm_node_t *) pm_range_node_create(parser, node, &operator, NULL);
+                }
+            }
+
+            return node;
+        }
+        case PM_TOKEN_CARET: {
+            parser_lex(parser);
+            pm_token_t operator = parser->previous;
+
+            // At this point we have a pin operator. We need to check the subsequent
+            // expression to determine if it's a variable or an expression.
+            switch (parser->current.type) {
+                case PM_TOKEN_IDENTIFIER: {
+                    parser_lex(parser);
+                    pm_node_t *variable = (pm_node_t *) parse_variable(parser);
+
+                    if (variable == NULL) {
+                        PM_PARSER_ERR_TOKEN_FORMAT_CONTENT(parser, parser->previous, PM_ERR_NO_LOCAL_VARIABLE);
+                        variable = (pm_node_t *) pm_local_variable_read_node_missing_create(parser, &parser->previous, 0);
+                    }
+
+                    return (pm_node_t *) pm_pinned_variable_node_create(parser, &operator, variable);
+                }
+                case PM_TOKEN_INSTANCE_VARIABLE: {
+                    parser_lex(parser);
+                    pm_node_t *variable = (pm_node_t *) pm_instance_variable_read_node_create(parser, &parser->previous);
+
+                    return (pm_node_t *) pm_pinned_variable_node_create(parser, &operator, variable);
+                }
+                case PM_TOKEN_CLASS_VARIABLE: {
+                    parser_lex(parser);
+                    pm_node_t *variable = (pm_node_t *) pm_class_variable_read_node_create(parser, &parser->previous);
+
+                    return (pm_node_t *) pm_pinned_variable_node_create(parser, &operator, variable);
+                }
+                case PM_TOKEN_GLOBAL_VARIABLE: {
+                    parser_lex(parser);
+                    pm_node_t *variable = (pm_node_t *) pm_global_variable_read_node_create(parser, &parser->previous);
+
+                    return (pm_node_t *) pm_pinned_variable_node_create(parser, &operator, variable);
+                }
+                case PM_TOKEN_NUMBERED_REFERENCE: {
+                    parser_lex(parser);
+                    pm_node_t *variable = (pm_node_t *) pm_numbered_reference_read_node_create(parser, &parser->previous);
+
+                    return (pm_node_t *) pm_pinned_variable_node_create(parser, &operator, variable);
+                }
+                case PM_TOKEN_BACK_REFERENCE: {
+                    parser_lex(parser);
+                    pm_node_t *variable = (pm_node_t *) pm_back_reference_read_node_create(parser, &parser->previous);
+
+                    return (pm_node_t *) pm_pinned_variable_node_create(parser, &operator, variable);
+                }
+                case PM_TOKEN_PARENTHESIS_LEFT: {
+                    bool previous_pattern_matching_newlines = parser->pattern_matching_newlines;
+                    parser->pattern_matching_newlines = false;
+
+                    pm_token_t lparen = parser->current;
+                    parser_lex(parser);
+
+                    pm_node_t *expression = parse_value_expression(parser, PM_BINDING_POWER_STATEMENT, true, false, PM_ERR_PATTERN_EXPRESSION_AFTER_PIN, (uint16_t) (depth + 1));
+                    parser->pattern_matching_newlines = previous_pattern_matching_newlines;
+
+                    accept1(parser, PM_TOKEN_NEWLINE);
+                    expect1(parser, PM_TOKEN_PARENTHESIS_RIGHT, PM_ERR_PATTERN_TERM_PAREN);
+                    return (pm_node_t *) pm_pinned_expression_node_create(parser, expression, &operator, &lparen, &parser->previous);
+                }
+                default: {
+                    // If we get here, then we have a pin operator followed by something
+                    // not understood. We'll create a missing node and return that.
+                    pm_parser_err_token(parser, &operator, PM_ERR_PATTERN_EXPRESSION_AFTER_PIN);
+                    pm_node_t *variable = (pm_node_t *) pm_missing_node_create(parser, operator.start, operator.end);
+                    return (pm_node_t *) pm_pinned_variable_node_create(parser, &operator, variable);
+                }
+            }
+        }
+        case PM_TOKEN_UCOLON_COLON: {
+            pm_token_t delimiter = parser->current;
+            parser_lex(parser);
+
+            expect1(parser, PM_TOKEN_CONSTANT, PM_ERR_CONSTANT_PATH_COLON_COLON_CONSTANT);
+            pm_constant_path_node_t *node = pm_constant_path_node_create(parser, NULL, &delimiter, &parser->previous);
+
+            return parse_pattern_constant_path(parser, captures, (pm_node_t *) node, (uint16_t) (depth + 1));
+        }
+        case PM_TOKEN_CONSTANT: {
+            pm_token_t constant = parser->current;
+            parser_lex(parser);
+
+            pm_node_t *node = (pm_node_t *) pm_constant_read_node_create(parser, &constant);
+            return parse_pattern_constant_path(parser, captures, node, (uint16_t) (depth + 1));
+        }
+        default:
+            pm_parser_err_current(parser, diag_id);
+            return (pm_node_t *) pm_missing_node_create(parser, parser->current.start, parser->current.end);
+    }
+}
+
+/**
+ * Parse any number of primitives joined by alternation and ended optionally by
+ * assignment.
+ */
+static pm_node_t *
+parse_pattern_primitives(pm_parser_t *parser, pm_constant_id_list_t *captures, pm_node_t *first_node, pm_diagnostic_id_t diag_id, uint16_t depth) {
+    pm_node_t *node = first_node;
+
+    while ((node == NULL) || accept1(parser, PM_TOKEN_PIPE)) {
+        pm_token_t operator = parser->previous;
+
+        switch (parser->current.type) {
+            case PM_TOKEN_IDENTIFIER:
+            case PM_TOKEN_BRACKET_LEFT_ARRAY:
+            case PM_TOKEN_BRACE_LEFT:
+            case PM_TOKEN_CARET:
+            case PM_TOKEN_CONSTANT:
+            case PM_TOKEN_UCOLON_COLON:
+            case PM_TOKEN_UDOT_DOT:
+            case PM_TOKEN_UDOT_DOT_DOT:
+            case PM_CASE_PRIMITIVE: {
+                if (node == NULL) {
+                    node = parse_pattern_primitive(parser, captures, diag_id, (uint16_t) (depth + 1));
+                } else {
+                    pm_node_t *right = parse_pattern_primitive(parser, captures, PM_ERR_PATTERN_EXPRESSION_AFTER_PIPE, (uint16_t) (depth + 1));
+                    node = (pm_node_t *) pm_alternation_pattern_node_create(parser, node, right, &operator);
+                }
+
+                break;
+            }
+            case PM_TOKEN_PARENTHESIS_LEFT:
+            case PM_TOKEN_PARENTHESIS_LEFT_PARENTHESES: {
+                pm_token_t opening = parser->current;
+                parser_lex(parser);
+
+                pm_node_t *body = parse_pattern(parser, captures, PM_PARSE_PATTERN_SINGLE, PM_ERR_PATTERN_EXPRESSION_AFTER_PAREN, (uint16_t) (depth + 1));
+                accept1(parser, PM_TOKEN_NEWLINE);
+                expect1(parser, PM_TOKEN_PARENTHESIS_RIGHT, PM_ERR_PATTERN_TERM_PAREN);
+                pm_node_t *right = (pm_node_t *) pm_parentheses_node_create(parser, &opening, body, &parser->previous, 0);
+
+                if (node == NULL) {
+                    node = right;
+                } else {
+                    node = (pm_node_t *) pm_alternation_pattern_node_create(parser, node, right, &operator);
+                }
+
+                break;
+            }
+            default: {
+                pm_parser_err_current(parser, diag_id);
+                pm_node_t *right = (pm_node_t *) pm_missing_node_create(parser, parser->current.start, parser->current.end);
+
+                if (node == NULL) {
+                    node = right;
+                } else {
+                    node = (pm_node_t *) pm_alternation_pattern_node_create(parser, node, right, &operator);
+                }
+
+                break;
+            }
+        }
+    }
+
+    // If we have an =>, then we are assigning this pattern to a variable.
+    // In this case we should create an assignment node.
+    while (accept1(parser, PM_TOKEN_EQUAL_GREATER)) {
+        pm_token_t operator = parser->previous;
+        expect1(parser, PM_TOKEN_IDENTIFIER, PM_ERR_PATTERN_IDENT_AFTER_HROCKET);
+
+        pm_constant_id_t constant_id = pm_parser_constant_id_token(parser, &parser->previous);
+        int depth;
+
+        if ((depth = pm_parser_local_depth_constant_id(parser, constant_id)) == -1) {
+            pm_parser_local_add(parser, constant_id, parser->previous.start, parser->previous.end, 0);
+        }
+
+        parse_pattern_capture(parser, captures, constant_id, &PM_LOCATION_TOKEN_VALUE(&parser->previous));
+        pm_local_variable_target_node_t *target = pm_local_variable_target_node_create(
+            parser,
+            &PM_LOCATION_TOKEN_VALUE(&parser->previous),
+            constant_id,
+            (uint32_t) (depth == -1 ? 0 : depth)
+        );
+
+        node = (pm_node_t *) pm_capture_pattern_node_create(parser, node, target, &operator);
+    }
+
+    return node;
+}
+
+/**
+ * Parse a pattern matching expression.
+ */
+static pm_node_t *
+parse_pattern(pm_parser_t *parser, pm_constant_id_list_t *captures, uint8_t flags, pm_diagnostic_id_t diag_id, uint16_t depth) {
+    pm_node_t *node = NULL;
+
+    bool leading_rest = false;
+    bool trailing_rest = false;
+
+    switch (parser->current.type) {
+        case PM_TOKEN_LABEL: {
+            parser_lex(parser);
+            pm_node_t *key = (pm_node_t *) pm_symbol_node_label_create(parser, &parser->previous);
+            node = (pm_node_t *) parse_pattern_hash(parser, captures, key, (uint16_t) (depth + 1));
+
+            if (!(flags & PM_PARSE_PATTERN_TOP)) {
+                pm_parser_err_node(parser, node, PM_ERR_PATTERN_HASH_IMPLICIT);
+            }
+
+            return node;
+        }
+        case PM_TOKEN_USTAR_STAR: {
+            node = parse_pattern_keyword_rest(parser, captures);
+            node = (pm_node_t *) parse_pattern_hash(parser, captures, node, (uint16_t) (depth + 1));
+
+            if (!(flags & PM_PARSE_PATTERN_TOP)) {
+                pm_parser_err_node(parser, node, PM_ERR_PATTERN_HASH_IMPLICIT);
+            }
+
+            return node;
+        }
+        case PM_TOKEN_STRING_BEGIN: {
+            // We need special handling for string beginnings because they could
+            // be dynamic symbols leading to hash patterns.
+            node = parse_pattern_primitive(parser, captures, diag_id, (uint16_t) (depth + 1));
+
+            if (pm_symbol_node_label_p(node)) {
+                node = (pm_node_t *) parse_pattern_hash(parser, captures, node, (uint16_t) (depth + 1));
+
+                if (!(flags & PM_PARSE_PATTERN_TOP)) {
+                    pm_parser_err_node(parser, node, PM_ERR_PATTERN_HASH_IMPLICIT);
+                }
+
+                return node;
+            }
+
+            node = parse_pattern_primitives(parser, captures, node, diag_id, (uint16_t) (depth + 1));
+            break;
+        }
+        case PM_TOKEN_USTAR: {
+            if (flags & (PM_PARSE_PATTERN_TOP | PM_PARSE_PATTERN_MULTI)) {
+                parser_lex(parser);
+                node = (pm_node_t *) parse_pattern_rest(parser, captures);
+                leading_rest = true;
+                break;
+            }
+        }
+        PRISM_FALLTHROUGH
+        default:
+            node = parse_pattern_primitives(parser, captures, NULL, diag_id, (uint16_t) (depth + 1));
+            break;
+    }
+
+    // If we got a dynamic label symbol, then we need to treat it like the
+    // beginning of a hash pattern.
+    if (pm_symbol_node_label_p(node)) {
+        return (pm_node_t *) parse_pattern_hash(parser, captures, node, (uint16_t) (depth + 1));
+    }
+
+    if ((flags & PM_PARSE_PATTERN_MULTI) && match1(parser, PM_TOKEN_COMMA)) {
+        // If we have a comma, then we are now parsing either an array pattern
+        // or a find pattern. We need to parse all of the patterns, put them
+        // into a big list, and then determine which type of node we have.
+        pm_node_list_t nodes = { 0 };
+        pm_node_list_append(&nodes, node);
+
+        // Gather up all of the patterns into the list.
+        while (accept1(parser, PM_TOKEN_COMMA)) {
+            // Break early here in case we have a trailing comma.
+            if (match9(parser, PM_TOKEN_KEYWORD_THEN, PM_TOKEN_BRACE_RIGHT, PM_TOKEN_BRACKET_RIGHT, PM_TOKEN_PARENTHESIS_RIGHT, PM_TOKEN_SEMICOLON, PM_TOKEN_NEWLINE, PM_TOKEN_EOF,PM_TOKEN_KEYWORD_AND, PM_TOKEN_KEYWORD_OR)) {
+                node = (pm_node_t *) pm_implicit_rest_node_create(parser, &parser->previous);
+                pm_node_list_append(&nodes, node);
+                trailing_rest = true;
+                break;
+            }
+
+            if (accept1(parser, PM_TOKEN_USTAR)) {
+                node = (pm_node_t *) parse_pattern_rest(parser, captures);
+
+                // If we have already parsed a splat pattern, then this is an
+                // error. We will continue to parse the rest of the patterns,
+                // but we will indicate it as an error.
+                if (trailing_rest) {
+                    pm_parser_err_previous(parser, PM_ERR_PATTERN_REST);
+                }
+
+                trailing_rest = true;
+            } else {
+                node = parse_pattern_primitives(parser, captures, NULL, PM_ERR_PATTERN_EXPRESSION_AFTER_COMMA, (uint16_t) (depth + 1));
+            }
+
+            pm_node_list_append(&nodes, node);
+        }
+
+        // If the first pattern and the last pattern are rest patterns, then we
+        // will call this a find pattern, regardless of how many rest patterns
+        // are in between because we know we already added the appropriate
+        // errors. Otherwise we will create an array pattern.
+        if (leading_rest && PM_NODE_TYPE_P(nodes.nodes[nodes.size - 1], PM_SPLAT_NODE)) {
+            node = (pm_node_t *) pm_find_pattern_node_create(parser, &nodes);
+
+            if (nodes.size == 2) {
+                pm_parser_err_node(parser, node, PM_ERR_PATTERN_FIND_MISSING_INNER);
+            }
+        } else {
+            node = (pm_node_t *) pm_array_pattern_node_node_list_create(parser, &nodes);
+
+            if (leading_rest && trailing_rest) {
+                pm_parser_err_node(parser, node, PM_ERR_PATTERN_ARRAY_MULTIPLE_RESTS);
+            }
+        }
+
+        xfree(nodes.nodes);
+    } else if (leading_rest) {
+        // Otherwise, if we parsed a single splat pattern, then we know we have
+        // an array pattern, so we can go ahead and create that node.
+        node = (pm_node_t *) pm_array_pattern_node_rest_create(parser, node);
+    }
+
+    return node;
+}
+
+/**
+ * Incorporate a negative sign into a numeric node by subtracting 1 character
+ * from its start bounds. If it's a compound node, then we will recursively
+ * apply this function to its value.
+ */
+static inline void
+parse_negative_numeric(pm_node_t *node) {
+    switch (PM_NODE_TYPE(node)) {
+        case PM_INTEGER_NODE: {
+            pm_integer_node_t *cast = (pm_integer_node_t *) node;
+            cast->base.location.start--;
+            cast->value.negative = true;
+            break;
+        }
+        case PM_FLOAT_NODE: {
+            pm_float_node_t *cast = (pm_float_node_t *) node;
+            cast->base.location.start--;
+            cast->value = -cast->value;
+            break;
+        }
+        case PM_RATIONAL_NODE: {
+            pm_rational_node_t *cast = (pm_rational_node_t *) node;
+            cast->base.location.start--;
+            cast->numerator.negative = true;
+            break;
+        }
+        case PM_IMAGINARY_NODE:
+            node->location.start--;
+            parse_negative_numeric(((pm_imaginary_node_t *) node)->numeric);
+            break;
+        default:
+            assert(false && "unreachable");
+            break;
+    }
+}
+
+/**
+ * Append an error to the error list on the parser using the given diagnostic
+ * ID. This function is a specialization that handles formatting the specific
+ * kind of error that is being appended.
+ */
+static void
+pm_parser_err_prefix(pm_parser_t *parser, pm_diagnostic_id_t diag_id) {
+    switch (diag_id) {
+        case PM_ERR_HASH_KEY: {
+            PM_PARSER_ERR_TOKEN_FORMAT(parser, parser->previous, diag_id, pm_token_type_human(parser->previous.type));
+            break;
+        }
+        case PM_ERR_HASH_VALUE:
+        case PM_ERR_EXPECT_EXPRESSION_AFTER_OPERATOR: {
+            PM_PARSER_ERR_TOKEN_FORMAT(parser, parser->current, diag_id, pm_token_type_human(parser->current.type));
+            break;
+        }
+        case PM_ERR_UNARY_RECEIVER: {
+            const char *human = (parser->current.type == PM_TOKEN_EOF ? "end-of-input" : pm_token_type_human(parser->current.type));
+            PM_PARSER_ERR_TOKEN_FORMAT(parser, parser->previous, diag_id, human, parser->previous.start[0]);
+            break;
+        }
+        case PM_ERR_UNARY_DISALLOWED:
+        case PM_ERR_EXPECT_ARGUMENT: {
+            PM_PARSER_ERR_TOKEN_FORMAT(parser, parser->current, diag_id, pm_token_type_human(parser->current.type));
+            break;
+        }
+        default:
+            pm_parser_err_previous(parser, diag_id);
+            break;
+    }
+}
+
+/**
+ * Ensures that the current retry token is valid in the current context.
+ */
+static void
+parse_retry(pm_parser_t *parser, const pm_node_t *node) {
+#define CONTEXT_NONE 0
+#define CONTEXT_THROUGH_ENSURE 1
+#define CONTEXT_THROUGH_ELSE 2
+
+    pm_context_node_t *context_node = parser->current_context;
+    int context = CONTEXT_NONE;
+
+    while (context_node != NULL) {
+        switch (context_node->context) {
+            case PM_CONTEXT_BEGIN_RESCUE:
+            case PM_CONTEXT_BLOCK_RESCUE:
+            case PM_CONTEXT_CLASS_RESCUE:
+            case PM_CONTEXT_DEF_RESCUE:
+            case PM_CONTEXT_LAMBDA_RESCUE:
+            case PM_CONTEXT_MODULE_RESCUE:
+            case PM_CONTEXT_SCLASS_RESCUE:
+            case PM_CONTEXT_DEFINED:
+            case PM_CONTEXT_RESCUE_MODIFIER:
+                // These are the good cases. We're allowed to have a retry here.
+                return;
+            case PM_CONTEXT_CLASS:
+            case PM_CONTEXT_DEF:
+            case PM_CONTEXT_DEF_PARAMS:
+            case PM_CONTEXT_MAIN:
+            case PM_CONTEXT_MODULE:
+            case PM_CONTEXT_PREEXE:
+            case PM_CONTEXT_SCLASS:
+                // These are the bad cases. We're not allowed to have a retry in
+                // these contexts.
+                if (context == CONTEXT_NONE) {
+                    pm_parser_err_node(parser, node, PM_ERR_INVALID_RETRY_WITHOUT_RESCUE);
+                } else if (context == CONTEXT_THROUGH_ENSURE) {
+                    pm_parser_err_node(parser, node, PM_ERR_INVALID_RETRY_AFTER_ENSURE);
+                } else if (context == CONTEXT_THROUGH_ELSE) {
+                    pm_parser_err_node(parser, node, PM_ERR_INVALID_RETRY_AFTER_ELSE);
+                }
+                return;
+            case PM_CONTEXT_BEGIN_ELSE:
+            case PM_CONTEXT_BLOCK_ELSE:
+            case PM_CONTEXT_CLASS_ELSE:
+            case PM_CONTEXT_DEF_ELSE:
+            case PM_CONTEXT_LAMBDA_ELSE:
+            case PM_CONTEXT_MODULE_ELSE:
+            case PM_CONTEXT_SCLASS_ELSE:
+                // These are also bad cases, but with a more specific error
+                // message indicating the else.
+                context = CONTEXT_THROUGH_ELSE;
+                break;
+            case PM_CONTEXT_BEGIN_ENSURE:
+            case PM_CONTEXT_BLOCK_ENSURE:
+            case PM_CONTEXT_CLASS_ENSURE:
+            case PM_CONTEXT_DEF_ENSURE:
+            case PM_CONTEXT_LAMBDA_ENSURE:
+            case PM_CONTEXT_MODULE_ENSURE:
+            case PM_CONTEXT_SCLASS_ENSURE:
+                // These are also bad cases, but with a more specific error
+                // message indicating the ensure.
+                context = CONTEXT_THROUGH_ENSURE;
+                break;
+            case PM_CONTEXT_NONE:
+                // This case should never happen.
+                assert(false && "unreachable");
+                break;
+            case PM_CONTEXT_BEGIN:
+            case PM_CONTEXT_BLOCK_BRACES:
+            case PM_CONTEXT_BLOCK_KEYWORDS:
+            case PM_CONTEXT_CASE_IN:
+            case PM_CONTEXT_CASE_WHEN:
+            case PM_CONTEXT_DEFAULT_PARAMS:
+            case PM_CONTEXT_ELSE:
+            case PM_CONTEXT_ELSIF:
+            case PM_CONTEXT_EMBEXPR:
+            case PM_CONTEXT_FOR_INDEX:
+            case PM_CONTEXT_FOR:
+            case PM_CONTEXT_IF:
+            case PM_CONTEXT_LAMBDA_BRACES:
+            case PM_CONTEXT_LAMBDA_DO_END:
+            case PM_CONTEXT_LOOP_PREDICATE:
+            case PM_CONTEXT_MULTI_TARGET:
+            case PM_CONTEXT_PARENS:
+            case PM_CONTEXT_POSTEXE:
+            case PM_CONTEXT_PREDICATE:
+            case PM_CONTEXT_TERNARY:
+            case PM_CONTEXT_UNLESS:
+            case PM_CONTEXT_UNTIL:
+            case PM_CONTEXT_WHILE:
+                // In these contexts we should continue walking up the list of
+                // contexts.
+                break;
+        }
+
+        context_node = context_node->prev;
+    }
+
+#undef CONTEXT_NONE
+#undef CONTEXT_ENSURE
+#undef CONTEXT_ELSE
+}
+
+/**
+ * Ensures that the current yield token is valid in the current context.
+ */
+static void
+parse_yield(pm_parser_t *parser, const pm_node_t *node) {
+    pm_context_node_t *context_node = parser->current_context;
+
+    while (context_node != NULL) {
+        switch (context_node->context) {
+            case PM_CONTEXT_DEF:
+            case PM_CONTEXT_DEF_PARAMS:
+            case PM_CONTEXT_DEFINED:
+            case PM_CONTEXT_DEF_ENSURE:
+            case PM_CONTEXT_DEF_RESCUE:
+            case PM_CONTEXT_DEF_ELSE:
+                // These are the good cases. We're allowed to have a block exit
+                // in these contexts.
+                return;
+            case PM_CONTEXT_CLASS:
+            case PM_CONTEXT_CLASS_ENSURE:
+            case PM_CONTEXT_CLASS_RESCUE:
+            case PM_CONTEXT_CLASS_ELSE:
+            case PM_CONTEXT_MAIN:
+            case PM_CONTEXT_MODULE:
+            case PM_CONTEXT_MODULE_ENSURE:
+            case PM_CONTEXT_MODULE_RESCUE:
+            case PM_CONTEXT_MODULE_ELSE:
+            case PM_CONTEXT_SCLASS:
+            case PM_CONTEXT_SCLASS_RESCUE:
+            case PM_CONTEXT_SCLASS_ENSURE:
+            case PM_CONTEXT_SCLASS_ELSE:
+                // These are the bad cases. We're not allowed to have a retry in
+                // these contexts.
+                pm_parser_err_node(parser, node, PM_ERR_INVALID_YIELD);
+                return;
+            case PM_CONTEXT_NONE:
+                // This case should never happen.
+                assert(false && "unreachable");
+                break;
+            case PM_CONTEXT_BEGIN:
+            case PM_CONTEXT_BEGIN_ELSE:
+            case PM_CONTEXT_BEGIN_ENSURE:
+            case PM_CONTEXT_BEGIN_RESCUE:
+            case PM_CONTEXT_BLOCK_BRACES:
+            case PM_CONTEXT_BLOCK_KEYWORDS:
+            case PM_CONTEXT_BLOCK_ELSE:
+            case PM_CONTEXT_BLOCK_ENSURE:
+            case PM_CONTEXT_BLOCK_RESCUE:
+            case PM_CONTEXT_CASE_IN:
+            case PM_CONTEXT_CASE_WHEN:
+            case PM_CONTEXT_DEFAULT_PARAMS:
+            case PM_CONTEXT_ELSE:
+            case PM_CONTEXT_ELSIF:
+            case PM_CONTEXT_EMBEXPR:
+            case PM_CONTEXT_FOR_INDEX:
+            case PM_CONTEXT_FOR:
+            case PM_CONTEXT_IF:
+            case PM_CONTEXT_LAMBDA_BRACES:
+            case PM_CONTEXT_LAMBDA_DO_END:
+            case PM_CONTEXT_LAMBDA_ELSE:
+            case PM_CONTEXT_LAMBDA_ENSURE:
+            case PM_CONTEXT_LAMBDA_RESCUE:
+            case PM_CONTEXT_LOOP_PREDICATE:
+            case PM_CONTEXT_MULTI_TARGET:
+            case PM_CONTEXT_PARENS:
+            case PM_CONTEXT_POSTEXE:
+            case PM_CONTEXT_PREDICATE:
+            case PM_CONTEXT_PREEXE:
+            case PM_CONTEXT_RESCUE_MODIFIER:
+            case PM_CONTEXT_TERNARY:
+            case PM_CONTEXT_UNLESS:
+            case PM_CONTEXT_UNTIL:
+            case PM_CONTEXT_WHILE:
+                // In these contexts we should continue walking up the list of
+                // contexts.
+                break;
+        }
+
+        context_node = context_node->prev;
+    }
+}
+
+/**
+ * This struct is used to pass information between the regular expression parser
+ * and the error callback.
+ */
+typedef struct {
+    /** The parser that we are parsing the regular expression for. */
+    pm_parser_t *parser;
+
+    /** The start of the regular expression. */
+    const uint8_t *start;
+
+    /** The end of the regular expression. */
+    const uint8_t *end;
+
+    /**
+     * Whether or not the source of the regular expression is shared. This
+     * impacts the location of error messages, because if it is shared then we
+     * can use the location directly and if it is not, then we use the bounds of
+     * the regular expression itself.
+     */
+    bool shared;
+} parse_regular_expression_error_data_t;
+
+/**
+ * This callback is called when the regular expression parser encounters a
+ * syntax error.
+ */
+static void
+parse_regular_expression_error(const uint8_t *start, const uint8_t *end, const char *message, void *data) {
+    parse_regular_expression_error_data_t *callback_data = (parse_regular_expression_error_data_t *) data;
+    pm_location_t location;
+
+    if (callback_data->shared) {
+        location = (pm_location_t) { .start = start, .end = end };
+    } else {
+        location = (pm_location_t) { .start = callback_data->start, .end = callback_data->end };
+    }
+
+    PM_PARSER_ERR_FORMAT(callback_data->parser, location.start, location.end, PM_ERR_REGEXP_PARSE_ERROR, message);
+}
+
+/**
+ * Parse the errors for the regular expression and add them to the parser.
+ */
+static void
+parse_regular_expression_errors(pm_parser_t *parser, pm_regular_expression_node_t *node) {
+    const pm_string_t *unescaped = &node->unescaped;
+    parse_regular_expression_error_data_t error_data = {
+        .parser = parser,
+        .start = node->base.location.start,
+        .end = node->base.location.end,
+        .shared = unescaped->type == PM_STRING_SHARED
+    };
+
+    pm_regexp_parse(parser, pm_string_source(unescaped), pm_string_length(unescaped), PM_NODE_FLAG_P(node, PM_REGULAR_EXPRESSION_FLAGS_EXTENDED), NULL, NULL, parse_regular_expression_error, &error_data);
+}
+
+/**
+ * Parse an expression that begins with the previous node that we just lexed.
+ */
+static inline pm_node_t *
+parse_expression_prefix(pm_parser_t *parser, pm_binding_power_t binding_power, bool accepts_command_call, bool accepts_label, pm_diagnostic_id_t diag_id, uint16_t depth) {
+    switch (parser->current.type) {
+        case PM_TOKEN_BRACKET_LEFT_ARRAY: {
+            parser_lex(parser);
+
+            pm_array_node_t *array = pm_array_node_create(parser, &parser->previous);
+            pm_accepts_block_stack_push(parser, true);
+            bool parsed_bare_hash = false;
+
+            while (!match2(parser, PM_TOKEN_BRACKET_RIGHT, PM_TOKEN_EOF)) {
+                bool accepted_newline = accept1(parser, PM_TOKEN_NEWLINE);
+
+                // Handle the case where we don't have a comma and we have a
+                // newline followed by a right bracket.
+                if (accepted_newline && match1(parser, PM_TOKEN_BRACKET_RIGHT)) {
+                    break;
+                }
+
+                // Ensure that we have a comma between elements in the array.
+                if (array->elements.size > 0) {
+                    if (accept1(parser, PM_TOKEN_COMMA)) {
+                        // If there was a comma but we also accepts a newline,
+                        // then this is a syntax error.
+                        if (accepted_newline) {
+                            pm_parser_err_previous(parser, PM_ERR_INVALID_COMMA);
+                        }
+                    } else {
+                        // If there was no comma, then we need to add a syntax
+                        // error.
+                        const uint8_t *location = parser->previous.end;
+                        PM_PARSER_ERR_FORMAT(parser, location, location, PM_ERR_ARRAY_SEPARATOR, pm_token_type_human(parser->current.type));
+
+                        parser->previous.start = location;
+                        parser->previous.type = PM_TOKEN_MISSING;
+                    }
+                }
+
+                // If we have a right bracket immediately following a comma,
+                // this is allowed since it's a trailing comma. In this case we
+                // can break out of the loop.
+                if (match1(parser, PM_TOKEN_BRACKET_RIGHT)) break;
+
+                pm_node_t *element;
+
+                if (accept1(parser, PM_TOKEN_USTAR)) {
+                    pm_token_t operator = parser->previous;
+                    pm_node_t *expression = NULL;
+
+                    if (match3(parser, PM_TOKEN_BRACKET_RIGHT, PM_TOKEN_COMMA, PM_TOKEN_EOF)) {
+                        pm_parser_scope_forwarding_positionals_check(parser, &operator);
+                    } else {
+                        expression = parse_value_expression(parser, PM_BINDING_POWER_DEFINED, false, false, PM_ERR_ARRAY_EXPRESSION_AFTER_STAR, (uint16_t) (depth + 1));
+                    }
+
+                    element = (pm_node_t *) pm_splat_node_create(parser, &operator, expression);
+                } else if (match2(parser, PM_TOKEN_LABEL, PM_TOKEN_USTAR_STAR)) {
+                    if (parsed_bare_hash) {
+                        pm_parser_err_current(parser, PM_ERR_EXPRESSION_BARE_HASH);
+                    }
+
+                    element = (pm_node_t *) pm_keyword_hash_node_create(parser);
+                    pm_static_literals_t hash_keys = { 0 };
+
+                    if (!match8(parser, PM_TOKEN_EOF, PM_TOKEN_NEWLINE, PM_TOKEN_SEMICOLON, PM_TOKEN_EOF, PM_TOKEN_BRACE_RIGHT, PM_TOKEN_BRACKET_RIGHT, PM_TOKEN_KEYWORD_DO, PM_TOKEN_PARENTHESIS_RIGHT)) {
+                        parse_assocs(parser, &hash_keys, element, (uint16_t) (depth + 1));
+                    }
+
+                    pm_static_literals_free(&hash_keys);
+                    parsed_bare_hash = true;
+                } else {
+                    element = parse_value_expression(parser, PM_BINDING_POWER_DEFINED, false, true, PM_ERR_ARRAY_EXPRESSION, (uint16_t) (depth + 1));
+
+                    if (pm_symbol_node_label_p(element) || accept1(parser, PM_TOKEN_EQUAL_GREATER)) {
+                        if (parsed_bare_hash) {
+                            pm_parser_err_previous(parser, PM_ERR_EXPRESSION_BARE_HASH);
+                        }
+
+                        pm_keyword_hash_node_t *hash = pm_keyword_hash_node_create(parser);
+                        pm_static_literals_t hash_keys = { 0 };
+                        pm_hash_key_static_literals_add(parser, &hash_keys, element);
+
+                        pm_token_t operator;
+                        if (parser->previous.type == PM_TOKEN_EQUAL_GREATER) {
+                            operator = parser->previous;
+                        } else {
+                            operator = not_provided(parser);
+                        }
+
+                        pm_node_t *value = parse_value_expression(parser, PM_BINDING_POWER_DEFINED, false, false, PM_ERR_HASH_VALUE, (uint16_t) (depth + 1));
+                        pm_node_t *assoc = (pm_node_t *) pm_assoc_node_create(parser, element, &operator, value);
+                        pm_keyword_hash_node_elements_append(hash, assoc);
+
+                        element = (pm_node_t *) hash;
+                        if (accept1(parser, PM_TOKEN_COMMA) && !match1(parser, PM_TOKEN_BRACKET_RIGHT)) {
+                            parse_assocs(parser, &hash_keys, element, (uint16_t) (depth + 1));
+                        }
+
+                        pm_static_literals_free(&hash_keys);
+                        parsed_bare_hash = true;
+                    }
+                }
+
+                pm_array_node_elements_append(array, element);
+                if (PM_NODE_TYPE_P(element, PM_MISSING_NODE)) break;
+            }
+
+            accept1(parser, PM_TOKEN_NEWLINE);
+
+            if (!accept1(parser, PM_TOKEN_BRACKET_RIGHT)) {
+                PM_PARSER_ERR_TOKEN_FORMAT(parser, parser->current, PM_ERR_ARRAY_TERM, pm_token_type_human(parser->current.type));
+                parser->previous.start = parser->previous.end;
+                parser->previous.type = PM_TOKEN_MISSING;
+            }
+
+            pm_array_node_close_set(array, &parser->previous);
+            pm_accepts_block_stack_pop(parser);
+
+            return (pm_node_t *) array;
+        }
+        case PM_TOKEN_PARENTHESIS_LEFT:
+        case PM_TOKEN_PARENTHESIS_LEFT_PARENTHESES: {
+            pm_token_t opening = parser->current;
+            pm_node_flags_t flags = 0;
+
+            pm_node_list_t current_block_exits = { 0 };
+            pm_node_list_t *previous_block_exits = push_block_exits(parser, &current_block_exits);
+
+            parser_lex(parser);
+            while (true) {
+                if (accept1(parser, PM_TOKEN_SEMICOLON)) {
+                    flags |= PM_PARENTHESES_NODE_FLAGS_MULTIPLE_STATEMENTS;
+                } else if (!accept1(parser, PM_TOKEN_NEWLINE)) {
+                    break;
+                }
+            }
+
+            // If this is the end of the file or we match a right parenthesis, then
+            // we have an empty parentheses node, and we can immediately return.
+            if (match2(parser, PM_TOKEN_PARENTHESIS_RIGHT, PM_TOKEN_EOF)) {
+                expect1(parser, PM_TOKEN_PARENTHESIS_RIGHT, PM_ERR_EXPECT_RPAREN);
+
+                pop_block_exits(parser, previous_block_exits);
+                pm_node_list_free(&current_block_exits);
+
+                return (pm_node_t *) pm_parentheses_node_create(parser, &opening, NULL, &parser->previous, flags);
+            }
+
+            // Otherwise, we're going to parse the first statement in the list
+            // of statements within the parentheses.
+            pm_accepts_block_stack_push(parser, true);
+            context_push(parser, PM_CONTEXT_PARENS);
+            pm_node_t *statement = parse_expression(parser, PM_BINDING_POWER_STATEMENT, true, false, PM_ERR_CANNOT_PARSE_EXPRESSION, (uint16_t) (depth + 1));
+            context_pop(parser);
+
+            // Determine if this statement is followed by a terminator. In the
+            // case of a single statement, this is fine. But in the case of
+            // multiple statements it's required.
+            bool terminator_found = false;
+
+            if (accept1(parser, PM_TOKEN_SEMICOLON)) {
+                terminator_found = true;
+                flags |= PM_PARENTHESES_NODE_FLAGS_MULTIPLE_STATEMENTS;
+            } else if (accept1(parser, PM_TOKEN_NEWLINE)) {
+                terminator_found = true;
+            }
+
+            if (terminator_found) {
+                while (true) {
+                    if (accept1(parser, PM_TOKEN_SEMICOLON)) {
+                        flags |= PM_PARENTHESES_NODE_FLAGS_MULTIPLE_STATEMENTS;
+                    } else if (!accept1(parser, PM_TOKEN_NEWLINE)) {
+                        break;
+                    }
+                }
+            }
+
+            // If we hit a right parenthesis, then we're done parsing the
+            // parentheses node, and we can check which kind of node we should
+            // return.
+            if (match1(parser, PM_TOKEN_PARENTHESIS_RIGHT)) {
+                if (opening.type == PM_TOKEN_PARENTHESIS_LEFT_PARENTHESES) {
+                    lex_state_set(parser, PM_LEX_STATE_ENDARG);
+                }
+
+                parser_lex(parser);
+                pm_accepts_block_stack_pop(parser);
+
+                pop_block_exits(parser, previous_block_exits);
+                pm_node_list_free(&current_block_exits);
+
+                if (PM_NODE_TYPE_P(statement, PM_MULTI_TARGET_NODE) || PM_NODE_TYPE_P(statement, PM_SPLAT_NODE)) {
+                    // If we have a single statement and are ending on a right
+                    // parenthesis, then we need to check if this is possibly a
+                    // multiple target node.
+                    pm_multi_target_node_t *multi_target;
+
+                    if (PM_NODE_TYPE_P(statement, PM_MULTI_TARGET_NODE) && ((pm_multi_target_node_t *) statement)->lparen_loc.start == NULL) {
+                        multi_target = (pm_multi_target_node_t *) statement;
+                    } else {
+                        multi_target = pm_multi_target_node_create(parser);
+                        pm_multi_target_node_targets_append(parser, multi_target, statement);
+                    }
+
+                    pm_location_t lparen_loc = PM_LOCATION_TOKEN_VALUE(&opening);
+                    pm_location_t rparen_loc = PM_LOCATION_TOKEN_VALUE(&parser->previous);
+
+                    multi_target->lparen_loc = lparen_loc;
+                    multi_target->rparen_loc = rparen_loc;
+                    multi_target->base.location.start = lparen_loc.start;
+                    multi_target->base.location.end = rparen_loc.end;
+
+                    pm_node_t *result;
+                    if (match1(parser, PM_TOKEN_COMMA) && (binding_power == PM_BINDING_POWER_STATEMENT)) {
+                        result = parse_targets(parser, (pm_node_t *) multi_target, PM_BINDING_POWER_INDEX, (uint16_t) (depth + 1));
+                        accept1(parser, PM_TOKEN_NEWLINE);
+                    } else {
+                        result = (pm_node_t *) multi_target;
+                    }
+
+                    if (context_p(parser, PM_CONTEXT_MULTI_TARGET)) {
+                        // All set, this is explicitly allowed by the parent
+                        // context.
+                    } else if (context_p(parser, PM_CONTEXT_FOR_INDEX) && match1(parser, PM_TOKEN_KEYWORD_IN)) {
+                        // All set, we're inside a for loop and we're parsing
+                        // multiple targets.
+                    } else if (binding_power != PM_BINDING_POWER_STATEMENT) {
+                        // Multi targets are not allowed when it's not a
+                        // statement level.
+                        pm_parser_err_node(parser, result, PM_ERR_WRITE_TARGET_UNEXPECTED);
+                    } else if (!match2(parser, PM_TOKEN_EQUAL, PM_TOKEN_PARENTHESIS_RIGHT)) {
+                        // Multi targets must be followed by an equal sign in
+                        // order to be valid (or a right parenthesis if they are
+                        // nested).
+                        pm_parser_err_node(parser, result, PM_ERR_WRITE_TARGET_UNEXPECTED);
+                    }
+
+                    return result;
+                }
+
+                // If we have a single statement and are ending on a right parenthesis
+                // and we didn't return a multiple assignment node, then we can return a
+                // regular parentheses node now.
+                pm_statements_node_t *statements = pm_statements_node_create(parser);
+                pm_statements_node_body_append(parser, statements, statement, true);
+
+                return (pm_node_t *) pm_parentheses_node_create(parser, &opening, (pm_node_t *) statements, &parser->previous, flags);
+            }
+
+            // If we have more than one statement in the set of parentheses,
+            // then we are going to parse all of them as a list of statements.
+            // We'll do that here.
+            context_push(parser, PM_CONTEXT_PARENS);
+            flags |= PM_PARENTHESES_NODE_FLAGS_MULTIPLE_STATEMENTS;
+
+            pm_statements_node_t *statements = pm_statements_node_create(parser);
+            pm_statements_node_body_append(parser, statements, statement, true);
+
+            // If we didn't find a terminator and we didn't find a right
+            // parenthesis, then this is a syntax error.
+            if (!terminator_found && !match1(parser, PM_TOKEN_EOF)) {
+                PM_PARSER_ERR_TOKEN_FORMAT(parser, parser->current, PM_ERR_EXPECT_EOL_AFTER_STATEMENT, pm_token_type_human(parser->current.type));
+            }
+
+            // Parse each statement within the parentheses.
+            while (true) {
+                pm_node_t *node = parse_expression(parser, PM_BINDING_POWER_STATEMENT, true, false, PM_ERR_CANNOT_PARSE_EXPRESSION, (uint16_t) (depth + 1));
+                pm_statements_node_body_append(parser, statements, node, true);
+
+                // If we're recovering from a syntax error, then we need to stop
+                // parsing the statements now.
+                if (parser->recovering) {
+                    // If this is the level of context where the recovery has
+                    // happened, then we can mark the parser as done recovering.
+                    if (match1(parser, PM_TOKEN_PARENTHESIS_RIGHT)) parser->recovering = false;
+                    break;
+                }
+
+                // If we couldn't parse an expression at all, then we need to
+                // bail out of the loop.
+                if (PM_NODE_TYPE_P(node, PM_MISSING_NODE)) break;
+
+                // If we successfully parsed a statement, then we are going to
+                // need terminator to delimit them.
+                if (accept2(parser, PM_TOKEN_NEWLINE, PM_TOKEN_SEMICOLON)) {
+                    while (accept2(parser, PM_TOKEN_NEWLINE, PM_TOKEN_SEMICOLON));
+                    if (match1(parser, PM_TOKEN_PARENTHESIS_RIGHT)) break;
+                } else if (match1(parser, PM_TOKEN_PARENTHESIS_RIGHT)) {
+                    break;
+                } else if (!match1(parser, PM_TOKEN_EOF)) {
+                    // If we're at the end of the file, then we're going to add
+                    // an error after this for the ) anyway.
+                    PM_PARSER_ERR_TOKEN_FORMAT(parser, parser->current, PM_ERR_EXPECT_EOL_AFTER_STATEMENT, pm_token_type_human(parser->current.type));
+                }
+            }
+
+            context_pop(parser);
+            pm_accepts_block_stack_pop(parser);
+            expect1(parser, PM_TOKEN_PARENTHESIS_RIGHT, PM_ERR_EXPECT_RPAREN);
+
+            // When we're parsing multi targets, we allow them to be followed by
+            // a right parenthesis if they are at the statement level. This is
+            // only possible if they are the final statement in a parentheses.
+            // We need to explicitly reject that here.
+            {
+                pm_node_t *statement = statements->body.nodes[statements->body.size - 1];
+
+                if (PM_NODE_TYPE_P(statement, PM_SPLAT_NODE)) {
+                    pm_multi_target_node_t *multi_target = pm_multi_target_node_create(parser);
+                    pm_multi_target_node_targets_append(parser, multi_target, statement);
+
+                    statement = (pm_node_t *) multi_target;
+                    statements->body.nodes[statements->body.size - 1] = statement;
+                }
+
+                if (PM_NODE_TYPE_P(statement, PM_MULTI_TARGET_NODE)) {
+                    const uint8_t *offset = statement->location.end;
+                    pm_token_t operator = { .type = PM_TOKEN_EQUAL, .start = offset, .end = offset };
+                    pm_node_t *value = (pm_node_t *) pm_missing_node_create(parser, offset, offset);
+
+                    statement = (pm_node_t *) pm_multi_write_node_create(parser, (pm_multi_target_node_t *) statement, &operator, value);
+                    statements->body.nodes[statements->body.size - 1] = statement;
+
+                    pm_parser_err_node(parser, statement, PM_ERR_WRITE_TARGET_UNEXPECTED);
+                }
+            }
+
+            pop_block_exits(parser, previous_block_exits);
+            pm_node_list_free(&current_block_exits);
+
+            pm_void_statements_check(parser, statements, true);
+            return (pm_node_t *) pm_parentheses_node_create(parser, &opening, (pm_node_t *) statements, &parser->previous, flags);
+        }
+        case PM_TOKEN_BRACE_LEFT: {
+            // If we were passed a current_hash_keys via the parser, then that
+            // means we're already parsing a hash and we want to share the set
+            // of hash keys with this inner hash we're about to parse for the
+            // sake of warnings. We'll set it to NULL after we grab it to make
+            // sure subsequent expressions don't use it. Effectively this is a
+            // way of getting around passing it to every call to
+            // parse_expression.
+            pm_static_literals_t *current_hash_keys = parser->current_hash_keys;
+            parser->current_hash_keys = NULL;
+
+            pm_accepts_block_stack_push(parser, true);
+            parser_lex(parser);
+
+            pm_hash_node_t *node = pm_hash_node_create(parser, &parser->previous);
+
+            if (!match2(parser, PM_TOKEN_BRACE_RIGHT, PM_TOKEN_EOF)) {
+                if (current_hash_keys != NULL) {
+                    parse_assocs(parser, current_hash_keys, (pm_node_t *) node, (uint16_t) (depth + 1));
+                } else {
+                    pm_static_literals_t hash_keys = { 0 };
+                    parse_assocs(parser, &hash_keys, (pm_node_t *) node, (uint16_t) (depth + 1));
+                    pm_static_literals_free(&hash_keys);
+                }
+
+                accept1(parser, PM_TOKEN_NEWLINE);
+            }
+
+            pm_accepts_block_stack_pop(parser);
+            expect1(parser, PM_TOKEN_BRACE_RIGHT, PM_ERR_HASH_TERM);
+            pm_hash_node_closing_loc_set(node, &parser->previous);
+
+            return (pm_node_t *) node;
+        }
+        case PM_TOKEN_CHARACTER_LITERAL: {
+            parser_lex(parser);
+
+            pm_token_t opening = parser->previous;
+            opening.type = PM_TOKEN_STRING_BEGIN;
+            opening.end = opening.start + 1;
+
+            pm_token_t content = parser->previous;
+            content.type = PM_TOKEN_STRING_CONTENT;
+            content.start = content.start + 1;
+
+            pm_token_t closing = not_provided(parser);
+            pm_node_t *node = (pm_node_t *) pm_string_node_create_current_string(parser, &opening, &content, &closing);
+            pm_node_flag_set(node, parse_unescaped_encoding(parser));
+
+            // Characters can be followed by strings in which case they are
+            // automatically concatenated.
+            if (match1(parser, PM_TOKEN_STRING_BEGIN)) {
+                return parse_strings(parser, node, false, (uint16_t) (depth + 1));
+            }
+
+            return node;
+        }
+        case PM_TOKEN_CLASS_VARIABLE: {
+            parser_lex(parser);
+            pm_node_t *node = (pm_node_t *) pm_class_variable_read_node_create(parser, &parser->previous);
+
+            if (binding_power == PM_BINDING_POWER_STATEMENT && match1(parser, PM_TOKEN_COMMA)) {
+                node = parse_targets_validate(parser, node, PM_BINDING_POWER_INDEX, (uint16_t) (depth + 1));
+            }
+
+            return node;
+        }
+        case PM_TOKEN_CONSTANT: {
+            parser_lex(parser);
+            pm_token_t constant = parser->previous;
+
+            // If a constant is immediately followed by parentheses, then this is in
+            // fact a method call, not a constant read.
+            if (
+                match1(parser, PM_TOKEN_PARENTHESIS_LEFT) ||
+                (accepts_command_call && (token_begins_expression_p(parser->current.type) || match3(parser, PM_TOKEN_UAMPERSAND, PM_TOKEN_USTAR, PM_TOKEN_USTAR_STAR))) ||
+                (pm_accepts_block_stack_p(parser) && match1(parser, PM_TOKEN_KEYWORD_DO)) ||
+                match1(parser, PM_TOKEN_BRACE_LEFT)
+            ) {
+                pm_arguments_t arguments = { 0 };
+                parse_arguments_list(parser, &arguments, true, accepts_command_call, (uint16_t) (depth + 1));
+                return (pm_node_t *) pm_call_node_fcall_create(parser, &constant, &arguments);
+            }
+
+            pm_node_t *node = (pm_node_t *) pm_constant_read_node_create(parser, &parser->previous);
+
+            if ((binding_power == PM_BINDING_POWER_STATEMENT) && match1(parser, PM_TOKEN_COMMA)) {
+                // If we get here, then we have a comma immediately following a
+                // constant, so we're going to parse this as a multiple assignment.
+                node = parse_targets_validate(parser, node, PM_BINDING_POWER_INDEX, (uint16_t) (depth + 1));
+            }
+
+            return node;
+        }
+        case PM_TOKEN_UCOLON_COLON: {
+            parser_lex(parser);
+            pm_token_t delimiter = parser->previous;
+
+            expect1(parser, PM_TOKEN_CONSTANT, PM_ERR_CONSTANT_PATH_COLON_COLON_CONSTANT);
+            pm_node_t *node = (pm_node_t *) pm_constant_path_node_create(parser, NULL, &delimiter, &parser->previous);
+
+            if ((binding_power == PM_BINDING_POWER_STATEMENT) && match1(parser, PM_TOKEN_COMMA)) {
+                node = parse_targets_validate(parser, node, PM_BINDING_POWER_INDEX, (uint16_t) (depth + 1));
+            }
+
+            return node;
+        }
+        case PM_TOKEN_UDOT_DOT:
+        case PM_TOKEN_UDOT_DOT_DOT: {
+            pm_token_t operator = parser->current;
+            parser_lex(parser);
+
+            pm_node_t *right = parse_expression(parser, pm_binding_powers[operator.type].left, false, false, PM_ERR_EXPECT_EXPRESSION_AFTER_OPERATOR, (uint16_t) (depth + 1));
+
+            // Unary .. and ... are special because these are non-associative
+            // operators that can also be unary operators. In this case we need
+            // to explicitly reject code that has a .. or ... that follows this
+            // expression.
+            if (match2(parser, PM_TOKEN_DOT_DOT, PM_TOKEN_DOT_DOT_DOT)) {
+                pm_parser_err_current(parser, PM_ERR_UNEXPECTED_RANGE_OPERATOR);
+            }
+
+            return (pm_node_t *) pm_range_node_create(parser, NULL, &operator, right);
+        }
+        case PM_TOKEN_FLOAT:
+            parser_lex(parser);
+            return (pm_node_t *) pm_float_node_create(parser, &parser->previous);
+        case PM_TOKEN_FLOAT_IMAGINARY:
+            parser_lex(parser);
+            return (pm_node_t *) pm_float_node_imaginary_create(parser, &parser->previous);
+        case PM_TOKEN_FLOAT_RATIONAL:
+            parser_lex(parser);
+            return (pm_node_t *) pm_float_node_rational_create(parser, &parser->previous);
+        case PM_TOKEN_FLOAT_RATIONAL_IMAGINARY:
+            parser_lex(parser);
+            return (pm_node_t *) pm_float_node_rational_imaginary_create(parser, &parser->previous);
+        case PM_TOKEN_NUMBERED_REFERENCE: {
+            parser_lex(parser);
+            pm_node_t *node = (pm_node_t *) pm_numbered_reference_read_node_create(parser, &parser->previous);
+
+            if (binding_power == PM_BINDING_POWER_STATEMENT && match1(parser, PM_TOKEN_COMMA)) {
+                node = parse_targets_validate(parser, node, PM_BINDING_POWER_INDEX, (uint16_t) (depth + 1));
+            }
+
+            return node;
+        }
+        case PM_TOKEN_GLOBAL_VARIABLE: {
+            parser_lex(parser);
+            pm_node_t *node = (pm_node_t *) pm_global_variable_read_node_create(parser, &parser->previous);
+
+            if (binding_power == PM_BINDING_POWER_STATEMENT && match1(parser, PM_TOKEN_COMMA)) {
+                node = parse_targets_validate(parser, node, PM_BINDING_POWER_INDEX, (uint16_t) (depth + 1));
+            }
+
+            return node;
+        }
+        case PM_TOKEN_BACK_REFERENCE: {
+            parser_lex(parser);
+            pm_node_t *node = (pm_node_t *) pm_back_reference_read_node_create(parser, &parser->previous);
+
+            if (binding_power == PM_BINDING_POWER_STATEMENT && match1(parser, PM_TOKEN_COMMA)) {
+                node = parse_targets_validate(parser, node, PM_BINDING_POWER_INDEX, (uint16_t) (depth + 1));
+            }
+
+            return node;
+        }
+        case PM_TOKEN_IDENTIFIER:
+        case PM_TOKEN_METHOD_NAME: {
+            parser_lex(parser);
+            pm_token_t identifier = parser->previous;
+            pm_node_t *node = parse_variable_call(parser);
+
+            if (PM_NODE_TYPE_P(node, PM_CALL_NODE)) {
+                // If parse_variable_call returned with a call node, then we
+                // know the identifier is not in the local table. In that case
+                // we need to check if there are arguments following the
+                // identifier.
+                pm_call_node_t *call = (pm_call_node_t *) node;
+                pm_arguments_t arguments = { 0 };
+
+                if (parse_arguments_list(parser, &arguments, true, accepts_command_call, (uint16_t) (depth + 1))) {
+                    // Since we found arguments, we need to turn off the
+                    // variable call bit in the flags.
+                    pm_node_flag_unset((pm_node_t *)call, PM_CALL_NODE_FLAGS_VARIABLE_CALL);
+
+                    call->opening_loc = arguments.opening_loc;
+                    call->arguments = arguments.arguments;
+                    call->closing_loc = arguments.closing_loc;
+                    call->block = arguments.block;
+
+                    if (arguments.block != NULL) {
+                        call->base.location.end = arguments.block->location.end;
+                    } else if (arguments.closing_loc.start == NULL) {
+                        if (arguments.arguments != NULL) {
+                            call->base.location.end = arguments.arguments->base.location.end;
+                        } else {
+                            call->base.location.end = call->message_loc.end;
+                        }
+                    } else {
+                        call->base.location.end = arguments.closing_loc.end;
+                    }
+                }
+            } else {
+                // Otherwise, we know the identifier is in the local table. This
+                // can still be a method call if it is followed by arguments or
+                // a block, so we need to check for that here.
+                if (
+                    (accepts_command_call && (token_begins_expression_p(parser->current.type) || match3(parser, PM_TOKEN_UAMPERSAND, PM_TOKEN_USTAR, PM_TOKEN_USTAR_STAR))) ||
+                    (pm_accepts_block_stack_p(parser) && match1(parser, PM_TOKEN_KEYWORD_DO)) ||
+                    match1(parser, PM_TOKEN_BRACE_LEFT)
+                ) {
+                    pm_arguments_t arguments = { 0 };
+                    parse_arguments_list(parser, &arguments, true, accepts_command_call, (uint16_t) (depth + 1));
+                    pm_call_node_t *fcall = pm_call_node_fcall_create(parser, &identifier, &arguments);
+
+                    if (PM_NODE_TYPE_P(node, PM_IT_LOCAL_VARIABLE_READ_NODE)) {
+                        // If we're about to convert an 'it' implicit local
+                        // variable read into a method call, we need to remove
+                        // it from the list of implicit local variables.
+                        parse_target_implicit_parameter(parser, node);
+                    } else {
+                        // Otherwise, we're about to convert a regular local
+                        // variable read into a method call, in which case we
+                        // need to indicate that this was not a read for the
+                        // purposes of warnings.
+                        assert(PM_NODE_TYPE_P(node, PM_LOCAL_VARIABLE_READ_NODE));
+
+                        if (pm_token_is_numbered_parameter(identifier.start, identifier.end)) {
+                            parse_target_implicit_parameter(parser, node);
+                        } else {
+                            pm_local_variable_read_node_t *cast = (pm_local_variable_read_node_t *) node;
+                            pm_locals_unread(&pm_parser_scope_find(parser, cast->depth)->locals, cast->name);
+                        }
+                    }
+
+                    pm_node_destroy(parser, node);
+                    return (pm_node_t *) fcall;
+                }
+            }
+
+            if ((binding_power == PM_BINDING_POWER_STATEMENT) && match1(parser, PM_TOKEN_COMMA)) {
+                node = parse_targets_validate(parser, node, PM_BINDING_POWER_INDEX, (uint16_t) (depth + 1));
+            }
+
+            return node;
+        }
+        case PM_TOKEN_HEREDOC_START: {
+            // Here we have found a heredoc. We'll parse it and add it to the
+            // list of strings.
+            assert(parser->lex_modes.current->mode == PM_LEX_HEREDOC);
+            pm_heredoc_lex_mode_t lex_mode = parser->lex_modes.current->as.heredoc.base;
+
+            size_t common_whitespace = (size_t) -1;
+            parser->lex_modes.current->as.heredoc.common_whitespace = &common_whitespace;
+
+            parser_lex(parser);
+            pm_token_t opening = parser->previous;
+
+            pm_node_t *node;
+            pm_node_t *part;
+
+            if (match2(parser, PM_TOKEN_HEREDOC_END, PM_TOKEN_EOF)) {
+                // If we get here, then we have an empty heredoc. We'll create
+                // an empty content token and return an empty string node.
+                expect1_heredoc_term(parser, lex_mode.ident_start, lex_mode.ident_length);
+                pm_token_t content = parse_strings_empty_content(parser->previous.start);
+
+                if (lex_mode.quote == PM_HEREDOC_QUOTE_BACKTICK) {
+                    node = (pm_node_t *) pm_xstring_node_create_unescaped(parser, &opening, &content, &parser->previous, &PM_STRING_EMPTY);
+                } else {
+                    node = (pm_node_t *) pm_string_node_create_unescaped(parser, &opening, &content, &parser->previous, &PM_STRING_EMPTY);
+                }
+
+                node->location.end = opening.end;
+            } else if ((part = parse_string_part(parser, (uint16_t) (depth + 1))) == NULL) {
+                // If we get here, then we tried to find something in the
+                // heredoc but couldn't actually parse anything, so we'll just
+                // return a missing node.
+                //
+                // parse_string_part handles its own errors, so there is no need
+                // for us to add one here.
+                node = (pm_node_t *) pm_missing_node_create(parser, parser->previous.start, parser->previous.end);
+            } else if (PM_NODE_TYPE_P(part, PM_STRING_NODE) && match2(parser, PM_TOKEN_HEREDOC_END, PM_TOKEN_EOF)) {
+                // If we get here, then the part that we parsed was plain string
+                // content and we're at the end of the heredoc, so we can return
+                // just a string node with the heredoc opening and closing as
+                // its opening and closing.
+                pm_node_flag_set(part, parse_unescaped_encoding(parser));
+                pm_string_node_t *cast = (pm_string_node_t *) part;
+
+                cast->opening_loc = PM_LOCATION_TOKEN_VALUE(&opening);
+                cast->closing_loc = PM_LOCATION_TOKEN_VALUE(&parser->current);
+                cast->base.location = cast->opening_loc;
+
+                if (lex_mode.quote == PM_HEREDOC_QUOTE_BACKTICK) {
+                    assert(sizeof(pm_string_node_t) == sizeof(pm_x_string_node_t));
+                    cast->base.type = PM_X_STRING_NODE;
+                }
+
+                if (lex_mode.indent == PM_HEREDOC_INDENT_TILDE && (common_whitespace != (size_t) -1) && (common_whitespace != 0)) {
+                    parse_heredoc_dedent_string(&cast->unescaped, common_whitespace);
+                }
+
+                node = (pm_node_t *) cast;
+                expect1_heredoc_term(parser, lex_mode.ident_start, lex_mode.ident_length);
+            } else {
+                // If we get here, then we have multiple parts in the heredoc,
+                // so we'll need to create an interpolated string node to hold
+                // them all.
+                pm_node_list_t parts = { 0 };
+                pm_node_list_append(&parts, part);
+
+                while (!match2(parser, PM_TOKEN_HEREDOC_END, PM_TOKEN_EOF)) {
+                    if ((part = parse_string_part(parser, (uint16_t) (depth + 1))) != NULL) {
+                        pm_node_list_append(&parts, part);
+                    }
+                }
+
+                // Now that we have all of the parts, create the correct type of
+                // interpolated node.
+                if (lex_mode.quote == PM_HEREDOC_QUOTE_BACKTICK) {
+                    pm_interpolated_x_string_node_t *cast = pm_interpolated_xstring_node_create(parser, &opening, &opening);
+                    cast->parts = parts;
+
+                    expect1_heredoc_term(parser, lex_mode.ident_start, lex_mode.ident_length);
+                    pm_interpolated_xstring_node_closing_set(cast, &parser->previous);
+
+                    cast->base.location = cast->opening_loc;
+                    node = (pm_node_t *) cast;
+                } else {
+                    pm_interpolated_string_node_t *cast = pm_interpolated_string_node_create(parser, &opening, &parts, &opening);
+                    pm_node_list_free(&parts);
+
+                    expect1_heredoc_term(parser, lex_mode.ident_start, lex_mode.ident_length);
+                    pm_interpolated_string_node_closing_set(cast, &parser->previous);
+
+                    cast->base.location = cast->opening_loc;
+                    node = (pm_node_t *) cast;
+                }
+
+                // If this is a heredoc that is indented with a ~, then we need
+                // to dedent each line by the common leading whitespace.
+                if (lex_mode.indent == PM_HEREDOC_INDENT_TILDE && (common_whitespace != (size_t) -1) && (common_whitespace != 0)) {
+                    pm_node_list_t *nodes;
+                    if (lex_mode.quote == PM_HEREDOC_QUOTE_BACKTICK) {
+                        nodes = &((pm_interpolated_x_string_node_t *) node)->parts;
+                    } else {
+                        nodes = &((pm_interpolated_string_node_t *) node)->parts;
+                    }
+
+                    parse_heredoc_dedent(parser, nodes, common_whitespace);
+                }
+            }
+
+            if (match1(parser, PM_TOKEN_STRING_BEGIN)) {
+                return parse_strings(parser, node, false, (uint16_t) (depth + 1));
+            }
+
+            return node;
+        }
+        case PM_TOKEN_INSTANCE_VARIABLE: {
+            parser_lex(parser);
+            pm_node_t *node = (pm_node_t *) pm_instance_variable_read_node_create(parser, &parser->previous);
+
+            if (binding_power == PM_BINDING_POWER_STATEMENT && match1(parser, PM_TOKEN_COMMA)) {
+                node = parse_targets_validate(parser, node, PM_BINDING_POWER_INDEX, (uint16_t) (depth + 1));
+            }
+
+            return node;
+        }
+        case PM_TOKEN_INTEGER: {
+            pm_node_flags_t base = parser->integer_base;
+            parser_lex(parser);
+            return (pm_node_t *) pm_integer_node_create(parser, base, &parser->previous);
+        }
+        case PM_TOKEN_INTEGER_IMAGINARY: {
+            pm_node_flags_t base = parser->integer_base;
+            parser_lex(parser);
+            return (pm_node_t *) pm_integer_node_imaginary_create(parser, base, &parser->previous);
+        }
+        case PM_TOKEN_INTEGER_RATIONAL: {
+            pm_node_flags_t base = parser->integer_base;
+            parser_lex(parser);
+            return (pm_node_t *) pm_integer_node_rational_create(parser, base, &parser->previous);
+        }
+        case PM_TOKEN_INTEGER_RATIONAL_IMAGINARY: {
+            pm_node_flags_t base = parser->integer_base;
+            parser_lex(parser);
+            return (pm_node_t *) pm_integer_node_rational_imaginary_create(parser, base, &parser->previous);
+        }
+        case PM_TOKEN_KEYWORD___ENCODING__:
+            parser_lex(parser);
+            return (pm_node_t *) pm_source_encoding_node_create(parser, &parser->previous);
+        case PM_TOKEN_KEYWORD___FILE__:
+            parser_lex(parser);
+            return (pm_node_t *) pm_source_file_node_create(parser, &parser->previous);
+        case PM_TOKEN_KEYWORD___LINE__:
+            parser_lex(parser);
+            return (pm_node_t *) pm_source_line_node_create(parser, &parser->previous);
+        case PM_TOKEN_KEYWORD_ALIAS: {
+            if (binding_power != PM_BINDING_POWER_STATEMENT) {
+                pm_parser_err_current(parser, PM_ERR_STATEMENT_ALIAS);
+            }
+
+            parser_lex(parser);
+            pm_token_t keyword = parser->previous;
+
+            pm_node_t *new_name = parse_alias_argument(parser, true, (uint16_t) (depth + 1));
+            pm_node_t *old_name = parse_alias_argument(parser, false, (uint16_t) (depth + 1));
+
+            switch (PM_NODE_TYPE(new_name)) {
+                case PM_BACK_REFERENCE_READ_NODE:
+                case PM_NUMBERED_REFERENCE_READ_NODE:
+                case PM_GLOBAL_VARIABLE_READ_NODE: {
+                    if (PM_NODE_TYPE_P(old_name, PM_BACK_REFERENCE_READ_NODE) || PM_NODE_TYPE_P(old_name, PM_NUMBERED_REFERENCE_READ_NODE) || PM_NODE_TYPE_P(old_name, PM_GLOBAL_VARIABLE_READ_NODE)) {
+                        if (PM_NODE_TYPE_P(old_name, PM_NUMBERED_REFERENCE_READ_NODE)) {
+                            pm_parser_err_node(parser, old_name, PM_ERR_ALIAS_ARGUMENT_NUMBERED_REFERENCE);
+                        }
+                    } else {
+                        pm_parser_err_node(parser, old_name, PM_ERR_ALIAS_ARGUMENT);
+                    }
+
+                    return (pm_node_t *) pm_alias_global_variable_node_create(parser, &keyword, new_name, old_name);
+                }
+                case PM_SYMBOL_NODE:
+                case PM_INTERPOLATED_SYMBOL_NODE: {
+                    if (!PM_NODE_TYPE_P(old_name, PM_SYMBOL_NODE) && !PM_NODE_TYPE_P(old_name, PM_INTERPOLATED_SYMBOL_NODE)) {
+                        pm_parser_err_node(parser, old_name, PM_ERR_ALIAS_ARGUMENT);
+                    }
+                }
+                PRISM_FALLTHROUGH
+                default:
+                    return (pm_node_t *) pm_alias_method_node_create(parser, &keyword, new_name, old_name);
+            }
+        }
+        case PM_TOKEN_KEYWORD_CASE: {
+            size_t opening_newline_index = token_newline_index(parser);
+            parser_lex(parser);
+
+            pm_token_t case_keyword = parser->previous;
+            pm_node_t *predicate = NULL;
+
+            pm_node_list_t current_block_exits = { 0 };
+            pm_node_list_t *previous_block_exits = push_block_exits(parser, &current_block_exits);
+
+            if (accept2(parser, PM_TOKEN_NEWLINE, PM_TOKEN_SEMICOLON)) {
+                while (accept2(parser, PM_TOKEN_NEWLINE, PM_TOKEN_SEMICOLON));
+                predicate = NULL;
+            } else if (match3(parser, PM_TOKEN_KEYWORD_WHEN, PM_TOKEN_KEYWORD_IN, PM_TOKEN_KEYWORD_END)) {
+                predicate = NULL;
+             } else if (!token_begins_expression_p(parser->current.type)) {
+                predicate = NULL;
+            } else {
+                predicate = parse_value_expression(parser, PM_BINDING_POWER_COMPOSITION, true, false, PM_ERR_CASE_EXPRESSION_AFTER_CASE, (uint16_t) (depth + 1));
+                while (accept2(parser, PM_TOKEN_NEWLINE, PM_TOKEN_SEMICOLON));
+            }
+
+            if (match1(parser, PM_TOKEN_KEYWORD_END)) {
+                parser_warn_indentation_mismatch(parser, opening_newline_index, &case_keyword, false, false);
+                parser_lex(parser);
+
+                pop_block_exits(parser, previous_block_exits);
+                pm_node_list_free(&current_block_exits);
+
+                pm_parser_err_token(parser, &case_keyword, PM_ERR_CASE_MISSING_CONDITIONS);
+                return (pm_node_t *) pm_case_node_create(parser, &case_keyword, predicate, &parser->previous);
+            }
+
+            // At this point we can create a case node, though we don't yet know
+            // if it is a case-in or case-when node.
+            pm_token_t end_keyword = not_provided(parser);
+            pm_node_t *node;
+
+            if (match1(parser, PM_TOKEN_KEYWORD_WHEN)) {
+                pm_case_node_t *case_node = pm_case_node_create(parser, &case_keyword, predicate, &end_keyword);
+                pm_static_literals_t literals = { 0 };
+
+                // At this point we've seen a when keyword, so we know this is a
+                // case-when node. We will continue to parse the when nodes
+                // until we hit the end of the list.
+                while (match1(parser, PM_TOKEN_KEYWORD_WHEN)) {
+                    parser_warn_indentation_mismatch(parser, opening_newline_index, &case_keyword, false, true);
+                    parser_lex(parser);
+
+                    pm_token_t when_keyword = parser->previous;
+                    pm_when_node_t *when_node = pm_when_node_create(parser, &when_keyword);
+
+                    do {
+                        if (accept1(parser, PM_TOKEN_USTAR)) {
+                            pm_token_t operator = parser->previous;
+                            pm_node_t *expression = parse_value_expression(parser, PM_BINDING_POWER_DEFINED, false, false, PM_ERR_EXPECT_EXPRESSION_AFTER_STAR, (uint16_t) (depth + 1));
+
+                            pm_splat_node_t *splat_node = pm_splat_node_create(parser, &operator, expression);
+                            pm_when_node_conditions_append(when_node, (pm_node_t *) splat_node);
+
+                            if (PM_NODE_TYPE_P(expression, PM_MISSING_NODE)) break;
+                        } else {
+                            pm_node_t *condition = parse_value_expression(parser, PM_BINDING_POWER_DEFINED, false, false, PM_ERR_CASE_EXPRESSION_AFTER_WHEN, (uint16_t) (depth + 1));
+                            pm_when_node_conditions_append(when_node, condition);
+
+                            // If we found a missing node, then this is a syntax
+                            // error and we should stop looping.
+                            if (PM_NODE_TYPE_P(condition, PM_MISSING_NODE)) break;
+
+                            // If this is a string node, then we need to mark it
+                            // as frozen because when clause strings are frozen.
+                            if (PM_NODE_TYPE_P(condition, PM_STRING_NODE)) {
+                                pm_node_flag_set(condition, PM_STRING_FLAGS_FROZEN | PM_NODE_FLAG_STATIC_LITERAL);
+                            } else if (PM_NODE_TYPE_P(condition, PM_SOURCE_FILE_NODE)) {
+                                pm_node_flag_set(condition, PM_NODE_FLAG_STATIC_LITERAL);
+                            }
+
+                            pm_when_clause_static_literals_add(parser, &literals, condition);
+                        }
+                    } while (accept1(parser, PM_TOKEN_COMMA));
+
+                    if (accept2(parser, PM_TOKEN_NEWLINE, PM_TOKEN_SEMICOLON)) {
+                        if (accept1(parser, PM_TOKEN_KEYWORD_THEN)) {
+                            pm_when_node_then_keyword_loc_set(when_node, &parser->previous);
+                        }
+                    } else {
+                        expect1(parser, PM_TOKEN_KEYWORD_THEN, PM_ERR_EXPECT_WHEN_DELIMITER);
+                        pm_when_node_then_keyword_loc_set(when_node, &parser->previous);
+                    }
+
+                    if (!match3(parser, PM_TOKEN_KEYWORD_WHEN, PM_TOKEN_KEYWORD_ELSE, PM_TOKEN_KEYWORD_END)) {
+                        pm_statements_node_t *statements = parse_statements(parser, PM_CONTEXT_CASE_WHEN, (uint16_t) (depth + 1));
+                        if (statements != NULL) {
+                            pm_when_node_statements_set(when_node, statements);
+                        }
+                    }
+
+                    pm_case_node_condition_append(case_node, (pm_node_t *) when_node);
+                }
+
+                // If we didn't parse any conditions (in or when) then we need
+                // to indicate that we have an error.
+                if (case_node->conditions.size == 0) {
+                    pm_parser_err_token(parser, &case_keyword, PM_ERR_CASE_MISSING_CONDITIONS);
+                }
+
+                pm_static_literals_free(&literals);
+                node = (pm_node_t *) case_node;
+            } else {
+                pm_case_match_node_t *case_node = pm_case_match_node_create(parser, &case_keyword, predicate, &end_keyword);
+
+                // If this is a case-match node (i.e., it is a pattern matching
+                // case statement) then we must have a predicate.
+                if (predicate == NULL) {
+                    pm_parser_err_token(parser, &case_keyword, PM_ERR_CASE_MATCH_MISSING_PREDICATE);
+                }
+
+                // At this point we expect that we're parsing a case-in node. We
+                // will continue to parse the in nodes until we hit the end of
+                // the list.
+                while (match1(parser, PM_TOKEN_KEYWORD_IN)) {
+                    parser_warn_indentation_mismatch(parser, opening_newline_index, &case_keyword, false, true);
+
+                    bool previous_pattern_matching_newlines = parser->pattern_matching_newlines;
+                    parser->pattern_matching_newlines = true;
+
+                    lex_state_set(parser, PM_LEX_STATE_BEG | PM_LEX_STATE_LABEL);
+                    parser->command_start = false;
+                    parser_lex(parser);
+
+                    pm_token_t in_keyword = parser->previous;
+
+                    pm_constant_id_list_t captures = { 0 };
+                    pm_node_t *pattern = parse_pattern(parser, &captures, PM_PARSE_PATTERN_TOP | PM_PARSE_PATTERN_MULTI, PM_ERR_PATTERN_EXPRESSION_AFTER_IN, (uint16_t) (depth + 1));
+
+                    parser->pattern_matching_newlines = previous_pattern_matching_newlines;
+                    pm_constant_id_list_free(&captures);
+
+                    // Since we're in the top-level of the case-in node we need
+                    // to check for guard clauses in the form of `if` or
+                    // `unless` statements.
+                    if (accept1(parser, PM_TOKEN_KEYWORD_IF_MODIFIER)) {
+                        pm_token_t keyword = parser->previous;
+                        pm_node_t *predicate = parse_value_expression(parser, PM_BINDING_POWER_COMPOSITION, true, false, PM_ERR_CONDITIONAL_IF_PREDICATE, (uint16_t) (depth + 1));
+                        pattern = (pm_node_t *) pm_if_node_modifier_create(parser, pattern, &keyword, predicate);
+                    } else if (accept1(parser, PM_TOKEN_KEYWORD_UNLESS_MODIFIER)) {
+                        pm_token_t keyword = parser->previous;
+                        pm_node_t *predicate = parse_value_expression(parser, PM_BINDING_POWER_COMPOSITION, true, false, PM_ERR_CONDITIONAL_UNLESS_PREDICATE, (uint16_t) (depth + 1));
+                        pattern = (pm_node_t *) pm_unless_node_modifier_create(parser, pattern, &keyword, predicate);
+                    }
+
+                    // Now we need to check for the terminator of the in node's
+                    // pattern. It can be a newline or semicolon optionally
+                    // followed by a `then` keyword.
+                    pm_token_t then_keyword;
+                    if (accept2(parser, PM_TOKEN_NEWLINE, PM_TOKEN_SEMICOLON)) {
+                        if (accept1(parser, PM_TOKEN_KEYWORD_THEN)) {
+                            then_keyword = parser->previous;
+                        } else {
+                            then_keyword = not_provided(parser);
+                        }
+                    } else {
+                        expect1(parser, PM_TOKEN_KEYWORD_THEN, PM_ERR_EXPECT_IN_DELIMITER);
+                        then_keyword = parser->previous;
+                    }
+
+                    // Now we can actually parse the statements associated with
+                    // the in node.
+                    pm_statements_node_t *statements;
+                    if (match3(parser, PM_TOKEN_KEYWORD_IN, PM_TOKEN_KEYWORD_ELSE, PM_TOKEN_KEYWORD_END)) {
+                        statements = NULL;
+                    } else {
+                        statements = parse_statements(parser, PM_CONTEXT_CASE_IN, (uint16_t) (depth + 1));
+                    }
+
+                    // Now that we have the full pattern and statements, we can
+                    // create the node and attach it to the case node.
+                    pm_node_t *condition = (pm_node_t *) pm_in_node_create(parser, pattern, statements, &in_keyword, &then_keyword);
+                    pm_case_match_node_condition_append(case_node, condition);
+                }
+
+                // If we didn't parse any conditions (in or when) then we need
+                // to indicate that we have an error.
+                if (case_node->conditions.size == 0) {
+                    pm_parser_err_token(parser, &case_keyword, PM_ERR_CASE_MISSING_CONDITIONS);
+                }
+
+                node = (pm_node_t *) case_node;
+            }
+
+            accept2(parser, PM_TOKEN_NEWLINE, PM_TOKEN_SEMICOLON);
+            if (accept1(parser, PM_TOKEN_KEYWORD_ELSE)) {
+                pm_token_t else_keyword = parser->previous;
+                pm_else_node_t *else_node;
+
+                if (!match1(parser, PM_TOKEN_KEYWORD_END)) {
+                    else_node = pm_else_node_create(parser, &else_keyword, parse_statements(parser, PM_CONTEXT_ELSE, (uint16_t) (depth + 1)), &parser->current);
+                } else {
+                    else_node = pm_else_node_create(parser, &else_keyword, NULL, &parser->current);
+                }
+
+                if (PM_NODE_TYPE_P(node, PM_CASE_NODE)) {
+                    pm_case_node_else_clause_set((pm_case_node_t *) node, else_node);
+                } else {
+                    pm_case_match_node_else_clause_set((pm_case_match_node_t *) node, else_node);
+                }
+            }
+
+            parser_warn_indentation_mismatch(parser, opening_newline_index, &case_keyword, false, false);
+            expect1(parser, PM_TOKEN_KEYWORD_END, PM_ERR_CASE_TERM);
+
+            if (PM_NODE_TYPE_P(node, PM_CASE_NODE)) {
+                pm_case_node_end_keyword_loc_set((pm_case_node_t *) node, &parser->previous);
+            } else {
+                pm_case_match_node_end_keyword_loc_set((pm_case_match_node_t *) node, &parser->previous);
+            }
+
+            pop_block_exits(parser, previous_block_exits);
+            pm_node_list_free(&current_block_exits);
+
+            return node;
+        }
+        case PM_TOKEN_KEYWORD_BEGIN: {
+            size_t opening_newline_index = token_newline_index(parser);
+            parser_lex(parser);
+
+            pm_token_t begin_keyword = parser->previous;
+            accept2(parser, PM_TOKEN_NEWLINE, PM_TOKEN_SEMICOLON);
+
+            pm_node_list_t current_block_exits = { 0 };
+            pm_node_list_t *previous_block_exits = push_block_exits(parser, &current_block_exits);
+            pm_statements_node_t *begin_statements = NULL;
+
+            if (!match4(parser, PM_TOKEN_KEYWORD_RESCUE, PM_TOKEN_KEYWORD_ENSURE, PM_TOKEN_KEYWORD_ELSE, PM_TOKEN_KEYWORD_END)) {
+                pm_accepts_block_stack_push(parser, true);
+                begin_statements = parse_statements(parser, PM_CONTEXT_BEGIN, (uint16_t) (depth + 1));
+                pm_accepts_block_stack_pop(parser);
+                accept2(parser, PM_TOKEN_NEWLINE, PM_TOKEN_SEMICOLON);
+            }
+
+            pm_begin_node_t *begin_node = pm_begin_node_create(parser, &begin_keyword, begin_statements);
+            parse_rescues(parser, opening_newline_index, &begin_keyword, begin_node, PM_RESCUES_BEGIN, (uint16_t) (depth + 1));
+            expect1(parser, PM_TOKEN_KEYWORD_END, PM_ERR_BEGIN_TERM);
+
+            begin_node->base.location.end = parser->previous.end;
+            pm_begin_node_end_keyword_set(begin_node, &parser->previous);
+
+            pop_block_exits(parser, previous_block_exits);
+            pm_node_list_free(&current_block_exits);
+
+            return (pm_node_t *) begin_node;
+        }
+        case PM_TOKEN_KEYWORD_BEGIN_UPCASE: {
+            pm_node_list_t current_block_exits = { 0 };
+            pm_node_list_t *previous_block_exits = push_block_exits(parser, &current_block_exits);
+
+            if (binding_power != PM_BINDING_POWER_STATEMENT) {
+                pm_parser_err_current(parser, PM_ERR_STATEMENT_PREEXE_BEGIN);
+            }
+
+            parser_lex(parser);
+            pm_token_t keyword = parser->previous;
+
+            expect1(parser, PM_TOKEN_BRACE_LEFT, PM_ERR_BEGIN_UPCASE_BRACE);
+            pm_token_t opening = parser->previous;
+            pm_statements_node_t *statements = parse_statements(parser, PM_CONTEXT_PREEXE, (uint16_t) (depth + 1));
+
+            expect1(parser, PM_TOKEN_BRACE_RIGHT, PM_ERR_BEGIN_UPCASE_TERM);
+            pm_context_t context = parser->current_context->context;
+            if ((context != PM_CONTEXT_MAIN) && (context != PM_CONTEXT_PREEXE)) {
+                pm_parser_err_token(parser, &keyword, PM_ERR_BEGIN_UPCASE_TOPLEVEL);
+            }
+
+            flush_block_exits(parser, previous_block_exits);
+            pm_node_list_free(&current_block_exits);
+
+            return (pm_node_t *) pm_pre_execution_node_create(parser, &keyword, &opening, statements, &parser->previous);
+        }
+        case PM_TOKEN_KEYWORD_BREAK:
+        case PM_TOKEN_KEYWORD_NEXT:
+        case PM_TOKEN_KEYWORD_RETURN: {
+            parser_lex(parser);
+
+            pm_token_t keyword = parser->previous;
+            pm_arguments_t arguments = { 0 };
+
+            if (
+                token_begins_expression_p(parser->current.type) ||
+                match2(parser, PM_TOKEN_USTAR, PM_TOKEN_USTAR_STAR)
+            ) {
+                pm_binding_power_t binding_power = pm_binding_powers[parser->current.type].left;
+
+                if (binding_power == PM_BINDING_POWER_UNSET || binding_power >= PM_BINDING_POWER_RANGE) {
+                    parse_arguments(parser, &arguments, false, PM_TOKEN_EOF, (uint16_t) (depth + 1));
+                }
+            }
+
+            switch (keyword.type) {
+                case PM_TOKEN_KEYWORD_BREAK: {
+                    pm_node_t *node = (pm_node_t *) pm_break_node_create(parser, &keyword, arguments.arguments);
+                    if (!parser->partial_script) parse_block_exit(parser, node);
+                    return node;
+                }
+                case PM_TOKEN_KEYWORD_NEXT: {
+                    pm_node_t *node = (pm_node_t *) pm_next_node_create(parser, &keyword, arguments.arguments);
+                    if (!parser->partial_script) parse_block_exit(parser, node);
+                    return node;
+                }
+                case PM_TOKEN_KEYWORD_RETURN: {
+                    pm_node_t *node = (pm_node_t *) pm_return_node_create(parser, &keyword, arguments.arguments);
+                    parse_return(parser, node);
+                    return node;
+                }
+                default:
+                    assert(false && "unreachable");
+                    return (pm_node_t *) pm_missing_node_create(parser, parser->previous.start, parser->previous.end);
+            }
+        }
+        case PM_TOKEN_KEYWORD_SUPER: {
+            parser_lex(parser);
+
+            pm_token_t keyword = parser->previous;
+            pm_arguments_t arguments = { 0 };
+            parse_arguments_list(parser, &arguments, true, accepts_command_call, (uint16_t) (depth + 1));
+
+            if (
+                arguments.opening_loc.start == NULL &&
+                arguments.arguments == NULL &&
+                ((arguments.block == NULL) || PM_NODE_TYPE_P(arguments.block, PM_BLOCK_NODE))
+            ) {
+                return (pm_node_t *) pm_forwarding_super_node_create(parser, &keyword, &arguments);
+            }
+
+            return (pm_node_t *) pm_super_node_create(parser, &keyword, &arguments);
+        }
+        case PM_TOKEN_KEYWORD_YIELD: {
+            parser_lex(parser);
+
+            pm_token_t keyword = parser->previous;
+            pm_arguments_t arguments = { 0 };
+            parse_arguments_list(parser, &arguments, false, accepts_command_call, (uint16_t) (depth + 1));
+
+            // It's possible that we've parsed a block argument through our
+            // call to parse_arguments_list. If we found one, we should mark it
+            // as invalid and destroy it, as we don't have a place for it on the
+            // yield node.
+            if (arguments.block != NULL) {
+                pm_parser_err_node(parser, arguments.block, PM_ERR_UNEXPECTED_BLOCK_ARGUMENT);
+                pm_node_destroy(parser, arguments.block);
+                arguments.block = NULL;
+            }
+
+            pm_node_t *node = (pm_node_t *) pm_yield_node_create(parser, &keyword, &arguments.opening_loc, arguments.arguments, &arguments.closing_loc);
+            if (!parser->parsing_eval && !parser->partial_script) parse_yield(parser, node);
+
+            return node;
+        }
+        case PM_TOKEN_KEYWORD_CLASS: {
+            size_t opening_newline_index = token_newline_index(parser);
+            parser_lex(parser);
+
+            pm_token_t class_keyword = parser->previous;
+            pm_do_loop_stack_push(parser, false);
+
+            pm_node_list_t current_block_exits = { 0 };
+            pm_node_list_t *previous_block_exits = push_block_exits(parser, &current_block_exits);
+
+            if (accept1(parser, PM_TOKEN_LESS_LESS)) {
+                pm_token_t operator = parser->previous;
+                pm_node_t *expression = parse_value_expression(parser, PM_BINDING_POWER_COMPOSITION, true, false, PM_ERR_EXPECT_EXPRESSION_AFTER_LESS_LESS, (uint16_t) (depth + 1));
+
+                pm_parser_scope_push(parser, true);
+                if (!match2(parser, PM_TOKEN_NEWLINE, PM_TOKEN_SEMICOLON)) {
+                    PM_PARSER_ERR_TOKEN_FORMAT(parser, parser->current, PM_ERR_EXPECT_SINGLETON_CLASS_DELIMITER, pm_token_type_human(parser->current.type));
+                }
+
+                pm_node_t *statements = NULL;
+                if (!match4(parser, PM_TOKEN_KEYWORD_RESCUE, PM_TOKEN_KEYWORD_ENSURE, PM_TOKEN_KEYWORD_ELSE, PM_TOKEN_KEYWORD_END)) {
+                    pm_accepts_block_stack_push(parser, true);
+                    statements = (pm_node_t *) parse_statements(parser, PM_CONTEXT_SCLASS, (uint16_t) (depth + 1));
+                    pm_accepts_block_stack_pop(parser);
+                }
+
+                if (match2(parser, PM_TOKEN_KEYWORD_RESCUE, PM_TOKEN_KEYWORD_ENSURE)) {
+                    assert(statements == NULL || PM_NODE_TYPE_P(statements, PM_STATEMENTS_NODE));
+                    statements = (pm_node_t *) parse_rescues_implicit_begin(parser, opening_newline_index, &class_keyword, class_keyword.start, (pm_statements_node_t *) statements, PM_RESCUES_SCLASS, (uint16_t) (depth + 1));
+                } else {
+                    parser_warn_indentation_mismatch(parser, opening_newline_index, &class_keyword, false, false);
+                }
+
+                expect1(parser, PM_TOKEN_KEYWORD_END, PM_ERR_CLASS_TERM);
+
+                pm_constant_id_list_t locals;
+                pm_locals_order(parser, &parser->current_scope->locals, &locals, false);
+
+                pm_parser_scope_pop(parser);
+                pm_do_loop_stack_pop(parser);
+
+                flush_block_exits(parser, previous_block_exits);
+                pm_node_list_free(&current_block_exits);
+
+                return (pm_node_t *) pm_singleton_class_node_create(parser, &locals, &class_keyword, &operator, expression, statements, &parser->previous);
+            }
+
+            pm_node_t *constant_path = parse_expression(parser, PM_BINDING_POWER_INDEX, false, false, PM_ERR_CLASS_NAME, (uint16_t) (depth + 1));
+            pm_token_t name = parser->previous;
+            if (name.type != PM_TOKEN_CONSTANT) {
+                pm_parser_err_token(parser, &name, PM_ERR_CLASS_NAME);
+            }
+
+            pm_token_t inheritance_operator;
+            pm_node_t *superclass;
+
+            if (match1(parser, PM_TOKEN_LESS)) {
+                inheritance_operator = parser->current;
+                lex_state_set(parser, PM_LEX_STATE_BEG);
+
+                parser->command_start = true;
+                parser_lex(parser);
+
+                superclass = parse_value_expression(parser, PM_BINDING_POWER_COMPOSITION, true, false, PM_ERR_CLASS_SUPERCLASS, (uint16_t) (depth + 1));
+            } else {
+                inheritance_operator = not_provided(parser);
+                superclass = NULL;
+            }
+
+            pm_parser_scope_push(parser, true);
+
+            if (inheritance_operator.type != PM_TOKEN_NOT_PROVIDED) {
+                expect2(parser, PM_TOKEN_NEWLINE, PM_TOKEN_SEMICOLON, PM_ERR_CLASS_UNEXPECTED_END);
+            } else {
+                accept2(parser, PM_TOKEN_NEWLINE, PM_TOKEN_SEMICOLON);
+            }
+            pm_node_t *statements = NULL;
+
+            if (!match4(parser, PM_TOKEN_KEYWORD_RESCUE, PM_TOKEN_KEYWORD_ENSURE, PM_TOKEN_KEYWORD_ELSE, PM_TOKEN_KEYWORD_END)) {
+                pm_accepts_block_stack_push(parser, true);
+                statements = (pm_node_t *) parse_statements(parser, PM_CONTEXT_CLASS, (uint16_t) (depth + 1));
+                pm_accepts_block_stack_pop(parser);
+            }
+
+            if (match2(parser, PM_TOKEN_KEYWORD_RESCUE, PM_TOKEN_KEYWORD_ENSURE)) {
+                assert(statements == NULL || PM_NODE_TYPE_P(statements, PM_STATEMENTS_NODE));
+                statements = (pm_node_t *) parse_rescues_implicit_begin(parser, opening_newline_index, &class_keyword, class_keyword.start, (pm_statements_node_t *) statements, PM_RESCUES_CLASS, (uint16_t) (depth + 1));
+            } else {
+                parser_warn_indentation_mismatch(parser, opening_newline_index, &class_keyword, false, false);
+            }
+
+            expect1(parser, PM_TOKEN_KEYWORD_END, PM_ERR_CLASS_TERM);
+
+            if (context_def_p(parser)) {
+                pm_parser_err_token(parser, &class_keyword, PM_ERR_CLASS_IN_METHOD);
+            }
+
+            pm_constant_id_list_t locals;
+            pm_locals_order(parser, &parser->current_scope->locals, &locals, false);
+
+            pm_parser_scope_pop(parser);
+            pm_do_loop_stack_pop(parser);
+
+            if (!PM_NODE_TYPE_P(constant_path, PM_CONSTANT_PATH_NODE) && !(PM_NODE_TYPE_P(constant_path, PM_CONSTANT_READ_NODE))) {
+                pm_parser_err_node(parser, constant_path, PM_ERR_CLASS_NAME);
+            }
+
+            pop_block_exits(parser, previous_block_exits);
+            pm_node_list_free(&current_block_exits);
+
+            return (pm_node_t *) pm_class_node_create(parser, &locals, &class_keyword, constant_path, &name, &inheritance_operator, superclass, statements, &parser->previous);
+        }
+        case PM_TOKEN_KEYWORD_DEF: {
+            pm_node_list_t current_block_exits = { 0 };
+            pm_node_list_t *previous_block_exits = push_block_exits(parser, &current_block_exits);
+
+            pm_token_t def_keyword = parser->current;
+            size_t opening_newline_index = token_newline_index(parser);
+
+            pm_node_t *receiver = NULL;
+            pm_token_t operator = not_provided(parser);
+            pm_token_t name;
+
+            // This context is necessary for lexing `...` in a bare params
+            // correctly. It must be pushed before lexing the first param, so it
+            // is here.
+            context_push(parser, PM_CONTEXT_DEF_PARAMS);
+            parser_lex(parser);
+
+            // This will be false if the method name is not a valid identifier
+            // but could be followed by an operator.
+            bool valid_name = true;
+
+            switch (parser->current.type) {
+                case PM_CASE_OPERATOR:
+                    pm_parser_scope_push(parser, true);
+                    lex_state_set(parser, PM_LEX_STATE_ENDFN);
+                    parser_lex(parser);
+
+                    name = parser->previous;
+                    break;
+                case PM_TOKEN_IDENTIFIER: {
+                    parser_lex(parser);
+
+                    if (match2(parser, PM_TOKEN_DOT, PM_TOKEN_COLON_COLON)) {
+                        receiver = parse_variable_call(parser);
+
+                        pm_parser_scope_push(parser, true);
+                        lex_state_set(parser, PM_LEX_STATE_FNAME);
+                        parser_lex(parser);
+
+                        operator = parser->previous;
+                        name = parse_method_definition_name(parser);
+                    } else {
+                        pm_refute_numbered_parameter(parser, parser->previous.start, parser->previous.end);
+                        pm_parser_scope_push(parser, true);
+
+                        name = parser->previous;
+                    }
+
+                    break;
+                }
+                case PM_TOKEN_INSTANCE_VARIABLE:
+                case PM_TOKEN_CLASS_VARIABLE:
+                case PM_TOKEN_GLOBAL_VARIABLE:
+                    valid_name = false;
+                    PRISM_FALLTHROUGH
+                case PM_TOKEN_CONSTANT:
+                case PM_TOKEN_KEYWORD_NIL:
+                case PM_TOKEN_KEYWORD_SELF:
+                case PM_TOKEN_KEYWORD_TRUE:
+                case PM_TOKEN_KEYWORD_FALSE:
+                case PM_TOKEN_KEYWORD___FILE__:
+                case PM_TOKEN_KEYWORD___LINE__:
+                case PM_TOKEN_KEYWORD___ENCODING__: {
+                    pm_parser_scope_push(parser, true);
+                    parser_lex(parser);
+
+                    pm_token_t identifier = parser->previous;
+
+                    if (match2(parser, PM_TOKEN_DOT, PM_TOKEN_COLON_COLON)) {
+                        lex_state_set(parser, PM_LEX_STATE_FNAME);
+                        parser_lex(parser);
+                        operator = parser->previous;
+
+                        switch (identifier.type) {
+                            case PM_TOKEN_CONSTANT:
+                                receiver = (pm_node_t *) pm_constant_read_node_create(parser, &identifier);
+                                break;
+                            case PM_TOKEN_INSTANCE_VARIABLE:
+                                receiver = (pm_node_t *) pm_instance_variable_read_node_create(parser, &identifier);
+                                break;
+                            case PM_TOKEN_CLASS_VARIABLE:
+                                receiver = (pm_node_t *) pm_class_variable_read_node_create(parser, &identifier);
+                                break;
+                            case PM_TOKEN_GLOBAL_VARIABLE:
+                                receiver = (pm_node_t *) pm_global_variable_read_node_create(parser, &identifier);
+                                break;
+                            case PM_TOKEN_KEYWORD_NIL:
+                                receiver = (pm_node_t *) pm_nil_node_create(parser, &identifier);
+                                break;
+                            case PM_TOKEN_KEYWORD_SELF:
+                                receiver = (pm_node_t *) pm_self_node_create(parser, &identifier);
+                                break;
+                            case PM_TOKEN_KEYWORD_TRUE:
+                                receiver = (pm_node_t *) pm_true_node_create(parser, &identifier);
+                                break;
+                            case PM_TOKEN_KEYWORD_FALSE:
+                                receiver = (pm_node_t *) pm_false_node_create(parser, &identifier);
+                                break;
+                            case PM_TOKEN_KEYWORD___FILE__:
+                                receiver = (pm_node_t *) pm_source_file_node_create(parser, &identifier);
+                                break;
+                            case PM_TOKEN_KEYWORD___LINE__:
+                                receiver = (pm_node_t *) pm_source_line_node_create(parser, &identifier);
+                                break;
+                            case PM_TOKEN_KEYWORD___ENCODING__:
+                                receiver = (pm_node_t *) pm_source_encoding_node_create(parser, &identifier);
+                                break;
+                            default:
+                                break;
+                        }
+
+                        name = parse_method_definition_name(parser);
+                    } else {
+                        if (!valid_name) {
+                            PM_PARSER_ERR_TOKEN_FORMAT(parser, identifier, PM_ERR_DEF_NAME, pm_token_type_human(identifier.type));
+                        }
+
+                        name = identifier;
+                    }
+                    break;
+                }
+                case PM_TOKEN_PARENTHESIS_LEFT: {
+                    // The current context is `PM_CONTEXT_DEF_PARAMS`, however
+                    // the inner expression of this parenthesis should not be
+                    // processed under this context. Thus, the context is popped
+                    // here.
+                    context_pop(parser);
+                    parser_lex(parser);
+
+                    pm_token_t lparen = parser->previous;
+                    pm_node_t *expression = parse_value_expression(parser, PM_BINDING_POWER_COMPOSITION, true, false, PM_ERR_DEF_RECEIVER, (uint16_t) (depth + 1));
+
+                    accept1(parser, PM_TOKEN_NEWLINE);
+                    expect1(parser, PM_TOKEN_PARENTHESIS_RIGHT, PM_ERR_EXPECT_RPAREN);
+                    pm_token_t rparen = parser->previous;
+
+                    lex_state_set(parser, PM_LEX_STATE_FNAME);
+                    expect2(parser, PM_TOKEN_DOT, PM_TOKEN_COLON_COLON, PM_ERR_DEF_RECEIVER_TERM);
+
+                    operator = parser->previous;
+                    receiver = (pm_node_t *) pm_parentheses_node_create(parser, &lparen, expression, &rparen, 0);
+
+                    // To push `PM_CONTEXT_DEF_PARAMS` again is for the same
+                    // reason as described the above.
+                    pm_parser_scope_push(parser, true);
+                    context_push(parser, PM_CONTEXT_DEF_PARAMS);
+                    name = parse_method_definition_name(parser);
+                    break;
+                }
+                default:
+                    pm_parser_scope_push(parser, true);
+                    name = parse_method_definition_name(parser);
+                    break;
+            }
+
+            pm_token_t lparen;
+            pm_token_t rparen;
+            pm_parameters_node_t *params;
+
+            switch (parser->current.type) {
+                case PM_TOKEN_PARENTHESIS_LEFT: {
+                    parser_lex(parser);
+                    lparen = parser->previous;
+
+                    if (match1(parser, PM_TOKEN_PARENTHESIS_RIGHT)) {
+                        params = NULL;
+                    } else {
+                        params = parse_parameters(parser, PM_BINDING_POWER_DEFINED, true, false, true, true, false, (uint16_t) (depth + 1));
+                    }
+
+                    lex_state_set(parser, PM_LEX_STATE_BEG);
+                    parser->command_start = true;
+
+                    context_pop(parser);
+                    if (!accept1(parser, PM_TOKEN_PARENTHESIS_RIGHT)) {
+                        PM_PARSER_ERR_TOKEN_FORMAT(parser, parser->current, PM_ERR_DEF_PARAMS_TERM_PAREN, pm_token_type_human(parser->current.type));
+                        parser->previous.start = parser->previous.end;
+                        parser->previous.type = PM_TOKEN_MISSING;
+                    }
+
+                    rparen = parser->previous;
+                    break;
+                }
+                case PM_CASE_PARAMETER: {
+                    // If we're about to lex a label, we need to add the label
+                    // state to make sure the next newline is ignored.
+                    if (parser->current.type == PM_TOKEN_LABEL) {
+                        lex_state_set(parser, parser->lex_state | PM_LEX_STATE_LABEL);
+                    }
+
+                    lparen = not_provided(parser);
+                    rparen = not_provided(parser);
+                    params = parse_parameters(parser, PM_BINDING_POWER_DEFINED, false, false, true, true, false, (uint16_t) (depth + 1));
+
+                    context_pop(parser);
+                    break;
+                }
+                default: {
+                    lparen = not_provided(parser);
+                    rparen = not_provided(parser);
+                    params = NULL;
+
+                    context_pop(parser);
+                    break;
+                }
+            }
+
+            pm_node_t *statements = NULL;
+            pm_token_t equal;
+            pm_token_t end_keyword;
+
+            if (accept1(parser, PM_TOKEN_EQUAL)) {
+                if (token_is_setter_name(&name)) {
+                    pm_parser_err_token(parser, &name, PM_ERR_DEF_ENDLESS_SETTER);
+                }
+                equal = parser->previous;
+
+                context_push(parser, PM_CONTEXT_DEF);
+                pm_do_loop_stack_push(parser, false);
+                statements = (pm_node_t *) pm_statements_node_create(parser);
+
+                pm_node_t *statement = parse_expression(parser, PM_BINDING_POWER_DEFINED + 1, binding_power < PM_BINDING_POWER_COMPOSITION, false, PM_ERR_DEF_ENDLESS, (uint16_t) (depth + 1));
+
+                if (accept1(parser, PM_TOKEN_KEYWORD_RESCUE_MODIFIER)) {
+                    context_push(parser, PM_CONTEXT_RESCUE_MODIFIER);
+
+                    pm_token_t rescue_keyword = parser->previous;
+                    pm_node_t *value = parse_expression(parser, pm_binding_powers[PM_TOKEN_KEYWORD_RESCUE_MODIFIER].right, false, false, PM_ERR_RESCUE_MODIFIER_VALUE, (uint16_t) (depth + 1));
+                    context_pop(parser);
+
+                    statement = (pm_node_t *) pm_rescue_modifier_node_create(parser, statement, &rescue_keyword, value);
+                }
+
+                pm_statements_node_body_append(parser, (pm_statements_node_t *) statements, statement, false);
+                pm_do_loop_stack_pop(parser);
+                context_pop(parser);
+                end_keyword = not_provided(parser);
+            } else {
+                equal = not_provided(parser);
+
+                if (lparen.type == PM_TOKEN_NOT_PROVIDED) {
+                    lex_state_set(parser, PM_LEX_STATE_BEG);
+                    parser->command_start = true;
+                    expect2(parser, PM_TOKEN_NEWLINE, PM_TOKEN_SEMICOLON, PM_ERR_DEF_PARAMS_TERM);
+                } else {
+                    accept2(parser, PM_TOKEN_NEWLINE, PM_TOKEN_SEMICOLON);
+                }
+
+                pm_accepts_block_stack_push(parser, true);
+                pm_do_loop_stack_push(parser, false);
+
+                if (!match4(parser, PM_TOKEN_KEYWORD_RESCUE, PM_TOKEN_KEYWORD_ENSURE, PM_TOKEN_KEYWORD_ELSE, PM_TOKEN_KEYWORD_END)) {
+                    pm_accepts_block_stack_push(parser, true);
+                    statements = (pm_node_t *) parse_statements(parser, PM_CONTEXT_DEF, (uint16_t) (depth + 1));
+                    pm_accepts_block_stack_pop(parser);
+                }
+
+                if (match3(parser, PM_TOKEN_KEYWORD_RESCUE, PM_TOKEN_KEYWORD_ENSURE, PM_TOKEN_KEYWORD_ELSE)) {
+                    assert(statements == NULL || PM_NODE_TYPE_P(statements, PM_STATEMENTS_NODE));
+                    statements = (pm_node_t *) parse_rescues_implicit_begin(parser, opening_newline_index, &def_keyword, def_keyword.start, (pm_statements_node_t *) statements, PM_RESCUES_DEF, (uint16_t) (depth + 1));
+                } else {
+                    parser_warn_indentation_mismatch(parser, opening_newline_index, &def_keyword, false, false);
+                }
+
+                pm_accepts_block_stack_pop(parser);
+                pm_do_loop_stack_pop(parser);
+
+                expect1(parser, PM_TOKEN_KEYWORD_END, PM_ERR_DEF_TERM);
+                end_keyword = parser->previous;
+            }
+
+            pm_constant_id_list_t locals;
+            pm_locals_order(parser, &parser->current_scope->locals, &locals, false);
+            pm_parser_scope_pop(parser);
+
+            /**
+             * If the final character is @. As is the case when defining
+             * methods to override the unary operators, we should ignore
+             * the @ in the same way we do for symbols.
+             */
+            pm_constant_id_t name_id = pm_parser_constant_id_location(parser, name.start, parse_operator_symbol_name(&name));
+
+            flush_block_exits(parser, previous_block_exits);
+            pm_node_list_free(&current_block_exits);
+
+            return (pm_node_t *) pm_def_node_create(
+                parser,
+                name_id,
+                &name,
+                receiver,
+                params,
+                statements,
+                &locals,
+                &def_keyword,
+                &operator,
+                &lparen,
+                &rparen,
+                &equal,
+                &end_keyword
+            );
+        }
+        case PM_TOKEN_KEYWORD_DEFINED: {
+            parser_lex(parser);
+            pm_token_t keyword = parser->previous;
+
+            pm_token_t lparen;
+            pm_token_t rparen;
+            pm_node_t *expression;
+
+            context_push(parser, PM_CONTEXT_DEFINED);
+            bool newline = accept1(parser, PM_TOKEN_NEWLINE);
+
+            if (accept1(parser, PM_TOKEN_PARENTHESIS_LEFT)) {
+                lparen = parser->previous;
+
+                if (newline && accept1(parser, PM_TOKEN_PARENTHESIS_RIGHT)) {
+                    expression = (pm_node_t *) pm_parentheses_node_create(parser, &lparen, NULL, &parser->previous, 0);
+                    lparen = not_provided(parser);
+                    rparen = not_provided(parser);
+                } else {
+                    expression = parse_expression(parser, PM_BINDING_POWER_COMPOSITION, true, false, PM_ERR_DEFINED_EXPRESSION, (uint16_t) (depth + 1));
+
+                    if (parser->recovering) {
+                        rparen = not_provided(parser);
+                    } else {
+                        accept1(parser, PM_TOKEN_NEWLINE);
+                        expect1(parser, PM_TOKEN_PARENTHESIS_RIGHT, PM_ERR_EXPECT_RPAREN);
+                        rparen = parser->previous;
+                    }
+                }
+            } else {
+                lparen = not_provided(parser);
+                rparen = not_provided(parser);
+                expression = parse_expression(parser, PM_BINDING_POWER_DEFINED, false, false, PM_ERR_DEFINED_EXPRESSION, (uint16_t) (depth + 1));
+            }
+
+            context_pop(parser);
+            return (pm_node_t *) pm_defined_node_create(
+                parser,
+                &lparen,
+                expression,
+                &rparen,
+                &PM_LOCATION_TOKEN_VALUE(&keyword)
+            );
+        }
+        case PM_TOKEN_KEYWORD_END_UPCASE: {
+            if (binding_power != PM_BINDING_POWER_STATEMENT) {
+                pm_parser_err_current(parser, PM_ERR_STATEMENT_POSTEXE_END);
+            }
+
+            parser_lex(parser);
+            pm_token_t keyword = parser->previous;
+
+            if (context_def_p(parser)) {
+                pm_parser_warn_token(parser, &keyword, PM_WARN_END_IN_METHOD);
+            }
+
+            expect1(parser, PM_TOKEN_BRACE_LEFT, PM_ERR_END_UPCASE_BRACE);
+            pm_token_t opening = parser->previous;
+            pm_statements_node_t *statements = parse_statements(parser, PM_CONTEXT_POSTEXE, (uint16_t) (depth + 1));
+
+            expect1(parser, PM_TOKEN_BRACE_RIGHT, PM_ERR_END_UPCASE_TERM);
+            return (pm_node_t *) pm_post_execution_node_create(parser, &keyword, &opening, statements, &parser->previous);
+        }
+        case PM_TOKEN_KEYWORD_FALSE:
+            parser_lex(parser);
+            return (pm_node_t *) pm_false_node_create(parser, &parser->previous);
+        case PM_TOKEN_KEYWORD_FOR: {
+            size_t opening_newline_index = token_newline_index(parser);
+            parser_lex(parser);
+
+            pm_token_t for_keyword = parser->previous;
+            pm_node_t *index;
+
+            context_push(parser, PM_CONTEXT_FOR_INDEX);
+
+            // First, parse out the first index expression.
+            if (accept1(parser, PM_TOKEN_USTAR)) {
+                pm_token_t star_operator = parser->previous;
+                pm_node_t *name = NULL;
+
+                if (token_begins_expression_p(parser->current.type)) {
+                    name = parse_expression(parser, PM_BINDING_POWER_INDEX, false, false, PM_ERR_EXPECT_EXPRESSION_AFTER_STAR, (uint16_t) (depth + 1));
+                }
+
+                index = (pm_node_t *) pm_splat_node_create(parser, &star_operator, name);
+            } else if (token_begins_expression_p(parser->current.type)) {
+                index = parse_expression(parser, PM_BINDING_POWER_INDEX, false, false, PM_ERR_EXPECT_EXPRESSION_AFTER_COMMA, (uint16_t) (depth + 1));
+            } else {
+                pm_parser_err_token(parser, &for_keyword, PM_ERR_FOR_INDEX);
+                index = (pm_node_t *) pm_missing_node_create(parser, for_keyword.start, for_keyword.end);
+            }
+
+            // Now, if there are multiple index expressions, parse them out.
+            if (match1(parser, PM_TOKEN_COMMA)) {
+                index = parse_targets(parser, index, PM_BINDING_POWER_INDEX, (uint16_t) (depth + 1));
+            } else {
+                index = parse_target(parser, index, false, false);
+            }
+
+            context_pop(parser);
+            pm_do_loop_stack_push(parser, true);
+
+            expect1(parser, PM_TOKEN_KEYWORD_IN, PM_ERR_FOR_IN);
+            pm_token_t in_keyword = parser->previous;
+
+            pm_node_t *collection = parse_value_expression(parser, PM_BINDING_POWER_COMPOSITION, true, false, PM_ERR_FOR_COLLECTION, (uint16_t) (depth + 1));
+            pm_do_loop_stack_pop(parser);
+
+            pm_token_t do_keyword;
+            if (accept1(parser, PM_TOKEN_KEYWORD_DO_LOOP)) {
+                do_keyword = parser->previous;
+            } else {
+                do_keyword = not_provided(parser);
+                if (!match2(parser, PM_TOKEN_SEMICOLON, PM_TOKEN_NEWLINE)) {
+                    PM_PARSER_ERR_TOKEN_FORMAT(parser, parser->current, PM_ERR_EXPECT_FOR_DELIMITER, pm_token_type_human(parser->current.type));
+                }
+            }
+
+            pm_statements_node_t *statements = NULL;
+            if (!match1(parser, PM_TOKEN_KEYWORD_END)) {
+                statements = parse_statements(parser, PM_CONTEXT_FOR, (uint16_t) (depth + 1));
+            }
+
+            parser_warn_indentation_mismatch(parser, opening_newline_index, &for_keyword, false, false);
+            expect1(parser, PM_TOKEN_KEYWORD_END, PM_ERR_FOR_TERM);
+
+            return (pm_node_t *) pm_for_node_create(parser, index, collection, statements, &for_keyword, &in_keyword, &do_keyword, &parser->previous);
+        }
+        case PM_TOKEN_KEYWORD_IF:
+            if (parser_end_of_line_p(parser)) {
+                PM_PARSER_WARN_TOKEN_FORMAT_CONTENT(parser, parser->current, PM_WARN_KEYWORD_EOL);
+            }
+
+            size_t opening_newline_index = token_newline_index(parser);
+            bool if_after_else = parser->previous.type == PM_TOKEN_KEYWORD_ELSE;
+            parser_lex(parser);
+
+            return parse_conditional(parser, PM_CONTEXT_IF, opening_newline_index, if_after_else, (uint16_t) (depth + 1));
+        case PM_TOKEN_KEYWORD_UNDEF: {
+            if (binding_power != PM_BINDING_POWER_STATEMENT) {
+                pm_parser_err_current(parser, PM_ERR_STATEMENT_UNDEF);
+            }
+
+            parser_lex(parser);
+            pm_undef_node_t *undef = pm_undef_node_create(parser, &parser->previous);
+            pm_node_t *name = parse_undef_argument(parser, (uint16_t) (depth + 1));
+
+            if (PM_NODE_TYPE_P(name, PM_MISSING_NODE)) {
+                pm_node_destroy(parser, name);
+            } else {
+                pm_undef_node_append(undef, name);
+
+                while (match1(parser, PM_TOKEN_COMMA)) {
+                    lex_state_set(parser, PM_LEX_STATE_FNAME | PM_LEX_STATE_FITEM);
+                    parser_lex(parser);
+                    name = parse_undef_argument(parser, (uint16_t) (depth + 1));
+
+                    if (PM_NODE_TYPE_P(name, PM_MISSING_NODE)) {
+                        pm_node_destroy(parser, name);
+                        break;
+                    }
+
+                    pm_undef_node_append(undef, name);
+                }
+            }
+
+            return (pm_node_t *) undef;
+        }
+        case PM_TOKEN_KEYWORD_NOT: {
+            parser_lex(parser);
+
+            pm_token_t message = parser->previous;
+            pm_arguments_t arguments = { 0 };
+            pm_node_t *receiver = NULL;
+
+            accept1(parser, PM_TOKEN_NEWLINE);
+
+            if (accept1(parser, PM_TOKEN_PARENTHESIS_LEFT)) {
+                pm_token_t lparen = parser->previous;
+
+                if (accept1(parser, PM_TOKEN_PARENTHESIS_RIGHT)) {
+                    receiver = (pm_node_t *) pm_parentheses_node_create(parser, &lparen, NULL, &parser->previous, 0);
+                } else {
+                    arguments.opening_loc = PM_LOCATION_TOKEN_VALUE(&lparen);
+                    receiver = parse_expression(parser, PM_BINDING_POWER_COMPOSITION, true, false, PM_ERR_NOT_EXPRESSION, (uint16_t) (depth + 1));
+
+                    if (!parser->recovering) {
+                        accept1(parser, PM_TOKEN_NEWLINE);
+                        expect1(parser, PM_TOKEN_PARENTHESIS_RIGHT, PM_ERR_EXPECT_RPAREN);
+                        arguments.closing_loc = PM_LOCATION_TOKEN_VALUE(&parser->previous);
+                    }
+                }
+            } else {
+                receiver = parse_expression(parser, PM_BINDING_POWER_NOT, true, false, PM_ERR_NOT_EXPRESSION, (uint16_t) (depth + 1));
+            }
+
+            return (pm_node_t *) pm_call_node_not_create(parser, receiver, &message, &arguments);
+        }
+        case PM_TOKEN_KEYWORD_UNLESS: {
+            size_t opening_newline_index = token_newline_index(parser);
+            parser_lex(parser);
+
+            return parse_conditional(parser, PM_CONTEXT_UNLESS, opening_newline_index, false, (uint16_t) (depth + 1));
+        }
+        case PM_TOKEN_KEYWORD_MODULE: {
+            pm_node_list_t current_block_exits = { 0 };
+            pm_node_list_t *previous_block_exits = push_block_exits(parser, &current_block_exits);
+
+            size_t opening_newline_index = token_newline_index(parser);
+            parser_lex(parser);
+            pm_token_t module_keyword = parser->previous;
+
+            pm_node_t *constant_path = parse_expression(parser, PM_BINDING_POWER_INDEX, false, false, PM_ERR_MODULE_NAME, (uint16_t) (depth + 1));
+            pm_token_t name;
+
+            // If we can recover from a syntax error that occurred while parsing
+            // the name of the module, then we'll handle that here.
+            if (PM_NODE_TYPE_P(constant_path, PM_MISSING_NODE)) {
+                pop_block_exits(parser, previous_block_exits);
+                pm_node_list_free(&current_block_exits);
+
+                pm_token_t missing = (pm_token_t) { .type = PM_TOKEN_MISSING, .start = parser->previous.end, .end = parser->previous.end };
+                return (pm_node_t *) pm_module_node_create(parser, NULL, &module_keyword, constant_path, &missing, NULL, &missing);
+            }
+
+            while (accept1(parser, PM_TOKEN_COLON_COLON)) {
+                pm_token_t double_colon = parser->previous;
+
+                expect1(parser, PM_TOKEN_CONSTANT, PM_ERR_CONSTANT_PATH_COLON_COLON_CONSTANT);
+                constant_path = (pm_node_t *) pm_constant_path_node_create(parser, constant_path, &double_colon, &parser->previous);
+            }
+
+            // Here we retrieve the name of the module. If it wasn't a constant,
+            // then it's possible that `module foo` was passed, which is a
+            // syntax error. We handle that here as well.
+            name = parser->previous;
+            if (name.type != PM_TOKEN_CONSTANT) {
+                pm_parser_err_token(parser, &name, PM_ERR_MODULE_NAME);
+            }
+
+            pm_parser_scope_push(parser, true);
+            accept2(parser, PM_TOKEN_SEMICOLON, PM_TOKEN_NEWLINE);
+            pm_node_t *statements = NULL;
+
+            if (!match4(parser, PM_TOKEN_KEYWORD_RESCUE, PM_TOKEN_KEYWORD_ENSURE, PM_TOKEN_KEYWORD_ELSE, PM_TOKEN_KEYWORD_END)) {
+                pm_accepts_block_stack_push(parser, true);
+                statements = (pm_node_t *) parse_statements(parser, PM_CONTEXT_MODULE, (uint16_t) (depth + 1));
+                pm_accepts_block_stack_pop(parser);
+            }
+
+            if (match3(parser, PM_TOKEN_KEYWORD_RESCUE, PM_TOKEN_KEYWORD_ENSURE, PM_TOKEN_KEYWORD_ELSE)) {
+                assert(statements == NULL || PM_NODE_TYPE_P(statements, PM_STATEMENTS_NODE));
+                statements = (pm_node_t *) parse_rescues_implicit_begin(parser, opening_newline_index, &module_keyword, module_keyword.start, (pm_statements_node_t *) statements, PM_RESCUES_MODULE, (uint16_t) (depth + 1));
+            } else {
+                parser_warn_indentation_mismatch(parser, opening_newline_index, &module_keyword, false, false);
+            }
+
+            pm_constant_id_list_t locals;
+            pm_locals_order(parser, &parser->current_scope->locals, &locals, false);
+
+            pm_parser_scope_pop(parser);
+            expect1(parser, PM_TOKEN_KEYWORD_END, PM_ERR_MODULE_TERM);
+
+            if (context_def_p(parser)) {
+                pm_parser_err_token(parser, &module_keyword, PM_ERR_MODULE_IN_METHOD);
+            }
+
+            pop_block_exits(parser, previous_block_exits);
+            pm_node_list_free(&current_block_exits);
+
+            return (pm_node_t *) pm_module_node_create(parser, &locals, &module_keyword, constant_path, &name, statements, &parser->previous);
+        }
+        case PM_TOKEN_KEYWORD_NIL:
+            parser_lex(parser);
+            return (pm_node_t *) pm_nil_node_create(parser, &parser->previous);
+        case PM_TOKEN_KEYWORD_REDO: {
+            parser_lex(parser);
+
+            pm_node_t *node = (pm_node_t *) pm_redo_node_create(parser, &parser->previous);
+            if (!parser->partial_script) parse_block_exit(parser, node);
+
+            return node;
+        }
+        case PM_TOKEN_KEYWORD_RETRY: {
+            parser_lex(parser);
+
+            pm_node_t *node = (pm_node_t *) pm_retry_node_create(parser, &parser->previous);
+            parse_retry(parser, node);
+
+            return node;
+        }
+        case PM_TOKEN_KEYWORD_SELF:
+            parser_lex(parser);
+            return (pm_node_t *) pm_self_node_create(parser, &parser->previous);
+        case PM_TOKEN_KEYWORD_TRUE:
+            parser_lex(parser);
+            return (pm_node_t *) pm_true_node_create(parser, &parser->previous);
+        case PM_TOKEN_KEYWORD_UNTIL: {
+            size_t opening_newline_index = token_newline_index(parser);
+
+            context_push(parser, PM_CONTEXT_LOOP_PREDICATE);
+            pm_do_loop_stack_push(parser, true);
+
+            parser_lex(parser);
+            pm_token_t keyword = parser->previous;
+            pm_node_t *predicate = parse_value_expression(parser, PM_BINDING_POWER_COMPOSITION, true, false, PM_ERR_CONDITIONAL_UNTIL_PREDICATE, (uint16_t) (depth + 1));
+
+            pm_do_loop_stack_pop(parser);
+            context_pop(parser);
+
+            pm_token_t do_keyword;
+            if (accept1(parser, PM_TOKEN_KEYWORD_DO_LOOP)) {
+                do_keyword = parser->previous;
+            } else {
+                do_keyword = not_provided(parser);
+                expect2(parser, PM_TOKEN_NEWLINE, PM_TOKEN_SEMICOLON, PM_ERR_CONDITIONAL_UNTIL_PREDICATE);
+            }
+
+            pm_statements_node_t *statements = NULL;
+            if (!match1(parser, PM_TOKEN_KEYWORD_END)) {
+                pm_accepts_block_stack_push(parser, true);
+                statements = parse_statements(parser, PM_CONTEXT_UNTIL, (uint16_t) (depth + 1));
+                pm_accepts_block_stack_pop(parser);
+                accept2(parser, PM_TOKEN_NEWLINE, PM_TOKEN_SEMICOLON);
+            }
+
+            parser_warn_indentation_mismatch(parser, opening_newline_index, &keyword, false, false);
+            expect1(parser, PM_TOKEN_KEYWORD_END, PM_ERR_UNTIL_TERM);
+
+            return (pm_node_t *) pm_until_node_create(parser, &keyword, &do_keyword, &parser->previous, predicate, statements, 0);
+        }
+        case PM_TOKEN_KEYWORD_WHILE: {
+            size_t opening_newline_index = token_newline_index(parser);
+
+            context_push(parser, PM_CONTEXT_LOOP_PREDICATE);
+            pm_do_loop_stack_push(parser, true);
+
+            parser_lex(parser);
+            pm_token_t keyword = parser->previous;
+            pm_node_t *predicate = parse_value_expression(parser, PM_BINDING_POWER_COMPOSITION, true, false, PM_ERR_CONDITIONAL_WHILE_PREDICATE, (uint16_t) (depth + 1));
+
+            pm_do_loop_stack_pop(parser);
+            context_pop(parser);
+
+            pm_token_t do_keyword;
+            if (accept1(parser, PM_TOKEN_KEYWORD_DO_LOOP)) {
+                do_keyword = parser->previous;
+            } else {
+                do_keyword = not_provided(parser);
+                expect2(parser, PM_TOKEN_NEWLINE, PM_TOKEN_SEMICOLON, PM_ERR_CONDITIONAL_WHILE_PREDICATE);
+            }
+
+            pm_statements_node_t *statements = NULL;
+            if (!match1(parser, PM_TOKEN_KEYWORD_END)) {
+                pm_accepts_block_stack_push(parser, true);
+                statements = parse_statements(parser, PM_CONTEXT_WHILE, (uint16_t) (depth + 1));
+                pm_accepts_block_stack_pop(parser);
+                accept2(parser, PM_TOKEN_NEWLINE, PM_TOKEN_SEMICOLON);
+            }
+
+            parser_warn_indentation_mismatch(parser, opening_newline_index, &keyword, false, false);
+            expect1(parser, PM_TOKEN_KEYWORD_END, PM_ERR_WHILE_TERM);
+
+            return (pm_node_t *) pm_while_node_create(parser, &keyword, &do_keyword, &parser->previous, predicate, statements, 0);
+        }
+        case PM_TOKEN_PERCENT_LOWER_I: {
+            parser_lex(parser);
+            pm_token_t opening = parser->previous;
+            pm_array_node_t *array = pm_array_node_create(parser, &opening);
+
+            while (!match2(parser, PM_TOKEN_STRING_END, PM_TOKEN_EOF)) {
+                accept1(parser, PM_TOKEN_WORDS_SEP);
+                if (match1(parser, PM_TOKEN_STRING_END)) break;
+
+                if (match1(parser, PM_TOKEN_STRING_CONTENT)) {
+                    pm_token_t opening = not_provided(parser);
+                    pm_token_t closing = not_provided(parser);
+                    pm_array_node_elements_append(array, (pm_node_t *) pm_symbol_node_create_current_string(parser, &opening, &parser->current, &closing));
+                }
+
+                expect1(parser, PM_TOKEN_STRING_CONTENT, PM_ERR_LIST_I_LOWER_ELEMENT);
+            }
+
+            pm_token_t closing = parser->current;
+            if (match1(parser, PM_TOKEN_EOF)) {
+                pm_parser_err_token(parser, &opening, PM_ERR_LIST_I_LOWER_TERM);
+                closing = (pm_token_t) { .type = PM_TOKEN_MISSING, .start = parser->previous.end, .end = parser->previous.end };
+            } else {
+                expect1(parser, PM_TOKEN_STRING_END, PM_ERR_LIST_I_LOWER_TERM);
+            }
+            pm_array_node_close_set(array, &closing);
+
+            return (pm_node_t *) array;
+        }
+        case PM_TOKEN_PERCENT_UPPER_I: {
+            parser_lex(parser);
+            pm_token_t opening = parser->previous;
+            pm_array_node_t *array = pm_array_node_create(parser, &opening);
+
+            // This is the current node that we are parsing that will be added to the
+            // list of elements.
+            pm_node_t *current = NULL;
+
+            while (!match2(parser, PM_TOKEN_STRING_END, PM_TOKEN_EOF)) {
+                switch (parser->current.type) {
+                    case PM_TOKEN_WORDS_SEP: {
+                        if (current == NULL) {
+                            // If we hit a separator before we have any content, then we don't
+                            // need to do anything.
+                        } else {
+                            // If we hit a separator after we've hit content, then we need to
+                            // append that content to the list and reset the current node.
+                            pm_array_node_elements_append(array, current);
+                            current = NULL;
+                        }
+
+                        parser_lex(parser);
+                        break;
+                    }
+                    case PM_TOKEN_STRING_CONTENT: {
+                        pm_token_t opening = not_provided(parser);
+                        pm_token_t closing = not_provided(parser);
+
+                        if (current == NULL) {
+                            // If we hit content and the current node is NULL, then this is
+                            // the first string content we've seen. In that case we're going
+                            // to create a new string node and set that to the current.
+                            current = (pm_node_t *) pm_symbol_node_create_current_string(parser, &opening, &parser->current, &closing);
+                            parser_lex(parser);
+                        } else if (PM_NODE_TYPE_P(current, PM_INTERPOLATED_SYMBOL_NODE)) {
+                            // If we hit string content and the current node is an
+                            // interpolated string, then we need to append the string content
+                            // to the list of child nodes.
+                            pm_node_t *string = (pm_node_t *) pm_string_node_create_current_string(parser, &opening, &parser->current, &closing);
+                            parser_lex(parser);
+
+                            pm_interpolated_symbol_node_append((pm_interpolated_symbol_node_t *) current, string);
+                        } else if (PM_NODE_TYPE_P(current, PM_SYMBOL_NODE)) {
+                            // If we hit string content and the current node is a symbol node,
+                            // then we need to convert the current node into an interpolated
+                            // string and add the string content to the list of child nodes.
+                            pm_symbol_node_t *cast = (pm_symbol_node_t *) current;
+                            pm_token_t bounds = not_provided(parser);
+
+                            pm_token_t content = { .type = PM_TOKEN_STRING_CONTENT, .start = cast->value_loc.start, .end = cast->value_loc.end };
+                            pm_node_t *first_string = (pm_node_t *) pm_string_node_create_unescaped(parser, &bounds, &content, &bounds, &cast->unescaped);
+                            pm_node_t *second_string = (pm_node_t *) pm_string_node_create_current_string(parser, &opening, &parser->previous, &closing);
+                            parser_lex(parser);
+
+                            pm_interpolated_symbol_node_t *interpolated = pm_interpolated_symbol_node_create(parser, &opening, NULL, &closing);
+                            pm_interpolated_symbol_node_append(interpolated, first_string);
+                            pm_interpolated_symbol_node_append(interpolated, second_string);
+
+                            xfree(current);
+                            current = (pm_node_t *) interpolated;
+                        } else {
+                            assert(false && "unreachable");
+                        }
+
+                        break;
+                    }
+                    case PM_TOKEN_EMBVAR: {
+                        bool start_location_set = false;
+                        if (current == NULL) {
+                            // If we hit an embedded variable and the current node is NULL,
+                            // then this is the start of a new string. We'll set the current
+                            // node to a new interpolated string.
+                            pm_token_t opening = not_provided(parser);
+                            pm_token_t closing = not_provided(parser);
+                            current = (pm_node_t *) pm_interpolated_symbol_node_create(parser, &opening, NULL, &closing);
+                        } else if (PM_NODE_TYPE_P(current, PM_SYMBOL_NODE)) {
+                            // If we hit an embedded variable and the current node is a string
+                            // node, then we'll convert the current into an interpolated
+                            // string and add the string node to the list of parts.
+                            pm_token_t opening = not_provided(parser);
+                            pm_token_t closing = not_provided(parser);
+                            pm_interpolated_symbol_node_t *interpolated = pm_interpolated_symbol_node_create(parser, &opening, NULL, &closing);
+
+                            current = (pm_node_t *) pm_symbol_node_to_string_node(parser, (pm_symbol_node_t *) current);
+                            pm_interpolated_symbol_node_append(interpolated, current);
+                            interpolated->base.location.start = current->location.start;
+                            start_location_set = true;
+                            current = (pm_node_t *) interpolated;
+                        } else {
+                            // If we hit an embedded variable and the current node is an
+                            // interpolated string, then we'll just add the embedded variable.
+                        }
+
+                        pm_node_t *part = parse_string_part(parser, (uint16_t) (depth + 1));
+                        pm_interpolated_symbol_node_append((pm_interpolated_symbol_node_t *) current, part);
+                        if (!start_location_set) {
+                            current->location.start = part->location.start;
+                        }
+                        break;
+                    }
+                    case PM_TOKEN_EMBEXPR_BEGIN: {
+                        bool start_location_set = false;
+                        if (current == NULL) {
+                            // If we hit an embedded expression and the current node is NULL,
+                            // then this is the start of a new string. We'll set the current
+                            // node to a new interpolated string.
+                            pm_token_t opening = not_provided(parser);
+                            pm_token_t closing = not_provided(parser);
+                            current = (pm_node_t *) pm_interpolated_symbol_node_create(parser, &opening, NULL, &closing);
+                        } else if (PM_NODE_TYPE_P(current, PM_SYMBOL_NODE)) {
+                            // If we hit an embedded expression and the current node is a
+                            // string node, then we'll convert the current into an
+                            // interpolated string and add the string node to the list of
+                            // parts.
+                            pm_token_t opening = not_provided(parser);
+                            pm_token_t closing = not_provided(parser);
+                            pm_interpolated_symbol_node_t *interpolated = pm_interpolated_symbol_node_create(parser, &opening, NULL, &closing);
+
+                            current = (pm_node_t *) pm_symbol_node_to_string_node(parser, (pm_symbol_node_t *) current);
+                            pm_interpolated_symbol_node_append(interpolated, current);
+                            interpolated->base.location.start = current->location.start;
+                            start_location_set = true;
+                            current = (pm_node_t *) interpolated;
+                        } else if (PM_NODE_TYPE_P(current, PM_INTERPOLATED_SYMBOL_NODE)) {
+                            // If we hit an embedded expression and the current node is an
+                            // interpolated string, then we'll just continue on.
+                        } else {
+                            assert(false && "unreachable");
+                        }
+
+                        pm_node_t *part = parse_string_part(parser, (uint16_t) (depth + 1));
+                        pm_interpolated_symbol_node_append((pm_interpolated_symbol_node_t *) current, part);
+                        if (!start_location_set) {
+                            current->location.start = part->location.start;
+                        }
+                        break;
+                    }
+                    default:
+                        expect1(parser, PM_TOKEN_STRING_CONTENT, PM_ERR_LIST_I_UPPER_ELEMENT);
+                        parser_lex(parser);
+                        break;
+                }
+            }
+
+            // If we have a current node, then we need to append it to the list.
+            if (current) {
+                pm_array_node_elements_append(array, current);
+            }
+
+            pm_token_t closing = parser->current;
+            if (match1(parser, PM_TOKEN_EOF)) {
+                pm_parser_err_token(parser, &opening, PM_ERR_LIST_I_UPPER_TERM);
+                closing = (pm_token_t) { .type = PM_TOKEN_MISSING, .start = parser->previous.end, .end = parser->previous.end };
+            } else {
+                expect1(parser, PM_TOKEN_STRING_END, PM_ERR_LIST_I_UPPER_TERM);
+            }
+            pm_array_node_close_set(array, &closing);
+
+            return (pm_node_t *) array;
+        }
+        case PM_TOKEN_PERCENT_LOWER_W: {
+            parser_lex(parser);
+            pm_token_t opening = parser->previous;
+            pm_array_node_t *array = pm_array_node_create(parser, &opening);
+
+            // skip all leading whitespaces
+            accept1(parser, PM_TOKEN_WORDS_SEP);
+
+            while (!match2(parser, PM_TOKEN_STRING_END, PM_TOKEN_EOF)) {
+                accept1(parser, PM_TOKEN_WORDS_SEP);
+                if (match1(parser, PM_TOKEN_STRING_END)) break;
+
+                if (match1(parser, PM_TOKEN_STRING_CONTENT)) {
+                    pm_token_t opening = not_provided(parser);
+                    pm_token_t closing = not_provided(parser);
+
+                    pm_node_t *string = (pm_node_t *) pm_string_node_create_current_string(parser, &opening, &parser->current, &closing);
+                    pm_array_node_elements_append(array, string);
+                }
+
+                expect1(parser, PM_TOKEN_STRING_CONTENT, PM_ERR_LIST_W_LOWER_ELEMENT);
+            }
+
+            pm_token_t closing = parser->current;
+            if (match1(parser, PM_TOKEN_EOF)) {
+                pm_parser_err_token(parser, &opening, PM_ERR_LIST_W_LOWER_TERM);
+                closing = (pm_token_t) { .type = PM_TOKEN_MISSING, .start = parser->previous.end, .end = parser->previous.end };
+            } else {
+                expect1(parser, PM_TOKEN_STRING_END, PM_ERR_LIST_W_LOWER_TERM);
+            }
+
+            pm_array_node_close_set(array, &closing);
+            return (pm_node_t *) array;
+        }
+        case PM_TOKEN_PERCENT_UPPER_W: {
+            parser_lex(parser);
+            pm_token_t opening = parser->previous;
+            pm_array_node_t *array = pm_array_node_create(parser, &opening);
+
+            // This is the current node that we are parsing that will be added
+            // to the list of elements.
+            pm_node_t *current = NULL;
+
+            while (!match2(parser, PM_TOKEN_STRING_END, PM_TOKEN_EOF)) {
+                switch (parser->current.type) {
+                    case PM_TOKEN_WORDS_SEP: {
+                        // Reset the explicit encoding if we hit a separator
+                        // since each element can have its own encoding.
+                        parser->explicit_encoding = NULL;
+
+                        if (current == NULL) {
+                            // If we hit a separator before we have any content,
+                            // then we don't need to do anything.
+                        } else {
+                            // If we hit a separator after we've hit content,
+                            // then we need to append that content to the list
+                            // and reset the current node.
+                            pm_array_node_elements_append(array, current);
+                            current = NULL;
+                        }
+
+                        parser_lex(parser);
+                        break;
+                    }
+                    case PM_TOKEN_STRING_CONTENT: {
+                        pm_token_t opening = not_provided(parser);
+                        pm_token_t closing = not_provided(parser);
+
+                        pm_node_t *string = (pm_node_t *) pm_string_node_create_current_string(parser, &opening, &parser->current, &closing);
+                        pm_node_flag_set(string, parse_unescaped_encoding(parser));
+                        parser_lex(parser);
+
+                        if (current == NULL) {
+                            // If we hit content and the current node is NULL,
+                            // then this is the first string content we've seen.
+                            // In that case we're going to create a new string
+                            // node and set that to the current.
+                            current = string;
+                        } else if (PM_NODE_TYPE_P(current, PM_INTERPOLATED_STRING_NODE)) {
+                            // If we hit string content and the current node is
+                            // an interpolated string, then we need to append
+                            // the string content to the list of child nodes.
+                            pm_interpolated_string_node_append((pm_interpolated_string_node_t *) current, string);
+                        } else if (PM_NODE_TYPE_P(current, PM_STRING_NODE)) {
+                            // If we hit string content and the current node is
+                            // a string node, then we need to convert the
+                            // current node into an interpolated string and add
+                            // the string content to the list of child nodes.
+                            pm_interpolated_string_node_t *interpolated = pm_interpolated_string_node_create(parser, &opening, NULL, &closing);
+                            pm_interpolated_string_node_append(interpolated, current);
+                            pm_interpolated_string_node_append(interpolated, string);
+                            current = (pm_node_t *) interpolated;
+                        } else {
+                            assert(false && "unreachable");
+                        }
+
+                        break;
+                    }
+                    case PM_TOKEN_EMBVAR: {
+                        if (current == NULL) {
+                            // If we hit an embedded variable and the current
+                            // node is NULL, then this is the start of a new
+                            // string. We'll set the current node to a new
+                            // interpolated string.
+                            pm_token_t opening = not_provided(parser);
+                            pm_token_t closing = not_provided(parser);
+                            current = (pm_node_t *) pm_interpolated_string_node_create(parser, &opening, NULL, &closing);
+                        } else if (PM_NODE_TYPE_P(current, PM_STRING_NODE)) {
+                            // If we hit an embedded variable and the current
+                            // node is a string node, then we'll convert the
+                            // current into an interpolated string and add the
+                            // string node to the list of parts.
+                            pm_token_t opening = not_provided(parser);
+                            pm_token_t closing = not_provided(parser);
+                            pm_interpolated_string_node_t *interpolated = pm_interpolated_string_node_create(parser, &opening, NULL, &closing);
+                            pm_interpolated_string_node_append(interpolated, current);
+                            current = (pm_node_t *) interpolated;
+                        } else {
+                            // If we hit an embedded variable and the current
+                            // node is an interpolated string, then we'll just
+                            // add the embedded variable.
+                        }
+
+                        pm_node_t *part = parse_string_part(parser, (uint16_t) (depth + 1));
+                        pm_interpolated_string_node_append((pm_interpolated_string_node_t *) current, part);
+                        break;
+                    }
+                    case PM_TOKEN_EMBEXPR_BEGIN: {
+                        if (current == NULL) {
+                            // If we hit an embedded expression and the current
+                            // node is NULL, then this is the start of a new
+                            // string. We'll set the current node to a new
+                            // interpolated string.
+                            pm_token_t opening = not_provided(parser);
+                            pm_token_t closing = not_provided(parser);
+                            current = (pm_node_t *) pm_interpolated_string_node_create(parser, &opening, NULL, &closing);
+                        } else if (PM_NODE_TYPE_P(current, PM_STRING_NODE)) {
+                            // If we hit an embedded expression and the current
+                            // node is a string node, then we'll convert the
+                            // current into an interpolated string and add the
+                            // string node to the list of parts.
+                            pm_token_t opening = not_provided(parser);
+                            pm_token_t closing = not_provided(parser);
+                            pm_interpolated_string_node_t *interpolated = pm_interpolated_string_node_create(parser, &opening, NULL, &closing);
+                            pm_interpolated_string_node_append(interpolated, current);
+                            current = (pm_node_t *) interpolated;
+                        } else if (PM_NODE_TYPE_P(current, PM_INTERPOLATED_STRING_NODE)) {
+                            // If we hit an embedded expression and the current
+                            // node is an interpolated string, then we'll just
+                            // continue on.
+                        } else {
+                            assert(false && "unreachable");
+                        }
+
+                        pm_node_t *part = parse_string_part(parser, (uint16_t) (depth + 1));
+                        pm_interpolated_string_node_append((pm_interpolated_string_node_t *) current, part);
+                        break;
+                    }
+                    default:
+                        expect1(parser, PM_TOKEN_STRING_CONTENT, PM_ERR_LIST_W_UPPER_ELEMENT);
+                        parser_lex(parser);
+                        break;
+                }
+            }
+
+            // If we have a current node, then we need to append it to the list.
+            if (current) {
+                pm_array_node_elements_append(array, current);
+            }
+
+            pm_token_t closing = parser->current;
+            if (match1(parser, PM_TOKEN_EOF)) {
+                pm_parser_err_token(parser, &opening, PM_ERR_LIST_W_UPPER_TERM);
+                closing = (pm_token_t) { .type = PM_TOKEN_MISSING, .start = parser->previous.end, .end = parser->previous.end };
+            } else {
+                expect1(parser, PM_TOKEN_STRING_END, PM_ERR_LIST_W_UPPER_TERM);
+            }
+
+            pm_array_node_close_set(array, &closing);
+            return (pm_node_t *) array;
+        }
+        case PM_TOKEN_REGEXP_BEGIN: {
+            pm_token_t opening = parser->current;
+            parser_lex(parser);
+
+            if (match1(parser, PM_TOKEN_REGEXP_END)) {
+                // If we get here, then we have an end immediately after a start. In
+                // that case we'll create an empty content token and return an
+                // uninterpolated regular expression.
+                pm_token_t content = (pm_token_t) {
+                    .type = PM_TOKEN_STRING_CONTENT,
+                    .start = parser->previous.end,
+                    .end = parser->previous.end
+                };
+
+                parser_lex(parser);
+
+                pm_node_t *node = (pm_node_t *) pm_regular_expression_node_create(parser, &opening, &content, &parser->previous);
+                pm_node_flag_set(node, PM_REGULAR_EXPRESSION_FLAGS_FORCED_US_ASCII_ENCODING);
+
+                return node;
+            }
+
+            pm_interpolated_regular_expression_node_t *interpolated;
+
+            if (match1(parser, PM_TOKEN_STRING_CONTENT)) {
+                // In this case we've hit string content so we know the regular
+                // expression at least has something in it. We'll need to check if the
+                // following token is the end (in which case we can return a plain
+                // regular expression) or if it's not then it has interpolation.
+                pm_string_t unescaped = parser->current_string;
+                pm_token_t content = parser->current;
+                bool ascii_only = parser->current_regular_expression_ascii_only;
+                parser_lex(parser);
+
+                // If we hit an end, then we can create a regular expression
+                // node without interpolation, which can be represented more
+                // succinctly and more easily compiled.
+                if (accept1(parser, PM_TOKEN_REGEXP_END)) {
+                    pm_regular_expression_node_t *node = (pm_regular_expression_node_t *) pm_regular_expression_node_create_unescaped(parser, &opening, &content, &parser->previous, &unescaped);
+
+                    // If we're not immediately followed by a =~, then we want
+                    // to parse all of the errors at this point. If it is
+                    // followed by a =~, then it will get parsed higher up while
+                    // parsing the named captures as well.
+                    if (!match1(parser, PM_TOKEN_EQUAL_TILDE)) {
+                        parse_regular_expression_errors(parser, node);
+                    }
+
+                    pm_node_flag_set((pm_node_t *) node, parse_and_validate_regular_expression_encoding(parser, &unescaped, ascii_only, node->base.flags));
+                    return (pm_node_t *) node;
+                }
+
+                // If we get here, then we have interpolation so we'll need to create
+                // a regular expression node with interpolation.
+                interpolated = pm_interpolated_regular_expression_node_create(parser, &opening);
+
+                pm_token_t opening = not_provided(parser);
+                pm_token_t closing = not_provided(parser);
+                pm_node_t *part = (pm_node_t *) pm_string_node_create_unescaped(parser, &opening, &parser->previous, &closing, &unescaped);
+
+                if (parser->encoding == PM_ENCODING_US_ASCII_ENTRY) {
+                    // This is extremely strange, but the first string part of a
+                    // regular expression will always be tagged as binary if we
+                    // are in a US-ASCII file, no matter its contents.
+                    pm_node_flag_set(part, PM_STRING_FLAGS_FORCED_BINARY_ENCODING);
+                }
+
+                pm_interpolated_regular_expression_node_append(interpolated, part);
+            } else {
+                // If the first part of the body of the regular expression is not a
+                // string content, then we have interpolation and we need to create an
+                // interpolated regular expression node.
+                interpolated = pm_interpolated_regular_expression_node_create(parser, &opening);
+            }
+
+            // Now that we're here and we have interpolation, we'll parse all of the
+            // parts into the list.
+            pm_node_t *part;
+            while (!match2(parser, PM_TOKEN_REGEXP_END, PM_TOKEN_EOF)) {
+                if ((part = parse_string_part(parser, (uint16_t) (depth + 1))) != NULL) {
+                    pm_interpolated_regular_expression_node_append(interpolated, part);
+                }
+            }
+
+            pm_token_t closing = parser->current;
+            if (match1(parser, PM_TOKEN_EOF)) {
+                pm_parser_err_token(parser, &opening, PM_ERR_REGEXP_TERM);
+                closing = (pm_token_t) { .type = PM_TOKEN_MISSING, .start = parser->previous.end, .end = parser->previous.end };
+            } else {
+                expect1(parser, PM_TOKEN_REGEXP_END, PM_ERR_REGEXP_TERM);
+            }
+
+            pm_interpolated_regular_expression_node_closing_set(parser, interpolated, &closing);
+            return (pm_node_t *) interpolated;
+        }
+        case PM_TOKEN_BACKTICK:
+        case PM_TOKEN_PERCENT_LOWER_X: {
+            parser_lex(parser);
+            pm_token_t opening = parser->previous;
+
+            // When we get here, we don't know if this string is going to have
+            // interpolation or not, even though it is allowed. Still, we want to be
+            // able to return a string node without interpolation if we can since
+            // it'll be faster.
+            if (match1(parser, PM_TOKEN_STRING_END)) {
+                // If we get here, then we have an end immediately after a start. In
+                // that case we'll create an empty content token and return an
+                // uninterpolated string.
+                pm_token_t content = (pm_token_t) {
+                    .type = PM_TOKEN_STRING_CONTENT,
+                    .start = parser->previous.end,
+                    .end = parser->previous.end
+                };
+
+                parser_lex(parser);
+                return (pm_node_t *) pm_xstring_node_create(parser, &opening, &content, &parser->previous);
+            }
+
+            pm_interpolated_x_string_node_t *node;
+
+            if (match1(parser, PM_TOKEN_STRING_CONTENT)) {
+                // In this case we've hit string content so we know the string
+                // at least has something in it. We'll need to check if the
+                // following token is the end (in which case we can return a
+                // plain string) or if it's not then it has interpolation.
+                pm_string_t unescaped = parser->current_string;
+                pm_token_t content = parser->current;
+                parser_lex(parser);
+
+                if (match1(parser, PM_TOKEN_STRING_END)) {
+                    pm_node_t *node = (pm_node_t *) pm_xstring_node_create_unescaped(parser, &opening, &content, &parser->current, &unescaped);
+                    pm_node_flag_set(node, parse_unescaped_encoding(parser));
+                    parser_lex(parser);
+                    return node;
+                }
+
+                // If we get here, then we have interpolation so we'll need to
+                // create a string node with interpolation.
+                node = pm_interpolated_xstring_node_create(parser, &opening, &opening);
+
+                pm_token_t opening = not_provided(parser);
+                pm_token_t closing = not_provided(parser);
+
+                pm_node_t *part = (pm_node_t *) pm_string_node_create_unescaped(parser, &opening, &parser->previous, &closing, &unescaped);
+                pm_node_flag_set(part, parse_unescaped_encoding(parser));
+
+                pm_interpolated_xstring_node_append(node, part);
+            } else {
+                // If the first part of the body of the string is not a string
+                // content, then we have interpolation and we need to create an
+                // interpolated string node.
+                node = pm_interpolated_xstring_node_create(parser, &opening, &opening);
+            }
+
+            pm_node_t *part;
+            while (!match2(parser, PM_TOKEN_STRING_END, PM_TOKEN_EOF)) {
+                if ((part = parse_string_part(parser, (uint16_t) (depth + 1))) != NULL) {
+                    pm_interpolated_xstring_node_append(node, part);
+                }
+            }
+
+            pm_token_t closing = parser->current;
+            if (match1(parser, PM_TOKEN_EOF)) {
+                pm_parser_err_token(parser, &opening, PM_ERR_XSTRING_TERM);
+                closing = (pm_token_t) { .type = PM_TOKEN_MISSING, .start = parser->previous.end, .end = parser->previous.end };
+            } else {
+                expect1(parser, PM_TOKEN_STRING_END, PM_ERR_XSTRING_TERM);
+            }
+            pm_interpolated_xstring_node_closing_set(node, &closing);
+
+            return (pm_node_t *) node;
+        }
+        case PM_TOKEN_USTAR: {
+            parser_lex(parser);
+
+            // * operators at the beginning of expressions are only valid in the
+            // context of a multiple assignment. We enforce that here. We'll
+            // still lex past it though and create a missing node place.
+            if (binding_power != PM_BINDING_POWER_STATEMENT) {
+                pm_parser_err_prefix(parser, diag_id);
+                return (pm_node_t *) pm_missing_node_create(parser, parser->previous.start, parser->previous.end);
+            }
+
+            pm_token_t operator = parser->previous;
+            pm_node_t *name = NULL;
+
+            if (token_begins_expression_p(parser->current.type)) {
+                name = parse_expression(parser, PM_BINDING_POWER_INDEX, false, false, PM_ERR_EXPECT_EXPRESSION_AFTER_STAR, (uint16_t) (depth + 1));
+            }
+
+            pm_node_t *splat = (pm_node_t *) pm_splat_node_create(parser, &operator, name);
+
+            if (match1(parser, PM_TOKEN_COMMA)) {
+                return parse_targets_validate(parser, splat, PM_BINDING_POWER_INDEX, (uint16_t) (depth + 1));
+            } else {
+                return parse_target_validate(parser, splat, true);
+            }
+        }
+        case PM_TOKEN_BANG: {
+            if (binding_power > PM_BINDING_POWER_UNARY) {
+                pm_parser_err_prefix(parser, PM_ERR_UNARY_DISALLOWED);
+            }
+
+            parser_lex(parser);
+
+            pm_token_t operator = parser->previous;
+            pm_node_t *receiver = parse_expression(parser, pm_binding_powers[parser->previous.type].right, binding_power < PM_BINDING_POWER_MATCH, false, PM_ERR_UNARY_RECEIVER, (uint16_t) (depth + 1));
+            pm_call_node_t *node = pm_call_node_unary_create(parser, &operator, receiver, "!");
+
+            pm_conditional_predicate(parser, receiver, PM_CONDITIONAL_PREDICATE_TYPE_NOT);
+            return (pm_node_t *) node;
+        }
+        case PM_TOKEN_TILDE: {
+            if (binding_power > PM_BINDING_POWER_UNARY) {
+                pm_parser_err_prefix(parser, PM_ERR_UNARY_DISALLOWED);
+            }
+            parser_lex(parser);
+
+            pm_token_t operator = parser->previous;
+            pm_node_t *receiver = parse_expression(parser, pm_binding_powers[parser->previous.type].right, false, false, PM_ERR_UNARY_RECEIVER, (uint16_t) (depth + 1));
+            pm_call_node_t *node = pm_call_node_unary_create(parser, &operator, receiver, "~");
+
+            return (pm_node_t *) node;
+        }
+        case PM_TOKEN_UMINUS: {
+            if (binding_power > PM_BINDING_POWER_UNARY) {
+                pm_parser_err_prefix(parser, PM_ERR_UNARY_DISALLOWED);
+            }
+            parser_lex(parser);
+
+            pm_token_t operator = parser->previous;
+            pm_node_t *receiver = parse_expression(parser, pm_binding_powers[parser->previous.type].right, false, false, PM_ERR_UNARY_RECEIVER, (uint16_t) (depth + 1));
+            pm_call_node_t *node = pm_call_node_unary_create(parser, &operator, receiver, "-@");
+
+            return (pm_node_t *) node;
+        }
+        case PM_TOKEN_UMINUS_NUM: {
+            parser_lex(parser);
+
+            pm_token_t operator = parser->previous;
+            pm_node_t *node = parse_expression(parser, pm_binding_powers[parser->previous.type].right, false, false, PM_ERR_UNARY_RECEIVER, (uint16_t) (depth + 1));
+
+            if (accept1(parser, PM_TOKEN_STAR_STAR)) {
+                pm_token_t exponent_operator = parser->previous;
+                pm_node_t *exponent = parse_expression(parser, pm_binding_powers[exponent_operator.type].right, false, false, PM_ERR_EXPECT_ARGUMENT, (uint16_t) (depth + 1));
+                node = (pm_node_t *) pm_call_node_binary_create(parser, node, &exponent_operator, exponent, 0);
+                node = (pm_node_t *) pm_call_node_unary_create(parser, &operator, node, "-@");
+            } else {
+                switch (PM_NODE_TYPE(node)) {
+                    case PM_INTEGER_NODE:
+                    case PM_FLOAT_NODE:
+                    case PM_RATIONAL_NODE:
+                    case PM_IMAGINARY_NODE:
+                        parse_negative_numeric(node);
+                        break;
+                    default:
+                        node = (pm_node_t *) pm_call_node_unary_create(parser, &operator, node, "-@");
+                        break;
+                }
+            }
+
+            return node;
+        }
+        case PM_TOKEN_MINUS_GREATER: {
+            int previous_lambda_enclosure_nesting = parser->lambda_enclosure_nesting;
+            parser->lambda_enclosure_nesting = parser->enclosure_nesting;
+
+            size_t opening_newline_index = token_newline_index(parser);
+            pm_accepts_block_stack_push(parser, true);
+            parser_lex(parser);
+
+            pm_token_t operator = parser->previous;
+            pm_parser_scope_push(parser, false);
+
+            pm_block_parameters_node_t *block_parameters;
+
+            switch (parser->current.type) {
+                case PM_TOKEN_PARENTHESIS_LEFT: {
+                    pm_token_t opening = parser->current;
+                    parser_lex(parser);
+
+                    if (match1(parser, PM_TOKEN_PARENTHESIS_RIGHT)) {
+                        block_parameters = pm_block_parameters_node_create(parser, NULL, &opening);
+                    } else {
+                        block_parameters = parse_block_parameters(parser, false, &opening, true, true, (uint16_t) (depth + 1));
+                    }
+
+                    accept1(parser, PM_TOKEN_NEWLINE);
+                    expect1(parser, PM_TOKEN_PARENTHESIS_RIGHT, PM_ERR_EXPECT_RPAREN);
+
+                    pm_block_parameters_node_closing_set(block_parameters, &parser->previous);
+                    break;
+                }
+                case PM_CASE_PARAMETER: {
+                    pm_accepts_block_stack_push(parser, false);
+                    pm_token_t opening = not_provided(parser);
+                    block_parameters = parse_block_parameters(parser, false, &opening, true, false, (uint16_t) (depth + 1));
+                    pm_accepts_block_stack_pop(parser);
+                    break;
+                }
+                default: {
+                    block_parameters = NULL;
+                    break;
+                }
+            }
+
+            pm_token_t opening;
+            pm_node_t *body = NULL;
+            parser->lambda_enclosure_nesting = previous_lambda_enclosure_nesting;
+
+            if (accept1(parser, PM_TOKEN_LAMBDA_BEGIN)) {
+                opening = parser->previous;
+
+                if (!match1(parser, PM_TOKEN_BRACE_RIGHT)) {
+                    body = (pm_node_t *) parse_statements(parser, PM_CONTEXT_LAMBDA_BRACES, (uint16_t) (depth + 1));
+                }
+
+                parser_warn_indentation_mismatch(parser, opening_newline_index, &operator, false, false);
+                expect1(parser, PM_TOKEN_BRACE_RIGHT, PM_ERR_LAMBDA_TERM_BRACE);
+            } else {
+                expect1(parser, PM_TOKEN_KEYWORD_DO, PM_ERR_LAMBDA_OPEN);
+                opening = parser->previous;
+
+                if (!match3(parser, PM_TOKEN_KEYWORD_END, PM_TOKEN_KEYWORD_RESCUE, PM_TOKEN_KEYWORD_ENSURE)) {
+                    pm_accepts_block_stack_push(parser, true);
+                    body = (pm_node_t *) parse_statements(parser, PM_CONTEXT_LAMBDA_DO_END, (uint16_t) (depth + 1));
+                    pm_accepts_block_stack_pop(parser);
+                }
+
+                if (match2(parser, PM_TOKEN_KEYWORD_RESCUE, PM_TOKEN_KEYWORD_ENSURE)) {
+                    assert(body == NULL || PM_NODE_TYPE_P(body, PM_STATEMENTS_NODE));
+                    body = (pm_node_t *) parse_rescues_implicit_begin(parser, opening_newline_index, &operator, opening.start, (pm_statements_node_t *) body, PM_RESCUES_LAMBDA, (uint16_t) (depth + 1));
+                } else {
+                    parser_warn_indentation_mismatch(parser, opening_newline_index, &operator, false, false);
+                }
+
+                expect1(parser, PM_TOKEN_KEYWORD_END, PM_ERR_LAMBDA_TERM_END);
+            }
+
+            pm_constant_id_list_t locals;
+            pm_locals_order(parser, &parser->current_scope->locals, &locals, pm_parser_scope_toplevel_p(parser));
+            pm_node_t *parameters = parse_blocklike_parameters(parser, (pm_node_t *) block_parameters, &operator, &parser->previous);
+
+            pm_parser_scope_pop(parser);
+            pm_accepts_block_stack_pop(parser);
+
+            return (pm_node_t *) pm_lambda_node_create(parser, &locals, &operator, &opening, &parser->previous, parameters, body);
+        }
+        case PM_TOKEN_UPLUS: {
+            if (binding_power > PM_BINDING_POWER_UNARY) {
+                pm_parser_err_prefix(parser, PM_ERR_UNARY_DISALLOWED);
+            }
+            parser_lex(parser);
+
+            pm_token_t operator = parser->previous;
+            pm_node_t *receiver = parse_expression(parser, pm_binding_powers[parser->previous.type].right, false, false, PM_ERR_UNARY_RECEIVER, (uint16_t) (depth + 1));
+            pm_call_node_t *node = pm_call_node_unary_create(parser, &operator, receiver, "+@");
+
+            return (pm_node_t *) node;
+        }
+        case PM_TOKEN_STRING_BEGIN:
+            return parse_strings(parser, NULL, accepts_label, (uint16_t) (depth + 1));
+        case PM_TOKEN_SYMBOL_BEGIN: {
+            pm_lex_mode_t lex_mode = *parser->lex_modes.current;
+            parser_lex(parser);
+
+            return parse_symbol(parser, &lex_mode, PM_LEX_STATE_END, (uint16_t) (depth + 1));
+        }
+        default: {
+            pm_context_t recoverable = context_recoverable(parser, &parser->current);
+
+            if (recoverable != PM_CONTEXT_NONE) {
+                parser->recovering = true;
+
+                // If the given error is not the generic one, then we'll add it
+                // here because it will provide more context in addition to the
+                // recoverable error that we will also add.
+                if (diag_id != PM_ERR_CANNOT_PARSE_EXPRESSION) {
+                    pm_parser_err_prefix(parser, diag_id);
+                }
+
+                // If we get here, then we are assuming this token is closing a
+                // parent context, so we'll indicate that to the user so that
+                // they know how we behaved.
+                PM_PARSER_ERR_TOKEN_FORMAT(parser, parser->current, PM_ERR_UNEXPECTED_TOKEN_CLOSE_CONTEXT, pm_token_type_human(parser->current.type), context_human(recoverable));
+            } else if (diag_id == PM_ERR_CANNOT_PARSE_EXPRESSION) {
+                // We're going to make a special case here, because "cannot
+                // parse expression" is pretty generic, and we know here that we
+                // have an unexpected token.
+                PM_PARSER_ERR_TOKEN_FORMAT(parser, parser->current, PM_ERR_UNEXPECTED_TOKEN_IGNORE, pm_token_type_human(parser->current.type));
+            } else {
+                pm_parser_err_prefix(parser, diag_id);
+            }
+
+            return (pm_node_t *) pm_missing_node_create(parser, parser->previous.start, parser->previous.end);
+        }
+    }
+}
+
+/**
+ * Parse a value that is going to be written to some kind of variable or method
+ * call. We need to handle this separately because the rescue modifier is
+ * permitted on the end of the these expressions, which is a deviation from its
+ * normal binding power.
+ *
+ * Note that this will only be called after an operator write, as in &&=, ||=,
+ * or any of the binary operators that can be written to a variable.
+ */
+static pm_node_t *
+parse_assignment_value(pm_parser_t *parser, pm_binding_power_t previous_binding_power, pm_binding_power_t binding_power, bool accepts_command_call, pm_diagnostic_id_t diag_id, uint16_t depth) {
+    pm_node_t *value = parse_value_expression(parser, binding_power, previous_binding_power == PM_BINDING_POWER_ASSIGNMENT ? accepts_command_call : previous_binding_power < PM_BINDING_POWER_MATCH, false, diag_id, (uint16_t) (depth + 1));
+
+    // Contradicting binding powers, the right-hand-side value of the assignment
+    // allows the `rescue` modifier.
+    if (match1(parser, PM_TOKEN_KEYWORD_RESCUE_MODIFIER)) {
+        context_push(parser, PM_CONTEXT_RESCUE_MODIFIER);
+
+        pm_token_t rescue = parser->current;
+        parser_lex(parser);
+
+        pm_node_t *right = parse_expression(parser, pm_binding_powers[PM_TOKEN_KEYWORD_RESCUE_MODIFIER].right, false, false, PM_ERR_RESCUE_MODIFIER_VALUE, (uint16_t) (depth + 1));
+        context_pop(parser);
+
+        return (pm_node_t *) pm_rescue_modifier_node_create(parser, value, &rescue, right);
+    }
+
+    return value;
+}
+
+/**
+ * When a local variable write node is the value being written in a different
+ * write, the local variable is considered "used".
+ */
+static void
+parse_assignment_value_local(pm_parser_t *parser, const pm_node_t *node) {
+    switch (PM_NODE_TYPE(node)) {
+        case PM_BEGIN_NODE: {
+            const pm_begin_node_t *cast = (const pm_begin_node_t *) node;
+            if (cast->statements != NULL) parse_assignment_value_local(parser, (const pm_node_t *) cast->statements);
+            break;
+        }
+        case PM_LOCAL_VARIABLE_WRITE_NODE: {
+            const pm_local_variable_write_node_t *cast = (const pm_local_variable_write_node_t *) node;
+            pm_locals_read(&pm_parser_scope_find(parser, cast->depth)->locals, cast->name);
+            break;
+        }
+        case PM_PARENTHESES_NODE: {
+            const pm_parentheses_node_t *cast = (const pm_parentheses_node_t *) node;
+            if (cast->body != NULL) parse_assignment_value_local(parser, cast->body);
+            break;
+        }
+        case PM_STATEMENTS_NODE: {
+            const pm_statements_node_t *cast = (const pm_statements_node_t *) node;
+            const pm_node_t *statement;
+
+            PM_NODE_LIST_FOREACH(&cast->body, index, statement) {
+                parse_assignment_value_local(parser, statement);
+            }
+            break;
+        }
+        default:
+            break;
+    }
+}
+
+/**
+ * Parse the value (or values, through an implicit array) that is going to be
+ * written to some kind of variable or method call. We need to handle this
+ * separately because the rescue modifier is permitted on the end of the these
+ * expressions, which is a deviation from its normal binding power.
+ *
+ * Additionally, if the value is a local variable write node (e.g., a = a = 1),
+ * the "a" is marked as being used so the parser should not warn on it.
+ *
+ * Note that this will only be called after an = operator, as that is the only
+ * operator that allows multiple values after it.
+ */
+static pm_node_t *
+parse_assignment_values(pm_parser_t *parser, pm_binding_power_t previous_binding_power, pm_binding_power_t binding_power, bool accepts_command_call, pm_diagnostic_id_t diag_id, uint16_t depth) {
+    bool permitted = true;
+    if (previous_binding_power != PM_BINDING_POWER_STATEMENT && match1(parser, PM_TOKEN_USTAR)) permitted = false;
+
+    pm_node_t *value = parse_starred_expression(parser, binding_power, previous_binding_power == PM_BINDING_POWER_ASSIGNMENT ? accepts_command_call : previous_binding_power < PM_BINDING_POWER_MATCH, diag_id, (uint16_t) (depth + 1));
+    if (!permitted) pm_parser_err_node(parser, value, PM_ERR_UNEXPECTED_MULTI_WRITE);
+
+    parse_assignment_value_local(parser, value);
+    bool single_value = true;
+
+    if (previous_binding_power == PM_BINDING_POWER_STATEMENT && (PM_NODE_TYPE_P(value, PM_SPLAT_NODE) || match1(parser, PM_TOKEN_COMMA))) {
+        single_value = false;
+
+        pm_token_t opening = not_provided(parser);
+        pm_array_node_t *array = pm_array_node_create(parser, &opening);
+
+        pm_array_node_elements_append(array, value);
+        value = (pm_node_t *) array;
+
+        while (accept1(parser, PM_TOKEN_COMMA)) {
+            pm_node_t *element = parse_starred_expression(parser, binding_power, false, PM_ERR_ARRAY_ELEMENT, (uint16_t) (depth + 1));
+
+            pm_array_node_elements_append(array, element);
+            if (PM_NODE_TYPE_P(element, PM_MISSING_NODE)) break;
+
+            parse_assignment_value_local(parser, element);
+        }
+    }
+
+    // Contradicting binding powers, the right-hand-side value of the assignment
+    // allows the `rescue` modifier.
+    if ((single_value || (binding_power == (PM_BINDING_POWER_MULTI_ASSIGNMENT + 1))) && match1(parser, PM_TOKEN_KEYWORD_RESCUE_MODIFIER)) {
+        context_push(parser, PM_CONTEXT_RESCUE_MODIFIER);
+
+        pm_token_t rescue = parser->current;
+        parser_lex(parser);
+
+        bool accepts_command_call_inner = false;
+
+        // RHS can accept command call iff the value is a call with arguments
+        // but without parenthesis.
+        if (PM_NODE_TYPE_P(value, PM_CALL_NODE)) {
+            pm_call_node_t *call_node = (pm_call_node_t *) value;
+            if ((call_node->arguments != NULL) && (call_node->opening_loc.start == NULL)) {
+                accepts_command_call_inner = true;
+            }
+        }
+
+        pm_node_t *right = parse_expression(parser, pm_binding_powers[PM_TOKEN_KEYWORD_RESCUE_MODIFIER].right, accepts_command_call_inner, false, PM_ERR_RESCUE_MODIFIER_VALUE, (uint16_t) (depth + 1));
+        context_pop(parser);
+
+        return (pm_node_t *) pm_rescue_modifier_node_create(parser, value, &rescue, right);
+    }
+
+    return value;
+}
+
+/**
+ * Ensure a call node that is about to become a call operator node does not
+ * have arguments or a block attached. If it does, then we'll need to add an
+ * error message and destroy the arguments/block. Ideally we would keep the node
+ * around so that consumers would still have access to it, but we don't have a
+ * great structure for that at the moment.
+ */
+static void
+parse_call_operator_write(pm_parser_t *parser, pm_call_node_t *call_node, const pm_token_t *operator) {
+    if (call_node->arguments != NULL) {
+        pm_parser_err_token(parser, operator, PM_ERR_OPERATOR_WRITE_ARGUMENTS);
+        pm_node_destroy(parser, (pm_node_t *) call_node->arguments);
+        call_node->arguments = NULL;
+    }
+
+    if (call_node->block != NULL) {
+        pm_parser_err_token(parser, operator, PM_ERR_OPERATOR_WRITE_BLOCK);
+        pm_node_destroy(parser, (pm_node_t *) call_node->block);
+        call_node->block = NULL;
+    }
+}
+
+/**
+ * This struct is used to pass information between the regular expression parser
+ * and the named capture callback.
+ */
+typedef struct {
+    /** The parser that is parsing the regular expression. */
+    pm_parser_t *parser;
+
+    /** The call node wrapping the regular expression node. */
+    pm_call_node_t *call;
+
+    /** The match write node that is being created. */
+    pm_match_write_node_t *match;
+
+    /** The list of names that have been parsed. */
+    pm_constant_id_list_t names;
+
+    /**
+     * Whether the content of the regular expression is shared. This impacts
+     * whether or not we used owned constants or shared constants in the
+     * constant pool for the names of the captures.
+     */
+    bool shared;
+} parse_regular_expression_named_capture_data_t;
+
+static inline const uint8_t *
+pm_named_capture_escape_hex(pm_buffer_t *unescaped, const uint8_t *cursor, const uint8_t *end) {
+    cursor++;
+
+    if (cursor < end && pm_char_is_hexadecimal_digit(*cursor)) {
+        uint8_t value = escape_hexadecimal_digit(*cursor);
+        cursor++;
+
+        if (cursor < end && pm_char_is_hexadecimal_digit(*cursor)) {
+            value = (uint8_t) ((value << 4) | escape_hexadecimal_digit(*cursor));
+            cursor++;
+        }
+
+        pm_buffer_append_byte(unescaped, value);
+    } else {
+        pm_buffer_append_string(unescaped, "\\x", 2);
+    }
+
+    return cursor;
+}
+
+static inline const uint8_t *
+pm_named_capture_escape_octal(pm_buffer_t *unescaped, const uint8_t *cursor, const uint8_t *end) {
+    uint8_t value = (uint8_t) (*cursor - '0');
+    cursor++;
+
+    if (cursor < end && pm_char_is_octal_digit(*cursor)) {
+        value = ((uint8_t) (value << 3)) | ((uint8_t) (*cursor - '0'));
+        cursor++;
+
+        if (cursor < end && pm_char_is_octal_digit(*cursor)) {
+            value = ((uint8_t) (value << 3)) | ((uint8_t) (*cursor - '0'));
+            cursor++;
+        }
+    }
+
+    pm_buffer_append_byte(unescaped, value);
+    return cursor;
+}
+
+static inline const uint8_t *
+pm_named_capture_escape_unicode(pm_parser_t *parser, pm_buffer_t *unescaped, const uint8_t *cursor, const uint8_t *end) {
+    const uint8_t *start = cursor - 1;
+    cursor++;
+
+    if (cursor >= end) {
+        pm_buffer_append_string(unescaped, "\\u", 2);
+        return cursor;
+    }
+
+    if (*cursor != '{') {
+        size_t length = pm_strspn_hexadecimal_digit(cursor, MIN(end - cursor, 4));
+        uint32_t value = escape_unicode(parser, cursor, length);
+
+        if (!pm_buffer_append_unicode_codepoint(unescaped, value)) {
+            pm_buffer_append_string(unescaped, (const char *) start, (size_t) ((cursor + length) - start));
+        }
+
+        return cursor + length;
+    }
+
+    cursor++;
+    for (;;) {
+        while (cursor < end && *cursor == ' ') cursor++;
+
+        if (cursor >= end) break;
+        if (*cursor == '}') {
+            cursor++;
+            break;
+        }
+
+        size_t length = pm_strspn_hexadecimal_digit(cursor, end - cursor);
+        uint32_t value = escape_unicode(parser, cursor, length);
+
+        (void) pm_buffer_append_unicode_codepoint(unescaped, value);
+        cursor += length;
+    }
+
+    return cursor;
+}
+
+static void
+pm_named_capture_escape(pm_parser_t *parser, pm_buffer_t *unescaped, const uint8_t *source, const size_t length, const uint8_t *cursor) {
+    const uint8_t *end = source + length;
+    pm_buffer_append_string(unescaped, (const char *) source, (size_t) (cursor - source));
+
+    for (;;) {
+        if (++cursor >= end) {
+            pm_buffer_append_byte(unescaped, '\\');
+            return;
+        }
+
+        switch (*cursor) {
+            case 'x':
+                cursor = pm_named_capture_escape_hex(unescaped, cursor, end);
+                break;
+            case '0': case '1': case '2': case '3': case '4': case '5': case '6': case '7':
+                cursor = pm_named_capture_escape_octal(unescaped, cursor, end);
+                break;
+            case 'u':
+                cursor = pm_named_capture_escape_unicode(parser, unescaped, cursor, end);
+                break;
+            default:
+                pm_buffer_append_byte(unescaped, '\\');
+                break;
+        }
+
+        const uint8_t *next_cursor = pm_memchr(cursor, '\\', (size_t) (end - cursor), parser->encoding_changed, parser->encoding);
+        if (next_cursor == NULL) break;
+
+        pm_buffer_append_string(unescaped, (const char *) cursor, (size_t) (next_cursor - cursor));
+        cursor = next_cursor;
+    }
+
+    pm_buffer_append_string(unescaped, (const char *) cursor, (size_t) (end - cursor));
+}
+
+/**
+ * This callback is called when the regular expression parser encounters a named
+ * capture group.
+ */
+static void
+parse_regular_expression_named_capture(const pm_string_t *capture, void *data) {
+    parse_regular_expression_named_capture_data_t *callback_data = (parse_regular_expression_named_capture_data_t *) data;
+
+    pm_parser_t *parser = callback_data->parser;
+    pm_call_node_t *call = callback_data->call;
+    pm_constant_id_list_t *names = &callback_data->names;
+
+    const uint8_t *source = pm_string_source(capture);
+    size_t length = pm_string_length(capture);
+    pm_buffer_t unescaped = { 0 };
+
+    // First, we need to handle escapes within the name of the capture group.
+    // This is because regular expressions have three different representations
+    // in prism. The first is the plain source code. The second is the
+    // representation that will be sent to the regular expression engine, which
+    // is the value of the "unescaped" field. This is poorly named, because it
+    // actually still contains escapes, just a subset of them that the regular
+    // expression engine knows how to handle. The third representation is fully
+    // unescaped, which is what we need.
+    const uint8_t *cursor = pm_memchr(source, '\\', length, parser->encoding_changed, parser->encoding);
+    if (PRISM_UNLIKELY(cursor != NULL)) {
+        pm_named_capture_escape(parser, &unescaped, source, length, cursor);
+        source = (const uint8_t *) pm_buffer_value(&unescaped);
+        length = pm_buffer_length(&unescaped);
+    }
+
+    pm_location_t location;
+    pm_constant_id_t name;
+
+    // If the name of the capture group isn't a valid identifier, we do
+    // not add it to the local table.
+    if (!pm_slice_is_valid_local(parser, source, source + length)) {
+        pm_buffer_free(&unescaped);
+        return;
+    }
+
+    if (callback_data->shared) {
+        // If the unescaped string is a slice of the source, then we can
+        // copy the names directly. The pointers will line up.
+        location = (pm_location_t) { .start = source, .end = source + length };
+        name = pm_parser_constant_id_location(parser, location.start, location.end);
+    } else {
+        // Otherwise, the name is a slice of the malloc-ed owned string,
+        // in which case we need to copy it out into a new string.
+        location = (pm_location_t) { .start = call->receiver->location.start, .end = call->receiver->location.end };
+
+        void *memory = xmalloc(length);
+        if (memory == NULL) abort();
+
+        memcpy(memory, source, length);
+        name = pm_parser_constant_id_owned(parser, (uint8_t *) memory, length);
+    }
+
+    // Add this name to the list of constants if it is valid, not duplicated,
+    // and not a keyword.
+    if (name != 0 && !pm_constant_id_list_includes(names, name)) {
+        pm_constant_id_list_append(names, name);
+
+        int depth;
+        if ((depth = pm_parser_local_depth_constant_id(parser, name)) == -1) {
+            // If the local is not already a local but it is a keyword, then we
+            // do not want to add a capture for this.
+            if (pm_local_is_keyword((const char *) source, length)) {
+                pm_buffer_free(&unescaped);
+                return;
+            }
+
+            // If the identifier is not already a local, then we will add it to
+            // the local table.
+            pm_parser_local_add(parser, name, location.start, location.end, 0);
+        }
+
+        // Here we lazily create the MatchWriteNode since we know we're
+        // about to add a target.
+        if (callback_data->match == NULL) {
+            callback_data->match = pm_match_write_node_create(parser, call);
+        }
+
+        // Next, create the local variable target and add it to the list of
+        // targets for the match.
+        pm_node_t *target = (pm_node_t *) pm_local_variable_target_node_create(parser, &location, name, depth == -1 ? 0 : (uint32_t) depth);
+        pm_node_list_append(&callback_data->match->targets, target);
+    }
+
+    pm_buffer_free(&unescaped);
+}
+
+/**
+ * Potentially change a =~ with a regular expression with named captures into a
+ * match write node.
+ */
+static pm_node_t *
+parse_regular_expression_named_captures(pm_parser_t *parser, const pm_string_t *content, pm_call_node_t *call, bool extended_mode) {
+    parse_regular_expression_named_capture_data_t callback_data = {
+        .parser = parser,
+        .call = call,
+        .names = { 0 },
+        .shared = content->type == PM_STRING_SHARED
+    };
+
+    parse_regular_expression_error_data_t error_data = {
+        .parser = parser,
+        .start = call->receiver->location.start,
+        .end = call->receiver->location.end,
+        .shared = content->type == PM_STRING_SHARED
+    };
+
+    pm_regexp_parse(parser, pm_string_source(content), pm_string_length(content), extended_mode, parse_regular_expression_named_capture, &callback_data, parse_regular_expression_error, &error_data);
+    pm_constant_id_list_free(&callback_data.names);
+
+    if (callback_data.match != NULL) {
+        return (pm_node_t *) callback_data.match;
+    } else {
+        return (pm_node_t *) call;
+    }
+}
+
+static inline pm_node_t *
+parse_expression_infix(pm_parser_t *parser, pm_node_t *node, pm_binding_power_t previous_binding_power, pm_binding_power_t binding_power, bool accepts_command_call, uint16_t depth) {
+    pm_token_t token = parser->current;
+
+    switch (token.type) {
+        case PM_TOKEN_EQUAL: {
+            switch (PM_NODE_TYPE(node)) {
+                case PM_CALL_NODE: {
+                    // If we have no arguments to the call node and we need this
+                    // to be a target then this is either a method call or a
+                    // local variable write. This _must_ happen before the value
+                    // is parsed because it could be referenced in the value.
+                    pm_call_node_t *call_node = (pm_call_node_t *) node;
+                    if (PM_NODE_FLAG_P(call_node, PM_CALL_NODE_FLAGS_VARIABLE_CALL)) {
+                        pm_parser_local_add_location(parser, call_node->message_loc.start, call_node->message_loc.end, 0);
+                    }
+                }
+                PRISM_FALLTHROUGH
+                case PM_CASE_WRITABLE: {
+                    parser_lex(parser);
+                    pm_node_t *value = parse_assignment_values(parser, previous_binding_power, PM_NODE_TYPE_P(node, PM_MULTI_TARGET_NODE) ? PM_BINDING_POWER_MULTI_ASSIGNMENT + 1 : binding_power, accepts_command_call, PM_ERR_EXPECT_EXPRESSION_AFTER_EQUAL, (uint16_t) (depth + 1));
+
+                    if (PM_NODE_TYPE_P(node, PM_MULTI_TARGET_NODE) && previous_binding_power != PM_BINDING_POWER_STATEMENT) {
+                        pm_parser_err_node(parser, node, PM_ERR_UNEXPECTED_MULTI_WRITE);
+                    }
+
+                    return parse_write(parser, node, &token, value);
+                }
+                case PM_SPLAT_NODE: {
+                    pm_multi_target_node_t *multi_target = pm_multi_target_node_create(parser);
+                    pm_multi_target_node_targets_append(parser, multi_target, node);
+
+                    parser_lex(parser);
+                    pm_node_t *value = parse_assignment_values(parser, previous_binding_power, PM_BINDING_POWER_MULTI_ASSIGNMENT + 1, accepts_command_call, PM_ERR_EXPECT_EXPRESSION_AFTER_EQUAL, (uint16_t) (depth + 1));
+                    return parse_write(parser, (pm_node_t *) multi_target, &token, value);
+                }
+                case PM_SOURCE_ENCODING_NODE:
+                case PM_FALSE_NODE:
+                case PM_SOURCE_FILE_NODE:
+                case PM_SOURCE_LINE_NODE:
+                case PM_NIL_NODE:
+                case PM_SELF_NODE:
+                case PM_TRUE_NODE: {
+                    // In these special cases, we have specific error messages
+                    // and we will replace them with local variable writes.
+                    parser_lex(parser);
+                    pm_node_t *value = parse_assignment_values(parser, previous_binding_power, binding_power, accepts_command_call, PM_ERR_EXPECT_EXPRESSION_AFTER_EQUAL, (uint16_t) (depth + 1));
+                    return parse_unwriteable_write(parser, node, &token, value);
+                }
+                default:
+                    // In this case we have an = sign, but we don't know what
+                    // it's for. We need to treat it as an error. We'll mark it
+                    // as an error and skip past it.
+                    parser_lex(parser);
+                    pm_parser_err_token(parser, &token, PM_ERR_EXPRESSION_NOT_WRITABLE);
+                    return node;
+            }
+        }
+        case PM_TOKEN_AMPERSAND_AMPERSAND_EQUAL: {
+            switch (PM_NODE_TYPE(node)) {
+                case PM_BACK_REFERENCE_READ_NODE:
+                case PM_NUMBERED_REFERENCE_READ_NODE:
+                    PM_PARSER_ERR_NODE_FORMAT_CONTENT(parser, node, PM_ERR_WRITE_TARGET_READONLY);
+                PRISM_FALLTHROUGH
+                case PM_GLOBAL_VARIABLE_READ_NODE: {
+                    parser_lex(parser);
+
+                    pm_node_t *value = parse_assignment_value(parser, previous_binding_power, binding_power, accepts_command_call, PM_ERR_EXPECT_EXPRESSION_AFTER_AMPAMPEQ, (uint16_t) (depth + 1));
+                    pm_node_t *result = (pm_node_t *) pm_global_variable_and_write_node_create(parser, node, &token, value);
+
+                    pm_node_destroy(parser, node);
+                    return result;
+                }
+                case PM_CLASS_VARIABLE_READ_NODE: {
+                    parser_lex(parser);
+
+                    pm_node_t *value = parse_assignment_value(parser, previous_binding_power, binding_power, accepts_command_call, PM_ERR_EXPECT_EXPRESSION_AFTER_AMPAMPEQ, (uint16_t) (depth + 1));
+                    pm_node_t *result = (pm_node_t *) pm_class_variable_and_write_node_create(parser, (pm_class_variable_read_node_t *) node, &token, value);
+
+                    pm_node_destroy(parser, node);
+                    return result;
+                }
+                case PM_CONSTANT_PATH_NODE: {
+                    parser_lex(parser);
+
+                    pm_node_t *value = parse_assignment_value(parser, previous_binding_power, binding_power, accepts_command_call, PM_ERR_EXPECT_EXPRESSION_AFTER_AMPAMPEQ, (uint16_t) (depth + 1));
+                    pm_node_t *write = (pm_node_t *) pm_constant_path_and_write_node_create(parser, (pm_constant_path_node_t *) node, &token, value);
+
+                    return parse_shareable_constant_write(parser, write);
+                }
+                case PM_CONSTANT_READ_NODE: {
+                    parser_lex(parser);
+
+                    pm_node_t *value = parse_assignment_value(parser, previous_binding_power, binding_power, accepts_command_call, PM_ERR_EXPECT_EXPRESSION_AFTER_AMPAMPEQ, (uint16_t) (depth + 1));
+                    pm_node_t *write = (pm_node_t *) pm_constant_and_write_node_create(parser, (pm_constant_read_node_t *) node, &token, value);
+
+                    pm_node_destroy(parser, node);
+                    return parse_shareable_constant_write(parser, write);
+                }
+                case PM_INSTANCE_VARIABLE_READ_NODE: {
+                    parser_lex(parser);
+
+                    pm_node_t *value = parse_assignment_value(parser, previous_binding_power, binding_power, accepts_command_call, PM_ERR_EXPECT_EXPRESSION_AFTER_AMPAMPEQ, (uint16_t) (depth + 1));
+                    pm_node_t *result = (pm_node_t *) pm_instance_variable_and_write_node_create(parser, (pm_instance_variable_read_node_t *) node, &token, value);
+
+                    pm_node_destroy(parser, node);
+                    return result;
+                }
+                case PM_IT_LOCAL_VARIABLE_READ_NODE: {
+                    pm_constant_id_t name = pm_parser_local_add_constant(parser, "it", 2);
+                    parser_lex(parser);
+
+                    pm_node_t *value = parse_assignment_value(parser, previous_binding_power, binding_power, accepts_command_call, PM_ERR_EXPECT_EXPRESSION_AFTER_AMPAMPEQ, (uint16_t) (depth + 1));
+                    pm_node_t *result = (pm_node_t *) pm_local_variable_and_write_node_create(parser, node, &token, value, name, 0);
+
+                    parse_target_implicit_parameter(parser, node);
+                    pm_node_destroy(parser, node);
+                    return result;
+                }
+                case PM_LOCAL_VARIABLE_READ_NODE: {
+                    if (pm_token_is_numbered_parameter(node->location.start, node->location.end)) {
+                        PM_PARSER_ERR_FORMAT(parser, node->location.start, node->location.end, PM_ERR_PARAMETER_NUMBERED_RESERVED, node->location.start);
+                        parse_target_implicit_parameter(parser, node);
+                    }
+
+                    pm_local_variable_read_node_t *cast = (pm_local_variable_read_node_t *) node;
+                    parser_lex(parser);
+
+                    pm_node_t *value = parse_assignment_value(parser, previous_binding_power, binding_power, accepts_command_call, PM_ERR_EXPECT_EXPRESSION_AFTER_AMPAMPEQ, (uint16_t) (depth + 1));
+                    pm_node_t *result = (pm_node_t *) pm_local_variable_and_write_node_create(parser, node, &token, value, cast->name, cast->depth);
+
+                    pm_node_destroy(parser, node);
+                    return result;
+                }
+                case PM_CALL_NODE: {
+                    pm_call_node_t *cast = (pm_call_node_t *) node;
+
+                    // If we have a vcall (a method with no arguments and no
+                    // receiver that could have been a local variable) then we
+                    // will transform it into a local variable write.
+                    if (PM_NODE_FLAG_P(cast, PM_CALL_NODE_FLAGS_VARIABLE_CALL)) {
+                        pm_location_t *message_loc = &cast->message_loc;
+                        pm_refute_numbered_parameter(parser, message_loc->start, message_loc->end);
+
+                        pm_constant_id_t constant_id = pm_parser_local_add_location(parser, message_loc->start, message_loc->end, 1);
+                        parser_lex(parser);
+
+                        pm_node_t *value = parse_assignment_value(parser, previous_binding_power, binding_power, accepts_command_call, PM_ERR_EXPECT_EXPRESSION_AFTER_AMPAMPEQ, (uint16_t) (depth + 1));
+                        pm_node_t *result = (pm_node_t *) pm_local_variable_and_write_node_create(parser, (pm_node_t *) cast, &token, value, constant_id, 0);
+
+                        pm_node_destroy(parser, (pm_node_t *) cast);
+                        return result;
+                    }
+
+                    // Move past the token here so that we have already added
+                    // the local variable by this point.
+                    parser_lex(parser);
+
+                    // If there is no call operator and the message is "[]" then
+                    // this is an aref expression, and we can transform it into
+                    // an aset expression.
+                    if (PM_NODE_FLAG_P(cast, PM_CALL_NODE_FLAGS_INDEX)) {
+                        pm_node_t *value = parse_assignment_value(parser, previous_binding_power, binding_power, accepts_command_call, PM_ERR_EXPECT_EXPRESSION_AFTER_AMPAMPEQ, (uint16_t) (depth + 1));
+                        return (pm_node_t *) pm_index_and_write_node_create(parser, cast, &token, value);
+                    }
+
+                    // If this node cannot be writable, then we have an error.
+                    if (pm_call_node_writable_p(parser, cast)) {
+                        parse_write_name(parser, &cast->name);
+                    } else {
+                        pm_parser_err_node(parser, node, PM_ERR_WRITE_TARGET_UNEXPECTED);
+                    }
+
+                    parse_call_operator_write(parser, cast, &token);
+                    pm_node_t *value = parse_assignment_value(parser, previous_binding_power, binding_power, accepts_command_call, PM_ERR_EXPECT_EXPRESSION_AFTER_AMPAMPEQ, (uint16_t) (depth + 1));
+                    return (pm_node_t *) pm_call_and_write_node_create(parser, cast, &token, value);
+                }
+                case PM_MULTI_WRITE_NODE: {
+                    parser_lex(parser);
+                    pm_parser_err_token(parser, &token, PM_ERR_AMPAMPEQ_MULTI_ASSIGN);
+                    return node;
+                }
+                default:
+                    parser_lex(parser);
+
+                    // In this case we have an &&= sign, but we don't know what it's for.
+                    // We need to treat it as an error. For now, we'll mark it as an error
+                    // and just skip right past it.
+                    pm_parser_err_token(parser, &token, PM_ERR_EXPECT_EXPRESSION_AFTER_AMPAMPEQ);
+                    return node;
+            }
+        }
+        case PM_TOKEN_PIPE_PIPE_EQUAL: {
+            switch (PM_NODE_TYPE(node)) {
+                case PM_BACK_REFERENCE_READ_NODE:
+                case PM_NUMBERED_REFERENCE_READ_NODE:
+                    PM_PARSER_ERR_NODE_FORMAT_CONTENT(parser, node, PM_ERR_WRITE_TARGET_READONLY);
+                PRISM_FALLTHROUGH
+                case PM_GLOBAL_VARIABLE_READ_NODE: {
+                    parser_lex(parser);
+
+                    pm_node_t *value = parse_assignment_value(parser, previous_binding_power, binding_power, accepts_command_call, PM_ERR_EXPECT_EXPRESSION_AFTER_PIPEPIPEEQ, (uint16_t) (depth + 1));
+                    pm_node_t *result = (pm_node_t *) pm_global_variable_or_write_node_create(parser, node, &token, value);
+
+                    pm_node_destroy(parser, node);
+                    return result;
+                }
+                case PM_CLASS_VARIABLE_READ_NODE: {
+                    parser_lex(parser);
+
+                    pm_node_t *value = parse_assignment_value(parser, previous_binding_power, binding_power, accepts_command_call, PM_ERR_EXPECT_EXPRESSION_AFTER_PIPEPIPEEQ, (uint16_t) (depth + 1));
+                    pm_node_t *result = (pm_node_t *) pm_class_variable_or_write_node_create(parser, (pm_class_variable_read_node_t *) node, &token, value);
+
+                    pm_node_destroy(parser, node);
+                    return result;
+                }
+                case PM_CONSTANT_PATH_NODE: {
+                    parser_lex(parser);
+
+                    pm_node_t *value = parse_assignment_value(parser, previous_binding_power, binding_power, accepts_command_call, PM_ERR_EXPECT_EXPRESSION_AFTER_PIPEPIPEEQ, (uint16_t) (depth + 1));
+                    pm_node_t *write = (pm_node_t *) pm_constant_path_or_write_node_create(parser, (pm_constant_path_node_t *) node, &token, value);
+
+                    return parse_shareable_constant_write(parser, write);
+                }
+                case PM_CONSTANT_READ_NODE: {
+                    parser_lex(parser);
+
+                    pm_node_t *value = parse_assignment_value(parser, previous_binding_power, binding_power, accepts_command_call, PM_ERR_EXPECT_EXPRESSION_AFTER_PIPEPIPEEQ, (uint16_t) (depth + 1));
+                    pm_node_t *write = (pm_node_t *) pm_constant_or_write_node_create(parser, (pm_constant_read_node_t *) node, &token, value);
+
+                    pm_node_destroy(parser, node);
+                    return parse_shareable_constant_write(parser, write);
+                }
+                case PM_INSTANCE_VARIABLE_READ_NODE: {
+                    parser_lex(parser);
+
+                    pm_node_t *value = parse_assignment_value(parser, previous_binding_power, binding_power, accepts_command_call, PM_ERR_EXPECT_EXPRESSION_AFTER_PIPEPIPEEQ, (uint16_t) (depth + 1));
+                    pm_node_t *result = (pm_node_t *) pm_instance_variable_or_write_node_create(parser, (pm_instance_variable_read_node_t *) node, &token, value);
+
+                    pm_node_destroy(parser, node);
+                    return result;
+                }
+                case PM_IT_LOCAL_VARIABLE_READ_NODE: {
+                    pm_constant_id_t name = pm_parser_local_add_constant(parser, "it", 2);
+                    parser_lex(parser);
+
+                    pm_node_t *value = parse_assignment_value(parser, previous_binding_power, binding_power, accepts_command_call, PM_ERR_EXPECT_EXPRESSION_AFTER_PIPEPIPEEQ, (uint16_t) (depth + 1));
+                    pm_node_t *result = (pm_node_t *) pm_local_variable_or_write_node_create(parser, node, &token, value, name, 0);
+
+                    parse_target_implicit_parameter(parser, node);
+                    pm_node_destroy(parser, node);
+                    return result;
+                }
+                case PM_LOCAL_VARIABLE_READ_NODE: {
+                    if (pm_token_is_numbered_parameter(node->location.start, node->location.end)) {
+                        PM_PARSER_ERR_FORMAT(parser, node->location.start, node->location.end, PM_ERR_PARAMETER_NUMBERED_RESERVED, node->location.start);
+                        parse_target_implicit_parameter(parser, node);
+                    }
+
+                    pm_local_variable_read_node_t *cast = (pm_local_variable_read_node_t *) node;
+                    parser_lex(parser);
+
+                    pm_node_t *value = parse_assignment_value(parser, previous_binding_power, binding_power, accepts_command_call, PM_ERR_EXPECT_EXPRESSION_AFTER_PIPEPIPEEQ, (uint16_t) (depth + 1));
+                    pm_node_t *result = (pm_node_t *) pm_local_variable_or_write_node_create(parser, node, &token, value, cast->name, cast->depth);
+
+                    pm_node_destroy(parser, node);
+                    return result;
+                }
+                case PM_CALL_NODE: {
+                    pm_call_node_t *cast = (pm_call_node_t *) node;
+
+                    // If we have a vcall (a method with no arguments and no
+                    // receiver that could have been a local variable) then we
+                    // will transform it into a local variable write.
+                    if (PM_NODE_FLAG_P(cast, PM_CALL_NODE_FLAGS_VARIABLE_CALL)) {
+                        pm_location_t *message_loc = &cast->message_loc;
+                        pm_refute_numbered_parameter(parser, message_loc->start, message_loc->end);
+
+                        pm_constant_id_t constant_id = pm_parser_local_add_location(parser, message_loc->start, message_loc->end, 1);
+                        parser_lex(parser);
+
+                        pm_node_t *value = parse_assignment_value(parser, previous_binding_power, binding_power, accepts_command_call, PM_ERR_EXPECT_EXPRESSION_AFTER_PIPEPIPEEQ, (uint16_t) (depth + 1));
+                        pm_node_t *result = (pm_node_t *) pm_local_variable_or_write_node_create(parser, (pm_node_t *) cast, &token, value, constant_id, 0);
+
+                        pm_node_destroy(parser, (pm_node_t *) cast);
+                        return result;
+                    }
+
+                    // Move past the token here so that we have already added
+                    // the local variable by this point.
+                    parser_lex(parser);
+
+                    // If there is no call operator and the message is "[]" then
+                    // this is an aref expression, and we can transform it into
+                    // an aset expression.
+                    if (PM_NODE_FLAG_P(cast, PM_CALL_NODE_FLAGS_INDEX)) {
+                        pm_node_t *value = parse_assignment_value(parser, previous_binding_power, binding_power, accepts_command_call, PM_ERR_EXPECT_EXPRESSION_AFTER_PIPEPIPEEQ, (uint16_t) (depth + 1));
+                        return (pm_node_t *) pm_index_or_write_node_create(parser, cast, &token, value);
+                    }
+
+                    // If this node cannot be writable, then we have an error.
+                    if (pm_call_node_writable_p(parser, cast)) {
+                        parse_write_name(parser, &cast->name);
+                    } else {
+                        pm_parser_err_node(parser, node, PM_ERR_WRITE_TARGET_UNEXPECTED);
+                    }
+
+                    parse_call_operator_write(parser, cast, &token);
+                    pm_node_t *value = parse_assignment_value(parser, previous_binding_power, binding_power, accepts_command_call, PM_ERR_EXPECT_EXPRESSION_AFTER_PIPEPIPEEQ, (uint16_t) (depth + 1));
+                    return (pm_node_t *) pm_call_or_write_node_create(parser, cast, &token, value);
+                }
+                case PM_MULTI_WRITE_NODE: {
+                    parser_lex(parser);
+                    pm_parser_err_token(parser, &token, PM_ERR_PIPEPIPEEQ_MULTI_ASSIGN);
+                    return node;
+                }
+                default:
+                    parser_lex(parser);
+
+                    // In this case we have an ||= sign, but we don't know what it's for.
+                    // We need to treat it as an error. For now, we'll mark it as an error
+                    // and just skip right past it.
+                    pm_parser_err_token(parser, &token, PM_ERR_EXPECT_EXPRESSION_AFTER_PIPEPIPEEQ);
+                    return node;
+            }
+        }
+        case PM_TOKEN_AMPERSAND_EQUAL:
+        case PM_TOKEN_CARET_EQUAL:
+        case PM_TOKEN_GREATER_GREATER_EQUAL:
+        case PM_TOKEN_LESS_LESS_EQUAL:
+        case PM_TOKEN_MINUS_EQUAL:
+        case PM_TOKEN_PERCENT_EQUAL:
+        case PM_TOKEN_PIPE_EQUAL:
+        case PM_TOKEN_PLUS_EQUAL:
+        case PM_TOKEN_SLASH_EQUAL:
+        case PM_TOKEN_STAR_EQUAL:
+        case PM_TOKEN_STAR_STAR_EQUAL: {
+            switch (PM_NODE_TYPE(node)) {
+                case PM_BACK_REFERENCE_READ_NODE:
+                case PM_NUMBERED_REFERENCE_READ_NODE:
+                    PM_PARSER_ERR_NODE_FORMAT_CONTENT(parser, node, PM_ERR_WRITE_TARGET_READONLY);
+                PRISM_FALLTHROUGH
+                case PM_GLOBAL_VARIABLE_READ_NODE: {
+                    parser_lex(parser);
+
+                    pm_node_t *value = parse_assignment_value(parser, previous_binding_power, binding_power, accepts_command_call, PM_ERR_EXPECT_EXPRESSION_AFTER_OPERATOR, (uint16_t) (depth + 1));
+                    pm_node_t *result = (pm_node_t *) pm_global_variable_operator_write_node_create(parser, node, &token, value);
+
+                    pm_node_destroy(parser, node);
+                    return result;
+                }
+                case PM_CLASS_VARIABLE_READ_NODE: {
+                    parser_lex(parser);
+
+                    pm_node_t *value = parse_assignment_value(parser, previous_binding_power, binding_power, accepts_command_call, PM_ERR_EXPECT_EXPRESSION_AFTER_OPERATOR, (uint16_t) (depth + 1));
+                    pm_node_t *result = (pm_node_t *) pm_class_variable_operator_write_node_create(parser, (pm_class_variable_read_node_t *) node, &token, value);
+
+                    pm_node_destroy(parser, node);
+                    return result;
+                }
+                case PM_CONSTANT_PATH_NODE: {
+                    parser_lex(parser);
+
+                    pm_node_t *value = parse_assignment_value(parser, previous_binding_power, binding_power, accepts_command_call, PM_ERR_EXPECT_EXPRESSION_AFTER_OPERATOR, (uint16_t) (depth + 1));
+                    pm_node_t *write = (pm_node_t *) pm_constant_path_operator_write_node_create(parser, (pm_constant_path_node_t *) node, &token, value);
+
+                    return parse_shareable_constant_write(parser, write);
+                }
+                case PM_CONSTANT_READ_NODE: {
+                    parser_lex(parser);
+
+                    pm_node_t *value = parse_assignment_value(parser, previous_binding_power, binding_power, accepts_command_call, PM_ERR_EXPECT_EXPRESSION_AFTER_OPERATOR, (uint16_t) (depth + 1));
+                    pm_node_t *write = (pm_node_t *) pm_constant_operator_write_node_create(parser, (pm_constant_read_node_t *) node, &token, value);
+
+                    pm_node_destroy(parser, node);
+                    return parse_shareable_constant_write(parser, write);
+                }
+                case PM_INSTANCE_VARIABLE_READ_NODE: {
+                    parser_lex(parser);
+
+                    pm_node_t *value = parse_assignment_value(parser, previous_binding_power, binding_power, accepts_command_call, PM_ERR_EXPECT_EXPRESSION_AFTER_OPERATOR, (uint16_t) (depth + 1));
+                    pm_node_t *result = (pm_node_t *) pm_instance_variable_operator_write_node_create(parser, (pm_instance_variable_read_node_t *) node, &token, value);
+
+                    pm_node_destroy(parser, node);
+                    return result;
+                }
+                case PM_IT_LOCAL_VARIABLE_READ_NODE: {
+                    pm_constant_id_t name = pm_parser_local_add_constant(parser, "it", 2);
+                    parser_lex(parser);
+
+                    pm_node_t *value = parse_assignment_value(parser, previous_binding_power, binding_power, accepts_command_call, PM_ERR_EXPECT_EXPRESSION_AFTER_OPERATOR, (uint16_t) (depth + 1));
+                    pm_node_t *result = (pm_node_t *) pm_local_variable_operator_write_node_create(parser, node, &token, value, name, 0);
+
+                    parse_target_implicit_parameter(parser, node);
+                    pm_node_destroy(parser, node);
+                    return result;
+                }
+                case PM_LOCAL_VARIABLE_READ_NODE: {
+                    if (pm_token_is_numbered_parameter(node->location.start, node->location.end)) {
+                        PM_PARSER_ERR_FORMAT(parser, node->location.start, node->location.end, PM_ERR_PARAMETER_NUMBERED_RESERVED, node->location.start);
+                        parse_target_implicit_parameter(parser, node);
+                    }
+
+                    pm_local_variable_read_node_t *cast = (pm_local_variable_read_node_t *) node;
+                    parser_lex(parser);
+
+                    pm_node_t *value = parse_assignment_value(parser, previous_binding_power, binding_power, accepts_command_call, PM_ERR_EXPECT_EXPRESSION_AFTER_OPERATOR, (uint16_t) (depth + 1));
+                    pm_node_t *result = (pm_node_t *) pm_local_variable_operator_write_node_create(parser, node, &token, value, cast->name, cast->depth);
+
+                    pm_node_destroy(parser, node);
+                    return result;
+                }
+                case PM_CALL_NODE: {
+                    parser_lex(parser);
+                    pm_call_node_t *cast = (pm_call_node_t *) node;
+
+                    // If we have a vcall (a method with no arguments and no
+                    // receiver that could have been a local variable) then we
+                    // will transform it into a local variable write.
+                    if (PM_NODE_FLAG_P(cast, PM_CALL_NODE_FLAGS_VARIABLE_CALL)) {
+                        pm_location_t *message_loc = &cast->message_loc;
+                        pm_refute_numbered_parameter(parser, message_loc->start, message_loc->end);
+
+                        pm_constant_id_t constant_id = pm_parser_local_add_location(parser, message_loc->start, message_loc->end, 1);
+                        pm_node_t *value = parse_assignment_value(parser, previous_binding_power, binding_power, accepts_command_call, PM_ERR_EXPECT_EXPRESSION_AFTER_OPERATOR, (uint16_t) (depth + 1));
+                        pm_node_t *result = (pm_node_t *) pm_local_variable_operator_write_node_create(parser, (pm_node_t *) cast, &token, value, constant_id, 0);
+
+                        pm_node_destroy(parser, (pm_node_t *) cast);
+                        return result;
+                    }
+
+                    // If there is no call operator and the message is "[]" then
+                    // this is an aref expression, and we can transform it into
+                    // an aset expression.
+                    if (PM_NODE_FLAG_P(cast, PM_CALL_NODE_FLAGS_INDEX)) {
+                        pm_node_t *value = parse_assignment_value(parser, previous_binding_power, binding_power, accepts_command_call, PM_ERR_EXPECT_EXPRESSION_AFTER_OPERATOR, (uint16_t) (depth + 1));
+                        return (pm_node_t *) pm_index_operator_write_node_create(parser, cast, &token, value);
+                    }
+
+                    // If this node cannot be writable, then we have an error.
+                    if (pm_call_node_writable_p(parser, cast)) {
+                        parse_write_name(parser, &cast->name);
+                    } else {
+                        pm_parser_err_node(parser, node, PM_ERR_WRITE_TARGET_UNEXPECTED);
+                    }
+
+                    parse_call_operator_write(parser, cast, &token);
+                    pm_node_t *value = parse_assignment_value(parser, previous_binding_power, binding_power, accepts_command_call, PM_ERR_EXPECT_EXPRESSION_AFTER_OPERATOR, (uint16_t) (depth + 1));
+                    return (pm_node_t *) pm_call_operator_write_node_create(parser, cast, &token, value);
+                }
+                case PM_MULTI_WRITE_NODE: {
+                    parser_lex(parser);
+                    pm_parser_err_token(parser, &token, PM_ERR_OPERATOR_MULTI_ASSIGN);
+                    return node;
+                }
+                default:
+                    parser_lex(parser);
+
+                    // In this case we have an operator but we don't know what it's for.
+                    // We need to treat it as an error. For now, we'll mark it as an error
+                    // and just skip right past it.
+                    PM_PARSER_ERR_TOKEN_FORMAT(parser, parser->previous, PM_ERR_EXPECT_EXPRESSION_AFTER_OPERATOR, pm_token_type_human(parser->current.type));
+                    return node;
+            }
+        }
+        case PM_TOKEN_AMPERSAND_AMPERSAND:
+        case PM_TOKEN_KEYWORD_AND: {
+            parser_lex(parser);
+
+            pm_node_t *right = parse_expression(parser, binding_power, parser->previous.type == PM_TOKEN_KEYWORD_AND, false, PM_ERR_EXPECT_EXPRESSION_AFTER_OPERATOR, (uint16_t) (depth + 1));
+            return (pm_node_t *) pm_and_node_create(parser, node, &token, right);
+        }
+        case PM_TOKEN_KEYWORD_OR:
+        case PM_TOKEN_PIPE_PIPE: {
+            parser_lex(parser);
+
+            pm_node_t *right = parse_expression(parser, binding_power, parser->previous.type == PM_TOKEN_KEYWORD_OR, false, PM_ERR_EXPECT_EXPRESSION_AFTER_OPERATOR, (uint16_t) (depth + 1));
+            return (pm_node_t *) pm_or_node_create(parser, node, &token, right);
+        }
+        case PM_TOKEN_EQUAL_TILDE: {
+            // Note that we _must_ parse the value before adding the local
+            // variables in order to properly mirror the behavior of Ruby. For
+            // example,
+            //
+            //     /(?<foo>bar)/ =~ foo
+            //
+            // In this case, `foo` should be a method call and not a local yet.
+            parser_lex(parser);
+            pm_node_t *argument = parse_expression(parser, binding_power, false, false, PM_ERR_EXPECT_EXPRESSION_AFTER_OPERATOR, (uint16_t) (depth + 1));
+
+            // By default, we're going to create a call node and then return it.
+            pm_call_node_t *call = pm_call_node_binary_create(parser, node, &token, argument, 0);
+            pm_node_t *result = (pm_node_t *) call;
+
+            // If the receiver of this =~ is a regular expression node, then we
+            // need to introduce local variables for it based on its named
+            // capture groups.
+            if (PM_NODE_TYPE_P(node, PM_INTERPOLATED_REGULAR_EXPRESSION_NODE)) {
+                // It's possible to have an interpolated regular expression node
+                // that only contains strings. This is because it can be split
+                // up by a heredoc. In this case we need to concat the unescaped
+                // strings together and then parse them as a regular expression.
+                pm_node_list_t *parts = &((pm_interpolated_regular_expression_node_t *) node)->parts;
+
+                bool interpolated = false;
+                size_t total_length = 0;
+
+                pm_node_t *part;
+                PM_NODE_LIST_FOREACH(parts, index, part) {
+                    if (PM_NODE_TYPE_P(part, PM_STRING_NODE)) {
+                        total_length += pm_string_length(&((pm_string_node_t *) part)->unescaped);
+                    } else {
+                        interpolated = true;
+                        break;
+                    }
+                }
+
+                if (!interpolated && total_length > 0) {
+                    void *memory = xmalloc(total_length);
+                    if (!memory) abort();
+
+                    uint8_t *cursor = memory;
+                    PM_NODE_LIST_FOREACH(parts, index, part) {
+                        pm_string_t *unescaped = &((pm_string_node_t *) part)->unescaped;
+                        size_t length = pm_string_length(unescaped);
+
+                        memcpy(cursor, pm_string_source(unescaped), length);
+                        cursor += length;
+                    }
+
+                    pm_string_t owned;
+                    pm_string_owned_init(&owned, (uint8_t *) memory, total_length);
+
+                    result = parse_regular_expression_named_captures(parser, &owned, call, PM_NODE_FLAG_P(node, PM_REGULAR_EXPRESSION_FLAGS_EXTENDED));
+                    pm_string_free(&owned);
+                }
+            } else if (PM_NODE_TYPE_P(node, PM_REGULAR_EXPRESSION_NODE)) {
+                // If we have a regular expression node, then we can just parse
+                // the named captures directly off the unescaped string.
+                const pm_string_t *content = &((pm_regular_expression_node_t *) node)->unescaped;
+                result = parse_regular_expression_named_captures(parser, content, call, PM_NODE_FLAG_P(node, PM_REGULAR_EXPRESSION_FLAGS_EXTENDED));
+            }
+
+            return result;
+        }
+        case PM_TOKEN_UAMPERSAND:
+        case PM_TOKEN_USTAR:
+        case PM_TOKEN_USTAR_STAR:
+            // The only times this will occur are when we are in an error state,
+            // but we'll put them in here so that errors can propagate.
+        case PM_TOKEN_BANG_EQUAL:
+        case PM_TOKEN_BANG_TILDE:
+        case PM_TOKEN_EQUAL_EQUAL:
+        case PM_TOKEN_EQUAL_EQUAL_EQUAL:
+        case PM_TOKEN_LESS_EQUAL_GREATER:
+        case PM_TOKEN_CARET:
+        case PM_TOKEN_PIPE:
+        case PM_TOKEN_AMPERSAND:
+        case PM_TOKEN_GREATER_GREATER:
+        case PM_TOKEN_LESS_LESS:
+        case PM_TOKEN_MINUS:
+        case PM_TOKEN_PLUS:
+        case PM_TOKEN_PERCENT:
+        case PM_TOKEN_SLASH:
+        case PM_TOKEN_STAR:
+        case PM_TOKEN_STAR_STAR: {
+            parser_lex(parser);
+            pm_token_t operator = parser->previous;
+            switch (PM_NODE_TYPE(node)) {
+                case PM_RESCUE_MODIFIER_NODE: {
+                    pm_rescue_modifier_node_t *cast = (pm_rescue_modifier_node_t *) node;
+                    if (PM_NODE_TYPE_P(cast->rescue_expression, PM_MATCH_PREDICATE_NODE) || PM_NODE_TYPE_P(cast->rescue_expression, PM_MATCH_REQUIRED_NODE)) {
+                        PM_PARSER_ERR_TOKEN_FORMAT(parser, operator, PM_ERR_EXPECT_EOL_AFTER_STATEMENT, pm_token_type_human(operator.type));
+                    }
+                    break;
+                }
+                case PM_AND_NODE: {
+                    pm_and_node_t *cast = (pm_and_node_t *) node;
+                    if (PM_NODE_TYPE_P(cast->right, PM_MATCH_PREDICATE_NODE) || PM_NODE_TYPE_P(cast->right, PM_MATCH_REQUIRED_NODE)) {
+                        PM_PARSER_ERR_TOKEN_FORMAT(parser, operator, PM_ERR_EXPECT_EOL_AFTER_STATEMENT, pm_token_type_human(operator.type));
+                    }
+                    break;
+                }
+                case PM_OR_NODE: {
+                    pm_or_node_t *cast = (pm_or_node_t *) node;
+                    if (PM_NODE_TYPE_P(cast->right, PM_MATCH_PREDICATE_NODE) || PM_NODE_TYPE_P(cast->right, PM_MATCH_REQUIRED_NODE)) {
+                        PM_PARSER_ERR_TOKEN_FORMAT(parser, operator, PM_ERR_EXPECT_EOL_AFTER_STATEMENT, pm_token_type_human(operator.type));
+                    }
+                    break;
+                }
+                default:
+                    break;
+            }
+
+            pm_node_t *argument = parse_expression(parser, binding_power, false, false, PM_ERR_EXPECT_EXPRESSION_AFTER_OPERATOR, (uint16_t) (depth + 1));
+            return (pm_node_t *) pm_call_node_binary_create(parser, node, &token, argument, 0);
+        }
+        case PM_TOKEN_GREATER:
+        case PM_TOKEN_GREATER_EQUAL:
+        case PM_TOKEN_LESS:
+        case PM_TOKEN_LESS_EQUAL: {
+            if (PM_NODE_TYPE_P(node, PM_CALL_NODE) && PM_NODE_FLAG_P(node, PM_CALL_NODE_FLAGS_COMPARISON)) {
+                PM_PARSER_WARN_TOKEN_FORMAT_CONTENT(parser, parser->current, PM_WARN_COMPARISON_AFTER_COMPARISON);
+            }
+
+            parser_lex(parser);
+            pm_node_t *argument = parse_expression(parser, binding_power, false, false, PM_ERR_EXPECT_EXPRESSION_AFTER_OPERATOR, (uint16_t) (depth + 1));
+            return (pm_node_t *) pm_call_node_binary_create(parser, node, &token, argument, PM_CALL_NODE_FLAGS_COMPARISON);
+        }
+        case PM_TOKEN_AMPERSAND_DOT:
+        case PM_TOKEN_DOT: {
+            parser_lex(parser);
+            pm_token_t operator = parser->previous;
+            pm_arguments_t arguments = { 0 };
+
+            // This if statement handles the foo.() syntax.
+            if (match1(parser, PM_TOKEN_PARENTHESIS_LEFT)) {
+                parse_arguments_list(parser, &arguments, true, false, (uint16_t) (depth + 1));
+                return (pm_node_t *) pm_call_node_shorthand_create(parser, node, &operator, &arguments);
+            }
+
+            switch (PM_NODE_TYPE(node)) {
+                case PM_RESCUE_MODIFIER_NODE: {
+                    pm_rescue_modifier_node_t *cast = (pm_rescue_modifier_node_t *) node;
+                    if (PM_NODE_TYPE_P(cast->rescue_expression, PM_MATCH_PREDICATE_NODE) || PM_NODE_TYPE_P(cast->rescue_expression, PM_MATCH_REQUIRED_NODE)) {
+                        PM_PARSER_ERR_TOKEN_FORMAT(parser, operator, PM_ERR_EXPECT_EOL_AFTER_STATEMENT, pm_token_type_human(operator.type));
+                    }
+                    break;
+                }
+                case PM_AND_NODE: {
+                    pm_and_node_t *cast = (pm_and_node_t *) node;
+                    if (PM_NODE_TYPE_P(cast->right, PM_MATCH_PREDICATE_NODE) || PM_NODE_TYPE_P(cast->right, PM_MATCH_REQUIRED_NODE)) {
+                        PM_PARSER_ERR_TOKEN_FORMAT(parser, operator, PM_ERR_EXPECT_EOL_AFTER_STATEMENT, pm_token_type_human(operator.type));
+                    }
+                    break;
+                }
+                case PM_OR_NODE: {
+                    pm_or_node_t *cast = (pm_or_node_t *) node;
+                    if (PM_NODE_TYPE_P(cast->right, PM_MATCH_PREDICATE_NODE) || PM_NODE_TYPE_P(cast->right, PM_MATCH_REQUIRED_NODE)) {
+                        PM_PARSER_ERR_TOKEN_FORMAT(parser, operator, PM_ERR_EXPECT_EOL_AFTER_STATEMENT, pm_token_type_human(operator.type));
+                    }
+                    break;
+                }
+                default:
+                    break;
+            }
+
+            pm_token_t message;
+
+            switch (parser->current.type) {
+                case PM_CASE_OPERATOR:
+                case PM_CASE_KEYWORD:
+                case PM_TOKEN_CONSTANT:
+                case PM_TOKEN_IDENTIFIER:
+                case PM_TOKEN_METHOD_NAME: {
+                    parser_lex(parser);
+                    message = parser->previous;
+                    break;
+                }
+                default: {
+                    PM_PARSER_ERR_TOKEN_FORMAT(parser, parser->current, PM_ERR_EXPECT_MESSAGE, pm_token_type_human(parser->current.type));
+                    message = (pm_token_t) { .type = PM_TOKEN_MISSING, .start = parser->previous.end, .end = parser->previous.end };
+                }
+            }
+
+            parse_arguments_list(parser, &arguments, true, accepts_command_call, (uint16_t) (depth + 1));
+            pm_call_node_t *call = pm_call_node_call_create(parser, node, &operator, &message, &arguments);
+
+            if (
+                (previous_binding_power == PM_BINDING_POWER_STATEMENT) &&
+                arguments.arguments == NULL &&
+                arguments.opening_loc.start == NULL &&
+                match1(parser, PM_TOKEN_COMMA)
+            ) {
+                return parse_targets_validate(parser, (pm_node_t *) call, PM_BINDING_POWER_INDEX, (uint16_t) (depth + 1));
+            } else {
+                return (pm_node_t *) call;
+            }
+        }
+        case PM_TOKEN_DOT_DOT:
+        case PM_TOKEN_DOT_DOT_DOT: {
+            parser_lex(parser);
+
+            pm_node_t *right = NULL;
+            if (token_begins_expression_p(parser->current.type)) {
+                right = parse_expression(parser, binding_power, false, false, PM_ERR_EXPECT_EXPRESSION_AFTER_OPERATOR, (uint16_t) (depth + 1));
+            }
+
+            return (pm_node_t *) pm_range_node_create(parser, node, &token, right);
+        }
+        case PM_TOKEN_KEYWORD_IF_MODIFIER: {
+            pm_token_t keyword = parser->current;
+            parser_lex(parser);
+
+            pm_node_t *predicate = parse_value_expression(parser, binding_power, true, false, PM_ERR_CONDITIONAL_IF_PREDICATE, (uint16_t) (depth + 1));
+            return (pm_node_t *) pm_if_node_modifier_create(parser, node, &keyword, predicate);
+        }
+        case PM_TOKEN_KEYWORD_UNLESS_MODIFIER: {
+            pm_token_t keyword = parser->current;
+            parser_lex(parser);
+
+            pm_node_t *predicate = parse_value_expression(parser, binding_power, true, false, PM_ERR_CONDITIONAL_UNLESS_PREDICATE, (uint16_t) (depth + 1));
+            return (pm_node_t *) pm_unless_node_modifier_create(parser, node, &keyword, predicate);
+        }
+        case PM_TOKEN_KEYWORD_UNTIL_MODIFIER: {
+            parser_lex(parser);
+            pm_statements_node_t *statements = pm_statements_node_create(parser);
+            pm_statements_node_body_append(parser, statements, node, true);
+
+            pm_node_t *predicate = parse_value_expression(parser, binding_power, true, false, PM_ERR_CONDITIONAL_UNTIL_PREDICATE, (uint16_t) (depth + 1));
+            return (pm_node_t *) pm_until_node_modifier_create(parser, &token, predicate, statements, PM_NODE_TYPE_P(node, PM_BEGIN_NODE) ? PM_LOOP_FLAGS_BEGIN_MODIFIER : 0);
+        }
+        case PM_TOKEN_KEYWORD_WHILE_MODIFIER: {
+            parser_lex(parser);
+            pm_statements_node_t *statements = pm_statements_node_create(parser);
+            pm_statements_node_body_append(parser, statements, node, true);
+
+            pm_node_t *predicate = parse_value_expression(parser, binding_power, true, false, PM_ERR_CONDITIONAL_WHILE_PREDICATE, (uint16_t) (depth + 1));
+            return (pm_node_t *) pm_while_node_modifier_create(parser, &token, predicate, statements, PM_NODE_TYPE_P(node, PM_BEGIN_NODE) ? PM_LOOP_FLAGS_BEGIN_MODIFIER : 0);
+        }
+        case PM_TOKEN_QUESTION_MARK: {
+            context_push(parser, PM_CONTEXT_TERNARY);
+            pm_node_list_t current_block_exits = { 0 };
+            pm_node_list_t *previous_block_exits = push_block_exits(parser, &current_block_exits);
+
+            pm_token_t qmark = parser->current;
+            parser_lex(parser);
+
+            pm_node_t *true_expression = parse_expression(parser, PM_BINDING_POWER_DEFINED, false, false, PM_ERR_TERNARY_EXPRESSION_TRUE, (uint16_t) (depth + 1));
+
+            if (parser->recovering) {
+                // If parsing the true expression of this ternary resulted in a syntax
+                // error that we can recover from, then we're going to put missing nodes
+                // and tokens into the remaining places. We want to be sure to do this
+                // before the `expect` function call to make sure it doesn't
+                // accidentally move past a ':' token that occurs after the syntax
+                // error.
+                pm_token_t colon = (pm_token_t) { .type = PM_TOKEN_MISSING, .start = parser->previous.end, .end = parser->previous.end };
+                pm_node_t *false_expression = (pm_node_t *) pm_missing_node_create(parser, colon.start, colon.end);
+
+                context_pop(parser);
+                pop_block_exits(parser, previous_block_exits);
+                pm_node_list_free(&current_block_exits);
+
+                return (pm_node_t *) pm_if_node_ternary_create(parser, node, &qmark, true_expression, &colon, false_expression);
+            }
+
+            accept1(parser, PM_TOKEN_NEWLINE);
+            expect1(parser, PM_TOKEN_COLON, PM_ERR_TERNARY_COLON);
+
+            pm_token_t colon = parser->previous;
+            pm_node_t *false_expression = parse_expression(parser, PM_BINDING_POWER_DEFINED, false, false, PM_ERR_TERNARY_EXPRESSION_FALSE, (uint16_t) (depth + 1));
+
+            context_pop(parser);
+            pop_block_exits(parser, previous_block_exits);
+            pm_node_list_free(&current_block_exits);
+
+            return (pm_node_t *) pm_if_node_ternary_create(parser, node, &qmark, true_expression, &colon, false_expression);
+        }
+        case PM_TOKEN_COLON_COLON: {
+            parser_lex(parser);
+            pm_token_t delimiter = parser->previous;
+
+            switch (parser->current.type) {
+                case PM_TOKEN_CONSTANT: {
+                    parser_lex(parser);
+                    pm_node_t *path;
+
+                    if (
+                        (parser->current.type == PM_TOKEN_PARENTHESIS_LEFT) ||
+                        (accepts_command_call && (token_begins_expression_p(parser->current.type) || match3(parser, PM_TOKEN_UAMPERSAND, PM_TOKEN_USTAR, PM_TOKEN_USTAR_STAR)))
+                    ) {
+                        // If we have a constant immediately following a '::' operator, then
+                        // this can either be a constant path or a method call, depending on
+                        // what follows the constant.
+                        //
+                        // If we have parentheses, then this is a method call. That would
+                        // look like Foo::Bar().
+                        pm_token_t message = parser->previous;
+                        pm_arguments_t arguments = { 0 };
+
+                        parse_arguments_list(parser, &arguments, true, accepts_command_call, (uint16_t) (depth + 1));
+                        path = (pm_node_t *) pm_call_node_call_create(parser, node, &delimiter, &message, &arguments);
+                    } else {
+                        // Otherwise, this is a constant path. That would look like Foo::Bar.
+                        path = (pm_node_t *) pm_constant_path_node_create(parser, node, &delimiter, &parser->previous);
+                    }
+
+                    // If this is followed by a comma then it is a multiple assignment.
+                    if (previous_binding_power == PM_BINDING_POWER_STATEMENT && match1(parser, PM_TOKEN_COMMA)) {
+                        return parse_targets_validate(parser, path, PM_BINDING_POWER_INDEX, (uint16_t) (depth + 1));
+                    }
+
+                    return path;
+                }
+                case PM_CASE_OPERATOR:
+                case PM_CASE_KEYWORD:
+                case PM_TOKEN_IDENTIFIER:
+                case PM_TOKEN_METHOD_NAME: {
+                    parser_lex(parser);
+                    pm_token_t message = parser->previous;
+
+                    // If we have an identifier following a '::' operator, then it is for
+                    // sure a method call.
+                    pm_arguments_t arguments = { 0 };
+                    parse_arguments_list(parser, &arguments, true, accepts_command_call, (uint16_t) (depth + 1));
+                    pm_call_node_t *call = pm_call_node_call_create(parser, node, &delimiter, &message, &arguments);
+
+                    // If this is followed by a comma then it is a multiple assignment.
+                    if (previous_binding_power == PM_BINDING_POWER_STATEMENT && match1(parser, PM_TOKEN_COMMA)) {
+                        return parse_targets_validate(parser, (pm_node_t *) call, PM_BINDING_POWER_INDEX, (uint16_t) (depth + 1));
+                    }
+
+                    return (pm_node_t *) call;
+                }
+                case PM_TOKEN_PARENTHESIS_LEFT: {
+                    // If we have a parenthesis following a '::' operator, then it is the
+                    // method call shorthand. That would look like Foo::(bar).
+                    pm_arguments_t arguments = { 0 };
+                    parse_arguments_list(parser, &arguments, true, false, (uint16_t) (depth + 1));
+
+                    return (pm_node_t *) pm_call_node_shorthand_create(parser, node, &delimiter, &arguments);
+                }
+                default: {
+                    expect1(parser, PM_TOKEN_CONSTANT, PM_ERR_CONSTANT_PATH_COLON_COLON_CONSTANT);
+                    return (pm_node_t *) pm_constant_path_node_create(parser, node, &delimiter, &parser->previous);
+                }
+            }
+        }
+        case PM_TOKEN_KEYWORD_RESCUE_MODIFIER: {
+            context_push(parser, PM_CONTEXT_RESCUE_MODIFIER);
+            parser_lex(parser);
+            accept1(parser, PM_TOKEN_NEWLINE);
+
+            pm_node_t *value = parse_expression(parser, binding_power, true, false, PM_ERR_RESCUE_MODIFIER_VALUE, (uint16_t) (depth + 1));
+            context_pop(parser);
+
+            return (pm_node_t *) pm_rescue_modifier_node_create(parser, node, &token, value);
+        }
+        case PM_TOKEN_BRACKET_LEFT: {
+            parser_lex(parser);
+
+            pm_arguments_t arguments = { 0 };
+            arguments.opening_loc = PM_LOCATION_TOKEN_VALUE(&parser->previous);
+
+            if (!accept1(parser, PM_TOKEN_BRACKET_RIGHT)) {
+                pm_accepts_block_stack_push(parser, true);
+                parse_arguments(parser, &arguments, false, PM_TOKEN_BRACKET_RIGHT, (uint16_t) (depth + 1));
+                pm_accepts_block_stack_pop(parser);
+                expect1(parser, PM_TOKEN_BRACKET_RIGHT, PM_ERR_EXPECT_RBRACKET);
+            }
+
+            arguments.closing_loc = PM_LOCATION_TOKEN_VALUE(&parser->previous);
+
+            // If we have a comma after the closing bracket then this is a multiple
+            // assignment and we should parse the targets.
+            if (previous_binding_power == PM_BINDING_POWER_STATEMENT && match1(parser, PM_TOKEN_COMMA)) {
+                pm_call_node_t *aref = pm_call_node_aref_create(parser, node, &arguments);
+                return parse_targets_validate(parser, (pm_node_t *) aref, PM_BINDING_POWER_INDEX, (uint16_t) (depth + 1));
+            }
+
+            // If we're at the end of the arguments, we can now check if there is a
+            // block node that starts with a {. If there is, then we can parse it and
+            // add it to the arguments.
+            pm_block_node_t *block = NULL;
+            if (accept1(parser, PM_TOKEN_BRACE_LEFT)) {
+                block = parse_block(parser, (uint16_t) (depth + 1));
+                pm_arguments_validate_block(parser, &arguments, block);
+            } else if (pm_accepts_block_stack_p(parser) && accept1(parser, PM_TOKEN_KEYWORD_DO)) {
+                block = parse_block(parser, (uint16_t) (depth + 1));
+            }
+
+            if (block != NULL) {
+                if (arguments.block != NULL) {
+                    pm_parser_err_node(parser, (pm_node_t *) block, PM_ERR_ARGUMENT_AFTER_BLOCK);
+                    if (arguments.arguments == NULL) {
+                        arguments.arguments = pm_arguments_node_create(parser);
+                    }
+                    pm_arguments_node_arguments_append(arguments.arguments, arguments.block);
+                }
+
+                arguments.block = (pm_node_t *) block;
+            }
+
+            return (pm_node_t *) pm_call_node_aref_create(parser, node, &arguments);
+        }
+        case PM_TOKEN_KEYWORD_IN: {
+            bool previous_pattern_matching_newlines = parser->pattern_matching_newlines;
+            parser->pattern_matching_newlines = true;
+
+            pm_token_t operator = parser->current;
+            parser->command_start = false;
+            lex_state_set(parser, PM_LEX_STATE_BEG | PM_LEX_STATE_LABEL);
+            parser_lex(parser);
+
+            pm_constant_id_list_t captures = { 0 };
+            pm_node_t *pattern = parse_pattern(parser, &captures, PM_PARSE_PATTERN_TOP | PM_PARSE_PATTERN_MULTI, PM_ERR_PATTERN_EXPRESSION_AFTER_IN, (uint16_t) (depth + 1));
+
+            parser->pattern_matching_newlines = previous_pattern_matching_newlines;
+            pm_constant_id_list_free(&captures);
+
+            return (pm_node_t *) pm_match_predicate_node_create(parser, node, pattern, &operator);
+        }
+        case PM_TOKEN_EQUAL_GREATER: {
+            bool previous_pattern_matching_newlines = parser->pattern_matching_newlines;
+            parser->pattern_matching_newlines = true;
+
+            pm_token_t operator = parser->current;
+            parser->command_start = false;
+            lex_state_set(parser, PM_LEX_STATE_BEG | PM_LEX_STATE_LABEL);
+            parser_lex(parser);
+
+            pm_constant_id_list_t captures = { 0 };
+            pm_node_t *pattern = parse_pattern(parser, &captures, PM_PARSE_PATTERN_TOP | PM_PARSE_PATTERN_MULTI, PM_ERR_PATTERN_EXPRESSION_AFTER_HROCKET, (uint16_t) (depth + 1));
+
+            parser->pattern_matching_newlines = previous_pattern_matching_newlines;
+            pm_constant_id_list_free(&captures);
+
+            return (pm_node_t *) pm_match_required_node_create(parser, node, pattern, &operator);
+        }
+        default:
+            assert(false && "unreachable");
+            return NULL;
+    }
+}
+
+#undef PM_PARSE_PATTERN_SINGLE
+#undef PM_PARSE_PATTERN_TOP
+#undef PM_PARSE_PATTERN_MULTI
+
+/**
+ * Determine if a given call node looks like a "command", which means it has
+ * arguments but does not have parentheses.
+ */
+static inline bool
+pm_call_node_command_p(const pm_call_node_t *node) {
+    return (
+        (node->opening_loc.start == NULL) &&
+        (node->block == NULL || PM_NODE_TYPE_P(node->block, PM_BLOCK_ARGUMENT_NODE)) &&
+        (node->arguments != NULL || node->block != NULL)
+    );
+}
+
+/**
+ * Parse an expression at the given point of the parser using the given binding
+ * power to parse subsequent chains. If this function finds a syntax error, it
+ * will append the error message to the parser's error list.
+ *
+ * Consumers of this function should always check parser->recovering to
+ * determine if they need to perform additional cleanup.
+ */
+static pm_node_t *
+parse_expression(pm_parser_t *parser, pm_binding_power_t binding_power, bool accepts_command_call, bool accepts_label, pm_diagnostic_id_t diag_id, uint16_t depth) {
+    if (PRISM_UNLIKELY(depth >= PRISM_DEPTH_MAXIMUM)) {
+        pm_parser_err_current(parser, PM_ERR_NESTING_TOO_DEEP);
+        return (pm_node_t *) pm_missing_node_create(parser, parser->current.start, parser->current.end);
+    }
+
+    pm_node_t *node = parse_expression_prefix(parser, binding_power, accepts_command_call, accepts_label, diag_id, depth);
+
+    switch (PM_NODE_TYPE(node)) {
+        case PM_MISSING_NODE:
+            // If we found a syntax error, then the type of node returned by
+            // parse_expression_prefix is going to be a missing node.
+            return node;
+        case PM_PRE_EXECUTION_NODE:
+        case PM_POST_EXECUTION_NODE:
+        case PM_ALIAS_GLOBAL_VARIABLE_NODE:
+        case PM_ALIAS_METHOD_NODE:
+        case PM_MULTI_WRITE_NODE:
+        case PM_UNDEF_NODE:
+            // These expressions are statements, and cannot be followed by
+            // operators (except modifiers).
+            if (pm_binding_powers[parser->current.type].left > PM_BINDING_POWER_MODIFIER) {
+                return node;
+            }
+            break;
+        case PM_CALL_NODE:
+            // If we have a call node, then we need to check if it looks like a
+            // method call without parentheses that contains arguments. If it
+            // does, then it has different rules for parsing infix operators,
+            // namely that it only accepts composition (and/or) and modifiers
+            // (if/unless/etc.).
+            if ((pm_binding_powers[parser->current.type].left > PM_BINDING_POWER_COMPOSITION) && pm_call_node_command_p((pm_call_node_t *) node)) {
+                return node;
+            }
+            break;
+        case PM_SYMBOL_NODE:
+            // If we have a symbol node that is being parsed as a label, then we
+            // need to immediately return, because there should never be an
+            // infix operator following this node.
+            if (pm_symbol_node_label_p(node)) {
+                return node;
+            }
+            break;
+        default:
+            break;
+    }
+
+    // Otherwise we'll look and see if the next token can be parsed as an infix
+    // operator. If it can, then we'll parse it using parse_expression_infix.
+    pm_binding_powers_t current_binding_powers;
+    pm_token_type_t current_token_type;
+
+    while (
+        current_token_type = parser->current.type,
+        current_binding_powers = pm_binding_powers[current_token_type],
+        binding_power <= current_binding_powers.left &&
+        current_binding_powers.binary
+     ) {
+        node = parse_expression_infix(parser, node, binding_power, current_binding_powers.right, accepts_command_call, (uint16_t) (depth + 1));
+
+        switch (PM_NODE_TYPE(node)) {
+            case PM_MULTI_WRITE_NODE:
+                // Multi-write nodes are statements, and cannot be followed by
+                // operators except modifiers.
+                if (pm_binding_powers[parser->current.type].left > PM_BINDING_POWER_MODIFIER) {
+                    return node;
+                }
+                break;
+            case PM_CLASS_VARIABLE_WRITE_NODE:
+            case PM_CONSTANT_PATH_WRITE_NODE:
+            case PM_CONSTANT_WRITE_NODE:
+            case PM_GLOBAL_VARIABLE_WRITE_NODE:
+            case PM_INSTANCE_VARIABLE_WRITE_NODE:
+            case PM_LOCAL_VARIABLE_WRITE_NODE:
+                // These expressions are statements, by virtue of the right-hand
+                // side of their write being an implicit array.
+                if (PM_NODE_FLAG_P(node, PM_WRITE_NODE_FLAGS_IMPLICIT_ARRAY) && pm_binding_powers[parser->current.type].left > PM_BINDING_POWER_MODIFIER) {
+                    return node;
+                }
+                break;
+            case PM_CALL_NODE:
+                // These expressions are also statements, by virtue of the
+                // right-hand side of the expression (i.e., the last argument to
+                // the call node) being an implicit array.
+                if (PM_NODE_FLAG_P(node, PM_CALL_NODE_FLAGS_IMPLICIT_ARRAY) && pm_binding_powers[parser->current.type].left > PM_BINDING_POWER_MODIFIER) {
+                    return node;
+                }
+                break;
+            default:
+                break;
+        }
+
+        // If the operator is nonassoc and we should not be able to parse the
+        // upcoming infix operator, break.
+        if (current_binding_powers.nonassoc) {
+            // If this is a non-assoc operator and we are about to parse the
+            // exact same operator, then we need to add an error.
+            if (match1(parser, current_token_type)) {
+                PM_PARSER_ERR_TOKEN_FORMAT(parser, parser->current, PM_ERR_NON_ASSOCIATIVE_OPERATOR, pm_token_type_human(parser->current.type), pm_token_type_human(current_token_type));
+                break;
+            }
+
+            // If this is an endless range, then we need to reject a couple of
+            // additional operators because it violates the normal operator
+            // precedence rules. Those patterns are:
+            //
+            //     1.. & 2
+            //     1.. * 2
+            //
+            if (PM_NODE_TYPE_P(node, PM_RANGE_NODE) && ((pm_range_node_t *) node)->right == NULL) {
+                if (match4(parser, PM_TOKEN_UAMPERSAND, PM_TOKEN_USTAR, PM_TOKEN_DOT, PM_TOKEN_AMPERSAND_DOT)) {
+                    PM_PARSER_ERR_TOKEN_FORMAT(parser, parser->current, PM_ERR_NON_ASSOCIATIVE_OPERATOR, pm_token_type_human(parser->current.type), pm_token_type_human(current_token_type));
+                    break;
+                }
+
+                if (PM_BINDING_POWER_TERM <= pm_binding_powers[parser->current.type].left) {
+                    break;
+                }
+            } else if (current_binding_powers.left <= pm_binding_powers[parser->current.type].left) {
+                break;
+            }
+        }
+
+        if (accepts_command_call) {
+            // A command-style method call is only accepted on method chains.
+            // Thus, we check whether the parsed node can continue method chains.
+            // The method chain can continue if the parsed node is one of the following five kinds:
+            // (1) index access: foo[1]
+            // (2) attribute access: foo.bar
+            // (3) method call with parenthesis: foo.bar(1)
+            // (4) method call with a block: foo.bar do end
+            // (5) constant path: foo::Bar
+            switch (node->type) {
+                case PM_CALL_NODE: {
+                    pm_call_node_t *cast = (pm_call_node_t *)node;
+                    if (
+                        // (1) foo[1]
+                        !(
+                            cast->call_operator_loc.start == NULL &&
+                            cast->message_loc.start != NULL &&
+                            cast->message_loc.start[0] == '[' &&
+                            cast->message_loc.end[-1] == ']'
+                        ) &&
+                        // (2) foo.bar
+                        !(
+                            cast->call_operator_loc.start != NULL &&
+                            cast->arguments == NULL &&
+                            cast->block == NULL &&
+                            cast->opening_loc.start == NULL
+                        ) &&
+                        // (3) foo.bar(1)
+                        !(
+                            cast->call_operator_loc.start != NULL &&
+                            cast->opening_loc.start != NULL
+                        ) &&
+                        // (4) foo.bar do end
+                        !(
+                            cast->block != NULL && PM_NODE_TYPE_P(cast->block, PM_BLOCK_NODE)
+                        )
+                     ) {
+                        accepts_command_call = false;
+                    }
+                    break;
+                }
+                // (5) foo::Bar
+                case PM_CONSTANT_PATH_NODE:
+                    break;
+                default:
+                    accepts_command_call = false;
+                    break;
+            }
+        }
+    }
+
+    return node;
+}
+
+/**
+ * ruby -p, ruby -n, ruby -a, and ruby -l options will mutate the AST. We
+ * perform that mutation here.
+ */
+static pm_statements_node_t *
+wrap_statements(pm_parser_t *parser, pm_statements_node_t *statements) {
+    if (PM_PARSER_COMMAND_LINE_OPTION_P(parser)) {
+        if (statements == NULL) {
+            statements = pm_statements_node_create(parser);
+        }
+
+        pm_arguments_node_t *arguments = pm_arguments_node_create(parser);
+        pm_arguments_node_arguments_append(
+            arguments,
+            (pm_node_t *) pm_global_variable_read_node_synthesized_create(parser, pm_parser_constant_id_constant(parser, "$_", 2))
+        );
+
+        pm_statements_node_body_append(parser, statements, (pm_node_t *) pm_call_node_fcall_synthesized_create(
+            parser,
+            arguments,
+            pm_parser_constant_id_constant(parser, "print", 5)
+        ), true);
+    }
+
+    if (PM_PARSER_COMMAND_LINE_OPTION_N(parser)) {
+        if (PM_PARSER_COMMAND_LINE_OPTION_A(parser)) {
+            if (statements == NULL) {
+                statements = pm_statements_node_create(parser);
+            }
+
+            pm_arguments_node_t *arguments = pm_arguments_node_create(parser);
+            pm_arguments_node_arguments_append(
+                arguments,
+                (pm_node_t *) pm_global_variable_read_node_synthesized_create(parser, pm_parser_constant_id_constant(parser, "$;", 2))
+            );
+
+            pm_global_variable_read_node_t *receiver = pm_global_variable_read_node_synthesized_create(parser, pm_parser_constant_id_constant(parser, "$_", 2));
+            pm_call_node_t *call = pm_call_node_call_synthesized_create(parser, (pm_node_t *) receiver, "split", arguments);
+
+            pm_global_variable_write_node_t *write = pm_global_variable_write_node_synthesized_create(
+                parser,
+                pm_parser_constant_id_constant(parser, "$F", 2),
+                (pm_node_t *) call
+            );
+
+            pm_statements_node_body_prepend(statements, (pm_node_t *) write);
+        }
+
+        pm_arguments_node_t *arguments = pm_arguments_node_create(parser);
+        pm_arguments_node_arguments_append(
+            arguments,
+            (pm_node_t *) pm_global_variable_read_node_synthesized_create(parser, pm_parser_constant_id_constant(parser, "$/", 2))
+        );
+
+        if (PM_PARSER_COMMAND_LINE_OPTION_L(parser)) {
+            pm_keyword_hash_node_t *keywords = pm_keyword_hash_node_create(parser);
+            pm_keyword_hash_node_elements_append(keywords, (pm_node_t *) pm_assoc_node_create(
+                parser,
+                (pm_node_t *) pm_symbol_node_synthesized_create(parser, "chomp"),
+                &(pm_token_t) { .type = PM_TOKEN_NOT_PROVIDED, .start = parser->start, .end = parser->start },
+                (pm_node_t *) pm_true_node_synthesized_create(parser)
+            ));
+
+            pm_arguments_node_arguments_append(arguments, (pm_node_t *) keywords);
+            pm_node_flag_set((pm_node_t *) arguments, PM_ARGUMENTS_NODE_FLAGS_CONTAINS_KEYWORDS);
+        }
+
+        pm_statements_node_t *wrapped_statements = pm_statements_node_create(parser);
+        pm_statements_node_body_append(parser, wrapped_statements, (pm_node_t *) pm_while_node_synthesized_create(
+            parser,
+            (pm_node_t *) pm_call_node_fcall_synthesized_create(parser, arguments, pm_parser_constant_id_constant(parser, "gets", 4)),
+            statements
+        ), true);
+
+        statements = wrapped_statements;
+    }
+
+    return statements;
+}
+
+/**
+ * Parse the top-level program node.
+ */
+static pm_node_t *
+parse_program(pm_parser_t *parser) {
+    // If the current scope is NULL, then we want to push a new top level scope.
+    // The current scope could exist in the event that we are parsing an eval
+    // and the user has passed into scopes that already exist.
+    if (parser->current_scope == NULL) {
+        pm_parser_scope_push(parser, true);
+    }
+
+    pm_node_list_t current_block_exits = { 0 };
+    pm_node_list_t *previous_block_exits = push_block_exits(parser, &current_block_exits);
+
+    parser_lex(parser);
+    pm_statements_node_t *statements = parse_statements(parser, PM_CONTEXT_MAIN, 0);
+
+    if (statements != NULL && !parser->parsing_eval) {
+        // If we have statements, then the top-level statement should be
+        // explicitly checked as well. We have to do this here because
+        // everywhere else we check all but the last statement.
+        assert(statements->body.size > 0);
+        pm_void_statement_check(parser, statements->body.nodes[statements->body.size - 1]);
+    }
+
+    pm_constant_id_list_t locals;
+    pm_locals_order(parser, &parser->current_scope->locals, &locals, true);
+    pm_parser_scope_pop(parser);
+
+    // At the top level, see if we need to wrap the statements in a program
+    // node with a while loop based on the options.
+    if (parser->command_line & (PM_OPTIONS_COMMAND_LINE_P | PM_OPTIONS_COMMAND_LINE_N)) {
+        statements = wrap_statements(parser, statements);
+    } else {
+        flush_block_exits(parser, previous_block_exits);
+        pm_node_list_free(&current_block_exits);
+    }
+
+    // If this is an empty file, then we're still going to parse all of the
+    // statements in order to gather up all of the comments and such. Here we'll
+    // correct the location information.
+    if (statements == NULL) {
+        statements = pm_statements_node_create(parser);
+        pm_statements_node_location_set(statements, parser->start, parser->start);
+    }
+
+    return (pm_node_t *) pm_program_node_create(parser, &locals, statements);
+}
+
+/******************************************************************************/
+/* External functions                                                         */
+/******************************************************************************/
+
+/**
+ * A vendored version of strnstr that is used to find a substring within a
+ * string with a given length. This function is used to search for the Ruby
+ * engine name within a shebang when the -x option is passed to Ruby.
+ *
+ * The only modification that we made here is that we don't do NULL byte checks
+ * because we know the little parameter will not have a NULL byte and we allow
+ * the big parameter to have them.
+ */
+static const char *
+pm_strnstr(const char *big, const char *little, size_t big_length) {
+    size_t little_length = strlen(little);
+
+    for (const char *big_end = big + big_length; big < big_end; big++) {
+        if (*big == *little && memcmp(big, little, little_length) == 0) return big;
+    }
+
+    return NULL;
+}
+
+#ifdef _WIN32
+#define pm_parser_warn_shebang_carriage_return(parser, start, length) ((void) 0)
+#else
+/**
+ * Potentially warn the user if the shebang that has been found to include
+ * "ruby" has a carriage return at the end, as that can cause problems on some
+ * platforms.
+ */
+static void
+pm_parser_warn_shebang_carriage_return(pm_parser_t *parser, const uint8_t *start, size_t length) {
+    if (length > 2 && start[length - 2] == '\r' && start[length - 1] == '\n') {
+        pm_parser_warn(parser, start, start + length, PM_WARN_SHEBANG_CARRIAGE_RETURN);
+    }
+}
+#endif
+
+/**
+ * Process the shebang when initializing the parser. This function assumes that
+ * the shebang_callback option has already been checked for nullability.
+ */
+static void
+pm_parser_init_shebang(pm_parser_t *parser, const pm_options_t *options, const char *engine, size_t length) {
+    const char *switches = pm_strnstr(engine, " -", length);
+    if (switches == NULL) return;
+
+    pm_options_t next_options = *options;
+    options->shebang_callback(
+        &next_options,
+        (const uint8_t *) (switches + 1),
+        length - ((size_t) (switches - engine)) - 1,
+        options->shebang_callback_data
+    );
+
+    size_t encoding_length;
+    if ((encoding_length = pm_string_length(&next_options.encoding)) > 0) {
+        const uint8_t *encoding_source = pm_string_source(&next_options.encoding);
+        parser_lex_magic_comment_encoding_value(parser, encoding_source, encoding_source + encoding_length);
+    }
+
+    parser->command_line = next_options.command_line;
+    parser->frozen_string_literal = next_options.frozen_string_literal;
+}
+
+/**
+ * Initialize a parser with the given start and end pointers.
+ */
+PRISM_EXPORTED_FUNCTION void
+pm_parser_init(pm_parser_t *parser, const uint8_t *source, size_t size, const pm_options_t *options) {
+    assert(source != NULL);
+
+    *parser = (pm_parser_t) {
+        .node_id = 0,
+        .lex_state = PM_LEX_STATE_BEG,
+        .enclosure_nesting = 0,
+        .lambda_enclosure_nesting = -1,
+        .brace_nesting = 0,
+        .do_loop_stack = 0,
+        .accepts_block_stack = 0,
+        .lex_modes = {
+            .index = 0,
+            .stack = {{ .mode = PM_LEX_DEFAULT }},
+            .current = &parser->lex_modes.stack[0],
+        },
+        .start = source,
+        .end = source + size,
+        .previous = { .type = PM_TOKEN_EOF, .start = source, .end = source },
+        .current = { .type = PM_TOKEN_EOF, .start = source, .end = source },
+        .next_start = NULL,
+        .heredoc_end = NULL,
+        .data_loc = { .start = NULL, .end = NULL },
+        .comment_list = { 0 },
+        .magic_comment_list = { 0 },
+        .warning_list = { 0 },
+        .error_list = { 0 },
+        .current_scope = NULL,
+        .current_context = NULL,
+        .encoding = PM_ENCODING_UTF_8_ENTRY,
+        .encoding_changed_callback = NULL,
+        .encoding_comment_start = source,
+        .lex_callback = NULL,
+        .filepath = { 0 },
+        .constant_pool = { 0 },
+        .newline_list = { 0 },
+        .integer_base = 0,
+        .current_string = PM_STRING_EMPTY,
+        .start_line = 1,
+        .explicit_encoding = NULL,
+        .command_line = 0,
+        .parsing_eval = false,
+        .partial_script = false,
+        .command_start = true,
+        .recovering = false,
+        .encoding_locked = false,
+        .encoding_changed = false,
+        .pattern_matching_newlines = false,
+        .in_keyword_arg = false,
+        .current_block_exits = NULL,
+        .semantic_token_seen = false,
+        .frozen_string_literal = PM_OPTIONS_FROZEN_STRING_LITERAL_UNSET,
+        .current_regular_expression_ascii_only = false,
+        .warn_mismatched_indentation = true
+    };
+
+    // Initialize the constant pool. We're going to completely guess as to the
+    // number of constants that we'll need based on the size of the input. The
+    // ratio we chose here is actually less arbitrary than you might think.
+    //
+    // We took ~50K Ruby files and measured the size of the file versus the
+    // number of constants that were found in those files. Then we found the
+    // average and standard deviation of the ratios of constants/bytesize. Then
+    // we added 1.34 standard deviations to the average to get a ratio that
+    // would fit 75% of the files (for a two-tailed distribution). This works
+    // because there was about a 0.77 correlation and the distribution was
+    // roughly normal.
+    //
+    // This ratio will need to change if we add more constants to the constant
+    // pool for another node type.
+    uint32_t constant_size = ((uint32_t) size) / 95;
+    pm_constant_pool_init(&parser->constant_pool, constant_size < 4 ? 4 : constant_size);
+
+    // Initialize the newline list. Similar to the constant pool, we're going to
+    // guess at the number of newlines that we'll need based on the size of the
+    // input.
+    size_t newline_size = size / 22;
+    pm_newline_list_init(&parser->newline_list, source, newline_size < 4 ? 4 : newline_size);
+
+    // If options were provided to this parse, establish them here.
+    if (options != NULL) {
+        // filepath option
+        parser->filepath = options->filepath;
+
+        // line option
+        parser->start_line = options->line;
+
+        // encoding option
+        size_t encoding_length = pm_string_length(&options->encoding);
+        if (encoding_length > 0) {
+            const uint8_t *encoding_source = pm_string_source(&options->encoding);
+            parser_lex_magic_comment_encoding_value(parser, encoding_source, encoding_source + encoding_length);
+        }
+
+        // encoding_locked option
+        parser->encoding_locked = options->encoding_locked;
+
+        // frozen_string_literal option
+        parser->frozen_string_literal = options->frozen_string_literal;
+
+        // command_line option
+        parser->command_line = options->command_line;
+
+        // version option
+        parser->version = options->version;
+
+        // partial_script
+        parser->partial_script = options->partial_script;
+
+        // scopes option
+        parser->parsing_eval = options->scopes_count > 0;
+        if (parser->parsing_eval) parser->warn_mismatched_indentation = false;
+
+        for (size_t scope_index = 0; scope_index < options->scopes_count; scope_index++) {
+            const pm_options_scope_t *scope = pm_options_scope_get(options, scope_index);
+            pm_parser_scope_push(parser, scope_index == 0);
+
+            // Scopes given from the outside are not allowed to have numbered
+            // parameters.
+            parser->current_scope->parameters = ((pm_scope_parameters_t) scope->forwarding) | PM_SCOPE_PARAMETERS_IMPLICIT_DISALLOWED;
+
+            for (size_t local_index = 0; local_index < scope->locals_count; local_index++) {
+                const pm_string_t *local = pm_options_scope_local_get(scope, local_index);
+
+                const uint8_t *source = pm_string_source(local);
+                size_t length = pm_string_length(local);
+
+                void *allocated = xmalloc(length);
+                if (allocated == NULL) continue;
+
+                memcpy(allocated, source, length);
+                pm_parser_local_add_owned(parser, (uint8_t *) allocated, length);
+            }
+        }
+    }
+
+    pm_accepts_block_stack_push(parser, true);
+
+    // Skip past the UTF-8 BOM if it exists.
+    if (size >= 3 && source[0] == 0xef && source[1] == 0xbb && source[2] == 0xbf) {
+        parser->current.end += 3;
+        parser->encoding_comment_start += 3;
+
+        if (parser->encoding != PM_ENCODING_UTF_8_ENTRY) {
+            parser->encoding = PM_ENCODING_UTF_8_ENTRY;
+            if (parser->encoding_changed_callback != NULL) parser->encoding_changed_callback(parser);
+        }
+    }
+
+    // If the -x command line flag is set, or the first shebang of the file does
+    // not include "ruby", then we'll search for a shebang that does include
+    // "ruby" and start parsing from there.
+    bool search_shebang = PM_PARSER_COMMAND_LINE_OPTION_X(parser);
+
+    // If the first two bytes of the source are a shebang, then we will do a bit
+    // of extra processing.
+    //
+    // First, we'll indicate that the encoding comment is at the end of the
+    // shebang. This means that when a shebang is present the encoding comment
+    // can begin on the second line.
+    //
+    // Second, we will check if the shebang includes "ruby". If it does, then we
+    // we will start parsing from there. We will also potentially warning the
+    // user if there is a carriage return at the end of the shebang. We will
+    // also potentially call the shebang callback if this is the main script to
+    // allow the caller to parse the shebang and find any command-line options.
+    // If the shebang does not include "ruby" and this is the main script being
+    // parsed, then we will start searching the file for a shebang that does
+    // contain "ruby" as if -x were passed on the command line.
+    const uint8_t *newline = next_newline(parser->start, parser->end - parser->start);
+    size_t length = (size_t) ((newline != NULL ? newline : parser->end) - parser->start);
+
+    if (length > 2 && parser->current.end[0] == '#' && parser->current.end[1] == '!') {
+        const char *engine;
+
+        if ((engine = pm_strnstr((const char *) parser->start, "ruby", length)) != NULL) {
+            if (newline != NULL) {
+                parser->encoding_comment_start = newline + 1;
+
+                if (options == NULL || options->main_script) {
+                    pm_parser_warn_shebang_carriage_return(parser, parser->start, length + 1);
+                }
+            }
+
+            if (options != NULL && options->main_script && options->shebang_callback != NULL) {
+                pm_parser_init_shebang(parser, options, engine, length - ((size_t) (engine - (const char *) parser->start)));
+            }
+
+            search_shebang = false;
+        } else if (options != NULL && options->main_script && !parser->parsing_eval) {
+            search_shebang = true;
+        }
+    }
+
+    // Here we're going to find the first shebang that includes "ruby" and start
+    // parsing from there.
+    if (search_shebang) {
+        // If a shebang that includes "ruby" is not found, then we're going to a
+        // a load error to the list of errors on the parser.
+        bool found_shebang = false;
+
+        // This is going to point to the start of each line as we check it.
+        // We'll maintain a moving window looking at each line at they come.
+        const uint8_t *cursor = parser->start;
+
+        // The newline pointer points to the end of the current line that we're
+        // considering. If it is NULL, then we're at the end of the file.
+        const uint8_t *newline = next_newline(cursor, parser->end - cursor);
+
+        while (newline != NULL) {
+            pm_newline_list_append(&parser->newline_list, newline);
+
+            cursor = newline + 1;
+            newline = next_newline(cursor, parser->end - cursor);
+
+            size_t length = (size_t) ((newline != NULL ? newline : parser->end) - cursor);
+            if (length > 2 && cursor[0] == '#' && cursor[1] == '!') {
+                const char *engine;
+                if ((engine = pm_strnstr((const char *) cursor, "ruby", length)) != NULL) {
+                    found_shebang = true;
+
+                    if (newline != NULL) {
+                        pm_parser_warn_shebang_carriage_return(parser, cursor, length + 1);
+                        parser->encoding_comment_start = newline + 1;
+                    }
+
+                    if (options != NULL && options->shebang_callback != NULL) {
+                        pm_parser_init_shebang(parser, options, engine, length - ((size_t) (engine - (const char *) cursor)));
+                    }
+
+                    break;
+                }
+            }
+        }
+
+        if (found_shebang) {
+            parser->previous = (pm_token_t) { .type = PM_TOKEN_EOF, .start = cursor, .end = cursor };
+            parser->current = (pm_token_t) { .type = PM_TOKEN_EOF, .start = cursor, .end = cursor };
+        } else {
+            pm_parser_err(parser, parser->start, parser->start, PM_ERR_SCRIPT_NOT_FOUND);
+            pm_newline_list_clear(&parser->newline_list);
+        }
+    }
+
+    // The encoding comment can start after any amount of inline whitespace, so
+    // here we'll advance it to the first non-inline-whitespace character so
+    // that it is ready for future comparisons.
+    parser->encoding_comment_start += pm_strspn_inline_whitespace(parser->encoding_comment_start, parser->end - parser->encoding_comment_start);
+}
+
+/**
+ * Register a callback that will be called whenever prism changes the encoding
+ * it is using to parse based on the magic comment.
+ */
+PRISM_EXPORTED_FUNCTION void
+pm_parser_register_encoding_changed_callback(pm_parser_t *parser, pm_encoding_changed_callback_t callback) {
+    parser->encoding_changed_callback = callback;
+}
+
+/**
+ * Free all of the memory associated with the comment list.
+ */
+static inline void
+pm_comment_list_free(pm_list_t *list) {
+    pm_list_node_t *node, *next;
+
+    for (node = list->head; node != NULL; node = next) {
+        next = node->next;
+
+        pm_comment_t *comment = (pm_comment_t *) node;
+        xfree(comment);
+    }
+}
+
+/**
+ * Free all of the memory associated with the magic comment list.
+ */
+static inline void
+pm_magic_comment_list_free(pm_list_t *list) {
+    pm_list_node_t *node, *next;
+
+    for (node = list->head; node != NULL; node = next) {
+        next = node->next;
+
+        pm_magic_comment_t *magic_comment = (pm_magic_comment_t *) node;
+        xfree(magic_comment);
+    }
+}
+
+/**
+ * Free any memory associated with the given parser.
+ */
+PRISM_EXPORTED_FUNCTION void
+pm_parser_free(pm_parser_t *parser) {
+    pm_string_free(&parser->filepath);
+    pm_diagnostic_list_free(&parser->error_list);
+    pm_diagnostic_list_free(&parser->warning_list);
+    pm_comment_list_free(&parser->comment_list);
+    pm_magic_comment_list_free(&parser->magic_comment_list);
+    pm_constant_pool_free(&parser->constant_pool);
+    pm_newline_list_free(&parser->newline_list);
+
+    while (parser->current_scope != NULL) {
+        // Normally, popping the scope doesn't free the locals since it is
+        // assumed that ownership has transferred to the AST. However if we have
+        // scopes while we're freeing the parser, it's likely they came from
+        // eval scopes and we need to free them explicitly here.
+        pm_parser_scope_pop(parser);
+    }
+
+    while (parser->lex_modes.index >= PM_LEX_STACK_SIZE) {
+        lex_mode_pop(parser);
+    }
+}
+
+/**
+ * Parse the Ruby source associated with the given parser and return the tree.
+ */
+PRISM_EXPORTED_FUNCTION pm_node_t *
+pm_parse(pm_parser_t *parser) {
+    return parse_program(parser);
+}
+
+/**
+ * Read into the stream until the gets callback returns false. If the last read
+ * line from the stream matches an __END__ marker, then halt and return false,
+ * otherwise return true.
+ */
+static bool
+pm_parse_stream_read(pm_buffer_t *buffer, void *stream, pm_parse_stream_fgets_t *stream_fgets) {
+#define LINE_SIZE 4096
+    char line[LINE_SIZE];
+
+    while (memset(line, '\n', LINE_SIZE), stream_fgets(line, LINE_SIZE, stream) != NULL) {
+        size_t length = LINE_SIZE;
+        while (length > 0 && line[length - 1] == '\n') length--;
+
+        if (length == LINE_SIZE) {
+            // If we read a line that is the maximum size and it doesn't end
+            // with a newline, then we'll just append it to the buffer and
+            // continue reading.
+            length--;
+            pm_buffer_append_string(buffer, line, length);
+            continue;
+        }
+
+        // Append the line to the buffer.
+        length--;
+        pm_buffer_append_string(buffer, line, length);
+
+        // Check if the line matches the __END__ marker. If it does, then stop
+        // reading and return false. In most circumstances, this means we should
+        // stop reading from the stream so that the DATA constant can pick it
+        // up.
+        switch (length) {
+            case 7:
+                if (strncmp(line, "__END__", 7) == 0) return false;
+                break;
+            case 8:
+                if (strncmp(line, "__END__\n", 8) == 0) return false;
+                break;
+            case 9:
+                if (strncmp(line, "__END__\r\n", 9) == 0) return false;
+                break;
+        }
+    }
+
+    return true;
+#undef LINE_SIZE
+}
+
+/**
+ * Determine if there was an unterminated heredoc at the end of the input, which
+ * would mean the stream isn't finished and we should keep reading.
+ *
+ * For the other lex modes we can check if the lex mode has been closed, but for
+ * heredocs when we hit EOF we close the lex mode and then go back to parse the
+ * rest of the line after the heredoc declaration so that we get more of the
+ * syntax tree.
+ */
+static bool
+pm_parse_stream_unterminated_heredoc_p(pm_parser_t *parser) {
+    pm_diagnostic_t *diagnostic = (pm_diagnostic_t *) parser->error_list.head;
+
+    for (; diagnostic != NULL; diagnostic = (pm_diagnostic_t *) diagnostic->node.next) {
+        if (diagnostic->diag_id == PM_ERR_HEREDOC_TERM) {
+            return true;
+        }
+    }
+
+    return false;
+}
+
+/**
+ * Parse a stream of Ruby source and return the tree.
+ *
+ * Prism is designed around having the entire source in memory at once, but you
+ * can stream stdin in to Ruby so we need to support a streaming API.
+ */
+PRISM_EXPORTED_FUNCTION pm_node_t *
+pm_parse_stream(pm_parser_t *parser, pm_buffer_t *buffer, void *stream, pm_parse_stream_fgets_t *stream_fgets, const pm_options_t *options) {
+    pm_buffer_init(buffer);
+
+    bool eof = pm_parse_stream_read(buffer, stream, stream_fgets);
+    pm_parser_init(parser, (const uint8_t *) pm_buffer_value(buffer), pm_buffer_length(buffer), options);
+    pm_node_t *node = pm_parse(parser);
+
+    while (!eof && parser->error_list.size > 0 && (parser->lex_modes.index > 0 || pm_parse_stream_unterminated_heredoc_p(parser))) {
+        pm_node_destroy(parser, node);
+        eof = pm_parse_stream_read(buffer, stream, stream_fgets);
+
+        pm_parser_free(parser);
+        pm_parser_init(parser, (const uint8_t *) pm_buffer_value(buffer), pm_buffer_length(buffer), options);
+        node = pm_parse(parser);
+    }
+
+    return node;
+}
+
+/**
+ * Parse the source and return true if it parses without errors or warnings.
+ */
+PRISM_EXPORTED_FUNCTION bool
+pm_parse_success_p(const uint8_t *source, size_t size, const char *data) {
+    pm_options_t options = { 0 };
+    pm_options_read(&options, data);
+
+    pm_parser_t parser;
+    pm_parser_init(&parser, source, size, &options);
+
+    pm_node_t *node = pm_parse(&parser);
+    pm_node_destroy(&parser, node);
+
+    bool result = parser.error_list.size == 0;
+    pm_parser_free(&parser);
+    pm_options_free(&options);
+
+    return result;
+}
+
+#undef PM_CASE_KEYWORD
+#undef PM_CASE_OPERATOR
+#undef PM_CASE_WRITABLE
+#undef PM_STRING_EMPTY
+#undef PM_LOCATION_NODE_BASE_VALUE
+#undef PM_LOCATION_NODE_VALUE
+#undef PM_LOCATION_NULL_VALUE
+#undef PM_LOCATION_TOKEN_VALUE
+
+// We optionally support serializing to a binary string. For systems that don't
+// want or need this functionality, it can be turned off with the
+// PRISM_EXCLUDE_SERIALIZATION define.
+#ifndef PRISM_EXCLUDE_SERIALIZATION
+
+static inline void
+pm_serialize_header(pm_buffer_t *buffer) {
+    pm_buffer_append_string(buffer, "PRISM", 5);
+    pm_buffer_append_byte(buffer, PRISM_VERSION_MAJOR);
+    pm_buffer_append_byte(buffer, PRISM_VERSION_MINOR);
+    pm_buffer_append_byte(buffer, PRISM_VERSION_PATCH);
+    pm_buffer_append_byte(buffer, PRISM_SERIALIZE_ONLY_SEMANTICS_FIELDS ? 1 : 0);
+}
+
+/**
+ * Serialize the AST represented by the given node to the given buffer.
+ */
+PRISM_EXPORTED_FUNCTION void
+pm_serialize(pm_parser_t *parser, pm_node_t *node, pm_buffer_t *buffer) {
+    pm_serialize_header(buffer);
+    pm_serialize_content(parser, node, buffer);
+    pm_buffer_append_byte(buffer, '\0');
+}
+
+/**
+ * Parse and serialize the AST represented by the given source to the given
+ * buffer.
+ */
+PRISM_EXPORTED_FUNCTION void
+pm_serialize_parse(pm_buffer_t *buffer, const uint8_t *source, size_t size, const char *data) {
+    pm_options_t options = { 0 };
+    pm_options_read(&options, data);
+
+    pm_parser_t parser;
+    pm_parser_init(&parser, source, size, &options);
+
+    pm_node_t *node = pm_parse(&parser);
+
+    pm_serialize_header(buffer);
+    pm_serialize_content(&parser, node, buffer);
+    pm_buffer_append_byte(buffer, '\0');
+
+    pm_node_destroy(&parser, node);
+    pm_parser_free(&parser);
+    pm_options_free(&options);
+}
+
+/**
+ * Parse and serialize the AST represented by the source that is read out of the
+ * given stream into to the given buffer.
+ */
+PRISM_EXPORTED_FUNCTION void
+pm_serialize_parse_stream(pm_buffer_t *buffer, void *stream, pm_parse_stream_fgets_t *stream_fgets, const char *data) {
+    pm_parser_t parser;
+    pm_options_t options = { 0 };
+    pm_options_read(&options, data);
+
+    pm_buffer_t parser_buffer;
+    pm_node_t *node = pm_parse_stream(&parser, &parser_buffer, stream, stream_fgets, &options);
+    pm_serialize_header(buffer);
+    pm_serialize_content(&parser, node, buffer);
+    pm_buffer_append_byte(buffer, '\0');
+
+    pm_node_destroy(&parser, node);
+    pm_buffer_free(&parser_buffer);
+    pm_parser_free(&parser);
+    pm_options_free(&options);
+}
+
+/**
+ * Parse and serialize the comments in the given source to the given buffer.
+ */
+PRISM_EXPORTED_FUNCTION void
+pm_serialize_parse_comments(pm_buffer_t *buffer, const uint8_t *source, size_t size, const char *data) {
+    pm_options_t options = { 0 };
+    pm_options_read(&options, data);
+
+    pm_parser_t parser;
+    pm_parser_init(&parser, source, size, &options);
+
+    pm_node_t *node = pm_parse(&parser);
+    pm_serialize_header(buffer);
+    pm_serialize_encoding(parser.encoding, buffer);
+    pm_buffer_append_varsint(buffer, parser.start_line);
+    pm_serialize_comment_list(&parser, &parser.comment_list, buffer);
+
+    pm_node_destroy(&parser, node);
+    pm_parser_free(&parser);
+    pm_options_free(&options);
+}
+
+#endif
+
+/******************************************************************************/
+/* Slice queries for the Ruby API                                             */
+/******************************************************************************/
+
+/** The category of slice returned from pm_slice_type. */
+typedef enum {
+    /** Returned when the given encoding name is invalid. */
+    PM_SLICE_TYPE_ERROR = -1,
+
+    /** Returned when no other types apply to the slice. */
+    PM_SLICE_TYPE_NONE,
+
+    /** Returned when the slice is a valid local variable name. */
+    PM_SLICE_TYPE_LOCAL,
+
+    /** Returned when the slice is a valid constant name. */
+    PM_SLICE_TYPE_CONSTANT,
+
+    /** Returned when the slice is a valid method name. */
+    PM_SLICE_TYPE_METHOD_NAME
+} pm_slice_type_t;
+
+/**
+ * Check that the slice is a valid local variable name or constant.
+ */
+pm_slice_type_t
+pm_slice_type(const uint8_t *source, size_t length, const char *encoding_name) {
+    // first, get the right encoding object
+    const pm_encoding_t *encoding = pm_encoding_find((const uint8_t *) encoding_name, (const uint8_t *) (encoding_name + strlen(encoding_name)));
+    if (encoding == NULL) return PM_SLICE_TYPE_ERROR;
+
+    // check that there is at least one character
+    if (length == 0) return PM_SLICE_TYPE_NONE;
+
+    size_t width;
+    if ((width = encoding->alpha_char(source, (ptrdiff_t) length)) != 0) {
+        // valid because alphabetical
+    } else if (*source == '_') {
+        // valid because underscore
+        width = 1;
+    } else if ((*source >= 0x80) && ((width = encoding->char_width(source, (ptrdiff_t) length)) > 0)) {
+        // valid because multibyte
+    } else {
+        // invalid because no match
+        return PM_SLICE_TYPE_NONE;
+    }
+
+    // determine the type of the slice based on the first character
+    const uint8_t *end = source + length;
+    pm_slice_type_t result = encoding->isupper_char(source, end - source) ? PM_SLICE_TYPE_CONSTANT : PM_SLICE_TYPE_LOCAL;
+
+    // next, iterate through all of the bytes of the string to ensure that they
+    // are all valid identifier characters
+    source += width;
+
+    while (source < end) {
+        if ((width = encoding->alnum_char(source, end - source)) != 0) {
+            // valid because alphanumeric
+            source += width;
+        } else if (*source == '_') {
+            // valid because underscore
+            source++;
+        } else if ((*source >= 0x80) && ((width = encoding->char_width(source, end - source)) > 0)) {
+            // valid because multibyte
+            source += width;
+        } else {
+            // invalid because no match
+            break;
+        }
+    }
+
+    // accept a ! or ? at the end of the slice as a method name
+    if (*source == '!' || *source == '?' || *source == '=') {
+        source++;
+        result = PM_SLICE_TYPE_METHOD_NAME;
+    }
+
+    // valid if we are at the end of the slice
+    return source == end ? result : PM_SLICE_TYPE_NONE;
+}
+
+/**
+ * Check that the slice is a valid local variable name.
+ */
+PRISM_EXPORTED_FUNCTION pm_string_query_t
+pm_string_query_local(const uint8_t *source, size_t length, const char *encoding_name) {
+    switch (pm_slice_type(source, length, encoding_name)) {
+        case PM_SLICE_TYPE_ERROR:
+            return PM_STRING_QUERY_ERROR;
+        case PM_SLICE_TYPE_NONE:
+        case PM_SLICE_TYPE_CONSTANT:
+        case PM_SLICE_TYPE_METHOD_NAME:
+            return PM_STRING_QUERY_FALSE;
+        case PM_SLICE_TYPE_LOCAL:
+            return PM_STRING_QUERY_TRUE;
+    }
+
+    assert(false && "unreachable");
+    return PM_STRING_QUERY_FALSE;
+}
+
+/**
+ * Check that the slice is a valid constant name.
+ */
+PRISM_EXPORTED_FUNCTION pm_string_query_t
+pm_string_query_constant(const uint8_t *source, size_t length, const char *encoding_name) {
+    switch (pm_slice_type(source, length, encoding_name)) {
+        case PM_SLICE_TYPE_ERROR:
+            return PM_STRING_QUERY_ERROR;
+        case PM_SLICE_TYPE_NONE:
+        case PM_SLICE_TYPE_LOCAL:
+        case PM_SLICE_TYPE_METHOD_NAME:
+            return PM_STRING_QUERY_FALSE;
+        case PM_SLICE_TYPE_CONSTANT:
+            return PM_STRING_QUERY_TRUE;
+    }
+
+    assert(false && "unreachable");
+    return PM_STRING_QUERY_FALSE;
+}
+
+/**
+ * Check that the slice is a valid method name.
+ */
+PRISM_EXPORTED_FUNCTION pm_string_query_t
+pm_string_query_method_name(const uint8_t *source, size_t length, const char *encoding_name) {
+#define B(p) ((p) ? PM_STRING_QUERY_TRUE : PM_STRING_QUERY_FALSE)
+#define C1(c) (*source == c)
+#define C2(s) (memcmp(source, s, 2) == 0)
+#define C3(s) (memcmp(source, s, 3) == 0)
+
+    switch (pm_slice_type(source, length, encoding_name)) {
+        case PM_SLICE_TYPE_ERROR:
+            return PM_STRING_QUERY_ERROR;
+        case PM_SLICE_TYPE_NONE:
+            break;
+        case PM_SLICE_TYPE_LOCAL:
+            // numbered parameters are not valid method names
+            return B((length != 2) || (source[0] != '_') || (source[1] == '0') || !pm_char_is_decimal_digit(source[1]));
+        case PM_SLICE_TYPE_CONSTANT:
+            // all constants are valid method names
+        case PM_SLICE_TYPE_METHOD_NAME:
+            // all method names are valid method names
+            return PM_STRING_QUERY_TRUE;
+    }
+
+    switch (length) {
+        case 1:
+            return B(C1('&') || C1('`') || C1('!') || C1('^') || C1('>') || C1('<') || C1('-') || C1('%') || C1('|') || C1('+') || C1('/') || C1('*') || C1('~'));
+        case 2:
+            return B(C2("!=") || C2("!~") || C2("[]") || C2("==") || C2("=~") || C2(">=") || C2(">>") || C2("<=") || C2("<<") || C2("**"));
+        case 3:
+            return B(C3("===") || C3("<=>") || C3("[]="));
+        default:
+            return PM_STRING_QUERY_FALSE;
+    }
+
+#undef B
+#undef C1
+#undef C2
+#undef C3
+}
diff --git a/prism/prism.h b/prism/prism.h
new file mode 100644
index 00000000000000..317568aa0cbd51
--- /dev/null
+++ b/prism/prism.h
@@ -0,0 +1,383 @@
+/**
+ * @file prism.h
+ *
+ * The main header file for the prism parser.
+ */
+#ifndef PRISM_H
+#define PRISM_H
+
+#include "prism/defines.h"
+#include "prism/util/pm_buffer.h"
+#include "prism/util/pm_char.h"
+#include "prism/util/pm_integer.h"
+#include "prism/util/pm_memchr.h"
+#include "prism/util/pm_strncasecmp.h"
+#include "prism/util/pm_strpbrk.h"
+#include "prism/ast.h"
+#include "prism/diagnostic.h"
+#include "prism/node.h"
+#include "prism/options.h"
+#include "prism/pack.h"
+#include "prism/parser.h"
+#include "prism/prettyprint.h"
+#include "prism/regexp.h"
+#include "prism/static_literals.h"
+#include "prism/version.h"
+
+#include <assert.h>
+#include <errno.h>
+#include <locale.h>
+#include <math.h>
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#ifndef _WIN32
+#include <strings.h>
+#endif
+
+/**
+ * The prism version and the serialization format.
+ *
+ * @returns The prism version as a constant string.
+ */
+PRISM_EXPORTED_FUNCTION const char * pm_version(void);
+
+/**
+ * Initialize a parser with the given start and end pointers.
+ *
+ * @param parser The parser to initialize.
+ * @param source The source to parse.
+ * @param size The size of the source.
+ * @param options The optional options to use when parsing.
+ */
+PRISM_EXPORTED_FUNCTION void pm_parser_init(pm_parser_t *parser, const uint8_t *source, size_t size, const pm_options_t *options);
+
+/**
+ * Register a callback that will be called whenever prism changes the encoding
+ * it is using to parse based on the magic comment.
+ *
+ * @param parser The parser to register the callback with.
+ * @param callback The callback to register.
+ */
+PRISM_EXPORTED_FUNCTION void pm_parser_register_encoding_changed_callback(pm_parser_t *parser, pm_encoding_changed_callback_t callback);
+
+/**
+ * Free any memory associated with the given parser.
+ *
+ * @param parser The parser to free.
+ */
+PRISM_EXPORTED_FUNCTION void pm_parser_free(pm_parser_t *parser);
+
+/**
+ * Initiate the parser with the given parser.
+ *
+ * @param parser The parser to use.
+ * @return The AST representing the source.
+ */
+PRISM_EXPORTED_FUNCTION pm_node_t * pm_parse(pm_parser_t *parser);
+
+/**
+ * This function is used in pm_parse_stream to retrieve a line of input from a
+ * stream. It closely mirrors that of fgets so that fgets can be used as the
+ * default implementation.
+ */
+typedef char * (pm_parse_stream_fgets_t)(char *string, int size, void *stream);
+
+/**
+ * Parse a stream of Ruby source and return the tree.
+ *
+ * @param parser The parser to use.
+ * @param buffer The buffer to use.
+ * @param stream The stream to parse.
+ * @param stream_fgets The function to use to read from the stream.
+ * @param options The optional options to use when parsing.
+ * @return The AST representing the source.
+ */
+PRISM_EXPORTED_FUNCTION pm_node_t * pm_parse_stream(pm_parser_t *parser, pm_buffer_t *buffer, void *stream, pm_parse_stream_fgets_t *stream_fgets, const pm_options_t *options);
+
+// We optionally support serializing to a binary string. For systems that don't
+// want or need this functionality, it can be turned off with the
+// PRISM_EXCLUDE_SERIALIZATION define.
+#ifndef PRISM_EXCLUDE_SERIALIZATION
+
+/**
+ * Parse and serialize the AST represented by the source that is read out of the
+ * given stream into to the given buffer.
+ *
+ * @param buffer The buffer to serialize to.
+ * @param stream The stream to parse.
+ * @param stream_fgets The function to use to read from the stream.
+ * @param data The optional data to pass to the parser.
+ */
+PRISM_EXPORTED_FUNCTION void pm_serialize_parse_stream(pm_buffer_t *buffer, void *stream, pm_parse_stream_fgets_t *stream_fgets, const char *data);
+
+/**
+ * Serialize the given list of comments to the given buffer.
+ *
+ * @param parser The parser to serialize.
+ * @param list The list of comments to serialize.
+ * @param buffer The buffer to serialize to.
+ */
+void pm_serialize_comment_list(pm_parser_t *parser, pm_list_t *list, pm_buffer_t *buffer);
+
+/**
+ * Serialize the name of the encoding to the buffer.
+ *
+ * @param encoding The encoding to serialize.
+ * @param buffer The buffer to serialize to.
+ */
+void pm_serialize_encoding(const pm_encoding_t *encoding, pm_buffer_t *buffer);
+
+/**
+ * Serialize the encoding, metadata, nodes, and constant pool.
+ *
+ * @param parser The parser to serialize.
+ * @param node The node to serialize.
+ * @param buffer The buffer to serialize to.
+ */
+void pm_serialize_content(pm_parser_t *parser, pm_node_t *node, pm_buffer_t *buffer);
+
+/**
+ * Serialize the AST represented by the given node to the given buffer.
+ *
+ * @param parser The parser to serialize.
+ * @param node The node to serialize.
+ * @param buffer The buffer to serialize to.
+ */
+PRISM_EXPORTED_FUNCTION void pm_serialize(pm_parser_t *parser, pm_node_t *node, pm_buffer_t *buffer);
+
+/**
+ * Parse the given source to the AST and dump the AST to the given buffer.
+ *
+ * @param buffer The buffer to serialize to.
+ * @param source The source to parse.
+ * @param size The size of the source.
+ * @param data The optional data to pass to the parser.
+ */
+PRISM_EXPORTED_FUNCTION void pm_serialize_parse(pm_buffer_t *buffer, const uint8_t *source, size_t size, const char *data);
+
+/**
+ * Parse and serialize the comments in the given source to the given buffer.
+ *
+ * @param buffer The buffer to serialize to.
+ * @param source The source to parse.
+ * @param size The size of the source.
+ * @param data The optional data to pass to the parser.
+ */
+PRISM_EXPORTED_FUNCTION void pm_serialize_parse_comments(pm_buffer_t *buffer, const uint8_t *source, size_t size, const char *data);
+
+/**
+ * Lex the given source and serialize to the given buffer.
+ *
+ * @param source The source to lex.
+ * @param size The size of the source.
+ * @param buffer The buffer to serialize to.
+ * @param data The optional data to pass to the lexer.
+ */
+PRISM_EXPORTED_FUNCTION void pm_serialize_lex(pm_buffer_t *buffer, const uint8_t *source, size_t size, const char *data);
+
+/**
+ * Parse and serialize both the AST and the tokens represented by the given
+ * source to the given buffer.
+ *
+ * @param buffer The buffer to serialize to.
+ * @param source The source to parse.
+ * @param size The size of the source.
+ * @param data The optional data to pass to the parser.
+ */
+PRISM_EXPORTED_FUNCTION void pm_serialize_parse_lex(pm_buffer_t *buffer, const uint8_t *source, size_t size, const char *data);
+
+#endif
+
+/**
+ * Parse the source and return true if it parses without errors or warnings.
+ *
+ * @param source The source to parse.
+ * @param size The size of the source.
+ * @param data The optional data to pass to the parser.
+ * @return True if the source parses without errors or warnings.
+ */
+PRISM_EXPORTED_FUNCTION bool pm_parse_success_p(const uint8_t *source, size_t size, const char *data);
+
+/**
+ * Returns a string representation of the given token type.
+ *
+ * @param token_type The token type to convert to a string.
+ * @return A string representation of the given token type.
+ */
+PRISM_EXPORTED_FUNCTION const char * pm_token_type_name(pm_token_type_t token_type);
+
+/**
+ * Returns the human name of the given token type.
+ *
+ * @param token_type The token type to convert to a human name.
+ * @return The human name of the given token type.
+ */
+const char * pm_token_type_human(pm_token_type_t token_type);
+
+// We optionally support dumping to JSON. For systems that don't want or need
+// this functionality, it can be turned off with the PRISM_EXCLUDE_JSON define.
+#ifndef PRISM_EXCLUDE_JSON
+
+/**
+ * Dump JSON to the given buffer.
+ *
+ * @param buffer The buffer to serialize to.
+ * @param parser The parser that parsed the node.
+ * @param node The node to serialize.
+ */
+PRISM_EXPORTED_FUNCTION void pm_dump_json(pm_buffer_t *buffer, const pm_parser_t *parser, const pm_node_t *node);
+
+#endif
+
+/**
+ * Represents the results of a slice query.
+ */
+typedef enum {
+    /** Returned if the encoding given to a slice query was invalid. */
+    PM_STRING_QUERY_ERROR = -1,
+
+    /** Returned if the result of the slice query is false. */
+    PM_STRING_QUERY_FALSE,
+
+    /** Returned if the result of the slice query is true. */
+    PM_STRING_QUERY_TRUE
+} pm_string_query_t;
+
+/**
+ * Check that the slice is a valid local variable name.
+ *
+ * @param source The source to check.
+ * @param length The length of the source.
+ * @param encoding_name The name of the encoding of the source.
+ * @return PM_STRING_QUERY_TRUE if the query is true, PM_STRING_QUERY_FALSE if
+ *   the query is false, and PM_STRING_QUERY_ERROR if the encoding was invalid.
+ */
+PRISM_EXPORTED_FUNCTION pm_string_query_t pm_string_query_local(const uint8_t *source, size_t length, const char *encoding_name);
+
+/**
+ * Check that the slice is a valid constant name.
+ *
+ * @param source The source to check.
+ * @param length The length of the source.
+ * @param encoding_name The name of the encoding of the source.
+ * @return PM_STRING_QUERY_TRUE if the query is true, PM_STRING_QUERY_FALSE if
+ *   the query is false, and PM_STRING_QUERY_ERROR if the encoding was invalid.
+ */
+PRISM_EXPORTED_FUNCTION pm_string_query_t pm_string_query_constant(const uint8_t *source, size_t length, const char *encoding_name);
+
+/**
+ * Check that the slice is a valid method name.
+ *
+ * @param source The source to check.
+ * @param length The length of the source.
+ * @param encoding_name The name of the encoding of the source.
+ * @return PM_STRING_QUERY_TRUE if the query is true, PM_STRING_QUERY_FALSE if
+ *   the query is false, and PM_STRING_QUERY_ERROR if the encoding was invalid.
+ */
+PRISM_EXPORTED_FUNCTION pm_string_query_t pm_string_query_method_name(const uint8_t *source, size_t length, const char *encoding_name);
+
+/**
+ * @mainpage
+ *
+ * Prism is a parser for the Ruby programming language. It is designed to be
+ * portable, error tolerant, and maintainable. It is written in C99 and has no
+ * dependencies. It is currently being integrated into
+ * [CRuby](https://github.com/ruby/ruby),
+ * [JRuby](https://github.com/jruby/jruby),
+ * [TruffleRuby](https://github.com/oracle/truffleruby),
+ * [Sorbet](https://github.com/sorbet/sorbet), and
+ * [Syntax Tree](https://github.com/ruby-syntax-tree/syntax_tree).
+ *
+ * @section getting-started Getting started
+ *
+ * If you're vendoring this project and compiling it statically then as long as
+ * you have a C99 compiler you will be fine. If you're linking against it as
+ * shared library, then you should compile with `-fvisibility=hidden` and
+ * `-DPRISM_EXPORT_SYMBOLS` to tell prism to make only its public interface
+ * visible.
+ *
+ * @section parsing Parsing
+ *
+ * In order to parse Ruby code, the structures and functions that you're going
+ * to want to use and be aware of are:
+ *
+ * * `pm_parser_t` - the main parser structure
+ * * `pm_parser_init` - initialize a parser
+ * * `pm_parse` - parse and return the root node
+ * * `pm_node_destroy` - deallocate the root node returned by `pm_parse`
+ * * `pm_parser_free` - free the internal memory of the parser
+ *
+ * Putting all of this together would look something like:
+ *
+ * ```c
+ * void parse(const uint8_t *source, size_t length) {
+ *     pm_parser_t parser;
+ *     pm_parser_init(&parser, source, length, NULL);
+ *
+ *     pm_node_t *root = pm_parse(&parser);
+ *     printf("PARSED!\n");
+ *
+ *     pm_node_destroy(&parser, root);
+ *     pm_parser_free(&parser);
+ * }
+ * ```
+ *
+ * All of the nodes "inherit" from `pm_node_t` by embedding those structures as
+ * their first member. This means you can downcast and upcast any node in the
+ * tree to a `pm_node_t`.
+ *
+ * @section serializing Serializing
+ *
+ * Prism provides the ability to serialize the AST and its related metadata into
+ * a binary format. This format is designed to be portable to different
+ * languages and runtimes so that you only need to make one FFI call in order to
+ * parse Ruby code. The structures and functions that you're going to want to
+ * use and be aware of are:
+ *
+ * * `pm_buffer_t` - a small buffer object that will hold the serialized AST
+ * * `pm_buffer_free` - free the memory associated with the buffer
+ * * `pm_serialize` - serialize the AST into a buffer
+ * * `pm_serialize_parse` - parse and serialize the AST into a buffer
+ *
+ * Putting all of this together would look something like:
+ *
+ * ```c
+ * void serialize(const uint8_t *source, size_t length) {
+ *     pm_buffer_t buffer = { 0 };
+ *
+ *     pm_serialize_parse(&buffer, source, length, NULL);
+ *     printf("SERIALIZED!\n");
+ *
+ *     pm_buffer_free(&buffer);
+ * }
+ * ```
+ *
+ * @section inspecting Inspecting
+ *
+ * Prism provides the ability to inspect the AST by pretty-printing nodes. You
+ * can do this with the `pm_prettyprint` function, which you would use like:
+ *
+ * ```c
+ * void prettyprint(const uint8_t *source, size_t length) {
+ *     pm_parser_t parser;
+ *     pm_parser_init(&parser, source, length, NULL);
+ *
+ *     pm_node_t *root = pm_parse(&parser);
+ *     pm_buffer_t buffer = { 0 };
+ *
+ *     pm_prettyprint(&buffer, &parser, root);
+ *     printf("%*.s\n", (int) buffer.length, buffer.value);
+ *
+ *     pm_buffer_free(&buffer);
+ *     pm_node_destroy(&parser, root);
+ *     pm_parser_free(&parser);
+ * }
+ * ```
+ */
+
+#endif
diff --git a/prism/regexp.c b/prism/regexp.c
new file mode 100644
index 00000000000000..dcc7476244a459
--- /dev/null
+++ b/prism/regexp.c
@@ -0,0 +1,790 @@
+#include "prism/regexp.h"
+
+#define PM_REGEXP_PARSE_DEPTH_MAX 4096
+
+/**
+ * This is the parser that is going to handle parsing regular expressions.
+ */
+typedef struct {
+    /** The parser that is currently being used. */
+    pm_parser_t *parser;
+
+    /** A pointer to the start of the source that we are parsing. */
+    const uint8_t *start;
+
+    /** A pointer to the current position in the source. */
+    const uint8_t *cursor;
+
+    /** A pointer to the end of the source that we are parsing. */
+    const uint8_t *end;
+
+    /**
+     * Whether or not the regular expression currently being parsed is in
+     * extended mode, wherein whitespace is ignored and comments are allowed.
+     */
+    bool extended_mode;
+
+    /** Whether the encoding has changed from the default. */
+    bool encoding_changed;
+
+    /** The encoding of the source. */
+    const pm_encoding_t *encoding;
+
+    /** The callback to call when a named capture group is found. */
+    pm_regexp_name_callback_t name_callback;
+
+    /** The data to pass to the name callback. */
+    void *name_data;
+
+    /** The callback to call when a parse error is found. */
+    pm_regexp_error_callback_t error_callback;
+
+    /** The data to pass to the error callback. */
+    void *error_data;
+} pm_regexp_parser_t;
+
+/**
+ * Append an error to the parser.
+ */
+static inline void
+pm_regexp_parse_error(pm_regexp_parser_t *parser, const uint8_t *start, const uint8_t *end, const char *message) {
+    parser->error_callback(start, end, message, parser->error_data);
+}
+
+/**
+ * This appends a new string to the list of named captures. This function
+ * assumes the caller has already checked the validity of the name callback.
+ */
+static void
+pm_regexp_parser_named_capture(pm_regexp_parser_t *parser, const uint8_t *start, const uint8_t *end) {
+    pm_string_t string;
+    pm_string_shared_init(&string, start, end);
+    parser->name_callback(&string, parser->name_data);
+    pm_string_free(&string);
+}
+
+/**
+ * Returns true if the next character is the end of the source.
+ */
+static inline bool
+pm_regexp_char_is_eof(pm_regexp_parser_t *parser) {
+    return parser->cursor >= parser->end;
+}
+
+/**
+ * Optionally accept a char and consume it if it exists.
+ */
+static inline bool
+pm_regexp_char_accept(pm_regexp_parser_t *parser, uint8_t value) {
+    if (!pm_regexp_char_is_eof(parser) && *parser->cursor == value) {
+        parser->cursor++;
+        return true;
+    }
+    return false;
+}
+
+/**
+ * Expect a character to be present and consume it.
+ */
+static inline bool
+pm_regexp_char_expect(pm_regexp_parser_t *parser, uint8_t value) {
+    if (!pm_regexp_char_is_eof(parser) && *parser->cursor == value) {
+        parser->cursor++;
+        return true;
+    }
+    return false;
+}
+
+/**
+ * This advances the current token to the next instance of the given character.
+ */
+static bool
+pm_regexp_char_find(pm_regexp_parser_t *parser, uint8_t value) {
+    if (pm_regexp_char_is_eof(parser)) {
+        return false;
+    }
+
+    const uint8_t *end = (const uint8_t *) pm_memchr(parser->cursor, value, (size_t) (parser->end - parser->cursor), parser->encoding_changed, parser->encoding);
+    if (end == NULL) {
+        return false;
+    }
+
+    parser->cursor = end + 1;
+    return true;
+}
+
+/**
+ * Range quantifiers are a special class of quantifiers that look like
+ *
+ * * {digit}
+ * * {digit,}
+ * * {digit,digit}
+ * * {,digit}
+ *
+ * Unfortunately, if there are any spaces in between, then this just becomes a
+ * regular character match expression and we have to backtrack. So when this
+ * function first starts running, we'll create a "save" point and then attempt
+ * to parse the quantifier. If it fails, we'll restore the save point and
+ * return.
+ *
+ * The properly track everything, we're going to build a little state machine.
+ * It looks something like the following:
+ *
+ *                  +-------+                 +---------+ ------------+
+ * ---- lbrace ---> | start | ---- digit ---> | minimum |             |
+ *                  +-------+                 +---------+ <--- digit -+
+ *                      |                       |    |
+ *   +-------+          |                       |  rbrace
+ *   | comma | <----- comma  +---- comma -------+    |
+ *   +-------+               V                       V
+ *      |             +---------+               +---------+
+ *      +-- digit --> | maximum | -- rbrace --> || final ||
+ *                    +---------+               +---------+
+ *                    |         ^
+ *                    +- digit -+
+ *
+ * Note that by the time we've hit this function, the lbrace has already been
+ * consumed so we're in the start state.
+ */
+static bool
+pm_regexp_parse_range_quantifier(pm_regexp_parser_t *parser) {
+    const uint8_t *savepoint = parser->cursor;
+
+    enum {
+        PM_REGEXP_RANGE_QUANTIFIER_STATE_START,
+        PM_REGEXP_RANGE_QUANTIFIER_STATE_MINIMUM,
+        PM_REGEXP_RANGE_QUANTIFIER_STATE_MAXIMUM,
+        PM_REGEXP_RANGE_QUANTIFIER_STATE_COMMA
+    } state = PM_REGEXP_RANGE_QUANTIFIER_STATE_START;
+
+    while (1) {
+        if (parser->cursor >= parser->end) {
+            parser->cursor = savepoint;
+            return true;
+        }
+
+        switch (state) {
+            case PM_REGEXP_RANGE_QUANTIFIER_STATE_START:
+                switch (*parser->cursor) {
+                    case '0': case '1': case '2': case '3': case '4': case '5': case '6': case '7': case '8': case '9':
+                        parser->cursor++;
+                        state = PM_REGEXP_RANGE_QUANTIFIER_STATE_MINIMUM;
+                        break;
+                    case ',':
+                        parser->cursor++;
+                        state = PM_REGEXP_RANGE_QUANTIFIER_STATE_COMMA;
+                        break;
+                    default:
+                        parser->cursor = savepoint;
+                        return true;
+                }
+                break;
+            case PM_REGEXP_RANGE_QUANTIFIER_STATE_MINIMUM:
+                switch (*parser->cursor) {
+                    case '0': case '1': case '2': case '3': case '4': case '5': case '6': case '7': case '8': case '9':
+                        parser->cursor++;
+                        break;
+                    case ',':
+                        parser->cursor++;
+                        state = PM_REGEXP_RANGE_QUANTIFIER_STATE_MAXIMUM;
+                        break;
+                    case '}':
+                        parser->cursor++;
+                        return true;
+                    default:
+                        parser->cursor = savepoint;
+                        return true;
+                }
+                break;
+            case PM_REGEXP_RANGE_QUANTIFIER_STATE_COMMA:
+                switch (*parser->cursor) {
+                    case '0': case '1': case '2': case '3': case '4': case '5': case '6': case '7': case '8': case '9':
+                        parser->cursor++;
+                        state = PM_REGEXP_RANGE_QUANTIFIER_STATE_MAXIMUM;
+                        break;
+                    default:
+                        parser->cursor = savepoint;
+                        return true;
+                }
+                break;
+            case PM_REGEXP_RANGE_QUANTIFIER_STATE_MAXIMUM:
+                switch (*parser->cursor) {
+                    case '0': case '1': case '2': case '3': case '4': case '5': case '6': case '7': case '8': case '9':
+                        parser->cursor++;
+                        break;
+                    case '}':
+                        parser->cursor++;
+                        return true;
+                    default:
+                        parser->cursor = savepoint;
+                        return true;
+                }
+                break;
+        }
+    }
+
+    return true;
+}
+
+/**
+ * quantifier : star-quantifier
+ *            | plus-quantifier
+ *            | optional-quantifier
+ *            | range-quantifier
+ *            | <empty>
+ *            ;
+ */
+static bool
+pm_regexp_parse_quantifier(pm_regexp_parser_t *parser) {
+    while (!pm_regexp_char_is_eof(parser)) {
+        switch (*parser->cursor) {
+            case '*':
+            case '+':
+            case '?':
+                parser->cursor++;
+                break;
+            case '{':
+                parser->cursor++;
+                if (!pm_regexp_parse_range_quantifier(parser)) return false;
+                break;
+            default:
+                // In this case there is no quantifier.
+                return true;
+        }
+    }
+
+    return true;
+}
+
+/**
+ * match-posix-class : '[' '[' ':' '^'? CHAR+ ':' ']' ']'
+ *                   ;
+ */
+static bool
+pm_regexp_parse_posix_class(pm_regexp_parser_t *parser) {
+    if (!pm_regexp_char_expect(parser, ':')) {
+        return false;
+    }
+
+    pm_regexp_char_accept(parser, '^');
+
+    return (
+        pm_regexp_char_find(parser, ':') &&
+        pm_regexp_char_expect(parser, ']') &&
+        pm_regexp_char_expect(parser, ']')
+    );
+}
+
+// Forward declaration because character sets can be nested.
+static bool
+pm_regexp_parse_lbracket(pm_regexp_parser_t *parser, uint16_t depth);
+
+/**
+ * match-char-set : '[' '^'? (match-range | match-char)* ']'
+ *                ;
+ */
+static bool
+pm_regexp_parse_character_set(pm_regexp_parser_t *parser, uint16_t depth) {
+    pm_regexp_char_accept(parser, '^');
+
+    while (!pm_regexp_char_is_eof(parser) && *parser->cursor != ']') {
+        switch (*parser->cursor++) {
+            case '[':
+                pm_regexp_parse_lbracket(parser, (uint16_t) (depth + 1));
+                break;
+            case '\\':
+                if (!pm_regexp_char_is_eof(parser)) {
+                    parser->cursor++;
+                }
+                break;
+            default:
+                // do nothing, we've already advanced the cursor
+                break;
+        }
+    }
+
+    return pm_regexp_char_expect(parser, ']');
+}
+
+/**
+ * A left bracket can either mean a POSIX class or a character set.
+ */
+static bool
+pm_regexp_parse_lbracket(pm_regexp_parser_t *parser, uint16_t depth) {
+    if (depth >= PM_REGEXP_PARSE_DEPTH_MAX) {
+        pm_regexp_parse_error(parser, parser->start, parser->end, "parse depth limit over");
+        return false;
+    }
+
+    if ((parser->cursor < parser->end) && parser->cursor[0] == ']') {
+        parser->cursor++;
+        pm_regexp_parse_error(parser, parser->cursor - 1, parser->cursor, "empty char-class");
+        return true;
+    }
+
+    const uint8_t *reset = parser->cursor;
+
+    if ((parser->cursor + 2 < parser->end) && parser->cursor[0] == '[' && parser->cursor[1] == ':') {
+        parser->cursor++;
+        if (pm_regexp_parse_posix_class(parser)) return true;
+
+        parser->cursor = reset;
+    }
+
+    return pm_regexp_parse_character_set(parser, depth);
+}
+
+// Forward declaration here since parsing groups needs to go back up the grammar
+// to parse expressions within them.
+static bool
+pm_regexp_parse_expression(pm_regexp_parser_t *parser, uint16_t depth);
+
+/**
+ * These are the states of the options that are configurable on the regular
+ * expression (or from within a group).
+ */
+typedef enum {
+    PM_REGEXP_OPTION_STATE_INVALID,
+    PM_REGEXP_OPTION_STATE_TOGGLEABLE,
+    PM_REGEXP_OPTION_STATE_ADDABLE,
+    PM_REGEXP_OPTION_STATE_ADDED,
+    PM_REGEXP_OPTION_STATE_REMOVED
+} pm_regexp_option_state_t;
+
+// These are the options that are configurable on the regular expression (or
+// from within a group).
+
+#define PRISM_REGEXP_OPTION_STATE_SLOT_MINIMUM 'a'
+#define PRISM_REGEXP_OPTION_STATE_SLOT_MAXIMUM 'x'
+#define PRISM_REGEXP_OPTION_STATE_SLOTS (PRISM_REGEXP_OPTION_STATE_SLOT_MAXIMUM - PRISM_REGEXP_OPTION_STATE_SLOT_MINIMUM + 1)
+
+/**
+ * This is the set of options that are configurable on the regular expression.
+ */
+typedef struct {
+    /** The current state of each option. */
+    uint8_t values[PRISM_REGEXP_OPTION_STATE_SLOTS];
+} pm_regexp_options_t;
+
+/**
+ * Initialize a new set of options to their default values.
+ */
+static void
+pm_regexp_options_init(pm_regexp_options_t *options) {
+    memset(options, PM_REGEXP_OPTION_STATE_INVALID, sizeof(uint8_t) * PRISM_REGEXP_OPTION_STATE_SLOTS);
+    options->values['i' - PRISM_REGEXP_OPTION_STATE_SLOT_MINIMUM] = PM_REGEXP_OPTION_STATE_TOGGLEABLE;
+    options->values['m' - PRISM_REGEXP_OPTION_STATE_SLOT_MINIMUM] = PM_REGEXP_OPTION_STATE_TOGGLEABLE;
+    options->values['x' - PRISM_REGEXP_OPTION_STATE_SLOT_MINIMUM] = PM_REGEXP_OPTION_STATE_TOGGLEABLE;
+    options->values['d' - PRISM_REGEXP_OPTION_STATE_SLOT_MINIMUM] = PM_REGEXP_OPTION_STATE_ADDABLE;
+    options->values['a' - PRISM_REGEXP_OPTION_STATE_SLOT_MINIMUM] = PM_REGEXP_OPTION_STATE_ADDABLE;
+    options->values['u' - PRISM_REGEXP_OPTION_STATE_SLOT_MINIMUM] = PM_REGEXP_OPTION_STATE_ADDABLE;
+}
+
+/**
+ * Attempt to add the given option to the set of options. Returns true if it was
+ * added, false if it was already present.
+ */
+static bool
+pm_regexp_options_add(pm_regexp_options_t *options, uint8_t key) {
+    if (key >= PRISM_REGEXP_OPTION_STATE_SLOT_MINIMUM && key <= PRISM_REGEXP_OPTION_STATE_SLOT_MAXIMUM) {
+        key = (uint8_t) (key - PRISM_REGEXP_OPTION_STATE_SLOT_MINIMUM);
+
+        switch (options->values[key]) {
+            case PM_REGEXP_OPTION_STATE_INVALID:
+            case PM_REGEXP_OPTION_STATE_REMOVED:
+                return false;
+            case PM_REGEXP_OPTION_STATE_TOGGLEABLE:
+            case PM_REGEXP_OPTION_STATE_ADDABLE:
+                options->values[key] = PM_REGEXP_OPTION_STATE_ADDED;
+                return true;
+            case PM_REGEXP_OPTION_STATE_ADDED:
+                return true;
+        }
+    }
+
+    return false;
+}
+
+/**
+ * Attempt to remove the given option from the set of options. Returns true if
+ * it was removed, false if it was already absent.
+ */
+static bool
+pm_regexp_options_remove(pm_regexp_options_t *options, uint8_t key) {
+    if (key >= PRISM_REGEXP_OPTION_STATE_SLOT_MINIMUM && key <= PRISM_REGEXP_OPTION_STATE_SLOT_MAXIMUM) {
+        key = (uint8_t) (key - PRISM_REGEXP_OPTION_STATE_SLOT_MINIMUM);
+
+        switch (options->values[key]) {
+            case PM_REGEXP_OPTION_STATE_INVALID:
+            case PM_REGEXP_OPTION_STATE_ADDABLE:
+                return false;
+            case PM_REGEXP_OPTION_STATE_TOGGLEABLE:
+            case PM_REGEXP_OPTION_STATE_ADDED:
+            case PM_REGEXP_OPTION_STATE_REMOVED:
+                options->values[key] = PM_REGEXP_OPTION_STATE_REMOVED;
+                return true;
+        }
+    }
+
+    return false;
+}
+
+/**
+ * True if the given key is set in the options.
+ */
+static uint8_t
+pm_regexp_options_state(pm_regexp_options_t *options, uint8_t key) {
+    if (key >= PRISM_REGEXP_OPTION_STATE_SLOT_MINIMUM && key <= PRISM_REGEXP_OPTION_STATE_SLOT_MAXIMUM) {
+        key = (uint8_t) (key - PRISM_REGEXP_OPTION_STATE_SLOT_MINIMUM);
+        return options->values[key];
+    }
+
+    return false;
+}
+
+/**
+ * Groups can have quite a few different patterns for syntax. They basically
+ * just wrap a set of expressions, but they can potentially have options after a
+ * question mark. If there _isn't_ a question mark, then it's just a set of
+ * expressions. If there _is_, then here are the options:
+ *
+ * * (?#...)                       - inline comments
+ * * (?:subexp)                    - non-capturing group
+ * * (?=subexp)                    - positive lookahead
+ * * (?!subexp)                    - negative lookahead
+ * * (?>subexp)                    - atomic group
+ * * (?~subexp)                    - absence operator
+ * * (?<=subexp)                   - positive lookbehind
+ * * (?<!subexp)                   - negative lookbehind
+ * * (?<name>subexp)               - named capturing group
+ * * (?'name'subexp)               - named capturing group
+ * * (?(cond)yes-subexp)           - conditional expression
+ * * (?(cond)yes-subexp|no-subexp) - conditional expression
+ * * (?imxdau-imx)                 - turn on and off configuration
+ * * (?imxdau-imx:subexp)          - turn on and off configuration for an expression
+ */
+static bool
+pm_regexp_parse_group(pm_regexp_parser_t *parser, uint16_t depth) {
+    const uint8_t *group_start = parser->cursor;
+
+    pm_regexp_options_t options;
+    pm_regexp_options_init(&options);
+
+    // First, parse any options for the group.
+    if (pm_regexp_char_accept(parser, '?')) {
+        if (pm_regexp_char_is_eof(parser)) {
+            pm_regexp_parse_error(parser, group_start, parser->cursor, "end pattern in group");
+            return false;
+        }
+
+        switch (*parser->cursor) {
+            case '#': { // inline comments
+                parser->cursor++;
+                if (pm_regexp_char_is_eof(parser)) {
+                    pm_regexp_parse_error(parser, group_start, parser->cursor, "end pattern in group");
+                    return false;
+                }
+
+                if (parser->encoding_changed && parser->encoding->multibyte) {
+                    bool escaped = false;
+
+                    // Here we're going to take a slow path and iterate through
+                    // each multibyte character to find the close paren. We do
+                    // this because \ can be a trailing byte in some encodings.
+                    while (parser->cursor < parser->end) {
+                        if (!escaped && *parser->cursor == ')') {
+                            parser->cursor++;
+                            return true;
+                        }
+
+                        size_t width = parser->encoding->char_width(parser->cursor, (ptrdiff_t) (parser->end - parser->cursor));
+                        if (width == 0) return false;
+
+                        escaped = (width == 1) && (*parser->cursor == '\\');
+                        parser->cursor += width;
+                    }
+
+                    return false;
+                } else {
+                    // Here we can take the fast path and use memchr to find the
+                    // next ) because we are safe checking backward for \ since
+                    // it cannot be a trailing character.
+                    bool found = pm_regexp_char_find(parser, ')');
+
+                    while (found && (parser->start <= parser->cursor - 2) && (*(parser->cursor - 2) == '\\')) {
+                        found = pm_regexp_char_find(parser, ')');
+                    }
+
+                    return found;
+                }
+            }
+            case ':': // non-capturing group
+            case '=': // positive lookahead
+            case '!': // negative lookahead
+            case '>': // atomic group
+            case '~': // absence operator
+                parser->cursor++;
+                break;
+            case '<':
+                parser->cursor++;
+                if (pm_regexp_char_is_eof(parser)) {
+                    pm_regexp_parse_error(parser, group_start, parser->cursor, "end pattern with unmatched parenthesis");
+                    return false;
+                }
+
+                switch (*parser->cursor) {
+                    case '=': // positive lookbehind
+                    case '!': // negative lookbehind
+                        parser->cursor++;
+                        break;
+                    default: { // named capture group
+                        const uint8_t *start = parser->cursor;
+                        if (!pm_regexp_char_find(parser, '>')) {
+                            return false;
+                        }
+
+                        if (parser->cursor - start == 1) {
+                            pm_regexp_parse_error(parser, start, parser->cursor, "group name is empty");
+                        }
+
+                        if (parser->name_callback != NULL) {
+                            pm_regexp_parser_named_capture(parser, start, parser->cursor - 1);
+                        }
+
+                        break;
+                    }
+                }
+                break;
+            case '\'': { // named capture group
+                const uint8_t *start = ++parser->cursor;
+                if (!pm_regexp_char_find(parser, '\'')) {
+                    return false;
+                }
+
+                if (parser->name_callback != NULL) {
+                    pm_regexp_parser_named_capture(parser, start, parser->cursor - 1);
+                }
+
+                break;
+            }
+            case '(': // conditional expression
+                if (!pm_regexp_char_find(parser, ')')) {
+                    return false;
+                }
+                break;
+            case 'i': case 'm': case 'x': case 'd': case 'a': case 'u': // options
+                while (!pm_regexp_char_is_eof(parser) && *parser->cursor != '-' && *parser->cursor != ':' && *parser->cursor != ')') {
+                    if (!pm_regexp_options_add(&options, *parser->cursor)) {
+                        return false;
+                    }
+                    parser->cursor++;
+                }
+
+                if (pm_regexp_char_is_eof(parser)) {
+                    return false;
+                }
+
+                // If we are at the end of the group of options and there is no
+                // subexpression, then we are going to be setting the options
+                // for the parent group. In this case we are safe to return now.
+                if (*parser->cursor == ')') {
+                    if (pm_regexp_options_state(&options, 'x') == PM_REGEXP_OPTION_STATE_ADDED) {
+                        parser->extended_mode = true;
+                    }
+
+                    parser->cursor++;
+                    return true;
+                }
+
+                // If we hit a -, then we're done parsing options.
+                if (*parser->cursor != '-') break;
+
+                PRISM_FALLTHROUGH
+            case '-':
+                parser->cursor++;
+                while (!pm_regexp_char_is_eof(parser) && *parser->cursor != ':' && *parser->cursor != ')') {
+                    if (!pm_regexp_options_remove(&options, *parser->cursor)) {
+                        return false;
+                    }
+                    parser->cursor++;
+                }
+
+                if (pm_regexp_char_is_eof(parser)) {
+                    return false;
+                }
+
+                // If we are at the end of the group of options and there is no
+                // subexpression, then we are going to be setting the options
+                // for the parent group. In this case we are safe to return now.
+                if (*parser->cursor == ')') {
+                    switch (pm_regexp_options_state(&options, 'x')) {
+                        case PM_REGEXP_OPTION_STATE_ADDED:
+                            parser->extended_mode = true;
+                            break;
+                        case PM_REGEXP_OPTION_STATE_REMOVED:
+                            parser->extended_mode = false;
+                            break;
+                    }
+
+                    parser->cursor++;
+                    return true;
+                }
+
+                break;
+            default:
+                parser->cursor++;
+                pm_regexp_parse_error(parser, parser->cursor - 1, parser->cursor, "undefined group option");
+                break;
+        }
+    }
+
+    bool extended_mode = parser->extended_mode;
+    switch (pm_regexp_options_state(&options, 'x')) {
+        case PM_REGEXP_OPTION_STATE_ADDED:
+            parser->extended_mode = true;
+            break;
+        case PM_REGEXP_OPTION_STATE_REMOVED:
+            parser->extended_mode = false;
+            break;
+    }
+
+    // Now, parse the expressions within this group.
+    while (!pm_regexp_char_is_eof(parser) && *parser->cursor != ')') {
+        if (!pm_regexp_parse_expression(parser, (uint16_t) (depth + 1))) {
+            parser->extended_mode = extended_mode;
+            return false;
+        }
+        pm_regexp_char_accept(parser, '|');
+    }
+
+    // Finally, make sure we have a closing parenthesis.
+    parser->extended_mode = extended_mode;
+    if (pm_regexp_char_expect(parser, ')')) return true;
+
+    pm_regexp_parse_error(parser, group_start, parser->cursor, "end pattern with unmatched parenthesis");
+    return false;
+}
+
+/**
+ * item : anchor
+ *      | match-posix-class
+ *      | match-char-set
+ *      | match-char-class
+ *      | match-char-prop
+ *      | match-char
+ *      | match-any
+ *      | group
+ *      | quantified
+ *      ;
+ */
+static bool
+pm_regexp_parse_item(pm_regexp_parser_t *parser, uint16_t depth) {
+    switch (*parser->cursor) {
+        case '^':
+        case '$':
+            parser->cursor++;
+            return pm_regexp_parse_quantifier(parser);
+        case '\\':
+            parser->cursor++;
+            if (!pm_regexp_char_is_eof(parser)) {
+                parser->cursor++;
+            }
+            return pm_regexp_parse_quantifier(parser);
+        case '(':
+            parser->cursor++;
+            return pm_regexp_parse_group(parser, depth) && pm_regexp_parse_quantifier(parser);
+        case '[':
+            parser->cursor++;
+            return pm_regexp_parse_lbracket(parser, depth) && pm_regexp_parse_quantifier(parser);
+        case '*':
+        case '?':
+        case '+':
+            parser->cursor++;
+            pm_regexp_parse_error(parser, parser->cursor - 1, parser->cursor, "target of repeat operator is not specified");
+            return true;
+        case ')':
+            parser->cursor++;
+            pm_regexp_parse_error(parser, parser->cursor - 1, parser->cursor, "unmatched close parenthesis");
+            return true;
+        case '#':
+            if (parser->extended_mode) {
+                if (!pm_regexp_char_find(parser, '\n')) parser->cursor = parser->end;
+                return true;
+            }
+        PRISM_FALLTHROUGH
+        default: {
+            size_t width;
+            if (!parser->encoding_changed) {
+                width = pm_encoding_utf_8_char_width(parser->cursor, (ptrdiff_t) (parser->end - parser->cursor));
+            } else {
+                width = parser->encoding->char_width(parser->cursor, (ptrdiff_t) (parser->end - parser->cursor));
+            }
+
+            if (width == 0) return false; // TODO: add appropriate error
+            parser->cursor += width;
+
+            return pm_regexp_parse_quantifier(parser);
+        }
+    }
+}
+
+/**
+ * expression : item+
+ *            ;
+ */
+static bool
+pm_regexp_parse_expression(pm_regexp_parser_t *parser, uint16_t depth) {
+    if (depth >= PM_REGEXP_PARSE_DEPTH_MAX) {
+        pm_regexp_parse_error(parser, parser->start, parser->end, "parse depth limit over");
+        return false;
+    }
+
+    if (!pm_regexp_parse_item(parser, depth)) {
+        return false;
+    }
+
+    while (!pm_regexp_char_is_eof(parser) && *parser->cursor != ')' && *parser->cursor != '|') {
+        if (!pm_regexp_parse_item(parser, depth)) {
+            return false;
+        }
+    }
+
+    return true;
+}
+
+/**
+ * pattern : EOF
+ *         | expression EOF
+ *         | expression '|' pattern
+ *         ;
+ */
+static bool
+pm_regexp_parse_pattern(pm_regexp_parser_t *parser) {
+    do {
+        if (pm_regexp_char_is_eof(parser)) return true;
+        if (!pm_regexp_parse_expression(parser, 0)) return false;
+    } while (pm_regexp_char_accept(parser, '|'));
+
+    return pm_regexp_char_is_eof(parser);
+}
+
+/**
+ * Parse a regular expression and extract the names of all of the named capture
+ * groups.
+ */
+PRISM_EXPORTED_FUNCTION void
+pm_regexp_parse(pm_parser_t *parser, const uint8_t *source, size_t size, bool extended_mode, pm_regexp_name_callback_t name_callback, void *name_data, pm_regexp_error_callback_t error_callback, void *error_data) {
+    pm_regexp_parse_pattern(&(pm_regexp_parser_t) {
+        .parser = parser,
+        .start = source,
+        .cursor = source,
+        .end = source + size,
+        .extended_mode = extended_mode,
+        .encoding_changed = parser->encoding_changed,
+        .encoding = parser->encoding,
+        .name_callback = name_callback,
+        .name_data = name_data,
+        .error_callback = error_callback,
+        .error_data = error_data
+    });
+}
diff --git a/prism/regexp.h b/prism/regexp.h
new file mode 100644
index 00000000000000..c0b3163e93b649
--- /dev/null
+++ b/prism/regexp.h
@@ -0,0 +1,43 @@
+/**
+ * @file regexp.h
+ *
+ * A regular expression parser.
+ */
+#ifndef PRISM_REGEXP_H
+#define PRISM_REGEXP_H
+
+#include "prism/defines.h"
+#include "prism/parser.h"
+#include "prism/encoding.h"
+#include "prism/util/pm_memchr.h"
+#include "prism/util/pm_string.h"
+
+#include <stdbool.h>
+#include <stddef.h>
+#include <string.h>
+
+/**
+ * This callback is called when a named capture group is found.
+ */
+typedef void (*pm_regexp_name_callback_t)(const pm_string_t *name, void *data);
+
+/**
+ * This callback is called when a parse error is found.
+ */
+typedef void (*pm_regexp_error_callback_t)(const uint8_t *start, const uint8_t *end, const char *message, void *data);
+
+/**
+ * Parse a regular expression.
+ *
+ * @param parser The parser that is currently being used.
+ * @param source The source code to parse.
+ * @param size The size of the source code.
+ * @param extended_mode Whether to parse the regular expression in extended mode.
+ * @param name_callback The optional callback to call when a named capture group is found.
+ * @param name_data The optional data to pass to the name callback.
+ * @param error_callback The callback to call when a parse error is found.
+ * @param error_data The data to pass to the error callback.
+ */
+PRISM_EXPORTED_FUNCTION void pm_regexp_parse(pm_parser_t *parser, const uint8_t *source, size_t size, bool extended_mode, pm_regexp_name_callback_t name_callback, void *name_data, pm_regexp_error_callback_t error_callback, void *error_data);
+
+#endif
diff --git a/prism/static_literals.c b/prism/static_literals.c
new file mode 100644
index 00000000000000..9fa37b999a9e46
--- /dev/null
+++ b/prism/static_literals.c
@@ -0,0 +1,617 @@
+#include "prism/static_literals.h"
+
+/**
+ * A small struct used for passing around a subset of the information that is
+ * stored on the parser. We use this to avoid having static literals explicitly
+ * depend on the parser struct.
+ */
+typedef struct {
+    /** The list of newline offsets to use to calculate line numbers. */
+    const pm_newline_list_t *newline_list;
+
+    /** The line number that the parser starts on. */
+    int32_t start_line;
+
+    /** The name of the encoding that the parser is using. */
+    const char *encoding_name;
+} pm_static_literals_metadata_t;
+
+static inline uint32_t
+murmur_scramble(uint32_t value) {
+    value *= 0xcc9e2d51;
+    value = (value << 15) | (value >> 17);
+    value *= 0x1b873593;
+    return value;
+}
+
+/**
+ * Murmur hash (https://en.wikipedia.org/wiki/MurmurHash) is a non-cryptographic
+ * general-purpose hash function. It is fast, which is what we care about in
+ * this case.
+ */
+static uint32_t
+murmur_hash(const uint8_t *key, size_t length) {
+    uint32_t hash = 0x9747b28c;
+    uint32_t segment;
+
+    for (size_t index = length >> 2; index; index--) {
+        memcpy(&segment, key, sizeof(uint32_t));
+        key += sizeof(uint32_t);
+        hash ^= murmur_scramble(segment);
+        hash = (hash << 13) | (hash >> 19);
+        hash = hash * 5 + 0xe6546b64;
+    }
+
+    segment = 0;
+    for (size_t index = length & 3; index; index--) {
+        segment <<= 8;
+        segment |= key[index - 1];
+    }
+
+    hash ^= murmur_scramble(segment);
+    hash ^= (uint32_t) length;
+    hash ^= hash >> 16;
+    hash *= 0x85ebca6b;
+    hash ^= hash >> 13;
+    hash *= 0xc2b2ae35;
+    hash ^= hash >> 16;
+    return hash;
+}
+
+/**
+ * Hash the value of an integer and return it.
+ */
+static uint32_t
+integer_hash(const pm_integer_t *integer) {
+    uint32_t hash;
+    if (integer->values) {
+        hash = murmur_hash((const uint8_t *) integer->values, sizeof(uint32_t) * integer->length);
+    } else {
+        hash = murmur_hash((const uint8_t *) &integer->value, sizeof(uint32_t));
+    }
+
+    if (integer->negative) {
+        hash ^= murmur_scramble((uint32_t) 1);
+    }
+
+    return hash;
+}
+
+/**
+ * Return the hash of the given node. It is important that nodes that have
+ * equivalent static literal values have the same hash. This is because we use
+ * these hashes to look for duplicates.
+ */
+static uint32_t
+node_hash(const pm_static_literals_metadata_t *metadata, const pm_node_t *node) {
+    switch (PM_NODE_TYPE(node)) {
+        case PM_INTEGER_NODE: {
+            // Integers hash their value.
+            const pm_integer_node_t *cast = (const pm_integer_node_t *) node;
+            return integer_hash(&cast->value);
+        }
+        case PM_SOURCE_LINE_NODE: {
+            // Source lines hash their line number.
+            const pm_line_column_t line_column = pm_newline_list_line_column(metadata->newline_list, node->location.start, metadata->start_line);
+            const int32_t *value = &line_column.line;
+            return murmur_hash((const uint8_t *) value, sizeof(int32_t));
+        }
+        case PM_FLOAT_NODE: {
+            // Floats hash their value.
+            const double *value = &((const pm_float_node_t *) node)->value;
+            return murmur_hash((const uint8_t *) value, sizeof(double));
+        }
+        case PM_RATIONAL_NODE: {
+            // Rationals hash their numerator and denominator.
+            const pm_rational_node_t *cast = (const pm_rational_node_t *) node;
+            return integer_hash(&cast->numerator) ^ integer_hash(&cast->denominator) ^ murmur_scramble((uint32_t) cast->base.type);
+        }
+        case PM_IMAGINARY_NODE: {
+            // Imaginaries hash their numeric value. Because their numeric value
+            // is stored as a subnode, we hash that node and then mix in the
+            // fact that this is an imaginary node.
+            const pm_node_t *numeric = ((const pm_imaginary_node_t *) node)->numeric;
+            return node_hash(metadata, numeric) ^ murmur_scramble((uint32_t) node->type);
+        }
+        case PM_STRING_NODE: {
+            // Strings hash their value and mix in their flags so that different
+            // encodings are not considered equal.
+            const pm_string_t *value = &((const pm_string_node_t *) node)->unescaped;
+
+            pm_node_flags_t flags = node->flags;
+            flags &= (PM_STRING_FLAGS_FORCED_BINARY_ENCODING | PM_STRING_FLAGS_FORCED_UTF8_ENCODING);
+
+            return murmur_hash(pm_string_source(value), pm_string_length(value) * sizeof(uint8_t)) ^ murmur_scramble((uint32_t) flags);
+        }
+        case PM_SOURCE_FILE_NODE: {
+            // Source files hash their value and mix in their flags so that
+            // different encodings are not considered equal.
+            const pm_string_t *value = &((const pm_source_file_node_t *) node)->filepath;
+            return murmur_hash(pm_string_source(value), pm_string_length(value) * sizeof(uint8_t));
+        }
+        case PM_REGULAR_EXPRESSION_NODE: {
+            // Regular expressions hash their value and mix in their flags so
+            // that different encodings are not considered equal.
+            const pm_string_t *value = &((const pm_regular_expression_node_t *) node)->unescaped;
+            return murmur_hash(pm_string_source(value), pm_string_length(value) * sizeof(uint8_t)) ^ murmur_scramble((uint32_t) node->flags);
+        }
+        case PM_SYMBOL_NODE: {
+            // Symbols hash their value and mix in their flags so that different
+            // encodings are not considered equal.
+            const pm_string_t *value = &((const pm_symbol_node_t *) node)->unescaped;
+            return murmur_hash(pm_string_source(value), pm_string_length(value) * sizeof(uint8_t)) ^ murmur_scramble((uint32_t) node->flags);
+        }
+        default:
+            assert(false && "unreachable");
+            return 0;
+    }
+}
+
+/**
+ * Insert a node into the node hash. It accepts the hash that should hold the
+ * new node, the parser that generated the node, the node to insert, and a
+ * comparison function. The comparison function is used for collision detection,
+ * and must be able to compare all node types that will be stored in this hash.
+ */
+static pm_node_t *
+pm_node_hash_insert(pm_node_hash_t *hash, const pm_static_literals_metadata_t *metadata, pm_node_t *node, bool replace, int (*compare)(const pm_static_literals_metadata_t *metadata, const pm_node_t *left, const pm_node_t *right)) {
+    // If we are out of space, we need to resize the hash. This will cause all
+    // of the nodes to be rehashed and reinserted into the new hash.
+    if (hash->size * 2 >= hash->capacity) {
+        // First, allocate space for the new node list.
+        uint32_t new_capacity = hash->capacity == 0 ? 4 : hash->capacity * 2;
+        pm_node_t **new_nodes = xcalloc(new_capacity, sizeof(pm_node_t *));
+        if (new_nodes == NULL) return NULL;
+
+        // It turns out to be more efficient to mask the hash value than to use
+        // the modulo operator. Because our capacities are always powers of two,
+        // we can use a bitwise AND to get the same result as the modulo
+        // operator.
+        uint32_t mask = new_capacity - 1;
+
+        // Now, rehash all of the nodes into the new list.
+        for (uint32_t index = 0; index < hash->capacity; index++) {
+            pm_node_t *node = hash->nodes[index];
+
+            if (node != NULL) {
+                uint32_t index = node_hash(metadata, node) & mask;
+                new_nodes[index] = node;
+            }
+        }
+
+        // Finally, free the old node list and update the hash.
+        xfree(hash->nodes);
+        hash->nodes = new_nodes;
+        hash->capacity = new_capacity;
+    }
+
+    // Now, insert the node into the hash.
+    uint32_t mask = hash->capacity - 1;
+    uint32_t index = node_hash(metadata, node) & mask;
+
+    // We use linear probing to resolve collisions. This means that if the
+    // current index is occupied, we will move to the next index and try again.
+    // We are guaranteed that this will eventually find an empty slot because we
+    // resize the hash when it gets too full.
+    while (hash->nodes[index] != NULL) {
+        if (compare(metadata, hash->nodes[index], node) == 0) break;
+        index = (index + 1) & mask;
+    }
+
+    // If the current index is occupied, we need to return the node that was
+    // already in the hash. Otherwise, we can just increment the size and insert
+    // the new node.
+    pm_node_t *result = hash->nodes[index];
+
+    if (result == NULL) {
+        hash->size++;
+        hash->nodes[index] = node;
+    } else if (replace) {
+        hash->nodes[index] = node;
+    }
+
+    return result;
+}
+
+/**
+ * Free the internal memory associated with the given node hash.
+ */
+static void
+pm_node_hash_free(pm_node_hash_t *hash) {
+    if (hash->capacity > 0) xfree(hash->nodes);
+}
+
+/**
+ * Compare two values that can be compared with a simple numeric comparison.
+ */
+#define PM_NUMERIC_COMPARISON(left, right) ((left < right) ? -1 : (left > right) ? 1 : 0)
+
+/**
+ * Return the integer value of the given node as an int64_t.
+ */
+static int64_t
+pm_int64_value(const pm_static_literals_metadata_t *metadata, const pm_node_t *node) {
+    switch (PM_NODE_TYPE(node)) {
+        case PM_INTEGER_NODE: {
+            const pm_integer_t *integer = &((const pm_integer_node_t *) node)->value;
+            if (integer->values) return integer->negative ? INT64_MIN : INT64_MAX;
+
+            int64_t value = (int64_t) integer->value;
+            return integer->negative ? -value : value;
+        }
+        case PM_SOURCE_LINE_NODE:
+            return (int64_t) pm_newline_list_line_column(metadata->newline_list, node->location.start, metadata->start_line).line;
+        default:
+            assert(false && "unreachable");
+            return 0;
+    }
+}
+
+/**
+ * A comparison function for comparing two IntegerNode or SourceLineNode
+ * instances.
+ */
+static int
+pm_compare_integer_nodes(const pm_static_literals_metadata_t *metadata, const pm_node_t *left, const pm_node_t *right) {
+    if (PM_NODE_TYPE_P(left, PM_SOURCE_LINE_NODE) || PM_NODE_TYPE_P(right, PM_SOURCE_LINE_NODE)) {
+        int64_t left_value = pm_int64_value(metadata, left);
+        int64_t right_value = pm_int64_value(metadata, right);
+        return PM_NUMERIC_COMPARISON(left_value, right_value);
+    }
+
+    const pm_integer_t *left_integer = &((const pm_integer_node_t *) left)->value;
+    const pm_integer_t *right_integer = &((const pm_integer_node_t *) right)->value;
+    return pm_integer_compare(left_integer, right_integer);
+}
+
+/**
+ * A comparison function for comparing two FloatNode instances.
+ */
+static int
+pm_compare_float_nodes(PRISM_ATTRIBUTE_UNUSED const pm_static_literals_metadata_t *metadata, const pm_node_t *left, const pm_node_t *right) {
+    const double left_value = ((const pm_float_node_t *) left)->value;
+    const double right_value = ((const pm_float_node_t *) right)->value;
+    return PM_NUMERIC_COMPARISON(left_value, right_value);
+}
+
+/**
+ * A comparison function for comparing two nodes that have attached numbers.
+ */
+static int
+pm_compare_number_nodes(const pm_static_literals_metadata_t *metadata, const pm_node_t *left, const pm_node_t *right) {
+    if (PM_NODE_TYPE(left) != PM_NODE_TYPE(right)) {
+        return PM_NUMERIC_COMPARISON(PM_NODE_TYPE(left), PM_NODE_TYPE(right));
+    }
+
+    switch (PM_NODE_TYPE(left)) {
+        case PM_IMAGINARY_NODE:
+            return pm_compare_number_nodes(metadata, ((const pm_imaginary_node_t *) left)->numeric, ((const pm_imaginary_node_t *) right)->numeric);
+        case PM_RATIONAL_NODE: {
+            const pm_rational_node_t *left_rational = (const pm_rational_node_t *) left;
+            const pm_rational_node_t *right_rational = (const pm_rational_node_t *) right;
+
+            int result = pm_integer_compare(&left_rational->denominator, &right_rational->denominator);
+            if (result != 0) return result;
+
+            return pm_integer_compare(&left_rational->numerator, &right_rational->numerator);
+        }
+        case PM_INTEGER_NODE:
+            return pm_compare_integer_nodes(metadata, left, right);
+        case PM_FLOAT_NODE:
+            return pm_compare_float_nodes(metadata, left, right);
+        default:
+            assert(false && "unreachable");
+            return 0;
+    }
+}
+
+/**
+ * Return a pointer to the string value of the given node.
+ */
+static const pm_string_t *
+pm_string_value(const pm_node_t *node) {
+    switch (PM_NODE_TYPE(node)) {
+        case PM_STRING_NODE:
+            return &((const pm_string_node_t *) node)->unescaped;
+        case PM_SOURCE_FILE_NODE:
+            return &((const pm_source_file_node_t *) node)->filepath;
+        case PM_SYMBOL_NODE:
+            return &((const pm_symbol_node_t *) node)->unescaped;
+        default:
+            assert(false && "unreachable");
+            return NULL;
+    }
+}
+
+/**
+ * A comparison function for comparing two nodes that have attached strings.
+ */
+static int
+pm_compare_string_nodes(PRISM_ATTRIBUTE_UNUSED const pm_static_literals_metadata_t *metadata, const pm_node_t *left, const pm_node_t *right) {
+    const pm_string_t *left_string = pm_string_value(left);
+    const pm_string_t *right_string = pm_string_value(right);
+    return pm_string_compare(left_string, right_string);
+}
+
+/**
+ * A comparison function for comparing two RegularExpressionNode instances.
+ */
+static int
+pm_compare_regular_expression_nodes(PRISM_ATTRIBUTE_UNUSED const pm_static_literals_metadata_t *metadata, const pm_node_t *left, const pm_node_t *right) {
+    const pm_regular_expression_node_t *left_regexp = (const pm_regular_expression_node_t *) left;
+    const pm_regular_expression_node_t *right_regexp = (const pm_regular_expression_node_t *) right;
+
+    int result = pm_string_compare(&left_regexp->unescaped, &right_regexp->unescaped);
+    if (result != 0) return result;
+
+    return PM_NUMERIC_COMPARISON(left_regexp->base.flags, right_regexp->base.flags);
+}
+
+#undef PM_NUMERIC_COMPARISON
+
+/**
+ * Add a node to the set of static literals.
+ */
+pm_node_t *
+pm_static_literals_add(const pm_newline_list_t *newline_list, int32_t start_line, pm_static_literals_t *literals, pm_node_t *node, bool replace) {
+    switch (PM_NODE_TYPE(node)) {
+        case PM_INTEGER_NODE:
+        case PM_SOURCE_LINE_NODE:
+            return pm_node_hash_insert(
+                &literals->integer_nodes,
+                &(pm_static_literals_metadata_t) {
+                    .newline_list = newline_list,
+                    .start_line = start_line,
+                    .encoding_name = NULL
+                },
+                node,
+                replace,
+                pm_compare_integer_nodes
+            );
+        case PM_FLOAT_NODE:
+            return pm_node_hash_insert(
+                &literals->float_nodes,
+                &(pm_static_literals_metadata_t) {
+                    .newline_list = newline_list,
+                    .start_line = start_line,
+                    .encoding_name = NULL
+                },
+                node,
+                replace,
+                pm_compare_float_nodes
+            );
+        case PM_RATIONAL_NODE:
+        case PM_IMAGINARY_NODE:
+            return pm_node_hash_insert(
+                &literals->number_nodes,
+                &(pm_static_literals_metadata_t) {
+                    .newline_list = newline_list,
+                    .start_line = start_line,
+                    .encoding_name = NULL
+                },
+                node,
+                replace,
+                pm_compare_number_nodes
+            );
+        case PM_STRING_NODE:
+        case PM_SOURCE_FILE_NODE:
+            return pm_node_hash_insert(
+                &literals->string_nodes,
+                &(pm_static_literals_metadata_t) {
+                    .newline_list = newline_list,
+                    .start_line = start_line,
+                    .encoding_name = NULL
+                },
+                node,
+                replace,
+                pm_compare_string_nodes
+            );
+        case PM_REGULAR_EXPRESSION_NODE:
+            return pm_node_hash_insert(
+                &literals->regexp_nodes,
+                &(pm_static_literals_metadata_t) {
+                    .newline_list = newline_list,
+                    .start_line = start_line,
+                    .encoding_name = NULL
+                },
+                node,
+                replace,
+                pm_compare_regular_expression_nodes
+            );
+        case PM_SYMBOL_NODE:
+            return pm_node_hash_insert(
+                &literals->symbol_nodes,
+                &(pm_static_literals_metadata_t) {
+                    .newline_list = newline_list,
+                    .start_line = start_line,
+                    .encoding_name = NULL
+                },
+                node,
+                replace,
+                pm_compare_string_nodes
+            );
+        case PM_TRUE_NODE: {
+            pm_node_t *duplicated = literals->true_node;
+            if ((duplicated == NULL) || replace) literals->true_node = node;
+            return duplicated;
+        }
+        case PM_FALSE_NODE: {
+            pm_node_t *duplicated = literals->false_node;
+            if ((duplicated == NULL) || replace) literals->false_node = node;
+            return duplicated;
+        }
+        case PM_NIL_NODE: {
+            pm_node_t *duplicated = literals->nil_node;
+            if ((duplicated == NULL) || replace) literals->nil_node = node;
+            return duplicated;
+        }
+        case PM_SOURCE_ENCODING_NODE: {
+            pm_node_t *duplicated = literals->source_encoding_node;
+            if ((duplicated == NULL) || replace) literals->source_encoding_node = node;
+            return duplicated;
+        }
+        default:
+            return NULL;
+    }
+}
+
+/**
+ * Free the internal memory associated with the given static literals set.
+ */
+void
+pm_static_literals_free(pm_static_literals_t *literals) {
+    pm_node_hash_free(&literals->integer_nodes);
+    pm_node_hash_free(&literals->float_nodes);
+    pm_node_hash_free(&literals->number_nodes);
+    pm_node_hash_free(&literals->string_nodes);
+    pm_node_hash_free(&literals->regexp_nodes);
+    pm_node_hash_free(&literals->symbol_nodes);
+}
+
+/**
+ * A helper to determine if the given node is a static literal that is positive.
+ * This is used for formatting imaginary nodes.
+ */
+static bool
+pm_static_literal_positive_p(const pm_node_t *node) {
+    switch (PM_NODE_TYPE(node)) {
+        case PM_FLOAT_NODE:
+            return ((const pm_float_node_t *) node)->value > 0;
+        case PM_INTEGER_NODE:
+            return !((const pm_integer_node_t *) node)->value.negative;
+        case PM_RATIONAL_NODE:
+            return !((const pm_rational_node_t *) node)->numerator.negative;
+        case PM_IMAGINARY_NODE:
+            return pm_static_literal_positive_p(((const pm_imaginary_node_t *) node)->numeric);
+        default:
+            assert(false && "unreachable");
+            return false;
+    }
+}
+
+/**
+ * Create a string-based representation of the given static literal.
+ */
+static inline void
+pm_static_literal_inspect_node(pm_buffer_t *buffer, const pm_static_literals_metadata_t *metadata, const pm_node_t *node) {
+    switch (PM_NODE_TYPE(node)) {
+        case PM_FALSE_NODE:
+            pm_buffer_append_string(buffer, "false", 5);
+            break;
+        case PM_FLOAT_NODE: {
+            const double value = ((const pm_float_node_t *) node)->value;
+
+            if (PRISM_ISINF(value)) {
+                if (*node->location.start == '-') {
+                    pm_buffer_append_byte(buffer, '-');
+                }
+                pm_buffer_append_string(buffer, "Infinity", 8);
+            } else if (value == 0.0) {
+                if (*node->location.start == '-') {
+                    pm_buffer_append_byte(buffer, '-');
+                }
+                pm_buffer_append_string(buffer, "0.0", 3);
+            } else {
+                pm_buffer_append_format(buffer, "%g", value);
+
+                // %g will not insert a .0 for 1e100 (we'll get back 1e+100). So
+                // we check for the decimal point and add it in here if it's not
+                // present.
+                if (pm_buffer_index(buffer, '.') == SIZE_MAX) {
+                    size_t exponent_index = pm_buffer_index(buffer, 'e');
+                    size_t index = exponent_index == SIZE_MAX ? pm_buffer_length(buffer) : exponent_index;
+                    pm_buffer_insert(buffer, index, ".0", 2);
+                }
+            }
+
+            break;
+        }
+        case PM_IMAGINARY_NODE: {
+            const pm_node_t *numeric = ((const pm_imaginary_node_t *) node)->numeric;
+            pm_buffer_append_string(buffer, "(0", 2);
+            if (pm_static_literal_positive_p(numeric)) pm_buffer_append_byte(buffer, '+');
+            pm_static_literal_inspect_node(buffer, metadata, numeric);
+            if (PM_NODE_TYPE_P(numeric, PM_RATIONAL_NODE)) {
+                pm_buffer_append_byte(buffer, '*');
+            }
+            pm_buffer_append_string(buffer, "i)", 2);
+            break;
+        }
+        case PM_INTEGER_NODE:
+            pm_integer_string(buffer, &((const pm_integer_node_t *) node)->value);
+            break;
+        case PM_NIL_NODE:
+            pm_buffer_append_string(buffer, "nil", 3);
+            break;
+        case PM_RATIONAL_NODE: {
+            const pm_rational_node_t *rational = (const pm_rational_node_t *) node;
+            pm_buffer_append_byte(buffer, '(');
+            pm_integer_string(buffer, &rational->numerator);
+            pm_buffer_append_byte(buffer, '/');
+            pm_integer_string(buffer, &rational->denominator);
+            pm_buffer_append_byte(buffer, ')');
+            break;
+        }
+        case PM_REGULAR_EXPRESSION_NODE: {
+            const pm_string_t *unescaped = &((const pm_regular_expression_node_t *) node)->unescaped;
+            pm_buffer_append_byte(buffer, '/');
+            pm_buffer_append_source(buffer, pm_string_source(unescaped), pm_string_length(unescaped), PM_BUFFER_ESCAPING_RUBY);
+            pm_buffer_append_byte(buffer, '/');
+
+            if (PM_NODE_FLAG_P(node, PM_REGULAR_EXPRESSION_FLAGS_MULTI_LINE)) pm_buffer_append_string(buffer, "m", 1);
+            if (PM_NODE_FLAG_P(node, PM_REGULAR_EXPRESSION_FLAGS_IGNORE_CASE)) pm_buffer_append_string(buffer, "i", 1);
+            if (PM_NODE_FLAG_P(node, PM_REGULAR_EXPRESSION_FLAGS_EXTENDED)) pm_buffer_append_string(buffer, "x", 1);
+            if (PM_NODE_FLAG_P(node, PM_REGULAR_EXPRESSION_FLAGS_ASCII_8BIT)) pm_buffer_append_string(buffer, "n", 1);
+
+            break;
+        }
+        case PM_SOURCE_ENCODING_NODE:
+            pm_buffer_append_format(buffer, "#<Encoding:%s>", metadata->encoding_name);
+            break;
+        case PM_SOURCE_FILE_NODE: {
+            const pm_string_t *filepath = &((const pm_source_file_node_t *) node)->filepath;
+            pm_buffer_append_byte(buffer, '"');
+            pm_buffer_append_source(buffer, pm_string_source(filepath), pm_string_length(filepath), PM_BUFFER_ESCAPING_RUBY);
+            pm_buffer_append_byte(buffer, '"');
+            break;
+        }
+        case PM_SOURCE_LINE_NODE:
+            pm_buffer_append_format(buffer, "%d", pm_newline_list_line_column(metadata->newline_list, node->location.start, metadata->start_line).line);
+            break;
+        case PM_STRING_NODE: {
+            const pm_string_t *unescaped = &((const pm_string_node_t *) node)->unescaped;
+            pm_buffer_append_byte(buffer, '"');
+            pm_buffer_append_source(buffer, pm_string_source(unescaped), pm_string_length(unescaped), PM_BUFFER_ESCAPING_RUBY);
+            pm_buffer_append_byte(buffer, '"');
+            break;
+        }
+        case PM_SYMBOL_NODE: {
+            const pm_string_t *unescaped = &((const pm_symbol_node_t *) node)->unescaped;
+            pm_buffer_append_byte(buffer, ':');
+            pm_buffer_append_source(buffer, pm_string_source(unescaped), pm_string_length(unescaped), PM_BUFFER_ESCAPING_RUBY);
+            break;
+        }
+        case PM_TRUE_NODE:
+            pm_buffer_append_string(buffer, "true", 4);
+            break;
+        default:
+            assert(false && "unreachable");
+            break;
+    }
+}
+
+/**
+ * Create a string-based representation of the given static literal.
+ */
+void
+pm_static_literal_inspect(pm_buffer_t *buffer, const pm_newline_list_t *newline_list, int32_t start_line, const char *encoding_name, const pm_node_t *node) {
+    pm_static_literal_inspect_node(
+        buffer,
+        &(pm_static_literals_metadata_t) {
+            .newline_list = newline_list,
+            .start_line = start_line,
+            .encoding_name = encoding_name
+        },
+        node
+    );
+}
diff --git a/prism/static_literals.h b/prism/static_literals.h
new file mode 100644
index 00000000000000..bd29761899c29c
--- /dev/null
+++ b/prism/static_literals.h
@@ -0,0 +1,121 @@
+/**
+ * @file static_literals.h
+ *
+ * A set of static literal nodes that can be checked for duplicates.
+ */
+#ifndef PRISM_STATIC_LITERALS_H
+#define PRISM_STATIC_LITERALS_H
+
+#include "prism/defines.h"
+#include "prism/ast.h"
+#include "prism/util/pm_newline_list.h"
+
+#include <assert.h>
+#include <stdbool.h>
+
+/**
+ * An internal hash table for a set of nodes.
+ */
+typedef struct {
+    /** The array of nodes in the hash table. */
+    pm_node_t **nodes;
+
+    /** The size of the hash table. */
+    uint32_t size;
+
+    /** The space that has been allocated in the hash table. */
+    uint32_t capacity;
+} pm_node_hash_t;
+
+/**
+ * Certain sets of nodes (hash keys and when clauses) check for duplicate nodes
+ * to alert the user of potential issues. To do this, we keep a set of the nodes
+ * that have been seen so far, and compare whenever we find a new node.
+ *
+ * We bucket the nodes based on their type to minimize the number of comparisons
+ * that need to be performed.
+ */
+typedef struct {
+    /**
+     * This is the set of IntegerNode and SourceLineNode instances.
+     */
+    pm_node_hash_t integer_nodes;
+
+    /**
+     * This is the set of FloatNode instances.
+     */
+    pm_node_hash_t float_nodes;
+
+    /**
+     * This is the set of RationalNode and ImaginaryNode instances.
+     */
+    pm_node_hash_t number_nodes;
+
+    /**
+     * This is the set of StringNode and SourceFileNode instances.
+     */
+    pm_node_hash_t string_nodes;
+
+    /**
+     * This is the set of RegularExpressionNode instances.
+     */
+    pm_node_hash_t regexp_nodes;
+
+    /**
+     * This is the set of SymbolNode instances.
+     */
+    pm_node_hash_t symbol_nodes;
+
+    /**
+     * A pointer to the last TrueNode instance that was inserted, or NULL.
+     */
+    pm_node_t *true_node;
+
+    /**
+     * A pointer to the last FalseNode instance that was inserted, or NULL.
+     */
+    pm_node_t *false_node;
+
+    /**
+     * A pointer to the last NilNode instance that was inserted, or NULL.
+     */
+    pm_node_t *nil_node;
+
+    /**
+     * A pointer to the last SourceEncodingNode instance that was inserted, or
+     * NULL.
+     */
+    pm_node_t *source_encoding_node;
+} pm_static_literals_t;
+
+/**
+ * Add a node to the set of static literals.
+ *
+ * @param newline_list The list of newline offsets to use to calculate lines.
+ * @param start_line The line number that the parser starts on.
+ * @param literals The set of static literals to add the node to.
+ * @param node The node to add to the set.
+ * @param replace Whether to replace the previous node if one already exists.
+ * @return A pointer to the node that is being overwritten, if there is one.
+ */
+pm_node_t * pm_static_literals_add(const pm_newline_list_t *newline_list, int32_t start_line, pm_static_literals_t *literals, pm_node_t *node, bool replace);
+
+/**
+ * Free the internal memory associated with the given static literals set.
+ *
+ * @param literals The set of static literals to free.
+ */
+void pm_static_literals_free(pm_static_literals_t *literals);
+
+/**
+ * Create a string-based representation of the given static literal.
+ *
+ * @param buffer The buffer to write the string to.
+ * @param newline_list The list of newline offsets to use to calculate lines.
+ * @param start_line The line number that the parser starts on.
+ * @param encoding_name The name of the encoding of the source being parsed.
+ * @param node The node to create a string representation of.
+ */
+void pm_static_literal_inspect(pm_buffer_t *buffer, const pm_newline_list_t *newline_list, int32_t start_line, const char *encoding_name, const pm_node_t *node);
+
+#endif
diff --git a/prism/templates/ext/prism/api_node.c.erb b/prism/templates/ext/prism/api_node.c.erb
new file mode 100644
index 00000000000000..23af8886a7364f
--- /dev/null
+++ b/prism/templates/ext/prism/api_node.c.erb
@@ -0,0 +1,282 @@
+#line <%= __LINE__ + 1 %> "prism/templates/ext/prism/<%= File.basename(__FILE__) %>"
+#include "prism/extension.h"
+
+extern VALUE rb_cPrism;
+extern VALUE rb_cPrismNode;
+extern VALUE rb_cPrismSource;
+extern VALUE rb_cPrismToken;
+extern VALUE rb_cPrismLocation;
+
+<%- nodes.each do |node| -%>
+static VALUE rb_cPrism<%= node.name %>;
+<%- end -%>
+
+static VALUE
+pm_location_new(const pm_parser_t *parser, const uint8_t *start, const uint8_t *end, VALUE source, bool freeze) {
+    if (freeze) {
+        VALUE location_argv[] = {
+            source,
+            LONG2FIX(start - parser->start),
+            LONG2FIX(end - start)
+        };
+
+        return rb_obj_freeze(rb_class_new_instance(3, location_argv, rb_cPrismLocation));
+    } else {
+        uint64_t value = ((((uint64_t) (start - parser->start)) << 32) | ((uint32_t) (end - start)));
+        return ULL2NUM(value);
+    }
+}
+
+VALUE
+pm_token_new(const pm_parser_t *parser, const pm_token_t *token, rb_encoding *encoding, VALUE source, bool freeze) {
+    ID type = rb_intern(pm_token_type_name(token->type));
+    VALUE location = pm_location_new(parser, token->start, token->end, source, freeze);
+
+    VALUE slice = rb_enc_str_new((const char *) token->start, token->end - token->start, encoding);
+    if (freeze) rb_obj_freeze(slice);
+
+    VALUE argv[] = { source, ID2SYM(type), slice, location };
+    VALUE value = rb_class_new_instance(4, argv, rb_cPrismToken);
+    if (freeze) rb_obj_freeze(value);
+
+    return value;
+}
+
+static VALUE
+pm_string_new(const pm_string_t *string, rb_encoding *encoding) {
+    return rb_obj_freeze(rb_enc_str_new((const char *) pm_string_source(string), pm_string_length(string), encoding));
+}
+
+VALUE
+pm_integer_new(const pm_integer_t *integer) {
+    VALUE result;
+    if (integer->values == NULL) {
+        result = UINT2NUM(integer->value);
+    } else {
+        VALUE string = rb_str_new(NULL, integer->length * 8);
+        unsigned char *bytes = (unsigned char *) RSTRING_PTR(string);
+
+        size_t offset = integer->length * 8;
+        for (size_t value_index = 0; value_index < integer->length; value_index++) {
+            uint32_t value = integer->values[value_index];
+
+            for (int index = 0; index < 8; index++) {
+                int byte = (value >> (4 * index)) & 0xf;
+                bytes[--offset] = byte < 10 ? byte + '0' : byte - 10 + 'a';
+            }
+        }
+
+        result = rb_funcall(string, rb_intern("to_i"), 1, UINT2NUM(16));
+    }
+
+    if (integer->negative) {
+        result = rb_funcall(result, rb_intern("-@"), 0);
+    }
+
+    return result;
+}
+
+// Create a Prism::Source object from the given parser, after pm_parse() was called.
+VALUE
+pm_source_new(const pm_parser_t *parser, rb_encoding *encoding, bool freeze) {
+    VALUE source_string = rb_enc_str_new((const char *) parser->start, parser->end - parser->start, encoding);
+
+    VALUE offsets = rb_ary_new_capa(parser->newline_list.size);
+    for (size_t index = 0; index < parser->newline_list.size; index++) {
+        rb_ary_push(offsets, ULONG2NUM(parser->newline_list.offsets[index]));
+    }
+
+    if (freeze) {
+        rb_obj_freeze(source_string);
+        rb_obj_freeze(offsets);
+    }
+
+    VALUE source = rb_funcall(rb_cPrismSource, rb_intern("for"), 3, source_string, LONG2NUM(parser->start_line), offsets);
+    if (freeze) rb_obj_freeze(source);
+
+    return source;
+}
+
+typedef struct pm_node_stack_node {
+    struct pm_node_stack_node *prev;
+    const pm_node_t *visit;
+    bool visited;
+} pm_node_stack_node_t;
+
+static void
+pm_node_stack_push(pm_node_stack_node_t **stack, const pm_node_t *visit) {
+    pm_node_stack_node_t *node = xmalloc(sizeof(pm_node_stack_node_t));
+    node->prev = *stack;
+    node->visit = visit;
+    node->visited = false;
+    *stack = node;
+}
+
+static const pm_node_t *
+pm_node_stack_pop(pm_node_stack_node_t **stack) {
+    pm_node_stack_node_t *current = *stack;
+    const pm_node_t *visit = current->visit;
+
+    *stack = current->prev;
+    xfree(current);
+
+    return visit;
+}
+
+VALUE
+pm_ast_new(const pm_parser_t *parser, const pm_node_t *node, rb_encoding *encoding, VALUE source, bool freeze) {
+    VALUE constants = rb_ary_new_capa(parser->constant_pool.size);
+
+    for (uint32_t index = 0; index < parser->constant_pool.size; index++) {
+        pm_constant_t *constant = &parser->constant_pool.constants[index];
+        int state = 0;
+
+        VALUE string = rb_enc_str_new((const char *) constant->start, constant->length, encoding);
+        VALUE value = rb_protect(rb_str_intern, string, &state);
+
+        if (state != 0) {
+            value = ID2SYM(rb_intern_const("?"));
+            rb_set_errinfo(Qnil);
+        }
+
+        rb_ary_push(constants, value);
+    }
+
+    pm_node_stack_node_t *node_stack = NULL;
+    pm_node_stack_push(&node_stack, node);
+    VALUE value_stack = rb_ary_new();
+
+    while (node_stack != NULL) {
+        if (!node_stack->visited) {
+            if (node_stack->visit == NULL) {
+                pm_node_stack_pop(&node_stack);
+                rb_ary_push(value_stack, Qnil);
+                continue;
+            }
+
+            const pm_node_t *node = node_stack->visit;
+            node_stack->visited = true;
+
+            switch (PM_NODE_TYPE(node)) {
+                <%- nodes.each do |node| -%>
+                <%- if node.fields.any? { |field| [Prism::Template::NodeField, Prism::Template::OptionalNodeField, Prism::Template::NodeListField].include?(field.class) } -%>
+#line <%= __LINE__ + 1 %> "prism/templates/ext/prism/<%= File.basename(__FILE__) %>"
+                case <%= node.type %>: {
+                    pm_<%= node.human %>_t *cast = (pm_<%= node.human %>_t *) node;
+                    <%- node.fields.each do |field| -%>
+                    <%- case field -%>
+                    <%- when Prism::Template::NodeField, Prism::Template::OptionalNodeField -%>
+                    pm_node_stack_push(&node_stack, (pm_node_t *) cast-><%= field.name %>);
+                    <%- when Prism::Template::NodeListField -%>
+                    for (size_t index = 0; index < cast-><%= field.name %>.size; index++) {
+                        pm_node_stack_push(&node_stack, (pm_node_t *) cast-><%= field.name %>.nodes[index]);
+                    }
+                    <%- end -%>
+                    <%- end -%>
+                    break;
+                }
+                <%- end -%>
+                <%- end -%>
+                default:
+                    break;
+            }
+#line <%= __LINE__ + 1 %> "prism/templates/ext/prism/<%= File.basename(__FILE__) %>"
+        } else {
+            const pm_node_t *node = pm_node_stack_pop(&node_stack);
+
+            switch (PM_NODE_TYPE(node)) {
+                <%- nodes.each do |node| -%>
+#line <%= __LINE__ + 1 %> "prism/templates/ext/prism/<%= File.basename(__FILE__) %>"
+                case <%= node.type %>: {
+                    <%- if node.fields.any? { |field| ![Prism::Template::NodeField, Prism::Template::OptionalNodeField].include?(field.class) } -%>
+                    pm_<%= node.human %>_t *cast = (pm_<%= node.human %>_t *) node;
+                    <%- end -%>
+                    VALUE argv[<%= node.fields.length + 4 %>];
+
+                    // source
+                    argv[0] = source;
+
+                    // node_id
+                    argv[1] = ULONG2NUM(node->node_id);
+
+                    // location
+                    argv[2] = pm_location_new(parser, node->location.start, node->location.end, source, freeze);
+
+                    // flags
+                    argv[3] = ULONG2NUM(node->flags);
+                    <%- node.fields.each.with_index(4) do |field, index| -%>
+
+                    // <%= field.name %>
+                    <%- case field -%>
+                    <%- when Prism::Template::NodeField, Prism::Template::OptionalNodeField -%>
+#line <%= __LINE__ + 1 %> "prism/templates/ext/prism/<%= File.basename(__FILE__) %>"
+                    argv[<%= index %>] = rb_ary_pop(value_stack);
+                    <%- when Prism::Template::NodeListField -%>
+#line <%= __LINE__ + 1 %> "prism/templates/ext/prism/<%= File.basename(__FILE__) %>"
+                    argv[<%= index %>] = rb_ary_new_capa(cast-><%= field.name %>.size);
+                    for (size_t index = 0; index < cast-><%= field.name %>.size; index++) {
+                        rb_ary_push(argv[<%= index %>], rb_ary_pop(value_stack));
+                    }
+                    if (freeze) rb_obj_freeze(argv[<%= index %>]);
+                    <%- when Prism::Template::StringField -%>
+#line <%= __LINE__ + 1 %> "prism/templates/ext/prism/<%= File.basename(__FILE__) %>"
+                    argv[<%= index %>] = pm_string_new(&cast-><%= field.name %>, encoding);
+                    <%- when Prism::Template::ConstantField -%>
+#line <%= __LINE__ + 1 %> "prism/templates/ext/prism/<%= File.basename(__FILE__) %>"
+                    assert(cast-><%= field.name %> != 0);
+                    argv[<%= index %>] = RARRAY_AREF(constants, cast-><%= field.name %> - 1);
+                    <%- when Prism::Template::OptionalConstantField -%>
+                    argv[<%= index %>] = cast-><%= field.name %> == 0 ? Qnil : RARRAY_AREF(constants, cast-><%= field.name %> - 1);
+                    <%- when Prism::Template::ConstantListField -%>
+#line <%= __LINE__ + 1 %> "prism/templates/ext/prism/<%= File.basename(__FILE__) %>"
+                    argv[<%= index %>] = rb_ary_new_capa(cast-><%= field.name %>.size);
+                    for (size_t index = 0; index < cast-><%= field.name %>.size; index++) {
+                        assert(cast-><%= field.name %>.ids[index] != 0);
+                        rb_ary_push(argv[<%= index %>], RARRAY_AREF(constants, cast-><%= field.name %>.ids[index] - 1));
+                    }
+                    if (freeze) rb_obj_freeze(argv[<%= index %>]);
+                    <%- when Prism::Template::LocationField -%>
+#line <%= __LINE__ + 1 %> "prism/templates/ext/prism/<%= File.basename(__FILE__) %>"
+                    argv[<%= index %>] = pm_location_new(parser, cast-><%= field.name %>.start, cast-><%= field.name %>.end, source, freeze);
+                    <%- when Prism::Template::OptionalLocationField -%>
+#line <%= __LINE__ + 1 %> "prism/templates/ext/prism/<%= File.basename(__FILE__) %>"
+                    argv[<%= index %>] = cast-><%= field.name %>.start == NULL ? Qnil : pm_location_new(parser, cast-><%= field.name %>.start, cast-><%= field.name %>.end, source, freeze);
+                    <%- when Prism::Template::UInt8Field -%>
+#line <%= __LINE__ + 1 %> "prism/templates/ext/prism/<%= File.basename(__FILE__) %>"
+                    argv[<%= index %>] = UINT2NUM(cast-><%= field.name %>);
+                    <%- when Prism::Template::UInt32Field -%>
+#line <%= __LINE__ + 1 %> "prism/templates/ext/prism/<%= File.basename(__FILE__) %>"
+                    argv[<%= index %>] = ULONG2NUM(cast-><%= field.name %>);
+                    <%- when Prism::Template::IntegerField -%>
+#line <%= __LINE__ + 1 %> "prism/templates/ext/prism/<%= File.basename(__FILE__) %>"
+                    argv[<%= index %>] = pm_integer_new(&cast-><%= field.name %>);
+                    <%- when Prism::Template::DoubleField -%>
+#line <%= __LINE__ + 1 %> "prism/templates/ext/prism/<%= File.basename(__FILE__) %>"
+                    argv[<%= index %>] = DBL2NUM(cast-><%= field.name %>);
+                    <%- else -%>
+                    <%- raise -%>
+                    <%- end -%>
+                    <%- end -%>
+
+                    VALUE value = rb_class_new_instance(<%= node.fields.length + 4 %>, argv, rb_cPrism<%= node.name %>);
+                    if (freeze) rb_obj_freeze(value);
+
+                    rb_ary_push(value_stack, value);
+                    break;
+                }
+                <%- end -%>
+                default:
+                    rb_raise(rb_eRuntimeError, "unknown node type: %d", PM_NODE_TYPE(node));
+            }
+        }
+    }
+
+    return rb_ary_pop(value_stack);
+}
+
+void
+Init_prism_api_node(void) {
+    <%- nodes.each do |node| -%>
+    rb_cPrism<%= node.name %> = rb_define_class_under(rb_cPrism, "<%= node.name %>", rb_cPrismNode);
+    <%- end -%>
+}
diff --git a/prism/templates/include/prism/ast.h.erb b/prism/templates/include/prism/ast.h.erb
new file mode 100644
index 00000000000000..087eb81890eb45
--- /dev/null
+++ b/prism/templates/include/prism/ast.h.erb
@@ -0,0 +1,226 @@
+/**
+ * @file ast.h
+ *
+ * The abstract syntax tree.
+ *
+ * --
+ */
+#ifndef PRISM_AST_H
+#define PRISM_AST_H
+
+#include "prism/defines.h"
+#include "prism/util/pm_constant_pool.h"
+#include "prism/util/pm_integer.h"
+#include "prism/util/pm_string.h"
+
+#include <assert.h>
+#include <stddef.h>
+#include <stdint.h>
+
+/**
+ * This enum represents every type of token in the Ruby source.
+ */
+typedef enum pm_token_type {
+<%- tokens.each do |token| -%>
+    /** <%= token.comment %> */
+    PM_TOKEN_<%= token.name %><%= " = #{token.value}" if token.value %>,
+
+<%- end -%>
+    /** The maximum token value. */
+    PM_TOKEN_MAXIMUM,
+} pm_token_type_t;
+
+/**
+ * This struct represents a token in the Ruby source. We use it to track both
+ * type and location information.
+ */
+typedef struct {
+    /** The type of the token. */
+    pm_token_type_t type;
+
+    /** A pointer to the start location of the token in the source. */
+    const uint8_t *start;
+
+    /** A pointer to the end location of the token in the source. */
+    const uint8_t *end;
+} pm_token_t;
+
+/**
+ * This represents a range of bytes in the source string to which a node or
+ * token corresponds.
+ */
+typedef struct {
+    /** A pointer to the start location of the range in the source. */
+    const uint8_t *start;
+
+    /** A pointer to the end location of the range in the source. */
+    const uint8_t *end;
+} pm_location_t;
+
+struct pm_node;
+
+/**
+ * A list of nodes in the source, most often used for lists of children.
+ */
+typedef struct pm_node_list {
+    /** The number of nodes in the list. */
+    size_t size;
+
+    /** The capacity of the list that has been allocated. */
+    size_t capacity;
+
+    /** The nodes in the list. */
+    struct pm_node **nodes;
+} pm_node_list_t;
+
+/**
+ * This enum represents every type of node in the Ruby syntax tree.
+ */
+enum pm_node_type {
+<%- nodes.each_with_index do |node, index| -%>
+    /** <%= node.name %> */
+    <%= node.type %> = <%= index + 1 %>,
+
+<%- end -%>
+    /** A special kind of node used for compilation. */
+    PM_SCOPE_NODE
+};
+
+/**
+ * This is the type of node embedded in the node struct. We explicitly control
+ * the size of it here to avoid having the variable-width enum.
+ */
+typedef uint16_t pm_node_type_t;
+
+/**
+ * These are the flags embedded in the node struct. We explicitly control the
+ * size of it here to avoid having the variable-width enum.
+ */
+typedef uint16_t pm_node_flags_t;
+
+/**
+ * We store the flags enum in every node in the tree. Some flags are common to
+ * all nodes (the ones listed below). Others are specific to certain node types.
+ */
+static const pm_node_flags_t PM_NODE_FLAG_NEWLINE = 0x1;
+static const pm_node_flags_t PM_NODE_FLAG_STATIC_LITERAL = 0x2;
+
+/**
+ * Cast the type to an enum to allow the compiler to provide exhaustiveness
+ * checking.
+ */
+#define PM_NODE_TYPE(node) ((enum pm_node_type) (node)->type)
+
+/**
+ * Return true if the type of the given node matches the given type.
+ */
+#define PM_NODE_TYPE_P(node, type) (PM_NODE_TYPE(node) == (type))
+
+/**
+ * Return true if the given flag is set on the given node.
+ */
+#define PM_NODE_FLAG_P(node, flag) ((((pm_node_t *)(node))->flags & (flag)) != 0)
+
+/**
+ * This is the base structure that represents a node in the syntax tree. It is
+ * embedded into every node type.
+ */
+typedef struct pm_node {
+    /**
+     * This represents the type of the node. It somewhat maps to the nodes that
+     * existed in the original grammar and ripper, but it's not a 1:1 mapping.
+     */
+    pm_node_type_t type;
+
+    /**
+     * This represents any flags on the node. Some are common to all nodes, and
+     * some are specific to the type of node.
+     */
+    pm_node_flags_t flags;
+
+    /**
+     * The unique identifier for this node, which is deterministic based on the
+     * source. It is used to identify unique nodes across parses.
+     */
+    uint32_t node_id;
+
+    /**
+     * This is the location of the node in the source. It's a range of bytes
+     * containing a start and an end.
+     */
+    pm_location_t location;
+} pm_node_t;
+<%- nodes.each do |node| -%>
+
+/**
+ * <%= node.name %>
+ *
+<%- node.each_comment_line do |line| -%>
+ *<%= line %>
+<%- end -%>
+ *
+ * Type: ::<%= node.type %>
+<% if (node_flags = node.flags) %>
+ * Flags (#pm_<%= node_flags.human %>):
+<%- node_flags.values.each do |value| -%>
+ * * ::PM_<%= node_flags.human.upcase %>_<%= value.name %>
+<%- end -%>
+<%- end -%>
+ *
+ * @extends pm_node_t
+ */
+typedef struct pm_<%= node.human %> {
+    /** The embedded base node. */
+    pm_node_t base;
+
+<%- node.fields.each do |field| -%>
+
+    /**
+     * <%= node.name %>#<%= field.name %>
+    <%- if field.comment -%>
+     *
+    <%- field.each_comment_line do |line| -%>
+     *<%= line %>
+    <%- end -%>
+    <%- end -%>
+     */
+    <%= case field
+    when Prism::Template::NodeField, Prism::Template::OptionalNodeField then "struct #{field.c_type} *#{field.name}"
+    when Prism::Template::NodeListField then "struct pm_node_list #{field.name}"
+    when Prism::Template::ConstantField, Prism::Template::OptionalConstantField then "pm_constant_id_t #{field.name}"
+    when Prism::Template::ConstantListField then "pm_constant_id_list_t #{field.name}"
+    when Prism::Template::StringField then "pm_string_t #{field.name}"
+    when Prism::Template::LocationField, Prism::Template::OptionalLocationField then "pm_location_t #{field.name}"
+    when Prism::Template::UInt8Field then "uint8_t #{field.name}"
+    when Prism::Template::UInt32Field then "uint32_t #{field.name}"
+    when Prism::Template::IntegerField then "pm_integer_t #{field.name}"
+    when Prism::Template::DoubleField then "double #{field.name}"
+    else raise field.class.name
+    end
+    %>;
+<%- end -%>
+} pm_<%= node.human %>_t;
+<%- end -%>
+<%- flags.each do |flag| -%>
+
+/**
+ * <%= flag.comment %>
+ */
+typedef enum pm_<%= flag.human %> {
+    <%- flag.values.each_with_index do |value, index| -%>
+<%= "\n" if index > 0 -%>
+    /** <%= value.comment %> */
+    PM_<%= flag.human.upcase %>_<%= value.name %> = <%= 1 << (index + Prism::Template::COMMON_FLAGS_COUNT) %>,
+    <%- end -%>
+} pm_<%= flag.human %>_t;
+<%- end -%>
+
+/**
+ * When we're serializing to Java, we want to skip serializing the location
+ * fields as they won't be used by JRuby or TruffleRuby. This boolean allows us
+ * to specify that through the environment. It will never be true except for in
+ * those build systems.
+ */
+#define PRISM_SERIALIZE_ONLY_SEMANTICS_FIELDS <%= Prism::Template::SERIALIZE_ONLY_SEMANTICS_FIELDS ? 1 : 0 %>
+
+#endif
diff --git a/prism/templates/include/prism/diagnostic.h.erb b/prism/templates/include/prism/diagnostic.h.erb
new file mode 100644
index 00000000000000..07bbc8fae79264
--- /dev/null
+++ b/prism/templates/include/prism/diagnostic.h.erb
@@ -0,0 +1,130 @@
+/**
+ * @file diagnostic.h
+ *
+ * A list of diagnostics generated during parsing.
+ */
+#ifndef PRISM_DIAGNOSTIC_H
+#define PRISM_DIAGNOSTIC_H
+
+#include "prism/ast.h"
+#include "prism/defines.h"
+#include "prism/util/pm_list.h"
+
+#include <stdbool.h>
+#include <stdlib.h>
+#include <assert.h>
+
+/**
+ * The diagnostic IDs of all of the diagnostics, used to communicate the types
+ * of errors between the parser and the user.
+ */
+typedef enum {
+    // These are the error diagnostics.
+    <%- errors.each do |error| -%>
+    PM_ERR_<%= error.name %>,
+    <%- end -%>
+
+    // These are the warning diagnostics.
+    <%- warnings.each do |warning| -%>
+    PM_WARN_<%= warning.name %>,
+    <%- end -%>
+} pm_diagnostic_id_t;
+
+/**
+ * This struct represents a diagnostic generated during parsing.
+ *
+ * @extends pm_list_node_t
+ */
+typedef struct {
+    /** The embedded base node. */
+    pm_list_node_t node;
+
+    /** The location of the diagnostic in the source. */
+    pm_location_t location;
+
+    /** The ID of the diagnostic. */
+    pm_diagnostic_id_t diag_id;
+
+    /** The message associated with the diagnostic. */
+    const char *message;
+
+    /**
+     * Whether or not the memory related to the message of this diagnostic is
+     * owned by this diagnostic. If it is, it needs to be freed when the
+     * diagnostic is freed.
+     */
+    bool owned;
+
+    /**
+     * The level of the diagnostic, see `pm_error_level_t` and
+     * `pm_warning_level_t` for possible values.
+     */
+    uint8_t level;
+} pm_diagnostic_t;
+
+/**
+ * The levels of errors generated during parsing.
+ */
+typedef enum {
+    /** For errors that should raise a syntax error. */
+    PM_ERROR_LEVEL_SYNTAX = 0,
+
+    /** For errors that should raise an argument error. */
+    PM_ERROR_LEVEL_ARGUMENT = 1,
+
+    /** For errors that should raise a load error. */
+    PM_ERROR_LEVEL_LOAD = 2
+} pm_error_level_t;
+
+/**
+ * The levels of warnings generated during parsing.
+ */
+typedef enum {
+    /** For warnings which should be emitted if $VERBOSE != nil. */
+    PM_WARNING_LEVEL_DEFAULT = 0,
+
+    /** For warnings which should be emitted if $VERBOSE == true. */
+    PM_WARNING_LEVEL_VERBOSE = 1
+} pm_warning_level_t;
+
+/**
+ * Get the human-readable name of the given diagnostic ID.
+ *
+ * @param diag_id The diagnostic ID.
+ * @return The human-readable name of the diagnostic ID.
+ */
+const char * pm_diagnostic_id_human(pm_diagnostic_id_t diag_id);
+
+/**
+ * Append a diagnostic to the given list of diagnostics that is using shared
+ * memory for its message.
+ *
+ * @param list The list to append to.
+ * @param start The start of the diagnostic.
+ * @param end The end of the diagnostic.
+ * @param diag_id The diagnostic ID.
+ * @return Whether the diagnostic was successfully appended.
+ */
+bool pm_diagnostic_list_append(pm_list_t *list, const uint8_t *start, const uint8_t *end, pm_diagnostic_id_t diag_id);
+
+/**
+ * Append a diagnostic to the given list of diagnostics that is using a format
+ * string for its message.
+ *
+ * @param list The list to append to.
+ * @param start The start of the diagnostic.
+ * @param end The end of the diagnostic.
+ * @param diag_id The diagnostic ID.
+ * @param ... The arguments to the format string for the message.
+ * @return Whether the diagnostic was successfully appended.
+ */
+bool pm_diagnostic_list_append_format(pm_list_t *list, const uint8_t *start, const uint8_t *end, pm_diagnostic_id_t diag_id, ...);
+
+/**
+ * Deallocate the internal state of the given diagnostic list.
+ *
+ * @param list The list to deallocate.
+ */
+void pm_diagnostic_list_free(pm_list_t *list);
+
+#endif
diff --git a/prism/templates/lib/prism/compiler.rb.erb b/prism/templates/lib/prism/compiler.rb.erb
new file mode 100644
index 00000000000000..9102025c20bdbe
--- /dev/null
+++ b/prism/templates/lib/prism/compiler.rb.erb
@@ -0,0 +1,43 @@
+module Prism
+  # A compiler is a visitor that returns the value of each node as it visits.
+  # This is as opposed to a visitor which will only walk the tree. This can be
+  # useful when you are trying to compile a tree into a different format.
+  #
+  # For example, to build a representation of the tree as s-expressions, you
+  # could write:
+  #
+  #     class SExpressions < Prism::Compiler
+  #       def visit_arguments_node(node) = [:arguments, super]
+  #       def visit_call_node(node) = [:call, super]
+  #       def visit_integer_node(node) = [:integer]
+  #       def visit_program_node(node) = [:program, super]
+  #     end
+  #
+  #     Prism.parse("1 + 2").value.accept(SExpressions.new)
+  #     # => [:program, [[[:call, [[:integer], [:arguments, [[:integer]]]]]]]]
+  #
+  class Compiler < Visitor
+    # Visit an individual node.
+    def visit(node)
+      node&.accept(self)
+    end
+
+    # Visit a list of nodes.
+    def visit_all(nodes)
+      nodes.map { |node| node&.accept(self) }
+    end
+
+    # Visit the child nodes of the given node.
+    def visit_child_nodes(node)
+      node.compact_child_nodes.map { |node| node.accept(self) }
+    end
+
+    <%- nodes.each_with_index do |node, index| -%>
+<%= "\n" if index != 0 -%>
+    # Compile a <%= node.name %> node
+    def visit_<%= node.human %>(node)
+      node.compact_child_nodes.map { |node| node.accept(self) }
+    end
+    <%- end -%>
+  end
+end
diff --git a/prism/templates/lib/prism/dispatcher.rb.erb b/prism/templates/lib/prism/dispatcher.rb.erb
new file mode 100644
index 00000000000000..52478451c99b9d
--- /dev/null
+++ b/prism/templates/lib/prism/dispatcher.rb.erb
@@ -0,0 +1,103 @@
+module Prism
+  # The dispatcher class fires events for nodes that are found while walking an
+  # AST to all registered listeners. It's useful for performing different types
+  # of analysis on the AST while only having to walk the tree once.
+  #
+  # To use the dispatcher, you would first instantiate it and register listeners
+  # for the events you're interested in:
+  #
+  #     class OctalListener
+  #       def on_integer_node_enter(node)
+  #         if node.octal? && !node.slice.start_with?("0o")
+  #           warn("Octal integers should be written with the 0o prefix")
+  #         end
+  #       end
+  #     end
+  #
+  #     listener = OctalListener.new
+  #     dispatcher = Prism::Dispatcher.new
+  #     dispatcher.register(listener, :on_integer_node_enter)
+  #
+  # Then, you can walk any number of trees and dispatch events to the listeners:
+  #
+  #     result = Prism.parse("001 + 002 + 003")
+  #     dispatcher.dispatch(result.value)
+  #
+  # Optionally, you can also use `#dispatch_once` to dispatch enter and leave
+  # events for a single node without recursing further down the tree. This can
+  # be useful in circumstances where you want to reuse the listeners you already
+  # have registers but want to stop walking the tree at a certain point.
+  #
+  #     integer = result.value.statements.body.first.receiver.receiver
+  #     dispatcher.dispatch_once(integer)
+  #
+  class Dispatcher < Visitor
+    # attr_reader listeners: Hash[Symbol, Array[Listener]]
+    attr_reader :listeners
+
+    # Initialize a new dispatcher.
+    def initialize
+      @listeners = {}
+    end
+
+    # Register a listener for one or more events.
+    #
+    # def register: (Listener, *Symbol) -> void
+    def register(listener, *events)
+      register_events(listener, events)
+    end
+
+    # Register all public methods of a listener that match the pattern
+    # `on_<node_name>_(enter|leave)`.
+    #
+    # def register_public_methods: (Listener) -> void
+    def register_public_methods(listener)
+      register_events(listener, listener.public_methods(false).grep(/\Aon_.+_(?:enter|leave)\z/))
+    end
+
+    # Register a listener for the given events.
+    private def register_events(listener, events)
+      events.each { |event| (listeners[event] ||= []) << listener }
+    end
+
+    # Walks `root` dispatching events to all registered listeners.
+    #
+    # def dispatch: (Node) -> void
+    alias dispatch visit
+
+    # Dispatches a single event for `node` to all registered listeners.
+    #
+    # def dispatch_once: (Node) -> void
+    def dispatch_once(node)
+      node.accept(DispatchOnce.new(listeners))
+    end
+    <%- nodes.each do |node| -%>
+
+    # Dispatch enter and leave events for <%= node.name %> nodes and continue
+    # walking the tree.
+    def visit_<%= node.human %>(node)
+      listeners[:on_<%= node.human %>_enter]&.each { |listener| listener.on_<%= node.human %>_enter(node) }
+      super
+      listeners[:on_<%= node.human %>_leave]&.each { |listener| listener.on_<%= node.human %>_leave(node) }
+    end
+    <%- end -%>
+
+    class DispatchOnce < Visitor # :nodoc:
+      attr_reader :listeners
+
+      def initialize(listeners)
+        @listeners = listeners
+      end
+      <%- nodes.each do |node| -%>
+
+      # Dispatch enter and leave events for <%= node.name %> nodes.
+      def visit_<%= node.human %>(node)
+        listeners[:on_<%= node.human %>_enter]&.each { |listener| listener.on_<%= node.human %>_enter(node) }
+        listeners[:on_<%= node.human %>_leave]&.each { |listener| listener.on_<%= node.human %>_leave(node) }
+      end
+      <%- end -%>
+    end
+
+    private_constant :DispatchOnce
+  end
+end
diff --git a/prism/templates/lib/prism/dot_visitor.rb.erb b/prism/templates/lib/prism/dot_visitor.rb.erb
new file mode 100644
index 00000000000000..cd2998fe61b9d6
--- /dev/null
+++ b/prism/templates/lib/prism/dot_visitor.rb.erb
@@ -0,0 +1,189 @@
+require "cgi/escape"
+require "cgi/util" unless defined?(CGI::EscapeExt)
+
+module Prism
+  # This visitor provides the ability to call Node#to_dot, which converts a
+  # subtree into a graphviz dot graph.
+  class DotVisitor < Visitor
+    class Field # :nodoc:
+      attr_reader :name, :value, :port
+
+      def initialize(name, value, port)
+        @name = name
+        @value = value
+        @port = port
+      end
+
+      def to_dot
+        if port
+          "<tr><td align=\"left\" colspan=\"2\" port=\"#{name}\">#{name}</td></tr>"
+        else
+          "<tr><td align=\"left\">#{name}</td><td>#{CGI.escapeHTML(value || raise)}</td></tr>"
+        end
+      end
+    end
+
+    class Table # :nodoc:
+      attr_reader :name, :fields
+
+      def initialize(name)
+        @name = name
+        @fields = []
+      end
+
+      def field(name, value = nil, port: false)
+        fields << Field.new(name, value, port)
+      end
+
+      def to_dot
+        dot = <<~DOT
+          <table border="0" cellborder="1" cellspacing="0" cellpadding="4">
+            <tr><td colspan="2"><b>#{name}</b></td></tr>
+        DOT
+
+        if fields.any?
+          "#{dot}  #{fields.map(&:to_dot).join("\n  ")}\n</table>"
+        else
+          "#{dot}</table>"
+        end
+      end
+    end
+
+    class Digraph # :nodoc:
+      attr_reader :nodes, :waypoints, :edges
+
+      def initialize
+        @nodes = []
+        @waypoints = []
+        @edges = []
+      end
+
+      def node(value)
+        nodes << value
+      end
+
+      def waypoint(value)
+        waypoints << value
+      end
+
+      def edge(value)
+        edges << value
+      end
+
+      def to_dot
+        <<~DOT
+          digraph "Prism" {
+            node [
+              fontname=\"Courier New\"
+              shape=plain
+              style=filled
+              fillcolor=gray95
+            ];
+
+            #{nodes.map { |node| node.gsub(/\n/, "\n  ") }.join("\n  ")}
+            node [shape=point];
+            #{waypoints.join("\n  ")}
+
+            #{edges.join("\n  ")}
+          }
+        DOT
+      end
+    end
+
+    private_constant :Field, :Table, :Digraph
+
+    # The digraph that is being built.
+    attr_reader :digraph
+
+    # Initialize a new dot visitor.
+    def initialize
+      @digraph = Digraph.new
+    end
+
+    # Convert this visitor into a graphviz dot graph string.
+    def to_dot
+      digraph.to_dot
+    end
+    <%- nodes.each do |node| -%>
+
+    # Visit a <%= node.name %> node.
+    def visit_<%= node.human %>(node)
+      table = Table.new("<%= node.name %>")
+      id = node_id(node)
+      <%- if (node_flags = node.flags) -%>
+
+      # flags
+      table.field("flags", <%= node_flags.human %>_inspect(node))
+      <%- end -%>
+      <%- node.fields.each do |field| -%>
+
+      # <%= field.name %>
+      <%- case field -%>
+      <%- when Prism::Template::NodeField -%>
+      table.field("<%= field.name %>", port: true)
+      digraph.edge("#{id}:<%= field.name %> -> #{node_id(node.<%= field.name %>)};")
+      <%- when Prism::Template::OptionalNodeField -%>
+      unless (<%= field.name %> = node.<%= field.name %>).nil?
+        table.field("<%= field.name %>", port: true)
+        digraph.edge("#{id}:<%= field.name %> -> #{node_id(<%= field.name %>)};")
+      end
+      <%- when Prism::Template::NodeListField -%>
+      if node.<%= field.name %>.any?
+        table.field("<%= field.name %>", port: true)
+
+        waypoint = "#{id}_<%= field.name %>"
+        digraph.waypoint("#{waypoint};")
+
+        digraph.edge("#{id}:<%= field.name %> -> #{waypoint};")
+        node.<%= field.name %>.each { |child| digraph.edge("#{waypoint} -> #{node_id(child)};") }
+      else
+        table.field("<%= field.name %>", "[]")
+      end
+      <%- when Prism::Template::StringField, Prism::Template::ConstantField, Prism::Template::OptionalConstantField, Prism::Template::UInt8Field, Prism::Template::UInt32Field, Prism::Template::ConstantListField, Prism::Template::IntegerField, Prism::Template::DoubleField -%>
+      table.field("<%= field.name %>", node.<%= field.name %>.inspect)
+      <%- when Prism::Template::LocationField -%>
+      table.field("<%= field.name %>", location_inspect(node.<%= field.name %>))
+      <%- when Prism::Template::OptionalLocationField -%>
+      unless (<%= field.name %> = node.<%= field.name %>).nil?
+        table.field("<%= field.name %>", location_inspect(<%= field.name %>))
+      end
+      <%- else -%>
+      <%- raise -%>
+      <%- end -%>
+      <%- end -%>
+
+      digraph.nodes << <<~DOT
+        #{id} [
+          label=<#{table.to_dot.gsub(/\n/, "\n  ")}>
+        ];
+      DOT
+
+      super
+    end
+    <%- end -%>
+
+    private
+
+    # Generate a unique node ID for a node throughout the digraph.
+    def node_id(node)
+      "Node_#{node.object_id}"
+    end
+
+    # Inspect a location to display the start and end line and column numbers.
+    def location_inspect(location)
+      "(#{location.start_line},#{location.start_column})-(#{location.end_line},#{location.end_column})"
+    end
+    <%- flags.each do |flag| -%>
+
+    # Inspect a node that has <%= flag.human %> flags to display the flags as a
+    # comma-separated list.
+    def <%= flag.human %>_inspect(node)
+      flags = [] #: Array[String]
+      <%- flag.values.each do |value| -%>
+      flags << "<%= value.name.downcase %>" if node.<%= value.name.downcase %>?
+      <%- end -%>
+      flags.join(", ")
+    end
+    <%- end -%>
+  end
+end
diff --git a/prism/templates/lib/prism/dsl.rb.erb b/prism/templates/lib/prism/dsl.rb.erb
new file mode 100644
index 00000000000000..e16ebb71101921
--- /dev/null
+++ b/prism/templates/lib/prism/dsl.rb.erb
@@ -0,0 +1,133 @@
+module Prism
+  # The DSL module provides a set of methods that can be used to create prism
+  # nodes in a more concise manner. For example, instead of writing:
+  #
+  #     source = Prism::Source.for("[1]")
+  #
+  #     Prism::ArrayNode.new(
+  #       source,
+  #       0,
+  #       Prism::Location.new(source, 0, 3),
+  #       0,
+  #       [
+  #         Prism::IntegerNode.new(
+  #           source,
+  #           0,
+  #           Prism::Location.new(source, 1, 1),
+  #           Prism::IntegerBaseFlags::DECIMAL,
+  #           1
+  #         )
+  #       ],
+  #       Prism::Location.new(source, 0, 1),
+  #       Prism::Location.new(source, 2, 1)
+  #     )
+  #
+  # you could instead write:
+  #
+  #     class Builder
+  #       include Prism::DSL
+  #
+  #       attr_reader :default_source
+  #
+  #       def initialize
+  #         @default_source = source("[1]")
+  #       end
+  #
+  #       def build
+  #         array_node(
+  #           location: location(start_offset: 0, length: 3),
+  #           elements: [
+  #             integer_node(
+  #               location: location(start_offset: 1, length: 1),
+  #               flags: integer_base_flag(:decimal),
+  #               value: 1
+  #             )
+  #           ],
+  #           opening_loc: location(start_offset: 0, length: 1),
+  #           closing_loc: location(start_offset: 2, length: 1)
+  #         )
+  #       end
+  #     end
+  #
+  # This is mostly helpful in the context of generating trees programmatically.
+  module DSL
+    # Provide all of these methods as module methods as well, to allow for
+    # building nodes like Prism::DSL.nil_node.
+    extend self
+
+    # Create a new Source object.
+    def source(string)
+      Source.for(string)
+    end
+
+    # Create a new Location object.
+    def location(source: default_source, start_offset: 0, length: 0)
+      Location.new(source, start_offset, length)
+    end
+    <%- nodes.each do |node| -%>
+
+    # Create a new <%= node.name %> node.
+    def <%= node.human %>(<%= ["source: default_source", "node_id: 0", "location: default_location", "flags: 0", *node.fields.map { |field|
+      case field
+      when Prism::Template::NodeField
+        kind = field.specific_kind || field.union_kind&.first
+        if kind.nil?
+          "#{field.name}: default_node(source, location)"
+        else
+          "#{field.name}: #{kind.gsub(/(?<=.)[A-Z]/, "_\\0").downcase}(source: source)"
+        end
+      when Prism::Template::ConstantField
+        "#{field.name}: :\"\""
+      when Prism::Template::OptionalNodeField, Prism::Template::OptionalConstantField, Prism::Template::OptionalLocationField
+        "#{field.name}: nil"
+      when Prism::Template::NodeListField, Prism::Template::ConstantListField
+        "#{field.name}: []"
+      when Prism::Template::StringField
+        "#{field.name}: \"\""
+      when Prism::Template::LocationField
+        "#{field.name}: location"
+      when Prism::Template::UInt8Field, Prism::Template::UInt32Field, Prism::Template::IntegerField
+        "#{field.name}: 0"
+      when Prism::Template::DoubleField
+        "#{field.name}: 0.0"
+      else
+        raise
+      end
+    }].join(", ") %>)
+      <%= node.name %>.new(<%= ["source", "node_id", "location", "flags", *node.fields.map(&:name)].join(", ") %>)
+    end
+    <%- end -%>
+    <%- flags.each do |flag| -%>
+
+    # Retrieve the value of one of the <%= flag.name %> flags.
+    def <%= flag.human.chomp("s") %>(name)
+      case name
+      <%- flag.values.each do |value| -%>
+      when :<%= value.name.downcase %> then <%= flag.name %>::<%= value.name %>
+      <%- end -%>
+      else Kernel.raise ArgumentError, "invalid <%= flag.name %> flag: #{name.inspect}"
+      end
+    end
+    <%- end -%>
+
+    private
+
+    # The default source object that gets attached to nodes and locations if no
+    # source is specified.
+    def default_source
+      Source.for("")
+    end
+
+    # The default location object that gets attached to nodes if no location is
+    # specified, which uses the given source.
+    def default_location
+      Location.new(default_source, 0, 0)
+    end
+
+    # The default node that gets attached to nodes if no node is specified for a
+    # required node field.
+    def default_node(source, location)
+      MissingNode.new(source, -1, location, 0)
+    end
+  end
+end
diff --git a/prism/templates/lib/prism/inspect_visitor.rb.erb b/prism/templates/lib/prism/inspect_visitor.rb.erb
new file mode 100644
index 00000000000000..3cfe615d850934
--- /dev/null
+++ b/prism/templates/lib/prism/inspect_visitor.rb.erb
@@ -0,0 +1,131 @@
+module Prism
+  # This visitor is responsible for composing the strings that get returned by
+  # the various #inspect methods defined on each of the nodes.
+  class InspectVisitor < Visitor
+    # Most of the time, we can simply pass down the indent to the next node.
+    # However, when we are inside a list we want some extra special formatting
+    # when we hit an element in that list. In this case, we have a special
+    # command that replaces the subsequent indent with the given value.
+    class Replace # :nodoc:
+      attr_reader :value
+
+      def initialize(value)
+        @value = value
+      end
+    end
+
+    private_constant :Replace
+
+    # The current prefix string.
+    attr_reader :indent
+
+    # The list of commands that we need to execute in order to compose the
+    # final string.
+    attr_reader :commands
+
+    # Initializes a new instance of the InspectVisitor.
+    def initialize(indent = +"")
+      @indent = indent
+      @commands = []
+    end
+
+    # Compose an inspect string for the given node.
+    def self.compose(node)
+      visitor = new
+      node.accept(visitor)
+      visitor.compose
+    end
+
+    # Compose the final string.
+    def compose
+      buffer = +""
+      replace = nil
+
+      until commands.empty?
+        # @type var command: String | node | Replace
+        # @type var indent: String
+        command, indent = *commands.shift
+
+        case command
+        when String
+          buffer << (replace || indent)
+          buffer << command
+          replace = nil
+        when Node
+          visitor = InspectVisitor.new(indent)
+          command.accept(visitor)
+          @commands = [*visitor.commands, *@commands]
+        when Replace
+          replace = command.value
+        else
+          raise "Unknown command: #{command.inspect}"
+        end
+      end
+
+      buffer
+    end
+    <%- nodes.each do |node| -%>
+
+    # Inspect a <%= node.name %> node.
+    def visit_<%= node.human %>(node)
+      commands << [inspect_node(<%= node.name.inspect %>, node), indent]
+      <%- (fields = [node.flags || Prism::Template::Flags.empty, *node.fields]).each_with_index do |field, index| -%>
+      <%- pointer = index == fields.length - 1 ? "└── " : "├── " -%>
+      <%- preadd = index == fields.length - 1 ? "    " : "│   " -%>
+      <%- case field -%>
+      <%- when Prism::Template::Flags -%>
+      flags = [("newline" if node.newline?), ("static_literal" if node.static_literal?), <%= field.values.map { |value| "(\"#{value.name.downcase}\" if node.#{value.name.downcase}?)" }.join(", ") %>].compact
+      commands << ["<%= pointer %>flags: #{flags.empty? ? "∅" : flags.join(", ")}\n", indent]
+      <%- when Prism::Template::NodeListField -%>
+      commands << ["<%= pointer %><%= field.name %>: (length: #{(<%= field.name %> = node.<%= field.name %>).length})\n", indent]
+      if <%= field.name %>.any?
+        <%= field.name %>[0...-1].each do |child|
+          commands << [Replace.new("#{indent}<%= preadd %>├── "), indent]
+          commands << [child, "#{indent}<%= preadd %>│   "]
+        end
+        commands << [Replace.new("#{indent}<%= preadd %>└── "), indent]
+        commands << [<%= field.name %>[-1], "#{indent}<%= preadd %>    "]
+      end
+      <%- when Prism::Template::NodeField -%>
+      commands << ["<%= pointer %><%= field.name %>:\n", indent]
+      commands << [node.<%= field.name %>, "#{indent}<%= preadd %>"]
+      <%- when Prism::Template::OptionalNodeField -%>
+      if (<%= field.name %> = node.<%= field.name %>).nil?
+        commands << ["<%= pointer %><%= field.name %>: ∅\n", indent]
+      else
+        commands << ["<%= pointer %><%= field.name %>:\n", indent]
+        commands << [<%= field.name %>, "#{indent}<%= preadd %>"]
+      end
+      <%- when Prism::Template::ConstantField, Prism::Template::ConstantListField, Prism::Template::StringField, Prism::Template::UInt8Field, Prism::Template::UInt32Field, Prism::Template::IntegerField, Prism::Template::DoubleField -%>
+      commands << ["<%= pointer %><%= field.name %>: #{node.<%= field.name %>.inspect}\n", indent]
+      <%- when Prism::Template::OptionalConstantField -%>
+      if (<%= field.name %> = node.<%= field.name %>).nil?
+        commands << ["<%= pointer %><%= field.name %>: ∅\n", indent]
+      else
+        commands << ["<%= pointer %><%= field.name %>: #{<%= field.name %>.inspect}\n", indent]
+      end
+      <%- when Prism::Template::LocationField, Prism::Template::OptionalLocationField -%>
+      commands << ["<%= pointer %><%= field.name %>: #{inspect_location(node.<%= field.name %>)}\n", indent]
+      <%- end -%>
+      <%- end -%>
+    end
+    <%- end -%>
+
+    private
+
+    # Compose a header for the given node.
+    def inspect_node(name, node)
+      location = node.location
+      "@ #{name} (location: (#{location.start_line},#{location.start_column})-(#{location.end_line},#{location.end_column}))\n"
+    end
+
+    # Compose a string representing the given inner location field.
+    def inspect_location(location)
+      if location
+        "(#{location.start_line},#{location.start_column})-(#{location.end_line},#{location.end_column}) = #{location.slice.inspect}"
+      else
+        "∅"
+      end
+    end
+  end
+end
diff --git a/prism/templates/lib/prism/mutation_compiler.rb.erb b/prism/templates/lib/prism/mutation_compiler.rb.erb
new file mode 100644
index 00000000000000..565ee4e315d47d
--- /dev/null
+++ b/prism/templates/lib/prism/mutation_compiler.rb.erb
@@ -0,0 +1,19 @@
+module Prism
+  # This visitor walks through the tree and copies each node as it is being
+  # visited. This is useful for consumers that want to mutate the tree, as you
+  # can change subtrees in place without effecting the rest of the tree.
+  class MutationCompiler < Compiler
+    <%- nodes.each_with_index do |node, index| -%>
+<%= "\n" if index != 0 -%>
+    # Copy a <%= node.name %> node
+    def visit_<%= node.human %>(node)
+      <%- fields = node.fields.select { |field| [Prism::Template::NodeField, Prism::Template::OptionalNodeField, Prism::Template::NodeListField].include?(field.class) } -%>
+      <%- if fields.any? -%>
+      node.copy(<%= fields.map { |field| "#{field.name}: #{field.is_a?(Prism::Template::NodeListField) ? "visit_all" : "visit"}(node.#{field.name})" }.join(", ") %>)
+      <%- else -%>
+      node.copy
+      <%- end -%>
+    end
+    <%- end -%>
+  end
+end
diff --git a/prism/templates/lib/prism/node.rb.erb b/prism/templates/lib/prism/node.rb.erb
new file mode 100644
index 00000000000000..ceee2b0ffec820
--- /dev/null
+++ b/prism/templates/lib/prism/node.rb.erb
@@ -0,0 +1,515 @@
+module Prism
+  # This represents a node in the tree. It is the parent class of all of the
+  # various node types.
+  class Node
+    # A pointer to the source that this node was created from.
+    attr_reader :source
+    private :source
+
+    # A unique identifier for this node. This is used in a very specific
+    # use case where you want to keep around a reference to a node without
+    # having to keep around the syntax tree in memory. This unique identifier
+    # will be consistent across multiple parses of the same source code.
+    attr_reader :node_id
+
+    # Save this node using a saved source so that it can be retrieved later.
+    def save(repository)
+      repository.enter(node_id, :itself)
+    end
+
+    # A Location instance that represents the location of this node in the
+    # source.
+    def location
+      location = @location
+      return location if location.is_a?(Location)
+      @location = Location.new(source, location >> 32, location & 0xFFFFFFFF)
+    end
+
+    # Save the location using a saved source so that it can be retrieved later.
+    def save_location(repository)
+      repository.enter(node_id, :location)
+    end
+
+    # Delegates to the start_line of the associated location object.
+    def start_line
+      location.start_line
+    end
+
+    # Delegates to the end_line of the associated location object.
+    def end_line
+      location.end_line
+    end
+
+    # The start offset of the node in the source. This method is effectively a
+    # delegate method to the location object.
+    def start_offset
+      location = @location
+      location.is_a?(Location) ? location.start_offset : location >> 32
+    end
+
+    # The end offset of the node in the source. This method is effectively a
+    # delegate method to the location object.
+    def end_offset
+      location = @location
+      location.is_a?(Location) ? location.end_offset : ((location >> 32) + (location & 0xFFFFFFFF))
+    end
+
+    # Delegates to the start_character_offset of the associated location object.
+    def start_character_offset
+      location.start_character_offset
+    end
+
+    # Delegates to the end_character_offset of the associated location object.
+    def end_character_offset
+      location.end_character_offset
+    end
+
+    # Delegates to the cached_start_code_units_offset of the associated location
+    # object.
+    def cached_start_code_units_offset(cache)
+      location.cached_start_code_units_offset(cache)
+    end
+
+    # Delegates to the cached_end_code_units_offset of the associated location
+    # object.
+    def cached_end_code_units_offset(cache)
+      location.cached_end_code_units_offset(cache)
+    end
+
+    # Delegates to the start_column of the associated location object.
+    def start_column
+      location.start_column
+    end
+
+    # Delegates to the end_column of the associated location object.
+    def end_column
+      location.end_column
+    end
+
+    # Delegates to the start_character_column of the associated location object.
+    def start_character_column
+      location.start_character_column
+    end
+
+    # Delegates to the end_character_column of the associated location object.
+    def end_character_column
+      location.end_character_column
+    end
+
+    # Delegates to the cached_start_code_units_column of the associated location
+    # object.
+    def cached_start_code_units_column(cache)
+      location.cached_start_code_units_column(cache)
+    end
+
+    # Delegates to the cached_end_code_units_column of the associated location
+    # object.
+    def cached_end_code_units_column(cache)
+      location.cached_end_code_units_column(cache)
+    end
+
+    # Delegates to the leading_comments of the associated location object.
+    def leading_comments
+      location.leading_comments
+    end
+
+    # Delegates to the trailing_comments of the associated location object.
+    def trailing_comments
+      location.trailing_comments
+    end
+
+    # Delegates to the comments of the associated location object.
+    def comments
+      location.comments
+    end
+
+    # Returns all of the lines of the source code associated with this node.
+    def source_lines
+      location.source_lines
+    end
+
+    # An alias for source_lines, used to mimic the API from
+    # RubyVM::AbstractSyntaxTree to make it easier to migrate.
+    alias script_lines source_lines
+
+    # Slice the location of the node from the source.
+    def slice
+      location.slice
+    end
+
+    # Slice the location of the node from the source, starting at the beginning
+    # of the line that the location starts on, ending at the end of the line
+    # that the location ends on.
+    def slice_lines
+      location.slice_lines
+    end
+
+    # An bitset of flags for this node. There are certain flags that are common
+    # for all nodes, and then some nodes have specific flags.
+    attr_reader :flags
+    protected :flags
+
+    # Returns true if the node has the newline flag set.
+    def newline?
+      flags.anybits?(NodeFlags::NEWLINE)
+    end
+
+    # Returns true if the node has the static literal flag set.
+    def static_literal?
+      flags.anybits?(NodeFlags::STATIC_LITERAL)
+    end
+
+    # Similar to inspect, but respects the current level of indentation given by
+    # the pretty print object.
+    def pretty_print(q)
+      q.seplist(inspect.chomp.each_line, -> { q.breakable }) do |line|
+        q.text(line.chomp)
+      end
+      q.current_group.break
+    end
+
+    # Convert this node into a graphviz dot graph string.
+    def to_dot
+      # @type self: node
+      DotVisitor.new.tap { |visitor| accept(visitor) }.to_dot
+    end
+
+    # Returns a list of nodes that are descendants of this node that contain the
+    # given line and column. This is useful for locating a node that is selected
+    # based on the line and column of the source code.
+    #
+    # Important to note is that the column given to this method should be in
+    # bytes, as opposed to characters or code units.
+    def tunnel(line, column)
+      queue = [self] #: Array[Prism::node]
+      result = [] #: Array[Prism::node]
+
+      while (node = queue.shift)
+        result << node
+
+        node.compact_child_nodes.each do |child_node|
+          child_location = child_node.location
+
+          start_line = child_location.start_line
+          end_line = child_location.end_line
+
+          if start_line == end_line
+            if line == start_line && column >= child_location.start_column && column < child_location.end_column
+              queue << child_node
+              break
+            end
+          elsif (line == start_line && column >= child_location.start_column) || (line == end_line && column < child_location.end_column)
+            queue << child_node
+            break
+          elsif line > start_line && line < end_line
+            queue << child_node
+            break
+          end
+        end
+      end
+
+      result
+    end
+
+    # Returns the first node that matches the given block when visited in a
+    # depth-first search. This is useful for finding a node that matches a
+    # particular condition.
+    #
+    #     node.breadth_first_search { |node| node.node_id == node_id }
+    #
+    def breadth_first_search(&block)
+      queue = [self] #: Array[Prism::node]
+
+      while (node = queue.shift)
+        return node if yield node
+        queue.concat(node.compact_child_nodes)
+      end
+
+      nil
+    end
+
+    # Returns a list of the fields that exist for this node class. Fields
+    # describe the structure of the node. This kind of reflection is useful for
+    # things like recursively visiting each node _and_ field in the tree.
+    def self.fields
+      # This method should only be called on subclasses of Node, not Node
+      # itself.
+      raise NoMethodError, "undefined method `fields' for #{inspect}" if self == Node
+
+      Reflection.fields_for(self)
+    end
+
+    # --------------------------------------------------------------------------
+    # :section: Node interface
+    # These methods are effectively abstract methods that must be implemented by
+    # the various subclasses of Node. They are here to make it easier to work
+    # with typecheckers.
+    # --------------------------------------------------------------------------
+
+    # Accepts a visitor and calls back into the specialized visit function.
+    def accept(visitor)
+      raise NoMethodError, "undefined method `accept' for #{inspect}"
+    end
+
+    # Returns an array of child nodes, including `nil`s in the place of optional
+    # nodes that were not present.
+    def child_nodes
+      raise NoMethodError, "undefined method `child_nodes' for #{inspect}"
+    end
+
+    alias deconstruct child_nodes
+
+    # Returns an array of child nodes, excluding any `nil`s in the place of
+    # optional nodes that were not present.
+    def compact_child_nodes
+      raise NoMethodError, "undefined method `compact_child_nodes' for #{inspect}"
+    end
+
+    # Returns an array of child nodes and locations that could potentially have
+    # comments attached to them.
+    def comment_targets
+      raise NoMethodError, "undefined method `comment_targets' for #{inspect}"
+    end
+
+    # Returns a string representation of the node.
+    def inspect
+      raise NoMethodError, "undefined method `inspect' for #{inspect}"
+    end
+
+    # Sometimes you want to check an instance of a node against a list of
+    # classes to see what kind of behavior to perform. Usually this is done by
+    # calling `[cls1, cls2].include?(node.class)` or putting the node into a
+    # case statement and doing `case node; when cls1; when cls2; end`. Both of
+    # these approaches are relatively slow because of the constant lookups,
+    # method calls, and/or array allocations.
+    #
+    # Instead, you can call #type, which will return to you a symbol that you
+    # can use for comparison. This is faster than the other approaches because
+    # it uses a single integer comparison, but also because if you're on CRuby
+    # you can take advantage of the fact that case statements with all symbol
+    # keys will use a jump table.
+    def type
+      raise NoMethodError, "undefined method `type' for #{inspect}"
+    end
+
+    # Similar to #type, this method returns a symbol that you can use for
+    # splitting on the type of the node without having to do a long === chain.
+    # Note that like #type, it will still be slower than using == for a single
+    # class, but should be faster in a case statement or an array comparison.
+    def self.type
+      raise NoMethodError, "undefined method `type' for #{inspect}"
+    end
+  end
+  <%- nodes.each do |node| -%>
+
+  <%- node.each_comment_line do |line| -%>
+  #<%= line %>
+  <%- end -%>
+  class <%= node.name -%> < Node
+    # Initialize a new <%= node.name %> node.
+    def initialize(<%= ["source", "node_id", "location", "flags", *node.fields.map(&:name)].join(", ") %>)
+      @source = source
+      @node_id = node_id
+      @location = location
+      @flags = flags
+      <%- node.fields.each do |field| -%>
+      <%- if Prism::Template::CHECK_FIELD_KIND && field.respond_to?(:check_field_kind) -%>
+      raise "<%= node.name %>#<%= field.name %> was of unexpected type:\n#{<%= field.name %>.inspect}" unless <%= field.check_field_kind %>
+      <%- end -%>
+      @<%= field.name %> = <%= field.name %>
+      <%- end -%>
+    end
+
+    # def accept: (Visitor visitor) -> void
+    def accept(visitor)
+      visitor.visit_<%= node.human %>(self)
+    end
+
+    # def child_nodes: () -> Array[Node?]
+    def child_nodes
+      [<%= node.fields.map { |field|
+        case field
+        when Prism::Template::NodeField, Prism::Template::OptionalNodeField then field.name
+        when Prism::Template::NodeListField then "*#{field.name}"
+        end
+      }.compact.join(", ") %>]
+    end
+
+    # def compact_child_nodes: () -> Array[Node]
+    def compact_child_nodes
+      <%- if node.fields.any? { |field| field.is_a?(Prism::Template::OptionalNodeField) } -%>
+      compact = [] #: Array[Prism::node]
+      <%- node.fields.each do |field| -%>
+      <%- case field -%>
+      <%- when Prism::Template::NodeField -%>
+      compact << <%= field.name %>
+      <%- when Prism::Template::OptionalNodeField -%>
+      compact << <%= field.name %> if <%= field.name %>
+      <%- when Prism::Template::NodeListField -%>
+      compact.concat(<%= field.name %>)
+      <%- end -%>
+      <%- end -%>
+      compact
+      <%- else -%>
+      [<%= node.fields.map { |field|
+        case field
+        when Prism::Template::NodeField then field.name
+        when Prism::Template::NodeListField then "*#{field.name}"
+        end
+      }.compact.join(", ") %>]
+      <%- end -%>
+    end
+
+    # def comment_targets: () -> Array[Node | Location]
+    def comment_targets
+      [<%= node.fields.map { |field|
+        case field
+        when Prism::Template::NodeField, Prism::Template::LocationField then field.name
+        when Prism::Template::OptionalNodeField, Prism::Template::NodeListField, Prism::Template::OptionalLocationField then "*#{field.name}"
+        end
+      }.compact.join(", ") %>] #: Array[Prism::node | Location]
+    end
+
+    # def copy: (<%= (["?node_id: Integer", "?location: Location", "?flags: Integer"] + node.fields.map { |field| "?#{field.name}: #{field.rbs_class}" }).join(", ") %>) -> <%= node.name %>
+    def copy(<%= (["node_id", "location", "flags"] + node.fields.map(&:name)).map { |field| "#{field}: self.#{field}" }.join(", ") %>)
+      <%= node.name %>.new(<%= ["source", "node_id", "location", "flags", *node.fields.map(&:name)].join(", ") %>)
+    end
+
+    # def deconstruct: () -> Array[Node?]
+    alias deconstruct child_nodes
+
+    # def deconstruct_keys: (Array[Symbol] keys) -> { <%= (["node_id: Integer", "location: Location"] + node.fields.map { |field| "#{field.name}: #{field.rbs_class}" }).join(", ") %> }
+    def deconstruct_keys(keys)
+      { <%= (["node_id: node_id", "location: location"] + node.fields.map { |field| "#{field.name}: #{field.name}" }).join(", ") %> }
+    end
+    <%- if (node_flags = node.flags) -%>
+    <%- node_flags.values.each do |value| -%>
+
+    # def <%= value.name.downcase %>?: () -> bool
+    def <%= value.name.downcase %>?
+      flags.anybits?(<%= node_flags.name %>::<%= value.name %>)
+    end
+    <%- end -%>
+    <%- end -%>
+    <%- node.fields.each do |field| -%>
+
+    <%- if field.comment.nil? -%>
+    # attr_reader <%= field.name %>: <%= field.rbs_class %>
+    <%- else -%>
+    <%- field.each_comment_line do |line| -%>
+    #<%= line %>
+    <%- end -%>
+    <%- end -%>
+    <%- case field -%>
+    <%- when Prism::Template::LocationField -%>
+    def <%= field.name %>
+      location = @<%= field.name %>
+      return location if location.is_a?(Location)
+      @<%= field.name %> = Location.new(source, location >> 32, location & 0xFFFFFFFF)
+    end
+
+    # Save the <%= field.name %> location using the given saved source so that
+    # it can be retrieved later.
+    def save_<%= field.name %>(repository)
+      repository.enter(node_id, :<%= field.name %>)
+    end
+    <%- when Prism::Template::OptionalLocationField -%>
+    def <%= field.name %>
+      location = @<%= field.name %>
+      case location
+      when nil
+        nil
+      when Location
+        location
+      else
+        @<%= field.name %> = Location.new(source, location >> 32, location & 0xFFFFFFFF)
+      end
+    end
+
+    # Save the <%= field.name %> location using the given saved source so that
+    # it can be retrieved later.
+    def save_<%= field.name %>(repository)
+      repository.enter(node_id, :<%= field.name %>) unless @<%= field.name %>.nil?
+    end
+    <%- else -%>
+    attr_reader :<%= field.name %>
+    <%- end -%>
+    <%- end -%>
+    <%- node.fields.each do |field| -%>
+    <%- case field -%>
+    <%- when Prism::Template::LocationField -%>
+    <%- raise unless field.name.end_with?("_loc") -%>
+    <%- next if node.fields.any? { |other| other.name == field.name.delete_suffix("_loc") } -%>
+
+    # def <%= field.name.delete_suffix("_loc") %>: () -> String
+    def <%= field.name.delete_suffix("_loc") %>
+      <%= field.name %>.slice
+    end
+    <%- when Prism::Template::OptionalLocationField -%>
+    <%- raise unless field.name.end_with?("_loc") -%>
+    <%- next if node.fields.any? { |other| other.name == field.name.delete_suffix("_loc") } -%>
+
+    # def <%= field.name.delete_suffix("_loc") %>: () -> String?
+    def <%= field.name.delete_suffix("_loc") %>
+      <%= field.name %>&.slice
+    end
+    <%- end -%>
+    <%- end -%>
+
+    # def inspect -> String
+    def inspect
+      InspectVisitor.compose(self)
+    end
+
+    # Return a symbol representation of this node type. See `Node#type`.
+    def type
+      :<%= node.human %>
+    end
+
+    # Return a symbol representation of this node type. See `Node::type`.
+    def self.type
+      :<%= node.human %>
+    end
+
+    # Implements case-equality for the node. This is effectively == but without
+    # comparing the value of locations. Locations are checked only for presence.
+    def ===(other)
+      other.is_a?(<%= node.name %>)<%= " &&" if (fields = [*node.flags, *node.fields]).any? %>
+        <%- fields.each_with_index do |field, index| -%>
+        <%- if field.is_a?(Prism::Template::LocationField) || field.is_a?(Prism::Template::OptionalLocationField) -%>
+        (<%= field.name %>.nil? == other.<%= field.name %>.nil?)<%= " &&" if index != fields.length - 1 %>
+        <%- elsif field.is_a?(Prism::Template::NodeListField) || field.is_a?(Prism::Template::ConstantListField) -%>
+        (<%= field.name %>.length == other.<%= field.name %>.length) &&
+        <%= field.name %>.zip(other.<%= field.name %>).all? { |left, right| left === right }<%= " &&" if index != fields.length - 1 %>
+        <%- elsif field.is_a?(Prism::Template::Flags) -%>
+        (flags === other.flags)<%= " &&" if index != fields.length - 1 %>
+        <%- else -%>
+        (<%= field.name %> === other.<%= field.name %>)<%= " &&" if index != fields.length - 1 %>
+        <%- end -%>
+        <%- end -%>
+    end
+  end
+  <%- end -%>
+  <%- flags.each do |flag| -%>
+
+  # <%= flag.comment %>
+  module <%= flag.name %>
+    <%- flag.values.each_with_index do |value, index| -%>
+    # <%= value.comment %>
+    <%= value.name %> = 1 << <%= index + Prism::Template::COMMON_FLAGS_COUNT %>
+<%= "\n" if value != flag.values.last -%>
+    <%- end -%>
+  end
+  <%- end -%>
+
+  # The flags that are common to all nodes.
+  module NodeFlags
+    # A flag to indicate that the node is a candidate to emit a :line event
+    # through tracepoint when compiled.
+    NEWLINE = 1
+
+    # A flag to indicate that the value that the node represents is a value that
+    # can be determined at parse-time.
+    STATIC_LITERAL = 2
+  end
+end
diff --git a/prism/templates/lib/prism/reflection.rb.erb b/prism/templates/lib/prism/reflection.rb.erb
new file mode 100644
index 00000000000000..6c8b2f4d257714
--- /dev/null
+++ b/prism/templates/lib/prism/reflection.rb.erb
@@ -0,0 +1,136 @@
+module Prism
+  # The Reflection module provides the ability to reflect on the structure of
+  # the syntax tree itself, as opposed to looking at a single syntax tree. This
+  # is useful in metaprogramming contexts.
+  module Reflection
+    # A field represents a single piece of data on a node. It is the base class
+    # for all other field types.
+    class Field
+      # The name of the field.
+      attr_reader :name
+
+      # Initializes the field with the given name.
+      def initialize(name)
+        @name = name
+      end
+    end
+
+    # A node field represents a single child node in the syntax tree. It
+    # resolves to a Prism::Node in Ruby.
+    class NodeField < Field
+    end
+
+    # An optional node field represents a single child node in the syntax tree
+    # that may or may not be present. It resolves to either a Prism::Node or nil
+    # in Ruby.
+    class OptionalNodeField < Field
+    end
+
+    # A node list field represents a list of child nodes in the syntax tree. It
+    # resolves to an array of Prism::Node instances in Ruby.
+    class NodeListField < Field
+    end
+
+    # A constant field represents a constant value on a node. Effectively, it
+    # represents an identifier found within the source. It resolves to a symbol
+    # in Ruby.
+    class ConstantField < Field
+    end
+
+    # An optional constant field represents a constant value on a node that may
+    # or may not be present. It resolves to either a symbol or nil in Ruby.
+    class OptionalConstantField < Field
+    end
+
+    # A constant list field represents a list of constant values on a node. It
+    # resolves to an array of symbols in Ruby.
+    class ConstantListField < Field
+    end
+
+    # A string field represents a string value on a node. It almost always
+    # represents the unescaped value of a string-like literal. It resolves to a
+    # string in Ruby.
+    class StringField < Field
+    end
+
+    # A location field represents the location of some part of the node in the
+    # source code. For example, the location of a keyword or an operator. It
+    # resolves to a Prism::Location in Ruby.
+    class LocationField < Field
+    end
+
+    # An optional location field represents the location of some part of the
+    # node in the source code that may or may not be present. It resolves to
+    # either a Prism::Location or nil in Ruby.
+    class OptionalLocationField < Field
+    end
+
+    # An integer field represents an integer value. It is used to represent the
+    # value of an integer literal, the depth of local variables, and the number
+    # of a numbered reference. It resolves to an Integer in Ruby.
+    class IntegerField < Field
+    end
+
+    # A float field represents a double-precision floating point value. It is
+    # used exclusively to represent the value of a floating point literal. It
+    # resolves to a Float in Ruby.
+    class FloatField < Field
+    end
+
+    # A flags field represents a bitset of flags on a node. It resolves to an
+    # integer in Ruby. Note that the flags cannot be accessed directly on the
+    # node because the integer is kept private. Instead, the various flags in
+    # the bitset should be accessed through their query methods.
+    class FlagsField < Field
+      # The names of the flags in the bitset.
+      attr_reader :flags
+
+      # Initializes the flags field with the given name and flags.
+      def initialize(name, flags)
+        super(name)
+        @flags = flags
+      end
+    end
+
+    # Returns the fields for the given node.
+    def self.fields_for(node)
+      case node.type
+      <%- nodes.each do |node| -%>
+      when :<%= node.human %>
+        [<%= [*node.flags, *node.fields].map { |field|
+          case field
+          when Prism::Template::NodeField
+            "NodeField.new(:#{field.name})"
+          when Prism::Template::OptionalNodeField
+            "OptionalNodeField.new(:#{field.name})"
+          when Prism::Template::NodeListField
+            "NodeListField.new(:#{field.name})"
+          when Prism::Template::ConstantField
+            "ConstantField.new(:#{field.name})"
+          when Prism::Template::OptionalConstantField
+            "OptionalConstantField.new(:#{field.name})"
+          when Prism::Template::ConstantListField
+            "ConstantListField.new(:#{field.name})"
+          when Prism::Template::StringField
+            "StringField.new(:#{field.name})"
+          when Prism::Template::LocationField
+            "LocationField.new(:#{field.name})"
+          when Prism::Template::OptionalLocationField
+            "OptionalLocationField.new(:#{field.name})"
+          when Prism::Template::UInt8Field, Prism::Template::UInt32Field, Prism::Template::IntegerField
+            "IntegerField.new(:#{field.name})"
+          when Prism::Template::DoubleField
+            "FloatField.new(:#{field.name})"
+          when Prism::Template::Flags
+            "FlagsField.new(:flags, [#{field.values.map { |value| ":#{value.name.downcase}?" }.join(", ")}])"
+          else
+            raise field.class.name
+          end
+        }.join(", ") %>]
+      <%- end -%>
+      else
+        raise "Unknown node type: #{node.type.inspect}"
+      end
+    end
+  end
+end
diff --git a/prism/templates/lib/prism/serialize.rb.erb b/prism/templates/lib/prism/serialize.rb.erb
new file mode 100644
index 00000000000000..104b60f4842015
--- /dev/null
+++ b/prism/templates/lib/prism/serialize.rb.erb
@@ -0,0 +1,602 @@
+require "stringio"
+require_relative "polyfill/unpack1"
+
+module Prism
+  # A module responsible for deserializing parse results.
+  module Serialize
+    # The major version of prism that we are expecting to find in the serialized
+    # strings.
+    MAJOR_VERSION = 1
+
+    # The minor version of prism that we are expecting to find in the serialized
+    # strings.
+    MINOR_VERSION = 4
+
+    # The patch version of prism that we are expecting to find in the serialized
+    # strings.
+    PATCH_VERSION = 0
+
+    # Deserialize the dumped output from a request to parse or parse_file.
+    #
+    # The formatting of the source of this method is purposeful to illustrate
+    # the structure of the serialized data.
+    def self.load_parse(input, serialized, freeze)
+      input = input.dup
+      source = Source.for(input)
+      loader = Loader.new(source, serialized)
+
+                       loader.load_header
+      encoding =       loader.load_encoding
+      start_line =     loader.load_varsint
+      offsets =        loader.load_line_offsets(freeze)
+
+      source.replace_start_line(start_line)
+      source.replace_offsets(offsets)
+
+      comments =       loader.load_comments(freeze)
+      magic_comments = loader.load_magic_comments(freeze)
+      data_loc =       loader.load_optional_location_object(freeze)
+      errors =         loader.load_errors(encoding, freeze)
+      warnings =       loader.load_warnings(encoding, freeze)
+      cpool_base =     loader.load_uint32
+      cpool_size =     loader.load_varuint
+
+      constant_pool = ConstantPool.new(input, serialized, cpool_base, cpool_size)
+
+      node =           loader.load_node(constant_pool, encoding, freeze)
+                       loader.load_constant_pool(constant_pool)
+      raise unless     loader.eof?
+
+      result = ParseResult.new(node, comments, magic_comments, data_loc, errors, warnings, source)
+      result.freeze if freeze
+
+      input.force_encoding(encoding)
+
+      # This is an extremely niche use-case where the file was marked as binary
+      # but it contained UTF-8-encoded characters. In that case we will actually
+      # put it back to UTF-8 to give the location APIs the best chance of being
+      # correct.
+      if !input.ascii_only? && input.encoding == Encoding::BINARY
+        input.force_encoding(Encoding::UTF_8)
+        input.force_encoding(Encoding::BINARY) unless input.valid_encoding?
+      end
+
+      if freeze
+        input.freeze
+        source.deep_freeze
+      end
+
+      result
+    end
+
+    # Deserialize the dumped output from a request to lex or lex_file.
+    #
+    # The formatting of the source of this method is purposeful to illustrate
+    # the structure of the serialized data.
+    def self.load_lex(input, serialized, freeze)
+      source = Source.for(input)
+      loader = Loader.new(source, serialized)
+
+      tokens =         loader.load_tokens
+      encoding =       loader.load_encoding
+      start_line =     loader.load_varsint
+      offsets =        loader.load_line_offsets(freeze)
+
+      source.replace_start_line(start_line)
+      source.replace_offsets(offsets)
+
+      comments =       loader.load_comments(freeze)
+      magic_comments = loader.load_magic_comments(freeze)
+      data_loc =       loader.load_optional_location_object(freeze)
+      errors =         loader.load_errors(encoding, freeze)
+      warnings =       loader.load_warnings(encoding, freeze)
+      raise unless     loader.eof?
+
+      result = LexResult.new(tokens, comments, magic_comments, data_loc, errors, warnings, source)
+
+      tokens.each do |token|
+        token[0].value.force_encoding(encoding)
+
+        if freeze
+          token[0].deep_freeze
+          token.freeze
+        end
+      end
+
+      if freeze
+        source.deep_freeze
+        tokens.freeze
+        result.freeze
+      end
+
+      result
+    end
+
+    # Deserialize the dumped output from a request to parse_comments or
+    # parse_file_comments.
+    #
+    # The formatting of the source of this method is purposeful to illustrate
+    # the structure of the serialized data.
+    def self.load_parse_comments(input, serialized, freeze)
+      source = Source.for(input)
+      loader = Loader.new(source, serialized)
+
+                   loader.load_header
+                   loader.load_encoding
+      start_line = loader.load_varsint
+
+      source.replace_start_line(start_line)
+
+      result =     loader.load_comments(freeze)
+      raise unless loader.eof?
+
+      source.deep_freeze if freeze
+      result
+    end
+
+    # Deserialize the dumped output from a request to parse_lex or
+    # parse_lex_file.
+    #
+    # The formatting of the source of this method is purposeful to illustrate
+    # the structure of the serialized data.
+    def self.load_parse_lex(input, serialized, freeze)
+      source = Source.for(input)
+      loader = Loader.new(source, serialized)
+
+      tokens =         loader.load_tokens
+                       loader.load_header
+      encoding =       loader.load_encoding
+      start_line =     loader.load_varsint
+      offsets =        loader.load_line_offsets(freeze)
+
+      source.replace_start_line(start_line)
+      source.replace_offsets(offsets)
+
+      comments =       loader.load_comments(freeze)
+      magic_comments = loader.load_magic_comments(freeze)
+      data_loc =       loader.load_optional_location_object(freeze)
+      errors =         loader.load_errors(encoding, freeze)
+      warnings =       loader.load_warnings(encoding, freeze)
+      cpool_base =     loader.load_uint32
+      cpool_size =     loader.load_varuint
+
+      constant_pool = ConstantPool.new(input, serialized, cpool_base, cpool_size)
+
+      node =           loader.load_node(constant_pool, encoding, freeze)
+                       loader.load_constant_pool(constant_pool)
+      raise unless     loader.eof?
+
+      value = [node, tokens]
+      result = ParseLexResult.new(value, comments, magic_comments, data_loc, errors, warnings, source)
+
+      tokens.each do |token|
+        token[0].value.force_encoding(encoding)
+
+        if freeze
+          token[0].deep_freeze
+          token.freeze
+        end
+      end
+
+      if freeze
+        source.deep_freeze
+        tokens.freeze
+        value.freeze
+        result.freeze
+      end
+
+      result
+    end
+
+    class ConstantPool # :nodoc:
+      attr_reader :size
+
+      def initialize(input, serialized, base, size)
+        @input = input
+        @serialized = serialized
+        @base = base
+        @size = size
+        @pool = Array.new(size, nil)
+      end
+
+      def get(index, encoding)
+        @pool[index] ||=
+          begin
+            offset = @base + index * 8
+            start = @serialized.unpack1("L", offset: offset)
+            length = @serialized.unpack1("L", offset: offset + 4)
+
+            if start.nobits?(1 << 31)
+              @input.byteslice(start, length).force_encoding(encoding).to_sym
+            else
+              @serialized.byteslice(start & ((1 << 31) - 1), length).force_encoding(encoding).to_sym
+            end
+          end
+      end
+    end
+
+    if RUBY_ENGINE == "truffleruby"
+      # StringIO is synchronized and that adds a high overhead on TruffleRuby.
+      class FastStringIO # :nodoc:
+        attr_accessor :pos
+
+        def initialize(string)
+          @string = string
+          @pos = 0
+        end
+
+        def getbyte
+          byte = @string.getbyte(@pos)
+          @pos += 1
+          byte
+        end
+
+        def read(n)
+          slice = @string.byteslice(@pos, n)
+          @pos += n
+          slice
+        end
+
+        def eof?
+          @pos >= @string.bytesize
+        end
+      end
+    else
+      FastStringIO = ::StringIO # :nodoc:
+    end
+
+    class Loader # :nodoc:
+      attr_reader :input, :io, :source
+
+      def initialize(source, serialized)
+        @input = source.source.dup
+        raise unless serialized.encoding == Encoding::BINARY
+        @io = FastStringIO.new(serialized)
+        @source = source
+        define_load_node_lambdas if RUBY_ENGINE != "ruby"
+      end
+
+      def eof?
+        io.getbyte
+        io.eof?
+      end
+
+      def load_constant_pool(constant_pool)
+        trailer = 0
+
+        constant_pool.size.times do |index|
+          start, length = io.read(8).unpack("L2")
+          trailer += length if start.anybits?(1 << 31)
+        end
+
+        io.read(trailer)
+      end
+
+      def load_header
+        raise "Invalid serialization" if io.read(5) != "PRISM"
+        raise "Invalid serialization" if io.read(3).unpack("C3") != [MAJOR_VERSION, MINOR_VERSION, PATCH_VERSION]
+        raise "Invalid serialization (location fields must be included but are not)" if io.getbyte != 0
+      end
+
+      def load_encoding
+        encoding = Encoding.find(io.read(load_varuint))
+        @input = input.force_encoding(encoding).freeze
+        encoding
+      end
+
+      def load_line_offsets(freeze)
+        offsets = Array.new(load_varuint) { load_varuint }
+        offsets.freeze if freeze
+        offsets
+      end
+
+      def load_comments(freeze)
+        comments =
+          Array.new(load_varuint) do
+            comment =
+              case load_varuint
+              when 0 then InlineComment.new(load_location_object(freeze))
+              when 1 then EmbDocComment.new(load_location_object(freeze))
+              end
+
+            comment.freeze if freeze
+            comment
+          end
+
+        comments.freeze if freeze
+        comments
+      end
+
+      def load_magic_comments(freeze)
+        magic_comments =
+          Array.new(load_varuint) do
+            magic_comment =
+              MagicComment.new(
+                load_location_object(freeze),
+                load_location_object(freeze)
+              )
+
+            magic_comment.freeze if freeze
+            magic_comment
+          end
+
+        magic_comments.freeze if freeze
+        magic_comments
+      end
+
+      DIAGNOSTIC_TYPES = [
+        <%- errors.each do |error| -%>
+        <%= error.name.downcase.to_sym.inspect %>,
+        <%- end -%>
+        <%- warnings.each do |warning| -%>
+        <%= warning.name.downcase.to_sym.inspect %>,
+        <%- end -%>
+      ].freeze
+
+      private_constant :DIAGNOSTIC_TYPES
+
+      def load_error_level
+        level = io.getbyte
+
+        case level
+        when 0
+          :syntax
+        when 1
+          :argument
+        when 2
+          :load
+        else
+          raise "Unknown level: #{level}"
+        end
+      end
+
+      def load_errors(encoding, freeze)
+        errors =
+          Array.new(load_varuint) do
+            error =
+              ParseError.new(
+                DIAGNOSTIC_TYPES.fetch(load_varuint),
+                load_embedded_string(encoding),
+                load_location_object(freeze),
+                load_error_level
+              )
+
+            error.freeze if freeze
+            error
+          end
+
+        errors.freeze if freeze
+        errors
+      end
+
+      def load_warning_level
+        level = io.getbyte
+
+        case level
+        when 0
+          :default
+        when 1
+          :verbose
+        else
+          raise "Unknown level: #{level}"
+        end
+      end
+
+      def load_warnings(encoding, freeze)
+        warnings =
+          Array.new(load_varuint) do
+            warning =
+              ParseWarning.new(
+                DIAGNOSTIC_TYPES.fetch(load_varuint),
+                load_embedded_string(encoding),
+                load_location_object(freeze),
+                load_warning_level
+              )
+
+            warning.freeze if freeze
+            warning
+          end
+
+        warnings.freeze if freeze
+        warnings
+      end
+
+      def load_tokens
+        tokens = []
+
+        while (type = TOKEN_TYPES.fetch(load_varuint))
+          start = load_varuint
+          length = load_varuint
+          lex_state = load_varuint
+
+          location = Location.new(@source, start, length)
+          token = Token.new(@source, type, location.slice, location)
+
+          tokens << [token, lex_state]
+        end
+
+        tokens
+      end
+
+      # variable-length integer using https://en.wikipedia.org/wiki/LEB128
+      # This is also what protobuf uses: https://protobuf.dev/programming-guides/encoding/#varints
+      def load_varuint
+        n = io.getbyte
+        if n < 128
+          n
+        else
+          n -= 128
+          shift = 0
+          while (b = io.getbyte) >= 128
+            n += (b - 128) << (shift += 7)
+          end
+          n + (b << (shift + 7))
+        end
+      end
+
+      def load_varsint
+        n = load_varuint
+        (n >> 1) ^ (-(n & 1))
+      end
+
+      def load_integer
+        negative = io.getbyte != 0
+        length = load_varuint
+
+        value = 0
+        length.times { |index| value |= (load_varuint << (index * 32)) }
+
+        value = -value if negative
+        value
+      end
+
+      def load_double
+        io.read(8).unpack1("D")
+      end
+
+      def load_uint32
+        io.read(4).unpack1("L")
+      end
+
+      def load_optional_node(constant_pool, encoding, freeze)
+        if io.getbyte != 0
+          io.pos -= 1
+          load_node(constant_pool, encoding, freeze)
+        end
+      end
+
+      def load_embedded_string(encoding)
+        io.read(load_varuint).force_encoding(encoding).freeze
+      end
+
+      def load_string(encoding)
+        case (type = io.getbyte)
+        when 1
+          input.byteslice(load_varuint, load_varuint).force_encoding(encoding).freeze
+        when 2
+          load_embedded_string(encoding)
+        else
+          raise "Unknown serialized string type: #{type}"
+        end
+      end
+
+      def load_location_object(freeze)
+        location = Location.new(source, load_varuint, load_varuint)
+        location.freeze if freeze
+        location
+      end
+
+      def load_location(freeze)
+        return load_location_object(freeze) if freeze
+        (load_varuint << 32) | load_varuint
+      end
+
+      def load_optional_location(freeze)
+        load_location(freeze) if io.getbyte != 0
+      end
+
+      def load_optional_location_object(freeze)
+        load_location_object(freeze) if io.getbyte != 0
+      end
+
+      def load_constant(constant_pool, encoding)
+        index = load_varuint
+        constant_pool.get(index - 1, encoding)
+      end
+
+      def load_optional_constant(constant_pool, encoding)
+        index = load_varuint
+        constant_pool.get(index - 1, encoding) if index != 0
+      end
+
+      if RUBY_ENGINE == "ruby"
+        def load_node(constant_pool, encoding, freeze)
+          type = io.getbyte
+          node_id = load_varuint
+          location = load_location(freeze)
+          value = case type
+          <%- nodes.each_with_index do |node, index| -%>
+          when <%= index + 1 %> then
+            <%- if node.needs_serialized_length? -%>
+            load_uint32
+            <%- end -%>
+            <%= node.name %>.new(<%= ["source", "node_id", "location", "load_varuint", *node.fields.map { |field|
+              case field
+              when Prism::Template::NodeField then "load_node(constant_pool, encoding, freeze)"
+              when Prism::Template::OptionalNodeField then "load_optional_node(constant_pool, encoding, freeze)"
+              when Prism::Template::StringField then "load_string(encoding)"
+              when Prism::Template::NodeListField then "Array.new(load_varuint) { load_node(constant_pool, encoding, freeze) }.tap { |nodes| nodes.freeze if freeze }"
+              when Prism::Template::ConstantField then "load_constant(constant_pool, encoding)"
+              when Prism::Template::OptionalConstantField then "load_optional_constant(constant_pool, encoding)"
+              when Prism::Template::ConstantListField then "Array.new(load_varuint) { load_constant(constant_pool, encoding) }.tap { |constants| constants.freeze if freeze }"
+              when Prism::Template::LocationField then "load_location(freeze)"
+              when Prism::Template::OptionalLocationField then "load_optional_location(freeze)"
+              when Prism::Template::UInt8Field then "io.getbyte"
+              when Prism::Template::UInt32Field then "load_varuint"
+              when Prism::Template::IntegerField then "load_integer"
+              when Prism::Template::DoubleField then "load_double"
+              else raise
+              end
+            }].join(", ") -%>)
+            <%- end -%>
+          end
+
+          value.freeze if freeze
+          value
+        end
+      else
+        def load_node(constant_pool, encoding, freeze)
+          @load_node_lambdas[io.getbyte].call(constant_pool, encoding, freeze)
+        end
+
+        def define_load_node_lambdas
+          @load_node_lambdas = [
+            nil,
+            <%- nodes.each do |node| -%>
+            -> (constant_pool, encoding, freeze) {
+              node_id = load_varuint
+              location = load_location(freeze)
+              <%- if node.needs_serialized_length? -%>
+              load_uint32
+              <%- end -%>
+              value = <%= node.name %>.new(<%= ["source", "node_id", "location", "load_varuint", *node.fields.map { |field|
+                case field
+                when Prism::Template::NodeField then "load_node(constant_pool, encoding, freeze)"
+                when Prism::Template::OptionalNodeField then "load_optional_node(constant_pool, encoding, freeze)"
+                when Prism::Template::StringField then "load_string(encoding)"
+                when Prism::Template::NodeListField then "Array.new(load_varuint) { load_node(constant_pool, encoding, freeze) }"
+                when Prism::Template::ConstantField then "load_constant(constant_pool, encoding)"
+                when Prism::Template::OptionalConstantField then "load_optional_constant(constant_pool, encoding)"
+                when Prism::Template::ConstantListField then "Array.new(load_varuint) { load_constant(constant_pool, encoding) }"
+                when Prism::Template::LocationField then "load_location(freeze)"
+                when Prism::Template::OptionalLocationField then "load_optional_location(freeze)"
+                when Prism::Template::UInt8Field then "io.getbyte"
+                when Prism::Template::UInt32Field then "load_varuint"
+                when Prism::Template::IntegerField then "load_integer"
+                when Prism::Template::DoubleField then "load_double"
+                else raise
+                end
+              }].join(", ") -%>)
+              value.freeze if freeze
+              value
+            },
+            <%- end -%>
+          ]
+        end
+      end
+    end
+
+    # The token types that can be indexed by their enum values.
+    TOKEN_TYPES = [
+      nil,
+      <%- tokens.each do |token| -%>
+      <%= token.name.to_sym.inspect %>,
+      <%- end -%>
+    ].freeze
+
+    private_constant :MAJOR_VERSION, :MINOR_VERSION, :PATCH_VERSION
+    private_constant :ConstantPool, :FastStringIO, :Loader, :TOKEN_TYPES
+  end
+
+  private_constant :Serialize
+end
diff --git a/prism/templates/lib/prism/visitor.rb.erb b/prism/templates/lib/prism/visitor.rb.erb
new file mode 100644
index 00000000000000..b1a03c3f1ac9e3
--- /dev/null
+++ b/prism/templates/lib/prism/visitor.rb.erb
@@ -0,0 +1,55 @@
+module Prism
+  # A class that knows how to walk down the tree. None of the individual visit
+  # methods are implemented on this visitor, so it forces the consumer to
+  # implement each one that they need. For a default implementation that
+  # continues walking the tree, see the Visitor class.
+  class BasicVisitor
+    # Calls `accept` on the given node if it is not `nil`, which in turn should
+    # call back into this visitor by calling the appropriate `visit_*` method.
+    def visit(node)
+      # @type self: _Visitor
+      node&.accept(self)
+    end
+
+    # Visits each node in `nodes` by calling `accept` on each one.
+    def visit_all(nodes)
+      # @type self: _Visitor
+      nodes.each { |node| node&.accept(self) }
+    end
+
+    # Visits the child nodes of `node` by calling `accept` on each one.
+    def visit_child_nodes(node)
+      # @type self: _Visitor
+      node.compact_child_nodes.each { |node| node.accept(self) }
+    end
+  end
+
+  # A visitor is a class that provides a default implementation for every accept
+  # method defined on the nodes. This means it can walk a tree without the
+  # caller needing to define any special handling. This allows you to handle a
+  # subset of the tree, while still walking the whole tree.
+  #
+  # For example, to find all of the method calls that call the `foo` method, you
+  # could write:
+  #
+  #     class FooCalls < Prism::Visitor
+  #       def visit_call_node(node)
+  #         if node.name == :foo
+  #           # Do something with the node
+  #         end
+  #
+  #         # Call super so that the visitor continues walking the tree
+  #         super
+  #       end
+  #     end
+  #
+  class Visitor < BasicVisitor
+    <%- nodes.each_with_index do |node, index| -%>
+<%= "\n" if index != 0 -%>
+    # Visit a <%= node.name %> node
+    def visit_<%= node.human %>(node)
+      node.compact_child_nodes.each { |node| node.accept(self) }
+    end
+    <%- end -%>
+  end
+end
diff --git a/prism/templates/src/diagnostic.c.erb b/prism/templates/src/diagnostic.c.erb
new file mode 100644
index 00000000000000..ce98dc5acd5163
--- /dev/null
+++ b/prism/templates/src/diagnostic.c.erb
@@ -0,0 +1,521 @@
+#include "prism/diagnostic.h"
+
+#define PM_DIAGNOSTIC_ID_MAX <%= errors.length + warnings.length %>
+
+/** This struct holds the data for each diagnostic. */
+typedef struct {
+    /** The message associated with the diagnostic. */
+    const char* message;
+
+    /** The level associated with the diagnostic. */
+    uint8_t level;
+} pm_diagnostic_data_t;
+
+/**
+ * ## Message composition
+ *
+ * When composing an error message, use sentence fragments.
+ *
+ * Try describing the property of the code that caused the error, rather than
+ * the rule that is being violated. It may help to use a fragment that completes
+ * a sentence beginning, "the parser encountered (a) ...". If appropriate, add a
+ * description of the rule violation (or other helpful context) after a
+ * semicolon.
+ *
+ * For example:, instead of "control escape sequence cannot be doubled", prefer:
+ *
+ * > "invalid control escape sequence; control cannot be repeated"
+ *
+ * In some cases, where the failure is more general or syntax expectations are
+ * violated, it may make more sense to use a fragment that completes a sentence
+ * beginning, "the parser ...".
+ *
+ * For example:
+ *
+ * > "expected an expression after `(`"
+ * > "cannot parse the expression"
+ *
+ * ## Message style guide
+ *
+ * - Use articles like "a", "an", and "the" when appropriate.
+ *   - e.g., prefer "cannot parse the expression" to "cannot parse expression".
+ * - Use the common name for tokens and nodes.
+ *   - e.g., prefer "keyword splat" to "assoc splat"
+ *   - e.g., prefer "embedded document" to "embdoc"
+ * - Do not capitalize the initial word of the message.
+ * - Use back ticks around token literals
+ *   - e.g., "Expected a `=>` between the hash key and value"
+ * - Do not use `.` or other punctuation at the end of the message.
+ * - Do not use contractions like "can't". Prefer "cannot" to "can not".
+ * - For tokens that can have multiple meanings, reference the token and its meaning.
+ *   - e.g., "`*` splat argument" is clearer and more complete than "splat argument" or "`*` argument"
+ *
+ * ## Error names (PM_ERR_*)
+ *
+ * - When appropriate, prefer node name to token name.
+ *   - e.g., prefer "SPLAT" to "STAR" in the context of argument parsing.
+ * - Prefer token name to common name.
+ *   - e.g., prefer "STAR" to "ASTERISK".
+ * - Try to order the words in the name from more general to more specific,
+ *   - e.g., "INVALID_NUMBER_DECIMAL" is better than "DECIMAL_INVALID_NUMBER".
+ *   - When in doubt, look for similar patterns and name them so that they are grouped when lexically
+ *     sorted. See PM_ERR_ARGUMENT_NO_FORWARDING_* for an example.
+ *
+ * ## Level
+ *
+ * For errors, they are:
+ *
+ * * `PM_ERROR_LEVEL_SYNTAX` - Errors that should raise SyntaxError.
+ * * `PM_ERROR_LEVEL_ARGUMENT` - Errors that should raise ArgumentError.
+ * * `PM_ERROR_LEVEL_LOAD` - Errors that should raise LoadError.
+ *
+ * For warnings, they are:
+ *
+ * * `PM_WARNING_LEVEL_DEFAULT` - Warnings that appear for `ruby -c -e 'code'`.
+ * * `PM_WARNING_LEVEL_VERBOSE` - Warnings that appear with `-w`, as in `ruby -w -c -e 'code'`.
+ */
+static const pm_diagnostic_data_t diagnostic_messages[PM_DIAGNOSTIC_ID_MAX] = {
+    // Special error that can be replaced
+    [PM_ERR_CANNOT_PARSE_EXPRESSION]            = { "cannot parse the expression", PM_ERROR_LEVEL_SYNTAX },
+
+    // Errors that should raise argument errors
+    [PM_ERR_INVALID_ENCODING_MAGIC_COMMENT]     = { "unknown or invalid encoding in the magic comment", PM_ERROR_LEVEL_ARGUMENT },
+
+    // Errors that should raise load errors
+    [PM_ERR_SCRIPT_NOT_FOUND]                   = { "no Ruby script found in input", PM_ERROR_LEVEL_LOAD },
+
+    // Errors that should raise syntax errors
+    [PM_ERR_ALIAS_ARGUMENT]                     = { "invalid argument being passed to `alias`; expected a bare word, symbol, constant, or global variable", PM_ERROR_LEVEL_SYNTAX },
+    [PM_ERR_ALIAS_ARGUMENT_NUMBERED_REFERENCE]  = { "invalid argument being passed to `alias`; can't make alias for the number variables", PM_ERROR_LEVEL_SYNTAX },
+    [PM_ERR_AMPAMPEQ_MULTI_ASSIGN]              = { "unexpected `&&=` in a multiple assignment", PM_ERROR_LEVEL_SYNTAX },
+    [PM_ERR_ARGUMENT_AFTER_BLOCK]               = { "unexpected argument after a block argument", PM_ERROR_LEVEL_SYNTAX },
+    [PM_ERR_ARGUMENT_AFTER_FORWARDING_ELLIPSES] = { "unexpected argument after `...`", PM_ERROR_LEVEL_SYNTAX },
+    [PM_ERR_ARGUMENT_BARE_HASH]                 = { "unexpected bare hash argument", PM_ERROR_LEVEL_SYNTAX },
+    [PM_ERR_ARGUMENT_BLOCK_MULTI]               = { "both block arg and actual block given; only one block is allowed", PM_ERROR_LEVEL_SYNTAX },
+    [PM_ERR_ARGUMENT_CONFLICT_AMPERSAND]        = { "unexpected `&`; anonymous block parameter is also used within block", PM_ERROR_LEVEL_SYNTAX },
+    [PM_ERR_ARGUMENT_CONFLICT_STAR]             = { "unexpected `*`; anonymous rest parameter is also used within block", PM_ERROR_LEVEL_SYNTAX },
+    [PM_ERR_ARGUMENT_CONFLICT_STAR_STAR]        = { "unexpected `**`; anonymous keyword rest parameter is also used within block", PM_ERROR_LEVEL_SYNTAX },
+    [PM_ERR_ARGUMENT_FORMAL_CLASS]              = { "invalid formal argument; formal argument cannot be a class variable", PM_ERROR_LEVEL_SYNTAX },
+    [PM_ERR_ARGUMENT_FORMAL_CONSTANT]           = { "invalid formal argument; formal argument cannot be a constant", PM_ERROR_LEVEL_SYNTAX },
+    [PM_ERR_ARGUMENT_FORMAL_GLOBAL]             = { "invalid formal argument; formal argument cannot be a global variable", PM_ERROR_LEVEL_SYNTAX },
+    [PM_ERR_ARGUMENT_FORMAL_IVAR]               = { "invalid formal argument; formal argument cannot be an instance variable", PM_ERROR_LEVEL_SYNTAX },
+    [PM_ERR_ARGUMENT_FORWARDING_UNBOUND]        = { "unexpected `...` in an non-parenthesized call", PM_ERROR_LEVEL_SYNTAX },
+    [PM_ERR_ARGUMENT_NO_FORWARDING_AMPERSAND]   = { "unexpected `&`; no anonymous block parameter", PM_ERROR_LEVEL_SYNTAX },
+    [PM_ERR_ARGUMENT_NO_FORWARDING_ELLIPSES]    = { "unexpected ... when the parent method is not forwarding", PM_ERROR_LEVEL_SYNTAX },
+    [PM_ERR_ARGUMENT_NO_FORWARDING_STAR]        = { "unexpected `*`; no anonymous rest parameter", PM_ERROR_LEVEL_SYNTAX },
+    [PM_ERR_ARGUMENT_NO_FORWARDING_STAR_STAR]   = { "unexpected `**`; no anonymous keyword rest parameter", PM_ERROR_LEVEL_SYNTAX },
+    [PM_ERR_ARGUMENT_SPLAT_AFTER_ASSOC_SPLAT]   = { "unexpected `*` splat argument after a `**` keyword splat argument", PM_ERROR_LEVEL_SYNTAX },
+    [PM_ERR_ARGUMENT_SPLAT_AFTER_SPLAT]         = { "unexpected `*` splat argument after a `*` splat argument", PM_ERROR_LEVEL_SYNTAX },
+    [PM_ERR_ARGUMENT_TERM_PAREN]                = { "unexpected %s; expected a `)` to close the arguments", PM_ERROR_LEVEL_SYNTAX },
+    [PM_ERR_ARGUMENT_UNEXPECTED_BLOCK]          = { "unexpected '{' after a method call without parenthesis", PM_ERROR_LEVEL_SYNTAX },
+    [PM_ERR_ARRAY_ELEMENT]                      = { "expected an element for the array", PM_ERROR_LEVEL_SYNTAX },
+    [PM_ERR_ARRAY_EXPRESSION]                   = { "expected an expression for the array element", PM_ERROR_LEVEL_SYNTAX },
+    [PM_ERR_ARRAY_EXPRESSION_AFTER_STAR]        = { "expected an expression after `*` in the array", PM_ERROR_LEVEL_SYNTAX },
+    [PM_ERR_ARRAY_SEPARATOR]                    = { "unexpected %s; expected a `,` separator for the array elements", PM_ERROR_LEVEL_SYNTAX },
+    [PM_ERR_ARRAY_TERM]                         = { "unexpected %s; expected a `]` to close the array", PM_ERROR_LEVEL_SYNTAX },
+    [PM_ERR_BEGIN_LONELY_ELSE]                  = { "unexpected `else` in `begin` block; else without rescue is useless", PM_ERROR_LEVEL_SYNTAX },
+    [PM_ERR_BEGIN_TERM]                         = { "expected an `end` to close the `begin` statement", PM_ERROR_LEVEL_SYNTAX },
+    [PM_ERR_BEGIN_UPCASE_BRACE]                 = { "expected a `{` after `BEGIN`", PM_ERROR_LEVEL_SYNTAX },
+    [PM_ERR_BEGIN_UPCASE_TERM]                  = { "expected a `}` to close the `BEGIN` statement", PM_ERROR_LEVEL_SYNTAX },
+    [PM_ERR_BEGIN_UPCASE_TOPLEVEL]              = { "BEGIN is permitted only at toplevel", PM_ERROR_LEVEL_SYNTAX },
+    [PM_ERR_BLOCK_PARAM_LOCAL_VARIABLE]         = { "expected a local variable name in the block parameters", PM_ERROR_LEVEL_SYNTAX },
+    [PM_ERR_BLOCK_PARAM_PIPE_TERM]              = { "expected the block parameters to end with `|`", PM_ERROR_LEVEL_SYNTAX },
+    [PM_ERR_BLOCK_TERM_BRACE]                   = { "expected a block beginning with `{` to end with `}`", PM_ERROR_LEVEL_SYNTAX },
+    [PM_ERR_BLOCK_TERM_END]                     = { "expected a block beginning with `do` to end with `end`", PM_ERROR_LEVEL_SYNTAX },
+    [PM_ERR_CANNOT_PARSE_STRING_PART]           = { "cannot parse the string part", PM_ERROR_LEVEL_SYNTAX },
+    [PM_ERR_CASE_EXPRESSION_AFTER_CASE]         = { "expected an expression after `case`", PM_ERROR_LEVEL_SYNTAX },
+    [PM_ERR_CASE_EXPRESSION_AFTER_WHEN]         = { "expected an expression after `when`", PM_ERROR_LEVEL_SYNTAX },
+    [PM_ERR_CASE_MATCH_MISSING_PREDICATE]       = { "expected a predicate for a case matching statement", PM_ERROR_LEVEL_SYNTAX },
+    [PM_ERR_CASE_MISSING_CONDITIONS]            = { "expected a `when` or `in` clause after `case`", PM_ERROR_LEVEL_SYNTAX },
+    [PM_ERR_CASE_TERM]                          = { "expected an `end` to close the `case` statement", PM_ERROR_LEVEL_SYNTAX },
+    [PM_ERR_CLASS_IN_METHOD]                    = { "unexpected class definition in method body", PM_ERROR_LEVEL_SYNTAX },
+    [PM_ERR_CLASS_NAME]                         = { "unexpected constant path after `class`; class/module name must be CONSTANT", PM_ERROR_LEVEL_SYNTAX },
+    [PM_ERR_CLASS_SUPERCLASS]                   = { "expected a superclass after `<`", PM_ERROR_LEVEL_SYNTAX },
+    [PM_ERR_CLASS_TERM]                         = { "expected an `end` to close the `class` statement", PM_ERROR_LEVEL_SYNTAX },
+    [PM_ERR_CLASS_UNEXPECTED_END]               = { "unexpected `end`, expecting ';' or '\\n'", PM_ERROR_LEVEL_SYNTAX },
+    [PM_ERR_CLASS_VARIABLE_BARE]                = { "'@@' without identifiers is not allowed as a class variable name", PM_ERROR_LEVEL_SYNTAX },
+    [PM_ERR_CONDITIONAL_ELSIF_PREDICATE]        = { "expected a predicate expression for the `elsif` statement", PM_ERROR_LEVEL_SYNTAX },
+    [PM_ERR_CONDITIONAL_IF_PREDICATE]           = { "expected a predicate expression for the `if` statement", PM_ERROR_LEVEL_SYNTAX },
+    [PM_ERR_CONDITIONAL_PREDICATE_TERM]         = { "expected `then` or `;` or '\\n'", PM_ERROR_LEVEL_SYNTAX },
+    [PM_ERR_CONDITIONAL_TERM]                   = { "expected an `end` to close the conditional clause", PM_ERROR_LEVEL_SYNTAX },
+    [PM_ERR_CONDITIONAL_TERM_ELSE]              = { "expected an `end` to close the `else` clause", PM_ERROR_LEVEL_SYNTAX },
+    [PM_ERR_CONDITIONAL_UNLESS_PREDICATE]       = { "expected a predicate expression for the `unless` statement", PM_ERROR_LEVEL_SYNTAX },
+    [PM_ERR_CONDITIONAL_UNTIL_PREDICATE]        = { "expected a predicate expression for the `until` statement", PM_ERROR_LEVEL_SYNTAX },
+    [PM_ERR_CONDITIONAL_WHILE_PREDICATE]        = { "expected a predicate expression for the `while` statement", PM_ERROR_LEVEL_SYNTAX },
+    [PM_ERR_CONSTANT_PATH_COLON_COLON_CONSTANT] = { "expected a constant after the `::` operator", PM_ERROR_LEVEL_SYNTAX },
+    [PM_ERR_DEF_ENDLESS]                        = { "could not parse the endless method body", PM_ERROR_LEVEL_SYNTAX },
+    [PM_ERR_DEF_ENDLESS_SETTER]                 = { "invalid method name; a setter method cannot be defined in an endless method definition", PM_ERROR_LEVEL_SYNTAX },
+    [PM_ERR_DEF_NAME]                           = { "unexpected %s; expected a method name", PM_ERROR_LEVEL_SYNTAX },
+    [PM_ERR_DEF_PARAMS_TERM]                    = { "expected a delimiter to close the parameters", PM_ERROR_LEVEL_SYNTAX },
+    [PM_ERR_DEF_PARAMS_TERM_PAREN]              = { "unexpected %s; expected a `)` to close the parameters", PM_ERROR_LEVEL_SYNTAX },
+    [PM_ERR_DEF_RECEIVER]                       = { "expected a receiver for the method definition", PM_ERROR_LEVEL_SYNTAX },
+    [PM_ERR_DEF_RECEIVER_TERM]                  = { "expected a `.` or `::` after the receiver in a method definition", PM_ERROR_LEVEL_SYNTAX },
+    [PM_ERR_DEF_TERM]                           = { "expected an `end` to close the `def` statement", PM_ERROR_LEVEL_SYNTAX },
+    [PM_ERR_DEFINED_EXPRESSION]                 = { "expected an expression after `defined?`", PM_ERROR_LEVEL_SYNTAX },
+    [PM_ERR_EMBDOC_TERM]                        = { "embedded document meets end of file", PM_ERROR_LEVEL_SYNTAX },
+    [PM_ERR_EMBEXPR_END]                        = { "expected a `}` to close the embedded expression", PM_ERROR_LEVEL_SYNTAX },
+    [PM_ERR_EMBVAR_INVALID]                     = { "invalid embedded variable", PM_ERROR_LEVEL_SYNTAX },
+    [PM_ERR_END_UPCASE_BRACE]                   = { "expected a `{` after `END`", PM_ERROR_LEVEL_SYNTAX },
+    [PM_ERR_END_UPCASE_TERM]                    = { "expected a `}` to close the `END` statement", PM_ERROR_LEVEL_SYNTAX },
+    [PM_ERR_ESCAPE_INVALID_CONTROL]             = { "Invalid escape character syntax", PM_ERROR_LEVEL_SYNTAX },
+    [PM_ERR_ESCAPE_INVALID_CONTROL_REPEAT]      = { "invalid control escape sequence; control cannot be repeated", PM_ERROR_LEVEL_SYNTAX },
+    [PM_ERR_ESCAPE_INVALID_HEXADECIMAL]         = { "invalid hex escape sequence", PM_ERROR_LEVEL_SYNTAX },
+    [PM_ERR_ESCAPE_INVALID_META]                = { "Invalid escape character syntax", PM_ERROR_LEVEL_SYNTAX },
+    [PM_ERR_ESCAPE_INVALID_META_REPEAT]         = { "invalid meta escape sequence; meta cannot be repeated", PM_ERROR_LEVEL_SYNTAX },
+    [PM_ERR_ESCAPE_INVALID_UNICODE]             = { "invalid Unicode escape sequence", PM_ERROR_LEVEL_SYNTAX },
+    [PM_ERR_ESCAPE_INVALID_UNICODE_CM_FLAGS]    = { "invalid Unicode escape sequence; Unicode cannot be combined with control or meta flags", PM_ERROR_LEVEL_SYNTAX },
+    [PM_ERR_ESCAPE_INVALID_UNICODE_LIST]        = { "invalid Unicode list: %.*s", PM_ERROR_LEVEL_SYNTAX },
+    [PM_ERR_ESCAPE_INVALID_UNICODE_LITERAL]     = { "invalid Unicode escape sequence; Multiple codepoints at single character literal are disallowed", PM_ERROR_LEVEL_SYNTAX },
+    [PM_ERR_ESCAPE_INVALID_UNICODE_LONG]        = { "invalid Unicode escape sequence; maximum length is 6 digits", PM_ERROR_LEVEL_SYNTAX },
+    [PM_ERR_ESCAPE_INVALID_UNICODE_SHORT]       = { "too short escape sequence: %.*s", PM_ERROR_LEVEL_SYNTAX },
+    [PM_ERR_ESCAPE_INVALID_UNICODE_TERM]        = { "unterminated Unicode escape", PM_ERROR_LEVEL_SYNTAX },
+    [PM_ERR_EXPECT_ARGUMENT]                    = { "unexpected %s; expected an argument", PM_ERROR_LEVEL_SYNTAX },
+    [PM_ERR_EXPECT_EOL_AFTER_STATEMENT]         = { "unexpected %s, expecting end-of-input", PM_ERROR_LEVEL_SYNTAX },
+    [PM_ERR_EXPECT_EXPRESSION_AFTER_AMPAMPEQ]   = { "expected an expression after `&&=`", PM_ERROR_LEVEL_SYNTAX },
+    [PM_ERR_EXPECT_EXPRESSION_AFTER_PIPEPIPEEQ] = { "expected an expression after `||=`", PM_ERROR_LEVEL_SYNTAX },
+    [PM_ERR_EXPECT_EXPRESSION_AFTER_COMMA]      = { "expected an expression after `,`", PM_ERROR_LEVEL_SYNTAX },
+    [PM_ERR_EXPECT_EXPRESSION_AFTER_EQUAL]      = { "expected an expression after `=`", PM_ERROR_LEVEL_SYNTAX },
+    [PM_ERR_EXPECT_EXPRESSION_AFTER_LESS_LESS]  = { "expected an expression after `<<`", PM_ERROR_LEVEL_SYNTAX },
+    [PM_ERR_EXPECT_EXPRESSION_AFTER_LPAREN]     = { "expected an expression after `(`", PM_ERROR_LEVEL_SYNTAX },
+    [PM_ERR_EXPECT_EXPRESSION_AFTER_OPERATOR]   = { "unexpected %s; expected an expression after the operator", PM_ERROR_LEVEL_SYNTAX },
+    [PM_ERR_EXPECT_EXPRESSION_AFTER_SPLAT]      = { "expected an expression after `*` splat in an argument", PM_ERROR_LEVEL_SYNTAX },
+    [PM_ERR_EXPECT_EXPRESSION_AFTER_SPLAT_HASH] = { "expected an expression after `**` in a hash", PM_ERROR_LEVEL_SYNTAX },
+    [PM_ERR_EXPECT_EXPRESSION_AFTER_STAR]       = { "expected an expression after `*`", PM_ERROR_LEVEL_SYNTAX },
+    [PM_ERR_EXPECT_FOR_DELIMITER]               = { "unexpected %s; expected a 'do', newline, or ';' after the 'for' loop collection", PM_ERROR_LEVEL_SYNTAX },
+    [PM_ERR_EXPECT_IDENT_REQ_PARAMETER]         = { "expected an identifier for the required parameter", PM_ERROR_LEVEL_SYNTAX },
+    [PM_ERR_EXPECT_IN_DELIMITER]                = { "expected a delimiter after the patterns of an `in` clause", PM_ERROR_LEVEL_SYNTAX },
+    [PM_ERR_EXPECT_LPAREN_REQ_PARAMETER]        = { "expected a `(` to start a required parameter", PM_ERROR_LEVEL_SYNTAX },
+    [PM_ERR_EXPECT_MESSAGE]                     = { "unexpected %s; expecting a message to send to the receiver", PM_ERROR_LEVEL_SYNTAX },
+    [PM_ERR_EXPECT_RBRACKET]                    = { "expected a matching `]`", PM_ERROR_LEVEL_SYNTAX },
+    [PM_ERR_EXPECT_RPAREN]                      = { "expected a matching `)`", PM_ERROR_LEVEL_SYNTAX },
+    [PM_ERR_EXPECT_RPAREN_AFTER_MULTI]          = { "expected a `)` after multiple assignment", PM_ERROR_LEVEL_SYNTAX },
+    [PM_ERR_EXPECT_RPAREN_REQ_PARAMETER]        = { "expected a `)` to end a required parameter", PM_ERROR_LEVEL_SYNTAX },
+    [PM_ERR_EXPECT_SINGLETON_CLASS_DELIMITER]   = { "unexpected %s; expected a newline or a ';' after the singleton class", PM_ERROR_LEVEL_SYNTAX },
+    [PM_ERR_EXPECT_STRING_CONTENT]              = { "expected string content after opening string delimiter", PM_ERROR_LEVEL_SYNTAX },
+    [PM_ERR_EXPECT_WHEN_DELIMITER]              = { "expected a delimiter after the predicates of a `when` clause", PM_ERROR_LEVEL_SYNTAX },
+    [PM_ERR_EXPRESSION_BARE_HASH]               = { "unexpected bare hash in expression", PM_ERROR_LEVEL_SYNTAX },
+    [PM_ERR_EXPRESSION_NOT_WRITABLE]            = { "unexpected '='; target cannot be written", PM_ERROR_LEVEL_SYNTAX },
+    [PM_ERR_EXPRESSION_NOT_WRITABLE_ENCODING]   = { "Can't assign to __ENCODING__", PM_ERROR_LEVEL_SYNTAX },
+    [PM_ERR_EXPRESSION_NOT_WRITABLE_FALSE]      = { "Can't assign to false", PM_ERROR_LEVEL_SYNTAX },
+    [PM_ERR_EXPRESSION_NOT_WRITABLE_FILE]       = { "Can't assign to __FILE__", PM_ERROR_LEVEL_SYNTAX },
+    [PM_ERR_EXPRESSION_NOT_WRITABLE_LINE]       = { "Can't assign to __LINE__", PM_ERROR_LEVEL_SYNTAX },
+    [PM_ERR_EXPRESSION_NOT_WRITABLE_NIL]        = { "Can't assign to nil", PM_ERROR_LEVEL_SYNTAX },
+    [PM_ERR_EXPRESSION_NOT_WRITABLE_NUMBERED]   = { "Can't assign to numbered parameter %.2s", PM_ERROR_LEVEL_SYNTAX },
+    [PM_ERR_EXPRESSION_NOT_WRITABLE_SELF]       = { "Can't change the value of self", PM_ERROR_LEVEL_SYNTAX },
+    [PM_ERR_EXPRESSION_NOT_WRITABLE_TRUE]       = { "Can't assign to true", PM_ERROR_LEVEL_SYNTAX },
+    [PM_ERR_FLOAT_PARSE]                        = { "could not parse the float '%.*s'", PM_ERROR_LEVEL_SYNTAX },
+    [PM_ERR_FOR_COLLECTION]                     = { "expected a collection after the `in` in a `for` statement", PM_ERROR_LEVEL_SYNTAX },
+    [PM_ERR_FOR_INDEX]                          = { "expected an index after `for`", PM_ERROR_LEVEL_SYNTAX },
+    [PM_ERR_FOR_IN]                             = { "expected an `in` after the index in a `for` statement", PM_ERROR_LEVEL_SYNTAX },
+    [PM_ERR_FOR_TERM]                           = { "expected an `end` to close the `for` loop", PM_ERROR_LEVEL_SYNTAX },
+    [PM_ERR_GLOBAL_VARIABLE_BARE]               = { "'$' without identifiers is not allowed as a global variable name", PM_ERROR_LEVEL_SYNTAX },
+    [PM_ERR_HASH_EXPRESSION_AFTER_LABEL]        = { "expected an expression after the label in a hash", PM_ERROR_LEVEL_SYNTAX },
+    [PM_ERR_HASH_KEY]                           = { "unexpected %s, expecting '}' or a key in the hash literal", PM_ERROR_LEVEL_SYNTAX },
+    [PM_ERR_HASH_ROCKET]                        = { "expected a `=>` between the hash key and value", PM_ERROR_LEVEL_SYNTAX },
+    [PM_ERR_HASH_TERM]                          = { "expected a `}` to close the hash literal", PM_ERROR_LEVEL_SYNTAX },
+    [PM_ERR_HASH_VALUE]                         = { "unexpected %s; expected a value in the hash literal", PM_ERROR_LEVEL_SYNTAX },
+    [PM_ERR_HEREDOC_IDENTIFIER]                 = { "unterminated here document identifier", PM_ERROR_LEVEL_SYNTAX },
+    [PM_ERR_HEREDOC_TERM]                       = { "unterminated heredoc; can't find string \"%.*s\" anywhere before EOF", PM_ERROR_LEVEL_SYNTAX },
+    [PM_ERR_INCOMPLETE_QUESTION_MARK]           = { "incomplete expression at `?`", PM_ERROR_LEVEL_SYNTAX },
+    [PM_ERR_INCOMPLETE_VARIABLE_CLASS_3_3]      = { "`%.*s' is not allowed as a class variable name", PM_ERROR_LEVEL_SYNTAX },
+    [PM_ERR_INCOMPLETE_VARIABLE_CLASS]          = { "'%.*s' is not allowed as a class variable name", PM_ERROR_LEVEL_SYNTAX },
+    [PM_ERR_INCOMPLETE_VARIABLE_INSTANCE_3_3]   = { "`%.*s' is not allowed as an instance variable name", PM_ERROR_LEVEL_SYNTAX },
+    [PM_ERR_INCOMPLETE_VARIABLE_INSTANCE]       = { "'%.*s' is not allowed as an instance variable name", PM_ERROR_LEVEL_SYNTAX },
+    [PM_ERR_INSTANCE_VARIABLE_BARE]             = { "'@' without identifiers is not allowed as an instance variable name", PM_ERROR_LEVEL_SYNTAX },
+    [PM_ERR_INVALID_BLOCK_EXIT]                 = { "Invalid %s", PM_ERROR_LEVEL_SYNTAX },
+    [PM_ERR_INVALID_COMMA]                      = { "invalid comma", PM_ERROR_LEVEL_SYNTAX },
+    [PM_ERR_INVALID_ESCAPE_CHARACTER]           = { "Invalid escape character syntax", PM_ERROR_LEVEL_SYNTAX },
+    [PM_ERR_INVALID_FLOAT_EXPONENT]             = { "invalid exponent", PM_ERROR_LEVEL_SYNTAX },
+    [PM_ERR_INVALID_LOCAL_VARIABLE_READ]        = { "identifier %.*s is not valid to get", PM_ERROR_LEVEL_SYNTAX },
+    [PM_ERR_INVALID_LOCAL_VARIABLE_WRITE]       = { "identifier %.*s is not valid to set", PM_ERROR_LEVEL_SYNTAX },
+    [PM_ERR_INVALID_NUMBER_BINARY]              = { "invalid binary number; numeric literal without digits", PM_ERROR_LEVEL_SYNTAX },
+    [PM_ERR_INVALID_NUMBER_DECIMAL]             = { "invalid decimal number; numeric literal without digits", PM_ERROR_LEVEL_SYNTAX },
+    [PM_ERR_INVALID_NUMBER_FRACTION]            = { "unexpected fraction part after numeric literal", PM_ERROR_LEVEL_SYNTAX },
+    [PM_ERR_INVALID_NUMBER_HEXADECIMAL]         = { "invalid hexadecimal number; numeric literal without digits", PM_ERROR_LEVEL_SYNTAX },
+    [PM_ERR_INVALID_NUMBER_OCTAL]               = { "invalid octal number; numeric literal without digits", PM_ERROR_LEVEL_SYNTAX },
+    [PM_ERR_INVALID_NUMBER_UNDERSCORE_INNER]    = { "invalid underscore placement in number", PM_ERROR_LEVEL_SYNTAX },
+    [PM_ERR_INVALID_NUMBER_UNDERSCORE_TRAILING] = { "trailing '_' in number", PM_ERROR_LEVEL_SYNTAX },
+    [PM_ERR_INVALID_CHARACTER]                  = { "Invalid char '\\x%02X' in expression", PM_ERROR_LEVEL_SYNTAX },
+    [PM_ERR_INVALID_MULTIBYTE_CHAR]             = { "invalid multibyte char (%s)", PM_ERROR_LEVEL_SYNTAX },
+    [PM_ERR_INVALID_MULTIBYTE_CHARACTER]        = { "invalid multibyte character 0x%X", PM_ERROR_LEVEL_SYNTAX },
+    [PM_ERR_INVALID_MULTIBYTE_ESCAPE]           = { "invalid multibyte escape: /%.*s/", PM_ERROR_LEVEL_SYNTAX },
+    [PM_ERR_INVALID_PRINTABLE_CHARACTER]        = { "invalid character `%c`", PM_ERROR_LEVEL_SYNTAX },
+    [PM_ERR_INVALID_PERCENT]                    = { "unknown type of %string", PM_ERROR_LEVEL_SYNTAX },
+    [PM_ERR_INVALID_PERCENT_EOF]                = { "unterminated quoted string meets end of file", PM_ERROR_LEVEL_SYNTAX },
+    [PM_ERR_INVALID_RETRY_AFTER_ELSE]           = { "Invalid retry after else", PM_ERROR_LEVEL_SYNTAX },
+    [PM_ERR_INVALID_RETRY_AFTER_ENSURE]         = { "Invalid retry after ensure", PM_ERROR_LEVEL_SYNTAX },
+    [PM_ERR_INVALID_RETRY_WITHOUT_RESCUE]       = { "Invalid retry without rescue", PM_ERROR_LEVEL_SYNTAX },
+    [PM_ERR_INVALID_SYMBOL]                     = { "invalid symbol", PM_ERROR_LEVEL_SYNTAX },
+    [PM_ERR_INVALID_VARIABLE_GLOBAL_3_3]        = { "`%.*s' is not allowed as a global variable name", PM_ERROR_LEVEL_SYNTAX },
+    [PM_ERR_INVALID_VARIABLE_GLOBAL]            = { "'%.*s' is not allowed as a global variable name", PM_ERROR_LEVEL_SYNTAX },
+    [PM_ERR_INVALID_YIELD]                      = { "Invalid yield", PM_ERROR_LEVEL_SYNTAX },
+    [PM_ERR_IT_NOT_ALLOWED_NUMBERED]            = { "'it' is not allowed when a numbered parameter is already used", PM_ERROR_LEVEL_SYNTAX },
+    [PM_ERR_IT_NOT_ALLOWED_ORDINARY]            = { "'it' is not allowed when an ordinary parameter is defined", PM_ERROR_LEVEL_SYNTAX },
+    [PM_ERR_LAMBDA_OPEN]                        = { "expected a `do` keyword or a `{` to open the lambda block", PM_ERROR_LEVEL_SYNTAX },
+    [PM_ERR_LAMBDA_TERM_BRACE]                  = { "expected a lambda block beginning with `{` to end with `}`", PM_ERROR_LEVEL_SYNTAX },
+    [PM_ERR_LAMBDA_TERM_END]                    = { "expected a lambda block beginning with `do` to end with `end`", PM_ERROR_LEVEL_SYNTAX },
+    [PM_ERR_LIST_I_LOWER_ELEMENT]               = { "expected a symbol in a `%i` list", PM_ERROR_LEVEL_SYNTAX },
+    [PM_ERR_LIST_I_LOWER_TERM]                  = { "unterminated list; expected a closing delimiter for the `%i`", PM_ERROR_LEVEL_SYNTAX },
+    [PM_ERR_LIST_I_UPPER_ELEMENT]               = { "expected a symbol in a `%I` list", PM_ERROR_LEVEL_SYNTAX },
+    [PM_ERR_LIST_I_UPPER_TERM]                  = { "unterminated list; expected a closing delimiter for the `%I`", PM_ERROR_LEVEL_SYNTAX },
+    [PM_ERR_LIST_W_LOWER_ELEMENT]               = { "expected a string in a `%w` list", PM_ERROR_LEVEL_SYNTAX },
+    [PM_ERR_LIST_W_LOWER_TERM]                  = { "unterminated list; expected a closing delimiter for the `%w`", PM_ERROR_LEVEL_SYNTAX },
+    [PM_ERR_LIST_W_UPPER_ELEMENT]               = { "expected a string in a `%W` list", PM_ERROR_LEVEL_SYNTAX },
+    [PM_ERR_LIST_W_UPPER_TERM]                  = { "unterminated list; expected a closing delimiter for the `%W`", PM_ERROR_LEVEL_SYNTAX },
+    [PM_ERR_MALLOC_FAILED]                      = { "failed to allocate memory", PM_ERROR_LEVEL_SYNTAX },
+    [PM_ERR_MIXED_ENCODING]                     = { "UTF-8 mixed within %s source", PM_ERROR_LEVEL_SYNTAX },
+    [PM_ERR_MODULE_IN_METHOD]                   = { "unexpected module definition in method body", PM_ERROR_LEVEL_SYNTAX },
+    [PM_ERR_MODULE_NAME]                        = { "unexpected constant path after `module`; class/module name must be CONSTANT", PM_ERROR_LEVEL_SYNTAX },
+    [PM_ERR_MODULE_TERM]                        = { "expected an `end` to close the `module` statement", PM_ERROR_LEVEL_SYNTAX },
+    [PM_ERR_MULTI_ASSIGN_MULTI_SPLATS]          = { "multiple splats in multiple assignment", PM_ERROR_LEVEL_SYNTAX },
+    [PM_ERR_MULTI_ASSIGN_UNEXPECTED_REST]       = { "unexpected '%.*s' resulting in multiple splats in multiple assignment", PM_ERROR_LEVEL_SYNTAX },
+    [PM_ERR_NESTING_TOO_DEEP]                   = { "nesting too deep", PM_ERROR_LEVEL_SYNTAX },
+    [PM_ERR_NO_LOCAL_VARIABLE]                  = { "%.*s: no such local variable", PM_ERROR_LEVEL_SYNTAX },
+    [PM_ERR_NON_ASSOCIATIVE_OPERATOR]           = { "unexpected %s; %s is a non-associative operator", PM_ERROR_LEVEL_SYNTAX },
+    [PM_ERR_NOT_EXPRESSION]                     = { "expected an expression after `not`", PM_ERROR_LEVEL_SYNTAX },
+    [PM_ERR_NUMBER_LITERAL_UNDERSCORE]          = { "number literal ending with a `_`", PM_ERROR_LEVEL_SYNTAX },
+    [PM_ERR_NUMBERED_PARAMETER_INNER_BLOCK]     = { "numbered parameter is already used in inner block", PM_ERROR_LEVEL_SYNTAX },
+    [PM_ERR_NUMBERED_PARAMETER_IT]              = { "numbered parameters are not allowed when 'it' is already used", PM_ERROR_LEVEL_SYNTAX },
+    [PM_ERR_NUMBERED_PARAMETER_ORDINARY]        = { "numbered parameters are not allowed when an ordinary parameter is defined", PM_ERROR_LEVEL_SYNTAX },
+    [PM_ERR_NUMBERED_PARAMETER_OUTER_BLOCK]     = { "numbered parameter is already used in outer block", PM_ERROR_LEVEL_SYNTAX },
+    [PM_ERR_OPERATOR_MULTI_ASSIGN]              = { "unexpected operator for a multiple assignment", PM_ERROR_LEVEL_SYNTAX },
+    [PM_ERR_OPERATOR_WRITE_ARGUMENTS]           = { "unexpected operator after a call with arguments", PM_ERROR_LEVEL_SYNTAX },
+    [PM_ERR_OPERATOR_WRITE_BLOCK]               = { "unexpected operator after a call with a block", PM_ERROR_LEVEL_SYNTAX },
+    [PM_ERR_PARAMETER_ASSOC_SPLAT_MULTI]        = { "unexpected multiple `**` splat parameters", PM_ERROR_LEVEL_SYNTAX },
+    [PM_ERR_PARAMETER_BLOCK_MULTI]              = { "multiple block parameters; only one block is allowed", PM_ERROR_LEVEL_SYNTAX },
+    [PM_ERR_PARAMETER_CIRCULAR]                 = { "circular argument reference - %.*s", PM_ERROR_LEVEL_SYNTAX },
+    [PM_ERR_PARAMETER_FORWARDING_AFTER_REST]    = { "... after rest argument", PM_ERROR_LEVEL_SYNTAX },
+    [PM_ERR_PARAMETER_METHOD_NAME]              = { "unexpected name for a parameter", PM_ERROR_LEVEL_SYNTAX },
+    [PM_ERR_PARAMETER_NAME_DUPLICATED]          = { "duplicated argument name", PM_ERROR_LEVEL_SYNTAX },
+    [PM_ERR_PARAMETER_NO_DEFAULT]               = { "expected a default value for the parameter", PM_ERROR_LEVEL_SYNTAX },
+    [PM_ERR_PARAMETER_NO_DEFAULT_KW]            = { "expected a default value for the keyword parameter", PM_ERROR_LEVEL_SYNTAX },
+    [PM_ERR_PARAMETER_NUMBERED_RESERVED]        = { "%.2s is reserved for numbered parameters", PM_ERROR_LEVEL_SYNTAX },
+    [PM_ERR_PARAMETER_ORDER]                    = { "unexpected parameter order", PM_ERROR_LEVEL_SYNTAX },
+    [PM_ERR_PARAMETER_SPLAT_MULTI]              = { "unexpected multiple `*` splat parameters", PM_ERROR_LEVEL_SYNTAX },
+    [PM_ERR_PARAMETER_STAR]                     = { "unexpected parameter `*`", PM_ERROR_LEVEL_SYNTAX },
+    [PM_ERR_PARAMETER_UNEXPECTED_FWD]           = { "unexpected `...` in parameters", PM_ERROR_LEVEL_SYNTAX },
+    [PM_ERR_PARAMETER_WILD_LOOSE_COMMA]         = { "unexpected `,` in parameters", PM_ERROR_LEVEL_SYNTAX },
+    [PM_ERR_PARAMETER_UNEXPECTED_NO_KW]         = { "unexpected **nil; no keywords marker disallowed after keywords", PM_ERROR_LEVEL_SYNTAX },
+    [PM_ERR_PATTERN_ARRAY_MULTIPLE_RESTS]       = { "unexpected multiple '*' rest patterns in an array pattern", PM_ERROR_LEVEL_SYNTAX },
+    [PM_ERR_PATTERN_CAPTURE_DUPLICATE]          = { "duplicated variable name", PM_ERROR_LEVEL_SYNTAX },
+    [PM_ERR_PATTERN_EXPRESSION_AFTER_BRACKET]   = { "expected a pattern expression after the `[` operator", PM_ERROR_LEVEL_SYNTAX },
+    [PM_ERR_PATTERN_EXPRESSION_AFTER_COMMA]     = { "expected a pattern expression after `,`", PM_ERROR_LEVEL_SYNTAX },
+    [PM_ERR_PATTERN_EXPRESSION_AFTER_HROCKET]   = { "expected a pattern expression after `=>`", PM_ERROR_LEVEL_SYNTAX },
+    [PM_ERR_PATTERN_EXPRESSION_AFTER_IN]        = { "expected a pattern expression after the `in` keyword", PM_ERROR_LEVEL_SYNTAX },
+    [PM_ERR_PATTERN_EXPRESSION_AFTER_KEY]       = { "expected a pattern expression after the key", PM_ERROR_LEVEL_SYNTAX },
+    [PM_ERR_PATTERN_EXPRESSION_AFTER_PAREN]     = { "expected a pattern expression after the `(` operator", PM_ERROR_LEVEL_SYNTAX },
+    [PM_ERR_PATTERN_EXPRESSION_AFTER_PIN]       = { "expected a pattern expression after the `^` pin operator", PM_ERROR_LEVEL_SYNTAX },
+    [PM_ERR_PATTERN_EXPRESSION_AFTER_PIPE]      = { "expected a pattern expression after the `|` operator", PM_ERROR_LEVEL_SYNTAX },
+    [PM_ERR_PATTERN_EXPRESSION_AFTER_RANGE]     = { "expected a pattern expression after the range operator", PM_ERROR_LEVEL_SYNTAX },
+    [PM_ERR_PATTERN_EXPRESSION_AFTER_REST]      = { "unexpected pattern expression after the `**` expression", PM_ERROR_LEVEL_SYNTAX },
+    [PM_ERR_PATTERN_FIND_MISSING_INNER]         = { "find patterns need at least one required inner pattern", PM_ERROR_LEVEL_SYNTAX },
+    [PM_ERR_PATTERN_HASH_IMPLICIT]              = { "unexpected implicit hash in pattern; use '{' to delineate", PM_ERROR_LEVEL_SYNTAX },
+    [PM_ERR_PATTERN_HASH_KEY]                   = { "unexpected %s; expected a key in the hash pattern", PM_ERROR_LEVEL_SYNTAX },
+    [PM_ERR_PATTERN_HASH_KEY_DUPLICATE]         = { "duplicated key name", PM_ERROR_LEVEL_SYNTAX },
+    [PM_ERR_PATTERN_HASH_KEY_INTERPOLATED]      = { "symbol literal with interpolation is not allowed", PM_ERROR_LEVEL_SYNTAX },
+    [PM_ERR_PATTERN_HASH_KEY_LABEL]             = { "expected a label as the key in the hash pattern", PM_ERROR_LEVEL_SYNTAX },
+    [PM_ERR_PATTERN_HASH_KEY_LOCALS]            = { "key must be valid as local variables", PM_ERROR_LEVEL_SYNTAX },
+    [PM_ERR_PATTERN_IDENT_AFTER_HROCKET]        = { "expected an identifier after the `=>` operator", PM_ERROR_LEVEL_SYNTAX },
+    [PM_ERR_PATTERN_LABEL_AFTER_COMMA]          = { "expected a label after the `,` in the hash pattern", PM_ERROR_LEVEL_SYNTAX },
+    [PM_ERR_PATTERN_REST]                       = { "unexpected rest pattern", PM_ERROR_LEVEL_SYNTAX },
+    [PM_ERR_PATTERN_TERM_BRACE]                 = { "expected a `}` to close the pattern expression", PM_ERROR_LEVEL_SYNTAX },
+    [PM_ERR_PATTERN_TERM_BRACKET]               = { "expected a `]` to close the pattern expression", PM_ERROR_LEVEL_SYNTAX },
+    [PM_ERR_PATTERN_TERM_PAREN]                 = { "expected a `)` to close the pattern expression", PM_ERROR_LEVEL_SYNTAX },
+    [PM_ERR_PIPEPIPEEQ_MULTI_ASSIGN]            = { "unexpected `||=` in a multiple assignment", PM_ERROR_LEVEL_SYNTAX },
+    [PM_ERR_REGEXP_ENCODING_OPTION_MISMATCH]    = { "regexp encoding option '%c' differs from source encoding '%s'", PM_ERROR_LEVEL_SYNTAX },
+    [PM_ERR_REGEXP_INCOMPAT_CHAR_ENCODING]      = { "incompatible character encoding: /%.*s/", PM_ERROR_LEVEL_SYNTAX },
+    [PM_ERR_REGEXP_NON_ESCAPED_MBC]             = { "/.../n has a non escaped non ASCII character in non ASCII-8BIT script: /%.*s/", PM_ERROR_LEVEL_SYNTAX },
+    [PM_ERR_REGEXP_INVALID_UNICODE_RANGE]       = { "invalid Unicode range: /%.*s/", PM_ERROR_LEVEL_SYNTAX },
+    [PM_ERR_REGEXP_PARSE_ERROR]                 = { "%s", PM_ERROR_LEVEL_SYNTAX },
+    [PM_ERR_REGEXP_UNKNOWN_OPTIONS]             = { "unknown regexp %s - %.*s", PM_ERROR_LEVEL_SYNTAX },
+    [PM_ERR_REGEXP_TERM]                        = { "unterminated regexp meets end of file; expected a closing delimiter", PM_ERROR_LEVEL_SYNTAX },
+    [PM_ERR_REGEXP_UTF8_CHAR_NON_UTF8_REGEXP]   = { "UTF-8 character in non UTF-8 regexp: /%s/", PM_ERROR_LEVEL_SYNTAX },
+    [PM_ERR_RESCUE_EXPRESSION]                  = { "expected a rescued expression", PM_ERROR_LEVEL_SYNTAX },
+    [PM_ERR_RESCUE_MODIFIER_VALUE]              = { "expected a value after the `rescue` modifier", PM_ERROR_LEVEL_SYNTAX },
+    [PM_ERR_RESCUE_TERM]                        = { "expected a closing delimiter for the `rescue` clause", PM_ERROR_LEVEL_SYNTAX },
+    [PM_ERR_RESCUE_VARIABLE]                    = { "expected an exception variable after `=>` in a rescue statement", PM_ERROR_LEVEL_SYNTAX },
+    [PM_ERR_RETURN_INVALID]                     = { "Invalid return in class/module body", PM_ERROR_LEVEL_SYNTAX },
+    [PM_ERR_SINGLETON_FOR_LITERALS]             = { "cannot define singleton method for literals", PM_ERROR_LEVEL_SYNTAX },
+    [PM_ERR_STATEMENT_ALIAS]                    = { "unexpected an `alias` at a non-statement position", PM_ERROR_LEVEL_SYNTAX },
+    [PM_ERR_STATEMENT_POSTEXE_END]              = { "unexpected an `END` at a non-statement position", PM_ERROR_LEVEL_SYNTAX },
+    [PM_ERR_STATEMENT_PREEXE_BEGIN]             = { "unexpected a `BEGIN` at a non-statement position", PM_ERROR_LEVEL_SYNTAX },
+    [PM_ERR_STATEMENT_UNDEF]                    = { "unexpected an `undef` at a non-statement position", PM_ERROR_LEVEL_SYNTAX },
+    [PM_ERR_STRING_CONCATENATION]               = { "expected a string for concatenation", PM_ERROR_LEVEL_SYNTAX },
+    [PM_ERR_STRING_INTERPOLATED_TERM]           = { "unterminated string; expected a closing delimiter for the interpolated string", PM_ERROR_LEVEL_SYNTAX },
+    [PM_ERR_STRING_LITERAL_EOF]                 = { "unterminated string meets end of file", PM_ERROR_LEVEL_SYNTAX },
+    [PM_ERR_STRING_LITERAL_TERM]                = { "unexpected %s, expected a string literal terminator", PM_ERROR_LEVEL_SYNTAX },
+    [PM_ERR_SYMBOL_INVALID]                     = { "invalid symbol", PM_ERROR_LEVEL_SYNTAX }, // TODO expected symbol? prism.c ~9719
+    [PM_ERR_SYMBOL_TERM_DYNAMIC]                = { "unterminated quoted string; expected a closing delimiter for the dynamic symbol", PM_ERROR_LEVEL_SYNTAX },
+    [PM_ERR_SYMBOL_TERM_INTERPOLATED]           = { "unterminated symbol; expected a closing delimiter for the interpolated symbol", PM_ERROR_LEVEL_SYNTAX },
+    [PM_ERR_TERNARY_COLON]                      = { "expected a `:` after the true expression of a ternary operator", PM_ERROR_LEVEL_SYNTAX },
+    [PM_ERR_TERNARY_EXPRESSION_FALSE]           = { "expected an expression after `:` in the ternary operator", PM_ERROR_LEVEL_SYNTAX },
+    [PM_ERR_TERNARY_EXPRESSION_TRUE]            = { "expected an expression after `?` in the ternary operator", PM_ERROR_LEVEL_SYNTAX },
+    [PM_ERR_UNARY_RECEIVER]                     = { "unexpected %s, expected a receiver for unary `%c`", PM_ERROR_LEVEL_SYNTAX },
+    [PM_ERR_UNARY_DISALLOWED]                   = { "unexpected %s; unary calls are not allowed in this context", PM_ERROR_LEVEL_SYNTAX },
+    [PM_ERR_UNDEF_ARGUMENT]                     = { "invalid argument being passed to `undef`; expected a bare word, constant, or symbol argument", PM_ERROR_LEVEL_SYNTAX },
+    [PM_ERR_UNEXPECTED_BLOCK_ARGUMENT]          = { "block argument should not be given", PM_ERROR_LEVEL_SYNTAX },
+    [PM_ERR_UNEXPECTED_INDEX_BLOCK]             = { "unexpected block arg given in index assignment; blocks are not allowed in index assignment expressions", PM_ERROR_LEVEL_SYNTAX },
+    [PM_ERR_UNEXPECTED_INDEX_KEYWORDS]          = { "unexpected keyword arg given in index assignment; keywords are not allowed in index assignment expressions", PM_ERROR_LEVEL_SYNTAX },
+    [PM_ERR_UNEXPECTED_LABEL]                   = { "unexpected label", PM_ERROR_LEVEL_SYNTAX },
+    [PM_ERR_UNEXPECTED_MULTI_WRITE]             = { "unexpected multiple assignment; multiple assignment is not allowed in this context", PM_ERROR_LEVEL_SYNTAX },
+    [PM_ERR_UNEXPECTED_RANGE_OPERATOR]          = { "unexpected range operator; .. and ... are non-associative and cannot be chained", PM_ERROR_LEVEL_SYNTAX },
+    [PM_ERR_UNEXPECTED_SAFE_NAVIGATION]         = { "&. inside multiple assignment destination", PM_ERROR_LEVEL_SYNTAX },
+    [PM_ERR_UNEXPECTED_TOKEN_CLOSE_CONTEXT]     = { "unexpected %s, assuming it is closing the parent %s", PM_ERROR_LEVEL_SYNTAX },
+    [PM_ERR_UNEXPECTED_TOKEN_IGNORE]            = { "unexpected %s, ignoring it", PM_ERROR_LEVEL_SYNTAX },
+    [PM_ERR_UNTIL_TERM]                         = { "expected an `end` to close the `until` statement", PM_ERROR_LEVEL_SYNTAX },
+    [PM_ERR_VOID_EXPRESSION]                    = { "unexpected void value expression", PM_ERROR_LEVEL_SYNTAX },
+    [PM_ERR_WHILE_TERM]                         = { "expected an `end` to close the `while` statement", PM_ERROR_LEVEL_SYNTAX },
+    [PM_ERR_WRITE_TARGET_IN_METHOD]             = { "dynamic constant assignment", PM_ERROR_LEVEL_SYNTAX },
+    [PM_ERR_WRITE_TARGET_READONLY]              = { "Can't set variable %.*s", PM_ERROR_LEVEL_SYNTAX },
+    [PM_ERR_WRITE_TARGET_UNEXPECTED]            = { "unexpected write target", PM_ERROR_LEVEL_SYNTAX },
+    [PM_ERR_XSTRING_TERM]                       = { "expected a closing delimiter for the `%x` or backtick string", PM_ERROR_LEVEL_SYNTAX },
+
+    // Warnings
+    [PM_WARN_AMBIGUOUS_BINARY_OPERATOR]         = { "'%s' after local variable or literal is interpreted as binary operator even though it seems like %s", PM_WARNING_LEVEL_VERBOSE },
+    [PM_WARN_AMBIGUOUS_FIRST_ARGUMENT_MINUS]    = { "ambiguous first argument; put parentheses or a space even after `-` operator", PM_WARNING_LEVEL_VERBOSE },
+    [PM_WARN_AMBIGUOUS_FIRST_ARGUMENT_PLUS]     = { "ambiguous first argument; put parentheses or a space even after `+` operator", PM_WARNING_LEVEL_VERBOSE },
+    [PM_WARN_AMBIGUOUS_PREFIX_AMPERSAND]        = { "ambiguous `&` has been interpreted as an argument prefix", PM_WARNING_LEVEL_VERBOSE },
+    [PM_WARN_AMBIGUOUS_PREFIX_STAR]             = { "ambiguous `*` has been interpreted as an argument prefix", PM_WARNING_LEVEL_VERBOSE },
+    [PM_WARN_AMBIGUOUS_PREFIX_STAR_STAR]        = { "ambiguous `**` has been interpreted as an argument prefix", PM_WARNING_LEVEL_VERBOSE },
+    [PM_WARN_AMBIGUOUS_SLASH]                   = { "ambiguous `/`; wrap regexp in parentheses or add a space after `/` operator", PM_WARNING_LEVEL_VERBOSE },
+    [PM_WARN_COMPARISON_AFTER_COMPARISON]       = { "comparison '%.*s' after comparison", PM_WARNING_LEVEL_VERBOSE },
+    [PM_WARN_DOT_DOT_DOT_EOL]                   = { "... at EOL, should be parenthesized?", PM_WARNING_LEVEL_DEFAULT },
+    [PM_WARN_DUPLICATED_HASH_KEY]               = { "key %.*s is duplicated and overwritten on line %" PRIi32, PM_WARNING_LEVEL_DEFAULT },
+    [PM_WARN_DUPLICATED_WHEN_CLAUSE]            = { "'when' clause on line %" PRIi32 " duplicates 'when' clause on line %" PRIi32 " and is ignored", PM_WARNING_LEVEL_VERBOSE },
+    [PM_WARN_EQUAL_IN_CONDITIONAL_3_3]          = { "found `= literal' in conditional, should be ==", PM_WARNING_LEVEL_DEFAULT },
+    [PM_WARN_EQUAL_IN_CONDITIONAL]              = { "found '= literal' in conditional, should be ==", PM_WARNING_LEVEL_DEFAULT },
+    [PM_WARN_END_IN_METHOD]                     = { "END in method; use at_exit", PM_WARNING_LEVEL_DEFAULT },
+    [PM_WARN_FLOAT_OUT_OF_RANGE]                = { "Float %.*s%s out of range", PM_WARNING_LEVEL_VERBOSE },
+    [PM_WARN_IGNORED_FROZEN_STRING_LITERAL]     = { "'frozen_string_literal' is ignored after any tokens", PM_WARNING_LEVEL_VERBOSE },
+    [PM_WARN_INDENTATION_MISMATCH]              = { "mismatched indentations at '%.*s' with '%.*s' at %" PRIi32, PM_WARNING_LEVEL_VERBOSE },
+    [PM_WARN_INTEGER_IN_FLIP_FLOP]              = { "integer literal in flip-flop", PM_WARNING_LEVEL_DEFAULT },
+    [PM_WARN_INVALID_CHARACTER]                 = { "invalid character syntax; use %s%s%s", PM_WARNING_LEVEL_DEFAULT },
+    [PM_WARN_INVALID_MAGIC_COMMENT_VALUE]       = { "invalid value for %.*s: %.*s", PM_WARNING_LEVEL_VERBOSE },
+    [PM_WARN_INVALID_NUMBERED_REFERENCE]        = { "'%.*s' is too big for a number variable, always nil", PM_WARNING_LEVEL_DEFAULT },
+    [PM_WARN_KEYWORD_EOL]                       = { "`%.*s` at the end of line without an expression", PM_WARNING_LEVEL_VERBOSE },
+    [PM_WARN_LITERAL_IN_CONDITION_DEFAULT]      = { "%sliteral in %s", PM_WARNING_LEVEL_DEFAULT },
+    [PM_WARN_LITERAL_IN_CONDITION_VERBOSE]      = { "%sliteral in %s", PM_WARNING_LEVEL_VERBOSE },
+    [PM_WARN_SHAREABLE_CONSTANT_VALUE_LINE]     = { "'shareable_constant_value' is ignored unless in comment-only line", PM_WARNING_LEVEL_VERBOSE },
+    [PM_WARN_SHEBANG_CARRIAGE_RETURN]           = { "shebang line ending with \\r may cause problems", PM_WARNING_LEVEL_DEFAULT },
+    [PM_WARN_UNEXPECTED_CARRIAGE_RETURN]        = { "encountered \\r in middle of line, treated as a mere space", PM_WARNING_LEVEL_DEFAULT },
+    [PM_WARN_UNREACHABLE_STATEMENT]             = { "statement not reached", PM_WARNING_LEVEL_VERBOSE },
+    [PM_WARN_UNUSED_LOCAL_VARIABLE]             = { "assigned but unused variable - %.*s", PM_WARNING_LEVEL_VERBOSE },
+    [PM_WARN_VOID_STATEMENT]                    = { "possibly useless use of %.*s in void context", PM_WARNING_LEVEL_VERBOSE }
+};
+
+/**
+ * Get the human-readable name of the given diagnostic ID.
+ */
+const char *
+pm_diagnostic_id_human(pm_diagnostic_id_t diag_id) {
+    switch (diag_id) {
+        <%- errors.each do |error| -%>
+        case PM_ERR_<%= error.name %>: return "<%= error.name.downcase %>";
+        <%- end -%>
+        <%- warnings.each do |warning| -%>
+        case PM_WARN_<%= warning.name %>: return "<%= warning.name.downcase %>";
+        <%- end -%>
+    }
+
+    assert(false && "unreachable");
+    return "";
+}
+
+static inline const char *
+pm_diagnostic_message(pm_diagnostic_id_t diag_id) {
+    assert(diag_id < PM_DIAGNOSTIC_ID_MAX);
+
+    const char *message = diagnostic_messages[diag_id].message;
+    assert(message);
+
+    return message;
+}
+
+static inline uint8_t
+pm_diagnostic_level(pm_diagnostic_id_t diag_id) {
+    assert(diag_id < PM_DIAGNOSTIC_ID_MAX);
+
+    return (uint8_t) diagnostic_messages[diag_id].level;
+}
+
+/**
+ * Append an error to the given list of diagnostic.
+ */
+bool
+pm_diagnostic_list_append(pm_list_t *list, const uint8_t *start, const uint8_t *end, pm_diagnostic_id_t diag_id) {
+    pm_diagnostic_t *diagnostic = (pm_diagnostic_t *) xcalloc(1, sizeof(pm_diagnostic_t));
+    if (diagnostic == NULL) return false;
+
+    *diagnostic = (pm_diagnostic_t) {
+        .location = { start, end },
+        .diag_id = diag_id,
+        .message = pm_diagnostic_message(diag_id),
+        .owned = false,
+        .level = pm_diagnostic_level(diag_id)
+    };
+
+    pm_list_append(list, (pm_list_node_t *) diagnostic);
+    return true;
+}
+
+/**
+ * Append a diagnostic to the given list of diagnostics that is using a format
+ * string for its message.
+ */
+bool
+pm_diagnostic_list_append_format(pm_list_t *list, const uint8_t *start, const uint8_t *end, pm_diagnostic_id_t diag_id, ...) {
+    va_list arguments;
+    va_start(arguments, diag_id);
+
+    const char *format = pm_diagnostic_message(diag_id);
+    int result = vsnprintf(NULL, 0, format, arguments);
+    va_end(arguments);
+
+    if (result < 0) {
+        return false;
+    }
+
+    pm_diagnostic_t *diagnostic = (pm_diagnostic_t *) xcalloc(1, sizeof(pm_diagnostic_t));
+    if (diagnostic == NULL) {
+        return false;
+    }
+
+    size_t length = (size_t) (result + 1);
+    char *message = (char *) xmalloc(length);
+    if (message == NULL) {
+        xfree(diagnostic);
+        return false;
+    }
+
+    va_start(arguments, diag_id);
+    vsnprintf(message, length, format, arguments);
+    va_end(arguments);
+
+    *diagnostic = (pm_diagnostic_t) {
+        .location = { start, end },
+        .diag_id = diag_id,
+        .message = message,
+        .owned = true,
+        .level = pm_diagnostic_level(diag_id)
+    };
+
+    pm_list_append(list, (pm_list_node_t *) diagnostic);
+    return true;
+}
+
+/**
+ * Deallocate the internal state of the given diagnostic list.
+ */
+void
+pm_diagnostic_list_free(pm_list_t *list) {
+    pm_diagnostic_t *node = (pm_diagnostic_t *) list->head;
+
+    while (node != NULL) {
+        pm_diagnostic_t *next = (pm_diagnostic_t *) node->node.next;
+
+        if (node->owned) xfree((void *) node->message);
+        xfree(node);
+
+        node = next;
+    }
+}
diff --git a/prism/templates/src/node.c.erb b/prism/templates/src/node.c.erb
new file mode 100644
index 00000000000000..2357e552000bc3
--- /dev/null
+++ b/prism/templates/src/node.c.erb
@@ -0,0 +1,333 @@
+#line <%= __LINE__ + 1 %> "prism/templates/src/<%= File.basename(__FILE__) %>"
+#include "prism/node.h"
+
+/**
+ * Attempts to grow the node list to the next size. If there is already
+ * capacity in the list, this function does nothing. Otherwise it reallocates
+ * the list to be twice as large as it was before. If the reallocation fails,
+ * this function returns false, otherwise it returns true.
+ */
+static bool
+pm_node_list_grow(pm_node_list_t *list, size_t size) {
+    size_t requested_size = list->size + size;
+
+    // If the requested size caused overflow, return false.
+    if (requested_size < list->size) return false;
+
+    // If the requested size is within the existing capacity, return true.
+    if (requested_size < list->capacity) return true;
+
+    // Otherwise, reallocate the list to be twice as large as it was before.
+    size_t next_capacity = list->capacity == 0 ? 4 : list->capacity * 2;
+
+    // If multiplying by 2 caused overflow, return false.
+    if (next_capacity < list->capacity) return false;
+
+    // If we didn't get enough by doubling, keep doubling until we do.
+    while (requested_size > next_capacity) {
+        size_t double_capacity = next_capacity * 2;
+
+        // Ensure we didn't overflow by multiplying by 2.
+        if (double_capacity < next_capacity) return false;
+        next_capacity = double_capacity;
+    }
+
+    pm_node_t **nodes = (pm_node_t **) xrealloc(list->nodes, sizeof(pm_node_t *) * next_capacity);
+    if (nodes == NULL) return false;
+
+    list->nodes = nodes;
+    list->capacity = next_capacity;
+    return true;
+}
+
+/**
+ * Append a new node onto the end of the node list.
+ */
+void
+pm_node_list_append(pm_node_list_t *list, pm_node_t *node) {
+    if (pm_node_list_grow(list, 1)) {
+        list->nodes[list->size++] = node;
+    }
+}
+
+/**
+ * Prepend a new node onto the beginning of the node list.
+ */
+void
+pm_node_list_prepend(pm_node_list_t *list, pm_node_t *node) {
+    if (pm_node_list_grow(list, 1)) {
+        memmove(list->nodes + 1, list->nodes, list->size * sizeof(pm_node_t *));
+        list->nodes[0] = node;
+        list->size++;
+    }
+}
+
+/**
+ * Concatenate the given node list onto the end of the other node list.
+ */
+void
+pm_node_list_concat(pm_node_list_t *list, pm_node_list_t *other) {
+    if (other->size > 0 && pm_node_list_grow(list, other->size)) {
+        memcpy(list->nodes + list->size, other->nodes, other->size * sizeof(pm_node_t *));
+        list->size += other->size;
+    }
+}
+
+/**
+ * Free the internal memory associated with the given node list.
+ */
+void
+pm_node_list_free(pm_node_list_t *list) {
+    if (list->capacity > 0) {
+        xfree(list->nodes);
+        *list = (pm_node_list_t) { 0 };
+    }
+}
+
+PRISM_EXPORTED_FUNCTION void
+pm_node_destroy(pm_parser_t *parser, pm_node_t *node);
+
+/**
+ * Destroy the nodes that are contained within the given node list.
+ */
+static void
+pm_node_list_destroy(pm_parser_t *parser, pm_node_list_t *list) {
+    pm_node_t *node;
+    PM_NODE_LIST_FOREACH(list, index, node) pm_node_destroy(parser, node);
+    pm_node_list_free(list);
+}
+
+/**
+ * Deallocate the space for a pm_node_t. Similarly to pm_node_alloc, we're not
+ * using the parser argument, but it's there to allow for the future possibility
+ * of pre-allocating larger memory pools.
+ */
+PRISM_EXPORTED_FUNCTION void
+pm_node_destroy(pm_parser_t *parser, pm_node_t *node) {
+    switch (PM_NODE_TYPE(node)) {
+        <%- nodes.each do |node| -%>
+#line <%= __LINE__ + 1 %> "prism/templates/src/<%= File.basename(__FILE__) %>"
+        case <%= node.type %>: {
+            <%- if node.fields.any? { |field| ![Prism::Template::LocationField, Prism::Template::OptionalLocationField, Prism::Template::UInt8Field, Prism::Template::UInt32Field, Prism::Template::ConstantField, Prism::Template::OptionalConstantField, Prism::Template::DoubleField].include?(field.class) } -%>
+            pm_<%= node.human %>_t *cast = (pm_<%= node.human %>_t *) node;
+            <%- end -%>
+            <%- node.fields.each do |field| -%>
+            <%- case field -%>
+            <%- when Prism::Template::LocationField, Prism::Template::OptionalLocationField, Prism::Template::UInt8Field, Prism::Template::UInt32Field, Prism::Template::ConstantField, Prism::Template::OptionalConstantField, Prism::Template::DoubleField -%>
+            <%- when Prism::Template::NodeField -%>
+            pm_node_destroy(parser, (pm_node_t *)cast-><%= field.name %>);
+            <%- when Prism::Template::OptionalNodeField -%>
+            if (cast-><%= field.name %> != NULL) {
+                pm_node_destroy(parser, (pm_node_t *)cast-><%= field.name %>);
+            }
+            <%- when Prism::Template::StringField -%>
+            pm_string_free(&cast-><%= field.name %>);
+            <%- when Prism::Template::NodeListField -%>
+            pm_node_list_destroy(parser, &cast-><%= field.name %>);
+            <%- when Prism::Template::ConstantListField -%>
+            pm_constant_id_list_free(&cast-><%= field.name %>);
+            <%- when Prism::Template::IntegerField -%>
+            pm_integer_free(&cast-><%= field.name %>);
+            <%- else -%>
+            <%- raise -%>
+            <%- end -%>
+            <%- end -%>
+            break;
+        }
+        <%- end -%>
+#line <%= __LINE__ + 1 %> "prism/templates/src/<%= File.basename(__FILE__) %>"
+        default:
+            assert(false && "unreachable");
+            break;
+    }
+    xfree(node);
+}
+
+/**
+ * Returns a string representation of the given node type.
+ */
+PRISM_EXPORTED_FUNCTION const char *
+pm_node_type_to_str(pm_node_type_t node_type)
+{
+    switch (node_type) {
+<%- nodes.each do |node| -%>
+        case <%= node.type %>:
+            return "<%= node.type %>";
+<%- end -%>
+    }
+    return "";
+}
+
+/**
+ * Visit each of the nodes in this subtree using the given visitor callback. The
+ * callback function will be called for each node in the subtree. If it returns
+ * false, then that node's children will not be visited. If it returns true,
+ * then the children will be visited. The data parameter is treated as an opaque
+ * pointer and is passed to the visitor callback for consumers to use as they
+ * see fit.
+ */
+PRISM_EXPORTED_FUNCTION void
+pm_visit_node(const pm_node_t *node, bool (*visitor)(const pm_node_t *node, void *data), void *data) {
+    if (visitor(node, data)) pm_visit_child_nodes(node, visitor, data);
+}
+
+/**
+ * Visit the children of the given node with the given callback. This is the
+ * default behavior for walking the tree that is called from pm_visit_node if
+ * the callback returns true.
+ */
+PRISM_EXPORTED_FUNCTION void
+pm_visit_child_nodes(const pm_node_t *node, bool (*visitor)(const pm_node_t *node, void *data), void *data) {
+    switch (PM_NODE_TYPE(node)) {
+        <%- nodes.each do |node| -%>
+        <%- if (fields = node.fields.select { |field| field.is_a?(Prism::Template::NodeField) || field.is_a?(Prism::Template::OptionalNodeField) || field.is_a?(Prism::Template::NodeListField) }).any? -%>
+        case <%= node.type %>: {
+            const pm_<%= node.human %>_t *cast = (const pm_<%= node.human %>_t *) node;
+            <%- fields.each do |field| -%>
+
+            // Visit the <%= field.name %> field
+            <%- case field -%>
+            <%- when Prism::Template::NodeField -%>
+            pm_visit_node((const pm_node_t *) cast-><%= field.name %>, visitor, data);
+            <%- when Prism::Template::OptionalNodeField -%>
+            if (cast-><%= field.name %> != NULL) {
+                pm_visit_node((const pm_node_t *) cast-><%= field.name %>, visitor, data);
+            }
+            <%- when Prism::Template::NodeListField -%>
+            const pm_node_list_t *<%= field.name %> = &cast-><%= field.name %>;
+            for (size_t index = 0; index < <%= field.name %>->size; index++) {
+                pm_visit_node(<%= field.name %>->nodes[index], visitor, data);
+            }
+            <%- end -%>
+            <%- end -%>
+
+            break;
+        }
+        <%- else -%>
+        case <%= node.type %>:
+            break;
+        <%- end -%>
+        <%- end -%>
+        case PM_SCOPE_NODE:
+            break;
+    }
+}
+
+// We optionally support dumping to JSON. For systems that don't want or need
+// this functionality, it can be turned off with the PRISM_EXCLUDE_JSON define.
+#ifndef PRISM_EXCLUDE_JSON
+
+static void
+pm_dump_json_constant(pm_buffer_t *buffer, const pm_parser_t *parser, pm_constant_id_t constant_id) {
+    const pm_constant_t *constant = pm_constant_pool_id_to_constant(&parser->constant_pool, constant_id);
+    pm_buffer_append_byte(buffer, '"');
+    pm_buffer_append_source(buffer, constant->start, constant->length, PM_BUFFER_ESCAPING_JSON);
+    pm_buffer_append_byte(buffer, '"');
+}
+
+static void
+pm_dump_json_location(pm_buffer_t *buffer, const pm_parser_t *parser, const pm_location_t *location) {
+    uint32_t start = (uint32_t) (location->start - parser->start);
+    uint32_t end = (uint32_t) (location->end - parser->start);
+    pm_buffer_append_format(buffer, "{\"start\":%" PRIu32 ",\"end\":%" PRIu32 "}", start, end);
+}
+
+/**
+ * Dump JSON to the given buffer.
+ */
+PRISM_EXPORTED_FUNCTION void
+pm_dump_json(pm_buffer_t *buffer, const pm_parser_t *parser, const pm_node_t *node) {
+    switch (PM_NODE_TYPE(node)) {
+        <%- nodes.each do |node| -%>
+        case <%= node.type %>: {
+            pm_buffer_append_string(buffer, "{\"type\":\"<%= node.name %>\",\"location\":", <%= node.name.bytesize + 22 %>);
+
+            const pm_<%= node.human %>_t *cast = (const pm_<%= node.human %>_t *) node;
+            pm_dump_json_location(buffer, parser, &cast->base.location);
+            <%- [*node.flags, *node.fields].each_with_index do |field, index| -%>
+
+            // Dump the <%= field.name %> field
+            pm_buffer_append_byte(buffer, ',');
+            pm_buffer_append_string(buffer, "\"<%= field.name %>\":", <%= field.name.bytesize + 3 %>);
+            <%- case field -%>
+            <%- when Prism::Template::NodeField -%>
+            pm_dump_json(buffer, parser, (const pm_node_t *) cast-><%= field.name %>);
+            <%- when Prism::Template::OptionalNodeField -%>
+            if (cast-><%= field.name %> != NULL) {
+                pm_dump_json(buffer, parser, (const pm_node_t *) cast-><%= field.name %>);
+            } else {
+                pm_buffer_append_string(buffer, "null", 4);
+            }
+            <%- when Prism::Template::NodeListField -%>
+            const pm_node_list_t *<%= field.name %> = &cast-><%= field.name %>;
+            pm_buffer_append_byte(buffer, '[');
+
+            for (size_t index = 0; index < <%= field.name %>->size; index++) {
+                if (index != 0) pm_buffer_append_byte(buffer, ',');
+                pm_dump_json(buffer, parser, <%= field.name %>->nodes[index]);
+            }
+            pm_buffer_append_byte(buffer, ']');
+            <%- when Prism::Template::StringField -%>
+            const pm_string_t *<%= field.name %> = &cast-><%= field.name %>;
+            pm_buffer_append_byte(buffer, '"');
+            pm_buffer_append_source(buffer, pm_string_source(<%= field.name %>), pm_string_length(<%= field.name %>), PM_BUFFER_ESCAPING_JSON);
+            pm_buffer_append_byte(buffer, '"');
+            <%- when Prism::Template::ConstantField -%>
+            pm_dump_json_constant(buffer, parser, cast-><%= field.name %>);
+            <%- when Prism::Template::OptionalConstantField -%>
+            if (cast-><%= field.name %> != PM_CONSTANT_ID_UNSET) {
+                pm_dump_json_constant(buffer, parser, cast-><%= field.name %>);
+            } else {
+                pm_buffer_append_string(buffer, "null", 4);
+            }
+            <%- when Prism::Template::ConstantListField -%>
+            const pm_constant_id_list_t *<%= field.name %> = &cast-><%= field.name %>;
+            pm_buffer_append_byte(buffer, '[');
+
+            for (size_t index = 0; index < <%= field.name %>->size; index++) {
+                if (index != 0) pm_buffer_append_byte(buffer, ',');
+                pm_dump_json_constant(buffer, parser, <%= field.name %>->ids[index]);
+            }
+            pm_buffer_append_byte(buffer, ']');
+            <%- when Prism::Template::LocationField -%>
+            pm_dump_json_location(buffer, parser, &cast-><%= field.name %>);
+            <%- when Prism::Template::OptionalLocationField -%>
+            if (cast-><%= field.name %>.start != NULL) {
+                pm_dump_json_location(buffer, parser, &cast-><%= field.name %>);
+            } else {
+                pm_buffer_append_string(buffer, "null", 4);
+            }
+            <%- when Prism::Template::UInt8Field -%>
+            pm_buffer_append_format(buffer, "%" PRIu8, cast-><%= field.name %>);
+            <%- when Prism::Template::UInt32Field -%>
+            pm_buffer_append_format(buffer, "%" PRIu32, cast-><%= field.name %>);
+            <%- when Prism::Template::Flags -%>
+            size_t flags = 0;
+            pm_buffer_append_byte(buffer, '[');
+            <%- node.flags.values.each_with_index do |value, index| -%>
+            if (PM_NODE_FLAG_P(cast, PM_<%= node.flags.human.upcase %>_<%= value.name %>)) {
+                if (flags != 0) pm_buffer_append_byte(buffer, ',');
+                pm_buffer_append_string(buffer, "\"<%= value.name %>\"", <%= value.name.bytesize + 2 %>);
+                flags++;
+            }
+            <%- end -%>
+            pm_buffer_append_byte(buffer, ']');
+            <%- when Prism::Template::IntegerField -%>
+            pm_integer_string(buffer, &cast-><%= field.name %>);
+            <%- when Prism::Template::DoubleField -%>
+            pm_buffer_append_format(buffer, "%f", cast-><%= field.name %>);
+            <%- else -%>
+            <%- raise %>
+            <%- end -%>
+            <%- end -%>
+
+            pm_buffer_append_byte(buffer, '}');
+            break;
+        }
+        <%- end -%>
+        case PM_SCOPE_NODE:
+            break;
+    }
+}
+
+#endif
diff --git a/prism/templates/src/prettyprint.c.erb b/prism/templates/src/prettyprint.c.erb
new file mode 100644
index 00000000000000..639c2fecf33ba3
--- /dev/null
+++ b/prism/templates/src/prettyprint.c.erb
@@ -0,0 +1,166 @@
+<%# encoding: ASCII -%>
+#include "prism/prettyprint.h"
+
+// We optionally support pretty printing nodes. For systems that don't want or
+// need this functionality, it can be turned off with the
+// PRISM_EXCLUDE_PRETTYPRINT define.
+#ifdef PRISM_EXCLUDE_PRETTYPRINT
+
+void pm_prettyprint(void) {}
+
+#else
+
+static inline void
+prettyprint_location(pm_buffer_t *output_buffer, const pm_parser_t *parser, const pm_location_t *location) {
+    pm_line_column_t start = pm_newline_list_line_column(&parser->newline_list, location->start, parser->start_line);
+    pm_line_column_t end = pm_newline_list_line_column(&parser->newline_list, location->end, parser->start_line);
+    pm_buffer_append_format(output_buffer, "(%" PRIi32 ",%" PRIu32 ")-(%" PRIi32 ",%" PRIu32 ")", start.line, start.column, end.line, end.column);
+}
+
+static inline void
+prettyprint_constant(pm_buffer_t *output_buffer, const pm_parser_t *parser, const pm_constant_id_t constant_id) {
+    pm_constant_t *constant = pm_constant_pool_id_to_constant(&parser->constant_pool, constant_id);
+    pm_buffer_append_format(output_buffer, ":%.*s", (int) constant->length, constant->start);
+}
+
+static void
+prettyprint_node(pm_buffer_t *output_buffer, const pm_parser_t *parser, const pm_node_t *node, pm_buffer_t *prefix_buffer) {
+    switch (PM_NODE_TYPE(node)) {
+        case PM_SCOPE_NODE:
+            // We do not need to print a ScopeNode as it's not part of the AST.
+            return;
+        <%- nodes.each do |node| -%>
+        case <%= node.type %>: {
+            <%- if !node.flags.nil? || node.fields.any? -%>
+            pm_<%= node.human %>_t *cast = (pm_<%= node.human %>_t *) node;
+            <%- end -%>
+            pm_buffer_append_string(output_buffer, "@ <%= node.name %> (location: ", <%= node.name.length + 14 %>);
+            prettyprint_location(output_buffer, parser, &node->location);
+            pm_buffer_append_string(output_buffer, ")\n", 2);
+            <%- (fields = [*node.flags, *node.fields]).each_with_index do |field, index| -%>
+            <%- preadd = index == fields.length - 1 ? "    " : "|   " -%>
+
+            // <%= field.name %>
+            {
+                pm_buffer_concat(output_buffer, prefix_buffer);
+                pm_buffer_append_string(output_buffer, "+-- <%= field.name %>:", <%= 4 + field.name.length + 1 %>);
+            <%- case field -%>
+            <%- when Prism::Template::NodeField -%>
+                pm_buffer_append_byte(output_buffer, '\n');
+
+                size_t prefix_length = prefix_buffer->length;
+                pm_buffer_append_string(prefix_buffer, "<%= preadd %>", 4);
+                pm_buffer_concat(output_buffer, prefix_buffer);
+                prettyprint_node(output_buffer, parser, (pm_node_t *) cast-><%= field.name %>, prefix_buffer);
+                prefix_buffer->length = prefix_length;
+            <%- when Prism::Template::OptionalNodeField -%>
+                if (cast-><%= field.name %> == NULL) {
+                    pm_buffer_append_string(output_buffer, " nil\n", 5);
+                } else {
+                    pm_buffer_append_byte(output_buffer, '\n');
+
+                    size_t prefix_length = prefix_buffer->length;
+                    pm_buffer_append_string(prefix_buffer, "<%= preadd %>", 4);
+                    pm_buffer_concat(output_buffer, prefix_buffer);
+                    prettyprint_node(output_buffer, parser, (pm_node_t *) cast-><%= field.name %>, prefix_buffer);
+                    prefix_buffer->length = prefix_length;
+                }
+            <%- when Prism::Template::StringField -%>
+                pm_buffer_append_string(output_buffer, " \"", 2);
+                pm_buffer_append_source(output_buffer, pm_string_source(&cast-><%= field.name %>), pm_string_length(&cast-><%= field.name %>), PM_BUFFER_ESCAPING_RUBY);
+                pm_buffer_append_string(output_buffer, "\"\n", 2);
+            <%- when Prism::Template::NodeListField -%>
+                pm_buffer_append_format(output_buffer, " (length: %lu)\n", (unsigned long) (cast-><%= field.name %>.size));
+
+                size_t last_index = cast-><%= field.name %>.size;
+                for (uint32_t index = 0; index < last_index; index++) {
+                    size_t prefix_length = prefix_buffer->length;
+                    pm_buffer_append_string(prefix_buffer, "<%= preadd %>", 4);
+                    pm_buffer_concat(output_buffer, prefix_buffer);
+                    pm_buffer_append_string(output_buffer, "+-- ", 4);
+                    pm_buffer_append_string(prefix_buffer, (index == last_index - 1) ? "    " : "|   ", 4);
+                    prettyprint_node(output_buffer, parser, (pm_node_t *) cast-><%= field.name %>.nodes[index], prefix_buffer);
+                    prefix_buffer->length = prefix_length;
+                }
+            <%- when Prism::Template::ConstantField -%>
+                pm_buffer_append_byte(output_buffer, ' ');
+                prettyprint_constant(output_buffer, parser, cast-><%= field.name %>);
+                pm_buffer_append_byte(output_buffer, '\n');
+            <%- when Prism::Template::OptionalConstantField -%>
+                if (cast-><%= field.name %> == 0) {
+                    pm_buffer_append_string(output_buffer, " nil\n", 5);
+                } else {
+                    pm_buffer_append_byte(output_buffer, ' ');
+                    prettyprint_constant(output_buffer, parser, cast-><%= field.name %>);
+                    pm_buffer_append_byte(output_buffer, '\n');
+                }
+            <%- when Prism::Template::ConstantListField -%>
+                pm_buffer_append_string(output_buffer, " [", 2);
+                for (uint32_t index = 0; index < cast-><%= field.name %>.size; index++) {
+                    if (index != 0) pm_buffer_append_string(output_buffer, ", ", 2);
+                    prettyprint_constant(output_buffer, parser, cast-><%= field.name %>.ids[index]);
+                }
+                pm_buffer_append_string(output_buffer, "]\n", 2);
+            <%- when Prism::Template::LocationField -%>
+                pm_location_t *location = &cast-><%= field.name %>;
+                pm_buffer_append_byte(output_buffer, ' ');
+                prettyprint_location(output_buffer, parser, location);
+                pm_buffer_append_string(output_buffer, " = \"", 4);
+                pm_buffer_append_source(output_buffer, location->start, (size_t) (location->end - location->start), PM_BUFFER_ESCAPING_RUBY);
+                pm_buffer_append_string(output_buffer, "\"\n", 2);
+            <%- when Prism::Template::OptionalLocationField -%>
+                pm_location_t *location = &cast-><%= field.name %>;
+                if (location->start == NULL) {
+                    pm_buffer_append_string(output_buffer, " nil\n", 5);
+                } else {
+                    pm_buffer_append_byte(output_buffer, ' ');
+                    prettyprint_location(output_buffer, parser, location);
+                    pm_buffer_append_string(output_buffer, " = \"", 4);
+                    pm_buffer_append_source(output_buffer, location->start, (size_t) (location->end - location->start), PM_BUFFER_ESCAPING_RUBY);
+                    pm_buffer_append_string(output_buffer, "\"\n", 2);
+                }
+            <%- when Prism::Template::UInt8Field -%>
+                pm_buffer_append_format(output_buffer, " %" PRIu8 "\n", cast-><%= field.name %>);
+            <%- when Prism::Template::UInt32Field -%>
+                pm_buffer_append_format(output_buffer, " %" PRIu32 "\n", cast-><%= field.name %>);
+            <%- when Prism::Template::Flags -%>
+                bool found = false;
+                <%- field.values.each do |value| -%>
+                if (cast->base.flags & PM_<%= field.human.upcase %>_<%= value.name %>) {
+                    if (found) pm_buffer_append_byte(output_buffer, ',');
+                    pm_buffer_append_string(output_buffer, " <%= value.name.downcase %>", <%= value.name.bytesize + 1 %>);
+                    found = true;
+                }
+                <%- end -%>
+                if (!found) pm_buffer_append_string(output_buffer, " nil", 4);
+                pm_buffer_append_byte(output_buffer, '\n');
+            <%- when Prism::Template::IntegerField -%>
+                const pm_integer_t *integer = &cast-><%= field.name %>;
+                pm_buffer_append_byte(output_buffer, ' ');
+                pm_integer_string(output_buffer, integer);
+                pm_buffer_append_byte(output_buffer, '\n');
+            <%- when Prism::Template::DoubleField -%>
+                pm_buffer_append_format(output_buffer, " %f\n", cast-><%= field.name %>);
+            <%- else -%>
+            <%- raise -%>
+            <%- end -%>
+            }
+            <%- end -%>
+
+            break;
+        }
+        <%- end -%>
+    }
+}
+
+/**
+ * Pretty-prints the AST represented by the given node to the given buffer.
+ */
+PRISM_EXPORTED_FUNCTION void
+pm_prettyprint(pm_buffer_t *output_buffer, const pm_parser_t *parser, const pm_node_t *node) {
+    pm_buffer_t prefix_buffer = { 0 };
+    prettyprint_node(output_buffer, parser, node, &prefix_buffer);
+    pm_buffer_free(&prefix_buffer);
+}
+
+#endif
diff --git a/prism/templates/src/serialize.c.erb b/prism/templates/src/serialize.c.erb
new file mode 100644
index 00000000000000..3e15a11039ef94
--- /dev/null
+++ b/prism/templates/src/serialize.c.erb
@@ -0,0 +1,406 @@
+#include "prism.h"
+
+// We optionally support serializing to a binary string. For systems that don't
+// want or need this functionality, it can be turned off with the
+// PRISM_EXCLUDE_SERIALIZATION define.
+#ifndef PRISM_EXCLUDE_SERIALIZATION
+
+#include <stdio.h>
+
+static inline uint32_t
+pm_ptrdifft_to_u32(ptrdiff_t value) {
+    assert(value >= 0 && ((unsigned long) value) < UINT32_MAX);
+    return (uint32_t) value;
+}
+
+static inline uint32_t
+pm_sizet_to_u32(size_t value) {
+    assert(value < UINT32_MAX);
+    return (uint32_t) value;
+}
+
+static void
+pm_serialize_location(const pm_parser_t *parser, const pm_location_t *location, pm_buffer_t *buffer) {
+    assert(location->start);
+    assert(location->end);
+    assert(location->start <= location->end);
+
+    pm_buffer_append_varuint(buffer, pm_ptrdifft_to_u32(location->start - parser->start));
+    pm_buffer_append_varuint(buffer, pm_ptrdifft_to_u32(location->end - location->start));
+}
+
+static void
+pm_serialize_string(const pm_parser_t *parser, const pm_string_t *string, pm_buffer_t *buffer) {
+    switch (string->type) {
+        case PM_STRING_SHARED: {
+            pm_buffer_append_byte(buffer, 1);
+            pm_buffer_append_varuint(buffer, pm_ptrdifft_to_u32(pm_string_source(string) - parser->start));
+            pm_buffer_append_varuint(buffer, pm_sizet_to_u32(pm_string_length(string)));
+            break;
+        }
+        case PM_STRING_OWNED:
+        case PM_STRING_CONSTANT: {
+            uint32_t length = pm_sizet_to_u32(pm_string_length(string));
+            pm_buffer_append_byte(buffer, 2);
+            pm_buffer_append_varuint(buffer, length);
+            pm_buffer_append_bytes(buffer, pm_string_source(string), length);
+            break;
+        }
+#ifdef PRISM_HAS_MMAP
+        case PM_STRING_MAPPED:
+            assert(false && "Cannot serialize mapped strings.");
+            break;
+#endif
+    }
+}
+
+static void
+pm_serialize_integer(const pm_integer_t *integer, pm_buffer_t *buffer) {
+    pm_buffer_append_byte(buffer, integer->negative ? 1 : 0);
+    if (integer->values == NULL) {
+        pm_buffer_append_varuint(buffer, pm_sizet_to_u32(1));
+        pm_buffer_append_varuint(buffer, integer->value);
+    } else {
+        pm_buffer_append_varuint(buffer, pm_sizet_to_u32(integer->length));
+        for (size_t i = 0; i < integer->length; i++) {
+            pm_buffer_append_varuint(buffer, integer->values[i]);
+        }
+    }
+}
+
+static void
+pm_serialize_node(pm_parser_t *parser, pm_node_t *node, pm_buffer_t *buffer) {
+    pm_buffer_append_byte(buffer, (uint8_t) PM_NODE_TYPE(node));
+
+    size_t offset = buffer->length;
+
+    <%- if Prism::Template::INCLUDE_NODE_ID -%>
+    pm_buffer_append_varuint(buffer, node->node_id);
+    <%- end -%>
+    pm_serialize_location(parser, &node->location, buffer);
+
+    switch (PM_NODE_TYPE(node)) {
+        // We do not need to serialize a ScopeNode ever as
+        // it is not part of the AST
+        case PM_SCOPE_NODE:
+            return;
+        <%- nodes.each do |node| -%>
+        case <%= node.type %>: {
+            <%- if node.needs_serialized_length? -%>
+            // serialize length
+            // encoding of location u32s make us need to save this offset.
+            size_t length_offset = buffer->length;
+            pm_buffer_append_string(buffer, "\0\0\0\0", 4); /* consume 4 bytes, updated below */
+            <%- end -%>
+            <%- unless Prism::Template::SERIALIZE_ONLY_SEMANTICS_FIELDS && !node.flags -%>
+            pm_buffer_append_varuint(buffer, (uint32_t) node->flags);
+            <%- end -%>
+            <%- node.fields.each do |field| -%>
+            <%- case field -%>
+            <%- when Prism::Template::NodeField -%>
+            pm_serialize_node(parser, (pm_node_t *)((pm_<%= node.human %>_t *)node)-><%= field.name %>, buffer);
+            <%- when Prism::Template::OptionalNodeField -%>
+            if (((pm_<%= node.human %>_t *)node)-><%= field.name %> == NULL) {
+                pm_buffer_append_byte(buffer, 0);
+            } else {
+                pm_serialize_node(parser, (pm_node_t *)((pm_<%= node.human %>_t *)node)-><%= field.name %>, buffer);
+            }
+            <%- when Prism::Template::StringField -%>
+            pm_serialize_string(parser, &((pm_<%= node.human %>_t *)node)-><%= field.name %>, buffer);
+            <%- when Prism::Template::NodeListField -%>
+            uint32_t <%= field.name %>_size = pm_sizet_to_u32(((pm_<%= node.human %>_t *)node)-><%= field.name %>.size);
+            pm_buffer_append_varuint(buffer, <%= field.name %>_size);
+            for (uint32_t index = 0; index < <%= field.name %>_size; index++) {
+                pm_serialize_node(parser, (pm_node_t *) ((pm_<%= node.human %>_t *)node)-><%= field.name %>.nodes[index], buffer);
+            }
+            <%- when Prism::Template::ConstantField, Prism::Template::OptionalConstantField -%>
+            pm_buffer_append_varuint(buffer, pm_sizet_to_u32(((pm_<%= node.human %>_t *)node)-><%= field.name %>));
+            <%- when Prism::Template::ConstantListField -%>
+            uint32_t <%= field.name %>_size = pm_sizet_to_u32(((pm_<%= node.human %>_t *)node)-><%= field.name %>.size);
+            pm_buffer_append_varuint(buffer, <%= field.name %>_size);
+            for (uint32_t index = 0; index < <%= field.name %>_size; index++) {
+                pm_buffer_append_varuint(buffer, pm_sizet_to_u32(((pm_<%= node.human %>_t *)node)-><%= field.name %>.ids[index]));
+            }
+            <%- when Prism::Template::LocationField -%>
+            <%- if field.should_be_serialized? -%>
+            pm_serialize_location(parser, &((pm_<%= node.human %>_t *)node)-><%= field.name %>, buffer);
+            <%- end -%>
+            <%- when Prism::Template::OptionalLocationField -%>
+            <%- if field.should_be_serialized? -%>
+            if (((pm_<%= node.human %>_t *)node)-><%= field.name %>.start == NULL) {
+                pm_buffer_append_byte(buffer, 0);
+            } else {
+                pm_buffer_append_byte(buffer, 1);
+                pm_serialize_location(parser, &((pm_<%= node.human %>_t *)node)-><%= field.name %>, buffer);
+            }
+            <%- end -%>
+            <%- when Prism::Template::UInt8Field -%>
+            pm_buffer_append_byte(buffer, ((pm_<%= node.human %>_t *)node)-><%= field.name %>);
+            <%- when Prism::Template::UInt32Field -%>
+            pm_buffer_append_varuint(buffer, ((pm_<%= node.human %>_t *)node)-><%= field.name %>);
+            <%- when Prism::Template::IntegerField -%>
+            pm_serialize_integer(&((pm_<%= node.human %>_t *)node)-><%= field.name %>, buffer);
+            <%- when Prism::Template::DoubleField -%>
+            pm_buffer_append_double(buffer, ((pm_<%= node.human %>_t *)node)-><%= field.name %>);
+            <%- else -%>
+            <%- raise -%>
+            <%- end -%>
+            <%- end -%>
+            <%- if node.needs_serialized_length? -%>
+            // serialize length
+            uint32_t length = pm_sizet_to_u32(buffer->length - offset - sizeof(uint32_t));
+            memcpy(buffer->value + length_offset, &length, sizeof(uint32_t));
+            <%- end -%>
+            break;
+        }
+        <%- end -%>
+    }
+}
+
+static void
+pm_serialize_newline_list(pm_newline_list_t *list, pm_buffer_t *buffer) {
+    uint32_t size = pm_sizet_to_u32(list->size);
+    pm_buffer_append_varuint(buffer, size);
+
+    for (uint32_t i = 0; i < size; i++) {
+        uint32_t offset = pm_sizet_to_u32(list->offsets[i]);
+        pm_buffer_append_varuint(buffer, offset);
+    }
+}
+
+static void
+pm_serialize_comment(pm_parser_t *parser, pm_comment_t *comment, pm_buffer_t *buffer) {
+    // serialize type
+    pm_buffer_append_byte(buffer, (uint8_t) comment->type);
+
+    // serialize location
+    pm_serialize_location(parser, &comment->location, buffer);
+}
+
+/**
+ * Serialize the given list of comments to the given buffer.
+ */
+void
+pm_serialize_comment_list(pm_parser_t *parser, pm_list_t *list, pm_buffer_t *buffer) {
+    pm_buffer_append_varuint(buffer, pm_sizet_to_u32(pm_list_size(list)));
+
+    pm_comment_t *comment;
+    for (comment = (pm_comment_t *) list->head; comment != NULL; comment = (pm_comment_t *) comment->node.next) {
+        pm_serialize_comment(parser, comment, buffer);
+    }
+}
+
+static void
+pm_serialize_magic_comment(pm_parser_t *parser, pm_magic_comment_t *magic_comment, pm_buffer_t *buffer) {
+    // serialize key location
+    pm_buffer_append_varuint(buffer, pm_ptrdifft_to_u32(magic_comment->key_start - parser->start));
+    pm_buffer_append_varuint(buffer, pm_sizet_to_u32(magic_comment->key_length));
+
+    // serialize value location
+    pm_buffer_append_varuint(buffer, pm_ptrdifft_to_u32(magic_comment->value_start - parser->start));
+    pm_buffer_append_varuint(buffer, pm_sizet_to_u32(magic_comment->value_length));
+}
+
+static void
+pm_serialize_magic_comment_list(pm_parser_t *parser, pm_list_t *list, pm_buffer_t *buffer) {
+    pm_buffer_append_varuint(buffer, pm_sizet_to_u32(pm_list_size(list)));
+
+    pm_magic_comment_t *magic_comment;
+    for (magic_comment = (pm_magic_comment_t *) list->head; magic_comment != NULL; magic_comment = (pm_magic_comment_t *) magic_comment->node.next) {
+        pm_serialize_magic_comment(parser, magic_comment, buffer);
+    }
+}
+
+static void
+pm_serialize_data_loc(const pm_parser_t *parser, pm_buffer_t *buffer) {
+    if (parser->data_loc.end == NULL) {
+        pm_buffer_append_byte(buffer, 0);
+    } else {
+        pm_buffer_append_byte(buffer, 1);
+        pm_serialize_location(parser, &parser->data_loc, buffer);
+    }
+}
+
+static void
+pm_serialize_diagnostic(pm_parser_t *parser, pm_diagnostic_t *diagnostic, pm_buffer_t *buffer) {
+    // serialize the type
+    pm_buffer_append_varuint(buffer, (uint32_t) diagnostic->diag_id);
+
+    // serialize message
+    size_t message_length = strlen(diagnostic->message);
+    pm_buffer_append_varuint(buffer, pm_sizet_to_u32(message_length));
+    pm_buffer_append_string(buffer, diagnostic->message, message_length);
+
+    // serialize location
+    pm_serialize_location(parser, &diagnostic->location, buffer);
+
+    pm_buffer_append_byte(buffer, diagnostic->level);
+}
+
+static void
+pm_serialize_diagnostic_list(pm_parser_t *parser, pm_list_t *list, pm_buffer_t *buffer) {
+    pm_buffer_append_varuint(buffer, pm_sizet_to_u32(pm_list_size(list)));
+
+    pm_diagnostic_t *diagnostic;
+    for (diagnostic = (pm_diagnostic_t *) list->head; diagnostic != NULL; diagnostic = (pm_diagnostic_t *) diagnostic->node.next) {
+        pm_serialize_diagnostic(parser, diagnostic, buffer);
+    }
+}
+
+/**
+ * Serialize the name of the encoding to the buffer.
+ */
+void
+pm_serialize_encoding(const pm_encoding_t *encoding, pm_buffer_t *buffer) {
+    size_t encoding_length = strlen(encoding->name);
+    pm_buffer_append_varuint(buffer, pm_sizet_to_u32(encoding_length));
+    pm_buffer_append_string(buffer, encoding->name, encoding_length);
+}
+
+static void
+pm_serialize_metadata(pm_parser_t *parser, pm_buffer_t *buffer) {
+    pm_serialize_encoding(parser->encoding, buffer);
+    pm_buffer_append_varsint(buffer, parser->start_line);
+    pm_serialize_newline_list(&parser->newline_list, buffer);
+<%- unless Prism::Template::SERIALIZE_ONLY_SEMANTICS_FIELDS -%>
+    pm_serialize_comment_list(parser, &parser->comment_list, buffer);
+<%- end -%>
+    pm_serialize_magic_comment_list(parser, &parser->magic_comment_list, buffer);
+    pm_serialize_data_loc(parser, buffer);
+    pm_serialize_diagnostic_list(parser, &parser->error_list, buffer);
+    pm_serialize_diagnostic_list(parser, &parser->warning_list, buffer);
+}
+
+#line <%= __LINE__ + 1 %> "prism/templates/src/<%= File.basename(__FILE__) %>"
+/**
+ * Serialize the metadata, nodes, and constant pool.
+ */
+void
+pm_serialize_content(pm_parser_t *parser, pm_node_t *node, pm_buffer_t *buffer) {
+    pm_serialize_metadata(parser, buffer);
+
+    // Here we're going to leave space for the offset of the constant pool in
+    // the buffer.
+    size_t offset = buffer->length;
+    pm_buffer_append_zeroes(buffer, 4);
+
+    // Next, encode the length of the constant pool.
+    pm_buffer_append_varuint(buffer, parser->constant_pool.size);
+
+    // Now we're going to serialize the content of the node.
+    pm_serialize_node(parser, node, buffer);
+
+    // Now we're going to serialize the offset of the constant pool back where
+    // we left space for it.
+    uint32_t length = pm_sizet_to_u32(buffer->length);
+    memcpy(buffer->value + offset, &length, sizeof(uint32_t));
+
+    // Now we're going to serialize the constant pool.
+    offset = buffer->length;
+    pm_buffer_append_zeroes(buffer, parser->constant_pool.size * 8);
+
+    for (uint32_t index = 0; index < parser->constant_pool.capacity; index++) {
+        pm_constant_pool_bucket_t *bucket = &parser->constant_pool.buckets[index];
+
+        // If we find a constant at this index, serialize it at the correct
+        // index in the buffer.
+        if (bucket->id != 0) {
+            pm_constant_t *constant = &parser->constant_pool.constants[bucket->id - 1];
+            size_t buffer_offset = offset + ((((size_t)bucket->id) - 1) * 8);
+
+            if (bucket->type == PM_CONSTANT_POOL_BUCKET_OWNED || bucket->type == PM_CONSTANT_POOL_BUCKET_CONSTANT) {
+                // Since this is an owned or constant constant, we are going to
+                // write its contents into the buffer after the constant pool.
+                // So effectively in place of the source offset, we have a
+                // buffer offset. We will add a leading 1 to indicate that this
+                // is a buffer offset.
+                uint32_t content_offset = pm_sizet_to_u32(buffer->length);
+                uint32_t owned_mask = (uint32_t) (1 << 31);
+
+                assert(content_offset < owned_mask);
+                content_offset |= owned_mask;
+
+                memcpy(buffer->value + buffer_offset, &content_offset, 4);
+                pm_buffer_append_bytes(buffer, constant->start, constant->length);
+            } else {
+                // Since this is a shared constant, we are going to write its
+                // source offset directly into the buffer.
+                uint32_t source_offset = pm_ptrdifft_to_u32(constant->start - parser->start);
+                memcpy(buffer->value + buffer_offset, &source_offset, 4);
+            }
+
+            // Now we can write the length of the constant into the buffer.
+            uint32_t constant_length = pm_sizet_to_u32(constant->length);
+            memcpy(buffer->value + buffer_offset + 4, &constant_length, 4);
+        }
+    }
+}
+
+static void
+serialize_token(void *data, pm_parser_t *parser, pm_token_t *token) {
+    pm_buffer_t *buffer = (pm_buffer_t *) data;
+
+    pm_buffer_append_varuint(buffer, token->type);
+    pm_buffer_append_varuint(buffer, pm_ptrdifft_to_u32(token->start - parser->start));
+    pm_buffer_append_varuint(buffer, pm_ptrdifft_to_u32(token->end - token->start));
+    pm_buffer_append_varuint(buffer, parser->lex_state);
+}
+
+/**
+ * Lex the given source and serialize to the given buffer.
+ */
+PRISM_EXPORTED_FUNCTION void
+pm_serialize_lex(pm_buffer_t *buffer, const uint8_t *source, size_t size, const char *data) {
+    pm_options_t options = { 0 };
+    pm_options_read(&options, data);
+
+    pm_parser_t parser;
+    pm_parser_init(&parser, source, size, &options);
+
+    pm_lex_callback_t lex_callback = (pm_lex_callback_t) {
+        .data = (void *) buffer,
+        .callback = serialize_token,
+    };
+
+    parser.lex_callback = &lex_callback;
+    pm_node_t *node = pm_parse(&parser);
+
+    // Append 0 to mark end of tokens.
+    pm_buffer_append_byte(buffer, 0);
+
+    pm_serialize_metadata(&parser, buffer);
+
+    pm_node_destroy(&parser, node);
+    pm_parser_free(&parser);
+    pm_options_free(&options);
+}
+
+/**
+ * Parse and serialize both the AST and the tokens represented by the given
+ * source to the given buffer.
+ */
+PRISM_EXPORTED_FUNCTION void
+pm_serialize_parse_lex(pm_buffer_t *buffer, const uint8_t *source, size_t size, const char *data) {
+    pm_options_t options = { 0 };
+    pm_options_read(&options, data);
+
+    pm_parser_t parser;
+    pm_parser_init(&parser, source, size, &options);
+
+    pm_lex_callback_t lex_callback = (pm_lex_callback_t) {
+        .data = (void *) buffer,
+        .callback = serialize_token,
+    };
+
+    parser.lex_callback = &lex_callback;
+    pm_node_t *node = pm_parse(&parser);
+
+    pm_buffer_append_byte(buffer, 0);
+    pm_serialize(&parser, node, buffer);
+
+    pm_node_destroy(&parser, node);
+    pm_parser_free(&parser);
+    pm_options_free(&options);
+}
+
+#endif
diff --git a/prism/templates/src/token_type.c.erb b/prism/templates/src/token_type.c.erb
new file mode 100644
index 00000000000000..f196393ee12661
--- /dev/null
+++ b/prism/templates/src/token_type.c.erb
@@ -0,0 +1,369 @@
+#include <string.h>
+
+#include "prism/ast.h"
+
+/**
+ * Returns a string representation of the given token type.
+ */
+PRISM_EXPORTED_FUNCTION const char *
+pm_token_type_name(pm_token_type_t token_type) {
+    switch (token_type) {
+<%- tokens.each do |token| -%>
+        case PM_TOKEN_<%= token.name %>:
+            return "<%= token.name %>";
+<%- end -%>
+        case PM_TOKEN_MAXIMUM:
+            assert(false && "unreachable");
+            return "";
+    }
+
+    // Provide a default, because some compilers can't determine that the above
+    // switch is exhaustive.
+    assert(false && "unreachable");
+    return "";
+}
+
+/**
+ * Returns the human name of the given token type.
+ */
+const char *
+pm_token_type_human(pm_token_type_t token_type) {
+    switch (token_type) {
+        case PM_TOKEN_EOF:
+            return "end-of-input";
+        case PM_TOKEN_MISSING:
+            return "missing token";
+        case PM_TOKEN_NOT_PROVIDED:
+            return "not provided token";
+        case PM_TOKEN_AMPERSAND:
+            return "'&'";
+        case PM_TOKEN_AMPERSAND_AMPERSAND:
+            return "'&&'";
+        case PM_TOKEN_AMPERSAND_AMPERSAND_EQUAL:
+            return "'&&='";
+        case PM_TOKEN_AMPERSAND_DOT:
+            return "'&.'";
+        case PM_TOKEN_AMPERSAND_EQUAL:
+            return "'&='";
+        case PM_TOKEN_BACKTICK:
+            return "'`'";
+        case PM_TOKEN_BACK_REFERENCE:
+            return "back reference";
+        case PM_TOKEN_BANG:
+            return "'!'";
+        case PM_TOKEN_BANG_EQUAL:
+            return "'!='";
+        case PM_TOKEN_BANG_TILDE:
+            return "'!~'";
+        case PM_TOKEN_BRACE_LEFT:
+            return "'{'";
+        case PM_TOKEN_BRACE_RIGHT:
+            return "'}'";
+        case PM_TOKEN_BRACKET_LEFT:
+            return "'['";
+        case PM_TOKEN_BRACKET_LEFT_ARRAY:
+            return "'['";
+        case PM_TOKEN_BRACKET_LEFT_RIGHT:
+            return "'[]'";
+        case PM_TOKEN_BRACKET_LEFT_RIGHT_EQUAL:
+            return "'[]='";
+        case PM_TOKEN_BRACKET_RIGHT:
+            return "']'";
+        case PM_TOKEN_CARET:
+            return "'^'";
+        case PM_TOKEN_CARET_EQUAL:
+            return "'^='";
+        case PM_TOKEN_CHARACTER_LITERAL:
+            return "character literal";
+        case PM_TOKEN_CLASS_VARIABLE:
+            return "class variable";
+        case PM_TOKEN_COLON:
+            return "':'";
+        case PM_TOKEN_COLON_COLON:
+            return "'::'";
+        case PM_TOKEN_COMMA:
+            return "','";
+        case PM_TOKEN_COMMENT:
+            return "comment";
+        case PM_TOKEN_CONSTANT:
+            return "constant";
+        case PM_TOKEN_DOT:
+            return "'.'";
+        case PM_TOKEN_DOT_DOT:
+            return "..";
+        case PM_TOKEN_DOT_DOT_DOT:
+            return "...";
+        case PM_TOKEN_EMBDOC_BEGIN:
+            return "'=begin'";
+        case PM_TOKEN_EMBDOC_END:
+            return "'=end'";
+        case PM_TOKEN_EMBDOC_LINE:
+            return "embedded documentation line";
+        case PM_TOKEN_EMBEXPR_BEGIN:
+            return "'#{'";
+        case PM_TOKEN_EMBEXPR_END:
+            return "'}'";
+        case PM_TOKEN_EMBVAR:
+            return "'#'";
+        case PM_TOKEN_EQUAL:
+            return "'='";
+        case PM_TOKEN_EQUAL_EQUAL:
+            return "'=='";
+        case PM_TOKEN_EQUAL_EQUAL_EQUAL:
+            return "'==='";
+        case PM_TOKEN_EQUAL_GREATER:
+            return "'=>'";
+        case PM_TOKEN_EQUAL_TILDE:
+            return "'=~'";
+        case PM_TOKEN_FLOAT:
+            return "float";
+        case PM_TOKEN_FLOAT_IMAGINARY:
+            return "imaginary";
+        case PM_TOKEN_FLOAT_RATIONAL:
+            return "rational";
+        case PM_TOKEN_FLOAT_RATIONAL_IMAGINARY:
+            return "imaginary";
+        case PM_TOKEN_GLOBAL_VARIABLE:
+            return "global variable";
+        case PM_TOKEN_GREATER:
+            return "'>'";
+        case PM_TOKEN_GREATER_EQUAL:
+            return "'>='";
+        case PM_TOKEN_GREATER_GREATER:
+            return ">>";
+        case PM_TOKEN_GREATER_GREATER_EQUAL:
+            return ">>=";
+        case PM_TOKEN_HEREDOC_END:
+            return "heredoc ending";
+        case PM_TOKEN_HEREDOC_START:
+            return "heredoc beginning";
+        case PM_TOKEN_IDENTIFIER:
+            return "local variable or method";
+        case PM_TOKEN_IGNORED_NEWLINE:
+            return "ignored newline";
+        case PM_TOKEN_INSTANCE_VARIABLE:
+            return "instance variable";
+        case PM_TOKEN_INTEGER:
+            return "integer";
+        case PM_TOKEN_INTEGER_IMAGINARY:
+            return "imaginary";
+        case PM_TOKEN_INTEGER_RATIONAL:
+            return "rational";
+        case PM_TOKEN_INTEGER_RATIONAL_IMAGINARY:
+            return "imaginary";
+        case PM_TOKEN_KEYWORD_ALIAS:
+            return "'alias'";
+        case PM_TOKEN_KEYWORD_AND:
+            return "'and'";
+        case PM_TOKEN_KEYWORD_BEGIN:
+            return "'begin'";
+        case PM_TOKEN_KEYWORD_BEGIN_UPCASE:
+            return "'BEGIN'";
+        case PM_TOKEN_KEYWORD_BREAK:
+            return "'break'";
+        case PM_TOKEN_KEYWORD_CASE:
+            return "'case'";
+        case PM_TOKEN_KEYWORD_CLASS:
+            return "'class'";
+        case PM_TOKEN_KEYWORD_DEF:
+            return "'def'";
+        case PM_TOKEN_KEYWORD_DEFINED:
+            return "'defined?'";
+        case PM_TOKEN_KEYWORD_DO:
+            return "'do'";
+        case PM_TOKEN_KEYWORD_DO_LOOP:
+            return "'do'";
+        case PM_TOKEN_KEYWORD_ELSE:
+            return "'else'";
+        case PM_TOKEN_KEYWORD_ELSIF:
+            return "'elsif'";
+        case PM_TOKEN_KEYWORD_END:
+            return "'end'";
+        case PM_TOKEN_KEYWORD_END_UPCASE:
+            return "'END'";
+        case PM_TOKEN_KEYWORD_ENSURE:
+            return "'ensure'";
+        case PM_TOKEN_KEYWORD_FALSE:
+            return "'false'";
+        case PM_TOKEN_KEYWORD_FOR:
+            return "'for'";
+        case PM_TOKEN_KEYWORD_IF:
+            return "'if'";
+        case PM_TOKEN_KEYWORD_IF_MODIFIER:
+            return "'if'";
+        case PM_TOKEN_KEYWORD_IN:
+            return "'in'";
+        case PM_TOKEN_KEYWORD_MODULE:
+            return "'module'";
+        case PM_TOKEN_KEYWORD_NEXT:
+            return "'next'";
+        case PM_TOKEN_KEYWORD_NIL:
+            return "'nil'";
+        case PM_TOKEN_KEYWORD_NOT:
+            return "'not'";
+        case PM_TOKEN_KEYWORD_OR:
+            return "'or'";
+        case PM_TOKEN_KEYWORD_REDO:
+            return "'redo'";
+        case PM_TOKEN_KEYWORD_RESCUE:
+            return "'rescue'";
+        case PM_TOKEN_KEYWORD_RESCUE_MODIFIER:
+            return "'rescue' modifier";
+        case PM_TOKEN_KEYWORD_RETRY:
+            return "'retry'";
+        case PM_TOKEN_KEYWORD_RETURN:
+            return "'return'";
+        case PM_TOKEN_KEYWORD_SELF:
+            return "'self'";
+        case PM_TOKEN_KEYWORD_SUPER:
+            return "'super'";
+        case PM_TOKEN_KEYWORD_THEN:
+            return "'then'";
+        case PM_TOKEN_KEYWORD_TRUE:
+            return "'true'";
+        case PM_TOKEN_KEYWORD_UNDEF:
+            return "'undef'";
+        case PM_TOKEN_KEYWORD_UNLESS:
+            return "'unless'";
+        case PM_TOKEN_KEYWORD_UNLESS_MODIFIER:
+            return "'unless'";
+        case PM_TOKEN_KEYWORD_UNTIL:
+            return "'until'";
+        case PM_TOKEN_KEYWORD_UNTIL_MODIFIER:
+            return "'until'";
+        case PM_TOKEN_KEYWORD_WHEN:
+            return "'when'";
+        case PM_TOKEN_KEYWORD_WHILE:
+            return "'while'";
+        case PM_TOKEN_KEYWORD_WHILE_MODIFIER:
+            return "'while'";
+        case PM_TOKEN_KEYWORD_YIELD:
+            return "'yield'";
+        case PM_TOKEN_KEYWORD___ENCODING__:
+            return "'__ENCODING__'";
+        case PM_TOKEN_KEYWORD___FILE__:
+            return "'__FILE__'";
+        case PM_TOKEN_KEYWORD___LINE__:
+            return "'__LINE__'";
+        case PM_TOKEN_LABEL:
+            return "label";
+        case PM_TOKEN_LABEL_END:
+            return "label terminator";
+        case PM_TOKEN_LAMBDA_BEGIN:
+            return "'{'";
+        case PM_TOKEN_LESS:
+            return "'<'";
+        case PM_TOKEN_LESS_EQUAL:
+            return "'<='";
+        case PM_TOKEN_LESS_EQUAL_GREATER:
+            return "'<=>'";
+        case PM_TOKEN_LESS_LESS:
+            return "<<";
+        case PM_TOKEN_LESS_LESS_EQUAL:
+            return "<<=";
+        case PM_TOKEN_METHOD_NAME:
+            return "method name";
+        case PM_TOKEN_MINUS:
+            return "'-'";
+        case PM_TOKEN_MINUS_EQUAL:
+            return "'-='";
+        case PM_TOKEN_MINUS_GREATER:
+            return "'->'";
+        case PM_TOKEN_NEWLINE:
+            return "newline";
+        case PM_TOKEN_NUMBERED_REFERENCE:
+            return "numbered reference";
+        case PM_TOKEN_PARENTHESIS_LEFT:
+            return "'('";
+        case PM_TOKEN_PARENTHESIS_LEFT_PARENTHESES:
+            return "'('";
+        case PM_TOKEN_PARENTHESIS_RIGHT:
+            return "')'";
+        case PM_TOKEN_PERCENT:
+            return "'%'";
+        case PM_TOKEN_PERCENT_EQUAL:
+            return "'%='";
+        case PM_TOKEN_PERCENT_LOWER_I:
+            return "'%i'";
+        case PM_TOKEN_PERCENT_LOWER_W:
+            return "'%w'";
+        case PM_TOKEN_PERCENT_LOWER_X:
+            return "'%x'";
+        case PM_TOKEN_PERCENT_UPPER_I:
+            return "'%I'";
+        case PM_TOKEN_PERCENT_UPPER_W:
+            return "'%W'";
+        case PM_TOKEN_PIPE:
+            return "'|'";
+        case PM_TOKEN_PIPE_EQUAL:
+            return "'|='";
+        case PM_TOKEN_PIPE_PIPE:
+            return "'||'";
+        case PM_TOKEN_PIPE_PIPE_EQUAL:
+            return "'||='";
+        case PM_TOKEN_PLUS:
+            return "'+'";
+        case PM_TOKEN_PLUS_EQUAL:
+            return "'+='";
+        case PM_TOKEN_QUESTION_MARK:
+            return "'?'";
+        case PM_TOKEN_REGEXP_BEGIN:
+            return "regular expression beginning";
+        case PM_TOKEN_REGEXP_END:
+            return "regular expression ending";
+        case PM_TOKEN_SEMICOLON:
+            return "';'";
+        case PM_TOKEN_SLASH:
+            return "'/'";
+        case PM_TOKEN_SLASH_EQUAL:
+            return "'/='";
+        case PM_TOKEN_STAR:
+            return "'*'";
+        case PM_TOKEN_STAR_EQUAL:
+            return "'*='";
+        case PM_TOKEN_STAR_STAR:
+            return "'**'";
+        case PM_TOKEN_STAR_STAR_EQUAL:
+            return "'**='";
+        case PM_TOKEN_STRING_BEGIN:
+            return "string literal";
+        case PM_TOKEN_STRING_CONTENT:
+            return "string content";
+        case PM_TOKEN_STRING_END:
+            return "string ending";
+        case PM_TOKEN_SYMBOL_BEGIN:
+            return "symbol literal";
+        case PM_TOKEN_TILDE:
+            return "'~'";
+        case PM_TOKEN_UAMPERSAND:
+            return "'&'";
+        case PM_TOKEN_UCOLON_COLON:
+            return "'::'";
+        case PM_TOKEN_UDOT_DOT:
+            return "'..'";
+        case PM_TOKEN_UDOT_DOT_DOT:
+            return "'...'";
+        case PM_TOKEN_UMINUS:
+            return "'-'";
+        case PM_TOKEN_UMINUS_NUM:
+            return "'-'";
+        case PM_TOKEN_UPLUS:
+            return "'+'";
+        case PM_TOKEN_USTAR:
+            return "*";
+        case PM_TOKEN_USTAR_STAR:
+            return "**";
+        case PM_TOKEN_WORDS_SEP:
+            return "string separator";
+        case PM_TOKEN___END__:
+            return "'__END__'";
+        case PM_TOKEN_MAXIMUM:
+            assert(false && "unreachable");
+            return "";
+    }
+
+    // Provide a default, because some compilers can't determine that the above
+    // switch is exhaustive.
+    assert(false && "unreachable");
+    return "";
+}
diff --git a/prism/templates/template.rb b/prism/templates/template.rb
new file mode 100755
index 00000000000000..6c3efd7e6c91a4
--- /dev/null
+++ b/prism/templates/template.rb
@@ -0,0 +1,689 @@
+#!/usr/bin/env ruby
+# typed: ignore
+
+require "erb"
+require "fileutils"
+require "yaml"
+
+module Prism
+  module Template
+    SERIALIZE_ONLY_SEMANTICS_FIELDS = ENV.fetch("PRISM_SERIALIZE_ONLY_SEMANTICS_FIELDS", false)
+    REMOVE_ON_ERROR_TYPES = SERIALIZE_ONLY_SEMANTICS_FIELDS
+    CHECK_FIELD_KIND = ENV.fetch("CHECK_FIELD_KIND", false)
+
+    JAVA_BACKEND = ENV["PRISM_JAVA_BACKEND"] || "truffleruby"
+    JAVA_STRING_TYPE = JAVA_BACKEND == "jruby" ? "org.jruby.RubySymbol" : "String"
+    INCLUDE_NODE_ID = !SERIALIZE_ONLY_SEMANTICS_FIELDS || JAVA_BACKEND == "jruby"
+
+    COMMON_FLAGS_COUNT = 2
+
+    class Error
+      attr_reader :name
+
+      def initialize(name)
+        @name = name
+      end
+    end
+
+    class Warning
+      attr_reader :name
+
+      def initialize(name)
+        @name = name
+      end
+    end
+
+    # This module contains methods for escaping characters in JavaDoc comments.
+    module JavaDoc
+      ESCAPES = {
+        "'" => "&#39;",
+        "\"" => "&quot;",
+        "@" => "&#64;",
+        "&" => "&amp;",
+        "<" => "&lt;",
+        ">" => "&gt;"
+      }.freeze
+
+      def self.escape(value)
+        value.gsub(/['&"<>@]/, ESCAPES)
+      end
+    end
+
+    # A comment attached to a field or node.
+    class ConfigComment
+      attr_reader :value
+
+      def initialize(value)
+        @value = value
+      end
+
+      def each_line(&block)
+        value.each_line { |line| yield line.prepend(" ").rstrip }
+      end
+
+      def each_java_line(&block)
+        ConfigComment.new(JavaDoc.escape(value)).each_line(&block)
+      end
+    end
+
+    # This represents a field on a node. It contains all of the necessary
+    # information to template out the code for that field.
+    class Field
+      attr_reader :name, :comment, :options
+
+      def initialize(name:, comment: nil, **options)
+        @name = name
+        @comment = comment
+        @options = options
+      end
+
+      def each_comment_line(&block)
+        ConfigComment.new(comment).each_line(&block) if comment
+      end
+
+      def each_comment_java_line(&block)
+        ConfigComment.new(comment).each_java_line(&block) if comment
+      end
+
+      def semantic_field?
+        true
+      end
+
+      def should_be_serialized?
+        SERIALIZE_ONLY_SEMANTICS_FIELDS ? semantic_field? : true
+      end
+    end
+
+    # Some node fields can be specialized if they point to a specific kind of
+    # node and not just a generic node.
+    class NodeKindField < Field
+      def initialize(kind:, **options)
+        @kind = kind
+        super(**options)
+      end
+
+      def c_type
+        if specific_kind
+          "pm_#{specific_kind.gsub(/(?<=.)[A-Z]/, "_\\0").downcase}"
+        else
+          "pm_node"
+        end
+      end
+
+      def ruby_type
+        specific_kind || "Node"
+      end
+
+      def java_type
+        specific_kind || "Node"
+      end
+
+      def java_cast
+        if specific_kind
+          "(Nodes.#{@kind}) "
+        else
+          ""
+        end
+      end
+
+      def specific_kind
+        @kind unless @kind.is_a?(Array)
+      end
+
+      def union_kind
+        @kind if @kind.is_a?(Array)
+      end
+    end
+
+    # This represents a field on a node that is itself a node. We pass them as
+    # references and store them as references.
+    class NodeField < NodeKindField
+      def rbs_class
+        if specific_kind
+          specific_kind
+        elsif union_kind
+          union_kind.join(" | ")
+        else
+          "Prism::node"
+        end
+      end
+
+      def rbi_class
+        if specific_kind
+          "Prism::#{specific_kind}"
+        elsif union_kind
+          "T.any(#{union_kind.map { |kind| "Prism::#{kind}" }.join(", ")})"
+        else
+          "Prism::Node"
+        end
+      end
+
+      def check_field_kind
+        if union_kind
+          "[#{union_kind.join(', ')}].include?(#{name}.class)"
+        else
+          "#{name}.is_a?(#{ruby_type})"
+        end
+      end
+    end
+
+    # This represents a field on a node that is itself a node and can be
+    # optionally null. We pass them as references and store them as references.
+    class OptionalNodeField < NodeKindField
+      def rbs_class
+        if specific_kind
+          "#{specific_kind}?"
+        elsif union_kind
+          [*union_kind, "nil"].join(" | ")
+        else
+          "Prism::node?"
+        end
+      end
+
+      def rbi_class
+        if specific_kind
+          "T.nilable(Prism::#{specific_kind})"
+        elsif union_kind
+          "T.nilable(T.any(#{union_kind.map { |kind| "Prism::#{kind}" }.join(", ")}))"
+        else
+          "T.nilable(Prism::Node)"
+        end
+      end
+
+      def check_field_kind
+        if union_kind
+          "[#{union_kind.join(', ')}, NilClass].include?(#{name}.class)"
+        else
+          "#{name}.nil? || #{name}.is_a?(#{ruby_type})"
+        end
+      end
+    end
+
+    # This represents a field on a node that is a list of nodes. We pass them as
+    # references and store them directly on the struct.
+    class NodeListField < NodeKindField
+      def rbs_class
+        if specific_kind
+          "Array[#{specific_kind}]"
+        elsif union_kind
+          "Array[#{union_kind.join(" | ")}]"
+        else
+          "Array[Prism::node]"
+        end
+      end
+
+      def rbi_class
+        if specific_kind
+          "T::Array[Prism::#{specific_kind}]"
+        elsif union_kind
+          "T::Array[T.any(#{union_kind.map { |kind| "Prism::#{kind}" }.join(", ")})]"
+        else
+          "T::Array[Prism::Node]"
+        end
+      end
+
+      def java_type
+        "#{super}[]"
+      end
+
+      def check_field_kind
+        if union_kind
+          "#{name}.all? { |n| [#{union_kind.join(', ')}].include?(n.class) }"
+        else
+          "#{name}.all? { |n| n.is_a?(#{ruby_type}) }"
+        end
+      end
+    end
+
+    # This represents a field on a node that is the ID of a string interned
+    # through the parser's constant pool.
+    class ConstantField < Field
+      def rbs_class
+        "Symbol"
+      end
+
+      def rbi_class
+        "Symbol"
+      end
+
+      def java_type
+        JAVA_STRING_TYPE
+      end
+    end
+
+    # This represents a field on a node that is the ID of a string interned
+    # through the parser's constant pool and can be optionally null.
+    class OptionalConstantField < Field
+      def rbs_class
+        "Symbol?"
+      end
+
+      def rbi_class
+        "T.nilable(Symbol)"
+      end
+
+      def java_type
+        JAVA_STRING_TYPE
+      end
+    end
+
+    # This represents a field on a node that is a list of IDs that are associated
+    # with strings interned through the parser's constant pool.
+    class ConstantListField < Field
+      def rbs_class
+        "Array[Symbol]"
+      end
+
+      def rbi_class
+        "T::Array[Symbol]"
+      end
+
+      def java_type
+        "#{JAVA_STRING_TYPE}[]"
+      end
+    end
+
+    # This represents a field on a node that is a string.
+    class StringField < Field
+      def rbs_class
+        "String"
+      end
+
+      def rbi_class
+        "String"
+      end
+
+      def java_type
+        "byte[]"
+      end
+    end
+
+    # This represents a field on a node that is a location.
+    class LocationField < Field
+      def semantic_field?
+        false
+      end
+
+      def rbs_class
+        "Location"
+      end
+
+      def rbi_class
+        "Prism::Location"
+      end
+
+      def java_type
+        "Location"
+      end
+    end
+
+    # This represents a field on a node that is a location that is optional.
+    class OptionalLocationField < Field
+      def semantic_field?
+        false
+      end
+
+      def rbs_class
+        "Location?"
+      end
+
+      def rbi_class
+        "T.nilable(Prism::Location)"
+      end
+
+      def java_type
+        "Location"
+      end
+    end
+
+    # This represents an integer field.
+    class UInt8Field < Field
+      def rbs_class
+        "Integer"
+      end
+
+      def rbi_class
+        "Integer"
+      end
+
+      def java_type
+        "int"
+      end
+    end
+
+    # This represents an integer field.
+    class UInt32Field < Field
+      def rbs_class
+        "Integer"
+      end
+
+      def rbi_class
+        "Integer"
+      end
+
+      def java_type
+        "int"
+      end
+    end
+
+    # This represents an arbitrarily-sized integer. When it gets to Ruby it will
+    # be an Integer.
+    class IntegerField < Field
+      def rbs_class
+        "Integer"
+      end
+
+      def rbi_class
+        "Integer"
+      end
+
+      def java_type
+        "Object"
+      end
+    end
+
+    # This represents a double-precision floating point number. When it gets to
+    # Ruby it will be a Float.
+    class DoubleField < Field
+      def rbs_class
+        "Float"
+      end
+
+      def rbi_class
+        "Float"
+      end
+
+      def java_type
+        "double"
+      end
+    end
+
+    # This class represents a node in the tree, configured by the config.yml file
+    # in YAML format. It contains information about the name of the node and the
+    # various child nodes it contains.
+    class NodeType
+      attr_reader :name, :type, :human, :flags, :fields, :newline, :comment
+
+      def initialize(config, flags)
+        @name = config.fetch("name")
+
+        type = @name.gsub(/(?<=.)[A-Z]/, "_\\0")
+        @type = "PM_#{type.upcase}"
+        @human = type.downcase
+
+        @fields =
+          config.fetch("fields", []).map do |field|
+            type = field_type_for(field.fetch("type"))
+
+            options = field.transform_keys(&:to_sym)
+            options.delete(:type)
+
+            # If/when we have documentation on every field, this should be
+            # changed to use fetch instead of delete.
+            comment = options.delete(:comment)
+
+            if kinds = options[:kind]
+              kinds = [kinds] unless kinds.is_a?(Array)
+              kinds = kinds.map do |kind|
+                case kind
+                when "non-void expression"
+                  # the actual list of types would be way too long
+                  "Node"
+                when "pattern expression"
+                  # the list of all possible types is too long with 37+ different classes
+                  "Node"
+                when Hash
+                  kind = kind.fetch("on error")
+                  REMOVE_ON_ERROR_TYPES ? nil : kind
+                else
+                  kind
+                end
+              end.compact
+              if kinds.size == 1
+                kinds = kinds.first
+                kinds = nil if kinds == "Node"
+              end
+              options[:kind] = kinds
+            else
+              if type < NodeKindField
+                raise "Missing kind in config.yml for field #{@name}##{options.fetch(:name)}"
+              end
+            end
+
+            type.new(comment: comment, **options)
+          end
+
+        @flags = config.key?("flags") ? flags.fetch(config.fetch("flags")) : nil
+        @newline = config.fetch("newline", true)
+        @comment = config.fetch("comment")
+      end
+
+      def each_comment_line(&block)
+        ConfigComment.new(comment).each_line(&block)
+      end
+
+      def each_comment_java_line(&block)
+        ConfigComment.new(comment).each_java_line(&block)
+      end
+
+      def semantic_fields
+        @semantic_fields ||= @fields.select(&:semantic_field?)
+      end
+
+      # Should emit serialized length of node so implementations can skip
+      # the node to enable lazy parsing.
+      def needs_serialized_length?
+        name == "DefNode"
+      end
+
+      private
+
+      def field_type_for(name)
+        case name
+        when "node"       then NodeField
+        when "node?"      then OptionalNodeField
+        when "node[]"     then NodeListField
+        when "string"     then StringField
+        when "constant"   then ConstantField
+        when "constant?"  then OptionalConstantField
+        when "constant[]" then ConstantListField
+        when "location"   then LocationField
+        when "location?"  then OptionalLocationField
+        when "uint8"      then UInt8Field
+        when "uint32"     then UInt32Field
+        when "integer"    then IntegerField
+        when "double"     then DoubleField
+        else raise("Unknown field type: #{name.inspect}")
+        end
+      end
+    end
+
+    # This represents a token in the lexer.
+    class Token
+      attr_reader :name, :value, :comment
+
+      def initialize(config)
+        @name = config.fetch("name")
+        @value = config["value"]
+        @comment = config.fetch("comment")
+      end
+    end
+
+    # Represents a set of flags that should be internally represented with an enum.
+    class Flags
+      # Represents an individual flag within a set of flags.
+      class Flag
+        attr_reader :name, :camelcase, :comment
+
+        def initialize(config)
+          @name = config.fetch("name")
+          @camelcase = @name.split("_").map(&:capitalize).join
+          @comment = config.fetch("comment")
+        end
+      end
+
+      attr_reader :name, :human, :values, :comment
+
+      def initialize(config)
+        @name = config.fetch("name")
+        @human = @name.gsub(/(?<=.)[A-Z]/, "_\\0").downcase
+        @values = config.fetch("values").map { |flag| Flag.new(flag) }
+        @comment = config.fetch("comment")
+      end
+
+      def self.empty
+        new("name" => "", "values" => [], "comment" => "")
+      end
+    end
+
+    class << self
+      # This templates out a file using ERB with the given locals. The locals are
+      # derived from the config.yml file.
+      def render(name, write_to: nil)
+        filepath = "templates/#{name}.erb"
+        template = File.expand_path("../#{filepath}", __dir__)
+
+        erb = read_template(template)
+        extension = File.extname(filepath.gsub(".erb", ""))
+
+        heading =
+          case extension
+          when ".rb"
+            <<~HEADING
+            # frozen_string_literal: true
+            # :markup: markdown
+
+            =begin
+            --
+            This file is generated by the templates/template.rb script and should not be
+            modified manually. See #{filepath}
+            if you are looking to modify the template
+            ++
+            =end
+
+            HEADING
+          when ".rbs"
+            <<~HEADING
+            # This file is generated by the templates/template.rb script and should not be
+            # modified manually. See #{filepath}
+            # if you are looking to modify the template
+
+            HEADING
+          when ".rbi"
+            <<~HEADING
+            # typed: strict
+
+            =begin
+            This file is generated by the templates/template.rb script and should not be
+            modified manually. See #{filepath}
+            if you are looking to modify the template
+            =end
+
+            HEADING
+          else
+            <<~HEADING
+            /* :markup: markdown */
+
+            /*----------------------------------------------------------------------------*/
+            /* This file is generated by the templates/template.rb script and should not  */
+            /* be modified manually. See                                                  */
+            /* #{filepath.ljust(74)} */
+            /* if you are looking to modify the                                           */
+            /* template                                                                   */
+            /*----------------------------------------------------------------------------*/
+
+            HEADING
+          end
+
+        write_to ||= File.expand_path("../#{name}", __dir__)
+        contents = heading + erb.result_with_hash(locals)
+
+        if (extension == ".c" || extension == ".h") && !contents.ascii_only?
+          # Enforce that we only have ASCII characters here. This is necessary
+          # for non-UTF-8 locales that only allow ASCII characters in C source
+          # files.
+          contents.each_line.with_index(1) do |line, line_number|
+            raise "Non-ASCII character on line #{line_number} of #{write_to}" unless line.ascii_only?
+          end
+        end
+
+        FileUtils.mkdir_p(File.dirname(write_to))
+        File.write(write_to, contents)
+      end
+
+      private
+
+      def read_template(filepath)
+        template = File.read(filepath, encoding: Encoding::UTF_8)
+        erb = erb(template)
+        erb.filename = filepath
+        erb
+      end
+
+      def erb(template)
+        ERB.new(template, trim_mode: "-")
+      end
+
+      def locals
+        @locals ||=
+          begin
+            config = YAML.load_file(File.expand_path("../config.yml", __dir__))
+            flags = config.fetch("flags").to_h { |flags| [flags["name"], Flags.new(flags)] }
+
+            {
+              errors: config.fetch("errors").map { |name| Error.new(name) },
+              warnings: config.fetch("warnings").map { |name| Warning.new(name) },
+              nodes: config.fetch("nodes").map { |node| NodeType.new(node, flags) }.sort_by(&:name),
+              tokens: config.fetch("tokens").map { |token| Token.new(token) },
+              flags: flags.values
+            }
+          end
+      end
+    end
+
+    TEMPLATES = [
+      "ext/prism/api_node.c",
+      "include/prism/ast.h",
+      "include/prism/diagnostic.h",
+      "javascript/src/deserialize.js",
+      "javascript/src/nodes.js",
+      "javascript/src/visitor.js",
+      "java/org/prism/Loader.java",
+      "java/org/prism/Nodes.java",
+      "java/org/prism/AbstractNodeVisitor.java",
+      "lib/prism/compiler.rb",
+      "lib/prism/dispatcher.rb",
+      "lib/prism/dot_visitor.rb",
+      "lib/prism/dsl.rb",
+      "lib/prism/inspect_visitor.rb",
+      "lib/prism/mutation_compiler.rb",
+      "lib/prism/node.rb",
+      "lib/prism/reflection.rb",
+      "lib/prism/serialize.rb",
+      "lib/prism/visitor.rb",
+      "src/diagnostic.c",
+      "src/node.c",
+      "src/prettyprint.c",
+      "src/serialize.c",
+      "src/token_type.c",
+      "rbi/prism/dsl.rbi",
+      "rbi/prism/node.rbi",
+      "rbi/prism/visitor.rbi",
+      "sig/prism.rbs",
+      "sig/prism/dsl.rbs",
+      "sig/prism/mutation_compiler.rbs",
+      "sig/prism/node.rbs",
+      "sig/prism/visitor.rbs",
+      "sig/prism/_private/dot_visitor.rbs"
+    ]
+  end
+end
+
+if __FILE__ == $0
+  if ARGV.empty?
+    Prism::Template::TEMPLATES.each { |filepath| Prism::Template.render(filepath) }
+  else # ruby/ruby
+    name, write_to = ARGV
+    Prism::Template.render(name, write_to: write_to)
+  end
+end
diff --git a/prism/util/pm_buffer.c b/prism/util/pm_buffer.c
new file mode 100644
index 00000000000000..2136a7c43eefd5
--- /dev/null
+++ b/prism/util/pm_buffer.c
@@ -0,0 +1,357 @@
+#include "prism/util/pm_buffer.h"
+
+/**
+ * Return the size of the pm_buffer_t struct.
+ */
+size_t
+pm_buffer_sizeof(void) {
+    return sizeof(pm_buffer_t);
+}
+
+/**
+ * Initialize a pm_buffer_t with the given capacity.
+ */
+bool
+pm_buffer_init_capacity(pm_buffer_t *buffer, size_t capacity) {
+    buffer->length = 0;
+    buffer->capacity = capacity;
+
+    buffer->value = (char *) xmalloc(capacity);
+    return buffer->value != NULL;
+}
+
+/**
+ * Initialize a pm_buffer_t with its default values.
+ */
+bool
+pm_buffer_init(pm_buffer_t *buffer) {
+    return pm_buffer_init_capacity(buffer, 1024);
+}
+
+/**
+ * Return the value of the buffer.
+ */
+char *
+pm_buffer_value(const pm_buffer_t *buffer) {
+    return buffer->value;
+}
+
+/**
+ * Return the length of the buffer.
+ */
+size_t
+pm_buffer_length(const pm_buffer_t *buffer) {
+    return buffer->length;
+}
+
+/**
+ * Append the given amount of space to the buffer.
+ */
+static inline bool
+pm_buffer_append_length(pm_buffer_t *buffer, size_t length) {
+    size_t next_length = buffer->length + length;
+
+    if (next_length > buffer->capacity) {
+        if (buffer->capacity == 0) {
+            buffer->capacity = 1;
+        }
+
+        while (next_length > buffer->capacity) {
+            buffer->capacity *= 2;
+        }
+
+        buffer->value = xrealloc(buffer->value, buffer->capacity);
+        if (buffer->value == NULL) return false;
+    }
+
+    buffer->length = next_length;
+    return true;
+}
+
+/**
+ * Append a generic pointer to memory to the buffer.
+ */
+static inline void
+pm_buffer_append(pm_buffer_t *buffer, const void *source, size_t length) {
+    size_t cursor = buffer->length;
+    if (pm_buffer_append_length(buffer, length)) {
+        memcpy(buffer->value + cursor, source, length);
+    }
+}
+
+/**
+ * Append the given amount of space as zeroes to the buffer.
+ */
+void
+pm_buffer_append_zeroes(pm_buffer_t *buffer, size_t length) {
+    size_t cursor = buffer->length;
+    if (pm_buffer_append_length(buffer, length)) {
+        memset(buffer->value + cursor, 0, length);
+    }
+}
+
+/**
+ * Append a formatted string to the buffer.
+ */
+void
+pm_buffer_append_format(pm_buffer_t *buffer, const char *format, ...) {
+    va_list arguments;
+    va_start(arguments, format);
+    int result = vsnprintf(NULL, 0, format, arguments);
+    va_end(arguments);
+
+    if (result < 0) return;
+    size_t length = (size_t) (result + 1);
+
+    size_t cursor = buffer->length;
+    if (pm_buffer_append_length(buffer, length)) {
+        va_start(arguments, format);
+        vsnprintf(buffer->value + cursor, length, format, arguments);
+        va_end(arguments);
+        buffer->length--;
+    }
+}
+
+/**
+ * Append a string to the buffer.
+ */
+void
+pm_buffer_append_string(pm_buffer_t *buffer, const char *value, size_t length) {
+    pm_buffer_append(buffer, value, length);
+}
+
+/**
+ * Append a list of bytes to the buffer.
+ */
+void
+pm_buffer_append_bytes(pm_buffer_t *buffer, const uint8_t *value, size_t length) {
+    pm_buffer_append(buffer, (const char *) value, length);
+}
+
+/**
+ * Append a single byte to the buffer.
+ */
+void
+pm_buffer_append_byte(pm_buffer_t *buffer, uint8_t value) {
+    const void *source = &value;
+    pm_buffer_append(buffer, source, sizeof(uint8_t));
+}
+
+/**
+ * Append a 32-bit unsigned integer to the buffer as a variable-length integer.
+ */
+void
+pm_buffer_append_varuint(pm_buffer_t *buffer, uint32_t value) {
+    if (value < 128) {
+        pm_buffer_append_byte(buffer, (uint8_t) value);
+    } else {
+        uint32_t n = value;
+        while (n >= 128) {
+            pm_buffer_append_byte(buffer, (uint8_t) (n | 128));
+            n >>= 7;
+        }
+        pm_buffer_append_byte(buffer, (uint8_t) n);
+    }
+}
+
+/**
+ * Append a 32-bit signed integer to the buffer as a variable-length integer.
+ */
+void
+pm_buffer_append_varsint(pm_buffer_t *buffer, int32_t value) {
+    uint32_t unsigned_int = ((uint32_t)(value) << 1) ^ ((uint32_t)(value >> 31));
+    pm_buffer_append_varuint(buffer, unsigned_int);
+}
+
+/**
+ * Append a double to the buffer.
+ */
+void
+pm_buffer_append_double(pm_buffer_t *buffer, double value) {
+    const void *source = &value;
+    pm_buffer_append(buffer, source, sizeof(double));
+}
+
+/**
+ * Append a unicode codepoint to the buffer.
+ */
+bool
+pm_buffer_append_unicode_codepoint(pm_buffer_t *buffer, uint32_t value) {
+    if (value <= 0x7F) {
+        pm_buffer_append_byte(buffer, (uint8_t) value); // 0xxxxxxx
+        return true;
+    } else if (value <= 0x7FF) {
+        uint8_t bytes[] = {
+            (uint8_t) (0xC0 | ((value >> 6) & 0x3F)), // 110xxxxx
+            (uint8_t) (0x80 | (value & 0x3F))         // 10xxxxxx
+        };
+
+        pm_buffer_append_bytes(buffer, bytes, 2);
+        return true;
+    } else if (value <= 0xFFFF) {
+        uint8_t bytes[] = {
+            (uint8_t) (0xE0 | ((value >> 12) & 0x3F)), // 1110xxxx
+            (uint8_t) (0x80 | ((value >> 6) & 0x3F)),  // 10xxxxxx
+            (uint8_t) (0x80 | (value & 0x3F))          // 10xxxxxx
+        };
+
+        pm_buffer_append_bytes(buffer, bytes, 3);
+        return true;
+    } else if (value <= 0x10FFFF) {
+        uint8_t bytes[] = {
+            (uint8_t) (0xF0 | ((value >> 18) & 0x3F)), // 11110xxx
+            (uint8_t) (0x80 | ((value >> 12) & 0x3F)), // 10xxxxxx
+            (uint8_t) (0x80 | ((value >> 6) & 0x3F)),  // 10xxxxxx
+            (uint8_t) (0x80 | (value & 0x3F))          // 10xxxxxx
+        };
+
+        pm_buffer_append_bytes(buffer, bytes, 4);
+        return true;
+    } else {
+        return false;
+    }
+}
+
+/**
+ * Append a slice of source code to the buffer.
+ */
+void
+pm_buffer_append_source(pm_buffer_t *buffer, const uint8_t *source, size_t length, pm_buffer_escaping_t escaping) {
+    for (size_t index = 0; index < length; index++) {
+        const uint8_t byte = source[index];
+
+        if ((byte <= 0x06) || (byte >= 0x0E && byte <= 0x1F) || (byte >= 0x7F)) {
+            if (escaping == PM_BUFFER_ESCAPING_RUBY) {
+                pm_buffer_append_format(buffer, "\\x%02X", byte);
+            } else {
+                pm_buffer_append_format(buffer, "\\u%04X", byte);
+            }
+        } else {
+            switch (byte) {
+                case '\a':
+                    if (escaping == PM_BUFFER_ESCAPING_RUBY) {
+                        pm_buffer_append_string(buffer, "\\a", 2);
+                    } else {
+                        pm_buffer_append_format(buffer, "\\u%04X", byte);
+                    }
+                    break;
+                case '\b':
+                    pm_buffer_append_string(buffer, "\\b", 2);
+                    break;
+                case '\t':
+                    pm_buffer_append_string(buffer, "\\t", 2);
+                    break;
+                case '\n':
+                    pm_buffer_append_string(buffer, "\\n", 2);
+                    break;
+                case '\v':
+                    if (escaping == PM_BUFFER_ESCAPING_RUBY) {
+                        pm_buffer_append_string(buffer, "\\v", 2);
+                    } else {
+                        pm_buffer_append_format(buffer, "\\u%04X", byte);
+                    }
+                    break;
+                case '\f':
+                    pm_buffer_append_string(buffer, "\\f", 2);
+                    break;
+                case '\r':
+                    pm_buffer_append_string(buffer, "\\r", 2);
+                    break;
+                case '"':
+                    pm_buffer_append_string(buffer, "\\\"", 2);
+                    break;
+                case '#': {
+                    if (escaping == PM_BUFFER_ESCAPING_RUBY && index + 1 < length) {
+                        const uint8_t next_byte = source[index + 1];
+                        if (next_byte == '{' || next_byte == '@' || next_byte == '$') {
+                            pm_buffer_append_byte(buffer, '\\');
+                        }
+                    }
+
+                    pm_buffer_append_byte(buffer, '#');
+                    break;
+                }
+                case '\\':
+                    pm_buffer_append_string(buffer, "\\\\", 2);
+                    break;
+                default:
+                    pm_buffer_append_byte(buffer, byte);
+                    break;
+            }
+        }
+    }
+}
+
+/**
+ * Prepend the given string to the buffer.
+ */
+void
+pm_buffer_prepend_string(pm_buffer_t *buffer, const char *value, size_t length) {
+    size_t cursor = buffer->length;
+    if (pm_buffer_append_length(buffer, length)) {
+        memmove(buffer->value + length, buffer->value, cursor);
+        memcpy(buffer->value, value, length);
+    }
+}
+
+/**
+ * Concatenate one buffer onto another.
+ */
+void
+pm_buffer_concat(pm_buffer_t *destination, const pm_buffer_t *source) {
+    if (source->length > 0) {
+        pm_buffer_append(destination, source->value, source->length);
+    }
+}
+
+/**
+ * Clear the buffer by reducing its size to 0. This does not free the allocated
+ * memory, but it does allow the buffer to be reused.
+ */
+void
+pm_buffer_clear(pm_buffer_t *buffer) {
+    buffer->length = 0;
+}
+
+/**
+ * Strip the whitespace from the end of the buffer.
+ */
+void
+pm_buffer_rstrip(pm_buffer_t *buffer) {
+    while (buffer->length > 0 && pm_char_is_whitespace((uint8_t) buffer->value[buffer->length - 1])) {
+        buffer->length--;
+    }
+}
+
+/**
+ * Checks if the buffer includes the given value.
+ */
+size_t
+pm_buffer_index(const pm_buffer_t *buffer, char value) {
+    const char *first = memchr(buffer->value, value, buffer->length);
+    return (first == NULL) ? SIZE_MAX : (size_t) (first - buffer->value);
+}
+
+/**
+ * Insert the given string into the buffer at the given index.
+ */
+void
+pm_buffer_insert(pm_buffer_t *buffer, size_t index, const char *value, size_t length) {
+    assert(index <= buffer->length);
+
+    if (index == buffer->length) {
+        pm_buffer_append_string(buffer, value, length);
+    } else {
+        pm_buffer_append_zeroes(buffer, length);
+        memmove(buffer->value + index + length, buffer->value + index, buffer->length - length - index);
+        memcpy(buffer->value + index, value, length);
+    }
+}
+
+/**
+ * Free the memory associated with the buffer.
+ */
+void
+pm_buffer_free(pm_buffer_t *buffer) {
+    xfree(buffer->value);
+}
diff --git a/prism/util/pm_buffer.h b/prism/util/pm_buffer.h
new file mode 100644
index 00000000000000..f3c20ab2a5ad10
--- /dev/null
+++ b/prism/util/pm_buffer.h
@@ -0,0 +1,228 @@
+/**
+ * @file pm_buffer.h
+ *
+ * A wrapper around a contiguous block of allocated memory.
+ */
+#ifndef PRISM_BUFFER_H
+#define PRISM_BUFFER_H
+
+#include "prism/defines.h"
+#include "prism/util/pm_char.h"
+
+#include <assert.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+#include <string.h>
+
+/**
+ * A pm_buffer_t is a simple memory buffer that stores data in a contiguous
+ * block of memory.
+ */
+typedef struct {
+    /** The length of the buffer in bytes. */
+    size_t length;
+
+    /** The capacity of the buffer in bytes that has been allocated. */
+    size_t capacity;
+
+    /** A pointer to the start of the buffer. */
+    char *value;
+} pm_buffer_t;
+
+/**
+ * Return the size of the pm_buffer_t struct.
+ *
+ * @returns The size of the pm_buffer_t struct.
+ */
+PRISM_EXPORTED_FUNCTION size_t pm_buffer_sizeof(void);
+
+/**
+ * Initialize a pm_buffer_t with the given capacity.
+ *
+ * @param buffer The buffer to initialize.
+ * @param capacity The capacity of the buffer.
+ * @returns True if the buffer was initialized successfully, false otherwise.
+ */
+bool pm_buffer_init_capacity(pm_buffer_t *buffer, size_t capacity);
+
+/**
+ * Initialize a pm_buffer_t with its default values.
+ *
+ * @param buffer The buffer to initialize.
+ * @returns True if the buffer was initialized successfully, false otherwise.
+ */
+PRISM_EXPORTED_FUNCTION bool pm_buffer_init(pm_buffer_t *buffer);
+
+/**
+ * Return the value of the buffer.
+ *
+ * @param buffer The buffer to get the value of.
+ * @returns The value of the buffer.
+ */
+PRISM_EXPORTED_FUNCTION char * pm_buffer_value(const pm_buffer_t *buffer);
+
+/**
+ * Return the length of the buffer.
+ *
+ * @param buffer The buffer to get the length of.
+ * @returns The length of the buffer.
+ */
+PRISM_EXPORTED_FUNCTION size_t pm_buffer_length(const pm_buffer_t *buffer);
+
+/**
+ * Append the given amount of space as zeroes to the buffer.
+ *
+ * @param buffer The buffer to append to.
+ * @param length The amount of space to append and zero.
+ */
+void pm_buffer_append_zeroes(pm_buffer_t *buffer, size_t length);
+
+/**
+ * Append a formatted string to the buffer.
+ *
+ * @param buffer The buffer to append to.
+ * @param format The format string to append.
+ * @param ... The arguments to the format string.
+ */
+void pm_buffer_append_format(pm_buffer_t *buffer, const char *format, ...) PRISM_ATTRIBUTE_FORMAT(2, 3);
+
+/**
+ * Append a string to the buffer.
+ *
+ * @param buffer The buffer to append to.
+ * @param value The string to append.
+ * @param length The length of the string to append.
+ */
+void pm_buffer_append_string(pm_buffer_t *buffer, const char *value, size_t length);
+
+/**
+ * Append a list of bytes to the buffer.
+ *
+ * @param buffer The buffer to append to.
+ * @param value The bytes to append.
+ * @param length The length of the bytes to append.
+ */
+void pm_buffer_append_bytes(pm_buffer_t *buffer, const uint8_t *value, size_t length);
+
+/**
+ * Append a single byte to the buffer.
+ *
+ * @param buffer The buffer to append to.
+ * @param value The byte to append.
+ */
+void pm_buffer_append_byte(pm_buffer_t *buffer, uint8_t value);
+
+/**
+ * Append a 32-bit unsigned integer to the buffer as a variable-length integer.
+ *
+ * @param buffer The buffer to append to.
+ * @param value The integer to append.
+ */
+void pm_buffer_append_varuint(pm_buffer_t *buffer, uint32_t value);
+
+/**
+ * Append a 32-bit signed integer to the buffer as a variable-length integer.
+ *
+ * @param buffer The buffer to append to.
+ * @param value The integer to append.
+ */
+void pm_buffer_append_varsint(pm_buffer_t *buffer, int32_t value);
+
+/**
+ * Append a double to the buffer.
+ *
+ * @param buffer The buffer to append to.
+ * @param value The double to append.
+ */
+void pm_buffer_append_double(pm_buffer_t *buffer, double value);
+
+/**
+ * Append a unicode codepoint to the buffer.
+ *
+ * @param buffer The buffer to append to.
+ * @param value The character to append.
+ * @returns True if the codepoint was valid and appended successfully, false
+ *   otherwise.
+ */
+bool pm_buffer_append_unicode_codepoint(pm_buffer_t *buffer, uint32_t value);
+
+/**
+ * The different types of escaping that can be performed by the buffer when
+ * appending a slice of Ruby source code.
+ */
+typedef enum {
+    PM_BUFFER_ESCAPING_RUBY,
+    PM_BUFFER_ESCAPING_JSON
+} pm_buffer_escaping_t;
+
+/**
+ * Append a slice of source code to the buffer.
+ *
+ * @param buffer The buffer to append to.
+ * @param source The source code to append.
+ * @param length The length of the source code to append.
+ * @param escaping The type of escaping to perform.
+ */
+void pm_buffer_append_source(pm_buffer_t *buffer, const uint8_t *source, size_t length, pm_buffer_escaping_t escaping);
+
+/**
+ * Prepend the given string to the buffer.
+ *
+ * @param buffer The buffer to prepend to.
+ * @param value The string to prepend.
+ * @param length The length of the string to prepend.
+ */
+void pm_buffer_prepend_string(pm_buffer_t *buffer, const char *value, size_t length);
+
+/**
+ * Concatenate one buffer onto another.
+ *
+ * @param destination The buffer to concatenate onto.
+ * @param source The buffer to concatenate.
+ */
+void pm_buffer_concat(pm_buffer_t *destination, const pm_buffer_t *source);
+
+/**
+ * Clear the buffer by reducing its size to 0. This does not free the allocated
+ * memory, but it does allow the buffer to be reused.
+ *
+ * @param buffer The buffer to clear.
+ */
+void pm_buffer_clear(pm_buffer_t *buffer);
+
+/**
+ * Strip the whitespace from the end of the buffer.
+ *
+ * @param buffer The buffer to strip.
+ */
+void pm_buffer_rstrip(pm_buffer_t *buffer);
+
+/**
+ * Checks if the buffer includes the given value.
+ *
+ * @param buffer The buffer to check.
+ * @param value The value to check for.
+ * @returns The index of the first occurrence of the value in the buffer, or
+ *   SIZE_MAX if the value is not found.
+ */
+size_t pm_buffer_index(const pm_buffer_t *buffer, char value);
+
+/**
+ * Insert the given string into the buffer at the given index.
+ *
+ * @param buffer The buffer to insert into.
+ * @param index The index to insert at.
+ * @param value The string to insert.
+ * @param length The length of the string to insert.
+ */
+void pm_buffer_insert(pm_buffer_t *buffer, size_t index, const char *value, size_t length);
+
+/**
+ * Free the memory associated with the buffer.
+ *
+ * @param buffer The buffer to free.
+ */
+PRISM_EXPORTED_FUNCTION void pm_buffer_free(pm_buffer_t *buffer);
+
+#endif
diff --git a/prism/util/pm_char.c b/prism/util/pm_char.c
new file mode 100644
index 00000000000000..a51dc11645ff63
--- /dev/null
+++ b/prism/util/pm_char.c
@@ -0,0 +1,318 @@
+#include "prism/util/pm_char.h"
+
+#define PRISM_CHAR_BIT_WHITESPACE (1 << 0)
+#define PRISM_CHAR_BIT_INLINE_WHITESPACE (1 << 1)
+#define PRISM_CHAR_BIT_REGEXP_OPTION (1 << 2)
+
+#define PRISM_NUMBER_BIT_BINARY_DIGIT (1 << 0)
+#define PRISM_NUMBER_BIT_BINARY_NUMBER (1 << 1)
+#define PRISM_NUMBER_BIT_OCTAL_DIGIT (1 << 2)
+#define PRISM_NUMBER_BIT_OCTAL_NUMBER (1 << 3)
+#define PRISM_NUMBER_BIT_DECIMAL_DIGIT (1 << 4)
+#define PRISM_NUMBER_BIT_DECIMAL_NUMBER (1 << 5)
+#define PRISM_NUMBER_BIT_HEXADECIMAL_DIGIT (1 << 6)
+#define PRISM_NUMBER_BIT_HEXADECIMAL_NUMBER (1 << 7)
+
+static const uint8_t pm_byte_table[256] = {
+//  0  1  2  3  4  5  6  7  8  9  A  B  C  D  E  F
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 1, 3, 3, 3, 0, 0, // 0x
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 1x
+    3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 2x
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 3x
+    0, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, // 4x
+    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 0, 0, 0, 0, 0, // 5x
+    0, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, // 6x
+    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 0, 0, 0, 0, 0, // 7x
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 8x
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 9x
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // Ax
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // Bx
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // Cx
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // Dx
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // Ex
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // Fx
+};
+
+static const uint8_t pm_number_table[256] = {
+    // 0     1     2     3     4     5     6     7     8     9     A     B     C     D     E     F
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0x
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 1x
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 2x
+    0xff, 0xff, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xf0, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 3x
+    0x00, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 4x
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xaa, // 5x
+    0x00, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 6x
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 7x
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 8x
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 9x
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // Ax
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // Bx
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // Cx
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // Dx
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // Ex
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // Fx
+};
+
+/**
+ * Returns the number of characters at the start of the string that match the
+ * given kind. Disallows searching past the given maximum number of characters.
+ */
+static inline size_t
+pm_strspn_char_kind(const uint8_t *string, ptrdiff_t length, uint8_t kind) {
+    if (length <= 0) return 0;
+
+    size_t size = 0;
+    size_t maximum = (size_t) length;
+
+    while (size < maximum && (pm_byte_table[string[size]] & kind)) size++;
+    return size;
+}
+
+/**
+ * Returns the number of characters at the start of the string that are
+ * whitespace. Disallows searching past the given maximum number of characters.
+ */
+size_t
+pm_strspn_whitespace(const uint8_t *string, ptrdiff_t length) {
+    return pm_strspn_char_kind(string, length, PRISM_CHAR_BIT_WHITESPACE);
+}
+
+/**
+ * Returns the number of characters at the start of the string that are
+ * whitespace while also tracking the location of each newline. Disallows
+ * searching past the given maximum number of characters.
+ */
+size_t
+pm_strspn_whitespace_newlines(const uint8_t *string, ptrdiff_t length, pm_newline_list_t *newline_list) {
+    if (length <= 0) return 0;
+
+    size_t size = 0;
+    size_t maximum = (size_t) length;
+
+    while (size < maximum && (pm_byte_table[string[size]] & PRISM_CHAR_BIT_WHITESPACE)) {
+        if (string[size] == '\n') {
+            pm_newline_list_append(newline_list, string + size);
+        }
+
+        size++;
+    }
+
+    return size;
+}
+
+/**
+ * Returns the number of characters at the start of the string that are inline
+ * whitespace. Disallows searching past the given maximum number of characters.
+ */
+size_t
+pm_strspn_inline_whitespace(const uint8_t *string, ptrdiff_t length) {
+    return pm_strspn_char_kind(string, length, PRISM_CHAR_BIT_INLINE_WHITESPACE);
+}
+
+/**
+ * Returns the number of characters at the start of the string that are regexp
+ * options. Disallows searching past the given maximum number of characters.
+ */
+size_t
+pm_strspn_regexp_option(const uint8_t *string, ptrdiff_t length) {
+    return pm_strspn_char_kind(string, length, PRISM_CHAR_BIT_REGEXP_OPTION);
+}
+
+/**
+ * Returns true if the given character matches the given kind.
+ */
+static inline bool
+pm_char_is_char_kind(const uint8_t b, uint8_t kind) {
+    return (pm_byte_table[b] & kind) != 0;
+}
+
+/**
+ * Returns true if the given character is a whitespace character.
+ */
+bool
+pm_char_is_whitespace(const uint8_t b) {
+    return pm_char_is_char_kind(b, PRISM_CHAR_BIT_WHITESPACE);
+}
+
+/**
+ * Returns true if the given character is an inline whitespace character.
+ */
+bool
+pm_char_is_inline_whitespace(const uint8_t b) {
+    return pm_char_is_char_kind(b, PRISM_CHAR_BIT_INLINE_WHITESPACE);
+}
+
+/**
+ * Scan through the string and return the number of characters at the start of
+ * the string that match the given kind. Disallows searching past the given
+ * maximum number of characters.
+ */
+static inline size_t
+pm_strspn_number_kind(const uint8_t *string, ptrdiff_t length, uint8_t kind) {
+    if (length <= 0) return 0;
+
+    size_t size = 0;
+    size_t maximum = (size_t) length;
+
+    while (size < maximum && (pm_number_table[string[size]] & kind)) size++;
+    return size;
+}
+
+/**
+ * Scan through the string and return the number of characters at the start of
+ * the string that match the given kind. Disallows searching past the given
+ * maximum number of characters.
+ *
+ * Additionally, report the location of the last invalid underscore character
+ * found in the string through the out invalid parameter.
+ */
+static inline size_t
+pm_strspn_number_kind_underscores(const uint8_t *string, ptrdiff_t length, const uint8_t **invalid, uint8_t kind) {
+    if (length <= 0) return 0;
+
+    size_t size = 0;
+    size_t maximum = (size_t) length;
+
+    bool underscore = false;
+    while (size < maximum && (pm_number_table[string[size]] & kind)) {
+        if (string[size] == '_') {
+            if (underscore) *invalid = string + size;
+            underscore = true;
+        } else {
+            underscore = false;
+        }
+
+        size++;
+    }
+
+    if (size > 0 && string[size - 1] == '_') *invalid = string + size - 1;
+    return size;
+}
+
+/**
+ * Returns the number of characters at the start of the string that are binary
+ * digits or underscores. Disallows searching past the given maximum number of
+ * characters.
+ *
+ * If multiple underscores are found in a row or if an underscore is
+ * found at the end of the number, then the invalid pointer is set to the index
+ * of the first invalid underscore.
+ */
+size_t
+pm_strspn_binary_number(const uint8_t *string, ptrdiff_t length, const uint8_t **invalid) {
+    return pm_strspn_number_kind_underscores(string, length, invalid, PRISM_NUMBER_BIT_BINARY_NUMBER);
+}
+
+/**
+ * Returns the number of characters at the start of the string that are octal
+ * digits or underscores. Disallows searching past the given maximum number of
+ * characters.
+ *
+ * If multiple underscores are found in a row or if an underscore is
+ * found at the end of the number, then the invalid pointer is set to the index
+ * of the first invalid underscore.
+ */
+size_t
+pm_strspn_octal_number(const uint8_t *string, ptrdiff_t length, const uint8_t **invalid) {
+    return pm_strspn_number_kind_underscores(string, length, invalid, PRISM_NUMBER_BIT_OCTAL_NUMBER);
+}
+
+/**
+ * Returns the number of characters at the start of the string that are decimal
+ * digits. Disallows searching past the given maximum number of characters.
+ */
+size_t
+pm_strspn_decimal_digit(const uint8_t *string, ptrdiff_t length) {
+    return pm_strspn_number_kind(string, length, PRISM_NUMBER_BIT_DECIMAL_DIGIT);
+}
+
+/**
+ * Returns the number of characters at the start of the string that are decimal
+ * digits or underscores. Disallows searching past the given maximum number of
+ * characters.
+ *
+ * If multiple underscores are found in a row or if an underscore is
+ * found at the end of the number, then the invalid pointer is set to the index
+ * of the first invalid underscore
+ */
+size_t
+pm_strspn_decimal_number(const uint8_t *string, ptrdiff_t length, const uint8_t **invalid) {
+    return pm_strspn_number_kind_underscores(string, length, invalid, PRISM_NUMBER_BIT_DECIMAL_NUMBER);
+}
+
+/**
+ * Returns the number of characters at the start of the string that are
+ * hexadecimal digits. Disallows searching past the given maximum number of
+ * characters.
+ */
+size_t
+pm_strspn_hexadecimal_digit(const uint8_t *string, ptrdiff_t length) {
+    return pm_strspn_number_kind(string, length, PRISM_NUMBER_BIT_HEXADECIMAL_DIGIT);
+}
+
+/**
+ * Returns the number of characters at the start of the string that are
+ * hexadecimal digits or underscores. Disallows searching past the given maximum
+ * number of characters.
+ *
+ * If multiple underscores are found in a row or if an underscore is
+ * found at the end of the number, then the invalid pointer is set to the index
+ * of the first invalid underscore.
+ */
+size_t
+pm_strspn_hexadecimal_number(const uint8_t *string, ptrdiff_t length, const uint8_t **invalid) {
+    return pm_strspn_number_kind_underscores(string, length, invalid, PRISM_NUMBER_BIT_HEXADECIMAL_NUMBER);
+}
+
+/**
+ * Returns true if the given character matches the given kind.
+ */
+static inline bool
+pm_char_is_number_kind(const uint8_t b, uint8_t kind) {
+    return (pm_number_table[b] & kind) != 0;
+}
+
+/**
+ * Returns true if the given character is a binary digit.
+ */
+bool
+pm_char_is_binary_digit(const uint8_t b) {
+    return pm_char_is_number_kind(b, PRISM_NUMBER_BIT_BINARY_DIGIT);
+}
+
+/**
+ * Returns true if the given character is an octal digit.
+ */
+bool
+pm_char_is_octal_digit(const uint8_t b) {
+    return pm_char_is_number_kind(b, PRISM_NUMBER_BIT_OCTAL_DIGIT);
+}
+
+/**
+ * Returns true if the given character is a decimal digit.
+ */
+bool
+pm_char_is_decimal_digit(const uint8_t b) {
+    return pm_char_is_number_kind(b, PRISM_NUMBER_BIT_DECIMAL_DIGIT);
+}
+
+/**
+ * Returns true if the given character is a hexadecimal digit.
+ */
+bool
+pm_char_is_hexadecimal_digit(const uint8_t b) {
+    return pm_char_is_number_kind(b, PRISM_NUMBER_BIT_HEXADECIMAL_DIGIT);
+}
+
+#undef PRISM_CHAR_BIT_WHITESPACE
+#undef PRISM_CHAR_BIT_INLINE_WHITESPACE
+#undef PRISM_CHAR_BIT_REGEXP_OPTION
+
+#undef PRISM_NUMBER_BIT_BINARY_DIGIT
+#undef PRISM_NUMBER_BIT_BINARY_NUMBER
+#undef PRISM_NUMBER_BIT_OCTAL_DIGIT
+#undef PRISM_NUMBER_BIT_OCTAL_NUMBER
+#undef PRISM_NUMBER_BIT_DECIMAL_DIGIT
+#undef PRISM_NUMBER_BIT_DECIMAL_NUMBER
+#undef PRISM_NUMBER_BIT_HEXADECIMAL_NUMBER
+#undef PRISM_NUMBER_BIT_HEXADECIMAL_DIGIT
diff --git a/prism/util/pm_char.h b/prism/util/pm_char.h
new file mode 100644
index 00000000000000..deeafd632177da
--- /dev/null
+++ b/prism/util/pm_char.h
@@ -0,0 +1,204 @@
+/**
+ * @file pm_char.h
+ *
+ * Functions for working with characters and strings.
+ */
+#ifndef PRISM_CHAR_H
+#define PRISM_CHAR_H
+
+#include "prism/defines.h"
+#include "prism/util/pm_newline_list.h"
+
+#include <stdbool.h>
+#include <stddef.h>
+
+/**
+ * Returns the number of characters at the start of the string that are
+ * whitespace. Disallows searching past the given maximum number of characters.
+ *
+ * @param string The string to search.
+ * @param length The maximum number of characters to search.
+ * @return The number of characters at the start of the string that are
+ *     whitespace.
+ */
+size_t pm_strspn_whitespace(const uint8_t *string, ptrdiff_t length);
+
+/**
+ * Returns the number of characters at the start of the string that are
+ * whitespace while also tracking the location of each newline. Disallows
+ * searching past the given maximum number of characters.
+ *
+ * @param string The string to search.
+ * @param length The maximum number of characters to search.
+ * @param newline_list The list of newlines to populate.
+ * @return The number of characters at the start of the string that are
+ *     whitespace.
+ */
+size_t pm_strspn_whitespace_newlines(const uint8_t *string, ptrdiff_t length, pm_newline_list_t *newline_list);
+
+/**
+ * Returns the number of characters at the start of the string that are inline
+ * whitespace. Disallows searching past the given maximum number of characters.
+ *
+ * @param string The string to search.
+ * @param length The maximum number of characters to search.
+ * @return The number of characters at the start of the string that are inline
+ *     whitespace.
+ */
+size_t pm_strspn_inline_whitespace(const uint8_t *string, ptrdiff_t length);
+
+/**
+ * Returns the number of characters at the start of the string that are decimal
+ * digits. Disallows searching past the given maximum number of characters.
+ *
+ * @param string The string to search.
+ * @param length The maximum number of characters to search.
+ * @return The number of characters at the start of the string that are decimal
+ *     digits.
+ */
+size_t pm_strspn_decimal_digit(const uint8_t *string, ptrdiff_t length);
+
+/**
+ * Returns the number of characters at the start of the string that are
+ * hexadecimal digits. Disallows searching past the given maximum number of
+ * characters.
+ *
+ * @param string The string to search.
+ * @param length The maximum number of characters to search.
+ * @return The number of characters at the start of the string that are
+ *     hexadecimal digits.
+ */
+size_t pm_strspn_hexadecimal_digit(const uint8_t *string, ptrdiff_t length);
+
+/**
+ * Returns the number of characters at the start of the string that are octal
+ * digits or underscores. Disallows searching past the given maximum number of
+ * characters.
+ *
+ * If multiple underscores are found in a row or if an underscore is
+ * found at the end of the number, then the invalid pointer is set to the index
+ * of the first invalid underscore.
+ *
+ * @param string The string to search.
+ * @param length The maximum number of characters to search.
+ * @param invalid The pointer to set to the index of the first invalid
+ *     underscore.
+ * @return The number of characters at the start of the string that are octal
+ *     digits or underscores.
+ */
+size_t pm_strspn_octal_number(const uint8_t *string, ptrdiff_t length, const uint8_t **invalid);
+
+/**
+ * Returns the number of characters at the start of the string that are decimal
+ * digits or underscores. Disallows searching past the given maximum number of
+ * characters.
+ *
+ * If multiple underscores are found in a row or if an underscore is
+ * found at the end of the number, then the invalid pointer is set to the index
+ * of the first invalid underscore.
+ *
+ * @param string The string to search.
+ * @param length The maximum number of characters to search.
+ * @param invalid The pointer to set to the index of the first invalid
+ *     underscore.
+ * @return The number of characters at the start of the string that are decimal
+ *     digits or underscores.
+ */
+size_t pm_strspn_decimal_number(const uint8_t *string, ptrdiff_t length, const uint8_t **invalid);
+
+/**
+ * Returns the number of characters at the start of the string that are
+ * hexadecimal digits or underscores. Disallows searching past the given maximum
+ * number of characters.
+ *
+ * If multiple underscores are found in a row or if an underscore is
+ * found at the end of the number, then the invalid pointer is set to the index
+ * of the first invalid underscore.
+ *
+ * @param string The string to search.
+ * @param length The maximum number of characters to search.
+ * @param invalid The pointer to set to the index of the first invalid
+ *     underscore.
+ * @return The number of characters at the start of the string that are
+ *     hexadecimal digits or underscores.
+ */
+size_t pm_strspn_hexadecimal_number(const uint8_t *string, ptrdiff_t length, const uint8_t **invalid);
+
+/**
+ * Returns the number of characters at the start of the string that are regexp
+ * options. Disallows searching past the given maximum number of characters.
+ *
+ * @param string The string to search.
+ * @param length The maximum number of characters to search.
+ * @return The number of characters at the start of the string that are regexp
+ *     options.
+ */
+size_t pm_strspn_regexp_option(const uint8_t *string, ptrdiff_t length);
+
+/**
+ * Returns the number of characters at the start of the string that are binary
+ * digits or underscores. Disallows searching past the given maximum number of
+ * characters.
+ *
+ * If multiple underscores are found in a row or if an underscore is
+ * found at the end of the number, then the invalid pointer is set to the index
+ * of the first invalid underscore.
+ *
+ * @param string The string to search.
+ * @param length The maximum number of characters to search.
+ * @param invalid The pointer to set to the index of the first invalid
+ *     underscore.
+ * @return The number of characters at the start of the string that are binary
+ *     digits or underscores.
+ */
+size_t pm_strspn_binary_number(const uint8_t *string, ptrdiff_t length, const uint8_t **invalid);
+
+/**
+ * Returns true if the given character is a whitespace character.
+ *
+ * @param b The character to check.
+ * @return True if the given character is a whitespace character.
+ */
+bool pm_char_is_whitespace(const uint8_t b);
+
+/**
+ * Returns true if the given character is an inline whitespace character.
+ *
+ * @param b The character to check.
+ * @return True if the given character is an inline whitespace character.
+ */
+bool pm_char_is_inline_whitespace(const uint8_t b);
+
+/**
+ * Returns true if the given character is a binary digit.
+ *
+ * @param b The character to check.
+ * @return True if the given character is a binary digit.
+ */
+bool pm_char_is_binary_digit(const uint8_t b);
+
+/**
+ * Returns true if the given character is an octal digit.
+ *
+ * @param b The character to check.
+ * @return True if the given character is an octal digit.
+ */
+bool pm_char_is_octal_digit(const uint8_t b);
+
+/**
+ * Returns true if the given character is a decimal digit.
+ *
+ * @param b The character to check.
+ * @return True if the given character is a decimal digit.
+ */
+bool pm_char_is_decimal_digit(const uint8_t b);
+
+/**
+ * Returns true if the given character is a hexadecimal digit.
+ *
+ * @param b The character to check.
+ * @return True if the given character is a hexadecimal digit.
+ */
+bool pm_char_is_hexadecimal_digit(const uint8_t b);
+
+#endif
diff --git a/prism/util/pm_constant_pool.c b/prism/util/pm_constant_pool.c
new file mode 100644
index 00000000000000..38ea01a2289d65
--- /dev/null
+++ b/prism/util/pm_constant_pool.c
@@ -0,0 +1,342 @@
+#include "prism/util/pm_constant_pool.h"
+
+/**
+ * Initialize a list of constant ids.
+ */
+void
+pm_constant_id_list_init(pm_constant_id_list_t *list) {
+    list->ids = NULL;
+    list->size = 0;
+    list->capacity = 0;
+}
+
+/**
+ * Initialize a list of constant ids with a given capacity.
+ */
+void
+pm_constant_id_list_init_capacity(pm_constant_id_list_t *list, size_t capacity) {
+    if (capacity) {
+        list->ids = xcalloc(capacity, sizeof(pm_constant_id_t));
+        if (list->ids == NULL) abort();
+    } else {
+        list->ids = NULL;
+    }
+
+    list->size = 0;
+    list->capacity = capacity;
+}
+
+/**
+ * Append a constant id to a list of constant ids. Returns false if any
+ * potential reallocations fail.
+ */
+bool
+pm_constant_id_list_append(pm_constant_id_list_t *list, pm_constant_id_t id) {
+    if (list->size >= list->capacity) {
+        list->capacity = list->capacity == 0 ? 8 : list->capacity * 2;
+        list->ids = (pm_constant_id_t *) xrealloc(list->ids, sizeof(pm_constant_id_t) * list->capacity);
+        if (list->ids == NULL) return false;
+    }
+
+    list->ids[list->size++] = id;
+    return true;
+}
+
+/**
+ * Insert a constant id into a list of constant ids at the specified index.
+ */
+void
+pm_constant_id_list_insert(pm_constant_id_list_t *list, size_t index, pm_constant_id_t id) {
+    assert(index < list->capacity);
+    assert(list->ids[index] == PM_CONSTANT_ID_UNSET);
+
+    list->ids[index] = id;
+    list->size++;
+}
+
+/**
+ * Checks if the current constant id list includes the given constant id.
+ */
+bool
+pm_constant_id_list_includes(pm_constant_id_list_t *list, pm_constant_id_t id) {
+    for (size_t index = 0; index < list->size; index++) {
+        if (list->ids[index] == id) return true;
+    }
+    return false;
+}
+
+/**
+ * Free the memory associated with a list of constant ids.
+ */
+void
+pm_constant_id_list_free(pm_constant_id_list_t *list) {
+    if (list->ids != NULL) {
+        xfree(list->ids);
+    }
+}
+
+/**
+ * A relatively simple hash function (djb2) that is used to hash strings. We are
+ * optimizing here for simplicity and speed.
+ */
+static inline uint32_t
+pm_constant_pool_hash(const uint8_t *start, size_t length) {
+    // This is a prime number used as the initial value for the hash function.
+    uint32_t value = 5381;
+
+    for (size_t index = 0; index < length; index++) {
+        value = ((value << 5) + value) + start[index];
+    }
+
+    return value;
+}
+
+/**
+ * https://graphics.stanford.edu/~seander/bithacks.html#RoundUpPowerOf2
+ */
+static uint32_t
+next_power_of_two(uint32_t v) {
+    // Avoid underflow in subtraction on next line.
+    if (v == 0) {
+        // 1 is the nearest power of 2 to 0 (2^0)
+        return 1;
+    }
+    v--;
+    v |= v >> 1;
+    v |= v >> 2;
+    v |= v >> 4;
+    v |= v >> 8;
+    v |= v >> 16;
+    v++;
+    return v;
+}
+
+#ifndef NDEBUG
+static bool
+is_power_of_two(uint32_t size) {
+    return (size & (size - 1)) == 0;
+}
+#endif
+
+/**
+ * Resize a constant pool to a given capacity.
+ */
+static inline bool
+pm_constant_pool_resize(pm_constant_pool_t *pool) {
+    assert(is_power_of_two(pool->capacity));
+
+    uint32_t next_capacity = pool->capacity * 2;
+    if (next_capacity < pool->capacity) return false;
+
+    const uint32_t mask = next_capacity - 1;
+    const size_t element_size = sizeof(pm_constant_pool_bucket_t) + sizeof(pm_constant_t);
+
+    void *next = xcalloc(next_capacity, element_size);
+    if (next == NULL) return false;
+
+    pm_constant_pool_bucket_t *next_buckets = next;
+    pm_constant_t *next_constants = (void *)(((char *) next) + next_capacity * sizeof(pm_constant_pool_bucket_t));
+
+    // For each bucket in the current constant pool, find the index in the
+    // next constant pool, and insert it.
+    for (uint32_t index = 0; index < pool->capacity; index++) {
+        pm_constant_pool_bucket_t *bucket = &pool->buckets[index];
+
+        // If an id is set on this constant, then we know we have content here.
+        // In this case we need to insert it into the next constant pool.
+        if (bucket->id != PM_CONSTANT_ID_UNSET) {
+            uint32_t next_index = bucket->hash & mask;
+
+            // This implements linear scanning to find the next available slot
+            // in case this index is already taken. We don't need to bother
+            // comparing the values since we know that the hash is unique.
+            while (next_buckets[next_index].id != PM_CONSTANT_ID_UNSET) {
+                next_index = (next_index + 1) & mask;
+            }
+
+            // Here we copy over the entire bucket, which includes the id so
+            // that they are consistent between resizes.
+            next_buckets[next_index] = *bucket;
+        }
+    }
+
+    // The constants are stable with respect to hash table resizes.
+    memcpy(next_constants, pool->constants, pool->size * sizeof(pm_constant_t));
+
+    // pool->constants and pool->buckets are allocated out of the same chunk
+    // of memory, with the buckets coming first.
+    xfree(pool->buckets);
+    pool->constants = next_constants;
+    pool->buckets = next_buckets;
+    pool->capacity = next_capacity;
+    return true;
+}
+
+/**
+ * Initialize a new constant pool with a given capacity.
+ */
+bool
+pm_constant_pool_init(pm_constant_pool_t *pool, uint32_t capacity) {
+    const uint32_t maximum = (~((uint32_t) 0));
+    if (capacity >= ((maximum / 2) + 1)) return false;
+
+    capacity = next_power_of_two(capacity);
+    const size_t element_size = sizeof(pm_constant_pool_bucket_t) + sizeof(pm_constant_t);
+    void *memory = xcalloc(capacity, element_size);
+    if (memory == NULL) return false;
+
+    pool->buckets = memory;
+    pool->constants = (void *)(((char *)memory) + capacity * sizeof(pm_constant_pool_bucket_t));
+    pool->size = 0;
+    pool->capacity = capacity;
+    return true;
+}
+
+/**
+ * Return a pointer to the constant indicated by the given constant id.
+ */
+pm_constant_t *
+pm_constant_pool_id_to_constant(const pm_constant_pool_t *pool, pm_constant_id_t constant_id) {
+    assert(constant_id != PM_CONSTANT_ID_UNSET && constant_id <= pool->size);
+    return &pool->constants[constant_id - 1];
+}
+
+/**
+ * Find a constant in a constant pool. Returns the id of the constant, or 0 if
+ * the constant is not found.
+ */
+pm_constant_id_t
+pm_constant_pool_find(const pm_constant_pool_t *pool, const uint8_t *start, size_t length) {
+    assert(is_power_of_two(pool->capacity));
+    const uint32_t mask = pool->capacity - 1;
+
+    uint32_t hash = pm_constant_pool_hash(start, length);
+    uint32_t index = hash & mask;
+    pm_constant_pool_bucket_t *bucket;
+
+    while (bucket = &pool->buckets[index], bucket->id != PM_CONSTANT_ID_UNSET) {
+        pm_constant_t *constant = &pool->constants[bucket->id - 1];
+        if ((constant->length == length) && memcmp(constant->start, start, length) == 0) {
+            return bucket->id;
+        }
+
+        index = (index + 1) & mask;
+    }
+
+    return PM_CONSTANT_ID_UNSET;
+}
+
+/**
+ * Insert a constant into a constant pool and return its index in the pool.
+ */
+static inline pm_constant_id_t
+pm_constant_pool_insert(pm_constant_pool_t *pool, const uint8_t *start, size_t length, pm_constant_pool_bucket_type_t type) {
+    if (pool->size >= (pool->capacity / 4 * 3)) {
+        if (!pm_constant_pool_resize(pool)) return PM_CONSTANT_ID_UNSET;
+    }
+
+    assert(is_power_of_two(pool->capacity));
+    const uint32_t mask = pool->capacity - 1;
+
+    uint32_t hash = pm_constant_pool_hash(start, length);
+    uint32_t index = hash & mask;
+    pm_constant_pool_bucket_t *bucket;
+
+    while (bucket = &pool->buckets[index], bucket->id != PM_CONSTANT_ID_UNSET) {
+        // If there is a collision, then we need to check if the content is the
+        // same as the content we are trying to insert. If it is, then we can
+        // return the id of the existing constant.
+        pm_constant_t *constant = &pool->constants[bucket->id - 1];
+
+        if ((constant->length == length) && memcmp(constant->start, start, length) == 0) {
+            // Since we have found a match, we need to check if this is
+            // attempting to insert a shared or an owned constant. We want to
+            // prefer shared constants since they don't require allocations.
+            if (type == PM_CONSTANT_POOL_BUCKET_OWNED) {
+                // If we're attempting to insert an owned constant and we have
+                // an existing constant, then either way we don't want the given
+                // memory. Either it's duplicated with the existing constant or
+                // it's not necessary because we have a shared version.
+                xfree((void *) start);
+            } else if (bucket->type == PM_CONSTANT_POOL_BUCKET_OWNED) {
+                // If we're attempting to insert a shared constant and the
+                // existing constant is owned, then we can free the owned
+                // constant and replace it with the shared constant.
+                xfree((void *) constant->start);
+                constant->start = start;
+                bucket->type = (unsigned int) (PM_CONSTANT_POOL_BUCKET_DEFAULT & 0x3);
+            }
+
+            return bucket->id;
+        }
+
+        index = (index + 1) & mask;
+    }
+
+    // IDs are allocated starting at 1, since the value 0 denotes a non-existent
+    // constant.
+    uint32_t id = ++pool->size;
+    assert(pool->size < ((uint32_t) (1 << 30)));
+
+    *bucket = (pm_constant_pool_bucket_t) {
+        .id = (unsigned int) (id & 0x3fffffff),
+        .type = (unsigned int) (type & 0x3),
+        .hash = hash
+    };
+
+    pool->constants[id - 1] = (pm_constant_t) {
+        .start = start,
+        .length = length,
+    };
+
+    return id;
+}
+
+/**
+ * Insert a constant into a constant pool. Returns the id of the constant, or
+ * PM_CONSTANT_ID_UNSET if any potential calls to resize fail.
+ */
+pm_constant_id_t
+pm_constant_pool_insert_shared(pm_constant_pool_t *pool, const uint8_t *start, size_t length) {
+    return pm_constant_pool_insert(pool, start, length, PM_CONSTANT_POOL_BUCKET_DEFAULT);
+}
+
+/**
+ * Insert a constant into a constant pool from memory that is now owned by the
+ * constant pool. Returns the id of the constant, or PM_CONSTANT_ID_UNSET if any
+ * potential calls to resize fail.
+ */
+pm_constant_id_t
+pm_constant_pool_insert_owned(pm_constant_pool_t *pool, uint8_t *start, size_t length) {
+    return pm_constant_pool_insert(pool, start, length, PM_CONSTANT_POOL_BUCKET_OWNED);
+}
+
+/**
+ * Insert a constant into a constant pool from memory that is constant. Returns
+ * the id of the constant, or PM_CONSTANT_ID_UNSET if any potential calls to
+ * resize fail.
+ */
+pm_constant_id_t
+pm_constant_pool_insert_constant(pm_constant_pool_t *pool, const uint8_t *start, size_t length) {
+    return pm_constant_pool_insert(pool, start, length, PM_CONSTANT_POOL_BUCKET_CONSTANT);
+}
+
+/**
+ * Free the memory associated with a constant pool.
+ */
+void
+pm_constant_pool_free(pm_constant_pool_t *pool) {
+    // For each constant in the current constant pool, free the contents if the
+    // contents are owned.
+    for (uint32_t index = 0; index < pool->capacity; index++) {
+        pm_constant_pool_bucket_t *bucket = &pool->buckets[index];
+
+        // If an id is set on this constant, then we know we have content here.
+        if (bucket->id != PM_CONSTANT_ID_UNSET && bucket->type == PM_CONSTANT_POOL_BUCKET_OWNED) {
+            pm_constant_t *constant = &pool->constants[bucket->id - 1];
+            xfree((void *) constant->start);
+        }
+    }
+
+    xfree(pool->buckets);
+}
diff --git a/prism/util/pm_constant_pool.h b/prism/util/pm_constant_pool.h
new file mode 100644
index 00000000000000..6df23f8f501d38
--- /dev/null
+++ b/prism/util/pm_constant_pool.h
@@ -0,0 +1,218 @@
+/**
+ * @file pm_constant_pool.h
+ *
+ * A data structure that stores a set of strings.
+ *
+ * Each string is assigned a unique id, which can be used to compare strings for
+ * equality. This comparison ends up being much faster than strcmp, since it
+ * only requires a single integer comparison.
+ */
+#ifndef PRISM_CONSTANT_POOL_H
+#define PRISM_CONSTANT_POOL_H
+
+#include "prism/defines.h"
+
+#include <assert.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+#include <string.h>
+
+/**
+ * When we allocate constants into the pool, we reserve 0 to mean that the slot
+ * is not yet filled. This constant is reused in other places to indicate the
+ * lack of a constant id.
+ */
+#define PM_CONSTANT_ID_UNSET 0
+
+/**
+ * A constant id is a unique identifier for a constant in the constant pool.
+ */
+typedef uint32_t pm_constant_id_t;
+
+/**
+ * A list of constant IDs. Usually used to represent a set of locals.
+ */
+typedef struct {
+    /** The number of constant ids in the list. */
+    size_t size;
+
+    /** The number of constant ids that have been allocated in the list. */
+    size_t capacity;
+
+    /** The constant ids in the list. */
+    pm_constant_id_t *ids;
+} pm_constant_id_list_t;
+
+/**
+ * Initialize a list of constant ids.
+ *
+ * @param list The list to initialize.
+ */
+void pm_constant_id_list_init(pm_constant_id_list_t *list);
+
+/**
+ * Initialize a list of constant ids with a given capacity.
+ *
+ * @param list The list to initialize.
+ * @param capacity The initial capacity of the list.
+ */
+void pm_constant_id_list_init_capacity(pm_constant_id_list_t *list, size_t capacity);
+
+/**
+ * Append a constant id to a list of constant ids. Returns false if any
+ * potential reallocations fail.
+ *
+ * @param list The list to append to.
+ * @param id The id to append.
+ * @return Whether the append succeeded.
+ */
+bool pm_constant_id_list_append(pm_constant_id_list_t *list, pm_constant_id_t id);
+
+/**
+ * Insert a constant id into a list of constant ids at the specified index.
+ *
+ * @param list The list to insert into.
+ * @param index The index at which to insert.
+ * @param id The id to insert.
+ */
+void pm_constant_id_list_insert(pm_constant_id_list_t *list, size_t index, pm_constant_id_t id);
+
+/**
+ * Checks if the current constant id list includes the given constant id.
+ *
+ * @param list The list to check.
+ * @param id The id to check for.
+ * @return Whether the list includes the given id.
+ */
+bool pm_constant_id_list_includes(pm_constant_id_list_t *list, pm_constant_id_t id);
+
+/**
+ * Free the memory associated with a list of constant ids.
+ *
+ * @param list The list to free.
+ */
+void pm_constant_id_list_free(pm_constant_id_list_t *list);
+
+/**
+ * The type of bucket in the constant pool hash map. This determines how the
+ * bucket should be freed.
+ */
+typedef unsigned int pm_constant_pool_bucket_type_t;
+
+/** By default, each constant is a slice of the source. */
+static const pm_constant_pool_bucket_type_t PM_CONSTANT_POOL_BUCKET_DEFAULT = 0;
+
+/** An owned constant is one for which memory has been allocated. */
+static const pm_constant_pool_bucket_type_t PM_CONSTANT_POOL_BUCKET_OWNED = 1;
+
+/** A constant constant is known at compile time. */
+static const pm_constant_pool_bucket_type_t PM_CONSTANT_POOL_BUCKET_CONSTANT = 2;
+
+/** A bucket in the hash map. */
+typedef struct {
+    /** The incremental ID used for indexing back into the pool. */
+    unsigned int id: 30;
+
+    /** The type of the bucket, which determines how to free it. */
+    pm_constant_pool_bucket_type_t type: 2;
+
+    /** The hash of the bucket. */
+    uint32_t hash;
+} pm_constant_pool_bucket_t;
+
+/** A constant in the pool which effectively stores a string. */
+typedef struct {
+    /** A pointer to the start of the string. */
+    const uint8_t *start;
+
+    /** The length of the string. */
+    size_t length;
+} pm_constant_t;
+
+/** The overall constant pool, which stores constants found while parsing. */
+typedef struct {
+    /** The buckets in the hash map. */
+    pm_constant_pool_bucket_t *buckets;
+
+    /** The constants that are stored in the buckets. */
+    pm_constant_t *constants;
+
+    /** The number of buckets in the hash map. */
+    uint32_t size;
+
+    /** The number of buckets that have been allocated in the hash map. */
+    uint32_t capacity;
+} pm_constant_pool_t;
+
+/**
+ * Initialize a new constant pool with a given capacity.
+ *
+ * @param pool The pool to initialize.
+ * @param capacity The initial capacity of the pool.
+ * @return Whether the initialization succeeded.
+ */
+bool pm_constant_pool_init(pm_constant_pool_t *pool, uint32_t capacity);
+
+/**
+ * Return a pointer to the constant indicated by the given constant id.
+ *
+ * @param pool The pool to get the constant from.
+ * @param constant_id The id of the constant to get.
+ * @return A pointer to the constant.
+ */
+pm_constant_t * pm_constant_pool_id_to_constant(const pm_constant_pool_t *pool, pm_constant_id_t constant_id);
+
+/**
+ * Find a constant in a constant pool. Returns the id of the constant, or 0 if
+ * the constant is not found.
+ *
+ * @param pool The pool to find the constant in.
+ * @param start A pointer to the start of the constant.
+ * @param length The length of the constant.
+ * @return The id of the constant.
+ */
+pm_constant_id_t pm_constant_pool_find(const pm_constant_pool_t *pool, const uint8_t *start, size_t length);
+
+/**
+ * Insert a constant into a constant pool that is a slice of a source string.
+ * Returns the id of the constant, or 0 if any potential calls to resize fail.
+ *
+ * @param pool The pool to insert the constant into.
+ * @param start A pointer to the start of the constant.
+ * @param length The length of the constant.
+ * @return The id of the constant.
+ */
+pm_constant_id_t pm_constant_pool_insert_shared(pm_constant_pool_t *pool, const uint8_t *start, size_t length);
+
+/**
+ * Insert a constant into a constant pool from memory that is now owned by the
+ * constant pool. Returns the id of the constant, or 0 if any potential calls to
+ * resize fail.
+ *
+ * @param pool The pool to insert the constant into.
+ * @param start A pointer to the start of the constant.
+ * @param length The length of the constant.
+ * @return The id of the constant.
+ */
+pm_constant_id_t pm_constant_pool_insert_owned(pm_constant_pool_t *pool, uint8_t *start, size_t length);
+
+/**
+ * Insert a constant into a constant pool from memory that is constant. Returns
+ * the id of the constant, or 0 if any potential calls to resize fail.
+ *
+ * @param pool The pool to insert the constant into.
+ * @param start A pointer to the start of the constant.
+ * @param length The length of the constant.
+ * @return The id of the constant.
+ */
+pm_constant_id_t pm_constant_pool_insert_constant(pm_constant_pool_t *pool, const uint8_t *start, size_t length);
+
+/**
+ * Free the memory associated with a constant pool.
+ *
+ * @param pool The pool to free.
+ */
+void pm_constant_pool_free(pm_constant_pool_t *pool);
+
+#endif
diff --git a/prism/util/pm_integer.c b/prism/util/pm_integer.c
new file mode 100644
index 00000000000000..4170ecc58db81b
--- /dev/null
+++ b/prism/util/pm_integer.c
@@ -0,0 +1,670 @@
+#include "prism/util/pm_integer.h"
+
+/**
+ * Pull out the length and values from the integer, regardless of the form in
+ * which the length/values are stored.
+ */
+#define INTEGER_EXTRACT(integer, length_variable, values_variable) \
+    if ((integer)->values == NULL) { \
+        length_variable = 1; \
+        values_variable = &(integer)->value; \
+    } else { \
+        length_variable = (integer)->length; \
+        values_variable = (integer)->values; \
+    }
+
+/**
+ * Adds two positive pm_integer_t with the given base.
+ * Return pm_integer_t with values allocated. Not normalized.
+ */
+static void
+big_add(pm_integer_t *destination, pm_integer_t *left, pm_integer_t *right, uint64_t base) {
+    size_t left_length;
+    uint32_t *left_values;
+    INTEGER_EXTRACT(left, left_length, left_values)
+
+    size_t right_length;
+    uint32_t *right_values;
+    INTEGER_EXTRACT(right, right_length, right_values)
+
+    size_t length = left_length < right_length ? right_length : left_length;
+    uint32_t *values = (uint32_t *) xmalloc(sizeof(uint32_t) * (length + 1));
+    if (values == NULL) return;
+
+    uint64_t carry = 0;
+    for (size_t index = 0; index < length; index++) {
+        uint64_t sum = carry + (index < left_length ? left_values[index] : 0) + (index < right_length ? right_values[index] : 0);
+        values[index] = (uint32_t) (sum % base);
+        carry = sum / base;
+    }
+
+    if (carry > 0) {
+        values[length] = (uint32_t) carry;
+        length++;
+    }
+
+    *destination = (pm_integer_t) { length, values, 0, false };
+}
+
+/**
+ * Internal use for karatsuba_multiply. Calculates `a - b - c` with the given
+ * base. Assume a, b, c, a - b - c all to be positive.
+ * Return pm_integer_t with values allocated. Not normalized.
+ */
+static void
+big_sub2(pm_integer_t *destination, pm_integer_t *a, pm_integer_t *b, pm_integer_t *c, uint64_t base) {
+    size_t a_length;
+    uint32_t *a_values;
+    INTEGER_EXTRACT(a, a_length, a_values)
+
+    size_t b_length;
+    uint32_t *b_values;
+    INTEGER_EXTRACT(b, b_length, b_values)
+
+    size_t c_length;
+    uint32_t *c_values;
+    INTEGER_EXTRACT(c, c_length, c_values)
+
+    uint32_t *values = (uint32_t*) xmalloc(sizeof(uint32_t) * a_length);
+    int64_t carry = 0;
+
+    for (size_t index = 0; index < a_length; index++) {
+        int64_t sub = (
+            carry +
+            a_values[index] -
+            (index < b_length ? b_values[index] : 0) -
+            (index < c_length ? c_values[index] : 0)
+        );
+
+        if (sub >= 0) {
+            values[index] = (uint32_t) sub;
+            carry = 0;
+        } else {
+            sub += 2 * (int64_t) base;
+            values[index] = (uint32_t) ((uint64_t) sub % base);
+            carry = sub / (int64_t) base - 2;
+        }
+    }
+
+    while (a_length > 1 && values[a_length - 1] == 0) a_length--;
+    *destination = (pm_integer_t) { a_length, values, 0, false };
+}
+
+/**
+ * Multiply two positive integers with the given base using karatsuba algorithm.
+ * Return pm_integer_t with values allocated. Not normalized.
+ */
+static void
+karatsuba_multiply(pm_integer_t *destination, pm_integer_t *left, pm_integer_t *right, uint64_t base) {
+    size_t left_length;
+    uint32_t *left_values;
+    INTEGER_EXTRACT(left, left_length, left_values)
+
+    size_t right_length;
+    uint32_t *right_values;
+    INTEGER_EXTRACT(right, right_length, right_values)
+
+    if (left_length > right_length) {
+        size_t temporary_length = left_length;
+        left_length = right_length;
+        right_length = temporary_length;
+
+        uint32_t *temporary_values = left_values;
+        left_values = right_values;
+        right_values = temporary_values;
+    }
+
+    if (left_length <= 10) {
+        size_t length = left_length + right_length;
+        uint32_t *values = (uint32_t *) xcalloc(length, sizeof(uint32_t));
+        if (values == NULL) return;
+
+        for (size_t left_index = 0; left_index < left_length; left_index++) {
+            uint32_t carry = 0;
+            for (size_t right_index = 0; right_index < right_length; right_index++) {
+                uint64_t product = (uint64_t) left_values[left_index] * right_values[right_index] + values[left_index + right_index] + carry;
+                values[left_index + right_index] = (uint32_t) (product % base);
+                carry = (uint32_t) (product / base);
+            }
+            values[left_index + right_length] = carry;
+        }
+
+        while (length > 1 && values[length - 1] == 0) length--;
+        *destination = (pm_integer_t) { length, values, 0, false };
+        return;
+    }
+
+    if (left_length * 2 <= right_length) {
+        uint32_t *values = (uint32_t *) xcalloc(left_length + right_length, sizeof(uint32_t));
+
+        for (size_t start_offset = 0; start_offset < right_length; start_offset += left_length) {
+            size_t end_offset = start_offset + left_length;
+            if (end_offset > right_length) end_offset = right_length;
+
+            pm_integer_t sliced_left = {
+                .length = left_length,
+                .values = left_values,
+                .value = 0,
+                .negative = false
+            };
+
+            pm_integer_t sliced_right = {
+                .length = end_offset - start_offset,
+                .values = right_values + start_offset,
+                .value = 0,
+                .negative = false
+            };
+
+            pm_integer_t product;
+            karatsuba_multiply(&product, &sliced_left, &sliced_right, base);
+
+            uint32_t carry = 0;
+            for (size_t index = 0; index < product.length; index++) {
+                uint64_t sum = (uint64_t) values[start_offset + index] + product.values[index] + carry;
+                values[start_offset + index] = (uint32_t) (sum % base);
+                carry = (uint32_t) (sum / base);
+            }
+
+            if (carry > 0) values[start_offset + product.length] += carry;
+            pm_integer_free(&product);
+        }
+
+        *destination = (pm_integer_t) { left_length + right_length, values, 0, false };
+        return;
+    }
+
+    size_t half = left_length / 2;
+    pm_integer_t x0 = { half, left_values, 0, false };
+    pm_integer_t x1 = { left_length - half, left_values + half, 0, false };
+    pm_integer_t y0 = { half, right_values, 0, false };
+    pm_integer_t y1 = { right_length - half, right_values + half, 0, false };
+
+    pm_integer_t z0 = { 0 };
+    karatsuba_multiply(&z0, &x0, &y0, base);
+
+    pm_integer_t z2 = { 0 };
+    karatsuba_multiply(&z2, &x1, &y1, base);
+
+    // For simplicity to avoid considering negative values,
+    // use `z1 = (x0 + x1) * (y0 + y1) - z0 - z2` instead of original karatsuba algorithm.
+    pm_integer_t x01 = { 0 };
+    big_add(&x01, &x0, &x1, base);
+
+    pm_integer_t y01 = { 0 };
+    big_add(&y01, &y0, &y1, base);
+
+    pm_integer_t xy = { 0 };
+    karatsuba_multiply(&xy, &x01, &y01, base);
+
+    pm_integer_t z1;
+    big_sub2(&z1, &xy, &z0, &z2, base);
+
+    size_t length = left_length + right_length;
+    uint32_t *values = (uint32_t*) xcalloc(length, sizeof(uint32_t));
+
+    assert(z0.values != NULL);
+    memcpy(values, z0.values, sizeof(uint32_t) * z0.length);
+
+    assert(z2.values != NULL);
+    memcpy(values + 2 * half, z2.values, sizeof(uint32_t) * z2.length);
+
+    uint32_t carry = 0;
+    for(size_t index = 0; index < z1.length; index++) {
+        uint64_t sum = (uint64_t) carry + values[index + half] + z1.values[index];
+        values[index + half] = (uint32_t) (sum % base);
+        carry = (uint32_t) (sum / base);
+    }
+
+    for(size_t index = half + z1.length; carry > 0; index++) {
+        uint64_t sum = (uint64_t) carry + values[index];
+        values[index] = (uint32_t) (sum % base);
+        carry = (uint32_t) (sum / base);
+    }
+
+    while (length > 1 && values[length - 1] == 0) length--;
+    pm_integer_free(&z0);
+    pm_integer_free(&z1);
+    pm_integer_free(&z2);
+    pm_integer_free(&x01);
+    pm_integer_free(&y01);
+    pm_integer_free(&xy);
+
+    *destination = (pm_integer_t) { length, values, 0, false };
+}
+
+/**
+ * The values of a hexadecimal digit, where the index is the ASCII character.
+ * Note that there's an odd exception here where _ is mapped to 0. This is
+ * because it's possible for us to end up trying to parse a number that has
+ * already had an error attached to it, and we want to provide _something_ to
+ * the user.
+ */
+static const int8_t pm_integer_parse_digit_values[256] = {
+//   0   1   2   3   4   5   6   7   8   9   A   B   C   D   E   F
+    -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, // 0x
+    -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, // 1x
+    -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, // 2x
+     0,  1,  2,  3,  4,  5,  6,  7,  8,  9, -1, -1, -1, -1, -1, -1, // 3x
+    -1, 10, 11, 12, 13, 14, 15, -1, -1, -1, -1, -1, -1, -1, -1, -1, // 4x
+    -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,  0, // 5x
+    -1, 10, 11, 12, 13, 14, 15, -1, -1, -1, -1, -1, -1, -1, -1, -1, // 6x
+    -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, // 7x
+    -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, // 8x
+    -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, // 9x
+    -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, // Ax
+    -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, // Bx
+    -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, // Cx
+    -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, // Dx
+    -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, // Ex
+    -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, // Fx
+};
+
+/**
+ * Return the value of a hexadecimal digit in a uint8_t.
+ */
+static uint8_t
+pm_integer_parse_digit(const uint8_t character) {
+    int8_t value = pm_integer_parse_digit_values[character];
+    assert(value != -1 && "invalid digit");
+
+    return (uint8_t) value;
+}
+
+/**
+ * Create a pm_integer_t from uint64_t with the given base. It is assumed that
+ * the memory for the pm_integer_t pointer has been zeroed.
+ */
+static void
+pm_integer_from_uint64(pm_integer_t *integer, uint64_t value, uint64_t base) {
+    if (value < base) {
+        integer->value = (uint32_t) value;
+        return;
+    }
+
+    size_t length = 0;
+    uint64_t length_value = value;
+    while (length_value > 0) {
+        length++;
+        length_value /= base;
+    }
+
+    uint32_t *values = (uint32_t *) xmalloc(sizeof(uint32_t) * length);
+    if (values == NULL) return;
+
+    for (size_t value_index = 0; value_index < length; value_index++) {
+        values[value_index] = (uint32_t) (value % base);
+        value /= base;
+    }
+
+    integer->length = length;
+    integer->values = values;
+}
+
+/**
+ * Normalize pm_integer_t.
+ * Heading zero values will be removed. If the integer fits into uint32_t,
+ * values is set to NULL, length is set to 0, and value field will be used.
+ */
+static void
+pm_integer_normalize(pm_integer_t *integer) {
+    if (integer->values == NULL) {
+        return;
+    }
+
+    while (integer->length > 1 && integer->values[integer->length - 1] == 0) {
+        integer->length--;
+    }
+
+    if (integer->length > 1) {
+        return;
+    }
+
+    uint32_t value = integer->values[0];
+    bool negative = integer->negative && value != 0;
+
+    pm_integer_free(integer);
+    *integer = (pm_integer_t) { .values = NULL, .value = value, .length = 0, .negative = negative };
+}
+
+/**
+ * Convert base of the integer.
+ * In practice, it converts 10**9 to 1<<32 or 1<<32 to 10**9.
+ */
+static void
+pm_integer_convert_base(pm_integer_t *destination, const pm_integer_t *source, uint64_t base_from, uint64_t base_to) {
+    size_t source_length;
+    const uint32_t *source_values;
+    INTEGER_EXTRACT(source, source_length, source_values)
+
+    size_t bigints_length = (source_length + 1) / 2;
+    assert(bigints_length > 0);
+
+    pm_integer_t *bigints = (pm_integer_t *) xcalloc(bigints_length, sizeof(pm_integer_t));
+    if (bigints == NULL) return;
+
+    for (size_t index = 0; index < source_length; index += 2) {
+        uint64_t value = source_values[index] + base_from * (index + 1 < source_length ? source_values[index + 1] : 0);
+        pm_integer_from_uint64(&bigints[index / 2], value, base_to);
+    }
+
+    pm_integer_t base = { 0 };
+    pm_integer_from_uint64(&base, base_from, base_to);
+
+    while (bigints_length > 1) {
+        pm_integer_t next_base;
+        karatsuba_multiply(&next_base, &base, &base, base_to);
+
+        pm_integer_free(&base);
+        base = next_base;
+
+        size_t next_length = (bigints_length + 1) / 2;
+        pm_integer_t *next_bigints = (pm_integer_t *) xcalloc(next_length, sizeof(pm_integer_t));
+
+        for (size_t bigints_index = 0; bigints_index < bigints_length; bigints_index += 2) {
+            if (bigints_index + 1 == bigints_length) {
+                next_bigints[bigints_index / 2] = bigints[bigints_index];
+            } else {
+                pm_integer_t multiplied = { 0 };
+                karatsuba_multiply(&multiplied, &base, &bigints[bigints_index + 1], base_to);
+
+                big_add(&next_bigints[bigints_index / 2], &bigints[bigints_index], &multiplied, base_to);
+                pm_integer_free(&bigints[bigints_index]);
+                pm_integer_free(&bigints[bigints_index + 1]);
+                pm_integer_free(&multiplied);
+            }
+        }
+
+        xfree(bigints);
+        bigints = next_bigints;
+        bigints_length = next_length;
+    }
+
+    *destination = bigints[0];
+    destination->negative = source->negative;
+    pm_integer_normalize(destination);
+
+    xfree(bigints);
+    pm_integer_free(&base);
+}
+
+#undef INTEGER_EXTRACT
+
+/**
+ * Convert digits to integer with the given power-of-two base.
+ */
+static void
+pm_integer_parse_powof2(pm_integer_t *integer, uint32_t base, const uint8_t *digits, size_t digits_length) {
+    size_t bit = 1;
+    while (base > (uint32_t) (1 << bit)) bit++;
+
+    size_t length = (digits_length * bit + 31) / 32;
+    uint32_t *values = (uint32_t *) xcalloc(length, sizeof(uint32_t));
+
+    for (size_t digit_index = 0; digit_index < digits_length; digit_index++) {
+        size_t bit_position = bit * (digits_length - digit_index - 1);
+        uint32_t value = digits[digit_index];
+
+        size_t index = bit_position / 32;
+        size_t shift = bit_position % 32;
+
+        values[index] |= value << shift;
+        if (32 - shift < bit) values[index + 1] |= value >> (32 - shift);
+    }
+
+    while (length > 1 && values[length - 1] == 0) length--;
+    *integer = (pm_integer_t) { .length = length, .values = values, .value = 0, .negative = false };
+    pm_integer_normalize(integer);
+}
+
+/**
+ * Convert decimal digits to pm_integer_t.
+ */
+static void
+pm_integer_parse_decimal(pm_integer_t *integer, const uint8_t *digits, size_t digits_length) {
+    const size_t batch = 9;
+    size_t length = (digits_length + batch - 1) / batch;
+
+    uint32_t *values = (uint32_t *) xcalloc(length, sizeof(uint32_t));
+    uint32_t value = 0;
+
+    for (size_t digits_index = 0; digits_index < digits_length; digits_index++) {
+        value = value * 10 + digits[digits_index];
+
+        size_t reverse_index = digits_length - digits_index - 1;
+        if (reverse_index % batch == 0) {
+            values[reverse_index / batch] = value;
+            value = 0;
+        }
+    }
+
+    // Convert base from 10**9 to 1<<32.
+    pm_integer_convert_base(integer, &((pm_integer_t) { .length = length, .values = values,  .value = 0, .negative = false }), 1000000000, ((uint64_t) 1 << 32));
+    xfree(values);
+}
+
+/**
+ * Parse a large integer from a string that does not fit into uint32_t.
+ */
+static void
+pm_integer_parse_big(pm_integer_t *integer, uint32_t multiplier, const uint8_t *start, const uint8_t *end) {
+    // Allocate an array to store digits.
+    uint8_t *digits = xmalloc(sizeof(uint8_t) * (size_t) (end - start));
+    size_t digits_length = 0;
+
+    for (; start < end; start++) {
+        if (*start == '_') continue;
+        digits[digits_length++] = pm_integer_parse_digit(*start);
+    }
+
+    // Construct pm_integer_t from the digits.
+    if (multiplier == 10) {
+        pm_integer_parse_decimal(integer, digits, digits_length);
+    } else {
+        pm_integer_parse_powof2(integer, multiplier, digits, digits_length);
+    }
+
+    xfree(digits);
+}
+
+/**
+ * Parse an integer from a string. This assumes that the format of the integer
+ * has already been validated, as internal validation checks are not performed
+ * here.
+ */
+void
+pm_integer_parse(pm_integer_t *integer, pm_integer_base_t base, const uint8_t *start, const uint8_t *end) {
+    // Ignore unary +. Unary - is parsed differently and will not end up here.
+    // Instead, it will modify the parsed integer later.
+    if (*start == '+') start++;
+
+    // Determine the multiplier from the base, and skip past any prefixes.
+    uint32_t multiplier = 10;
+    switch (base) {
+        case PM_INTEGER_BASE_DEFAULT:
+            while (*start == '0') start++; // 01 -> 1
+            break;
+        case PM_INTEGER_BASE_BINARY:
+            start += 2; // 0b
+            multiplier = 2;
+            break;
+        case PM_INTEGER_BASE_OCTAL:
+            start++; // 0
+            if (*start == '_' || *start == 'o' || *start == 'O') start++; // o
+            multiplier = 8;
+            break;
+        case PM_INTEGER_BASE_DECIMAL:
+            if (*start == '0' && (end - start) > 1) start += 2; // 0d
+            break;
+        case PM_INTEGER_BASE_HEXADECIMAL:
+            start += 2; // 0x
+            multiplier = 16;
+            break;
+        case PM_INTEGER_BASE_UNKNOWN:
+            if (*start == '0' && (end - start) > 1) {
+                switch (start[1]) {
+                    case '_': start += 2; multiplier = 8; break;
+                    case '0': case '1': case '2': case '3': case '4': case '5': case '6': case '7': start++; multiplier = 8; break;
+                    case 'b': case 'B': start += 2; multiplier = 2; break;
+                    case 'o': case 'O': start += 2; multiplier = 8; break;
+                    case 'd': case 'D': start += 2; break;
+                    case 'x': case 'X': start += 2; multiplier = 16; break;
+                    default: assert(false && "unreachable"); break;
+                }
+            }
+            break;
+    }
+
+    // It's possible that we've consumed everything at this point if there is an
+    // invalid integer. If this is the case, we'll just return 0.
+    if (start >= end) return;
+
+    const uint8_t *cursor = start;
+    uint64_t value = (uint64_t) pm_integer_parse_digit(*cursor++);
+
+    for (; cursor < end; cursor++) {
+        if (*cursor == '_') continue;
+        value = value * multiplier + (uint64_t) pm_integer_parse_digit(*cursor);
+
+        if (value > UINT32_MAX) {
+            // If the integer is too large to fit into a single uint32_t, then
+            // we'll parse it as a big integer.
+            pm_integer_parse_big(integer, multiplier, start, end);
+            return;
+        }
+    }
+
+    integer->value = (uint32_t) value;
+}
+
+/**
+ * Compare two integers. This function returns -1 if the left integer is less
+ * than the right integer, 0 if they are equal, and 1 if the left integer is
+ * greater than the right integer.
+ */
+int
+pm_integer_compare(const pm_integer_t *left, const pm_integer_t *right) {
+    if (left->negative != right->negative) return left->negative ? -1 : 1;
+    int negative = left->negative ? -1 : 1;
+
+    if (left->values == NULL && right->values == NULL) {
+        if (left->value < right->value) return -1 * negative;
+        if (left->value > right->value) return 1 * negative;
+        return 0;
+    }
+
+    if (left->values == NULL || left->length < right->length) return -1 * negative;
+    if (right->values == NULL || left->length > right->length) return 1 * negative;
+
+    for (size_t index = 0; index < left->length; index++) {
+        size_t value_index = left->length - index - 1;
+        uint32_t left_value = left->values[value_index];
+        uint32_t right_value = right->values[value_index];
+
+        if (left_value < right_value) return -1 * negative;
+        if (left_value > right_value) return 1 * negative;
+    }
+
+    return 0;
+}
+
+/**
+ * Reduce a ratio of integers to its simplest form.
+ */
+void pm_integers_reduce(pm_integer_t *numerator, pm_integer_t *denominator) {
+    // If either the numerator or denominator do not fit into a 32-bit integer,
+    // then this function is a no-op. In the future, we may consider reducing
+    // even the larger numbers, but for now we're going to keep it simple.
+    if (
+        // If the numerator doesn't fit into a 32-bit integer, return early.
+        numerator->length != 0 ||
+        // If the denominator doesn't fit into a 32-bit integer, return early.
+        denominator->length != 0 ||
+        // If the numerator is 0, then return early.
+        numerator->value == 0 ||
+        // If the denominator is 1, then return early.
+        denominator->value == 1
+    ) return;
+
+    // Find the greatest common divisor of the numerator and denominator.
+    uint32_t divisor = numerator->value;
+    uint32_t remainder = denominator->value;
+
+    while (remainder != 0) {
+        uint32_t temporary = remainder;
+        remainder = divisor % remainder;
+        divisor = temporary;
+    }
+
+    // Divide the numerator and denominator by the greatest common divisor.
+    numerator->value /= divisor;
+    denominator->value /= divisor;
+}
+
+/**
+ * Convert an integer to a decimal string.
+ */
+PRISM_EXPORTED_FUNCTION void
+pm_integer_string(pm_buffer_t *buffer, const pm_integer_t *integer) {
+    if (integer->negative) {
+        pm_buffer_append_byte(buffer, '-');
+    }
+
+    // If the integer fits into a single uint32_t, then we can just append the
+    // value directly to the buffer.
+    if (integer->values == NULL) {
+        pm_buffer_append_format(buffer, "%" PRIu32, integer->value);
+        return;
+    }
+
+    // If the integer is two uint32_t values, then we can | them together and
+    // append the result to the buffer.
+    if (integer->length == 2) {
+        const uint64_t value = ((uint64_t) integer->values[0]) | ((uint64_t) integer->values[1] << 32);
+        pm_buffer_append_format(buffer, "%" PRIu64, value);
+        return;
+    }
+
+    // Otherwise, first we'll convert the base from 1<<32 to 10**9.
+    pm_integer_t converted = { 0 };
+    pm_integer_convert_base(&converted, integer, (uint64_t) 1 << 32, 1000000000);
+
+    if (converted.values == NULL) {
+        pm_buffer_append_format(buffer, "%" PRIu32, converted.value);
+        pm_integer_free(&converted);
+        return;
+    }
+
+    // Allocate a buffer that we'll copy the decimal digits into.
+    size_t digits_length = converted.length * 9;
+    char *digits = xcalloc(digits_length, sizeof(char));
+    if (digits == NULL) return;
+
+    // Pack bigdecimal to digits.
+    for (size_t value_index = 0; value_index < converted.length; value_index++) {
+        uint32_t value = converted.values[value_index];
+
+        for (size_t digit_index = 0; digit_index < 9; digit_index++) {
+            digits[digits_length - 9 * value_index - digit_index - 1] = (char) ('0' + value % 10);
+            value /= 10;
+        }
+    }
+
+    size_t start_offset = 0;
+    while (start_offset < digits_length - 1 && digits[start_offset] == '0') start_offset++;
+
+    // Finally, append the string to the buffer and free the digits.
+    pm_buffer_append_string(buffer, digits + start_offset, digits_length - start_offset);
+    xfree(digits);
+    pm_integer_free(&converted);
+}
+
+/**
+ * Free the internal memory of an integer. This memory will only be allocated if
+ * the integer exceeds the size of a single uint32_t.
+ */
+PRISM_EXPORTED_FUNCTION void
+pm_integer_free(pm_integer_t *integer) {
+    if (integer->values) {
+        xfree(integer->values);
+    }
+}
diff --git a/prism/util/pm_integer.h b/prism/util/pm_integer.h
new file mode 100644
index 00000000000000..a9e2966703408b
--- /dev/null
+++ b/prism/util/pm_integer.h
@@ -0,0 +1,126 @@
+/**
+ * @file pm_integer.h
+ *
+ * This module provides functions for working with arbitrary-sized integers.
+ */
+#ifndef PRISM_NUMBER_H
+#define PRISM_NUMBER_H
+
+#include "prism/defines.h"
+#include "prism/util/pm_buffer.h"
+
+#include <assert.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+/**
+ * A structure represents an arbitrary-sized integer.
+ */
+typedef struct {
+    /**
+     * The number of allocated values. length is set to 0 if the integer fits
+     * into uint32_t.
+     */
+    size_t length;
+
+    /**
+     * List of 32-bit integers. Set to NULL if the integer fits into uint32_t.
+     */
+    uint32_t *values;
+
+    /**
+     * Embedded value for small integer. This value is set to 0 if the value
+     * does not fit into uint32_t.
+     */
+    uint32_t value;
+
+    /**
+     * Whether or not the integer is negative. It is stored this way so that a
+     * zeroed pm_integer_t is always positive zero.
+     */
+    bool negative;
+} pm_integer_t;
+
+/**
+ * An enum controlling the base of an integer. It is expected that the base is
+ * already known before parsing the integer, even though it could be derived
+ * from the string itself.
+ */
+typedef enum {
+    /** The default decimal base, with no prefix. Leading 0s will be ignored. */
+    PM_INTEGER_BASE_DEFAULT,
+
+    /** The binary base, indicated by a 0b or 0B prefix. */
+    PM_INTEGER_BASE_BINARY,
+
+    /** The octal base, indicated by a 0, 0o, or 0O prefix. */
+    PM_INTEGER_BASE_OCTAL,
+
+    /** The decimal base, indicated by a 0d, 0D, or empty prefix. */
+    PM_INTEGER_BASE_DECIMAL,
+
+    /** The hexadecimal base, indicated by a 0x or 0X prefix. */
+    PM_INTEGER_BASE_HEXADECIMAL,
+
+    /**
+     * An unknown base, in which case pm_integer_parse will derive it based on
+     * the content of the string. This is less efficient and does more
+     * comparisons, so if callers know the base ahead of time, they should use
+     * that instead.
+     */
+    PM_INTEGER_BASE_UNKNOWN
+} pm_integer_base_t;
+
+/**
+ * Parse an integer from a string. This assumes that the format of the integer
+ * has already been validated, as internal validation checks are not performed
+ * here.
+ *
+ * @param integer The integer to parse into.
+ * @param base The base of the integer.
+ * @param start The start of the string.
+ * @param end The end of the string.
+ */
+void pm_integer_parse(pm_integer_t *integer, pm_integer_base_t base, const uint8_t *start, const uint8_t *end);
+
+/**
+ * Compare two integers. This function returns -1 if the left integer is less
+ * than the right integer, 0 if they are equal, and 1 if the left integer is
+ * greater than the right integer.
+ *
+ * @param left The left integer to compare.
+ * @param right The right integer to compare.
+ * @return The result of the comparison.
+ */
+int pm_integer_compare(const pm_integer_t *left, const pm_integer_t *right);
+
+/**
+ * Reduce a ratio of integers to its simplest form.
+ *
+ * If either the numerator or denominator do not fit into a 32-bit integer, then
+ * this function is a no-op. In the future, we may consider reducing even the
+ * larger numbers, but for now we're going to keep it simple.
+ *
+ * @param numerator The numerator of the ratio.
+ * @param denominator The denominator of the ratio.
+ */
+void pm_integers_reduce(pm_integer_t *numerator, pm_integer_t *denominator);
+
+/**
+ * Convert an integer to a decimal string.
+ *
+ * @param buffer The buffer to append the string to.
+ * @param integer The integer to convert to a string.
+ */
+PRISM_EXPORTED_FUNCTION void pm_integer_string(pm_buffer_t *buffer, const pm_integer_t *integer);
+
+/**
+ * Free the internal memory of an integer. This memory will only be allocated if
+ * the integer exceeds the size of a single node in the linked list.
+ *
+ * @param integer The integer to free.
+ */
+PRISM_EXPORTED_FUNCTION void pm_integer_free(pm_integer_t *integer);
+
+#endif
diff --git a/prism/util/pm_list.c b/prism/util/pm_list.c
new file mode 100644
index 00000000000000..ad2294cd603f4b
--- /dev/null
+++ b/prism/util/pm_list.c
@@ -0,0 +1,49 @@
+#include "prism/util/pm_list.h"
+
+/**
+ * Returns true if the given list is empty.
+ */
+PRISM_EXPORTED_FUNCTION bool
+pm_list_empty_p(pm_list_t *list) {
+    return list->head == NULL;
+}
+
+/**
+ * Returns the size of the list.
+ */
+PRISM_EXPORTED_FUNCTION size_t
+pm_list_size(pm_list_t *list) {
+    return list->size;
+}
+
+/**
+ * Append a node to the given list.
+ */
+void
+pm_list_append(pm_list_t *list, pm_list_node_t *node) {
+    if (list->head == NULL) {
+        list->head = node;
+    } else {
+        list->tail->next = node;
+    }
+
+    list->tail = node;
+    list->size++;
+}
+
+/**
+ * Deallocate the internal state of the given list.
+ */
+PRISM_EXPORTED_FUNCTION void
+pm_list_free(pm_list_t *list) {
+    pm_list_node_t *node = list->head;
+    pm_list_node_t *next;
+
+    while (node != NULL) {
+        next = node->next;
+        xfree(node);
+        node = next;
+    }
+
+    list->size = 0;
+}
diff --git a/prism/util/pm_list.h b/prism/util/pm_list.h
new file mode 100644
index 00000000000000..3512dee979aa52
--- /dev/null
+++ b/prism/util/pm_list.h
@@ -0,0 +1,97 @@
+/**
+ * @file pm_list.h
+ *
+ * An abstract linked list.
+ */
+#ifndef PRISM_LIST_H
+#define PRISM_LIST_H
+
+#include "prism/defines.h"
+
+#include <stdbool.h>
+#include <stddef.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+/**
+ * This struct represents an abstract linked list that provides common
+ * functionality. It is meant to be used any time a linked list is necessary to
+ * store data.
+ *
+ * The linked list itself operates off a set of pointers. Because the pointers
+ * are not necessarily sequential, they can be of any size. We use this fact to
+ * allow the consumer of this linked list to extend the node struct to include
+ * any data they want. This is done by using the pm_list_node_t as the first
+ * member of the struct.
+ *
+ * For example, if we want to store a list of integers, we can do the following:
+ *
+ * ```c
+ * typedef struct {
+ *     pm_list_node_t node;
+ *     int value;
+ * } pm_int_node_t;
+ *
+ * pm_list_t list = { 0 };
+ * pm_int_node_t *node = xmalloc(sizeof(pm_int_node_t));
+ * node->value = 5;
+ *
+ * pm_list_append(&list, &node->node);
+ * ```
+ *
+ * The pm_list_t struct is used to represent the overall linked list. It
+ * contains a pointer to the head and tail of the list. This allows for easy
+ * iteration and appending of new nodes.
+ */
+typedef struct pm_list_node {
+    /** A pointer to the next node in the list. */
+    struct pm_list_node *next;
+} pm_list_node_t;
+
+/**
+ * This represents the overall linked list. It keeps a pointer to the head and
+ * tail so that iteration is easy and pushing new nodes is easy.
+ */
+typedef struct {
+    /** The size of the list. */
+    size_t size;
+
+    /** A pointer to the head of the list. */
+    pm_list_node_t *head;
+
+    /** A pointer to the tail of the list. */
+    pm_list_node_t *tail;
+} pm_list_t;
+
+/**
+ * Returns true if the given list is empty.
+ *
+ * @param list The list to check.
+ * @return True if the given list is empty, otherwise false.
+ */
+PRISM_EXPORTED_FUNCTION bool pm_list_empty_p(pm_list_t *list);
+
+/**
+ * Returns the size of the list.
+ *
+ * @param list The list to check.
+ * @return The size of the list.
+ */
+PRISM_EXPORTED_FUNCTION size_t pm_list_size(pm_list_t *list);
+
+/**
+ * Append a node to the given list.
+ *
+ * @param list The list to append to.
+ * @param node The node to append.
+ */
+void pm_list_append(pm_list_t *list, pm_list_node_t *node);
+
+/**
+ * Deallocate the internal state of the given list.
+ *
+ * @param list The list to free.
+ */
+PRISM_EXPORTED_FUNCTION void pm_list_free(pm_list_t *list);
+
+#endif
diff --git a/prism/util/pm_memchr.c b/prism/util/pm_memchr.c
new file mode 100644
index 00000000000000..7ea20ace6d5290
--- /dev/null
+++ b/prism/util/pm_memchr.c
@@ -0,0 +1,35 @@
+#include "prism/util/pm_memchr.h"
+
+#define PRISM_MEMCHR_TRAILING_BYTE_MINIMUM 0x40
+
+/**
+ * We need to roll our own memchr to handle cases where the encoding changes and
+ * we need to search for a character in a buffer that could be the trailing byte
+ * of a multibyte character.
+ */
+void *
+pm_memchr(const void *memory, int character, size_t number, bool encoding_changed, const pm_encoding_t *encoding) {
+    if (encoding_changed && encoding->multibyte && character >= PRISM_MEMCHR_TRAILING_BYTE_MINIMUM) {
+        const uint8_t *source = (const uint8_t *) memory;
+        size_t index = 0;
+
+        while (index < number) {
+            if (source[index] == character) {
+                return (void *) (source + index);
+            }
+
+            size_t width = encoding->char_width(source + index, (ptrdiff_t) (number - index));
+            if (width == 0) {
+                return NULL;
+            }
+
+            index += width;
+        }
+
+        return NULL;
+    } else {
+        return memchr(memory, character, number);
+    }
+}
+
+#undef PRISM_MEMCHR_TRAILING_BYTE_MINIMUM
diff --git a/prism/util/pm_memchr.h b/prism/util/pm_memchr.h
new file mode 100644
index 00000000000000..e0671eaed3b9a6
--- /dev/null
+++ b/prism/util/pm_memchr.h
@@ -0,0 +1,29 @@
+/**
+ * @file pm_memchr.h
+ *
+ * A custom memchr implementation.
+ */
+#ifndef PRISM_MEMCHR_H
+#define PRISM_MEMCHR_H
+
+#include "prism/defines.h"
+#include "prism/encoding.h"
+
+#include <stddef.h>
+
+/**
+ * We need to roll our own memchr to handle cases where the encoding changes and
+ * we need to search for a character in a buffer that could be the trailing byte
+ * of a multibyte character.
+ *
+ * @param source The source string.
+ * @param character The character to search for.
+ * @param number The maximum number of bytes to search.
+ * @param encoding_changed Whether the encoding changed.
+ * @param encoding A pointer to the encoding.
+ * @return A pointer to the first occurrence of the character in the source
+ *     string, or NULL if no such character exists.
+ */
+void * pm_memchr(const void *source, int character, size_t number, bool encoding_changed, const pm_encoding_t *encoding);
+
+#endif
diff --git a/prism/util/pm_newline_list.c b/prism/util/pm_newline_list.c
new file mode 100644
index 00000000000000..8331618f54ff20
--- /dev/null
+++ b/prism/util/pm_newline_list.c
@@ -0,0 +1,125 @@
+#include "prism/util/pm_newline_list.h"
+
+/**
+ * Initialize a new newline list with the given capacity. Returns true if the
+ * allocation of the offsets succeeds, otherwise returns false.
+ */
+bool
+pm_newline_list_init(pm_newline_list_t *list, const uint8_t *start, size_t capacity) {
+    list->offsets = (size_t *) xcalloc(capacity, sizeof(size_t));
+    if (list->offsets == NULL) return false;
+
+    list->start = start;
+
+    // This is 1 instead of 0 because we want to include the first line of the
+    // file as having offset 0, which is set because of calloc.
+    list->size = 1;
+    list->capacity = capacity;
+
+    return true;
+}
+
+/**
+ * Clear out the newlines that have been appended to the list.
+ */
+void
+pm_newline_list_clear(pm_newline_list_t *list) {
+    list->size = 1;
+}
+
+/**
+ * Append a new offset to the newline list. Returns true if the reallocation of
+ * the offsets succeeds (if one was necessary), otherwise returns false.
+ */
+bool
+pm_newline_list_append(pm_newline_list_t *list, const uint8_t *cursor) {
+    if (list->size == list->capacity) {
+        size_t *original_offsets = list->offsets;
+
+        list->capacity = (list->capacity * 3) / 2;
+        list->offsets = (size_t *) xcalloc(list->capacity, sizeof(size_t));
+        if (list->offsets == NULL) return false;
+
+        memcpy(list->offsets, original_offsets, list->size * sizeof(size_t));
+        xfree(original_offsets);
+    }
+
+    assert(*cursor == '\n');
+    assert(cursor >= list->start);
+    size_t newline_offset = (size_t) (cursor - list->start + 1);
+
+    assert(list->size == 0 || newline_offset > list->offsets[list->size - 1]);
+    list->offsets[list->size++] = newline_offset;
+
+    return true;
+}
+
+/**
+ * Returns the line of the given offset. If the offset is not in the list, the
+ * line of the closest offset less than the given offset is returned.
+ */
+int32_t
+pm_newline_list_line(const pm_newline_list_t *list, const uint8_t *cursor, int32_t start_line) {
+    assert(cursor >= list->start);
+    size_t offset = (size_t) (cursor - list->start);
+
+    size_t left = 0;
+    size_t right = list->size - 1;
+
+    while (left <= right) {
+        size_t mid = left + (right - left) / 2;
+
+        if (list->offsets[mid] == offset) {
+            return ((int32_t) mid) + start_line;
+        }
+
+        if (list->offsets[mid] < offset) {
+            left = mid + 1;
+        } else {
+            right = mid - 1;
+        }
+    }
+
+    return ((int32_t) left) + start_line - 1;
+}
+
+/**
+ * Returns the line and column of the given offset. If the offset is not in the
+ * list, the line and column of the closest offset less than the given offset
+ * are returned.
+ */
+pm_line_column_t
+pm_newline_list_line_column(const pm_newline_list_t *list, const uint8_t *cursor, int32_t start_line) {
+    assert(cursor >= list->start);
+    size_t offset = (size_t) (cursor - list->start);
+
+    size_t left = 0;
+    size_t right = list->size - 1;
+
+    while (left <= right) {
+        size_t mid = left + (right - left) / 2;
+
+        if (list->offsets[mid] == offset) {
+            return ((pm_line_column_t) { ((int32_t) mid) + start_line, 0 });
+        }
+
+        if (list->offsets[mid] < offset) {
+            left = mid + 1;
+        } else {
+            right = mid - 1;
+        }
+    }
+
+    return ((pm_line_column_t) {
+        .line = ((int32_t) left) + start_line - 1,
+        .column = (uint32_t) (offset - list->offsets[left - 1])
+    });
+}
+
+/**
+ * Free the internal memory allocated for the newline list.
+ */
+void
+pm_newline_list_free(pm_newline_list_t *list) {
+    xfree(list->offsets);
+}
diff --git a/prism/util/pm_newline_list.h b/prism/util/pm_newline_list.h
new file mode 100644
index 00000000000000..406abe8ba59062
--- /dev/null
+++ b/prism/util/pm_newline_list.h
@@ -0,0 +1,113 @@
+/**
+ * @file pm_newline_list.h
+ *
+ * A list of byte offsets of newlines in a string.
+ *
+ * When compiling the syntax tree, it's necessary to know the line and column
+ * of many nodes. This is necessary to support things like error messages,
+ * tracepoints, etc.
+ *
+ * It's possible that we could store the start line, start column, end line, and
+ * end column on every node in addition to the offsets that we already store,
+ * but that would be quite a lot of memory overhead.
+ */
+#ifndef PRISM_NEWLINE_LIST_H
+#define PRISM_NEWLINE_LIST_H
+
+#include "prism/defines.h"
+
+#include <assert.h>
+#include <stdbool.h>
+#include <stddef.h>
+#include <stdlib.h>
+
+/**
+ * A list of offsets of newlines in a string. The offsets are assumed to be
+ * sorted/inserted in ascending order.
+ */
+typedef struct {
+    /** A pointer to the start of the source string. */
+    const uint8_t *start;
+
+    /** The number of offsets in the list. */
+    size_t size;
+
+    /** The capacity of the list that has been allocated. */
+    size_t capacity;
+
+    /** The list of offsets. */
+    size_t *offsets;
+} pm_newline_list_t;
+
+/**
+ * A line and column in a string.
+ */
+typedef struct {
+    /** The line number. */
+    int32_t line;
+
+    /** The column number. */
+    uint32_t column;
+} pm_line_column_t;
+
+/**
+ * Initialize a new newline list with the given capacity. Returns true if the
+ * allocation of the offsets succeeds, otherwise returns false.
+ *
+ * @param list The list to initialize.
+ * @param start A pointer to the start of the source string.
+ * @param capacity The initial capacity of the list.
+ * @return True if the allocation of the offsets succeeds, otherwise false.
+ */
+bool pm_newline_list_init(pm_newline_list_t *list, const uint8_t *start, size_t capacity);
+
+/**
+ * Clear out the newlines that have been appended to the list.
+ *
+ * @param list The list to clear.
+ */
+void
+pm_newline_list_clear(pm_newline_list_t *list);
+
+/**
+ * Append a new offset to the newline list. Returns true if the reallocation of
+ * the offsets succeeds (if one was necessary), otherwise returns false.
+ *
+ * @param list The list to append to.
+ * @param cursor A pointer to the offset to append.
+ * @return True if the reallocation of the offsets succeeds (if one was
+ *     necessary), otherwise false.
+ */
+bool pm_newline_list_append(pm_newline_list_t *list, const uint8_t *cursor);
+
+/**
+ * Returns the line of the given offset. If the offset is not in the list, the
+ * line of the closest offset less than the given offset is returned.
+ *
+ * @param list The list to search.
+ * @param cursor A pointer to the offset to search for.
+ * @param start_line The line to start counting from.
+ * @return The line of the given offset.
+ */
+int32_t pm_newline_list_line(const pm_newline_list_t *list, const uint8_t *cursor, int32_t start_line);
+
+/**
+ * Returns the line and column of the given offset. If the offset is not in the
+ * list, the line and column of the closest offset less than the given offset
+ * are returned.
+ *
+ * @param list The list to search.
+ * @param cursor A pointer to the offset to search for.
+ * @param start_line The line to start counting from.
+ * @return The line and column of the given offset.
+ */
+pm_line_column_t pm_newline_list_line_column(const pm_newline_list_t *list, const uint8_t *cursor, int32_t start_line);
+
+/**
+ * Free the internal memory allocated for the newline list.
+ *
+ * @param list The list to free.
+ */
+void pm_newline_list_free(pm_newline_list_t *list);
+
+#endif
diff --git a/prism/util/pm_string.c b/prism/util/pm_string.c
new file mode 100644
index 00000000000000..75422fbdf2c41d
--- /dev/null
+++ b/prism/util/pm_string.c
@@ -0,0 +1,383 @@
+#include "prism/util/pm_string.h"
+
+/**
+ * Returns the size of the pm_string_t struct. This is necessary to allocate the
+ * correct amount of memory in the FFI backend.
+ */
+PRISM_EXPORTED_FUNCTION size_t
+pm_string_sizeof(void) {
+    return sizeof(pm_string_t);
+}
+
+/**
+ * Initialize a shared string that is based on initial input.
+ */
+void
+pm_string_shared_init(pm_string_t *string, const uint8_t *start, const uint8_t *end) {
+    assert(start <= end);
+
+    *string = (pm_string_t) {
+        .type = PM_STRING_SHARED,
+        .source = start,
+        .length = (size_t) (end - start)
+    };
+}
+
+/**
+ * Initialize an owned string that is responsible for freeing allocated memory.
+ */
+void
+pm_string_owned_init(pm_string_t *string, uint8_t *source, size_t length) {
+    *string = (pm_string_t) {
+        .type = PM_STRING_OWNED,
+        .source = source,
+        .length = length
+    };
+}
+
+/**
+ * Initialize a constant string that doesn't own its memory source.
+ */
+void
+pm_string_constant_init(pm_string_t *string, const char *source, size_t length) {
+    *string = (pm_string_t) {
+        .type = PM_STRING_CONSTANT,
+        .source = (const uint8_t *) source,
+        .length = length
+    };
+}
+
+#ifdef _WIN32
+/**
+ * Represents a file handle on Windows, where the path will need to be freed
+ * when the file is closed.
+ */
+typedef struct {
+    /** The path to the file, which will become allocated memory. */
+    WCHAR *path;
+
+    /** The handle to the file, which will start as uninitialized memory. */
+    HANDLE file;
+} pm_string_file_handle_t;
+
+/**
+ * Open the file indicated by the filepath parameter for reading on Windows.
+ * Perform any kind of normalization that needs to happen on the filepath.
+ */
+static pm_string_init_result_t
+pm_string_file_handle_open(pm_string_file_handle_t *handle, const char *filepath) {
+    int length = MultiByteToWideChar(CP_UTF8, 0, filepath, -1, NULL, 0);
+    if (length == 0) return PM_STRING_INIT_ERROR_GENERIC;
+
+    handle->path = xmalloc(sizeof(WCHAR) * ((size_t) length));
+    if ((handle->path == NULL) || (MultiByteToWideChar(CP_UTF8, 0, filepath, -1, handle->path, length) == 0)) {
+        xfree(handle->path);
+        return PM_STRING_INIT_ERROR_GENERIC;
+    }
+
+    handle->file = CreateFileW(handle->path, GENERIC_READ, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_READONLY, NULL);
+    if (handle->file == INVALID_HANDLE_VALUE) {
+        pm_string_init_result_t result = PM_STRING_INIT_ERROR_GENERIC;
+
+        if (GetLastError() == ERROR_ACCESS_DENIED) {
+            DWORD attributes = GetFileAttributesW(handle->path);
+            if ((attributes != INVALID_FILE_ATTRIBUTES) && (attributes & FILE_ATTRIBUTE_DIRECTORY)) {
+                result = PM_STRING_INIT_ERROR_DIRECTORY;
+            }
+        }
+
+        xfree(handle->path);
+        return result;
+    }
+
+    return PM_STRING_INIT_SUCCESS;
+}
+
+/**
+ * Close the file handle and free the path.
+ */
+static void
+pm_string_file_handle_close(pm_string_file_handle_t *handle) {
+    xfree(handle->path);
+    CloseHandle(handle->file);
+}
+#endif
+
+/**
+ * Read the file indicated by the filepath parameter into source and load its
+ * contents and size into the given `pm_string_t`. The given `pm_string_t`
+ * should be freed using `pm_string_free` when it is no longer used.
+ *
+ * We want to use demand paging as much as possible in order to avoid having to
+ * read the entire file into memory (which could be detrimental to performance
+ * for large files). This means that if we're on windows we'll use
+ * `MapViewOfFile`, on POSIX systems that have access to `mmap` we'll use
+ * `mmap`, and on other POSIX systems we'll use `read`.
+ */
+PRISM_EXPORTED_FUNCTION pm_string_init_result_t
+pm_string_mapped_init(pm_string_t *string, const char *filepath) {
+#ifdef _WIN32
+    // Open the file for reading.
+    pm_string_file_handle_t handle;
+    pm_string_init_result_t result = pm_string_file_handle_open(&handle, filepath);
+    if (result != PM_STRING_INIT_SUCCESS) return result;
+
+    // Get the file size.
+    DWORD file_size = GetFileSize(handle.file, NULL);
+    if (file_size == INVALID_FILE_SIZE) {
+        pm_string_file_handle_close(&handle);
+        return PM_STRING_INIT_ERROR_GENERIC;
+    }
+
+    // If the file is empty, then we don't need to do anything else, we'll set
+    // the source to a constant empty string and return.
+    if (file_size == 0) {
+        pm_string_file_handle_close(&handle);
+        const uint8_t source[] = "";
+        *string = (pm_string_t) { .type = PM_STRING_CONSTANT, .source = source, .length = 0 };
+        return PM_STRING_INIT_SUCCESS;
+    }
+
+    // Create a mapping of the file.
+    HANDLE mapping = CreateFileMapping(handle.file, NULL, PAGE_READONLY, 0, 0, NULL);
+    if (mapping == NULL) {
+        pm_string_file_handle_close(&handle);
+        return PM_STRING_INIT_ERROR_GENERIC;
+    }
+
+    // Map the file into memory.
+    uint8_t *source = (uint8_t *) MapViewOfFile(mapping, FILE_MAP_READ, 0, 0, 0);
+    CloseHandle(mapping);
+    pm_string_file_handle_close(&handle);
+
+    if (source == NULL) {
+        return PM_STRING_INIT_ERROR_GENERIC;
+    }
+
+    *string = (pm_string_t) { .type = PM_STRING_MAPPED, .source = source, .length = (size_t) file_size };
+    return PM_STRING_INIT_SUCCESS;
+#elif defined(_POSIX_MAPPED_FILES)
+    // Open the file for reading
+    int fd = open(filepath, O_RDONLY);
+    if (fd == -1) {
+        return PM_STRING_INIT_ERROR_GENERIC;
+    }
+
+    // Stat the file to get the file size
+    struct stat sb;
+    if (fstat(fd, &sb) == -1) {
+        close(fd);
+        return PM_STRING_INIT_ERROR_GENERIC;
+    }
+
+    // Ensure it is a file and not a directory
+    if (S_ISDIR(sb.st_mode)) {
+        close(fd);
+        return PM_STRING_INIT_ERROR_DIRECTORY;
+    }
+
+    // mmap the file descriptor to virtually get the contents
+    size_t size = (size_t) sb.st_size;
+    uint8_t *source = NULL;
+
+    if (size == 0) {
+        close(fd);
+        const uint8_t source[] = "";
+        *string = (pm_string_t) { .type = PM_STRING_CONSTANT, .source = source, .length = 0 };
+        return PM_STRING_INIT_SUCCESS;
+    }
+
+    source = mmap(NULL, size, PROT_READ, MAP_PRIVATE, fd, 0);
+    if (source == MAP_FAILED) {
+        close(fd);
+        return PM_STRING_INIT_ERROR_GENERIC;
+    }
+
+    close(fd);
+    *string = (pm_string_t) { .type = PM_STRING_MAPPED, .source = source, .length = size };
+    return PM_STRING_INIT_SUCCESS;
+#else
+    return pm_string_file_init(string, filepath);
+#endif
+}
+
+/**
+ * Read the file indicated by the filepath parameter into source and load its
+ * contents and size into the given `pm_string_t`. The given `pm_string_t`
+ * should be freed using `pm_string_free` when it is no longer used.
+ */
+PRISM_EXPORTED_FUNCTION pm_string_init_result_t
+pm_string_file_init(pm_string_t *string, const char *filepath) {
+#ifdef _WIN32
+    // Open the file for reading.
+    pm_string_file_handle_t handle;
+    pm_string_init_result_t result = pm_string_file_handle_open(&handle, filepath);
+    if (result != PM_STRING_INIT_SUCCESS) return result;
+
+    // Get the file size.
+    DWORD file_size = GetFileSize(handle.file, NULL);
+    if (file_size == INVALID_FILE_SIZE) {
+        pm_string_file_handle_close(&handle);
+        return PM_STRING_INIT_ERROR_GENERIC;
+    }
+
+    // If the file is empty, then we don't need to do anything else, we'll set
+    // the source to a constant empty string and return.
+    if (file_size == 0) {
+        pm_string_file_handle_close(&handle);
+        const uint8_t source[] = "";
+        *string = (pm_string_t) { .type = PM_STRING_CONSTANT, .source = source, .length = 0 };
+        return PM_STRING_INIT_SUCCESS;
+    }
+
+    // Create a buffer to read the file into.
+    uint8_t *source = xmalloc(file_size);
+    if (source == NULL) {
+        pm_string_file_handle_close(&handle);
+        return PM_STRING_INIT_ERROR_GENERIC;
+    }
+
+    // Read the contents of the file
+    DWORD bytes_read;
+    if (!ReadFile(handle.file, source, file_size, &bytes_read, NULL)) {
+        pm_string_file_handle_close(&handle);
+        return PM_STRING_INIT_ERROR_GENERIC;
+    }
+
+    // Check the number of bytes read
+    if (bytes_read != file_size) {
+        xfree(source);
+        pm_string_file_handle_close(&handle);
+        return PM_STRING_INIT_ERROR_GENERIC;
+    }
+
+    pm_string_file_handle_close(&handle);
+    *string = (pm_string_t) { .type = PM_STRING_OWNED, .source = source, .length = (size_t) file_size };
+    return PM_STRING_INIT_SUCCESS;
+#elif defined(PRISM_HAS_FILESYSTEM)
+    // Open the file for reading
+    int fd = open(filepath, O_RDONLY);
+    if (fd == -1) {
+        return PM_STRING_INIT_ERROR_GENERIC;
+    }
+
+    // Stat the file to get the file size
+    struct stat sb;
+    if (fstat(fd, &sb) == -1) {
+        close(fd);
+        return PM_STRING_INIT_ERROR_GENERIC;
+    }
+
+    // Ensure it is a file and not a directory
+    if (S_ISDIR(sb.st_mode)) {
+        close(fd);
+        return PM_STRING_INIT_ERROR_DIRECTORY;
+    }
+
+    // Check the size to see if it's empty
+    size_t size = (size_t) sb.st_size;
+    if (size == 0) {
+        close(fd);
+        const uint8_t source[] = "";
+        *string = (pm_string_t) { .type = PM_STRING_CONSTANT, .source = source, .length = 0 };
+        return PM_STRING_INIT_SUCCESS;
+    }
+
+    size_t length = (size_t) size;
+    uint8_t *source = xmalloc(length);
+    if (source == NULL) {
+        close(fd);
+        return PM_STRING_INIT_ERROR_GENERIC;
+    }
+
+    long bytes_read = (long) read(fd, source, length);
+    close(fd);
+
+    if (bytes_read == -1) {
+        xfree(source);
+        return PM_STRING_INIT_ERROR_GENERIC;
+    }
+
+    *string = (pm_string_t) { .type = PM_STRING_OWNED, .source = source, .length = length };
+    return PM_STRING_INIT_SUCCESS;
+#else
+    (void) string;
+    (void) filepath;
+    perror("pm_string_file_init is not implemented for this platform");
+    return PM_STRING_INIT_ERROR_GENERIC;
+#endif
+}
+
+/**
+ * Ensure the string is owned. If it is not, then reinitialize it as owned and
+ * copy over the previous source.
+ */
+void
+pm_string_ensure_owned(pm_string_t *string) {
+    if (string->type == PM_STRING_OWNED) return;
+
+    size_t length = pm_string_length(string);
+    const uint8_t *source = pm_string_source(string);
+
+    uint8_t *memory = xmalloc(length);
+    if (!memory) return;
+
+    pm_string_owned_init(string, memory, length);
+    memcpy((void *) string->source, source, length);
+}
+
+/**
+ * Compare the underlying lengths and bytes of two strings. Returns 0 if the
+ * strings are equal, a negative number if the left string is less than the
+ * right string, and a positive number if the left string is greater than the
+ * right string.
+ */
+int
+pm_string_compare(const pm_string_t *left, const pm_string_t *right) {
+    size_t left_length = pm_string_length(left);
+    size_t right_length = pm_string_length(right);
+
+    if (left_length < right_length) {
+        return -1;
+    } else if (left_length > right_length) {
+        return 1;
+    }
+
+    return memcmp(pm_string_source(left), pm_string_source(right), left_length);
+}
+
+/**
+ * Returns the length associated with the string.
+ */
+PRISM_EXPORTED_FUNCTION size_t
+pm_string_length(const pm_string_t *string) {
+    return string->length;
+}
+
+/**
+ * Returns the start pointer associated with the string.
+ */
+PRISM_EXPORTED_FUNCTION const uint8_t *
+pm_string_source(const pm_string_t *string) {
+    return string->source;
+}
+
+/**
+ * Free the associated memory of the given string.
+ */
+PRISM_EXPORTED_FUNCTION void
+pm_string_free(pm_string_t *string) {
+    void *memory = (void *) string->source;
+
+    if (string->type == PM_STRING_OWNED) {
+        xfree(memory);
+#ifdef PRISM_HAS_MMAP
+    } else if (string->type == PM_STRING_MAPPED && string->length) {
+#if defined(_WIN32)
+        UnmapViewOfFile(memory);
+#elif defined(_POSIX_MAPPED_FILES)
+        munmap(memory, string->length);
+#endif
+#endif /* PRISM_HAS_MMAP */
+    }
+}
diff --git a/prism/util/pm_string.h b/prism/util/pm_string.h
new file mode 100644
index 00000000000000..f99f1abdf38c9b
--- /dev/null
+++ b/prism/util/pm_string.h
@@ -0,0 +1,190 @@
+/**
+ * @file pm_string.h
+ *
+ * A generic string type that can have various ownership semantics.
+ */
+#ifndef PRISM_STRING_H
+#define PRISM_STRING_H
+
+#include "prism/defines.h"
+
+#include <assert.h>
+#include <errno.h>
+#include <stdbool.h>
+#include <stddef.h>
+#include <stdlib.h>
+#include <string.h>
+
+// The following headers are necessary to read files using demand paging.
+#ifdef _WIN32
+#include <windows.h>
+#elif defined(_POSIX_MAPPED_FILES)
+#include <fcntl.h>
+#include <sys/mman.h>
+#include <sys/stat.h>
+#elif defined(PRISM_HAS_FILESYSTEM)
+#include <fcntl.h>
+#include <sys/stat.h>
+#endif
+
+/**
+ * A generic string type that can have various ownership semantics.
+ */
+typedef struct {
+    /** A pointer to the start of the string. */
+    const uint8_t *source;
+
+    /** The length of the string in bytes of memory. */
+    size_t length;
+
+    /** The type of the string. This field determines how the string should be freed. */
+    enum {
+        /** This string is a constant string, and should not be freed. */
+        PM_STRING_CONSTANT,
+
+        /** This is a slice of another string, and should not be freed. */
+        PM_STRING_SHARED,
+
+        /** This string owns its memory, and should be freed using `pm_string_free`. */
+        PM_STRING_OWNED,
+
+#ifdef PRISM_HAS_MMAP
+        /** This string is a memory-mapped file, and should be freed using `pm_string_free`. */
+        PM_STRING_MAPPED
+#endif
+    } type;
+} pm_string_t;
+
+/**
+ * Returns the size of the pm_string_t struct. This is necessary to allocate the
+ * correct amount of memory in the FFI backend.
+ *
+ * @return The size of the pm_string_t struct.
+ */
+PRISM_EXPORTED_FUNCTION size_t pm_string_sizeof(void);
+
+/**
+ * Defines an empty string. This is useful for initializing a string that will
+ * be filled in later.
+ */
+#define PM_STRING_EMPTY ((pm_string_t) { .type = PM_STRING_CONSTANT, .source = NULL, .length = 0 })
+
+/**
+ * Initialize a shared string that is based on initial input.
+ *
+ * @param string The string to initialize.
+ * @param start The start of the string.
+ * @param end The end of the string.
+ */
+void pm_string_shared_init(pm_string_t *string, const uint8_t *start, const uint8_t *end);
+
+/**
+ * Initialize an owned string that is responsible for freeing allocated memory.
+ *
+ * @param string The string to initialize.
+ * @param source The source of the string.
+ * @param length The length of the string.
+ */
+void pm_string_owned_init(pm_string_t *string, uint8_t *source, size_t length);
+
+/**
+ * Initialize a constant string that doesn't own its memory source.
+ *
+ * @param string The string to initialize.
+ * @param source The source of the string.
+ * @param length The length of the string.
+ */
+void pm_string_constant_init(pm_string_t *string, const char *source, size_t length);
+
+/**
+ * Represents the result of calling pm_string_mapped_init or
+ * pm_string_file_init. We need this additional information because there is
+ * not a platform-agnostic way to indicate that the file that was attempted to
+ * be opened was a directory.
+ */
+typedef enum {
+    /** Indicates that the string was successfully initialized. */
+    PM_STRING_INIT_SUCCESS = 0,
+    /**
+     * Indicates a generic error from a string_*_init function, where the type
+     * of error should be read from `errno` or `GetLastError()`.
+     */
+    PM_STRING_INIT_ERROR_GENERIC = 1,
+    /**
+     * Indicates that the file that was attempted to be opened was a directory.
+     */
+    PM_STRING_INIT_ERROR_DIRECTORY = 2
+} pm_string_init_result_t;
+
+/**
+ * Read the file indicated by the filepath parameter into source and load its
+ * contents and size into the given `pm_string_t`. The given `pm_string_t`
+ * should be freed using `pm_string_free` when it is no longer used.
+ *
+ * We want to use demand paging as much as possible in order to avoid having to
+ * read the entire file into memory (which could be detrimental to performance
+ * for large files). This means that if we're on windows we'll use
+ * `MapViewOfFile`, on POSIX systems that have access to `mmap` we'll use
+ * `mmap`, and on other POSIX systems we'll use `read`.
+ *
+ * @param string The string to initialize.
+ * @param filepath The filepath to read.
+ * @return The success of the read, indicated by the value of the enum.
+ */
+PRISM_EXPORTED_FUNCTION pm_string_init_result_t pm_string_mapped_init(pm_string_t *string, const char *filepath);
+
+/**
+ * Read the file indicated by the filepath parameter into source and load its
+ * contents and size into the given `pm_string_t`. The given `pm_string_t`
+ * should be freed using `pm_string_free` when it is no longer used.
+ *
+ * @param string The string to initialize.
+ * @param filepath The filepath to read.
+ * @return The success of the read, indicated by the value of the enum.
+ */
+PRISM_EXPORTED_FUNCTION pm_string_init_result_t pm_string_file_init(pm_string_t *string, const char *filepath);
+
+/**
+ * Ensure the string is owned. If it is not, then reinitialize it as owned and
+ * copy over the previous source.
+ *
+ * @param string The string to ensure is owned.
+ */
+void pm_string_ensure_owned(pm_string_t *string);
+
+/**
+ * Compare the underlying lengths and bytes of two strings. Returns 0 if the
+ * strings are equal, a negative number if the left string is less than the
+ * right string, and a positive number if the left string is greater than the
+ * right string.
+ *
+ * @param left The left string to compare.
+ * @param right The right string to compare.
+ * @return The comparison result.
+ */
+int pm_string_compare(const pm_string_t *left, const pm_string_t *right);
+
+/**
+ * Returns the length associated with the string.
+ *
+ * @param string The string to get the length of.
+ * @return The length of the string.
+ */
+PRISM_EXPORTED_FUNCTION size_t pm_string_length(const pm_string_t *string);
+
+/**
+ * Returns the start pointer associated with the string.
+ *
+ * @param string The string to get the start pointer of.
+ * @return The start pointer of the string.
+ */
+PRISM_EXPORTED_FUNCTION const uint8_t * pm_string_source(const pm_string_t *string);
+
+/**
+ * Free the associated memory of the given string.
+ *
+ * @param string The string to free.
+ */
+PRISM_EXPORTED_FUNCTION void pm_string_free(pm_string_t *string);
+
+#endif
diff --git a/prism/util/pm_strncasecmp.c b/prism/util/pm_strncasecmp.c
new file mode 100644
index 00000000000000..3f584215540c02
--- /dev/null
+++ b/prism/util/pm_strncasecmp.c
@@ -0,0 +1,36 @@
+#include "prism/util/pm_strncasecmp.h"
+
+/**
+ * A locale-insensitive version of `tolower(3)`
+ */
+static inline int
+pm_tolower(int c)
+{
+    if ('A' <= c && c <= 'Z') {
+        return c | 0x20;
+    }
+    return c;
+}
+
+/**
+ * Compare two strings, ignoring case, up to the given length. Returns 0 if the
+ * strings are equal, a negative number if string1 is less than string2, or a
+ * positive number if string1 is greater than string2.
+ *
+ * Note that this is effectively our own implementation of strncasecmp, but it's
+ * not available on all of the platforms we want to support so we're rolling it
+ * here.
+ */
+int
+pm_strncasecmp(const uint8_t *string1, const uint8_t *string2, size_t length) {
+    size_t offset = 0;
+    int difference = 0;
+
+    while (offset < length && string1[offset] != '\0') {
+        if (string2[offset] == '\0') return string1[offset];
+        if ((difference = pm_tolower(string1[offset]) - pm_tolower(string2[offset])) != 0) return difference;
+        offset++;
+    }
+
+    return difference;
+}
diff --git a/prism/util/pm_strncasecmp.h b/prism/util/pm_strncasecmp.h
new file mode 100644
index 00000000000000..5cb88cb5eb5363
--- /dev/null
+++ b/prism/util/pm_strncasecmp.h
@@ -0,0 +1,32 @@
+/**
+ * @file pm_strncasecmp.h
+ *
+ * A custom strncasecmp implementation.
+ */
+#ifndef PRISM_STRNCASECMP_H
+#define PRISM_STRNCASECMP_H
+
+#include "prism/defines.h"
+
+#include <ctype.h>
+#include <stddef.h>
+#include <stdint.h>
+
+/**
+ * Compare two strings, ignoring case, up to the given length. Returns 0 if the
+ * strings are equal, a negative number if string1 is less than string2, or a
+ * positive number if string1 is greater than string2.
+ *
+ * Note that this is effectively our own implementation of strncasecmp, but it's
+ * not available on all of the platforms we want to support so we're rolling it
+ * here.
+ *
+ * @param string1 The first string to compare.
+ * @param string2 The second string to compare
+ * @param length The maximum number of characters to compare.
+ * @return 0 if the strings are equal, a negative number if string1 is less than
+ *     string2, or a positive number if string1 is greater than string2.
+ */
+int pm_strncasecmp(const uint8_t *string1, const uint8_t *string2, size_t length);
+
+#endif
diff --git a/prism/util/pm_strpbrk.c b/prism/util/pm_strpbrk.c
new file mode 100644
index 00000000000000..916a4cc3fd3c16
--- /dev/null
+++ b/prism/util/pm_strpbrk.c
@@ -0,0 +1,206 @@
+#include "prism/util/pm_strpbrk.h"
+
+/**
+ * Add an invalid multibyte character error to the parser.
+ */
+static inline void
+pm_strpbrk_invalid_multibyte_character(pm_parser_t *parser, const uint8_t *start, const uint8_t *end) {
+    pm_diagnostic_list_append_format(&parser->error_list, start, end, PM_ERR_INVALID_MULTIBYTE_CHARACTER, *start);
+}
+
+/**
+ * Set the explicit encoding for the parser to the current encoding.
+ */
+static inline void
+pm_strpbrk_explicit_encoding_set(pm_parser_t *parser, const uint8_t *source, size_t width) {
+    if (parser->explicit_encoding != NULL) {
+        if (parser->explicit_encoding == parser->encoding) {
+            // Okay, we already locked to this encoding.
+        } else if (parser->explicit_encoding == PM_ENCODING_UTF_8_ENTRY) {
+            // Not okay, we already found a Unicode escape sequence and this
+            // conflicts.
+            pm_diagnostic_list_append_format(&parser->error_list, source, source + width, PM_ERR_MIXED_ENCODING, parser->encoding->name);
+        } else {
+            // Should not be anything else.
+            assert(false && "unreachable");
+        }
+    }
+
+    parser->explicit_encoding = parser->encoding;
+}
+
+/**
+ * This is the default path.
+ */
+static inline const uint8_t *
+pm_strpbrk_utf8(pm_parser_t *parser, const uint8_t *source, const uint8_t *charset, size_t maximum, bool validate) {
+    size_t index = 0;
+
+    while (index < maximum) {
+        if (strchr((const char *) charset, source[index]) != NULL) {
+            return source + index;
+        }
+
+        if (source[index] < 0x80) {
+            index++;
+        } else {
+            size_t width = pm_encoding_utf_8_char_width(source + index, (ptrdiff_t) (maximum - index));
+
+            if (width > 0) {
+                index += width;
+            } else if (!validate) {
+                index++;
+            } else {
+                // At this point we know we have an invalid multibyte character.
+                // We'll walk forward as far as we can until we find the next
+                // valid character so that we don't spam the user with a ton of
+                // the same kind of error.
+                const size_t start = index;
+
+                do {
+                    index++;
+                } while (index < maximum && pm_encoding_utf_8_char_width(source + index, (ptrdiff_t) (maximum - index)) == 0);
+
+                pm_strpbrk_invalid_multibyte_character(parser, source + start, source + index);
+            }
+        }
+    }
+
+    return NULL;
+}
+
+/**
+ * This is the path when the encoding is ASCII-8BIT.
+ */
+static inline const uint8_t *
+pm_strpbrk_ascii_8bit(pm_parser_t *parser, const uint8_t *source, const uint8_t *charset, size_t maximum, bool validate) {
+    size_t index = 0;
+
+    while (index < maximum) {
+        if (strchr((const char *) charset, source[index]) != NULL) {
+            return source + index;
+        }
+
+        if (validate && source[index] >= 0x80) pm_strpbrk_explicit_encoding_set(parser, source, 1);
+        index++;
+    }
+
+    return NULL;
+}
+
+/**
+ * This is the slow path that does care about the encoding.
+ */
+static inline const uint8_t *
+pm_strpbrk_multi_byte(pm_parser_t *parser, const uint8_t *source, const uint8_t *charset, size_t maximum, bool validate) {
+    size_t index = 0;
+    const pm_encoding_t *encoding = parser->encoding;
+
+    while (index < maximum) {
+        if (strchr((const char *) charset, source[index]) != NULL) {
+            return source + index;
+        }
+
+        if (source[index] < 0x80) {
+            index++;
+        } else {
+            size_t width = encoding->char_width(source + index, (ptrdiff_t) (maximum - index));
+            if (validate) pm_strpbrk_explicit_encoding_set(parser, source, width);
+
+            if (width > 0) {
+                index += width;
+            } else if (!validate) {
+                index++;
+            } else {
+                // At this point we know we have an invalid multibyte character.
+                // We'll walk forward as far as we can until we find the next
+                // valid character so that we don't spam the user with a ton of
+                // the same kind of error.
+                const size_t start = index;
+
+                do {
+                    index++;
+                } while (index < maximum && encoding->char_width(source + index, (ptrdiff_t) (maximum - index)) == 0);
+
+                pm_strpbrk_invalid_multibyte_character(parser, source + start, source + index);
+            }
+        }
+    }
+
+    return NULL;
+}
+
+/**
+ * This is the fast path that does not care about the encoding because we know
+ * the encoding only supports single-byte characters.
+ */
+static inline const uint8_t *
+pm_strpbrk_single_byte(pm_parser_t *parser, const uint8_t *source, const uint8_t *charset, size_t maximum, bool validate) {
+    size_t index = 0;
+    const pm_encoding_t *encoding = parser->encoding;
+
+    while (index < maximum) {
+        if (strchr((const char *) charset, source[index]) != NULL) {
+            return source + index;
+        }
+
+        if (source[index] < 0x80 || !validate) {
+            index++;
+        } else {
+            size_t width = encoding->char_width(source + index, (ptrdiff_t) (maximum - index));
+            pm_strpbrk_explicit_encoding_set(parser, source, width);
+
+            if (width > 0) {
+                index += width;
+            } else {
+                // At this point we know we have an invalid multibyte character.
+                // We'll walk forward as far as we can until we find the next
+                // valid character so that we don't spam the user with a ton of
+                // the same kind of error.
+                const size_t start = index;
+
+                do {
+                    index++;
+                } while (index < maximum && encoding->char_width(source + index, (ptrdiff_t) (maximum - index)) == 0);
+
+                pm_strpbrk_invalid_multibyte_character(parser, source + start, source + index);
+            }
+        }
+    }
+
+    return NULL;
+}
+
+/**
+ * Here we have rolled our own version of strpbrk. The standard library strpbrk
+ * has undefined behavior when the source string is not null-terminated. We want
+ * to support strings that are not null-terminated because pm_parse does not
+ * have the contract that the string is null-terminated. (This is desirable
+ * because it means the extension can call pm_parse with the result of a call to
+ * mmap).
+ *
+ * The standard library strpbrk also does not support passing a maximum length
+ * to search. We want to support this for the reason mentioned above, but we
+ * also don't want it to stop on null bytes. Ruby actually allows null bytes
+ * within strings, comments, regular expressions, etc. So we need to be able to
+ * skip past them.
+ *
+ * Finally, we want to support encodings wherein the charset could contain
+ * characters that are trailing bytes of multi-byte characters. For example, in
+ * Shift_JIS, the backslash character can be a trailing byte. In that case we
+ * need to take a slower path and iterate one multi-byte character at a time.
+ */
+const uint8_t *
+pm_strpbrk(pm_parser_t *parser, const uint8_t *source, const uint8_t *charset, ptrdiff_t length, bool validate) {
+    if (length <= 0) {
+        return NULL;
+    } else if (!parser->encoding_changed) {
+        return pm_strpbrk_utf8(parser, source, charset, (size_t) length, validate);
+    } else if (parser->encoding == PM_ENCODING_ASCII_8BIT_ENTRY) {
+        return pm_strpbrk_ascii_8bit(parser, source, charset, (size_t) length, validate);
+    } else if (parser->encoding->multibyte) {
+        return pm_strpbrk_multi_byte(parser, source, charset, (size_t) length, validate);
+    } else {
+        return pm_strpbrk_single_byte(parser, source, charset, (size_t) length, validate);
+    }
+}
diff --git a/prism/util/pm_strpbrk.h b/prism/util/pm_strpbrk.h
new file mode 100644
index 00000000000000..f387bd5782f169
--- /dev/null
+++ b/prism/util/pm_strpbrk.h
@@ -0,0 +1,46 @@
+/**
+ * @file pm_strpbrk.h
+ *
+ * A custom strpbrk implementation.
+ */
+#ifndef PRISM_STRPBRK_H
+#define PRISM_STRPBRK_H
+
+#include "prism/defines.h"
+#include "prism/diagnostic.h"
+#include "prism/parser.h"
+
+#include <stddef.h>
+#include <string.h>
+
+/**
+ * Here we have rolled our own version of strpbrk. The standard library strpbrk
+ * has undefined behavior when the source string is not null-terminated. We want
+ * to support strings that are not null-terminated because pm_parse does not
+ * have the contract that the string is null-terminated. (This is desirable
+ * because it means the extension can call pm_parse with the result of a call to
+ * mmap).
+ *
+ * The standard library strpbrk also does not support passing a maximum length
+ * to search. We want to support this for the reason mentioned above, but we
+ * also don't want it to stop on null bytes. Ruby actually allows null bytes
+ * within strings, comments, regular expressions, etc. So we need to be able to
+ * skip past them.
+ *
+ * Finally, we want to support encodings wherein the charset could contain
+ * characters that are trailing bytes of multi-byte characters. For example, in
+ * Shift-JIS, the backslash character can be a trailing byte. In that case we
+ * need to take a slower path and iterate one multi-byte character at a time.
+ *
+ * @param parser The parser.
+ * @param source The source to search.
+ * @param charset The charset to search for.
+ * @param length The maximum number of bytes to search.
+ * @param validate Whether to validate that the source string is valid in the
+ *     current encoding of the parser.
+ * @return A pointer to the first character in the source string that is in the
+ *     charset, or NULL if no such character exists.
+ */
+const uint8_t * pm_strpbrk(pm_parser_t *parser, const uint8_t *source, const uint8_t *charset, ptrdiff_t length, bool validate);
+
+#endif
diff --git a/prism/version.h b/prism/version.h
new file mode 100644
index 00000000000000..0a2a8c8fce5a25
--- /dev/null
+++ b/prism/version.h
@@ -0,0 +1,29 @@
+/**
+ * @file version.h
+ *
+ * The version of the Prism library.
+ */
+#ifndef PRISM_VERSION_H
+#define PRISM_VERSION_H
+
+/**
+ * The major version of the Prism library as an int.
+ */
+#define PRISM_VERSION_MAJOR 1
+
+/**
+ * The minor version of the Prism library as an int.
+ */
+#define PRISM_VERSION_MINOR 4
+
+/**
+ * The patch version of the Prism library as an int.
+ */
+#define PRISM_VERSION_PATCH 0
+
+/**
+ * The version of the Prism library as a constant string.
+ */
+#define PRISM_VERSION "1.4.0"
+
+#endif
diff --git a/prism_compile.c b/prism_compile.c
new file mode 100644
index 00000000000000..e9585805243ffa
--- /dev/null
+++ b/prism_compile.c
@@ -0,0 +1,11537 @@
+#include "prism.h"
+
+/**
+ * This compiler defines its own concept of the location of a node. We do this
+ * because we want to pair line information with node identifier so that we can
+ * have reproducible parses.
+ */
+typedef struct {
+    /** This is the line number of a node. */
+    int32_t line;
+
+    /** This is a unique identifier for the node. */
+    uint32_t node_id;
+} pm_node_location_t;
+
+/******************************************************************************/
+/* These macros operate on pm_node_location_t structs as opposed to NODE*s.   */
+/******************************************************************************/
+
+#define PUSH_ADJUST(seq, location, label) \
+    ADD_ELEM((seq), (LINK_ELEMENT *) new_adjust_body(iseq, (label), (int) (location).line))
+
+#define PUSH_ADJUST_RESTORE(seq, label) \
+    ADD_ELEM((seq), (LINK_ELEMENT *) new_adjust_body(iseq, (label), -1))
+
+#define PUSH_INSN(seq, location, insn) \
+    ADD_ELEM((seq), (LINK_ELEMENT *) new_insn_body(iseq, (int) (location).line, (int) (location).node_id, BIN(insn), 0))
+
+#define PUSH_INSN1(seq, location, insn, op1) \
+    ADD_ELEM((seq), (LINK_ELEMENT *) new_insn_body(iseq, (int) (location).line, (int) (location).node_id, BIN(insn), 1, (VALUE)(op1)))
+
+#define PUSH_INSN2(seq, location, insn, op1, op2) \
+    ADD_ELEM((seq), (LINK_ELEMENT *) new_insn_body(iseq, (int) (location).line, (int) (location).node_id, BIN(insn), 2, (VALUE)(op1), (VALUE)(op2)))
+
+#define PUSH_INSN3(seq, location, insn, op1, op2, op3) \
+    ADD_ELEM((seq), (LINK_ELEMENT *) new_insn_body(iseq, (int) (location).line, (int) (location).node_id, BIN(insn), 3, (VALUE)(op1), (VALUE)(op2), (VALUE)(op3)))
+
+#define PUSH_INSNL(seq, location, insn, label) \
+    (PUSH_INSN1(seq, location, insn, label), LABEL_REF(label))
+
+#define PUSH_LABEL(seq, label) \
+    ADD_ELEM((seq), (LINK_ELEMENT *) (label))
+
+#define PUSH_SEND_R(seq, location, id, argc, block, flag, keywords) \
+    ADD_ELEM((seq), (LINK_ELEMENT *) new_insn_send(iseq, (int) (location).line, (int) (location).node_id, (id), (VALUE)(argc), (block), (VALUE)(flag), (keywords)))
+
+#define PUSH_SEND(seq, location, id, argc) \
+    PUSH_SEND_R((seq), location, (id), (argc), NULL, (VALUE)INT2FIX(0), NULL)
+
+#define PUSH_SEND_WITH_FLAG(seq, location, id, argc, flag) \
+    PUSH_SEND_R((seq), location, (id), (argc), NULL, (VALUE)(flag), NULL)
+
+#define PUSH_SEND_WITH_BLOCK(seq, location, id, argc, block) \
+    PUSH_SEND_R((seq), location, (id), (argc), (block), (VALUE)INT2FIX(0), NULL)
+
+#define PUSH_CALL(seq, location, id, argc) \
+    PUSH_SEND_R((seq), location, (id), (argc), NULL, (VALUE)INT2FIX(VM_CALL_FCALL), NULL)
+
+#define PUSH_CALL_WITH_BLOCK(seq, location, id, argc, block) \
+    PUSH_SEND_R((seq), location, (id), (argc), (block), (VALUE)INT2FIX(VM_CALL_FCALL), NULL)
+
+#define PUSH_TRACE(seq, event) \
+    ADD_ELEM((seq), (LINK_ELEMENT *) new_trace_body(iseq, (event), 0))
+
+#define PUSH_CATCH_ENTRY(type, ls, le, iseqv, lc) \
+    ADD_CATCH_ENTRY((type), (ls), (le), (iseqv), (lc))
+
+#define PUSH_SEQ(seq1, seq2) \
+    APPEND_LIST((seq1), (seq2))
+
+#define PUSH_SYNTHETIC_PUTNIL(seq, iseq) \
+    do { \
+        int lineno = ISEQ_COMPILE_DATA(iseq)->last_line; \
+        if (lineno == 0) lineno = FIX2INT(rb_iseq_first_lineno(iseq)); \
+        ADD_SYNTHETIC_INSN(seq, lineno, -1, putnil); \
+    } while (0)
+
+/******************************************************************************/
+/* These functions compile getlocal/setlocal instructions but operate on      */
+/* prism locations instead of NODEs.                                          */
+/******************************************************************************/
+
+static void
+pm_iseq_add_getlocal(rb_iseq_t *iseq, LINK_ANCHOR *const seq, int line, int node_id, int idx, int level)
+{
+    if (iseq_local_block_param_p(iseq, idx, level)) {
+        ADD_ELEM(seq, (LINK_ELEMENT *) new_insn_body(iseq, line, node_id, BIN(getblockparam), 2, INT2FIX((idx) + VM_ENV_DATA_SIZE - 1), INT2FIX(level)));
+    }
+    else {
+        ADD_ELEM(seq, (LINK_ELEMENT *) new_insn_body(iseq, line, node_id, BIN(getlocal), 2, INT2FIX((idx) + VM_ENV_DATA_SIZE - 1), INT2FIX(level)));
+    }
+    if (level > 0) access_outer_variables(iseq, level, iseq_lvar_id(iseq, idx, level), Qfalse);
+}
+
+static void
+pm_iseq_add_setlocal(rb_iseq_t *iseq, LINK_ANCHOR *const seq, int line, int node_id, int idx, int level)
+{
+    if (iseq_local_block_param_p(iseq, idx, level)) {
+        ADD_ELEM(seq, (LINK_ELEMENT *) new_insn_body(iseq, line, node_id, BIN(setblockparam), 2, INT2FIX((idx) + VM_ENV_DATA_SIZE - 1), INT2FIX(level)));
+    }
+    else {
+        ADD_ELEM(seq, (LINK_ELEMENT *) new_insn_body(iseq, line, node_id, BIN(setlocal), 2, INT2FIX((idx) + VM_ENV_DATA_SIZE - 1), INT2FIX(level)));
+    }
+    if (level > 0) access_outer_variables(iseq, level, iseq_lvar_id(iseq, idx, level), Qtrue);
+}
+
+#define PUSH_GETLOCAL(seq, location, idx, level) \
+    pm_iseq_add_getlocal(iseq, (seq), (int) (location).line, (int) (location).node_id, (idx), (level))
+
+#define PUSH_SETLOCAL(seq, location, idx, level) \
+    pm_iseq_add_setlocal(iseq, (seq), (int) (location).line, (int) (location).node_id, (idx), (level))
+
+/******************************************************************************/
+/* These are helper macros for the compiler.                                  */
+/******************************************************************************/
+
+#define OLD_ISEQ NEW_ISEQ
+#undef NEW_ISEQ
+
+#define NEW_ISEQ(node, name, type, line_no) \
+    pm_new_child_iseq(iseq, (node), rb_fstring(name), 0, (type), (line_no))
+
+#define OLD_CHILD_ISEQ NEW_CHILD_ISEQ
+#undef NEW_CHILD_ISEQ
+
+#define NEW_CHILD_ISEQ(node, name, type, line_no) \
+    pm_new_child_iseq(iseq, (node), rb_fstring(name), iseq, (type), (line_no))
+
+#define PM_COMPILE(node) \
+    pm_compile_node(iseq, (node), ret, popped, scope_node)
+
+#define PM_COMPILE_INTO_ANCHOR(_ret, node) \
+    pm_compile_node(iseq, (node), _ret, popped, scope_node)
+
+#define PM_COMPILE_POPPED(node) \
+    pm_compile_node(iseq, (node), ret, true, scope_node)
+
+#define PM_COMPILE_NOT_POPPED(node) \
+    pm_compile_node(iseq, (node), ret, false, scope_node)
+
+#define PM_NODE_START_LOCATION(parser, node) \
+    ((pm_node_location_t) { .line = pm_newline_list_line(&(parser)->newline_list, ((const pm_node_t *) (node))->location.start, (parser)->start_line), .node_id = ((const pm_node_t *) (node))->node_id })
+
+#define PM_NODE_END_LOCATION(parser, node) \
+    ((pm_node_location_t) { .line = pm_newline_list_line(&(parser)->newline_list, ((const pm_node_t *) (node))->location.end, (parser)->start_line), .node_id = ((const pm_node_t *) (node))->node_id })
+
+#define PM_LOCATION_START_LOCATION(parser, location, id) \
+    ((pm_node_location_t) { .line = pm_newline_list_line(&(parser)->newline_list, (location)->start, (parser)->start_line), .node_id = id })
+
+#define PM_NODE_START_LINE_COLUMN(parser, node) \
+    pm_newline_list_line_column(&(parser)->newline_list, ((const pm_node_t *) (node))->location.start, (parser)->start_line)
+
+#define PM_NODE_END_LINE_COLUMN(parser, node) \
+    pm_newline_list_line_column(&(parser)->newline_list, ((const pm_node_t *) (node))->location.end, (parser)->start_line)
+
+#define PM_LOCATION_START_LINE_COLUMN(parser, location) \
+    pm_newline_list_line_column(&(parser)->newline_list, (location)->start, (parser)->start_line)
+
+static int
+pm_node_line_number(const pm_parser_t *parser, const pm_node_t *node)
+{
+    return (int) pm_newline_list_line(&parser->newline_list, node->location.start, parser->start_line);
+}
+
+static int
+pm_location_line_number(const pm_parser_t *parser, const pm_location_t *location) {
+    return (int) pm_newline_list_line(&parser->newline_list, location->start, parser->start_line);
+}
+
+/**
+ * Parse the value of a pm_integer_t into a Ruby Integer.
+ */
+static VALUE
+parse_integer_value(const pm_integer_t *integer)
+{
+    VALUE result;
+
+    if (integer->values == NULL) {
+        result = UINT2NUM(integer->value);
+    }
+    else {
+        VALUE string = rb_str_new(NULL, integer->length * 8);
+        unsigned char *bytes = (unsigned char *) RSTRING_PTR(string);
+
+        size_t offset = integer->length * 8;
+        for (size_t value_index = 0; value_index < integer->length; value_index++) {
+            uint32_t value = integer->values[value_index];
+
+            for (int index = 0; index < 8; index++) {
+                int byte = (value >> (4 * index)) & 0xf;
+                bytes[--offset] = byte < 10 ? byte + '0' : byte - 10 + 'a';
+            }
+        }
+
+        result = rb_funcall(string, rb_intern("to_i"), 1, UINT2NUM(16));
+    }
+
+    if (integer->negative) {
+        result = rb_funcall(result, rb_intern("-@"), 0);
+    }
+
+    return result;
+}
+
+/**
+ * Convert the value of an integer node into a Ruby Integer.
+ */
+static inline VALUE
+parse_integer(const pm_integer_node_t *node)
+{
+    return parse_integer_value(&node->value);
+}
+
+/**
+ * Convert the value of a float node into a Ruby Float.
+ */
+static VALUE
+parse_float(const pm_float_node_t *node)
+{
+    return DBL2NUM(node->value);
+}
+
+/**
+ * Convert the value of a rational node into a Ruby Rational. Rational nodes can
+ * either be wrapping an integer node or a float node. If it's an integer node,
+ * we can reuse our parsing. If it's not, then we'll parse the numerator and
+ * then parse the denominator and create the rational from those two values.
+ */
+static VALUE
+parse_rational(const pm_rational_node_t *node)
+{
+    VALUE numerator = parse_integer_value(&node->numerator);
+    VALUE denominator = parse_integer_value(&node->denominator);
+    return rb_rational_new(numerator, denominator);
+}
+
+/**
+ * Convert the value of an imaginary node into a Ruby Complex. Imaginary nodes
+ * can be wrapping an integer node, a float node, or a rational node. In all
+ * cases we will reuse parsing functions seen above to get the inner value, and
+ * then convert into an imaginary with rb_complex_raw.
+ */
+static VALUE
+parse_imaginary(const pm_imaginary_node_t *node)
+{
+    VALUE imaginary_part;
+    switch (PM_NODE_TYPE(node->numeric)) {
+      case PM_FLOAT_NODE: {
+        imaginary_part = parse_float((const pm_float_node_t *) node->numeric);
+        break;
+      }
+      case PM_INTEGER_NODE: {
+        imaginary_part = parse_integer((const pm_integer_node_t *) node->numeric);
+        break;
+      }
+      case PM_RATIONAL_NODE: {
+        imaginary_part = parse_rational((const pm_rational_node_t *) node->numeric);
+        break;
+      }
+      default:
+        rb_bug("Unexpected numeric type on imaginary number %s\n", pm_node_type_to_str(PM_NODE_TYPE(node->numeric)));
+    }
+
+    return rb_complex_raw(INT2FIX(0), imaginary_part);
+}
+
+static inline VALUE
+parse_string(const pm_scope_node_t *scope_node, const pm_string_t *string)
+{
+    return rb_enc_str_new((const char *) pm_string_source(string), pm_string_length(string), scope_node->encoding);
+}
+
+/**
+ * Certain strings can have their encoding differ from the parser's encoding due
+ * to bytes or escape sequences that have the top bit set. This function handles
+ * creating those strings based on the flags set on the owning node.
+ */
+static inline VALUE
+parse_string_encoded(const pm_node_t *node, const pm_string_t *string, rb_encoding *default_encoding)
+{
+    rb_encoding *encoding;
+
+    if (node->flags & PM_ENCODING_FLAGS_FORCED_BINARY_ENCODING) {
+        encoding = rb_ascii8bit_encoding();
+    }
+    else if (node->flags & PM_ENCODING_FLAGS_FORCED_UTF8_ENCODING) {
+        encoding = rb_utf8_encoding();
+    }
+    else {
+        encoding = default_encoding;
+    }
+
+    return rb_enc_str_new((const char *) pm_string_source(string), pm_string_length(string), encoding);
+}
+
+static inline VALUE
+parse_static_literal_string(rb_iseq_t *iseq, const pm_scope_node_t *scope_node, const pm_node_t *node, const pm_string_t *string)
+{
+    rb_encoding *encoding;
+
+    if (node->flags & PM_STRING_FLAGS_FORCED_BINARY_ENCODING) {
+        encoding = rb_ascii8bit_encoding();
+    }
+    else if (node->flags & PM_STRING_FLAGS_FORCED_UTF8_ENCODING) {
+        encoding = rb_utf8_encoding();
+    }
+    else {
+        encoding = scope_node->encoding;
+    }
+
+    VALUE value = rb_enc_literal_str((const char *) pm_string_source(string), pm_string_length(string), encoding);
+    rb_enc_str_coderange(value);
+
+    if (ISEQ_COMPILE_DATA(iseq)->option->debug_frozen_string_literal || RTEST(ruby_debug)) {
+        int line_number = pm_node_line_number(scope_node->parser, node);
+        value = rb_str_with_debug_created_info(value, rb_iseq_path(iseq), line_number);
+    }
+
+    return value;
+}
+
+static inline ID
+parse_string_symbol(const pm_scope_node_t *scope_node, const pm_symbol_node_t *symbol)
+{
+    rb_encoding *encoding;
+    if (symbol->base.flags & PM_SYMBOL_FLAGS_FORCED_UTF8_ENCODING) {
+        encoding = rb_utf8_encoding();
+    }
+    else if (symbol->base.flags & PM_SYMBOL_FLAGS_FORCED_BINARY_ENCODING) {
+        encoding = rb_ascii8bit_encoding();
+    }
+    else if (symbol->base.flags & PM_SYMBOL_FLAGS_FORCED_US_ASCII_ENCODING) {
+        encoding = rb_usascii_encoding();
+    }
+    else {
+        encoding = scope_node->encoding;
+    }
+
+    return rb_intern3((const char *) pm_string_source(&symbol->unescaped), pm_string_length(&symbol->unescaped), encoding);
+}
+
+static int
+pm_optimizable_range_item_p(const pm_node_t *node)
+{
+    return (!node || PM_NODE_TYPE_P(node, PM_INTEGER_NODE) || PM_NODE_TYPE_P(node, PM_NIL_NODE));
+}
+
+/** Raise an error corresponding to the invalid regular expression. */
+static VALUE
+parse_regexp_error(rb_iseq_t *iseq, int32_t line_number, const char *fmt, ...)
+{
+    va_list args;
+    va_start(args, fmt);
+    VALUE error = rb_syntax_error_append(Qnil, rb_iseq_path(iseq), line_number, -1, NULL, "%" PRIsVALUE, args);
+    va_end(args);
+    rb_exc_raise(error);
+}
+
+static VALUE
+parse_regexp_string_part(rb_iseq_t *iseq, const pm_scope_node_t *scope_node, const pm_node_t *node, const pm_string_t *unescaped, rb_encoding *implicit_regexp_encoding, rb_encoding *explicit_regexp_encoding)
+{
+    // If we were passed an explicit regexp encoding, then we need to double
+    // check that it's okay here for this fragment of the string.
+    rb_encoding *encoding;
+
+    if (explicit_regexp_encoding != NULL) {
+        encoding = explicit_regexp_encoding;
+    }
+    else if (node->flags & PM_STRING_FLAGS_FORCED_BINARY_ENCODING) {
+        encoding = rb_ascii8bit_encoding();
+    }
+    else if (node->flags & PM_STRING_FLAGS_FORCED_UTF8_ENCODING) {
+        encoding = rb_utf8_encoding();
+    }
+    else {
+        encoding = implicit_regexp_encoding;
+    }
+
+    VALUE string = rb_enc_str_new((const char *) pm_string_source(unescaped), pm_string_length(unescaped), encoding);
+    VALUE error = rb_reg_check_preprocess(string);
+
+    if (error != Qnil) parse_regexp_error(iseq, pm_node_line_number(scope_node->parser, node), "%" PRIsVALUE, rb_obj_as_string(error));
+    return string;
+}
+
+static VALUE
+pm_static_literal_concat(rb_iseq_t *iseq, const pm_node_list_t *nodes, const pm_scope_node_t *scope_node, rb_encoding *implicit_regexp_encoding, rb_encoding *explicit_regexp_encoding, bool top)
+{
+    VALUE current = Qnil;
+
+    for (size_t index = 0; index < nodes->size; index++) {
+        const pm_node_t *part = nodes->nodes[index];
+        VALUE string;
+
+        switch (PM_NODE_TYPE(part)) {
+          case PM_STRING_NODE:
+            if (implicit_regexp_encoding != NULL) {
+                if (top) {
+                    string = parse_regexp_string_part(iseq, scope_node, part, &((const pm_string_node_t *) part)->unescaped, implicit_regexp_encoding, explicit_regexp_encoding);
+                }
+                else {
+                    string = parse_string_encoded(part, &((const pm_string_node_t *) part)->unescaped, scope_node->encoding);
+                    VALUE error = rb_reg_check_preprocess(string);
+                    if (error != Qnil) parse_regexp_error(iseq, pm_node_line_number(scope_node->parser, part), "%" PRIsVALUE, rb_obj_as_string(error));
+                }
+            }
+            else {
+                string = parse_string_encoded(part, &((const pm_string_node_t *) part)->unescaped, scope_node->encoding);
+            }
+            break;
+          case PM_INTERPOLATED_STRING_NODE:
+            string = pm_static_literal_concat(iseq, &((const pm_interpolated_string_node_t *) part)->parts, scope_node, implicit_regexp_encoding, explicit_regexp_encoding, false);
+            break;
+          case PM_EMBEDDED_STATEMENTS_NODE: {
+            const pm_embedded_statements_node_t *cast = (const pm_embedded_statements_node_t *) part;
+            string = pm_static_literal_concat(iseq, &cast->statements->body, scope_node, implicit_regexp_encoding, explicit_regexp_encoding, false);
+            break;
+          }
+          default:
+            RUBY_ASSERT(false && "unexpected node type in pm_static_literal_concat");
+            return Qnil;
+        }
+
+        if (current != Qnil) {
+            current = rb_str_concat(current, string);
+        }
+        else {
+            current = string;
+        }
+    }
+
+    return top ? rb_fstring(current) : current;
+}
+
+#define RE_OPTION_ENCODING_SHIFT 8
+#define RE_OPTION_ENCODING(encoding) (((encoding) & 0xFF) << RE_OPTION_ENCODING_SHIFT)
+#define ARG_ENCODING_NONE    32
+#define ARG_ENCODING_FIXED   16
+#define ENC_ASCII8BIT        1
+#define ENC_EUC_JP           2
+#define ENC_Windows_31J      3
+#define ENC_UTF8             4
+
+/**
+ * Check the prism flags of a regular expression-like node and return the flags
+ * that are expected by the CRuby VM.
+ */
+static int
+parse_regexp_flags(const pm_node_t *node)
+{
+    int flags = 0;
+
+    // Check "no encoding" first so that flags don't get clobbered
+    // We're calling `rb_char_to_option_kcode` in this case so that
+    // we don't need to have access to `ARG_ENCODING_NONE`
+    if (PM_NODE_FLAG_P(node, PM_REGULAR_EXPRESSION_FLAGS_ASCII_8BIT)) {
+        flags |= ARG_ENCODING_NONE;
+    }
+
+    if (PM_NODE_FLAG_P(node, PM_REGULAR_EXPRESSION_FLAGS_EUC_JP)) {
+        flags |= (ARG_ENCODING_FIXED | RE_OPTION_ENCODING(ENC_EUC_JP));
+    }
+
+    if (PM_NODE_FLAG_P(node, PM_REGULAR_EXPRESSION_FLAGS_WINDOWS_31J)) {
+        flags |= (ARG_ENCODING_FIXED | RE_OPTION_ENCODING(ENC_Windows_31J));
+    }
+
+    if (PM_NODE_FLAG_P(node, PM_REGULAR_EXPRESSION_FLAGS_UTF_8)) {
+        flags |= (ARG_ENCODING_FIXED | RE_OPTION_ENCODING(ENC_UTF8));
+    }
+
+    if (PM_NODE_FLAG_P(node, PM_REGULAR_EXPRESSION_FLAGS_IGNORE_CASE)) {
+        flags |= ONIG_OPTION_IGNORECASE;
+    }
+
+    if (PM_NODE_FLAG_P(node, PM_REGULAR_EXPRESSION_FLAGS_MULTI_LINE)) {
+        flags |= ONIG_OPTION_MULTILINE;
+    }
+
+    if (PM_NODE_FLAG_P(node, PM_REGULAR_EXPRESSION_FLAGS_EXTENDED)) {
+        flags |= ONIG_OPTION_EXTEND;
+    }
+
+    return flags;
+}
+
+#undef RE_OPTION_ENCODING_SHIFT
+#undef RE_OPTION_ENCODING
+#undef ARG_ENCODING_FIXED
+#undef ARG_ENCODING_NONE
+#undef ENC_ASCII8BIT
+#undef ENC_EUC_JP
+#undef ENC_Windows_31J
+#undef ENC_UTF8
+
+static rb_encoding *
+parse_regexp_encoding(const pm_scope_node_t *scope_node, const pm_node_t *node)
+{
+    if (PM_NODE_FLAG_P(node, PM_REGULAR_EXPRESSION_FLAGS_FORCED_BINARY_ENCODING) || PM_NODE_FLAG_P(node, PM_REGULAR_EXPRESSION_FLAGS_ASCII_8BIT)) {
+        return rb_ascii8bit_encoding();
+    }
+    else if (PM_NODE_FLAG_P(node, PM_REGULAR_EXPRESSION_FLAGS_UTF_8)) {
+        return rb_utf8_encoding();
+    }
+    else if (PM_NODE_FLAG_P(node, PM_REGULAR_EXPRESSION_FLAGS_EUC_JP)) {
+        return rb_enc_get_from_index(ENCINDEX_EUC_JP);
+    }
+    else if (PM_NODE_FLAG_P(node, PM_REGULAR_EXPRESSION_FLAGS_WINDOWS_31J)) {
+        return rb_enc_get_from_index(ENCINDEX_Windows_31J);
+    }
+    else {
+        return NULL;
+    }
+}
+
+static VALUE
+parse_regexp(rb_iseq_t *iseq, const pm_scope_node_t *scope_node, const pm_node_t *node, VALUE string)
+{
+    VALUE errinfo = rb_errinfo();
+
+    int32_t line_number = pm_node_line_number(scope_node->parser, node);
+    VALUE regexp = rb_reg_compile(string, parse_regexp_flags(node), (const char *) pm_string_source(&scope_node->parser->filepath), line_number);
+
+    if (NIL_P(regexp)) {
+        VALUE message = rb_attr_get(rb_errinfo(), idMesg);
+        rb_set_errinfo(errinfo);
+
+        parse_regexp_error(iseq, line_number, "%" PRIsVALUE, message);
+        return Qnil;
+    }
+
+    rb_obj_freeze(regexp);
+    return regexp;
+}
+
+static inline VALUE
+parse_regexp_literal(rb_iseq_t *iseq, const pm_scope_node_t *scope_node, const pm_node_t *node, const pm_string_t *unescaped)
+{
+    rb_encoding *regexp_encoding = parse_regexp_encoding(scope_node, node);
+    if (regexp_encoding == NULL) regexp_encoding = scope_node->encoding;
+
+    VALUE string = rb_enc_str_new((const char *) pm_string_source(unescaped), pm_string_length(unescaped), regexp_encoding);
+    return parse_regexp(iseq, scope_node, node, string);
+}
+
+static inline VALUE
+parse_regexp_concat(rb_iseq_t *iseq, const pm_scope_node_t *scope_node, const pm_node_t *node, const pm_node_list_t *parts)
+{
+    rb_encoding *explicit_regexp_encoding = parse_regexp_encoding(scope_node, node);
+    rb_encoding *implicit_regexp_encoding = explicit_regexp_encoding != NULL ? explicit_regexp_encoding : scope_node->encoding;
+
+    VALUE string = pm_static_literal_concat(iseq, parts, scope_node, implicit_regexp_encoding, explicit_regexp_encoding, false);
+    return parse_regexp(iseq, scope_node, node, string);
+}
+
+static void pm_compile_node(rb_iseq_t *iseq, const pm_node_t *node, LINK_ANCHOR *const ret, bool popped, pm_scope_node_t *scope_node);
+
+static int
+pm_interpolated_node_compile(rb_iseq_t *iseq, const pm_node_list_t *parts, const pm_node_location_t *node_location, LINK_ANCHOR *const ret, bool popped, pm_scope_node_t *scope_node, rb_encoding *implicit_regexp_encoding, rb_encoding *explicit_regexp_encoding)
+{
+    int stack_size = 0;
+    size_t parts_size = parts->size;
+    bool interpolated = false;
+
+    if (parts_size > 0) {
+        VALUE current_string = Qnil;
+        pm_node_location_t current_location = *node_location;
+
+        for (size_t index = 0; index < parts_size; index++) {
+            const pm_node_t *part = parts->nodes[index];
+
+            if (PM_NODE_TYPE_P(part, PM_STRING_NODE)) {
+                const pm_string_node_t *string_node = (const pm_string_node_t *) part;
+                VALUE string_value;
+
+                if (implicit_regexp_encoding == NULL) {
+                    string_value = parse_string_encoded(part, &string_node->unescaped, scope_node->encoding);
+                }
+                else {
+                    string_value = parse_regexp_string_part(iseq, scope_node, (const pm_node_t *) string_node, &string_node->unescaped, implicit_regexp_encoding, explicit_regexp_encoding);
+                }
+
+                if (RTEST(current_string)) {
+                    current_string = rb_str_concat(current_string, string_value);
+                }
+                else {
+                    current_string = string_value;
+                    if (index != 0) current_location = PM_NODE_END_LOCATION(scope_node->parser, part);
+                }
+            }
+            else {
+                interpolated = true;
+
+                if (
+                    PM_NODE_TYPE_P(part, PM_EMBEDDED_STATEMENTS_NODE) &&
+                    ((const pm_embedded_statements_node_t *) part)->statements != NULL &&
+                    ((const pm_embedded_statements_node_t *) part)->statements->body.size == 1 &&
+                    PM_NODE_TYPE_P(((const pm_embedded_statements_node_t *) part)->statements->body.nodes[0], PM_STRING_NODE)
+                ) {
+                    const pm_string_node_t *string_node = (const pm_string_node_t *) ((const pm_embedded_statements_node_t *) part)->statements->body.nodes[0];
+                    VALUE string_value;
+
+                    if (implicit_regexp_encoding == NULL) {
+                        string_value = parse_string_encoded(part, &string_node->unescaped, scope_node->encoding);
+                    }
+                    else {
+                        string_value = parse_regexp_string_part(iseq, scope_node, (const pm_node_t *) string_node, &string_node->unescaped, implicit_regexp_encoding, explicit_regexp_encoding);
+                    }
+
+                    if (RTEST(current_string)) {
+                        current_string = rb_str_concat(current_string, string_value);
+                    }
+                    else {
+                        current_string = string_value;
+                        current_location = PM_NODE_START_LOCATION(scope_node->parser, part);
+                    }
+                }
+                else {
+                    if (!RTEST(current_string)) {
+                        rb_encoding *encoding;
+
+                        if (implicit_regexp_encoding != NULL) {
+                            if (explicit_regexp_encoding != NULL) {
+                                encoding = explicit_regexp_encoding;
+                            }
+                            else if (scope_node->parser->encoding == PM_ENCODING_US_ASCII_ENTRY) {
+                                encoding = rb_ascii8bit_encoding();
+                            }
+                            else {
+                                encoding = implicit_regexp_encoding;
+                            }
+                        }
+                        else {
+                            encoding = scope_node->encoding;
+                        }
+
+                        if (parts_size == 1) {
+                            current_string = rb_enc_str_new(NULL, 0, encoding);
+                        }
+                    }
+
+                    if (RTEST(current_string)) {
+                        VALUE operand = rb_fstring(current_string);
+                        PUSH_INSN1(ret, current_location, putobject, operand);
+                        stack_size++;
+                    }
+
+                    PM_COMPILE_NOT_POPPED(part);
+
+                    const pm_node_location_t current_location = PM_NODE_START_LOCATION(scope_node->parser, part);
+                    PUSH_INSN(ret, current_location, dup);
+
+                    {
+                        const struct rb_callinfo *callinfo = new_callinfo(iseq, idTo_s, 0, VM_CALL_FCALL | VM_CALL_ARGS_SIMPLE, NULL, FALSE);
+                        PUSH_INSN1(ret, current_location, objtostring, callinfo);
+                    }
+
+                    PUSH_INSN(ret, current_location, anytostring);
+
+                    current_string = Qnil;
+                    stack_size++;
+                }
+            }
+        }
+
+        if (RTEST(current_string)) {
+            current_string = rb_fstring(current_string);
+
+            if (stack_size == 0 && interpolated) {
+                PUSH_INSN1(ret, current_location, putstring, current_string);
+            }
+            else {
+                PUSH_INSN1(ret, current_location, putobject, current_string);
+            }
+
+            current_string = Qnil;
+            stack_size++;
+        }
+    }
+    else {
+        PUSH_INSN(ret, *node_location, putnil);
+    }
+
+    return stack_size;
+}
+
+static void
+pm_compile_regexp_dynamic(rb_iseq_t *iseq, const pm_node_t *node, const pm_node_list_t *parts, const pm_node_location_t *node_location, LINK_ANCHOR *const ret, bool popped, pm_scope_node_t *scope_node)
+{
+    rb_encoding *explicit_regexp_encoding = parse_regexp_encoding(scope_node, node);
+    rb_encoding *implicit_regexp_encoding = explicit_regexp_encoding != NULL ? explicit_regexp_encoding : scope_node->encoding;
+
+    int length = pm_interpolated_node_compile(iseq, parts, node_location, ret, popped, scope_node, implicit_regexp_encoding, explicit_regexp_encoding);
+    PUSH_INSN2(ret, *node_location, toregexp, INT2FIX(parse_regexp_flags(node) & 0xFF), INT2FIX(length));
+}
+
+static VALUE
+pm_source_file_value(const pm_source_file_node_t *node, const pm_scope_node_t *scope_node)
+{
+    const pm_string_t *filepath = &node->filepath;
+    size_t length = pm_string_length(filepath);
+
+    if (length > 0) {
+        rb_encoding *filepath_encoding = scope_node->filepath_encoding != NULL ? scope_node->filepath_encoding : rb_utf8_encoding();
+        return rb_enc_interned_str((const char *) pm_string_source(filepath), length, filepath_encoding);
+    }
+    else {
+        return rb_fstring_lit("<compiled>");
+    }
+}
+
+/**
+ * Return a static literal string, optionally with attached debugging
+ * information.
+ */
+static VALUE
+pm_static_literal_string(rb_iseq_t *iseq, VALUE string, int line_number)
+{
+    if (ISEQ_COMPILE_DATA(iseq)->option->debug_frozen_string_literal || RTEST(ruby_debug)) {
+        return rb_str_with_debug_created_info(string, rb_iseq_path(iseq), line_number);
+    }
+    else {
+        return rb_fstring(string);
+    }
+}
+
+/**
+ * Certain nodes can be compiled literally. This function returns the literal
+ * value described by the given node. For example, an array node with all static
+ * literal values can be compiled into a literal array.
+ */
+static VALUE
+pm_static_literal_value(rb_iseq_t *iseq, const pm_node_t *node, const pm_scope_node_t *scope_node)
+{
+    // Every node that comes into this function should already be marked as
+    // static literal. If it's not, then we have a bug somewhere.
+    RUBY_ASSERT(PM_NODE_FLAG_P(node, PM_NODE_FLAG_STATIC_LITERAL));
+
+    switch (PM_NODE_TYPE(node)) {
+      case PM_ARRAY_NODE: {
+        const pm_array_node_t *cast = (const pm_array_node_t *) node;
+        const pm_node_list_t *elements = &cast->elements;
+
+        VALUE value = rb_ary_hidden_new(elements->size);
+        for (size_t index = 0; index < elements->size; index++) {
+            rb_ary_push(value, pm_static_literal_value(iseq, elements->nodes[index], scope_node));
+        }
+
+        OBJ_FREEZE(value);
+        return value;
+      }
+      case PM_FALSE_NODE:
+        return Qfalse;
+      case PM_FLOAT_NODE:
+        return parse_float((const pm_float_node_t *) node);
+      case PM_HASH_NODE: {
+        const pm_hash_node_t *cast = (const pm_hash_node_t *) node;
+        const pm_node_list_t *elements = &cast->elements;
+
+        VALUE array = rb_ary_hidden_new(elements->size * 2);
+        for (size_t index = 0; index < elements->size; index++) {
+            RUBY_ASSERT(PM_NODE_TYPE_P(elements->nodes[index], PM_ASSOC_NODE));
+            const pm_assoc_node_t *cast = (const pm_assoc_node_t *) elements->nodes[index];
+            VALUE pair[2] = { pm_static_literal_value(iseq, cast->key, scope_node), pm_static_literal_value(iseq, cast->value, scope_node) };
+            rb_ary_cat(array, pair, 2);
+        }
+
+        VALUE value = rb_hash_new_with_size(elements->size);
+        rb_hash_bulk_insert(RARRAY_LEN(array), RARRAY_CONST_PTR(array), value);
+
+        value = rb_obj_hide(value);
+        OBJ_FREEZE(value);
+        return value;
+      }
+      case PM_IMAGINARY_NODE:
+        return parse_imaginary((const pm_imaginary_node_t *) node);
+      case PM_INTEGER_NODE:
+        return parse_integer((const pm_integer_node_t *) node);
+      case PM_INTERPOLATED_MATCH_LAST_LINE_NODE: {
+        const pm_interpolated_match_last_line_node_t *cast = (const pm_interpolated_match_last_line_node_t *) node;
+        return parse_regexp_concat(iseq, scope_node, (const pm_node_t *) cast, &cast->parts);
+      }
+      case PM_INTERPOLATED_REGULAR_EXPRESSION_NODE: {
+        const pm_interpolated_regular_expression_node_t *cast = (const pm_interpolated_regular_expression_node_t *) node;
+        return parse_regexp_concat(iseq, scope_node, (const pm_node_t *) cast, &cast->parts);
+      }
+      case PM_INTERPOLATED_STRING_NODE: {
+        VALUE string = pm_static_literal_concat(iseq, &((const pm_interpolated_string_node_t *) node)->parts, scope_node, NULL, NULL, false);
+        int line_number = pm_node_line_number(scope_node->parser, node);
+        return pm_static_literal_string(iseq, string, line_number);
+      }
+      case PM_INTERPOLATED_SYMBOL_NODE: {
+        const pm_interpolated_symbol_node_t *cast = (const pm_interpolated_symbol_node_t *) node;
+        VALUE string = pm_static_literal_concat(iseq, &cast->parts, scope_node, NULL, NULL, true);
+
+        return ID2SYM(rb_intern_str(string));
+      }
+      case PM_MATCH_LAST_LINE_NODE: {
+        const pm_match_last_line_node_t *cast = (const pm_match_last_line_node_t *) node;
+        return parse_regexp_literal(iseq, scope_node, (const pm_node_t *) cast, &cast->unescaped);
+      }
+      case PM_NIL_NODE:
+        return Qnil;
+      case PM_RATIONAL_NODE:
+        return parse_rational((const pm_rational_node_t *) node);
+      case PM_REGULAR_EXPRESSION_NODE: {
+        const pm_regular_expression_node_t *cast = (const pm_regular_expression_node_t *) node;
+        return parse_regexp_literal(iseq, scope_node, (const pm_node_t *) cast, &cast->unescaped);
+      }
+      case PM_SOURCE_ENCODING_NODE:
+        return rb_enc_from_encoding(scope_node->encoding);
+      case PM_SOURCE_FILE_NODE: {
+        const pm_source_file_node_t *cast = (const pm_source_file_node_t *) node;
+        return pm_source_file_value(cast, scope_node);
+      }
+      case PM_SOURCE_LINE_NODE:
+        return INT2FIX(pm_node_line_number(scope_node->parser, node));
+      case PM_STRING_NODE: {
+        const pm_string_node_t *cast = (const pm_string_node_t *) node;
+        return parse_static_literal_string(iseq, scope_node, node, &cast->unescaped);
+      }
+      case PM_SYMBOL_NODE:
+        return ID2SYM(parse_string_symbol(scope_node, (const pm_symbol_node_t *) node));
+      case PM_TRUE_NODE:
+        return Qtrue;
+      default:
+        rb_bug("Don't have a literal value for node type %s", pm_node_type_to_str(PM_NODE_TYPE(node)));
+        return Qfalse;
+    }
+}
+
+/**
+ * A helper for converting a pm_location_t into a rb_code_location_t.
+ */
+static rb_code_location_t
+pm_code_location(const pm_scope_node_t *scope_node, const pm_node_t *node)
+{
+    const pm_line_column_t start_location = PM_NODE_START_LINE_COLUMN(scope_node->parser, node);
+    const pm_line_column_t end_location = PM_NODE_END_LINE_COLUMN(scope_node->parser, node);
+
+    return (rb_code_location_t) {
+        .beg_pos = { .lineno = start_location.line, .column = start_location.column },
+        .end_pos = { .lineno = end_location.line, .column = end_location.column }
+    };
+}
+
+/**
+ * A macro for determining if we should go through the work of adding branch
+ * coverage to the current iseq. We check this manually each time because we
+ * want to avoid the overhead of creating rb_code_location_t objects.
+ */
+#define PM_BRANCH_COVERAGE_P(iseq) (ISEQ_COVERAGE(iseq) && ISEQ_BRANCH_COVERAGE(iseq))
+
+static void
+pm_compile_branch_condition(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const pm_node_t *cond,
+                         LABEL *then_label, LABEL *else_label, bool popped, pm_scope_node_t *scope_node);
+
+static void
+pm_compile_logical(rb_iseq_t *iseq, LINK_ANCHOR *const ret, pm_node_t *cond, LABEL *then_label, LABEL *else_label, bool popped, pm_scope_node_t *scope_node)
+{
+    const pm_node_location_t location = PM_NODE_START_LOCATION(scope_node->parser, cond);
+
+    DECL_ANCHOR(seq);
+
+    LABEL *label = NEW_LABEL(location.line);
+    if (!then_label) then_label = label;
+    else if (!else_label) else_label = label;
+
+    pm_compile_branch_condition(iseq, seq, cond, then_label, else_label, popped, scope_node);
+
+    if (LIST_INSN_SIZE_ONE(seq)) {
+        INSN *insn = (INSN *) ELEM_FIRST_INSN(FIRST_ELEMENT(seq));
+        if (insn->insn_id == BIN(jump) && (LABEL *)(insn->operands[0]) == label) return;
+    }
+
+    if (!label->refcnt) {
+        if (popped) PUSH_INSN(ret, location, putnil);
+    }
+    else {
+        PUSH_LABEL(seq, label);
+    }
+
+    PUSH_SEQ(ret, seq);
+    return;
+}
+
+static void
+pm_compile_flip_flop_bound(rb_iseq_t *iseq, const pm_node_t *node, LINK_ANCHOR *const ret, bool popped, pm_scope_node_t *scope_node)
+{
+    const pm_node_location_t location = { .line = ISEQ_BODY(iseq)->location.first_lineno, .node_id = -1 };
+
+    if (PM_NODE_TYPE_P(node, PM_INTEGER_NODE)) {
+        PM_COMPILE_NOT_POPPED(node);
+
+        VALUE operand = ID2SYM(rb_intern("$."));
+        PUSH_INSN1(ret, location, getglobal, operand);
+
+        PUSH_SEND(ret, location, idEq, INT2FIX(1));
+        if (popped) PUSH_INSN(ret, location, pop);
+    }
+    else {
+        PM_COMPILE(node);
+    }
+}
+
+static void
+pm_compile_flip_flop(const pm_flip_flop_node_t *flip_flop_node, LABEL *else_label, LABEL *then_label, rb_iseq_t *iseq, const int lineno, LINK_ANCHOR *const ret, bool popped, pm_scope_node_t *scope_node)
+{
+    const pm_node_location_t location = { .line = ISEQ_BODY(iseq)->location.first_lineno, .node_id = -1 };
+    LABEL *lend = NEW_LABEL(location.line);
+
+    int again = !(flip_flop_node->base.flags & PM_RANGE_FLAGS_EXCLUDE_END);
+
+    rb_num_t count = ISEQ_FLIP_CNT_INCREMENT(ISEQ_BODY(iseq)->local_iseq) + VM_SVAR_FLIPFLOP_START;
+    VALUE key = INT2FIX(count);
+
+    PUSH_INSN2(ret, location, getspecial, key, INT2FIX(0));
+    PUSH_INSNL(ret, location, branchif, lend);
+
+    if (flip_flop_node->left) {
+        pm_compile_flip_flop_bound(iseq, flip_flop_node->left, ret, popped, scope_node);
+    }
+    else {
+        PUSH_INSN(ret, location, putnil);
+    }
+
+    PUSH_INSNL(ret, location, branchunless, else_label);
+    PUSH_INSN1(ret, location, putobject, Qtrue);
+    PUSH_INSN1(ret, location, setspecial, key);
+    if (!again) {
+        PUSH_INSNL(ret, location, jump, then_label);
+    }
+
+    PUSH_LABEL(ret, lend);
+    if (flip_flop_node->right) {
+        pm_compile_flip_flop_bound(iseq, flip_flop_node->right, ret, popped, scope_node);
+    }
+    else {
+        PUSH_INSN(ret, location, putnil);
+    }
+
+    PUSH_INSNL(ret, location, branchunless, then_label);
+    PUSH_INSN1(ret, location, putobject, Qfalse);
+    PUSH_INSN1(ret, location, setspecial, key);
+    PUSH_INSNL(ret, location, jump, then_label);
+}
+
+static void pm_compile_defined_expr(rb_iseq_t *iseq, const pm_node_t *node, const pm_node_location_t *node_location, LINK_ANCHOR *const ret, bool popped, pm_scope_node_t *scope_node, bool in_condition);
+
+static void
+pm_compile_branch_condition(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const pm_node_t *cond, LABEL *then_label, LABEL *else_label, bool popped, pm_scope_node_t *scope_node)
+{
+    const pm_node_location_t location = PM_NODE_START_LOCATION(scope_node->parser, cond);
+
+again:
+    switch (PM_NODE_TYPE(cond)) {
+      case PM_AND_NODE: {
+        const pm_and_node_t *cast = (const pm_and_node_t *) cond;
+        pm_compile_logical(iseq, ret, cast->left, NULL, else_label, popped, scope_node);
+
+        cond = cast->right;
+        goto again;
+      }
+      case PM_OR_NODE: {
+        const pm_or_node_t *cast = (const pm_or_node_t *) cond;
+        pm_compile_logical(iseq, ret, cast->left, then_label, NULL, popped, scope_node);
+
+        cond = cast->right;
+        goto again;
+      }
+      case PM_FALSE_NODE:
+      case PM_NIL_NODE:
+        PUSH_INSNL(ret, location, jump, else_label);
+        return;
+      case PM_FLOAT_NODE:
+      case PM_IMAGINARY_NODE:
+      case PM_INTEGER_NODE:
+      case PM_LAMBDA_NODE:
+      case PM_RATIONAL_NODE:
+      case PM_REGULAR_EXPRESSION_NODE:
+      case PM_STRING_NODE:
+      case PM_SYMBOL_NODE:
+      case PM_TRUE_NODE:
+        PUSH_INSNL(ret, location, jump, then_label);
+        return;
+      case PM_FLIP_FLOP_NODE:
+        pm_compile_flip_flop((const pm_flip_flop_node_t *) cond, else_label, then_label, iseq, location.line, ret, popped, scope_node);
+        return;
+      case PM_DEFINED_NODE: {
+        const pm_defined_node_t *cast = (const pm_defined_node_t *) cond;
+        pm_compile_defined_expr(iseq, cast->value, &location, ret, popped, scope_node, true);
+        break;
+      }
+      default: {
+        DECL_ANCHOR(cond_seq);
+        pm_compile_node(iseq, cond, cond_seq, false, scope_node);
+
+        if (LIST_INSN_SIZE_ONE(cond_seq)) {
+            INSN *insn = (INSN *) ELEM_FIRST_INSN(FIRST_ELEMENT(cond_seq));
+
+            if (insn->insn_id == BIN(putobject)) {
+                if (RTEST(insn->operands[0])) {
+                    PUSH_INSNL(ret, location, jump, then_label);
+                    // maybe unreachable
+                    return;
+                }
+                else {
+                    PUSH_INSNL(ret, location, jump, else_label);
+                    return;
+                }
+            }
+        }
+
+        PUSH_SEQ(ret, cond_seq);
+        break;
+      }
+    }
+
+    PUSH_INSNL(ret, location, branchunless, else_label);
+    PUSH_INSNL(ret, location, jump, then_label);
+}
+
+/**
+ * Compile an if or unless node.
+ */
+static void
+pm_compile_conditional(rb_iseq_t *iseq, const pm_node_location_t *node_location, pm_node_type_t type, const pm_node_t *node, const pm_statements_node_t *statements, const pm_node_t *subsequent, const pm_node_t *predicate, LINK_ANCHOR *const ret, bool popped, pm_scope_node_t *scope_node)
+{
+    const pm_node_location_t location = *node_location;
+    LABEL *then_label = NEW_LABEL(location.line);
+    LABEL *else_label = NEW_LABEL(location.line);
+    LABEL *end_label = NULL;
+
+    DECL_ANCHOR(cond_seq);
+    pm_compile_branch_condition(iseq, cond_seq, predicate, then_label, else_label, false, scope_node);
+    PUSH_SEQ(ret, cond_seq);
+
+    rb_code_location_t conditional_location = { 0 };
+    VALUE branches = Qfalse;
+
+    if (then_label->refcnt && else_label->refcnt && PM_BRANCH_COVERAGE_P(iseq)) {
+        conditional_location = pm_code_location(scope_node, node);
+        branches = decl_branch_base(iseq, PTR2NUM(node), &conditional_location, type == PM_IF_NODE ? "if" : "unless");
+    }
+
+    if (then_label->refcnt) {
+        PUSH_LABEL(ret, then_label);
+
+        DECL_ANCHOR(then_seq);
+
+        if (statements != NULL) {
+            pm_compile_node(iseq, (const pm_node_t *) statements, then_seq, popped, scope_node);
+        }
+        else if (!popped) {
+            PUSH_SYNTHETIC_PUTNIL(then_seq, iseq);
+        }
+
+        if (else_label->refcnt) {
+            // Establish branch coverage for the then block.
+            if (PM_BRANCH_COVERAGE_P(iseq)) {
+                rb_code_location_t branch_location;
+
+                if (statements != NULL) {
+                    branch_location = pm_code_location(scope_node, (const pm_node_t *) statements);
+                } else if (type == PM_IF_NODE) {
+                    pm_line_column_t predicate_end = PM_NODE_END_LINE_COLUMN(scope_node->parser, predicate);
+                    branch_location = (rb_code_location_t) {
+                        .beg_pos = { .lineno = predicate_end.line, .column = predicate_end.column },
+                        .end_pos = { .lineno = predicate_end.line, .column = predicate_end.column }
+                    };
+                } else {
+                    branch_location = conditional_location;
+                }
+
+                add_trace_branch_coverage(iseq, ret, &branch_location, branch_location.beg_pos.column, 0, type == PM_IF_NODE ? "then" : "else", branches);
+            }
+
+            end_label = NEW_LABEL(location.line);
+            PUSH_INSNL(then_seq, location, jump, end_label);
+            if (!popped) PUSH_INSN(then_seq, location, pop);
+        }
+
+        PUSH_SEQ(ret, then_seq);
+    }
+
+    if (else_label->refcnt) {
+        PUSH_LABEL(ret, else_label);
+
+        DECL_ANCHOR(else_seq);
+
+        if (subsequent != NULL) {
+            pm_compile_node(iseq, subsequent, else_seq, popped, scope_node);
+        }
+        else if (!popped) {
+            PUSH_SYNTHETIC_PUTNIL(else_seq, iseq);
+        }
+
+        // Establish branch coverage for the else block.
+        if (then_label->refcnt && PM_BRANCH_COVERAGE_P(iseq)) {
+            rb_code_location_t branch_location;
+
+            if (subsequent == NULL) {
+                branch_location = conditional_location;
+            } else if (PM_NODE_TYPE_P(subsequent, PM_ELSE_NODE)) {
+                const pm_else_node_t *else_node = (const pm_else_node_t *) subsequent;
+                branch_location = pm_code_location(scope_node, else_node->statements != NULL ? ((const pm_node_t *) else_node->statements) : (const pm_node_t *) else_node);
+            } else {
+                branch_location = pm_code_location(scope_node, (const pm_node_t *) subsequent);
+            }
+
+            add_trace_branch_coverage(iseq, ret, &branch_location, branch_location.beg_pos.column, 1, type == PM_IF_NODE ? "else" : "then", branches);
+        }
+
+        PUSH_SEQ(ret, else_seq);
+    }
+
+    if (end_label) {
+        PUSH_LABEL(ret, end_label);
+    }
+
+    return;
+}
+
+/**
+ * Compile a while or until loop.
+ */
+static void
+pm_compile_loop(rb_iseq_t *iseq, const pm_node_location_t *node_location, pm_node_flags_t flags, enum pm_node_type type, const pm_node_t *node, const pm_statements_node_t *statements, const pm_node_t *predicate, LINK_ANCHOR *const ret, bool popped, pm_scope_node_t *scope_node)
+{
+    const pm_node_location_t location = *node_location;
+
+    LABEL *prev_start_label = ISEQ_COMPILE_DATA(iseq)->start_label;
+    LABEL *prev_end_label = ISEQ_COMPILE_DATA(iseq)->end_label;
+    LABEL *prev_redo_label = ISEQ_COMPILE_DATA(iseq)->redo_label;
+
+    LABEL *next_label = ISEQ_COMPILE_DATA(iseq)->start_label = NEW_LABEL(location.line); /* next  */
+    LABEL *redo_label = ISEQ_COMPILE_DATA(iseq)->redo_label = NEW_LABEL(location.line);  /* redo  */
+    LABEL *break_label = ISEQ_COMPILE_DATA(iseq)->end_label = NEW_LABEL(location.line);  /* break */
+    LABEL *end_label = NEW_LABEL(location.line);
+    LABEL *adjust_label = NEW_LABEL(location.line);
+
+    LABEL *next_catch_label = NEW_LABEL(location.line);
+    LABEL *tmp_label = NULL;
+
+    // We're pushing onto the ensure stack because breaks need to break out of
+    // this loop and not break into the ensure statements within the same
+    // lexical scope.
+    struct iseq_compile_data_ensure_node_stack enl;
+    push_ensure_entry(iseq, &enl, NULL, NULL);
+
+    // begin; end while true
+    if (flags & PM_LOOP_FLAGS_BEGIN_MODIFIER) {
+        tmp_label = NEW_LABEL(location.line);
+        PUSH_INSNL(ret, location, jump, tmp_label);
+    }
+    else {
+        // while true; end
+        PUSH_INSNL(ret, location, jump, next_label);
+    }
+
+    PUSH_LABEL(ret, adjust_label);
+    PUSH_INSN(ret, location, putnil);
+    PUSH_LABEL(ret, next_catch_label);
+    PUSH_INSN(ret, location, pop);
+    PUSH_INSNL(ret, location, jump, next_label);
+    if (tmp_label) PUSH_LABEL(ret, tmp_label);
+
+    PUSH_LABEL(ret, redo_label);
+
+    // Establish branch coverage for the loop.
+    if (PM_BRANCH_COVERAGE_P(iseq)) {
+        rb_code_location_t loop_location = pm_code_location(scope_node, node);
+        VALUE branches = decl_branch_base(iseq, PTR2NUM(node), &loop_location, type == PM_WHILE_NODE ? "while" : "until");
+
+        rb_code_location_t branch_location = statements != NULL ? pm_code_location(scope_node, (const pm_node_t *) statements) : loop_location;
+        add_trace_branch_coverage(iseq, ret, &branch_location, branch_location.beg_pos.column, 0, "body", branches);
+    }
+
+    if (statements != NULL) PM_COMPILE_POPPED((const pm_node_t *) statements);
+    PUSH_LABEL(ret, next_label);
+
+    if (type == PM_WHILE_NODE) {
+        pm_compile_branch_condition(iseq, ret, predicate, redo_label, end_label, popped, scope_node);
+    }
+    else if (type == PM_UNTIL_NODE) {
+        pm_compile_branch_condition(iseq, ret, predicate, end_label, redo_label, popped, scope_node);
+    }
+
+    PUSH_LABEL(ret, end_label);
+    PUSH_ADJUST_RESTORE(ret, adjust_label);
+    PUSH_INSN(ret, location, putnil);
+
+    PUSH_LABEL(ret, break_label);
+    if (popped) PUSH_INSN(ret, location, pop);
+
+    PUSH_CATCH_ENTRY(CATCH_TYPE_BREAK, redo_label, break_label, NULL, break_label);
+    PUSH_CATCH_ENTRY(CATCH_TYPE_NEXT, redo_label, break_label, NULL, next_catch_label);
+    PUSH_CATCH_ENTRY(CATCH_TYPE_REDO, redo_label, break_label, NULL, ISEQ_COMPILE_DATA(iseq)->redo_label);
+
+    ISEQ_COMPILE_DATA(iseq)->start_label = prev_start_label;
+    ISEQ_COMPILE_DATA(iseq)->end_label = prev_end_label;
+    ISEQ_COMPILE_DATA(iseq)->redo_label = prev_redo_label;
+    ISEQ_COMPILE_DATA(iseq)->ensure_node_stack = ISEQ_COMPILE_DATA(iseq)->ensure_node_stack->prev;
+
+    return;
+}
+
+// This recurses through scopes and finds the local index at any scope level
+// It also takes a pointer to depth, and increments depth appropriately
+// according to the depth of the local.
+static pm_local_index_t
+pm_lookup_local_index(rb_iseq_t *iseq, const pm_scope_node_t *scope_node, pm_constant_id_t constant_id, int start_depth)
+{
+    pm_local_index_t lindex = { 0 };
+    st_data_t local_index;
+
+    int level;
+    for (level = 0; level < start_depth; level++) {
+        scope_node = scope_node->previous;
+    }
+
+    while (!st_lookup(scope_node->index_lookup_table, constant_id, &local_index)) {
+        level++;
+
+        if (scope_node->previous) {
+            scope_node = scope_node->previous;
+        }
+        else {
+            // We have recursed up all scope nodes
+            // and have not found the local yet
+            rb_bug("Local with constant_id %u does not exist", (unsigned int) constant_id);
+        }
+    }
+
+    lindex.level = level;
+    lindex.index = scope_node->local_table_for_iseq_size - (int) local_index;
+    return lindex;
+}
+
+// This returns the CRuby ID which maps to the pm_constant_id_t
+//
+// Constant_ids in prism are indexes of the constants in prism's constant pool.
+// We add a constants mapping on the scope_node which is a mapping from
+// these constant_id indexes to the CRuby IDs that they represent.
+// This helper method allows easy access to those IDs
+static ID
+pm_constant_id_lookup(const pm_scope_node_t *scope_node, pm_constant_id_t constant_id)
+{
+    if (constant_id < 1 || constant_id > scope_node->parser->constant_pool.size) {
+        rb_bug("constant_id out of range: %u", (unsigned int)constant_id);
+    }
+    return scope_node->constants[constant_id - 1];
+}
+
+static rb_iseq_t *
+pm_new_child_iseq(rb_iseq_t *iseq, pm_scope_node_t *node, VALUE name, const rb_iseq_t *parent, enum rb_iseq_type type, int line_no)
+{
+    debugs("[new_child_iseq]> ---------------------------------------\n");
+    int isolated_depth = ISEQ_COMPILE_DATA(iseq)->isolated_depth;
+    int error_state;
+    rb_iseq_t *ret_iseq = pm_iseq_new_with_opt(node, name,
+            rb_iseq_path(iseq), rb_iseq_realpath(iseq),
+            line_no, parent,
+            isolated_depth ? isolated_depth + 1 : 0,
+            type, ISEQ_COMPILE_DATA(iseq)->option, &error_state);
+
+    if (error_state) {
+        pm_scope_node_destroy(node);
+        RUBY_ASSERT(ret_iseq == NULL);
+        rb_jump_tag(error_state);
+    }
+    debugs("[new_child_iseq]< ---------------------------------------\n");
+    return ret_iseq;
+}
+
+static int
+pm_compile_class_path(rb_iseq_t *iseq, const pm_node_t *node, const pm_node_location_t *node_location, LINK_ANCHOR *const ret, bool popped, pm_scope_node_t *scope_node)
+{
+    if (PM_NODE_TYPE_P(node, PM_CONSTANT_PATH_NODE)) {
+        const pm_node_t *parent = ((const pm_constant_path_node_t *) node)->parent;
+
+        if (parent) {
+            /* Bar::Foo */
+            PM_COMPILE(parent);
+            return VM_DEFINECLASS_FLAG_SCOPED;
+        }
+        else {
+            /* toplevel class ::Foo */
+            PUSH_INSN1(ret, *node_location, putobject, rb_cObject);
+            return VM_DEFINECLASS_FLAG_SCOPED;
+        }
+    }
+    else {
+        /* class at cbase Foo */
+        PUSH_INSN1(ret, *node_location, putspecialobject, INT2FIX(VM_SPECIAL_OBJECT_CONST_BASE));
+        return 0;
+    }
+}
+
+/**
+ * Compile either a call and write node or a call or write node. These look like
+ * method calls that are followed by a ||= or &&= operator.
+ */
+static void
+pm_compile_call_and_or_write_node(rb_iseq_t *iseq, bool and_node, const pm_node_t *receiver, const pm_node_t *value, pm_constant_id_t write_name, pm_constant_id_t read_name, bool safe_nav, const pm_node_location_t *node_location, LINK_ANCHOR *const ret, bool popped, pm_scope_node_t *scope_node)
+{
+    const pm_node_location_t location = *node_location;
+    LABEL *lfin = NEW_LABEL(location.line);
+    LABEL *lcfin = NEW_LABEL(location.line);
+    LABEL *lskip = NULL;
+
+    int flag = PM_NODE_TYPE_P(receiver, PM_SELF_NODE) ? VM_CALL_FCALL : 0;
+    ID id_read_name = pm_constant_id_lookup(scope_node, read_name);
+
+    PM_COMPILE_NOT_POPPED(receiver);
+    if (safe_nav) {
+        lskip = NEW_LABEL(location.line);
+        PUSH_INSN(ret, location, dup);
+        PUSH_INSNL(ret, location, branchnil, lskip);
+    }
+
+    PUSH_INSN(ret, location, dup);
+    PUSH_SEND_WITH_FLAG(ret, location, id_read_name, INT2FIX(0), INT2FIX(flag));
+    if (!popped) PUSH_INSN(ret, location, dup);
+
+    if (and_node) {
+        PUSH_INSNL(ret, location, branchunless, lcfin);
+    }
+    else {
+        PUSH_INSNL(ret, location, branchif, lcfin);
+    }
+
+    if (!popped) PUSH_INSN(ret, location, pop);
+    PM_COMPILE_NOT_POPPED(value);
+
+    if (!popped) {
+        PUSH_INSN(ret, location, swap);
+        PUSH_INSN1(ret, location, topn, INT2FIX(1));
+    }
+
+    ID id_write_name = pm_constant_id_lookup(scope_node, write_name);
+    PUSH_SEND_WITH_FLAG(ret, location, id_write_name, INT2FIX(1), INT2FIX(flag));
+    PUSH_INSNL(ret, location, jump, lfin);
+
+    PUSH_LABEL(ret, lcfin);
+    if (!popped) PUSH_INSN(ret, location, swap);
+
+    PUSH_LABEL(ret, lfin);
+
+    if (lskip && popped) PUSH_LABEL(ret, lskip);
+    PUSH_INSN(ret, location, pop);
+    if (lskip && !popped) PUSH_LABEL(ret, lskip);
+}
+
+static void pm_compile_shareable_constant_value(rb_iseq_t *iseq, const pm_node_t *node, const pm_node_flags_t shareability, VALUE path, LINK_ANCHOR *const ret, pm_scope_node_t *scope_node, bool top);
+
+/**
+ * This function compiles a hash onto the stack. It is used to compile hash
+ * literals and keyword arguments. It is assumed that if we get here that the
+ * contents of the hash are not popped.
+ */
+static void
+pm_compile_hash_elements(rb_iseq_t *iseq, const pm_node_t *node, const pm_node_list_t *elements, const pm_node_flags_t shareability, VALUE path, bool argument, LINK_ANCHOR *const ret, pm_scope_node_t *scope_node)
+{
+    const pm_node_location_t location = PM_NODE_START_LOCATION(scope_node->parser, node);
+
+    // If this element is not popped, then we need to create the hash on the
+    // stack. Neighboring plain assoc nodes should be grouped together (either
+    // by newhash or hash merge). Double splat nodes should be merged using the
+    // merge_kwd method call.
+    const int max_stack_length = 0x100;
+    const unsigned int min_tmp_hash_length = 0x800;
+
+    int stack_length = 0;
+    bool first_chunk = true;
+
+    // This is an optimization wherein we keep track of whether or not the
+    // previous element was a static literal. If it was, then we do not attempt
+    // to check if we have a subhash that can be optimized. If it was not, then
+    // we do check.
+    bool static_literal = false;
+
+    DECL_ANCHOR(anchor);
+
+    // Convert pushed elements to a hash, and merge if needed.
+#define FLUSH_CHUNK                                                                         \
+    if (stack_length) {                                                                     \
+        if (first_chunk) {                                                                  \
+            PUSH_SEQ(ret, anchor);                                                          \
+            PUSH_INSN1(ret, location, newhash, INT2FIX(stack_length));                      \
+            first_chunk = false;                                                            \
+        }                                                                                   \
+        else {                                                                              \
+            PUSH_INSN1(ret, location, putspecialobject, INT2FIX(VM_SPECIAL_OBJECT_VMCORE)); \
+            PUSH_INSN(ret, location, swap);                                                 \
+            PUSH_SEQ(ret, anchor);                                                          \
+            PUSH_SEND(ret, location, id_core_hash_merge_ptr, INT2FIX(stack_length + 1));    \
+        }                                                                                   \
+        INIT_ANCHOR(anchor);                                                                \
+        stack_length = 0;                                                                   \
+    }
+
+    for (size_t index = 0; index < elements->size; index++) {
+        const pm_node_t *element = elements->nodes[index];
+
+        switch (PM_NODE_TYPE(element)) {
+          case PM_ASSOC_NODE: {
+            // Pre-allocation check (this branch can be omitted).
+            if (
+                (shareability == 0) &&
+                PM_NODE_FLAG_P(element, PM_NODE_FLAG_STATIC_LITERAL) && (
+                    (!static_literal && ((index + min_tmp_hash_length) < elements->size)) ||
+                    (first_chunk && stack_length == 0)
+                )
+            ) {
+                // Count the elements that are statically-known.
+                size_t count = 1;
+                while (index + count < elements->size && PM_NODE_FLAG_P(elements->nodes[index + count], PM_NODE_FLAG_STATIC_LITERAL)) count++;
+
+                if ((first_chunk && stack_length == 0) || count >= min_tmp_hash_length) {
+                    // The subsequence of elements in this hash is long enough
+                    // to merit its own hash.
+                    VALUE ary = rb_ary_hidden_new(count);
+
+                    // Create a hidden hash.
+                    for (size_t tmp_end = index + count; index < tmp_end; index++) {
+                        const pm_assoc_node_t *assoc = (const pm_assoc_node_t *) elements->nodes[index];
+
+                        VALUE elem[2] = {
+                            pm_static_literal_value(iseq, assoc->key, scope_node),
+                            pm_static_literal_value(iseq, assoc->value, scope_node)
+                        };
+
+                        rb_ary_cat(ary, elem, 2);
+                    }
+                    index --;
+
+                    VALUE hash = rb_hash_new_with_size(RARRAY_LEN(ary) / 2);
+                    rb_hash_bulk_insert(RARRAY_LEN(ary), RARRAY_CONST_PTR(ary), hash);
+                    hash = rb_obj_hide(hash);
+                    OBJ_FREEZE(hash);
+
+                    // Emit optimized code.
+                    FLUSH_CHUNK;
+                    if (first_chunk) {
+                        PUSH_INSN1(ret, location, duphash, hash);
+                        first_chunk = false;
+                    }
+                    else {
+                        PUSH_INSN1(ret, location, putspecialobject, INT2FIX(VM_SPECIAL_OBJECT_VMCORE));
+                        PUSH_INSN(ret, location, swap);
+                        PUSH_INSN1(ret, location, putobject, hash);
+                        PUSH_SEND(ret, location, id_core_hash_merge_kwd, INT2FIX(2));
+                    }
+
+                    break;
+                }
+                else {
+                    static_literal = true;
+                }
+            }
+            else {
+                static_literal = false;
+            }
+
+            // If this is a plain assoc node, then we can compile it directly
+            // and then add the total number of values on the stack.
+            if (shareability == 0) {
+                pm_compile_node(iseq, element, anchor, false, scope_node);
+            }
+            else {
+                const pm_assoc_node_t *assoc = (const pm_assoc_node_t *) element;
+                pm_compile_shareable_constant_value(iseq, assoc->key, shareability, path, ret, scope_node, false);
+                pm_compile_shareable_constant_value(iseq, assoc->value, shareability, path, ret, scope_node, false);
+            }
+
+            if ((stack_length += 2) >= max_stack_length) FLUSH_CHUNK;
+            break;
+          }
+          case PM_ASSOC_SPLAT_NODE: {
+            FLUSH_CHUNK;
+
+            const pm_assoc_splat_node_t *assoc_splat = (const pm_assoc_splat_node_t *) element;
+            bool empty_hash = assoc_splat->value != NULL && (
+                (PM_NODE_TYPE_P(assoc_splat->value, PM_HASH_NODE) && ((const pm_hash_node_t *) assoc_splat->value)->elements.size == 0) ||
+                PM_NODE_TYPE_P(assoc_splat->value, PM_NIL_NODE)
+            );
+
+            bool first_element = first_chunk && stack_length == 0;
+            bool last_element = index == elements->size - 1;
+            bool only_element = first_element && last_element;
+
+            if (empty_hash) {
+                if (only_element && argument) {
+                    // **{} appears at the only keyword argument in method call,
+                    // so it won't be modified.
+                    //
+                    // This is only done for method calls and not for literal
+                    // hashes, because literal hashes should always result in a
+                    // new hash.
+                    PUSH_INSN(ret, location, putnil);
+                }
+                else if (first_element) {
+                    // **{} appears as the first keyword argument, so it may be
+                    // modified. We need to create a fresh hash object.
+                    PUSH_INSN1(ret, location, newhash, INT2FIX(0));
+                }
+                // Any empty keyword splats that are not the first can be
+                // ignored since merging an empty hash into the existing hash is
+                // the same as not merging it.
+            }
+            else {
+                if (only_element && argument) {
+                    // ** is only keyword argument in the method call. Use it
+                    // directly. This will be not be flagged as mutable. This is
+                    // only done for method calls and not for literal hashes,
+                    // because literal hashes should always result in a new
+                    // hash.
+                    if (shareability == 0) {
+                        PM_COMPILE_NOT_POPPED(element);
+                    }
+                    else {
+                        pm_compile_shareable_constant_value(iseq, element, shareability, path, ret, scope_node, false);
+                    }
+                }
+                else {
+                    // There is more than one keyword argument, or this is not a
+                    // method call. In that case, we need to add an empty hash
+                    // (if first keyword), or merge the hash to the accumulated
+                    // hash (if not the first keyword).
+                    PUSH_INSN1(ret, location, putspecialobject, INT2FIX(VM_SPECIAL_OBJECT_VMCORE));
+
+                    if (first_element) {
+                        PUSH_INSN1(ret, location, newhash, INT2FIX(0));
+                    }
+                    else {
+                        PUSH_INSN(ret, location, swap);
+                    }
+
+                    if (shareability == 0) {
+                        PM_COMPILE_NOT_POPPED(element);
+                    }
+                    else {
+                        pm_compile_shareable_constant_value(iseq, element, shareability, path, ret, scope_node, false);
+                    }
+
+                    PUSH_SEND(ret, location, id_core_hash_merge_kwd, INT2FIX(2));
+                }
+            }
+
+            first_chunk = false;
+            static_literal = false;
+            break;
+          }
+          default:
+            RUBY_ASSERT("Invalid node type for hash" && false);
+            break;
+        }
+    }
+
+    FLUSH_CHUNK;
+#undef FLUSH_CHUNK
+}
+
+#define SPLATARRAY_FALSE 0
+#define SPLATARRAY_TRUE 1
+#define DUP_SINGLE_KW_SPLAT 2
+
+// This is details. Users should call pm_setup_args() instead.
+static int
+pm_setup_args_core(const pm_arguments_node_t *arguments_node, const pm_node_t *block, int *flags, const bool has_regular_blockarg, struct rb_callinfo_kwarg **kw_arg, int *dup_rest, rb_iseq_t *iseq, LINK_ANCHOR *const ret, pm_scope_node_t *scope_node, const pm_node_location_t *node_location)
+{
+    const pm_node_location_t location = *node_location;
+
+    int orig_argc = 0;
+    bool has_splat = false;
+    bool has_keyword_splat = false;
+
+    if (arguments_node == NULL) {
+        if (*flags & VM_CALL_FCALL) {
+            *flags |= VM_CALL_VCALL;
+        }
+    }
+    else {
+        const pm_node_list_t *arguments = &arguments_node->arguments;
+        has_keyword_splat = PM_NODE_FLAG_P(arguments_node, PM_ARGUMENTS_NODE_FLAGS_CONTAINS_KEYWORD_SPLAT);
+
+        // We count the number of elements post the splat node that are not keyword elements to
+        // eventually pass as an argument to newarray
+        int post_splat_counter = 0;
+        const pm_node_t *argument;
+
+        PM_NODE_LIST_FOREACH(arguments, index, argument) {
+            switch (PM_NODE_TYPE(argument)) {
+              // A keyword hash node contains all keyword arguments as AssocNodes and AssocSplatNodes
+              case PM_KEYWORD_HASH_NODE: {
+                const pm_keyword_hash_node_t *keyword_arg = (const pm_keyword_hash_node_t *) argument;
+                const pm_node_list_t *elements = &keyword_arg->elements;
+
+                if (has_keyword_splat || has_splat) {
+                    *flags |= VM_CALL_KW_SPLAT;
+                    has_keyword_splat = true;
+
+                    if (elements->size > 1 || !(elements->size == 1 && PM_NODE_TYPE_P(elements->nodes[0], PM_ASSOC_SPLAT_NODE))) {
+                        // A new hash will be created for the keyword arguments
+                        // in this case, so mark the method as passing mutable
+                        // keyword splat.
+                        *flags |= VM_CALL_KW_SPLAT_MUT;
+                        pm_compile_hash_elements(iseq, argument, elements, 0, Qundef, true, ret, scope_node);
+                    }
+                    else if (*dup_rest & DUP_SINGLE_KW_SPLAT) {
+                        *flags |= VM_CALL_KW_SPLAT_MUT;
+                        PUSH_INSN1(ret, location, putspecialobject, INT2FIX(VM_SPECIAL_OBJECT_VMCORE));
+                        PUSH_INSN1(ret, location, newhash, INT2FIX(0));
+                        pm_compile_hash_elements(iseq, argument, elements, 0, Qundef, true, ret, scope_node);
+                        PUSH_SEND(ret, location, id_core_hash_merge_kwd, INT2FIX(2));
+                    }
+                    else {
+                        pm_compile_hash_elements(iseq, argument, elements, 0, Qundef, true, ret, scope_node);
+                    }
+                }
+                else {
+                    // We need to first figure out if all elements of the
+                    // KeywordHashNode are AssocNodes with symbol keys.
+                    if (PM_NODE_FLAG_P(keyword_arg, PM_KEYWORD_HASH_NODE_FLAGS_SYMBOL_KEYS)) {
+                        // If they are all symbol keys then we can pass them as
+                        // keyword arguments. The first thing we need to do is
+                        // deduplicate. We'll do this using the combination of a
+                        // Ruby hash and a Ruby array.
+                        VALUE stored_indices = rb_hash_new();
+                        VALUE keyword_indices = rb_ary_new_capa(elements->size);
+
+                        size_t size = 0;
+                        for (size_t element_index = 0; element_index < elements->size; element_index++) {
+                            const pm_assoc_node_t *assoc = (const pm_assoc_node_t *) elements->nodes[element_index];
+
+                            // Retrieve the stored index from the hash for this
+                            // keyword.
+                            VALUE keyword = pm_static_literal_value(iseq, assoc->key, scope_node);
+                            VALUE stored_index = rb_hash_aref(stored_indices, keyword);
+
+                            // If this keyword was already seen in the hash,
+                            // then mark the array at that index as false and
+                            // decrement the keyword size.
+                            if (!NIL_P(stored_index)) {
+                                rb_ary_store(keyword_indices, NUM2LONG(stored_index), Qfalse);
+                                size--;
+                            }
+
+                            // Store (and possibly overwrite) the index for this
+                            // keyword in the hash, mark the array at that index
+                            // as true, and increment the keyword size.
+                            rb_hash_aset(stored_indices, keyword, ULONG2NUM(element_index));
+                            rb_ary_store(keyword_indices, (long) element_index, Qtrue);
+                            size++;
+                        }
+
+                        *kw_arg = rb_xmalloc_mul_add(size, sizeof(VALUE), sizeof(struct rb_callinfo_kwarg));
+                        *flags |= VM_CALL_KWARG;
+
+                        VALUE *keywords = (*kw_arg)->keywords;
+                        (*kw_arg)->references = 0;
+                        (*kw_arg)->keyword_len = (int) size;
+
+                        size_t keyword_index = 0;
+                        for (size_t element_index = 0; element_index < elements->size; element_index++) {
+                            const pm_assoc_node_t *assoc = (const pm_assoc_node_t *) elements->nodes[element_index];
+                            bool popped = true;
+
+                            if (rb_ary_entry(keyword_indices, (long) element_index) == Qtrue) {
+                                keywords[keyword_index++] = pm_static_literal_value(iseq, assoc->key, scope_node);
+                                popped = false;
+                            }
+
+                            PM_COMPILE(assoc->value);
+                        }
+
+                        RUBY_ASSERT(keyword_index == size);
+                    }
+                    else {
+                        // If they aren't all symbol keys then we need to
+                        // construct a new hash and pass that as an argument.
+                        orig_argc++;
+                        *flags |= VM_CALL_KW_SPLAT;
+
+                        size_t size = elements->size;
+                        if (size > 1) {
+                            // A new hash will be created for the keyword
+                            // arguments in this case, so mark the method as
+                            // passing mutable keyword splat.
+                            *flags |= VM_CALL_KW_SPLAT_MUT;
+                        }
+
+                        for (size_t element_index = 0; element_index < size; element_index++) {
+                            const pm_assoc_node_t *assoc = (const pm_assoc_node_t *) elements->nodes[element_index];
+                            PM_COMPILE_NOT_POPPED(assoc->key);
+                            PM_COMPILE_NOT_POPPED(assoc->value);
+                        }
+
+                        PUSH_INSN1(ret, location, newhash, INT2FIX(size * 2));
+                    }
+                }
+                break;
+              }
+              case PM_SPLAT_NODE: {
+                *flags |= VM_CALL_ARGS_SPLAT;
+                const pm_splat_node_t *splat_node = (const pm_splat_node_t *) argument;
+
+                if (splat_node->expression) {
+                    PM_COMPILE_NOT_POPPED(splat_node->expression);
+                }
+                else {
+                    pm_local_index_t index = pm_lookup_local_index(iseq, scope_node, PM_CONSTANT_MULT, 0);
+                    PUSH_GETLOCAL(ret, location, index.index, index.level);
+                }
+
+                bool first_splat = !has_splat;
+
+                if (first_splat) {
+                    // If this is the first splat array seen and it's not the
+                    // last parameter, we want splatarray to dup it.
+                    //
+                    // foo(a, *b, c)
+                    //        ^^
+                    if (index + 1 < arguments->size || has_regular_blockarg) {
+                        PUSH_INSN1(ret, location, splatarray, (*dup_rest & SPLATARRAY_TRUE) ? Qtrue : Qfalse);
+                        if (*dup_rest & SPLATARRAY_TRUE) *dup_rest &= ~SPLATARRAY_TRUE;
+                    }
+                    // If this is the first spalt array seen and it's the last
+                    // parameter, we don't want splatarray to dup it.
+                    //
+                    // foo(a, *b)
+                    //        ^^
+                    else {
+                        PUSH_INSN1(ret, location, splatarray, Qfalse);
+                    }
+                }
+                else {
+                    // If this is not the first splat array seen and it is also
+                    // the last parameter, we don't want splatarray to dup it
+                    // and we need to concat the array.
+                    //
+                    // foo(a, *b, *c)
+                    //            ^^
+                    PUSH_INSN(ret, location, concattoarray);
+                }
+
+                has_splat = true;
+                post_splat_counter = 0;
+
+                break;
+              }
+              case PM_FORWARDING_ARGUMENTS_NODE: { // not counted in argc return value
+                iseq_set_use_block(ISEQ_BODY(iseq)->local_iseq);
+
+                if (ISEQ_BODY(ISEQ_BODY(iseq)->local_iseq)->param.flags.forwardable) {
+                    *flags |= VM_CALL_FORWARDING;
+
+                    pm_local_index_t mult_local = pm_lookup_local_index(iseq, scope_node, PM_CONSTANT_DOT3, 0);
+                    PUSH_GETLOCAL(ret, location, mult_local.index, mult_local.level);
+
+                    break;
+                }
+
+                orig_argc += 2;
+
+                *flags |= VM_CALL_ARGS_SPLAT | VM_CALL_ARGS_SPLAT_MUT | VM_CALL_ARGS_BLOCKARG | VM_CALL_KW_SPLAT;
+
+                // Forwarding arguments nodes are treated as foo(*, **, &)
+                // So foo(...) equals foo(*, **, &) and as such the local
+                // table for this method is known in advance
+                //
+                // Push the *
+                pm_local_index_t mult_local = pm_lookup_local_index(iseq, scope_node, PM_CONSTANT_MULT, 0);
+                PUSH_GETLOCAL(ret, location, mult_local.index, mult_local.level);
+                PUSH_INSN1(ret, location, splatarray, Qtrue);
+
+                // Push the **
+                pm_local_index_t pow_local = pm_lookup_local_index(iseq, scope_node, PM_CONSTANT_POW, 0);
+                PUSH_GETLOCAL(ret, location, pow_local.index, pow_local.level);
+
+                // Push the &
+                pm_local_index_t and_local = pm_lookup_local_index(iseq, scope_node, PM_CONSTANT_AND, 0);
+                PUSH_INSN2(ret, location, getblockparamproxy, INT2FIX(and_local.index + VM_ENV_DATA_SIZE - 1), INT2FIX(and_local.level));
+                PUSH_INSN(ret, location, splatkw);
+
+                break;
+              }
+              default: {
+                post_splat_counter++;
+                PM_COMPILE_NOT_POPPED(argument);
+
+                // If we have a splat and we've seen a splat, we need to process
+                // everything after the splat.
+                if (has_splat) {
+                    // Stack items are turned into an array and concatenated in
+                    // the following cases:
+                    //
+                    // If the next node is a splat:
+                    //
+                    //   foo(*a, b, *c)
+                    //
+                    // If the next node is a kwarg or kwarg splat:
+                    //
+                    //   foo(*a, b, c: :d)
+                    //   foo(*a, b, **c)
+                    //
+                    // If the next node is NULL (we have hit the end):
+                    //
+                    //   foo(*a, b)
+                    if (index == arguments->size - 1) {
+                        RUBY_ASSERT(post_splat_counter > 0);
+                        PUSH_INSN1(ret, location, pushtoarray, INT2FIX(post_splat_counter));
+                    }
+                    else {
+                        pm_node_t *next_arg = arguments->nodes[index + 1];
+
+                        switch (PM_NODE_TYPE(next_arg)) {
+                          // A keyword hash node contains all keyword arguments as AssocNodes and AssocSplatNodes
+                          case PM_KEYWORD_HASH_NODE: {
+                            PUSH_INSN1(ret, location, newarray, INT2FIX(post_splat_counter));
+                            PUSH_INSN(ret, location, concatarray);
+                            break;
+                          }
+                          case PM_SPLAT_NODE: {
+                            PUSH_INSN1(ret, location, newarray, INT2FIX(post_splat_counter));
+                            PUSH_INSN(ret, location, concatarray);
+                            break;
+                          }
+                          default:
+                            break;
+                        }
+                    }
+                }
+                else {
+                    orig_argc++;
+                }
+              }
+            }
+        }
+    }
+
+    if (has_splat) orig_argc++;
+    if (has_keyword_splat) orig_argc++;
+    return orig_argc;
+}
+
+/**
+ * True if the given kind of node could potentially mutate the array that is
+ * being splatted in a set of call arguments.
+ */
+static inline bool
+pm_setup_args_dup_rest_p(const pm_node_t *node)
+{
+    switch (PM_NODE_TYPE(node)) {
+      case PM_BACK_REFERENCE_READ_NODE:
+      case PM_CLASS_VARIABLE_READ_NODE:
+      case PM_CONSTANT_READ_NODE:
+      case PM_FALSE_NODE:
+      case PM_FLOAT_NODE:
+      case PM_GLOBAL_VARIABLE_READ_NODE:
+      case PM_IMAGINARY_NODE:
+      case PM_INSTANCE_VARIABLE_READ_NODE:
+      case PM_INTEGER_NODE:
+      case PM_LAMBDA_NODE:
+      case PM_LOCAL_VARIABLE_READ_NODE:
+      case PM_NIL_NODE:
+      case PM_NUMBERED_REFERENCE_READ_NODE:
+      case PM_RATIONAL_NODE:
+      case PM_REGULAR_EXPRESSION_NODE:
+      case PM_SELF_NODE:
+      case PM_STRING_NODE:
+      case PM_SYMBOL_NODE:
+      case PM_TRUE_NODE:
+        return false;
+      case PM_CONSTANT_PATH_NODE: {
+        const pm_constant_path_node_t *cast = (const pm_constant_path_node_t *) node;
+        if (cast->parent != NULL) {
+            return pm_setup_args_dup_rest_p(cast->parent);
+        }
+        return false;
+      }
+      case PM_IMPLICIT_NODE:
+        return pm_setup_args_dup_rest_p(((const pm_implicit_node_t *) node)->value);
+      case PM_ARRAY_NODE: {
+        const pm_array_node_t *cast = (const pm_array_node_t *) node;
+        for (size_t index = 0; index < cast->elements.size; index++) {
+            if (pm_setup_args_dup_rest_p(cast->elements.nodes[index])) {
+                return true;
+            }
+        }
+        return false;
+      }
+      default:
+        return true;
+    }
+}
+
+/**
+ * Compile the argument parts of a call.
+ */
+static int
+pm_setup_args(const pm_arguments_node_t *arguments_node, const pm_node_t *block, int *flags, struct rb_callinfo_kwarg **kw_arg, rb_iseq_t *iseq, LINK_ANCHOR *const ret, pm_scope_node_t *scope_node, const pm_node_location_t *node_location)
+{
+    int dup_rest = SPLATARRAY_TRUE;
+
+    const pm_node_list_t *arguments;
+    size_t arguments_size;
+
+    // Calls like foo(1, *f, **hash) that use splat and kwsplat could be
+    // eligible for eliding duping the rest array (dup_reset=false).
+    if (
+        arguments_node != NULL &&
+        (arguments = &arguments_node->arguments, arguments_size = arguments->size) >= 2 &&
+        PM_NODE_FLAG_P(arguments_node, PM_ARGUMENTS_NODE_FLAGS_CONTAINS_SPLAT) &&
+        !PM_NODE_FLAG_P(arguments_node, PM_ARGUMENTS_NODE_FLAGS_CONTAINS_MULTIPLE_SPLATS) &&
+        PM_NODE_TYPE_P(arguments->nodes[arguments_size - 1], PM_KEYWORD_HASH_NODE)
+    ) {
+        // Start by assuming that dup_rest=false, then check each element of the
+        // hash to ensure we don't need to flip it back to true (in case one of
+        // the elements could potentially mutate the array).
+        dup_rest = SPLATARRAY_FALSE;
+
+        const pm_keyword_hash_node_t *keyword_hash = (const pm_keyword_hash_node_t *) arguments->nodes[arguments_size - 1];
+        const pm_node_list_t *elements = &keyword_hash->elements;
+
+        for (size_t index = 0; dup_rest == SPLATARRAY_FALSE && index < elements->size; index++) {
+            const pm_node_t *element = elements->nodes[index];
+
+            switch (PM_NODE_TYPE(element)) {
+              case PM_ASSOC_NODE: {
+                const pm_assoc_node_t *assoc = (const pm_assoc_node_t *) element;
+                if (pm_setup_args_dup_rest_p(assoc->key) || pm_setup_args_dup_rest_p(assoc->value)) dup_rest = SPLATARRAY_TRUE;
+                break;
+              }
+              case PM_ASSOC_SPLAT_NODE: {
+                const pm_assoc_splat_node_t *assoc = (const pm_assoc_splat_node_t *) element;
+                if (assoc->value != NULL && pm_setup_args_dup_rest_p(assoc->value)) dup_rest = SPLATARRAY_TRUE;
+                break;
+              }
+              default:
+                break;
+            }
+        }
+    }
+
+    int initial_dup_rest = dup_rest;
+    int argc;
+
+    if (block && PM_NODE_TYPE_P(block, PM_BLOCK_ARGUMENT_NODE)) {
+        // We compile the `&block_arg` expression first and stitch it later
+        // since the nature of the expression influences whether splat should
+        // duplicate the array.
+        bool regular_block_arg = true;
+        const pm_node_t *block_expr = ((const pm_block_argument_node_t *)block)->expression;
+
+        if (block_expr && pm_setup_args_dup_rest_p(block_expr)) {
+            dup_rest = SPLATARRAY_TRUE | DUP_SINGLE_KW_SPLAT;
+            initial_dup_rest = dup_rest;
+        }
+
+        DECL_ANCHOR(block_arg);
+        pm_compile_node(iseq, block, block_arg, false, scope_node);
+
+        *flags |= VM_CALL_ARGS_BLOCKARG;
+
+        if (LIST_INSN_SIZE_ONE(block_arg)) {
+            LINK_ELEMENT *elem = FIRST_ELEMENT(block_arg);
+            if (IS_INSN(elem)) {
+                INSN *iobj = (INSN *) elem;
+                if (iobj->insn_id == BIN(getblockparam)) {
+                    iobj->insn_id = BIN(getblockparamproxy);
+                }
+
+                // Allow splat without duplication for simple one-instruction
+                // block arguments like `&arg`. It is known that this
+                // optimization can be too aggressive in some cases. See
+                // [Bug #16504].
+                regular_block_arg = false;
+            }
+        }
+
+        argc = pm_setup_args_core(arguments_node, block, flags, regular_block_arg, kw_arg, &dup_rest, iseq, ret, scope_node, node_location);
+        PUSH_SEQ(ret, block_arg);
+    }
+    else {
+        argc = pm_setup_args_core(arguments_node, block, flags, false, kw_arg, &dup_rest, iseq, ret, scope_node, node_location);
+    }
+
+    // If the dup_rest flag was consumed while compiling the arguments (which
+    // effectively means we found the splat node), then it would have changed
+    // during the call to pm_setup_args_core. In this case, we want to add the
+    // VM_CALL_ARGS_SPLAT_MUT flag.
+    if (*flags & VM_CALL_ARGS_SPLAT && dup_rest != initial_dup_rest) {
+        *flags |= VM_CALL_ARGS_SPLAT_MUT;
+    }
+
+    return argc;
+}
+
+/**
+ * Compile an index operator write node, which is a node that is writing a value
+ * using the [] and []= methods. It looks like:
+ *
+ *     foo[bar] += baz
+ *
+ * This breaks down to caching the receiver and arguments on the stack, calling
+ * the [] method, calling the operator method with the result of the [] method,
+ * and then calling the []= method with the result of the operator method.
+ */
+static void
+pm_compile_index_operator_write_node(rb_iseq_t *iseq, const pm_index_operator_write_node_t *node, const pm_node_location_t *node_location, LINK_ANCHOR *const ret, bool popped, pm_scope_node_t *scope_node)
+{
+    const pm_node_location_t location = *node_location;
+    if (!popped) PUSH_INSN(ret, location, putnil);
+
+    PM_COMPILE_NOT_POPPED(node->receiver);
+
+    int boff = (node->block == NULL ? 0 : 1);
+    int flag = PM_NODE_TYPE_P(node->receiver, PM_SELF_NODE) ? VM_CALL_FCALL : 0;
+    struct rb_callinfo_kwarg *keywords = NULL;
+    int argc = pm_setup_args(node->arguments, (const pm_node_t *) node->block, &flag, &keywords, iseq, ret, scope_node, node_location);
+
+    if ((argc > 0 || boff) && (flag & VM_CALL_KW_SPLAT)) {
+        if (boff) {
+            PUSH_INSN(ret, location, splatkw);
+        }
+        else {
+            PUSH_INSN(ret, location, dup);
+            PUSH_INSN(ret, location, splatkw);
+            PUSH_INSN(ret, location, pop);
+        }
+    }
+
+    int dup_argn = argc + 1 + boff;
+    int keyword_len = 0;
+
+    if (keywords) {
+        keyword_len = keywords->keyword_len;
+        dup_argn += keyword_len;
+    }
+
+    PUSH_INSN1(ret, location, dupn, INT2FIX(dup_argn));
+    PUSH_SEND_R(ret, location, idAREF, INT2FIX(argc), NULL, INT2FIX(flag & ~(VM_CALL_ARGS_SPLAT_MUT | VM_CALL_KW_SPLAT_MUT)), keywords);
+    PM_COMPILE_NOT_POPPED(node->value);
+
+    ID id_operator = pm_constant_id_lookup(scope_node, node->binary_operator);
+    PUSH_SEND(ret, location, id_operator, INT2FIX(1));
+
+    if (!popped) {
+        PUSH_INSN1(ret, location, setn, INT2FIX(dup_argn + 1));
+    }
+    if (flag & VM_CALL_ARGS_SPLAT) {
+        if (flag & VM_CALL_KW_SPLAT) {
+            PUSH_INSN1(ret, location, topn, INT2FIX(2 + boff));
+
+            if (!(flag & VM_CALL_ARGS_SPLAT_MUT)) {
+                PUSH_INSN1(ret, location, splatarray, Qtrue);
+                flag |= VM_CALL_ARGS_SPLAT_MUT;
+            }
+
+            PUSH_INSN(ret, location, swap);
+            PUSH_INSN1(ret, location, pushtoarray, INT2FIX(1));
+            PUSH_INSN1(ret, location, setn, INT2FIX(2 + boff));
+            PUSH_INSN(ret, location, pop);
+        }
+        else {
+            if (boff > 0) {
+                PUSH_INSN1(ret, location, dupn, INT2FIX(3));
+                PUSH_INSN(ret, location, swap);
+                PUSH_INSN(ret, location, pop);
+            }
+            if (!(flag & VM_CALL_ARGS_SPLAT_MUT)) {
+                PUSH_INSN(ret, location, swap);
+                PUSH_INSN1(ret, location, splatarray, Qtrue);
+                PUSH_INSN(ret, location, swap);
+                flag |= VM_CALL_ARGS_SPLAT_MUT;
+            }
+            PUSH_INSN1(ret, location, pushtoarray, INT2FIX(1));
+            if (boff > 0) {
+                PUSH_INSN1(ret, location, setn, INT2FIX(3));
+                PUSH_INSN(ret, location, pop);
+                PUSH_INSN(ret, location, pop);
+            }
+        }
+
+        PUSH_SEND_R(ret, location, idASET, INT2FIX(argc), NULL, INT2FIX(flag), keywords);
+    }
+    else if (flag & VM_CALL_KW_SPLAT) {
+        if (boff > 0) {
+            PUSH_INSN1(ret, location, topn, INT2FIX(2));
+            PUSH_INSN(ret, location, swap);
+            PUSH_INSN1(ret, location, setn, INT2FIX(3));
+            PUSH_INSN(ret, location, pop);
+        }
+        PUSH_INSN(ret, location, swap);
+        PUSH_SEND_R(ret, location, idASET, INT2FIX(argc + 1), NULL, INT2FIX(flag), keywords);
+    }
+    else if (keyword_len) {
+        PUSH_INSN(ret, location, dup);
+        PUSH_INSN1(ret, location, opt_reverse, INT2FIX(keyword_len + boff + 2));
+        PUSH_INSN1(ret, location, opt_reverse, INT2FIX(keyword_len + boff + 1));
+        PUSH_INSN(ret, location, pop);
+        PUSH_SEND_R(ret, location, idASET, INT2FIX(argc + 1), NULL, INT2FIX(flag), keywords);
+    }
+    else {
+        if (boff > 0) {
+            PUSH_INSN(ret, location, swap);
+        }
+        PUSH_SEND_R(ret, location, idASET, INT2FIX(argc + 1), NULL, INT2FIX(flag), keywords);
+    }
+
+    PUSH_INSN(ret, location, pop);
+}
+
+/**
+ * Compile an index control flow write node, which is a node that is writing a
+ * value using the [] and []= methods and the &&= and ||= operators. It looks
+ * like:
+ *
+ *     foo[bar] ||= baz
+ *
+ * This breaks down to caching the receiver and arguments on the stack, calling
+ * the [] method, checking the result and then changing control flow based on
+ * it. If the value would result in a write, then the value is written using the
+ * []= method.
+ */
+static void
+pm_compile_index_control_flow_write_node(rb_iseq_t *iseq, const pm_node_t *node, const pm_node_t *receiver, const pm_arguments_node_t *arguments, const pm_block_argument_node_t *block, const pm_node_t *value, const pm_node_location_t *node_location, LINK_ANCHOR *const ret, bool popped, pm_scope_node_t *scope_node)
+{
+    const pm_node_location_t location = *node_location;
+    if (!popped) PUSH_INSN(ret, location, putnil);
+    PM_COMPILE_NOT_POPPED(receiver);
+
+    int boff = (block == NULL ? 0 : 1);
+    int flag = PM_NODE_TYPE_P(receiver, PM_SELF_NODE) ? VM_CALL_FCALL : 0;
+    struct rb_callinfo_kwarg *keywords = NULL;
+    int argc = pm_setup_args(arguments, (const pm_node_t *) block, &flag, &keywords, iseq, ret, scope_node, node_location);
+
+    if ((argc > 0 || boff) && (flag & VM_CALL_KW_SPLAT)) {
+        if (boff) {
+            PUSH_INSN(ret, location, splatkw);
+        }
+        else {
+            PUSH_INSN(ret, location, dup);
+            PUSH_INSN(ret, location, splatkw);
+            PUSH_INSN(ret, location, pop);
+        }
+    }
+
+    int dup_argn = argc + 1 + boff;
+    int keyword_len = 0;
+
+    if (keywords) {
+        keyword_len = keywords->keyword_len;
+        dup_argn += keyword_len;
+    }
+
+    PUSH_INSN1(ret, location, dupn, INT2FIX(dup_argn));
+    PUSH_SEND_R(ret, location, idAREF, INT2FIX(argc), NULL, INT2FIX(flag & ~(VM_CALL_ARGS_SPLAT_MUT | VM_CALL_KW_SPLAT_MUT)), keywords);
+
+    LABEL *label = NEW_LABEL(location.line);
+    LABEL *lfin = NEW_LABEL(location.line);
+
+    PUSH_INSN(ret, location, dup);
+    if (PM_NODE_TYPE_P(node, PM_INDEX_AND_WRITE_NODE)) {
+        PUSH_INSNL(ret, location, branchunless, label);
+    }
+    else {
+        PUSH_INSNL(ret, location, branchif, label);
+    }
+
+    PUSH_INSN(ret, location, pop);
+    PM_COMPILE_NOT_POPPED(value);
+
+    if (!popped) {
+        PUSH_INSN1(ret, location, setn, INT2FIX(dup_argn + 1));
+    }
+
+    if (flag & VM_CALL_ARGS_SPLAT) {
+        if (flag & VM_CALL_KW_SPLAT) {
+            PUSH_INSN1(ret, location, topn, INT2FIX(2 + boff));
+            if (!(flag & VM_CALL_ARGS_SPLAT_MUT)) {
+                PUSH_INSN1(ret, location, splatarray, Qtrue);
+                flag |= VM_CALL_ARGS_SPLAT_MUT;
+            }
+
+            PUSH_INSN(ret, location, swap);
+            PUSH_INSN1(ret, location, pushtoarray, INT2FIX(1));
+            PUSH_INSN1(ret, location, setn, INT2FIX(2 + boff));
+            PUSH_INSN(ret, location, pop);
+        }
+        else {
+            if (boff > 0) {
+                PUSH_INSN1(ret, location, dupn, INT2FIX(3));
+                PUSH_INSN(ret, location, swap);
+                PUSH_INSN(ret, location, pop);
+            }
+            if (!(flag & VM_CALL_ARGS_SPLAT_MUT)) {
+                PUSH_INSN(ret, location, swap);
+                PUSH_INSN1(ret, location, splatarray, Qtrue);
+                PUSH_INSN(ret, location, swap);
+                flag |= VM_CALL_ARGS_SPLAT_MUT;
+            }
+            PUSH_INSN1(ret, location, pushtoarray, INT2FIX(1));
+            if (boff > 0) {
+                PUSH_INSN1(ret, location, setn, INT2FIX(3));
+                PUSH_INSN(ret, location, pop);
+                PUSH_INSN(ret, location, pop);
+            }
+        }
+
+        PUSH_SEND_R(ret, location, idASET, INT2FIX(argc), NULL, INT2FIX(flag), keywords);
+    }
+    else if (flag & VM_CALL_KW_SPLAT) {
+        if (boff > 0) {
+            PUSH_INSN1(ret, location, topn, INT2FIX(2));
+            PUSH_INSN(ret, location, swap);
+            PUSH_INSN1(ret, location, setn, INT2FIX(3));
+            PUSH_INSN(ret, location, pop);
+        }
+
+        PUSH_INSN(ret, location, swap);
+        PUSH_SEND_R(ret, location, idASET, INT2FIX(argc + 1), NULL, INT2FIX(flag), keywords);
+    }
+    else if (keyword_len) {
+        PUSH_INSN1(ret, location, opt_reverse, INT2FIX(keyword_len + boff + 1));
+        PUSH_INSN1(ret, location, opt_reverse, INT2FIX(keyword_len + boff + 0));
+        PUSH_SEND_R(ret, location, idASET, INT2FIX(argc + 1), NULL, INT2FIX(flag), keywords);
+    }
+    else {
+        if (boff > 0) {
+            PUSH_INSN(ret, location, swap);
+        }
+        PUSH_SEND_R(ret, location, idASET, INT2FIX(argc + 1), NULL, INT2FIX(flag), keywords);
+    }
+
+    PUSH_INSN(ret, location, pop);
+    PUSH_INSNL(ret, location, jump, lfin);
+    PUSH_LABEL(ret, label);
+    if (!popped) {
+        PUSH_INSN1(ret, location, setn, INT2FIX(dup_argn + 1));
+    }
+    PUSH_INSN1(ret, location, adjuststack, INT2FIX(dup_argn + 1));
+    PUSH_LABEL(ret, lfin);
+}
+
+// When we compile a pattern matching expression, we use the stack as a scratch
+// space to store lots of different values (consider it like we have a pattern
+// matching function and we need space for a bunch of different local
+// variables). The "base index" refers to the index on the stack where we
+// started compiling the pattern matching expression. These offsets from that
+// base index indicate the location of the various locals we need.
+#define PM_PATTERN_BASE_INDEX_OFFSET_DECONSTRUCTED_CACHE 0
+#define PM_PATTERN_BASE_INDEX_OFFSET_ERROR_STRING 1
+#define PM_PATTERN_BASE_INDEX_OFFSET_KEY_ERROR_P 2
+#define PM_PATTERN_BASE_INDEX_OFFSET_KEY_ERROR_MATCHEE 3
+#define PM_PATTERN_BASE_INDEX_OFFSET_KEY_ERROR_KEY 4
+
+// A forward declaration because this is the recursive function that handles
+// compiling a pattern. It can be reentered by nesting patterns, as in the case
+// of arrays or hashes.
+static int pm_compile_pattern(rb_iseq_t *iseq, pm_scope_node_t *scope_node, const pm_node_t *node, LINK_ANCHOR *const ret, LABEL *matched_label, LABEL *unmatched_label, bool in_single_pattern, bool in_alternation_pattern, bool use_deconstructed_cache, unsigned int base_index);
+
+/**
+ * This function generates the code to set up the error string and error_p
+ * locals depending on whether or not the pattern matched.
+ */
+static int
+pm_compile_pattern_generic_error(rb_iseq_t *iseq, pm_scope_node_t *scope_node, const pm_node_t *node, LINK_ANCHOR *const ret, VALUE message, unsigned int base_index)
+{
+    const pm_node_location_t location = PM_NODE_START_LOCATION(scope_node->parser, node);
+    LABEL *match_succeeded_label = NEW_LABEL(location.line);
+
+    PUSH_INSN(ret, location, dup);
+    PUSH_INSNL(ret, location, branchif, match_succeeded_label);
+
+    PUSH_INSN1(ret, location, putspecialobject, INT2FIX(VM_SPECIAL_OBJECT_VMCORE));
+    PUSH_INSN1(ret, location, putobject, message);
+    PUSH_INSN1(ret, location, topn, INT2FIX(3));
+    PUSH_SEND(ret, location, id_core_sprintf, INT2FIX(2));
+    PUSH_INSN1(ret, location, setn, INT2FIX(base_index + PM_PATTERN_BASE_INDEX_OFFSET_ERROR_STRING + 1));
+
+    PUSH_INSN1(ret, location, putobject, Qfalse);
+    PUSH_INSN1(ret, location, setn, INT2FIX(base_index + PM_PATTERN_BASE_INDEX_OFFSET_KEY_ERROR_P + 2));
+
+    PUSH_INSN(ret, location, pop);
+    PUSH_INSN(ret, location, pop);
+    PUSH_LABEL(ret, match_succeeded_label);
+
+    return COMPILE_OK;
+}
+
+/**
+ * This function generates the code to set up the error string and error_p
+ * locals depending on whether or not the pattern matched when the value needs
+ * to match a specific deconstructed length.
+ */
+static int
+pm_compile_pattern_length_error(rb_iseq_t *iseq, pm_scope_node_t *scope_node, const pm_node_t *node, LINK_ANCHOR *const ret, VALUE message, VALUE length, unsigned int base_index)
+{
+    const pm_node_location_t location = PM_NODE_START_LOCATION(scope_node->parser, node);
+    LABEL *match_succeeded_label = NEW_LABEL(location.line);
+
+    PUSH_INSN(ret, location, dup);
+    PUSH_INSNL(ret, location, branchif, match_succeeded_label);
+
+    PUSH_INSN1(ret, location, putspecialobject, INT2FIX(VM_SPECIAL_OBJECT_VMCORE));
+    PUSH_INSN1(ret, location, putobject, message);
+    PUSH_INSN1(ret, location, topn, INT2FIX(3));
+    PUSH_INSN(ret, location, dup);
+    PUSH_SEND(ret, location, idLength, INT2FIX(0));
+    PUSH_INSN1(ret, location, putobject, length);
+    PUSH_SEND(ret, location, id_core_sprintf, INT2FIX(4));
+    PUSH_INSN1(ret, location, setn, INT2FIX(base_index + PM_PATTERN_BASE_INDEX_OFFSET_ERROR_STRING + 1));
+
+    PUSH_INSN1(ret, location, putobject, Qfalse);
+    PUSH_INSN1(ret, location, setn, INT2FIX(base_index + PM_PATTERN_BASE_INDEX_OFFSET_KEY_ERROR_P + 2));
+
+    PUSH_INSN(ret, location, pop);
+    PUSH_INSN(ret, location, pop);
+    PUSH_LABEL(ret, match_succeeded_label);
+
+    return COMPILE_OK;
+}
+
+/**
+ * This function generates the code to set up the error string and error_p
+ * locals depending on whether or not the pattern matched when the value needs
+ * to pass a specific #=== method call.
+ */
+static int
+pm_compile_pattern_eqq_error(rb_iseq_t *iseq, pm_scope_node_t *scope_node, const pm_node_t *node, LINK_ANCHOR *const ret, unsigned int base_index)
+{
+    const pm_node_location_t location = PM_NODE_START_LOCATION(scope_node->parser, node);
+    LABEL *match_succeeded_label = NEW_LABEL(location.line);
+
+    PUSH_INSN(ret, location, dup);
+    PUSH_INSNL(ret, location, branchif, match_succeeded_label);
+    PUSH_INSN1(ret, location, putspecialobject, INT2FIX(VM_SPECIAL_OBJECT_VMCORE));
+
+    VALUE operand = rb_fstring_lit("%p === %p does not return true");
+    PUSH_INSN1(ret, location, putobject, operand);
+
+    PUSH_INSN1(ret, location, topn, INT2FIX(3));
+    PUSH_INSN1(ret, location, topn, INT2FIX(5));
+    PUSH_SEND(ret, location, id_core_sprintf, INT2FIX(3));
+    PUSH_INSN1(ret, location, setn, INT2FIX(base_index + PM_PATTERN_BASE_INDEX_OFFSET_ERROR_STRING + 1));
+    PUSH_INSN1(ret, location, putobject, Qfalse);
+    PUSH_INSN1(ret, location, setn, INT2FIX(base_index + PM_PATTERN_BASE_INDEX_OFFSET_KEY_ERROR_P + 2));
+    PUSH_INSN(ret, location, pop);
+    PUSH_INSN(ret, location, pop);
+
+    PUSH_LABEL(ret, match_succeeded_label);
+    PUSH_INSN1(ret, location, setn, INT2FIX(2));
+    PUSH_INSN(ret, location, pop);
+    PUSH_INSN(ret, location, pop);
+
+    return COMPILE_OK;
+}
+
+/**
+ * This is a variation on compiling a pattern matching expression that is used
+ * to have the pattern matching instructions fall through to immediately after
+ * the pattern if it passes. Otherwise it jumps to the given unmatched_label
+ * label.
+ */
+static int
+pm_compile_pattern_match(rb_iseq_t *iseq, pm_scope_node_t *scope_node, const pm_node_t *node, LINK_ANCHOR *const ret, LABEL *unmatched_label, bool in_single_pattern, bool in_alternation_pattern, bool use_deconstructed_cache, unsigned int base_index)
+{
+    LABEL *matched_label = NEW_LABEL(pm_node_line_number(scope_node->parser, node));
+    CHECK(pm_compile_pattern(iseq, scope_node, node, ret, matched_label, unmatched_label, in_single_pattern, in_alternation_pattern, use_deconstructed_cache, base_index));
+    PUSH_LABEL(ret, matched_label);
+    return COMPILE_OK;
+}
+
+/**
+ * This function compiles in the code necessary to call #deconstruct on the
+ * value to match against. It raises appropriate errors if the method does not
+ * exist or if it returns the wrong type.
+ */
+static int
+pm_compile_pattern_deconstruct(rb_iseq_t *iseq, pm_scope_node_t *scope_node, const pm_node_t *node, LINK_ANCHOR *const ret, LABEL *deconstruct_label, LABEL *match_failed_label, LABEL *deconstructed_label, LABEL *type_error_label, bool in_single_pattern, bool use_deconstructed_cache, unsigned int base_index)
+{
+    const pm_node_location_t location = PM_NODE_START_LOCATION(scope_node->parser, node);
+
+    if (use_deconstructed_cache) {
+        PUSH_INSN1(ret, location, topn, INT2FIX(base_index + PM_PATTERN_BASE_INDEX_OFFSET_DECONSTRUCTED_CACHE));
+        PUSH_INSNL(ret, location, branchnil, deconstruct_label);
+
+        PUSH_INSN1(ret, location, topn, INT2FIX(base_index + PM_PATTERN_BASE_INDEX_OFFSET_DECONSTRUCTED_CACHE));
+        PUSH_INSNL(ret, location, branchunless, match_failed_label);
+
+        PUSH_INSN(ret, location, pop);
+        PUSH_INSN1(ret, location, topn, INT2FIX(base_index + PM_PATTERN_BASE_INDEX_OFFSET_DECONSTRUCTED_CACHE - 1));
+        PUSH_INSNL(ret, location, jump, deconstructed_label);
+    }
+    else {
+        PUSH_INSNL(ret, location, jump, deconstruct_label);
+    }
+
+    PUSH_LABEL(ret, deconstruct_label);
+    PUSH_INSN(ret, location, dup);
+
+    VALUE operand = ID2SYM(rb_intern("deconstruct"));
+    PUSH_INSN1(ret, location, putobject, operand);
+    PUSH_SEND(ret, location, idRespond_to, INT2FIX(1));
+
+    if (use_deconstructed_cache) {
+        PUSH_INSN1(ret, location, setn, INT2FIX(base_index + PM_PATTERN_BASE_INDEX_OFFSET_DECONSTRUCTED_CACHE + 1));
+    }
+
+    if (in_single_pattern) {
+        CHECK(pm_compile_pattern_generic_error(iseq, scope_node, node, ret, rb_fstring_lit("%p does not respond to #deconstruct"), base_index + 1));
+    }
+
+    PUSH_INSNL(ret, location, branchunless, match_failed_label);
+    PUSH_SEND(ret, location, rb_intern("deconstruct"), INT2FIX(0));
+
+    if (use_deconstructed_cache) {
+        PUSH_INSN1(ret, location, setn, INT2FIX(base_index + PM_PATTERN_BASE_INDEX_OFFSET_DECONSTRUCTED_CACHE));
+    }
+
+    PUSH_INSN(ret, location, dup);
+    PUSH_INSN1(ret, location, checktype, INT2FIX(T_ARRAY));
+    PUSH_INSNL(ret, location, branchunless, type_error_label);
+    PUSH_LABEL(ret, deconstructed_label);
+
+    return COMPILE_OK;
+}
+
+/**
+ * This function compiles in the code necessary to match against the optional
+ * constant path that is attached to an array, find, or hash pattern.
+ */
+static int
+pm_compile_pattern_constant(rb_iseq_t *iseq, pm_scope_node_t *scope_node, const pm_node_t *node, LINK_ANCHOR *const ret, LABEL *match_failed_label, bool in_single_pattern, unsigned int base_index)
+{
+    const pm_node_location_t location = PM_NODE_START_LOCATION(scope_node->parser, node);
+
+    PUSH_INSN(ret, location, dup);
+    PM_COMPILE_NOT_POPPED(node);
+
+    if (in_single_pattern) {
+        PUSH_INSN1(ret, location, dupn, INT2FIX(2));
+    }
+    PUSH_INSN1(ret, location, checkmatch, INT2FIX(VM_CHECKMATCH_TYPE_CASE));
+    if (in_single_pattern) {
+        CHECK(pm_compile_pattern_eqq_error(iseq, scope_node, node, ret, base_index + 3));
+    }
+    PUSH_INSNL(ret, location, branchunless, match_failed_label);
+    return COMPILE_OK;
+}
+
+/**
+ * When matching fails, an appropriate error must be raised. This function is
+ * responsible for compiling in those error raising instructions.
+ */
+static void
+pm_compile_pattern_error_handler(rb_iseq_t *iseq, const pm_scope_node_t *scope_node, const pm_node_t *node, LINK_ANCHOR *const ret, LABEL *done_label, bool popped)
+{
+    const pm_node_location_t location = PM_NODE_START_LOCATION(scope_node->parser, node);
+    LABEL *key_error_label = NEW_LABEL(location.line);
+    LABEL *cleanup_label = NEW_LABEL(location.line);
+
+    struct rb_callinfo_kwarg *kw_arg = rb_xmalloc_mul_add(2, sizeof(VALUE), sizeof(struct rb_callinfo_kwarg));
+    kw_arg->references = 0;
+    kw_arg->keyword_len = 2;
+    kw_arg->keywords[0] = ID2SYM(rb_intern("matchee"));
+    kw_arg->keywords[1] = ID2SYM(rb_intern("key"));
+
+    PUSH_INSN1(ret, location, putspecialobject, INT2FIX(VM_SPECIAL_OBJECT_VMCORE));
+    PUSH_INSN1(ret, location, topn, INT2FIX(PM_PATTERN_BASE_INDEX_OFFSET_KEY_ERROR_P + 2));
+    PUSH_INSNL(ret, location, branchif, key_error_label);
+
+    PUSH_INSN1(ret, location, putobject, rb_eNoMatchingPatternError);
+    PUSH_INSN1(ret, location, putspecialobject, INT2FIX(VM_SPECIAL_OBJECT_VMCORE));
+
+    {
+        VALUE operand = rb_fstring_lit("%p: %s");
+        PUSH_INSN1(ret, location, putobject, operand);
+    }
+
+    PUSH_INSN1(ret, location, topn, INT2FIX(4));
+    PUSH_INSN1(ret, location, topn, INT2FIX(PM_PATTERN_BASE_INDEX_OFFSET_ERROR_STRING + 6));
+    PUSH_SEND(ret, location, id_core_sprintf, INT2FIX(3));
+    PUSH_SEND(ret, location, id_core_raise, INT2FIX(2));
+    PUSH_INSNL(ret, location, jump, cleanup_label);
+
+    PUSH_LABEL(ret, key_error_label);
+    PUSH_INSN1(ret, location, putobject, rb_eNoMatchingPatternKeyError);
+    PUSH_INSN1(ret, location, putspecialobject, INT2FIX(VM_SPECIAL_OBJECT_VMCORE));
+
+    {
+        VALUE operand = rb_fstring_lit("%p: %s");
+        PUSH_INSN1(ret, location, putobject, operand);
+    }
+
+    PUSH_INSN1(ret, location, topn, INT2FIX(4));
+    PUSH_INSN1(ret, location, topn, INT2FIX(PM_PATTERN_BASE_INDEX_OFFSET_ERROR_STRING + 6));
+    PUSH_SEND(ret, location, id_core_sprintf, INT2FIX(3));
+    PUSH_INSN1(ret, location, topn, INT2FIX(PM_PATTERN_BASE_INDEX_OFFSET_KEY_ERROR_MATCHEE + 4));
+    PUSH_INSN1(ret, location, topn, INT2FIX(PM_PATTERN_BASE_INDEX_OFFSET_KEY_ERROR_KEY + 5));
+    PUSH_SEND_R(ret, location, rb_intern("new"), INT2FIX(1), NULL, INT2FIX(VM_CALL_KWARG), kw_arg);
+    PUSH_SEND(ret, location, id_core_raise, INT2FIX(1));
+    PUSH_LABEL(ret, cleanup_label);
+
+    PUSH_INSN1(ret, location, adjuststack, INT2FIX(7));
+    if (!popped) PUSH_INSN(ret, location, putnil);
+    PUSH_INSNL(ret, location, jump, done_label);
+    PUSH_INSN1(ret, location, dupn, INT2FIX(5));
+    if (popped) PUSH_INSN(ret, location, putnil);
+}
+
+/**
+ * Compile a pattern matching expression.
+ */
+static int
+pm_compile_pattern(rb_iseq_t *iseq, pm_scope_node_t *scope_node, const pm_node_t *node, LINK_ANCHOR *const ret, LABEL *matched_label, LABEL *unmatched_label, bool in_single_pattern, bool in_alternation_pattern, bool use_deconstructed_cache, unsigned int base_index)
+{
+    const pm_node_location_t location = PM_NODE_START_LOCATION(scope_node->parser, node);
+
+    switch (PM_NODE_TYPE(node)) {
+      case PM_ARRAY_PATTERN_NODE: {
+        // Array patterns in pattern matching are triggered by using commas in
+        // a pattern or wrapping it in braces. They are represented by a
+        // ArrayPatternNode. This looks like:
+        //
+        //     foo => [1, 2, 3]
+        //
+        // It can optionally have a splat in the middle of it, which can
+        // optionally have a name attached.
+        const pm_array_pattern_node_t *cast = (const pm_array_pattern_node_t *) node;
+
+        const size_t requireds_size = cast->requireds.size;
+        const size_t posts_size = cast->posts.size;
+        const size_t minimum_size = requireds_size + posts_size;
+
+        bool rest_named = false;
+        bool use_rest_size = false;
+
+        if (cast->rest != NULL) {
+            rest_named = (PM_NODE_TYPE_P(cast->rest, PM_SPLAT_NODE) && ((const pm_splat_node_t *) cast->rest)->expression != NULL);
+            use_rest_size = (rest_named || (!rest_named && posts_size > 0));
+        }
+
+        LABEL *match_failed_label = NEW_LABEL(location.line);
+        LABEL *type_error_label = NEW_LABEL(location.line);
+        LABEL *deconstruct_label = NEW_LABEL(location.line);
+        LABEL *deconstructed_label = NEW_LABEL(location.line);
+
+        if (use_rest_size) {
+            PUSH_INSN1(ret, location, putobject, INT2FIX(0));
+            PUSH_INSN(ret, location, swap);
+            base_index++;
+        }
+
+        if (cast->constant != NULL) {
+            CHECK(pm_compile_pattern_constant(iseq, scope_node, cast->constant, ret, match_failed_label, in_single_pattern, base_index));
+        }
+
+        CHECK(pm_compile_pattern_deconstruct(iseq, scope_node, node, ret, deconstruct_label, match_failed_label, deconstructed_label, type_error_label, in_single_pattern, use_deconstructed_cache, base_index));
+
+        PUSH_INSN(ret, location, dup);
+        PUSH_SEND(ret, location, idLength, INT2FIX(0));
+        PUSH_INSN1(ret, location, putobject, INT2FIX(minimum_size));
+        PUSH_SEND(ret, location, cast->rest == NULL ? idEq : idGE, INT2FIX(1));
+        if (in_single_pattern) {
+            VALUE message = cast->rest == NULL ? rb_fstring_lit("%p length mismatch (given %p, expected %p)") : rb_fstring_lit("%p length mismatch (given %p, expected %p+)");
+            CHECK(pm_compile_pattern_length_error(iseq, scope_node, node, ret, message, INT2FIX(minimum_size), base_index + 1));
+        }
+        PUSH_INSNL(ret, location, branchunless, match_failed_label);
+
+        for (size_t index = 0; index < requireds_size; index++) {
+            const pm_node_t *required = cast->requireds.nodes[index];
+            PUSH_INSN(ret, location, dup);
+            PUSH_INSN1(ret, location, putobject, INT2FIX(index));
+            PUSH_SEND(ret, location, idAREF, INT2FIX(1));
+            CHECK(pm_compile_pattern_match(iseq, scope_node, required, ret, match_failed_label, in_single_pattern, in_alternation_pattern, false, base_index + 1));
+        }
+
+        if (cast->rest != NULL) {
+            if (rest_named) {
+                PUSH_INSN(ret, location, dup);
+                PUSH_INSN1(ret, location, putobject, INT2FIX(requireds_size));
+                PUSH_INSN1(ret, location, topn, INT2FIX(1));
+                PUSH_SEND(ret, location, idLength, INT2FIX(0));
+                PUSH_INSN1(ret, location, putobject, INT2FIX(minimum_size));
+                PUSH_SEND(ret, location, idMINUS, INT2FIX(1));
+                PUSH_INSN1(ret, location, setn, INT2FIX(4));
+                PUSH_SEND(ret, location, idAREF, INT2FIX(2));
+                CHECK(pm_compile_pattern_match(iseq, scope_node, ((const pm_splat_node_t *) cast->rest)->expression, ret, match_failed_label, in_single_pattern, in_alternation_pattern, false, base_index + 1));
+            }
+            else if (posts_size > 0) {
+                PUSH_INSN(ret, location, dup);
+                PUSH_SEND(ret, location, idLength, INT2FIX(0));
+                PUSH_INSN1(ret, location, putobject, INT2FIX(minimum_size));
+                PUSH_SEND(ret, location, idMINUS, INT2FIX(1));
+                PUSH_INSN1(ret, location, setn, INT2FIX(2));
+                PUSH_INSN(ret, location, pop);
+            }
+        }
+
+        for (size_t index = 0; index < posts_size; index++) {
+            const pm_node_t *post = cast->posts.nodes[index];
+            PUSH_INSN(ret, location, dup);
+
+            PUSH_INSN1(ret, location, putobject, INT2FIX(requireds_size + index));
+            PUSH_INSN1(ret, location, topn, INT2FIX(3));
+            PUSH_SEND(ret, location, idPLUS, INT2FIX(1));
+            PUSH_SEND(ret, location, idAREF, INT2FIX(1));
+            CHECK(pm_compile_pattern_match(iseq, scope_node, post, ret, match_failed_label, in_single_pattern, in_alternation_pattern, false, base_index + 1));
+        }
+
+        PUSH_INSN(ret, location, pop);
+        if (use_rest_size) {
+            PUSH_INSN(ret, location, pop);
+        }
+
+        PUSH_INSNL(ret, location, jump, matched_label);
+        PUSH_INSN(ret, location, putnil);
+        if (use_rest_size) {
+            PUSH_INSN(ret, location, putnil);
+        }
+
+        PUSH_LABEL(ret, type_error_label);
+        PUSH_INSN1(ret, location, putspecialobject, INT2FIX(VM_SPECIAL_OBJECT_VMCORE));
+        PUSH_INSN1(ret, location, putobject, rb_eTypeError);
+
+        {
+            VALUE operand = rb_fstring_lit("deconstruct must return Array");
+            PUSH_INSN1(ret, location, putobject, operand);
+        }
+
+        PUSH_SEND(ret, location, id_core_raise, INT2FIX(2));
+        PUSH_INSN(ret, location, pop);
+
+        PUSH_LABEL(ret, match_failed_label);
+        PUSH_INSN(ret, location, pop);
+        if (use_rest_size) {
+            PUSH_INSN(ret, location, pop);
+        }
+
+        PUSH_INSNL(ret, location, jump, unmatched_label);
+        break;
+      }
+      case PM_FIND_PATTERN_NODE: {
+        // Find patterns in pattern matching are triggered by using commas in
+        // a pattern or wrapping it in braces and using a splat on both the left
+        // and right side of the pattern. This looks like:
+        //
+        //     foo => [*, 1, 2, 3, *]
+        //
+        // There can be any number of requireds in the middle. The splats on
+        // both sides can optionally have names attached.
+        const pm_find_pattern_node_t *cast = (const pm_find_pattern_node_t *) node;
+        const size_t size = cast->requireds.size;
+
+        LABEL *match_failed_label = NEW_LABEL(location.line);
+        LABEL *type_error_label = NEW_LABEL(location.line);
+        LABEL *deconstruct_label = NEW_LABEL(location.line);
+        LABEL *deconstructed_label = NEW_LABEL(location.line);
+
+        if (cast->constant) {
+            CHECK(pm_compile_pattern_constant(iseq, scope_node, cast->constant, ret, match_failed_label, in_single_pattern, base_index));
+        }
+
+        CHECK(pm_compile_pattern_deconstruct(iseq, scope_node, node, ret, deconstruct_label, match_failed_label, deconstructed_label, type_error_label, in_single_pattern, use_deconstructed_cache, base_index));
+
+        PUSH_INSN(ret, location, dup);
+        PUSH_SEND(ret, location, idLength, INT2FIX(0));
+        PUSH_INSN1(ret, location, putobject, INT2FIX(size));
+        PUSH_SEND(ret, location, idGE, INT2FIX(1));
+        if (in_single_pattern) {
+            CHECK(pm_compile_pattern_length_error(iseq, scope_node, node, ret, rb_fstring_lit("%p length mismatch (given %p, expected %p+)"), INT2FIX(size), base_index + 1));
+        }
+        PUSH_INSNL(ret, location, branchunless, match_failed_label);
+
+        {
+            LABEL *while_begin_label = NEW_LABEL(location.line);
+            LABEL *next_loop_label = NEW_LABEL(location.line);
+            LABEL *find_succeeded_label = NEW_LABEL(location.line);
+            LABEL *find_failed_label = NEW_LABEL(location.line);
+
+            PUSH_INSN(ret, location, dup);
+            PUSH_SEND(ret, location, idLength, INT2FIX(0));
+
+            PUSH_INSN(ret, location, dup);
+            PUSH_INSN1(ret, location, putobject, INT2FIX(size));
+            PUSH_SEND(ret, location, idMINUS, INT2FIX(1));
+            PUSH_INSN1(ret, location, putobject, INT2FIX(0));
+            PUSH_LABEL(ret, while_begin_label);
+
+            PUSH_INSN(ret, location, dup);
+            PUSH_INSN1(ret, location, topn, INT2FIX(2));
+            PUSH_SEND(ret, location, idLE, INT2FIX(1));
+            PUSH_INSNL(ret, location, branchunless, find_failed_label);
+
+            for (size_t index = 0; index < size; index++) {
+                PUSH_INSN1(ret, location, topn, INT2FIX(3));
+                PUSH_INSN1(ret, location, topn, INT2FIX(1));
+
+                if (index != 0) {
+                    PUSH_INSN1(ret, location, putobject, INT2FIX(index));
+                    PUSH_SEND(ret, location, idPLUS, INT2FIX(1));
+                }
+
+                PUSH_SEND(ret, location, idAREF, INT2FIX(1));
+                CHECK(pm_compile_pattern_match(iseq, scope_node, cast->requireds.nodes[index], ret, next_loop_label, in_single_pattern, in_alternation_pattern, false, base_index + 4));
+            }
+
+            const pm_splat_node_t *left = cast->left;
+
+            if (left->expression != NULL) {
+                PUSH_INSN1(ret, location, topn, INT2FIX(3));
+                PUSH_INSN1(ret, location, putobject, INT2FIX(0));
+                PUSH_INSN1(ret, location, topn, INT2FIX(2));
+                PUSH_SEND(ret, location, idAREF, INT2FIX(2));
+                CHECK(pm_compile_pattern_match(iseq, scope_node, left->expression, ret, find_failed_label, in_single_pattern, in_alternation_pattern, false, base_index + 4));
+            }
+
+            RUBY_ASSERT(PM_NODE_TYPE_P(cast->right, PM_SPLAT_NODE));
+            const pm_splat_node_t *right = (const pm_splat_node_t *) cast->right;
+
+            if (right->expression != NULL) {
+                PUSH_INSN1(ret, location, topn, INT2FIX(3));
+                PUSH_INSN1(ret, location, topn, INT2FIX(1));
+                PUSH_INSN1(ret, location, putobject, INT2FIX(size));
+                PUSH_SEND(ret, location, idPLUS, INT2FIX(1));
+                PUSH_INSN1(ret, location, topn, INT2FIX(3));
+                PUSH_SEND(ret, location, idAREF, INT2FIX(2));
+                pm_compile_pattern_match(iseq, scope_node, right->expression, ret, find_failed_label, in_single_pattern, in_alternation_pattern, false, base_index + 4);
+            }
+
+            PUSH_INSNL(ret, location, jump, find_succeeded_label);
+
+            PUSH_LABEL(ret, next_loop_label);
+            PUSH_INSN1(ret, location, putobject, INT2FIX(1));
+            PUSH_SEND(ret, location, idPLUS, INT2FIX(1));
+            PUSH_INSNL(ret, location, jump, while_begin_label);
+
+            PUSH_LABEL(ret, find_failed_label);
+            PUSH_INSN1(ret, location, adjuststack, INT2FIX(3));
+            if (in_single_pattern) {
+                PUSH_INSN1(ret, location, putspecialobject, INT2FIX(VM_SPECIAL_OBJECT_VMCORE));
+
+                {
+                    VALUE operand = rb_fstring_lit("%p does not match to find pattern");
+                    PUSH_INSN1(ret, location, putobject, operand);
+                }
+
+                PUSH_INSN1(ret, location, topn, INT2FIX(2));
+                PUSH_SEND(ret, location, id_core_sprintf, INT2FIX(2));
+                PUSH_INSN1(ret, location, setn, INT2FIX(base_index + PM_PATTERN_BASE_INDEX_OFFSET_ERROR_STRING + 1));
+
+                PUSH_INSN1(ret, location, putobject, Qfalse);
+                PUSH_INSN1(ret, location, setn, INT2FIX(base_index + PM_PATTERN_BASE_INDEX_OFFSET_KEY_ERROR_P + 2));
+
+                PUSH_INSN(ret, location, pop);
+                PUSH_INSN(ret, location, pop);
+            }
+            PUSH_INSNL(ret, location, jump, match_failed_label);
+            PUSH_INSN1(ret, location, dupn, INT2FIX(3));
+
+            PUSH_LABEL(ret, find_succeeded_label);
+            PUSH_INSN1(ret, location, adjuststack, INT2FIX(3));
+        }
+
+        PUSH_INSN(ret, location, pop);
+        PUSH_INSNL(ret, location, jump, matched_label);
+        PUSH_INSN(ret, location, putnil);
+
+        PUSH_LABEL(ret, type_error_label);
+        PUSH_INSN1(ret, location, putspecialobject, INT2FIX(VM_SPECIAL_OBJECT_VMCORE));
+        PUSH_INSN1(ret, location, putobject, rb_eTypeError);
+
+        {
+            VALUE operand = rb_fstring_lit("deconstruct must return Array");
+            PUSH_INSN1(ret, location, putobject, operand);
+        }
+
+        PUSH_SEND(ret, location, id_core_raise, INT2FIX(2));
+        PUSH_INSN(ret, location, pop);
+
+        PUSH_LABEL(ret, match_failed_label);
+        PUSH_INSN(ret, location, pop);
+        PUSH_INSNL(ret, location, jump, unmatched_label);
+
+        break;
+      }
+      case PM_HASH_PATTERN_NODE: {
+        // Hash patterns in pattern matching are triggered by using labels and
+        // values in a pattern or by using the ** operator. They are represented
+        // by the HashPatternNode. This looks like:
+        //
+        //     foo => { a: 1, b: 2, **bar }
+        //
+        // It can optionally have an assoc splat in the middle of it, which can
+        // optionally have a name.
+        const pm_hash_pattern_node_t *cast = (const pm_hash_pattern_node_t *) node;
+
+        // We don't consider it a "rest" parameter if it's a ** that is unnamed.
+        bool has_rest = cast->rest != NULL && !(PM_NODE_TYPE_P(cast->rest, PM_ASSOC_SPLAT_NODE) && ((const pm_assoc_splat_node_t *) cast->rest)->value == NULL);
+        bool has_keys = cast->elements.size > 0 || cast->rest != NULL;
+
+        LABEL *match_failed_label = NEW_LABEL(location.line);
+        LABEL *type_error_label = NEW_LABEL(location.line);
+        VALUE keys = Qnil;
+
+        if (has_keys && !has_rest) {
+            keys = rb_ary_new_capa(cast->elements.size);
+
+            for (size_t index = 0; index < cast->elements.size; index++) {
+                const pm_node_t *element = cast->elements.nodes[index];
+                RUBY_ASSERT(PM_NODE_TYPE_P(element, PM_ASSOC_NODE));
+
+                const pm_node_t *key = ((const pm_assoc_node_t *) element)->key;
+                RUBY_ASSERT(PM_NODE_TYPE_P(key, PM_SYMBOL_NODE));
+
+                VALUE symbol = ID2SYM(parse_string_symbol(scope_node, (const pm_symbol_node_t *) key));
+                rb_ary_push(keys, symbol);
+            }
+        }
+
+        if (cast->constant) {
+            CHECK(pm_compile_pattern_constant(iseq, scope_node, cast->constant, ret, match_failed_label, in_single_pattern, base_index));
+        }
+
+        PUSH_INSN(ret, location, dup);
+
+        {
+            VALUE operand = ID2SYM(rb_intern("deconstruct_keys"));
+            PUSH_INSN1(ret, location, putobject, operand);
+        }
+
+        PUSH_SEND(ret, location, idRespond_to, INT2FIX(1));
+        if (in_single_pattern) {
+            CHECK(pm_compile_pattern_generic_error(iseq, scope_node, node, ret, rb_fstring_lit("%p does not respond to #deconstruct_keys"), base_index + 1));
+        }
+        PUSH_INSNL(ret, location, branchunless, match_failed_label);
+
+        if (NIL_P(keys)) {
+            PUSH_INSN(ret, location, putnil);
+        }
+        else {
+            PUSH_INSN1(ret, location, duparray, keys);
+            RB_OBJ_WRITTEN(iseq, Qundef, rb_obj_hide(keys));
+        }
+        PUSH_SEND(ret, location, rb_intern("deconstruct_keys"), INT2FIX(1));
+
+        PUSH_INSN(ret, location, dup);
+        PUSH_INSN1(ret, location, checktype, INT2FIX(T_HASH));
+        PUSH_INSNL(ret, location, branchunless, type_error_label);
+
+        if (has_rest) {
+            PUSH_SEND(ret, location, rb_intern("dup"), INT2FIX(0));
+        }
+
+        if (has_keys) {
+            DECL_ANCHOR(match_values);
+
+            for (size_t index = 0; index < cast->elements.size; index++) {
+                const pm_node_t *element = cast->elements.nodes[index];
+                RUBY_ASSERT(PM_NODE_TYPE_P(element, PM_ASSOC_NODE));
+
+                const pm_assoc_node_t *assoc = (const pm_assoc_node_t *) element;
+                const pm_node_t *key = assoc->key;
+                RUBY_ASSERT(PM_NODE_TYPE_P(key, PM_SYMBOL_NODE));
+
+                VALUE symbol = ID2SYM(parse_string_symbol(scope_node, (const pm_symbol_node_t *) key));
+                PUSH_INSN(ret, location, dup);
+                PUSH_INSN1(ret, location, putobject, symbol);
+                PUSH_SEND(ret, location, rb_intern("key?"), INT2FIX(1));
+
+                if (in_single_pattern) {
+                    LABEL *match_succeeded_label = NEW_LABEL(location.line);
+
+                    PUSH_INSN(ret, location, dup);
+                    PUSH_INSNL(ret, location, branchif, match_succeeded_label);
+
+                    {
+                        VALUE operand = rb_str_freeze(rb_sprintf("key not found: %+"PRIsVALUE, symbol));
+                        PUSH_INSN1(ret, location, putobject, operand);
+                    }
+
+                    PUSH_INSN1(ret, location, setn, INT2FIX(base_index + PM_PATTERN_BASE_INDEX_OFFSET_ERROR_STRING + 2));
+                    PUSH_INSN1(ret, location, putobject, Qtrue);
+                    PUSH_INSN1(ret, location, setn, INT2FIX(base_index + PM_PATTERN_BASE_INDEX_OFFSET_KEY_ERROR_P + 3));
+                    PUSH_INSN1(ret, location, topn, INT2FIX(3));
+                    PUSH_INSN1(ret, location, setn, INT2FIX(base_index + PM_PATTERN_BASE_INDEX_OFFSET_KEY_ERROR_MATCHEE + 4));
+                    PUSH_INSN1(ret, location, putobject, symbol);
+                    PUSH_INSN1(ret, location, setn, INT2FIX(base_index + PM_PATTERN_BASE_INDEX_OFFSET_KEY_ERROR_KEY + 5));
+
+                    PUSH_INSN1(ret, location, adjuststack, INT2FIX(4));
+                    PUSH_LABEL(ret, match_succeeded_label);
+                }
+
+                PUSH_INSNL(ret, location, branchunless, match_failed_label);
+                PUSH_INSN(match_values, location, dup);
+                PUSH_INSN1(match_values, location, putobject, symbol);
+                PUSH_SEND(match_values, location, has_rest ? rb_intern("delete") : idAREF, INT2FIX(1));
+
+                const pm_node_t *value = assoc->value;
+                if (PM_NODE_TYPE_P(value, PM_IMPLICIT_NODE)) {
+                    value = ((const pm_implicit_node_t *) value)->value;
+                }
+
+                CHECK(pm_compile_pattern_match(iseq, scope_node, value, match_values, match_failed_label, in_single_pattern, in_alternation_pattern, false, base_index + 1));
+            }
+
+            PUSH_SEQ(ret, match_values);
+        }
+        else {
+            PUSH_INSN(ret, location, dup);
+            PUSH_SEND(ret, location, idEmptyP, INT2FIX(0));
+            if (in_single_pattern) {
+                CHECK(pm_compile_pattern_generic_error(iseq, scope_node, node, ret, rb_fstring_lit("%p is not empty"), base_index + 1));
+            }
+            PUSH_INSNL(ret, location, branchunless, match_failed_label);
+        }
+
+        if (has_rest) {
+            switch (PM_NODE_TYPE(cast->rest)) {
+              case PM_NO_KEYWORDS_PARAMETER_NODE: {
+                PUSH_INSN(ret, location, dup);
+                PUSH_SEND(ret, location, idEmptyP, INT2FIX(0));
+                if (in_single_pattern) {
+                    pm_compile_pattern_generic_error(iseq, scope_node, node, ret, rb_fstring_lit("rest of %p is not empty"), base_index + 1);
+                }
+                PUSH_INSNL(ret, location, branchunless, match_failed_label);
+                break;
+              }
+              case PM_ASSOC_SPLAT_NODE: {
+                const pm_assoc_splat_node_t *splat = (const pm_assoc_splat_node_t *) cast->rest;
+                PUSH_INSN(ret, location, dup);
+                pm_compile_pattern_match(iseq, scope_node, splat->value, ret, match_failed_label, in_single_pattern, in_alternation_pattern, false, base_index + 1);
+                break;
+              }
+              default:
+                rb_bug("unreachable");
+                break;
+            }
+        }
+
+        PUSH_INSN(ret, location, pop);
+        PUSH_INSNL(ret, location, jump, matched_label);
+        PUSH_INSN(ret, location, putnil);
+
+        PUSH_LABEL(ret, type_error_label);
+        PUSH_INSN1(ret, location, putspecialobject, INT2FIX(VM_SPECIAL_OBJECT_VMCORE));
+        PUSH_INSN1(ret, location, putobject, rb_eTypeError);
+
+        {
+            VALUE operand = rb_fstring_lit("deconstruct_keys must return Hash");
+            PUSH_INSN1(ret, location, putobject, operand);
+        }
+
+        PUSH_SEND(ret, location, id_core_raise, INT2FIX(2));
+        PUSH_INSN(ret, location, pop);
+
+        PUSH_LABEL(ret, match_failed_label);
+        PUSH_INSN(ret, location, pop);
+        PUSH_INSNL(ret, location, jump, unmatched_label);
+        break;
+      }
+      case PM_CAPTURE_PATTERN_NODE: {
+        // Capture patterns allow you to pattern match against an element in a
+        // pattern and also capture the value into a local variable. This looks
+        // like:
+        //
+        //     [1] => [Integer => foo]
+        //
+        // In this case the `Integer => foo` will be represented by a
+        // CapturePatternNode, which has both a value (the pattern to match
+        // against) and a target (the place to write the variable into).
+        const pm_capture_pattern_node_t *cast = (const pm_capture_pattern_node_t *) node;
+
+        LABEL *match_failed_label = NEW_LABEL(location.line);
+
+        PUSH_INSN(ret, location, dup);
+        CHECK(pm_compile_pattern_match(iseq, scope_node, cast->value, ret, match_failed_label, in_single_pattern, in_alternation_pattern, use_deconstructed_cache, base_index + 1));
+        CHECK(pm_compile_pattern(iseq, scope_node, (const pm_node_t *) cast->target, ret, matched_label, match_failed_label, in_single_pattern, in_alternation_pattern, false, base_index));
+        PUSH_INSN(ret, location, putnil);
+
+        PUSH_LABEL(ret, match_failed_label);
+        PUSH_INSN(ret, location, pop);
+        PUSH_INSNL(ret, location, jump, unmatched_label);
+
+        break;
+      }
+      case PM_LOCAL_VARIABLE_TARGET_NODE: {
+        // Local variables can be targeted by placing identifiers in the place
+        // of a pattern. For example, foo in bar. This results in the value
+        // being matched being written to that local variable.
+        const pm_local_variable_target_node_t *cast = (const pm_local_variable_target_node_t *) node;
+        pm_local_index_t index = pm_lookup_local_index(iseq, scope_node, cast->name, cast->depth);
+
+        // If this local variable is being written from within an alternation
+        // pattern, then it cannot actually be added to the local table since
+        // it's ambiguous which value should be used. So instead we indicate
+        // this with a compile error.
+        if (in_alternation_pattern) {
+            ID id = pm_constant_id_lookup(scope_node, cast->name);
+            const char *name = rb_id2name(id);
+
+            if (name && strlen(name) > 0 && name[0] != '_') {
+                COMPILE_ERROR(iseq, location.line, "illegal variable in alternative pattern (%"PRIsVALUE")", rb_id2str(id));
+                return COMPILE_NG;
+            }
+        }
+
+        PUSH_SETLOCAL(ret, location, index.index, index.level);
+        PUSH_INSNL(ret, location, jump, matched_label);
+        break;
+      }
+      case PM_ALTERNATION_PATTERN_NODE: {
+        // Alternation patterns allow you to specify multiple patterns in a
+        // single expression using the | operator.
+        const pm_alternation_pattern_node_t *cast = (const pm_alternation_pattern_node_t *) node;
+
+        LABEL *matched_left_label = NEW_LABEL(location.line);
+        LABEL *unmatched_left_label = NEW_LABEL(location.line);
+
+        // First, we're going to attempt to match against the left pattern. If
+        // that pattern matches, then we'll skip matching the right pattern.
+        PUSH_INSN(ret, location, dup);
+        CHECK(pm_compile_pattern(iseq, scope_node, cast->left, ret, matched_left_label, unmatched_left_label, in_single_pattern, true, use_deconstructed_cache, base_index + 1));
+
+        // If we get here, then we matched on the left pattern. In this case we
+        // should pop out the duplicate value that we preemptively added to
+        // match against the right pattern and then jump to the match label.
+        PUSH_LABEL(ret, matched_left_label);
+        PUSH_INSN(ret, location, pop);
+        PUSH_INSNL(ret, location, jump, matched_label);
+        PUSH_INSN(ret, location, putnil);
+
+        // If we get here, then we didn't match on the left pattern. In this
+        // case we attempt to match against the right pattern.
+        PUSH_LABEL(ret, unmatched_left_label);
+        CHECK(pm_compile_pattern(iseq, scope_node, cast->right, ret, matched_label, unmatched_label, in_single_pattern, true, use_deconstructed_cache, base_index));
+        break;
+      }
+      case PM_PARENTHESES_NODE:
+        // Parentheses are allowed to wrap expressions in pattern matching and
+        // they do nothing since they can only wrap individual expressions and
+        // not groups. In this case we'll recurse back into this same function
+        // with the body of the parentheses.
+        return pm_compile_pattern(iseq, scope_node, ((const pm_parentheses_node_t *) node)->body, ret, matched_label, unmatched_label, in_single_pattern, in_alternation_pattern, use_deconstructed_cache, base_index);
+      case PM_PINNED_EXPRESSION_NODE:
+        // Pinned expressions are a way to match against the value of an
+        // expression that should be evaluated at runtime. This looks like:
+        // foo in ^(bar). To compile these, we compile the expression as if it
+        // were a literal value by falling through to the literal case.
+        node = ((const pm_pinned_expression_node_t *) node)->expression;
+        /* fallthrough */
+      case PM_ARRAY_NODE:
+      case PM_CLASS_VARIABLE_READ_NODE:
+      case PM_CONSTANT_PATH_NODE:
+      case PM_CONSTANT_READ_NODE:
+      case PM_FALSE_NODE:
+      case PM_FLOAT_NODE:
+      case PM_GLOBAL_VARIABLE_READ_NODE:
+      case PM_IMAGINARY_NODE:
+      case PM_INSTANCE_VARIABLE_READ_NODE:
+      case PM_IT_LOCAL_VARIABLE_READ_NODE:
+      case PM_INTEGER_NODE:
+      case PM_INTERPOLATED_REGULAR_EXPRESSION_NODE:
+      case PM_INTERPOLATED_STRING_NODE:
+      case PM_INTERPOLATED_SYMBOL_NODE:
+      case PM_INTERPOLATED_X_STRING_NODE:
+      case PM_LAMBDA_NODE:
+      case PM_LOCAL_VARIABLE_READ_NODE:
+      case PM_NIL_NODE:
+      case PM_SOURCE_ENCODING_NODE:
+      case PM_SOURCE_FILE_NODE:
+      case PM_SOURCE_LINE_NODE:
+      case PM_RANGE_NODE:
+      case PM_RATIONAL_NODE:
+      case PM_REGULAR_EXPRESSION_NODE:
+      case PM_SELF_NODE:
+      case PM_STRING_NODE:
+      case PM_SYMBOL_NODE:
+      case PM_TRUE_NODE:
+      case PM_X_STRING_NODE: {
+        // These nodes are all simple patterns, which means we'll use the
+        // checkmatch instruction to match against them, which is effectively a
+        // VM-level === operator.
+        PM_COMPILE_NOT_POPPED(node);
+        if (in_single_pattern) {
+            PUSH_INSN1(ret, location, dupn, INT2FIX(2));
+        }
+
+        PUSH_INSN1(ret, location, checkmatch, INT2FIX(VM_CHECKMATCH_TYPE_CASE));
+
+        if (in_single_pattern) {
+            pm_compile_pattern_eqq_error(iseq, scope_node, node, ret, base_index + 2);
+        }
+
+        PUSH_INSNL(ret, location, branchif, matched_label);
+        PUSH_INSNL(ret, location, jump, unmatched_label);
+        break;
+      }
+      case PM_PINNED_VARIABLE_NODE: {
+        // Pinned variables are a way to match against the value of a variable
+        // without it looking like you're trying to write to the variable. This
+        // looks like: foo in ^@bar. To compile these, we compile the variable
+        // that they hold.
+        const pm_pinned_variable_node_t *cast = (const pm_pinned_variable_node_t *) node;
+        CHECK(pm_compile_pattern(iseq, scope_node, cast->variable, ret, matched_label, unmatched_label, in_single_pattern, in_alternation_pattern, true, base_index));
+        break;
+      }
+      case PM_IF_NODE:
+      case PM_UNLESS_NODE: {
+        // If and unless nodes can show up here as guards on `in` clauses. This
+        // looks like:
+        //
+        //     case foo
+        //     in bar if baz?
+        //       qux
+        //     end
+        //
+        // Because we know they're in the modifier form and they can't have any
+        // variation on this pattern, we compile them differently (more simply)
+        // here than we would in the normal compilation path.
+        const pm_node_t *predicate;
+        const pm_node_t *statement;
+
+        if (PM_NODE_TYPE_P(node, PM_IF_NODE)) {
+            const pm_if_node_t *cast = (const pm_if_node_t *) node;
+            predicate = cast->predicate;
+
+            RUBY_ASSERT(cast->statements != NULL && cast->statements->body.size == 1);
+            statement = cast->statements->body.nodes[0];
+        }
+        else {
+            const pm_unless_node_t *cast = (const pm_unless_node_t *) node;
+            predicate = cast->predicate;
+
+            RUBY_ASSERT(cast->statements != NULL && cast->statements->body.size == 1);
+            statement = cast->statements->body.nodes[0];
+        }
+
+        CHECK(pm_compile_pattern_match(iseq, scope_node, statement, ret, unmatched_label, in_single_pattern, in_alternation_pattern, use_deconstructed_cache, base_index));
+        PM_COMPILE_NOT_POPPED(predicate);
+
+        if (in_single_pattern) {
+            LABEL *match_succeeded_label = NEW_LABEL(location.line);
+
+            PUSH_INSN(ret, location, dup);
+            if (PM_NODE_TYPE_P(node, PM_IF_NODE)) {
+                PUSH_INSNL(ret, location, branchif, match_succeeded_label);
+            }
+            else {
+                PUSH_INSNL(ret, location, branchunless, match_succeeded_label);
+            }
+
+            {
+                VALUE operand = rb_fstring_lit("guard clause does not return true");
+                PUSH_INSN1(ret, location, putobject, operand);
+            }
+
+            PUSH_INSN1(ret, location, setn, INT2FIX(base_index + PM_PATTERN_BASE_INDEX_OFFSET_ERROR_STRING + 1));
+            PUSH_INSN1(ret, location, putobject, Qfalse);
+            PUSH_INSN1(ret, location, setn, INT2FIX(base_index + PM_PATTERN_BASE_INDEX_OFFSET_KEY_ERROR_P + 2));
+
+            PUSH_INSN(ret, location, pop);
+            PUSH_INSN(ret, location, pop);
+
+            PUSH_LABEL(ret, match_succeeded_label);
+        }
+
+        if (PM_NODE_TYPE_P(node, PM_IF_NODE)) {
+            PUSH_INSNL(ret, location, branchunless, unmatched_label);
+        }
+        else {
+            PUSH_INSNL(ret, location, branchif, unmatched_label);
+        }
+
+        PUSH_INSNL(ret, location, jump, matched_label);
+        break;
+      }
+      default:
+        // If we get here, then we have a node type that should not be in this
+        // position. This would be a bug in the parser, because a different node
+        // type should never have been created in this position in the tree.
+        rb_bug("Unexpected node type in pattern matching expression: %s", pm_node_type_to_str(PM_NODE_TYPE(node)));
+        break;
+    }
+
+    return COMPILE_OK;
+}
+
+#undef PM_PATTERN_BASE_INDEX_OFFSET_DECONSTRUCTED_CACHE
+#undef PM_PATTERN_BASE_INDEX_OFFSET_ERROR_STRING
+#undef PM_PATTERN_BASE_INDEX_OFFSET_KEY_ERROR_P
+#undef PM_PATTERN_BASE_INDEX_OFFSET_KEY_ERROR_MATCHEE
+#undef PM_PATTERN_BASE_INDEX_OFFSET_KEY_ERROR_KEY
+
+// Generate a scope node from the given node.
+void
+pm_scope_node_init(const pm_node_t *node, pm_scope_node_t *scope, pm_scope_node_t *previous)
+{
+    // This is very important, otherwise the scope node could be seen as having
+    // certain flags set that _should not_ be set.
+    memset(scope, 0, sizeof(pm_scope_node_t));
+
+    scope->base.type = PM_SCOPE_NODE;
+    scope->base.location.start = node->location.start;
+    scope->base.location.end = node->location.end;
+
+    scope->previous = previous;
+    scope->ast_node = (pm_node_t *) node;
+
+    if (previous) {
+        scope->parser = previous->parser;
+        scope->encoding = previous->encoding;
+        scope->filepath_encoding = previous->filepath_encoding;
+        scope->constants = previous->constants;
+        scope->coverage_enabled = previous->coverage_enabled;
+        scope->script_lines = previous->script_lines;
+    }
+
+    switch (PM_NODE_TYPE(node)) {
+      case PM_BLOCK_NODE: {
+        const pm_block_node_t *cast = (const pm_block_node_t *) node;
+        scope->body = cast->body;
+        scope->locals = cast->locals;
+        scope->parameters = cast->parameters;
+        break;
+      }
+      case PM_CLASS_NODE: {
+        const pm_class_node_t *cast = (const pm_class_node_t *) node;
+        scope->body = cast->body;
+        scope->locals = cast->locals;
+        break;
+      }
+      case PM_DEF_NODE: {
+        const pm_def_node_t *cast = (const pm_def_node_t *) node;
+        scope->parameters = (pm_node_t *) cast->parameters;
+        scope->body = cast->body;
+        scope->locals = cast->locals;
+        break;
+      }
+      case PM_ENSURE_NODE: {
+        const pm_ensure_node_t *cast = (const pm_ensure_node_t *) node;
+        scope->body = (pm_node_t *) node;
+
+        if (cast->statements != NULL) {
+            scope->base.location.start = cast->statements->base.location.start;
+            scope->base.location.end = cast->statements->base.location.end;
+        }
+
+        break;
+      }
+      case PM_FOR_NODE: {
+        const pm_for_node_t *cast = (const pm_for_node_t *) node;
+        scope->body = (pm_node_t *) cast->statements;
+        break;
+      }
+      case PM_INTERPOLATED_REGULAR_EXPRESSION_NODE: {
+        RUBY_ASSERT(node->flags & PM_REGULAR_EXPRESSION_FLAGS_ONCE);
+        scope->body = (pm_node_t *) node;
+        break;
+      }
+      case PM_LAMBDA_NODE: {
+        const pm_lambda_node_t *cast = (const pm_lambda_node_t *) node;
+        scope->parameters = cast->parameters;
+        scope->body = cast->body;
+        scope->locals = cast->locals;
+
+        if (cast->parameters != NULL) {
+            scope->base.location.start = cast->parameters->location.start;
+        }
+        else {
+            scope->base.location.start = cast->operator_loc.end;
+        }
+        break;
+      }
+      case PM_MODULE_NODE: {
+        const pm_module_node_t *cast = (const pm_module_node_t *) node;
+        scope->body = cast->body;
+        scope->locals = cast->locals;
+        break;
+      }
+      case PM_POST_EXECUTION_NODE: {
+        const pm_post_execution_node_t *cast = (const pm_post_execution_node_t *) node;
+        scope->body = (pm_node_t *) cast->statements;
+        break;
+      }
+      case PM_PROGRAM_NODE: {
+        const pm_program_node_t *cast = (const pm_program_node_t *) node;
+        scope->body = (pm_node_t *) cast->statements;
+        scope->locals = cast->locals;
+        break;
+      }
+      case PM_RESCUE_NODE: {
+        const pm_rescue_node_t *cast = (const pm_rescue_node_t *) node;
+        scope->body = (pm_node_t *) cast->statements;
+        break;
+      }
+      case PM_RESCUE_MODIFIER_NODE: {
+        const pm_rescue_modifier_node_t *cast = (const pm_rescue_modifier_node_t *) node;
+        scope->body = (pm_node_t *) cast->rescue_expression;
+        break;
+      }
+      case PM_SINGLETON_CLASS_NODE: {
+        const pm_singleton_class_node_t *cast = (const pm_singleton_class_node_t *) node;
+        scope->body = cast->body;
+        scope->locals = cast->locals;
+        break;
+      }
+      case PM_STATEMENTS_NODE: {
+        const pm_statements_node_t *cast = (const pm_statements_node_t *) node;
+        scope->body = (pm_node_t *) cast;
+        break;
+      }
+      default:
+        rb_bug("unreachable");
+        break;
+    }
+}
+
+void
+pm_scope_node_destroy(pm_scope_node_t *scope_node)
+{
+    if (scope_node->index_lookup_table) {
+        st_free_table(scope_node->index_lookup_table);
+    }
+}
+
+/**
+ * We need to put the label "retry_end_l" immediately after the last "send"
+ * instruction. This because vm_throw checks if the break cont is equal to the
+ * index of next insn of the "send". (Otherwise, it is considered
+ * "break from proc-closure". See "TAG_BREAK" handling in "vm_throw_start".)
+ *
+ * Normally, "send" instruction is at the last. However, qcall under branch
+ * coverage measurement adds some instructions after the "send".
+ *
+ * Note that "invokesuper", "invokesuperforward" appears instead of "send".
+ */
+static void
+pm_compile_retry_end_label(rb_iseq_t *iseq, LINK_ANCHOR *const ret, LABEL *retry_end_l)
+{
+    INSN *iobj;
+    LINK_ELEMENT *last_elem = LAST_ELEMENT(ret);
+    iobj = IS_INSN(last_elem) ? (INSN*) last_elem : (INSN*) get_prev_insn((INSN*) last_elem);
+    while (!IS_INSN_ID(iobj, send) && !IS_INSN_ID(iobj, invokesuper) && !IS_INSN_ID(iobj, sendforward) && !IS_INSN_ID(iobj, invokesuperforward)) {
+        iobj = (INSN*) get_prev_insn(iobj);
+    }
+    ELEM_INSERT_NEXT(&iobj->link, (LINK_ELEMENT*) retry_end_l);
+
+    // LINK_ANCHOR has a pointer to the last element, but
+    // ELEM_INSERT_NEXT does not update it even if we add an insn to the
+    // last of LINK_ANCHOR. So this updates it manually.
+    if (&iobj->link == LAST_ELEMENT(ret)) {
+        ret->last = (LINK_ELEMENT*) retry_end_l;
+    }
+}
+
+static const char *
+pm_iseq_builtin_function_name(const pm_scope_node_t *scope_node, const pm_node_t *receiver, ID method_id)
+{
+    const char *name = rb_id2name(method_id);
+    static const char prefix[] = "__builtin_";
+    const size_t prefix_len = sizeof(prefix) - 1;
+
+    if (receiver == NULL) {
+        if (UNLIKELY(strncmp(prefix, name, prefix_len) == 0)) {
+            // __builtin_foo
+            return &name[prefix_len];
+        }
+    }
+    else if (PM_NODE_TYPE_P(receiver, PM_CALL_NODE)) {
+        if (PM_NODE_FLAG_P(receiver, PM_CALL_NODE_FLAGS_VARIABLE_CALL)) {
+            const pm_call_node_t *cast = (const pm_call_node_t *) receiver;
+            if (pm_constant_id_lookup(scope_node, cast->name) == rb_intern_const("__builtin")) {
+                // __builtin.foo
+                return name;
+            }
+        }
+    }
+    else if (PM_NODE_TYPE_P(receiver, PM_CONSTANT_READ_NODE)) {
+        const pm_constant_read_node_t *cast = (const pm_constant_read_node_t *) receiver;
+        if (pm_constant_id_lookup(scope_node, cast->name) == rb_intern_const("Primitive")) {
+            // Primitive.foo
+            return name;
+        }
+    }
+
+    return NULL;
+}
+
+// Compile Primitive.attr! :leaf, ...
+static int
+pm_compile_builtin_attr(rb_iseq_t *iseq, const pm_scope_node_t *scope_node, const pm_arguments_node_t *arguments, const pm_node_location_t *node_location)
+{
+    if (arguments == NULL) {
+        COMPILE_ERROR(iseq, node_location->line, "attr!: no argument");
+        return COMPILE_NG;
+    }
+
+    const pm_node_t *argument;
+    PM_NODE_LIST_FOREACH(&arguments->arguments, index, argument) {
+        if (!PM_NODE_TYPE_P(argument, PM_SYMBOL_NODE)) {
+            COMPILE_ERROR(iseq, node_location->line, "non symbol argument to attr!: %s", pm_node_type_to_str(PM_NODE_TYPE(argument)));
+            return COMPILE_NG;
+        }
+
+        VALUE symbol = pm_static_literal_value(iseq, argument, scope_node);
+        VALUE string = rb_sym2str(symbol);
+
+        if (strcmp(RSTRING_PTR(string), "leaf") == 0) {
+            ISEQ_BODY(iseq)->builtin_attrs |= BUILTIN_ATTR_LEAF;
+        }
+        else if (strcmp(RSTRING_PTR(string), "inline_block") == 0) {
+            ISEQ_BODY(iseq)->builtin_attrs |= BUILTIN_ATTR_INLINE_BLOCK;
+        }
+        else if (strcmp(RSTRING_PTR(string), "use_block") == 0) {
+            iseq_set_use_block(iseq);
+        }
+        else if (strcmp(RSTRING_PTR(string), "c_trace") == 0) {
+            // Let the iseq act like a C method in backtraces
+            ISEQ_BODY(iseq)->builtin_attrs |= BUILTIN_ATTR_C_TRACE;
+        }
+        else {
+            COMPILE_ERROR(iseq, node_location->line, "unknown argument to attr!: %s", RSTRING_PTR(string));
+            return COMPILE_NG;
+        }
+    }
+
+    return COMPILE_OK;
+}
+
+static int
+pm_compile_builtin_arg(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const pm_scope_node_t *scope_node, const pm_arguments_node_t *arguments, const pm_node_location_t *node_location, int popped)
+{
+    if (arguments == NULL) {
+        COMPILE_ERROR(iseq, node_location->line, "arg!: no argument");
+        return COMPILE_NG;
+    }
+
+    if (arguments->arguments.size != 1) {
+        COMPILE_ERROR(iseq, node_location->line, "arg!: too many argument");
+        return COMPILE_NG;
+    }
+
+    const pm_node_t *argument = arguments->arguments.nodes[0];
+    if (!PM_NODE_TYPE_P(argument, PM_SYMBOL_NODE)) {
+        COMPILE_ERROR(iseq, node_location->line, "non symbol argument to arg!: %s", pm_node_type_to_str(PM_NODE_TYPE(argument)));
+        return COMPILE_NG;
+    }
+
+    if (!popped) {
+        ID name = parse_string_symbol(scope_node, ((const pm_symbol_node_t *) argument));
+        int index = ISEQ_BODY(ISEQ_BODY(iseq)->local_iseq)->local_table_size - get_local_var_idx(iseq, name);
+
+        debugs("id: %s idx: %d\n", rb_id2name(name), index);
+        PUSH_GETLOCAL(ret, *node_location, index, get_lvar_level(iseq));
+    }
+
+    return COMPILE_OK;
+}
+
+static int
+pm_compile_builtin_mandatory_only_method(rb_iseq_t *iseq, pm_scope_node_t *scope_node, const pm_call_node_t *call_node, const pm_node_location_t *node_location)
+{
+    const pm_node_t *ast_node = scope_node->ast_node;
+    if (!PM_NODE_TYPE_P(ast_node, PM_DEF_NODE)) {
+        rb_bug("mandatory_only?: not in method definition");
+        return COMPILE_NG;
+    }
+
+    const pm_def_node_t *def_node = (const pm_def_node_t *) ast_node;
+    const pm_parameters_node_t *parameters_node = def_node->parameters;
+    if (parameters_node == NULL) {
+        rb_bug("mandatory_only?: in method definition with no parameters");
+        return COMPILE_NG;
+    }
+
+    const pm_node_t *body_node = def_node->body;
+    if (body_node == NULL || !PM_NODE_TYPE_P(body_node, PM_STATEMENTS_NODE) || (((const pm_statements_node_t *) body_node)->body.size != 1) || !PM_NODE_TYPE_P(((const pm_statements_node_t *) body_node)->body.nodes[0], PM_IF_NODE)) {
+        rb_bug("mandatory_only?: not in method definition with plain statements");
+        return COMPILE_NG;
+    }
+
+    const pm_if_node_t *if_node = (const pm_if_node_t *) ((const pm_statements_node_t *) body_node)->body.nodes[0];
+    if (if_node->predicate != ((const pm_node_t *) call_node)) {
+        rb_bug("mandatory_only?: can't find mandatory node");
+        return COMPILE_NG;
+    }
+
+    pm_parameters_node_t parameters = {
+        .base = parameters_node->base,
+        .requireds = parameters_node->requireds
+    };
+
+    const pm_def_node_t def = {
+        .base = def_node->base,
+        .name = def_node->name,
+        .receiver = def_node->receiver,
+        .parameters = &parameters,
+        .body = (pm_node_t *) if_node->statements,
+        .locals = {
+            .ids = def_node->locals.ids,
+            .size = parameters_node->requireds.size,
+            .capacity = def_node->locals.capacity
+        }
+    };
+
+    pm_scope_node_t next_scope_node;
+    pm_scope_node_init(&def.base, &next_scope_node, scope_node);
+
+    int error_state;
+    const rb_iseq_t *mandatory_only_iseq = pm_iseq_new_with_opt(
+        &next_scope_node,
+        rb_iseq_base_label(iseq),
+        rb_iseq_path(iseq),
+        rb_iseq_realpath(iseq),
+        node_location->line,
+        NULL,
+        0,
+        ISEQ_TYPE_METHOD,
+        ISEQ_COMPILE_DATA(iseq)->option,
+        &error_state
+    );
+    RB_OBJ_WRITE(iseq, &ISEQ_BODY(iseq)->mandatory_only_iseq, (VALUE)mandatory_only_iseq);
+
+    if (error_state) {
+        RUBY_ASSERT(ISEQ_BODY(iseq)->mandatory_only_iseq == NULL);
+        rb_jump_tag(error_state);
+    }
+
+    pm_scope_node_destroy(&next_scope_node);
+    return COMPILE_OK;
+}
+
+static int
+pm_compile_builtin_function_call(rb_iseq_t *iseq, LINK_ANCHOR *const ret, pm_scope_node_t *scope_node, const pm_call_node_t *call_node, const pm_node_location_t *node_location, int popped, const rb_iseq_t *parent_block, const char *builtin_func)
+{
+    const pm_arguments_node_t *arguments = call_node->arguments;
+
+    if (parent_block != NULL) {
+        COMPILE_ERROR(iseq, node_location->line, "should not call builtins here.");
+        return COMPILE_NG;
+    }
+
+#define BUILTIN_INLINE_PREFIX "_bi"
+    char inline_func[sizeof(BUILTIN_INLINE_PREFIX) + DECIMAL_SIZE_OF(int)];
+    bool cconst = false;
+retry:;
+    const struct rb_builtin_function *bf = iseq_builtin_function_lookup(iseq, builtin_func);
+
+    if (bf == NULL) {
+        if (strcmp("cstmt!", builtin_func) == 0 || strcmp("cexpr!", builtin_func) == 0) {
+            // ok
+        }
+        else if (strcmp("cconst!", builtin_func) == 0) {
+            cconst = true;
+        }
+        else if (strcmp("cinit!", builtin_func) == 0) {
+            // ignore
+            return COMPILE_OK;
+        }
+        else if (strcmp("attr!", builtin_func) == 0) {
+            return pm_compile_builtin_attr(iseq, scope_node, arguments, node_location);
+        }
+        else if (strcmp("arg!", builtin_func) == 0) {
+            return pm_compile_builtin_arg(iseq, ret, scope_node, arguments, node_location, popped);
+        }
+        else if (strcmp("mandatory_only?", builtin_func) == 0) {
+            if (popped) {
+                rb_bug("mandatory_only? should be in if condition");
+            }
+            else if (!LIST_INSN_SIZE_ZERO(ret)) {
+                rb_bug("mandatory_only? should be put on top");
+            }
+
+            PUSH_INSN1(ret, *node_location, putobject, Qfalse);
+            return pm_compile_builtin_mandatory_only_method(iseq, scope_node, call_node, node_location);
+        }
+        else if (1) {
+            rb_bug("can't find builtin function:%s", builtin_func);
+        }
+        else {
+            COMPILE_ERROR(iseq, node_location->line, "can't find builtin function:%s", builtin_func);
+            return COMPILE_NG;
+        }
+
+        int inline_index = node_location->line;
+        snprintf(inline_func, sizeof(inline_func), BUILTIN_INLINE_PREFIX "%d", inline_index);
+        builtin_func = inline_func;
+        arguments = NULL;
+        goto retry;
+    }
+
+    if (cconst) {
+        typedef VALUE(*builtin_func0)(void *, VALUE);
+        VALUE const_val = (*(builtin_func0)(uintptr_t)bf->func_ptr)(NULL, Qnil);
+        PUSH_INSN1(ret, *node_location, putobject, const_val);
+        return COMPILE_OK;
+    }
+
+    // fprintf(stderr, "func_name:%s -> %p\n", builtin_func, bf->func_ptr);
+
+    DECL_ANCHOR(args_seq);
+
+    int flags = 0;
+    struct rb_callinfo_kwarg *keywords = NULL;
+    int argc = pm_setup_args(arguments, call_node->block, &flags, &keywords, iseq, args_seq, scope_node, node_location);
+
+    if (argc != bf->argc) {
+        COMPILE_ERROR(iseq, node_location->line, "argc is not match for builtin function:%s (expect %d but %d)", builtin_func, bf->argc, argc);
+        return COMPILE_NG;
+    }
+
+    unsigned int start_index;
+    if (delegate_call_p(iseq, argc, args_seq, &start_index)) {
+        PUSH_INSN2(ret, *node_location, opt_invokebuiltin_delegate, bf, INT2FIX(start_index));
+    }
+    else {
+        PUSH_SEQ(ret, args_seq);
+        PUSH_INSN1(ret, *node_location, invokebuiltin, bf);
+    }
+
+    if (popped) PUSH_INSN(ret, *node_location, pop);
+    return COMPILE_OK;
+}
+
+/**
+ * Compile a call node into the given iseq.
+ */
+static void
+pm_compile_call(rb_iseq_t *iseq, const pm_call_node_t *call_node, LINK_ANCHOR *const ret, bool popped, pm_scope_node_t *scope_node, ID method_id, LABEL *start)
+{
+    const pm_location_t *message_loc = &call_node->message_loc;
+    if (message_loc->start == NULL) message_loc = &call_node->base.location;
+
+    const pm_node_location_t location = PM_LOCATION_START_LOCATION(scope_node->parser, message_loc, call_node->base.node_id);
+
+    LABEL *else_label = NEW_LABEL(location.line);
+    LABEL *end_label = NEW_LABEL(location.line);
+    LABEL *retry_end_l = NEW_LABEL(location.line);
+
+    VALUE branches = Qfalse;
+    rb_code_location_t code_location = { 0 };
+    int node_id = location.node_id;
+
+    if (PM_NODE_FLAG_P(call_node, PM_CALL_NODE_FLAGS_SAFE_NAVIGATION)) {
+        if (PM_BRANCH_COVERAGE_P(iseq)) {
+            const uint8_t *cursors[3] = {
+                call_node->closing_loc.end,
+                call_node->arguments == NULL ? NULL : call_node->arguments->base.location.end,
+                call_node->message_loc.end
+            };
+
+            const uint8_t *end_cursor = cursors[0];
+            end_cursor = (end_cursor == NULL || cursors[1] == NULL) ? cursors[1] : (end_cursor > cursors[1] ? end_cursor : cursors[1]);
+            end_cursor = (end_cursor == NULL || cursors[2] == NULL) ? cursors[2] : (end_cursor > cursors[2] ? end_cursor : cursors[2]);
+            if (!end_cursor) end_cursor = call_node->closing_loc.end;
+
+            const pm_line_column_t start_location = PM_NODE_START_LINE_COLUMN(scope_node->parser, call_node);
+            const pm_line_column_t end_location = pm_newline_list_line_column(&scope_node->parser->newline_list, end_cursor, scope_node->parser->start_line);
+
+            code_location = (rb_code_location_t) {
+                .beg_pos = { .lineno = start_location.line, .column = start_location.column },
+                .end_pos = { .lineno = end_location.line, .column = end_location.column }
+            };
+
+            branches = decl_branch_base(iseq, PTR2NUM(call_node), &code_location, "&.");
+        }
+
+        PUSH_INSN(ret, location, dup);
+        PUSH_INSNL(ret, location, branchnil, else_label);
+
+        add_trace_branch_coverage(iseq, ret, &code_location, node_id, 0, "then", branches);
+    }
+
+    LINK_ELEMENT *opt_new_prelude = LAST_ELEMENT(ret);
+
+    int flags = 0;
+    struct rb_callinfo_kwarg *kw_arg = NULL;
+
+    int orig_argc = pm_setup_args(call_node->arguments, call_node->block, &flags, &kw_arg, iseq, ret, scope_node, &location);
+    const rb_iseq_t *previous_block = ISEQ_COMPILE_DATA(iseq)->current_block;
+    const rb_iseq_t *block_iseq = NULL;
+
+    if (call_node->block != NULL && PM_NODE_TYPE_P(call_node->block, PM_BLOCK_NODE)) {
+        // Scope associated with the block
+        pm_scope_node_t next_scope_node;
+        pm_scope_node_init(call_node->block, &next_scope_node, scope_node);
+
+        block_iseq = NEW_CHILD_ISEQ(&next_scope_node, make_name_for_block(iseq), ISEQ_TYPE_BLOCK, pm_node_line_number(scope_node->parser, call_node->block));
+        pm_scope_node_destroy(&next_scope_node);
+        ISEQ_COMPILE_DATA(iseq)->current_block = block_iseq;
+    }
+    else {
+        if (PM_NODE_FLAG_P(call_node, PM_CALL_NODE_FLAGS_VARIABLE_CALL)) {
+            flags |= VM_CALL_VCALL;
+        }
+
+        if (!flags) {
+            flags |= VM_CALL_ARGS_SIMPLE;
+        }
+    }
+
+    if (PM_NODE_FLAG_P(call_node, PM_CALL_NODE_FLAGS_IGNORE_VISIBILITY)) {
+        flags |= VM_CALL_FCALL;
+    }
+
+    if (!popped && PM_NODE_FLAG_P(call_node, PM_CALL_NODE_FLAGS_ATTRIBUTE_WRITE)) {
+        if (flags & VM_CALL_ARGS_BLOCKARG) {
+            PUSH_INSN1(ret, location, topn, INT2FIX(1));
+            if (flags & VM_CALL_ARGS_SPLAT) {
+                PUSH_INSN1(ret, location, putobject, INT2FIX(-1));
+                PUSH_SEND_WITH_FLAG(ret, location, idAREF, INT2FIX(1), INT2FIX(0));
+            }
+            PUSH_INSN1(ret, location, setn, INT2FIX(orig_argc + 3));
+            PUSH_INSN(ret, location, pop);
+        }
+        else if (flags & VM_CALL_ARGS_SPLAT) {
+            PUSH_INSN(ret, location, dup);
+            PUSH_INSN1(ret, location, putobject, INT2FIX(-1));
+            PUSH_SEND_WITH_FLAG(ret, location, idAREF, INT2FIX(1), INT2FIX(0));
+            PUSH_INSN1(ret, location, setn, INT2FIX(orig_argc + 2));
+            PUSH_INSN(ret, location, pop);
+        }
+        else {
+            PUSH_INSN1(ret, location, setn, INT2FIX(orig_argc + 1));
+        }
+    }
+
+    if ((flags & VM_CALL_KW_SPLAT) && (flags & VM_CALL_ARGS_BLOCKARG) && !(flags & VM_CALL_KW_SPLAT_MUT)) {
+        PUSH_INSN(ret, location, splatkw);
+    }
+
+    LABEL *not_basic_new = NEW_LABEL(location.line);
+    LABEL *not_basic_new_finish = NEW_LABEL(location.line);
+
+    bool inline_new = ISEQ_COMPILE_DATA(iseq)->option->specialized_instruction &&
+        method_id == rb_intern("new") &&
+        call_node->block == NULL &&
+        (flags & VM_CALL_ARGS_BLOCKARG) == 0;
+
+    if (inline_new) {
+        if (LAST_ELEMENT(ret) == opt_new_prelude) {
+            PUSH_INSN(ret, location, putnil);
+            PUSH_INSN(ret, location, swap);
+        }
+        else {
+            ELEM_INSERT_NEXT(opt_new_prelude, &new_insn_body(iseq, location.line, location.node_id, BIN(swap), 0)->link);
+            ELEM_INSERT_NEXT(opt_new_prelude, &new_insn_body(iseq, location.line, location.node_id, BIN(putnil), 0)->link);
+        }
+
+        // Jump unless the receiver uses the "basic" implementation of "new"
+        VALUE ci;
+        if (flags & VM_CALL_FORWARDING) {
+            ci = (VALUE)new_callinfo(iseq, method_id, orig_argc + 1, flags, kw_arg, 0);
+        }
+        else {
+            ci = (VALUE)new_callinfo(iseq, method_id, orig_argc, flags, kw_arg, 0);
+        }
+
+        PUSH_INSN2(ret, location, opt_new, ci, not_basic_new);
+        LABEL_REF(not_basic_new);
+        // optimized path
+        PUSH_SEND_R(ret, location, rb_intern("initialize"), INT2FIX(orig_argc), block_iseq, INT2FIX(flags | VM_CALL_FCALL), kw_arg);
+        PUSH_INSNL(ret, location, jump, not_basic_new_finish);
+
+        PUSH_LABEL(ret, not_basic_new);
+        // Fall back to normal send
+        PUSH_SEND_R(ret, location, method_id, INT2FIX(orig_argc), block_iseq, INT2FIX(flags), kw_arg);
+        PUSH_INSN(ret, location, swap);
+
+        PUSH_LABEL(ret, not_basic_new_finish);
+        PUSH_INSN(ret, location, pop);
+    }
+    else {
+        PUSH_SEND_R(ret, location, method_id, INT2FIX(orig_argc), block_iseq, INT2FIX(flags), kw_arg);
+    }
+
+    if (block_iseq && ISEQ_BODY(block_iseq)->catch_table) {
+        pm_compile_retry_end_label(iseq, ret, retry_end_l);
+        PUSH_CATCH_ENTRY(CATCH_TYPE_BREAK, start, retry_end_l, block_iseq, retry_end_l);
+    }
+
+    if (PM_NODE_FLAG_P(call_node, PM_CALL_NODE_FLAGS_SAFE_NAVIGATION)) {
+        PUSH_INSNL(ret, location, jump, end_label);
+        PUSH_LABEL(ret, else_label);
+        add_trace_branch_coverage(iseq, ret, &code_location, node_id, 1, "else", branches);
+        PUSH_LABEL(ret, end_label);
+    }
+
+    if (PM_NODE_FLAG_P(call_node, PM_CALL_NODE_FLAGS_ATTRIBUTE_WRITE) && !popped) {
+        PUSH_INSN(ret, location, pop);
+    }
+
+    if (popped) PUSH_INSN(ret, location, pop);
+    ISEQ_COMPILE_DATA(iseq)->current_block = previous_block;
+}
+
+/**
+ * Compile and return the VALUE associated with the given back reference read
+ * node.
+ */
+static inline VALUE
+pm_compile_back_reference_ref(const pm_back_reference_read_node_t *node)
+{
+    const char *type = (const char *) (node->base.location.start + 1);
+
+    // Since a back reference is `$<char>`, Ruby represents the ID as an
+    // rb_intern on the value after the `$`.
+    return INT2FIX(rb_intern2(type, 1)) << 1 | 1;
+}
+
+/**
+ * Compile and return the VALUE associated with the given numbered reference
+ * read node.
+ */
+static inline VALUE
+pm_compile_numbered_reference_ref(const pm_numbered_reference_read_node_t *node)
+{
+    return INT2FIX(node->number << 1);
+}
+
+static void
+pm_compile_defined_expr0(rb_iseq_t *iseq, const pm_node_t *node, const pm_node_location_t *node_location, LINK_ANCHOR *const ret, bool popped, pm_scope_node_t *scope_node, bool in_condition, LABEL **lfinish, bool explicit_receiver)
+{
+#define PUSH_VAL(type) (in_condition ? Qtrue : rb_iseq_defined_string(type))
+
+    // in_condition is the same as compile.c's needstr
+    enum defined_type dtype = DEFINED_NOT_DEFINED;
+    const pm_node_location_t location = *node_location;
+
+    switch (PM_NODE_TYPE(node)) {
+/* DEFINED_NIL ****************************************************************/
+      case PM_NIL_NODE:
+        // defined?(nil)
+        //          ^^^
+        dtype = DEFINED_NIL;
+        break;
+/* DEFINED_IVAR ***************************************************************/
+      case PM_INSTANCE_VARIABLE_READ_NODE: {
+        // defined?(@a)
+        //          ^^
+        const pm_instance_variable_read_node_t *cast = (const pm_instance_variable_read_node_t *) node;
+        ID name = pm_constant_id_lookup(scope_node, cast->name);
+
+        PUSH_INSN3(ret, location, definedivar, ID2SYM(name), get_ivar_ic_value(iseq, name), PUSH_VAL(DEFINED_IVAR));
+
+        return;
+      }
+/* DEFINED_LVAR ***************************************************************/
+      case PM_LOCAL_VARIABLE_READ_NODE:
+        // a = 1; defined?(a)
+        //                 ^
+      case PM_IT_LOCAL_VARIABLE_READ_NODE:
+        // 1.then { defined?(it) }
+        //                   ^^
+        dtype = DEFINED_LVAR;
+        break;
+/* DEFINED_GVAR ***************************************************************/
+      case PM_GLOBAL_VARIABLE_READ_NODE: {
+        // defined?($a)
+        //          ^^
+        const pm_global_variable_read_node_t *cast = (const pm_global_variable_read_node_t *) node;
+        ID name = pm_constant_id_lookup(scope_node, cast->name);
+
+        PUSH_INSN(ret, location, putnil);
+        PUSH_INSN3(ret, location, defined, INT2FIX(DEFINED_GVAR), ID2SYM(name), PUSH_VAL(DEFINED_GVAR));
+
+        return;
+      }
+/* DEFINED_CVAR ***************************************************************/
+      case PM_CLASS_VARIABLE_READ_NODE: {
+        // defined?(@@a)
+        //          ^^^
+        const pm_class_variable_read_node_t *cast = (const pm_class_variable_read_node_t *) node;
+        ID name = pm_constant_id_lookup(scope_node, cast->name);
+
+        PUSH_INSN(ret, location, putnil);
+        PUSH_INSN3(ret, location, defined, INT2FIX(DEFINED_CVAR), ID2SYM(name), PUSH_VAL(DEFINED_CVAR));
+
+        return;
+      }
+/* DEFINED_CONST **************************************************************/
+      case PM_CONSTANT_READ_NODE: {
+        // defined?(A)
+        //          ^
+        const pm_constant_read_node_t *cast = (const pm_constant_read_node_t *) node;
+        ID name = pm_constant_id_lookup(scope_node, cast->name);
+
+        PUSH_INSN(ret, location, putnil);
+        PUSH_INSN3(ret, location, defined, INT2FIX(DEFINED_CONST), ID2SYM(name), PUSH_VAL(DEFINED_CONST));
+
+        return;
+      }
+/* DEFINED_YIELD **************************************************************/
+      case PM_YIELD_NODE:
+        // defined?(yield)
+        //          ^^^^^
+        iseq_set_use_block(ISEQ_BODY(iseq)->local_iseq);
+
+        PUSH_INSN(ret, location, putnil);
+        PUSH_INSN3(ret, location, defined, INT2FIX(DEFINED_YIELD), 0, PUSH_VAL(DEFINED_YIELD));
+
+        return;
+/* DEFINED_ZSUPER *************************************************************/
+      case PM_SUPER_NODE: {
+        // defined?(super 1, 2)
+        //          ^^^^^^^^^^
+        const pm_super_node_t *cast = (const pm_super_node_t *) node;
+
+        if (cast->block != NULL && !PM_NODE_TYPE_P(cast->block, PM_BLOCK_ARGUMENT_NODE)) {
+            dtype = DEFINED_EXPR;
+            break;
+        }
+
+        PUSH_INSN(ret, location, putnil);
+        PUSH_INSN3(ret, location, defined, INT2FIX(DEFINED_ZSUPER), 0, PUSH_VAL(DEFINED_ZSUPER));
+        return;
+      }
+      case PM_FORWARDING_SUPER_NODE: {
+        // defined?(super)
+        //          ^^^^^
+        const pm_forwarding_super_node_t *cast = (const pm_forwarding_super_node_t *) node;
+
+        if (cast->block != NULL) {
+            dtype = DEFINED_EXPR;
+            break;
+        }
+
+        PUSH_INSN(ret, location, putnil);
+        PUSH_INSN3(ret, location, defined, INT2FIX(DEFINED_ZSUPER), 0, PUSH_VAL(DEFINED_ZSUPER));
+        return;
+      }
+/* DEFINED_SELF ***************************************************************/
+      case PM_SELF_NODE:
+        // defined?(self)
+        //          ^^^^
+        dtype = DEFINED_SELF;
+        break;
+/* DEFINED_TRUE ***************************************************************/
+      case PM_TRUE_NODE:
+        // defined?(true)
+        //          ^^^^
+        dtype = DEFINED_TRUE;
+        break;
+/* DEFINED_FALSE **************************************************************/
+      case PM_FALSE_NODE:
+        // defined?(false)
+        //          ^^^^^
+        dtype = DEFINED_FALSE;
+        break;
+/* DEFINED_ASGN ***************************************************************/
+      case PM_CALL_AND_WRITE_NODE:
+        // defined?(a.a &&= 1)
+        //          ^^^^^^^^^
+      case PM_CALL_OPERATOR_WRITE_NODE:
+        // defined?(a.a += 1)
+        //          ^^^^^^^^
+      case PM_CALL_OR_WRITE_NODE:
+        // defined?(a.a ||= 1)
+        //          ^^^^^^^^^
+      case PM_CLASS_VARIABLE_AND_WRITE_NODE:
+        // defined?(@@a &&= 1)
+        //          ^^^^^^^^^
+      case PM_CLASS_VARIABLE_OPERATOR_WRITE_NODE:
+        // defined?(@@a += 1)
+        //          ^^^^^^^^
+      case PM_CLASS_VARIABLE_OR_WRITE_NODE:
+        // defined?(@@a ||= 1)
+        //          ^^^^^^^^^
+      case PM_CLASS_VARIABLE_WRITE_NODE:
+        // defined?(@@a = 1)
+        //          ^^^^^^^
+      case PM_CONSTANT_AND_WRITE_NODE:
+        // defined?(A &&= 1)
+        //          ^^^^^^^
+      case PM_CONSTANT_OPERATOR_WRITE_NODE:
+        // defined?(A += 1)
+        //          ^^^^^^
+      case PM_CONSTANT_OR_WRITE_NODE:
+        // defined?(A ||= 1)
+        //          ^^^^^^^
+      case PM_CONSTANT_PATH_AND_WRITE_NODE:
+        // defined?(A::A &&= 1)
+        //          ^^^^^^^^^^
+      case PM_CONSTANT_PATH_OPERATOR_WRITE_NODE:
+        // defined?(A::A += 1)
+        //          ^^^^^^^^^
+      case PM_CONSTANT_PATH_OR_WRITE_NODE:
+        // defined?(A::A ||= 1)
+        //          ^^^^^^^^^^
+      case PM_CONSTANT_PATH_WRITE_NODE:
+        // defined?(A::A = 1)
+        //          ^^^^^^^^
+      case PM_CONSTANT_WRITE_NODE:
+        // defined?(A = 1)
+        //          ^^^^^
+      case PM_GLOBAL_VARIABLE_AND_WRITE_NODE:
+        // defined?($a &&= 1)
+        //          ^^^^^^^^
+      case PM_GLOBAL_VARIABLE_OPERATOR_WRITE_NODE:
+        // defined?($a += 1)
+        //          ^^^^^^^
+      case PM_GLOBAL_VARIABLE_OR_WRITE_NODE:
+        // defined?($a ||= 1)
+        //          ^^^^^^^^
+      case PM_GLOBAL_VARIABLE_WRITE_NODE:
+        // defined?($a = 1)
+        //          ^^^^^^
+      case PM_INDEX_AND_WRITE_NODE:
+        // defined?(a[1] &&= 1)
+        //          ^^^^^^^^^^
+      case PM_INDEX_OPERATOR_WRITE_NODE:
+        // defined?(a[1] += 1)
+        //          ^^^^^^^^^
+      case PM_INDEX_OR_WRITE_NODE:
+        // defined?(a[1] ||= 1)
+        //          ^^^^^^^^^^
+      case PM_INSTANCE_VARIABLE_AND_WRITE_NODE:
+        // defined?(@a &&= 1)
+        //          ^^^^^^^^
+      case PM_INSTANCE_VARIABLE_OPERATOR_WRITE_NODE:
+        // defined?(@a += 1)
+        //          ^^^^^^^
+      case PM_INSTANCE_VARIABLE_OR_WRITE_NODE:
+        // defined?(@a ||= 1)
+        //          ^^^^^^^^
+      case PM_INSTANCE_VARIABLE_WRITE_NODE:
+        // defined?(@a = 1)
+        //          ^^^^^^
+      case PM_LOCAL_VARIABLE_AND_WRITE_NODE:
+        // defined?(a &&= 1)
+        //          ^^^^^^^
+      case PM_LOCAL_VARIABLE_OPERATOR_WRITE_NODE:
+        // defined?(a += 1)
+        //          ^^^^^^
+      case PM_LOCAL_VARIABLE_OR_WRITE_NODE:
+        // defined?(a ||= 1)
+        //          ^^^^^^^
+      case PM_LOCAL_VARIABLE_WRITE_NODE:
+        // defined?(a = 1)
+        //          ^^^^^
+      case PM_MULTI_WRITE_NODE:
+        // defined?((a, = 1))
+        //           ^^^^^^
+        dtype = DEFINED_ASGN;
+        break;
+/* DEFINED_EXPR ***************************************************************/
+      case PM_ALIAS_GLOBAL_VARIABLE_NODE:
+        // defined?((alias $a $b))
+        //           ^^^^^^^^^^^
+      case PM_ALIAS_METHOD_NODE:
+        // defined?((alias a b))
+        //           ^^^^^^^^^
+      case PM_AND_NODE:
+        // defined?(a and b)
+        //          ^^^^^^^
+      case PM_BREAK_NODE:
+        // defined?(break 1)
+        //          ^^^^^^^
+      case PM_CASE_MATCH_NODE:
+        // defined?(case 1; in 1; end)
+        //          ^^^^^^^^^^^^^^^^^
+      case PM_CASE_NODE:
+        // defined?(case 1; when 1; end)
+        //          ^^^^^^^^^^^^^^^^^^^
+      case PM_CLASS_NODE:
+        // defined?(class Foo; end)
+        //          ^^^^^^^^^^^^^^
+      case PM_DEF_NODE:
+        // defined?(def a() end)
+        //          ^^^^^^^^^^^
+      case PM_DEFINED_NODE:
+        // defined?(defined?(a))
+        //          ^^^^^^^^^^^
+      case PM_FLIP_FLOP_NODE:
+        // defined?(not (a .. b))
+        //               ^^^^^^
+      case PM_FLOAT_NODE:
+        // defined?(1.0)
+        //          ^^^
+      case PM_FOR_NODE:
+        // defined?(for a in 1 do end)
+        //          ^^^^^^^^^^^^^^^^^
+      case PM_IF_NODE:
+        // defined?(if a then end)
+        //          ^^^^^^^^^^^^^
+      case PM_IMAGINARY_NODE:
+        // defined?(1i)
+        //          ^^
+      case PM_INTEGER_NODE:
+        // defined?(1)
+        //          ^
+      case PM_INTERPOLATED_MATCH_LAST_LINE_NODE:
+        // defined?(not /#{1}/)
+        //              ^^^^^^
+      case PM_INTERPOLATED_REGULAR_EXPRESSION_NODE:
+        // defined?(/#{1}/)
+        //          ^^^^^^
+      case PM_INTERPOLATED_STRING_NODE:
+        // defined?("#{1}")
+        //          ^^^^^^
+      case PM_INTERPOLATED_SYMBOL_NODE:
+        // defined?(:"#{1}")
+        //          ^^^^^^^
+      case PM_INTERPOLATED_X_STRING_NODE:
+        // defined?(`#{1}`)
+        //          ^^^^^^
+      case PM_LAMBDA_NODE:
+        // defined?(-> {})
+        //          ^^^^^
+      case PM_MATCH_LAST_LINE_NODE:
+        // defined?(not //)
+        //          ^^^^^^
+      case PM_MATCH_PREDICATE_NODE:
+        // defined?(1 in 1)
+        //          ^^^^^^
+      case PM_MATCH_REQUIRED_NODE:
+        // defined?(1 => 1)
+        //          ^^^^^^
+      case PM_MATCH_WRITE_NODE:
+        // defined?(/(?<a>)/ =~ "")
+        //          ^^^^^^^^^^^^^^
+      case PM_MODULE_NODE:
+        // defined?(module A end)
+        //          ^^^^^^^^^^^^
+      case PM_NEXT_NODE:
+        // defined?(next 1)
+        //          ^^^^^^
+      case PM_OR_NODE:
+        // defined?(a or b)
+        //          ^^^^^^
+      case PM_POST_EXECUTION_NODE:
+        // defined?((END {}))
+        //          ^^^^^^^^
+      case PM_RANGE_NODE:
+        // defined?(1..1)
+        //          ^^^^
+      case PM_RATIONAL_NODE:
+        // defined?(1r)
+        //          ^^
+      case PM_REDO_NODE:
+        // defined?(redo)
+        //          ^^^^
+      case PM_REGULAR_EXPRESSION_NODE:
+        // defined?(//)
+        //          ^^
+      case PM_RESCUE_MODIFIER_NODE:
+        // defined?(a rescue b)
+        //          ^^^^^^^^^^
+      case PM_RETRY_NODE:
+        // defined?(retry)
+        //          ^^^^^
+      case PM_RETURN_NODE:
+        // defined?(return)
+        //          ^^^^^^
+      case PM_SINGLETON_CLASS_NODE:
+        // defined?(class << self; end)
+        //          ^^^^^^^^^^^^^^^^^^
+      case PM_SOURCE_ENCODING_NODE:
+        // defined?(__ENCODING__)
+        //          ^^^^^^^^^^^^
+      case PM_SOURCE_FILE_NODE:
+        // defined?(__FILE__)
+        //          ^^^^^^^^
+      case PM_SOURCE_LINE_NODE:
+        // defined?(__LINE__)
+        //          ^^^^^^^^
+      case PM_STRING_NODE:
+        // defined?("")
+        //          ^^
+      case PM_SYMBOL_NODE:
+        // defined?(:a)
+        //          ^^
+      case PM_UNDEF_NODE:
+        // defined?((undef a))
+        //           ^^^^^^^
+      case PM_UNLESS_NODE:
+        // defined?(unless a then end)
+        //          ^^^^^^^^^^^^^^^^^
+      case PM_UNTIL_NODE:
+        // defined?(until a do end)
+        //          ^^^^^^^^^^^^^^
+      case PM_WHILE_NODE:
+        // defined?(while a do end)
+        //          ^^^^^^^^^^^^^^
+      case PM_X_STRING_NODE:
+        // defined?(``)
+        //          ^^
+        dtype = DEFINED_EXPR;
+        break;
+/* DEFINED_REF ****************************************************************/
+      case PM_BACK_REFERENCE_READ_NODE: {
+        // defined?($+)
+        //          ^^
+        const pm_back_reference_read_node_t *cast = (const pm_back_reference_read_node_t *) node;
+        VALUE ref = pm_compile_back_reference_ref(cast);
+
+        PUSH_INSN(ret, location, putnil);
+        PUSH_INSN3(ret, location, defined, INT2FIX(DEFINED_REF), ref, PUSH_VAL(DEFINED_GVAR));
+
+        return;
+      }
+      case PM_NUMBERED_REFERENCE_READ_NODE: {
+        // defined?($1)
+        //          ^^
+        const pm_numbered_reference_read_node_t *cast = (const pm_numbered_reference_read_node_t *) node;
+        VALUE ref = pm_compile_numbered_reference_ref(cast);
+
+        PUSH_INSN(ret, location, putnil);
+        PUSH_INSN3(ret, location, defined, INT2FIX(DEFINED_REF), ref, PUSH_VAL(DEFINED_GVAR));
+
+        return;
+      }
+/* DEFINED_CONST_FROM *********************************************************/
+      case PM_CONSTANT_PATH_NODE: {
+        // defined?(A::A)
+        //          ^^^^
+        const pm_constant_path_node_t *cast = (const pm_constant_path_node_t *) node;
+        ID name = pm_constant_id_lookup(scope_node, cast->name);
+
+        if (cast->parent != NULL) {
+            if (!lfinish[1]) lfinish[1] = NEW_LABEL(location.line);
+            pm_compile_defined_expr0(iseq, cast->parent, node_location, ret, popped, scope_node, true, lfinish, false);
+
+            PUSH_INSNL(ret, location, branchunless, lfinish[1]);
+            PM_COMPILE(cast->parent);
+        }
+        else {
+            PUSH_INSN1(ret, location, putobject, rb_cObject);
+        }
+
+        PUSH_INSN3(ret, location, defined, INT2FIX(DEFINED_CONST_FROM), ID2SYM(name), PUSH_VAL(DEFINED_CONST));
+        return;
+      }
+/* Containers *****************************************************************/
+      case PM_BEGIN_NODE: {
+        // defined?(begin end)
+        //          ^^^^^^^^^
+        const pm_begin_node_t *cast = (const pm_begin_node_t *) node;
+
+        if (cast->rescue_clause == NULL && cast->ensure_clause == NULL && cast->else_clause == NULL) {
+            if (cast->statements == NULL) {
+                // If we have empty statements, then we want to return "nil".
+                dtype = DEFINED_NIL;
+            }
+            else if (cast->statements->body.size == 1) {
+                // If we have a begin node that is wrapping a single statement
+                // then we want to recurse down to that statement and compile
+                // it.
+                pm_compile_defined_expr0(iseq, cast->statements->body.nodes[0], node_location, ret, popped, scope_node, in_condition, lfinish, false);
+                return;
+            }
+            else {
+                // Otherwise, we have a begin wrapping multiple statements, in
+                // which case this is defined as "expression".
+                dtype = DEFINED_EXPR;
+            }
+        } else {
+            // If we have any of the other clauses besides the main begin/end,
+            // this is defined as "expression".
+            dtype = DEFINED_EXPR;
+        }
+
+        break;
+      }
+      case PM_PARENTHESES_NODE: {
+        // defined?(())
+        //          ^^
+        const pm_parentheses_node_t *cast = (const pm_parentheses_node_t *) node;
+
+        if (cast->body == NULL) {
+            // If we have empty parentheses, then we want to return "nil".
+            dtype = DEFINED_NIL;
+        }
+        else if (PM_NODE_TYPE_P(cast->body, PM_STATEMENTS_NODE) && !PM_NODE_FLAG_P(cast, PM_PARENTHESES_NODE_FLAGS_MULTIPLE_STATEMENTS)) {
+            // If we have a parentheses node that is wrapping a single statement
+            // then we want to recurse down to that statement and compile it.
+            pm_compile_defined_expr0(iseq, ((const pm_statements_node_t *) cast->body)->body.nodes[0], node_location, ret, popped, scope_node, in_condition, lfinish, false);
+            return;
+        }
+        else {
+            // Otherwise, we have parentheses wrapping multiple statements, in
+            // which case this is defined as "expression".
+            dtype = DEFINED_EXPR;
+        }
+
+        break;
+      }
+      case PM_ARRAY_NODE: {
+        // defined?([])
+        //          ^^
+        const pm_array_node_t *cast = (const pm_array_node_t *) node;
+
+        if (cast->elements.size > 0 && !lfinish[1]) {
+            lfinish[1] = NEW_LABEL(location.line);
+        }
+
+        for (size_t index = 0; index < cast->elements.size; index++) {
+            pm_compile_defined_expr0(iseq, cast->elements.nodes[index], node_location, ret, popped, scope_node, true, lfinish, false);
+            PUSH_INSNL(ret, location, branchunless, lfinish[1]);
+        }
+
+        dtype = DEFINED_EXPR;
+        break;
+      }
+      case PM_HASH_NODE:
+        // defined?({ a: 1 })
+        //          ^^^^^^^^
+      case PM_KEYWORD_HASH_NODE: {
+        // defined?(a(a: 1))
+        //            ^^^^
+        const pm_node_list_t *elements;
+
+        if (PM_NODE_TYPE_P(node, PM_HASH_NODE)) {
+            elements = &((const pm_hash_node_t *) node)->elements;
+        }
+        else {
+            elements = &((const pm_keyword_hash_node_t *) node)->elements;
+        }
+
+        if (elements->size > 0 && !lfinish[1]) {
+            lfinish[1] = NEW_LABEL(location.line);
+        }
+
+        for (size_t index = 0; index < elements->size; index++) {
+            pm_compile_defined_expr0(iseq, elements->nodes[index], node_location, ret, popped, scope_node, true, lfinish, false);
+            PUSH_INSNL(ret, location, branchunless, lfinish[1]);
+        }
+
+        dtype = DEFINED_EXPR;
+        break;
+      }
+      case PM_ASSOC_NODE: {
+        // defined?({ a: 1 })
+        //            ^^^^
+        const pm_assoc_node_t *cast = (const pm_assoc_node_t *) node;
+
+        pm_compile_defined_expr0(iseq, cast->key, node_location, ret, popped, scope_node, true, lfinish, false);
+        PUSH_INSNL(ret, location, branchunless, lfinish[1]);
+        pm_compile_defined_expr0(iseq, cast->value, node_location, ret, popped, scope_node, true, lfinish, false);
+
+        return;
+      }
+      case PM_ASSOC_SPLAT_NODE: {
+        // defined?({ **a })
+        //            ^^^^
+        const pm_assoc_splat_node_t *cast = (const pm_assoc_splat_node_t *) node;
+
+        if (cast->value == NULL) {
+            dtype = DEFINED_EXPR;
+            break;
+        }
+
+        pm_compile_defined_expr0(iseq, cast->value, node_location, ret, popped, scope_node, true, lfinish, false);
+        return;
+      }
+      case PM_IMPLICIT_NODE: {
+        // defined?({ a: })
+        //            ^^
+        const pm_implicit_node_t *cast = (const pm_implicit_node_t *) node;
+        pm_compile_defined_expr0(iseq, cast->value, node_location, ret, popped, scope_node, in_condition, lfinish, false);
+        return;
+      }
+      case PM_CALL_NODE: {
+#define BLOCK_P(cast) ((cast)->block != NULL && PM_NODE_TYPE_P((cast)->block, PM_BLOCK_NODE))
+
+        // defined?(a(1, 2, 3))
+        //          ^^^^^^^^^^
+        const pm_call_node_t *cast = ((const pm_call_node_t *) node);
+
+        if (BLOCK_P(cast)) {
+            dtype = DEFINED_EXPR;
+            break;
+        }
+
+        if (cast->receiver || cast->arguments || (cast->block && PM_NODE_TYPE_P(cast->block, PM_BLOCK_ARGUMENT_NODE))) {
+            if (!lfinish[1]) lfinish[1] = NEW_LABEL(location.line);
+            if (!lfinish[2]) lfinish[2] = NEW_LABEL(location.line);
+        }
+
+        if (cast->arguments) {
+            pm_compile_defined_expr0(iseq, (const pm_node_t *) cast->arguments, node_location, ret, popped, scope_node, true, lfinish, false);
+            PUSH_INSNL(ret, location, branchunless, lfinish[1]);
+        }
+
+        if (cast->block && PM_NODE_TYPE_P(cast->block, PM_BLOCK_ARGUMENT_NODE)) {
+            pm_compile_defined_expr0(iseq, cast->block, node_location, ret, popped, scope_node, true, lfinish, false);
+            PUSH_INSNL(ret, location, branchunless, lfinish[1]);
+        }
+
+        if (cast->receiver) {
+            if (PM_NODE_TYPE_P(cast->receiver, PM_CALL_NODE) && !BLOCK_P((const pm_call_node_t *) cast->receiver)) {
+                // Special behavior here where we chain calls together. This is
+                // the only path that sets explicit_receiver to true.
+                pm_compile_defined_expr0(iseq, cast->receiver, node_location, ret, popped, scope_node, true, lfinish, true);
+                PUSH_INSNL(ret, location, branchunless, lfinish[2]);
+
+                const pm_call_node_t *receiver = (const pm_call_node_t *) cast->receiver;
+                ID method_id = pm_constant_id_lookup(scope_node, receiver->name);
+
+                pm_compile_call(iseq, receiver, ret, popped, scope_node, method_id, NULL);
+            }
+            else {
+                pm_compile_defined_expr0(iseq, cast->receiver, node_location, ret, popped, scope_node, true, lfinish, false);
+                PUSH_INSNL(ret, location, branchunless, lfinish[1]);
+                PM_COMPILE(cast->receiver);
+            }
+
+            ID method_id = pm_constant_id_lookup(scope_node, cast->name);
+
+            if (explicit_receiver) PUSH_INSN(ret, location, dup);
+            PUSH_INSN3(ret, location, defined, INT2FIX(DEFINED_METHOD), rb_id2sym(method_id), PUSH_VAL(DEFINED_METHOD));
+        }
+        else {
+            ID method_id = pm_constant_id_lookup(scope_node, cast->name);
+
+            PUSH_INSN(ret, location, putself);
+            if (explicit_receiver) PUSH_INSN(ret, location, dup);
+
+            PUSH_INSN3(ret, location, defined, INT2FIX(DEFINED_FUNC), rb_id2sym(method_id), PUSH_VAL(DEFINED_METHOD));
+        }
+
+        return;
+
+#undef BLOCK_P
+      }
+      case PM_ARGUMENTS_NODE: {
+        // defined?(a(1, 2, 3))
+        //            ^^^^^^^
+        const pm_arguments_node_t *cast = (const pm_arguments_node_t *) node;
+
+        for (size_t index = 0; index < cast->arguments.size; index++) {
+            pm_compile_defined_expr0(iseq, cast->arguments.nodes[index], node_location, ret, popped, scope_node, in_condition, lfinish, false);
+            PUSH_INSNL(ret, location, branchunless, lfinish[1]);
+        }
+
+        dtype = DEFINED_EXPR;
+        break;
+      }
+      case PM_BLOCK_ARGUMENT_NODE:
+        // defined?(a(&b))
+        //            ^^
+        dtype = DEFINED_EXPR;
+        break;
+      case PM_FORWARDING_ARGUMENTS_NODE:
+        // def a(...) = defined?(a(...))
+        //                         ^^^
+        dtype = DEFINED_EXPR;
+        break;
+      case PM_SPLAT_NODE: {
+        // def a(*) = defined?(a(*))
+        //                       ^
+        const pm_splat_node_t *cast = (const pm_splat_node_t *) node;
+
+        if (cast->expression == NULL) {
+            dtype = DEFINED_EXPR;
+            break;
+        }
+
+        pm_compile_defined_expr0(iseq, cast->expression, node_location, ret, popped, scope_node, in_condition, lfinish, false);
+
+        if (!lfinish[1]) lfinish[1] = NEW_LABEL(location.line);
+        PUSH_INSNL(ret, location, branchunless, lfinish[1]);
+
+        dtype = DEFINED_EXPR;
+        break;
+      }
+      case PM_SHAREABLE_CONSTANT_NODE:
+        // # shareable_constant_value: literal
+        // defined?(A = 1)
+        //          ^^^^^
+        pm_compile_defined_expr0(iseq, ((const pm_shareable_constant_node_t *) node)->write, node_location, ret, popped, scope_node, in_condition, lfinish, explicit_receiver);
+        return;
+/* Unreachable (parameters) ***************************************************/
+      case PM_BLOCK_LOCAL_VARIABLE_NODE:
+      case PM_BLOCK_PARAMETER_NODE:
+      case PM_BLOCK_PARAMETERS_NODE:
+      case PM_FORWARDING_PARAMETER_NODE:
+      case PM_IMPLICIT_REST_NODE:
+      case PM_IT_PARAMETERS_NODE:
+      case PM_PARAMETERS_NODE:
+      case PM_KEYWORD_REST_PARAMETER_NODE:
+      case PM_NO_KEYWORDS_PARAMETER_NODE:
+      case PM_NUMBERED_PARAMETERS_NODE:
+      case PM_OPTIONAL_KEYWORD_PARAMETER_NODE:
+      case PM_OPTIONAL_PARAMETER_NODE:
+      case PM_REQUIRED_KEYWORD_PARAMETER_NODE:
+      case PM_REQUIRED_PARAMETER_NODE:
+      case PM_REST_PARAMETER_NODE:
+/* Unreachable (pattern matching) *********************************************/
+      case PM_ALTERNATION_PATTERN_NODE:
+      case PM_ARRAY_PATTERN_NODE:
+      case PM_CAPTURE_PATTERN_NODE:
+      case PM_FIND_PATTERN_NODE:
+      case PM_HASH_PATTERN_NODE:
+      case PM_PINNED_EXPRESSION_NODE:
+      case PM_PINNED_VARIABLE_NODE:
+/* Unreachable (indirect writes) **********************************************/
+      case PM_CALL_TARGET_NODE:
+      case PM_CLASS_VARIABLE_TARGET_NODE:
+      case PM_CONSTANT_PATH_TARGET_NODE:
+      case PM_CONSTANT_TARGET_NODE:
+      case PM_GLOBAL_VARIABLE_TARGET_NODE:
+      case PM_INDEX_TARGET_NODE:
+      case PM_INSTANCE_VARIABLE_TARGET_NODE:
+      case PM_LOCAL_VARIABLE_TARGET_NODE:
+      case PM_MULTI_TARGET_NODE:
+/* Unreachable (clauses) ******************************************************/
+      case PM_ELSE_NODE:
+      case PM_ENSURE_NODE:
+      case PM_IN_NODE:
+      case PM_RESCUE_NODE:
+      case PM_WHEN_NODE:
+/* Unreachable (miscellaneous) ************************************************/
+      case PM_BLOCK_NODE:
+      case PM_EMBEDDED_STATEMENTS_NODE:
+      case PM_EMBEDDED_VARIABLE_NODE:
+      case PM_MISSING_NODE:
+      case PM_PRE_EXECUTION_NODE:
+      case PM_PROGRAM_NODE:
+      case PM_SCOPE_NODE:
+      case PM_STATEMENTS_NODE:
+        rb_bug("Unreachable node in defined?: %s", pm_node_type_to_str(PM_NODE_TYPE(node)));
+    }
+
+    RUBY_ASSERT(dtype != DEFINED_NOT_DEFINED);
+    PUSH_INSN1(ret, location, putobject, PUSH_VAL(dtype));
+
+#undef PUSH_VAL
+}
+
+static void
+pm_defined_expr(rb_iseq_t *iseq, const pm_node_t *node, const pm_node_location_t *node_location, LINK_ANCHOR *const ret, bool popped, pm_scope_node_t *scope_node, bool in_condition, LABEL **lfinish)
+{
+    LINK_ELEMENT *lcur = ret->last;
+    pm_compile_defined_expr0(iseq, node, node_location, ret, popped, scope_node, in_condition, lfinish, false);
+
+    if (lfinish[1]) {
+        LABEL *lstart = NEW_LABEL(node_location->line);
+        LABEL *lend = NEW_LABEL(node_location->line);
+
+        struct rb_iseq_new_with_callback_callback_func *ifunc =
+            rb_iseq_new_with_callback_new_callback(build_defined_rescue_iseq, NULL);
+
+        const rb_iseq_t *rescue = new_child_iseq_with_callback(
+            iseq,
+            ifunc,
+            rb_str_concat(rb_str_new2("defined guard in "), ISEQ_BODY(iseq)->location.label),
+            iseq,
+            ISEQ_TYPE_RESCUE,
+            0
+        );
+
+        lstart->rescued = LABEL_RESCUE_BEG;
+        lend->rescued = LABEL_RESCUE_END;
+
+        APPEND_LABEL(ret, lcur, lstart);
+        PUSH_LABEL(ret, lend);
+        PUSH_CATCH_ENTRY(CATCH_TYPE_RESCUE, lstart, lend, rescue, lfinish[1]);
+    }
+}
+
+static void
+pm_compile_defined_expr(rb_iseq_t *iseq, const pm_node_t *node, const pm_node_location_t *node_location, LINK_ANCHOR *const ret, bool popped, pm_scope_node_t *scope_node, bool in_condition)
+{
+    LABEL *lfinish[3];
+    LINK_ELEMENT *last = ret->last;
+
+    lfinish[0] = NEW_LABEL(node_location->line);
+    lfinish[1] = 0;
+    lfinish[2] = 0;
+
+    if (!popped) {
+        pm_defined_expr(iseq, node, node_location, ret, popped, scope_node, in_condition, lfinish);
+    }
+
+    if (lfinish[1]) {
+        ELEM_INSERT_NEXT(last, &new_insn_body(iseq, node_location->line, node_location->node_id, BIN(putnil), 0)->link);
+        PUSH_INSN(ret, *node_location, swap);
+
+        if (lfinish[2]) PUSH_LABEL(ret, lfinish[2]);
+        PUSH_INSN(ret, *node_location, pop);
+        PUSH_LABEL(ret, lfinish[1]);
+
+    }
+
+    PUSH_LABEL(ret, lfinish[0]);
+}
+
+// This is exactly the same as add_ensure_iseq, except it compiled
+// the node as a Prism node, and not a CRuby node
+static void
+pm_add_ensure_iseq(LINK_ANCHOR *const ret, rb_iseq_t *iseq, int is_return, pm_scope_node_t *scope_node)
+{
+    RUBY_ASSERT(can_add_ensure_iseq(iseq));
+
+    struct iseq_compile_data_ensure_node_stack *enlp =
+        ISEQ_COMPILE_DATA(iseq)->ensure_node_stack;
+    struct iseq_compile_data_ensure_node_stack *prev_enlp = enlp;
+    DECL_ANCHOR(ensure);
+
+    while (enlp) {
+        if (enlp->erange != NULL) {
+            DECL_ANCHOR(ensure_part);
+            LABEL *lstart = NEW_LABEL(0);
+            LABEL *lend = NEW_LABEL(0);
+
+            add_ensure_range(iseq, enlp->erange, lstart, lend);
+
+            ISEQ_COMPILE_DATA(iseq)->ensure_node_stack = enlp->prev;
+            PUSH_LABEL(ensure_part, lstart);
+            bool popped = true;
+            PM_COMPILE_INTO_ANCHOR(ensure_part, (const pm_node_t *) enlp->ensure_node);
+            PUSH_LABEL(ensure_part, lend);
+            PUSH_SEQ(ensure, ensure_part);
+        }
+        else {
+            if (!is_return) {
+                break;
+            }
+        }
+        enlp = enlp->prev;
+    }
+    ISEQ_COMPILE_DATA(iseq)->ensure_node_stack = prev_enlp;
+    PUSH_SEQ(ret, ensure);
+}
+
+struct pm_local_table_insert_ctx {
+    pm_scope_node_t *scope_node;
+    rb_ast_id_table_t *local_table_for_iseq;
+    int local_index;
+};
+
+static int
+pm_local_table_insert_func(st_data_t *key, st_data_t *value, st_data_t arg, int existing)
+{
+    if (!existing) {
+        pm_constant_id_t constant_id = (pm_constant_id_t) *key;
+        struct pm_local_table_insert_ctx * ctx = (struct pm_local_table_insert_ctx *) arg;
+
+        pm_scope_node_t *scope_node = ctx->scope_node;
+        rb_ast_id_table_t *local_table_for_iseq = ctx->local_table_for_iseq;
+        int local_index = ctx->local_index;
+
+        ID local = pm_constant_id_lookup(scope_node, constant_id);
+        local_table_for_iseq->ids[local_index] = local;
+
+        *value = (st_data_t)local_index;
+
+        ctx->local_index++;
+    }
+
+    return ST_CONTINUE;
+}
+
+/**
+ * Insert a local into the local table for the iseq. This is used to create the
+ * local table in the correct order while compiling the scope. The locals being
+ * inserted are regular named locals, as opposed to special forwarding locals.
+ */
+static void
+pm_insert_local_index(pm_constant_id_t constant_id, int local_index, st_table *index_lookup_table, rb_ast_id_table_t *local_table_for_iseq, pm_scope_node_t *scope_node)
+{
+    RUBY_ASSERT((constant_id & PM_SPECIAL_CONSTANT_FLAG) == 0);
+
+    ID local = pm_constant_id_lookup(scope_node, constant_id);
+    local_table_for_iseq->ids[local_index] = local;
+    st_insert(index_lookup_table, (st_data_t) constant_id, (st_data_t) local_index);
+}
+
+/**
+ * Insert a local into the local table for the iseq that is a special forwarding
+ * local variable.
+ */
+static void
+pm_insert_local_special(ID local_name, int local_index, st_table *index_lookup_table, rb_ast_id_table_t *local_table_for_iseq)
+{
+    local_table_for_iseq->ids[local_index] = local_name;
+    st_insert(index_lookup_table, (st_data_t) (local_name | PM_SPECIAL_CONSTANT_FLAG), (st_data_t) local_index);
+}
+
+/**
+ * Compile the locals of a multi target node that is used as a positional
+ * parameter in a method, block, or lambda definition. Note that this doesn't
+ * actually add any instructions to the iseq. Instead, it adds locals to the
+ * local and index lookup tables and increments the local index as necessary.
+ */
+static int
+pm_compile_destructured_param_locals(const pm_multi_target_node_t *node, st_table *index_lookup_table, rb_ast_id_table_t *local_table_for_iseq, pm_scope_node_t *scope_node, int local_index)
+{
+    for (size_t index = 0; index < node->lefts.size; index++) {
+        const pm_node_t *left = node->lefts.nodes[index];
+
+        if (PM_NODE_TYPE_P(left, PM_REQUIRED_PARAMETER_NODE)) {
+            if (!PM_NODE_FLAG_P(left, PM_PARAMETER_FLAGS_REPEATED_PARAMETER)) {
+                pm_insert_local_index(((const pm_required_parameter_node_t *) left)->name, local_index, index_lookup_table, local_table_for_iseq, scope_node);
+                local_index++;
+            }
+        }
+        else {
+            RUBY_ASSERT(PM_NODE_TYPE_P(left, PM_MULTI_TARGET_NODE));
+            local_index = pm_compile_destructured_param_locals((const pm_multi_target_node_t *) left, index_lookup_table, local_table_for_iseq, scope_node, local_index);
+        }
+    }
+
+    if (node->rest != NULL && PM_NODE_TYPE_P(node->rest, PM_SPLAT_NODE)) {
+        const pm_splat_node_t *rest = (const pm_splat_node_t *) node->rest;
+
+        if (rest->expression != NULL) {
+            RUBY_ASSERT(PM_NODE_TYPE_P(rest->expression, PM_REQUIRED_PARAMETER_NODE));
+
+            if (!PM_NODE_FLAG_P(rest->expression, PM_PARAMETER_FLAGS_REPEATED_PARAMETER)) {
+                pm_insert_local_index(((const pm_required_parameter_node_t *) rest->expression)->name, local_index, index_lookup_table, local_table_for_iseq, scope_node);
+                local_index++;
+            }
+        }
+    }
+
+    for (size_t index = 0; index < node->rights.size; index++) {
+        const pm_node_t *right = node->rights.nodes[index];
+
+        if (PM_NODE_TYPE_P(right, PM_REQUIRED_PARAMETER_NODE)) {
+            if (!PM_NODE_FLAG_P(right, PM_PARAMETER_FLAGS_REPEATED_PARAMETER)) {
+                pm_insert_local_index(((const pm_required_parameter_node_t *) right)->name, local_index, index_lookup_table, local_table_for_iseq, scope_node);
+                local_index++;
+            }
+        }
+        else {
+            RUBY_ASSERT(PM_NODE_TYPE_P(right, PM_MULTI_TARGET_NODE));
+            local_index = pm_compile_destructured_param_locals((const pm_multi_target_node_t *) right, index_lookup_table, local_table_for_iseq, scope_node, local_index);
+        }
+    }
+
+    return local_index;
+}
+
+/**
+ * Compile a required parameter node that is part of a destructure that is used
+ * as a positional parameter in a method, block, or lambda definition.
+ */
+static inline void
+pm_compile_destructured_param_write(rb_iseq_t *iseq, const pm_required_parameter_node_t *node, LINK_ANCHOR *const ret, const pm_scope_node_t *scope_node)
+{
+    const pm_node_location_t location = PM_NODE_START_LOCATION(scope_node->parser, node);
+    pm_local_index_t index = pm_lookup_local_index(iseq, scope_node, node->name, 0);
+    PUSH_SETLOCAL(ret, location, index.index, index.level);
+}
+
+/**
+ * Compile a multi target node that is used as a positional parameter in a
+ * method, block, or lambda definition. Note that this is effectively the same
+ * as a multi write, but with the added context that all of the targets
+ * contained in the write are required parameter nodes. With this context, we
+ * know they won't have any parent expressions so we build a separate code path
+ * for this simplified case.
+ */
+static void
+pm_compile_destructured_param_writes(rb_iseq_t *iseq, const pm_multi_target_node_t *node, LINK_ANCHOR *const ret, const pm_scope_node_t *scope_node)
+{
+    const pm_node_location_t location = PM_NODE_START_LOCATION(scope_node->parser, node);
+    bool has_rest = (node->rest && PM_NODE_TYPE_P(node->rest, PM_SPLAT_NODE) && (((const pm_splat_node_t *) node->rest)->expression) != NULL);
+    bool has_rights = node->rights.size > 0;
+
+    int flag = (has_rest || has_rights) ? 1 : 0;
+    PUSH_INSN2(ret, location, expandarray, INT2FIX(node->lefts.size), INT2FIX(flag));
+
+    for (size_t index = 0; index < node->lefts.size; index++) {
+        const pm_node_t *left = node->lefts.nodes[index];
+
+        if (PM_NODE_TYPE_P(left, PM_REQUIRED_PARAMETER_NODE)) {
+            pm_compile_destructured_param_write(iseq, (const pm_required_parameter_node_t *) left, ret, scope_node);
+        }
+        else {
+            RUBY_ASSERT(PM_NODE_TYPE_P(left, PM_MULTI_TARGET_NODE));
+            pm_compile_destructured_param_writes(iseq, (const pm_multi_target_node_t *) left, ret, scope_node);
+        }
+    }
+
+    if (has_rest) {
+        if (has_rights) {
+            PUSH_INSN2(ret, location, expandarray, INT2FIX(node->rights.size), INT2FIX(3));
+        }
+
+        const pm_node_t *rest = ((const pm_splat_node_t *) node->rest)->expression;
+        RUBY_ASSERT(PM_NODE_TYPE_P(rest, PM_REQUIRED_PARAMETER_NODE));
+
+        pm_compile_destructured_param_write(iseq, (const pm_required_parameter_node_t *) rest, ret, scope_node);
+    }
+
+    if (has_rights) {
+        if (!has_rest) {
+            PUSH_INSN2(ret, location, expandarray, INT2FIX(node->rights.size), INT2FIX(2));
+        }
+
+        for (size_t index = 0; index < node->rights.size; index++) {
+            const pm_node_t *right = node->rights.nodes[index];
+
+            if (PM_NODE_TYPE_P(right, PM_REQUIRED_PARAMETER_NODE)) {
+                pm_compile_destructured_param_write(iseq, (const pm_required_parameter_node_t *) right, ret, scope_node);
+            }
+            else {
+                RUBY_ASSERT(PM_NODE_TYPE_P(right, PM_MULTI_TARGET_NODE));
+                pm_compile_destructured_param_writes(iseq, (const pm_multi_target_node_t *) right, ret, scope_node);
+            }
+        }
+    }
+}
+
+/**
+ * This is a node in the multi target state linked list. It tracks the
+ * information for a particular target that necessarily has a parent expression.
+ */
+typedef struct pm_multi_target_state_node {
+    // The pointer to the topn instruction that will need to be modified after
+    // we know the total stack size of all of the targets.
+    INSN *topn;
+
+    // The index of the stack from the base of the entire multi target at which
+    // the parent expression is located.
+    size_t stack_index;
+
+    // The number of slots in the stack that this node occupies.
+    size_t stack_size;
+
+    // The position of the node in the list of targets.
+    size_t position;
+
+    // A pointer to the next node in this linked list.
+    struct pm_multi_target_state_node *next;
+} pm_multi_target_state_node_t;
+
+/**
+ * As we're compiling a multi target, we need to track additional information
+ * whenever there is a parent expression on the left hand side of the target.
+ * This is because we need to go back and tell the expression where to fetch its
+ * parent expression from the stack. We use a linked list of nodes to track this
+ * information.
+ */
+typedef struct {
+    // The total number of slots in the stack that this multi target occupies.
+    size_t stack_size;
+
+    // The position of the current node being compiled. This is forwarded to
+    // nodes when they are allocated.
+    size_t position;
+
+    // A pointer to the head of this linked list.
+    pm_multi_target_state_node_t *head;
+
+    // A pointer to the tail of this linked list.
+    pm_multi_target_state_node_t *tail;
+} pm_multi_target_state_t;
+
+/**
+ * Push a new state node onto the multi target state.
+ */
+static void
+pm_multi_target_state_push(pm_multi_target_state_t *state, INSN *topn, size_t stack_size)
+{
+    pm_multi_target_state_node_t *node = ALLOC(pm_multi_target_state_node_t);
+    node->topn = topn;
+    node->stack_index = state->stack_size + 1;
+    node->stack_size = stack_size;
+    node->position = state->position;
+    node->next = NULL;
+
+    if (state->head == NULL) {
+        state->head = node;
+        state->tail = node;
+    }
+    else {
+        state->tail->next = node;
+        state->tail = node;
+    }
+
+    state->stack_size += stack_size;
+}
+
+/**
+ * Walk through a multi target state's linked list and update the topn
+ * instructions that were inserted into the write sequence to make sure they can
+ * correctly retrieve their parent expressions.
+ */
+static void
+pm_multi_target_state_update(pm_multi_target_state_t *state)
+{
+    // If nothing was ever pushed onto the stack, then we don't need to do any
+    // kind of updates.
+    if (state->stack_size == 0) return;
+
+    pm_multi_target_state_node_t *current = state->head;
+    pm_multi_target_state_node_t *previous;
+
+    while (current != NULL) {
+        VALUE offset = INT2FIX(state->stack_size - current->stack_index + current->position);
+        current->topn->operands[0] = offset;
+
+        // stack_size will be > 1 in the case that we compiled an index target
+        // and it had arguments. In this case, we use multiple topn instructions
+        // to grab up all of the arguments as well, so those offsets need to be
+        // updated as well.
+        if (current->stack_size > 1) {
+            INSN *insn = current->topn;
+
+            for (size_t index = 1; index < current->stack_size; index += 1) {
+                LINK_ELEMENT *element = get_next_insn(insn);
+                RUBY_ASSERT(IS_INSN(element));
+
+                insn = (INSN *) element;
+                RUBY_ASSERT(insn->insn_id == BIN(topn));
+
+                insn->operands[0] = offset;
+            }
+        }
+
+        previous = current;
+        current = current->next;
+
+        xfree(previous);
+    }
+}
+
+static void
+pm_compile_multi_target_node(rb_iseq_t *iseq, const pm_node_t *node, LINK_ANCHOR *const parents, LINK_ANCHOR *const writes, LINK_ANCHOR *const cleanup, pm_scope_node_t *scope_node, pm_multi_target_state_t *state);
+
+/**
+ * A target node represents an indirect write to a variable or a method call to
+ * a method ending in =. Compiling one of these nodes requires three sequences:
+ *
+ * * The first is to compile retrieving the parent expression if there is one.
+ *   This could be the object that owns a constant or the receiver of a method
+ *   call.
+ * * The second is to compile the writes to the targets. This could be writing
+ *   to variables, or it could be performing method calls.
+ * * The third is to compile any cleanup that needs to happen, i.e., popping the
+ *   appropriate number of values off the stack.
+ *
+ * When there is a parent expression and this target is part of a multi write, a
+ * topn instruction will be inserted into the write sequence. This is to move
+ * the parent expression to the top of the stack so that it can be used as the
+ * receiver of the method call or the owner of the constant. To facilitate this,
+ * we return a pointer to the topn instruction that was used to be later
+ * modified with the correct offset.
+ *
+ * These nodes can appear in a couple of places, but most commonly:
+ *
+ * * For loops - the index variable is a target node
+ * * Rescue clauses - the exception reference variable is a target node
+ * * Multi writes - the left hand side contains a list of target nodes
+ *
+ * For the comments with examples within this function, we'll use for loops as
+ * the containing node.
+ */
+static void
+pm_compile_target_node(rb_iseq_t *iseq, const pm_node_t *node, LINK_ANCHOR *const parents, LINK_ANCHOR *const writes, LINK_ANCHOR *const cleanup, pm_scope_node_t *scope_node, pm_multi_target_state_t *state)
+{
+    const pm_node_location_t location = PM_NODE_START_LOCATION(scope_node->parser, node);
+
+    switch (PM_NODE_TYPE(node)) {
+      case PM_LOCAL_VARIABLE_TARGET_NODE: {
+        // Local variable targets have no parent expression, so they only need
+        // to compile the write.
+        //
+        //     for i in []; end
+        //
+        const pm_local_variable_target_node_t *cast = (const pm_local_variable_target_node_t *) node;
+        pm_local_index_t index = pm_lookup_local_index(iseq, scope_node, cast->name, cast->depth);
+
+        PUSH_SETLOCAL(writes, location, index.index, index.level);
+        break;
+      }
+      case PM_CLASS_VARIABLE_TARGET_NODE: {
+        // Class variable targets have no parent expression, so they only need
+        // to compile the write.
+        //
+        //     for @@i in []; end
+        //
+        const pm_class_variable_target_node_t *cast = (const pm_class_variable_target_node_t *) node;
+        ID name = pm_constant_id_lookup(scope_node, cast->name);
+
+        VALUE operand = ID2SYM(name);
+        PUSH_INSN2(writes, location, setclassvariable, operand, get_cvar_ic_value(iseq, name));
+        break;
+      }
+      case PM_CONSTANT_TARGET_NODE: {
+        // Constant targets have no parent expression, so they only need to
+        // compile the write.
+        //
+        //     for I in []; end
+        //
+        const pm_constant_target_node_t *cast = (const pm_constant_target_node_t *) node;
+        ID name = pm_constant_id_lookup(scope_node, cast->name);
+
+        VALUE operand = ID2SYM(name);
+        PUSH_INSN1(writes, location, putspecialobject, INT2FIX(VM_SPECIAL_OBJECT_CONST_BASE));
+        PUSH_INSN1(writes, location, setconstant, operand);
+        break;
+      }
+      case PM_GLOBAL_VARIABLE_TARGET_NODE: {
+        // Global variable targets have no parent expression, so they only need
+        // to compile the write.
+        //
+        //     for $i in []; end
+        //
+        const pm_global_variable_target_node_t *cast = (const pm_global_variable_target_node_t *) node;
+        ID name = pm_constant_id_lookup(scope_node, cast->name);
+
+        VALUE operand = ID2SYM(name);
+        PUSH_INSN1(writes, location, setglobal, operand);
+        break;
+      }
+      case PM_INSTANCE_VARIABLE_TARGET_NODE: {
+        // Instance variable targets have no parent expression, so they only
+        // need to compile the write.
+        //
+        //     for @i in []; end
+        //
+        const pm_instance_variable_target_node_t *cast = (const pm_instance_variable_target_node_t *) node;
+        ID name = pm_constant_id_lookup(scope_node, cast->name);
+
+        VALUE operand = ID2SYM(name);
+        PUSH_INSN2(writes, location, setinstancevariable, operand, get_ivar_ic_value(iseq, name));
+        break;
+      }
+      case PM_CONSTANT_PATH_TARGET_NODE: {
+        // Constant path targets have a parent expression that is the object
+        // that owns the constant. This needs to be compiled first into the
+        // parents sequence. If no parent is found, then it represents using the
+        // unary :: operator to indicate a top-level constant. In that case we
+        // need to push Object onto the stack.
+        //
+        //     for I::J in []; end
+        //
+        const pm_constant_path_target_node_t *cast = (const pm_constant_path_target_node_t *) node;
+        ID name = pm_constant_id_lookup(scope_node, cast->name);
+
+        if (cast->parent != NULL) {
+            pm_compile_node(iseq, cast->parent, parents, false, scope_node);
+        }
+        else {
+            PUSH_INSN1(parents, location, putobject, rb_cObject);
+        }
+
+        if (state == NULL) {
+            PUSH_INSN(writes, location, swap);
+        }
+        else {
+            PUSH_INSN1(writes, location, topn, INT2FIX(1));
+            pm_multi_target_state_push(state, (INSN *) LAST_ELEMENT(writes), 1);
+        }
+
+        VALUE operand = ID2SYM(name);
+        PUSH_INSN1(writes, location, setconstant, operand);
+
+        if (state != NULL) {
+            PUSH_INSN(cleanup, location, pop);
+        }
+
+        break;
+      }
+      case PM_CALL_TARGET_NODE: {
+        // Call targets have a parent expression that is the receiver of the
+        // method being called. This needs to be compiled first into the parents
+        // sequence. These nodes cannot have arguments, so the method call is
+        // compiled with a single argument which represents the value being
+        // written.
+        //
+        //     for i.j in []; end
+        //
+        const pm_call_target_node_t *cast = (const pm_call_target_node_t *) node;
+        ID method_id = pm_constant_id_lookup(scope_node, cast->name);
+
+        pm_compile_node(iseq, cast->receiver, parents, false, scope_node);
+
+        LABEL *safe_label = NULL;
+        if (PM_NODE_FLAG_P(cast, PM_CALL_NODE_FLAGS_SAFE_NAVIGATION)) {
+            safe_label = NEW_LABEL(location.line);
+            PUSH_INSN(parents, location, dup);
+            PUSH_INSNL(parents, location, branchnil, safe_label);
+        }
+
+        if (state != NULL) {
+            PUSH_INSN1(writes, location, topn, INT2FIX(1));
+            pm_multi_target_state_push(state, (INSN *) LAST_ELEMENT(writes), 1);
+            PUSH_INSN(writes, location, swap);
+        }
+
+        int flags = VM_CALL_ARGS_SIMPLE;
+        if (PM_NODE_FLAG_P(cast, PM_CALL_NODE_FLAGS_IGNORE_VISIBILITY)) flags |= VM_CALL_FCALL;
+
+        PUSH_SEND_WITH_FLAG(writes, location, method_id, INT2FIX(1), INT2FIX(flags));
+        if (safe_label != NULL && state == NULL) PUSH_LABEL(writes, safe_label);
+        PUSH_INSN(writes, location, pop);
+        if (safe_label != NULL && state != NULL) PUSH_LABEL(writes, safe_label);
+
+        if (state != NULL) {
+            PUSH_INSN(cleanup, location, pop);
+        }
+
+        break;
+      }
+      case PM_INDEX_TARGET_NODE: {
+        // Index targets have a parent expression that is the receiver of the
+        // method being called and any additional arguments that are being
+        // passed along with the value being written. The receiver and arguments
+        // both need to be on the stack. Note that this is even more complicated
+        // by the fact that these nodes can hold a block using the unary &
+        // operator.
+        //
+        //     for i[:j] in []; end
+        //
+        const pm_index_target_node_t *cast = (const pm_index_target_node_t *) node;
+
+        pm_compile_node(iseq, cast->receiver, parents, false, scope_node);
+
+        int flags = 0;
+        struct rb_callinfo_kwarg *kwargs = NULL;
+        int argc = pm_setup_args(cast->arguments, (const pm_node_t *) cast->block, &flags, &kwargs, iseq, parents, scope_node, &location);
+
+        if (state != NULL) {
+            PUSH_INSN1(writes, location, topn, INT2FIX(argc + 1));
+            pm_multi_target_state_push(state, (INSN *) LAST_ELEMENT(writes), argc + 1);
+
+            if (argc == 0) {
+                PUSH_INSN(writes, location, swap);
+            }
+            else {
+                for (int index = 0; index < argc; index++) {
+                    PUSH_INSN1(writes, location, topn, INT2FIX(argc + 1));
+                }
+                PUSH_INSN1(writes, location, topn, INT2FIX(argc + 1));
+            }
+        }
+
+        // The argc that we're going to pass to the send instruction is the
+        // number of arguments + 1 for the value being written. If there's a
+        // splat, then we need to insert newarray and concatarray instructions
+        // after the arguments have been written.
+        int ci_argc = argc + 1;
+        if (flags & VM_CALL_ARGS_SPLAT) {
+            ci_argc--;
+            PUSH_INSN1(writes, location, newarray, INT2FIX(1));
+            PUSH_INSN(writes, location, concatarray);
+        }
+
+        PUSH_SEND_R(writes, location, idASET, INT2NUM(ci_argc), NULL, INT2FIX(flags), kwargs);
+        PUSH_INSN(writes, location, pop);
+
+        if (state != NULL) {
+            if (argc != 0) {
+                PUSH_INSN(writes, location, pop);
+            }
+
+            for (int index = 0; index < argc + 1; index++) {
+                PUSH_INSN(cleanup, location, pop);
+            }
+        }
+
+        break;
+      }
+      case PM_MULTI_TARGET_NODE: {
+        // Multi target nodes represent a set of writes to multiple variables.
+        // The parent expressions are the combined set of the parent expressions
+        // of its inner target nodes.
+        //
+        //     for i, j in []; end
+        //
+        size_t before_position;
+        if (state != NULL) {
+            before_position = state->position;
+            state->position--;
+        }
+
+        pm_compile_multi_target_node(iseq, node, parents, writes, cleanup, scope_node, state);
+        if (state != NULL) state->position = before_position;
+
+        break;
+      }
+      case PM_SPLAT_NODE: {
+        // Splat nodes capture all values into an array. They can be used
+        // as targets in assignments or for loops.
+        //
+        //     for *x in []; end
+        //
+        const pm_splat_node_t *cast = (const pm_splat_node_t *) node;
+
+        if (cast->expression != NULL) {
+            pm_compile_target_node(iseq, cast->expression, parents, writes, cleanup, scope_node, state);
+        }
+
+        break;
+      }
+      default:
+        rb_bug("Unexpected node type: %s", pm_node_type_to_str(PM_NODE_TYPE(node)));
+        break;
+    }
+}
+
+/**
+ * Compile a multi target or multi write node. It returns the number of values
+ * on the stack that correspond to the parent expressions of the various
+ * targets.
+ */
+static void
+pm_compile_multi_target_node(rb_iseq_t *iseq, const pm_node_t *node, LINK_ANCHOR *const parents, LINK_ANCHOR *const writes, LINK_ANCHOR *const cleanup, pm_scope_node_t *scope_node, pm_multi_target_state_t *state)
+{
+    const pm_node_location_t location = PM_NODE_START_LOCATION(scope_node->parser, node);
+    const pm_node_list_t *lefts;
+    const pm_node_t *rest;
+    const pm_node_list_t *rights;
+
+    switch (PM_NODE_TYPE(node)) {
+      case PM_MULTI_TARGET_NODE: {
+        const pm_multi_target_node_t *cast = (const pm_multi_target_node_t *) node;
+        lefts = &cast->lefts;
+        rest = cast->rest;
+        rights = &cast->rights;
+        break;
+      }
+      case PM_MULTI_WRITE_NODE: {
+        const pm_multi_write_node_t *cast = (const pm_multi_write_node_t *) node;
+        lefts = &cast->lefts;
+        rest = cast->rest;
+        rights = &cast->rights;
+        break;
+      }
+      default:
+        rb_bug("Unsupported node %s", pm_node_type_to_str(PM_NODE_TYPE(node)));
+        break;
+    }
+
+    bool has_rest = (rest != NULL) && PM_NODE_TYPE_P(rest, PM_SPLAT_NODE) && ((const pm_splat_node_t *) rest)->expression != NULL;
+    bool has_posts = rights->size > 0;
+
+    // The first instruction in the writes sequence is going to spread the
+    // top value of the stack onto the number of values that we're going to
+    // write.
+    PUSH_INSN2(writes, location, expandarray, INT2FIX(lefts->size), INT2FIX((has_rest || has_posts) ? 1 : 0));
+
+    // We need to keep track of some additional state information as we're
+    // going through the targets because we will need to revisit them once
+    // we know how many values are being pushed onto the stack.
+    pm_multi_target_state_t target_state = { 0 };
+    if (state == NULL) state = &target_state;
+
+    size_t base_position = state->position;
+    size_t splat_position = (has_rest || has_posts) ? 1 : 0;
+
+    // Next, we'll iterate through all of the leading targets.
+    for (size_t index = 0; index < lefts->size; index++) {
+        const pm_node_t *target = lefts->nodes[index];
+        state->position = lefts->size - index + splat_position + base_position;
+        pm_compile_target_node(iseq, target, parents, writes, cleanup, scope_node, state);
+    }
+
+    // Next, we'll compile the rest target if there is one.
+    if (has_rest) {
+        const pm_node_t *target = ((const pm_splat_node_t *) rest)->expression;
+        state->position = 1 + rights->size + base_position;
+
+        if (has_posts) {
+            PUSH_INSN2(writes, location, expandarray, INT2FIX(rights->size), INT2FIX(3));
+        }
+
+        pm_compile_target_node(iseq, target, parents, writes, cleanup, scope_node, state);
+    }
+
+    // Finally, we'll compile the trailing targets.
+    if (has_posts) {
+        if (!has_rest && rest != NULL) {
+            PUSH_INSN2(writes, location, expandarray, INT2FIX(rights->size), INT2FIX(2));
+        }
+
+        for (size_t index = 0; index < rights->size; index++) {
+            const pm_node_t *target = rights->nodes[index];
+            state->position = rights->size - index + base_position;
+            pm_compile_target_node(iseq, target, parents, writes, cleanup, scope_node, state);
+        }
+    }
+}
+
+/**
+ * When compiling a for loop, we need to write the iteration variable to
+ * whatever expression exists in the index slot. This function performs that
+ * compilation.
+ */
+static void
+pm_compile_for_node_index(rb_iseq_t *iseq, const pm_node_t *node, LINK_ANCHOR *const ret, pm_scope_node_t *scope_node)
+{
+    const pm_node_location_t location = PM_NODE_START_LOCATION(scope_node->parser, node);
+
+    switch (PM_NODE_TYPE(node)) {
+      case PM_LOCAL_VARIABLE_TARGET_NODE: {
+        // For local variables, all we have to do is retrieve the value and then
+        // compile the index node.
+        PUSH_GETLOCAL(ret, location, 1, 0);
+        pm_compile_target_node(iseq, node, ret, ret, ret, scope_node, NULL);
+        break;
+      }
+      case PM_CLASS_VARIABLE_TARGET_NODE:
+      case PM_CONSTANT_TARGET_NODE:
+      case PM_GLOBAL_VARIABLE_TARGET_NODE:
+      case PM_INSTANCE_VARIABLE_TARGET_NODE:
+      case PM_CONSTANT_PATH_TARGET_NODE:
+      case PM_CALL_TARGET_NODE:
+      case PM_INDEX_TARGET_NODE:
+      case PM_SPLAT_NODE: {
+        // For other targets, we need to potentially compile the parent or
+        // owning expression of this target, then retrieve the value, expand it,
+        // and then compile the necessary writes.
+        DECL_ANCHOR(writes);
+        DECL_ANCHOR(cleanup);
+
+        pm_multi_target_state_t state = { 0 };
+        state.position = 1;
+        pm_compile_target_node(iseq, node, ret, writes, cleanup, scope_node, &state);
+
+        PUSH_GETLOCAL(ret, location, 1, 0);
+        PUSH_INSN2(ret, location, expandarray, INT2FIX(1), INT2FIX(0));
+
+        PUSH_SEQ(ret, writes);
+        PUSH_SEQ(ret, cleanup);
+
+        pm_multi_target_state_update(&state);
+        break;
+      }
+      case PM_MULTI_TARGET_NODE: {
+        DECL_ANCHOR(writes);
+        DECL_ANCHOR(cleanup);
+
+        pm_compile_target_node(iseq, node, ret, writes, cleanup, scope_node, NULL);
+
+        LABEL *not_single = NEW_LABEL(location.line);
+        LABEL *not_ary = NEW_LABEL(location.line);
+
+        // When there are multiple targets, we'll do a bunch of work to convert
+        // the value into an array before we expand it. Effectively we're trying
+        // to accomplish:
+        //
+        //     (args.length == 1 && Array.try_convert(args[0])) || args
+        //
+        PUSH_GETLOCAL(ret, location, 1, 0);
+        PUSH_INSN(ret, location, dup);
+        PUSH_CALL(ret, location, idLength, INT2FIX(0));
+        PUSH_INSN1(ret, location, putobject, INT2FIX(1));
+        PUSH_CALL(ret, location, idEq, INT2FIX(1));
+        PUSH_INSNL(ret, location, branchunless, not_single);
+        PUSH_INSN(ret, location, dup);
+        PUSH_INSN1(ret, location, putobject, INT2FIX(0));
+        PUSH_CALL(ret, location, idAREF, INT2FIX(1));
+        PUSH_INSN1(ret, location, putobject, rb_cArray);
+        PUSH_INSN(ret, location, swap);
+        PUSH_CALL(ret, location, rb_intern("try_convert"), INT2FIX(1));
+        PUSH_INSN(ret, location, dup);
+        PUSH_INSNL(ret, location, branchunless, not_ary);
+        PUSH_INSN(ret, location, swap);
+
+        PUSH_LABEL(ret, not_ary);
+        PUSH_INSN(ret, location, pop);
+
+        PUSH_LABEL(ret, not_single);
+        PUSH_SEQ(ret, writes);
+        PUSH_SEQ(ret, cleanup);
+        break;
+      }
+      default:
+        rb_bug("Unexpected node type for index in for node: %s", pm_node_type_to_str(PM_NODE_TYPE(node)));
+        break;
+    }
+}
+
+static void
+pm_compile_rescue(rb_iseq_t *iseq, const pm_begin_node_t *cast, const pm_node_location_t *node_location, LINK_ANCHOR *const ret, bool popped, pm_scope_node_t *scope_node)
+{
+    const pm_parser_t *parser = scope_node->parser;
+
+    LABEL *lstart = NEW_LABEL(node_location->line);
+    LABEL *lend = NEW_LABEL(node_location->line);
+    LABEL *lcont = NEW_LABEL(node_location->line);
+
+    pm_scope_node_t rescue_scope_node;
+    pm_scope_node_init((const pm_node_t *) cast->rescue_clause, &rescue_scope_node, scope_node);
+
+    rb_iseq_t *rescue_iseq = NEW_CHILD_ISEQ(
+        &rescue_scope_node,
+        rb_str_concat(rb_str_new2("rescue in "), ISEQ_BODY(iseq)->location.label),
+        ISEQ_TYPE_RESCUE,
+        pm_node_line_number(parser, (const pm_node_t *) cast->rescue_clause)
+    );
+
+    pm_scope_node_destroy(&rescue_scope_node);
+
+    lstart->rescued = LABEL_RESCUE_BEG;
+    lend->rescued = LABEL_RESCUE_END;
+    PUSH_LABEL(ret, lstart);
+
+    bool prev_in_rescue = ISEQ_COMPILE_DATA(iseq)->in_rescue;
+    ISEQ_COMPILE_DATA(iseq)->in_rescue = true;
+
+    if (cast->statements != NULL) {
+        PM_COMPILE_NOT_POPPED((const pm_node_t *) cast->statements);
+    }
+    else {
+        const pm_node_location_t location = PM_NODE_START_LOCATION(parser, cast->rescue_clause);
+        PUSH_INSN(ret, location, putnil);
+    }
+
+    ISEQ_COMPILE_DATA(iseq)->in_rescue = prev_in_rescue;
+    PUSH_LABEL(ret, lend);
+
+    if (cast->else_clause != NULL) {
+        if (!popped) PUSH_INSN(ret, *node_location, pop);
+        PM_COMPILE((const pm_node_t *) cast->else_clause);
+    }
+
+    PUSH_INSN(ret, *node_location, nop);
+    PUSH_LABEL(ret, lcont);
+
+    if (popped) PUSH_INSN(ret, *node_location, pop);
+    PUSH_CATCH_ENTRY(CATCH_TYPE_RESCUE, lstart, lend, rescue_iseq, lcont);
+    PUSH_CATCH_ENTRY(CATCH_TYPE_RETRY, lend, lcont, NULL, lstart);
+}
+
+static void
+pm_compile_ensure(rb_iseq_t *iseq, const pm_begin_node_t *cast, const pm_node_location_t *node_location, LINK_ANCHOR *const ret, bool popped, pm_scope_node_t *scope_node)
+{
+    const pm_parser_t *parser = scope_node->parser;
+    const pm_statements_node_t *statements = cast->ensure_clause->statements;
+
+    pm_node_location_t location;
+    if (statements != NULL) {
+        location = PM_NODE_START_LOCATION(parser, statements);
+    }
+    else {
+        location = *node_location;
+    }
+
+    LABEL *lstart = NEW_LABEL(location.line);
+    LABEL *lend = NEW_LABEL(location.line);
+    LABEL *lcont = NEW_LABEL(location.line);
+
+    struct ensure_range er;
+    struct iseq_compile_data_ensure_node_stack enl;
+    struct ensure_range *erange;
+
+    DECL_ANCHOR(ensr);
+    if (statements != NULL) {
+        pm_compile_node(iseq, (const pm_node_t *) statements, ensr, true, scope_node);
+    }
+
+    LINK_ELEMENT *last = ensr->last;
+    bool last_leave = last && IS_INSN(last) && IS_INSN_ID(last, leave);
+
+    er.begin = lstart;
+    er.end = lend;
+    er.next = 0;
+    push_ensure_entry(iseq, &enl, &er, (void *) cast->ensure_clause);
+
+    PUSH_LABEL(ret, lstart);
+    if (cast->rescue_clause != NULL) {
+        pm_compile_rescue(iseq, cast, node_location, ret, popped | last_leave, scope_node);
+    }
+    else if (cast->statements != NULL) {
+        pm_compile_node(iseq, (const pm_node_t *) cast->statements, ret, popped | last_leave, scope_node);
+    }
+    else if (!(popped | last_leave)) {
+        PUSH_SYNTHETIC_PUTNIL(ret, iseq);
+    }
+
+    PUSH_LABEL(ret, lend);
+    PUSH_SEQ(ret, ensr);
+    if (!popped && last_leave) PUSH_INSN(ret, *node_location, putnil);
+    PUSH_LABEL(ret, lcont);
+    if (last_leave) PUSH_INSN(ret, *node_location, pop);
+
+    pm_scope_node_t next_scope_node;
+    pm_scope_node_init((const pm_node_t *) cast->ensure_clause, &next_scope_node, scope_node);
+
+    rb_iseq_t *child_iseq = NEW_CHILD_ISEQ(
+        &next_scope_node,
+        rb_str_concat(rb_str_new2("ensure in "), ISEQ_BODY(iseq)->location.label),
+        ISEQ_TYPE_ENSURE,
+        location.line
+    );
+
+    pm_scope_node_destroy(&next_scope_node);
+
+    erange = ISEQ_COMPILE_DATA(iseq)->ensure_node_stack->erange;
+    if (lstart->link.next != &lend->link) {
+        while (erange) {
+            PUSH_CATCH_ENTRY(CATCH_TYPE_ENSURE, erange->begin, erange->end, child_iseq, lcont);
+            erange = erange->next;
+        }
+    }
+    ISEQ_COMPILE_DATA(iseq)->ensure_node_stack = enl.prev;
+}
+
+/**
+ * Returns true if the given call node can use the opt_str_uminus or
+ * opt_str_freeze instructions as an optimization with the current iseq options.
+ */
+static inline bool
+pm_opt_str_freeze_p(const rb_iseq_t *iseq, const pm_call_node_t *node)
+{
+    return (
+        !PM_NODE_FLAG_P(node, PM_CALL_NODE_FLAGS_SAFE_NAVIGATION) &&
+        node->receiver != NULL &&
+        PM_NODE_TYPE_P(node->receiver, PM_STRING_NODE) &&
+        node->arguments == NULL &&
+        node->block == NULL &&
+        ISEQ_COMPILE_DATA(iseq)->option->specialized_instruction
+    );
+}
+
+/**
+ * Returns true if the given call node can use the opt_aref_with optimization
+ * with the current iseq options.
+ */
+static inline bool
+pm_opt_aref_with_p(const rb_iseq_t *iseq, const pm_call_node_t *node)
+{
+    return (
+        !PM_NODE_FLAG_P(node, PM_CALL_NODE_FLAGS_SAFE_NAVIGATION) &&
+        node->arguments != NULL &&
+        PM_NODE_TYPE_P((const pm_node_t *) node->arguments, PM_ARGUMENTS_NODE) &&
+        ((const pm_arguments_node_t *) node->arguments)->arguments.size == 1 &&
+        PM_NODE_TYPE_P(((const pm_arguments_node_t *) node->arguments)->arguments.nodes[0], PM_STRING_NODE) &&
+        node->block == NULL &&
+        !PM_NODE_FLAG_P(((const pm_arguments_node_t *) node->arguments)->arguments.nodes[0], PM_STRING_FLAGS_FROZEN) &&
+        ISEQ_COMPILE_DATA(iseq)->option->specialized_instruction
+    );
+}
+
+/**
+ * Returns true if the given call node can use the opt_aset_with optimization
+ * with the current iseq options.
+ */
+static inline bool
+pm_opt_aset_with_p(const rb_iseq_t *iseq, const pm_call_node_t *node)
+{
+    return (
+        !PM_NODE_FLAG_P(node, PM_CALL_NODE_FLAGS_SAFE_NAVIGATION) &&
+        node->arguments != NULL &&
+        PM_NODE_TYPE_P((const pm_node_t *) node->arguments, PM_ARGUMENTS_NODE) &&
+        ((const pm_arguments_node_t *) node->arguments)->arguments.size == 2 &&
+        PM_NODE_TYPE_P(((const pm_arguments_node_t *) node->arguments)->arguments.nodes[0], PM_STRING_NODE) &&
+        node->block == NULL &&
+        !PM_NODE_FLAG_P(((const pm_arguments_node_t *) node->arguments)->arguments.nodes[0], PM_STRING_FLAGS_FROZEN) &&
+        ISEQ_COMPILE_DATA(iseq)->option->specialized_instruction
+    );
+}
+
+/**
+ * Compile the instructions necessary to read a constant, based on the options
+ * of the current iseq.
+ */
+static void
+pm_compile_constant_read(rb_iseq_t *iseq, VALUE name, const pm_location_t *name_loc, uint32_t node_id, LINK_ANCHOR *const ret, const pm_scope_node_t *scope_node)
+{
+    const pm_node_location_t location = PM_LOCATION_START_LOCATION(scope_node->parser, name_loc, node_id);
+
+    if (ISEQ_COMPILE_DATA(iseq)->option->inline_const_cache) {
+        ISEQ_BODY(iseq)->ic_size++;
+        VALUE segments = rb_ary_new_from_args(1, name);
+        PUSH_INSN1(ret, location, opt_getconstant_path, segments);
+    }
+    else {
+        PUSH_INSN(ret, location, putnil);
+        PUSH_INSN1(ret, location, putobject, Qtrue);
+        PUSH_INSN1(ret, location, getconstant, name);
+    }
+}
+
+/**
+ * Returns a Ruby array of the parts of the constant path node if it is constant
+ * reads all of the way down. If it isn't, then Qnil is returned.
+ */
+static VALUE
+pm_constant_path_parts(const pm_node_t *node, const pm_scope_node_t *scope_node)
+{
+    VALUE parts = rb_ary_new();
+
+    while (true) {
+        switch (PM_NODE_TYPE(node)) {
+          case PM_CONSTANT_READ_NODE: {
+            const pm_constant_read_node_t *cast = (const pm_constant_read_node_t *) node;
+            VALUE name = ID2SYM(pm_constant_id_lookup(scope_node, cast->name));
+
+            rb_ary_unshift(parts, name);
+            return parts;
+          }
+          case PM_CONSTANT_PATH_NODE: {
+            const pm_constant_path_node_t *cast = (const pm_constant_path_node_t *) node;
+            VALUE name = ID2SYM(pm_constant_id_lookup(scope_node, cast->name));
+
+            rb_ary_unshift(parts, name);
+            if (cast->parent == NULL) {
+                rb_ary_unshift(parts, ID2SYM(idNULL));
+                return parts;
+            }
+
+            node = cast->parent;
+            break;
+          }
+          default:
+            return Qnil;
+        }
+    }
+}
+
+/**
+ * Compile a constant path into two sequences of instructions, one for the
+ * owning expression if there is one (prefix) and one for the constant reads
+ * (body).
+ */
+static void
+pm_compile_constant_path(rb_iseq_t *iseq, const pm_node_t *node, LINK_ANCHOR *const prefix, LINK_ANCHOR *const body, bool popped, pm_scope_node_t *scope_node)
+{
+    const pm_node_location_t location = PM_NODE_START_LOCATION(scope_node->parser, node);
+
+    switch (PM_NODE_TYPE(node)) {
+      case PM_CONSTANT_READ_NODE: {
+        const pm_constant_read_node_t *cast = (const pm_constant_read_node_t *) node;
+        VALUE name = ID2SYM(pm_constant_id_lookup(scope_node, cast->name));
+
+        PUSH_INSN1(body, location, putobject, Qtrue);
+        PUSH_INSN1(body, location, getconstant, name);
+        break;
+      }
+      case PM_CONSTANT_PATH_NODE: {
+        const pm_constant_path_node_t *cast = (const pm_constant_path_node_t *) node;
+        VALUE name = ID2SYM(pm_constant_id_lookup(scope_node, cast->name));
+
+        if (cast->parent == NULL) {
+            PUSH_INSN(body, location, pop);
+            PUSH_INSN1(body, location, putobject, rb_cObject);
+            PUSH_INSN1(body, location, putobject, Qtrue);
+            PUSH_INSN1(body, location, getconstant, name);
+        }
+        else {
+            pm_compile_constant_path(iseq, cast->parent, prefix, body, false, scope_node);
+            PUSH_INSN1(body, location, putobject, Qfalse);
+            PUSH_INSN1(body, location, getconstant, name);
+        }
+        break;
+      }
+      default:
+        PM_COMPILE_INTO_ANCHOR(prefix, node);
+        break;
+    }
+}
+
+/**
+ * Return the object that will be pushed onto the stack for the given node.
+ */
+static VALUE
+pm_compile_shareable_constant_literal(rb_iseq_t *iseq, const pm_node_t *node, const pm_scope_node_t *scope_node)
+{
+    switch (PM_NODE_TYPE(node)) {
+      case PM_TRUE_NODE:
+      case PM_FALSE_NODE:
+      case PM_NIL_NODE:
+      case PM_SYMBOL_NODE:
+      case PM_REGULAR_EXPRESSION_NODE:
+      case PM_SOURCE_LINE_NODE:
+      case PM_INTEGER_NODE:
+      case PM_FLOAT_NODE:
+      case PM_RATIONAL_NODE:
+      case PM_IMAGINARY_NODE:
+      case PM_SOURCE_ENCODING_NODE:
+        return pm_static_literal_value(iseq, node, scope_node);
+      case PM_STRING_NODE:
+        return parse_static_literal_string(iseq, scope_node, node, &((const pm_string_node_t *) node)->unescaped);
+      case PM_SOURCE_FILE_NODE:
+        return pm_source_file_value((const pm_source_file_node_t *) node, scope_node);
+      case PM_ARRAY_NODE: {
+        const pm_array_node_t *cast = (const pm_array_node_t *) node;
+        VALUE result = rb_ary_new_capa(cast->elements.size);
+
+        for (size_t index = 0; index < cast->elements.size; index++) {
+            VALUE element = pm_compile_shareable_constant_literal(iseq, cast->elements.nodes[index], scope_node);
+            if (element == Qundef) return Qundef;
+
+            rb_ary_push(result, element);
+        }
+
+        return rb_ractor_make_shareable(result);
+      }
+      case PM_HASH_NODE: {
+        const pm_hash_node_t *cast = (const pm_hash_node_t *) node;
+        VALUE result = rb_hash_new_capa(cast->elements.size);
+
+        for (size_t index = 0; index < cast->elements.size; index++) {
+            const pm_node_t *element = cast->elements.nodes[index];
+            if (!PM_NODE_TYPE_P(element, PM_ASSOC_NODE)) return Qundef;
+
+            const pm_assoc_node_t *assoc = (const pm_assoc_node_t *) element;
+
+            VALUE key = pm_compile_shareable_constant_literal(iseq, assoc->key, scope_node);
+            if (key == Qundef) return Qundef;
+
+            VALUE value = pm_compile_shareable_constant_literal(iseq, assoc->value, scope_node);
+            if (value == Qundef) return Qundef;
+
+            rb_hash_aset(result, key, value);
+        }
+
+        return rb_ractor_make_shareable(result);
+      }
+      default:
+        return Qundef;
+    }
+}
+
+/**
+ * Compile the instructions for pushing the value that will be written to a
+ * shared constant.
+ */
+static void
+pm_compile_shareable_constant_value(rb_iseq_t *iseq, const pm_node_t *node, const pm_node_flags_t shareability, VALUE path, LINK_ANCHOR *const ret, pm_scope_node_t *scope_node, bool top)
+{
+    VALUE literal = pm_compile_shareable_constant_literal(iseq, node, scope_node);
+    if (literal != Qundef) {
+        const pm_node_location_t location = PM_NODE_START_LOCATION(scope_node->parser, node);
+        PUSH_INSN1(ret, location, putobject, literal);
+        return;
+    }
+
+    const pm_node_location_t location = PM_NODE_START_LOCATION(scope_node->parser, node);
+    switch (PM_NODE_TYPE(node)) {
+      case PM_ARRAY_NODE: {
+        const pm_array_node_t *cast = (const pm_array_node_t *) node;
+
+        if (top) {
+            PUSH_INSN1(ret, location, putspecialobject, INT2FIX(VM_SPECIAL_OBJECT_VMCORE));
+        }
+
+        for (size_t index = 0; index < cast->elements.size; index++) {
+            pm_compile_shareable_constant_value(iseq, cast->elements.nodes[index], shareability, path, ret, scope_node, false);
+        }
+
+        PUSH_INSN1(ret, location, newarray, INT2FIX(cast->elements.size));
+
+        if (top) {
+            ID method_id = (shareability & PM_SHAREABLE_CONSTANT_NODE_FLAGS_EXPERIMENTAL_COPY) ? rb_intern("make_shareable_copy") : rb_intern("make_shareable");
+            PUSH_SEND_WITH_FLAG(ret, location, method_id, INT2FIX(1), INT2FIX(VM_CALL_ARGS_SIMPLE));
+        }
+
+        return;
+      }
+      case PM_HASH_NODE: {
+        const pm_hash_node_t *cast = (const pm_hash_node_t *) node;
+
+        if (top) {
+            PUSH_INSN1(ret, location, putspecialobject, INT2FIX(VM_SPECIAL_OBJECT_VMCORE));
+        }
+
+        pm_compile_hash_elements(iseq, (const pm_node_t *) cast, &cast->elements, shareability, path, false, ret, scope_node);
+
+        if (top) {
+            ID method_id = (shareability & PM_SHAREABLE_CONSTANT_NODE_FLAGS_EXPERIMENTAL_COPY) ? rb_intern("make_shareable_copy") : rb_intern("make_shareable");
+            PUSH_SEND_WITH_FLAG(ret, location, method_id, INT2FIX(1), INT2FIX(VM_CALL_ARGS_SIMPLE));
+        }
+
+        return;
+      }
+      default: {
+        DECL_ANCHOR(value_seq);
+
+        pm_compile_node(iseq, node, value_seq, false, scope_node);
+        if (PM_NODE_TYPE_P(node, PM_INTERPOLATED_STRING_NODE)) {
+            PUSH_SEND_WITH_FLAG(value_seq, location, idUMinus, INT2FIX(0), INT2FIX(VM_CALL_ARGS_SIMPLE));
+        }
+
+        if (shareability & PM_SHAREABLE_CONSTANT_NODE_FLAGS_LITERAL) {
+            PUSH_INSN1(ret, location, putspecialobject, INT2FIX(VM_SPECIAL_OBJECT_VMCORE));
+            PUSH_SEQ(ret, value_seq);
+            PUSH_INSN1(ret, location, putobject, path);
+            PUSH_SEND_WITH_FLAG(ret, location, rb_intern("ensure_shareable"), INT2FIX(2), INT2FIX(VM_CALL_ARGS_SIMPLE));
+        }
+        else if (shareability & PM_SHAREABLE_CONSTANT_NODE_FLAGS_EXPERIMENTAL_COPY) {
+            if (top) PUSH_INSN1(ret, location, putspecialobject, INT2FIX(VM_SPECIAL_OBJECT_VMCORE));
+            PUSH_SEQ(ret, value_seq);
+            if (top) PUSH_SEND_WITH_FLAG(ret, location, rb_intern("make_shareable_copy"), INT2FIX(1), INT2FIX(VM_CALL_ARGS_SIMPLE));
+        }
+        else if (shareability & PM_SHAREABLE_CONSTANT_NODE_FLAGS_EXPERIMENTAL_EVERYTHING) {
+            if (top) PUSH_INSN1(ret, location, putspecialobject, INT2FIX(VM_SPECIAL_OBJECT_VMCORE));
+            PUSH_SEQ(ret, value_seq);
+            if (top) PUSH_SEND_WITH_FLAG(ret, location, rb_intern("make_shareable"), INT2FIX(1), INT2FIX(VM_CALL_ARGS_SIMPLE));
+        }
+
+        break;
+      }
+    }
+}
+
+/**
+ * Compile a constant write node, either in the context of a ractor pragma or
+ * not.
+ */
+static void
+pm_compile_constant_write_node(rb_iseq_t *iseq, const pm_constant_write_node_t *node, const pm_node_flags_t shareability, const pm_node_location_t *node_location, LINK_ANCHOR *const ret, bool popped, pm_scope_node_t *scope_node)
+{
+    const pm_node_location_t location = *node_location;
+    ID name_id = pm_constant_id_lookup(scope_node, node->name);
+
+    if (shareability != 0) {
+        pm_compile_shareable_constant_value(iseq, node->value, shareability, rb_id2str(name_id), ret, scope_node, true);
+    }
+    else {
+        PM_COMPILE_NOT_POPPED(node->value);
+    }
+
+    if (!popped) PUSH_INSN(ret, location, dup);
+    PUSH_INSN1(ret, location, putspecialobject, INT2FIX(VM_SPECIAL_OBJECT_CONST_BASE));
+
+    VALUE operand = ID2SYM(name_id);
+    PUSH_INSN1(ret, location, setconstant, operand);
+}
+
+/**
+ * Compile a constant and write node, either in the context of a ractor pragma
+ * or not.
+ */
+static void
+pm_compile_constant_and_write_node(rb_iseq_t *iseq, const pm_constant_and_write_node_t *node, const pm_node_flags_t shareability, const pm_node_location_t *node_location, LINK_ANCHOR *const ret, bool popped, pm_scope_node_t *scope_node)
+{
+    const pm_node_location_t location = *node_location;
+
+    VALUE name = ID2SYM(pm_constant_id_lookup(scope_node, node->name));
+    LABEL *end_label = NEW_LABEL(location.line);
+
+    pm_compile_constant_read(iseq, name, &node->name_loc, location.node_id, ret, scope_node);
+    if (!popped) PUSH_INSN(ret, location, dup);
+
+    PUSH_INSNL(ret, location, branchunless, end_label);
+    if (!popped) PUSH_INSN(ret, location, pop);
+
+    if (shareability != 0) {
+        pm_compile_shareable_constant_value(iseq, node->value, shareability, name, ret, scope_node, true);
+    }
+    else {
+        PM_COMPILE_NOT_POPPED(node->value);
+    }
+
+    if (!popped) PUSH_INSN(ret, location, dup);
+    PUSH_INSN1(ret, location, putspecialobject, INT2FIX(VM_SPECIAL_OBJECT_CONST_BASE));
+    PUSH_INSN1(ret, location, setconstant, name);
+    PUSH_LABEL(ret, end_label);
+}
+
+/**
+ * Compile a constant or write node, either in the context of a ractor pragma or
+ * not.
+ */
+static void
+pm_compile_constant_or_write_node(rb_iseq_t *iseq, const pm_constant_or_write_node_t *node, const pm_node_flags_t shareability, const pm_node_location_t *node_location, LINK_ANCHOR *const ret, bool popped, pm_scope_node_t *scope_node)
+{
+    const pm_node_location_t location = *node_location;
+    VALUE name = ID2SYM(pm_constant_id_lookup(scope_node, node->name));
+
+    LABEL *set_label = NEW_LABEL(location.line);
+    LABEL *end_label = NEW_LABEL(location.line);
+
+    PUSH_INSN(ret, location, putnil);
+    PUSH_INSN3(ret, location, defined, INT2FIX(DEFINED_CONST), name, Qtrue);
+    PUSH_INSNL(ret, location, branchunless, set_label);
+
+    pm_compile_constant_read(iseq, name, &node->name_loc, location.node_id, ret, scope_node);
+    if (!popped) PUSH_INSN(ret, location, dup);
+
+    PUSH_INSNL(ret, location, branchif, end_label);
+    if (!popped) PUSH_INSN(ret, location, pop);
+    PUSH_LABEL(ret, set_label);
+
+    if (shareability != 0) {
+        pm_compile_shareable_constant_value(iseq, node->value, shareability, name, ret, scope_node, true);
+    }
+    else {
+        PM_COMPILE_NOT_POPPED(node->value);
+    }
+
+    if (!popped) PUSH_INSN(ret, location, dup);
+    PUSH_INSN1(ret, location, putspecialobject, INT2FIX(VM_SPECIAL_OBJECT_CONST_BASE));
+    PUSH_INSN1(ret, location, setconstant, name);
+    PUSH_LABEL(ret, end_label);
+}
+
+/**
+ * Compile a constant operator write node, either in the context of a ractor
+ * pragma or not.
+ */
+static void
+pm_compile_constant_operator_write_node(rb_iseq_t *iseq, const pm_constant_operator_write_node_t *node, const pm_node_flags_t shareability, const pm_node_location_t *node_location, LINK_ANCHOR *const ret, bool popped, pm_scope_node_t *scope_node)
+{
+    const pm_node_location_t location = *node_location;
+
+    VALUE name = ID2SYM(pm_constant_id_lookup(scope_node, node->name));
+    ID method_id = pm_constant_id_lookup(scope_node, node->binary_operator);
+
+    pm_compile_constant_read(iseq, name, &node->name_loc, location.node_id, ret, scope_node);
+
+    if (shareability != 0) {
+        pm_compile_shareable_constant_value(iseq, node->value, shareability, name, ret, scope_node, true);
+    }
+    else {
+        PM_COMPILE_NOT_POPPED(node->value);
+    }
+
+    PUSH_SEND_WITH_FLAG(ret, location, method_id, INT2NUM(1), INT2FIX(VM_CALL_ARGS_SIMPLE));
+    if (!popped) PUSH_INSN(ret, location, dup);
+
+    PUSH_INSN1(ret, location, putspecialobject, INT2FIX(VM_SPECIAL_OBJECT_CONST_BASE));
+    PUSH_INSN1(ret, location, setconstant, name);
+}
+
+/**
+ * Creates a string that is used in ractor error messages to describe the
+ * constant path being written.
+ */
+static VALUE
+pm_constant_path_path(const pm_constant_path_node_t *node, const pm_scope_node_t *scope_node)
+{
+    VALUE parts = rb_ary_new();
+    rb_ary_push(parts, rb_id2str(pm_constant_id_lookup(scope_node, node->name)));
+
+    const pm_node_t *current = node->parent;
+    while (current != NULL && PM_NODE_TYPE_P(current, PM_CONSTANT_PATH_NODE)) {
+        const pm_constant_path_node_t *cast = (const pm_constant_path_node_t *) current;
+        rb_ary_unshift(parts, rb_id2str(pm_constant_id_lookup(scope_node, cast->name)));
+        current = cast->parent;
+    }
+
+    if (current == NULL) {
+        rb_ary_unshift(parts, rb_id2str(idNULL));
+    }
+    else if (PM_NODE_TYPE_P(current, PM_CONSTANT_READ_NODE)) {
+        rb_ary_unshift(parts, rb_id2str(pm_constant_id_lookup(scope_node, ((const pm_constant_read_node_t *) current)->name)));
+    }
+    else {
+        rb_ary_unshift(parts, rb_str_new_cstr("..."));
+    }
+
+    return rb_ary_join(parts, rb_str_new_cstr("::"));
+}
+
+/**
+ * Compile a constant path write node, either in the context of a ractor pragma
+ * or not.
+ */
+static void
+pm_compile_constant_path_write_node(rb_iseq_t *iseq, const pm_constant_path_write_node_t *node, const pm_node_flags_t shareability, const pm_node_location_t *node_location, LINK_ANCHOR *const ret, bool popped, pm_scope_node_t *scope_node)
+{
+    const pm_node_location_t location = *node_location;
+    const pm_constant_path_node_t *target = node->target;
+    VALUE name = ID2SYM(pm_constant_id_lookup(scope_node, target->name));
+
+    if (target->parent) {
+        PM_COMPILE_NOT_POPPED((const pm_node_t *) target->parent);
+    }
+    else {
+        PUSH_INSN1(ret, location, putobject, rb_cObject);
+    }
+
+    if (shareability != 0) {
+        pm_compile_shareable_constant_value(iseq, node->value, shareability, pm_constant_path_path(node->target, scope_node), ret, scope_node, true);
+    }
+    else {
+        PM_COMPILE_NOT_POPPED(node->value);
+    }
+
+    if (!popped) {
+        PUSH_INSN(ret, location, swap);
+        PUSH_INSN1(ret, location, topn, INT2FIX(1));
+    }
+
+    PUSH_INSN(ret, location, swap);
+    PUSH_INSN1(ret, location, setconstant, name);
+}
+
+/**
+ * Compile a constant path and write node, either in the context of a ractor
+ * pragma or not.
+ */
+static void
+pm_compile_constant_path_and_write_node(rb_iseq_t *iseq, const pm_constant_path_and_write_node_t *node, const pm_node_flags_t shareability, const pm_node_location_t *node_location, LINK_ANCHOR *const ret, bool popped, pm_scope_node_t *scope_node)
+{
+    const pm_node_location_t location = *node_location;
+    const pm_constant_path_node_t *target = node->target;
+
+    VALUE name = ID2SYM(pm_constant_id_lookup(scope_node, target->name));
+    LABEL *lfin = NEW_LABEL(location.line);
+
+    if (target->parent) {
+        PM_COMPILE_NOT_POPPED(target->parent);
+    }
+    else {
+        PUSH_INSN1(ret, location, putobject, rb_cObject);
+    }
+
+    PUSH_INSN(ret, location, dup);
+    PUSH_INSN1(ret, location, putobject, Qtrue);
+    PUSH_INSN1(ret, location, getconstant, name);
+
+    if (!popped) PUSH_INSN(ret, location, dup);
+    PUSH_INSNL(ret, location, branchunless, lfin);
+
+    if (!popped) PUSH_INSN(ret, location, pop);
+
+    if (shareability != 0) {
+        pm_compile_shareable_constant_value(iseq, node->value, shareability, pm_constant_path_path(node->target, scope_node), ret, scope_node, true);
+    }
+    else {
+        PM_COMPILE_NOT_POPPED(node->value);
+    }
+
+    if (popped) {
+        PUSH_INSN1(ret, location, topn, INT2FIX(1));
+    }
+    else {
+        PUSH_INSN1(ret, location, dupn, INT2FIX(2));
+        PUSH_INSN(ret, location, swap);
+    }
+
+    PUSH_INSN1(ret, location, setconstant, name);
+    PUSH_LABEL(ret, lfin);
+
+    if (!popped) PUSH_INSN(ret, location, swap);
+    PUSH_INSN(ret, location, pop);
+}
+
+/**
+ * Compile a constant path or write node, either in the context of a ractor
+ * pragma or not.
+ */
+static void
+pm_compile_constant_path_or_write_node(rb_iseq_t *iseq, const pm_constant_path_or_write_node_t *node, const pm_node_flags_t shareability, const pm_node_location_t *node_location, LINK_ANCHOR *const ret, bool popped, pm_scope_node_t *scope_node)
+{
+    const pm_node_location_t location = *node_location;
+    const pm_constant_path_node_t *target = node->target;
+
+    VALUE name = ID2SYM(pm_constant_id_lookup(scope_node, target->name));
+    LABEL *lassign = NEW_LABEL(location.line);
+    LABEL *lfin = NEW_LABEL(location.line);
+
+    if (target->parent) {
+        PM_COMPILE_NOT_POPPED(target->parent);
+    }
+    else {
+        PUSH_INSN1(ret, location, putobject, rb_cObject);
+    }
+
+    PUSH_INSN(ret, location, dup);
+    PUSH_INSN3(ret, location, defined, INT2FIX(DEFINED_CONST_FROM), name, Qtrue);
+    PUSH_INSNL(ret, location, branchunless, lassign);
+
+    PUSH_INSN(ret, location, dup);
+    PUSH_INSN1(ret, location, putobject, Qtrue);
+    PUSH_INSN1(ret, location, getconstant, name);
+
+    if (!popped) PUSH_INSN(ret, location, dup);
+    PUSH_INSNL(ret, location, branchif, lfin);
+
+    if (!popped) PUSH_INSN(ret, location, pop);
+    PUSH_LABEL(ret, lassign);
+
+    if (shareability != 0) {
+        pm_compile_shareable_constant_value(iseq, node->value, shareability, pm_constant_path_path(node->target, scope_node), ret, scope_node, true);
+    }
+    else {
+        PM_COMPILE_NOT_POPPED(node->value);
+    }
+
+    if (popped) {
+        PUSH_INSN1(ret, location, topn, INT2FIX(1));
+    }
+    else {
+        PUSH_INSN1(ret, location, dupn, INT2FIX(2));
+        PUSH_INSN(ret, location, swap);
+    }
+
+    PUSH_INSN1(ret, location, setconstant, name);
+    PUSH_LABEL(ret, lfin);
+
+    if (!popped) PUSH_INSN(ret, location, swap);
+    PUSH_INSN(ret, location, pop);
+}
+
+/**
+ * Compile a constant path operator write node, either in the context of a
+ * ractor pragma or not.
+ */
+static void
+pm_compile_constant_path_operator_write_node(rb_iseq_t *iseq, const pm_constant_path_operator_write_node_t *node, const pm_node_flags_t shareability, const pm_node_location_t *node_location, LINK_ANCHOR *const ret, bool popped, pm_scope_node_t *scope_node)
+{
+    const pm_node_location_t location = *node_location;
+    const pm_constant_path_node_t *target = node->target;
+
+    ID method_id = pm_constant_id_lookup(scope_node, node->binary_operator);
+    VALUE name = ID2SYM(pm_constant_id_lookup(scope_node, target->name));
+
+    if (target->parent) {
+        PM_COMPILE_NOT_POPPED(target->parent);
+    }
+    else {
+        PUSH_INSN1(ret, location, putobject, rb_cObject);
+    }
+
+    PUSH_INSN(ret, location, dup);
+    PUSH_INSN1(ret, location, putobject, Qtrue);
+    PUSH_INSN1(ret, location, getconstant, name);
+
+    if (shareability != 0) {
+        pm_compile_shareable_constant_value(iseq, node->value, shareability, pm_constant_path_path(node->target, scope_node), ret, scope_node, true);
+    }
+    else {
+        PM_COMPILE_NOT_POPPED(node->value);
+    }
+
+    PUSH_CALL(ret, location, method_id, INT2FIX(1));
+    PUSH_INSN(ret, location, swap);
+
+    if (!popped) {
+        PUSH_INSN1(ret, location, topn, INT2FIX(1));
+        PUSH_INSN(ret, location, swap);
+    }
+
+    PUSH_INSN1(ret, location, setconstant, name);
+}
+
+/**
+ * Many nodes in Prism can be marked as a static literal, which means slightly
+ * different things depending on which node it is. Occasionally we need to omit
+ * container nodes from static literal checks, which is where this macro comes
+ * in.
+ */
+#define PM_CONTAINER_P(node) (PM_NODE_TYPE_P(node, PM_ARRAY_NODE) || PM_NODE_TYPE_P(node, PM_HASH_NODE) || PM_NODE_TYPE_P(node, PM_RANGE_NODE))
+
+/**
+ * Compile a scope node, which is a special kind of node that represents a new
+ * lexical scope, attached to a node in the AST.
+ */
+static inline void
+pm_compile_scope_node(rb_iseq_t *iseq, pm_scope_node_t *scope_node, const pm_node_location_t *node_location, LINK_ANCHOR *const ret, bool popped)
+{
+    const pm_node_location_t location = *node_location;
+    struct rb_iseq_constant_body *body = ISEQ_BODY(iseq);
+
+    pm_constant_id_list_t *locals = &scope_node->locals;
+    pm_parameters_node_t *parameters_node = NULL;
+    pm_node_list_t *keywords_list = NULL;
+    pm_node_list_t *optionals_list = NULL;
+    pm_node_list_t *posts_list = NULL;
+    pm_node_list_t *requireds_list = NULL;
+    pm_node_list_t *block_locals = NULL;
+    bool trailing_comma = false;
+
+    if (PM_NODE_TYPE_P(scope_node->ast_node, PM_CLASS_NODE) || PM_NODE_TYPE_P(scope_node->ast_node, PM_MODULE_NODE)) {
+        PUSH_TRACE(ret, RUBY_EVENT_CLASS);
+    }
+
+    if (scope_node->parameters != NULL) {
+        switch (PM_NODE_TYPE(scope_node->parameters)) {
+          case PM_BLOCK_PARAMETERS_NODE: {
+            pm_block_parameters_node_t *cast = (pm_block_parameters_node_t *) scope_node->parameters;
+            parameters_node = cast->parameters;
+            block_locals = &cast->locals;
+
+            if (parameters_node) {
+                if (parameters_node->rest && PM_NODE_TYPE_P(parameters_node->rest, PM_IMPLICIT_REST_NODE)) {
+                    trailing_comma = true;
+                }
+            }
+            break;
+          }
+          case PM_PARAMETERS_NODE: {
+            parameters_node = (pm_parameters_node_t *) scope_node->parameters;
+            break;
+          }
+          case PM_NUMBERED_PARAMETERS_NODE: {
+            uint32_t maximum = ((const pm_numbered_parameters_node_t *) scope_node->parameters)->maximum;
+            body->param.lead_num = maximum;
+            body->param.flags.ambiguous_param0 = maximum == 1;
+            break;
+          }
+          case PM_IT_PARAMETERS_NODE:
+            body->param.lead_num = 1;
+            body->param.flags.ambiguous_param0 = true;
+            break;
+          default:
+            rb_bug("Unexpected node type for parameters: %s", pm_node_type_to_str(PM_NODE_TYPE(scope_node->parameters)));
+        }
+    }
+
+    struct rb_iseq_param_keyword *keyword = NULL;
+
+    if (parameters_node) {
+        optionals_list = &parameters_node->optionals;
+        requireds_list = &parameters_node->requireds;
+        keywords_list = &parameters_node->keywords;
+        posts_list = &parameters_node->posts;
+    }
+    else if (scope_node->parameters && (PM_NODE_TYPE_P(scope_node->parameters, PM_NUMBERED_PARAMETERS_NODE) || PM_NODE_TYPE_P(scope_node->parameters, PM_IT_PARAMETERS_NODE))) {
+        body->param.opt_num = 0;
+    }
+    else {
+        body->param.lead_num = 0;
+        body->param.opt_num = 0;
+    }
+
+    //********STEP 1**********
+    // Goal: calculate the table size for the locals, accounting for
+    // hidden variables and multi target nodes
+    size_t locals_size = locals->size;
+
+    // Index lookup table buffer size is only the number of the locals
+    st_table *index_lookup_table = st_init_numtable();
+
+    int table_size = (int) locals_size;
+
+    // For nodes have a hidden iteration variable. We add that to the local
+    // table size here.
+    if (PM_NODE_TYPE_P(scope_node->ast_node, PM_FOR_NODE)) table_size++;
+
+    if (keywords_list && keywords_list->size) {
+        table_size++;
+    }
+
+    if (requireds_list) {
+        for (size_t i = 0; i < requireds_list->size; i++) {
+            // For each MultiTargetNode, we're going to have one
+            // additional anonymous local not represented in the locals table
+            // We want to account for this in our table size
+            pm_node_t *required = requireds_list->nodes[i];
+            if (PM_NODE_TYPE_P(required, PM_MULTI_TARGET_NODE)) {
+                table_size++;
+            }
+            else if (PM_NODE_TYPE_P(required, PM_REQUIRED_PARAMETER_NODE)) {
+                if (PM_NODE_FLAG_P(required, PM_PARAMETER_FLAGS_REPEATED_PARAMETER)) {
+                    table_size++;
+                }
+            }
+        }
+    }
+
+    // If we have the `it` implicit local variable, we need to account for
+    // it in the local table size.
+    if (scope_node->parameters != NULL && PM_NODE_TYPE_P(scope_node->parameters, PM_IT_PARAMETERS_NODE)) {
+        table_size++;
+    }
+
+    // Ensure there is enough room in the local table for any
+    // parameters that have been repeated
+    // ex: def underscore_parameters(_, _ = 1, _ = 2); _; end
+    //                                  ^^^^^^^^^^^^
+    if (optionals_list && optionals_list->size) {
+        for (size_t i = 0; i < optionals_list->size; i++) {
+            pm_node_t * node = optionals_list->nodes[i];
+            if (PM_NODE_FLAG_P(node, PM_PARAMETER_FLAGS_REPEATED_PARAMETER)) {
+                table_size++;
+            }
+        }
+    }
+
+    // If we have an anonymous "rest" node, we'll need to increase the local
+    // table size to take it in to account.
+    // def m(foo, *, bar)
+    //            ^
+    if (parameters_node) {
+        if (parameters_node->rest) {
+            if (!(PM_NODE_TYPE_P(parameters_node->rest, PM_IMPLICIT_REST_NODE))) {
+                if (!((const pm_rest_parameter_node_t *) parameters_node->rest)->name || PM_NODE_FLAG_P(parameters_node->rest, PM_PARAMETER_FLAGS_REPEATED_PARAMETER)) {
+                    table_size++;
+                }
+            }
+        }
+
+        // def foo(_, **_); _; end
+        //            ^^^
+        if (parameters_node->keyword_rest) {
+            // def foo(...); end
+            //         ^^^
+            // When we have a `...` as the keyword_rest, it's a forwarding_parameter_node and
+            // we need to leave space for 4 locals: *, **, &, ...
+            if (PM_NODE_TYPE_P(parameters_node->keyword_rest, PM_FORWARDING_PARAMETER_NODE)) {
+                // Only optimize specifically methods like this: `foo(...)`
+                if (requireds_list->size == 0 && optionals_list->size == 0 && keywords_list->size == 0) {
+                    ISEQ_BODY(iseq)->param.flags.use_block = TRUE;
+                    ISEQ_BODY(iseq)->param.flags.forwardable = TRUE;
+                    table_size += 1;
+                }
+                else {
+                    table_size += 4;
+                }
+            }
+            else {
+                const pm_keyword_rest_parameter_node_t *kw_rest = (const pm_keyword_rest_parameter_node_t *) parameters_node->keyword_rest;
+
+                // If it's anonymous or repeated, then we need to allocate stack space
+                if (!kw_rest->name || PM_NODE_FLAG_P(kw_rest, PM_PARAMETER_FLAGS_REPEATED_PARAMETER)) {
+                    table_size++;
+                }
+            }
+        }
+    }
+
+    if (posts_list) {
+        for (size_t i = 0; i < posts_list->size; i++) {
+            // For each MultiTargetNode, we're going to have one
+            // additional anonymous local not represented in the locals table
+            // We want to account for this in our table size
+            pm_node_t *required = posts_list->nodes[i];
+            if (PM_NODE_TYPE_P(required, PM_MULTI_TARGET_NODE) || PM_NODE_FLAG_P(required, PM_PARAMETER_FLAGS_REPEATED_PARAMETER)) {
+                table_size++;
+            }
+        }
+    }
+
+    if (keywords_list && keywords_list->size) {
+        for (size_t i = 0; i < keywords_list->size; i++) {
+            pm_node_t *keyword_parameter_node = keywords_list->nodes[i];
+            if (PM_NODE_FLAG_P(keyword_parameter_node, PM_PARAMETER_FLAGS_REPEATED_PARAMETER)) {
+                table_size++;
+            }
+        }
+    }
+
+    if (parameters_node && parameters_node->block) {
+        const pm_block_parameter_node_t *block_node = (const pm_block_parameter_node_t *) parameters_node->block;
+
+        if (PM_NODE_FLAG_P(block_node, PM_PARAMETER_FLAGS_REPEATED_PARAMETER) || !block_node->name) {
+            table_size++;
+        }
+    }
+
+    // We can create local_table_for_iseq with the correct size
+    VALUE idtmp = 0;
+    rb_ast_id_table_t *local_table_for_iseq = ALLOCV(idtmp, sizeof(rb_ast_id_table_t) + table_size * sizeof(ID));
+    local_table_for_iseq->size = table_size;
+
+    //********END OF STEP 1**********
+
+    //********STEP 2**********
+    // Goal: populate iv index table as well as local table, keeping the
+    // layout of the local table consistent with the layout of the
+    // stack when calling the method
+    //
+    // Do a first pass on all of the parameters, setting their values in
+    // the local_table_for_iseq, _except_ for Multis who get a hidden
+    // variable in this step, and will get their names inserted in step 3
+
+    // local_index is a cursor that keeps track of the current
+    // index into local_table_for_iseq. The local table is actually a list,
+    // and the order of that list must match the order of the items pushed
+    // on the stack.  We need to take in to account things pushed on the
+    // stack that _might not have a name_ (for example array destructuring).
+    // This index helps us know which item we're dealing with and also give
+    // those anonymous items temporary names (as below)
+    int local_index = 0;
+
+    // Here we figure out local table indices and insert them in to the
+    // index lookup table and local tables.
+    //
+    // def foo(a, (b, *c, d), e = 1, *f, g, (h, *i, j), k:, l: 1, **m, &n)
+    //         ^^^^^^^^^^^^^
+    if (requireds_list && requireds_list->size) {
+        for (size_t i = 0; i < requireds_list->size; i++, local_index++) {
+            ID local;
+
+            // For each MultiTargetNode, we're going to have one additional
+            // anonymous local not represented in the locals table. We want
+            // to account for this in our table size.
+            pm_node_t *required = requireds_list->nodes[i];
+
+            switch (PM_NODE_TYPE(required)) {
+              case PM_MULTI_TARGET_NODE: {
+                // def foo(a, (b, *c, d), e = 1, *f, g, (h, *i, j), k:, l: 1, **m, &n)
+                //            ^^^^^^^^^^
+                local = rb_make_temporary_id(local_index);
+                local_table_for_iseq->ids[local_index] = local;
+                break;
+              }
+              case PM_REQUIRED_PARAMETER_NODE: {
+                // def foo(a, (b, *c, d), e = 1, *f, g, (h, *i, j), k:, l: 1, **m, &n)
+                //         ^
+                const pm_required_parameter_node_t *param = (const pm_required_parameter_node_t *) required;
+
+                if (PM_NODE_FLAG_P(required, PM_PARAMETER_FLAGS_REPEATED_PARAMETER)) {
+                    ID local = pm_constant_id_lookup(scope_node, param->name);
+                    local_table_for_iseq->ids[local_index] = local;
+                }
+                else {
+                    pm_insert_local_index(param->name, local_index, index_lookup_table, local_table_for_iseq, scope_node);
+                }
+
+                break;
+              }
+              default:
+                rb_bug("Unsupported node in requireds in parameters %s", pm_node_type_to_str(PM_NODE_TYPE(required)));
+            }
+        }
+
+        body->param.lead_num = (int) requireds_list->size;
+        body->param.flags.has_lead = true;
+    }
+
+    if (scope_node->parameters != NULL && PM_NODE_TYPE_P(scope_node->parameters, PM_IT_PARAMETERS_NODE)) {
+        ID local = rb_make_temporary_id(local_index);
+        local_table_for_iseq->ids[local_index++] = local;
+    }
+
+    // def foo(a, (b, *c, d), e = 1, *f, g, (h, *i, j), k:, l: 1, **m, &n)
+    //                        ^^^^^
+    if (optionals_list && optionals_list->size) {
+        body->param.opt_num = (int) optionals_list->size;
+        body->param.flags.has_opt = true;
+
+        for (size_t i = 0; i < optionals_list->size; i++, local_index++) {
+            pm_node_t * node = optionals_list->nodes[i];
+            pm_constant_id_t name = ((const pm_optional_parameter_node_t *) node)->name;
+
+            if (PM_NODE_FLAG_P(node, PM_PARAMETER_FLAGS_REPEATED_PARAMETER)) {
+                ID local = pm_constant_id_lookup(scope_node, name);
+                local_table_for_iseq->ids[local_index] = local;
+            }
+            else {
+                pm_insert_local_index(name, local_index, index_lookup_table, local_table_for_iseq, scope_node);
+            }
+        }
+    }
+
+    // def foo(a, (b, *c, d), e = 1, *f, g, (h, *i, j), k:, l: 1, **m, &n)
+    //                               ^^
+    if (parameters_node && parameters_node->rest) {
+        body->param.rest_start = local_index;
+
+        // If there's a trailing comma, we'll have an implicit rest node,
+        // and we don't want it to impact the rest variables on param
+        if (!(PM_NODE_TYPE_P(parameters_node->rest, PM_IMPLICIT_REST_NODE))) {
+            body->param.flags.has_rest = true;
+            RUBY_ASSERT(body->param.rest_start != -1);
+
+            pm_constant_id_t name = ((const pm_rest_parameter_node_t *) parameters_node->rest)->name;
+
+            if (name) {
+                // def foo(a, (b, *c, d), e = 1, *f, g, (h, *i, j), k:, l: 1, **m, &n)
+                //                               ^^
+                if (PM_NODE_FLAG_P(parameters_node->rest, PM_PARAMETER_FLAGS_REPEATED_PARAMETER)) {
+                    ID local = pm_constant_id_lookup(scope_node, name);
+                    local_table_for_iseq->ids[local_index] = local;
+                }
+                else {
+                    pm_insert_local_index(name, local_index, index_lookup_table, local_table_for_iseq, scope_node);
+                }
+            }
+            else {
+                // def foo(a, (b, *c, d), e = 1, *, g, (h, *i, j), k:, l: 1, **m, &n)
+                //                               ^
+                body->param.flags.anon_rest = true;
+                pm_insert_local_special(idMULT, local_index, index_lookup_table, local_table_for_iseq);
+            }
+
+            local_index++;
+        }
+    }
+
+    // def foo(a, (b, *c, d), e = 1, *f, g, (h, *i, j), k:, l: 1, **m, &n)
+    //                                   ^^^^^^^^^^^^^
+    if (posts_list && posts_list->size) {
+        body->param.post_num = (int) posts_list->size;
+        body->param.post_start = local_index;
+        body->param.flags.has_post = true;
+
+        for (size_t i = 0; i < posts_list->size; i++, local_index++) {
+            ID local;
+
+            // For each MultiTargetNode, we're going to have one additional
+            // anonymous local not represented in the locals table. We want
+            // to account for this in our table size.
+            const pm_node_t *post_node = posts_list->nodes[i];
+
+            switch (PM_NODE_TYPE(post_node)) {
+              case PM_MULTI_TARGET_NODE: {
+                // def foo(a, (b, *c, d), e = 1, *f, g, (h, *i, j), k:, l: 1, **m, &n)
+                //                                      ^^^^^^^^^^
+                local = rb_make_temporary_id(local_index);
+                local_table_for_iseq->ids[local_index] = local;
+                break;
+              }
+              case PM_REQUIRED_PARAMETER_NODE: {
+                // def foo(a, (b, *c, d), e = 1, *f, g, (h, *i, j), k:, l: 1, **m, &n)
+                //                                   ^
+                const pm_required_parameter_node_t *param = (const pm_required_parameter_node_t *) post_node;
+
+                if (PM_NODE_FLAG_P(param, PM_PARAMETER_FLAGS_REPEATED_PARAMETER)) {
+                    ID local = pm_constant_id_lookup(scope_node, param->name);
+                    local_table_for_iseq->ids[local_index] = local;
+                }
+                else {
+                    pm_insert_local_index(param->name, local_index, index_lookup_table, local_table_for_iseq, scope_node);
+                }
+                break;
+              }
+              default:
+                rb_bug("Unsupported node in posts in parameters %s", pm_node_type_to_str(PM_NODE_TYPE(post_node)));
+            }
+        }
+    }
+
+    // def foo(a, (b, *c, d), e = 1, *f, g, (h, *i, j), k:, l: 1, **m, &n)
+    //                                                   ^^^^^^^^
+    // Keywords create an internal variable on the parse tree
+    if (keywords_list && keywords_list->size) {
+        keyword = ZALLOC_N(struct rb_iseq_param_keyword, 1);
+        keyword->num = (int) keywords_list->size;
+
+        const VALUE default_values = rb_ary_hidden_new(1);
+        const VALUE complex_mark = rb_str_tmp_new(0);
+
+        for (size_t i = 0; i < keywords_list->size; i++) {
+            pm_node_t *keyword_parameter_node = keywords_list->nodes[i];
+            pm_constant_id_t name;
+
+            // def foo(a, (b, *c, d), e = 1, *f, g, (h, *i, j), k:, l: 1, **m, &n)
+            //                                                   ^^
+            if (PM_NODE_TYPE_P(keyword_parameter_node, PM_REQUIRED_KEYWORD_PARAMETER_NODE)) {
+                name = ((const pm_required_keyword_parameter_node_t *) keyword_parameter_node)->name;
+                keyword->required_num++;
+                ID local = pm_constant_id_lookup(scope_node, name);
+
+                if (PM_NODE_FLAG_P(keyword_parameter_node, PM_PARAMETER_FLAGS_REPEATED_PARAMETER)) {
+                    local_table_for_iseq->ids[local_index] = local;
+                }
+                else {
+                    pm_insert_local_index(name, local_index, index_lookup_table, local_table_for_iseq, scope_node);
+                }
+                local_index++;
+            }
+        }
+
+        for (size_t i = 0; i < keywords_list->size; i++) {
+            pm_node_t *keyword_parameter_node = keywords_list->nodes[i];
+            pm_constant_id_t name;
+
+            // def foo(a, (b, *c, d), e = 1, *f, g, (h, *i, j), k:, l: 1, **m, &n)
+            //                                                       ^^^^
+            if (PM_NODE_TYPE_P(keyword_parameter_node, PM_OPTIONAL_KEYWORD_PARAMETER_NODE)) {
+                const pm_optional_keyword_parameter_node_t *cast = ((const pm_optional_keyword_parameter_node_t *) keyword_parameter_node);
+
+                pm_node_t *value = cast->value;
+                name = cast->name;
+
+                if (PM_NODE_FLAG_P(value, PM_NODE_FLAG_STATIC_LITERAL) && !PM_CONTAINER_P(value)) {
+                    rb_ary_push(default_values, pm_static_literal_value(iseq, value, scope_node));
+                }
+                else {
+                    rb_ary_push(default_values, complex_mark);
+                }
+
+                ID local = pm_constant_id_lookup(scope_node, name);
+                if (PM_NODE_FLAG_P(keyword_parameter_node, PM_PARAMETER_FLAGS_REPEATED_PARAMETER)) {
+                    local_table_for_iseq->ids[local_index] = local;
+                }
+                else {
+                    pm_insert_local_index(name, local_index, index_lookup_table, local_table_for_iseq, scope_node);
+                }
+                local_index++;
+            }
+
+        }
+
+        if (RARRAY_LEN(default_values)) {
+            VALUE *dvs = ALLOC_N(VALUE, RARRAY_LEN(default_values));
+
+            for (int i = 0; i < RARRAY_LEN(default_values); i++) {
+                VALUE dv = RARRAY_AREF(default_values, i);
+                if (dv == complex_mark) dv = Qundef;
+                RB_OBJ_WRITE(iseq, &dvs[i], dv);
+            }
+
+            keyword->default_values = dvs;
+        }
+
+        // Hidden local for keyword arguments
+        keyword->bits_start = local_index;
+        ID local = rb_make_temporary_id(local_index);
+        local_table_for_iseq->ids[local_index] = local;
+        local_index++;
+
+        body->param.keyword = keyword;
+        body->param.flags.has_kw = true;
+    }
+
+    if (body->type == ISEQ_TYPE_BLOCK && local_index == 1 && requireds_list && requireds_list->size == 1 && !trailing_comma) {
+        body->param.flags.ambiguous_param0 = true;
+    }
+
+    if (parameters_node) {
+        // def foo(a, (b, *c, d), e = 1, *f, g, (h, *i, j), k:, l: 1, **m, &n)
+        //                                                             ^^^
+        if (parameters_node->keyword_rest) {
+            switch (PM_NODE_TYPE(parameters_node->keyword_rest)) {
+              case PM_NO_KEYWORDS_PARAMETER_NODE: {
+                // def foo(a, (b, *c, d), e = 1, *f, g, (h, *i, j), k:, l: 1, **nil, &n)
+                //                                                             ^^^^^
+                body->param.flags.accepts_no_kwarg = true;
+                break;
+              }
+              case PM_KEYWORD_REST_PARAMETER_NODE: {
+                // def foo(a, (b, *c, d), e = 1, *f, g, (h, *i, j), k:, l: 1, **m, &n)
+                //                                                             ^^^
+                const pm_keyword_rest_parameter_node_t *kw_rest_node = (const pm_keyword_rest_parameter_node_t *) parameters_node->keyword_rest;
+                if (!body->param.flags.has_kw) {
+                    body->param.keyword = keyword = ZALLOC_N(struct rb_iseq_param_keyword, 1);
+                }
+
+                keyword->rest_start = local_index;
+                body->param.flags.has_kwrest = true;
+
+                pm_constant_id_t constant_id = kw_rest_node->name;
+                if (constant_id) {
+                    if (PM_NODE_FLAG_P(kw_rest_node, PM_PARAMETER_FLAGS_REPEATED_PARAMETER)) {
+                        ID local = pm_constant_id_lookup(scope_node, constant_id);
+                        local_table_for_iseq->ids[local_index] = local;
+                    }
+                    else {
+                        pm_insert_local_index(constant_id, local_index, index_lookup_table, local_table_for_iseq, scope_node);
+                    }
+                }
+                else {
+                    body->param.flags.anon_kwrest = true;
+                    pm_insert_local_special(idPow, local_index, index_lookup_table, local_table_for_iseq);
+                }
+
+                local_index++;
+                break;
+              }
+              case PM_FORWARDING_PARAMETER_NODE: {
+                // def foo(...)
+                //         ^^^
+                if (!ISEQ_BODY(iseq)->param.flags.forwardable) {
+                    // Add the anonymous *
+                    body->param.rest_start = local_index;
+                    body->param.flags.has_rest = true;
+                    body->param.flags.anon_rest = true;
+                    pm_insert_local_special(idMULT, local_index++, index_lookup_table, local_table_for_iseq);
+
+                    // Add the anonymous **
+                    RUBY_ASSERT(!body->param.flags.has_kw);
+                    body->param.flags.has_kw = false;
+                    body->param.flags.has_kwrest = true;
+                    body->param.flags.anon_kwrest = true;
+                    body->param.keyword = keyword = ZALLOC_N(struct rb_iseq_param_keyword, 1);
+                    keyword->rest_start = local_index;
+                    pm_insert_local_special(idPow, local_index++, index_lookup_table, local_table_for_iseq);
+
+                    // Add the anonymous &
+                    body->param.block_start = local_index;
+                    body->param.flags.has_block = true;
+                    pm_insert_local_special(idAnd, local_index++, index_lookup_table, local_table_for_iseq);
+                }
+
+                // Add the ...
+                pm_insert_local_special(idDot3, local_index++, index_lookup_table, local_table_for_iseq);
+                break;
+              }
+              default:
+                rb_bug("node type %s not expected as keyword_rest", pm_node_type_to_str(PM_NODE_TYPE(parameters_node->keyword_rest)));
+            }
+        }
+
+        // def foo(a, (b, *c, d), e = 1, *f, g, (h, *i, j), k:, l: 1, **m, &n)
+        //                                                                  ^^
+        if (parameters_node->block) {
+            body->param.block_start = local_index;
+            body->param.flags.has_block = true;
+            iseq_set_use_block(iseq);
+
+            pm_constant_id_t name = ((const pm_block_parameter_node_t *) parameters_node->block)->name;
+
+            if (name) {
+                if (PM_NODE_FLAG_P(parameters_node->block, PM_PARAMETER_FLAGS_REPEATED_PARAMETER)) {
+                    ID local = pm_constant_id_lookup(scope_node, name);
+                    local_table_for_iseq->ids[local_index] = local;
+                }
+                else {
+                    pm_insert_local_index(name, local_index, index_lookup_table, local_table_for_iseq, scope_node);
+                }
+            }
+            else {
+                pm_insert_local_special(idAnd, local_index, index_lookup_table, local_table_for_iseq);
+            }
+
+            local_index++;
+        }
+    }
+
+    //********END OF STEP 2**********
+    // The local table is now consistent with expected
+    // stack layout
+
+    // If there's only one required element in the parameters
+    // CRuby needs to recognize it as an ambiguous parameter
+
+    //********STEP 3**********
+    // Goal: fill in the names of the parameters in MultiTargetNodes
+    //
+    // Go through requireds again to set the multis
+
+    if (requireds_list && requireds_list->size) {
+        for (size_t i = 0; i < requireds_list->size; i++) {
+            // For each MultiTargetNode, we're going to have one
+            // additional anonymous local not represented in the locals table
+            // We want to account for this in our table size
+            const pm_node_t *required = requireds_list->nodes[i];
+
+            if (PM_NODE_TYPE_P(required, PM_MULTI_TARGET_NODE)) {
+                local_index = pm_compile_destructured_param_locals((const pm_multi_target_node_t *) required, index_lookup_table, local_table_for_iseq, scope_node, local_index);
+            }
+        }
+    }
+
+    // Go through posts again to set the multis
+    if (posts_list && posts_list->size) {
+        for (size_t i = 0; i < posts_list->size; i++) {
+            // For each MultiTargetNode, we're going to have one
+            // additional anonymous local not represented in the locals table
+            // We want to account for this in our table size
+            const pm_node_t *post = posts_list->nodes[i];
+
+            if (PM_NODE_TYPE_P(post, PM_MULTI_TARGET_NODE)) {
+                local_index = pm_compile_destructured_param_locals((const pm_multi_target_node_t *) post, index_lookup_table, local_table_for_iseq, scope_node, local_index);
+            }
+        }
+    }
+
+    // Set any anonymous locals for the for node
+    if (PM_NODE_TYPE_P(scope_node->ast_node, PM_FOR_NODE)) {
+        if (PM_NODE_TYPE_P(((const pm_for_node_t *) scope_node->ast_node)->index, PM_LOCAL_VARIABLE_TARGET_NODE)) {
+            body->param.lead_num++;
+        }
+        else {
+            body->param.rest_start = local_index;
+            body->param.flags.has_rest = true;
+        }
+
+        ID local = rb_make_temporary_id(local_index);
+        local_table_for_iseq->ids[local_index] = local;
+        local_index++;
+    }
+
+    // Fill in any NumberedParameters, if they exist
+    if (scope_node->parameters && PM_NODE_TYPE_P(scope_node->parameters, PM_NUMBERED_PARAMETERS_NODE)) {
+        int maximum = ((const pm_numbered_parameters_node_t *) scope_node->parameters)->maximum;
+        RUBY_ASSERT(0 < maximum && maximum <= 9);
+        for (int i = 0; i < maximum; i++, local_index++) {
+            const uint8_t param_name[] = { '_', '1' + i };
+            pm_constant_id_t constant_id = pm_constant_pool_find(&scope_node->parser->constant_pool, param_name, 2);
+            RUBY_ASSERT(constant_id && "parser should fill in any gaps in numbered parameters");
+            pm_insert_local_index(constant_id, local_index, index_lookup_table, local_table_for_iseq, scope_node);
+        }
+        body->param.lead_num = maximum;
+        body->param.flags.has_lead = true;
+    }
+
+    //********END OF STEP 3**********
+
+    //********STEP 4**********
+    // Goal: fill in the method body locals
+    // To be explicit, these are the non-parameter locals
+    // We fill in the block_locals, if they exist
+    // lambda { |x; y| y }
+    //              ^
+    if (block_locals && block_locals->size) {
+        for (size_t i = 0; i < block_locals->size; i++, local_index++) {
+            pm_constant_id_t constant_id = ((const pm_block_local_variable_node_t *) block_locals->nodes[i])->name;
+            pm_insert_local_index(constant_id, local_index, index_lookup_table, local_table_for_iseq, scope_node);
+        }
+    }
+
+    // Fill in any locals we missed
+    if (scope_node->locals.size) {
+        for (size_t i = 0; i < scope_node->locals.size; i++) {
+            pm_constant_id_t constant_id = locals->ids[i];
+            if (constant_id) {
+                struct pm_local_table_insert_ctx ctx;
+                ctx.scope_node = scope_node;
+                ctx.local_table_for_iseq = local_table_for_iseq;
+                ctx.local_index = local_index;
+
+                st_update(index_lookup_table, (st_data_t)constant_id, pm_local_table_insert_func, (st_data_t)&ctx);
+
+                local_index = ctx.local_index;
+            }
+        }
+    }
+
+    //********END OF STEP 4**********
+
+    // We set the index_lookup_table on the scope node so we can
+    // refer to the parameters correctly
+    if (scope_node->index_lookup_table) {
+        st_free_table(scope_node->index_lookup_table);
+    }
+    scope_node->index_lookup_table = index_lookup_table;
+    iseq_calc_param_size(iseq);
+
+    if (ISEQ_BODY(iseq)->param.flags.forwardable) {
+        // We're treating `...` as a parameter so that frame
+        // pushing won't clobber it.
+        ISEQ_BODY(iseq)->param.size += 1;
+    }
+
+    // FIXME: args?
+    iseq_set_local_table(iseq, local_table_for_iseq, 0);
+    scope_node->local_table_for_iseq_size = local_table_for_iseq->size;
+
+    if (keyword != NULL) {
+        size_t keyword_start_index = keyword->bits_start - keyword->num;
+        keyword->table = (ID *)&ISEQ_BODY(iseq)->local_table[keyword_start_index];
+    }
+
+    //********STEP 5************
+    // Goal: compile anything that needed to be compiled
+    if (optionals_list && optionals_list->size) {
+        LABEL **opt_table = (LABEL **) ALLOC_N(VALUE, optionals_list->size + 1);
+        LABEL *label;
+
+        // TODO: Should we make an api for NEW_LABEL where you can pass
+        // a pointer to the label it should fill out?  We already
+        // have a list of labels allocated above so it seems wasteful
+        // to do the copies.
+        for (size_t i = 0; i < optionals_list->size; i++) {
+            label = NEW_LABEL(location.line);
+            opt_table[i] = label;
+            PUSH_LABEL(ret, label);
+            pm_node_t *optional_node = optionals_list->nodes[i];
+            PM_COMPILE_NOT_POPPED(optional_node);
+        }
+
+        // Set the last label
+        label = NEW_LABEL(location.line);
+        opt_table[optionals_list->size] = label;
+        PUSH_LABEL(ret, label);
+
+        body->param.opt_table = (const VALUE *) opt_table;
+    }
+
+    if (keywords_list && keywords_list->size) {
+        size_t optional_index = 0;
+        for (size_t i = 0; i < keywords_list->size; i++) {
+            pm_node_t *keyword_parameter_node = keywords_list->nodes[i];
+            pm_constant_id_t name;
+
+            switch (PM_NODE_TYPE(keyword_parameter_node)) {
+              case PM_OPTIONAL_KEYWORD_PARAMETER_NODE: {
+                // def foo(a, (b, *c, d), e = 1, *f, g, (h, *i, j), k:, l: 1, **m, &n)
+                //                                                       ^^^^
+                const pm_optional_keyword_parameter_node_t *cast = ((const pm_optional_keyword_parameter_node_t *) keyword_parameter_node);
+
+                pm_node_t *value = cast->value;
+                name = cast->name;
+
+                if (!PM_NODE_FLAG_P(value, PM_NODE_FLAG_STATIC_LITERAL) || PM_CONTAINER_P(value)) {
+                    LABEL *end_label = NEW_LABEL(location.line);
+
+                    pm_local_index_t index = pm_lookup_local_index(iseq, scope_node, name, 0);
+                    int kw_bits_idx = table_size - body->param.keyword->bits_start;
+                    PUSH_INSN2(ret, location, checkkeyword, INT2FIX(kw_bits_idx + VM_ENV_DATA_SIZE - 1), INT2FIX(optional_index));
+                    PUSH_INSNL(ret, location, branchif, end_label);
+                    PM_COMPILE(value);
+                    PUSH_SETLOCAL(ret, location, index.index, index.level);
+                    PUSH_LABEL(ret, end_label);
+                }
+                optional_index++;
+                break;
+              }
+              case PM_REQUIRED_KEYWORD_PARAMETER_NODE:
+                // def foo(a, (b, *c, d), e = 1, *f, g, (h, *i, j), k:, l: 1, **m, &n)
+                //                                                   ^^
+                break;
+              default:
+                rb_bug("Unexpected keyword parameter node type %s", pm_node_type_to_str(PM_NODE_TYPE(keyword_parameter_node)));
+            }
+        }
+    }
+
+    if (requireds_list && requireds_list->size) {
+        for (size_t i = 0; i < requireds_list->size; i++) {
+            // For each MultiTargetNode, we're going to have one additional
+            // anonymous local not represented in the locals table. We want
+            // to account for this in our table size.
+            const pm_node_t *required = requireds_list->nodes[i];
+
+            if (PM_NODE_TYPE_P(required, PM_MULTI_TARGET_NODE)) {
+                PUSH_GETLOCAL(ret, location, table_size - (int)i, 0);
+                pm_compile_destructured_param_writes(iseq, (const pm_multi_target_node_t *) required, ret, scope_node);
+            }
+        }
+    }
+
+    if (posts_list && posts_list->size) {
+        for (size_t i = 0; i < posts_list->size; i++) {
+            // For each MultiTargetNode, we're going to have one additional
+            // anonymous local not represented in the locals table. We want
+            // to account for this in our table size.
+            const pm_node_t *post = posts_list->nodes[i];
+
+            if (PM_NODE_TYPE_P(post, PM_MULTI_TARGET_NODE)) {
+                PUSH_GETLOCAL(ret, location, table_size - body->param.post_start - (int) i, 0);
+                pm_compile_destructured_param_writes(iseq, (const pm_multi_target_node_t *) post, ret, scope_node);
+            }
+        }
+    }
+
+    switch (body->type) {
+      case ISEQ_TYPE_PLAIN: {
+        RUBY_ASSERT(PM_NODE_TYPE_P(scope_node->ast_node, PM_INTERPOLATED_REGULAR_EXPRESSION_NODE));
+
+        const pm_interpolated_regular_expression_node_t *cast = (const pm_interpolated_regular_expression_node_t *) scope_node->ast_node;
+        pm_compile_regexp_dynamic(iseq, (const pm_node_t *) cast, &cast->parts, &location, ret, popped, scope_node);
+
+        break;
+      }
+      case ISEQ_TYPE_BLOCK: {
+        LABEL *start = ISEQ_COMPILE_DATA(iseq)->start_label = NEW_LABEL(0);
+        LABEL *end = ISEQ_COMPILE_DATA(iseq)->end_label = NEW_LABEL(0);
+        const pm_node_location_t block_location = { .line = body->location.first_lineno, .node_id = scope_node->ast_node->node_id };
+
+        start->rescued = LABEL_RESCUE_BEG;
+        end->rescued = LABEL_RESCUE_END;
+
+        // For nodes automatically assign the iteration variable to whatever
+        // index variable. We need to handle that write here because it has
+        // to happen in the context of the block. Note that this happens
+        // before the B_CALL tracepoint event.
+        if (PM_NODE_TYPE_P(scope_node->ast_node, PM_FOR_NODE)) {
+            pm_compile_for_node_index(iseq, ((const pm_for_node_t *) scope_node->ast_node)->index, ret, scope_node);
+        }
+
+        PUSH_TRACE(ret, RUBY_EVENT_B_CALL);
+        PUSH_INSN(ret, block_location, nop);
+        PUSH_LABEL(ret, start);
+
+        if (scope_node->body != NULL) {
+            switch (PM_NODE_TYPE(scope_node->ast_node)) {
+              case PM_POST_EXECUTION_NODE: {
+                const pm_post_execution_node_t *cast = (const pm_post_execution_node_t *) scope_node->ast_node;
+                PUSH_INSN1(ret, block_location, putspecialobject, INT2FIX(VM_SPECIAL_OBJECT_VMCORE));
+
+                // We create another ScopeNode from the statements within the PostExecutionNode
+                pm_scope_node_t next_scope_node;
+                pm_scope_node_init((const pm_node_t *) cast->statements, &next_scope_node, scope_node);
+
+                const rb_iseq_t *block = NEW_CHILD_ISEQ(&next_scope_node, make_name_for_block(body->parent_iseq), ISEQ_TYPE_BLOCK, location.line);
+                pm_scope_node_destroy(&next_scope_node);
+
+                PUSH_CALL_WITH_BLOCK(ret, block_location, id_core_set_postexe, INT2FIX(0), block);
+                break;
+              }
+              case PM_INTERPOLATED_REGULAR_EXPRESSION_NODE: {
+                const pm_interpolated_regular_expression_node_t *cast = (const pm_interpolated_regular_expression_node_t *) scope_node->ast_node;
+                pm_compile_regexp_dynamic(iseq, (const pm_node_t *) cast, &cast->parts, &location, ret, popped, scope_node);
+                break;
+              }
+              default:
+                pm_compile_node(iseq, scope_node->body, ret, popped, scope_node);
+                break;
+            }
+        }
+        else {
+            PUSH_INSN(ret, block_location, putnil);
+        }
+
+        PUSH_LABEL(ret, end);
+        PUSH_TRACE(ret, RUBY_EVENT_B_RETURN);
+        ISEQ_COMPILE_DATA(iseq)->last_line = body->location.code_location.end_pos.lineno;
+
+        /* wide range catch handler must put at last */
+        PUSH_CATCH_ENTRY(CATCH_TYPE_REDO, start, end, NULL, start);
+        PUSH_CATCH_ENTRY(CATCH_TYPE_NEXT, start, end, NULL, end);
+        break;
+      }
+      case ISEQ_TYPE_ENSURE: {
+        const pm_node_location_t statements_location = (scope_node->body != NULL ? PM_NODE_START_LOCATION(scope_node->parser, scope_node->body) : location);
+        iseq_set_exception_local_table(iseq);
+
+        if (scope_node->body != NULL) {
+            PM_COMPILE_POPPED((const pm_node_t *) scope_node->body);
+        }
+
+        PUSH_GETLOCAL(ret, statements_location, 1, 0);
+        PUSH_INSN1(ret, statements_location, throw, INT2FIX(0));
+        return;
+      }
+      case ISEQ_TYPE_METHOD: {
+        ISEQ_COMPILE_DATA(iseq)->root_node = (const void *) scope_node->body;
+        PUSH_TRACE(ret, RUBY_EVENT_CALL);
+
+        if (scope_node->body) {
+            PM_COMPILE((const pm_node_t *) scope_node->body);
+        }
+        else {
+            PUSH_INSN(ret, location, putnil);
+        }
+
+        ISEQ_COMPILE_DATA(iseq)->root_node = (const void *) scope_node->body;
+        PUSH_TRACE(ret, RUBY_EVENT_RETURN);
+
+        ISEQ_COMPILE_DATA(iseq)->last_line = body->location.code_location.end_pos.lineno;
+        break;
+      }
+      case ISEQ_TYPE_RESCUE: {
+        iseq_set_exception_local_table(iseq);
+        if (PM_NODE_TYPE_P(scope_node->ast_node, PM_RESCUE_MODIFIER_NODE)) {
+            LABEL *lab = NEW_LABEL(location.line);
+            LABEL *rescue_end = NEW_LABEL(location.line);
+            PUSH_GETLOCAL(ret, location, LVAR_ERRINFO, 0);
+            PUSH_INSN1(ret, location, putobject, rb_eStandardError);
+            PUSH_INSN1(ret, location, checkmatch, INT2FIX(VM_CHECKMATCH_TYPE_RESCUE));
+            PUSH_INSNL(ret, location, branchif, lab);
+            PUSH_INSNL(ret, location, jump, rescue_end);
+            PUSH_LABEL(ret, lab);
+            PUSH_TRACE(ret, RUBY_EVENT_RESCUE);
+            PM_COMPILE((const pm_node_t *) scope_node->body);
+            PUSH_INSN(ret, location, leave);
+            PUSH_LABEL(ret, rescue_end);
+            PUSH_GETLOCAL(ret, location, LVAR_ERRINFO, 0);
+        }
+        else {
+            PM_COMPILE((const pm_node_t *) scope_node->ast_node);
+        }
+        PUSH_INSN1(ret, location, throw, INT2FIX(0));
+
+        return;
+      }
+      default:
+        if (scope_node->body) {
+            PM_COMPILE((const pm_node_t *) scope_node->body);
+        }
+        else {
+            PUSH_INSN(ret, location, putnil);
+        }
+        break;
+    }
+
+    if (PM_NODE_TYPE_P(scope_node->ast_node, PM_CLASS_NODE) || PM_NODE_TYPE_P(scope_node->ast_node, PM_MODULE_NODE)) {
+        const pm_node_location_t end_location = PM_NODE_END_LOCATION(scope_node->parser, scope_node->ast_node);
+        PUSH_TRACE(ret, RUBY_EVENT_END);
+        ISEQ_COMPILE_DATA(iseq)->last_line = end_location.line;
+    }
+
+    if (!PM_NODE_TYPE_P(scope_node->ast_node, PM_ENSURE_NODE)) {
+        const pm_node_location_t location = { .line = ISEQ_COMPILE_DATA(iseq)->last_line, .node_id = scope_node->ast_node->node_id };
+        PUSH_INSN(ret, location, leave);
+    }
+}
+
+static inline void
+pm_compile_alias_global_variable_node(rb_iseq_t *iseq, const pm_alias_global_variable_node_t *node, const pm_node_location_t *location, LINK_ANCHOR *const ret, bool popped, pm_scope_node_t *scope_node)
+{
+    // alias $foo $bar
+    // ^^^^^^^^^^^^^^^
+    PUSH_INSN1(ret, *location, putspecialobject, INT2FIX(VM_SPECIAL_OBJECT_VMCORE));
+
+    {
+        const pm_location_t *name_loc = &node->new_name->location;
+        VALUE operand = ID2SYM(rb_intern3((const char *) name_loc->start, name_loc->end - name_loc->start, scope_node->encoding));
+        PUSH_INSN1(ret, *location, putobject, operand);
+    }
+
+    {
+        const pm_location_t *name_loc = &node->old_name->location;
+        VALUE operand = ID2SYM(rb_intern3((const char *) name_loc->start, name_loc->end - name_loc->start, scope_node->encoding));
+        PUSH_INSN1(ret, *location, putobject, operand);
+    }
+
+    PUSH_SEND(ret, *location, id_core_set_variable_alias, INT2FIX(2));
+    if (popped) PUSH_INSN(ret, *location, pop);
+}
+
+static inline void
+pm_compile_alias_method_node(rb_iseq_t *iseq, const pm_alias_method_node_t *node, const pm_node_location_t *location, LINK_ANCHOR *const ret, bool popped, pm_scope_node_t *scope_node)
+{
+    PUSH_INSN1(ret, *location, putspecialobject, INT2FIX(VM_SPECIAL_OBJECT_VMCORE));
+    PUSH_INSN1(ret, *location, putspecialobject, INT2FIX(VM_SPECIAL_OBJECT_CBASE));
+    PM_COMPILE_NOT_POPPED(node->new_name);
+    PM_COMPILE_NOT_POPPED(node->old_name);
+
+    PUSH_SEND(ret, *location, id_core_set_method_alias, INT2FIX(3));
+    if (popped) PUSH_INSN(ret, *location, pop);
+}
+
+static inline void
+pm_compile_and_node(rb_iseq_t *iseq, const pm_and_node_t *node, const pm_node_location_t *location, LINK_ANCHOR *const ret, bool popped, pm_scope_node_t *scope_node)
+{
+    LABEL *end_label = NEW_LABEL(location->line);
+
+    PM_COMPILE_NOT_POPPED(node->left);
+    if (!popped) PUSH_INSN(ret, *location, dup);
+    PUSH_INSNL(ret, *location, branchunless, end_label);
+
+    if (!popped) PUSH_INSN(ret, *location, pop);
+    PM_COMPILE(node->right);
+    PUSH_LABEL(ret, end_label);
+}
+
+static inline void
+pm_compile_array_node(rb_iseq_t *iseq, const pm_node_t *node, const pm_node_list_t *elements, const pm_node_location_t *location, LINK_ANCHOR *const ret, bool popped, pm_scope_node_t *scope_node)
+{
+    // If every node in the array is static, then we can compile the entire
+    // array now instead of later.
+    if (PM_NODE_FLAG_P(node, PM_NODE_FLAG_STATIC_LITERAL)) {
+        // We're only going to compile this node if it's not popped. If it
+        // is popped, then we know we don't need to do anything since it's
+        // statically known.
+        if (!popped) {
+            if (elements->size) {
+                VALUE value = pm_static_literal_value(iseq, node, scope_node);
+                PUSH_INSN1(ret, *location, duparray, value);
+            }
+            else {
+                PUSH_INSN1(ret, *location, newarray, INT2FIX(0));
+            }
+        }
+        return;
+    }
+
+    // Here since we know there are possible side-effects inside the
+    // array contents, we're going to build it entirely at runtime.
+    // We'll do this by pushing all of the elements onto the stack and
+    // then combining them with newarray.
+    //
+    // If this array is popped, then this serves only to ensure we enact
+    // all side-effects (like method calls) that are contained within
+    // the array contents.
+    //
+    // We treat all sequences of non-splat elements as their
+    // own arrays, followed by a newarray, and then continually
+    // concat the arrays with the SplatNode nodes.
+    const int max_new_array_size = 0x100;
+    const unsigned int min_tmp_array_size = 0x40;
+
+    int new_array_size = 0;
+    bool first_chunk = true;
+
+    // This is an optimization wherein we keep track of whether or not
+    // the previous element was a static literal. If it was, then we do
+    // not attempt to check if we have a subarray that can be optimized.
+    // If it was not, then we do check.
+    bool static_literal = false;
+
+    // Either create a new array, or push to the existing array.
+#define FLUSH_CHUNK \
+    if (new_array_size) {                                                               \
+        if (first_chunk) PUSH_INSN1(ret, *location, newarray, INT2FIX(new_array_size)); \
+        else PUSH_INSN1(ret, *location, pushtoarray, INT2FIX(new_array_size));          \
+        first_chunk = false;                                                            \
+        new_array_size = 0;                                                             \
+    }
+
+    for (size_t index = 0; index < elements->size; index++) {
+        const pm_node_t *element = elements->nodes[index];
+
+        if (PM_NODE_TYPE_P(element, PM_SPLAT_NODE)) {
+            FLUSH_CHUNK;
+
+            const pm_splat_node_t *splat_element = (const pm_splat_node_t *) element;
+            if (splat_element->expression) {
+                PM_COMPILE_NOT_POPPED(splat_element->expression);
+            }
+            else {
+                pm_local_index_t index = pm_lookup_local_index(iseq, scope_node, PM_CONSTANT_MULT, 0);
+                PUSH_GETLOCAL(ret, *location, index.index, index.level);
+            }
+
+            if (first_chunk) {
+                // If this is the first element of the array then we
+                // need to splatarray the elements into the list.
+                PUSH_INSN1(ret, *location, splatarray, Qtrue);
+                first_chunk = false;
+            }
+            else {
+                PUSH_INSN(ret, *location, concattoarray);
+            }
+
+            static_literal = false;
+        }
+        else if (PM_NODE_TYPE_P(element, PM_KEYWORD_HASH_NODE)) {
+            if (new_array_size == 0 && first_chunk) {
+                PUSH_INSN1(ret, *location, newarray, INT2FIX(0));
+                first_chunk = false;
+            }
+            else {
+                FLUSH_CHUNK;
+            }
+
+            // If we get here, then this is the last element of the
+            // array/arguments, because it cannot be followed by
+            // anything else without a syntax error. This looks like:
+            //
+            //     [foo, bar, baz: qux]
+            //                ^^^^^^^^
+            //
+            //     [foo, bar, **baz]
+            //                ^^^^^
+            //
+            const pm_keyword_hash_node_t *keyword_hash = (const pm_keyword_hash_node_t *) element;
+            pm_compile_hash_elements(iseq, element, &keyword_hash->elements, 0, Qundef, false, ret, scope_node);
+
+            // This boolean controls the manner in which we push the
+            // hash onto the array. If it's all keyword splats, then we
+            // can use the very specialized pushtoarraykwsplat
+            // instruction to check if it's empty before we push it.
+            size_t splats = 0;
+            while (splats < keyword_hash->elements.size && PM_NODE_TYPE_P(keyword_hash->elements.nodes[splats], PM_ASSOC_SPLAT_NODE)) splats++;
+
+            if (keyword_hash->elements.size == splats) {
+                PUSH_INSN(ret, *location, pushtoarraykwsplat);
+            }
+            else {
+                new_array_size++;
+            }
+        }
+        else if (
+            PM_NODE_FLAG_P(element, PM_NODE_FLAG_STATIC_LITERAL) &&
+            !PM_CONTAINER_P(element) &&
+            !static_literal &&
+            ((index + min_tmp_array_size) < elements->size)
+        ) {
+            // If we have a static literal, then there's the potential
+            // to group a bunch of them together with a literal array
+            // and then concat them together.
+            size_t right_index = index + 1;
+            while (
+                right_index < elements->size &&
+                PM_NODE_FLAG_P(elements->nodes[right_index], PM_NODE_FLAG_STATIC_LITERAL) &&
+                !PM_CONTAINER_P(elements->nodes[right_index])
+            ) right_index++;
+
+            size_t tmp_array_size = right_index - index;
+            if (tmp_array_size >= min_tmp_array_size) {
+                VALUE tmp_array = rb_ary_hidden_new(tmp_array_size);
+
+                // Create the temporary array.
+                for (; tmp_array_size; tmp_array_size--)
+                    rb_ary_push(tmp_array, pm_static_literal_value(iseq, elements->nodes[index++], scope_node));
+
+                index--; // about to be incremented by for loop
+                OBJ_FREEZE(tmp_array);
+
+                // Emit the optimized code.
+                FLUSH_CHUNK;
+                if (first_chunk) {
+                    PUSH_INSN1(ret, *location, duparray, tmp_array);
+                    first_chunk = false;
+                }
+                else {
+                    PUSH_INSN1(ret, *location, putobject, tmp_array);
+                    PUSH_INSN(ret, *location, concattoarray);
+                }
+            }
+            else {
+                PM_COMPILE_NOT_POPPED(element);
+                if (++new_array_size >= max_new_array_size) FLUSH_CHUNK;
+                static_literal = true;
+            }
+        } else {
+            PM_COMPILE_NOT_POPPED(element);
+            if (++new_array_size >= max_new_array_size) FLUSH_CHUNK;
+            static_literal = false;
+        }
+    }
+
+    FLUSH_CHUNK;
+    if (popped) PUSH_INSN(ret, *location, pop);
+
+#undef FLUSH_CHUNK
+}
+
+static inline void
+pm_compile_break_node(rb_iseq_t *iseq, const pm_break_node_t *node, const pm_node_location_t *location, LINK_ANCHOR *const ret, bool popped, pm_scope_node_t *scope_node)
+{
+    unsigned long throw_flag = 0;
+
+    if (ISEQ_COMPILE_DATA(iseq)->redo_label != 0 && can_add_ensure_iseq(iseq)) {
+        /* while/until */
+        LABEL *splabel = NEW_LABEL(0);
+        PUSH_LABEL(ret, splabel);
+        PUSH_ADJUST(ret, *location, ISEQ_COMPILE_DATA(iseq)->redo_label);
+
+        if (node->arguments != NULL) {
+            PM_COMPILE_NOT_POPPED((const pm_node_t *) node->arguments);
+        }
+        else {
+            PUSH_INSN(ret, *location, putnil);
+        }
+
+        pm_add_ensure_iseq(ret, iseq, 0, scope_node);
+        PUSH_INSNL(ret, *location, jump, ISEQ_COMPILE_DATA(iseq)->end_label);
+        PUSH_ADJUST_RESTORE(ret, splabel);
+        if (!popped) PUSH_INSN(ret, *location, putnil);
+    }
+    else {
+        const rb_iseq_t *ip = iseq;
+
+        while (ip) {
+            if (!ISEQ_COMPILE_DATA(ip)) {
+                ip = 0;
+                break;
+            }
+
+            if (ISEQ_COMPILE_DATA(ip)->redo_label != 0) {
+                throw_flag = VM_THROW_NO_ESCAPE_FLAG;
+            }
+            else if (ISEQ_BODY(ip)->type == ISEQ_TYPE_BLOCK) {
+                throw_flag = 0;
+            }
+            else if (ISEQ_BODY(ip)->type == ISEQ_TYPE_EVAL) {
+                COMPILE_ERROR(iseq, location->line, "Invalid break");
+                return;
+            }
+            else {
+                ip = ISEQ_BODY(ip)->parent_iseq;
+                continue;
+            }
+
+            /* escape from block */
+            if (node->arguments != NULL) {
+                PM_COMPILE_NOT_POPPED((const pm_node_t *) node->arguments);
+            }
+            else {
+                PUSH_INSN(ret, *location, putnil);
+            }
+
+            PUSH_INSN1(ret, *location, throw, INT2FIX(throw_flag | TAG_BREAK));
+            if (popped) PUSH_INSN(ret, *location, pop);
+
+            return;
+        }
+
+        COMPILE_ERROR(iseq, location->line, "Invalid break");
+    }
+}
+
+static inline void
+pm_compile_call_node(rb_iseq_t *iseq, const pm_call_node_t *node, LINK_ANCHOR *const ret, bool popped, pm_scope_node_t *scope_node)
+{
+    ID method_id = pm_constant_id_lookup(scope_node, node->name);
+
+    const pm_location_t *message_loc = &node->message_loc;
+    if (message_loc->start == NULL) message_loc = &node->base.location;
+
+    const pm_node_location_t location = PM_LOCATION_START_LOCATION(scope_node->parser, message_loc, node->base.node_id);
+    const char *builtin_func;
+
+    if (UNLIKELY(iseq_has_builtin_function_table(iseq)) && (builtin_func = pm_iseq_builtin_function_name(scope_node, node->receiver, method_id)) != NULL) {
+        pm_compile_builtin_function_call(iseq, ret, scope_node, node, &location, popped, ISEQ_COMPILE_DATA(iseq)->current_block, builtin_func);
+        return;
+    }
+
+    LABEL *start = NEW_LABEL(location.line);
+    if (node->block) PUSH_LABEL(ret, start);
+
+    switch (method_id) {
+      case idUMinus: {
+        if (pm_opt_str_freeze_p(iseq, node)) {
+            VALUE value = parse_static_literal_string(iseq, scope_node, node->receiver, &((const pm_string_node_t * ) node->receiver)->unescaped);
+            const struct rb_callinfo *callinfo = new_callinfo(iseq, idUMinus, 0, 0, NULL, FALSE);
+            PUSH_INSN2(ret, location, opt_str_uminus, value, callinfo);
+            if (popped) PUSH_INSN(ret, location, pop);
+            return;
+        }
+        break;
+      }
+      case idFreeze: {
+        if (pm_opt_str_freeze_p(iseq, node)) {
+            VALUE value = parse_static_literal_string(iseq, scope_node, node->receiver, &((const pm_string_node_t * ) node->receiver)->unescaped);
+            const struct rb_callinfo *callinfo = new_callinfo(iseq, idFreeze, 0, 0, NULL, FALSE);
+            PUSH_INSN2(ret, location, opt_str_freeze, value, callinfo);
+            if (popped) PUSH_INSN(ret, location, pop);
+            return;
+        }
+        break;
+      }
+      case idAREF: {
+        if (pm_opt_aref_with_p(iseq, node)) {
+            const pm_string_node_t *string = (const pm_string_node_t *) ((const pm_arguments_node_t *) node->arguments)->arguments.nodes[0];
+            VALUE value = parse_static_literal_string(iseq, scope_node, (const pm_node_t *) string, &string->unescaped);
+
+            PM_COMPILE_NOT_POPPED(node->receiver);
+
+            const struct rb_callinfo *callinfo = new_callinfo(iseq, idAREF, 1, 0, NULL, FALSE);
+            PUSH_INSN2(ret, location, opt_aref_with, value, callinfo);
+
+            if (popped) {
+                PUSH_INSN(ret, location, pop);
+            }
+
+            return;
+        }
+        break;
+      }
+      case idASET: {
+        if (pm_opt_aset_with_p(iseq, node)) {
+            const pm_string_node_t *string = (const pm_string_node_t *) ((const pm_arguments_node_t *) node->arguments)->arguments.nodes[0];
+            VALUE value = parse_static_literal_string(iseq, scope_node, (const pm_node_t *) string, &string->unescaped);
+
+            PM_COMPILE_NOT_POPPED(node->receiver);
+            PM_COMPILE_NOT_POPPED(((const pm_arguments_node_t *) node->arguments)->arguments.nodes[1]);
+
+            if (!popped) {
+                PUSH_INSN(ret, location, swap);
+                PUSH_INSN1(ret, location, topn, INT2FIX(1));
+            }
+
+            const struct rb_callinfo *callinfo = new_callinfo(iseq, idASET, 2, 0, NULL, FALSE);
+            PUSH_INSN2(ret, location, opt_aset_with, value, callinfo);
+            PUSH_INSN(ret, location, pop);
+            return;
+        }
+        break;
+      }
+    }
+
+    if (PM_NODE_FLAG_P(node, PM_CALL_NODE_FLAGS_ATTRIBUTE_WRITE) && !popped) {
+        PUSH_INSN(ret, location, putnil);
+    }
+
+    if (node->receiver == NULL) {
+        PUSH_INSN(ret, location, putself);
+    }
+    else {
+        if (method_id == idCall && PM_NODE_TYPE_P(node->receiver, PM_LOCAL_VARIABLE_READ_NODE)) {
+            const pm_local_variable_read_node_t *read_node_cast = (const pm_local_variable_read_node_t *) node->receiver;
+            uint32_t node_id = node->receiver->node_id;
+            int idx, level;
+
+            if (iseq_block_param_id_p(iseq, pm_constant_id_lookup(scope_node, read_node_cast->name), &idx, &level)) {
+                ADD_ELEM(ret, (LINK_ELEMENT *) new_insn_body(iseq, location.line, node_id, BIN(getblockparamproxy), 2, INT2FIX((idx) + VM_ENV_DATA_SIZE - 1), INT2FIX(level)));
+            }
+            else {
+                PM_COMPILE_NOT_POPPED(node->receiver);
+            }
+        }
+        else {
+            PM_COMPILE_NOT_POPPED(node->receiver);
+        }
+    }
+
+    pm_compile_call(iseq, node, ret, popped, scope_node, method_id, start);
+    return;
+}
+
+static inline void
+pm_compile_call_operator_write_node(rb_iseq_t *iseq, const pm_call_operator_write_node_t *node, const pm_node_location_t *location, LINK_ANCHOR *const ret, bool popped, pm_scope_node_t *scope_node)
+{
+    int flag = 0;
+
+    if (PM_NODE_FLAG_P(node, PM_CALL_NODE_FLAGS_IGNORE_VISIBILITY)) {
+        flag = VM_CALL_FCALL;
+    }
+
+    PM_COMPILE_NOT_POPPED(node->receiver);
+
+    LABEL *safe_label = NULL;
+    if (PM_NODE_FLAG_P(node, PM_CALL_NODE_FLAGS_SAFE_NAVIGATION)) {
+        safe_label = NEW_LABEL(location->line);
+        PUSH_INSN(ret, *location, dup);
+        PUSH_INSNL(ret, *location, branchnil, safe_label);
+    }
+
+    PUSH_INSN(ret, *location, dup);
+
+    ID id_read_name = pm_constant_id_lookup(scope_node, node->read_name);
+    PUSH_SEND_WITH_FLAG(ret, *location, id_read_name, INT2FIX(0), INT2FIX(flag));
+
+    PM_COMPILE_NOT_POPPED(node->value);
+    ID id_operator = pm_constant_id_lookup(scope_node, node->binary_operator);
+    PUSH_SEND(ret, *location, id_operator, INT2FIX(1));
+
+    if (!popped) {
+        PUSH_INSN(ret, *location, swap);
+        PUSH_INSN1(ret, *location, topn, INT2FIX(1));
+    }
+
+    ID id_write_name = pm_constant_id_lookup(scope_node, node->write_name);
+    PUSH_SEND_WITH_FLAG(ret, *location, id_write_name, INT2FIX(1), INT2FIX(flag));
+
+    if (safe_label != NULL && popped) PUSH_LABEL(ret, safe_label);
+    PUSH_INSN(ret, *location, pop);
+    if (safe_label != NULL && !popped) PUSH_LABEL(ret, safe_label);
+}
+
+/**
+ * When we're compiling a case node, it's possible that we can speed it up using
+ * a dispatch hash, which will allow us to jump directly to the correct when
+ * clause body based on a hash lookup of the value. This can only happen when
+ * the conditions are literals that can be compiled into a hash key.
+ *
+ * This function accepts a dispatch hash and the condition of a when clause. It
+ * is responsible for compiling the condition into a hash key and then adding it
+ * to the dispatch hash.
+ *
+ * If the value can be successfully compiled into the hash, then this function
+ * returns the dispatch hash with the new key added. If the value cannot be
+ * compiled into the hash, then this function returns Qundef. In the case of
+ * Qundef, this function is signaling that the caller should abandon the
+ * optimization entirely.
+ */
+static VALUE
+pm_compile_case_node_dispatch(rb_iseq_t *iseq, VALUE dispatch, const pm_node_t *node, LABEL *label, const pm_scope_node_t *scope_node)
+{
+    VALUE key = Qundef;
+
+    switch (PM_NODE_TYPE(node)) {
+      case PM_FLOAT_NODE: {
+        key = pm_static_literal_value(iseq, node, scope_node);
+        double intptr;
+
+        if (modf(RFLOAT_VALUE(key), &intptr) == 0.0) {
+            key = (FIXABLE(intptr) ? LONG2FIX((long) intptr) : rb_dbl2big(intptr));
+        }
+
+        break;
+      }
+      case PM_FALSE_NODE:
+      case PM_INTEGER_NODE:
+      case PM_NIL_NODE:
+      case PM_SOURCE_FILE_NODE:
+      case PM_SOURCE_LINE_NODE:
+      case PM_SYMBOL_NODE:
+      case PM_TRUE_NODE:
+        key = pm_static_literal_value(iseq, node, scope_node);
+        break;
+      case PM_STRING_NODE: {
+        const pm_string_node_t *cast = (const pm_string_node_t *) node;
+        key = parse_static_literal_string(iseq, scope_node, node, &cast->unescaped);
+        break;
+      }
+      default:
+        return Qundef;
+    }
+
+    if (NIL_P(rb_hash_lookup(dispatch, key))) {
+        rb_hash_aset(dispatch, key, ((VALUE) label) | 1);
+    }
+
+    return dispatch;
+}
+
+/**
+ * Compile a case node, representing a case statement with when clauses.
+ */
+static inline void
+pm_compile_case_node(rb_iseq_t *iseq, const pm_case_node_t *cast, const pm_node_location_t *node_location, LINK_ANCHOR *const ret, bool popped, pm_scope_node_t *scope_node)
+{
+    const pm_parser_t *parser = scope_node->parser;
+    const pm_node_location_t location = *node_location;
+    const pm_node_list_t *conditions = &cast->conditions;
+
+    // This is the anchor that we will compile the conditions of the various
+    // `when` nodes into. If a match is found, they will need to jump into
+    // the body_seq anchor to the correct spot.
+    DECL_ANCHOR(cond_seq);
+
+    // This is the anchor that we will compile the bodies of the various
+    // `when` nodes into. We'll make sure that the clauses that are compiled
+    // jump into the correct spots within this anchor.
+    DECL_ANCHOR(body_seq);
+
+    // This is the label where all of the when clauses will jump to if they
+    // have matched and are done executing their bodies.
+    LABEL *end_label = NEW_LABEL(location.line);
+
+    // If we have a predicate on this case statement, then it's going to
+    // compare all of the various when clauses to the predicate. If we
+    // don't, then it's basically an if-elsif-else chain.
+    if (cast->predicate == NULL) {
+        // Establish branch coverage for the case node.
+        VALUE branches = Qfalse;
+        rb_code_location_t case_location = { 0 };
+        int branch_id = 0;
+
+        if (PM_BRANCH_COVERAGE_P(iseq)) {
+            case_location = pm_code_location(scope_node, (const pm_node_t *) cast);
+            branches = decl_branch_base(iseq, PTR2NUM(cast), &case_location, "case");
+        }
+
+        // Loop through each clauses in the case node and compile each of
+        // the conditions within them into cond_seq. If they match, they
+        // should jump into their respective bodies in body_seq.
+        for (size_t clause_index = 0; clause_index < conditions->size; clause_index++) {
+            const pm_when_node_t *clause = (const pm_when_node_t *) conditions->nodes[clause_index];
+            const pm_node_list_t *conditions = &clause->conditions;
+
+            int clause_lineno = pm_node_line_number(parser, (const pm_node_t *) clause);
+            LABEL *label = NEW_LABEL(clause_lineno);
+            PUSH_LABEL(body_seq, label);
+
+            // Establish branch coverage for the when clause.
+            if (PM_BRANCH_COVERAGE_P(iseq)) {
+                rb_code_location_t branch_location = pm_code_location(scope_node, clause->statements != NULL ? ((const pm_node_t *) clause->statements) : ((const pm_node_t *) clause));
+                add_trace_branch_coverage(iseq, body_seq, &branch_location, branch_location.beg_pos.column, branch_id++, "when", branches);
+            }
+
+            if (clause->statements != NULL) {
+                pm_compile_node(iseq, (const pm_node_t *) clause->statements, body_seq, popped, scope_node);
+            }
+            else if (!popped) {
+                PUSH_SYNTHETIC_PUTNIL(body_seq, iseq);
+            }
+
+            PUSH_INSNL(body_seq, location, jump, end_label);
+
+            // Compile each of the conditions for the when clause into the
+            // cond_seq. Each one should have a unique condition and should
+            // jump to the subsequent one if it doesn't match.
+            for (size_t condition_index = 0; condition_index < conditions->size; condition_index++) {
+                const pm_node_t *condition = conditions->nodes[condition_index];
+
+                if (PM_NODE_TYPE_P(condition, PM_SPLAT_NODE)) {
+                    pm_node_location_t cond_location = PM_NODE_START_LOCATION(parser, condition);
+                    PUSH_INSN(cond_seq, cond_location, putnil);
+                    pm_compile_node(iseq, condition, cond_seq, false, scope_node);
+                    PUSH_INSN1(cond_seq, cond_location, checkmatch, INT2FIX(VM_CHECKMATCH_TYPE_WHEN | VM_CHECKMATCH_ARRAY));
+                    PUSH_INSNL(cond_seq, cond_location, branchif, label);
+                }
+                else {
+                    LABEL *next_label = NEW_LABEL(pm_node_line_number(parser, condition));
+                    pm_compile_branch_condition(iseq, cond_seq, condition, label, next_label, false, scope_node);
+                    PUSH_LABEL(cond_seq, next_label);
+                }
+            }
+        }
+
+        // Establish branch coverage for the else clause (implicit or
+        // explicit).
+        if (PM_BRANCH_COVERAGE_P(iseq)) {
+            rb_code_location_t branch_location;
+
+            if (cast->else_clause == NULL) {
+                branch_location = case_location;
+            } else if (cast->else_clause->statements == NULL) {
+                branch_location = pm_code_location(scope_node, (const pm_node_t *) cast->else_clause);
+            } else {
+                branch_location = pm_code_location(scope_node, (const pm_node_t *) cast->else_clause->statements);
+            }
+
+            add_trace_branch_coverage(iseq, cond_seq, &branch_location, branch_location.beg_pos.column, branch_id, "else", branches);
+        }
+
+        // Compile the else clause if there is one.
+        if (cast->else_clause != NULL) {
+            pm_compile_node(iseq, (const pm_node_t *) cast->else_clause, cond_seq, popped, scope_node);
+        }
+        else if (!popped) {
+            PUSH_SYNTHETIC_PUTNIL(cond_seq, iseq);
+        }
+
+        // Finally, jump to the end label if none of the other conditions
+        // have matched.
+        PUSH_INSNL(cond_seq, location, jump, end_label);
+        PUSH_SEQ(ret, cond_seq);
+    }
+    else {
+        // Establish branch coverage for the case node.
+        VALUE branches = Qfalse;
+        rb_code_location_t case_location = { 0 };
+        int branch_id = 0;
+
+        if (PM_BRANCH_COVERAGE_P(iseq)) {
+            case_location = pm_code_location(scope_node, (const pm_node_t *) cast);
+            branches = decl_branch_base(iseq, PTR2NUM(cast), &case_location, "case");
+        }
+
+        // This is the label where everything will fall into if none of the
+        // conditions matched.
+        LABEL *else_label = NEW_LABEL(location.line);
+
+        // It's possible for us to speed up the case node by using a
+        // dispatch hash. This is a hash that maps the conditions of the
+        // various when clauses to the labels of their bodies. If we can
+        // compile the conditions into a hash key, then we can use a hash
+        // lookup to jump directly to the correct when clause body.
+        VALUE dispatch = Qundef;
+        if (ISEQ_COMPILE_DATA(iseq)->option->specialized_instruction) {
+            dispatch = rb_hash_new();
+            RHASH_TBL_RAW(dispatch)->type = &cdhash_type;
+        }
+
+        // We're going to loop through each of the conditions in the case
+        // node and compile each of their contents into both the cond_seq
+        // and the body_seq. Each condition will use its own label to jump
+        // from its conditions into its body.
+        //
+        // Note that none of the code in the loop below should be adding
+        // anything to ret, as we're going to be laying out the entire case
+        // node instructions later.
+        for (size_t clause_index = 0; clause_index < conditions->size; clause_index++) {
+            const pm_when_node_t *clause = (const pm_when_node_t *) conditions->nodes[clause_index];
+            pm_node_location_t clause_location = PM_NODE_START_LOCATION(parser, (const pm_node_t *) clause);
+
+            const pm_node_list_t *conditions = &clause->conditions;
+            LABEL *label = NEW_LABEL(clause_location.line);
+
+            // Compile each of the conditions for the when clause into the
+            // cond_seq. Each one should have a unique comparison that then
+            // jumps into the body if it matches.
+            for (size_t condition_index = 0; condition_index < conditions->size; condition_index++) {
+                const pm_node_t *condition = conditions->nodes[condition_index];
+                const pm_node_location_t condition_location = PM_NODE_START_LOCATION(parser, condition);
+
+                // If we haven't already abandoned the optimization, then
+                // we're going to try to compile the condition into the
+                // dispatch hash.
+                if (dispatch != Qundef) {
+                    dispatch = pm_compile_case_node_dispatch(iseq, dispatch, condition, label, scope_node);
+                }
+
+                if (PM_NODE_TYPE_P(condition, PM_SPLAT_NODE)) {
+                    PUSH_INSN(cond_seq, condition_location, dup);
+                    pm_compile_node(iseq, condition, cond_seq, false, scope_node);
+                    PUSH_INSN1(cond_seq, condition_location, checkmatch, INT2FIX(VM_CHECKMATCH_TYPE_CASE | VM_CHECKMATCH_ARRAY));
+                }
+                else {
+                    if (PM_NODE_TYPE_P(condition, PM_STRING_NODE)) {
+                        const pm_string_node_t *string = (const pm_string_node_t *) condition;
+                        VALUE value = parse_static_literal_string(iseq, scope_node, condition, &string->unescaped);
+                        PUSH_INSN1(cond_seq, condition_location, putobject, value);
+                    }
+                    else {
+                        pm_compile_node(iseq, condition, cond_seq, false, scope_node);
+                    }
+
+                    PUSH_INSN1(cond_seq, condition_location, topn, INT2FIX(1));
+                    PUSH_SEND_WITH_FLAG(cond_seq, condition_location, idEqq, INT2NUM(1), INT2FIX(VM_CALL_FCALL | VM_CALL_ARGS_SIMPLE));
+                }
+
+                PUSH_INSNL(cond_seq, condition_location, branchif, label);
+            }
+
+            // Now, add the label to the body and compile the body of the
+            // when clause. This involves popping the predicate, compiling
+            // the statements to be executed, and then compiling a jump to
+            // the end of the case node.
+            PUSH_LABEL(body_seq, label);
+            PUSH_INSN(body_seq, clause_location, pop);
+
+            // Establish branch coverage for the when clause.
+            if (PM_BRANCH_COVERAGE_P(iseq)) {
+                rb_code_location_t branch_location = pm_code_location(scope_node, clause->statements != NULL ? ((const pm_node_t *) clause->statements) : ((const pm_node_t *) clause));
+                add_trace_branch_coverage(iseq, body_seq, &branch_location, branch_location.beg_pos.column, branch_id++, "when", branches);
+            }
+
+            if (clause->statements != NULL) {
+                pm_compile_node(iseq, (const pm_node_t *) clause->statements, body_seq, popped, scope_node);
+            }
+            else if (!popped) {
+                PUSH_SYNTHETIC_PUTNIL(body_seq, iseq);
+            }
+
+            PUSH_INSNL(body_seq, clause_location, jump, end_label);
+        }
+
+        // Now that we have compiled the conditions and the bodies of the
+        // various when clauses, we can compile the predicate, lay out the
+        // conditions, compile the fallback subsequent if there is one, and
+        // finally put in the bodies of the when clauses.
+        PM_COMPILE_NOT_POPPED(cast->predicate);
+
+        // If we have a dispatch hash, then we'll use it here to create the
+        // optimization.
+        if (dispatch != Qundef) {
+            PUSH_INSN(ret, location, dup);
+            PUSH_INSN2(ret, location, opt_case_dispatch, dispatch, else_label);
+            LABEL_REF(else_label);
+        }
+
+        PUSH_SEQ(ret, cond_seq);
+
+        // Compile either the explicit else clause or an implicit else
+        // clause.
+        PUSH_LABEL(ret, else_label);
+
+        if (cast->else_clause != NULL) {
+            pm_node_location_t else_location = PM_NODE_START_LOCATION(parser, cast->else_clause->statements != NULL ? ((const pm_node_t *) cast->else_clause->statements) : ((const pm_node_t *) cast->else_clause));
+            PUSH_INSN(ret, else_location, pop);
+
+            // Establish branch coverage for the else clause.
+            if (PM_BRANCH_COVERAGE_P(iseq)) {
+                rb_code_location_t branch_location = pm_code_location(scope_node, cast->else_clause->statements != NULL ? ((const pm_node_t *) cast->else_clause->statements) : ((const pm_node_t *) cast->else_clause));
+                add_trace_branch_coverage(iseq, ret, &branch_location, branch_location.beg_pos.column, branch_id, "else", branches);
+            }
+
+            PM_COMPILE((const pm_node_t *) cast->else_clause);
+            PUSH_INSNL(ret, else_location, jump, end_label);
+        }
+        else {
+            PUSH_INSN(ret, location, pop);
+
+            // Establish branch coverage for the implicit else clause.
+            if (PM_BRANCH_COVERAGE_P(iseq)) {
+                add_trace_branch_coverage(iseq, ret, &case_location, case_location.beg_pos.column, branch_id, "else", branches);
+            }
+
+            if (!popped) PUSH_INSN(ret, location, putnil);
+            PUSH_INSNL(ret, location, jump, end_label);
+        }
+    }
+
+    PUSH_SEQ(ret, body_seq);
+    PUSH_LABEL(ret, end_label);
+}
+
+static inline void
+pm_compile_case_match_node(rb_iseq_t *iseq, const pm_case_match_node_t *node, const pm_node_location_t *location, LINK_ANCHOR *const ret, bool popped, pm_scope_node_t *scope_node)
+{
+    // This is the anchor that we will compile the bodies of the various
+    // `in` nodes into. We'll make sure that the patterns that are compiled
+    // jump into the correct spots within this anchor.
+    DECL_ANCHOR(body_seq);
+
+    // This is the anchor that we will compile the patterns of the various
+    // `in` nodes into. If a match is found, they will need to jump into the
+    // body_seq anchor to the correct spot.
+    DECL_ANCHOR(cond_seq);
+
+    // This label is used to indicate the end of the entire node. It is
+    // jumped to after the entire stack is cleaned up.
+    LABEL *end_label = NEW_LABEL(location->line);
+
+    // This label is used as the fallback for the case match. If no match is
+    // found, then we jump to this label. This is either an `else` clause or
+    // an error handler.
+    LABEL *else_label = NEW_LABEL(location->line);
+
+    // We're going to use this to uniquely identify each branch so that we
+    // can track coverage information.
+    rb_code_location_t case_location = { 0 };
+    VALUE branches = Qfalse;
+    int branch_id = 0;
+
+    if (PM_BRANCH_COVERAGE_P(iseq)) {
+        case_location = pm_code_location(scope_node, (const pm_node_t *) node);
+        branches = decl_branch_base(iseq, PTR2NUM(node), &case_location, "case");
+    }
+
+    // If there is only one pattern, then the behavior changes a bit. It
+    // effectively gets treated as a match required node (this is how it is
+    // represented in the other parser).
+    bool in_single_pattern = node->else_clause == NULL && node->conditions.size == 1;
+
+    // First, we're going to push a bunch of stuff onto the stack that is
+    // going to serve as our scratch space.
+    if (in_single_pattern) {
+        PUSH_INSN(ret, *location, putnil); // key error key
+        PUSH_INSN(ret, *location, putnil); // key error matchee
+        PUSH_INSN1(ret, *location, putobject, Qfalse); // key error?
+        PUSH_INSN(ret, *location, putnil); // error string
+    }
+
+    // Now we're going to compile the value to match against.
+    PUSH_INSN(ret, *location, putnil); // deconstruct cache
+    PM_COMPILE_NOT_POPPED(node->predicate);
+
+    // Next, we'll loop through every in clause and compile its body into
+    // the body_seq anchor and its pattern into the cond_seq anchor. We'll
+    // make sure the pattern knows how to jump correctly into the body if it
+    // finds a match.
+    for (size_t index = 0; index < node->conditions.size; index++) {
+        const pm_node_t *condition = node->conditions.nodes[index];
+        RUBY_ASSERT(PM_NODE_TYPE_P(condition, PM_IN_NODE));
+
+        const pm_in_node_t *in_node = (const pm_in_node_t *) condition;
+        const pm_node_location_t in_location = PM_NODE_START_LOCATION(scope_node->parser, in_node);
+        const pm_node_location_t pattern_location = PM_NODE_START_LOCATION(scope_node->parser, in_node->pattern);
+
+        if (branch_id) {
+            PUSH_INSN(body_seq, in_location, putnil);
+        }
+
+        LABEL *body_label = NEW_LABEL(in_location.line);
+        PUSH_LABEL(body_seq, body_label);
+        PUSH_INSN1(body_seq, in_location, adjuststack, INT2FIX(in_single_pattern ? 6 : 2));
+
+        // Establish branch coverage for the in clause.
+        if (PM_BRANCH_COVERAGE_P(iseq)) {
+            rb_code_location_t branch_location = pm_code_location(scope_node, in_node->statements != NULL ? ((const pm_node_t *) in_node->statements) : ((const pm_node_t *) in_node));
+            add_trace_branch_coverage(iseq, body_seq, &branch_location, branch_location.beg_pos.column, branch_id++, "in", branches);
+        }
+
+        if (in_node->statements != NULL) {
+            PM_COMPILE_INTO_ANCHOR(body_seq, (const pm_node_t *) in_node->statements);
+        }
+        else if (!popped) {
+            PUSH_SYNTHETIC_PUTNIL(body_seq, iseq);
+        }
+
+        PUSH_INSNL(body_seq, in_location, jump, end_label);
+        LABEL *next_pattern_label = NEW_LABEL(pattern_location.line);
+
+        PUSH_INSN(cond_seq, pattern_location, dup);
+        pm_compile_pattern(iseq, scope_node, in_node->pattern, cond_seq, body_label, next_pattern_label, in_single_pattern, false, true, 2);
+        PUSH_LABEL(cond_seq, next_pattern_label);
+        LABEL_UNREMOVABLE(next_pattern_label);
+    }
+
+    if (node->else_clause != NULL) {
+        // If we have an `else` clause, then this becomes our fallback (and
+        // there is no need to compile in code to potentially raise an
+        // error).
+        const pm_else_node_t *else_node = node->else_clause;
+
+        PUSH_LABEL(cond_seq, else_label);
+        PUSH_INSN(cond_seq, *location, pop);
+        PUSH_INSN(cond_seq, *location, pop);
+
+        // Establish branch coverage for the else clause.
+        if (PM_BRANCH_COVERAGE_P(iseq)) {
+            rb_code_location_t branch_location = pm_code_location(scope_node, else_node->statements != NULL ? ((const pm_node_t *) else_node->statements) : ((const pm_node_t *) else_node));
+            add_trace_branch_coverage(iseq, cond_seq, &branch_location, branch_location.beg_pos.column, branch_id, "else", branches);
+        }
+
+        PM_COMPILE_INTO_ANCHOR(cond_seq, (const pm_node_t *) else_node);
+        PUSH_INSNL(cond_seq, *location, jump, end_label);
+        PUSH_INSN(cond_seq, *location, putnil);
+        if (popped) PUSH_INSN(cond_seq, *location, putnil);
+    }
+    else {
+        // Otherwise, if we do not have an `else` clause, we will compile in
+        // the code to handle raising an appropriate error.
+        PUSH_LABEL(cond_seq, else_label);
+
+        // Establish branch coverage for the implicit else clause.
+        add_trace_branch_coverage(iseq, cond_seq, &case_location, case_location.beg_pos.column, branch_id, "else", branches);
+
+        if (in_single_pattern) {
+            pm_compile_pattern_error_handler(iseq, scope_node, (const pm_node_t *) node, cond_seq, end_label, popped);
+        }
+        else {
+            PUSH_INSN1(cond_seq, *location, putspecialobject, INT2FIX(VM_SPECIAL_OBJECT_VMCORE));
+            PUSH_INSN1(cond_seq, *location, putobject, rb_eNoMatchingPatternError);
+            PUSH_INSN1(cond_seq, *location, topn, INT2FIX(2));
+            PUSH_SEND(cond_seq, *location, id_core_raise, INT2FIX(2));
+
+            PUSH_INSN1(cond_seq, *location, adjuststack, INT2FIX(3));
+            if (!popped) PUSH_INSN(cond_seq, *location, putnil);
+            PUSH_INSNL(cond_seq, *location, jump, end_label);
+            PUSH_INSN1(cond_seq, *location, dupn, INT2FIX(1));
+            if (popped) PUSH_INSN(cond_seq, *location, putnil);
+        }
+    }
+
+    // At the end of all of this compilation, we will add the code for the
+    // conditions first, then the various bodies, then mark the end of the
+    // entire sequence with the end label.
+    PUSH_SEQ(ret, cond_seq);
+    PUSH_SEQ(ret, body_seq);
+    PUSH_LABEL(ret, end_label);
+}
+
+static inline void
+pm_compile_forwarding_super_node(rb_iseq_t *iseq, const pm_forwarding_super_node_t *node, const pm_node_location_t *location, LINK_ANCHOR *const ret, bool popped, pm_scope_node_t *scope_node)
+{
+    const rb_iseq_t *block = NULL;
+    const rb_iseq_t *previous_block = NULL;
+    LABEL *retry_label = NULL;
+    LABEL *retry_end_l = NULL;
+
+    if (node->block != NULL) {
+        previous_block = ISEQ_COMPILE_DATA(iseq)->current_block;
+        ISEQ_COMPILE_DATA(iseq)->current_block = NULL;
+
+        retry_label = NEW_LABEL(location->line);
+        retry_end_l = NEW_LABEL(location->line);
+
+        PUSH_LABEL(ret, retry_label);
+    }
+    else {
+        iseq_set_use_block(ISEQ_BODY(iseq)->local_iseq);
+    }
+
+    PUSH_INSN(ret, *location, putself);
+    int flag = VM_CALL_ZSUPER | VM_CALL_SUPER | VM_CALL_FCALL;
+
+    if (node->block != NULL) {
+        pm_scope_node_t next_scope_node;
+        pm_scope_node_init((const pm_node_t *) node->block, &next_scope_node, scope_node);
+
+        ISEQ_COMPILE_DATA(iseq)->current_block = block = NEW_CHILD_ISEQ(&next_scope_node, make_name_for_block(iseq), ISEQ_TYPE_BLOCK, location->line);
+        pm_scope_node_destroy(&next_scope_node);
+        RB_OBJ_WRITTEN(iseq, Qundef, (VALUE) block);
+    }
+
+    DECL_ANCHOR(args);
+
+    struct rb_iseq_constant_body *const body = ISEQ_BODY(iseq);
+    const rb_iseq_t *local_iseq = body->local_iseq;
+    const struct rb_iseq_constant_body *const local_body = ISEQ_BODY(local_iseq);
+
+    int argc = 0;
+    int depth = get_lvar_level(iseq);
+
+    if (ISEQ_BODY(ISEQ_BODY(iseq)->local_iseq)->param.flags.forwardable) {
+        flag |= VM_CALL_FORWARDING;
+        pm_local_index_t mult_local = pm_lookup_local_index(iseq, scope_node, PM_CONSTANT_DOT3, 0);
+        PUSH_GETLOCAL(ret, *location, mult_local.index, mult_local.level);
+
+        const struct rb_callinfo *callinfo = new_callinfo(iseq, 0, 0, flag, NULL, block != NULL);
+        PUSH_INSN2(ret, *location, invokesuperforward, callinfo, block);
+
+        if (popped) PUSH_INSN(ret, *location, pop);
+        if (node->block) {
+            ISEQ_COMPILE_DATA(iseq)->current_block = previous_block;
+        }
+        return;
+    }
+
+    if (local_body->param.flags.has_lead) {
+        /* required arguments */
+        for (int i = 0; i < local_body->param.lead_num; i++) {
+            int idx = local_body->local_table_size - i;
+            PUSH_GETLOCAL(args, *location, idx, depth);
+        }
+        argc += local_body->param.lead_num;
+    }
+
+    if (local_body->param.flags.has_opt) {
+        /* optional arguments */
+        for (int j = 0; j < local_body->param.opt_num; j++) {
+            int idx = local_body->local_table_size - (argc + j);
+            PUSH_GETLOCAL(args, *location, idx, depth);
+        }
+        argc += local_body->param.opt_num;
+    }
+
+    if (local_body->param.flags.has_rest) {
+        /* rest argument */
+        int idx = local_body->local_table_size - local_body->param.rest_start;
+        PUSH_GETLOCAL(args, *location, idx, depth);
+        PUSH_INSN1(args, *location, splatarray, Qfalse);
+
+        argc = local_body->param.rest_start + 1;
+        flag |= VM_CALL_ARGS_SPLAT;
+    }
+
+    if (local_body->param.flags.has_post) {
+        /* post arguments */
+        int post_len = local_body->param.post_num;
+        int post_start = local_body->param.post_start;
+
+        int j = 0;
+        for (; j < post_len; j++) {
+            int idx = local_body->local_table_size - (post_start + j);
+            PUSH_GETLOCAL(args, *location, idx, depth);
+        }
+
+        if (local_body->param.flags.has_rest) {
+            // argc remains unchanged from rest branch
+            PUSH_INSN1(args, *location, newarray, INT2FIX(j));
+            PUSH_INSN(args, *location, concatarray);
+        }
+        else {
+            argc = post_len + post_start;
+        }
+    }
+
+    const struct rb_iseq_param_keyword *const local_keyword = local_body->param.keyword;
+    if (local_body->param.flags.has_kw) {
+        int local_size = local_body->local_table_size;
+        argc++;
+
+        PUSH_INSN1(args, *location, putspecialobject, INT2FIX(VM_SPECIAL_OBJECT_VMCORE));
+
+        if (local_body->param.flags.has_kwrest) {
+            int idx = local_body->local_table_size - local_keyword->rest_start;
+            PUSH_GETLOCAL(args, *location, idx, depth);
+            RUBY_ASSERT(local_keyword->num > 0);
+            PUSH_SEND(args, *location, rb_intern("dup"), INT2FIX(0));
+        }
+        else {
+            PUSH_INSN1(args, *location, newhash, INT2FIX(0));
+        }
+        int i = 0;
+        for (; i < local_keyword->num; ++i) {
+            ID id = local_keyword->table[i];
+            int idx = local_size - get_local_var_idx(local_iseq, id);
+
+            {
+                VALUE operand = ID2SYM(id);
+                PUSH_INSN1(args, *location, putobject, operand);
+            }
+
+            PUSH_GETLOCAL(args, *location, idx, depth);
+        }
+
+        PUSH_SEND(args, *location, id_core_hash_merge_ptr, INT2FIX(i * 2 + 1));
+        flag |= VM_CALL_KW_SPLAT| VM_CALL_KW_SPLAT_MUT;
+    }
+    else if (local_body->param.flags.has_kwrest) {
+        int idx = local_body->local_table_size - local_keyword->rest_start;
+        PUSH_GETLOCAL(args, *location, idx, depth);
+        argc++;
+        flag |= VM_CALL_KW_SPLAT;
+    }
+
+    PUSH_SEQ(ret, args);
+
+    {
+        const struct rb_callinfo *callinfo = new_callinfo(iseq, 0, argc, flag, NULL, block != NULL);
+        PUSH_INSN2(ret, *location, invokesuper, callinfo, block);
+    }
+
+    if (node->block != NULL) {
+        pm_compile_retry_end_label(iseq, ret, retry_end_l);
+        PUSH_CATCH_ENTRY(CATCH_TYPE_BREAK, retry_label, retry_end_l, block, retry_end_l);
+        ISEQ_COMPILE_DATA(iseq)->current_block = previous_block;
+    }
+
+    if (popped) PUSH_INSN(ret, *location, pop);
+}
+
+static inline void
+pm_compile_match_required_node(rb_iseq_t *iseq, const pm_match_required_node_t *node, const pm_node_location_t *location, LINK_ANCHOR *const ret, bool popped, pm_scope_node_t *scope_node)
+{
+    LABEL *matched_label = NEW_LABEL(location->line);
+    LABEL *unmatched_label = NEW_LABEL(location->line);
+    LABEL *done_label = NEW_LABEL(location->line);
+
+    // First, we're going to push a bunch of stuff onto the stack that is
+    // going to serve as our scratch space.
+    PUSH_INSN(ret, *location, putnil); // key error key
+    PUSH_INSN(ret, *location, putnil); // key error matchee
+    PUSH_INSN1(ret, *location, putobject, Qfalse); // key error?
+    PUSH_INSN(ret, *location, putnil); // error string
+    PUSH_INSN(ret, *location, putnil); // deconstruct cache
+
+    // Next we're going to compile the value expression such that it's on
+    // the stack.
+    PM_COMPILE_NOT_POPPED(node->value);
+
+    // Here we'll dup it so that it can be used for comparison, but also be
+    // used for error handling.
+    PUSH_INSN(ret, *location, dup);
+
+    // Next we'll compile the pattern. We indicate to the pm_compile_pattern
+    // function that this is the only pattern that will be matched against
+    // through the in_single_pattern parameter. We also indicate that the
+    // value to compare against is 2 slots from the top of the stack (the
+    // base_index parameter).
+    pm_compile_pattern(iseq, scope_node, node->pattern, ret, matched_label, unmatched_label, true, false, true, 2);
+
+    // If the pattern did not match the value, then we're going to compile
+    // in our error handler code. This will determine which error to raise
+    // and raise it.
+    PUSH_LABEL(ret, unmatched_label);
+    pm_compile_pattern_error_handler(iseq, scope_node, (const pm_node_t *) node, ret, done_label, popped);
+
+    // If the pattern did match, we'll clean up the values we've pushed onto
+    // the stack and then push nil onto the stack if it's not popped.
+    PUSH_LABEL(ret, matched_label);
+    PUSH_INSN1(ret, *location, adjuststack, INT2FIX(6));
+    if (!popped) PUSH_INSN(ret, *location, putnil);
+    PUSH_INSNL(ret, *location, jump, done_label);
+
+    PUSH_LABEL(ret, done_label);
+}
+
+static inline void
+pm_compile_match_write_node(rb_iseq_t *iseq, const pm_match_write_node_t *node, const pm_node_location_t *location, LINK_ANCHOR *const ret, bool popped, pm_scope_node_t *scope_node)
+{
+    LABEL *fail_label = NEW_LABEL(location->line);
+    LABEL *end_label = NEW_LABEL(location->line);
+
+    // First, we'll compile the call so that all of its instructions are
+    // present. Then we'll compile all of the local variable targets.
+    PM_COMPILE_NOT_POPPED((const pm_node_t *) node->call);
+
+    // Now, check if the match was successful. If it was, then we'll
+    // continue on and assign local variables. Otherwise we'll skip over the
+    // assignment code.
+    {
+        VALUE operand = rb_id2sym(idBACKREF);
+        PUSH_INSN1(ret, *location, getglobal, operand);
+    }
+
+    PUSH_INSN(ret, *location, dup);
+    PUSH_INSNL(ret, *location, branchunless, fail_label);
+
+    // If there's only a single local variable target, we can skip some of
+    // the bookkeeping, so we'll put a special branch here.
+    size_t targets_count = node->targets.size;
+
+    if (targets_count == 1) {
+        const pm_node_t *target = node->targets.nodes[0];
+        RUBY_ASSERT(PM_NODE_TYPE_P(target, PM_LOCAL_VARIABLE_TARGET_NODE));
+
+        const pm_local_variable_target_node_t *local_target = (const pm_local_variable_target_node_t *) target;
+        pm_local_index_t index = pm_lookup_local_index(iseq, scope_node, local_target->name, local_target->depth);
+
+        {
+            VALUE operand = rb_id2sym(pm_constant_id_lookup(scope_node, local_target->name));
+            PUSH_INSN1(ret, *location, putobject, operand);
+        }
+
+        PUSH_SEND(ret, *location, idAREF, INT2FIX(1));
+        PUSH_LABEL(ret, fail_label);
+        PUSH_SETLOCAL(ret, *location, index.index, index.level);
+        if (popped) PUSH_INSN(ret, *location, pop);
+        return;
+    }
+
+    DECL_ANCHOR(fail_anchor);
+
+    // Otherwise there is more than one local variable target, so we'll need
+    // to do some bookkeeping.
+    for (size_t targets_index = 0; targets_index < targets_count; targets_index++) {
+        const pm_node_t *target = node->targets.nodes[targets_index];
+        RUBY_ASSERT(PM_NODE_TYPE_P(target, PM_LOCAL_VARIABLE_TARGET_NODE));
+
+        const pm_local_variable_target_node_t *local_target = (const pm_local_variable_target_node_t *) target;
+        pm_local_index_t index = pm_lookup_local_index(iseq, scope_node, local_target->name, local_target->depth);
+
+        if (((size_t) targets_index) < (targets_count - 1)) {
+            PUSH_INSN(ret, *location, dup);
+        }
+
+        {
+            VALUE operand = rb_id2sym(pm_constant_id_lookup(scope_node, local_target->name));
+            PUSH_INSN1(ret, *location, putobject, operand);
+        }
+
+        PUSH_SEND(ret, *location, idAREF, INT2FIX(1));
+        PUSH_SETLOCAL(ret, *location, index.index, index.level);
+
+        PUSH_INSN(fail_anchor, *location, putnil);
+        PUSH_SETLOCAL(fail_anchor, *location, index.index, index.level);
+    }
+
+    // Since we matched successfully, now we'll jump to the end.
+    PUSH_INSNL(ret, *location, jump, end_label);
+
+    // In the case that the match failed, we'll loop through each local
+    // variable target and set all of them to `nil`.
+    PUSH_LABEL(ret, fail_label);
+    PUSH_INSN(ret, *location, pop);
+    PUSH_SEQ(ret, fail_anchor);
+
+    // Finally, we can push the end label for either case.
+    PUSH_LABEL(ret, end_label);
+    if (popped) PUSH_INSN(ret, *location, pop);
+}
+
+static inline void
+pm_compile_next_node(rb_iseq_t *iseq, const pm_next_node_t *node, const pm_node_location_t *location, LINK_ANCHOR *const ret, bool popped, pm_scope_node_t *scope_node)
+{
+    if (ISEQ_COMPILE_DATA(iseq)->redo_label != 0 && can_add_ensure_iseq(iseq)) {
+        LABEL *splabel = NEW_LABEL(0);
+        PUSH_LABEL(ret, splabel);
+
+        if (node->arguments) {
+            PM_COMPILE_NOT_POPPED((const pm_node_t *) node->arguments);
+        }
+        else {
+            PUSH_INSN(ret, *location, putnil);
+        }
+        pm_add_ensure_iseq(ret, iseq, 0, scope_node);
+
+        PUSH_ADJUST(ret, *location, ISEQ_COMPILE_DATA(iseq)->redo_label);
+        PUSH_INSNL(ret, *location, jump, ISEQ_COMPILE_DATA(iseq)->start_label);
+
+        PUSH_ADJUST_RESTORE(ret, splabel);
+        if (!popped) PUSH_INSN(ret, *location, putnil);
+    }
+    else if (ISEQ_COMPILE_DATA(iseq)->end_label && can_add_ensure_iseq(iseq)) {
+        LABEL *splabel = NEW_LABEL(0);
+
+        PUSH_LABEL(ret, splabel);
+        PUSH_ADJUST(ret, *location, ISEQ_COMPILE_DATA(iseq)->start_label);
+
+        if (node->arguments != NULL) {
+            PM_COMPILE_NOT_POPPED((const pm_node_t *) node->arguments);
+        }
+        else {
+            PUSH_INSN(ret, *location, putnil);
+        }
+
+        pm_add_ensure_iseq(ret, iseq, 0, scope_node);
+        PUSH_INSNL(ret, *location, jump, ISEQ_COMPILE_DATA(iseq)->end_label);
+        PUSH_ADJUST_RESTORE(ret, splabel);
+        splabel->unremovable = FALSE;
+
+        if (!popped) PUSH_INSN(ret, *location, putnil);
+    }
+    else {
+        const rb_iseq_t *ip = iseq;
+        unsigned long throw_flag = 0;
+
+        while (ip) {
+            if (!ISEQ_COMPILE_DATA(ip)) {
+                ip = 0;
+                break;
+            }
+
+            throw_flag = VM_THROW_NO_ESCAPE_FLAG;
+            if (ISEQ_COMPILE_DATA(ip)->redo_label != 0) {
+                /* while loop */
+                break;
+            }
+            else if (ISEQ_BODY(ip)->type == ISEQ_TYPE_BLOCK) {
+                break;
+            }
+            else if (ISEQ_BODY(ip)->type == ISEQ_TYPE_EVAL) {
+                COMPILE_ERROR(iseq, location->line, "Invalid next");
+                return;
+            }
+
+            ip = ISEQ_BODY(ip)->parent_iseq;
+        }
+
+        if (ip != 0) {
+            if (node->arguments) {
+                PM_COMPILE_NOT_POPPED((const pm_node_t *) node->arguments);
+            }
+            else {
+                PUSH_INSN(ret, *location, putnil);
+            }
+
+            PUSH_INSN1(ret, *location, throw, INT2FIX(throw_flag | TAG_NEXT));
+            if (popped) PUSH_INSN(ret, *location, pop);
+        }
+        else {
+            COMPILE_ERROR(iseq, location->line, "Invalid next");
+        }
+    }
+}
+
+static inline void
+pm_compile_redo_node(rb_iseq_t *iseq, const pm_node_location_t *location, LINK_ANCHOR *const ret, bool popped, pm_scope_node_t *scope_node)
+{
+    if (ISEQ_COMPILE_DATA(iseq)->redo_label && can_add_ensure_iseq(iseq)) {
+        LABEL *splabel = NEW_LABEL(0);
+
+        PUSH_LABEL(ret, splabel);
+        PUSH_ADJUST(ret, *location, ISEQ_COMPILE_DATA(iseq)->redo_label);
+        pm_add_ensure_iseq(ret, iseq, 0, scope_node);
+
+        PUSH_INSNL(ret, *location, jump, ISEQ_COMPILE_DATA(iseq)->redo_label);
+        PUSH_ADJUST_RESTORE(ret, splabel);
+        if (!popped) PUSH_INSN(ret, *location, putnil);
+    }
+    else if (ISEQ_BODY(iseq)->type != ISEQ_TYPE_EVAL && ISEQ_COMPILE_DATA(iseq)->start_label && can_add_ensure_iseq(iseq)) {
+        LABEL *splabel = NEW_LABEL(0);
+
+        PUSH_LABEL(ret, splabel);
+        pm_add_ensure_iseq(ret, iseq, 0, scope_node);
+        PUSH_ADJUST(ret, *location, ISEQ_COMPILE_DATA(iseq)->start_label);
+
+        PUSH_INSNL(ret, *location, jump, ISEQ_COMPILE_DATA(iseq)->start_label);
+        PUSH_ADJUST_RESTORE(ret, splabel);
+        if (!popped) PUSH_INSN(ret, *location, putnil);
+    }
+    else {
+        const rb_iseq_t *ip = iseq;
+
+        while (ip) {
+            if (!ISEQ_COMPILE_DATA(ip)) {
+                ip = 0;
+                break;
+            }
+
+            if (ISEQ_COMPILE_DATA(ip)->redo_label != 0) {
+                break;
+            }
+            else if (ISEQ_BODY(ip)->type == ISEQ_TYPE_BLOCK) {
+                break;
+            }
+            else if (ISEQ_BODY(ip)->type == ISEQ_TYPE_EVAL) {
+                COMPILE_ERROR(iseq, location->line, "Invalid redo");
+                return;
+            }
+
+            ip = ISEQ_BODY(ip)->parent_iseq;
+        }
+
+        if (ip != 0) {
+            PUSH_INSN(ret, *location, putnil);
+            PUSH_INSN1(ret, *location, throw, INT2FIX(VM_THROW_NO_ESCAPE_FLAG | TAG_REDO));
+            if (popped) PUSH_INSN(ret, *location, pop);
+        }
+        else {
+            COMPILE_ERROR(iseq, location->line, "Invalid redo");
+        }
+    }
+}
+
+static inline void
+pm_compile_rescue_node(rb_iseq_t *iseq, const pm_rescue_node_t *node, const pm_node_location_t *location, LINK_ANCHOR *const ret, bool popped, pm_scope_node_t *scope_node)
+{
+    iseq_set_exception_local_table(iseq);
+
+    // First, establish the labels that we need to be able to jump to within
+    // this compilation block.
+    LABEL *exception_match_label = NEW_LABEL(location->line);
+    LABEL *rescue_end_label = NEW_LABEL(location->line);
+
+    // Next, compile each of the exceptions that we're going to be
+    // handling. For each one, we'll add instructions to check if the
+    // exception matches the raised one, and if it does then jump to the
+    // exception_match_label label. Otherwise it will fall through to the
+    // subsequent check. If there are no exceptions, we'll only check
+    // StandardError.
+    const pm_node_list_t *exceptions = &node->exceptions;
+
+    if (exceptions->size > 0) {
+        for (size_t index = 0; index < exceptions->size; index++) {
+            PUSH_GETLOCAL(ret, *location, LVAR_ERRINFO, 0);
+            PM_COMPILE(exceptions->nodes[index]);
+            int checkmatch_flags = VM_CHECKMATCH_TYPE_RESCUE;
+            if (PM_NODE_TYPE_P(exceptions->nodes[index], PM_SPLAT_NODE)) {
+                checkmatch_flags |= VM_CHECKMATCH_ARRAY;
+            }
+            PUSH_INSN1(ret, *location, checkmatch, INT2FIX(checkmatch_flags));
+            PUSH_INSNL(ret, *location, branchif, exception_match_label);
+        }
+    }
+    else {
+        PUSH_GETLOCAL(ret, *location, LVAR_ERRINFO, 0);
+        PUSH_INSN1(ret, *location, putobject, rb_eStandardError);
+        PUSH_INSN1(ret, *location, checkmatch, INT2FIX(VM_CHECKMATCH_TYPE_RESCUE));
+        PUSH_INSNL(ret, *location, branchif, exception_match_label);
+    }
+
+    // If none of the exceptions that we are matching against matched, then
+    // we'll jump straight to the rescue_end_label label.
+    PUSH_INSNL(ret, *location, jump, rescue_end_label);
+
+    // Here we have the exception_match_label, which is where the
+    // control-flow goes in the case that one of the exceptions matched.
+    // Here we will compile the instructions to handle the exception.
+    PUSH_LABEL(ret, exception_match_label);
+    PUSH_TRACE(ret, RUBY_EVENT_RESCUE);
+
+    // If we have a reference to the exception, then we'll compile the write
+    // into the instruction sequence. This can look quite different
+    // depending on the kind of write being performed.
+    if (node->reference) {
+        DECL_ANCHOR(writes);
+        DECL_ANCHOR(cleanup);
+
+        pm_compile_target_node(iseq, node->reference, ret, writes, cleanup, scope_node, NULL);
+        PUSH_GETLOCAL(ret, *location, LVAR_ERRINFO, 0);
+
+        PUSH_SEQ(ret, writes);
+        PUSH_SEQ(ret, cleanup);
+    }
+
+    // If we have statements to execute, we'll compile them here. Otherwise
+    // we'll push nil onto the stack.
+    if (node->statements != NULL) {
+        // We'll temporarily remove the end_label location from the iseq
+        // when compiling the statements so that next/redo statements
+        // inside the body will throw to the correct place instead of
+        // jumping straight to the end of this iseq
+        LABEL *prev_end = ISEQ_COMPILE_DATA(iseq)->end_label;
+        ISEQ_COMPILE_DATA(iseq)->end_label = NULL;
+
+        PM_COMPILE((const pm_node_t *) node->statements);
+
+        // Now restore the end_label
+        ISEQ_COMPILE_DATA(iseq)->end_label = prev_end;
+    }
+    else {
+        PUSH_INSN(ret, *location, putnil);
+    }
+
+    PUSH_INSN(ret, *location, leave);
+
+    // Here we'll insert the rescue_end_label label, which is jumped to if
+    // none of the exceptions matched. It will cause the control-flow to
+    // either jump to the next rescue clause or it will fall through to the
+    // subsequent instruction returning the raised error.
+    PUSH_LABEL(ret, rescue_end_label);
+    if (node->subsequent != NULL) {
+        PM_COMPILE((const pm_node_t *) node->subsequent);
+    }
+    else {
+        PUSH_GETLOCAL(ret, *location, 1, 0);
+    }
+}
+
+static inline void
+pm_compile_return_node(rb_iseq_t *iseq, const pm_return_node_t *node, const pm_node_location_t *location, LINK_ANCHOR *const ret, bool popped, pm_scope_node_t *scope_node)
+{
+    const pm_arguments_node_t *arguments = node->arguments;
+    enum rb_iseq_type type = ISEQ_BODY(iseq)->type;
+    LABEL *splabel = 0;
+
+    const rb_iseq_t *parent_iseq = iseq;
+    enum rb_iseq_type parent_type = ISEQ_BODY(parent_iseq)->type;
+    while (parent_type == ISEQ_TYPE_RESCUE || parent_type == ISEQ_TYPE_ENSURE) {
+        if (!(parent_iseq = ISEQ_BODY(parent_iseq)->parent_iseq)) break;
+        parent_type = ISEQ_BODY(parent_iseq)->type;
+    }
+
+    switch (parent_type) {
+      case ISEQ_TYPE_TOP:
+      case ISEQ_TYPE_MAIN:
+        if (arguments) {
+            rb_warn("argument of top-level return is ignored");
+        }
+        if (parent_iseq == iseq) {
+            type = ISEQ_TYPE_METHOD;
+        }
+        break;
+      default:
+        break;
+    }
+
+    if (type == ISEQ_TYPE_METHOD) {
+        splabel = NEW_LABEL(0);
+        PUSH_LABEL(ret, splabel);
+        PUSH_ADJUST(ret, *location, 0);
+    }
+
+    if (arguments != NULL) {
+        PM_COMPILE_NOT_POPPED((const pm_node_t *) arguments);
+    }
+    else {
+        PUSH_INSN(ret, *location, putnil);
+    }
+
+    if (type == ISEQ_TYPE_METHOD && can_add_ensure_iseq(iseq)) {
+        pm_add_ensure_iseq(ret, iseq, 1, scope_node);
+        PUSH_TRACE(ret, RUBY_EVENT_RETURN);
+        PUSH_INSN(ret, *location, leave);
+        PUSH_ADJUST_RESTORE(ret, splabel);
+        if (!popped) PUSH_INSN(ret, *location, putnil);
+    }
+    else {
+        PUSH_INSN1(ret, *location, throw, INT2FIX(TAG_RETURN));
+        if (popped) PUSH_INSN(ret, *location, pop);
+    }
+}
+
+static inline void
+pm_compile_super_node(rb_iseq_t *iseq, const pm_super_node_t *node, const pm_node_location_t *location, LINK_ANCHOR *const ret, bool popped, pm_scope_node_t *scope_node)
+{
+    DECL_ANCHOR(args);
+
+    LABEL *retry_label = NEW_LABEL(location->line);
+    LABEL *retry_end_l = NEW_LABEL(location->line);
+
+    const rb_iseq_t *previous_block = ISEQ_COMPILE_DATA(iseq)->current_block;
+    const rb_iseq_t *current_block;
+    ISEQ_COMPILE_DATA(iseq)->current_block = current_block = NULL;
+
+    PUSH_LABEL(ret, retry_label);
+    PUSH_INSN(ret, *location, putself);
+
+    int flags = 0;
+    struct rb_callinfo_kwarg *keywords = NULL;
+    int argc = pm_setup_args(node->arguments, node->block, &flags, &keywords, iseq, ret, scope_node, location);
+    bool is_forwardable = (node->arguments != NULL) && PM_NODE_FLAG_P(node->arguments, PM_ARGUMENTS_NODE_FLAGS_CONTAINS_FORWARDING);
+    flags |= VM_CALL_SUPER | VM_CALL_FCALL;
+
+    if (node->block && PM_NODE_TYPE_P(node->block, PM_BLOCK_NODE)) {
+        pm_scope_node_t next_scope_node;
+        pm_scope_node_init(node->block, &next_scope_node, scope_node);
+
+        ISEQ_COMPILE_DATA(iseq)->current_block = current_block = NEW_CHILD_ISEQ(&next_scope_node, make_name_for_block(iseq), ISEQ_TYPE_BLOCK, location->line);
+        pm_scope_node_destroy(&next_scope_node);
+    }
+
+    if (!node->block) {
+        iseq_set_use_block(ISEQ_BODY(iseq)->local_iseq);
+    }
+
+    if ((flags & VM_CALL_ARGS_BLOCKARG) && (flags & VM_CALL_KW_SPLAT) && !(flags & VM_CALL_KW_SPLAT_MUT)) {
+        PUSH_INSN(args, *location, splatkw);
+    }
+
+    PUSH_SEQ(ret, args);
+    if (is_forwardable && ISEQ_BODY(ISEQ_BODY(iseq)->local_iseq)->param.flags.forwardable) {
+        flags |= VM_CALL_FORWARDING;
+
+        {
+            const struct rb_callinfo *callinfo = new_callinfo(iseq, 0, argc, flags, keywords, current_block != NULL);
+            PUSH_INSN2(ret, *location, invokesuperforward, callinfo, current_block);
+        }
+    }
+    else {
+        {
+            const struct rb_callinfo *callinfo = new_callinfo(iseq, 0, argc, flags, keywords, current_block != NULL);
+            PUSH_INSN2(ret, *location, invokesuper, callinfo, current_block);
+        }
+
+    }
+
+    pm_compile_retry_end_label(iseq, ret, retry_end_l);
+
+    if (popped) PUSH_INSN(ret, *location, pop);
+    ISEQ_COMPILE_DATA(iseq)->current_block = previous_block;
+    PUSH_CATCH_ENTRY(CATCH_TYPE_BREAK, retry_label, retry_end_l, current_block, retry_end_l);
+}
+
+static inline void
+pm_compile_yield_node(rb_iseq_t *iseq, const pm_yield_node_t *node, const pm_node_location_t *location, LINK_ANCHOR *const ret, bool popped, pm_scope_node_t *scope_node)
+{
+    switch (ISEQ_BODY(ISEQ_BODY(iseq)->local_iseq)->type) {
+      case ISEQ_TYPE_TOP:
+      case ISEQ_TYPE_MAIN:
+      case ISEQ_TYPE_CLASS:
+        COMPILE_ERROR(iseq, location->line, "Invalid yield");
+        return;
+      default: /* valid */;
+    }
+
+    int argc = 0;
+    int flags = 0;
+    struct rb_callinfo_kwarg *keywords = NULL;
+
+    if (node->arguments) {
+        argc = pm_setup_args(node->arguments, NULL, &flags, &keywords, iseq, ret, scope_node, location);
+    }
+
+    const struct rb_callinfo *callinfo = new_callinfo(iseq, 0, argc, flags, keywords, FALSE);
+    PUSH_INSN1(ret, *location, invokeblock, callinfo);
+
+    iseq_set_use_block(ISEQ_BODY(iseq)->local_iseq);
+    if (popped) PUSH_INSN(ret, *location, pop);
+
+    int level = 0;
+    for (const rb_iseq_t *tmp_iseq = iseq; tmp_iseq != ISEQ_BODY(iseq)->local_iseq; level++) {
+        tmp_iseq = ISEQ_BODY(tmp_iseq)->parent_iseq;
+    }
+
+    if (level > 0) access_outer_variables(iseq, level, rb_intern("yield"), true);
+}
+
+/**
+ * Compiles a prism node into instruction sequences.
+ *
+ * iseq -            The current instruction sequence object (used for locals)
+ * node -            The prism node to compile
+ * ret -             The linked list of instructions to append instructions onto
+ * popped -          True if compiling something with no side effects, so instructions don't
+ *                   need to be added
+ * scope_node - Stores parser and local information
+ */
+static void
+pm_compile_node(rb_iseq_t *iseq, const pm_node_t *node, LINK_ANCHOR *const ret, bool popped, pm_scope_node_t *scope_node)
+{
+    const pm_parser_t *parser = scope_node->parser;
+    const pm_node_location_t location = PM_NODE_START_LOCATION(parser, node);
+    int lineno = (int) location.line;
+
+    if (PM_NODE_TYPE_P(node, PM_BEGIN_NODE) && (((const pm_begin_node_t *) node)->statements == NULL) && (((const pm_begin_node_t *) node)->rescue_clause != NULL)) {
+        // If this node is a begin node and it has empty statements and also
+        // has a rescue clause, then the other parser considers it as
+        // starting on the same line as the rescue, as opposed to the
+        // location of the begin keyword. We replicate that behavior here.
+        lineno = (int) PM_NODE_START_LINE_COLUMN(parser, ((const pm_begin_node_t *) node)->rescue_clause).line;
+    }
+
+    if (PM_NODE_FLAG_P(node, PM_NODE_FLAG_NEWLINE) && ISEQ_COMPILE_DATA(iseq)->last_line != lineno) {
+        // If this node has the newline flag set and it is on a new line
+        // from the previous nodes that have been compiled for this ISEQ,
+        // then we need to emit a newline event.
+        int event = RUBY_EVENT_LINE;
+
+        ISEQ_COMPILE_DATA(iseq)->last_line = lineno;
+        if (lineno > 0 && ISEQ_COVERAGE(iseq) && ISEQ_LINE_COVERAGE(iseq)) {
+            event |= RUBY_EVENT_COVERAGE_LINE;
+        }
+        PUSH_TRACE(ret, event);
+    }
+
+    switch (PM_NODE_TYPE(node)) {
+      case PM_ALIAS_GLOBAL_VARIABLE_NODE:
+        // alias $foo $bar
+        // ^^^^^^^^^^^^^^^
+        pm_compile_alias_global_variable_node(iseq, (const pm_alias_global_variable_node_t *) node, &location, ret, popped, scope_node);
+        return;
+      case PM_ALIAS_METHOD_NODE:
+        // alias foo bar
+        // ^^^^^^^^^^^^^
+        pm_compile_alias_method_node(iseq, (const pm_alias_method_node_t *) node, &location, ret, popped, scope_node);
+        return;
+      case PM_AND_NODE:
+        // a and b
+        // ^^^^^^^
+        pm_compile_and_node(iseq, (const pm_and_node_t *) node, &location, ret, popped, scope_node);
+        return;
+      case PM_ARGUMENTS_NODE: {
+        // break foo
+        //       ^^^
+        //
+        // These are ArgumentsNodes that are not compiled directly by their
+        // parent call nodes, used in the cases of NextNodes, ReturnNodes, and
+        // BreakNodes. They can create an array like ArrayNode.
+        const pm_arguments_node_t *cast = (const pm_arguments_node_t *) node;
+        const pm_node_list_t *elements = &cast->arguments;
+
+        if (elements->size == 1) {
+            // If we are only returning a single element through one of the jump
+            // nodes, then we will only compile that node directly.
+            PM_COMPILE(elements->nodes[0]);
+        }
+        else {
+            pm_compile_array_node(iseq, (const pm_node_t *) cast, elements, &location, ret, popped, scope_node);
+        }
+        return;
+      }
+      case PM_ARRAY_NODE: {
+        // [foo, bar, baz]
+        // ^^^^^^^^^^^^^^^
+        const pm_array_node_t *cast = (const pm_array_node_t *) node;
+        pm_compile_array_node(iseq, (const pm_node_t *) cast, &cast->elements, &location, ret, popped, scope_node);
+        return;
+      }
+      case PM_ASSOC_NODE: {
+        // { foo: 1 }
+        //   ^^^^^^
+        //
+        // foo(bar: 1)
+        //     ^^^^^^
+        const pm_assoc_node_t *cast = (const pm_assoc_node_t *) node;
+
+        PM_COMPILE(cast->key);
+        PM_COMPILE(cast->value);
+
+        return;
+      }
+      case PM_ASSOC_SPLAT_NODE: {
+        // { **foo }
+        //   ^^^^^
+        //
+        // def foo(**); bar(**); end
+        //                  ^^
+        const pm_assoc_splat_node_t *cast = (const pm_assoc_splat_node_t *) node;
+
+        if (cast->value != NULL) {
+            PM_COMPILE(cast->value);
+        }
+        else if (!popped) {
+            pm_local_index_t index = pm_lookup_local_index(iseq, scope_node, PM_CONSTANT_POW, 0);
+            PUSH_GETLOCAL(ret, location, index.index, index.level);
+        }
+
+        return;
+      }
+      case PM_BACK_REFERENCE_READ_NODE: {
+        // $+
+        // ^^
+        if (!popped) {
+            const pm_back_reference_read_node_t *cast = (const pm_back_reference_read_node_t *) node;
+            VALUE backref = pm_compile_back_reference_ref(cast);
+
+            PUSH_INSN2(ret, location, getspecial, INT2FIX(1), backref);
+        }
+        return;
+      }
+      case PM_BEGIN_NODE: {
+        // begin end
+        // ^^^^^^^^^
+        const pm_begin_node_t *cast = (const pm_begin_node_t *) node;
+
+        if (cast->ensure_clause) {
+            // Compiling the ensure clause will compile the rescue clause (if
+            // there is one), which will compile the begin statements.
+            pm_compile_ensure(iseq, cast, &location, ret, popped, scope_node);
+        }
+        else if (cast->rescue_clause) {
+            // Compiling rescue will compile begin statements (if applicable).
+            pm_compile_rescue(iseq, cast, &location, ret, popped, scope_node);
+        }
+        else {
+            // If there is neither ensure or rescue, the just compile the
+            // statements.
+            if (cast->statements != NULL) {
+                PM_COMPILE((const pm_node_t *) cast->statements);
+            }
+            else if (!popped) {
+                PUSH_SYNTHETIC_PUTNIL(ret, iseq);
+            }
+        }
+        return;
+      }
+      case PM_BLOCK_ARGUMENT_NODE: {
+        // foo(&bar)
+        //     ^^^^
+        const pm_block_argument_node_t *cast = (const pm_block_argument_node_t *) node;
+
+        if (cast->expression != NULL) {
+            PM_COMPILE(cast->expression);
+        }
+        else {
+            // If there's no expression, this must be block forwarding.
+            pm_local_index_t local_index = pm_lookup_local_index(iseq, scope_node, PM_CONSTANT_AND, 0);
+            PUSH_INSN2(ret, location, getblockparamproxy, INT2FIX(local_index.index + VM_ENV_DATA_SIZE - 1), INT2FIX(local_index.level));
+        }
+        return;
+      }
+      case PM_BREAK_NODE:
+        // break
+        // ^^^^^
+        //
+        // break foo
+        // ^^^^^^^^^
+        pm_compile_break_node(iseq, (const pm_break_node_t *) node, &location, ret, popped, scope_node);
+        return;
+      case PM_CALL_NODE:
+        // foo
+        // ^^^
+        //
+        // foo.bar
+        // ^^^^^^^
+        //
+        // foo.bar() {}
+        // ^^^^^^^^^^^^
+        pm_compile_call_node(iseq, (const pm_call_node_t *) node, ret, popped, scope_node);
+        return;
+      case PM_CALL_AND_WRITE_NODE: {
+        // foo.bar &&= baz
+        // ^^^^^^^^^^^^^^^
+        const pm_call_and_write_node_t *cast = (const pm_call_and_write_node_t *) node;
+        pm_compile_call_and_or_write_node(iseq, true, cast->receiver, cast->value, cast->write_name, cast->read_name, PM_NODE_FLAG_P(cast, PM_CALL_NODE_FLAGS_SAFE_NAVIGATION), &location, ret, popped, scope_node);
+        return;
+      }
+      case PM_CALL_OR_WRITE_NODE: {
+        // foo.bar ||= baz
+        // ^^^^^^^^^^^^^^^
+        const pm_call_or_write_node_t *cast = (const pm_call_or_write_node_t *) node;
+        pm_compile_call_and_or_write_node(iseq, false, cast->receiver, cast->value, cast->write_name, cast->read_name, PM_NODE_FLAG_P(cast, PM_CALL_NODE_FLAGS_SAFE_NAVIGATION), &location, ret, popped, scope_node);
+        return;
+      }
+      case PM_CALL_OPERATOR_WRITE_NODE:
+        // foo.bar += baz
+        // ^^^^^^^^^^^^^^^
+        //
+        // Call operator writes occur when you have a call node on the left-hand
+        // side of a write operator that is not `=`. As an example,
+        // `foo.bar *= 1`. This breaks down to caching the receiver on the
+        // stack and then performing three method calls, one to read the value,
+        // one to compute the result, and one to write the result back to the
+        // receiver.
+        pm_compile_call_operator_write_node(iseq, (const pm_call_operator_write_node_t *) node, &location, ret, popped, scope_node);
+        return;
+      case PM_CASE_NODE:
+        // case foo; when bar; end
+        // ^^^^^^^^^^^^^^^^^^^^^^^
+        pm_compile_case_node(iseq, (const pm_case_node_t *) node, &location, ret, popped, scope_node);
+        return;
+      case PM_CASE_MATCH_NODE:
+        // case foo; in bar; end
+        // ^^^^^^^^^^^^^^^^^^^^^
+        //
+        // If you use the `case` keyword to create a case match node, it will
+        // match against all of the `in` clauses until it finds one that
+        // matches. If it doesn't find one, it can optionally fall back to an
+        // `else` clause. If none is present and a match wasn't found, it will
+        // raise an appropriate error.
+        pm_compile_case_match_node(iseq, (const pm_case_match_node_t *) node, &location, ret, popped, scope_node);
+        return;
+      case PM_CLASS_NODE: {
+        // class Foo; end
+        // ^^^^^^^^^^^^^^
+        const pm_class_node_t *cast = (const pm_class_node_t *) node;
+
+        ID class_id = pm_constant_id_lookup(scope_node, cast->name);
+        VALUE class_name = rb_str_freeze(rb_sprintf("<class:%"PRIsVALUE">", rb_id2str(class_id)));
+
+        pm_scope_node_t next_scope_node;
+        pm_scope_node_init((const pm_node_t *) cast, &next_scope_node, scope_node);
+
+        const rb_iseq_t *class_iseq = NEW_CHILD_ISEQ(&next_scope_node, class_name, ISEQ_TYPE_CLASS, location.line);
+        pm_scope_node_destroy(&next_scope_node);
+
+        // TODO: Once we merge constant path nodes correctly, fix this flag
+        const int flags = VM_DEFINECLASS_TYPE_CLASS |
+            (cast->superclass ? VM_DEFINECLASS_FLAG_HAS_SUPERCLASS : 0) |
+            pm_compile_class_path(iseq, cast->constant_path, &location, ret, false, scope_node);
+
+        if (cast->superclass) {
+            PM_COMPILE_NOT_POPPED(cast->superclass);
+        }
+        else {
+            PUSH_INSN(ret, location, putnil);
+        }
+
+        {
+            VALUE operand = ID2SYM(class_id);
+            PUSH_INSN3(ret, location, defineclass, operand, class_iseq, INT2FIX(flags));
+        }
+        RB_OBJ_WRITTEN(iseq, Qundef, (VALUE)class_iseq);
+
+        if (popped) PUSH_INSN(ret, location, pop);
+        return;
+      }
+      case PM_CLASS_VARIABLE_AND_WRITE_NODE: {
+        // @@foo &&= bar
+        // ^^^^^^^^^^^^^
+        const pm_class_variable_and_write_node_t *cast = (const pm_class_variable_and_write_node_t *) node;
+        LABEL *end_label = NEW_LABEL(location.line);
+
+        ID name_id = pm_constant_id_lookup(scope_node, cast->name);
+        VALUE name = ID2SYM(name_id);
+
+        PUSH_INSN2(ret, location, getclassvariable, name, get_cvar_ic_value(iseq, name_id));
+        if (!popped) PUSH_INSN(ret, location, dup);
+
+        PUSH_INSNL(ret, location, branchunless, end_label);
+        if (!popped) PUSH_INSN(ret, location, pop);
+
+        PM_COMPILE_NOT_POPPED(cast->value);
+        if (!popped) PUSH_INSN(ret, location, dup);
+
+        PUSH_INSN2(ret, location, setclassvariable, name, get_cvar_ic_value(iseq, name_id));
+        PUSH_LABEL(ret, end_label);
+
+        return;
+      }
+      case PM_CLASS_VARIABLE_OPERATOR_WRITE_NODE: {
+        // @@foo += bar
+        // ^^^^^^^^^^^^
+        const pm_class_variable_operator_write_node_t *cast = (const pm_class_variable_operator_write_node_t *) node;
+
+        ID name_id = pm_constant_id_lookup(scope_node, cast->name);
+        VALUE name = ID2SYM(name_id);
+
+        PUSH_INSN2(ret, location, getclassvariable, name, get_cvar_ic_value(iseq, name_id));
+        PM_COMPILE_NOT_POPPED(cast->value);
+
+        ID method_id = pm_constant_id_lookup(scope_node, cast->binary_operator);
+        int flags = VM_CALL_ARGS_SIMPLE;
+        PUSH_SEND_WITH_FLAG(ret, location, method_id, INT2NUM(1), INT2FIX(flags));
+
+        if (!popped) PUSH_INSN(ret, location, dup);
+        PUSH_INSN2(ret, location, setclassvariable, name, get_cvar_ic_value(iseq, name_id));
+
+        return;
+      }
+      case PM_CLASS_VARIABLE_OR_WRITE_NODE: {
+        // @@foo ||= bar
+        // ^^^^^^^^^^^^^
+        const pm_class_variable_or_write_node_t *cast = (const pm_class_variable_or_write_node_t *) node;
+        LABEL *end_label = NEW_LABEL(location.line);
+        LABEL *start_label = NEW_LABEL(location.line);
+
+        ID name_id = pm_constant_id_lookup(scope_node, cast->name);
+        VALUE name = ID2SYM(name_id);
+
+        PUSH_INSN(ret, location, putnil);
+        PUSH_INSN3(ret, location, defined, INT2FIX(DEFINED_CVAR), name, Qtrue);
+        PUSH_INSNL(ret, location, branchunless, start_label);
+
+        PUSH_INSN2(ret, location, getclassvariable, name, get_cvar_ic_value(iseq, name_id));
+        if (!popped) PUSH_INSN(ret, location, dup);
+
+        PUSH_INSNL(ret, location, branchif, end_label);
+        if (!popped) PUSH_INSN(ret, location, pop);
+
+        PUSH_LABEL(ret, start_label);
+        PM_COMPILE_NOT_POPPED(cast->value);
+        if (!popped) PUSH_INSN(ret, location, dup);
+
+        PUSH_INSN2(ret, location, setclassvariable, name, get_cvar_ic_value(iseq, name_id));
+        PUSH_LABEL(ret, end_label);
+
+        return;
+      }
+      case PM_CLASS_VARIABLE_READ_NODE: {
+        // @@foo
+        // ^^^^^
+        if (!popped) {
+            const pm_class_variable_read_node_t *cast = (const pm_class_variable_read_node_t *) node;
+            ID name = pm_constant_id_lookup(scope_node, cast->name);
+            PUSH_INSN2(ret, location, getclassvariable, ID2SYM(name), get_cvar_ic_value(iseq, name));
+        }
+        return;
+      }
+      case PM_CLASS_VARIABLE_WRITE_NODE: {
+        // @@foo = 1
+        // ^^^^^^^^^
+        const pm_class_variable_write_node_t *cast = (const pm_class_variable_write_node_t *) node;
+        PM_COMPILE_NOT_POPPED(cast->value);
+        if (!popped) PUSH_INSN(ret, location, dup);
+
+        ID name = pm_constant_id_lookup(scope_node, cast->name);
+        PUSH_INSN2(ret, location, setclassvariable, ID2SYM(name), get_cvar_ic_value(iseq, name));
+
+        return;
+      }
+      case PM_CONSTANT_PATH_NODE: {
+        // Foo::Bar
+        // ^^^^^^^^
+        VALUE parts;
+
+        if (ISEQ_COMPILE_DATA(iseq)->option->inline_const_cache && ((parts = pm_constant_path_parts(node, scope_node)) != Qnil)) {
+            ISEQ_BODY(iseq)->ic_size++;
+            PUSH_INSN1(ret, location, opt_getconstant_path, parts);
+        }
+        else {
+            DECL_ANCHOR(prefix);
+            DECL_ANCHOR(body);
+
+            pm_compile_constant_path(iseq, node, prefix, body, popped, scope_node);
+            if (LIST_INSN_SIZE_ZERO(prefix)) {
+                PUSH_INSN(ret, location, putnil);
+            }
+            else {
+                PUSH_SEQ(ret, prefix);
+            }
+
+            PUSH_SEQ(ret, body);
+        }
+
+        if (popped) PUSH_INSN(ret, location, pop);
+        return;
+      }
+      case PM_CONSTANT_PATH_AND_WRITE_NODE: {
+        // Foo::Bar &&= baz
+        // ^^^^^^^^^^^^^^^^
+        const pm_constant_path_and_write_node_t *cast = (const pm_constant_path_and_write_node_t *) node;
+        pm_compile_constant_path_and_write_node(iseq, cast, 0, &location, ret, popped, scope_node);
+        return;
+      }
+      case PM_CONSTANT_PATH_OR_WRITE_NODE: {
+        // Foo::Bar ||= baz
+        // ^^^^^^^^^^^^^^^^
+        const pm_constant_path_or_write_node_t *cast = (const pm_constant_path_or_write_node_t *) node;
+        pm_compile_constant_path_or_write_node(iseq, cast, 0, &location, ret, popped, scope_node);
+        return;
+      }
+      case PM_CONSTANT_PATH_OPERATOR_WRITE_NODE: {
+        // Foo::Bar += baz
+        // ^^^^^^^^^^^^^^^
+        const pm_constant_path_operator_write_node_t *cast = (const pm_constant_path_operator_write_node_t *) node;
+        pm_compile_constant_path_operator_write_node(iseq, cast, 0, &location, ret, popped, scope_node);
+        return;
+      }
+      case PM_CONSTANT_PATH_WRITE_NODE: {
+        // Foo::Bar = 1
+        // ^^^^^^^^^^^^
+        const pm_constant_path_write_node_t *cast = (const pm_constant_path_write_node_t *) node;
+        pm_compile_constant_path_write_node(iseq, cast, 0, &location, ret, popped, scope_node);
+        return;
+      }
+      case PM_CONSTANT_READ_NODE: {
+        // Foo
+        // ^^^
+        const pm_constant_read_node_t *cast = (const pm_constant_read_node_t *) node;
+        VALUE name = ID2SYM(pm_constant_id_lookup(scope_node, cast->name));
+
+        pm_compile_constant_read(iseq, name, &cast->base.location, location.node_id, ret, scope_node);
+        if (popped) PUSH_INSN(ret, location, pop);
+
+        return;
+      }
+      case PM_CONSTANT_AND_WRITE_NODE: {
+        // Foo &&= bar
+        // ^^^^^^^^^^^
+        const pm_constant_and_write_node_t *cast = (const pm_constant_and_write_node_t *) node;
+        pm_compile_constant_and_write_node(iseq, cast, 0, &location, ret, popped, scope_node);
+        return;
+      }
+      case PM_CONSTANT_OR_WRITE_NODE: {
+        // Foo ||= bar
+        // ^^^^^^^^^^^
+        const pm_constant_or_write_node_t *cast = (const pm_constant_or_write_node_t *) node;
+        pm_compile_constant_or_write_node(iseq, cast, 0, &location, ret, popped, scope_node);
+        return;
+      }
+      case PM_CONSTANT_OPERATOR_WRITE_NODE: {
+        // Foo += bar
+        // ^^^^^^^^^^
+        const pm_constant_operator_write_node_t *cast = (const pm_constant_operator_write_node_t *) node;
+        pm_compile_constant_operator_write_node(iseq, cast, 0, &location, ret, popped, scope_node);
+        return;
+      }
+      case PM_CONSTANT_WRITE_NODE: {
+        // Foo = 1
+        // ^^^^^^^
+        const pm_constant_write_node_t *cast = (const pm_constant_write_node_t *) node;
+        pm_compile_constant_write_node(iseq, cast, 0, &location, ret, popped, scope_node);
+        return;
+      }
+      case PM_DEF_NODE: {
+        // def foo; end
+        // ^^^^^^^^^^^^
+        //
+        // def self.foo; end
+        // ^^^^^^^^^^^^^^^^^
+        const pm_def_node_t *cast = (const pm_def_node_t *) node;
+        ID method_name = pm_constant_id_lookup(scope_node, cast->name);
+
+        pm_scope_node_t next_scope_node;
+        pm_scope_node_init((const pm_node_t *) cast, &next_scope_node, scope_node);
+
+        rb_iseq_t *method_iseq = NEW_ISEQ(&next_scope_node, rb_id2str(method_name), ISEQ_TYPE_METHOD, location.line);
+        pm_scope_node_destroy(&next_scope_node);
+
+        if (cast->receiver) {
+            PM_COMPILE_NOT_POPPED(cast->receiver);
+            PUSH_INSN2(ret, location, definesmethod, ID2SYM(method_name), method_iseq);
+        }
+        else {
+            PUSH_INSN2(ret, location, definemethod, ID2SYM(method_name), method_iseq);
+        }
+        RB_OBJ_WRITTEN(iseq, Qundef, (VALUE) method_iseq);
+
+        if (!popped) {
+            PUSH_INSN1(ret, location, putobject, ID2SYM(method_name));
+        }
+
+        return;
+      }
+      case PM_DEFINED_NODE: {
+        // defined?(a)
+        // ^^^^^^^^^^^
+        const pm_defined_node_t *cast = (const pm_defined_node_t *) node;
+        pm_compile_defined_expr(iseq, cast->value, &location, ret, popped, scope_node, false);
+        return;
+      }
+      case PM_EMBEDDED_STATEMENTS_NODE: {
+        // "foo #{bar}"
+        //      ^^^^^^
+        const pm_embedded_statements_node_t *cast = (const pm_embedded_statements_node_t *) node;
+
+        if (cast->statements != NULL) {
+            PM_COMPILE((const pm_node_t *) (cast->statements));
+        }
+        else {
+            PUSH_SYNTHETIC_PUTNIL(ret, iseq);
+        }
+
+        if (popped) PUSH_INSN(ret, location, pop);
+        return;
+      }
+      case PM_EMBEDDED_VARIABLE_NODE: {
+        // "foo #@bar"
+        //      ^^^^^
+        const pm_embedded_variable_node_t *cast = (const pm_embedded_variable_node_t *) node;
+        PM_COMPILE(cast->variable);
+        return;
+      }
+      case PM_FALSE_NODE: {
+        // false
+        // ^^^^^
+        if (!popped) {
+            PUSH_INSN1(ret, location, putobject, Qfalse);
+        }
+        return;
+      }
+      case PM_ENSURE_NODE: {
+        const pm_ensure_node_t *cast = (const pm_ensure_node_t *) node;
+
+        if (cast->statements != NULL) {
+            PM_COMPILE((const pm_node_t *) cast->statements);
+        }
+
+        return;
+      }
+      case PM_ELSE_NODE: {
+        // if foo then bar else baz end
+        //                 ^^^^^^^^^^^^
+        const pm_else_node_t *cast = (const pm_else_node_t *) node;
+
+        if (cast->statements != NULL) {
+            PM_COMPILE((const pm_node_t *) cast->statements);
+        }
+        else if (!popped) {
+            PUSH_SYNTHETIC_PUTNIL(ret, iseq);
+        }
+
+        return;
+      }
+      case PM_FLIP_FLOP_NODE: {
+        // if foo .. bar; end
+        //    ^^^^^^^^^^
+        const pm_flip_flop_node_t *cast = (const pm_flip_flop_node_t *) node;
+
+        LABEL *final_label = NEW_LABEL(location.line);
+        LABEL *then_label = NEW_LABEL(location.line);
+        LABEL *else_label = NEW_LABEL(location.line);
+
+        pm_compile_flip_flop(cast, else_label, then_label, iseq, location.line, ret, popped, scope_node);
+
+        PUSH_LABEL(ret, then_label);
+        PUSH_INSN1(ret, location, putobject, Qtrue);
+        PUSH_INSNL(ret, location, jump, final_label);
+        PUSH_LABEL(ret, else_label);
+        PUSH_INSN1(ret, location, putobject, Qfalse);
+        PUSH_LABEL(ret, final_label);
+
+        return;
+      }
+      case PM_FLOAT_NODE: {
+        // 1.0
+        // ^^^
+        if (!popped) {
+            VALUE operand = parse_float((const pm_float_node_t *) node);
+            PUSH_INSN1(ret, location, putobject, operand);
+        }
+        return;
+      }
+      case PM_FOR_NODE: {
+        // for foo in bar do end
+        // ^^^^^^^^^^^^^^^^^^^^^
+        const pm_for_node_t *cast = (const pm_for_node_t *) node;
+
+        LABEL *retry_label = NEW_LABEL(location.line);
+        LABEL *retry_end_l = NEW_LABEL(location.line);
+
+        // First, compile the collection that we're going to be iterating over.
+        PUSH_LABEL(ret, retry_label);
+        PM_COMPILE_NOT_POPPED(cast->collection);
+
+        // Next, create the new scope that is going to contain the block that
+        // will be passed to the each method.
+        pm_scope_node_t next_scope_node;
+        pm_scope_node_init((const pm_node_t *) cast, &next_scope_node, scope_node);
+
+        const rb_iseq_t *child_iseq = NEW_CHILD_ISEQ(&next_scope_node, make_name_for_block(iseq), ISEQ_TYPE_BLOCK, location.line);
+        pm_scope_node_destroy(&next_scope_node);
+
+        const rb_iseq_t *prev_block = ISEQ_COMPILE_DATA(iseq)->current_block;
+        ISEQ_COMPILE_DATA(iseq)->current_block = child_iseq;
+
+        // Now, create the method call to each that will be used to iterate over
+        // the collection, and pass the newly created iseq as the block.
+        PUSH_SEND_WITH_BLOCK(ret, location, idEach, INT2FIX(0), child_iseq);
+        pm_compile_retry_end_label(iseq, ret, retry_end_l);
+
+        if (popped) PUSH_INSN(ret, location, pop);
+        ISEQ_COMPILE_DATA(iseq)->current_block = prev_block;
+        PUSH_CATCH_ENTRY(CATCH_TYPE_BREAK, retry_label, retry_end_l, child_iseq, retry_end_l);
+        return;
+      }
+      case PM_FORWARDING_ARGUMENTS_NODE:
+        rb_bug("Cannot compile a ForwardingArgumentsNode directly\n");
+        return;
+      case PM_FORWARDING_SUPER_NODE:
+        // super
+        // ^^^^^
+        //
+        // super {}
+        // ^^^^^^^^
+        pm_compile_forwarding_super_node(iseq, (const pm_forwarding_super_node_t *) node, &location, ret, popped, scope_node);
+        return;
+      case PM_GLOBAL_VARIABLE_AND_WRITE_NODE: {
+        // $foo &&= bar
+        // ^^^^^^^^^^^^
+        const pm_global_variable_and_write_node_t *cast = (const pm_global_variable_and_write_node_t *) node;
+        LABEL *end_label = NEW_LABEL(location.line);
+
+        VALUE name = ID2SYM(pm_constant_id_lookup(scope_node, cast->name));
+        PUSH_INSN1(ret, location, getglobal, name);
+        if (!popped) PUSH_INSN(ret, location, dup);
+
+        PUSH_INSNL(ret, location, branchunless, end_label);
+        if (!popped) PUSH_INSN(ret, location, pop);
+
+        PM_COMPILE_NOT_POPPED(cast->value);
+        if (!popped) PUSH_INSN(ret, location, dup);
+
+        PUSH_INSN1(ret, location, setglobal, name);
+        PUSH_LABEL(ret, end_label);
+
+        return;
+      }
+      case PM_GLOBAL_VARIABLE_OPERATOR_WRITE_NODE: {
+        // $foo += bar
+        // ^^^^^^^^^^^
+        const pm_global_variable_operator_write_node_t *cast = (const pm_global_variable_operator_write_node_t *) node;
+
+        VALUE name = ID2SYM(pm_constant_id_lookup(scope_node, cast->name));
+        PUSH_INSN1(ret, location, getglobal, name);
+        PM_COMPILE_NOT_POPPED(cast->value);
+
+        ID method_id = pm_constant_id_lookup(scope_node, cast->binary_operator);
+        int flags = VM_CALL_ARGS_SIMPLE;
+        PUSH_SEND_WITH_FLAG(ret, location, method_id, INT2NUM(1), INT2FIX(flags));
+
+        if (!popped) PUSH_INSN(ret, location, dup);
+        PUSH_INSN1(ret, location, setglobal, name);
+
+        return;
+      }
+      case PM_GLOBAL_VARIABLE_OR_WRITE_NODE: {
+        // $foo ||= bar
+        // ^^^^^^^^^^^^
+        const pm_global_variable_or_write_node_t *cast = (const pm_global_variable_or_write_node_t *) node;
+        LABEL *set_label = NEW_LABEL(location.line);
+        LABEL *end_label = NEW_LABEL(location.line);
+
+        PUSH_INSN(ret, location, putnil);
+        VALUE name = ID2SYM(pm_constant_id_lookup(scope_node, cast->name));
+
+        PUSH_INSN3(ret, location, defined, INT2FIX(DEFINED_GVAR), name, Qtrue);
+        PUSH_INSNL(ret, location, branchunless, set_label);
+
+        PUSH_INSN1(ret, location, getglobal, name);
+        if (!popped) PUSH_INSN(ret, location, dup);
+
+        PUSH_INSNL(ret, location, branchif, end_label);
+        if (!popped) PUSH_INSN(ret, location, pop);
+
+        PUSH_LABEL(ret, set_label);
+        PM_COMPILE_NOT_POPPED(cast->value);
+        if (!popped) PUSH_INSN(ret, location, dup);
+
+        PUSH_INSN1(ret, location, setglobal, name);
+        PUSH_LABEL(ret, end_label);
+
+        return;
+      }
+      case PM_GLOBAL_VARIABLE_READ_NODE: {
+        // $foo
+        // ^^^^
+        const pm_global_variable_read_node_t *cast = (const pm_global_variable_read_node_t *) node;
+        VALUE name = ID2SYM(pm_constant_id_lookup(scope_node, cast->name));
+
+        PUSH_INSN1(ret, location, getglobal, name);
+        if (popped) PUSH_INSN(ret, location, pop);
+
+        return;
+      }
+      case PM_GLOBAL_VARIABLE_WRITE_NODE: {
+        // $foo = 1
+        // ^^^^^^^^
+        const pm_global_variable_write_node_t *cast = (const pm_global_variable_write_node_t *) node;
+        PM_COMPILE_NOT_POPPED(cast->value);
+        if (!popped) PUSH_INSN(ret, location, dup);
+
+        ID name = pm_constant_id_lookup(scope_node, cast->name);
+        PUSH_INSN1(ret, location, setglobal, ID2SYM(name));
+
+        return;
+      }
+      case PM_HASH_NODE: {
+        // {}
+        // ^^
+        //
+        // If every node in the hash is static, then we can compile the entire
+        // hash now instead of later.
+        if (PM_NODE_FLAG_P(node, PM_NODE_FLAG_STATIC_LITERAL)) {
+            // We're only going to compile this node if it's not popped. If it
+            // is popped, then we know we don't need to do anything since it's
+            // statically known.
+            if (!popped) {
+                const pm_hash_node_t *cast = (const pm_hash_node_t *) node;
+
+                if (cast->elements.size == 0) {
+                    PUSH_INSN1(ret, location, newhash, INT2FIX(0));
+                }
+                else {
+                    VALUE value = pm_static_literal_value(iseq, node, scope_node);
+                    PUSH_INSN1(ret, location, duphash, value);
+                    RB_OBJ_WRITTEN(iseq, Qundef, value);
+                }
+            }
+        }
+        else {
+            // Here since we know there are possible side-effects inside the
+            // hash contents, we're going to build it entirely at runtime. We'll
+            // do this by pushing all of the key-value pairs onto the stack and
+            // then combining them with newhash.
+            //
+            // If this hash is popped, then this serves only to ensure we enact
+            // all side-effects (like method calls) that are contained within
+            // the hash contents.
+            const pm_hash_node_t *cast = (const pm_hash_node_t *) node;
+            const pm_node_list_t *elements = &cast->elements;
+
+            if (popped) {
+                // If this hash is popped, then we can iterate through each
+                // element and compile it. The result of each compilation will
+                // only include the side effects of the element itself.
+                for (size_t index = 0; index < elements->size; index++) {
+                    PM_COMPILE_POPPED(elements->nodes[index]);
+                }
+            }
+            else {
+                pm_compile_hash_elements(iseq, node, elements, 0, Qundef, false, ret, scope_node);
+            }
+        }
+
+        return;
+      }
+      case PM_IF_NODE: {
+        // if foo then bar end
+        // ^^^^^^^^^^^^^^^^^^^
+        //
+        // bar if foo
+        // ^^^^^^^^^^
+        //
+        // foo ? bar : baz
+        // ^^^^^^^^^^^^^^^
+        const pm_if_node_t *cast = (const pm_if_node_t *) node;
+        pm_compile_conditional(iseq, &location, PM_IF_NODE, (const pm_node_t *) cast, cast->statements, cast->subsequent, cast->predicate, ret, popped, scope_node);
+        return;
+      }
+      case PM_IMAGINARY_NODE: {
+        // 1i
+        // ^^
+        if (!popped) {
+            VALUE operand = parse_imaginary((const pm_imaginary_node_t *) node);
+            PUSH_INSN1(ret, location, putobject, operand);
+        }
+        return;
+      }
+      case PM_IMPLICIT_NODE: {
+        // Implicit nodes mark places in the syntax tree where explicit syntax
+        // was omitted, but implied. For example,
+        //
+        //     { foo: }
+        //
+        // In this case a method call/local variable read is implied by virtue
+        // of the missing value. To compile these nodes, we simply compile the
+        // value that is implied, which is helpfully supplied by the parser.
+        const pm_implicit_node_t *cast = (const pm_implicit_node_t *) node;
+        PM_COMPILE(cast->value);
+        return;
+      }
+      case PM_IN_NODE: {
+        // In nodes are handled by the case match node directly, so we should
+        // never end up hitting them through this path.
+        rb_bug("Should not ever enter an in node directly");
+        return;
+      }
+      case PM_INDEX_OPERATOR_WRITE_NODE: {
+        // foo[bar] += baz
+        // ^^^^^^^^^^^^^^^
+        const pm_index_operator_write_node_t *cast = (const pm_index_operator_write_node_t *) node;
+        pm_compile_index_operator_write_node(iseq, cast, &location, ret, popped, scope_node);
+        return;
+      }
+      case PM_INDEX_AND_WRITE_NODE: {
+        // foo[bar] &&= baz
+        // ^^^^^^^^^^^^^^^^
+        const pm_index_and_write_node_t *cast = (const pm_index_and_write_node_t *) node;
+        pm_compile_index_control_flow_write_node(iseq, node, cast->receiver, cast->arguments, cast->block, cast->value, &location, ret, popped, scope_node);
+        return;
+      }
+      case PM_INDEX_OR_WRITE_NODE: {
+        // foo[bar] ||= baz
+        // ^^^^^^^^^^^^^^^^
+        const pm_index_or_write_node_t *cast = (const pm_index_or_write_node_t *) node;
+        pm_compile_index_control_flow_write_node(iseq, node, cast->receiver, cast->arguments, cast->block, cast->value, &location, ret, popped, scope_node);
+        return;
+      }
+      case PM_INSTANCE_VARIABLE_AND_WRITE_NODE: {
+        // @foo &&= bar
+        // ^^^^^^^^^^^^
+        const pm_instance_variable_and_write_node_t *cast = (const pm_instance_variable_and_write_node_t *) node;
+        LABEL *end_label = NEW_LABEL(location.line);
+
+        ID name_id = pm_constant_id_lookup(scope_node, cast->name);
+        VALUE name = ID2SYM(name_id);
+
+        PUSH_INSN2(ret, location, getinstancevariable, name, get_ivar_ic_value(iseq, name_id));
+        if (!popped) PUSH_INSN(ret, location, dup);
+
+        PUSH_INSNL(ret, location, branchunless, end_label);
+        if (!popped) PUSH_INSN(ret, location, pop);
+
+        PM_COMPILE_NOT_POPPED(cast->value);
+        if (!popped) PUSH_INSN(ret, location, dup);
+
+        PUSH_INSN2(ret, location, setinstancevariable, name, get_ivar_ic_value(iseq, name_id));
+        PUSH_LABEL(ret, end_label);
+
+        return;
+      }
+      case PM_INSTANCE_VARIABLE_OPERATOR_WRITE_NODE: {
+        // @foo += bar
+        // ^^^^^^^^^^^
+        const pm_instance_variable_operator_write_node_t *cast = (const pm_instance_variable_operator_write_node_t *) node;
+
+        ID name_id = pm_constant_id_lookup(scope_node, cast->name);
+        VALUE name = ID2SYM(name_id);
+
+        PUSH_INSN2(ret, location, getinstancevariable, name, get_ivar_ic_value(iseq, name_id));
+        PM_COMPILE_NOT_POPPED(cast->value);
+
+        ID method_id = pm_constant_id_lookup(scope_node, cast->binary_operator);
+        int flags = VM_CALL_ARGS_SIMPLE;
+        PUSH_SEND_WITH_FLAG(ret, location, method_id, INT2NUM(1), INT2FIX(flags));
+
+        if (!popped) PUSH_INSN(ret, location, dup);
+        PUSH_INSN2(ret, location, setinstancevariable, name, get_ivar_ic_value(iseq, name_id));
+
+        return;
+      }
+      case PM_INSTANCE_VARIABLE_OR_WRITE_NODE: {
+        // @foo ||= bar
+        // ^^^^^^^^^^^^
+        const pm_instance_variable_or_write_node_t *cast = (const pm_instance_variable_or_write_node_t *) node;
+        LABEL *end_label = NEW_LABEL(location.line);
+
+        ID name_id = pm_constant_id_lookup(scope_node, cast->name);
+        VALUE name = ID2SYM(name_id);
+
+        PUSH_INSN2(ret, location, getinstancevariable, name, get_ivar_ic_value(iseq, name_id));
+        if (!popped) PUSH_INSN(ret, location, dup);
+
+        PUSH_INSNL(ret, location, branchif, end_label);
+        if (!popped) PUSH_INSN(ret, location, pop);
+
+        PM_COMPILE_NOT_POPPED(cast->value);
+        if (!popped) PUSH_INSN(ret, location, dup);
+
+        PUSH_INSN2(ret, location, setinstancevariable, name, get_ivar_ic_value(iseq, name_id));
+        PUSH_LABEL(ret, end_label);
+
+        return;
+      }
+      case PM_INSTANCE_VARIABLE_READ_NODE: {
+        // @foo
+        // ^^^^
+        if (!popped) {
+            const pm_instance_variable_read_node_t *cast = (const pm_instance_variable_read_node_t *) node;
+            ID name = pm_constant_id_lookup(scope_node, cast->name);
+            PUSH_INSN2(ret, location, getinstancevariable, ID2SYM(name), get_ivar_ic_value(iseq, name));
+        }
+        return;
+      }
+      case PM_INSTANCE_VARIABLE_WRITE_NODE: {
+        // @foo = 1
+        // ^^^^^^^^
+        const pm_instance_variable_write_node_t *cast = (const pm_instance_variable_write_node_t *) node;
+        PM_COMPILE_NOT_POPPED(cast->value);
+        if (!popped) PUSH_INSN(ret, location, dup);
+
+        ID name = pm_constant_id_lookup(scope_node, cast->name);
+        PUSH_INSN2(ret, location, setinstancevariable, ID2SYM(name), get_ivar_ic_value(iseq, name));
+
+        return;
+      }
+      case PM_INTEGER_NODE: {
+        // 1
+        // ^
+        if (!popped) {
+            VALUE operand = parse_integer((const pm_integer_node_t *) node);
+            PUSH_INSN1(ret, location, putobject, operand);
+        }
+        return;
+      }
+      case PM_INTERPOLATED_MATCH_LAST_LINE_NODE: {
+        // if /foo #{bar}/ then end
+        //    ^^^^^^^^^^^^
+        if (PM_NODE_FLAG_P(node, PM_NODE_FLAG_STATIC_LITERAL)) {
+            if (!popped) {
+                VALUE regexp = pm_static_literal_value(iseq, node, scope_node);
+                PUSH_INSN1(ret, location, putobject, regexp);
+            }
+        }
+        else {
+            pm_compile_regexp_dynamic(iseq, node, &((const pm_interpolated_match_last_line_node_t *) node)->parts, &location, ret, popped, scope_node);
+        }
+
+        PUSH_INSN1(ret, location, getglobal, rb_id2sym(idLASTLINE));
+        PUSH_SEND(ret, location, idEqTilde, INT2NUM(1));
+        if (popped) PUSH_INSN(ret, location, pop);
+
+        return;
+      }
+      case PM_INTERPOLATED_REGULAR_EXPRESSION_NODE: {
+        // /foo #{bar}/
+        // ^^^^^^^^^^^^
+        if (PM_NODE_FLAG_P(node, PM_REGULAR_EXPRESSION_FLAGS_ONCE)) {
+            const rb_iseq_t *prevblock = ISEQ_COMPILE_DATA(iseq)->current_block;
+            const rb_iseq_t *block_iseq = NULL;
+            int ise_index = ISEQ_BODY(iseq)->ise_size++;
+
+            pm_scope_node_t next_scope_node;
+            pm_scope_node_init(node, &next_scope_node, scope_node);
+
+            block_iseq = NEW_CHILD_ISEQ(&next_scope_node, make_name_for_block(iseq), ISEQ_TYPE_PLAIN, location.line);
+            pm_scope_node_destroy(&next_scope_node);
+
+            ISEQ_COMPILE_DATA(iseq)->current_block = block_iseq;
+            PUSH_INSN2(ret, location, once, block_iseq, INT2FIX(ise_index));
+            ISEQ_COMPILE_DATA(iseq)->current_block = prevblock;
+
+            if (popped) PUSH_INSN(ret, location, pop);
+            return;
+        }
+
+        if (PM_NODE_FLAG_P(node, PM_NODE_FLAG_STATIC_LITERAL)) {
+            if (!popped) {
+                VALUE regexp = pm_static_literal_value(iseq, node, scope_node);
+                PUSH_INSN1(ret, location, putobject, regexp);
+            }
+        }
+        else {
+            pm_compile_regexp_dynamic(iseq, node, &((const pm_interpolated_regular_expression_node_t *) node)->parts, &location, ret, popped, scope_node);
+            if (popped) PUSH_INSN(ret, location, pop);
+        }
+
+        return;
+      }
+      case PM_INTERPOLATED_STRING_NODE: {
+        // "foo #{bar}"
+        // ^^^^^^^^^^^^
+        if (PM_NODE_FLAG_P(node, PM_NODE_FLAG_STATIC_LITERAL)) {
+            if (!popped) {
+                VALUE string = pm_static_literal_value(iseq, node, scope_node);
+
+                if (PM_NODE_FLAG_P(node, PM_INTERPOLATED_STRING_NODE_FLAGS_FROZEN)) {
+                    PUSH_INSN1(ret, location, putobject, string);
+                }
+                else if (PM_NODE_FLAG_P(node, PM_INTERPOLATED_STRING_NODE_FLAGS_MUTABLE)) {
+                    PUSH_INSN1(ret, location, putstring, string);
+                }
+                else {
+                    PUSH_INSN1(ret, location, putchilledstring, string);
+                }
+            }
+        }
+        else {
+            const pm_interpolated_string_node_t *cast = (const pm_interpolated_string_node_t *) node;
+            int length = pm_interpolated_node_compile(iseq, &cast->parts, &location, ret, popped, scope_node, NULL, NULL);
+            if (length > 1) PUSH_INSN1(ret, location, concatstrings, INT2FIX(length));
+            if (popped) PUSH_INSN(ret, location, pop);
+        }
+
+        return;
+      }
+      case PM_INTERPOLATED_SYMBOL_NODE: {
+        // :"foo #{bar}"
+        // ^^^^^^^^^^^^^
+        const pm_interpolated_symbol_node_t *cast = (const pm_interpolated_symbol_node_t *) node;
+        int length = pm_interpolated_node_compile(iseq, &cast->parts, &location, ret, popped, scope_node, NULL, NULL);
+
+        if (length > 1) {
+            PUSH_INSN1(ret, location, concatstrings, INT2FIX(length));
+        }
+
+        if (!popped) {
+            PUSH_INSN(ret, location, intern);
+        }
+        else {
+            PUSH_INSN(ret, location, pop);
+        }
+
+        return;
+      }
+      case PM_INTERPOLATED_X_STRING_NODE: {
+        // `foo #{bar}`
+        // ^^^^^^^^^^^^
+        const pm_interpolated_x_string_node_t *cast = (const pm_interpolated_x_string_node_t *) node;
+
+        PUSH_INSN(ret, location, putself);
+
+        int length = pm_interpolated_node_compile(iseq, &cast->parts, &location, ret, false, scope_node, NULL, NULL);
+        if (length > 1) PUSH_INSN1(ret, location, concatstrings, INT2FIX(length));
+
+        PUSH_SEND_WITH_FLAG(ret, location, idBackquote, INT2NUM(1), INT2FIX(VM_CALL_FCALL | VM_CALL_ARGS_SIMPLE));
+        if (popped) PUSH_INSN(ret, location, pop);
+
+        return;
+      }
+      case PM_IT_LOCAL_VARIABLE_READ_NODE: {
+        // -> { it }
+        //      ^^
+        if (!popped) {
+            pm_scope_node_t *current_scope_node = scope_node;
+            int level = 0;
+
+            while (current_scope_node) {
+                if (current_scope_node->parameters && PM_NODE_TYPE_P(current_scope_node->parameters, PM_IT_PARAMETERS_NODE)) {
+                    PUSH_GETLOCAL(ret, location, current_scope_node->local_table_for_iseq_size, level);
+                    return;
+                }
+
+                current_scope_node = current_scope_node->previous;
+                level++;
+            }
+            rb_bug("Local `it` does not exist");
+        }
+
+        return;
+      }
+      case PM_KEYWORD_HASH_NODE: {
+        // foo(bar: baz)
+        //     ^^^^^^^^
+        const pm_keyword_hash_node_t *cast = (const pm_keyword_hash_node_t *) node;
+        const pm_node_list_t *elements = &cast->elements;
+
+        const pm_node_t *element;
+        PM_NODE_LIST_FOREACH(elements, index, element) {
+            PM_COMPILE(element);
+        }
+
+        if (!popped) PUSH_INSN1(ret, location, newhash, INT2FIX(elements->size * 2));
+        return;
+      }
+      case PM_LAMBDA_NODE: {
+        // -> {}
+        // ^^^^^
+        const pm_lambda_node_t *cast = (const pm_lambda_node_t *) node;
+
+        pm_scope_node_t next_scope_node;
+        pm_scope_node_init(node, &next_scope_node, scope_node);
+
+        int opening_lineno = pm_location_line_number(parser, &cast->opening_loc);
+        const rb_iseq_t *block = NEW_CHILD_ISEQ(&next_scope_node, make_name_for_block(iseq), ISEQ_TYPE_BLOCK, opening_lineno);
+        pm_scope_node_destroy(&next_scope_node);
+
+        VALUE argc = INT2FIX(0);
+        PUSH_INSN1(ret, location, putspecialobject, INT2FIX(VM_SPECIAL_OBJECT_VMCORE));
+        PUSH_CALL_WITH_BLOCK(ret, location, idLambda, argc, block);
+        RB_OBJ_WRITTEN(iseq, Qundef, (VALUE) block);
+
+        if (popped) PUSH_INSN(ret, location, pop);
+        return;
+      }
+      case PM_LOCAL_VARIABLE_AND_WRITE_NODE: {
+        // foo &&= bar
+        // ^^^^^^^^^^^
+        const pm_local_variable_and_write_node_t *cast = (const pm_local_variable_and_write_node_t *) node;
+        LABEL *end_label = NEW_LABEL(location.line);
+
+        pm_local_index_t local_index = pm_lookup_local_index(iseq, scope_node, cast->name, cast->depth);
+        PUSH_GETLOCAL(ret, location, local_index.index, local_index.level);
+        if (!popped) PUSH_INSN(ret, location, dup);
+
+        PUSH_INSNL(ret, location, branchunless, end_label);
+        if (!popped) PUSH_INSN(ret, location, pop);
+
+        PM_COMPILE_NOT_POPPED(cast->value);
+        if (!popped) PUSH_INSN(ret, location, dup);
+
+        PUSH_SETLOCAL(ret, location, local_index.index, local_index.level);
+        PUSH_LABEL(ret, end_label);
+
+        return;
+      }
+      case PM_LOCAL_VARIABLE_OPERATOR_WRITE_NODE: {
+        // foo += bar
+        // ^^^^^^^^^^
+        const pm_local_variable_operator_write_node_t *cast = (const pm_local_variable_operator_write_node_t *) node;
+
+        pm_local_index_t local_index = pm_lookup_local_index(iseq, scope_node, cast->name, cast->depth);
+        PUSH_GETLOCAL(ret, location, local_index.index, local_index.level);
+
+        PM_COMPILE_NOT_POPPED(cast->value);
+
+        ID method_id = pm_constant_id_lookup(scope_node, cast->binary_operator);
+        PUSH_SEND_WITH_FLAG(ret, location, method_id, INT2NUM(1), INT2FIX(VM_CALL_ARGS_SIMPLE));
+
+        if (!popped) PUSH_INSN(ret, location, dup);
+        PUSH_SETLOCAL(ret, location, local_index.index, local_index.level);
+
+        return;
+      }
+      case PM_LOCAL_VARIABLE_OR_WRITE_NODE: {
+        // foo ||= bar
+        // ^^^^^^^^^^^
+        const pm_local_variable_or_write_node_t *cast = (const pm_local_variable_or_write_node_t *) node;
+
+        LABEL *set_label = NEW_LABEL(location.line);
+        LABEL *end_label = NEW_LABEL(location.line);
+
+        PUSH_INSN1(ret, location, putobject, Qtrue);
+        PUSH_INSNL(ret, location, branchunless, set_label);
+
+        pm_local_index_t local_index = pm_lookup_local_index(iseq, scope_node, cast->name, cast->depth);
+        PUSH_GETLOCAL(ret, location, local_index.index, local_index.level);
+        if (!popped) PUSH_INSN(ret, location, dup);
+
+        PUSH_INSNL(ret, location, branchif, end_label);
+        if (!popped) PUSH_INSN(ret, location, pop);
+
+        PUSH_LABEL(ret, set_label);
+        PM_COMPILE_NOT_POPPED(cast->value);
+        if (!popped) PUSH_INSN(ret, location, dup);
+
+        PUSH_SETLOCAL(ret, location, local_index.index, local_index.level);
+        PUSH_LABEL(ret, end_label);
+
+        return;
+      }
+      case PM_LOCAL_VARIABLE_READ_NODE: {
+        // foo
+        // ^^^
+        if (!popped) {
+            const pm_local_variable_read_node_t *cast = (const pm_local_variable_read_node_t *) node;
+            pm_local_index_t index = pm_lookup_local_index(iseq, scope_node, cast->name, cast->depth);
+            PUSH_GETLOCAL(ret, location, index.index, index.level);
+        }
+
+        return;
+      }
+      case PM_LOCAL_VARIABLE_WRITE_NODE: {
+        // foo = 1
+        // ^^^^^^^
+        const pm_local_variable_write_node_t *cast = (const pm_local_variable_write_node_t *) node;
+        PM_COMPILE_NOT_POPPED(cast->value);
+        if (!popped) PUSH_INSN(ret, location, dup);
+
+        pm_local_index_t index = pm_lookup_local_index(iseq, scope_node, cast->name, cast->depth);
+        PUSH_SETLOCAL(ret, location, index.index, index.level);
+        return;
+      }
+      case PM_MATCH_LAST_LINE_NODE: {
+        // if /foo/ then end
+        //    ^^^^^
+        VALUE regexp = pm_static_literal_value(iseq, node, scope_node);
+
+        PUSH_INSN1(ret, location, putobject, regexp);
+        PUSH_INSN2(ret, location, getspecial, INT2FIX(0), INT2FIX(0));
+        PUSH_SEND(ret, location, idEqTilde, INT2NUM(1));
+        if (popped) PUSH_INSN(ret, location, pop);
+
+        return;
+      }
+      case PM_MATCH_PREDICATE_NODE: {
+        // foo in bar
+        // ^^^^^^^^^^
+        const pm_match_predicate_node_t *cast = (const pm_match_predicate_node_t *) node;
+
+        // First, allocate some stack space for the cached return value of any
+        // calls to #deconstruct.
+        PUSH_INSN(ret, location, putnil);
+
+        // Next, compile the expression that we're going to match against.
+        PM_COMPILE_NOT_POPPED(cast->value);
+        PUSH_INSN(ret, location, dup);
+
+        // Now compile the pattern that is going to be used to match against the
+        // expression.
+        LABEL *matched_label = NEW_LABEL(location.line);
+        LABEL *unmatched_label = NEW_LABEL(location.line);
+        LABEL *done_label = NEW_LABEL(location.line);
+        pm_compile_pattern(iseq, scope_node, cast->pattern, ret, matched_label, unmatched_label, false, false, true, 2);
+
+        // If the pattern did not match, then compile the necessary instructions
+        // to handle pushing false onto the stack, then jump to the end.
+        PUSH_LABEL(ret, unmatched_label);
+        PUSH_INSN(ret, location, pop);
+        PUSH_INSN(ret, location, pop);
+
+        if (!popped) PUSH_INSN1(ret, location, putobject, Qfalse);
+        PUSH_INSNL(ret, location, jump, done_label);
+        PUSH_INSN(ret, location, putnil);
+
+        // If the pattern did match, then compile the necessary instructions to
+        // handle pushing true onto the stack, then jump to the end.
+        PUSH_LABEL(ret, matched_label);
+        PUSH_INSN1(ret, location, adjuststack, INT2FIX(2));
+        if (!popped) PUSH_INSN1(ret, location, putobject, Qtrue);
+        PUSH_INSNL(ret, location, jump, done_label);
+
+        PUSH_LABEL(ret, done_label);
+        return;
+      }
+      case PM_MATCH_REQUIRED_NODE:
+        // foo => bar
+        // ^^^^^^^^^^
+        //
+        // A match required node represents pattern matching against a single
+        // pattern using the => operator. For example,
+        //
+        //     foo => bar
+        //
+        // This is somewhat analogous to compiling a case match statement with a
+        // single pattern. In both cases, if the pattern fails it should
+        // immediately raise an error.
+        pm_compile_match_required_node(iseq, (const pm_match_required_node_t *) node, &location, ret, popped, scope_node);
+        return;
+      case PM_MATCH_WRITE_NODE:
+        // /(?<foo>foo)/ =~ bar
+        // ^^^^^^^^^^^^^^^^^^^^
+        //
+        // Match write nodes are specialized call nodes that have a regular
+        // expression with valid named capture groups on the left, the =~
+        // operator, and some value on the right. The nodes themselves simply
+        // wrap the call with the local variable targets that will be written
+        // when the call is executed.
+        pm_compile_match_write_node(iseq, (const pm_match_write_node_t *) node, &location, ret, popped, scope_node);
+        return;
+      case PM_MISSING_NODE:
+        rb_bug("A pm_missing_node_t should not exist in prism's AST.");
+        return;
+      case PM_MODULE_NODE: {
+        // module Foo; end
+        // ^^^^^^^^^^^^^^^
+        const pm_module_node_t *cast = (const pm_module_node_t *) node;
+
+        ID module_id = pm_constant_id_lookup(scope_node, cast->name);
+        VALUE module_name = rb_str_freeze(rb_sprintf("<module:%"PRIsVALUE">", rb_id2str(module_id)));
+
+        pm_scope_node_t next_scope_node;
+        pm_scope_node_init((const pm_node_t *) cast, &next_scope_node, scope_node);
+
+        const rb_iseq_t *module_iseq = NEW_CHILD_ISEQ(&next_scope_node, module_name, ISEQ_TYPE_CLASS, location.line);
+        pm_scope_node_destroy(&next_scope_node);
+
+        const int flags = VM_DEFINECLASS_TYPE_MODULE | pm_compile_class_path(iseq, cast->constant_path, &location, ret, false, scope_node);
+        PUSH_INSN(ret, location, putnil);
+        PUSH_INSN3(ret, location, defineclass, ID2SYM(module_id), module_iseq, INT2FIX(flags));
+        RB_OBJ_WRITTEN(iseq, Qundef, (VALUE) module_iseq);
+
+        if (popped) PUSH_INSN(ret, location, pop);
+        return;
+      }
+      case PM_REQUIRED_PARAMETER_NODE: {
+        // def foo(bar); end
+        //         ^^^
+        const pm_required_parameter_node_t *cast = (const pm_required_parameter_node_t *) node;
+        pm_local_index_t index = pm_lookup_local_index(iseq, scope_node, cast->name, 0);
+
+        PUSH_SETLOCAL(ret, location, index.index, index.level);
+        return;
+      }
+      case PM_MULTI_WRITE_NODE: {
+        // foo, bar = baz
+        // ^^^^^^^^^^^^^^
+        //
+        // A multi write node represents writing to multiple values using an =
+        // operator. Importantly these nodes are only parsed when the left-hand
+        // side of the operator has multiple targets. The right-hand side of the
+        // operator having multiple targets represents an implicit array
+        // instead.
+        const pm_multi_write_node_t *cast = (const pm_multi_write_node_t *) node;
+
+        DECL_ANCHOR(writes);
+        DECL_ANCHOR(cleanup);
+
+        pm_multi_target_state_t state = { 0 };
+        state.position = popped ? 0 : 1;
+        pm_compile_multi_target_node(iseq, node, ret, writes, cleanup, scope_node, &state);
+
+        PM_COMPILE_NOT_POPPED(cast->value);
+        if (!popped) PUSH_INSN(ret, location, dup);
+
+        PUSH_SEQ(ret, writes);
+        if (!popped && state.stack_size >= 1) {
+            // Make sure the value on the right-hand side of the = operator is
+            // being returned before we pop the parent expressions.
+            PUSH_INSN1(ret, location, setn, INT2FIX(state.stack_size));
+        }
+
+        // Now, we need to go back and modify the topn instructions in order to
+        // ensure they can correctly retrieve the parent expressions.
+        pm_multi_target_state_update(&state);
+
+        PUSH_SEQ(ret, cleanup);
+        return;
+      }
+      case PM_NEXT_NODE:
+        // next
+        // ^^^^
+        //
+        // next foo
+        // ^^^^^^^^
+        pm_compile_next_node(iseq, (const pm_next_node_t *) node, &location, ret, popped, scope_node);
+        return;
+      case PM_NIL_NODE: {
+        // nil
+        // ^^^
+        if (!popped) {
+            PUSH_INSN(ret, location, putnil);
+        }
+
+        return;
+      }
+      case PM_NO_KEYWORDS_PARAMETER_NODE: {
+        // def foo(**nil); end
+        //         ^^^^^
+        ISEQ_BODY(iseq)->param.flags.accepts_no_kwarg = TRUE;
+        return;
+      }
+      case PM_NUMBERED_REFERENCE_READ_NODE: {
+        // $1
+        // ^^
+        if (!popped) {
+            const pm_numbered_reference_read_node_t *cast = (const pm_numbered_reference_read_node_t *) node;
+
+            if (cast->number != 0) {
+                VALUE ref = pm_compile_numbered_reference_ref(cast);
+                PUSH_INSN2(ret, location, getspecial, INT2FIX(1), ref);
+            }
+            else {
+                PUSH_INSN(ret, location, putnil);
+            }
+        }
+
+        return;
+      }
+      case PM_OR_NODE: {
+        // a or b
+        // ^^^^^^
+        const pm_or_node_t *cast = (const pm_or_node_t *) node;
+
+        LABEL *end_label = NEW_LABEL(location.line);
+        PM_COMPILE_NOT_POPPED(cast->left);
+
+        if (!popped) PUSH_INSN(ret, location, dup);
+        PUSH_INSNL(ret, location, branchif, end_label);
+
+        if (!popped) PUSH_INSN(ret, location, pop);
+        PM_COMPILE(cast->right);
+        PUSH_LABEL(ret, end_label);
+
+        return;
+      }
+      case PM_OPTIONAL_PARAMETER_NODE: {
+        // def foo(bar = 1); end
+        //         ^^^^^^^
+        const pm_optional_parameter_node_t *cast = (const pm_optional_parameter_node_t *) node;
+        PM_COMPILE_NOT_POPPED(cast->value);
+
+        pm_local_index_t index = pm_lookup_local_index(iseq, scope_node, cast->name, 0);
+        PUSH_SETLOCAL(ret, location, index.index, index.level);
+
+        return;
+      }
+      case PM_PARENTHESES_NODE: {
+        // ()
+        // ^^
+        //
+        // (1)
+        // ^^^
+        const pm_parentheses_node_t *cast = (const pm_parentheses_node_t *) node;
+
+        if (cast->body != NULL) {
+            PM_COMPILE(cast->body);
+        }
+        else if (!popped) {
+            PUSH_INSN(ret, location, putnil);
+        }
+
+        return;
+      }
+      case PM_PRE_EXECUTION_NODE: {
+        // BEGIN {}
+        // ^^^^^^^^
+        const pm_pre_execution_node_t *cast = (const pm_pre_execution_node_t *) node;
+
+        LINK_ANCHOR *outer_pre = scope_node->pre_execution_anchor;
+        RUBY_ASSERT(outer_pre != NULL);
+
+        // BEGIN{} nodes can be nested, so here we're going to do the same thing
+        // that we did for the top-level compilation where we create two
+        // anchors and then join them in the correct order into the resulting
+        // anchor.
+        DECL_ANCHOR(inner_pre);
+        scope_node->pre_execution_anchor = inner_pre;
+
+        DECL_ANCHOR(inner_body);
+
+        if (cast->statements != NULL) {
+            const pm_node_list_t *body = &cast->statements->body;
+
+            for (size_t index = 0; index < body->size; index++) {
+                pm_compile_node(iseq, body->nodes[index], inner_body, true, scope_node);
+            }
+        }
+
+        if (!popped) {
+            PUSH_INSN(inner_body, location, putnil);
+        }
+
+        // Now that everything has been compiled, join both anchors together
+        // into the correct outer pre execution anchor, and reset the value so
+        // that subsequent BEGIN{} nodes can be compiled correctly.
+        PUSH_SEQ(outer_pre, inner_pre);
+        PUSH_SEQ(outer_pre, inner_body);
+        scope_node->pre_execution_anchor = outer_pre;
+
+        return;
+      }
+      case PM_POST_EXECUTION_NODE: {
+        // END {}
+        // ^^^^^^
+        const rb_iseq_t *child_iseq;
+        const rb_iseq_t *prevblock = ISEQ_COMPILE_DATA(iseq)->current_block;
+
+        pm_scope_node_t next_scope_node;
+        pm_scope_node_init(node, &next_scope_node, scope_node);
+        child_iseq = NEW_CHILD_ISEQ(&next_scope_node, make_name_for_block(iseq), ISEQ_TYPE_BLOCK, lineno);
+        pm_scope_node_destroy(&next_scope_node);
+
+        ISEQ_COMPILE_DATA(iseq)->current_block = child_iseq;
+
+        int is_index = ISEQ_BODY(iseq)->ise_size++;
+        PUSH_INSN2(ret, location, once, child_iseq, INT2FIX(is_index));
+        RB_OBJ_WRITTEN(iseq, Qundef, (VALUE) child_iseq);
+        if (popped) PUSH_INSN(ret, location, pop);
+
+        ISEQ_COMPILE_DATA(iseq)->current_block = prevblock;
+
+        return;
+      }
+      case PM_RANGE_NODE: {
+        // 0..5
+        // ^^^^
+        const pm_range_node_t *cast = (const pm_range_node_t *) node;
+        bool exclude_end = PM_NODE_FLAG_P(cast, PM_RANGE_FLAGS_EXCLUDE_END);
+
+        if (pm_optimizable_range_item_p(cast->left) && pm_optimizable_range_item_p(cast->right))  {
+            if (!popped) {
+                const pm_node_t *left = cast->left;
+                const pm_node_t *right = cast->right;
+
+                VALUE val = rb_range_new(
+                    (left && PM_NODE_TYPE_P(left, PM_INTEGER_NODE)) ? parse_integer((const pm_integer_node_t *) left) : Qnil,
+                    (right && PM_NODE_TYPE_P(right, PM_INTEGER_NODE)) ? parse_integer((const pm_integer_node_t *) right) : Qnil,
+                    exclude_end
+                );
+
+                PUSH_INSN1(ret, location, putobject, val);
+            }
+        }
+        else {
+            if (cast->left != NULL) {
+                PM_COMPILE(cast->left);
+            }
+            else if (!popped) {
+                PUSH_INSN(ret, location, putnil);
+            }
+
+            if (cast->right != NULL) {
+                PM_COMPILE(cast->right);
+            }
+            else if (!popped) {
+                PUSH_INSN(ret, location, putnil);
+            }
+
+            if (!popped) {
+                PUSH_INSN1(ret, location, newrange, INT2FIX(exclude_end ? 1 : 0));
+            }
+        }
+        return;
+      }
+      case PM_RATIONAL_NODE: {
+        // 1r
+        // ^^
+        if (!popped) {
+            PUSH_INSN1(ret, location, putobject, parse_rational((const pm_rational_node_t *) node));
+        }
+        return;
+      }
+      case PM_REDO_NODE:
+        // redo
+        // ^^^^
+        pm_compile_redo_node(iseq, &location, ret, popped, scope_node);
+        return;
+      case PM_REGULAR_EXPRESSION_NODE: {
+        // /foo/
+        // ^^^^^
+        if (!popped) {
+            VALUE regexp = pm_static_literal_value(iseq, node, scope_node);
+            PUSH_INSN1(ret, location, putobject, regexp);
+        }
+        return;
+      }
+      case PM_RESCUE_NODE:
+        // begin; rescue; end
+        //        ^^^^^^^
+        pm_compile_rescue_node(iseq, (const pm_rescue_node_t *) node, &location, ret, popped, scope_node);
+        return;
+      case PM_RESCUE_MODIFIER_NODE: {
+        // foo rescue bar
+        // ^^^^^^^^^^^^^^
+        const pm_rescue_modifier_node_t *cast = (const pm_rescue_modifier_node_t *) node;
+
+        pm_scope_node_t rescue_scope_node;
+        pm_scope_node_init((const pm_node_t *) cast, &rescue_scope_node, scope_node);
+
+        rb_iseq_t *rescue_iseq = NEW_CHILD_ISEQ(
+            &rescue_scope_node,
+            rb_str_concat(rb_str_new2("rescue in "), ISEQ_BODY(iseq)->location.label),
+            ISEQ_TYPE_RESCUE,
+            pm_node_line_number(parser, cast->rescue_expression)
+        );
+
+        pm_scope_node_destroy(&rescue_scope_node);
+
+        LABEL *lstart = NEW_LABEL(location.line);
+        LABEL *lend = NEW_LABEL(location.line);
+        LABEL *lcont = NEW_LABEL(location.line);
+
+        lstart->rescued = LABEL_RESCUE_BEG;
+        lend->rescued = LABEL_RESCUE_END;
+
+        PUSH_LABEL(ret, lstart);
+        PM_COMPILE_NOT_POPPED(cast->expression);
+        PUSH_LABEL(ret, lend);
+
+        PUSH_INSN(ret, location, nop);
+        PUSH_LABEL(ret, lcont);
+        if (popped) PUSH_INSN(ret, location, pop);
+
+        PUSH_CATCH_ENTRY(CATCH_TYPE_RESCUE, lstart, lend, rescue_iseq, lcont);
+        PUSH_CATCH_ENTRY(CATCH_TYPE_RETRY, lend, lcont, NULL, lstart);
+        return;
+      }
+      case PM_RETURN_NODE:
+        // return
+        // ^^^^^^
+        //
+        // return 1
+        // ^^^^^^^^
+        pm_compile_return_node(iseq, (const pm_return_node_t *) node, &location, ret, popped, scope_node);
+        return;
+      case PM_RETRY_NODE: {
+        // retry
+        // ^^^^^
+        if (ISEQ_BODY(iseq)->type == ISEQ_TYPE_RESCUE) {
+            PUSH_INSN(ret, location, putnil);
+            PUSH_INSN1(ret, location, throw, INT2FIX(TAG_RETRY));
+            if (popped) PUSH_INSN(ret, location, pop);
+        }
+        else {
+            COMPILE_ERROR(iseq, location.line, "Invalid retry");
+            return;
+        }
+        return;
+      }
+      case PM_SCOPE_NODE:
+        pm_compile_scope_node(iseq, (pm_scope_node_t *) node, &location, ret, popped);
+        return;
+      case PM_SELF_NODE: {
+        // self
+        // ^^^^
+        if (!popped) {
+            PUSH_INSN(ret, location, putself);
+        }
+        return;
+      }
+      case PM_SHAREABLE_CONSTANT_NODE: {
+        // A value that is being written to a constant that is being marked as
+        // shared depending on the current lexical context.
+        const pm_shareable_constant_node_t *cast = (const pm_shareable_constant_node_t *) node;
+        pm_node_flags_t shareability = (cast->base.flags & (PM_SHAREABLE_CONSTANT_NODE_FLAGS_LITERAL | PM_SHAREABLE_CONSTANT_NODE_FLAGS_EXPERIMENTAL_EVERYTHING | PM_SHAREABLE_CONSTANT_NODE_FLAGS_EXPERIMENTAL_COPY));
+
+        switch (PM_NODE_TYPE(cast->write)) {
+          case PM_CONSTANT_WRITE_NODE:
+            pm_compile_constant_write_node(iseq, (const pm_constant_write_node_t *) cast->write, shareability, &location, ret, popped, scope_node);
+            break;
+          case PM_CONSTANT_AND_WRITE_NODE:
+            pm_compile_constant_and_write_node(iseq, (const pm_constant_and_write_node_t *) cast->write, shareability, &location, ret, popped, scope_node);
+            break;
+          case PM_CONSTANT_OR_WRITE_NODE:
+            pm_compile_constant_or_write_node(iseq, (const pm_constant_or_write_node_t *) cast->write, shareability, &location, ret, popped, scope_node);
+            break;
+          case PM_CONSTANT_OPERATOR_WRITE_NODE:
+            pm_compile_constant_operator_write_node(iseq, (const pm_constant_operator_write_node_t *) cast->write, shareability, &location, ret, popped, scope_node);
+            break;
+          case PM_CONSTANT_PATH_WRITE_NODE:
+            pm_compile_constant_path_write_node(iseq, (const pm_constant_path_write_node_t *) cast->write, shareability, &location, ret, popped, scope_node);
+            break;
+          case PM_CONSTANT_PATH_AND_WRITE_NODE:
+            pm_compile_constant_path_and_write_node(iseq, (const pm_constant_path_and_write_node_t *) cast->write, shareability, &location, ret, popped, scope_node);
+            break;
+          case PM_CONSTANT_PATH_OR_WRITE_NODE:
+            pm_compile_constant_path_or_write_node(iseq, (const pm_constant_path_or_write_node_t *) cast->write, shareability, &location, ret, popped, scope_node);
+            break;
+          case PM_CONSTANT_PATH_OPERATOR_WRITE_NODE:
+            pm_compile_constant_path_operator_write_node(iseq, (const pm_constant_path_operator_write_node_t *) cast->write, shareability, &location, ret, popped, scope_node);
+            break;
+          default:
+            rb_bug("Unexpected node type for shareable constant write: %s", pm_node_type_to_str(PM_NODE_TYPE(cast->write)));
+            break;
+        }
+
+        return;
+      }
+      case PM_SINGLETON_CLASS_NODE: {
+        // class << self; end
+        // ^^^^^^^^^^^^^^^^^^
+        const pm_singleton_class_node_t *cast = (const pm_singleton_class_node_t *) node;
+
+        pm_scope_node_t next_scope_node;
+        pm_scope_node_init((const pm_node_t *) cast, &next_scope_node, scope_node);
+        const rb_iseq_t *child_iseq = NEW_ISEQ(&next_scope_node, rb_fstring_lit("singleton class"), ISEQ_TYPE_CLASS, location.line);
+        pm_scope_node_destroy(&next_scope_node);
+
+        PM_COMPILE_NOT_POPPED(cast->expression);
+        PUSH_INSN(ret, location, putnil);
+
+        ID singletonclass;
+        CONST_ID(singletonclass, "singletonclass");
+        PUSH_INSN3(ret, location, defineclass, ID2SYM(singletonclass), child_iseq, INT2FIX(VM_DEFINECLASS_TYPE_SINGLETON_CLASS));
+
+        if (popped) PUSH_INSN(ret, location, pop);
+        RB_OBJ_WRITTEN(iseq, Qundef, (VALUE) child_iseq);
+
+        return;
+      }
+      case PM_SOURCE_ENCODING_NODE: {
+        // __ENCODING__
+        // ^^^^^^^^^^^^
+        if (!popped) {
+            VALUE value = pm_static_literal_value(iseq, node, scope_node);
+            PUSH_INSN1(ret, location, putobject, value);
+        }
+        return;
+      }
+      case PM_SOURCE_FILE_NODE: {
+        // __FILE__
+        // ^^^^^^^^
+        if (!popped) {
+            const pm_source_file_node_t *cast = (const pm_source_file_node_t *) node;
+            VALUE string = pm_source_file_value(cast, scope_node);
+
+            if (PM_NODE_FLAG_P(cast, PM_STRING_FLAGS_FROZEN)) {
+                PUSH_INSN1(ret, location, putobject, string);
+            }
+            else if (PM_NODE_FLAG_P(cast, PM_STRING_FLAGS_MUTABLE)) {
+                PUSH_INSN1(ret, location, putstring, string);
+            }
+            else {
+                PUSH_INSN1(ret, location, putchilledstring, string);
+            }
+        }
+        return;
+      }
+      case PM_SOURCE_LINE_NODE: {
+        // __LINE__
+        // ^^^^^^^^
+        if (!popped) {
+            VALUE value = pm_static_literal_value(iseq, node, scope_node);
+            PUSH_INSN1(ret, location, putobject, value);
+        }
+        return;
+      }
+      case PM_SPLAT_NODE: {
+        // foo(*bar)
+        //     ^^^^
+        const pm_splat_node_t *cast = (const pm_splat_node_t *) node;
+        if (cast->expression) {
+            PM_COMPILE(cast->expression);
+        }
+
+        if (!popped) {
+            PUSH_INSN1(ret, location, splatarray, Qtrue);
+        }
+        return;
+      }
+      case PM_STATEMENTS_NODE: {
+        // A list of statements.
+        const pm_statements_node_t *cast = (const pm_statements_node_t *) node;
+        const pm_node_list_t *body = &cast->body;
+
+        if (body->size > 0) {
+            for (size_t index = 0; index < body->size - 1; index++) {
+                PM_COMPILE_POPPED(body->nodes[index]);
+            }
+            PM_COMPILE(body->nodes[body->size - 1]);
+        }
+        else {
+            PUSH_INSN(ret, location, putnil);
+        }
+        return;
+      }
+      case PM_STRING_NODE: {
+        // "foo"
+        // ^^^^^
+        if (!popped) {
+            const pm_string_node_t *cast = (const pm_string_node_t *) node;
+            VALUE value = parse_static_literal_string(iseq, scope_node, node, &cast->unescaped);
+
+            if (PM_NODE_FLAG_P(node, PM_STRING_FLAGS_FROZEN)) {
+                PUSH_INSN1(ret, location, putobject, value);
+            }
+            else if (PM_NODE_FLAG_P(node, PM_STRING_FLAGS_MUTABLE)) {
+                PUSH_INSN1(ret, location, putstring, value);
+            }
+            else {
+                PUSH_INSN1(ret, location, putchilledstring, value);
+            }
+        }
+        return;
+      }
+      case PM_SUPER_NODE:
+        // super()
+        // super(foo)
+        // super(...)
+        pm_compile_super_node(iseq, (const pm_super_node_t *) node, &location, ret, popped, scope_node);
+        return;
+      case PM_SYMBOL_NODE: {
+        // :foo
+        // ^^^^
+        if (!popped) {
+            VALUE value = pm_static_literal_value(iseq, node, scope_node);
+            PUSH_INSN1(ret, location, putobject, value);
+        }
+        return;
+      }
+      case PM_TRUE_NODE: {
+        // true
+        // ^^^^
+        if (!popped) {
+            PUSH_INSN1(ret, location, putobject, Qtrue);
+        }
+        return;
+      }
+      case PM_UNDEF_NODE: {
+        // undef foo
+        // ^^^^^^^^^
+        const pm_undef_node_t *cast = (const pm_undef_node_t *) node;
+        const pm_node_list_t *names = &cast->names;
+
+        for (size_t index = 0; index < names->size; index++) {
+            PUSH_INSN1(ret, location, putspecialobject, INT2FIX(VM_SPECIAL_OBJECT_VMCORE));
+            PUSH_INSN1(ret, location, putspecialobject, INT2FIX(VM_SPECIAL_OBJECT_CBASE));
+
+            PM_COMPILE_NOT_POPPED(names->nodes[index]);
+            PUSH_SEND(ret, location, id_core_undef_method, INT2NUM(2));
+
+            if (index < names->size - 1) {
+                PUSH_INSN(ret, location, pop);
+            }
+        }
+
+        if (popped) PUSH_INSN(ret, location, pop);
+        return;
+      }
+      case PM_UNLESS_NODE: {
+        // unless foo; bar end
+        // ^^^^^^^^^^^^^^^^^^^
+        //
+        // bar unless foo
+        // ^^^^^^^^^^^^^^
+        const pm_unless_node_t *cast = (const pm_unless_node_t *) node;
+        const pm_statements_node_t *statements = NULL;
+        if (cast->else_clause != NULL) {
+            statements = ((const pm_else_node_t *) cast->else_clause)->statements;
+        }
+
+        pm_compile_conditional(iseq, &location, PM_UNLESS_NODE, (const pm_node_t *) cast, statements, (const pm_node_t *) cast->statements, cast->predicate, ret, popped, scope_node);
+        return;
+      }
+      case PM_UNTIL_NODE: {
+        // until foo; bar end
+        // ^^^^^^^^^^^^^^^^^
+        //
+        // bar until foo
+        // ^^^^^^^^^^^^^
+        const pm_until_node_t *cast = (const pm_until_node_t *) node;
+        pm_compile_loop(iseq, &location, cast->base.flags, PM_UNTIL_NODE, (const pm_node_t *) cast, cast->statements, cast->predicate, ret, popped, scope_node);
+        return;
+      }
+      case PM_WHILE_NODE: {
+        // while foo; bar end
+        // ^^^^^^^^^^^^^^^^^^
+        //
+        // bar while foo
+        // ^^^^^^^^^^^^^
+        const pm_while_node_t *cast = (const pm_while_node_t *) node;
+        pm_compile_loop(iseq, &location, cast->base.flags, PM_WHILE_NODE, (const pm_node_t *) cast, cast->statements, cast->predicate, ret, popped, scope_node);
+        return;
+      }
+      case PM_X_STRING_NODE: {
+        // `foo`
+        // ^^^^^
+        const pm_x_string_node_t *cast = (const pm_x_string_node_t *) node;
+        VALUE value = parse_static_literal_string(iseq, scope_node, node, &cast->unescaped);
+
+        PUSH_INSN(ret, location, putself);
+        PUSH_INSN1(ret, location, putobject, value);
+        PUSH_SEND_WITH_FLAG(ret, location, idBackquote, INT2NUM(1), INT2FIX(VM_CALL_FCALL | VM_CALL_ARGS_SIMPLE));
+        if (popped) PUSH_INSN(ret, location, pop);
+
+        return;
+      }
+      case PM_YIELD_NODE:
+        // yield
+        // ^^^^^
+        //
+        // yield 1
+        // ^^^^^^^
+        pm_compile_yield_node(iseq, (const pm_yield_node_t *) node, &location, ret, popped, scope_node);
+        return;
+      default:
+        rb_raise(rb_eNotImpError, "node type %s not implemented", pm_node_type_to_str(PM_NODE_TYPE(node)));
+        return;
+    }
+}
+
+#undef PM_CONTAINER_P
+
+/** True if the given iseq can have pre execution blocks. */
+static inline bool
+pm_iseq_pre_execution_p(rb_iseq_t *iseq)
+{
+    switch (ISEQ_BODY(iseq)->type) {
+      case ISEQ_TYPE_TOP:
+      case ISEQ_TYPE_EVAL:
+      case ISEQ_TYPE_MAIN:
+        return true;
+      default:
+        return false;
+    }
+}
+
+/**
+ * This is the main entry-point into the prism compiler. It accepts the iseq
+ * that it should be compiling instruction into and a pointer to the scope node
+ * that it should be compiling. It returns the established instruction sequence.
+ * Note that this function could raise Ruby errors if it encounters compilation
+ * errors or if there is a bug in the compiler.
+ */
+VALUE
+pm_iseq_compile_node(rb_iseq_t *iseq, pm_scope_node_t *node)
+{
+    DECL_ANCHOR(ret);
+
+    if (pm_iseq_pre_execution_p(iseq)) {
+        // Because these ISEQs can have BEGIN{}, we're going to create two
+        // anchors to compile them, a "pre" and a "body". We'll mark the "pre"
+        // on the scope node so that when BEGIN{} is found, its contents will be
+        // added to the "pre" anchor.
+        DECL_ANCHOR(pre);
+        node->pre_execution_anchor = pre;
+
+        // Now we'll compile the body as normal. We won't compile directly into
+        // the "ret" anchor yet because we want to add the "pre" anchor to the
+        // beginning of the "ret" anchor first.
+        DECL_ANCHOR(body);
+        pm_compile_node(iseq, (const pm_node_t *) node, body, false, node);
+
+        // Now we'll join both anchors together so that the content is in the
+        // correct order.
+        PUSH_SEQ(ret, pre);
+        PUSH_SEQ(ret, body);
+    }
+    else {
+        // In other circumstances, we can just compile the node directly into
+        // the "ret" anchor.
+        pm_compile_node(iseq, (const pm_node_t *) node, ret, false, node);
+    }
+
+    CHECK(iseq_setup_insn(iseq, ret));
+    return iseq_setup(iseq, ret);
+}
+
+/**
+ * Free the internal memory associated with a pm_parse_result_t struct.
+ * Importantly this does not free the struct itself.
+ */
+void
+pm_parse_result_free(pm_parse_result_t *result)
+{
+    if (result->node.ast_node != NULL) {
+        pm_node_destroy(&result->parser, result->node.ast_node);
+    }
+
+    if (result->parsed) {
+        xfree(result->node.constants);
+        pm_scope_node_destroy(&result->node);
+    }
+
+    pm_parser_free(&result->parser);
+    pm_string_free(&result->input);
+    pm_options_free(&result->options);
+}
+
+/** An error that is going to be formatted into the output. */
+typedef struct {
+    /** A pointer to the diagnostic that was generated during parsing. */
+    pm_diagnostic_t *error;
+
+    /** The start line of the diagnostic message. */
+    int32_t line;
+
+    /** The column start of the diagnostic message. */
+    uint32_t column_start;
+
+    /** The column end of the diagnostic message. */
+    uint32_t column_end;
+} pm_parse_error_t;
+
+/** The format that will be used to format the errors into the output. */
+typedef struct {
+    /** The prefix that will be used for line numbers. */
+    const char *number_prefix;
+
+    /** The prefix that will be used for blank lines. */
+    const char *blank_prefix;
+
+    /** The divider that will be used between sections of source code. */
+    const char *divider;
+
+    /** The length of the blank prefix. */
+    size_t blank_prefix_length;
+
+    /** The length of the divider. */
+    size_t divider_length;
+} pm_parse_error_format_t;
+
+#define PM_COLOR_BOLD "\033[1m"
+#define PM_COLOR_GRAY "\033[2m"
+#define PM_COLOR_RED "\033[1;31m"
+#define PM_COLOR_RESET "\033[m"
+#define PM_ERROR_TRUNCATE 30
+
+static inline pm_parse_error_t *
+pm_parse_errors_format_sort(const pm_parser_t *parser, const pm_list_t *error_list, const pm_newline_list_t *newline_list) {
+    pm_parse_error_t *errors = xcalloc(error_list->size, sizeof(pm_parse_error_t));
+    if (errors == NULL) return NULL;
+
+    int32_t start_line = parser->start_line;
+    for (pm_diagnostic_t *error = (pm_diagnostic_t *) error_list->head; error != NULL; error = (pm_diagnostic_t *) error->node.next) {
+        pm_line_column_t start = pm_newline_list_line_column(newline_list, error->location.start, start_line);
+        pm_line_column_t end = pm_newline_list_line_column(newline_list, error->location.end, start_line);
+
+        // We're going to insert this error into the array in sorted order. We
+        // do this by finding the first error that has a line number greater
+        // than the current error and then inserting the current error before
+        // that one.
+        size_t index = 0;
+        while (
+            (index < error_list->size) &&
+            (errors[index].error != NULL) &&
+            (
+                (errors[index].line < start.line) ||
+                ((errors[index].line == start.line) && (errors[index].column_start < start.column))
+            )
+        ) index++;
+
+        // Now we're going to shift all of the errors after this one down one
+        // index to make room for the new error.
+        if (index + 1 < error_list->size) {
+            memmove(&errors[index + 1], &errors[index], sizeof(pm_parse_error_t) * (error_list->size - index - 1));
+        }
+
+        // Finally, we'll insert the error into the array.
+        uint32_t column_end;
+        if (start.line == end.line) {
+            column_end = end.column;
+        } else {
+            column_end = (uint32_t) (newline_list->offsets[start.line - start_line + 1] - newline_list->offsets[start.line - start_line] - 1);
+        }
+
+        // Ensure we have at least one column of error.
+        if (start.column == column_end) column_end++;
+
+        errors[index] = (pm_parse_error_t) {
+            .error = error,
+            .line = start.line,
+            .column_start = start.column,
+            .column_end = column_end
+        };
+    }
+
+    return errors;
+}
+
+/* Append a literal string to the buffer. */
+#define pm_buffer_append_literal(buffer, str) pm_buffer_append_string(buffer, str, rb_strlen_lit(str))
+
+static inline void
+pm_parse_errors_format_line(const pm_parser_t *parser, const pm_newline_list_t *newline_list, const char *number_prefix, int32_t line, uint32_t column_start, uint32_t column_end, pm_buffer_t *buffer) {
+    int32_t line_delta = line - parser->start_line;
+    assert(line_delta >= 0);
+
+    size_t index = (size_t) line_delta;
+    assert(index < newline_list->size);
+
+    const uint8_t *start = &parser->start[newline_list->offsets[index]];
+    const uint8_t *end;
+
+    if (index >= newline_list->size - 1) {
+        end = parser->end;
+    } else {
+        end = &parser->start[newline_list->offsets[index + 1]];
+    }
+
+    pm_buffer_append_format(buffer, number_prefix, line);
+
+    // Here we determine if we should truncate the end of the line.
+    bool truncate_end = false;
+    if ((column_end != 0) && ((end - (start + column_end)) >= PM_ERROR_TRUNCATE)) {
+        end = start + column_end + PM_ERROR_TRUNCATE;
+        truncate_end = true;
+    }
+
+    // Here we determine if we should truncate the start of the line.
+    if (column_start >= PM_ERROR_TRUNCATE) {
+        pm_buffer_append_string(buffer, "... ", 4);
+        start += column_start;
+    }
+
+    pm_buffer_append_string(buffer, (const char *) start, (size_t) (end - start));
+
+    if (truncate_end) {
+        pm_buffer_append_string(buffer, " ...\n", 5);
+    } else if (end == parser->end && end[-1] != '\n') {
+        pm_buffer_append_string(buffer, "\n", 1);
+    }
+}
+
+/**
+ * Format the errors on the parser into the given buffer.
+ */
+static void
+pm_parse_errors_format(const pm_parser_t *parser, const pm_list_t *error_list, pm_buffer_t *buffer, int highlight, bool inline_messages) {
+    assert(error_list->size != 0);
+
+    // First, we're going to sort all of the errors by line number using an
+    // insertion sort into a newly allocated array.
+    const int32_t start_line = parser->start_line;
+    const pm_newline_list_t *newline_list = &parser->newline_list;
+
+    pm_parse_error_t *errors = pm_parse_errors_format_sort(parser, error_list, newline_list);
+    if (errors == NULL) return;
+
+    // Now we're going to determine how we're going to format line numbers and
+    // blank lines based on the maximum number of digits in the line numbers
+    // that are going to be displaid.
+    pm_parse_error_format_t error_format;
+    int32_t first_line_number = errors[0].line;
+    int32_t last_line_number = errors[error_list->size - 1].line;
+
+    // If we have a maximum line number that is negative, then we're going to
+    // use the absolute value for comparison but multiple by 10 to additionally
+    // have a column for the negative sign.
+    if (first_line_number < 0) first_line_number = (-first_line_number) * 10;
+    if (last_line_number < 0) last_line_number = (-last_line_number) * 10;
+    int32_t max_line_number = first_line_number > last_line_number ? first_line_number : last_line_number;
+
+    if (max_line_number < 10) {
+        if (highlight > 0) {
+            error_format = (pm_parse_error_format_t) {
+                .number_prefix = PM_COLOR_GRAY "%1" PRIi32 " | " PM_COLOR_RESET,
+                .blank_prefix = PM_COLOR_GRAY "  | " PM_COLOR_RESET,
+                .divider = PM_COLOR_GRAY "  ~~~~~" PM_COLOR_RESET "\n"
+            };
+        } else {
+            error_format = (pm_parse_error_format_t) {
+                .number_prefix = "%1" PRIi32 " | ",
+                .blank_prefix = "  | ",
+                .divider = "  ~~~~~\n"
+            };
+        }
+    } else if (max_line_number < 100) {
+        if (highlight > 0) {
+            error_format = (pm_parse_error_format_t) {
+                .number_prefix = PM_COLOR_GRAY "%2" PRIi32 " | " PM_COLOR_RESET,
+                .blank_prefix = PM_COLOR_GRAY "   | " PM_COLOR_RESET,
+                .divider = PM_COLOR_GRAY "  ~~~~~~" PM_COLOR_RESET "\n"
+            };
+        } else {
+            error_format = (pm_parse_error_format_t) {
+                .number_prefix = "%2" PRIi32 " | ",
+                .blank_prefix = "   | ",
+                .divider = "  ~~~~~~\n"
+            };
+        }
+    } else if (max_line_number < 1000) {
+        if (highlight > 0) {
+            error_format = (pm_parse_error_format_t) {
+                .number_prefix = PM_COLOR_GRAY "%3" PRIi32 " | " PM_COLOR_RESET,
+                .blank_prefix = PM_COLOR_GRAY "    | " PM_COLOR_RESET,
+                .divider = PM_COLOR_GRAY "  ~~~~~~~" PM_COLOR_RESET "\n"
+            };
+        } else {
+            error_format = (pm_parse_error_format_t) {
+                .number_prefix = "%3" PRIi32 " | ",
+                .blank_prefix = "    | ",
+                .divider = "  ~~~~~~~\n"
+            };
+        }
+    } else if (max_line_number < 10000) {
+        if (highlight > 0) {
+            error_format = (pm_parse_error_format_t) {
+                .number_prefix = PM_COLOR_GRAY "%4" PRIi32 " | " PM_COLOR_RESET,
+                .blank_prefix = PM_COLOR_GRAY "     | " PM_COLOR_RESET,
+                .divider = PM_COLOR_GRAY "  ~~~~~~~~" PM_COLOR_RESET "\n"
+            };
+        } else {
+            error_format = (pm_parse_error_format_t) {
+                .number_prefix = "%4" PRIi32 " | ",
+                .blank_prefix = "     | ",
+                .divider = "  ~~~~~~~~\n"
+            };
+        }
+    } else {
+        if (highlight > 0) {
+            error_format = (pm_parse_error_format_t) {
+                .number_prefix = PM_COLOR_GRAY "%5" PRIi32 " | " PM_COLOR_RESET,
+                .blank_prefix = PM_COLOR_GRAY "      | " PM_COLOR_RESET,
+                .divider = PM_COLOR_GRAY "  ~~~~~~~~" PM_COLOR_RESET "\n"
+            };
+        } else {
+            error_format = (pm_parse_error_format_t) {
+                .number_prefix = "%5" PRIi32 " | ",
+                .blank_prefix = "      | ",
+                .divider = "  ~~~~~~~~\n"
+            };
+        }
+    }
+
+    error_format.blank_prefix_length = strlen(error_format.blank_prefix);
+    error_format.divider_length = strlen(error_format.divider);
+
+    // Now we're going to iterate through every error in our error list and
+    // display it. While we're iterating, we will display some padding lines of
+    // the source before the error to give some context. We'll be careful not to
+    // display the same line twice in case the errors are close enough in the
+    // source.
+    int32_t last_line = parser->start_line - 1;
+    uint32_t last_column_start = 0;
+    const pm_encoding_t *encoding = parser->encoding;
+
+    for (size_t index = 0; index < error_list->size; index++) {
+        pm_parse_error_t *error = &errors[index];
+
+        // Here we determine how many lines of padding of the source to display,
+        // based on the difference from the last line that was displaid.
+        if (error->line - last_line > 1) {
+            if (error->line - last_line > 2) {
+                if ((index != 0) && (error->line - last_line > 3)) {
+                    pm_buffer_append_string(buffer, error_format.divider, error_format.divider_length);
+                }
+
+                pm_buffer_append_string(buffer, "  ", 2);
+                pm_parse_errors_format_line(parser, newline_list, error_format.number_prefix, error->line - 2, 0, 0, buffer);
+            }
+
+            pm_buffer_append_string(buffer, "  ", 2);
+            pm_parse_errors_format_line(parser, newline_list, error_format.number_prefix, error->line - 1, 0, 0, buffer);
+        }
+
+        // If this is the first error or we're on a new line, then we'll display
+        // the line that has the error in it.
+        if ((index == 0) || (error->line != last_line)) {
+            if (highlight > 1) {
+                pm_buffer_append_literal(buffer, PM_COLOR_RED "> " PM_COLOR_RESET);
+            } else if (highlight > 0) {
+                pm_buffer_append_literal(buffer, PM_COLOR_BOLD "> " PM_COLOR_RESET);
+            } else {
+                pm_buffer_append_literal(buffer, "> ");
+            }
+
+            last_column_start = error->column_start;
+
+            // Find the maximum column end of all the errors on this line.
+            uint32_t column_end = error->column_end;
+            for (size_t next_index = index + 1; next_index < error_list->size; next_index++) {
+                if (errors[next_index].line != error->line) break;
+                if (errors[next_index].column_end > column_end) column_end = errors[next_index].column_end;
+            }
+
+            pm_parse_errors_format_line(parser, newline_list, error_format.number_prefix, error->line, error->column_start, column_end, buffer);
+        }
+
+        const uint8_t *start = &parser->start[newline_list->offsets[error->line - start_line]];
+        if (start == parser->end) pm_buffer_append_byte(buffer, '\n');
+
+        // Now we'll display the actual error message. We'll do this by first
+        // putting the prefix to the line, then a bunch of blank spaces
+        // depending on the column, then as many carets as we need to display
+        // the width of the error, then the error message itself.
+        //
+        // Note that this doesn't take into account the width of the actual
+        // character when displaid in the terminal. For some east-asian
+        // languages or emoji, this means it can be thrown off pretty badly. We
+        // will need to solve this eventually.
+        pm_buffer_append_string(buffer, "  ", 2);
+        pm_buffer_append_string(buffer, error_format.blank_prefix, error_format.blank_prefix_length);
+
+        size_t column = 0;
+        if (last_column_start >= PM_ERROR_TRUNCATE) {
+            pm_buffer_append_string(buffer, "    ", 4);
+            column = last_column_start;
+        }
+
+        while (column < error->column_start) {
+            pm_buffer_append_byte(buffer, ' ');
+
+            size_t char_width = encoding->char_width(start + column, parser->end - (start + column));
+            column += (char_width == 0 ? 1 : char_width);
+        }
+
+        if (highlight > 1) pm_buffer_append_literal(buffer, PM_COLOR_RED);
+        else if (highlight > 0) pm_buffer_append_literal(buffer, PM_COLOR_BOLD);
+        pm_buffer_append_byte(buffer, '^');
+
+        size_t char_width = encoding->char_width(start + column, parser->end - (start + column));
+        column += (char_width == 0 ? 1 : char_width);
+
+        while (column < error->column_end) {
+            pm_buffer_append_byte(buffer, '~');
+
+            size_t char_width = encoding->char_width(start + column, parser->end - (start + column));
+            column += (char_width == 0 ? 1 : char_width);
+        }
+
+        if (highlight > 0) pm_buffer_append_literal(buffer, PM_COLOR_RESET);
+
+        if (inline_messages) {
+            pm_buffer_append_byte(buffer, ' ');
+            assert(error->error != NULL);
+
+            const char *message = error->error->message;
+            pm_buffer_append_string(buffer, message, strlen(message));
+        }
+
+        pm_buffer_append_byte(buffer, '\n');
+
+        // Here we determine how many lines of padding to display after the
+        // error, depending on where the next error is in source.
+        last_line = error->line;
+        int32_t next_line;
+
+        if (index == error_list->size - 1) {
+            next_line = (((int32_t) newline_list->size) + parser->start_line);
+
+            // If the file ends with a newline, subtract one from our "next_line"
+            // so that we don't output an extra line at the end of the file
+            if ((parser->start + newline_list->offsets[newline_list->size - 1]) == parser->end) {
+                next_line--;
+            }
+        }
+        else {
+            next_line = errors[index + 1].line;
+        }
+
+        if (next_line - last_line > 1) {
+            pm_buffer_append_string(buffer, "  ", 2);
+            pm_parse_errors_format_line(parser, newline_list, error_format.number_prefix, ++last_line, 0, 0, buffer);
+        }
+
+        if (next_line - last_line > 1) {
+            pm_buffer_append_string(buffer, "  ", 2);
+            pm_parse_errors_format_line(parser, newline_list, error_format.number_prefix, ++last_line, 0, 0, buffer);
+        }
+    }
+
+    // Finally, we'll free the array of errors that we allocated.
+    xfree(errors);
+}
+
+#undef PM_ERROR_TRUNCATE
+#undef PM_COLOR_GRAY
+#undef PM_COLOR_RED
+#undef PM_COLOR_RESET
+
+/**
+ * Check if the given source slice is valid UTF-8. The location represents the
+ * location of the error, but the slice of the source will include the content
+ * of all of the lines that the error touches, so we need to check those parts
+ * as well.
+ */
+static bool
+pm_parse_process_error_utf8_p(const pm_parser_t *parser, const pm_location_t *location)
+{
+    const size_t start_line = pm_newline_list_line_column(&parser->newline_list, location->start, 1).line;
+    const size_t end_line = pm_newline_list_line_column(&parser->newline_list, location->end, 1).line;
+
+    const uint8_t *start = parser->start + parser->newline_list.offsets[start_line - 1];
+    const uint8_t *end = ((end_line == parser->newline_list.size) ? parser->end : (parser->start + parser->newline_list.offsets[end_line]));
+    size_t width;
+
+    while (start < end) {
+        if ((width = pm_encoding_utf_8_char_width(start, end - start)) == 0) return false;
+        start += width;
+    }
+
+    return true;
+}
+
+/**
+ * Generate an error object from the given parser that contains as much
+ * information as possible about the errors that were encountered.
+ */
+static VALUE
+pm_parse_process_error(const pm_parse_result_t *result)
+{
+    const pm_parser_t *parser = &result->parser;
+    const pm_diagnostic_t *head = (const pm_diagnostic_t *) parser->error_list.head;
+    bool valid_utf8 = true;
+
+    pm_buffer_t buffer = { 0 };
+    const pm_string_t *filepath = &parser->filepath;
+
+    int highlight = rb_stderr_tty_p();
+    if (highlight) {
+        const char *no_color = getenv("NO_COLOR");
+        highlight = (no_color == NULL || no_color[0] == '\0') ? 2 : 1;
+    }
+
+    for (const pm_diagnostic_t *error = head; error != NULL; error = (const pm_diagnostic_t *) error->node.next) {
+        switch (error->level) {
+          case PM_ERROR_LEVEL_SYNTAX:
+            // It is implicitly assumed that the error messages will be
+            // encodeable as UTF-8. Because of this, we can't include source
+            // examples that contain invalid byte sequences. So if any source
+            // examples include invalid UTF-8 byte sequences, we will skip
+            // showing source examples entirely.
+            if (valid_utf8 && !pm_parse_process_error_utf8_p(parser, &error->location)) {
+                valid_utf8 = false;
+            }
+            break;
+          case PM_ERROR_LEVEL_ARGUMENT: {
+            // Any errors with the level PM_ERROR_LEVEL_ARGUMENT take over as
+            // the only argument that gets raised. This is to allow priority
+            // messages that should be handled before anything else.
+            int32_t line_number = (int32_t) pm_location_line_number(parser, &error->location);
+
+            pm_buffer_append_format(
+                &buffer,
+                "%.*s:%" PRIi32 ": %s",
+                (int) pm_string_length(filepath),
+                pm_string_source(filepath),
+                line_number,
+                error->message
+            );
+
+            if (pm_parse_process_error_utf8_p(parser, &error->location)) {
+                pm_buffer_append_byte(&buffer, '\n');
+
+                pm_list_node_t *list_node = (pm_list_node_t *) error;
+                pm_list_t error_list = { .size = 1, .head = list_node, .tail = list_node };
+
+                pm_parse_errors_format(parser, &error_list, &buffer, highlight, false);
+            }
+
+            VALUE value = rb_exc_new(rb_eArgError, pm_buffer_value(&buffer), pm_buffer_length(&buffer));
+            pm_buffer_free(&buffer);
+
+            return value;
+          }
+          case PM_ERROR_LEVEL_LOAD: {
+            // Load errors are much simpler, because they don't include any of
+            // the source in them. We create the error directly from the
+            // message.
+            VALUE message = rb_enc_str_new_cstr(error->message, rb_locale_encoding());
+            VALUE value = rb_exc_new3(rb_eLoadError, message);
+            rb_ivar_set(value, rb_intern_const("@path"), Qnil);
+            return value;
+          }
+        }
+    }
+
+    pm_buffer_append_format(
+        &buffer,
+        "%.*s:%" PRIi32 ": syntax error%s found\n",
+        (int) pm_string_length(filepath),
+        pm_string_source(filepath),
+        (int32_t) pm_location_line_number(parser, &head->location),
+        (parser->error_list.size > 1) ? "s" : ""
+    );
+
+    if (valid_utf8) {
+        pm_parse_errors_format(parser, &parser->error_list, &buffer, highlight, true);
+    }
+    else {
+        for (const pm_diagnostic_t *error = head; error != NULL; error = (const pm_diagnostic_t *) error->node.next) {
+            if (error != head) pm_buffer_append_byte(&buffer, '\n');
+            pm_buffer_append_format(&buffer, "%.*s:%" PRIi32 ": %s", (int) pm_string_length(filepath), pm_string_source(filepath), (int32_t) pm_location_line_number(parser, &error->location), error->message);
+        }
+    }
+
+    VALUE message = rb_enc_str_new(pm_buffer_value(&buffer), pm_buffer_length(&buffer), result->node.encoding);
+    VALUE error = rb_exc_new_str(rb_eSyntaxError, message);
+
+    rb_encoding *filepath_encoding = result->node.filepath_encoding != NULL ? result->node.filepath_encoding : rb_utf8_encoding();
+    VALUE path = rb_enc_str_new((const char *) pm_string_source(filepath), pm_string_length(filepath), filepath_encoding);
+
+    rb_ivar_set(error, rb_intern_const("@path"), path);
+    pm_buffer_free(&buffer);
+
+    return error;
+}
+
+/**
+ * Parse the parse result and raise a Ruby error if there are any syntax errors.
+ * It returns an error if one should be raised. It is assumed that the parse
+ * result object is zeroed out.
+ */
+static VALUE
+pm_parse_process(pm_parse_result_t *result, pm_node_t *node, VALUE *script_lines)
+{
+    pm_parser_t *parser = &result->parser;
+
+    // First, set up the scope node so that the AST node is attached and can be
+    // freed regardless of whether or we return an error.
+    pm_scope_node_t *scope_node = &result->node;
+    rb_encoding *filepath_encoding = scope_node->filepath_encoding;
+    int coverage_enabled = scope_node->coverage_enabled;
+
+    pm_scope_node_init(node, scope_node, NULL);
+    scope_node->filepath_encoding = filepath_encoding;
+
+    scope_node->encoding = rb_enc_find(parser->encoding->name);
+    if (!scope_node->encoding) rb_bug("Encoding not found %s!", parser->encoding->name);
+
+    scope_node->coverage_enabled = coverage_enabled;
+
+    // If RubyVM.keep_script_lines is set to true, then we need to create that
+    // array of script lines here.
+    if (script_lines != NULL) {
+        *script_lines = rb_ary_new_capa(parser->newline_list.size);
+
+        for (size_t index = 0; index < parser->newline_list.size; index++) {
+            size_t offset = parser->newline_list.offsets[index];
+            size_t length = index == parser->newline_list.size - 1 ? ((size_t) (parser->end - (parser->start + offset))) : (parser->newline_list.offsets[index + 1] - offset);
+            rb_ary_push(*script_lines, rb_enc_str_new((const char *) parser->start + offset, length, scope_node->encoding));
+        }
+
+        scope_node->script_lines = script_lines;
+    }
+
+    // Emit all of the various warnings from the parse.
+    const pm_diagnostic_t *warning;
+    const char *warning_filepath = (const char *) pm_string_source(&parser->filepath);
+
+    for (warning = (const pm_diagnostic_t *) parser->warning_list.head; warning != NULL; warning = (const pm_diagnostic_t *) warning->node.next) {
+        int line = pm_location_line_number(parser, &warning->location);
+
+        if (warning->level == PM_WARNING_LEVEL_VERBOSE) {
+            rb_enc_compile_warning(scope_node->encoding, warning_filepath, line, "%s", warning->message);
+        }
+        else {
+            rb_enc_compile_warn(scope_node->encoding, warning_filepath, line, "%s", warning->message);
+        }
+    }
+
+    // If there are errors, raise an appropriate error and free the result.
+    if (parser->error_list.size > 0) {
+        VALUE error = pm_parse_process_error(result);
+
+        // TODO: We need to set the backtrace.
+        // rb_funcallv(error, rb_intern("set_backtrace"), 1, &path);
+        return error;
+    }
+
+    // Now set up the constant pool and intern all of the various constants into
+    // their corresponding IDs.
+    scope_node->parser = parser;
+    scope_node->constants = parser->constant_pool.size ? xcalloc(parser->constant_pool.size, sizeof(ID)) : NULL;
+
+    for (uint32_t index = 0; index < parser->constant_pool.size; index++) {
+        pm_constant_t *constant = &parser->constant_pool.constants[index];
+        scope_node->constants[index] = rb_intern3((const char *) constant->start, constant->length, scope_node->encoding);
+    }
+
+    scope_node->index_lookup_table = st_init_numtable();
+    pm_constant_id_list_t *locals = &scope_node->locals;
+    for (size_t index = 0; index < locals->size; index++) {
+        st_insert(scope_node->index_lookup_table, locals->ids[index], index);
+    }
+
+    // If we got here, this is a success and we can return Qnil to indicate that
+    // no error should be raised.
+    result->parsed = true;
+    return Qnil;
+}
+
+/**
+ * Set the frozen_string_literal option based on the default value used by the
+ * CRuby compiler.
+ */
+static void
+pm_options_frozen_string_literal_init(pm_options_t *options)
+{
+    int frozen_string_literal = rb_iseq_opt_frozen_string_literal();
+
+    switch (frozen_string_literal) {
+      case ISEQ_FROZEN_STRING_LITERAL_UNSET:
+        break;
+      case ISEQ_FROZEN_STRING_LITERAL_DISABLED:
+        pm_options_frozen_string_literal_set(options, false);
+        break;
+      case ISEQ_FROZEN_STRING_LITERAL_ENABLED:
+        pm_options_frozen_string_literal_set(options, true);
+        break;
+      default:
+        rb_bug("pm_options_frozen_string_literal_init: invalid frozen_string_literal=%d", frozen_string_literal);
+        break;
+    }
+}
+
+/**
+ * Returns an array of ruby String objects that represent the lines of the
+ * source file that the given parser parsed.
+ */
+static inline VALUE
+pm_parse_file_script_lines(const pm_scope_node_t *scope_node, const pm_parser_t *parser)
+{
+    const pm_newline_list_t *newline_list = &parser->newline_list;
+    const char *start = (const char *) parser->start;
+    const char *end = (const char *) parser->end;
+
+    // If we end exactly on a newline, then there's no need to push on a final
+    // segment. If we don't, then we need to push on the last offset up to the
+    // end of the string.
+    size_t last_offset = newline_list->offsets[newline_list->size - 1];
+    bool last_push = start + last_offset != end;
+
+    // Create the ruby strings that represent the lines of the source.
+    VALUE lines = rb_ary_new_capa(newline_list->size - (last_push ? 0 : 1));
+
+    for (size_t index = 0; index < newline_list->size - 1; index++) {
+        size_t offset = newline_list->offsets[index];
+        size_t length = newline_list->offsets[index + 1] - offset;
+
+        rb_ary_push(lines, rb_enc_str_new(start + offset, length, scope_node->encoding));
+    }
+
+    // Push on the last line if we need to.
+    if (last_push) {
+        rb_ary_push(lines, rb_enc_str_new(start + last_offset, end - (start + last_offset), scope_node->encoding));
+    }
+
+    return lines;
+}
+
+// This is essentially pm_string_mapped_init(), preferring to memory map the
+// file, with additional handling for files that require blocking to properly
+// read (e.g. pipes).
+static pm_string_init_result_t
+pm_read_file(pm_string_t *string, const char *filepath)
+{
+#ifdef _WIN32
+    // Open the file for reading.
+    int length = MultiByteToWideChar(CP_UTF8, 0, filepath, -1, NULL, 0);
+    if (length == 0) return PM_STRING_INIT_ERROR_GENERIC;
+
+    WCHAR *wfilepath = xmalloc(sizeof(WCHAR) * ((size_t) length));
+    if ((wfilepath == NULL) || (MultiByteToWideChar(CP_UTF8, 0, filepath, -1, wfilepath, length) == 0)) {
+        xfree(wfilepath);
+        return PM_STRING_INIT_ERROR_GENERIC;
+    }
+
+    HANDLE file = CreateFileW(wfilepath, GENERIC_READ, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_READONLY, NULL);
+    if (file == INVALID_HANDLE_VALUE) {
+        pm_string_init_result_t result = PM_STRING_INIT_ERROR_GENERIC;
+
+        if (GetLastError() == ERROR_ACCESS_DENIED) {
+            DWORD attributes = GetFileAttributesW(wfilepath);
+            if ((attributes != INVALID_FILE_ATTRIBUTES) && (attributes & FILE_ATTRIBUTE_DIRECTORY)) {
+                result = PM_STRING_INIT_ERROR_DIRECTORY;
+            }
+        }
+
+        xfree(wfilepath);
+        return result;
+    }
+
+    // Get the file size.
+    DWORD file_size = GetFileSize(file, NULL);
+    if (file_size == INVALID_FILE_SIZE) {
+        CloseHandle(file);
+        xfree(wfilepath);
+        return PM_STRING_INIT_ERROR_GENERIC;
+    }
+
+    // If the file is empty, then we don't need to do anything else, we'll set
+    // the source to a constant empty string and return.
+    if (file_size == 0) {
+        CloseHandle(file);
+        xfree(wfilepath);
+        const uint8_t source[] = "";
+        *string = (pm_string_t) { .type = PM_STRING_CONSTANT, .source = source, .length = 0 };
+        return PM_STRING_INIT_SUCCESS;
+    }
+
+    // Create a mapping of the file.
+    HANDLE mapping = CreateFileMapping(file, NULL, PAGE_READONLY, 0, 0, NULL);
+    if (mapping == NULL) {
+        CloseHandle(file);
+        xfree(wfilepath);
+        return PM_STRING_INIT_ERROR_GENERIC;
+    }
+
+    // Map the file into memory.
+    uint8_t *source = (uint8_t *) MapViewOfFile(mapping, FILE_MAP_READ, 0, 0, 0);
+    CloseHandle(mapping);
+    CloseHandle(file);
+    xfree(wfilepath);
+
+    if (source == NULL) {
+        return PM_STRING_INIT_ERROR_GENERIC;
+    }
+
+    *string = (pm_string_t) { .type = PM_STRING_MAPPED, .source = source, .length = (size_t) file_size };
+    return PM_STRING_INIT_SUCCESS;
+#elif defined(_POSIX_MAPPED_FILES)
+    // Open the file for reading
+    const int open_mode = O_RDONLY | O_NONBLOCK;
+    int fd = open(filepath, open_mode);
+    if (fd == -1) {
+        return PM_STRING_INIT_ERROR_GENERIC;
+    }
+
+    // Stat the file to get the file size
+    struct stat sb;
+    if (fstat(fd, &sb) == -1) {
+        close(fd);
+        return PM_STRING_INIT_ERROR_GENERIC;
+    }
+
+    // Ensure it is a file and not a directory
+    if (S_ISDIR(sb.st_mode)) {
+        close(fd);
+        return PM_STRING_INIT_ERROR_DIRECTORY;
+    }
+
+    // We need to wait for data first before reading from pipes and character
+    // devices. To not block the entire VM, we need to release the GVL while
+    // reading. Use IO#read to do this and let the GC handle closing the FD.
+    if (S_ISFIFO(sb.st_mode) || S_ISCHR(sb.st_mode)) {
+        VALUE io = rb_io_fdopen((int) fd, open_mode, filepath);
+        rb_io_wait(io, RB_INT2NUM(RUBY_IO_READABLE), Qnil);
+        VALUE contents = rb_funcall(io, rb_intern("read"), 0);
+
+        if (!RB_TYPE_P(contents, T_STRING)) {
+            return PM_STRING_INIT_ERROR_GENERIC;
+        }
+
+        long len = RSTRING_LEN(contents);
+        if (len < 0) {
+            return PM_STRING_INIT_ERROR_GENERIC;
+        }
+
+        size_t length = (size_t) len;
+        uint8_t *source = malloc(length);
+        memcpy(source, RSTRING_PTR(contents), length);
+        *string = (pm_string_t) { .type = PM_STRING_OWNED, .source = source, .length = length };
+
+        return PM_STRING_INIT_SUCCESS;
+    }
+
+    // mmap the file descriptor to virtually get the contents
+    size_t size = (size_t) sb.st_size;
+    uint8_t *source = NULL;
+
+    if (size == 0) {
+        close(fd);
+        const uint8_t source[] = "";
+        *string = (pm_string_t) { .type = PM_STRING_CONSTANT, .source = source, .length = 0 };
+        return PM_STRING_INIT_SUCCESS;
+    }
+
+    source = mmap(NULL, size, PROT_READ, MAP_PRIVATE, fd, 0);
+    if (source == MAP_FAILED) {
+        close(fd);
+        return PM_STRING_INIT_ERROR_GENERIC;
+    }
+
+    close(fd);
+    *string = (pm_string_t) { .type = PM_STRING_MAPPED, .source = source, .length = size };
+    return PM_STRING_INIT_SUCCESS;
+#else
+    return pm_string_file_init(string, filepath);
+#endif
+}
+
+/**
+ * Attempt to load the file into memory. Return a Ruby error if the file cannot
+ * be read.
+ */
+VALUE
+pm_load_file(pm_parse_result_t *result, VALUE filepath, bool load_error)
+{
+    pm_string_init_result_t init_result = pm_read_file(&result->input, RSTRING_PTR(filepath));
+
+    if (init_result == PM_STRING_INIT_SUCCESS) {
+        pm_options_frozen_string_literal_init(&result->options);
+        return Qnil;
+    }
+
+    int err;
+    if (init_result == PM_STRING_INIT_ERROR_DIRECTORY) {
+        err = EISDIR;
+    } else {
+#ifdef _WIN32
+        err = rb_w32_map_errno(GetLastError());
+#else
+        err = errno;
+#endif
+    }
+
+    VALUE error;
+    if (load_error) {
+        VALUE message = rb_str_buf_new_cstr(strerror(err));
+        rb_str_cat2(message, " -- ");
+        rb_str_append(message, filepath);
+
+        error = rb_exc_new3(rb_eLoadError, message);
+        rb_ivar_set(error, rb_intern_const("@path"), filepath);
+    } else {
+        error = rb_syserr_new(err, RSTRING_PTR(filepath));
+        RB_GC_GUARD(filepath);
+    }
+
+    return error;
+}
+
+/**
+ * Parse the given filepath and store the resulting scope node in the given
+ * parse result struct. It returns a Ruby error if the file cannot be read or
+ * if it cannot be parsed properly. It is assumed that the parse result object
+ * is zeroed out.
+ */
+VALUE
+pm_parse_file(pm_parse_result_t *result, VALUE filepath, VALUE *script_lines)
+{
+    result->node.filepath_encoding = rb_enc_get(filepath);
+    pm_options_filepath_set(&result->options, RSTRING_PTR(filepath));
+    RB_GC_GUARD(filepath);
+
+    pm_parser_init(&result->parser, pm_string_source(&result->input), pm_string_length(&result->input), &result->options);
+    pm_node_t *node = pm_parse(&result->parser);
+
+    VALUE error = pm_parse_process(result, node, script_lines);
+
+    // If we're parsing a filepath, then we need to potentially support the
+    // SCRIPT_LINES__ constant, which can be a hash that has an array of lines
+    // of every read file.
+    ID id_script_lines = rb_intern("SCRIPT_LINES__");
+
+    if (rb_const_defined_at(rb_cObject, id_script_lines)) {
+        VALUE constant_script_lines = rb_const_get_at(rb_cObject, id_script_lines);
+
+        if (RB_TYPE_P(constant_script_lines, T_HASH)) {
+            rb_hash_aset(constant_script_lines, filepath, pm_parse_file_script_lines(&result->node, &result->parser));
+        }
+    }
+
+    return error;
+}
+
+/**
+ * Load and then parse the given filepath. It returns a Ruby error if the file
+ * cannot be read or if it cannot be parsed properly.
+ */
+VALUE
+pm_load_parse_file(pm_parse_result_t *result, VALUE filepath, VALUE *script_lines)
+{
+    VALUE error = pm_load_file(result, filepath, false);
+    if (NIL_P(error)) {
+        error = pm_parse_file(result, filepath, script_lines);
+    }
+
+    return error;
+}
+
+/**
+ * Parse the given source that corresponds to the given filepath and store the
+ * resulting scope node in the given parse result struct. It is assumed that the
+ * parse result object is zeroed out. If the string fails to parse, then a Ruby
+ * error is returned.
+ */
+VALUE
+pm_parse_string(pm_parse_result_t *result, VALUE source, VALUE filepath, VALUE *script_lines)
+{
+    rb_encoding *encoding = rb_enc_get(source);
+    if (!rb_enc_asciicompat(encoding)) {
+        return rb_exc_new_cstr(rb_eArgError, "invalid source encoding");
+    }
+
+    pm_options_frozen_string_literal_init(&result->options);
+    pm_string_constant_init(&result->input, RSTRING_PTR(source), RSTRING_LEN(source));
+    pm_options_encoding_set(&result->options, rb_enc_name(encoding));
+
+    result->node.filepath_encoding = rb_enc_get(filepath);
+    pm_options_filepath_set(&result->options, RSTRING_PTR(filepath));
+    RB_GC_GUARD(filepath);
+
+    pm_parser_init(&result->parser, pm_string_source(&result->input), pm_string_length(&result->input), &result->options);
+    pm_node_t *node = pm_parse(&result->parser);
+
+    return pm_parse_process(result, node, script_lines);
+}
+
+/**
+ * An implementation of fgets that is suitable for use with Ruby IO objects.
+ */
+static char *
+pm_parse_stdin_fgets(char *string, int size, void *stream)
+{
+    RUBY_ASSERT(size > 0);
+
+    VALUE line = rb_funcall((VALUE) stream, rb_intern("gets"), 1, INT2FIX(size - 1));
+    if (NIL_P(line)) {
+        return NULL;
+    }
+
+    const char *cstr = RSTRING_PTR(line);
+    long length = RSTRING_LEN(line);
+
+    memcpy(string, cstr, length);
+    string[length] = '\0';
+
+    return string;
+}
+
+// We need access to this function when we're done parsing stdin.
+void rb_reset_argf_lineno(long n);
+
+/**
+ * Parse the source off STDIN and store the resulting scope node in the given
+ * parse result struct. It is assumed that the parse result object is zeroed
+ * out. If the stream fails to parse, then a Ruby error is returned.
+ */
+VALUE
+pm_parse_stdin(pm_parse_result_t *result)
+{
+    pm_options_frozen_string_literal_init(&result->options);
+
+    pm_buffer_t buffer;
+    pm_node_t *node = pm_parse_stream(&result->parser, &buffer, (void *) rb_stdin, pm_parse_stdin_fgets, &result->options);
+
+    // Copy the allocated buffer contents into the input string so that it gets
+    // freed. At this point we've handed over ownership, so we don't need to
+    // free the buffer itself.
+    pm_string_owned_init(&result->input, (uint8_t *) pm_buffer_value(&buffer), pm_buffer_length(&buffer));
+
+    // When we're done parsing, we reset $. because we don't want the fact that
+    // we went through an IO object to be visible to the user.
+    rb_reset_argf_lineno(0);
+
+    return pm_parse_process(result, node, NULL);
+}
+
+#undef NEW_ISEQ
+#define NEW_ISEQ OLD_ISEQ
+
+#undef NEW_CHILD_ISEQ
+#define NEW_CHILD_ISEQ OLD_CHILD_ISEQ
diff --git a/prism_compile.h b/prism_compile.h
new file mode 100644
index 00000000000000..c032449bd65ca9
--- /dev/null
+++ b/prism_compile.h
@@ -0,0 +1,105 @@
+#include "prism/prism.h"
+#include "ruby/encoding.h"
+
+/**
+ * the getlocal and setlocal instructions require two parameters. level is how
+ * many hops up the iseq stack one needs to go before finding the correct local
+ * table. The index is the index in that table where our variable is.
+ *
+ * Because these are always calculated and used together, we'll bind them
+ * together as a tuple.
+ */
+typedef struct pm_local_index_struct {
+    int index, level;
+} pm_local_index_t;
+
+// A declaration for the struct that lives in compile.c.
+struct iseq_link_anchor;
+
+// ScopeNodes are helper nodes, and will never be part of the AST. We manually
+// declare them here to avoid generating them.
+typedef struct pm_scope_node {
+    pm_node_t base;
+    struct pm_scope_node *previous;
+    pm_node_t *ast_node;
+    pm_node_t *parameters;
+    pm_node_t *body;
+    pm_constant_id_list_t locals;
+
+    const pm_parser_t *parser;
+    rb_encoding *encoding;
+
+    /**
+     * This is a pointer to the list of script lines for the ISEQs that will be
+     * associated with this scope node. It is only set if
+     * RubyVM.keep_script_lines is true. If it is set, it will be set to a
+     * pointer to an array that is always stack allocated (so no GC marking is
+     * needed by this struct). If it is not set, it will be NULL. It is
+     * inherited by all child scopes.
+     */
+    VALUE *script_lines;
+
+    /**
+     * This is the encoding of the actual filepath object that will be used when
+     * a __FILE__ node is compiled or when the path has to be set on a syntax
+     * error.
+     */
+    rb_encoding *filepath_encoding;
+
+    // The size of the local table on the iseq which includes locals and hidden
+    // variables.
+    int local_table_for_iseq_size;
+
+    ID *constants;
+    st_table *index_lookup_table;
+
+    // The current coverage setting, passed down through the various scopes.
+    int coverage_enabled;
+
+    /**
+     * This will only be set on the top-level scope node. It will contain all of
+     * the instructions pertaining to BEGIN{} nodes.
+     */
+    struct iseq_link_anchor *pre_execution_anchor;
+} pm_scope_node_t;
+
+void pm_scope_node_init(const pm_node_t *node, pm_scope_node_t *scope, pm_scope_node_t *previous);
+void pm_scope_node_destroy(pm_scope_node_t *scope_node);
+
+typedef struct {
+    /** The parser that will do the actual parsing. */
+    pm_parser_t parser;
+
+    /** The options that will be passed to the parser. */
+    pm_options_t options;
+
+    /** The input that represents the source to be parsed. */
+    pm_string_t input;
+
+    /** The resulting scope node that will hold the generated AST. */
+    pm_scope_node_t node;
+
+    /** Whether or not this parse result has performed its parsing yet. */
+    bool parsed;
+} pm_parse_result_t;
+
+#define PM_SPECIAL_CONSTANT_FLAG ((pm_constant_id_t)(1 << 31))
+#define PM_CONSTANT_AND ((pm_constant_id_t)(idAnd | PM_SPECIAL_CONSTANT_FLAG))
+#define PM_CONSTANT_DOT3 ((pm_constant_id_t)(idDot3 | PM_SPECIAL_CONSTANT_FLAG))
+#define PM_CONSTANT_MULT ((pm_constant_id_t)(idMULT | PM_SPECIAL_CONSTANT_FLAG))
+#define PM_CONSTANT_POW ((pm_constant_id_t)(idPow | PM_SPECIAL_CONSTANT_FLAG))
+
+VALUE pm_load_file(pm_parse_result_t *result, VALUE filepath, bool load_error);
+VALUE pm_parse_file(pm_parse_result_t *result, VALUE filepath, VALUE *script_lines);
+VALUE pm_load_parse_file(pm_parse_result_t *result, VALUE filepath, VALUE *script_lines);
+VALUE pm_parse_string(pm_parse_result_t *result, VALUE source, VALUE filepath, VALUE *script_lines);
+VALUE pm_parse_stdin(pm_parse_result_t *result);
+void pm_parse_result_free(pm_parse_result_t *result);
+
+rb_iseq_t *pm_iseq_new(pm_scope_node_t *node, VALUE name, VALUE path, VALUE realpath, const rb_iseq_t *parent, enum rb_iseq_type, int *error_state);
+rb_iseq_t *pm_iseq_new_top(pm_scope_node_t *node, VALUE name, VALUE path, VALUE realpath, const rb_iseq_t *parent, int *error_state);
+rb_iseq_t *pm_iseq_new_main(pm_scope_node_t *node, VALUE path, VALUE realpath, const rb_iseq_t *parent, int opt, int *error_state);
+rb_iseq_t *pm_iseq_new_eval(pm_scope_node_t *node, VALUE name, VALUE path, VALUE realpath, int first_lineno, const rb_iseq_t *parent, int isolated_depth, int *error_state);
+rb_iseq_t *pm_iseq_new_with_opt(pm_scope_node_t *node, VALUE name, VALUE path, VALUE realpath, int first_lineno, const rb_iseq_t *parent, int isolated_depth, enum rb_iseq_type, const rb_compile_option_t *option, int *error_state);
+
+VALUE pm_iseq_compile_node(rb_iseq_t *iseq, pm_scope_node_t *node);
diff --git a/prism_init.c b/prism_init.c
new file mode 100644
index 00000000000000..ddc87fad855b09
--- /dev/null
+++ b/prism_init.c
@@ -0,0 +1,9 @@
+#include "prism/extension.h"
+
+void ruby_init_ext(const char *name, void (*init)(void));
+
+void
+Init_Prism(void)
+{
+    ruby_init_ext("prism/prism.so", Init_prism);
+}
diff --git a/proc.c b/proc.c
index 9fd24a8fd4e561..85431104761512 100644
--- a/proc.c
+++ b/proc.c
@@ -15,23 +15,16 @@
 #include "internal/error.h"
 #include "internal/eval.h"
 #include "internal/gc.h"
+#include "internal/hash.h"
 #include "internal/object.h"
 #include "internal/proc.h"
 #include "internal/symbol.h"
 #include "method.h"
 #include "iseq.h"
 #include "vm_core.h"
+#include "ractor_core.h"
 #include "yjit.h"
 
-#if !defined(__GNUC__) || __GNUC__ < 5 || defined(__MINGW32__)
-# define NO_CLOBBERED(v) (*(volatile VALUE *)&(v))
-#else
-# define NO_CLOBBERED(v) (v)
-#endif
-
-#define UPDATE_TYPED_REFERENCE(_type, _ref) *(_type*)&_ref = (_type)rb_gc_location((VALUE)_ref)
-#define UPDATE_REFERENCE(_ref) UPDATE_TYPED_REFERENCE(VALUE, _ref)
-
 const rb_cref_t *rb_vm_cref_in_context(VALUE self, VALUE cbase);
 
 struct METHOD {
@@ -60,23 +53,6 @@ static VALUE proc_binding(VALUE self);
 
 #define IS_METHOD_PROC_IFUNC(ifunc) ((ifunc)->func == bmcall)
 
-/* :FIXME: The way procs are cloned has been historically different from the
- * way everything else are.  @shyouhei is not sure for the intention though.
- */
-#undef CLONESETUP
-static inline void
-CLONESETUP(VALUE clone, VALUE obj)
-{
-    RBIMPL_ASSERT_OR_ASSUME(! RB_SPECIAL_CONST_P(obj));
-    RBIMPL_ASSERT_OR_ASSUME(! RB_SPECIAL_CONST_P(clone));
-
-    const VALUE flags = RUBY_FL_PROMOTED | RUBY_FL_FINALIZE;
-    rb_obj_setup(clone, rb_singleton_class_clone(obj),
-                 RB_FL_TEST_RAW(obj, ~flags));
-    rb_singleton_class_attached(RBASIC_CLASS(clone), clone);
-    if (RB_FL_TEST(obj, RUBY_FL_EXIVAR)) rb_copy_generic_ivar(clone, obj);
-}
-
 static void
 block_mark_and_move(struct rb_block *block)
 {
@@ -151,8 +127,15 @@ static VALUE
 proc_clone(VALUE self)
 {
     VALUE procval = rb_proc_dup(self);
-    CLONESETUP(procval, self);
-    return procval;
+    return rb_obj_clone_setup(self, procval, Qnil);
+}
+
+/* :nodoc: */
+static VALUE
+proc_dup(VALUE self)
+{
+    VALUE procval = rb_proc_dup(self);
+    return rb_obj_dup_setup(self, procval);
 }
 
 /*
@@ -315,10 +298,8 @@ rb_binding_alloc(VALUE klass)
     return obj;
 }
 
-
-/* :nodoc: */
 static VALUE
-binding_dup(VALUE self)
+binding_copy(VALUE self)
 {
     VALUE bindval = rb_binding_alloc(rb_cBinding);
     rb_binding_t *src, *dst;
@@ -330,13 +311,18 @@ binding_dup(VALUE self)
     return bindval;
 }
 
+/* :nodoc: */
+static VALUE
+binding_dup(VALUE self)
+{
+    return rb_obj_dup_setup(self, binding_copy(self));
+}
+
 /* :nodoc: */
 static VALUE
 binding_clone(VALUE self)
 {
-    VALUE bindval = binding_dup(self);
-    CLONESETUP(bindval, self);
-    return bindval;
+    return rb_obj_clone_setup(self, binding_copy(self), Qnil);
 }
 
 VALUE
@@ -433,11 +419,11 @@ get_local_variable_ptr(const rb_env_t **envp, ID lid)
             }
 
             const rb_iseq_t *iseq = env->iseq;
-            unsigned int i;
 
             VM_ASSERT(rb_obj_is_iseq((VALUE)iseq));
 
-            for (i=0; i<ISEQ_BODY(iseq)->local_table_size; i++) {
+            const unsigned int local_table_size = ISEQ_BODY(iseq)->local_table_size;
+            for (unsigned int i=0; i<local_table_size; i++) {
                 if (ISEQ_BODY(iseq)->local_table[i] == lid) {
                     if (ISEQ_BODY(iseq)->local_iseq == iseq &&
                             ISEQ_BODY(iseq)->param.flags.has_block &&
@@ -450,7 +436,9 @@ get_local_variable_ptr(const rb_env_t **envp, ID lid)
                     }
 
                     *envp = env;
-                    return &env->env[i];
+                    unsigned int last_lvar = env->env_size+VM_ENV_INDEX_LAST_LVAR
+                        - 1 /* errinfo */;
+                    return &env->env[last_lvar - (local_table_size - i)];
                 }
             }
         }
@@ -477,13 +465,13 @@ check_local_id(VALUE bindval, volatile VALUE *pname)
 
     if (lid) {
         if (!rb_is_local_id(lid)) {
-            rb_name_err_raise("wrong local variable name `%1$s' for %2$s",
+            rb_name_err_raise("wrong local variable name '%1$s' for %2$s",
                               bindval, ID2SYM(lid));
         }
     }
     else {
         if (!rb_is_local_name(name)) {
-            rb_name_err_raise("wrong local variable name `%1$s' for %2$s",
+            rb_name_err_raise("wrong local variable name '%1$s' for %2$s",
                               bindval, name);
         }
         return 0;
@@ -520,6 +508,12 @@ bind_local_variables(VALUE bindval)
     return rb_vm_env_local_variables(env);
 }
 
+int
+rb_numparam_id_p(ID id)
+{
+    return (tNUMPARAM_1 << ID_SCOPE_SHIFT) <= id && id < ((tNUMPARAM_1 + 9) << ID_SCOPE_SHIFT);
+}
+
 /*
  *  call-seq:
  *     binding.local_variable_get(symbol) -> obj
@@ -546,6 +540,10 @@ bind_local_variable_get(VALUE bindval, VALUE sym)
     const rb_env_t *env;
 
     if (!lid) goto undefined;
+    if (rb_numparam_id_p(lid)) {
+        rb_name_err_raise("numbered parameter '%1$s' is not a local variable",
+                          bindval, ID2SYM(lid));
+    }
 
     GetBindingPtr(bindval, bind);
 
@@ -556,7 +554,7 @@ bind_local_variable_get(VALUE bindval, VALUE sym)
 
     sym = ID2SYM(lid);
   undefined:
-    rb_name_err_raise("local variable `%1$s' is not defined for %2$s",
+    rb_name_err_raise("local variable '%1$s' is not defined for %2$s",
                       bindval, sym);
     UNREACHABLE_RETURN(Qundef);
 }
@@ -595,6 +593,10 @@ bind_local_variable_set(VALUE bindval, VALUE sym, VALUE val)
     const rb_env_t *env;
 
     if (!lid) lid = rb_intern_str(sym);
+    if (rb_numparam_id_p(lid)) {
+        rb_name_err_raise("numbered parameter '%1$s' is not a local variable",
+                          bindval, ID2SYM(lid));
+    }
 
     GetBindingPtr(bindval, bind);
     env = VM_ENV_ENVVAL_PTR(vm_block_ep(&bind->block));
@@ -681,6 +683,7 @@ cfunc_proc_new(VALUE klass, VALUE ifunc)
 {
     rb_proc_t *proc;
     cfunc_proc_t *sproc;
+    const rb_namespace_t *ns = rb_current_namespace();
     VALUE procval = TypedData_Make_Struct(klass, cfunc_proc_t, &proc_data_type, sproc);
     VALUE *ep;
 
@@ -695,10 +698,34 @@ cfunc_proc_new(VALUE klass, VALUE ifunc)
 
     /* self? */
     RB_OBJ_WRITE(procval, &proc->block.as.captured.code.ifunc, ifunc);
+    proc->ns = ns;
     proc->is_lambda = TRUE;
     return procval;
 }
 
+VALUE
+rb_func_proc_dup(VALUE src_obj)
+{
+    RUBY_ASSERT(rb_typeddata_is_instance_of(src_obj, &proc_data_type));
+
+    rb_proc_t *src_proc;
+    GetProcPtr(src_obj, src_proc);
+    RUBY_ASSERT(vm_block_type(&src_proc->block) == block_type_ifunc);
+
+    cfunc_proc_t *proc;
+    VALUE proc_obj = TypedData_Make_Struct(rb_obj_class(src_obj), cfunc_proc_t, &proc_data_type, proc);
+
+    memcpy(&proc->basic, src_proc, sizeof(rb_proc_t));
+
+    VALUE *ep = *(VALUE **)&proc->basic.block.as.captured.ep = proc->env + VM_ENV_DATA_SIZE - 1;
+    ep[VM_ENV_DATA_INDEX_FLAGS]   = src_proc->block.as.captured.ep[VM_ENV_DATA_INDEX_FLAGS];
+    ep[VM_ENV_DATA_INDEX_ME_CREF] = src_proc->block.as.captured.ep[VM_ENV_DATA_INDEX_ME_CREF];
+    ep[VM_ENV_DATA_INDEX_SPECVAL] = src_proc->block.as.captured.ep[VM_ENV_DATA_INDEX_SPECVAL];
+    ep[VM_ENV_DATA_INDEX_ENV]     = src_proc->block.as.captured.ep[VM_ENV_DATA_INDEX_ENV];
+
+    return proc_obj;
+}
+
 static VALUE
 sym_proc_new(VALUE klass, VALUE sym)
 {
@@ -707,6 +734,7 @@ sym_proc_new(VALUE klass, VALUE sym)
     GetProcPtr(procval, proc);
 
     vm_block_type_set(&proc->block, block_type_symbol);
+    // No namespace specified: similar to built-in methods
     proc->is_lambda = TRUE;
     RB_OBJ_WRITE(procval, &proc->block.as.symbol, sym);
     return procval;
@@ -715,11 +743,6 @@ sym_proc_new(VALUE klass, VALUE sym)
 struct vm_ifunc *
 rb_vm_ifunc_new(rb_block_call_func_t func, const void *data, int min_argc, int max_argc)
 {
-    union {
-        struct vm_ifunc_argc argc;
-        VALUE packed;
-    } arity;
-
     if (min_argc < UNLIMITED_ARGUMENTS ||
 #if SIZEOF_INT * 2 > SIZEOF_VALUE
         min_argc >= (int)(1U << (SIZEOF_VALUE * CHAR_BIT) / 2) ||
@@ -736,18 +759,15 @@ rb_vm_ifunc_new(rb_block_call_func_t func, const void *data, int min_argc, int m
         rb_raise(rb_eRangeError, "maximum argument number out of range: %d",
                  max_argc);
     }
-    arity.argc.min = min_argc;
-    arity.argc.max = max_argc;
     rb_execution_context_t *ec = GET_EC();
-    VALUE ret = rb_imemo_new(imemo_ifunc, (VALUE)func, (VALUE)data, arity.packed, (VALUE)rb_vm_svar_lep(ec, ec->cfp));
-    return (struct vm_ifunc *)ret;
-}
 
-VALUE
-rb_func_proc_new(rb_block_call_func_t func, VALUE val)
-{
-    struct vm_ifunc *ifunc = rb_vm_ifunc_proc_new(func, (void *)val);
-    return cfunc_proc_new(rb_cProc, (VALUE)ifunc);
+    struct vm_ifunc *ifunc = IMEMO_NEW(struct vm_ifunc, imemo_ifunc, (VALUE)rb_vm_svar_lep(ec, ec->cfp));
+    ifunc->func = func;
+    ifunc->data = data;
+    ifunc->argc.min = min_argc;
+    ifunc->argc.max = max_argc;
+
+    return ifunc;
 }
 
 VALUE
@@ -793,16 +813,8 @@ proc_new(VALUE klass, int8_t is_lambda)
         break;
 
       case block_handler_type_ifunc:
-        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);
-        }
+        return rb_vm_make_proc_lambda(ec, VM_BH_TO_CAPT_BLOCK(block_handler), klass, is_lambda);
     }
     VM_UNREACHABLE(proc_new);
     return Qnil;
@@ -857,31 +869,34 @@ rb_block_lambda(void)
 }
 
 static void
-f_lambda_warn(void)
+f_lambda_filter_non_literal(void)
 {
     rb_control_frame_t *cfp = GET_EC()->cfp;
     VALUE block_handler = rb_vm_frame_block_handler(cfp);
 
-    if (block_handler != VM_BLOCK_HANDLER_NONE) {
-        switch (vm_block_handler_type(block_handler)) {
-          case block_handler_type_iseq:
-            if (RUBY_VM_PREVIOUS_CONTROL_FRAME(cfp)->ep == VM_BH_TO_ISEQ_BLOCK(block_handler)->ep) {
-                return;
-            }
-            break;
-          case block_handler_type_symbol:
+    if (block_handler == VM_BLOCK_HANDLER_NONE) {
+        // no block error raised else where
+        return;
+    }
+
+    switch (vm_block_handler_type(block_handler)) {
+      case block_handler_type_iseq:
+        if (RUBY_VM_PREVIOUS_CONTROL_FRAME(cfp)->ep == VM_BH_TO_ISEQ_BLOCK(block_handler)->ep) {
+            return;
+        }
+        break;
+      case block_handler_type_symbol:
+        return;
+      case block_handler_type_proc:
+        if (rb_proc_lambda_p(VM_BH_TO_PROC(block_handler))) {
             return;
-          case block_handler_type_proc:
-            if (rb_proc_lambda_p(VM_BH_TO_PROC(block_handler))) {
-                return;
-            }
-            break;
-          case block_handler_type_ifunc:
-            break;
         }
+        break;
+      case block_handler_type_ifunc:
+        break;
     }
 
-    rb_warn_deprecated("lambda without a literal block", "the proc without lambda");
+    rb_raise(rb_eArgError, "the lambda method requires a literal block");
 }
 
 /*
@@ -895,7 +910,7 @@ f_lambda_warn(void)
 static VALUE
 f_lambda(VALUE _)
 {
-    f_lambda_warn();
+    f_lambda_filter_non_literal();
     return rb_block_lambda();
 }
 
@@ -1070,7 +1085,7 @@ rb_iseq_min_max_arity(const rb_iseq_t *iseq, int *max)
 {
     *max = ISEQ_BODY(iseq)->param.flags.has_rest == FALSE ?
       ISEQ_BODY(iseq)->param.lead_num + ISEQ_BODY(iseq)->param.opt_num + ISEQ_BODY(iseq)->param.post_num +
-      (ISEQ_BODY(iseq)->param.flags.has_kw == TRUE || ISEQ_BODY(iseq)->param.flags.has_kwrest == TRUE)
+      (ISEQ_BODY(iseq)->param.flags.has_kw == TRUE || ISEQ_BODY(iseq)->param.flags.has_kwrest == TRUE || ISEQ_BODY(iseq)->param.flags.forwardable == TRUE)
       : UNLIMITED_ARGUMENTS;
     return ISEQ_BODY(iseq)->param.lead_num + ISEQ_BODY(iseq)->param.post_num + (ISEQ_BODY(iseq)->param.flags.has_kw && ISEQ_BODY(iseq)->param.keyword->required_num > 0);
 }
@@ -1166,10 +1181,10 @@ rb_block_pair_yield_optimizable(void)
     min = rb_vm_block_min_max_arity(&block, &max);
 
     switch (vm_block_type(&block)) {
-      case block_handler_type_symbol:
+      case block_type_symbol:
         return 0;
 
-      case block_handler_type_proc:
+      case block_type_proc:
         {
             VALUE procval = block_handler;
             rb_proc_t *proc;
@@ -1179,6 +1194,12 @@ rb_block_pair_yield_optimizable(void)
             return min > 1;
         }
 
+      case block_type_ifunc:
+        {
+            const struct vm_ifunc *ifunc = block.as.captured.code.ifunc;
+            if (ifunc->flags & IFUNC_YIELD_OPTIMIZABLE) return 1;
+        }
+
       default:
         return min > 1;
     }
@@ -1200,10 +1221,10 @@ rb_block_arity(void)
     block_setup(&block, block_handler);
 
     switch (vm_block_type(&block)) {
-      case block_handler_type_symbol:
+      case block_type_symbol:
         return -1;
 
-      case block_handler_type_proc:
+      case block_type_proc:
         return rb_proc_arity(block_handler);
 
       default:
@@ -1324,12 +1345,17 @@ proc_eq(VALUE self, VALUE other)
         }
         break;
       case block_type_ifunc:
-        if (self_block->as.captured.ep != \
-                other_block->as.captured.ep ||
-                self_block->as.captured.code.ifunc != \
+        if (self_block->as.captured.code.ifunc != \
                 other_block->as.captured.code.ifunc) {
             return Qfalse;
         }
+
+        if (memcmp(
+                ((cfunc_proc_t *)self_proc)->env,
+                ((cfunc_proc_t *)other_proc)->env,
+                sizeof(((cfunc_proc_t *)self_proc)->env))) {
+            return Qfalse;
+        }
         break;
       case block_type_proc:
         if (self_block->as.proc != other_block->as.proc) {
@@ -1349,14 +1375,20 @@ proc_eq(VALUE self, VALUE other)
 static VALUE
 iseq_location(const rb_iseq_t *iseq)
 {
-    VALUE loc[2];
+    VALUE loc[5];
+    int i = 0;
 
     if (!iseq) return Qnil;
     rb_iseq_check(iseq);
-    loc[0] = rb_iseq_path(iseq);
-    loc[1] = RB_INT2NUM(ISEQ_BODY(iseq)->location.first_lineno);
+    loc[i++] = rb_iseq_path(iseq);
+    const rb_code_location_t *cl = &ISEQ_BODY(iseq)->location.code_location;
+    loc[i++] = RB_INT2NUM(cl->beg_pos.lineno);
+    loc[i++] = RB_INT2NUM(cl->beg_pos.column);
+    loc[i++] = RB_INT2NUM(cl->end_pos.lineno);
+    loc[i++] = RB_INT2NUM(cl->end_pos.column);
+    RUBY_ASSERT_ALWAYS(i == numberof(loc));
 
-    return rb_ary_new4(2, loc);
+    return rb_ary_new_from_values(i, loc);
 }
 
 VALUE
@@ -1367,10 +1399,17 @@ rb_iseq_location(const rb_iseq_t *iseq)
 
 /*
  * call-seq:
- *    prc.source_location  -> [String, Integer]
+ *    prc.source_location  -> [String, Integer, Integer, Integer, Integer]
+ *
+ * Returns the location where the Proc was defined.
+ * The returned Array contains:
+ *   (1) the Ruby source filename
+ *   (2) the line number where the definition starts
+ *   (3) the column number where the definition starts
+ *   (4) the line number where the definition ends
+ *   (5) the column number where the definitions ends
  *
- * Returns the Ruby source filename and line number containing this proc
- * or +nil+ if this proc was not defined in Ruby (i.e. native).
+ * This method will return +nil+ if the Proc was not defined in Ruby (i.e. native).
  */
 
 VALUE
@@ -1451,11 +1490,36 @@ rb_hash_proc(st_index_t hash, VALUE prc)
 {
     rb_proc_t *proc;
     GetProcPtr(prc, proc);
-    hash = rb_hash_uint(hash, (st_index_t)proc->block.as.captured.code.val);
-    hash = rb_hash_uint(hash, (st_index_t)proc->block.as.captured.self);
-    return rb_hash_uint(hash, (st_index_t)proc->block.as.captured.ep);
+
+    switch (vm_block_type(&proc->block)) {
+      case block_type_iseq:
+        hash = rb_st_hash_uint(hash, (st_index_t)proc->block.as.captured.code.iseq->body);
+        break;
+      case block_type_ifunc:
+        hash = rb_st_hash_uint(hash, (st_index_t)proc->block.as.captured.code.ifunc->func);
+        hash = rb_st_hash_uint(hash, (st_index_t)proc->block.as.captured.code.ifunc->data);
+        break;
+      case block_type_symbol:
+        hash = rb_st_hash_uint(hash, rb_any_hash(proc->block.as.symbol));
+        break;
+      case block_type_proc:
+        hash = rb_st_hash_uint(hash, rb_any_hash(proc->block.as.proc));
+        break;
+      default:
+        rb_bug("rb_hash_proc: unknown block type %d", vm_block_type(&proc->block));
+    }
+
+    /* ifunc procs have their own allocated ep. If an ifunc is duplicated, they
+     * will point to different ep but they should return the same hash code, so
+     * we cannot include the ep in the hash. */
+    if (vm_block_type(&proc->block) != block_type_ifunc) {
+        hash = rb_hash_uint(hash, (st_index_t)proc->block.as.captured.ep);
+    }
+
+    return hash;
 }
 
+static VALUE sym_proc_cache = Qfalse;
 
 /*
  *  call-seq:
@@ -1474,29 +1538,33 @@ rb_hash_proc(st_index_t hash, VALUE prc)
 VALUE
 rb_sym_to_proc(VALUE sym)
 {
-    static VALUE sym_proc_cache = Qfalse;
     enum {SYM_PROC_CACHE_SIZE = 67};
-    VALUE proc;
-    long index;
-    ID id;
 
-    if (!sym_proc_cache) {
-        sym_proc_cache = rb_ary_hidden_new(SYM_PROC_CACHE_SIZE * 2);
-        rb_gc_register_mark_object(sym_proc_cache);
-        rb_ary_store(sym_proc_cache, SYM_PROC_CACHE_SIZE*2 - 1, Qnil);
-    }
+    if (rb_ractor_main_p()) {
+        if (!sym_proc_cache) {
+            sym_proc_cache = rb_ary_hidden_new(SYM_PROC_CACHE_SIZE);
+            rb_ary_store(sym_proc_cache, SYM_PROC_CACHE_SIZE - 1, Qnil);
+        }
+
+        ID id = SYM2ID(sym);
+        long index = (id % SYM_PROC_CACHE_SIZE);
+        VALUE procval = RARRAY_AREF(sym_proc_cache, index);
+        if (RTEST(procval)) {
+            rb_proc_t *proc;
+            GetProcPtr(procval, proc);
+
+            if (proc->block.as.symbol == sym) {
+                return procval;
+            }
+        }
 
-    id = SYM2ID(sym);
-    index = (id % SYM_PROC_CACHE_SIZE) << 1;
+        procval = sym_proc_new(rb_cProc, sym);
+        RARRAY_ASET(sym_proc_cache, index, procval);
 
-    if (RARRAY_AREF(sym_proc_cache, index) == sym) {
-        return RARRAY_AREF(sym_proc_cache, index + 1);
+        return RB_GC_GUARD(procval);
     }
     else {
-        proc = sym_proc_new(rb_cProc, ID2SYM(id));
-        RARRAY_ASET(sym_proc_cache, index, sym);
-        RARRAY_ASET(sym_proc_cache, index + 1, proc);
-        return proc;
+        return sym_proc_new(rb_cProc, sym);
     }
 }
 
@@ -1592,21 +1660,15 @@ bm_mark_and_move(void *ptr)
     rb_gc_mark_and_move_ptr((rb_method_entry_t **)&data->me);
 }
 
-static size_t
-bm_memsize(const void *ptr)
-{
-    return sizeof(struct METHOD);
-}
-
 static const rb_data_type_t method_data_type = {
     "method",
     {
         bm_mark_and_move,
         RUBY_TYPED_DEFAULT_FREE,
-        bm_memsize,
+        NULL, // No external memory to report,
         bm_mark_and_move,
     },
-    0, 0, RUBY_TYPED_FREE_IMMEDIATELY | RUBY_TYPED_WB_PROTECTED
+    0, 0, RUBY_TYPED_FREE_IMMEDIATELY | RUBY_TYPED_WB_PROTECTED | RUBY_TYPED_EMBEDDABLE
 };
 
 VALUE
@@ -1700,7 +1762,7 @@ mnew_internal(const rb_method_entry_t *me, VALUE klass, VALUE iclass,
 
     method = TypedData_Make_Struct(mclass, struct METHOD, &method_data_type, data);
 
-    if (obj == Qundef) {
+    if (UNDEF_P(obj)) {
         RB_OBJ_WRITE(method, &data->recv, Qundef);
         RB_OBJ_WRITE(method, &data->klass, Qundef);
     }
@@ -1754,7 +1816,7 @@ method_entry_defined_class(const rb_method_entry_t *me)
  *
  * Document-class: Method
  *
- *  Method objects are created by Object#method, and are associated
+ *  +Method+ objects are created by Object#method, and are associated
  *  with a particular object (not just with a class).  They may be
  *  used to invoke the method within the object, and as a block
  *  associated with an iterator.  They may also be unbound from one
@@ -1800,8 +1862,8 @@ method_eq(VALUE method, VALUE other)
         return Qfalse;
 
     Check_TypedStruct(method, &method_data_type);
-    m1 = (struct METHOD *)DATA_PTR(method);
-    m2 = (struct METHOD *)DATA_PTR(other);
+    m1 = (struct METHOD *)RTYPEDDATA_GET_DATA(method);
+    m2 = (struct METHOD *)RTYPEDDATA_GET_DATA(other);
 
     klass1 = method_entry_defined_class(m1->me);
     klass2 = method_entry_defined_class(m2->me);
@@ -1964,14 +2026,29 @@ method_owner(VALUE obj)
     return data->owner;
 }
 
+static VALUE
+method_namespace(VALUE obj)
+{
+    struct METHOD *data;
+    const rb_namespace_t *ns;
+
+    TypedData_Get_Struct(obj, struct METHOD, &method_data_type, data);
+    ns = data->me->def->ns;
+    if (!ns) return Qfalse;
+    if (ns->ns_object) return ns->ns_object;
+    // This should not happen
+    rb_bug("Unexpected namespace on the method definition: %p", (void*) ns);
+    return Qtrue;
+}
+
 void
 rb_method_name_error(VALUE klass, VALUE str)
 {
-#define MSG(s) rb_fstring_lit("undefined method `%1$s' for"s" `%2$s'")
+#define MSG(s) rb_fstring_lit("undefined method '%1$s' for"s" '%2$s'")
     VALUE c = klass;
     VALUE s = Qundef;
 
-    if (FL_TEST(c, FL_SINGLETON)) {
+    if (RCLASS_SINGLETON_P(c)) {
         VALUE obj = RCLASS_ATTACHED_OBJECT(klass);
 
         switch (BUILTIN_TYPE(obj)) {
@@ -2013,7 +2090,7 @@ obj_method(VALUE obj, VALUE vid, int scope)
  *     obj.method(sym)    -> method
  *
  *  Looks up the named method as a receiver in <i>obj</i>, returning a
- *  Method object (or raising NameError). The Method object acts as a
+ *  +Method+ object (or raising NameError). The +Method+ object acts as a
  *  closure in <i>obj</i>'s object instance, so instance variables and
  *  the value of <code>self</code> remain available.
  *
@@ -2034,7 +2111,7 @@ obj_method(VALUE obj, VALUE vid, int scope)
  *     m = l.method("hello")
  *     m.call   #=> "Hello, @iv = Fred"
  *
- *  Note that Method implements <code>to_proc</code> method, which
+ *  Note that +Method+ implements <code>to_proc</code> method, which
  *  means it can be used with iterators.
  *
  *     [ 1, 2, 3 ].each(&method(:puts)) # => prints 3 lines to stdout
@@ -2066,6 +2143,19 @@ rb_obj_public_method(VALUE obj, VALUE vid)
     return obj_method(obj, vid, TRUE);
 }
 
+static VALUE
+rb_obj_singleton_method_lookup(VALUE arg)
+{
+    VALUE *args = (VALUE *)arg;
+    return rb_obj_method(args[0], args[1]);
+}
+
+static VALUE
+rb_obj_singleton_method_lookup_fail(VALUE arg1, VALUE arg2)
+{
+    return Qfalse;
+}
+
 /*
  *  call-seq:
  *     obj.singleton_method(sym)    -> method
@@ -2093,11 +2183,12 @@ rb_obj_public_method(VALUE obj, VALUE vid)
 VALUE
 rb_obj_singleton_method(VALUE obj, VALUE vid)
 {
-    VALUE klass = rb_singleton_class_get(obj);
+    VALUE sc = rb_singleton_class_get(obj);
+    VALUE klass;
     ID id = rb_check_id(&vid);
 
-    if (NIL_P(klass) ||
-        NIL_P(klass = RCLASS_ORIGIN(klass)) ||
+    if (NIL_P(sc) ||
+        NIL_P(klass = RCLASS_ORIGIN(sc)) ||
         !NIL_P(rb_special_singleton_class(obj))) {
         /* goto undef; */
     }
@@ -2107,22 +2198,27 @@ rb_obj_singleton_method(VALUE obj, VALUE vid)
         /* else goto undef; */
     }
     else {
-        const rb_method_entry_t *me = rb_method_entry_at(klass, id);
-        vid = ID2SYM(id);
-
-        if (UNDEFINED_METHOD_ENTRY_P(me)) {
-            /* goto undef; */
-        }
-        else if (UNDEFINED_REFINED_METHOD_P(me->def)) {
-            /* goto undef; */
-        }
-        else {
-            return mnew_from_me(me, klass, klass, obj, id, rb_cMethod, FALSE);
+        VALUE args[2] = {obj, vid};
+        VALUE ruby_method = rb_rescue(rb_obj_singleton_method_lookup, (VALUE)args, rb_obj_singleton_method_lookup_fail, Qfalse);
+        if (ruby_method) {
+            struct METHOD *method = (struct METHOD *)RTYPEDDATA_GET_DATA(ruby_method);
+            VALUE lookup_class = RBASIC_CLASS(obj);
+            VALUE stop_class = rb_class_superclass(sc);
+            VALUE method_class = method->iclass;
+
+            /* Determine if method is in singleton class, or module included in or prepended to it */
+            do {
+                if (lookup_class == method_class) {
+                    return ruby_method;
+                }
+                lookup_class = RCLASS_SUPER(lookup_class);
+            } while (lookup_class && lookup_class != stop_class);
         }
     }
 
   /* undef: */
-    rb_name_err_raise("undefined singleton method `%1$s' for `%2$s'",
+    vid = ID2SYM(id);
+    rb_name_err_raise("undefined singleton method '%1$s' for '%2$s'",
                       obj, vid);
     UNREACHABLE_RETURN(Qundef);
 }
@@ -2217,10 +2313,10 @@ rb_mod_define_method_with_visibility(int argc, VALUE *argv, VALUE mod, const str
     if (!id) id = rb_to_id(name);
 
     if (is_method) {
-        struct METHOD *method = (struct METHOD *)DATA_PTR(body);
+        struct METHOD *method = (struct METHOD *)RTYPEDDATA_GET_DATA(body);
         if (method->me->owner != mod && !RB_TYPE_P(method->me->owner, T_MODULE) &&
             !RTEST(rb_class_inherited_p(mod, method->me->owner))) {
-            if (FL_TEST(method->me->owner, FL_SINGLETON)) {
+            if (RCLASS_SINGLETON_P(method->me->owner)) {
                 rb_raise(rb_eTypeError,
                          "can't bind singleton method to a different class");
             }
@@ -2357,17 +2453,7 @@ rb_obj_define_method(int argc, VALUE *argv, VALUE obj)
 static VALUE
 top_define_method(int argc, VALUE *argv, VALUE obj)
 {
-    rb_thread_t *th = GET_THREAD();
-    VALUE klass;
-
-    klass = th->top_wrapper;
-    if (klass) {
-        rb_warning("main.define_method in the wrapped load is effective only in wrapper module");
-    }
-    else {
-        klass = rb_cObject;
-    }
-    return rb_mod_define_method(argc, argv, klass);
+    return rb_mod_define_method(argc, argv, rb_top_main_class("define_method"));
 }
 
 /*
@@ -2395,7 +2481,25 @@ method_clone(VALUE self)
 
     TypedData_Get_Struct(self, struct METHOD, &method_data_type, orig);
     clone = TypedData_Make_Struct(CLASS_OF(self), struct METHOD, &method_data_type, data);
-    CLONESETUP(clone, self);
+    rb_obj_clone_setup(self, clone, Qnil);
+    RB_OBJ_WRITE(clone, &data->recv, orig->recv);
+    RB_OBJ_WRITE(clone, &data->klass, orig->klass);
+    RB_OBJ_WRITE(clone, &data->iclass, orig->iclass);
+    RB_OBJ_WRITE(clone, &data->owner, orig->owner);
+    RB_OBJ_WRITE(clone, &data->me, rb_method_entry_clone(orig->me));
+    return clone;
+}
+
+/* :nodoc: */
+static VALUE
+method_dup(VALUE self)
+{
+    VALUE clone;
+    struct METHOD *orig, *data;
+
+    TypedData_Get_Struct(self, struct METHOD, &method_data_type, orig);
+    clone = TypedData_Make_Struct(CLASS_OF(self), struct METHOD, &method_data_type, data);
+    rb_obj_dup_setup(self, clone);
     RB_OBJ_WRITE(clone, &data->recv, orig->recv);
     RB_OBJ_WRITE(clone, &data->klass, orig->klass);
     RB_OBJ_WRITE(clone, &data->iclass, orig->iclass);
@@ -2506,7 +2610,7 @@ rb_method_call_with_block(int argc, const VALUE *argv, VALUE method, VALUE passe
  *
  * Document-class: UnboundMethod
  *
- *  Ruby supports two forms of objectified methods. Class Method is
+ *  Ruby supports two forms of objectified methods. Class +Method+ is
  *  used to represent methods that are associated with a particular
  *  object: these method objects are bound to that object. Bound
  *  method objects for an object can be created using Object#method.
@@ -2569,7 +2673,7 @@ convert_umethod_to_method_components(const struct METHOD *data, VALUE recv, VALU
         if (!NIL_P(refined_class)) methclass = refined_class;
     }
     if (!RB_TYPE_P(methclass, T_MODULE) && !RTEST(rb_obj_is_kind_of(recv, methclass))) {
-        if (FL_TEST(methclass, FL_SINGLETON)) {
+        if (RCLASS_SINGLETON_P(methclass)) {
             rb_raise(rb_eTypeError,
                      "singleton method called for a different object");
         }
@@ -2969,10 +3073,17 @@ rb_method_entry_location(const rb_method_entry_t *me)
 
 /*
  * call-seq:
- *    meth.source_location  -> [String, Integer]
+ *    meth.source_location  -> [String, Integer, Integer, Integer, Integer]
+ *
+ * Returns the location where the method was defined.
+ * The returned Array contains:
+ *   (1) the Ruby source filename
+ *   (2) the line number where the definition starts
+ *   (3) the column number where the definition starts
+ *   (4) the line number where the definition ends
+ *   (5) the column number where the definitions ends
  *
- * Returns the Ruby source filename and line number containing this method
- * or nil if this method was not defined in Ruby (i.e. native).
+ * This method will return +nil+ if the method was not defined in Ruby (i.e. native).
  */
 
 VALUE
@@ -3136,11 +3247,11 @@ method_inspect(VALUE method)
         defined_class = RBASIC_CLASS(defined_class);
     }
 
-    if (data->recv == Qundef) {
+    if (UNDEF_P(data->recv)) {
         // UnboundMethod
         rb_str_buf_append(str, rb_inspect(defined_class));
     }
-    else if (FL_TEST(mklass, FL_SINGLETON)) {
+    else if (RCLASS_SINGLETON_P(mklass)) {
         VALUE v = RCLASS_ATTACHED_OBJECT(mklass);
 
         if (UNDEF_P(data->recv)) {
@@ -3160,7 +3271,7 @@ method_inspect(VALUE method)
     }
     else {
         mklass = data->klass;
-        if (FL_TEST(mklass, FL_SINGLETON)) {
+        if (RCLASS_SINGLETON_P(mklass)) {
             VALUE v = RCLASS_ATTACHED_OBJECT(mklass);
             if (!(RB_TYPE_P(v, T_CLASS) || RB_TYPE_P(v, T_MODULE))) {
                 do {
@@ -3347,7 +3458,7 @@ extern VALUE rb_find_defined_class_by_owner(VALUE current_class, VALUE target_ow
  * call-seq:
  *   meth.super_method  -> method
  *
- * Returns a Method of superclass which would be called when super is used
+ * Returns a +Method+ of superclass which would be called when super is used
  * or nil if there is no method on superclass.
  */
 
@@ -3420,9 +3531,15 @@ env_clone(const rb_env_t *env, const rb_cref_t *cref)
     }
 
     new_body = ALLOC_N(VALUE, env->env_size);
-    MEMCPY(new_body, env->env, VALUE, env->env_size);
     new_ep = &new_body[env->ep - env->env];
     new_env = vm_env_new(new_ep, new_body, env->env_size, env->iseq);
+
+    /* The memcpy has to happen after the vm_env_new because it can trigger a
+     * GC compaction which can move the objects in the env. */
+    MEMCPY(new_body, env->env, VALUE, env->env_size);
+    /* VM_ENV_DATA_INDEX_ENV is set in vm_env_new but will get overwritten
+     * by the memcpy above. */
+    new_ep[VM_ENV_DATA_INDEX_ENV] = (VALUE)new_env;
     RB_OBJ_WRITE(new_env, &new_ep[VM_ENV_DATA_INDEX_ME_CREF], (VALUE)cref);
     VM_ASSERT(VM_ENV_ESCAPED_P(new_ep));
     return new_env;
@@ -3479,7 +3596,7 @@ proc_binding(VALUE self)
                 env = VM_ENV_ENVVAL_PTR(block->as.captured.ep);
                 env = env_clone(env, method_cref(method));
                 /* set empty iseq */
-                empty = rb_iseq_new(NULL, name, name, Qnil, 0, ISEQ_TYPE_TOP);
+                empty = rb_iseq_new(Qnil, name, name, Qnil, 0, ISEQ_TYPE_TOP);
                 RB_OBJ_WRITE(env, &env->iseq, empty);
                 break;
             }
@@ -4135,7 +4252,6 @@ proc_ruby2_keywords(VALUE procval)
  * a proc by the <code>&</code> operator, and therefore can be
  * consumed by iterators.
  *
-
  *      class Greeter
  *        def initialize(greeting)
  *          @greeting = greeting
@@ -4151,8 +4267,8 @@ proc_ruby2_keywords(VALUE procval)
  *      ["Bob", "Jane"].map(&hi)    #=> ["Hi, Bob!", "Hi, Jane!"]
  *      ["Bob", "Jane"].map(&hey)   #=> ["Hey, Bob!", "Hey, Jane!"]
  *
- * Of the Ruby core classes, this method is implemented by Symbol,
- * Method, and Hash.
+ * Of the Ruby core classes, this method is implemented by +Symbol+,
+ * +Method+, and +Hash+.
  *
  *      :to_s.to_proc.call(1)           #=> "1"
  *      [1, 2].map(&:to_s)              #=> ["1", "2"]
@@ -4186,19 +4302,86 @@ proc_ruby2_keywords(VALUE procval)
  * Since +return+ and +break+ exits the block itself in lambdas,
  * lambdas cannot be orphaned.
  *
- * == Numbered parameters
+ * == Anonymous block parameters
  *
- * Numbered parameters are implicitly defined block parameters intended to
- * simplify writing short blocks:
+ * To simplify writing short blocks, Ruby provides two different types of
+ * anonymous parameters: +it+ (single parameter) and numbered ones: <tt>_1</tt>,
+ * <tt>_2</tt> and so on.
  *
  *     # 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:
+ *     # it:
+ *     %w[test me please].each { puts it.upcase } # prints TEST, ME, PLEASE
+ *     (1..5).map { it**2 } # => [1, 4, 9, 16, 25]
+ *
+ *     # Numbered parameter:
  *     %w[test me please].each { puts _1.upcase } # prints TEST, ME, PLEASE
  *     (1..5).map { _1**2 } # => [1, 4, 9, 16, 25]
  *
+ * === +it+
+ *
+ * +it+ is a name that is available inside a block when no explicit parameters
+ * defined, as shown above.
+ *
+ *     %w[test me please].each { puts it.upcase } # prints TEST, ME, PLEASE
+ *     (1..5).map { it**2 } # => [1, 4, 9, 16, 25]
+ *
+ * +it+ is a "soft keyword": it is not a reserved name, and can be used as
+ * a name for methods and local variables:
+ *
+ *      it = 5 # no warnings
+ *      def it(&block) # RSpec-like API, no warnings
+ *         # ...
+ *      end
+ *
+ * +it+ can be used as a local variable even in blocks that use it as an
+ * implicit parameter (though this style is obviously confusing):
+ *
+ *      [1, 2, 3].each {
+ *        # takes a value of implicit parameter "it" and uses it to
+ *        # define a local variable with the same name
+ *        it = it**2
+ *        p it
+ *      }
+ *
+ * In a block with explicit parameters defined +it+ usage raises an exception:
+ *
+ *      [1, 2, 3].each { |x| p it }
+ *      # syntax error found (SyntaxError)
+ *      # [1, 2, 3].each { |x| p it }
+ *      #                        ^~ 'it' is not allowed when an ordinary parameter is defined
+ *
+ * But if a local name (variable or method) is available, it would be used:
+ *
+ *      it = 5
+ *      [1, 2, 3].each { |x| p it }
+ *      # Prints 5, 5, 5
+ *
+ * Blocks using +it+ can be nested:
+ *
+ *     %w[test me].each { it.each_char { p it } }
+ *     # Prints "t", "e", "s", "t", "m", "e"
+ *
+ * Blocks using +it+ are considered to have one parameter:
+ *
+ *     p = proc { it**2 }
+ *     l = lambda { it**2 }
+ *     p.parameters     # => [[:opt]]
+ *     p.arity          # => 1
+ *     l.parameters     # => [[:req]]
+ *     l.arity          # => 1
+ *
+ * === Numbered parameters
+ *
+ * Numbered parameters are another way to name block parameters implicitly.
+ * Unlike +it+, numbered parameters allow to refer to several parameters
+ * in one block.
+ *
+ *     %w[test me please].each { puts _1.upcase } # prints TEST, ME, PLEASE
+ *     {a: 100, b: 200}.map { "#{_1} = #{_2}" } # => "a = 100", "b = 200"
+ *
  * Parameter names from +_1+ to +_9+ are supported:
  *
  *     [10, 20, 30].zip([40, 50, 60], [70, 80, 90]).map { _1 + _2 + _3 }
@@ -4213,11 +4396,16 @@ proc_ruby2_keywords(VALUE procval)
  *     [10, 20, 30].map { |x| _1**2 }
  *     # SyntaxError (ordinary parameter is defined)
  *
+ * Numbered parameters can't be mixed with +it+ either:
+ *
+ *     [10, 20, 30].map { _1 + it }
+ *     # SyntaxError: 'it' is not allowed when a numbered parameter is already used
+ *
  * To avoid conflicts, naming local variables or method
- * arguments +_1+, +_2+ and so on, causes a warning.
+ * arguments +_1+, +_2+ and so on, causes an error.
  *
- *     _1 = 'test'
- *     # warning: `_1' is reserved as numbered parameter
+ *       _1 = 'test'
+ *     # ^~ _1 is reserved for numbered parameters (SyntaxError)
  *
  * Using implicit numbered parameters affects block's arity:
  *
@@ -4231,14 +4419,12 @@ proc_ruby2_keywords(VALUE procval)
  * 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)
+ *     # numbered parameter is already used in outer block (SyntaxError)
  *     # %w[test me].each { _1.each_char { p _1 } }
  *     #                    ^~
  *
- * Numbered parameters were introduced in Ruby 2.7.
  */
 
-
 void
 Init_Proc(void)
 {
@@ -4263,7 +4449,7 @@ Init_Proc(void)
     rb_define_method(rb_cProc, "to_proc", proc_to_proc, 0);
     rb_define_method(rb_cProc, "arity", proc_arity, 0);
     rb_define_method(rb_cProc, "clone", proc_clone, 0);
-    rb_define_method(rb_cProc, "dup", rb_proc_dup, 0);
+    rb_define_method(rb_cProc, "dup", proc_dup, 0);
     rb_define_method(rb_cProc, "hash", proc_hash, 0);
     rb_define_method(rb_cProc, "to_s", proc_to_s, 0);
     rb_define_alias(rb_cProc, "inspect", "to_s");
@@ -4299,6 +4485,7 @@ Init_Proc(void)
     rb_define_method(rb_cMethod, "eql?", method_eq, 1);
     rb_define_method(rb_cMethod, "hash", method_hash, 0);
     rb_define_method(rb_cMethod, "clone", method_clone, 0);
+    rb_define_method(rb_cMethod, "dup", method_dup, 0);
     rb_define_method(rb_cMethod, "call", rb_method_call_pass_called_kw, -1);
     rb_define_method(rb_cMethod, "===", rb_method_call_pass_called_kw, -1);
     rb_define_method(rb_cMethod, "curry", rb_method_curry, -1);
@@ -4321,6 +4508,8 @@ Init_Proc(void)
     rb_define_method(rb_mKernel, "public_method", rb_obj_public_method, 1);
     rb_define_method(rb_mKernel, "singleton_method", rb_obj_singleton_method, 1);
 
+    rb_define_method(rb_cMethod, "namespace", method_namespace, 0);
+
     /* UnboundMethod */
     rb_cUnboundMethod = rb_define_class("UnboundMethod", rb_cObject);
     rb_undef_alloc_func(rb_cUnboundMethod);
@@ -4329,6 +4518,7 @@ Init_Proc(void)
     rb_define_method(rb_cUnboundMethod, "eql?", unbound_method_eq, 1);
     rb_define_method(rb_cUnboundMethod, "hash", method_hash, 0);
     rb_define_method(rb_cUnboundMethod, "clone", method_clone, 0);
+    rb_define_method(rb_cUnboundMethod, "dup", method_dup, 0);
     rb_define_method(rb_cUnboundMethod, "arity", method_arity_m, 0);
     rb_define_method(rb_cUnboundMethod, "inspect", method_inspect, 0);
     rb_define_method(rb_cUnboundMethod, "to_s", method_inspect, 0);
@@ -4391,6 +4581,8 @@ Init_Proc(void)
 void
 Init_Binding(void)
 {
+    rb_gc_register_address(&sym_proc_cache);
+
     rb_cBinding = rb_define_class("Binding", rb_cObject);
     rb_undef_alloc_func(rb_cBinding);
     rb_undef_method(CLASS_OF(rb_cBinding), "new");
diff --git a/process.c b/process.c
index acb74c2d47b167..da9ce74027ce3c 100644
--- a/process.c
+++ b/process.c
@@ -110,11 +110,11 @@ int initgroups(const char *, rb_gid_t);
 #include "internal/thread.h"
 #include "internal/variable.h"
 #include "internal/warnings.h"
-#include "rjit.h"
 #include "ruby/io.h"
 #include "ruby/st.h"
 #include "ruby/thread.h"
 #include "ruby/util.h"
+#include "ractor_core.h"
 #include "vm_core.h"
 #include "vm_sync.h"
 #include "ruby/ractor.h"
@@ -566,30 +566,20 @@ proc_get_ppid(VALUE _)
  *
  * Document-class: Process::Status
  *
- *  Process::Status encapsulates the information on the
- *  status of a running or terminated system process. The built-in
- *  variable <code>$?</code> is either +nil+ or a
- *  Process::Status object.
- *
- *     fork { exit 99 }   #=> 26557
- *     Process.wait       #=> 26557
- *     $?.class           #=> Process::Status
- *     $?.to_i            #=> 25344
- *     $? >> 8            #=> 99
- *     $?.stopped?        #=> false
- *     $?.exited?         #=> true
- *     $?.exitstatus      #=> 99
- *
- *  Posix systems record information on processes using a 16-bit
- *  integer.  The lower bits record the process status (stopped,
- *  exited, signaled) and the upper bits possibly contain additional
- *  information (for example the program's return code in the case of
- *  exited processes). Pre Ruby 1.8, these bits were exposed directly
- *  to the Ruby program. Ruby now encapsulates these in a
- *  Process::Status object. To maximize compatibility,
- *  however, these objects retain a bit-oriented interface. In the
- *  descriptions that follow, when we talk about the integer value of
- *  _stat_, we're referring to this 16 bit value.
+ *  A Process::Status contains information about a system process.
+ *
+ *  Thread-local variable <tt>$?</tt> is initially +nil+.
+ *  Some methods assign to it a Process::Status object
+ *  that represents a system process (either running or terminated):
+ *
+ *    `ruby -e "exit 99"`
+ *    stat = $?       # => #<Process::Status: pid 1262862 exit 99>
+ *    stat.class      # => Process::Status
+ *    stat.to_i       # => 25344
+ *    stat.stopped?   # => false
+ *    stat.exited?    # => true
+ *    stat.exitstatus # => 99
+ *
  */
 
 static VALUE rb_cProcessStatus;
@@ -603,17 +593,17 @@ struct rb_process_status {
 static const rb_data_type_t rb_process_status_type = {
     .wrap_struct_name = "Process::Status",
     .function = {
+        .dmark = NULL,
         .dfree = RUBY_DEFAULT_FREE,
+        .dsize = NULL,
     },
-    .data = NULL,
-    .flags = RUBY_TYPED_FREE_IMMEDIATELY,
+    .flags = RUBY_TYPED_FREE_IMMEDIATELY | RUBY_TYPED_WB_PROTECTED | RUBY_TYPED_EMBEDDABLE,
 };
 
 static VALUE
 rb_process_status_allocate(VALUE klass)
 {
-    struct rb_process_status *data = NULL;
-
+    struct rb_process_status *data;
     return TypedData_Make_Struct(klass, struct rb_process_status, &rb_process_status_type, data);
 }
 
@@ -655,8 +645,7 @@ VALUE
 rb_process_status_new(rb_pid_t pid, int status, int error)
 {
     VALUE last_status = rb_process_status_allocate(rb_cProcessStatus);
-
-    struct rb_process_status *data = RTYPEDDATA_DATA(last_status);
+    struct rb_process_status *data = RTYPEDDATA_GET_DATA(last_status);
     data->pid = pid;
     data->status = status;
     data->error = error;
@@ -669,7 +658,8 @@ static VALUE
 process_status_dump(VALUE status)
 {
     VALUE dump = rb_class_new_instance(0, 0, rb_cObject);
-    struct rb_process_status *data = RTYPEDDATA_DATA(status);
+    struct rb_process_status *data;
+    TypedData_Get_Struct(status, struct rb_process_status, &rb_process_status_type, data);
     if (data->pid) {
         rb_ivar_set(dump, id_status, INT2NUM(data->status));
         rb_ivar_set(dump, id_pid, PIDT2NUM(data->pid));
@@ -694,36 +684,42 @@ rb_last_status_set(int status, rb_pid_t pid)
     GET_THREAD()->last_status = rb_process_status_new(pid, status, 0);
 }
 
+static void
+last_status_clear(rb_thread_t *th)
+{
+    th->last_status = Qnil;
+}
+
 void
 rb_last_status_clear(void)
 {
-    GET_THREAD()->last_status = Qnil;
+    last_status_clear(GET_THREAD());
 }
 
 static rb_pid_t
-pst_pid(VALUE pst)
+pst_pid(VALUE status)
 {
-    struct rb_process_status *data = RTYPEDDATA_DATA(pst);
+    struct rb_process_status *data;
+    TypedData_Get_Struct(status, struct rb_process_status, &rb_process_status_type, data);
     return data->pid;
 }
 
 static int
-pst_status(VALUE pst)
+pst_status(VALUE status)
 {
-    struct rb_process_status *data = RTYPEDDATA_DATA(pst);
+    struct rb_process_status *data;
+    TypedData_Get_Struct(status, struct rb_process_status, &rb_process_status_type, data);
     return data->status;
 }
 
 /*
  *  call-seq:
- *     stat.to_i     -> integer
+ *    to_i     -> integer
  *
- *  Returns the bits in _stat_ as an Integer. Poking
- *  around in these bits is platform dependent.
+ *  Returns the system-dependent integer status of +self+:
  *
- *     fork { exit 0xab }         #=> 26566
- *     Process.wait               #=> 26566
- *     sprintf('%04x', $?.to_i)   #=> "ab00"
+ *    `cat /nop`
+ *    $?.to_i # => 256
  */
 
 static VALUE
@@ -737,13 +733,13 @@ pst_to_i(VALUE self)
 
 /*
  *  call-seq:
- *     stat.pid   -> integer
+ *    pid -> integer
  *
- *  Returns the process ID that this status object represents.
+ *  Returns the process ID of the process:
+ *
+ *    system("false")
+ *    $?.pid # => 1247002
  *
- *     fork { exit }   #=> 26569
- *     Process.wait    #=> 26569
- *     $?.pid          #=> 26569
  */
 
 static VALUE
@@ -799,12 +795,13 @@ pst_message_status(VALUE str, int status)
 
 /*
  *  call-seq:
- *     stat.to_s   -> string
+ *    to_s -> string
  *
- *  Show pid and exit status as a string.
+ *  Returns a string representation of +self+:
+ *
+ *    `cat /nop`
+ *    $?.to_s # => "pid 1262141 exit 1"
  *
- *    system("false")
- *    p $?.to_s         #=> "pid 12766 exit 1"
  *
  */
 
@@ -826,12 +823,12 @@ pst_to_s(VALUE st)
 
 /*
  *  call-seq:
- *     stat.inspect   -> string
+ *    inspect -> string
  *
- *  Override the inspection method.
+ *  Returns a string representation of +self+:
  *
  *    system("false")
- *    p $?.inspect #=> "#<Process::Status: pid 12861 exit 1>"
+ *    $?.inspect # => "#<Process::Status: pid 1303494 exit 1>"
  *
  */
 
@@ -857,10 +854,15 @@ pst_inspect(VALUE st)
 
 /*
  *  call-seq:
- *     stat == other   -> true or false
+ *    stat == other -> true or false
+ *
+ *  Returns whether the value of #to_i == +other+:
+ *
+ *    `cat /nop`
+ *    stat = $?                # => #<Process::Status: pid 1170366 exit 1>
+ *    sprintf('%x', stat.to_i) # => "100"
+ *    stat == 0x100            # => true
  *
- *  Returns +true+ if the integer value of _stat_
- *  equals <em>other</em>.
  */
 
 static VALUE
@@ -873,53 +875,11 @@ pst_equal(VALUE st1, VALUE st2)
 
 /*
  *  call-seq:
- *     stat & num   -> integer
- *
- *  Logical AND of the bits in _stat_ with <em>num</em>.
- *
- *     fork { exit 0x37 }
- *     Process.wait
- *     sprintf('%04x', $?.to_i)       #=> "3700"
- *     sprintf('%04x', $? & 0x1e00)   #=> "1600"
- */
-
-static VALUE
-pst_bitand(VALUE st1, VALUE st2)
-{
-    int status = PST2INT(st1) & NUM2INT(st2);
-
-    return INT2NUM(status);
-}
-
-
-/*
- *  call-seq:
- *     stat >> num   -> integer
- *
- *  Shift the bits in _stat_ right <em>num</em> places.
+ *    stopped? -> true or false
  *
- *     fork { exit 99 }   #=> 26563
- *     Process.wait       #=> 26563
- *     $?.to_i            #=> 25344
- *     $? >> 8            #=> 99
- */
-
-static VALUE
-pst_rshift(VALUE st1, VALUE st2)
-{
-    int status = PST2INT(st1) >> NUM2INT(st2);
-
-    return INT2NUM(status);
-}
-
-
-/*
- *  call-seq:
- *     stat.stopped?   -> true or false
- *
- *  Returns +true+ if this process is stopped. This is only returned
- *  if the corresponding #wait call had the Process::WUNTRACED flag
- *  set.
+ *  Returns +true+ if this process is stopped,
+ *  and if the corresponding #wait call had the Process::WUNTRACED flag set,
+ *  +false+ otherwise.
  */
 
 static VALUE
@@ -933,10 +893,10 @@ pst_wifstopped(VALUE st)
 
 /*
  *  call-seq:
- *     stat.stopsig   -> integer or nil
+ *    stopsig -> integer or nil
  *
- *  Returns the number of the signal that caused _stat_ to stop
- *  (or +nil+ if self is not stopped).
+ *  Returns the number of the signal that caused the process to stop,
+ *  or +nil+ if the process is not stopped.
  */
 
 static VALUE
@@ -952,10 +912,10 @@ pst_wstopsig(VALUE st)
 
 /*
  *  call-seq:
- *     stat.signaled?   -> true or false
+ *    signaled? -> true or false
  *
- *  Returns +true+ if _stat_ terminated because of
- *  an uncaught signal.
+ *  Returns +true+ if the process terminated because of an uncaught signal,
+ *  +false+ otherwise.
  */
 
 static VALUE
@@ -969,11 +929,10 @@ pst_wifsignaled(VALUE st)
 
 /*
  *  call-seq:
- *     stat.termsig   -> integer or nil
+ *    termsig -> integer or nil
  *
- *  Returns the number of the signal that caused _stat_ to
- *  terminate (or +nil+ if self was not terminated by an
- *  uncaught signal).
+ *  Returns the number of the signal that caused the process to terminate
+ *  or +nil+ if the process was not terminated by an uncaught signal.
  */
 
 static VALUE
@@ -989,11 +948,11 @@ pst_wtermsig(VALUE st)
 
 /*
  *  call-seq:
- *     stat.exited?   -> true or false
+ *    exited? -> true or false
  *
- *  Returns +true+ if _stat_ exited normally (for
- *  example using an <code>exit()</code> call or finishing the
- *  program).
+ *  Returns +true+ if the process exited normally
+ *  (for example using an <code>exit()</code> call or finishing the
+ *  program), +false+ if not.
  */
 
 static VALUE
@@ -1007,20 +966,15 @@ pst_wifexited(VALUE st)
 
 /*
  *  call-seq:
- *     stat.exitstatus   -> integer or nil
+ *    exitstatus -> integer or nil
  *
- *  Returns the least significant eight bits of the return code of
- *  _stat_. Only available if #exited? is +true+.
+ *  Returns the least significant eight bits of the return code
+ *  of the process if it has exited;
+ *  +nil+ otherwise:
  *
- *     fork { }           #=> 26572
- *     Process.wait       #=> 26572
- *     $?.exited?         #=> true
- *     $?.exitstatus      #=> 0
+ *    `exit 99`
+ *    $?.exitstatus # => 99
  *
- *     fork { exit 99 }   #=> 26573
- *     Process.wait       #=> 26573
- *     $?.exited?         #=> true
- *     $?.exitstatus      #=> 99
  */
 
 static VALUE
@@ -1036,10 +990,14 @@ pst_wexitstatus(VALUE st)
 
 /*
  *  call-seq:
- *     stat.success?   -> true, false or nil
+ *    success? -> true, false, or nil
+ *
+ *  Returns:
+ *
+ *  - +true+ if the process has completed successfully and exited.
+ *  - +false+ if the process has completed unsuccessfully and exited.
+ *  - +nil+ if the process has not exited.
  *
- *  Returns +true+ if _stat_ is successful, +false+ if not.
- *  Returns +nil+ if #exited? is not +true+.
  */
 
 static VALUE
@@ -1055,10 +1013,12 @@ pst_success_p(VALUE st)
 
 /*
  *  call-seq:
- *     stat.coredump?   -> true or false
+ *    coredump? -> true or false
+ *
+ *  Returns +true+ if the process generated a coredump
+ *  when it terminated, +false+ if not.
  *
- *  Returns +true+ if _stat_ generated a coredump
- *  when it terminated. Not available on all platforms.
+ *  Not available on all platforms.
  */
 
 static VALUE
@@ -1137,8 +1097,10 @@ rb_process_status_wait(rb_pid_t pid, int flags)
     // We only enter the scheduler if we are "blocking":
     if (!(flags & WNOHANG)) {
         VALUE scheduler = rb_fiber_scheduler_current();
-        VALUE result = rb_fiber_scheduler_process_wait(scheduler, pid, flags);
-        if (!UNDEF_P(result)) return result;
+        if (scheduler != Qnil) {
+            VALUE result = rb_fiber_scheduler_process_wait(scheduler, pid, flags);
+            if (!UNDEF_P(result)) return result;
+        }
     }
 
     struct waitpid_state waitpid_state;
@@ -1155,46 +1117,32 @@ rb_process_status_wait(rb_pid_t pid, int flags)
 
 /*
  *  call-seq:
- *     Process::Status.wait(pid=-1, flags=0)      -> Process::Status
+ *     Process::Status.wait(pid = -1, flags = 0) -> Process::Status
  *
- *  Waits for a child process to exit and returns a Process::Status object
- *  containing information on that process. Which child it waits on
- *  depends on the value of _pid_:
+ *  Like Process.wait, but returns a Process::Status object
+ *  (instead of an integer pid or nil);
+ *  see Process.wait for the values of +pid+ and +flags+.
  *
- *  > 0::   Waits for the child whose process ID equals _pid_.
+ *  If there are child processes,
+ *  waits for a child process to exit and returns a Process::Status object
+ *  containing information on that process;
+ *  sets thread-local variable <tt>$?</tt>:
  *
- *  0::     Waits for any child whose process group ID equals that of the
- *          calling process.
+ *    Process.spawn('cat /nop') # => 1155880
+ *    Process::Status.wait      # => #<Process::Status: pid 1155880 exit 1>
+ *    $?                        # => #<Process::Status: pid 1155508 exit 1>
  *
- *  -1::    Waits for any child process (the default if no _pid_ is
- *          given).
+ *  If there is no child process,
+ *  returns an "empty" Process::Status object
+ *  that does not represent an actual process;
+ *  does not set thread-local variable <tt>$?</tt>:
  *
- *  < -1::  Waits for any child whose process group ID equals the absolute
- *          value of _pid_.
+ *    Process::Status.wait # => #<Process::Status: pid -1 exit 0>
+ *    $?                   # => #<Process::Status: pid 1155508 exit 1> # Unchanged.
  *
- *  The _flags_ argument may be a logical or of the flag values
- *  Process::WNOHANG (do not block if no child available)
- *  or Process::WUNTRACED (return stopped children that
- *  haven't been reported). Not all flags are available on all
- *  platforms, but a flag value of zero will work on all platforms.
+ *  May invoke the scheduler hook Fiber::Scheduler#process_wait.
  *
- *  Returns +nil+ if there are no child processes.
  *  Not available on all platforms.
- *
- *  May invoke the scheduler hook _process_wait_.
- *
- *     fork { exit 99 }                              #=> 27429
- *     Process::Status.wait                          #=> pid 27429 exit 99
- *     $?                                            #=> nil
- *
- *     pid = fork { sleep 3 }                        #=> 27440
- *     Time.now                                      #=> 2008-03-08 19:56:16 +0900
- *     Process::Status.wait(pid, Process::WNOHANG)   #=> nil
- *     Time.now                                      #=> 2008-03-08 19:56:16 +0900
- *     Process::Status.wait(pid, 0)                  #=> pid 27440 exit 99
- *     Time.now                                      #=> 2008-03-08 19:56:19 +0900
- *
- *  This is an EXPERIMENTAL FEATURE.
  */
 
 static VALUE
@@ -1403,7 +1351,7 @@ proc_wait(int argc, VALUE *argv)
  *  or as the logical OR of both:
  *
  *  - Process::WNOHANG: Does not block if no child process is available.
- *  - Process:WUNTRACED: May return a stopped child process, even if not yet reported.
+ *  - Process::WUNTRACED: May return a stopped child process, even if not yet reported.
  *
  *  Not all flags are available on all platforms.
  *
@@ -1430,7 +1378,7 @@ proc_m_wait(int c, VALUE *v, VALUE _)
  *    Process.wait2(pid)
  *    # => [309581, #<Process::Status: pid 309581 exit 13>]
  *
- *  Process.waitpid2 is an alias for Process.waitpid.
+ *  Process.waitpid2 is an alias for Process.wait2.
  */
 
 static VALUE
@@ -1616,42 +1564,35 @@ before_exec(void)
     before_exec_async_signal_safe();
 }
 
-/* This function should be async-signal-safe.  Actually it is. */
 static void
-after_exec_async_signal_safe(void)
-{
-}
-
-static void
-after_exec_non_async_signal_safe(void)
+after_exec(void)
 {
     rb_thread_reset_timer_thread();
     rb_thread_start_timer_thread();
 }
 
-static void
-after_exec(void)
-{
-    after_exec_async_signal_safe();
-    after_exec_non_async_signal_safe();
-}
-
 #if defined HAVE_WORKING_FORK || defined HAVE_DAEMON
 static void
 before_fork_ruby(void)
 {
+    rb_gc_before_fork();
     before_exec();
 }
 
 static void
 after_fork_ruby(rb_pid_t pid)
 {
-    rb_threadptr_pending_interrupt_clear(GET_THREAD());
+    rb_gc_after_fork(pid);
+
     if (pid == 0) {
+        // child
         clear_pid_cache();
         rb_thread_atfork();
     }
-    after_exec();
+    else {
+        // parent
+        after_exec();
+    }
 }
 #endif
 
@@ -1799,7 +1740,7 @@ memsize_exec_arg(const void *ptr)
 static const rb_data_type_t exec_arg_data_type = {
     "exec_arg",
     {mark_exec_arg, RUBY_TYPED_DEFAULT_FREE, memsize_exec_arg},
-    0, 0, RUBY_TYPED_FREE_IMMEDIATELY
+    0, 0, RUBY_TYPED_FREE_IMMEDIATELY | RUBY_TYPED_EMBEDDABLE
 };
 
 #ifdef _WIN32
@@ -2442,12 +2383,12 @@ rb_check_argv(int argc, VALUE *argv)
         }
         prog = RARRAY_AREF(tmp, 0);
         argv[0] = RARRAY_AREF(tmp, 1);
-        SafeStringValue(prog);
+        StringValue(prog);
         StringValueCStr(prog);
         prog = rb_str_new_frozen(prog);
     }
     for (i = 0; i < argc; i++) {
-        SafeStringValue(argv[i]);
+        StringValue(argv[i]);
         argv[i] = rb_str_new_frozen(argv[i]);
         StringValueCStr(argv[i]);
     }
@@ -2743,6 +2684,7 @@ rb_execarg_setenv(VALUE execarg_obj, VALUE env)
     struct rb_execarg *eargp = rb_execarg_get(execarg_obj);
     env = !NIL_P(env) ? rb_check_exec_env(env, &eargp->path_env) : Qfalse;
     eargp->env_modification = env;
+    RB_GC_GUARD(execarg_obj);
 }
 
 static int
@@ -2940,6 +2882,7 @@ execarg_parent_end(VALUE execarg_obj)
     }
 
     errno = err;
+    RB_GC_GUARD(execarg_obj);
     return execarg_obj;
 }
 
@@ -3031,7 +2974,7 @@ NORETURN(static VALUE f_exec(int c, const VALUE *a, VALUE _));
  *
  *  - +command_line+ if it is a string,
  *    and if it begins with a shell reserved word or special built-in,
- *    or if it contains one or more metacharacters.
+ *    or if it contains one or more meta characters.
  *  - +exe_path+ otherwise.
  *
  *  <b>Argument +command_line+</b>
@@ -3040,8 +2983,8 @@ NORETURN(static VALUE f_exec(int c, const VALUE *a, VALUE _));
  *  it must begin with a shell reserved word, begin with a special built-in,
  *  or contain meta characters:
  *
- *    exec('echo')                         # Built-in.
  *    exec('if true; then echo "Foo"; fi') # Shell reserved word.
+ *    exec('exit')                         # Built-in.
  *    exec('date > date.tmp')              # Contains meta character.
  *
  *  The command line may also contain arguments and options for the command:
@@ -3052,21 +2995,7 @@ NORETURN(static VALUE f_exec(int c, const VALUE *a, VALUE _));
  *
  *    Foo
  *
- *  On a Unix-like system, the shell is <tt>/bin/sh</tt>;
- *  otherwise the shell is determined by environment variable
- *  <tt>ENV['RUBYSHELL']</tt>, if defined, or <tt>ENV['COMSPEC']</tt> otherwise.
- *
- *  Except for the +COMSPEC+ case,
- *  the entire string +command_line+ is passed as an argument
- *  to {shell option -c}[https://pubs.opengroup.org/onlinepubs/9699919799.2018edition/utilities/sh.html].
- *
- *  The shell performs normal shell expansion on the command line:
- *
- *    exec('echo C*')
- *
- *  Output:
- *
- *    CONTRIBUTING.md COPYING COPYING.ja
+ *  See {Execution Shell}[rdoc-ref:Process@Execution+Shell] for details about the shell.
  *
  *  Raises an exception if the new process could not execute.
  *
@@ -3086,7 +3015,9 @@ NORETURN(static VALUE f_exec(int c, const VALUE *a, VALUE _));
  *
  *    Sat Aug 26 09:38:00 AM CDT 2023
  *
- *  Ruby invokes the executable directly, with no shell and no shell expansion:
+ *  Ruby invokes the executable directly.
+ *  This form does not use the shell;
+ *  see {Arguments args}[rdoc-ref:Process@Arguments+args] for caveats.
  *
  *    exec('doesnt_exist') # Raises Errno::ENOENT
  *
@@ -3111,9 +3042,13 @@ f_exec(int c, const VALUE *a, VALUE _)
     UNREACHABLE_RETURN(Qnil);
 }
 
-#define ERRMSG(str) do { if (errmsg && 0 < errmsg_buflen) strlcpy(errmsg, (str), errmsg_buflen); } while (0)
-#define ERRMSG1(str, a) do { if (errmsg && 0 < errmsg_buflen) snprintf(errmsg, errmsg_buflen, (str), (a)); } while (0)
-#define ERRMSG2(str, a, b) do { if (errmsg && 0 < errmsg_buflen) snprintf(errmsg, errmsg_buflen, (str), (a), (b)); } while (0)
+#define ERRMSG(str) \
+    ((errmsg && 0 < errmsg_buflen) ? \
+     (void)strlcpy(errmsg, (str), errmsg_buflen) : (void)0)
+
+#define ERRMSG_FMT(...) \
+    ((errmsg && 0 < errmsg_buflen) ? \
+     (void)snprintf(errmsg, errmsg_buflen, __VA_ARGS__) : (void)0)
 
 static int fd_get_cloexec(int fd, char *errmsg, size_t errmsg_buflen);
 static int fd_set_cloexec(int fd, char *errmsg, size_t errmsg_buflen);
@@ -3326,6 +3261,14 @@ run_exec_dup2(VALUE ary, VALUE tmpbuf, struct rb_execarg *sargp, char *errmsg, s
                 ERRMSG("dup");
                 goto fail;
             }
+            // without this, kqueue timer_th.event_fd fails with a reserved FD did not have close-on-exec
+            //   in #assert_close_on_exec because the FD_CLOEXEC is not dup'd by default
+            if (fd_get_cloexec(pairs[i].oldfd, errmsg, errmsg_buflen)) {
+                if (fd_set_cloexec(extra_fd, errmsg, errmsg_buflen)) {
+                    close(extra_fd);
+                    goto fail;
+                }
+            }
             rb_update_max_fd(extra_fd);
         }
         else {
@@ -4156,7 +4099,7 @@ fork_check_err(struct rb_process_status *status, int (*chfunc)(void*, char *, si
  * The "async_signal_safe" name is a lie, but it is used by pty.c and
  * maybe other exts.  fork() is not async-signal-safe due to pthread_atfork
  * and future POSIX revisions will remove it from a list of signal-safe
- * functions.  rb_waitpid is not async-signal-safe since RJIT, either.
+ * functions.  rb_waitpid is not async-signal-safe.
  * For our purposes, we do not need async-signal-safety, here
  */
 rb_pid_t
@@ -4175,47 +4118,47 @@ rb_fork_async_signal_safe(int *status,
     return result;
 }
 
-static rb_pid_t
-rb_fork_ruby2(struct rb_process_status *status)
+rb_pid_t
+rb_fork_ruby(int *status)
 {
+    if (UNLIKELY(!rb_ractor_main_p())) {
+        rb_raise(rb_eRactorIsolationError, "can not fork from non-main Ractors");
+    }
+
+    struct rb_process_status child = {.status = 0};
     rb_pid_t pid;
-    int try_gc = 1, err;
+    int try_gc = 1, err = 0;
     struct child_handler_disabler_state old;
 
-    if (status) status->status = 0;
-
-    while (1) {
+    do {
         prefork();
-        disable_child_handler_before_fork(&old);
+
         before_fork_ruby();
-        pid = rb_fork();
-        err = errno;
-        if (status) {
-            status->pid = pid;
-            status->error = err;
-        }
-        after_fork_ruby(pid);
-        disable_child_handler_fork_parent(&old); /* yes, bad name */
+        rb_thread_acquire_fork_lock();
+        disable_child_handler_before_fork(&old);
 
-        if (pid >= 0) { /* fork succeed */
-            return pid;
+        RB_VM_LOCKING() {
+            child.pid = pid = rb_fork();
+            child.error = err = errno;
         }
 
-        /* fork failed */
-        if (handle_fork_error(err, status, NULL, &try_gc)) {
-            return -1;
+        disable_child_handler_fork_parent(&old); /* yes, bad name */
+        if (
+#if defined(__FreeBSD__)
+            pid != 0 &&
+#endif
+            true) {
+            rb_thread_release_fork_lock();
         }
-    }
-}
-
-rb_pid_t
-rb_fork_ruby(int *status)
-{
-    struct rb_process_status process_status = {0};
+        if (pid == 0) {
+            rb_thread_reset_fork_lock();
+        }
+        after_fork_ruby(pid);
 
-    rb_pid_t pid = rb_fork_ruby2(&process_status);
+        /* repeat while fork failed but retryable */
+    } while (pid < 0 && handle_fork_error(err, &child, NULL, &try_gc) == 0);
 
-    if (status) *status = process_status.status;
+    if (status) *status = child.status;
 
     return pid;
 }
@@ -4639,11 +4582,16 @@ static VALUE
 do_spawn_process(VALUE arg)
 {
     struct spawn_args *argp = (struct spawn_args *)arg;
+
     rb_execarg_parent_start1(argp->execarg);
-    return (VALUE)rb_spawn_process(DATA_PTR(argp->execarg),
+
+    return (VALUE)rb_spawn_process(rb_execarg_get(argp->execarg),
                                    argp->errmsg.ptr, argp->errmsg.buflen);
 }
 
+NOINLINE(static rb_pid_t
+         rb_execarg_spawn(VALUE execarg_obj, char *errmsg, size_t errmsg_buflen));
+
 static rb_pid_t
 rb_execarg_spawn(VALUE execarg_obj, char *errmsg, size_t errmsg_buflen)
 {
@@ -4652,8 +4600,10 @@ rb_execarg_spawn(VALUE execarg_obj, char *errmsg, size_t errmsg_buflen)
     args.execarg = execarg_obj;
     args.errmsg.ptr = errmsg;
     args.errmsg.buflen = errmsg_buflen;
-    return (rb_pid_t)rb_ensure(do_spawn_process, (VALUE)&args,
-                               execarg_parent_end, execarg_obj);
+
+    rb_pid_t r = (rb_pid_t)rb_ensure(do_spawn_process, (VALUE)&args,
+                                     execarg_parent_end, execarg_obj);
+    return r;
 }
 
 static rb_pid_t
@@ -4717,7 +4667,7 @@ rb_spawn(int argc, const VALUE *argv)
  *
  *  - +command_line+ if it is a string,
  *    and if it begins with a shell reserved word or special built-in,
- *    or if it contains one or more metacharacters.
+ *    or if it contains one or more meta characters.
  *  - +exe_path+ otherwise.
  *
  *  <b>Argument +command_line+</b>
@@ -4726,15 +4676,15 @@ rb_spawn(int argc, const VALUE *argv)
  *  it must begin with a shell reserved word, begin with a special built-in,
  *  or contain meta characters:
  *
- *    system('echo')                                  # => true  # Built-in.
  *    system('if true; then echo "Foo"; fi')          # => true  # Shell reserved word.
+ *    system('exit')                                  # => true  # Built-in.
  *    system('date > /tmp/date.tmp')                  # => true  # Contains meta character.
  *    system('date > /nop/date.tmp')                  # => false
  *    system('date > /nop/date.tmp', exception: true) # Raises RuntimeError.
  *
  *  Assigns the command's error status to <tt>$?</tt>:
  *
- *    system('echo')                             # => true  # Built-in.
+ *    system('exit')                             # => true  # Built-in.
  *    $?                                         # => #<Process::Status: pid 640610 exit 0>
  *    system('date > /nop/date.tmp')             # => false
  *    $?                                         # => #<Process::Status: pid 640742 exit 2>
@@ -4747,21 +4697,7 @@ rb_spawn(int argc, const VALUE *argv)
  *
  *    Foo
  *
- *  On a Unix-like system, the shell is <tt>/bin/sh</tt>;
- *  otherwise the shell is determined by environment variable
- *  <tt>ENV['RUBYSHELL']</tt>, if defined, or <tt>ENV['COMSPEC']</tt> otherwise.
- *
- *  Except for the +COMSPEC+ case,
- *  the entire string +command_line+ is passed as an argument
- *  to {shell option -c}[https://pubs.opengroup.org/onlinepubs/9699919799.2018edition/utilities/sh.html].
- *
- *  The shell performs normal shell expansion on the command line:
- *
- *    system('echo C*') # => true
- *
- *  Output:
- *
- *    CONTRIBUTING.md COPYING COPYING.ja
+ *  See {Execution Shell}[rdoc-ref:Process@Execution+Shell] for details about the shell.
  *
  *  Raises an exception if the new process could not execute.
  *
@@ -4789,7 +4725,9 @@ rb_spawn(int argc, const VALUE *argv)
  *    system('foo')           # => nil
  *    $?                      # => #<Process::Status: pid 645608 exit 127>
  *
- *  Ruby invokes the executable directly, with no shell and no shell expansion:
+ *  Ruby invokes the executable directly.
+ *  This form does not use the shell;
+ *  see {Arguments args}[rdoc-ref:Process@Arguments+args] for caveats.
  *
  *    system('doesnt_exist') # => nil
  *
@@ -4810,13 +4748,14 @@ rb_spawn(int argc, const VALUE *argv)
 static VALUE
 rb_f_system(int argc, VALUE *argv, VALUE _)
 {
+    rb_thread_t *th = GET_THREAD();
     VALUE execarg_obj = rb_execarg_new(argc, argv, TRUE, TRUE);
     struct rb_execarg *eargp = rb_execarg_get(execarg_obj);
 
     struct rb_process_status status = {0};
     eargp->status = &status;
 
-    rb_last_status_clear();
+    last_status_clear(th);
 
     // This function can set the thread's last status.
     // May be different from waitpid_state.pid on exec failure.
@@ -4824,12 +4763,10 @@ rb_f_system(int argc, VALUE *argv, VALUE _)
 
     if (pid > 0) {
         VALUE status = rb_process_status_wait(pid, 0);
-
         struct rb_process_status *data = rb_check_typeddata(status, &rb_process_status_type);
-
         // Set the last status:
         rb_obj_freeze(status);
-        GET_THREAD()->last_status = status;
+        th->last_status = status;
 
         if (data->status == EXIT_SUCCESS) {
             return Qtrue;
@@ -4907,7 +4844,7 @@ rb_f_system(int argc, VALUE *argv, VALUE _)
  *
  *  - +command_line+ if it is a string,
  *    and if it begins with a shell reserved word or special built-in,
- *    or if it contains one or more metacharacters.
+ *    or if it contains one or more meta characters.
  *  - +exe_path+ otherwise.
  *
  *  <b>Argument +command_line+</b>
@@ -4916,11 +4853,11 @@ rb_f_system(int argc, VALUE *argv, VALUE _)
  *  it must begin with a shell reserved word, begin with a special built-in,
  *  or contain meta characters:
  *
- *    spawn('echo')                         # => 798847
+ *    spawn('if true; then echo "Foo"; fi') # => 798847 # Shell reserved word.
  *    Process.wait                          # => 798847
- *    spawn('if true; then echo "Foo"; fi') # => 798848
+ *    spawn('exit')                         # => 798848 # Built-in.
  *    Process.wait                          # => 798848
- *    spawn('date > /tmp/date.tmp')         # => 798879
+ *    spawn('date > /tmp/date.tmp')         # => 798879 # Contains meta character.
  *    Process.wait                          # => 798849
  *    spawn('date > /nop/date.tmp')         # => 798882 # Issues error message.
  *    Process.wait                          # => 798882
@@ -4934,22 +4871,7 @@ rb_f_system(int argc, VALUE *argv, VALUE _)
  *
  *    Foo
  *
- *  On a Unix-like system, the shell is <tt>/bin/sh</tt>;
- *  otherwise the shell is determined by environment variable
- *  <tt>ENV['RUBYSHELL']</tt>, if defined, or <tt>ENV['COMSPEC']</tt> otherwise.
- *
- *  Except for the +COMSPEC+ case,
- *  the entire string +command_line+ is passed as an argument
- *  to {shell option -c}[https://pubs.opengroup.org/onlinepubs/9699919799.2018edition/utilities/sh.html].
- *
- *  The shell performs normal shell expansion on the command line:
- *
- *    spawn('echo C*') # => 799139
- *    Process.wait     # => 799139
- *
- *  Output:
- *
- *    CONTRIBUTING.md COPYING COPYING.ja
+ *  See {Execution Shell}[rdoc-ref:Process@Execution+Shell] for details about the shell.
  *
  *  Raises an exception if the new process could not execute.
  *
@@ -4958,19 +4880,19 @@ rb_f_system(int argc, VALUE *argv, VALUE _)
  *  Argument +exe_path+ is one of the following:
  *
  *  - The string path to an executable to be called.
- *  - A 2-element array containing the path to an executable
+ *  - A 2-element array containing the path to an executable to be called,
  *    and the string to be used as the name of the executing process.
  *
- *  Example:
- *
- *    spawn('/usr/bin/date') # => 799198 # Path to date on Unix-style system.
- *    Process.wait           # => 799198
+ *      spawn('/usr/bin/date') # Path to date on Unix-style system.
+ *      Process.wait
  *
- *  Output:
+ *    Output:
  *
- *    Thu Aug 31 10:06:48 AM CDT 2023
+ *      Mon Aug 28 11:43:10 AM CDT 2023
  *
- *  Ruby invokes the executable directly, with no shell and no shell expansion.
+ *  Ruby invokes the executable directly.
+ *  This form does not use the shell;
+ *  see {Arguments args}[rdoc-ref:Process@Arguments+args] for caveats.
  *
  *  If one or more +args+ is given, each is an argument or option
  *  to be passed to the executable:
@@ -5236,7 +5158,7 @@ static rb_pid_t
 ruby_setsid(void)
 {
     rb_pid_t pid;
-    int ret;
+    int ret, fd;
 
     pid = getpid();
 #if defined(SETPGRP_VOID)
@@ -5698,6 +5620,12 @@ check_gid_switch(void)
 
 
 #if defined(HAVE_PWD_H)
+static inline bool
+login_not_found(int err)
+{
+    return (err == ENOTTY || err == ENXIO || err == ENOENT);
+}
+
 /**
  * Best-effort attempt to obtain the name of the login user, if any,
  * associated with the process. Processes not descended from login(1) (or
@@ -5706,18 +5634,18 @@ check_gid_switch(void)
 VALUE
 rb_getlogin(void)
 {
-#if ( !defined(USE_GETLOGIN_R) && !defined(USE_GETLOGIN) )
+# if !defined(USE_GETLOGIN_R) && !defined(USE_GETLOGIN)
     return Qnil;
-#else
+# else
     char MAYBE_UNUSED(*login) = NULL;
 
 # ifdef USE_GETLOGIN_R
 
-#if defined(__FreeBSD__)
+#   if defined(__FreeBSD__)
     typedef int getlogin_r_size_t;
-#else
+#   else
     typedef size_t getlogin_r_size_t;
-#endif
+#   endif
 
     long loginsize = GETLOGIN_R_SIZE_INIT;  /* maybe -1 */
 
@@ -5731,10 +5659,8 @@ rb_getlogin(void)
     rb_str_set_len(maybe_result, loginsize);
 
     int gle;
-    errno = 0;
     while ((gle = getlogin_r(login, (getlogin_r_size_t)loginsize)) != 0) {
-
-        if (gle == ENOTTY || gle == ENXIO || gle == ENOENT) {
+        if (login_not_found(gle)) {
             rb_str_resize(maybe_result, 0);
             return Qnil;
         }
@@ -5754,17 +5680,19 @@ rb_getlogin(void)
         return Qnil;
     }
 
+    rb_str_set_len(maybe_result, strlen(login));
     return maybe_result;
 
-# elif USE_GETLOGIN
+# elif defined(USE_GETLOGIN)
 
     errno = 0;
     login = getlogin();
-    if (errno) {
-        if (errno == ENOTTY || errno == ENXIO || errno == ENOENT) {
+    int err = errno;
+    if (err) {
+        if (login_not_found(err)) {
             return Qnil;
         }
-        rb_syserr_fail(errno, "getlogin");
+        rb_syserr_fail(err, "getlogin");
     }
 
     return login ? rb_str_new_cstr(login) : Qnil;
@@ -5773,10 +5701,46 @@ rb_getlogin(void)
 #endif
 }
 
+/* avoid treating as errors errno values that indicate "not found" */
+static inline bool
+pwd_not_found(int err)
+{
+    switch (err) {
+      case 0:
+      case ENOENT:
+      case ESRCH:
+      case EBADF:
+      case EPERM:
+        return true;
+      default:
+        return false;
+    }
+}
+
+# if defined(USE_GETPWNAM_R)
+struct getpwnam_r_args {
+    const char *login;
+    char *buf;
+    size_t bufsize;
+    struct passwd *result;
+    struct passwd pwstore;
+};
+
+# define GETPWNAM_R_ARGS(login_, buf_, bufsize_) (struct getpwnam_r_args) \
+    {.login = login_, .buf = buf_, .bufsize = bufsize_, .result = NULL}
+
+static void *
+nogvl_getpwnam_r(void *args)
+{
+    struct getpwnam_r_args *arg = args;
+    return (void *)(VALUE)getpwnam_r(arg->login, &arg->pwstore, arg->buf, arg->bufsize, &arg->result);
+}
+# endif
+
 VALUE
 rb_getpwdirnam_for_login(VALUE login_name)
 {
-#if ( !defined(USE_GETPWNAM_R) && !defined(USE_GETPWNAM) )
+#if !defined(USE_GETPWNAM_R) && !defined(USE_GETPWNAM)
     return Qnil;
 #else
 
@@ -5785,13 +5749,11 @@ rb_getpwdirnam_for_login(VALUE login_name)
         return Qnil;
     }
 
-    char *login = RSTRING_PTR(login_name);
+    const char *login = RSTRING_PTR(login_name);
 
-    struct passwd *pwptr;
 
 # ifdef USE_GETPWNAM_R
 
-    struct passwd pwdnm;
     char *bufnm;
     long bufsizenm = GETPW_R_SIZE_INIT;  /* maybe -1 */
 
@@ -5803,58 +5765,77 @@ rb_getpwdirnam_for_login(VALUE login_name)
     bufnm = RSTRING_PTR(getpwnm_tmp);
     bufsizenm = rb_str_capacity(getpwnm_tmp);
     rb_str_set_len(getpwnm_tmp, bufsizenm);
+    struct getpwnam_r_args args = GETPWNAM_R_ARGS(login, bufnm, (size_t)bufsizenm);
 
     int enm;
-    errno = 0;
-    while ((enm = getpwnam_r(login, &pwdnm, bufnm, bufsizenm, &pwptr)) != 0) {
-
-        if (enm == ENOENT || enm== ESRCH || enm == EBADF || enm == EPERM) {
-            /* not found; non-errors */
+    while ((enm = IO_WITHOUT_GVL_INT(nogvl_getpwnam_r, &args)) != 0) {
+        if (pwd_not_found(enm)) {
             rb_str_resize(getpwnm_tmp, 0);
             return Qnil;
         }
 
-        if (enm != ERANGE || bufsizenm >= GETPW_R_SIZE_LIMIT) {
+        if (enm != ERANGE || args.bufsize >= GETPW_R_SIZE_LIMIT) {
             rb_str_resize(getpwnm_tmp, 0);
             rb_syserr_fail(enm, "getpwnam_r");
         }
 
-        rb_str_modify_expand(getpwnm_tmp, bufsizenm);
-        bufnm = RSTRING_PTR(getpwnm_tmp);
-        bufsizenm = rb_str_capacity(getpwnm_tmp);
+        rb_str_modify_expand(getpwnm_tmp, (long)args.bufsize);
+        args.buf = RSTRING_PTR(getpwnm_tmp);
+        args.bufsize = (size_t)rb_str_capacity(getpwnm_tmp);
     }
 
-    if (pwptr == NULL) {
+    if (args.result == NULL) {
         /* no record in the password database for the login name */
         rb_str_resize(getpwnm_tmp, 0);
         return Qnil;
     }
 
     /* found it */
-    VALUE result = rb_str_new_cstr(pwptr->pw_dir);
+    VALUE result = rb_str_new_cstr(args.result->pw_dir);
     rb_str_resize(getpwnm_tmp, 0);
     return result;
 
-# elif USE_GETPWNAM
+# elif defined(USE_GETPWNAM)
 
+    struct passwd *pwptr;
     errno = 0;
-    pwptr = getpwnam(login);
-    if (pwptr) {
-        /* found it */
-        return rb_str_new_cstr(pwptr->pw_dir);
-    }
-    if (errno
-        /*   avoid treating as errors errno values that indicate "not found" */
-        && ( errno != ENOENT && errno != ESRCH && errno != EBADF && errno != EPERM)) {
-        rb_syserr_fail(errno, "getpwnam");
+    if (!(pwptr = getpwnam(login))) {
+        int err = errno;
+
+        if (pwd_not_found(err)) {
+            return Qnil;
+        }
+
+        rb_syserr_fail(err, "getpwnam");
     }
 
-    return Qnil;  /* not found */
+    /* found it */
+    return rb_str_new_cstr(pwptr->pw_dir);
 # endif
 
 #endif
 }
 
+# if defined(USE_GETPWUID_R)
+struct getpwuid_r_args {
+    uid_t uid;
+    char *buf;
+    size_t bufsize;
+    struct passwd *result;
+    struct passwd pwstore;
+};
+
+# define GETPWUID_R_ARGS(uid_, buf_, bufsize_) (struct getpwuid_r_args) \
+    {.uid = uid_, .buf = buf_, .bufsize = bufsize_, .result = NULL}
+
+static void *
+nogvl_getpwuid_r(void *args)
+{
+    struct getpwuid_r_args *arg = args;
+    return (void *)(VALUE)getpwuid_r(arg->uid, &arg->pwstore, arg->buf, arg->bufsize, &arg->result);
+}
+# endif
+
 /**
  * Look up the user's dflt home dir in the password db, by uid.
  */
@@ -5867,11 +5848,8 @@ rb_getpwdiruid(void)
 # else
     uid_t ruid = getuid();
 
-    struct passwd *pwptr;
-
 # ifdef USE_GETPWUID_R
 
-    struct passwd pwdid;
     char *bufid;
     long bufsizeid = GETPW_R_SIZE_INIT;  /* maybe -1 */
 
@@ -5883,53 +5861,52 @@ rb_getpwdiruid(void)
     bufid = RSTRING_PTR(getpwid_tmp);
     bufsizeid = rb_str_capacity(getpwid_tmp);
     rb_str_set_len(getpwid_tmp, bufsizeid);
+    struct getpwuid_r_args args = GETPWUID_R_ARGS(ruid, bufid, (size_t)bufsizeid);
 
     int eid;
-    errno = 0;
-    while ((eid = getpwuid_r(ruid, &pwdid, bufid, bufsizeid, &pwptr)) != 0) {
-
-        if (eid == ENOENT || eid== ESRCH || eid == EBADF || eid == EPERM) {
-            /* not found; non-errors */
+    while ((eid = IO_WITHOUT_GVL_INT(nogvl_getpwuid_r, &args)) != 0) {
+        if (pwd_not_found(eid)) {
             rb_str_resize(getpwid_tmp, 0);
             return Qnil;
         }
 
-        if (eid != ERANGE || bufsizeid >= GETPW_R_SIZE_LIMIT) {
+        if (eid != ERANGE || args.bufsize >= GETPW_R_SIZE_LIMIT) {
             rb_str_resize(getpwid_tmp, 0);
             rb_syserr_fail(eid, "getpwuid_r");
         }
 
-        rb_str_modify_expand(getpwid_tmp, bufsizeid);
-        bufid = RSTRING_PTR(getpwid_tmp);
-        bufsizeid = rb_str_capacity(getpwid_tmp);
+        rb_str_modify_expand(getpwid_tmp, (long)args.bufsize);
+        args.buf = RSTRING_PTR(getpwid_tmp);
+        args.bufsize = (size_t)rb_str_capacity(getpwid_tmp);
     }
 
-    if (pwptr == NULL) {
+    if (args.result == NULL) {
         /* no record in the password database for the uid */
         rb_str_resize(getpwid_tmp, 0);
         return Qnil;
     }
 
     /* found it */
-    VALUE result = rb_str_new_cstr(pwptr->pw_dir);
+    VALUE result = rb_str_new_cstr(args.result->pw_dir);
     rb_str_resize(getpwid_tmp, 0);
     return result;
 
 # elif defined(USE_GETPWUID)
 
+    struct passwd *pwptr;
     errno = 0;
-    pwptr = getpwuid(ruid);
-    if (pwptr) {
-        /* found it */
-        return rb_str_new_cstr(pwptr->pw_dir);
-    }
-    if (errno
-        /*   avoid treating as errors errno values that indicate "not found" */
-        && ( errno == ENOENT || errno == ESRCH || errno == EBADF || errno == EPERM)) {
-        rb_syserr_fail(errno, "getpwuid");
+    if (!(pwptr = getpwuid(ruid))) {
+        int err = errno;
+
+        if (pwd_not_found(err)) {
+            return Qnil;
+        }
+
+        rb_syserr_fail(err, "getpwuid");
     }
 
-    return Qnil;  /* not found */
+    /* found it */
+    return rb_str_new_cstr(pwptr->pw_dir);
 # endif
 
 #endif /* !defined(USE_GETPWUID_R) && !defined(USE_GETPWUID) */
@@ -5943,7 +5920,7 @@ rb_getpwdiruid(void)
  *  The Process::Sys module contains UID and GID
  *  functions which provide direct bindings to the system calls of the
  *  same names instead of the more-portable versions of the same
- *  functionality found in the Process,
+ *  functionality found in the +Process+,
  *  Process::UID, and Process::GID modules.
  */
 
@@ -5965,7 +5942,6 @@ obj2uid(VALUE id
         const char *usrname = StringValueCStr(id);
         struct passwd *pwptr;
 #ifdef USE_GETPWNAM_R
-        struct passwd pwbuf;
         char *getpw_buf;
         long getpw_buf_len;
         int e;
@@ -5978,15 +5954,18 @@ obj2uid(VALUE id
         getpw_buf_len = rb_str_capacity(*getpw_tmp);
         rb_str_set_len(*getpw_tmp, getpw_buf_len);
         errno = 0;
-        while ((e = getpwnam_r(usrname, &pwbuf, getpw_buf, getpw_buf_len, &pwptr)) != 0) {
-            if (e != ERANGE || getpw_buf_len >= GETPW_R_SIZE_LIMIT) {
+        struct getpwnam_r_args args = GETPWNAM_R_ARGS((char *)usrname, getpw_buf, (size_t)getpw_buf_len);
+
+        while ((e = IO_WITHOUT_GVL_INT(nogvl_getpwnam_r, &args)) != 0) {
+            if (e != ERANGE || args.bufsize >= GETPW_R_SIZE_LIMIT) {
                 rb_str_resize(*getpw_tmp, 0);
                 rb_syserr_fail(e, "getpwnam_r");
             }
-            rb_str_modify_expand(*getpw_tmp, getpw_buf_len);
-            getpw_buf = RSTRING_PTR(*getpw_tmp);
-            getpw_buf_len = rb_str_capacity(*getpw_tmp);
+            rb_str_modify_expand(*getpw_tmp, (long)args.bufsize);
+            args.buf = RSTRING_PTR(*getpw_tmp);
+            args.bufsize = (size_t)rb_str_capacity(*getpw_tmp);
         }
+        pwptr = args.result;
 #else
         pwptr = getpwnam(usrname);
 #endif
@@ -6025,6 +6004,26 @@ p_uid_from_name(VALUE self, VALUE id)
 #endif
 
 #if defined(HAVE_GRP_H)
+# if defined(USE_GETGRNAM_R)
+struct getgrnam_r_args {
+    const char *name;
+    char *buf;
+    size_t bufsize;
+    struct group *result;
+    struct group grp;
+};
+
+# define GETGRNAM_R_ARGS(name_, buf_, bufsize_) (struct getgrnam_r_args) \
+    {.name  = name_, .buf = buf_, .bufsize = bufsize_, .result = NULL}
+
+static void *
+nogvl_getgrnam_r(void *args)
+{
+    struct getgrnam_r_args *arg = args;
+    return (void *)(VALUE)getgrnam_r(arg->name, &arg->grp, arg->buf, arg->bufsize, &arg->result);
+}
+# endif
+
 static rb_gid_t
 obj2gid(VALUE id
 # ifdef USE_GETGRNAM_R
@@ -6042,7 +6041,6 @@ obj2gid(VALUE id
         const char *grpname = StringValueCStr(id);
         struct group *grptr;
 #ifdef USE_GETGRNAM_R
-        struct group grbuf;
         char *getgr_buf;
         long getgr_buf_len;
         int e;
@@ -6055,15 +6053,18 @@ obj2gid(VALUE id
         getgr_buf_len = rb_str_capacity(*getgr_tmp);
         rb_str_set_len(*getgr_tmp, getgr_buf_len);
         errno = 0;
-        while ((e = getgrnam_r(grpname, &grbuf, getgr_buf, getgr_buf_len, &grptr)) != 0) {
-            if (e != ERANGE || getgr_buf_len >= GETGR_R_SIZE_LIMIT) {
+        struct getgrnam_r_args args = GETGRNAM_R_ARGS(grpname, getgr_buf, (size_t)getgr_buf_len);
+
+        while ((e = IO_WITHOUT_GVL_INT(nogvl_getgrnam_r, &args)) != 0) {
+            if (e != ERANGE || args.bufsize >= GETGR_R_SIZE_LIMIT) {
                 rb_str_resize(*getgr_tmp, 0);
                 rb_syserr_fail(e, "getgrnam_r");
             }
-            rb_str_modify_expand(*getgr_tmp, getgr_buf_len);
-            getgr_buf = RSTRING_PTR(*getgr_tmp);
-            getgr_buf_len = rb_str_capacity(*getgr_tmp);
+            rb_str_modify_expand(*getgr_tmp, (long)args.bufsize);
+            args.buf = RSTRING_PTR(*getgr_tmp);
+            args.bufsize = (size_t)rb_str_capacity(*getgr_tmp);
         }
+        grptr = args.result;
 #elif defined(HAVE_GETGRNAM)
         grptr = getgrnam(grpname);
 #else
@@ -7835,6 +7836,7 @@ get_clk_tck(void)
  *    Process.times
  *    # => #<struct Process::Tms utime=55.122118, stime=35.533068, cutime=0.0, cstime=0.002846>
  *
+ *  The precision is platform-defined.
  */
 
 VALUE
@@ -8751,35 +8753,43 @@ static VALUE rb_mProcID_Syscall;
  *  * Precomputes the coderange of all strings.
  *  * Frees all empty heap pages and increments the allocatable pages counter
  *    by the number of pages freed.
+ *  * Invoke +malloc_trim+ if available to free empty malloc pages.
  */
 
 static VALUE
 proc_warmup(VALUE _)
 {
-    RB_VM_LOCK_ENTER();
-    rb_gc_prepare_heap();
-    RB_VM_LOCK_LEAVE();
+    RB_VM_LOCKING() {
+        rb_gc_prepare_heap();
+    }
     return Qtrue;
 }
 
 /*
  * Document-module: Process
  *
- * \Module +Process+ represents a process in the underlying operating system.
+ * Module +Process+ represents a process in the underlying operating system.
  * Its methods support management of the current process and its child processes.
  *
- * == \Process Creation
+ * == Process Creation
  *
- * Each of these methods creates a process:
+ * Each of the following methods executes a given command in a new process or subshell,
+ * or multiple commands in new processes and/or subshells.
+ * The choice of process or subshell depends on the form of the command;
+ * see {Argument command_line or exe_path}[rdoc-ref:Process@Argument+command_line+or+exe_path].
  *
- * - Process.exec: Replaces the current process by running a given external command.
- * - Process.spawn, Kernel#spawn: Executes the given command and returns its pid without waiting for completion.
- * - Kernel#system: Executes the given command in a subshell.
+ * - Process.spawn, Kernel#spawn: Executes the command;
+ *   returns the new pid without waiting for completion.
+ * - Process.exec: Replaces the current process by executing the command.
  *
- * Each of these methods accepts:
+ * In addition:
  *
- * - An optional hash of environment variable names and values.
- * - An optional hash of execution options.
+ * - Method Kernel#system executes a given command-line (string) in a subshell;
+ *   returns +true+, +false+, or +nil+.
+ * - Method Kernel#` executes a given command-line (string) in a subshell;
+ *   returns its $stdout string.
+ * - Module Open3 supports creating child processes
+ *   with access to their $stdin, $stdout, and $stderr streams.
  *
  * === Execution Environment
  *
@@ -8792,7 +8802,6 @@ proc_warmup(VALUE _)
  *
  * Output:
  *
- *   nil
  *   "0"
  *
  * The effect is usually similar to that of calling ENV#update with argument +env+,
@@ -8804,6 +8813,119 @@ proc_warmup(VALUE _)
  * if the new process fails.
  * For example, hard resource limits are not restored.
  *
+ * === Argument +command_line+ or +exe_path+
+ *
+ * The required string argument is one of the following:
+ *
+ * - +command_line+ if it begins with a shell reserved word or special built-in,
+ *   or if it contains one or more meta characters.
+ * - +exe_path+ otherwise.
+ *
+ * ==== Argument +command_line+
+ *
+ * \String argument +command_line+ is a command line to be passed to a shell;
+ * it must begin with a shell reserved word, begin with a special built-in,
+ * or contain meta characters:
+ *
+ *   system('if true; then echo "Foo"; fi')          # => true  # Shell reserved word.
+ *   system('exit')                                  # => true  # Built-in.
+ *   system('date > /tmp/date.tmp')                  # => true  # Contains meta character.
+ *   system('date > /nop/date.tmp')                  # => false
+ *   system('date > /nop/date.tmp', exception: true) # Raises RuntimeError.
+ *
+ * The command line may also contain arguments and options for the command:
+ *
+ *   system('echo "Foo"') # => true
+ *
+ * Output:
+ *
+ *   Foo
+ *
+ * See {Execution Shell}[rdoc-ref:Process@Execution+Shell] for details about the shell.
+ *
+ * ==== Argument +exe_path+
+ *
+ * Argument +exe_path+ is one of the following:
+ *
+ * - The string path to an executable file to be called:
+ *
+ *   Example:
+ *
+ *     system('/usr/bin/date') # => true # Path to date on Unix-style system.
+ *     system('foo')           # => nil  # Command execlution failed.
+ *
+ *   Output:
+ *
+ *     Thu Aug 31 10:06:48 AM CDT 2023
+ *
+ *   A path or command name containing spaces without arguments cannot
+ *   be distinguished from +command_line+ above, so you must quote or
+ *   escape the entire command name using a shell in platform
+ *   dependent manner, or use the array form below.
+ *
+ *   If +exe_path+ does not contain any path separator, an executable
+ *   file is searched from directories specified with the +PATH+
+ *   environment variable.  What the word "executable" means here is
+ *   depending on platforms.
+ *
+ *   Even if the file considered "executable", its content may not be
+ *   in proper executable format.  In that case, Ruby tries to run it
+ *   by using <tt>/bin/sh</tt> on a Unix-like system, like system(3)
+ *   does.
+ *
+ *     File.write('shell_command', 'echo $SHELL', perm: 0o755)
+ *     system('./shell_command')        # prints "/bin/sh" or something.
+ *
+ * - A 2-element array containing the path to an executable
+ *   and the string to be used as the name of the executing process:
+ *
+ *   Example:
+ *
+ *     pid = spawn(['sleep', 'Hello!'], '1') # 2-element array.
+ *     p `ps -p #{pid} -o command=`
+ *
+ *   Output:
+ *
+ *     "Hello! 1\n"
+ *
+ * === Arguments +args+
+ *
+ * If +command_line+ does not contain shell meta characters except for
+ * spaces and tabs, or +exe_path+ is given, Ruby invokes the
+ * executable directly.  This form does not use the shell:
+ *
+ *   spawn("doesnt_exist")       # Raises Errno::ENOENT
+ *   spawn("doesnt_exist", "\n") # Raises Errno::ENOENT
+ *
+ *   spawn("doesnt_exist\n")     # => false
+ *   # sh: 1: doesnot_exist: not found
+ *
+ * The error message is from a shell and would vary depending on your
+ * system.
+ *
+ * If one or more +args+ is given after +exe_path+, each is an
+ * argument or option to be passed to the executable:
+ *
+ * Example:
+ *
+ *   system('echo', '<', 'C*', '|', '$SHELL', '>')   # => true
+ *
+ * Output:
+ *
+ *   < C* | $SHELL >
+ *
+ * However, there are exceptions on Windows.  See {Execution Shell on
+ * Windows}[rdoc-ref:Process@Execution+Shell+on+Windows].
+ *
+ * If you want to invoke a path containing spaces with no arguments
+ * without shell, you will need to use a 2-element array +exe_path+.
+ *
+ * Example:
+ *
+ *   path = '/Applications/Google Chrome.app/Contents/MacOS/Google Chrome'
+ *   spawn(path) # Raises Errno::ENOENT; No such file or directory - /Applications/Google
+ *   spawn([path] * 2)
+ *
  * === Execution Options
  *
  * Optional trailing argument +options+ is a hash of execution options.
@@ -8839,7 +8961,7 @@ proc_warmup(VALUE _)
  * The key for such an option may be an integer file descriptor (fd),
  * specifying a source,
  * or an array of fds, specifying multiple sources.
-
+ *
  * An integer source fd may be specified as:
  *
  * - _n_: Specifies file descriptor _n_.
@@ -8896,7 +9018,7 @@ proc_warmup(VALUE _)
  *
  *   0644
  *
- * ==== \Process Groups (+:pgroup+ and +:new_pgroup+)
+ * ==== Process Groups (+:pgroup+ and +:new_pgroup+)
  *
  * By default, the new process belongs to the same
  * {process group}[https://en.wikipedia.org/wiki/Process_group]
@@ -8934,6 +9056,52 @@ proc_warmup(VALUE _)
  * Use execution option <tt>:close_others => true</tt> to modify that inheritance
  * by closing non-standard fds (3 and greater) that are not otherwise redirected.
  *
+ * === Execution Shell
+ *
+ * On a Unix-like system, the shell invoked is <tt>/bin/sh</tt>;
+ * the entire string +command_line+ is passed as an argument
+ * to {shell option -c}[https://pubs.opengroup.org/onlinepubs/9699919799.2018edition/utilities/sh.html].
+ *
+ * The shell performs normal shell expansion on the command line:
+ *
+ * Example:
+ *
+ *   system('echo $SHELL: C*') # => true
+ *
+ * Output:
+ *
+ *   /bin/bash: CONTRIBUTING.md COPYING COPYING.ja
+ *
+ * ==== Execution Shell on Windows
+ *
+ * On Windows, the shell invoked is determined by environment variable
+ * +RUBYSHELL+, if defined, or +COMSPEC+ otherwise; the entire string
+ * +command_line+ is passed as an argument to <tt>-c</tt> option for
+ * +RUBYSHELL+, as well as <tt>/bin/sh</tt>, and {/c
+ * option}[https://learn.microsoft.com/en-us/windows-server/administration/windows-commands/cmd]
+ * for +COMSPEC+.  The shell is invoked automatically in the following
+ * cases:
+ *
+ * - The command is a built-in of +cmd.exe+, such as +echo+.
+ * - The executable file is a batch file; its name ends with +.bat+ or
+ *   +.cmd+.
+ *
+ * Note that the command will still be invoked as +command_line+ form
+ * even when called in +exe_path+ form, because +cmd.exe+ does not
+ * accept a script name like <tt>/bin/sh</tt> does but only works with
+ * <tt>/c</tt> option.
+ *
+ * The standard shell +cmd.exe+ performs environment variable
+ * expansion but does not have globbing functionality:
+ *
+ * Example:
+ *
+ *   system("echo %COMSPEC%: C*")' # => true
+ *
+ * Output:
+ *
+ *   C:\WINDOWS\system32\cmd.exe: C*
+ *
  * == What's Here
  *
  * === Current-Process Getters
@@ -8984,7 +9152,7 @@ proc_warmup(VALUE _)
  * - ::waitall: Waits for all child processes to exit;
  *   returns their process IDs and statuses.
  *
- * === \Process Groups
+ * === Process Groups
  *
  * - ::getpgid: Returns the process group ID for a process.
  * - ::getpriority: Returns the scheduling priority
@@ -9081,8 +9249,6 @@ InitVM_process(void)
     rb_define_singleton_method(rb_cProcessStatus, "wait", rb_process_status_waitv, -1);
 
     rb_define_method(rb_cProcessStatus, "==", pst_equal, 1);
-    rb_define_method(rb_cProcessStatus, "&", pst_bitand, 1);
-    rb_define_method(rb_cProcessStatus, ">>", pst_rshift, 1);
     rb_define_method(rb_cProcessStatus, "to_i", pst_to_i, 0);
     rb_define_method(rb_cProcessStatus, "to_s", pst_to_s, 0);
     rb_define_method(rb_cProcessStatus, "inspect", pst_inspect, 0);
diff --git a/ractor.c b/ractor.c
index e0919ac56b1804..12ffced0a3546f 100644
--- a/ractor.c
+++ b/ractor.c
@@ -12,12 +12,13 @@
 #include "internal/error.h"
 #include "internal/gc.h"
 #include "internal/hash.h"
+#include "internal/object.h"
+#include "internal/ractor.h"
 #include "internal/rational.h"
 #include "internal/struct.h"
 #include "internal/thread.h"
 #include "variable.h"
 #include "yjit.h"
-#include "rjit.h"
 
 VALUE rb_cRactor;
 static VALUE rb_cRactorSelector;
@@ -32,14 +33,19 @@ static VALUE rb_cRactorMovedObject;
 
 static void vm_ractor_blocking_cnt_inc(rb_vm_t *vm, rb_ractor_t *r, const char *file, int line);
 
+
+#if RACTOR_CHECK_MODE > 0
+bool rb_ractor_ignore_belonging_flag = false;
+#endif
+
 // Ractor locking
 
 static void
 ASSERT_ractor_unlocking(rb_ractor_t *r)
 {
 #if RACTOR_CHECK_MODE > 0
-    // GET_EC is NULL in an RJIT worker
-    if (rb_current_execution_context(false) != NULL && r->sync.locked_by == rb_ractor_self(GET_RACTOR())) {
+    const rb_execution_context_t *ec = rb_current_ec_noinline();
+    if (ec != NULL && r->sync.locked_by == rb_ractor_self(rb_ec_ractor_ptr(ec))) {
         rb_bug("recursive ractor locking");
     }
 #endif
@@ -49,8 +55,8 @@ static void
 ASSERT_ractor_locking(rb_ractor_t *r)
 {
 #if RACTOR_CHECK_MODE > 0
-    // GET_EC is NULL in an RJIT worker
-    if (rb_current_execution_context(false) != NULL && r->sync.locked_by != rb_ractor_self(GET_RACTOR())) {
+    const rb_execution_context_t *ec = rb_current_ec_noinline();
+    if (ec != NULL && r->sync.locked_by != rb_ractor_self(rb_ec_ractor_ptr(ec))) {
         rp(r->sync.locked_by);
         rb_bug("ractor lock is not acquired.");
     }
@@ -66,7 +72,7 @@ ractor_lock(rb_ractor_t *r, const char *file, int line)
     rb_native_mutex_lock(&r->sync.lock);
 
 #if RACTOR_CHECK_MODE > 0
-    if (rb_current_execution_context(false) != NULL) { // GET_EC is NULL in an RJIT worker
+    if (rb_current_execution_context(false) != NULL) {
         rb_ractor_t *cr = rb_current_ractor_raw(false);
         r->sync.locked_by = cr ? rb_ractor_self(cr) : Qundef;
     }
@@ -78,7 +84,7 @@ ractor_lock(rb_ractor_t *r, const char *file, int line)
 static void
 ractor_lock_self(rb_ractor_t *cr, const char *file, int line)
 {
-    VM_ASSERT(cr == GET_RACTOR());
+    VM_ASSERT(cr == rb_ec_ractor_ptr(rb_current_ec_noinline()));
 #if RACTOR_CHECK_MODE > 0
     VM_ASSERT(cr->sync.locked_by != cr->pub.self);
 #endif
@@ -100,7 +106,7 @@ ractor_unlock(rb_ractor_t *r, const char *file, int line)
 static void
 ractor_unlock_self(rb_ractor_t *cr, const char *file, int line)
 {
-    VM_ASSERT(cr == GET_RACTOR());
+    VM_ASSERT(cr == rb_ec_ractor_ptr(rb_current_ec_noinline()));
 #if RACTOR_CHECK_MODE > 0
     VM_ASSERT(cr->sync.locked_by == cr->pub.self);
 #endif
@@ -112,18 +118,16 @@ ractor_unlock_self(rb_ractor_t *cr, const char *file, int line)
 #define RACTOR_LOCK_SELF(r) ractor_lock_self(r, __FILE__, __LINE__)
 #define RACTOR_UNLOCK_SELF(r) ractor_unlock_self(r, __FILE__, __LINE__)
 
-static void
-ractor_cond_wait(rb_ractor_t *r)
+void
+rb_ractor_lock_self(rb_ractor_t *r)
 {
-#if RACTOR_CHECK_MODE > 0
-    VALUE locked_by = r->sync.locked_by;
-    r->sync.locked_by = Qnil;
-#endif
-    rb_native_cond_wait(&r->sync.cond, &r->sync.lock);
+    RACTOR_LOCK_SELF(r);
+}
 
-#if RACTOR_CHECK_MODE > 0
-    r->sync.locked_by = locked_by;
-#endif
+void
+rb_ractor_unlock_self(rb_ractor_t *r)
+{
+    RACTOR_UNLOCK_SELF(r);
 }
 
 // Ractor status
@@ -179,39 +183,21 @@ ractor_status_p(rb_ractor_t *r, enum ractor_status status)
 
 // Ractor data/mark/free
 
-static struct rb_ractor_basket *ractor_queue_at(rb_ractor_t *r, struct rb_ractor_queue *rq, int i);
 static void ractor_local_storage_mark(rb_ractor_t *r);
 static void ractor_local_storage_free(rb_ractor_t *r);
 
-static void
-ractor_queue_mark(struct rb_ractor_queue *rq)
-{
-    for (int i=0; i<rq->cnt; i++) {
-        struct rb_ractor_basket *b = ractor_queue_at(NULL, rq, i);
-        rb_gc_mark(b->sender);
-
-        switch (b->type.e) {
-          case basket_type_yielding:
-          case basket_type_take_basket:
-          case basket_type_deleted:
-          case basket_type_reserved:
-            // ignore
-            break;
-          default:
-            rb_gc_mark(b->p.send.v);
-        }
-    }
-}
+static void ractor_sync_mark(rb_ractor_t *r);
+static void ractor_sync_free(rb_ractor_t *r);
+static size_t ractor_sync_memsize(const rb_ractor_t *r);
+static void ractor_sync_init(rb_ractor_t *r);
 
 static void
 ractor_mark(void *ptr)
 {
     rb_ractor_t *r = (rb_ractor_t *)ptr;
 
-    ractor_queue_mark(&r->sync.recv_queue);
-    ractor_queue_mark(&r->sync.takers_queue);
-
-    rb_gc_mark(r->receiving_mutex);
+    // mark received messages
+    ractor_sync_mark(r);
 
     rb_gc_mark(r->loc);
     rb_gc_mark(r->name);
@@ -231,30 +217,27 @@ ractor_mark(void *ptr)
     ractor_local_storage_mark(r);
 }
 
-static void
-ractor_queue_free(struct rb_ractor_queue *rq)
-{
-    free(rq->baskets);
-}
-
 static void
 ractor_free(void *ptr)
 {
     rb_ractor_t *r = (rb_ractor_t *)ptr;
     RUBY_DEBUG_LOG("free r:%d", rb_ractor_id(r));
     rb_native_mutex_destroy(&r->sync.lock);
-    rb_native_cond_destroy(&r->sync.cond);
-    ractor_queue_free(&r->sync.recv_queue);
-    ractor_queue_free(&r->sync.takers_queue);
+#ifdef RUBY_THREAD_WIN32_H
+    rb_native_cond_destroy(&r->sync.wakeup_cond);
+#endif
     ractor_local_storage_free(r);
     rb_hook_list_free(&r->pub.hooks);
-    ruby_xfree(r);
-}
 
-static size_t
-ractor_queue_memsize(const struct rb_ractor_queue *rq)
-{
-    return sizeof(struct rb_ractor_basket) * rq->size;
+    if (r->newobj_cache) {
+        RUBY_ASSERT(r == ruby_single_main_ractor);
+
+        rb_gc_ractor_cache_free(r->newobj_cache);
+        r->newobj_cache = NULL;
+    }
+
+    ractor_sync_free(r);
+    ruby_xfree(r);
 }
 
 static size_t
@@ -263,9 +246,7 @@ ractor_memsize(const void *ptr)
     rb_ractor_t *r = (rb_ractor_t *)ptr;
 
     // TODO: more correct?
-    return sizeof(rb_ractor_t) +
-           ractor_queue_memsize(&r->sync.recv_queue) +
-           ractor_queue_memsize(&r->sync.takers_queue);
+    return sizeof(rb_ractor_t) + ractor_sync_memsize(r);
 }
 
 static const rb_data_type_t ractor_data_type = {
@@ -303,1503 +284,17 @@ static rb_atomic_t ractor_last_id;
 #if RACTOR_CHECK_MODE > 0
 uint32_t
 rb_ractor_current_id(void)
-{
-    if (GET_THREAD()->ractor == NULL) {
-        return 1; // main ractor
-    }
-    else {
-        return rb_ractor_id(GET_RACTOR());
-    }
-}
-#endif
-
-// Ractor queue
-
-static void
-ractor_queue_setup(struct rb_ractor_queue *rq)
-{
-    rq->size = 2;
-    rq->cnt = 0;
-    rq->start = 0;
-    rq->baskets = malloc(sizeof(struct rb_ractor_basket) * rq->size);
-}
-
-static struct rb_ractor_basket *
-ractor_queue_head(rb_ractor_t *r, struct rb_ractor_queue *rq)
-{
-    if (r != NULL) ASSERT_ractor_locking(r);
-    return &rq->baskets[rq->start];
-}
-
-static struct rb_ractor_basket *
-ractor_queue_at(rb_ractor_t *r, struct rb_ractor_queue *rq, int i)
-{
-    if (r != NULL) ASSERT_ractor_locking(r);
-    return &rq->baskets[(rq->start + i) % rq->size];
-}
-
-static void
-ractor_queue_advance(rb_ractor_t *r, struct rb_ractor_queue *rq)
-{
-    ASSERT_ractor_locking(r);
-
-    if (rq->reserved_cnt == 0) {
-        rq->cnt--;
-        rq->start = (rq->start + 1) % rq->size;
-        rq->serial++;
-    }
-    else {
-        ractor_queue_at(r, rq, 0)->type.e = basket_type_deleted;
-    }
-}
-
-static bool
-ractor_queue_skip_p(rb_ractor_t *r, struct rb_ractor_queue *rq, int i)
-{
-    struct rb_ractor_basket *b = ractor_queue_at(r, rq, i);
-    return basket_type_p(b, basket_type_deleted) ||
-           basket_type_p(b, basket_type_reserved);
-}
-
-static void
-ractor_queue_compact(rb_ractor_t *r, struct rb_ractor_queue *rq)
-{
-    ASSERT_ractor_locking(r);
-
-    while (rq->cnt > 0 && basket_type_p(ractor_queue_at(r, rq, 0), basket_type_deleted)) {
-        ractor_queue_advance(r, rq);
-    }
-}
-
-static bool
-ractor_queue_empty_p(rb_ractor_t *r, struct rb_ractor_queue *rq)
-{
-    ASSERT_ractor_locking(r);
-
-    if (rq->cnt == 0) {
-        return true;
-    }
-
-    ractor_queue_compact(r, rq);
-
-    for (int i=0; i<rq->cnt; i++) {
-        if (!ractor_queue_skip_p(r, rq, i)) {
-            return false;
-        }
-    }
-
-    return true;
-}
-
-static bool
-ractor_queue_deq(rb_ractor_t *r, struct rb_ractor_queue *rq, struct rb_ractor_basket *basket)
-{
-    ASSERT_ractor_locking(r);
-
-    for (int i=0; i<rq->cnt; i++) {
-        if (!ractor_queue_skip_p(r, rq, i)) {
-            struct rb_ractor_basket *b = ractor_queue_at(r, rq, i);
-            *basket = *b;
-
-            // remove from queue
-            b->type.e = basket_type_deleted;
-            ractor_queue_compact(r, rq);
-            return true;
-        }
-    }
-
-    return false;
-}
-
-static void
-ractor_queue_enq(rb_ractor_t *r, struct rb_ractor_queue *rq, struct rb_ractor_basket *basket)
-{
-    ASSERT_ractor_locking(r);
-
-    if (rq->size <= rq->cnt) {
-        rq->baskets = realloc(rq->baskets, sizeof(struct rb_ractor_basket) * rq->size * 2);
-        for (int i=rq->size - rq->start; i<rq->cnt; i++) {
-            rq->baskets[i + rq->start] = rq->baskets[i + rq->start - rq->size];
-        }
-        rq->size *= 2;
-    }
-    rq->baskets[(rq->start + rq->cnt++) % rq->size] = *basket;
-    // fprintf(stderr, "%s %p->cnt:%d\n", RUBY_FUNCTION_NAME_STRING, (void *)rq, rq->cnt);
-}
-
-static void
-ractor_queue_delete(rb_ractor_t *r, struct rb_ractor_queue *rq, struct rb_ractor_basket *basket)
-{
-    basket->type.e = basket_type_deleted;
-}
-
-// Ractor basket
-
-static VALUE ractor_reset_belonging(VALUE obj); // in this file
-
-static VALUE
-ractor_basket_value(struct rb_ractor_basket *b)
-{
-    switch (b->type.e) {
-      case basket_type_ref:
-        break;
-      case basket_type_copy:
-      case basket_type_move:
-      case basket_type_will:
-        b->type.e = basket_type_ref;
-        b->p.send.v = ractor_reset_belonging(b->p.send.v);
-        break;
-      default:
-        rb_bug("unreachable");
-    }
-
-    return b->p.send.v;
-}
-
-static VALUE
-ractor_basket_accept(struct rb_ractor_basket *b)
-{
-    VALUE v = ractor_basket_value(b);
-
-    if (b->p.send.exception) {
-        VALUE cause = v;
-        VALUE err = rb_exc_new_cstr(rb_eRactorRemoteError, "thrown by remote Ractor.");
-        rb_ivar_set(err, rb_intern("@ractor"), b->sender);
-        rb_ec_setup_exception(NULL, err, cause);
-        rb_exc_raise(err);
-    }
-
-    return v;
-}
-
-// Ractor synchronizations
-
-#if USE_RUBY_DEBUG_LOG
-static const char *
-wait_status_str(enum rb_ractor_wait_status wait_status)
-{
-    switch ((int)wait_status) {
-      case wait_none: return "none";
-      case wait_receiving: return "receiving";
-      case wait_taking: return "taking";
-      case wait_yielding: return "yielding";
-      case wait_receiving|wait_taking: return "receiving|taking";
-      case wait_receiving|wait_yielding: return "receiving|yielding";
-      case wait_taking|wait_yielding: return "taking|yielding";
-      case wait_receiving|wait_taking|wait_yielding: return "receiving|taking|yielding";
-    }
-    rb_bug("unreachable");
-}
-
-static const char *
-wakeup_status_str(enum rb_ractor_wakeup_status wakeup_status)
-{
-    switch (wakeup_status) {
-      case wakeup_none: return "none";
-      case wakeup_by_send: return "by_send";
-      case wakeup_by_yield: return "by_yield";
-      case wakeup_by_take: return "by_take";
-      case wakeup_by_close: return "by_close";
-      case wakeup_by_interrupt: return "by_interrupt";
-      case wakeup_by_retry: return "by_retry";
-    }
-    rb_bug("unreachable");
-}
-
-static const char *
-basket_type_name(enum rb_ractor_basket_type type)
-{
-    switch (type) {
-      case basket_type_none: return  "none";
-      case basket_type_ref: return "ref";
-      case basket_type_copy: return "copy";
-      case basket_type_move: return "move";
-      case basket_type_will: return "will";
-      case basket_type_deleted: return "deleted";
-      case basket_type_reserved: return "reserved";
-      case basket_type_take_basket: return "take_basket";
-      case basket_type_yielding: return "yielding";
-    }
-    VM_ASSERT(0);
-    return NULL;
-}
-#endif // USE_RUBY_DEBUG_LOG
-
-static bool
-ractor_sleeping_by(const rb_ractor_t *r, enum rb_ractor_wait_status wait_status)
-{
-    return (r->sync.wait.status & wait_status) && r->sync.wait.wakeup_status == wakeup_none;
-}
-
-static bool
-ractor_wakeup(rb_ractor_t *r, enum rb_ractor_wait_status wait_status, enum rb_ractor_wakeup_status wakeup_status)
-{
-    ASSERT_ractor_locking(r);
-
-    RUBY_DEBUG_LOG("r:%u wait_by:%s -> wait:%s wakeup:%s",
-                   rb_ractor_id(r),
-                   wait_status_str(r->sync.wait.status),
-                   wait_status_str(wait_status),
-                   wakeup_status_str(wakeup_status));
-
-    if (ractor_sleeping_by(r, wait_status)) {
-        r->sync.wait.wakeup_status = wakeup_status;
-        rb_native_cond_broadcast(&r->sync.cond);
-        return true;
-    }
-    else {
-        return false;
-    }
-}
-
-static void *
-ractor_sleep_wo_gvl(void *ptr)
-{
-    rb_ractor_t *cr = ptr;
-    RACTOR_LOCK_SELF(cr);
-    {
-        VM_ASSERT(cr->sync.wait.status != wait_none);
-        if (cr->sync.wait.wakeup_status == wakeup_none) {
-            ractor_cond_wait(cr);
-        }
-        cr->sync.wait.status = wait_none;
-    }
-    RACTOR_UNLOCK_SELF(cr);
-    return NULL;
-}
-
-static void
-ractor_sleep_interrupt(void *ptr)
-{
-    rb_ractor_t *r = ptr;
-
-    RACTOR_LOCK(r);
-    {
-        ractor_wakeup(r, wait_receiving | wait_taking | wait_yielding, wakeup_by_interrupt);
-    }
-    RACTOR_UNLOCK(r);
-}
-
-typedef void (*ractor_sleep_cleanup_function)(rb_ractor_t *cr, void *p);
-
-static enum rb_ractor_wakeup_status
-ractor_sleep_with_cleanup(rb_execution_context_t *ec, rb_ractor_t *cr, enum rb_ractor_wait_status wait_status,
-                          ractor_sleep_cleanup_function cf_func, void *cf_data)
-{
-    enum rb_ractor_wakeup_status wakeup_status;
-    VM_ASSERT(GET_RACTOR() == cr);
-
-    // TODO: multi-threads
-    VM_ASSERT(cr->sync.wait.status == wait_none);
-    VM_ASSERT(wait_status != wait_none);
-    cr->sync.wait.status = wait_status;
-    cr->sync.wait.wakeup_status = wakeup_none;
-
-    // fprintf(stderr, "%s  r:%p status:%s, wakeup_status:%s\n", RUBY_FUNCTION_NAME_STRING, (void *)cr,
-    //                 wait_status_str(cr->sync.wait.status), wakeup_status_str(cr->sync.wait.wakeup_status));
-
-    RUBY_DEBUG_LOG("sleep by %s", wait_status_str(wait_status));
-
-    RACTOR_UNLOCK(cr);
-    {
-        rb_nogvl(ractor_sleep_wo_gvl, cr,
-                 ractor_sleep_interrupt, cr,
-                 RB_NOGVL_UBF_ASYNC_SAFE | RB_NOGVL_INTR_FAIL);
-    }
-    RACTOR_LOCK(cr);
-
-    // rb_nogvl() can be canceled by interrupts
-    if (cr->sync.wait.status != wait_none) {
-        cr->sync.wait.status = wait_none;
-        cr->sync.wait.wakeup_status = wakeup_by_interrupt;
-
-        RACTOR_UNLOCK(cr);
-        {
-            if (cf_func) {
-                int state;
-                EC_PUSH_TAG(ec);
-                if ((state = EC_EXEC_TAG()) == TAG_NONE) {
-                    rb_thread_check_ints();
-                }
-                EC_POP_TAG();
-
-                if (state) {
-                    (*cf_func)(cr, cf_data);
-                    EC_JUMP_TAG(ec, state);
-                }
-            }
-            else {
-                rb_thread_check_ints();
-            }
-        }
-        RACTOR_LOCK(cr); // reachable?
-    }
-
-    // TODO: multi-thread
-    wakeup_status = cr->sync.wait.wakeup_status;
-    cr->sync.wait.wakeup_status = wakeup_none;
-
-    RUBY_DEBUG_LOG("wakeup %s", wakeup_status_str(wakeup_status));
-
-    return wakeup_status;
-}
-
-static enum rb_ractor_wakeup_status
-ractor_sleep(rb_execution_context_t *ec, rb_ractor_t *cr, enum rb_ractor_wait_status wait_status)
-{
-    return ractor_sleep_with_cleanup(ec, cr, wait_status, 0, NULL);
-}
-
-// Ractor.receive
-
-static void
-ractor_recursive_receive_if(rb_ractor_t *r)
-{
-    if (r->receiving_mutex && rb_mutex_owned_p(r->receiving_mutex)) {
-        rb_raise(rb_eRactorError, "can not call receive/receive_if recursively");
-    }
-}
-
-static VALUE
-ractor_try_receive(rb_execution_context_t *ec, rb_ractor_t *cr, struct rb_ractor_queue *rq)
-{
-    struct rb_ractor_basket basket;
-    ractor_recursive_receive_if(cr);
-    bool received = false;
-
-    RACTOR_LOCK_SELF(cr);
-    {
-        RUBY_DEBUG_LOG("rq->cnt:%d", rq->cnt);
-        received = ractor_queue_deq(cr, rq, &basket);
-    }
-    RACTOR_UNLOCK_SELF(cr);
-
-    if (!received) {
-        if (cr->sync.incoming_port_closed) {
-            rb_raise(rb_eRactorClosedError, "The incoming port is already closed");
-        }
-        return Qundef;
-    }
-    else {
-        return ractor_basket_accept(&basket);
-    }
-}
-
-static void
-ractor_wait_receive(rb_execution_context_t *ec, rb_ractor_t *cr, struct rb_ractor_queue *rq)
-{
-    VM_ASSERT(cr == rb_ec_ractor_ptr(ec));
-    ractor_recursive_receive_if(cr);
-
-    RACTOR_LOCK(cr);
-    {
-        while (ractor_queue_empty_p(cr, rq)) {
-            ractor_sleep(ec, cr, wait_receiving);
-        }
-    }
-    RACTOR_UNLOCK(cr);
-}
-
-static VALUE
-ractor_receive(rb_execution_context_t *ec, rb_ractor_t *cr)
-{
-    VM_ASSERT(cr == rb_ec_ractor_ptr(ec));
-    VALUE v;
-    struct rb_ractor_queue *rq = &cr->sync.recv_queue;
-
-    while (UNDEF_P(v = ractor_try_receive(ec, cr, rq))) {
-        ractor_wait_receive(ec, cr, rq);
-    }
-
-    return v;
-}
-
-#if 0
-static void
-rq_dump(struct rb_ractor_queue *rq)
-{
-    bool bug = false;
-    for (int i=0; i<rq->cnt; i++) {
-        struct rb_ractor_basket *b = ractor_queue_at(NULL, rq, i);
-        fprintf(stderr, "%d (start:%d) type:%s %p %s\n", i, rq->start, basket_type_name(b->type),
-                (void *)b, RSTRING_PTR(RARRAY_AREF(b->v, 1)));
-        if (basket_type_p(b, basket_type_reserved) bug = true;
-    }
-    if (bug) rb_bug("!!");
-}
-#endif
-
-struct receive_block_data {
-    rb_ractor_t *cr;
-    struct rb_ractor_queue *rq;
-    VALUE v;
-    int index;
-    bool success;
-};
-
-static void
-ractor_receive_if_lock(rb_ractor_t *cr)
-{
-    VALUE m = cr->receiving_mutex;
-    if (m == Qfalse) {
-        m = cr->receiving_mutex = rb_mutex_new();
-    }
-    rb_mutex_lock(m);
-}
-
-static VALUE
-receive_if_body(VALUE ptr)
-{
-    struct receive_block_data *data = (struct receive_block_data *)ptr;
-
-    ractor_receive_if_lock(data->cr);
-    VALUE block_result = rb_yield(data->v);
-    rb_ractor_t *cr = data->cr;
-
-    RACTOR_LOCK_SELF(cr);
-    {
-        struct rb_ractor_basket *b = ractor_queue_at(cr, data->rq, data->index);
-        VM_ASSERT(basket_type_p(b, basket_type_reserved));
-        data->rq->reserved_cnt--;
-
-        if (RTEST(block_result)) {
-            ractor_queue_delete(cr, data->rq, b);
-            ractor_queue_compact(cr, data->rq);
-        }
-        else {
-            b->type.e = basket_type_ref;
-        }
-    }
-    RACTOR_UNLOCK_SELF(cr);
-
-    data->success = true;
-
-    if (RTEST(block_result)) {
-        return data->v;
-    }
-    else {
-        return Qundef;
-    }
-}
-
-static VALUE
-receive_if_ensure(VALUE v)
-{
-    struct receive_block_data *data = (struct receive_block_data *)v;
-    rb_ractor_t *cr = data->cr;
-
-    if (!data->success) {
-        RACTOR_LOCK_SELF(cr);
-        {
-            struct rb_ractor_basket *b = ractor_queue_at(cr, data->rq, data->index);
-            VM_ASSERT(basket_type_p(b, basket_type_reserved));
-            b->type.e = basket_type_deleted;
-            data->rq->reserved_cnt--;
-        }
-        RACTOR_UNLOCK_SELF(cr);
-    }
-
-    rb_mutex_unlock(cr->receiving_mutex);
-    return Qnil;
-}
-
-static VALUE
-ractor_receive_if(rb_execution_context_t *ec, VALUE crv, VALUE b)
-{
-    if (!RTEST(b)) rb_raise(rb_eArgError, "no block given");
-
-    rb_ractor_t *cr = rb_ec_ractor_ptr(ec);
-    unsigned int serial = (unsigned int)-1;
-    int index = 0;
-    struct rb_ractor_queue *rq = &cr->sync.recv_queue;
-
-    while (1) {
-        VALUE v = Qundef;
-
-        ractor_wait_receive(ec, cr, rq);
-
-        RACTOR_LOCK_SELF(cr);
-        {
-            if (serial != rq->serial) {
-                serial = rq->serial;
-                index = 0;
-            }
-
-            // check newer version
-            for (int i=index; i<rq->cnt; i++) {
-                if (!ractor_queue_skip_p(cr, rq, i)) {
-                    struct rb_ractor_basket *b = ractor_queue_at(cr, rq, i);
-                    v = ractor_basket_value(b);
-                    b->type.e = basket_type_reserved;
-                    rq->reserved_cnt++;
-                    index = i;
-                    break;
-                }
-            }
-        }
-        RACTOR_UNLOCK_SELF(cr);
-
-        if (!UNDEF_P(v)) {
-            struct receive_block_data data = {
-                .cr = cr,
-                .rq = rq,
-                .v = v,
-                .index = index,
-                .success = false,
-            };
-
-            VALUE result = rb_ensure(receive_if_body, (VALUE)&data,
-                                     receive_if_ensure, (VALUE)&data);
-
-            if (!UNDEF_P(result)) return result;
-            index++;
-        }
-
-        RUBY_VM_CHECK_INTS(ec);
-    }
-}
-
-static void
-ractor_send_basket(rb_execution_context_t *ec, rb_ractor_t *r, struct rb_ractor_basket *b)
-{
-    bool closed = false;
-
-    RACTOR_LOCK(r);
-    {
-        if (r->sync.incoming_port_closed) {
-            closed = true;
-        }
-        else {
-            ractor_queue_enq(r, &r->sync.recv_queue, b);
-            ractor_wakeup(r, wait_receiving, wakeup_by_send);
-        }
-    }
-    RACTOR_UNLOCK(r);
-
-    if (closed) {
-        rb_raise(rb_eRactorClosedError, "The incoming-port is already closed");
-    }
-}
-
-// Ractor#send
-
-static VALUE ractor_move(VALUE obj); // in this file
-static VALUE ractor_copy(VALUE obj); // in this file
-
-static void
-ractor_basket_prepare_contents(VALUE obj, VALUE move, volatile VALUE *pobj, enum rb_ractor_basket_type *ptype)
-{
-    VALUE v;
-    enum rb_ractor_basket_type type;
-
-    if (rb_ractor_shareable_p(obj)) {
-        type = basket_type_ref;
-        v = obj;
-    }
-    else if (!RTEST(move)) {
-        v = ractor_copy(obj);
-        type = basket_type_copy;
-    }
-    else {
-        type = basket_type_move;
-        v = ractor_move(obj);
-    }
-
-    *pobj = v;
-    *ptype = type;
-}
-
-static void
-ractor_basket_fill_(rb_ractor_t *cr, struct rb_ractor_basket *basket, VALUE obj, bool exc)
-{
-    VM_ASSERT(cr == GET_RACTOR());
-
-    basket->sender = cr->pub.self;
-    basket->p.send.exception = exc;
-    basket->p.send.v = obj;
-}
-
-static void
-ractor_basket_fill(rb_ractor_t *cr, struct rb_ractor_basket *basket, VALUE obj, VALUE move, bool exc)
-{
-    VALUE v;
-    enum rb_ractor_basket_type type;
-    ractor_basket_prepare_contents(obj, move, &v, &type);
-    ractor_basket_fill_(cr, basket, v, exc);
-    basket->type.e = type;
-}
-
-static void
-ractor_basket_fill_will(rb_ractor_t *cr, struct rb_ractor_basket *basket, VALUE obj, bool exc)
-{
-    ractor_basket_fill_(cr, basket, obj, exc);
-    basket->type.e = basket_type_will;
-}
-
-static VALUE
-ractor_send(rb_execution_context_t *ec, rb_ractor_t *r, VALUE obj, VALUE move)
-{
-    struct rb_ractor_basket basket;
-    // TODO: Ractor local GC
-    ractor_basket_fill(rb_ec_ractor_ptr(ec), &basket, obj, move, false);
-    ractor_send_basket(ec, r, &basket);
-    return r->pub.self;
-}
-
-// Ractor#take
-
-static bool
-ractor_take_has_will(rb_ractor_t *r)
-{
-    ASSERT_ractor_locking(r);
-
-    return basket_type_p(&r->sync.will_basket, basket_type_will);
-}
-
-static bool
-ractor_take_will(rb_ractor_t *r, struct rb_ractor_basket *b)
-{
-    ASSERT_ractor_locking(r);
-
-    if (ractor_take_has_will(r)) {
-        *b = r->sync.will_basket;
-        r->sync.will_basket.type.e = basket_type_none;
-        return true;
-    }
-    else {
-        VM_ASSERT(basket_type_p(&r->sync.will_basket, basket_type_none));
-        return false;
-    }
-}
-
-static bool
-ractor_take_will_lock(rb_ractor_t *r, struct rb_ractor_basket *b)
-{
-    ASSERT_ractor_unlocking(r);
-    bool taken;
-
-    RACTOR_LOCK(r);
-    {
-        taken = ractor_take_will(r, b);
-    }
-    RACTOR_UNLOCK(r);
-
-    return taken;
-}
-
-static bool
-ractor_register_take(rb_ractor_t *cr, rb_ractor_t *r, struct rb_ractor_basket *take_basket,
-                     bool is_take, struct rb_ractor_selector_take_config *config, bool ignore_error)
-{
-    struct rb_ractor_basket b = {
-        .type.e = basket_type_take_basket,
-        .sender = cr->pub.self,
-        .p = {
-            .take = {
-                .basket = take_basket,
-                .config = config,
-            },
-        },
-    };
-    bool closed = false;
-
-    RACTOR_LOCK(r);
-    {
-        if (is_take && ractor_take_will(r, take_basket)) {
-            RUBY_DEBUG_LOG("take over a will of r:%d", rb_ractor_id(r));
-        }
-        else if (!is_take && ractor_take_has_will(r)) {
-            RUBY_DEBUG_LOG("has_will");
-            VM_ASSERT(config != NULL);
-            config->closed = true;
-        }
-        else if (r->sync.outgoing_port_closed) {
-            closed = true;
-        }
-        else {
-            RUBY_DEBUG_LOG("register in r:%d", rb_ractor_id(r));
-            ractor_queue_enq(r, &r->sync.takers_queue, &b);
-
-            if (basket_none_p(take_basket)) {
-                ractor_wakeup(r, wait_yielding, wakeup_by_take);
-            }
-        }
-    }
-    RACTOR_UNLOCK(r);
-
-    if (closed) {
-        if (!ignore_error) rb_raise(rb_eRactorClosedError, "The outgoing-port is already closed");
-        return false;
-    }
-    else {
-        return true;
-    }
-}
-
-static bool
-ractor_deregister_take(rb_ractor_t *r, struct rb_ractor_basket *take_basket)
-{
-    struct rb_ractor_queue *ts = &r->sync.takers_queue;
-    bool deleted = false;
-
-    RACTOR_LOCK(r);
-    {
-        if (r->sync.outgoing_port_closed) {
-            // ok
-        }
-        else {
-            for (int i=0; i<ts->cnt; i++) {
-                struct rb_ractor_basket *b = ractor_queue_at(r, ts, i);
-                if (basket_type_p(b, basket_type_take_basket) && b->p.take.basket == take_basket) {
-                    ractor_queue_delete(r, ts, b);
-                    deleted = true;
-                }
-            }
-            if (deleted) {
-                ractor_queue_compact(r, ts);
-            }
-        }
-    }
-    RACTOR_UNLOCK(r);
-
-    return deleted;
-}
-
-static VALUE
-ractor_try_take(rb_ractor_t *cr, rb_ractor_t *r, struct rb_ractor_basket *take_basket)
-{
-    bool taken;
-
-    RACTOR_LOCK_SELF(cr);
-    {
-        if (basket_none_p(take_basket) || basket_type_p(take_basket, basket_type_yielding)) {
-            taken = false;
-        }
-        else {
-            taken = true;
-        }
-    }
-    RACTOR_UNLOCK_SELF(cr);
-
-    if (taken) {
-        RUBY_DEBUG_LOG("taken");
-        if (basket_type_p(take_basket, basket_type_deleted)) {
-            VM_ASSERT(r->sync.outgoing_port_closed);
-            rb_raise(rb_eRactorClosedError, "The outgoing-port is already closed");
-        }
-        return ractor_basket_accept(take_basket);
-    }
-    else {
-        RUBY_DEBUG_LOG("not taken");
-        return Qundef;
-    }
-}
-
-
-#if VM_CHECK_MODE > 0
-static bool
-ractor_check_specific_take_basket_lock(rb_ractor_t *r, struct rb_ractor_basket *tb)
-{
-    bool ret = false;
-    struct rb_ractor_queue *ts = &r->sync.takers_queue;
-
-    RACTOR_LOCK(r);
-    {
-        for (int i=0; i<ts->cnt; i++) {
-            struct rb_ractor_basket *b = ractor_queue_at(r, ts, i);
-            if (basket_type_p(b, basket_type_take_basket) && b->p.take.basket == tb) {
-                ret = true;
-                break;
-            }
-        }
-    }
-    RACTOR_UNLOCK(r);
-
-    return ret;
-}
-#endif
-
-static void
-ractor_take_cleanup(rb_ractor_t *cr, rb_ractor_t *r, struct rb_ractor_basket *tb)
-{
-  retry:
-    if (basket_none_p(tb)) { // not yielded yet
-        if (!ractor_deregister_take(r, tb)) {
-            // not in r's takers queue
-            rb_thread_sleep(0);
-            goto retry;
-        }
-    }
-    else {
-        VM_ASSERT(!ractor_check_specific_take_basket_lock(r, tb));
-    }
-}
-
-struct take_wait_take_cleanup_data {
-    rb_ractor_t *r;
-    struct rb_ractor_basket *tb;
-};
-
-static void
-ractor_wait_take_cleanup(rb_ractor_t *cr, void *ptr)
-{
-    struct take_wait_take_cleanup_data *data = (struct take_wait_take_cleanup_data *)ptr;
-    ractor_take_cleanup(cr, data->r, data->tb);
-}
-
-static void
-ractor_wait_take(rb_execution_context_t *ec, rb_ractor_t *cr, rb_ractor_t *r, struct rb_ractor_basket *take_basket)
-{
-    struct take_wait_take_cleanup_data data = {
-        .r = r,
-        .tb = take_basket,
-    };
-
-    RACTOR_LOCK_SELF(cr);
-    {
-        if (basket_none_p(take_basket) || basket_type_p(take_basket, basket_type_yielding)) {
-            ractor_sleep_with_cleanup(ec, cr, wait_taking, ractor_wait_take_cleanup, &data);
-        }
-    }
-    RACTOR_UNLOCK_SELF(cr);
-}
-
-static VALUE
-ractor_take(rb_execution_context_t *ec, rb_ractor_t *r)
-{
-    RUBY_DEBUG_LOG("from r:%u", rb_ractor_id(r));
-    VALUE v;
-    rb_ractor_t *cr = rb_ec_ractor_ptr(ec);
-
-    struct rb_ractor_basket take_basket = {
-        .type.e = basket_type_none,
-        .sender = 0,
-    };
-
-    ractor_register_take(cr, r, &take_basket, true, NULL, false);
-
-    while (UNDEF_P(v = ractor_try_take(cr, r, &take_basket))) {
-        ractor_wait_take(ec, cr, r, &take_basket);
-    }
-
-    VM_ASSERT(!basket_none_p(&take_basket));
-    VM_ASSERT(!ractor_check_specific_take_basket_lock(r, &take_basket));
-
-    return v;
-}
-
-// Ractor.yield
-
-static bool
-ractor_check_take_basket(rb_ractor_t *cr, struct rb_ractor_queue *rs)
-{
-    ASSERT_ractor_locking(cr);
-
-    for (int i=0; i<rs->cnt; i++) {
-        struct rb_ractor_basket *b = ractor_queue_at(cr, rs, i);
-        if (basket_type_p(b, basket_type_take_basket) &&
-            basket_none_p(b->p.take.basket)) {
-            return true;
-        }
-    }
-
-    return false;
-}
-
-static bool
-ractor_deq_take_basket(rb_ractor_t *cr, struct rb_ractor_queue *rs, struct rb_ractor_basket *b)
-{
-    ASSERT_ractor_unlocking(cr);
-    struct rb_ractor_basket *first_tb = NULL;
-    bool found = false;
-
-    RACTOR_LOCK_SELF(cr);
-    {
-        while (ractor_queue_deq(cr, rs, b)) {
-            if (basket_type_p(b, basket_type_take_basket)) {
-                struct rb_ractor_basket *tb = b->p.take.basket;
-
-                if (RUBY_ATOMIC_CAS(tb->type.atomic, basket_type_none, basket_type_yielding) == basket_type_none) {
-                    found = true;
-                    break;
-                }
-                else {
-                    ractor_queue_enq(cr, rs, b);
-                    if (first_tb == NULL) first_tb = tb;
-                    struct rb_ractor_basket *head = ractor_queue_head(cr, rs);
-                    VM_ASSERT(head != NULL);
-                    if (basket_type_p(head, basket_type_take_basket) && head->p.take.basket == first_tb) {
-                        break; // loop detected
-                    }
-                }
-            }
-            else {
-                VM_ASSERT(basket_none_p(b));
-            }
-        }
-
-        if (found && b->p.take.config && !b->p.take.config->oneshot) {
-            ractor_queue_enq(cr, rs, b);
-        }
-    }
-    RACTOR_UNLOCK_SELF(cr);
-
-    return found;
-}
-
-static bool
-ractor_try_yield(rb_execution_context_t *ec, rb_ractor_t *cr, struct rb_ractor_queue *ts, volatile VALUE obj, VALUE move, bool exc, bool is_will)
-{
-    ASSERT_ractor_unlocking(cr);
-
-    struct rb_ractor_basket b;
-
-    if (ractor_deq_take_basket(cr, ts, &b)) {
-        VM_ASSERT(basket_type_p(&b, basket_type_take_basket));
-        VM_ASSERT(basket_type_p(b.p.take.basket, basket_type_yielding));
-
-        rb_ractor_t *tr = RACTOR_PTR(b.sender);
-        struct rb_ractor_basket *tb = b.p.take.basket;
-        enum rb_ractor_basket_type type;
-
-        RUBY_DEBUG_LOG("basket from r:%u", rb_ractor_id(tr));
-
-        if (is_will) {
-            type = basket_type_will;
-        }
-        else {
-            int state;
-
-            // begin
-            EC_PUSH_TAG(ec);
-            if ((state = EC_EXEC_TAG()) == TAG_NONE) {
-                // TODO: Ractor local GC
-                ractor_basket_prepare_contents(obj, move, &obj, &type);
-            }
-            EC_POP_TAG();
-            // rescue
-            if (state) {
-                RACTOR_LOCK_SELF(cr);
-                {
-                    b.p.take.basket->type.e = basket_type_none;
-                    ractor_queue_enq(cr, ts, &b);
-                }
-                RACTOR_UNLOCK_SELF(cr);
-                EC_JUMP_TAG(ec, state);
-            }
-        }
-
-        RACTOR_LOCK(tr);
-        {
-            VM_ASSERT(basket_type_p(tb, basket_type_yielding));
-            // fill atomic
-            RUBY_DEBUG_LOG("fill %sbasket from r:%u", is_will ? "will " : "", rb_ractor_id(tr));
-            ractor_basket_fill_(cr, tb, obj, exc);
-            if (RUBY_ATOMIC_CAS(tb->type.atomic, basket_type_yielding, type) != basket_type_yielding) {
-                rb_bug("unreachable");
-            }
-            ractor_wakeup(tr, wait_taking, wakeup_by_yield);
-        }
-        RACTOR_UNLOCK(tr);
-
-        return true;
-    }
-    else {
-        RUBY_DEBUG_LOG("no take basket");
-        return false;
-    }
-}
-
-static void
-ractor_wait_yield(rb_execution_context_t *ec, rb_ractor_t *cr, struct rb_ractor_queue *ts)
-{
-    RACTOR_LOCK_SELF(cr);
-    {
-        while (!ractor_check_take_basket(cr, ts)) {
-            ractor_sleep(ec, cr, wait_yielding);
-        }
-    }
-    RACTOR_UNLOCK_SELF(cr);
-}
-
-static VALUE
-ractor_yield(rb_execution_context_t *ec, rb_ractor_t *cr, VALUE obj, VALUE move)
-{
-    struct rb_ractor_queue *ts = &cr->sync.takers_queue;
-
-    while (!ractor_try_yield(ec, cr, ts, obj, move, false, false)) {
-        ractor_wait_yield(ec, cr, ts);
-    }
-
-    return Qnil;
-}
-
-// Ractor::Selector
-
-struct rb_ractor_selector {
-    rb_ractor_t *r;
-    struct rb_ractor_basket take_basket;
-    st_table *take_ractors; // rb_ractor_t * => (struct rb_ractor_selector_take_config *)
-};
-
-static int
-ractor_selector_mark_ractors_i(st_data_t key, st_data_t value, st_data_t data)
-{
-    const rb_ractor_t *r = (rb_ractor_t *)key;
-    rb_gc_mark(r->pub.self);
-    return ST_CONTINUE;
-}
-
-static void
-ractor_selector_mark(void *ptr)
-{
-    struct rb_ractor_selector *s = ptr;
-
-    if (s->take_ractors) {
-        st_foreach(s->take_ractors, ractor_selector_mark_ractors_i, 0);
-    }
-
-    switch (s->take_basket.type.e) {
-      case basket_type_ref:
-      case basket_type_copy:
-      case basket_type_move:
-      case basket_type_will:
-        rb_gc_mark(s->take_basket.sender);
-        rb_gc_mark(s->take_basket.p.send.v);
-        break;
-      default:
-        break;
-    }
-}
-
-static int
-ractor_selector_release_i(st_data_t key, st_data_t val, st_data_t data)
-{
-    struct rb_ractor_selector *s = (struct rb_ractor_selector *)data;
-    struct rb_ractor_selector_take_config *config = (struct rb_ractor_selector_take_config *)val;
-
-    if (!config->closed) {
-        ractor_deregister_take((rb_ractor_t *)key, &s->take_basket);
-    }
-    free(config);
-    return ST_CONTINUE;
-}
-
-static void
-ractor_selector_free(void *ptr)
-{
-    struct rb_ractor_selector *s = ptr;
-    st_foreach(s->take_ractors, ractor_selector_release_i, (st_data_t)s);
-    st_free_table(s->take_ractors);
-    ruby_xfree(ptr);
-}
-
-static size_t
-ractor_selector_memsize(const void *ptr)
-{
-    const struct rb_ractor_selector *s = ptr;
-    return sizeof(struct rb_ractor_selector) +
-      st_memsize(s->take_ractors) +
-      s->take_ractors->num_entries * sizeof(struct rb_ractor_selector_take_config);
-}
-
-static const rb_data_type_t ractor_selector_data_type = {
-    "ractor/selector",
-    {
-        ractor_selector_mark,
-        ractor_selector_free,
-        ractor_selector_memsize,
-        NULL, // update
-    },
-    0, 0, RUBY_TYPED_FREE_IMMEDIATELY,
-};
-
-static struct rb_ractor_selector *
-RACTOR_SELECTOR_PTR(VALUE selv)
-{
-    VM_ASSERT(rb_typeddata_is_kind_of(selv, &ractor_selector_data_type));
-
-    return (struct rb_ractor_selector *)DATA_PTR(selv);
-}
-
-// Ractor::Selector.new
-
-static VALUE
-ractor_selector_create(VALUE crv)
-{
-    struct rb_ractor_selector *s;
-    VALUE selv = TypedData_Make_Struct(rb_cRactorSelector, struct rb_ractor_selector, &ractor_selector_data_type, s);
-    s->take_basket.type.e = basket_type_reserved;
-    s->take_ractors = st_init_numtable(); // ractor (ptr) -> take_config
-    return selv;
-}
-
-// Ractor::Selector#add(r)
-
-static VALUE
-ractor_selector_add(rb_execution_context_t *ec, VALUE selv, VALUE rv)
-{
-    if (!rb_ractor_p(rv)) {
-        rb_raise(rb_eArgError, "Not a ractor object");
-    }
-
-    rb_ractor_t *r = RACTOR_PTR(rv);
-    struct rb_ractor_selector *s = RACTOR_SELECTOR_PTR(selv);
-
-    if (st_lookup(s->take_ractors, (st_data_t)r, NULL)) {
-        rb_raise(rb_eArgError, "already added");
-    }
-
-    struct rb_ractor_selector_take_config *config = malloc(sizeof(struct rb_ractor_selector_take_config));
-    VM_ASSERT(config != NULL);
-    config->closed = false;
-    config->oneshot = false;
-
-    if (ractor_register_take(rb_ec_ractor_ptr(ec), r, &s->take_basket, false, config, true)) {
-        st_insert(s->take_ractors, (st_data_t)r, (st_data_t)config);
-    }
-
-    return rv;
-}
-
-// Ractor::Selector#remove(r)
-
-static VALUE
-ractor_selector_remove(rb_execution_context_t *ec, VALUE selv, VALUE rv)
-{
-    if (!rb_ractor_p(rv)) {
-        rb_raise(rb_eArgError, "Not a ractor object");
-    }
-
-    rb_ractor_t *r = RACTOR_PTR(rv);
-    struct rb_ractor_selector *s = RACTOR_SELECTOR_PTR(selv);
-
-    RUBY_DEBUG_LOG("r:%u", rb_ractor_id(r));
-
-    if (!st_lookup(s->take_ractors, (st_data_t)r, NULL)) {
-        rb_raise(rb_eArgError, "not added yet");
-    }
-
-    ractor_deregister_take(r, &s->take_basket);
-    struct rb_ractor_selector_take_config *config;
-    st_delete(s->take_ractors, (st_data_t *)&r, (st_data_t *)&config);
-    free(config);
-
-    return rv;
-}
-
-// Ractor::Selector#clear
-
-struct ractor_selector_clear_data {
-    VALUE selv;
-    rb_execution_context_t *ec;
-};
-
-static int
-ractor_selector_clear_i(st_data_t key, st_data_t val, st_data_t data)
-{
-    struct ractor_selector_clear_data *ptr = (struct ractor_selector_clear_data *)data;
-    rb_ractor_t *r = (rb_ractor_t *)key;
-    ractor_selector_remove(ptr->ec, ptr->selv, r->pub.self);
-    return ST_CONTINUE;
-}
-
-static VALUE
-ractor_selector_clear(rb_execution_context_t *ec, VALUE selv)
-{
-    struct ractor_selector_clear_data data = {
-        .selv = selv,
-        .ec = ec,
-    };
-    struct rb_ractor_selector *s = RACTOR_SELECTOR_PTR(selv);
-
-    st_foreach(s->take_ractors, ractor_selector_clear_i, (st_data_t)&data);
-    st_clear(s->take_ractors);
-    return selv;
-}
-
-static VALUE
-ractor_selector_empty_p(rb_execution_context_t *ec, VALUE selv)
-{
-    struct rb_ractor_selector *s = RACTOR_SELECTOR_PTR(selv);
-    return s->take_ractors->num_entries == 0 ? Qtrue : Qfalse;
-}
-
-static int
-ractor_selector_wait_i(st_data_t key, st_data_t val, st_data_t dat)
-{
-    rb_ractor_t *r = (rb_ractor_t *)key;
-    struct rb_ractor_basket *tb = (struct rb_ractor_basket *)dat;
-    int ret;
-
-    if (!basket_none_p(tb)) {
-        RUBY_DEBUG_LOG("already taken:%s", basket_type_name(tb->type.e));
-        return ST_STOP;
-    }
-
-    RACTOR_LOCK(r);
-    {
-        if (basket_type_p(&r->sync.will_basket, basket_type_will)) {
-            RUBY_DEBUG_LOG("r:%u has will", rb_ractor_id(r));
-
-            if (RUBY_ATOMIC_CAS(tb->type.atomic, basket_type_none, basket_type_will) == basket_type_none) {
-                ractor_take_will(r, tb);
-                ret = ST_STOP;
-            }
-            else {
-                RUBY_DEBUG_LOG("has will, but already taken (%s)", basket_type_name(tb->type.e));
-                ret = ST_CONTINUE;
-            }
-        }
-        else if (r->sync.outgoing_port_closed) {
-            RUBY_DEBUG_LOG("r:%u is closed", rb_ractor_id(r));
-
-            if (RUBY_ATOMIC_CAS(tb->type.atomic, basket_type_none, basket_type_deleted) == basket_type_none) {
-                tb->sender = r->pub.self;
-                ret = ST_STOP;
-            }
-            else {
-                RUBY_DEBUG_LOG("closed, but already taken (%s)", basket_type_name(tb->type.e));
-                ret = ST_CONTINUE;
-            }
-        }
-        else {
-            RUBY_DEBUG_LOG("wakeup r:%u", rb_ractor_id(r));
-            ractor_wakeup(r, wait_yielding, wakeup_by_take);
-            ret = ST_CONTINUE;
-        }
-    }
-    RACTOR_UNLOCK(r);
-
-    return ret;
-}
-
-// Ractor::Selector#wait
-
-static void
-ractor_selector_wait_cleaup(rb_ractor_t *cr, void *ptr)
-{
-    struct rb_ractor_basket *tb = (struct rb_ractor_basket *)ptr;
-
-    RACTOR_LOCK_SELF(cr);
-    {
-        while (basket_type_p(tb, basket_type_yielding)) rb_thread_sleep(0);
-        // if tb->type is not none, taking is succeeded, but interruption ignore it unfortunately.
-        tb->type.e = basket_type_reserved;
-    }
-    RACTOR_UNLOCK_SELF(cr);
-}
-
-static VALUE
-ractor_selector_wait(rb_execution_context_t *ec, VALUE selv, VALUE do_receivev, VALUE do_yieldv, VALUE yield_value, VALUE move)
-{
-    struct rb_ractor_selector *s = RACTOR_SELECTOR_PTR(selv);
-    struct rb_ractor_basket *tb = &s->take_basket;
-    struct rb_ractor_basket taken_basket;
-    rb_ractor_t *cr = rb_ec_ractor_ptr(ec);
-    bool do_receive = !!RTEST(do_receivev);
-    bool do_yield = !!RTEST(do_yieldv);
-    VALUE ret_v, ret_r;
-    enum rb_ractor_wait_status wait_status;
-    struct rb_ractor_queue *rq = &cr->sync.recv_queue;
-    struct rb_ractor_queue *ts = &cr->sync.takers_queue;
-
-    RUBY_DEBUG_LOG("start");
-
-  retry:
-    RUBY_DEBUG_LOG("takers:%ld", s->take_ractors->num_entries);
-
-    // setup wait_status
-    wait_status = wait_none;
-    if (s->take_ractors->num_entries > 0) wait_status |= wait_taking;
-    if (do_receive)                       wait_status |= wait_receiving;
-    if (do_yield)                         wait_status |= wait_yielding;
-
-    RUBY_DEBUG_LOG("wait:%s", wait_status_str(wait_status));
-
-    if (wait_status == wait_none) {
-        rb_raise(rb_eRactorError, "no taking ractors");
-    }
-
-    // check recv_queue
-    if (do_receive && (ret_v = ractor_try_receive(ec, cr, rq)) != Qundef) {
-        ret_r = ID2SYM(rb_intern("receive"));
-        goto success;
-    }
-
-    // check takers
-    if (do_yield && ractor_try_yield(ec, cr, ts, yield_value, move, false, false)) {
-        ret_v = Qnil;
-        ret_r = ID2SYM(rb_intern("yield"));
-        goto success;
-    }
-
-    // check take_basket
-    VM_ASSERT(basket_type_p(&s->take_basket, basket_type_reserved));
-    s->take_basket.type.e = basket_type_none;
-    // kick all take target ractors
-    st_foreach(s->take_ractors, ractor_selector_wait_i, (st_data_t)tb);
-
-    RACTOR_LOCK_SELF(cr);
-    {
-      retry_waiting:
-        while (1) {
-            if (!basket_none_p(tb)) {
-                RUBY_DEBUG_LOG("taken:%s from r:%u", basket_type_name(tb->type.e),
-                               tb->sender ? rb_ractor_id(RACTOR_PTR(tb->sender)) : 0);
-                break;
-            }
-            if (do_receive && !ractor_queue_empty_p(cr, rq)) {
-                RUBY_DEBUG_LOG("can receive (%d)", rq->cnt);
-                break;
-            }
-            if (do_yield && ractor_check_take_basket(cr, ts)) {
-                RUBY_DEBUG_LOG("can yield");
-                break;
-            }
-
-            ractor_sleep_with_cleanup(ec, cr, wait_status, ractor_selector_wait_cleaup, tb);
-        }
-
-        taken_basket = *tb;
-
-        // ensure
-        //   tb->type.e = basket_type_reserved # do it atomic in the following code
-        if (taken_basket.type.e == basket_type_yielding ||
-            RUBY_ATOMIC_CAS(tb->type.atomic, taken_basket.type.e, basket_type_reserved) != taken_basket.type.e) {
-
-            if (basket_type_p(tb, basket_type_yielding)) {
-                RACTOR_UNLOCK_SELF(cr);
-                {
-                    rb_thread_sleep(0);
-                }
-                RACTOR_LOCK_SELF(cr);
-            }
-            goto retry_waiting;
-        }
-    }
-    RACTOR_UNLOCK_SELF(cr);
-
-    // check the taken resutl
-    switch (taken_basket.type.e) {
-      case basket_type_none:
-        VM_ASSERT(do_receive || do_yield);
-        goto retry;
-      case basket_type_yielding:
-        rb_bug("unreachable");
-      case basket_type_deleted: {
-          ractor_selector_remove(ec, selv, taken_basket.sender);
-
-          rb_ractor_t *r = RACTOR_PTR(taken_basket.sender);
-          if (ractor_take_will_lock(r, &taken_basket)) {
-              RUBY_DEBUG_LOG("has_will");
-          }
-          else {
-              RUBY_DEBUG_LOG("no will");
-              // rb_raise(rb_eRactorClosedError, "The outgoing-port is already closed");
-              // remove and retry wait
-              goto retry;
-          }
-          break;
-      }
-      case basket_type_will:
-        // no more messages
-        ractor_selector_remove(ec, selv, taken_basket.sender);
-        break;
-      default:
-        break;
-    }
-
-    RUBY_DEBUG_LOG("taken_basket:%s", basket_type_name(taken_basket.type.e));
-
-    ret_v = ractor_basket_accept(&taken_basket);
-    ret_r = taken_basket.sender;
-  success:
-    return rb_ary_new_from_args(2, ret_r, ret_v);
-}
-
-// Ractor#close_incoming
-
-static VALUE
-ractor_close_incoming(rb_execution_context_t *ec, rb_ractor_t *r)
-{
-    VALUE prev;
-
-    RACTOR_LOCK(r);
-    {
-        if (!r->sync.incoming_port_closed) {
-            prev = Qfalse;
-            r->sync.incoming_port_closed = true;
-            if (ractor_wakeup(r, wait_receiving, wakeup_by_close)) {
-                VM_ASSERT(ractor_queue_empty_p(r, &r->sync.recv_queue));
-                RUBY_DEBUG_LOG("cancel receiving");
-            }
-        }
-        else {
-            prev = Qtrue;
-        }
-    }
-    RACTOR_UNLOCK(r);
-    return prev;
-}
-
-// Ractor#close_outgoing
-
-static VALUE
-ractor_close_outgoing(rb_execution_context_t *ec, rb_ractor_t *r)
-{
-    VALUE prev;
-
-    RACTOR_LOCK(r);
-    {
-        struct rb_ractor_queue *ts = &r->sync.takers_queue;
-        rb_ractor_t *tr;
-        struct rb_ractor_basket b;
-
-        if (!r->sync.outgoing_port_closed) {
-            prev = Qfalse;
-            r->sync.outgoing_port_closed = true;
-        }
-        else {
-            VM_ASSERT(ractor_queue_empty_p(r, ts));
-            prev = Qtrue;
-        }
-
-        // wakeup all taking ractors
-        while (ractor_queue_deq(r, ts, &b)) {
-            if (basket_type_p(&b, basket_type_take_basket)) {
-                tr = RACTOR_PTR(b.sender);
-                struct rb_ractor_basket *tb = b.p.take.basket;
-
-                if (RUBY_ATOMIC_CAS(tb->type.atomic, basket_type_none, basket_type_yielding) == basket_type_none) {
-                    b.p.take.basket->sender = r->pub.self;
-                    if (RUBY_ATOMIC_CAS(tb->type.atomic, basket_type_yielding, basket_type_deleted) != basket_type_yielding) {
-                        rb_bug("unreachable");
-                    }
-                    RUBY_DEBUG_LOG("set delete for r:%u", rb_ractor_id(RACTOR_PTR(b.sender)));
-                }
-
-                if (b.p.take.config) {
-                    b.p.take.config->closed = true;
-                }
-
-                // TODO: deadlock-able?
-                RACTOR_LOCK(tr);
-                {
-                    ractor_wakeup(tr, wait_taking, wakeup_by_close);
-                }
-                RACTOR_UNLOCK(tr);
-            }
-        }
-
-        // raising yielding Ractor
-        ractor_wakeup(r, wait_yielding, wakeup_by_close);
-
-        VM_ASSERT(ractor_queue_empty_p(r, ts));
+{
+    if (GET_THREAD()->ractor == NULL) {
+        return 1; // main ractor
+    }
+    else {
+        return rb_ractor_id(GET_RACTOR());
     }
-    RACTOR_UNLOCK(r);
-    return prev;
 }
+#endif
+
+#include "ractor_sync.c"
 
 // creation/termination
 
@@ -1821,6 +316,13 @@ vm_insert_ractor0(rb_vm_t *vm, rb_ractor_t *r, bool single_ractor_mode)
 
     ccan_list_add_tail(&vm->ractor.set, &r->vmlr_node);
     vm->ractor.cnt++;
+
+    if (r->newobj_cache) {
+        VM_ASSERT(r == ruby_single_main_ractor);
+    }
+    else {
+        r->newobj_cache = rb_gc_ractor_cache_alloc(r);
+    }
 }
 
 static void
@@ -1829,15 +331,8 @@ cancel_single_ractor_mode(void)
     // enable multi-ractor mode
     RUBY_DEBUG_LOG("enable multi-ractor mode");
 
-    VALUE was_disabled = rb_gc_enable();
-
-    rb_gc_start();
-
-    if (was_disabled) {
-        rb_gc_disable();
-    }
-
     ruby_single_main_ractor = NULL;
+    rb_funcall(rb_cRactor, rb_intern("_activated"), 0);
 }
 
 static void
@@ -1888,8 +383,8 @@ vm_remove_ractor(rb_vm_t *vm, rb_ractor_t *cr)
         }
         vm->ractor.cnt--;
 
-        /* Clear the cached freelist to prevent a memory leak. */
-        rb_gc_ractor_newobj_cache_clear(&cr->newobj_cache);
+        rb_gc_ractor_cache_free(cr->newobj_cache);
+        cr->newobj_cache = NULL;
 
         ractor_status_set(cr, ractor_terminated);
     }
@@ -1910,22 +405,24 @@ ractor_alloc(VALUE klass)
 rb_ractor_t *
 rb_ractor_main_alloc(void)
 {
-    rb_ractor_t *r = ruby_mimmalloc(sizeof(rb_ractor_t));
+    rb_ractor_t *r = ruby_mimcalloc(1, sizeof(rb_ractor_t));
     if (r == NULL) {
         fprintf(stderr, "[FATAL] failed to allocate memory for main ractor\n");
         exit(EXIT_FAILURE);
     }
-    MEMZERO(r, rb_ractor_t, 1);
     r->pub.id = ++ractor_last_id;
     r->loc = Qnil;
     r->name = Qnil;
     r->pub.self = Qnil;
+    r->newobj_cache = rb_gc_ractor_cache_alloc(r);
     ruby_single_main_ractor = r;
 
     return r;
 }
 
 #if defined(HAVE_WORKING_FORK)
+// Set up the main Ractor for the VM after fork.
+// Puts us in "single Ractor mode"
 void
 rb_ractor_atfork(rb_vm_t *vm, rb_thread_t *th)
 {
@@ -1941,9 +438,18 @@ rb_ractor_atfork(rb_vm_t *vm, rb_thread_t *th)
     VM_ASSERT(vm->ractor.blocking_cnt == 0);
     VM_ASSERT(vm->ractor.cnt == 1);
 }
+
+void
+rb_ractor_terminate_atfork(rb_vm_t *vm, rb_ractor_t *r)
+{
+    rb_gc_ractor_cache_free(r->newobj_cache);
+    r->newobj_cache = NULL;
+    r->status_ = ractor_terminated;
+    ractor_sync_terminate_atfork(vm, r);
+}
 #endif
 
-void rb_thread_sched_init(struct rb_thread_sched *);
+void rb_thread_sched_init(struct rb_thread_sched *, bool atfork);
 
 void
 rb_ractor_living_threads_init(rb_ractor_t *r)
@@ -1956,14 +462,10 @@ rb_ractor_living_threads_init(rb_ractor_t *r)
 static void
 ractor_init(rb_ractor_t *r, VALUE name, VALUE loc)
 {
-    ractor_queue_setup(&r->sync.recv_queue);
-    ractor_queue_setup(&r->sync.takers_queue);
-    rb_native_mutex_initialize(&r->sync.lock);
-    rb_native_cond_initialize(&r->sync.cond);
-    rb_native_cond_initialize(&r->barrier_wait_cond);
+    ractor_sync_init(r);
 
     // thread management
-    rb_thread_sched_init(&r->threads.sched);
+    rb_thread_sched_init(&r->threads.sched, false);
     rb_ractor_living_threads_init(r);
 
     // naming
@@ -1984,11 +486,13 @@ ractor_init(rb_ractor_t *r, VALUE name, VALUE loc)
 void
 rb_ractor_main_setup(rb_vm_t *vm, rb_ractor_t *r, rb_thread_t *th)
 {
-    r->pub.self = TypedData_Wrap_Struct(rb_cRactor, &ractor_data_type, r);
+    VALUE rv = r->pub.self = TypedData_Wrap_Struct(rb_cRactor, &ractor_data_type, r);
     FL_SET_RAW(r->pub.self, RUBY_FL_SHAREABLE);
     ractor_init(r, Qnil, Qnil);
     r->threads.main = th;
     rb_ractor_living_threads_insert(r, th);
+
+    RB_GC_GUARD(rv);
 }
 
 static VALUE
@@ -2007,83 +511,58 @@ ractor_create(rb_execution_context_t *ec, VALUE self, VALUE loc, VALUE name, VAL
     r->debug = cr->debug;
 
     rb_yjit_before_ractor_spawn();
-    rb_rjit_before_ractor_spawn();
     rb_thread_create_ractor(r, args, block);
 
     RB_GC_GUARD(rv);
     return rv;
 }
 
-static void
-ractor_yield_atexit(rb_execution_context_t *ec, rb_ractor_t *cr, VALUE v, bool exc)
+#if 0
+static VALUE
+ractor_create_func(VALUE klass, VALUE loc, VALUE name, VALUE args, rb_block_call_func_t func)
 {
-    if (cr->sync.outgoing_port_closed) {
-        return;
-    }
-
-    ASSERT_ractor_unlocking(cr);
-
-    struct rb_ractor_queue *ts = &cr->sync.takers_queue;
-
-  retry:
-    if (ractor_try_yield(ec, cr, ts, v, Qfalse, exc, true)) {
-        // OK.
-    }
-    else {
-        bool retry = false;
-        RACTOR_LOCK(cr);
-        {
-            if (!ractor_check_take_basket(cr, ts)) {
-                VM_ASSERT(cr->sync.wait.status == wait_none);
-                RUBY_DEBUG_LOG("leave a will");
-                ractor_basket_fill_will(cr, &cr->sync.will_basket, v, exc);
-            }
-            else {
-                RUBY_DEBUG_LOG("rare timing!");
-                retry = true; // another ractor is waiting for the yield.
-            }
-        }
-        RACTOR_UNLOCK(cr);
+    VALUE block = rb_proc_new(func, Qnil);
+    return ractor_create(rb_current_ec_noinline(), klass, loc, name, args, block);
+}
+#endif
 
-        if (retry) goto retry;
-    }
+static void
+ractor_atexit(rb_execution_context_t *ec, rb_ractor_t *cr, VALUE result, bool exc)
+{
+    ractor_notify_exit(ec, cr, result, exc);
 }
 
 void
 rb_ractor_atexit(rb_execution_context_t *ec, VALUE result)
 {
     rb_ractor_t *cr = rb_ec_ractor_ptr(ec);
-    ractor_yield_atexit(ec, cr, result, false);
+    ractor_atexit(ec, cr, result, false);
 }
 
 void
 rb_ractor_atexit_exception(rb_execution_context_t *ec)
 {
     rb_ractor_t *cr = rb_ec_ractor_ptr(ec);
-    ractor_yield_atexit(ec, cr, ec->errinfo, true);
+    ractor_atexit(ec, cr, ec->errinfo, true);
 }
 
 void
 rb_ractor_teardown(rb_execution_context_t *ec)
 {
     rb_ractor_t *cr = rb_ec_ractor_ptr(ec);
-    ractor_close_incoming(ec, cr);
-    ractor_close_outgoing(ec, cr);
 
     // sync with rb_ractor_terminate_interrupt_main_thread()
-    RB_VM_LOCK_ENTER();
-    {
+    RB_VM_LOCKING() {
         VM_ASSERT(cr->threads.main != NULL);
         cr->threads.main = NULL;
     }
-    RB_VM_LOCK_LEAVE();
 }
 
 void
 rb_ractor_receive_parameters(rb_execution_context_t *ec, rb_ractor_t *r, int len, VALUE *ptr)
 {
     for (int i=0; i<len; i++) {
-        ptr[i] = ractor_receive(ec, r);
+        ptr[i] = ractor_receive(ec, ractor_default_port(r));
     }
 }
 
@@ -2092,7 +571,7 @@ rb_ractor_send_parameters(rb_execution_context_t *ec, rb_ractor_t *r, VALUE args
 {
     int len = RARRAY_LENINT(args);
     for (int i=0; i<len; i++) {
-        ractor_send(ec, r, RARRAY_AREF(args, i), false);
+        ractor_send(ec, ractor_default_port(r), RARRAY_AREF(args, i), false);
     }
 }
 
@@ -2208,16 +687,15 @@ ractor_check_blocking(rb_ractor_t *cr, unsigned int remained_thread_cnt, const c
         cr->threads.cnt == cr->threads.blocking_cnt + 1) {
         // change ractor status: running -> blocking
         rb_vm_t *vm = GET_VM();
-        ASSERT_vm_unlocking();
 
-        RB_VM_LOCK();
-        {
+        RB_VM_LOCKING() {
             rb_vm_ractor_blocking_cnt_inc(vm, cr, file, line);
         }
-        RB_VM_UNLOCK();
     }
 }
 
+void rb_threadptr_remove(rb_thread_t *th);
+
 void
 rb_ractor_living_threads_remove(rb_ractor_t *cr, rb_thread_t *th)
 {
@@ -2225,6 +703,8 @@ rb_ractor_living_threads_remove(rb_ractor_t *cr, rb_thread_t *th)
     RUBY_DEBUG_LOG("r->threads.cnt:%d--", cr->threads.cnt);
     ractor_check_blocking(cr, cr->threads.cnt - 1, __FILE__, __LINE__);
 
+    rb_threadptr_remove(th);
+
     if (cr->threads.cnt == 1) {
         vm_remove_ractor(th->vm, cr);
     }
@@ -2262,11 +742,9 @@ rb_ractor_blocking_threads_dec(rb_ractor_t *cr, const char *file, int line)
     if (cr->threads.cnt == cr->threads.blocking_cnt) {
         rb_vm_t *vm = GET_VM();
 
-        RB_VM_LOCK_ENTER();
-        {
+        RB_VM_LOCKING() {
             rb_vm_ractor_blocking_cnt_dec(vm, cr, __FILE__, __LINE__);
         }
-        RB_VM_LOCK_LEAVE();
     }
 
     cr->threads.blocking_cnt--;
@@ -2327,6 +805,9 @@ ractor_terminal_interrupt_all(rb_vm_t *vm)
     }
 }
 
+void rb_add_running_thread(rb_thread_t *th);
+void rb_del_running_thread(rb_thread_t *th);
+
 void
 rb_ractor_terminate_all(void)
 {
@@ -2354,7 +835,9 @@ rb_ractor_terminate_all(void)
 
             // wait for 1sec
             rb_vm_ractor_blocking_cnt_inc(vm, cr, __FILE__, __LINE__);
+            rb_del_running_thread(rb_ec_thread_ptr(cr->threads.running_ec));
             rb_vm_cond_timedwait(vm, &vm->ractor.sync.terminate_cond, 1000 /* ms */);
+            rb_add_running_thread(rb_ec_thread_ptr(cr->threads.running_ec));
             rb_vm_ractor_blocking_cnt_dec(vm, cr, __FILE__, __LINE__);
 
             ractor_terminal_interrupt_all(vm);
@@ -2366,7 +849,23 @@ rb_ractor_terminate_all(void)
 rb_execution_context_t *
 rb_vm_main_ractor_ec(rb_vm_t *vm)
 {
-    return vm->ractor.main_ractor->threads.running_ec;
+    /* This code needs to carefully work around two bugs:
+     *   - Bug #20016: When M:N threading is enabled, running_ec is NULL if no thread is
+     *     actually currently running (as opposed to without M:N threading, when
+     *     running_ec will still point to the _last_ thread which ran)
+     *   - Bug #20197: If the main thread is sleeping, setting its postponed job
+     *     interrupt flag is pointless; it won't look at the flag until it stops sleeping
+     *     for some reason. It would be better to set the flag on the running ec, which
+     *     will presumably look at it soon.
+     *
+     *  Solution: use running_ec if it's set, otherwise fall back to the main thread ec.
+     *  This is still susceptible to some rare race conditions (what if the last thread
+     *  to run just entered a long-running sleep?), but seems like the best balance of
+     *  robustness and complexity.
+     */
+    rb_execution_context_t *running_ec = vm->ractor.main_ractor->threads.running_ec;
+    if (running_ec) { return running_ec; }
+    return vm->ractor.main_thread->ec;
 }
 
 static VALUE
@@ -2495,8 +994,7 @@ Init_Ractor(void)
     rb_define_method(rb_cRactorMovedObject, "instance_eval", ractor_moved_missing, -1);
     rb_define_method(rb_cRactorMovedObject, "instance_exec", ractor_moved_missing, -1);
 
-    rb_cRactorSelector = rb_define_class_under(rb_cRactor, "Selector", rb_cObject);
-    rb_undef_alloc_func(rb_cRactorSelector);
+    Init_RactorPort();
 }
 
 void
@@ -2642,19 +1140,6 @@ obj_hash_traverse_i(VALUE key, VALUE val, VALUE ptr)
     return ST_CONTINUE;
 }
 
-static int
-obj_hash_iv_traverse_i(st_data_t key, st_data_t val, st_data_t ptr)
-{
-    struct obj_traverse_callback_data *d = (struct obj_traverse_callback_data *)ptr;
-
-    if (obj_traverse_i((VALUE)val, d->data)) {
-        d->stop = true;
-        return ST_STOP;
-    }
-
-    return ST_CONTINUE;
-}
-
 static void
 obj_traverse_reachable_i(VALUE obj, void *ptr)
 {
@@ -2675,6 +1160,19 @@ obj_traverse_rec(struct obj_traverse_data *data)
     return data->rec;
 }
 
+static int
+obj_traverse_ivar_foreach_i(ID key, VALUE val, st_data_t ptr)
+{
+    struct obj_traverse_callback_data *d = (struct obj_traverse_callback_data *)ptr;
+
+    if (obj_traverse_i(val, d->data)) {
+        d->stop = true;
+        return ST_STOP;
+    }
+
+    return ST_CONTINUE;
+}
+
 static int
 obj_traverse_i(VALUE obj, struct obj_traverse_data *data)
 {
@@ -2690,15 +1188,14 @@ obj_traverse_i(VALUE obj, struct obj_traverse_data *data)
         // already traversed
         return 0;
     }
+    RB_OBJ_WRITTEN(data->rec_hash, Qundef, obj);
 
-    if (UNLIKELY(FL_TEST_RAW(obj, FL_EXIVAR))) {
-        struct gen_ivtbl *ivtbl;
-        rb_ivar_generic_ivtbl_lookup(obj, &ivtbl);
-        for (uint32_t i = 0; i < ivtbl->numiv; i++) {
-            VALUE val = ivtbl->ivptr[i];
-            if (!UNDEF_P(val) && obj_traverse_i(val, data)) return 1;
-        }
-    }
+    struct obj_traverse_callback_data d = {
+        .stop = false,
+        .data = data,
+    };
+    rb_ivar_foreach(obj, obj_traverse_ivar_foreach_i, (st_data_t)&d);
+    if (d.stop) return 1;
 
     switch (BUILTIN_TYPE(obj)) {
       // no child node
@@ -2712,25 +1209,7 @@ obj_traverse_i(VALUE obj, struct obj_traverse_data *data)
         break;
 
       case T_OBJECT:
-        {
-            if (rb_shape_obj_too_complex(obj)) {
-                struct obj_traverse_callback_data d = {
-                    .stop = false,
-                    .data = data,
-                };
-                rb_st_foreach(ROBJECT_IV_HASH(obj), obj_hash_iv_traverse_i, (st_data_t)&d);
-                if (d.stop) return 1;
-            }
-            else {
-                uint32_t len = ROBJECT_IV_COUNT(obj);
-                VALUE *ptr = ROBJECT_IVPTR(obj);
-
-                for (uint32_t i=0; i<len; i++) {
-                    VALUE val = ptr[i];
-                    if (!UNDEF_P(val) && obj_traverse_i(val, data)) return 1;
-                }
-            }
-        }
+        /* Instance variables already traversed. */
         break;
 
       case T_ARRAY:
@@ -2782,11 +1261,9 @@ obj_traverse_i(VALUE obj, struct obj_traverse_data *data)
                 .stop = false,
                 .data = data,
             };
-            RB_VM_LOCK_ENTER_NO_BARRIER();
-            {
+            RB_VM_LOCKING_NO_BARRIER() {
                 rb_objspace_reachable_objects_from(obj, obj_traverse_reachable_i, &d);
             }
-            RB_VM_LOCK_LEAVE_NO_BARRIER();
             if (d.stop) return 1;
         }
         break;
@@ -2848,7 +1325,7 @@ rb_obj_traverse(VALUE obj,
 }
 
 static int
-frozen_shareable_p(VALUE obj, bool *made_shareable)
+allow_frozen_shareable_p(VALUE obj)
 {
     if (!RB_TYPE_P(obj, T_DATA)) {
         return true;
@@ -2858,13 +1335,6 @@ frozen_shareable_p(VALUE obj, bool *made_shareable)
         if (type->flags & RUBY_TYPED_FROZEN_SHAREABLE) {
             return true;
         }
-        else if (made_shareable && rb_obj_is_proc(obj)) {
-            // special path to make shareable Proc.
-            rb_proc_ractor_make_shareable(obj);
-            *made_shareable = true;
-            VM_ASSERT(RB_OBJ_SHAREABLE_P(obj));
-            return false;
-        }
     }
 
     return false;
@@ -2874,18 +1344,39 @@ static enum obj_traverse_iterator_result
 make_shareable_check_shareable(VALUE obj)
 {
     VM_ASSERT(!SPECIAL_CONST_P(obj));
-    bool made_shareable = false;
 
     if (rb_ractor_shareable_p(obj)) {
         return traverse_skip;
     }
-    else if (!frozen_shareable_p(obj, &made_shareable)) {
-        if (made_shareable) {
-            return traverse_skip;
+    else if (!allow_frozen_shareable_p(obj)) {
+        if (rb_obj_is_proc(obj)) {
+            rb_proc_ractor_make_shareable(obj);
+            return traverse_cont;
         }
         else {
-            rb_raise(rb_eRactorError, "can not make shareable object for %"PRIsVALUE, obj);
+            rb_raise(rb_eRactorError, "can not make shareable object for %+"PRIsVALUE, obj);
+        }
+    }
+
+    switch (TYPE(obj)) {
+      case T_IMEMO:
+        return traverse_skip;
+      case T_OBJECT:
+        {
+            // If a T_OBJECT is shared and has no free capacity, we can't safely store the object_id inline,
+            // as it would require to move the object content into an external buffer.
+            // This is only a problem for T_OBJECT, given other types have external fields and can do RCU.
+            // To avoid this issue, we proactively create the object_id.
+            shape_id_t shape_id = RBASIC_SHAPE_ID(obj);
+            attr_index_t capacity = RSHAPE_CAPACITY(shape_id);
+            attr_index_t free_capacity = capacity - RSHAPE_LEN(shape_id);
+            if (!rb_shape_has_object_id(shape_id) && capacity && !free_capacity) {
+                rb_obj_id(obj);
+            }
         }
+        break;
+      default:
+        break;
     }
 
     if (!RB_OBJ_FROZEN_RAW(obj)) {
@@ -2959,7 +1450,7 @@ shareable_p_enter(VALUE obj)
         return traverse_skip;
     }
     else if (RB_OBJ_FROZEN_RAW(obj) &&
-             frozen_shareable_p(obj, NULL)) {
+             allow_frozen_shareable_p(obj)) {
         return traverse_cont;
     }
 
@@ -2980,6 +1471,12 @@ rb_ractor_shareable_p_continue(VALUE obj)
 }
 
 #if RACTOR_CHECK_MODE > 0
+void
+rb_ractor_setup_belonging(VALUE obj)
+{
+    rb_ractor_setup_belonging_to(obj, rb_ractor_current_id());
+}
+
 static enum obj_traverse_iterator_result
 reset_belonging_enter(VALUE obj)
 {
@@ -3118,11 +1615,9 @@ static int
 obj_refer_only_shareables_p(VALUE obj)
 {
     int cnt = 0;
-    RB_VM_LOCK_ENTER_NO_BARRIER();
-    {
+    RB_VM_LOCKING_NO_BARRIER() {
         rb_objspace_reachable_objects_from(obj, obj_refer_only_shareables_p_i, &cnt);
     }
-    RB_VM_LOCK_LEAVE_NO_BARRIER();
     return cnt == 0;
 }
 
@@ -3150,24 +1645,43 @@ obj_traverse_replace_i(VALUE obj, struct obj_traverse_replace_data *data)
     }
     else {
         st_insert(obj_traverse_replace_rec(data), (st_data_t)obj, replacement);
+        RB_OBJ_WRITTEN(data->rec_hash, Qundef, obj);
+        RB_OBJ_WRITTEN(data->rec_hash, Qundef, replacement);
     }
 
     if (!data->move) {
         obj = replacement;
     }
 
-#define CHECK_AND_REPLACE(v) do { \
+#define CHECK_AND_REPLACE(parent_obj, v) do { \
     VALUE _val = (v); \
     if (obj_traverse_replace_i(_val, data)) { return 1; } \
-    else if (data->replacement != _val)     { RB_OBJ_WRITE(obj, &v, data->replacement); } \
+    else if (data->replacement != _val)     { RB_OBJ_WRITE(parent_obj, &v, data->replacement); } \
 } while (0)
 
-    if (UNLIKELY(FL_TEST_RAW(obj, FL_EXIVAR))) {
-        struct gen_ivtbl *ivtbl;
-        rb_ivar_generic_ivtbl_lookup(obj, &ivtbl);
-        for (uint32_t i = 0; i < ivtbl->numiv; i++) {
-            if (!UNDEF_P(ivtbl->ivptr[i])) {
-                CHECK_AND_REPLACE(ivtbl->ivptr[i]);
+    if (UNLIKELY(rb_obj_exivar_p(obj))) {
+        VALUE fields_obj;
+        rb_ivar_generic_fields_tbl_lookup(obj, &fields_obj);
+
+        if (UNLIKELY(rb_shape_obj_too_complex_p(obj))) {
+            struct obj_traverse_replace_callback_data d = {
+                .stop = false,
+                .data = data,
+                .src = fields_obj,
+            };
+            rb_st_foreach_with_replace(
+                rb_imemo_fields_complex_tbl(fields_obj),
+                obj_iv_hash_traverse_replace_foreach_i,
+                obj_iv_hash_traverse_replace_i,
+                (st_data_t)&d
+            );
+            if (d.stop) return 1;
+        }
+        else {
+            uint32_t fields_count = RSHAPE_LEN(RBASIC_SHAPE_ID(obj));
+            VALUE *fields = rb_imemo_fields_ptr(fields_obj);
+            for (uint32_t i = 0; i < fields_count; i++) {
+                CHECK_AND_REPLACE(fields_obj, fields[i]);
             }
         }
     }
@@ -3187,27 +1701,26 @@ obj_traverse_replace_i(VALUE obj, struct obj_traverse_replace_data *data)
 
       case T_OBJECT:
         {
-            if (rb_shape_obj_too_complex(obj)) {
-                st_table * table = ROBJECT_IV_HASH(obj);
+            if (rb_shape_obj_too_complex_p(obj)) {
                 struct obj_traverse_replace_callback_data d = {
                     .stop = false,
                     .data = data,
                     .src = obj,
                 };
                 rb_st_foreach_with_replace(
-                        table,
-                        obj_iv_hash_traverse_replace_foreach_i,
-                        obj_iv_hash_traverse_replace_i,
-                        (st_data_t)&d);
+                    ROBJECT_FIELDS_HASH(obj),
+                    obj_iv_hash_traverse_replace_foreach_i,
+                    obj_iv_hash_traverse_replace_i,
+                    (st_data_t)&d
+                );
+                if (d.stop) return 1;
             }
             else {
-                uint32_t len = ROBJECT_IV_COUNT(obj);
-                VALUE *ptr = ROBJECT_IVPTR(obj);
+                uint32_t len = ROBJECT_FIELDS_COUNT(obj);
+                VALUE *ptr = ROBJECT_FIELDS(obj);
 
-                for (uint32_t i=0; i<len; i++) {
-                    if (!UNDEF_P(ptr[i])) {
-                        CHECK_AND_REPLACE(ptr[i]);
-                    }
+                for (uint32_t i = 0; i < len; i++) {
+                    CHECK_AND_REPLACE(obj, ptr[i]);
                 }
             }
         }
@@ -3260,18 +1773,18 @@ obj_traverse_replace_i(VALUE obj, struct obj_traverse_replace_data *data)
             const VALUE *ptr = RSTRUCT_CONST_PTR(obj);
 
             for (long i=0; i<len; i++) {
-                CHECK_AND_REPLACE(ptr[i]);
+                CHECK_AND_REPLACE(obj, ptr[i]);
             }
         }
         break;
 
       case T_RATIONAL:
-        CHECK_AND_REPLACE(RRATIONAL(obj)->num);
-        CHECK_AND_REPLACE(RRATIONAL(obj)->den);
+        CHECK_AND_REPLACE(obj, RRATIONAL(obj)->num);
+        CHECK_AND_REPLACE(obj, RRATIONAL(obj)->den);
         break;
       case T_COMPLEX:
-        CHECK_AND_REPLACE(RCOMPLEX(obj)->real);
-        CHECK_AND_REPLACE(RCOMPLEX(obj)->imag);
+        CHECK_AND_REPLACE(obj, RCOMPLEX(obj)->real);
+        CHECK_AND_REPLACE(obj, RCOMPLEX(obj)->imag);
         break;
 
       case T_DATA:
@@ -3330,35 +1843,19 @@ rb_obj_traverse_replace(VALUE obj,
     }
 }
 
-struct RVALUE {
-    VALUE flags;
-    VALUE klass;
-    VALUE v1;
-    VALUE v2;
-    VALUE v3;
+static const bool wb_protected_types[RUBY_T_MASK] = {
+    [T_OBJECT] = RGENGC_WB_PROTECTED_OBJECT,
+    [T_HASH] = RGENGC_WB_PROTECTED_HASH,
+    [T_ARRAY] = RGENGC_WB_PROTECTED_ARRAY,
+    [T_STRING] = RGENGC_WB_PROTECTED_STRING,
+    [T_STRUCT] = RGENGC_WB_PROTECTED_STRUCT,
+    [T_COMPLEX] = RGENGC_WB_PROTECTED_COMPLEX,
+    [T_REGEXP] = RGENGC_WB_PROTECTED_REGEXP,
+    [T_MATCH] = RGENGC_WB_PROTECTED_MATCH,
+    [T_FLOAT] = RGENGC_WB_PROTECTED_FLOAT,
+    [T_RATIONAL] = RGENGC_WB_PROTECTED_RATIONAL,
 };
 
-static const VALUE fl_users = FL_USER1  | FL_USER2  | FL_USER3  |
-                              FL_USER4  | FL_USER5  | FL_USER6  | FL_USER7  |
-                              FL_USER8  | FL_USER9  | FL_USER10 | FL_USER11 |
-                              FL_USER12 | FL_USER13 | FL_USER14 | FL_USER15 |
-                              FL_USER16 | FL_USER17 | FL_USER18 | FL_USER19;
-
-static void
-ractor_moved_bang(VALUE obj)
-{
-    // invalidate src object
-    struct RVALUE *rv = (void *)obj;
-
-    rv->klass = rb_cRactorMovedObject;
-    rv->v1 = 0;
-    rv->v2 = 0;
-    rv->v3 = 0;
-    rv->flags = rv->flags & ~fl_users;
-
-    // TODO: record moved location
-}
-
 static enum obj_traverse_iterator_result
 move_enter(VALUE obj, struct obj_traverse_replace_data *data)
 {
@@ -3367,33 +1864,44 @@ move_enter(VALUE obj, struct obj_traverse_replace_data *data)
         return traverse_skip;
     }
     else {
-        data->replacement = rb_obj_alloc(RBASIC_CLASS(obj));
+        VALUE type = RB_BUILTIN_TYPE(obj);
+        type |= wb_protected_types[type] ? FL_WB_PROTECTED : 0;
+        NEWOBJ_OF(moved, struct RBasic, 0, type, rb_gc_obj_slot_size(obj), 0);
+        data->replacement = (VALUE)moved;
         return traverse_cont;
     }
 }
 
-void rb_replace_generic_ivar(VALUE clone, VALUE obj); // variable.c
-
 static enum obj_traverse_iterator_result
 move_leave(VALUE obj, struct obj_traverse_replace_data *data)
 {
-    VALUE v = data->replacement;
-    struct RVALUE *dst = (struct RVALUE *)v;
-    struct RVALUE *src = (struct RVALUE *)obj;
+    // Copy flags
+    VALUE ignored_flags = RUBY_FL_PROMOTED;
+    RBASIC(data->replacement)->flags = (RBASIC(obj)->flags & ~ignored_flags) | (RBASIC(data->replacement)->flags & ignored_flags);
+    // Copy contents without the flags
+    memcpy(
+        (char *)data->replacement + sizeof(VALUE),
+        (char *)obj + sizeof(VALUE),
+        rb_gc_obj_slot_size(obj) - sizeof(VALUE)
+    );
+
+    // We've copied obj's references to the replacement
+    rb_gc_writebarrier_remember(data->replacement);
 
-    dst->flags = (dst->flags & ~fl_users) | (src->flags & fl_users);
+    void rb_replace_generic_ivar(VALUE clone, VALUE obj); // variable.c
 
-    dst->v1 = src->v1;
-    dst->v2 = src->v2;
-    dst->v3 = src->v3;
+    rb_gc_obj_id_moved(data->replacement);
 
-    if (UNLIKELY(FL_TEST_RAW(obj, FL_EXIVAR))) {
-        rb_replace_generic_ivar(v, obj);
+    if (UNLIKELY(rb_obj_exivar_p(obj))) {
+        rb_replace_generic_ivar(data->replacement, obj);
     }
 
-    // TODO: generic_ivar
+    VALUE flags = T_OBJECT | FL_FREEZE | ROBJECT_EMBED | (RBASIC(obj)->flags & FL_PROMOTED);
 
-    ractor_moved_bang(obj);
+    // Avoid mutations using bind_call, etc.
+    MEMZERO((char *)obj, char, sizeof(struct RBasic));
+    RBASIC(obj)->flags = flags;
+    RBASIC_SET_CLASS_RAW(obj, rb_cRactorMovedObject);
     return traverse_cont;
 }
 
@@ -3462,7 +1970,7 @@ ractor_local_storage_mark_i(st_data_t key, st_data_t val, st_data_t dmy)
 }
 
 static enum rb_id_table_iterator_result
-idkey_local_storage_mark_i(ID id, VALUE val, void *dmy)
+idkey_local_storage_mark_i(VALUE val, void *dmy)
 {
     rb_gc_mark(val);
     return ID_TABLE_CONTINUE;
@@ -3485,8 +1993,10 @@ ractor_local_storage_mark(rb_ractor_t *r)
     }
 
     if (r->idkey_local_storage) {
-        rb_id_table_foreach(r->idkey_local_storage, idkey_local_storage_mark_i, NULL);
+        rb_id_table_foreach_values(r->idkey_local_storage, idkey_local_storage_mark_i, NULL);
     }
+
+    rb_gc_mark(r->local_storage_store_lock);
 }
 
 static int
@@ -3549,15 +2059,13 @@ rb_ractor_local_storage_value_newkey(void)
 void
 rb_ractor_local_storage_delkey(rb_ractor_local_key_t key)
 {
-    RB_VM_LOCK_ENTER();
-    {
+    RB_VM_LOCKING() {
         if (freed_ractor_local_keys.cnt == freed_ractor_local_keys.capa) {
             freed_ractor_local_keys.capa = freed_ractor_local_keys.capa ? freed_ractor_local_keys.capa * 2 : 4;
             REALLOC_N(freed_ractor_local_keys.keys, rb_ractor_local_key_t, freed_ractor_local_keys.capa);
         }
         freed_ractor_local_keys.keys[freed_ractor_local_keys.cnt++] = key;
     }
-    RB_VM_LOCK_LEAVE();
 }
 
 static bool
@@ -3692,4 +2200,273 @@ ractor_local_value_set(rb_execution_context_t *ec, VALUE self, VALUE sym, VALUE
     return val;
 }
 
+struct ractor_local_storage_store_data {
+    rb_execution_context_t *ec;
+    struct rb_id_table *tbl;
+    ID id;
+    VALUE sym;
+};
+
+static VALUE
+ractor_local_value_store_i(VALUE ptr)
+{
+    VALUE val;
+    struct ractor_local_storage_store_data *data = (struct ractor_local_storage_store_data *)ptr;
+
+    if (rb_id_table_lookup(data->tbl, data->id, &val)) {
+        // after synchronization, we found already registered entry
+    }
+    else {
+        val = rb_yield(Qnil);
+        ractor_local_value_set(data->ec, Qnil, data->sym, val);
+    }
+    return val;
+}
+
+static VALUE
+ractor_local_value_store_if_absent(rb_execution_context_t *ec, VALUE self, VALUE sym)
+{
+    rb_ractor_t *cr = rb_ec_ractor_ptr(ec);
+    struct ractor_local_storage_store_data data = {
+        .ec = ec,
+        .sym = sym,
+        .id = SYM2ID(rb_to_symbol(sym)),
+        .tbl = cr->idkey_local_storage,
+    };
+    VALUE val;
+
+    if (data.tbl == NULL) {
+        data.tbl = cr->idkey_local_storage = rb_id_table_create(2);
+    }
+    else if (rb_id_table_lookup(data.tbl, data.id, &val)) {
+        // already set
+        return val;
+    }
+
+    if (!cr->local_storage_store_lock) {
+        cr->local_storage_store_lock = rb_mutex_new();
+    }
+
+    return rb_mutex_synchronize(cr->local_storage_store_lock, ractor_local_value_store_i, (VALUE)&data);
+}
+
+// Ractor#require
+
+struct cross_ractor_require {
+    VALUE port;
+    VALUE result;
+    VALUE exception;
+
+    // require
+    VALUE feature;
+
+    // autoload
+    VALUE module;
+    ID name;
+
+    bool silent;
+};
+
+static void
+cross_ractor_require_mark(void *ptr)
+{
+    struct cross_ractor_require *crr = (struct cross_ractor_require *)ptr;
+    rb_gc_mark(crr->port);
+    rb_gc_mark(crr->result);
+    rb_gc_mark(crr->exception);
+    rb_gc_mark(crr->feature);
+    rb_gc_mark(crr->module);
+}
+
+static const rb_data_type_t cross_ractor_require_data_type = {
+    "ractor/cross_ractor_require",
+    {
+        cross_ractor_require_mark,
+        RUBY_DEFAULT_FREE,
+        NULL, // memsize
+        NULL, // compact
+    },
+    0, 0, RUBY_TYPED_FREE_IMMEDIATELY
+};
+
+static VALUE
+require_body(VALUE data)
+{
+    struct cross_ractor_require *crr = (struct cross_ractor_require *)data;
+
+    ID require;
+    CONST_ID(require, "require");
+
+    if (crr->silent) {
+        int rb_require_internal_silent(VALUE fname);
+        crr->result = INT2NUM(rb_require_internal_silent(crr->feature));
+    }
+    else {
+        crr->result = rb_funcallv(Qnil, require, 1, &crr->feature);
+    }
+
+    return Qnil;
+}
+
+static VALUE
+require_rescue(VALUE data, VALUE errinfo)
+{
+    struct cross_ractor_require *crr = (struct cross_ractor_require *)data;
+    crr->exception = errinfo;
+    return Qundef;
+}
+
+static VALUE
+require_result_copy_body(VALUE data)
+{
+    struct cross_ractor_require *crr = (struct cross_ractor_require *)data;
+
+    if (crr->exception != Qundef) {
+        VM_ASSERT(crr->result == Qundef);
+        crr->exception = ractor_copy(crr->exception);
+    }
+    else{
+        VM_ASSERT(crr->result != Qundef);
+        crr->result = ractor_copy(crr->result);
+    }
+
+    return Qnil;
+}
+
+static VALUE
+require_result_copy_resuce(VALUE data, VALUE errinfo)
+{
+    struct cross_ractor_require *crr = (struct cross_ractor_require *)data;
+    crr->exception = errinfo; // ractor_move(crr->exception);
+    return Qnil;
+}
+
+static VALUE
+ractor_require_protect(VALUE crr_obj, VALUE (*func)(VALUE))
+{
+    struct cross_ractor_require *crr;
+    TypedData_Get_Struct(crr_obj, struct cross_ractor_require, &cross_ractor_require_data_type, crr);
+
+    const bool silent = crr->silent;
+    VALUE debug, errinfo;
+    if (silent) {
+        debug = ruby_debug;
+        errinfo = rb_errinfo();
+    }
+
+    // catch any error
+    rb_rescue2(func, (VALUE)crr,
+               require_rescue, (VALUE)crr, rb_eException, 0);
+
+    if (silent) {
+        ruby_debug = debug;
+        rb_set_errinfo(errinfo);
+    }
+
+    rb_rescue2(require_result_copy_body, (VALUE)crr,
+               require_result_copy_resuce, (VALUE)crr, rb_eException, 0);
+
+    ractor_port_send(GET_EC(), crr->port, Qtrue, Qfalse);
+    RB_GC_GUARD(crr_obj);
+    return Qnil;
+}
+
+static VALUE
+ractor_require_func(void *crr_obj)
+{
+    return ractor_require_protect((VALUE)crr_obj, require_body);
+}
+
+VALUE
+rb_ractor_require(VALUE feature, bool silent)
+{
+    // We're about to block on the main ractor, so if we're holding the global lock we'll deadlock.
+    ASSERT_vm_unlocking();
+
+    struct cross_ractor_require *crr;
+    VALUE crr_obj = TypedData_Make_Struct(0, struct cross_ractor_require, &cross_ractor_require_data_type, crr);
+    FL_SET_RAW(crr_obj, RUBY_FL_SHAREABLE);
+
+    // Convert feature to proper file path and make it shareable as fstring
+    crr->feature = rb_fstring(FilePathValue(feature));
+    crr->port = ractor_port_new(GET_RACTOR());
+    crr->result = Qundef;
+    crr->exception = Qundef;
+    crr->silent = silent;
+
+    rb_execution_context_t *ec = GET_EC();
+    rb_ractor_t *main_r = GET_VM()->ractor.main_ractor;
+    rb_ractor_interrupt_exec(main_r, ractor_require_func, (void *)crr_obj, rb_interrupt_exec_flag_value_data);
+
+    // wait for require done
+    ractor_port_receive(ec, crr->port);
+    ractor_port_close(ec, crr->port);
+
+    VALUE exc = crr->exception;
+    VALUE result = crr->result;
+    RB_GC_GUARD(crr_obj);
+
+    if (exc != Qundef) {
+        ractor_reset_belonging(exc);
+        rb_exc_raise(exc);
+    }
+    else {
+        RUBY_ASSERT(result != Qundef);
+        ractor_reset_belonging(result);
+        return result;
+    }
+}
+
+static VALUE
+ractor_require(rb_execution_context_t *ec, VALUE self, VALUE feature)
+{
+    return rb_ractor_require(feature, false);
+}
+
+static VALUE
+autoload_load_body(VALUE data)
+{
+    struct cross_ractor_require *crr = (struct cross_ractor_require *)data;
+    crr->result = rb_autoload_load(crr->module, crr->name);
+    return Qnil;
+}
+
+static VALUE
+ractor_autoload_load_func(void *crr_obj)
+{
+    return ractor_require_protect((VALUE)crr_obj, autoload_load_body);
+}
+
+VALUE
+rb_ractor_autoload_load(VALUE module, ID name)
+{
+    struct cross_ractor_require *crr;
+    VALUE crr_obj = TypedData_Make_Struct(0, struct cross_ractor_require, &cross_ractor_require_data_type, crr);
+    FL_SET_RAW(crr_obj, RUBY_FL_SHAREABLE);
+    crr->module = module;
+    crr->name = name;
+    crr->port = ractor_port_new(GET_RACTOR());
+    crr->result = Qundef;
+    crr->exception = Qundef;
+
+    rb_execution_context_t *ec = GET_EC();
+    rb_ractor_t *main_r = GET_VM()->ractor.main_ractor;
+    rb_ractor_interrupt_exec(main_r, ractor_autoload_load_func, (void *)crr_obj, rb_interrupt_exec_flag_value_data);
+
+    // wait for require done
+    ractor_port_receive(ec, crr->port);
+    ractor_port_close(ec, crr->port);
+
+    VALUE exc = crr->exception;
+    VALUE result = crr->result;
+    RB_GC_GUARD(crr_obj);
+
+    if (exc != Qundef) {
+        rb_exc_raise(exc);
+    }
+    else {
+        return result;
+    }
+}
+
 #include "ractor.rbinc"
diff --git a/ractor.rb b/ractor.rb
index 5620eeec389262..20fc622d772896 100644
--- a/ractor.rb
+++ b/ractor.rb
@@ -4,7 +4,7 @@
 #
 #     # The simplest ractor
 #     r = Ractor.new {puts "I am in Ractor!"}
-#     r.take # wait for it to finish
+#     r.join # wait for it to finish
 #     # Here, "I am in Ractor!" is printed
 #
 # Ractors do not share all objects with each other. There are two main benefits to this: across ractors, thread-safety
@@ -36,53 +36,11 @@
 #       puts "I am in Ractor! a=#{a_in_ractor}"
 #     end
 #     r.send(a)  # pass it
-#     r.take
+#     r.join
 #     # Here, "I am in Ractor! a=1" is printed
 #
-# There are two pairs of methods for sending/receiving messages:
-#
-# * Ractor#send and Ractor.receive for when the _sender_ knows the receiver (push);
-# * Ractor.yield and Ractor#take for when the _receiver_ knows the sender (pull);
-#
 # In addition to that, any arguments passed to Ractor.new are passed to the block and available there
-# as if received by Ractor.receive, and the last block value is sent outside of the
-# ractor as if sent by Ractor.yield.
-#
-# A little demonstration of a classic ping-pong:
-#
-#     server = Ractor.new(name: "server") do
-#       puts "Server starts: #{self.inspect}"
-#       puts "Server sends: ping"
-#       Ractor.yield 'ping'                       # The server doesn't know the receiver and sends to whoever interested
-#       received = Ractor.receive                 # The server doesn't know the sender and receives from whoever sent
-#       puts "Server received: #{received}"
-#     end
-#
-#     client = Ractor.new(server) do |srv|        # The server is sent to the client, and available as srv
-#       puts "Client starts: #{self.inspect}"
-#       received = srv.take                       # The client takes a message from the server
-#       puts "Client received from " \
-#            "#{srv.inspect}: #{received}"
-#       puts "Client sends to " \
-#            "#{srv.inspect}: pong"
-#       srv.send 'pong'                           # The client sends a message to the server
-#     end
-#
-#     [client, server].each(&:take)               # Wait until they both finish
-#
-# This will output something like:
-#
-#     Server starts: #<Ractor:#2 server test.rb:1 running>
-#     Server sends: ping
-#     Client starts: #<Ractor:#3 test.rb:8 running>
-#     Client received from #<Ractor:#2 server test.rb:1 blocking>: ping
-#     Client sends to #<Ractor:#2 server test.rb:1 blocking>: pong
-#     Server received: pong
-#
-# Ractors receive their messages via the <em>incoming port</em>, and send them
-# to the <em>outgoing port</em>. Either one can be disabled with Ractor#close_incoming and
-# Ractor#close_outgoing, respectively. When a ractor terminates, its ports are closed
-# automatically.
+# as if received by Ractor.receive, and the last block value can be received with Ractor#value.
 #
 # == Shareable and unshareable objects
 #
@@ -155,7 +113,7 @@
 # Notice that even +inspect+ (and more basic methods like <tt>__id__</tt>) is inaccessible
 # on a moved object.
 #
-# Class and Module objects are shareable so the class/module definitions are shared between ractors.
+# +Class+ and +Module+ objects are shareable so the class/module definitions are shared between ractors.
 # \Ractor objects are also shareable. All operations on shareable objects are thread-safe, so the thread-safety property
 # will be kept. We can not define mutable shareable objects in Ruby, but C extensions can introduce them.
 #
@@ -274,7 +232,7 @@ def self.new(*args, name: nil, &block)
     b = block # TODO: builtin bug
     raise ArgumentError, "must be called with a block" unless block
     if __builtin_cexpr!("RBOOL(ruby_single_main_ractor)")
-      warn("Ractor is experimental, and the behavior may change in future versions of Ruby! " \
+      Kernel.warn("Ractor is experimental, and the behavior may change in future versions of Ruby! " \
            "Also there are many implementation issues.", uplevel: 0, category: :experimental)
     end
     loc = caller_locations(1, 1).first
@@ -307,246 +265,52 @@ def self.count
 
   #
   # call-seq:
-  #    Ractor.select(*ractors, [yield_value:, move: false]) -> [ractor or symbol, obj]
-  #
-  # Wait for any ractor to have something in its outgoing port, read from this ractor, and
-  # then return that ractor and the object received.
-  #
-  #    r1 = Ractor.new {Ractor.yield 'from 1'}
-  #    r2 = Ractor.new {Ractor.yield 'from 2'}
-  #
-  #    r, obj = Ractor.select(r1, r2)
-  #
-  #    puts "received #{obj.inspect} from #{r.inspect}"
-  #    # Prints: received "from 1" from #<Ractor:#2 test.rb:1 running>
-  #    # But could just as well print "from r2" here, either prints could be first.
-  #
-  # If one of the given ractors is the current ractor, and it is selected, +r+ will contain
-  # the +:receive+ symbol instead of the ractor object.
+  #    Ractor.select(*ports) -> [...]
   #
-  #    r1 = Ractor.new(Ractor.current) do |main|
-  #      main.send 'to main'
-  #      Ractor.yield 'from 1'
-  #    end
-  #    r2 = Ractor.new do
-  #      Ractor.yield 'from 2'
-  #    end
-  #
-  #    r, obj = Ractor.select(r1, r2, Ractor.current)
-  #    puts "received #{obj.inspect} from #{r.inspect}"
-  #    # Could print: received "to main" from :receive
-  #
-  # If +yield_value+ is provided, that value may be yielded if another ractor is calling #take.
-  # In this case, the pair <tt>[:yield, nil]</tt> is returned:
-  #
-  #    r1 = Ractor.new(Ractor.current) do |main|
-  #      puts "Received from main: #{main.take}"
-  #    end
-  #
-  #    puts "Trying to select"
-  #    r, obj = Ractor.select(r1, Ractor.current, yield_value: 123)
-  #    wait
-  #    puts "Received #{obj.inspect} from #{r.inspect}"
-  #
-  # This will print:
-  #
-  #    Trying to select
-  #    Received from main: 123
-  #    Received nil from :yield
-  #
-  # +move+ boolean flag defines whether yielded value will be copied (default) or moved.
-  def self.select(*ractors, yield_value: yield_unspecified = true, move: false)
-    raise ArgumentError, 'specify at least one ractor or `yield_value`' if yield_unspecified && ractors.empty?
+  # TBD
+  def self.select(*ports)
+    raise ArgumentError, 'specify at least one ractor or `yield_value`' if ports.empty?
 
-    begin
-      if ractors.delete Ractor.current
-        do_receive = true
-      else
-        do_receive = false
-      end
-      selector = Ractor::Selector.new(*ractors)
+    monitors = {} # Ractor::Port => Ractor
 
-      if yield_unspecified
-        selector.wait receive: do_receive
+    ports = ports.map do |arg|
+      case arg
+      when Ractor
+        port = Ractor::Port.new
+        monitors[port] = arg
+        arg.monitor port
+        port
+      when Ractor::Port
+        arg
       else
-        selector.wait receive: do_receive, yield_value: yield_value, move: move
+        raise ArgumentError, "should be Ractor::Port or Ractor"
       end
-    ensure
-      selector.clear
     end
-  end
 
-  #
-  # Ractor::Selector provides a functionality to wait multiple Ractor events.
-  # Ractor::Selector#wait is more lightweight than Ractor.select()
-  # because we don't have to specify all target ractors for each wait time.
-  #
-  # Ractor.select() uses Ractor::Selector internally to implement it.
-  #
-  class Selector
-    # call-seq:
-    #   Ractor::Selector.new(*ractors)
-    #
-    # Creates a selector object.
-    #
-    # If a ractors parameter is given, it is same as the following code.
-    #
-    #    selector = Ractor::Selector.new
-    #    ractors.each{|r| selector.add r}
-    #
-    def self.new(*rs)
-      selector = __builtin_cexpr! %q{
-        ractor_selector_create(self);
-      }
-      rs.each{|r| selector.add(r) }
-      selector
-    end
-
-    # call-seq:
-    #   selector.add(ractor)
-    #
-    # Registers a ractor as a taking target by the selector.
-    #
-    def add r
-      __builtin_ractor_selector_add r
-    end
-
-    # call-seq:
-    #   selector.remove(ractor)
-    #
-    # Deregisters a ractor as a taking target by the selector.
-    #
-    def remove r
-      __builtin_ractor_selector_remove r
-    end
-
-    # call-seq:
-    #   selector.clear
-    #
-    # Deregisters all ractors.
-    def clear
-      __builtin_ractor_selector_clear
-    end
-
-    # call-seq:
-    #   selector.empty?
-    #
-    # Returns true if the number of ractors in the waiting set at the current time is zero.
-    #
-    # Note that even if <tt>#empty?</tt> returns false, the subsequent <tt>#wait</tt>
-    # may raise an exception because other ractors may close the target ractors.
-    #
-    def empty?
-      __builtin_ractor_selector_empty_p
-    end
+    begin
+      result_port, obj = __builtin_ractor_select_internal(ports)
 
-    # call-seq:
-    #   selector.wait(receive: false, yield_value: yield_value, move: false) -> [ractor or symbol, value]
-    #
-    # Waits Ractor events. It is lighter than Ractor.select() for many ractors.
-    #
-    # The simplest form is waiting for taking a value from one of
-    # registerred ractors like that.
-    #
-    #   selector = Ractor::Selector.new(r1, r2, r3)
-    #   r, v = selector.wait
-    #
-    # On this case, when r1, r2 or r3 is ready to take (yielding a value),
-    # this method takes the value from the ready (yielded) ractor
-    # and returns [the yielded ractor, the taking value].
-    #
-    # Note that if a take target ractor is closed, the ractor will be removed
-    # automatically.
-    #
-    # If you also want to wait with receiving an object from other ractors,
-    # you can specify receive: true keyword like:
-    #
-    #   r, v = selector.wait receive: true
-    #
-    # On this case, wait for taking from r1, r2 or r3 and waiting for receving
-    # a value from other ractors.
-    # If it successes the receiving, it returns an array object [:receive, the received value].
-    #
-    # If you also want to wait with yielding a value, you can specify
-    # :yield_value like:
-    #
-    #   r, v = selector.wait yield_value: obj
-    #
-    # On this case wait for taking from r1, r2, or r3 and waiting for taking
-    # yielding value (obj) by another ractor.
-    # If antoher ractor takes the value (obj), it returns an array object [:yield, nil].
-    #
-    # You can specify a keyword parameter <tt>move: true</tt> like Ractor.yield(obj, move: true)
-    #
-    def wait receive: false, yield_value: yield_unspecified = true, move: false
-      __builtin_ractor_selector_wait receive, !yield_unspecified, yield_value, move
+      if r = monitors[result_port]
+        [r, r.value]
+      else
+        [result_port, obj]
+      end
+    ensure
+      # close all ports for join
+      monitors.each do |port, r|
+        r.unmonitor port
+        port.close
+      end
     end
   end
 
   #
   # call-seq:
-  #    Ractor.receive -> msg
-  #
-  # Receive a message from the incoming port of the current ractor (which was
-  # sent there by #send from another ractor).
-  #
-  #     r = Ractor.new do
-  #       v1 = Ractor.receive
-  #       puts "Received: #{v1}"
-  #     end
-  #     r.send('message1')
-  #     r.take
-  #     # Here will be printed: "Received: message1"
-  #
-  # Alternatively, the private instance method +receive+ may be used:
-  #
-  #     r = Ractor.new do
-  #       v1 = receive
-  #       puts "Received: #{v1}"
-  #     end
-  #     r.send('message1')
-  #     r.take
-  #     # This prints: "Received: message1"
-  #
-  # The method blocks if the queue is empty.
-  #
-  #     r = Ractor.new do
-  #       puts "Before first receive"
-  #       v1 = Ractor.receive
-  #       puts "Received: #{v1}"
-  #       v2 = Ractor.receive
-  #       puts "Received: #{v2}"
-  #     end
-  #     wait
-  #     puts "Still not received"
-  #     r.send('message1')
-  #     wait
-  #     puts "Still received only one"
-  #     r.send('message2')
-  #     r.take
-  #
-  # Output:
-  #
-  #     Before first receive
-  #     Still not received
-  #     Received: message1
-  #     Still received only one
-  #     Received: message2
-  #
-  # If close_incoming was called on the ractor, the method raises Ractor::ClosedError
-  # if there are no more messages in the incoming queue:
-  #
-  #     Ractor.new do
-  #       close_incoming
-  #       receive
-  #     end
-  #     wait
-  #     # in `receive': The incoming port is already closed => #<Ractor:#2 test.rb:1 running> (Ractor::ClosedError)
+  #    Ractor.receive -> obj
   #
+  # Receive a message from the default port.
   def self.receive
-    __builtin_cexpr! %q{
-      ractor_receive(ec, rb_ec_ractor_ptr(ec))
-    }
+    Ractor.current.default_port.receive
   end
 
   class << self
@@ -555,280 +319,21 @@ class << self
 
   # same as Ractor.receive
   private def receive
-    __builtin_cexpr! %q{
-      ractor_receive(ec, rb_ec_ractor_ptr(ec))
-    }
+    default_port.receive
   end
   alias recv receive
 
   #
   # call-seq:
-  #    Ractor.receive_if {|msg| block } -> msg
-  #
-  # Receive only a specific message.
-  #
-  # Instead of Ractor.receive, Ractor.receive_if can be given a pattern (or any
-  # filter) in a block and you can choose the messages to accept that are available in
-  # your ractor's incoming queue.
-  #
-  #     r = Ractor.new do
-  #       p Ractor.receive_if{|msg| msg.match?(/foo/)} #=> "foo3"
-  #       p Ractor.receive_if{|msg| msg.match?(/bar/)} #=> "bar1"
-  #       p Ractor.receive_if{|msg| msg.match?(/baz/)} #=> "baz2"
-  #     end
-  #     r << "bar1"
-  #     r << "baz2"
-  #     r << "foo3"
-  #     r.take
-  #
-  # This will output:
-  #
-  #     foo3
-  #     bar1
-  #     baz2
-  #
-  # If the block returns a truthy value, the message is removed from the incoming queue
-  # and returned.
-  # Otherwise, the message remains in the incoming queue and the next messages are checked
-  # by the given block.
+  #   ractor.send(msg) -> self
   #
-  # If there are no messages left in the incoming queue, the method will
-  # block until new messages arrive.
-  #
-  # If the block is escaped by break/return/exception/throw, the message is removed from
-  # the incoming queue as if a truthy value had been returned.
-  #
-  #     r = Ractor.new do
-  #       val = Ractor.receive_if{|msg| msg.is_a?(Array)}
-  #       puts "Received successfully: #{val}"
-  #     end
-  #
-  #     r.send(1)
-  #     r.send('test')
-  #     wait
-  #     puts "2 non-matching sent, nothing received"
-  #     r.send([1, 2, 3])
-  #     wait
-  #
-  # Prints:
-  #
-  #     2 non-matching sent, nothing received
-  #     Received successfully: [1, 2, 3]
-  #
-  # Note that you can not call receive/receive_if in the given block recursively.
-  # You should not do any tasks in the block other than message filtration.
-  #
-  #     Ractor.current << true
-  #     Ractor.receive_if{|msg| Ractor.receive}
-  #     #=> `receive': can not call receive/receive_if recursively (Ractor::Error)
-  #
-  def self.receive_if &b
-    Primitive.ractor_receive_if b
-  end
-
-  # same as Ractor.receive_if
-  private def receive_if &b
-    Primitive.ractor_receive_if b
-  end
-
-  #
-  # call-seq:
-  #    ractor.send(msg, move: false) -> self
-  #
-  # Send a message to a Ractor's incoming queue to be accepted by Ractor.receive.
-  #
-  #   r = Ractor.new do
-  #     value = Ractor.receive
-  #     puts "Received #{value}"
-  #   end
-  #   r.send 'message'
-  #   # Prints: "Received: message"
-  #
-  # The method is non-blocking (will return immediately even if the ractor is not ready
-  # to receive anything):
-  #
-  #    r = Ractor.new {sleep(5)}
-  #    r.send('test')
-  #    puts "Sent successfully"
-  #    # Prints: "Sent successfully" immediately
-  #
-  # An attempt to send to a ractor which already finished its execution will raise Ractor::ClosedError.
-  #
-  #   r = Ractor.new {}
-  #   r.take
-  #   p r
-  #   # "#<Ractor:#6 (irb):23 terminated>"
-  #   r.send('test')
-  #   # Ractor::ClosedError (The incoming-port is already closed)
-  #
-  # If close_incoming was called on the ractor, the method also raises Ractor::ClosedError.
-  #
-  #    r =  Ractor.new do
-  #      sleep(500)
-  #      receive
-  #    end
-  #    r.close_incoming
-  #    r.send('test')
-  #    # Ractor::ClosedError (The incoming-port is already closed)
-  #    # The error is raised immediately, not when the ractor tries to receive
-  #
-  # If the +obj+ is unshareable, by default it will be copied into the receiving ractor by deep cloning.
-  # If <tt>move: true</tt> is passed, the object is _moved_ into the receiving ractor and becomes
-  # inaccessible to the sender.
-  #
-  #    r = Ractor.new {puts "Received: #{receive}"}
-  #    msg = 'message'
-  #    r.send(msg, move: true)
-  #    r.take
-  #    p msg
-  #
-  # This prints:
-  #
-  #    Received: message
-  #    in `p': undefined method `inspect' for #<Ractor::MovedObject:0x000055c99b9b69b8>
-  #
-  # All references to the object and its parts will become invalid to the sender.
-  #
-  #    r = Ractor.new {puts "Received: #{receive}"}
-  #    s = 'message'
-  #    ary = [s]
-  #    copy = ary.dup
-  #    r.send(ary, move: true)
-  #
-  #    s.inspect
-  #    # Ractor::MovedError (can not send any methods to a moved object)
-  #    ary.class
-  #    # Ractor::MovedError (can not send any methods to a moved object)
-  #    copy.class
-  #    # => Array, it is different object
-  #    copy[0].inspect
-  #    # Ractor::MovedError (can not send any methods to a moved object)
-  #    # ...but its item was still a reference to `s`, which was moved
-  #
-  # If the object is shareable, <tt>move: true</tt> has no effect on it:
-  #
-  #    r = Ractor.new {puts "Received: #{receive}"}
-  #    s = 'message'.freeze
-  #    r.send(s, move: true)
-  #    s.inspect #=> "message", still available
-  #
-  def send(obj, move: false)
-    __builtin_cexpr! %q{
-      ractor_send(ec, RACTOR_PTR(self), obj, move)
-    }
+  # It is equivalent to default_port.send(msg)
+  def send(...)
+    default_port.send(...)
+    self
   end
   alias << send
 
-  #
-  #  call-seq:
-  #     Ractor.yield(msg, move: false) -> nil
-  #
-  # Send a message to the current ractor's outgoing port to be accepted by #take.
-  #
-  #    r = Ractor.new {Ractor.yield 'Hello from ractor'}
-  #    puts r.take
-  #    # Prints: "Hello from ractor"
-  #
-  # This method is blocking, and will return only when somebody consumes the
-  # sent message.
-  #
-  #    r = Ractor.new do
-  #      Ractor.yield 'Hello from ractor'
-  #      puts "Ractor: after yield"
-  #    end
-  #    wait
-  #    puts "Still not taken"
-  #    puts r.take
-  #
-  # This will print:
-  #
-  #    Still not taken
-  #    Hello from ractor
-  #    Ractor: after yield
-  #
-  # If the outgoing port was closed with #close_outgoing, the method will raise:
-  #
-  #    r = Ractor.new do
-  #      close_outgoing
-  #      Ractor.yield 'Hello from ractor'
-  #    end
-  #    wait
-  #    # `yield': The outgoing-port is already closed (Ractor::ClosedError)
-  #
-  # The meaning of the +move+ argument is the same as for #send.
-  def self.yield(obj, move: false)
-    __builtin_cexpr! %q{
-      ractor_yield(ec, rb_ec_ractor_ptr(ec), obj, move)
-    }
-  end
-
-  #
-  #  call-seq:
-  #     ractor.take -> msg
-  #
-  # Get a message from the ractor's outgoing port, which was put there by Ractor.yield or at ractor's
-  # termination.
-  #
-  #   r = Ractor.new do
-  #     Ractor.yield 'explicit yield'
-  #     'last value'
-  #   end
-  #   puts r.take #=> 'explicit yield'
-  #   puts r.take #=> 'last value'
-  #   puts r.take # Ractor::ClosedError (The outgoing-port is already closed)
-  #
-  # The fact that the last value is also sent to the outgoing port means that +take+ can be used
-  # as an analog of Thread#join ("just wait until ractor finishes"). However, it will raise if
-  # somebody has already consumed that message.
-  #
-  # If the outgoing port was closed with #close_outgoing, the method will raise Ractor::ClosedError.
-  #
-  #    r = Ractor.new do
-  #      sleep(500)
-  #      Ractor.yield 'Hello from ractor'
-  #    end
-  #    r.close_outgoing
-  #    r.take
-  #    # Ractor::ClosedError (The outgoing-port is already closed)
-  #    # The error would be raised immediately, not when ractor will try to receive
-  #
-  # If an uncaught exception is raised in the Ractor, it is propagated by take as a
-  # Ractor::RemoteError.
-  #
-  #   r = Ractor.new {raise "Something weird happened"}
-  #
-  #   begin
-  #     r.take
-  #   rescue => e
-  #     p e              #  => #<Ractor::RemoteError: thrown by remote Ractor.>
-  #     p e.ractor == r  # => true
-  #     p e.cause        # => #<RuntimeError: Something weird happened>
-  #   end
-  #
-  # Ractor::ClosedError is a descendant of StopIteration, so the termination of the ractor will break
-  # out of any loops that receive this message without propagating the error:
-  #
-  #     r = Ractor.new do
-  #       3.times {|i| Ractor.yield "message #{i}"}
-  #       "finishing"
-  #     end
-  #
-  #     loop {puts "Received: " + r.take}
-  #     puts "Continue successfully"
-  #
-  # This will print:
-  #
-  #     Received: message 0
-  #     Received: message 1
-  #     Received: message 2
-  #     Received: finishing
-  #     Continue successfully
-  def take
-    __builtin_cexpr! %q{
-      ractor_take(ec, RACTOR_PTR(self))
-    }
-  end
-
   def inspect
     loc  = __builtin_cexpr! %q{ RACTOR_PTR(self)->loc }
     name = __builtin_cexpr! %q{ RACTOR_PTR(self)->name }
@@ -847,43 +352,19 @@ def name
   end
 
   class RemoteError
+    # The Ractor an uncaught exception is raised in.
     attr_reader :ractor
   end
 
   #
   #  call-seq:
-  #     ractor.close_incoming -> true | false
-  #
-  # Closes the incoming port and returns whether it was already closed. All further attempts
-  # to Ractor.receive in the ractor, and #send to the ractor will fail with Ractor::ClosedError.
-  #
-  #   r = Ractor.new {sleep(500)}
-  #   r.close_incoming  #=> false
-  #   r.close_incoming  #=> true
-  #   r.send('test')
-  #   # Ractor::ClosedError (The incoming-port is already closed)
-  def close_incoming
-    __builtin_cexpr! %q{
-      ractor_close_incoming(ec, RACTOR_PTR(self));
-    }
-  end
-
+  #     Ractor.current.close -> true | false
   #
-  # call-seq:
-  #    ractor.close_outgoing -> true | false
-  #
-  # Closes the outgoing port and returns whether it was already closed. All further attempts
-  # to Ractor.yield in the ractor, and #take from the ractor will fail with Ractor::ClosedError.
+  # Closes default_port. Closing port is allowed only by the ractor which creates this port.
+  # So this close method also allowed by the current Ractor.
   #
-  #   r = Ractor.new {sleep(500)}
-  #   r.close_outgoing  #=> false
-  #   r.close_outgoing  #=> true
-  #   r.take
-  #   # Ractor::ClosedError (The outgoing-port is already closed)
-  def close_outgoing
-    __builtin_cexpr! %q{
-      ractor_close_outgoing(ec, RACTOR_PTR(self));
-    }
+  def close
+    default_port.close
   end
 
   #
@@ -950,20 +431,340 @@ def self.make_shareable obj, copy: false
     end
   end
 
-  # get a value from ractor-local storage
+  # get a value from ractor-local storage for current Ractor
+  # Obsolete and use Ractor.[] instead.
   def [](sym)
+    if (self != Ractor.current)
+      raise RuntimeError, "Cannot get ractor local storage for non-current ractor"
+    end
     Primitive.ractor_local_value(sym)
   end
 
-  # set a value in ractor-local storage
+  # set a value in ractor-local storage for current Ractor
+  # Obsolete and use Ractor.[]= instead.
   def []=(sym, val)
+    if (self != Ractor.current)
+      raise RuntimeError, "Cannot set ractor local storage for non-current ractor"
+    end
+    Primitive.ractor_local_value_set(sym, val)
+  end
+
+  # get a value from ractor-local storage of current Ractor
+  def self.[](sym)
+    Primitive.ractor_local_value(sym)
+  end
+
+  # set a value in ractor-local storage of current Ractor
+  def self.[]=(sym, val)
     Primitive.ractor_local_value_set(sym, val)
   end
 
+  # call-seq:
+  #   Ractor.store_if_absent(key){ init_block }
+  #
+  # If the corresponding value is not set, yield a value with
+  # init_block and store the value in thread-safe manner.
+  # This method returns corresponding stored value.
+  #
+  #   (1..10).map{
+  #     Thread.new(it){|i|
+  #       Ractor.store_if_absent(:s){ f(); i }
+  #       #=> return stored value of key :s
+  #     }
+  #   }.map(&:value).uniq.size #=> 1 and f() is called only once
+  #
+  def self.store_if_absent(sym)
+    Primitive.ractor_local_value_store_if_absent(sym)
+  end
+
   # returns main ractor
   def self.main
     __builtin_cexpr! %q{
       rb_ractor_self(GET_VM()->ractor.main_ractor);
     }
   end
+
+  # return true if the current ractor is main ractor
+  def self.main?
+    __builtin_cexpr! %q{
+      RBOOL(GET_VM()->ractor.main_ractor == rb_ec_ractor_ptr(ec))
+    }
+  end
+
+  # internal method
+  def self._require feature # :nodoc:
+    if main?
+      super feature
+    else
+      Primitive.ractor_require feature
+    end
+  end
+
+  class << self
+    private
+
+    # internal method that is called when the first "Ractor.new" is called
+    def _activated # :nodoc:
+      Kernel.prepend Module.new{|m|
+        m.set_temporary_name '<RactorRequire>'
+
+        def require feature # :nodoc: -- otherwise RDoc outputs it as a class method
+          if Ractor.main?
+            super
+          else
+            Ractor._require feature
+          end
+        end
+      }
+    end
+  end
+
+  #
+  # call-seq:
+  #   ractor.default_port -> port object
+  #
+  # return default port of the Ractor.
+  #
+  def default_port
+    __builtin_cexpr! %q{
+      ractor_default_port_value(RACTOR_PTR(self))
+    }
+  end
+
+  #
+  # call-seq:
+  #    ractor.join -> self
+  #
+  # Wait for the termination of the Ractor.
+  # If the Ractor was aborted (terminated with an exception),
+  # Ractor#value is called to raise an exception.
+  #
+  #     Ractor.new{}.join #=> ractor
+  #
+  #     Ractor.new{ raise "foo" }.join
+  #     #=> raise an exception "foo (RuntimeError)"
+  #
+  def join
+    port = Port.new
+
+    self.monitor port
+    if port.receive == :aborted
+      __builtin_ractor_value
+    end
+
+    self
+  ensure
+    port.close
+  end
+
+  #
+  # call-seq:
+  #    ractor.value -> obj
+  #
+  # Waits for +ractor+ to complete, using #join, and return its value or raise
+  # the exception which terminated the Ractor. The value will not be copied even
+  # if it is unshareable object. Therefore at most 1 Ractor can get a value.
+  #
+  #   r = Ractor.new{ [1, 2] }
+  #   r.value #=> [1, 2] (unshareable object)
+  #
+  #   Ractor.new(r){|r| r.value} #=> Ractor::Error
+  #
+  def value
+    self.join
+    __builtin_ractor_value
+  end
+
+  # keep it for compatibility
+  def take
+    Kernel.warn("Ractor#take was deprecated and use Ractor#value instead. This method will be removed after the end of Aug 2025", uplevel: 0)
+    self.value
+  end
+
+  #
+  # call-seq:
+  #    ractor.monitor(port) -> self
+  #
+  # Register port as a monitoring port. If the ractor terminated,
+  # the port received a Symbol object.
+  # :exited will be sent if the ractor terminated without an exception.
+  # :aborted will be sent if the ractor terminated with a exception.
+  #
+  #     r = Ractor.new{ some_task() }
+  #     r.monitor(port = Ractor::Port.new)
+  #     port.receive #=> :exited and r is terminated
+  #
+  #     r = Ractor.new{ raise "foo" }
+  #     r.monitor(port = Ractor::Port.new)
+  #     port.receive #=> :terminated and r is terminated with an exception "foo"
+  #
+  def monitor port
+    __builtin_ractor_monitor(port)
+  end
+
+  #
+  # call-seq:
+  #    ractor.unmonitor(port) -> self
+  #
+  # Unregister port from the monitoring ports.
+  #
+  def unmonitor port
+    __builtin_ractor_unmonitor(port)
+  end
+
+  class Port
+    #
+    # call-seq:
+    #    port.receive -> msg
+    #
+    # Receive a message to the port (which was sent there by Port#send).
+    #
+    #     port = Ractor::Port.new
+    #     r = Ractor.new port do |port|
+    #       port.send('message1')
+    #     end
+    #
+    #     v1 = port.receive
+    #     puts "Received: #{v1}"
+    #     r.join
+    #     # Here will be printed: "Received: message1"
+    #
+    # The method blocks if the message queue is empty.
+    #
+    #     port = Ractor::Port.new
+    #     r = Ractor.new port do |port|
+    #       wait
+    #       puts "Still not received"
+    #       port.send('message1')
+    #       wait
+    #       puts "Still received only one"
+    #       port.send('message2')
+    #     end
+    #     puts "Before first receive"
+    #     v1 = port.receive
+    #     puts "Received: #{v1}"
+    #     v2 = port.receive
+    #     puts "Received: #{v2}"
+    #     r.join
+    #
+    # Output:
+    #
+    #     Before first receive
+    #     Still not received
+    #     Received: message1
+    #     Still received only one
+    #     Received: message2
+    #
+    # If close_incoming was called on the ractor, the method raises Ractor::ClosedError
+    # if there are no more messages in the message queue:
+    #
+    #     port = Ractor::Port.new
+    #     port.close
+    #     port.receive #=> raise Ractor::ClosedError
+    #
+    def receive
+      __builtin_cexpr! %q{
+        ractor_port_receive(ec, self)
+      }
+    end
+
+    #
+    # call-seq:
+    #    port.send(msg, move: false) -> self
+    #
+    # Send a message to a port to be accepted by port.receive.
+    #
+    #     port = Ractor::Port.new
+    #     r = Ractor.new do
+    #       r.send 'message'
+    #     end
+    #     value = port.receive
+    #     puts "Received #{value}"
+    #     # Prints: "Received: message"
+    #
+    # The method is non-blocking (will return immediately even if the ractor is not ready
+    # to receive anything):
+    #
+    #     port = Ractor::Port.new
+    #     r = Ractor.new(port) do |port|
+    #       port.send 'test'}
+    #       puts "Sent successfully"
+    #       # Prints: "Sent successfully" immediately
+    #     end
+    #
+    # An attempt to send to a port which already closed its execution will raise Ractor::ClosedError.
+    #
+    #   r = Ractor.new {Ractor::Port.new}
+    #   r.join
+    #   p r
+    #   # "#<Ractor:#6 (irb):23 terminated>"
+    #   port = r.value
+    #   port.send('test') # raise Ractor::ClosedError
+    #
+    # If the +obj+ is unshareable, by default it will be copied into the receiving ractor by deep cloning.
+    #
+    # If the object is shareable, it only send a reference to the object without cloning.
+    #
+    def send obj, move: false
+      __builtin_cexpr! %q{
+        ractor_port_send(ec, self, obj, move)
+      }
+    end
+
+    alias << send
+
+    #
+    # call-seq:
+    #    port.close
+    #
+    # Close the port. On the closed port, sending is not prohibited.
+    # Receiving is also not allowed if there is no sent messages arrived before closing.
+    #
+    #     port = Ractor::Port.new
+    #     Ractor.new port do |port|
+    #       port.send 1 # OK
+    #       port.send 2 # OK
+    #       port.close
+    #       port.send 3 # raise Ractor::ClosedError
+    #     end
+    #
+    #     port.receive #=> 1
+    #     port.receive #=> 2
+    #     port.receive #=> raise Ractor::ClosedError
+    #
+    # Now, only a Ractor which creates the port is allowed to close ports.
+    #
+    #     port = Ractor::Port.new
+    #     Ractor.new port do |port|
+    #       port.close #=> closing port by other ractors is not allowed (Ractor::Error)
+    #     end.join
+    #
+    def close
+      __builtin_cexpr! %q{
+        ractor_port_close(ec, self)
+      }
+    end
+
+    #
+    # call-seq:
+    #    port.closed? -> true/false
+    #
+    # Return the port is closed or not.
+    def closed?
+      __builtin_cexpr! %q{
+        ractor_port_closed_p(ec, self);
+      }
+    end
+
+    #
+    # call-seq:
+    #    port.inspect -> string
+    def inspect
+      "#<Ractor::Port to:\##{
+        __builtin_cexpr! "SIZET2NUM(rb_ractor_id((RACTOR_PORT_PTR(self)->r)))"
+      } id:#{
+        __builtin_cexpr! "SIZET2NUM(ractor_port_id(RACTOR_PORT_PTR(self)))"
+      }>"
+    end
+  end
 end
diff --git a/ractor_core.h b/ractor_core.h
index 38aded15074bef..0656ce00a0a8de 100644
--- a/ractor_core.h
+++ b/ractor_core.h
@@ -9,118 +9,36 @@
 #define RACTOR_CHECK_MODE (VM_CHECK_MODE || RUBY_DEBUG) && (SIZEOF_UINT64_T == SIZEOF_VALUE)
 #endif
 
-enum rb_ractor_basket_type {
-    // basket is empty
-    basket_type_none,
-
-    // value is available
-    basket_type_ref,
-    basket_type_copy,
-    basket_type_move,
-    basket_type_will,
-
-    // basket should be deleted
-    basket_type_deleted,
-
-    // basket is reserved
-    basket_type_reserved,
-
-    // take_basket is available
-    basket_type_take_basket,
-
-    // basket is keeping by yielding ractor
-    basket_type_yielding,
-};
-
-// per ractor taking configuration
-struct rb_ractor_selector_take_config {
-    bool closed;
-    bool oneshot;
-};
-
-struct rb_ractor_basket {
-    union {
-        enum rb_ractor_basket_type e;
-        rb_atomic_t atomic;
-    } type;
-    VALUE sender;
-
-    union {
-        struct {
-            VALUE v;
-            bool exception;
-        } send;
-
-        struct {
-            struct rb_ractor_basket *basket;
-            struct rb_ractor_selector_take_config *config;
-        } take;
-    } p; // payload
-};
-
-static inline bool
-basket_type_p(struct rb_ractor_basket *b, enum rb_ractor_basket_type type)
-{
-    return b->type.e == type;
-}
-
-static inline bool
-basket_none_p(struct rb_ractor_basket *b)
-{
-    return basket_type_p(b, basket_type_none);
-}
-
-struct rb_ractor_queue {
-    struct rb_ractor_basket *baskets;
-    int start;
-    int cnt;
-    int size;
-    unsigned int serial;
-    unsigned int reserved_cnt;
-};
-
-enum rb_ractor_wait_status {
-    wait_none      = 0x00,
-    wait_receiving = 0x01,
-    wait_taking    = 0x02,
-    wait_yielding  = 0x04,
-    wait_moving    = 0x08,
-};
-
-enum rb_ractor_wakeup_status {
-    wakeup_none,
-    wakeup_by_send,
-    wakeup_by_yield,
-    wakeup_by_take,
-    wakeup_by_close,
-    wakeup_by_interrupt,
-    wakeup_by_retry,
-};
-
 struct rb_ractor_sync {
     // ractor lock
     rb_nativethread_lock_t lock;
+
 #if RACTOR_CHECK_MODE > 0
     VALUE locked_by;
 #endif
-    rb_nativethread_cond_t cond;
 
-    bool incoming_port_closed;
-    bool outgoing_port_closed;
+#ifndef RUBY_THREAD_PTHREAD_H
+    rb_nativethread_cond_t wakeup_cond;
+#endif
+
+    // incoming messages
+    struct ractor_queue *recv_queue;
 
-    // All sent messages will be pushed into recv_queue
-    struct rb_ractor_queue recv_queue;
+    // waiting threads for receiving
+    struct ccan_list_head waiters;
 
-    // The following ractors waiting for the yielding by this ractor
-    struct rb_ractor_queue takers_queue;
+    // ports
+    VALUE default_port_value;
+    struct st_table *ports;
+    size_t next_port_id;
 
-    // Enabled if the ractor already terminated and not taken yet.
-    struct rb_ractor_basket will_basket;
+    // monitors
+    struct ccan_list_head monitors;
 
-    struct ractor_wait {
-        enum rb_ractor_wait_status status;
-        enum rb_ractor_wakeup_status wakeup_status;
-    } wait;
+    // value
+    rb_ractor_t *successor;
+    VALUE legacy;
+    bool legacy_exc;
 };
 
 // created
@@ -146,12 +64,7 @@ enum ractor_status {
 
 struct rb_ractor_struct {
     struct rb_ractor_pub pub;
-
     struct rb_ractor_sync sync;
-    VALUE receiving_mutex;
-
-    // vm wide barrier synchronization
-    rb_nativethread_cond_t barrier_wait_cond;
 
     // thread management
     struct {
@@ -163,6 +76,7 @@ struct rb_ractor_struct {
         rb_execution_context_t *running_ec;
         rb_thread_t *main;
     } threads;
+
     VALUE thgroup_default;
 
     VALUE name;
@@ -176,6 +90,7 @@ struct rb_ractor_struct {
 
     st_table *local_storage;
     struct rb_id_table *idkey_local_storage;
+    VALUE local_storage_store_lock;
 
     VALUE r_stdin;
     VALUE r_stdout;
@@ -183,13 +98,7 @@ struct rb_ractor_struct {
     VALUE verbose;
     VALUE debug;
 
-    rb_ractor_newobj_cache_t newobj_cache;
-
-    // gc.c rb_objspace_reachable_objects_from
-    struct gc_mark_func_data_struct {
-        void *data;
-        void (*mark_func)(VALUE v, void *data);
-    } *mfd;
+    void *newobj_cache;
 }; // rb_ractor_t is defined in vm_core.h
 
 
@@ -223,12 +132,16 @@ void rb_ractor_vm_barrier_interrupt_running_thread(rb_ractor_t *r);
 void rb_ractor_terminate_interrupt_main_thread(rb_ractor_t *r);
 void rb_ractor_terminate_all(void);
 bool rb_ractor_main_p_(void);
-void rb_ractor_finish_marking(void);
 void rb_ractor_atfork(rb_vm_t *vm, rb_thread_t *th);
+void rb_ractor_terminate_atfork(rb_vm_t *vm, rb_ractor_t *th);
+VALUE rb_ractor_require(VALUE feature, bool silent);
+VALUE rb_ractor_autoload_load(VALUE space, ID id);
 
 VALUE rb_ractor_ensure_shareable(VALUE obj, VALUE name);
 
 RUBY_SYMBOL_EXPORT_BEGIN
+void rb_ractor_finish_marking(void);
+
 bool rb_ractor_shareable_p_continue(VALUE obj);
 
 // THIS FUNCTION SHOULD NOT CALL WHILE INCREMENTAL MARKING!!
@@ -279,12 +192,16 @@ rb_ractor_sleeper_thread_num(rb_ractor_t *r)
 }
 
 static inline void
-rb_ractor_thread_switch(rb_ractor_t *cr, rb_thread_t *th)
+rb_ractor_thread_switch(rb_ractor_t *cr, rb_thread_t *th, bool always_reset)
 {
     RUBY_DEBUG_LOG("th:%d->%u%s",
                    cr->threads.running_ec ? (int)rb_th_serial(cr->threads.running_ec->thread_ptr) : -1,
                    rb_th_serial(th), cr->threads.running_ec == th->ec ? " (same)" : "");
 
+    if (cr->threads.running_ec != th->ec || always_reset) {
+        th->running_time_us = 0;
+    }
+
     if (cr->threads.running_ec != th->ec) {
         if (0) {
             ruby_debug_printf("rb_ractor_thread_switch ec:%p->%p\n",
@@ -295,26 +212,21 @@ rb_ractor_thread_switch(rb_ractor_t *cr, rb_thread_t *th)
         return;
     }
 
-    if (cr->threads.running_ec != th->ec) {
-        th->running_time_us = 0;
-    }
-
     cr->threads.running_ec = th->ec;
 
     VM_ASSERT(cr == GET_RACTOR());
 }
 
 #define rb_ractor_set_current_ec(cr, ec) rb_ractor_set_current_ec_(cr, ec, __FILE__, __LINE__)
+#ifdef RB_THREAD_LOCAL_SPECIFIER
+void rb_current_ec_set(rb_execution_context_t *ec);
+#endif
 
 static inline void
 rb_ractor_set_current_ec_(rb_ractor_t *cr, rb_execution_context_t *ec, const char *file, int line)
 {
 #ifdef RB_THREAD_LOCAL_SPECIFIER
-# ifdef __APPLE__
     rb_current_ec_set(ec);
-# else
-    ruby_current_ec = ec;
-# endif
 #else
     native_tls_set(ruby_current_ec_key, ec);
 #endif
@@ -343,12 +255,6 @@ rb_ractor_setup_belonging_to(VALUE obj, uint32_t rid)
     RACTOR_BELONGING_ID(obj) = rid;
 }
 
-static inline void
-rb_ractor_setup_belonging(VALUE obj)
-{
-    rb_ractor_setup_belonging_to(obj, rb_ractor_current_id());
-}
-
 static inline uint32_t
 rb_ractor_belonging(VALUE obj)
 {
@@ -360,9 +266,13 @@ rb_ractor_belonging(VALUE obj)
     }
 }
 
+extern bool rb_ractor_ignore_belonging_flag;
+
 static inline VALUE
 rb_ractor_confirm_belonging(VALUE obj)
 {
+    if (rb_ractor_ignore_belonging_flag) return obj;
+
     uint32_t id = rb_ractor_belonging(obj);
 
     if (id == 0) {
@@ -382,6 +292,14 @@ rb_ractor_confirm_belonging(VALUE obj)
     }
     return obj;
 }
+
+static inline void
+rb_ractor_ignore_belonging(bool flag)
+{
+    rb_ractor_ignore_belonging_flag = flag;
+}
+
 #else
 #define rb_ractor_confirm_belonging(obj) obj
+#define rb_ractor_ignore_belonging(flag) (0)
 #endif
diff --git a/ractor_sync.c b/ractor_sync.c
new file mode 100644
index 00000000000000..eb967a73cbc324
--- /dev/null
+++ b/ractor_sync.c
@@ -0,0 +1,1499 @@
+
+// this file is included by ractor.c
+
+struct ractor_port {
+    rb_ractor_t *r;
+    st_data_t id_;
+};
+
+static st_data_t
+ractor_port_id(const struct ractor_port *rp)
+{
+    return rp->id_;
+}
+
+static VALUE rb_cRactorPort;
+
+static VALUE ractor_receive(rb_execution_context_t *ec, const struct ractor_port *rp);
+static VALUE ractor_send(rb_execution_context_t *ec, const struct ractor_port *rp, VALUE obj, VALUE move);
+static VALUE ractor_try_send(rb_execution_context_t *ec, const struct ractor_port *rp, VALUE obj, VALUE move);
+static void ractor_add_port(rb_ractor_t *r, st_data_t id);
+
+static void
+ractor_port_mark(void *ptr)
+{
+    const struct ractor_port *rp = (struct ractor_port *)ptr;
+
+    if (rp->r) {
+        rb_gc_mark(rp->r->pub.self);
+    }
+}
+
+static void
+ractor_port_free(void *ptr)
+{
+    xfree(ptr);
+}
+
+static size_t
+ractor_port_memsize(const void *ptr)
+{
+    return sizeof(struct ractor_port);
+}
+
+static const rb_data_type_t ractor_port_data_type = {
+    "ractor/port",
+    {
+        ractor_port_mark,
+        ractor_port_free,
+        ractor_port_memsize,
+        NULL, // update
+    },
+    0, 0, RUBY_TYPED_FREE_IMMEDIATELY | RUBY_TYPED_WB_PROTECTED,
+};
+
+static st_data_t
+ractor_genid_for_port(rb_ractor_t *cr)
+{
+    // TODO: enough?
+    return cr->sync.next_port_id++;
+}
+
+static struct ractor_port *
+RACTOR_PORT_PTR(VALUE self)
+{
+    VM_ASSERT(rb_typeddata_is_kind_of(self, &ractor_port_data_type));
+    struct ractor_port *rp = DATA_PTR(self);
+    return rp;
+}
+
+static VALUE
+ractor_port_alloc(VALUE klass)
+{
+    struct ractor_port *rp;
+    VALUE rpv = TypedData_Make_Struct(klass, struct ractor_port, &ractor_port_data_type, rp);
+    return rpv;
+}
+
+static VALUE
+ractor_port_init(VALUE rpv, rb_ractor_t *r)
+{
+    struct ractor_port *rp = RACTOR_PORT_PTR(rpv);
+
+    rp->r = r;
+    RB_OBJ_WRITTEN(rpv, Qundef, r->pub.self);
+    rp->id_ = ractor_genid_for_port(r);
+
+    ractor_add_port(r, ractor_port_id(rp));
+
+    rb_obj_freeze(rpv);
+
+    return rpv;
+}
+
+static VALUE
+ractor_port_initialzie(VALUE self)
+{
+    return ractor_port_init(self, GET_RACTOR());
+}
+
+static VALUE
+ractor_port_initialzie_copy(VALUE self, VALUE orig)
+{
+    struct ractor_port *dst = RACTOR_PORT_PTR(self);
+    struct ractor_port *src = RACTOR_PORT_PTR(orig);
+    dst->r = src->r;
+    RB_OBJ_WRITTEN(self, Qundef, dst->r->pub.self);
+    dst->id_ = ractor_port_id(src);
+
+    return self;
+}
+
+static VALUE
+ractor_port_new(rb_ractor_t *r)
+{
+    VALUE rpv = ractor_port_alloc(rb_cRactorPort);
+    ractor_port_init(rpv, r);
+    return rpv;
+}
+
+static bool
+ractor_port_p(VALUE self)
+{
+    return rb_typeddata_is_kind_of(self, &ractor_port_data_type);
+}
+
+static VALUE
+ractor_port_receive(rb_execution_context_t *ec, VALUE self)
+{
+    const struct ractor_port *rp = RACTOR_PORT_PTR(self);
+
+    if (rp->r != rb_ec_ractor_ptr(ec)) {
+        rb_raise(rb_eRactorError, "only allowed from the creator Ractor of this port");
+    }
+
+    return ractor_receive(ec, rp);
+}
+
+static VALUE
+ractor_port_send(rb_execution_context_t *ec, VALUE self, VALUE obj, VALUE move)
+{
+    const struct ractor_port *rp = RACTOR_PORT_PTR(self);
+    ractor_send(ec, rp, obj, RTEST(move));
+    return self;
+}
+
+static bool ractor_closed_port_p(rb_execution_context_t *ec, rb_ractor_t *r, const struct ractor_port *rp);
+static bool ractor_close_port(rb_execution_context_t *ec, rb_ractor_t *r, const struct ractor_port *rp);
+
+static VALUE
+ractor_port_closed_p(rb_execution_context_t *ec, VALUE self)
+{
+    const struct ractor_port *rp = RACTOR_PORT_PTR(self);
+
+    if (ractor_closed_port_p(ec, rp->r, rp)) {
+        return Qtrue;
+    }
+    else {
+        return Qfalse;
+    }
+}
+
+static VALUE
+ractor_port_close(rb_execution_context_t *ec, VALUE self)
+{
+    const struct ractor_port *rp = RACTOR_PORT_PTR(self);
+    rb_ractor_t *cr = rb_ec_ractor_ptr(ec);
+
+    if (cr != rp->r) {
+        rb_raise(rb_eRactorError, "closing port by other ractors is not allowed");
+    }
+
+    ractor_close_port(ec, cr, rp);
+    return self;
+}
+
+// ractor-internal
+
+// ractor-internal - ractor_basket
+
+enum ractor_basket_type {
+    // basket is empty
+    basket_type_none,
+
+    // value is available
+    basket_type_ref,
+    basket_type_copy,
+    basket_type_move,
+};
+
+struct ractor_basket {
+    enum ractor_basket_type type;
+    VALUE sender;
+    st_data_t port_id;
+
+    struct {
+        VALUE v;
+        bool exception;
+    } p; // payload
+
+    struct ccan_list_node node;
+};
+
+#if 0
+static inline bool
+ractor_basket_type_p(const struct ractor_basket *b, enum ractor_basket_type type)
+{
+    return b->type == type;
+}
+
+static inline bool
+ractor_basket_none_p(const struct ractor_basket *b)
+{
+    return ractor_basket_type_p(b, basket_type_none);
+}
+#endif
+
+static void
+ractor_basket_mark(const struct ractor_basket *b)
+{
+    rb_gc_mark(b->p.v);
+}
+
+static void
+ractor_basket_free(struct ractor_basket *b)
+{
+    xfree(b);
+}
+
+static struct ractor_basket *
+ractor_basket_alloc(void)
+{
+    struct ractor_basket *b = ALLOC(struct ractor_basket);
+    return b;
+}
+
+// ractor-internal - ractor_queue
+
+struct ractor_queue {
+    struct ccan_list_head set;
+    bool closed;
+};
+
+static void
+ractor_queue_init(struct ractor_queue *rq)
+{
+    ccan_list_head_init(&rq->set);
+    rq->closed = false;
+}
+
+static struct ractor_queue *
+ractor_queue_new(void)
+{
+    struct ractor_queue *rq = ALLOC(struct ractor_queue);
+    ractor_queue_init(rq);
+    return rq;
+}
+
+static void
+ractor_queue_mark(const struct ractor_queue *rq)
+{
+    const struct ractor_basket *b;
+
+    ccan_list_for_each(&rq->set, b, node) {
+        ractor_basket_mark(b);
+    }
+}
+
+static void
+ractor_queue_free(struct ractor_queue *rq)
+{
+    struct ractor_basket *b, *nxt;
+
+    ccan_list_for_each_safe(&rq->set, b, nxt, node) {
+        ccan_list_del_init(&b->node);
+        ractor_basket_free(b);
+    }
+
+    VM_ASSERT(ccan_list_empty(&rq->set));
+
+    xfree(rq);
+}
+
+RBIMPL_ATTR_MAYBE_UNUSED()
+static size_t
+ractor_queue_size(const struct ractor_queue *rq)
+{
+    size_t size = 0;
+    const struct ractor_basket *b;
+
+    ccan_list_for_each(&rq->set, b, node) {
+        size++;
+    }
+    return size;
+}
+
+static void
+ractor_queue_close(struct ractor_queue *rq)
+{
+    rq->closed = true;
+}
+
+static void
+ractor_queue_move(struct ractor_queue *dst_rq, struct ractor_queue *src_rq)
+{
+    struct ccan_list_head *src = &src_rq->set;
+    struct ccan_list_head *dst = &dst_rq->set;
+
+    dst->n.next = src->n.next;
+    dst->n.prev = src->n.prev;
+    dst->n.next->prev = &dst->n;
+    dst->n.prev->next = &dst->n;
+    ccan_list_head_init(src);
+}
+
+#if 0
+static struct ractor_basket *
+ractor_queue_head(rb_ractor_t *r, struct ractor_queue *rq)
+{
+    return ccan_list_top(&rq->set, struct ractor_basket, node);
+}
+#endif
+
+static bool
+ractor_queue_empty_p(rb_ractor_t *r, const struct ractor_queue *rq)
+{
+    return ccan_list_empty(&rq->set);
+}
+
+static struct ractor_basket *
+ractor_queue_deq(rb_ractor_t *r, struct ractor_queue *rq)
+{
+    VM_ASSERT(GET_RACTOR() == r);
+
+    return ccan_list_pop(&rq->set, struct ractor_basket, node);
+}
+
+static void
+ractor_queue_enq(rb_ractor_t *r, struct ractor_queue *rq, struct ractor_basket *basket)
+{
+    ccan_list_add_tail(&rq->set, &basket->node);
+}
+
+#if 0
+static void
+rq_dump(const struct ractor_queue *rq)
+{
+    int i=0;
+    struct ractor_basket *b;
+    ccan_list_for_each(&rq->set, b, node) {
+        fprintf(stderr, "%d type:%s %p\n", i, basket_type_name(b->type), (void *)b);
+        i++;
+    }
+}
+#endif
+
+static void ractor_delete_port(rb_ractor_t *cr, st_data_t id, bool locked);
+
+static struct ractor_queue *
+ractor_get_queue(rb_ractor_t *cr, st_data_t id, bool locked)
+{
+    VM_ASSERT(cr == GET_RACTOR());
+
+    struct ractor_queue *rq;
+
+    if (cr->sync.ports && st_lookup(cr->sync.ports, id, (st_data_t *)&rq)) {
+        if (rq->closed && ractor_queue_empty_p(cr, rq)) {
+            ractor_delete_port(cr, id, locked);
+            return NULL;
+        }
+        else {
+            return rq;
+        }
+    }
+    else {
+        return NULL;
+    }
+}
+
+// ractor-internal - ports
+
+static void
+ractor_add_port(rb_ractor_t *r, st_data_t id)
+{
+    struct ractor_queue *rq = ractor_queue_new();
+    ASSERT_ractor_unlocking(r);
+
+    RUBY_DEBUG_LOG("id:%u", (unsigned int)id);
+
+    RACTOR_LOCK(r);
+    {
+        // memo: can cause GC, but GC doesn't use ractor locking.
+        st_insert(r->sync.ports, id, (st_data_t)rq);
+    }
+    RACTOR_UNLOCK(r);
+}
+
+static void
+ractor_delete_port_locked(rb_ractor_t *cr, st_data_t id)
+{
+    ASSERT_ractor_locking(cr);
+
+    RUBY_DEBUG_LOG("id:%u", (unsigned int)id);
+
+    struct ractor_queue *rq;
+
+    if (st_delete(cr->sync.ports, &id, (st_data_t *)&rq)) {
+        ractor_queue_free(rq);
+    }
+    else {
+        VM_ASSERT(0);
+    }
+}
+
+static void
+ractor_delete_port(rb_ractor_t *cr, st_data_t id, bool locked)
+{
+    if (locked) {
+        ractor_delete_port_locked(cr, id);
+    }
+    else {
+        RACTOR_LOCK_SELF(cr);
+        {
+            ractor_delete_port_locked(cr, id);
+        }
+        RACTOR_UNLOCK_SELF(cr);
+    }
+}
+
+static const struct ractor_port *
+ractor_default_port(rb_ractor_t *r)
+{
+    return RACTOR_PORT_PTR(r->sync.default_port_value);
+}
+
+static VALUE
+ractor_default_port_value(rb_ractor_t *r)
+{
+    return r->sync.default_port_value;
+}
+
+static bool
+ractor_closed_port_p(rb_execution_context_t *ec, rb_ractor_t *r, const struct ractor_port *rp)
+{
+    VM_ASSERT(rb_ec_ractor_ptr(ec) == rp->r ? 1 : (ASSERT_ractor_locking(rp->r), 1));
+
+    const struct ractor_queue *rq;
+
+    if (rp->r->sync.ports && st_lookup(rp->r->sync.ports, ractor_port_id(rp), (st_data_t *)&rq)) {
+        return rq->closed;
+    }
+    else {
+        return true;
+    }
+}
+
+static void ractor_deliver_incoming_messages(rb_execution_context_t *ec, rb_ractor_t *cr);
+static bool ractor_queue_empty_p(rb_ractor_t *r, const struct ractor_queue *rq);
+
+static bool
+ractor_close_port(rb_execution_context_t *ec, rb_ractor_t *cr, const struct ractor_port *rp)
+{
+    VM_ASSERT(cr == rp->r);
+    struct ractor_queue *rq = NULL;
+
+    RACTOR_LOCK_SELF(cr);
+    {
+        ractor_deliver_incoming_messages(ec, cr); // check incoming messages
+
+        if (st_lookup(rp->r->sync.ports, ractor_port_id(rp), (st_data_t *)&rq)) {
+            ractor_queue_close(rq);
+
+            if (ractor_queue_empty_p(cr, rq)) {
+                // delete from the table
+                ractor_delete_port(cr, ractor_port_id(rp), true);
+            }
+
+            // TODO: free rq
+        }
+    }
+    RACTOR_UNLOCK_SELF(cr);
+
+    return rq != NULL;
+}
+
+static int
+ractor_free_all_ports_i(st_data_t port_id, st_data_t val, st_data_t dat)
+{
+    struct ractor_queue *rq = (struct ractor_queue *)val;
+    // rb_ractor_t *cr = (rb_ractor_t *)dat;
+
+    ractor_queue_free(rq);
+    return ST_CONTINUE;
+}
+
+static void
+ractor_free_all_ports(rb_ractor_t *cr)
+{
+    if (cr->sync.ports) {
+        st_foreach(cr->sync.ports, ractor_free_all_ports_i, (st_data_t)cr);
+        st_free_table(cr->sync.ports);
+        cr->sync.ports = NULL;
+    }
+
+    if (cr->sync.recv_queue) {
+        ractor_queue_free(cr->sync.recv_queue);
+        cr->sync.recv_queue = NULL;
+    }
+}
+
+#if defined(HAVE_WORKING_FORK)
+static void
+ractor_sync_terminate_atfork(rb_vm_t *vm, rb_ractor_t *r)
+{
+    ractor_free_all_ports(r);
+    r->sync.legacy = Qnil;
+}
+#endif
+
+// Ractor#monitor
+
+struct ractor_monitor {
+    struct ractor_port port;
+    struct ccan_list_node node;
+};
+
+static void
+ractor_mark_monitors(rb_ractor_t *r)
+{
+    const struct ractor_monitor *rm;
+    ccan_list_for_each(&r->sync.monitors, rm, node) {
+        rb_gc_mark(rm->port.r->pub.self);
+    }
+}
+
+static VALUE
+ractor_exit_token(bool exc)
+{
+    if (exc) {
+        RUBY_DEBUG_LOG("aborted");
+        return ID2SYM(idAborted);
+    }
+    else {
+        RUBY_DEBUG_LOG("exited");
+        return ID2SYM(idExited);
+    }
+}
+
+static VALUE
+ractor_monitor(rb_execution_context_t *ec, VALUE self, VALUE port)
+{
+    rb_ractor_t *r = RACTOR_PTR(self);
+    bool terminated = false;
+    const struct ractor_port *rp = RACTOR_PORT_PTR(port);
+    struct ractor_monitor *rm = ALLOC(struct ractor_monitor);
+    rm->port = *rp; // copy port information
+
+    RACTOR_LOCK(r);
+    {
+        if (UNDEF_P(r->sync.legacy)) { // not terminated
+            RUBY_DEBUG_LOG("OK/r:%u -> port:%u@r%u", (unsigned int)rb_ractor_id(r), (unsigned int)ractor_port_id(&rm->port), (unsigned int)rb_ractor_id(rm->port.r));
+            ccan_list_add_tail(&r->sync.monitors, &rm->node);
+        }
+        else {
+            RUBY_DEBUG_LOG("NG/r:%u -> port:%u@r%u", (unsigned int)rb_ractor_id(r), (unsigned int)ractor_port_id(&rm->port), (unsigned int)rb_ractor_id(rm->port.r));
+            terminated = true;
+        }
+    }
+    RACTOR_UNLOCK(r);
+
+    if (terminated) {
+        xfree(rm);
+        ractor_port_send(ec, port, ractor_exit_token(r->sync.legacy_exc), Qfalse);
+
+        return Qfalse;
+    }
+    else {
+        return Qtrue;
+    }
+}
+
+static VALUE
+ractor_unmonitor(rb_execution_context_t *ec, VALUE self, VALUE port)
+{
+    rb_ractor_t *r = RACTOR_PTR(self);
+    const struct ractor_port *rp = RACTOR_PORT_PTR(port);
+
+    RACTOR_LOCK(r);
+    {
+        if (UNDEF_P(r->sync.legacy)) { // not terminated
+            struct ractor_monitor *rm, *nxt;
+
+            ccan_list_for_each_safe(&r->sync.monitors, rm, nxt, node) {
+                if (ractor_port_id(&rm->port) == ractor_port_id(rp)) {
+                    RUBY_DEBUG_LOG("r:%u -> port:%u@r%u",
+                                   (unsigned int)rb_ractor_id(r),
+                                   (unsigned int)ractor_port_id(&rm->port),
+                                   (unsigned int)rb_ractor_id(rm->port.r));
+                    ccan_list_del(&rm->node);
+                    xfree(rm);
+                }
+            }
+        }
+    }
+    RACTOR_UNLOCK(r);
+
+    return self;
+}
+
+static void
+ractor_notify_exit(rb_execution_context_t *ec, rb_ractor_t *cr, VALUE legacy, bool exc)
+{
+    RUBY_DEBUG_LOG("exc:%d", exc);
+    VM_ASSERT(!UNDEF_P(legacy));
+    VM_ASSERT(cr->sync.legacy == Qundef);
+
+    RACTOR_LOCK_SELF(cr);
+    {
+        ractor_free_all_ports(cr);
+
+        cr->sync.legacy = legacy;
+        cr->sync.legacy_exc = exc;
+    }
+    RACTOR_UNLOCK_SELF(cr);
+
+    // send token
+
+    VALUE token = ractor_exit_token(exc);
+    struct ractor_monitor *rm, *nxt;
+
+    ccan_list_for_each_safe(&cr->sync.monitors, rm, nxt, node)
+    {
+        RUBY_DEBUG_LOG("port:%u@r%u", (unsigned int)ractor_port_id(&rm->port), (unsigned int)rb_ractor_id(rm->port.r));
+
+        ractor_try_send(ec, &rm->port, token, false);
+
+        ccan_list_del(&rm->node);
+        xfree(rm);
+    }
+
+    VM_ASSERT(ccan_list_empty(&cr->sync.monitors));
+}
+
+// ractor-internal - initialize, mark, free, memsize
+
+static int
+ractor_mark_ports_i(st_data_t key, st_data_t val, st_data_t data)
+{
+    // id -> ractor_queue
+    const struct ractor_queue *rq = (struct ractor_queue *)val;
+    ractor_queue_mark(rq);
+    return ST_CONTINUE;
+}
+
+static void
+ractor_sync_mark(rb_ractor_t *r)
+{
+    rb_gc_mark(r->sync.default_port_value);
+
+    if (r->sync.ports) {
+        ractor_queue_mark(r->sync.recv_queue);
+        st_foreach(r->sync.ports, ractor_mark_ports_i, 0);
+    }
+
+    ractor_mark_monitors(r);
+}
+
+static int
+ractor_sync_free_ports_i(st_data_t _key, st_data_t val, st_data_t _args)
+{
+    struct ractor_queue *queue = (struct ractor_queue *)val;
+
+    ractor_queue_free(queue);
+
+    return ST_CONTINUE;
+}
+
+static void
+ractor_sync_free(rb_ractor_t *r)
+{
+    if (r->sync.recv_queue) {
+        ractor_queue_free(r->sync.recv_queue);
+    }
+
+    // maybe NULL
+    if (r->sync.ports) {
+        st_foreach(r->sync.ports, ractor_sync_free_ports_i, 0);
+        st_free_table(r->sync.ports);
+        r->sync.ports = NULL;
+    }
+}
+
+static size_t
+ractor_sync_memsize(const rb_ractor_t *r)
+{
+    return st_table_size(r->sync.ports);
+}
+
+static void
+ractor_sync_init(rb_ractor_t *r)
+{
+    // lock
+    rb_native_mutex_initialize(&r->sync.lock);
+
+    // monitors
+    ccan_list_head_init(&r->sync.monitors);
+
+    // waiters
+    ccan_list_head_init(&r->sync.waiters);
+
+    // receiving queue
+    r->sync.recv_queue = ractor_queue_new();
+
+    // ports
+    r->sync.ports = st_init_numtable();
+    r->sync.default_port_value = ractor_port_new(r);
+    FL_SET_RAW(r->sync.default_port_value, RUBY_FL_SHAREABLE); // only default ports are shareable
+
+    // legacy
+    r->sync.legacy = Qundef;
+
+#ifndef RUBY_THREAD_PTHREAD_H
+    rb_native_cond_initialize(&r->sync.wakeup_cond);
+#endif
+}
+
+// Ractor#value
+
+static rb_ractor_t *
+ractor_set_successor_once(rb_ractor_t *r, rb_ractor_t *cr)
+{
+    if (r->sync.successor == NULL) {
+        rb_ractor_t *successor = ATOMIC_PTR_CAS(r->sync.successor, NULL, cr);
+        return successor == NULL ? cr : successor;
+    }
+
+    return r->sync.successor;
+}
+
+static VALUE ractor_reset_belonging(VALUE obj);
+
+static VALUE
+ractor_make_remote_exception(VALUE cause, VALUE sender)
+{
+    VALUE err = rb_exc_new_cstr(rb_eRactorRemoteError, "thrown by remote Ractor.");
+    rb_ivar_set(err, rb_intern("@ractor"), sender);
+    rb_ec_setup_exception(NULL, err, cause);
+    return err;
+}
+
+static VALUE
+ractor_value(rb_execution_context_t *ec, VALUE self)
+{
+    rb_ractor_t *cr = rb_ec_ractor_ptr(ec);
+    rb_ractor_t *r = RACTOR_PTR(self);
+    rb_ractor_t *sr = ractor_set_successor_once(r, cr);
+
+    if (sr == cr) {
+        ractor_reset_belonging(r->sync.legacy);
+
+        if (r->sync.legacy_exc) {
+            rb_exc_raise(ractor_make_remote_exception(r->sync.legacy, self));
+        }
+        return r->sync.legacy;
+    }
+    else {
+        rb_raise(rb_eRactorError, "Only the successor ractor can take a value");
+    }
+}
+
+static VALUE ractor_move(VALUE obj); // in this file
+static VALUE ractor_copy(VALUE obj); // in this file
+
+static VALUE
+ractor_prepare_payload(rb_execution_context_t *ec, VALUE obj, enum ractor_basket_type *ptype)
+{
+    switch (*ptype) {
+      case basket_type_ref:
+        return obj;
+      case basket_type_move:
+        return ractor_move(obj);
+      default:
+        if (rb_ractor_shareable_p(obj)) {
+            *ptype = basket_type_ref;
+            return obj;
+        }
+        else {
+            *ptype = basket_type_copy;
+            return ractor_copy(obj);
+        }
+    }
+}
+
+static struct ractor_basket *
+ractor_basket_new(rb_execution_context_t *ec, VALUE obj, enum ractor_basket_type type, bool exc)
+{
+    VALUE v = ractor_prepare_payload(ec, obj, &type);
+
+    struct ractor_basket *b = ractor_basket_alloc();
+    b->type = type;
+    b->p.v = v;
+    b->p.exception = exc;
+    return b;
+}
+
+static VALUE
+ractor_basket_value(struct ractor_basket *b)
+{
+    switch (b->type) {
+      case basket_type_ref:
+        break;
+      case basket_type_copy:
+      case basket_type_move:
+        ractor_reset_belonging(b->p.v);
+        break;
+      default:
+        VM_ASSERT(0); // unreachable
+    }
+
+    VM_ASSERT(!RB_TYPE_P(b->p.v, T_NONE));
+    return b->p.v;
+}
+
+static VALUE
+ractor_basket_accept(struct ractor_basket *b)
+{
+    VALUE v = ractor_basket_value(b);
+
+    if (b->p.exception) {
+        VALUE err = ractor_make_remote_exception(v, b->sender);
+        ractor_basket_free(b);
+        rb_exc_raise(err);
+    }
+
+    ractor_basket_free(b);
+    return v;
+}
+
+// Ractor blocking by receive
+
+enum ractor_wakeup_status {
+    wakeup_none,
+    wakeup_by_send,
+    wakeup_by_interrupt,
+
+    // wakeup_by_close,
+};
+
+struct ractor_waiter {
+    enum ractor_wakeup_status wakeup_status;
+    rb_thread_t *th;
+    struct ccan_list_node node;
+};
+
+#if VM_CHECK_MODE > 0
+static bool
+ractor_waiter_included(rb_ractor_t *cr, rb_thread_t *th)
+{
+    ASSERT_ractor_locking(cr);
+
+    struct ractor_waiter *w;
+
+    ccan_list_for_each(&cr->sync.waiters, w, node) {
+        if (w->th == th) {
+            return true;
+        }
+    }
+
+    return false;
+}
+#endif
+
+#if USE_RUBY_DEBUG_LOG
+
+static const char *
+wakeup_status_str(enum ractor_wakeup_status wakeup_status)
+{
+    switch (wakeup_status) {
+      case wakeup_none: return "none";
+      case wakeup_by_send: return "by_send";
+      case wakeup_by_interrupt: return "by_interrupt";
+      // case wakeup_by_close: return "by_close";
+    }
+    rb_bug("unreachable");
+}
+
+static const char *
+basket_type_name(enum ractor_basket_type type)
+{
+    switch (type) {
+      case basket_type_none: return  "none";
+      case basket_type_ref: return "ref";
+      case basket_type_copy: return "copy";
+      case basket_type_move: return "move";
+    }
+    VM_ASSERT(0);
+    return NULL;
+}
+
+#endif // USE_RUBY_DEBUG_LOG
+
+#ifdef RUBY_THREAD_PTHREAD_H
+
+//
+
+#else // win32
+
+static void
+ractor_cond_wait(rb_ractor_t *r)
+{
+#if RACTOR_CHECK_MODE > 0
+    VALUE locked_by = r->sync.locked_by;
+    r->sync.locked_by = Qnil;
+#endif
+    rb_native_cond_wait(&r->sync.wakeup_cond, &r->sync.lock);
+
+#if RACTOR_CHECK_MODE > 0
+    r->sync.locked_by = locked_by;
+#endif
+}
+
+static void *
+ractor_wait_no_gvl(void *ptr)
+{
+    struct ractor_waiter *waiter = (struct ractor_waiter *)ptr;
+    rb_ractor_t *cr = waiter->th->ractor;
+
+    RACTOR_LOCK_SELF(cr);
+    {
+        if (waiter->wakeup_status == wakeup_none) {
+            ractor_cond_wait(cr);
+        }
+    }
+    RACTOR_UNLOCK_SELF(cr);
+    return NULL;
+}
+
+static void
+rb_ractor_sched_wait(rb_execution_context_t *ec, rb_ractor_t *cr, rb_unblock_function_t *ubf, void *ptr)
+{
+    struct ractor_waiter *waiter = (struct ractor_waiter *)ptr;
+
+    RACTOR_UNLOCK(cr);
+    {
+        rb_nogvl(ractor_wait_no_gvl, waiter,
+                 ubf, waiter,
+                 RB_NOGVL_UBF_ASYNC_SAFE | RB_NOGVL_INTR_FAIL);
+    }
+    RACTOR_LOCK(cr);
+}
+
+static void
+rb_ractor_sched_wakeup(rb_ractor_t *r, rb_thread_t *th)
+{
+    // ractor lock is acquired
+    rb_native_cond_broadcast(&r->sync.wakeup_cond);
+}
+#endif
+
+static bool
+ractor_wakeup_all(rb_ractor_t *r, enum ractor_wakeup_status wakeup_status)
+{
+    ASSERT_ractor_unlocking(r);
+
+    RUBY_DEBUG_LOG("r:%u wakeup:%s", rb_ractor_id(r), wakeup_status_str(wakeup_status));
+
+    bool wakeup_p = false;
+
+    RACTOR_LOCK(r);
+    while (1) {
+        struct ractor_waiter *waiter = ccan_list_pop(&r->sync.waiters, struct ractor_waiter, node);
+
+        if (waiter) {
+            VM_ASSERT(waiter->wakeup_status == wakeup_none);
+
+            waiter->wakeup_status = wakeup_status;
+            rb_ractor_sched_wakeup(r, waiter->th);
+
+            wakeup_p = true;
+        }
+        else {
+            break;
+        }
+    }
+    RACTOR_UNLOCK(r);
+
+    return wakeup_p;
+}
+
+static void
+ubf_ractor_wait(void *ptr)
+{
+    struct ractor_waiter *waiter = (struct ractor_waiter *)ptr;
+
+    rb_thread_t *th = waiter->th;
+    rb_ractor_t *r = th->ractor;
+
+    // clear ubf and nobody can kick UBF
+    th->unblock.func = NULL;
+    th->unblock.arg  = NULL;
+
+    rb_native_mutex_unlock(&th->interrupt_lock);
+    {
+        RACTOR_LOCK(r);
+        {
+            if (waiter->wakeup_status == wakeup_none) {
+                RUBY_DEBUG_LOG("waiter:%p", (void *)waiter);
+
+                waiter->wakeup_status = wakeup_by_interrupt;
+                ccan_list_del(&waiter->node);
+
+                rb_ractor_sched_wakeup(r, waiter->th);
+            }
+        }
+        RACTOR_UNLOCK(r);
+    }
+    rb_native_mutex_lock(&th->interrupt_lock);
+}
+
+static enum ractor_wakeup_status
+ractor_wait(rb_execution_context_t *ec, rb_ractor_t *cr)
+{
+    rb_thread_t *th = rb_ec_thread_ptr(ec);
+
+    struct ractor_waiter waiter = {
+        .wakeup_status = wakeup_none,
+        .th = th,
+    };
+
+    RUBY_DEBUG_LOG("wait%s", "");
+
+    ASSERT_ractor_locking(cr);
+
+    VM_ASSERT(GET_RACTOR() == cr);
+    VM_ASSERT(!ractor_waiter_included(cr, th));
+
+    ccan_list_add_tail(&cr->sync.waiters, &waiter.node);
+
+    // resume another ready thread and wait for an event
+    rb_ractor_sched_wait(ec, cr, ubf_ractor_wait, &waiter);
+
+    if (waiter.wakeup_status == wakeup_none) {
+        ccan_list_del(&waiter.node);
+    }
+
+    RUBY_DEBUG_LOG("wakeup_status:%s", wakeup_status_str(waiter.wakeup_status));
+
+    RACTOR_UNLOCK_SELF(cr);
+    {
+        rb_ec_check_ints(ec);
+    }
+    RACTOR_LOCK_SELF(cr);
+
+    VM_ASSERT(!ractor_waiter_included(cr, th));
+    return waiter.wakeup_status;
+}
+
+static void
+ractor_deliver_incoming_messages(rb_execution_context_t *ec, rb_ractor_t *cr)
+{
+    ASSERT_ractor_locking(cr);
+    struct ractor_queue *recv_q = cr->sync.recv_queue;
+
+    struct ractor_basket *b;
+    while ((b = ractor_queue_deq(cr, recv_q)) != NULL) {
+        ractor_queue_enq(cr, ractor_get_queue(cr, b->port_id, true), b);
+    }
+}
+
+static bool
+ractor_check_received(rb_ractor_t *cr, struct ractor_queue *messages)
+{
+    struct ractor_queue *received_queue = cr->sync.recv_queue;
+    bool received = false;
+
+    ASSERT_ractor_locking(cr);
+
+    if (ractor_queue_empty_p(cr, received_queue)) {
+        RUBY_DEBUG_LOG("empty");
+    }
+    else {
+        received = true;
+
+        // messages <- incoming
+        ractor_queue_init(messages);
+        ractor_queue_move(messages, received_queue);
+    }
+
+    VM_ASSERT(ractor_queue_empty_p(cr, received_queue));
+
+    RUBY_DEBUG_LOG("received:%d", received);
+    return received;
+}
+
+static void
+ractor_wait_receive(rb_execution_context_t *ec, rb_ractor_t *cr)
+{
+    struct ractor_queue messages;
+    bool deliverred = false;
+
+    RACTOR_LOCK_SELF(cr);
+    {
+        if (ractor_check_received(cr, &messages)) {
+            deliverred = true;
+        }
+        else {
+            ractor_wait(ec, cr);
+        }
+    }
+    RACTOR_UNLOCK_SELF(cr);
+
+    if (deliverred) {
+        VM_ASSERT(!ractor_queue_empty_p(cr, &messages));
+        struct ractor_basket *b;
+
+        while ((b = ractor_queue_deq(cr, &messages)) != NULL) {
+            ractor_queue_enq(cr, ractor_get_queue(cr, b->port_id, false), b);
+        }
+    }
+}
+
+static VALUE
+ractor_try_receive(rb_execution_context_t *ec, rb_ractor_t *cr, const struct ractor_port *rp)
+{
+    struct ractor_queue *rq = ractor_get_queue(cr, ractor_port_id(rp), false);
+
+    if (rq == NULL) {
+        rb_raise(rb_eRactorClosedError, "The port was already closed");
+    }
+
+    struct ractor_basket *b = ractor_queue_deq(cr, rq);
+
+    if (rq->closed && ractor_queue_empty_p(cr, rq)) {
+        ractor_delete_port(cr, ractor_port_id(rp), false);
+    }
+
+    if (b) {
+        return ractor_basket_accept(b);
+    }
+    else {
+        return Qundef;
+    }
+}
+
+static VALUE
+ractor_receive(rb_execution_context_t *ec, const struct ractor_port *rp)
+{
+    rb_ractor_t *cr = rb_ec_ractor_ptr(ec);
+    VM_ASSERT(cr == rp->r);
+
+    RUBY_DEBUG_LOG("port:%u", (unsigned int)ractor_port_id(rp));
+
+    while (1) {
+        VALUE v = ractor_try_receive(ec, cr, rp);
+
+        if (v != Qundef) {
+            return v;
+        }
+        else {
+            ractor_wait_receive(ec, cr);
+        }
+    }
+}
+
+// Ractor#send
+
+static void
+ractor_send_basket(rb_execution_context_t *ec, const struct ractor_port *rp, struct ractor_basket *b, bool raise_on_error)
+{
+    bool closed = false;
+
+    RUBY_DEBUG_LOG("port:%u@r%u b:%s v:%p", (unsigned int)ractor_port_id(rp), rb_ractor_id(rp->r), basket_type_name(b->type), (void *)b->p.v);
+
+    RACTOR_LOCK(rp->r);
+    {
+        if (ractor_closed_port_p(ec, rp->r, rp)) {
+            closed = true;
+        }
+        else {
+            b->port_id = ractor_port_id(rp);
+            ractor_queue_enq(rp->r, rp->r->sync.recv_queue, b);
+        }
+    }
+    RACTOR_UNLOCK(rp->r);
+
+    // NOTE: ref r -> b->p.v is created, but Ractor is unprotected object, so no problem on that.
+
+    if (!closed) {
+        ractor_wakeup_all(rp->r, wakeup_by_send);
+    }
+    else {
+        RUBY_DEBUG_LOG("closed:%u@r%u", (unsigned int)ractor_port_id(rp), rb_ractor_id(rp->r));
+
+        if (raise_on_error) {
+            ractor_basket_free(b);
+            rb_raise(rb_eRactorClosedError, "The port was already closed");
+        }
+    }
+}
+
+static VALUE
+ractor_send0(rb_execution_context_t *ec, const struct ractor_port *rp, VALUE obj, VALUE move, bool raise_on_error)
+{
+    struct ractor_basket *b = ractor_basket_new(ec, obj, RTEST(move) ? basket_type_move : basket_type_none, false);
+    ractor_send_basket(ec, rp, b, raise_on_error);
+    RB_GC_GUARD(obj);
+    return rp->r->pub.self;
+}
+
+static VALUE
+ractor_send(rb_execution_context_t *ec, const struct ractor_port *rp, VALUE obj, VALUE move)
+{
+    return ractor_send0(ec, rp, obj, move, true);
+}
+
+static VALUE
+ractor_try_send(rb_execution_context_t *ec, const struct ractor_port *rp, VALUE obj, VALUE move)
+{
+    return ractor_send0(ec, rp, obj, move, false);
+}
+
+// Ractor::Selector
+
+struct ractor_selector {
+    rb_ractor_t *r;
+    struct st_table *ports; // rpv -> rp
+
+};
+
+static int
+ractor_selector_mark_i(st_data_t key, st_data_t val, st_data_t dmy)
+{
+    rb_gc_mark((VALUE)key); // rpv
+
+    return ST_CONTINUE;
+}
+
+static void
+ractor_selector_mark(void *ptr)
+{
+    struct ractor_selector *s = ptr;
+
+    if (s->ports) {
+        st_foreach(s->ports, ractor_selector_mark_i, 0);
+    }
+}
+
+static void
+ractor_selector_free(void *ptr)
+{
+    struct ractor_selector *s = ptr;
+    st_free_table(s->ports);
+    ruby_xfree(ptr);
+}
+
+static size_t
+ractor_selector_memsize(const void *ptr)
+{
+    const struct ractor_selector *s = ptr;
+    return sizeof(struct ractor_selector) + st_memsize(s->ports);
+}
+
+static const rb_data_type_t ractor_selector_data_type = {
+    "ractor/selector",
+    {
+        ractor_selector_mark,
+        ractor_selector_free,
+        ractor_selector_memsize,
+        NULL, // update
+    },
+    0, 0, RUBY_TYPED_FREE_IMMEDIATELY,
+};
+
+static struct ractor_selector *
+RACTOR_SELECTOR_PTR(VALUE selv)
+{
+    VM_ASSERT(rb_typeddata_is_kind_of(selv, &ractor_selector_data_type));
+    return (struct ractor_selector *)DATA_PTR(selv);
+}
+
+// Ractor::Selector.new
+
+static VALUE
+ractor_selector_create(VALUE klass)
+{
+    struct ractor_selector *s;
+    VALUE selv = TypedData_Make_Struct(klass, struct ractor_selector, &ractor_selector_data_type, s);
+    s->ports = st_init_numtable(); // TODO
+    return selv;
+}
+
+// Ractor::Selector#add(r)
+
+/*
+ * call-seq:
+ *   add(ractor) -> ractor
+ *
+ * Adds _ractor_ to +self+.  Raises an exception if _ractor_ is already added.
+ * Returns _ractor_.
+ */
+static VALUE
+ractor_selector_add(VALUE selv, VALUE rpv)
+{
+    if (!ractor_port_p(rpv)) {
+        rb_raise(rb_eArgError, "Not a Ractor::Port object");
+    }
+
+    struct ractor_selector *s = RACTOR_SELECTOR_PTR(selv);
+    const struct ractor_port *rp = RACTOR_PORT_PTR(rpv);
+
+    if (st_lookup(s->ports, (st_data_t)rpv, NULL)) {
+        rb_raise(rb_eArgError, "already added");
+    }
+
+    st_insert(s->ports, (st_data_t)rpv, (st_data_t)rp);
+    return selv;
+}
+
+// Ractor::Selector#remove(r)
+
+/* call-seq:
+ *   remove(ractor) -> ractor
+ *
+ * Removes _ractor_ from +self+.  Raises an exception if _ractor_ is not added.
+ * Returns the removed _ractor_.
+ */
+static VALUE
+ractor_selector_remove(VALUE selv, VALUE rpv)
+{
+    if (!ractor_port_p(rpv)) {
+        rb_raise(rb_eArgError, "Not a Ractor::Port object");
+    }
+
+    struct ractor_selector *s = RACTOR_SELECTOR_PTR(selv);
+
+    if (!st_lookup(s->ports, (st_data_t)rpv, NULL)) {
+        rb_raise(rb_eArgError, "not added yet");
+    }
+
+    st_delete(s->ports, (st_data_t *)&rpv, NULL);
+
+    return selv;
+}
+
+// Ractor::Selector#clear
+
+/*
+ * call-seq:
+ *   clear -> self
+ *
+ * Removes all ractors from +self+.  Raises +self+.
+ */
+static VALUE
+ractor_selector_clear(VALUE selv)
+{
+    struct ractor_selector *s = RACTOR_SELECTOR_PTR(selv);
+    st_clear(s->ports);
+    return selv;
+}
+
+/*
+ * call-seq:
+ *  empty? -> true or false
+ *
+ * Returns +true+ if no ractor is added.
+ */
+static VALUE
+ractor_selector_empty_p(VALUE selv)
+{
+    struct ractor_selector *s = RACTOR_SELECTOR_PTR(selv);
+    return s->ports->num_entries == 0 ? Qtrue : Qfalse;
+}
+
+// Ractor::Selector#wait
+
+struct ractor_selector_wait_data {
+    rb_ractor_t *cr;
+    rb_execution_context_t *ec;
+    bool found;
+    VALUE v;
+    VALUE rpv;
+};
+
+static int
+ractor_selector_wait_i(st_data_t key, st_data_t val, st_data_t data)
+{
+    struct ractor_selector_wait_data *p = (struct ractor_selector_wait_data *)data;
+    const struct ractor_port *rp = (const struct ractor_port *)val;
+
+    VALUE v = ractor_try_receive(p->ec, p->cr, rp);
+
+    if (v != Qundef) {
+        p->found = true;
+        p->v = v;
+        p->rpv = (VALUE)key;
+        return ST_STOP;
+    }
+    else {
+        return ST_CONTINUE;
+    }
+}
+
+static VALUE
+ractor_selector__wait(rb_execution_context_t *ec, VALUE selector)
+{
+    rb_ractor_t *cr = rb_ec_ractor_ptr(ec);
+    struct ractor_selector *s = RACTOR_SELECTOR_PTR(selector);
+
+    struct ractor_selector_wait_data data = {
+        .ec = ec,
+        .cr = cr,
+        .found = false,
+    };
+
+    while (1) {
+        st_foreach(s->ports, ractor_selector_wait_i, (st_data_t)&data);
+
+        if (data.found) {
+            return rb_ary_new_from_args(2, data.rpv, data.v);
+        }
+
+        ractor_wait_receive(ec, cr);
+    }
+}
+
+/*
+ * call-seq:
+ *  wait(receive: false, yield_value: undef, move: false) -> [ractor, value]
+ *
+ * Waits until any ractor in _selector_ can be active.
+ */
+static VALUE
+ractor_selector_wait(VALUE selector)
+{
+    return ractor_selector__wait(GET_EC(), selector);
+}
+
+static VALUE
+ractor_selector_new(int argc, VALUE *ractors, VALUE klass)
+{
+    VALUE selector = ractor_selector_create(klass);
+
+    for (int i=0; i<argc; i++) {
+        ractor_selector_add(selector, ractors[i]);
+    }
+
+    return selector;
+}
+
+static VALUE
+ractor_select_internal(rb_execution_context_t *ec, VALUE self, VALUE ports)
+{
+    VALUE selector = ractor_selector_new(RARRAY_LENINT(ports), (VALUE *)RARRAY_CONST_PTR(ports), rb_cRactorSelector);
+    VALUE result = ractor_selector__wait(ec, selector);
+
+    RB_GC_GUARD(selector);
+    RB_GC_GUARD(ports);
+    return result;
+}
+
+#ifndef USE_RACTOR_SELECTOR
+#define USE_RACTOR_SELECTOR 0
+#endif
+
+RUBY_SYMBOL_EXPORT_BEGIN
+void rb_init_ractor_selector(void);
+RUBY_SYMBOL_EXPORT_END
+
+/*
+ * Document-class: Ractor::Selector
+ * :nodoc: currently
+ *
+ * Selects multiple Ractors to be activated.
+ */
+void
+rb_init_ractor_selector(void)
+{
+    rb_cRactorSelector = rb_define_class_under(rb_cRactor, "Selector", rb_cObject);
+    rb_undef_alloc_func(rb_cRactorSelector);
+
+    rb_define_singleton_method(rb_cRactorSelector, "new", ractor_selector_new , -1);
+    rb_define_method(rb_cRactorSelector, "add", ractor_selector_add, 1);
+    rb_define_method(rb_cRactorSelector, "remove", ractor_selector_remove, 1);
+    rb_define_method(rb_cRactorSelector, "clear", ractor_selector_clear, 0);
+    rb_define_method(rb_cRactorSelector, "empty?", ractor_selector_empty_p, 0);
+    rb_define_method(rb_cRactorSelector, "wait", ractor_selector_wait, 0);
+}
+
+static void
+Init_RactorPort(void)
+{
+    rb_cRactorPort = rb_define_class_under(rb_cRactor, "Port", rb_cObject);
+    rb_define_alloc_func(rb_cRactorPort, ractor_port_alloc);
+    rb_define_method(rb_cRactorPort, "initialize", ractor_port_initialzie, 0);
+    rb_define_method(rb_cRactorPort, "initialize_copy", ractor_port_initialzie_copy, 1);
+
+#if USE_RACTOR_SELECTOR
+    rb_init_ractor_selector();
+#endif
+}
diff --git a/random.c b/random.c
index 4b5b7ab6c475e0..1611c3db978bd9 100644
--- a/random.c
+++ b/random.c
@@ -73,7 +73,7 @@
 #include "ruby/random.h"
 #include "ruby/ractor.h"
 
-typedef int int_must_be_32bit_at_least[sizeof(int) * CHAR_BIT < 32 ? -1 : 1];
+STATIC_ASSERT(int_must_be_32bit_at_least, sizeof(int) * CHAR_BIT >= 32);
 
 #include "missing/mt19937.c"
 
@@ -131,8 +131,9 @@ typedef struct {
 
 static VALUE rand_init(const rb_random_interface_t *, rb_random_t *, VALUE);
 static VALUE random_seed(VALUE);
-static void fill_random_seed(uint32_t *seed, size_t cnt);
+static void fill_random_seed(uint32_t *seed, size_t cnt, bool try_bytes);
 static VALUE make_seed_value(uint32_t *ptr, size_t len);
+#define fill_random_bytes ruby_fill_random_bytes
 
 RB_RANDOM_INTERFACE_DECLARE(rand_mt);
 static const rb_random_interface_t random_mt_if = {
@@ -157,6 +158,12 @@ rand_start(rb_random_mt_t *r)
 
 static rb_ractor_local_key_t default_rand_key;
 
+void
+rb_free_default_rand_key(void)
+{
+    xfree(default_rand_key);
+}
+
 static void
 default_rand_mark(void *ptr)
 {
@@ -348,7 +355,7 @@ rand_init_default(const rb_random_interface_t *rng, rb_random_t *rnd)
     size_t len = roomof(rng->default_seed_bits, 32);
     uint32_t *buf = ALLOCV_N(uint32_t, buf0, len+1);
 
-    fill_random_seed(buf, len);
+    fill_random_seed(buf, len, true);
     rng->init(rnd, buf, len);
     seed = make_seed_value(buf, len);
     explicit_bzero(buf, len * sizeof(*buf));
@@ -371,8 +378,8 @@ rand_init(const rb_random_interface_t *rng, rb_random_t *rnd, VALUE seed)
         INTEGER_PACK_LSWORD_FIRST|INTEGER_PACK_NATIVE_BYTE_ORDER);
     if (sign < 0)
         sign = -sign;
-    if (len <= 1) {
-        rng->init_int32(rnd, len ? buf[0] : 0);
+    if (len == 1) {
+        rng->init_int32(rnd, buf[0]);
     }
     else {
         if (sign != 2 && buf[len-1] == 1) /* remove leading-zero-guard */
@@ -431,23 +438,17 @@ random_init(int argc, VALUE *argv, VALUE obj)
 # define USE_DEV_URANDOM 0
 #endif
 
-#ifdef HAVE_GETENTROPY
-# define MAX_SEED_LEN_PER_READ 256
-static int
-fill_random_bytes_urandom(void *seed, size_t size)
-{
-     unsigned char *p = (unsigned char *)seed;
-     while (size) {
-        size_t len = size < MAX_SEED_LEN_PER_READ ? size : MAX_SEED_LEN_PER_READ;
-        if (getentropy(p, len) != 0) {
-            return -1;
-        }
-        p += len;
-        size -= len;
-     }
-     return 0;
-}
-#elif USE_DEV_URANDOM
+#if ! defined HAVE_GETRANDOM && defined __linux__ && defined __NR_getrandom
+# ifndef GRND_NONBLOCK
+#   define GRND_NONBLOCK 0x0001	/* not defined in musl libc */
+# endif
+# define getrandom(ptr, size, flags) \
+    (ssize_t)syscall(__NR_getrandom, (ptr), (size), (flags))
+# define HAVE_GETRANDOM 1
+#endif
+
+/* fill random bytes by reading random device directly */
+#if USE_DEV_URANDOM
 static int
 fill_random_bytes_urandom(void *seed, size_t size)
 {
@@ -487,15 +488,7 @@ fill_random_bytes_urandom(void *seed, size_t size)
 # define fill_random_bytes_urandom(seed, size) -1
 #endif
 
-#if ! defined HAVE_GETRANDOM && defined __linux__ && defined __NR_getrandom
-# ifndef GRND_NONBLOCK
-#   define GRND_NONBLOCK 0x0001	/* not defined in musl libc */
-# endif
-# define getrandom(ptr, size, flags) \
-    (ssize_t)syscall(__NR_getrandom, (ptr), (size), (flags))
-# define HAVE_GETRANDOM 1
-#endif
-
+/* fill random bytes by library */
 #if 0
 #elif defined MAC_OS_X_VERSION_10_7 && MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_7
 
@@ -513,7 +506,7 @@ fill_random_bytes_urandom(void *seed, size_t size)
 # endif
 
 static int
-fill_random_bytes_syscall(void *seed, size_t size, int unused)
+fill_random_bytes_lib(void *seed, size_t size)
 {
 #if USE_COMMON_RANDOM
     CCRNGStatus status = CCRandomGenerateBytes(seed, size);
@@ -540,18 +533,16 @@ fill_random_bytes_syscall(void *seed, size_t size, int unused)
     }
     return 0;
 }
-#elif defined(HAVE_ARC4RANDOM_BUF)
+#elif defined(HAVE_ARC4RANDOM_BUF) && \
+    ((defined(__OpenBSD__) && OpenBSD >= 201411) || \
+     (defined(__NetBSD__)  && __NetBSD_Version__ >= 700000000) || \
+     (defined(__FreeBSD__) && __FreeBSD_version >= 1200079))
+// [Bug #15039] arc4random_buf(3) should used only if we know it is fork-safe
 static int
-fill_random_bytes_syscall(void *buf, size_t size, int unused)
+fill_random_bytes_lib(void *buf, size_t size)
 {
-#if (defined(__OpenBSD__) && OpenBSD >= 201411) || \
-    (defined(__NetBSD__)  && __NetBSD_Version__ >= 700000000) || \
-    (defined(__FreeBSD__) && __FreeBSD_version >= 1200079)
     arc4random_buf(buf, size);
     return 0;
-#else
-    return -1;
-#endif
 }
 #elif defined(_WIN32)
 
@@ -560,8 +551,6 @@ fill_random_bytes_syscall(void *buf, size_t size, int unused)
 #endif
 
 # if defined(CRYPT_VERIFYCONTEXT)
-STATIC_ASSERT(sizeof_HCRYPTPROV, sizeof(HCRYPTPROV) == sizeof(size_t));
-
 /* Although HCRYPTPROV is not a HANDLE, it looks like
  * INVALID_HANDLE_VALUE is not a valid value */
 static const HCRYPTPROV INVALID_HCRYPTPROV = (HCRYPTPROV)INVALID_HANDLE_VALUE;
@@ -570,27 +559,33 @@ static void
 release_crypt(void *p)
 {
     HCRYPTPROV *ptr = p;
-    HCRYPTPROV prov = (HCRYPTPROV)ATOMIC_SIZE_EXCHANGE(*ptr, INVALID_HCRYPTPROV);
+    HCRYPTPROV prov = (HCRYPTPROV)ATOMIC_PTR_EXCHANGE(*ptr, INVALID_HCRYPTPROV);
     if (prov && prov != INVALID_HCRYPTPROV) {
         CryptReleaseContext(prov, 0);
     }
 }
 
+static const rb_data_type_t crypt_prov_type = {
+    "HCRYPTPROV",
+    {0, release_crypt,},
+    0, 0, RUBY_TYPED_FREE_IMMEDIATELY | RUBY_TYPED_EMBEDDABLE
+};
+
 static int
 fill_random_bytes_crypt(void *seed, size_t size)
 {
     static HCRYPTPROV perm_prov;
     HCRYPTPROV prov = perm_prov, old_prov;
     if (!prov) {
+        VALUE wrapper = TypedData_Wrap_Struct(0, &crypt_prov_type, 0);
         if (!CryptAcquireContext(&prov, NULL, NULL, PROV_RSA_FULL, CRYPT_VERIFYCONTEXT)) {
             prov = INVALID_HCRYPTPROV;
         }
-        old_prov = (HCRYPTPROV)ATOMIC_SIZE_CAS(perm_prov, 0, prov);
+        old_prov = (HCRYPTPROV)ATOMIC_PTR_CAS(perm_prov, 0, prov);
         if (LIKELY(!old_prov)) { /* no other threads acquired */
             if (prov != INVALID_HCRYPTPROV) {
-#undef RUBY_UNTYPED_DATA_WARNING
-#define RUBY_UNTYPED_DATA_WARNING 0
-                rb_gc_register_mark_object(Data_Wrap_Struct(0, 0, release_crypt, &perm_prov));
+                DATA_PTR(wrapper) = (void *)prov;
+                rb_vm_register_global_object(wrapper);
             }
         }
         else {			/* another thread acquired */
@@ -627,11 +622,17 @@ fill_random_bytes_bcrypt(void *seed, size_t size)
 }
 
 static int
-fill_random_bytes_syscall(void *seed, size_t size, int unused)
+fill_random_bytes_lib(void *seed, size_t size)
 {
     if (fill_random_bytes_bcrypt(seed, size) == 0) return 0;
     return fill_random_bytes_crypt(seed, size);
 }
+#else
+# define fill_random_bytes_lib(seed, size) -1
+#endif
+
+/* fill random bytes by dedicated syscall */
+#if 0
 #elif defined HAVE_GETRANDOM
 static int
 fill_random_bytes_syscall(void *seed, size_t size, int need_secure)
@@ -655,6 +656,31 @@ fill_random_bytes_syscall(void *seed, size_t size, int need_secure)
     }
     return -1;
 }
+#elif defined(HAVE_GETENTROPY)
+/*
+ * The Open Group Base Specifications Issue 8 - IEEE Std 1003.1-2024
+ * https://pubs.opengroup.org/onlinepubs/9799919799/functions/getentropy.html
+ *
+ * NOTE: `getentropy`(3) on Linux is implemented using `getrandom`(2),
+ * prefer the latter over this if both are defined.
+ */
+#ifndef GETENTROPY_MAX
+# define GETENTROPY_MAX 256
+#endif
+static int
+fill_random_bytes_syscall(void *seed, size_t size, int need_secure)
+{
+    unsigned char *p = (unsigned char *)seed;
+    while (size) {
+        size_t len = size < GETENTROPY_MAX ? size : GETENTROPY_MAX;
+        if (getentropy(p, len) != 0) {
+            return -1;
+        }
+        p += len;
+        size -= len;
+    }
+    return 0;
+}
 #else
 # define fill_random_bytes_syscall(seed, size, need_secure) -1
 #endif
@@ -664,14 +690,13 @@ ruby_fill_random_bytes(void *seed, size_t size, int need_secure)
 {
     int ret = fill_random_bytes_syscall(seed, size, need_secure);
     if (ret == 0) return ret;
+    if (fill_random_bytes_lib(seed, size) == 0) return 0;
     return fill_random_bytes_urandom(seed, size);
 }
 
-#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)
+fill_random_seed(uint32_t *seed, size_t cnt, bool try_bytes)
 {
     static rb_atomic_t n = 0;
 #if defined HAVE_CLOCK_GETTIME
@@ -681,10 +706,12 @@ fill_random_seed(uint32_t *seed, size_t cnt)
 #endif
     size_t len = cnt * sizeof(*seed);
 
-    memset(seed, 0, len);
-
-    fill_random_bytes(seed, len, FALSE);
+    if (try_bytes) {
+        fill_random_bytes(seed, len, FALSE);
+        return;
+    }
 
+    memset(seed, 0, len);
 #if defined HAVE_CLOCK_GETTIME
     clock_gettime(CLOCK_REALTIME, &tv);
     seed[0] ^= tv.tv_nsec;
@@ -719,8 +746,8 @@ 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); \
+#define with_random_seed(size, add, try_bytes) \
+    for (uint32_t seedbuf[(size)+(add)], loop = (fill_random_seed(seedbuf, (size), try_bytes), 1); \
          loop; explicit_bzero(seedbuf, (size)*sizeof(seedbuf[0])), loop = 0)
 
 /*
@@ -735,7 +762,7 @@ static VALUE
 random_seed(VALUE _)
 {
     VALUE v;
-    with_random_seed(DEFAULT_SEED_CNT, 1) {
+    with_random_seed(DEFAULT_SEED_CNT, 1, true) {
         v = make_seed_value(seedbuf, DEFAULT_SEED_CNT);
     }
     return v;
@@ -884,7 +911,7 @@ rand_mt_load(VALUE obj, VALUE dump)
         sizeof(*mt->state), 0,
         INTEGER_PACK_LSWORD_FIRST|INTEGER_PACK_NATIVE_BYTE_ORDER);
     x = NUM2ULONG(left);
-    if (x > numberof(mt->state)) {
+    if (x > numberof(mt->state) || x == 0) {
         rb_raise(rb_eArgError, "wrong value");
     }
     mt->left = (unsigned int)x;
@@ -1764,7 +1791,7 @@ Init_RandomSeedCore(void)
     */
     struct MT mt;
 
-    with_random_seed(DEFAULT_SEED_CNT, 0) {
+    with_random_seed(DEFAULT_SEED_CNT, 0, false) {
         init_by_array(&mt, seedbuf, DEFAULT_SEED_CNT);
     }
 
diff --git a/range.c b/range.c
index 62e957e6224a96..12077a068e469c 100644
--- a/range.c
+++ b/range.c
@@ -34,6 +34,7 @@ static ID id_beg, id_end, id_excl;
 #define id_succ idSucc
 #define id_min idMin
 #define id_max idMax
+#define id_plus  '+'
 
 static VALUE r_cover_p(VALUE, VALUE, VALUE, VALUE);
 
@@ -78,7 +79,7 @@ range_modify(VALUE range)
     rb_check_frozen(range);
     /* Ranges are immutable, so that they should be initialized only once. */
     if (RANGE_EXCL(range) != Qnil) {
-        rb_name_err_raise("`initialize' called twice", range, ID2SYM(idInitialize));
+        rb_name_err_raise("'initialize' called twice", range, ID2SYM(idInitialize));
     }
 }
 
@@ -224,8 +225,8 @@ recursive_eql(VALUE range, VALUE obj, int recur)
  *  Returns +true+ if and only if:
  *
  *  - +other+ is a range.
- *  - <tt>other.begin eql? self.begin</tt>.
- *  - <tt>other.end eql? self.end</tt>.
+ *  - <tt>other.begin.eql?(self.begin)</tt>.
+ *  - <tt>other.end.eql?(self.end)</tt>.
  *  - <tt>other.exclude_end? == self.exclude_end?</tt>.
  *
  *  Otherwise returns +false+.
@@ -308,6 +309,9 @@ range_each_func(VALUE range, int (*func)(VALUE, VALUE), VALUE arg)
     }
 }
 
+// NB: Two functions below (step_i_iter, sym_step_i and step_i) are used only to maintain the
+// backward-compatible behavior for string and symbol ranges with integer steps. If that branch
+// will be removed from range_step, these two can go, too.
 static bool
 step_i_iter(VALUE arg)
 {
@@ -400,72 +404,138 @@ range_step_size(VALUE range, VALUE args, VALUE eobj)
 
 /*
  *  call-seq:
- *    step(n = 1) {|element| ... } -> self
- *    step(n = 1)                  -> enumerator
+ *    step(s = 1) {|element| ... } -> self
+ *    step(s = 1)                  -> enumerator/arithmetic_sequence
  *
- *  Iterates over the elements of +self+.
+ *  Iterates over the elements of range in steps of +s+. The iteration is performed
+ *  by <tt>+</tt> operator:
  *
- *  With a block given and no argument,
- *  calls the block each element of the range; returns +self+:
+ *    (0..6).step(2) { puts _1 } #=> 1..5
+ *    # Prints: 0, 2, 4, 6
  *
- *    a = []
- *    (1..5).step {|element| a.push(element) } # => 1..5
- *    a # => [1, 2, 3, 4, 5]
- *    a = []
- *    ('a'..'e').step {|element| a.push(element) } # => "a".."e"
- *    a # => ["a", "b", "c", "d", "e"]
+ *    # Iterate between two dates in step of 1 day (24 hours)
+ *    (Time.utc(2022, 2, 24)..Time.utc(2022, 3, 1)).step(24*60*60) { puts _1 }
+ *    # Prints:
+ *    #   2022-02-24 00:00:00 UTC
+ *    #   2022-02-25 00:00:00 UTC
+ *    #   2022-02-26 00:00:00 UTC
+ *    #   2022-02-27 00:00:00 UTC
+ *    #   2022-02-28 00:00:00 UTC
+ *    #   2022-03-01 00:00:00 UTC
  *
- *  With a block given and a positive integer argument +n+ given,
- *  calls the block with element +0+, element +n+, element <tt>2n</tt>, and so on:
+ *  If <tt> + step</tt> decreases the value, iteration is still performed when
+ *  step +begin+ is higher than the +end+:
  *
- *    a = []
- *    (1..5).step(2) {|element| a.push(element) } # => 1..5
- *    a # => [1, 3, 5]
- *    a = []
- *    ('a'..'e').step(2) {|element| a.push(element) } # => "a".."e"
- *    a # => ["a", "c", "e"]
+ *    (0..6).step(-2) { puts _1 }
+ *    # Prints nothing
+ *
+ *    (6..0).step(-2) { puts _1 }
+ *    # Prints: 6, 4, 2, 0
+ *
+ *    (Time.utc(2022, 3, 1)..Time.utc(2022, 2, 24)).step(-24*60*60) { puts _1 }
+ *    # Prints:
+ *    #   2022-03-01 00:00:00 UTC
+ *    #   2022-02-28 00:00:00 UTC
+ *    #   2022-02-27 00:00:00 UTC
+ *    #   2022-02-26 00:00:00 UTC
+ *    #   2022-02-25 00:00:00 UTC
+ *    #   2022-02-24 00:00:00 UTC
+ *
+ *  When the block is not provided, and range boundaries and step are Numeric,
+ *  the method returns Enumerator::ArithmeticSequence.
+ *
+ *    (1..5).step(2) # => ((1..5).step(2))
+ *    (1.0..).step(1.5) #=> ((1.0..).step(1.5))
+ *    (..3r).step(1/3r) #=> ((..3/1).step((1/3)))
+ *
+ *  Enumerator::ArithmeticSequence can be further used as a value object for iteration
+ *  or slicing of collections (see Array#[]). There is a convenience method #% with
+ *  behavior similar to +step+ to produce arithmetic sequences more expressively:
+ *
+ *    # Same as (1..5).step(2)
+ *    (1..5) % 2 # => ((1..5).%(2))
  *
- *  With no block given, returns an enumerator,
- *  which will be of class Enumerator::ArithmeticSequence if +self+ is numeric;
- *  otherwise of class Enumerator:
+ *  In a generic case, when the block is not provided, Enumerator is returned:
  *
- *    e = (1..5).step(2) # => ((1..5).step(2))
- *    e.class            # => Enumerator::ArithmeticSequence
- *    ('a'..'e').step # => #<Enumerator: ...>
+ *    ('a'..).step('b')         #=> #<Enumerator: "a"..:step("b")>
+ *    ('a'..).step('b').take(3) #=> ["a", "ab", "abb"]
+ *
+ *  If +s+ is not provided, it is considered +1+ for ranges with numeric +begin+:
+ *
+ *    (1..5).step { p _1 }
+ *    # Prints: 1, 2, 3, 4, 5
+ *
+ *  For non-Numeric ranges, step absence is an error:
+ *
+ *    (Time.utc(2022, 3, 1)..Time.utc(2022, 2, 24)).step { p _1 }
+ *    # raises: step is required for non-numeric ranges (ArgumentError)
+ *
+ *  For backward compatibility reasons, String ranges support the iteration both with
+ *  string step and with integer step. In the latter case, the iteration is performed
+ *  by calculating the next values with String#succ:
+ *
+ *    ('a'..'e').step(2) { p _1 }
+ *    # Prints: a, c, e
+ *    ('a'..'e').step { p _1 }
+ *    # Default step 1; prints: a, b, c, d, e
  *
- *  Related: Range#%.
  */
 static VALUE
 range_step(int argc, VALUE *argv, VALUE range)
 {
-    VALUE b, e, step, tmp;
+    VALUE b, e, v, step;
+    int c, dir;
 
     b = RANGE_BEG(range);
     e = RANGE_END(range);
-    step = (!rb_check_arity(argc, 0, 1) ? INT2FIX(1) : argv[0]);
+    v = b;
+
+    const VALUE b_num_p = rb_obj_is_kind_of(b, rb_cNumeric);
+    const VALUE e_num_p = rb_obj_is_kind_of(e, rb_cNumeric);
+    // For backward compatibility reasons (conforming to behavior before 3.4), String/Symbol
+    // supports both old behavior ('a'..).step(1) and new behavior ('a'..).step('a')
+    // Hence the additional conversion/additional checks.
+    const VALUE str_b = rb_check_string_type(b);
+    const VALUE sym_b = SYMBOL_P(b) ? rb_sym2str(b) : Qnil;
+
+    if (rb_check_arity(argc, 0, 1))
+        step = argv[0];
+    else {
+        if (b_num_p || !NIL_P(str_b) || !NIL_P(sym_b) || (NIL_P(b) && e_num_p))
+            step = INT2FIX(1);
+        else
+            rb_raise(rb_eArgError, "step is required for non-numeric ranges");
+    }
 
-    if (!rb_block_given_p()) {
-        if (!rb_obj_is_kind_of(step, rb_cNumeric)) {
-            step = rb_to_int(step);
-        }
-        if (rb_equal(step, INT2FIX(0))) {
-            rb_raise(rb_eArgError, "step can't be 0");
-        }
+    const VALUE step_num_p = rb_obj_is_kind_of(step, rb_cNumeric);
+
+    if (step_num_p && b_num_p && rb_equal(step, INT2FIX(0))) {
+        rb_raise(rb_eArgError, "step can't be 0");
+    }
 
-        const VALUE b_num_p = rb_obj_is_kind_of(b, rb_cNumeric);
-        const VALUE e_num_p = rb_obj_is_kind_of(e, rb_cNumeric);
-        if ((b_num_p && (NIL_P(e) || e_num_p)) || (NIL_P(b) && e_num_p)) {
+    if (!rb_block_given_p()) {
+        // This code is allowed to create even beginless ArithmeticSequence, which can be useful,
+        // e.g., for array slicing:
+        //   ary[(..-1) % 3]
+        if (step_num_p && ((b_num_p && (NIL_P(e) || e_num_p)) || (NIL_P(b) && e_num_p))) {
             return rb_arith_seq_new(range, ID2SYM(rb_frame_this_func()), argc, argv,
                     range_step_size, b, e, step, EXCL(range));
         }
 
-        RETURN_SIZED_ENUMERATOR(range, argc, argv, range_step_size);
+        // ...but generic Enumerator from beginless range is useless and probably an error.
+        if (NIL_P(b)) {
+            rb_raise(rb_eArgError, "#step for non-numeric beginless ranges is meaningless");
+        }
+
+        RETURN_SIZED_ENUMERATOR(range, argc, argv, 0);
     }
 
-    step = check_step_domain(step);
-    VALUE iter[2] = {INT2FIX(1), step};
+    if (NIL_P(b)) {
+        rb_raise(rb_eArgError, "#step iteration for beginless ranges is meaningless");
+    }
 
     if (FIXNUM_P(b) && NIL_P(e) && FIXNUM_P(step)) {
+        /* perform summation of numbers in C until their reach Fixnum limit */
         long i = FIX2LONG(b), unit = FIX2LONG(step);
         do {
             rb_yield(LONG2FIX(i));
@@ -473,70 +543,102 @@ range_step(int argc, VALUE *argv, VALUE range)
         } while (FIXABLE(i));
         b = LONG2NUM(i);
 
+        /* then switch to Bignum API */
         for (;; b = rb_big_plus(b, step))
             rb_yield(b);
     }
-    else if (FIXNUM_P(b) && FIXNUM_P(e) && FIXNUM_P(step)) { /* fixnums are special */
+    else if (FIXNUM_P(b) && FIXNUM_P(e) && FIXNUM_P(step)) {
+        /* fixnums are special: summation is performed in C for performance */
         long end = FIX2LONG(e);
         long i, unit = FIX2LONG(step);
 
-        if (!EXCL(range))
-            end += 1;
-        i = FIX2LONG(b);
-        while (i < end) {
-            rb_yield(LONG2NUM(i));
-            if (i + unit < i) break;
-            i += unit;
+        if (unit < 0) {
+            if (!EXCL(range))
+                end -= 1;
+            i = FIX2LONG(b);
+            while (i > end) {
+                rb_yield(LONG2NUM(i));
+                i += unit;
+            }
+        }
+        else {
+            if (!EXCL(range))
+                end += 1;
+            i = FIX2LONG(b);
+            while (i < end) {
+                rb_yield(LONG2NUM(i));
+                i += unit;
+            }
         }
+    }
+    else if (b_num_p && step_num_p && ruby_float_step(b, e, step, EXCL(range), TRUE)) {
+        /* done */
+    }
+    else if (!NIL_P(str_b) && FIXNUM_P(step)) {
+        // backwards compatibility behavior for String only, when no step/Integer step is passed
+        // See discussion in https://bugs.ruby-lang.org/issues/18368
+
+        VALUE iter[2] = {INT2FIX(1), step};
 
+        if (NIL_P(e)) {
+            rb_str_upto_endless_each(str_b, step_i, (VALUE)iter);
+        }
+        else {
+            rb_str_upto_each(str_b, e, EXCL(range), step_i, (VALUE)iter);
+        }
     }
-    else if (SYMBOL_P(b) && (NIL_P(e) || SYMBOL_P(e))) { /* symbols are special */
-        b = rb_sym2str(b);
+    else if (!NIL_P(sym_b) && FIXNUM_P(step)) {
+        // same as above: backward compatibility for symbols
+
+        VALUE iter[2] = {INT2FIX(1), step};
+
         if (NIL_P(e)) {
-            rb_str_upto_endless_each(b, sym_step_i, (VALUE)iter);
+            rb_str_upto_endless_each(sym_b, sym_step_i, (VALUE)iter);
         }
         else {
-            rb_str_upto_each(b, rb_sym2str(e), EXCL(range), sym_step_i, (VALUE)iter);
+            rb_str_upto_each(sym_b, rb_sym2str(e), EXCL(range), sym_step_i, (VALUE)iter);
         }
     }
-    else if (ruby_float_step(b, e, step, EXCL(range), TRUE)) {
-        /* done */
+    else if (NIL_P(e)) {
+        // endless range
+        for (;; v = rb_funcall(v, id_plus, 1, step))
+            rb_yield(v);
     }
-    else if (rb_obj_is_kind_of(b, rb_cNumeric) ||
-             !NIL_P(rb_check_to_integer(b, "to_int")) ||
-             !NIL_P(rb_check_to_integer(e, "to_int"))) {
-        ID op = EXCL(range) ? '<' : idLE;
-        VALUE v = b;
-        int i = 0;
+    else if (b_num_p && step_num_p && r_less(step, INT2FIX(0)) < 0) {
+        // iterate backwards, for consistency with ArithmeticSequence
+        if (EXCL(range)) {
+            for (; r_less(e, v) < 0; v = rb_funcall(v, id_plus, 1, step))
+                rb_yield(v);
+        }
+        else {
+            for (; (c = r_less(e, v)) <= 0; v = rb_funcall(v, id_plus, 1, step)) {
+                rb_yield(v);
+                if (!c) break;
+            }
+        }
 
-        while (NIL_P(e) || RTEST(rb_funcall(v, op, 1, e))) {
+    }
+    else if ((dir = r_less(b, e)) == 0) {
+        if (!EXCL(range)) {
             rb_yield(v);
-            i++;
-            v = rb_funcall(b, '+', 1, rb_funcall(INT2NUM(i), '*', 1, step));
         }
     }
-    else {
-        tmp = rb_check_string_type(b);
-
-        if (!NIL_P(tmp)) {
-            b = tmp;
-            if (NIL_P(e)) {
-                rb_str_upto_endless_each(b, step_i, (VALUE)iter);
-            }
-            else {
-                rb_str_upto_each(b, e, EXCL(range), step_i, (VALUE)iter);
-            }
+    else if (dir == r_less(b, rb_funcall(b, id_plus, 1, step))) {
+        // Direction of the comparison. We use it as a comparison operator in cycle:
+        // if begin < end, the cycle performs while value < end (iterating forward)
+        // if begin > end, the cycle performs while value > end (iterating backward with
+        // a negative step)
+        // One preliminary addition to check the step moves iteration in the same direction as
+        // from begin to end; otherwise, the iteration should be empty.
+        if (EXCL(range)) {
+            for (; r_less(v, e) == dir; v = rb_funcall(v, id_plus, 1, step))
+                rb_yield(v);
         }
         else {
-            if (!discrete_object_p(b)) {
-                rb_raise(rb_eTypeError, "can't iterate from %s",
-                         rb_obj_classname(b));
+            for (; (c = r_less(v, e)) == dir || c == 0; v = rb_funcall(v, id_plus, 1, step)) {
+                rb_yield(v);
+                if (!c) break;
             }
-            if (!NIL_P(e))
-                range_each_func(range, step_i, (VALUE)iter);
-            else
-                for (;; b = rb_funcallv(b, id_succ, 0, 0))
-                    step_i(b, (VALUE)iter);
         }
     }
     return range;
@@ -545,29 +647,24 @@ range_step(int argc, VALUE *argv, VALUE range)
 /*
  *  call-seq:
  *    %(n) {|element| ... } -> self
- *    %(n)                  -> enumerator
+ *    %(n)                  -> enumerator or arithmetic_sequence
  *
- *  Iterates over the elements of +self+.
+ *  Same as #step (but doesn't provide default value for +n+).
+ *  The method is convenient for experssive producing of Enumerator::ArithmeticSequence.
  *
- *  With a block given, calls the block with selected elements of the range;
- *  returns +self+:
+ *    array = [0, 1, 2, 3, 4, 5, 6]
  *
- *    a = []
- *    (1..5).%(2) {|element| a.push(element) } # => 1..5
- *    a # => [1, 3, 5]
- *    a = []
- *    ('a'..'e').%(2) {|element| a.push(element) } # => "a".."e"
- *    a # => ["a", "c", "e"]
- *
- *  With no block given, returns an enumerator,
- *  which will be of class Enumerator::ArithmeticSequence if +self+ is numeric;
- *  otherwise of class Enumerator:
+ *    # slice each second element:
+ *    seq = (0..) % 2 #=> ((0..).%(2))
+ *    array[seq] #=> [0, 2, 4, 6]
+ *    # or just
+ *    array[(0..) % 2] #=> [0, 2, 4, 6]
  *
- *    e = (1..5) % 2 # => ((1..5).%(2))
- *    e.class        # => Enumerator::ArithmeticSequence
- *    ('a'..'e') % 2 # =>  #<Enumerator: ...>
+ *  Note that due to operator precedence in Ruby, parentheses are mandatory around range
+ *  in this case:
  *
- *  Related: Range#step.
+ *      (0..7) % 2 #=> ((0..7).%(2)) -- as expected
+ *      0..7 % 2 #=> 0..1 -- parsed as 0..(7 % 2)
  */
 static VALUE
 range_percent_step(VALUE range, VALUE step)
@@ -607,6 +704,10 @@ double_as_int64(double d)
 static int
 is_integer_p(VALUE v)
 {
+    if (rb_integer_type_p(v)) {
+        return true;
+    }
+
     ID id_integer_p;
     VALUE is_int;
     CONST_ID(id_integer_p, "integer?");
@@ -649,27 +750,30 @@ bsearch_integer_range(VALUE beg, VALUE end, int excl)
 
     VALUE low = rb_to_int(beg);
     VALUE high = rb_to_int(end);
-    VALUE mid, org_high;
+    VALUE mid;
     ID id_div;
     CONST_ID(id_div, "div");
 
-    if (excl) high = rb_funcall(high, '-', 1, INT2FIX(1));
-    org_high = high;
+    if (!excl) high = rb_funcall(high, '+', 1, INT2FIX(1));
+    low = rb_funcall(low, '-', 1, INT2FIX(1));
 
-    while (rb_cmpint(rb_funcall(low, id_cmp, 1, high), low, high) < 0) {
-        mid = rb_funcall(rb_funcall(high, '+', 1, low), id_div, 1, INT2FIX(2));
+    /*
+     * This loop must continue while low + 1 < high.
+     * Instead of checking low + 1 < high, check low < mid, where mid = (low + high) / 2.
+     * This is to avoid the cost of calculating low + 1 on each iteration.
+     * Note that this condition replacement is valid because Integer#div always rounds
+     * towards negative infinity.
+     */
+    while (mid = rb_funcall(rb_funcall(high, '+', 1, low), id_div, 1, INT2FIX(2)),
+           rb_cmpint(rb_funcall(low, id_cmp, 1, mid), low, mid) < 0) {
         BSEARCH_CHECK(mid);
         if (smaller) {
             high = mid;
         }
         else {
-            low = rb_funcall(mid, '+', 1, INT2FIX(1));
+            low = mid;
         }
     }
-    if (rb_equal(low, org_high)) {
-        BSEARCH_CHECK(low);
-        if (!smaller) return Qnil;
-    }
     return satisfied;
 }
 
@@ -696,52 +800,58 @@ range_bsearch(VALUE range)
      * by the mantissa. This is true with or without implicit bit.
      *
      * Finding the average of two ints needs to be careful about
-     * potential overflow (since float to long can use 64 bits)
-     * as well as the fact that -1/2 can be 0 or -1 in C89.
+     * potential overflow (since float to long can use 64 bits).
+     *
+     * The half-open interval (low, high] indicates where the target is located.
+     * The loop continues until low and high are adjacent.
+     *
+     * -1/2 can be either 0 or -1 in C89. However, when low and high are not adjacent,
+     * the rounding direction of mid = (low + high) / 2 does not affect the result of
+     * the binary search.
      *
      * Note that -0.0 is mapped to the same int as 0.0 as we don't want
      * (-1...0.0).bsearch to yield -0.0.
      */
 
-#define BSEARCH(conv) \
+#define BSEARCH(conv, excl) \
     do { \
         RETURN_ENUMERATOR(range, 0, 0); \
-        if (EXCL(range)) high--; \
-        org_high = high; \
-        while (low < high) { \
+        if (!(excl)) high++; \
+        low--; \
+        while (low + 1 < high) { \
             mid = ((high < 0) == (low < 0)) ? low + ((high - low) / 2) \
-                : (low < -high) ? -((-1 - low - high)/2 + 1) : (low + high) / 2; \
+                : (low + high) / 2; \
             BSEARCH_CHECK(conv(mid)); \
             if (smaller) { \
                 high = mid; \
             } \
             else { \
-                low = mid + 1; \
+                low = mid; \
             } \
         } \
-        if (low == org_high) { \
-            BSEARCH_CHECK(conv(low)); \
-            if (!smaller) return Qnil; \
-        } \
         return satisfied; \
     } while (0)
 
+#define BSEARCH_FIXNUM(beg, end, excl) \
+    do { \
+        long low = FIX2LONG(beg); \
+        long high = FIX2LONG(end); \
+        long mid; \
+        BSEARCH(INT2FIX, (excl)); \
+    } while (0)
 
     beg = RANGE_BEG(range);
     end = RANGE_END(range);
 
     if (FIXNUM_P(beg) && FIXNUM_P(end)) {
-        long low = FIX2LONG(beg);
-        long high = FIX2LONG(end);
-        long mid, org_high;
-        BSEARCH(INT2FIX);
+        BSEARCH_FIXNUM(beg, end, EXCL(range));
     }
 #if SIZEOF_DOUBLE == 8 && defined(HAVE_INT64_T)
     else if (RB_FLOAT_TYPE_P(beg) || RB_FLOAT_TYPE_P(end)) {
         int64_t low  = double_as_int64(NIL_P(beg) ? -HUGE_VAL : RFLOAT_VALUE(rb_Float(beg)));
         int64_t high = double_as_int64(NIL_P(end) ?  HUGE_VAL : RFLOAT_VALUE(rb_Float(end)));
-        int64_t mid, org_high;
-        BSEARCH(int64_as_double_to_num);
+        int64_t mid;
+        BSEARCH(int64_as_double_to_num, EXCL(range));
     }
 #endif
     else if (is_integer_p(beg) && is_integer_p(end)) {
@@ -755,9 +865,15 @@ range_bsearch(VALUE range)
             VALUE mid = rb_funcall(beg, '+', 1, diff);
             BSEARCH_CHECK(mid);
             if (smaller) {
-                return bsearch_integer_range(beg, mid, 0);
+                if (FIXNUM_P(beg) && FIXNUM_P(mid)) {
+                    BSEARCH_FIXNUM(beg, mid, false);
+                }
+                else {
+                    return bsearch_integer_range(beg, mid, false);
+                }
             }
             diff = rb_funcall(diff, '*', 1, LONG2FIX(2));
+            beg = mid;
         }
     }
     else if (NIL_P(beg) && is_integer_p(end)) {
@@ -767,9 +883,15 @@ range_bsearch(VALUE range)
             VALUE mid = rb_funcall(end, '+', 1, diff);
             BSEARCH_CHECK(mid);
             if (!smaller) {
-                return bsearch_integer_range(mid, end, 0);
+                if (FIXNUM_P(mid) && FIXNUM_P(end)) {
+                    BSEARCH_FIXNUM(mid, end, false);
+                }
+                else {
+                    return bsearch_integer_range(mid, end, false);
+                }
             }
             diff = rb_funcall(diff, '*', 1, LONG2FIX(2));
+            end = mid;
         }
     }
     else {
@@ -791,6 +913,10 @@ sym_each_i(VALUE v, VALUE arg)
     return each_i(rb_str_intern(v), arg);
 }
 
+#define CANT_ITERATE_FROM(x) \
+    rb_raise(rb_eTypeError, "can't iterate from %s", \
+             rb_obj_classname(x))
+
 /*
  *  call-seq:
  *    size -> non_negative_integer or Infinity or nil
@@ -802,7 +928,12 @@ sym_each_i(VALUE v, VALUE arg)
  *    (1..4).size      # => 4
  *    (1...4).size     # => 3
  *    (1..).size       # => Infinity
- *    ('a'..'z').size  #=> nil
+ *    ('a'..'z').size  # => nil
+ *
+ *  If +self+ is not iterable, raises an exception:
+ *
+ *    (0.5..2.5).size  # TypeError
+ *    (..1).size       # TypeError
  *
  *  Related: Range#count.
  */
@@ -811,7 +942,8 @@ static VALUE
 range_size(VALUE range)
 {
     VALUE b = RANGE_BEG(range), e = RANGE_END(range);
-    if (rb_obj_is_kind_of(b, rb_cNumeric)) {
+
+    if (RB_INTEGER_TYPE_P(b)) {
         if (rb_obj_is_kind_of(e, rb_cNumeric)) {
             return ruby_num_interval_step_size(b, e, INT2FIX(1), EXCL(range));
         }
@@ -819,15 +951,50 @@ range_size(VALUE range)
             return DBL2NUM(HUGE_VAL);
         }
     }
-    else if (NIL_P(b)) {
+
+    if (!discrete_object_p(b)) {
+        CANT_ITERATE_FROM(b);
+    }
+
+    return Qnil;
+}
+
+static VALUE
+range_reverse_size(VALUE range)
+{
+    VALUE b = RANGE_BEG(range), e = RANGE_END(range);
+
+    if (NIL_P(e)) {
+        CANT_ITERATE_FROM(e);
+    }
+
+    if (RB_INTEGER_TYPE_P(b)) {
         if (rb_obj_is_kind_of(e, rb_cNumeric)) {
+            return ruby_num_interval_step_size(b, e, INT2FIX(1), EXCL(range));
+        }
+        else {
+            CANT_ITERATE_FROM(e);
+        }
+    }
+
+    if (NIL_P(b)) {
+        if (RB_INTEGER_TYPE_P(e)) {
             return DBL2NUM(HUGE_VAL);
         }
+        else {
+            CANT_ITERATE_FROM(e);
+        }
+    }
+
+    if (!discrete_object_p(b)) {
+        CANT_ITERATE_FROM(e);
     }
 
     return Qnil;
 }
 
+#undef CANT_ITERATE_FROM
+
 /*
  *  call-seq:
  *    to_a -> array
@@ -856,6 +1023,12 @@ range_enum_size(VALUE range, VALUE args, VALUE eobj)
     return range_size(range);
 }
 
+static VALUE
+range_enum_reverse_size(VALUE range, VALUE args, VALUE eobj)
+{
+    return range_reverse_size(range);
+}
+
 RBIMPL_ATTR_NORETURN()
 static void
 range_each_bignum_endless(VALUE beg)
@@ -999,6 +1172,144 @@ range_each(VALUE range)
     return range;
 }
 
+RBIMPL_ATTR_NORETURN()
+static void
+range_reverse_each_bignum_beginless(VALUE end)
+{
+    RUBY_ASSERT(RBIGNUM_NEGATIVE_P(end));
+
+    for (;; end = rb_big_minus(end, INT2FIX(1))) {
+        rb_yield(end);
+    }
+    UNREACHABLE;
+}
+
+static void
+range_reverse_each_bignum(VALUE beg, VALUE end)
+{
+    RUBY_ASSERT(RBIGNUM_POSITIVE_P(beg) == RBIGNUM_POSITIVE_P(end));
+
+    VALUE c;
+    while ((c = rb_big_cmp(beg, end)) != INT2FIX(1)) {
+        rb_yield(end);
+        if (c == INT2FIX(0)) break;
+        end = rb_big_minus(end, INT2FIX(1));
+    }
+}
+
+static void
+range_reverse_each_positive_bignum_section(VALUE beg, VALUE end)
+{
+    RUBY_ASSERT(!NIL_P(end));
+
+    if (FIXNUM_P(end) || RBIGNUM_NEGATIVE_P(end)) return;
+
+    if (NIL_P(beg) || FIXNUM_P(beg) || RBIGNUM_NEGATIVE_P(beg)) {
+        beg = LONG2NUM(FIXNUM_MAX + 1);
+    }
+
+    range_reverse_each_bignum(beg, end);
+}
+
+static void
+range_reverse_each_fixnum_section(VALUE beg, VALUE end)
+{
+    RUBY_ASSERT(!NIL_P(end));
+
+    if (!FIXNUM_P(beg)) {
+        if (!NIL_P(beg) && RBIGNUM_POSITIVE_P(beg)) return;
+
+        beg = LONG2FIX(FIXNUM_MIN);
+    }
+
+    if (!FIXNUM_P(end)) {
+        if (RBIGNUM_NEGATIVE_P(end)) return;
+
+        end = LONG2FIX(FIXNUM_MAX);
+    }
+
+    long b = FIX2LONG(beg);
+    long e = FIX2LONG(end);
+    for (long i = e; i >= b; --i) {
+        rb_yield(LONG2FIX(i));
+    }
+}
+
+static void
+range_reverse_each_negative_bignum_section(VALUE beg, VALUE end)
+{
+    RUBY_ASSERT(!NIL_P(end));
+
+    if (FIXNUM_P(end) || RBIGNUM_POSITIVE_P(end)) {
+        end = LONG2NUM(FIXNUM_MIN - 1);
+    }
+
+    if (NIL_P(beg)) {
+        range_reverse_each_bignum_beginless(end);
+    }
+
+    if (FIXNUM_P(beg) || RBIGNUM_POSITIVE_P(beg)) return;
+
+    range_reverse_each_bignum(beg, end);
+}
+
+/*
+ *  call-seq:
+ *    reverse_each {|element| ... } -> self
+ *    reverse_each                  -> an_enumerator
+ *
+ *  With a block given, passes each element of +self+ to the block in reverse order:
+ *
+ *    a = []
+ *    (1..4).reverse_each {|element| a.push(element) } # => 1..4
+ *    a # => [4, 3, 2, 1]
+ *
+ *    a = []
+ *    (1...4).reverse_each {|element| a.push(element) } # => 1...4
+ *    a # => [3, 2, 1]
+ *
+ *  With no block given, returns an enumerator.
+ *
+ */
+
+static VALUE
+range_reverse_each(VALUE range)
+{
+    RETURN_SIZED_ENUMERATOR(range, 0, 0, range_enum_reverse_size);
+
+    VALUE beg = RANGE_BEG(range);
+    VALUE end = RANGE_END(range);
+    int excl = EXCL(range);
+
+    if (NIL_P(end)) {
+        rb_raise(rb_eTypeError, "can't iterate from %s",
+                 rb_obj_classname(end));
+    }
+
+    if (FIXNUM_P(beg) && FIXNUM_P(end)) {
+        if (excl) {
+            if (end == LONG2FIX(FIXNUM_MIN)) return range;
+
+            end = rb_int_minus(end, INT2FIX(1));
+        }
+
+        range_reverse_each_fixnum_section(beg, end);
+    }
+    else if ((NIL_P(beg) || RB_INTEGER_TYPE_P(beg)) && RB_INTEGER_TYPE_P(end)) {
+        if (excl) {
+            end = rb_int_minus(end, INT2FIX(1));
+        }
+        range_reverse_each_positive_bignum_section(beg, end);
+        range_reverse_each_fixnum_section(beg, end);
+        range_reverse_each_negative_bignum_section(beg, end);
+    }
+    else {
+        return rb_call_super(0, NULL);
+    }
+
+    return range;
+}
+
 /*
  *  call-seq:
  *    self.begin -> object
@@ -1094,33 +1405,58 @@ range_first(int argc, VALUE *argv, VALUE range)
     return ary[1];
 }
 
+static bool
+range_basic_each_p(VALUE range)
+{
+    return rb_method_basic_definition_p(CLASS_OF(range), idEach);
+}
+
+static bool
+integer_end_optimizable(VALUE range)
+{
+    VALUE b = RANGE_BEG(range);
+    if (!NIL_P(b) && !RB_INTEGER_TYPE_P(b)) return false;
+    VALUE e = RANGE_END(range);
+    if (!RB_INTEGER_TYPE_P(e)) return false;
+    if (RB_LIKELY(range_basic_each_p(range))) return true;
+    return false;
+}
+
 static VALUE
 rb_int_range_last(int argc, VALUE *argv, VALUE range)
 {
     static const VALUE ONE = INT2FIX(1);
 
-    VALUE b, e, len_1, len, nv, ary;
+    VALUE b, e, len_1 = Qnil, len = Qnil, nv, ary;
     int x;
     long n;
 
-    assert(argc > 0);
+    RUBY_ASSERT(argc > 0);
 
     b = RANGE_BEG(range);
     e = RANGE_END(range);
-    assert(RB_INTEGER_TYPE_P(b) && RB_INTEGER_TYPE_P(e));
+    RUBY_ASSERT(NIL_P(b) || RB_INTEGER_TYPE_P(b), "b=%"PRIsVALUE, rb_obj_class(b));
+    RUBY_ASSERT(RB_INTEGER_TYPE_P(e), "e=%"PRIsVALUE, rb_obj_class(e));
 
     x = EXCL(range);
 
-    len_1 = rb_int_minus(e, b);
-    if (x) {
-        e = rb_int_minus(e, ONE);
-        len = len_1;
+    if (!NIL_P(b)) {
+        len_1 = rb_int_minus(e, b);
+        if (x) {
+            e = rb_int_minus(e, ONE);
+            len = len_1;
+        }
+        else {
+            len = rb_int_plus(len_1, ONE);
+        }
     }
     else {
-        len = rb_int_plus(len_1, ONE);
+        if (x) {
+            e = rb_int_minus(e, ONE);
+        }
     }
 
-    if (FIXNUM_ZERO_P(len) || rb_num_negative_p(len)) {
+    if (!NIL_P(len) && (FIXNUM_ZERO_P(len) || rb_num_negative_p(len))) {
         return rb_ary_new_capa(0);
     }
 
@@ -1131,7 +1467,7 @@ rb_int_range_last(int argc, VALUE *argv, VALUE range)
     }
 
     nv = LONG2NUM(n);
-    if (RTEST(rb_int_gt(nv, len))) {
+    if (!NIL_P(b) && RTEST(rb_int_gt(nv, len))) {
         nv = len;
         n = NUM2LONG(nv);
     }
@@ -1185,17 +1521,11 @@ rb_int_range_last(int argc, VALUE *argv, VALUE range)
 static VALUE
 range_last(int argc, VALUE *argv, VALUE range)
 {
-    VALUE b, e;
-
     if (NIL_P(RANGE_END(range))) {
         rb_raise(rb_eRangeError, "cannot get the last element of endless range");
     }
     if (argc == 0) return RANGE_END(range);
-
-    b = RANGE_BEG(range);
-    e = RANGE_END(range);
-    if (RB_INTEGER_TYPE_P(b) && RB_INTEGER_TYPE_P(e) &&
-        RB_LIKELY(rb_method_basic_definition_p(rb_cRange, idEach))) {
+    if (integer_end_optimizable(range)) {
         return rb_int_range_last(argc, argv, range);
     }
     return rb_ary_last(argc, argv, rb_Array(range));
@@ -1210,7 +1540,7 @@ range_last(int argc, VALUE *argv, VALUE range)
  *    min(n) {|a, b| ... } -> array
  *
  *  Returns the minimum value in +self+,
- *  using method <tt><=></tt> or a given block for comparison.
+ *  using method <tt>#<=></tt> or a given block for comparison.
  *
  *  With no argument and no block given,
  *  returns the minimum-valued element of +self+.
@@ -1318,7 +1648,7 @@ range_min(int argc, VALUE *argv, VALUE range)
  *    max(n) {|a, b| ... } -> array
  *
  *  Returns the maximum value in +self+,
- *  using method <tt><=></tt> or a given block for comparison.
+ *  using method <tt>#<=></tt> or a given block for comparison.
  *
  *  With no argument and no block given,
  *  returns the maximum-valued element of +self+.
@@ -1403,12 +1733,27 @@ range_max(int argc, VALUE *argv, VALUE range)
 
     VALUE b = RANGE_BEG(range);
 
-    if (rb_block_given_p() || (EXCL(range) && !nm) || argc) {
+    if (rb_block_given_p() || (EXCL(range) && !nm)) {
         if (NIL_P(b)) {
             rb_raise(rb_eRangeError, "cannot get the maximum of beginless range with custom comparison method");
         }
         return rb_call_super(argc, argv);
     }
+    else if (argc) {
+        VALUE ary[2];
+        ID reverse_each;
+        CONST_ID(reverse_each, "reverse_each");
+        rb_scan_args(argc, argv, "1", &ary[0]);
+        ary[1] = rb_ary_new2(NUM2LONG(ary[0]));
+        rb_block_call(range, reverse_each, 0, 0, first_i, (VALUE)ary);
+        return ary[1];
+#if 0
+        if (integer_end_optimizable(range)) {
+            return rb_int_range_last(argc, argv, range, true);
+        }
+        return rb_ary_reverse(rb_ary_last(argc, argv, rb_Array(range)));
+#endif
+    }
     else {
         int c = NIL_P(b) ? -1 : OPTIMIZED_CMP(b, e);
 
@@ -1419,13 +1764,13 @@ range_max(int argc, VALUE *argv, VALUE range)
                 rb_raise(rb_eTypeError, "cannot exclude non Integer end value");
             }
             if (c == 0) return Qnil;
-            if (!RB_INTEGER_TYPE_P(b)) {
+            if (!NIL_P(b) && !RB_INTEGER_TYPE_P(b)) {
                 rb_raise(rb_eTypeError, "cannot exclude end value with non Integer begin value");
             }
             if (FIXNUM_P(e)) {
                 return LONG2NUM(FIX2LONG(e) - 1);
             }
-            return rb_funcall(e, '-', 1, INT2FIX(1));
+            return rb_int_minus(e,INT2FIX(1));
         }
         return e;
     }
@@ -1437,10 +1782,10 @@ range_max(int argc, VALUE *argv, VALUE range)
  *    minmax {|a, b| ... } -> [object, object]
  *
  *  Returns a 2-element array containing the minimum and maximum value in +self+,
- *  either according to comparison method <tt><=></tt> or a given block.
+ *  either according to comparison method <tt>#<=></tt> or a given block.
  *
  *  With no block given, returns the minimum and maximum values,
- *  using <tt><=></tt> for comparison:
+ *  using <tt>#<=></tt> for comparison:
  *
  *    (1..4).minmax     # => [1, 4]
  *    (1...4).minmax    # => [1, 3]
@@ -1681,7 +2026,6 @@ range_inspect(VALUE range)
 }
 
 static VALUE range_include_internal(VALUE range, VALUE val);
-static VALUE range_string_cover_internal(VALUE range, VALUE val);
 VALUE rb_str_include_range_p(VALUE beg, VALUE end, VALUE val, VALUE exclusive);
 
 /*
@@ -1726,8 +2070,6 @@ VALUE rb_str_include_range_p(VALUE beg, VALUE end, VALUE val, VALUE exclusive);
 static VALUE
 range_eqq(VALUE range, VALUE val)
 {
-    VALUE ret = range_string_cover_internal(range, val);
-    if (!UNDEF_P(ret)) return ret;
     return r_cover_p(range, RANGE_BEG(range), RANGE_END(range), val);
 }
 
@@ -1776,12 +2118,6 @@ range_integer_edge_p(VALUE beg, VALUE end)
             !NIL_P(rb_check_to_integer(end, "to_int")));
 }
 
-static inline bool
-range_string_edge_p(VALUE beg, VALUE end)
-{
-    return RB_TYPE_P(beg, T_STRING) || RB_TYPE_P(end, T_STRING);
-}
-
 static inline bool
 range_string_range_p(VALUE beg, VALUE end)
 {
@@ -1802,39 +2138,6 @@ range_include_fallback(VALUE beg, VALUE end, VALUE val)
     return Qundef;
 }
 
-static VALUE
-range_string_cover_internal(VALUE range, VALUE val)
-{
-    VALUE beg = RANGE_BEG(range);
-    VALUE end = RANGE_END(range);
-    int nv = FIXNUM_P(beg) || FIXNUM_P(end) ||
-             linear_object_p(beg) || linear_object_p(end);
-
-    if (nv || range_integer_edge_p(beg, end)) {
-        return r_cover_p(range, beg, end, val);
-    }
-    else if (range_string_edge_p(beg, end)) {
-        if (range_string_range_p(beg, end)) {
-            return r_cover_p(range, beg, end, val);
-        }
-        if (NIL_P(beg)) {
-            VALUE r = rb_funcall(val, id_cmp, 1, end);
-            if (NIL_P(r)) return Qfalse;
-            if (RANGE_EXCL(range)) {
-                return RBOOL(rb_cmpint(r, val, end) < 0);
-            }
-            return RBOOL(rb_cmpint(r, val, end) <= 0);
-        }
-        else if (NIL_P(end)) {
-            VALUE r = rb_funcall(beg, id_cmp, 1, val);
-            if (NIL_P(r)) return Qfalse;
-            return RBOOL(rb_cmpint(r, beg, val) <= 0);
-        }
-    }
-
-    return range_include_fallback(beg, end, val);
-}
-
 static VALUE
 range_include_internal(VALUE range, VALUE val)
 {
@@ -1877,7 +2180,7 @@ static int r_cover_range_p(VALUE range, VALUE beg, VALUE end, VALUE val);
  *    r.cover?(0)     # => false
  *    r.cover?(5)     # => false
  *    r.cover?('foo') # => false
-
+ *
  *    r = ('a'..'d')
  *    r.cover?('a')     # => true
  *    r.cover?('d')     # => true
@@ -1898,7 +2201,7 @@ static int r_cover_range_p(VALUE range, VALUE beg, VALUE end, VALUE val);
  *    r.cover?(0)     # => false
  *    r.cover?(4)     # => false
  *    r.cover?('foo') # => false
-
+ *
  *    r = ('a'...'d')
  *    r.cover?('a')     # => true
  *    r.cover?('c')     # => true
@@ -1914,7 +2217,7 @@ static int r_cover_range_p(VALUE range, VALUE beg, VALUE end, VALUE val);
  *    r.cover?(0..4)     # => false
  *    r.cover?(1..5)     # => false
  *    r.cover?('a'..'d') # => false
-
+ *
  *    r = (1...4)
  *    r.cover?(1..3)     # => true
  *    r.cover?(1..4)     # => false
@@ -1932,7 +2235,7 @@ static int r_cover_range_p(VALUE range, VALUE beg, VALUE end, VALUE val);
  *  Returns +false+ if either:
  *
  *  - The begin value of +self+ is larger than its end value.
- *  - An internal call to <tt><=></tt> returns +nil+;
+ *  - An internal call to <tt>#<=></tt> returns +nil+;
  *    that is, the operands are not comparable.
  *
  *  Beginless ranges cover all values of the same type before the end,
@@ -2136,17 +2439,137 @@ range_count(int argc, VALUE *argv, VALUE range)
          * Infinity. Just let it loop. */
         return rb_call_super(argc, argv);
     }
-    else if (NIL_P(RANGE_END(range))) {
+
+    VALUE beg = RANGE_BEG(range), end = RANGE_END(range);
+
+    if (NIL_P(beg) || NIL_P(end)) {
         /* We are confident that the answer is Infinity. */
         return DBL2NUM(HUGE_VAL);
     }
-    else if (NIL_P(RANGE_BEG(range))) {
-        /* We are confident that the answer is Infinity. */
-        return DBL2NUM(HUGE_VAL);
+
+    if (is_integer_p(beg)) {
+        VALUE size = range_size(range);
+        if (!NIL_P(size)) {
+            return size;
+        }
     }
-    else {
-        return rb_call_super(argc, argv);
+
+    return rb_call_super(argc, argv);
+}
+
+static bool
+empty_region_p(VALUE beg, VALUE end, int excl)
+{
+    if (NIL_P(beg)) return false;
+    if (NIL_P(end)) return false;
+    int less = r_less(beg, end);
+    /* empty range */
+    if (less > 0) return true;
+    if (excl && less == 0) return true;
+    return false;
+}
+
+/*
+ *  call-seq:
+ *    overlap?(range) -> true or false
+ *
+ *  Returns +true+ if +range+ overlaps with +self+, +false+ otherwise:
+ *
+ *    (0..2).overlap?(1..3) #=> true
+ *    (0..2).overlap?(3..4) #=> false
+ *    (0..).overlap?(..0)   #=> true
+ *
+ *  With non-range argument, raises TypeError.
+ *
+ *    (1..3).overlap?(1)         # TypeError
+ *
+ *  Returns +false+ if an internal call to <tt>#<=></tt> returns +nil+;
+ *  that is, the operands are not comparable.
+ *
+ *    (1..3).overlap?('a'..'d')  # => false
+ *
+ *  Returns +false+ if +self+ or +range+ is empty. "Empty range" means
+ *  that its begin value is larger than, or equal for an exclusive
+ *  range, its end value.
+ *
+ *    (4..1).overlap?(2..3)      # => false
+ *    (4..1).overlap?(..3)       # => false
+ *    (4..1).overlap?(2..)       # => false
+ *    (2...2).overlap?(1..2)     # => false
+ *
+ *    (1..4).overlap?(3..2)      # => false
+ *    (..4).overlap?(3..2)       # => false
+ *    (1..).overlap?(3..2)       # => false
+ *    (1..2).overlap?(2...2)     # => false
+ *
+ *  Returns +false+ if the begin value one of +self+ and +range+ is
+ *  larger than, or equal if the other is an exclusive range, the end
+ *  value of the other:
+ *
+ *    (4..5).overlap?(2..3)      # => false
+ *    (4..5).overlap?(2...4)     # => false
+ *
+ *    (1..2).overlap?(3..4)      # => false
+ *    (1...3).overlap?(3..4)     # => false
+ *
+ *  Returns +false+ if the end value one of +self+ and +range+ is
+ *  larger than, or equal for an exclusive range, the end value of the
+ *  other:
+ *
+ *    (4..5).overlap?(2..3)      # => false
+ *    (4..5).overlap?(2...4)     # => false
+ *
+ *    (1..2).overlap?(3..4)      # => false
+ *    (1...3).overlap?(3..4)     # => false
+ *
+ *  Note that the method wouldn't make any assumptions about the beginless
+ *  range being actually empty, even if its upper bound is the minimum
+ *  possible value of its type, so all this would return +true+:
+ *
+ *     (...-Float::INFINITY).overlap?(...-Float::INFINITY) # => true
+ *     (..."").overlap?(..."") # => true
+ *     (...[]).overlap?(...[]) # => true
+ *
+ *  Even if those ranges are effectively empty (no number can be smaller than
+ *  <tt>-Float::INFINITY</tt>), they are still considered overlapping
+ *  with themselves.
+ *
+ *  Related: Range#cover?.
+ */
+
+static VALUE
+range_overlap(VALUE range, VALUE other)
+{
+    if (!rb_obj_is_kind_of(other, rb_cRange)) {
+        rb_raise(rb_eTypeError, "wrong argument type %"PRIsVALUE" (expected Range)",
+                 rb_class_name(rb_obj_class(other)));
+    }
+
+    VALUE self_beg = RANGE_BEG(range);
+    VALUE self_end = RANGE_END(range);
+    int self_excl = EXCL(range);
+    VALUE other_beg = RANGE_BEG(other);
+    VALUE other_end = RANGE_END(other);
+    int other_excl = EXCL(other);
+
+    if (empty_region_p(self_beg, other_end, other_excl)) return Qfalse;
+    if (empty_region_p(other_beg, self_end, self_excl)) return Qfalse;
+
+    if (!NIL_P(self_beg) && !NIL_P(other_beg)) {
+        VALUE cmp = rb_funcall(self_beg, id_cmp, 1, other_beg);
+        if (NIL_P(cmp)) return Qfalse;
+        /* if both begin values are equal, no more comparisons needed */
+        if (rb_cmpint(cmp, self_beg, other_beg) == 0) return Qtrue;
+    }
+    else if (NIL_P(self_beg) && !NIL_P(self_end) && NIL_P(other_beg) && !NIL_P(other_end)) {
+        VALUE cmp = rb_funcall(self_end, id_cmp, 1, other_end);
+        return RBOOL(!NIL_P(cmp));
     }
+
+    if (empty_region_p(self_beg, self_end, self_excl)) return Qfalse;
+    if (empty_region_p(other_beg, other_end, other_excl)) return Qfalse;
+
+    return Qtrue;
 }
 
 /* A \Range object represents a collection of values
@@ -2163,7 +2586,7 @@ range_count(int argc, VALUE *argv, VALUE range)
  *     (1...4).to_a     # => [1, 2, 3]
  *     ('a'...'d').to_a # => ["a", "b", "c"]
  *
- * A range may be created using method Range.new:
+ * - Method Range.new:
  *
  *   # Ranges that by default include the given end value.
  *   Range.new(1, 4).to_a     # => [1, 2, 3, 4]
@@ -2191,10 +2614,14 @@ range_count(int argc, VALUE *argv, VALUE range)
  * A beginless range may be used to slice an array:
  *
  *  a = [1, 2, 3, 4]
- *  r = (..2) # => nil...2
- *  a[r]      # => [1, 2]
+ *  # Include the third array element in the slice
+ *  r = (..2)  # => nil..2
+ *  a[r]       # => [1, 2, 3]
+ *  # Exclude the third array element from the slice
+ *  r = (...2) # => nil...2
+ *  a[r]       # => [1, 2]
  *
- * \Method +each+ for a beginless range raises an exception.
+ * Method +each+ for a beginless range raises an exception.
  *
  * == Endless Ranges
  *
@@ -2224,7 +2651,7 @@ range_count(int argc, VALUE *argv, VALUE range)
  *   r = (2..) # => 2..
  *   a[r]      # => [3, 4]
  *
- * \Method +each+ for an endless range calls the given block indefinitely:
+ * Method +each+ for an endless range calls the given block indefinitely:
  *
  *   a = []
  *   r = (1..)
@@ -2234,19 +2661,19 @@ range_count(int argc, VALUE *argv, VALUE range)
  *   end
  *   a # => [2, 4, 6, 8, 10]
  *
- * A range can be both beginless and endless.  For literal beginless, endless
+ * A range can be both beginless and endless. For literal beginless, endless
  * ranges, at least the beginning or end of the range must be given as an
  * explicit nil value. It is recommended to use an explicit nil beginning and
- * implicit nil end, since that is what Ruby uses for Range#inspect:
+ * end, since that is what Ruby uses for Range#inspect:
  *
- *   (nil..)    # => (nil..)
- *   (..nil)    # => (nil..)
- *   (nil..nil) # => (nil..)
+ *   (nil..)    # => (nil..nil)
+ *   (..nil)    # => (nil..nil)
+ *   (nil..nil) # => (nil..nil)
  *
  * == Ranges and Other Classes
  *
  * An object may be put into a range if its class implements
- * instance method <tt><=></tt>.
+ * instance method <tt>#<=></tt>.
  * Ruby core classes that do so include Array, Complex, File::Stat,
  * Float, Integer, Kernel, Module, Numeric, Rational, String, Symbol, and Time.
  *
@@ -2278,15 +2705,15 @@ range_count(int argc, VALUE *argv, VALUE range)
  * == Ranges and User-Defined Classes
  *
  * A user-defined class that is to be used in a range
- * must implement instance <tt><=></tt>;
+ * must implement instance method <tt>#<=></tt>;
  * see Integer#<=>.
  * To make iteration available, it must also implement
  * instance method +succ+; see Integer#succ.
  *
- * The class below implements both <tt><=></tt> and +succ+,
+ * The class below implements both <tt>#<=></tt> and +succ+,
  * and so can be used both to construct ranges and to iterate over them.
  * Note that the Comparable module is included
- * so the <tt>==</tt> method is defined in terms of <tt><=></tt>.
+ * so the <tt>==</tt> method is defined in terms of <tt>#<=></tt>.
  *
  *   # Represent a string of 'X' characters.
  *   class Xs
@@ -2316,7 +2743,7 @@ range_count(int argc, VALUE *argv, VALUE range)
  *
  * == What's Here
  *
- * First, what's elsewhere. \Class \Range:
+ * First, what's elsewhere. Class \Range:
  *
  * - Inherits from {class Object}[rdoc-ref:Object@What-27s+Here].
  * - Includes {module Enumerable}[rdoc-ref:Enumerable@What-27s+Here],
@@ -2329,6 +2756,7 @@ range_count(int argc, VALUE *argv, VALUE range)
  * - {Comparing}[rdoc-ref:Range@Methods+for+Comparing]
  * - {Iterating}[rdoc-ref:Range@Methods+for+Iterating]
  * - {Converting}[rdoc-ref:Range@Methods+for+Converting]
+ * - {Methods for Working with JSON}[rdoc-ref:Range@Methods+for+Working+with+JSON]
  *
  * === Methods for Creating a \Range
  *
@@ -2363,7 +2791,7 @@ range_count(int argc, VALUE *argv, VALUE range)
  * - #%: Requires argument +n+; calls the block with each +n+-th element of +self+.
  * - #each: Calls the block with each element of +self+.
  * - #step: Takes optional argument +n+ (defaults to 1);
-     calls the block with each +n+-th element of +self+.
+ *   calls the block with each +n+-th element of +self+.
  *
  * === Methods for Converting
  *
@@ -2371,6 +2799,16 @@ range_count(int argc, VALUE *argv, VALUE range)
  * - #to_a (aliased as #entries): Returns elements of +self+ in an array.
  * - #to_s: Returns a string representation of +self+ (uses #to_s).
  *
+ * === Methods for Working with \JSON
+ *
+ * - ::json_create: Returns a new \Range object constructed from the given object.
+ * - #as_json: Returns a 2-element hash representing +self+.
+ * - #to_json: Returns a \JSON string representing +self+.
+ *
+ * To make these methods available:
+ *
+ *   require 'json/add/range'
+ *
  */
 
 void
@@ -2395,6 +2833,7 @@ Init_Range(void)
     rb_define_method(rb_cRange, "each", range_each, 0);
     rb_define_method(rb_cRange, "step", range_step, -1);
     rb_define_method(rb_cRange, "%", range_percent_step, 1);
+    rb_define_method(rb_cRange, "reverse_each", range_reverse_each, 0);
     rb_define_method(rb_cRange, "bsearch", range_bsearch, 0);
     rb_define_method(rb_cRange, "begin", range_begin, 0);
     rb_define_method(rb_cRange, "end", range_end, 0);
@@ -2415,4 +2854,5 @@ Init_Range(void)
     rb_define_method(rb_cRange, "include?", range_include, 1);
     rb_define_method(rb_cRange, "cover?", range_cover, 1);
     rb_define_method(rb_cRange, "count", range_count, -1);
+    rb_define_method(rb_cRange, "overlap?", range_overlap, 1);
 }
diff --git a/rational.c b/rational.c
index c5ad7598f7d592..89e74c328dca0d 100644
--- a/rational.c
+++ b/rational.c
@@ -22,9 +22,6 @@
 # define USE_GMP 0
 #endif
 #endif
-#if USE_GMP
-#include <gmp.h>
-#endif
 
 #include "id.h"
 #include "internal.h"
@@ -36,6 +33,15 @@
 #include "internal/rational.h"
 #include "ruby_assert.h"
 
+#if USE_GMP
+RBIMPL_WARNING_PUSH()
+# ifdef _MSC_VER
+RBIMPL_WARNING_IGNORED(4146) /* for mpn_neg() */
+# endif
+# include <gmp.h>
+RBIMPL_WARNING_POP()
+#endif
+
 #define ZERO INT2FIX(0)
 #define ONE INT2FIX(1)
 #define TWO INT2FIX(2)
@@ -389,8 +395,8 @@ f_gcd(VALUE x, VALUE y)
 {
     VALUE r = f_gcd_orig(x, y);
     if (f_nonzero_p(r)) {
-        assert(f_zero_p(f_mod(x, r)));
-        assert(f_zero_p(f_mod(y, r)));
+        RUBY_ASSERT(f_zero_p(f_mod(x, r)));
+        RUBY_ASSERT(f_zero_p(f_mod(y, r)));
     }
     return r;
 }
@@ -418,7 +424,7 @@ nurat_s_new_internal(VALUE klass, VALUE num, VALUE den)
 
     RATIONAL_SET_NUM((VALUE)obj, num);
     RATIONAL_SET_DEN((VALUE)obj, den);
-    OBJ_FREEZE_RAW((VALUE)obj);
+    OBJ_FREEZE((VALUE)obj);
 
     return (VALUE)obj;
 }
@@ -456,8 +462,8 @@ nurat_int_value(VALUE num)
 static void
 nurat_canonicalize(VALUE *num, VALUE *den)
 {
-    assert(num); assert(RB_INTEGER_TYPE_P(*num));
-    assert(den); assert(RB_INTEGER_TYPE_P(*den));
+    RUBY_ASSERT(num); RUBY_ASSERT(RB_INTEGER_TYPE_P(*num));
+    RUBY_ASSERT(den); RUBY_ASSERT(RB_INTEGER_TYPE_P(*den));
     if (INT_NEGATIVE_P(*den)) {
         *num = rb_int_uminus(*num);
         *den = rb_int_uminus(*den);
@@ -497,16 +503,16 @@ nurat_s_canonicalize_internal_no_reduce(VALUE klass, VALUE num, VALUE den)
 inline static VALUE
 f_rational_new2(VALUE klass, VALUE x, VALUE y)
 {
-    assert(!k_rational_p(x));
-    assert(!k_rational_p(y));
+    RUBY_ASSERT(!k_rational_p(x));
+    RUBY_ASSERT(!k_rational_p(y));
     return nurat_s_canonicalize_internal(klass, x, y);
 }
 
 inline static VALUE
 f_rational_new_no_reduce2(VALUE klass, VALUE x, VALUE y)
 {
-    assert(!k_rational_p(x));
-    assert(!k_rational_p(y));
+    RUBY_ASSERT(!k_rational_p(x));
+    RUBY_ASSERT(!k_rational_p(y));
     return nurat_s_canonicalize_internal_no_reduce(klass, x, y);
 }
 
@@ -610,7 +616,7 @@ nurat_denominator(VALUE self)
 VALUE
 rb_rational_uminus(VALUE self)
 {
-    const int unused = (assert(RB_TYPE_P(self, T_RATIONAL)), 0);
+    const int unused = (RUBY_ASSERT(RB_TYPE_P(self, T_RATIONAL)), 0);
     get_dat1(self);
     (void)unused;
     return f_rational_new2(CLASS_OF(self), rb_int_uminus(dat->num), dat->den);
@@ -646,7 +652,7 @@ inline static VALUE
 f_imul(long x, long y)
 {
     VALUE r = f_imul_orig(x, y);
-    assert(f_eqeq_p(r, f_mul(LONG2NUM(x), LONG2NUM(y))));
+    RUBY_ASSERT(f_eqeq_p(r, f_mul(LONG2NUM(x), LONG2NUM(y))));
     return r;
 }
 #endif
@@ -795,7 +801,7 @@ f_muldiv(VALUE self, VALUE anum, VALUE aden, VALUE bnum, VALUE bden, int k)
 {
     VALUE num, den;
 
-    assert(RB_TYPE_P(self, T_RATIONAL));
+    RUBY_ASSERT(RB_TYPE_P(self, T_RATIONAL));
 
     /* Integer#** can return Rational with Float right now */
     if (RB_FLOAT_TYPE_P(anum) || RB_FLOAT_TYPE_P(aden) ||
@@ -806,10 +812,10 @@ f_muldiv(VALUE self, VALUE anum, VALUE aden, VALUE bnum, VALUE bden, int k)
         return DBL2NUM(x);
     }
 
-    assert(RB_INTEGER_TYPE_P(anum));
-    assert(RB_INTEGER_TYPE_P(aden));
-    assert(RB_INTEGER_TYPE_P(bnum));
-    assert(RB_INTEGER_TYPE_P(bden));
+    RUBY_ASSERT(RB_INTEGER_TYPE_P(anum));
+    RUBY_ASSERT(RB_INTEGER_TYPE_P(aden));
+    RUBY_ASSERT(RB_INTEGER_TYPE_P(bnum));
+    RUBY_ASSERT(RB_INTEGER_TYPE_P(bden));
 
     if (k == '/') {
         VALUE t;
@@ -1042,8 +1048,7 @@ rb_rational_pow(VALUE self, VALUE other)
         }
     }
     else if (RB_BIGNUM_TYPE_P(other)) {
-        rb_warn("in a**b, b may be too big");
-        return rb_float_pow(nurat_to_f(self), other);
+        rb_raise(rb_eArgError, "exponent is too large");
     }
     else if (RB_FLOAT_TYPE_P(other) || RB_TYPE_P(other, T_RATIONAL)) {
         return rb_float_pow(nurat_to_f(self), other);
@@ -1847,7 +1852,7 @@ nurat_loader(VALUE self, VALUE a)
     nurat_canonicalize(&num, &den);
     RATIONAL_SET_NUM((VALUE)dat, num);
     RATIONAL_SET_DEN((VALUE)dat, den);
-    OBJ_FREEZE_RAW(self);
+    OBJ_FREEZE(self);
 
     return self;
 }
@@ -2102,39 +2107,6 @@ rb_float_denominator(VALUE self)
     return nurat_denominator(r);
 }
 
-/*
- * call-seq:
- *   to_r  ->  (0/1)
- *
- * Returns zero as a Rational:
- *
- *   nil.to_r # => (0/1)
- *
- */
-static VALUE
-nilclass_to_r(VALUE self)
-{
-    return rb_rational_new1(INT2FIX(0));
-}
-
-/*
- * call-seq:
- *   rationalize(eps = nil)  ->  (0/1)
- *
- * Returns zero as a Rational:
- *
- *   nil.rationalize # => (0/1)
- *
- * Argument +eps+ is ignored.
- *
- */
-static VALUE
-nilclass_rationalize(int argc, VALUE *argv, VALUE self)
-{
-    rb_check_arity(argc, 0, 1);
-    return nilclass_to_r(self);
-}
-
 /*
  * call-seq:
  *    int.to_r  ->  rational
@@ -2559,7 +2531,7 @@ nurat_convert(VALUE klass, VALUE numv, VALUE denv, int raise)
     VALUE a1 = numv, a2 = denv;
     int state;
 
-    assert(!UNDEF_P(a1));
+    RUBY_ASSERT(!UNDEF_P(a1));
 
     if (NIL_P(a1) || NIL_P(a2)) {
         if (!raise) return Qnil;
@@ -2710,7 +2682,7 @@ nurat_s_convert(int argc, VALUE *argv, VALUE klass)
  *
  * You can convert certain objects to Rationals with:
  *
- * - \Method #Rational.
+ * - Method #Rational.
  *
  * Examples
  *
@@ -2818,8 +2790,6 @@ Init_Rational(void)
     rb_define_method(rb_cFloat, "numerator", rb_float_numerator, 0);
     rb_define_method(rb_cFloat, "denominator", rb_float_denominator, 0);
 
-    rb_define_method(rb_cNilClass, "to_r", nilclass_to_r, 0);
-    rb_define_method(rb_cNilClass, "rationalize", nilclass_rationalize, -1);
     rb_define_method(rb_cInteger, "to_r", integer_to_r, 0);
     rb_define_method(rb_cInteger, "rationalize", integer_rationalize, -1);
     rb_define_method(rb_cFloat, "to_r", float_to_r, 0);
diff --git a/re.c b/re.c
index da7434f421a4ac..b47538d59415dc 100644
--- a/re.c
+++ b/re.c
@@ -28,6 +28,7 @@
 #include "ruby/encoding.h"
 #include "ruby/re.h"
 #include "ruby/util.h"
+#include "ractor_core.h"
 
 VALUE rb_eRegexpError, rb_eRegexpTimeoutError;
 
@@ -88,6 +89,9 @@ static const char casetable[] = {
 # error >>> "You lose. You will need a translation table for your character set." <<<
 #endif
 
+// The process-global timeout for regexp matching
+rb_hrtime_t rb_reg_match_time_limit = 0;
+
 int
 rb_memcicmp(const void *x, const void *y, long len)
 {
@@ -450,7 +454,7 @@ rb_reg_expr_str(VALUE str, const char *s, long len,
 }
 
 static VALUE
-rb_reg_desc(const char *s, long len, VALUE re)
+rb_reg_desc(VALUE re)
 {
     rb_encoding *enc = rb_enc_get(re);
     VALUE str = rb_str_buf_new2("/");
@@ -463,7 +467,11 @@ rb_reg_desc(const char *s, long len, VALUE re)
     else {
         rb_enc_associate(str, rb_usascii_encoding());
     }
-    rb_reg_expr_str(str, s, len, enc, resenc, '/');
+
+    VALUE src_str = RREGEXP_SRC(re);
+    rb_reg_expr_str(str, RSTRING_PTR(src_str), RSTRING_LEN(src_str), enc, resenc, '/');
+    RB_GC_GUARD(src_str);
+
     rb_str_buf_cat2(str, "/");
     if (re) {
         char opts[OPTBUF_SIZE];
@@ -522,7 +530,7 @@ rb_reg_inspect(VALUE re)
     if (!RREGEXP_PTR(re) || !RREGEXP_SRC(re) || !RREGEXP_SRC_PTR(re)) {
         return rb_any_to_s(re);
     }
-    return rb_reg_desc(RREGEXP_SRC_PTR(re), RREGEXP_SRC_LEN(re), re);
+    return rb_reg_desc(re);
 }
 
 static VALUE rb_reg_str_with_term(VALUE re, int term);
@@ -538,7 +546,7 @@ static VALUE rb_reg_str_with_term(VALUE re, int term);
  *
  *  The returned string may be used as an argument to Regexp.new,
  *  or as interpolated text for a
- *  {Regexp interpolation}[rdoc-ref:regexp.rdoc@Interpolation+Mode]:
+ *  {Regexp interpolation}[rdoc-ref:Regexp@Interpolation+Mode]:
  *
  *    r1 = Regexp.new(s0) # => /(?ix-m:ab+c)/
  *    r2 = /#{s0}/        # => /(?ix-m:ab+c)/
@@ -565,8 +573,6 @@ rb_reg_str_with_term(VALUE re, int term)
 {
     int options, opt;
     const int embeddable = ONIG_OPTION_MULTILINE|ONIG_OPTION_IGNORECASE|ONIG_OPTION_EXTEND;
-    long len;
-    const UChar* ptr;
     VALUE str = rb_str_buf_new2("(?");
     char optbuf[OPTBUF_SIZE + 1]; /* for '-' */
     rb_encoding *enc = rb_enc_get(re);
@@ -575,8 +581,9 @@ rb_reg_str_with_term(VALUE re, int term)
 
     rb_enc_copy(str, re);
     options = RREGEXP_PTR(re)->options;
-    ptr = (UChar*)RREGEXP_SRC_PTR(re);
-    len = RREGEXP_SRC_LEN(re);
+    VALUE src_str = RREGEXP_SRC(re);
+    const UChar *ptr = (UChar *)RSTRING_PTR(src_str);
+    long len = RSTRING_LEN(src_str);
   again:
     if (len >= 4 && ptr[0] == '(' && ptr[1] == '?') {
         int err = 1;
@@ -666,15 +673,17 @@ rb_reg_str_with_term(VALUE re, int term)
     }
     rb_enc_copy(str, re);
 
+    RB_GC_GUARD(src_str);
+
     return str;
 }
 
-NORETURN(static void rb_reg_raise(const char *s, long len, const char *err, VALUE re));
+NORETURN(static void rb_reg_raise(const char *err, VALUE re));
 
 static void
-rb_reg_raise(const char *s, long len, const char *err, VALUE re)
+rb_reg_raise(const char *err, VALUE re)
 {
-    VALUE desc = rb_reg_desc(s, len, re);
+    VALUE desc = rb_reg_desc(re);
 
     rb_raise(rb_eRegexpError, "%s: %"PRIsVALUE, err, desc);
 }
@@ -953,7 +962,7 @@ make_regexp(const char *s, long len, rb_encoding *enc, int flags, onig_errmsg_bu
  *  * <code>$'</code> is Regexp.last_match<code>.post_match</code>;
  *  * <code>$+</code> is Regexp.last_match<code>[ -1 ]</code> (the last capture).
  *
- *  See also "Special global variables" section in Regexp documentation.
+ *  See also Regexp@Global+Variables.
  */
 
 VALUE rb_cMatch;
@@ -1288,6 +1297,54 @@ match_byteoffset(VALUE match, VALUE n)
 }
 
 
+/*
+ *  call-seq:
+ *    bytebegin(n) -> integer
+ *    bytebegin(name) -> integer
+ *
+ *  :include: doc/matchdata/bytebegin.rdoc
+ *
+ */
+
+static VALUE
+match_bytebegin(VALUE match, VALUE n)
+{
+    int i = match_backref_number(match, n);
+    struct re_registers *regs = RMATCH_REGS(match);
+
+    match_check(match);
+    backref_number_check(regs, i);
+
+    if (BEG(i) < 0)
+        return Qnil;
+    return LONG2NUM(BEG(i));
+}
+
+
+/*
+ *  call-seq:
+ *    byteend(n) -> integer
+ *    byteend(name) -> integer
+ *
+ *  :include: doc/matchdata/byteend.rdoc
+ *
+ */
+
+static VALUE
+match_byteend(VALUE match, VALUE n)
+{
+    int i = match_backref_number(match, n);
+    struct re_registers *regs = RMATCH_REGS(match);
+
+    match_check(match);
+    backref_number_check(regs, i);
+
+    if (BEG(i) < 0)
+        return Qnil;
+    return LONG2NUM(END(i));
+}
+
+
 /*
  *  call-seq:
  *    begin(n) -> integer
@@ -1465,7 +1522,7 @@ match_set_string(VALUE m, VALUE string, long pos, long len)
     rmatch->regs.end[0] = pos + len;
 }
 
-void
+VALUE
 rb_backref_set_string(VALUE string, long pos, long len)
 {
     VALUE match = rb_backref_get();
@@ -1474,6 +1531,7 @@ rb_backref_set_string(VALUE string, long pos, long len)
     }
     match_set_string(match, string, pos, len);
     rb_backref_set(match);
+    return match;
 }
 
 /*
@@ -1522,8 +1580,8 @@ reg_enc_error(VALUE re, VALUE str)
 {
     rb_raise(rb_eEncCompatError,
              "incompatible encoding regexp match (%s regexp with %s string)",
-             rb_enc_name(rb_enc_get(re)),
-             rb_enc_name(rb_enc_get(str)));
+             rb_enc_inspect_name(rb_enc_get(re)),
+             rb_enc_inspect_name(rb_enc_get(str)));
 }
 
 static inline int
@@ -1580,7 +1638,6 @@ rb_reg_prepare_re(VALUE re, VALUE str)
 {
     int r;
     OnigErrorInfo einfo;
-    const char *pattern;
     VALUE unescaped;
     rb_encoding *fixed_enc = 0;
     rb_encoding *enc = rb_reg_prepare_enc(re, str, 1);
@@ -1589,11 +1646,13 @@ rb_reg_prepare_re(VALUE re, VALUE str)
     if (reg->enc == enc) return reg;
 
     rb_reg_check(re);
-    pattern = RREGEXP_SRC_PTR(re);
+
+    VALUE src_str = RREGEXP_SRC(re);
+    const char *pattern = RSTRING_PTR(src_str);
 
     onig_errmsg_buffer err = "";
     unescaped = rb_reg_preprocess(
-        pattern, pattern + RREGEXP_SRC_LEN(re), enc,
+        pattern, pattern + RSTRING_LEN(src_str), enc,
         &fixed_enc, err, 0);
 
     if (NIL_P(unescaped)) {
@@ -1608,7 +1667,7 @@ rb_reg_prepare_re(VALUE re, VALUE str)
     RSTRING_GETMEM(unescaped, ptr, len);
 
     /* If there are no other users of this regex, then we can directly overwrite it. */
-    if (RREGEXP(re)->usecnt == 0) {
+    if (ruby_single_main_ractor && RREGEXP(re)->usecnt == 0) {
         regex_t tmp_reg;
         r = onig_new_without_alloc(&tmp_reg, (UChar *)ptr, (UChar *)(ptr + len),
                                    reg->options, enc,
@@ -1632,12 +1691,13 @@ rb_reg_prepare_re(VALUE re, VALUE str)
 
     if (r) {
         onig_error_code_to_str((UChar*)err, r, &einfo);
-        rb_reg_raise(pattern, RREGEXP_SRC_LEN(re), err, re);
+        rb_reg_raise(err, re);
     }
 
     reg->timelimit = timelimit;
 
     RB_GC_GUARD(unescaped);
+    RB_GC_GUARD(src_str);
     return reg;
 }
 
@@ -1661,10 +1721,16 @@ rb_reg_onig_match(VALUE re, VALUE str,
     if (result < 0) {
         onig_region_free(regs, 0);
 
-        if (result != ONIG_MISMATCH) {
+        switch (result) {
+          case ONIG_MISMATCH:
+            break;
+          case ONIGERR_TIMEOUT:
+            rb_raise(rb_eRegexpTimeoutError, "regexp match timeout");
+          default: {
             onig_errmsg_buffer err = "";
             onig_error_code_to_str((UChar*)err, (int)result);
-            rb_reg_raise(RREGEXP_SRC_PTR(re), RREGEXP_SRC_LEN(re), err, re);
+            rb_reg_raise(err, re);
+          }
         }
     }
 
@@ -1739,18 +1805,41 @@ rb_reg_search_set_match(VALUE re, VALUE str, long pos, int reverse, int set_back
         .pos = pos,
         .range = reverse ? 0 : len,
     };
+    struct re_registers regs = {0};
 
-    VALUE match = match_alloc(rb_cMatch);
-    struct re_registers *regs = RMATCH_REGS(match);
+    OnigPosition result = rb_reg_onig_match(re, str, reg_onig_search, &args, &regs);
 
-    OnigPosition result = rb_reg_onig_match(re, str, reg_onig_search, &args, regs);
     if (result == ONIG_MISMATCH) {
         rb_backref_set(Qnil);
         return ONIG_MISMATCH;
     }
 
+    VALUE match = Qnil;
+    if (set_match) {
+        match = *set_match;
+    }
+
+    if (NIL_P(match)) {
+        match = rb_backref_get();
+    }
+
+    if (!NIL_P(match) && FL_TEST(match, MATCH_BUSY)) {
+        match = Qnil;
+    }
+
+    if (NIL_P(match)) {
+        match = match_alloc(rb_cMatch);
+    }
+    else {
+        onig_region_free(&RMATCH_EXT(match)->regs, false);
+    }
+
+    rb_matchext_t *rm = RMATCH_EXT(match);
+    rm->regs = regs;
+
     if (set_backref_str) {
         RB_OBJ_WRITE(match, &RMATCH(match)->str, rb_str_new4(str));
+        rb_obj_reveal(match, rb_cMatch);
     }
     else {
         /* Note that a MatchData object with RMATCH(match)->str == 0 is incomplete!
@@ -1768,15 +1857,15 @@ rb_reg_search_set_match(VALUE re, VALUE str, long pos, int reverse, int set_back
 }
 
 long
-rb_reg_search0(VALUE re, VALUE str, long pos, int reverse, int set_backref_str)
+rb_reg_search0(VALUE re, VALUE str, long pos, int reverse, int set_backref_str, VALUE *match)
 {
-    return rb_reg_search_set_match(re, str, pos, reverse, set_backref_str, NULL);
+    return rb_reg_search_set_match(re, str, pos, reverse, set_backref_str, match);
 }
 
 long
 rb_reg_search(VALUE re, VALUE str, long pos, int reverse)
 {
-    return rb_reg_search0(re, str, pos, reverse, 1);
+    return rb_reg_search_set_match(re, str, pos, reverse, 1, NULL);
 }
 
 static OnigPosition
@@ -2151,6 +2240,17 @@ match_ary_aref(VALUE match, VALUE idx, VALUE result)
  *    m['foo'] # => "h"
  *    m[:bar]  # => "ge"
  *
+ *  If multiple captures have the same name, returns the last matched
+ *  substring.
+ *
+ *    m = /(?<foo>.)(?<foo>.+)/.match("hoge")
+ *    # => #<MatchData "hoge" foo:"h" foo:"oge">
+ *    m[:foo] #=> "oge"
+ *
+ *    m = /\W(?<foo>.+)|\w(?<foo>.+)|(?<foo>.+)/.match("hoge")
+ *    #<MatchData "hoge" foo:nil foo:"oge" foo:nil>
+ *    m[:foo] #=> "oge"
+ *
  */
 
 static VALUE
@@ -2334,8 +2434,8 @@ match_named_captures_iter(const OnigUChar *name, const OnigUChar *name_end,
  *    # => #<MatchData "01" a:"0" a:"1">
  *    m.named_captures #=> {"a" => "1"}
  *
- * If keyword argument +symbolize_names+ is given
- * a true value, the keys in the resulting hash are Symbols:
+ *  If keyword argument +symbolize_names+ is given
+ *  a true value, the keys in the resulting hash are Symbols:
  *
  *    m = /(?<a>.)(?<a>.)/.match("01")
  *    # => #<MatchData "01" a:"0" a:"1">
@@ -2390,7 +2490,7 @@ match_named_captures(int argc, VALUE *argv, VALUE match)
  *    m.deconstruct_keys([:hours, :minutes]) # => {:hours => "18", :minutes => "37"}
  *    m.deconstruct_keys(nil) # => {:hours => "18", :minutes => "37", :seconds => "22"}
  *
- *  Returns an empty hash of no named captures were defined:
+ *  Returns an empty hash if no named captures were defined:
  *
  *    m = /(\d{2}):(\d{2}):(\d{2})/.match("18:37:22")
  *    m.deconstruct_keys(nil) # => {}
@@ -2489,10 +2589,10 @@ match_inspect_name_iter(const OnigUChar *name, const OnigUChar *name_end,
 }
 
 /*
- * call-seq:
- *   inspect -> string
+ *  call-seq:
+ *    inspect -> string
  *
- * Returns a string representation of +self+:
+ *  Returns a string representation of +self+:
  *
  *    m = /.$/.match("foo")
  *    # => #<MatchData "o">
@@ -2507,7 +2607,6 @@ match_inspect_name_iter(const OnigUChar *name, const OnigUChar *name_end,
  *    m.inspect # => "#<MatchData \"fo\" 1:\"f\" 2:nil 3:\"o\">"
  *
  *  Related: MatchData#to_s.
- *
  */
 
 static VALUE
@@ -3020,55 +3119,55 @@ unescape_nonascii0(const char **pp, const char *end, rb_encoding *enc,
                         parens++;
                     }
 
-                    for(s = p+1; s < end; s++) {
+                    for (s = p+1; s < end; s++) {
                         switch(*s) {
-                            case 'x':
-                                local_extend = invert ? -1 : 1;
-                                break;
-                            case '-':
-                                invert = 1;
-                                break;
-                            case ':':
-                            case ')':
-                                if (local_extend == 0 ||
-                                    (local_extend == -1 && !extended_mode) ||
-                                    (local_extend == 1 && extended_mode)) {
-                                    /* no changes to extended flag */
-                                    goto fallthrough;
-                                }
+                          case 'x':
+                            local_extend = invert ? -1 : 1;
+                            break;
+                          case '-':
+                            invert = 1;
+                            break;
+                          case ':':
+                          case ')':
+                            if (local_extend == 0 ||
+                                (local_extend == -1 && !extended_mode) ||
+                                (local_extend == 1 && extended_mode)) {
+                                /* no changes to extended flag */
+                                goto fallthrough;
+                            }
 
-                                if (*s == ':') {
-                                    /* change extended flag until ')' */
-                                    int local_options = options;
-                                    if (local_extend == 1) {
-                                         local_options |= ONIG_OPTION_EXTEND;
-                                    }
-                                    else {
-                                         local_options &= ~ONIG_OPTION_EXTEND;
-                                    }
-
-                                    rb_str_buf_cat(buf, (char *)&c, 1);
-                                    int ret = unescape_nonascii0(&p, end, enc, buf, encp,
-                                                                has_property, err,
-                                                                local_options, 1);
-                                    if (ret < 0) return ret;
-                                    goto begin_scan;
+                            if (*s == ':') {
+                                /* change extended flag until ')' */
+                                int local_options = options;
+                                if (local_extend == 1) {
+                                    local_options |= ONIG_OPTION_EXTEND;
                                 }
                                 else {
-                                    /* change extended flag for rest of expression */
-                                    extended_mode = local_extend == 1;
-                                    goto fallthrough;
+                                    local_options &= ~ONIG_OPTION_EXTEND;
                                 }
-                            case 'i':
-                            case 'm':
-                            case 'a':
-                            case 'd':
-                            case 'u':
-                                /* other option flags, ignored during scanning */
-                                break;
-                            default:
-                                /* other character, no extended flag change*/
+
+                                rb_str_buf_cat(buf, (char *)&c, 1);
+                                int ret = unescape_nonascii0(&p, end, enc, buf, encp,
+                                                             has_property, err,
+                                                             local_options, 1);
+                                if (ret < 0) return ret;
+                                goto begin_scan;
+                            }
+                            else {
+                                /* change extended flag for rest of expression */
+                                extended_mode = local_extend == 1;
                                 goto fallthrough;
+                            }
+                          case 'i':
+                          case 'm':
+                          case 'a':
+                          case 'd':
+                          case 'u':
+                            /* other option flags, ignored during scanning */
+                            break;
+                          default:
+                            /* other character, no extended flag change*/
+                            goto fallthrough;
                         }
                     }
                 }
@@ -3401,12 +3500,17 @@ static VALUE reg_cache;
 VALUE
 rb_reg_regcomp(VALUE str)
 {
-    if (reg_cache && RREGEXP_SRC_LEN(reg_cache) == RSTRING_LEN(str)
-        && ENCODING_GET(reg_cache) == ENCODING_GET(str)
-        && memcmp(RREGEXP_SRC_PTR(reg_cache), RSTRING_PTR(str), RSTRING_LEN(str)) == 0)
-        return reg_cache;
+    if (rb_ractor_main_p()) {
+        if (reg_cache && RREGEXP_SRC_LEN(reg_cache) == RSTRING_LEN(str)
+            && ENCODING_GET(reg_cache) == ENCODING_GET(str)
+            && memcmp(RREGEXP_SRC_PTR(reg_cache), RSTRING_PTR(str), RSTRING_LEN(str)) == 0)
+            return reg_cache;
 
-    return reg_cache = rb_reg_new_str(str, 0);
+        return reg_cache = rb_reg_new_str(str, 0);
+    }
+    else {
+        return rb_reg_new_str(str, 0);
+    }
 }
 
 static st_index_t reg_hash(VALUE re);
@@ -3576,7 +3680,7 @@ reg_match_pos(VALUE re, VALUE *strp, long pos, VALUE* set_match)
  *  if and only if +self+:
  *
  *  - Is a regexp literal;
- *    see {Regexp Literals}[rdoc-ref:literals.rdoc@Regexp+Literals].
+ *    see {Regexp Literals}[rdoc-ref:syntax/literals.rdoc@Regexp+Literals].
  *  - Does not contain interpolations;
  *    see {Regexp interpolation}[rdoc-ref:Regexp@Interpolation+Mode].
  *  - Is at the left of the expression.
@@ -3854,6 +3958,8 @@ reg_copy(VALUE copy, VALUE orig)
     RB_OBJ_WRITE(copy, &RREGEXP(copy)->src, RREGEXP(orig)->src);
     RREGEXP_PTR(copy)->timelimit = RREGEXP_PTR(orig)->timelimit;
     rb_enc_copy(copy, orig);
+    FL_SET_RAW(copy, FL_TEST_RAW(orig, KCODE_FIXED|REG_ENCODING_NONE));
+
     return copy;
 }
 
@@ -4528,7 +4634,7 @@ match_setter(VALUE val, ID _x, VALUE *_y)
  *    Regexp.last_match(n) -> string or nil
  *    Regexp.last_match(name) -> string or nil
  *
- *  With no argument, returns the value of <tt>$!</tt>,
+ *  With no argument, returns the value of <tt>$~</tt>,
  *  which is the result of the most recent pattern match
  *  (see {Regexp global variables}[rdoc-ref:Regexp@Global+Variables]):
  *
@@ -4579,12 +4685,9 @@ re_warn(const char *s)
     rb_warn("%s", s);
 }
 
-// The process-global timeout for regexp matching
-rb_hrtime_t rb_reg_match_time_limit = 0;
-
 // This function is periodically called during regexp matching
-void
-rb_reg_check_timeout(regex_t *reg, void *end_time_)
+bool
+rb_reg_timeout_p(regex_t *reg, void *end_time_)
 {
     rb_hrtime_t *end_time = (rb_hrtime_t *)end_time_;
 
@@ -4609,10 +4712,12 @@ rb_reg_check_timeout(regex_t *reg, void *end_time_)
     }
     else {
         if (*end_time < rb_hrtime_now()) {
-            // timeout is exceeded
-            rb_raise(rb_eRegexpTimeoutError, "regexp match timeout");
+            // Timeout has exceeded
+            return true;
         }
     }
+
+    return false;
 }
 
 /*
@@ -4693,7 +4798,7 @@ rb_reg_timeout_get(VALUE re)
 /*
  *  Document-class: Regexp
  *
- *  :include: doc/regexp.rdoc
+ *  :include: doc/_regexp.rdoc
  */
 
 void
@@ -4779,6 +4884,8 @@ Init_Regexp(void)
     rb_define_method(rb_cMatch, "length", match_size, 0);
     rb_define_method(rb_cMatch, "offset", match_offset, 1);
     rb_define_method(rb_cMatch, "byteoffset", match_byteoffset, 1);
+    rb_define_method(rb_cMatch, "bytebegin", match_bytebegin, 1);
+    rb_define_method(rb_cMatch, "byteend", match_byteend, 1);
     rb_define_method(rb_cMatch, "begin", match_begin, 1);
     rb_define_method(rb_cMatch, "end", match_end, 1);
     rb_define_method(rb_cMatch, "match", match_nth, 1);
diff --git a/regcomp.c b/regcomp.c
index b880c85bf145e8..38bfed5631d643 100644
--- a/regcomp.c
+++ b/regcomp.c
@@ -1273,6 +1273,10 @@ compile_length_enclose_node(EncloseNode* node, regex_t* reg)
     break;
 
   case ENCLOSE_STOP_BACKTRACK:
+    /* Disable POP_STOP_BT optimization for simple repeat under the match cache */
+    /* optimization because the match cache optimization pushes an extra item to */
+    /* the stack and it breaks the assumption for this optimization. */
+#ifndef USE_MATCH_CACHE
     if (IS_ENCLOSE_STOP_BT_SIMPLE_REPEAT(node)) {
       QtfrNode* qn = NQTFR(node->target);
       tlen = compile_length_tree(qn->target, reg);
@@ -1282,8 +1286,11 @@ compile_length_enclose_node(EncloseNode* node, regex_t* reg)
 	  + SIZE_OP_PUSH + tlen + SIZE_OP_POP + SIZE_OP_JUMP;
     }
     else {
+#endif
       len = SIZE_OP_PUSH_STOP_BT + tlen + SIZE_OP_POP_STOP_BT;
+#ifndef USE_MATCH_CACHE
     }
+#endif
     break;
 
   case ENCLOSE_CONDITION:
@@ -1395,6 +1402,10 @@ compile_enclose_node(EncloseNode* node, regex_t* reg)
     break;
 
   case ENCLOSE_STOP_BACKTRACK:
+    /* Disable POP_STOP_BT optimization for simple repeat under the match cache */
+    /* optimization because the match cache optimization pushes an extra item to */
+    /* the stack and it breaks the assumption for this optimization. */
+#ifndef USE_MATCH_CACHE
     if (IS_ENCLOSE_STOP_BT_SIMPLE_REPEAT(node)) {
       QtfrNode* qn = NQTFR(node->target);
       r = compile_tree_n_times(qn->target, qn->lower, reg);
@@ -1413,12 +1424,15 @@ compile_enclose_node(EncloseNode* node, regex_t* reg)
 	 -((int )SIZE_OP_PUSH + len + (int )SIZE_OP_POP + (int )SIZE_OP_JUMP));
     }
     else {
+#endif
       r = add_opcode(reg, OP_PUSH_STOP_BT);
       if (r) return r;
       r = compile_tree(node->target, reg);
       if (r) return r;
       r = add_opcode(reg, OP_POP_STOP_BT);
+#ifndef USE_MATCH_CACHE
     }
+#endif
     break;
 
   case ENCLOSE_CONDITION:
@@ -3381,7 +3395,7 @@ next_setup(Node* node, Node* next_node, regex_t* reg)
   }
   else if (type == NT_ENCLOSE) {
     EncloseNode* en = NENCLOSE(node);
-    if (en->type == ENCLOSE_MEMORY) {
+    if (en->type == ENCLOSE_MEMORY && !IS_ENCLOSE_CALLED(en)) {
       node = en->target;
       goto retry;
     }
@@ -5482,10 +5496,8 @@ clear_optimize_info(regex_t* reg)
   reg->sub_anchor    = 0;
   reg->exact_end     = (UChar* )NULL;
   reg->threshold_len = 0;
-  if (IS_NOT_NULL(reg->exact)) {
-    xfree(reg->exact);
-    reg->exact = (UChar* )NULL;
-  }
+  xfree(reg->exact);
+  reg->exact = (UChar* )NULL;
 }
 
 #ifdef ONIG_DEBUG
@@ -5715,7 +5727,7 @@ onig_reg_copy(regex_t** nreg, regex_t* oreg)
         goto err_repeat_range;
     }
     if (IS_NOT_NULL(reg->name_table)) {
-      if (IS_NULL(reg->name_table = st_copy(reg->name_table)))
+      if (onig_names_copy(reg, oreg))
         goto err_name_table;
     }
     if (IS_NOT_NULL(reg->chain)) {
@@ -5726,7 +5738,7 @@ onig_reg_copy(regex_t** nreg, regex_t* oreg)
 # undef COPY_FAILED
 
   err_chain:
-    onig_st_free_table(reg->name_table);
+    onig_names_free(reg);
   err_name_table:
     xfree(reg->repeat_range);
   err_repeat_range:
diff --git a/regenc.c b/regenc.c
index fc131d2533cb6a..c554f4eb316ea0 100644
--- a/regenc.c
+++ b/regenc.c
@@ -57,7 +57,7 @@ onigenc_mbclen(const OnigUChar* p,const OnigUChar* e, OnigEncoding enc)
   int ret = ONIGENC_PRECISE_MBC_ENC_LEN(enc, p, e);
   if (ONIGENC_MBCLEN_CHARFOUND_P(ret)) {
     ret = ONIGENC_MBCLEN_CHARFOUND_LEN(ret);
-    if (ret > (int)(e - p)) ret = (int)(e - p); // just for case
+    if (p + ret > e) ret = (int)(e - p); // just for case
     return ret;
   }
   else if (ONIGENC_MBCLEN_NEEDMORE_P(ret)) {
@@ -985,7 +985,8 @@ onigenc_ascii_only_case_map(OnigCaseFoldType* flagP, const OnigUChar** pp, const
     if (code >= 'a' && code <= 'z' && (flags & ONIGENC_CASE_UPCASE)) {
       flags |= ONIGENC_CASE_MODIFIED;
       code += 'A' - 'a';
-    } else if (code >= 'A' && code <= 'Z' &&
+    }
+    else if (code >= 'A' && code <= 'Z' &&
 	(flags & (ONIGENC_CASE_DOWNCASE | ONIGENC_CASE_FOLD))) {
       flags |= ONIGENC_CASE_MODIFIED;
       code += 'a' - 'A';
@@ -1013,7 +1014,8 @@ onigenc_single_byte_ascii_only_case_map(OnigCaseFoldType* flagP, const OnigUChar
     if (code >= 'a' && code <= 'z' && (flags & ONIGENC_CASE_UPCASE)) {
       flags |= ONIGENC_CASE_MODIFIED;
       code += 'A' - 'a';
-    } else if (code >= 'A' && code <= 'Z' &&
+    }
+    else if (code >= 'A' && code <= 'Z' &&
 	(flags & (ONIGENC_CASE_DOWNCASE | ONIGENC_CASE_FOLD))) {
       flags |= ONIGENC_CASE_MODIFIED;
       code += 'a' - 'A';
diff --git a/regenc.h b/regenc.h
index 352a8d79800873..4b4d21a715b4af 100644
--- a/regenc.h
+++ b/regenc.h
@@ -118,6 +118,11 @@ typedef struct {
 
 typedef struct {
   short int len;
+#if defined(__has_attribute)
+# if __has_attribute(nonstring)
+  __attribute__((nonstring))
+# endif
+#endif
   const UChar name[6];
   int       ctype;
 } PosixBracketEntryType;
diff --git a/regerror.c b/regerror.c
index b18fc2e88b9d4f..df5e964cc305c6 100644
--- a/regerror.c
+++ b/regerror.c
@@ -299,7 +299,8 @@ onig_error_code_to_str(UChar* s, OnigPosition code, ...)
     if (q) {
       len = onigenc_str_bytelen_null(ONIG_ENCODING_ASCII, q);
       xmemcpy(s, q, len);
-    } else {
+    }
+    else {
       len = 0;
     }
     s[len] = '\0';
diff --git a/regexec.c b/regexec.c
index ba0e7c2cd2e19c..ba5560c60934d0 100644
--- a/regexec.c
+++ b/regexec.c
@@ -240,14 +240,11 @@ Glossary for "match cache"
 The `Regexp#match` optimization by using a cache.
 
 "cache opcode"
-A cachable opcode (e.g. `OP_PUSH`, `OP_REPEAT`, etc).
+A cacheable opcode (e.g. `OP_PUSH`, `OP_REPEAT`, etc).
 It is corresponding to some cache points.
-`OP_NULL_CHECK_START` and `OP_NULL_CHECK_END_MEMST` are exceptions.
-They are counted as cache opcodes, but they have no corresponding cache points.
-They are used for resetting a match cache buffer when a null loop is detected.
 
 "cache point"
-A cachable point on matching.
+A cacheable point on matching.
 Usually, one-to-one corresponding between a cache opcode and a cache point exists,
 but cache opcodes between `OP_REPEAT` and `OP_REPEAT_INC` have some corresponding
 cache points depending on repetition counts.
@@ -258,21 +255,22 @@ We encode a match cache point to an integer value by the following equation:
 "match cache point" = "position on input string" * "total number of cache points" + "cache point"
 
 "match cache buffer"
-A bit-array for recording (caching) match cache points once arrived.
+A bit-array for memoizing (recording) match cache points once backtracked.
 */
 
-/* count the total number of cache opcodes for allocating a match cache buffer. */
-static OnigPosition
-count_num_cache_opcodes(const regex_t* reg, long* num_cache_opcodes_ptr)
+static OnigPosition count_num_cache_opcodes_inner(
+    const regex_t* reg,
+    MemNumType current_repeat_mem, int lookaround_nesting,
+    UChar** pp, long* num_cache_opcodes_ptr
+)
 {
-  UChar* p = reg->p;
-  UChar* pend = p + reg->used;
+  UChar* p = *pp;
+  UChar* pend = reg->p + reg->used;
   LengthType len;
   MemNumType repeat_mem;
   OnigEncoding enc = reg->enc;
-  MemNumType current_repeat_mem = -1;
-  long num_cache_opcodes = 0;
-  long num_cache_opcodes_at_null_check_start = -1;
+  long num_cache_opcodes = *num_cache_opcodes_ptr;
+  OnigPosition result;
 
   while (p < pend) {
     switch (*p++) {
@@ -326,7 +324,7 @@ count_num_cache_opcodes(const regex_t* reg, long* num_cache_opcodes_ptr)
 	break;
       case OP_ANYCHAR_STAR:
       case OP_ANYCHAR_ML_STAR:
-	num_cache_opcodes++;break;
+	num_cache_opcodes++; break;
       case OP_ANYCHAR_STAR_PEEK_NEXT:
       case OP_ANYCHAR_ML_STAR_PEEK_NEXT:
 	p++; num_cache_opcodes++; break;
@@ -370,7 +368,12 @@ count_num_cache_opcodes(const regex_t* reg, long* num_cache_opcodes_ptr)
       case OP_MEMORY_END_PUSH_REC:
       case OP_MEMORY_END:
       case OP_MEMORY_END_REC:
-	p += SIZE_MEMNUM; break;
+	p += SIZE_MEMNUM;
+	// A memory (capture) in look-around is found.
+	if (lookaround_nesting != 0) {
+	  goto impossible;
+        }
+	break;
 
       case OP_KEEP:
 	break;
@@ -397,10 +400,25 @@ count_num_cache_opcodes(const regex_t* reg, long* num_cache_opcodes_ptr)
 	}
 	GET_MEMNUM_INC(repeat_mem, p);
 	p += SIZE_RELADDR;
-	if (reg->repeat_range[repeat_mem].lower == 0) {
-	  num_cache_opcodes++;
+	if (reg->repeat_range[repeat_mem].lower == 0 && reg->repeat_range[repeat_mem].upper == 0) {
+	  long dummy_num_cache_opcodes = 0;
+	  result = count_num_cache_opcodes_inner(reg, repeat_mem, lookaround_nesting, &p, &dummy_num_cache_opcodes);
+	  if (result < 0 || dummy_num_cache_opcodes < 0) {
+	    goto fail;
+	  }
+	} else {
+	  if (reg->repeat_range[repeat_mem].lower == 0) {
+	    num_cache_opcodes++;
+	  }
+	  result = count_num_cache_opcodes_inner(reg, repeat_mem, lookaround_nesting, &p, &num_cache_opcodes);
+	  if (result < 0 || num_cache_opcodes < 0) {
+	    goto fail;
+	  }
+	  OnigRepeatRange *repeat_range = &reg->repeat_range[repeat_mem];
+	  if (repeat_range->lower < repeat_range->upper) {
+	    num_cache_opcodes++;
+	  }
 	}
-	current_repeat_mem = repeat_mem;
 	break;
       case OP_REPEAT_INC:
       case OP_REPEAT_INC_NG:
@@ -409,50 +427,73 @@ count_num_cache_opcodes(const regex_t* reg, long* num_cache_opcodes_ptr)
 	  // A lone or invalid OP_REPEAT_INC is found.
 	  goto impossible;
 	}
-	{
-	  OnigRepeatRange *repeat_range = &reg->repeat_range[repeat_mem];
-	  if (repeat_range->lower < repeat_range->upper) {
-	    num_cache_opcodes++;
-	  }
-	  current_repeat_mem = -1;
-	}
-	break;
+	goto exit;
       case OP_REPEAT_INC_SG:
       case OP_REPEAT_INC_NG_SG:
 	goto impossible;
       case OP_NULL_CHECK_START:
 	p += SIZE_MEMNUM;
-	if (num_cache_opcodes_at_null_check_start != -1) {
-	// A nested OP_NULL_CHECK_START is not yet supported.
-	  goto impossible;
-	}
-	num_cache_opcodes_at_null_check_start = num_cache_opcodes;
 	break;
       case OP_NULL_CHECK_END:
       case OP_NULL_CHECK_END_MEMST_PUSH:
 	p += SIZE_MEMNUM;
-	num_cache_opcodes_at_null_check_start = -1;
 	break;
       case OP_NULL_CHECK_END_MEMST:
 	p += SIZE_MEMNUM;
-	// OP_NULL_CHECK_START and OP_NULL_CHECK_END_MEMST are counted as cache opcodes.
-	if (num_cache_opcodes_at_null_check_start < num_cache_opcodes) {
-	  num_cache_opcodes += 2;
-	}
-	num_cache_opcodes_at_null_check_start = -1;
 	break;
 
       case OP_PUSH_POS:
-      case OP_POP_POS:
+	if (lookaround_nesting < 0) {
+	  // A look-around nested in a atomic grouping is found.
+	  goto impossible;
+	}
+	result = count_num_cache_opcodes_inner(reg, current_repeat_mem, lookaround_nesting + 1, &p, &num_cache_opcodes);
+	if (result < 0 || num_cache_opcodes < 0) {
+	  goto fail;
+	}
+	break;
       case OP_PUSH_POS_NOT:
-      case OP_FAIL_POS:
-	goto impossible;
-      case OP_PUSH_STOP_BT:
-      case OP_POP_STOP_BT:
+	if (lookaround_nesting < 0) {
+	  // A look-around nested in a atomic grouping is found.
+	  goto impossible;
+	}
+	p += SIZE_RELADDR;
+	result = count_num_cache_opcodes_inner(reg, current_repeat_mem, lookaround_nesting + 1, &p, &num_cache_opcodes);
+	if (result < 0 || num_cache_opcodes < 0) {
+	  goto fail;
+	}
 	break;
-      case OP_LOOK_BEHIND:
       case OP_PUSH_LOOK_BEHIND_NOT:
+	if (lookaround_nesting < 0) {
+	  // A look-around nested in a atomic grouping is found.
+	  goto impossible;
+	}
+	p += SIZE_RELADDR;
+	p += SIZE_LENGTH;
+	result = count_num_cache_opcodes_inner(reg, current_repeat_mem, lookaround_nesting + 1, &p, &num_cache_opcodes);
+	if (result < 0 || num_cache_opcodes < 0) {
+	  goto fail;
+	}
+	break;
+      case OP_PUSH_STOP_BT:
+	if (lookaround_nesting != 0) {
+	  // A nested atomic grouping is found.
+	  goto impossible;
+	}
+	result = count_num_cache_opcodes_inner(reg, current_repeat_mem, -1, &p, &num_cache_opcodes);
+	if (result < 0 || num_cache_opcodes < 0) {
+	  goto fail;
+	}
+	break;
+      case OP_POP_POS:
+      case OP_FAIL_POS:
       case OP_FAIL_LOOK_BEHIND_NOT:
+      case OP_POP_STOP_BT:
+	goto exit;
+      case OP_LOOK_BEHIND:
+	p += SIZE_LENGTH;
+	break;
+
       case OP_PUSH_ABSENT_POS:
       case OP_ABSENT_END:
       case OP_ABSENT:
@@ -482,9 +523,15 @@ count_num_cache_opcodes(const regex_t* reg, long* num_cache_opcodes_ptr)
     }
   }
 
+exit:
+  *pp = p;
   *num_cache_opcodes_ptr = num_cache_opcodes;
   return 0;
 
+fail:
+  *num_cache_opcodes_ptr = num_cache_opcodes;
+  return result;
+
 impossible:
   *num_cache_opcodes_ptr = NUM_CACHE_OPCODES_IMPOSSIBLE;
   return 0;
@@ -493,32 +540,48 @@ count_num_cache_opcodes(const regex_t* reg, long* num_cache_opcodes_ptr)
   return ONIGERR_UNDEFINED_BYTECODE;
 }
 
-/* collect cache opcodes from the given regex program, and compute the total number of cache points. */
+/* count the total number of cache opcodes for allocating a match cache buffer. */
 static OnigPosition
-init_cache_opcodes(const regex_t* reg, OnigCacheOpcode* cache_opcodes, long* num_cache_points_ptr)
+count_num_cache_opcodes(const regex_t* reg, long* num_cache_opcodes_ptr)
 {
-  UChar* pbegin;
   UChar* p = reg->p;
-  UChar* pend = p + reg->used;
+  *num_cache_opcodes_ptr = 0;
+  OnigPosition result = count_num_cache_opcodes_inner(reg, -1, 0, &p, num_cache_opcodes_ptr);
+  if (result == 0 && *num_cache_opcodes_ptr >= 0 && p != reg->p + reg->used) {
+    return ONIGERR_UNDEFINED_BYTECODE;
+  }
+
+  return result;
+}
+
+static OnigPosition
+init_cache_opcodes_inner(
+    const regex_t* reg,
+    MemNumType current_repeat_mem, int lookaround_nesting,
+    OnigCacheOpcode** cache_opcodes_ptr, UChar** pp, long* num_cache_points_ptr
+)
+{
+  UChar* p = *pp;
+  UChar* pend = reg->p + reg->used;
+  UChar* pbegin;
   LengthType len;
   MemNumType repeat_mem;
   OnigEncoding enc = reg->enc;
-  MemNumType current_repeat_mem = -1;
-  long cache_point = 0;
-  long num_cache_points_at_repeat = 0;
-  OnigCacheOpcode* cache_opcodes_at_repeat = NULL;
-  UChar* null_check_start_addr = NULL;
-  OnigCacheOpcode* cache_opcodes_at_null_check_start = NULL;
-
-#  define INC_CACHE_OPCODES do {\
+  long cache_point = *num_cache_points_ptr;
+  OnigCacheOpcode *cache_opcodes = *cache_opcodes_ptr;
+  OnigPosition result;
+
+# define INC_CACHE_OPCODES if (cache_opcodes != NULL) {\
     cache_opcodes->addr = pbegin;\
-    cache_opcodes->cache_point = cache_point - num_cache_points_at_repeat;\
+    cache_opcodes->cache_point = cache_point;\
     cache_opcodes->outer_repeat_mem = current_repeat_mem;\
-    cache_opcodes->num_cache_points_at_outer_repeat = num_cache_points_at_repeat;\
+    cache_opcodes->num_cache_points_at_outer_repeat = 0;\
     cache_opcodes->num_cache_points_in_outer_repeat = 0;\
-    cache_point++;\
+    cache_opcodes->lookaround_nesting = lookaround_nesting;\
+    cache_opcodes->match_addr = NULL;\
+    cache_point += lookaround_nesting != 0 ? 2 : 1;\
     cache_opcodes++;\
-   } while (0)
+  }
 
   while (p < pend) {
     pbegin = p;
@@ -620,7 +683,11 @@ init_cache_opcodes(const regex_t* reg, OnigCacheOpcode* cache_opcodes, long* num
       case OP_MEMORY_END_PUSH_REC:
       case OP_MEMORY_END:
       case OP_MEMORY_END_REC:
-	p += SIZE_MEMNUM; break;
+	p += SIZE_MEMNUM;
+	if (lookaround_nesting != 0) {
+	  goto unexpected_bytecode_error;
+	}
+	break;
 
       case OP_KEEP:
 	break;
@@ -645,80 +712,104 @@ init_cache_opcodes(const regex_t* reg, OnigCacheOpcode* cache_opcodes, long* num
       case OP_REPEAT_NG:
 	GET_MEMNUM_INC(repeat_mem, p);
 	p += SIZE_RELADDR;
-	if (reg->repeat_range[repeat_mem].lower == 0) {
-	  INC_CACHE_OPCODES;
-	}
-	current_repeat_mem = repeat_mem;
-	num_cache_points_at_repeat = cache_point;
-	cache_opcodes_at_repeat = cache_opcodes;
-	break;
-      case OP_REPEAT_INC:
-      case OP_REPEAT_INC_NG:
-	GET_MEMNUM_INC(repeat_mem, p);
-	{
-	  long num_cache_points_in_repeat = cache_point - num_cache_points_at_repeat;
-	  OnigRepeatRange *repeat_range = &reg->repeat_range[repeat_mem];
-	  if (repeat_range->lower < repeat_range->upper) {
+	if (reg->repeat_range[repeat_mem].lower == 0 && reg->repeat_range[repeat_mem].upper == 0) {
+	  long dummy_num_cache_points = 0;
+	  OnigCacheOpcode* dummy_cache_opcodes = NULL;
+	  result = init_cache_opcodes_inner(reg, repeat_mem, lookaround_nesting, &dummy_cache_opcodes, &p, &dummy_num_cache_points);
+	  if (result != 0) {
+	    goto fail;
+	  }
+	} else {
+	  if (reg->repeat_range[repeat_mem].lower == 0) {
 	    INC_CACHE_OPCODES;
-	    cache_point--;
 	  }
-	  cache_point -= num_cache_points_in_repeat;
-	  int repeat_bounds = repeat_range->upper == 0x7fffffff ? 1 : repeat_range->upper - repeat_range->lower;
-	  cache_point += num_cache_points_in_repeat * repeat_range->lower + (num_cache_points_in_repeat + 1) * repeat_bounds;
-	  OnigCacheOpcode* cache_opcodes_in_repeat = cache_opcodes - 1;
-	  while (cache_opcodes_at_repeat <= cache_opcodes_in_repeat) {
-	    cache_opcodes_in_repeat->num_cache_points_in_outer_repeat = num_cache_points_in_repeat;
-	    cache_opcodes_in_repeat--;
+	  {
+	    long num_cache_points_in_repeat = 0;
+	    long num_cache_points_at_repeat = cache_point;
+	    OnigCacheOpcode* cache_opcodes_in_repeat = cache_opcodes;
+	    result = init_cache_opcodes_inner(reg, repeat_mem, lookaround_nesting, &cache_opcodes, &p, &num_cache_points_in_repeat);
+	    if (result != 0) {
+	      goto fail;
+	    }
+	    OnigRepeatRange *repeat_range = &reg->repeat_range[repeat_mem];
+	    if (repeat_range->lower < repeat_range->upper) {
+	      INC_CACHE_OPCODES;
+	      cache_point -= lookaround_nesting != 0 ? 2 : 1;
+	    }
+	    int repeat_bounds = repeat_range->upper == 0x7fffffff ? 1 : repeat_range->upper - repeat_range->lower;
+	    cache_point += num_cache_points_in_repeat * repeat_range->lower + (num_cache_points_in_repeat + (lookaround_nesting != 0 ? 2 : 1)) * repeat_bounds;
+	    for (; cache_opcodes_in_repeat < cache_opcodes; cache_opcodes_in_repeat++) {
+	      cache_opcodes_in_repeat->num_cache_points_at_outer_repeat = num_cache_points_at_repeat;
+	      cache_opcodes_in_repeat->num_cache_points_in_outer_repeat = num_cache_points_in_repeat;
+	    }
 	  }
-	  current_repeat_mem = -1;
-	  num_cache_points_at_repeat = 0;
-	  cache_opcodes_at_repeat = NULL;
 	}
 	break;
+      case OP_REPEAT_INC:
+      case OP_REPEAT_INC_NG:
+	p += SIZE_MEMNUM;
+        goto exit;
       case OP_REPEAT_INC_SG:
       case OP_REPEAT_INC_NG_SG:
 	goto unexpected_bytecode_error;
       case OP_NULL_CHECK_START:
-	if (cache_opcodes_at_null_check_start != NULL) {
-	  goto unexpected_bytecode_error;
-	}
 	p += SIZE_MEMNUM;
-	null_check_start_addr = pbegin;
-	cache_opcodes_at_null_check_start = cache_opcodes;
 	break;
       case OP_NULL_CHECK_END:
       case OP_NULL_CHECK_END_MEMST_PUSH:
 	p += SIZE_MEMNUM;
-	cache_opcodes_at_null_check_start = NULL;
 	break;
       case OP_NULL_CHECK_END_MEMST:
 	p += SIZE_MEMNUM;
+	break;
+
+      case OP_PUSH_POS:
+	lookaround:
 	{
-	  if (cache_opcodes_at_null_check_start < cache_opcodes) {
-	    *cache_opcodes = *(cache_opcodes - 1);
-	    cache_opcodes->addr = pbegin;
-	    cache_opcodes++;
-	    long num_cache_opcodes_in_null_check = (cache_opcodes - cache_opcodes_at_null_check_start);
-	    xmemmove(cache_opcodes_at_null_check_start + 1, cache_opcodes_at_null_check_start, sizeof(OnigCacheOpcode) * num_cache_opcodes_in_null_check);
-	    cache_opcodes_at_null_check_start->addr = null_check_start_addr;
-	    cache_opcodes++;
+	  OnigCacheOpcode* cache_opcodes_in_lookaround = cache_opcodes;
+	  result = init_cache_opcodes_inner(reg, current_repeat_mem, lookaround_nesting + 1, &cache_opcodes, &p, &cache_point);
+	  if (result != 0) {
+	    goto fail;
+	  }
+	  UChar* match_addr = p - 1;
+	  for (; cache_opcodes_in_lookaround < cache_opcodes; cache_opcodes_in_lookaround++) {
+	    if (cache_opcodes_in_lookaround->match_addr == NULL) {
+	      cache_opcodes_in_lookaround->match_addr = match_addr;
+	    }
 	  }
-	  cache_opcodes_at_null_check_start = NULL;
 	}
 	break;
-
-      case OP_PUSH_POS:
-      case OP_POP_POS:
       case OP_PUSH_POS_NOT:
-      case OP_FAIL_POS:
-	goto unexpected_bytecode_error;
+	p += SIZE_RELADDR;
+        goto lookaround;
+      case OP_PUSH_LOOK_BEHIND_NOT:
+	p += SIZE_RELADDR;
+	p += SIZE_LENGTH;
+        goto lookaround;
       case OP_PUSH_STOP_BT:
-      case OP_POP_STOP_BT:
+	{
+	  OnigCacheOpcode* cache_opcodes_in_atomic = cache_opcodes;
+	  result = init_cache_opcodes_inner(reg, current_repeat_mem, -1, &cache_opcodes, &p, &cache_point);
+	  if (result != 0) {
+	    goto fail;
+	  }
+	  UChar* match_addr = p - 1;
+	  for (; cache_opcodes_in_atomic < cache_opcodes; cache_opcodes_in_atomic++) {
+	    if (cache_opcodes_in_atomic->match_addr == NULL) {
+	      cache_opcodes_in_atomic->match_addr = match_addr;
+	    }
+	  }
+	}
 	break;
-      case OP_LOOK_BEHIND:
-      case OP_PUSH_LOOK_BEHIND_NOT:
+      case OP_POP_POS:
+      case OP_FAIL_POS:
       case OP_FAIL_LOOK_BEHIND_NOT:
-      case OP_PUSH_ABSENT_POS:
+      case OP_POP_STOP_BT:
+	goto exit;
+      case OP_LOOK_BEHIND:
+	p += SIZE_LENGTH;
+	break;
+
       case OP_ABSENT_END:
       case OP_ABSENT:
 	goto unexpected_bytecode_error;
@@ -747,15 +838,35 @@ init_cache_opcodes(const regex_t* reg, OnigCacheOpcode* cache_opcodes, long* num
     }
   }
 
+exit:
+  *cache_opcodes_ptr = cache_opcodes;
+  *pp = p;
   *num_cache_points_ptr = cache_point;
   return 0;
 
+fail:
+  return result;
+
 unexpected_bytecode_error:
   return ONIGERR_UNEXPECTED_BYTECODE;
 
 bytecode_error:
   return ONIGERR_UNDEFINED_BYTECODE;
 }
+
+/* collect cache opcodes from the given regex program, and compute the total number of cache points. */
+static OnigPosition
+init_cache_opcodes(const regex_t* reg, OnigCacheOpcode* cache_opcodes_ptr, long* num_cache_points_ptr)
+{
+  UChar* p = reg->p;
+  *num_cache_points_ptr = 0;
+  OnigPosition result = init_cache_opcodes_inner(reg, -1, 0, &cache_opcodes_ptr, &p, num_cache_points_ptr);
+  if (result == 0 && p != reg->p + reg->used) {
+    return ONIGERR_UNDEFINED_BYTECODE;
+  }
+
+  return result;
+}
 #else
 static OnigPosition
 count_num_cache_opcodes(regex_t* reg, long* num_cache_opcodes)
@@ -933,31 +1044,33 @@ onig_region_copy(OnigRegion* to, const OnigRegion* from)
 
 /* stack type */
 /* used by normal-POP */
-#define STK_ALT                    0x0001
-#define STK_LOOK_BEHIND_NOT        0x0002
-#define STK_POS_NOT                0x0003
+#define STK_ALT                      0x0001
+#define STK_LOOK_BEHIND_NOT          0x0002
+#define STK_POS_NOT                  0x0003
 /* handled by normal-POP */
-#define STK_MEM_START              0x0100
-#define STK_MEM_END                0x8200
-#define STK_REPEAT_INC             0x0300
-#define STK_STATE_CHECK_MARK       0x1000
+#define STK_MEM_START                0x0100
+#define STK_MEM_END                  0x8200
+#define STK_REPEAT_INC               0x0300
+#define STK_STATE_CHECK_MARK         0x1000
 /* avoided by normal-POP */
-#define STK_NULL_CHECK_START       0x3000
-#define STK_NULL_CHECK_END         0x5000  /* for recursive call */
-#define STK_MEM_END_MARK           0x8400
-#define STK_POS                    0x0500  /* used when POP-POS */
-#define STK_STOP_BT                0x0600  /* mark for "(?>...)" */
-#define STK_REPEAT                 0x0700
-#define STK_CALL_FRAME             0x0800
-#define STK_RETURN                 0x0900
-#define STK_VOID                   0x0a00  /* for fill a blank */
-#define STK_ABSENT_POS             0x0b00  /* for absent */
-#define STK_ABSENT                 0x0c00  /* absent inner loop marker */
+#define STK_NULL_CHECK_START         0x3000
+#define STK_NULL_CHECK_END           0x5000  /* for recursive call */
+#define STK_MEM_END_MARK             0x8400
+#define STK_POS                      0x0500  /* used when POP-POS */
+#define STK_STOP_BT                  0x0600  /* mark for "(?>...)" */
+#define STK_REPEAT                   0x0700
+#define STK_CALL_FRAME               0x0800
+#define STK_RETURN                   0x0900
+#define STK_VOID                     0x0a00  /* for fill a blank */
+#define STK_ABSENT_POS               0x0b00  /* for absent */
+#define STK_ABSENT                   0x0c00  /* absent inner loop marker */
+#define STK_MATCH_CACHE_POINT        0x0d00  /* for the match cache optimization */
+#define STK_ATOMIC_MATCH_CACHE_POINT 0x0e00
 
 /* stack type check mask */
-#define STK_MASK_POP_USED          0x00ff
-#define STK_MASK_TO_VOID_TARGET    0x10ff
-#define STK_MASK_MEM_END_OR_MARK   0x8000  /* MEM_END or MEM_END_MARK */
+#define STK_MASK_POP_USED            0x00ff
+#define STK_MASK_TO_VOID_TARGET      0x10ff
+#define STK_MASK_MEM_END_OR_MARK     0x8000  /* MEM_END or MEM_END_MARK */
 
 #ifdef USE_MATCH_CACHE
 #define MATCH_ARG_INIT_MATCH_CACHE(msa) do {\
@@ -1061,13 +1174,15 @@ onig_region_copy(OnigRegion* to, const OnigRegion* from)
       stk_base  = stk_alloc;\
       stk       = stk_base;\
       stk_end   = stk_base + msa->stack_n;\
-    } else {\
+    }\
+    else {\
       stk_alloc = (OnigStackType* )xalloca(sizeof(OnigStackType) * (stack_num));\
       stk_base  = stk_alloc;\
       stk       = stk_base;\
       stk_end   = stk_base + (stack_num);\
     }\
-  } else if (msa->stack_p) {\
+  }\
+  else if (msa->stack_p) {\
     alloc_addr = (char* )xalloca(sizeof(OnigStackIndex) * (ptr_num));\
     heap_addr  = NULL;\
     stk_alloc  = (OnigStackType* )(msa->stack_p);\
@@ -1387,6 +1502,15 @@ stack_double(OnigStackType** arg_stk_base, OnigStackType** arg_stk_end,
   STACK_INC;\
 } while(0)
 
+#define STACK_PUSH_MATCH_CACHE_POINT(match_cache_point_index, match_cache_point_mask) do {\
+  STACK_ENSURE(1);\
+  stk->type = STK_MATCH_CACHE_POINT;\
+  stk->null_check = stk == stk_base ? 0 : (stk-1)->null_check;\
+  stk->u.match_cache_point.index = (match_cache_point_index);\
+  stk->u.match_cache_point.mask = (match_cache_point_mask);\
+  STACK_INC;\
+} while(0)
+
 
 #ifdef ONIG_DEBUG
 # define STACK_BASE_CHECK(p, at) \
@@ -1398,6 +1522,43 @@ stack_double(OnigStackType** arg_stk_base, OnigStackType** arg_stk_end,
 # define STACK_BASE_CHECK(p, at)
 #endif
 
+#ifdef ONIG_DEBUG_MATCH_CACHE
+# define MATCH_CACHE_DEBUG_MEMOIZE(stkp) fprintf(stderr, "MATCH CACHE: memoize (index=%ld mask=%d)\n", stkp->u.match_cache_point.index, stkp->u.match_cache_point.mask);
+#else
+# define MATCH_CACHE_DEBUG_MEMOIZE(stkp) ((void) 0)
+#endif
+
+#ifdef USE_MATCH_CACHE
+# define INC_NUM_FAILS msa->num_fails++
+# define MEMOIZE_MATCH_CACHE_POINT do {\
+    if (stk->type == STK_MATCH_CACHE_POINT) {\
+      msa->match_cache_buf[stk->u.match_cache_point.index] |= stk->u.match_cache_point.mask;\
+      MATCH_CACHE_DEBUG_MEMOIZE(stk);\
+    }\
+    else if (stk->type == STK_ATOMIC_MATCH_CACHE_POINT) {\
+      memoize_extended_match_cache_point(msa->match_cache_buf, stk->u.match_cache_point.index, stk->u.match_cache_point.mask);\
+      MATCH_CACHE_DEBUG_MEMOIZE(stkp);\
+    }\
+  } while(0)
+# define MEMOIZE_LOOKAROUND_MATCH_CACHE_POINT(stkp) do {\
+    if (stkp->type == STK_MATCH_CACHE_POINT) {\
+      stkp->type = STK_VOID;\
+      memoize_extended_match_cache_point(msa->match_cache_buf, stkp->u.match_cache_point.index, stkp->u.match_cache_point.mask);\
+      MATCH_CACHE_DEBUG_MEMOIZE(stkp);\
+    }\
+  } while(0)
+# define MEMOIZE_ATOMIC_MATCH_CACHE_POINT do {\
+    if (stk->type == STK_MATCH_CACHE_POINT) {\
+      memoize_extended_match_cache_point(msa->match_cache_buf, stk->u.match_cache_point.index, stk->u.match_cache_point.mask);\
+      MATCH_CACHE_DEBUG_MEMOIZE(stkp);\
+    }\
+  } while(0)
+#else
+# define INC_NUM_FAILS ((void) 0)
+# define MEMOIZE_MATCH_CACHE_POINT ((void) 0)
+# define MEMOIZE_LOOKAROUND_MATCH_CACHE_POINT(stkp) ((void) 0)
+#endif
+
 #define STACK_POP_ONE do {\
   stk--;\
   STACK_BASE_CHECK(stk, "STACK_POP_ONE"); \
@@ -1411,6 +1572,7 @@ stack_double(OnigStackType** arg_stk_base, OnigStackType** arg_stk_end,
       STACK_BASE_CHECK(stk, "STACK_POP"); \
       if ((stk->type & STK_MASK_POP_USED) != 0)  break;\
       ELSE_IF_STATE_CHECK_MARK(stk);\
+      MEMOIZE_MATCH_CACHE_POINT;\
     }\
     break;\
   case STACK_POP_LEVEL_MEM_START:\
@@ -1423,6 +1585,7 @@ stack_double(OnigStackType** arg_stk_base, OnigStackType** arg_stk_end,
         mem_end_stk[stk->u.mem.num]   = stk->u.mem.end;\
       }\
       ELSE_IF_STATE_CHECK_MARK(stk);\
+      MEMOIZE_MATCH_CACHE_POINT;\
     }\
     break;\
   default:\
@@ -1442,6 +1605,7 @@ stack_double(OnigStackType** arg_stk_base, OnigStackType** arg_stk_end,
         mem_end_stk[stk->u.mem.num]   = stk->u.mem.end;\
       }\
       ELSE_IF_STATE_CHECK_MARK(stk);\
+      MEMOIZE_MATCH_CACHE_POINT;\
     }\
     break;\
   }\
@@ -1463,7 +1627,11 @@ stack_double(OnigStackType** arg_stk_base, OnigStackType** arg_stk_end,
       mem_start_stk[stk->u.mem.num] = stk->u.mem.start;\
       mem_end_stk[stk->u.mem.num]   = stk->u.mem.end;\
     }\
+    else if (IS_TO_VOID_TARGET(stk)) {\
+      INC_NUM_FAILS;\
+    }\
     ELSE_IF_STATE_CHECK_MARK(stk);\
+    MEMOIZE_LOOKAROUND_MATCH_CACHE_POINT(stk);\
   }\
 } while(0)
 
@@ -1520,12 +1688,14 @@ stack_double(OnigStackType** arg_stk_base, OnigStackType** arg_stk_end,
     k--;\
     STACK_BASE_CHECK(k, "STACK_POS_END"); \
     if (IS_TO_VOID_TARGET(k)) {\
+      INC_NUM_FAILS;\
       k->type = STK_VOID;\
     }\
     else if (k->type == STK_POS) {\
       k->type = STK_VOID;\
       break;\
     }\
+    MEMOIZE_LOOKAROUND_MATCH_CACHE_POINT(k);\
   }\
 } while(0)
 
@@ -1535,12 +1705,28 @@ stack_double(OnigStackType** arg_stk_base, OnigStackType** arg_stk_end,
     k--;\
     STACK_BASE_CHECK(k, "STACK_STOP_BT_END"); \
     if (IS_TO_VOID_TARGET(k)) {\
+      INC_NUM_FAILS;\
       k->type = STK_VOID;\
     }\
     else if (k->type == STK_STOP_BT) {\
       k->type = STK_VOID;\
       break;\
     }\
+    else if (k->type == STK_MATCH_CACHE_POINT) {\
+      k->type = STK_ATOMIC_MATCH_CACHE_POINT;\
+    }\
+  }\
+} while(0)
+
+#define STACK_STOP_BT_FAIL do {\
+  while (1) {\
+    stk--;\
+    STACK_BASE_CHECK(stk, "STACK_STOP_BT_END"); \
+    if (stk->type == STK_STOP_BT) {\
+      stk->type = STK_VOID;\
+      break;\
+    }\
+    MEMOIZE_ATOMIC_MATCH_CACHE_POINT;\
   }\
 } while(0)
 
@@ -1579,7 +1765,7 @@ stack_double(OnigStackType** arg_stk_base, OnigStackType** arg_stk_end,
   }\
 } while(0)
 
-#define STACK_NULL_CHECK_MEMST(isnull,ischange,id,s,reg) do {\
+#define STACK_NULL_CHECK_MEMST(isnull,id,s,reg) do {\
   OnigStackType* k = STACK_AT((stk-1)->null_check)+1;\
   while (1) {\
     k--;\
@@ -1596,14 +1782,14 @@ stack_double(OnigStackType** arg_stk_base, OnigStackType** arg_stk_end,
           while (k < stk) {\
             if (k->type == STK_MEM_START) {\
               if (k->u.mem.end == INVALID_STACK_INDEX) {\
-                (isnull) = 0; (ischange) = 1; break;\
+                (isnull) = 0; break;\
               }\
               if (BIT_STATUS_AT(reg->bt_mem_end, k->u.mem.num))\
                 endp = STACK_AT(k->u.mem.end)->u.mem.pstr;\
               else\
                 endp = (UChar* )k->u.mem.end;\
               if (STACK_AT(k->u.mem.start)->u.mem.pstr != endp) {\
-                (isnull) = 0; (ischange) = 1; break;\
+                (isnull) = 0; break;\
               }\
               else if (endp != s) {\
                 (isnull) = -1; /* empty, but position changed */ \
@@ -1775,6 +1961,19 @@ static int string_cmp_ic(OnigEncoding enc, int case_fold_flag,
 # define ABSENT_END_POS        end
 #endif /* USE_MATCH_RANGE_MUST_BE_INSIDE_OF_SPECIFIED_RANGE */
 
+int onigenc_mbclen_approximate(const OnigUChar* p,const OnigUChar* e, const struct OnigEncodingTypeST* enc);
+
+static inline int
+enclen_approx(OnigEncoding enc, const OnigUChar* p, const OnigUChar* e)
+{
+    if (enc->max_enc_len == enc->min_enc_len) {
+        return (p < e ? enc->min_enc_len : 0);
+    }
+    else {
+        return onigenc_mbclen_approximate(p, e, enc);
+    }
+}
+
 
 #ifdef USE_CAPTURE_HISTORY
 static int
@@ -2008,6 +2207,7 @@ stack_type_str(int stack_type)
     case STK_VOID:		return "Void  ";
     case STK_ABSENT_POS:	return "AbsPos";
     case STK_ABSENT:		return "Absent";
+    case STK_MATCH_CACHE_POINT:	return "MCache";
     default:			return "      ";
   }
 }
@@ -2029,7 +2229,7 @@ bsearch_cache_opcodes(const OnigCacheOpcode *cache_opcodes, long num_cache_opcod
 }
 
 static long
-find_cache_point(regex_t* reg, const OnigCacheOpcode* cache_opcodes, long num_cache_opcodes, const UChar* p, const OnigStackType *stk, const OnigStackIndex *repeat_stk)
+find_cache_point(regex_t* reg, const OnigCacheOpcode* cache_opcodes, long num_cache_opcodes, const UChar* p, const OnigStackType *stk, const OnigStackIndex *repeat_stk, const OnigCacheOpcode **cache_opcode_ptr)
 {
   long m;
   const OnigCacheOpcode* cache_opcode;
@@ -2048,6 +2248,7 @@ find_cache_point(regex_t* reg, const OnigCacheOpcode* cache_opcodes, long num_ca
   }
 
   cache_opcode = &cache_opcodes[m];
+  *cache_opcode_ptr = &cache_opcodes[m];
   cache_point = cache_opcode->cache_point;
   if (cache_opcode->outer_repeat_mem == -1) {
     return cache_point;
@@ -2079,54 +2280,29 @@ find_cache_point(regex_t* reg, const OnigCacheOpcode* cache_opcodes, long num_ca
     cache_point;
 }
 
-static void
-reset_match_cache_on_null_check(regex_t* reg, const UChar* pstart, const UChar* pend, long pos, uint8_t* match_cache_buf, const OnigCacheOpcode* cache_opcodes, long num_cache_opcodes, long num_cache_points, const OnigStackType *stk, const OnigStackIndex *repeat_stk)
+static int
+check_extended_match_cache_point(uint8_t *match_cache_buf, long match_cache_point_index, uint8_t match_cache_point_mask)
 {
-  long cache_point_start, cache_point_end;
-  long match_cache_point_start, match_cache_point_end;
-  long match_cache_point_start_index, match_cache_point_end_index;
-  uint8_t match_cache_point_start_bit, match_cache_point_end_bit;
-
-#ifdef ONIG_DEBUG_MATCH_CACHE
-  fprintf(stderr, "MATCH CACHE: reset start=%p end=%p pos=%ld cache_opcodes=%p num_cache_opcodes=%ld\n", pstart, pend, pos, cache_opcodes, num_cache_opcodes);
-#endif
-
-  cache_point_start = find_cache_point(reg, cache_opcodes, num_cache_opcodes, pstart, stk, repeat_stk);
-  cache_point_end = find_cache_point(reg, cache_opcodes, num_cache_opcodes, pend, stk, repeat_stk);
-  // Skip to reset if `pstart` or `pend` is not found.
-  // This situation occurs when there is no cache point
-  // between OP_NULL_CHECK_START and OP_NULL_CHECK_END_MEMST.
-  if (cache_point_start == -1 || cache_point_end == -1) return;
-
-  match_cache_point_start = pos * num_cache_points + cache_point_start;
-  match_cache_point_end = pos * num_cache_points + cache_point_end;
-  match_cache_point_start_index = match_cache_point_start >> 3;
-  match_cache_point_end_index = match_cache_point_end >> 3;
-  match_cache_point_start_bit = match_cache_point_start & 7;
-  match_cache_point_end_bit = match_cache_point_end & 7;
-
-#ifdef ONIG_DEBUG_MATCH_CACHE
-  fprintf(stderr, "MATCH CACHE: reset start %ld (%ld index=%ld bit=%d)\n", match_cache_point_start, cache_point_start, match_cache_point_start_index, match_cache_point_start_bit);
-  fprintf(stderr, "MATCH CACHE: reset end   %ld (%ld index=%ld bit=%d)\n", match_cache_point_end, cache_point_end, match_cache_point_end_index, match_cache_point_end_bit);
-#endif
+  if (match_cache_point_mask & 0x80) {
+    return (match_cache_buf[match_cache_point_index + 1] & 0x01) > 0;
+  }
+  else {
+    return (match_cache_buf[match_cache_point_index] & (match_cache_point_mask << 1)) > 0;
+  }
+}
 
-  if (match_cache_point_start_index == match_cache_point_end_index) {
-    match_cache_buf[match_cache_point_start_index] &=
-      (((1 << (8 - match_cache_point_end_bit - 1)) - 1) << (match_cache_point_end_bit + 1)) |
-      ((1 << match_cache_point_start_bit) - 1);
-  } else {
-    if (match_cache_point_start_bit) {
-      match_cache_buf[match_cache_point_start_index] &= (1 << (match_cache_point_start_bit - 1)) - 1;
-      match_cache_point_start_index++;
-    }
-    if (match_cache_point_start_index < match_cache_point_end_index) {
-      xmemset(&match_cache_buf[match_cache_point_start_index], 0, match_cache_point_end_index - match_cache_point_start_index);
-      if (match_cache_point_end_bit) {
-	match_cache_buf[match_cache_point_end_index] &= (((1 << (8 - match_cache_point_end_bit - 1)) - 1) << (match_cache_point_end_bit + 1));
-      }
-    }
+static void
+memoize_extended_match_cache_point(uint8_t *match_cache_buf, long match_cache_point_index, uint8_t match_cache_point_mask)
+{
+  match_cache_buf[match_cache_point_index] |= match_cache_point_mask;
+  if (match_cache_point_mask & 0x80) {
+    match_cache_buf[match_cache_point_index + 1] |= 0x01;
+  }
+  else {
+    match_cache_buf[match_cache_point_index] |= match_cache_point_mask << 1;
   }
 }
+
 #endif /* USE_MATCH_CACHE */
 
 /* match data(str - end) from position (sstart). */
@@ -2154,7 +2330,7 @@ match_at(regex_t* reg, const UChar* str, const UChar* end,
   UChar *pkeep;
   char *alloca_base;
   char *xmalloc_base = NULL;
-  OnigStackType *stk_alloc, *stk_base, *stk, *stk_end;
+  OnigStackType *stk_alloc, *stk_base = NULL, *stk, *stk_end;
   OnigStackType *stkp; /* used as any purpose. */
   OnigStackIndex si;
   OnigStackIndex *repeat_stk;
@@ -2445,19 +2621,37 @@ match_at(regex_t* reg, const UChar* str, const UChar* end,
 #define MATCH_CACHE_DEBUG_HIT ((void) 0)
 #endif
 
+#define MATCH_CACHE_HIT ((void) 0)
+
 #  define CHECK_MATCH_CACHE do {\
   if (msa->match_cache_status == MATCH_CACHE_STATUS_ENABLED) {\
-    long cache_point = find_cache_point(reg, msa->cache_opcodes, msa->num_cache_opcodes, pbegin, stk_base, repeat_stk);\
+    const OnigCacheOpcode *cache_opcode;\
+    long cache_point = find_cache_point(reg, msa->cache_opcodes, msa->num_cache_opcodes, pbegin, stk_base, repeat_stk, &cache_opcode);\
     if (cache_point >= 0) {\
       long match_cache_point = msa->num_cache_points * (long)(s - str) + cache_point;\
       long match_cache_point_index = match_cache_point >> 3;\
       uint8_t match_cache_point_mask = 1 << (match_cache_point & 7);\
       MATCH_CACHE_DEBUG;\
       if (msa->match_cache_buf[match_cache_point_index] & match_cache_point_mask) {\
-	MATCH_CACHE_DEBUG_HIT;\
-	goto fail;\
+	MATCH_CACHE_DEBUG_HIT; MATCH_CACHE_HIT;\
+	if (cache_opcode->lookaround_nesting == 0) goto fail;\
+	else if (cache_opcode->lookaround_nesting < 0) {\
+	  if (check_extended_match_cache_point(msa->match_cache_buf, match_cache_point_index, match_cache_point_mask)) {\
+            STACK_STOP_BT_FAIL;\
+            goto fail;\
+          }\
+          else goto fail;\
+        }\
+        else {\
+	  if (check_extended_match_cache_point(msa->match_cache_buf, match_cache_point_index, match_cache_point_mask)) {\
+	    p = cache_opcode->match_addr;\
+            MOP_OUT;\
+            JUMP;\
+          }\
+          else goto fail;\
+        }\
       }\
-      msa->match_cache_buf[match_cache_point_index] |= match_cache_point_mask;\
+      STACK_PUSH_MATCH_CACHE_POINT(match_cache_point_index, match_cache_point_mask);\
     }\
   }\
 } while (0)
@@ -2769,7 +2963,7 @@ match_at(regex_t* reg, const UChar* str, const UChar* end,
 	int mb_len;
 
 	DATA_ENSURE(1);
-	mb_len = enclen(encode, s, end);
+	mb_len = enclen_approx(encode, s, end);
 	DATA_ENSURE(mb_len);
 	ss = s;
 	s += mb_len;
@@ -2874,7 +3068,7 @@ match_at(regex_t* reg, const UChar* str, const UChar* end,
 
     CASE(OP_ANYCHAR)  MOP_IN(OP_ANYCHAR);
       DATA_ENSURE(1);
-      n = enclen(encode, s, end);
+      n = enclen_approx(encode, s, end);
       DATA_ENSURE(n);
       if (ONIGENC_IS_MBC_NEWLINE_EX(encode, s, str, end, option, 0)) goto fail;
       s += n;
@@ -2883,7 +3077,7 @@ match_at(regex_t* reg, const UChar* str, const UChar* end,
 
     CASE(OP_ANYCHAR_ML)  MOP_IN(OP_ANYCHAR_ML);
       DATA_ENSURE(1);
-      n = enclen(encode, s, end);
+      n = enclen_approx(encode, s, end);
       DATA_ENSURE(n);
       s += n;
       MOP_OUT;
@@ -2893,7 +3087,7 @@ match_at(regex_t* reg, const UChar* str, const UChar* end,
       while (DATA_ENSURE_CHECK1) {
 	CHECK_MATCH_CACHE;
 	STACK_PUSH_ALT(p, s, sprev, pkeep);
-	n = enclen(encode, s, end);
+	n = enclen_approx(encode, s, end);
 	DATA_ENSURE(n);
 	if (ONIGENC_IS_MBC_NEWLINE_EX(encode, s, str, end, option, 0))  goto fail;
 	sprev = s;
@@ -2906,7 +3100,7 @@ match_at(regex_t* reg, const UChar* str, const UChar* end,
       while (DATA_ENSURE_CHECK1) {
 	CHECK_MATCH_CACHE;
 	STACK_PUSH_ALT(p, s, sprev, pkeep);
-	n = enclen(encode, s, end);
+	n = enclen_approx(encode, s, end);
 	if (n > 1) {
 	  DATA_ENSURE(n);
 	  sprev = s;
@@ -2932,7 +3126,7 @@ match_at(regex_t* reg, const UChar* str, const UChar* end,
 	  msa->num_fails++;
 #endif
 	}
-	n = enclen(encode, s, end);
+	n = enclen_approx(encode, s, end);
 	DATA_ENSURE(n);
 	if (ONIGENC_IS_MBC_NEWLINE_EX(encode, s, str, end, option, 0))  goto fail;
 	sprev = s;
@@ -2954,7 +3148,7 @@ match_at(regex_t* reg, const UChar* str, const UChar* end,
 	  msa->num_fails++;
 #endif
 	}
-	n = enclen(encode, s, end);
+	n = enclen_approx(encode, s, end);
 	if (n > 1) {
 	  DATA_ENSURE(n);
 	  sprev = s;
@@ -2977,7 +3171,7 @@ match_at(regex_t* reg, const UChar* str, const UChar* end,
 	if (scv) goto fail;
 
 	STACK_PUSH_ALT_WITH_STATE_CHECK(p, s, sprev, mem, pkeep);
-	n = enclen(encode, s, end);
+	n = enclen_approx(encode, s, end);
 	DATA_ENSURE(n);
 	if (ONIGENC_IS_MBC_NEWLINE_EX(encode, s, str, end, option, 0))  goto fail;
 	sprev = s;
@@ -2995,7 +3189,7 @@ match_at(regex_t* reg, const UChar* str, const UChar* end,
 	if (scv) goto fail;
 
 	STACK_PUSH_ALT_WITH_STATE_CHECK(p, s, sprev, mem, pkeep);
-	n = enclen(encode, s, end);
+	n = enclen_approx(encode, s, end);
 	if (n > 1) {
 	  DATA_ENSURE(n);
 	  sprev = s;
@@ -3282,8 +3476,8 @@ match_at(regex_t* reg, const UChar* str, const UChar* end,
     CASE(OP_MEMORY_END_PUSH_REC)  MOP_IN(OP_MEMORY_END_PUSH_REC);
       GET_MEMNUM_INC(mem, p);
       STACK_GET_MEM_START(mem, stkp); /* should be before push mem-end. */
-      STACK_PUSH_MEM_END(mem, s);
       mem_start_stk[mem] = GET_STACK_INDEX(stkp);
+      STACK_PUSH_MEM_END(mem, s);
       MOP_OUT;
       JUMP;
 
@@ -3337,7 +3531,7 @@ match_at(regex_t* reg, const UChar* str, const UChar* end,
 	DATA_ENSURE(n);
 	sprev = s;
 	STRING_CMP(pstart, s, n);
-	while (sprev + (len = enclen(encode, sprev, end)) < s)
+	while (sprev + (len = enclen_approx(encode, sprev, end)) < s)
 	  sprev += len;
 
 	MOP_OUT;
@@ -3367,8 +3561,8 @@ match_at(regex_t* reg, const UChar* str, const UChar* end,
 	n = pend - pstart;
 	DATA_ENSURE(n);
 	sprev = s;
-	STRING_CMP_IC(case_fold_flag, pstart, &s, (int)n, end);
-	while (sprev + (len = enclen(encode, sprev, end)) < s)
+	STRING_CMP_IC(case_fold_flag, pstart, &s, n, end);
+	while (sprev + (len = enclen_approx(encode, sprev, end)) < s)
 	  sprev += len;
 
 	MOP_OUT;
@@ -3403,7 +3597,7 @@ match_at(regex_t* reg, const UChar* str, const UChar* end,
 	  STRING_CMP_VALUE(pstart, swork, n, is_fail);
 	  if (is_fail) continue;
 	  s = swork;
-	  while (sprev + (len = enclen(encode, sprev, end)) < s)
+	  while (sprev + (len = enclen_approx(encode, sprev, end)) < s)
 	    sprev += len;
 
 	  p += (SIZE_MEMNUM * (tlen - i - 1));
@@ -3538,10 +3732,9 @@ match_at(regex_t* reg, const UChar* str, const UChar* end,
     CASE(OP_NULL_CHECK_END_MEMST)  MOP_IN(OP_NULL_CHECK_END_MEMST);
       {
 	int isnull;
-	int ischanged = 0; // set 1 when a loop is empty but memory status is changed.
 
 	GET_MEMNUM_INC(mem, p); /* mem: null check id */
-	STACK_NULL_CHECK_MEMST(isnull, ischanged, mem, s, reg);
+	STACK_NULL_CHECK_MEMST(isnull, mem, s, reg);
 	if (isnull) {
 # ifdef ONIG_DEBUG_MATCH
 	  fprintf(stderr, "NULL_CHECK_END_MEMST: skip  id:%d, s:%"PRIuPTR" (%p)\n",
@@ -3550,31 +3743,6 @@ match_at(regex_t* reg, const UChar* str, const UChar* end,
 	  if (isnull == -1) goto fail;
 	  goto null_check_found;
 	}
-# ifdef USE_MATCH_CACHE
-	if (ischanged && msa->match_cache_status == MATCH_CACHE_STATUS_ENABLED) {
-	  RelAddrType rel;
-	  OnigUChar *null_check_start;
-	  OnigUChar *null_check_end = pbegin;
-	  MemNumType mem;
-	  UChar* tmp = p;
-	  switch (*tmp++) {
-	  case OP_JUMP:
-	  case OP_PUSH:
-	    GET_RELADDR_INC(rel, tmp);
-	    null_check_start = tmp + rel;
-	    break;
-	  case OP_REPEAT_INC:
-	  case OP_REPEAT_INC_NG:
-	    GET_MEMNUM_INC(mem, tmp);
-	    // Skip OP_REPEAT (or OP_REPEAT_NG)
-	    null_check_start = STACK_AT(repeat_stk[mem])->u.repeat.pcode;
-	    break;
-	  default:
-	    goto unexpected_bytecode_error;
-	  }
-	  reset_match_cache_on_null_check(reg, null_check_start, null_check_end, (long)(s - str), msa->match_cache_buf, msa->cache_opcodes, msa->num_cache_opcodes, msa->num_cache_points, stk_base, repeat_stk);
-	}
-# endif
       }
       MOP_OUT;
       JUMP;
@@ -3683,14 +3851,15 @@ match_at(regex_t* reg, const UChar* str, const UChar* end,
 
     CASE(OP_PUSH_IF_PEEK_NEXT)  MOP_IN(OP_PUSH_IF_PEEK_NEXT);
       GET_RELADDR_INC(addr, p);
+      CHECK_MATCH_CACHE;
       if (*p == *s) {
 	p++;
-	CHECK_MATCH_CACHE;
 	STACK_PUSH_ALT(p + addr, s, sprev, pkeep);
 	MOP_OUT;
 	JUMP;
       }
       p++;
+      INC_NUM_FAILS;
       MOP_OUT;
       JUMP;
 
@@ -3740,9 +3909,15 @@ match_at(regex_t* reg, const UChar* str, const UChar* end,
 	/* end of repeat. Nothing to do. */
       }
       else if (stkp->u.repeat.count >= reg->repeat_range[mem].lower) {
+#ifdef USE_MATCH_CACHE
 	if (*pbegin == OP_REPEAT_INC) {
+#undef MATCH_CACHE_HIT
+#define MATCH_CACHE_HIT stkp->u.repeat.count--;
 	  CHECK_MATCH_CACHE;
+#undef MATCH_CACHE_HIT
+#define MATCH_CACHE_HIT ((void) 0)
 	}
+#endif
 	STACK_PUSH_ALT(p, s, sprev, pkeep);
 	p = STACK_AT(si)->u.repeat.pcode; /* Don't use stkp after PUSH. */
       }
@@ -4002,7 +4177,7 @@ match_at(regex_t* reg, const UChar* str, const UChar* end,
 	  fprintf(stderr, "MATCH CACHE: #cache points = %ld\n", msa->num_cache_points);
 	  fprintf(stderr, "MATCH CACHE: cache opcodes (%p):\n", msa->cache_opcodes);
 	  for (int i = 0; i < msa->num_cache_opcodes; i++) {
-	    fprintf(stderr, "MATCH CACHE:   [%p] cache_point=%ld outer_repeat_mem=%d num_cache_opcodes_at_outer_repeat=%ld num_cache_opcodes_in_outer_repeat=%ld\n", msa->cache_opcodes[i].addr, msa->cache_opcodes[i].cache_point, msa->cache_opcodes[i].outer_repeat_mem, msa->cache_opcodes[i].num_cache_points_at_outer_repeat, msa->cache_opcodes[i].num_cache_points_in_outer_repeat);
+	    fprintf(stderr, "MATCH CACHE:   [%p] cache_point=%ld outer_repeat_mem=%d num_cache_opcodes_at_outer_repeat=%ld num_cache_opcodes_in_outer_repeat=%ld lookaround_nesting=%d match_addr=%p\n", msa->cache_opcodes[i].addr, msa->cache_opcodes[i].cache_point, msa->cache_opcodes[i].outer_repeat_mem, msa->cache_opcodes[i].num_cache_points_at_outer_repeat, msa->cache_opcodes[i].num_cache_points_in_outer_repeat, msa->cache_opcodes[i].lookaround_nesting, msa->cache_opcodes[i].match_addr);
 	  }
 #endif
 	}
@@ -4010,7 +4185,7 @@ match_at(regex_t* reg, const UChar* str, const UChar* end,
 	  size_t length = (end - str) + 1;
 	  size_t num_match_cache_points = (size_t)msa->num_cache_points * length;
 #ifdef ONIG_DEBUG_MATCH_CACHE
-	  fprintf(stderr, "MATCH CACHE: #match cache points = %ld (length = %zu)\n", num_match_cache_points, length);
+	  fprintf(stderr, "MATCH CACHE: #match cache points = %zu (length = %zu)\n", num_match_cache_points, length);
 #endif
 	  /* Overflow check */
 	  if (num_match_cache_points / length != (size_t)msa->num_cache_points) {
@@ -4019,7 +4194,7 @@ match_at(regex_t* reg, const UChar* str, const UChar* end,
 	  if (num_match_cache_points >= LONG_MAX_LIMIT) {
 	    return ONIGERR_MEMORY;
 	  }
-	  size_t match_cache_buf_length = (num_match_cache_points >> 3) + (num_match_cache_points & 7 ? 1 : 0);
+	  size_t match_cache_buf_length = (num_match_cache_points >> 3) + (num_match_cache_points & 7 ? 1 : 0) + 1;
 	  uint8_t* match_cache_buf = (uint8_t*)xmalloc(match_cache_buf_length * sizeof(uint8_t));
 	  if (match_cache_buf == NULL) {
 	    return ONIGERR_MEMORY;
@@ -4067,6 +4242,11 @@ match_at(regex_t* reg, const UChar* str, const UChar* end,
   STACK_SAVE;
   xfree(xmalloc_base);
   return ONIGERR_UNEXPECTED_BYTECODE;
+
+ timeout:
+  STACK_SAVE;
+  xfree(xmalloc_base);
+  return ONIGERR_TIMEOUT;
 }
 
 
@@ -4767,12 +4947,17 @@ forward_search_range(regex_t* reg, const UChar* str, const UChar* end, UChar* s,
 		     UChar* range, UChar** low, UChar** high, UChar** low_prev)
 {
   UChar *p, *pprev = (UChar* )NULL;
+  size_t input_len = end - str;
 
 #ifdef ONIG_DEBUG_SEARCH
   fprintf(stderr, "forward_search_range: str: %"PRIuPTR" (%p), end: %"PRIuPTR" (%p), s: %"PRIuPTR" (%p), range: %"PRIuPTR" (%p)\n",
 	  (uintptr_t )str, str, (uintptr_t )end, end, (uintptr_t )s, s, (uintptr_t )range, range);
 #endif
 
+  if (reg->dmin > input_len) {
+    return 0;
+  }
+
   p = s;
   if (reg->dmin > 0) {
     if (ONIGENC_IS_SINGLEBYTE(reg->enc)) {
@@ -4909,6 +5094,11 @@ backward_search_range(regex_t* reg, const UChar* str, const UChar* end,
 		      UChar** low, UChar** high)
 {
   UChar *p;
+  size_t input_len = end - str;
+
+  if (reg->dmin > input_len) {
+    return 0;
+  }
 
   range += reg->dmin;
   p = s;
@@ -5048,44 +5238,64 @@ onig_search_gpos(regex_t* reg, const UChar* str, const UChar* end,
 # ifdef USE_FIND_LONGEST_SEARCH_ALL_OF_RANGE
 #  define MATCH_AND_RETURN_CHECK(upper_range) \
   r = match_at(reg, str, end, (upper_range), s, prev, &msa); \
-  if (r != ONIG_MISMATCH) {\
-    if (r >= 0) {\
-      if (! IS_FIND_LONGEST(reg->options)) {\
-        goto match;\
+  switch (r) { \
+    case ONIG_MISMATCH: \
+      break; \
+    case ONIGERR_TIMEOUT: \
+      goto timeout; \
+    default: \
+      if (r >= 0) { \
+        if (! IS_FIND_LONGEST(reg->options)) { \
+          goto match; \
+        }\
       }\
-    }\
-    else goto finish; /* error */ \
+      else goto finish; /* error */ \
   }
 # else
 #  define MATCH_AND_RETURN_CHECK(upper_range) \
   r = match_at(reg, str, end, (upper_range), s, prev, &msa); \
-  if (r != ONIG_MISMATCH) {\
-    if (r >= 0) {\
-      goto match;\
-    }\
-    else goto finish; /* error */ \
+  switch (r) { \
+    case ONIG_MISMATCH: \
+      break; \
+    case ONIGERR_TIMEOUT: \
+      goto timeout; \
+    default: \
+      if (r >= 0) { \
+        goto match; \
+      }\
+      else goto finish; /* error */ \
   }
 # endif /* USE_FIND_LONGEST_SEARCH_ALL_OF_RANGE */
 #else
 # ifdef USE_FIND_LONGEST_SEARCH_ALL_OF_RANGE
 #  define MATCH_AND_RETURN_CHECK(none) \
   r = match_at(reg, str, end, s, prev, &msa);\
-  if (r != ONIG_MISMATCH) {\
-    if (r >= 0) {\
-      if (! IS_FIND_LONGEST(reg->options)) {\
-        goto match;\
-      }\
-    }\
-    else goto finish; /* error */ \
+  switch (r) { \
+    case ONIG_MISMATCH: \
+      break; \
+    case ONIGERR_TIMEOUT: \
+      goto timeout; \
+    default: \
+      if (r >= 0) { \
+        if (! IS_FIND_LONGEST(reg->options)) { \
+          goto match; \
+        } \
+      } \
+      else goto finish; /* error */ \
   }
 # else
 #  define MATCH_AND_RETURN_CHECK(none) \
   r = match_at(reg, str, end, s, prev, &msa);\
-  if (r != ONIG_MISMATCH) {\
-    if (r >= 0) {\
-      goto match;\
-    }\
-    else goto finish; /* error */ \
+  switch (r) { \
+    case ONIG_MISMATCH: \
+      break; \
+    case ONIGERR_TIMEOUT: \
+      goto timeout; \
+    default: \
+    if (r >= 0) { \
+        goto match; \
+      } \
+      else goto finish; /* error */ \
   }
 # endif /* USE_FIND_LONGEST_SEARCH_ALL_OF_RANGE */
 #endif /* USE_MATCH_RANGE_MUST_BE_INSIDE_OF_SPECIFIED_RANGE */
@@ -5388,6 +5598,10 @@ onig_search_gpos(regex_t* reg, const UChar* str, const UChar* end,
  match:
   MATCH_ARG_FREE(msa);
   return s - str;
+
+timeout:
+  MATCH_ARG_FREE(msa);
+  return ONIGERR_TIMEOUT;
 }
 
 extern OnigPosition
diff --git a/regint.h b/regint.h
index 650d615c640d00..75abfba235790c 100644
--- a/regint.h
+++ b/regint.h
@@ -154,12 +154,14 @@
 #ifdef RUBY
 
 # define CHECK_INTERRUPT_IN_MATCH_AT do { \
-  msa->counter++;                         \
-  if (msa->counter >= 128) {              \
-    msa->counter = 0;                     \
-    rb_reg_check_timeout(reg, &msa->end_time);  \
-    rb_thread_check_ints();               \
-  }                                       \
+  msa->counter++; \
+  if (msa->counter >= 128) { \
+    msa->counter = 0; \
+    if (rb_reg_timeout_p(reg, &msa->end_time)) { \
+      goto timeout; \
+    } \
+    rb_thread_check_ints(); \
+  } \
 } while(0)
 # define onig_st_init_table                  st_init_table
 # define onig_st_init_table_with_size        st_init_table_with_size
@@ -873,6 +875,12 @@ typedef struct _OnigStackType {
       UChar *abs_pstr;        /* absent start position */
       const UChar *end_pstr;  /* end position */
     } absent_pos;
+#ifdef USE_MATCH_CACHE
+    struct {
+      long    index;      /* index of the match cache buffer */
+      uint8_t mask;       /* bit-mask for the match cache buffer */
+    } match_cache_point;
+#endif
   } u;
 } OnigStackType;
 
@@ -883,6 +891,8 @@ typedef struct {
   int outer_repeat_mem;
   long num_cache_points_at_outer_repeat;
   long num_cache_points_in_outer_repeat;
+  int lookaround_nesting;
+  UChar *match_addr;
 } OnigCacheOpcode;
 #endif
 
@@ -988,7 +998,7 @@ extern int onig_st_insert_strend(hash_table_type* table, const UChar* str_key, c
 #ifdef RUBY
 extern size_t onig_memsize(const regex_t *reg);
 extern size_t onig_region_memsize(const struct re_registers *regs);
-void rb_reg_check_timeout(regex_t *reg, void *end_time);
+bool rb_reg_timeout_p(regex_t *reg, void *end_time);
 #endif
 
 RUBY_SYMBOL_EXPORT_END
diff --git a/regparse.c b/regparse.c
index e5796b287581d7..7b2bc7eea86f2f 100644
--- a/regparse.c
+++ b/regparse.c
@@ -251,7 +251,7 @@ bitset_copy(BitSetRef dest, BitSetRef bs)
 
 #if defined(USE_NAMED_GROUP) && !defined(USE_ST_LIBRARY)
 extern int
-onig_strncmp(const UChar* s1, const UChar* s2, int n)
+onig_strncmp(const UChar* s1, const UChar* s2, size_t n)
 {
   int x;
 
@@ -275,7 +275,7 @@ onig_strcpy(UChar* dest, const UChar* src, const UChar* end)
 
 #ifdef USE_NAMED_GROUP
 static UChar*
-strdup_with_null(OnigEncoding enc, UChar* s, UChar* end)
+strdup_with_null(OnigEncoding enc, const UChar* s, const UChar* end)
 {
   ptrdiff_t slen;
   int term_len, i;
@@ -476,8 +476,10 @@ typedef st_data_t HashDataType;   /* 1.6 st.h doesn't define st_data_t type */
 
 #  ifdef ONIG_DEBUG
 static int
-i_print_name_entry(UChar* key, NameEntry* e, void* arg)
+i_print_name_entry(HashDataType key_, HashDataType e_, HashDataType arg_)
 {
+  NameEntry* e = (NameEntry *)e_;
+  void* arg = (void *)arg_;
   int i;
   FILE* fp = (FILE* )arg;
 
@@ -503,7 +505,7 @@ onig_print_names(FILE* fp, regex_t* reg)
 
   if (IS_NOT_NULL(t)) {
     fprintf(fp, "name table\n");
-    onig_st_foreach(t, (st_foreach_callback_func *)i_print_name_entry, (HashDataType )fp);
+    onig_st_foreach(t, i_print_name_entry, (HashDataType )fp);
     fputs("\n", fp);
   }
   return 0;
@@ -511,8 +513,10 @@ onig_print_names(FILE* fp, regex_t* reg)
 #  endif /* ONIG_DEBUG */
 
 static int
-i_free_name_entry(UChar* key, NameEntry* e, void* arg ARG_UNUSED)
+i_free_name_entry(HashDataType key_, HashDataType e_, HashDataType arg_ ARG_UNUSED)
 {
+  UChar* key = (UChar *)key_;
+  NameEntry* e = (NameEntry *)e_;
   xfree(e->name);
   xfree(e->back_refs);
   xfree(key);
@@ -526,7 +530,7 @@ names_clear(regex_t* reg)
   NameTable* t = (NameTable* )reg->name_table;
 
   if (IS_NOT_NULL(t)) {
-    onig_st_foreach(t, (st_foreach_callback_func *)i_free_name_entry, 0);
+    onig_st_foreach(t, i_free_name_entry, 0);
   }
   return 0;
 }
@@ -546,6 +550,58 @@ onig_names_free(regex_t* reg)
   return 0;
 }
 
+static int
+copy_named_captures_iter(const OnigUChar *name, const OnigUChar *name_end,
+          int back_num, int *back_refs, OnigRegex regex, void *arg)
+{
+    NameTable *copy_table = (NameTable *)arg;
+    NameEntry *entry_copy = (NameEntry* )xmalloc(sizeof(NameEntry));
+    if (IS_NULL(entry_copy)) return -1;
+
+    entry_copy->name_len   = name_end - name;
+    entry_copy->back_num   = back_num;
+    entry_copy->back_alloc = back_num;
+    entry_copy->back_ref1 = back_refs[0];
+    entry_copy->back_refs = xmalloc(back_num * (sizeof(int*)));
+    if (IS_NULL(entry_copy->back_refs)) {
+      xfree(entry_copy);
+      return -1;
+    }
+    memcpy(entry_copy->back_refs, back_refs, back_num * sizeof(back_refs[0]));
+
+    UChar *new_name = strdup_with_null(regex->enc, name, name_end);
+    if (IS_NULL(new_name)) {
+      xfree(entry_copy->back_refs);
+      xfree(entry_copy);
+      return -1;
+    }
+    entry_copy->name = new_name;
+
+    if (onig_st_insert_strend(copy_table, new_name, (new_name + entry_copy->name_len), (hash_data_type)entry_copy)) {
+      xfree(entry_copy->name);
+      xfree(entry_copy->back_refs);
+      xfree(entry_copy);
+      return -1;
+    }
+    return 0;
+}
+
+extern int
+onig_names_copy(regex_t* reg, regex_t* oreg)
+{
+  NameTable* table = oreg->name_table;
+  if (table) {
+    NameTable * t = onig_st_init_strend_table_with_size(onig_number_of_names(oreg));
+    CHECK_NULL_RETURN_MEMERR(t);
+    if (onig_foreach_name(oreg, copy_named_captures_iter, (void*)t)) {
+      onig_st_free_table(t);
+      return ONIGERR_MEMORY;
+    }
+    reg->name_table = t;
+  }
+  return 0;
+}
+
 static NameEntry*
 name_find(regex_t* reg, const UChar* name, const UChar* name_end)
 {
@@ -568,8 +624,10 @@ typedef struct {
 } INamesArg;
 
 static int
-i_names(UChar* key ARG_UNUSED, NameEntry* e, INamesArg* arg)
+i_names(HashDataType key_ ARG_UNUSED, HashDataType e_, HashDataType arg_)
 {
+  NameEntry* e = (NameEntry *)e_;
+  INamesArg* arg = (INamesArg *)arg_;
   int r = (*(arg->func))(e->name,
 			 e->name + e->name_len,
 			 e->back_num,
@@ -595,14 +653,16 @@ onig_foreach_name(regex_t* reg,
     narg.reg  = reg;
     narg.arg  = arg;
     narg.enc  = reg->enc; /* should be pattern encoding. */
-    onig_st_foreach(t, (st_foreach_callback_func *)i_names, (HashDataType )&narg);
+    onig_st_foreach(t, i_names, (HashDataType )&narg);
   }
   return narg.ret;
 }
 
 static int
-i_renumber_name(UChar* key ARG_UNUSED, NameEntry* e, GroupNumRemap* map)
+i_renumber_name(HashDataType key_ ARG_UNUSED, HashDataType e_, HashDataType map_)
 {
+  NameEntry* e = (NameEntry *)e_;
+  GroupNumRemap* map = (GroupNumRemap *)map_;
   int i;
 
   if (e->back_num > 1) {
@@ -623,7 +683,7 @@ onig_renumber_name_table(regex_t* reg, GroupNumRemap* map)
   NameTable* t = (NameTable* )reg->name_table;
 
   if (IS_NOT_NULL(t)) {
-    onig_st_foreach(t, (st_foreach_callback_func *)i_renumber_name, (HashDataType )map);
+    onig_st_foreach(t, i_renumber_name, (HashDataType )map);
   }
   return 0;
 }
@@ -703,10 +763,9 @@ names_clear(regex_t* reg)
 	e->back_refs = (int* )NULL;
       }
     }
-    if (IS_NOT_NULL(t->e)) {
-      xfree(t->e);
-      t->e = NULL;
-    }
+
+    xfree(t->e);
+    t->e = NULL;
     t->num = 0;
   }
   return 0;
@@ -727,10 +786,52 @@ onig_names_free(regex_t* reg)
   return 0;
 }
 
+extern int
+onig_names_copy(regex_t* reg, regex_t* oreg)
+{
+  NameTable* ot = oreg->name_table;
+  if (ot) {
+    OnigEncoding enc = oreg->enc;
+    int i, num = ot->num;
+    NameTable* t = xmalloc(sizeof(*t));
+    CHECK_NULL_RETURN_MEMERR(t);
+    *t = *ot;
+    t->e = xmalloc(t->alloc * sizeof(t->e[0]));
+    if (IS_NULL(t->e)) {
+      xfree(t);
+      return ONIGERR_MEMORY;
+    }
+    t->num = 0;
+    reg->name_table = t;
+    for (i = 0; i < num; t->num = ++i) {
+      NameEntry* oe = &(ot->e[i]);
+      NameEntry* e = &(t->e[i]);
+      *e = *oe;
+      e->name = NULL;
+      e->back_refs = NULL;
+      e->name = strdup_with_null(enc, oe->name, oe->name + e->name_len);
+      if (IS_NULL(e->name)) {
+        onig_names_free(reg);
+        return ONIGERR_MEMORY;
+      }
+      e->back_refs = xmalloc(e->back_alloc * sizeof(e->back_refs[0]));
+      if (IS_NULL(e->back_refs)) {
+        xfree(e->name);
+        onig_names_free(reg);
+        return ONIGERR_MEMORY;
+      }
+      memcpy(e->back_refs, oe->back_refs, e->back_num * sizeof(e->back_refs[0]));
+      e->back_ref1 = e->back_refs[0];
+    }
+  }
+  return 0;
+}
+
 static NameEntry*
 name_find(regex_t* reg, const UChar* name, const UChar* name_end)
 {
-  int i, len;
+  int i;
+  size_t len;
   NameEntry* e;
   NameTable* t = (NameTable* )reg->name_table;
 
@@ -765,6 +866,30 @@ onig_foreach_name(regex_t* reg,
   return 0;
 }
 
+extern int
+onig_renumber_name_table(regex_t* reg, GroupNumRemap* map)
+{
+  int i, j;
+  NameEntry* e;
+  NameTable* t = (NameTable* )reg->name_table;
+
+  if (IS_NOT_NULL(t)) {
+    for (i = 0; i < t->num; i++) {
+      e = &(t->e[i]);
+
+      if (e->back_num > 1) {
+        for (j = 0; j < e->back_num; j++) {
+          e->back_refs[j] = map[e->back_refs[j]].new_val;
+        }
+      }
+      else if (e->back_num == 1) {
+        e->back_ref1 = map[e->back_ref1].new_val;
+      }
+    }
+  }
+  return 0;
+}
+
 extern int
 onig_number_of_names(const regex_t* reg)
 {
@@ -967,6 +1092,12 @@ onig_number_of_names(const regex_t* reg)
 {
   return 0;
 }
+
+extern int
+onig_names_copy(regex_t* reg, regex_t* oreg)
+{
+  return 0;
+}
 #endif /* else USE_NAMED_GROUP */
 
 extern int
@@ -5495,6 +5626,22 @@ clear_not_flag_cclass(CClassNode* cc, OnigEncoding enc)
 }
 #endif /* CASE_FOLD_IS_APPLIED_INSIDE_NEGATIVE_CCLASS */
 
+static inline bool
+is_singlebyte_range(OnigCodePoint code, OnigEncoding enc)
+{
+  /* single byte encoding */
+  if (ONIGENC_MBC_MAXLEN(enc) == 1) {
+    return true;
+  }
+
+  /* wide char encoding */
+  if (ONIGENC_MBC_MINLEN(enc) > 1) {
+    return false;
+  }
+
+  return (code < 0x80);
+}
+
 typedef struct {
   ScanEnv*    env;
   CClassNode* cc;
@@ -5538,31 +5685,31 @@ i_apply_case_fold(OnigCodePoint from, OnigCodePoint to[],
     if ((is_in != 0 && !IS_NCCLASS_NOT(cc)) ||
 	(is_in == 0 &&  IS_NCCLASS_NOT(cc))) {
       if (add_flag) {
-	if (ONIGENC_MBC_MINLEN(env->enc) > 1 || *to >= SINGLE_BYTE_SIZE) {
-	  r = add_code_range0(&(cc->mbuf), env, *to, *to, 0);
-	  if (r < 0) return r;
-	}
-	else {
-	  BITSET_SET_BIT(bs, *to);
-	}
+        if (is_singlebyte_range(*to, env->enc)) {
+          BITSET_SET_BIT(bs, *to);
+        }
+        else {
+          r = add_code_range0(&(cc->mbuf), env, *to, *to, 0);
+          if (r < 0) return r;
+        }
       }
     }
 #else
     if (is_in != 0) {
       if (add_flag) {
-	if (ONIGENC_MBC_MINLEN(env->enc) > 1 || *to >= SINGLE_BYTE_SIZE) {
-	  if (IS_NCCLASS_NOT(cc)) clear_not_flag_cclass(cc, env->enc);
-	  r = add_code_range0(&(cc->mbuf), env, *to, *to, 0);
-	  if (r < 0) return r;
-	}
-	else {
-	  if (IS_NCCLASS_NOT(cc)) {
-	    BITSET_CLEAR_BIT(bs, *to);
-	  }
-	  else {
-	    BITSET_SET_BIT(bs, *to);
-	  }
-	}
+        if (is_singlebyte_range(*to, env->enc)) {
+          if (IS_NCCLASS_NOT(cc)) {
+            BITSET_CLEAR_BIT(bs, *to);
+          }
+          else {
+            BITSET_SET_BIT(bs, *to);
+          }
+        }
+        else {
+          if (IS_NCCLASS_NOT(cc)) clear_not_flag_cclass(cc, env->enc);
+          r = add_code_range0(&(cc->mbuf), env, *to, *to, 0);
+          if (r < 0) return r;
+        }
       }
     }
 #endif /* CASE_FOLD_IS_APPLIED_INSIDE_NEGATIVE_CCLASS */
@@ -5806,19 +5953,21 @@ create_node_from_array(int kind, Node **np, Node **node_array)
  * nodes of the source to NULL_NODE, we can overlap the target array
  * as long as we do not override the actual target location.
  *
- * Target       Array name          Index
+ * Target          Array name          Index
  *
- *              node_array          0 1 2 3 4 5 6 7 8 9 A B C D E F
- * top_alts     alts[5]             0 1 2 3 4*
- * alts+1       list[4]                   0 1 2 3*
- * list+1       core_alts[7]                  0 1 2 3 4 5 6*
- * core_alts+0  H_list[4]                       0 1 2 3*
- * H_list+1     H_alt2[4]                           0 1 2 3*
- * h_alt2+1     H_list2[3]                              0 1 2*
- * core_alts+4  XP_list[4]                              0 1 2 3*
- * XP_list+1    Ex_list[4]                                  0 1 2 3*
+ *                 node_array          0 1 2 3 4 5 6 7 8 9 A B C D E F G H
+ * top_alts        alts[5]             0 1 2 3 4*
+ * alts+2          list[4]                   0 1 2 3*
+ * list+1          core_alts[8]                  0 1 2 3 4 5 6 7*
+ * core_alts+0     H_list[4]                       0 1 2 3*
+ * H_list+1        H_alt2[4]                           0 1 2 3*
+ * H_alt2+1        H_list2[3]                              0 1 2*
+ * core_alts+4     XP_list[3]                              0 1 2*
+ * XP_list+1       Ex_list[4]                                  0 1 2 3*
+ * core_alts+5     CC_list[3]                                0 1 2*
+ * CC_list+1       CC_inner_list[5]                              0 1 2 3 4*
  */
-#define NODE_COMMON_SIZE 16
+#define NODE_COMMON_SIZE 18
 
 static int
 node_extended_grapheme_cluster(Node** np, ScanEnv* env)
@@ -5885,9 +6034,10 @@ node_extended_grapheme_cluster(Node** np, ScanEnv* env)
       /* core := hangul-syllable
        *       | ri-sequence
        *       | xpicto-sequence
+       *       | conjunctCluster
        *       | [^Control CR LF] */
       {
-        Node **core_alts = list + 2; /* size: 7 */
+        Node **core_alts = list + 2; /* size: 8 */
 
         /* hangul-syllable :=
          *     L* (V+ | LV V* | LVT) T*
@@ -5955,10 +6105,49 @@ node_extended_grapheme_cluster(Node** np, ScanEnv* env)
           R_ERR(create_node_from_array(LIST, core_alts+4, XP_list));
         }
 
+        /* conjunctCluster := \p{InCB=Consonant} ([\p{InCB=Extend} \p{InCB=Linker}]* \p{InCB=Linker} [\p{InCB=Extend} \p{InCB=Linker}]* \p{InCB=Consonant})+ */
+        {
+          // \p{InCB=Consonant}
+          Node **CC_list = core_alts + 6; /* size: 3 */
+          R_ERR(create_property_node(CC_list+0, env, "InCB=Consonant"));
+
+          {
+            Node **CC_inner_list = CC_list + 2; /* size: 5 */
+            {
+              // [\p{InCB=Extend} \p{InCB=Linker}]*
+              R_ERR(create_property_node(CC_inner_list+0, env, "InCB=Extend"));
+              R_ERR(add_property_to_cc(NCCLASS(CC_inner_list[0]), "InCB=Linker", 0, env));
+              R_ERR(quantify_node(CC_inner_list+0, 0, REPEAT_INFINITE));
+            }
+
+            // \p{InCB=Linker}
+            R_ERR(create_property_node(CC_inner_list+1, env, "InCB=Linker"));
+
+            {
+              // [\p{InCB=Extend} \p{InCB=Linker}]*
+              R_ERR(create_property_node(CC_inner_list+2, env, "InCB=Extend"));
+              R_ERR(add_property_to_cc(NCCLASS(CC_inner_list[2]), "InCB=Linker", 0, env));
+              R_ERR(quantify_node(CC_inner_list+2, 0, REPEAT_INFINITE));
+            }
+
+            // \p{InCB=Consonant}
+            R_ERR(create_property_node(CC_inner_list+3, env, "InCB=Consonant"));
+
+            // ([\p{InCB=Extend} \p{InCB=Linker}]* \p{InCB=Linker} [\p{InCB=Extend} \p{InCB=Linker}]* \p{InCB=Consonant})
+            R_ERR(create_node_from_array(LIST, CC_list+1, CC_inner_list));
+
+            // (...)+
+            R_ERR(quantify_node(CC_list+1, 1, REPEAT_INFINITE));
+          }
+
+          // \p{InCB=Consonant} ([\p{InCB=Extend} \p{InCB=Linker}]* \p{InCB=Linker} [\p{InCB=Extend} \p{InCB=Linker}]* \p{InCB=Consonant})+
+          R_ERR(create_node_from_array(LIST, core_alts+5, CC_list));
+        }
+
         /* [^Control CR LF] */
-        core_alts[5] = node_new_cclass();
-        if (IS_NULL(core_alts[5])) goto err;
-        cc = NCCLASS(core_alts[5]);
+        core_alts[6] = node_new_cclass();
+        if (IS_NULL(core_alts[6])) goto err;
+        cc = NCCLASS(core_alts[6]);
         if (ONIGENC_MBC_MINLEN(env->enc) > 1) { /* UTF-16/UTF-32 */
           BBuf *inverted_buf = NULL;
 
@@ -5972,7 +6161,8 @@ node_extended_grapheme_cluster(Node** np, ScanEnv* env)
           R_ERR(add_code_range(&(cc->mbuf), env, 0x000A, 0x000A)); /* CR */
           R_ERR(add_code_range(&(cc->mbuf), env, 0x000D, 0x000D)); /* LF */
           R_ERR(not_code_range_buf(env->enc, cc->mbuf, &inverted_buf, env));
-          cc->mbuf = inverted_buf; /* TODO: check what to do with buffer before inversion */
+          bbuf_free(cc->mbuf);
+          cc->mbuf = inverted_buf;
 
           env->warnings_flag &= dup_not_warned; /* TODO: fix false warning */
         }
@@ -6095,7 +6285,8 @@ is_onechar_cclass(CClassNode* cc, OnigCodePoint* code)
     if (b1 != 0) {
       if (((b1 & (b1 - 1)) == 0) && (c == not_found)) {
 	c = BITS_IN_ROOM * i + countbits(b1 - 1);
-      } else {
+      }
+      else {
 	return 0;  /* the character class contains multiple chars */
       }
     }
@@ -6530,7 +6721,7 @@ parse_subexp(Node** top, OnigToken* tok, int term,
 	     UChar** src, UChar* end, ScanEnv* env)
 {
   int r;
-  Node *node, **headp;
+  Node *node, *topnode, **headp;
 
   *top = NULL;
   env->parse_depth++;
@@ -6546,23 +6737,29 @@ parse_subexp(Node** top, OnigToken* tok, int term,
     *top = node;
   }
   else if (r == TK_ALT) {
-    *top  = onig_node_new_alt(node, NULL);
-    headp = &(NCDR(*top));
+    topnode = onig_node_new_alt(node, NULL);
+    headp   = &(NCDR(topnode));
     while (r == TK_ALT) {
       r = fetch_token(tok, src, end, env);
-      if (r < 0) return r;
+      if (r < 0) {
+	onig_node_free(topnode);
+	return r;
+      }
       r = parse_branch(&node, tok, term, src, end, env);
       if (r < 0) {
-	onig_node_free(node);
+	onig_node_free(topnode);
 	return r;
       }
 
       *headp = onig_node_new_alt(node, NULL);
-      headp = &(NCDR(*headp));
+      headp  = &(NCDR(*headp));
     }
 
-    if (tok->type != (enum TokenSyms )term)
+    if (tok->type != (enum TokenSyms )term) {
+      onig_node_free(topnode);
       goto err;
+    }
+    *top = topnode;
   }
   else {
     onig_node_free(node);
diff --git a/regparse.h b/regparse.h
index acdd3e2f5c7e52..de980d0ac8cb1c 100644
--- a/regparse.h
+++ b/regparse.h
@@ -339,7 +339,7 @@ typedef struct {
 extern int    onig_renumber_name_table(regex_t* reg, GroupNumRemap* map);
 #endif
 
-extern int    onig_strncmp(const UChar* s1, const UChar* s2, int n);
+extern int    onig_strncmp(const UChar* s1, const UChar* s2, size_t n);
 extern void   onig_strcpy(UChar* dest, const UChar* src, const UChar* end);
 extern void   onig_scan_env_set_error_string(ScanEnv* env, int ecode, UChar* arg, UChar* arg_end);
 extern int    onig_scan_unsigned_number(UChar** src, const UChar* end, OnigEncoding enc);
@@ -356,6 +356,7 @@ extern Node*  onig_node_list_add(Node* list, Node* x);
 extern Node*  onig_node_new_alt(Node* left, Node* right);
 extern void   onig_node_str_clear(Node* node);
 extern int    onig_names_free(regex_t* reg);
+extern int    onig_names_copy(regex_t* reg, regex_t* oreg);
 extern int    onig_parse_make_tree(Node** root, const UChar* pattern, const UChar* end, regex_t* reg, ScanEnv* env);
 extern int    onig_free_shared_cclass_table(void);
 
diff --git a/rjit.c b/rjit.c
deleted file mode 100644
index 4ce6af4d4b13d6..00000000000000
--- a/rjit.c
+++ /dev/null
@@ -1,477 +0,0 @@
-/**********************************************************************
-
-  rjit.c - Ruby JIT compiler functions
-
-  Copyright (C) 2023 Takashi Kokubun <k0kubun@ruby-lang.org>.
-
-**********************************************************************/
-
-#include "rjit.h" // defines USE_RJIT
-
-#if USE_RJIT
-
-#include "constant.h"
-#include "id_table.h"
-#include "internal.h"
-#include "internal/class.h"
-#include "internal/cmdlineopt.h"
-#include "internal/cont.h"
-#include "internal/file.h"
-#include "internal/hash.h"
-#include "internal/process.h"
-#include "internal/warnings.h"
-#include "vm_sync.h"
-#include "ractor_core.h"
-
-#ifdef __sun
-#define __EXTENSIONS__ 1
-#endif
-
-#include "vm_core.h"
-#include "vm_callinfo.h"
-#include "rjit_c.h"
-#include "ruby_assert.h"
-#include "ruby/debug.h"
-#include "ruby/thread.h"
-#include "ruby/version.h"
-#include "builtin.h"
-#include "insns.inc"
-#include "insns_info.inc"
-#include "internal/compile.h"
-#include "internal/gc.h"
-
-#include <sys/wait.h>
-#include <sys/time.h>
-#include <dlfcn.h>
-#include <errno.h>
-#ifdef HAVE_FCNTL_H
-#include <fcntl.h>
-#endif
-#ifdef HAVE_SYS_PARAM_H
-# include <sys/param.h>
-#endif
-#include "dln.h"
-
-// For mmapp(), sysconf()
-#ifndef _WIN32
-#include <unistd.h>
-#include <sys/mman.h>
-#endif
-
-#include "ruby/util.h"
-
-// A copy of RJIT portion of MRI options since RJIT initialization.  We
-// need them as RJIT threads still can work when the most MRI data were
-// freed.
-struct rb_rjit_options rb_rjit_opts;
-
-// true if RJIT is enabled.
-bool rb_rjit_enabled = false;
-// true if --rjit-stats (used before rb_rjit_opts is set)
-bool rb_rjit_stats_enabled = false;
-// true if --rjit-trace-exits (used before rb_rjit_opts is set)
-bool rb_rjit_trace_exits_enabled = false;
-// true if JIT-ed code should be called. When `ruby_vm_event_enabled_global_flags & ISEQ_TRACE_EVENTS`
-// and `rb_rjit_call_p == false`, any JIT-ed code execution is cancelled as soon as possible.
-bool rb_rjit_call_p = false;
-// A flag to communicate that rb_rjit_call_p should be disabled while it's temporarily false.
-static bool rjit_cancel_p = false;
-
-// `rb_ec_ractor_hooks(ec)->events` is moved to this variable during compilation.
-rb_event_flag_t rb_rjit_global_events = 0;
-
-// Basically rb_rjit_opts.stats, but this becomes false during RJIT compilation.
-static bool rjit_stats_p = false;
-
-// RubyVM::RJIT
-static VALUE rb_mRJIT = 0;
-// RubyVM::RJIT::C
-static VALUE rb_mRJITC = 0;
-// RubyVM::RJIT::Compiler
-static VALUE rb_RJITCompiler = 0;
-// RubyVM::RJIT::CPointer::Struct_rb_iseq_t
-static VALUE rb_cRJITIseqPtr = 0;
-// RubyVM::RJIT::CPointer::Struct_rb_control_frame_t
-static VALUE rb_cRJITCfpPtr = 0;
-// RubyVM::RJIT::Hooks
-static VALUE rb_mRJITHooks = 0;
-
-// Frames for --rjit-trace-exits
-VALUE rb_rjit_raw_samples = 0;
-// Line numbers for --rjit-trace-exits
-VALUE rb_rjit_line_samples = 0;
-
-// A default threshold used to add iseq to JIT.
-#define DEFAULT_CALL_THRESHOLD 10
-// Size of executable memory block in MiB.
-#define DEFAULT_EXEC_MEM_SIZE 64
-
-#define opt_match_noarg(s, l, name) \
-    opt_match(s, l, name) && (*(s) ? (rb_warn("argument to --rjit-" name " is ignored"), 1) : 1)
-#define opt_match_arg(s, l, name) \
-    opt_match(s, l, name) && (*(s) ? 1 : (rb_raise(rb_eRuntimeError, "--rjit-" name " needs an argument"), 0))
-
-void
-rb_rjit_setup_options(const char *s, struct rb_rjit_options *rjit_opt)
-{
-    const size_t l = strlen(s);
-    if (l == 0) {
-        return;
-    }
-    else if (opt_match_arg(s, l, "call-threshold")) {
-        rjit_opt->call_threshold = atoi(s + 1);
-    }
-    else if (opt_match_arg(s, l, "exec-mem-size")) {
-        rjit_opt->exec_mem_size = atoi(s + 1);
-    }
-    else if (opt_match_noarg(s, l, "stats")) {
-        rjit_opt->stats = true;
-    }
-    else if (opt_match_noarg(s, l, "trace-exits")) {
-        rjit_opt->trace_exits = true;
-    }
-    else if (opt_match_noarg(s, l, "dump-disasm")) {
-        rjit_opt->dump_disasm = true;
-    }
-    else if (opt_match_noarg(s, l, "verify-ctx")) {
-        rjit_opt->verify_ctx = true;
-    }
-    // --rjit=pause is an undocumented feature for experiments
-    else if (opt_match_noarg(s, l, "pause")) {
-        rjit_opt->pause = true;
-    }
-    else {
-        rb_raise(rb_eRuntimeError,
-                 "invalid RJIT option `%s' (--help will show valid RJIT options)", s);
-    }
-}
-
-#define M(shortopt, longopt, desc) RUBY_OPT_MESSAGE(shortopt, longopt, desc)
-const struct ruby_opt_message rb_rjit_option_messages[] = {
-    M("--rjit-stats",              "", "Enable collecting RJIT statistics"),
-#if RJIT_STATS
-    M("--rjit-trace-exits",        "", "Trace side exit locations"),
-#endif
-    M("--rjit-exec-mem-size=num",  "", "Size of executable memory block in MiB (default: " STRINGIZE(DEFAULT_EXEC_MEM_SIZE) ")"),
-    M("--rjit-call-threshold=num", "", "Number of calls to trigger JIT (default: " STRINGIZE(DEFAULT_CALL_THRESHOLD) ")"),
-#ifdef HAVE_LIBCAPSTONE
-    M("--rjit-dump-disasm",        "", "Dump all JIT code"),
-#endif
-    {0}
-};
-#undef M
-
-struct rb_rjit_runtime_counters rb_rjit_counters = { 0 };
-
-#if RJIT_STATS
-void
-rb_rjit_collect_vm_usage_insn(int insn)
-{
-    if (!rjit_stats_p) return;
-    rb_rjit_counters.vm_insns_count++;
-}
-#endif // YJIT_STATS
-
-extern VALUE rb_gc_enable(void);
-extern VALUE rb_gc_disable(void);
-
-#define WITH_RJIT_ISOLATED(stmt) do { \
-    VALUE was_disabled = rb_gc_disable(); \
-    rb_hook_list_t *global_hooks = rb_ec_ractor_hooks(GET_EC()); \
-    rb_rjit_global_events = global_hooks->events; \
-    global_hooks->events = 0; \
-    bool original_call_p = rb_rjit_call_p; \
-    rjit_stats_p = false; \
-    rb_rjit_call_p = false; \
-    stmt; \
-    rb_rjit_call_p = (rjit_cancel_p ? false : original_call_p); \
-    rjit_stats_p = rb_rjit_opts.stats; \
-    global_hooks->events = rb_rjit_global_events; \
-    if (!was_disabled) rb_gc_enable(); \
-} while (0);
-
-void
-rb_rjit_cancel_all(const char *reason)
-{
-    if (!rb_rjit_enabled)
-        return;
-
-    rb_rjit_call_p = false;
-    rjit_cancel_p = true;
-}
-
-void
-rb_rjit_bop_redefined(int redefined_flag, enum ruby_basic_operators bop)
-{
-    if (!rb_rjit_call_p) return;
-    rb_rjit_call_p = false;
-}
-
-static void
-rjit_cme_invalidate(void *data)
-{
-    if (!rb_rjit_enabled || !rb_rjit_call_p || !rb_mRJITHooks) return;
-    WITH_RJIT_ISOLATED({
-        rb_funcall(rb_mRJITHooks, rb_intern("on_cme_invalidate"), 1, SIZET2NUM((size_t)data));
-    });
-}
-
-extern int rb_workqueue_register(unsigned flags, rb_postponed_job_func_t func, void *data);
-
-void
-rb_rjit_cme_invalidate(rb_callable_method_entry_t *cme)
-{
-    if (!rb_rjit_enabled || !rb_rjit_call_p || !rb_mRJITHooks) return;
-    // Asynchronously hook the Ruby code since running Ruby in the middle of cme invalidation is dangerous.
-    rb_workqueue_register(0, rjit_cme_invalidate, (void *)cme);
-}
-
-void
-rb_rjit_before_ractor_spawn(void)
-{
-    if (!rb_rjit_call_p) return;
-    rb_rjit_call_p = false;
-}
-
-static void
-rjit_constant_state_changed(void *data)
-{
-    if (!rb_rjit_enabled || !rb_rjit_call_p || !rb_mRJITHooks) return;
-    RB_VM_LOCK_ENTER();
-    rb_vm_barrier();
-
-    WITH_RJIT_ISOLATED({
-        rb_funcall(rb_mRJITHooks, rb_intern("on_constant_state_changed"), 1, SIZET2NUM((size_t)data));
-    });
-
-    RB_VM_LOCK_LEAVE();
-}
-
-void
-rb_rjit_constant_state_changed(ID id)
-{
-    if (!rb_rjit_enabled || !rb_rjit_call_p || !rb_mRJITHooks) return;
-    // Asynchronously hook the Ruby code since this is hooked during a "Ruby critical section".
-    rb_workqueue_register(0, rjit_constant_state_changed, (void *)id);
-}
-
-void
-rb_rjit_constant_ic_update(const rb_iseq_t *const iseq, IC ic, unsigned insn_idx)
-{
-    if (!rb_rjit_enabled || !rb_rjit_call_p || !rb_mRJITHooks) return;
-
-    RB_VM_LOCK_ENTER();
-    rb_vm_barrier();
-
-    WITH_RJIT_ISOLATED({
-        rb_funcall(rb_mRJITHooks, rb_intern("on_constant_ic_update"), 3,
-                   SIZET2NUM((size_t)iseq), SIZET2NUM((size_t)ic), UINT2NUM(insn_idx));
-    });
-
-    RB_VM_LOCK_LEAVE();
-}
-
-void
-rb_rjit_tracing_invalidate_all(rb_event_flag_t new_iseq_events)
-{
-    if (!rb_rjit_enabled || !rb_rjit_call_p || !rb_mRJITHooks) return;
-    WITH_RJIT_ISOLATED({
-        rb_funcall(rb_mRJITHooks, rb_intern("on_tracing_invalidate_all"), 1, UINT2NUM(new_iseq_events));
-    });
-}
-
-static void
-rjit_iseq_update_references(void *data)
-{
-    if (!rb_rjit_enabled || !rb_rjit_call_p || !rb_mRJITHooks) return;
-    WITH_RJIT_ISOLATED({
-        rb_funcall(rb_mRJITHooks, rb_intern("on_update_references"), 0);
-    });
-}
-
-void
-rb_rjit_iseq_update_references(struct rb_iseq_constant_body *const body)
-{
-    if (!rb_rjit_enabled) return;
-
-    if (body->rjit_blocks) {
-        body->rjit_blocks = rb_gc_location(body->rjit_blocks);
-    }
-
-    // Asynchronously hook the Ruby code to avoid allocation during GC.compact.
-    // Using _one because it's too slow to invalidate all for each ISEQ. Thus
-    // not giving an ISEQ pointer.
-    rb_postponed_job_register_one(0, rjit_iseq_update_references, NULL);
-}
-
-void
-rb_rjit_iseq_mark(VALUE rjit_blocks)
-{
-    if (!rb_rjit_enabled) return;
-
-    // Note: This wasn't enough for some reason.
-    // We actually rely on RubyVM::RJIT::GC_REFS to mark this.
-    if (rjit_blocks) {
-        rb_gc_mark_movable(rjit_blocks);
-    }
-}
-
-// Called by rb_vm_mark()
-void
-rb_rjit_mark(void)
-{
-    if (!rb_rjit_enabled)
-        return;
-    RUBY_MARK_ENTER("rjit");
-
-    // Pin object pointers used in this file
-    rb_gc_mark(rb_RJITCompiler);
-    rb_gc_mark(rb_cRJITIseqPtr);
-    rb_gc_mark(rb_cRJITCfpPtr);
-    rb_gc_mark(rb_mRJITHooks);
-    rb_gc_mark(rb_rjit_raw_samples);
-    rb_gc_mark(rb_rjit_line_samples);
-
-    RUBY_MARK_LEAVE("rjit");
-}
-
-void
-rb_rjit_free_iseq(const rb_iseq_t *iseq)
-{
-    // TODO: implement this. GC_REFS should remove this iseq's mjit_blocks
-}
-
-// TODO: Use this in more places
-VALUE
-rb_rjit_iseq_new(rb_iseq_t *iseq)
-{
-    return rb_funcall(rb_cRJITIseqPtr, rb_intern("new"), 1, SIZET2NUM((size_t)iseq));
-}
-
-void
-rb_rjit_compile(const rb_iseq_t *iseq)
-{
-    RB_VM_LOCK_ENTER();
-    rb_vm_barrier();
-
-    WITH_RJIT_ISOLATED({
-        VALUE iseq_ptr = rb_funcall(rb_cRJITIseqPtr, rb_intern("new"), 1, SIZET2NUM((size_t)iseq));
-        VALUE cfp_ptr = rb_funcall(rb_cRJITCfpPtr, rb_intern("new"), 1, SIZET2NUM((size_t)GET_EC()->cfp));
-        rb_funcall(rb_RJITCompiler, rb_intern("compile"), 2, iseq_ptr, cfp_ptr);
-    });
-
-    RB_VM_LOCK_LEAVE();
-}
-
-void *
-rb_rjit_entry_stub_hit(VALUE branch_stub)
-{
-    VALUE result;
-
-    RB_VM_LOCK_ENTER();
-    rb_vm_barrier();
-
-    rb_control_frame_t *cfp = GET_EC()->cfp;
-
-    WITH_RJIT_ISOLATED({
-        VALUE cfp_ptr = rb_funcall(rb_cRJITCfpPtr, rb_intern("new"), 1, SIZET2NUM((size_t)cfp));
-        result = rb_funcall(rb_RJITCompiler, rb_intern("entry_stub_hit"), 2, branch_stub, cfp_ptr);
-    });
-
-    RB_VM_LOCK_LEAVE();
-
-    return (void *)NUM2SIZET(result);
-}
-
-void *
-rb_rjit_branch_stub_hit(VALUE branch_stub, int sp_offset, int target0_p)
-{
-    VALUE result;
-
-    RB_VM_LOCK_ENTER();
-    rb_vm_barrier();
-
-    rb_control_frame_t *cfp = GET_EC()->cfp;
-    cfp->sp += sp_offset; // preserve stack values, also using the actual sp_offset to make jit.peek_at_stack work
-
-    WITH_RJIT_ISOLATED({
-        VALUE cfp_ptr = rb_funcall(rb_cRJITCfpPtr, rb_intern("new"), 1, SIZET2NUM((size_t)cfp));
-        result = rb_funcall(rb_RJITCompiler, rb_intern("branch_stub_hit"), 3, branch_stub, cfp_ptr, RBOOL(target0_p));
-    });
-
-    cfp->sp -= sp_offset; // reset for consistency with the code without the stub
-
-    RB_VM_LOCK_LEAVE();
-
-    return (void *)NUM2SIZET(result);
-}
-
-void
-rb_rjit_init(const struct rb_rjit_options *opts)
-{
-    VM_ASSERT(rb_rjit_enabled);
-
-    // Normalize options
-    rb_rjit_opts = *opts;
-    if (rb_rjit_opts.exec_mem_size == 0)
-        rb_rjit_opts.exec_mem_size = DEFAULT_EXEC_MEM_SIZE;
-    if (rb_rjit_opts.call_threshold == 0)
-        rb_rjit_opts.call_threshold = DEFAULT_CALL_THRESHOLD;
-#ifndef HAVE_LIBCAPSTONE
-    if (rb_rjit_opts.dump_disasm)
-        rb_warn("libcapstone has not been linked. Ignoring --rjit-dump-disasm.");
-#endif
-
-    // RJIT doesn't support miniruby, but it might reach here by RJIT_FORCE_ENABLE.
-    rb_mRJIT = rb_const_get(rb_cRubyVM, rb_intern("RJIT"));
-    if (!rb_const_defined(rb_mRJIT, rb_intern("Compiler"))) {
-        rb_warn("Disabling RJIT because RubyVM::RJIT::Compiler is not defined");
-        rb_rjit_enabled = false;
-        return;
-    }
-    rb_mRJITC = rb_const_get(rb_mRJIT, rb_intern("C"));
-    VALUE rb_cRJITCompiler = rb_const_get(rb_mRJIT, rb_intern("Compiler"));
-    rb_RJITCompiler = rb_funcall(rb_cRJITCompiler, rb_intern("new"), 0);
-    rb_cRJITIseqPtr = rb_funcall(rb_mRJITC, rb_intern("rb_iseq_t"), 0);
-    rb_cRJITCfpPtr = rb_funcall(rb_mRJITC, rb_intern("rb_control_frame_t"), 0);
-    rb_mRJITHooks = rb_const_get(rb_mRJIT, rb_intern("Hooks"));
-    if (rb_rjit_opts.trace_exits) {
-        rb_rjit_raw_samples = rb_ary_new();
-        rb_rjit_line_samples = rb_ary_new();
-    }
-
-    // Enable RJIT and stats from here
-    rb_rjit_call_p = !rb_rjit_opts.pause;
-    rjit_stats_p = rb_rjit_opts.stats;
-}
-
-//
-// Primitive for rjit.rb
-//
-
-// Same as `rb_rjit_opts.stats`, but this is used before rb_rjit_opts is set.
-static VALUE
-rjit_stats_enabled_p(rb_execution_context_t *ec, VALUE self)
-{
-    return RBOOL(rb_rjit_stats_enabled);
-}
-
-// Same as `rb_rjit_opts.trace_exits`, but this is used before rb_rjit_opts is set.
-static VALUE
-rjit_trace_exits_enabled_p(rb_execution_context_t *ec, VALUE self)
-{
-    return RBOOL(rb_rjit_trace_exits_enabled);
-}
-
-// Disable anything that could impact stats. It ends up disabling JIT calls as well.
-static VALUE
-rjit_stop_stats(rb_execution_context_t *ec, VALUE self)
-{
-    rb_rjit_call_p = false;
-    rjit_stats_p = false;
-    return Qnil;
-}
-
-#include "rjit.rbinc"
-
-#endif // USE_RJIT
diff --git a/rjit.h b/rjit.h
deleted file mode 100644
index 1efd4f3ae7243d..00000000000000
--- a/rjit.h
+++ /dev/null
@@ -1,103 +0,0 @@
-#ifndef RUBY_RJIT_H
-#define RUBY_RJIT_H 1
-/**********************************************************************
-
-  rjit.h - Interface to RJIT
-
-  Copyright (C) 2023 Takashi Kokubun <k0kubun@ruby-lang.org>.
-
-**********************************************************************/
-
-#include "ruby/internal/config.h" // defines USE_RJIT
-#include "ruby/internal/stdbool.h"
-#include "vm_core.h"
-
-# if USE_RJIT
-
-#ifndef RJIT_STATS
-# define RJIT_STATS RUBY_DEBUG
-#endif
-
-#include "ruby.h"
-#include "vm_core.h"
-
-// RJIT options which can be defined on the MRI command line.
-struct rb_rjit_options {
-    // Converted from "rjit" feature flag to tell the enablement
-    // information to ruby_show_version().
-    bool on;
-    // Number of calls to trigger JIT compilation.
-    unsigned int call_threshold;
-    // Size of executable memory block in MiB
-    unsigned int exec_mem_size;
-    // Collect RJIT statistics
-    bool stats;
-    // Trace side exit locations
-    bool trace_exits;
-    // Enable disasm of all JIT code
-    bool dump_disasm;
-    // Verify context objects
-    bool verify_ctx;
-    // [experimental] Do not start RJIT until RJIT.resume is called.
-    bool pause;
-};
-
-RUBY_SYMBOL_EXPORT_BEGIN
-RUBY_EXTERN struct rb_rjit_options rb_rjit_opts;
-RUBY_EXTERN bool rb_rjit_call_p;
-
-#define rb_rjit_call_threshold() rb_rjit_opts.call_threshold
-
-extern void rb_rjit_compile(const rb_iseq_t *iseq);
-RUBY_SYMBOL_EXPORT_END
-
-extern void rb_rjit_cancel_all(const char *reason);
-extern void rb_rjit_init(const struct rb_rjit_options *opts);
-extern void rb_rjit_free_iseq(const rb_iseq_t *iseq);
-extern void rb_rjit_iseq_update_references(struct rb_iseq_constant_body *const body);
-extern void rb_rjit_mark(void);
-extern void rb_rjit_iseq_mark(VALUE rjit_blocks);
-extern void rjit_notify_waitpid(int exit_code);
-
-extern void rb_rjit_bop_redefined(int redefined_flag, enum ruby_basic_operators bop);
-extern void rb_rjit_cme_invalidate(rb_callable_method_entry_t *cme);
-extern void rb_rjit_before_ractor_spawn(void);
-extern void rb_rjit_constant_state_changed(ID id);
-extern void rb_rjit_constant_ic_update(const rb_iseq_t *const iseq, IC ic, unsigned insn_idx);
-extern void rb_rjit_tracing_invalidate_all(rb_event_flag_t new_iseq_events);
-
-extern void rb_rjit_bop_redefined(int redefined_flag, enum ruby_basic_operators bop);
-extern void rb_rjit_before_ractor_spawn(void);
-extern void rb_rjit_tracing_invalidate_all(rb_event_flag_t new_iseq_events);
-extern void rb_rjit_collect_vm_usage_insn(int insn);
-
-extern bool rb_rjit_enabled;
-extern bool rb_rjit_stats_enabled;
-extern bool rb_rjit_trace_exits_enabled;
-
-# else // USE_RJIT
-
-static inline void rb_rjit_compile(const rb_iseq_t *iseq){}
-
-static inline void rb_rjit_cancel_all(const char *reason){}
-static inline void rb_rjit_free_iseq(const rb_iseq_t *iseq){}
-static inline void rb_rjit_mark(void){}
-
-static inline void rb_rjit_bop_redefined(int redefined_flag, enum ruby_basic_operators bop) {}
-static inline void rb_rjit_cme_invalidate(rb_callable_method_entry_t *cme) {}
-static inline void rb_rjit_before_ractor_spawn(void) {}
-static inline void rb_rjit_constant_state_changed(ID id) {}
-static inline void rb_rjit_constant_ic_update(const rb_iseq_t *const iseq, IC ic, unsigned insn_idx) {}
-static inline void rb_rjit_tracing_invalidate_all(rb_event_flag_t new_iseq_events) {}
-
-#define rb_rjit_enabled false
-#define rb_rjit_call_p false
-#define rb_rjit_stats_enabled false
-#define rb_rjit_trace_exits_enabled false
-
-#define rb_rjit_call_threshold() UINT_MAX
-
-static inline void rb_rjit_collect_vm_usage_insn(int insn) {}
-
-# endif // USE_RJIT
-#endif // RUBY_RJIT_H
diff --git a/rjit.rb b/rjit.rb
deleted file mode 100644
index ebad3529ef78e5..00000000000000
--- a/rjit.rb
+++ /dev/null
@@ -1,41 +0,0 @@
-module RubyVM::RJIT
-  # Return true if RJIT is enabled.
-  def self.enabled?
-    Primitive.cexpr! 'RBOOL(rb_rjit_enabled)'
-  end
-
-  # Start generating JITed code again after --rjit-pause.
-  def self.resume
-    Primitive.cstmt! %{
-      rb_rjit_call_p = true;
-      return Qnil;
-    }
-  end
-
-  if Primitive.rjit_stats_enabled_p
-    at_exit do
-      Primitive.rjit_stop_stats
-      print_stats
-    end
-  end
-  if Primitive.rjit_trace_exits_enabled_p
-    at_exit do
-      Primitive.rjit_stop_stats
-      dump_trace_exits
-    end
-  end
-end
-
-if RubyVM::RJIT.enabled?
-  begin
-    require 'fiddle'
-    require 'fiddle/import'
-  rescue LoadError
-    return # miniruby doesn't support RJIT
-  end
-
-  require 'ruby_vm/rjit/c_type'
-  require 'ruby_vm/rjit/compiler'
-  require 'ruby_vm/rjit/hooks'
-  require 'ruby_vm/rjit/stats'
-end
diff --git a/rjit_c.c b/rjit_c.c
deleted file mode 100644
index bdc9ce80725b49..00000000000000
--- a/rjit_c.c
+++ /dev/null
@@ -1,541 +0,0 @@
-/**********************************************************************
-
-  rjit_c.c - C helpers for RJIT
-
-  Copyright (C) 2017 Takashi Kokubun <k0kubun@ruby-lang.org>.
-
-**********************************************************************/
-
-#include "rjit.h" // defines USE_RJIT
-
-#if USE_RJIT
-
-#include "rjit_c.h"
-#include "include/ruby/assert.h"
-#include "include/ruby/debug.h"
-#include "internal.h"
-#include "internal/compile.h"
-#include "internal/fixnum.h"
-#include "internal/hash.h"
-#include "internal/sanitizers.h"
-#include "internal/gc.h"
-#include "internal/proc.h"
-#include "yjit.h"
-#include "vm_insnhelper.h"
-#include "probes.h"
-#include "probes_helper.h"
-
-#include "insns.inc"
-#include "insns_info.inc"
-
-// For mmapp(), sysconf()
-#ifndef _WIN32
-#include <unistd.h>
-#include <sys/mman.h>
-#endif
-
-#include <errno.h>
-
-#if defined(MAP_FIXED_NOREPLACE) && defined(_SC_PAGESIZE)
-// Align the current write position to a multiple of bytes
-static uint8_t *
-align_ptr(uint8_t *ptr, uint32_t multiple)
-{
-    // Compute the pointer modulo the given alignment boundary
-    uint32_t rem = ((uint32_t)(uintptr_t)ptr) % multiple;
-
-    // If the pointer is already aligned, stop
-    if (rem == 0)
-        return ptr;
-
-    // Pad the pointer by the necessary amount to align it
-    uint32_t pad = multiple - rem;
-
-    return ptr + pad;
-}
-#endif
-
-// Address space reservation. Memory pages are mapped on an as needed basis.
-// See the Rust mm module for details.
-static uint8_t *
-rjit_reserve_addr_space(uint32_t mem_size)
-{
-#ifndef _WIN32
-    uint8_t *mem_block;
-
-    // On Linux
-    #if defined(MAP_FIXED_NOREPLACE) && defined(_SC_PAGESIZE)
-        uint32_t const page_size = (uint32_t)sysconf(_SC_PAGESIZE);
-        uint8_t *const cfunc_sample_addr = (void *)&rjit_reserve_addr_space;
-        uint8_t *const probe_region_end = cfunc_sample_addr + INT32_MAX;
-        // Align the requested address to page size
-        uint8_t *req_addr = align_ptr(cfunc_sample_addr, page_size);
-
-        // Probe for addresses close to this function using MAP_FIXED_NOREPLACE
-        // to improve odds of being in range for 32-bit relative call instructions.
-        do {
-            mem_block = mmap(
-                req_addr,
-                mem_size,
-                PROT_NONE,
-                MAP_PRIVATE | MAP_ANONYMOUS | MAP_FIXED_NOREPLACE,
-                -1,
-                0
-            );
-
-            // If we succeeded, stop
-            if (mem_block != MAP_FAILED) {
-                break;
-            }
-
-            // +4MB
-            req_addr += 4 * 1024 * 1024;
-        } while (req_addr < probe_region_end);
-
-    // On MacOS and other platforms
-    #else
-        // Try to map a chunk of memory as executable
-        mem_block = mmap(
-            (void *)rjit_reserve_addr_space,
-            mem_size,
-            PROT_NONE,
-            MAP_PRIVATE | MAP_ANONYMOUS,
-            -1,
-            0
-        );
-    #endif
-
-    // Fallback
-    if (mem_block == MAP_FAILED) {
-        // Try again without the address hint (e.g., valgrind)
-        mem_block = mmap(
-            NULL,
-            mem_size,
-            PROT_NONE,
-            MAP_PRIVATE | MAP_ANONYMOUS,
-            -1,
-            0
-        );
-    }
-
-    // Check that the memory mapping was successful
-    if (mem_block == MAP_FAILED) {
-        perror("ruby: yjit: mmap:");
-        if(errno == ENOMEM) {
-            // No crash report if it's only insufficient memory
-            exit(EXIT_FAILURE);
-        }
-        rb_bug("mmap failed");
-    }
-
-    return mem_block;
-#else
-    // Windows not supported for now
-    return NULL;
-#endif
-}
-
-static VALUE
-mprotect_write(rb_execution_context_t *ec, VALUE self, VALUE rb_mem_block, VALUE rb_mem_size)
-{
-    void *mem_block = (void *)NUM2SIZET(rb_mem_block);
-    uint32_t mem_size = NUM2UINT(rb_mem_size);
-    return RBOOL(mprotect(mem_block, mem_size, PROT_READ | PROT_WRITE) == 0);
-}
-
-static VALUE
-mprotect_exec(rb_execution_context_t *ec, VALUE self, VALUE rb_mem_block, VALUE rb_mem_size)
-{
-    void *mem_block = (void *)NUM2SIZET(rb_mem_block);
-    uint32_t mem_size = NUM2UINT(rb_mem_size);
-    if (mem_size == 0) return Qfalse; // Some platforms return an error for mem_size 0.
-
-    if (mprotect(mem_block, mem_size, PROT_READ | PROT_EXEC)) {
-        rb_bug("Couldn't make JIT page (%p, %lu bytes) executable, errno: %s",
-            mem_block, (unsigned long)mem_size, strerror(errno));
-    }
-    return Qtrue;
-}
-
-static VALUE
-rjit_optimized_call(VALUE *recv, rb_execution_context_t *ec, int argc, VALUE *argv, int kw_splat, VALUE block_handler)
-{
-    rb_proc_t *proc;
-    GetProcPtr(recv, proc);
-    return rb_vm_invoke_proc(ec, proc, argc, argv, kw_splat, block_handler);
-}
-
-static VALUE
-rjit_str_neq_internal(VALUE str1, VALUE str2)
-{
-    return rb_str_eql_internal(str1, str2) == Qtrue ? Qfalse : Qtrue;
-}
-
-static VALUE
-rjit_str_simple_append(VALUE str1, VALUE str2)
-{
-    return rb_str_cat(str1, RSTRING_PTR(str2), RSTRING_LEN(str2));
-}
-
-static VALUE
-rjit_rb_ary_subseq_length(VALUE ary, long beg)
-{
-    long len = RARRAY_LEN(ary);
-    return rb_ary_subseq(ary, beg, len);
-}
-
-static VALUE
-rjit_build_kwhash(const struct rb_callinfo *ci, VALUE *sp)
-{
-    const struct rb_callinfo_kwarg *kw_arg = vm_ci_kwarg(ci);
-    int kw_len = kw_arg->keyword_len;
-    VALUE hash = rb_hash_new_with_size(kw_len);
-
-    for (int i = 0; i < kw_len; i++) {
-        VALUE key = kw_arg->keywords[i];
-        VALUE val = *(sp - kw_len + i);
-        rb_hash_aset(hash, key, val);
-    }
-    return hash;
-}
-
-// The code we generate in gen_send_cfunc() doesn't fire the c_return TracePoint event
-// like the interpreter. When tracing for c_return is enabled, we patch the code after
-// the C method return to call into this to fire the event.
-static void
-rjit_full_cfunc_return(rb_execution_context_t *ec, VALUE return_value)
-{
-    rb_control_frame_t *cfp = ec->cfp;
-    RUBY_ASSERT_ALWAYS(cfp == GET_EC()->cfp);
-    const rb_callable_method_entry_t *me = rb_vm_frame_method_entry(cfp);
-
-    RUBY_ASSERT_ALWAYS(RUBYVM_CFUNC_FRAME_P(cfp));
-    RUBY_ASSERT_ALWAYS(me->def->type == VM_METHOD_TYPE_CFUNC);
-
-    // CHECK_CFP_CONSISTENCY("full_cfunc_return"); TODO revive this
-
-    // Pop the C func's frame and fire the c_return TracePoint event
-    // Note that this is the same order as vm_call_cfunc_with_frame().
-    rb_vm_pop_frame(ec);
-    EXEC_EVENT_HOOK(ec, RUBY_EVENT_C_RETURN, cfp->self, me->def->original_id, me->called_id, me->owner, return_value);
-    // Note, this deviates from the interpreter in that users need to enable
-    // a c_return TracePoint for this DTrace hook to work. A reasonable change
-    // since the Ruby return event works this way as well.
-    RUBY_DTRACE_CMETHOD_RETURN_HOOK(ec, me->owner, me->def->original_id);
-
-    // Push return value into the caller's stack. We know that it's a frame that
-    // uses cfp->sp because we are patching a call done with gen_send_cfunc().
-    ec->cfp->sp[0] = return_value;
-    ec->cfp->sp++;
-}
-
-static rb_proc_t *
-rjit_get_proc_ptr(VALUE procv)
-{
-    rb_proc_t *proc;
-    GetProcPtr(procv, proc);
-    return proc;
-}
-
-// Use the same buffer size as Stackprof.
-#define BUFF_LEN 2048
-
-extern VALUE rb_rjit_raw_samples;
-extern VALUE rb_rjit_line_samples;
-
-static void
-rjit_record_exit_stack(const VALUE *exit_pc)
-{
-    // Let Primitive.rjit_stop_stats stop this
-    if (!rb_rjit_call_p) return;
-
-    // Get the opcode from the encoded insn handler at this PC
-    int insn = rb_vm_insn_addr2opcode((void *)*exit_pc);
-
-    // Create 2 array buffers to be used to collect frames and lines.
-    VALUE frames_buffer[BUFF_LEN] = { 0 };
-    int lines_buffer[BUFF_LEN] = { 0 };
-
-    // Records call frame and line information for each method entry into two
-    // temporary buffers. Returns the number of times we added to the buffer (ie
-    // the length of the stack).
-    //
-    // Call frame info is stored in the frames_buffer, line number information
-    // in the lines_buffer. The first argument is the start point and the second
-    // argument is the buffer limit, set at 2048.
-    int stack_length = rb_profile_frames(0, BUFF_LEN, frames_buffer, lines_buffer);
-    int samples_length = stack_length + 3; // 3: length, insn, count
-
-    // If yjit_raw_samples is less than or equal to the current length of the samples
-    // we might have seen this stack trace previously.
-    int prev_stack_len_index = (int)RARRAY_LEN(rb_rjit_raw_samples) - samples_length;
-    VALUE prev_stack_len_obj;
-    if (RARRAY_LEN(rb_rjit_raw_samples) >= samples_length && FIXNUM_P(prev_stack_len_obj = RARRAY_AREF(rb_rjit_raw_samples, prev_stack_len_index))) {
-        int prev_stack_len = NUM2INT(prev_stack_len_obj);
-        int idx = stack_length - 1;
-        int prev_frame_idx = 0;
-        bool seen_already = true;
-
-        // If the previous stack length and current stack length are equal,
-        // loop and compare the current frame to the previous frame. If they are
-        // not equal, set seen_already to false and break out of the loop.
-        if (prev_stack_len == stack_length) {
-            while (idx >= 0) {
-                VALUE current_frame = frames_buffer[idx];
-                VALUE prev_frame = RARRAY_AREF(rb_rjit_raw_samples, prev_stack_len_index + prev_frame_idx + 1);
-
-                // If the current frame and previous frame are not equal, set
-                // seen_already to false and break out of the loop.
-                if (current_frame != prev_frame) {
-                    seen_already = false;
-                    break;
-                }
-
-                idx--;
-                prev_frame_idx++;
-            }
-
-            // If we know we've seen this stack before, increment the counter by 1.
-            if (seen_already) {
-                int prev_idx = (int)RARRAY_LEN(rb_rjit_raw_samples) - 1;
-                int prev_count = NUM2INT(RARRAY_AREF(rb_rjit_raw_samples, prev_idx));
-                int new_count = prev_count + 1;
-
-                rb_ary_store(rb_rjit_raw_samples, prev_idx, INT2NUM(new_count));
-                rb_ary_store(rb_rjit_line_samples, prev_idx, INT2NUM(new_count));
-                return;
-            }
-        }
-    }
-
-    rb_ary_push(rb_rjit_raw_samples, INT2NUM(stack_length));
-    rb_ary_push(rb_rjit_line_samples, INT2NUM(stack_length));
-
-    int idx = stack_length - 1;
-
-    while (idx >= 0) {
-        VALUE frame = frames_buffer[idx];
-        int line = lines_buffer[idx];
-
-        rb_ary_push(rb_rjit_raw_samples, frame);
-        rb_ary_push(rb_rjit_line_samples, INT2NUM(line));
-
-        idx--;
-    }
-
-    // Push the insn value into the yjit_raw_samples Vec.
-    rb_ary_push(rb_rjit_raw_samples, INT2NUM(insn));
-
-    // Push the current line onto the yjit_line_samples Vec. This
-    // points to the line in insns.def.
-    int line = (int)RARRAY_LEN(rb_rjit_line_samples) - 1;
-    rb_ary_push(rb_rjit_line_samples, INT2NUM(line));
-
-    // Push number of times seen onto the stack, which is 1
-    // because it's the first time we've seen it.
-    rb_ary_push(rb_rjit_raw_samples, INT2NUM(1));
-    rb_ary_push(rb_rjit_line_samples, INT2NUM(1));
-}
-
-// For a given raw_sample (frame), set the hash with the caller's
-// name, file, and line number. Return the  hash with collected frame_info.
-static void
-rjit_add_frame(VALUE hash, VALUE frame)
-{
-    VALUE frame_id = SIZET2NUM(frame);
-
-    if (RTEST(rb_hash_aref(hash, frame_id))) {
-        return;
-    }
-    else {
-        VALUE frame_info = rb_hash_new();
-        // Full label for the frame
-        VALUE name = rb_profile_frame_full_label(frame);
-        // Absolute path of the frame from rb_iseq_realpath
-        VALUE file = rb_profile_frame_absolute_path(frame);
-        // Line number of the frame
-        VALUE line = rb_profile_frame_first_lineno(frame);
-
-        // If absolute path isn't available use the rb_iseq_path
-        if (NIL_P(file)) {
-            file = rb_profile_frame_path(frame);
-        }
-
-        rb_hash_aset(frame_info, ID2SYM(rb_intern("name")), name);
-        rb_hash_aset(frame_info, ID2SYM(rb_intern("file")), file);
-        rb_hash_aset(frame_info, ID2SYM(rb_intern("samples")), INT2NUM(0));
-        rb_hash_aset(frame_info, ID2SYM(rb_intern("total_samples")), INT2NUM(0));
-        rb_hash_aset(frame_info, ID2SYM(rb_intern("edges")), rb_hash_new());
-        rb_hash_aset(frame_info, ID2SYM(rb_intern("lines")), rb_hash_new());
-
-        if (line != INT2FIX(0)) {
-            rb_hash_aset(frame_info, ID2SYM(rb_intern("line")), line);
-        }
-
-       rb_hash_aset(hash, frame_id, frame_info);
-    }
-}
-
-static VALUE
-rjit_exit_traces(void)
-{
-    int samples_len = (int)RARRAY_LEN(rb_rjit_raw_samples);
-    RUBY_ASSERT(samples_len == RARRAY_LEN(rb_rjit_line_samples));
-
-    VALUE result = rb_hash_new();
-    VALUE raw_samples = rb_ary_new_capa(samples_len);
-    VALUE line_samples = rb_ary_new_capa(samples_len);
-    VALUE frames = rb_hash_new();
-    int idx = 0;
-
-    // While the index is less than samples_len, parse yjit_raw_samples and
-    // yjit_line_samples, then add casted values to raw_samples and line_samples array.
-    while (idx < samples_len) {
-        int num = NUM2INT(RARRAY_AREF(rb_rjit_raw_samples, idx));
-        int line_num = NUM2INT(RARRAY_AREF(rb_rjit_line_samples, idx));
-        idx++;
-
-        rb_ary_push(raw_samples, SIZET2NUM(num));
-        rb_ary_push(line_samples, INT2NUM(line_num));
-
-        // Loop through the length of samples_len and add data to the
-        // frames hash. Also push the current value onto the raw_samples
-        // and line_samples array respectively.
-        for (int o = 0; o < num; o++) {
-            rjit_add_frame(frames, RARRAY_AREF(rb_rjit_raw_samples, idx));
-            rb_ary_push(raw_samples, SIZET2NUM(RARRAY_AREF(rb_rjit_raw_samples, idx)));
-            rb_ary_push(line_samples, RARRAY_AREF(rb_rjit_line_samples, idx));
-            idx++;
-        }
-
-        // insn BIN and lineno
-        rb_ary_push(raw_samples, RARRAY_AREF(rb_rjit_raw_samples, idx));
-        rb_ary_push(line_samples, RARRAY_AREF(rb_rjit_line_samples, idx));
-        idx++;
-
-        // Number of times seen
-        rb_ary_push(raw_samples, RARRAY_AREF(rb_rjit_raw_samples, idx));
-        rb_ary_push(line_samples, RARRAY_AREF(rb_rjit_line_samples, idx));
-        idx++;
-    }
-
-    // Set add the raw_samples, line_samples, and frames to the results
-    // hash.
-    rb_hash_aset(result, ID2SYM(rb_intern("raw")), raw_samples);
-    rb_hash_aset(result, ID2SYM(rb_intern("lines")), line_samples);
-    rb_hash_aset(result, ID2SYM(rb_intern("frames")), frames);
-
-    return result;
-}
-
-// An offsetof implementation that works for unnamed struct and union.
-// Multiplying 8 for compatibility with libclang's offsetof.
-#define OFFSETOF(ptr, member) RB_SIZE2NUM(((char *)&ptr.member - (char*)&ptr) * 8)
-
-#define SIZEOF(type) RB_SIZE2NUM(sizeof(type))
-#define SIGNED_TYPE_P(type) RBOOL((type)(-1) < (type)(1))
-
-// Insn side exit counters
-static size_t rjit_insn_exits[VM_INSTRUCTION_SIZE] = { 0 };
-
-// macOS: brew install capstone
-// Ubuntu/Debian: apt-get install libcapstone-dev
-// Fedora: dnf -y install capstone-devel
-#ifdef HAVE_LIBCAPSTONE
-#include <capstone/capstone.h>
-#endif
-
-// Return an array of [address, mnemonic, op_str]
-static VALUE
-dump_disasm(rb_execution_context_t *ec, VALUE self, VALUE from, VALUE to, VALUE test)
-{
-    VALUE result = rb_ary_new();
-#ifdef HAVE_LIBCAPSTONE
-    // Prepare for calling cs_disasm
-    static csh handle;
-    if (cs_open(CS_ARCH_X86, CS_MODE_64, &handle) != CS_ERR_OK) {
-        rb_raise(rb_eRuntimeError, "failed to make Capstone handle");
-    }
-    size_t from_addr = NUM2SIZET(from);
-    size_t to_addr = NUM2SIZET(to);
-
-    // Call cs_disasm and convert results to a Ruby array
-    cs_insn *insns;
-    size_t base_addr = RTEST(test) ? 0 : from_addr; // On tests, start from 0 for output stability.
-    size_t count = cs_disasm(handle, (const uint8_t *)from_addr, to_addr - from_addr, base_addr, 0, &insns);
-    for (size_t i = 0; i < count; i++) {
-        VALUE vals = rb_ary_new_from_args(3, LONG2NUM(insns[i].address), rb_str_new2(insns[i].mnemonic), rb_str_new2(insns[i].op_str));
-        rb_ary_push(result, vals);
-    }
-
-    // Free memory used by capstone
-    cs_free(insns, count);
-    cs_close(&handle);
-#endif
-    return result;
-}
-
-// Same as `RubyVM::RJIT.enabled?`, but this is used before it's defined.
-static VALUE
-rjit_enabled_p(rb_execution_context_t *ec, VALUE self)
-{
-    return RBOOL(rb_rjit_enabled);
-}
-
-static int
-for_each_iseq_i(void *vstart, void *vend, size_t stride, void *data)
-{
-    VALUE block = (VALUE)data;
-    VALUE v = (VALUE)vstart;
-    for (; v != (VALUE)vend; v += stride) {
-        void *ptr = asan_poisoned_object_p(v);
-        asan_unpoison_object(v, false);
-
-        if (rb_obj_is_iseq(v)) {
-            extern VALUE rb_rjit_iseq_new(rb_iseq_t *iseq);
-            rb_iseq_t *iseq = (rb_iseq_t *)v;
-            rb_funcall(block, rb_intern("call"), 1, rb_rjit_iseq_new(iseq));
-        }
-
-        asan_poison_object_if(ptr, v);
-    }
-    return 0;
-}
-
-static VALUE
-rjit_for_each_iseq(rb_execution_context_t *ec, VALUE self, VALUE block)
-{
-    rb_objspace_each_objects(for_each_iseq_i, (void *)block);
-    return Qnil;
-}
-
-// bindgen funcs
-extern ID rb_get_symbol_id(VALUE name);
-extern VALUE rb_fix_aref(VALUE fix, VALUE idx);
-extern VALUE rb_str_getbyte(VALUE str, VALUE index);
-extern VALUE rb_vm_concat_array(VALUE ary1, VALUE ary2st);
-extern VALUE rb_vm_get_ev_const(rb_execution_context_t *ec, VALUE orig_klass, ID id, VALUE allow_nil);
-extern VALUE rb_vm_getclassvariable(const rb_iseq_t *iseq, const rb_control_frame_t *cfp, ID id, ICVARC ic);
-extern VALUE rb_vm_opt_newarray_min(rb_execution_context_t *ec, rb_num_t num, const VALUE *ptr);
-extern VALUE rb_vm_opt_newarray_max(rb_execution_context_t *ec, rb_num_t num, const VALUE *ptr);
-extern VALUE rb_vm_opt_newarray_hash(rb_execution_context_t *ec, rb_num_t num, const VALUE *ptr);
-extern VALUE rb_vm_splat_array(VALUE flag, VALUE array);
-extern bool rb_simple_iseq_p(const rb_iseq_t *iseq);
-extern bool rb_vm_defined(rb_execution_context_t *ec, rb_control_frame_t *reg_cfp, rb_num_t op_type, VALUE obj, VALUE v);
-extern bool rb_vm_ic_hit_p(IC ic, const VALUE *reg_ep);
-extern rb_event_flag_t rb_rjit_global_events;
-extern void rb_vm_setinstancevariable(const rb_iseq_t *iseq, VALUE obj, ID id, VALUE val, IVC ic);
-extern VALUE rb_vm_throw(const rb_execution_context_t *ec, rb_control_frame_t *reg_cfp, rb_num_t throw_state, VALUE throwobj);
-extern VALUE rb_reg_new_ary(VALUE ary, int opt);
-extern void rb_vm_setclassvariable(const rb_iseq_t *iseq, const rb_control_frame_t *cfp, ID id, VALUE val, ICVARC ic);
-extern VALUE rb_str_bytesize(VALUE str);
-extern const rb_callable_method_entry_t *rb_callable_method_entry_or_negative(VALUE klass, ID mid);
-extern VALUE rb_vm_yield_with_cfunc(rb_execution_context_t *ec, const struct rb_captured_block *captured, int argc, const VALUE *argv);
-extern VALUE rb_vm_set_ivar_id(VALUE obj, ID id, VALUE val);
-extern VALUE rb_ary_unshift_m(int argc, VALUE *argv, VALUE ary);
-extern void* rb_rjit_entry_stub_hit(VALUE branch_stub);
-extern void* rb_rjit_branch_stub_hit(VALUE branch_stub, int sp_offset, int target0_p);
-
-#include "rjit_c.rbinc"
-
-#endif // USE_RJIT
diff --git a/rjit_c.h b/rjit_c.h
deleted file mode 100644
index 518d336c00ddea..00000000000000
--- a/rjit_c.h
+++ /dev/null
@@ -1,165 +0,0 @@
-// This file is parsed by tool/rjit/generate.rb to generate rjit_c.rb
-#ifndef RJIT_C_H
-#define RJIT_C_H
-
-#include "ruby/internal/config.h"
-#include "internal/string.h"
-#include "internal/struct.h"
-#include "internal/variable.h"
-#include "vm_core.h"
-#include "vm_callinfo.h"
-#include "builtin.h"
-#include "ccan/list/list.h"
-#include "rjit.h"
-#include "shape.h"
-
-extern uint8_t *rb_rjit_mem_block;
-
-#define RJIT_RUNTIME_COUNTERS(...) struct rb_rjit_runtime_counters { size_t __VA_ARGS__; };
-RJIT_RUNTIME_COUNTERS(
-    vm_insns_count,
-    rjit_insns_count,
-
-    send_args_splat_kw_splat,
-    send_args_splat,
-    send_args_splat_not_array,
-    send_args_splat_length_not_equal,
-    send_args_splat_cfunc_var_args,
-    send_args_splat_arity_error,
-    send_args_splat_ruby2_hash,
-    send_args_splat_cfunc_zuper,
-    send_args_splat_cfunc_ruby2_keywords,
-    send_kw_splat,
-    send_kwarg,
-    send_klass_megamorphic,
-    send_missing_cme,
-    send_private,
-    send_protected_check_failed,
-    send_tailcall,
-    send_notimplemented,
-    send_missing,
-    send_bmethod,
-    send_alias,
-    send_undef,
-    send_zsuper,
-    send_refined,
-    send_stackoverflow,
-    send_arity,
-    send_c_tracing,
-    send_is_a_class_mismatch,
-    send_instance_of_class_mismatch,
-    send_keywords,
-
-    send_blockiseq,
-    send_block_handler,
-    send_block_setup,
-    send_block_not_nil,
-    send_block_not_proxy,
-    send_block_arg,
-
-    send_iseq_kwparam,
-    send_iseq_accepts_no_kwarg,
-    send_iseq_has_opt,
-    send_iseq_has_kwrest,
-    send_iseq_ruby2_keywords,
-    send_iseq_has_rest_and_captured,
-    send_iseq_has_rest_and_kw_supplied,
-    send_iseq_has_no_kw,
-    send_iseq_zsuper,
-    send_iseq_materialized_block,
-    send_iseq_has_rest,
-    send_iseq_block_arg0_splat,
-    send_iseq_kw_call,
-    send_iseq_splat,
-    send_iseq_has_rest_and_optional,
-    send_iseq_arity_error,
-    send_iseq_missing_optional_kw,
-    send_iseq_too_many_kwargs,
-    send_iseq_kwargs_mismatch,
-    send_iseq_splat_with_kw,
-    send_iseq_splat_arity_error,
-    send_iseq_has_rest_and_splat_not_equal,
-
-    send_cfunc_variadic,
-    send_cfunc_too_many_args,
-    send_cfunc_ruby_array_varg,
-    send_cfunc_splat_with_kw,
-    send_cfunc_tracing,
-    send_cfunc_argc_mismatch,
-    send_cfunc_toomany_args,
-
-    send_attrset_splat,
-    send_attrset_kwarg,
-    send_attrset_method,
-
-    send_ivar_splat,
-    send_ivar_opt_send,
-
-    send_optimized_send_no_args,
-    send_optimized_send_not_sym_or_str,
-    send_optimized_send_mid_class_changed,
-    send_optimized_send_mid_id_changed,
-    send_optimized_send_null_mid,
-    send_optimized_send_send,
-    send_optimized_call_block,
-    send_optimized_call_kwarg,
-    send_optimized_call_splat,
-    send_optimized_struct_aref_error,
-
-    send_optimized_block_call,
-    send_optimized_struct_aset,
-
-    send_bmethod_not_iseq,
-    send_bmethod_blockarg,
-
-    invokesuper_me_changed,
-    invokesuper_block,
-
-    invokeblock_none,
-    invokeblock_symbol,
-    invokeblock_proc,
-    invokeblock_tag_changed,
-    invokeblock_iseq_block_changed,
-    invokeblock_iseq_arity,
-    invokeblock_iseq_arg0_splat,
-    invokeblock_ifunc_args_splat,
-    invokeblock_ifunc_kw_splat,
-    invokeblock_iseq_arg0_args_splat,
-    invokeblock_iseq_arg0_has_kw,
-
-    getivar_megamorphic,
-    getivar_not_heap,
-    getivar_special_const,
-    getivar_too_complex,
-
-    optaref_arg_not_fixnum,
-    optaref_argc_not_one,
-    optaref_recv_not_array,
-    optaref_recv_not_hash,
-    optaref_send,
-
-    optgetconst_not_cached,
-    optgetconst_cref,
-    optgetconst_cache_miss,
-
-    setivar_frozen,
-    setivar_not_heap,
-    setivar_megamorphic,
-    setivar_too_complex,
-
-    expandarray_splat,
-    expandarray_postarg,
-    expandarray_not_array,
-    expandarray_rhs_too_small,
-
-    getblockpp_block_param_modified,
-    getblockpp_block_handler_none,
-    getblockpp_not_gc_guarded,
-    getblockpp_not_iseq_block,
-
-    compiled_block_count
-)
-#undef RJIT_RUNTIME_COUNTERS
-extern struct rb_rjit_runtime_counters rb_rjit_counters;
-
-#endif /* RJIT_C_H */
diff --git a/rjit_c.rb b/rjit_c.rb
deleted file mode 100644
index 78d1a6cf747e62..00000000000000
--- a/rjit_c.rb
+++ /dev/null
@@ -1,1692 +0,0 @@
-# frozen_string_literal: true
-# Part of this file is generated by tool/rjit/bindgen.rb.
-# Run `make rjit-bindgen` to update code between "RJIT bindgen begin" and "RJIT bindgen end".
-module RubyVM::RJIT # :nodoc: all
-  #
-  # Main: Used by RJIT
-  #
-  # This `class << C` section is for calling C functions with Primitive.
-  # For importing variables or macros, use tool/rjit/bindgen.rb instead.
-  class << C = Module.new
-    def mmap(mem_size)
-      Primitive.cexpr! 'SIZET2NUM((size_t)rjit_reserve_addr_space(NUM2UINT(mem_size)))'
-    end
-
-    def mprotect_write(mem_block, mem_size)
-      Primitive.mprotect_write(mem_block, mem_size)
-    end
-
-    def mprotect_exec(mem_block, mem_size)
-      Primitive.mprotect_exec(mem_block, mem_size)
-    end
-
-    def rjit_insn_exits
-      addr = Primitive.cexpr! 'SIZET2NUM((size_t)rjit_insn_exits)'
-      CType::Immediate.parse("size_t").new(addr)
-    end
-
-    def rb_rjit_counters
-      addr = Primitive.cexpr! 'SIZET2NUM((size_t)&rb_rjit_counters)'
-      rb_rjit_runtime_counters.new(addr)
-    end
-
-    # @param from [Integer] - From address
-    # @param to [Integer]   - To address
-    def dump_disasm(from, to, test: false)
-      Primitive.dump_disasm(from, to, test)
-    end
-
-    # Convert a Ruby object to a VALUE in Integer
-    def to_value(obj)
-      Primitive.cexpr! 'SIZET2NUM((size_t)obj)'
-    end
-
-    def BASIC_OP_UNREDEFINED_P(op, klass)
-      Primitive.cexpr! 'RBOOL(BASIC_OP_UNREDEFINED_P(NUM2INT(op), NUM2INT(klass)))'
-    end
-
-    def rb_iseq_line_no(iseq, pos)
-      _iseq_addr = iseq.to_i
-      Primitive.cexpr! 'UINT2NUM(rb_iseq_line_no((const rb_iseq_t *)NUM2SIZET(_iseq_addr), NUM2SIZET(pos)))'
-    end
-
-    def rb_class_of(obj)
-      Primitive.cexpr! 'rb_class_of(obj)'
-    end
-
-    def rb_callable_method_entry(klass, mid)
-      cme_addr = Primitive.cexpr! 'SIZET2NUM((size_t)rb_callable_method_entry(klass, NUM2UINT(mid)))'
-      return nil if cme_addr == 0
-      rb_callable_method_entry_t.new(cme_addr)
-    end
-
-    def METHOD_ENTRY_VISI(cme)
-      _cme_addr = cme.to_i
-      Primitive.cexpr! 'UINT2NUM(METHOD_ENTRY_VISI((const rb_callable_method_entry_t *)NUM2SIZET(_cme_addr)))'
-    end
-
-    def rb_simple_iseq_p(iseq)
-      _iseq_addr = iseq.to_i
-      Primitive.cexpr! 'RBOOL(rb_simple_iseq_p((rb_iseq_t *)NUM2SIZET(_iseq_addr)))'
-    end
-
-    def SPECIAL_CONST_P(obj)
-      _value = to_value(obj)
-      Primitive.cexpr! 'RBOOL(SPECIAL_CONST_P((VALUE)NUM2SIZET(_value)))'
-    end
-
-    def BUILTIN_TYPE(obj)
-      _value = to_value(obj)
-      Primitive.cexpr! 'INT2NUM(BUILTIN_TYPE((VALUE)NUM2SIZET(_value)))'
-    end
-
-    def RB_TYPE_P(obj, type)
-      Primitive.cexpr! 'RBOOL(RB_TYPE_P(obj, NUM2UINT(type)))'
-    end
-
-    def rb_shape_get_shape_id(obj)
-      _value = to_value(obj)
-      Primitive.cexpr! 'UINT2NUM((unsigned int)rb_shape_get_shape_id((VALUE)NUM2SIZET(_value)))'
-    end
-
-    def rb_shape_id_offset
-      Primitive.cexpr! 'INT2NUM(rb_shape_id_offset())'
-    end
-
-    def rb_shape_get_iv_index(shape_id, ivar_id)
-      Primitive.cstmt! %{
-        rb_shape_t *shape = rb_shape_get_shape_by_id((shape_id_t)NUM2SIZET(shape_id));
-        attr_index_t index;
-        bool found = rb_shape_get_iv_index(shape, (ID)NUM2SIZET(ivar_id), &index);
-        return found ? UINT2NUM(index) : Qnil;
-      }
-    end
-
-    def FL_TEST_RAW(obj, flags)
-      Primitive.cexpr! 'RBOOL(FL_TEST_RAW(obj, (VALUE)NUM2SIZET(flags)))'
-    end
-
-    def FL_TEST(obj, flags)
-      Primitive.cexpr! 'RBOOL(FL_TEST(obj, (VALUE)NUM2SIZET(flags)))'
-    end
-
-    def rjit_for_each_iseq(&block)
-      Primitive.rjit_for_each_iseq(block)
-    end
-
-    def get_symbol_id(name)
-      Primitive.cexpr! 'SIZET2NUM((size_t)rb_get_symbol_id(name))'
-    end
-
-    def rb_vm_frame_method_entry(cfp)
-      _cfp = cfp.to_i
-      cme_addr = Primitive.cexpr! 'SIZET2NUM((size_t)rb_vm_frame_method_entry((const rb_control_frame_t *)NUM2SIZET(_cfp)))'
-      return nil if cme_addr == 0
-      rb_callable_method_entry_t.new(cme_addr)
-    end
-
-    def rb_class_get_superclass(klass)
-      Primitive.cexpr! 'rb_class_get_superclass(klass)'
-    end
-
-    def ID2SYM(id)
-      Primitive.cexpr! 'ID2SYM((ID)NUM2SIZET(id))'
-    end
-
-    def obj_is_kind_of(obj, c)
-      Primitive.cexpr! 'rb_obj_is_kind_of(obj, c)'
-    end
-
-    def imemo_type_p(ptr, type)
-      _ptr = ptr.to_i
-      Primitive.cexpr! 'RBOOL(imemo_type_p((VALUE)NUM2SIZET(_ptr), NUM2UINT(type)))'
-    end
-
-    def rb_iseq_only_optparam_p(iseq)
-      _iseq = iseq.to_i
-      Primitive.cstmt! %{
-        extern bool rb_iseq_only_optparam_p(const rb_iseq_t *iseq);
-        return RBOOL(rb_iseq_only_optparam_p((rb_iseq_t *)NUM2SIZET(_iseq)));
-      }
-    end
-
-    def rb_iseq_only_kwparam_p(iseq)
-      _iseq = iseq.to_i
-      Primitive.cstmt! %{
-        extern bool rb_iseq_only_kwparam_p(const rb_iseq_t *iseq);
-        return RBOOL(rb_iseq_only_kwparam_p((rb_iseq_t *)NUM2SIZET(_iseq)));
-      }
-    end
-
-    def rb_obj_frozen_p(obj)
-      Primitive.cexpr! 'rb_obj_frozen_p(obj)'
-    end
-
-    def rb_intern(str)
-      Primitive.cexpr! 'SIZET2NUM((size_t)rb_intern(RSTRING_PTR(str)))'
-    end
-
-    def rb_method_entry_at(klass, mid)
-      me_addr = Primitive.cexpr! 'SIZET2NUM((size_t)rb_method_entry_at(klass, (ID)NUM2SIZET(mid)))'
-      me_addr == 0 ? nil : rb_method_entry_t.new(me_addr)
-    end
-
-    def rb_shape_transition_shape_capa(shape, new_capacity)
-      _shape = shape.to_i
-      shape_addr = Primitive.cexpr! 'SIZET2NUM((size_t)rb_shape_transition_shape_capa((rb_shape_t *)NUM2SIZET(_shape), NUM2UINT(new_capacity)))'
-      rb_shape_t.new(shape_addr)
-    end
-
-    def rb_shape_get_next(shape, obj, id)
-      _shape = shape.to_i
-      shape_addr = Primitive.cexpr! 'SIZET2NUM((size_t)rb_shape_get_next((rb_shape_t *)NUM2SIZET(_shape), obj, (ID)NUM2SIZET(id)))'
-      rb_shape_t.new(shape_addr)
-    end
-
-    def rb_shape_id(shape)
-      _shape = shape.to_i
-      Primitive.cexpr! 'SIZET2NUM((size_t)rb_shape_id((rb_shape_t *)NUM2SIZET(_shape)))'
-    end
-
-    def rb_class_attached_object(klass)
-      Primitive.cexpr! 'rb_class_attached_object(klass)'
-    end
-
-    def rb_singleton_class(obj)
-      Primitive.cexpr! 'rb_singleton_class(obj)'
-    end
-
-    def rb_aliased_callable_method_entry(cme)
-      _cme = cme.to_i
-      cme_addr = Primitive.cstmt! %{
-        extern const rb_callable_method_entry_t * rb_aliased_callable_method_entry(const rb_callable_method_entry_t *me);
-        return SIZET2NUM((size_t)rb_aliased_callable_method_entry((const rb_callable_method_entry_t *)NUM2SIZET(_cme)));
-      }
-      rb_callable_method_entry_t.new(cme_addr)
-    end
-
-    def rb_yjit_get_proc_ptr(proc_addr)
-      proc_t_addr = Primitive.cstmt! %{
-        extern rb_proc_t * rjit_get_proc_ptr(VALUE procv);
-        return SIZET2NUM((size_t)rjit_get_proc_ptr((VALUE)NUM2SIZET(proc_addr)));
-      }
-      rb_proc_t.new(proc_t_addr)
-    end
-
-    def rb_shape_get_shape_by_id(shape_id)
-      _shape_id = shape_id.to_i
-      shape_addr = Primitive.cexpr! 'SIZET2NUM((VALUE)rb_shape_get_shape_by_id((shape_id_t)NUM2UINT(_shape_id)))'
-      rb_shape_t.new(shape_addr)
-    end
-
-    def rb_iseq_check(iseq)
-      _iseq_addr = iseq.to_i
-      iseq_addr = Primitive.cexpr! 'SIZET2NUM((VALUE)rb_iseq_check((rb_iseq_t *)NUM2SIZET(_iseq_addr)))'
-      rb_iseq_t.new(iseq_addr)
-    end
-
-    def rb_iseq_path(iseq)
-      _iseq_addr = iseq.to_i
-      Primitive.cexpr! 'rb_iseq_path((rb_iseq_t *)NUM2SIZET(_iseq_addr))'
-    end
-
-    def vm_ci_argc(ci)
-      _ci_addr = ci.to_i
-      Primitive.cexpr! 'UINT2NUM(vm_ci_argc((CALL_INFO)NUM2SIZET(_ci_addr)))'
-    end
-
-    def vm_ci_flag(ci)
-      _ci_addr = ci.to_i
-      Primitive.cexpr! 'UINT2NUM(vm_ci_flag((CALL_INFO)NUM2SIZET(_ci_addr)))'
-    end
-
-    def vm_ci_kwarg(ci)
-      _ci_addr = ci.to_i
-      kwarg_addr = Primitive.cexpr! 'SIZET2NUM((size_t)vm_ci_kwarg((CALL_INFO)NUM2SIZET(_ci_addr)))'
-      kwarg_addr == 0 ? nil : rb_callinfo_kwarg.new(kwarg_addr)
-    end
-
-    def vm_ci_mid(ci)
-      _ci_addr = ci.to_i
-      Primitive.cexpr! 'SIZET2NUM((size_t)vm_ci_mid((CALL_INFO)NUM2SIZET(_ci_addr)))'
-    end
-
-    def rjit_opts
-      addr = Primitive.cexpr! 'SIZET2NUM((VALUE)&rb_rjit_opts)'
-      rb_rjit_options.new(addr)
-    end
-
-    def rjit_cancel_all(reason)
-      Primitive.cstmt! %{
-        rb_rjit_cancel_all(RSTRING_PTR(reason));
-        return Qnil;
-      }
-    end
-
-    # Convert an encoded VM pointer to an insn BIN.
-    def rb_vm_insn_decode(encoded)
-      # Using rb_vm_insn_addr2opcode to return trace_ insns
-      Primitive.cexpr! 'INT2NUM(rb_vm_insn_addr2opcode((void *)NUM2SIZET(encoded)))'
-    end
-
-    # Convert Integer VALUE to an actual Ruby object
-    def to_ruby(value)
-      Primitive.cexpr! '(VALUE)NUM2SIZET(value)'
-    end
-
-    def HAVE_LIBCAPSTONE
-      Primitive.cstmt! %{
-        #ifdef HAVE_LIBCAPSTONE
-          return Qtrue;
-        #else
-          return Qfalse;
-        #endif
-      }
-    end
-
-    def rjit_exit_traces
-      Primitive.cexpr! 'rjit_exit_traces()'
-    end
-
-    def rb_vm_ep_local_ep(ep)
-      _ep = ep.to_i
-      lep_addr = Primitive.cexpr! 'SIZET2NUM((size_t)rb_vm_ep_local_ep((const VALUE *)NUM2SIZET(_ep)))'
-      C.VALUE.new(lep_addr)
-    end
-
-    def rb_hash_keys(hash)
-      Primitive.cexpr! 'rb_hash_keys(hash)'
-    end
-
-    def rb_hash_stlike_lookup(hash, key)
-      Primitive.cstmt! %{
-        VALUE result = Qnil;
-        rb_hash_stlike_lookup(hash, key, &result);
-        return result;
-      }
-    end
-
-    def rb_obj_class(obj)
-      Primitive.cexpr! 'rb_obj_class(obj)'
-    end
-
-    def rb_sym2id(sym)
-      Primitive.cexpr! 'SIZET2NUM((size_t)rb_sym2id(sym))'
-    end
-
-    def rb_callable_method_entry_or_negative(klass, mid)
-      cme_addr = Primitive.cexpr! 'SIZET2NUM((size_t)rb_callable_method_entry_or_negative(klass, (ID)NUM2SIZET(mid)))'
-      return nil if cme_addr == 0
-      rb_callable_method_entry_t.new(cme_addr)
-    end
-
-    def rb_method_basic_definition_p(klass, mid)
-      Primitive.cexpr! 'RBOOL(rb_method_basic_definition_p(klass, (ID)NUM2SIZET(mid)))'
-    end
-
-    def UNDEFINED_METHOD_ENTRY_P(cme)
-      _cme_addr = cme.to_i
-      Primitive.cexpr! 'RBOOL(UNDEFINED_METHOD_ENTRY_P((const rb_callable_method_entry_t *)NUM2SIZET(_cme_addr)))'
-    end
-
-    def RCLASS_ORIGIN(klass)
-      Primitive.cexpr! 'RCLASS_ORIGIN(klass)'
-    end
-  end
-
-  #
-  # Utilities: Not used by RJIT, but useful for debugging
-  #
-  class << C
-    # Convert insn BINs to encoded VM pointers.
-    def rb_vm_insn_encode(bin)
-      Primitive.cexpr! 'SIZET2NUM((VALUE)rb_vm_get_insns_address_table()[NUM2INT(bin)])'
-    end
-
-    # Convert RubyVM::InstructionSequence to C.rb_iseq_t.
-    def rb_iseqw_to_iseq(iseqw)
-      iseq_addr = Primitive.cexpr! 'SIZET2NUM((VALUE)rb_iseqw_to_iseq(iseqw))'
-      rb_iseq_t.new(iseq_addr)
-    end
-  end
-
-  ### RJIT bindgen begin ###
-
-  C::UNLIMITED_ARGUMENTS = Primitive.cexpr! %q{ LONG2NUM(UNLIMITED_ARGUMENTS) }
-  C::VM_ENV_DATA_INDEX_ME_CREF = Primitive.cexpr! %q{ LONG2NUM(VM_ENV_DATA_INDEX_ME_CREF) }
-  C::VM_ENV_DATA_INDEX_SPECVAL = Primitive.cexpr! %q{ LONG2NUM(VM_ENV_DATA_INDEX_SPECVAL) }
-  C::ARRAY_REDEFINED_OP_FLAG = Primitive.cexpr! %q{ SIZET2NUM(ARRAY_REDEFINED_OP_FLAG) }
-  C::BOP_AND = Primitive.cexpr! %q{ SIZET2NUM(BOP_AND) }
-  C::BOP_AREF = Primitive.cexpr! %q{ SIZET2NUM(BOP_AREF) }
-  C::BOP_EQ = Primitive.cexpr! %q{ SIZET2NUM(BOP_EQ) }
-  C::BOP_EQQ = Primitive.cexpr! %q{ SIZET2NUM(BOP_EQQ) }
-  C::BOP_FREEZE = Primitive.cexpr! %q{ SIZET2NUM(BOP_FREEZE) }
-  C::BOP_GE = Primitive.cexpr! %q{ SIZET2NUM(BOP_GE) }
-  C::BOP_GT = Primitive.cexpr! %q{ SIZET2NUM(BOP_GT) }
-  C::BOP_LE = Primitive.cexpr! %q{ SIZET2NUM(BOP_LE) }
-  C::BOP_LT = Primitive.cexpr! %q{ SIZET2NUM(BOP_LT) }
-  C::BOP_MINUS = Primitive.cexpr! %q{ SIZET2NUM(BOP_MINUS) }
-  C::BOP_MOD = Primitive.cexpr! %q{ SIZET2NUM(BOP_MOD) }
-  C::BOP_OR = Primitive.cexpr! %q{ SIZET2NUM(BOP_OR) }
-  C::BOP_PLUS = Primitive.cexpr! %q{ SIZET2NUM(BOP_PLUS) }
-  C::BUILTIN_ATTR_LEAF = Primitive.cexpr! %q{ SIZET2NUM(BUILTIN_ATTR_LEAF) }
-  C::BUILTIN_ATTR_NO_GC = Primitive.cexpr! %q{ SIZET2NUM(BUILTIN_ATTR_NO_GC) }
-  C::HASH_REDEFINED_OP_FLAG = Primitive.cexpr! %q{ SIZET2NUM(HASH_REDEFINED_OP_FLAG) }
-  C::INTEGER_REDEFINED_OP_FLAG = Primitive.cexpr! %q{ SIZET2NUM(INTEGER_REDEFINED_OP_FLAG) }
-  C::INVALID_SHAPE_ID = Primitive.cexpr! %q{ SIZET2NUM(INVALID_SHAPE_ID) }
-  C::METHOD_VISI_PRIVATE = Primitive.cexpr! %q{ SIZET2NUM(METHOD_VISI_PRIVATE) }
-  C::METHOD_VISI_PROTECTED = Primitive.cexpr! %q{ SIZET2NUM(METHOD_VISI_PROTECTED) }
-  C::METHOD_VISI_PUBLIC = Primitive.cexpr! %q{ SIZET2NUM(METHOD_VISI_PUBLIC) }
-  C::METHOD_VISI_UNDEF = Primitive.cexpr! %q{ SIZET2NUM(METHOD_VISI_UNDEF) }
-  C::OBJ_TOO_COMPLEX_SHAPE_ID = Primitive.cexpr! %q{ SIZET2NUM(OBJ_TOO_COMPLEX_SHAPE_ID) }
-  C::OPTIMIZED_METHOD_TYPE_BLOCK_CALL = Primitive.cexpr! %q{ SIZET2NUM(OPTIMIZED_METHOD_TYPE_BLOCK_CALL) }
-  C::OPTIMIZED_METHOD_TYPE_CALL = Primitive.cexpr! %q{ SIZET2NUM(OPTIMIZED_METHOD_TYPE_CALL) }
-  C::OPTIMIZED_METHOD_TYPE_SEND = Primitive.cexpr! %q{ SIZET2NUM(OPTIMIZED_METHOD_TYPE_SEND) }
-  C::OPTIMIZED_METHOD_TYPE_STRUCT_AREF = Primitive.cexpr! %q{ SIZET2NUM(OPTIMIZED_METHOD_TYPE_STRUCT_AREF) }
-  C::OPTIMIZED_METHOD_TYPE_STRUCT_ASET = Primitive.cexpr! %q{ SIZET2NUM(OPTIMIZED_METHOD_TYPE_STRUCT_ASET) }
-  C::RARRAY_EMBED_FLAG = Primitive.cexpr! %q{ SIZET2NUM(RARRAY_EMBED_FLAG) }
-  C::RARRAY_EMBED_LEN_MASK = Primitive.cexpr! %q{ SIZET2NUM(RARRAY_EMBED_LEN_MASK) }
-  C::RARRAY_EMBED_LEN_SHIFT = Primitive.cexpr! %q{ SIZET2NUM(RARRAY_EMBED_LEN_SHIFT) }
-  C::RHASH_PASS_AS_KEYWORDS = Primitive.cexpr! %q{ SIZET2NUM(RHASH_PASS_AS_KEYWORDS) }
-  C::RMODULE_IS_REFINEMENT = Primitive.cexpr! %q{ SIZET2NUM(RMODULE_IS_REFINEMENT) }
-  C::ROBJECT_EMBED = Primitive.cexpr! %q{ SIZET2NUM(ROBJECT_EMBED) }
-  C::RSTRUCT_EMBED_LEN_MASK = Primitive.cexpr! %q{ SIZET2NUM(RSTRUCT_EMBED_LEN_MASK) }
-  C::RUBY_ENCODING_MASK = Primitive.cexpr! %q{ SIZET2NUM(RUBY_ENCODING_MASK) }
-  C::RUBY_EVENT_CLASS = Primitive.cexpr! %q{ SIZET2NUM(RUBY_EVENT_CLASS) }
-  C::RUBY_EVENT_C_CALL = Primitive.cexpr! %q{ SIZET2NUM(RUBY_EVENT_C_CALL) }
-  C::RUBY_EVENT_C_RETURN = Primitive.cexpr! %q{ SIZET2NUM(RUBY_EVENT_C_RETURN) }
-  C::RUBY_FIXNUM_FLAG = Primitive.cexpr! %q{ SIZET2NUM(RUBY_FIXNUM_FLAG) }
-  C::RUBY_FLONUM_FLAG = Primitive.cexpr! %q{ SIZET2NUM(RUBY_FLONUM_FLAG) }
-  C::RUBY_FLONUM_MASK = Primitive.cexpr! %q{ SIZET2NUM(RUBY_FLONUM_MASK) }
-  C::RUBY_FL_FREEZE = Primitive.cexpr! %q{ SIZET2NUM(RUBY_FL_FREEZE) }
-  C::RUBY_FL_SINGLETON = Primitive.cexpr! %q{ SIZET2NUM(RUBY_FL_SINGLETON) }
-  C::RUBY_IMMEDIATE_MASK = Primitive.cexpr! %q{ SIZET2NUM(RUBY_IMMEDIATE_MASK) }
-  C::RUBY_SPECIAL_SHIFT = Primitive.cexpr! %q{ SIZET2NUM(RUBY_SPECIAL_SHIFT) }
-  C::RUBY_SYMBOL_FLAG = Primitive.cexpr! %q{ SIZET2NUM(RUBY_SYMBOL_FLAG) }
-  C::RUBY_T_ARRAY = Primitive.cexpr! %q{ SIZET2NUM(RUBY_T_ARRAY) }
-  C::RUBY_T_CLASS = Primitive.cexpr! %q{ SIZET2NUM(RUBY_T_CLASS) }
-  C::RUBY_T_HASH = Primitive.cexpr! %q{ SIZET2NUM(RUBY_T_HASH) }
-  C::RUBY_T_ICLASS = Primitive.cexpr! %q{ SIZET2NUM(RUBY_T_ICLASS) }
-  C::RUBY_T_MASK = Primitive.cexpr! %q{ SIZET2NUM(RUBY_T_MASK) }
-  C::RUBY_T_MODULE = Primitive.cexpr! %q{ SIZET2NUM(RUBY_T_MODULE) }
-  C::RUBY_T_OBJECT = Primitive.cexpr! %q{ SIZET2NUM(RUBY_T_OBJECT) }
-  C::RUBY_T_STRING = Primitive.cexpr! %q{ SIZET2NUM(RUBY_T_STRING) }
-  C::RUBY_T_SYMBOL = Primitive.cexpr! %q{ SIZET2NUM(RUBY_T_SYMBOL) }
-  C::SHAPE_CAPACITY_CHANGE = Primitive.cexpr! %q{ SIZET2NUM(SHAPE_CAPACITY_CHANGE) }
-  C::SHAPE_FLAG_SHIFT = Primitive.cexpr! %q{ SIZET2NUM(SHAPE_FLAG_SHIFT) }
-  C::SHAPE_FROZEN = Primitive.cexpr! %q{ SIZET2NUM(SHAPE_FROZEN) }
-  C::SHAPE_ID_NUM_BITS = Primitive.cexpr! %q{ SIZET2NUM(SHAPE_ID_NUM_BITS) }
-  C::SHAPE_INITIAL_CAPACITY = Primitive.cexpr! %q{ SIZET2NUM(SHAPE_INITIAL_CAPACITY) }
-  C::SHAPE_IVAR = Primitive.cexpr! %q{ SIZET2NUM(SHAPE_IVAR) }
-  C::SHAPE_MASK = Primitive.cexpr! %q{ SIZET2NUM(SHAPE_MASK) }
-  C::SHAPE_ROOT = Primitive.cexpr! %q{ SIZET2NUM(SHAPE_ROOT) }
-  C::STRING_REDEFINED_OP_FLAG = Primitive.cexpr! %q{ SIZET2NUM(STRING_REDEFINED_OP_FLAG) }
-  C::T_OBJECT = Primitive.cexpr! %q{ SIZET2NUM(T_OBJECT) }
-  C::VM_BLOCK_HANDLER_NONE = Primitive.cexpr! %q{ SIZET2NUM(VM_BLOCK_HANDLER_NONE) }
-  C::VM_CALL_ARGS_BLOCKARG = Primitive.cexpr! %q{ SIZET2NUM(VM_CALL_ARGS_BLOCKARG) }
-  C::VM_CALL_ARGS_SPLAT = Primitive.cexpr! %q{ SIZET2NUM(VM_CALL_ARGS_SPLAT) }
-  C::VM_CALL_FCALL = Primitive.cexpr! %q{ SIZET2NUM(VM_CALL_FCALL) }
-  C::VM_CALL_KWARG = Primitive.cexpr! %q{ SIZET2NUM(VM_CALL_KWARG) }
-  C::VM_CALL_KW_SPLAT = Primitive.cexpr! %q{ SIZET2NUM(VM_CALL_KW_SPLAT) }
-  C::VM_CALL_KW_SPLAT_MUT = Primitive.cexpr! %q{ SIZET2NUM(VM_CALL_KW_SPLAT_MUT) }
-  C::VM_CALL_KW_SPLAT_bit = Primitive.cexpr! %q{ SIZET2NUM(VM_CALL_KW_SPLAT_bit) }
-  C::VM_CALL_OPT_SEND = Primitive.cexpr! %q{ SIZET2NUM(VM_CALL_OPT_SEND) }
-  C::VM_CALL_TAILCALL = Primitive.cexpr! %q{ SIZET2NUM(VM_CALL_TAILCALL) }
-  C::VM_CALL_TAILCALL_bit = Primitive.cexpr! %q{ SIZET2NUM(VM_CALL_TAILCALL_bit) }
-  C::VM_CALL_ZSUPER = Primitive.cexpr! %q{ SIZET2NUM(VM_CALL_ZSUPER) }
-  C::VM_ENV_DATA_INDEX_FLAGS = Primitive.cexpr! %q{ SIZET2NUM(VM_ENV_DATA_INDEX_FLAGS) }
-  C::VM_ENV_DATA_SIZE = Primitive.cexpr! %q{ SIZET2NUM(VM_ENV_DATA_SIZE) }
-  C::VM_ENV_FLAG_LOCAL = Primitive.cexpr! %q{ SIZET2NUM(VM_ENV_FLAG_LOCAL) }
-  C::VM_ENV_FLAG_WB_REQUIRED = Primitive.cexpr! %q{ SIZET2NUM(VM_ENV_FLAG_WB_REQUIRED) }
-  C::VM_FRAME_FLAG_BMETHOD = Primitive.cexpr! %q{ SIZET2NUM(VM_FRAME_FLAG_BMETHOD) }
-  C::VM_FRAME_FLAG_CFRAME = Primitive.cexpr! %q{ SIZET2NUM(VM_FRAME_FLAG_CFRAME) }
-  C::VM_FRAME_FLAG_CFRAME_KW = Primitive.cexpr! %q{ SIZET2NUM(VM_FRAME_FLAG_CFRAME_KW) }
-  C::VM_FRAME_FLAG_LAMBDA = Primitive.cexpr! %q{ SIZET2NUM(VM_FRAME_FLAG_LAMBDA) }
-  C::VM_FRAME_FLAG_MODIFIED_BLOCK_PARAM = Primitive.cexpr! %q{ SIZET2NUM(VM_FRAME_FLAG_MODIFIED_BLOCK_PARAM) }
-  C::VM_FRAME_MAGIC_BLOCK = Primitive.cexpr! %q{ SIZET2NUM(VM_FRAME_MAGIC_BLOCK) }
-  C::VM_FRAME_MAGIC_CFUNC = Primitive.cexpr! %q{ SIZET2NUM(VM_FRAME_MAGIC_CFUNC) }
-  C::VM_FRAME_MAGIC_METHOD = Primitive.cexpr! %q{ SIZET2NUM(VM_FRAME_MAGIC_METHOD) }
-  C::VM_METHOD_TYPE_ALIAS = Primitive.cexpr! %q{ SIZET2NUM(VM_METHOD_TYPE_ALIAS) }
-  C::VM_METHOD_TYPE_ATTRSET = Primitive.cexpr! %q{ SIZET2NUM(VM_METHOD_TYPE_ATTRSET) }
-  C::VM_METHOD_TYPE_BMETHOD = Primitive.cexpr! %q{ SIZET2NUM(VM_METHOD_TYPE_BMETHOD) }
-  C::VM_METHOD_TYPE_CFUNC = Primitive.cexpr! %q{ SIZET2NUM(VM_METHOD_TYPE_CFUNC) }
-  C::VM_METHOD_TYPE_ISEQ = Primitive.cexpr! %q{ SIZET2NUM(VM_METHOD_TYPE_ISEQ) }
-  C::VM_METHOD_TYPE_IVAR = Primitive.cexpr! %q{ SIZET2NUM(VM_METHOD_TYPE_IVAR) }
-  C::VM_METHOD_TYPE_MISSING = Primitive.cexpr! %q{ SIZET2NUM(VM_METHOD_TYPE_MISSING) }
-  C::VM_METHOD_TYPE_NOTIMPLEMENTED = Primitive.cexpr! %q{ SIZET2NUM(VM_METHOD_TYPE_NOTIMPLEMENTED) }
-  C::VM_METHOD_TYPE_OPTIMIZED = Primitive.cexpr! %q{ SIZET2NUM(VM_METHOD_TYPE_OPTIMIZED) }
-  C::VM_METHOD_TYPE_REFINED = Primitive.cexpr! %q{ SIZET2NUM(VM_METHOD_TYPE_REFINED) }
-  C::VM_METHOD_TYPE_UNDEF = Primitive.cexpr! %q{ SIZET2NUM(VM_METHOD_TYPE_UNDEF) }
-  C::VM_METHOD_TYPE_ZSUPER = Primitive.cexpr! %q{ SIZET2NUM(VM_METHOD_TYPE_ZSUPER) }
-  C::VM_SPECIAL_OBJECT_VMCORE = Primitive.cexpr! %q{ SIZET2NUM(VM_SPECIAL_OBJECT_VMCORE) }
-
-  def C.block_type_iseq
-    Primitive.cexpr! %q{ SIZET2NUM(block_type_iseq) }
-  end
-
-  def C.idRespond_to_missing
-    Primitive.cexpr! %q{ SIZET2NUM(idRespond_to_missing) }
-  end
-
-  def C.imemo_callinfo
-    Primitive.cexpr! %q{ SIZET2NUM(imemo_callinfo) }
-  end
-
-  def C.imemo_iseq
-    Primitive.cexpr! %q{ SIZET2NUM(imemo_iseq) }
-  end
-
-  def C.rb_block_param_proxy
-    Primitive.cexpr! %q{ SIZET2NUM(rb_block_param_proxy) }
-  end
-
-  def C.rb_cArray
-    Primitive.cexpr! %q{ SIZET2NUM(rb_cArray) }
-  end
-
-  def C.rb_cFalseClass
-    Primitive.cexpr! %q{ SIZET2NUM(rb_cFalseClass) }
-  end
-
-  def C.rb_cFloat
-    Primitive.cexpr! %q{ SIZET2NUM(rb_cFloat) }
-  end
-
-  def C.rb_cInteger
-    Primitive.cexpr! %q{ SIZET2NUM(rb_cInteger) }
-  end
-
-  def C.rb_cNilClass
-    Primitive.cexpr! %q{ SIZET2NUM(rb_cNilClass) }
-  end
-
-  def C.rb_cString
-    Primitive.cexpr! %q{ SIZET2NUM(rb_cString) }
-  end
-
-  def C.rb_cSymbol
-    Primitive.cexpr! %q{ SIZET2NUM(rb_cSymbol) }
-  end
-
-  def C.rb_cTrueClass
-    Primitive.cexpr! %q{ SIZET2NUM(rb_cTrueClass) }
-  end
-
-  def C.rb_mRubyVMFrozenCore
-    Primitive.cexpr! %q{ SIZET2NUM(rb_mRubyVMFrozenCore) }
-  end
-
-  def C.rb_rjit_global_events
-    Primitive.cexpr! %q{ SIZET2NUM(rb_rjit_global_events) }
-  end
-
-  def C.rb_ary_clear
-    Primitive.cexpr! %q{ SIZET2NUM((size_t)rb_ary_clear) }
-  end
-
-  def C.rb_ary_dup
-    Primitive.cexpr! %q{ SIZET2NUM((size_t)rb_ary_dup) }
-  end
-
-  def C.rb_ary_entry_internal
-    Primitive.cexpr! %q{ SIZET2NUM((size_t)rb_ary_entry_internal) }
-  end
-
-  def C.rb_ary_push
-    Primitive.cexpr! %q{ SIZET2NUM((size_t)rb_ary_push) }
-  end
-
-  def C.rb_ary_resurrect
-    Primitive.cexpr! %q{ SIZET2NUM((size_t)rb_ary_resurrect) }
-  end
-
-  def C.rb_ary_store
-    Primitive.cexpr! %q{ SIZET2NUM((size_t)rb_ary_store) }
-  end
-
-  def C.rb_ary_tmp_new_from_values
-    Primitive.cexpr! %q{ SIZET2NUM((size_t)rb_ary_tmp_new_from_values) }
-  end
-
-  def C.rb_ary_unshift_m
-    Primitive.cexpr! %q{ SIZET2NUM((size_t)rb_ary_unshift_m) }
-  end
-
-  def C.rb_backref_get
-    Primitive.cexpr! %q{ SIZET2NUM((size_t)rb_backref_get) }
-  end
-
-  def C.rb_ec_ary_new_from_values
-    Primitive.cexpr! %q{ SIZET2NUM((size_t)rb_ec_ary_new_from_values) }
-  end
-
-  def C.rb_ec_str_resurrect
-    Primitive.cexpr! %q{ SIZET2NUM((size_t)rb_ec_str_resurrect) }
-  end
-
-  def C.rb_ensure_iv_list_size
-    Primitive.cexpr! %q{ SIZET2NUM((size_t)rb_ensure_iv_list_size) }
-  end
-
-  def C.rb_fix_aref
-    Primitive.cexpr! %q{ SIZET2NUM((size_t)rb_fix_aref) }
-  end
-
-  def C.rb_fix_div_fix
-    Primitive.cexpr! %q{ SIZET2NUM((size_t)rb_fix_div_fix) }
-  end
-
-  def C.rb_fix_mod_fix
-    Primitive.cexpr! %q{ SIZET2NUM((size_t)rb_fix_mod_fix) }
-  end
-
-  def C.rb_fix_mul_fix
-    Primitive.cexpr! %q{ SIZET2NUM((size_t)rb_fix_mul_fix) }
-  end
-
-  def C.rb_gc_writebarrier
-    Primitive.cexpr! %q{ SIZET2NUM((size_t)rb_gc_writebarrier) }
-  end
-
-  def C.rb_get_symbol_id
-    Primitive.cexpr! %q{ SIZET2NUM((size_t)rb_get_symbol_id) }
-  end
-
-  def C.rb_gvar_get
-    Primitive.cexpr! %q{ SIZET2NUM((size_t)rb_gvar_get) }
-  end
-
-  def C.rb_hash_aref
-    Primitive.cexpr! %q{ SIZET2NUM((size_t)rb_hash_aref) }
-  end
-
-  def C.rb_hash_aset
-    Primitive.cexpr! %q{ SIZET2NUM((size_t)rb_hash_aset) }
-  end
-
-  def C.rb_hash_bulk_insert
-    Primitive.cexpr! %q{ SIZET2NUM((size_t)rb_hash_bulk_insert) }
-  end
-
-  def C.rb_hash_new
-    Primitive.cexpr! %q{ SIZET2NUM((size_t)rb_hash_new) }
-  end
-
-  def C.rb_hash_new_with_size
-    Primitive.cexpr! %q{ SIZET2NUM((size_t)rb_hash_new_with_size) }
-  end
-
-  def C.rb_hash_resurrect
-    Primitive.cexpr! %q{ SIZET2NUM((size_t)rb_hash_resurrect) }
-  end
-
-  def C.rb_ivar_defined
-    Primitive.cexpr! %q{ SIZET2NUM((size_t)rb_ivar_defined) }
-  end
-
-  def C.rb_ivar_get
-    Primitive.cexpr! %q{ SIZET2NUM((size_t)rb_ivar_get) }
-  end
-
-  def C.rb_obj_as_string_result
-    Primitive.cexpr! %q{ SIZET2NUM((size_t)rb_obj_as_string_result) }
-  end
-
-  def C.rb_obj_is_kind_of
-    Primitive.cexpr! %q{ SIZET2NUM((size_t)rb_obj_is_kind_of) }
-  end
-
-  def C.rb_range_new
-    Primitive.cexpr! %q{ SIZET2NUM((size_t)rb_range_new) }
-  end
-
-  def C.rb_reg_last_match
-    Primitive.cexpr! %q{ SIZET2NUM((size_t)rb_reg_last_match) }
-  end
-
-  def C.rb_reg_match_last
-    Primitive.cexpr! %q{ SIZET2NUM((size_t)rb_reg_match_last) }
-  end
-
-  def C.rb_reg_match_post
-    Primitive.cexpr! %q{ SIZET2NUM((size_t)rb_reg_match_post) }
-  end
-
-  def C.rb_reg_match_pre
-    Primitive.cexpr! %q{ SIZET2NUM((size_t)rb_reg_match_pre) }
-  end
-
-  def C.rb_reg_new_ary
-    Primitive.cexpr! %q{ SIZET2NUM((size_t)rb_reg_new_ary) }
-  end
-
-  def C.rb_reg_nth_match
-    Primitive.cexpr! %q{ SIZET2NUM((size_t)rb_reg_nth_match) }
-  end
-
-  def C.rb_rjit_branch_stub_hit
-    Primitive.cexpr! %q{ SIZET2NUM((size_t)rb_rjit_branch_stub_hit) }
-  end
-
-  def C.rb_rjit_entry_stub_hit
-    Primitive.cexpr! %q{ SIZET2NUM((size_t)rb_rjit_entry_stub_hit) }
-  end
-
-  def C.rb_str_buf_append
-    Primitive.cexpr! %q{ SIZET2NUM((size_t)rb_str_buf_append) }
-  end
-
-  def C.rb_str_bytesize
-    Primitive.cexpr! %q{ SIZET2NUM((size_t)rb_str_bytesize) }
-  end
-
-  def C.rb_str_concat_literals
-    Primitive.cexpr! %q{ SIZET2NUM((size_t)rb_str_concat_literals) }
-  end
-
-  def C.rb_str_dup
-    Primitive.cexpr! %q{ SIZET2NUM((size_t)rb_str_dup) }
-  end
-
-  def C.rb_str_eql_internal
-    Primitive.cexpr! %q{ SIZET2NUM((size_t)rb_str_eql_internal) }
-  end
-
-  def C.rb_str_getbyte
-    Primitive.cexpr! %q{ SIZET2NUM((size_t)rb_str_getbyte) }
-  end
-
-  def C.rb_str_intern
-    Primitive.cexpr! %q{ SIZET2NUM((size_t)rb_str_intern) }
-  end
-
-  def C.rb_sym_to_proc
-    Primitive.cexpr! %q{ SIZET2NUM((size_t)rb_sym_to_proc) }
-  end
-
-  def C.rb_vm_bh_to_procval
-    Primitive.cexpr! %q{ SIZET2NUM((size_t)rb_vm_bh_to_procval) }
-  end
-
-  def C.rb_vm_concat_array
-    Primitive.cexpr! %q{ SIZET2NUM((size_t)rb_vm_concat_array) }
-  end
-
-  def C.rb_vm_defined
-    Primitive.cexpr! %q{ SIZET2NUM((size_t)rb_vm_defined) }
-  end
-
-  def C.rb_vm_get_ev_const
-    Primitive.cexpr! %q{ SIZET2NUM((size_t)rb_vm_get_ev_const) }
-  end
-
-  def C.rb_vm_getclassvariable
-    Primitive.cexpr! %q{ SIZET2NUM((size_t)rb_vm_getclassvariable) }
-  end
-
-  def C.rb_vm_ic_hit_p
-    Primitive.cexpr! %q{ SIZET2NUM((size_t)rb_vm_ic_hit_p) }
-  end
-
-  def C.rb_vm_opt_newarray_hash
-    Primitive.cexpr! %q{ SIZET2NUM((size_t)rb_vm_opt_newarray_hash) }
-  end
-
-  def C.rb_vm_opt_newarray_max
-    Primitive.cexpr! %q{ SIZET2NUM((size_t)rb_vm_opt_newarray_max) }
-  end
-
-  def C.rb_vm_opt_newarray_min
-    Primitive.cexpr! %q{ SIZET2NUM((size_t)rb_vm_opt_newarray_min) }
-  end
-
-  def C.rb_vm_set_ivar_id
-    Primitive.cexpr! %q{ SIZET2NUM((size_t)rb_vm_set_ivar_id) }
-  end
-
-  def C.rb_vm_setclassvariable
-    Primitive.cexpr! %q{ SIZET2NUM((size_t)rb_vm_setclassvariable) }
-  end
-
-  def C.rb_vm_setinstancevariable
-    Primitive.cexpr! %q{ SIZET2NUM((size_t)rb_vm_setinstancevariable) }
-  end
-
-  def C.rb_vm_splat_array
-    Primitive.cexpr! %q{ SIZET2NUM((size_t)rb_vm_splat_array) }
-  end
-
-  def C.rb_vm_throw
-    Primitive.cexpr! %q{ SIZET2NUM((size_t)rb_vm_throw) }
-  end
-
-  def C.rb_vm_yield_with_cfunc
-    Primitive.cexpr! %q{ SIZET2NUM((size_t)rb_vm_yield_with_cfunc) }
-  end
-
-  def C.rjit_build_kwhash
-    Primitive.cexpr! %q{ SIZET2NUM((size_t)rjit_build_kwhash) }
-  end
-
-  def C.rjit_full_cfunc_return
-    Primitive.cexpr! %q{ SIZET2NUM((size_t)rjit_full_cfunc_return) }
-  end
-
-  def C.rjit_optimized_call
-    Primitive.cexpr! %q{ SIZET2NUM((size_t)rjit_optimized_call) }
-  end
-
-  def C.rjit_rb_ary_subseq_length
-    Primitive.cexpr! %q{ SIZET2NUM((size_t)rjit_rb_ary_subseq_length) }
-  end
-
-  def C.rjit_record_exit_stack
-    Primitive.cexpr! %q{ SIZET2NUM((size_t)rjit_record_exit_stack) }
-  end
-
-  def C.rjit_str_neq_internal
-    Primitive.cexpr! %q{ SIZET2NUM((size_t)rjit_str_neq_internal) }
-  end
-
-  def C.rjit_str_simple_append
-    Primitive.cexpr! %q{ SIZET2NUM((size_t)rjit_str_simple_append) }
-  end
-
-  def C.CALL_DATA
-    @CALL_DATA ||= self.rb_call_data
-  end
-
-  def C.IC
-    @IC ||= self.iseq_inline_constant_cache
-  end
-
-  def C.ID
-    @ID ||= CType::Immediate.parse("unsigned long")
-  end
-
-  def C.IVC
-    @IVC ||= self.iseq_inline_iv_cache_entry
-  end
-
-  def C.RArray
-    @RArray ||= CType::Struct.new(
-      "RArray", Primitive.cexpr!("SIZEOF(struct RArray)"),
-      basic: [self.RBasic, Primitive.cexpr!("OFFSETOF((*((struct RArray *)NULL)), basic)")],
-      as: [CType::Union.new(
-        "", Primitive.cexpr!("SIZEOF(((struct RArray *)NULL)->as)"),
-        heap: CType::Struct.new(
-          "", Primitive.cexpr!("SIZEOF(((struct RArray *)NULL)->as.heap)"),
-          len: [CType::Immediate.parse("long"), Primitive.cexpr!("OFFSETOF(((struct RArray *)NULL)->as.heap, len)")],
-          aux: [CType::Union.new(
-            "", Primitive.cexpr!("SIZEOF(((struct RArray *)NULL)->as.heap.aux)"),
-            capa: CType::Immediate.parse("long"),
-            shared_root: self.VALUE,
-          ), Primitive.cexpr!("OFFSETOF(((struct RArray *)NULL)->as.heap, aux)")],
-          ptr: [CType::Pointer.new { self.VALUE }, Primitive.cexpr!("OFFSETOF(((struct RArray *)NULL)->as.heap, ptr)")],
-        ),
-        ary: CType::Pointer.new { self.VALUE },
-      ), Primitive.cexpr!("OFFSETOF((*((struct RArray *)NULL)), as)")],
-    )
-  end
-
-  def C.RB_BUILTIN
-    @RB_BUILTIN ||= self.rb_builtin_function
-  end
-
-  def C.RBasic
-    @RBasic ||= CType::Struct.new(
-      "RBasic", Primitive.cexpr!("SIZEOF(struct RBasic)"),
-      flags: [self.VALUE, Primitive.cexpr!("OFFSETOF((*((struct RBasic *)NULL)), flags)")],
-      klass: [self.VALUE, Primitive.cexpr!("OFFSETOF((*((struct RBasic *)NULL)), klass)")],
-    )
-  end
-
-  def C.RObject
-    @RObject ||= CType::Struct.new(
-      "RObject", Primitive.cexpr!("SIZEOF(struct RObject)"),
-      basic: [self.RBasic, Primitive.cexpr!("OFFSETOF((*((struct RObject *)NULL)), basic)")],
-      as: [CType::Union.new(
-        "", Primitive.cexpr!("SIZEOF(((struct RObject *)NULL)->as)"),
-        heap: CType::Struct.new(
-          "", Primitive.cexpr!("SIZEOF(((struct RObject *)NULL)->as.heap)"),
-          ivptr: [CType::Pointer.new { self.VALUE }, Primitive.cexpr!("OFFSETOF(((struct RObject *)NULL)->as.heap, ivptr)")],
-          iv_index_tbl: [CType::Pointer.new { self.rb_id_table }, Primitive.cexpr!("OFFSETOF(((struct RObject *)NULL)->as.heap, iv_index_tbl)")],
-        ),
-        ary: CType::Pointer.new { self.VALUE },
-      ), Primitive.cexpr!("OFFSETOF((*((struct RObject *)NULL)), as)")],
-    )
-  end
-
-  def C.RString
-    @RString ||= CType::Struct.new(
-      "RString", Primitive.cexpr!("SIZEOF(struct RString)"),
-      basic: [self.RBasic, Primitive.cexpr!("OFFSETOF((*((struct RString *)NULL)), basic)")],
-      len: [CType::Immediate.parse("long"), Primitive.cexpr!("OFFSETOF((*((struct RString *)NULL)), len)")],
-      as: [CType::Union.new(
-        "", Primitive.cexpr!("SIZEOF(((struct RString *)NULL)->as)"),
-        heap: CType::Struct.new(
-          "", Primitive.cexpr!("SIZEOF(((struct RString *)NULL)->as.heap)"),
-          ptr: [CType::Pointer.new { CType::Immediate.parse("char") }, Primitive.cexpr!("OFFSETOF(((struct RString *)NULL)->as.heap, ptr)")],
-          aux: [CType::Union.new(
-            "", Primitive.cexpr!("SIZEOF(((struct RString *)NULL)->as.heap.aux)"),
-            capa: CType::Immediate.parse("long"),
-            shared: self.VALUE,
-          ), Primitive.cexpr!("OFFSETOF(((struct RString *)NULL)->as.heap, aux)")],
-        ),
-        embed: CType::Struct.new(
-          "", Primitive.cexpr!("SIZEOF(((struct RString *)NULL)->as.embed)"),
-          ary: [CType::Pointer.new { CType::Immediate.parse("char") }, Primitive.cexpr!("OFFSETOF(((struct RString *)NULL)->as.embed, ary)")],
-        ),
-      ), Primitive.cexpr!("OFFSETOF((*((struct RString *)NULL)), as)")],
-    )
-  end
-
-  def C.RStruct
-    @RStruct ||= CType::Struct.new(
-      "RStruct", Primitive.cexpr!("SIZEOF(struct RStruct)"),
-      basic: [self.RBasic, Primitive.cexpr!("OFFSETOF((*((struct RStruct *)NULL)), basic)")],
-      as: [CType::Union.new(
-        "", Primitive.cexpr!("SIZEOF(((struct RStruct *)NULL)->as)"),
-        heap: CType::Struct.new(
-          "", Primitive.cexpr!("SIZEOF(((struct RStruct *)NULL)->as.heap)"),
-          len: [CType::Immediate.parse("long"), Primitive.cexpr!("OFFSETOF(((struct RStruct *)NULL)->as.heap, len)")],
-          ptr: [CType::Pointer.new { self.VALUE }, Primitive.cexpr!("OFFSETOF(((struct RStruct *)NULL)->as.heap, ptr)")],
-        ),
-        ary: CType::Pointer.new { self.VALUE },
-      ), Primitive.cexpr!("OFFSETOF((*((struct RStruct *)NULL)), as)")],
-    )
-  end
-
-  def C.attr_index_t
-    @attr_index_t ||= CType::Immediate.parse("uint32_t")
-  end
-
-  def C.iseq_inline_constant_cache
-    @iseq_inline_constant_cache ||= CType::Struct.new(
-      "iseq_inline_constant_cache", Primitive.cexpr!("SIZEOF(struct iseq_inline_constant_cache)"),
-      entry: [CType::Pointer.new { self.iseq_inline_constant_cache_entry }, Primitive.cexpr!("OFFSETOF((*((struct iseq_inline_constant_cache *)NULL)), entry)")],
-      segments: [CType::Pointer.new { self.ID }, Primitive.cexpr!("OFFSETOF((*((struct iseq_inline_constant_cache *)NULL)), segments)")],
-    )
-  end
-
-  def C.iseq_inline_constant_cache_entry
-    @iseq_inline_constant_cache_entry ||= CType::Struct.new(
-      "iseq_inline_constant_cache_entry", Primitive.cexpr!("SIZEOF(struct iseq_inline_constant_cache_entry)"),
-      flags: [self.VALUE, Primitive.cexpr!("OFFSETOF((*((struct iseq_inline_constant_cache_entry *)NULL)), flags)")],
-      value: [self.VALUE, Primitive.cexpr!("OFFSETOF((*((struct iseq_inline_constant_cache_entry *)NULL)), value)")],
-      _unused1: [self.VALUE, Primitive.cexpr!("OFFSETOF((*((struct iseq_inline_constant_cache_entry *)NULL)), _unused1)")],
-      _unused2: [self.VALUE, Primitive.cexpr!("OFFSETOF((*((struct iseq_inline_constant_cache_entry *)NULL)), _unused2)")],
-      ic_cref: [CType::Pointer.new { self.rb_cref_t }, Primitive.cexpr!("OFFSETOF((*((struct iseq_inline_constant_cache_entry *)NULL)), ic_cref)")],
-    )
-  end
-
-  def C.iseq_inline_iv_cache_entry
-    @iseq_inline_iv_cache_entry ||= CType::Struct.new(
-      "iseq_inline_iv_cache_entry", Primitive.cexpr!("SIZEOF(struct iseq_inline_iv_cache_entry)"),
-      value: [CType::Immediate.parse("uintptr_t"), Primitive.cexpr!("OFFSETOF((*((struct iseq_inline_iv_cache_entry *)NULL)), value)")],
-      iv_set_name: [self.ID, Primitive.cexpr!("OFFSETOF((*((struct iseq_inline_iv_cache_entry *)NULL)), iv_set_name)")],
-    )
-  end
-
-  def C.iseq_inline_storage_entry
-    @iseq_inline_storage_entry ||= CType::Union.new(
-      "iseq_inline_storage_entry", Primitive.cexpr!("SIZEOF(union iseq_inline_storage_entry)"),
-      once: CType::Struct.new(
-        "", Primitive.cexpr!("SIZEOF(((union iseq_inline_storage_entry *)NULL)->once)"),
-        running_thread: [CType::Pointer.new { self.rb_thread_struct }, Primitive.cexpr!("OFFSETOF(((union iseq_inline_storage_entry *)NULL)->once, running_thread)")],
-        value: [self.VALUE, Primitive.cexpr!("OFFSETOF(((union iseq_inline_storage_entry *)NULL)->once, value)")],
-      ),
-      ic_cache: self.iseq_inline_constant_cache,
-      iv_cache: self.iseq_inline_iv_cache_entry,
-    )
-  end
-
-  def C.method_optimized_type
-    @method_optimized_type ||= CType::Immediate.parse("int")
-  end
-
-  def C.rb_block
-    @rb_block ||= CType::Struct.new(
-      "rb_block", Primitive.cexpr!("SIZEOF(struct rb_block)"),
-      as: [CType::Union.new(
-        "", Primitive.cexpr!("SIZEOF(((struct rb_block *)NULL)->as)"),
-        captured: self.rb_captured_block,
-        symbol: self.VALUE,
-        proc: self.VALUE,
-      ), Primitive.cexpr!("OFFSETOF((*((struct rb_block *)NULL)), as)")],
-      type: [self.rb_block_type, Primitive.cexpr!("OFFSETOF((*((struct rb_block *)NULL)), type)")],
-    )
-  end
-
-  def C.rb_block_type
-    @rb_block_type ||= CType::Immediate.parse("int")
-  end
-
-  def C.rb_builtin_function
-    @rb_builtin_function ||= CType::Struct.new(
-      "rb_builtin_function", Primitive.cexpr!("SIZEOF(struct rb_builtin_function)"),
-      func_ptr: [CType::Immediate.parse("void *"), Primitive.cexpr!("OFFSETOF((*((struct rb_builtin_function *)NULL)), func_ptr)")],
-      argc: [CType::Immediate.parse("int"), Primitive.cexpr!("OFFSETOF((*((struct rb_builtin_function *)NULL)), argc)")],
-      index: [CType::Immediate.parse("int"), Primitive.cexpr!("OFFSETOF((*((struct rb_builtin_function *)NULL)), index)")],
-      name: [CType::Pointer.new { CType::Immediate.parse("char") }, Primitive.cexpr!("OFFSETOF((*((struct rb_builtin_function *)NULL)), name)")],
-    )
-  end
-
-  def C.rb_call_data
-    @rb_call_data ||= CType::Struct.new(
-      "rb_call_data", Primitive.cexpr!("SIZEOF(struct rb_call_data)"),
-      ci: [CType::Pointer.new { self.rb_callinfo }, Primitive.cexpr!("OFFSETOF((*((struct rb_call_data *)NULL)), ci)")],
-      cc: [CType::Pointer.new { self.rb_callcache }, Primitive.cexpr!("OFFSETOF((*((struct rb_call_data *)NULL)), cc)")],
-    )
-  end
-
-  def C.rb_callable_method_entry_struct
-    @rb_callable_method_entry_struct ||= CType::Struct.new(
-      "rb_callable_method_entry_struct", Primitive.cexpr!("SIZEOF(struct rb_callable_method_entry_struct)"),
-      flags: [self.VALUE, Primitive.cexpr!("OFFSETOF((*((struct rb_callable_method_entry_struct *)NULL)), flags)")],
-      defined_class: [self.VALUE, Primitive.cexpr!("OFFSETOF((*((struct rb_callable_method_entry_struct *)NULL)), defined_class)"), true],
-      def: [CType::Pointer.new { self.rb_method_definition_struct }, Primitive.cexpr!("OFFSETOF((*((struct rb_callable_method_entry_struct *)NULL)), def)")],
-      called_id: [self.ID, Primitive.cexpr!("OFFSETOF((*((struct rb_callable_method_entry_struct *)NULL)), called_id)")],
-      owner: [self.VALUE, Primitive.cexpr!("OFFSETOF((*((struct rb_callable_method_entry_struct *)NULL)), owner)")],
-    )
-  end
-
-  def C.rb_callable_method_entry_t
-    @rb_callable_method_entry_t ||= CType::Struct.new(
-      "rb_callable_method_entry_struct", Primitive.cexpr!("SIZEOF(struct rb_callable_method_entry_struct)"),
-      flags: [self.VALUE, Primitive.cexpr!("OFFSETOF((*((struct rb_callable_method_entry_struct *)NULL)), flags)")],
-      defined_class: [self.VALUE, Primitive.cexpr!("OFFSETOF((*((struct rb_callable_method_entry_struct *)NULL)), defined_class)"), true],
-      def: [CType::Pointer.new { self.rb_method_definition_struct }, Primitive.cexpr!("OFFSETOF((*((struct rb_callable_method_entry_struct *)NULL)), def)")],
-      called_id: [self.ID, Primitive.cexpr!("OFFSETOF((*((struct rb_callable_method_entry_struct *)NULL)), called_id)")],
-      owner: [self.VALUE, Primitive.cexpr!("OFFSETOF((*((struct rb_callable_method_entry_struct *)NULL)), owner)")],
-    )
-  end
-
-  def C.rb_callcache
-    @rb_callcache ||= CType::Struct.new(
-      "rb_callcache", Primitive.cexpr!("SIZEOF(struct rb_callcache)"),
-      flags: [self.VALUE, Primitive.cexpr!("OFFSETOF((*((struct rb_callcache *)NULL)), flags)")],
-      klass: [self.VALUE, Primitive.cexpr!("OFFSETOF((*((struct rb_callcache *)NULL)), klass)")],
-      cme_: [CType::Pointer.new { self.rb_callable_method_entry_struct }, Primitive.cexpr!("OFFSETOF((*((struct rb_callcache *)NULL)), cme_)")],
-      call_: [self.vm_call_handler, Primitive.cexpr!("OFFSETOF((*((struct rb_callcache *)NULL)), call_)")],
-      aux_: [CType::Union.new(
-        "", Primitive.cexpr!("SIZEOF(((struct rb_callcache *)NULL)->aux_)"),
-        attr: CType::Struct.new(
-          "", Primitive.cexpr!("SIZEOF(((struct rb_callcache *)NULL)->aux_.attr)"),
-          value: [CType::Immediate.parse("uintptr_t"), Primitive.cexpr!("OFFSETOF(((struct rb_callcache *)NULL)->aux_.attr, value)")],
-        ),
-        method_missing_reason: self.method_missing_reason,
-        v: self.VALUE,
-        bf: CType::Pointer.new { self.rb_builtin_function },
-      ), Primitive.cexpr!("OFFSETOF((*((struct rb_callcache *)NULL)), aux_)")],
-    )
-  end
-
-  def C.rb_callinfo
-    @rb_callinfo ||= CType::Struct.new(
-      "rb_callinfo", Primitive.cexpr!("SIZEOF(struct rb_callinfo)"),
-      flags: [self.VALUE, Primitive.cexpr!("OFFSETOF((*((struct rb_callinfo *)NULL)), flags)")],
-      kwarg: [CType::Pointer.new { self.rb_callinfo_kwarg }, Primitive.cexpr!("OFFSETOF((*((struct rb_callinfo *)NULL)), kwarg)")],
-      mid: [self.VALUE, Primitive.cexpr!("OFFSETOF((*((struct rb_callinfo *)NULL)), mid)")],
-      flag: [self.VALUE, Primitive.cexpr!("OFFSETOF((*((struct rb_callinfo *)NULL)), flag)")],
-      argc: [self.VALUE, Primitive.cexpr!("OFFSETOF((*((struct rb_callinfo *)NULL)), argc)")],
-    )
-  end
-
-  def C.rb_callinfo_kwarg
-    @rb_callinfo_kwarg ||= CType::Struct.new(
-      "rb_callinfo_kwarg", Primitive.cexpr!("SIZEOF(struct rb_callinfo_kwarg)"),
-      keyword_len: [CType::Immediate.parse("int"), Primitive.cexpr!("OFFSETOF((*((struct rb_callinfo_kwarg *)NULL)), keyword_len)")],
-      keywords: [CType::Immediate.parse("void *"), Primitive.cexpr!("OFFSETOF((*((struct rb_callinfo_kwarg *)NULL)), keywords)")],
-    )
-  end
-
-  def C.rb_captured_block
-    @rb_captured_block ||= CType::Struct.new(
-      "rb_captured_block", Primitive.cexpr!("SIZEOF(struct rb_captured_block)"),
-      self: [self.VALUE, Primitive.cexpr!("OFFSETOF((*((struct rb_captured_block *)NULL)), self)")],
-      ep: [CType::Pointer.new { self.VALUE }, Primitive.cexpr!("OFFSETOF((*((struct rb_captured_block *)NULL)), ep)")],
-      code: [CType::Union.new(
-        "", Primitive.cexpr!("SIZEOF(((struct rb_captured_block *)NULL)->code)"),
-        iseq: CType::Pointer.new { self.rb_iseq_t },
-        ifunc: CType::Pointer.new { self.vm_ifunc },
-        val: self.VALUE,
-      ), Primitive.cexpr!("OFFSETOF((*((struct rb_captured_block *)NULL)), code)")],
-    )
-  end
-
-  def C.rb_control_frame_t
-    @rb_control_frame_t ||= CType::Struct.new(
-      "rb_control_frame_struct", Primitive.cexpr!("SIZEOF(struct rb_control_frame_struct)"),
-      pc: [CType::Pointer.new { self.VALUE }, Primitive.cexpr!("OFFSETOF((*((struct rb_control_frame_struct *)NULL)), pc)")],
-      sp: [CType::Pointer.new { self.VALUE }, Primitive.cexpr!("OFFSETOF((*((struct rb_control_frame_struct *)NULL)), sp)")],
-      iseq: [CType::Pointer.new { self.rb_iseq_t }, Primitive.cexpr!("OFFSETOF((*((struct rb_control_frame_struct *)NULL)), iseq)")],
-      self: [self.VALUE, Primitive.cexpr!("OFFSETOF((*((struct rb_control_frame_struct *)NULL)), self)")],
-      ep: [CType::Pointer.new { self.VALUE }, Primitive.cexpr!("OFFSETOF((*((struct rb_control_frame_struct *)NULL)), ep)")],
-      block_code: [CType::Immediate.parse("void *"), Primitive.cexpr!("OFFSETOF((*((struct rb_control_frame_struct *)NULL)), block_code)")],
-      jit_return: [CType::Pointer.new { CType::Immediate.parse("void") }, Primitive.cexpr!("OFFSETOF((*((struct rb_control_frame_struct *)NULL)), jit_return)")],
-    )
-  end
-
-  def C.rb_cref_t
-    @rb_cref_t ||= CType::Struct.new(
-      "rb_cref_struct", Primitive.cexpr!("SIZEOF(struct rb_cref_struct)"),
-      flags: [self.VALUE, Primitive.cexpr!("OFFSETOF((*((struct rb_cref_struct *)NULL)), flags)")],
-      refinements: [self.VALUE, Primitive.cexpr!("OFFSETOF((*((struct rb_cref_struct *)NULL)), refinements)")],
-      klass_or_self: [self.VALUE, Primitive.cexpr!("OFFSETOF((*((struct rb_cref_struct *)NULL)), klass_or_self)")],
-      next: [CType::Pointer.new { self.rb_cref_struct }, Primitive.cexpr!("OFFSETOF((*((struct rb_cref_struct *)NULL)), next)")],
-      scope_visi: [self.rb_scope_visibility_t, Primitive.cexpr!("OFFSETOF((*((struct rb_cref_struct *)NULL)), scope_visi)")],
-    )
-  end
-
-  def C.rb_execution_context_struct
-    @rb_execution_context_struct ||= CType::Struct.new(
-      "rb_execution_context_struct", Primitive.cexpr!("SIZEOF(struct rb_execution_context_struct)"),
-      vm_stack: [CType::Pointer.new { self.VALUE }, Primitive.cexpr!("OFFSETOF((*((struct rb_execution_context_struct *)NULL)), vm_stack)")],
-      vm_stack_size: [CType::Immediate.parse("size_t"), Primitive.cexpr!("OFFSETOF((*((struct rb_execution_context_struct *)NULL)), vm_stack_size)")],
-      cfp: [CType::Pointer.new { self.rb_control_frame_t }, Primitive.cexpr!("OFFSETOF((*((struct rb_execution_context_struct *)NULL)), cfp)")],
-      tag: [CType::Pointer.new { self.rb_vm_tag }, Primitive.cexpr!("OFFSETOF((*((struct rb_execution_context_struct *)NULL)), tag)")],
-      interrupt_flag: [self.rb_atomic_t, Primitive.cexpr!("OFFSETOF((*((struct rb_execution_context_struct *)NULL)), interrupt_flag)")],
-      interrupt_mask: [self.rb_atomic_t, Primitive.cexpr!("OFFSETOF((*((struct rb_execution_context_struct *)NULL)), interrupt_mask)")],
-      fiber_ptr: [CType::Pointer.new { self.rb_fiber_t }, Primitive.cexpr!("OFFSETOF((*((struct rb_execution_context_struct *)NULL)), fiber_ptr)")],
-      thread_ptr: [CType::Pointer.new { self.rb_thread_struct }, Primitive.cexpr!("OFFSETOF((*((struct rb_execution_context_struct *)NULL)), thread_ptr)")],
-      local_storage: [CType::Pointer.new { self.rb_id_table }, Primitive.cexpr!("OFFSETOF((*((struct rb_execution_context_struct *)NULL)), local_storage)")],
-      local_storage_recursive_hash: [self.VALUE, Primitive.cexpr!("OFFSETOF((*((struct rb_execution_context_struct *)NULL)), local_storage_recursive_hash)")],
-      local_storage_recursive_hash_for_trace: [self.VALUE, Primitive.cexpr!("OFFSETOF((*((struct rb_execution_context_struct *)NULL)), local_storage_recursive_hash_for_trace)")],
-      storage: [self.VALUE, Primitive.cexpr!("OFFSETOF((*((struct rb_execution_context_struct *)NULL)), storage)")],
-      root_lep: [CType::Pointer.new { self.VALUE }, Primitive.cexpr!("OFFSETOF((*((struct rb_execution_context_struct *)NULL)), root_lep)")],
-      root_svar: [self.VALUE, Primitive.cexpr!("OFFSETOF((*((struct rb_execution_context_struct *)NULL)), root_svar)")],
-      ensure_list: [CType::Pointer.new { self.rb_ensure_list_t }, Primitive.cexpr!("OFFSETOF((*((struct rb_execution_context_struct *)NULL)), ensure_list)")],
-      trace_arg: [CType::Pointer.new { self.rb_trace_arg_struct }, Primitive.cexpr!("OFFSETOF((*((struct rb_execution_context_struct *)NULL)), trace_arg)")],
-      errinfo: [self.VALUE, Primitive.cexpr!("OFFSETOF((*((struct rb_execution_context_struct *)NULL)), errinfo)")],
-      passed_block_handler: [self.VALUE, Primitive.cexpr!("OFFSETOF((*((struct rb_execution_context_struct *)NULL)), passed_block_handler)")],
-      raised_flag: [CType::Immediate.parse("uint8_t"), Primitive.cexpr!("OFFSETOF((*((struct rb_execution_context_struct *)NULL)), raised_flag)")],
-      private_const_reference: [self.VALUE, Primitive.cexpr!("OFFSETOF((*((struct rb_execution_context_struct *)NULL)), private_const_reference)")],
-      machine: [CType::Struct.new(
-        "", Primitive.cexpr!("SIZEOF(((struct rb_execution_context_struct *)NULL)->machine)"),
-        stack_start: [CType::Pointer.new { self.VALUE }, Primitive.cexpr!("OFFSETOF(((struct rb_execution_context_struct *)NULL)->machine, stack_start)")],
-        stack_end: [CType::Pointer.new { self.VALUE }, Primitive.cexpr!("OFFSETOF(((struct rb_execution_context_struct *)NULL)->machine, stack_end)")],
-        stack_maxsize: [CType::Immediate.parse("size_t"), Primitive.cexpr!("OFFSETOF(((struct rb_execution_context_struct *)NULL)->machine, stack_maxsize)")],
-      ), Primitive.cexpr!("OFFSETOF((*((struct rb_execution_context_struct *)NULL)), machine)")],
-    )
-  end
-
-  def C.rb_execution_context_t
-    @rb_execution_context_t ||= self.rb_execution_context_struct
-  end
-
-  def C.rb_iseq_constant_body
-    @rb_iseq_constant_body ||= CType::Struct.new(
-      "rb_iseq_constant_body", Primitive.cexpr!("SIZEOF(struct rb_iseq_constant_body)"),
-      type: [self.rb_iseq_type, Primitive.cexpr!("OFFSETOF((*((struct rb_iseq_constant_body *)NULL)), type)")],
-      iseq_size: [CType::Immediate.parse("unsigned int"), Primitive.cexpr!("OFFSETOF((*((struct rb_iseq_constant_body *)NULL)), iseq_size)")],
-      iseq_encoded: [CType::Pointer.new { self.VALUE }, Primitive.cexpr!("OFFSETOF((*((struct rb_iseq_constant_body *)NULL)), iseq_encoded)")],
-      param: [CType::Struct.new(
-        "", Primitive.cexpr!("SIZEOF(((struct rb_iseq_constant_body *)NULL)->param)"),
-        flags: [CType::Struct.new(
-          "", Primitive.cexpr!("SIZEOF(((struct rb_iseq_constant_body *)NULL)->param.flags)"),
-          has_lead: [CType::BitField.new(1, 0), 0],
-          has_opt: [CType::BitField.new(1, 1), 1],
-          has_rest: [CType::BitField.new(1, 2), 2],
-          has_post: [CType::BitField.new(1, 3), 3],
-          has_kw: [CType::BitField.new(1, 4), 4],
-          has_kwrest: [CType::BitField.new(1, 5), 5],
-          has_block: [CType::BitField.new(1, 6), 6],
-          ambiguous_param0: [CType::BitField.new(1, 7), 7],
-          accepts_no_kwarg: [CType::BitField.new(1, 0), 8],
-          ruby2_keywords: [CType::BitField.new(1, 1), 9],
-        ), Primitive.cexpr!("OFFSETOF(((struct rb_iseq_constant_body *)NULL)->param, flags)")],
-        size: [CType::Immediate.parse("unsigned int"), Primitive.cexpr!("OFFSETOF(((struct rb_iseq_constant_body *)NULL)->param, size)")],
-        lead_num: [CType::Immediate.parse("int"), Primitive.cexpr!("OFFSETOF(((struct rb_iseq_constant_body *)NULL)->param, lead_num)")],
-        opt_num: [CType::Immediate.parse("int"), Primitive.cexpr!("OFFSETOF(((struct rb_iseq_constant_body *)NULL)->param, opt_num)")],
-        rest_start: [CType::Immediate.parse("int"), Primitive.cexpr!("OFFSETOF(((struct rb_iseq_constant_body *)NULL)->param, rest_start)")],
-        post_start: [CType::Immediate.parse("int"), Primitive.cexpr!("OFFSETOF(((struct rb_iseq_constant_body *)NULL)->param, post_start)")],
-        post_num: [CType::Immediate.parse("int"), Primitive.cexpr!("OFFSETOF(((struct rb_iseq_constant_body *)NULL)->param, post_num)")],
-        block_start: [CType::Immediate.parse("int"), Primitive.cexpr!("OFFSETOF(((struct rb_iseq_constant_body *)NULL)->param, block_start)")],
-        opt_table: [CType::Pointer.new { self.VALUE }, Primitive.cexpr!("OFFSETOF(((struct rb_iseq_constant_body *)NULL)->param, opt_table)")],
-        keyword: [CType::Pointer.new { self.rb_iseq_param_keyword }, Primitive.cexpr!("OFFSETOF(((struct rb_iseq_constant_body *)NULL)->param, keyword)")],
-      ), Primitive.cexpr!("OFFSETOF((*((struct rb_iseq_constant_body *)NULL)), param)")],
-      location: [self.rb_iseq_location_t, Primitive.cexpr!("OFFSETOF((*((struct rb_iseq_constant_body *)NULL)), location)")],
-      insns_info: [self.iseq_insn_info, Primitive.cexpr!("OFFSETOF((*((struct rb_iseq_constant_body *)NULL)), insns_info)")],
-      local_table: [CType::Pointer.new { self.ID }, Primitive.cexpr!("OFFSETOF((*((struct rb_iseq_constant_body *)NULL)), local_table)")],
-      catch_table: [CType::Pointer.new { self.iseq_catch_table }, Primitive.cexpr!("OFFSETOF((*((struct rb_iseq_constant_body *)NULL)), catch_table)")],
-      parent_iseq: [CType::Pointer.new { self.rb_iseq_struct }, Primitive.cexpr!("OFFSETOF((*((struct rb_iseq_constant_body *)NULL)), parent_iseq)")],
-      local_iseq: [CType::Pointer.new { self.rb_iseq_struct }, Primitive.cexpr!("OFFSETOF((*((struct rb_iseq_constant_body *)NULL)), local_iseq)")],
-      is_entries: [CType::Pointer.new { self.iseq_inline_storage_entry }, Primitive.cexpr!("OFFSETOF((*((struct rb_iseq_constant_body *)NULL)), is_entries)")],
-      call_data: [CType::Pointer.new { self.rb_call_data }, Primitive.cexpr!("OFFSETOF((*((struct rb_iseq_constant_body *)NULL)), call_data)")],
-      variable: [CType::Struct.new(
-        "", Primitive.cexpr!("SIZEOF(((struct rb_iseq_constant_body *)NULL)->variable)"),
-        flip_count: [self.rb_snum_t, Primitive.cexpr!("OFFSETOF(((struct rb_iseq_constant_body *)NULL)->variable, flip_count)")],
-        script_lines: [self.VALUE, Primitive.cexpr!("OFFSETOF(((struct rb_iseq_constant_body *)NULL)->variable, script_lines)")],
-        coverage: [self.VALUE, Primitive.cexpr!("OFFSETOF(((struct rb_iseq_constant_body *)NULL)->variable, coverage)")],
-        pc2branchindex: [self.VALUE, Primitive.cexpr!("OFFSETOF(((struct rb_iseq_constant_body *)NULL)->variable, pc2branchindex)")],
-        original_iseq: [CType::Pointer.new { self.VALUE }, Primitive.cexpr!("OFFSETOF(((struct rb_iseq_constant_body *)NULL)->variable, original_iseq)")],
-      ), Primitive.cexpr!("OFFSETOF((*((struct rb_iseq_constant_body *)NULL)), variable)")],
-      local_table_size: [CType::Immediate.parse("unsigned int"), Primitive.cexpr!("OFFSETOF((*((struct rb_iseq_constant_body *)NULL)), local_table_size)")],
-      ic_size: [CType::Immediate.parse("unsigned int"), Primitive.cexpr!("OFFSETOF((*((struct rb_iseq_constant_body *)NULL)), ic_size)")],
-      ise_size: [CType::Immediate.parse("unsigned int"), Primitive.cexpr!("OFFSETOF((*((struct rb_iseq_constant_body *)NULL)), ise_size)")],
-      ivc_size: [CType::Immediate.parse("unsigned int"), Primitive.cexpr!("OFFSETOF((*((struct rb_iseq_constant_body *)NULL)), ivc_size)")],
-      icvarc_size: [CType::Immediate.parse("unsigned int"), Primitive.cexpr!("OFFSETOF((*((struct rb_iseq_constant_body *)NULL)), icvarc_size)")],
-      ci_size: [CType::Immediate.parse("unsigned int"), Primitive.cexpr!("OFFSETOF((*((struct rb_iseq_constant_body *)NULL)), ci_size)")],
-      stack_max: [CType::Immediate.parse("unsigned int"), Primitive.cexpr!("OFFSETOF((*((struct rb_iseq_constant_body *)NULL)), stack_max)")],
-      builtin_attrs: [CType::Immediate.parse("unsigned int"), Primitive.cexpr!("OFFSETOF((*((struct rb_iseq_constant_body *)NULL)), builtin_attrs)")],
-      mark_bits: [CType::Union.new(
-        "", Primitive.cexpr!("SIZEOF(((struct rb_iseq_constant_body *)NULL)->mark_bits)"),
-        list: CType::Pointer.new { self.iseq_bits_t },
-        single: self.iseq_bits_t,
-      ), Primitive.cexpr!("OFFSETOF((*((struct rb_iseq_constant_body *)NULL)), mark_bits)")],
-      outer_variables: [CType::Pointer.new { self.rb_id_table }, Primitive.cexpr!("OFFSETOF((*((struct rb_iseq_constant_body *)NULL)), outer_variables)")],
-      mandatory_only_iseq: [CType::Pointer.new { self.rb_iseq_t }, Primitive.cexpr!("OFFSETOF((*((struct rb_iseq_constant_body *)NULL)), mandatory_only_iseq)")],
-      jit_entry: [self.rb_jit_func_t, Primitive.cexpr!("OFFSETOF((*((struct rb_iseq_constant_body *)NULL)), jit_entry)")],
-      jit_entry_calls: [CType::Immediate.parse("unsigned long"), Primitive.cexpr!("OFFSETOF((*((struct rb_iseq_constant_body *)NULL)), jit_entry_calls)")],
-      rjit_blocks: [self.VALUE, Primitive.cexpr!("OFFSETOF((*((struct rb_iseq_constant_body *)NULL)), rjit_blocks)"), true],
-    )
-  end
-
-  def C.rb_iseq_location_t
-    @rb_iseq_location_t ||= CType::Struct.new(
-      "rb_iseq_location_struct", Primitive.cexpr!("SIZEOF(struct rb_iseq_location_struct)"),
-      pathobj: [self.VALUE, Primitive.cexpr!("OFFSETOF((*((struct rb_iseq_location_struct *)NULL)), pathobj)"), true],
-      base_label: [self.VALUE, Primitive.cexpr!("OFFSETOF((*((struct rb_iseq_location_struct *)NULL)), base_label)"), true],
-      label: [self.VALUE, Primitive.cexpr!("OFFSETOF((*((struct rb_iseq_location_struct *)NULL)), label)"), true],
-      first_lineno: [CType::Immediate.parse("int"), Primitive.cexpr!("OFFSETOF((*((struct rb_iseq_location_struct *)NULL)), first_lineno)")],
-      node_id: [CType::Immediate.parse("int"), Primitive.cexpr!("OFFSETOF((*((struct rb_iseq_location_struct *)NULL)), node_id)")],
-      code_location: [self.rb_code_location_t, Primitive.cexpr!("OFFSETOF((*((struct rb_iseq_location_struct *)NULL)), code_location)")],
-    )
-  end
-
-  def C.rb_iseq_param_keyword
-    @rb_iseq_param_keyword ||= CType::Struct.new(
-      "rb_iseq_param_keyword", Primitive.cexpr!("SIZEOF(struct rb_iseq_param_keyword)"),
-      num: [CType::Immediate.parse("int"), Primitive.cexpr!("OFFSETOF((*((struct rb_iseq_param_keyword *)NULL)), num)")],
-      required_num: [CType::Immediate.parse("int"), Primitive.cexpr!("OFFSETOF((*((struct rb_iseq_param_keyword *)NULL)), required_num)")],
-      bits_start: [CType::Immediate.parse("int"), Primitive.cexpr!("OFFSETOF((*((struct rb_iseq_param_keyword *)NULL)), bits_start)")],
-      rest_start: [CType::Immediate.parse("int"), Primitive.cexpr!("OFFSETOF((*((struct rb_iseq_param_keyword *)NULL)), rest_start)")],
-      table: [CType::Pointer.new { self.ID }, Primitive.cexpr!("OFFSETOF((*((struct rb_iseq_param_keyword *)NULL)), table)")],
-      default_values: [CType::Pointer.new { self.VALUE }, Primitive.cexpr!("OFFSETOF((*((struct rb_iseq_param_keyword *)NULL)), default_values)")],
-    )
-  end
-
-  def C.rb_iseq_struct
-    @rb_iseq_struct ||= CType::Struct.new(
-      "rb_iseq_struct", Primitive.cexpr!("SIZEOF(struct rb_iseq_struct)"),
-      flags: [self.VALUE, Primitive.cexpr!("OFFSETOF((*((struct rb_iseq_struct *)NULL)), flags)")],
-      wrapper: [self.VALUE, Primitive.cexpr!("OFFSETOF((*((struct rb_iseq_struct *)NULL)), wrapper)")],
-      body: [CType::Pointer.new { self.rb_iseq_constant_body }, Primitive.cexpr!("OFFSETOF((*((struct rb_iseq_struct *)NULL)), body)")],
-      aux: [CType::Union.new(
-        "", Primitive.cexpr!("SIZEOF(((struct rb_iseq_struct *)NULL)->aux)"),
-        compile_data: CType::Pointer.new { self.iseq_compile_data },
-        loader: CType::Struct.new(
-          "", Primitive.cexpr!("SIZEOF(((struct rb_iseq_struct *)NULL)->aux.loader)"),
-          obj: [self.VALUE, Primitive.cexpr!("OFFSETOF(((struct rb_iseq_struct *)NULL)->aux.loader, obj)")],
-          index: [CType::Immediate.parse("int"), Primitive.cexpr!("OFFSETOF(((struct rb_iseq_struct *)NULL)->aux.loader, index)")],
-        ),
-        exec: CType::Struct.new(
-          "", Primitive.cexpr!("SIZEOF(((struct rb_iseq_struct *)NULL)->aux.exec)"),
-          local_hooks: [CType::Pointer.new { self.rb_hook_list_struct }, Primitive.cexpr!("OFFSETOF(((struct rb_iseq_struct *)NULL)->aux.exec, local_hooks)")],
-          global_trace_events: [self.rb_event_flag_t, Primitive.cexpr!("OFFSETOF(((struct rb_iseq_struct *)NULL)->aux.exec, global_trace_events)")],
-        ),
-      ), Primitive.cexpr!("OFFSETOF((*((struct rb_iseq_struct *)NULL)), aux)")],
-    )
-  end
-
-  def C.rb_iseq_t
-    @rb_iseq_t ||= self.rb_iseq_struct
-  end
-
-  def C.rb_jit_func_t
-    @rb_jit_func_t ||= CType::Immediate.parse("void *")
-  end
-
-  def C.rb_method_attr_t
-    @rb_method_attr_t ||= CType::Struct.new(
-      "rb_method_attr_struct", Primitive.cexpr!("SIZEOF(struct rb_method_attr_struct)"),
-      id: [self.ID, Primitive.cexpr!("OFFSETOF((*((struct rb_method_attr_struct *)NULL)), id)")],
-      location: [self.VALUE, Primitive.cexpr!("OFFSETOF((*((struct rb_method_attr_struct *)NULL)), location)")],
-    )
-  end
-
-  def C.rb_method_bmethod_t
-    @rb_method_bmethod_t ||= CType::Struct.new(
-      "rb_method_bmethod_struct", Primitive.cexpr!("SIZEOF(struct rb_method_bmethod_struct)"),
-      proc: [self.VALUE, Primitive.cexpr!("OFFSETOF((*((struct rb_method_bmethod_struct *)NULL)), proc)")],
-      hooks: [CType::Pointer.new { self.rb_hook_list_struct }, Primitive.cexpr!("OFFSETOF((*((struct rb_method_bmethod_struct *)NULL)), hooks)")],
-      defined_ractor: [self.VALUE, Primitive.cexpr!("OFFSETOF((*((struct rb_method_bmethod_struct *)NULL)), defined_ractor)")],
-    )
-  end
-
-  def C.rb_method_cfunc_t
-    @rb_method_cfunc_t ||= CType::Struct.new(
-      "rb_method_cfunc_struct", Primitive.cexpr!("SIZEOF(struct rb_method_cfunc_struct)"),
-      func: [CType::Immediate.parse("void *"), Primitive.cexpr!("OFFSETOF((*((struct rb_method_cfunc_struct *)NULL)), func)")],
-      invoker: [CType::Immediate.parse("void *"), Primitive.cexpr!("OFFSETOF((*((struct rb_method_cfunc_struct *)NULL)), invoker)")],
-      argc: [CType::Immediate.parse("int"), Primitive.cexpr!("OFFSETOF((*((struct rb_method_cfunc_struct *)NULL)), argc)")],
-    )
-  end
-
-  def C.rb_method_definition_struct
-    @rb_method_definition_struct ||= CType::Struct.new(
-      "rb_method_definition_struct", Primitive.cexpr!("SIZEOF(struct rb_method_definition_struct)"),
-      type: [CType::BitField.new(4, 0), 0],
-      iseq_overload: [CType::BitField.new(1, 4), 4],
-      alias_count: [CType::BitField.new(27, 5), 5],
-      complemented_count: [CType::BitField.new(28, 0), 32],
-      no_redef_warning: [CType::BitField.new(1, 4), 60],
-      body: [CType::Union.new(
-        "", Primitive.cexpr!("SIZEOF(((struct rb_method_definition_struct *)NULL)->body)"),
-        iseq: self.rb_method_iseq_t,
-        cfunc: self.rb_method_cfunc_t,
-        attr: self.rb_method_attr_t,
-        alias: self.rb_method_alias_t,
-        refined: self.rb_method_refined_t,
-        bmethod: self.rb_method_bmethod_t,
-        optimized: self.rb_method_optimized_t,
-      ), Primitive.cexpr!("OFFSETOF((*((struct rb_method_definition_struct *)NULL)), body)")],
-      original_id: [self.ID, Primitive.cexpr!("OFFSETOF((*((struct rb_method_definition_struct *)NULL)), original_id)")],
-      method_serial: [CType::Immediate.parse("uintptr_t"), Primitive.cexpr!("OFFSETOF((*((struct rb_method_definition_struct *)NULL)), method_serial)")],
-    )
-  end
-
-  def C.rb_method_entry_t
-    @rb_method_entry_t ||= CType::Struct.new(
-      "rb_method_entry_struct", Primitive.cexpr!("SIZEOF(struct rb_method_entry_struct)"),
-      flags: [self.VALUE, Primitive.cexpr!("OFFSETOF((*((struct rb_method_entry_struct *)NULL)), flags)")],
-      defined_class: [self.VALUE, Primitive.cexpr!("OFFSETOF((*((struct rb_method_entry_struct *)NULL)), defined_class)")],
-      def: [CType::Pointer.new { self.rb_method_definition_struct }, Primitive.cexpr!("OFFSETOF((*((struct rb_method_entry_struct *)NULL)), def)")],
-      called_id: [self.ID, Primitive.cexpr!("OFFSETOF((*((struct rb_method_entry_struct *)NULL)), called_id)")],
-      owner: [self.VALUE, Primitive.cexpr!("OFFSETOF((*((struct rb_method_entry_struct *)NULL)), owner)")],
-    )
-  end
-
-  def C.rb_method_iseq_t
-    @rb_method_iseq_t ||= CType::Struct.new(
-      "rb_method_iseq_struct", Primitive.cexpr!("SIZEOF(struct rb_method_iseq_struct)"),
-      iseqptr: [CType::Pointer.new { self.rb_iseq_t }, Primitive.cexpr!("OFFSETOF((*((struct rb_method_iseq_struct *)NULL)), iseqptr)")],
-      cref: [CType::Pointer.new { self.rb_cref_t }, Primitive.cexpr!("OFFSETOF((*((struct rb_method_iseq_struct *)NULL)), cref)")],
-    )
-  end
-
-  def C.rb_method_optimized_t
-    @rb_method_optimized_t ||= CType::Struct.new(
-      "rb_method_optimized", Primitive.cexpr!("SIZEOF(struct rb_method_optimized)"),
-      type: [self.method_optimized_type, Primitive.cexpr!("OFFSETOF((*((struct rb_method_optimized *)NULL)), type)")],
-      index: [CType::Immediate.parse("unsigned int"), Primitive.cexpr!("OFFSETOF((*((struct rb_method_optimized *)NULL)), index)")],
-    )
-  end
-
-  def C.rb_method_type_t
-    @rb_method_type_t ||= CType::Immediate.parse("int")
-  end
-
-  def C.rb_proc_t
-    @rb_proc_t ||= CType::Struct.new(
-      "", Primitive.cexpr!("SIZEOF(rb_proc_t)"),
-      block: [self.rb_block, Primitive.cexpr!("OFFSETOF((*((rb_proc_t *)NULL)), block)")],
-    )
-  end
-
-  def C.rb_rjit_options
-    @rb_rjit_options ||= CType::Struct.new(
-      "rb_rjit_options", Primitive.cexpr!("SIZEOF(struct rb_rjit_options)"),
-      on: [self._Bool, Primitive.cexpr!("OFFSETOF((*((struct rb_rjit_options *)NULL)), on)")],
-      call_threshold: [CType::Immediate.parse("unsigned int"), Primitive.cexpr!("OFFSETOF((*((struct rb_rjit_options *)NULL)), call_threshold)")],
-      exec_mem_size: [CType::Immediate.parse("unsigned int"), Primitive.cexpr!("OFFSETOF((*((struct rb_rjit_options *)NULL)), exec_mem_size)")],
-      stats: [self._Bool, Primitive.cexpr!("OFFSETOF((*((struct rb_rjit_options *)NULL)), stats)")],
-      trace_exits: [self._Bool, Primitive.cexpr!("OFFSETOF((*((struct rb_rjit_options *)NULL)), trace_exits)")],
-      dump_disasm: [self._Bool, Primitive.cexpr!("OFFSETOF((*((struct rb_rjit_options *)NULL)), dump_disasm)")],
-      verify_ctx: [self._Bool, Primitive.cexpr!("OFFSETOF((*((struct rb_rjit_options *)NULL)), verify_ctx)")],
-      pause: [self._Bool, Primitive.cexpr!("OFFSETOF((*((struct rb_rjit_options *)NULL)), pause)")],
-    )
-  end
-
-  def C.rb_rjit_runtime_counters
-    @rb_rjit_runtime_counters ||= CType::Struct.new(
-      "rb_rjit_runtime_counters", Primitive.cexpr!("SIZEOF(struct rb_rjit_runtime_counters)"),
-      vm_insns_count: [CType::Immediate.parse("size_t"), Primitive.cexpr!("OFFSETOF((*((struct rb_rjit_runtime_counters *)NULL)), vm_insns_count)")],
-      rjit_insns_count: [CType::Immediate.parse("size_t"), Primitive.cexpr!("OFFSETOF((*((struct rb_rjit_runtime_counters *)NULL)), rjit_insns_count)")],
-      send_args_splat_kw_splat: [CType::Immediate.parse("size_t"), Primitive.cexpr!("OFFSETOF((*((struct rb_rjit_runtime_counters *)NULL)), send_args_splat_kw_splat)")],
-      send_args_splat: [CType::Immediate.parse("size_t"), Primitive.cexpr!("OFFSETOF((*((struct rb_rjit_runtime_counters *)NULL)), send_args_splat)")],
-      send_args_splat_not_array: [CType::Immediate.parse("size_t"), Primitive.cexpr!("OFFSETOF((*((struct rb_rjit_runtime_counters *)NULL)), send_args_splat_not_array)")],
-      send_args_splat_length_not_equal: [CType::Immediate.parse("size_t"), Primitive.cexpr!("OFFSETOF((*((struct rb_rjit_runtime_counters *)NULL)), send_args_splat_length_not_equal)")],
-      send_args_splat_cfunc_var_args: [CType::Immediate.parse("size_t"), Primitive.cexpr!("OFFSETOF((*((struct rb_rjit_runtime_counters *)NULL)), send_args_splat_cfunc_var_args)")],
-      send_args_splat_arity_error: [CType::Immediate.parse("size_t"), Primitive.cexpr!("OFFSETOF((*((struct rb_rjit_runtime_counters *)NULL)), send_args_splat_arity_error)")],
-      send_args_splat_ruby2_hash: [CType::Immediate.parse("size_t"), Primitive.cexpr!("OFFSETOF((*((struct rb_rjit_runtime_counters *)NULL)), send_args_splat_ruby2_hash)")],
-      send_args_splat_cfunc_zuper: [CType::Immediate.parse("size_t"), Primitive.cexpr!("OFFSETOF((*((struct rb_rjit_runtime_counters *)NULL)), send_args_splat_cfunc_zuper)")],
-      send_args_splat_cfunc_ruby2_keywords: [CType::Immediate.parse("size_t"), Primitive.cexpr!("OFFSETOF((*((struct rb_rjit_runtime_counters *)NULL)), send_args_splat_cfunc_ruby2_keywords)")],
-      send_kw_splat: [CType::Immediate.parse("size_t"), Primitive.cexpr!("OFFSETOF((*((struct rb_rjit_runtime_counters *)NULL)), send_kw_splat)")],
-      send_kwarg: [CType::Immediate.parse("size_t"), Primitive.cexpr!("OFFSETOF((*((struct rb_rjit_runtime_counters *)NULL)), send_kwarg)")],
-      send_klass_megamorphic: [CType::Immediate.parse("size_t"), Primitive.cexpr!("OFFSETOF((*((struct rb_rjit_runtime_counters *)NULL)), send_klass_megamorphic)")],
-      send_missing_cme: [CType::Immediate.parse("size_t"), Primitive.cexpr!("OFFSETOF((*((struct rb_rjit_runtime_counters *)NULL)), send_missing_cme)")],
-      send_private: [CType::Immediate.parse("size_t"), Primitive.cexpr!("OFFSETOF((*((struct rb_rjit_runtime_counters *)NULL)), send_private)")],
-      send_protected_check_failed: [CType::Immediate.parse("size_t"), Primitive.cexpr!("OFFSETOF((*((struct rb_rjit_runtime_counters *)NULL)), send_protected_check_failed)")],
-      send_tailcall: [CType::Immediate.parse("size_t"), Primitive.cexpr!("OFFSETOF((*((struct rb_rjit_runtime_counters *)NULL)), send_tailcall)")],
-      send_notimplemented: [CType::Immediate.parse("size_t"), Primitive.cexpr!("OFFSETOF((*((struct rb_rjit_runtime_counters *)NULL)), send_notimplemented)")],
-      send_missing: [CType::Immediate.parse("size_t"), Primitive.cexpr!("OFFSETOF((*((struct rb_rjit_runtime_counters *)NULL)), send_missing)")],
-      send_bmethod: [CType::Immediate.parse("size_t"), Primitive.cexpr!("OFFSETOF((*((struct rb_rjit_runtime_counters *)NULL)), send_bmethod)")],
-      send_alias: [CType::Immediate.parse("size_t"), Primitive.cexpr!("OFFSETOF((*((struct rb_rjit_runtime_counters *)NULL)), send_alias)")],
-      send_undef: [CType::Immediate.parse("size_t"), Primitive.cexpr!("OFFSETOF((*((struct rb_rjit_runtime_counters *)NULL)), send_undef)")],
-      send_zsuper: [CType::Immediate.parse("size_t"), Primitive.cexpr!("OFFSETOF((*((struct rb_rjit_runtime_counters *)NULL)), send_zsuper)")],
-      send_refined: [CType::Immediate.parse("size_t"), Primitive.cexpr!("OFFSETOF((*((struct rb_rjit_runtime_counters *)NULL)), send_refined)")],
-      send_stackoverflow: [CType::Immediate.parse("size_t"), Primitive.cexpr!("OFFSETOF((*((struct rb_rjit_runtime_counters *)NULL)), send_stackoverflow)")],
-      send_arity: [CType::Immediate.parse("size_t"), Primitive.cexpr!("OFFSETOF((*((struct rb_rjit_runtime_counters *)NULL)), send_arity)")],
-      send_c_tracing: [CType::Immediate.parse("size_t"), Primitive.cexpr!("OFFSETOF((*((struct rb_rjit_runtime_counters *)NULL)), send_c_tracing)")],
-      send_is_a_class_mismatch: [CType::Immediate.parse("size_t"), Primitive.cexpr!("OFFSETOF((*((struct rb_rjit_runtime_counters *)NULL)), send_is_a_class_mismatch)")],
-      send_instance_of_class_mismatch: [CType::Immediate.parse("size_t"), Primitive.cexpr!("OFFSETOF((*((struct rb_rjit_runtime_counters *)NULL)), send_instance_of_class_mismatch)")],
-      send_keywords: [CType::Immediate.parse("size_t"), Primitive.cexpr!("OFFSETOF((*((struct rb_rjit_runtime_counters *)NULL)), send_keywords)")],
-      send_blockiseq: [CType::Immediate.parse("size_t"), Primitive.cexpr!("OFFSETOF((*((struct rb_rjit_runtime_counters *)NULL)), send_blockiseq)")],
-      send_block_handler: [CType::Immediate.parse("size_t"), Primitive.cexpr!("OFFSETOF((*((struct rb_rjit_runtime_counters *)NULL)), send_block_handler)")],
-      send_block_setup: [CType::Immediate.parse("size_t"), Primitive.cexpr!("OFFSETOF((*((struct rb_rjit_runtime_counters *)NULL)), send_block_setup)")],
-      send_block_not_nil: [CType::Immediate.parse("size_t"), Primitive.cexpr!("OFFSETOF((*((struct rb_rjit_runtime_counters *)NULL)), send_block_not_nil)")],
-      send_block_not_proxy: [CType::Immediate.parse("size_t"), Primitive.cexpr!("OFFSETOF((*((struct rb_rjit_runtime_counters *)NULL)), send_block_not_proxy)")],
-      send_block_arg: [CType::Immediate.parse("size_t"), Primitive.cexpr!("OFFSETOF((*((struct rb_rjit_runtime_counters *)NULL)), send_block_arg)")],
-      send_iseq_kwparam: [CType::Immediate.parse("size_t"), Primitive.cexpr!("OFFSETOF((*((struct rb_rjit_runtime_counters *)NULL)), send_iseq_kwparam)")],
-      send_iseq_accepts_no_kwarg: [CType::Immediate.parse("size_t"), Primitive.cexpr!("OFFSETOF((*((struct rb_rjit_runtime_counters *)NULL)), send_iseq_accepts_no_kwarg)")],
-      send_iseq_has_opt: [CType::Immediate.parse("size_t"), Primitive.cexpr!("OFFSETOF((*((struct rb_rjit_runtime_counters *)NULL)), send_iseq_has_opt)")],
-      send_iseq_has_kwrest: [CType::Immediate.parse("size_t"), Primitive.cexpr!("OFFSETOF((*((struct rb_rjit_runtime_counters *)NULL)), send_iseq_has_kwrest)")],
-      send_iseq_ruby2_keywords: [CType::Immediate.parse("size_t"), Primitive.cexpr!("OFFSETOF((*((struct rb_rjit_runtime_counters *)NULL)), send_iseq_ruby2_keywords)")],
-      send_iseq_has_rest_and_captured: [CType::Immediate.parse("size_t"), Primitive.cexpr!("OFFSETOF((*((struct rb_rjit_runtime_counters *)NULL)), send_iseq_has_rest_and_captured)")],
-      send_iseq_has_rest_and_kw_supplied: [CType::Immediate.parse("size_t"), Primitive.cexpr!("OFFSETOF((*((struct rb_rjit_runtime_counters *)NULL)), send_iseq_has_rest_and_kw_supplied)")],
-      send_iseq_has_no_kw: [CType::Immediate.parse("size_t"), Primitive.cexpr!("OFFSETOF((*((struct rb_rjit_runtime_counters *)NULL)), send_iseq_has_no_kw)")],
-      send_iseq_zsuper: [CType::Immediate.parse("size_t"), Primitive.cexpr!("OFFSETOF((*((struct rb_rjit_runtime_counters *)NULL)), send_iseq_zsuper)")],
-      send_iseq_materialized_block: [CType::Immediate.parse("size_t"), Primitive.cexpr!("OFFSETOF((*((struct rb_rjit_runtime_counters *)NULL)), send_iseq_materialized_block)")],
-      send_iseq_has_rest: [CType::Immediate.parse("size_t"), Primitive.cexpr!("OFFSETOF((*((struct rb_rjit_runtime_counters *)NULL)), send_iseq_has_rest)")],
-      send_iseq_block_arg0_splat: [CType::Immediate.parse("size_t"), Primitive.cexpr!("OFFSETOF((*((struct rb_rjit_runtime_counters *)NULL)), send_iseq_block_arg0_splat)")],
-      send_iseq_kw_call: [CType::Immediate.parse("size_t"), Primitive.cexpr!("OFFSETOF((*((struct rb_rjit_runtime_counters *)NULL)), send_iseq_kw_call)")],
-      send_iseq_splat: [CType::Immediate.parse("size_t"), Primitive.cexpr!("OFFSETOF((*((struct rb_rjit_runtime_counters *)NULL)), send_iseq_splat)")],
-      send_iseq_has_rest_and_optional: [CType::Immediate.parse("size_t"), Primitive.cexpr!("OFFSETOF((*((struct rb_rjit_runtime_counters *)NULL)), send_iseq_has_rest_and_optional)")],
-      send_iseq_arity_error: [CType::Immediate.parse("size_t"), Primitive.cexpr!("OFFSETOF((*((struct rb_rjit_runtime_counters *)NULL)), send_iseq_arity_error)")],
-      send_iseq_missing_optional_kw: [CType::Immediate.parse("size_t"), Primitive.cexpr!("OFFSETOF((*((struct rb_rjit_runtime_counters *)NULL)), send_iseq_missing_optional_kw)")],
-      send_iseq_too_many_kwargs: [CType::Immediate.parse("size_t"), Primitive.cexpr!("OFFSETOF((*((struct rb_rjit_runtime_counters *)NULL)), send_iseq_too_many_kwargs)")],
-      send_iseq_kwargs_mismatch: [CType::Immediate.parse("size_t"), Primitive.cexpr!("OFFSETOF((*((struct rb_rjit_runtime_counters *)NULL)), send_iseq_kwargs_mismatch)")],
-      send_iseq_splat_with_kw: [CType::Immediate.parse("size_t"), Primitive.cexpr!("OFFSETOF((*((struct rb_rjit_runtime_counters *)NULL)), send_iseq_splat_with_kw)")],
-      send_iseq_splat_arity_error: [CType::Immediate.parse("size_t"), Primitive.cexpr!("OFFSETOF((*((struct rb_rjit_runtime_counters *)NULL)), send_iseq_splat_arity_error)")],
-      send_iseq_has_rest_and_splat_not_equal: [CType::Immediate.parse("size_t"), Primitive.cexpr!("OFFSETOF((*((struct rb_rjit_runtime_counters *)NULL)), send_iseq_has_rest_and_splat_not_equal)")],
-      send_cfunc_variadic: [CType::Immediate.parse("size_t"), Primitive.cexpr!("OFFSETOF((*((struct rb_rjit_runtime_counters *)NULL)), send_cfunc_variadic)")],
-      send_cfunc_too_many_args: [CType::Immediate.parse("size_t"), Primitive.cexpr!("OFFSETOF((*((struct rb_rjit_runtime_counters *)NULL)), send_cfunc_too_many_args)")],
-      send_cfunc_ruby_array_varg: [CType::Immediate.parse("size_t"), Primitive.cexpr!("OFFSETOF((*((struct rb_rjit_runtime_counters *)NULL)), send_cfunc_ruby_array_varg)")],
-      send_cfunc_splat_with_kw: [CType::Immediate.parse("size_t"), Primitive.cexpr!("OFFSETOF((*((struct rb_rjit_runtime_counters *)NULL)), send_cfunc_splat_with_kw)")],
-      send_cfunc_tracing: [CType::Immediate.parse("size_t"), Primitive.cexpr!("OFFSETOF((*((struct rb_rjit_runtime_counters *)NULL)), send_cfunc_tracing)")],
-      send_cfunc_argc_mismatch: [CType::Immediate.parse("size_t"), Primitive.cexpr!("OFFSETOF((*((struct rb_rjit_runtime_counters *)NULL)), send_cfunc_argc_mismatch)")],
-      send_cfunc_toomany_args: [CType::Immediate.parse("size_t"), Primitive.cexpr!("OFFSETOF((*((struct rb_rjit_runtime_counters *)NULL)), send_cfunc_toomany_args)")],
-      send_attrset_splat: [CType::Immediate.parse("size_t"), Primitive.cexpr!("OFFSETOF((*((struct rb_rjit_runtime_counters *)NULL)), send_attrset_splat)")],
-      send_attrset_kwarg: [CType::Immediate.parse("size_t"), Primitive.cexpr!("OFFSETOF((*((struct rb_rjit_runtime_counters *)NULL)), send_attrset_kwarg)")],
-      send_attrset_method: [CType::Immediate.parse("size_t"), Primitive.cexpr!("OFFSETOF((*((struct rb_rjit_runtime_counters *)NULL)), send_attrset_method)")],
-      send_ivar_splat: [CType::Immediate.parse("size_t"), Primitive.cexpr!("OFFSETOF((*((struct rb_rjit_runtime_counters *)NULL)), send_ivar_splat)")],
-      send_ivar_opt_send: [CType::Immediate.parse("size_t"), Primitive.cexpr!("OFFSETOF((*((struct rb_rjit_runtime_counters *)NULL)), send_ivar_opt_send)")],
-      send_optimized_send_no_args: [CType::Immediate.parse("size_t"), Primitive.cexpr!("OFFSETOF((*((struct rb_rjit_runtime_counters *)NULL)), send_optimized_send_no_args)")],
-      send_optimized_send_not_sym_or_str: [CType::Immediate.parse("size_t"), Primitive.cexpr!("OFFSETOF((*((struct rb_rjit_runtime_counters *)NULL)), send_optimized_send_not_sym_or_str)")],
-      send_optimized_send_mid_class_changed: [CType::Immediate.parse("size_t"), Primitive.cexpr!("OFFSETOF((*((struct rb_rjit_runtime_counters *)NULL)), send_optimized_send_mid_class_changed)")],
-      send_optimized_send_mid_id_changed: [CType::Immediate.parse("size_t"), Primitive.cexpr!("OFFSETOF((*((struct rb_rjit_runtime_counters *)NULL)), send_optimized_send_mid_id_changed)")],
-      send_optimized_send_null_mid: [CType::Immediate.parse("size_t"), Primitive.cexpr!("OFFSETOF((*((struct rb_rjit_runtime_counters *)NULL)), send_optimized_send_null_mid)")],
-      send_optimized_send_send: [CType::Immediate.parse("size_t"), Primitive.cexpr!("OFFSETOF((*((struct rb_rjit_runtime_counters *)NULL)), send_optimized_send_send)")],
-      send_optimized_call_block: [CType::Immediate.parse("size_t"), Primitive.cexpr!("OFFSETOF((*((struct rb_rjit_runtime_counters *)NULL)), send_optimized_call_block)")],
-      send_optimized_call_kwarg: [CType::Immediate.parse("size_t"), Primitive.cexpr!("OFFSETOF((*((struct rb_rjit_runtime_counters *)NULL)), send_optimized_call_kwarg)")],
-      send_optimized_call_splat: [CType::Immediate.parse("size_t"), Primitive.cexpr!("OFFSETOF((*((struct rb_rjit_runtime_counters *)NULL)), send_optimized_call_splat)")],
-      send_optimized_struct_aref_error: [CType::Immediate.parse("size_t"), Primitive.cexpr!("OFFSETOF((*((struct rb_rjit_runtime_counters *)NULL)), send_optimized_struct_aref_error)")],
-      send_optimized_block_call: [CType::Immediate.parse("size_t"), Primitive.cexpr!("OFFSETOF((*((struct rb_rjit_runtime_counters *)NULL)), send_optimized_block_call)")],
-      send_optimized_struct_aset: [CType::Immediate.parse("size_t"), Primitive.cexpr!("OFFSETOF((*((struct rb_rjit_runtime_counters *)NULL)), send_optimized_struct_aset)")],
-      send_bmethod_not_iseq: [CType::Immediate.parse("size_t"), Primitive.cexpr!("OFFSETOF((*((struct rb_rjit_runtime_counters *)NULL)), send_bmethod_not_iseq)")],
-      send_bmethod_blockarg: [CType::Immediate.parse("size_t"), Primitive.cexpr!("OFFSETOF((*((struct rb_rjit_runtime_counters *)NULL)), send_bmethod_blockarg)")],
-      invokesuper_me_changed: [CType::Immediate.parse("size_t"), Primitive.cexpr!("OFFSETOF((*((struct rb_rjit_runtime_counters *)NULL)), invokesuper_me_changed)")],
-      invokesuper_block: [CType::Immediate.parse("size_t"), Primitive.cexpr!("OFFSETOF((*((struct rb_rjit_runtime_counters *)NULL)), invokesuper_block)")],
-      invokeblock_none: [CType::Immediate.parse("size_t"), Primitive.cexpr!("OFFSETOF((*((struct rb_rjit_runtime_counters *)NULL)), invokeblock_none)")],
-      invokeblock_symbol: [CType::Immediate.parse("size_t"), Primitive.cexpr!("OFFSETOF((*((struct rb_rjit_runtime_counters *)NULL)), invokeblock_symbol)")],
-      invokeblock_proc: [CType::Immediate.parse("size_t"), Primitive.cexpr!("OFFSETOF((*((struct rb_rjit_runtime_counters *)NULL)), invokeblock_proc)")],
-      invokeblock_tag_changed: [CType::Immediate.parse("size_t"), Primitive.cexpr!("OFFSETOF((*((struct rb_rjit_runtime_counters *)NULL)), invokeblock_tag_changed)")],
-      invokeblock_iseq_block_changed: [CType::Immediate.parse("size_t"), Primitive.cexpr!("OFFSETOF((*((struct rb_rjit_runtime_counters *)NULL)), invokeblock_iseq_block_changed)")],
-      invokeblock_iseq_arity: [CType::Immediate.parse("size_t"), Primitive.cexpr!("OFFSETOF((*((struct rb_rjit_runtime_counters *)NULL)), invokeblock_iseq_arity)")],
-      invokeblock_iseq_arg0_splat: [CType::Immediate.parse("size_t"), Primitive.cexpr!("OFFSETOF((*((struct rb_rjit_runtime_counters *)NULL)), invokeblock_iseq_arg0_splat)")],
-      invokeblock_ifunc_args_splat: [CType::Immediate.parse("size_t"), Primitive.cexpr!("OFFSETOF((*((struct rb_rjit_runtime_counters *)NULL)), invokeblock_ifunc_args_splat)")],
-      invokeblock_ifunc_kw_splat: [CType::Immediate.parse("size_t"), Primitive.cexpr!("OFFSETOF((*((struct rb_rjit_runtime_counters *)NULL)), invokeblock_ifunc_kw_splat)")],
-      invokeblock_iseq_arg0_args_splat: [CType::Immediate.parse("size_t"), Primitive.cexpr!("OFFSETOF((*((struct rb_rjit_runtime_counters *)NULL)), invokeblock_iseq_arg0_args_splat)")],
-      invokeblock_iseq_arg0_has_kw: [CType::Immediate.parse("size_t"), Primitive.cexpr!("OFFSETOF((*((struct rb_rjit_runtime_counters *)NULL)), invokeblock_iseq_arg0_has_kw)")],
-      getivar_megamorphic: [CType::Immediate.parse("size_t"), Primitive.cexpr!("OFFSETOF((*((struct rb_rjit_runtime_counters *)NULL)), getivar_megamorphic)")],
-      getivar_not_heap: [CType::Immediate.parse("size_t"), Primitive.cexpr!("OFFSETOF((*((struct rb_rjit_runtime_counters *)NULL)), getivar_not_heap)")],
-      getivar_special_const: [CType::Immediate.parse("size_t"), Primitive.cexpr!("OFFSETOF((*((struct rb_rjit_runtime_counters *)NULL)), getivar_special_const)")],
-      getivar_too_complex: [CType::Immediate.parse("size_t"), Primitive.cexpr!("OFFSETOF((*((struct rb_rjit_runtime_counters *)NULL)), getivar_too_complex)")],
-      optaref_arg_not_fixnum: [CType::Immediate.parse("size_t"), Primitive.cexpr!("OFFSETOF((*((struct rb_rjit_runtime_counters *)NULL)), optaref_arg_not_fixnum)")],
-      optaref_argc_not_one: [CType::Immediate.parse("size_t"), Primitive.cexpr!("OFFSETOF((*((struct rb_rjit_runtime_counters *)NULL)), optaref_argc_not_one)")],
-      optaref_recv_not_array: [CType::Immediate.parse("size_t"), Primitive.cexpr!("OFFSETOF((*((struct rb_rjit_runtime_counters *)NULL)), optaref_recv_not_array)")],
-      optaref_recv_not_hash: [CType::Immediate.parse("size_t"), Primitive.cexpr!("OFFSETOF((*((struct rb_rjit_runtime_counters *)NULL)), optaref_recv_not_hash)")],
-      optaref_send: [CType::Immediate.parse("size_t"), Primitive.cexpr!("OFFSETOF((*((struct rb_rjit_runtime_counters *)NULL)), optaref_send)")],
-      optgetconst_not_cached: [CType::Immediate.parse("size_t"), Primitive.cexpr!("OFFSETOF((*((struct rb_rjit_runtime_counters *)NULL)), optgetconst_not_cached)")],
-      optgetconst_cref: [CType::Immediate.parse("size_t"), Primitive.cexpr!("OFFSETOF((*((struct rb_rjit_runtime_counters *)NULL)), optgetconst_cref)")],
-      optgetconst_cache_miss: [CType::Immediate.parse("size_t"), Primitive.cexpr!("OFFSETOF((*((struct rb_rjit_runtime_counters *)NULL)), optgetconst_cache_miss)")],
-      setivar_frozen: [CType::Immediate.parse("size_t"), Primitive.cexpr!("OFFSETOF((*((struct rb_rjit_runtime_counters *)NULL)), setivar_frozen)")],
-      setivar_not_heap: [CType::Immediate.parse("size_t"), Primitive.cexpr!("OFFSETOF((*((struct rb_rjit_runtime_counters *)NULL)), setivar_not_heap)")],
-      setivar_megamorphic: [CType::Immediate.parse("size_t"), Primitive.cexpr!("OFFSETOF((*((struct rb_rjit_runtime_counters *)NULL)), setivar_megamorphic)")],
-      setivar_too_complex: [CType::Immediate.parse("size_t"), Primitive.cexpr!("OFFSETOF((*((struct rb_rjit_runtime_counters *)NULL)), setivar_too_complex)")],
-      expandarray_splat: [CType::Immediate.parse("size_t"), Primitive.cexpr!("OFFSETOF((*((struct rb_rjit_runtime_counters *)NULL)), expandarray_splat)")],
-      expandarray_postarg: [CType::Immediate.parse("size_t"), Primitive.cexpr!("OFFSETOF((*((struct rb_rjit_runtime_counters *)NULL)), expandarray_postarg)")],
-      expandarray_not_array: [CType::Immediate.parse("size_t"), Primitive.cexpr!("OFFSETOF((*((struct rb_rjit_runtime_counters *)NULL)), expandarray_not_array)")],
-      expandarray_rhs_too_small: [CType::Immediate.parse("size_t"), Primitive.cexpr!("OFFSETOF((*((struct rb_rjit_runtime_counters *)NULL)), expandarray_rhs_too_small)")],
-      getblockpp_block_param_modified: [CType::Immediate.parse("size_t"), Primitive.cexpr!("OFFSETOF((*((struct rb_rjit_runtime_counters *)NULL)), getblockpp_block_param_modified)")],
-      getblockpp_block_handler_none: [CType::Immediate.parse("size_t"), Primitive.cexpr!("OFFSETOF((*((struct rb_rjit_runtime_counters *)NULL)), getblockpp_block_handler_none)")],
-      getblockpp_not_gc_guarded: [CType::Immediate.parse("size_t"), Primitive.cexpr!("OFFSETOF((*((struct rb_rjit_runtime_counters *)NULL)), getblockpp_not_gc_guarded)")],
-      getblockpp_not_iseq_block: [CType::Immediate.parse("size_t"), Primitive.cexpr!("OFFSETOF((*((struct rb_rjit_runtime_counters *)NULL)), getblockpp_not_iseq_block)")],
-      compiled_block_count: [CType::Immediate.parse("size_t"), Primitive.cexpr!("OFFSETOF((*((struct rb_rjit_runtime_counters *)NULL)), compiled_block_count)")],
-    )
-  end
-
-  def C.rb_serial_t
-    @rb_serial_t ||= CType::Immediate.parse("unsigned long long")
-  end
-
-  def C.rb_shape
-    @rb_shape ||= CType::Struct.new(
-      "rb_shape", Primitive.cexpr!("SIZEOF(struct rb_shape)"),
-      edges: [CType::Pointer.new { self.rb_id_table }, Primitive.cexpr!("OFFSETOF((*((struct rb_shape *)NULL)), edges)")],
-      edge_name: [self.ID, Primitive.cexpr!("OFFSETOF((*((struct rb_shape *)NULL)), edge_name)")],
-      next_iv_index: [self.attr_index_t, Primitive.cexpr!("OFFSETOF((*((struct rb_shape *)NULL)), next_iv_index)")],
-      capacity: [CType::Immediate.parse("uint32_t"), Primitive.cexpr!("OFFSETOF((*((struct rb_shape *)NULL)), capacity)")],
-      type: [CType::Immediate.parse("uint8_t"), Primitive.cexpr!("OFFSETOF((*((struct rb_shape *)NULL)), type)")],
-      size_pool_index: [CType::Immediate.parse("uint8_t"), Primitive.cexpr!("OFFSETOF((*((struct rb_shape *)NULL)), size_pool_index)")],
-      parent_id: [self.shape_id_t, Primitive.cexpr!("OFFSETOF((*((struct rb_shape *)NULL)), parent_id)")],
-    )
-  end
-
-  def C.rb_shape_t
-    @rb_shape_t ||= self.rb_shape
-  end
-
-  def C.rb_thread_struct
-    @rb_thread_struct ||= CType::Struct.new(
-      "rb_thread_struct", Primitive.cexpr!("SIZEOF(struct rb_thread_struct)"),
-      lt_node: [self.ccan_list_node, Primitive.cexpr!("OFFSETOF((*((struct rb_thread_struct *)NULL)), lt_node)")],
-      self: [self.VALUE, Primitive.cexpr!("OFFSETOF((*((struct rb_thread_struct *)NULL)), self)")],
-      ractor: [CType::Pointer.new { self.rb_ractor_t }, Primitive.cexpr!("OFFSETOF((*((struct rb_thread_struct *)NULL)), ractor)")],
-      vm: [CType::Pointer.new { self.rb_vm_t }, Primitive.cexpr!("OFFSETOF((*((struct rb_thread_struct *)NULL)), vm)")],
-      nt: [CType::Pointer.new { self.rb_native_thread }, Primitive.cexpr!("OFFSETOF((*((struct rb_thread_struct *)NULL)), nt)")],
-      ec: [CType::Pointer.new { self.rb_execution_context_t }, Primitive.cexpr!("OFFSETOF((*((struct rb_thread_struct *)NULL)), ec)")],
-      sched: [self.rb_thread_sched_item, Primitive.cexpr!("OFFSETOF((*((struct rb_thread_struct *)NULL)), sched)")],
-      serial: [self.rb_atomic_t, Primitive.cexpr!("OFFSETOF((*((struct rb_thread_struct *)NULL)), serial)")],
-      last_status: [self.VALUE, Primitive.cexpr!("OFFSETOF((*((struct rb_thread_struct *)NULL)), last_status)")],
-      calling: [CType::Pointer.new { self.rb_calling_info }, Primitive.cexpr!("OFFSETOF((*((struct rb_thread_struct *)NULL)), calling)")],
-      top_self: [self.VALUE, Primitive.cexpr!("OFFSETOF((*((struct rb_thread_struct *)NULL)), top_self)")],
-      top_wrapper: [self.VALUE, Primitive.cexpr!("OFFSETOF((*((struct rb_thread_struct *)NULL)), top_wrapper)")],
-      priority: [CType::Immediate.parse("int8_t"), Primitive.cexpr!("OFFSETOF((*((struct rb_thread_struct *)NULL)), priority)")],
-      running_time_us: [CType::Immediate.parse("uint32_t"), Primitive.cexpr!("OFFSETOF((*((struct rb_thread_struct *)NULL)), running_time_us)")],
-      blocking_region_buffer: [CType::Pointer.new { CType::Immediate.parse("void") }, Primitive.cexpr!("OFFSETOF((*((struct rb_thread_struct *)NULL)), blocking_region_buffer)")],
-      thgroup: [self.VALUE, Primitive.cexpr!("OFFSETOF((*((struct rb_thread_struct *)NULL)), thgroup)")],
-      value: [self.VALUE, Primitive.cexpr!("OFFSETOF((*((struct rb_thread_struct *)NULL)), value)")],
-      pending_interrupt_queue: [self.VALUE, Primitive.cexpr!("OFFSETOF((*((struct rb_thread_struct *)NULL)), pending_interrupt_queue)")],
-      pending_interrupt_mask_stack: [self.VALUE, Primitive.cexpr!("OFFSETOF((*((struct rb_thread_struct *)NULL)), pending_interrupt_mask_stack)")],
-      interrupt_lock: [self.rb_nativethread_lock_t, Primitive.cexpr!("OFFSETOF((*((struct rb_thread_struct *)NULL)), interrupt_lock)")],
-      unblock: [self.rb_unblock_callback, Primitive.cexpr!("OFFSETOF((*((struct rb_thread_struct *)NULL)), unblock)")],
-      locking_mutex: [self.VALUE, Primitive.cexpr!("OFFSETOF((*((struct rb_thread_struct *)NULL)), locking_mutex)")],
-      keeping_mutexes: [CType::Pointer.new { self.rb_mutex_struct }, Primitive.cexpr!("OFFSETOF((*((struct rb_thread_struct *)NULL)), keeping_mutexes)")],
-      join_list: [CType::Pointer.new { self.rb_waiting_list }, Primitive.cexpr!("OFFSETOF((*((struct rb_thread_struct *)NULL)), join_list)")],
-      invoke_arg: [CType::Union.new(
-        "", Primitive.cexpr!("SIZEOF(((struct rb_thread_struct *)NULL)->invoke_arg)"),
-        proc: CType::Struct.new(
-          "", Primitive.cexpr!("SIZEOF(((struct rb_thread_struct *)NULL)->invoke_arg.proc)"),
-          proc: [self.VALUE, Primitive.cexpr!("OFFSETOF(((struct rb_thread_struct *)NULL)->invoke_arg.proc, proc)")],
-          args: [self.VALUE, Primitive.cexpr!("OFFSETOF(((struct rb_thread_struct *)NULL)->invoke_arg.proc, args)")],
-          kw_splat: [CType::Immediate.parse("int"), Primitive.cexpr!("OFFSETOF(((struct rb_thread_struct *)NULL)->invoke_arg.proc, kw_splat)")],
-        ),
-        func: CType::Struct.new(
-          "", Primitive.cexpr!("SIZEOF(((struct rb_thread_struct *)NULL)->invoke_arg.func)"),
-          func: [CType::Immediate.parse("void *"), Primitive.cexpr!("OFFSETOF(((struct rb_thread_struct *)NULL)->invoke_arg.func, func)")],
-          arg: [CType::Pointer.new { CType::Immediate.parse("void") }, Primitive.cexpr!("OFFSETOF(((struct rb_thread_struct *)NULL)->invoke_arg.func, arg)")],
-        ),
-      ), Primitive.cexpr!("OFFSETOF((*((struct rb_thread_struct *)NULL)), invoke_arg)")],
-      invoke_type: [self.thread_invoke_type, Primitive.cexpr!("OFFSETOF((*((struct rb_thread_struct *)NULL)), invoke_type)")],
-      stat_insn_usage: [self.VALUE, Primitive.cexpr!("OFFSETOF((*((struct rb_thread_struct *)NULL)), stat_insn_usage)")],
-      root_fiber: [CType::Pointer.new { self.rb_fiber_t }, Primitive.cexpr!("OFFSETOF((*((struct rb_thread_struct *)NULL)), root_fiber)")],
-      scheduler: [self.VALUE, Primitive.cexpr!("OFFSETOF((*((struct rb_thread_struct *)NULL)), scheduler)")],
-      blocking: [CType::Immediate.parse("unsigned int"), Primitive.cexpr!("OFFSETOF((*((struct rb_thread_struct *)NULL)), blocking)")],
-      name: [self.VALUE, Primitive.cexpr!("OFFSETOF((*((struct rb_thread_struct *)NULL)), name)")],
-      ext_config: [self.rb_ext_config, Primitive.cexpr!("OFFSETOF((*((struct rb_thread_struct *)NULL)), ext_config)")],
-    )
-  end
-
-  def C.VALUE
-    @VALUE ||= CType::Immediate.find(Primitive.cexpr!("SIZEOF(VALUE)"), Primitive.cexpr!("SIGNED_TYPE_P(VALUE)"))
-  end
-
-  def C.shape_id_t
-    @shape_id_t ||= CType::Immediate.find(Primitive.cexpr!("SIZEOF(shape_id_t)"), Primitive.cexpr!("SIGNED_TYPE_P(shape_id_t)"))
-  end
-
-  def C.rb_id_table
-    CType::Stub.new(:rb_id_table)
-  end
-
-  def C.vm_call_handler
-    CType::Stub.new(:vm_call_handler)
-  end
-
-  def C.method_missing_reason
-    CType::Stub.new(:method_missing_reason)
-  end
-
-  def C.vm_ifunc
-    CType::Stub.new(:vm_ifunc)
-  end
-
-  def C.rb_cref_struct
-    CType::Stub.new(:rb_cref_struct)
-  end
-
-  def C.rb_scope_visibility_t
-    CType::Stub.new(:rb_scope_visibility_t)
-  end
-
-  def C.rb_vm_tag
-    CType::Stub.new(:rb_vm_tag)
-  end
-
-  def C.rb_atomic_t
-    CType::Stub.new(:rb_atomic_t)
-  end
-
-  def C.rb_fiber_t
-    CType::Stub.new(:rb_fiber_t)
-  end
-
-  def C.rb_ensure_list_t
-    CType::Stub.new(:rb_ensure_list_t)
-  end
-
-  def C.rb_trace_arg_struct
-    CType::Stub.new(:rb_trace_arg_struct)
-  end
-
-  def C.rb_iseq_type
-    CType::Stub.new(:rb_iseq_type)
-  end
-
-  def C.iseq_insn_info
-    CType::Stub.new(:iseq_insn_info)
-  end
-
-  def C.iseq_catch_table
-    CType::Stub.new(:iseq_catch_table)
-  end
-
-  def C.rb_snum_t
-    CType::Stub.new(:rb_snum_t)
-  end
-
-  def C.iseq_bits_t
-    CType::Stub.new(:iseq_bits_t)
-  end
-
-  def C.rb_code_location_t
-    CType::Stub.new(:rb_code_location_t)
-  end
-
-  def C.iseq_compile_data
-    CType::Stub.new(:iseq_compile_data)
-  end
-
-  def C.rb_hook_list_struct
-    CType::Stub.new(:rb_hook_list_struct)
-  end
-
-  def C.rb_event_flag_t
-    CType::Stub.new(:rb_event_flag_t)
-  end
-
-  def C.rb_method_alias_t
-    CType::Stub.new(:rb_method_alias_t)
-  end
-
-  def C.rb_method_refined_t
-    CType::Stub.new(:rb_method_refined_t)
-  end
-
-  def C._Bool
-    CType::Bool.new
-  end
-
-  def C.ccan_list_node
-    CType::Stub.new(:ccan_list_node)
-  end
-
-  def C.rb_ractor_t
-    CType::Stub.new(:rb_ractor_t)
-  end
-
-  def C.rb_vm_t
-    CType::Stub.new(:rb_vm_t)
-  end
-
-  def C.rb_native_thread
-    CType::Stub.new(:rb_native_thread)
-  end
-
-  def C.rb_thread_sched_item
-    CType::Stub.new(:rb_thread_sched_item)
-  end
-
-  def C.rb_calling_info
-    CType::Stub.new(:rb_calling_info)
-  end
-
-  def C.rb_nativethread_lock_t
-    CType::Stub.new(:rb_nativethread_lock_t)
-  end
-
-  def C.rb_unblock_callback
-    CType::Stub.new(:rb_unblock_callback)
-  end
-
-  def C.rb_mutex_struct
-    CType::Stub.new(:rb_mutex_struct)
-  end
-
-  def C.rb_waiting_list
-    CType::Stub.new(:rb_waiting_list)
-  end
-
-  def C.thread_invoke_type
-    CType::Stub.new(:thread_invoke_type)
-  end
-
-  def C.rb_ext_config
-    CType::Stub.new(:rb_ext_config)
-  end
-
-  ### RJIT bindgen end ###
-end if Primitive.rjit_enabled_p
diff --git a/ruby-runner.c b/ruby-runner.c
index bbc2b78fa00f12..295ef47cc31e8c 100644
--- a/ruby-runner.c
+++ b/ruby-runner.c
@@ -7,6 +7,10 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 
+#ifdef _WIN32
+# error This feature is unnecessary on Windows in favor of SxS.
+#endif
+
 #include "ruby-runner.h"
 
 static void
@@ -25,12 +29,24 @@ insert_env_path(const char *envname, const char *paths, size_t size, int prepend
         char *e = malloc(size+n+1);
         size_t pos = 0;
         if (prepend) {
+            if (size == n || (size < n && env[size] == PATH_SEP)) {
+                if (strncmp(paths, env, size) == 0) {
+                    free(e);
+                    return;
+                }
+            }
             memcpy(e, paths, pos = size-1);
             e[pos++] = PATH_SEP;
         }
         memcpy(e+pos, env, n);
         pos += n;
         if (!prepend) {
+            if (size == n || (size < n && env[n-size-1] == PATH_SEP)) {
+                if (strncmp(paths, &env[n-size], size) == 0) {
+                    free(e);
+                    return;
+                }
+            }
             e[pos++] = PATH_SEP;
             memcpy(e+pos, paths, size-1);
             pos += size-1;
@@ -44,6 +60,9 @@ insert_env_path(const char *envname, const char *paths, size_t size, int prepend
     setenv(envname, env, 1);
 }
 
+#define insert_env_path_lit(env, path, prep) \
+    insert_env_path(env, path, sizeof(path), prep)
+
 #define EXTOUT_DIR BUILDDIR"/"EXTOUT
 int
 main(int argc, char **argv)
@@ -65,6 +84,12 @@ main(int argc, char **argv)
     insert_env_path(LIBPATHENV, builddir, dirsize, 1);
     insert_env_path("RUBYLIB", rubylib, sizeof(rubylib), 0);
 
+    if (!getenv("GEM_PATH")) {
+        insert_env_path_lit("GEM_PATH", ABS_SRCDIR"/.bundle", 1);
+        insert_env_path_lit("GEM_PATH", BUILDDIR"/.bundle", 1);
+        setenv("GEM_HOME", BUILDDIR"/.bundle", 0);
+    }
+
     if (!(p = strrchr(arg0, '/'))) p = arg0; else p++;
     if (strlen(p) < namesize - 1) {
         argv[0] = malloc(p - arg0 + namesize);
diff --git a/ruby.c b/ruby.c
index be2ea2d0cde267..0d09e7ce61e1ab 100644
--- a/ruby.c
+++ b/ruby.c
@@ -22,7 +22,7 @@
 # include <sys/cygwin.h>
 #endif
 
-#if (defined(LOAD_RELATIVE) || defined(__MACH__)) && defined(HAVE_DLADDR)
+#if defined(LOAD_RELATIVE) && defined(HAVE_DLADDR)
 # include <dlfcn.h>
 #endif
 
@@ -53,6 +53,7 @@
 #include "internal/loadpath.h"
 #include "internal/missing.h"
 #include "internal/object.h"
+#include "internal/thread.h"
 #include "internal/ruby_parser.h"
 #include "internal/variable.h"
 #include "ruby/encoding.h"
@@ -104,9 +105,9 @@ void rb_warning_category_update(unsigned int mask, unsigned int bits);
     SEP \
     X(frozen_string_literal) \
     SEP \
-    X(rjit) \
-    SEP \
     X(yjit) \
+    SEP \
+    X(zjit) \
     /* END OF FEATURES */
 #define EACH_DEBUG_FEATURES(X, SEP) \
     X(frozen_string_literal) \
@@ -116,13 +117,10 @@ void rb_warning_category_update(unsigned int mask, unsigned int bits);
 #define DEFINE_DEBUG_FEATURE(bit) feature_debug_##bit
 enum feature_flag_bits {
     EACH_FEATURES(DEFINE_FEATURE, COMMA),
+    DEFINE_FEATURE(frozen_string_literal_set),
     feature_debug_flag_first,
-#if defined(RJIT_FORCE_ENABLE) || !USE_YJIT
-    DEFINE_FEATURE(jit) = feature_rjit,
-#else
     DEFINE_FEATURE(jit) = feature_yjit,
-#endif
-    feature_jit_mask = FEATURE_BIT(rjit) | FEATURE_BIT(yjit),
+    feature_jit_mask = FEATURE_BIT(yjit) | FEATURE_BIT(zjit),
 
     feature_debug_flag_begin = feature_debug_flag_first - 1,
     EACH_DEBUG_FEATURES(DEFINE_DEBUG_FEATURE, COMMA),
@@ -150,22 +148,19 @@ enum feature_flag_bits {
     SEP \
     X(parsetree) \
     SEP \
-    X(parsetree_with_comment) \
-    SEP \
     X(insns) \
-    SEP \
-    X(insns_without_opt) \
     /* END OF DUMPS */
 enum dump_flag_bits {
     dump_version_v,
-    dump_error_tolerant,
+    dump_opt_error_tolerant,
+    dump_opt_comment,
+    dump_opt_optimize,
     EACH_DUMPS(DEFINE_DUMP, COMMA),
-    dump_error_tolerant_bits = (DUMP_BIT(yydebug) |
-                                DUMP_BIT(parsetree) |
-                                DUMP_BIT(parsetree_with_comment)),
     dump_exit_bits = (DUMP_BIT(yydebug) | DUMP_BIT(syntax) |
-                      DUMP_BIT(parsetree) | DUMP_BIT(parsetree_with_comment) |
-                      DUMP_BIT(insns) | DUMP_BIT(insns_without_opt))
+                      DUMP_BIT(parsetree) | DUMP_BIT(insns)),
+    dump_optional_bits = (DUMP_BIT(opt_error_tolerant) |
+                          DUMP_BIT(opt_comment) |
+                          DUMP_BIT(opt_optimize))
 };
 
 static inline void
@@ -191,6 +186,7 @@ enum {
     COMPILATION_FEATURES = (
         0
         | FEATURE_BIT(frozen_string_literal)
+        | FEATURE_BIT(frozen_string_literal_set)
         | FEATURE_BIT(debug_frozen_string_literal)
         ),
     DEFAULT_FEATURES = (
@@ -199,6 +195,7 @@ enum {
         & ~FEATURE_BIT(gems)
 #endif
         & ~FEATURE_BIT(frozen_string_literal)
+        & ~FEATURE_BIT(frozen_string_literal_set)
         & ~feature_jit_mask
         )
 };
@@ -216,17 +213,16 @@ cmdline_options_init(ruby_cmdline_options_t *opt)
     opt->ext.enc.index = -1;
     opt->intern.enc.index = -1;
     opt->features.set = DEFAULT_FEATURES;
-#ifdef RJIT_FORCE_ENABLE /* to use with: ./configure cppflags="-DRJIT_FORCE_ENABLE" */
-    opt->features.set |= FEATURE_BIT(rjit);
-#elif defined(YJIT_FORCE_ENABLE)
+#if defined(YJIT_FORCE_ENABLE)
     opt->features.set |= FEATURE_BIT(yjit);
 #endif
+    opt->dump |= DUMP_BIT(opt_optimize);
     opt->backtrace_length_limit = LONG_MIN;
 
     return opt;
 }
 
-static rb_ast_t *load_file(VALUE parser, VALUE fname, VALUE f, int script,
+static VALUE load_file(VALUE parser, VALUE fname, VALUE f, int script,
                        ruby_cmdline_options_t *opt);
 static VALUE open_load_file(VALUE fname_v, int *xflag);
 static void forbid_setid(const char *, const ruby_cmdline_options_t *);
@@ -241,145 +237,165 @@ static const char esc_standout[] = "\n\033[1;7m";
 static const char esc_bold[] = "\033[1m";
 static const char esc_reset[] = "\033[0m";
 static const char esc_none[] = "";
+#define USAGE_INDENT "  "       /* macro for concatenation */
 
 static void
-show_usage_line(const struct ruby_opt_message *m,
+show_usage_part(const char *str, const unsigned int namelen,
+                const char *str2, const unsigned int secondlen,
+                const char *desc,
                 int help, int highlight, unsigned int w, int columns)
 {
-    const char *str = m->str;
-    const unsigned int namelen = m->namelen, secondlen = m->secondlen;
+    static const int indent_width = (int)rb_strlen_lit(USAGE_INDENT);
     const char *sb = highlight ? esc_bold : esc_none;
     const char *se = highlight ? esc_reset : esc_none;
-    const char *desc = str + namelen + secondlen;
     unsigned int desclen = (unsigned int)strcspn(desc, "\n");
-    if (help && (namelen > w) && (int)(namelen + secondlen) >= columns) {
-        printf("  %s" "%.*s" "%s\n", sb, namelen-1, str, se);
-        if (secondlen > 1) {
-            const int second_end = namelen+secondlen-1;
-            int n = namelen;
-            if (str[n] == ',') n++;
-            if (str[n] == ' ') n++;
-            printf("  %s" "%.*s" "%s\n", sb, second_end-n, str+n, se);
+    if (!help && desclen > 0 && strchr(".;:", desc[desclen-1])) --desclen;
+    if (help && (namelen + 1 > w) && /* a padding space */
+        (int)(namelen + secondlen + indent_width) >= columns) {
+        printf(USAGE_INDENT "%s" "%.*s" "%s\n", sb, namelen, str, se);
+        if (secondlen > 0) {
+            const int second_end = secondlen;
+            int n = 0;
+            if (str2[n] == ',') n++;
+            if (str2[n] == ' ') n++;
+            printf(USAGE_INDENT "%s" "%.*s" "%s\n", sb, second_end-n, str2+n, se);
         }
-        printf("%-*s%.*s\n", w + 2, "", desclen, desc);
+        printf("%-*s%.*s\n", w + indent_width, USAGE_INDENT, desclen, desc);
     }
     else {
-        const int wrap = help && namelen + secondlen - 1 > w;
-        printf("  %s%.*s%-*.*s%s%-*s%.*s\n", sb, namelen-1, str,
-               (wrap ? 0 : w - namelen + 1),
-               (help ? secondlen-1 : 0), str + namelen, se,
-               (wrap ? w + 3 : 0), (wrap ? "\n" : ""),
+        const int wrap = help && namelen + secondlen >= w;
+        printf(USAGE_INDENT "%s%.*s%-*.*s%s%-*s%.*s\n", sb, namelen, str,
+               (wrap ? 0 : w - namelen),
+               (help ? secondlen : 0), str2, se,
+               (wrap ? (int)(w + rb_strlen_lit("\n" USAGE_INDENT)) : 0),
+               (wrap ? "\n" USAGE_INDENT : ""),
                desclen, desc);
     }
     if (help) {
         while (desc[desclen]) {
-            desc += desclen + 1;
+            desc += desclen + rb_strlen_lit("\n");
             desclen = (unsigned int)strcspn(desc, "\n");
-            printf("%-*s%.*s\n", w + 2, "", desclen, desc);
+            printf("%-*s%.*s\n", w + indent_width, USAGE_INDENT, desclen, desc);
         }
     }
 }
 
+static void
+show_usage_line(const struct ruby_opt_message *m,
+                int help, int highlight, unsigned int w, int columns)
+{
+    const char *str = m->str;
+    const unsigned int namelen = m->namelen, secondlen = m->secondlen;
+    const char *desc = str + namelen + secondlen;
+    show_usage_part(str, namelen - 1, str + namelen, secondlen - 1, desc,
+                    help, highlight, w, columns);
+}
+
+void
+ruby_show_usage_line(const char *name, const char *secondary, const char *description,
+                     int help, int highlight, unsigned int width, int columns)
+{
+    unsigned int namelen = (unsigned int)strlen(name);
+    unsigned int secondlen = (secondary ? (unsigned int)strlen(secondary) : 0);
+    show_usage_part(name, namelen, secondary, secondlen,
+                    description, help, highlight, width, columns);
+}
+
 static void
 usage(const char *name, int help, int highlight, int columns)
 {
 #define M(shortopt, longopt, desc) RUBY_OPT_MESSAGE(shortopt, longopt, desc)
 
 #if USE_YJIT
-# define PLATFORM_JIT_OPTION "--yjit"
-#else
-# define PLATFORM_JIT_OPTION "--rjit (experimental)"
+# define DEFAULT_JIT_OPTION "--yjit"
+#elif USE_ZJIT
+# define DEFAULT_JIT_OPTION "--zjit"
 #endif
 
     /* This message really ought to be max 23 lines.
      * Removed -h because the user already knows that option. Others? */
     static const struct ruby_opt_message usage_msg[] = {
-        M("-0[octal]",	   "",			   "specify record separator (\\0, if no argument)\n"
-            "(-00 for paragraph mode, -0777 for slurp mode)"),
-        M("-a",		   "",			   "autosplit mode with -n or -p (splits $_ into $F)"),
-        M("-c",		   "",			   "check syntax only"),
-        M("-Cdirectory",   "",			   "cd to directory before executing your script"),
-        M("-d",		   ", --debug",		   "set debugging flags (set $DEBUG to true)"),
-        M("-e 'command'",  "",			   "one line of script. Several -e's allowed. Omit [programfile]"),
-        M("-Eex[:in]",     ", --encoding=ex[:in]", "specify the default external and internal character encodings"),
-        M("-Fpattern",	   "",			   "split() pattern for autosplit (-a)"),
-        M("-i[extension]", "",			   "edit ARGV files in place (make backup if extension supplied)"),
-        M("-Idirectory",   "",			   "specify $LOAD_PATH directory (may be used more than once)"),
-        M("-l",		   "",			   "enable line ending processing"),
-        M("-n",		   "",			   "assume 'while gets(); ... end' loop around your script"),
-        M("-p",		   "",			   "assume loop like -n but print line also like sed"),
-        M("-rlibrary",	   "",			   "require the library before executing your script"),
-        M("-s",		   "",			   "enable some switch parsing for switches after script name"),
-        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|: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 for the platform, same as " PLATFORM_JIT_OPTION),
+        M("-0[octal]",	   "",                     "Set input record separator ($/):\n"
+            "-0 for \\0; -00 for paragraph mode; -0777 for slurp mode."),
+        M("-a",		   "",                     "Split each input line ($_) into fields ($F)."),
+        M("-c",		   "",			   "Check syntax (no execution)."),
+        M("-Cdirpath",     "",			   "Execute program in specified directory."),
+        M("-d",		   ", --debug",		   "Set debugging flag ($DEBUG) to true."),
+        M("-e 'code'",     "",			   "Execute given Ruby code; multiple -e allowed."),
+        M("-Eex[:in]",     ", --encoding=ex[:in]", "Set default external and internal encodings."),
+        M("-Fpattern",	   "",			   "Set input field separator ($;); used with -a."),
+        M("-i[extension]", "",			   "Set ARGF in-place mode;\n"
+            "create backup files with given extension."),
+        M("-Idirpath",     "",			   "Prepend specified directory to load paths ($LOAD_PATH);\n"
+            "relative paths are expanded; multiple -I are allowed."),
+        M("-l",		   "",			   "Set output record separator ($\\) to $/;\n"
+            "used for line-oriented output."),
+        M("-n",		   "",			   "Run program in gets loop."),
+        M("-p",		   "",			   "Like -n, with printing added."),
+        M("-rlibrary",	   "",			   "Require the given library."),
+        M("-s",		   "",			   "Define global variables using switches following program path."),
+        M("-S",		   "",			   "Search directories found in the PATH environment variable."),
+        M("-v",		   "",			   "Print version; set $VERBOSE to true."),
+        M("-w",		   "",			   "Synonym for -W1."),
+        M("-W[level=2|:category]", "",             "Set warning flag ($-W):\n"
+            "0 for silent; 1 for moderate; 2 for verbose."),
+        M("-x[dirpath]",   "",			   "Execute Ruby code starting from a #!ruby line."),
+#if USE_YJIT || USE_ZJIT
+        M("--jit",         "",                     "Enable the default JIT for the build; same as " DEFAULT_JIT_OPTION "."),
+#endif
 #if USE_YJIT
-        M("--yjit",        "",                     "enable in-process JIT compiler"),
+        M("--yjit",        "",                     "Enable in-process JIT compiler."),
 #endif
-#if USE_RJIT
-        M("--rjit",        "",                     "enable pure-Ruby JIT compiler (experimental)"),
+#if USE_ZJIT
+        M("--zjit",        "",                     "Enable method-based JIT compiler."),
 #endif
-        M("-h",		   "",			   "show this message, --help for more info"),
+        M("-h",		   "",			   "Print this help message; use --help for longer message."),
     };
-    STATIC_ASSERT(usage_msg_size, numberof(usage_msg) < 25);
+    STATIC_ASSERT(usage_msg_size, numberof(usage_msg) < 26);
 
     static const struct ruby_opt_message help_msg[] = {
-        M("--copyright",                            "", "print the copyright"),
-        M("--dump={insns|parsetree|...}[,...]",     "",
-          "dump debug information. see below for available dump list"),
-        M("--enable={jit|rubyopt|...}[,...]", ", --disable={jit|rubyopt|...}[,...]",
-          "enable or disable features. see below for available features"),
-        M("--external-encoding=encoding",           ", --internal-encoding=encoding",
-          "specify the default external or internal character encoding"),
-        M("--backtrace-limit=num",                  "", "limit the maximum length of backtrace"),
-        M("--verbose",                              "", "turn on verbose mode and disable script from stdin"),
-        M("--version",                              "", "print the version number, then exit"),
-        M("-y",                          ", --yydebug", "print log of parser. Backward compatibility is not guaranteed"),
-        M("--help",			            "", "show this message, -h for short message"),
+        M("--backtrace-limit=num",        "",            "Set backtrace limit."),
+        M("--copyright",                  "",            "Print Ruby copyright."),
+        M("--crash-report=template",      "",            "Set template for crash report file."),
+        M("--disable=features",           "",            "Disable features; see list below."),
+        M("--dump=items",                 "",            "Dump items; see list below."),
+        M("--enable=features",            "",            "Enable features; see list below."),
+        M("--external-encoding=encoding", "",            "Set default external encoding."),
+        M("--help",                       "",            "Print long help message; use -h for short message."),
+        M("--internal-encoding=encoding", "",            "Set default internal encoding."),
+        M("--parser=parser",              "",            "Set Ruby parser: parse.y or prism."),
+        M("--verbose",                    "",            "Set $VERBOSE to true; ignore input from $stdin."),
+        M("--version",                    "",            "Print Ruby version."),
+        M("-y",                           ", --yydebug", "Print parser log; backward compatibility not guaranteed."),
     };
     static const struct ruby_opt_message dumps[] = {
-        M("insns",                  "", "instruction sequences"),
-        M("insns_without_opt",      "", "instruction sequences compiled with no optimization"),
-        M("yydebug(+error-tolerant)", "", "yydebug of yacc parser generator"),
-        M("parsetree(+error-tolerant)","", "AST"),
-        M("parsetree_with_comment(+error-tolerant)", "", "AST with comments"),
+        M("insns",              "", "Instruction sequences."),
+        M("yydebug",            "", "yydebug of yacc parser generator."),
+        M("parsetree",          "", "Abstract syntax tree (AST)."),
+        M("-optimize",          "", "Disable optimization (affects insns)."),
+        M("+error-tolerant",    "", "Error-tolerant parsing (affects yydebug, parsetree)."),
+        M("+comment",           "", "Add comments to AST (affects parsetree with --parser=parse.y)."),
     };
     static const struct ruby_opt_message features[] = {
-        M("gems",    "",        "rubygems (only for debugging, default: "DEFAULT_RUBYGEMS_ENABLED")"),
-        M("error_highlight", "", "error_highlight (default: "DEFAULT_RUBYGEMS_ENABLED")"),
-        M("did_you_mean", "",   "did_you_mean (default: "DEFAULT_RUBYGEMS_ENABLED")"),
-        M("syntax_suggest", "", "syntax_suggest (default: "DEFAULT_RUBYGEMS_ENABLED")"),
-        M("rubyopt", "",        "RUBYOPT environment variable (default: enabled)"),
-        M("frozen-string-literal", "", "freeze all string literals (default: disabled)"),
+        M("gems",                  "", "Rubygems (only for debugging, default: "DEFAULT_RUBYGEMS_ENABLED")."),
+        M("error_highlight",       "", "error_highlight (default: "DEFAULT_RUBYGEMS_ENABLED")."),
+        M("did_you_mean",          "", "did_you_mean (default: "DEFAULT_RUBYGEMS_ENABLED")."),
+        M("syntax_suggest",        "", "syntax_suggest (default: "DEFAULT_RUBYGEMS_ENABLED")."),
+        M("rubyopt",               "", "RUBYOPT environment variable (default: enabled)."),
+        M("frozen-string-literal", "", "Freeze all string literals (default: disabled)."),
 #if USE_YJIT
-        M("yjit", "",           "in-process JIT compiler (default: disabled)"),
+        M("yjit",                  "", "In-process JIT compiler (default: disabled)."),
 #endif
-#if USE_RJIT
-        M("rjit", "",           "pure-Ruby JIT compiler (default: disabled)"),
+#if USE_ZJIT
+        M("zjit",                  "", "Method-based JIT compiler (default: disabled)."),
 #endif
     };
     static const struct ruby_opt_message warn_categories[] = {
-        M("deprecated", "",       "deprecated features"),
-        M("experimental", "",     "experimental features"),
-        M("performance", "",      "performance issues"),
+        M("deprecated",   "", "Deprecated features."),
+        M("experimental", "", "Experimental features."),
+        M("performance",  "", "Performance issues."),
+        M("strict_unused_block", "", "Warning unused block strictly"),
     };
-#if USE_YJIT
-    static const struct ruby_opt_message yjit_options[] = {
-        M("--yjit-stats",                    "", "Enable collecting YJIT statistics"),
-        M("--yjit-trace-exits",              "", "Record Ruby source location when exiting from generated code"),
-        M("--yjit-trace-exits-sample-rate",  "", "Trace exit locations only every Nth occurrence"),
-        M("--yjit-exec-mem-size=num",        "", "Size of executable memory block in MiB (default: 128)"),
-        M("--yjit-call-threshold=num",       "", "Number of calls to trigger JIT (default: 30)"),
-        M("--yjit-max-versions=num",         "", "Maximum number of versions per basic block (default: 4)"),
-        M("--yjit-greedy-versioning",        "", "Greedy versioning mode (default: disabled)"),
-    };
-#endif
-#if USE_RJIT
-    extern const struct ruby_opt_message rb_rjit_option_messages[];
-#endif
     int i;
     const char *sb = highlight ? esc_standout+1 : esc_none;
     const char *se = highlight ? esc_reset : esc_none;
@@ -387,7 +403,7 @@ usage(const char *name, int help, int highlight, int columns)
     unsigned int w = (columns > 80 ? (columns - 79) / 2 : 0) + 16;
 #define SHOW(m) show_usage_line(&(m), help, highlight, w, columns)
 
-    printf("%sUsage:%s %s [switches] [--] [programfile] [arguments]\n", sb, se, name);
+    printf("%sUsage:%s %s [options] [--] [filepath] [arguments]\n", sb, se, name);
     for (i = 0; i < num; ++i)
         SHOW(usage_msg[i]);
 
@@ -408,52 +424,43 @@ usage(const char *name, int help, int highlight, int columns)
         SHOW(warn_categories[i]);
 #if USE_YJIT
     printf("%s""YJIT options:%s\n", sb, se);
-    for (i = 0; i < numberof(yjit_options); ++i)
-        SHOW(yjit_options[i]);
+    rb_yjit_show_usage(help, highlight, w, columns);
 #endif
-#if USE_RJIT
-    printf("%s""RJIT options (experimental):%s\n", sb, se);
-    for (i = 0; rb_rjit_option_messages[i].str; ++i)
-        SHOW(rb_rjit_option_messages[i]);
+#if USE_ZJIT
+    printf("%s""ZJIT options:%s\n", sb, se);
+    extern void rb_zjit_show_usage(int help, int highlight, unsigned int width, int columns);
+    rb_zjit_show_usage(help, highlight, w, columns);
 #endif
 }
 
 #define rubylib_path_new rb_str_new
 
 static void
-push_include(const char *path, VALUE (*filter)(VALUE))
+ruby_push_include(const char *path, VALUE (*filter)(VALUE))
 {
     const char sep = PATH_SEP_CHAR;
     const char *p, *s;
     VALUE load_path = GET_VM()->load_path;
-
-    p = path;
-    while (*p) {
-        while (*p == sep)
-            p++;
-        if (!*p) break;
-        for (s = p; *s && *s != sep; s = CharNext(s));
-        rb_ary_push(load_path, (*filter)(rubylib_path_new(p, s - p)));
-        p = s;
-    }
-}
-
 #ifdef __CYGWIN__
-static void
-push_include_cygwin(const char *path, VALUE (*filter)(VALUE))
-{
-    const char *p, *s;
     char rubylib[FILENAME_MAX];
     VALUE buf = 0;
+# define is_path_sep(c) ((c) == sep || (c) == ';')
+#else
+# define is_path_sep(c) ((c) == sep)
+#endif
 
+    if (path == 0) return;
     p = path;
     while (*p) {
-        unsigned int len;
-        while (*p == ';')
+        long len;
+        while (is_path_sep(*p))
             p++;
         if (!*p) break;
-        for (s = p; *s && *s != ';'; s = CharNext(s));
+        for (s = p; *s && !is_path_sep(*s); s = CharNext(s));
         len = s - p;
+#undef is_path_sep
+
+#ifdef __CYGWIN__
         if (*s) {
             if (!buf) {
                 buf = rb_str_new(p, len);
@@ -470,23 +477,14 @@ push_include_cygwin(const char *path, VALUE (*filter)(VALUE))
 #else
 # error no cygwin_conv_path
 #endif
-        if (CONV_TO_POSIX_PATH(p, rubylib) == 0)
+        if (CONV_TO_POSIX_PATH(p, rubylib) == 0) {
             p = rubylib;
-        push_include(p, filter);
-        if (!*s) break;
-        p = s + 1;
-    }
-}
-
-#define push_include push_include_cygwin
+            len = strlen(p);
+        }
 #endif
-
-void
-ruby_push_include(const char *path, VALUE (*filter)(VALUE))
-{
-    if (path == 0)
-        return;
-    push_include(path, filter);
+        rb_ary_push(load_path, (*filter)(rubylib_path_new(p, len)));
+        p = s;
+    }
 }
 
 static VALUE
@@ -494,6 +492,7 @@ identical_path(VALUE path)
 {
     return path;
 }
+
 static VALUE
 locale_path(VALUE path)
 {
@@ -554,6 +553,8 @@ translit_char_bin(char *p, int from, int to)
 #endif
 
 #ifdef _WIN32
+# undef chdir
+# define chdir rb_w32_uchdir
 # define UTF8_PATH 1
 #endif
 
@@ -580,7 +581,7 @@ str_conv_enc(VALUE str, rb_encoding *from, rb_encoding *to)
 
 void ruby_init_loadpath(void);
 
-#if defined(LOAD_RELATIVE) || defined(__MACH__)
+#if defined(LOAD_RELATIVE)
 static VALUE
 runtime_libruby_path(void)
 {
@@ -657,10 +658,6 @@ runtime_libruby_path(void)
 #define INITIAL_LOAD_PATH_MARK rb_intern_const("@gem_prelude_index")
 
 VALUE ruby_archlibdir_path, ruby_prefix_path;
-#if defined(__MACH__)
-// A path to libruby.dylib itself or where it's statically linked to.
-VALUE rb_libruby_selfpath;
-#endif
 
 void
 ruby_init_loadpath(void)
@@ -668,19 +665,6 @@ ruby_init_loadpath(void)
     VALUE load_path, archlibdir = 0;
     ID id_initial_load_path_mark;
     const char *paths = ruby_initial_load_paths;
-#if defined(LOAD_RELATIVE) || defined(__MACH__)
-    VALUE libruby_path = runtime_libruby_path();
-# if defined(__MACH__)
-    VALUE selfpath = libruby_path;
-#   if defined(LOAD_RELATIVE)
-    selfpath = rb_str_dup(selfpath);
-#   endif
-    rb_obj_hide(selfpath);
-    OBJ_FREEZE_RAW(selfpath);
-    rb_gc_register_address(&rb_libruby_selfpath);
-    rb_libruby_selfpath = selfpath;
-# endif
-#endif
 
 #if defined LOAD_RELATIVE
 #if !defined ENABLE_MULTIARCH
@@ -695,7 +679,7 @@ ruby_init_loadpath(void)
     size_t baselen;
     const char *p;
 
-    sopath = libruby_path;
+    sopath = runtime_libruby_path();
     libpath = RSTRING_PTR(sopath);
 
     p = strrchr(libpath, '/');
@@ -721,11 +705,11 @@ ruby_init_loadpath(void)
             p -= bindir_len;
             archlibdir = rb_str_subseq(sopath, 0, p - libpath);
             rb_str_cat_cstr(archlibdir, libdir);
-            OBJ_FREEZE_RAW(archlibdir);
+            OBJ_FREEZE(archlibdir);
         }
         else if (p - libpath >= libdir_len && !strncmp(p - libdir_len, libdir, libdir_len)) {
             archlibdir = rb_str_subseq(sopath, 0, (p2 ? p2 : p) - libpath);
-            OBJ_FREEZE_RAW(archlibdir);
+            OBJ_FREEZE(archlibdir);
             p -= libdir_len;
         }
 #ifdef ENABLE_MULTIARCH
@@ -756,7 +740,7 @@ ruby_init_loadpath(void)
 #endif
     rb_gc_register_address(&ruby_prefix_path);
     ruby_prefix_path = PREFIX_PATH();
-    OBJ_FREEZE_RAW(ruby_prefix_path);
+    OBJ_FREEZE(ruby_prefix_path);
     if (!archlibdir) archlibdir = ruby_prefix_path;
     rb_gc_register_address(&ruby_archlibdir_path);
     ruby_archlibdir_path = archlibdir;
@@ -773,8 +757,6 @@ ruby_init_loadpath(void)
         rb_ary_push(load_path, path);
         paths += len + 1;
     }
-
-    rb_const_set(rb_cObject, rb_intern_const("TMP_RUBY_PREFIX"), ruby_prefix_path);
 }
 
 
@@ -898,18 +880,20 @@ moreswitches(const char *s, ruby_cmdline_options_t *opt, int envopt)
     ruby_features_t feat = opt->features;
     ruby_features_t warn = opt->warn;
     long backtrace_length_limit = opt->backtrace_length_limit;
+    const char *crash_report = opt->crash_report;
 
     while (ISSPACE(*s)) s++;
     if (!*s) return;
 
     opt->src.enc.name = opt->ext.enc.name = opt->intern.enc.name = 0;
 
-    argstr = rb_str_tmp_new((len = strlen(s)) + (envopt!=0));
+    const int hyphen = *s != '-';
+    argstr = rb_str_tmp_new((len = strlen(s)) + hyphen);
     argary = rb_str_tmp_new(0);
 
     p = RSTRING_PTR(argstr);
-    if (envopt) *p++ = ' ';
-    memcpy(p, s, len + 1);
+    if (hyphen) *p = '-';
+    memcpy(p + hyphen, s, len + 1);
     ap = 0;
     rb_str_cat(argary, (char *)&ap, sizeof(ap));
     while (*p) {
@@ -951,6 +935,9 @@ moreswitches(const char *s, ruby_cmdline_options_t *opt, int envopt)
     if (BACKTRACE_LENGTH_LIMIT_VALID_P(backtrace_length_limit)) {
         opt->backtrace_length_limit = backtrace_length_limit;
     }
+    if (crash_report) {
+        opt->crash_report = crash_report;
+    }
 
     ruby_xfree(ptr);
     /* get rid of GC */
@@ -971,7 +958,7 @@ name_match_p(const char *name, const char *str, size_t len)
         if (*str != '-' && *str != '_') return 0;
         while (ISALNUM(*name)) name++;
         if (*name != '-' && *name != '_') return 0;
-        ++name;
+        if (!*++name) return 1;
         ++str;
         if (--len == 0) return 1;
     }
@@ -1015,14 +1002,14 @@ feature_option(const char *str, int len, void *arg, const unsigned int enable)
         goto found;
     }
     if (NAME_MATCH_P("all", str, len)) {
-        // YJIT and RJIT cannot be enabled at the same time. We enable only one for --enable=all.
+        // We enable only one JIT for --enable=all.
         mask &= ~feature_jit_mask | FEATURE_BIT(jit);
         goto found;
     }
 #if AMBIGUOUS_FEATURE_NAMES
     if (matched == 1) goto found;
     if (matched > 1) {
-        VALUE mesg = rb_sprintf("ambiguous feature: `%.*s' (", len, str);
+        VALUE mesg = rb_sprintf("ambiguous feature: '%.*s' (", len, str);
 #define ADD_FEATURE_NAME(bit) \
         if (FEATURE_BIT(bit) & set) { \
             rb_str_cat_cstr(mesg, #bit); \
@@ -1036,13 +1023,16 @@ feature_option(const char *str, int len, void *arg, const unsigned int enable)
 #else
     (void)set;
 #endif
-    rb_warn("unknown argument for --%s: `%.*s'",
+    rb_warn("unknown argument for --%s: '%.*s'",
             enable ? "enable" : "disable", len, str);
     rb_warn("features are [%.*s].", (int)strlen(list), list);
     return;
 
   found:
     FEATURE_SET_TO(*argp, mask, (mask & enable));
+    if (NAME_MATCH_P("frozen_string_literal", str, len)) {
+        FEATURE_SET_TO(*argp, FEATURE_BIT(frozen_string_literal_set), FEATURE_BIT(frozen_string_literal_set));
+    }
     return;
 }
 
@@ -1075,7 +1065,7 @@ debug_option(const char *str, int len, void *arg)
 #ifdef RUBY_DEVEL
     if (ruby_patchlevel < 0 && ruby_env_debug_option(str, len, 0)) return;
 #endif
-    rb_warn("unknown argument for --debug: `%.*s'", len, str);
+    rb_warn("unknown argument for --debug: '%.*s'", len, str);
     rb_warn("debug features are [%.*s].", (int)strlen(list), list);
 }
 
@@ -1091,21 +1081,45 @@ memtermspn(const char *str, char term, int len)
 static const char additional_opt_sep = '+';
 
 static unsigned int
-dump_additional_option(const char *str, int len, unsigned int bits, const char *name)
+dump_additional_option_flag(const char *str, int len, unsigned int bits, bool set)
+{
+#define SET_DUMP_OPT(bit) if (NAME_MATCH_P(#bit, str, len)) { \
+        return set ? (bits | DUMP_BIT(opt_ ## bit)) : (bits & ~DUMP_BIT(opt_ ## bit)); \
+    }
+    SET_DUMP_OPT(error_tolerant);
+    SET_DUMP_OPT(comment);
+    SET_DUMP_OPT(optimize);
+#undef SET_DUMP_OPT
+    rb_warn("don't know how to dump with%s '%.*s'", set ? "" : "out", len, str);
+    return bits;
+}
+
+static unsigned int
+dump_additional_option(const char *str, int len, unsigned int bits)
 {
     int w;
     for (; len-- > 0 && *str++ == additional_opt_sep; len -= w, str += w) {
         w = memtermspn(str, additional_opt_sep, len);
-#define SET_ADDITIONAL(bit) if (NAME_MATCH_P(#bit, str, w)) { \
-            if (bits & DUMP_BIT(bit)) \
-                rb_warn("duplicate option to dump %s: `%.*s'", name, w, str); \
-            bits |= DUMP_BIT(bit); \
-            continue; \
+        bool set = true;
+        if (*str == '-' || *str == '+') {
+            set = *str++ == '+';
+            --w;
         }
-        if (dump_error_tolerant_bits & bits) {
-            SET_ADDITIONAL(error_tolerant);
+        else {
+            int n = memtermspn(str, '-', w);
+            if (str[n] == '-') {
+                if (NAME_MATCH_P("with", str, n)) {
+                    str += n;
+                    w -= n;
+                }
+                else if (NAME_MATCH_P("without", str, n)) {
+                    set = false;
+                    str += n;
+                    w -= n;
+                }
+            }
         }
-        rb_warn("don't know how to dump %s with `%.*s'", name, w, str);
+        bits = dump_additional_option_flag(str, w, bits, set);
     }
     return bits;
 }
@@ -1114,16 +1128,21 @@ static void
 dump_option(const char *str, int len, void *arg)
 {
     static const char list[] = EACH_DUMPS(LITERAL_NAME_ELEMENT, ", ");
+    unsigned int *bits_ptr = (unsigned int *)arg;
+    if (*str == '+' || *str == '-') {
+        bool set = *str++ == '+';
+        *bits_ptr = dump_additional_option_flag(str, --len, *bits_ptr, set);
+        return;
+    }
     int w = memtermspn(str, additional_opt_sep, len);
 
 #define SET_WHEN_DUMP(bit) \
-    if (NAME_MATCH_P(#bit, (str), (w))) { \
-        *(unsigned int *)arg |= \
-            dump_additional_option(str + w, len - w, DUMP_BIT(bit), #bit); \
+    if (NAME_MATCH_P(#bit "-", (str), (w))) { \
+        *bits_ptr = dump_additional_option(str + w, len - w, *bits_ptr | DUMP_BIT(bit)); \
         return; \
     }
     EACH_DUMPS(SET_WHEN_DUMP, ;);
-    rb_warn("don't know how to dump `%.*s',", len, str);
+    rb_warn("don't know how to dump '%.*s',", len, str);
     rb_warn("but only [%.*s].", (int)strlen(list), list);
 }
 
@@ -1169,12 +1188,27 @@ setup_yjit_options(const char *s)
 
     rb_raise(
         rb_eRuntimeError,
-        "invalid YJIT option `%s' (--help will show valid yjit options)",
+        "invalid YJIT option '%s' (--help will show valid yjit options)",
         s
     );
 }
 #endif
 
+#if USE_ZJIT
+static void
+setup_zjit_options(ruby_cmdline_options_t *opt, const char *s)
+{
+    // The option parsing is done in zjit/src/options.rs
+    extern void *rb_zjit_init_options(void);
+    extern bool rb_zjit_parse_option(void *options, const char *s);
+
+    if (!opt->zjit) opt->zjit = rb_zjit_init_options();
+    if (!rb_zjit_parse_option(opt->zjit, s)) {
+        rb_raise(rb_eRuntimeError, "invalid ZJIT option '%s' (--help will show valid zjit options)", s);
+    }
+}
+#endif
+
 /*
  * Following proc_*_option functions are tree kinds:
  *
@@ -1206,8 +1240,11 @@ proc_W_option(ruby_cmdline_options_t *opt, const char *s, int *warning)
         else if (NAME_MATCH_P("performance", s, len)) {
             bits = 1U << RB_WARN_CATEGORY_PERFORMANCE;
         }
+        else if (NAME_MATCH_P("strict_unused_block", s, len)) {
+            bits = 1U << RB_WARN_CATEGORY_STRICT_UNUSED_BLOCK;
+        }
         else {
-            rb_warn("unknown warning category: `%s'", s);
+            rb_warn("unknown warning category: '%s'", s);
         }
         if (bits) FEATURE_SET_TO(opt->warn, bits, enable ? bits : 0);
         return 0;
@@ -1316,11 +1353,11 @@ proc_0_option(ruby_cmdline_options_t *opt, const char *s)
     if (v > 0377)
         rb_rs = Qnil;
     else if (v == 0 && numlen >= 2) {
-        rb_rs = rb_str_new2("");
+        rb_rs = rb_fstring_lit("");
     }
     else {
         c = v & 0xff;
-        rb_rs = rb_str_new(&c, 1);
+        rb_rs = rb_str_freeze(rb_str_new(&c, 1));
     }
     return s;
 }
@@ -1362,14 +1399,14 @@ proc_long_options(ruby_cmdline_options_t *opt, const char *s, long argc, char **
     (((allow_envopt) || !envopt) ? (void)0 :                            \
      rb_raise(rb_eRuntimeError, "invalid switch in RUBYOPT: --" name))
 # define need_argument(name, s, needs_arg, next_arg)                    \
-    ((*(s) ? !*++(s) : (next_arg) && (!argc || !((s) = argv[1]) || (--argc, ++argv, 0))) && (needs_arg) ? \
+    ((*(s) ? !*++(s) : (next_arg) && (argc <= 1 || !((s) = argv[1]) || (--argc, ++argv, 0))) && (needs_arg) ? \
      rb_raise(rb_eRuntimeError, "missing argument for --" name)         \
      : (void)0)
 # define is_option_with_arg(name, allow_hyphen, allow_envopt)           \
     is_option_with_optarg(name, allow_hyphen, allow_envopt, Qtrue, Qtrue)
 # define is_option_with_optarg(name, allow_hyphen, allow_envopt, needs_arg, next_arg) \
     (strncmp((name), s, n = sizeof(name) - 1) == 0 && is_option_end(s[n], (allow_hyphen)) && \
-     (s[n] != '-' || s[n+1]) ?                                          \
+     (s[n] != '-' || (s[n] && s[n+1])) ?                                \
      (check_envopt(name, (allow_envopt)), s += n,                       \
       need_argument(name, s, needs_arg, next_arg), 1) : 0)
 
@@ -1401,6 +1438,17 @@ proc_long_options(ruby_cmdline_options_t *opt, const char *s, long argc, char **
     else if (is_option_with_arg("external-encoding", Qfalse, Qtrue)) {
         set_external_encoding_once(opt, s, 0);
     }
+    else if (is_option_with_arg("parser", Qfalse, Qtrue)) {
+        if (strcmp("prism", s) == 0) {
+            rb_ruby_default_parser_set(RB_DEFAULT_PARSER_PRISM);
+        }
+        else if (strcmp("parse.y", s) == 0) {
+            rb_ruby_default_parser_set(RB_DEFAULT_PARSER_PARSE_Y);
+        }
+        else {
+            rb_raise(rb_eRuntimeError, "unknown parser %s", s);
+        }
+    }
 #if defined ALLOW_DEFAULT_SOURCE_ENCODING && ALLOW_DEFAULT_SOURCE_ENCODING
     else if (is_option_with_arg("source-encoding", Qfalse, Qtrue)) {
         set_source_encoding_once(opt, s, 0);
@@ -1415,19 +1463,10 @@ proc_long_options(ruby_cmdline_options_t *opt, const char *s, long argc, char **
         ruby_verbose = Qtrue;
     }
     else if (strcmp("jit", s) == 0) {
-#if !USE_RJIT
-        rb_warn("Ruby was built without JIT support");
-#else
+#if USE_YJIT
         FEATURE_SET(opt->features, FEATURE_BIT(jit));
-#endif
-    }
-    else if (is_option_with_optarg("rjit", '-', true, false, false)) {
-#if USE_RJIT
-        extern void rb_rjit_setup_options(const char *s, struct rb_rjit_options *rjit_opt);
-        FEATURE_SET(opt->features, FEATURE_BIT(rjit));
-        rb_rjit_setup_options(s, &opt->rjit);
 #else
-        rb_warn("RJIT support is disabled.");
+        rb_warn("Ruby was built without JIT support");
 #endif
     }
     else if (is_option_with_optarg("yjit", '-', true, false, false)) {
@@ -1437,6 +1476,15 @@ proc_long_options(ruby_cmdline_options_t *opt, const char *s, long argc, char **
 #else
         rb_warn("Ruby was built without YJIT support."
                 " You may need to install rustc to build Ruby with YJIT.");
+#endif
+    }
+    else if (is_option_with_optarg("zjit", '-', true, false, false)) {
+#if USE_ZJIT
+        FEATURE_SET(opt->features, FEATURE_BIT(zjit));
+        setup_zjit_options(opt, s);
+#else
+        rb_warn("Ruby was built without ZJIT support."
+                " You may need to install rustc to build Ruby with ZJIT.");
 #endif
     }
     else if (strcmp("yydebug", s) == 0) {
@@ -1461,6 +1509,9 @@ proc_long_options(ruby_cmdline_options_t *opt, const char *s, long argc, char **
             opt->backtrace_length_limit = n;
         }
     }
+    else if (is_option_with_arg("crash-report", true, true)) {
+        opt->crash_report = s;
+    }
     else {
         rb_raise(rb_eRuntimeError,
                  "invalid option --%s  (-h will show valid options)", s);
@@ -1676,11 +1727,27 @@ proc_options(long argc, char **argv, ruby_cmdline_options_t *opt, int envopt)
             if (!s[1])
                 break;
 
-          default:
+          default: {
+            rb_encoding *enc = IF_UTF8_PATH(rb_utf8_encoding(), rb_locale_encoding());
+            const char *e = s + strlen(s);
+            int r = rb_enc_precise_mbclen(s, e, enc);
+            unsigned int c = (unsigned char)*s;
+            if (r > 0) {
+                c = rb_enc_mbc_to_codepoint(s, e, enc);
+                if (ONIGENC_IS_CODE_GRAPH(enc, c) ||
+                    ((s = ruby_escaped_char(c)) != 0 &&
+                     (r = (int)strlen(s), /* 3 at most */ 1))) {
+                    rb_enc_raise(enc, rb_eRuntimeError,
+                                 "invalid option -%.*s  (-h will show valid options)",
+                                 r, s);
+                }
+            }
             rb_raise(rb_eRuntimeError,
-                     "invalid option -%c  (-h will show valid options)",
-                     (int)(unsigned char)*s);
+                     "invalid option -\\x%.2x  (-h will show valid options)",
+                     c);
+
             goto switch_end;
+          }
 
           noenvopt:
             /* "EIdvwWrKU" only */
@@ -1703,7 +1770,6 @@ static void
 ruby_init_prelude(void)
 {
     Init_builtin_features();
-    rb_const_remove(rb_cObject, rb_intern_const("TMP_RUBY_PREFIX"));
 }
 
 void rb_call_builtin_inits(void);
@@ -1721,6 +1787,8 @@ Init_extra_exts(void)
 static void
 ruby_opt_init(ruby_cmdline_options_t *opt)
 {
+    rb_warning_category_update(opt->warn.mask, opt->warn.set);
+
     if (opt->dump & dump_exit_bits) return;
 
     if (FEATURE_SET_P(opt->features, gems)) {
@@ -1736,8 +1804,6 @@ ruby_opt_init(ruby_cmdline_options_t *opt)
         }
     }
 
-    rb_warning_category_update(opt->warn.mask, opt->warn.set);
-
     /* [Feature #19785] Warning for removed GC environment variable.
      * Remove this in Ruby 3.4. */
     if (getenv("RUBY_GC_HEAP_INIT_SLOTS")) {
@@ -1745,36 +1811,36 @@ ruby_opt_init(ruby_cmdline_options_t *opt)
                            "environment variables RUBY_GC_HEAP_%d_INIT_SLOTS");
     }
 
-#if USE_RJIT
-    // rb_call_builtin_inits depends on RubyVM::RJIT.enabled?
-    if (opt->rjit.on)
-        rb_rjit_enabled = true;
-    if (opt->rjit.stats)
-        rb_rjit_stats_enabled = true;
-    if (opt->rjit.trace_exits)
-        rb_rjit_trace_exits_enabled = true;
-#endif
-
     Init_ext(); /* load statically linked extensions before rubygems */
     Init_extra_exts();
+
+    GET_VM()->running = 0;
     rb_call_builtin_inits();
-    ruby_init_prelude();
+    GET_VM()->running = 1;
+    memset(ruby_vm_redefined_flag, 0, sizeof(ruby_vm_redefined_flag));
+
+    if (rb_namespace_available())
+        rb_initialize_main_namespace();
 
     // Initialize JITs after prelude because JITing prelude is typically not optimal.
-#if USE_RJIT
-    // Also, rb_rjit_init is safe only after rb_call_builtin_inits() defines RubyVM::RJIT::Compiler.
-    if (opt->rjit.on)
-        rb_rjit_init(&opt->rjit);
+#if USE_YJIT
+    rb_yjit_init(opt->yjit);
+#endif
+#if USE_ZJIT
+    if (opt->zjit) {
+        extern void rb_zjit_init(void *options);
+        rb_zjit_init(opt->zjit);
+    }
 #endif
+
 #if USE_YJIT
-    if (opt->yjit)
-        rb_yjit_init();
+    // Call yjit_hook.rb after rb_yjit_init() to use `RubyVM::YJIT.enabled?`
+    void Init_builtin_yjit_hook();
+    Init_builtin_yjit_hook();
 #endif
-    // rb_threadptr_root_fiber_setup for the initial thread is called before rb_yjit_enabled_p()
-    // or rjit_enabled becomes true, meaning jit_cont_new is skipped for the initial root fiber.
-    // Therefore we need to call this again here to set the initial root fiber's jit_cont.
-    rb_jit_cont_init(); // must be after rjit_enabled = true and rb_yjit_init()
 
+    rb_namespace_init_done();
+    ruby_init_prelude();
     ruby_set_script_name(opt->script_name);
     require_libraries(&opt->req_list);
 }
@@ -1939,7 +2005,7 @@ copy_str(VALUE str, rb_encoding *enc, bool intern)
     return rb_enc_interned_str(RSTRING_PTR(str), RSTRING_LEN(str), enc);
 }
 
-#if USE_YJIT
+#if USE_YJIT || USE_ZJIT
 // Check that an environment variable is set to a truthy value
 static bool
 env_var_truthy(const char *name)
@@ -1961,12 +2027,296 @@ env_var_truthy(const char *name)
 
 rb_pid_t rb_fork_ruby(int *status);
 
+static void
+show_help(const char *progname, int help)
+{
+    int tty = isatty(1);
+    int columns = 0;
+    if (help && tty) {
+        const char *pager_env = getenv("RUBY_PAGER");
+        if (!pager_env) pager_env = getenv("PAGER");
+        if (pager_env && *pager_env && isatty(0)) {
+            const char *columns_env = getenv("COLUMNS");
+            if (columns_env) columns = atoi(columns_env);
+            VALUE pager = rb_str_new_cstr(pager_env);
+#ifdef HAVE_WORKING_FORK
+            int fds[2];
+            if (rb_pipe(fds) == 0) {
+                rb_pid_t pid = rb_fork_ruby(NULL);
+                if (pid > 0) {
+                    /* exec PAGER with reading from child */
+                    dup2(fds[0], 0);
+                }
+                else if (pid == 0) {
+                    /* send the help message to the parent PAGER */
+                    dup2(fds[1], 1);
+                    dup2(fds[1], 2);
+                }
+                close(fds[0]);
+                close(fds[1]);
+                if (pid > 0) {
+                    setup_pager_env();
+                    rb_f_exec(1, &pager);
+                    kill(SIGTERM, pid);
+                    rb_waitpid(pid, 0, 0);
+                }
+            }
+#else
+            setup_pager_env();
+            VALUE port = rb_io_popen(pager, rb_str_new_lit("w"), Qnil, Qnil);
+            if (!NIL_P(port)) {
+                int oldout = dup(1);
+                int olderr = dup(2);
+                int fd = RFILE(port)->fptr->fd;
+                tty = tty_enabled();
+                dup2(fd, 1);
+                dup2(fd, 2);
+                usage(progname, 1, tty, columns);
+                fflush(stdout);
+                dup2(oldout, 1);
+                dup2(olderr, 2);
+                rb_io_close(port);
+                return;
+            }
+#endif
+        }
+    }
+    usage(progname, help, tty, columns);
+}
+
+static VALUE
+process_script(ruby_cmdline_options_t *opt)
+{
+    rb_ast_t *ast;
+    VALUE ast_value;
+    VALUE parser = rb_parser_new();
+    const unsigned int dump = opt->dump;
+
+    if (dump & DUMP_BIT(yydebug)) {
+        rb_parser_set_yydebug(parser, Qtrue);
+    }
+
+    if ((dump & dump_exit_bits) && (dump & DUMP_BIT(opt_error_tolerant))) {
+        rb_parser_error_tolerant(parser);
+    }
+
+    if (opt->e_script) {
+        VALUE progname = rb_progname;
+        rb_parser_set_context(parser, 0, TRUE);
+
+        ruby_opt_init(opt);
+        ruby_set_script_name(progname);
+        rb_parser_set_options(parser, opt->do_print, opt->do_loop,
+                              opt->do_line, opt->do_split);
+        ast_value = rb_parser_compile_string(parser, opt->script, opt->e_script, 1);
+    }
+    else {
+        VALUE f;
+        int xflag = opt->xflag;
+        f = open_load_file(opt->script_name, &xflag);
+        opt->xflag = xflag != 0;
+        rb_parser_set_context(parser, 0, f == rb_stdin);
+        ast_value = load_file(parser, opt->script_name, f, 1, opt);
+    }
+    ast = rb_ruby_ast_data_get(ast_value);
+    if (!ast->body.root) {
+        rb_ast_dispose(ast);
+        return Qnil;
+    }
+    return ast_value;
+}
+
+static uint8_t
+prism_script_command_line(ruby_cmdline_options_t *opt)
+{
+    uint8_t command_line = 0;
+    if (opt->do_split) command_line |= PM_OPTIONS_COMMAND_LINE_A;
+    if (opt->do_line) command_line |= PM_OPTIONS_COMMAND_LINE_L;
+    if (opt->do_loop) command_line |= PM_OPTIONS_COMMAND_LINE_N;
+    if (opt->do_print) command_line |= PM_OPTIONS_COMMAND_LINE_P;
+    if (opt->xflag) command_line |= PM_OPTIONS_COMMAND_LINE_X;
+    return command_line;
+}
+
+static void
+prism_script_shebang_callback(pm_options_t *options, const uint8_t *source, size_t length, void *data)
+{
+    ruby_cmdline_options_t *opt = (ruby_cmdline_options_t *) data;
+    opt->warning = 0;
+
+    char *switches = malloc(length + 1);
+    memcpy(switches, source, length);
+    switches[length] = '\0';
+
+    int no_src_enc = !opt->src.enc.name;
+    int no_ext_enc = !opt->ext.enc.name;
+    int no_int_enc = !opt->intern.enc.name;
+
+    moreswitches(switches, opt, 0);
+    free(switches);
+
+    pm_options_command_line_set(options, prism_script_command_line(opt));
+
+    if (no_src_enc && opt->src.enc.name) {
+        opt->src.enc.index = opt_enc_index(opt->src.enc.name);
+        pm_options_encoding_set(options, StringValueCStr(opt->ext.enc.name));
+    }
+    if (no_ext_enc && opt->ext.enc.name) {
+        opt->ext.enc.index = opt_enc_index(opt->ext.enc.name);
+    }
+    if (no_int_enc && opt->intern.enc.name) {
+        opt->intern.enc.index = opt_enc_index(opt->intern.enc.name);
+    }
+}
+
+/**
+ * Process the command line options and parse the script into the given result.
+ * Raise an error if the script cannot be parsed.
+ */
+static void
+prism_script(ruby_cmdline_options_t *opt, pm_parse_result_t *result)
+{
+    memset(result, 0, sizeof(pm_parse_result_t));
+
+    pm_options_t *options = &result->options;
+    pm_options_line_set(options, 1);
+    pm_options_main_script_set(options, true);
+
+    const bool read_stdin = (strcmp(opt->script, "-") == 0);
+
+    if (read_stdin) {
+        pm_options_encoding_set(options, rb_enc_name(rb_locale_encoding()));
+    }
+    if (opt->src.enc.name != 0) {
+        pm_options_encoding_set(options, StringValueCStr(opt->src.enc.name));
+    }
+
+    uint8_t command_line = prism_script_command_line(opt);
+    VALUE error;
+
+    if (read_stdin) {
+        pm_options_command_line_set(options, command_line);
+        pm_options_filepath_set(options, "-");
+        pm_options_shebang_callback_set(options, prism_script_shebang_callback, (void *) opt);
+
+        ruby_opt_init(opt);
+        error = pm_parse_stdin(result);
+
+        // If we found an __END__ marker, then we're going to define a global
+        // DATA constant that is a file object that can be read to read the
+        // contents after the marker.
+        if (NIL_P(error) && result->parser.data_loc.start != NULL) {
+            rb_define_global_const("DATA", rb_stdin);
+        }
+    }
+    else if (opt->e_script) {
+        command_line = (uint8_t) ((command_line | PM_OPTIONS_COMMAND_LINE_E) & ~PM_OPTIONS_COMMAND_LINE_X);
+        pm_options_command_line_set(options, command_line);
+
+        ruby_opt_init(opt);
+        result->node.coverage_enabled = 0;
+        error = pm_parse_string(result, opt->e_script, rb_str_new2("-e"), NULL);
+    }
+    else {
+        VALUE script_name = rb_str_encode_ospath(opt->script_name);
+
+        pm_options_command_line_set(options, command_line);
+        pm_options_shebang_callback_set(options, prism_script_shebang_callback, (void *) opt);
+
+        error = pm_load_file(result, script_name, true);
+
+        // If reading the file did not error, at that point we load the command
+        // line options. We do it in this order so that if the main script fails
+        // to load, it doesn't require files required by -r.
+        if (NIL_P(error)) {
+            ruby_opt_init(opt);
+            error = pm_parse_file(result, opt->script_name, NULL);
+        }
+
+        // Check if (after requiring all of the files through -r flags) we have
+        // coverage enabled and need to enable coverage on the main script.
+        if (RTEST(rb_get_coverages())) {
+            result->node.coverage_enabled = 1;
+        }
+
+        // If we found an __END__ marker, then we're going to define a global
+        // DATA constant that is a file object that can be read to read the
+        // contents after the marker.
+        if (NIL_P(error) && result->parser.data_loc.start != NULL) {
+            int xflag = opt->xflag;
+            VALUE file = open_load_file(script_name, &xflag);
+
+            const pm_parser_t *parser = &result->parser;
+            size_t offset = parser->data_loc.start - parser->start + 7;
+
+            if ((parser->start + offset < parser->end) && parser->start[offset] == '\r') offset++;
+            if ((parser->start + offset < parser->end) && parser->start[offset] == '\n') offset++;
+
+            rb_funcall(file, rb_intern_const("seek"), 2, SIZET2NUM(offset), INT2FIX(SEEK_SET));
+            rb_define_global_const("DATA", file);
+        }
+    }
+
+    if (!NIL_P(error)) {
+        pm_parse_result_free(result);
+        rb_exc_raise(error);
+    }
+}
+
+static VALUE
+prism_dump_tree(pm_parse_result_t *result)
+{
+    pm_buffer_t output_buffer = { 0 };
+
+    pm_prettyprint(&output_buffer, &result->parser, result->node.ast_node);
+    VALUE tree = rb_str_new(output_buffer.value, output_buffer.length);
+    pm_buffer_free(&output_buffer);
+    return tree;
+}
+
+static void
+process_options_global_setup(const ruby_cmdline_options_t *opt, const rb_iseq_t *iseq)
+{
+    if (OPT_BACKTRACE_LENGTH_LIMIT_VALID_P(opt)) {
+        rb_backtrace_length_limit = opt->backtrace_length_limit;
+    }
+
+    if (opt->do_loop) {
+        rb_define_global_function("sub", rb_f_sub, -1);
+        rb_define_global_function("gsub", rb_f_gsub, -1);
+        rb_define_global_function("chop", rb_f_chop, 0);
+        rb_define_global_function("chomp", rb_f_chomp, -1);
+    }
+
+    rb_define_readonly_boolean("$-p", opt->do_print);
+    rb_define_readonly_boolean("$-l", opt->do_line);
+    rb_define_readonly_boolean("$-a", opt->do_split);
+
+    rb_gvar_ractor_local("$-p");
+    rb_gvar_ractor_local("$-l");
+    rb_gvar_ractor_local("$-a");
+
+    if ((rb_e_script = opt->e_script) != 0) {
+        rb_str_freeze(rb_e_script);
+        rb_vm_register_global_object(opt->e_script);
+    }
+
+    rb_execution_context_t *ec = GET_EC();
+    VALUE script = (opt->e_script ? opt->e_script : Qnil);
+    rb_exec_event_hook_script_compiled(ec, iseq, script);
+}
+
 static VALUE
 process_options(int argc, char **argv, ruby_cmdline_options_t *opt)
 {
-    rb_ast_t *ast = 0;
-    VALUE parser;
-    VALUE script_name;
+    VALUE ast_value = Qnil;
+    struct {
+        rb_ast_t *ast;
+        pm_parse_result_t prism;
+    } result = {0};
+#define dispose_result() \
+    (result.ast ? rb_ast_dispose(result.ast) : pm_parse_result_free(&result.prism))
+
     const rb_iseq_t *iseq;
     rb_encoding *enc, *lenc;
 #if UTF8_PATH
@@ -1981,62 +2331,11 @@ process_options(int argc, char **argv, ruby_cmdline_options_t *opt)
     const long loaded_before_enc = RARRAY_LEN(vm->loaded_features);
 
     if (opt->dump & (DUMP_BIT(usage)|DUMP_BIT(help))) {
-        int tty = isatty(1);
         const char *const progname =
             (argc > 0 && argv && argv[0] ? argv[0] :
              origarg.argc > 0 && origarg.argv && origarg.argv[0] ? origarg.argv[0] :
              ruby_engine);
-        int columns = 0;
-        if ((opt->dump & DUMP_BIT(help)) && tty) {
-            const char *pager_env = getenv("RUBY_PAGER");
-            if (!pager_env) pager_env = getenv("PAGER");
-            if (pager_env && *pager_env && isatty(0)) {
-                const char *columns_env = getenv("COLUMNS");
-                if (columns_env) columns = atoi(columns_env);
-                VALUE pager = rb_str_new_cstr(pager_env);
-#ifdef HAVE_WORKING_FORK
-                int fds[2];
-                if (rb_pipe(fds) == 0) {
-                    rb_pid_t pid = rb_fork_ruby(NULL);
-                    if (pid > 0) {
-                        /* exec PAGER with reading from child */
-                        dup2(fds[0], 0);
-                    }
-                    else if (pid == 0) {
-                        /* send the help message to the parent PAGER */
-                        dup2(fds[1], 1);
-                        dup2(fds[1], 2);
-                    }
-                    close(fds[0]);
-                    close(fds[1]);
-                    if (pid > 0) {
-                        setup_pager_env();
-                        rb_f_exec(1, &pager);
-                        kill(SIGTERM, pid);
-                        rb_waitpid(pid, 0, 0);
-                    }
-                }
-#else
-                setup_pager_env();
-                VALUE port = rb_io_popen(pager, rb_str_new_lit("w"), Qnil, Qnil);
-                if (!NIL_P(port)) {
-                    int oldout = dup(1);
-                    int olderr = dup(2);
-                    int fd = RFILE(port)->fptr->fd;
-                    tty = tty_enabled();
-                    dup2(fd, 1);
-                    dup2(fd, 2);
-                    usage(progname, 1, tty, columns);
-                    fflush(stdout);
-                    dup2(oldout, 1);
-                    dup2(olderr, 2);
-                    rb_io_close(port);
-                    return Qtrue;
-                }
-#endif
-            }
-        }
-        usage(progname, (opt->dump & DUMP_BIT(help)), tty, columns);
+        show_help(progname, (opt->dump & DUMP_BIT(help)));
         return Qtrue;
     }
 
@@ -2058,24 +2357,33 @@ process_options(int argc, char **argv, ruby_cmdline_options_t *opt)
         if (!FEATURE_USED_P(opt->features, yjit) && env_var_truthy("RUBY_YJIT_ENABLE")) {
             FEATURE_SET(opt->features, FEATURE_BIT(yjit));
         }
+#elif USE_ZJIT
+        if (!FEATURE_USED_P(opt->features, zjit) && env_var_truthy("RUBY_ZJIT_ENABLE")) {
+            FEATURE_SET(opt->features, FEATURE_BIT(zjit));
+        }
 #endif
     }
     if (MULTI_BITS_P(FEATURE_SET_BITS(opt->features) & feature_jit_mask)) {
-        rb_warn("RJIT and YJIT cannot both be enabled at the same time. Exiting");
+        rb_warn("Only one JIT can be enabled at the same time. Exiting");
         return Qfalse;
     }
 
-#if USE_RJIT
-    if (FEATURE_SET_P(opt->features, rjit)) {
-        opt->rjit.on = true; // set opt->rjit.on for Init_ruby_description() and calling rb_rjit_init()
-    }
-#endif
 #if USE_YJIT
     if (FEATURE_SET_P(opt->features, yjit)) {
-        opt->yjit = true; // set opt->yjit for Init_ruby_description() and calling rb_yjit_init()
+        bool rb_yjit_option_disable(void);
+        opt->yjit = !rb_yjit_option_disable(); // set opt->yjit for Init_ruby_description() and calling rb_yjit_init()
+    }
+#endif
+#if USE_ZJIT
+    if (FEATURE_SET_P(opt->features, zjit) && !opt->zjit) {
+        extern void *rb_zjit_init_options(void);
+        opt->zjit = rb_zjit_init_options();
     }
 #endif
+
+    ruby_mn_threads_params();
     Init_ruby_description(opt);
+
     if (opt->dump & (DUMP_BIT(version) | DUMP_BIT(version_v))) {
         ruby_show_version();
         if (opt->dump & DUMP_BIT(version)) return Qtrue;
@@ -2122,8 +2430,6 @@ process_options(int argc, char **argv, ruby_cmdline_options_t *opt)
 
 #ifdef _WIN32
     translit_char_bin(RSTRING_PTR(opt->script_name), '\\', '/');
-#elif defined DOSISH
-    translit_char(RSTRING_PTR(opt->script_name), '\\', '/');
 #endif
 
     ruby_gc_set_params();
@@ -2133,13 +2439,6 @@ process_options(int argc, char **argv, ruby_cmdline_options_t *opt)
     lenc = rb_locale_encoding();
     rb_enc_associate(rb_progname, lenc);
     rb_obj_freeze(rb_progname);
-    parser = rb_parser_new();
-    if (opt->dump & DUMP_BIT(yydebug)) {
-        rb_parser_set_yydebug(parser, Qtrue);
-    }
-    if (opt->dump & DUMP_BIT(error_tolerant)) {
-        rb_parser_error_tolerant(parser);
-    }
     if (opt->ext.enc.name != 0) {
         opt->ext.enc.index = opt_enc_index(opt->ext.enc.name);
     }
@@ -2165,7 +2464,6 @@ process_options(int argc, char **argv, ruby_cmdline_options_t *opt)
         ienc = enc;
 #endif
     }
-    script_name = opt->script_name;
     rb_enc_associate(opt->script_name, IF_UTF8_PATH(uenc, lenc));
 #if UTF8_PATH
     if (uenc != lenc) {
@@ -2224,7 +2522,10 @@ process_options(int argc, char **argv, ruby_cmdline_options_t *opt)
 #define SET_COMPILE_OPTION(h, o, name) \
         rb_hash_aset((h), ID2SYM(rb_intern_const(#name)), \
                      RBOOL(FEATURE_SET_P(o->features, name)))
-        SET_COMPILE_OPTION(option, opt, frozen_string_literal);
+
+        if (FEATURE_SET_P(opt->features, frozen_string_literal_set)) {
+            SET_COMPILE_OPTION(option, opt, frozen_string_literal);
+        }
         SET_COMPILE_OPTION(option, opt, debug_frozen_string_literal);
         rb_funcallv(rb_cISeq, rb_intern_const("compile_option="), 1, &option);
 #undef SET_COMPILE_OPTION
@@ -2233,10 +2534,7 @@ process_options(int argc, char **argv, ruby_cmdline_options_t *opt)
     opt->sflag = process_sflag(opt->sflag);
 
     if (opt->e_script) {
-        VALUE progname = rb_progname;
         rb_encoding *eenc;
-        rb_parser_set_context(parser, 0, TRUE);
-
         if (opt->src.enc.index >= 0) {
             eenc = rb_enc_from_index(opt->src.enc.index);
         }
@@ -2252,24 +2550,19 @@ process_options(int argc, char **argv, ruby_cmdline_options_t *opt)
         }
 #endif
         rb_enc_associate(opt->e_script, eenc);
-        ruby_opt_init(opt);
-        ruby_set_script_name(progname);
-        rb_parser_set_options(parser, opt->do_print, opt->do_loop,
-                              opt->do_line, opt->do_split);
-        ast = rb_parser_compile_string(parser, opt->script, opt->e_script, 1);
+    }
+
+    if (!rb_ruby_prism_p()) {
+        ast_value = process_script(opt);
+        if (!(result.ast = rb_ruby_ast_data_get(ast_value))) return Qfalse;
     }
     else {
-        VALUE f;
-        int xflag = opt->xflag;
-        f = open_load_file(script_name, &xflag);
-        opt->xflag = xflag != 0;
-        rb_parser_set_context(parser, 0, f == rb_stdin);
-        ast = load_file(parser, opt->script_name, f, 1, opt);
+        prism_script(opt, &result.prism);
     }
     ruby_set_script_name(opt->script_name);
-    if (dump & DUMP_BIT(yydebug)) {
-        dump &= ~DUMP_BIT(yydebug);
-        if (!dump) return Qtrue;
+    if ((dump & DUMP_BIT(yydebug)) && !(dump &= ~DUMP_BIT(yydebug))) {
+        dispose_result();
+        return Qtrue;
     }
 
     if (opt->ext.enc.index >= 0) {
@@ -2289,33 +2582,32 @@ process_options(int argc, char **argv, ruby_cmdline_options_t *opt)
         rb_enc_set_default_internal(Qnil);
     rb_stdio_set_default_encoding();
 
-    if (!ast->body.root) {
-        rb_ast_dispose(ast);
-        return Qfalse;
-    }
-
     opt->sflag = process_sflag(opt->sflag);
     opt->xflag = 0;
 
     if (dump & DUMP_BIT(syntax)) {
         printf("Syntax OK\n");
         dump &= ~DUMP_BIT(syntax);
-        if (!dump) return Qtrue;
-    }
-
-    if (opt->do_loop) {
-        rb_define_global_function("sub", rb_f_sub, -1);
-        rb_define_global_function("gsub", rb_f_gsub, -1);
-        rb_define_global_function("chop", rb_f_chop, 0);
-        rb_define_global_function("chomp", rb_f_chomp, -1);
+        if (!dump) {
+            dispose_result();
+            return Qtrue;
+        }
     }
 
-    if (dump & (DUMP_BIT(parsetree)|DUMP_BIT(parsetree_with_comment))) {
-        rb_io_write(rb_stdout, rb_parser_dump_tree(ast->body.root, dump & DUMP_BIT(parsetree_with_comment)));
+    if (dump & DUMP_BIT(parsetree)) {
+        VALUE tree;
+        if (result.ast) {
+            int comment = opt->dump & DUMP_BIT(opt_comment);
+            tree = rb_parser_dump_tree(result.ast->body.root, comment);
+        }
+        else {
+            tree = prism_dump_tree(&result.prism);
+        }
+        rb_io_write(rb_stdout, tree);
         rb_io_flush(rb_stdout);
-        dump &= ~DUMP_BIT(parsetree)&~DUMP_BIT(parsetree_with_comment);
+        dump &= ~DUMP_BIT(parsetree);
         if (!dump) {
-            rb_ast_dispose(ast);
+            dispose_result();
             return Qtrue;
         }
     }
@@ -2323,7 +2615,7 @@ process_options(int argc, char **argv, ruby_cmdline_options_t *opt)
     {
         VALUE path = Qnil;
         if (!opt->e_script && strcmp(opt->script, "-")) {
-            path = rb_realpath_internal(Qnil, script_name, 1);
+            path = rb_realpath_internal(Qnil, opt->script_name, 1);
 #if UTF8_PATH
             if (uenc != lenc) {
                 path = str_conv_enc(path, uenc, lenc);
@@ -2335,14 +2627,31 @@ process_options(int argc, char **argv, ruby_cmdline_options_t *opt)
         }
 
         rb_binding_t *toplevel_binding;
-        GetBindingPtr(rb_const_get(rb_cObject, rb_intern("TOPLEVEL_BINDING")),
-                      toplevel_binding);
+        GetBindingPtr(rb_const_get(rb_cObject, rb_intern("TOPLEVEL_BINDING")), toplevel_binding);
         const struct rb_block *base_block = toplevel_context(toplevel_binding);
-        iseq = rb_iseq_new_main(&ast->body, opt->script_name, path, vm_block_iseq(base_block), !(dump & DUMP_BIT(insns_without_opt)));
-        rb_ast_dispose(ast);
+        const rb_iseq_t *parent = vm_block_iseq(base_block);
+        bool optimize = (opt->dump & DUMP_BIT(opt_optimize)) != 0;
+
+        if (!result.ast) {
+            pm_parse_result_t *pm = &result.prism;
+            int error_state;
+            iseq = pm_iseq_new_main(&pm->node, opt->script_name, path, parent, optimize, &error_state);
+
+            pm_parse_result_free(pm);
+
+            if (error_state) {
+                RUBY_ASSERT(iseq == NULL);
+                rb_jump_tag(error_state);
+            }
+        }
+        else {
+            rb_ast_t *ast = result.ast;
+            iseq = rb_iseq_new_main(ast_value, opt->script_name, path, parent, optimize);
+            rb_ast_dispose(ast);
+        }
     }
 
-    if (dump & (DUMP_BIT(insns) | DUMP_BIT(insns_without_opt))) {
+    if (dump & DUMP_BIT(insns)) {
         rb_io_write(rb_stdout, rb_iseq_disasm((const rb_iseq_t *)iseq));
         rb_io_flush(rb_stdout);
         dump &= ~DUMP_BIT(insns);
@@ -2350,35 +2659,7 @@ process_options(int argc, char **argv, ruby_cmdline_options_t *opt)
     }
     if (opt->dump & dump_exit_bits) return Qtrue;
 
-    if (OPT_BACKTRACE_LENGTH_LIMIT_VALID_P(opt)) {
-        rb_backtrace_length_limit = opt->backtrace_length_limit;
-    }
-
-    rb_define_readonly_boolean("$-p", opt->do_print);
-    rb_define_readonly_boolean("$-l", opt->do_line);
-    rb_define_readonly_boolean("$-a", opt->do_split);
-
-    rb_gvar_ractor_local("$-p");
-    rb_gvar_ractor_local("$-l");
-    rb_gvar_ractor_local("$-a");
-
-    if ((rb_e_script = opt->e_script) != 0) {
-        rb_str_freeze(rb_e_script);
-        rb_gc_register_mark_object(opt->e_script);
-    }
-
-    {
-        rb_execution_context_t *ec = GET_EC();
-
-        if (opt->e_script) {
-            /* -e */
-            rb_exec_event_hook_script_compiled(ec, iseq, opt->e_script);
-        }
-        else {
-            /* file */
-            rb_exec_event_hook_script_compiled(ec, iseq, Qnil);
-        }
-    }
+    process_options_global_setup(opt, iseq);
     return (VALUE)iseq;
 }
 
@@ -2386,7 +2667,7 @@ process_options(int argc, char **argv, ruby_cmdline_options_t *opt)
 static void
 warn_cr_in_shebang(const char *str, long len)
 {
-    if (str[len-1] == '\n' && str[len-2] == '\r') {
+    if (len > 1 && str[len-1] == '\n' && str[len-2] == '\r') {
         rb_warn("shebang line ending with \\r may cause problems");
     }
 }
@@ -2404,7 +2685,7 @@ struct load_file_arg {
     VALUE f;
 };
 
-VALUE rb_script_lines_for(VALUE path, bool add);
+void rb_set_script_lines_for(VALUE vparser, VALUE path);
 
 static VALUE
 load_file_internal(VALUE argp_v)
@@ -2416,7 +2697,7 @@ load_file_internal(VALUE argp_v)
     ruby_cmdline_options_t *opt = argp->opt;
     VALUE f = argp->f;
     int line_start = 1;
-    rb_ast_t *ast = 0;
+    VALUE ast_value = Qnil;
     rb_encoding *enc;
     ID set_encoding;
 
@@ -2509,18 +2790,15 @@ load_file_internal(VALUE argp_v)
     rb_parser_set_options(parser, opt->do_print, opt->do_loop,
                           opt->do_line, opt->do_split);
 
-    VALUE lines = rb_script_lines_for(orig_fname, true);
-    if (!NIL_P(lines)) {
-        rb_parser_set_script_lines(parser, lines);
-    }
+    rb_set_script_lines_for(parser, orig_fname);
 
     if (NIL_P(f)) {
         f = rb_str_new(0, 0);
         rb_enc_associate(f, enc);
-        return (VALUE)rb_parser_compile_string_path(parser, orig_fname, f, line_start);
+        return rb_parser_compile_string_path(parser, orig_fname, f, line_start);
     }
     rb_funcall(f, set_encoding, 2, rb_enc_from_encoding(enc), rb_str_new_cstr("-"));
-    ast = rb_parser_compile_file_path(parser, orig_fname, f, line_start);
+    ast_value = rb_parser_compile_file_path(parser, orig_fname, f, line_start);
     rb_funcall(f, set_encoding, 1, rb_parser_encoding(parser));
     if (script && rb_parser_end_seen_p(parser)) {
         /*
@@ -2538,7 +2816,7 @@ load_file_internal(VALUE argp_v)
         rb_define_global_const("DATA", f);
         argp->f = Qnil;
     }
-    return (VALUE)ast;
+    return ast_value;
 }
 
 /* disabling O_NONBLOCK, and returns 0 on success, otherwise errno */
@@ -2647,7 +2925,7 @@ restore_load_file(VALUE arg)
     return Qnil;
 }
 
-static rb_ast_t *
+static VALUE
 load_file(VALUE parser, VALUE fname, VALUE f, int script, ruby_cmdline_options_t *opt)
 {
     struct load_file_arg arg;
@@ -2656,7 +2934,7 @@ load_file(VALUE parser, VALUE fname, VALUE f, int script, ruby_cmdline_options_t
     arg.script = script;
     arg.opt = opt;
     arg.f = f;
-    return (rb_ast_t *)rb_ensure(load_file_internal, (VALUE)&arg,
+    return rb_ensure(load_file_internal, (VALUE)&arg,
                               restore_load_file, (VALUE)&arg);
 }
 
@@ -2670,10 +2948,12 @@ rb_load_file(const char *fname)
 void *
 rb_load_file_str(VALUE fname_v)
 {
-    return rb_parser_load_file(rb_parser_new(), fname_v);
+    VALUE ast_value;
+    ast_value = rb_parser_load_file(rb_parser_new(), fname_v);
+    return (void *)rb_ruby_ast_data_get(ast_value);
 }
 
-void *
+VALUE
 rb_parser_load_file(VALUE parser, VALUE fname_v)
 {
     ruby_cmdline_options_t opt;
@@ -2902,14 +3182,24 @@ ruby_process_options(int argc, char **argv)
     }
     set_progname(external_str_new_cstr(script_name));  /* for the time being */
     rb_argv0 = rb_str_new4(rb_progname);
-    rb_gc_register_mark_object(rb_argv0);
+    rb_vm_register_global_object(rb_argv0);
 
 #ifndef HAVE_SETPROCTITLE
     ruby_init_setproctitle(argc, argv);
 #endif
 
+    if (getenv("RUBY_FREE_AT_EXIT")) {
+        rb_free_at_exit = true;
+        rb_category_warn(RB_WARN_CATEGORY_EXPERIMENTAL, "Free at exit is experimental and may be unstable");
+    }
+
     iseq = process_options(argc, argv, cmdline_options_init(&opt));
 
+    if (opt.crash_report && *opt.crash_report) {
+        void ruby_set_crash_report(const char *template);
+        ruby_set_crash_report(opt.crash_report);
+    }
+
     return (void*)(struct RData*)iseq;
 }
 
@@ -2955,3 +3245,9 @@ ruby_sysinit(int *argc, char ***argv)
     }
     fill_standard_fds();
 }
+
+#ifdef RUBY_ASAN_ENABLED
+RUBY_SYMBOL_EXPORT_BEGIN
+const char ruby_asan_default_options[] = "use_sigaltstack=0:detect_leaks=0";
+RUBY_SYMBOL_EXPORT_END
+#endif
diff --git a/ruby_atomic.h b/ruby_atomic.h
index 57d341082d7a0e..1ccabcbdf6ba6a 100644
--- a/ruby_atomic.h
+++ b/ruby_atomic.h
@@ -1,5 +1,10 @@
+#ifndef INTERNAL_ATOMIC_H
+#define INTERNAL_ATOMIC_H
+
 #include "ruby/atomic.h"
 
+#define RUBY_ATOMIC_VALUE_LOAD(x) (VALUE)(RUBY_ATOMIC_PTR_LOAD(x))
+
 /* shim macros only */
 #define ATOMIC_ADD(var, val) RUBY_ATOMIC_ADD(var, val)
 #define ATOMIC_CAS(var, oldval, newval) RUBY_ATOMIC_CAS(var, oldval, newval)
@@ -21,3 +26,50 @@
 #define ATOMIC_SUB(var, val) RUBY_ATOMIC_SUB(var, val)
 #define ATOMIC_VALUE_CAS(var, oldval, val) RUBY_ATOMIC_VALUE_CAS(var, oldval, val)
 #define ATOMIC_VALUE_EXCHANGE(var, val) RUBY_ATOMIC_VALUE_EXCHANGE(var, val)
+
+static inline rb_atomic_t
+rbimpl_atomic_load_relaxed(volatile rb_atomic_t *ptr)
+{
+#if defined(HAVE_GCC_ATOMIC_BUILTINS)
+    return __atomic_load_n(ptr, __ATOMIC_RELAXED);
+#else
+    return *ptr;
+#endif
+}
+#define ATOMIC_LOAD_RELAXED(var) rbimpl_atomic_load_relaxed(&(var))
+
+typedef RBIMPL_ALIGNAS(8) uint64_t rbimpl_atomic_uint64_t;
+
+static inline uint64_t
+rbimpl_atomic_u64_load_relaxed(const volatile rbimpl_atomic_uint64_t *value)
+{
+#if defined(HAVE_GCC_ATOMIC_BUILTINS_64)
+    return __atomic_load_n(value, __ATOMIC_RELAXED);
+#elif defined(_WIN32)
+    uint64_t val = *value;
+    return InterlockedCompareExchange64(RBIMPL_CAST((uint64_t *)value), val, val);
+#elif defined(__sun) && defined(HAVE_ATOMIC_H) && (defined(_LP64) || defined(_I32LPx))
+    uint64_t val = *value;
+    return atomic_cas_64(value, val, val);
+#else
+    return *value;
+#endif
+}
+#define ATOMIC_U64_LOAD_RELAXED(var) rbimpl_atomic_u64_load_relaxed(&(var))
+
+static inline void
+rbimpl_atomic_u64_set_relaxed(volatile rbimpl_atomic_uint64_t *address, uint64_t value)
+{
+#if defined(HAVE_GCC_ATOMIC_BUILTINS_64)
+    __atomic_store_n(address, value, __ATOMIC_RELAXED);
+#elif defined(_WIN32)
+    InterlockedExchange64(address, value);
+#elif defined(__sun) && defined(HAVE_ATOMIC_H) && (defined(_LP64) || defined(_I32LPx))
+    atomic_swap_64(address, value);
+#else
+    *address = value;
+#endif
+}
+#define ATOMIC_U64_SET_RELAXED(var, val) rbimpl_atomic_u64_set_relaxed(&(var), val)
+
+#endif
diff --git a/ruby_parser.c b/ruby_parser.c
index 6aaa867c16a55f..267f619bf9cd18 100644
--- a/ruby_parser.c
+++ b/ruby_parser.c
@@ -1,4 +1,13 @@
 /* This is a wrapper for parse.y */
+
+#include "internal/parse.h"
+#include "internal/re.h"
+#include "internal/ruby_parser.h"
+
+#include "node.h"
+#include "rubyparser.h"
+#include "internal/error.h"
+
 #ifdef UNIVERSAL_PARSER
 
 #include "internal.h"
@@ -7,14 +16,11 @@
 #include "internal/compile.h"
 #include "internal/complex.h"
 #include "internal/encoding.h"
-#include "internal/error.h"
 #include "internal/gc.h"
 #include "internal/hash.h"
 #include "internal/io.h"
-#include "internal/parse.h"
 #include "internal/rational.h"
 #include "internal/re.h"
-#include "internal/ruby_parser.h"
 #include "internal/string.h"
 #include "internal/symbol.h"
 #include "internal/thread.h"
@@ -22,99 +28,18 @@
 #include "ruby/ractor.h"
 #include "ruby/ruby.h"
 #include "ruby/util.h"
-#include "node.h"
 #include "internal.h"
 #include "vm_core.h"
 #include "symbol.h"
 
-struct ruby_parser {
-    rb_parser_t *parser_params;
-};
-
-static void
-parser_mark(void *ptr)
-{
-    struct ruby_parser *parser = (struct ruby_parser*)ptr;
-    rb_ruby_parser_mark(parser->parser_params);
-}
-
-static void
-parser_free(void *ptr)
-{
-    struct ruby_parser *parser = (struct ruby_parser*)ptr;
-    rb_ruby_parser_free(parser->parser_params);
-}
-
-static size_t
-parser_memsize(const void *ptr)
-{
-    struct ruby_parser *parser = (struct ruby_parser*)ptr;
-    return rb_ruby_parser_memsize(parser->parser_params);
-}
-
-static const rb_data_type_t ruby_parser_data_type = {
-    "parser",
-    {
-        parser_mark,
-        parser_free,
-        parser_memsize,
-    },
-    0, 0, RUBY_TYPED_FREE_IMMEDIATELY
-};
-
-static void
-bignum_negate(VALUE b)
-{
-    BIGNUM_NEGATE(b);
-}
-
-static int
-is_ascii_string2(VALUE str)
-{
-    return is_ascii_string(str);
-}
-
-static void
-rational_set_num(VALUE r, VALUE n)
-{
-    RATIONAL_SET_NUM(r, n);
-}
-
-static VALUE
-rational_get_num(VALUE obj)
-{
-    return RRATIONAL(obj)->num;
-}
-
-static void
-rcomplex_set_real(VALUE cmp, VALUE r)
-{
-    RCOMPLEX_SET_REAL(cmp, r);
-}
-
-static void
-rcomplex_set_imag(VALUE cmp, VALUE i)
-{
-    RCOMPLEX_SET_IMAG(cmp, i);
-}
-
-static VALUE
-rcomplex_get_real(VALUE obj)
-{
-    return RCOMPLEX(obj)->real;
-}
-
-static VALUE
-rcomplex_get_imag(VALUE obj)
-{
-    return RCOMPLEX(obj)->imag;
-}
+#define parser_encoding const void
 
+RBIMPL_ATTR_FORMAT(RBIMPL_PRINTF_FORMAT, 6, 0)
 static VALUE
 syntax_error_append(VALUE exc, VALUE file, int line, int column,
-                       void *enc, const char *fmt, va_list args)
+                    parser_encoding *enc, const char *fmt, va_list args)
 {
-    return rb_syntax_error_append(exc, file, line, column, (rb_encoding *)enc, fmt, args);
+    return rb_syntax_error_append(exc, file, line, column, enc, fmt, args);
 }
 
 static int
@@ -129,36 +54,10 @@ dvar_defined(ID id, const void *p)
     return rb_dvar_defined(id, (const rb_iseq_t *)p);
 }
 
-static bool
-hash_literal_key_p(VALUE k)
-{
-    switch (OBJ_BUILTIN_TYPE(k)) {
-      case T_NODE:
-        return false;
-      default:
-        return true;
-    }
-}
-
-static int
-literal_cmp(VALUE val, VALUE lit)
-{
-    if (val == lit) return 0;
-    if (!hash_literal_key_p(val) || !hash_literal_key_p(lit)) return -1;
-    return rb_iseq_cdhash_cmp(val, lit);
-}
-
-static st_index_t
-literal_hash(VALUE a)
-{
-    if (!hash_literal_key_p(a)) return (st_index_t)a;
-    return rb_iseq_cdhash_hash(a);
-}
-
 static int
-is_usascii_enc(void *enc)
+is_usascii_enc(parser_encoding *enc)
 {
-    return rb_is_usascii_enc((rb_encoding *)enc);
+    return rb_is_usascii_enc(enc);
 }
 
 static int
@@ -180,21 +79,21 @@ is_notop_id2(ID id)
 }
 
 static VALUE
-enc_str_new(const char *ptr, long len, void *enc)
+enc_str_new(const char *ptr, long len, parser_encoding *enc)
 {
-    return rb_enc_str_new(ptr, len, (rb_encoding *)enc);
+    return rb_enc_str_new(ptr, len, enc);
 }
 
 static int
-enc_isalnum(OnigCodePoint c, void *enc)
+enc_isalnum(OnigCodePoint c, parser_encoding *enc)
 {
-    return rb_enc_isalnum(c, (rb_encoding *)enc);
+    return rb_enc_isalnum(c, enc);
 }
 
 static int
-enc_precise_mbclen(const char *p, const char *e, void *enc)
+enc_precise_mbclen(const char *p, const char *e, parser_encoding *enc)
 {
-    return rb_enc_precise_mbclen(p, e, (rb_encoding *)enc);
+    return rb_enc_precise_mbclen(p, e, enc);
 }
 
 static int
@@ -203,124 +102,82 @@ mbclen_charfound_p(int len)
     return MBCLEN_CHARFOUND_P(len);
 }
 
+static int
+mbclen_charfound_len(int len)
+{
+    return MBCLEN_CHARFOUND_LEN(len);
+}
+
 static const char *
-enc_name(void *enc)
+enc_name(parser_encoding *enc)
 {
-    return rb_enc_name((rb_encoding *)enc);
+    return rb_enc_name(enc);
 }
 
 static char *
-enc_prev_char(const char *s, const char *p, const char *e, void *enc)
+enc_prev_char(const char *s, const char *p, const char *e, parser_encoding *enc)
 {
-    return rb_enc_prev_char(s, p, e, (rb_encoding *)enc);
+    return rb_enc_prev_char(s, p, e, enc);
 }
 
-static void *
+static parser_encoding *
 enc_get(VALUE obj)
 {
-    return (void *)rb_enc_get(obj);
+    return rb_enc_get(obj);
 }
 
 static int
-enc_asciicompat(void *enc)
+enc_asciicompat(parser_encoding *enc)
 {
-    return rb_enc_asciicompat((rb_encoding *)enc);
+    return rb_enc_asciicompat(enc);
 }
 
-static void *
+static parser_encoding *
 utf8_encoding(void)
 {
-    return (void *)rb_utf8_encoding();
-}
-
-static VALUE
-enc_associate(VALUE obj, void *enc)
-{
-    return rb_enc_associate(obj, (rb_encoding *)enc);
+    return rb_utf8_encoding();
 }
 
-static void *
+static parser_encoding *
 ascii8bit_encoding(void)
 {
-    return (void *)rb_ascii8bit_encoding();
+    return rb_ascii8bit_encoding();
 }
 
 static int
-enc_codelen(int c, void *enc)
-{
-    return rb_enc_codelen(c, (rb_encoding *)enc);
-}
-
-static VALUE
-enc_str_buf_cat(VALUE str, const char *ptr, long len, void *enc)
+enc_codelen(int c, parser_encoding *enc)
 {
-    return rb_enc_str_buf_cat(str, ptr, len, (rb_encoding *)enc);
+    return rb_enc_codelen(c, enc);
 }
 
 static int
-enc_mbcput(unsigned int c, void *buf, void *enc)
+enc_mbcput(unsigned int c, void *buf, parser_encoding *enc)
 {
-    return rb_enc_mbcput(c, buf, (rb_encoding *)enc);
+    return rb_enc_mbcput(c, buf, enc);
 }
 
-static void *
+static parser_encoding *
 enc_from_index(int idx)
 {
-    return (void *)rb_enc_from_index(idx);
+    return rb_enc_from_index(idx);
 }
 
 static int
-enc_isspace(OnigCodePoint c, void *enc)
+enc_isspace(OnigCodePoint c, parser_encoding *enc)
 {
-    return rb_enc_isspace(c, (rb_encoding *)enc);
+    return rb_enc_isspace(c, enc);
 }
 
 static ID
-intern3(const char *name, long len, void *enc)
+intern3(const char *name, long len, parser_encoding *enc)
 {
-    return rb_intern3(name, len, (rb_encoding *)enc);
-}
-
-static void *
-enc_compatible(VALUE str1, VALUE str2)
-{
-    return (void *)rb_enc_compatible(str1, str2);
-}
-
-static VALUE
-enc_from_encoding(void *enc)
-{
-    return rb_enc_from_encoding((rb_encoding *)enc);
-}
-
-static int
-encoding_get(VALUE obj)
-{
-    return ENCODING_GET(obj);
-}
-
-static void
-encoding_set(VALUE obj, int encindex)
-{
-    ENCODING_SET(obj, encindex);
-}
-
-static int
-encoding_is_ascii8bit(VALUE obj)
-{
-    return ENCODING_IS_ASCII8BIT(obj);
-}
-
-static void *
-usascii_encoding(void)
-{
-    return (void *)rb_usascii_encoding();
+    return rb_intern3(name, len, enc);
 }
 
 static int
-enc_symname_type(const char *name, long len, void *enc, unsigned int allowed_attrset)
+enc_symname_type(const char *name, long len, parser_encoding *enc, unsigned int allowed_attrset)
 {
-    return rb_enc_symname_type(name, len, (rb_encoding *)enc, allowed_attrset);
+    return rb_enc_symname_type(name, len, enc, allowed_attrset);
 }
 
 typedef struct {
@@ -328,6 +185,7 @@ typedef struct {
     rb_encoding *enc;
     NODE *succ_block;
     const rb_code_location_t *loc;
+    rb_parser_assignable_func assignable;
 } reg_named_capture_assign_t;
 
 static int
@@ -341,11 +199,12 @@ reg_named_capture_assign_iter(const OnigUChar *name, const OnigUChar *name_end,
     long len = name_end - name;
     const char *s = (const char *)name;
 
-    return rb_reg_named_capture_assign_iter_impl(p, s, len, (void *)enc, &arg->succ_block, loc);
+    return rb_reg_named_capture_assign_iter_impl(p, s, len, enc, &arg->succ_block, loc, arg->assignable);
 }
 
 static NODE *
-reg_named_capture_assign(struct parser_params* p, VALUE regexp, const rb_code_location_t *loc)
+reg_named_capture_assign(struct parser_params* p, VALUE regexp, const rb_code_location_t *loc,
+                         rb_parser_assignable_func assignable)
 {
     reg_named_capture_assign_t arg;
 
@@ -353,22 +212,11 @@ reg_named_capture_assign(struct parser_params* p, VALUE regexp, const rb_code_lo
     arg.enc = rb_enc_get(regexp);
     arg.succ_block = 0;
     arg.loc = loc;
+    arg.assignable = assignable;
     onig_foreach_name(RREGEXP_PTR(regexp), reg_named_capture_assign_iter, &arg);
 
     if (!arg.succ_block) return 0;
-    return arg.succ_block->nd_next;
-}
-
-static VALUE
-rbool(VALUE v)
-{
-    return RBOOL(v);
-}
-
-static int
-undef_p(VALUE v)
-{
-    return RB_UNDEF_P(v);
+    return RNODE_BLOCK(arg.succ_block)->nd_next;
 }
 
 static int
@@ -383,54 +231,12 @@ nil_p(VALUE obj)
     return (int)NIL_P(obj);
 }
 
-static int
-flonum_p(VALUE obj)
-{
-    return (int)RB_FLONUM_P(obj);
-}
-
-static VALUE
-int2fix(long i)
-{
-    return INT2FIX(i);
-}
-
 static VALUE
 syntax_error_new(void)
 {
     return rb_class_new_instance(0, 0, rb_eSyntaxError);
 }
 
-static int
-obj_frozen(VALUE obj)
-{
-    return (int)RB_OBJ_FROZEN(obj);
-}
-
-static VALUE
-obj_write(VALUE old, VALUE *slot, VALUE young)
-{
-    return RB_OBJ_WRITE(old, slot, young);
-}
-
-static VALUE
-obj_written(VALUE old, VALUE slot, VALUE young)
-{
-    return RB_OBJ_WRITTEN(old, slot, young);
-}
-
-static VALUE
-default_rs(void)
-{
-    return rb_default_rs;
-}
-
-static VALUE
-rational_raw1(VALUE x)
-{
-    return rb_rational_raw1(x);
-}
-
 static void *
 memmove2(void *dest, const void *src, size_t t, size_t n)
 {
@@ -449,355 +255,294 @@ ruby_verbose2(void)
     return ruby_verbose;
 }
 
-static int
-type_p(VALUE obj, int t)
+static int *
+rb_errno_ptr2(void)
 {
-    return (int)RB_TYPE_P(obj, t);
+    return rb_errno_ptr();
 }
 
-static int
-fixnum_p(VALUE obj)
+static void *
+zalloc(size_t elemsiz)
 {
-    return (int)RB_FIXNUM_P(obj);
+    return ruby_xcalloc(1, elemsiz);
 }
 
-static int
-symbol_p(VALUE obj)
+static void
+gc_guard(VALUE obj)
 {
-    return (int)RB_SYMBOL_P(obj);
+    RB_GC_GUARD(obj);
 }
 
-static void *
-zalloc(size_t elemsiz)
+static VALUE
+arg_error(void)
 {
-    return ruby_xcalloc(1, elemsiz);
+    return rb_eArgError;
 }
 
 static VALUE
-new_strterm(VALUE v1, VALUE v2, VALUE v3, VALUE v0, int heredoc)
+static_id2sym(ID id)
 {
-    rb_strterm_t *imemo = (rb_strterm_t *)rb_imemo_new(imemo_parser_strterm, v1, v2, v3, v0);
-    if (heredoc) {
-        imemo->flags |= STRTERM_HEREDOC;
-    }
+    return (((VALUE)(id)<<RUBY_SPECIAL_SHIFT)|SYMBOL_FLAG);
+}
 
-    return (VALUE)imemo;
+static long
+str_coderange_scan_restartable(const char *s, const char *e, parser_encoding *enc, int *cr)
+{
+    return rb_str_coderange_scan_restartable(s, e, enc, cr);
 }
 
 static int
-strterm_is_heredoc(VALUE strterm)
+enc_mbminlen(parser_encoding *enc)
 {
-    return ((rb_strterm_t *)strterm)->flags & STRTERM_HEREDOC;
+    return rb_enc_mbminlen(enc);
 }
 
+static bool
+enc_isascii(OnigCodePoint c, parser_encoding *enc)
+{
+    return rb_enc_isascii(c, enc);
+}
+
+static OnigCodePoint
+enc_mbc_to_codepoint(const char *p, const char *e, parser_encoding *enc)
+{
+    const OnigUChar *up = RBIMPL_CAST((const OnigUChar *)p);
+    const OnigUChar *ue = RBIMPL_CAST((const OnigUChar *)e);
+
+    return ONIGENC_MBC_TO_CODE((rb_encoding *)enc, up, ue);
+}
+
+extern VALUE rb_eArgError;
+
+static const rb_parser_config_t rb_global_parser_config = {
+    .malloc = ruby_xmalloc,
+    .calloc = ruby_xcalloc,
+    .realloc = ruby_xrealloc,
+    .free = ruby_xfree,
+    .alloc_n = ruby_xmalloc2,
+    .alloc = ruby_xmalloc,
+    .realloc_n = ruby_xrealloc2,
+    .zalloc = zalloc,
+    .rb_memmove = memmove2,
+    .nonempty_memcpy = nonempty_memcpy,
+    .xmalloc_mul_add = rb_xmalloc_mul_add,
+
+    .compile_callback = rb_suppress_tracing,
+    .reg_named_capture_assign = reg_named_capture_assign,
+
+    .attr_get = rb_attr_get,
+
+    .ary_new_from_args = rb_ary_new_from_args,
+    .ary_unshift = rb_ary_unshift,
+
+    .make_temporary_id = rb_make_temporary_id,
+    .is_local_id = is_local_id2,
+    .is_attrset_id = is_attrset_id2,
+    .is_global_name_punct = is_global_name_punct,
+    .id_type = id_type,
+    .id_attrset = rb_id_attrset,
+    .intern = rb_intern,
+    .intern2 = rb_intern2,
+    .intern3 = intern3,
+    .intern_str = rb_intern_str,
+    .is_notop_id = is_notop_id2,
+    .enc_symname_type = enc_symname_type,
+    .id2name = rb_id2name,
+    .id2str = rb_id2str,
+    .id2sym = rb_id2sym,
+
+    .str_catf = rb_str_catf,
+    .str_cat_cstr = rb_str_cat_cstr,
+    .str_resize = rb_str_resize,
+    .str_new = rb_str_new,
+    .str_new_cstr = rb_str_new_cstr,
+    .str_to_interned_str = rb_str_to_interned_str,
+    .enc_str_new = enc_str_new,
+    .str_vcatf = rb_str_vcatf,
+    .rb_sprintf = rb_sprintf,
+    .rstring_ptr = RSTRING_PTR,
+    .rstring_len = RSTRING_LEN,
+
+    .int2num = rb_int2num_inline,
+
+    .stderr_tty_p = rb_stderr_tty_p,
+    .write_error_str = rb_write_error_str,
+    .io_write = rb_io_write,
+    .io_flush = rb_io_flush,
+    .io_puts = rb_io_puts,
+
+    .debug_output_stdout = rb_ractor_stdout,
+    .debug_output_stderr = rb_ractor_stderr,
+
+    .is_usascii_enc = is_usascii_enc,
+    .enc_isalnum = enc_isalnum,
+    .enc_precise_mbclen = enc_precise_mbclen,
+    .mbclen_charfound_p = mbclen_charfound_p,
+    .mbclen_charfound_len = mbclen_charfound_len,
+    .enc_name = enc_name,
+    .enc_prev_char = enc_prev_char,
+    .enc_get = enc_get,
+    .enc_asciicompat = enc_asciicompat,
+    .utf8_encoding = utf8_encoding,
+    .ascii8bit_encoding = ascii8bit_encoding,
+    .enc_codelen = enc_codelen,
+    .enc_mbcput = enc_mbcput,
+    .enc_find_index = rb_enc_find_index,
+    .enc_from_index = enc_from_index,
+    .enc_isspace = enc_isspace,
+    .enc_coderange_7bit = ENC_CODERANGE_7BIT,
+    .enc_coderange_unknown = ENC_CODERANGE_UNKNOWN,
+    .enc_mbminlen = enc_mbminlen,
+    .enc_isascii = enc_isascii,
+    .enc_mbc_to_codepoint = enc_mbc_to_codepoint,
+
+    .local_defined = local_defined,
+    .dvar_defined = dvar_defined,
+
+    .syntax_error_append = syntax_error_append,
+    .raise = rb_raise,
+    .syntax_error_new = syntax_error_new,
+
+    .errinfo = rb_errinfo,
+    .set_errinfo = rb_set_errinfo,
+    .make_exception = rb_make_exception,
+
+    .sized_xfree = ruby_sized_xfree,
+    .sized_realloc_n = ruby_sized_realloc_n,
+    .gc_guard = gc_guard,
+    .gc_mark = rb_gc_mark,
+
+    .reg_compile = rb_reg_compile,
+    .reg_check_preprocess = rb_reg_check_preprocess,
+    .memcicmp = rb_memcicmp,
+
+    .compile_warn = rb_compile_warn,
+    .compile_warning = rb_compile_warning,
+    .bug = rb_bug,
+    .fatal = rb_fatal,
+    .verbose = ruby_verbose2,
+    .errno_ptr = rb_errno_ptr2,
+
+    .make_backtrace = rb_make_backtrace,
+
+    .scan_hex = ruby_scan_hex,
+    .scan_oct = ruby_scan_oct,
+    .scan_digits = ruby_scan_digits,
+    .strtod = ruby_strtod,
+
+    .rtest = rtest,
+    .nil_p = nil_p,
+    .qnil = Qnil,
+    .qfalse = Qfalse,
+    .eArgError = arg_error,
+    .long2int = rb_long2int,
+
+    /* For Ripper */
+    .static_id2sym = static_id2sym,
+    .str_coderange_scan_restartable = str_coderange_scan_restartable,
+};
+#endif
+
+enum lex_type {
+    lex_type_str,
+    lex_type_io,
+    lex_type_array,
+    lex_type_generic,
+};
+
+struct ruby_parser {
+    rb_parser_t *parser_params;
+    enum lex_type type;
+    union {
+        struct lex_pointer_string lex_str;
+        struct {
+            VALUE file;
+        } lex_io;
+        struct {
+            VALUE ary;
+        } lex_array;
+    } data;
+};
+
 static void
-gc_guard(VALUE obj)
+parser_mark(void *ptr)
 {
-    RB_GC_GUARD(obj);
-}
+    struct ruby_parser *parser = (struct ruby_parser*)ptr;
+    rb_ruby_parser_mark(parser->parser_params);
 
-void
-rb_strterm_mark(VALUE obj)
-{
-    rb_strterm_t *strterm = (rb_strterm_t*)obj;
-    if (RBASIC(obj)->flags & STRTERM_HEREDOC) {
-        rb_strterm_heredoc_t *heredoc = &strterm->u.heredoc;
-        rb_gc_mark(heredoc->lastline);
+    switch (parser->type) {
+      case lex_type_str:
+        rb_gc_mark(parser->data.lex_str.str);
+        break;
+      case lex_type_io:
+        rb_gc_mark(parser->data.lex_io.file);
+        break;
+      case lex_type_array:
+        rb_gc_mark(parser->data.lex_array.ary);
+        break;
+      case lex_type_generic:
+        /* noop. Caller of rb_parser_compile_generic should mark the objects. */
+        break;
     }
 }
 
-static rb_imemo_tmpbuf_t *
-tmpbuf_parser_heap(void *buf, rb_imemo_tmpbuf_t *old_heap, size_t cnt)
+static void
+parser_free(void *ptr)
 {
-    return rb_imemo_tmpbuf_parser_heap(buf, old_heap, cnt);
+    struct ruby_parser *parser = (struct ruby_parser*)ptr;
+    rb_ruby_parser_free(parser->parser_params);
+    xfree(parser);
 }
 
-static int
-special_const_p(VALUE obj)
+static size_t
+parser_memsize(const void *ptr)
 {
-    return (int)RB_SPECIAL_CONST_P(obj);
+    struct ruby_parser *parser = (struct ruby_parser*)ptr;
+    return rb_ruby_parser_memsize(parser->parser_params);
 }
 
-static int
-builtin_type(VALUE obj)
-{
-    return (int)RB_BUILTIN_TYPE(obj);
-}
+static const rb_data_type_t ruby_parser_data_type = {
+    "parser",
+    {
+        parser_mark,
+        parser_free,
+        parser_memsize,
+    },
+    0, 0, RUBY_TYPED_FREE_IMMEDIATELY
+};
 
-static rb_ast_t *
-ast_new(VALUE nb)
+#ifdef UNIVERSAL_PARSER
+const rb_parser_config_t *
+rb_ruby_parser_config(void)
 {
-    rb_ast_t *ast = (rb_ast_t *)rb_imemo_new(imemo_ast, 0, 0, 0, nb);
-    return ast;
+    return &rb_global_parser_config;
 }
 
-static VALUE
-static_id2sym(ID id)
+rb_parser_t *
+rb_parser_params_new(void)
 {
-    return (((VALUE)(id)<<RUBY_SPECIAL_SHIFT)|SYMBOL_FLAG);
+    return rb_ruby_parser_new(&rb_global_parser_config);
 }
-
-static long
-str_coderange_scan_restartable(const char *s, const char *e, void *enc, int *cr)
+#else
+rb_parser_t *
+rb_parser_params_new(void)
 {
-    return rb_str_coderange_scan_restartable(s, e, (rb_encoding *)enc, cr);
-}
-
-VALUE rb_io_gets_internal(VALUE io);
-extern VALUE rb_mRubyVMFrozenCore;
-VALUE rb_node_case_when_optimizable_literal(const NODE *const node);
-
-void
-rb_parser_config_initialize(rb_parser_config_t *config)
-{
-    config->counter = 0;
-
-    config->malloc   = ruby_xmalloc;
-    config->calloc   = ruby_xcalloc;
-    config->realloc  = ruby_xrealloc;
-    config->free     = ruby_xfree;
-    config->alloc_n  = ruby_xmalloc2;
-    config->alloc    = ruby_xmalloc;
-    config->realloc_n = ruby_xrealloc2;
-    config->zalloc = zalloc;
-    config->rb_memmove = memmove2;
-    config->nonempty_memcpy = nonempty_memcpy;
-    config->xmalloc_mul_add = rb_xmalloc_mul_add;
-
-    config->new_strterm = new_strterm;
-    config->strterm_is_heredoc = strterm_is_heredoc;
-    config->tmpbuf_auto_free_pointer = rb_imemo_tmpbuf_auto_free_pointer;
-    config->tmpbuf_set_ptr = rb_imemo_tmpbuf_set_ptr;
-    config->tmpbuf_parser_heap = tmpbuf_parser_heap;
-    config->ast_new = ast_new;
-
-    config->compile_callback         = rb_suppress_tracing;
-    config->reg_named_capture_assign = reg_named_capture_assign;
-
-    config->obj_freeze = rb_obj_freeze;
-    config->obj_hide = rb_obj_hide;
-    config->obj_frozen = obj_frozen;
-    config->type_p = type_p;
-    config->obj_freeze_raw = OBJ_FREEZE_RAW;
-
-    config->fixnum_p = fixnum_p;
-    config->symbol_p = symbol_p;
-
-    config->attr_get = rb_attr_get;
-
-    config->ary_new           = rb_ary_new;
-    config->ary_push          = rb_ary_push;
-    config->ary_new_from_args = rb_ary_new_from_args;
-    config->ary_pop           = rb_ary_pop;
-    config->ary_last          = rb_ary_last;
-    config->ary_unshift       = rb_ary_unshift;
-    config->ary_new2          = rb_ary_new2;
-    config->ary_entry         = rb_ary_entry;
-    config->ary_join          = rb_ary_join;
-    config->ary_reverse       = rb_ary_reverse;
-    config->ary_clear         = rb_ary_clear;
-    config->array_len         = rb_array_len;
-    config->array_aref        = RARRAY_AREF;
-
-    config->sym_intern_ascii_cstr = rb_sym_intern_ascii_cstr;
-    config->make_temporary_id     = rb_make_temporary_id;
-    config->is_local_id           = is_local_id2;
-    config->is_attrset_id         = is_attrset_id2;
-    config->is_global_name_punct  = is_global_name_punct;
-    config->id_type               = id_type;
-    config->id_attrset            = rb_id_attrset;
-    config->intern                = rb_intern;
-    config->intern2               = rb_intern2;
-    config->intern3               = intern3;
-    config->intern_str            = rb_intern_str;
-    config->is_notop_id           = is_notop_id2;
-    config->enc_symname_type      = enc_symname_type;
-    config->str_intern            = rb_str_intern;
-    config->id2name               = rb_id2name;
-    config->id2str                = rb_id2str;
-    config->id2sym                = rb_id2sym;
-    config->sym2id                = rb_sym2id;
-
-    config->str_catf        = rb_str_catf;
-    config->str_cat_cstr    = rb_str_cat_cstr;
-    config->str_subseq      = rb_str_subseq;
-    config->str_dup         = rb_str_dup;
-    config->str_new_frozen  = rb_str_new_frozen;
-    config->str_buf_new     = rb_str_buf_new;
-    config->str_buf_cat     = rb_str_buf_cat;
-    config->str_modify      = rb_str_modify;
-    config->str_set_len     = rb_str_set_len;
-    config->str_cat         = rb_str_cat;
-    config->str_resize      = rb_str_resize;
-    config->str_new         = rb_str_new;
-    config->str_new_cstr    = rb_str_new_cstr;
-    config->fstring         = rb_fstring;
-    config->is_ascii_string = is_ascii_string2;
-    config->enc_str_new     = enc_str_new;
-    config->enc_str_buf_cat = enc_str_buf_cat;
-    config->str_buf_append  = rb_str_buf_append;
-    config->str_vcatf       = rb_str_vcatf;
-    config->string_value_cstr = rb_string_value_cstr;
-    config->rb_sprintf      = rb_sprintf;
-    config->rstring_ptr     = RSTRING_PTR;
-    config->rstring_end     = RSTRING_END;
-    config->rstring_len     = RSTRING_LEN;
-    config->filesystem_str_new_cstr = rb_filesystem_str_new_cstr;
-    config->obj_as_string = rb_obj_as_string;
-
-    config->hash_clear     = rb_hash_clear;
-    config->hash_new       = rb_hash_new;
-    config->hash_aset      = rb_hash_aset;
-    config->hash_lookup    = rb_hash_lookup;
-    config->ident_hash_new = rb_ident_hash_new;
-
-    config->int2fix = int2fix;
-
-    config->bignum_negate = bignum_negate;
-    config->big_norm      = rb_big_norm;
-    config->cstr_to_inum  = rb_cstr_to_inum;
-
-    config->float_new   = rb_float_new;
-    config->float_value = rb_float_value;
-
-    config->num2int          = rb_num2int_inline;
-    config->int_positive_pow = rb_int_positive_pow;
-    config->int2num          = rb_int2num_inline;
-    config->fix2long         = rb_fix2long;
-
-    config->rational_new     = rb_rational_new;
-    config->rational_raw1    = rational_raw1;
-    config->rational_set_num = rational_set_num;
-    config->rational_get_num = rational_get_num;
-
-    config->complex_raw       = rb_complex_raw;
-    config->rcomplex_set_real = rcomplex_set_real;
-    config->rcomplex_set_imag = rcomplex_set_imag;
-    config->rcomplex_get_real = rcomplex_get_real;
-    config->rcomplex_get_imag = rcomplex_get_imag;
-
-    config->stderr_tty_p    = rb_stderr_tty_p;
-    config->write_error_str = rb_write_error_str;
-    config->default_rs = default_rs;
-    config->io_write = rb_io_write;
-    config->io_flush = rb_io_flush;
-    config->io_puts = rb_io_puts;
-    config->io_gets_internal= rb_io_gets_internal;
-
-    config->debug_output_stdout = rb_ractor_stdout;
-    config->debug_output_stderr = rb_ractor_stderr;
-
-    config->is_usascii_enc        = is_usascii_enc;
-    config->enc_isalnum           = enc_isalnum;
-    config->enc_precise_mbclen    = enc_precise_mbclen;
-    config->mbclen_charfound_p    = mbclen_charfound_p;
-    config->enc_name              = enc_name;
-    config->enc_prev_char         = enc_prev_char;
-    config->enc_get               = enc_get;
-    config->enc_asciicompat       = enc_asciicompat;
-    config->utf8_encoding         = utf8_encoding;
-    config->enc_associate         = enc_associate;
-    config->ascii8bit_encoding    = ascii8bit_encoding;
-    config->enc_codelen           = enc_codelen;
-    config->enc_mbcput            = enc_mbcput;
-    config->char_to_option_kcode  = rb_char_to_option_kcode;
-    config->ascii8bit_encindex    = rb_ascii8bit_encindex;
-    config->enc_find_index        = rb_enc_find_index;
-    config->enc_from_index        = enc_from_index;
-    config->enc_associate_index   = rb_enc_associate_index;
-    config->enc_isspace           = enc_isspace;
-    config->enc_coderange_7bit    = ENC_CODERANGE_7BIT;
-    config->enc_coderange_unknown = ENC_CODERANGE_UNKNOWN;
-    config->enc_compatible        = enc_compatible;
-    config->enc_from_encoding     = enc_from_encoding;
-    config->encoding_get          = encoding_get;
-    config->encoding_set          = encoding_set;
-    config->encoding_is_ascii8bit = encoding_is_ascii8bit;
-    config->usascii_encoding      = usascii_encoding;
-
-    config->ractor_make_shareable = rb_ractor_make_shareable;
-
-    config->local_defined        = local_defined;
-    config->dvar_defined         = dvar_defined;
-
-    config->literal_cmp  = literal_cmp;
-    config->literal_hash = literal_hash;
-
-    config->builtin_class_name = rb_builtin_class_name;
-    config->syntax_error_append = syntax_error_append;
-    config->raise = rb_raise;
-    config->syntax_error_new = syntax_error_new;
-
-    config->errinfo = rb_errinfo;
-    config->set_errinfo = rb_set_errinfo;
-    config->exc_raise = rb_exc_raise;
-    config->make_exception = rb_make_exception;
-
-    config->sized_xfree = ruby_sized_xfree;
-    config->sized_realloc_n = ruby_sized_realloc_n;
-    config->obj_write = obj_write;
-    config->obj_written = obj_written;
-    config->gc_register_mark_object = rb_gc_register_mark_object;
-    config->gc_guard = gc_guard;
-    config->gc_mark = rb_gc_mark;
-    config->gc_mark_movable = rb_gc_mark_movable;
-    config->gc_location = rb_gc_location;
-
-    config->reg_compile = rb_reg_compile;
-    config->reg_check_preprocess = rb_reg_check_preprocess;
-    config->memcicmp = rb_memcicmp;
-
-    config->compile_warn    = rb_compile_warn;
-    config->compile_warning = rb_compile_warning;
-    config->bug             = rb_bug;
-    config->fatal           = rb_fatal;
-    config->verbose         = ruby_verbose2;
-
-    config->make_backtrace = rb_make_backtrace;
-
-    config->scan_hex    = ruby_scan_hex;
-    config->scan_oct    = ruby_scan_oct;
-    config->scan_digits = ruby_scan_digits;
-    config->strtod      = ruby_strtod;
-
-    config->rbool = rbool;
-    config->undef_p = undef_p;
-    config->rtest = rtest;
-    config->nil_p = nil_p;
-    config->flonum_p = flonum_p;
-    config->qnil  = Qnil;
-    config->qtrue = Qtrue;
-    config->qfalse = Qfalse;
-    config->qundef = Qundef;
-    config->eArgError = rb_eArgError;
-    config->mRubyVMFrozenCore = rb_mRubyVMFrozenCore;
-    config->long2int = rb_long2int;
-    config->special_const_p = special_const_p;
-    config->builtin_type = builtin_type;
-
-    config->node_case_when_optimizable_literal = rb_node_case_when_optimizable_literal;
-
-    /* For Ripper */
-    config->static_id2sym = static_id2sym;
-    config->str_coderange_scan_restartable = str_coderange_scan_restartable;
+    return rb_ruby_parser_new();
 }
+#endif /* UNIVERSAL_PARSER */
 
 VALUE
 rb_parser_new(void)
 {
     struct ruby_parser *parser;
-    rb_parser_config_t *config;
     rb_parser_t *parser_params;
 
-    config = rb_ruby_parser_config_new(ruby_xmalloc);
-    rb_parser_config_initialize(config);
-
     /*
      * Create parser_params ahead of vparser because
      * rb_ruby_parser_new can run GC so if create vparser
      * first, parser_mark tries to mark not initialized parser_params.
      */
-    parser_params = rb_ruby_parser_new(config);
+    parser_params = rb_parser_params_new();
     VALUE vparser = TypedData_Make_Struct(0, struct ruby_parser,
                                          &ruby_parser_data_type, parser);
     parser->parser_params = parser_params;
@@ -825,12 +570,12 @@ rb_parser_set_context(VALUE vparser, const struct rb_iseq_struct *base, int main
 }
 
 void
-rb_parser_set_script_lines(VALUE vparser, VALUE lines)
+rb_parser_set_script_lines(VALUE vparser)
 {
     struct ruby_parser *parser;
 
     TypedData_Get_Struct(vparser, struct ruby_parser, &ruby_parser_data_type, parser);
-    rb_ruby_parser_set_script_lines(parser->parser_params, lines);
+    rb_ruby_parser_set_script_lines(parser->parser_params);
 }
 
 void
@@ -842,65 +587,227 @@ rb_parser_error_tolerant(VALUE vparser)
     rb_ruby_parser_error_tolerant(parser->parser_params);
 }
 
-rb_ast_t*
+void
+rb_parser_keep_tokens(VALUE vparser)
+{
+    struct ruby_parser *parser;
+
+    TypedData_Get_Struct(vparser, struct ruby_parser, &ruby_parser_data_type, parser);
+    rb_ruby_parser_keep_tokens(parser->parser_params);
+}
+
+rb_parser_string_t *
+rb_parser_lex_get_str(struct parser_params *p, struct lex_pointer_string *ptr_str)
+{
+    char *beg, *end, *start;
+    long len;
+    VALUE s = ptr_str->str;
+
+    beg = RSTRING_PTR(s);
+    len = RSTRING_LEN(s);
+    start = beg;
+    if (ptr_str->ptr) {
+        if (len == ptr_str->ptr) return 0;
+        beg += ptr_str->ptr;
+        len -= ptr_str->ptr;
+    }
+    end = memchr(beg, '\n', len);
+    if (end) len = ++end - beg;
+    ptr_str->ptr += len;
+    return rb_str_to_parser_string(p, rb_str_subseq(s, beg - start, len));
+}
+
+static rb_parser_string_t *
+lex_get_str(struct parser_params *p, rb_parser_input_data input, int line_count)
+{
+    return rb_parser_lex_get_str(p, (struct lex_pointer_string *)input);
+}
+
+static void parser_aset_script_lines_for(VALUE path, rb_parser_ary_t *lines);
+
+static rb_ast_t*
+parser_compile(rb_parser_t *p, rb_parser_lex_gets_func *gets, VALUE fname, rb_parser_input_data input, int line)
+{
+    rb_ast_t *ast = rb_parser_compile(p, gets, fname, input, line);
+    parser_aset_script_lines_for(fname, ast->body.script_lines);
+    return ast;
+}
+
+static rb_ast_t*
+parser_compile_string0(struct ruby_parser *parser, VALUE fname, VALUE s, int line)
+{
+    VALUE str = rb_str_new_frozen(s);
+
+    parser->type = lex_type_str;
+    parser->data.lex_str.str = str;
+    parser->data.lex_str.ptr = 0;
+
+    return parser_compile(parser->parser_params, lex_get_str, fname, (rb_parser_input_data)&parser->data, line);
+}
+
+static rb_encoding *
+must_be_ascii_compatible(VALUE s)
+{
+    rb_encoding *enc = rb_enc_get(s);
+    if (!rb_enc_asciicompat(enc)) {
+        rb_raise(rb_eArgError, "invalid source encoding");
+    }
+    return enc;
+}
+
+static rb_ast_t*
+parser_compile_string_path(struct ruby_parser *parser, VALUE f, VALUE s, int line)
+{
+    must_be_ascii_compatible(s);
+    return parser_compile_string0(parser, f, s, line);
+}
+
+static rb_ast_t*
+parser_compile_string(struct ruby_parser *parser, const char *f, VALUE s, int line)
+{
+    return parser_compile_string_path(parser, rb_filesystem_str_new_cstr(f), s, line);
+}
+
+VALUE rb_io_gets_internal(VALUE io);
+
+static rb_parser_string_t *
+lex_io_gets(struct parser_params *p, rb_parser_input_data input, int line_count)
+{
+    VALUE io = (VALUE)input;
+    VALUE line = rb_io_gets_internal(io);
+    if (NIL_P(line)) return 0;
+    return rb_str_to_parser_string(p, line);
+}
+
+static rb_parser_string_t *
+lex_gets_array(struct parser_params *p, rb_parser_input_data data, int index)
+{
+    VALUE array = (VALUE)data;
+    VALUE str = rb_ary_entry(array, index);
+    if (!NIL_P(str)) {
+        StringValue(str);
+        if (!rb_enc_asciicompat(rb_enc_get(str))) {
+            rb_raise(rb_eArgError, "invalid source encoding");
+        }
+        return rb_str_to_parser_string(p, str);
+    }
+    else {
+        return 0;
+    }
+}
+
+static rb_ast_t*
+parser_compile_file_path(struct ruby_parser *parser, VALUE fname, VALUE file, int start)
+{
+    parser->type = lex_type_io;
+    parser->data.lex_io.file = file;
+
+    return parser_compile(parser->parser_params, lex_io_gets, fname, (rb_parser_input_data)file, start);
+}
+
+static rb_ast_t*
+parser_compile_array(struct ruby_parser *parser, VALUE fname, VALUE array, int start)
+{
+    parser->type = lex_type_array;
+    parser->data.lex_array.ary = array;
+
+    return parser_compile(parser->parser_params, lex_gets_array, fname, (rb_parser_input_data)array, start);
+}
+
+static rb_ast_t*
+parser_compile_generic(struct ruby_parser *parser, rb_parser_lex_gets_func *lex_gets, VALUE fname, VALUE input, int start)
+{
+    parser->type = lex_type_generic;
+
+    return parser_compile(parser->parser_params, lex_gets, fname, (rb_parser_input_data)input, start);
+}
+
+static void
+ast_free(void *ptr)
+{
+    rb_ast_t *ast = (rb_ast_t *)ptr;
+    rb_ast_free(ast);
+}
+
+static const rb_data_type_t ast_data_type = {
+    "AST",
+    {
+        NULL,
+        ast_free,
+        NULL, // No dsize() because this object does not appear in ObjectSpace.
+    },
+    0, 0, RUBY_TYPED_FREE_IMMEDIATELY
+};
+
+static VALUE
+ast_alloc(void)
+{
+    return TypedData_Wrap_Struct(0, &ast_data_type, NULL);
+}
+
+VALUE
 rb_parser_compile_file_path(VALUE vparser, VALUE fname, VALUE file, int start)
 {
     struct ruby_parser *parser;
-    rb_ast_t *ast;
+    VALUE ast_value = ast_alloc();
 
     TypedData_Get_Struct(vparser, struct ruby_parser, &ruby_parser_data_type, parser);
-    ast = rb_ruby_parser_compile_file_path(parser->parser_params, fname, file, start);
+    DATA_PTR(ast_value) = parser_compile_file_path(parser, fname, file, start);
     RB_GC_GUARD(vparser);
 
-    return ast;
+    return ast_value;
 }
 
-void
-rb_parser_keep_tokens(VALUE vparser)
+VALUE
+rb_parser_compile_array(VALUE vparser, VALUE fname, VALUE array, int start)
 {
     struct ruby_parser *parser;
+    VALUE ast_value = ast_alloc();
 
     TypedData_Get_Struct(vparser, struct ruby_parser, &ruby_parser_data_type, parser);
-    rb_ruby_parser_keep_tokens(parser->parser_params);
+    DATA_PTR(ast_value) = parser_compile_array(parser, fname, array, start);
+    RB_GC_GUARD(vparser);
+
+    return ast_value;
 }
 
-rb_ast_t*
-rb_parser_compile_generic(VALUE vparser, VALUE (*lex_gets)(VALUE, int), VALUE fname, VALUE input, int start)
+VALUE
+rb_parser_compile_generic(VALUE vparser, rb_parser_lex_gets_func *lex_gets, VALUE fname, VALUE input, int start)
 {
     struct ruby_parser *parser;
-    rb_ast_t *ast;
+    VALUE ast_value = ast_alloc();
 
     TypedData_Get_Struct(vparser, struct ruby_parser, &ruby_parser_data_type, parser);
-    ast = rb_ruby_parser_compile_generic(parser->parser_params, lex_gets, fname, input, start);
+    DATA_PTR(ast_value) = parser_compile_generic(parser, lex_gets, fname, input, start);
     RB_GC_GUARD(vparser);
 
-    return ast;
+    return ast_value;
 }
 
-rb_ast_t*
+VALUE
 rb_parser_compile_string(VALUE vparser, const char *f, VALUE s, int line)
 {
     struct ruby_parser *parser;
-    rb_ast_t *ast;
+    VALUE ast_value = ast_alloc();
 
     TypedData_Get_Struct(vparser, struct ruby_parser, &ruby_parser_data_type, parser);
-    ast = rb_ruby_parser_compile_string(parser->parser_params, f, s, line);
+    DATA_PTR(ast_value) = parser_compile_string(parser, f, s, line);
     RB_GC_GUARD(vparser);
 
-    return ast;
+    return ast_value;
 }
 
-rb_ast_t*
+VALUE
 rb_parser_compile_string_path(VALUE vparser, VALUE f, VALUE s, int line)
 {
     struct ruby_parser *parser;
-    rb_ast_t *ast;
+    VALUE ast_value = ast_alloc();
 
     TypedData_Get_Struct(vparser, struct ruby_parser, &ruby_parser_data_type, parser);
-    ast = rb_ruby_parser_compile_string_path(parser->parser_params, f, s, line);
+    DATA_PTR(ast_value) = parser_compile_string_path(parser, f, s, line);
     RB_GC_GUARD(vparser);
 
-    return ast;
+    return ast_value;
 }
 
 VALUE
@@ -909,7 +816,7 @@ rb_parser_encoding(VALUE vparser)
     struct ruby_parser *parser;
 
     TypedData_Get_Struct(vparser, struct ruby_parser, &ruby_parser_data_type, parser);
-    return rb_ruby_parser_encoding(parser->parser_params);
+    return rb_enc_from_encoding(rb_ruby_parser_encoding(parser->parser_params));
 }
 
 VALUE
@@ -931,10 +838,282 @@ rb_parser_set_yydebug(VALUE vparser, VALUE flag)
     return flag;
 }
 
-#else
-
-/* For "ISO C requires a translation unit to contain at least one declaration" */
 void
-rb_parser_dummy(void)
-{}
+rb_set_script_lines_for(VALUE vparser, VALUE path)
+{
+    struct ruby_parser *parser;
+    VALUE hash;
+    ID script_lines;
+    CONST_ID(script_lines, "SCRIPT_LINES__");
+    if (!rb_const_defined_at(rb_cObject, script_lines)) return;
+    hash = rb_const_get_at(rb_cObject, script_lines);
+    if (RB_TYPE_P(hash, T_HASH)) {
+        rb_hash_aset(hash, path, Qtrue);
+        TypedData_Get_Struct(vparser, struct ruby_parser, &ruby_parser_data_type, parser);
+        rb_ruby_parser_set_script_lines(parser->parser_params);
+    }
+}
+
+VALUE
+rb_parser_build_script_lines_from(rb_parser_ary_t *lines)
+{
+    int i;
+    if (!lines) return Qnil;
+    if (lines->data_type != PARSER_ARY_DATA_SCRIPT_LINE) {
+        rb_bug("unexpected rb_parser_ary_data_type (%d) for script lines", lines->data_type);
+    }
+    VALUE script_lines = rb_ary_new_capa(lines->len);
+    for (i = 0; i < lines->len; i++) {
+        rb_parser_string_t *str = (rb_parser_string_t *)lines->data[i];
+        rb_ary_push(script_lines, rb_enc_str_new(str->ptr, str->len, str->enc));
+    }
+    return script_lines;
+}
+
+VALUE
+rb_str_new_parser_string(rb_parser_string_t *str)
+{
+    VALUE string = rb_enc_literal_str(str->ptr, str->len, str->enc);
+    rb_enc_str_coderange(string);
+    return string;
+}
+
+VALUE
+rb_str_new_mutable_parser_string(rb_parser_string_t *str)
+{
+    return rb_enc_str_new(str->ptr, str->len, str->enc);
+}
+
+static VALUE
+negative_numeric(VALUE val)
+{
+    if (FIXNUM_P(val)) {
+        return LONG2FIX(-FIX2LONG(val));
+    }
+    if (SPECIAL_CONST_P(val)) {
+#if USE_FLONUM
+        if (FLONUM_P(val)) {
+            return DBL2NUM(-RFLOAT_VALUE(val));
+        }
+#endif
+        goto unknown;
+    }
+    switch (BUILTIN_TYPE(val)) {
+      case T_BIGNUM:
+        BIGNUM_NEGATE(val);
+        val = rb_big_norm(val);
+        break;
+      case T_RATIONAL:
+        RATIONAL_SET_NUM(val, negative_numeric(RRATIONAL(val)->num));
+        break;
+      case T_COMPLEX:
+        RCOMPLEX_SET_REAL(val, negative_numeric(RCOMPLEX(val)->real));
+        RCOMPLEX_SET_IMAG(val, negative_numeric(RCOMPLEX(val)->imag));
+        break;
+      case T_FLOAT:
+        val = DBL2NUM(-RFLOAT_VALUE(val));
+        break;
+      unknown:
+      default:
+        rb_bug("unknown literal type (%s) passed to negative_numeric",
+               rb_builtin_class_name(val));
+        break;
+    }
+    return val;
+}
+
+static VALUE
+integer_value(const char *val, int base)
+{
+    return rb_cstr_to_inum(val, base, FALSE);
+}
+
+static VALUE
+rational_value(const char *node_val, int base, int seen_point)
+{
+    VALUE lit;
+    char* val = strdup(node_val);
+    if (seen_point > 0) {
+        int len = (int)(strlen(val));
+        char *point = &val[seen_point];
+        size_t fraclen = len-seen_point-1;
+        memmove(point, point+1, fraclen+1);
+
+        lit = rb_rational_new(integer_value(val, base), rb_int_positive_pow(10, fraclen));
+    }
+    else {
+        lit = rb_rational_raw1(integer_value(val, base));
+    }
+
+    free(val);
+
+    return lit;
+}
+
+VALUE
+rb_node_integer_literal_val(const NODE *n)
+{
+    const rb_node_integer_t *node = RNODE_INTEGER(n);
+    VALUE val = integer_value(node->val, node->base);
+    if (node->minus) {
+        val = negative_numeric(val);
+    }
+    return val;
+}
+
+VALUE
+rb_node_float_literal_val(const NODE *n)
+{
+    const rb_node_float_t *node = RNODE_FLOAT(n);
+    double d = strtod(node->val, 0);
+    if (node->minus) {
+        d = -d;
+    }
+    VALUE val = DBL2NUM(d);
+    return val;
+}
+
+VALUE
+rb_node_rational_literal_val(const NODE *n)
+{
+    VALUE lit;
+    const rb_node_rational_t *node = RNODE_RATIONAL(n);
+
+    lit = rational_value(node->val, node->base, node->seen_point);
+
+    if (node->minus) {
+        lit = negative_numeric(lit);
+    }
+
+    return lit;
+}
+
+VALUE
+rb_node_imaginary_literal_val(const NODE *n)
+{
+    VALUE lit;
+    const rb_node_imaginary_t *node = RNODE_IMAGINARY(n);
+
+    enum rb_numeric_type type = node->type;
+
+    switch (type) {
+      case integer_literal:
+        lit = integer_value(node->val, node->base);
+        break;
+      case float_literal:{
+        double d = strtod(node->val, 0);
+        lit = DBL2NUM(d);
+        break;
+      }
+      case rational_literal:
+        lit = rational_value(node->val, node->base, node->seen_point);
+        break;
+      default:
+        rb_bug("unreachable");
+    }
+
+    lit = rb_complex_raw(INT2FIX(0), lit);
+
+    if (node->minus) {
+        lit = negative_numeric(lit);
+    }
+    return lit;
+}
+
+VALUE
+rb_node_str_string_val(const NODE *node)
+{
+    rb_parser_string_t *str = RNODE_STR(node)->string;
+    return rb_str_new_parser_string(str);
+}
+
+VALUE
+rb_node_sym_string_val(const NODE *node)
+{
+    rb_parser_string_t *str = RNODE_SYM(node)->string;
+    return ID2SYM(rb_intern3(str->ptr, str->len, str->enc));
+}
+
+VALUE
+rb_node_dstr_string_val(const NODE *node)
+{
+    rb_parser_string_t *str = RNODE_DSTR(node)->string;
+    return str ? rb_str_new_parser_string(str) : Qnil;
+}
+
+VALUE
+rb_node_dregx_string_val(const NODE *node)
+{
+    rb_parser_string_t *str = RNODE_DREGX(node)->string;
+    return rb_str_new_parser_string(str);
+}
+
+VALUE
+rb_node_regx_string_val(const NODE *node)
+{
+    rb_node_regx_t *node_reg = RNODE_REGX(node);
+    rb_parser_string_t *string = node_reg->string;
+    VALUE str = rb_enc_str_new(string->ptr, string->len, string->enc);
+
+    return rb_reg_compile(str, node_reg->options, NULL, 0);
+}
+
+VALUE
+rb_node_line_lineno_val(const NODE *node)
+{
+    return INT2FIX(node->nd_loc.beg_pos.lineno);
+}
+
+VALUE
+rb_node_file_path_val(const NODE *node)
+{
+    return rb_str_new_parser_string(RNODE_FILE(node)->path);
+}
+
+VALUE
+rb_node_encoding_val(const NODE *node)
+{
+    return rb_enc_from_encoding(RNODE_ENCODING(node)->enc);
+}
+
+static void
+parser_aset_script_lines_for(VALUE path, rb_parser_ary_t *lines)
+{
+    VALUE hash, script_lines;
+    ID script_lines_id;
+    if (NIL_P(path) || !lines) return;
+    CONST_ID(script_lines_id, "SCRIPT_LINES__");
+    if (!rb_const_defined_at(rb_cObject, script_lines_id)) return;
+    hash = rb_const_get_at(rb_cObject, script_lines_id);
+    if (!RB_TYPE_P(hash, T_HASH)) return;
+    if (rb_hash_lookup(hash, path) == Qnil) return;
+    script_lines = rb_parser_build_script_lines_from(lines);
+    rb_hash_aset(hash, path, script_lines);
+}
+
+VALUE
+rb_ruby_ast_new(const NODE *const root)
+{
+    rb_ast_t *ast;
+    VALUE ast_value = TypedData_Make_Struct(0, rb_ast_t, &ast_data_type, ast);
+#ifdef UNIVERSAL_PARSER
+    ast->config = &rb_global_parser_config;
 #endif
+    ast->body = (rb_ast_body_t){
+        .root = root,
+        .frozen_string_literal = -1,
+        .coverage_enabled = -1,
+        .script_lines = NULL,
+        .line_count = 0,
+    };
+    return ast_value;
+}
+
+rb_ast_t *
+rb_ruby_ast_data_get(VALUE ast_value)
+{
+    rb_ast_t *ast;
+    if (NIL_P(ast_value)) return NULL;
+    TypedData_Get_Struct(ast_value, rb_ast_t, &ast_data_type, ast);
+    return ast;
+}
diff --git a/rubyparser.h b/rubyparser.h
index e95b71f049f681..c63929abb299a5 100644
--- a/rubyparser.h
+++ b/rubyparser.h
@@ -5,10 +5,11 @@
  */
 
 #include <stdarg.h> /* for va_list */
+#include <assert.h>
 
 #ifdef UNIVERSAL_PARSER
 
-#define rb_encoding void
+#define rb_encoding const void
 #define OnigCodePoint unsigned int
 #include "parser_st.h"
 #ifndef RUBY_RUBY_H
@@ -21,6 +22,59 @@
 
 #endif
 
+#ifndef FLEX_ARY_LEN
+/* From internal/compilers.h */
+/* 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
+#endif
+
+#if defined(__GNUC__)
+# if defined(__MINGW_PRINTF_FORMAT)
+#   define RUBYPARSER_ATTRIBUTE_FORMAT(string_index, argument_index) __attribute__((format(__MINGW_PRINTF_FORMAT, string_index, argument_index)))
+# else
+#   define RUBYPARSER_ATTRIBUTE_FORMAT(string_index, argument_index) __attribute__((format(printf, string_index, argument_index)))
+# endif
+#elif defined(__clang__)
+# define RUBYPARSER_ATTRIBUTE_FORMAT(string_index, argument_index) __attribute__((__format__(__printf__, string_index, argument_index)))
+#else
+# define RUBYPARSER_ATTRIBUTE_FORMAT(string_index, argument_index)
+#endif
+
+/*
+ * Parser String
+ */
+enum rb_parser_string_coderange_type {
+    /** The object's coderange is unclear yet. */
+    RB_PARSER_ENC_CODERANGE_UNKNOWN  = 0,
+    RB_PARSER_ENC_CODERANGE_7BIT     = 1,
+    RB_PARSER_ENC_CODERANGE_VALID    = 2,
+    RB_PARSER_ENC_CODERANGE_BROKEN   = 3
+};
+
+typedef struct rb_parser_string {
+    enum rb_parser_string_coderange_type coderange;
+    rb_encoding *enc;
+    /* Length of the string, not including terminating NUL character. */
+    long len;
+    /* Pointer to the contents of the string. */
+    char *ptr;
+} rb_parser_string_t;
+
+enum rb_parser_shareability {
+    rb_parser_shareable_none,
+    rb_parser_shareable_literal,
+    rb_parser_shareable_copy,
+    rb_parser_shareable_everything,
+};
+
+typedef void* rb_parser_input_data;
+
 /*
  * AST Node
  */
@@ -70,7 +124,6 @@ enum node_type {
     NODE_ZSUPER,
     NODE_LIST,
     NODE_ZLIST,
-    NODE_VALUES,
     NODE_HASH,
     NODE_RETURN,
     NODE_YIELD,
@@ -85,12 +138,16 @@ enum node_type {
     NODE_MATCH,
     NODE_MATCH2,
     NODE_MATCH3,
-    NODE_LIT,
+    NODE_INTEGER,
+    NODE_FLOAT,
+    NODE_RATIONAL,
+    NODE_IMAGINARY,
     NODE_STR,
     NODE_DSTR,
     NODE_XSTR,
     NODE_DXSTR,
     NODE_EVSTR,
+    NODE_REGX,
     NODE_DREGX,
     NODE_ONCE,
     NODE_ARGS,
@@ -123,6 +180,7 @@ enum node_type {
     NODE_ERRINFO,
     NODE_DEFINED,
     NODE_POSTEXE,
+    NODE_SYM,
     NODE_DSYM,
     NODE_ATTRASGN,
     NODE_LAMBDA,
@@ -130,148 +188,578 @@ enum node_type {
     NODE_HSHPTN,
     NODE_FNDPTN,
     NODE_ERROR,
+    NODE_LINE,
+    NODE_FILE,
+    NODE_ENCODING,
     NODE_LAST
 };
 
+typedef struct rb_ast_id_table {
+    int size;
+    ID ids[FLEX_ARY_LEN];
+} rb_ast_id_table_t;
 
-#define nd_head  u1.node
-#define nd_alen  u2.argc
-#define nd_next  u3.node
+typedef struct rb_code_position_struct {
+    int lineno;
+    int column;
+} rb_code_position_t;
 
-#define nd_cond  u1.node
-#define nd_body  u2.node
-#define nd_else  u3.node
+typedef struct rb_code_location_struct {
+    rb_code_position_t beg_pos;
+    rb_code_position_t end_pos;
+} rb_code_location_t;
+#define YYLTYPE rb_code_location_t
+#define YYLTYPE_IS_DECLARED 1
 
-#define nd_resq  u2.node
-#define nd_ensr  u3.node
+typedef struct rb_parser_ast_token {
+    int id;
+    const char *type_name;
+    rb_parser_string_t *str;
+    rb_code_location_t loc;
+} rb_parser_ast_token_t;
 
-#define nd_1st   u1.node
-#define nd_2nd   u2.node
+/*
+ * Array-like object for parser
+ */
+typedef void* rb_parser_ary_data;
 
-#define nd_stts  u1.node
+enum rb_parser_ary_data_type {
+    PARSER_ARY_DATA_AST_TOKEN = 1,
+    PARSER_ARY_DATA_SCRIPT_LINE,
+    PARSER_ARY_DATA_NODE
+};
 
-#define nd_vid   u1.id
+typedef struct rb_parser_ary {
+    enum rb_parser_ary_data_type data_type;
+    rb_parser_ary_data *data;
+    long len;  // current size
+    long capa; // capacity
+} rb_parser_ary_t;
 
-#define nd_var   u1.node
-#define nd_iter  u3.node
+/* Header part of AST Node */
+typedef struct RNode {
+    VALUE flags;
+    rb_code_location_t nd_loc;
+    int node_id;
+} NODE;
 
-#define nd_value u2.node
-#define nd_aid   u3.id
+typedef struct RNode_SCOPE {
+    NODE node;
+
+    rb_ast_id_table_t *nd_tbl;
+    struct RNode *nd_body;
+    struct RNode_ARGS *nd_args;
+} rb_node_scope_t;
+
+typedef struct RNode_BLOCK {
+    NODE node;
+
+    struct RNode *nd_head;
+    struct RNode *nd_end;
+    struct RNode *nd_next;
+} rb_node_block_t;
+
+typedef struct RNode_IF {
+    NODE node;
+
+    struct RNode *nd_cond;
+    struct RNode *nd_body;
+    struct RNode *nd_else;
+    rb_code_location_t if_keyword_loc;
+    rb_code_location_t then_keyword_loc;
+    rb_code_location_t end_keyword_loc;
+} rb_node_if_t;
+
+typedef struct RNode_UNLESS {
+    NODE node;
+
+    struct RNode *nd_cond;
+    struct RNode *nd_body;
+    struct RNode *nd_else;
+    rb_code_location_t keyword_loc;
+    rb_code_location_t then_keyword_loc;
+    rb_code_location_t end_keyword_loc;
+} rb_node_unless_t;
+
+typedef struct RNode_CASE {
+    NODE node;
+
+    struct RNode *nd_head;
+    struct RNode *nd_body;
+    rb_code_location_t case_keyword_loc;
+    rb_code_location_t end_keyword_loc;
+} rb_node_case_t;
+
+typedef struct RNode_CASE2 {
+    NODE node;
+
+    struct RNode *nd_head;
+    struct RNode *nd_body;
+    rb_code_location_t case_keyword_loc;
+    rb_code_location_t end_keyword_loc;
+} rb_node_case2_t;
+
+typedef struct RNode_CASE3 {
+    NODE node;
+
+    struct RNode *nd_head;
+    struct RNode *nd_body;
+    rb_code_location_t case_keyword_loc;
+    rb_code_location_t end_keyword_loc;
+} rb_node_case3_t;
+
+typedef struct RNode_WHEN {
+    NODE node;
+
+    struct RNode *nd_head;
+    struct RNode *nd_body;
+    struct RNode *nd_next;
+    rb_code_location_t keyword_loc;
+    rb_code_location_t then_keyword_loc;
+} rb_node_when_t;
+
+typedef struct RNode_IN {
+    NODE node;
+
+    struct RNode *nd_head;
+    struct RNode *nd_body;
+    struct RNode *nd_next;
+} rb_node_in_t;
+
+typedef struct RNode_LOOP {
+    NODE node;
+
+    struct RNode *nd_cond;
+    struct RNode *nd_body;
+    long nd_state;
+    rb_code_location_t keyword_loc;
+    rb_code_location_t closing_loc;
+} rb_node_while_t, rb_node_until_t;
+
+typedef struct RNode_ITER {
+    NODE node;
+
+    struct RNode *nd_body;
+    struct RNode *nd_iter;
+} rb_node_iter_t;
+
+typedef struct RNode_FOR {
+    NODE node;
+
+    struct RNode *nd_body;
+    struct RNode *nd_iter;
+    rb_code_location_t for_keyword_loc;
+    rb_code_location_t in_keyword_loc;
+    rb_code_location_t do_keyword_loc;
+    rb_code_location_t end_keyword_loc;
+} rb_node_for_t;
+
+typedef struct RNode_FOR_MASGN {
+    NODE node;
+
+    struct RNode *nd_var;
+} rb_node_for_masgn_t;
+
+typedef struct RNode_EXITS {
+    NODE node;
+
+    struct RNode *nd_chain;
+    struct RNode *nd_stts;
+    rb_code_location_t keyword_loc;
+} rb_node_exits_t, rb_node_break_t, rb_node_next_t, rb_node_redo_t;
+
+typedef struct RNode_RETRY {
+    NODE node;
+} rb_node_retry_t;
+
+typedef struct RNode_BEGIN {
+    NODE node;
+
+    struct RNode *nd_body;
+} rb_node_begin_t;
+
+typedef struct RNode_RESCUE {
+    NODE node;
+
+    struct RNode *nd_head;
+    struct RNode *nd_resq;
+    struct RNode *nd_else;
+} rb_node_rescue_t;
+
+typedef struct RNode_RESBODY {
+    NODE node;
+
+    struct RNode *nd_args;
+    struct RNode *nd_exc_var;
+    struct RNode *nd_body;
+    struct RNode *nd_next;
+} rb_node_resbody_t;
+
+typedef struct RNode_ENSURE {
+    NODE node;
+
+    struct RNode *nd_head;
+    struct RNode *nd_ensr;
+} rb_node_ensure_t;
+
+typedef struct {
+    NODE node;
+
+    struct RNode *nd_1st;
+    struct RNode *nd_2nd;
+    rb_code_location_t operator_loc;
+} rb_node_and_t, rb_node_or_t;
+
+typedef struct RNode_MASGN {
+    NODE node;
+
+    struct RNode *nd_head;
+    struct RNode *nd_value;
+    struct RNode *nd_args;
+} rb_node_masgn_t;
+
+typedef struct RNode_LASGN {
+    NODE node;
+
+    ID nd_vid;
+    struct RNode *nd_value;
+} rb_node_lasgn_t;
+
+typedef struct RNode_DASGN {
+    NODE node;
+
+    ID nd_vid;
+    struct RNode *nd_value;
+} rb_node_dasgn_t;
+
+typedef struct RNode_GASGN {
+    NODE node;
 
-#define nd_lit   u1.value
+    ID nd_vid;
+    struct RNode *nd_value;
+} rb_node_gasgn_t;
 
-#define nd_recv  u1.node
-#define nd_mid   u2.id
-#define nd_args  u3.node
-#define nd_ainfo u3.args
+typedef struct RNode_IASGN {
+    NODE node;
 
-#define nd_defn  u3.node
+    ID nd_vid;
+    struct RNode *nd_value;
+} rb_node_iasgn_t;
 
-#define nd_cpath u1.node
-#define nd_super u3.node
+typedef struct RNode_CDECL {
+    NODE node;
 
-#define nd_beg   u1.node
-#define nd_end   u2.node
-#define nd_state u3.state
+    ID nd_vid;
+    struct RNode *nd_value;
+    struct RNode *nd_else;
+    enum rb_parser_shareability shareability;
+} rb_node_cdecl_t;
 
-#define nd_nth   u2.argc
+typedef struct RNode_CVASGN {
+    NODE node;
 
-#define nd_alias  u1.id
-#define nd_orig   u2.id
-#define nd_undef  u2.node
+    ID nd_vid;
+    struct RNode *nd_value;
+} rb_node_cvasgn_t;
 
-#define nd_brace u2.argc
+typedef struct RNode_OP_ASGN1 {
+    NODE node;
 
-#define nd_pconst     u1.node
-#define nd_pkwargs    u2.node
-#define nd_pkwrestarg u3.node
+    struct RNode *nd_recv;
+    ID nd_mid;
+    struct RNode *nd_index;
+    struct RNode *nd_rvalue;
+    rb_code_location_t call_operator_loc;
+    rb_code_location_t opening_loc;
+    rb_code_location_t closing_loc;
+    rb_code_location_t binary_operator_loc;
+} rb_node_op_asgn1_t;
 
-#define nd_apinfo u3.apinfo
+typedef struct RNode_OP_ASGN2 {
+    NODE node;
 
-#define nd_fpinfo u3.fpinfo
+    struct RNode *nd_recv;
+    struct RNode *nd_value;
+    ID nd_vid;
+    ID nd_mid;
+    bool nd_aid;
+    rb_code_location_t call_operator_loc;
+    rb_code_location_t message_loc;
+    rb_code_location_t binary_operator_loc;
+} rb_node_op_asgn2_t;
 
-// for NODE_SCOPE
-#define nd_tbl   u1.tbl
+typedef struct RNode_OP_ASGN_AND {
+    NODE node;
 
-// for NODE_ARGS_AUX
-#define nd_pid   u1.id
-#define nd_plen  u2.argc
-#define nd_cflag u2.id
+    struct RNode *nd_head;
+    struct RNode *nd_value;
+} rb_node_op_asgn_and_t;
 
-// for ripper
-#define nd_cval  u3.value
-#define nd_rval  u2.value
-#define nd_tag   u1.id
+typedef struct RNode_OP_ASGN_OR {
+    NODE node;
 
-#ifndef FLEX_ARY_LEN
-/* From internal/compilers.h */
-/* 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
-#endif
+    struct RNode *nd_head;
+    struct RNode *nd_value;
+} rb_node_op_asgn_or_t;
 
-typedef struct rb_ast_id_table {
-    int size;
-    ID ids[FLEX_ARY_LEN];
-} rb_ast_id_table_t;
+typedef struct RNode_OP_CDECL {
+    NODE node;
 
-typedef struct rb_code_position_struct {
-    int lineno;
-    int column;
-} rb_code_position_t;
+    struct RNode *nd_head;
+    struct RNode *nd_value;
+    ID nd_aid;
+    enum rb_parser_shareability shareability;
+} rb_node_op_cdecl_t;
 
-typedef struct rb_code_location_struct {
-    rb_code_position_t beg_pos;
-    rb_code_position_t end_pos;
-} rb_code_location_t;
+typedef struct RNode_CALL {
+    NODE node;
+
+    struct RNode *nd_recv;
+    ID nd_mid;
+    struct RNode *nd_args;
+} rb_node_call_t;
 
-typedef struct RNode {
-    VALUE flags;
-    union {
-        struct RNode *node;
-        ID id;
-        VALUE value;
-        rb_ast_id_table_t *tbl;
-    } u1;
+typedef struct RNode_OPCALL {
+    NODE node;
+
+    struct RNode *nd_recv;
+    ID nd_mid;
+    struct RNode *nd_args;
+} rb_node_opcall_t;
+
+typedef struct RNode_FCALL {
+    NODE node;
+
+    ID nd_mid;
+    struct RNode *nd_args;
+} rb_node_fcall_t;
+
+typedef struct RNode_VCALL {
+    NODE node;
+
+    ID nd_mid;
+} rb_node_vcall_t;
+
+typedef struct RNode_QCALL {
+    NODE node;
+
+    struct RNode *nd_recv;
+    ID nd_mid;
+    struct RNode *nd_args;
+} rb_node_qcall_t;
+
+typedef struct RNode_SUPER {
+    NODE node;
+
+    struct RNode *nd_args;
+    rb_code_location_t keyword_loc;
+    rb_code_location_t lparen_loc;
+    rb_code_location_t rparen_loc;
+} rb_node_super_t;
+
+typedef struct RNode_ZSUPER {
+    NODE node;
+} rb_node_zsuper_t;
+
+/*
+
+  Structure of LIST:
+
+  LIST                     +--> LIST
+   * head --> element      |     * head
+   * alen (length of list) |     * nd_end (point to the last LIST)
+   * next -----------------+     * next
+
+*/
+typedef struct RNode_LIST {
+    NODE node;
+
+    struct RNode *nd_head; /* element */
     union {
-        struct RNode *node;
-        ID id;
-        long argc;
-        VALUE value;
-    } u2;
+        long nd_alen;
+        struct RNode *nd_end; /* Second list node has this structure */
+    } as;
+    struct RNode *nd_next; /* next list node */
+} rb_node_list_t;
+
+typedef struct RNode_ZLIST {
+    NODE node;
+} rb_node_zlist_t;
+
+typedef struct RNode_HASH {
+    NODE node;
+
+    struct RNode *nd_head;
+    long nd_brace;
+} rb_node_hash_t;
+
+typedef struct RNode_RETURN {
+    NODE node;
+
+    struct RNode *nd_stts;
+    rb_code_location_t keyword_loc;
+} rb_node_return_t;
+
+typedef struct RNode_YIELD {
+    NODE node;
+
+    struct RNode *nd_head;
+    rb_code_location_t keyword_loc;
+    rb_code_location_t lparen_loc;
+    rb_code_location_t rparen_loc;
+} rb_node_yield_t;
+
+typedef struct RNode_LVAR {
+    NODE node;
+
+    ID nd_vid;
+} rb_node_lvar_t;
+
+typedef struct RNode_DVAR {
+    NODE node;
+
+    ID nd_vid;
+} rb_node_dvar_t;
+
+typedef struct RNode_GVAR {
+    NODE node;
+
+    ID nd_vid;
+} rb_node_gvar_t;
+
+typedef struct RNode_IVAR {
+    NODE node;
+
+    ID nd_vid;
+} rb_node_ivar_t;
+
+typedef struct RNode_CONST {
+    NODE node;
+
+    ID nd_vid;
+} rb_node_const_t;
+
+typedef struct RNode_CVAR {
+    NODE node;
+
+    ID nd_vid;
+} rb_node_cvar_t;
+
+typedef struct RNode_NTH_REF {
+    NODE node;
+
+    long nd_nth;
+} rb_node_nth_ref_t;
+
+typedef struct RNode_BACK_REF {
+    NODE node;
+
+    long nd_nth;
+} rb_node_back_ref_t;
+
+typedef struct RNode_MATCH2 {
+    NODE node;
+
+    struct RNode *nd_recv;
+    struct RNode *nd_value;
+    struct RNode *nd_args;
+} rb_node_match2_t;
+
+typedef struct RNode_MATCH3 {
+    NODE node;
+
+    struct RNode *nd_recv;
+    struct RNode *nd_value;
+} rb_node_match3_t;
+
+typedef struct RNode_INTEGER {
+    NODE node;
+
+    char *val;
+    int minus;
+    int base;
+} rb_node_integer_t;
+
+typedef struct RNode_FLOAT {
+    NODE node;
+
+    char *val;
+    int minus;
+} rb_node_float_t;
+
+typedef struct RNode_RATIONAL {
+    NODE node;
+
+    char *val;
+    int minus;
+    int base;
+    int seen_point;
+} rb_node_rational_t;
+
+enum rb_numeric_type {
+    integer_literal,
+    float_literal,
+    rational_literal
+};
+
+typedef struct RNode_IMAGINARY {
+    NODE node;
+
+    char *val;
+    int minus;
+    int base;
+    int seen_point;
+    enum rb_numeric_type type;
+} rb_node_imaginary_t;
+
+typedef struct RNode_STR {
+    NODE node;
+
+    struct rb_parser_string *string;
+} rb_node_str_t;
+
+/* NODE_DSTR, NODE_DXSTR, NODE_DREGX, NODE_DSYM */
+typedef struct RNode_DSTR {
+    NODE node;
+
+    struct rb_parser_string *string;
     union {
-        struct RNode *node;
-        ID id;
-        long state;
-        struct rb_args_info *args;
-        struct rb_ary_pattern_info *apinfo;
-        struct rb_fnd_pattern_info *fpinfo;
-        VALUE value;
-    } u3;
-    rb_code_location_t nd_loc;
-    int node_id;
-} NODE;
+        long nd_alen;
+        long nd_cflag;
+        struct RNode *nd_end; /* Second dstr node has this structure. See also RNode_LIST */
+    } as;
+    struct RNode_LIST *nd_next;
+} rb_node_dstr_t;
 
-/* FL     : 0..4: T_TYPES, 5: KEEP_WB, 6: PROMOTED, 7: FINALIZE, 8: UNUSED, 9: UNUSED, 10: EXIVAR, 11: FREEZE */
-/* NODE_FL: 0..4: T_TYPES, 5: KEEP_WB, 6: PROMOTED, 7: NODE_FL_NEWLINE,
- *          8..14: nd_type,
- *          15..: nd_line
- */
-#define NODE_FL_NEWLINE              (((VALUE)1)<<7)
+typedef rb_node_str_t rb_node_xstr_t;
 
-#define NODE_TYPESHIFT 8
-#define NODE_TYPEMASK  (((VALUE)0x7f)<<NODE_TYPESHIFT)
+typedef rb_node_dstr_t rb_node_dxstr_t;
 
-#define nd_type(n) ((int) (((n)->flags & NODE_TYPEMASK)>>NODE_TYPESHIFT))
-#define nd_set_type(n,t) \
-    rb_node_set_type(n, t)
-#define nd_init_type(n,t) \
-    (n)->flags=(((n)->flags&~NODE_TYPEMASK)|((((unsigned long)(t))<<NODE_TYPESHIFT)&NODE_TYPEMASK))
+typedef struct RNode_EVSTR {
+    NODE node;
+
+    struct RNode *nd_body;
+    rb_code_location_t opening_loc;
+    rb_code_location_t closing_loc;
+} rb_node_evstr_t;
+
+typedef struct RNode_REGX {     /* also RNode_MATCH */
+    NODE node;
+
+    struct rb_parser_string *string;
+    int options;
+    rb_code_location_t opening_loc;
+    rb_code_location_t content_loc;
+    rb_code_location_t closing_loc;
+} rb_node_regx_t, rb_node_match_t;
+
+typedef rb_node_dstr_t rb_node_dregx_t;
+
+typedef struct RNode_ONCE {
+    NODE node;
+
+    struct RNode *nd_body;
+} rb_node_once_t;
 
 struct rb_args_info {
     NODE *pre_init;
@@ -285,44 +773,429 @@ struct rb_args_info {
     ID rest_arg;
     ID block_arg;
 
-    NODE *kw_args;
+    struct RNode_KW_ARG *kw_args;
     NODE *kw_rest_arg;
 
-    NODE *opt_args;
+    struct RNode_OPT_ARG *opt_args;
     unsigned int no_kwarg: 1;
     unsigned int ruby2_keywords: 1;
     unsigned int forwarding: 1;
-
-    VALUE imemo;
 };
 
-struct rb_ary_pattern_info {
+typedef struct RNode_ARGS {
+    NODE node;
+
+    struct rb_args_info nd_ainfo;
+} rb_node_args_t;
+
+typedef struct RNode_ARGS_AUX {
+    NODE node;
+
+    ID nd_pid;
+    int nd_plen;
+    struct RNode *nd_next;
+} rb_node_args_aux_t;
+
+typedef struct RNode_OPT_ARG {
+    NODE node;
+
+    struct RNode *nd_body;
+    struct RNode_OPT_ARG *nd_next;
+} rb_node_opt_arg_t;
+
+typedef struct RNode_KW_ARG {
+    NODE node;
+
+    struct RNode *nd_body;
+    struct RNode_KW_ARG *nd_next;
+} rb_node_kw_arg_t;
+
+typedef struct RNode_POSTARG {
+    NODE node;
+
+    struct RNode *nd_1st;
+    struct RNode *nd_2nd;
+} rb_node_postarg_t;
+
+typedef struct RNode_ARGSCAT {
+    NODE node;
+
+    struct RNode *nd_head;
+    struct RNode *nd_body;
+} rb_node_argscat_t;
+
+typedef struct RNode_ARGSPUSH {
+    NODE node;
+
+    struct RNode *nd_head;
+    struct RNode *nd_body;
+} rb_node_argspush_t;
+
+typedef struct RNode_SPLAT {
+    NODE node;
+
+    struct RNode *nd_head;
+    rb_code_location_t operator_loc;
+} rb_node_splat_t;
+
+typedef struct RNode_BLOCK_PASS {
+    NODE node;
+
+    struct RNode *nd_head;
+    struct RNode *nd_body;
+    unsigned int forwarding: 1;
+    rb_code_location_t operator_loc;
+} rb_node_block_pass_t;
+
+typedef struct RNode_DEFN {
+    NODE node;
+
+    ID nd_mid;
+    struct RNode *nd_defn;
+} rb_node_defn_t;
+
+typedef struct RNode_DEFS {
+    NODE node;
+
+    struct RNode *nd_recv;
+    ID nd_mid;
+    struct RNode *nd_defn;
+} rb_node_defs_t;
+
+typedef struct RNode_ALIAS {
+    NODE node;
+
+    struct RNode *nd_1st;
+    struct RNode *nd_2nd;
+    rb_code_location_t keyword_loc;
+} rb_node_alias_t;
+
+typedef struct RNode_VALIAS {
+    NODE node;
+
+    ID nd_alias;
+    ID nd_orig;
+    rb_code_location_t keyword_loc;
+} rb_node_valias_t;
+
+typedef struct RNode_UNDEF {
+    NODE node;
+
+    rb_parser_ary_t *nd_undefs;
+    rb_code_location_t keyword_loc;
+} rb_node_undef_t;
+
+typedef struct RNode_CLASS {
+    NODE node;
+
+    struct RNode *nd_cpath;
+    struct RNode *nd_body;
+    struct RNode *nd_super;
+    rb_code_location_t class_keyword_loc;
+    rb_code_location_t inheritance_operator_loc;
+    rb_code_location_t end_keyword_loc;
+} rb_node_class_t;
+
+typedef struct RNode_MODULE {
+    NODE node;
+
+    struct RNode *nd_cpath;
+    struct RNode *nd_body;
+} rb_node_module_t;
+
+typedef struct RNode_SCLASS {
+    NODE node;
+
+    struct RNode *nd_recv;
+    struct RNode *nd_body;
+} rb_node_sclass_t;
+
+typedef struct RNode_COLON2 {
+    NODE node;
+
+    struct RNode *nd_head;
+    ID nd_mid;
+    rb_code_location_t delimiter_loc;
+    rb_code_location_t name_loc;
+} rb_node_colon2_t;
+
+typedef struct RNode_COLON3 {
+    NODE node;
+
+    ID nd_mid;
+    rb_code_location_t delimiter_loc;
+    rb_code_location_t name_loc;
+} rb_node_colon3_t;
+
+/* NODE_DOT2, NODE_DOT3, NODE_FLIP2, NODE_FLIP3 */
+typedef struct RNode_DOTS {
+    NODE node;
+
+    struct RNode *nd_beg;
+    struct RNode *nd_end;
+    rb_code_location_t operator_loc;
+} rb_node_dot2_t, rb_node_dot3_t, rb_node_flip2_t, rb_node_flip3_t;
+
+typedef struct RNode_SELF {
+    NODE node;
+
+    long nd_state; /* Default 1. See NEW_SELF. */
+} rb_node_self_t;
+
+typedef struct RNode_NIL {
+    NODE node;
+} rb_node_nil_t;
+
+typedef struct RNode_TRUE {
+    NODE node;
+} rb_node_true_t;
+
+typedef struct RNode_FALSE {
+    NODE node;
+} rb_node_false_t;
+
+typedef struct RNode_ERRINFO {
+    NODE node;
+} rb_node_errinfo_t;
+
+typedef struct RNode_DEFINED {
+    NODE node;
+
+    struct RNode *nd_head;
+} rb_node_defined_t;
+
+typedef struct RNode_POSTEXE {
+    NODE node;
+
+    struct RNode *nd_body;
+    rb_code_location_t keyword_loc;
+    rb_code_location_t opening_loc;
+    rb_code_location_t closing_loc;
+} rb_node_postexe_t;
+
+typedef struct RNode_SYM {
+    NODE node;
+
+    struct rb_parser_string *string;
+} rb_node_sym_t;
+
+typedef rb_node_dstr_t rb_node_dsym_t;
+
+typedef struct RNode_ATTRASGN {
+    NODE node;
+
+    struct RNode *nd_recv;
+    ID nd_mid;
+    struct RNode *nd_args;
+} rb_node_attrasgn_t;
+
+typedef struct RNode_LAMBDA {
+    NODE node;
+
+    struct RNode *nd_body;
+    rb_code_location_t operator_loc;
+    rb_code_location_t opening_loc;
+    rb_code_location_t closing_loc;
+} rb_node_lambda_t;
+
+typedef struct RNode_ARYPTN {
+    NODE node;
+
+    struct RNode *nd_pconst;
     NODE *pre_args;
     NODE *rest_arg;
     NODE *post_args;
-};
+} rb_node_aryptn_t;
+
+typedef struct RNode_HSHPTN {
+    NODE node;
+
+    struct RNode *nd_pconst;
+    struct RNode *nd_pkwargs;
+    struct RNode *nd_pkwrestarg;
+} rb_node_hshptn_t;
+
+typedef struct RNode_FNDPTN {
+    NODE node;
 
-struct rb_fnd_pattern_info {
+    struct RNode *nd_pconst;
     NODE *pre_rest_arg;
     NODE *args;
     NODE *post_rest_arg;
-};
+} rb_node_fndptn_t;
+
+typedef struct RNode_LINE {
+    NODE node;
+} rb_node_line_t;
+
+typedef struct RNode_FILE {
+    NODE node;
+
+    struct rb_parser_string *path;
+} rb_node_file_t;
+
+typedef struct RNode_ENCODING {
+    NODE node;
+    rb_encoding *enc;
+} rb_node_encoding_t;
+
+typedef struct RNode_ERROR {
+    NODE node;
+} rb_node_error_t;
+
+#define RNODE(obj)  ((NODE *)(obj))
+
+#define RNODE_SCOPE(node) ((rb_node_scope_t *)(node))
+#define RNODE_BLOCK(node) ((rb_node_block_t *)(node))
+#define RNODE_IF(node) ((rb_node_if_t *)(node))
+#define RNODE_UNLESS(node) ((rb_node_unless_t *)(node))
+#define RNODE_CASE(node) ((rb_node_case_t *)(node))
+#define RNODE_CASE2(node) ((rb_node_case2_t *)(node))
+#define RNODE_CASE3(node) ((rb_node_case3_t *)(node))
+#define RNODE_WHEN(node) ((rb_node_when_t *)(node))
+#define RNODE_IN(node) ((rb_node_in_t *)(node))
+#define RNODE_WHILE(node) ((rb_node_while_t *)(node))
+#define RNODE_UNTIL(node) ((rb_node_until_t *)(node))
+#define RNODE_ITER(node) ((rb_node_iter_t *)(node))
+#define RNODE_FOR(node) ((rb_node_for_t *)(node))
+#define RNODE_FOR_MASGN(node) ((rb_node_for_masgn_t *)(node))
+#define RNODE_BREAK(node) ((rb_node_break_t *)(node))
+#define RNODE_NEXT(node) ((rb_node_next_t *)(node))
+#define RNODE_REDO(node) ((rb_node_redo_t *)(node))
+#define RNODE_RETRY(node) ((rb_node_retry_t *)(node))
+#define RNODE_BEGIN(node) ((rb_node_begin_t *)(node))
+#define RNODE_RESCUE(node) ((rb_node_rescue_t *)(node))
+#define RNODE_RESBODY(node) ((rb_node_resbody_t *)(node))
+#define RNODE_ENSURE(node) ((rb_node_ensure_t *)(node))
+#define RNODE_AND(node) ((rb_node_and_t *)(node))
+#define RNODE_OR(node) ((rb_node_or_t *)(node))
+#define RNODE_MASGN(node) ((rb_node_masgn_t *)(node))
+#define RNODE_LASGN(node) ((rb_node_lasgn_t *)(node))
+#define RNODE_DASGN(node) ((rb_node_dasgn_t *)(node))
+#define RNODE_GASGN(node) ((rb_node_gasgn_t *)(node))
+#define RNODE_IASGN(node) ((rb_node_iasgn_t *)(node))
+#define RNODE_CDECL(node) ((rb_node_cdecl_t *)(node))
+#define RNODE_CVASGN(node) ((rb_node_cvasgn_t *)(node))
+#define RNODE_OP_ASGN1(node) ((rb_node_op_asgn1_t *)(node))
+#define RNODE_OP_ASGN2(node) ((rb_node_op_asgn2_t *)(node))
+#define RNODE_OP_ASGN_AND(node) ((rb_node_op_asgn_and_t *)(node))
+#define RNODE_OP_ASGN_OR(node) ((rb_node_op_asgn_or_t *)(node))
+#define RNODE_OP_CDECL(node) ((rb_node_op_cdecl_t *)(node))
+#define RNODE_CALL(node) ((rb_node_call_t *)(node))
+#define RNODE_OPCALL(node) ((rb_node_opcall_t *)(node))
+#define RNODE_FCALL(node) ((rb_node_fcall_t *)(node))
+#define RNODE_VCALL(node) ((rb_node_vcall_t *)(node))
+#define RNODE_QCALL(node) ((rb_node_qcall_t *)(node))
+#define RNODE_SUPER(node) ((rb_node_super_t *)(node))
+#define RNODE_ZSUPER(node) ((rb_node_zsuper_t *)(node))
+#define RNODE_LIST(node) ((rb_node_list_t *)(node))
+#define RNODE_ZLIST(node) ((rb_node_zlist_t *)(node))
+#define RNODE_HASH(node) ((rb_node_hash_t *)(node))
+#define RNODE_RETURN(node) ((rb_node_return_t *)(node))
+#define RNODE_YIELD(node) ((rb_node_yield_t *)(node))
+#define RNODE_LVAR(node) ((rb_node_lvar_t *)(node))
+#define RNODE_DVAR(node) ((rb_node_dvar_t *)(node))
+#define RNODE_GVAR(node) ((rb_node_gvar_t *)(node))
+#define RNODE_IVAR(node) ((rb_node_ivar_t *)(node))
+#define RNODE_CONST(node) ((rb_node_const_t *)(node))
+#define RNODE_CVAR(node) ((rb_node_cvar_t *)(node))
+#define RNODE_NTH_REF(node) ((rb_node_nth_ref_t *)(node))
+#define RNODE_BACK_REF(node) ((rb_node_back_ref_t *)(node))
+#define RNODE_MATCH(node) ((rb_node_match_t *)(node))
+#define RNODE_MATCH2(node) ((rb_node_match2_t *)(node))
+#define RNODE_MATCH3(node) ((rb_node_match3_t *)(node))
+#define RNODE_INTEGER(node) ((rb_node_integer_t *)(node))
+#define RNODE_FLOAT(node) ((rb_node_float_t *)(node))
+#define RNODE_RATIONAL(node) ((rb_node_rational_t *)(node))
+#define RNODE_IMAGINARY(node) ((rb_node_imaginary_t *)(node))
+#define RNODE_STR(node) ((rb_node_str_t *)(node))
+#define RNODE_DSTR(node) ((rb_node_dstr_t *)(node))
+#define RNODE_XSTR(node) ((rb_node_xstr_t *)(node))
+#define RNODE_DXSTR(node) ((rb_node_dxstr_t *)(node))
+#define RNODE_EVSTR(node) ((rb_node_evstr_t *)(node))
+#define RNODE_REGX(node) ((rb_node_regx_t *)(node))
+#define RNODE_DREGX(node) ((rb_node_dregx_t *)(node))
+#define RNODE_ONCE(node) ((rb_node_once_t *)(node))
+#define RNODE_ARGS(node) ((rb_node_args_t *)(node))
+#define RNODE_ARGS_AUX(node) ((rb_node_args_aux_t *)(node))
+#define RNODE_OPT_ARG(node) ((rb_node_opt_arg_t *)(node))
+#define RNODE_KW_ARG(node) ((rb_node_kw_arg_t *)(node))
+#define RNODE_POSTARG(node) ((rb_node_postarg_t *)(node))
+#define RNODE_ARGSCAT(node) ((rb_node_argscat_t *)(node))
+#define RNODE_ARGSPUSH(node) ((rb_node_argspush_t *)(node))
+#define RNODE_SPLAT(node) ((rb_node_splat_t *)(node))
+#define RNODE_BLOCK_PASS(node) ((rb_node_block_pass_t *)(node))
+#define RNODE_DEFN(node) ((rb_node_defn_t *)(node))
+#define RNODE_DEFS(node) ((rb_node_defs_t *)(node))
+#define RNODE_ALIAS(node) ((rb_node_alias_t *)(node))
+#define RNODE_VALIAS(node) ((rb_node_valias_t *)(node))
+#define RNODE_UNDEF(node) ((rb_node_undef_t *)(node))
+#define RNODE_CLASS(node) ((rb_node_class_t *)(node))
+#define RNODE_MODULE(node) ((rb_node_module_t *)(node))
+#define RNODE_SCLASS(node) ((rb_node_sclass_t *)(node))
+#define RNODE_COLON2(node) ((rb_node_colon2_t *)(node))
+#define RNODE_COLON3(node) ((rb_node_colon3_t *)(node))
+#define RNODE_DOT2(node) ((rb_node_dot2_t *)(node))
+#define RNODE_DOT3(node) ((rb_node_dot3_t *)(node))
+#define RNODE_FLIP2(node) ((rb_node_flip2_t *)(node))
+#define RNODE_FLIP3(node) ((rb_node_flip3_t *)(node))
+#define RNODE_SELF(node) ((rb_node_self_t *)(node))
+#define RNODE_NIL(node) ((rb_node_nil_t *)(node))
+#define RNODE_TRUE(node) ((rb_node_true_t *)(node))
+#define RNODE_FALSE(node) ((rb_node_false_t *)(node))
+#define RNODE_ERRINFO(node) ((rb_node_errinfo_t *)(node))
+#define RNODE_DEFINED(node) ((rb_node_defined_t *)(node))
+#define RNODE_POSTEXE(node) ((rb_node_postexe_t *)(node))
+#define RNODE_SYM(node) ((rb_node_sym_t *)(node))
+#define RNODE_DSYM(node) ((rb_node_dsym_t *)(node))
+#define RNODE_ATTRASGN(node) ((rb_node_attrasgn_t *)(node))
+#define RNODE_LAMBDA(node) ((rb_node_lambda_t *)(node))
+#define RNODE_ARYPTN(node) ((rb_node_aryptn_t *)(node))
+#define RNODE_HSHPTN(node) ((rb_node_hshptn_t *)(node))
+#define RNODE_FNDPTN(node) ((rb_node_fndptn_t *)(node))
+#define RNODE_LINE(node) ((rb_node_line_t *)(node))
+#define RNODE_FILE(node) ((rb_node_file_t *)(node))
+#define RNODE_ENCODING(node) ((rb_node_encoding_t *)(node))
+
+/* FL     : 0..4: T_TYPES, 5: KEEP_WB, 6: PROMOTED, 7: FINALIZE, 8..10: UNUSED, 11: FREEZE */
+/* NODE_FL: 0..4: UNUSED,  5: UNUSED,  6: UNUSED,   7: NODE_FL_NEWLINE,
+ *          8..14: nd_type,
+ *          15..: nd_line
+ */
+#define NODE_FL_NEWLINE              (((VALUE)1)<<7)
+
+#define NODE_TYPESHIFT 8
+#define NODE_TYPEMASK  (((VALUE)0x7f)<<NODE_TYPESHIFT)
+
+#define nd_fl_newline(n) ((n)->flags & NODE_FL_NEWLINE)
+#define nd_set_fl_newline(n) ((n)->flags |= NODE_FL_NEWLINE)
+#define nd_unset_fl_newline(n) ((n)->flags &= ~NODE_FL_NEWLINE)
+
+#define nd_type(n) ((int) ((RNODE(n)->flags & NODE_TYPEMASK)>>NODE_TYPESHIFT))
+#define nd_set_type(n,t) \
+    rb_node_set_type(n, t)
+#define nd_init_type(n,t) \
+    (n)->flags=(((n)->flags&~NODE_TYPEMASK)|((((unsigned long)(t))<<NODE_TYPESHIFT)&NODE_TYPEMASK))
 
 typedef struct node_buffer_struct node_buffer_t;
-/* T_IMEMO/ast */
+
+#ifdef UNIVERSAL_PARSER
+typedef struct rb_parser_config_struct rb_parser_config_t;
+#endif
+
 typedef struct rb_ast_body_struct {
     const NODE *root;
-    VALUE script_lines;
-    // script_lines is either:
-    // - a Fixnum that represents the line count of the original source, or
-    // - an Array that contains the lines of the original source
+    rb_parser_ary_t *script_lines;
+    int line_count;
     signed int frozen_string_literal:2; /* -1: not specified, 0: false, 1: true */
     signed int coverage_enabled:2; /* -1: not specified, 0: false, 1: true */
 } rb_ast_body_t;
 typedef struct rb_ast_struct {
-    VALUE flags;
     node_buffer_t *node_buffer;
     rb_ast_body_t body;
+#ifdef UNIVERSAL_PARSER
+    const rb_parser_config_t *config;
+#endif
 } rb_ast_t;
 
 
@@ -337,16 +1210,10 @@ typedef struct parser_params rb_parser_t;
 typedef struct rb_imemo_tmpbuf_struct rb_imemo_tmpbuf_t;
 #endif
 
+typedef NODE *(*rb_parser_assignable_func)(struct parser_params *p, ID id, NODE *val, const rb_code_location_t *loc);
+
 #ifdef UNIVERSAL_PARSER
 typedef struct rb_parser_config_struct {
-    /*
-     * Reference counter.
-     *   This is needed because both parser and ast refer
-     *   same config pointer.
-     *   We can remove this, once decuple parser and ast from Ruby GC.
-     */
-    int counter;
-
     /* Memory */
     void *(*malloc)(size_t size);
     void *(*calloc)(size_t number, size_t size);
@@ -360,49 +1227,18 @@ typedef struct rb_parser_config_struct {
     void *(*nonempty_memcpy)(void *dest, const void *src, size_t t, size_t n);
     void *(*xmalloc_mul_add)(size_t x, size_t y, size_t z);
 
-    /* imemo */
-    // TODO: Should it return `rb_strterm_t *'?
-    VALUE (*new_strterm)(VALUE v1, VALUE v2, VALUE v3, VALUE v0, int heredoc);
-    int (*strterm_is_heredoc)(VALUE strterm);
-    VALUE (*tmpbuf_auto_free_pointer)(void);
-    void *(*tmpbuf_set_ptr)(VALUE v, void *ptr);
-    rb_imemo_tmpbuf_t *(*tmpbuf_parser_heap)(void *buf, rb_imemo_tmpbuf_t *old_heap, size_t cnt);
-    rb_ast_t *(*ast_new)(VALUE nb);
-
     // VALUE rb_suppress_tracing(VALUE (*func)(VALUE), VALUE arg);
     VALUE (*compile_callback)(VALUE (*func)(VALUE), VALUE arg);
-    NODE *(*reg_named_capture_assign)(struct parser_params* p, VALUE regexp, const rb_code_location_t *loc);
-
-    /* Object */
-    VALUE (*obj_freeze)(VALUE obj);
-    VALUE (*obj_hide)(VALUE obj);
-    int (*obj_frozen)(VALUE obj);
-    int (*type_p)(VALUE, int);
-    void (*obj_freeze_raw)(VALUE obj);
-
-    int (*fixnum_p)(VALUE);
-    int (*symbol_p)(VALUE);
+    NODE *(*reg_named_capture_assign)(struct parser_params* p, VALUE regexp, const rb_code_location_t *loc, rb_parser_assignable_func assignable);
 
     /* Variable */
     VALUE (*attr_get)(VALUE obj, ID id);
 
     /* Array */
-    VALUE (*ary_new)(void);
-    VALUE (*ary_push)(VALUE ary, VALUE elem);
     VALUE (*ary_new_from_args)(long n, ...);
-    VALUE (*ary_pop)(VALUE ary);
-    VALUE (*ary_last)(int argc, const VALUE *argv, VALUE ary);
     VALUE (*ary_unshift)(VALUE ary, VALUE item);
-    VALUE (*ary_new2)(long capa); // ary_new_capa
-    VALUE (*ary_entry)(VALUE ary, long offset);
-    VALUE (*ary_join)(VALUE ary, VALUE sep);
-    VALUE (*ary_reverse)(VALUE ary);
-    VALUE (*ary_clear)(VALUE ary);
-    long (*array_len)(VALUE a);
-    VALUE (*array_aref)(VALUE, long);
 
     /* Symbol */
-    VALUE (*sym_intern_ascii_cstr)(const char *ptr);
     ID (*make_temporary_id)(size_t n);
     int (*is_local_id)(ID);
     int (*is_attrset_id)(ID);
@@ -415,86 +1251,35 @@ typedef struct rb_parser_config_struct {
     ID (*intern_str)(VALUE str);
     int (*is_notop_id)(ID);
     int (*enc_symname_type)(const char *name, long len, rb_encoding *enc, unsigned int allowed_attrset);
-    VALUE (*str_intern)(VALUE str);
     const char *(*id2name)(ID id);
     VALUE (*id2str)(ID id);
     VALUE (*id2sym)(ID x);
-    ID (*sym2id)(VALUE sym);
 
     /* String */
+    RBIMPL_ATTR_FORMAT(RBIMPL_PRINTF_FORMAT, 2, 3)
     VALUE (*str_catf)(VALUE str, const char *format, ...);
     VALUE (*str_cat_cstr)(VALUE str, const char *ptr);
-    VALUE (*str_subseq)(VALUE str, long beg, long len);
-    VALUE (*str_dup)(VALUE str);
-    VALUE (*str_new_frozen)(VALUE orig);
-    VALUE (*str_buf_new)(long capa);
-    VALUE (*str_buf_cat)(VALUE, const char*, long);
-    void (*str_modify)(VALUE str);
-    void (*str_set_len)(VALUE str, long len);
-    VALUE (*str_cat)(VALUE str, const char *ptr, long len);
     VALUE (*str_resize)(VALUE str, long len);
     VALUE (*str_new)(const char *ptr, long len);
     VALUE (*str_new_cstr)(const char *ptr);
-    VALUE (*fstring)(VALUE);
-    int (*is_ascii_string)(VALUE str);
+    VALUE (*str_to_interned_str)(VALUE);
     VALUE (*enc_str_new)(const char *ptr, long len, rb_encoding *enc);
-    VALUE (*enc_str_buf_cat)(VALUE str, const char *ptr, long len, rb_encoding *enc);
-    VALUE (*str_buf_append)(VALUE str, VALUE str2);
+    RBIMPL_ATTR_FORMAT(RBIMPL_PRINTF_FORMAT, 2, 0)
     VALUE (*str_vcatf)(VALUE str, const char *fmt, va_list ap);
-    char *(*string_value_cstr)(volatile VALUE *ptr);
+    RBIMPL_ATTR_FORMAT(RBIMPL_PRINTF_FORMAT, 1, 2)
     VALUE (*rb_sprintf)(const char *format, ...);
     char *(*rstring_ptr)(VALUE str);
-    char *(*rstring_end)(VALUE str);
     long (*rstring_len)(VALUE str);
-    VALUE (*filesystem_str_new_cstr)(const char *ptr);
-    VALUE (*obj_as_string)(VALUE);
-
-    /* Hash */
-    VALUE (*hash_clear)(VALUE hash);
-    VALUE (*hash_new)(void);
-    VALUE (*hash_aset)(VALUE hash, VALUE key, VALUE val);
-    VALUE (*hash_lookup)(VALUE hash, VALUE key);
-    VALUE (*ident_hash_new)(void);
-
-    /* Fixnum */
-    VALUE (*int2fix)(long i);
-
-    /* Bignum */
-    void (*bignum_negate)(VALUE b);
-    VALUE (*big_norm)(VALUE x);
-    VALUE (*cstr_to_inum)(const char *str, int base, int badcheck);
-
-    /* Float */
-    VALUE (*float_new)(double d);
-    double (*float_value)(VALUE v);
 
     /* Numeric */
-    int (*num2int)(VALUE val);
-    VALUE (*int_positive_pow)(long x, unsigned long y);
     VALUE (*int2num)(int v);
-    long (*fix2long)(VALUE val);
-
-    /* Rational */
-    VALUE (*rational_new)(VALUE x, VALUE y);
-    VALUE (*rational_raw1)(VALUE x);
-    void (*rational_set_num)(VALUE r, VALUE n);
-    VALUE (*rational_get_num)(VALUE obj);
-
-    /* Complex */
-    VALUE (*complex_raw)(VALUE x, VALUE y);
-    void (*rcomplex_set_real)(VALUE cmp, VALUE r);
-    void (*rcomplex_set_imag)(VALUE cmp, VALUE i);
-    VALUE (*rcomplex_get_real)(VALUE obj);
-    VALUE (*rcomplex_get_imag)(VALUE obj);
 
     /* IO */
     int (*stderr_tty_p)(void);
     void (*write_error_str)(VALUE mesg);
-    VALUE (*default_rs)(void);
     VALUE (*io_write)(VALUE io, VALUE str);
     VALUE (*io_flush)(VALUE io);
     VALUE (*io_puts)(int argc, const VALUE *argv, VALUE out);
-    VALUE (*io_gets_internal)(VALUE io);
 
     /* IO (Ractor) */
     VALUE (*debug_output_stdout)(void);
@@ -505,32 +1290,21 @@ typedef struct rb_parser_config_struct {
     int (*enc_isalnum)(OnigCodePoint c, rb_encoding *enc);
     int (*enc_precise_mbclen)(const char *p, const char *e, rb_encoding *enc);
     int (*mbclen_charfound_p)(int len);
+    int (*mbclen_charfound_len)(int len);
     const char *(*enc_name)(rb_encoding *enc);
     char *(*enc_prev_char)(const char *s, const char *p, const char *e, rb_encoding *enc);
     rb_encoding* (*enc_get)(VALUE obj);
     int (*enc_asciicompat)(rb_encoding *enc);
     rb_encoding *(*utf8_encoding)(void);
-    VALUE (*enc_associate)(VALUE obj, rb_encoding *enc);
     rb_encoding *(*ascii8bit_encoding)(void);
     int (*enc_codelen)(int c, rb_encoding *enc);
     int (*enc_mbcput)(unsigned int c, void *buf, rb_encoding *enc);
-    int (*char_to_option_kcode)(int c, int *option, int *kcode);
-    int (*ascii8bit_encindex)(void);
     int (*enc_find_index)(const char *name);
     rb_encoding *(*enc_from_index)(int idx);
-    VALUE (*enc_associate_index)(VALUE obj, int encindex);
     int (*enc_isspace)(OnigCodePoint c, rb_encoding *enc);
-    int enc_coderange_7bit;
-    int enc_coderange_unknown;
-    rb_encoding *(*enc_compatible)(VALUE str1, VALUE str2);
-    VALUE (*enc_from_encoding)(rb_encoding *enc);
-    int (*encoding_get)(VALUE obj);
-    void (*encoding_set)(VALUE obj, int encindex);
-    int (*encoding_is_ascii8bit)(VALUE obj);
-    rb_encoding *(*usascii_encoding)(void);
-
-    /* Ractor */
-    VALUE (*ractor_make_shareable)(VALUE obj);
+    int (*enc_mbminlen)(rb_encoding *enc);
+    bool (*enc_isascii)(OnigCodePoint c, rb_encoding *enc);
+    OnigCodePoint (*enc_mbc_to_codepoint)(const char *p, const char *e, rb_encoding *enc);
 
     /* Compile */
     // int rb_local_defined(ID id, const rb_iseq_t *iseq);
@@ -538,32 +1312,23 @@ typedef struct rb_parser_config_struct {
     // int rb_dvar_defined(ID id, const rb_iseq_t *iseq);
     int (*dvar_defined)(ID, const void*);
 
-    /* Compile (parse.y) */
-    int (*literal_cmp)(VALUE val, VALUE lit);
-    parser_st_index_t (*literal_hash)(VALUE a);
-
     /* Error (Exception) */
-    const char *(*builtin_class_name)(VALUE x);
+    RBIMPL_ATTR_FORMAT(RBIMPL_PRINTF_FORMAT, 6, 0)
     VALUE (*syntax_error_append)(VALUE, VALUE, int, int, rb_encoding*, const char*, va_list);
+    RBIMPL_ATTR_FORMAT(RBIMPL_PRINTF_FORMAT, 2, 3)
     void (*raise)(VALUE exc, const char *fmt, ...);
     VALUE (*syntax_error_new)(void);
 
     /* Eval */
     VALUE (*errinfo)(void);
     void (*set_errinfo)(VALUE err);
-    void (*exc_raise)(VALUE mesg);
     VALUE (*make_exception)(int argc, const VALUE *argv);
 
     /* GC */
     void (*sized_xfree)(void *x, size_t size);
     void *(*sized_realloc_n)(void *ptr, size_t new_count, size_t element_size, size_t old_count);
-    VALUE (*obj_write)(VALUE, VALUE *, VALUE);
-    VALUE (*obj_written)(VALUE, VALUE, VALUE);
-    void (*gc_register_mark_object)(VALUE object);
     void (*gc_guard)(VALUE);
     void (*gc_mark)(VALUE);
-    void (*gc_mark_movable)(VALUE ptr);
-    VALUE (*gc_location)(VALUE value);
 
     /* Re */
     VALUE (*reg_compile)(VALUE str, int options, const char *sourcefile, int sourceline);
@@ -571,11 +1336,12 @@ typedef struct rb_parser_config_struct {
     int (*memcicmp)(const void *x, const void *y, long len);
 
     /* Error */
-    void (*compile_warn)(const char *file, int line, const char *fmt, ...);
-    void (*compile_warning)(const char *file, int line, const char *fmt, ...);
-    void (*bug)(const char *fmt, ...);
-    void (*fatal)(const char *fmt, ...);
+    void (*compile_warn)(const char *file, int line, const char *fmt, ...) RUBYPARSER_ATTRIBUTE_FORMAT(3, 4);
+    void (*compile_warning)(const char *file, int line, const char *fmt, ...) RUBYPARSER_ATTRIBUTE_FORMAT(3, 4);
+    void (*bug)(const char *fmt, ...) RUBYPARSER_ATTRIBUTE_FORMAT(1, 2);
+    void (*fatal)(const char *fmt, ...) RUBYPARSER_ATTRIBUTE_FORMAT(1, 2);
     VALUE (*verbose)(void);
+    int *(*errno_ptr)(void);
 
     /* VM */
     VALUE (*make_backtrace)(void);
@@ -587,24 +1353,16 @@ typedef struct rb_parser_config_struct {
     double (*strtod)(const char *s00, char **se);
 
     /* Misc */
-    VALUE (*rbool)(VALUE);
-    int (*undef_p)(VALUE);
     int (*rtest)(VALUE obj);
     int (*nil_p)(VALUE obj);
-    int (*flonum_p)(VALUE obj);
     VALUE qnil;
-    VALUE qtrue;
     VALUE qfalse;
-    VALUE qundef;
-    VALUE eArgError;
-    VALUE mRubyVMFrozenCore;
+    VALUE (*eArgError)(void);
     int (*long2int)(long);
-    int (*special_const_p)(VALUE);
-    int (*builtin_type)(VALUE);
-
-    VALUE (*node_case_when_optimizable_literal)(const NODE *const node);
 
     /* For Ripper */
+    int enc_coderange_7bit;
+    int enc_coderange_unknown;
     VALUE (*static_id2sym)(ID id);
     long (*str_coderange_scan_restartable)(const char *s, const char *e, rb_encoding *enc, int *cr);
 } rb_parser_config_t;
@@ -615,14 +1373,12 @@ typedef struct rb_parser_config_struct {
 
 RUBY_SYMBOL_EXPORT_BEGIN
 void rb_ruby_parser_free(void *ptr);
-rb_ast_t* rb_ruby_parser_compile_string(rb_parser_t *p, const char *f, VALUE s, int line);
 
 #ifdef UNIVERSAL_PARSER
-rb_parser_config_t *rb_ruby_parser_config_new(void *(*malloc)(size_t size));
-void rb_ruby_parser_config_free(rb_parser_config_t *config);
-rb_parser_t *rb_ruby_parser_allocate(rb_parser_config_t *config);
-rb_parser_t *rb_ruby_parser_new(rb_parser_config_t *config);
+rb_parser_t *rb_ruby_parser_allocate(const rb_parser_config_t *config);
+rb_parser_t *rb_ruby_parser_new(const rb_parser_config_t *config);
 #endif
+
 RUBY_SYMBOL_EXPORT_END
 
 #endif /* RUBY_RUBYPARSER_H */
diff --git a/sample/drb/README.ja.rdoc b/sample/drb/README.ja.rdoc
deleted file mode 100644
index 1697b1b70416bc..00000000000000
--- a/sample/drb/README.ja.rdoc
+++ /dev/null
@@ -1,59 +0,0 @@
-= サンプルスクリプト
-
-* Arrayをリモートから利用してイテレータを試す。
-  * darray.rb --- server
-  * darrayc.rb --- client
-
-* 簡易チャット
-  * dchats.rb --- server
-  * dchatc.rb --- client
-
-* 分散chasen
-  * dhasen.rb --- server
-  * dhasenc.rb --- client
-
-* 簡易ログサーバ
-  * dlogd.rb --- server
-  * dlogc.rb --- client
-
-* Queueサーバ。
-  クライアントdqin.rbはQueueサーバの知らないオブジェクト(DQEntry)を
-  pushするがDRbUnknownによりクライアントdqout.rbがpopできる。
-  * dqueue.rb --- server
-  * dqin.rb --- client。DQEntryオブジェクトをpushする
-  * dqout.rb --- client。DQEntryオブジェクトをpopする
-  * dqlib.rb --- DQEntryを定義したライブラリ
-
-* 名前による参照
-  IdConvをカスタマイズしてidでなく名前で参照する例
-  * name.rb --- server
-  * namec.rb --- client
-
-* extservのサンプル
-  * extserv_test.rb
-
-* TimerIdConvの使用例
-  * holders.rb --- server。ruby -d hodlers.rbとするとTimerIdConvを使用する。
-  * holderc.rb --- client
-
-* rinda.rbの使用例
-  * rinda_ts.rb --- TupleSpaceサーバ。
-  * rindac.rb --- TupleSpaceのclientでアプリケーションのclient
-  * rindas.rb --- TupleSpaceのclientでアプリケーションのserver
-
-* observerの使用例
-  cdbiff - http://namazu.org/~satoru/cdbiff/
-  * dbiff.rb --- dcdbiff server
-  * dcdbiff.rb --- dcdbiff client
-
-* drbsslの使用例
-  * drbssl_s.rb
-  * drbssl_c.rb
-
-* DRbProtocolの追加例
-  * http0.rb
-  * http0serv.rb
-
-* ringの使用例
-  * ring_place.rb
-  * ring_echo.rb
diff --git a/sample/drb/README.rdoc b/sample/drb/README.rdoc
deleted file mode 100644
index e6b457bc5c170c..00000000000000
--- a/sample/drb/README.rdoc
+++ /dev/null
@@ -1,56 +0,0 @@
-= Sample scripts
-
-* array and iterator
-  * darray.rb --- server
-  * darrayc.rb --- client
-
-* simple chat
-  * dchats.rb --- server
-  * dchatc.rb --- client
-
-* distributed chasen (for Japanese)
-  * dhasen.rb --- server
-  * dhasenc.rb --- client
-
-* simple log server
-  * dlogd.rb --- server
-  * dlogc.rb --- client
-
-* Queue server, and DRbUnknown demo
-  * dqueue.rb --- server
-  * dqin.rb --- client. push DQEntry objects.
-  * dqout.rb --- client. pop DQEntry objects.
-  * dqlib.rb --- define DQEntry
-
-* IdConv customize demo: reference by name
-  * name.rb --- server
-  * namec.rb --- client
-
-* extserv
-  * extserv_test.rb
-
-* IdConv customize demo 2: using TimerIdConv
-  * holders.rb --- server
-  * holderc.rb --- client
-
-* rinda, remote tuplespace
-  * rinda_ts.rb --- TupleSpace server.
-  * rindas.rb --- provide simple service via TupleSpace.
-  * rindac.rb --- service user
-
-* observer
-  cdbiff - http://namazu.org/~satoru/cdbiff/
-  * dbiff.rb --- dcdbiff server
-  * dcdbiff.rb --- dcdbiff client
-
-* drbssl
-  * drbssl_s.rb
-  * drbssl_c.rb
-
-* add DRbProtocol
-  * http0.rb
-  * http0serv.rb
-
-* Rinda::Ring
-  * ring_place.rb
-  * ring_echo.rb
diff --git a/sample/drb/acl.rb b/sample/drb/acl.rb
deleted file mode 100644
index d93eb9c1fcd119..00000000000000
--- a/sample/drb/acl.rb
+++ /dev/null
@@ -1,15 +0,0 @@
-require 'drb/acl'
-
-list = %w(deny all
-          allow 192.168.1.1
-          allow ::ffff:192.168.1.2
-          allow 192.168.1.3
-)
-
-addr = ["AF_INET", 10, "lc630", "192.168.1.3"]
-
-acl = ACL.new
-p acl.allow_addr?(addr)
-
-acl = ACL.new(list, ACL::DENY_ALLOW)
-p acl.allow_addr?(addr)
diff --git a/sample/drb/darray.rb b/sample/drb/darray.rb
deleted file mode 100644
index d2ac39513f4a6d..00000000000000
--- a/sample/drb/darray.rb
+++ /dev/null
@@ -1,12 +0,0 @@
-=begin
- distributed Ruby --- Array
- 	Copyright (c) 1999-2001 Masatoshi SEKI
-=end
-
-require 'drb/drb'
-
-here = ARGV.shift
-DRb.start_service(here, [1, 2, "III", 4, "five", 6])
-puts DRb.uri
-DRb.thread.join
-
diff --git a/sample/drb/darrayc.rb b/sample/drb/darrayc.rb
deleted file mode 100644
index 579e11564e9f96..00000000000000
--- a/sample/drb/darrayc.rb
+++ /dev/null
@@ -1,47 +0,0 @@
-=begin
- distributed Ruby --- Array client
- 	Copyright (c) 1999-2001 Masatoshi SEKI
-=end
-
-require 'drb/drb'
-
-there = ARGV.shift || raise("usage: #{$0} <server_uri>")
-
-DRb.start_service(nil, nil)
-ro = DRbObject.new(nil, there)
-p ro.size
-
-puts "# collect"
-a = ro.collect { |x|
-  x + x
-}
-p a
-
-puts "# find"
-p ro.find { |x| x.kind_of? String }
-
-puts "# each, break"
-ro.each do |x|
-  next if x == "five"
-  puts x
-end
-
-puts "# each, break"
-ro.each do |x|
-  break if x == "five"
-  puts x
-end
-
-puts "# each, next"
-ro.each do |x|
-  next if x == "five"
-  puts x
-end
-
-puts "# each, redo"
-count = 0
-ro.each do |x|
-  count += 1
-  puts count
-  redo if count == 3
-end
diff --git a/sample/drb/dbiff.rb b/sample/drb/dbiff.rb
deleted file mode 100644
index 290eb1d28b55fe..00000000000000
--- a/sample/drb/dbiff.rb
+++ /dev/null
@@ -1,51 +0,0 @@
-#
-# dbiff.rb - distributed cdbiff (server)
-#  * original: cdbiff by Satoru Takabayashi <http://namazu.org/~satoru/cdbiff>
-
-require 'drb/drb'
-require 'drb/eq'
-require 'drb/observer'
-
-class Biff
-  include DRb::DRbObservable
-
-  def initialize(filename, interval)
-    super()
-    @filename = filename
-    @interval = interval
-  end
-
-  def run
-    last = Time.now
-    while true
-      begin
-        sleep(@interval)
-        current = File::mtime(@filename)
-        if current > last
-          changed
-          begin
-            notify_observers(@filename, current)
-          rescue Error
-          end
-          last = current
-        end
-      rescue
-        next
-      end
-    end
-  end
-end
-
-def main
-  filename = "/var/mail/#{ENV['USER']}"
-  interval = 15
-  uri = 'druby://:19903'
-
-  biff = Biff.new(filename, interval)
-
-  DRb.start_service(uri, biff)
-  biff.run
-end
-
-main
-
diff --git a/sample/drb/dcdbiff.rb b/sample/drb/dcdbiff.rb
deleted file mode 100644
index 6a24680c33fc56..00000000000000
--- a/sample/drb/dcdbiff.rb
+++ /dev/null
@@ -1,43 +0,0 @@
-#
-# dcdbiff.rb - distributed cdbiff (client)
-#  * original: cdbiff by Satoru Takabayashi <http://namazu.org/~satoru/cdbiff>
-
-require 'drb/drb'
-require 'drb/eq'
-
-class Notify
-  include DRbUndumped
-
-  def initialize(biff, command)
-    @biff = biff
-    @command = command
-
-    @biff.add_observer(self)
-  end
-
-  def update(filename, time)
-    p [filename, time] if $DEBUG
-    system(@command)
-  end
-
-  def done
-    begin
-      @biff.delete_observer(self)
-    rescue
-    end
-  end
-end
-
-def main
-  command = 'eject'
-  uri = 'druby://localhost:19903'
-
-  DRb.start_service
-  biff = DRbObject.new(nil, uri)
-  notify = Notify.new(biff, command)
-
-  trap("INT"){ notify.done }
-  DRb.thread.join
-end
-
-main
diff --git a/sample/drb/dchatc.rb b/sample/drb/dchatc.rb
deleted file mode 100644
index 2b8ddbf4cc649b..00000000000000
--- a/sample/drb/dchatc.rb
+++ /dev/null
@@ -1,41 +0,0 @@
-=begin
- distributed Ruby --- chat client
- 	Copyright (c) 1999-2000 Masatoshi SEKI
-=end
-
-require 'drb/drb'
-
-class ChatClient
-  include DRbUndumped
-
-  def initialize(name)
-    @name = name
-    @key = nil
-  end
-  attr_reader(:name)
-  attr_accessor(:key)
-
-  def message(there, str)
-    raise 'invalid key' unless @key == there
-    puts str
-  end
-end
-
-if __FILE__ == $0
-  begin
-    there = ARGV.shift
-    name = ARGV.shift
-    raise "usage" unless (there and name)
-  rescue
-    $stderr.puts("usage: #{$0} <server_uri> <your_name>")
-    exit 1
-  end
-  DRb.start_service
-  ro = DRbObject.new(nil, there)
-
-  chat = ChatClient.new(name)
-  entry = ro.add_member(chat)
-  while gets
-    entry.say($_)
-  end
-end
diff --git a/sample/drb/dchats.rb b/sample/drb/dchats.rb
deleted file mode 100644
index c96486a4527d97..00000000000000
--- a/sample/drb/dchats.rb
+++ /dev/null
@@ -1,69 +0,0 @@
-=begin
- distributed Ruby --- chat server
- 	Copyright (c) 1999-2000 Masatoshi SEKI
-=end
-require 'drb/drb'
-
-class ChatEntry
-  include DRbUndumped
-
-  def initialize(server, there)
-    @server = server
-    @there = there
-    @name = there.name
-    @key = there.key = Time.now
-  end
-  attr :name, true
-  attr :there
-
-  def say(str)
-    @server.distribute(@there, str)
-  end
-
-  def listen(str)
-    @there.message(@key, str)
-  end
-end
-
-
-class ChatServer
-  def initialize
-    @mutex = Thread::Mutex.new
-    @members = {}
-  end
-
-  def add_member(there)
-    client = ChatEntry.new(self, there)
-    @mutex.synchronize do
-      @members[there] = client
-    end
-    client
-  end
-
-  def distribute(there, str)
-    name = @members[there].name
-    msg = "<#{name}> #{str}"
-    msg2 = ">#{name}< #{str}"
-    @mutex.synchronize do
-      for m in @members.keys
-        begin
-          if m == there
-            @members[m].listen(msg2)
-           else
-            @members[m].listen(msg)
-          end
-        rescue
-          p $!
-          @members.delete(m)
-        end
-      end
-    end
-  end
-end
-
-if __FILE__ == $0
-  here = ARGV.shift
-  DRb.start_service(here, ChatServer.new)
-  puts DRb.uri
-  DRb.thread.join
-end
diff --git a/sample/drb/dhasen.rb b/sample/drb/dhasen.rb
deleted file mode 100644
index 13ff38940e7687..00000000000000
--- a/sample/drb/dhasen.rb
+++ /dev/null
@@ -1,41 +0,0 @@
-=begin
- distributed Ruby --- dRuby Sample Server --- chasen server
- 	Copyright (c) 1999-2001 Masatoshi SEKI
-=end
-
-=begin
- How to play.
-
- Terminal 1
- | % ruby dhasen.rb
- | druby://yourhost:7640
-
- Terminal 2
- | % ruby dhasenc.rb druby://yourhost:7640
-
-=end
-
-require 'drb/drb'
-require 'chasen'
-
-class Dhasen
-  include DRbUndumped
-
-  def initialize
-    @mutex = Thread::Mutex.new
-  end
-
-  def sparse(str, *arg)
-    @mutex.synchronize do
-      Chasen.getopt(*arg)
-      Chasen.sparse(str)
-    end
-  end
-end
-
-if __FILE__ == $0
-  DRb.start_service(nil, Dhasen.new)
-  puts DRb.uri
-  DRb.thread.join
-end
-
diff --git a/sample/drb/dhasenc.rb b/sample/drb/dhasenc.rb
deleted file mode 100644
index dddac9882cc970..00000000000000
--- a/sample/drb/dhasenc.rb
+++ /dev/null
@@ -1,14 +0,0 @@
-# -*- coding: utf-8 -*-
-=begin
- distributed Ruby --- dRuby Sample Client -- chasen client
- 	Copyright (c) 1999-2001 Masatoshi SEKI
-=end
-
-require 'drb/drb'
-
-there = ARGV.shift || raise("usage: #{$0} <server_uri>")
-DRb.start_service
-dhasen = DRbObject.new(nil, there)
-
-print dhasen.sparse("本日は、晴天なり。", "-F", '(%BB %m %M)\n', "-j")
-print dhasen.sparse("本日は、晴天なり。", "-F", '(%m %M)\n')
diff --git a/sample/drb/dlogc.rb b/sample/drb/dlogc.rb
deleted file mode 100644
index 3939a718271c74..00000000000000
--- a/sample/drb/dlogc.rb
+++ /dev/null
@@ -1,16 +0,0 @@
-=begin
- distributed Ruby --- Log test
- 	Copyright (c) 1999-2001 Masatoshi SEKI
-=end
-
-require 'drb/drb'
-
-there = ARGV.shift || raise("usage: #{$0} <server_uri>")
-
-DRb.start_service
-ro = DRbObject.new(nil, there)
-ro.log(123)
-ro.log("hello")
-sleep 2
-ro.log("wakeup")
-
diff --git a/sample/drb/dlogd.rb b/sample/drb/dlogd.rb
deleted file mode 100644
index a87e6603464a73..00000000000000
--- a/sample/drb/dlogd.rb
+++ /dev/null
@@ -1,38 +0,0 @@
-=begin
- distributed Ruby --- Log server
- 	Copyright (c) 1999-2000 Masatoshi SEKI
-=end
-
-require 'drb/drb'
-
-class Logger
-  def initialize(fname)
-    @fname = fname.to_s
-    @fp = File.open(@fname, "a+")
-    @queue = Thread::Queue.new
-    @th = Thread.new { self.flush }
-  end
-
-  def log(str)
-    @queue.push("#{Time.now}\t" + str.to_s)
-  end
-
-  def flush
-    begin
-      while(1)
-        @fp.puts(@queue.pop)
-        @fp.flush
-      end
-    ensure
-      @fp.close
-    end
-  end
-end
-
-if __FILE__ == $0
-  here = ARGV.shift
-  DRb.start_service(here, Logger.new('/usr/tmp/dlogd.log'))
-  puts DRb.uri
-  DRb.thread.join
-end
-
diff --git a/sample/drb/dqin.rb b/sample/drb/dqin.rb
deleted file mode 100644
index 4751335fff7c3e..00000000000000
--- a/sample/drb/dqin.rb
+++ /dev/null
@@ -1,13 +0,0 @@
-=begin
- distributed Ruby --- store
- 	Copyright (c) 1999-2000 Masatoshi SEKI
-=end
-
-require 'drb/drb'
-require 'dqlib'
-
-there = ARGV.shift || raise("usage: #{$0} <server_uri>")
-
-DRb.start_service
-queue = DRbObject.new(nil, there)
-queue.push(DQEntry.new(DRb.uri))
diff --git a/sample/drb/dqlib.rb b/sample/drb/dqlib.rb
deleted file mode 100644
index 75f2e6115b7829..00000000000000
--- a/sample/drb/dqlib.rb
+++ /dev/null
@@ -1,14 +0,0 @@
-class DQEntry
-  def initialize(name)
-    @name = name
-  end
-
-  def greeting
-    "Hello, This is #{@name}."
-  end
-  alias to_s greeting
-end
-
-if __FILE__ == $0
-  puts DQEntry.new('DQEntry')
-end
diff --git a/sample/drb/dqout.rb b/sample/drb/dqout.rb
deleted file mode 100644
index f2b0b4ac95a952..00000000000000
--- a/sample/drb/dqout.rb
+++ /dev/null
@@ -1,14 +0,0 @@
-=begin
- distributed Ruby --- fetch
- 	Copyright (c) 1999-2000 Masatoshi SEKI
-=end
-
-require 'drb/drb'
-require 'dqlib'
-
-there = ARGV.shift || raise("usage: #{$0} <server_uri>")
-
-DRb.start_service
-queue = DRbObject.new(nil, there)
-entry = queue.pop
-puts entry.greeting
diff --git a/sample/drb/dqueue.rb b/sample/drb/dqueue.rb
deleted file mode 100644
index a9afa8c8585ec8..00000000000000
--- a/sample/drb/dqueue.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-=begin
- distributed Ruby --- Queue
- 	Copyright (c) 1999-2000 Masatoshi SEKI
-=end
-
-require 'drb/drb'
-
-DRb.start_service(nil, Thread::Queue.new)
-puts DRb.uri
-DRb.thread.join
-
diff --git a/sample/drb/drbc.rb b/sample/drb/drbc.rb
deleted file mode 100644
index 50a86c39e8a111..00000000000000
--- a/sample/drb/drbc.rb
+++ /dev/null
@@ -1,45 +0,0 @@
-=begin
- distributed Ruby --- dRuby Sample Client
- 	Copyright (c) 1999-2000 Masatoshi SEKI
-=end
-
-require 'drb/drb'
-
-class DRbEx2
-  include DRbUndumped
-
-  def initialize(n)
-    @n = n
-  end
-
-  def to_i
-    @n.to_i
-  end
-end
-
-if __FILE__ == $0
-  there = ARGV.shift
-  unless there
-    $stderr.puts("usage: #{$0} <server_uri>")
-    exit 1
-  end
-
-  DRb.start_service()
-  ro = DRbObject.new_with_uri(there)
-
-  puts ro
-  p ro.to_a
-  puts ro.hello
-  p ro.hello
-  puts ro.sample(DRbEx2.new(1), 2, 3)
-  puts ro.sample(1, ro.sample(DRbEx2.new(1), 2, 3), DRbEx2.new(3))
-
-  begin
-    ro.err
-  rescue DRb::DRbUnknownError
-    p $!
-    p $!.unknown
-  rescue RuntimeError
-    p $!
-  end
-end
diff --git a/sample/drb/drbch.rb b/sample/drb/drbch.rb
deleted file mode 100644
index 07fdcd5fae1e67..00000000000000
--- a/sample/drb/drbch.rb
+++ /dev/null
@@ -1,48 +0,0 @@
-=begin
- distributed Ruby --- dRuby Sample Client
- 	Copyright (c) 1999-2000 Masatoshi SEKI
-=end
-
-require 'drb/drb'
-require 'drb/http'
-
-class DRbEx2
-  include DRbUndumped
-
-  def initialize(n)
-    @n = n
-  end
-
-  def to_i
-    @n.to_i
-  end
-end
-
-if __FILE__ == $0
-  there = ARGV.shift
-  unless there
-    $stderr.puts("usage: #{$0} <server_uri>")
-    exit 1
-  end
-
-  DRb::DRbConn.proxy_map['x68k'] = 'http://x68k/~mas/http_cgi.rb'
-
-  DRb.start_service()
-  ro = DRbObject.new(nil, there)
-
-  puts ro
-  p ro.to_a
-  puts ro.hello
-  p ro.hello
-  puts ro.sample(DRbEx2.new(1), 2, 3)
-  puts ro.sample(1, ro.sample(DRbEx2.new(1), 2, 3), DRbEx2.new(3))
-
-  begin
-    ro.err
-  rescue DRb::DRbUnknownError
-    p $!
-    p $!.unknown
-  rescue RuntimeError
-    p $!
-  end
-end
diff --git a/sample/drb/drbm.rb b/sample/drb/drbm.rb
deleted file mode 100644
index 3390608cd1889f..00000000000000
--- a/sample/drb/drbm.rb
+++ /dev/null
@@ -1,60 +0,0 @@
-=begin
- multiple DRbServer
- 	Copyright (c) 1999-2002 Masatoshi SEKI
-=end
-
-=begin
- How to play.
-
- Terminal 1
- | % ruby drbm.rb
- | druby://yourhost:7640 druby://yourhost:7641
-
- Terminal 2
- | % ruby drbmc.rb druby://yourhost:7640 druby://yourhost:7641
- | [#<DRb::DRbObject .... @uri="druby://yourhost:7640">, "FOO"]
- | [#<DRb::DRbObject .... @uri="druby://yourhost:7641">, "FOO"]
-
-=end
-
-require 'drb/drb'
-
-class Hoge
-  include DRbUndumped
-  def initialize(s)
-    @str = s
-  end
-
-  def to_s
-    @str
-  end
-end
-
-class Foo
-  def initialize(s='FOO')
-    @hoge = Hoge.new(s)
-  end
-
-  def hello
-    @hoge
-  end
-end
-
-class Bar < Foo
-  def initialize(foo)
-    @hoge = foo.hello
-  end
-end
-
-
-if __FILE__ == $0
-  foo = Foo.new
-  s1 = DRb::DRbServer.new('druby://:7640', foo)
-  s2 = DRb::DRbServer.new('druby://:7641', Bar.new(foo))
-
-  puts "#{s1.uri} #{s2.uri}"
-
-  s1.thread.join
-  s2.thread.join
-end
-
diff --git a/sample/drb/drbmc.rb b/sample/drb/drbmc.rb
deleted file mode 100644
index fd191401e6d40b..00000000000000
--- a/sample/drb/drbmc.rb
+++ /dev/null
@@ -1,22 +0,0 @@
-=begin
-  multiple DRbServer client
- 	Copyright (c) 1999-2002 Masatoshi SEKI
-=end
-
-require 'drb/drb'
-
-if __FILE__ == $0
-  s1 = ARGV.shift
-  s2 = ARGV.shift
-  unless s1 && s2
-    $stderr.puts("usage: #{$0} <server_uri1> <server_uri2>")
-    exit 1
-  end
-
-  DRb.start_service()
-  r1 = DRbObject.new(nil, s1)
-  r2 = DRbObject.new(nil, s2)
-
-  p [r1.hello, r1.hello.to_s]
-  p [r2.hello, r2.hello.to_s]
-end
diff --git a/sample/drb/drbs-acl.rb b/sample/drb/drbs-acl.rb
deleted file mode 100644
index 71c4f7bf428364..00000000000000
--- a/sample/drb/drbs-acl.rb
+++ /dev/null
@@ -1,51 +0,0 @@
-=begin
- distributed Ruby --- dRuby Sample Server
- 	Copyright (c) 1999-2000 Masatoshi SEKI
-=end
-
-=begin
- How to play.
-
- Terminal 1
- | % ruby drbs.rb
- | druby://yourhost:7640
-
- Terminal 2
- | % ruby drbc.rb druby://yourhost:7640
- | "hello"
- | 6
- | 10
-
-=end
-
-require 'drb/drb'
-require 'acl'
-
-class DRbEx
-  def initialize
-    @hello = 'hello'
-  end
-
-  def hello
-    info = Thread.current['DRb']
-    p info['socket'].peeraddr if info
-    @hello
-  end
-
-  def sample(a, b, c)
-    a.to_i + b.to_i + c.to_i
-  end
-end
-
-if __FILE__ == $0
-  acl = ACL.new(%w(deny all
-                   allow 192.168.1.*
-                   allow localhost))
-
-  DRb.install_acl(acl)
-
-  DRb.start_service(nil, DRbEx.new)
-  puts DRb.uri
-  DRb.thread.join
-end
-
diff --git a/sample/drb/drbs.rb b/sample/drb/drbs.rb
deleted file mode 100644
index 5a913d9918bd4b..00000000000000
--- a/sample/drb/drbs.rb
+++ /dev/null
@@ -1,64 +0,0 @@
-=begin
- distributed Ruby --- dRuby Sample Server
- 	Copyright (c) 1999-2000,2002 Masatoshi SEKI
-=end
-
-=begin
- How to play.
-
- Terminal 1
- | % ruby drbs.rb
- | druby://yourhost:7640
-
- Terminal 2
- | % ruby drbc.rb druby://yourhost:7640
- | "hello"
- | ....
-
-=end
-
-require 'drb/drb'
-
-class DRbEx
-  include DRbUndumped
-
-  def initialize
-    @hello = 'hello'
-  end
-
-  def hello
-    cntxt = Thread.current['DRb']
-    if cntxt
-      p cntxt['server'].uri
-      p cntxt['client'].peeraddr
-    end
-    Foo::Unknown.new
-  end
-
-  def err
-    raise FooError
-  end
-
-  def sample(a, b, c)
-    a.to_i + b.to_i + c.to_i
-  end
-end
-
-class Foo
-  class Unknown
-  end
-end
-
-class FooError < RuntimeError
-end
-
-if __FILE__ == $0
-  DRb.start_service(ARGV.shift || 'druby://:7640', DRbEx.new)
-  puts DRb.uri
-  Thread.new do
-    sleep 10
-    DRb.stop_service
-  end
-  DRb.thread.join
-end
-
diff --git a/sample/drb/drbssl_c.rb b/sample/drb/drbssl_c.rb
deleted file mode 100644
index 65112f6e7872a8..00000000000000
--- a/sample/drb/drbssl_c.rb
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/usr/bin/env ruby
-
-require 'drb'
-require 'drb/ssl'
-
-there = ARGV.shift || "drbssl://localhost:3456"
-
-config = Hash.new
-config[:SSLVerifyMode] = OpenSSL::SSL::VERIFY_PEER
-config[:SSLVerifyCallback] = lambda{|ok,x509_store|
-  p [ok, x509_store.error_string]
-  true
-}
-
-DRb.start_service(nil,nil,config)
-h = DRbObject.new(nil, there)
-while line = gets
-  p h.hello(line.chomp)
-end
diff --git a/sample/drb/drbssl_s.rb b/sample/drb/drbssl_s.rb
deleted file mode 100644
index 4d96f591d4edf4..00000000000000
--- a/sample/drb/drbssl_s.rb
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/usr/bin/env ruby
-
-require 'drb'
-require 'drb/ssl'
-
-here = ARGV.shift || "drbssl://localhost:3456"
-
-class HelloWorld
-  include DRbUndumped
-
-  def hello(name)
-    "Hello, #{name}."
-  end
-end
-
-config = Hash.new
-config[:verbose] = true
-begin
-  data = open("sample.key"){|io| io.read }
-  config[:SSLPrivateKey] = OpenSSL::PKey::RSA.new(data)
-  data = open("sample.crt"){|io| io.read }
-  config[:SSLCertificate] = OpenSSL::X509::Certificate.new(data)
-rescue
-  $stderr.puts "Switching to use self-signed certificate"
-  config[:SSLCertName] =
-    [ ["C","JP"], ["O","Foo.DRuby.Org"], ["CN", "Sample"] ]
-end
-
-DRb.start_service(here, HelloWorld.new, config)
-puts DRb.uri
-DRb.thread.join
diff --git a/sample/drb/extserv_test.rb b/sample/drb/extserv_test.rb
deleted file mode 100644
index 2c4f485dc67b45..00000000000000
--- a/sample/drb/extserv_test.rb
+++ /dev/null
@@ -1,80 +0,0 @@
-=begin
- dRuby sample
- 	Copyright (c) 2000 Masatoshi SEKI
-
-= How to play
-
-* Terminal 1
-
-  % ruby -I. extserv_test.rb server
-  druby://yourhost:12345
-
-* Terminal 2
-
-  % ruby -I. extserv_test.rb druby://yourhost:12345
-  ...
-
-=end
-
-require 'drb/drb'
-
-def ARGV.shift
-  it = super()
-  raise "usage:\nserver: #{$0} server [<uri>]\nclient: #{$0} [quit] <uri>" unless it
-  it
-end
-
-class Foo
-  include DRbUndumped
-
-  def initialize(str)
-    @str = str
-  end
-
-  def hello(it)
-    "#{it}: #{self}"
-  end
-
-  def to_s
-    @str
-  end
-end
-
-cmd = ARGV.shift
-case cmd
-when 'itest1', 'itest2'
-  require 'drb/extserv'
-
-  front = Foo.new(cmd)
-  server = DRb::DRbServer.new(nil, front)
-  es = DRb::ExtServ.new(ARGV.shift, ARGV.shift, server)
-  server.thread.join
-
-when 'server'
-  require 'drb/extservm'
-
-  DRb::ExtServManager.command['itest1'] = "ruby -I. #{$0} itest1"
-  DRb::ExtServManager.command['itest2'] = "ruby -I. #{$0} itest2"
-
-  s = DRb::ExtServManager.new
-  DRb.start_service(ARGV.shift, s)
-  puts DRb.uri
-  DRb.thread.join
-
-
-else
-  uri = (cmd == 'quit') ? ARGV.shift : cmd
-
-  DRb.start_service
-  s = DRbObject.new(nil, uri)
-  t1 = s.service('itest1').front
-  puts t1
-  t2 = s.service('itest2').front
-  puts t2
-  puts t1.hello(t2)
-  if (cmd == 'quit')
-    s.service('itest1').stop_service
-    s.service('itest2').stop_service
-  end
-end
-
diff --git a/sample/drb/gw_ct.rb b/sample/drb/gw_ct.rb
deleted file mode 100644
index 062278401839c3..00000000000000
--- a/sample/drb/gw_ct.rb
+++ /dev/null
@@ -1,29 +0,0 @@
-require 'drb/drb'
-
-class Foo
-  include DRbUndumped
-
-  def foo(n)
-    n + n
-  end
-
-  def bar(n)
-    yield(n) + yield(n)
-  end
-end
-
-DRb.start_service(nil)
-puts DRb.uri
-
-ro = DRbObject.new(nil, ARGV.shift)
-ro[:tcp] = Foo.new
-gets
-
-it = ro[:unix]
-p [it, it.foo(1)]
-gets
-
-p it.bar('2') {|n| n * 3}
-gets
-
-
diff --git a/sample/drb/gw_cu.rb b/sample/drb/gw_cu.rb
deleted file mode 100644
index 8079cbdc4fd6fb..00000000000000
--- a/sample/drb/gw_cu.rb
+++ /dev/null
@@ -1,28 +0,0 @@
-require 'drb/drb'
-require 'drb/unix'
-
-class Foo
-  include DRbUndumped
-
-  def foo(n)
-    n + n
-  end
-
-  def bar(n)
-    yield(n) + yield(n)
-  end
-end
-
-DRb.start_service('drbunix:', nil)
-puts DRb.uri
-
-ro = DRbObject.new(nil, ARGV.shift)
-ro[:unix] = Foo.new
-gets
-
-it = ro[:tcp]
-p [it, it.foo(1)]
-gets
-
-p it.bar('2') {|n| n * 3}
-gets
diff --git a/sample/drb/gw_s.rb b/sample/drb/gw_s.rb
deleted file mode 100644
index c2bea0baadf06a..00000000000000
--- a/sample/drb/gw_s.rb
+++ /dev/null
@@ -1,10 +0,0 @@
-require 'drb/drb'
-require 'drb/unix'
-require 'drb/gw'
-
-DRb.install_id_conv(DRb::GWIdConv.new)
-gw = DRb::GW.new
-s1 = DRb::DRbServer.new(ARGV.shift, gw)
-s2 = DRb::DRbServer.new(ARGV.shift, gw)
-s1.thread.join
-s2.thread.join
diff --git a/sample/drb/holderc.rb b/sample/drb/holderc.rb
deleted file mode 100644
index e627916d76a844..00000000000000
--- a/sample/drb/holderc.rb
+++ /dev/null
@@ -1,22 +0,0 @@
-require 'drb/drb'
-
-begin
-  there = ARGV.shift || raise
-rescue
-  $stderr.puts("usage: #{$0} <server_uri>")
-  exit 1
-end
-
-DRb.start_service()
-ro = DRbObject.new(nil, there)
-
-ary = []
-10.times do
-  ary.push(ro.gen)
-end
-
-sleep 5 if $DEBUG
-
-ary.each do |e|
-  p e.sample([1])
-end
diff --git a/sample/drb/holders.rb b/sample/drb/holders.rb
deleted file mode 100644
index 293426faa5e37b..00000000000000
--- a/sample/drb/holders.rb
+++ /dev/null
@@ -1,63 +0,0 @@
-=begin
-= How to play.
-
-==  with timeridconv:
-  % ruby -d holders.rb
-  druby://yourhost:1234
-
-  % ruby holderc.rb druby://yourhost:1234
-
-
-==  without timeridconv:
-  % ruby holders.rb
-  druby://yourhost:1234
-
-  % ruby holderc.rb druby://yourhost:1234
-=end
-
-
-require 'drb/drb'
-
-class DRbEx3
-  include DRbUndumped
-
-  def initialize(n)
-    @v = n
-  end
-
-  def sample(list)
-    sum = 0
-    list.each do |e|
-      sum += e.to_i
-    end
-    @v * sum
-  end
-end
-
-class DRbEx4
-  include DRbUndumped
-
-  def initialize
-    @curr = 1
-  end
-
-  def gen
-    begin
-      @curr += 1
-      DRbEx3.new(@curr)
-    ensure
-      GC.start
-    end
-  end
-end
-
-if __FILE__ == $0
-  if $DEBUG
-    require 'drb/timeridconv'
-    DRb.install_id_conv(DRb::TimerIdConv.new(2))
-  end
-
-  DRb.start_service(nil, DRbEx4.new)
-  puts DRb.uri
-  DRb.thread.join
-end
diff --git a/sample/drb/http0.rb b/sample/drb/http0.rb
deleted file mode 100644
index e40d81031169a4..00000000000000
--- a/sample/drb/http0.rb
+++ /dev/null
@@ -1,77 +0,0 @@
-require 'drb/drb'
-require 'net/http'
-require 'uri'
-
-module DRb
-  module HTTP0
-    class StrStream
-      def initialize(str='')
-        @buf = str
-      end
-      attr_reader :buf
-
-      def read(n)
-        begin
-          return @buf[0,n]
-        ensure
-          @buf[0,n] = ''
-        end
-      end
-
-      def write(s)
-        @buf.concat s
-      end
-    end
-
-    def self.uri_option(uri, config)
-      return uri, nil
-    end
-
-    def self.open(uri, config)
-      unless /^http:/ =~ uri
-        raise(DRbBadScheme, uri) unless uri =~ /^http:/
-        raise(DRbBadURI, 'can\'t parse uri:' + uri)
-      end
-      ClientSide.new(uri, config)
-    end
-
-    class ClientSide
-      def initialize(uri, config)
-        @uri = uri
-        @res = nil
-        @config = config
-        @msg = DRbMessage.new(config)
-        @proxy = ENV['HTTP_PROXY']
-      end
-
-      def close; end
-      def alive?; false; end
-
-      def send_request(ref, msg_id, *arg, &b)
-        stream = StrStream.new
-        @msg.send_request(stream, ref, msg_id, *arg, &b)
-        @reply_stream = StrStream.new
-        post(@uri, stream.buf)
-      end
-
-      def recv_reply
-        @msg.recv_reply(@reply_stream)
-      end
-
-      def post(url, data)
-        it = URI.parse(url)
-        path = [(it.path=='' ? '/' : it.path), it.query].compact.join('?')
-        http = Net::HTTP.new(it.host, it.port)
-        sio = StrStream.new
-        http.post(path, data, {'Content-Type'=>'application/octetstream;'}) do |str|
-          sio.write(str)
-          if @config[:load_limit] < sio.buf.size
-            raise TypeError, 'too large packet'
-          end
-        end
-        @reply_stream = sio
-      end
-    end
-  end
-  DRbProtocol.add_protocol(HTTP0)
-end
diff --git a/sample/drb/http0serv.rb b/sample/drb/http0serv.rb
deleted file mode 100644
index 2e853312e12a6c..00000000000000
--- a/sample/drb/http0serv.rb
+++ /dev/null
@@ -1,120 +0,0 @@
-require 'webrick'
-require 'drb/drb'
-require_relative 'http0'
-
-module DRb
-  module HTTP0
-
-    def self.open_server(uri, config)
-      unless /^http:/ =~ uri
-        raise(DRbBadScheme, uri) unless uri =~ /^http:/
-        raise(DRbBadURI, 'can\'t parse uri:' + uri)
-      end
-      Server.new(uri, config)
-    end
-
-    class Callback < WEBrick::HTTPServlet::AbstractServlet
-      def initialize(config, drb)
-        @config = config
-        @drb = drb
-        @queue = Thread::Queue.new
-      end
-
-      def do_POST(req, res)
-        @req = req
-        @res = res
-        @drb.push(self)
-        @res.body = @queue.pop
-        @res['content-type'] = 'application/octet-stream;'
-      end
-
-      def req_body
-        @req.body
-      end
-
-      def reply(body)
-        @queue.push(body)
-      end
-
-      def close
-        @queue.push('')
-      end
-    end
-
-    class Server
-      def initialize(uri, config)
-        @uri = uri
-        @config = config
-        @queue = Thread::Queue.new
-        setup_webrick(uri)
-      end
-      attr_reader :uri
-
-      def close
-        @server.shutdown if @server
-        @server = nil
-      end
-
-      def push(callback)
-        @queue.push(callback)
-      end
-
-      def accept
-        client = @queue.pop
-        ServerSide.new(uri, client, @config)
-      end
-
-      def setup_webrick(uri)
-        logger = WEBrick::Log::new($stderr, WEBrick::Log::FATAL)
-        u = URI.parse(uri)
-        s = WEBrick::HTTPServer.new(:Port => u.port,
-          :AddressFamily => Socket::AF_INET,
-          :BindAddress => u.host,
-          :Logger => logger,
-          :ServerType => Thread)
-        s.mount(u.path, Callback, self)
-        @server = s
-        s.start
-      end
-    end
-
-    class ServerSide
-      def initialize(uri, callback, config)
-        @uri = uri
-        @callback = callback
-        @config = config
-        @msg = DRbMessage.new(@config)
-        @req_stream = StrStream.new(@callback.req_body)
-      end
-      attr_reader :uri
-
-      def close
-        @callback.close if @callback
-        @callback = nil
-      end
-
-      def alive?; false; end
-
-      def recv_request
-        begin
-          @msg.recv_request(@req_stream)
-        rescue
-          close
-          raise $!
-        end
-      end
-
-      def send_reply(succ, result)
-        begin
-          return unless @callback
-          stream = StrStream.new
-          @msg.send_reply(stream, succ, result)
-          @callback.reply(stream.buf)
-        rescue
-          close
-          raise $!
-        end
-      end
-    end
-  end
-end
diff --git a/sample/drb/name.rb b/sample/drb/name.rb
deleted file mode 100644
index 6d88186dabf1d3..00000000000000
--- a/sample/drb/name.rb
+++ /dev/null
@@ -1,117 +0,0 @@
-=begin
- distributed Ruby --- NamedObject Sample
- 	Copyright (c) 2000-2001 Masatoshi SEKI
-=end
-
-=begin
-How to play.
-
-* start server
- Terminal 1
- | % ruby name.rb druby://yourhost:7640
- | druby://yourhost:7640
- | [return] to exit
-
-* start client
- Terminal 2
- | % ruby namec.rb druby://yourhost:7640
- | #<DRb::DRbObject:0x40164174 @uri="druby://yourhost:7640", @ref="seq">
- | #<DRb::DRbObject:0x40163c9c @uri="druby://yourhost:7640", @ref="mutex">
- | 1
- | 2
- | [return] to continue
-
-* restart server
- Terminal 1
- type [return]
- | % ruby name.rb druby://yourhost:7640
- | druby://yourhost:7640
- | [return] to exit
-
-* continue client
- Terminal 2
- type [return]
- | 1
- | 2
-=end
-
-require 'drb/drb'
-
-module DRbNamedObject
-  DRbNAMEDICT = {}
-  DRBNAMEMUTEX = Thread::Mutex.new
-  attr_reader(:drb_name)
-
-  def drb_name=(name)
-    @drb_name = name
-    DRBNAMEMUTEX.synchronize do
-      raise(IndexError, name) if DRbNAMEDICT[name]
-      DRbNAMEDICT[name] = self
-    end
-  end
-end
-
-class DRbNamedIdConv < DRb::DRbIdConv
-  def initialize
-    @dict = DRbNamedObject::DRbNAMEDICT
-  end
-
-  def to_obj(ref)
-    @dict.fetch(ref) do super end
-  end
-
-  def to_id(obj)
-    if obj.kind_of? DRbNamedObject
-      return obj.drb_name
-    else
-      return super
-    end
-  end
-end
-
-class Seq
-  include DRbUndumped
-  include DRbNamedObject
-
-  def initialize(v, name)
-    @counter = v
-    @mutex = Thread::Mutex.new
-    self.drb_name = name
-  end
-
-  def next_value
-    @mutex.synchronize do
-      @counter += 1
-      return @counter
-    end
-  end
-end
-
-class Front
-  def initialize
-    seq = Seq.new(0, 'seq')
-    mutex = Thread::Mutex.new
-    mutex.extend(DRbUndumped)
-    mutex.extend(DRbNamedObject)
-    mutex.drb_name = 'mutex'
-    @name = {}
-    @name['seq'] = seq
-    @name['mutex'] = mutex
-  end
-
-  def [](k)
-    @name[k]
-  end
-end
-
-if __FILE__ == $0
-  uri = ARGV.shift
-
-  name_conv = DRbNamedIdConv.new
-
-  DRb.install_id_conv(name_conv)
-  DRb.start_service(uri, Front.new)
-  puts DRb.uri
-  DRb.thread.join
-end
-
diff --git a/sample/drb/namec.rb b/sample/drb/namec.rb
deleted file mode 100644
index 98b9d0e532afbf..00000000000000
--- a/sample/drb/namec.rb
+++ /dev/null
@@ -1,36 +0,0 @@
-=begin
- distributed Ruby --- NamedObject Sample Client
- 	Copyright (c) 2000-2001 Masatoshi SEKI
-=end
-
-require 'drb/drb'
-
-begin
-  there = ARGV.shift || raise
-rescue
-  puts "usage: #{$0} <server_uri>"
-  exit 1
-end
-
-DRb.start_service()
-ro = DRbObject.new(nil, there)
-
-seq = ro["seq"]
-mutex = ro["mutex"]
-
-p seq
-p mutex
-
-mutex.synchronize do
-  p seq.next_value
-  p seq.next_value
-end
-
-puts '[return] to continue'
-gets
-
-mutex.synchronize do
-  p seq.next_value
-  p seq.next_value
-end
-
diff --git a/sample/drb/old_tuplespace.rb b/sample/drb/old_tuplespace.rb
deleted file mode 100644
index 2d5310086e9362..00000000000000
--- a/sample/drb/old_tuplespace.rb
+++ /dev/null
@@ -1,212 +0,0 @@
-#!/usr/local/bin/ruby
-# TupleSpace
-# Copyright (c) 1999-2000 Masatoshi SEKI
-# You can redistribute it and/or modify it under the same terms as Ruby.
-
-class TupleSpace
-  class Template
-    def initialize(list)
-      @list = list
-      @check_idx = []
-      @list.each_with_index do |x, i|
-        @check_idx.push i if x
-      end
-      @size = @list.size
-    end
-
-    attr :size
-    alias length size
-
-    def match(tuple)
-      return nil if tuple.size != self.size
-      @check_idx.each do |i|
-        unless @list[i] === tuple[i]
-          return false
-        end
-      end
-      return true
-    end
-  end
-
-  def initialize
-    @que = {}
-    @waiting = {}
-    @que.taint		# enable tainted communication
-    @waiting.taint
-    self.taint
-  end
-
-  def wakeup_waiting(tuple)
-    sz = tuple.length
-    return nil unless @waiting[sz]
-
-    x = nil
-    i = -1
-    found = false
-    @waiting[sz] = @waiting[sz].find_all { |x|
-      if x[0].match(tuple)
-        begin
-          x[1].wakeup
-        rescue ThreadError
-        end
-        false
-      else
-        true
-      end
-    }
-  end
-
-  def put_waiting(template, thread)
-    sz = template.length
-    @waiting[sz] = [] unless @waiting[sz]
-    @waiting[sz].push([Template.new(template), thread])
-  end
-  private :wakeup_waiting
-  private :put_waiting
-
-  def get_que(template)
-    sz = template.length
-    return nil unless @que[sz]
-
-    template = Template.new(template)
-
-    x = nil
-    i = -1
-    found = false
-    @que[sz].each_with_index do |x, i|
-      if template.match(x)
-        found = true
-        break
-      end
-    end
-    return nil unless found
-
-    @que[sz].delete_at(i)
-
-    return x
-  end
-
-  def put_que(tuple)
-    sz = tuple.length
-    @que[sz] = [] unless @que[sz]
-    @que[sz].push tuple
-  end
-  private :get_que
-  private :put_que
-
-  def out(*tuples)
-    tuples.each do |tuple|
-      Thread.critical = true
-      put_que(tuple)
-      wakeup_waiting(tuple)
-      Thread.critical = false
-    end
-  end
-  alias put out
-  alias write out
-
-  def in(template, non_block=false)
-    begin
-      loop do
-        Thread.critical = true
-        tuple = get_que(template)
-        unless tuple
-          if non_block
-            raise ThreadError, "queue empty"
-          end
-          put_waiting(template, Thread.current)
-          Thread.stop
-        else
-          return tuple
-        end
-      end
-    ensure
-      Thread.critical = false
-    end
-  end
-  alias get in
-  alias take in
-
-  def rd(template, non_block=false)
-    tuple = self.in(template, non_block)
-    out(tuple)
-    tuple
-  end
-  alias read rd
-
-  def mv(dest, template, non_block=false)
-    tuple = self.in(template, non_block)
-    begin
-      dest.out(tuple)
-    rescue
-      self.out(tuple)
-    end
-  end
-  alias move mv
-end
-
-if __FILE__ == $0
-  ts = TupleSpace.new
-  clients = []
-  servers = []
-
-  def server(ts, id)
-    Thread.start {
-      loop do
-        req = ts.in(['req', nil, nil])
-        ac = req[1]
-        num = req[2]
-        sleep id
-        ts.out([ac, id, num, num * num])
-      end
-    }
-  end
-
-  def client(ts, n)
-    Thread.start {
-      ac = Object.new
-      tuples = (1..10).collect { |i|
-        ['req', ac, i * 10 + n]
-      }
-      ts.out(*tuples)
-      ts.out(tuples[0])
-      puts "out: #{n}"
-      11.times do |i|
-        ans = ts.in([ac, nil, nil, nil])
-        puts "client(#{n}) server(#{ans[1]}) #{ans[2]} #{ans[3]}"
-      end
-    }
-  end
-
-  def watcher(ts)
-    Thread.start {
-      loop do
-        begin
-          sleep 1
-          p ts.rd(['req', nil, nil], true)
-        rescue ThreadError
-          puts "'req' not found."
-        end
-      end
-    }
-  end
-
-  (0..3).each do |n|
-    servers.push(server(ts, n))
-  end
-
-  (1..6).each do |n|
-    clients.push(client(ts, n))
-  end
-
-  (1..3).each do
-    watcher(ts)
-  end
-
-  clients.each do |t|
-    t.join
-  end
-end
-
-
-
diff --git a/sample/drb/rinda_ts.rb b/sample/drb/rinda_ts.rb
deleted file mode 100644
index 6f2fae5c0f20fe..00000000000000
--- a/sample/drb/rinda_ts.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-require 'drb/drb'
-require 'rinda/tuplespace'
-
-uri = ARGV.shift
-DRb.start_service(uri, Rinda::TupleSpace.new)
-puts DRb.uri
-DRb.thread.join
diff --git a/sample/drb/rindac.rb b/sample/drb/rindac.rb
deleted file mode 100644
index 72be09deafda56..00000000000000
--- a/sample/drb/rindac.rb
+++ /dev/null
@@ -1,17 +0,0 @@
-require 'drb/drb'
-require 'rinda/rinda'
-
-uri = ARGV.shift || raise("usage: #{$0} <server_uri>")
-
-DRb.start_service
-ts = Rinda::TupleSpaceProxy.new(DRbObject.new(nil, uri))
-
-(1..10).each do |n|
-  ts.write(['sum', DRb.uri, n])
-end
-
-(1..10).each do |n|
-  ans = ts.take(['ans', DRb.uri, n, nil])
-  p [ans[2], ans[3]]
-end
-
diff --git a/sample/drb/rindas.rb b/sample/drb/rindas.rb
deleted file mode 100644
index 9fd9ada2d10106..00000000000000
--- a/sample/drb/rindas.rb
+++ /dev/null
@@ -1,18 +0,0 @@
-require 'drb/drb'
-require 'rinda/rinda'
-
-def do_it(v)
-  puts "do_it(#{v})"
-  v + v
-end
-
-uri = ARGV.shift || raise("usage: #{$0} <server_uri>")
-
-DRb.start_service
-ts = Rinda::TupleSpaceProxy.new(DRbObject.new(nil, uri))
-
-while true
-  r = ts.take(['sum', nil, nil])
-  v = do_it(r[2])
-  ts.write(['ans', r[1], r[2], v])
-end
diff --git a/sample/drb/ring_echo.rb b/sample/drb/ring_echo.rb
deleted file mode 100644
index c54628b54c2064..00000000000000
--- a/sample/drb/ring_echo.rb
+++ /dev/null
@@ -1,29 +0,0 @@
-require 'drb/drb'
-require 'drb/eq'
-require 'rinda/ring'
-
-class RingEcho
-  include DRbUndumped
-  def initialize(name)
-    @name = name
-  end
-
-  def echo(str)
-    "#{@name}: #{str}"
-  end
-end
-
-DRb.start_service
-
-renewer = Rinda::SimpleRenewer.new
-
-finder = Rinda::RingFinger.new
-ts = finder.lookup_ring_any
-ts.read_all([:name, :RingEcho, nil, nil]).each do |tuple|
-  p tuple[2]
-  puts tuple[2].echo('Hello, World') rescue nil
-end
-ts.write([:name, :RingEcho, RingEcho.new(DRb.uri), ''], renewer)
-
-DRb.thread.join
-
diff --git a/sample/drb/ring_inspect.rb b/sample/drb/ring_inspect.rb
deleted file mode 100644
index c096cd7034932b..00000000000000
--- a/sample/drb/ring_inspect.rb
+++ /dev/null
@@ -1,30 +0,0 @@
-require 'rinda/ring'
-require 'drb/drb'
-
-class Inspector
-  def initialize
-  end
-
-  def primary
-    Rinda::RingFinger.primary
-  end
-
-  def list_place
-    Rinda::RingFinger.to_a
-  end
-
-  def list(idx = -1)
-    if idx < 0
-      ts = primary
-    else
-      ts = list_place[idx]
-      raise "RingNotFound" unless ts
-    end
-    ts.read_all([:name, nil, nil, nil])
-  end
-end
-
-def main
-  DRb.start_service
-  r = Inspector.new
-end
diff --git a/sample/drb/ring_place.rb b/sample/drb/ring_place.rb
deleted file mode 100644
index 11c6c2fe80287f..00000000000000
--- a/sample/drb/ring_place.rb
+++ /dev/null
@@ -1,25 +0,0 @@
-require 'drb/drb'
-require 'rinda/ring'
-require 'rinda/tuplespace'
-
-unless $DEBUG
-  # Run as a daemon...
-  exit!( 0 ) if fork
-  Process.setsid
-  exit!( 0 ) if fork
-end
-
-DRb.start_service(ARGV.shift)
-
-ts = Rinda::TupleSpace.new
-place = Rinda::RingServer.new(ts)
-
-if $DEBUG
-  puts DRb.uri
-  DRb.thread.join
-else
-  STDIN.reopen(IO::NULL)
-  STDOUT.reopen(IO::NULL, 'w')
-  STDERR.reopen(IO::NULL, 'w')
-  DRb.thread.join
-end
diff --git a/sample/drb/simpletuple.rb b/sample/drb/simpletuple.rb
deleted file mode 100644
index 4bb4b1cff91475..00000000000000
--- a/sample/drb/simpletuple.rb
+++ /dev/null
@@ -1,89 +0,0 @@
-#!/usr/local/bin/ruby
-# SimpleTupleSpace
-# Copyright (c) 1999-2000 Masatoshi SEKI
-# You can redistribute it and/or modify it under the same terms as Ruby.
-
-class SimpleTupleSpace
-  def initialize
-    @hash = {}
-    @waiting = {}
-    @hash.taint
-    @waiting.taint
-    self.taint
-  end
-
-  def out(key, obj)
-    Thread.critical = true
-    @hash[key] ||= []
-    @waiting[key] ||= []
-    @hash[key].push obj
-    begin
-      t = @waiting[key].shift
-      @waiting.delete(key) if @waiting[key].length == 0
-      t.wakeup if t
-    rescue ThreadError
-      retry
-    ensure
-      Thread.critical = false
-    end
-  end
-
-  def in(key)
-    Thread.critical = true
-    @hash[key] ||= []
-    @waiting[key] ||= []
-    begin
-      loop do
-        if @hash[key].length == 0
-          @waiting[key].push Thread.current
-          Thread.stop
-        else
-          return @hash[key].shift
-        end
-      end
-    ensure
-      @hash.delete(key) if @hash[key].length == 0
-      Thread.critical = false
-    end
-  end
-end
-
-if __FILE__ == $0
-  ts = SimpleTupleSpace.new
-  clients = []
-  servers = []
-
-  def server(ts)
-    Thread.start {
-      loop do
-        req = ts.in('req')
-        ac = req[0]
-        num = req[1]
-        ts.out(ac, num * num)
-      end
-    }
-  end
-
-  def client(ts, n)
-    Thread.start {
-      ac = Object.new
-      ts.out('req', [ac, n])
-      ans = ts.in(ac)
-      puts "#{n}: #{ans}"
-    }
-  end
-
-  3.times do
-    servers.push(server(ts))
-  end
-
-  (1..6).each do |n|
-    clients.push(client(ts, n))
-  end
-
-  clients.each do |t|
-    t.join
-  end
-end
-
-
diff --git a/sample/drb/speedc.rb b/sample/drb/speedc.rb
deleted file mode 100644
index 64b8a650216760..00000000000000
--- a/sample/drb/speedc.rb
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/usr/local/bin/ruby
-
-uri = ARGV.shift || raise("usage: #{$0} URI")
-N = (ARGV.shift || 100).to_i
-
-case uri
-when /^tcpromp:/, /^unixromp:/
-  require 'romp'
-
-  client = ROMP::Client.new(uri, false)
-  foo = client.resolve("foo")
-when /^druby:/
-  require 'drb/drb'
-
-  DRb.start_service
-  foo = DRbObject.new(nil, uri)
-end
-
-N.times do |n|
-  foo.foo(n)
-end
diff --git a/sample/drb/speeds.rb b/sample/drb/speeds.rb
deleted file mode 100644
index 79840594231e94..00000000000000
--- a/sample/drb/speeds.rb
+++ /dev/null
@@ -1,31 +0,0 @@
-class Foo
-  attr_reader :i
-  def initialize
-    @i = 0
-  end
-
-  def foo(i)
-    @i = i
-    i + i
-  end
-end
-
-# server = ROMP::Server.new('tcpromp://localhost:4242', nil, true)
-
-uri = ARGV.shift || raise("usage: #{$0} URI")
-foo = Foo.new
-
-case uri
-when /^tcpromp:/, /^unixromp:/
-  require 'romp'
-
-  server = ROMP::Server.new(uri, nil, true)
-  server.bind(foo, "foo")
-
-when /^druby:/
-  require 'drb/drb'
-
-  DRb.start_service(uri, Foo.new)
-end
-
-DRb.thread.join
diff --git a/sample/getoptlong/abbrev.rb b/sample/getoptlong/abbrev.rb
deleted file mode 100644
index 9b89863626cc87..00000000000000
--- a/sample/getoptlong/abbrev.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-require 'getoptlong'
-
-options = GetoptLong.new(
-  ['--xxx', GetoptLong::NO_ARGUMENT],
-  ['--xyz', GetoptLong::NO_ARGUMENT]
-)
-options.each do |option, argument|
-  p [option, argument]
-end
diff --git a/sample/getoptlong/aliases.rb b/sample/getoptlong/aliases.rb
deleted file mode 100644
index 895254c6ae8550..00000000000000
--- a/sample/getoptlong/aliases.rb
+++ /dev/null
@@ -1,8 +0,0 @@
-require 'getoptlong'
-
-options = GetoptLong.new(
-  ['--xxx', '-x', '--aaa', '-a', '-p', GetoptLong::NO_ARGUMENT]
-)
-options.each do |option, argument|
-  p [option, argument]
-end
diff --git a/sample/getoptlong/argv.rb b/sample/getoptlong/argv.rb
deleted file mode 100644
index 8efcad22ea6fbe..00000000000000
--- a/sample/getoptlong/argv.rb
+++ /dev/null
@@ -1,12 +0,0 @@
-require 'getoptlong'
-
-options = GetoptLong.new(
-  ['--xxx', GetoptLong::REQUIRED_ARGUMENT],
-  ['--yyy', GetoptLong::OPTIONAL_ARGUMENT],
-  ['--zzz', GetoptLong::NO_ARGUMENT]
-)
-puts "Original ARGV: #{ARGV}"
-options.each do |option, argument|
-  p [option, argument]
-end
-puts "Remaining ARGV: #{ARGV}"
diff --git a/sample/getoptlong/each.rb b/sample/getoptlong/each.rb
deleted file mode 100644
index 661e0a968f33b5..00000000000000
--- a/sample/getoptlong/each.rb
+++ /dev/null
@@ -1,12 +0,0 @@
-require 'getoptlong'
-
-options = GetoptLong.new(
-  ['--xxx', '-x', GetoptLong::REQUIRED_ARGUMENT],
-  ['--yyy', '-y', GetoptLong::OPTIONAL_ARGUMENT],
-  ['--zzz', '-z',GetoptLong::NO_ARGUMENT]
-)
-puts "Original ARGV: #{ARGV}"
-options.each do |option, argument|
-  p [option, argument]
-end
-puts "Remaining ARGV: #{ARGV}"
diff --git a/sample/getoptlong/fibonacci.rb b/sample/getoptlong/fibonacci.rb
deleted file mode 100644
index 24a2aab3c35e72..00000000000000
--- a/sample/getoptlong/fibonacci.rb
+++ /dev/null
@@ -1,62 +0,0 @@
-require 'getoptlong'
-
-options = GetoptLong.new(
-  ['--number', '-n', GetoptLong::REQUIRED_ARGUMENT],
-  ['--verbose', '-v', GetoptLong::OPTIONAL_ARGUMENT],
-  ['--help', '-h', GetoptLong::NO_ARGUMENT]
-)
-
-def help(status = 0)
-  puts <<~HELP
-    Usage:
-
-      -n n, --number n:
-        Compute Fibonacci number for n.
-      -v [boolean], --verbose [boolean]:
-        Show intermediate results; default is 'false'.
-      -h, --help:
-        Show this help.
-  HELP
-  exit(status)
-end
-
-def print_fibonacci (number)
-  return 0 if number == 0
-  return 1 if number == 1 or number == 2
-  i = 0
-  j = 1
-  (2..number).each do
-    k = i + j
-    i = j
-    j = k
-    puts j if @verbose
-  end
-  puts j unless @verbose
-end
-
-options.each do |option, argument|
-  case option
-  when '--number'
-    @number = argument.to_i
-  when '--verbose'
-    @verbose = if argument.empty?
-      true
-    elsif argument.match(/true/i)
-      true
-    elsif argument.match(/false/i)
-      false
-    else
-      puts '--verbose argument must be true or false'
-      help(255)
-    end
-  when '--help'
-    help
-  end
-end
-
-unless @number
-  puts 'Option --number is required.'
-  help(255)
-end
-
-print_fibonacci(@number)
diff --git a/sample/getoptlong/permute.rb b/sample/getoptlong/permute.rb
deleted file mode 100644
index 8efcad22ea6fbe..00000000000000
--- a/sample/getoptlong/permute.rb
+++ /dev/null
@@ -1,12 +0,0 @@
-require 'getoptlong'
-
-options = GetoptLong.new(
-  ['--xxx', GetoptLong::REQUIRED_ARGUMENT],
-  ['--yyy', GetoptLong::OPTIONAL_ARGUMENT],
-  ['--zzz', GetoptLong::NO_ARGUMENT]
-)
-puts "Original ARGV: #{ARGV}"
-options.each do |option, argument|
-  p [option, argument]
-end
-puts "Remaining ARGV: #{ARGV}"
diff --git a/sample/getoptlong/require_order.rb b/sample/getoptlong/require_order.rb
deleted file mode 100644
index 357f667905755e..00000000000000
--- a/sample/getoptlong/require_order.rb
+++ /dev/null
@@ -1,13 +0,0 @@
-require 'getoptlong'
-
-options = GetoptLong.new(
-  ['--xxx', GetoptLong::REQUIRED_ARGUMENT],
-  ['--yyy', GetoptLong::OPTIONAL_ARGUMENT],
-  ['--zzz', GetoptLong::NO_ARGUMENT]
-)
-options.ordering = GetoptLong::REQUIRE_ORDER
-puts "Original ARGV: #{ARGV}"
-options.each do |option, argument|
-  p [option, argument]
-end
-puts "Remaining ARGV: #{ARGV}"
diff --git a/sample/getoptlong/return_in_order.rb b/sample/getoptlong/return_in_order.rb
deleted file mode 100644
index 91ce1ef9963d12..00000000000000
--- a/sample/getoptlong/return_in_order.rb
+++ /dev/null
@@ -1,13 +0,0 @@
-require 'getoptlong'
-
-options = GetoptLong.new(
-  ['--xxx', GetoptLong::REQUIRED_ARGUMENT],
-  ['--yyy', GetoptLong::OPTIONAL_ARGUMENT],
-  ['--zzz', GetoptLong::NO_ARGUMENT]
-)
-options.ordering = GetoptLong::RETURN_IN_ORDER
-puts "Original ARGV: #{ARGV}"
-options.each do |option, argument|
-  p [option, argument]
-end
-puts "Remaining ARGV: #{ARGV}"
diff --git a/sample/getoptlong/simple.rb b/sample/getoptlong/simple.rb
deleted file mode 100644
index 1af6447632e3f6..00000000000000
--- a/sample/getoptlong/simple.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-require 'getoptlong'
-
-options = GetoptLong.new(
-  ['--number', '-n', GetoptLong::REQUIRED_ARGUMENT],
-  ['--verbose', '-v', GetoptLong::OPTIONAL_ARGUMENT],
-  ['--help', '-h', GetoptLong::NO_ARGUMENT]
-)
diff --git a/sample/getoptlong/types.rb b/sample/getoptlong/types.rb
deleted file mode 100644
index ac74bfe12ed133..00000000000000
--- a/sample/getoptlong/types.rb
+++ /dev/null
@@ -1,10 +0,0 @@
-require 'getoptlong'
-
-options = GetoptLong.new(
-  ['--xxx', GetoptLong::REQUIRED_ARGUMENT],
-  ['--yyy', GetoptLong::OPTIONAL_ARGUMENT],
-  ['--zzz', GetoptLong::NO_ARGUMENT]
-)
-options.each do |option, argument|
-  p [option, argument]
-end
diff --git a/sample/net-imap.rb b/sample/net-imap.rb
deleted file mode 100644
index b93ecb746e6996..00000000000000
--- a/sample/net-imap.rb
+++ /dev/null
@@ -1,167 +0,0 @@
-require 'net/imap'
-require "getoptlong"
-
-$stdout.sync = true
-$port = nil
-$user = ENV["USER"] || ENV["LOGNAME"]
-$auth = "login"
-$ssl = false
-$starttls = false
-
-def usage
-  <<EOF
-usage: #{$0} [options] <host>
-
-  --help                        print this message
-  --port=PORT                   specifies port
-  --user=USER                   specifies user
-  --auth=AUTH                   specifies auth type
-  --starttls                    use starttls
-  --ssl                         use ssl
-EOF
-end
-
-begin
-  require 'io/console'
-rescue LoadError
-  def _noecho(&block)
-    system("stty", "-echo")
-    begin
-      yield STDIN
-    ensure
-      system("stty", "echo")
-    end
-  end
-else
-  def _noecho(&block)
-    STDIN.noecho(&block)
-  end
-end
-
-def get_password
-  print "password: "
-  begin
-    return _noecho(&:gets).chomp
-  ensure
-    puts
-  end
-end
-
-def get_command
-  printf("%s@%s> ", $user, $host)
-  if line = gets
-    return line.strip.split(/\s+/)
-  else
-    return nil
-  end
-end
-
-parser = GetoptLong.new
-parser.set_options(['--debug', GetoptLong::NO_ARGUMENT],
-  ['--help', GetoptLong::NO_ARGUMENT],
-  ['--port', GetoptLong::REQUIRED_ARGUMENT],
-  ['--user', GetoptLong::REQUIRED_ARGUMENT],
-  ['--auth', GetoptLong::REQUIRED_ARGUMENT],
-  ['--starttls', GetoptLong::NO_ARGUMENT],
-  ['--ssl', GetoptLong::NO_ARGUMENT])
-begin
-  parser.each_option do |name, arg|
-    case name
-    when "--port"
-      $port = arg
-    when "--user"
-      $user = arg
-    when "--auth"
-      $auth = arg
-    when "--ssl"
-      $ssl = true
-    when "--starttls"
-      $starttls = true
-    when "--debug"
-      Net::IMAP.debug = true
-    when "--help"
-      usage
-      exit
-    end
-  end
-rescue
-  abort usage
-end
-
-$host = ARGV.shift
-unless $host
-  abort usage
-end
-
-imap = Net::IMAP.new($host, :port => $port, :ssl => $ssl)
-begin
-  imap.starttls if $starttls
-  class << password = method(:get_password)
-    alias to_str call
-  end
-  imap.authenticate($auth, $user, password)
-  while true
-    cmd, *args = get_command
-    break unless cmd
-    begin
-      case cmd
-      when "list"
-        for mbox in imap.list("", args[0] || "*")
-          if mbox.attr.include?(Net::IMAP::NOSELECT)
-            prefix = "!"
-          elsif mbox.attr.include?(Net::IMAP::MARKED)
-            prefix = "*"
-          else
-            prefix = " "
-          end
-          print prefix, mbox.name, "\n"
-        end
-      when "select"
-        imap.select(args[0] || "inbox")
-        print "ok\n"
-      when "close"
-        imap.close
-        print "ok\n"
-      when "summary"
-        unless messages = imap.responses["EXISTS"][-1]
-          puts "not selected"
-          next
-        end
-        if messages > 0
-          for data in imap.fetch(1..-1, ["ENVELOPE"])
-            print data.seqno, ": ", data.attr["ENVELOPE"].subject, "\n"
-          end
-        else
-          puts "no message"
-        end
-      when "fetch"
-        if args[0]
-          data = imap.fetch(args[0].to_i, ["RFC822.HEADER", "RFC822.TEXT"])[0]
-          puts data.attr["RFC822.HEADER"]
-          puts data.attr["RFC822.TEXT"]
-        else
-          puts "missing argument"
-        end
-      when "logout", "exit", "quit"
-        break
-      when "help", "?"
-        print <<EOF
-list [pattern]                  list mailboxes
-select [mailbox]                select mailbox
-close                           close mailbox
-summary                         display summary
-fetch [msgno]                   display message
-logout                          logout
-help, ?                         display help message
-EOF
-      else
-        print "unknown command: ", cmd, "\n"
-      end
-    rescue Net::IMAP::Error
-      puts $!
-    end
-  end
-ensure
-  imap.logout
-  imap.disconnect
-end
diff --git a/sample/prism/find_calls.rb b/sample/prism/find_calls.rb
new file mode 100644
index 00000000000000..30af56c719da9f
--- /dev/null
+++ b/sample/prism/find_calls.rb
@@ -0,0 +1,105 @@
+# This script finds calls to a specific method with a certain keyword parameter
+# within a given source file.
+
+require "prism"
+require "pp"
+
+# For deprecation or refactoring purposes, it's often useful to find all of the
+# places that call a specific method with a specific k  eyword parameter. This is
+# easily accomplished with a visitor such as this one.
+class QuxParameterVisitor < Prism::Visitor
+  def initialize(calls)
+    @calls = calls
+  end
+
+  def visit_call_node(node)
+    @calls << node if qux?(node)
+    super
+  end
+
+  private
+
+  def qux?(node)
+    # All nodes implement pattern matching, so you can use the `in` operator to
+    # pull out all of their individual fields. As you can see by this extensive
+    # pattern match, this is quite a powerful feature.
+    node in {
+      # This checks that the receiver is the constant Qux or the constant path
+      # ::Qux. We are assuming relative constants are fine in this case.
+      receiver: (
+        Prism::ConstantReadNode[name: :Qux] |
+        Prism::ConstantPathNode[parent: nil, name: :Qux]
+      ),
+      # This checks that the name of the method is qux. We purposefully are not
+      # checking the call operator (., ::, or &.) because we want all of them.
+      # In other ASTs, this would be multiple node types, but prism combines
+      # them all into one for convenience.
+      name: :qux,
+      arguments: Prism::ArgumentsNode[
+        # Here we're going to use the "find" pattern to find the keyword hash
+        # node that has the correct key.
+        arguments: [
+          *,
+          Prism::KeywordHashNode[
+            # Here we'll use another "find" pattern to find the key that we are
+            # specifically looking for.
+            elements: [
+              *,
+              # Finally, we can assert against the key itself. Note that we are
+              # not looking at the value of hash pair, because we are only
+              # specifically looking for a key.
+              Prism::AssocNode[key: Prism::SymbolNode[unescaped: "qux"]],
+              *
+            ]
+          ],
+          *
+        ]
+      ]
+    }
+  end
+end
+
+calls = []
+Prism.parse_stream(DATA).value.accept(QuxParameterVisitor.new(calls))
+
+calls.each do |call|
+  print "CallNode "
+  puts PP.pp(call.location, +"")
+  print "  "
+  puts call.slice
+end
+
+# =>
+# CallNode (5,6)-(5,29)
+#   Qux.qux(222, qux: true)
+# CallNode (9,6)-(9,30)
+#   Qux&.qux(333, qux: true)
+# CallNode (20,6)-(20,51)
+#   Qux::qux(888, qux: ::Qux.qux(999, qux: true))
+# CallNode (20,25)-(20,50)
+#   ::Qux.qux(999, qux: true)
+
+__END__
+module Foo
+  class Bar
+    def baz1
+      Qux.qux(111)
+      Qux.qux(222, qux: true)
+    end
+
+    def baz2
+      Qux&.qux(333, qux: true)
+      Qux&.qux(444)
+    end
+
+    def baz3
+      qux(555, qux: false)
+      666.qux(666)
+    end
+
+    def baz4
+      Qux::qux(777)
+      Qux::qux(888, qux: ::Qux.qux(999, qux: true))
+    end
+  end
+end
diff --git a/sample/prism/find_comments.rb b/sample/prism/find_comments.rb
new file mode 100644
index 00000000000000..6a26cd32b7c9b8
--- /dev/null
+++ b/sample/prism/find_comments.rb
@@ -0,0 +1,100 @@
+# This script finds all of the comments within a given source file for a method.
+
+require "prism"
+
+class FindMethodComments < Prism::Visitor
+  def initialize(target, comments, nesting = [])
+    @target = target
+    @comments = comments
+    @nesting = nesting
+  end
+
+  # These visit methods are specific to each class. Defining a visitor allows
+  # you to group functionality that applies to all node types into a single
+  # class. You can find which method corresponds to which node type by looking
+  # at the class name, calling #type on the node, or by looking at the #accept
+  # method definition on the node.
+  def visit_module_node(node)
+    visitor = FindMethodComments.new(@target, @comments, [*@nesting, node.name])
+    node.compact_child_nodes.each { |child| child.accept(visitor) }
+  end
+
+  def visit_class_node(node)
+    # We could keep track of an internal state where we push the class name here
+    # and then pop it after the visit is complete. However, it is often simpler
+    # and cleaner to generate a new visitor instance when the state changes,
+    # because then the state is immutable and it's easier to reason about. This
+    # also provides for more debugging opportunity in the initializer.
+    visitor = FindMethodComments.new(@target, @comments, [*@nesting, node.name])
+    node.compact_child_nodes.each { |child| child.accept(visitor) }
+  end
+
+  def visit_def_node(node)
+    if [*@nesting, node.name] == @target
+      # Comments are always attached to locations (either inner locations on a
+      # node like the location of a keyword or the location on the node itself).
+      # Nodes are considered either "leading" or "trailing", which means that
+      # they occur before or after the location, respectively. In this case of
+      # documentation, we only want to consider leading comments. You can also
+      # fetch all of the comments on a location with #comments.
+      @comments.concat(node.location.leading_comments)
+    else
+      super
+    end
+  end
+end
+
+# Most of the time, the concept of "finding" something in the AST can be
+# accomplished either with a queue or with a visitor. In this case we will use a
+# visitor, but a queue would work just as well.
+def find_comments(result, path)
+  target = path.split(/::|#/).map(&:to_sym)
+  comments = []
+
+  result.value.accept(FindMethodComments.new(target, comments))
+  comments
+end
+
+result = Prism.parse_stream(DATA)
+result.attach_comments!
+
+find_comments(result, "Foo#foo").each do |comment|
+  puts comment.inspect
+  puts comment.slice
+end
+
+# =>
+# #<Prism::InlineComment @location=#<Prism::Location @start_offset=205 @length=27 start_line=13>>
+# # This is the documentation
+# #<Prism::InlineComment @location=#<Prism::Location @start_offset=235 @length=21 start_line=14>>
+# # for the foo method.
+
+find_comments(result, "Foo::Bar#bar").each do |comment|
+  puts comment.inspect
+  puts comment.slice
+end
+
+# =>
+# #<Prism::InlineComment @location=#<Prism::Location @start_offset=126 @length=23 start_line=7>>
+# # This is documentation
+# #<Prism::InlineComment @location=#<Prism::Location @start_offset=154 @length=21 start_line=8>>
+# # for the bar method.
+
+__END__
+# This is the documentation
+# for the Foo module.
+module Foo
+  # This is documentation
+  # for the Bar class.
+  class Bar
+    # This is documentation
+    # for the bar method.
+    def bar
+    end
+  end
+
+  # This is the documentation
+  # for the foo method.
+  def foo
+  end
+end
diff --git a/sample/prism/locate_nodes.rb b/sample/prism/locate_nodes.rb
new file mode 100644
index 00000000000000..7a51db43675779
--- /dev/null
+++ b/sample/prism/locate_nodes.rb
@@ -0,0 +1,84 @@
+# This script locates a set of nodes determined by a line and column (in bytes).
+
+require "prism"
+require "pp"
+
+# This method determines if the given location covers the given line and column.
+# It's important to note that columns (and offsets) in prism are always in
+# bytes. This is because prism supports all 90 source encodings that Ruby
+# supports. You can always retrieve the column (or offset) of a location in
+# other units with other provided APIs, like #start_character_column or
+# #start_code_units_column.
+def covers?(location, line:, column:)
+  start_line = location.start_line
+  end_line = location.end_line
+
+  if start_line == end_line
+    # If the location only spans one line, then we only check if the line
+    # matches and that the column is covered by the column range.
+    line == start_line && (location.start_column...location.end_column).cover?(column)
+  else
+    # Otherwise, we check that it is on the start line and the column is greater
+    # than or equal to the start column, or that it is on the end line and the
+    # column is less than the end column, or that it is between the start and
+    # end lines.
+    (line == start_line && column >= location.start_column) ||
+      (line == end_line && column < location.end_column) ||
+      (line > start_line && line < end_line)
+  end
+end
+
+# This method descends down into the AST whose root is `node` and returns the
+# array of all of the nodes that cover the given line and column.
+def locate(node, line:, column:)
+  queue = [node]
+  result = []
+
+  # We could use a recursive method here instead if we wanted, but it's
+  # important to note that that will not work for ASTs that are nested deeply
+  # enough to cause a stack overflow.
+  while (node = queue.shift)
+    result << node
+
+    # Nodes have `child_nodes` and `compact_child_nodes`. `child_nodes` have
+    # consistent indices but include `nil` for optional fields that are not
+    # present, whereas `compact_child_nodes` has inconsistent indices but does
+    # not include `nil` for optional fields that are not present.
+    node.compact_child_nodes.find do |child|
+      queue << child if covers?(child.location, line: line, column: column)
+    end
+  end
+
+  result
+end
+
+result = Prism.parse_stream(DATA)
+locate(result.value, line: 4, column: 14).each_with_index do |node, index|
+  print " " * index
+  print node.class.name.split("::", 2).last
+  print " "
+  puts PP.pp(node.location, +"")
+end
+
+# =>
+# ProgramNode (1,0)-(7,3)
+#  StatementsNode (1,0)-(7,3)
+#   ModuleNode (1,0)-(7,3)
+#    StatementsNode (2,2)-(6,5)
+#     ClassNode (2,2)-(6,5)
+#      StatementsNode (3,4)-(5,7)
+#       DefNode (3,4)-(5,7)
+#        StatementsNode (4,6)-(4,21)
+#         CallNode (4,6)-(4,21)
+#          CallNode (4,6)-(4,15)
+#           ArgumentsNode (4,12)-(4,15)
+#            IntegerNode (4,12)-(4,15)
+
+__END__
+module Foo
+  class Bar
+    def baz
+      111 + 222 + 333
+    end
+  end
+end
diff --git a/sample/prism/make_tags.rb b/sample/prism/make_tags.rb
new file mode 100644
index 00000000000000..dc770ab1b08aea
--- /dev/null
+++ b/sample/prism/make_tags.rb
@@ -0,0 +1,302 @@
+# This script generates a tags file using Prism to parse the Ruby files.
+
+require "prism"
+
+# This visitor is responsible for visiting the nodes in the AST and generating
+# the appropriate tags. The tags are stored in the entries array as strings.
+class TagsVisitor < Prism::Visitor
+  # This represents an entry in the tags file, which is a tab-separated line. It
+  # houses the logic for how an entry is constructed.
+  class Entry
+    attr_reader :parts
+
+    def initialize(name, filepath, pattern, type)
+      @parts = [name, filepath, pattern, type]
+    end
+
+    def attribute(key, value)
+      parts << "#{key}:#{value}"
+    end
+
+    def attribute_class(nesting, names)
+      return if nesting.empty? && names.length == 1
+      attribute("class", [*nesting, names].flatten.tap(&:pop).join("."))
+    end
+
+    def attribute_inherits(names)
+      attribute("inherits", names.join(".")) if names
+    end
+
+    def to_line
+      parts.join("\t")
+    end
+  end
+
+  private_constant :Entry
+
+  attr_reader :entries, :filepath, :lines, :nesting, :singleton
+
+  # Initialize the visitor with the given parameters. The first three parameters
+  # are constant throughout the visit, while the last two are controlled by the
+  # visitor as it traverses the AST. These are treated as immutable by virtue of
+  # the visit methods constructing new visitors when they need to change.
+  def initialize(entries, filepath, lines, nesting = [], singleton = false)
+    @entries = entries
+    @filepath = filepath
+    @lines = lines
+    @nesting = nesting
+    @singleton = singleton
+  end
+
+  # Visit a method alias node and generate the appropriate tags.
+  #
+  #     alias m2 m1
+  #
+  def visit_alias_method_node(node)
+    enter(node.new_name.unescaped.to_sym, node, "a") do |entry|
+      entry.attribute_class(nesting, [nil])
+    end
+
+    super
+  end
+
+  # Visit a method call to attr_reader, attr_writer, or attr_accessor without a
+  # receiver and generate the appropriate tags. Note that this ignores the fact
+  # that these methods could be overridden, which is a limitation of this
+  # script.
+  #
+  #     attr_accessor :m1
+  #
+  def visit_call_node(node)
+    if !node.receiver && %i[attr_reader attr_writer attr_accessor].include?(name = node.name)
+      (node.arguments&.arguments || []).grep(Prism::SymbolNode).each do |argument|
+        if name != :attr_writer
+          enter(:"#{argument.unescaped}", argument, singleton ? "F" : "f") do |entry|
+            entry.attribute_class(nesting, [nil])
+          end
+        end
+
+        if name != :attr_reader
+          enter(:"#{argument.unescaped}=", argument, singleton ? "F" : "f") do |entry|
+            entry.attribute_class(nesting, [nil])
+          end
+        end
+      end
+    end
+
+    super
+  end
+
+  # Visit a class node and generate the appropriate tags.
+  #
+  #     class C1
+  #     end
+  #
+  def visit_class_node(node)
+    if (names = names_for(node.constant_path))
+      enter(names.last, node, "c") do |entry|
+        entry.attribute_class(nesting, names)
+        entry.attribute_inherits(names_for(node.superclass))
+      end
+
+      node.body&.accept(copy_visitor([*nesting, names], singleton))
+    end
+  end
+
+  # Visit a constant path write node and generate the appropriate tags.
+  #
+  #     C1::C2 = 1
+  #
+  def visit_constant_path_write_node(node)
+    if (names = names_for(node.target))
+      enter(names.last, node, "C") do |entry|
+        entry.attribute_class(nesting, names)
+      end
+    end
+
+    super
+  end
+
+  # Visit a constant write node and generate the appropriate tags.
+  #
+  #     C1 = 1
+  #
+  def visit_constant_write_node(node)
+    enter(node.name, node, "C") do |entry|
+      entry.attribute_class(nesting, [nil])
+    end
+
+    super
+  end
+
+  # Visit a method definition node and generate the appropriate tags.
+  #
+  #     def m1; end
+  #
+  def visit_def_node(node)
+    enter(node.name, node, (node.receiver || singleton) ? "F" : "f") do |entry|
+      entry.attribute_class(nesting, [nil])
+    end
+
+    super
+  end
+
+  # Visit a module node and generate the appropriate tags.
+  #
+  #     module M1
+  #     end
+  #
+  def visit_module_node(node)
+    if (names = names_for(node.constant_path))
+      enter(names.last, node, "m") do |entry|
+        entry.attribute_class(nesting, names)
+      end
+
+      node.body&.accept(copy_visitor([*nesting, names], singleton))
+    end
+  end
+
+  # Visit a singleton class node and generate the appropriate tags.
+  #
+  #     class << self
+  #     end
+  #
+  def visit_singleton_class_node(node)
+    case node.expression
+    when Prism::SelfNode
+      node.body&.accept(copy_visitor(nesting, true))
+    when Prism::ConstantReadNode, Prism::ConstantPathNode
+      if (names = names_for(node.expression))
+        node.body&.accept(copy_visitor([*nesting, names], true))
+      end
+    else
+      node.body&.accept(copy_visitor([*nesting, nil], true))
+    end
+  end
+
+  private
+
+  # Generate a new visitor with the given dynamic options. The static options
+  # are copied over automatically.
+  def copy_visitor(nesting, singleton)
+    TagsVisitor.new(entries, filepath, lines, nesting, singleton)
+  end
+
+  # Generate a new entry for the given name, node, and type and add it into the
+  # list of entries. The block is used to add additional attributes to the
+  # entry.
+  def enter(name, node, type)
+    line = lines[node.location.start_line - 1].chomp
+    pattern = "/^#{line.gsub("\\", "\\\\\\\\").gsub("/", "\\/")}$/;\""
+
+    entry = Entry.new(name, filepath, pattern, type)
+    yield entry
+
+    entries << entry.to_line
+  end
+
+  # Retrieve the names for the given node. This is used to construct the class
+  # attribute for the tags.
+  def names_for(node)
+    case node
+    when Prism::ConstantPathNode
+      names = names_for(node.parent)
+      return unless names
+
+      names << node.name
+    when Prism::ConstantReadNode
+      [node.name]
+    when Prism::SelfNode
+      [:self]
+    else
+      # dynamic
+    end
+  end
+end
+
+# Parse the Ruby file and visit all of the nodes in the resulting AST. Once all
+# of the nodes have been visited, the entries array should be populated with the
+# tags.
+result = Prism.parse_stream(DATA)
+result.value.accept(TagsVisitor.new(entries = [], __FILE__, result.source.lines))
+
+# Print the tags to STDOUT.
+puts "!_TAG_FILE_FORMAT	2	/extended format; --format=1 will not append ;\" to lines/"
+puts "!_TAG_FILE_SORTED	1	/0=unsorted, 1=sorted, 2=foldcase/"
+puts entries.sort
+
+# =>
+# !_TAG_FILE_FORMAT	2	/extended format; --format=1 will not append ;" to lines/
+# !_TAG_FILE_SORTED	1	/0=unsorted, 1=sorted, 2=foldcase/
+# C1	sample/prism/make_tags.rb	/^    class C1$/;"	c	class:M1.M2
+# C2	sample/prism/make_tags.rb	/^      class C2 < Object$/;"	c	class:M1.M2.C1	inherits:Object
+# C6	sample/prism/make_tags.rb	/^  C6 = 1$/;"	C	class:M1
+# C7	sample/prism/make_tags.rb	/^  C7 = 2$/;"	C	class:M1
+# C9	sample/prism/make_tags.rb	/^  C8::C9 = 3$/;"	C	class:M1.C8
+# M1	sample/prism/make_tags.rb	/^module M1$/;"	m
+# M2	sample/prism/make_tags.rb	/^  module M2$/;"	m	class:M1
+# M4	sample/prism/make_tags.rb	/^  module M3::M4$/;"	m	class:M1.M3
+# M5	sample/prism/make_tags.rb	/^  module self::M5$/;"	m	class:M1.self
+# m1	sample/prism/make_tags.rb	/^        def m1; end$/;"	f	class:M1.M2.C1.C2
+# m10	sample/prism/make_tags.rb	/^    attr_accessor :m10, :m11$/;"	f	class:M1.M3.M4
+# m10=	sample/prism/make_tags.rb	/^    attr_accessor :m10, :m11$/;"	f	class:M1.M3.M4
+# m11	sample/prism/make_tags.rb	/^    attr_accessor :m10, :m11$/;"	f	class:M1.M3.M4
+# m11=	sample/prism/make_tags.rb	/^    attr_accessor :m10, :m11$/;"	f	class:M1.M3.M4
+# m12	sample/prism/make_tags.rb	/^    attr_reader :m12, :m13, :m14$/;"	f	class:M1.M3.M4
+# m13	sample/prism/make_tags.rb	/^    attr_reader :m12, :m13, :m14$/;"	f	class:M1.M3.M4
+# m14	sample/prism/make_tags.rb	/^    attr_reader :m12, :m13, :m14$/;"	f	class:M1.M3.M4
+# m15=	sample/prism/make_tags.rb	/^    attr_writer :m15$/;"	f	class:M1.M3.M4
+# m2	sample/prism/make_tags.rb	/^        def m2; end$/;"	f	class:M1.M2.C1.C2
+# m3	sample/prism/make_tags.rb	/^        alias m3 m1$/;"	a	class:M1.M2.C1.C2
+# m4	sample/prism/make_tags.rb	/^        alias :m4 :m2$/;"	a	class:M1.M2.C1.C2
+# m5	sample/prism/make_tags.rb	/^        def self.m5; end$/;"	F	class:M1.M2.C1.C2
+# m6	sample/prism/make_tags.rb	/^          def m6; end$/;"	F	class:M1.M2.C1.C2
+# m7	sample/prism/make_tags.rb	/^          def m7; end$/;"	F	class:M1.M2.C1.C2.C3
+# m8	sample/prism/make_tags.rb	/^          def m8; end$/;"	F	class:M1.M2.C1.C2.C4.C5
+# m9	sample/prism/make_tags.rb	/^          def m9; end$/;"	F	class:M1.M2.C1.C2.
+
+__END__
+module M1
+  module M2
+    class C1
+      class C2 < Object
+        def m1; end
+        def m2; end
+
+        alias m3 m1
+        alias :m4 :m2
+
+        def self.m5; end
+
+        class << self
+          def m6; end
+        end
+
+        class << C3
+          def m7; end
+        end
+
+        class << C4::C5
+          def m8; end
+        end
+
+        class << c
+          def m9; end
+        end
+      end
+    end
+  end
+
+  module M3::M4
+    attr_accessor :m10, :m11
+    attr_reader :m12, :m13, :m14
+    attr_writer :m15
+  end
+
+  module self::M5
+  end
+
+  C6 = 1
+  C7 = 2
+  C8::C9 = 3
+end
diff --git a/sample/prism/multiplex_constants.rb b/sample/prism/multiplex_constants.rb
new file mode 100644
index 00000000000000..e39f2c36f62fd2
--- /dev/null
+++ b/sample/prism/multiplex_constants.rb
@@ -0,0 +1,138 @@
+# This script indexes the classes and modules within a set of files using the
+# saved source functionality.
+
+require "prism"
+require "etc"
+require "tempfile"
+
+module Indexer
+  # A class that implements the #enter functionality so that it can be passed to
+  # the various save* APIs. This effectively bundles up all of the node_id and
+  # field_name pairs so that they can be written back to the parent process.
+  class Repository
+    attr_reader :scope, :entries
+
+    def initialize
+      @scope = []
+      @entries = []
+    end
+
+    def with(next_scope)
+      previous_scope = scope
+      @scope = scope + next_scope
+      yield
+      @scope = previous_scope
+    end
+
+    def empty?
+      entries.empty?
+    end
+
+    def enter(node_id, field_name)
+      entries << [scope.join("::"), node_id, field_name]
+    end
+  end
+
+  # Visit the classes and modules in the AST and save their locations into the
+  # repository.
+  class Visitor < Prism::Visitor
+    attr_reader :repository
+
+    def initialize(repository)
+      @repository = repository
+    end
+
+    def visit_class_node(node)
+      repository.with(node.constant_path.full_name_parts) do
+        node.constant_path.save_location(repository)
+        visit(node.body)
+      end
+    end
+
+    def visit_module_node(node)
+      repository.with(node.constant_path.full_name_parts) do
+        node.constant_path.save_location(repository)
+        visit(node.body)
+      end
+    end
+  end
+
+  # Index the classes and modules within a file. If there are any entries,
+  # return them as a serialized string to the parent process.
+  def self.index(filepath)
+    repository = Repository.new
+    Prism.parse_file(filepath).value.accept(Visitor.new(repository))
+    "#{filepath}|#{repository.entries.join("|")}" unless repository.empty?
+  end
+end
+
+def index_glob(glob, count = Etc.nprocessors - 1)
+  process_ids = []
+  filepath_writers = []
+  index_reader, index_writer = IO.pipe
+
+  # For each number in count, fork off a worker that has access to two pipes.
+  # The first pipe is the index_writer, to which it writes all of the results of
+  # indexing the various files. The second pipe is the filepath_reader, from
+  # which it reads the filepaths that it needs to index.
+  count.times do
+    filepath_reader, filepath_writer = IO.pipe
+
+    process_ids << fork do
+      filepath_writer.close
+      index_reader.close
+
+      while (filepath = filepath_reader.gets(chomp: true))
+        results = Indexer.index(filepath)
+        index_writer.puts(results) if results
+      end
+    end
+
+    filepath_reader.close
+    filepath_writers << filepath_writer
+  end
+
+  index_writer.close
+
+  # In a separate thread, write all of the filepaths to the various worker
+  # processes. This is done in a separate threads since puts will eventually
+  # block when each of the pipe buffers fills up. We write in a round-robin
+  # fashion to the various workers. This could be improved using a work-stealing
+  # algorithm, but is fine if you don't end up having a ton of variety in the
+  # size of your files.
+  writer_thread =
+    Thread.new do
+      Dir[glob].each_with_index do |filepath, index|
+        filepath_writers[index % count].puts(filepath)
+      end
+    end
+
+  index = Hash.new { |hash, key| hash[key] = [] }
+
+  # In a separate thread, read all of the results from the various worker
+  # processes and store them in the index. This is done in a separate thread so
+  # that reads and writes can be interleaved. This is important so that the
+  # index pipe doesn't fill up and block the writer.
+  reader_thread =
+    Thread.new do
+      while (line = index_reader.gets(chomp: true))
+        filepath, *entries = line.split("|")
+        repository = Prism::Relocation.filepath(filepath).filepath.lines.code_unit_columns(Encoding::UTF_16LE).leading_comments
+
+        entries.each_slice(3) do |(name, node_id, field_name)|
+          index[name] << repository.enter(Integer(node_id), field_name.to_sym)
+        end
+      end
+    end
+
+  writer_thread.join
+  filepath_writers.each(&:close)
+
+  reader_thread.join
+  index_reader.close
+
+  process_ids.each { |process_id| Process.wait(process_id) }
+  index
+end
+
+index_glob(File.expand_path("../../lib/**/*.rb", __dir__))
diff --git a/sample/prism/relocate_constants.rb b/sample/prism/relocate_constants.rb
new file mode 100644
index 00000000000000..faa48f6388d4d4
--- /dev/null
+++ b/sample/prism/relocate_constants.rb
@@ -0,0 +1,43 @@
+# This script finds the declaration of all classes and modules and stores them
+# in a hash for an in-memory database of constants.
+
+require "prism"
+
+class RelocationVisitor < Prism::Visitor
+  attr_reader :index, :repository, :scope
+
+  def initialize(index, repository, scope = [])
+    @index = index
+    @repository = repository
+    @scope = scope
+  end
+
+  def visit_class_node(node)
+    next_scope = scope + node.constant_path.full_name_parts
+    index[next_scope.join("::")] << node.constant_path.save(repository)
+    node.body&.accept(RelocationVisitor.new(index, repository, next_scope))
+  end
+
+  def visit_module_node(node)
+    next_scope = scope + node.constant_path.full_name_parts
+    index[next_scope.join("::")] << node.constant_path.save(repository)
+    node.body&.accept(RelocationVisitor.new(index, repository, next_scope))
+  end
+end
+
+# Create an index that will store a mapping between the names of constants to a
+# list of the locations where they are declared or re-opened.
+index = Hash.new { |hash, key| hash[key] = [] }
+
+# Loop through every file in the lib directory of this repository and parse them
+# with Prism. Then visit them using the RelocateVisitor to store their
+# repository entries in the index.
+Dir[File.expand_path("../../lib/**/*.rb", __dir__)].each do |filepath|
+  repository = Prism::Relocation.filepath(filepath).filepath.lines.code_unit_columns(Encoding::UTF_16LE)
+  Prism.parse_file(filepath).value.accept(RelocationVisitor.new(index, repository))
+end
+
+puts index["Prism::ParametersNode"].map { |entry| "#{entry.filepath}:#{entry.start_line}:#{entry.start_code_units_column}" }
+# =>
+# prism/lib/prism/node.rb:13889:8
+# prism/lib/prism/node_ext.rb:267:8
diff --git a/sample/prism/visit_nodes.rb b/sample/prism/visit_nodes.rb
new file mode 100644
index 00000000000000..5ba703b0a36b82
--- /dev/null
+++ b/sample/prism/visit_nodes.rb
@@ -0,0 +1,63 @@
+# This script visits all of the nodes of a specific type within a given source
+# file. It uses the visitor class to traverse the AST.
+
+require "prism"
+require "pp"
+
+class CaseInsensitiveRegularExpressionVisitor < Prism::Visitor
+  def initialize(regexps)
+    @regexps = regexps
+  end
+
+  # As the visitor is walking the tree, this method will only be called when it
+  # encounters a regular expression node. We can then call any regular
+  # expression -specific APIs. In this case, we are only interested in the
+  # regular expressions that are case-insensitive, which we can retrieve with
+  # the #ignore_case? method.
+  def visit_regular_expression_node(node)
+    @regexps << node if node.ignore_case?
+    super
+  end
+
+  def visit_interpolated_regular_expression_node(node)
+    @regexps << node if node.ignore_case?
+
+    # The default behavior of the visitor is to continue visiting the children
+    # of the node. Because Ruby is so dynamic, it's actually possible for
+    # another regular expression to be interpolated in statements contained
+    # within the #{} contained in this interpolated regular expression node. By
+    # calling `super`, we ensure the visitor will continue. Failing to call
+    # `super` will cause the visitor to stop the traversal of the tree, which
+    # can also be useful in some cases.
+    super
+  end
+end
+
+result = Prism.parse_stream(DATA)
+regexps = []
+
+result.value.accept(CaseInsensitiveRegularExpressionVisitor.new(regexps))
+regexps.each do |node|
+  print node.class.name.split("::", 2).last
+  print " "
+  puts PP.pp(node.location, +"")
+
+  if node.is_a?(Prism::RegularExpressionNode)
+    print "  "
+    p node.unescaped
+  end
+end
+
+# =>
+# InterpolatedRegularExpressionNode (3,9)-(3,47)
+# RegularExpressionNode (3,16)-(3,22)
+#   "bar"
+# RegularExpressionNode (4,9)-(4,15)
+#   "bar"
+
+__END__
+class Foo
+  REG1 = /foo/
+  REG2 = /foo #{/bar/i =~ "" ? "bar" : "baz"}/i
+  REG3 = /bar/i
+end
diff --git a/sample/trick2025/01-omoikane/authors.markdown b/sample/trick2025/01-omoikane/authors.markdown
new file mode 100644
index 00000000000000..5c6823c0773d81
--- /dev/null
+++ b/sample/trick2025/01-omoikane/authors.markdown
@@ -0,0 +1,5 @@
+* Don Yang
+  * omoikane@uguu.org
+  * cctld: us
+  * bsky.app/profile/omoikane.bsky.social
+  * twitter.com/uguu_org
diff --git a/sample/trick2025/01-omoikane/bf.rb b/sample/trick2025/01-omoikane/bf.rb
new file mode 100644
index 00000000000000..74f5abe7e4ef60
--- /dev/null
+++ b/sample/trick2025/01-omoikane/bf.rb
@@ -0,0 +1,81 @@
+#!/usr/bin/ruby -w
+# Simple BF interpretor.
+#
+# This works by translating input code into ruby and evaluating the
+# translated ruby code.  Doing it this way runs much faster than
+# interpreting BF on our own.
+#
+# There is no error reporting whatsoever.  A malformed input may result in
+# a syntax error at run time, but good luck in finding where it came from.
+
+
+# Setup empty tape and initial pointer position.  Note that tape size is
+# fixed.  We can make it infinite by initializing it to "[]" here and
+# adding some nil checks in the generated code, but avoiding those checks
+# makes the program run ~10% faster.
+$code = "t=Array.new(30000,0); p=0;"
+
+# Counters for pending add or shift operations.  We buffer incoming +-<>
+# operators and output a single merged operation when we encounter a
+# different operator.
+$buffered_add = 0
+$buffered_shift = 0
+
+# Flush pending add operations, if any.
+def flush_add
+   if $buffered_add != 0
+      $code += "t[p]+=#{$buffered_add};"
+      $buffered_add = 0
+   end
+end
+
+# Flush pending shift operations, if any.
+def flush_shift
+   if $buffered_shift != 0
+      $code += "p+=#{$buffered_shift};"
+      $buffered_shift = 0
+   end
+end
+
+def flush_pending_ops
+   flush_add
+   flush_shift
+end
+
+# Convert input characters to ruby.
+ARGF.each_char{|c|
+   case c
+   when '+'
+      flush_shift
+      $buffered_add += 1
+   when '-'
+      flush_shift
+      $buffered_add -= 1
+   when '<'
+      flush_add
+      $buffered_shift -= 1
+   when '>'
+      flush_add
+      $buffered_shift += 1
+   when ','
+      flush_pending_ops
+      $code += "if c=STDIN.getc;" +
+               "t[p]=c.ord;" +
+               "else;" +
+               "t[p]=-1;" +  # EOF is interpreted as -1.
+               "end;"
+   when '.'
+      flush_pending_ops
+      $code += "print t[p].chr;"
+   when '['
+      flush_pending_ops
+      $code += "while t[p]!=0;"
+   when ']'
+      flush_pending_ops
+      $code += "end;"
+   end
+}
+flush_pending_ops
+
+# Evaluate converted code.
+eval $code
diff --git a/sample/trick2025/01-omoikane/entry.rb b/sample/trick2025/01-omoikane/entry.rb
new file mode 100644
index 00000000000000..c84f8079ae2862
--- /dev/null
+++ b/sample/trick2025/01-omoikane/entry.rb
@@ -0,0 +1,32 @@
+            a=+Math::PI/13
+          #Z---z';#za-mRUBY
+         #A-ZaA-Mn--\[+>+>++
+         '"N-Z(\++\[->++++@"
+        b=\[->+>     +>+>\[h_
+        p%{}             eact
+       zoraq  ;%{   GF.  rin);
+       %{eb} r   A R   p *""\]
+      <<<{{{             }<\]<b
+     ]<l(%w|    }   ;    a;a=%Y/
+    evar{|c)}    <][    #pgny\W{f
+    chaa,b)]>++[     ->+>>>>>[40v
+   .tr(= ' ;eval(%w{r=u=b= y =0;%{
+  (ct;c ) ; ] <<->--<<< < < ] >>[>,
+ exi}; a * = A RGV.siz e > 0 ? -1:1;
+ z=[] ; A R G F .ea c h _ l i n e{|i
+|i.eac h _ g r aph e m e _ c l u ster
+{|j|i f ( k = j.o r d ) < 3 3 ; r+=k<
+32?k==9? 8 - r%8 : k = = 1 0 | |k==13
+?[u+=1,-r][ 1]: 0 : 1 ; e lse;z+=[[u,
+r,j]];b+=r;y+=u;r+=1;end;}};if(s=z.si
+ze)>0;b/=s;y/=s;m,n=z[0];i=Math::tan(
+a/2);j=Math::sin(a);z.map!{|d|p=d[1]-
+b;q=d[0]-y;p-=(i*q).round;m=[m,q+=(j*
+ p).round].min;n=[n,p-=(i*q).round].
+  min;[q,p,d[2]]};r=n;u=m;z.sort.eac
+   h{|d|p,b=d;r=(u<p)?n:r;print"\n"
+    *(p-u),"\40"*(b-r),d[2];u=p;r=
+     b+1};print"\n";end}*"");%(]>
+       "tyvuts(}}.--.>--.>+.<++'
+         )b\40"gena.(c)2025<<<
+           #)#ehol""+a*.^_^
diff --git a/sample/trick2025/01-omoikane/remarks.markdown b/sample/trick2025/01-omoikane/remarks.markdown
new file mode 100644
index 00000000000000..2aa77d64e434ce
--- /dev/null
+++ b/sample/trick2025/01-omoikane/remarks.markdown
@@ -0,0 +1,71 @@
+### Summary
+
+This is a rot13 filter.  Given an input text, it will **rotate** the text by **pi/13** radians.  Two modes of operation are available, selected based on number of command line arguments.
+
+Rotate clockwise:
+
+    ruby entry.rb < input.txt
+
+Rotate counterclockwise:
+
+    ruby entry.rb input.txt
+    ruby entry.rb - < input.txt
+
+### Details
+
+This program interprets input as an ASCII art with each character representing individual square pixels, and produces a rotated image to stdout.  All non-whitespace characters are preserved in output, only the positions of those characters are adjusted.  While all the characters are preserved, the words and sentences will not be as readable in their newly rotated form.  This makes the program suitable for obfuscating text.
+
+    ruby entry.rb original.txt > rotated.txt
+    ruby entry.rb < rotated.txt > unrotated.txt
+
+But note that while `unrotated.txt` is often the same as `original.txt`, there is no hard guarantee due to integer rounding intricacies.  Whether the original text can be recovered depends a lot on its shape, be sure to check that the output is reversible if you are using this rot13 filter to post spoilers and such.
+
+Reversibility does hold for `entry.rb`:
+
+    ruby entry.rb entry.rb | ruby entry.rb | diff entry.rb -
+    ruby entry.rb < entry.rb | ruby entry.rb - | diff entry.rb -
+
+Also, there is a bit of text embedded in the rotated version:
+
+    ruby entry.rb entry.rb | ruby
+
+But this text is encrypted!  No problem, just rotate `entry.rb` the other way for the decryption tool:
+
+    ruby entry.rb < entry.rb > caesar_cipher_shift_13.rb
+    ruby entry.rb entry.rb | ruby | ruby caesar_cipher_shift_13.rb
+
+If current shell is `bash` or `zsh`, this can be done all in one line:
+
+    ruby entry.rb entry.rb | ruby | ruby <(ruby entry.rb < entry.rb)
+
+### Miscellaneous features
+
+To rotate to a different angle, edit the first line of `entry.rb`.  Angles between -pi/2 and pi/2 will work best, anything outside that range produces more distortion than rotation, although the output might still be reversible.
+
+Setting angle to zero makes this program a filter that expands tabs, trim whitespaces, and canonicalize end-of-line sequences.
+
+This program preserves non-ASCII characters since input is tokenized with `each_grapheme_cluster`, although all characters that's not an ASCII space/tab/newline are given the same treatment.  For example, the full-width space character (U+3000) will be transformed as if it's a half-width non-whitespace ASCII character.
+
+If input contains only whitespace characters, output will be empty.
+
+The layout is meant to resemble a daruma doll.  There was still ~119 bytes of space left after fitting in 3 ruby programs, so I embedded a brainfuck program as well.
+
+    ruby bf.rb entry.rb
+
+A `sample_input.txt` has been included for testing.  After rotating this file 26 times either clockwise or counterclockwise, you should get back the original `sample_input.txt`.
+
+    ruby entry.rb < sample_input.txt | ruby entry.rb | ruby entry.rb | ruby entry.rb | ruby entry.rb | ruby entry.rb | ruby entry.rb | ruby entry.rb | ruby entry.rb | ruby entry.rb | ruby entry.rb | ruby entry.rb | ruby entry.rb | ruby entry.rb | ruby entry.rb | ruby entry.rb | ruby entry.rb | ruby entry.rb | ruby entry.rb | ruby entry.rb | ruby entry.rb | ruby entry.rb | ruby entry.rb | ruby entry.rb | ruby entry.rb | ruby entry.rb | diff sample_input.txt -
+    ruby entry.rb sample_input.txt | ruby entry.rb - | ruby entry.rb - | ruby entry.rb - | ruby entry.rb - | ruby entry.rb - | ruby entry.rb - | ruby entry.rb - | ruby entry.rb - | ruby entry.rb - | ruby entry.rb - | ruby entry.rb - | ruby entry.rb - | ruby entry.rb - | ruby entry.rb - | ruby entry.rb - | ruby entry.rb - | ruby entry.rb - | ruby entry.rb - | ruby entry.rb - | ruby entry.rb - | ruby entry.rb - | ruby entry.rb - | ruby entry.rb - | ruby entry.rb - | ruby entry.rb - | diff sample_input.txt -
+
+Additional development notes can be found in `spoiler_rot13.txt` (rotate clockwise to decode).
+
+    ruby entry.rb < spoiler_rot13.txt
+
+### Compatibility
+
+Program has been verified to work under these environments:
+
+   * ruby 3.2.2 on cygwin.
+   * ruby 2.5.1p57 on linux.
+   * ruby 2.7.4p191 on linux.
+   * ruby 2.7.1p83 on jslinux.
diff --git a/sample/trick2025/01-omoikane/sample_input.txt b/sample/trick2025/01-omoikane/sample_input.txt
new file mode 100644
index 00000000000000..244530f265a64e
--- /dev/null
+++ b/sample/trick2025/01-omoikane/sample_input.txt
@@ -0,0 +1,35 @@
+                  T   U
+              S           V
+
+          R       T   U       W
+              S           V
+
+       Q   R                 W   X
+
+         Q                     X
+     P           i h g f           Y
+               j         e
+       P     k             d     Y
+
+    O       l               c       Z
+      O                           Z
+            m               b
+
+*   N N     n       +       a     A A   *
+
+            o               z
+      M                           B
+    M       p               y       B
+
+       L     q             x     C
+               r         w
+     L           s t u v           C
+         K                     D
+
+       K   J                 E   D
+
+              I           F
+          J       H   G       E
+
+              I           F
+                  H   G
diff --git a/sample/trick2025/01-omoikane/spoiler_rot13.txt b/sample/trick2025/01-omoikane/spoiler_rot13.txt
new file mode 100644
index 00000000000000..91636176b8e6dd
--- /dev/null
+++ b/sample/trick2025/01-omoikane/spoiler_rot13.txt
@@ -0,0 +1,470 @@
+                                                                        .
+                                                                    text
+                                                                ted t to
+                                                            rota tex
+                                                        dit HTML
+                                                    to etes         oss
+                                               sier  wri         acr
+                                            t earb"),        ions             .
+                                        ke itry.         etat             text
+                                    o ma "en         erpr            tive
+                                ge te.g.        e int:           erna
+                            L paut (        tiplsteps         alt        edit,he
+                       a HTM inp         muling          cted        ach dit tu
+               -w  tes nt as        havellow         expe        er ely ere yo
+           uby neragume         can e fo         the          aftrect whethis
+        in/rt gee ar         hat y th    t.   has         stepindicesshat
+   usr/bcripingl        ext tt tr     texsult         ion  to  prois w
+#!/his s a s        of t migh    inale re        rotatededis aich         ts.
+# TTakest.      ece  you     origf th        tra ts neike , wh         tex
+ # stdou    a piles,     the ck i        e exemenuld lusly        ated    the
+ #      ite  ang    s tod che        f th movu wotaneo         rot    pen
+ # To wrrent    edit, an         se orsort yoimul          and    nd o         ne.
+ # diffe    ome tion1-2.     ecaue cu Whats s         inal    t, a        en do
+  #      ke srotaeps     ous be thve.  tex         orig    ayou        t wh
+  # 1. Maply t st    tediecausuitiated        hold     he l         tex     this
+  # 2. Apepea     is lt bunint rot         to     rom ted.     ated     but
+  #  3. R    cessficu is l and        ough    le fenabl     upd    nce,          in
+   #      pro diftextgina         e en    L fiipt       the    atie        dable
+   # Thisalsoive  ori         larg     HTMascr    paste    of p         reay
+   # and rnat thedes:    at's     te a jav    opy&     bit its.    t is Rubke   },
+   # alteeditrovi    t th     nerawith    en c    fair l ed     thar ine-li, %w{
+    # can pt p    ayou    to geser     , th    h a manua    textasiequot %()
+    # scri     a l    ipt  brow    page     witose      ing 's eple %{},
+    #     Make     scrin a     TML     textn th     writt itulti of         ter
+    ## 1.     thisTML     the H    dit ly o    lly:l, buas m use         Ras         t
+     #    Run ut H    via      ly euick    ficaiviauby hakestes.    eral          wan
+     # 2. outp    its     anualte q    peciy trse R.rb m quo     Gen        nd we
+     #        y ed    to mitera    by sactlecauntryouble     for        rs a
+     #    Appl    eed you      g Rut exs, b.  ele+d     ithm        acte
+     # 3.     ll nlet     ardins nouageientsing    Algor        char        paperpplyg
+      #     stiill      regons ilangnvenmon     ast ces:     are         nal ply ardin
+      # Youol w    hingtatither e co com    "A Feren     els         rigi sim regato
+       # to    re trienny o quit the     on diff    r pix        .  O andailsnter
+       #   e mole oo ma areourse    asedtwo     e ous.       tionates detn ce         o
+       # Onltiped tthatof c     is bith     sincalue     rotardine toatio         is n
+       # mumparors and     ithm h, w    ls, er v    r of  coot du rot        here ns  d
+       # coerat//,     lgor Paet    pixeract    enteinput, but to        r, tratio, an.
+       # op{},     on aAlan     ing  cha    ng cthe as isspecion.    ente opeinput two
+        # %W    tati by     blendinal    ardiing ues th reunct    on ctionthe ne or
+        #   e roion"    for  orig     reghift vale witer f    tatirota of a li
+        # Thotat    ort  the     tionut snate car_cen     e roise hapeextr
+         # R    supperve    idera aboordixtra get    stablockwhe s an         ons.
+         #   No pres    consthingd coed e see    ore terclon tting        tatiugh
+         # - to     nal  any-basee neble,     a mcoun lot nser        e roltho
+         #      itio sayto 0ng, wersi    tingise/ds a by i        oducd, a
+         #   Addsn'trms undit rev    elecockwepenible         ] prstea
+          # - doensfor routpu     in se clIt dvers         pi/2t in            ly to
+          #   trategehe o    care utivt.  e re        i/2,  tex            ical
+          #    inke t    tra onsecr ou mad         [-pt the            omat
+           #   ma    h exat c othen be        weenstorible.         aut
+           #      wite theachon ca         beto divers         sted
+           # Evenantecel tati         glesnd te re         adju            s.
+           # guar cane ro         y ane tell b        l be             ment
+           # willn th          Onlrang sti         wil              ele
+            # ofte        gle.that ight        idth             text
+            #         n anide ion m        .  W             ble                 erialink
+                  atiooutsrmat/ 13     entss.          edita        les.    he scan l
+               Rotles nsfo:PI      elemcell        all           tup    .  T we
+             # Ang traath:    edit ter          to          eme)    textthat
+             # the = M     of harac        ched        graph    ate uch her.
+             #NGLE    ightre c.9em"    atta        al,       rotD, sh ot
+             A    e hesqua= "0      be         seri    me toue I eac
+               Linure GHT     me to         x,     aphe uniqs to
+              # ens_HEI    s na          (y,    d grme aation
+              #LINE    clas "t"     t of    s anaphe rot
+                   yle SS =    a lis    nateh grrent
+               # St_CLA     as      ordi eaciffe
+               EDIT    nput    he cogivess d
+                   ad i    ed td to acro
+               # Lo    y neaddeheme
+               #    onl is grap          0
+                # Wemberame put      _y =        {|c|
+                # nuhe sd_in]   ursor        ster
+                 # t loa = [ = c     ine|_clu            8
+                 defdataor_x 0  ne{|lheme            x %
+                    cursal =h_li_grap     1      sor_r\n"             ]
+                    seri.eaceach= " "x +="    cur= "\             , c]
+                    ARGFine. c =rsor_ "\t 8 - c =             rial
+                       l  if  cu c ==x +=" ||            x, se
+                             lsifrsor_ "\n0           sor_
+                            e  cu c ==x =  1       cur
+                             lsifrsor_y +=    r_y,                                          t
+                            e  cursor_    urso                                           thay
+                               cu      [[c= 1                                      ilityed bext.
+                             lse ta +=_x +1                                    obabollowal t
+                            e  daursor +=                                  e pron frigin
+                                cerial                         ass.    s thtatihe o
+                                 s                          of m    easee roin t    l be hat
+                              end                      nter     incrkwislts      wilges thave
+                                                   m ce    nter clocresu    heret ed  We
+                           }      a             fro    n cee. a sa)     o, taighion.
+                               dat         nter    atio, i.e ver     zer strotat
+                        } turn         n ce     rotible vic     frome.g.he r                 ,
+                        re        tatio    s asvers (or    away er, er t                 tione.
+                      nd      e ro      mase retion    und  cent aftcts:             rotaitiv
+                     e    mput    er ofll brota    e rotionld betifa    o.  ox. ftern pos
+                       # Co    centon wiise     ow wrotashouse ar     zerng box aemai     r
+                       #   ing tatilockw    to hthe hey  the     d ofunding bon r     othey
+                       # Use roterc     due ear an tduce    nsteaf bounditati    s atbilittion
+                       # thcoun    ely, ts nd tho re    ty iter of bor ro    factersiul op
+                       # a     unattifacaggegs t    fini cenner oafte    arti revusef         f
+                       #   forte arore jthin    e ino be cor and     get  theost          er or
+                       # Unsiblut mious     itivon to before      we losehe m         centr fo
+                       # vime o var      postation ts be     thatlso be t         theedito
+                        # coried    owardf rotatinate    e is we a to         ause an  and the t
+                         # t    nd tter of roordi    thes andpears        ll catesaddsm in  tha
+                         #   Rou center ol co     of ter,s ap         s wienerrts rithd for
+                         # - Set cenat al     all cen mas         cterly guppoalgo neer).
+                         # - Seth th     with ther of        charat onso sion reatithe
+                         # - suc    ened d ofente.       ing script alotat a gol e
+                         #      happnsteang cacts    emovhis r thahe re iss to
+                         #  hat es i  Usirtif    nd rhy tditoent tther thi
+                          # Wplacure.the a    ng ais wan eplemsure  for
+                           # featite      ertiich ave reimnot  need
+                           # desp    t ins, whTo h to  am  any
+                           #      thashiftt.  need.  Ie is
+                           # Note to g texill riptther
+                           # massacin we wvascure
+                           # repltes,ed jaot sa)
+                           # deleerat am n(dat                     ze
+                            #  genl (Ienter                    ta.si
+                             # tooet_cy = 0t|              / da
+                             #ef g = cach{|1]           cy
+                             d  cxta.e+= t[0]      ize,
+                                da cx += t[    ta.s        es.
+                                   cy      / da        inat
+                                      n cx         oorda)
+                                } etur         to ccy,                              .
+                                  r         ion cx,  2)                          gain
+                               end     rotatta, (a /                          X a
+                                   ply te(da:tan(a) |                    r in
+                               # AprotaMath::sinp{|tnts.             shea
+                               def x = Math:a.maonte            then
+                                  ry = n dater c cx          Y,
+                                  retur Cent1] - cy     r in                 me).
+                                  r   # = t[0] -    shead                aphe                 eme.
+                                      x = t[     X, round            , gr                graph
+                                       y     r in y).round       erial                ach
+                                         Shearx * x).roun    x, s                 nd e
+                                       # -= (ry * y).    (y,                  arou
+                                       x += (rx *    ted ]                pan
+                                       y -= (    updat[3]             ne s
+                                       x     urn 2],             ith o
+                                        # Ret, t[            xt wfix)
+                                        [y, x            L te_pre
+                                                       HTM, id
+                                      }           k ofdata0]      n
+                                     d        blocock(ata[    ].min
+                                   en    rate e_bl = d    t[1]].mi
+                                     Geneneratin_xt|  _x, t[0]
+                                   # f ge_y, mch{|[min_y,
+                                   de minta.eax = [min                 >\n"
+                                       da min_y =                 ix}\"
+                                           min_        x       pref
+                                                   min_y   {id_
+                                        }      x = min_=\"#             r_y)
+                                          rsor_y = e id{|t|        curso
+                                        cursor_"<preach        y -
+                                        cuxt = ort.t    < y * (
+                                        teata.sx = or_y"\n"
+                                         d  y, curs +=  = yin_x
+                                             if textor_y = m
+                                                cursor_x
+                                                curs        [3] &"  "
+                                                         = t== "amp;"
+                                             end    textext = "&= "<
+                                                ner_er_text xt =lt;""                        ' +
+                                              in inner_tr_te= "&= ">                      '">
+                                              if inninneext xt =gt;"             SS +_s +
+                                                sif er_tr_te= "&         x) +_CLA].to
+                                               el inninneext         rsor_EDIT t[2
+                                                 sif er_t        - cu"' + ix +
+                                               el inn         (x ass=_pref
+                                                 d        " *n cl+ id                              low.
+                                               en    += "<spa="' t +                          er be
+                                                 ext    '" id_tex                         numb
+                                                t       'nneran>"                     ial          ns.
+                                                        i</sp+ 1                   ser        colum
+                                                         "= x     re>"         next.        by
+                                                      r_x     n</p         the airs    them
+                                                  urso    + "\        find er p    oup
+                                                 c    ext         er,  numbta) d gr
+                                              }   rn t        numbrialap(das an
+                                              retu        ial f sewn_my row
+                                             nd        serst or_dors b
+                                            e     eacha liursoumbe
+                                               For rns te_cal n             ]]
+                                             # Retuneraseri}   |t| ]    [t[2
+                                             #ef geort  = {ach{t[1]] +=     ]
+                                             d  # Sumnsrt.emns[t[1]    [t[2]
+                                                cola.socolumns[    ] =              n.
+                                                dat if colu    t[1]             olum        0]])                 .
+                                                       e   mns[             ch c         [r[                 ight
+                                                    elscolu            or ea        1] +                 he r         by
+                                                                    rs f         e -                  to t        sortnext
+                                                     end        umbe         .siz                mber          we the
+                                                            al n    r|  [1, r                l nu         o if us
+                                                  }     seri [] |_, ip(r                 eria         s, s get
+                                                    Add ls =ach{ r.z                 xt s        inateould        )
+                                                  # erians.es +=                 e ners.     oordhat w        [0]]
+                                                   solumrial    s            d th pai    n) c1, t         ials
+                                                   c  se    rial        , finmberta) olum by          [ser                 a
+                                                        n se        mberal nup(daw, cials        1] +                  extr
+                                                    }etur        l nuseriht_ma (ro ser        e -                   one
+                                                    r        eria of _rig with all        .siz                  get
+                                                 end     ch slistrsortartotate    [2]}ials        .        e we        ,'
+                                                     r eas a e_cues snd r     t| t ser        airs     sinc        + '"
+                                                 # Foturnerattuples a.   map{|s[1,        ue p)   ine,         o_s
+                                                 # Re genput tuplbersort.erial         valairsnewl         1].t
+                                                  def# Input  numta.sip(s          keyal_ping          + t[
+                                                     # inrial= dals.z         s asserirail        efix
+                                                      # seals eria         pairix, ut t        + pr
+                                                      serirn s        mber(prefitho         "'
+                                                      retu        l nu_mapies wate.     '":
+                                                              eriarsorentrtempl|t| _s +
+                                                   end    at st_cumap the .map{].to
+                                                      Formnverate rom airs+ t[0
+                                                    # f coenerne fal_pfix
+                                                    de # Gewliseri pre             es.
+                                                        # nurn "' +             valu
+                                                        ret'   "           nate
+                                                            "\n        ordi
+                                                        } *        f co)   a[0]
+                                                       d       ge odata dat
+                                                     en     ranize(_x =
+                                                        Getet_s minn_x
+                                                      #ef gn_y,= min_y          min                 1
+                                                       d  mix_x = mi|t|     , x].max             y +
+                                                          max_y ach{t   in_x, x].min         min_
+                                                          mata.ex = = [max_x, y].max     y -
+                                                          da y, n_x = [min_y, y].    max_
+                                                              mix_x = [max_y      1,
+                                                              man_y = [m    n_x +
+                                                              mix_y     - mi
+                                                              ma    x_x
+                                                                n ma
+                                                            }etur
+                                                            r            ut
+                                                         end         _inp
+                                                                 loadty?          )   a)      GLE))                        /td>
+                                                             a = .emp        (data(dat     -ANNGLE                     ")}<     >
+                                                          datdatarn      nter_size     cy,y, A        d>       r>  , "Ltd> }</td
+                                                          if retu    t_ce get      cx,x, c        /hea     "><tdata)}</"R")
+                                                                 = geht =    data,a, c        le><    ng="4eft_ "M"ta,
+                                                           end cy heig    ate(e(dat        /tit    addiock(lata,t_da
+                                                           cx,th,      rototat         est<    ellpe_block(drigh
+                                                           wid    ta = = r         te t    1" cerate_bllock(
+                                                              t_dadata        >Rota    ng="{generatte_b         l>
+                                                           lefght_    OT" itle     pacip">#{gennera         labe
+                                                            ri    <<"Ed><t    cells="top">##{ge        le)</
+                                                              int <hea    "1" align="toop">    ">  togg                                  or
+                                                            prtml>    der=t" valignn="t    edit to l>                                 errght,
+                                                             <hody> bor"left" vvalig    id="(ESC"><u                              izes-hei
+                                                             <bableign="lefft"      ox" dit nonet.                           minimline
+                                                             <td align=="le    heckble elay: tex                         hat sing
+                                                             <td allignble>e="c>Enabdisplace    .                    ne tcreap.
+                                                             <ttd a</ta typdit"yle=" repor. anel                 he oy deerla
+                                                              </tr>nputr="e" sters =cursct p                 ep tis bo ov
+                                                              <p><il fohelpractmove sele                nd keo thes t
+                                                              <labeid=" chas = ab =                 s, also d lin
+                                                               <div SCII keyft+to.           ">  aluean ae the                             ;
+                                                               <li>Arrow shi und         riptng vWe ccaus                              ght)
+                                                               <li>Aab /+Z =         vascpacio.  ill                               tHei
+                                                               <li>TCtrliv>     xt/jaer-sratich wM");;                        offse
+                                                               <<li>></d    ="te lettect o muId("HT}"                     / p.
+                                                                </ul    typerentd aspt tontByHEIG                     dth
+                                                                    ipt iffesireg thalemeINE_                     etWi
+                                                                <scrry de deasin.getE"#{L        2)           offs
+                                                                // To thecrementht =          0.0         - p.
+                                                                 // tut ddocuHeig         x +=    em";ght}
+                                                                 // bp = line= 0; 2;  .0;      + "{hei
+                                                                 var yle.t_x or =x < 2     = x / #
+                                                                 p.st bes_err 0;      cingdth}
+                                                                  var min x =    erSpa#{wi
+                                                                  var(var    lett.abs( )
+                                                                  for    yle.Mathr > e
+                                                                  {  p.ste = erro     ;   ;
+                                                                      var min_    r = e"em"
+                                                                      if(     erro x +         t_x;);  }";
+                                                                      {   min__x =          bes("L"IGHT
+                                                                          best         ng =ByIdE_HE
+                                                                                  Spaciment{LINt_x;"); T}";
+                                                                       }      tteretEle= "# besd("REIGH
+                                                                          e.lent.gight ng =tByINE_H;
+                                                                    } stylcumeneHeSpaciemen#{LIst_x
+                                                                     p.= doe.littergetEl = "= be
+                                                                     p style.leent.eighting
+                                                                     p.stylocumineHrSpac                                         ta))}
+                                                                     p. = dle.lette         e;                               t_da     }
+                                                                      p.style.l    tate.fals    .                        (lefa))}ata))
+                                                                      p.sty    le sit =     tion        ns.          _map(datht_d
+                                                                      p    itabe_ed     posi        itio         down_map(rig
+                                                                       / Wrnabl    rsor ;        pos        rsor_down_map             )}
+                                                                       /ar e    t cu "M0"    rsor        e_cursor_down            data)
+                                                                       v    rrenor =     t cu        erate_cursor_            eft_)}   ))}
+                                                                        / Cucurs    o nex         generate_cu             ap(lata)_data
+                                                                       /var     ng t         "L", generat             ht_map(dight
+                                                                            appi =       map("M", gen             _right_map(r
+                                                                        // Mdown    rsor_map("R",            ursor_right_m
+                                                                        var     t_cursor_map(            te_cursor_rig
+                                                                        {   nvert_cursor_            nerate_cursor
+                                                                         #{convert_cu             , generate_c
+                                                                         #{conver             ("L", genera         rs.
+                                                                         #{co    ht =     _map("M", ge        ) pai
+                                                                          };  rig    ursor_map("R"        text
+                                                                          var    rt_cursor_map        nal
+                                                                          {  onvert_cursor        rigi
+                                                                          #{convert_c         x, o                     n))
+                                                                          #{conve         uffi        .            (dow
+                                                                          #{c        (id s [];    ions        tries
+                                                                           };      of ist =    osit        t.en             )
+                                                                              Listdo_l     or p        bjec             ght)
+                                                                           // r un     curs        of O             s(ri
+                                                                            va    erse};       ue]             ntrie
+                                                                               Rev = { {};  val            ct.e
+                                                                            //r upft =[key,            Obje
+                                                                            var lenst      key;     of
+                                                                            var(co    e] =     lue]
+                                                                             fo    valu     , va                             on.
+                                                                             {  up[     [key    ey;                      siti
+                                                                                   onst      = k                     e po            ;
+                                                                              }or(c    alue]        .           e sam            tyle;
+                                                                              f    ft[v         okes$/;     t th              = style;
+                                                                              {  le         ystr!-~]    rs a             tyle = style
+                                                                                       ed ke /^[    actele)          x).style = s
+                                                                              }    cepteys =    char sty        suffix).style
+                                                                                / AcditK     for (id,    (1);" + suffix).s
+                                                                               /ar e    tyle tyle    bstrd("L" + suffi
+                                                                               v    et s setS    d.sutById("M" +
+                                                                                // Stion      = iementById("R                     .
+                                                                                func    uffixetElementByI                     tion
+                                                                                {   ar sent.getElemen                     posi
+                                                                                   vocument.getEl        n.           sor
+                                                                                   document.g        itio        s cur        .            0";
+                                                                                    docum          posd)      viou         tion        ff808
+                                                                                    d         rsoror(i     pre         posi        nd:#                         ;
+                                                                                  }      te cuCurs    t at        rsor     );  grou                         xt])
+                                                                                     Updan set    ligh"");    w cu     f80"back                         erTe
+                                                                                  // ctio     highor,     t ne    :#80f = "                         .inn
+                                                                                  fun    lear curs    ht a    oundstyle        ion.             fix)
+                                                                                  {  // Ctyle(    hlig    ckgrid).         osit              suf
+                                                                                     setS      hig     "bayId(         me p            "M" +t;
+                                                                                         pdate id;sor,entB        at sa            yId(= text;
+                                                                                      // Usor =(curElem        ers              entBext = text;
+                                                                                       curStyle.get        ractxt)          ElemnerText = tex
+                                                                                       setument         cha, te         .get).innerText
+                                                                                       doc          fort(id    1); umentffix).innerT
+                                                                                               texteTex    str( doc + suffix).in
+                                                                                    }     lace plac    .subfix,("L" + suffix
+                                                                                       Repon re    = id[sufById("M" + su
+                                                                                    //ncti     fix ush(mentById("R"
+                                                                                     fu    r sufst.ptElementById
+                                                                                     {   vado_lit.getElement
+                                                                                         uncument.getEle
+                                                                                         document.ge        it.                                   [1];
+                                                                                         documen        t ed        )                         ntry[1];
+                                                                                         do         ecen        = 0                      t = entry[1];
+                                                                                                st r()      th =                     rText = entry
+                                                                                      }    do moundo    leng                     innerText = e
+                                                                                        / Untion     ist.            );       ix).innerTex
+                                                                                       /func     do_l            pop(     suffix).inne
+                                                                                        {   f( un            ist.    L" + suffix).
+                                                                                           i     urn;    do_l[0];Id("M" + suff
+                                                                                           {  ret    = unntryntById("R" +
+                                                                                                 try  = elementById("
+                                                                                           }ar enffixgetElementBy         x);
+                                                                                           var suent.getEleme        suffi
+                                                                                            vdocument.getEit )    ] +
+                                                                                             document.e_ed    or[0
+                                                                                             documnabl    curs                                          ";
+                                                                                             if( e    sor(                                          line
+                                                                                             {    tCur                                           "in
+                                                                                                se            us.                          lay =
+                                                                                             }            statt()     it;              disp
+                                                                                                      dit _edi    e_ed             yle.                 ;
+                                                                                          }       ge eggle    nabl             ).st                 one"
+                                                                                               Chann to    = !e)            elp"                 = "n
+                                                                                            //nctio    dit dit     ;   Id("h                play     ;
+                                                                                            fu     le_ele_e    sor)ntBy                 .dis     edit
+                                                                                            {  enabenab    (curleme                 tyle    able_            )
+                                                                                               if(     rsorgetE                 ").s    = en             S}")
+                                                                                               {   etCuent.            ;    help    ked              CLAS
+                                                                                                  socum             "")yId("    chec             DIT_
+                                                                                                  d            sor,entB     t").            ("#{E
+                                                                                                 }  e       (curElem    ("edi            Name
+                                                                                                 els    tyle.get    ById             lass
+                                                                                                 {  setSment    ment             sByC    {
+                                                                                                    docu    tEle             ment     =>
+                                                                                                        t.ge        s.  etEle    ent)
+                                                                                                 }  umen        enernt.g      (ev
+                                                                                                 doc        listcume    ick",
+                                                                                                        ent f do    ("cl
+                                                                                               }     d ev t o    ener )                       => {
+                                                                                                // Adonst    Listedit                     nt)                          ) )
+                                                                                                for(c    ventble_    id);             (eve                          "Z"
+                                                                                                {    addE ena    r(t.             n",                          y ==
+                                                                                                   t. if(    urso             ydow                         t.ke
+                                                                                                      {  setC            r("ke                         even
+                                                                                                                     tene                           ||
+                                                                                                       }         tLis)        e" )            = "z"
+                                                                                                      );      Evendit     Escap            ey =
+                                                                                                     }    .addle_e    == "             nt.k                     ) )
+                                                                                                  }   mentenab    key              (eve                      "Z"
+                                                                                                  docuf( !    ent.    ();       &&                      y ==
+                                                                                                     i    ( ev    edit    rlKey                     t.ke
+                                                                                                     {  if    gle_    t.ct                      even
+                                                                                                        {  tog    even                     " ||
+                                                                                                              if(                      = "z
+                                                                                                         }lse     ;                ey =
+                                                                                                          e    do()             nt.k
+                                                                                                          {  un             (eve
+                                                                                                               n;      y &&             s) )
+                                                                                                          }etur    rlKe             tKey
+                                                                                                          r    t.ct             (edi    );
+                                                                                                       }   even            match    .key
+                                                                                                       if(     ();     key.     vent
+                                                                                                        {  undo    ent.    or, er]);     )
+                                                                                                                ( ev    curscurso    wUp"                             e" )
+                                                                                                         }  e if    ext(ght[     Arro                             spac
+                                                                                                         els    aceTr(ri     == "                             Back
+                                                                                                         {  replurso    .key     );      n" )             == "
+                                                                                                            setC    vent    rsor]    wDow             key
+                                                                                                                f( e    p[cu     Arro            vent.            )
+                                                                                                         }  se i    or(u     == "            || e             " "
+                                                                                                          el    Curs    .key     r]);    ft"               ==
+                                                                                                           {  set    vent    curso    owLe             .key
+                                                                                                                 f( e    own[     "Arr            event
+                                                                                                           } se i    or(d    y ==     ;        ||                      M"}
+                                                                                                           el    Curs    t.ke     or])    ght"                     ": "L"};
+                                                                                                           {  set    even    [curs    owRi                     , "R": "
+                                                                                                                 if(     left     "Arr                      "L", "R
+                                                                                                           } lse     sor(    y ==     );               "M": "R"
+                                                                                                            e    tCur    t.ke     sor]            "R", "M":;
+                                                                                                             {  se    even    t[cur    b" )    L": "M", r(1)
+                                                                                                                  if(     righ      "Ta    ? {"L": subst
+                                                                                                             }lse     sor(    ey ==    Key : {"sor.
+                                                                                                             e    tCur    nt.k     hift     cur                                  {
+                                                                                                             {  se     eve    ent.s    ]] +                                 ) =>
+                                                                                                                   if(    = ev     or[0                                 vent
+                                                                                                             }else    ext     [curs        " )                      , (e
+                                                                                                              {   ar n    nextsor);    cape                     ick"
+                                                                                                                  v    r = (cur      "Es                     ("cl
+                                                                                                                   ursorsor    ey ==                     ener
+                                                                                                                  cetCu    nt.k                     tList
+                                                                                                                  s     eve    );               Even
+                                                                                                               }    if(    dit(     ();     .add
+                                                                                                               else    le_e    fault    it")
+                                                                                                               {   togg    ntDe     ("ed
+                                                                                                                       reve    tById
+                                                                                                                }  nt.p    emen
+                                                                                                                 eve    etEl();
+                                                                                                                ;   nt.gedit
+                                                                                                              })cumegle_
+                                                                                                              do tog
+                                                                                                                ;   pt>     >
+                                                                                                              })scri    html
+                                                                                                              </    y></
+                                                                                                                /bod
+                                                                                                                <OT
+                                                                                                                E
diff --git a/sample/trick2025/02-mame/authors.markdown b/sample/trick2025/02-mame/authors.markdown
new file mode 100644
index 00000000000000..0e420fdf5dc996
--- /dev/null
+++ b/sample/trick2025/02-mame/authors.markdown
@@ -0,0 +1,3 @@
+* Yusuke Endoh
+  * mame@ruby-lang.org
+  * cctld: jp
diff --git a/sample/trick2025/02-mame/entry.rb b/sample/trick2025/02-mame/entry.rb
new file mode 100644
index 00000000000000..d5de370dc914d4
--- /dev/null
+++ b/sample/trick2025/02-mame/entry.rb
@@ -0,0 +1,34 @@
+From:pd <pd-@example.com> (`)
+Date:Wed,01 Jan 2025 00:00:00 +0000
+Subject:[PATCH] +an(/.{40}/));exit].gsub(/X.*X|\n(\h+\s)?\+?/,E=""))#TRICK2025]}
+
+--- /dev/null
++++ pd.rb
+@@ -0,0 +1,27 @@
++%;`);;BEGIN{eval$s=%q[eval(%q[F=File;puts((dup)?(q="%;`);;BEGIN
++{eval$s=%q[#$s]}";U,*,V=R=(0..33.0).map{|t|q.gsub(/./){i=$`.siz
++e;c=(i/64*2i-26i+i%64-31)*1i**(t/16.5);x,y=c.rect;r=c.abs;r<13?
++4<=r&&r<6&&x>-4||-5<x&&x<=-3&&-6<y&&y<11??.:?X:$&}};B,A="---|%s
++\n+++|%s\n@@|-%s,%s|+%s,%s|@@\nFrom:pd|<pd-@example.com>|(`)\nD
++ate:%a,%d|%b|%Y|%T|%z\nSubject:[PATCH]|".tr(?|,z="\s")[/@.*\n/]
++,$`;(i=R.index(q))?(S,T=i<33?R[i,(f=->i{(Time.gm(2025)+86400*i)
++.strftime$'};o=f[i+1]+(fXXXXXXXXXXXXXXX[0]+q[/.*\z/]+?\n*2+A%["
++/dev/null",v="pd.rb"]+XXXXXXXXXXXXXXXXXXXB%[0,0,1,27]+U.gsub(/^
++/,?+)).lines[-i-2],EXXXXXXXXXXXXXXXXXXXXXXX,a=A%[v,v];V<<"\n(`\
++n#{a+B%[0,0,1,1]}+dXXXXXXXXXXXXXXXXXXXXXXXXXup=(`)";2)]:($*.siz
++e!=2&&abort(["usagXXXXXXXXX.........XXXXXXXXXe:",$0,F,F]*z);$*.
++map{o=A%$*;F.read(XXXXXXXXX..XXXXXX..XXXXXXXX_1)});a=[i=0]*v=(s
++=[s]+S.lines).sizeXXXXXXXXX..XXXXXX..XXXXXXXX;c=b=s.map{c=_1&&[
++c,?-+_1,i+=1]||0};XXXXXXXXX..XXXXXX..XXXXXXXXT.lines{|t|s.map{|
++s|a<<((s)?[x=a[-1]XXXXXXXXX.........XXXXXXXXX,y=a[-v]].max+((f=
++s==t)?1:0):0);c,d=(XXXXXXXX..XXXXXXXXXXXXXXXf)?[v+1,z+t]:s&&(x>
++y)?[1,?-+s]:[v,?++t]XXXXXXX..XXXXXXXXXXXXXX;b<<[b[-c],d,i+=1]}}
++;c=b[-1].flatten;b=c[(XXXXX..XXXXXXXXXXXX1..)%2];(b.map{_1[0]}*
++E).scan(/\s{,3}([-+]\s{,XXXXXXXXXXXXXXX6})*[-+]\s{,3}/){n=c[2*i
++=$`.size];o=o,B%[n%v+1-1/v,(m=c[2.*i+j=$&.size]-n)%v,T>""?n/v+1
++:0,m/v],b[i,j]}):(o=[];a,b=[A,B].map{_1.sub(?+){'\+'}%(['(\S+)'
++]*4)};$<.read=~//;F.write$2,(s=F.readlines$1;o<<[:patching,F,$2
++]*z;(*,n,i,m=[*$~].map{_1.to_i};n+=m;($'=~/\A((-)|\+)?(.*\n)/;$
++2?s[i-=1,1]=[]:$1?s[i-1,0]=$3:n-=1;i+=1;n-=1)while+n>0)while/\A
++#{b}/=~$';s*E)while$'=~/^#{a}/);o):([*[?l]*799,1].shuffle*E).sc
++an(/.{40}/));exit].gsub(/X.*X|\n(\h+\s)?\+?/,E=""))#TRICK2025]}
diff --git a/sample/trick2025/02-mame/remarks.markdown b/sample/trick2025/02-mame/remarks.markdown
new file mode 100644
index 00000000000000..8be86ebc2d43f1
--- /dev/null
+++ b/sample/trick2025/02-mame/remarks.markdown
@@ -0,0 +1,141 @@
+# A Lesser "Patch" Program
+
+This program is a minimalistic version of the traditional "patch" command, which looks like a patch.
+
+## Usage as a "Patch" Command
+
+The program reads a unified diff file from standard input and applies the changes to the specified files.
+
+To apply `test.patch` to `sample.rb`, use the following commands:
+
+```
+$ cp sample.orig.rb sample.rb
+$ ruby entry.rb < test.patch
+```
+
+After running these commands, verify that `sample.rb` has been modified.
+
+## Usage as a Patch File
+
+Interestingly, this program is not just a patch-like tools -- it *is* a patch.
+This duality allows it to be applied like a regular patch file.
+
+The following will create a file named pd.rb.
+
+```
+$ patch < entry.rb
+```
+
+Alternatively, you can achieve the same result using `entry.rb`:
+
+```
+$ ruby entry.rb < entry.rb
+```
+
+The generated `pd.rb` produces a new patch.
+
+```
+$ ruby pd.rb
+```
+
+The produced patch is self-referential, targeting `pd.rb` itself.
+To apply it:
+
+```
+$ ruby pd.rb | ruby entry.rb
+```
+
+You'll notice the `p` logo rotates slightly counterclockwise.
+
+The modified `pd.rb` outputs the patch for itself again, apply the patch repeatedly--a total of 33 times!
+
+## From `p` to `d`
+
+The center `p` logo symbolizes a "patch."
+When rotated 180 degrees, it resembles a `d`, signifying a transformation in functionality.
+`pd.rb` now operates as a simplified "diff" command:
+
+```
+$ ruby pd.rb
+usage: pd.rb File File
+
+$ ruby pd.rb sample.orig.rb sample.rb
+--- sample.orig.rb
++++ sample.rb
+...
+```
+
+## Integration with Git
+
+The patches are compatible with Git's `git am` command, which imports patches in mbox format.
+
+Start fresh by removing `pd.rb` and initializing a Git repository:
+
+```
+$ rm -f pd.rb
+$ git init
+Initialized empty Git repository in /home/...
+```
+
+And import `entry.rb` as a patch to the repository:
+
+```
+$ git am --committer-date-is-author-date entry.rb
+Applying: +(/.{40}/));exit].gsub(/X.*X|\n(\h+\s)?\+?/,E=""))#_TRICK2025_]}
+applying to an empty history
+```
+
+Verify the commit history:
+
+```
+$ git log
+commit 1e32693f11c1df77bd797c7b3e9f108a3e139824 (HEAD -> main)
+Author: pd (`) <pd-@example.com>
+Date:   Wed Jan 1 00:00:00 2025 +0000
+
+    +an(/.{40}/));exit].gsub(/X.*X|\n(\h+\s)?\+?/,E=""))#TRICK2025]}
+```
+
+Notice that the Author and Date are properly set.
+
+To apply subsequent patches:
+
+```
+$ for i in `seq 0 32`; do ruby pd.rb | git am --committer-date-is-author-date; done
+```
+
+*(A fun details: you will see the `b` logo!)*
+
+Now, view a commit history by the following command:
+
+```
+$ git log --oneline
+```
+
+You will rediscover the original `entry.rb` unexpectedly.
+
+If you set `--committer-date-is-author-date` appropriately, you should be able to run the output of `git log --oneline` as is.
+
+Try this unusual command:
+
+```
+$ git log --oneline | ruby - test.patch
+```
+
+## A Little Something Extra
+
+Interestingly, `pd.rb` -- functioning as a diff command -- is a patch to itself.
+Reveal hidden details with:
+
+```
+$ ruby entry.rb pd.rb
+$ ruby pd.rb
+```
+
+Can you spot the difference?
+
+## Limitations
+
+* I tested it with ruby 3.3.6, git 2.45.2, and GNU patch 2.7.6.
+* No error check at all. The lesser patch do not care if there is a discrepancy between what is written in the patch and the input file, and will write over the existing file without prompt.
+* It is assumed that the text files have a new line at the end.
diff --git a/sample/trick2025/02-mame/sample.orig.rb b/sample/trick2025/02-mame/sample.orig.rb
new file mode 100644
index 00000000000000..3d880b387d3783
--- /dev/null
+++ b/sample/trick2025/02-mame/sample.orig.rb
@@ -0,0 +1,8 @@
+def add(a, b)
+  a + b
+end
+
+if __FILE__ == $0
+  result = add(3, 5)
+  puts "Three plus five is #{ result }"
+end
diff --git a/sample/trick2025/02-mame/test.patch b/sample/trick2025/02-mame/test.patch
new file mode 100644
index 00000000000000..0a63ae8a4c7918
--- /dev/null
+++ b/sample/trick2025/02-mame/test.patch
@@ -0,0 +1,16 @@
+--- sample.rb
++++ sample.rb
+@@ -2,7 +2,13 @@
+   a + b
+ end
+ 
++def sub(a, b)
++  a - b
++end
++
+ if __FILE__ == $0
+   result = add(3, 5)
+   puts "Three plus five is #{ result }"
++  result = sub(5, 3)
++  puts "five minus three is #{ result }"
+ end
diff --git a/sample/trick2025/03-tompng/authors.markdown b/sample/trick2025/03-tompng/authors.markdown
new file mode 100644
index 00000000000000..26ebe24da68db9
--- /dev/null
+++ b/sample/trick2025/03-tompng/authors.markdown
@@ -0,0 +1,3 @@
+* Tomoya Ishida (tompng)
+  * tomoyapenguin@gmail.com
+  * cctld: jp
diff --git a/sample/trick2025/03-tompng/entry.rb b/sample/trick2025/03-tompng/entry.rb
new file mode 100644
index 00000000000000..0de2244979b0c1
--- /dev/null
+++ b/sample/trick2025/03-tompng/entry.rb
@@ -0,0 +1,74 @@
+eval->{%w[u=*?    a..?i;l=*?j..?    r;o=*?s..?z,?_
+;m='#-*&|^`!@$    '.chars;s=[[3]    ,[0,1,3,4,6],[
+1,5],[1,4],[0,    4,6],[2,4],[2]    ,[1,3,4,6],[],
+          [4],    ];a=      (0..    7).m      ap{[
+          ?;*_    1+'a      4',:    a1,?      x*(_
+          1+2)    ]*"T      /#{?    x.*6      7-_1
+          }/x;    "};v      =([c    =[?x      *150
+          ]*4,    a.reverse,[[6,    3,0].map{"a#{_
+          1}T/    #{?x*15}/x"}*(    ?;*42)+';xx']*
+          30,a    .map{_1.tr'14'    ,'25'},c,]*n=$
+          /).g    sub(      /(^|              ;)(;
+          *);/    ){$1      +?x*              $2.s
+          ize+    ?;};      p,e=              [0,1
+          ].ma    p{|t      |g=(              ["(m
+          fT/'    /;#{a=(0..9).m    ap{"f#{_1}T/l#
+          {_1}    =1./"}*?;};C"'    ;#{a.tr'l',?u}
+          ;?C"    ",(0..9).map{|    i|a="l#{i}T/'/
+
+
+;C"'      ;";b    ="#{o[i-1]+?=i    fTi>0}%+";(1..
+9).m      ap{a    <<l[_1-1]+"T/%    #{c=m[_1]}/;";
+b<<c      +";#    {(d=_1+i)>10?'    ca='+o[d-11]:d
+>9?'      ca':    o[d-              1]}=
+%"+c      };a+    b+[m              [1..
+],?+      ,?"]    *';?              '},"
+caT/      '/;C    "';"              +(1.
+.8).map{u[8-_1    ]+"T/#{u[9-_1]    }=1./;"}*''+u[
+0]+h='=1;?"',(    1..9).map{|i|"    u#{i}T/'/;C"';
+"+(0..8-i).map    {u[8-i-_1]+"T/    #{u[8-_1]}=1./
+          ;"}*              ''+u    [i-1      ]+h}
+          ]*?;              ).sp    lit(      /([^
+          ;]+;              )/);    ((0.      .43)
+          .map              {|y|    c=''      ;q=-
+          >{a=    (y-22).abs;b=(    c.size+_1-78).
+          abs;    [a<7&&b<59||b<    15,(b-30).abs<
+          14][    t]};110.times{    c+=q[8]?g.shif
+
+
+          t||?    ;:q[-t]??;:'T'    };c.gsub(';T',
+          'TT'    ).rstrip}*n).g    sub(/(;|T)(;;+
+          )(;|    $)/){$1+'/'+?x    *($2.size-2)+'
+          /'+$              3}};              F=Fi
+          le;1              0.ti              mes{
+          |i|a              ="(n              fT/m
+          f=l#              {i}=              '/;n
+          f=f#    {i}=?';def/("+    s[i].map!{"a#{
+          _1}"    }*','+')=(';F.    write"#{i}",a+
+          ?x*(    150-a.size)+n+    v[..-5]+'))&&'
+          +n};    a,*b                        ="/)
+          &&de    f((C                        nCn<
+          <A";    c=")                        )./(
+          ";d=    'T}'                        ,?A,
+          '__=    <<B';u.map{|v|    b<<v+"TT%(T<<#
+          {v}T    )TT";d=d,v,"AC    n#{v}=<<B"};o.
+          zip(    l,m){a+=?;+_1+    "T/%#{_3}/";c+
+
+
+=(_3[?#]||?#+_
+3)+"))./("+_2+
+?,};F.write'+'
+,n*2      6+[p         [..-
+10]+      (a+c         ).tr         ('!@',%("')).g
+sub(      /%([         '"`]         )/,){$1},'#{TT
+T'+b      *';T         T'+d         *n,?B,')=']*n+
+n;a,      b=[u    ,o].map{|v|(0.
+.8).      map{    t=s[9-_1];t[0]
+&&t+      =[1]    ;v[8-_1]+"T/#{
+t*?=      }#/"         }*?;         +';a3='+?x*25}
+;F.w      rite         '=',         [n*26]*2*e+a+n
++v+n      +(b+         n+v)         .tr(?a,?b)[..-
+9]+'      )if~         exit
+'+n].join.tr('
+TRICK',_1)}[+"
+\x2025"<<-?\\]
diff --git a/sample/trick2025/03-tompng/remarks.markdown b/sample/trick2025/03-tompng/remarks.markdown
new file mode 100644
index 00000000000000..7f3f4ac6cf9c82
--- /dev/null
+++ b/sample/trick2025/03-tompng/remarks.markdown
@@ -0,0 +1,146 @@
+### Remarks
+
+Run it with no argument. It will generate 12 files: 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, + and =.
+
+```sh
+ruby entry.rb
+```
+
+Concat and syntax highlight them.
+
+```sh
+cat 2 0 + 2 5 = | ruby -run -e colorize
+cat 4 + 1 5 + 4 + 1 8 = | ruby -run -e colorize
+```
+
+I confirmed the following implementations/platforms:
+
+* ruby 3.4.1 (2024-12-25 revision 48d4efcb85) +YJIT +MN +PRISM [arm64-darwin22]
+* ruby 3.3.0 (2023-12-25 revision 5124f9ac75) +YJIT +MN [arm64-darwin22]
+
+### Description
+
+Did you know that Ruby syntax can perform additive operations on two-digit numbers without Ruby runtime? This entry demonstrates a syntax level computation of Ruby grammar.
+
+`ruby entry.rb` will generate 12 files: 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, + and =.
+These files constitute a calculator system that runs on Ruby parser.
+
+To calculate `6 + 7`, concat `6`, `+`, `7` and `=`.
+
+```sh
+cat 6 + 7 =
+```
+
+The concatenated output is a Ruby script that does nothing. It is also an ASCII art of `█ + █ = ██` rotated 90 degrees.
+Now, let's try syntax highlighting that code.
+
+```sh
+cat 6 + 7 = | ruby -run -e colorize
+```
+
+Wow! You can see the calculation result `6 + 7 = 13` as a colorized ASCII art!
+
+This system can also add more than two numbers. All numbers should be one or two digits, and the answer should be less than 100.
+
+```sh
+cat 3 1 + 4 + 1 5 + 9 = | ruby -run -e colorize
+cat 1 + 2 + 4 + 8 + 1 6 + 3 2 = | ruby -run -e colorize
+cat 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 1 0 = | ruby -run -e colorize
+```
+
+If the syntax highlighting is hard to see, use this command to change the terminal color.
+
+```sh
+printf "\e]11;#000000\a\e]10;#333333\a\e]4;1;#ffaaaa\a"
+```
+
+### Internals
+
+To perform calculation, you need a storage and a control flow statement.
+Local variable existence can be used as a storage.
+Ruby syntax provides conditional local variable definition and local variable reset with state carry over which can be used as a control flow statement.
+
+#### Conditional Local Variable Definition
+
+Ruby syntax can define new local variables conditionally.
+
+```ruby
+# Defines x and y if a is defined
+a /x = y = 1./
+# Defines x and y if a is not defined
+a /1#/; x = y = 1
+# Defines x or y depend on the existence of local variable a
+a /(x=1);'/;(y=1);?'
+```
+
+#### Local Variables Reset
+
+Local variables can be cleared by creating a new `def` scope.
+
+```ruby
+x = y = z = 1
+def f
+# x, y, z are cleared
+```
+
+#### State Carry Over
+
+Some state should be carried over to the next `def` scope. There are two tricks to do it.
+
+```ruby
+a /%+/i; b /%-/i; def f(x)# +; def f(y) # -; def f(z)
+```
+
+```ruby
+a %(<<A); b %(<<B); def f
+x=<<C
+A
+y=<<C
+B
+z=<<C
+C
+```
+
+In both examples above, local variable defined in the new scope will be:
+
+```ruby
+x # if both a and b are not defined
+y # if a is defined
+z # if b is defined
+```
+
+Combining these two tricks, Ruby syntax can carry over two states to the next `def` scope. In this system, two states represents upper digit and lower digit.
+
+### File Structure
+
+```ruby
+# File 0, 1, 2, 3, 4, 5, 6, 7, 8, 9
+(code) &&
+```
+
+```ruby
+# File +
+(code) && def f(arg)=
+```
+
+```ruby
+# File =
+(code) if exit
+```
+
+```ruby
+# cat 1 2 + 3 + 4 5 =
+(one) &&
+(two) &&
+(plus) && def f(arg)=
+(three) &&
+(plus) && def f(arg)=
+(four) &&
+(five) &&
+(equal) if exit
+```
+
+### Limitation
+
+Number to be added must be one or two digits.
+Answer of the addition must be less than 100.
diff --git a/sample/trick2025/04-tompng/authors.markdown b/sample/trick2025/04-tompng/authors.markdown
new file mode 100644
index 00000000000000..26ebe24da68db9
--- /dev/null
+++ b/sample/trick2025/04-tompng/authors.markdown
@@ -0,0 +1,3 @@
+* Tomoya Ishida (tompng)
+  * tomoyapenguin@gmail.com
+  * cctld: jp
diff --git a/sample/trick2025/04-tompng/entry.rb b/sample/trick2025/04-tompng/entry.rb
new file mode 100644
index 00000000000000..881c1af8717594
--- /dev/null
+++ b/sample/trick2025/04-tompng/entry.rb
@@ -0,0 +1,36 @@
+                                                      $c=%q@E="                 
+                                                  \e[4%d;37m%s\e[m"             
+                                                ;n=32.chr;pu    ts"\e           
+                                              [H\e[J#{$c=n*54+'    $c=%         
+                                             q'+[64.chr]*2*$c+';e   val$        
+                                            c.'+n*10+"\n"+n*57+"spl  it*'       
+                                            '"+n*15}";n=l=0;R=->y=0 {n+=1       
+                ;l=$c.lines.                map{|m|m=(0..79).chunk{380-n+       
+           36*Math.sin(0.04.*it-n           )<9*y}.map{a=_2.map{m[it]}*''       
+        ;_1&&E%[6,a]||a}*'';m!=l[~-y        +=1]&&$><<"\e[#{y}H#{m}\e[37H       
+      ";m}};N=(Integer$*      [-1]resc       ue+30)*H=44100;alias:r:rand        
+    ;F=->e,w=1{a=b=c=0;d=(       1-e)**0      .5*20;->v=r-0.5{a=a*w*e+v         
+   ;b=b*w*e*e+v;d.*a-2*b+c=c*w     *e**3+       v}};A=->u,n,t{(0..n).           
+  map{|i|u=u.shuffle.map{|w|R[];     a=u.s        ample;b,c,d=[[0.5             
+ ,(0.2+r)*H/3*1.1**i,[[1+r/10,1+r/    10]][           i]||[1.2+                 
+ r/10,1.3+r/5]],[0.3,r*H/2,[1,1+r/5   ]]][t                                     
+];e,f=d.shuffle;g=b+r;h=b+r;(0..[w.  size/e,             a.size/f               
++c].max).map{g*(w[it*e]||0)+h*(a[[it-c,0].ma        x*f]||0)}}}};j=A[A          
+[(0..9).map{a=F[0.998,1i**0.02];(0..28097).m     ap{a[].real.*0.1**(8.0*i       
+t/H)-8e-6}},14,0].transpose.map{|d|a=[0]*3e3     ;15.times{|i|R      [];b=r     
+ (3e3);d[i].each_with_index{a[c=_2+b]=(a[c]      ||0)+_1*0.63**i}}     ;a},9,   
+ 1][4..].flatten(1).shuffle;y=(0..3).map{F[     1-1e-5]};m=[-1,1].map    {[F[1  
+  -1e-4],F[1-5e-5],it]};u=v=w=0;k=[],[],[]     ;z=F[0.7,1i**0.5];File.o   pen($ 
+   *.grep(/[^\d]/)[0]||'output.wav','wb')      {|f|f<<'RIFF'+[N*4+36,'WA   VEfmt
+    ',32,16,1,2,H,H*4,4,16,'data',N*4].p      ack('Va7cVvvVVvva4V');N.tim   es{|
+      i|$><<E%[4,?#]if(i+1)*80/N!=i*80      /N;t=[i/1e5,(N-i)/2e5,1].min;a,b,c=k
+        .map{it.shift||(j[20*r,0]=[g       =j.pop];a=1+r/3;it[0..]=(0..g.size).m
+           ap{g[it*a]||0};0)};u=u         *0.96+r-0.5;v=v*0.99+d=r-0.5;w=w*0.8+d
+                ;x=(z[].*1+0              .59i).imag;e=y.map(&:[]);f.<<m.map{|o,
+                                           p,q|r=a+(b+c)/2+(b-c)*q/5;s=o[r.abs] 
+                                            ;r=t*t*(3-2*t)*(r+s*w/1e4+p[s]*x/1  
+                                             e7+[[u,0],[v,1]].sum{_1*1.5**(e[   
+                                               _2]+q*e[_2+2]/9)}/32)/9;r/(1     
+                                                 +r*r)**0.5*32768}.pack'v       
+                                                    *'}};puts@;eval$c.          
+                                                         split*''               
diff --git a/sample/trick2025/04-tompng/remarks.markdown b/sample/trick2025/04-tompng/remarks.markdown
new file mode 100644
index 00000000000000..b2d848c07cf7a4
--- /dev/null
+++ b/sample/trick2025/04-tompng/remarks.markdown
@@ -0,0 +1,43 @@
+# Seashore - Nature Sound
+
+Listen to the relaxing sound of ocean waves generated by Ruby.
+
+## Usage
+
+```sh
+ruby entry.rb
+ruby entry.rb seashore.wav 60
+```
+
+The default filename is `output.wav` and the default duration is 30 seconds.
+
+Tested with ruby 3.4.1 (2024-12-25 revision 48d4efcb85) +YJIT +MN +PRISM [arm64-darwin22]
+
+## Noise
+
+Noise sound is created by applying low-pass/band-pass filter to a white noise signal.
+Volume of the noise should change over time. This is also calculated by using low-pass filter.
+
+## Wave
+
+Sound of a single ocean wave is composed of hundreds of water splash sounds.
+Each water splash sound is composed of thousands of water drops and bubbles.
+This program creates this complicated sound by repeating sound mixing.
+
+```ruby
+sound2 = mix(sound1.change_pitch(rand), sound1.change_pitch(rand).delay(rand))
+sound4 = mix(sound2.change_pitch(rand), sound2.change_pitch(rand).delay(rand))
+...
+sound32768 = mix(sound16384.change_pitch(rand), sound16384.change_pitch(rand).delay(rand))
+
+splash1 = mix(sound1.delay(rand), sound2.delay(rand), sound4.delay(rand), ..., sound16384.delay(rand))
+splash2 = mix(splash1.change_pitch(rand), splash1.change_pitch(rand).delay(rand))
+splash4 = mix(splash2.change_pitch(rand), splash2.change_pitch(rand).delay(rand))
+...
+splash1024 = mix(splash512.change_pitch(rand), splash512.change_pitch(rand).delay(rand))
+
+wave_sound = [splash32, splash64, ..., splash1024].sample
+```
+
+This kind of repetition is often used in fractal rendering. In other words, this operation is rendering a fractal shape to the spectrogram canvas.
+It's an efficient way to create complex structure with low computational cost.
diff --git a/sample/trick2025/05-tompng/authors.markdown b/sample/trick2025/05-tompng/authors.markdown
new file mode 100644
index 00000000000000..26ebe24da68db9
--- /dev/null
+++ b/sample/trick2025/05-tompng/authors.markdown
@@ -0,0 +1,3 @@
+* Tomoya Ishida (tompng)
+  * tomoyapenguin@gmail.com
+  * cctld: jp
diff --git a/sample/trick2025/05-tompng/entry.rb b/sample/trick2025/05-tompng/entry.rb
new file mode 100644
index 00000000000000..4d30c5b5a9b60e
--- /dev/null
+++ b/sample/trick2025/05-tompng/entry.rb
@@ -0,0 +1,118 @@
+module ReadableFizzBuzz
+  module Chain
+  end
+end
+
+include ReadableFizzBuzz
+
+Chain::Itself = Chain
+
+module Chain::Itself
+  module Void
+    A = B = C = D = E = F = G = H = I = J = K = L = M = Void
+    N = O = P = Q = R = S = T = U = V = W = X = Y = Z = Void
+
+    module Set
+    end
+
+    module Put
+    end
+
+    module WriteBack
+    end
+
+    module Not
+      include Void
+    end
+  end
+
+  module Off
+    include Void
+  end
+
+  module Nil
+    A = B = C = D = E = F = G = H = I = J = K = L = M = Off
+    N = O = P = Q = R = S = T = U = V = W = X = Y = Z = Off
+  end
+
+  module Next
+    include Nil
+  end
+
+  module Current
+    include Nil
+
+    Not = Off
+    Set = Put = Next
+    WriteBack = Current
+  end
+
+  True = If = Current
+  On = Next
+
+  module On
+    INT = 1
+    FIZZ = 'Fizz'
+    BUZZ = 'Buzz'
+    PREFIX = '0b'
+    FORMAT = "%d%s%s\n"
+    NEXT = __FILE__
+  end
+
+  module Off
+    INT = 0
+    FIZZ = BUZZ = nil
+    PREFIX = '0b1'
+    FORMAT = "%2$s%3$s\n"
+    NEXT = '/dev/null'
+    Not = True
+  end
+
+  module Initial
+    C = D = True
+  end
+
+  module ReadableFizzBuzz::Chain::Current
+    include Initial
+  end
+
+  If::C::Set::E = If::E::Set::F = If::F::Set::C = On
+  If::D::Set::G = If::G::Set::H = If::H::Set::I = If::I::Set::J = If::J::Set::D = On
+  If::F::Not::J::Not::Set::B = On
+  If::K::Not::Set::K = On
+  If::K::WriteBack::L = True
+  If::L::Not::M::Set::M = On
+  If::L::M::Not::Put::M = On
+  If::L::M::WriteBack::N = True
+  If::N::Not::O::Set::O = On
+  If::N::O::Not::Put::O = On
+  If::N::O::WriteBack::P = True
+  If::P::Not::Q::Set::Q = On
+  If::P::Q::Not::Put::Q = On
+  If::P::Q::WriteBack::R = True
+  If::R::Not::S::Set::S = On
+  If::R::S::Not::Put::S = On
+  If::R::S::WriteBack::T = True
+  If::T::Not::U::Set::U = On
+  If::T::U::Not::Put::U = On
+  If::T::U::WriteBack::V = True
+  If::V::Not::W::Set::W = On
+  If::V::W::Not::Put::W = On
+  If::V::W::WriteBack::X = True
+  If::X::Not::Y::Set::Y = On
+  If::X::Y::Not::Put::Y = On
+  If::X::Y::WriteBack::Z = True
+  If::Z::Not::Set::A = On
+end
+
+module Chain::Chain
+  Current = Chain::Next
+end
+
+include Chain
+
+module Chain::Current
+  NUMBER = A::PREFIX, Y::INT, W::INT, U::INT, S::INT, Q::INT, O::INT, M::INT, K::INT
+  printf B::FORMAT, NUMBER.join, C::FIZZ, D::BUZZ
+  load A::NEXT
+end
diff --git a/sample/trick2025/05-tompng/remarks.markdown b/sample/trick2025/05-tompng/remarks.markdown
new file mode 100644
index 00000000000000..adb4bf4df8abe1
--- /dev/null
+++ b/sample/trick2025/05-tompng/remarks.markdown
@@ -0,0 +1,106 @@
+### Remarks
+
+Just run it with no argument:
+
+```sh
+ruby entry.rb
+```
+
+I confirmed the following implementations/platforms:
+
+- ruby 3.4.1 (2024-12-25 revision 48d4efcb85) +YJIT +MN +PRISM [arm64-darwin22]
+- ruby 3.0.0p0 (2020-12-25 revision 95aff21468) [aarch64-linux-musl]
+
+### Description
+
+Readability is important even for a simple fizz buzz program.
+
+These are the major ingredients of a spaghetti that makes program tasty and valuable but unreadable.
+
+- Many class definitions
+- Many method definitions
+- Many method calls
+- Many variables
+- Conditional branches
+
+These are what is acceptable for a readable program.
+
+- Many modules: Using only a single module in a program is not good.
+- Many constants: Better than magic numbers.
+- Module#include: Mixins are what module is for.
+- Many file loads: Usually better than loading a large file only once.
+- Minimal method calls: Needed for printing output.
+
+This program is doing something slightly difficult in the last few lines: print output and load ruby program.
+In contrast, the rest part of this program is extremely simple and easy. Module definition, constant definition and module inclusion. That's all.
+
+### Internals
+
+Called methods
+
+- `Module#include`
+- `Array#join`
+- `Kernel#printf`
+- `Kernel#load`
+
+Deeply nested module chain to avoid constant reassignment
+
+```ruby
+10.times do
+  module Root
+    module Chain
+      module X; end
+      module Y; end
+      module Z; end
+    end
+  end
+  include Root
+
+  module Chain::Chain
+    # Not a constant reassignment because Chain::Chain is always a new module
+    X = Chain::Y
+    Y = Chain::Z
+    Z = Chain::X
+  end
+  include Chain
+  p x: X, chain: Chain
+end
+```
+
+Constant allocation
+
+| Constant               | Purpose                 |
+| ---------------------- | ----------------------- |
+| A                      | Loop condition          |
+| B                      | Format (!Fizz && !Buzz) |
+| C, E, F                | Fizz rotation           |
+| D, G, H, I, J          | Buzz rotation           |
+| K, M, O, Q, S, U, W, Y | Iteration bits          |
+| L, N, P, R, T, V, X, Z | Temporary carry bits    |
+
+Instruction sequence with constant lookup magic
+
+```ruby
+# B = 1 if A
+If::A::Set::B = On
+
+# B = 1 if !A
+If::A::Not::Set::B = On
+
+# C = 1 if !A && B
+If::A::Not::B::Set::C = On
+
+# C = 1 if !A && !B
+If::A::Not::B::Not::Set::C = On
+```
+
+Loop with `load __FILE__`
+
+```ruby
+# A::NEXT is __FILE__ or '/dev/null'
+load A::NEXT
+```
+
+### Limitation
+
+Needs `/dev/null`
diff --git a/sample/trick2025/README.md b/sample/trick2025/README.md
new file mode 100644
index 00000000000000..1d71f546201656
--- /dev/null
+++ b/sample/trick2025/README.md
@@ -0,0 +1,16 @@
+This directory contains the top-five entries of
+the 5th Transcendental Ruby Imbroglio Contest for rubyKaigi (TRICK 2025).
+
+THESE ARE BAD EXAMPLES!  You must NOT use them as a sample code.
+
+* 1st: "Most Revolutionary" - Don Yang
+* 2nd: "Most Useful" - Yusuke Endoh
+* 3rd: "Most Arithmetic" - Tomoya Ishida
+* 4th: "Best ASMR" - Tomoya Ishida
+* 5th: "Most Maintainable" - Tomoya Ishida
+
+These files are licensed under MIT license.
+
+For the contest outline and other winning entries, see:
+
+https://github.com/tric/trick2025
diff --git a/scheduler.c b/scheduler.c
index 866e53993fff1e..83b9681cc34a25 100644
--- a/scheduler.c
+++ b/scheduler.c
@@ -13,8 +13,14 @@
 #include "ruby/io.h"
 #include "ruby/io/buffer.h"
 
+#include "ruby/thread.h"
+
+// For `ruby_thread_has_gvl_p`:
 #include "internal/thread.h"
 
+// For atomic operations:
+#include "ruby_atomic.h"
+
 static ID id_close;
 static ID id_scheduler_close;
 
@@ -33,9 +39,229 @@ static ID id_io_close;
 
 static ID id_address_resolve;
 
+static ID id_blocking_operation_wait;
+static ID id_fiber_interrupt;
+
 static ID id_fiber_schedule;
 
+// Our custom blocking operation class
+static VALUE rb_cFiberSchedulerBlockingOperation;
+
+/*
+ * Custom blocking operation structure for blocking operations
+ * This replaces the use of Ruby procs to avoid use-after-free issues
+ * and provides a cleaner C API for native work pools.
+ */
+
+typedef enum {
+    RB_FIBER_SCHEDULER_BLOCKING_OPERATION_STATUS_QUEUED,    // Submitted but not started
+    RB_FIBER_SCHEDULER_BLOCKING_OPERATION_STATUS_EXECUTING, // Currently running
+    RB_FIBER_SCHEDULER_BLOCKING_OPERATION_STATUS_COMPLETED, // Finished (success/error)
+    RB_FIBER_SCHEDULER_BLOCKING_OPERATION_STATUS_CANCELLED  // Cancelled
+} rb_fiber_blocking_operation_status_t;
+
+struct rb_fiber_scheduler_blocking_operation {
+    void *(*function)(void *);
+    void *data;
+
+    rb_unblock_function_t *unblock_function;
+    void *data2;
+
+    int flags;
+    struct rb_fiber_scheduler_blocking_operation_state *state;
+
+    // Execution status
+    volatile rb_atomic_t status;
+};
+
+static void
+blocking_operation_mark(void *ptr)
+{
+    // No Ruby objects to mark in our struct
+}
+
+static void
+blocking_operation_free(void *ptr)
+{
+    rb_fiber_scheduler_blocking_operation_t *blocking_operation = (rb_fiber_scheduler_blocking_operation_t *)ptr;
+    ruby_xfree(blocking_operation);
+}
+
+static size_t
+blocking_operation_memsize(const void *ptr)
+{
+    return sizeof(rb_fiber_scheduler_blocking_operation_t);
+}
+
+static const rb_data_type_t blocking_operation_data_type = {
+    "Fiber::Scheduler::BlockingOperation",
+    {
+        blocking_operation_mark,
+        blocking_operation_free,
+        blocking_operation_memsize,
+    },
+    0, 0, RUBY_TYPED_FREE_IMMEDIATELY | RUBY_TYPED_WB_PROTECTED
+};
+
+/*
+ * Allocate a new blocking operation
+ */
+static VALUE
+blocking_operation_alloc(VALUE klass)
+{
+    rb_fiber_scheduler_blocking_operation_t *blocking_operation;
+    VALUE obj = TypedData_Make_Struct(klass, rb_fiber_scheduler_blocking_operation_t, &blocking_operation_data_type, blocking_operation);
+
+    blocking_operation->function = NULL;
+    blocking_operation->data = NULL;
+    blocking_operation->unblock_function = NULL;
+    blocking_operation->data2 = NULL;
+    blocking_operation->flags = 0;
+    blocking_operation->state = NULL;
+    blocking_operation->status = RB_FIBER_SCHEDULER_BLOCKING_OPERATION_STATUS_QUEUED;
+
+    return obj;
+}
+
+/*
+ * Get the blocking operation struct from a Ruby object
+ */
+static rb_fiber_scheduler_blocking_operation_t *
+get_blocking_operation(VALUE obj)
+{
+    rb_fiber_scheduler_blocking_operation_t *blocking_operation;
+    TypedData_Get_Struct(obj, rb_fiber_scheduler_blocking_operation_t, &blocking_operation_data_type, blocking_operation);
+    return blocking_operation;
+}
+
+/*
+ * Document-method: Fiber::Scheduler::BlockingOperation#call
+ *
+ * Execute the blocking operation. This method releases the GVL and calls
+ * the blocking function, then restores the errno value.
+ *
+ * Returns nil. The actual result is stored in the associated state object.
+ */
+static VALUE
+blocking_operation_call(VALUE self)
+{
+    rb_fiber_scheduler_blocking_operation_t *blocking_operation = get_blocking_operation(self);
+
+    if (blocking_operation->status != RB_FIBER_SCHEDULER_BLOCKING_OPERATION_STATUS_QUEUED) {
+        rb_raise(rb_eRuntimeError, "Blocking operation has already been executed!");
+    }
+
+    if (blocking_operation->function == NULL) {
+        rb_raise(rb_eRuntimeError, "Blocking operation has no function to execute!");
+    }
+
+    if (blocking_operation->state == NULL) {
+        rb_raise(rb_eRuntimeError, "Blocking operation has no result object!");
+    }
+
+    // Mark as executing
+    blocking_operation->status = RB_FIBER_SCHEDULER_BLOCKING_OPERATION_STATUS_EXECUTING;
+
+    // Execute the blocking operation without GVL
+    blocking_operation->state->result = rb_nogvl(blocking_operation->function, blocking_operation->data,
+                                         blocking_operation->unblock_function, blocking_operation->data2,
+                                         blocking_operation->flags);
+    blocking_operation->state->saved_errno = rb_errno();
+
+    // Mark as completed
+    blocking_operation->status = RB_FIBER_SCHEDULER_BLOCKING_OPERATION_STATUS_COMPLETED;
+
+    return Qnil;
+}
+
+/*
+ * C API: Extract blocking operation struct from Ruby object (GVL required)
+ *
+ * This function safely extracts the opaque struct from a BlockingOperation VALUE
+ * while holding the GVL. The returned pointer can be passed to worker threads
+ * and used with rb_fiber_scheduler_blocking_operation_execute_opaque_nogvl.
+ *
+ * Returns the opaque struct pointer on success, NULL on error.
+ * Must be called while holding the GVL.
+ */
+rb_fiber_scheduler_blocking_operation_t *
+rb_fiber_scheduler_blocking_operation_extract(VALUE self)
+{
+    return get_blocking_operation(self);
+}
+
+/*
+ * C API: Execute blocking operation from opaque struct (GVL not required)
+ *
+ * This function executes a blocking operation using the opaque struct pointer
+ * obtained from rb_fiber_scheduler_blocking_operation_extract.
+ * It can be called from native threads without holding the GVL.
+ *
+ * Returns 0 on success, -1 on error.
+ */
+int
+rb_fiber_scheduler_blocking_operation_execute(rb_fiber_scheduler_blocking_operation_t *blocking_operation)
+{
+    if (blocking_operation == NULL) {
+        return -1;
+    }
+
+    if (blocking_operation->function == NULL || blocking_operation->state == NULL) {
+        return -1; // Invalid blocking operation
+    }
+
+    // Resolve sentinel values for unblock_function and data2:
+    rb_thread_resolve_unblock_function(&blocking_operation->unblock_function, &blocking_operation->data2, GET_THREAD());
+
+    // Atomically check if we can transition from QUEUED to EXECUTING
+    rb_atomic_t expected = RB_FIBER_SCHEDULER_BLOCKING_OPERATION_STATUS_QUEUED;
+    if (RUBY_ATOMIC_CAS(blocking_operation->status, expected, RB_FIBER_SCHEDULER_BLOCKING_OPERATION_STATUS_EXECUTING) != expected) {
+        // Already cancelled or in wrong state
+        return -1;
+    }
+
+    // Now we're executing - call the function
+    blocking_operation->state->result = blocking_operation->function(blocking_operation->data);
+    blocking_operation->state->saved_errno = errno;
+
+    // Atomically transition to completed (unless cancelled during execution)
+    expected = RB_FIBER_SCHEDULER_BLOCKING_OPERATION_STATUS_EXECUTING;
+    if (RUBY_ATOMIC_CAS(blocking_operation->status, expected, RB_FIBER_SCHEDULER_BLOCKING_OPERATION_STATUS_COMPLETED) == expected) {
+        // Successfully completed
+        return 0;
+    } else {
+        // Was cancelled during execution
+        blocking_operation->state->saved_errno = EINTR;
+        return -1;
+    }
+}
+
 /*
+ * C API: Create a new blocking operation
+ *
+ * This creates a blocking operation that can be executed by native work pools.
+ * The blocking operation holds references to the function and data safely.
+ */
+VALUE
+rb_fiber_scheduler_blocking_operation_new(void *(*function)(void *), void *data,
+                                         rb_unblock_function_t *unblock_function, void *data2,
+                                         int flags, struct rb_fiber_scheduler_blocking_operation_state *state)
+{
+    VALUE self = blocking_operation_alloc(rb_cFiberSchedulerBlockingOperation);
+    rb_fiber_scheduler_blocking_operation_t *blocking_operation = get_blocking_operation(self);
+
+    blocking_operation->function = function;
+    blocking_operation->data = data;
+    blocking_operation->unblock_function = unblock_function;
+    blocking_operation->data2 = data2;
+    blocking_operation->flags = flags;
+    blocking_operation->state = state;
+
+    return self;
+}
+
+/*
+ *
  *  Document-class: Fiber::Scheduler
  *
  *  This is not an existing class, but documentation of the interface that Scheduler
@@ -70,6 +296,7 @@ static ID id_fiber_schedule;
  *  * #timeout_after
  *  * #address_resolve
  *  * #block and #unblock
+ *  * #blocking_operation_wait
  *  * (the list is expanded as Ruby developers make more methods having non-blocking calls)
  *
  *  When not specified otherwise, the hook implementations are mandatory: if they are not
@@ -109,8 +336,20 @@ Init_Fiber_Scheduler(void)
 
     id_address_resolve = rb_intern_const("address_resolve");
 
+    id_blocking_operation_wait = rb_intern_const("blocking_operation_wait");
+    id_fiber_interrupt = rb_intern_const("fiber_interrupt");
+
     id_fiber_schedule = rb_intern_const("fiber");
 
+    // Define an anonymous BlockingOperation class for internal use only
+    // This is completely hidden from Ruby code and cannot be instantiated directly
+    rb_cFiberSchedulerBlockingOperation = rb_class_new(rb_cObject);
+    rb_define_alloc_func(rb_cFiberSchedulerBlockingOperation, blocking_operation_alloc);
+    rb_define_method(rb_cFiberSchedulerBlockingOperation, "call", blocking_operation_call, 0);
+
+    // Register the anonymous class as a GC root so it doesn't get collected
+    rb_gc_register_mark_object(rb_cFiberSchedulerBlockingOperation);
+
 #if 0 /* for RDoc */
     rb_cFiberScheduler = rb_define_class_under(rb_cFiber, "Scheduler", rb_cObject);
     rb_define_method(rb_cFiberScheduler, "close", rb_fiber_scheduler_close, 0);
@@ -126,17 +365,18 @@ Init_Fiber_Scheduler(void)
     rb_define_method(rb_cFiberScheduler, "timeout_after", rb_fiber_scheduler_timeout_after, 3);
     rb_define_method(rb_cFiberScheduler, "block", rb_fiber_scheduler_block, 2);
     rb_define_method(rb_cFiberScheduler, "unblock", rb_fiber_scheduler_unblock, 2);
-    rb_define_method(rb_cFiberScheduler, "fiber", rb_fiber_scheduler, -2);
+    rb_define_method(rb_cFiberScheduler, "fiber", rb_fiber_scheduler_fiber, -2);
+    rb_define_method(rb_cFiberScheduler, "blocking_operation_wait", rb_fiber_scheduler_blocking_operation_wait, -2);
 #endif
 }
 
 VALUE
 rb_fiber_scheduler_get(void)
 {
-    VM_ASSERT(ruby_thread_has_gvl_p());
+    RUBY_ASSERT(ruby_thread_has_gvl_p());
 
     rb_thread_t *thread = GET_THREAD();
-    VM_ASSERT(thread);
+    RUBY_ASSERT(thread);
 
     return thread->scheduler;
 }
@@ -159,15 +399,34 @@ verify_interface(VALUE scheduler)
     if (!rb_respond_to(scheduler, id_io_wait)) {
         rb_raise(rb_eArgError, "Scheduler must implement #io_wait");
     }
+
+    if (!rb_respond_to(scheduler, id_fiber_interrupt)) {
+        rb_warn("Scheduler should implement #fiber_interrupt");
+    }
+}
+
+static VALUE
+fiber_scheduler_close(VALUE scheduler)
+{
+    return rb_fiber_scheduler_close(scheduler);
+}
+
+static VALUE
+fiber_scheduler_close_ensure(VALUE _thread)
+{
+    rb_thread_t *thread = (rb_thread_t*)_thread;
+    thread->scheduler = Qnil;
+
+    return Qnil;
 }
 
 VALUE
 rb_fiber_scheduler_set(VALUE scheduler)
 {
-    VM_ASSERT(ruby_thread_has_gvl_p());
+    RUBY_ASSERT(ruby_thread_has_gvl_p());
 
     rb_thread_t *thread = GET_THREAD();
-    VM_ASSERT(thread);
+    RUBY_ASSERT(thread);
 
     if (scheduler != Qnil) {
         verify_interface(scheduler);
@@ -178,7 +437,8 @@ rb_fiber_scheduler_set(VALUE scheduler)
     // That way, we do not need to consider interactions, e.g., of a Fiber from
     // the previous scheduler with the new scheduler.
     if (thread->scheduler != Qnil) {
-        rb_fiber_scheduler_close(thread->scheduler);
+        // rb_fiber_scheduler_close(thread->scheduler);
+        rb_ensure(fiber_scheduler_close, thread->scheduler, fiber_scheduler_close_ensure, (VALUE)thread);
     }
 
     thread->scheduler = scheduler;
@@ -189,7 +449,7 @@ rb_fiber_scheduler_set(VALUE scheduler)
 static VALUE
 rb_fiber_scheduler_current_for_threadptr(rb_thread_t *thread)
 {
-    VM_ASSERT(thread);
+    RUBY_ASSERT(thread);
 
     if (thread->blocking == 0) {
         return thread->scheduler;
@@ -223,7 +483,7 @@ VALUE rb_fiber_scheduler_current_for_thread(VALUE thread)
 VALUE
 rb_fiber_scheduler_close(VALUE scheduler)
 {
-    VM_ASSERT(ruby_thread_has_gvl_p());
+    RUBY_ASSERT(ruby_thread_has_gvl_p());
 
     VALUE result;
 
@@ -246,7 +506,7 @@ VALUE
 rb_fiber_scheduler_make_timeout(struct timeval *timeout)
 {
     if (timeout) {
-        return rb_float_new((double)timeout->tv_sec + (0.000001f * timeout->tv_usec));
+        return rb_float_new((double)timeout->tv_sec + (0.000001 * timeout->tv_usec));
     }
 
     return Qnil;
@@ -385,9 +645,24 @@ rb_fiber_scheduler_block(VALUE scheduler, VALUE blocker, VALUE timeout)
 VALUE
 rb_fiber_scheduler_unblock(VALUE scheduler, VALUE blocker, VALUE fiber)
 {
-    VM_ASSERT(rb_obj_is_fiber(fiber));
+    RUBY_ASSERT(rb_obj_is_fiber(fiber));
 
-    return rb_funcall(scheduler, id_unblock, 2, blocker, fiber);
+    // `rb_fiber_scheduler_unblock` can be called from points where `errno` is expected to be preserved. Therefore, we should save and restore it. For example `io_binwrite` calls `rb_fiber_scheduler_unblock` and if `errno` is reset to 0 by user code, it will break the error handling in `io_write`.
+    // If we explicitly preserve `errno` in `io_binwrite` and other similar functions (e.g. by returning it), this code is no longer needed. I hope in the future we will be able to remove it.
+    int saved_errno = errno;
+
+#ifdef RUBY_DEBUG
+    rb_execution_context_t *ec = GET_EC();
+    if (RUBY_VM_INTERRUPTED(ec)) {
+        rb_bug("rb_fiber_scheduler_unblock called with pending interrupt");
+    }
+#endif
+
+    VALUE result = rb_funcall(scheduler, id_unblock, 2, blocker, fiber);
+
+    errno = saved_errno;
+
+    return result;
 }
 
 /*
@@ -409,10 +684,25 @@ rb_fiber_scheduler_unblock(VALUE scheduler, VALUE blocker, VALUE fiber)
  *  Expected to return the subset of events that are ready immediately.
  *
  */
+static VALUE
+fiber_scheduler_io_wait(VALUE _argument) {
+    VALUE *arguments = (VALUE*)_argument;
+
+    return rb_funcallv(arguments[0], id_io_wait, 3, arguments + 1);
+}
+
 VALUE
 rb_fiber_scheduler_io_wait(VALUE scheduler, VALUE io, VALUE events, VALUE timeout)
 {
-    return rb_funcall(scheduler, id_io_wait, 3, io, events, timeout);
+    VALUE arguments[] = {
+        scheduler, io, events, timeout
+    };
+
+    if (rb_respond_to(scheduler, id_fiber_interrupt)) {
+        return rb_thread_io_blocking_operation(io, fiber_scheduler_io_wait, (VALUE)&arguments);
+    } else {
+        return fiber_scheduler_io_wait((VALUE)&arguments);
+    }
 }
 
 VALUE
@@ -458,7 +748,7 @@ VALUE rb_fiber_scheduler_io_selectv(VALUE scheduler, int argc, VALUE *argv)
 
 /*
  *  Document-method: Fiber::Scheduler#io_read
- *  call-seq: io_read(io, buffer, length) -> read length or -errno
+ *  call-seq: io_read(io, buffer, length, offset) -> read length or -errno
  *
  *  Invoked by IO#read or IO#Buffer.read to read +length+ bytes from +io+ into a
  *  specified +buffer+ (see IO::Buffer) at the given +offset+.
@@ -482,14 +772,29 @@ VALUE rb_fiber_scheduler_io_selectv(VALUE scheduler, int argc, VALUE *argv)
  *
  *  The method should be considered _experimental_.
  */
+static VALUE
+fiber_scheduler_io_read(VALUE _argument) {
+    VALUE *arguments = (VALUE*)_argument;
+
+    return rb_funcallv(arguments[0], id_io_read, 4, arguments + 1);
+}
+
 VALUE
 rb_fiber_scheduler_io_read(VALUE scheduler, VALUE io, VALUE buffer, size_t length, size_t offset)
 {
+    if (!rb_respond_to(scheduler, id_io_read)) {
+        return RUBY_Qundef;
+    }
+
     VALUE arguments[] = {
-        io, buffer, SIZET2NUM(length), SIZET2NUM(offset)
+        scheduler, io, buffer, SIZET2NUM(length), SIZET2NUM(offset)
     };
 
-    return rb_check_funcall(scheduler, id_io_read, 4, arguments);
+    if (rb_respond_to(scheduler, id_fiber_interrupt)) {
+        return rb_thread_io_blocking_operation(io, fiber_scheduler_io_read, (VALUE)&arguments);
+    } else {
+        return fiber_scheduler_io_read((VALUE)&arguments);
+    }
 }
 
 /*
@@ -506,19 +811,34 @@ rb_fiber_scheduler_io_read(VALUE scheduler, VALUE io, VALUE buffer, size_t lengt
  *
  *  The method should be considered _experimental_.
  */
+static VALUE
+fiber_scheduler_io_pread(VALUE _argument) {
+    VALUE *arguments = (VALUE*)_argument;
+
+    return rb_funcallv(arguments[0], id_io_pread, 5, arguments + 1);
+}
+
 VALUE
 rb_fiber_scheduler_io_pread(VALUE scheduler, VALUE io, rb_off_t from, VALUE buffer, size_t length, size_t offset)
 {
+    if (!rb_respond_to(scheduler, id_io_pread)) {
+        return RUBY_Qundef;
+    }
+
     VALUE arguments[] = {
-        io, buffer, OFFT2NUM(from), SIZET2NUM(length), SIZET2NUM(offset)
+        scheduler, io, buffer, OFFT2NUM(from), SIZET2NUM(length), SIZET2NUM(offset)
     };
 
-    return rb_check_funcall(scheduler, id_io_pread, 5, arguments);
+    if (rb_respond_to(scheduler, id_fiber_interrupt)) {
+        return rb_thread_io_blocking_operation(io, fiber_scheduler_io_pread, (VALUE)&arguments);
+    } else {
+        return fiber_scheduler_io_pread((VALUE)&arguments);
+    }
 }
 
 /*
  *  Document-method: Scheduler#io_write
- *  call-seq: io_write(io, buffer, length) -> written length or -errno
+ *  call-seq: io_write(io, buffer, length, offset) -> written length or -errno
  *
  *  Invoked by IO#write or IO::Buffer#write to write +length+ bytes to +io+ from
  *  from a specified +buffer+ (see IO::Buffer) at the given +offset+.
@@ -544,14 +864,29 @@ rb_fiber_scheduler_io_pread(VALUE scheduler, VALUE io, rb_off_t from, VALUE buff
  *
  *  The method should be considered _experimental_.
  */
+static VALUE
+fiber_scheduler_io_write(VALUE _argument) {
+    VALUE *arguments = (VALUE*)_argument;
+
+    return rb_funcallv(arguments[0], id_io_write, 4, arguments + 1);
+}
+
 VALUE
 rb_fiber_scheduler_io_write(VALUE scheduler, VALUE io, VALUE buffer, size_t length, size_t offset)
 {
+    if (!rb_respond_to(scheduler, id_io_write)) {
+        return RUBY_Qundef;
+    }
+
     VALUE arguments[] = {
-        io, buffer, SIZET2NUM(length), SIZET2NUM(offset)
+        scheduler, io, buffer, SIZET2NUM(length), SIZET2NUM(offset)
     };
 
-    return rb_check_funcall(scheduler, id_io_write, 4, arguments);
+    if (rb_respond_to(scheduler, id_fiber_interrupt)) {
+        return rb_thread_io_blocking_operation(io, fiber_scheduler_io_write, (VALUE)&arguments);
+    } else {
+        return fiber_scheduler_io_write((VALUE)&arguments);
+    }
 }
 
 /*
@@ -569,14 +904,29 @@ rb_fiber_scheduler_io_write(VALUE scheduler, VALUE io, VALUE buffer, size_t leng
  *  The method should be considered _experimental_.
  *
  */
+static VALUE
+fiber_scheduler_io_pwrite(VALUE _argument) {
+    VALUE *arguments = (VALUE*)_argument;
+
+    return rb_funcallv(arguments[0], id_io_pwrite, 5, arguments + 1);
+}
+
 VALUE
 rb_fiber_scheduler_io_pwrite(VALUE scheduler, VALUE io, rb_off_t from, VALUE buffer, size_t length, size_t offset)
 {
+    if (!rb_respond_to(scheduler, id_io_pwrite)) {
+        return RUBY_Qundef;
+    }
+
     VALUE arguments[] = {
-        io, buffer, OFFT2NUM(from), SIZET2NUM(length), SIZET2NUM(offset)
+        scheduler, io, buffer, OFFT2NUM(from), SIZET2NUM(length), SIZET2NUM(offset)
     };
 
-    return rb_check_funcall(scheduler, id_io_pwrite, 5, arguments);
+    if (rb_respond_to(scheduler, id_fiber_interrupt)) {
+        return rb_thread_io_blocking_operation(io, fiber_scheduler_io_pwrite, (VALUE)&arguments);
+    } else {
+        return fiber_scheduler_io_pwrite((VALUE)&arguments);
+    }
 }
 
 VALUE
@@ -677,6 +1027,69 @@ rb_fiber_scheduler_address_resolve(VALUE scheduler, VALUE hostname)
     return rb_check_funcall(scheduler, id_address_resolve, 1, arguments);
 }
 
+/*
+ *  Document-method: Fiber::Scheduler#blocking_operation_wait
+ *  call-seq: blocking_operation_wait(blocking_operation)
+ *
+ *  Invoked by Ruby's core methods to run a blocking operation in a non-blocking way.
+ *  The blocking_operation is a Fiber::Scheduler::BlockingOperation that encapsulates the blocking operation.
+ *
+ *  If the scheduler doesn't implement this method, or if the scheduler doesn't execute
+ *  the blocking operation, Ruby will fall back to the non-scheduler implementation.
+ *
+ *  Minimal suggested implementation is:
+ *
+ *     def blocking_operation_wait(blocking_operation)
+ *       Thread.new { blocking_operation.call }.join
+ *     end
+ */
+VALUE rb_fiber_scheduler_blocking_operation_wait(VALUE scheduler, void* (*function)(void *), void *data, rb_unblock_function_t *unblock_function, void *data2, int flags, struct rb_fiber_scheduler_blocking_operation_state *state)
+{
+    // Check if scheduler supports blocking_operation_wait before creating the object
+    if (!rb_respond_to(scheduler, id_blocking_operation_wait)) {
+        return Qundef;
+    }
+
+    // Create a new BlockingOperation with the blocking operation
+    VALUE blocking_operation = rb_fiber_scheduler_blocking_operation_new(function, data, unblock_function, data2, flags, state);
+
+    VALUE result = rb_funcall(scheduler, id_blocking_operation_wait, 1, blocking_operation);
+
+    // Get the operation data to check if it was executed
+    rb_fiber_scheduler_blocking_operation_t *operation = get_blocking_operation(blocking_operation);
+    rb_atomic_t current_status = RUBY_ATOMIC_LOAD(operation->status);
+
+    // Invalidate the operation now that we're done with it
+    operation->function = NULL;
+    operation->state = NULL;
+    operation->data = NULL;
+    operation->data2 = NULL;
+    operation->unblock_function = NULL;
+
+    // If the blocking operation was never executed, return Qundef to signal the caller to use rb_nogvl instead
+    if (current_status == RB_FIBER_SCHEDULER_BLOCKING_OPERATION_STATUS_QUEUED) {
+        return Qundef;
+    }
+
+    return result;
+}
+
+VALUE rb_fiber_scheduler_fiber_interrupt(VALUE scheduler, VALUE fiber, VALUE exception)
+{
+    VALUE arguments[] = {
+        fiber, exception
+    };
+
+#ifdef RUBY_DEBUG
+    rb_execution_context_t *ec = GET_EC();
+    if (RUBY_VM_INTERRUPTED(ec)) {
+        rb_bug("rb_fiber_scheduler_fiber_interrupt called with pending interrupt");
+    }
+#endif
+
+    return rb_check_funcall(scheduler, id_fiber_interrupt, 2, arguments);
+}
+
 /*
  *  Document-method: Fiber::Scheduler#fiber
  *  call-seq: fiber(&block)
@@ -697,3 +1110,54 @@ rb_fiber_scheduler_fiber(VALUE scheduler, int argc, VALUE *argv, int kw_splat)
 {
     return rb_funcall_passing_block_kw(scheduler, id_fiber_schedule, argc, argv, kw_splat);
 }
+
+/*
+ * C API: Cancel a blocking operation
+ *
+ * This function cancels a blocking operation. If the operation is queued,
+ * it just marks it as cancelled. If it's executing, it marks it as cancelled
+ * and calls the unblock function to interrupt the operation.
+ *
+ * Returns 1 if unblock function was called, 0 if just marked cancelled, -1 on error.
+ */
+int
+rb_fiber_scheduler_blocking_operation_cancel(rb_fiber_scheduler_blocking_operation_t *blocking_operation)
+{
+    if (blocking_operation == NULL) {
+        return -1;
+    }
+
+    rb_atomic_t current_state = RUBY_ATOMIC_LOAD(blocking_operation->status);
+
+    switch (current_state) {
+        case RB_FIBER_SCHEDULER_BLOCKING_OPERATION_STATUS_QUEUED:
+            // Work hasn't started - just mark as cancelled:
+            if (RUBY_ATOMIC_CAS(blocking_operation->status, current_state, RB_FIBER_SCHEDULER_BLOCKING_OPERATION_STATUS_CANCELLED) == current_state) {
+                // Successfully cancelled before execution:
+                return 0;
+            }
+            // Fall through if state changed between load and CAS
+
+        case RB_FIBER_SCHEDULER_BLOCKING_OPERATION_STATUS_EXECUTING:
+            // Work is running - mark cancelled AND call unblock function
+            if (RUBY_ATOMIC_CAS(blocking_operation->status, current_state, RB_FIBER_SCHEDULER_BLOCKING_OPERATION_STATUS_CANCELLED) != current_state) {
+                // State changed between load and CAS - operation may have completed:
+                return 0;
+            }
+            // Otherwise, we successfully marked it as cancelled, so we can call the unblock function:
+            rb_unblock_function_t *unblock_function = blocking_operation->unblock_function;
+            if (unblock_function) {
+                RUBY_ASSERT(unblock_function != (rb_unblock_function_t *)-1 && "unblock_function is still sentinel value -1, should have been resolved earlier");
+                blocking_operation->unblock_function(blocking_operation->data2);
+            }
+            // Cancelled during execution (unblock function called):
+            return 1;
+
+        case RB_FIBER_SCHEDULER_BLOCKING_OPERATION_STATUS_COMPLETED:
+        case RB_FIBER_SCHEDULER_BLOCKING_OPERATION_STATUS_CANCELLED:
+            // Already finished or cancelled:
+            return 0;
+    }
+
+    return 0;
+}
diff --git a/set.c b/set.c
new file mode 100644
index 00000000000000..55d0e626338af5
--- /dev/null
+++ b/set.c
@@ -0,0 +1,2256 @@
+/* This implements sets using the same hash table implementation as in
+   st.c, but without a value for each hash entry.  This results in the
+   same basic performance characteristics as when using an st table,
+   but uses 1/3 less memory.
+   */
+
+#include "id.h"
+#include "internal.h"
+#include "internal/bits.h"
+#include "internal/error.h"
+#include "internal/hash.h"
+#include "internal/proc.h"
+#include "internal/sanitizers.h"
+#include "internal/set_table.h"
+#include "internal/symbol.h"
+#include "internal/variable.h"
+#include "ruby_assert.h"
+
+#include <stdio.h>
+#ifdef HAVE_STDLIB_H
+#include <stdlib.h>
+#endif
+#include <string.h>
+
+#ifndef SET_DEBUG
+#define SET_DEBUG 0
+#endif
+
+#if SET_DEBUG
+#include "internal/gc.h"
+#endif
+
+static st_index_t
+dbl_to_index(double d)
+{
+    union {double d; st_index_t i;} u;
+    u.d = d;
+    return u.i;
+}
+
+static const uint64_t prime1 = ((uint64_t)0x2e0bb864 << 32) | 0xe9ea7df5;
+static const uint32_t prime2 = 0x830fcab9;
+
+static inline uint64_t
+mult_and_mix(uint64_t m1, uint64_t m2)
+{
+#if defined HAVE_UINT128_T
+    uint128_t r = (uint128_t) m1 * (uint128_t) m2;
+    return (uint64_t) (r >> 64) ^ (uint64_t) r;
+#else
+    uint64_t hm1 = m1 >> 32, hm2 = m2 >> 32;
+    uint64_t lm1 = m1, lm2 = m2;
+    uint64_t v64_128 = hm1 * hm2;
+    uint64_t v32_96 = hm1 * lm2 + lm1 * hm2;
+    uint64_t v1_32 = lm1 * lm2;
+
+    return (v64_128 + (v32_96 >> 32)) ^ ((v32_96 << 32) + v1_32);
+#endif
+}
+
+static inline uint64_t
+key64_hash(uint64_t key, uint32_t seed)
+{
+    return mult_and_mix(key + seed, prime1);
+}
+
+/* Should cast down the result for each purpose */
+#define set_index_hash(index) key64_hash(rb_hash_start(index), prime2)
+
+static st_index_t
+set_ident_hash(st_data_t n)
+{
+#ifdef USE_FLONUM /* RUBY */
+    /*
+     * - flonum (on 64-bit) is pathologically bad, mix the actual
+     *   float value in, but do not use the float value as-is since
+     *   many integers get interpreted as 2.0 or -2.0 [Bug #10761]
+     */
+    if (FLONUM_P(n)) {
+        n ^= dbl_to_index(rb_float_value(n));
+    }
+#endif
+
+    return (st_index_t)set_index_hash((st_index_t)n);
+}
+
+static const struct st_hash_type identhash = {
+    rb_st_numcmp,
+    set_ident_hash,
+};
+
+static const struct st_hash_type objhash = {
+    rb_any_cmp,
+    rb_any_hash,
+};
+
+VALUE rb_cSet;
+
+#define id_each idEach
+static ID id_each_entry;
+static ID id_any_p;
+static ID id_new;
+static ID id_i_hash;
+static ID id_set_iter_lev;
+
+#define RSET_INITIALIZED FL_USER1
+#define RSET_LEV_MASK (FL_USER13 | FL_USER14 | FL_USER15 |                /* FL 13..19 */ \
+                        FL_USER16 | FL_USER17 | FL_USER18 | FL_USER19)
+#define RSET_LEV_SHIFT (FL_USHIFT + 13)
+#define RSET_LEV_MAX 127 /* 7 bits */
+
+#define SET_ASSERT(expr) RUBY_ASSERT_MESG_WHEN(SET_DEBUG, expr, #expr)
+
+#define RSET_SIZE(set) set_table_size(RSET_TABLE(set))
+#define RSET_EMPTY(set) (RSET_SIZE(set) == 0)
+#define RSET_SIZE_NUM(set) SIZET2NUM(RSET_SIZE(set))
+#define RSET_IS_MEMBER(sobj, item) set_table_lookup(RSET_TABLE(set), (st_data_t)(item))
+#define RSET_COMPARE_BY_IDENTITY(set) (RSET_TABLE(set)->type == &identhash)
+
+struct set_object {
+    set_table table;
+};
+
+static int
+mark_key(st_data_t key, st_data_t data)
+{
+    rb_gc_mark_movable((VALUE)key);
+
+    return ST_CONTINUE;
+}
+
+static void
+set_mark(void *ptr)
+{
+    struct set_object *sobj = ptr;
+    if (sobj->table.entries) set_table_foreach(&sobj->table, mark_key, 0);
+}
+
+static void
+set_free_embedded(struct set_object *sobj)
+{
+    free((&sobj->table)->bins);
+    free((&sobj->table)->entries);
+}
+
+static void
+set_free(void *ptr)
+{
+    struct set_object *sobj = ptr;
+    set_free_embedded(sobj);
+    memset(&sobj->table, 0, sizeof(sobj->table));
+}
+
+static size_t
+set_size(const void *ptr)
+{
+    const struct set_object *sobj = ptr;
+    /* Do not count the table size twice, as it is embedded */
+    return (unsigned long)set_memsize(&sobj->table) - sizeof(sobj->table);
+}
+
+static int
+set_foreach_replace(st_data_t key, st_data_t argp, int error)
+{
+    if (rb_gc_location((VALUE)key) != (VALUE)key) {
+        return ST_REPLACE;
+    }
+
+    return ST_CONTINUE;
+}
+
+static int
+set_replace_ref(st_data_t *key, st_data_t argp, int existing)
+{
+    if (rb_gc_location((VALUE)*key) != (VALUE)*key) {
+        *key = rb_gc_location((VALUE)*key);
+    }
+
+    return ST_CONTINUE;
+}
+
+static void
+set_update_references(void *ptr)
+{
+    struct set_object *sobj = ptr;
+    set_foreach_with_replace(&sobj->table, set_foreach_replace, set_replace_ref, 0);
+}
+
+static const rb_data_type_t set_data_type = {
+    .wrap_struct_name = "set",
+    .function = {
+        .dmark = set_mark,
+        .dfree = set_free,
+        .dsize = set_size,
+        .dcompact = set_update_references,
+    },
+    .flags = RUBY_TYPED_EMBEDDABLE | RUBY_TYPED_FREE_IMMEDIATELY | RUBY_TYPED_WB_PROTECTED | RUBY_TYPED_FROZEN_SHAREABLE
+};
+
+static inline set_table *
+RSET_TABLE(VALUE set)
+{
+    struct set_object *sobj;
+    TypedData_Get_Struct(set, struct set_object, &set_data_type, sobj);
+    return &sobj->table;
+}
+
+static unsigned long
+iter_lev_in_ivar(VALUE set)
+{
+    VALUE levval = rb_ivar_get(set, id_set_iter_lev);
+    SET_ASSERT(FIXNUM_P(levval));
+    long lev = FIX2LONG(levval);
+    SET_ASSERT(lev >= 0);
+    return (unsigned long)lev;
+}
+
+void rb_ivar_set_internal(VALUE obj, ID id, VALUE val);
+
+static void
+iter_lev_in_ivar_set(VALUE set, unsigned long lev)
+{
+    SET_ASSERT(lev >= RSET_LEV_MAX);
+    SET_ASSERT(POSFIXABLE(lev)); /* POSFIXABLE means fitting to long */
+    rb_ivar_set_internal(set, id_set_iter_lev, LONG2FIX((long)lev));
+}
+
+static inline unsigned long
+iter_lev_in_flags(VALUE set)
+{
+    return (unsigned long)((RBASIC(set)->flags >> RSET_LEV_SHIFT) & RSET_LEV_MAX);
+}
+
+static inline void
+iter_lev_in_flags_set(VALUE set, unsigned long lev)
+{
+    SET_ASSERT(lev <= RSET_LEV_MAX);
+    RBASIC(set)->flags = ((RBASIC(set)->flags & ~RSET_LEV_MASK) | ((VALUE)lev << RSET_LEV_SHIFT));
+}
+
+static inline bool
+set_iterating_p(VALUE set)
+{
+    return iter_lev_in_flags(set) > 0;
+}
+
+static void
+set_iter_lev_inc(VALUE set)
+{
+    unsigned long lev = iter_lev_in_flags(set);
+    if (lev == RSET_LEV_MAX) {
+        lev = iter_lev_in_ivar(set) + 1;
+        if (!POSFIXABLE(lev)) { /* paranoiac check */
+            rb_raise(rb_eRuntimeError, "too much nested iterations");
+        }
+    }
+    else {
+        lev += 1;
+        iter_lev_in_flags_set(set, lev);
+        if (lev < RSET_LEV_MAX) return;
+    }
+    iter_lev_in_ivar_set(set, lev);
+}
+
+static void
+set_iter_lev_dec(VALUE set)
+{
+    unsigned long lev = iter_lev_in_flags(set);
+    if (lev == RSET_LEV_MAX) {
+        lev = iter_lev_in_ivar(set);
+        if (lev > RSET_LEV_MAX) {
+            iter_lev_in_ivar_set(set, lev-1);
+            return;
+        }
+        rb_attr_delete(set, id_set_iter_lev);
+    }
+    else if (lev == 0) {
+        rb_raise(rb_eRuntimeError, "iteration level underflow");
+    }
+    iter_lev_in_flags_set(set, lev - 1);
+}
+
+static VALUE
+set_foreach_ensure(VALUE set)
+{
+    set_iter_lev_dec(set);
+    return 0;
+}
+
+typedef int set_foreach_func(VALUE, VALUE);
+
+struct set_foreach_arg {
+    VALUE set;
+    set_foreach_func *func;
+    VALUE arg;
+};
+
+static int
+set_iter_status_check(int status)
+{
+    if (status == ST_CONTINUE) {
+      return ST_CHECK;
+    }
+
+    return status;
+}
+
+static int
+set_foreach_iter(st_data_t key, st_data_t argp, int error)
+{
+    struct set_foreach_arg *arg = (struct set_foreach_arg *)argp;
+
+    if (error) return ST_STOP;
+
+    set_table *tbl = RSET_TABLE(arg->set);
+    int status = (*arg->func)((VALUE)key, arg->arg);
+
+    if (RSET_TABLE(arg->set) != tbl) {
+        rb_raise(rb_eRuntimeError, "reset occurred during iteration");
+    }
+
+    return set_iter_status_check(status);
+}
+
+static VALUE
+set_foreach_call(VALUE arg)
+{
+    VALUE set = ((struct set_foreach_arg *)arg)->set;
+    int ret = 0;
+    ret = set_foreach_check(RSET_TABLE(set), set_foreach_iter,
+                           (st_data_t)arg, (st_data_t)Qundef);
+    if (ret) {
+        rb_raise(rb_eRuntimeError, "ret: %d, set modified during iteration", ret);
+    }
+    return Qnil;
+}
+
+static void
+set_iter(VALUE set, set_foreach_func *func, VALUE farg)
+{
+    struct set_foreach_arg arg;
+
+    if (RSET_EMPTY(set))
+        return;
+    arg.set = set;
+    arg.func = func;
+    arg.arg  = farg;
+    if (RB_OBJ_FROZEN(set)) {
+        set_foreach_call((VALUE)&arg);
+    }
+    else {
+        set_iter_lev_inc(set);
+        rb_ensure(set_foreach_call, (VALUE)&arg, set_foreach_ensure, set);
+    }
+}
+
+NORETURN(static void no_new_item(void));
+static void
+no_new_item(void)
+{
+    rb_raise(rb_eRuntimeError, "can't add a new item into set during iteration");
+}
+
+static void
+set_compact_after_delete(VALUE set)
+{
+    if (!set_iterating_p(set)) {
+        set_compact_table(RSET_TABLE(set));
+    }
+}
+
+static int
+set_table_insert_wb(set_table *tab, VALUE set, VALUE key, VALUE *key_addr)
+{
+    if (tab->type != &identhash && rb_obj_class(key) == rb_cString && !RB_OBJ_FROZEN(key)) {
+        key = rb_hash_key_str(key);
+        if (key_addr) *key_addr = key;
+    }
+    int ret = set_insert(tab, (st_data_t)key);
+    if (ret == 0) RB_OBJ_WRITTEN(set, Qundef, key);
+    return ret;
+}
+
+static int
+set_insert_wb(VALUE set, VALUE key, VALUE *key_addr)
+{
+    return set_table_insert_wb(RSET_TABLE(set), set, key, key_addr);
+}
+
+static VALUE
+set_alloc_with_size(VALUE klass, st_index_t size)
+{
+    VALUE set;
+    struct set_object *sobj;
+
+    set = TypedData_Make_Struct(klass, struct set_object, &set_data_type, sobj);
+    set_init_table_with_size(&sobj->table, &objhash, size);
+
+    return set;
+}
+
+
+static VALUE
+set_s_alloc(VALUE klass)
+{
+    return set_alloc_with_size(klass, 0);
+}
+
+static VALUE
+set_s_create(int argc, VALUE *argv, VALUE klass)
+{
+    VALUE set = set_alloc_with_size(klass, argc);
+    set_table *table = RSET_TABLE(set);
+    int i;
+
+    for (i=0; i < argc; i++) {
+        set_table_insert_wb(table, set, argv[i], NULL);
+    }
+
+    return set;
+}
+
+static void
+check_set(VALUE arg)
+{
+    if (!rb_obj_is_kind_of(arg, rb_cSet)) {
+        rb_raise(rb_eArgError, "value must be a set");
+    }
+}
+
+static ID
+enum_method_id(VALUE other)
+{
+    if (rb_respond_to(other, id_each_entry)) {
+        return id_each_entry;
+    }
+    else if (rb_respond_to(other, id_each)) {
+        return id_each;
+    }
+    else {
+        rb_raise(rb_eArgError, "value must be enumerable");
+    }
+}
+
+static VALUE
+set_enum_size(VALUE set, VALUE args, VALUE eobj)
+{
+    return RSET_SIZE_NUM(set);
+}
+
+static VALUE
+set_initialize_without_block(RB_BLOCK_CALL_FUNC_ARGLIST(i, set))
+{
+    VALUE element = i;
+    set_insert_wb(set, element, &element);
+    return element;
+}
+
+static VALUE
+set_initialize_with_block(RB_BLOCK_CALL_FUNC_ARGLIST(i, set))
+{
+    VALUE element = rb_yield(i);
+    set_insert_wb(set, element, &element);
+    return element;
+}
+
+/*
+ *  call-seq:
+ *    Set.new -> new_set
+ *    Set.new(enum) -> new_set
+ *    Set.new(enum) { |elem| ... } -> new_set
+ *
+ *  Creates a new set containing the elements of the given enumerable
+ *  object.
+ *
+ *  If a block is given, the elements of enum are preprocessed by the
+ *  given block.
+ *
+ *    Set.new([1, 2])                       #=> #<Set: {1, 2}>
+ *    Set.new([1, 2, 1])                    #=> #<Set: {1, 2}>
+ *    Set.new([1, 'c', :s])                 #=> #<Set: {1, "c", :s}>
+ *    Set.new(1..5)                         #=> #<Set: {1, 2, 3, 4, 5}>
+ *    Set.new([1, 2, 3]) { |x| x * x }      #=> #<Set: {1, 4, 9}>
+ */
+static VALUE
+set_i_initialize(int argc, VALUE *argv, VALUE set)
+{
+    if (RBASIC(set)->flags & RSET_INITIALIZED) {
+        rb_raise(rb_eRuntimeError, "cannot reinitialize set");
+    }
+    RBASIC(set)->flags |= RSET_INITIALIZED;
+
+    VALUE other;
+    rb_check_arity(argc, 0, 1);
+
+    if (argc > 0 && (other = argv[0]) != Qnil) {
+        if (RB_TYPE_P(other, T_ARRAY)) {
+            long i;
+            int block_given = rb_block_given_p();
+            set_table *into = RSET_TABLE(set);
+            for (i=0; i<RARRAY_LEN(other); i++) {
+                VALUE key = RARRAY_AREF(other, i);
+                if (block_given) key = rb_yield(key);
+                set_table_insert_wb(into, set, key, NULL);
+            }
+        }
+        else {
+            rb_block_call(other, enum_method_id(other), 0, 0,
+                rb_block_given_p() ? set_initialize_with_block : set_initialize_without_block,
+                set);
+        }
+    }
+
+    return set;
+}
+
+static VALUE
+set_i_initialize_copy(VALUE set, VALUE other)
+{
+    if (set == other) return set;
+
+    if (set_iterating_p(set)) {
+        rb_raise(rb_eRuntimeError, "cannot replace set during iteration");
+    }
+
+    struct set_object *sobj;
+    TypedData_Get_Struct(set, struct set_object, &set_data_type, sobj);
+
+    set_free_embedded(sobj);
+    set_copy(&sobj->table, RSET_TABLE(other));
+    rb_gc_writebarrier_remember(set);
+
+    return set;
+}
+
+static int
+set_inspect_i(st_data_t key, st_data_t arg)
+{
+    VALUE *args = (VALUE*)arg;
+    VALUE str = args[0];
+    if (args[1] == Qtrue) {
+        rb_str_buf_cat_ascii(str, ", ");
+    }
+    else {
+        args[1] = Qtrue;
+    }
+    rb_str_buf_append(str, rb_inspect((VALUE)key));
+
+    return ST_CONTINUE;
+}
+
+static VALUE
+set_inspect(VALUE set, VALUE dummy, int recur)
+{
+    VALUE str;
+    VALUE klass_name = rb_class_path(CLASS_OF(set));
+
+    if (recur) {
+        str = rb_sprintf("%"PRIsVALUE"[...]", klass_name);
+        return rb_str_export_to_enc(str, rb_usascii_encoding());
+    }
+
+    str = rb_sprintf("%"PRIsVALUE"[", klass_name);
+    VALUE args[2] = {str, Qfalse};
+    set_iter(set, set_inspect_i, (st_data_t)args);
+    rb_str_buf_cat2(str, "]");
+
+    return str;
+}
+
+/*
+ *  call-seq:
+ *    inspect -> new_string
+ *
+ *  Returns a new string containing the set entries:
+ *
+ *    s = Set.new
+ *    s.inspect # => "#<Set: {}>"
+ *    s.add(1)
+ *    s.inspect # => "#<Set: {1}>"
+ *    s.add(2)
+ *    s.inspect # => "#<Set: {1, 2}>"
+ *
+ *  Related: see {Methods for Converting}[rdoc-ref:Set@Methods+for+Converting].
+ */
+static VALUE
+set_i_inspect(VALUE set)
+{
+    return rb_exec_recursive(set_inspect, set, 0);
+}
+
+static int
+set_to_a_i(st_data_t key, st_data_t arg)
+{
+    rb_ary_push((VALUE)arg, (VALUE)key);
+    return ST_CONTINUE;
+}
+
+/*
+ *  call-seq:
+ *    to_a -> array
+ *
+ *  Returns an array containing all elements in the set.
+ *
+ *    Set[1, 2].to_a                    #=> [1, 2]
+ *    Set[1, 'c', :s].to_a              #=> [1, "c", :s]
+ */
+static VALUE
+set_i_to_a(VALUE set)
+{
+    st_index_t size = RSET_SIZE(set);
+    VALUE ary = rb_ary_new_capa(size);
+
+    if (size == 0) return ary;
+
+    if (ST_DATA_COMPATIBLE_P(VALUE)) {
+        RARRAY_PTR_USE(ary, ptr, {
+            size = set_keys(RSET_TABLE(set), ptr, size);
+        });
+        rb_gc_writebarrier_remember(ary);
+        rb_ary_set_len(ary, size);
+    }
+    else {
+        set_iter(set, set_to_a_i, (st_data_t)ary);
+    }
+    return ary;
+}
+
+/*
+ *  call-seq:
+ *    to_set(klass = Set, *args, &block) -> self or new_set
+ *
+ *  Returns self if receiver is an instance of +Set+ and no arguments or
+ *  block are given.  Otherwise, converts the set to another with
+ *  <tt>klass.new(self, *args, &block)</tt>.
+ *
+ *  In subclasses, returns `klass.new(self, *args, &block)` unless overridden.
+ */
+static VALUE
+set_i_to_set(int argc, VALUE *argv, VALUE set)
+{
+    VALUE klass;
+
+    if (argc == 0) {
+        klass = rb_cSet;
+        argv = &set;
+        argc = 1;
+    }
+    else {
+        rb_warn_deprecated("passing arguments to Set#to_set", NULL);
+        klass = argv[0];
+        argv[0] = set;
+    }
+
+    if (klass == rb_cSet && rb_obj_is_instance_of(set, rb_cSet) &&
+            argc == 1 && !rb_block_given_p()) {
+        return set;
+    }
+
+    return rb_funcall_passing_block(klass, id_new, argc, argv);
+}
+
+/*
+ *  call-seq:
+ *    join(separator=nil)-> new_string
+ *
+ *  Returns a string created by converting each element of the set to a string.
+ */
+static VALUE
+set_i_join(int argc, VALUE *argv, VALUE set)
+{
+    rb_check_arity(argc, 0, 1);
+    return rb_ary_join(set_i_to_a(set), argc == 0 ? Qnil : argv[0]);
+}
+
+/*
+ *  call-seq:
+ *    add(obj) -> self
+ *
+ *  Adds the given object to the set and returns self.  Use `merge` to
+ *  add many elements at once.
+ *
+ *    Set[1, 2].add(3)                    #=> #<Set: {1, 2, 3}>
+ *    Set[1, 2].add([3, 4])               #=> #<Set: {1, 2, [3, 4]}>
+ *    Set[1, 2].add(2)                    #=> #<Set: {1, 2}>
+ */
+static VALUE
+set_i_add(VALUE set, VALUE item)
+{
+    rb_check_frozen(set);
+    if (set_iterating_p(set)) {
+        if (!set_table_lookup(RSET_TABLE(set), (st_data_t)item)) {
+            no_new_item();
+        }
+    }
+    else {
+        set_insert_wb(set, item, NULL);
+    }
+    return set;
+}
+
+/*
+ *  call-seq:
+ *    add?(obj) -> self or nil
+ *
+ *  Adds the given object to the set and returns self. If the object is
+ *  already in the set, returns nil.
+ *
+ *    Set[1, 2].add?(3)                    #=> #<Set: {1, 2, 3}>
+ *    Set[1, 2].add?([3, 4])               #=> #<Set: {1, 2, [3, 4]}>
+ *    Set[1, 2].add?(2)                    #=> nil
+ */
+static VALUE
+set_i_add_p(VALUE set, VALUE item)
+{
+    rb_check_frozen(set);
+    if (set_iterating_p(set)) {
+        if (!set_table_lookup(RSET_TABLE(set), (st_data_t)item)) {
+            no_new_item();
+        }
+        return Qnil;
+    }
+    else {
+        return set_insert_wb(set, item, NULL) ? Qnil : set;
+    }
+}
+
+/*
+ *  call-seq:
+ *    delete(obj) -> self
+ *
+ *  Deletes the given object from the set and returns self. Use subtract
+ *  to delete many items at once.
+ */
+static VALUE
+set_i_delete(VALUE set, VALUE item)
+{
+    rb_check_frozen(set);
+    if (set_table_delete(RSET_TABLE(set), (st_data_t *)&item)) {
+        set_compact_after_delete(set);
+    }
+    return set;
+}
+
+/*
+ *  call-seq:
+ *    delete?(obj) -> self or nil
+ *
+ *  Deletes the given object from the set and returns self.  If the
+ *  object is not in the set, returns nil.
+ */
+static VALUE
+set_i_delete_p(VALUE set, VALUE item)
+{
+    rb_check_frozen(set);
+    if (set_table_delete(RSET_TABLE(set), (st_data_t *)&item)) {
+        set_compact_after_delete(set);
+        return set;
+    }
+    return Qnil;
+}
+
+static int
+set_delete_if_i(st_data_t key, st_data_t dummy)
+{
+    return RTEST(rb_yield((VALUE)key)) ? ST_DELETE : ST_CONTINUE;
+}
+
+/*
+ *  call-seq:
+ *    delete_if { |o| ... } -> self
+ *    delete_if -> enumerator
+ *
+ *  Deletes every element of the set for which block evaluates to
+ *  true, and returns self. Returns an enumerator if no block is given.
+ */
+static VALUE
+set_i_delete_if(VALUE set)
+{
+    RETURN_SIZED_ENUMERATOR(set, 0, 0, set_enum_size);
+    rb_check_frozen(set);
+    set_iter(set, set_delete_if_i, 0);
+    set_compact_after_delete(set);
+    return set;
+}
+
+/*
+ *  call-seq:
+ *    reject! { |o| ... } -> self
+ *    reject! -> enumerator
+ *
+ *  Equivalent to Set#delete_if, but returns nil if no changes were made.
+ *  Returns an enumerator if no block is given.
+ */
+static VALUE
+set_i_reject(VALUE set)
+{
+    RETURN_SIZED_ENUMERATOR(set, 0, 0, set_enum_size);
+    rb_check_frozen(set);
+
+    set_table *table = RSET_TABLE(set);
+    size_t n = set_table_size(table);
+    set_iter(set, set_delete_if_i, 0);
+
+    if (n == set_table_size(table)) return Qnil;
+
+    set_compact_after_delete(set);
+    return set;
+}
+
+static int
+set_classify_i(st_data_t key, st_data_t tmp)
+{
+    VALUE* args = (VALUE*)tmp;
+    VALUE hash = args[0];
+    VALUE hash_key = rb_yield(key);
+    VALUE set = rb_hash_lookup2(hash, hash_key, Qundef);
+    if (set == Qundef) {
+        set = set_s_alloc(args[1]);
+        rb_hash_aset(hash, hash_key, set);
+    }
+    set_i_add(set, key);
+
+    return ST_CONTINUE;
+}
+
+/*
+ *  call-seq:
+ *    classify { |o| ... } -> hash
+ *    classify -> enumerator
+ *
+ *  Classifies the set by the return value of the given block and
+ *  returns a hash of {value => set of elements} pairs.  The block is
+ *  called once for each element of the set, passing the element as
+ *  parameter.
+ *
+ *    files = Set.new(Dir.glob("*.rb"))
+ *    hash = files.classify { |f| File.mtime(f).year }
+ *    hash       #=> {2000 => #<Set: {"a.rb", "b.rb"}>,
+ *               #    2001 => #<Set: {"c.rb", "d.rb", "e.rb"}>,
+ *               #    2002 => #<Set: {"f.rb"}>}
+ *
+ *  Returns an enumerator if no block is given.
+ */
+static VALUE
+set_i_classify(VALUE set)
+{
+    RETURN_SIZED_ENUMERATOR(set, 0, 0, set_enum_size);
+    VALUE args[2];
+    args[0] = rb_hash_new();
+    args[1] = rb_obj_class(set);
+    set_iter(set, set_classify_i, (st_data_t)args);
+    return args[0];
+}
+
+// Union-find with path compression
+static long
+set_divide_union_find_root(long *uf_parents, long index, long *tmp_array)
+{
+    long root = uf_parents[index];
+    long update_size = 0;
+    while (root != index) {
+        tmp_array[update_size++] = index;
+        index = root;
+        root = uf_parents[index];
+    }
+    for (long j = 0; j < update_size; j++) {
+        long idx = tmp_array[j];
+        uf_parents[idx] = root;
+    }
+    return root;
+}
+
+static void
+set_divide_union_find_merge(long *uf_parents, long i, long j, long *tmp_array)
+{
+    long root_i = set_divide_union_find_root(uf_parents, i, tmp_array);
+    long root_j = set_divide_union_find_root(uf_parents, j, tmp_array);
+    if (root_i != root_j) uf_parents[root_j] = root_i;
+}
+
+static VALUE
+set_divide_arity2(VALUE set)
+{
+    VALUE tmp, uf;
+    long size, *uf_parents, *tmp_array;
+    VALUE set_class = rb_obj_class(set);
+    VALUE items = set_i_to_a(set);
+    rb_ary_freeze(items);
+    size = RARRAY_LEN(items);
+    tmp_array = ALLOCV_N(long, tmp, size);
+    uf_parents = ALLOCV_N(long, uf, size);
+    for (long i = 0; i < size; i++) {
+        uf_parents[i] = i;
+    }
+    for (long i = 0; i < size - 1; i++) {
+        VALUE item1 = RARRAY_AREF(items, i);
+        for (long j = i + 1; j < size; j++) {
+            VALUE item2 = RARRAY_AREF(items, j);
+            if (RTEST(rb_yield_values(2, item1, item2)) &&
+                RTEST(rb_yield_values(2, item2, item1))) {
+                set_divide_union_find_merge(uf_parents, i, j, tmp_array);
+            }
+        }
+    }
+    VALUE final_set = set_s_create(0, 0, rb_cSet);
+    VALUE hash = rb_hash_new();
+    for (long i = 0; i < size; i++) {
+        VALUE v = RARRAY_AREF(items, i);
+        long root = set_divide_union_find_root(uf_parents, i, tmp_array);
+        VALUE set = rb_hash_aref(hash, LONG2FIX(root));
+        if (set == Qnil) {
+            set = set_s_create(0, 0, set_class);
+            rb_hash_aset(hash, LONG2FIX(root), set);
+            set_i_add(final_set, set);
+        }
+        set_i_add(set, v);
+    }
+    ALLOCV_END(tmp);
+    ALLOCV_END(uf);
+    return final_set;
+}
+
+static void set_merge_enum_into(VALUE set, VALUE arg);
+
+/*
+ *  call-seq:
+ *    divide { |o1, o2| ... } -> set
+ *    divide { |o| ... } -> set
+ *    divide -> enumerator
+ *
+ *  Divides the set into a set of subsets according to the commonality
+ *  defined by the given block.
+ *
+ *  If the arity of the block is 2, elements o1 and o2 are in common
+ *  if both block.call(o1, o2) and block.call(o2, o1) are true.
+ *  Otherwise, elements o1 and o2 are in common if
+ *  block.call(o1) == block.call(o2).
+ *
+ *    numbers = Set[1, 3, 4, 6, 9, 10, 11]
+ *    set = numbers.divide { |i,j| (i - j).abs == 1 }
+ *    set        #=> #<Set: {#<Set: {1}>,
+ *               #           #<Set: {3, 4}>,
+ *               #           #<Set: {6}>}>
+ *               #           #<Set: {9, 10, 11}>,
+ *
+ *  Returns an enumerator if no block is given.
+ */
+static VALUE
+set_i_divide(VALUE set)
+{
+    RETURN_SIZED_ENUMERATOR(set, 0, 0, set_enum_size);
+
+    if (rb_block_arity() == 2) {
+        return set_divide_arity2(set);
+    }
+
+    VALUE values = rb_hash_values(set_i_classify(set));
+    set = set_alloc_with_size(rb_cSet, RARRAY_LEN(values));
+    set_merge_enum_into(set, values);
+    return set;
+}
+
+static int
+set_clear_i(st_data_t key, st_data_t dummy)
+{
+    return ST_DELETE;
+}
+
+/*
+ *  call-seq:
+ *    clear -> self
+ *
+ *  Removes all elements and returns self.
+ *
+ *    set = Set[1, 'c', :s]             #=> #<Set: {1, "c", :s}>
+ *    set.clear                         #=> #<Set: {}>
+ *    set                               #=> #<Set: {}>
+ */
+static VALUE
+set_i_clear(VALUE set)
+{
+    rb_check_frozen(set);
+    if (RSET_SIZE(set) == 0) return set;
+    if (set_iterating_p(set)) {
+        set_iter(set, set_clear_i, 0);
+    }
+    else {
+        set_table_clear(RSET_TABLE(set));
+        set_compact_after_delete(set);
+    }
+    return set;
+}
+
+struct set_intersection_data {
+    VALUE set;
+    set_table *into;
+    set_table *other;
+};
+
+static int
+set_intersection_i(st_data_t key, st_data_t tmp)
+{
+    struct set_intersection_data *data = (struct set_intersection_data *)tmp;
+    if (set_table_lookup(data->other, key)) {
+        set_table_insert_wb(data->into, data->set, key, NULL);
+    }
+
+    return ST_CONTINUE;
+}
+
+static VALUE
+set_intersection_block(RB_BLOCK_CALL_FUNC_ARGLIST(i, data))
+{
+    set_intersection_i((st_data_t)i, (st_data_t)data);
+    return i;
+}
+
+/*
+ *  call-seq:
+ *    set & enum -> new_set
+ *
+ *  Returns a new set containing elements common to the set and the given
+ *  enumerable object.
+ *
+ *    Set[1, 3, 5] & Set[3, 2, 1]             #=> #<Set: {3, 1}>
+ *    Set['a', 'b', 'z'] & ['a', 'b', 'c']    #=> #<Set: {"a", "b"}>
+ */
+static VALUE
+set_i_intersection(VALUE set, VALUE other)
+{
+    VALUE new_set = set_s_alloc(rb_obj_class(set));
+    set_table *stable = RSET_TABLE(set);
+    set_table *ntable = RSET_TABLE(new_set);
+
+    if (rb_obj_is_kind_of(other, rb_cSet)) {
+        set_table *otable = RSET_TABLE(other);
+        if (set_table_size(stable) >= set_table_size(otable)) {
+            /* Swap so we iterate over the smaller set */
+            otable = stable;
+            set = other;
+        }
+
+        struct set_intersection_data data = {
+            .set = new_set,
+            .into = ntable,
+            .other = otable
+        };
+        set_iter(set, set_intersection_i, (st_data_t)&data);
+    }
+    else {
+        struct set_intersection_data data = {
+            .set = new_set,
+            .into = ntable,
+            .other = stable
+        };
+        rb_block_call(other, enum_method_id(other), 0, 0, set_intersection_block, (VALUE)&data);
+    }
+
+    return new_set;
+}
+
+/*
+ *  call-seq:
+ *    include?(item) -> true or false
+ *
+ *  Returns true if the set contains the given object:
+ *
+ *    Set[1, 2, 3].include? 2   #=> true
+ *    Set[1, 2, 3].include? 4   #=> false
+ *
+ *  Note that <code>include?</code> and <code>member?</code> do not test member
+ *  equality using <code>==</code> as do other Enumerables.
+ *
+ *  This is aliased to #===, so it is usable in +case+ expressions:
+ *
+ *    case :apple
+ *    when Set[:potato, :carrot]
+ *      "vegetable"
+ *    when Set[:apple, :banana]
+ *      "fruit"
+ *    end
+ *    # => "fruit"
+ *
+ *  See also Enumerable#include?
+ */
+static VALUE
+set_i_include(VALUE set, VALUE item)
+{
+    return RBOOL(RSET_IS_MEMBER(set, item));
+}
+
+struct set_merge_args {
+  VALUE set;
+  set_table *into;
+};
+
+static int
+set_merge_i(st_data_t key, st_data_t data)
+{
+    struct set_merge_args *args = (struct set_merge_args *)data;
+    set_table_insert_wb(args->into, args->set, key, NULL);
+    return ST_CONTINUE;
+}
+
+static VALUE
+set_merge_block(RB_BLOCK_CALL_FUNC_ARGLIST(key, set))
+{
+    VALUE element = key;
+    set_insert_wb(set, element, &element);
+    return element;
+}
+
+static void
+set_merge_enum_into(VALUE set, VALUE arg)
+{
+    if (rb_obj_is_kind_of(arg, rb_cSet)) {
+        struct set_merge_args args = {
+            .set = set,
+            .into = RSET_TABLE(set)
+        };
+        set_iter(arg, set_merge_i, (st_data_t)&args);
+    }
+    else if (RB_TYPE_P(arg, T_ARRAY)) {
+        long i;
+        set_table *into = RSET_TABLE(set);
+        for (i=0; i<RARRAY_LEN(arg); i++) {
+            set_table_insert_wb(into, set, RARRAY_AREF(arg, i), NULL);
+        }
+    }
+    else {
+        rb_block_call(arg, enum_method_id(arg), 0, 0, set_merge_block, (VALUE)set);
+    }
+}
+
+/*
+ *  call-seq:
+ *    merge(*enums, **nil) -> self
+ *
+ *  Merges the elements of the given enumerable objects to the set and
+ *  returns self.
+ */
+static VALUE
+set_i_merge(int argc, VALUE *argv, VALUE set)
+{
+    if (rb_keyword_given_p()) {
+        rb_raise(rb_eArgError, "no keywords accepted");
+    }
+
+    if (set_iterating_p(set)) {
+        rb_raise(rb_eRuntimeError, "cannot add to set during iteration");
+    }
+
+    rb_check_frozen(set);
+
+    int i;
+
+    for (i=0; i < argc; i++) {
+        set_merge_enum_into(set, argv[i]);
+    }
+
+    return set;
+}
+
+static VALUE
+set_reset_table_with_type(VALUE set, const struct st_hash_type *type)
+{
+    rb_check_frozen(set);
+
+    struct set_object *sobj;
+    TypedData_Get_Struct(set, struct set_object, &set_data_type, sobj);
+    set_table *old = &sobj->table;
+
+    size_t size = set_table_size(old);
+    if (size > 0) {
+        set_table *new = set_init_table_with_size(NULL, type, size);
+        struct set_merge_args args = {
+            .set = set,
+            .into = new
+        };
+        set_iter(set, set_merge_i, (st_data_t)&args);
+        set_free_embedded(sobj);
+        memcpy(&sobj->table, new, sizeof(*new));
+        free(new);
+    }
+    else {
+        sobj->table.type = type;
+    }
+
+    return set;
+}
+
+/*
+ *  call-seq:
+ *    compare_by_identity -> self
+ *
+ *  Makes the set compare its elements by their identity and returns self.
+ */
+static VALUE
+set_i_compare_by_identity(VALUE set)
+{
+    if (RSET_COMPARE_BY_IDENTITY(set)) return set;
+
+    if (set_iterating_p(set)) {
+        rb_raise(rb_eRuntimeError, "compare_by_identity during iteration");
+    }
+
+    return set_reset_table_with_type(set, &identhash);
+}
+
+/*
+ *  call-seq:
+ *    compare_by_identity? -> true or false
+ *
+ *  Returns true if the set will compare its elements by their
+ *  identity.  Also see Set#compare_by_identity.
+ */
+static VALUE
+set_i_compare_by_identity_p(VALUE set)
+{
+    return RBOOL(RSET_COMPARE_BY_IDENTITY(set));
+}
+
+/*
+ *  call-seq:
+ *    size -> integer
+ *
+ *  Returns the number of elements.
+ */
+static VALUE
+set_i_size(VALUE set)
+{
+    return RSET_SIZE_NUM(set);
+}
+
+/*
+ *  call-seq:
+ *    empty? -> true or false
+ *
+ *  Returns true if the set contains no elements.
+ */
+static VALUE
+set_i_empty(VALUE set)
+{
+    return RBOOL(RSET_EMPTY(set));
+}
+
+static int
+set_xor_i(st_data_t key, st_data_t data)
+{
+    VALUE element = (VALUE)key;
+    VALUE set = (VALUE)data;
+    set_table *table = RSET_TABLE(set);
+    if (set_table_insert_wb(table, set, element, &element)) {
+        set_table_delete(table, &element);
+    }
+    return ST_CONTINUE;
+}
+
+/*
+ *  call-seq:
+ *    set ^ enum -> new_set
+ *
+ *  Returns a new set containing elements exclusive between the set and the
+ *  given enumerable object.  <tt>(set ^ enum)</tt> is equivalent to
+ *  <tt>((set | enum) - (set & enum))</tt>.
+ *
+ *    Set[1, 2] ^ Set[2, 3]                   #=> #<Set: {3, 1}>
+ *    Set[1, 'b', 'c'] ^ ['b', 'd']           #=> #<Set: {"d", 1, "c"}>
+ */
+static VALUE
+set_i_xor(VALUE set, VALUE other)
+{
+    VALUE new_set;
+    if (rb_obj_is_kind_of(other, rb_cSet)) {
+        new_set = other;
+    }
+    else {
+        new_set = set_s_alloc(rb_obj_class(set));
+        set_merge_enum_into(new_set, other);
+    }
+    set_iter(set, set_xor_i, (st_data_t)new_set);
+    return new_set;
+}
+
+/*
+ *  call-seq:
+ *    set | enum -> new_set
+ *
+ *  Returns a new set built by merging the set and the elements of the
+ *  given enumerable object.
+ *
+ *    Set[1, 2, 3] | Set[2, 4, 5]         #=> #<Set: {1, 2, 3, 4, 5}>
+ *    Set[1, 5, 'z'] | (1..6)             #=> #<Set: {1, 5, "z", 2, 3, 4, 6}>
+ */
+static VALUE
+set_i_union(VALUE set, VALUE other)
+{
+    set = rb_obj_dup(set);
+    set_merge_enum_into(set, other);
+    return set;
+}
+
+static int
+set_remove_i(st_data_t key, st_data_t from)
+{
+    set_table_delete((struct set_table *)from, (st_data_t *)&key);
+    return ST_CONTINUE;
+}
+
+static VALUE
+set_remove_block(RB_BLOCK_CALL_FUNC_ARGLIST(key, set))
+{
+    rb_check_frozen(set);
+    set_table_delete(RSET_TABLE(set), (st_data_t *)&key);
+    return key;
+}
+
+static void
+set_remove_enum_from(VALUE set, VALUE arg)
+{
+    if (rb_obj_is_kind_of(arg, rb_cSet)) {
+        set_iter(arg, set_remove_i, (st_data_t)RSET_TABLE(set));
+    }
+    else {
+        rb_block_call(arg, enum_method_id(arg), 0, 0, set_remove_block, (VALUE)set);
+    }
+}
+
+/*
+ *  call-seq:
+ *    subtract(enum) -> self
+ *
+ *  Deletes every element that appears in the given enumerable object
+ *  and returns self.
+ */
+static VALUE
+set_i_subtract(VALUE set, VALUE other)
+{
+    rb_check_frozen(set);
+    set_remove_enum_from(set, other);
+    return set;
+}
+
+/*
+ *  call-seq:
+ *    set - enum -> new_set
+ *
+ *  Returns a new set built by duplicating the set, removing every
+ *  element that appears in the given enumerable object.
+ *
+ *    Set[1, 3, 5] - Set[1, 5]                #=> #<Set: {3}>
+ *    Set['a', 'b', 'z'] - ['a', 'c']         #=> #<Set: {"b", "z"}>
+ */
+static VALUE
+set_i_difference(VALUE set, VALUE other)
+{
+    return set_i_subtract(rb_obj_dup(set), other);
+}
+
+static int
+set_each_i(st_data_t key, st_data_t dummy)
+{
+    rb_yield(key);
+    return ST_CONTINUE;
+}
+
+/*
+ *  call-seq:
+ *    each { |o| ... } -> self
+ *    each -> enumerator
+ *
+ *  Calls the given block once for each element in the set, passing
+ *  the element as parameter.  Returns an enumerator if no block is
+ *  given.
+ */
+static VALUE
+set_i_each(VALUE set)
+{
+    RETURN_SIZED_ENUMERATOR(set, 0, 0, set_enum_size);
+    set_iter(set, set_each_i, 0);
+    return set;
+}
+
+static int
+set_collect_i(st_data_t key, st_data_t data)
+{
+    set_insert_wb((VALUE)data, rb_yield((VALUE)key), NULL);
+    return ST_CONTINUE;
+}
+
+/*
+ *  call-seq:
+ *    collect! { |o| ... } -> self
+ *    collect! -> enumerator
+ *
+ *  Replaces the elements with ones returned by +collect+.
+ *  Returns an enumerator if no block is given.
+ */
+static VALUE
+set_i_collect(VALUE set)
+{
+    RETURN_SIZED_ENUMERATOR(set, 0, 0, set_enum_size);
+    rb_check_frozen(set);
+
+    VALUE new_set = set_s_alloc(rb_obj_class(set));
+    set_iter(set, set_collect_i, (st_data_t)new_set);
+    set_i_initialize_copy(set, new_set);
+
+    return set;
+}
+
+static int
+set_keep_if_i(st_data_t key, st_data_t into)
+{
+    if (!RTEST(rb_yield((VALUE)key))) {
+        set_table_delete((set_table *)into, &key);
+    }
+    return ST_CONTINUE;
+}
+
+/*
+ *  call-seq:
+ *    keep_if { |o| ... } -> self
+ *    keep_if -> enumerator
+ *
+ *  Deletes every element of the set for which block evaluates to false, and
+ *  returns self. Returns an enumerator if no block is given.
+ */
+static VALUE
+set_i_keep_if(VALUE set)
+{
+    RETURN_SIZED_ENUMERATOR(set, 0, 0, set_enum_size);
+    rb_check_frozen(set);
+
+    set_iter(set, set_keep_if_i, (st_data_t)RSET_TABLE(set));
+
+    return set;
+}
+
+/*
+ *  call-seq:
+ *    select! { |o| ... } -> self
+ *    select! -> enumerator
+ *
+ *  Equivalent to Set#keep_if, but returns nil if no changes were made.
+ *  Returns an enumerator if no block is given.
+ */
+static VALUE
+set_i_select(VALUE set)
+{
+    RETURN_SIZED_ENUMERATOR(set, 0, 0, set_enum_size);
+    rb_check_frozen(set);
+
+    set_table *table = RSET_TABLE(set);
+    size_t n = set_table_size(table);
+    set_iter(set, set_keep_if_i, (st_data_t)table);
+
+    return (n == set_table_size(table)) ? Qnil : set;
+}
+
+/*
+ *  call-seq:
+ *    replace(enum) -> self
+ *
+ *  Replaces the contents of the set with the contents of the given
+ *  enumerable object and returns self.
+ *
+ *    set = Set[1, 'c', :s]             #=> #<Set: {1, "c", :s}>
+ *    set.replace([1, 2])               #=> #<Set: {1, 2}>
+ *    set                               #=> #<Set: {1, 2}>
+ */
+static VALUE
+set_i_replace(VALUE set, VALUE other)
+{
+    rb_check_frozen(set);
+
+    if (rb_obj_is_kind_of(other, rb_cSet)) {
+        set_i_initialize_copy(set, other);
+    }
+    else {
+        if (set_iterating_p(set)) {
+            rb_raise(rb_eRuntimeError, "cannot replace set during iteration");
+        }
+
+        // make sure enum is enumerable before calling clear
+        enum_method_id(other);
+
+        set_table_clear(RSET_TABLE(set));
+        set_merge_enum_into(set, other);
+    }
+
+    return set;
+}
+
+/*
+ *  call-seq:
+ *    reset -> self
+ *
+ *  Resets the internal state after modification to existing elements
+ *  and returns self. Elements will be reindexed and deduplicated.
+ */
+static VALUE
+set_i_reset(VALUE set)
+{
+    if (set_iterating_p(set)) {
+        rb_raise(rb_eRuntimeError, "reset during iteration");
+    }
+
+    return set_reset_table_with_type(set, RSET_TABLE(set)->type);
+}
+
+static void set_flatten_merge(VALUE set, VALUE from, VALUE seen);
+
+static int
+set_flatten_merge_i(st_data_t item, st_data_t arg)
+{
+    VALUE *args = (VALUE *)arg;
+    VALUE set = args[0];
+    if (rb_obj_is_kind_of(item, rb_cSet)) {
+        VALUE e_id = rb_obj_id(item);
+        VALUE hash = args[2];
+        switch(rb_hash_aref(hash, e_id)) {
+          case Qfalse:
+           return ST_CONTINUE;
+          case Qtrue:
+            rb_raise(rb_eArgError, "tried to flatten recursive Set");
+          default:
+            break;
+        }
+
+        rb_hash_aset(hash, e_id, Qtrue);
+        set_flatten_merge(set, item, hash);
+        rb_hash_aset(hash, e_id, Qfalse);
+    }
+    else {
+        set_i_add(set, item);
+    }
+    return ST_CONTINUE;
+}
+
+static void
+set_flatten_merge(VALUE set, VALUE from, VALUE hash)
+{
+    VALUE args[3] = {set, from, hash};
+    set_iter(from, set_flatten_merge_i, (st_data_t)args);
+}
+
+/*
+ *  call-seq:
+ *    flatten -> set
+ *
+ *  Returns a new set that is a copy of the set, flattening each
+ *  containing set recursively.
+ */
+static VALUE
+set_i_flatten(VALUE set)
+{
+    VALUE new_set = set_s_alloc(rb_obj_class(set));
+    set_flatten_merge(new_set, set, rb_hash_new());
+    return new_set;
+}
+
+static int
+set_contains_set_i(st_data_t item, st_data_t arg)
+{
+    if (rb_obj_is_kind_of(item, rb_cSet)) {
+        *(bool *)arg = true;
+        return ST_STOP;
+    }
+    return ST_CONTINUE;
+}
+
+/*
+ *  call-seq:
+ *    flatten! -> self
+ *
+ *  Equivalent to Set#flatten, but replaces the receiver with the
+ *  result in place.  Returns nil if no modifications were made.
+ */
+static VALUE
+set_i_flatten_bang(VALUE set)
+{
+    bool contains_set = false;
+    set_iter(set, set_contains_set_i, (st_data_t)&contains_set);
+    if (!contains_set) return Qnil;
+    rb_check_frozen(set);
+    return set_i_replace(set, set_i_flatten(set));
+}
+
+struct set_subset_data {
+    set_table *table;
+    VALUE result;
+};
+
+static int
+set_le_i(st_data_t key, st_data_t arg)
+{
+    struct set_subset_data *data = (struct set_subset_data *)arg;
+    if (set_table_lookup(data->table, key)) return ST_CONTINUE;
+    data->result = Qfalse;
+    return ST_STOP;
+}
+
+static VALUE
+set_le(VALUE set, VALUE other)
+{
+    struct set_subset_data data = {
+        .table = RSET_TABLE(other),
+        .result = Qtrue
+    };
+    set_iter(set, set_le_i, (st_data_t)&data);
+    return data.result;
+}
+
+/*
+ *  call-seq:
+ *    proper_subset?(set) -> true or false
+ *
+ *  Returns true if the set is a proper subset of the given set.
+ */
+static VALUE
+set_i_proper_subset(VALUE set, VALUE other)
+{
+    check_set(other);
+    if (RSET_SIZE(set) >= RSET_SIZE(other)) return Qfalse;
+    return set_le(set, other);
+}
+
+/*
+ *  call-seq:
+ *    subset?(set) -> true or false
+ *
+ *  Returns true if the set is a subset of the given set.
+ */
+static VALUE
+set_i_subset(VALUE set, VALUE other)
+{
+    check_set(other);
+    if (RSET_SIZE(set) > RSET_SIZE(other)) return Qfalse;
+    return set_le(set, other);
+}
+
+/*
+ *  call-seq:
+ *    proper_superset?(set) -> true or false
+ *
+ *  Returns true if the set is a proper superset of the given set.
+ */
+static VALUE
+set_i_proper_superset(VALUE set, VALUE other)
+{
+    check_set(other);
+    if (RSET_SIZE(set) <= RSET_SIZE(other)) return Qfalse;
+    return set_le(other, set);
+}
+
+/*
+ *  call-seq:
+ *    superset?(set) -> true or false
+ *
+ *  Returns true if the set is a superset of the given set.
+ */
+static VALUE
+set_i_superset(VALUE set, VALUE other)
+{
+    check_set(other);
+    if (RSET_SIZE(set) < RSET_SIZE(other)) return Qfalse;
+    return set_le(other, set);
+}
+
+static int
+set_intersect_i(st_data_t key, st_data_t arg)
+{
+    VALUE *args = (VALUE *)arg;
+    if (set_table_lookup((set_table *)args[0], key)) {
+        args[1] = Qtrue;
+        return ST_STOP;
+    }
+    return ST_CONTINUE;
+}
+
+/*
+ *  call-seq:
+ *    intersect?(set) -> true or false
+ *
+ *  Returns true if the set and the given enumerable have at least one
+ *  element in common.
+ *
+ *    Set[1, 2, 3].intersect? Set[4, 5]   #=> false
+ *    Set[1, 2, 3].intersect? Set[3, 4]   #=> true
+ *    Set[1, 2, 3].intersect? 4..5        #=> false
+ *    Set[1, 2, 3].intersect? [3, 4]      #=> true
+ */
+static VALUE
+set_i_intersect(VALUE set, VALUE other)
+{
+    if (rb_obj_is_kind_of(other, rb_cSet)) {
+        size_t set_size = RSET_SIZE(set);
+        size_t other_size = RSET_SIZE(other);
+        VALUE args[2];
+        args[1] = Qfalse;
+        VALUE iter_arg;
+
+        if (set_size < other_size) {
+            iter_arg = set;
+            args[0] = (VALUE)RSET_TABLE(other);
+        }
+        else {
+            iter_arg = other;
+            args[0] = (VALUE)RSET_TABLE(set);
+        }
+        set_iter(iter_arg, set_intersect_i, (st_data_t)args);
+        return args[1];
+    }
+    else if (rb_obj_is_kind_of(other, rb_mEnumerable)) {
+        return rb_funcall(other, id_any_p, 1, set);
+    }
+    else {
+        rb_raise(rb_eArgError, "value must be enumerable");
+    }
+}
+
+/*
+ *  call-seq:
+ *    disjoint?(set) -> true or false
+ *
+ *  Returns true if the set and the given enumerable have no
+ *  element in common.  This method is the opposite of +intersect?+.
+ *
+ *    Set[1, 2, 3].disjoint? Set[3, 4]   #=> false
+ *    Set[1, 2, 3].disjoint? Set[4, 5]   #=> true
+ *    Set[1, 2, 3].disjoint? [3, 4]      #=> false
+ *    Set[1, 2, 3].disjoint? 4..5        #=> true
+ */
+static VALUE
+set_i_disjoint(VALUE set, VALUE other)
+{
+    return RBOOL(!RTEST(set_i_intersect(set, other)));
+}
+
+/*
+ *  call-seq:
+ *    set <=> other -> -1, 0, 1, or nil
+ *
+ *  Returns 0 if the set are equal, -1 / 1 if the set is a
+ *  proper subset / superset of the given set, or or nil if
+ *  they both have unique elements.
+ */
+static VALUE
+set_i_compare(VALUE set, VALUE other)
+{
+    if (rb_obj_is_kind_of(other, rb_cSet)) {
+        size_t set_size = RSET_SIZE(set);
+        size_t other_size = RSET_SIZE(other);
+
+        if (set_size < other_size) {
+            if (set_le(set, other) == Qtrue) {
+                return INT2NUM(-1);
+            }
+        }
+        else if (set_size > other_size) {
+            if (set_le(other, set) == Qtrue) {
+                return INT2NUM(1);
+            }
+        }
+        else if (set_le(set, other) == Qtrue) {
+            return INT2NUM(0);
+        }
+    }
+
+    return Qnil;
+}
+
+struct set_equal_data {
+    VALUE result;
+    VALUE set;
+};
+
+static int
+set_eql_i(st_data_t item, st_data_t arg)
+{
+    struct set_equal_data *data = (struct set_equal_data *)arg;
+
+    if (!set_table_lookup(RSET_TABLE(data->set), item)) {
+        data->result = Qfalse;
+        return ST_STOP;
+    }
+    return ST_CONTINUE;
+}
+
+static VALUE
+set_recursive_eql(VALUE set, VALUE dt, int recur)
+{
+    if (recur) return Qtrue;
+    struct set_equal_data *data = (struct set_equal_data*)dt;
+    data->result = Qtrue;
+    set_iter(set, set_eql_i, dt);
+    return data->result;
+}
+
+/*
+ *  call-seq:
+ *    set == other -> true or false
+ *
+ *  Returns true if two sets are equal.
+ */
+static VALUE
+set_i_eq(VALUE set, VALUE other)
+{
+    if (!rb_obj_is_kind_of(other, rb_cSet)) return Qfalse;
+    if (set == other) return Qtrue;
+
+    set_table *stable = RSET_TABLE(set);
+    set_table *otable = RSET_TABLE(other);
+    size_t ssize = set_table_size(stable);
+    size_t osize = set_table_size(otable);
+
+    if (ssize != osize) return Qfalse;
+    if (ssize == 0 && osize == 0) return Qtrue;
+    if (stable->type != otable->type) return Qfalse;
+
+    struct set_equal_data data;
+    data.set = other;
+    return rb_exec_recursive_paired(set_recursive_eql, set, other, (VALUE)&data);
+}
+
+static int
+set_hash_i(st_data_t item, st_data_t(arg))
+{
+    st_index_t *hval = (st_index_t *)arg;
+    st_index_t ival = rb_hash(item);
+    *hval ^= rb_st_hash(&ival, sizeof(st_index_t), 0);
+    return ST_CONTINUE;
+}
+
+/*
+ *  call-seq:
+ *    hash -> integer
+ *
+ *  Returns hash code for set.
+ */
+static VALUE
+set_i_hash(VALUE set)
+{
+    st_index_t size = RSET_SIZE(set);
+    st_index_t hval = rb_st_hash_start(size);
+    hval = rb_hash_uint(hval, (st_index_t)set_i_hash);
+    if (size) {
+        set_iter(set, set_hash_i, (VALUE)&hval);
+    }
+    hval = rb_st_hash_end(hval);
+    return ST2FIX(hval);
+}
+
+/* :nodoc: */
+static int
+set_to_hash_i(st_data_t key, st_data_t arg)
+{
+    rb_hash_aset((VALUE)arg, (VALUE)key, Qtrue);
+    return ST_CONTINUE;
+}
+
+static VALUE
+set_i_to_h(VALUE set)
+{
+    st_index_t size = RSET_SIZE(set);
+    VALUE hash;
+    if (RSET_COMPARE_BY_IDENTITY(set)) {
+        hash = rb_ident_hash_new_with_size(size);
+    }
+    else {
+        hash = rb_hash_new_with_size(size);
+    }
+    rb_hash_set_default(hash, Qfalse);
+
+    if (size == 0) return hash;
+
+    set_iter(set, set_to_hash_i, (st_data_t)hash);
+    return hash;
+}
+
+static VALUE
+compat_dumper(VALUE set)
+{
+    VALUE dumper = rb_class_new_instance(0, 0, rb_cObject);
+    rb_ivar_set(dumper, id_i_hash, set_i_to_h(set));
+    return dumper;
+}
+
+static int
+set_i_from_hash_i(st_data_t key, st_data_t val, st_data_t set)
+{
+    if ((VALUE)val != Qtrue) {
+        rb_raise(rb_eRuntimeError, "expect true as Set value: %"PRIsVALUE, rb_obj_class((VALUE)val));
+    }
+    set_i_add((VALUE)set, (VALUE)key);
+    return ST_CONTINUE;
+}
+
+static VALUE
+set_i_from_hash(VALUE set, VALUE hash)
+{
+    Check_Type(hash, T_HASH);
+    if (rb_hash_compare_by_id_p(hash)) set_i_compare_by_identity(set);
+    rb_hash_stlike_foreach(hash, set_i_from_hash_i, (st_data_t)set);
+    return set;
+}
+
+static VALUE
+compat_loader(VALUE self, VALUE a)
+{
+    return set_i_from_hash(self, rb_ivar_get(a, id_i_hash));
+}
+
+/* C-API functions */
+
+void
+rb_set_foreach(VALUE set, int (*func)(VALUE element, VALUE arg), VALUE arg)
+{
+    set_iter(set, func, arg);
+}
+
+VALUE
+rb_set_new(void)
+{
+    return set_alloc_with_size(rb_cSet, 0);
+}
+
+VALUE
+rb_set_new_capa(size_t capa)
+{
+    return set_alloc_with_size(rb_cSet, (st_index_t)capa);
+}
+
+bool
+rb_set_lookup(VALUE set, VALUE element)
+{
+    return RSET_IS_MEMBER(set, element);
+}
+
+bool
+rb_set_add(VALUE set, VALUE element)
+{
+    return set_i_add_p(set, element) != Qnil;
+}
+
+VALUE
+rb_set_clear(VALUE set)
+{
+    return set_i_clear(set);
+}
+
+bool
+rb_set_delete(VALUE set, VALUE element)
+{
+    return set_i_delete_p(set, element) != Qnil;
+}
+
+size_t
+rb_set_size(VALUE set)
+{
+    return RSET_SIZE(set);
+}
+
+/*
+ *  Document-class: Set
+ *
+ * Copyright (c) 2002-2024 Akinori MUSHA <knu@iDaemons.org>
+ *
+ * Documentation by Akinori MUSHA and Gavin Sinclair.
+ *
+ * All rights reserved.  You can redistribute and/or modify it under the same
+ * terms as Ruby.
+ *
+ * The Set class implements a collection of unordered values with no
+ * duplicates. It is a hybrid of Array's intuitive inter-operation
+ * facilities and Hash's fast lookup.
+ *
+ * Set is easy to use with Enumerable objects (implementing `each`).
+ * Most of the initializer methods and binary operators accept generic
+ * Enumerable objects besides sets and arrays.  An Enumerable object
+ * can be converted to Set using the `to_set` method.
+ *
+ * Set uses a data structure similar to Hash for storage, except that
+ * it only has keys and no values.
+ *
+ * * Equality of elements is determined according to Object#eql? and
+ *   Object#hash.  Use Set#compare_by_identity to make a set compare
+ *   its elements by their identity.
+ * * Set assumes that the identity of each element does not change
+ *   while it is stored.  Modifying an element of a set will render the
+ *   set to an unreliable state.
+ * * When a string is to be stored, a frozen copy of the string is
+ *   stored instead unless the original string is already frozen.
+ *
+ * == Comparison
+ *
+ * The comparison operators <tt><</tt>, <tt>></tt>, <tt><=</tt>, and
+ * <tt>>=</tt> are implemented as shorthand for the
+ * {proper_,}{subset?,superset?} methods.  The <tt><=></tt>
+ * operator reflects this order, or returns +nil+ for sets that both
+ * have distinct elements (<tt>{x, y}</tt> vs. <tt>{x, z}</tt> for example).
+ *
+ * == Example
+ *
+ *   s1 = Set[1, 2]                        #=> #<Set: {1, 2}>
+ *   s2 = [1, 2].to_set                    #=> #<Set: {1, 2}>
+ *   s1 == s2                              #=> true
+ *   s1.add("foo")                         #=> #<Set: {1, 2, "foo"}>
+ *   s1.merge([2, 6])                      #=> #<Set: {1, 2, "foo", 6}>
+ *   s1.subset?(s2)                        #=> false
+ *   s2.subset?(s1)                        #=> true
+ *
+ * == Contact
+ *
+ * - Akinori MUSHA <knu@iDaemons.org> (current maintainer)
+ *
+ * == What's Here
+ *
+ *  First, what's elsewhere. \Class \Set:
+ *
+ * - Inherits from {class Object}[rdoc-ref:Object@What-27s+Here].
+ * - Includes {module Enumerable}[rdoc-ref:Enumerable@What-27s+Here],
+ *   which provides dozens of additional methods.
+ *
+ * In particular, class \Set does not have many methods of its own
+ * for fetching or for iterating.
+ * Instead, it relies on those in \Enumerable.
+ *
+ * Here, class \Set provides methods that are useful for:
+ *
+ * - {Creating an Array}[rdoc-ref:Array@Methods+for+Creating+an+Array]
+ * - {Creating a Set}[rdoc-ref:Array@Methods+for+Creating+a+Set]
+ * - {Set Operations}[rdoc-ref:Array@Methods+for+Set+Operations]
+ * - {Comparing}[rdoc-ref:Array@Methods+for+Comparing]
+ * - {Querying}[rdoc-ref:Array@Methods+for+Querying]
+ * - {Assigning}[rdoc-ref:Array@Methods+for+Assigning]
+ * - {Deleting}[rdoc-ref:Array@Methods+for+Deleting]
+ * - {Converting}[rdoc-ref:Array@Methods+for+Converting]
+ * - {Iterating}[rdoc-ref:Array@Methods+for+Iterating]
+ * - {And more....}[rdoc-ref:Array@Other+Methods]
+ *
+ * === Methods for Creating a \Set
+ *
+ * - ::[]:
+ *   Returns a new set containing the given objects.
+ * - ::new:
+ *   Returns a new set containing either the given objects
+ *   (if no block given) or the return values from the called block
+ *   (if a block given).
+ *
+ * === Methods for \Set Operations
+ *
+ * - #| (aliased as #union and #+):
+ *   Returns a new set containing all elements from +self+
+ *   and all elements from a given enumerable (no duplicates).
+ * - #& (aliased as #intersection):
+ *   Returns a new set containing all elements common to +self+
+ *   and a given enumerable.
+ * - #- (aliased as #difference):
+ *   Returns a copy of +self+ with all elements
+ *   in a given enumerable removed.
+ * - #^: Returns a new set containing all elements from +self+
+ *   and a given enumerable except those common to both.
+ *
+ * === Methods for Comparing
+ *
+ * - #<=>: Returns -1, 0, or 1 as +self+ is less than, equal to,
+ *   or greater than a given object.
+ * - #==: Returns whether +self+ and a given enumerable are equal,
+ *   as determined by Object#eql?.
+ * - #compare_by_identity?:
+ *   Returns whether the set considers only identity
+ *   when comparing elements.
+ *
+ * === Methods for Querying
+ *
+ * - #length (aliased as #size):
+ *   Returns the count of elements.
+ * - #empty?:
+ *   Returns whether the set has no elements.
+ * - #include? (aliased as #member? and #===):
+ *   Returns whether a given object is an element in the set.
+ * - #subset? (aliased as #<=):
+ *   Returns whether a given object is a subset of the set.
+ * - #proper_subset? (aliased as #<):
+ *   Returns whether a given enumerable is a proper subset of the set.
+ * - #superset? (aliased as #>=):
+ *   Returns whether a given enumerable is a superset of the set.
+ * - #proper_superset? (aliased as #>):
+ *   Returns whether a given enumerable is a proper superset of the set.
+ * - #disjoint?:
+ *   Returns +true+ if the set and a given enumerable
+ *   have no common elements, +false+ otherwise.
+ * - #intersect?:
+ *   Returns +true+ if the set and a given enumerable:
+ *   have any common elements, +false+ otherwise.
+ * - #compare_by_identity?:
+ *   Returns whether the set considers only identity
+ *   when comparing elements.
+ *
+ * === Methods for Assigning
+ *
+ * - #add (aliased as #<<):
+ *   Adds a given object to the set; returns +self+.
+ * - #add?:
+ *   If the given object is not an element in the set,
+ *   adds it and returns +self+; otherwise, returns +nil+.
+ * - #merge:
+ *   Merges the elements of each given enumerable object to the set; returns +self+.
+ * - #replace:
+ *   Replaces the contents of the set with the contents
+ *   of a given enumerable.
+ *
+ * === Methods for Deleting
+ *
+ * - #clear:
+ *   Removes all elements in the set; returns +self+.
+ * - #delete:
+ *   Removes a given object from the set; returns +self+.
+ * - #delete?:
+ *   If the given object is an element in the set,
+ *   removes it and returns +self+; otherwise, returns +nil+.
+ * - #subtract:
+ *   Removes each given object from the set; returns +self+.
+ * - #delete_if - Removes elements specified by a given block.
+ * - #select! (aliased as #filter!):
+ *   Removes elements not specified by a given block.
+ * - #keep_if:
+ *   Removes elements not specified by a given block.
+ * - #reject!
+ *   Removes elements specified by a given block.
+ *
+ * === Methods for Converting
+ *
+ * - #classify:
+ *   Returns a hash that classifies the elements,
+ *   as determined by the given block.
+ * - #collect! (aliased as #map!):
+ *   Replaces each element with a block return-value.
+ * - #divide:
+ *   Returns a hash that classifies the elements,
+ *   as determined by the given block;
+ *   differs from #classify in that the block may accept
+ *   either one or two arguments.
+ * - #flatten:
+ *   Returns a new set that is a recursive flattening of +self+.
+ * - #flatten!:
+ *   Replaces each nested set in +self+ with the elements from that set.
+ * - #inspect (aliased as #to_s):
+ *   Returns a string displaying the elements.
+ * - #join:
+ *   Returns a string containing all elements, converted to strings
+ *   as needed, and joined by the given record separator.
+ * - #to_a:
+ *   Returns an array containing all set elements.
+ * - #to_set:
+ *   Returns +self+ if given no arguments and no block;
+ *   with a block given, returns a new set consisting of block
+ *   return values.
+ *
+ * === Methods for Iterating
+ *
+ * - #each:
+ *   Calls the block with each successive element; returns +self+.
+ *
+ * === Other Methods
+ *
+ * - #reset:
+ *   Resets the internal state; useful if an object
+ *   has been modified while an element in the set.
+ *
+ */
+void
+Init_Set(void)
+{
+    rb_cSet = rb_define_class("Set", rb_cObject);
+    rb_include_module(rb_cSet, rb_mEnumerable);
+
+    id_each_entry = rb_intern_const("each_entry");
+    id_any_p = rb_intern_const("any?");
+    id_new = rb_intern_const("new");
+    id_i_hash = rb_intern_const("@hash");
+    id_set_iter_lev = rb_make_internal_id();
+
+    rb_define_alloc_func(rb_cSet, set_s_alloc);
+    rb_define_singleton_method(rb_cSet, "[]", set_s_create, -1);
+
+    rb_define_method(rb_cSet, "initialize", set_i_initialize, -1);
+    rb_define_method(rb_cSet, "initialize_copy", set_i_initialize_copy, 1);
+
+    rb_define_method(rb_cSet, "&", set_i_intersection, 1);
+    rb_define_alias(rb_cSet, "intersection", "&");
+    rb_define_method(rb_cSet, "-", set_i_difference, 1);
+    rb_define_alias(rb_cSet, "difference", "-");
+    rb_define_method(rb_cSet, "^", set_i_xor, 1);
+    rb_define_method(rb_cSet, "|", set_i_union, 1);
+    rb_define_alias(rb_cSet, "+", "|");
+    rb_define_alias(rb_cSet, "union", "|");
+    rb_define_method(rb_cSet, "<=>", set_i_compare, 1);
+    rb_define_method(rb_cSet, "==", set_i_eq, 1);
+    rb_define_alias(rb_cSet, "eql?", "==");
+    rb_define_method(rb_cSet, "add", set_i_add, 1);
+    rb_define_alias(rb_cSet, "<<", "add");
+    rb_define_method(rb_cSet, "add?", set_i_add_p, 1);
+    rb_define_method(rb_cSet, "classify", set_i_classify, 0);
+    rb_define_method(rb_cSet, "clear", set_i_clear, 0);
+    rb_define_method(rb_cSet, "collect!", set_i_collect, 0);
+    rb_define_alias(rb_cSet, "map!", "collect!");
+    rb_define_method(rb_cSet, "compare_by_identity", set_i_compare_by_identity, 0);
+    rb_define_method(rb_cSet, "compare_by_identity?", set_i_compare_by_identity_p, 0);
+    rb_define_method(rb_cSet, "delete", set_i_delete, 1);
+    rb_define_method(rb_cSet, "delete?", set_i_delete_p, 1);
+    rb_define_method(rb_cSet, "delete_if", set_i_delete_if, 0);
+    rb_define_method(rb_cSet, "disjoint?", set_i_disjoint, 1);
+    rb_define_method(rb_cSet, "divide", set_i_divide, 0);
+    rb_define_method(rb_cSet, "each", set_i_each, 0);
+    rb_define_method(rb_cSet, "empty?", set_i_empty, 0);
+    rb_define_method(rb_cSet, "flatten", set_i_flatten, 0);
+    rb_define_method(rb_cSet, "flatten!", set_i_flatten_bang, 0);
+    rb_define_method(rb_cSet, "hash", set_i_hash, 0);
+    rb_define_method(rb_cSet, "include?", set_i_include, 1);
+    rb_define_alias(rb_cSet, "member?", "include?");
+    rb_define_alias(rb_cSet, "===", "include?");
+    rb_define_method(rb_cSet, "inspect", set_i_inspect, 0);
+    rb_define_alias(rb_cSet, "to_s", "inspect");
+    rb_define_method(rb_cSet, "intersect?", set_i_intersect, 1);
+    rb_define_method(rb_cSet, "join", set_i_join, -1);
+    rb_define_method(rb_cSet, "keep_if", set_i_keep_if, 0);
+    rb_define_method(rb_cSet, "merge", set_i_merge, -1);
+    rb_define_method(rb_cSet, "proper_subset?", set_i_proper_subset, 1);
+    rb_define_alias(rb_cSet, "<", "proper_subset?");
+    rb_define_method(rb_cSet, "proper_superset?", set_i_proper_superset, 1);
+    rb_define_alias(rb_cSet, ">", "proper_superset?");
+    rb_define_method(rb_cSet, "reject!", set_i_reject, 0);
+    rb_define_method(rb_cSet, "replace", set_i_replace, 1);
+    rb_define_method(rb_cSet, "reset", set_i_reset, 0);
+    rb_define_method(rb_cSet, "size", set_i_size, 0);
+    rb_define_alias(rb_cSet, "length", "size");
+    rb_define_method(rb_cSet, "select!", set_i_select, 0);
+    rb_define_alias(rb_cSet, "filter!", "select!");
+    rb_define_method(rb_cSet, "subset?", set_i_subset, 1);
+    rb_define_alias(rb_cSet, "<=", "subset?");
+    rb_define_method(rb_cSet, "subtract", set_i_subtract, 1);
+    rb_define_method(rb_cSet, "superset?", set_i_superset, 1);
+    rb_define_alias(rb_cSet, ">=", "superset?");
+    rb_define_method(rb_cSet, "to_a", set_i_to_a, 0);
+    rb_define_method(rb_cSet, "to_set", set_i_to_set, -1);
+
+    /* :nodoc: */
+    VALUE compat = rb_define_class_under(rb_cSet, "compatible", rb_cObject);
+    rb_marshal_define_compat(rb_cSet, compat, compat_dumper, compat_loader);
+
+    rb_provide("set.rb");
+}
diff --git a/shape.c b/shape.c
index dcdb9d28aac4a5..e296ab2d8fa741 100644
--- a/shape.c
+++ b/shape.c
@@ -4,170 +4,526 @@
 #include "symbol.h"
 #include "id_table.h"
 #include "internal/class.h"
+#include "internal/error.h"
 #include "internal/gc.h"
+#include "internal/object.h"
 #include "internal/symbol.h"
 #include "internal/variable.h"
-#include "internal/error.h"
 #include "variable.h"
 #include <stdbool.h>
 
+#ifndef _WIN32
+#include <sys/mman.h>
+#endif
+
 #ifndef SHAPE_DEBUG
 #define SHAPE_DEBUG (VM_CHECK_MODE > 0)
 #endif
 
+#define REDBLACK_CACHE_SIZE (SHAPE_BUFFER_SIZE * 32)
+
+/* This depends on that the allocated memory by Ruby's allocator or
+ * mmap is not located at an odd address. */
 #define SINGLE_CHILD_TAG 0x1
-#define TAG_SINGLE_CHILD(x) (struct rb_id_table *)((uintptr_t)x | SINGLE_CHILD_TAG)
+#define TAG_SINGLE_CHILD(x) (VALUE)((uintptr_t)(x) | SINGLE_CHILD_TAG)
 #define SINGLE_CHILD_MASK (~((uintptr_t)SINGLE_CHILD_TAG))
-#define SINGLE_CHILD_P(x) (((uintptr_t)x) & SINGLE_CHILD_TAG)
-#define SINGLE_CHILD(x) (rb_shape_t *)((uintptr_t)x & SINGLE_CHILD_MASK)
+#define SINGLE_CHILD_P(x) ((uintptr_t)(x) & SINGLE_CHILD_TAG)
+#define SINGLE_CHILD(x) (rb_shape_t *)((uintptr_t)(x) & SINGLE_CHILD_MASK)
+#define ANCESTOR_CACHE_THRESHOLD 10
+#define MAX_SHAPE_ID (SHAPE_BUFFER_SIZE - 1)
+#define ANCESTOR_SEARCH_MAX_DEPTH 2
 
-static ID id_frozen;
-static ID id_t_object;
-static ID size_pool_edge_names[SIZE_POOL_COUNT];
+static ID id_object_id;
 
-rb_shape_tree_t *rb_shape_tree_ptr = NULL;
+#define LEAF 0
+#define BLACK 0x0
+#define RED 0x1
+
+static redblack_node_t *
+redblack_left(redblack_node_t *node)
+{
+    if (node->l == LEAF) {
+        return LEAF;
+    }
+    else {
+        RUBY_ASSERT(node->l < rb_shape_tree.cache_size);
+        redblack_node_t *left = &rb_shape_tree.shape_cache[node->l - 1];
+        return left;
+    }
+}
+
+static redblack_node_t *
+redblack_right(redblack_node_t *node)
+{
+    if (node->r == LEAF) {
+        return LEAF;
+    }
+    else {
+        RUBY_ASSERT(node->r < rb_shape_tree.cache_size);
+        redblack_node_t *right = &rb_shape_tree.shape_cache[node->r - 1];
+        return right;
+    }
+}
+
+static redblack_node_t *
+redblack_find(redblack_node_t *tree, ID key)
+{
+    if (tree == LEAF) {
+        return LEAF;
+    }
+    else {
+        RUBY_ASSERT(redblack_left(tree) == LEAF || redblack_left(tree)->key < tree->key);
+        RUBY_ASSERT(redblack_right(tree) == LEAF || redblack_right(tree)->key > tree->key);
+
+        if (tree->key == key) {
+            return tree;
+        }
+        else {
+            if (key < tree->key) {
+                return redblack_find(redblack_left(tree), key);
+            }
+            else {
+                return redblack_find(redblack_right(tree), key);
+            }
+        }
+    }
+}
+
+static inline rb_shape_t *
+redblack_value(redblack_node_t *node)
+{
+    // Color is stored in the bottom bit of the shape pointer
+    // Mask away the bit so we get the actual pointer back
+    return (rb_shape_t *)((uintptr_t)node->value & ~(uintptr_t)1);
+}
+
+#ifdef HAVE_MMAP
+static inline char
+redblack_color(redblack_node_t *node)
+{
+    return node && ((uintptr_t)node->value & RED);
+}
+
+static inline bool
+redblack_red_p(redblack_node_t *node)
+{
+    return redblack_color(node) == RED;
+}
+
+static redblack_id_t
+redblack_id_for(redblack_node_t *node)
+{
+    RUBY_ASSERT(node || node == LEAF);
+    if (node == LEAF) {
+        return 0;
+    }
+    else {
+        redblack_node_t *redblack_nodes = rb_shape_tree.shape_cache;
+        redblack_id_t id = (redblack_id_t)(node - redblack_nodes);
+        return id + 1;
+    }
+}
+
+static redblack_node_t *
+redblack_new(char color, ID key, rb_shape_t *value, redblack_node_t *left, redblack_node_t *right)
+{
+    if (rb_shape_tree.cache_size + 1 >= REDBLACK_CACHE_SIZE) {
+        // We're out of cache, just quit
+        return LEAF;
+    }
+
+    RUBY_ASSERT(left == LEAF || left->key < key);
+    RUBY_ASSERT(right == LEAF || right->key > key);
+
+    redblack_node_t *redblack_nodes = rb_shape_tree.shape_cache;
+    redblack_node_t *node = &redblack_nodes[(rb_shape_tree.cache_size)++];
+    node->key = key;
+    node->value = (rb_shape_t *)((uintptr_t)value | color);
+    node->l = redblack_id_for(left);
+    node->r = redblack_id_for(right);
+    return node;
+}
+
+static redblack_node_t *
+redblack_balance(char color, ID key, rb_shape_t *value, redblack_node_t *left, redblack_node_t *right)
+{
+    if (color == BLACK) {
+        ID new_key, new_left_key, new_right_key;
+        rb_shape_t *new_value, *new_left_value, *new_right_value;
+        redblack_node_t *new_left_left, *new_left_right, *new_right_left, *new_right_right;
+
+        if (redblack_red_p(left) && redblack_red_p(redblack_left(left))) {
+            new_right_key = key;
+            new_right_value = value;
+            new_right_right = right;
+
+            new_key = left->key;
+            new_value = redblack_value(left);
+            new_right_left = redblack_right(left);
+
+            new_left_key = redblack_left(left)->key;
+            new_left_value = redblack_value(redblack_left(left));
+
+            new_left_left = redblack_left(redblack_left(left));
+            new_left_right = redblack_right(redblack_left(left));
+        }
+        else if (redblack_red_p(left) && redblack_red_p(redblack_right(left))) {
+            new_right_key = key;
+            new_right_value = value;
+            new_right_right = right;
+
+            new_left_key = left->key;
+            new_left_value = redblack_value(left);
+            new_left_left = redblack_left(left);
+
+            new_key = redblack_right(left)->key;
+            new_value = redblack_value(redblack_right(left));
+            new_left_right = redblack_left(redblack_right(left));
+            new_right_left = redblack_right(redblack_right(left));
+        }
+        else if (redblack_red_p(right) && redblack_red_p(redblack_left(right))) {
+            new_left_key = key;
+            new_left_value = value;
+            new_left_left = left;
+
+            new_right_key = right->key;
+            new_right_value = redblack_value(right);
+            new_right_right = redblack_right(right);
+
+            new_key = redblack_left(right)->key;
+            new_value = redblack_value(redblack_left(right));
+            new_left_right = redblack_left(redblack_left(right));
+            new_right_left = redblack_right(redblack_left(right));
+        }
+        else if (redblack_red_p(right) && redblack_red_p(redblack_right(right))) {
+            new_left_key = key;
+            new_left_value = value;
+            new_left_left = left;
+
+            new_key = right->key;
+            new_value = redblack_value(right);
+            new_left_right = redblack_left(right);
+
+            new_right_key = redblack_right(right)->key;
+            new_right_value = redblack_value(redblack_right(right));
+            new_right_left = redblack_left(redblack_right(right));
+            new_right_right = redblack_right(redblack_right(right));
+        }
+        else {
+            return redblack_new(color, key, value, left, right);
+        }
+
+        RUBY_ASSERT(new_left_key < new_key);
+        RUBY_ASSERT(new_right_key > new_key);
+        RUBY_ASSERT(new_left_left == LEAF || new_left_left->key < new_left_key);
+        RUBY_ASSERT(new_left_right == LEAF || new_left_right->key > new_left_key);
+        RUBY_ASSERT(new_left_right == LEAF || new_left_right->key < new_key);
+        RUBY_ASSERT(new_right_left == LEAF || new_right_left->key < new_right_key);
+        RUBY_ASSERT(new_right_left == LEAF || new_right_left->key > new_key);
+        RUBY_ASSERT(new_right_right == LEAF || new_right_right->key > new_right_key);
+
+        return redblack_new(
+                RED, new_key, new_value,
+                redblack_new(BLACK, new_left_key, new_left_value, new_left_left, new_left_right),
+                redblack_new(BLACK, new_right_key, new_right_value, new_right_left, new_right_right));
+    }
+
+    return redblack_new(color, key, value, left, right);
+}
+
+static redblack_node_t *
+redblack_insert_aux(redblack_node_t *tree, ID key, rb_shape_t *value)
+{
+    if (tree == LEAF) {
+        return redblack_new(RED, key, value, LEAF, LEAF);
+    }
+    else {
+        redblack_node_t *left, *right;
+        if (key < tree->key) {
+            left = redblack_insert_aux(redblack_left(tree), key, value);
+            RUBY_ASSERT(left != LEAF);
+            right = redblack_right(tree);
+            RUBY_ASSERT(right == LEAF || right->key > tree->key);
+        }
+        else if (key > tree->key) {
+            left = redblack_left(tree);
+            RUBY_ASSERT(left == LEAF || left->key < tree->key);
+            right = redblack_insert_aux(redblack_right(tree), key, value);
+            RUBY_ASSERT(right != LEAF);
+        }
+        else {
+            return tree;
+        }
+
+        return redblack_balance(
+            redblack_color(tree),
+            tree->key,
+            redblack_value(tree),
+            left,
+            right
+        );
+    }
+}
+
+static redblack_node_t *
+redblack_force_black(redblack_node_t *node)
+{
+    node->value = redblack_value(node);
+    return node;
+}
+
+static redblack_node_t *
+redblack_insert(redblack_node_t *tree, ID key, rb_shape_t *value)
+{
+    redblack_node_t *root = redblack_insert_aux(tree, key, value);
+
+    if (redblack_red_p(root)) {
+        return redblack_force_black(root);
+    }
+    else {
+        return root;
+    }
+}
+#endif
+
+rb_shape_tree_t rb_shape_tree = { 0 };
+static VALUE shape_tree_obj = Qfalse;
 
-/*
- * Shape getters
- */
 rb_shape_t *
 rb_shape_get_root_shape(void)
 {
-    return GET_SHAPE_TREE()->root_shape;
+    return rb_shape_tree.root_shape;
 }
 
-shape_id_t
-rb_shape_id(rb_shape_t * shape)
+static void
+shape_tree_mark(void *data)
 {
-    return (shape_id_t)(shape - GET_SHAPE_TREE()->shape_list);
+    rb_shape_t *cursor = rb_shape_get_root_shape();
+    rb_shape_t *end = RSHAPE(rb_shape_tree.next_shape_id - 1);
+    while (cursor <= end) {
+        if (cursor->edges && !SINGLE_CHILD_P(cursor->edges)) {
+            rb_gc_mark_movable(cursor->edges);
+        }
+        cursor++;
+    }
 }
 
-void
-rb_shape_each_shape(each_shape_callback callback, void *data)
+static void
+shape_tree_compact(void *data)
 {
     rb_shape_t *cursor = rb_shape_get_root_shape();
-    rb_shape_t *end = rb_shape_get_shape_by_id(GET_SHAPE_TREE()->next_shape_id);
-    while (cursor < end) {
-        callback(cursor, data);
-        cursor += 1;
+    rb_shape_t *end = RSHAPE(rb_shape_tree.next_shape_id - 1);
+    while (cursor <= end) {
+        if (cursor->edges && !SINGLE_CHILD_P(cursor->edges)) {
+            cursor->edges = rb_gc_location(cursor->edges);
+        }
+        cursor++;
     }
 }
 
-RUBY_FUNC_EXPORTED rb_shape_t*
-rb_shape_get_shape_by_id(shape_id_t shape_id)
+static size_t
+shape_tree_memsize(const void *data)
 {
-    RUBY_ASSERT(shape_id != INVALID_SHAPE_ID);
+    return rb_shape_tree.cache_size * sizeof(redblack_node_t);
+}
 
-    rb_shape_t *shape = &GET_SHAPE_TREE()->shape_list[shape_id];
-    return shape;
+static const rb_data_type_t shape_tree_type = {
+    .wrap_struct_name = "VM/shape_tree",
+    .function = {
+        .dmark = shape_tree_mark,
+        .dfree = NULL, // Nothing to free, done at VM exit in rb_shape_free_all,
+        .dsize = shape_tree_memsize,
+        .dcompact = shape_tree_compact,
+    },
+    .flags = RUBY_TYPED_FREE_IMMEDIATELY | RUBY_TYPED_WB_PROTECTED,
+};
+
+
+/*
+ * Shape getters
+ */
+
+static inline shape_id_t
+raw_shape_id(rb_shape_t *shape)
+{
+    RUBY_ASSERT(shape);
+    return (shape_id_t)(shape - rb_shape_tree.shape_list);
 }
 
-rb_shape_t *
-rb_shape_get_parent(rb_shape_t * shape)
+static inline shape_id_t
+shape_id(rb_shape_t *shape, shape_id_t previous_shape_id)
 {
-    return rb_shape_get_shape_by_id(shape->parent_id);
+    RUBY_ASSERT(shape);
+    shape_id_t raw_id = (shape_id_t)(shape - rb_shape_tree.shape_list);
+    return raw_id | (previous_shape_id & SHAPE_ID_FLAGS_MASK);
 }
 
-#if !SHAPE_IN_BASIC_FLAGS
-shape_id_t rb_generic_shape_id(VALUE obj);
+#if RUBY_DEBUG
+static inline bool
+shape_frozen_p(shape_id_t shape_id)
+{
+    return shape_id & SHAPE_ID_FL_FROZEN;
+}
 #endif
 
+void
+rb_shape_each_shape_id(each_shape_callback callback, void *data)
+{
+    rb_shape_t *start = rb_shape_get_root_shape();
+    rb_shape_t *cursor = start;
+    rb_shape_t *end = RSHAPE(rb_shapes_count());
+    while (cursor < end) {
+        callback((shape_id_t)(cursor - start), data);
+        cursor += 1;
+    }
+}
+
 RUBY_FUNC_EXPORTED shape_id_t
-rb_shape_get_shape_id(VALUE obj)
+rb_obj_shape_id(VALUE obj)
 {
     if (RB_SPECIAL_CONST_P(obj)) {
         return SPECIAL_CONST_SHAPE_ID;
     }
 
-#if SHAPE_IN_BASIC_FLAGS
-    return RBASIC_SHAPE_ID(obj);
-#else
-    switch (BUILTIN_TYPE(obj)) {
-      case T_OBJECT:
-        return ROBJECT_SHAPE_ID(obj);
-        break;
-      case T_CLASS:
-      case T_MODULE:
-        return RCLASS_SHAPE_ID(obj);
-      default:
-        return rb_generic_shape_id(obj);
+    if (BUILTIN_TYPE(obj) == T_CLASS || BUILTIN_TYPE(obj) == T_MODULE) {
+        VALUE fields_obj = RCLASS_WRITABLE_FIELDS_OBJ(obj);
+        if (fields_obj) {
+            return RBASIC_SHAPE_ID(fields_obj);
+        }
+        return ROOT_SHAPE_ID;
     }
-#endif
+    return RBASIC_SHAPE_ID(obj);
 }
 
 size_t
-rb_shape_depth(rb_shape_t * shape)
+rb_shape_depth(shape_id_t shape_id)
 {
     size_t depth = 1;
+    rb_shape_t *shape = RSHAPE(shape_id);
 
     while (shape->parent_id != INVALID_SHAPE_ID) {
         depth++;
-        shape = rb_shape_get_parent(shape);
+        shape = RSHAPE(shape->parent_id);
     }
 
     return depth;
 }
 
-rb_shape_t*
-rb_shape_get_shape(VALUE obj)
-{
-    return rb_shape_get_shape_by_id(rb_shape_get_shape_id(obj));
-}
-
 static rb_shape_t *
 shape_alloc(void)
 {
-    shape_id_t shape_id = GET_SHAPE_TREE()->next_shape_id;
-    GET_SHAPE_TREE()->next_shape_id++;
+    shape_id_t current, new_id;
 
-    if (shape_id == MAX_SHAPE_ID) {
-        // TODO: Make an OutOfShapesError ??
-        rb_bug("Out of shapes");
-    }
+    do {
+        current = RUBY_ATOMIC_LOAD(rb_shape_tree.next_shape_id);
+        if (current > MAX_SHAPE_ID) {
+            return NULL;  // Out of shapes
+        }
+        new_id = current + 1;
+    } while (current != RUBY_ATOMIC_CAS(rb_shape_tree.next_shape_id, current, new_id));
 
-    return &GET_SHAPE_TREE()->shape_list[shape_id];
+    return &rb_shape_tree.shape_list[current];
 }
 
 static rb_shape_t *
 rb_shape_alloc_with_parent_id(ID edge_name, shape_id_t parent_id)
 {
-    rb_shape_t * shape = shape_alloc();
+    rb_shape_t *shape = shape_alloc();
+    if (!shape) return NULL;
 
     shape->edge_name = edge_name;
-    shape->next_iv_index = 0;
+    shape->next_field_index = 0;
     shape->parent_id = parent_id;
-    shape->edges = NULL;
+    shape->edges = 0;
 
     return shape;
 }
 
 static rb_shape_t *
-rb_shape_alloc(ID edge_name, rb_shape_t * parent, enum shape_type type)
+rb_shape_alloc(ID edge_name, rb_shape_t *parent, enum shape_type type)
 {
-    rb_shape_t * shape = rb_shape_alloc_with_parent_id(edge_name, rb_shape_id(parent));
+    rb_shape_t *shape = rb_shape_alloc_with_parent_id(edge_name, raw_shape_id(parent));
+    if (!shape) return NULL;
+
     shape->type = (uint8_t)type;
-    shape->size_pool_index = parent->size_pool_index;
     shape->capacity = parent->capacity;
     shape->edges = 0;
     return shape;
 }
 
+#ifdef HAVE_MMAP
+static redblack_node_t *
+redblack_cache_ancestors(rb_shape_t *shape)
+{
+    if (!(shape->ancestor_index || shape->parent_id == INVALID_SHAPE_ID)) {
+        redblack_node_t *parent_index;
+
+        parent_index = redblack_cache_ancestors(RSHAPE(shape->parent_id));
+
+        if (shape->type == SHAPE_IVAR) {
+            shape->ancestor_index = redblack_insert(parent_index, shape->edge_name, shape);
+
+#if RUBY_DEBUG
+            if (shape->ancestor_index) {
+                redblack_node_t *inserted_node = redblack_find(shape->ancestor_index, shape->edge_name);
+                RUBY_ASSERT(inserted_node);
+                RUBY_ASSERT(redblack_value(inserted_node) == shape);
+            }
+#endif
+        }
+        else {
+            shape->ancestor_index = parent_index;
+        }
+    }
+
+    return shape->ancestor_index;
+}
+#else
+static redblack_node_t *
+redblack_cache_ancestors(rb_shape_t *shape)
+{
+    return LEAF;
+}
+#endif
+
+static attr_index_t
+shape_grow_capa(attr_index_t current_capa)
+{
+    const attr_index_t *capacities = rb_shape_tree.capacities;
+
+    // First try to use the next size that will be embeddable in a larger object slot.
+    attr_index_t capa;
+    while ((capa = *capacities)) {
+        if (capa > current_capa) {
+            return capa;
+        }
+        capacities++;
+    }
+
+    return (attr_index_t)rb_malloc_grow_capa(current_capa, sizeof(VALUE));
+}
+
 static rb_shape_t *
-rb_shape_alloc_new_child(ID id, rb_shape_t * shape, enum shape_type shape_type)
+rb_shape_alloc_new_child(ID id, rb_shape_t *shape, enum shape_type shape_type)
 {
-    rb_shape_t * new_shape = rb_shape_alloc(id, shape, shape_type);
+    rb_shape_t *new_shape = rb_shape_alloc(id, shape, shape_type);
+    if (!new_shape) return NULL;
 
     switch (shape_type) {
+      case SHAPE_OBJ_ID:
       case SHAPE_IVAR:
-        new_shape->next_iv_index = shape->next_iv_index + 1;
-        break;
-      case SHAPE_CAPACITY_CHANGE:
-      case SHAPE_FROZEN:
-      case SHAPE_T_OBJECT:
-        new_shape->next_iv_index = shape->next_iv_index;
+        if (UNLIKELY(shape->next_field_index >= shape->capacity)) {
+            RUBY_ASSERT(shape->next_field_index == shape->capacity);
+            new_shape->capacity = shape_grow_capa(shape->capacity);
+        }
+        RUBY_ASSERT(new_shape->capacity > shape->next_field_index);
+        new_shape->next_field_index = shape->next_field_index + 1;
+        if (new_shape->next_field_index > ANCESTOR_CACHE_THRESHOLD) {
+            RB_VM_LOCKING() {
+                redblack_cache_ancestors(new_shape);
+            }
+        }
         break;
-      case SHAPE_OBJ_TOO_COMPLEX:
-      case SHAPE_INITIAL_CAPACITY:
       case SHAPE_ROOT:
         rb_bug("Unreachable");
         break;
@@ -176,293 +532,558 @@ rb_shape_alloc_new_child(ID id, rb_shape_t * shape, enum shape_type shape_type)
     return new_shape;
 }
 
-static rb_shape_t*
-get_next_shape_internal(rb_shape_t * shape, ID id, enum shape_type shape_type, bool * variation_created, bool new_shapes_allowed, bool new_shape_necessary)
+static rb_shape_t *
+get_next_shape_internal_atomic(rb_shape_t *shape, ID id, enum shape_type shape_type, bool *variation_created, bool new_variations_allowed)
 {
     rb_shape_t *res = NULL;
 
-    // There should never be outgoing edges from "too complex"
-    RUBY_ASSERT(rb_shape_id(shape) != OBJ_TOO_COMPLEX_SHAPE_ID);
-
     *variation_created = false;
+    VALUE edges_table;
+
+retry:
+    edges_table = RUBY_ATOMIC_VALUE_LOAD(shape->edges);
+
+    // If the current shape has children
+    if (edges_table) {
+        // Check if it only has one child
+        if (SINGLE_CHILD_P(edges_table)) {
+            rb_shape_t *child = SINGLE_CHILD(edges_table);
+            // If the one child has a matching edge name, then great,
+            // we found what we want.
+            if (child->edge_name == id) {
+                res = child;
+            }
+        }
+        else {
+            // If it has more than one child, do a hash lookup to find it.
+            VALUE lookup_result;
+            if (rb_managed_id_table_lookup(edges_table, id, &lookup_result)) {
+                res = (rb_shape_t *)lookup_result;
+            }
+        }
+    }
 
-    if (new_shape_necessary || (new_shapes_allowed && (shape->next_iv_index < SHAPE_MAX_NUM_IVS))) {
-        RB_VM_LOCK_ENTER();
-        {
-            // If the current shape has children
-            if (shape->edges) {
-                // Check if it only has one child
-                if (SINGLE_CHILD_P(shape->edges)) {
-                    rb_shape_t * child = SINGLE_CHILD(shape->edges);
-                    // If the one child has a matching edge name, then great,
-                    // we found what we want.
-                    if (child->edge_name == id) {
-                        res = child;
-                    }
-                    else {
-                        // Otherwise we're going to have to create a new shape
-                        // and insert it as a child node, so create an id
-                        // table and insert the existing child
-                        shape->edges = rb_id_table_create(2);
-                        rb_id_table_insert(shape->edges, child->edge_name, (VALUE)child);
-                    }
+    // If we didn't find the shape we're looking for and we're allowed more variations we create it.
+    if (!res && new_variations_allowed) {
+        VALUE new_edges = 0;
+
+        rb_shape_t *new_shape = rb_shape_alloc_new_child(id, shape, shape_type);
+
+        // If we're out of shapes, return NULL
+        if (new_shape) {
+            if (!edges_table) {
+                // If the shape had no edge yet, we can directly set the new child
+                new_edges = TAG_SINGLE_CHILD(new_shape);
+            }
+            else {
+                // If the edge was single child we need to allocate a table.
+                if (SINGLE_CHILD_P(edges_table)) {
+                    rb_shape_t *old_child = SINGLE_CHILD(edges_table);
+                    new_edges = rb_managed_id_table_new(2);
+                    rb_managed_id_table_insert(new_edges, old_child->edge_name, (VALUE)old_child);
                 }
                 else {
-                    // If it has more than one child, do a hash lookup to find it.
-                    VALUE lookup_result;
-                    if (rb_id_table_lookup(shape->edges, id, &lookup_result)) {
-                        res = (rb_shape_t *)lookup_result;
-                    }
+                    new_edges = rb_managed_id_table_dup(edges_table);
                 }
 
-                // If the shape we were looking for above was found,
-                // then `res` will be set to the child.  If it isn't set, then
-                // we know we need a new child shape, and that we must insert
-                // it in to the table.
-                if (!res) {
-                    *variation_created = true;
-                    rb_shape_t * new_shape = rb_shape_alloc_new_child(id, shape, shape_type);
-                    rb_id_table_insert(shape->edges, id, (VALUE)new_shape);
-                    res = new_shape;
-                }
+                rb_managed_id_table_insert(new_edges, new_shape->edge_name, (VALUE)new_shape);
+                *variation_created = true;
             }
-            else {
-                // If the shape didn't have any outgoing edges, then create
-                // the new outgoing edge and tag the pointer.
-                rb_shape_t * new_shape = rb_shape_alloc_new_child(id, shape, shape_type);
+
+            if (edges_table != RUBY_ATOMIC_VALUE_CAS(shape->edges, edges_table, new_edges)) {
+                // Another thread updated the table;
+                goto retry;
+            }
+            RB_OBJ_WRITTEN(shape_tree_obj, Qundef, new_edges);
+            res = new_shape;
+            RB_GC_GUARD(new_edges);
+        }
+    }
+
+    return res;
+}
+
+static rb_shape_t *
+get_next_shape_internal(rb_shape_t *shape, ID id, enum shape_type shape_type, bool *variation_created, bool new_variations_allowed)
+{
+    if (rb_multi_ractor_p()) {
+        return get_next_shape_internal_atomic(shape, id, shape_type, variation_created, new_variations_allowed);
+    }
+
+    rb_shape_t *res = NULL;
+    *variation_created = false;
+
+    VALUE edges_table = shape->edges;
+
+    // If the current shape has children
+    if (edges_table) {
+        // Check if it only has one child
+        if (SINGLE_CHILD_P(edges_table)) {
+            rb_shape_t *child = SINGLE_CHILD(edges_table);
+            // If the one child has a matching edge name, then great,
+            // we found what we want.
+            if (child->edge_name == id) {
+                res = child;
+            }
+        }
+        else {
+            // If it has more than one child, do a hash lookup to find it.
+            VALUE lookup_result;
+            if (rb_managed_id_table_lookup(edges_table, id, &lookup_result)) {
+                res = (rb_shape_t *)lookup_result;
+            }
+        }
+    }
+
+    // If we didn't find the shape we're looking for we create it.
+    if (!res) {
+        // If we're not allowed to create a new variation, of if we're out of shapes
+        // we return TOO_COMPLEX_SHAPE.
+        if (!new_variations_allowed || rb_shapes_count() > MAX_SHAPE_ID) {
+            res = NULL;
+        }
+        else {
+            rb_shape_t *new_shape = rb_shape_alloc_new_child(id, shape, shape_type);
+
+            if (!edges_table) {
+                // If the shape had no edge yet, we can directly set the new child
                 shape->edges = TAG_SINGLE_CHILD(new_shape);
-                res = new_shape;
             }
+            else {
+                // If the edge was single child we need to allocate a table.
+                if (SINGLE_CHILD_P(edges_table)) {
+                    rb_shape_t *old_child = SINGLE_CHILD(edges_table);
+                    VALUE new_edges = rb_managed_id_table_new(2);
+                    rb_managed_id_table_insert(new_edges, old_child->edge_name, (VALUE)old_child);
+                    RB_OBJ_WRITE(shape_tree_obj, &shape->edges, new_edges);
+                }
+
+                rb_managed_id_table_insert(shape->edges, new_shape->edge_name, (VALUE)new_shape);
+                *variation_created = true;
+            }
+
+            res = new_shape;
         }
-        RB_VM_LOCK_LEAVE();
     }
+
     return res;
 }
 
-int
-rb_shape_frozen_shape_p(rb_shape_t* shape)
+static rb_shape_t *
+remove_shape_recursive(rb_shape_t *shape, ID id, rb_shape_t **removed_shape)
+{
+    if (shape->parent_id == INVALID_SHAPE_ID) {
+        // We've hit the top of the shape tree and couldn't find the
+        // IV we wanted to remove, so return NULL
+        *removed_shape = NULL;
+        return NULL;
+    }
+    else {
+        if (shape->type == SHAPE_IVAR && shape->edge_name == id) {
+            *removed_shape = shape;
+
+            return RSHAPE(shape->parent_id);
+        }
+        else {
+            // This isn't the IV we want to remove, keep walking up.
+            rb_shape_t *new_parent = remove_shape_recursive(RSHAPE(shape->parent_id), id, removed_shape);
+
+            // We found a new parent.  Create a child of the new parent that
+            // has the same attributes as this shape.
+            if (new_parent) {
+                bool dont_care;
+                rb_shape_t *new_child = get_next_shape_internal(new_parent, shape->edge_name, shape->type, &dont_care, true);
+                RUBY_ASSERT(!new_child || new_child->capacity <= shape->capacity);
+                return new_child;
+            }
+            else {
+                // We went all the way to the top of the shape tree and couldn't
+                // find an IV to remove so return NULL.
+                return NULL;
+            }
+        }
+    }
+}
+
+static inline shape_id_t transition_complex(shape_id_t shape_id);
+
+static shape_id_t
+shape_transition_object_id(shape_id_t original_shape_id)
 {
-    return SHAPE_FROZEN == (enum shape_type)shape->type;
+    RUBY_ASSERT(!rb_shape_has_object_id(original_shape_id));
+
+    bool dont_care;
+    rb_shape_t *shape = get_next_shape_internal(RSHAPE(original_shape_id), id_object_id, SHAPE_OBJ_ID, &dont_care, true);
+    if (!shape) {
+        shape = RSHAPE(ROOT_SHAPE_WITH_OBJ_ID);
+    }
+
+    RUBY_ASSERT(shape);
+    return shape_id(shape, original_shape_id) | SHAPE_ID_FL_HAS_OBJECT_ID;
 }
 
-static void
-move_iv(VALUE obj, ID id, attr_index_t from, attr_index_t to)
+shape_id_t
+rb_shape_transition_object_id(VALUE obj)
 {
-    switch(BUILTIN_TYPE(obj)) {
-      case T_CLASS:
-      case T_MODULE:
-        RCLASS_IVPTR(obj)[to] = RCLASS_IVPTR(obj)[from];
-        break;
-      case T_OBJECT:
-        RUBY_ASSERT(!rb_shape_obj_too_complex(obj));
-        ROBJECT_IVPTR(obj)[to] = ROBJECT_IVPTR(obj)[from];
-        break;
-      default: {
-        struct gen_ivtbl *ivtbl;
-        rb_gen_ivtbl_get(obj, id, &ivtbl);
-        ivtbl->ivptr[to] = ivtbl->ivptr[from];
-        break;
-      }
+    return shape_transition_object_id(RBASIC_SHAPE_ID(obj));
+}
+
+shape_id_t
+rb_shape_object_id(shape_id_t original_shape_id)
+{
+    RUBY_ASSERT(rb_shape_has_object_id(original_shape_id));
+
+    rb_shape_t *shape = RSHAPE(original_shape_id);
+    while (shape->type != SHAPE_OBJ_ID) {
+        if (UNLIKELY(shape->parent_id == INVALID_SHAPE_ID)) {
+            rb_bug("Missing object_id in shape tree");
+        }
+        shape = RSHAPE(shape->parent_id);
+    }
+
+    return shape_id(shape, original_shape_id) | SHAPE_ID_FL_HAS_OBJECT_ID;
+}
+
+static inline shape_id_t
+transition_complex(shape_id_t shape_id)
+{
+    uint8_t heap_index = rb_shape_heap_index(shape_id);
+    shape_id_t next_shape_id;
+
+    if (heap_index) {
+        next_shape_id = rb_shape_root(heap_index - 1) | SHAPE_ID_FL_TOO_COMPLEX;
+        if (rb_shape_has_object_id(shape_id)) {
+            next_shape_id = shape_transition_object_id(next_shape_id);
+        }
+    }
+    else {
+        if (rb_shape_has_object_id(shape_id)) {
+            next_shape_id = ROOT_TOO_COMPLEX_WITH_OBJ_ID | (shape_id & SHAPE_ID_FLAGS_MASK);
+        }
+        else {
+            next_shape_id = ROOT_TOO_COMPLEX_SHAPE_ID | (shape_id & SHAPE_ID_FLAGS_MASK);
+        }
+    }
+
+    RUBY_ASSERT(rb_shape_has_object_id(shape_id) == rb_shape_has_object_id(next_shape_id));
+
+    return next_shape_id;
+}
+
+shape_id_t
+rb_shape_transition_remove_ivar(VALUE obj, ID id, shape_id_t *removed_shape_id)
+{
+    shape_id_t original_shape_id = RBASIC_SHAPE_ID(obj);
+
+    RUBY_ASSERT(!rb_shape_too_complex_p(original_shape_id));
+    RUBY_ASSERT(!shape_frozen_p(original_shape_id));
+
+    rb_shape_t *removed_shape = NULL;
+    rb_shape_t *new_shape = remove_shape_recursive(RSHAPE(original_shape_id), id, &removed_shape);
+
+    if (removed_shape) {
+        *removed_shape_id = raw_shape_id(removed_shape);
+    }
+
+    if (new_shape) {
+        return shape_id(new_shape, original_shape_id);
+    }
+    else if (removed_shape) {
+        // We found the shape to remove, but couldn't create a new variation.
+        // We must transition to TOO_COMPLEX.
+        shape_id_t next_shape_id = transition_complex(original_shape_id);
+        RUBY_ASSERT(rb_shape_has_object_id(next_shape_id) == rb_shape_has_object_id(original_shape_id));
+        return next_shape_id;
+    }
+    return original_shape_id;
+}
+
+shape_id_t
+rb_shape_transition_frozen(VALUE obj)
+{
+    RUBY_ASSERT(RB_OBJ_FROZEN(obj));
+
+    shape_id_t shape_id = rb_obj_shape_id(obj);
+    return shape_id | SHAPE_ID_FL_FROZEN;
+}
+
+shape_id_t
+rb_shape_transition_complex(VALUE obj)
+{
+    return transition_complex(RBASIC_SHAPE_ID(obj));
+}
+
+shape_id_t
+rb_shape_transition_heap(VALUE obj, size_t heap_index)
+{
+     return (RBASIC_SHAPE_ID(obj) & (~SHAPE_ID_HEAP_INDEX_MASK)) | rb_shape_root(heap_index);
+}
+
+void
+rb_set_namespaced_class_shape_id(VALUE obj, shape_id_t shape_id)
+{
+    RBASIC_SET_SHAPE_ID(RCLASS_WRITABLE_ENSURE_FIELDS_OBJ(obj), shape_id);
+    // FIXME: How to do multi-shape?
+    RBASIC_SET_SHAPE_ID(obj, shape_id);
+}
+
+/*
+ * This function is used for assertions where we don't want to increment
+ * max_iv_count
+ */
+static inline rb_shape_t *
+shape_get_next_iv_shape(rb_shape_t *shape, ID id)
+{
+    RUBY_ASSERT(!is_instance_id(id) || RTEST(rb_sym2str(ID2SYM(id))));
+    bool dont_care;
+    return get_next_shape_internal(shape, id, SHAPE_IVAR, &dont_care, true);
+}
+
+shape_id_t
+rb_shape_get_next_iv_shape(shape_id_t shape_id, ID id)
+{
+    rb_shape_t *shape = RSHAPE(shape_id);
+    rb_shape_t *next_shape = shape_get_next_iv_shape(shape, id);
+    if (!next_shape) {
+        return INVALID_SHAPE_ID;
+    }
+    return raw_shape_id(next_shape);
+}
+
+static bool
+shape_get_iv_index(rb_shape_t *shape, ID id, attr_index_t *value)
+{
+    while (shape->parent_id != INVALID_SHAPE_ID) {
+        if (shape->edge_name == id) {
+            enum shape_type shape_type;
+            shape_type = (enum shape_type)shape->type;
+
+            switch (shape_type) {
+              case SHAPE_IVAR:
+                RUBY_ASSERT(shape->next_field_index > 0);
+                *value = shape->next_field_index - 1;
+                return true;
+              case SHAPE_ROOT:
+                return false;
+              case SHAPE_OBJ_ID:
+                rb_bug("Ivar should not exist on transition");
+            }
+        }
+
+        shape = RSHAPE(shape->parent_id);
+    }
+
+    return false;
+}
+
+static inline rb_shape_t *
+shape_get_next(rb_shape_t *shape, VALUE obj, ID id, bool emit_warnings)
+{
+    RUBY_ASSERT(!is_instance_id(id) || RTEST(rb_sym2str(ID2SYM(id))));
+
+#if RUBY_DEBUG
+    attr_index_t index;
+    if (shape_get_iv_index(shape, id, &index)) {
+        rb_bug("rb_shape_get_next: trying to create ivar that already exists at index %u", index);
+    }
+#endif
+
+    VALUE klass;
+    if (IMEMO_TYPE_P(obj, imemo_fields)) { // HACK
+        klass = CLASS_OF(obj);
+    }
+    else {
+        klass = rb_obj_class(obj);
     }
-}
 
-static rb_shape_t *
-remove_shape_recursive(VALUE obj, ID id, rb_shape_t * shape, VALUE * removed)
-{
-    if (shape->parent_id == INVALID_SHAPE_ID) {
-        // We've hit the top of the shape tree and couldn't find the
-        // IV we wanted to remove, so return NULL
+    bool allow_new_shape = RCLASS_VARIATION_COUNT(klass) < SHAPE_MAX_VARIATIONS;
+    bool variation_created = false;
+    rb_shape_t *new_shape = get_next_shape_internal(shape, id, SHAPE_IVAR, &variation_created, allow_new_shape);
+
+    if (!new_shape) {
+        // We could create a new variation, transitioning to TOO_COMPLEX.
         return NULL;
     }
-    else {
-        if (shape->type == SHAPE_IVAR && shape->edge_name == id) {
-            // We've hit the edge we wanted to remove, return it's _parent_
-            // as the new parent while we go back down the stack.
-            attr_index_t index = shape->next_iv_index - 1;
-
-            switch(BUILTIN_TYPE(obj)) {
-              case T_CLASS:
-              case T_MODULE:
-                *removed = RCLASS_IVPTR(obj)[index];
-                break;
-              case T_OBJECT:
-                *removed = ROBJECT_IVPTR(obj)[index];
-                break;
-              default: {
-                struct gen_ivtbl *ivtbl;
-                rb_gen_ivtbl_get(obj, id, &ivtbl);
-                *removed = ivtbl->ivptr[index];
-                break;
-              }
-            }
-            return rb_shape_get_parent(shape);
-        }
-        else {
-            // This isn't the IV we want to remove, keep walking up.
-            rb_shape_t * new_parent = remove_shape_recursive(obj, id, rb_shape_get_parent(shape), removed);
 
-            // We found a new parent.  Create a child of the new parent that
-            // has the same attributes as this shape.
-            if (new_parent) {
-                bool dont_care;
-                enum ruby_value_type type = BUILTIN_TYPE(obj);
-                bool new_shape_necessary = type != T_OBJECT;
-                rb_shape_t * new_child = get_next_shape_internal(new_parent, shape->edge_name, shape->type, &dont_care, true, new_shape_necessary);
-                new_child->capacity = shape->capacity;
-                if (new_child->type == SHAPE_IVAR) {
-                    move_iv(obj, id, shape->next_iv_index - 1, new_child->next_iv_index - 1);
-                }
+    // Check if we should update max_iv_count on the object's class
+    if (obj != klass && new_shape->next_field_index > RCLASS_MAX_IV_COUNT(klass)) {
+        RCLASS_SET_MAX_IV_COUNT(klass, new_shape->next_field_index);
+    }
 
-                return new_child;
-            }
-            else {
-                // We went all the way to the top of the shape tree and couldn't
-                // find an IV to remove, so return NULL
-                return NULL;
+    if (variation_created) {
+        RCLASS_VARIATION_COUNT(klass)++;
+
+        if (emit_warnings && rb_warning_category_enabled_p(RB_WARN_CATEGORY_PERFORMANCE)) {
+            if (RCLASS_VARIATION_COUNT(klass) >= SHAPE_MAX_VARIATIONS) {
+                rb_category_warn(
+                    RB_WARN_CATEGORY_PERFORMANCE,
+                    "The class %"PRIsVALUE" reached %d shape variations, instance variables accesses will be slower and memory usage increased.\n"
+                    "It is recommended to define instance variables in a consistent order, for instance by eagerly defining them all in the #initialize method.",
+                    rb_class_path(klass),
+                    SHAPE_MAX_VARIATIONS
+                );
             }
         }
     }
-}
 
-void
-rb_shape_transition_shape_remove_ivar(VALUE obj, ID id, rb_shape_t *shape, VALUE * removed)
-{
-    rb_shape_t * new_shape = remove_shape_recursive(obj, id, shape, removed);
-    if (new_shape) {
-        rb_shape_set_shape(obj, new_shape);
-    }
+    return new_shape;
 }
 
-void
-rb_shape_transition_shape_frozen(VALUE obj)
+shape_id_t
+rb_shape_transition_add_ivar(VALUE obj, ID id)
 {
-    rb_shape_t* shape = rb_shape_get_shape(obj);
-    RUBY_ASSERT(shape);
-    RUBY_ASSERT(RB_OBJ_FROZEN(obj));
+    shape_id_t original_shape_id = RBASIC_SHAPE_ID(obj);
+    RUBY_ASSERT(!shape_frozen_p(original_shape_id));
 
-    if (rb_shape_frozen_shape_p(shape) || rb_shape_obj_too_complex(obj)) {
-        return;
+    rb_shape_t *next_shape = shape_get_next(RSHAPE(original_shape_id), obj, id, true);
+    if (next_shape) {
+        return shape_id(next_shape, original_shape_id);
     }
-
-    rb_shape_t* next_shape;
-
-    if (shape == rb_shape_get_root_shape()) {
-        rb_shape_set_shape_id(obj, SPECIAL_CONST_SHAPE_ID);
-        return;
+    else {
+        return transition_complex(original_shape_id);
     }
-
-    bool dont_care;
-    next_shape = get_next_shape_internal(shape, (ID)id_frozen, SHAPE_FROZEN, &dont_care, true, false);
-
-    RUBY_ASSERT(next_shape);
-    rb_shape_set_shape(obj, next_shape);
 }
 
-/*
- * This function is used for assertions where we don't want to increment
- * max_iv_count
- */
-rb_shape_t *
-rb_shape_get_next_iv_shape(rb_shape_t* shape, ID id)
+shape_id_t
+rb_shape_transition_add_ivar_no_warnings(VALUE obj, ID id)
 {
-    RUBY_ASSERT(!is_instance_id(id) || RTEST(rb_sym2str(ID2SYM(id))));
-    bool dont_care;
-    return get_next_shape_internal(shape, id, SHAPE_IVAR, &dont_care, true, false);
+    shape_id_t original_shape_id = RBASIC_SHAPE_ID(obj);
+    RUBY_ASSERT(!shape_frozen_p(original_shape_id));
+
+    rb_shape_t *next_shape = shape_get_next(RSHAPE(original_shape_id), obj, id, false);
+    if (next_shape) {
+        return shape_id(next_shape, original_shape_id);
+    }
+    else {
+        return transition_complex(original_shape_id);
+    }
 }
 
-rb_shape_t *
-rb_shape_get_next(rb_shape_t* shape, VALUE obj, ID id)
+// Same as rb_shape_get_iv_index, but uses a provided valid shape id and index
+// to return a result faster if branches of the shape tree are closely related.
+bool
+rb_shape_get_iv_index_with_hint(shape_id_t shape_id, ID id, attr_index_t *value, shape_id_t *shape_id_hint)
 {
-    RUBY_ASSERT(!is_instance_id(id) || RTEST(rb_sym2str(ID2SYM(id))));
+    attr_index_t index_hint = *value;
 
-    bool allow_new_shape = true;
+    if (*shape_id_hint == INVALID_SHAPE_ID) {
+        *shape_id_hint = shape_id;
+        return rb_shape_get_iv_index(shape_id, id, value);
+    }
 
-    if (BUILTIN_TYPE(obj) == T_OBJECT) {
-        VALUE klass = rb_obj_class(obj);
-        allow_new_shape = RCLASS_EXT(klass)->variation_count < SHAPE_MAX_VARIATIONS;
+    rb_shape_t *shape = RSHAPE(shape_id);
+    rb_shape_t *initial_shape = shape;
+    rb_shape_t *shape_hint = RSHAPE(*shape_id_hint);
+
+    // We assume it's likely shape_id_hint and shape_id have a close common
+    // ancestor, so we check up to ANCESTOR_SEARCH_MAX_DEPTH ancestors before
+    // eventually using the index, as in case of a match it will be faster.
+    // However if the shape doesn't have an index, we walk the entire tree.
+    int depth = INT_MAX;
+    if (shape->ancestor_index && shape->next_field_index >= ANCESTOR_CACHE_THRESHOLD) {
+        depth = ANCESTOR_SEARCH_MAX_DEPTH;
     }
 
-    bool variation_created = false;
-    // For non T_OBJECTS, force a new shape
-    bool new_shape_necessary = BUILTIN_TYPE(obj) != T_OBJECT;
-    rb_shape_t * new_shape = get_next_shape_internal(shape, id, SHAPE_IVAR, &variation_created, allow_new_shape, new_shape_necessary);
+    while (depth > 0 && shape->next_field_index > index_hint) {
+        while (shape_hint->next_field_index > shape->next_field_index) {
+            shape_hint = RSHAPE(shape_hint->parent_id);
+        }
 
-    if (!new_shape) {
-        RUBY_ASSERT(BUILTIN_TYPE(obj) == T_OBJECT);
-        new_shape = rb_shape_get_shape_by_id(OBJ_TOO_COMPLEX_SHAPE_ID);
+        if (shape_hint == shape) {
+            // We've found a common ancestor so use the index hint
+            *value = index_hint;
+            *shape_id_hint = raw_shape_id(shape);
+            return true;
+        }
+        if (shape->edge_name == id) {
+            // We found the matching id before a common ancestor
+            *value = shape->next_field_index - 1;
+            *shape_id_hint = raw_shape_id(shape);
+            return true;
+        }
+
+        shape = RSHAPE(shape->parent_id);
+        depth--;
     }
 
-    // Check if we should update max_iv_count on the object's class
-    if (BUILTIN_TYPE(obj) == T_OBJECT) {
-        VALUE klass = rb_obj_class(obj);
-        if (new_shape->next_iv_index > RCLASS_EXT(klass)->max_iv_count) {
-            RCLASS_EXT(klass)->max_iv_count = new_shape->next_iv_index;
-        }
-
-        if (variation_created) {
-            RCLASS_EXT(klass)->variation_count++;
-            if (rb_warning_category_enabled_p(RB_WARN_CATEGORY_PERFORMANCE)) {
-                if (RCLASS_EXT(klass)->variation_count >= SHAPE_MAX_VARIATIONS) {
-                    rb_category_warn(
-                        RB_WARN_CATEGORY_PERFORMANCE,
-                        "Maximum shapes variations (%d) reached by %"PRIsVALUE", instance variables accesses will be slower.",
-                        SHAPE_MAX_VARIATIONS,
-                        rb_class_path(klass)
-                    );
-                }
-            }
+    // If the original shape had an index but its ancestor doesn't
+    // we switch back to the original one as it will be faster.
+    if (!shape->ancestor_index && initial_shape->ancestor_index) {
+        shape = initial_shape;
+    }
+    *shape_id_hint = shape_id;
+    return shape_get_iv_index(shape, id, value);
+}
+
+static bool
+shape_cache_find_ivar(rb_shape_t *shape, ID id, rb_shape_t **ivar_shape)
+{
+    if (shape->ancestor_index && shape->next_field_index >= ANCESTOR_CACHE_THRESHOLD) {
+        redblack_node_t *node = redblack_find(shape->ancestor_index, id);
+        if (node) {
+            *ivar_shape = redblack_value(node);
+
+            return true;
         }
     }
 
-    return new_shape;
+    return false;
 }
 
-rb_shape_t *
-rb_shape_transition_shape_capa(rb_shape_t* shape, uint32_t new_capacity)
+static bool
+shape_find_ivar(rb_shape_t *shape, ID id, rb_shape_t **ivar_shape)
 {
-    ID edge_name = rb_make_temporary_id(new_capacity);
-    bool dont_care;
-    rb_shape_t * new_shape = get_next_shape_internal(shape, edge_name, SHAPE_CAPACITY_CHANGE, &dont_care, true, false);
-    new_shape->capacity = new_capacity;
-    return new_shape;
+    while (shape->parent_id != INVALID_SHAPE_ID) {
+        if (shape->edge_name == id) {
+            RUBY_ASSERT(shape->type == SHAPE_IVAR);
+            *ivar_shape = shape;
+            return true;
+        }
+
+        shape = RSHAPE(shape->parent_id);
+    }
+
+    return false;
 }
 
 bool
-rb_shape_get_iv_index(rb_shape_t * shape, ID id, attr_index_t *value)
+rb_shape_find_ivar(shape_id_t current_shape_id, ID id, shape_id_t *ivar_shape_id)
 {
-    // It doesn't make sense to ask for the index of an IV that's stored
-    // on an object that is "too complex" as it uses a hash for storing IVs
-    RUBY_ASSERT(rb_shape_id(shape) != OBJ_TOO_COMPLEX_SHAPE_ID);
+    RUBY_ASSERT(!rb_shape_too_complex_p(current_shape_id));
 
-    while (shape->parent_id != INVALID_SHAPE_ID) {
-        if (shape->edge_name == id) {
-            enum shape_type shape_type;
-            shape_type = (enum shape_type)shape->type;
+    rb_shape_t *shape = RSHAPE(current_shape_id);
+    rb_shape_t *ivar_shape;
 
-            switch (shape_type) {
-              case SHAPE_IVAR:
-                RUBY_ASSERT(shape->next_iv_index > 0);
-                *value = shape->next_iv_index - 1;
-                return true;
-              case SHAPE_CAPACITY_CHANGE:
-              case SHAPE_ROOT:
-              case SHAPE_INITIAL_CAPACITY:
-              case SHAPE_T_OBJECT:
+    if (!shape_cache_find_ivar(shape, id, &ivar_shape)) {
+        // If it wasn't in the ancestor cache, then don't do a linear search
+        if (shape->ancestor_index && shape->next_field_index >= ANCESTOR_CACHE_THRESHOLD) {
+            return false;
+        }
+        else {
+            if (!shape_find_ivar(shape, id, &ivar_shape)) {
                 return false;
-              case SHAPE_OBJ_TOO_COMPLEX:
-              case SHAPE_FROZEN:
-                rb_bug("Ivar should not exist on transition");
             }
         }
-        shape = rb_shape_get_parent(shape);
     }
-    return false;
+
+    *ivar_shape_id = shape_id(ivar_shape, current_shape_id);
+
+    return true;
 }
 
-void
-rb_shape_set_shape(VALUE obj, rb_shape_t* shape)
+bool
+rb_shape_get_iv_index(shape_id_t shape_id, ID id, attr_index_t *value)
 {
-    rb_shape_set_shape_id(obj, rb_shape_id(shape));
+    // It doesn't make sense to ask for the index of an IV that's stored
+    // on an object that is "too complex" as it uses a hash for storing IVs
+    RUBY_ASSERT(!rb_shape_too_complex_p(shape_id));
+
+    shape_id_t ivar_shape_id;
+    if (rb_shape_find_ivar(shape_id, id, &ivar_shape_id)) {
+        *value = RSHAPE_INDEX(ivar_shape_id);
+        return true;
+    }
+    return false;
 }
 
 int32_t
@@ -471,150 +1092,245 @@ rb_shape_id_offset(void)
     return sizeof(uintptr_t) - SHAPE_ID_NUM_BITS / sizeof(uintptr_t);
 }
 
-rb_shape_t *
-rb_shape_traverse_from_new_root(rb_shape_t *initial_shape, rb_shape_t *dest_shape)
+// Rebuild a similar shape with the same ivars but starting from
+// a different SHAPE_T_OBJECT, and don't cary over non-canonical transitions
+// such as SHAPE_OBJ_ID.
+static rb_shape_t *
+shape_rebuild(rb_shape_t *initial_shape, rb_shape_t *dest_shape)
 {
-    RUBY_ASSERT(initial_shape->type == SHAPE_T_OBJECT);
-    rb_shape_t *next_shape = initial_shape;
+    rb_shape_t *midway_shape;
+
+    RUBY_ASSERT(initial_shape->type == SHAPE_ROOT);
 
     if (dest_shape->type != initial_shape->type) {
-        next_shape = rb_shape_traverse_from_new_root(initial_shape, rb_shape_get_parent(dest_shape));
-        if (!next_shape) {
+        midway_shape = shape_rebuild(initial_shape, RSHAPE(dest_shape->parent_id));
+        if (UNLIKELY(!midway_shape)) {
             return NULL;
         }
     }
+    else {
+        midway_shape = initial_shape;
+    }
 
     switch ((enum shape_type)dest_shape->type) {
       case SHAPE_IVAR:
-      case SHAPE_FROZEN:
-        if (!next_shape->edges) {
-            return NULL;
-        }
-
-        VALUE lookup_result;
-        if (SINGLE_CHILD_P(next_shape->edges)) {
-            rb_shape_t * child = SINGLE_CHILD(next_shape->edges);
-            if (child->edge_name == dest_shape->edge_name) {
-                return child;
-            }
-            else {
-                return NULL;
-            }
-        }
-        else {
-            if (rb_id_table_lookup(next_shape->edges, dest_shape->edge_name, &lookup_result)) {
-                next_shape = (rb_shape_t *)lookup_result;
-            }
-            else {
-                return NULL;
-            }
-        }
+        midway_shape = shape_get_next_iv_shape(midway_shape, dest_shape->edge_name);
         break;
+      case SHAPE_OBJ_ID:
       case SHAPE_ROOT:
-      case SHAPE_CAPACITY_CHANGE:
-      case SHAPE_INITIAL_CAPACITY:
-      case SHAPE_T_OBJECT:
-        break;
-      case SHAPE_OBJ_TOO_COMPLEX:
-        rb_bug("Unreachable");
         break;
     }
 
-    return next_shape;
+    return midway_shape;
 }
 
-rb_shape_t *
-rb_shape_rebuild_shape(rb_shape_t * initial_shape, rb_shape_t * dest_shape)
+// Rebuild `dest_shape_id` starting from `initial_shape_id`, and keep only SHAPE_IVAR transitions.
+// SHAPE_OBJ_ID and frozen status are lost.
+shape_id_t
+rb_shape_rebuild(shape_id_t initial_shape_id, shape_id_t dest_shape_id)
 {
-    rb_shape_t * midway_shape;
-
-    RUBY_ASSERT(initial_shape->type == SHAPE_T_OBJECT);
+    RUBY_ASSERT(!rb_shape_too_complex_p(initial_shape_id));
+    RUBY_ASSERT(!rb_shape_too_complex_p(dest_shape_id));
 
-    if (dest_shape->type != initial_shape->type) {
-        midway_shape = rb_shape_rebuild_shape(initial_shape, rb_shape_get_parent(dest_shape));
+    rb_shape_t *next_shape = shape_rebuild(RSHAPE(initial_shape_id), RSHAPE(dest_shape_id));
+    if (next_shape) {
+        return shape_id(next_shape, initial_shape_id);
     }
     else {
-        midway_shape = initial_shape;
+        return transition_complex(initial_shape_id | (dest_shape_id & SHAPE_ID_FL_HAS_OBJECT_ID));
     }
+}
 
-    switch ((enum shape_type)dest_shape->type) {
-      case SHAPE_IVAR:
-        if (midway_shape->capacity <= midway_shape->next_iv_index) {
-            // There isn't enough room to write this IV, so we need to increase the capacity
-            midway_shape = rb_shape_transition_shape_capa(midway_shape, midway_shape->capacity * 2);
-        }
+void
+rb_shape_copy_fields(VALUE dest, VALUE *dest_buf, shape_id_t dest_shape_id, VALUE *src_buf, shape_id_t src_shape_id)
+{
+    rb_shape_t *dest_shape = RSHAPE(dest_shape_id);
+    rb_shape_t *src_shape = RSHAPE(src_shape_id);
 
-        midway_shape = rb_shape_get_next_iv_shape(midway_shape, dest_shape->edge_name);
-        break;
-      case SHAPE_ROOT:
-      case SHAPE_FROZEN:
-      case SHAPE_CAPACITY_CHANGE:
-      case SHAPE_INITIAL_CAPACITY:
-      case SHAPE_T_OBJECT:
-        break;
-      case SHAPE_OBJ_TOO_COMPLEX:
-        rb_bug("Unreachable");
-        break;
-    }
+    if (src_shape->next_field_index == dest_shape->next_field_index) {
+        // Happy path, we can just memcpy the ivptr content
+        MEMCPY(dest_buf, src_buf, VALUE, dest_shape->next_field_index);
 
-    return midway_shape;
-}
+        // Fire write barriers
+        for (uint32_t i = 0; i < dest_shape->next_field_index; i++) {
+            RB_OBJ_WRITTEN(dest, Qundef, dest_buf[i]);
+        }
+    }
+    else {
+        while (src_shape->parent_id != INVALID_SHAPE_ID) {
+            if (src_shape->type == SHAPE_IVAR) {
+                while (dest_shape->edge_name != src_shape->edge_name) {
+                    if (UNLIKELY(dest_shape->parent_id == INVALID_SHAPE_ID)) {
+                        rb_bug("Lost field %s", rb_id2name(src_shape->edge_name));
+                    }
+                    dest_shape = RSHAPE(dest_shape->parent_id);
+                }
 
-RUBY_FUNC_EXPORTED bool
-rb_shape_obj_too_complex(VALUE obj)
-{
-    return rb_shape_get_shape_id(obj) == OBJ_TOO_COMPLEX_SHAPE_ID;
+                RB_OBJ_WRITE(dest, &dest_buf[dest_shape->next_field_index - 1], src_buf[src_shape->next_field_index - 1]);
+            }
+            src_shape = RSHAPE(src_shape->parent_id);
+        }
+    }
 }
 
 void
-rb_shape_set_too_complex(VALUE obj)
+rb_shape_copy_complex_ivars(VALUE dest, VALUE obj, shape_id_t src_shape_id, st_table *fields_table)
 {
-    RUBY_ASSERT(BUILTIN_TYPE(obj) == T_OBJECT);
-    RUBY_ASSERT(!rb_shape_obj_too_complex(obj));
-    rb_shape_set_shape_id(obj, OBJ_TOO_COMPLEX_SHAPE_ID);
+    // obj is TOO_COMPLEX so we can copy its iv_hash
+    st_table *table = st_copy(fields_table);
+    if (rb_shape_has_object_id(src_shape_id)) {
+        st_data_t id = (st_data_t)id_object_id;
+        st_delete(table, &id, NULL);
+    }
+    rb_obj_init_too_complex(dest, table);
 }
 
 size_t
-rb_shape_edges_count(rb_shape_t *shape)
+rb_shape_edges_count(shape_id_t shape_id)
 {
+    rb_shape_t *shape = RSHAPE(shape_id);
     if (shape->edges) {
         if (SINGLE_CHILD_P(shape->edges)) {
             return 1;
         }
         else {
-            return rb_id_table_size(shape->edges);
+            return rb_managed_id_table_size(shape->edges);
         }
     }
     return 0;
 }
 
 size_t
-rb_shape_memsize(rb_shape_t *shape)
+rb_shape_memsize(shape_id_t shape_id)
 {
+    rb_shape_t *shape = RSHAPE(shape_id);
+
     size_t memsize = sizeof(rb_shape_t);
     if (shape->edges && !SINGLE_CHILD_P(shape->edges)) {
-        memsize += rb_id_table_memsize(shape->edges);
+        memsize += rb_managed_id_table_size(shape->edges);
     }
     return memsize;
 }
 
+bool
+rb_shape_foreach_field(shape_id_t initial_shape_id, rb_shape_foreach_transition_callback func, void *data)
+{
+    RUBY_ASSERT(!rb_shape_too_complex_p(initial_shape_id));
+
+    rb_shape_t *shape = RSHAPE(initial_shape_id);
+    if (shape->type == SHAPE_ROOT) {
+        return true;
+    }
+
+    shape_id_t parent_id = shape_id(RSHAPE(shape->parent_id), initial_shape_id);
+    if (rb_shape_foreach_field(parent_id, func, data)) {
+        switch (func(shape_id(shape, initial_shape_id), data)) {
+          case ST_STOP:
+            return false;
+          case ST_CHECK:
+          case ST_CONTINUE:
+            break;
+          default:
+            rb_bug("unreachable");
+        }
+    }
+    return true;
+}
+
+#if RUBY_DEBUG
+bool
+rb_shape_verify_consistency(VALUE obj, shape_id_t shape_id)
+{
+    if (shape_id == INVALID_SHAPE_ID) {
+        rb_bug("Can't set INVALID_SHAPE_ID on an object");
+    }
+
+    rb_shape_t *shape = RSHAPE(shape_id);
+
+    bool has_object_id = false;
+    while (shape->parent_id != INVALID_SHAPE_ID) {
+        if (shape->type == SHAPE_OBJ_ID) {
+            has_object_id = true;
+            break;
+        }
+        shape = RSHAPE(shape->parent_id);
+    }
+
+    if (rb_shape_has_object_id(shape_id)) {
+        if (!has_object_id) {
+            rb_p(obj);
+            rb_bug("shape_id claim having obj_id but doesn't shape_id=%u, obj=%s", shape_id, rb_obj_info(obj));
+        }
+    }
+    else {
+        if (has_object_id) {
+            rb_p(obj);
+            rb_bug("shape_id claim not having obj_id but it does shape_id=%u, obj=%s", shape_id, rb_obj_info(obj));
+        }
+    }
+
+    // Make sure SHAPE_ID_HAS_IVAR_MASK is valid.
+    if (rb_shape_too_complex_p(shape_id)) {
+        RUBY_ASSERT(shape_id & SHAPE_ID_HAS_IVAR_MASK);
+    }
+    else {
+        attr_index_t ivar_count = RSHAPE_LEN(shape_id);
+        if (has_object_id) {
+            ivar_count--;
+        }
+        if (ivar_count) {
+            RUBY_ASSERT(shape_id & SHAPE_ID_HAS_IVAR_MASK);
+        }
+        else {
+            RUBY_ASSERT(!(shape_id & SHAPE_ID_HAS_IVAR_MASK));
+        }
+    }
+
+    uint8_t flags_heap_index = rb_shape_heap_index(shape_id);
+    if (RB_TYPE_P(obj, T_OBJECT)) {
+        RUBY_ASSERT(flags_heap_index > 0);
+        size_t shape_id_slot_size = rb_shape_tree.capacities[flags_heap_index - 1] * sizeof(VALUE) + sizeof(struct RBasic);
+        size_t actual_slot_size = rb_gc_obj_slot_size(obj);
+
+        if (shape_id_slot_size != actual_slot_size) {
+            rb_bug("shape_id heap_index flags mismatch: shape_id_slot_size=%zu, gc_slot_size=%zu\n", shape_id_slot_size, actual_slot_size);
+        }
+    }
+    else {
+        if (flags_heap_index) {
+            rb_bug("shape_id indicate heap_index > 0 but object is not T_OBJECT: %s", rb_obj_info(obj));
+        }
+    }
+
+    return true;
+}
+#endif
+
 #if SHAPE_DEBUG
+
 /*
- * Exposing Shape to Ruby via RubyVM.debug_shape
+ * Exposing Shape to Ruby via RubyVM::Shape.of(object)
  */
 
-/* :nodoc: */
 static VALUE
-rb_shape_too_complex(VALUE self)
+shape_too_complex(VALUE self)
 {
-    rb_shape_t * shape;
-    shape = rb_shape_get_shape_by_id(NUM2INT(rb_struct_getmember(self, rb_intern("id"))));
-    if (rb_shape_id(shape) == OBJ_TOO_COMPLEX_SHAPE_ID) {
-        return Qtrue;
-    }
-    else {
-        return Qfalse;
-    }
+    shape_id_t shape_id = NUM2INT(rb_struct_getmember(self, rb_intern("id")));
+    return RBOOL(rb_shape_too_complex_p(shape_id));
+}
+
+static VALUE
+shape_frozen(VALUE self)
+{
+    shape_id_t shape_id = NUM2INT(rb_struct_getmember(self, rb_intern("id")));
+    return RBOOL(shape_id & SHAPE_ID_FL_FROZEN);
+}
+
+static VALUE
+shape_has_object_id_p(VALUE self)
+{
+    shape_id_t shape_id = NUM2INT(rb_struct_getmember(self, rb_intern("id")));
+    return RBOOL(rb_shape_has_object_id(shape_id));
 }
 
 static VALUE
@@ -626,21 +1342,23 @@ parse_key(ID key)
     return LONG2NUM(key);
 }
 
-static VALUE rb_shape_edge_name(rb_shape_t * shape);
+static VALUE rb_shape_edge_name(rb_shape_t *shape);
 
 static VALUE
-rb_shape_t_to_rb_cShape(rb_shape_t *shape)
+shape_id_t_to_rb_cShape(shape_id_t shape_id)
 {
     VALUE rb_cShape = rb_const_get(rb_cRubyVM, rb_intern("Shape"));
+    rb_shape_t *shape = RSHAPE(shape_id);
 
     VALUE obj = rb_struct_new(rb_cShape,
-            INT2NUM(rb_shape_id(shape)),
+            INT2NUM(shape_id),
+            INT2NUM(shape_id & SHAPE_ID_OFFSET_MASK),
             INT2NUM(shape->parent_id),
             rb_shape_edge_name(shape),
-            INT2NUM(shape->next_iv_index),
-            INT2NUM(shape->size_pool_index),
+            INT2NUM(shape->next_field_index),
+            INT2NUM(rb_shape_heap_index(shape_id)),
             INT2NUM(shape->type),
-            INT2NUM(shape->capacity));
+            INT2NUM(RSHAPE_CAPACITY(shape_id)));
     rb_obj_freeze(obj);
     return obj;
 }
@@ -648,27 +1366,26 @@ rb_shape_t_to_rb_cShape(rb_shape_t *shape)
 static enum rb_id_table_iterator_result
 rb_edges_to_hash(ID key, VALUE value, void *ref)
 {
-    rb_hash_aset(*(VALUE *)ref, parse_key(key), rb_shape_t_to_rb_cShape((rb_shape_t*)value));
+    rb_hash_aset(*(VALUE *)ref, parse_key(key), shape_id_t_to_rb_cShape(raw_shape_id((rb_shape_t *)value)));
     return ID_TABLE_CONTINUE;
 }
 
-/* :nodoc: */
 static VALUE
 rb_shape_edges(VALUE self)
 {
-    rb_shape_t* shape;
-
-    shape = rb_shape_get_shape_by_id(NUM2INT(rb_struct_getmember(self, rb_intern("id"))));
+    rb_shape_t *shape = RSHAPE(NUM2INT(rb_struct_getmember(self, rb_intern("id"))));
 
     VALUE hash = rb_hash_new();
 
     if (shape->edges) {
         if (SINGLE_CHILD_P(shape->edges)) {
-            rb_shape_t * child = SINGLE_CHILD(shape->edges);
+            rb_shape_t *child = SINGLE_CHILD(shape->edges);
             rb_edges_to_hash(child->edge_name, (VALUE)child, &hash);
         }
         else {
-            rb_id_table_foreach(shape->edges, rb_edges_to_hash, &hash);
+            VALUE edges = shape->edges;
+            rb_managed_id_table_foreach(edges, rb_edges_to_hash, &hash);
+            RB_GC_GUARD(edges);
         }
     }
 
@@ -676,7 +1393,7 @@ rb_shape_edges(VALUE self)
 }
 
 static VALUE
-rb_shape_edge_name(rb_shape_t * shape)
+rb_shape_edge_name(rb_shape_t *shape)
 {
     if (shape->edge_name) {
         if (is_instance_id(shape->edge_name)) {
@@ -687,71 +1404,82 @@ rb_shape_edge_name(rb_shape_t * shape)
     return Qnil;
 }
 
-/* :nodoc: */
 static VALUE
 rb_shape_export_depth(VALUE self)
 {
-    rb_shape_t* shape;
-    shape = rb_shape_get_shape_by_id(NUM2INT(rb_struct_getmember(self, rb_intern("id"))));
-    return SIZET2NUM(rb_shape_depth(shape));
+    shape_id_t shape_id = NUM2INT(rb_struct_getmember(self, rb_intern("id")));
+    return SIZET2NUM(rb_shape_depth(shape_id));
 }
 
-/* :nodoc: */
 static VALUE
 rb_shape_parent(VALUE self)
 {
-    rb_shape_t * shape;
-    shape = rb_shape_get_shape_by_id(NUM2INT(rb_struct_getmember(self, rb_intern("id"))));
+    rb_shape_t *shape;
+    shape = RSHAPE(NUM2INT(rb_struct_getmember(self, rb_intern("id"))));
     if (shape->parent_id != INVALID_SHAPE_ID) {
-        return rb_shape_t_to_rb_cShape(rb_shape_get_parent(shape));
+        return shape_id_t_to_rb_cShape(shape->parent_id);
     }
     else {
         return Qnil;
     }
 }
 
-/* :nodoc: */
 static VALUE
 rb_shape_debug_shape(VALUE self, VALUE obj)
 {
-    return rb_shape_t_to_rb_cShape(rb_shape_get_shape(obj));
+    return shape_id_t_to_rb_cShape(rb_obj_shape_id(obj));
 }
 
-/* :nodoc: */
 static VALUE
 rb_shape_root_shape(VALUE self)
 {
-    return rb_shape_t_to_rb_cShape(rb_shape_get_root_shape());
+    return shape_id_t_to_rb_cShape(ROOT_SHAPE_ID);
+}
+
+static VALUE
+rb_shape_shapes_available(VALUE self)
+{
+    return INT2NUM(MAX_SHAPE_ID - (rb_shapes_count() - 1));
+}
+
+static VALUE
+rb_shape_exhaust(int argc, VALUE *argv, VALUE self)
+{
+    rb_check_arity(argc, 0, 1);
+    int offset = argc == 1 ? NUM2INT(argv[0]) : 0;
+    RUBY_ATOMIC_SET(rb_shape_tree.next_shape_id, MAX_SHAPE_ID - offset + 1);
+    return Qnil;
 }
 
-VALUE rb_obj_shape(rb_shape_t* shape);
+static VALUE shape_to_h(rb_shape_t *shape);
 
 static enum rb_id_table_iterator_result collect_keys_and_values(ID key, VALUE value, void *ref)
 {
-    rb_hash_aset(*(VALUE *)ref, parse_key(key), rb_obj_shape((rb_shape_t*)value));
+    rb_hash_aset(*(VALUE *)ref, parse_key(key), shape_to_h((rb_shape_t *)value));
     return ID_TABLE_CONTINUE;
 }
 
-static VALUE edges(struct rb_id_table* edges)
+static VALUE edges(VALUE edges)
 {
     VALUE hash = rb_hash_new();
-    if (SINGLE_CHILD_P(edges)) {
-        rb_shape_t * child = SINGLE_CHILD(edges);
-        collect_keys_and_values(child->edge_name, (VALUE)child, &hash);
-    }
-    else {
-        rb_id_table_foreach(edges, collect_keys_and_values, &hash);
+    if (edges) {
+        if (SINGLE_CHILD_P(edges)) {
+            rb_shape_t *child = SINGLE_CHILD(edges);
+            collect_keys_and_values(child->edge_name, (VALUE)child, &hash);
+        }
+        else {
+            rb_managed_id_table_foreach(edges, collect_keys_and_values, &hash);
+        }
     }
     return hash;
 }
 
-/* :nodoc: */
-VALUE
-rb_obj_shape(rb_shape_t* shape)
+static VALUE
+shape_to_h(rb_shape_t *shape)
 {
     VALUE rb_shape = rb_hash_new();
 
-    rb_hash_aset(rb_shape, ID2SYM(rb_intern("id")), INT2NUM(rb_shape_id(shape)));
+    rb_hash_aset(rb_shape, ID2SYM(rb_intern("id")), INT2NUM(raw_shape_id(shape)));
     rb_hash_aset(rb_shape, ID2SYM(rb_intern("edges")), edges(shape->edges));
 
     if (shape == rb_shape_get_root_shape()) {
@@ -765,22 +1493,20 @@ rb_obj_shape(rb_shape_t* shape)
     return rb_shape;
 }
 
-/* :nodoc: */
 static VALUE
 shape_transition_tree(VALUE self)
 {
-    return rb_obj_shape(rb_shape_get_root_shape());
+    return shape_to_h(rb_shape_get_root_shape());
 }
 
-/* :nodoc: */
 static VALUE
 rb_shape_find_by_id(VALUE mod, VALUE id)
 {
     shape_id_t shape_id = NUM2UINT(id);
-    if (shape_id >= GET_SHAPE_TREE()->next_shape_id) {
+    if (shape_id >= rb_shapes_count()) {
         rb_raise(rb_eArgError, "Shape ID %d is out of bounds\n", shape_id);
     }
-    return rb_shape_t_to_rb_cShape(rb_shape_get_shape_by_id(shape_id));
+    return shape_id_t_to_rb_cShape(shape_id);
 }
 #endif
 
@@ -791,86 +1517,98 @@ rb_shape_find_by_id(VALUE mod, VALUE id)
 void
 Init_default_shapes(void)
 {
-    rb_shape_tree_t *st = ruby_mimmalloc(sizeof(rb_shape_tree_t));
-    memset(st, 0, sizeof(rb_shape_tree_t));
-    rb_shape_tree_ptr = st;
+    size_t *heap_sizes = rb_gc_heap_sizes();
+    size_t heaps_count = 0;
+    while (heap_sizes[heaps_count]) {
+        heaps_count++;
+    }
+    attr_index_t *capacities = ALLOC_N(attr_index_t, heaps_count + 1);
+    capacities[heaps_count] = 0;
+    size_t index;
+    for (index = 0; index < heaps_count; index++) {
+        capacities[index] = (heap_sizes[index] - sizeof(struct RBasic)) / sizeof(VALUE);
+    }
+    rb_shape_tree.capacities = capacities;
 
 #ifdef HAVE_MMAP
-    rb_shape_tree_ptr->shape_list = (rb_shape_t *)mmap(NULL, rb_size_mul_or_raise(SHAPE_BUFFER_SIZE, sizeof(rb_shape_t), rb_eRuntimeError),
+    size_t shape_list_mmap_size = rb_size_mul_or_raise(SHAPE_BUFFER_SIZE, sizeof(rb_shape_t), rb_eRuntimeError);
+    rb_shape_tree.shape_list = (rb_shape_t *)mmap(NULL, shape_list_mmap_size,
                          PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
-    if (GET_SHAPE_TREE()->shape_list == MAP_FAILED) {
-        GET_SHAPE_TREE()->shape_list = 0;
+    if (rb_shape_tree.shape_list == MAP_FAILED) {
+        rb_shape_tree.shape_list = 0;
+    }
+    else {
+        ruby_annotate_mmap(rb_shape_tree.shape_list, shape_list_mmap_size, "Ruby:Init_default_shapes:shape_list");
     }
 #else
-    GET_SHAPE_TREE()->shape_list = xcalloc(SHAPE_BUFFER_SIZE, sizeof(rb_shape_t));
+    rb_shape_tree.shape_list = xcalloc(SHAPE_BUFFER_SIZE, sizeof(rb_shape_t));
 #endif
 
-    if (!GET_SHAPE_TREE()->shape_list) {
+    if (!rb_shape_tree.shape_list) {
         rb_memerror();
     }
 
-    id_frozen = rb_make_internal_id();
-    id_t_object = rb_make_internal_id();
+    id_object_id = rb_make_internal_id();
 
-    // Shapes by size pool
-    for (int i = 0; i < SIZE_POOL_COUNT; i++) {
-        size_pool_edge_names[i] = rb_make_internal_id();
+#ifdef HAVE_MMAP
+    size_t shape_cache_mmap_size = rb_size_mul_or_raise(REDBLACK_CACHE_SIZE, sizeof(redblack_node_t), rb_eRuntimeError);
+    rb_shape_tree.shape_cache = (redblack_node_t *)mmap(NULL, shape_cache_mmap_size,
+                         PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
+    rb_shape_tree.cache_size = 0;
+
+    // If mmap fails, then give up on the redblack tree cache.
+    // We set the cache size such that the redblack node allocators think
+    // the cache is full.
+    if (rb_shape_tree.shape_cache == MAP_FAILED) {
+        rb_shape_tree.shape_cache = 0;
+        rb_shape_tree.cache_size = REDBLACK_CACHE_SIZE;
     }
-
-    // Root shape
-    rb_shape_t * root = rb_shape_alloc_with_parent_id(0, INVALID_SHAPE_ID);
-    root->capacity = (uint32_t)((rb_size_pool_slot_size(0) - offsetof(struct RObject, as.ary)) / sizeof(VALUE));
-    root->type = SHAPE_ROOT;
-    root->size_pool_index = 0;
-    GET_SHAPE_TREE()->root_shape = root;
-    RUBY_ASSERT(rb_shape_id(GET_SHAPE_TREE()->root_shape) == ROOT_SHAPE_ID);
-
-    // Shapes by size pool
-    for (int i = 1; i < SIZE_POOL_COUNT; i++) {
-        uint32_t capa = (uint32_t)((rb_size_pool_slot_size(i) - offsetof(struct RObject, as.ary)) / sizeof(VALUE));
-        rb_shape_t * new_shape = rb_shape_transition_shape_capa(root, capa);
-        new_shape->type = SHAPE_INITIAL_CAPACITY;
-        new_shape->size_pool_index = i;
-        RUBY_ASSERT(rb_shape_id(new_shape) == (shape_id_t)i);
+    else {
+        ruby_annotate_mmap(rb_shape_tree.shape_cache, shape_cache_mmap_size, "Ruby:Init_default_shapes:shape_cache");
     }
+#endif
 
-    // Make shapes for T_OBJECT
-    for (int i = 0; i < SIZE_POOL_COUNT; i++) {
-        rb_shape_t * shape = rb_shape_get_shape_by_id(i);
-        bool dont_care;
-        rb_shape_t * t_object_shape =
-            get_next_shape_internal(shape, id_t_object, SHAPE_T_OBJECT, &dont_care, true, false);
-        t_object_shape->edges = rb_id_table_create(0);
-        RUBY_ASSERT(rb_shape_id(t_object_shape) == (shape_id_t)(i + SIZE_POOL_COUNT));
-    }
+    rb_gc_register_address(&shape_tree_obj);
+    shape_tree_obj = TypedData_Wrap_Struct(0, &shape_tree_type, (void *)1);
 
-    bool dont_care;
-    // Special const shape
-#if RUBY_DEBUG
-    rb_shape_t * special_const_shape =
-#endif
-        get_next_shape_internal(root, (ID)id_frozen, SHAPE_FROZEN, &dont_care, true, false);
-    RUBY_ASSERT(rb_shape_id(special_const_shape) == SPECIAL_CONST_SHAPE_ID);
-    RUBY_ASSERT(SPECIAL_CONST_SHAPE_ID == (GET_SHAPE_TREE()->next_shape_id - 1));
-    RUBY_ASSERT(rb_shape_frozen_shape_p(special_const_shape));
+    // Root shape
+    rb_shape_t *root = rb_shape_alloc_with_parent_id(0, INVALID_SHAPE_ID);
+    root->capacity = 0;
+    root->type = SHAPE_ROOT;
+    rb_shape_tree.root_shape = root;
+    RUBY_ASSERT(raw_shape_id(rb_shape_tree.root_shape) == ROOT_SHAPE_ID);
+    RUBY_ASSERT(!(raw_shape_id(rb_shape_tree.root_shape) & SHAPE_ID_HAS_IVAR_MASK));
+
+    bool dontcare;
+    rb_shape_t *root_with_obj_id = get_next_shape_internal(root, id_object_id, SHAPE_OBJ_ID, &dontcare, true);
+    RUBY_ASSERT(root_with_obj_id);
+    RUBY_ASSERT(raw_shape_id(root_with_obj_id) == ROOT_SHAPE_WITH_OBJ_ID);
+    RUBY_ASSERT(root_with_obj_id->type == SHAPE_OBJ_ID);
+    RUBY_ASSERT(root_with_obj_id->edge_name == id_object_id);
+    RUBY_ASSERT(root_with_obj_id->next_field_index == 1);
+    RUBY_ASSERT(!(raw_shape_id(root_with_obj_id) & SHAPE_ID_HAS_IVAR_MASK));
+    (void)root_with_obj_id;
+}
 
-    rb_shape_t * hash_fallback_shape = rb_shape_alloc_with_parent_id(0, ROOT_SHAPE_ID);
-    hash_fallback_shape->type = SHAPE_OBJ_TOO_COMPLEX;
-    hash_fallback_shape->size_pool_index = 0;
-    RUBY_ASSERT(OBJ_TOO_COMPLEX_SHAPE_ID == (GET_SHAPE_TREE()->next_shape_id - 1));
-    RUBY_ASSERT(rb_shape_id(hash_fallback_shape) == OBJ_TOO_COMPLEX_SHAPE_ID);
+void
+rb_shape_free_all(void)
+{
+    xfree((void *)rb_shape_tree.capacities);
 }
 
 void
 Init_shape(void)
 {
 #if SHAPE_DEBUG
+    /* Document-class: RubyVM::Shape
+     * :nodoc: */
     VALUE rb_cShape = rb_struct_define_under(rb_cRubyVM, "Shape",
             "id",
+            "raw_id",
             "parent_id",
             "edge_name",
-            "next_iv_index",
-            "size_pool_index",
+            "next_field_index",
+            "heap_index",
             "type",
             "capacity",
             NULL);
@@ -878,21 +1616,26 @@ Init_shape(void)
     rb_define_method(rb_cShape, "parent", rb_shape_parent, 0);
     rb_define_method(rb_cShape, "edges", rb_shape_edges, 0);
     rb_define_method(rb_cShape, "depth", rb_shape_export_depth, 0);
-    rb_define_method(rb_cShape, "too_complex?", rb_shape_too_complex, 0);
+    rb_define_method(rb_cShape, "too_complex?", shape_too_complex, 0);
+    rb_define_method(rb_cShape, "shape_frozen?", shape_frozen, 0);
+    rb_define_method(rb_cShape, "has_object_id?", shape_has_object_id_p, 0);
+
     rb_define_const(rb_cShape, "SHAPE_ROOT", INT2NUM(SHAPE_ROOT));
     rb_define_const(rb_cShape, "SHAPE_IVAR", INT2NUM(SHAPE_IVAR));
-    rb_define_const(rb_cShape, "SHAPE_T_OBJECT", INT2NUM(SHAPE_T_OBJECT));
-    rb_define_const(rb_cShape, "SHAPE_FROZEN", INT2NUM(SHAPE_FROZEN));
     rb_define_const(rb_cShape, "SHAPE_ID_NUM_BITS", INT2NUM(SHAPE_ID_NUM_BITS));
     rb_define_const(rb_cShape, "SHAPE_FLAG_SHIFT", INT2NUM(SHAPE_FLAG_SHIFT));
     rb_define_const(rb_cShape, "SPECIAL_CONST_SHAPE_ID", INT2NUM(SPECIAL_CONST_SHAPE_ID));
-    rb_define_const(rb_cShape, "OBJ_TOO_COMPLEX_SHAPE_ID", INT2NUM(OBJ_TOO_COMPLEX_SHAPE_ID));
     rb_define_const(rb_cShape, "SHAPE_MAX_VARIATIONS", INT2NUM(SHAPE_MAX_VARIATIONS));
-    rb_define_const(rb_cShape, "SHAPE_MAX_NUM_IVS", INT2NUM(SHAPE_MAX_NUM_IVS));
+    rb_define_const(rb_cShape, "SIZEOF_RB_SHAPE_T", INT2NUM(sizeof(rb_shape_t)));
+    rb_define_const(rb_cShape, "SIZEOF_REDBLACK_NODE_T", INT2NUM(sizeof(redblack_node_t)));
+    rb_define_const(rb_cShape, "SHAPE_BUFFER_SIZE", INT2NUM(sizeof(rb_shape_t) * SHAPE_BUFFER_SIZE));
+    rb_define_const(rb_cShape, "REDBLACK_CACHE_SIZE", INT2NUM(sizeof(redblack_node_t) * REDBLACK_CACHE_SIZE));
 
     rb_define_singleton_method(rb_cShape, "transition_tree", shape_transition_tree, 0);
     rb_define_singleton_method(rb_cShape, "find_by_id", rb_shape_find_by_id, 1);
     rb_define_singleton_method(rb_cShape, "of", rb_shape_debug_shape, 1);
     rb_define_singleton_method(rb_cShape, "root_shape", rb_shape_root_shape, 0);
+    rb_define_singleton_method(rb_cShape, "shapes_available", rb_shape_shapes_available, 0);
+    rb_define_singleton_method(rb_cShape, "exhaust_shapes", rb_shape_exhaust, -1);
 #endif
 }
diff --git a/shape.h b/shape.h
index 025dfb4dd8067c..63d5534d463dce 100644
--- a/shape.h
+++ b/shape.h
@@ -3,230 +3,430 @@
 
 #include "internal/gc.h"
 
-#if (SIZEOF_UINT64_T <= SIZEOF_VALUE)
-#define SIZEOF_SHAPE_T 4
-#define SHAPE_IN_BASIC_FLAGS 1
-typedef uint32_t attr_index_t;
-#else
-#define SIZEOF_SHAPE_T 2
-#define SHAPE_IN_BASIC_FLAGS 0
 typedef uint16_t attr_index_t;
-#endif
+typedef uint32_t shape_id_t;
+#define SHAPE_ID_NUM_BITS 32
+#define SHAPE_ID_OFFSET_NUM_BITS 19
 
-#define MAX_IVARS (attr_index_t)(-1)
+STATIC_ASSERT(shape_id_num_bits, SHAPE_ID_NUM_BITS == sizeof(shape_id_t) * CHAR_BIT);
 
-#if SIZEOF_SHAPE_T == 4
-typedef uint32_t shape_id_t;
-# define SHAPE_ID_NUM_BITS 32
-# define SHAPE_BUFFER_SIZE 0x80000
-#else
-typedef uint16_t shape_id_t;
-# define SHAPE_ID_NUM_BITS 16
-# define SHAPE_BUFFER_SIZE 0x8000
-#endif
+#define SHAPE_BUFFER_SIZE (1 << SHAPE_ID_OFFSET_NUM_BITS)
+#define SHAPE_ID_OFFSET_MASK (SHAPE_BUFFER_SIZE - 1)
+
+#define SHAPE_ID_HEAP_INDEX_BITS 3
+#define SHAPE_ID_HEAP_INDEX_MAX ((1 << SHAPE_ID_HEAP_INDEX_BITS) - 1)
+
+#define SHAPE_ID_FL_USHIFT (SHAPE_ID_OFFSET_NUM_BITS + SHAPE_ID_HEAP_INDEX_BITS)
+#define SHAPE_ID_HEAP_INDEX_OFFSET SHAPE_ID_FL_USHIFT
+
+// shape_id_t bits:
+//      0-18 SHAPE_ID_OFFSET_MASK
+//              index in rb_shape_tree.shape_list. Allow to access `rb_shape_t *`.
+//      19-21 SHAPE_ID_HEAP_INDEX_MASK
+//              index in rb_shape_tree.capacities. Allow to access slot size.
+//      22 SHAPE_ID_FL_FROZEN
+//              Whether the object is frozen or not.
+//      23 SHAPE_ID_FL_HAS_OBJECT_ID
+//              Whether the object has an `SHAPE_OBJ_ID` transition.
+//      24 SHAPE_ID_FL_TOO_COMPLEX
+//              The object is backed by a `st_table`.
+
+enum shape_id_fl_type {
+#define RBIMPL_SHAPE_ID_FL(n) (1<<(SHAPE_ID_FL_USHIFT+n))
+
+    SHAPE_ID_HEAP_INDEX_MASK = RBIMPL_SHAPE_ID_FL(0) | RBIMPL_SHAPE_ID_FL(1) | RBIMPL_SHAPE_ID_FL(2),
+
+    SHAPE_ID_FL_FROZEN = RBIMPL_SHAPE_ID_FL(3),
+    SHAPE_ID_FL_HAS_OBJECT_ID = RBIMPL_SHAPE_ID_FL(4),
+    SHAPE_ID_FL_TOO_COMPLEX = RBIMPL_SHAPE_ID_FL(5),
+
+    SHAPE_ID_FL_NON_CANONICAL_MASK = SHAPE_ID_FL_FROZEN | SHAPE_ID_FL_HAS_OBJECT_ID,
+    SHAPE_ID_FLAGS_MASK = SHAPE_ID_HEAP_INDEX_MASK | SHAPE_ID_FL_NON_CANONICAL_MASK | SHAPE_ID_FL_TOO_COMPLEX,
+
+#undef RBIMPL_SHAPE_ID_FL
+};
 
-# define SHAPE_MASK (((uintptr_t)1 << SHAPE_ID_NUM_BITS) - 1)
-# define SHAPE_FLAG_MASK (((VALUE)-1) >> SHAPE_ID_NUM_BITS)
+// This masks allows to check if a shape_id contains any ivar.
+// It rely on ROOT_SHAPE_WITH_OBJ_ID==1.
+#define SHAPE_ID_HAS_IVAR_MASK (SHAPE_ID_FL_TOO_COMPLEX | (SHAPE_ID_OFFSET_MASK - 1))
 
-# define SHAPE_FLAG_SHIFT ((SIZEOF_VALUE * 8) - SHAPE_ID_NUM_BITS)
+// The interpreter doesn't care about frozen status or slot size when reading ivars.
+// So we normalize shape_id by clearing these bits to improve cache hits.
+// JITs however might care about it.
+#define SHAPE_ID_READ_ONLY_MASK (~(SHAPE_ID_FL_FROZEN | SHAPE_ID_HEAP_INDEX_MASK))
 
-# define SHAPE_MAX_VARIATIONS 8
-# define SHAPE_MAX_NUM_IVS 80
+typedef uint32_t redblack_id_t;
 
-# define MAX_SHAPE_ID SHAPE_BUFFER_SIZE
-# define INVALID_SHAPE_ID SHAPE_MASK
-# define ROOT_SHAPE_ID 0x0
+#define SHAPE_MAX_FIELDS (attr_index_t)(-1)
+#define SHAPE_FLAG_SHIFT ((SIZEOF_VALUE * CHAR_BIT) - SHAPE_ID_NUM_BITS)
+#define SHAPE_FLAG_MASK (((VALUE)-1) >> SHAPE_ID_NUM_BITS)
 
-# define SPECIAL_CONST_SHAPE_ID (SIZE_POOL_COUNT * 2)
-# define OBJ_TOO_COMPLEX_SHAPE_ID (SPECIAL_CONST_SHAPE_ID + 1)
+#define SHAPE_MAX_VARIATIONS 8
+
+#define INVALID_SHAPE_ID ((shape_id_t)-1)
+#define ATTR_INDEX_NOT_SET ((attr_index_t)-1)
+
+#define ROOT_SHAPE_ID                   0x0
+#define ROOT_SHAPE_WITH_OBJ_ID          0x1
+#define ROOT_TOO_COMPLEX_SHAPE_ID       (ROOT_SHAPE_ID | SHAPE_ID_FL_TOO_COMPLEX)
+#define ROOT_TOO_COMPLEX_WITH_OBJ_ID    (ROOT_SHAPE_WITH_OBJ_ID | SHAPE_ID_FL_TOO_COMPLEX | SHAPE_ID_FL_HAS_OBJECT_ID)
+#define SPECIAL_CONST_SHAPE_ID          (ROOT_SHAPE_ID | SHAPE_ID_FL_FROZEN)
+
+typedef struct redblack_node redblack_node_t;
 
 struct rb_shape {
-    struct rb_id_table * edges; // id_table from ID (ivar) to next shape
+    VALUE edges; // id_table from ID (ivar) to next shape
     ID edge_name; // ID (ivar) for transition from parent to rb_shape
-    attr_index_t next_iv_index;
-    uint32_t capacity; // Total capacity of the object with this shape
-    uint8_t type;
-    uint8_t size_pool_index;
+    redblack_node_t *ancestor_index;
     shape_id_t parent_id;
+    attr_index_t next_field_index; // Fields are either ivars or internal properties like `object_id`
+    attr_index_t capacity; // Total capacity of the object with this shape
+    uint8_t type;
 };
 
 typedef struct rb_shape rb_shape_t;
 
+struct redblack_node {
+    ID key;
+    rb_shape_t *value;
+    redblack_id_t l;
+    redblack_id_t r;
+};
+
 enum shape_type {
     SHAPE_ROOT,
     SHAPE_IVAR,
-    SHAPE_FROZEN,
-    SHAPE_CAPACITY_CHANGE,
-    SHAPE_INITIAL_CAPACITY,
-    SHAPE_T_OBJECT,
-    SHAPE_OBJ_TOO_COMPLEX,
+    SHAPE_OBJ_ID,
+};
+
+enum shape_flags {
+    SHAPE_FL_FROZEN             = 1 << 0,
+    SHAPE_FL_HAS_OBJECT_ID      = 1 << 1,
+    SHAPE_FL_TOO_COMPLEX        = 1 << 2,
+
+    SHAPE_FL_NON_CANONICAL_MASK = SHAPE_FL_FROZEN | SHAPE_FL_HAS_OBJECT_ID,
 };
 
 typedef struct {
     /* object shapes */
     rb_shape_t *shape_list;
     rb_shape_t *root_shape;
-    shape_id_t next_shape_id;
+    const attr_index_t *capacities;
+    rb_atomic_t next_shape_id;
+
+    redblack_node_t *shape_cache;
+    unsigned int cache_size;
 } rb_shape_tree_t;
-RUBY_EXTERN rb_shape_tree_t *rb_shape_tree_ptr;
 
-static inline rb_shape_tree_t *
-rb_current_shape_tree(void)
+RUBY_SYMBOL_EXPORT_BEGIN
+RUBY_EXTERN rb_shape_tree_t rb_shape_tree;
+RUBY_SYMBOL_EXPORT_END
+
+static inline shape_id_t
+rb_shapes_count(void)
 {
-    return rb_shape_tree_ptr;
+    return (shape_id_t)RUBY_ATOMIC_LOAD(rb_shape_tree.next_shape_id);
 }
-#define GET_SHAPE_TREE() rb_current_shape_tree()
+
+union rb_attr_index_cache {
+    uint64_t pack;
+    struct {
+        shape_id_t shape_id;
+        attr_index_t index;
+    } unpack;
+};
 
 static inline shape_id_t
-get_shape_id_from_flags(VALUE obj)
+RBASIC_SHAPE_ID(VALUE obj)
 {
     RUBY_ASSERT(!RB_SPECIAL_CONST_P(obj));
-    return (shape_id_t)(SHAPE_MASK & ((RBASIC(obj)->flags) >> SHAPE_FLAG_SHIFT));
+    RUBY_ASSERT(!RB_TYPE_P(obj, T_IMEMO) || IMEMO_TYPE_P(obj, imemo_fields));
+#if RBASIC_SHAPE_ID_FIELD
+    return (shape_id_t)((RBASIC(obj)->shape_id));
+#else
+    return (shape_id_t)((RBASIC(obj)->flags) >> SHAPE_FLAG_SHIFT);
+#endif
 }
 
+// Same as RBASIC_SHAPE_ID but with flags that have no impact
+// on reads removed. e.g. Remove FL_FROZEN.
+static inline shape_id_t
+RBASIC_SHAPE_ID_FOR_READ(VALUE obj)
+{
+    return RBASIC_SHAPE_ID(obj) & SHAPE_ID_READ_ONLY_MASK;
+}
+
+#if RUBY_DEBUG
+bool rb_shape_verify_consistency(VALUE obj, shape_id_t shape_id);
+#endif
+
 static inline void
-set_shape_id_in_flags(VALUE obj, shape_id_t shape_id)
+RBASIC_SET_SHAPE_ID(VALUE obj, shape_id_t shape_id)
 {
-    // Ractors are occupying the upper 32 bits of flags, but only in debug mode
+    RUBY_ASSERT(!RB_SPECIAL_CONST_P(obj));
+    RUBY_ASSERT(!RB_TYPE_P(obj, T_IMEMO) || IMEMO_TYPE_P(obj, imemo_fields));
+#if RBASIC_SHAPE_ID_FIELD
+    RBASIC(obj)->shape_id = (VALUE)shape_id;
+#else
     // Object shapes are occupying top bits
     RBASIC(obj)->flags &= SHAPE_FLAG_MASK;
     RBASIC(obj)->flags |= ((VALUE)(shape_id) << SHAPE_FLAG_SHIFT);
+#endif
+    RUBY_ASSERT(rb_shape_verify_consistency(obj, shape_id));
 }
 
+void rb_set_namespaced_class_shape_id(VALUE obj, shape_id_t shape_id);
 
-#if SHAPE_IN_BASIC_FLAGS
-static inline shape_id_t
-RBASIC_SHAPE_ID(VALUE obj)
+static inline void
+RB_SET_SHAPE_ID(VALUE obj, shape_id_t shape_id)
 {
-    return get_shape_id_from_flags(obj);
+    switch (BUILTIN_TYPE(obj)) {
+      case T_CLASS:
+      case T_MODULE:
+        rb_set_namespaced_class_shape_id(obj, shape_id);
+        break;
+      default:
+        RBASIC_SET_SHAPE_ID(obj, shape_id);
+        break;
+    }
 }
 
-static inline void
-RBASIC_SET_SHAPE_ID(VALUE obj, shape_id_t shape_id)
+static inline rb_shape_t *
+RSHAPE(shape_id_t shape_id)
 {
-    set_shape_id_in_flags(obj, shape_id);
+    uint32_t offset = (shape_id & SHAPE_ID_OFFSET_MASK);
+    RUBY_ASSERT(offset != INVALID_SHAPE_ID);
+
+    return &rb_shape_tree.shape_list[offset];
 }
-#endif
 
-static inline shape_id_t
-ROBJECT_SHAPE_ID(VALUE obj)
+int32_t rb_shape_id_offset(void);
+
+RUBY_FUNC_EXPORTED shape_id_t rb_obj_shape_id(VALUE obj);
+shape_id_t rb_shape_get_next_iv_shape(shape_id_t shape_id, ID id);
+bool rb_shape_get_iv_index(shape_id_t shape_id, ID id, attr_index_t *value);
+bool rb_shape_get_iv_index_with_hint(shape_id_t shape_id, ID id, attr_index_t *value, shape_id_t *shape_id_hint);
+bool rb_shape_find_ivar(shape_id_t shape_id, ID id, shape_id_t *ivar_shape);
+
+typedef int rb_shape_foreach_transition_callback(shape_id_t shape_id, void *data);
+bool rb_shape_foreach_field(shape_id_t shape_id, rb_shape_foreach_transition_callback func, void *data);
+
+shape_id_t rb_shape_transition_frozen(VALUE obj);
+shape_id_t rb_shape_transition_complex(VALUE obj);
+shape_id_t rb_shape_transition_remove_ivar(VALUE obj, ID id, shape_id_t *removed_shape_id);
+shape_id_t rb_shape_transition_add_ivar(VALUE obj, ID id);
+shape_id_t rb_shape_transition_add_ivar_no_warnings(VALUE obj, ID id);
+shape_id_t rb_shape_transition_object_id(VALUE obj);
+shape_id_t rb_shape_transition_heap(VALUE obj, size_t heap_index);
+shape_id_t rb_shape_object_id(shape_id_t original_shape_id);
+
+void rb_shape_free_all(void);
+
+shape_id_t rb_shape_rebuild(shape_id_t initial_shape_id, shape_id_t dest_shape_id);
+void rb_shape_copy_fields(VALUE dest, VALUE *dest_buf, shape_id_t dest_shape_id, VALUE *src_buf, shape_id_t src_shape_id);
+void rb_shape_copy_complex_ivars(VALUE dest, VALUE obj, shape_id_t src_shape_id, st_table *fields_table);
+
+static inline bool
+rb_shape_too_complex_p(shape_id_t shape_id)
 {
-    RBIMPL_ASSERT_TYPE(obj, RUBY_T_OBJECT);
-    return get_shape_id_from_flags(obj);
+    return shape_id & SHAPE_ID_FL_TOO_COMPLEX;
 }
 
-static inline void
-ROBJECT_SET_SHAPE_ID(VALUE obj, shape_id_t shape_id)
+static inline bool
+rb_shape_obj_too_complex_p(VALUE obj)
 {
-    RBIMPL_ASSERT_TYPE(obj, RUBY_T_OBJECT);
-    set_shape_id_in_flags(obj, shape_id);
+    return !RB_SPECIAL_CONST_P(obj) && rb_shape_too_complex_p(RBASIC_SHAPE_ID(obj));
+}
+
+static inline bool
+rb_shape_has_object_id(shape_id_t shape_id)
+{
+    return shape_id & SHAPE_ID_FL_HAS_OBJECT_ID;
+}
+
+static inline bool
+rb_shape_canonical_p(shape_id_t shape_id)
+{
+    return !(shape_id & SHAPE_ID_FL_NON_CANONICAL_MASK);
+}
+
+static inline uint8_t
+rb_shape_heap_index(shape_id_t shape_id)
+{
+    return (uint8_t)((shape_id & SHAPE_ID_HEAP_INDEX_MASK) >> SHAPE_ID_HEAP_INDEX_OFFSET);
 }
 
 static inline shape_id_t
-RCLASS_SHAPE_ID(VALUE obj)
+rb_shape_root(size_t heap_id)
 {
-    RUBY_ASSERT(RB_TYPE_P(obj, T_CLASS) || RB_TYPE_P(obj, T_MODULE));
-    return get_shape_id_from_flags(obj);
+    shape_id_t heap_index = (shape_id_t)(heap_id + 1);
+    shape_id_t heap_flags = heap_index << SHAPE_ID_HEAP_INDEX_OFFSET;
+
+    RUBY_ASSERT((heap_flags & SHAPE_ID_HEAP_INDEX_MASK) == heap_flags);
+    RUBY_ASSERT(rb_shape_heap_index(heap_flags) == heap_index);
+
+    return ROOT_SHAPE_ID | heap_flags;
 }
 
-static inline void
-RCLASS_SET_SHAPE_ID(VALUE obj, shape_id_t shape_id)
+static inline shape_id_t
+RSHAPE_PARENT(shape_id_t shape_id)
 {
-    RUBY_ASSERT(RB_TYPE_P(obj, T_CLASS) || RB_TYPE_P(obj, T_MODULE));
-    set_shape_id_in_flags(obj, shape_id);
+    return RSHAPE(shape_id)->parent_id;
 }
 
-rb_shape_t * rb_shape_get_root_shape(void);
-int32_t rb_shape_id_offset(void);
+static inline enum shape_type
+RSHAPE_TYPE(shape_id_t shape_id)
+{
+    return RSHAPE(shape_id)->type;
+}
 
-rb_shape_t * rb_shape_get_parent(rb_shape_t * shape);
+static inline bool
+RSHAPE_TYPE_P(shape_id_t shape_id, enum shape_type type)
+{
+    return RSHAPE_TYPE(shape_id) == type;
+}
 
-rb_shape_t* rb_shape_get_shape_by_id(shape_id_t shape_id);
-shape_id_t rb_shape_get_shape_id(VALUE obj);
-rb_shape_t * rb_shape_get_next_iv_shape(rb_shape_t * shape, ID id);
-bool rb_shape_get_iv_index(rb_shape_t * shape, ID id, attr_index_t * value);
-bool rb_shape_obj_too_complex(VALUE obj);
+static inline attr_index_t
+RSHAPE_EMBEDDED_CAPACITY(shape_id_t shape_id)
+{
+    uint8_t heap_index = rb_shape_heap_index(shape_id);
+    if (heap_index) {
+        return rb_shape_tree.capacities[heap_index - 1];
+    }
+    return 0;
+}
 
-void rb_shape_set_shape(VALUE obj, rb_shape_t* shape);
-rb_shape_t* rb_shape_get_shape(VALUE obj);
-int rb_shape_frozen_shape_p(rb_shape_t* shape);
-void rb_shape_transition_shape_frozen(VALUE obj);
-void rb_shape_transition_shape_remove_ivar(VALUE obj, ID id, rb_shape_t *shape, VALUE * removed);
-rb_shape_t * rb_shape_transition_shape_capa(rb_shape_t * shape, uint32_t new_capacity);
-rb_shape_t* rb_shape_get_next(rb_shape_t* shape, VALUE obj, ID id);
+static inline attr_index_t
+RSHAPE_CAPACITY(shape_id_t shape_id)
+{
+    attr_index_t embedded_capacity = RSHAPE_EMBEDDED_CAPACITY(shape_id);
 
-rb_shape_t * rb_shape_rebuild_shape(rb_shape_t * initial_shape, rb_shape_t * dest_shape);
+    if (embedded_capacity > RSHAPE(shape_id)->capacity) {
+        return embedded_capacity;
+    }
+    else {
+        return RSHAPE(shape_id)->capacity;
+    }
+}
+
+static inline attr_index_t
+RSHAPE_LEN(shape_id_t shape_id)
+{
+    return RSHAPE(shape_id)->next_field_index;
+}
+
+static inline attr_index_t
+RSHAPE_INDEX(shape_id_t shape_id)
+{
+    return RSHAPE_LEN(shape_id) - 1;
+}
+
+static inline ID
+RSHAPE_EDGE_NAME(shape_id_t shape_id)
+{
+    return RSHAPE(shape_id)->edge_name;
+}
 
 static inline uint32_t
-ROBJECT_IV_CAPACITY(VALUE obj)
+ROBJECT_FIELDS_CAPACITY(VALUE obj)
 {
     RBIMPL_ASSERT_TYPE(obj, RUBY_T_OBJECT);
     // Asking for capacity doesn't make sense when the object is using
     // a hash table for storing instance variables
-    RUBY_ASSERT(ROBJECT_SHAPE_ID(obj) != OBJ_TOO_COMPLEX_SHAPE_ID);
-    return rb_shape_get_shape_by_id(ROBJECT_SHAPE_ID(obj))->capacity;
+    RUBY_ASSERT(!rb_shape_obj_too_complex_p(obj));
+    return RSHAPE_CAPACITY(RBASIC_SHAPE_ID(obj));
 }
 
 static inline st_table *
-ROBJECT_IV_HASH(VALUE obj)
+ROBJECT_FIELDS_HASH(VALUE obj)
 {
     RBIMPL_ASSERT_TYPE(obj, RUBY_T_OBJECT);
-    RUBY_ASSERT(ROBJECT_SHAPE_ID(obj) == OBJ_TOO_COMPLEX_SHAPE_ID);
-    return (st_table *)ROBJECT(obj)->as.heap.ivptr;
+    RUBY_ASSERT(rb_shape_obj_too_complex_p(obj));
+    return (st_table *)ROBJECT(obj)->as.heap.fields;
 }
 
 static inline void
-ROBJECT_SET_IV_HASH(VALUE obj, const struct rb_id_table *tbl)
+ROBJECT_SET_FIELDS_HASH(VALUE obj, const st_table *tbl)
 {
     RBIMPL_ASSERT_TYPE(obj, RUBY_T_OBJECT);
-    RUBY_ASSERT(ROBJECT_SHAPE_ID(obj) == OBJ_TOO_COMPLEX_SHAPE_ID);
-    ROBJECT(obj)->as.heap.ivptr = (VALUE *)tbl;
+    RUBY_ASSERT(rb_shape_obj_too_complex_p(obj));
+    ROBJECT(obj)->as.heap.fields = (VALUE *)tbl;
 }
 
-size_t rb_id_table_size(const struct rb_id_table *tbl);
-
 static inline uint32_t
-ROBJECT_IV_COUNT(VALUE obj)
+ROBJECT_FIELDS_COUNT(VALUE obj)
 {
-    if (ROBJECT_SHAPE_ID(obj) == OBJ_TOO_COMPLEX_SHAPE_ID) {
-        return (uint32_t)rb_st_table_size(ROBJECT_IV_HASH(obj));
+    if (rb_shape_obj_too_complex_p(obj)) {
+        return (uint32_t)rb_st_table_size(ROBJECT_FIELDS_HASH(obj));
     }
     else {
         RBIMPL_ASSERT_TYPE(obj, RUBY_T_OBJECT);
-        RUBY_ASSERT(ROBJECT_SHAPE_ID(obj) != OBJ_TOO_COMPLEX_SHAPE_ID);
-        return rb_shape_get_shape_by_id(ROBJECT_SHAPE_ID(obj))->next_iv_index;
+        RUBY_ASSERT(!rb_shape_obj_too_complex_p(obj));
+        return RSHAPE(RBASIC_SHAPE_ID(obj))->next_field_index;
     }
 }
 
 static inline uint32_t
-RBASIC_IV_COUNT(VALUE obj)
+RBASIC_FIELDS_COUNT(VALUE obj)
 {
-    return rb_shape_get_shape_by_id(rb_shape_get_shape_id(obj))->next_iv_index;
+    return RSHAPE(rb_obj_shape_id(obj))->next_field_index;
 }
 
-static inline uint32_t
-RCLASS_IV_COUNT(VALUE obj)
+bool rb_obj_set_shape_id(VALUE obj, shape_id_t shape_id);
+
+static inline bool
+rb_shape_obj_has_id(VALUE obj)
+{
+    return rb_shape_has_object_id(RBASIC_SHAPE_ID(obj));
+}
+
+static inline bool
+rb_shape_has_ivars(shape_id_t shape_id)
+{
+    return shape_id & SHAPE_ID_HAS_IVAR_MASK;
+}
+
+static inline bool
+rb_shape_obj_has_ivars(VALUE obj)
 {
-    RUBY_ASSERT(RB_TYPE_P(obj, RUBY_T_CLASS) || RB_TYPE_P(obj, RUBY_T_MODULE));
-    uint32_t ivc = rb_shape_get_shape_by_id(RCLASS_SHAPE_ID(obj))->next_iv_index;
-    return ivc;
+    return rb_shape_has_ivars(RBASIC_SHAPE_ID(obj));
 }
 
-rb_shape_t *rb_shape_traverse_from_new_root(rb_shape_t *initial_shape, rb_shape_t *orig_shape);
+static inline bool
+rb_shape_has_fields(shape_id_t shape_id)
+{
+    return shape_id & (SHAPE_ID_OFFSET_MASK | SHAPE_ID_FL_TOO_COMPLEX);
+}
 
-bool rb_shape_set_shape_id(VALUE obj, shape_id_t shape_id);
+static inline bool
+rb_shape_obj_has_fields(VALUE obj)
+{
+    return rb_shape_has_fields(RBASIC_SHAPE_ID(obj));
+}
 
-VALUE rb_obj_debug_shape(VALUE self, VALUE obj);
-void rb_shape_set_too_complex(VALUE obj);
+static inline bool
+rb_obj_exivar_p(VALUE obj)
+{
+    switch (TYPE(obj)) {
+        case T_NONE:
+        case T_OBJECT:
+        case T_CLASS:
+        case T_MODULE:
+        case T_IMEMO:
+          return false;
+        default:
+          break;
+    }
+    return rb_shape_obj_has_fields(obj);
+}
 
 // For ext/objspace
 RUBY_SYMBOL_EXPORT_BEGIN
-typedef void each_shape_callback(rb_shape_t * shape, void *data);
-void rb_shape_each_shape(each_shape_callback callback, void *data);
-size_t rb_shape_memsize(rb_shape_t *shape);
-size_t rb_shape_edges_count(rb_shape_t *shape);
-size_t rb_shape_depth(rb_shape_t *shape);
-shape_id_t rb_shape_id(rb_shape_t * shape);
+typedef void each_shape_callback(shape_id_t shape_id, void *data);
+void rb_shape_each_shape_id(each_shape_callback callback, void *data);
+size_t rb_shape_memsize(shape_id_t shape);
+size_t rb_shape_edges_count(shape_id_t shape_id);
+size_t rb_shape_depth(shape_id_t shape_id);
 RUBY_SYMBOL_EXPORT_END
 
 #endif
diff --git a/signal.c b/signal.c
index fa7d25caf5f586..9edac5a7896fb7 100644
--- a/signal.c
+++ b/signal.c
@@ -45,6 +45,7 @@
 #include "ruby_atomic.h"
 #include "vm_core.h"
 #include "ractor_core.h"
+#include "ruby/internal/attr/nonstring.h"
 
 #ifdef NEED_RUBY_ATOMIC_OPS
 rb_atomic_t
@@ -274,7 +275,7 @@ signm2signo(VALUE *sig_ptr, int negative, int exit, int *prefix_ptr)
         vsig = rb_str_subseq(vsig, prefix, len);
         prefix = signame_prefix_len;
     }
-    rb_raise(rb_eArgError, "unsupported signal `%.*s%"PRIsVALUE"'",
+    rb_raise(rb_eArgError, "unsupported signal '%.*s%"PRIsVALUE"'",
              prefix, signame_prefix, vsig);
     UNREACHABLE_RETURN(0);
 }
@@ -402,7 +403,9 @@ interrupt_init(int argc, VALUE *argv, VALUE self)
     return rb_call_super(2, args);
 }
 
-void rb_malloc_info_show_results(void); /* gc.c */
+#if defined(USE_SIGALTSTACK) || defined(_WIN32)
+static void reset_sigmask(int sig);
+#endif
 
 void
 ruby_default_signal(int sig)
@@ -410,9 +413,11 @@ ruby_default_signal(int sig)
 #if USE_DEBUG_COUNTER
     rb_debug_counter_show_results("killed by signal.");
 #endif
-    rb_malloc_info_show_results();
 
     signal(sig, SIG_DFL);
+#if defined(USE_SIGALTSTACK) || defined(_WIN32)
+    reset_sigmask(sig);
+#endif
     raise(sig);
 }
 
@@ -591,7 +596,7 @@ ruby_signal(int signum, sighandler_t handler)
 #endif
 
     sigemptyset(&sigact.sa_mask);
-#ifdef USE_SIGALTSTACK
+#if defined(USE_SIGALTSTACK) && !defined(__wasm__)
     if (handler == SIG_IGN || handler == SIG_DFL) {
         sigact.sa_handler = handler;
         sigact.sa_flags = 0;
@@ -659,6 +664,10 @@ ruby_nativethread_signal(int signum, sighandler_t handler)
 #endif
 #endif
 
+#if !defined(POSIX_SIGNAL) && !defined(SIG_GET)
+static rb_nativethread_lock_t sig_check_lock;
+#endif
+
 static int
 signal_ignored(int sig)
 {
@@ -668,9 +677,16 @@ signal_ignored(int sig)
     (void)VALGRIND_MAKE_MEM_DEFINED(&old, sizeof(old));
     if (sigaction(sig, NULL, &old) < 0) return FALSE;
     func = old.sa_handler;
+#elif defined SIG_GET
+    // https://learn.microsoft.com/en-us/cpp/c-runtime-library/signal-action-constants
+    // SIG_GET: Returns the current value of the signal.
+    func = signal(sig, SIG_GET);
 #else
-    sighandler_t old = signal(sig, SIG_DFL);
+    sighandler_t old;
+    rb_native_mutex_lock(&sig_check_lock);
+    old = signal(sig, SIG_DFL);
     signal(sig, old);
+    rb_native_mutex_unlock(&sig_check_lock);
     func = old;
 #endif
     if (func == SIG_IGN) return 1;
@@ -702,7 +718,7 @@ sighandler(int sig)
 int
 rb_signal_buff_size(void)
 {
-    return signal_buff.size;
+    return RUBY_ATOMIC_LOAD(signal_buff.size);
 }
 
 static void
@@ -730,7 +746,7 @@ rb_get_next_signal(void)
 {
     int i, sig = 0;
 
-    if (signal_buff.size != 0) {
+    if (rb_signal_buff_size() != 0) {
         for (i=1; i<RUBY_NSIG; i++) {
             if (signal_buff.cnt[i] > 0) {
                 ATOMIC_DEC(signal_buff.cnt[i]);
@@ -745,13 +761,15 @@ rb_get_next_signal(void)
 
 #if defined SIGSEGV || defined SIGBUS || defined SIGILL || defined SIGFPE
 static const char *received_signal;
-# define clear_received_signal() (void)(ruby_disable_gc = 0, received_signal = 0)
+# define clear_received_signal() do { \
+    if (GET_VM() != NULL) rb_gc_enable(); \
+    received_signal = 0; \
+} while (0)
 #else
 # define clear_received_signal() ((void)0)
 #endif
 
 #if defined(USE_SIGALTSTACK) || defined(_WIN32)
-NORETURN(void rb_ec_stack_overflow(rb_execution_context_t *ec, int crit));
 # if defined __HAIKU__
 #   define USE_UCONTEXT_REG 1
 # elif !(defined(HAVE_UCONTEXT_H) && (defined __i386__ || defined __x86_64__ || defined __amd64__))
@@ -797,7 +815,8 @@ check_stack_overflow(int sig, const uintptr_t addr, const ucontext_t *ctx)
     const greg_t bp = mctx->gregs[REG_EBP];
 #   endif
 # elif defined __APPLE__
-#   if __DARWIN_UNIX03
+#   include <AvailabilityMacros.h>
+#   if defined(MAC_OS_X_VERSION_10_5) && MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5
 #     define MCTX_SS_REG(reg) __ss.__##reg
 #   else
 #     define MCTX_SS_REG(reg) ss.reg
@@ -836,13 +855,17 @@ check_stack_overflow(int sig, const uintptr_t addr, const ucontext_t *ctx)
     if (sp_page == fault_page || sp_page == fault_page + 1 ||
         (sp_page <= fault_page && fault_page <= bp_page)) {
         rb_execution_context_t *ec = GET_EC();
-        int crit = FALSE;
+        ruby_stack_overflow_critical_level crit = rb_stack_overflow_signal;
         int uplevel = roomof(pagesize, sizeof(*ec->tag)) / 2; /* XXX: heuristic */
         while ((uintptr_t)ec->tag->buf / pagesize <= fault_page + 1) {
             /* drop the last tag if it is close to the fault,
              * otherwise it can cause stack overflow again at the same
              * place. */
-            if ((crit = (!ec->tag->prev || !--uplevel)) != FALSE) break;
+            if (!ec->tag->prev || !--uplevel) {
+                crit = rb_stack_overflow_fatal;
+                break;
+            }
+            rb_vm_tag_jmpbuf_deinit(&ec->tag->buf);
             ec->tag = ec->tag->prev;
         }
         reset_sigmask(sig);
@@ -857,20 +880,23 @@ check_stack_overflow(int sig, const void *addr)
     rb_thread_t *th = GET_THREAD();
     if (ruby_stack_overflowed_p(th, addr)) {
         reset_sigmask(sig);
-        rb_ec_stack_overflow(th->ec, FALSE);
+        rb_ec_stack_overflow(th->ec, 1);
     }
 }
 # endif
+
 # ifdef _WIN32
 #   define CHECK_STACK_OVERFLOW() check_stack_overflow(sig, 0)
 # else
 #   define FAULT_ADDRESS info->si_addr
 #   ifdef USE_UCONTEXT_REG
-#     define CHECK_STACK_OVERFLOW() check_stack_overflow(sig, (uintptr_t)FAULT_ADDRESS, ctx)
+#     define CHECK_STACK_OVERFLOW_() check_stack_overflow(sig, (uintptr_t)FAULT_ADDRESS, ctx)
 #   else
-#     define CHECK_STACK_OVERFLOW() check_stack_overflow(sig, FAULT_ADDRESS)
+#     define CHECK_STACK_OVERFLOW_() check_stack_overflow(sig, FAULT_ADDRESS)
 #   endif
 #   define MESSAGE_FAULT_ADDRESS " at %p", FAULT_ADDRESS
+#   define SIGNAL_FROM_USER_P() ((info)->si_code == SI_USER)
+#   define CHECK_STACK_OVERFLOW() (SIGNAL_FROM_USER_P() ? (void)0 : CHECK_STACK_OVERFLOW_())
 # endif
 #else
 # define CHECK_STACK_OVERFLOW() (void)0
@@ -962,7 +988,7 @@ check_reserved_signal_(const char *name, size_t name_len, int signo)
     if (prev) {
         ssize_t RB_UNUSED_VAR(err);
         static const int stderr_fd = 2;
-#define NOZ(name, str) name[sizeof(str)-1] = str
+#define NOZ(name, str) RBIMPL_ATTR_NONSTRING() name[sizeof(str)-1] = str
         static const char NOZ(msg1, " received in ");
         static const char NOZ(msg2, " handler\n");
 
@@ -991,7 +1017,9 @@ check_reserved_signal_(const char *name, size_t name_len, int signo)
         ruby_abort();
     }
 
-    ruby_disable_gc = 1;
+    if (GET_VM() != NULL) {
+        rb_gc_disable_no_rest();
+    }
 }
 #endif
 
@@ -1487,6 +1515,12 @@ Init_signal(void)
     rb_define_method(rb_eSignal, "signo", esignal_signo, 0);
     rb_alias(rb_eSignal, rb_intern_const("signm"), rb_intern_const("message"));
     rb_define_method(rb_eInterrupt, "initialize", interrupt_init, -1);
+#if !defined(POSIX_SIGNAL) && !defined(SIG_GET)
+    rb_native_mutex_initialize(&sig_check_lock);
+#endif
+
+    // It should be ready to call rb_signal_exec()
+    VM_ASSERT(GET_THREAD()->pending_interrupt_queue);
 
     /* At this time, there is no subthread. Then sigmask guarantee atomics. */
     rb_disable_interrupt();
@@ -1537,20 +1571,10 @@ Init_signal(void)
     rb_enable_interrupt();
 }
 
-#if defined(HAVE_GRANTPT)
-extern int grantpt(int);
-#else
-static int
-fake_grantfd(int masterfd)
+void
+rb_signal_atfork(void)
 {
-    errno = ENOSYS;
-    return -1;
-}
-#define grantpt(fd) fake_grantfd(fd)
+#if defined(HAVE_WORKING_FORK) && !defined(POSIX_SIGNAL) && !defined(SIG_GET)
+    rb_native_mutex_initialize(&sig_check_lock);
 #endif
-
-int
-rb_grantpt(int masterfd)
-{
-    return grantpt(masterfd);
 }
diff --git a/siphash.c b/siphash.c
index 61b8604fc9df8c..62de6227786160 100644
--- a/siphash.c
+++ b/siphash.c
@@ -140,6 +140,9 @@ xor64_to(uint64_t *v, const uint64_t s)
 #endif
 
 static const union {
+#if defined(__has_attribute) && __has_attribute(nonstring)
+    __attribute__((nonstring))
+#endif
     char bin[32];
     uint64_t u64[4];
 } sip_init_state_bin = {"uespemos""modnarod""arenegyl""setybdet"};
diff --git a/spec/bin/bundle b/spec/bin/bundle
new file mode 100755
index 00000000000000..8f8b5352951537
--- /dev/null
+++ b/spec/bin/bundle
@@ -0,0 +1,6 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+require_relative "../bundler/support/activate"
+
+load File.expand_path("bundle", Spec::Path.exedir)
diff --git a/spec/bin/parallel_rspec b/spec/bin/parallel_rspec
new file mode 100755
index 00000000000000..412defa58b94c0
--- /dev/null
+++ b/spec/bin/parallel_rspec
@@ -0,0 +1,7 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+require_relative "../bundler/support/setup"
+
+require "turbo_tests"
+TurboTests::CLI.new(ARGV).run
diff --git a/spec/bin/rspec b/spec/bin/rspec
new file mode 100755
index 00000000000000..1f61e3c64c74e0
--- /dev/null
+++ b/spec/bin/rspec
@@ -0,0 +1,6 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+require_relative "../bundler/support/rubygems_ext"
+
+Spec::Rubygems.gem_load("rspec-core", "rspec")
diff --git a/spec/bundled_gems.mspec b/spec/bundled_gems.mspec
new file mode 100644
index 00000000000000..f7edb34c7596dc
--- /dev/null
+++ b/spec/bundled_gems.mspec
@@ -0,0 +1,14 @@
+load File.dirname(__FILE__) + '/default.mspec'
+
+class MSpecScript
+  test_bundled_gems = get(:stdlibs).to_a & get(:bundled_gems).to_a
+  unless ENV["BUNDLED_GEMS"].nil? || ENV["BUNDLED_GEMS"].empty?
+    test_bundled_gems = ENV["BUNDLED_GEMS"].split(",").map do |gem|
+      gem = "openstruct" if gem == "ostruct"
+      test_bundled_gems.find{|test_gem| test_gem.include?(gem) }
+    end.compact
+    exit if test_bundled_gems.empty?
+  end
+  set :library, test_bundled_gems
+  set :files, get(:library)
+end
diff --git a/spec/bundled_gems_spec.rb b/spec/bundled_gems_spec.rb
new file mode 100644
index 00000000000000..c362881850f775
--- /dev/null
+++ b/spec/bundled_gems_spec.rb
@@ -0,0 +1,403 @@
+require "bundled_gems"
+
+require "bundler"
+require "fileutils"
+
+require_relative "bundler/support/builders"
+require_relative "bundler/support/helpers"
+require_relative "bundler/support/path"
+
+module Gem
+  def self.ruby=(ruby)
+    @ruby = ruby
+  end
+end
+
+RSpec.configure do |config|
+  config.include Spec::Builders
+  config.include Spec::Helpers
+  config.include Spec::Path
+
+  config.before(:suite) do
+    Gem.ruby = ENV["RUBY"] if ENV["RUBY"]
+
+    require_relative "bundler/support/rubygems_ext"
+    Spec::Rubygems.test_setup
+    Spec::Helpers.install_dev_bundler
+    FileUtils.mkdir_p Spec::Path.gem_path
+  end
+
+  config.around(:each) do |example|
+    FileUtils.cp_r Spec::Path.pristine_system_gem_path, Spec::Path.system_gem_path
+    FileUtils.mkdir_p Spec::Path.base_system_gem_path.join("gems")
+    %w[sinatra rack tilt rack-protection rack-session rack-test mustermann base64 logger compact_index].each do |gem|
+      path = Dir[File.expand_path("../.bundle/gems/#{gem}-*", __dir__)].map(&:to_s).first
+      FileUtils.cp_r path, Spec::Path.base_system_gem_path.join("gems")
+    end
+
+    with_gem_path_as(system_gem_path) do
+      Bundler.ui.silence { example.run }
+
+      all_output = all_commands_output
+      if example.exception && !all_output.empty?
+        message = all_output + "\n" + example.exception.message
+        (class << example.exception; self; end).send(:define_method, :message) do
+          message
+        end
+      end
+    end
+  ensure
+    reset!
+  end
+
+  config.after :suite do
+    FileUtils.rm_rf Spec::Path.pristine_system_gem_path
+  end
+end
+
+RSpec.describe "bundled_gems.rb" do
+  let(:stub_code) {
+    <<~STUB
+      Gem::BUNDLED_GEMS.send(:remove_const, :LIBDIR)
+      Gem::BUNDLED_GEMS.send(:remove_const, :ARCHDIR)
+      Gem::BUNDLED_GEMS.send(:remove_const, :SINCE)
+      Gem::BUNDLED_GEMS.const_set(:LIBDIR, File.expand_path(File.join(__dir__, "../../..", "lib")) + "/")
+      Gem::BUNDLED_GEMS.const_set(:ARCHDIR, File.expand_path($LOAD_PATH.find{|path| path.include?(".ext/common") }) + "/")
+      Gem::BUNDLED_GEMS.const_set(:SINCE, { "openssl" => RUBY_VERSION, "fileutils" => RUBY_VERSION, "csv" => "3.4.0", "net-smtp" => "3.1.0" })
+    STUB
+  }
+
+  def script(code, options = {})
+    options[:artifice] ||= "compact_index"
+    code = <<~RUBY
+      #{stub_code}
+      require 'bundler/inline'
+
+      #{code}
+    RUBY
+    ruby(code, options)
+  end
+
+  it "Show warning require and LoadError" do
+    script <<-RUBY
+      gemfile do
+        source "https://rubygems.org"
+      end
+
+      begin
+        require "csv"
+      rescue LoadError
+      end
+      require "openssl"
+    RUBY
+
+    expect(err).to include(/csv used to be loaded from (.*) since Ruby 3.4.0/)
+    expect(err).to include(/-e:15/)
+    expect(err).to include(/openssl used to be loaded from (.*) since Ruby #{RUBY_VERSION}/)
+    expect(err).to include(/-e:18/)
+  end
+
+  it "Show warning when bundled gems called as dependency" do
+    build_lib "activesupport", "7.0.7.2" do |s|
+      s.write "lib/active_support/all.rb", "require 'openssl'"
+    end
+
+    script <<-RUBY, env: { "BUNDLER_SPEC_GEM_REPO" => gem_repo1.to_s }
+      gemfile do
+        source "https://gem.repo1"
+        path "#{lib_path}" do
+          gem "activesupport", "7.0.7.2"
+        end
+      end
+
+      require "active_support/all"
+    RUBY
+
+    expect(err).to include(/openssl used to be loaded from (.*) since Ruby 3.5.0/)
+    expect(err).to include(/lib\/active_support\/all\.rb:1/)
+  end
+
+  it "Show warning dash gem like net/smtp" do
+    script <<-RUBY
+      gemfile do
+        source "https://rubygems.org"
+      end
+
+      begin
+        require "net/smtp"
+      rescue LoadError
+      end
+    RUBY
+
+    expect(err).to include(/net\/smtp used to be loaded from (.*) since Ruby 3.1.0/)
+    expect(err).to include(/-e:15/)
+    expect(err).to include("You can add net-smtp")
+  end
+
+  it "Show warning sub-feature like openssl/bn" do
+    skip "This test is not working on Windows" if Gem.win_platform?
+
+    script <<-RUBY
+      gemfile do
+        source "https://rubygems.org"
+      end
+
+      require "openssl/bn"
+    RUBY
+
+    expect(err).to include(/openssl\/bn is found in openssl, (.*) part of the default gems since Ruby #{RUBY_VERSION}/)
+    expect(err).to include(/-e:14/)
+  end
+
+  it "Show warning when bundle exec with ruby and script" do
+    code = <<-RUBY
+      #{stub_code}
+      require "openssl"
+    RUBY
+    create_file("script.rb", code)
+    create_file("Gemfile", "source 'https://rubygems.org'")
+
+    bundle "exec ruby script.rb"
+
+    expect(err).to include(/openssl used to be loaded from (.*) since Ruby 3.5.0/)
+    expect(err).to include(/script\.rb:8/)
+  end
+
+  it "Show warning when bundle exec with shebang's script" do
+    skip "This test is not working on Windows" if Gem.win_platform?
+
+    code = <<-RUBY
+      #!/usr/bin/env ruby
+      #{stub_code}
+      require "openssl"
+    RUBY
+    create_file("script.rb", code)
+    FileUtils.chmod(0o777, bundled_app("script.rb"))
+    create_file("Gemfile", "source 'https://rubygems.org'")
+
+    bundle "exec ./script.rb"
+
+    expect(err).to include(/openssl used to be loaded from (.*) since Ruby 3.5.0/)
+    expect(err).to include(/script\.rb:9/)
+  end
+
+  it "Show warning when bundle exec with -r option" do
+    create_file("stub.rb", stub_code)
+    create_file("Gemfile", "source 'https://rubygems.org'")
+    bundle "exec ruby -r./stub -ropenssl -e ''"
+
+    expect(err).to include(/openssl used to be loaded from (.*) since Ruby 3.5.0/)
+  end
+
+  it "Show warning when warn is not the standard one in the current scope" do
+    script <<-RUBY
+      module My
+        def warn(msg)
+        end
+
+        def my
+          gemfile do
+            source "https://rubygems.org"
+          end
+
+          require "openssl"
+        end
+
+        extend self
+      end
+
+      My.my
+    RUBY
+
+    expect(err).to include(/openssl used to be loaded from (.*) since Ruby 3.5.0/)
+    expect(err).to include(/-e:19/)
+  end
+
+  it "Don't show warning when bundled gems called as dependency" do
+    build_lib "activesupport", "7.0.7.2" do |s|
+      s.write "lib/active_support/all.rb", "require 'openssl'"
+    end
+    build_lib "openssl", "1.0.0" do |s|
+      s.write "lib/openssl.rb", "puts 'openssl'"
+    end
+
+    script <<-RUBY, env: { "BUNDLER_SPEC_GEM_REPO" => gem_repo1.to_s }
+      gemfile do
+        source "https://gem.repo1"
+        path "#{lib_path}" do
+          gem "activesupport", "7.0.7.2"
+          gem "openssl"
+        end
+      end
+
+      require "active_support/all"
+    RUBY
+
+    expect(err).to be_empty
+  end
+
+  it "Show warning with bootsnap cases" do
+    script <<-RUBY
+      gemfile do
+        source "https://rubygems.org"
+        # gem "bootsnap", require: false
+      end
+
+      # require 'bootsnap'
+      # Bootsnap.setup(cache_dir: 'tmp/cache')
+
+      # bootsnap expand required feature to full path
+      # require 'openssl'
+      require Gem::BUNDLED_GEMS::ARCHDIR + 'openssl'
+    RUBY
+
+    expect(err).to include(/openssl used to be loaded from (.*) since Ruby 3.5.0/)
+    # TODO: We should assert caller location like below:
+    # test_warn_bootsnap.rb:14: warning: ...
+  end
+
+  it "Show warning with bootsnap for gem with native extension" do
+    script <<-RUBY
+      gemfile do
+        source "https://rubygems.org"
+        # gem "bootsnap", require: false
+      end
+
+      # require 'bootsnap'
+      # Bootsnap.setup(cache_dir: 'tmp/cache')
+
+      # bootsnap expand required feature to full path
+      # require 'openssl'
+      require Gem::BUNDLED_GEMS::ARCHDIR + "openssl"
+    RUBY
+
+    expect(err).to include(/openssl used to be loaded from (.*) since Ruby #{RUBY_VERSION}/)
+    # TODO: We should assert caller location like below:
+    # test_warn_bootsnap_rubyarchdir_gem.rb:14: warning: ...
+  end
+
+  it "Show warning with bootsnap and some gem in Gemfile" do
+    # Original issue is childprocess 5.0.0 and logger.
+    build_lib "fileutils2", "5.0.0" do |s|
+      # bootsnap expand required feature to full path
+      rubylibpath = File.expand_path(File.join(__dir__, "..", "lib"))
+      s.write "lib/fileutils2.rb", "require '#{rubylibpath}/fileutils'"
+    end
+
+    script <<-RUBY
+      gemfile do
+        source "https://rubygems.org"
+        # gem "bootsnap", require: false
+        path "#{lib_path}" do
+          gem "fileutils2", "5.0.0"
+        end
+      end
+
+      # require 'bootsnap'
+      # Bootsnap.setup(cache_dir: 'tmp/cache')
+
+      # bootsnap expand required feature to full path
+      require Gem.loaded_specs["fileutils2"].full_gem_path + '/lib/fileutils2'
+    RUBY
+
+    expect(err).to include(/fileutils used to be loaded from (.*) since Ruby #{RUBY_VERSION}/)
+    # TODO: We should assert caller location like below:
+    # $GEM_HOME/gems/childprocess-5.0.0/lib/childprocess.rb:7: warning:
+  end
+
+  it "Show warning with zeitwerk" do
+    libpath = Dir[File.expand_path("../.bundle/gems/{zeitwerk}-*/lib", __dir__)].map(&:to_s).first
+    code = <<-RUBY
+      #{stub_code}
+      $LOAD_PATH.unshift("#{libpath}")
+      require "zeitwerk"
+      loader = Zeitwerk::Loader.for_gem(warn_on_extra_files: false)
+      loader.setup
+
+      require 'openssl'
+    RUBY
+    create_file("script.rb", code)
+    create_file("Gemfile", "source 'https://rubygems.org'")
+    bundle "exec ruby script.rb"
+
+    expect(err).to include(/openssl used to be loaded from (.*) since Ruby 3.5.0/)
+    expect(err).to include(/script\.rb:13/)
+  end
+
+  it "Don't show warning openssl/bn when openssl on Gemfile" do
+    build_lib "openssl", "1.0.0" do |s|
+      s.write "lib/openssl.rb", "puts 'openssl'"
+      s.write "lib/openssl/bn.rb", "puts 'openssl/bn'"
+    end
+
+    script <<-RUBY, env: { "BUNDLER_SPEC_GEM_REPO" => gem_repo1.to_s }
+      gemfile do
+        source "https://gem.repo1"
+        path "#{lib_path}" do
+          gem "openssl"
+        end
+      end
+
+      require "openssl/bn"
+    RUBY
+
+    expect(err).to be_empty
+  end
+
+  it "Don't show warning with net/smtp when net-smtp on Gemfile" do
+    build_lib "net-smtp", "1.0.0" do |s|
+      s.write "lib/net/smtp.rb", "puts 'net-smtp'"
+    end
+
+    script <<-RUBY, env: { "BUNDLER_SPEC_GEM_REPO" => gem_repo1.to_s }
+      gemfile do
+        source "https://gem.repo1"
+        path "#{lib_path}" do
+          gem "net-smtp"
+        end
+      end
+
+      require "net/smtp"
+    RUBY
+
+    expect(err).to be_empty
+  end
+
+  describe ".force_activate" do
+    before do
+      allow_any_instance_of(Bundler::Runtime).to receive(:setup).and_raise(Bundler::GemNotFound)
+    end
+
+    context "with bundle environment" do
+      before do
+        code = <<-RUBY
+          #!/usr/bin/env ruby
+
+          Gem::BUNDLED_GEMS.force_activate("csv")
+        RUBY
+        create_file("script.rb", code)
+        create_file("Gemfile", "source 'https://rubygems.org'")
+      end
+
+      it "lockfile is available" do
+        bundle "install"
+        bundle "exec ./script.rb"
+
+        expect(err).to include("gem install csv")
+      end
+
+      it "lockfile is not available" do
+        bundle "exec ./script.rb"
+
+        expect(err).to include("gem install csv")
+      end
+    end
+
+    context "without bundle environment" do
+      it "warns about installation requirement" do
+        expect_any_instance_of(Object).to receive(:warn)
+        Gem::BUNDLED_GEMS.force_activate("csv")
+      end
+    end
+  end
+end
diff --git a/spec/bundler/bundler/build_metadata_spec.rb b/spec/bundler/bundler/build_metadata_spec.rb
index afa2d1716fb390..2e69821f68fc7a 100644
--- a/spec/bundler/bundler/build_metadata_spec.rb
+++ b/spec/bundler/bundler/build_metadata_spec.rb
@@ -6,18 +6,20 @@
 RSpec.describe Bundler::BuildMetadata do
   before do
     allow(Time).to receive(:now).and_return(Time.at(0))
-    Bundler::BuildMetadata.instance_variable_set(:@built_at, nil)
+    Bundler::BuildMetadata.instance_variable_set(:@timestamp, nil)
   end
 
-  describe "#built_at" do
-    it "returns %Y-%m-%d formatted time" do
-      expect(Bundler::BuildMetadata.built_at).to eq "1970-01-01"
+  describe "#timestamp" do
+    it "returns %Y-%m-%d formatted current time if built_at not set" do
+      Bundler::BuildMetadata.instance_variable_set(:@built_at, nil)
+      expect(Bundler::BuildMetadata.timestamp).to eq "1970-01-01"
     end
-  end
 
-  describe "#release?" do
-    it "returns false as default" do
-      expect(Bundler::BuildMetadata.release?).to be_falsey
+    it "returns %Y-%m-%d formatted current time if built_at not set" do
+      Bundler::BuildMetadata.instance_variable_set(:@built_at, "2025-01-01")
+      expect(Bundler::BuildMetadata.timestamp).to eq "2025-01-01"
+    ensure
+      Bundler::BuildMetadata.instance_variable_set(:@built_at, nil)
     end
   end
 
@@ -40,10 +42,9 @@
   describe "#to_h" do
     subject { Bundler::BuildMetadata.to_h }
 
-    it "returns a hash includes Built At, Git SHA and Released Version" do
-      expect(subject["Built At"]).to eq "1970-01-01"
+    it "returns a hash includes Timestamp, and Git SHA" do
+      expect(subject["Timestamp"]).to eq "1970-01-01"
       expect(subject["Git SHA"]).to be_instance_of(String)
-      expect(subject["Released Version"]).to be_falsey
     end
   end
 end
diff --git a/spec/bundler/bundler/bundler_spec.rb b/spec/bundler/bundler/bundler_spec.rb
index f4c1664620a05d..4db8c00e5227ea 100644
--- a/spec/bundler/bundler/bundler_spec.rb
+++ b/spec/bundler/bundler/bundler_spec.rb
@@ -7,7 +7,7 @@
   describe "#load_marshal" do
     it "is a private method and raises an error" do
       data = Marshal.dump(Bundler)
-      expect { Bundler.load_marshal(data) }.to raise_error(NoMethodError, /private method `load_marshal' called/)
+      expect { Bundler.load_marshal(data) }.to raise_error(NoMethodError, /private method [`']load_marshal' called/)
     end
 
     it "loads any data" do
@@ -23,7 +23,7 @@
     end
 
     it "loads simple structure" do
-      simple_structure = { "name" => [:abc] }
+      simple_structure = { "name" => [:development] }
       data = Marshal.dump(simple_structure)
       expect(Bundler.safe_load_marshal(data)).to eq(simple_structure)
     end
@@ -88,7 +88,7 @@
       end
     end
 
-    context "with correct YAML file", :if => defined?(Encoding) do
+    context "with correct YAML file", if: defined?(Encoding) do
       it "can load a gemspec with unicode characters with default ruby encoding" do
         # spec_helper forces the external encoding to UTF-8 but that's not the
         # default until Ruby 2.0
@@ -139,7 +139,7 @@
             end
           GEMSPEC
         end
-        expect(Bundler.rubygems).to receive(:validate).with have_attributes(:name => "validated")
+        expect(Bundler.rubygems).to receive(:validate).with have_attributes(name: "validated")
         subject
       end
     end
@@ -164,53 +164,36 @@
   end
 
   describe "#which" do
-    let(:executable) { "executable" }
+    it "can detect relative path" do
+      script_path = bundled_app("tmp/test_command")
+      create_file(script_path, "#!/usr/bin/env ruby\n")
 
-    let(:path) do
-      if Gem.win_platform?
-        %w[C:/a C:/b C:/c C:/../d C:/e]
-      else
-        %w[/a /b c ../d /e]
+      result = Dir.chdir script_path.dirname.dirname do
+        Bundler.which("test_command")
       end
-    end
-
-    let(:expected) { "executable" }
+      expect(result).to eq(nil)
 
-    before do
-      ENV["PATH"] = path.join(File::PATH_SEPARATOR)
-
-      allow(File).to receive(:file?).and_return(false)
-      allow(File).to receive(:executable?).and_return(false)
-      if expected
-        expect(File).to receive(:file?).with(expected).and_return(true)
-        expect(File).to receive(:executable?).with(expected).and_return(true)
+      result = Dir.chdir script_path.dirname do
+        Bundler.which("test_command")
       end
-    end
 
-    subject { described_class.which(executable) }
-
-    shared_examples_for "it returns the correct executable" do
-      it "returns the expected file" do
-        expect(subject).to eq(expected)
-      end
+      expect(result).to eq("test_command") unless Gem.win_platform?
+      expect(result).to eq("test_command.bat") if Gem.win_platform?
     end
 
-    it_behaves_like "it returns the correct executable"
+    it "can detect absolute path" do
+      create_file("test_command", "#!/usr/bin/env ruby\n")
 
-    context "when the executable in inside a quoted path" do
-      let(:expected) do
-        if Gem.win_platform?
-          "C:/e/executable"
-        else
-          "/e/executable"
-        end
-      end
-      it_behaves_like "it returns the correct executable"
+      ENV["PATH"] = bundled_app("test_command").parent.to_s
+
+      result = Bundler.which("test_command")
+      expect(result).to eq(bundled_app("test_command").to_s) unless Gem.win_platform?
+      expect(result).to eq(bundled_app("test_command.bat").to_s) if Gem.win_platform?
     end
 
-    context "when the executable is not found" do
-      let(:expected) { nil }
-      it_behaves_like "it returns the correct executable"
+    it "returns nil when not found" do
+      result = Bundler.which("test_command")
+      expect(result).to eq(nil)
     end
   end
 
@@ -224,35 +207,17 @@
     end
   end
 
-  describe "#rm_rf" do
-    context "the directory is world writable" do
-      let(:bundler_ui) { Bundler.ui }
-      it "should raise a friendly error" do
-        allow(File).to receive(:exist?).and_return(true)
-        allow(::Bundler::FileUtils).to receive(:remove_entry_secure).and_raise(ArgumentError)
-        allow(File).to receive(:world_writable?).and_return(true)
-        message = <<EOF
-It is a security vulnerability to allow your home directory to be world-writable, and bundler cannot continue.
-You should probably consider fixing this issue by running `chmod o-w ~` on *nix.
-Please refer to https://ruby-doc.org/stdlib-3.1.2/libdoc/fileutils/rdoc/FileUtils.html#method-c-remove_entry_secure for details.
-EOF
-        expect(bundler_ui).to receive(:warn).with(message)
-        expect { Bundler.send(:rm_rf, bundled_app) }.to raise_error(Bundler::PathError)
-      end
-    end
-  end
-
   describe "#mkdir_p" do
     it "creates a folder at the given path" do
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
-        gem "rack"
+        source "https://gem.repo1"
+        gem "myrack"
       G
 
       allow(Bundler).to receive(:root).and_return(bundled_app)
 
-      Bundler.mkdir_p(bundled_app.join("foo", "bar"))
-      expect(bundled_app.join("foo", "bar")).to exist
+      Bundler.mkdir_p(bundled_app("foo", "bar"))
+      expect(bundled_app("foo", "bar")).to exist
     end
   end
 
@@ -285,6 +250,7 @@
         it "should issue a warning and return a temporary user home" do
           allow(Bundler.rubygems).to receive(:user_home).and_return(path)
           allow(File).to receive(:directory?).with(path).and_return true
+          allow(File).to receive(:writable?).and_call_original
           allow(File).to receive(:writable?).with(path).and_return false
           allow(File).to receive(:directory?).with(dotbundle).and_return false
           allow(Bundler).to receive(:tmp).and_return(Pathname.new("/tmp/trulyrandom"))
diff --git a/spec/bundler/bundler/ci_detector_spec.rb b/spec/bundler/bundler/ci_detector_spec.rb
new file mode 100644
index 00000000000000..299d8005e8febc
--- /dev/null
+++ b/spec/bundler/bundler/ci_detector_spec.rb
@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+RSpec.describe Bundler::CIDetector do
+  # This is properly tested in rubygems, under the name Gem::CIDetector
+  # But the test that confirms that our version _stays in sync_ with that version
+  # will live here.
+
+  it "stays in sync with the rubygems implementation" do
+    rubygems_implementation_path = File.join(git_root, "lib", "rubygems", "ci_detector.rb")
+    expect(File.exist?(rubygems_implementation_path)).to be_truthy
+    rubygems_code = File.read(rubygems_implementation_path)
+    denamespaced_rubygems_code = rubygems_code.sub("Gem", "NAMESPACE")
+
+    bundler_implementation_path = File.join(source_lib_dir, "bundler", "ci_detector.rb")
+    expect(File.exist?(bundler_implementation_path)).to be_truthy
+    bundler_code = File.read(bundler_implementation_path)
+    denamespaced_bundler_code = bundler_code.sub("Bundler", "NAMESPACE")
+
+    expect(denamespaced_bundler_code).to eq(denamespaced_rubygems_code)
+  end
+end
diff --git a/spec/bundler/bundler/cli_spec.rb b/spec/bundler/bundler/cli_spec.rb
index b752cd7e703ad3..41cd8c636d4041 100644
--- a/spec/bundler/bundler/cli_spec.rb
+++ b/spec/bundler/bundler/cli_spec.rb
@@ -4,12 +4,12 @@
 
 RSpec.describe "bundle executable" do
   it "returns non-zero exit status when passed unrecognized options" do
-    bundle "--invalid_argument", :raise_on_error => false
+    bundle "--invalid_argument", raise_on_error: false
     expect(exitstatus).to_not be_zero
   end
 
   it "returns non-zero exit status when passed unrecognized task" do
-    bundle "unrecognized-task", :raise_on_error => false
+    bundle "unrecognized-task", raise_on_error: false
     expect(exitstatus).to_not be_zero
   end
 
@@ -87,7 +87,7 @@ def out_with_macos_man_workaround
   end
 
   context "with no arguments" do
-    it "prints a concise help message", :bundler => "3" do
+    it "prints a concise help message", bundler: "4" do
       bundle ""
       expect(err).to be_empty
       expect(out).to include("Bundler version #{Bundler::VERSION}").
@@ -101,31 +101,45 @@ def out_with_macos_man_workaround
   context "when ENV['BUNDLE_GEMFILE'] is set to an empty string" do
     it "ignores it" do
       gemfile bundled_app_gemfile, <<-G
-        source "#{file_uri_for(gem_repo1)}"
-        gem 'rack'
+        source "https://gem.repo1"
+        gem 'myrack'
       G
 
-      bundle :install, :env => { "BUNDLE_GEMFILE" => "" }
+      bundle :install, env: { "BUNDLE_GEMFILE" => "" }
 
-      expect(the_bundle).to include_gems "rack 1.0.0"
+      expect(the_bundle).to include_gems "myrack 1.0.0"
     end
   end
 
   context "with --verbose" do
+    before do
+      gemfile "source 'https://gem.repo1'"
+    end
+
     it "prints the running command" do
-      gemfile "source \"#{file_uri_for(gem_repo1)}\""
-      bundle "info bundler", :verbose => true
+      bundle "info bundler", verbose: true
       expect(out).to start_with("Running `bundle info bundler --verbose` with bundler #{Bundler::VERSION}")
-    end
 
-    it "doesn't print defaults" do
-      install_gemfile "source \"#{file_uri_for(gem_repo1)}\"", :verbose => true
+      bundle "install", verbose: true
       expect(out).to start_with("Running `bundle install --verbose` with bundler #{Bundler::VERSION}")
     end
 
-    it "doesn't print defaults" do
-      install_gemfile "source \"#{file_uri_for(gem_repo1)}\"", :verbose => true
-      expect(out).to start_with("Running `bundle install --verbose` with bundler #{Bundler::VERSION}")
+    it "prints the simulated version too when setting is enabled" do
+      bundle "config simulate_version 4", verbose: true
+      bundle "info bundler", verbose: true
+      expect(out).to start_with("Running `bundle info bundler --verbose` with bundler #{Bundler::VERSION} (simulating Bundler 4)")
+    end
+  end
+
+  context "with verbose configuration" do
+    before do
+      bundle "config verbose true"
+    end
+
+    it "prints the running command" do
+      gemfile "source 'https://gem.repo1'"
+      bundle "info bundler"
+      expect(out).to start_with("Running `bundle info bundler` with bundler #{Bundler::VERSION}")
     end
   end
 
@@ -133,13 +147,13 @@ def out_with_macos_man_workaround
     let(:run_command) do
       bundle "install"
 
-      bundle "outdated #{flags}", :raise_on_error => false
+      bundle "outdated #{flags}", raise_on_error: false
     end
 
     before do
       gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
-        gem "rack", '0.9.1'
+        source "https://gem.repo1"
+        gem "myrack", '0.9.1'
       G
     end
 
@@ -149,8 +163,8 @@ def out_with_macos_man_workaround
       it "prints a message when there are outdated gems" do
         run_command
 
-        expect(out).to include("Gem   Current  Latest  Requested  Groups")
-        expect(out).to include("rack  0.9.1    1.0.0   = 0.9.1    default")
+        expect(out).to include("Gem     Current  Latest  Requested  Groups")
+        expect(out).to include("myrack  0.9.1    1.0.0   = 0.9.1    default")
       end
     end
 
@@ -160,7 +174,7 @@ def out_with_macos_man_workaround
       it "prints a message when there are outdated gems" do
         run_command
 
-        expect(out).to include("rack (newest 1.0.0, installed 0.9.1, requested = 0.9.1)")
+        expect(out).to include("myrack (newest 1.0.0, installed 0.9.1, requested = 0.9.1)")
       end
     end
 
@@ -170,7 +184,7 @@ def out_with_macos_man_workaround
       it "prints a simplified message when there are outdated gems" do
         run_command
 
-        expect(out).to include("rack (newest 1.0.0, installed 0.9.1, requested = 0.9.1)")
+        expect(out).to include("myrack (newest 1.0.0, installed 0.9.1, requested = 0.9.1)")
       end
     end
   end
@@ -178,8 +192,8 @@ def out_with_macos_man_workaround
   describe "printing the outdated warning" do
     shared_examples_for "no warning" do
       it "prints no warning" do
-        bundle "fail", :env => { "BUNDLER_VERSION" => bundler_version }, :raise_on_error => false
-        expect(last_command.stdboth).to eq("Could not find command \"fail\".")
+        bundle "fail", env: { "BUNDLER_VERSION" => bundler_version }, raise_on_error: false
+        expect(stdboth).to eq("Could not find command \"fail\".")
       end
     end
 
@@ -213,7 +227,7 @@ def out_with_macos_man_workaround
     context "when the latest version is greater than the current version" do
       let(:latest_version) { "222.0" }
       it "prints the version warning" do
-        bundle "fail", :env => { "BUNDLER_VERSION" => bundler_version }, :raise_on_error => false
+        bundle "fail", env: { "BUNDLER_VERSION" => bundler_version }, raise_on_error: false
         expect(err).to start_with(<<-EOS.strip)
 The latest bundler is #{latest_version}, but you are currently running #{bundler_version}.
 To update to the most recent version, run `bundle update --bundler`
@@ -221,24 +235,24 @@ def out_with_macos_man_workaround
       end
 
       context "and disable_version_check is set" do
-        before { bundle "config set disable_version_check true", :env => { "BUNDLER_VERSION" => bundler_version } }
+        before { bundle "config set disable_version_check true", env: { "BUNDLER_VERSION" => bundler_version } }
         include_examples "no warning"
       end
 
       context "running a parseable command" do
         it "prints no warning" do
-          bundle "config get --parseable foo", :env => { "BUNDLER_VERSION" => bundler_version }
-          expect(last_command.stdboth).to eq ""
+          bundle "config get --parseable foo", env: { "BUNDLER_VERSION" => bundler_version }
+          expect(stdboth).to eq ""
 
-          bundle "platform --ruby", :env => { "BUNDLER_VERSION" => bundler_version }, :raise_on_error => false
-          expect(last_command.stdboth).to eq "Could not locate Gemfile"
+          bundle "platform --ruby", env: { "BUNDLER_VERSION" => bundler_version }, raise_on_error: false
+          expect(stdboth).to eq "Could not locate Gemfile"
         end
       end
 
       context "and is a pre-release" do
         let(:latest_version) { "222.0.0.pre.4" }
         it "prints the version warning" do
-          bundle "fail", :env => { "BUNDLER_VERSION" => bundler_version }, :raise_on_error => false
+          bundle "fail", env: { "BUNDLER_VERSION" => bundler_version }, raise_on_error: false
           expect(err).to start_with(<<-EOS.strip)
 The latest bundler is #{latest_version}, but you are currently running #{bundler_version}.
 To update to the most recent version, run `bundle update --bundler`
@@ -250,13 +264,12 @@ def out_with_macos_man_workaround
 end
 
 RSpec.describe "bundler executable" do
-  it "shows the bundler version just as the `bundle` executable does", :bundler => "< 3" do
+  it "shows the bundler version just as the `bundle` executable does" do
     bundler "--version"
     expect(out).to eq("Bundler version #{Bundler::VERSION}")
-  end
 
-  it "shows the bundler version just as the `bundle` executable does", :bundler => "3" do
+    bundle "config simulate_version 4"
     bundler "--version"
-    expect(out).to eq(Bundler::VERSION)
+    expect(out).to eq("#{Bundler::VERSION} (simulating Bundler 4)")
   end
 end
diff --git a/spec/bundler/bundler/compact_index_client/parser_spec.rb b/spec/bundler/bundler/compact_index_client/parser_spec.rb
new file mode 100644
index 00000000000000..1f6b9e593bcd14
--- /dev/null
+++ b/spec/bundler/bundler/compact_index_client/parser_spec.rb
@@ -0,0 +1,237 @@
+# frozen_string_literal: true
+
+require "bundler/compact_index_client"
+require "bundler/compact_index_client/parser"
+
+TestCompactIndexClient = Struct.new(:names, :versions, :info_data) do
+  # Requiring the checksum to match the input data helps ensure
+  # that we are parsing the correct checksum from the versions file
+  def info(name, checksum)
+    info_data.dig(name, checksum)
+  end
+
+  def set_info_data(name, value)
+    info_data[name] = value
+  end
+end
+
+RSpec.describe Bundler::CompactIndexClient::Parser do
+  subject(:parser) { described_class.new(compact_index) }
+
+  let(:compact_index) { TestCompactIndexClient.new(names, versions, info_data) }
+  let(:names) { "a\nb\nc\n" }
+  let(:versions) { <<~VERSIONS.dup }
+    created_at: 2024-05-01T00:00:04Z
+    ---
+    a 1.0.0,1.0.1,1.1.0 aaa111
+    b 2.0.0,2.0.0-java bbb222
+    c 3.0.0,3.0.3,3.3.3 ccc333
+    c -3.0.3 ccc333yanked
+  VERSIONS
+  let(:info_data) do
+    {
+      "a" => { "aaa111" => a_info },
+      "b" => { "bbb222" => b_info },
+      "c" => { "ccc333yanked" => c_info },
+    }
+  end
+  let(:a_info) { <<~INFO.dup }
+    ---
+    1.0.0 |checksum:aaa1,ruby:>= 3.0.0,rubygems:>= 3.2.3
+    1.0.1 |checksum:aaa2,ruby:>= 3.0.0,rubygems:>= 3.2.3
+    1.1.0 |checksum:aaa3,ruby:>= 3.0.0,rubygems:>= 3.2.3
+  INFO
+  let(:b_info) { <<~INFO }
+    2.0.0 a:~> 1.0&<= 3.0|checksum:bbb1
+    2.0.0-java a:~> 1.0&<= 3.0|checksum:bbb2
+  INFO
+  let(:c_info) { <<~INFO }
+    3.0.0 a:= 1.0.0,b:~> 2.0|checksum:ccc1,ruby:>= 2.7.0,rubygems:>= 3.0.0
+    3.3.3 a:>= 1.1.0,b:~> 2.0|checksum:ccc3,ruby:>= 3.0.0,rubygems:>= 3.2.3
+  INFO
+
+  describe "#available?" do
+    it "returns true versions are available" do
+      expect(parser).to be_available
+    end
+
+    it "returns true when versions has only one gem" do
+      compact_index.versions = +"a 1.0.0 aaa1\n"
+      expect(parser).to be_available
+    end
+
+    it "returns true when versions has a gem and a header" do
+      compact_index.versions = +"---\na 1.0.0 aaa1\n"
+      expect(parser).to be_available
+    end
+
+    it "returns true when versions has a gem and a header with header data" do
+      compact_index.versions = +"created_at: 2024-05-01T00:00:04Z\n---\na 1.0.0 aaa1\n"
+      expect(parser).to be_available
+    end
+
+    it "returns false when versions has only the header" do
+      compact_index.versions = +"---\n"
+      expect(parser).not_to be_available
+    end
+
+    it "returns false when versions has only the header with header data" do
+      compact_index.versions = +"created_at: 2024-05-01T00:00:04Z\n---\n"
+      expect(parser).not_to be_available
+    end
+
+    it "returns false when versions index is not available" do
+      compact_index.versions = nil
+      expect(parser).not_to be_available
+    end
+
+    it "returns false when versions is empty" do
+      compact_index.versions = +""
+      expect(parser).not_to be_available
+    end
+  end
+
+  describe "#names" do
+    it "returns the names" do
+      expect(parser.names).to eq(%w[a b c])
+    end
+
+    it "returns an empty array when names is empty" do
+      compact_index.names = ""
+      expect(parser.names).to eq([])
+    end
+
+    it "returns an empty array when names is not readable" do
+      compact_index.names = nil
+      expect(parser.names).to eq([])
+    end
+  end
+
+  describe "#versions" do
+    it "returns the versions" do
+      expect(parser.versions).to eq(
+        "a" => [
+          ["a", "1.0.0"],
+          ["a", "1.0.1"],
+          ["a", "1.1.0"],
+        ],
+        "b" => [
+          ["b", "2.0.0"],
+          ["b", "2.0.0", "java"],
+        ],
+        "c" => [
+          ["c", "3.0.0"],
+          ["c", "3.3.3"],
+        ],
+      )
+    end
+
+    it "returns an empty hash when versions is empty" do
+      compact_index.versions = ""
+      expect(parser.versions).to eq({})
+    end
+
+    it "returns an empty hash when versions is not readable" do
+      compact_index.versions = nil
+      expect(parser.versions).to eq({})
+    end
+  end
+
+  describe "#info" do
+    let(:a_result) do
+      [
+        [
+          "a",
+          "1.0.0",
+          nil,
+          [],
+          [["checksum", ["aaa1"]], ["ruby", [">= 3.0.0"]], ["rubygems", [">= 3.2.3"]]],
+        ],
+        [
+          "a",
+          "1.0.1",
+          nil,
+          [],
+          [["checksum", ["aaa2"]], ["ruby", [">= 3.0.0"]], ["rubygems", [">= 3.2.3"]]],
+        ],
+        [
+          "a",
+          "1.1.0",
+          nil,
+          [],
+          [["checksum", ["aaa3"]], ["ruby", [">= 3.0.0"]], ["rubygems", [">= 3.2.3"]]],
+        ],
+      ]
+    end
+    let(:b_result) do
+      [
+        [
+          "b",
+          "2.0.0",
+          nil,
+          [["a", ["~> 1.0", "<= 3.0"]]],
+          [["checksum", ["bbb1"]]],
+        ],
+        [
+          "b",
+          "2.0.0",
+          "java",
+          [["a", ["~> 1.0", "<= 3.0"]]],
+          [["checksum", ["bbb2"]]],
+        ],
+      ]
+    end
+    let(:c_result) do
+      [
+        [
+          "c",
+          "3.0.0",
+          nil,
+          [["a", ["= 1.0.0"]], ["b", ["~> 2.0"]]],
+          [["checksum", ["ccc1"]], ["ruby", [">= 2.7.0"]], ["rubygems", [">= 3.0.0"]]],
+        ],
+        [
+          "c",
+          "3.3.3",
+          nil,
+          [["a", [">= 1.1.0"]], ["b", ["~> 2.0"]]],
+          [["checksum", ["ccc3"]], ["ruby", [">= 3.0.0"]], ["rubygems", [">= 3.2.3"]]],
+        ],
+      ]
+    end
+
+    it "returns the info for example gem 'a' which has no deps" do
+      expect(parser.info("a")).to eq(a_result)
+    end
+
+    it "returns the info for example gem 'b' which has platform and compound deps" do
+      expect(parser.info("b")).to eq(b_result)
+    end
+
+    it "returns the info for example gem 'c' which has deps and yanked version (requires use of correct info checksum)" do
+      expect(parser.info("c")).to eq(c_result)
+    end
+
+    it "returns an empty array when the info is empty" do
+      compact_index.set_info_data("a", {})
+      expect(parser.info("a")).to eq([])
+    end
+
+    it "returns an empty array when the info is not readable" do
+      expect(parser.info("d")).to eq([])
+    end
+
+    it "handles empty lines in the versions file (Artifactory bug that they have yet to fix)" do
+      compact_index.versions = +<<~VERSIONS
+        created_at: 2024-05-01T00:00:04Z
+        ---
+        a 1.0.0,1.0.1,1.1.0 aaa111
+        b 2.0.0,2.0.0-java bbb222
+
+        c 3.0.0,3.0.3,3.3.3 ccc333
+        c -3.0.3 ccc333yanked
+      VERSIONS
+      expect(parser.info("a")).to eq(a_result)
+    end
+  end
+end
diff --git a/spec/bundler/bundler/compact_index_client/updater_spec.rb b/spec/bundler/bundler/compact_index_client/updater_spec.rb
index fe417e392067c9..fd63a652a4e4ae 100644
--- a/spec/bundler/bundler/compact_index_client/updater_spec.rb
+++ b/spec/bundler/bundler/compact_index_client/updater_spec.rb
@@ -1,43 +1,225 @@
 # frozen_string_literal: true
 
-require "net/http"
+require "bundler/vendored_net_http"
 require "bundler/compact_index_client"
 require "bundler/compact_index_client/updater"
 require "tmpdir"
 
 RSpec.describe Bundler::CompactIndexClient::Updater do
+  subject(:updater) { described_class.new(fetcher) }
+
   let(:fetcher) { double(:fetcher) }
-  let(:local_path) { Pathname.new Dir.mktmpdir("localpath") }
+  let(:local_path) { Pathname.new(Dir.mktmpdir("localpath")).join("versions") }
+  let(:etag_path) { Pathname.new(Dir.mktmpdir("localpath-etags")).join("versions.etag") }
   let(:remote_path) { double(:remote_path) }
 
-  let!(:updater) { described_class.new(fetcher) }
+  let(:full_body) { "abc123" }
+  let(:response) { double(:response, body: full_body, is_a?: false) }
+  let(:digest) { Digest::SHA256.base64digest(full_body) }
+
+  context "when the local path does not exist" do
+    before do
+      allow(response).to receive(:[]).with("Repr-Digest") { nil }
+      allow(response).to receive(:[]).with("Digest") { nil }
+      allow(response).to receive(:[]).with("ETag") { '"thisisanetag"' }
+    end
+
+    it "downloads the file without attempting append" do
+      expect(fetcher).to receive(:call).once.with(remote_path, {}) { response }
+
+      updater.update(remote_path, local_path, etag_path)
+
+      expect(local_path.read).to eq(full_body)
+      expect(etag_path.read).to eq("thisisanetag")
+    end
+
+    it "fails immediately on bad checksum" do
+      expect(fetcher).to receive(:call).once.with(remote_path, {}) { response }
+      allow(response).to receive(:[]).with("Repr-Digest") { "sha-256=:baddigest:" }
+
+      expect do
+        updater.update(remote_path, local_path, etag_path)
+      end.to raise_error(Bundler::CompactIndexClient::Updater::MismatchedChecksumError)
+    end
+  end
+
+  context "when the local path exists" do
+    let(:local_body) { "abc" }
+
+    before do
+      local_path.open("w") {|f| f.write(local_body) }
+    end
+
+    context "with an etag" do
+      before do
+        etag_path.open("w") {|f| f.write("LocalEtag") }
+      end
+
+      let(:headers) do
+        {
+          "If-None-Match" => '"LocalEtag"',
+          "Range" => "bytes=2-",
+        }
+      end
+
+      it "does nothing if etags match" do
+        expect(fetcher).to receive(:call).once.with(remote_path, headers).and_return(response)
+        allow(response).to receive(:is_a?).with(Gem::Net::HTTPPartialContent) { false }
+        allow(response).to receive(:is_a?).with(Gem::Net::HTTPNotModified) { true }
+
+        updater.update(remote_path, local_path, etag_path)
+
+        expect(local_path.read).to eq("abc")
+        expect(etag_path.read).to eq("LocalEtag")
+      end
+
+      it "appends the file if etags do not match" do
+        expect(fetcher).to receive(:call).once.with(remote_path, headers).and_return(response)
+        allow(response).to receive(:[]).with("Repr-Digest") { "sha-256=:#{digest}:" }
+        allow(response).to receive(:[]).with("ETag") { '"NewEtag"' }
+        allow(response).to receive(:is_a?).with(Gem::Net::HTTPPartialContent) { true }
+        allow(response).to receive(:is_a?).with(Gem::Net::HTTPNotModified) { false }
+        allow(response).to receive(:body) { "c123" }
+
+        updater.update(remote_path, local_path, etag_path)
+
+        expect(local_path.read).to eq(full_body)
+        expect(etag_path.read).to eq("NewEtag")
+      end
+
+      it "replaces the file if response ignores range" do
+        expect(fetcher).to receive(:call).once.with(remote_path, headers).and_return(response)
+        allow(response).to receive(:[]).with("Repr-Digest") { "sha-256=:#{digest}:" }
+        allow(response).to receive(:[]).with("ETag") { '"NewEtag"' }
+        allow(response).to receive(:body) { full_body }
+
+        updater.update(remote_path, local_path, etag_path)
+
+        expect(local_path.read).to eq(full_body)
+        expect(etag_path.read).to eq("NewEtag")
+      end
+
+      it "tries the request again if the partial response fails digest check" do
+        allow(response).to receive(:[]).with("Repr-Digest") { "sha-256=:baddigest:" }
+        allow(response).to receive(:body) { "the beginning of the file changed" }
+        allow(response).to receive(:is_a?).with(Gem::Net::HTTPPartialContent) { true }
+        expect(fetcher).to receive(:call).once.with(remote_path, headers).and_return(response)
+
+        full_response = double(:full_response, body: full_body, is_a?: false)
+        allow(full_response).to receive(:[]).with("Repr-Digest") { "sha-256=:#{digest}:" }
+        allow(full_response).to receive(:[]).with("ETag") { '"NewEtag"' }
+        expect(fetcher).to receive(:call).once.with(remote_path, { "If-None-Match" => '"LocalEtag"' }).and_return(full_response)
+
+        updater.update(remote_path, local_path, etag_path)
+
+        expect(local_path.read).to eq(full_body)
+        expect(etag_path.read).to eq("NewEtag")
+      end
+
+      it "tries the request again if the partial response is blank" do
+        allow(response).to receive(:[]).with("Repr-Digest") { "sha-256=:baddigest:" }
+        allow(response).to receive(:body) { "" }
+        allow(response).to receive(:is_a?).with(Gem::Net::HTTPPartialContent) { true }
+        expect(fetcher).to receive(:call).once.with(remote_path, headers).and_return(response)
+
+        full_response = double(:full_response, body: full_body, is_a?: false)
+        allow(full_response).to receive(:[]).with("Repr-Digest") { "sha-256=:#{digest}:" }
+        allow(full_response).to receive(:[]).with("ETag") { '"NewEtag"' }
+        expect(fetcher).to receive(:call).once.with(remote_path, { "If-None-Match" => '"LocalEtag"' }).and_return(full_response)
+
+        updater.update(remote_path, local_path, etag_path)
+
+        expect(local_path.read).to eq(full_body)
+        expect(etag_path.read).to eq("NewEtag")
+      end
+    end
+
+    context "without an etag file" do
+      let(:headers) do
+        { "Range" => "bytes=2-" }
+      end
+
+      it "appends the file" do
+        expect(fetcher).to receive(:call).once.with(remote_path, headers).and_return(response)
+        allow(response).to receive(:[]).with("Repr-Digest") { "sha-256=:#{digest}:" }
+        allow(response).to receive(:[]).with("ETag") { '"OpaqueEtag"' }
+        allow(response).to receive(:is_a?).with(Gem::Net::HTTPPartialContent) { true }
+        allow(response).to receive(:is_a?).with(Gem::Net::HTTPNotModified) { false }
+        allow(response).to receive(:body) { "c123" }
+
+        updater.update(remote_path, local_path, etag_path)
+
+        expect(local_path.read).to eq(full_body)
+        expect(etag_path.read).to eq("OpaqueEtag")
+      end
+
+      it "replaces the file on full file response that ignores range request" do
+        expect(fetcher).to receive(:call).once.with(remote_path, headers).and_return(response)
+        allow(response).to receive(:[]).with("Repr-Digest") { nil }
+        allow(response).to receive(:[]).with("Digest") { nil }
+        allow(response).to receive(:[]).with("ETag") { '"OpaqueEtag"' }
+        allow(response).to receive(:is_a?).with(Gem::Net::HTTPPartialContent) { false }
+        allow(response).to receive(:is_a?).with(Gem::Net::HTTPNotModified) { false }
+        allow(response).to receive(:body) { full_body }
+
+        updater.update(remote_path, local_path, etag_path)
+
+        expect(local_path.read).to eq(full_body)
+        expect(etag_path.read).to eq("OpaqueEtag")
+      end
+
+      it "tries the request again if the partial response fails digest check" do
+        allow(response).to receive(:[]).with("Repr-Digest") { "sha-256=:baddigest:" }
+        allow(response).to receive(:body) { "the beginning of the file changed" }
+        allow(response).to receive(:is_a?).with(Gem::Net::HTTPPartialContent) { true }
+        expect(fetcher).to receive(:call).once.with(remote_path, headers) do
+          # During the failed first request, we simulate another process writing the etag.
+          # This ensures the second request doesn't generate the md5 etag again but just uses whatever is written.
+          etag_path.open("w") {|f| f.write("LocalEtag") }
+          response
+        end
+
+        full_response = double(:full_response, body: full_body, is_a?: false)
+        allow(full_response).to receive(:[]).with("Repr-Digest") { "sha-256=:#{digest}:" }
+        allow(full_response).to receive(:[]).with("ETag") { '"NewEtag"' }
+        expect(fetcher).to receive(:call).once.with(remote_path, { "If-None-Match" => '"LocalEtag"' }).and_return(full_response)
+
+        updater.update(remote_path, local_path, etag_path)
+
+        expect(local_path.read).to eq(full_body)
+        expect(etag_path.read).to eq("NewEtag")
+      end
+    end
+  end
 
   context "when the ETag header is missing" do
     # Regression test for https://github.com/rubygems/bundler/issues/5463
-    let(:response) { double(:response, :body => "abc123") }
+    let(:response) { double(:response, body: full_body) }
 
     it "treats the response as an update" do
-      expect(response).to receive(:[]).with("ETag") { nil }
+      allow(response).to receive(:[]).with("Repr-Digest") { nil }
+      allow(response).to receive(:[]).with("Digest") { nil }
+      allow(response).to receive(:[]).with("ETag") { nil }
       expect(fetcher).to receive(:call) { response }
 
-      updater.update(local_path, remote_path)
+      updater.update(remote_path, local_path, etag_path)
     end
   end
 
   context "when the download is corrupt" do
-    let(:response) { double(:response, :body => "") }
+    let(:response) { double(:response, body: "") }
 
     it "raises HTTPError" do
       expect(fetcher).to receive(:call).and_raise(Zlib::GzipFile::Error)
 
       expect do
-        updater.update(local_path, remote_path)
+        updater.update(remote_path, local_path, etag_path)
       end.to raise_error(Bundler::HTTPError)
     end
   end
 
   context "when receiving non UTF-8 data and default internal encoding set to ASCII" do
-    let(:response) { double(:response, :body => "\x8B".b) }
+    let(:response) { double(:response, body: "\x8B".b) }
 
     it "works just fine" do
       old_verbose = $VERBOSE
@@ -46,10 +228,12 @@
       begin
         $VERBOSE = false
         Encoding.default_internal = "ASCII"
-        expect(response).to receive(:[]).with("ETag") { nil }
+        allow(response).to receive(:[]).with("Repr-Digest") { nil }
+        allow(response).to receive(:[]).with("Digest") { nil }
+        allow(response).to receive(:[]).with("ETag") { nil }
         expect(fetcher).to receive(:call) { response }
 
-        updater.update(local_path, remote_path)
+        updater.update(remote_path, local_path, etag_path)
       ensure
         Encoding.default_internal = previous_internal_encoding
         $VERBOSE = old_verbose
diff --git a/spec/bundler/bundler/current_ruby_spec.rb b/spec/bundler/bundler/current_ruby_spec.rb
new file mode 100644
index 00000000000000..8764c4971fe83a
--- /dev/null
+++ b/spec/bundler/bundler/current_ruby_spec.rb
@@ -0,0 +1,156 @@
+# frozen_string_literal: true
+
+RSpec.describe Bundler::CurrentRuby do
+  describe "PLATFORM_MAP" do
+    subject { described_class::PLATFORM_MAP }
+
+    # rubocop:disable Naming/VariableNumber
+    let(:platforms) do
+      { ruby: Gem::Platform::RUBY,
+        ruby_18: Gem::Platform::RUBY,
+        ruby_19: Gem::Platform::RUBY,
+        ruby_20: Gem::Platform::RUBY,
+        ruby_21: Gem::Platform::RUBY,
+        ruby_22: Gem::Platform::RUBY,
+        ruby_23: Gem::Platform::RUBY,
+        ruby_24: Gem::Platform::RUBY,
+        ruby_25: Gem::Platform::RUBY,
+        ruby_26: Gem::Platform::RUBY,
+        ruby_27: Gem::Platform::RUBY,
+        ruby_30: Gem::Platform::RUBY,
+        ruby_31: Gem::Platform::RUBY,
+        ruby_32: Gem::Platform::RUBY,
+        ruby_33: Gem::Platform::RUBY,
+        ruby_34: Gem::Platform::RUBY,
+        ruby_35: Gem::Platform::RUBY,
+        mri: Gem::Platform::RUBY,
+        mri_18: Gem::Platform::RUBY,
+        mri_19: Gem::Platform::RUBY,
+        mri_20: Gem::Platform::RUBY,
+        mri_21: Gem::Platform::RUBY,
+        mri_22: Gem::Platform::RUBY,
+        mri_23: Gem::Platform::RUBY,
+        mri_24: Gem::Platform::RUBY,
+        mri_25: Gem::Platform::RUBY,
+        mri_26: Gem::Platform::RUBY,
+        mri_27: Gem::Platform::RUBY,
+        mri_30: Gem::Platform::RUBY,
+        mri_31: Gem::Platform::RUBY,
+        mri_32: Gem::Platform::RUBY,
+        mri_33: Gem::Platform::RUBY,
+        mri_34: Gem::Platform::RUBY,
+        mri_35: Gem::Platform::RUBY,
+        rbx: Gem::Platform::RUBY,
+        truffleruby: Gem::Platform::RUBY,
+        jruby: Gem::Platform::JAVA,
+        jruby_18: Gem::Platform::JAVA,
+        jruby_19: Gem::Platform::JAVA,
+        windows: Gem::Platform::WINDOWS,
+        windows_18: Gem::Platform::WINDOWS,
+        windows_19: Gem::Platform::WINDOWS,
+        windows_20: Gem::Platform::WINDOWS,
+        windows_21: Gem::Platform::WINDOWS,
+        windows_22: Gem::Platform::WINDOWS,
+        windows_23: Gem::Platform::WINDOWS,
+        windows_24: Gem::Platform::WINDOWS,
+        windows_25: Gem::Platform::WINDOWS,
+        windows_26: Gem::Platform::WINDOWS,
+        windows_27: Gem::Platform::WINDOWS,
+        windows_30: Gem::Platform::WINDOWS,
+        windows_31: Gem::Platform::WINDOWS,
+        windows_32: Gem::Platform::WINDOWS,
+        windows_33: Gem::Platform::WINDOWS,
+        windows_34: Gem::Platform::WINDOWS,
+        windows_35: Gem::Platform::WINDOWS }
+    end
+
+    let(:deprecated) do
+      { mswin: Gem::Platform::MSWIN,
+        mswin_18: Gem::Platform::MSWIN,
+        mswin_19: Gem::Platform::MSWIN,
+        mswin_20: Gem::Platform::MSWIN,
+        mswin_21: Gem::Platform::MSWIN,
+        mswin_22: Gem::Platform::MSWIN,
+        mswin_23: Gem::Platform::MSWIN,
+        mswin_24: Gem::Platform::MSWIN,
+        mswin_25: Gem::Platform::MSWIN,
+        mswin_26: Gem::Platform::MSWIN,
+        mswin_27: Gem::Platform::MSWIN,
+        mswin_30: Gem::Platform::MSWIN,
+        mswin_31: Gem::Platform::MSWIN,
+        mswin_32: Gem::Platform::MSWIN,
+        mswin_33: Gem::Platform::MSWIN,
+        mswin_34: Gem::Platform::MSWIN,
+        mswin_35: Gem::Platform::MSWIN,
+        mswin64: Gem::Platform::MSWIN64,
+        mswin64_19: Gem::Platform::MSWIN64,
+        mswin64_20: Gem::Platform::MSWIN64,
+        mswin64_21: Gem::Platform::MSWIN64,
+        mswin64_22: Gem::Platform::MSWIN64,
+        mswin64_23: Gem::Platform::MSWIN64,
+        mswin64_24: Gem::Platform::MSWIN64,
+        mswin64_25: Gem::Platform::MSWIN64,
+        mswin64_26: Gem::Platform::MSWIN64,
+        mswin64_27: Gem::Platform::MSWIN64,
+        mswin64_30: Gem::Platform::MSWIN64,
+        mswin64_31: Gem::Platform::MSWIN64,
+        mswin64_32: Gem::Platform::MSWIN64,
+        mswin64_33: Gem::Platform::MSWIN64,
+        mswin64_34: Gem::Platform::MSWIN64,
+        mswin64_35: Gem::Platform::MSWIN64,
+        mingw: Gem::Platform::UNIVERSAL_MINGW,
+        mingw_18: Gem::Platform::UNIVERSAL_MINGW,
+        mingw_19: Gem::Platform::UNIVERSAL_MINGW,
+        mingw_20: Gem::Platform::UNIVERSAL_MINGW,
+        mingw_21: Gem::Platform::UNIVERSAL_MINGW,
+        mingw_22: Gem::Platform::UNIVERSAL_MINGW,
+        mingw_23: Gem::Platform::UNIVERSAL_MINGW,
+        mingw_24: Gem::Platform::UNIVERSAL_MINGW,
+        mingw_25: Gem::Platform::UNIVERSAL_MINGW,
+        mingw_26: Gem::Platform::UNIVERSAL_MINGW,
+        mingw_27: Gem::Platform::UNIVERSAL_MINGW,
+        mingw_30: Gem::Platform::UNIVERSAL_MINGW,
+        mingw_31: Gem::Platform::UNIVERSAL_MINGW,
+        mingw_32: Gem::Platform::UNIVERSAL_MINGW,
+        mingw_33: Gem::Platform::UNIVERSAL_MINGW,
+        mingw_34: Gem::Platform::UNIVERSAL_MINGW,
+        mingw_35: Gem::Platform::UNIVERSAL_MINGW,
+        x64_mingw: Gem::Platform::UNIVERSAL_MINGW,
+        x64_mingw_20: Gem::Platform::UNIVERSAL_MINGW,
+        x64_mingw_21: Gem::Platform::UNIVERSAL_MINGW,
+        x64_mingw_22: Gem::Platform::UNIVERSAL_MINGW,
+        x64_mingw_23: Gem::Platform::UNIVERSAL_MINGW,
+        x64_mingw_24: Gem::Platform::UNIVERSAL_MINGW,
+        x64_mingw_25: Gem::Platform::UNIVERSAL_MINGW,
+        x64_mingw_26: Gem::Platform::UNIVERSAL_MINGW,
+        x64_mingw_27: Gem::Platform::UNIVERSAL_MINGW,
+        x64_mingw_30: Gem::Platform::UNIVERSAL_MINGW,
+        x64_mingw_31: Gem::Platform::UNIVERSAL_MINGW,
+        x64_mingw_32: Gem::Platform::UNIVERSAL_MINGW,
+        x64_mingw_33: Gem::Platform::UNIVERSAL_MINGW,
+        x64_mingw_34: Gem::Platform::UNIVERSAL_MINGW,
+        x64_mingw_35: Gem::Platform::UNIVERSAL_MINGW }
+    end
+    # rubocop:enable Naming/VariableNumber
+
+    it "includes all platforms" do
+      expect(subject).to eq(platforms.merge(deprecated))
+    end
+  end
+
+  describe "Deprecated platform" do
+    it "Outputs a deprecation warning when calling maglev?" do
+      expect(Bundler.ui).to receive(:warn).with(/`CurrentRuby#maglev\?` is deprecated with no replacement./)
+
+      Bundler.current_ruby.maglev?
+    end
+
+    it "Outputs a deprecation warning when calling maglev_31?" do
+      expect(Bundler.ui).to receive(:warn).with(/`CurrentRuby#maglev_31\?` is deprecated with no replacement./)
+
+      Bundler.current_ruby.maglev_31?
+    end
+
+    pending "is removed and shows a helpful error message about it", bundler: "4"
+  end
+end
diff --git a/spec/bundler/bundler/definition_spec.rb b/spec/bundler/bundler/definition_spec.rb
index 59b958ae4248c9..8f796877fda30c 100644
--- a/spec/bundler/bundler/definition_spec.rb
+++ b/spec/bundler/bundler/definition_spec.rb
@@ -5,58 +5,60 @@
 RSpec.describe Bundler::Definition do
   describe "#lock" do
     before do
-      allow(Bundler).to receive(:settings) { Bundler::Settings.new(".") }
-      allow(Bundler::SharedHelpers).to receive(:find_gemfile) { Pathname.new("Gemfile") }
-      allow(Bundler).to receive(:ui) { double("UI", :info => "", :debug => "") }
+      allow(Bundler::SharedHelpers).to receive(:find_gemfile) { bundled_app_gemfile }
+      allow(Bundler).to receive(:ui) { double("UI", info: "", debug: "") }
     end
-    context "when it's not possible to write to the file" do
-      subject { Bundler::Definition.new(nil, [], Bundler::SourceList.new, []) }
 
+    subject { Bundler::Definition.new(bundled_app_lock, [], Bundler::SourceList.new, {}) }
+
+    context "when it's not possible to write to the file" do
       it "raises an PermissionError with explanation" do
         allow(File).to receive(:open).and_call_original
-        expect(File).to receive(:open).with("Gemfile.lock", "wb").
-          and_raise(Errno::EACCES)
-        expect { subject.lock("Gemfile.lock") }.
+        expect(File).to receive(:open).with(bundled_app_lock, "wb").
+          and_raise(Errno::EACCES.new(bundled_app_lock.to_s))
+        expect { subject.lock }.
           to raise_error(Bundler::PermissionError, /Gemfile\.lock/)
       end
     end
     context "when a temporary resource access issue occurs" do
-      subject { Bundler::Definition.new(nil, [], Bundler::SourceList.new, []) }
-
       it "raises a TemporaryResourceError with explanation" do
         allow(File).to receive(:open).and_call_original
-        expect(File).to receive(:open).with("Gemfile.lock", "wb").
+        expect(File).to receive(:open).with(bundled_app_lock, "wb").
           and_raise(Errno::EAGAIN)
-        expect { subject.lock("Gemfile.lock") }.
+        expect { subject.lock }.
           to raise_error(Bundler::TemporaryResourceError, /temporarily unavailable/)
       end
     end
     context "when Bundler::Definition.no_lock is set to true" do
-      subject { Bundler::Definition.new(nil, [], Bundler::SourceList.new, []) }
       before { Bundler::Definition.no_lock = true }
       after { Bundler::Definition.no_lock = false }
 
-      it "does not create a lock file" do
-        subject.lock("Gemfile.lock")
-        expect(File.file?("Gemfile.lock")).to eq false
+      it "does not create a lockfile" do
+        subject.lock
+        expect(bundled_app_lock).not_to be_file
       end
     end
   end
 
   describe "detects changes" do
     it "for a path gem with changes" do
-      build_lib "foo", "1.0", :path => lib_path("foo")
+      build_lib "foo", "1.0", path: lib_path("foo")
 
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
+        source "https://gem.repo1"
         gem "foo", :path => "#{lib_path("foo")}"
       G
 
-      build_lib "foo", "1.0", :path => lib_path("foo") do |s|
-        s.add_dependency "rack", "1.0"
+      build_lib "foo", "1.0", path: lib_path("foo") do |s|
+        s.add_dependency "myrack", "1.0"
+      end
+
+      checksums = checksums_section_when_enabled do |c|
+        c.no_checksum "foo", "1.0"
+        c.checksum gem_repo1, "myrack", "1.0.0"
       end
 
-      bundle :install, :env => { "DEBUG" => "1" }
+      bundle :install, env: { "DEBUG" => "1" }
 
       expect(out).to match(/re-resolving dependencies/)
       expect(lockfile).to eq <<~G
@@ -64,19 +66,19 @@
           remote: #{lib_path("foo")}
           specs:
             foo (1.0)
-              rack (= 1.0)
+              myrack (= 1.0)
 
         GEM
-          remote: #{file_uri_for(gem_repo1)}/
+          remote: https://gem.repo1/
           specs:
-            rack (1.0.0)
+            myrack (1.0.0)
 
         PLATFORMS
           #{lockfile_platforms}
 
         DEPENDENCIES
           foo!
-
+        #{checksums}
         BUNDLED WITH
            #{Bundler::VERSION}
       G
@@ -89,67 +91,80 @@
       end
 
       gemfile <<-G
-        source "#{file_uri_for(gem_repo4)}"
+        source "https://gem.repo4"
         gem "ffi"
       G
 
       bundle "lock --add-platform java"
 
-      bundle "update ffi", :env => { "DEBUG" => "1" }
+      bundle "update ffi", env: { "DEBUG" => "1" }
 
       expect(out).to match(/because bundler is unlocking gems: \(ffi\)/)
     end
 
     it "for a path gem with deps and no changes" do
-      build_lib "foo", "1.0", :path => lib_path("foo") do |s|
-        s.add_dependency "rack", "1.0"
+      build_lib "foo", "1.0", path: lib_path("foo") do |s|
+        s.add_dependency "myrack", "1.0"
         s.add_development_dependency "net-ssh", "1.0"
       end
 
+      checksums = checksums_section_when_enabled do |c|
+        c.no_checksum "foo", "1.0"
+        c.checksum gem_repo1, "myrack", "1.0.0"
+      end
+
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
+        source "https://gem.repo1"
         gem "foo", :path => "#{lib_path("foo")}"
       G
 
-      bundle :check, :env => { "DEBUG" => "1" }
-
-      expect(out).to match(/using resolution from the lockfile/)
-      expect(lockfile).to eq <<~G
+      expected_lockfile = <<~G
         PATH
           remote: #{lib_path("foo")}
           specs:
             foo (1.0)
-              rack (= 1.0)
+              myrack (= 1.0)
 
         GEM
-          remote: #{file_uri_for(gem_repo1)}/
+          remote: https://gem.repo1/
           specs:
-            rack (1.0.0)
+            myrack (1.0.0)
 
         PLATFORMS
           #{lockfile_platforms}
 
         DEPENDENCIES
           foo!
-
+        #{checksums}
         BUNDLED WITH
            #{Bundler::VERSION}
       G
+
+      expect(lockfile).to eq(expected_lockfile)
+
+      bundle :check, env: { "DEBUG" => "1" }
+
+      expect(out).to match(/using resolution from the lockfile/)
+      expect(lockfile).to eq(expected_lockfile)
     end
 
     it "for a locked gem for another platform" do
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
+        source "https://gem.repo1"
         gem "only_java", platform: :jruby
       G
 
+      checksums = checksums_section_when_enabled do |c|
+        c.checksum gem_repo1, "only_java", "1.1", "java"
+      end
+
       bundle "lock --add-platform java"
-      bundle :check, :env => { "DEBUG" => "1" }
+      bundle :check, env: { "DEBUG" => "1" }
 
       expect(out).to match(/using resolution from the lockfile/)
       expect(lockfile).to eq <<~G
         GEM
-          remote: #{file_uri_for(gem_repo1)}/
+          remote: https://gem.repo1/
           specs:
             only_java (1.1-java)
 
@@ -158,24 +173,28 @@
 
         DEPENDENCIES
           only_java
-
+        #{checksums}
         BUNDLED WITH
            #{Bundler::VERSION}
       G
     end
 
     it "for a rubygems gem" do
+      checksums = checksums_section_when_enabled do |c|
+        c.checksum gem_repo1, "foo", "1.0"
+      end
+
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
+        source "https://gem.repo1"
         gem "foo"
       G
 
-      bundle :check, :env => { "DEBUG" => "1" }
+      bundle :check, env: { "DEBUG" => "1" }
 
       expect(out).to match(/using resolution from the lockfile/)
       expect(lockfile).to eq <<~G
         GEM
-          remote: #{file_uri_for(gem_repo1)}/
+          remote: https://gem.repo1/
           specs:
             foo (1.0)
 
@@ -184,7 +203,7 @@
 
         DEPENDENCIES
           foo
-
+        #{checksums}
         BUNDLED WITH
            #{Bundler::VERSION}
       G
@@ -196,13 +215,13 @@
       context "eager unlock" do
         let(:source_list) do
           Bundler::SourceList.new.tap do |source_list|
-            source_list.add_global_rubygems_remote(file_uri_for(gem_repo4))
+            source_list.add_global_rubygems_remote("https://gem.repo4")
           end
         end
 
         before do
           gemfile <<-G
-            source "#{file_uri_for(gem_repo4)}"
+            source "https://gem.repo4"
             gem 'isolated_owner'
 
             gem 'shared_owner_a'
@@ -211,7 +230,7 @@
 
           lockfile <<-L
             GEM
-              remote: #{file_uri_for(gem_repo4)}
+              remote: https://gem.repo4
               specs:
                 isolated_dep (2.0.1)
                 isolated_owner (1.0.1)
@@ -260,7 +279,7 @@
             bundled_app_lock,
             updated_deps_in_gemfile,
             source_list,
-            :gems => ["shared_owner_a"], :conservative => true
+            gems: ["shared_owner_a"], conservative: true
           )
           locked = definition.send(:converge_locked_specs).map(&:name)
           expect(locked).to eq %w[isolated_dep isolated_owner shared_dep shared_owner_b]
diff --git a/spec/bundler/bundler/dependency_spec.rb b/spec/bundler/bundler/dependency_spec.rb
index 1ef511f1aad6b2..f930459571da86 100644
--- a/spec/bundler/bundler/dependency_spec.rb
+++ b/spec/bundler/bundler/dependency_spec.rb
@@ -35,126 +35,15 @@
     end
   end
 
-  describe "PLATFORM_MAP" do
-    subject { described_class::PLATFORM_MAP }
+  it "is on the current platform" do
+    engine = Gem.win_platform? ? "windows" : RUBY_ENGINE
 
-    # rubocop:disable Naming/VariableNumber
-    let(:platforms) do
-      { :ruby => Gem::Platform::RUBY,
-        :ruby_18 => Gem::Platform::RUBY,
-        :ruby_19 => Gem::Platform::RUBY,
-        :ruby_20 => Gem::Platform::RUBY,
-        :ruby_21 => Gem::Platform::RUBY,
-        :ruby_22 => Gem::Platform::RUBY,
-        :ruby_23 => Gem::Platform::RUBY,
-        :ruby_24 => Gem::Platform::RUBY,
-        :ruby_25 => Gem::Platform::RUBY,
-        :ruby_26 => Gem::Platform::RUBY,
-        :ruby_27 => Gem::Platform::RUBY,
-        :ruby_30 => Gem::Platform::RUBY,
-        :ruby_31 => Gem::Platform::RUBY,
-        :ruby_32 => Gem::Platform::RUBY,
-        :ruby_33 => Gem::Platform::RUBY,
-        :mri => Gem::Platform::RUBY,
-        :mri_18 => Gem::Platform::RUBY,
-        :mri_19 => Gem::Platform::RUBY,
-        :mri_20 => Gem::Platform::RUBY,
-        :mri_21 => Gem::Platform::RUBY,
-        :mri_22 => Gem::Platform::RUBY,
-        :mri_23 => Gem::Platform::RUBY,
-        :mri_24 => Gem::Platform::RUBY,
-        :mri_25 => Gem::Platform::RUBY,
-        :mri_26 => Gem::Platform::RUBY,
-        :mri_27 => Gem::Platform::RUBY,
-        :mri_30 => Gem::Platform::RUBY,
-        :mri_31 => Gem::Platform::RUBY,
-        :mri_32 => Gem::Platform::RUBY,
-        :mri_33 => Gem::Platform::RUBY,
-        :rbx => Gem::Platform::RUBY,
-        :truffleruby => Gem::Platform::RUBY,
-        :jruby => Gem::Platform::JAVA,
-        :jruby_18 => Gem::Platform::JAVA,
-        :jruby_19 => Gem::Platform::JAVA,
-        :windows => Gem::Platform::WINDOWS,
-        :windows_18 => Gem::Platform::WINDOWS,
-        :windows_19 => Gem::Platform::WINDOWS,
-        :windows_20 => Gem::Platform::WINDOWS,
-        :windows_21 => Gem::Platform::WINDOWS,
-        :windows_22 => Gem::Platform::WINDOWS,
-        :windows_23 => Gem::Platform::WINDOWS,
-        :windows_24 => Gem::Platform::WINDOWS,
-        :windows_25 => Gem::Platform::WINDOWS,
-        :windows_26 => Gem::Platform::WINDOWS,
-        :windows_27 => Gem::Platform::WINDOWS,
-        :windows_30 => Gem::Platform::WINDOWS,
-        :windows_31 => Gem::Platform::WINDOWS,
-        :windows_32 => Gem::Platform::WINDOWS,
-        :windows_33 => Gem::Platform::WINDOWS }
-    end
-
-    let(:deprecated) do
-      { :mswin => Gem::Platform::MSWIN,
-        :mswin_18 => Gem::Platform::MSWIN,
-        :mswin_19 => Gem::Platform::MSWIN,
-        :mswin_20 => Gem::Platform::MSWIN,
-        :mswin_21 => Gem::Platform::MSWIN,
-        :mswin_22 => Gem::Platform::MSWIN,
-        :mswin_23 => Gem::Platform::MSWIN,
-        :mswin_24 => Gem::Platform::MSWIN,
-        :mswin_25 => Gem::Platform::MSWIN,
-        :mswin_26 => Gem::Platform::MSWIN,
-        :mswin_27 => Gem::Platform::MSWIN,
-        :mswin_30 => Gem::Platform::MSWIN,
-        :mswin_31 => Gem::Platform::MSWIN,
-        :mswin_32 => Gem::Platform::MSWIN,
-        :mswin_33 => Gem::Platform::MSWIN,
-        :mswin64 => Gem::Platform::MSWIN64,
-        :mswin64_19 => Gem::Platform::MSWIN64,
-        :mswin64_20 => Gem::Platform::MSWIN64,
-        :mswin64_21 => Gem::Platform::MSWIN64,
-        :mswin64_22 => Gem::Platform::MSWIN64,
-        :mswin64_23 => Gem::Platform::MSWIN64,
-        :mswin64_24 => Gem::Platform::MSWIN64,
-        :mswin64_25 => Gem::Platform::MSWIN64,
-        :mswin64_26 => Gem::Platform::MSWIN64,
-        :mswin64_27 => Gem::Platform::MSWIN64,
-        :mswin64_30 => Gem::Platform::MSWIN64,
-        :mswin64_31 => Gem::Platform::MSWIN64,
-        :mswin64_32 => Gem::Platform::MSWIN64,
-        :mswin64_33 => Gem::Platform::MSWIN64,
-        :mingw => Gem::Platform::MINGW,
-        :mingw_18 => Gem::Platform::MINGW,
-        :mingw_19 => Gem::Platform::MINGW,
-        :mingw_20 => Gem::Platform::MINGW,
-        :mingw_21 => Gem::Platform::MINGW,
-        :mingw_22 => Gem::Platform::MINGW,
-        :mingw_23 => Gem::Platform::MINGW,
-        :mingw_24 => Gem::Platform::MINGW,
-        :mingw_25 => Gem::Platform::MINGW,
-        :mingw_26 => Gem::Platform::MINGW,
-        :mingw_27 => Gem::Platform::MINGW,
-        :mingw_30 => Gem::Platform::MINGW,
-        :mingw_31 => Gem::Platform::MINGW,
-        :mingw_32 => Gem::Platform::MINGW,
-        :mingw_33 => Gem::Platform::MINGW,
-        :x64_mingw => Gem::Platform::X64_MINGW,
-        :x64_mingw_20 => Gem::Platform::X64_MINGW,
-        :x64_mingw_21 => Gem::Platform::X64_MINGW,
-        :x64_mingw_22 => Gem::Platform::X64_MINGW,
-        :x64_mingw_23 => Gem::Platform::X64_MINGW,
-        :x64_mingw_24 => Gem::Platform::X64_MINGW,
-        :x64_mingw_25 => Gem::Platform::X64_MINGW,
-        :x64_mingw_26 => Gem::Platform::X64_MINGW,
-        :x64_mingw_27 => Gem::Platform::X64_MINGW,
-        :x64_mingw_30 => Gem::Platform::X64_MINGW,
-        :x64_mingw_31 => Gem::Platform::X64_MINGW,
-        :x64_mingw_32 => Gem::Platform::X64_MINGW,
-        :x64_mingw_33 => Gem::Platform::X64_MINGW }
-    end
-    # rubocop:enable Naming/VariableNumber
+    dep = described_class.new(
+      "test_gem",
+      "1.0.0",
+      { "platforms" => "#{engine}_#{RbConfig::CONFIG["MAJOR"]}#{RbConfig::CONFIG["MINOR"]}" },
+    )
 
-    it "includes all platforms" do
-      expect(subject).to eq(platforms.merge(deprecated))
-    end
+    expect(dep.current_platform?).to be_truthy
   end
 end
diff --git a/spec/bundler/bundler/digest_spec.rb b/spec/bundler/bundler/digest_spec.rb
index fd7b0c968e007c..f876827964a3a0 100644
--- a/spec/bundler/bundler/digest_spec.rb
+++ b/spec/bundler/bundler/digest_spec.rb
@@ -11,7 +11,7 @@
     it "is compatible with stdlib" do
       random_strings = ["foo", "skfjsdlkfjsdf", "3924m", "ldskfj"]
 
-      # https://datatracker.ietf.org/doc/html/rfc3174#section-7.3
+      # https://www.rfc-editor.org/rfc/rfc3174#section-7.3
       rfc3174_test_cases = ["abc", "abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq", "a", "01234567" * 8]
 
       (random_strings + rfc3174_test_cases).each do |payload|
diff --git a/spec/bundler/bundler/dsl_spec.rb b/spec/bundler/bundler/dsl_spec.rb
index 8b5bf930f2c3f4..ac28aea4d7da0d 100644
--- a/spec/bundler/bundler/dsl_spec.rb
+++ b/spec/bundler/bundler/dsl_spec.rb
@@ -10,7 +10,7 @@
     it "registers custom hosts" do
       subject.git_source(:example) {|repo_name| "git@git.example.com:#{repo_name}.git" }
       subject.git_source(:foobar) {|repo_name| "git@foobar.com:#{repo_name}.git" }
-      subject.gem("dobry-pies", :example => "strzalek/dobry-pies")
+      subject.gem("dobry-pies", example: "strzalek/dobry-pies")
       example_uri = "git@git.example.com:strzalek/dobry-pies.git"
       expect(subject.dependencies.first.source.uri).to eq(example_uri)
     end
@@ -26,85 +26,136 @@
     end
 
     it "converts :github PR to URI using https" do
-      subject.gem("sparks", :github => "https://github.com/indirect/sparks/pull/5")
+      subject.gem("sparks", github: "https://github.com/indirect/sparks/pull/5")
       github_uri = "https://github.com/indirect/sparks.git"
       expect(subject.dependencies.first.source.uri).to eq(github_uri)
       expect(subject.dependencies.first.source.ref).to eq("refs/pull/5/head")
     end
 
+    it "converts :gitlab PR to URI using https" do
+      subject.gem("sparks", gitlab: "https://gitlab.com/indirect/sparks/-/merge_requests/5")
+      gitlab_uri = "https://gitlab.com/indirect/sparks.git"
+      expect(subject.dependencies.first.source.uri).to eq(gitlab_uri)
+      expect(subject.dependencies.first.source.ref).to eq("refs/merge-requests/5/head")
+    end
+
     it "rejects :github PR URI with a branch, ref or tag" do
       expect do
-        subject.gem("sparks", :github => "https://github.com/indirect/sparks/pull/5", :branch => "foo")
+        subject.gem("sparks", github: "https://github.com/indirect/sparks/pull/5", branch: "foo")
       end.to raise_error(
         Bundler::GemfileError,
         %(The :branch option can't be used with `github: "https://github.com/indirect/sparks/pull/5"`),
       )
 
       expect do
-        subject.gem("sparks", :github => "https://github.com/indirect/sparks/pull/5", :ref => "foo")
+        subject.gem("sparks", github: "https://github.com/indirect/sparks/pull/5", ref: "foo")
       end.to raise_error(
         Bundler::GemfileError,
         %(The :ref option can't be used with `github: "https://github.com/indirect/sparks/pull/5"`),
       )
 
       expect do
-        subject.gem("sparks", :github => "https://github.com/indirect/sparks/pull/5", :tag => "foo")
+        subject.gem("sparks", github: "https://github.com/indirect/sparks/pull/5", tag: "foo")
       end.to raise_error(
         Bundler::GemfileError,
         %(The :tag option can't be used with `github: "https://github.com/indirect/sparks/pull/5"`),
       )
     end
 
+    it "rejects :gitlab PR URI with a branch, ref or tag" do
+      expect do
+        subject.gem("sparks", gitlab: "https://gitlab.com/indirect/sparks/-/merge_requests/5", branch: "foo")
+      end.to raise_error(
+        Bundler::GemfileError,
+        %(The :branch option can't be used with `gitlab: "https://gitlab.com/indirect/sparks/-/merge_requests/5"`),
+      )
+
+      expect do
+        subject.gem("sparks", gitlab: "https://gitlab.com/indirect/sparks/-/merge_requests/5", ref: "foo")
+      end.to raise_error(
+        Bundler::GemfileError,
+        %(The :ref option can't be used with `gitlab: "https://gitlab.com/indirect/sparks/-/merge_requests/5"`),
+      )
+
+      expect do
+        subject.gem("sparks", gitlab: "https://gitlab.com/indirect/sparks/-/merge_requests/5", tag: "foo")
+      end.to raise_error(
+        Bundler::GemfileError,
+        %(The :tag option can't be used with `gitlab: "https://gitlab.com/indirect/sparks/-/merge_requests/5"`),
+      )
+    end
+
     it "rejects :github with :git" do
       expect do
-        subject.gem("sparks", :github => "indirect/sparks", :git => "https://github.com/indirect/sparks.git")
+        subject.gem("sparks", github: "indirect/sparks", git: "https://github.com/indirect/sparks.git")
       end.to raise_error(
         Bundler::GemfileError,
         %(The :git option can't be used with `github: "indirect/sparks"`),
       )
     end
 
-    context "default hosts", :bundler => "< 3" do
+    it "rejects :gitlab with :git" do
+      expect do
+        subject.gem("sparks", gitlab: "indirect/sparks", git: "https://gitlab.com/indirect/sparks.git")
+      end.to raise_error(
+        Bundler::GemfileError,
+        %(The :git option can't be used with `gitlab: "indirect/sparks"`),
+      )
+    end
+
+    context "default hosts" do
       it "converts :github to URI using https" do
-        subject.gem("sparks", :github => "indirect/sparks")
+        subject.gem("sparks", github: "indirect/sparks")
         github_uri = "https://github.com/indirect/sparks.git"
         expect(subject.dependencies.first.source.uri).to eq(github_uri)
       end
 
       it "converts :github shortcut to URI using https" do
-        subject.gem("sparks", :github => "rails")
+        subject.gem("sparks", github: "rails")
         github_uri = "https://github.com/rails/rails.git"
         expect(subject.dependencies.first.source.uri).to eq(github_uri)
       end
 
+      it "converts :gitlab to URI using https" do
+        subject.gem("sparks", gitlab: "indirect/sparks")
+        gitlab_uri = "https://gitlab.com/indirect/sparks.git"
+        expect(subject.dependencies.first.source.uri).to eq(gitlab_uri)
+      end
+
+      it "converts :gitlab shortcut to URI using https" do
+        subject.gem("sparks", gitlab: "rails")
+        gitlab_uri = "https://gitlab.com/rails/rails.git"
+        expect(subject.dependencies.first.source.uri).to eq(gitlab_uri)
+      end
+
       it "converts numeric :gist to :git" do
-        subject.gem("not-really-a-gem", :gist => 2_859_988)
+        subject.gem("not-really-a-gem", gist: 2_859_988)
         github_uri = "https://gist.github.com/2859988.git"
         expect(subject.dependencies.first.source.uri).to eq(github_uri)
       end
 
       it "converts :gist to :git" do
-        subject.gem("not-really-a-gem", :gist => "2859988")
+        subject.gem("not-really-a-gem", gist: "2859988")
         github_uri = "https://gist.github.com/2859988.git"
         expect(subject.dependencies.first.source.uri).to eq(github_uri)
       end
 
       it "converts :bitbucket to :git" do
-        subject.gem("not-really-a-gem", :bitbucket => "mcorp/flatlab-rails")
+        subject.gem("not-really-a-gem", bitbucket: "mcorp/flatlab-rails")
         bitbucket_uri = "https://mcorp@bitbucket.org/mcorp/flatlab-rails.git"
         expect(subject.dependencies.first.source.uri).to eq(bitbucket_uri)
       end
 
       it "converts 'mcorp' to 'mcorp/mcorp'" do
-        subject.gem("not-really-a-gem", :bitbucket => "mcorp")
+        subject.gem("not-really-a-gem", bitbucket: "mcorp")
         bitbucket_uri = "https://mcorp@bitbucket.org/mcorp/mcorp.git"
         expect(subject.dependencies.first.source.uri).to eq(bitbucket_uri)
       end
     end
 
     context "default git sources" do
-      it "has bitbucket, gist, and github" do
-        expect(subject.instance_variable_get(:@git_sources).keys.sort).to eq(%w[bitbucket gist github])
+      it "has bitbucket, gist, github, and gitlab" do
+        expect(subject.instance_variable_get(:@git_sources).keys.sort).to eq(%w[bitbucket gist github gitlab])
       end
     end
   end
@@ -124,7 +175,7 @@
     it "handles syntax errors with a useful message" do
       expect(Bundler).to receive(:read_file).with(source_root.join("Gemfile").to_s).and_return("}")
       expect { subject.eval_gemfile("Gemfile") }.
-        to raise_error(Bundler::GemfileError, /There was an error parsing `Gemfile`: (syntax error, unexpected tSTRING_DEND|(compile error - )?syntax error, unexpected '\}'). Bundler cannot continue./)
+        to raise_error(Bundler::GemfileError, /There was an error parsing `Gemfile`: (syntax error, unexpected tSTRING_DEND|(compile error - )?syntax error, unexpected '\}'|.+?unexpected '}', ignoring it\n). Bundler cannot continue./m)
     end
 
     it "distinguishes syntax errors from evaluation errors" do
@@ -134,29 +185,47 @@
       expect { subject.eval_gemfile("Gemfile") }.
         to raise_error(Bundler::GemfileError, /There was an error evaluating `Gemfile`: ruby_version must match the :engine_version for MRI/)
     end
+
+    it "populates __dir__ and __FILE__ correctly" do
+      abs_path = source_root.join("../fragment.rb").to_s
+      expect(Bundler).to receive(:read_file).with(abs_path).and_return(<<~RUBY)
+        @fragment_dir = __dir__
+        @fragment_file = __FILE__
+      RUBY
+      subject.eval_gemfile("../fragment.rb")
+      expect(subject.instance_variable_get(:@fragment_dir)).to eq(source_root.dirname.to_s)
+      expect(subject.instance_variable_get(:@fragment_file)).to eq(abs_path)
+    end
   end
 
   describe "#gem" do
     # rubocop:disable Naming/VariableNumber
     [:ruby, :ruby_18, :ruby_19, :ruby_20, :ruby_21, :ruby_22, :ruby_23, :ruby_24, :ruby_25, :ruby_26, :ruby_27,
-     :ruby_30, :ruby_31, :ruby_32, :ruby_33, :mri, :mri_18, :mri_19, :mri_20, :mri_21, :mri_22, :mri_23, :mri_24,
-     :mri_25, :mri_26, :mri_27, :mri_30, :mri_31, :mri_32, :mri_33, :jruby, :rbx, :truffleruby].each do |platform|
+     :ruby_30, :ruby_31, :ruby_32, :ruby_33, :ruby_34, :ruby_35, :mri, :mri_18, :mri_19, :mri_20, :mri_21, :mri_22, :mri_23, :mri_24,
+     :mri_25, :mri_26, :mri_27, :mri_30, :mri_31, :mri_32, :mri_33, :mri_34, :mri_35, :jruby, :rbx, :truffleruby].each do |platform|
       it "allows #{platform} as a valid platform" do
-        subject.gem("foo", :platform => platform)
+        subject.gem("foo", platform: platform)
       end
     end
     # rubocop:enable Naming/VariableNumber
 
     it "allows platforms matching the running Ruby version" do
       platform = "ruby_#{RbConfig::CONFIG["MAJOR"]}#{RbConfig::CONFIG["MINOR"]}"
-      subject.gem("foo", :platform => platform)
+
+      expect { subject.gem("foo", platform: platform) }.not_to raise_error
+      expect(Bundler.current_ruby.respond_to?("#{platform}?")).to be_truthy
     end
 
     it "rejects invalid platforms" do
-      expect { subject.gem("foo", :platform => :bogus) }.
+      expect { subject.gem("foo", platform: :bogus) }.
         to raise_error(Bundler::GemfileError, /is not a valid platform/)
     end
 
+    it "raises a deprecation warning for legacy windows platforms" do
+      expect(Bundler::SharedHelpers).to receive(:major_deprecation).with(2, /\APlatform :mswin, :x64_mingw is deprecated/, removed_message: /\APlatform :mswin, :x64_mingw has been removed/)
+      subject.gem("foo", platforms: [:mswin, :jruby, :x64_mingw])
+    end
+
     it "rejects empty gem name" do
       expect { subject.gem("") }.
         to raise_error(Bundler::GemfileError, /an empty gem name is not valid/)
@@ -203,24 +272,33 @@
     end
 
     it "rejects branch option on non-git gems" do
-      expect { subject.gem("foo", :branch => "test") }.
+      expect { subject.gem("foo", branch: "test") }.
         to raise_error(Bundler::GemfileError, /The `branch` option for `gem 'foo'` is not allowed. Only gems with a git source can specify a branch/)
     end
 
     it "allows specifying a branch on git gems" do
-      subject.gem("foo", :branch => "test", :git => "http://mytestrepo")
+      subject.gem("foo", branch: "test", git: "http://mytestrepo")
       dep = subject.dependencies.last
       expect(dep.name).to eq "foo"
     end
 
     it "allows specifying a branch on git gems with a git_source" do
       subject.git_source(:test_source) {|n| "https://github.com/#{n}" }
-      subject.gem("foo", :branch => "test", :test_source => "bundler/bundler")
+      subject.gem("foo", branch: "test", test_source: "bundler/bundler")
       dep = subject.dependencies.last
       expect(dep.name).to eq "foo"
     end
   end
 
+  describe "#platforms" do
+    it "raises a deprecation warning for legacy windows platforms" do
+      expect(Bundler::SharedHelpers).to receive(:major_deprecation).with(2, /\APlatform :mswin64, :mingw is deprecated/, removed_message: /\APlatform :mswin64, :mingw has been removed/)
+      subject.platforms(:mswin64, :jruby, :mingw) do
+        subject.gem("foo")
+      end
+    end
+  end
+
   context "can bundle groups of gems with" do
     # git "https://github.com/rails/rails.git" do
     #   gem "railties"
@@ -260,7 +338,7 @@
     it "will raise a Bundler::GemfileError" do
       gemfile "gem 'foo', :path => /unquoted/string/syntax/error"
       expect { Bundler::Dsl.evaluate(bundled_app_gemfile, nil, true) }.
-        to raise_error(Bundler::GemfileError, /There was an error parsing `Gemfile`:( compile error -)? unknown regexp options - trg.+ Bundler cannot continue./)
+        to raise_error(Bundler::GemfileError, /There was an error parsing `Gemfile`:( compile error -)?.+?unknown regexp options - trg.+ Bundler cannot continue./m)
     end
   end
 
@@ -280,7 +358,7 @@
         allow(Bundler).to receive(:default_gemfile).and_return(Pathname.new("./Gemfile"))
 
         subject.source("https://other-source.org") do
-          subject.gem("dobry-pies", :path => "foo")
+          subject.gem("dobry-pies", path: "foo")
           subject.gem("foo")
         end
 
@@ -288,21 +366,4 @@
       end
     end
   end
-
-  describe "#check_primary_source_safety" do
-    context "when a global source is not defined implicitly" do
-      it "will raise a major deprecation warning" do
-        not_a_global_source = double("not-a-global-source", :no_remotes? => true)
-        allow(Bundler::Source::Rubygems).to receive(:new).and_return(not_a_global_source)
-
-        warning = "This Gemfile does not include an explicit global source. " \
-          "Not using an explicit global source may result in a different lockfile being generated depending on " \
-          "the gems you have installed locally before bundler is run. " \
-          "Instead, define a global source in your Gemfile like this: source \"https://rubygems.org\"."
-        expect(Bundler::SharedHelpers).to receive(:major_deprecation).with(2, warning)
-
-        subject.check_primary_source_safety
-      end
-    end
-  end
 end
diff --git a/spec/bundler/bundler/endpoint_specification_spec.rb b/spec/bundler/bundler/endpoint_specification_spec.rb
index 7dd6925007bb0e..6518f125ba5e52 100644
--- a/spec/bundler/bundler/endpoint_specification_spec.rb
+++ b/spec/bundler/bundler/endpoint_specification_spec.rb
@@ -42,7 +42,7 @@
         expect { subject }.to raise_error(
           Bundler::GemspecError,
           a_string_including("There was an error parsing the metadata for the gem foo (1.0.0)").
-            and(a_string_including('The metadata was {"rubygems"=>">\n"}'))
+            and(a_string_including("The metadata was #{{ "rubygems" => ">\n" }.inspect}"))
         )
       end
     end
@@ -60,21 +60,21 @@
 
     it "should return the remote spec value when not set on endpoint specification and remote spec has one" do
       remote_value = "remote_value"
-      remote_spec = double(:remote_spec, :required_ruby_version => remote_value, :required_rubygems_version => nil)
+      remote_spec = double(:remote_spec, required_ruby_version: remote_value, required_rubygems_version: nil)
       allow(spec_fetcher).to receive(:fetch_spec).and_return(remote_spec)
 
       expect(spec.required_ruby_version). eql?(remote_value)
     end
 
     it "should use the default Gem Requirement value when not set on endpoint specification and not set on remote spec" do
-      remote_spec = double(:remote_spec, :required_ruby_version => nil, :required_rubygems_version => nil)
+      remote_spec = double(:remote_spec, required_ruby_version: nil, required_rubygems_version: nil)
       allow(spec_fetcher).to receive(:fetch_spec).and_return(remote_spec)
       expect(spec.required_ruby_version). eql?(Gem::Requirement.default)
     end
   end
 
   it "supports equality comparison" do
-    remote_spec = double(:remote_spec, :required_ruby_version => nil, :required_rubygems_version => nil)
+    remote_spec = double(:remote_spec, required_ruby_version: nil, required_rubygems_version: nil)
     allow(spec_fetcher).to receive(:fetch_spec).and_return(remote_spec)
     other_spec = described_class.new("bar", version, platform, spec_fetcher, dependencies, metadata)
     expect(spec).to eql(spec)
diff --git a/spec/bundler/bundler/env_spec.rb b/spec/bundler/bundler/env_spec.rb
index 0fdcb560b7fccd..e0ab0a45e33004 100644
--- a/spec/bundler/bundler/env_spec.rb
+++ b/spec/bundler/bundler/env_spec.rb
@@ -70,16 +70,16 @@ def with_clear_paths(env_var, env_value)
 
     context "when there is a Gemfile and a lockfile and print_gemfile is true" do
       before do
-        gemfile "source \"#{file_uri_for(gem_repo1)}\"; gem 'rack', '1.0.0'"
+        gemfile "source 'https://gem.repo1'; gem 'myrack', '1.0.0'"
 
         lockfile <<-L
           GEM
-            remote: #{file_uri_for(gem_repo1)}/
+            remote: https://gem.repo1/
             specs:
-              rack (1.0.0)
+              myrack (1.0.0)
 
           DEPENDENCIES
-            rack
+            myrack
 
           BUNDLED WITH
              1.10.0
@@ -88,21 +88,21 @@ def with_clear_paths(env_var, env_value)
         allow(Bundler::SharedHelpers).to receive(:find_gemfile).and_return(bundled_app_gemfile)
       end
 
-      let(:output) { described_class.report(:print_gemfile => true) }
+      let(:output) { described_class.report(print_gemfile: true) }
 
       it "prints the Gemfile" do
         expect(output).to include("Gemfile")
-        expect(output).to include("'rack', '1.0.0'")
+        expect(output).to include("'myrack', '1.0.0'")
       end
 
       it "prints the lockfile" do
         expect(output).to include("Gemfile.lock")
-        expect(output).to include("rack (1.0.0)")
+        expect(output).to include("myrack (1.0.0)")
       end
     end
 
     context "when there no Gemfile and print_gemfile is true" do
-      let(:output) { described_class.report(:print_gemfile => true) }
+      let(:output) { described_class.report(print_gemfile: true) }
 
       it "prints the environment" do
         expect(output).to start_with("## Environment")
@@ -114,7 +114,7 @@ def with_clear_paths(env_var, env_value)
         bundle "config set https://localgemserver.test/ user:pass"
       end
 
-      let(:output) { described_class.report(:print_gemfile => true) }
+      let(:output) { described_class.report(print_gemfile: true) }
 
       it "prints the config with redacted values" do
         expect(output).to include("https://localgemserver.test")
@@ -128,7 +128,7 @@ def with_clear_paths(env_var, env_value)
         bundle "config set https://localgemserver.test/ api_token:x-oauth-basic"
       end
 
-      let(:output) { described_class.report(:print_gemfile => true) }
+      let(:output) { described_class.report(print_gemfile: true) }
 
       it "prints the config with redacted values" do
         expect(output).to include("https://localgemserver.test")
@@ -148,9 +148,9 @@ def with_clear_paths(env_var, env_value)
       end
 
       before do
-        gemfile("source \"#{file_uri_for(gem_repo1)}\"; gemspec")
+        gemfile("source 'https://gem.repo1'; gemspec")
 
-        File.open(bundled_app.join("foo.gemspec"), "wb") do |f|
+        File.open(bundled_app("foo.gemspec"), "wb") do |f|
           f.write(gemspec)
         end
 
@@ -158,7 +158,7 @@ def with_clear_paths(env_var, env_value)
       end
 
       it "prints the gemspec" do
-        output = described_class.report(:print_gemspecs => true)
+        output = described_class.report(print_gemspecs: true)
 
         expect(output).to include("foo.gemspec")
         expect(output).to include(gemspec)
@@ -167,17 +167,17 @@ def with_clear_paths(env_var, env_value)
 
     context "when eval_gemfile is used" do
       it "prints all gemfiles" do
-        create_file bundled_app("other/Gemfile-other"), "gem 'rack'"
-        create_file bundled_app("other/Gemfile"), "eval_gemfile 'Gemfile-other'"
-        create_file bundled_app("Gemfile-alt"), <<-G
-          source "#{file_uri_for(gem_repo1)}"
+        gemfile bundled_app("other/Gemfile-other"), "gem 'myrack'"
+        gemfile bundled_app("other/Gemfile"), "eval_gemfile 'Gemfile-other'"
+        gemfile bundled_app("Gemfile-alt"), <<-G
+          source "https://gem.repo1"
           eval_gemfile "other/Gemfile"
         G
         gemfile "eval_gemfile #{bundled_app("Gemfile-alt").to_s.dump}"
         allow(Bundler::SharedHelpers).to receive(:find_gemfile).and_return(bundled_app_gemfile)
         allow(Bundler::SharedHelpers).to receive(:pwd).and_return(bundled_app)
 
-        output = described_class.report(:print_gemspecs => true)
+        output = described_class.report(print_gemspecs: true)
         expect(output).to include(<<~ENV)
           ## Gemfile
 
@@ -190,7 +190,7 @@ def with_clear_paths(env_var, env_value)
           ### Gemfile-alt
 
           ```ruby
-          source "#{file_uri_for(gem_repo1)}"
+          source "https://gem.repo1"
           eval_gemfile "other/Gemfile"
           ```
 
@@ -203,7 +203,7 @@ def with_clear_paths(env_var, env_value)
           ### other/Gemfile-other
 
           ```ruby
-          gem 'rack'
+          gem 'myrack'
           ```
 
           ### Gemfile.lock
diff --git a/spec/bundler/bundler/environment_preserver_spec.rb b/spec/bundler/bundler/environment_preserver_spec.rb
index 530ca6f8356d70..6c7066d0c604a6 100644
--- a/spec/bundler/bundler/environment_preserver_spec.rb
+++ b/spec/bundler/bundler/environment_preserver_spec.rb
@@ -27,8 +27,12 @@
     context "when a key is empty" do
       let(:env) { { "foo" => "" } }
 
-      it "should not create backup entries" do
-        expect(subject).not_to have_key "BUNDLER_ORIG_foo"
+      it "should keep the original entry" do
+        expect(subject["foo"]).to be_empty
+      end
+
+      it "should still create backup entries" do
+        expect(subject).to have_key "BUNDLER_ORIG_foo"
       end
     end
 
@@ -71,8 +75,12 @@
     context "when the original key is empty" do
       let(:env) { { "foo" => "my-foo", "BUNDLER_ORIG_foo" => "" } }
 
-      it "should keep the current value" do
-        expect(subject["foo"]).to eq("my-foo")
+      it "should restore the original value" do
+        expect(subject["foo"]).to be_empty
+      end
+
+      it "should delete the backup value" do
+        expect(subject.key?("BUNDLER_ORIG_foo")).to eq(false)
       end
     end
   end
diff --git a/spec/bundler/bundler/fetcher/base_spec.rb b/spec/bundler/bundler/fetcher/base_spec.rb
index 02506591f3774f..b8c6b57b10ef96 100644
--- a/spec/bundler/bundler/fetcher/base_spec.rb
+++ b/spec/bundler/bundler/fetcher/base_spec.rb
@@ -4,15 +4,16 @@
   let(:downloader)  { double(:downloader) }
   let(:remote)      { double(:remote) }
   let(:display_uri) { "http://sample_uri.com" }
+  let(:gem_remote_fetcher) { nil }
 
   class TestClass < described_class; end
 
-  subject { TestClass.new(downloader, remote, display_uri) }
+  subject { TestClass.new(downloader, remote, display_uri, gem_remote_fetcher) }
 
   describe "#initialize" do
     context "with the abstract Base class" do
       it "should raise an error" do
-        expect { described_class.new(downloader, remote, display_uri) }.to raise_error(RuntimeError, "Abstract class")
+        expect { described_class.new(downloader, remote, display_uri, gem_remote_fetcher) }.to raise_error(RuntimeError, "Abstract class")
       end
     end
 
@@ -36,7 +37,7 @@ class TestClass < described_class; end
   end
 
   describe "#fetch_uri" do
-    let(:remote_uri_obj) { Bundler::URI("http://rubygems.org") }
+    let(:remote_uri_obj) { Gem::URI("http://rubygems.org") }
 
     before { allow(subject).to receive(:remote_uri).and_return(remote_uri_obj) }
 
@@ -49,10 +50,10 @@ class TestClass < described_class; end
     end
 
     context "when the remote uri's host is not rubygems.org" do
-      let(:remote_uri_obj) { Bundler::URI("http://otherhost.org") }
+      let(:remote_uri_obj) { Gem::URI("http://otherhost.org") }
 
       it "should return the remote uri" do
-        expect(subject.fetch_uri).to eq(Bundler::URI("http://otherhost.org"))
+        expect(subject.fetch_uri).to eq(Gem::URI("http://otherhost.org"))
       end
     end
 
diff --git a/spec/bundler/bundler/fetcher/compact_index_spec.rb b/spec/bundler/bundler/fetcher/compact_index_spec.rb
index 00eb27edea5083..aa536673d9076b 100644
--- a/spec/bundler/bundler/fetcher/compact_index_spec.rb
+++ b/spec/bundler/bundler/fetcher/compact_index_spec.rb
@@ -4,13 +4,18 @@
 require "bundler/compact_index_client"
 
 RSpec.describe Bundler::Fetcher::CompactIndex do
-  let(:downloader)  { double(:downloader) }
-  let(:display_uri) { Bundler::URI("http://sampleuri.com") }
-  let(:remote)      { double(:remote, :cache_slug => "lsjdf", :uri => display_uri) }
-  let(:compact_index) { described_class.new(downloader, remote, display_uri) }
+  let(:response) { double(:response) }
+  let(:downloader) { double(:downloader, fetch: response) }
+  let(:display_uri) { Gem::URI("http://sampleuri.com") }
+  let(:remote)      { double(:remote, cache_slug: "lsjdf", uri: display_uri) }
+  let(:gem_remote_fetcher) { nil }
+  let(:compact_index) { described_class.new(downloader, remote, display_uri, gem_remote_fetcher) }
+  let(:compact_index_client) { double(:compact_index_client, available?: true, info: [["lskdjf", "1", nil, [], []]]) }
 
   before do
+    allow(response).to receive(:is_a?).with(Gem::Net::HTTPNotModified).and_return(true)
     allow(compact_index).to receive(:log_specs) {}
+    allow(compact_index).to receive(:compact_index_client).and_return(compact_index_client)
   end
 
   describe "#specs_for_names" do
@@ -31,11 +36,6 @@
     end
 
     describe "#available?" do
-      before do
-        allow(compact_index).to receive(:compact_index_client).
-          and_return(double(:compact_index_client, :update_and_parse_checksums! => true))
-      end
-
       it "returns true" do
         expect(compact_index).to be_available
       end
diff --git a/spec/bundler/bundler/fetcher/dependency_spec.rb b/spec/bundler/bundler/fetcher/dependency_spec.rb
index 20307f9c99d090..c420b7c07f2022 100644
--- a/spec/bundler/bundler/fetcher/dependency_spec.rb
+++ b/spec/bundler/bundler/fetcher/dependency_spec.rb
@@ -2,10 +2,11 @@
 
 RSpec.describe Bundler::Fetcher::Dependency do
   let(:downloader)  { double(:downloader) }
-  let(:remote)      { double(:remote, :uri => Bundler::URI("http://localhost:5000")) }
+  let(:remote)      { double(:remote, uri: Gem::URI("http://localhost:5000")) }
   let(:display_uri) { "http://sample_uri.com" }
+  let(:gem_remote_fetcher) { nil }
 
-  subject { described_class.new(downloader, remote, display_uri) }
+  subject { described_class.new(downloader, remote, display_uri, gem_remote_fetcher) }
 
   describe "#available?" do
     let(:dependency_api_uri) { double(:dependency_api_uri) }
@@ -210,7 +211,7 @@
     let(:gem_names)         { [%w[foo bar], %w[bundler rubocop]] }
     let(:dep_api_uri)       { double(:dep_api_uri) }
     let(:unmarshalled_gems) { double(:unmarshalled_gems) }
-    let(:fetch_response)    { double(:fetch_response, :body => double(:body)) }
+    let(:fetch_response)    { double(:fetch_response, body: double(:body)) }
     let(:rubygems_limit)    { 50 }
 
     before { allow(subject).to receive(:dependency_api_uri).with(gem_names).and_return(dep_api_uri) }
@@ -227,20 +228,20 @@
     let(:gem_list) do
       [
         {
-          :dependencies => {
+          dependencies: {
             "resque" => "req3,req4",
           },
-          :name => "typhoeus",
-          :number => "1.0.1",
-          :platform => "ruby",
+          name: "typhoeus",
+          number: "1.0.1",
+          platform: "ruby",
         },
         {
-          :dependencies => {
+          dependencies: {
             "faraday" => "req1,req2",
           },
-          :name => "grape",
-          :number => "2.0.2",
-          :platform => "jruby",
+          name: "grape",
+          number: "2.0.2",
+          platform: "jruby",
         },
       ]
     end
@@ -254,7 +255,7 @@
   end
 
   describe "#dependency_api_uri" do
-    let(:uri) { Bundler::URI("http://gem-api.com") }
+    let(:uri) { Gem::URI("http://gem-api.com") }
 
     context "with gem names" do
       let(:gem_names) { %w[foo bar bundler rubocop] }
diff --git a/spec/bundler/bundler/fetcher/downloader_spec.rb b/spec/bundler/bundler/fetcher/downloader_spec.rb
index 22aa3a8b0c6809..36b9b949908caf 100644
--- a/spec/bundler/bundler/fetcher/downloader_spec.rb
+++ b/spec/bundler/bundler/fetcher/downloader_spec.rb
@@ -3,7 +3,7 @@
 RSpec.describe Bundler::Fetcher::Downloader do
   let(:connection)     { double(:connection) }
   let(:redirect_limit) { 5 }
-  let(:uri)            { Bundler::URI("http://www.uri-to-fetch.com/api/v2/endpoint") }
+  let(:uri)            { Gem::URI("http://www.uri-to-fetch.com/api/v2/endpoint") }
   let(:options)        { double(:options) }
 
   subject { described_class.new(connection, redirect_limit) }
@@ -27,7 +27,7 @@
     end
 
     context "logging" do
-      let(:http_response) { Net::HTTPSuccess.new("1.1", 200, "Success") }
+      let(:http_response) { Gem::Net::HTTPSuccess.new("1.1", 200, "Success") }
 
       it "should log the HTTP response code and message to debug" do
         expect(Bundler).to receive_message_chain(:ui, :debug).with("HTTP 200 Success #{uri}")
@@ -35,61 +35,61 @@
       end
     end
 
-    context "when the request response is a Net::HTTPRedirection" do
-      let(:http_response) { Net::HTTPRedirection.new(httpv, 308, "Moved") }
+    context "when the request response is a Gem::Net::HTTPRedirection" do
+      let(:http_response) { Gem::Net::HTTPRedirection.new(httpv, 308, "Moved") }
 
       before { http_response["location"] = "http://www.redirect-uri.com/api/v2/endpoint" }
 
       it "should try to fetch the redirect uri and iterate the # requests counter" do
-        expect(subject).to receive(:fetch).with(Bundler::URI("http://www.uri-to-fetch.com/api/v2/endpoint"), options, 0).and_call_original
-        expect(subject).to receive(:fetch).with(Bundler::URI("http://www.redirect-uri.com/api/v2/endpoint"), options, 1)
+        expect(subject).to receive(:fetch).with(Gem::URI("http://www.uri-to-fetch.com/api/v2/endpoint"), options, 0).and_call_original
+        expect(subject).to receive(:fetch).with(Gem::URI("http://www.redirect-uri.com/api/v2/endpoint"), options, 1)
         subject.fetch(uri, options, counter)
       end
 
       context "when the redirect uri and original uri are the same" do
-        let(:uri) { Bundler::URI("ssh://username:password@www.uri-to-fetch.com/api/v2/endpoint") }
+        let(:uri) { Gem::URI("ssh://username:password@www.uri-to-fetch.com/api/v2/endpoint") }
 
         before { http_response["location"] = "ssh://www.uri-to-fetch.com/api/v1/endpoint" }
 
         it "should set the same user and password for the redirect uri" do
-          expect(subject).to receive(:fetch).with(Bundler::URI("ssh://username:password@www.uri-to-fetch.com/api/v2/endpoint"), options, 0).and_call_original
-          expect(subject).to receive(:fetch).with(Bundler::URI("ssh://username:password@www.uri-to-fetch.com/api/v1/endpoint"), options, 1)
+          expect(subject).to receive(:fetch).with(Gem::URI("ssh://username:password@www.uri-to-fetch.com/api/v2/endpoint"), options, 0).and_call_original
+          expect(subject).to receive(:fetch).with(Gem::URI("ssh://username:password@www.uri-to-fetch.com/api/v1/endpoint"), options, 1)
           subject.fetch(uri, options, counter)
         end
       end
     end
 
-    context "when the request response is a Net::HTTPSuccess" do
-      let(:http_response) { Net::HTTPSuccess.new("1.1", 200, "Success") }
+    context "when the request response is a Gem::Net::HTTPSuccess" do
+      let(:http_response) { Gem::Net::HTTPSuccess.new("1.1", 200, "Success") }
 
       it "should return the response body" do
         expect(subject.fetch(uri, options, counter)).to eq(http_response)
       end
     end
 
-    context "when the request response is a Net::HTTPRequestEntityTooLarge" do
-      let(:http_response) { Net::HTTPRequestEntityTooLarge.new("1.1", 413, "Too Big") }
+    context "when the request response is a Gem::Net::HTTPRequestEntityTooLarge" do
+      let(:http_response) { Gem::Net::HTTPRequestEntityTooLarge.new("1.1", 413, "Too Big") }
 
       it "should raise a Bundler::Fetcher::FallbackError with the response body" do
         expect { subject.fetch(uri, options, counter) }.to raise_error(Bundler::Fetcher::FallbackError, "Body with info")
       end
     end
 
-    context "when the request response is a Net::HTTPUnauthorized" do
-      let(:http_response) { Net::HTTPUnauthorized.new("1.1", 401, "Unauthorized") }
+    context "when the request response is a Gem::Net::HTTPUnauthorized" do
+      let(:http_response) { Gem::Net::HTTPUnauthorized.new("1.1", 401, "Unauthorized") }
 
       it "should raise a Bundler::Fetcher::AuthenticationRequiredError with the uri host" do
         expect { subject.fetch(uri, options, counter) }.to raise_error(Bundler::Fetcher::AuthenticationRequiredError,
           /Authentication is required for www.uri-to-fetch.com/)
       end
 
-      it "should raise a Bundler::Fetcher::AuthenticationRequiredError with advices" do
+      it "should raise a Bundler::Fetcher::AuthenticationRequiredError with advice" do
         expect { subject.fetch(uri, options, counter) }.to raise_error(Bundler::Fetcher::AuthenticationRequiredError,
           /`bundle config set --global www\.uri-to-fetch\.com username:password`.*`BUNDLE_WWW__URI___TO___FETCH__COM`/m)
       end
 
-      context "when the there are credentials provided in the request" do
-        let(:uri) { Bundler::URI("http://user:password@www.uri-to-fetch.com") }
+      context "when there are credentials provided in the request" do
+        let(:uri) { Gem::URI("http://user:password@www.uri-to-fetch.com") }
 
         it "should raise a Bundler::Fetcher::BadAuthenticationError that doesn't contain the password" do
           expect { subject.fetch(uri, options, counter) }.
@@ -98,9 +98,9 @@
       end
     end
 
-    context "when the request response is a Net::HTTPForbidden" do
-      let(:http_response) { Net::HTTPForbidden.new("1.1", 403, "Forbidden") }
-      let(:uri) { Bundler::URI("http://user:password@www.uri-to-fetch.com") }
+    context "when the request response is a Gem::Net::HTTPForbidden" do
+      let(:http_response) { Gem::Net::HTTPForbidden.new("1.1", 403, "Forbidden") }
+      let(:uri) { Gem::URI("http://user:password@www.uri-to-fetch.com") }
 
       it "should raise a Bundler::Fetcher::AuthenticationForbiddenError with the uri host" do
         expect { subject.fetch(uri, options, counter) }.to raise_error(Bundler::Fetcher::AuthenticationForbiddenError,
@@ -108,29 +108,29 @@
       end
     end
 
-    context "when the request response is a Net::HTTPNotFound" do
-      let(:http_response) { Net::HTTPNotFound.new("1.1", 404, "Not Found") }
+    context "when the request response is a Gem::Net::HTTPNotFound" do
+      let(:http_response) { Gem::Net::HTTPNotFound.new("1.1", 404, "Not Found") }
 
-      it "should raise a Bundler::Fetcher::FallbackError with Net::HTTPNotFound" do
+      it "should raise a Bundler::Fetcher::FallbackError with Gem::Net::HTTPNotFound" do
         expect { subject.fetch(uri, options, counter) }.
-          to raise_error(Bundler::Fetcher::FallbackError, "Net::HTTPNotFound: http://www.uri-to-fetch.com/api/v2/endpoint")
+          to raise_error(Bundler::Fetcher::FallbackError, "Gem::Net::HTTPNotFound: http://www.uri-to-fetch.com/api/v2/endpoint")
       end
 
-      context "when the there are credentials provided in the request" do
-        let(:uri) { Bundler::URI("http://username:password@www.uri-to-fetch.com/api/v2/endpoint") }
+      context "when there are credentials provided in the request" do
+        let(:uri) { Gem::URI("http://username:password@www.uri-to-fetch.com/api/v2/endpoint") }
 
         it "should raise a Bundler::Fetcher::FallbackError that doesn't contain the password" do
           expect { subject.fetch(uri, options, counter) }.
-            to raise_error(Bundler::Fetcher::FallbackError, "Net::HTTPNotFound: http://username@www.uri-to-fetch.com/api/v2/endpoint")
+            to raise_error(Bundler::Fetcher::FallbackError, "Gem::Net::HTTPNotFound: http://username@www.uri-to-fetch.com/api/v2/endpoint")
         end
       end
     end
 
     context "when the request response is some other type" do
-      let(:http_response) { Net::HTTPBadGateway.new("1.1", 500, "Fatal Error") }
+      let(:http_response) { Gem::Net::HTTPBadGateway.new("1.1", 500, "Fatal Error") }
 
       it "should raise a Bundler::HTTPError with the response class and body" do
-        expect { subject.fetch(uri, options, counter) }.to raise_error(Bundler::HTTPError, "Net::HTTPBadGateway: Body with info")
+        expect { subject.fetch(uri, options, counter) }.to raise_error(Bundler::HTTPError, "Gem::Net::HTTPBadGateway: Body with info")
       end
     end
   end
@@ -140,7 +140,7 @@
     let(:response)     { double(:response) }
 
     before do
-      allow(Net::HTTP::Get).to receive(:new).with("/api/v2/endpoint", options).and_return(net_http_get)
+      allow(Gem::Net::HTTP::Get).to receive(:new).with("/api/v2/endpoint", options).and_return(net_http_get)
       allow(connection).to receive(:request).with(uri, net_http_get).and_return(response)
     end
 
@@ -152,37 +152,41 @@
     context "when there is a user provided in the request" do
       context "and there is also a password provided" do
         context "that contains cgi escaped characters" do
-          let(:uri) { Bundler::URI("http://username:password%24@www.uri-to-fetch.com/api/v2/endpoint") }
+          let(:uri) { Gem::URI("http://username:password%24@www.uri-to-fetch.com/api/v2/endpoint") }
 
-          it "should request basic authentication with the username and password" do
+          it "should request basic authentication with the username and password, and log the HTTP GET request to debug, without the password" do
             expect(net_http_get).to receive(:basic_auth).with("username", "password$")
+            expect(Bundler).to receive_message_chain(:ui, :debug).with("HTTP GET http://username@www.uri-to-fetch.com/api/v2/endpoint")
             subject.request(uri, options)
           end
         end
 
         context "that is all unescaped characters" do
-          let(:uri) { Bundler::URI("http://username:password@www.uri-to-fetch.com/api/v2/endpoint") }
-          it "should request basic authentication with the username and proper cgi compliant password" do
+          let(:uri) { Gem::URI("http://username:password@www.uri-to-fetch.com/api/v2/endpoint") }
+          it "should request basic authentication with the username and proper cgi compliant password, and log the HTTP GET request to debug, without the password" do
             expect(net_http_get).to receive(:basic_auth).with("username", "password")
+            expect(Bundler).to receive_message_chain(:ui, :debug).with("HTTP GET http://username@www.uri-to-fetch.com/api/v2/endpoint")
             subject.request(uri, options)
           end
         end
       end
 
-      context "and there is no password provided" do
-        let(:uri) { Bundler::URI("http://username@www.uri-to-fetch.com/api/v2/endpoint") }
+      context "and it's used as the authentication token" do
+        let(:uri) { Gem::URI("http://username@www.uri-to-fetch.com/api/v2/endpoint") }
 
-        it "should request basic authentication with just the user" do
+        it "should request basic authentication with just the user, and log the HTTP GET request to debug, without the token" do
           expect(net_http_get).to receive(:basic_auth).with("username", nil)
+          expect(Bundler).to receive_message_chain(:ui, :debug).with("HTTP GET http://www.uri-to-fetch.com/api/v2/endpoint")
           subject.request(uri, options)
         end
       end
 
-      context "that contains cgi escaped characters" do
-        let(:uri) { Bundler::URI("http://username%24@www.uri-to-fetch.com/api/v2/endpoint") }
+      context "and it's used as the authentication token, and contains cgi escaped characters" do
+        let(:uri) { Gem::URI("http://username%24@www.uri-to-fetch.com/api/v2/endpoint") }
 
-        it "should request basic authentication with the proper cgi compliant password user" do
+        it "should request basic authentication with the proper cgi compliant password user, and log the HTTP GET request to debug, without the token" do
           expect(net_http_get).to receive(:basic_auth).with("username$", nil)
+          expect(Bundler).to receive_message_chain(:ui, :debug).with("HTTP GET http://www.uri-to-fetch.com/api/v2/endpoint")
           subject.request(uri, options)
         end
       end
@@ -197,57 +201,68 @@
       end
     end
 
-    context "when the request response causes an error included in HTTP_ERRORS" do
-      let(:message) { nil }
-      let(:error)   { RuntimeError.new(message) }
+    context "when the request response causes an HTTP error" do
+      let(:message) { "error about network" }
+      let(:error) { error_class.new(message) }
 
       before do
-        stub_const("Bundler::Fetcher::HTTP_ERRORS", [RuntimeError])
         allow(connection).to receive(:request).with(uri, net_http_get) { raise error }
       end
 
-      it "should trace log the error" do
-        allow(Bundler).to receive_message_chain(:ui, :debug)
-        expect(Bundler).to receive_message_chain(:ui, :trace).with(error)
-        expect { subject.request(uri, options) }.to raise_error(Bundler::HTTPError)
-      end
-
-      context "when error message is about the host being down" do
-        let(:message) { "host down: http://www.uri-to-fetch.com" }
+      context "that it's retryable" do
+        let(:error_class) { Gem::Timeout::Error }
 
-        it "should raise a Bundler::Fetcher::NetworkDownError" do
-          expect { subject.request(uri, options) }.to raise_error(Bundler::Fetcher::NetworkDownError,
-            /Could not reach host www.uri-to-fetch.com/)
+        it "should trace log the error" do
+          allow(Bundler).to receive_message_chain(:ui, :debug)
+          expect(Bundler).to receive_message_chain(:ui, :trace).with(error)
+          expect { subject.request(uri, options) }.to raise_error(Bundler::HTTPError)
         end
-      end
-
-      context "when error message is not about host down" do
-        let(:message) { "other error about network" }
 
         it "should raise a Bundler::HTTPError" do
           expect { subject.request(uri, options) }.to raise_error(Bundler::HTTPError,
-            "Network error while fetching http://www.uri-to-fetch.com/api/v2/endpoint (other error about network)")
+            "Network error while fetching http://www.uri-to-fetch.com/api/v2/endpoint (error about network)")
         end
 
-        context "when the there are credentials provided in the request" do
-          let(:uri) { Bundler::URI("http://username:password@www.uri-to-fetch.com/api/v2/endpoint") }
+        context "when there are credentials provided in the request" do
+          let(:uri) { Gem::URI("http://username:password@www.uri-to-fetch.com/api/v2/endpoint") }
           before do
             allow(net_http_get).to receive(:basic_auth).with("username", "password")
           end
 
           it "should raise a Bundler::HTTPError that doesn't contain the password" do
             expect { subject.request(uri, options) }.to raise_error(Bundler::HTTPError,
-              "Network error while fetching http://username@www.uri-to-fetch.com/api/v2/endpoint (other error about network)")
+              "Network error while fetching http://username@www.uri-to-fetch.com/api/v2/endpoint (error about network)")
           end
         end
       end
 
-      context "when error message is about no route to host" do
+      context "when error is about the host being down" do
+        let(:error_class) { Gem::Net::HTTP::Persistent::Error }
+        let(:message) { "host down: http://www.uri-to-fetch.com" }
+
+        it "should raise a Bundler::Fetcher::NetworkDownError" do
+          expect { subject.request(uri, options) }.to raise_error(Bundler::Fetcher::NetworkDownError,
+            /Could not reach host www.uri-to-fetch.com/)
+        end
+      end
+
+      context "when error is about connection refused" do
+        let(:error_class) { Gem::Net::HTTP::Persistent::Error }
+        let(:message) { "connection refused down: http://www.uri-to-fetch.com" }
+
+        it "should raise a Bundler::Fetcher::NetworkDownError" do
+          expect { subject.request(uri, options) }.to raise_error(Bundler::Fetcher::NetworkDownError,
+            /Could not reach host www.uri-to-fetch.com/)
+        end
+      end
+
+      context "when error is about no route to host" do
+        let(:error_class) { SocketError }
         let(:message) { "Failed to open TCP connection to www.uri-to-fetch.com:443 " }
 
-        it "should raise a Bundler::Fetcher::HTTPError" do
-          expect { subject.request(uri, options) }.to raise_error(Bundler::HTTPError,
-            "Network error while fetching http://www.uri-to-fetch.com/api/v2/endpoint (#{message})")
+        it "should raise a Bundler::Fetcher::NetworkDownError" do
+          expect { subject.request(uri, options) }.to raise_error(Bundler::Fetcher::NetworkDownError,
+            /Could not reach host www.uri-to-fetch.com/)
         end
       end
     end
diff --git a/spec/bundler/bundler/fetcher/index_spec.rb b/spec/bundler/bundler/fetcher/index_spec.rb
index 971b64ce8f5538..a6a18efd98ebec 100644
--- a/spec/bundler/bundler/fetcher/index_spec.rb
+++ b/spec/bundler/bundler/fetcher/index_spec.rb
@@ -4,12 +4,15 @@
 
 RSpec.describe Bundler::Fetcher::Index do
   let(:downloader)  { nil }
-  let(:remote)      { nil }
+  let(:remote)      { double(:remote, uri: remote_uri) }
+  let(:remote_uri)  { Gem::URI("http://#{userinfo}remote-uri.org") }
+  let(:userinfo)    { "" }
   let(:display_uri) { "http://sample_uri.com" }
   let(:rubygems)    { double(:rubygems) }
   let(:gem_names)   { %w[foo bar] }
+  let(:gem_remote_fetcher) { nil }
 
-  subject { described_class.new(downloader, remote, display_uri) }
+  subject { described_class.new(downloader, remote, display_uri, gem_remote_fetcher) }
 
   before { allow(Bundler).to receive(:rubygems).and_return(rubygems) }
 
@@ -19,10 +22,8 @@
   end
 
   context "error handling" do
-    let(:remote_uri) { Bundler::URI("http://remote-uri.org") }
     before do
       allow(rubygems).to receive(:fetch_all_remote_specs) { raise Gem::RemoteFetcher::FetchError.new(error_message, display_uri) }
-      allow(subject).to receive(:remote_uri).and_return(remote_uri)
     end
 
     context "when certificate verify failed" do
@@ -37,25 +38,17 @@
     context "when a 401 response occurs" do
       let(:error_message) { "401" }
 
-      before do
-        allow(remote_uri).to receive(:userinfo).and_return(userinfo)
+      it "should raise a Bundler::Fetcher::AuthenticationRequiredError" do
+        expect { subject.specs(gem_names) }.to raise_error(Bundler::Fetcher::AuthenticationRequiredError,
+          %r{Authentication is required for http://remote-uri.org})
       end
 
       context "and there was userinfo" do
-        let(:userinfo) { double(:userinfo) }
+        let(:userinfo) { "user:pass@" }
 
         it "should raise a Bundler::Fetcher::BadAuthenticationError" do
           expect { subject.specs(gem_names) }.to raise_error(Bundler::Fetcher::BadAuthenticationError,
-            %r{Bad username or password for http://remote-uri.org})
-        end
-      end
-
-      context "and there was no userinfo" do
-        let(:userinfo) { nil }
-
-        it "should raise a Bundler::Fetcher::AuthenticationRequiredError" do
-          expect { subject.specs(gem_names) }.to raise_error(Bundler::Fetcher::AuthenticationRequiredError,
-            %r{Authentication is required for http://remote-uri.org})
+            %r{Bad username or password for http://user@remote-uri.org})
         end
       end
     end
@@ -72,7 +65,7 @@
     context "any other message is returned" do
       let(:error_message) { "You get an error, you get an error!" }
 
-      before { allow(Bundler).to receive(:ui).and_return(double(:trace => nil)) }
+      before { allow(Bundler).to receive(:ui).and_return(double(trace: nil)) }
 
       it "should raise a Bundler::HTTPError" do
         expect { subject.specs(gem_names) }.to raise_error(Bundler::HTTPError, "Could not fetch specs from http://sample_uri.com due to underlying error <You get an error, you get an error! (http://sample_uri.com)>")
diff --git a/spec/bundler/bundler/fetcher_spec.rb b/spec/bundler/bundler/fetcher_spec.rb
index 92790dc7d6f744..e20f7e7c481a7d 100644
--- a/spec/bundler/bundler/fetcher_spec.rb
+++ b/spec/bundler/bundler/fetcher_spec.rb
@@ -3,8 +3,8 @@
 require "bundler/fetcher"
 
 RSpec.describe Bundler::Fetcher do
-  let(:uri) { Bundler::URI("https://example.com") }
-  let(:remote) { double("remote", :uri => uri, :original_uri => nil) }
+  let(:uri) { Gem::URI("https://example.com") }
+  let(:remote) { double("remote", uri: uri, original_uri: nil) }
 
   subject(:fetcher) { Bundler::Fetcher.new(remote) }
 
@@ -45,9 +45,9 @@
     end
 
     context "when a rubygems source mirror is set" do
-      let(:orig_uri) { Bundler::URI("http://zombo.com") }
+      let(:orig_uri) { Gem::URI("http://zombo.com") }
       let(:remote_with_mirror) do
-        double("remote", :uri => uri, :original_uri => orig_uri, :anonymized_uri => uri)
+        double("remote", uri: uri, original_uri: orig_uri, anonymized_uri: uri)
       end
 
       let(:fetcher) { Bundler::Fetcher.new(remote_with_mirror) }
@@ -61,7 +61,7 @@
 
     context "when there is no rubygems source mirror set" do
       let(:remote_no_mirror) do
-        double("remote", :uri => uri, :original_uri => nil, :anonymized_uri => uri)
+        double("remote", uri: uri, original_uri: nil, anonymized_uri: uri)
       end
 
       let(:fetcher) { Bundler::Fetcher.new(remote_no_mirror) }
@@ -114,9 +114,9 @@
     context "when gem ssl configuration is set" do
       before do
         allow(Gem.configuration).to receive_messages(
-          :http_proxy => nil,
-          :ssl_client_cert => "cert",
-          :ssl_ca_cert => "ca"
+          http_proxy: nil,
+          ssl_client_cert: "cert",
+          ssl_ca_cert: "ca"
         )
         expect(File).to receive(:read).and_return("")
         expect(OpenSSL::X509::Certificate).to receive(:new).and_return("cert")
@@ -143,18 +143,20 @@
 
     describe "include CI information" do
       it "from one CI" do
-        with_env_vars("JENKINS_URL" => "foo") do
+        with_env_vars("CI" => nil, "JENKINS_URL" => "foo") do
           ci_part = fetcher.user_agent.split(" ").find {|x| x.start_with?("ci/") }
-          expect(ci_part).to match("jenkins")
+          cis = ci_part.split("/").last.split(",")
+          expect(cis).to include("jenkins")
+          expect(cis).not_to include("ci")
         end
       end
 
       it "from many CI" do
-        with_env_vars("TRAVIS" => "foo", "GITLAB_CI" => "gitlab", "CI_NAME" => "my_ci") do
+        with_env_vars("CI" => "true", "SEMAPHORE" => nil, "TRAVIS" => "foo", "GITLAB_CI" => "gitlab", "CI_NAME" => "MY_ci") do
           ci_part = fetcher.user_agent.split(" ").find {|x| x.start_with?("ci/") }
-          expect(ci_part).to match("travis")
-          expect(ci_part).to match("gitlab")
-          expect(ci_part).to match("my_ci")
+          cis = ci_part.split("/").last.split(",")
+          expect(cis).to include("ci", "gitlab", "my_ci", "travis")
+          expect(cis).not_to include("semaphore")
         end
       end
     end
@@ -165,7 +167,7 @@
     let(:version) { "1.3.17" }
     let(:platform) { "platform" }
     let(:downloader) { double("downloader") }
-    let(:body) { double(Net::HTTP::Get, :body => downloaded_data) }
+    let(:body) { double(Gem::Net::HTTP::Get, body: downloaded_data) }
 
     context "when attempting to load a Gem::Specification" do
       let(:spec) { Gem::Specification.new(name, version) }
@@ -192,10 +194,10 @@
 
   describe "#specs_with_retry" do
     let(:downloader)  { double(:downloader) }
-    let(:remote)      { double(:remote, :cache_slug => "slug", :uri => uri, :original_uri => nil, :anonymized_uri => uri) }
-    let(:compact_index) { double(Bundler::Fetcher::CompactIndex, :available? => true, :api_fetcher? => true) }
-    let(:dependency)    { double(Bundler::Fetcher::Dependency, :available? => true, :api_fetcher? => true) }
-    let(:index)         { double(Bundler::Fetcher::Index, :available? => true, :api_fetcher? => false) }
+    let(:remote)      { double(:remote, cache_slug: "slug", uri: uri, original_uri: nil, anonymized_uri: uri) }
+    let(:compact_index) { double(Bundler::Fetcher::CompactIndex, available?: true, api_fetcher?: true) }
+    let(:dependency)    { double(Bundler::Fetcher::Dependency, available?: true, api_fetcher?: true) }
+    let(:index)         { double(Bundler::Fetcher::Index, available?: true, api_fetcher?: false) }
 
     before do
       allow(Bundler::Fetcher::CompactIndex).to receive(:new).and_return(compact_index)
@@ -228,10 +230,10 @@
 
   describe "#api_fetcher?" do
     let(:downloader)  { double(:downloader) }
-    let(:remote)      { double(:remote, :cache_slug => "slug", :uri => uri, :original_uri => nil, :anonymized_uri => uri) }
-    let(:compact_index) { double(Bundler::Fetcher::CompactIndex, :available? => false, :api_fetcher? => true) }
-    let(:dependency)    { double(Bundler::Fetcher::Dependency, :available? => false, :api_fetcher? => true) }
-    let(:index)         { double(Bundler::Fetcher::Index, :available? => true, :api_fetcher? => false) }
+    let(:remote)      { double(:remote, cache_slug: "slug", uri: uri, original_uri: nil, anonymized_uri: uri) }
+    let(:compact_index) { double(Bundler::Fetcher::CompactIndex, available?: false, api_fetcher?: true) }
+    let(:dependency)    { double(Bundler::Fetcher::Dependency, available?: false, api_fetcher?: true) }
+    let(:index)         { double(Bundler::Fetcher::Index, available?: true, api_fetcher?: false) }
 
     before do
       allow(Bundler::Fetcher::CompactIndex).to receive(:new).and_return(compact_index)
diff --git a/spec/bundler/bundler/friendly_errors_spec.rb b/spec/bundler/bundler/friendly_errors_spec.rb
index 37afe488f322dd..d6a9d4813dbacc 100644
--- a/spec/bundler/bundler/friendly_errors_spec.rb
+++ b/spec/bundler/bundler/friendly_errors_spec.rb
@@ -2,7 +2,8 @@
 
 require "bundler"
 require "bundler/friendly_errors"
-require "cgi"
+require "cgi/escape"
+require "cgi/util" unless defined?(CGI::EscapeExt)
 
 RSpec.describe Bundler, "friendly errors" do
   context "with invalid YAML in .gemrc" do
@@ -18,11 +19,11 @@
 
     it "reports a relevant friendly error message" do
       gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
-        gem "rack"
+        source "https://gem.repo1"
+        gem "myrack"
       G
 
-      bundle :install, :env => { "DEBUG" => "true" }
+      bundle :install, env: { "DEBUG" => "true" }
 
       expect(err).to include("Failed to load #{home(".gemrc")}")
     end
@@ -101,7 +102,7 @@
     context "BundlerError" do
       it "Bundler.ui receive error" do
         error = Bundler::BundlerError.new
-        expect(Bundler.ui).to receive(:error).with(error.message, :wrap => true)
+        expect(Bundler.ui).to receive(:error).with(error.message, wrap: true)
         Bundler::FriendlyErrors.log_error(error)
       end
     end
@@ -121,7 +122,7 @@
     context "Gem::InvalidSpecificationException" do
       it "Bundler.ui receive error" do
         error = Gem::InvalidSpecificationException.new
-        expect(Bundler.ui).to receive(:error).with(error.message, :wrap => true)
+        expect(Bundler.ui).to receive(:error).with(error.message, wrap: true)
         Bundler::FriendlyErrors.log_error(error)
       end
     end
@@ -130,17 +131,13 @@
       # Does nothing
     end
 
-    context "Java::JavaLang::OutOfMemoryError" do
-      module Java
-        module JavaLang
-          class OutOfMemoryError < StandardError; end
-        end
-      end
-
+    context "Java::JavaLang::OutOfMemoryError", :jruby_only do
       it "Bundler.ui receive error" do
-        error = Java::JavaLang::OutOfMemoryError.new
-        expect(Bundler.ui).to receive(:error).with(/JVM has run out of memory/)
-        Bundler::FriendlyErrors.log_error(error)
+        install_gemfile <<-G, raise_on_error: false, env: { "JRUBY_OPTS" => "-J-Xmx32M" }, artifice: nil
+          source "https://gem.repo1"
+        G
+
+        expect(err).to include("JVM has run out of memory")
       end
     end
 
diff --git a/spec/bundler/bundler/gem_helper_spec.rb b/spec/bundler/bundler/gem_helper_spec.rb
index 7d955007ab935c..94f66537d3ebf6 100644
--- a/spec/bundler/bundler/gem_helper_spec.rb
+++ b/spec/bundler/bundler/gem_helper_spec.rb
@@ -11,7 +11,7 @@
   before(:each) do
     global_config "BUNDLE_GEM__MIT" => "false", "BUNDLE_GEM__TEST" => "false", "BUNDLE_GEM__COC" => "false", "BUNDLE_GEM__LINTER" => "false",
                   "BUNDLE_GEM__CI" => "false", "BUNDLE_GEM__CHANGELOG" => "false"
-    sys_exec("git config --global init.defaultBranch main")
+    git("config --global init.defaultBranch main")
     bundle "gem #{app_name}"
     prepare_gemspec(app_gemspec_path)
   end
@@ -253,11 +253,11 @@ def sha512_hexdigest(path)
       end
 
       before do
-        sys_exec("git init", :dir => app_path)
-        sys_exec("git config user.email \"you@example.com\"", :dir => app_path)
-        sys_exec("git config user.name \"name\"", :dir => app_path)
-        sys_exec("git config commit.gpgsign false", :dir => app_path)
-        sys_exec("git config push.default simple", :dir => app_path)
+        git("init", app_path)
+        git("config user.email \"you@example.com\"", app_path)
+        git("config user.name \"name\"", app_path)
+        git("config commit.gpgsign false", app_path)
+        git("config push.default simple", app_path)
 
         # silence messages
         allow(Bundler.ui).to receive(:confirm)
@@ -271,23 +271,23 @@ def sha512_hexdigest(path)
         end
 
         it "when there are uncommitted files" do
-          sys_exec("git add .", :dir => app_path)
+          git("add .", app_path)
           expect { Rake.application["release"].invoke }.
             to raise_error("There are files that need to be committed first.")
         end
 
         it "when there is no git remote" do
-          sys_exec("git commit -a -m \"initial commit\"", :dir => app_path)
+          git("commit -a -m \"initial commit\"", app_path)
           expect { Rake.application["release"].invoke }.to raise_error(RuntimeError)
         end
       end
 
       context "succeeds" do
-        let(:repo) { build_git("foo", :bare => true) }
+        let(:repo) { build_git("foo", bare: true) }
 
         before do
-          sys_exec("git remote add origin #{file_uri_for(repo.path)}", :dir => app_path)
-          sys_exec('git commit -a -m "initial commit"', :dir => app_path)
+          git("remote add origin #{repo.path}", app_path)
+          git('commit -a -m "initial commit"', app_path)
         end
 
         context "on releasing" do
@@ -296,7 +296,7 @@ def sha512_hexdigest(path)
             mock_confirm_message "Tagged v#{app_version}."
             mock_confirm_message "Pushed git commits and release tag."
 
-            sys_exec("git push -u origin main", :dir => app_path)
+            git("push -u origin main", app_path)
           end
 
           it "calls rubygem_push with proper arguments" do
@@ -314,8 +314,8 @@ def sha512_hexdigest(path)
 
           it "also works when releasing from an ambiguous reference" do
             # Create a branch with the same name as the tag
-            sys_exec("git checkout -b v#{app_version}", :dir => app_path)
-            sys_exec("git push -u origin v#{app_version}", :dir => app_path)
+            git("checkout -b v#{app_version}", app_path)
+            git("push -u origin v#{app_version}", app_path)
 
             expect(subject).to receive(:rubygem_push).with(app_gem_path.to_s)
 
@@ -323,7 +323,7 @@ def sha512_hexdigest(path)
           end
 
           it "also works with releasing from a branch not yet pushed" do
-            sys_exec("git checkout -b module_function", :dir => app_path)
+            git("checkout -b module_function", app_path)
 
             expect(subject).to receive(:rubygem_push).with(app_gem_path.to_s)
 
@@ -337,7 +337,7 @@ def sha512_hexdigest(path)
             mock_build_message app_name, app_version
             mock_confirm_message "Pushed git commits and release tag."
 
-            sys_exec("git push -u origin main", :dir => app_path)
+            git("push -u origin main", app_path)
             expect(subject).to receive(:rubygem_push).with(app_gem_path.to_s)
           end
 
@@ -353,7 +353,7 @@ def sha512_hexdigest(path)
           mock_confirm_message "Tag v#{app_version} has already been created."
           expect(subject).to receive(:rubygem_push).with(app_gem_path.to_s)
 
-          sys_exec("git tag -a -m \"Version #{app_version}\" v#{app_version}", :dir => app_path)
+          git("tag -a -m \"Version #{app_version}\" v#{app_version}", app_path)
 
           Rake.application["release"].invoke
         end
@@ -374,10 +374,10 @@ def sha512_hexdigest(path)
       end
 
       before do
-        sys_exec("git init", :dir => app_path)
-        sys_exec("git config user.email \"you@example.com\"", :dir => app_path)
-        sys_exec("git config user.name \"name\"", :dir => app_path)
-        sys_exec("git config push.gpgsign simple", :dir => app_path)
+        git("init", app_path)
+        git("config user.email \"you@example.com\"", app_path)
+        git("config user.name \"name\"", app_path)
+        git("config push.gpgsign simple", app_path)
 
         # silence messages
         allow(Bundler.ui).to receive(:confirm)
diff --git a/spec/bundler/bundler/gem_version_promoter_spec.rb b/spec/bundler/bundler/gem_version_promoter_spec.rb
index 8058412f32c002..0e1b7c9cc82f00 100644
--- a/spec/bundler/bundler/gem_version_promoter_spec.rb
+++ b/spec/bundler/bundler/gem_version_promoter_spec.rb
@@ -20,26 +20,26 @@ def build_candidates(versions)
       end
     end
 
-    def build_package(name, version, locked = [])
-      Bundler::Resolver::Package.new(name, [], :locked_specs => Bundler::SpecSet.new(build_spec(name, version)), :unlock => locked)
+    def build_package(name, version, unlock)
+      Bundler::Resolver::Package.new(name, [], locked_specs: Bundler::SpecSet.new(build_spec(name, version)), unlock: unlock)
     end
 
-    def sorted_versions(candidates:, current:, name: "foo", locked: [])
+    def sorted_versions(candidates:, current:, unlock: true)
       gvp.sort_versions(
-        build_package(name, current, locked),
+        build_package("foo", current, unlock),
         build_candidates(candidates)
       ).flatten.map(&:version).map(&:to_s)
     end
 
     it "numerically sorts versions" do
-      versions = sorted_versions(:candidates => %w[1.7.7 1.7.8 1.7.9 1.7.15 1.8.0], :current => "1.7.8")
-      expect(versions).to eq %w[1.7.7 1.7.8 1.7.9 1.7.15 1.8.0]
+      versions = sorted_versions(candidates: %w[1.7.7 1.7.8 1.7.9 1.7.15 1.8.0], current: "1.7.8")
+      expect(versions).to eq %w[1.8.0 1.7.15 1.7.9 1.7.8 1.7.7]
     end
 
     context "with no options" do
       it "defaults to level=:major, strict=false, pre=false" do
-        versions = sorted_versions(:candidates => %w[0.2.0 0.3.0 0.3.1 0.9.0 1.0.0 2.0.1 2.1.0], :current => "0.3.0")
-        expect(versions).to eq %w[0.2.0 0.3.0 0.3.1 0.9.0 1.0.0 2.0.1 2.1.0]
+        versions = sorted_versions(candidates: %w[0.2.0 0.3.0 0.3.1 0.9.0 1.0.0 2.0.1 2.1.0], current: "0.3.0")
+        expect(versions).to eq %w[2.1.0 2.0.1 1.0.0 0.9.0 0.3.1 0.3.0 0.2.0]
       end
     end
 
@@ -50,26 +50,26 @@ def sorted_versions(candidates:, current:, name: "foo", locked: [])
         before { gvp.level = :major }
 
         it "keeps downgrades" do
-          versions = sorted_versions(:candidates => %w[0.2.0 0.3.0 0.3.1 0.9.0 1.0.0 2.0.1 2.1.0], :current => "0.3.0")
-          expect(versions).to eq %w[0.2.0 0.3.0 0.3.1 0.9.0 1.0.0 2.0.1 2.1.0]
+          versions = sorted_versions(candidates: %w[0.2.0 0.3.0 0.3.1 0.9.0 1.0.0 2.0.1 2.1.0], current: "0.3.0")
+          expect(versions).to eq %w[2.1.0 2.0.1 1.0.0 0.9.0 0.3.1 0.3.0 0.2.0]
         end
       end
 
       context "when level is minor" do
         before { gvp.level = :minor }
 
-        it "removes downgrades and major upgrades" do
-          versions = sorted_versions(:candidates => %w[0.2.0 0.3.0 0.3.1 0.9.0 1.0.0 2.0.1 2.1.0], :current => "0.3.0")
-          expect(versions).to eq %w[0.3.0 0.3.1 0.9.0]
+        it "sorts highest minor within same major in first position" do
+          versions = sorted_versions(candidates: %w[0.2.0 0.3.0 0.3.1 0.9.0 1.0.0 2.0.1 2.1.0], current: "0.3.0")
+          expect(versions).to eq %w[0.9.0 0.3.1 0.3.0 1.0.0 2.1.0 2.0.1 0.2.0]
         end
       end
 
       context "when level is patch" do
         before { gvp.level = :patch }
 
-        it "removes downgrades and major and minor upgrades" do
-          versions = sorted_versions(:candidates => %w[0.2.0 0.3.0 0.3.1 0.9.0 1.0.0 2.0.1 2.1.0], :current => "0.3.0")
-          expect(versions).to eq %w[0.3.0 0.3.1]
+        it "sorts highest patch within same minor in first position" do
+          versions = sorted_versions(candidates: %w[0.2.0 0.3.0 0.3.1 0.9.0 1.0.0 2.0.1 2.1.0], current: "0.3.0")
+          expect(versions).to eq %w[0.3.1 0.3.0 0.9.0 1.0.0 2.0.1 2.1.0 0.2.0]
         end
       end
     end
@@ -81,26 +81,26 @@ def sorted_versions(candidates:, current:, name: "foo", locked: [])
         before { gvp.level = :major }
 
         it "orders by version" do
-          versions = sorted_versions(:candidates => %w[0.2.0 0.3.0 0.3.1 0.9.0 1.0.0 2.0.1 2.1.0], :current => "0.3.0")
-          expect(versions).to eq %w[0.2.0 0.3.0 0.3.1 0.9.0 1.0.0 2.0.1 2.1.0]
+          versions = sorted_versions(candidates: %w[0.2.0 0.3.0 0.3.1 0.9.0 1.0.0 2.0.1 2.1.0], current: "0.3.0")
+          expect(versions).to eq %w[2.1.0 2.0.1 1.0.0 0.9.0 0.3.1 0.3.0 0.2.0]
         end
       end
 
       context "when level is minor" do
         before { gvp.level = :minor }
 
-        it "favors downgrades, then upgrades by major descending, minor ascending, patch ascending" do
-          versions = sorted_versions(:candidates => %w[0.2.0 0.3.0 0.3.1 0.9.0 1.0.0 2.0.1 2.1.0], :current => "0.3.0")
-          expect(versions).to eq %w[0.2.0 2.0.1 2.1.0 1.0.0 0.3.0 0.3.1 0.9.0]
+        it "favors minor upgrades, then patch upgrades, then major upgrades, then downgrades" do
+          versions = sorted_versions(candidates: %w[0.2.0 0.3.0 0.3.1 0.9.0 1.0.0 2.0.1 2.1.0], current: "0.3.0")
+          expect(versions).to eq %w[0.9.0 0.3.1 0.3.0 1.0.0 2.1.0 2.0.1 0.2.0]
         end
       end
 
       context "when level is patch" do
         before { gvp.level = :patch }
 
-        it "favors downgrades, then upgrades by major descending, minor descending, patch ascending" do
-          versions = sorted_versions(:candidates => %w[0.2.0 0.3.0 0.3.1 0.9.0 1.0.0 2.0.1 2.1.0], :current => "0.3.0")
-          expect(versions).to eq %w[0.2.0 2.1.0 2.0.1 1.0.0 0.9.0 0.3.0 0.3.1]
+        it "favors patch upgrades, then minor upgrades, then major upgrades, then downgrades" do
+          versions = sorted_versions(candidates: %w[0.2.0 0.3.0 0.3.1 0.9.0 1.0.0 2.0.1 2.1.0], current: "0.3.0")
+          expect(versions).to eq %w[0.3.1 0.3.0 0.9.0 1.0.0 2.0.1 2.1.0 0.2.0]
         end
       end
     end
@@ -109,8 +109,8 @@ def sorted_versions(candidates:, current:, name: "foo", locked: [])
       before { gvp.pre = true }
 
       it "sorts regardless of prerelease status" do
-        versions = sorted_versions(:candidates => %w[1.7.7.pre 1.8.0 1.8.1.pre 1.8.1 2.0.0.pre 2.0.0], :current => "1.8.0")
-        expect(versions).to eq %w[1.7.7.pre 1.8.0 1.8.1.pre 1.8.1 2.0.0.pre 2.0.0]
+        versions = sorted_versions(candidates: %w[1.7.7.pre 1.8.0 1.8.1.pre 1.8.1 2.0.0.pre 2.0.0], current: "1.8.0")
+        expect(versions).to eq %w[2.0.0 2.0.0.pre 1.8.1 1.8.1.pre 1.8.0 1.7.7.pre]
       end
     end
 
@@ -118,17 +118,17 @@ def sorted_versions(candidates:, current:, name: "foo", locked: [])
       before { gvp.pre = false }
 
       it "deprioritizes prerelease gems" do
-        versions = sorted_versions(:candidates => %w[1.7.7.pre 1.8.0 1.8.1.pre 1.8.1 2.0.0.pre 2.0.0], :current => "1.8.0")
-        expect(versions).to eq %w[1.7.7.pre 1.8.1.pre 2.0.0.pre 1.8.0 1.8.1 2.0.0]
+        versions = sorted_versions(candidates: %w[1.7.7.pre 1.8.0 1.8.1.pre 1.8.1 2.0.0.pre 2.0.0], current: "1.8.0")
+        expect(versions).to eq %w[2.0.0 1.8.1 1.8.0 2.0.0.pre 1.8.1.pre 1.7.7.pre]
       end
     end
 
     context "when locking and not major" do
       before { gvp.level = :minor }
 
-      it "keeps the current version last" do
-        versions = sorted_versions(:candidates => %w[0.2.0 0.3.0 0.3.1 0.9.0 1.0.0 2.1.0 2.0.1], :current => "0.3.0", :locked => ["bar"])
-        expect(versions.last).to eq("0.3.0")
+      it "keeps the current version first" do
+        versions = sorted_versions(candidates: %w[0.2.0 0.3.0 0.3.1 0.9.0 1.0.0 2.1.0 2.0.1], current: "0.3.0", unlock: [])
+        expect(versions.first).to eq("0.3.0")
       end
     end
   end
diff --git a/spec/bundler/bundler/installer/gem_installer_spec.rb b/spec/bundler/bundler/installer/gem_installer_spec.rb
index e86bdf009aa603..dbd4e1d2c8cfeb 100644
--- a/spec/bundler/bundler/installer/gem_installer_spec.rb
+++ b/spec/bundler/bundler/installer/gem_installer_spec.rb
@@ -3,10 +3,11 @@
 require "bundler/installer/gem_installer"
 
 RSpec.describe Bundler::GemInstaller do
-  let(:definition) { instance_double("Definition", :locked_gems => nil) }
-  let(:installer) { instance_double("Installer", :definition => definition) }
+  let(:definition) { instance_double("Definition", locked_gems: nil) }
+  let(:installer) { instance_double("Installer", definition: definition) }
   let(:spec_source) { instance_double("SpecSource") }
-  let(:spec) { instance_double("Specification", :name => "dummy", :version => "0.0.1", :loaded_from => "dummy", :source => spec_source) }
+  let(:spec) { instance_double("Specification", name: "dummy", version: "0.0.1", loaded_from: "dummy", source: spec_source) }
+  let(:base_options) { { force: false, local: false, previous_spec: nil } }
 
   subject { described_class.new(spec, installer) }
 
@@ -14,7 +15,7 @@
     it "invokes install method with empty build_args" do
       allow(spec_source).to receive(:install).with(
         spec,
-        { :force => false, :ensure_builtin_gems_cached => false, :build_args => [], :previous_spec => nil }
+        base_options.merge(build_args: [])
       )
       subject.install_from_spec
     end
@@ -22,13 +23,11 @@
 
   context "spec_settings is build option" do
     it "invokes install method with build_args" do
-      allow(Bundler.settings).to receive(:[]).with(:bin)
-      allow(Bundler.settings).to receive(:[]).with(:inline)
-      allow(Bundler.settings).to receive(:[]).with(:forget_cli_options)
+      allow(Bundler.settings).to receive(:[])
       allow(Bundler.settings).to receive(:[]).with("build.dummy").and_return("--with-dummy-config=dummy")
       expect(spec_source).to receive(:install).with(
         spec,
-        { :force => false, :ensure_builtin_gems_cached => false, :build_args => ["--with-dummy-config=dummy"], :previous_spec => nil }
+        base_options.merge(build_args: ["--with-dummy-config=dummy"])
       )
       subject.install_from_spec
     end
@@ -36,13 +35,11 @@
 
   context "spec_settings is build option with spaces" do
     it "invokes install method with build_args" do
-      allow(Bundler.settings).to receive(:[]).with(:bin)
-      allow(Bundler.settings).to receive(:[]).with(:inline)
-      allow(Bundler.settings).to receive(:[]).with(:forget_cli_options)
+      allow(Bundler.settings).to receive(:[])
       allow(Bundler.settings).to receive(:[]).with("build.dummy").and_return("--with-dummy-config=dummy --with-another-dummy-config")
       expect(spec_source).to receive(:install).with(
         spec,
-        { :force => false, :ensure_builtin_gems_cached => false, :build_args => ["--with-dummy-config=dummy", "--with-another-dummy-config"], :previous_spec => nil }
+        base_options.merge(build_args: ["--with-dummy-config=dummy", "--with-another-dummy-config"])
       )
       subject.install_from_spec
     end
diff --git a/spec/bundler/bundler/installer/parallel_installer_spec.rb b/spec/bundler/bundler/installer/parallel_installer_spec.rb
deleted file mode 100644
index c8403a2e38922b..00000000000000
--- a/spec/bundler/bundler/installer/parallel_installer_spec.rb
+++ /dev/null
@@ -1,46 +0,0 @@
-# frozen_string_literal: true
-
-require "bundler/installer/parallel_installer"
-
-RSpec.describe Bundler::ParallelInstaller do
-  let(:installer) { instance_double("Installer") }
-  let(:all_specs) { [] }
-  let(:size) { 1 }
-  let(:standalone) { false }
-  let(:force) { false }
-
-  subject { described_class.new(installer, all_specs, size, standalone, force) }
-
-  context "when the spec set is not a valid resolution" do
-    let(:all_specs) do
-      [
-        build_spec("cucumber", "4.1.0") {|s| s.runtime "diff-lcs", "< 1.4" },
-        build_spec("diff-lcs", "1.4.4"),
-      ].flatten
-    end
-
-    it "prints a warning" do
-      expect(Bundler.ui).to receive(:warn).with(<<-W.strip)
-Your lockfile doesn't include a valid resolution.
-You can fix this by regenerating your lockfile or manually editing the bad locked gems to a version that satisfies all dependencies.
-The unmet dependencies are:
-* diff-lcs (< 1.4), dependency of cucumber-4.1.0, unsatisfied by diff-lcs-1.4.4
-      W
-      subject.check_for_unmet_dependencies
-    end
-  end
-
-  context "when the spec set is a valid resolution" do
-    let(:all_specs) do
-      [
-        build_spec("cucumber", "4.1.0") {|s| s.runtime "diff-lcs", "< 1.4" },
-        build_spec("diff-lcs", "1.3"),
-      ].flatten
-    end
-
-    it "doesn't print a warning" do
-      expect(Bundler.ui).not_to receive(:warn)
-      subject.check_for_unmet_dependencies
-    end
-  end
-end
diff --git a/spec/bundler/bundler/installer/spec_installation_spec.rb b/spec/bundler/bundler/installer/spec_installation_spec.rb
index e63ef26cb31631..cbe2589b99b740 100644
--- a/spec/bundler/bundler/installer/spec_installation_spec.rb
+++ b/spec/bundler/bundler/installer/spec_installation_spec.rb
@@ -42,24 +42,26 @@ def a_spec.full_name
     context "when all dependencies are installed" do
       it "returns true" do
         dependencies = []
-        dependencies << instance_double("SpecInstallation", :spec => "alpha", :name => "alpha", :installed? => true, :all_dependencies => [], :type => :production)
-        dependencies << instance_double("SpecInstallation", :spec => "beta", :name => "beta", :installed? => true, :all_dependencies => [], :type => :production)
-        all_specs = dependencies + [instance_double("SpecInstallation", :spec => "gamma", :name => "gamma", :installed? => false, :all_dependencies => [], :type => :production)]
+        dependencies << instance_double("SpecInstallation", spec: "alpha", name: "alpha", installed?: true, all_dependencies: [], type: :production)
+        dependencies << instance_double("SpecInstallation", spec: "beta", name: "beta", installed?: true, all_dependencies: [], type: :production)
+        all_specs = dependencies + [instance_double("SpecInstallation", spec: "gamma", name: "gamma", installed?: false, all_dependencies: [], type: :production)]
         spec = described_class.new(dep)
         allow(spec).to receive(:all_dependencies).and_return(dependencies)
-        expect(spec.dependencies_installed?(all_specs)).to be_truthy
+        installed_specs = all_specs.select(&:installed?).map {|s| [s.name, true] }.to_h
+        expect(spec.dependencies_installed?(installed_specs)).to be_truthy
       end
     end
 
     context "when all dependencies are not installed" do
       it "returns false" do
         dependencies = []
-        dependencies << instance_double("SpecInstallation", :spec => "alpha", :name => "alpha", :installed? => false, :all_dependencies => [], :type => :production)
-        dependencies << instance_double("SpecInstallation", :spec => "beta", :name => "beta", :installed? => true, :all_dependencies => [], :type => :production)
-        all_specs = dependencies + [instance_double("SpecInstallation", :spec => "gamma", :name => "gamma", :installed? => false, :all_dependencies => [], :type => :production)]
+        dependencies << instance_double("SpecInstallation", spec: "alpha", name: "alpha", installed?: false, all_dependencies: [], type: :production)
+        dependencies << instance_double("SpecInstallation", spec: "beta", name: "beta", installed?: true, all_dependencies: [], type: :production)
+        all_specs = dependencies + [instance_double("SpecInstallation", spec: "gamma", name: "gamma", installed?: false, all_dependencies: [], type: :production)]
         spec = described_class.new(dep)
         allow(spec).to receive(:all_dependencies).and_return(dependencies)
-        expect(spec.dependencies_installed?(all_specs)).to be_falsey
+        installed_specs = all_specs.select(&:installed?).map {|s| [s.name, true] }.to_h
+        expect(spec.dependencies_installed?(installed_specs)).to be_falsey
       end
     end
   end
diff --git a/spec/bundler/bundler/lockfile_parser_spec.rb b/spec/bundler/bundler/lockfile_parser_spec.rb
index 30fbeac71a5f5e..54aa6a0bfe37e7 100644
--- a/spec/bundler/bundler/lockfile_parser_spec.rb
+++ b/spec/bundler/bundler/lockfile_parser_spec.rb
@@ -22,6 +22,9 @@
       peiji-san!
       rake
 
+    CHECKSUMS
+      rake (10.3.2) sha256=814828c34f1315d7e7b7e8295184577cc4e969bad6156ac069d02d63f58d82e8
+
     RUBY VERSION
        ruby 2.1.3p242
 
@@ -33,7 +36,7 @@
     it "returns the attributes" do
       attributes = described_class.sections_in_lockfile(lockfile_contents)
       expect(attributes).to contain_exactly(
-        "BUNDLED WITH", "DEPENDENCIES", "GEM", "GIT", "PLATFORMS", "RUBY VERSION"
+        "BUNDLED WITH", "CHECKSUMS", "DEPENDENCIES", "GEM", "GIT", "PLATFORMS", "RUBY VERSION"
       )
     end
   end
@@ -60,7 +63,7 @@
 
       it "returns the same as > 1.0" do
         expect(subject).to contain_exactly(
-          described_class::BUNDLED, described_class::RUBY, described_class::PLUGIN
+          described_class::BUNDLED, described_class::CHECKSUMS, described_class::RUBY, described_class::PLUGIN
         )
       end
     end
@@ -70,7 +73,7 @@
 
       it "returns the same as for the release version" do
         expect(subject).to contain_exactly(
-          described_class::RUBY, described_class::PLUGIN
+          described_class::CHECKSUMS, described_class::RUBY, described_class::PLUGIN
         )
       end
     end
@@ -92,6 +95,134 @@
     end
   end
 
+  describe "X64_MINGW_LEGACY platform handling" do
+    before { allow(Bundler::SharedHelpers).to receive(:find_gemfile).and_return(bundled_app("gems.rb")) }
+
+    describe "when X64_MINGW_LEGACY is present alone" do
+      let(:lockfile_with_legacy_platform) { <<~L }
+        GEM
+          remote: https://rubygems.org/
+          specs:
+            rake (10.3.2)
+
+        PLATFORMS
+          ruby
+          x64-mingw32
+
+        DEPENDENCIES
+          rake
+
+        BUNDLED WITH
+           3.6.9
+      L
+
+      context "when bundle is not frozen" do
+        before { allow(Bundler).to receive(:frozen_bundle?).and_return(false) }
+        subject { described_class.new(lockfile_with_legacy_platform) }
+
+        it "replaces X64_MINGW_LEGACY with X64_MINGW" do
+          allow(Bundler::SharedHelpers).to receive(:major_deprecation)
+          expect(subject.platforms.map(&:to_s)).to contain_exactly("ruby", "x64-mingw-ucrt")
+          expect(subject.platforms.map(&:to_s)).not_to include("x64-mingw32")
+        end
+
+        it "shows deprecation warning for replacement" do
+          expect(Bundler::SharedHelpers).to receive(:major_deprecation).with(
+            2,
+            "Found x64-mingw32 in lockfile, which is deprecated. Using x64-mingw-ucrt, the replacement for x64-mingw32 in modern rubies, instead. Support for x64-mingw32 will be removed in Bundler 4.0.",
+            removed_message: "Found x64-mingw32 in lockfile, which is no longer supported as of Bundler 4.0."
+          )
+          subject
+        end
+      end
+
+      context "when bundle is frozen" do
+        before { allow(Bundler).to receive(:frozen_bundle?).and_return(true) }
+        subject { described_class.new(lockfile_with_legacy_platform) }
+
+        it "preserves X64_MINGW_LEGACY platform without replacement" do
+          expect(subject.platforms.map(&:to_s)).to contain_exactly("ruby", "x64-mingw32")
+        end
+
+        it "does not show any deprecation warnings" do
+          expect(Bundler::SharedHelpers).not_to receive(:major_deprecation)
+          subject
+        end
+      end
+    end
+
+    describe "when both X64_MINGW_LEGACY and X64_MINGW are present" do
+      let(:lockfile_with_both_platforms) { <<~L }
+        GEM
+          remote: https://rubygems.org/
+          specs:
+            rake (10.3.2)
+
+        PLATFORMS
+          ruby
+          x64-mingw32
+          x64-mingw-ucrt
+
+        DEPENDENCIES
+          rake
+
+        BUNDLED WITH
+           3.6.9
+      L
+
+      context "when bundle is not frozen" do
+        before { allow(Bundler).to receive(:frozen_bundle?).and_return(false) }
+        subject { described_class.new(lockfile_with_both_platforms) }
+
+        it "removes X64_MINGW_LEGACY and keeps X64_MINGW" do
+          allow(Bundler::SharedHelpers).to receive(:major_deprecation)
+          expect(subject.platforms.map(&:to_s)).to contain_exactly("ruby", "x64-mingw-ucrt")
+          expect(subject.platforms.map(&:to_s)).not_to include("x64-mingw32")
+        end
+
+        it "shows deprecation warning for removing legacy platform" do
+          expect(Bundler::SharedHelpers).to receive(:major_deprecation).with(
+            2,
+            "Found x64-mingw32 in lockfile, which is deprecated. Removing it. Support for x64-mingw32 will be removed in Bundler 4.0.",
+            removed_message: "Found x64-mingw32 in lockfile, which is no longer supported as of Bundler 4.0."
+          )
+          subject
+        end
+      end
+    end
+
+    describe "when no X64_MINGW_LEGACY platform is present" do
+      let(:lockfile_with_modern_platforms) { <<~L }
+        GEM
+          remote: https://rubygems.org/
+          specs:
+            rake (10.3.2)
+
+        PLATFORMS
+          ruby
+          x64-mingw-ucrt
+
+        DEPENDENCIES
+          rake
+
+        BUNDLED WITH
+           3.6.9
+      L
+
+      before { allow(Bundler).to receive(:frozen_bundle?).and_return(false) }
+      subject { described_class.new(lockfile_with_modern_platforms) }
+
+      it "preserves all modern platforms without changes" do
+        expect(subject.platforms.map(&:to_s)).to contain_exactly("ruby", "x64-mingw-ucrt")
+      end
+
+      it "does not show any deprecation warnings" do
+        expect(Bundler::SharedHelpers).not_to receive(:major_deprecation)
+        subject
+      end
+    end
+  end
+
   describe "#initialize" do
     before { allow(Bundler::SharedHelpers).to receive(:find_gemfile).and_return(bundled_app("gems.rb")) }
     subject { described_class.new(lockfile_contents) }
@@ -108,13 +239,21 @@
     end
     let(:specs) do
       [
-        Bundler::LazySpecification.new("peiji-san", v("1.2.0"), rb),
-        Bundler::LazySpecification.new("rake", v("10.3.2"), rb),
+        Bundler::LazySpecification.new("peiji-san", v("1.2.0"), Gem::Platform::RUBY),
+        Bundler::LazySpecification.new("rake", v("10.3.2"), Gem::Platform::RUBY),
       ]
     end
-    let(:platforms) { [rb] }
+    let(:platforms) { [Gem::Platform::RUBY] }
     let(:bundler_version) { Gem::Version.new("1.12.0.rc.2") }
     let(:ruby_version) { "ruby 2.1.3p242" }
+    let(:lockfile_path) { Bundler.default_lockfile.relative_path_from(Dir.pwd) }
+    let(:rake_sha256_checksum) do
+      Bundler::Checksum.from_lock(
+        "sha256=814828c34f1315d7e7b7e8295184577cc4e969bad6156ac069d02d63f58d82e8",
+        "#{lockfile_path}:20:17"
+      )
+    end
+    let(:rake_checksums) { [rake_sha256_checksum] }
 
     shared_examples_for "parsing" do
       it "parses correctly" do
@@ -125,6 +264,9 @@
         expect(subject.platforms).to eq platforms
         expect(subject.bundler_version).to eq bundler_version
         expect(subject.ruby_version).to eq ruby_version
+        rake_spec = specs.last
+        checksums = subject.sources.last.checksum_store.to_lock(specs.last)
+        expect(checksums).to eq("#{rake_spec.lock_name} #{rake_checksums.map(&:to_lock).sort.join(",")}")
       end
     end
 
@@ -149,5 +291,59 @@
       let(:lockfile_contents) { super().sub("peiji-san!", "peiji-san!\n    foo: bar") }
       include_examples "parsing"
     end
+
+    context "when the checksum is urlsafe base64 encoded" do
+      let(:lockfile_contents) do
+        super().sub(
+          "sha256=814828c34f1315d7e7b7e8295184577cc4e969bad6156ac069d02d63f58d82e8",
+          "sha256=gUgow08TFdfnt-gpUYRXfMTpabrWFWrAadAtY_WNgug="
+        )
+      end
+      include_examples "parsing"
+    end
+
+    context "when the checksum is of an unknown algorithm" do
+      let(:rake_sha512_checksum) do
+        Bundler::Checksum.from_lock(
+          "sha512=pVDn9GLmcFkz8vj1ueiVxj5uGKkAyaqYjEX8zG6L5O4BeVg3wANaKbQdpj/B82Nd/MHVszy6polHcyotUdwilQ==",
+          "#{lockfile_path}:20:17"
+        )
+      end
+      let(:lockfile_contents) do
+        super().sub(
+          "sha256=",
+          "sha512=pVDn9GLmcFkz8vj1ueiVxj5uGKkAyaqYjEX8zG6L5O4BeVg3wANaKbQdpj/B82Nd/MHVszy6polHcyotUdwilQ==,sha256="
+        )
+      end
+      let(:rake_checksums) { [rake_sha256_checksum, rake_sha512_checksum] }
+      include_examples "parsing"
+    end
+
+    context "when CHECKSUMS has duplicate checksums in the lockfile that don't match" do
+      let(:bad_checksum) { "sha256=c0ffee11c0ffee11c0ffee11c0ffee11c0ffee11c0ffee11c0ffee11c0ffee11" }
+      let(:lockfile_contents) { super().split(/(?<=CHECKSUMS\n)/m).insert(1, "  rake (10.3.2) #{bad_checksum}\n").join }
+
+      it "raises a security error" do
+        expect { subject }.to raise_error(Bundler::SecurityError) do |e|
+          expect(e.message).to match <<~MESSAGE
+            Bundler found mismatched checksums. This is a potential security risk.
+              rake (10.3.2) #{bad_checksum}
+                from the lockfile CHECKSUMS at #{lockfile_path}:20:17
+              rake (10.3.2) #{rake_sha256_checksum.to_lock}
+                from the lockfile CHECKSUMS at #{lockfile_path}:21:17
+
+            To resolve this issue you can either:
+              1. remove the matching checksum in #{lockfile_path}:21:17
+              2. run `bundle install`
+            or if you are sure that the new checksum from the lockfile CHECKSUMS at #{lockfile_path}:21:17 is correct:
+              1. remove the matching checksum in #{lockfile_path}:20:17
+              2. run `bundle install`
+
+            To ignore checksum security warnings, disable checksum validation with
+              `bundle config set --local disable_checksum_validation true`
+          MESSAGE
+        end
+      end
+    end
   end
 end
diff --git a/spec/bundler/bundler/mirror_spec.rb b/spec/bundler/bundler/mirror_spec.rb
index 1eaf1e9a8e01d0..ba1c6ed413daf8 100644
--- a/spec/bundler/bundler/mirror_spec.rb
+++ b/spec/bundler/bundler/mirror_spec.rb
@@ -36,12 +36,12 @@
 
   it "takes a string for the uri but returns an uri object" do
     mirror.uri = "http://localhost:9292"
-    expect(mirror.uri).to eq(Bundler::URI("http://localhost:9292"))
+    expect(mirror.uri).to eq(Gem::URI("http://localhost:9292"))
   end
 
   it "takes an uri object for the uri" do
-    mirror.uri = Bundler::URI("http://localhost:9293")
-    expect(mirror.uri).to eq(Bundler::URI("http://localhost:9293"))
+    mirror.uri = Gem::URI("http://localhost:9293")
+    expect(mirror.uri).to eq(Gem::URI("http://localhost:9293"))
   end
 
   context "without a uri" do
@@ -145,7 +145,7 @@
 end
 
 RSpec.describe Bundler::Settings::Mirrors do
-  let(:localhost_uri) { Bundler::URI("http://localhost:9292") }
+  let(:localhost_uri) { Gem::URI("http://localhost:9292") }
 
   context "with a just created mirror" do
     let(:mirrors) do
@@ -260,7 +260,7 @@
         before { mirrors.parse("mirror.all.fallback_timeout", "true") }
 
         it "returns the source uri, not localhost" do
-          expect(mirrors.for("http://whatever.com").uri).to eq(Bundler::URI("http://whatever.com/"))
+          expect(mirrors.for("http://whatever.com").uri).to eq(Gem::URI("http://whatever.com/"))
         end
       end
     end
@@ -270,7 +270,7 @@
 
       context "without a fallback timeout" do
         it "returns the uri that is not mirrored" do
-          expect(mirrors.for("http://whatever.com").uri).to eq(Bundler::URI("http://whatever.com/"))
+          expect(mirrors.for("http://whatever.com").uri).to eq(Gem::URI("http://whatever.com/"))
         end
 
         it "returns localhost for rubygems.org" do
@@ -282,11 +282,11 @@
         before { mirrors.parse("mirror.http://rubygems.org/.fallback_timeout", "true") }
 
         it "returns the uri that is not mirrored" do
-          expect(mirrors.for("http://whatever.com").uri).to eq(Bundler::URI("http://whatever.com/"))
+          expect(mirrors.for("http://whatever.com").uri).to eq(Gem::URI("http://whatever.com/"))
         end
 
         it "returns rubygems.org for rubygems.org" do
-          expect(mirrors.for("http://rubygems.org/").uri).to eq(Bundler::URI("http://rubygems.org/"))
+          expect(mirrors.for("http://rubygems.org/").uri).to eq(Gem::URI("http://rubygems.org/"))
         end
       end
     end
diff --git a/spec/bundler/bundler/plugin/dsl_spec.rb b/spec/bundler/bundler/plugin/dsl_spec.rb
index 00e39dca6924f2..235a5497352379 100644
--- a/spec/bundler/bundler/plugin/dsl_spec.rb
+++ b/spec/bundler/bundler/plugin/dsl_spec.rb
@@ -23,7 +23,7 @@
     it "adds #source with :type to list and also inferred_plugins list" do
       expect(dsl).to receive(:plugin).with("bundler-source-news").once
 
-      dsl.source("some_random_url", :type => "news") {}
+      dsl.source("some_random_url", type: "news") {}
 
       expect(dsl.inferred_plugins).to eq(["bundler-source-news"])
     end
@@ -31,8 +31,8 @@
     it "registers a source type plugin only once for multiple declarations" do
       expect(dsl).to receive(:plugin).with("bundler-source-news").and_call_original.once
 
-      dsl.source("some_random_url", :type => "news") {}
-      dsl.source("another_random_url", :type => "news") {}
+      dsl.source("some_random_url", type: "news") {}
+      dsl.source("another_random_url", type: "news") {}
     end
   end
 end
diff --git a/spec/bundler/bundler/plugin/index_spec.rb b/spec/bundler/bundler/plugin/index_spec.rb
index 5a7047459f49b3..565fc9b088e352 100644
--- a/spec/bundler/bundler/plugin/index_spec.rb
+++ b/spec/bundler/bundler/plugin/index_spec.rb
@@ -5,7 +5,7 @@
 
   before do
     allow(Bundler::SharedHelpers).to receive(:find_gemfile).and_return(bundled_app_gemfile)
-    gemfile "source \"#{file_uri_for(gem_repo1)}\""
+    gemfile "source 'https://gem.repo1'"
     path = lib_path(plugin_name)
     index.register_plugin("new-plugin", path.to_s, [path.join("lib").to_s], commands, sources, hooks)
   end
@@ -193,12 +193,4 @@
       include_examples "it cleans up"
     end
   end
-
-  describe "readonly disk without home" do
-    it "ignores being unable to create temp home dir" do
-      expect_any_instance_of(Bundler::Plugin::Index).to receive(:global_index_file).
-        and_raise(Bundler::GenericSystemCallError.new("foo", "bar"))
-      Bundler::Plugin::Index.new
-    end
-  end
 end
diff --git a/spec/bundler/bundler/plugin/installer_spec.rb b/spec/bundler/bundler/plugin/installer_spec.rb
index 2c50ee5afcf420..8e1879395a6320 100644
--- a/spec/bundler/bundler/plugin/installer_spec.rb
+++ b/spec/bundler/bundler/plugin/installer_spec.rb
@@ -6,7 +6,6 @@
   describe "cli install" do
     it "uses Gem.sources when non of the source is provided" do
       sources = double(:sources)
-      Bundler.settings # initialize it before we have to touch rubygems.ext_lock
       allow(Gem).to receive(:sources) { sources }
 
       allow(installer).to receive(:install_rubygems).
@@ -21,15 +20,15 @@
         allow(installer).to receive(:install_git).
           and_return("new-plugin" => spec)
 
-        expect(installer.install(["new-plugin"], :git => "https://some.ran/dom")).
+        expect(installer.install(["new-plugin"], git: "https://some.ran/dom")).
           to eq("new-plugin" => spec)
       end
 
       it "returns the installed spec after installing local git plugins" do
-        allow(installer).to receive(:install_local_git).
+        allow(installer).to receive(:install_git).
           and_return("new-plugin" => spec)
 
-        expect(installer.install(["new-plugin"], :local_git => "/phony/path/repo")).
+        expect(installer.install(["new-plugin"], git: "/phony/path/repo")).
           to eq("new-plugin" => spec)
       end
 
@@ -37,7 +36,7 @@
         allow(installer).to receive(:install_rubygems).
           and_return("new-plugin" => spec)
 
-        expect(installer.install(["new-plugin"], :source => "https://some.ran/dom")).
+        expect(installer.install(["new-plugin"], source: "https://some.ran/dom")).
           to eq("new-plugin" => spec)
       end
     end
@@ -52,13 +51,13 @@
 
       context "git plugins" do
         before do
-          build_git "ga-plugin", :path => lib_path("ga-plugin") do |s|
+          build_git "ga-plugin", path: lib_path("ga-plugin") do |s|
             s.write "plugins.rb"
           end
         end
 
         let(:result) do
-          installer.install(["ga-plugin"], :git => file_uri_for(lib_path("ga-plugin")))
+          installer.install(["ga-plugin"], git: lib_path("ga-plugin").to_s)
         end
 
         it "returns the installed spec after installing" do
@@ -75,13 +74,13 @@
 
       context "local git plugins" do
         before do
-          build_git "ga-plugin", :path => lib_path("ga-plugin") do |s|
+          build_git "ga-plugin", path: lib_path("ga-plugin") do |s|
             s.write "plugins.rb"
           end
         end
 
         let(:result) do
-          installer.install(["ga-plugin"], :local_git => lib_path("ga-plugin").to_s)
+          installer.install(["ga-plugin"], git: lib_path("ga-plugin").to_s)
         end
 
         it "returns the installed spec after installing" do
@@ -98,7 +97,7 @@
 
       context "rubygems plugins" do
         let(:result) do
-          installer.install(["re-plugin"], :source => file_uri_for(gem_repo2))
+          installer.install(["re-plugin"], source: file_uri_for(gem_repo2))
         end
 
         it "returns the installed spec after installing " do
@@ -113,7 +112,7 @@
 
       context "multiple plugins" do
         let(:result) do
-          installer.install(["re-plugin", "ma-plugin"], :source => file_uri_for(gem_repo2))
+          installer.install(["re-plugin", "ma-plugin"], source: file_uri_for(gem_repo2))
         end
 
         it "returns the installed spec after installing " do
diff --git a/spec/bundler/bundler/plugin_spec.rb b/spec/bundler/bundler/plugin_spec.rb
index d28479cf318d3c..fea39250006735 100644
--- a/spec/bundler/bundler/plugin_spec.rb
+++ b/spec/bundler/bundler/plugin_spec.rb
@@ -9,11 +9,11 @@
   let(:spec2) { double(:spec2) }
 
   before do
-    build_lib "new-plugin", :path => lib_path("new-plugin") do |s|
+    build_lib "new-plugin", path: lib_path("new-plugin") do |s|
       s.write "plugins.rb"
     end
 
-    build_lib "another-plugin", :path => lib_path("another-plugin") do |s|
+    build_lib "another-plugin", path: lib_path("another-plugin") do |s|
       s.write "plugins.rb"
     end
 
@@ -225,7 +225,7 @@
     end
   end
 
-  describe "#source_from_lock" do
+  describe "#from_lock" do
     it "returns instance of registered class initialized with locked opts" do
       opts = { "type" => "l_source", "remote" => "xyz", "other" => "random" }
       allow(index).to receive(:source_plugin).with("l_source") { "plugin_name" }
@@ -236,7 +236,7 @@
 
       expect(SClass).to receive(:new).
         with(hash_including("type" => "l_source", "uri" => "xyz", "other" => "random")) { s_instance }
-      expect(subject.source_from_lock(opts)).to be(s_instance)
+      expect(subject.from_lock(opts)).to be(s_instance)
     end
   end
 
@@ -247,7 +247,7 @@
       end
 
       it "returns plugin dir in app .bundle path" do
-        expect(subject.root).to eq(bundled_app.join(".bundle/plugin"))
+        expect(subject.root).to eq(bundled_app(".bundle/plugin"))
       end
     end
 
@@ -257,7 +257,7 @@
       end
 
       it "returns plugin dir in global bundle path" do
-        expect(subject.root).to eq(home.join(".bundle/plugin"))
+        expect(subject.root).to eq(home(".bundle/plugin"))
       end
     end
   end
@@ -275,7 +275,7 @@
   describe "#hook" do
     before do
       path = lib_path("foo-plugin")
-      build_lib "foo-plugin", :path => path do |s|
+      build_lib "foo-plugin", path: path do |s|
         s.write "plugins.rb", code
       end
 
@@ -333,5 +333,28 @@
         end.to output("win\n").to_stdout
       end
     end
+
+    context "the plugin load_path is invalid" do
+      before do
+        allow(index).to receive(:load_paths).with("foo-plugin").
+          and_return(["invalid-file-name1", "invalid-file-name2"])
+      end
+
+      it "outputs a useful warning" do
+        msg =
+          "The following plugin paths don't exist: invalid-file-name1, invalid-file-name2.\n\n" \
+          "This can happen if the plugin was " \
+          "installed with a different version of Ruby that has since been uninstalled.\n\n" \
+          "If you would like to reinstall the plugin, run:\n\n" \
+          "bundler plugin uninstall foo-plugin && bundler plugin install foo-plugin\n\n" \
+          "Continuing without installing plugin foo-plugin.\n"
+
+        expect(Bundler.ui).to receive(:warn).with(msg)
+
+        Plugin.hook(Bundler::Plugin::Events::EVENT1)
+
+        expect(subject.loaded?("foo-plugin")).to be_falsey
+      end
+    end
   end
 end
diff --git a/spec/bundler/bundler/remote_specification_spec.rb b/spec/bundler/bundler/remote_specification_spec.rb
index 921a47a2d3b849..f35b231d5869a0 100644
--- a/spec/bundler/bundler/remote_specification_spec.rb
+++ b/spec/bundler/bundler/remote_specification_spec.rb
@@ -17,7 +17,7 @@
   end
 
   describe "#fetch_platform" do
-    let(:remote_spec) { double(:remote_spec, :platform => "jruby") }
+    let(:remote_spec) { double(:remote_spec, platform: "jruby") }
 
     before { allow(spec_fetcher).to receive(:fetch_spec).and_return(remote_spec) }
 
@@ -113,7 +113,7 @@
 
     context "comparing a non sortable object" do
       let(:other) { Object.new }
-      let(:remote_spec) { double(:remote_spec, :platform => "jruby") }
+      let(:remote_spec) { double(:remote_spec, platform: "jruby") }
 
       before do
         allow(spec_fetcher).to receive(:fetch_spec).and_return(remote_spec)
@@ -127,8 +127,8 @@
   end
 
   describe "#__swap__" do
-    let(:spec) { double(:spec, :dependencies => []) }
-    let(:new_spec) { double(:new_spec, :dependencies => [], :runtime_dependencies => []) }
+    let(:spec) { double(:spec, dependencies: []) }
+    let(:new_spec) { double(:new_spec, dependencies: [], runtime_dependencies: []) }
 
     before { subject.instance_variable_set(:@_remote_specification, spec) }
 
@@ -157,7 +157,7 @@
 
   describe "method missing" do
     context "and is present in Gem::Specification" do
-      let(:remote_spec) { double(:remote_spec, :authors => "abcd") }
+      let(:remote_spec) { double(:remote_spec, authors: "abcd") }
 
       before do
         allow(subject).to receive(:_remote_specification).and_return(remote_spec)
@@ -172,7 +172,7 @@
 
   describe "respond to missing?" do
     context "and is present in Gem::Specification" do
-      let(:remote_spec) { double(:remote_spec, :authors => "abcd") }
+      let(:remote_spec) { double(:remote_spec, authors: "abcd") }
 
       before do
         allow(subject).to receive(:_remote_specification).and_return(remote_spec)
diff --git a/spec/bundler/bundler/resolver/candidate_spec.rb b/spec/bundler/bundler/resolver/candidate_spec.rb
index cd52c867c41cf2..aefad3316ed173 100644
--- a/spec/bundler/bundler/resolver/candidate_spec.rb
+++ b/spec/bundler/bundler/resolver/candidate_spec.rb
@@ -2,20 +2,19 @@
 
 RSpec.describe Bundler::Resolver::Candidate do
   it "compares fine" do
-    version1 = described_class.new("1.12.5", :specs => [Gem::Specification.new("foo", "1.12.5") {|s| s.platform = Gem::Platform::RUBY }])
-    version2 = described_class.new("1.12.5") # passing no specs creates a platform specific candidate, so sorts higher
+    version1 = described_class.new("1.12.5", priority: -1)
+    version2 = described_class.new("1.12.5", priority: 1)
 
-    expect(version2 >= version1).to be true
+    expect(version2 > version1).to be true
 
-    expect(version1.generic! == version2.generic!).to be true
-    expect(version1.platform_specific! == version2.platform_specific!).to be true
+    version1 = described_class.new("1.12.5")
+    version2 = described_class.new("1.12.5")
 
-    expect(version1.platform_specific! >= version2.generic!).to be true
-    expect(version2.platform_specific! >= version1.generic!).to be true
+    expect(version2 == version1).to be true
 
-    version1 = described_class.new("1.12.5", :specs => [Gem::Specification.new("foo", "1.12.5") {|s| s.platform = Gem::Platform::RUBY }])
-    version2 = described_class.new("1.12.5", :specs => [Gem::Specification.new("foo", "1.12.5") {|s| s.platform = Gem::Platform::X64_LINUX }])
+    version1 = described_class.new("1.12.5", priority: 1)
+    version2 = described_class.new("1.12.5", priority: -1)
 
-    expect(version2 >= version1).to be true
+    expect(version2 < version1).to be true
   end
 end
diff --git a/spec/bundler/bundler/retry_spec.rb b/spec/bundler/bundler/retry_spec.rb
index b893580d72ceec..ffbc07807429e6 100644
--- a/spec/bundler/bundler/retry_spec.rb
+++ b/spec/bundler/bundler/retry_spec.rb
@@ -68,7 +68,7 @@
       it "print error message with newlines" do
         allow(Bundler.ui).to  receive(:debug?).and_return(false)
         expect(Bundler.ui).to receive(:info).with("").twice
-        expect(Bundler.ui).to receive(:warn).with(failure_message, false)
+        expect(Bundler.ui).to receive(:warn).with(failure_message, true)
 
         expect do
           Bundler::Retry.new("test", [], 1).attempt do
diff --git a/spec/bundler/bundler/ruby_dsl_spec.rb b/spec/bundler/bundler/ruby_dsl_spec.rb
index 4af271ad59fff1..2607f746e76653 100644
--- a/spec/bundler/bundler/ruby_dsl_spec.rb
+++ b/spec/bundler/bundler/ruby_dsl_spec.rb
@@ -7,6 +7,7 @@ class MockDSL
     include Bundler::RubyDsl
 
     attr_reader :ruby_version
+    attr_accessor :gemfile
   end
 
   let(:dsl) { MockDSL.new }
@@ -17,15 +18,18 @@ class MockDSL
   let(:engine_version) { "9000" }
   let(:patchlevel) { "100" }
   let(:options) do
-    { :patchlevel => patchlevel,
-      :engine => engine,
-      :engine_version => engine_version }
+    { patchlevel: patchlevel,
+      engine: engine,
+      engine_version: engine_version }
   end
+  let(:project_root) { Pathname.new("/path/to/project") }
+  let(:gemfile) { project_root.join("Gemfile") }
+  before { allow(Bundler).to receive(:root).and_return(project_root) }
 
   let(:invoke) do
     proc do
       args = []
-      args << Array(ruby_version_arg) if ruby_version_arg
+      args << ruby_version_arg if ruby_version_arg
       args << options
 
       dsl.ruby(*args)
@@ -33,6 +37,7 @@ class MockDSL
   end
 
   subject do
+    dsl.gemfile = gemfile
     invoke.call
     dsl.ruby_version
   end
@@ -63,10 +68,19 @@ class MockDSL
       it_behaves_like "it stores the ruby version"
     end
 
+    context "with a preview version" do
+      let(:ruby_version) { "3.3.0-preview2" }
+
+      it "stores the version" do
+        expect(subject.versions).to eq(Array("3.3.0.preview2"))
+        expect(subject.gem_version.version).to eq("3.3.0.preview2")
+      end
+    end
+
     context "with two requirements in the same string" do
       let(:ruby_version) { ">= 2.0.0, < 3.0" }
       it "raises an error" do
-        expect { subject }.to raise_error(ArgumentError)
+        expect { subject }.to raise_error(Bundler::InvalidArgumentError)
       end
     end
 
@@ -97,53 +111,103 @@ class MockDSL
     end
 
     context "with a file option" do
-      let(:options) { { :file => "foo" } }
-      let(:version) { "3.2.2" }
-      let(:ruby_version) { "3.2.2" }
+      let(:file) { ".ruby-version" }
+      let(:ruby_version_file_path) { gemfile.dirname.join(file) }
+      let(:options) do
+        { file: file,
+          patchlevel: patchlevel,
+          engine: engine,
+          engine_version: engine_version }
+      end
       let(:ruby_version_arg) { nil }
-      let(:engine_version) { version }
-      let(:patchlevel) { nil }
-      let(:engine) { "ruby" }
-      let(:project_root) { Pathname.new("/path/to/project") }
+      let(:file_content) { "#{version}\n" }
 
       before do
-        allow(Bundler).to receive(:read_file).with(project_root.join("foo")).and_return("#{version}\n")
-        allow(Bundler).to receive(:root).and_return(Pathname.new("/path/to/project"))
+        allow(Bundler).to receive(:read_file) do |path|
+          raise Errno::ENOENT, <<~ERROR unless path == ruby_version_file_path
+            #{file} not found in specs:
+              expected: #{ruby_version_file_path}
+              received: #{path}
+          ERROR
+          file_content
+        end
       end
 
       it_behaves_like "it stores the ruby version"
 
+      context "with the Gemfile ruby file: path is relative to the Gemfile in a subdir" do
+        let(:gemfile) { project_root.join("subdir", "Gemfile") }
+        let(:file) { "../.ruby-version" }
+        let(:ruby_version_file_path) { gemfile.dirname.join(file) }
+
+        it_behaves_like "it stores the ruby version"
+      end
+
+      context "with bundler root in a subdir of the project" do
+        let(:project_root) { Pathname.new("/path/to/project/subdir") }
+        let(:gemfile) { project_root.parent.join("Gemfile") }
+
+        it_behaves_like "it stores the ruby version"
+      end
+
+      context "with the ruby- prefix in the file" do
+        let(:file_content) { "ruby-#{version}\n" }
+
+        it_behaves_like "it stores the ruby version"
+      end
+
       context "and a version" do
-        let(:ruby_version_arg) { "2.0.0" }
+        let(:ruby_version_arg) { version }
 
         it "raises an error" do
-          expect { subject }.to raise_error(Bundler::GemfileError, "Cannot specify version when using the file option")
+          expect { subject }.to raise_error(Bundler::GemfileError, "Do not pass version argument when using :file option")
         end
       end
-    end
 
-    context "with a (.tool-versions) file option" do
-      let(:options) { { :file => "foo" } }
-      let(:version) { "3.2.2" }
-      let(:ruby_version) { "3.2.2" }
-      let(:ruby_version_arg) { nil }
-      let(:engine_version) { version }
-      let(:patchlevel) { nil }
-      let(:engine) { "ruby" }
-      let(:project_root) { Pathname.new("/path/to/project") }
+      context "with a @gemset" do
+        let(:file_content) { "ruby-#{version}@gemset\n" }
 
-      before do
-        allow(Bundler).to receive(:read_file).with(project_root.join("foo")).and_return("nodejs 18.16.0\nruby #{version} # This is a comment\npnpm 8.6.12\n")
-        allow(Bundler).to receive(:root).and_return(Pathname.new("/path/to/project"))
+        it "raises an error" do
+          expect { subject }.to raise_error(Bundler::InvalidArgumentError, "2.0.0@gemset is not a valid requirement on the Ruby version")
+        end
       end
 
-      it_behaves_like "it stores the ruby version"
+      context "with a mise.toml file format" do
+        let(:file) { "mise.toml" }
+        let(:ruby_version_arg) { nil }
+        let(:file_content) do
+          <<~TOML
+            [tools]
+            ruby = "#{version}"
+          TOML
+        end
 
-      context "and a version" do
-        let(:ruby_version_arg) { "2.0.0" }
+        it_behaves_like "it stores the ruby version"
+      end
 
-        it "raises an error" do
-          expect { subject }.to raise_error(Bundler::GemfileError, "Cannot specify version when using the file option")
+      context "with a .tool-versions file format" do
+        let(:file) { ".tool-versions" }
+        let(:ruby_version_arg) { nil }
+        let(:file_content) do
+          <<~TOOLS
+            nodejs 18.16.0
+            ruby #{version} # This is a comment
+            pnpm 8.6.12
+          TOOLS
+        end
+
+        it_behaves_like "it stores the ruby version"
+
+        context "with extra spaces and a very cozy comment" do
+          let(:file_content) do
+            <<~TOOLS
+              nodejs 18.16.0
+              ruby   #{version}# This is a cozy comment
+              pnpm   8.6.12
+            TOOLS
+          end
+
+          it_behaves_like "it stores the ruby version"
         end
       end
     end
diff --git a/spec/bundler/bundler/rubygems_integration_spec.rb b/spec/bundler/bundler/rubygems_integration_spec.rb
index 182aa3646a7dab..a2c63a7ca0d243 100644
--- a/spec/bundler/bundler/rubygems_integration_spec.rb
+++ b/spec/bundler/bundler/rubygems_integration_spec.rb
@@ -1,10 +1,6 @@
 # frozen_string_literal: true
 
 RSpec.describe Bundler::RubygemsIntegration do
-  it "uses the same chdir lock as rubygems" do
-    expect(Bundler.rubygems.ext_lock).to eq(Gem::Ext::Builder::CHDIR_MONITOR)
-  end
-
   context "#validate" do
     let(:spec) do
       Gem::Specification.new do |s|
@@ -15,14 +11,14 @@
     end
     subject { Bundler.rubygems.validate(spec) }
 
-    it "validates with packaging mode disabled" do
-      expect(spec).to receive(:validate).with(false)
+    it "validates for resolution" do
+      expect(spec).to receive(:validate_for_resolution)
       subject
     end
 
     context "with an invalid spec" do
       before do
-        expect(spec).to receive(:validate).with(false).
+        expect(spec).to receive(:validate_for_resolution).
           and_raise(Gem::InvalidSpecificationException.new("TODO is not an author"))
       end
 
@@ -36,7 +32,6 @@
 
   describe "#download_gem" do
     let(:bundler_retry) { double(Bundler::Retry) }
-    let(:uri) { Bundler::URI.parse("https://foo.bar") }
     let(:cache_dir) { "#{Gem.path.first}/cache" }
     let(:spec) do
       spec = Gem::Specification.new("Foo", Gem::Version.new("2.5.2"))
@@ -45,15 +40,47 @@
     end
     let(:fetcher) { double("gem_remote_fetcher") }
 
-    it "successfully downloads gem with retries" do
-      expect(Bundler.rubygems).to receive(:gem_remote_fetcher).and_return(fetcher)
-      expect(fetcher).to receive(:headers=).with({ "X-Gemfile-Source" => "https://foo.bar" })
-      expect(Bundler::Retry).to receive(:new).with("download gem from #{uri}/").
-        and_return(bundler_retry)
-      expect(bundler_retry).to receive(:attempts).and_yield
-      expect(fetcher).to receive(:cache_update_path)
+    context "when uri is public" do
+      let(:uri) { Gem::URI.parse("https://foo.bar") }
+
+      it "successfully downloads gem with retries" do
+        expect(Bundler::Retry).to receive(:new).with("download gem from #{uri}/").
+          and_return(bundler_retry)
+        expect(bundler_retry).to receive(:attempts).and_yield
+        expect(fetcher).to receive(:cache_update_path)
+
+        Bundler.rubygems.download_gem(spec, uri, cache_dir, fetcher)
+      end
+    end
+
+    context "when uri contains userinfo part" do
+      let(:uri) { Gem::URI.parse("https://#{userinfo}@foo.bar") }
 
-      Bundler.rubygems.download_gem(spec, uri, cache_dir)
+      context "with user and password" do
+        let(:userinfo) { "user:password" }
+
+        it "successfully downloads gem with retries with filtered log" do
+          expect(Bundler::Retry).to receive(:new).with("download gem from https://user:REDACTED@foo.bar/").
+            and_return(bundler_retry)
+          expect(bundler_retry).to receive(:attempts).and_yield
+          expect(fetcher).to receive(:cache_update_path)
+
+          Bundler.rubygems.download_gem(spec, uri, cache_dir, fetcher)
+        end
+      end
+
+      context "with token [as user]" do
+        let(:userinfo) { "token" }
+
+        it "successfully downloads gem with retries with filtered log" do
+          expect(Bundler::Retry).to receive(:new).with("download gem from https://REDACTED@foo.bar/").
+            and_return(bundler_retry)
+          expect(bundler_retry).to receive(:attempts).and_yield
+          expect(fetcher).to receive(:cache_update_path)
+
+          Bundler.rubygems.download_gem(spec, uri, cache_dir, fetcher)
+        end
+      end
     end
   end
 
@@ -64,40 +91,35 @@
     let(:prerelease_specs_response) { Marshal.dump(["prerelease_specs"]) }
 
     context "when a rubygems source mirror is set" do
-      let(:orig_uri) { Bundler::URI("http://zombo.com") }
-      let(:remote_with_mirror) { double("remote", :uri => uri, :original_uri => orig_uri) }
+      let(:orig_uri) { Gem::URI("http://zombo.com") }
+      let(:remote_with_mirror) { double("remote", uri: uri, original_uri: orig_uri) }
 
       it "sets the 'X-Gemfile-Source' header containing the original source" do
-        expect(Bundler.rubygems).to receive(:gem_remote_fetcher).twice.and_return(fetcher)
-        expect(fetcher).to receive(:headers=).with({ "X-Gemfile-Source" => "http://zombo.com" }).twice
         expect(fetcher).to receive(:fetch_path).with(uri + "specs.4.8.gz").and_return(specs_response)
         expect(fetcher).to receive(:fetch_path).with(uri + "prerelease_specs.4.8.gz").and_return(prerelease_specs_response)
-        result = Bundler.rubygems.fetch_all_remote_specs(remote_with_mirror)
+        result = Bundler.rubygems.fetch_all_remote_specs(remote_with_mirror, fetcher)
         expect(result).to eq(%w[specs prerelease_specs])
       end
     end
 
     context "when there is no rubygems source mirror set" do
-      let(:remote_no_mirror) { double("remote", :uri => uri, :original_uri => nil) }
+      let(:remote_no_mirror) { double("remote", uri: uri, original_uri: nil) }
 
       it "does not set the 'X-Gemfile-Source' header" do
-        expect(Bundler.rubygems).to receive(:gem_remote_fetcher).twice.and_return(fetcher)
-        expect(fetcher).to_not receive(:headers=)
         expect(fetcher).to receive(:fetch_path).with(uri + "specs.4.8.gz").and_return(specs_response)
         expect(fetcher).to receive(:fetch_path).with(uri + "prerelease_specs.4.8.gz").and_return(prerelease_specs_response)
-        result = Bundler.rubygems.fetch_all_remote_specs(remote_no_mirror)
+        result = Bundler.rubygems.fetch_all_remote_specs(remote_no_mirror, fetcher)
         expect(result).to eq(%w[specs prerelease_specs])
       end
     end
 
     context "when loading an unexpected class" do
-      let(:remote_no_mirror) { double("remote", :uri => uri, :original_uri => nil) }
+      let(:remote_no_mirror) { double("remote", uri: uri, original_uri: nil) }
       let(:unexpected_specs_response) { Marshal.dump(3) }
 
       it "raises a MarshalError error" do
-        expect(Bundler.rubygems).to receive(:gem_remote_fetcher).once.and_return(fetcher)
         expect(fetcher).to receive(:fetch_path).with(uri + "specs.4.8.gz").and_return(unexpected_specs_response)
-        expect { Bundler.rubygems.fetch_all_remote_specs(remote_no_mirror) }.to raise_error(Bundler::MarshalError, /unexpected class/i)
+        expect { Bundler.rubygems.fetch_all_remote_specs(remote_no_mirror, fetcher) }.to raise_error(Bundler::MarshalError, /unexpected class/i)
       end
     end
   end
diff --git a/spec/bundler/bundler/settings_spec.rb b/spec/bundler/bundler/settings_spec.rb
index 4636993d9f9a42..592db81e9b9039 100644
--- a/spec/bundler/bundler/settings_spec.rb
+++ b/spec/bundler/bundler/settings_spec.rb
@@ -6,12 +6,18 @@
   subject(:settings) { described_class.new(bundled_app) }
 
   describe "#set_local" do
-    context "when the local config file is not found" do
+    context "root is nil" do
       subject(:settings) { described_class.new(nil) }
 
-      it "raises a GemfileNotFound error with explanation" do
-        expect { subject.set_local("foo", "bar") }.
-          to raise_error(Bundler::GemfileNotFound, "Could not locate Gemfile")
+      before do
+        allow(Pathname).to receive(:new).and_call_original
+        allow(Pathname).to receive(:new).with(".bundle").and_return home(".bundle")
+      end
+
+      it "works" do
+        subject.set_local("foo", "bar")
+
+        expect(subject["foo"]).to eq("bar")
       end
     end
   end
@@ -115,12 +121,13 @@
       end
     end
 
-    context "when it's not possible to write to the file" do
+    context "when it's not possible to create the settings directory" do
       it "raises an PermissionError with explanation" do
-        expect(::Bundler::FileUtils).to receive(:mkdir_p).with(settings.send(:local_config_file).dirname).
-          and_raise(Errno::EACCES)
+        settings_dir = settings.send(:local_config_file).dirname
+        expect(::Bundler::FileUtils).to receive(:mkdir_p).with(settings_dir).
+          and_raise(Errno::EACCES.new(settings_dir.to_s))
         expect { settings.set_local :frozen, "1" }.
-          to raise_error(Bundler::PermissionError, /config/)
+          to raise_error(Bundler::PermissionError, /#{settings_dir}/)
       end
     end
   end
@@ -131,7 +138,7 @@
 
       Bundler.settings.set_command_option :no_install, true
 
-      Bundler.settings.temporary(:no_install => false) do
+      Bundler.settings.temporary(no_install: false) do
         expect(Bundler.settings[:no_install]).to eq false
       end
 
@@ -147,23 +154,24 @@
 
     context "when called without a block" do
       it "leaves the setting changed" do
-        Bundler.settings.temporary(:foo => :random)
+        Bundler.settings.temporary(foo: :random)
         expect(Bundler.settings[:foo]).to eq "random"
       end
 
       it "returns nil" do
-        expect(Bundler.settings.temporary(:foo => :bar)).to be_nil
+        expect(Bundler.settings.temporary(foo: :bar)).to be_nil
       end
     end
   end
 
   describe "#set_global" do
-    context "when it's not possible to write to the file" do
+    context "when it's not possible to write to create the settings directory" do
       it "raises an PermissionError with explanation" do
-        expect(::Bundler::FileUtils).to receive(:mkdir_p).with(settings.send(:global_config_file).dirname).
-          and_raise(Errno::EACCES)
+        settings_dir = settings.send(:global_config_file).dirname
+        expect(::Bundler::FileUtils).to receive(:mkdir_p).with(settings_dir).
+          and_raise(Errno::EACCES.new(settings_dir.to_s))
         expect { settings.set_global(:frozen, "1") }.
-          to raise_error(Bundler::PermissionError, %r{\.bundle/config})
+          to raise_error(Bundler::PermissionError, /#{settings_dir}/)
       end
     end
   end
@@ -179,7 +187,7 @@
   end
 
   describe "#mirror_for" do
-    let(:uri) { Bundler::URI("https://rubygems.org/") }
+    let(:uri) { Gem::URI("https://rubygems.org/") }
 
     context "with no configured mirror" do
       it "returns the original URI" do
@@ -192,7 +200,7 @@
     end
 
     context "with a configured mirror" do
-      let(:mirror_uri) { Bundler::URI("https://rubygems-mirror.org/") }
+      let(:mirror_uri) { Gem::URI("https://example-mirror.rubygems.org/") }
 
       before { settings.set_local "mirror.https://rubygems.org/", mirror_uri.to_s }
 
@@ -213,7 +221,7 @@
       end
 
       context "with a file URI" do
-        let(:mirror_uri) { Bundler::URI("file:/foo/BAR/baz/qUx/") }
+        let(:mirror_uri) { Gem::URI("file:/foo/BAR/baz/qUx/") }
 
         it "returns the mirror URI" do
           expect(settings.mirror_for(uri)).to eq(mirror_uri)
@@ -231,7 +239,7 @@
   end
 
   describe "#credentials_for" do
-    let(:uri) { Bundler::URI("https://gemserver.example.org/") }
+    let(:uri) { Gem::URI("https://gemserver.example.org/") }
     let(:credentials) { "username:password" }
 
     context "with no configured credentials" do
@@ -269,12 +277,12 @@
     end
 
     it "normalizes HTTP URIs in mirror configuration" do
-      settings.set_local "mirror.http://rubygems.org", "http://rubygems-mirror.org"
+      settings.set_local "mirror.http://rubygems.org", "http://example-mirror.rubygems.org"
       expect(settings.all).to include("mirror.http://rubygems.org/")
     end
 
     it "normalizes HTTPS URIs in mirror configuration" do
-      settings.set_local "mirror.https://rubygems.org", "http://rubygems-mirror.org"
+      settings.set_local "mirror.https://rubygems.org", "http://example-mirror.rubygems.org"
       expect(settings.all).to include("mirror.https://rubygems.org/")
     end
 
@@ -289,9 +297,9 @@
     end
 
     it "reads older keys without trailing slashes" do
-      settings.set_local "mirror.https://rubygems.org", "http://rubygems-mirror.org"
+      settings.set_local "mirror.https://rubygems.org", "http://example-mirror.rubygems.org"
       expect(settings.mirror_for("https://rubygems.org/")).to eq(
-        Bundler::URI("http://rubygems-mirror.org/")
+        Gem::URI("http://example-mirror.rubygems.org/")
       )
     end
 
@@ -310,13 +318,22 @@
     let(:settings) { described_class.new(bundled_app(".bundle")) }
 
     it "converts older keys without double underscore" do
-      config("BUNDLE_MY__PERSONAL.RACK" => "~/Work/git/rack")
-      expect(settings["my.personal.rack"]).to eq("~/Work/git/rack")
+      config("BUNDLE_MY__PERSONAL.MYRACK" => "~/Work/git/myrack")
+      expect(settings["my.personal.myrack"]).to eq("~/Work/git/myrack")
     end
 
     it "converts older keys without trailing slashes and double underscore" do
-      config("BUNDLE_MIRROR__HTTPS://RUBYGEMS.ORG" => "http://rubygems-mirror.org")
-      expect(settings["mirror.https://rubygems.org/"]).to eq("http://rubygems-mirror.org")
+      config("BUNDLE_MIRROR__HTTPS://RUBYGEMS.ORG" => "http://example-mirror.rubygems.org")
+      expect(settings["mirror.https://rubygems.org/"]).to eq("http://example-mirror.rubygems.org")
+    end
+
+    it "ignores commented out keys" do
+      create_file bundled_app(".bundle/config"), <<~C
+        # BUNDLE_MY-PERSONAL-SERVER__ORG: my-personal-server.org
+      C
+
+      expect(Bundler.ui).not_to receive(:warn)
+      expect(settings.all).to be_empty
     end
 
     it "converts older keys with dashes" do
@@ -330,8 +347,8 @@
     end
 
     it "reads newer keys format properly" do
-      config("BUNDLE_MIRROR__HTTPS://RUBYGEMS__ORG/" => "http://rubygems-mirror.org")
-      expect(settings["mirror.https://rubygems.org/"]).to eq("http://rubygems-mirror.org")
+      config("BUNDLE_MIRROR__HTTPS://RUBYGEMS__ORG/" => "http://example-mirror.rubygems.org")
+      expect(settings["mirror.https://rubygems.org/"]).to eq("http://example-mirror.rubygems.org")
     end
   end
 end
diff --git a/spec/bundler/bundler/shared_helpers_spec.rb b/spec/bundler/bundler/shared_helpers_spec.rb
index 3c6536c4ebe39c..356858070105d1 100644
--- a/spec/bundler/bundler/shared_helpers_spec.rb
+++ b/spec/bundler/bundler/shared_helpers_spec.rb
@@ -1,12 +1,8 @@
 # frozen_string_literal: true
 
 RSpec.describe Bundler::SharedHelpers do
-  let(:ext_lock_double) { double(:ext_lock) }
-
   before do
     pwd_stub
-    allow(Bundler.rubygems).to receive(:ext_lock).and_return(ext_lock_double)
-    allow(ext_lock_double).to receive(:synchronize) {|&block| block.call }
   end
 
   let(:pwd_stub) { allow(subject).to receive(:pwd).and_return(bundled_app) }
@@ -63,7 +59,7 @@
 
       before { allow(subject).to receive(:default_gemfile).and_return(gemfile_path) }
 
-      it "returns the lock file path" do
+      it "returns the lockfile path" do
         expect(subject.default_lockfile).to eq(expected_lockfile_path)
       end
     end
@@ -242,14 +238,12 @@
     shared_examples_for "ENV['RUBYOPT'] gets set correctly" do
       it "ensures -rbundler/setup is at the beginning of ENV['RUBYOPT']" do
         subject.set_bundle_environment
-        expect(ENV["RUBYOPT"].split(" ")).to start_with("-r#{source_lib_dir}/bundler/setup")
+        expect(ENV["RUBYOPT"].split(" ")).to start_with("-r#{install_path}/bundler/setup")
       end
     end
 
     shared_examples_for "ENV['BUNDLER_SETUP'] gets set correctly" do
       it "ensures bundler/setup is set in ENV['BUNDLER_SETUP']" do
-        skip "Does not play well with DidYouMean being a bundled gem instead of a default gem in Ruby 2.6" if RUBY_VERSION < "2.7"
-
         subject.set_bundle_environment
         expect(ENV["BUNDLER_SETUP"]).to eq("#{source_lib_dir}/bundler/setup")
       end
@@ -264,8 +258,7 @@
 
       it "ensures bundler's ruby version lib path is in ENV['RUBYLIB']" do
         subject.set_bundle_environment
-        paths = (ENV["RUBYLIB"]).split(File::PATH_SEPARATOR)
-        expect(paths).to include(ruby_lib_path)
+        expect(rubylib).to include(ruby_lib_path)
       end
     end
 
@@ -282,8 +275,7 @@
 
       subject.set_bundle_environment
 
-      paths = (ENV["RUBYLIB"]).split(File::PATH_SEPARATOR)
-      expect(paths.count(RbConfig::CONFIG["rubylibdir"])).to eq(0)
+      expect(rubylib.count(RbConfig::CONFIG["rubylibdir"])).to eq(0)
     end
 
     it "exits if bundle path contains the unix-like path separator" do
@@ -362,25 +354,46 @@
 
       it "ENV['PATH'] should only contain one instance of bundle bin path" do
         subject.set_bundle_environment
-        paths = (ENV["PATH"]).split(File::PATH_SEPARATOR)
+        paths = ENV["PATH"].split(File::PATH_SEPARATOR)
         expect(paths.count(bundle_path)).to eq(1)
       end
     end
 
-    context "ENV['RUBYOPT'] does not exist" do
-      before { ENV.delete("RUBYOPT") }
+    context "when bundler install path is standard" do
+      let(:install_path) { source_lib_dir }
 
-      it_behaves_like "ENV['RUBYOPT'] gets set correctly"
-    end
+      context "ENV['RUBYOPT'] does not exist" do
+        before { ENV.delete("RUBYOPT") }
 
-    context "ENV['RUBYOPT'] exists without -rbundler/setup" do
-      before { ENV["RUBYOPT"] = "-I/some_app_path/lib" }
+        it_behaves_like "ENV['RUBYOPT'] gets set correctly"
+      end
 
-      it_behaves_like "ENV['RUBYOPT'] gets set correctly"
+      context "ENV['RUBYOPT'] exists without -rbundler/setup" do
+        before { ENV["RUBYOPT"] = "-I/some_app_path/lib" }
+
+        it_behaves_like "ENV['RUBYOPT'] gets set correctly"
+      end
+
+      context "ENV['RUBYOPT'] exists and contains -rbundler/setup" do
+        before { ENV["RUBYOPT"] = "-rbundler/setup" }
+
+        it_behaves_like "ENV['RUBYOPT'] gets set correctly"
+      end
     end
 
-    context "ENV['RUBYOPT'] exists and contains -rbundler/setup" do
-      before { ENV["RUBYOPT"] = "-rbundler/setup" }
+    context "when bundler install path contains special characters" do
+      let(:install_path) { "/opt/ruby3.3.0-preview2/lib/ruby/3.3.0+0" }
+
+      before do
+        ENV["RUBYOPT"] = "-r#{install_path}/bundler/setup"
+        allow(File).to receive(:expand_path).and_return("#{install_path}/bundler/setup")
+        allow(Gem).to  receive(:bin_path).and_return("#{install_path}/bundler/setup")
+      end
+
+      it "ensures -rbundler/setup is not duplicated" do
+        subject.set_bundle_environment
+        expect(ENV["RUBYOPT"].split(" ").grep(%r{-r.*/bundler/setup}).length).to eq(1)
+      end
 
       it_behaves_like "ENV['RUBYOPT'] gets set correctly"
     end
@@ -410,7 +423,7 @@
       it "sets BUNDLE_BIN_PATH to the bundle executable file" do
         subject.set_bundle_environment
         bin_path = ENV["BUNDLE_BIN_PATH"]
-        expect(bin_path).to eq(bindir.join("bundle").to_s)
+        expect(bin_path).to eq(exedir.join("bundle").to_s)
         expect(File.exist?(bin_path)).to be true
       end
     end
@@ -426,8 +439,7 @@
 
       it "ENV['RUBYLIB'] should only contain one instance of bundler's ruby version lib path" do
         subject.set_bundle_environment
-        paths = (ENV["RUBYLIB"]).split(File::PATH_SEPARATOR)
-        expect(paths.count(ruby_lib_path)).to eq(1)
+        expect(rubylib.count(ruby_lib_path)).to eq(1)
       end
     end
   end
@@ -443,7 +455,7 @@
     end
 
     context "system throws Errno::EACESS" do
-      let(:file_op_block) { proc {|_path| raise Errno::EACCES } }
+      let(:file_op_block) { proc {|_path| raise Errno::EACCES.new("/path") } }
 
       it "raises a PermissionError" do
         expect { subject.filesystem_access("/path", &file_op_block) }.to raise_error(
@@ -498,9 +510,39 @@
 
       it "raises a GenericSystemCallError" do
         expect { subject.filesystem_access("/path", &file_op_block) }.to raise_error(
-          Bundler::GenericSystemCallError, /error accessing.+underlying.+Shields down/m
+          Bundler::GenericSystemCallError, /error creating.+underlying.+Shields down/m
         )
       end
     end
   end
+
+  describe "#major_deprecation" do
+    before { allow(Bundler).to receive(:feature_flag).and_return(Bundler::FeatureFlag.new(37)) }
+    before { allow(Bundler.ui).to receive(:warn) }
+
+    it "prints and raises nothing below the deprecated major version" do
+      subject.major_deprecation(38, "Message")
+      subject.major_deprecation(39, "Message", removed_message: "Removal", print_caller_location: true)
+      expect(Bundler.ui).not_to have_received(:warn)
+    end
+
+    it "prints but does not raise _at_ the deprecated major version" do
+      subject.major_deprecation(37, "Message")
+      subject.major_deprecation(37, "Message", removed_message: "Removal")
+      expect(Bundler.ui).to have_received(:warn).with("[DEPRECATED] Message").twice
+
+      subject.major_deprecation(37, "Message", print_caller_location: true)
+      expect(Bundler.ui).to have_received(:warn).
+        with(a_string_matching(/^\[DEPRECATED\] Message \(called at .*:\d+\)$/))
+    end
+
+    it "raises the appropriate errors when _past_ the deprecated major version" do
+      expect { subject.major_deprecation(36, "Message") }.
+        to raise_error(Bundler::DeprecatedError, "[REMOVED] Message")
+      expect { subject.major_deprecation(36, "Message", removed_message: "Removal") }.
+        to raise_error(Bundler::DeprecatedError, "[REMOVED] Removal")
+      expect { subject.major_deprecation(35, "Message", removed_message: "Removal", print_caller_location: true) }.
+        to raise_error(Bundler::DeprecatedError, /^\[REMOVED\] Removal \(called at .*:\d+\)$/)
+    end
+  end
 end
diff --git a/spec/bundler/bundler/source/git/git_proxy_spec.rb b/spec/bundler/bundler/source/git/git_proxy_spec.rb
index c79dd8ff71f02a..492eee64444b1c 100644
--- a/spec/bundler/bundler/source/git/git_proxy_spec.rb
+++ b/spec/bundler/bundler/source/git/git_proxy_spec.rb
@@ -3,34 +3,84 @@
 RSpec.describe Bundler::Source::Git::GitProxy do
   let(:path) { Pathname("path") }
   let(:uri) { "https://github.com/rubygems/rubygems.git" }
-  let(:ref) { "HEAD" }
+  let(:ref) { nil }
+  let(:branch) { nil }
+  let(:tag) { nil }
+  let(:options) { { "ref" => ref, "branch" => branch, "tag" => tag }.compact }
   let(:revision) { nil }
   let(:git_source) { nil }
-  let(:clone_result) { double(Process::Status, :success? => true) }
+  let(:clone_result) { double(Process::Status, success?: true) }
   let(:base_clone_args) { ["clone", "--bare", "--no-hardlinks", "--quiet", "--no-tags", "--depth", "1", "--single-branch"] }
-  subject { described_class.new(path, uri, ref, revision, git_source) }
+  subject(:git_proxy) { described_class.new(path, uri, options, revision, git_source) }
+
+  context "with explicit ref" do
+    context "with branch only" do
+      let(:branch) { "main" }
+      it "sets explicit ref to branch" do
+        expect(git_proxy.explicit_ref).to eq(branch)
+      end
+    end
+
+    context "with ref only" do
+      let(:ref) { "HEAD" }
+      it "sets explicit ref to ref" do
+        expect(git_proxy.explicit_ref).to eq(ref)
+      end
+    end
+
+    context "with tag only" do
+      let(:tag) { "v1.0" }
+      it "sets explicit ref to ref" do
+        expect(git_proxy.explicit_ref).to eq(tag)
+      end
+    end
+
+    context "with tag and branch" do
+      let(:tag) { "v1.0" }
+      let(:branch) { "main" }
+      it "raises error" do
+        expect { git_proxy }.to raise_error(Bundler::Source::Git::AmbiguousGitReference)
+      end
+    end
+
+    context "with tag and ref" do
+      let(:tag) { "v1.0" }
+      let(:ref) { "HEAD" }
+      it "raises error" do
+        expect { git_proxy }.to raise_error(Bundler::Source::Git::AmbiguousGitReference)
+      end
+    end
+
+    context "with branch and ref" do
+      let(:branch) { "main" }
+      let(:ref) { "HEAD" }
+      it "honors ref over branch" do
+        expect(git_proxy.explicit_ref).to eq(ref)
+      end
+    end
+  end
 
   context "with configured credentials" do
     it "adds username and password to URI" do
       Bundler.settings.temporary(uri => "u:p") do
-        allow(subject).to receive(:git_local).with("--version").and_return("git version 2.14.0")
-        expect(subject).to receive(:capture).with([*base_clone_args, "--", "https://u:p@github.com/rubygems/rubygems.git", path.to_s], nil).and_return(["", "", clone_result])
+        allow(git_proxy).to receive(:git_local).with("--version").and_return("git version 2.14.0")
+        expect(git_proxy).to receive(:capture).with([*base_clone_args, "--", "https://u:p@github.com/rubygems/rubygems.git", path.to_s], nil).and_return(["", "", clone_result])
         subject.checkout
       end
     end
 
     it "adds username and password to URI for host" do
       Bundler.settings.temporary("github.com" => "u:p") do
-        allow(subject).to receive(:git_local).with("--version").and_return("git version 2.14.0")
-        expect(subject).to receive(:capture).with([*base_clone_args, "--", "https://u:p@github.com/rubygems/rubygems.git", path.to_s], nil).and_return(["", "", clone_result])
+        allow(git_proxy).to receive(:git_local).with("--version").and_return("git version 2.14.0")
+        expect(git_proxy).to receive(:capture).with([*base_clone_args, "--", "https://u:p@github.com/rubygems/rubygems.git", path.to_s], nil).and_return(["", "", clone_result])
         subject.checkout
       end
     end
 
     it "does not add username and password to mismatched URI" do
       Bundler.settings.temporary("https://u:p@github.com/rubygems/rubygems-mismatch.git" => "u:p") do
-        allow(subject).to receive(:git_local).with("--version").and_return("git version 2.14.0")
-        expect(subject).to receive(:capture).with([*base_clone_args, "--", uri, path.to_s], nil).and_return(["", "", clone_result])
+        allow(git_proxy).to receive(:git_local).with("--version").and_return("git version 2.14.0")
+        expect(git_proxy).to receive(:capture).with([*base_clone_args, "--", uri, path.to_s], nil).and_return(["", "", clone_result])
         subject.checkout
       end
     end
@@ -38,10 +88,10 @@
     it "keeps original userinfo" do
       Bundler.settings.temporary("github.com" => "u:p") do
         original = "https://orig:info@github.com/rubygems/rubygems.git"
-        subject = described_class.new(Pathname("path"), original, "HEAD")
-        allow(subject).to receive(:git_local).with("--version").and_return("git version 2.14.0")
-        expect(subject).to receive(:capture).with([*base_clone_args, "--", original, path.to_s], nil).and_return(["", "", clone_result])
-        subject.checkout
+        git_proxy = described_class.new(Pathname("path"), original, options)
+        allow(git_proxy).to receive(:git_local).with("--version").and_return("git version 2.14.0")
+        expect(git_proxy).to receive(:capture).with([*base_clone_args, "--", original, path.to_s], nil).and_return(["", "", clone_result])
+        git_proxy.checkout
       end
     end
   end
@@ -49,46 +99,46 @@
   describe "#version" do
     context "with a normal version number" do
       before do
-        expect(subject).to receive(:git_local).with("--version").
+        expect(git_proxy).to receive(:git_local).with("--version").
           and_return("git version 1.2.3")
       end
 
       it "returns the git version number" do
-        expect(subject.version).to eq("1.2.3")
+        expect(git_proxy.version).to eq("1.2.3")
       end
 
       it "does not raise an error when passed into Gem::Version.create" do
-        expect { Gem::Version.create subject.version }.not_to raise_error
+        expect { Gem::Version.create git_proxy.version }.not_to raise_error
       end
     end
 
     context "with a OSX version number" do
       before do
-        expect(subject).to receive(:git_local).with("--version").
+        expect(git_proxy).to receive(:git_local).with("--version").
           and_return("git version 1.2.3 (Apple Git-BS)")
       end
 
       it "strips out OSX specific additions in the version string" do
-        expect(subject.version).to eq("1.2.3")
+        expect(git_proxy.version).to eq("1.2.3")
       end
 
       it "does not raise an error when passed into Gem::Version.create" do
-        expect { Gem::Version.create subject.version }.not_to raise_error
+        expect { Gem::Version.create git_proxy.version }.not_to raise_error
       end
     end
 
     context "with a msysgit version number" do
       before do
-        expect(subject).to receive(:git_local).with("--version").
+        expect(git_proxy).to receive(:git_local).with("--version").
           and_return("git version 1.2.3.msysgit.0")
       end
 
       it "strips out msysgit specific additions in the version string" do
-        expect(subject.version).to eq("1.2.3")
+        expect(git_proxy.version).to eq("1.2.3")
       end
 
       it "does not raise an error when passed into Gem::Version.create" do
-        expect { Gem::Version.create subject.version }.not_to raise_error
+        expect { Gem::Version.create git_proxy.version }.not_to raise_error
       end
     end
   end
@@ -96,34 +146,34 @@
   describe "#full_version" do
     context "with a normal version number" do
       before do
-        expect(subject).to receive(:git_local).with("--version").
+        expect(git_proxy).to receive(:git_local).with("--version").
           and_return("git version 1.2.3")
       end
 
       it "returns the git version number" do
-        expect(subject.full_version).to eq("1.2.3")
+        expect(git_proxy.full_version).to eq("1.2.3")
       end
     end
 
     context "with a OSX version number" do
       before do
-        expect(subject).to receive(:git_local).with("--version").
+        expect(git_proxy).to receive(:git_local).with("--version").
           and_return("git version 1.2.3 (Apple Git-BS)")
       end
 
       it "does not strip out OSX specific additions in the version string" do
-        expect(subject.full_version).to eq("1.2.3 (Apple Git-BS)")
+        expect(git_proxy.full_version).to eq("1.2.3 (Apple Git-BS)")
       end
     end
 
     context "with a msysgit version number" do
       before do
-        expect(subject).to receive(:git_local).with("--version").
+        expect(git_proxy).to receive(:git_local).with("--version").
           and_return("git version 1.2.3.msysgit.0")
       end
 
       it "does not strip out msysgit specific additions in the version string" do
-        expect(subject.full_version).to eq("1.2.3.msysgit.0")
+        expect(git_proxy.full_version).to eq("1.2.3.msysgit.0")
       end
     end
   end
@@ -143,8 +193,145 @@
 
     FileUtils.chmod("+x", file)
 
-    bundle :lock, :raise_on_error => false
+    bundle :lock, raise_on_error: false
 
     expect(Pathname.new(bundled_app("canary"))).not_to exist
   end
+
+  context "URI is HTTP" do
+    let(:uri) { "http://github.com/rubygems/rubygems.git" }
+    let(:without_depth_arguments) { ["clone", "--bare", "--no-hardlinks", "--quiet", "--no-tags", "--single-branch"] }
+    let(:fail_clone_result) { double(Process::Status, success?: false) }
+
+    it "retries without --depth when git url is http and fails" do
+      allow(git_proxy).to receive(:git_local).with("--version").and_return("git version 2.14.0")
+      allow(git_proxy).to receive(:capture).with([*base_clone_args, "--", uri, path.to_s], nil).and_return(["", "dumb http transport does not support shallow capabilities", fail_clone_result])
+      expect(git_proxy).to receive(:capture).with([*without_depth_arguments, "--", uri, path.to_s], nil).and_return(["", "", clone_result])
+
+      subject.checkout
+    end
+  end
+
+  describe "#installed_to?" do
+    let(:destination) { "install/dir" }
+    let(:destination_dir_exists) { true }
+    let(:children) { ["gem.gemspec", "README.me", ".git", "Rakefile"] }
+
+    before do
+      allow(Dir).to receive(:exist?).with(destination).and_return(destination_dir_exists)
+      allow(Dir).to receive(:children).with(destination).and_return(children)
+    end
+
+    context "when destination dir exists with children other than just .git" do
+      it "returns true" do
+        expect(git_proxy.installed_to?(destination)).to be true
+      end
+    end
+
+    context "when destination dir does not exist" do
+      let(:destination_dir_exists) { false }
+
+      it "returns false" do
+        expect(git_proxy.installed_to?(destination)).to be false
+      end
+    end
+
+    context "when destination dir is empty" do
+      let(:children) { [] }
+
+      it "returns false" do
+        expect(git_proxy.installed_to?(destination)).to be false
+      end
+    end
+
+    context "when destination dir has only .git directory" do
+      let(:children) { [".git"] }
+
+      it "returns false" do
+        expect(git_proxy.installed_to?(destination)).to be false
+      end
+    end
+  end
+
+  describe "#checkout" do
+    context "when the repository isn't cloned" do
+      before do
+        allow(path).to receive(:exist?).and_return(false)
+      end
+
+      it "clones the repository" do
+        allow(git_proxy).to receive(:git_local).with("--version").and_return("git version 2.14.0")
+        expect(git_proxy).to receive(:capture).with([*base_clone_args, "--", uri, path.to_s], nil).and_return(["", "", clone_result])
+        subject.checkout
+      end
+    end
+
+    context "when the repository is cloned" do
+      before do
+        allow(path).to receive(:exist?).and_return(true)
+      end
+
+      context "with a locked revision" do
+        let(:revision) { Digest::SHA1.hexdigest("ruby") }
+
+        context "when the revision exists locally" do
+          it "uses the cached revision" do
+            allow(git_proxy).to receive(:git_local).with("--version").and_return("git version 2.14.0")
+            expect(git_proxy).to receive(:git).with("cat-file", "-e", revision, dir: path).and_return(true)
+            subject.checkout
+          end
+        end
+
+        context "when the revision doesn't exist locally" do
+          it "fetches the specific revision" do
+            allow(git_proxy).to receive(:git_local).with("--version").and_return("git version 2.14.0")
+            expect(git_proxy).to receive(:git).with("cat-file", "-e", revision, dir: path).and_raise(Bundler::GitError)
+            expect(git_proxy).to receive(:capture).with(["fetch", "--force", "--quiet", "--no-tags", "--depth", "1", "--", uri, "#{revision}:refs/#{revision}-sha"], path).and_return(["", "", clone_result])
+            subject.checkout
+          end
+        end
+      end
+
+      context "with no explicit ref" do
+        it "fetches the HEAD revision" do
+          parsed_revision = Digest::SHA1.hexdigest("ruby")
+          allow(git_proxy).to receive(:git_local).with("rev-parse", "--abbrev-ref", "HEAD", dir: path).and_return(parsed_revision)
+          allow(git_proxy).to receive(:git_local).with("--version").and_return("git version 2.14.0")
+          expect(git_proxy).to receive(:capture).with(["fetch", "--force", "--quiet", "--no-tags", "--depth", "1", "--", uri, "refs/heads/#{parsed_revision}:refs/heads/#{parsed_revision}"], path).and_return(["", "", clone_result])
+          subject.checkout
+        end
+      end
+
+      context "with a commit ref" do
+        let(:ref) { Digest::SHA1.hexdigest("ruby") }
+
+        context "when the revision exists locally" do
+          it "uses the cached revision" do
+            allow(git_proxy).to receive(:git_local).with("--version").and_return("git version 2.14.0")
+            expect(git_proxy).to receive(:git).with("cat-file", "-e", ref, dir: path).and_return(true)
+            subject.checkout
+          end
+        end
+
+        context "when the revision doesn't exist locally" do
+          it "fetches the specific revision" do
+            allow(git_proxy).to receive(:git_local).with("--version").and_return("git version 2.14.0")
+            expect(git_proxy).to receive(:git).with("cat-file", "-e", ref, dir: path).and_raise(Bundler::GitError)
+            expect(git_proxy).to receive(:capture).with(["fetch", "--force", "--quiet", "--no-tags", "--depth", "1", "--", uri, "#{ref}:refs/#{ref}-sha"], path).and_return(["", "", clone_result])
+            subject.checkout
+          end
+        end
+      end
+
+      context "with a non-commit ref" do
+        let(:ref) { "HEAD" }
+
+        it "fetches all revisions" do
+          allow(git_proxy).to receive(:git_local).with("--version").and_return("git version 2.14.0")
+          expect(git_proxy).to receive(:capture).with(["fetch", "--force", "--quiet", "--no-tags", "--", uri, "refs/*:refs/*"], path).and_return(["", "", clone_result])
+          subject.checkout
+        end
+      end
+    end
+  end
 end
diff --git a/spec/bundler/bundler/source/git_spec.rb b/spec/bundler/bundler/source/git_spec.rb
index ed6dc3cd29fdb9..14e91c6bdce2b9 100644
--- a/spec/bundler/bundler/source/git_spec.rb
+++ b/spec/bundler/bundler/source/git_spec.rb
@@ -38,7 +38,7 @@
 
     context "when the source has a reference" do
       let(:git_proxy_stub) do
-        instance_double(Bundler::Source::Git::GitProxy, :revision => "123abc", :branch => "v1.0.0")
+        instance_double(Bundler::Source::Git::GitProxy, revision: "123abc", branch: "v1.0.0")
       end
       let(:options) do
         { "uri" => uri, "ref" => "v1.0.0" }
@@ -55,7 +55,7 @@
 
     context "when the source has both reference and glob specifiers" do
       let(:git_proxy_stub) do
-        instance_double(Bundler::Source::Git::GitProxy, :revision => "123abc", :branch => "v1.0.0")
+        instance_double(Bundler::Source::Git::GitProxy, revision: "123abc", branch: "v1.0.0")
       end
       let(:options) do
         { "uri" => uri, "ref" => "v1.0.0", "glob" => "gems/foo/*.gemspec" }
@@ -70,4 +70,54 @@
       end
     end
   end
+
+  describe "#locked_revision_checked_out?" do
+    let(:revision) { "abc" }
+    let(:git_proxy_revision) { revision }
+    let(:git_proxy_installed) { true }
+    let(:git_proxy) { subject.send(:git_proxy) }
+    let(:options) do
+      {
+        "uri" => uri,
+        "revision" => revision,
+      }
+    end
+
+    before do
+      allow(git_proxy).to receive(:revision).and_return(git_proxy_revision)
+      allow(git_proxy).to receive(:installed_to?).with(subject.install_path).and_return(git_proxy_installed)
+    end
+
+    context "when the locked revision is checked out" do
+      it "returns true" do
+        expect(subject.send(:locked_revision_checked_out?)).to be true
+      end
+    end
+
+    context "when no revision is provided" do
+      let(:options) do
+        { "uri" => uri }
+      end
+
+      it "returns falsey value" do
+        expect(subject.send(:locked_revision_checked_out?)).to be_falsey
+      end
+    end
+
+    context "when the git proxy revision is different than the git revision" do
+      let(:git_proxy_revision) { revision.next }
+
+      it "returns falsey value" do
+        expect(subject.send(:locked_revision_checked_out?)).to be_falsey
+      end
+    end
+
+    context "when the gem hasn't been installed" do
+      let(:git_proxy_installed) { false }
+
+      it "returns falsey value" do
+        expect(subject.send(:locked_revision_checked_out?)).to be_falsey
+      end
+    end
+  end
 end
diff --git a/spec/bundler/bundler/source/rubygems/remote_spec.rb b/spec/bundler/bundler/source/rubygems/remote_spec.rb
index 07ce4f968e947a..f2214ca8fe129a 100644
--- a/spec/bundler/bundler/source/rubygems/remote_spec.rb
+++ b/spec/bundler/bundler/source/rubygems/remote_spec.rb
@@ -11,8 +11,8 @@ def remote(uri)
     allow(Digest(:MD5)).to receive(:hexdigest).with(duck_type(:to_s)) {|string| "MD5HEX(#{string})" }
   end
 
-  let(:uri_no_auth) { Bundler::URI("https://gems.example.com") }
-  let(:uri_with_auth) { Bundler::URI("https://#{credentials}@gems.example.com") }
+  let(:uri_no_auth) { Gem::URI("https://gems.example.com") }
+  let(:uri_with_auth) { Gem::URI("https://#{credentials}@gems.example.com") }
   let(:credentials) { "username:password" }
 
   context "when the original URI has no credentials" do
@@ -89,11 +89,11 @@ def remote(uri)
   end
 
   context "when the original URI has only a username" do
-    let(:uri) { Bundler::URI("https://SeCrEt-ToKeN@gem.fury.io/me/") }
+    let(:uri) { Gem::URI("https://SeCrEt-ToKeN@gem.fury.io/me/") }
 
     describe "#anonymized_uri" do
       it "returns the URI without username and password" do
-        expect(remote(uri).anonymized_uri).to eq(Bundler::URI("https://gem.fury.io/me/"))
+        expect(remote(uri).anonymized_uri).to eq(Gem::URI("https://gem.fury.io/me/"))
       end
     end
 
@@ -105,9 +105,9 @@ def remote(uri)
   end
 
   context "when a mirror with inline credentials is configured for the URI" do
-    let(:uri) { Bundler::URI("https://rubygems.org/") }
-    let(:mirror_uri_with_auth) { Bundler::URI("https://username:password@rubygems-mirror.org/") }
-    let(:mirror_uri_no_auth) { Bundler::URI("https://rubygems-mirror.org/") }
+    let(:uri) { Gem::URI("https://rubygems.org/") }
+    let(:mirror_uri_with_auth) { Gem::URI("https://username:password@example-mirror.rubygems.org/") }
+    let(:mirror_uri_no_auth) { Gem::URI("https://example-mirror.rubygems.org/") }
 
     before { Bundler.settings.temporary("mirror.https://rubygems.org/" => mirror_uri_with_auth.to_s) }
 
@@ -131,9 +131,9 @@ def remote(uri)
   end
 
   context "when a mirror with configured credentials is configured for the URI" do
-    let(:uri) { Bundler::URI("https://rubygems.org/") }
-    let(:mirror_uri_with_auth) { Bundler::URI("https://#{credentials}@rubygems-mirror.org/") }
-    let(:mirror_uri_no_auth) { Bundler::URI("https://rubygems-mirror.org/") }
+    let(:uri) { Gem::URI("https://rubygems.org/") }
+    let(:mirror_uri_with_auth) { Gem::URI("https://#{credentials}@example-mirror.rubygems.org/") }
+    let(:mirror_uri_no_auth) { Gem::URI("https://example-mirror.rubygems.org/") }
 
     before do
       Bundler.settings.temporary("mirror.https://rubygems.org/" => mirror_uri_no_auth.to_s)
diff --git a/spec/bundler/bundler/source_list_spec.rb b/spec/bundler/bundler/source_list_spec.rb
index f860e9ff58e7ef..13453cb2a33a0d 100644
--- a/spec/bundler/bundler/source_list_spec.rb
+++ b/spec/bundler/bundler/source_list_spec.rb
@@ -85,7 +85,7 @@
         end
 
         it "ignores git protocols on request" do
-          Bundler.settings.temporary(:"git.allow_insecure" => true)
+          Bundler.settings.temporary("git.allow_insecure": true)
           expect(Bundler.ui).to_not receive(:warn).with(msg)
           source_list.add_git_source("uri" => "git://existing-git.org/path.git")
         end
@@ -125,8 +125,8 @@
       it "adds the provided remote to the beginning of the aggregate source" do
         source_list.add_global_rubygems_remote("https://othersource.org")
         expect(returned_source.remotes).to eq [
-          Bundler::URI("https://othersource.org/"),
-          Bundler::URI("https://rubygems.org/"),
+          Gem::URI("https://othersource.org/"),
+          Gem::URI("https://rubygems.org/"),
         ]
       end
     end
diff --git a/spec/bundler/bundler/source_spec.rb b/spec/bundler/bundler/source_spec.rb
index ceb369ecdb9343..01b57ce9e8e436 100644
--- a/spec/bundler/bundler/source_spec.rb
+++ b/spec/bundler/bundler/source_spec.rb
@@ -21,7 +21,7 @@ class ExampleSource < Bundler::Source
   end
 
   describe "#version_message" do
-    let(:spec) { double(:spec, :name => "nokogiri", :version => ">= 1.6", :platform => rb) }
+    let(:spec) { double(:spec, name: "nokogiri", version: ">= 1.6", platform: Gem::Platform::RUBY) }
 
     shared_examples_for "the lockfile specs are not relevant" do
       it "should return a string with the spec name and version" do
@@ -32,19 +32,19 @@ class ExampleSource < Bundler::Source
     context "when there are locked gems" do
       context "that contain the relevant gem spec" do
         context "without a version" do
-          let(:locked_gem) { double(:locked_gem, :name => "nokogiri", :version => nil) }
+          let(:locked_gem) { double(:locked_gem, name: "nokogiri", version: nil) }
 
           it_behaves_like "the lockfile specs are not relevant"
         end
 
         context "with the same version" do
-          let(:locked_gem) { double(:locked_gem, :name => "nokogiri", :version => ">= 1.6") }
+          let(:locked_gem) { double(:locked_gem, name: "nokogiri", version: ">= 1.6") }
 
           it_behaves_like "the lockfile specs are not relevant"
         end
 
         context "with a different version" do
-          let(:locked_gem) { double(:locked_gem, :name => "nokogiri", :version => "< 1.5") }
+          let(:locked_gem) { double(:locked_gem, name: "nokogiri", version: "< 1.5") }
 
           context "with color", :no_color_tty do
             before do
@@ -70,8 +70,8 @@ class ExampleSource < Bundler::Source
         end
 
         context "with a more recent version" do
-          let(:spec) { double(:spec, :name => "nokogiri", :version => "1.6.1", :platform => rb) }
-          let(:locked_gem) { double(:locked_gem, :name => "nokogiri", :version => "1.7.0") }
+          let(:spec) { double(:spec, name: "nokogiri", version: "1.6.1", platform: Gem::Platform::RUBY) }
+          let(:locked_gem) { double(:locked_gem, name: "nokogiri", version: "1.7.0") }
 
           context "with color", :no_color_tty do
             before do
@@ -97,8 +97,8 @@ class ExampleSource < Bundler::Source
         end
 
         context "with an older version" do
-          let(:spec) { double(:spec, :name => "nokogiri", :version => "1.7.1", :platform => rb) }
-          let(:locked_gem) { double(:locked_gem, :name => "nokogiri", :version => "1.7.0") }
+          let(:spec) { double(:spec, name: "nokogiri", version: "1.7.1", platform: Gem::Platform::RUBY) }
+          let(:locked_gem) { double(:locked_gem, name: "nokogiri", version: "1.7.0") }
 
           context "with color", :no_color_tty do
             before do
@@ -128,7 +128,7 @@ class ExampleSource < Bundler::Source
 
   describe "#can_lock?" do
     context "when the passed spec's source is equivalent" do
-      let(:spec) { double(:spec, :source => subject) }
+      let(:spec) { double(:spec, source: subject) }
 
       it "should return true" do
         expect(subject.can_lock?(spec)).to be_truthy
@@ -136,7 +136,7 @@ class ExampleSource < Bundler::Source
     end
 
     context "when the passed spec's source is not equivalent" do
-      let(:spec) { double(:spec, :source => double(:other_source)) }
+      let(:spec) { double(:spec, source: double(:other_source)) }
 
       it "should return false" do
         expect(subject.can_lock?(spec)).to be_falsey
diff --git a/spec/bundler/bundler/spec_set_spec.rb b/spec/bundler/bundler/spec_set_spec.rb
index 6fedd38b50fc4f..c4b66762236a11 100644
--- a/spec/bundler/bundler/spec_set_spec.rb
+++ b/spec/bundler/bundler/spec_set_spec.rb
@@ -45,24 +45,6 @@
     end
   end
 
-  describe "#merge" do
-    let(:other_specs) do
-      [
-        build_spec("f", "1.0"),
-        build_spec("g", "2.0"),
-      ].flatten
-    end
-
-    let(:other_spec_set) { described_class.new(other_specs) }
-
-    it "merges the items in each gemspec" do
-      new_spec_set = subject.merge(other_spec_set)
-      specs = new_spec_set.to_a.map(&:full_name)
-      expect(specs).to include("a-1.0")
-      expect(specs).to include("f-1.0")
-    end
-  end
-
   describe "#to_a" do
     it "returns the specs in order" do
       expect(subject.to_a.map(&:full_name)).to eq %w[
diff --git a/spec/bundler/bundler/specifications/foo.gemspec b/spec/bundler/bundler/specifications/foo.gemspec
new file mode 100644
index 00000000000000..19b7724e8189ba
--- /dev/null
+++ b/spec/bundler/bundler/specifications/foo.gemspec
@@ -0,0 +1,13 @@
+# rubocop:disable Style/FrozenStringLiteralComment
+# stub: foo 1.0.0 ruby lib
+
+# The first line would be '# -*- encoding: utf-8 -*-' in a real stub gemspec
+
+Gem::Specification.new do |s|
+  s.name = "foo"
+  s.version = "1.0.0"
+  s.loaded_from = __FILE__
+  s.extensions = "ext/foo"
+  s.required_ruby_version = ">= 3.2.0"
+end
+# rubocop:enable Style/FrozenStringLiteralComment
diff --git a/spec/bundler/bundler/stub_specification_spec.rb b/spec/bundler/bundler/stub_specification_spec.rb
index fb612813c24f17..beb966b3ce8b56 100644
--- a/spec/bundler/bundler/stub_specification_spec.rb
+++ b/spec/bundler/bundler/stub_specification_spec.rb
@@ -19,6 +19,17 @@
     end
   end
 
+  describe "#gem_build_complete_path" do
+    it "StubSpecification should have equal gem_build_complete_path as Specification" do
+      spec_path = File.join(File.dirname(__FILE__), "specifications", "foo.gemspec")
+      spec = Gem::Specification.load(spec_path)
+      gem_stub = Gem::StubSpecification.new(spec_path, File.dirname(__FILE__),"","")
+
+      stub = described_class.from_stub(gem_stub)
+      expect(stub.gem_build_complete_path).to eq spec.gem_build_complete_path
+    end
+  end
+
   describe "#manually_installed?" do
     it "returns true if installed_by_version is nil or 0" do
       stub = described_class.from_stub(with_bundler_stub_spec)
@@ -44,4 +55,24 @@
       expect(stub.missing_extensions?).to be true
     end
   end
+
+  describe "#activated?" do
+    it "returns true after activation" do
+      stub = described_class.from_stub(with_bundler_stub_spec)
+
+      expect(stub.activated?).to be_falsey
+      stub.activated = true
+      expect(stub.activated?).to be true
+    end
+
+    it "returns true after activation if the underlying stub is a `Gem::StubSpecification`" do
+      spec_path = File.join(File.dirname(__FILE__), "specifications", "foo.gemspec")
+      gem_stub = Gem::StubSpecification.new(spec_path, File.dirname(__FILE__),"","")
+      stub = described_class.from_stub(gem_stub)
+
+      expect(stub.activated?).to be_falsey
+      stub.activated = true
+      expect(stub.activated?).to be true
+    end
+  end
 end
diff --git a/spec/bundler/bundler/ui/shell_spec.rb b/spec/bundler/bundler/ui/shell_spec.rb
index 15120a8a41cfb6..422c850a6536e6 100644
--- a/spec/bundler/bundler/ui/shell_spec.rb
+++ b/spec/bundler/bundler/ui/shell_spec.rb
@@ -10,6 +10,13 @@
     it "prints to stdout" do
       expect { subject.info("info") }.to output("info\n").to_stdout
     end
+
+    context "when output_stream is :stderr" do
+      before { subject.output_stream = :stderr }
+      it "prints to stderr" do
+        expect { subject.info("info") }.to output("info\n").to_stderr
+      end
+    end
   end
 
   describe "#confirm" do
@@ -17,19 +24,36 @@
     it "prints to stdout" do
       expect { subject.confirm("confirm") }.to output("confirm\n").to_stdout
     end
+
+    context "when output_stream is :stderr" do
+      before { subject.output_stream = :stderr }
+      it "prints to stderr" do
+        expect { subject.confirm("confirm") }.to output("confirm\n").to_stderr
+      end
+    end
   end
 
   describe "#warn" do
     before { subject.level = "warn" }
-    it "prints to stderr" do
+    it "prints to stderr, implicitly adding a newline" do
       expect { subject.warn("warning") }.to output("warning\n").to_stderr
     end
+    it "can be told not to emit a newline" do
+      expect { subject.warn("warning", false) }.to output("warning").to_stderr
+    end
   end
 
   describe "#debug" do
     it "prints to stdout" do
       expect { subject.debug("debug") }.to output("debug\n").to_stdout
     end
+
+    context "when output_stream is :stderr" do
+      before { subject.output_stream = :stderr }
+      it "prints to stderr" do
+        expect { subject.debug("debug") }.to output("debug\n").to_stderr
+      end
+    end
   end
 
   describe "#error" do
diff --git a/spec/bundler/bundler/uri_credentials_filter_spec.rb b/spec/bundler/bundler/uri_credentials_filter_spec.rb
index 466c1b8594ba5d..641f0addb4a23c 100644
--- a/spec/bundler/bundler/uri_credentials_filter_spec.rb
+++ b/spec/bundler/bundler/uri_credentials_filter_spec.rb
@@ -16,7 +16,7 @@
           let(:credentials) { "oauth_token:x-oauth-basic@" }
 
           it "returns the uri without the oauth token" do
-            expect(subject.credential_filtered_uri(uri).to_s).to eq(Bundler::URI("https://x-oauth-basic@github.com/company/private-repo").to_s)
+            expect(subject.credential_filtered_uri(uri).to_s).to eq(Gem::URI("https://x-oauth-basic@github.com/company/private-repo").to_s)
           end
 
           it_behaves_like "original type of uri is maintained"
@@ -26,7 +26,17 @@
           let(:credentials) { "oauth_token:x@" }
 
           it "returns the uri without the oauth token" do
-            expect(subject.credential_filtered_uri(uri).to_s).to eq(Bundler::URI("https://x@github.com/company/private-repo").to_s)
+            expect(subject.credential_filtered_uri(uri).to_s).to eq(Gem::URI("https://x@github.com/company/private-repo").to_s)
+          end
+
+          it_behaves_like "original type of uri is maintained"
+        end
+
+        context "specified without empty username" do
+          let(:credentials) { "oauth_token@" }
+
+          it "returns the uri without the oauth token" do
+            expect(subject.credential_filtered_uri(uri).to_s).to eq(Gem::URI("https://github.com/company/private-repo").to_s)
           end
 
           it_behaves_like "original type of uri is maintained"
@@ -37,7 +47,7 @@
         let(:credentials) { "username1:hunter3@" }
 
         it "returns the uri without the password" do
-          expect(subject.credential_filtered_uri(uri).to_s).to eq(Bundler::URI("https://username1@github.com/company/private-repo").to_s)
+          expect(subject.credential_filtered_uri(uri).to_s).to eq(Gem::URI("https://username1@github.com/company/private-repo").to_s)
         end
 
         it_behaves_like "original type of uri is maintained"
@@ -55,7 +65,7 @@
     end
 
     context "uri is a uri object" do
-      let(:uri) { Bundler::URI("https://#{credentials}github.com/company/private-repo") }
+      let(:uri) { Gem::URI("https://#{credentials}github.com/company/private-repo") }
 
       it_behaves_like "sensitive credentials in uri are filtered out"
     end
@@ -90,7 +100,7 @@
   describe "#credential_filtered_string" do
     let(:str_to_filter) { "This is a git message containing a uri #{uri}!" }
     let(:credentials)   { "" }
-    let(:uri)           { Bundler::URI("https://#{credentials}github.com/company/private-repo") }
+    let(:uri)           { Gem::URI("https://#{credentials}github.com/company/private-repo") }
 
     context "with a uri that contains credentials" do
       let(:credentials) { "oauth_token:x-oauth-basic@" }
diff --git a/spec/bundler/bundler/yaml_serializer_spec.rb b/spec/bundler/bundler/yaml_serializer_spec.rb
index da4aa52829a576..9ff1579b76c896 100644
--- a/spec/bundler/bundler/yaml_serializer_spec.rb
+++ b/spec/bundler/bundler/yaml_serializer_spec.rb
@@ -57,6 +57,19 @@
 
       expect(serializer.dump(hash)).to eq(expected)
     end
+
+    it "handles empty array" do
+      hash = {
+        "empty_array" => [],
+      }
+
+      expected = <<~YAML
+        ---
+        empty_array: []
+      YAML
+
+      expect(serializer.dump(hash)).to eq(expected)
+    end
   end
 
   describe "#load" do
@@ -99,10 +112,10 @@
 
     it "handles colon in key/value" do
       yaml = <<~YAML
-        BUNDLE_MIRROR__HTTPS://RUBYGEMS__ORG/: http://rubygems-mirror.org
+        BUNDLE_MIRROR__HTTPS://RUBYGEMS__ORG/: http://example-mirror.rubygems.org
       YAML
 
-      expect(serializer.load(yaml)).to eq("BUNDLE_MIRROR__HTTPS://RUBYGEMS__ORG/" => "http://rubygems-mirror.org")
+      expect(serializer.load(yaml)).to eq("BUNDLE_MIRROR__HTTPS://RUBYGEMS__ORG/" => "http://example-mirror.rubygems.org")
     end
 
     it "handles arrays inside hashes" do
@@ -148,6 +161,34 @@
 
       expect(serializer.load(yaml)).to eq(hash)
     end
+
+    it "handles empty array" do
+      yaml = <<~YAML
+        ---
+        empty_array: []
+      YAML
+
+      hash = {
+        "empty_array" => [],
+      }
+
+      expect(serializer.load(yaml)).to eq(hash)
+    end
+
+    it "skip commented out words" do
+      yaml = <<~YAML
+        ---
+        foo: bar
+        buzz: foo # bar
+      YAML
+
+      hash = {
+        "foo" => "bar",
+        "buzz" => "foo",
+      }
+
+      expect(serializer.load(yaml)).to eq(hash)
+    end
   end
 
   describe "against yaml lib" do
diff --git a/spec/bundler/cache/cache_path_spec.rb b/spec/bundler/cache/cache_path_spec.rb
index 12385427b1bcf3..d5bd14965b58cf 100644
--- a/spec/bundler/cache/cache_path_spec.rb
+++ b/spec/bundler/cache/cache_path_spec.rb
@@ -3,15 +3,15 @@
 RSpec.describe "bundle package" do
   before do
     gemfile <<-G
-      source "#{file_uri_for(gem_repo1)}"
-      gem "rack"
+      source "https://gem.repo1"
+      gem "myrack"
     G
   end
 
   context "with --cache-path" do
     it "caches gems at given path" do
       bundle :cache, "cache-path" => "vendor/cache-foo"
-      expect(bundled_app("vendor/cache-foo/rack-1.0.0.gem")).to exist
+      expect(bundled_app("vendor/cache-foo/myrack-1.0.0.gem")).to exist
     end
   end
 
@@ -19,14 +19,14 @@
     it "caches gems at given path" do
       bundle "config set cache_path vendor/cache-foo"
       bundle :cache
-      expect(bundled_app("vendor/cache-foo/rack-1.0.0.gem")).to exist
+      expect(bundled_app("vendor/cache-foo/myrack-1.0.0.gem")).to exist
     end
   end
 
   context "with absolute --cache-path" do
     it "caches gems at given path" do
-      bundle :cache, "cache-path" => "/tmp/cache-foo"
-      expect(bundled_app("/tmp/cache-foo/rack-1.0.0.gem")).to exist
+      bundle :cache, "cache-path" => bundled_app("vendor/cache-foo")
+      expect(bundled_app("vendor/cache-foo/myrack-1.0.0.gem")).to exist
     end
   end
 end
diff --git a/spec/bundler/cache/gems_spec.rb b/spec/bundler/cache/gems_spec.rb
index 63c00eba016f23..780972b9afa8a9 100644
--- a/spec/bundler/cache/gems_spec.rb
+++ b/spec/bundler/cache/gems_spec.rb
@@ -4,23 +4,23 @@
   shared_examples_for "when there are only gemsources" do
     before :each do
       gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
-        gem 'rack'
+        source "https://gem.repo1"
+        gem 'myrack'
       G
 
-      system_gems "rack-1.0.0", :path => path
+      system_gems "myrack-1.0.0", path: path
       bundle :cache
     end
 
     it "copies the .gem file to vendor/cache" do
-      expect(bundled_app("vendor/cache/rack-1.0.0.gem")).to exist
+      expect(bundled_app("vendor/cache/myrack-1.0.0.gem")).to exist
     end
 
     it "uses the cache as a source when installing gems" do
-      build_gem "omg", :path => bundled_app("vendor/cache")
+      build_gem "omg", path: bundled_app("vendor/cache")
 
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
+        source "https://gem.repo1"
         gem "omg"
       G
 
@@ -28,47 +28,47 @@
     end
 
     it "uses the cache as a source when installing gems with --local" do
-      system_gems [], :path => default_bundle_path
+      system_gems [], path: default_bundle_path
       bundle "install --local"
 
-      expect(the_bundle).to include_gems("rack 1.0.0")
+      expect(the_bundle).to include_gems("myrack 1.0.0")
     end
 
     it "does not reinstall gems from the cache if they exist on the system" do
-      build_gem "rack", "1.0.0", :path => bundled_app("vendor/cache") do |s|
-        s.write "lib/rack.rb", "RACK = 'FAIL'"
+      build_gem "myrack", "1.0.0", path: bundled_app("vendor/cache") do |s|
+        s.write "lib/myrack.rb", "MYRACK = 'FAIL'"
       end
 
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
-        gem "rack"
+        source "https://gem.repo1"
+        gem "myrack"
       G
 
-      expect(the_bundle).to include_gems("rack 1.0.0")
+      expect(the_bundle).to include_gems("myrack 1.0.0")
     end
 
     it "does not reinstall gems from the cache if they exist in the bundle" do
-      system_gems "rack-1.0.0", :path => default_bundle_path
+      system_gems "myrack-1.0.0", path: default_bundle_path
 
       gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
-        gem "rack"
+        source "https://gem.repo1"
+        gem "myrack"
       G
 
-      build_gem "rack", "1.0.0", :path => bundled_app("vendor/cache") do |s|
-        s.write "lib/rack.rb", "RACK = 'FAIL'"
+      build_gem "myrack", "1.0.0", path: bundled_app("vendor/cache") do |s|
+        s.write "lib/myrack.rb", "MYRACK = 'FAIL'"
       end
 
-      bundle :install, :local => true
-      expect(the_bundle).to include_gems("rack 1.0.0")
+      bundle :install, local: true
+      expect(the_bundle).to include_gems("myrack 1.0.0")
     end
 
     it "creates a lockfile" do
-      cache_gems "rack-1.0.0"
+      cache_gems "myrack-1.0.0"
 
       gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
-        gem "rack"
+        source "https://gem.repo1"
+        gem "myrack"
       G
 
       bundle "cache"
@@ -93,82 +93,102 @@
     let(:default_json_version) { ruby "gem 'json'; require 'json'; puts JSON::VERSION" }
 
     before :each do
-      build_repo2 do
-        build_gem "json", default_json_version
+      build_gem "json", default_json_version, to_system: true, default: true
+    end
+
+    context "when a remote gem is available for caching" do
+      before do
+        build_repo2 do
+          build_gem "json", default_json_version
+        end
       end
 
-      build_gem "json", default_json_version, :to_system => true, :default => true
-    end
+      it "uses remote gems when installing" do
+        install_gemfile %(source "https://gem.repo2"; gem 'json', '#{default_json_version}'), verbose: true
+        expect(out).to include("Installing json #{default_json_version}")
+      end
 
-    it "uses builtin gems when installing to system gems" do
-      bundle "config set path.system true"
-      install_gemfile %(source "#{file_uri_for(gem_repo1)}"; gem 'json', '#{default_json_version}'), :verbose => true
-      expect(out).to include("Using json #{default_json_version}")
-    end
+      it "does not use remote gems when installing with --local flag" do
+        install_gemfile %(source "https://gem.repo2"; gem 'json', '#{default_json_version}'), verbose: true, local: true
+        expect(out).to include("Using json #{default_json_version}")
+      end
 
-    it "caches remote and builtin gems" do
-      install_gemfile <<-G
-        source "#{file_uri_for(gem_repo2)}"
-        gem 'json', '#{default_json_version}'
-        gem 'rack', '1.0.0'
-      G
+      it "does not use remote gems when installing with --prefer-local flag" do
+        install_gemfile %(source "https://gem.repo2"; gem 'json', '#{default_json_version}'), verbose: true, "prefer-local": true
+        expect(out).to include("Using json #{default_json_version}")
+      end
 
-      bundle :cache
-      expect(bundled_app("vendor/cache/rack-1.0.0.gem")).to exist
-      expect(bundled_app("vendor/cache/json-#{default_json_version}.gem")).to exist
-    end
+      it "caches remote and builtin gems" do
+        install_gemfile <<-G
+          source "https://gem.repo2"
+          gem 'json', '#{default_json_version}'
+          gem 'myrack', '1.0.0'
+        G
 
-    it "caches builtin gems when cache_all_platforms is set" do
-      gemfile <<-G
-        source "#{file_uri_for(gem_repo2)}"
-        gem "json"
-      G
+        bundle :cache
+        expect(bundled_app("vendor/cache/myrack-1.0.0.gem")).to exist
+        expect(bundled_app("vendor/cache/json-#{default_json_version}.gem")).to exist
+      end
 
-      bundle "config set cache_all_platforms true"
+      it "caches builtin gems when cache_all_platforms is set" do
+        gemfile <<-G
+          source "https://gem.repo2"
+          gem "json"
+        G
 
-      bundle :cache
-      expect(bundled_app("vendor/cache/json-#{default_json_version}.gem")).to exist
-    end
+        bundle "config set cache_all_platforms true"
 
-    it "doesn't make remote request after caching the gem" do
-      build_gem "builtin_gem_2", "1.0.2", :path => bundled_app("vendor/cache") do |s|
-        s.summary = "This builtin_gem is bundled with Ruby"
+        bundle :cache
+        expect(bundled_app("vendor/cache/json-#{default_json_version}.gem")).to exist
       end
 
-      install_gemfile <<-G
-        source "#{file_uri_for(gem_repo2)}"
-        gem 'builtin_gem_2', '1.0.2'
-      G
+      it "doesn't make remote request after caching the gem" do
+        build_gem "builtin_gem_2", "1.0.2", path: bundled_app("vendor/cache"), default: true
 
-      bundle "install --local"
-      expect(the_bundle).to include_gems("builtin_gem_2 1.0.2")
+        install_gemfile <<-G
+          source "https://gem.repo2"
+          gem 'builtin_gem_2', '1.0.2'
+        G
+
+        bundle "install --local"
+        expect(the_bundle).to include_gems("builtin_gem_2 1.0.2")
+      end
     end
 
-    it "errors if the builtin gem isn't available to cache" do
-      bundle "config set path.system true"
+    context "when a remote gem is not available for caching" do
+      it "warns, but uses builtin gems when installing to system gems" do
+        bundle "config set path.system true"
+        install_gemfile %(source "https://gem.repo1"; gem 'json', '#{default_json_version}'), verbose: true
+        expect(err).to include("json-#{default_json_version} is built in to Ruby, and can't be cached")
+        expect(out).to include("Using json #{default_json_version}")
+      end
+
+      it "errors when explicitly caching" do
+        bundle "config set path.system true"
 
-      install_gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
-        gem 'json', '#{default_json_version}'
-      G
+        install_gemfile <<-G
+          source "https://gem.repo1"
+          gem 'json', '#{default_json_version}'
+        G
 
-      bundle :cache, :raise_on_error => false
-      expect(exitstatus).to_not eq(0)
-      expect(err).to include("json-#{default_json_version} is built in to Ruby, and can't be cached")
+        bundle :cache, raise_on_error: false
+        expect(last_command).to be_failure
+        expect(err).to include("json-#{default_json_version} is built in to Ruby, and can't be cached")
+      end
     end
   end
 
   describe "when there are also git sources" do
     before do
       build_git "foo"
-      system_gems "rack-1.0.0"
+      system_gems "myrack-1.0.0"
 
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
+        source "https://gem.repo1"
         git "#{lib_path("foo-1.0")}" do
           gem 'foo'
         end
-        gem 'rack'
+        gem 'myrack'
       G
     end
 
@@ -178,7 +198,7 @@
       system_gems []
       bundle "install --local"
 
-      expect(the_bundle).to include_gems("rack 1.0.0", "foo 1.0")
+      expect(the_bundle).to include_gems("myrack 1.0.0", "foo 1.0")
     end
 
     it "should not explode if the lockfile is not present" do
@@ -191,41 +211,44 @@
   end
 
   describe "when previously cached" do
-    before :each do
+    let :setup_main_repo do
       build_repo2
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo2)}"
-        gem "rack"
+        source "https://gem.repo2"
+        gem "myrack"
         gem "actionpack"
       G
       bundle :cache
-      expect(cached_gem("rack-1.0.0")).to exist
+      expect(cached_gem("myrack-1.0.0")).to exist
       expect(cached_gem("actionpack-2.3.2")).to exist
       expect(cached_gem("activesupport-2.3.2")).to exist
     end
 
     it "re-caches during install" do
-      cached_gem("rack-1.0.0").rmtree
+      setup_main_repo
+      cached_gem("myrack-1.0.0").rmtree
       bundle :install
       expect(out).to include("Updating files in vendor/cache")
-      expect(cached_gem("rack-1.0.0")).to exist
+      expect(cached_gem("myrack-1.0.0")).to exist
     end
 
     it "adds and removes when gems are updated" do
+      setup_main_repo
       update_repo2 do
-        build_gem "rack", "1.2" do |s|
-          s.executables = "rackup"
+        build_gem "myrack", "1.2" do |s|
+          s.executables = "myrackup"
         end
       end
 
-      bundle "update", :all => true
-      expect(cached_gem("rack-1.2")).to exist
-      expect(cached_gem("rack-1.0.0")).not_to exist
+      bundle "update", all: true
+      expect(cached_gem("myrack-1.2")).to exist
+      expect(cached_gem("myrack-1.0.0")).not_to exist
     end
 
     it "adds new gems and dependencies" do
+      setup_main_repo
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo2)}"
+        source "https://gem.repo2"
         gem "rails"
       G
       expect(cached_gem("rails-2.3.2")).to exist
@@ -233,24 +256,26 @@
     end
 
     it "removes .gems for removed gems and dependencies" do
+      setup_main_repo
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo2)}"
-        gem "rack"
+        source "https://gem.repo2"
+        gem "myrack"
       G
-      expect(cached_gem("rack-1.0.0")).to exist
+      expect(cached_gem("myrack-1.0.0")).to exist
       expect(cached_gem("actionpack-2.3.2")).not_to exist
       expect(cached_gem("activesupport-2.3.2")).not_to exist
     end
 
     it "removes .gems when gem changes to git source" do
-      build_git "rack"
+      setup_main_repo
+      build_git "myrack"
 
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo2)}"
-        gem "rack", :git => "#{lib_path("rack-1.0")}"
+        source "https://gem.repo2"
+        gem "myrack", :git => "#{lib_path("myrack-1.0")}"
         gem "actionpack"
       G
-      expect(cached_gem("rack-1.0.0")).not_to exist
+      expect(cached_gem("myrack-1.0.0")).not_to exist
       expect(cached_gem("actionpack-2.3.2")).to exist
       expect(cached_gem("activesupport-2.3.2")).to exist
     end
@@ -258,7 +283,7 @@
     it "doesn't remove gems that are for another platform" do
       simulate_platform "java" do
         install_gemfile <<-G
-          source "#{file_uri_for(gem_repo1)}"
+          source "https://gem.repo1"
           gem "platform_specific"
         G
 
@@ -266,37 +291,111 @@
         expect(cached_gem("platform_specific-1.0-java")).to exist
       end
 
-      simulate_new_machine
-      install_gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
-        gem "platform_specific"
-      G
+      pristine_system_gems :bundler
+
+      simulate_platform "x86-darwin-100" do
+        install_gemfile <<-G
+          source "https://gem.repo1"
+          gem "platform_specific"
+        G
+
+        expect(cached_gem("platform_specific-1.0-x86-darwin-100")).to exist
+        expect(cached_gem("platform_specific-1.0-java")).to exist
+      end
+    end
+
+    it "doesn't remove gems cached gems that don't match their remote counterparts, but also refuses to install and prints an error" do
+      setup_main_repo
+      cached_myrack = cached_gem("myrack-1.0.0")
+      cached_myrack.rmtree
+      build_gem "myrack", "1.0.0",
+        path: cached_myrack.parent,
+        rubygems_version: "1.3.2"
+
+      FileUtils.rm_r default_bundle_path
+      system_gems :bundler
+
+      FileUtils.rm bundled_app_lock
+      bundle :install, raise_on_error: false
+
+      expect(err).to eq <<~E.strip
+        Bundler found mismatched checksums. This is a potential security risk.
+          #{checksum_to_lock(gem_repo2, "myrack", "1.0.0")}
+            from the API at https://gem.repo2/
+          #{checksum_from_package(cached_myrack, "myrack", "1.0.0")}
+            from the gem at #{cached_myrack}
+
+        If you trust the API at https://gem.repo2/, to resolve this issue you can:
+          1. remove the gem at #{cached_myrack}
+          2. run `bundle install`
+
+        To ignore checksum security warnings, disable checksum validation with
+          `bundle config set --local disable_checksum_validation true`
+      E
 
-      expect(cached_gem("platform_specific-1.0-#{Bundler.local_platform}")).to exist
-      expect(cached_gem("platform_specific-1.0-java")).to exist
+      expect(cached_gem("myrack-1.0.0")).to exist
     end
 
-    it "doesn't remove gems with mismatched :rubygems_version or :date" do
-      cached_gem("rack-1.0.0").rmtree
-      build_gem "rack", "1.0.0",
-        :path => bundled_app("vendor/cache"),
-        :rubygems_version => "1.3.2"
-      simulate_new_machine
+    it "raises an error when a cached gem is altered and produces a different checksum than the remote gem" do
+      setup_main_repo
+      cached_gem("myrack-1.0.0").rmtree
+      build_gem "myrack", "1.0.0", path: bundled_app("vendor/cache")
 
+      checksums = checksums_section do |c|
+        c.checksum gem_repo1, "myrack", "1.0.0"
+      end
+
+      FileUtils.rm_r default_bundle_path
+      system_gems :bundler
+
+      lockfile <<-L
+        GEM
+          remote: https://gem.repo2/
+          specs:
+            myrack (1.0.0)
+        #{checksums}
+      L
+
+      bundle :install, raise_on_error: false
+      expect(exitstatus).to eq(37)
+      expect(err).to include("Bundler found mismatched checksums.")
+      expect(err).to include("1. remove the gem at #{cached_gem("myrack-1.0.0")}")
+
+      expect(cached_gem("myrack-1.0.0")).to exist
+      cached_gem("myrack-1.0.0").rmtree
       bundle :install
-      expect(cached_gem("rack-1.0.0")).to exist
+      expect(cached_gem("myrack-1.0.0")).to exist
+    end
+
+    it "installs a modified gem with a non-matching checksum when the API implementation does not provide checksums" do
+      setup_main_repo
+      cached_gem("myrack-1.0.0").rmtree
+      build_gem "myrack", "1.0.0", path: bundled_app("vendor/cache")
+      pristine_system_gems :bundler
+
+      lockfile <<-L
+        GEM
+          remote: https://gem.repo2/
+          specs:
+            myrack (1.0.0)
+      L
+
+      bundle :install, artifice: "endpoint", env: { "BUNDLER_SPEC_GEM_REPO" => gem_repo2.to_s }
+      expect(cached_gem("myrack-1.0.0")).to exist
     end
 
     it "handles directories and non .gem files in the cache" do
+      setup_main_repo
       bundled_app("vendor/cache/foo").mkdir
       File.open(bundled_app("vendor/cache/bar"), "w") {|f| f.write("not a gem") }
       bundle :cache
     end
 
     it "does not say that it is removing gems when it isn't actually doing so" do
+      setup_main_repo
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
-        gem "rack"
+        source "https://gem.repo1"
+        gem "myrack"
       G
       bundle "cache"
       bundle "install"
@@ -304,9 +403,10 @@
     end
 
     it "does not warn about all if it doesn't have any git/path dependency" do
+      setup_main_repo
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
-        gem "rack"
+        source "https://gem.repo1"
+        gem "myrack"
       G
       bundle "cache"
       expect(out).not_to match(/\-\-all/)
@@ -314,10 +414,10 @@
 
     it "should install gems with the name bundler in them (that aren't bundler)" do
       build_gem "foo-bundler", "1.0",
-        :path => bundled_app("vendor/cache")
+        path: bundled_app("vendor/cache")
 
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
+        source "https://gem.repo1"
         gem "foo-bundler"
       G
 
diff --git a/spec/bundler/cache/git_spec.rb b/spec/bundler/cache/git_spec.rb
index 890ba88605af09..e9dee60a98eb8e 100644
--- a/spec/bundler/cache/git_spec.rb
+++ b/spec/bundler/cache/git_spec.rb
@@ -18,7 +18,7 @@
     ref = git.ref_for("main", 11)
 
     install_gemfile <<-G
-      source "#{file_uri_for(gem_repo1)}"
+      source "https://gem.repo1"
       gem "foo", :git => '#{lib_path("foo-1.0")}'
     G
 
@@ -28,7 +28,7 @@
     expect(bundled_app("vendor/cache/foo-1.0-#{ref}/.git")).not_to exist
     expect(bundled_app("vendor/cache/foo-1.0-#{ref}/.bundlecache")).to be_file
 
-    FileUtils.rm_rf lib_path("foo-1.0")
+    FileUtils.rm_r lib_path("foo-1.0")
     expect(the_bundle).to include_gems "foo 1.0"
   end
 
@@ -37,7 +37,7 @@
     ref = git.ref_for("main", 11)
 
     install_gemfile <<-G
-      source "#{file_uri_for(gem_repo1)}"
+      source "https://gem.repo1"
       gem "foo", :git => '#{lib_path("foo-1.0")}'
     G
 
@@ -49,7 +49,7 @@
     expect(bundled_app("vendor/cache/foo-1.0-#{ref}")).to exist
     expect(bundled_app("vendor/cache/foo-1.0-#{ref}/.git")).not_to exist
 
-    FileUtils.rm_rf lib_path("foo-1.0")
+    FileUtils.rm_r lib_path("foo-1.0")
     expect(the_bundle).to include_gems "foo 1.0"
   end
 
@@ -57,7 +57,7 @@
     build_git "foo"
 
     install_gemfile <<-G
-      source "#{file_uri_for(gem_repo1)}"
+      source "https://gem.repo1"
       gem "foo", :git => '#{lib_path("foo-1.0")}'
     G
 
@@ -66,7 +66,7 @@
     bundle :cache
 
     expect(out).to include "Updating files in vendor/cache"
-    FileUtils.rm_rf lib_path("foo-1.0")
+    FileUtils.rm_r lib_path("foo-1.0")
     expect(the_bundle).to include_gems "foo 1.0"
   end
 
@@ -75,7 +75,7 @@
     old_ref = git.ref_for("main", 11)
 
     install_gemfile <<-G
-      source "#{file_uri_for(gem_repo1)}"
+      source "https://gem.repo1"
       gem "foo", :git => '#{lib_path("foo-1.0")}'
     G
 
@@ -89,13 +89,13 @@
     ref = git.ref_for("main", 11)
     expect(ref).not_to eq(old_ref)
 
-    bundle "update", :all => true
+    bundle "update", all: true
     bundle :cache
 
     expect(bundled_app("vendor/cache/foo-1.0-#{ref}")).to exist
     expect(bundled_app("vendor/cache/foo-1.0-#{old_ref}")).not_to exist
 
-    FileUtils.rm_rf lib_path("foo-1.0")
+    FileUtils.rm_r lib_path("foo-1.0")
     run "require 'foo'"
     expect(out).to eq("CACHE")
   end
@@ -105,7 +105,7 @@
     old_ref = git.ref_for("main", 11)
 
     install_gemfile <<-G
-      source "#{file_uri_for(gem_repo1)}"
+      source "https://gem.repo1"
       gem "foo", :git => '#{lib_path("foo-1.0")}'
     G
 
@@ -124,7 +124,7 @@
     expect(bundled_app("vendor/cache/foo-1.0-#{ref}")).to exist
     expect(bundled_app("vendor/cache/foo-1.0-#{old_ref}")).not_to exist
 
-    FileUtils.rm_rf lib_path("foo-1.0")
+    FileUtils.rm_r lib_path("foo-1.0")
     run "require 'foo'"
     expect(out).to eq("CACHE")
   end
@@ -134,7 +134,7 @@
     ref = git.ref_for("main", 11)
 
     gemfile <<-G
-      source "#{file_uri_for(gem_repo1)}"
+      source "https://gem.repo1"
       gem "foo", :git => '#{lib_path("foo-invalid")}', :branch => :main
     G
 
@@ -154,6 +154,173 @@
     expect(out).to eq("LOCAL")
   end
 
+  it "can use gems after copying install folder to a different machine with git not installed" do
+    build_git "foo"
+
+    gemfile <<-G
+      source "https://gem.repo1"
+      gem "foo", :git => '#{lib_path("foo-1.0")}'
+    G
+    bundle "config set path vendor/bundle"
+    bundle :install
+
+    pristine_system_gems :bundler
+    with_path_as "" do
+      bundle "config set deployment true"
+      bundle "install --local"
+      expect(the_bundle).to include_gem "foo 1.0"
+    end
+  end
+
+  it "can install after bundle cache without cloning remote repositories" do
+    build_git "foo"
+
+    gemfile <<-G
+      source "https://gem.repo1"
+      gem "foo", :git => '#{lib_path("foo-1.0")}'
+    G
+    bundle "config set cache_all true"
+    bundle :cache, "all-platforms" => true
+
+    pristine_system_gems :bundler
+    bundle "config set frozen true"
+    bundle "install --local --verbose"
+    expect(out).to_not include("Fetching")
+    expect(the_bundle).to include_gem "foo 1.0"
+  end
+
+  it "can install after bundle cache without cloning remote repositories even without the original cache" do
+    build_git "foo"
+
+    gemfile <<-G
+      source "https://gem.repo1"
+      gem "foo", :git => '#{lib_path("foo-1.0")}'
+    G
+    bundle "config set cache_all true"
+    bundle :cache, "all-platforms" => true
+
+    pristine_system_gems :bundler
+    bundle "config set frozen true"
+    bundle "install --local --verbose"
+    expect(out).to_not include("Fetching")
+    expect(the_bundle).to include_gem "foo 1.0"
+  end
+
+  it "can install after bundle cache without cloning remote repositories with only git tracked files" do
+    build_git "foo"
+
+    gemfile <<-G
+      source "https://gem.repo1"
+      gem "foo", :git => '#{lib_path("foo-1.0")}'
+    G
+    bundle "config set cache_all true"
+    bundle :cache, "all-platforms" => true
+
+    pristine_system_gems :bundler
+    bundle "config set frozen true"
+
+    # Remove untracked files (including the empty refs dir in the cache)
+    Dir.chdir(bundled_app) do
+      system(*%W[git init --quiet])
+      system(*%W[git add --all])
+      system(*%W[git clean -d --force --quiet])
+    end
+
+    bundle "install --local --verbose"
+    expect(out).to_not include("Fetching")
+    expect(the_bundle).to include_gem "foo 1.0"
+  end
+
+  it "installs properly a bundler 2.5.17-2.5.23 cache as a bare repository without cloning remote repositories" do
+    git = build_git "foo"
+
+    short_ref = git.ref_for("main", 11)
+    cache_dir = bundled_app("vendor/cache/foo-1.0-#{short_ref}")
+
+    gemfile <<-G
+      source "https://gem.repo1"
+      gem "foo", :git => '#{lib_path("foo-1.0")}'
+    G
+    bundle "config set global_gem_cache false"
+    bundle "config set cache_all true"
+    bundle "config path vendor/bundle"
+    bundle :install
+
+    # Simulate old cache by copying the real cache folder to vendor/cache
+    FileUtils.mkdir_p bundled_app("vendor/cache")
+    FileUtils.cp_r "#{Dir.glob(vendored_gems("cache/bundler/git/foo-1.0-*")).first}/.", cache_dir
+    FileUtils.rm_r bundled_app("vendor/bundle")
+
+    bundle "install --local --verbose"
+    expect(err).to include("Installing from cache in old \"bare repository\" format for compatibility")
+
+    expect(out).to_not include("Fetching")
+
+    # leaves old cache alone
+    expect(cache_dir.join("lib/foo.rb")).not_to exist
+    expect(cache_dir.join("HEAD")).to exist
+
+    expect(the_bundle).to include_gem "foo 1.0"
+  end
+
+  it "migrates a bundler 2.5.17-2.5.23 cache as a bare repository when not running with --local" do
+    git = build_git "foo"
+
+    short_ref = git.ref_for("main", 11)
+    cache_dir = bundled_app("vendor/cache/foo-1.0-#{short_ref}")
+
+    gemfile <<-G
+      source "https://gem.repo1"
+      gem "foo", :git => '#{lib_path("foo-1.0")}'
+    G
+    bundle "config set global_gem_cache false"
+    bundle "config set cache_all true"
+    bundle "config path vendor/bundle"
+    bundle :install
+
+    # Simulate old cache by copying the real cache folder to vendor/cache
+    FileUtils.mkdir_p bundled_app("vendor/cache")
+    FileUtils.cp_r "#{Dir.glob(vendored_gems("cache/bundler/git/foo-1.0-*")).first}/.", cache_dir
+    FileUtils.rm_r bundled_app("vendor/bundle")
+
+    bundle "install --verbose"
+    expect(out).to include("Fetching")
+
+    # migrates old cache alone
+    expect(cache_dir.join("lib/foo.rb")).to exist
+    expect(cache_dir.join("HEAD")).not_to exist
+
+    expect(the_bundle).to include_gem "foo 1.0"
+  end
+
+  it "migrates a bundler 2.5.17-2.5.23 cache as a bare repository when running `bundle cache`, even if gems already installed" do
+    git = build_git "foo"
+
+    short_ref = git.ref_for("main", 11)
+    cache_dir = bundled_app("vendor/cache/foo-1.0-#{short_ref}")
+
+    gemfile <<-G
+      source "https://gem.repo1"
+      gem "foo", :git => '#{lib_path("foo-1.0")}'
+    G
+    bundle "config set global_gem_cache false"
+    bundle "config set cache_all true"
+    bundle "config path vendor/bundle"
+    bundle :install
+
+    # Simulate old cache by copying the real cache folder to vendor/cache
+    FileUtils.mkdir_p bundled_app("vendor/cache")
+    FileUtils.cp_r "#{Dir.glob(vendored_gems("cache/bundler/git/foo-1.0-*")).first}/.", cache_dir
+
+    bundle "cache"
+
+    # migrates old cache alone
+    expect(cache_dir.join("lib/foo.rb")).to exist
+    expect(cache_dir.join("HEAD")).not_to exist
+
+    expect(the_bundle).to include_gem "foo 1.0"
+  end
+
   it "copies repository to vendor cache, including submodules" do
     # CVE-2022-39253: https://lore.kernel.org/lkml/xmqq4jw1uku5.fsf@gitster.g/
     system(*%W[git config --global protocol.file.allow always])
@@ -164,11 +331,11 @@
       s.add_dependency "submodule"
     end
 
-    sys_exec "git submodule add #{lib_path("submodule-1.0")} submodule-1.0", :dir => lib_path("has_submodule-1.0")
-    sys_exec "git commit -m \"submodulator\"", :dir => lib_path("has_submodule-1.0")
+    git "submodule add #{lib_path("submodule-1.0")} submodule-1.0", lib_path("has_submodule-1.0")
+    git "commit -m \"submodulator\"", lib_path("has_submodule-1.0")
 
     install_gemfile <<-G
-      source "#{file_uri_for(gem_repo1)}"
+      source "https://gem.repo1"
       git "#{lib_path("has_submodule-1.0")}", :submodules => true do
         gem "has_submodule"
       end
@@ -192,7 +359,7 @@
     update_git("foo") {|s| s.write "foo.gemspec", spec_lines.join("\n") }
 
     install_gemfile <<-G
-      source "#{file_uri_for(gem_repo1)}"
+      source "https://gem.repo1"
       gem "foo", :git => '#{lib_path("foo-1.0")}'
     G
     bundle "config set cache_all true"
@@ -207,26 +374,66 @@
     build_git "foo"
 
     gemfile <<-G
-      source "#{file_uri_for(gem_repo1)}"
+      source "https://gem.repo1"
       gem "foo", :git => '#{lib_path("foo-1.0")}'
     G
     bundle "config set cache_all true"
     bundle :cache, "all-platforms" => true, :install => false
 
-    simulate_new_machine
+    pristine_system_gems :bundler
     with_path_as "" do
       bundle "config set deployment true"
-      bundle :install, :local => true
+      bundle :install, local: true
       expect(the_bundle).to include_gem "foo 1.0"
     end
   end
 
+  it "can install after bundle cache generated with an older Bundler that kept checkouts in the cache" do
+    git = build_git("foo")
+    locked_revision = git.ref_for("main")
+    path_revision = git.ref_for("main", 11)
+
+    git_path = lib_path("foo-1.0")
+
+    gemfile <<-G
+      source "https://gem.repo1"
+      gem "foo", :git => '#{git_path}'
+    G
+    lockfile <<~L
+      GIT
+        remote: #{git_path}/
+        revision: #{locked_revision}
+        specs:
+          foo (1.0)
+
+      GEM
+        remote: https://gem.repo1/
+        specs:
+
+      PLATFORMS
+        #{lockfile_platforms}
+
+      DEPENDENCIES
+        foo!
+
+      BUNDLED WITH
+         #{Bundler::VERSION}
+    L
+
+    # Simulate an old incorrect situation where vendor/cache would be the install location of git gems
+    FileUtils.mkdir_p bundled_app("vendor/cache")
+    FileUtils.cp_r git_path, bundled_app("vendor/cache/foo-1.0-#{path_revision}")
+    FileUtils.rm_r bundled_app("vendor/cache/foo-1.0-#{path_revision}/.git")
+
+    bundle :install, env: { "BUNDLE_DEPLOYMENT" => "true", "BUNDLE_CACHE_ALL" => "true" }
+  end
+
   it "respects the --no-install flag" do
     git = build_git "foo", &:add_c_extension
     ref = git.ref_for("main", 11)
 
     gemfile <<-G
-      source "#{file_uri_for(gem_repo1)}"
+      source "https://gem.repo1"
       gem "foo", :git => '#{lib_path("foo-1.0")}'
     G
     bundle "config set cache_all true"
@@ -245,7 +452,7 @@
       bundle :cache, "all-platforms" => true, :install => false
 
       # it did _NOT_ actually install the gem - neither in $GEM_HOME (bundler 2 mode),
-      # nor in .bundle (bundler 3 mode)
+      # nor in .bundle (bundler 4 mode)
       expect(Pathname.new(File.join(default_bundle_path, "gems/foo-1.0-#{ref}"))).to_not exist
       # it _did_ cache the gem in vendor/
       expect(bundled_app("vendor/cache/foo-1.0-#{ref}")).to exist
@@ -266,11 +473,40 @@
     # Verify that the compilation worked and the result is in $LOAD_PATH by simply attempting
     # to require it; that should make sure this spec does not break if the load path behaviour
     # is changed.
-    bundle :install, :local => true
-    ruby <<~R, :raise_on_error => false
+    bundle :install, local: true
+    ruby <<~R, raise_on_error: false
       require 'bundler/setup'
       require 'foo_c'
     R
     expect(last_command).to_not be_failure
   end
+
+  it "doesn't fail when git gem has extensions and an empty cache folder is present before bundle install" do
+    build_git "puma" do |s|
+      s.add_dependency "rake"
+      s.extensions << "Rakefile"
+      s.executables = "puma"
+      s.write "Rakefile", <<-RUBY
+        task :default do
+          path = File.expand_path("../lib", __FILE__)
+          FileUtils.mkdir_p(path)
+          File.open("\#{path}/puma.rb", "w") do |f|
+            f.puts "PUMA = 'YES'"
+          end
+        end
+      RUBY
+    end
+
+    FileUtils.mkdir_p(bundled_app("vendor/cache"))
+    bundle "config set cache_all all"
+
+    install_gemfile <<-G
+      source "https://gem.repo1"
+      gem "puma", :git => "#{lib_path("puma-1.0")}"
+    G
+
+    bundle "exec puma"
+
+    expect(out).to eq("YES")
+  end
 end
diff --git a/spec/bundler/cache/path_spec.rb b/spec/bundler/cache/path_spec.rb
index 2ad136a00864e2..526b7369ef35a5 100644
--- a/spec/bundler/cache/path_spec.rb
+++ b/spec/bundler/cache/path_spec.rb
@@ -2,10 +2,10 @@
 
 RSpec.describe "bundle cache with path" do
   it "is no-op when the path is within the bundle" do
-    build_lib "foo", :path => bundled_app("lib/foo")
+    build_lib "foo", path: bundled_app("lib/foo")
 
     install_gemfile <<-G
-      source "#{file_uri_for(gem_repo1)}"
+      source "https://gem.repo1"
       gem "foo", :path => '#{bundled_app("lib/foo")}'
     G
 
@@ -19,7 +19,7 @@
     build_lib "foo"
 
     install_gemfile <<-G
-      source "#{file_uri_for(gem_repo1)}"
+      source "https://gem.repo1"
       gem "foo", :path => '#{lib_path("foo-1.0")}'
     G
 
@@ -35,10 +35,10 @@
     libname = File.basename(bundled_app) + "_gem"
     libpath = File.join(File.dirname(bundled_app), libname)
 
-    build_lib libname, :path => libpath
+    build_lib libname, path: libpath
 
     install_gemfile <<-G
-      source "#{file_uri_for(gem_repo1)}"
+      source "https://gem.repo1"
       gem "#{libname}", :path => '#{libpath}'
     G
 
@@ -54,7 +54,7 @@
     build_lib "foo"
 
     install_gemfile <<-G
-      source "#{file_uri_for(gem_repo1)}"
+      source "https://gem.repo1"
       gem "foo", :path => '#{lib_path("foo-1.0")}'
     G
 
@@ -77,7 +77,7 @@
     build_lib "foo"
 
     install_gemfile <<-G
-      source "#{file_uri_for(gem_repo1)}"
+      source "https://gem.repo1"
       gem "foo", :path => '#{lib_path("foo-1.0")}'
     G
 
@@ -89,7 +89,7 @@
     build_lib "bar"
 
     install_gemfile <<-G
-      source "#{file_uri_for(gem_repo1)}"
+      source "https://gem.repo1"
       gem "bar", :path => '#{lib_path("bar-1.0")}'
     G
 
@@ -97,11 +97,11 @@
     expect(bundled_app("vendor/cache/foo-1.0")).not_to exist
   end
 
-  it "does not cache path gems by default", :bundler => "< 3" do
+  it "does not cache path gems by default" do
     build_lib "foo"
 
     install_gemfile <<-G
-      source "#{file_uri_for(gem_repo1)}"
+      source "https://gem.repo1"
       gem "foo", :path => '#{lib_path("foo-1.0")}'
     G
 
@@ -110,11 +110,11 @@
     expect(bundled_app("vendor/cache/foo-1.0")).not_to exist
   end
 
-  it "caches path gems by default", :bundler => "3" do
+  it "caches path gems by default", bundler: "4" do
     build_lib "foo"
 
     install_gemfile <<-G
-      source "#{file_uri_for(gem_repo1)}"
+      source "https://gem.repo1"
       gem "foo", :path => '#{lib_path("foo-1.0")}'
     G
 
@@ -127,7 +127,7 @@
     build_lib "foo"
 
     install_gemfile <<-G
-      source "#{file_uri_for(gem_repo1)}"
+      source "https://gem.repo1"
       gem "foo", :path => '#{lib_path("foo-1.0")}'
     G
 
@@ -136,7 +136,7 @@
     build_lib "bar"
 
     install_gemfile <<-G
-      source "#{file_uri_for(gem_repo1)}"
+      source "https://gem.repo1"
       gem "foo", :path => '#{lib_path("foo-1.0")}'
       gem "bar", :path => '#{lib_path("bar-1.0")}'
     G
@@ -149,7 +149,7 @@
     build_lib "foo"
 
     install_gemfile <<-G
-      source "#{file_uri_for(gem_repo1)}"
+      source "https://gem.repo1"
       gem "foo", :path => '#{lib_path("foo-1.0")}'
     G
 
@@ -158,12 +158,12 @@
     build_lib "baz"
 
     gemfile <<-G
-      source "#{file_uri_for(gem_repo1)}"
+      source "https://gem.repo1"
       gem "foo", :path => '#{lib_path("foo-1.0")}'
       gem "baz", :path => '#{lib_path("baz-1.0")}'
     G
 
-    bundle "cache --no-all", :raise_on_error => false
+    bundle "cache --no-all", raise_on_error: false
     expect(bundled_app("vendor/cache/baz-1.0")).not_to exist
   end
 end
diff --git a/spec/bundler/cache/platform_spec.rb b/spec/bundler/cache/platform_spec.rb
index 128278956c8e5e..71c0eaee8eb6bb 100644
--- a/spec/bundler/cache/platform_spec.rb
+++ b/spec/bundler/cache/platform_spec.rb
@@ -3,10 +3,10 @@
 RSpec.describe "bundle cache with multiple platforms" do
   before :each do
     gemfile <<-G
-      source "#{file_uri_for(gem_repo1)}"
+      source "https://gem.repo1"
 
       platforms :mri, :rbx do
-        gem "rack", "1.0.0"
+        gem "myrack", "1.0.0"
       end
 
       platforms :jruby do
@@ -16,9 +16,9 @@
 
     lockfile <<-G
       GEM
-        remote: #{file_uri_for(gem_repo1)}/
+        remote: https://gem.repo1/
         specs:
-          rack (1.0.0)
+          myrack (1.0.0)
           activesupport (2.3.5)
 
       PLATFORMS
@@ -26,24 +26,24 @@
         java
 
       DEPENDENCIES
-        rack (1.0.0)
+        myrack (1.0.0)
         activesupport (2.3.5)
     G
 
-    cache_gems "rack-1.0.0", "activesupport-2.3.5"
+    cache_gems "myrack-1.0.0", "activesupport-2.3.5"
   end
 
   it "ensures that a successful bundle install does not delete gems for other platforms" do
     bundle "install"
 
-    expect(bundled_app("vendor/cache/rack-1.0.0.gem")).to exist
+    expect(bundled_app("vendor/cache/myrack-1.0.0.gem")).to exist
     expect(bundled_app("vendor/cache/activesupport-2.3.5.gem")).to exist
   end
 
   it "ensures that a successful bundle update does not delete gems for other platforms" do
-    bundle "update", :all => true
+    bundle "update", all: true
 
-    expect(bundled_app("vendor/cache/rack-1.0.0.gem")).to exist
+    expect(bundled_app("vendor/cache/myrack-1.0.0.gem")).to exist
     expect(bundled_app("vendor/cache/activesupport-2.3.5.gem")).to exist
   end
 end
diff --git a/spec/bundler/commands/add_spec.rb b/spec/bundler/commands/add_spec.rb
index 5a5b534e8d2ba0..00aa6415e11c97 100644
--- a/spec/bundler/commands/add_spec.rb
+++ b/spec/bundler/commands/add_spec.rb
@@ -9,24 +9,34 @@
       build_gem "bar", "0.12.3"
       build_gem "cat", "0.12.3.pre"
       build_gem "dog", "1.1.3.pre"
+      build_gem "lemur", "3.1.1.pre.2023.1.1"
     end
 
     build_git "foo", "2.0"
 
     gemfile <<-G
-      source "#{file_uri_for(gem_repo2)}"
+      source "https://gem.repo2"
       gem "weakling", "~> 0.0.1"
     G
   end
 
   context "when no gems are specified" do
     it "shows error" do
-      bundle "add", :raise_on_error => false
+      bundle "add", raise_on_error: false
 
       expect(err).to include("Please specify gems to add")
     end
   end
 
+  context "when Gemfile is empty, and frozen mode is set" do
+    it "shows error" do
+      gemfile 'source "https://gem.repo2"'
+      bundle "add bar", raise_on_error: false, env: { "BUNDLE_FROZEN" => "true" }
+
+      expect(err).to include("Frozen mode is set, but there's no lockfile")
+    end
+  end
+
   describe "without version specified" do
     it "version requirement becomes ~> major.minor.patch when resolved version is < 1.0" do
       bundle "add 'bar'"
@@ -51,6 +61,13 @@
       expect(bundled_app_gemfile.read).to match(/gem "dog", "~> 1.1.pre"/)
       expect(the_bundle).to include_gems "dog 1.1.3.pre"
     end
+
+    it "version requirement becomes ~> major.minor.pre.tail when resolved version has a very long tail pre version" do
+      bundle "add 'lemur'"
+      # the trailing pre purposely matches the release version to ensure that subbing the release doesn't change the pre.version"
+      expect(bundled_app_gemfile.read).to match(/gem "lemur", "~> 3.1.pre.2023.1.1"/)
+      expect(the_bundle).to include_gems "lemur 3.1.1.pre.2023.1.1"
+    end
   end
 
   describe "with --version" do
@@ -63,7 +80,7 @@
     it "adds multiple version constraints when specified" do
       requirements = ["< 3.0", "> 1.0"]
       bundle "add 'foo' --version='#{requirements.join(", ")}'"
-      expect(bundled_app_gemfile.read).to match(/gem "foo", #{Gem::Requirement.new(requirements).as_list.map(&:dump).join(', ')}/)
+      expect(bundled_app_gemfile.read).to match(/gem "foo", #{Gem::Requirement.new(requirements).as_list.map(&:dump).join(", ")}/)
       expect(the_bundle).to include_gems "foo 2.0"
     end
   end
@@ -71,34 +88,34 @@
   describe "with --require" do
     it "adds the require param for the gem" do
       bundle "add 'foo' --require=foo/engine"
-      expect(bundled_app_gemfile.read).to match(%r{gem "foo",(?: .*,) :require => "foo\/engine"})
+      expect(bundled_app_gemfile.read).to match(%r{gem "foo",(?: .*,) require: "foo\/engine"})
     end
 
     it "converts false to a boolean" do
       bundle "add 'foo' --require=false"
-      expect(bundled_app_gemfile.read).to match(/gem "foo",(?: .*,) :require => false/)
+      expect(bundled_app_gemfile.read).to match(/gem "foo",(?: .*,) require: false/)
     end
   end
 
   describe "with --group" do
     it "adds dependency for the specified group" do
       bundle "add 'foo' --group='development'"
-      expect(bundled_app_gemfile.read).to match(/gem "foo", "~> 2.0", :group => :development/)
+      expect(bundled_app_gemfile.read).to match(/gem "foo", "~> 2.0", group: :development/)
       expect(the_bundle).to include_gems "foo 2.0"
     end
 
     it "adds dependency to more than one group" do
       bundle "add 'foo' --group='development, test'"
-      expect(bundled_app_gemfile.read).to match(/gem "foo", "~> 2.0", :groups => \[:development, :test\]/)
+      expect(bundled_app_gemfile.read).to match(/gem "foo", "~> 2.0", groups: \[:development, :test\]/)
       expect(the_bundle).to include_gems "foo 2.0"
     end
   end
 
   describe "with --source" do
     it "adds dependency with specified source" do
-      bundle "add 'foo' --source='#{file_uri_for(gem_repo2)}'"
+      bundle "add 'foo' --source='https://gem.repo2'"
 
-      expect(bundled_app_gemfile.read).to match(/gem "foo", "~> 2.0", :source => "#{file_uri_for(gem_repo2)}"/)
+      expect(bundled_app_gemfile.read).to match(%r{gem "foo", "~> 2.0", source: "https://gem.repo2"})
       expect(the_bundle).to include_gems "foo 2.0"
     end
   end
@@ -107,7 +124,7 @@
     it "adds dependency with specified path" do
       bundle "add 'foo' --path='#{lib_path("foo-2.0")}'"
 
-      expect(bundled_app_gemfile.read).to match(/gem "foo", "~> 2.0", :path => "#{lib_path("foo-2.0")}"/)
+      expect(bundled_app_gemfile.read).to match(/gem "foo", "~> 2.0", path: "#{lib_path("foo-2.0")}"/)
       expect(the_bundle).to include_gems "foo 2.0"
     end
   end
@@ -116,20 +133,20 @@
     it "adds dependency with specified git source" do
       bundle "add foo --git=#{lib_path("foo-2.0")}"
 
-      expect(bundled_app_gemfile.read).to match(/gem "foo", "~> 2.0", :git => "#{lib_path("foo-2.0")}"/)
+      expect(bundled_app_gemfile.read).to match(/gem "foo", "~> 2.0", git: "#{lib_path("foo-2.0")}"/)
       expect(the_bundle).to include_gems "foo 2.0"
     end
   end
 
   describe "with --git and --branch" do
     before do
-      update_git "foo", "2.0", :branch => "test"
+      update_git "foo", "2.0", branch: "test"
     end
 
     it "adds dependency with specified git source and branch" do
       bundle "add foo --git=#{lib_path("foo-2.0")} --branch=test"
 
-      expect(bundled_app_gemfile.read).to match(/gem "foo", "~> 2.0", :git => "#{lib_path("foo-2.0")}", :branch => "test"/)
+      expect(bundled_app_gemfile.read).to match(/gem "foo", "~> 2.0", git: "#{lib_path("foo-2.0")}", branch: "test"/)
       expect(the_bundle).to include_gems "foo 2.0"
     end
   end
@@ -138,32 +155,84 @@
     it "adds dependency with specified git source and branch" do
       bundle "add foo --git=#{lib_path("foo-2.0")} --ref=#{revision_for(lib_path("foo-2.0"))}"
 
-      expect(bundled_app_gemfile.read).to match(/gem "foo", "~> 2\.0", :git => "#{lib_path("foo-2.0")}", :ref => "#{revision_for(lib_path("foo-2.0"))}"/)
+      expect(bundled_app_gemfile.read).to match(/gem "foo", "~> 2\.0", git: "#{lib_path("foo-2.0")}", ref: "#{revision_for(lib_path("foo-2.0"))}"/)
       expect(the_bundle).to include_gems "foo 2.0"
     end
   end
 
   describe "with --github" do
-    it "adds dependency with specified github source", :realworld do
+    before do
+      build_git "rake", "13.0"
+      git("config --global url.file://#{lib_path("rake-13.0")}.insteadOf https://github.com/ruby/rake.git")
+    end
+
+    it "adds dependency with specified github source" do
       bundle "add rake --github=ruby/rake"
 
-      expect(bundled_app_gemfile.read).to match(%r{gem "rake", "~> 13\.0", :github => "ruby\/rake"})
+      expect(bundled_app_gemfile.read).to match(%r{gem "rake", "~> 13\.\d+", github: "ruby\/rake"})
+    end
+
+    it "adds dependency with specified github source and branch" do
+      bundle "add rake --github=ruby/rake --branch=main"
+
+      expect(bundled_app_gemfile.read).to match(%r{gem "rake", "~> 13\.\d+", github: "ruby\/rake", branch: "main"})
+    end
+
+    it "adds dependency with specified github source and ref" do
+      ref = revision_for(lib_path("rake-13.0"))
+      bundle "add rake --github=ruby/rake --ref=#{ref}"
+
+      expect(bundled_app_gemfile.read).to match(%r{gem "rake", "~> 13\.\d+", github: "ruby\/rake", ref: "#{ref}"})
+    end
+
+    it "adds dependency with specified github source and glob" do
+      bundle "add rake --github=ruby/rake --glob='./*.gemspec'"
+
+      expect(bundled_app_gemfile.read).to match(%r{gem "rake", "~> 13\.\d+", github: "ruby\/rake", glob: "\.\/\*\.gemspec"})
+    end
+
+    it "adds dependency with specified github source, branch and glob" do
+      bundle "add rake --github=ruby/rake --branch=main --glob='./*.gemspec'"
+
+      expect(bundled_app_gemfile.read).to match(%r{gem "rake", "~> 13\.\d+", github: "ruby\/rake", branch: "main", glob: "\.\/\*\.gemspec"})
+    end
+
+    it "adds dependency with specified github source, ref and glob" do
+      ref = revision_for(lib_path("rake-13.0"))
+      bundle "add rake --github=ruby/rake --ref=#{ref} --glob='./*.gemspec'"
+
+      expect(bundled_app_gemfile.read).to match(%r{gem "rake", "~> 13\.\d+", github: "ruby\/rake", ref: "#{ref}", glob: "\.\/\*\.gemspec"})
     end
   end
 
-  describe "with --github and --branch" do
-    it "adds dependency with specified github source and branch", :realworld do
-      bundle "add rake --github=ruby/rake --branch=master"
+  describe "with --git and --glob" do
+    it "adds dependency with specified git source" do
+      bundle "add foo --git=#{lib_path("foo-2.0")} --glob='./*.gemspec'"
 
-      expect(bundled_app_gemfile.read).to match(%r{gem "rake", "~> 13\.0", :github => "ruby\/rake", :branch => "master"})
+      expect(bundled_app_gemfile.read).to match(%r{gem "foo", "~> 2.0", git: "#{lib_path("foo-2.0")}", glob: "\./\*\.gemspec"})
+      expect(the_bundle).to include_gems "foo 2.0"
     end
   end
 
-  describe "with --github and --ref" do
-    it "adds dependency with specified github source and ref", :realworld do
-      bundle "add rake --github=ruby/rake --ref=5c60da8"
+  describe "with --git and --branch and --glob" do
+    before do
+      update_git "foo", "2.0", branch: "test"
+    end
+
+    it "adds dependency with specified git source and branch" do
+      bundle "add foo --git=#{lib_path("foo-2.0")} --branch=test --glob='./*.gemspec'"
 
-      expect(bundled_app_gemfile.read).to match(%r{gem "rake", "~> 13\.0", :github => "ruby\/rake", :ref => "5c60da8"})
+      expect(bundled_app_gemfile.read).to match(%r{gem "foo", "~> 2.0", git: "#{lib_path("foo-2.0")}", branch: "test", glob: "\./\*\.gemspec"})
+      expect(the_bundle).to include_gems "foo 2.0"
+    end
+  end
+
+  describe "with --git and --ref and --glob" do
+    it "adds dependency with specified git source and branch" do
+      bundle "add foo --git=#{lib_path("foo-2.0")} --ref=#{revision_for(lib_path("foo-2.0"))} --glob='./*.gemspec'"
+
+      expect(bundled_app_gemfile.read).to match(%r{gem "foo", "~> 2\.0", git: "#{lib_path("foo-2.0")}", ref: "#{revision_for(lib_path("foo-2.0"))}", glob: "\./\*\.gemspec"})
+      expect(the_bundle).to include_gems "foo 2.0"
     end
   end
 
@@ -177,30 +246,30 @@
   end
 
   it "using combination of short form options works like long form" do
-    bundle "add 'foo' -s='#{file_uri_for(gem_repo2)}' -g='development' -v='~>1.0'"
-    expect(bundled_app_gemfile.read).to include %(gem "foo", "~> 1.0", :group => :development, :source => "#{file_uri_for(gem_repo2)}")
+    bundle "add 'foo' -s='https://gem.repo2' -g='development' -v='~>1.0'"
+    expect(bundled_app_gemfile.read).to include %(gem "foo", "~> 1.0", group: :development, source: "https://gem.repo2")
     expect(the_bundle).to include_gems "foo 1.1"
   end
 
   it "shows error message when version is not formatted correctly" do
-    bundle "add 'foo' -v='~>1 . 0'", :raise_on_error => false
+    bundle "add 'foo' -v='~>1 . 0'", raise_on_error: false
     expect(err).to match("Invalid gem requirement pattern '~>1 . 0'")
   end
 
   it "shows error message when gem cannot be found" do
     bundle "config set force_ruby_platform true"
-    bundle "add 'werk_it'", :raise_on_error => false
+    bundle "add 'werk_it'", raise_on_error: false
     expect(err).to match("Could not find gem 'werk_it' in")
 
-    bundle "add 'werk_it' -s='#{file_uri_for(gem_repo2)}'", :raise_on_error => false
+    bundle "add 'werk_it' -s='https://gem.repo2'", raise_on_error: false
     expect(err).to match("Could not find gem 'werk_it' in rubygems repository")
   end
 
   it "shows error message when source cannot be reached" do
-    bundle "add 'baz' --source='http://badhostasdf'", :raise_on_error => false
+    bundle "add 'baz' --source='http://badhostasdf'", raise_on_error: false, artifice: "fail"
     expect(err).to include("Could not reach host badhostasdf. Check your network connection and try again.")
 
-    bundle "add 'baz' --source='file://does/not/exist'", :raise_on_error => false
+    bundle "add 'baz' --source='file://does/not/exist'", raise_on_error: false
     expect(err).to include("Could not fetch specs from file://does/not/exist/")
   end
 
@@ -212,6 +281,38 @@
     end
   end
 
+  describe "with --quiet option" do
+    it "is quiet when there are no warnings" do
+      bundle "add 'foo' --quiet"
+      expect(out).to be_empty
+      expect(err).to be_empty
+    end
+
+    it "still displays warning and errors" do
+      create_file("add_with_warning.rb", <<~RUBY)
+        require "#{lib_dir}/bundler"
+        require "#{lib_dir}/bundler/cli"
+        require "#{lib_dir}/bundler/cli/add"
+
+        module RunWithWarning
+          def run
+            super
+          rescue
+            Bundler.ui.warn "This is a warning"
+            raise
+          end
+        end
+
+        Bundler::CLI::Add.prepend(RunWithWarning)
+      RUBY
+
+      bundle "add 'non-existing-gem' --quiet", raise_on_error: false, env: { "RUBYOPT" => "-r#{bundled_app("add_with_warning.rb")}" }
+      expect(out).to be_empty
+      expect(err).to include("Could not find gem 'non-existing-gem'")
+      expect(err).to include("This is a warning")
+    end
+  end
+
   describe "with --strict option" do
     it "adds strict version" do
       bundle "add 'foo' --strict"
@@ -230,9 +331,9 @@
 
   describe "with --optimistic and --strict" do
     it "throws error" do
-      bundle "add 'foo' --strict --optimistic", :raise_on_error => false
+      bundle "add 'foo' --strict --optimistic", raise_on_error: false
 
-      expect(err).to include("You can not specify `--strict` and `--optimistic` at the same time")
+      expect(err).to include("You cannot specify `--strict` and `--optimistic` at the same time")
     end
   end
 
@@ -245,7 +346,7 @@
     end
 
     it "throws error if any of the specified gems are present in the gemfile with different version" do
-      bundle "add weakling bar", :raise_on_error => false
+      bundle "add weakling bar", raise_on_error: false
 
       expect(err).to include("You cannot specify the same gem twice with different version requirements")
       expect(err).to include("You specified: weakling (~> 0.0.1) and weakling (>= 0).")
@@ -255,41 +356,41 @@
   describe "when a gem is added which is already specified in Gemfile with version" do
     it "shows an error when added with different version requirement" do
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo2)}"
-        gem "rack", "1.0"
+        source "https://gem.repo2"
+        gem "myrack", "1.0"
       G
 
-      bundle "add 'rack' --version=1.1", :raise_on_error => false
+      bundle "add 'myrack' --version=1.1", raise_on_error: false
 
       expect(err).to include("You cannot specify the same gem twice with different version requirements")
-      expect(err).to include("If you want to update the gem version, run `bundle update rack`. You may also need to change the version requirement specified in the Gemfile if it's too restrictive")
+      expect(err).to include("If you want to update the gem version, run `bundle update myrack`. You may also need to change the version requirement specified in the Gemfile if it's too restrictive")
     end
 
     it "shows error when added without version requirements" do
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo2)}"
-        gem "rack", "1.0"
+        source "https://gem.repo2"
+        gem "myrack", "1.0"
       G
 
-      bundle "add 'rack'", :raise_on_error => false
+      bundle "add 'myrack'", raise_on_error: false
 
       expect(err).to include("Gem already added.")
       expect(err).to include("You cannot specify the same gem twice with different version requirements")
-      expect(err).not_to include("If you want to update the gem version, run `bundle update rack`. You may also need to change the version requirement specified in the Gemfile if it's too restrictive")
+      expect(err).not_to include("If you want to update the gem version, run `bundle update myrack`. You may also need to change the version requirement specified in the Gemfile if it's too restrictive")
     end
   end
 
   describe "when a gem is added which is already specified in Gemfile without version" do
     it "shows an error when added with different version requirement" do
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo2)}"
-        gem "rack"
+        source "https://gem.repo2"
+        gem "myrack"
       G
 
-      bundle "add 'rack' --version=1.1", :raise_on_error => false
+      bundle "add 'myrack' --version=1.1", raise_on_error: false
 
       expect(err).to include("You cannot specify the same gem twice with different version requirements")
-      expect(err).to include("If you want to update the gem version, run `bundle update rack`.")
+      expect(err).to include("If you want to update the gem version, run `bundle update myrack`.")
       expect(err).not_to include("You may also need to change the version requirement specified in the Gemfile if it's too restrictive")
     end
   end
@@ -298,8 +399,8 @@
     it "caches all new dependencies added for the specified gem" do
       bundle :cache
 
-      bundle "add 'rack' --version=1.0.0"
-      expect(bundled_app("vendor/cache/rack-1.0.0.gem")).to exist
+      bundle "add 'myrack' --version=1.0.0"
+      expect(bundled_app("vendor/cache/myrack-1.0.0.gem")).to exist
     end
   end
 end
diff --git a/spec/bundler/commands/binstubs_spec.rb b/spec/bundler/commands/binstubs_spec.rb
index bfbef58181305e..e0424dcba4e03a 100644
--- a/spec/bundler/commands/binstubs_spec.rb
+++ b/spec/bundler/commands/binstubs_spec.rb
@@ -4,48 +4,48 @@
   context "when the gem exists in the lockfile" do
     it "sets up the binstub" do
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
-        gem "rack"
+        source "https://gem.repo1"
+        gem "myrack"
       G
 
-      bundle "binstubs rack"
+      bundle "binstubs myrack"
 
-      expect(bundled_app("bin/rackup")).to exist
+      expect(bundled_app("bin/myrackup")).to exist
     end
 
     it "does not install other binstubs" do
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
-        gem "rack"
+        source "https://gem.repo1"
+        gem "myrack"
         gem "rails"
       G
 
       bundle "binstubs rails"
 
-      expect(bundled_app("bin/rackup")).not_to exist
+      expect(bundled_app("bin/myrackup")).not_to exist
       expect(bundled_app("bin/rails")).to exist
     end
 
     it "does install multiple binstubs" do
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
-        gem "rack"
+        source "https://gem.repo1"
+        gem "myrack"
         gem "rails"
       G
 
-      bundle "binstubs rails rack"
+      bundle "binstubs rails myrack"
 
-      expect(bundled_app("bin/rackup")).to exist
+      expect(bundled_app("bin/myrackup")).to exist
       expect(bundled_app("bin/rails")).to exist
     end
 
     it "allows installing all binstubs" do
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
+        source "https://gem.repo1"
         gem "rails"
       G
 
-      bundle :binstubs, :all => true
+      bundle :binstubs, all: true
 
       expect(bundled_app("bin/rails")).to exist
       expect(bundled_app("bin/rake")).to exist
@@ -53,259 +53,46 @@
 
     it "allows installing binstubs for all platforms" do
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
-        gem "rack"
+        source "https://gem.repo1"
+        gem "myrack"
       G
 
-      bundle "binstubs rack --all-platforms"
+      bundle "binstubs myrack --all-platforms"
 
-      expect(bundled_app("bin/rackup")).to exist
-      expect(bundled_app("bin/rackup.cmd")).to exist
+      expect(bundled_app("bin/myrackup")).to exist
+      expect(bundled_app("bin/myrackup.cmd")).to exist
     end
 
     it "displays an error when used without any gem" do
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
-        gem "rack"
+        source "https://gem.repo1"
+        gem "myrack"
       G
 
-      bundle "binstubs", :raise_on_error => false
+      bundle "binstubs", raise_on_error: false
       expect(exitstatus).to eq(1)
       expect(err).to include("`bundle binstubs` needs at least one gem to run.")
     end
 
     it "displays an error when used with --all and gems" do
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
-        gem "rack"
+        source "https://gem.repo1"
+        gem "myrack"
       G
 
-      bundle "binstubs rack", :all => true, :raise_on_error => false
+      bundle "binstubs myrack", all: true, raise_on_error: false
       expect(last_command).to be_failure
       expect(err).to include("Cannot specify --all with specific gems")
     end
 
-    context "when generating bundle binstub outside bundler" do
-      it "should abort" do
-        install_gemfile <<-G
-          source "#{file_uri_for(gem_repo1)}"
-          gem "rack"
-        G
-
-        bundle "binstubs rack"
-
-        File.open(bundled_app("bin/bundle"), "wb") do |file|
-          file.print "OMG"
-        end
-
-        sys_exec "bin/rackup", :raise_on_error => false
-
-        expect(err).to include("was not generated by Bundler")
-      end
-    end
-
-    context "the bundle binstub" do
-      before do
-        pristine_system_gems "bundler-#{system_bundler_version}"
-        build_repo2 do
-          build_gem "rack", "1.2" do |s|
-            s.executables = "rackup"
-          end
-
-          build_gem "prints_loaded_gems", "1.0" do |s|
-            s.executables = "print_loaded_gems"
-            s.bindir = "exe"
-            s.write "exe/print_loaded_gems", <<-R
-              specs = Gem.loaded_specs.values.reject {|s| s.default_gem? }
-              puts specs.map(&:full_name).sort.inspect
-            R
-          end
-        end
-        install_gemfile <<-G
-          source "#{file_uri_for(gem_repo2)}"
-          gem "rack"
-          gem "prints_loaded_gems"
-        G
-        bundle "binstubs bundler rack prints_loaded_gems"
-      end
-
-      let(:system_bundler_version) { Bundler::VERSION }
-
-      it "runs bundler" do
-        sys_exec "bin/bundle install", :env => { "DEBUG" => "1" }
-        expect(out).to include %(Using bundler #{system_bundler_version}\n)
-      end
-
-      context "when BUNDLER_VERSION is set" do
-        it "runs the correct version of bundler" do
-          sys_exec "bin/bundle install", :env => { "BUNDLER_VERSION" => "999.999.999" }, :raise_on_error => false
-          expect(exitstatus).to eq(42)
-          expect(err).to include("Activating bundler (999.999.999) failed:").
-            and include("To install the version of bundler this project requires, run `gem install bundler -v '999.999.999'`")
-        end
-
-        it "runs the correct version of bundler even if a higher version is installed" do
-          system_gems "bundler-999.999.998", "bundler-999.999.999"
-
-          sys_exec "bin/bundle install", :env => { "BUNDLER_VERSION" => "999.999.998", "DEBUG" => "1" }, :raise_on_error => false
-          expect(out).to include %(Using bundler 999.999.998\n)
-        end
-      end
-
-      context "when a lockfile exists with a locked bundler version" do
-        context "and the version is newer" do
-          before do
-            lockfile lockfile.gsub(system_bundler_version, "999.999")
-          end
-
-          it "runs the correct version of bundler" do
-            sys_exec "bin/bundle install", :raise_on_error => false
-            expect(exitstatus).to eq(42)
-            expect(err).to include("Activating bundler (~> 999.999) failed:").
-              and include("To install the version of bundler this project requires, run `gem install bundler -v '~> 999.999'`")
-          end
-        end
-
-        context "and the version is newer when given `gems.rb` and `gems.locked`" do
-          before do
-            gemfile bundled_app("gems.rb"), gemfile
-            lockfile bundled_app("gems.locked"), lockfile.gsub(system_bundler_version, "999.999")
-          end
-
-          it "runs the correct version of bundler" do
-            sys_exec "bin/bundle install", :env => { "BUNDLE_GEMFILE" => "gems.rb" }, :raise_on_error => false
-
-            expect(exitstatus).to eq(42)
-            expect(err).to include("Activating bundler (~> 999.999) failed:").
-              and include("To install the version of bundler this project requires, run `gem install bundler -v '~> 999.999'`")
-          end
-        end
-
-        context "and the version is older and a different major" do
-          let(:system_bundler_version) { "55" }
-
-          before do
-            lockfile lockfile.gsub(/BUNDLED WITH\n   .*$/m, "BUNDLED WITH\n   44.0")
-          end
-
-          it "runs the correct version of bundler" do
-            sys_exec "bin/bundle install", :raise_on_error => false
-            expect(exitstatus).to eq(42)
-            expect(err).to include("Activating bundler (~> 44.0) failed:").
-              and include("To install the version of bundler this project requires, run `gem install bundler -v '~> 44.0'`")
-          end
-        end
-
-        context "and the version is older and a different major when given `gems.rb` and `gems.locked`" do
-          let(:system_bundler_version) { "55" }
-
-          before do
-            gemfile bundled_app("gems.rb"), gemfile
-            lockfile bundled_app("gems.locked"), lockfile.gsub(/BUNDLED WITH\n   .*$/m, "BUNDLED WITH\n   44.0")
-          end
-
-          it "runs the correct version of bundler" do
-            sys_exec "bin/bundle install", :env => { "BUNDLE_GEMFILE" => "gems.rb" }, :raise_on_error => false
-            expect(exitstatus).to eq(42)
-            expect(err).to include("Activating bundler (~> 44.0) failed:").
-              and include("To install the version of bundler this project requires, run `gem install bundler -v '~> 44.0'`")
-          end
-        end
-
-        context "and the version is older and the same major" do
-          let(:system_bundler_version) { "2.999.999" }
-
-          before do
-            lockfile lockfile.gsub(/BUNDLED WITH\n   .*$/m, "BUNDLED WITH\n   2.3.0")
-          end
-
-          it "installs and runs the exact version of bundler", :rubygems => ">= 3.3.0.dev", :realworld => true do
-            sys_exec "bin/bundle install --verbose", :artifice => "vcr"
-            expect(exitstatus).not_to eq(42)
-            expect(out).to include("Bundler 2.999.999 is running, but your lockfile was generated with 2.3.0. Installing Bundler 2.3.0 and restarting using that version.")
-            expect(out).to include("Using bundler 2.3.0")
-            expect(err).not_to include("Activating bundler (~> 2.3.0) failed:")
-          end
-
-          it "runs the available version of bundler", :rubygems => "< 3.3.0.dev" do
-            sys_exec "bin/bundle install --verbose"
-            expect(exitstatus).not_to eq(42)
-            expect(out).not_to include("Bundler 2.999.999 is running, but your lockfile was generated with 2.3.0. Installing Bundler 2.3.0 and restarting using that version.")
-            expect(out).to include("Using bundler 2.999.999")
-            expect(err).not_to include("Activating bundler (~> 2.3.0) failed:")
-          end
-        end
-
-        context "and the version is a pre-releaser" do
-          let(:system_bundler_version) { "55" }
-
-          before do
-            lockfile lockfile.gsub(/BUNDLED WITH\n   .*$/m, "BUNDLED WITH\n   2.12.0.a")
-          end
-
-          it "runs the correct version of bundler when the version is a pre-release" do
-            sys_exec "bin/bundle install", :raise_on_error => false
-            expect(exitstatus).to eq(42)
-            expect(err).to include("Activating bundler (~> 2.12.a) failed:").
-              and include("To install the version of bundler this project requires, run `gem install bundler -v '~> 2.12.a'`")
-          end
-        end
-      end
-
-      context "when update --bundler is called" do
-        before { lockfile.gsub(system_bundler_version, "1.1.1") }
-
-        it "calls through to the latest bundler version", :realworld do
-          sys_exec "bin/bundle update --bundler", :env => { "DEBUG" => "1" }
-          using_bundler_line = /Using bundler ([\w\.]+)\n/.match(out)
-          expect(using_bundler_line).to_not be_nil
-          latest_version = using_bundler_line[1]
-          expect(Gem::Version.new(latest_version)).to be >= Gem::Version.new(system_bundler_version)
-        end
-
-        it "calls through to the explicit bundler version" do
-          sys_exec "bin/bundle update --bundler=999.999.999", :raise_on_error => false
-          expect(exitstatus).to eq(42)
-          expect(err).to include("Activating bundler (999.999.999) failed:").
-            and include("To install the version of bundler this project requires, run `gem install bundler -v '999.999.999'`")
-        end
-      end
-
-      context "without a lockfile" do
-        it "falls back to the latest installed bundler" do
-          FileUtils.rm bundled_app_lock
-          sys_exec "bin/bundle install", :env => { "DEBUG" => "1" }
-          expect(out).to include "Using bundler #{system_bundler_version}\n"
-        end
-      end
-
-      context "using another binstub" do
-        it "loads all gems" do
-          sys_exec bundled_app("bin/print_loaded_gems").to_s
-          expect(out).to eq %(["bundler-#{Bundler::VERSION}", "prints_loaded_gems-1.0", "rack-1.2"])
-        end
-
-        context "when requesting a different bundler version" do
-          before { lockfile lockfile.gsub(Bundler::VERSION, "999.999.999") }
-
-          it "attempts to load that version" do
-            sys_exec bundled_app("bin/rackup").to_s, :raise_on_error => false
-            expect(exitstatus).to eq(42)
-            expect(err).to include("Activating bundler (~> 999.999) failed:").
-              and include("To install the version of bundler this project requires, run `gem install bundler -v '~> 999.999'`")
-          end
-        end
-      end
-    end
-
     it "installs binstubs from git gems" do
       FileUtils.mkdir_p(lib_path("foo/bin"))
       FileUtils.touch(lib_path("foo/bin/foo"))
-      build_git "foo", "1.0", :path => lib_path("foo") do |s|
+      build_git "foo", "1.0", path: lib_path("foo") do |s|
         s.executables = %w[foo]
       end
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
+        source "https://gem.repo1"
         gem "foo", :git => "#{lib_path("foo")}"
       G
 
@@ -317,11 +104,11 @@
     it "installs binstubs from path gems" do
       FileUtils.mkdir_p(lib_path("foo/bin"))
       FileUtils.touch(lib_path("foo/bin/foo"))
-      build_lib "foo", "1.0", :path => lib_path("foo") do |s|
+      build_lib "foo", "1.0", path: lib_path("foo") do |s|
         s.executables = %w[foo]
       end
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
+        source "https://gem.repo1"
         gem "foo", :path => "#{lib_path("foo")}"
       G
 
@@ -333,12 +120,12 @@
     it "sets correct permissions for binstubs" do
       with_umask(0o002) do
         install_gemfile <<-G
-          source "#{file_uri_for(gem_repo1)}"
-          gem "rack"
+          source "https://gem.repo1"
+          gem "myrack"
         G
 
-        bundle "binstubs rack"
-        binary = bundled_app("bin/rackup")
+        bundle "binstubs myrack"
+        binary = bundled_app("bin/myrackup")
         expect(File.stat(binary).mode.to_s(8)).to eq(Gem.win_platform? ? "100644" : "100775")
       end
     end
@@ -346,12 +133,12 @@
     context "when using --shebang" do
       it "sets the specified shebang for the binstub" do
         install_gemfile <<-G
-          source "#{file_uri_for(gem_repo1)}"
-          gem "rack"
+          source "https://gem.repo1"
+          gem "myrack"
         G
 
-        bundle "binstubs rack --shebang jruby"
-        expect(File.readlines(bundled_app("bin/rackup")).first).to eq("#!/usr/bin/env jruby\n")
+        bundle "binstubs myrack --shebang jruby"
+        expect(File.readlines(bundled_app("bin/myrackup")).first).to eq("#!/usr/bin/env jruby\n")
       end
     end
   end
@@ -359,10 +146,10 @@
   context "when the gem doesn't exist" do
     it "displays an error with correct status" do
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
+        source "https://gem.repo1"
       G
 
-      bundle "binstubs doesnt_exist", :raise_on_error => false
+      bundle "binstubs doesnt_exist", raise_on_error: false
 
       expect(exitstatus).to eq(7)
       expect(err).to include("Could not find gem 'doesnt_exist'.")
@@ -372,23 +159,23 @@
   context "--path" do
     it "sets the binstubs dir" do
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
-        gem "rack"
+        source "https://gem.repo1"
+        gem "myrack"
       G
 
-      bundle "binstubs rack --path exec"
+      bundle "binstubs myrack --path exec"
 
-      expect(bundled_app("exec/rackup")).to exist
+      expect(bundled_app("exec/myrackup")).to exist
     end
 
-    it "setting is saved for bundle install", :bundler => "< 3" do
+    it "setting is saved for bundle install" do
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
-        gem "rack"
+        source "https://gem.repo1"
+        gem "myrack"
         gem "rails"
       G
 
-      bundle "binstubs rack", :path => "exec"
+      bundle "binstubs myrack", path: "exec"
       bundle :install
 
       expect(bundled_app("exec/rails")).to exist
@@ -398,34 +185,34 @@
   context "with --standalone option" do
     before do
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
-        gem "rack"
+        source "https://gem.repo1"
+        gem "myrack"
         gem "rails"
       G
     end
 
     it "generates a standalone binstub" do
-      bundle "binstubs rack --standalone"
-      expect(bundled_app("bin/rackup")).to exist
+      bundle "binstubs myrack --standalone"
+      expect(bundled_app("bin/myrackup")).to exist
     end
 
     it "generates a binstub that does not depend on rubygems or bundler" do
-      bundle "binstubs rack --standalone"
-      expect(File.read(bundled_app("bin/rackup"))).to_not include("Gem.bin_path")
+      bundle "binstubs myrack --standalone"
+      expect(File.read(bundled_app("bin/myrackup"))).to_not include("Gem.bin_path")
     end
 
     context "when specified --path option" do
       it "generates a standalone binstub at the given path" do
-        bundle "binstubs rack --standalone --path foo"
-        expect(bundled_app("foo/rackup")).to exist
+        bundle "binstubs myrack --standalone --path foo"
+        expect(bundled_app("foo/myrackup")).to exist
       end
     end
 
     context "when specified --all-platforms option" do
       it "generates standalone binstubs for all platforms" do
-        bundle "binstubs rack --standalone --all-platforms"
-        expect(bundled_app("bin/rackup")).to exist
-        expect(bundled_app("bin/rackup.cmd")).to exist
+        bundle "binstubs myrack --standalone --all-platforms"
+        expect(bundled_app("bin/myrackup")).to exist
+        expect(bundled_app("bin/myrackup.cmd")).to exist
       end
     end
 
@@ -441,7 +228,7 @@
     context "when specified --all option" do
       it "generates standalone binstubs for all gems except bundler" do
         bundle "binstubs --standalone --all"
-        expect(bundled_app("bin/rackup")).to exist
+        expect(bundled_app("bin/myrackup")).to exist
         expect(bundled_app("bin/rails")).to exist
         expect(bundled_app("bin/bundle")).not_to exist
         expect(bundled_app("bin/bundler")).not_to exist
@@ -453,39 +240,39 @@
   context "when the bin already exists" do
     it "doesn't overwrite and warns" do
       FileUtils.mkdir_p(bundled_app("bin"))
-      File.open(bundled_app("bin/rackup"), "wb") do |file|
+      File.open(bundled_app("bin/myrackup"), "wb") do |file|
         file.print "OMG"
       end
 
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
-        gem "rack"
+        source "https://gem.repo1"
+        gem "myrack"
       G
 
-      bundle "binstubs rack"
+      bundle "binstubs myrack"
 
-      expect(bundled_app("bin/rackup")).to exist
-      expect(File.read(bundled_app("bin/rackup"))).to eq("OMG")
-      expect(err).to include("Skipped rackup")
+      expect(bundled_app("bin/myrackup")).to exist
+      expect(File.read(bundled_app("bin/myrackup"))).to eq("OMG")
+      expect(err).to include("Skipped myrackup")
       expect(err).to include("overwrite skipped stubs, use --force")
     end
 
     context "when using --force" do
       it "overwrites the binstub" do
         FileUtils.mkdir_p(bundled_app("bin"))
-        File.open(bundled_app("bin/rackup"), "wb") do |file|
+        File.open(bundled_app("bin/myrackup"), "wb") do |file|
           file.print "OMG"
         end
 
         install_gemfile <<-G
-          source "#{file_uri_for(gem_repo1)}"
-          gem "rack"
+          source "https://gem.repo1"
+          gem "myrack"
         G
 
-        bundle "binstubs rack --force"
+        bundle "binstubs myrack --force"
 
-        expect(bundled_app("bin/rackup")).to exist
-        expect(File.read(bundled_app("bin/rackup"))).not_to eq("OMG")
+        expect(bundled_app("bin/myrackup")).to exist
+        expect(File.read(bundled_app("bin/myrackup"))).not_to eq("OMG")
       end
     end
   end
@@ -493,18 +280,18 @@
   context "when the gem has no bins" do
     it "suggests child gems if they have bins" do
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
-        gem "rack-obama"
+        source "https://gem.repo1"
+        gem "myrack-obama"
       G
 
-      bundle "binstubs rack-obama"
-      expect(err).to include("rack-obama has no executables")
-      expect(err).to include("rack has: rackup")
+      bundle "binstubs myrack-obama"
+      expect(err).to include("myrack-obama has no executables")
+      expect(err).to include("myrack has: myrackup")
     end
 
     it "works if child gems don't have bins" do
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
+        source "https://gem.repo1"
         gem "actionpack"
       G
 
@@ -520,7 +307,7 @@
       end
 
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo2)}"
+        source "https://gem.repo2"
         gem "with_development_dependency"
       G
 
@@ -532,25 +319,25 @@
   context "when BUNDLE_INSTALL is specified" do
     it "performs an automatic bundle install" do
       gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
-        gem "rack"
+        source "https://gem.repo1"
+        gem "myrack"
       G
 
       bundle "config set auto_install 1"
-      bundle "binstubs rack"
-      expect(out).to include("Installing rack 1.0.0")
-      expect(the_bundle).to include_gems "rack 1.0.0"
+      bundle "binstubs myrack"
+      expect(out).to include("Installing myrack 1.0.0")
+      expect(the_bundle).to include_gems "myrack 1.0.0"
     end
 
     it "does nothing when already up to date" do
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
-        gem "rack"
+        source "https://gem.repo1"
+        gem "myrack"
       G
 
       bundle "config set auto_install 1"
-      bundle "binstubs rack", :env => { "BUNDLE_INSTALL" => "1" }
-      expect(out).not_to include("Installing rack 1.0.0")
+      bundle "binstubs myrack", env: { "BUNDLE_INSTALL" => "1" }
+      expect(out).not_to include("Installing myrack 1.0.0")
     end
   end
 end
diff --git a/spec/bundler/commands/cache_spec.rb b/spec/bundler/commands/cache_spec.rb
index a7ac6148f43ac3..4365b92b8cf663 100644
--- a/spec/bundler/commands/cache_spec.rb
+++ b/spec/bundler/commands/cache_spec.rb
@@ -3,8 +3,8 @@
 RSpec.describe "bundle cache" do
   it "doesn't update the cache multiple times, even if it already exists" do
     gemfile <<-G
-      source "#{file_uri_for(gem_repo1)}"
-      gem "rack"
+      source "https://gem.repo1"
+      gem "myrack"
     G
 
     bundle :cache
@@ -17,14 +17,14 @@
   context "with --gemfile" do
     it "finds the gemfile" do
       gemfile bundled_app("NotGemfile"), <<-G
-        source "#{file_uri_for(gem_repo1)}"
-        gem 'rack'
+        source "https://gem.repo1"
+        gem 'myrack'
       G
 
       bundle "cache --gemfile=NotGemfile"
 
       ENV["BUNDLE_GEMFILE"] = "NotGemfile"
-      expect(the_bundle).to include_gems "rack 1.0.0"
+      expect(the_bundle).to include_gems "myrack 1.0.0"
     end
   end
 
@@ -32,15 +32,15 @@
     context "without a gemspec" do
       it "caches all dependencies except bundler itself" do
         gemfile <<-D
-          source "#{file_uri_for(gem_repo1)}"
-          gem 'rack'
+          source "https://gem.repo1"
+          gem 'myrack'
           gem 'bundler'
         D
 
         bundle "config set cache_all true"
         bundle :cache
 
-        expect(bundled_app("vendor/cache/rack-1.0.0.gem")).to exist
+        expect(bundled_app("vendor/cache/myrack-1.0.0.gem")).to exist
         expect(bundled_app("vendor/cache/bundler-0.9.gem")).to_not exist
       end
     end
@@ -63,15 +63,15 @@
 
         it "caches all dependencies except bundler and the gemspec specified gem" do
           gemfile <<-D
-            source "#{file_uri_for(gem_repo1)}"
-            gem 'rack'
+            source "https://gem.repo1"
+            gem 'myrack'
             gemspec
           D
 
           bundle "config set cache_all true"
           bundle :cache
 
-          expect(bundled_app("vendor/cache/rack-1.0.0.gem")).to exist
+          expect(bundled_app("vendor/cache/myrack-1.0.0.gem")).to exist
           expect(bundled_app("vendor/cache/nokogiri-1.4.2.gem")).to exist
           expect(bundled_app("vendor/cache/mygem-0.1.1.gem")).to_not exist
           expect(bundled_app("vendor/cache/bundler-0.9.gem")).to_not exist
@@ -95,15 +95,15 @@
 
         it "caches all dependencies except bundler and the gemspec specified gem" do
           gemfile <<-D
-            source "#{file_uri_for(gem_repo1)}"
-            gem 'rack'
+            source "https://gem.repo1"
+            gem 'myrack'
             gemspec
           D
 
           bundle "config set cache_all true"
           bundle :cache
 
-          expect(bundled_app("vendor/cache/rack-1.0.0.gem")).to exist
+          expect(bundled_app("vendor/cache/myrack-1.0.0.gem")).to exist
           expect(bundled_app("vendor/cache/nokogiri-1.4.2.gem")).to exist
           expect(bundled_app("vendor/cache/mygem-0.1.1.gem")).to_not exist
           expect(bundled_app("vendor/cache/bundler-0.9.gem")).to_not exist
@@ -139,8 +139,8 @@
 
       it "caches all dependencies except bundler and the gemspec specified gems" do
         gemfile <<-D
-          source "#{file_uri_for(gem_repo1)}"
-          gem 'rack'
+          source "https://gem.repo1"
+          gem 'myrack'
           gemspec :name => 'mygem'
           gemspec :name => 'mygem_test'
         D
@@ -148,7 +148,7 @@
         bundle "config set cache_all true"
         bundle :cache
 
-        expect(bundled_app("vendor/cache/rack-1.0.0.gem")).to exist
+        expect(bundled_app("vendor/cache/myrack-1.0.0.gem")).to exist
         expect(bundled_app("vendor/cache/nokogiri-1.4.2.gem")).to exist
         expect(bundled_app("vendor/cache/weakling-0.0.3.gem")).to exist
         expect(bundled_app("vendor/cache/mygem-0.1.1.gem")).to_not exist
@@ -158,16 +158,16 @@
     end
   end
 
-  context "with --path", :bundler => "< 3" do
+  context "with --path" do
     it "sets root directory for gems" do
       gemfile <<-D
-        source "#{file_uri_for(gem_repo1)}"
-        gem 'rack'
+        source "https://gem.repo1"
+        gem 'myrack'
       D
 
       bundle "cache --path #{bundled_app("test")}"
 
-      expect(the_bundle).to include_gems "rack 1.0.0"
+      expect(the_bundle).to include_gems "myrack 1.0.0"
       expect(bundled_app("test/vendor/cache/")).to exist
     end
   end
@@ -175,60 +175,72 @@
   context "with --no-install" do
     it "puts the gems in vendor/cache but does not install them" do
       gemfile <<-D
-        source "#{file_uri_for(gem_repo1)}"
-        gem 'rack'
+        source "https://gem.repo1"
+        gem 'myrack'
       D
 
       bundle "cache --no-install"
 
-      expect(the_bundle).not_to include_gems "rack 1.0.0"
-      expect(bundled_app("vendor/cache/rack-1.0.0.gem")).to exist
+      expect(the_bundle).not_to include_gems "myrack 1.0.0"
+      expect(bundled_app("vendor/cache/myrack-1.0.0.gem")).to exist
     end
 
     it "does not prevent installing gems with bundle install" do
       gemfile <<-D
-        source "#{file_uri_for(gem_repo1)}"
-        gem 'rack'
+        source "https://gem.repo1"
+        gem 'myrack'
       D
 
       bundle "cache --no-install"
       bundle "install"
 
-      expect(the_bundle).to include_gems "rack 1.0.0"
+      expect(the_bundle).to include_gems "myrack 1.0.0"
     end
 
     it "does not prevent installing gems with bundle update" do
       gemfile <<-D
-        source "#{file_uri_for(gem_repo1)}"
-        gem "rack", "1.0.0"
+        source "https://gem.repo1"
+        gem "myrack", "1.0.0"
       D
 
       bundle "cache --no-install"
       bundle "update --all"
 
-      expect(the_bundle).to include_gems "rack 1.0.0"
+      expect(the_bundle).to include_gems "myrack 1.0.0"
     end
   end
 
   context "with --all-platforms" do
-    it "puts the gems in vendor/cache even for other rubies", :bundler => ">= 2.4.0" do
+    it "puts the gems in vendor/cache even for other rubies" do
       gemfile <<-D
-        source "#{file_uri_for(gem_repo1)}"
-        gem 'rack', :platforms => [:ruby_20, :windows_20]
+        source "https://gem.repo1"
+        gem 'myrack', :platforms => [:ruby_20, :windows_20]
       D
 
       bundle "cache --all-platforms"
-      expect(bundled_app("vendor/cache/rack-1.0.0.gem")).to exist
+      expect(bundled_app("vendor/cache/myrack-1.0.0.gem")).to exist
     end
 
-    it "puts the gems in vendor/cache even for legacy windows rubies", :bundler => ">= 2.4.0" do
+    it "puts the gems in vendor/cache even for legacy windows rubies, but prints a warning" do
       gemfile <<-D
-        source "#{file_uri_for(gem_repo1)}"
-        gem 'rack', :platforms => [:ruby_20, :x64_mingw_20]
+        source "https://gem.repo1"
+        gem 'myrack', :platforms => [:ruby_20, :x64_mingw_20]
       D
 
       bundle "cache --all-platforms"
-      expect(bundled_app("vendor/cache/rack-1.0.0.gem")).to exist
+      expect(err).to include("deprecated")
+      expect(bundled_app("vendor/cache/myrack-1.0.0.gem")).to exist
+    end
+
+    it "prints an error when using legacy windows rubies", bundler: "4" do
+      gemfile <<-D
+        source "https://gem.repo1"
+        gem 'myrack', :platforms => [:ruby_20, :x64_mingw_20]
+      D
+
+      bundle "cache --all-platforms", raise_on_error: false
+      expect(err).to include("removed")
+      expect(bundled_app("vendor/cache/myrack-1.0.0.gem")).not_to exist
     end
 
     it "does not attempt to install gems in without groups" do
@@ -241,39 +253,39 @@
       end
 
       bundle "config set --local without wo"
-      install_gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
-        gem "rack"
+      install_gemfile <<-G, artifice: "compact_index_extra_api"
+        source "https://main.repo"
+        gem "myrack"
         group :wo do
           gem "weakling"
-          gem "uninstallable", :source => "#{file_uri_for(gem_repo4)}"
+          gem "uninstallable", :source => "https://main.repo/extra"
         end
       G
 
-      bundle :cache, "all-platforms" => true
+      bundle :cache, "all-platforms" => true, artifice: "compact_index_extra_api"
       expect(bundled_app("vendor/cache/weakling-0.0.3.gem")).to exist
       expect(bundled_app("vendor/cache/uninstallable-2.0.gem")).to exist
-      expect(the_bundle).to include_gem "rack 1.0"
+      expect(the_bundle).to include_gem "myrack 1.0"
       expect(the_bundle).not_to include_gems "weakling", "uninstallable"
 
       bundle "config set --local without wo"
-      bundle :install
-      expect(the_bundle).to include_gem "rack 1.0"
-      expect(the_bundle).not_to include_gems "weakling", "uninstallable"
+      bundle :install, artifice: "compact_index_extra_api"
+      expect(the_bundle).to include_gem "myrack 1.0"
+      expect(the_bundle).not_to include_gems "weakling"
     end
 
     it "does not fail to cache gems in excluded groups when there's a lockfile but gems not previously installed" do
       bundle "config set --local without wo"
       gemfile <<-G
-        source "https://my.gem.repo.1"
-        gem "rack"
+        source "https://gem.repo1"
+        gem "myrack"
         group :wo do
           gem "weakling"
         end
       G
 
-      bundle :lock, :artifice => "compact_index", :env => { "BUNDLER_SPEC_GEM_REPO" => gem_repo1.to_s }
-      bundle :cache, "all-platforms" => true, :artifice => "compact_index", :env => { "BUNDLER_SPEC_GEM_REPO" => gem_repo1.to_s }
+      bundle :lock
+      bundle :cache, "all-platforms" => true
       expect(bundled_app("vendor/cache/weakling-0.0.3.gem")).to exist
     end
   end
@@ -281,29 +293,29 @@
   context "with frozen configured" do
     before do
       gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
-        gem "rack"
+        source "https://gem.repo1"
+        gem "myrack"
       G
       bundle "install"
     end
 
     subject do
       bundle "config set --local frozen true"
-      bundle :cache, :raise_on_error => false
+      bundle :cache, raise_on_error: false
     end
 
     it "tries to install with frozen" do
       bundle "config set deployment true"
       gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
-        gem "rack"
-        gem "rack-obama"
+        source "https://gem.repo1"
+        gem "myrack"
+        gem "myrack-obama"
       G
       subject
       expect(exitstatus).to eq(16)
       expect(err).to include("frozen mode")
       expect(err).to include("You have added to the Gemfile")
-      expect(err).to include("* rack-obama")
+      expect(err).to include("* myrack-obama")
       bundle "env"
       expect(out).to include("frozen").or include("deployment")
     end
@@ -315,12 +327,12 @@
         build_gem "racc", "2.0" do |s|
           s.add_dependency "rake"
           s.extensions << "Rakefile"
-          s.write "Rakefile", "task(:default) { puts 'INSTALLING rack' }"
+          s.write "Rakefile", "task(:default) { puts 'INSTALLING myrack' }"
         end
       end
 
       gemfile <<~G
-        source "#{file_uri_for(gem_repo2)}"
+        source "https://gem.repo2"
 
         gem "racc"
       G
@@ -339,94 +351,199 @@
     it "does not hit the remote at all" do
       build_repo2
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo2)}"
-        gem "rack"
+        source "https://gem.repo2"
+        gem "myrack"
       G
 
       bundle :cache
-      simulate_new_machine
-      FileUtils.rm_rf gem_repo2
+      pristine_system_gems :bundler
+      FileUtils.rm_r gem_repo2
 
       bundle "install --local"
-      expect(the_bundle).to include_gems "rack 1.0.0"
+      expect(the_bundle).to include_gems "myrack 1.0.0"
     end
 
     it "does not hit the remote at all in frozen mode" do
       build_repo2
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo2)}"
-        gem "rack"
+        source "https://gem.repo2"
+        gem "myrack"
       G
 
       bundle :cache
-      simulate_new_machine
-      FileUtils.rm_rf gem_repo2
+      pristine_system_gems :bundler
+      FileUtils.rm_r gem_repo2
 
       bundle "config set --local deployment true"
       bundle "config set --local path vendor/bundle"
       bundle :install
-      expect(the_bundle).to include_gems "rack 1.0.0"
+      expect(the_bundle).to include_gems "myrack 1.0.0"
     end
 
     it "does not hit the remote at all when cache_all_platforms configured" do
       build_repo2
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo2)}"
-        gem "rack"
+        source "https://gem.repo2"
+        gem "myrack"
       G
 
       bundle :cache
-      simulate_new_machine
-      FileUtils.rm_rf gem_repo2
+      pristine_system_gems :bundler
+      FileUtils.rm_r gem_repo2
 
       bundle "config set --local cache_all_platforms true"
       bundle "config set --local path vendor/bundle"
       bundle "install --local"
       expect(out).not_to include("Fetching gem metadata")
-      expect(the_bundle).to include_gems "rack 1.0.0"
+      expect(the_bundle).to include_gems "myrack 1.0.0"
+    end
+
+    it "uses cached gems for secondary sources when cache_all_platforms configured" do
+      build_repo4 do
+        build_gem "foo", "1.0.0" do |s|
+          s.platform = "x86_64-linux"
+        end
+
+        build_gem "foo", "1.0.0" do |s|
+          s.platform = "arm64-darwin"
+        end
+      end
+
+      gemfile <<~G
+        source "https://gem.repo2"
+
+        source "https://gem.repo4" do
+        gem "foo"
+        end
+      G
+
+      lockfile <<~L
+        GEM
+          remote: https://gem.repo2/
+          specs:
+
+        GEM
+          remote: https://gem.repo4/
+          specs:
+            foo (1.0.0-x86_64-linux)
+            foo (1.0.0-arm64-darwin)
+
+        PLATFORMS
+          arm64-darwin
+          ruby
+          x86_64-linux
+
+        DEPENDENCIES
+          foo
+
+        BUNDLED WITH
+           #{Bundler::VERSION}
+      L
+
+      simulate_platform "x86_64-linux" do
+        bundle "config set cache_all_platforms true"
+        bundle "config set path vendor/bundle"
+        bundle :cache, artifice: "compact_index", env: { "BUNDLER_SPEC_GEM_REPO" => gem_repo4.to_s }
+
+        # simulate removal of all remote gems
+        empty_repo4
+
+        # delete compact index cache
+        FileUtils.rm_r home(".bundle/cache/compact_index")
+
+        bundle "install", artifice: "compact_index", env: { "BUNDLER_SPEC_GEM_REPO" => gem_repo4.to_s }
+
+        expect(the_bundle).to include_gems "foo 1.0.0 x86_64-linux"
+      end
     end
 
     it "does not reinstall already-installed gems" do
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
-        gem "rack"
+        source "https://gem.repo1"
+        gem "myrack"
       G
       bundle :cache
 
-      build_gem "rack", "1.0.0", :path => bundled_app("vendor/cache") do |s|
-        s.write "lib/rack.rb", "raise 'omg'"
+      build_gem "myrack", "1.0.0", path: bundled_app("vendor/cache") do |s|
+        s.write "lib/myrack.rb", "raise 'omg'"
       end
 
       bundle :install
       expect(err).to be_empty
-      expect(the_bundle).to include_gems "rack 1.0"
+      expect(the_bundle).to include_gems "myrack 1.0"
     end
 
     it "ignores cached gems for the wrong platform" do
       simulate_platform "java" do
         install_gemfile <<-G
-          source "#{file_uri_for(gem_repo1)}"
+          source "https://gem.repo1"
           gem "platform_specific"
         G
         bundle :cache
       end
 
-      simulate_new_machine
+      pristine_system_gems :bundler
 
       bundle "config set --local force_ruby_platform true"
 
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
+        source "https://gem.repo1"
         gem "platform_specific"
       G
-      run "require 'platform_specific' ; puts PLATFORM_SPECIFIC"
-      expect(out).to eq("1.0.0 RUBY")
+      expect(the_bundle).to include_gems("platform_specific 1.0 ruby")
+    end
+
+    it "keeps gems that are locked and cached for the current platform, even if incompatible with the current ruby" do
+      build_repo4 do
+        build_gem "bcrypt_pbkdf", "1.1.1"
+        build_gem "bcrypt_pbkdf", "1.1.1" do |s|
+          s.platform = "arm64-darwin"
+          s.required_ruby_version = "< #{current_ruby_minor}"
+        end
+      end
+
+      app_cache = bundled_app("vendor/cache")
+      FileUtils.mkdir_p app_cache
+      FileUtils.cp gem_repo4("gems/bcrypt_pbkdf-1.1.1-arm64-darwin.gem"), app_cache
+      FileUtils.cp gem_repo4("gems/bcrypt_pbkdf-1.1.1.gem"), app_cache
+
+      bundle "config cache_all_platforms true"
+
+      lockfile <<~L
+        GEM
+          remote: https://gem.repo4/
+          specs:
+            bcrypt_pbkdf (1.1.1)
+            bcrypt_pbkdf (1.1.1-arm64-darwin)
+
+        PLATFORMS
+          arm64-darwin
+          ruby
+
+        DEPENDENCIES
+          bcrypt_pbkdf
+
+        BUNDLED WITH
+           #{Bundler::VERSION}
+      L
+
+      simulate_platform "arm64-darwin-23" do
+        install_gemfile <<~G, verbose: true
+          source "https://gem.repo4"
+          gem "bcrypt_pbkdf"
+        G
+
+        expect(out).to include("Updating files in vendor/cache")
+        expect(err).to be_empty
+        expect(app_cache.join("bcrypt_pbkdf-1.1.1-arm64-darwin.gem")).to exist
+        expect(app_cache.join("bcrypt_pbkdf-1.1.1.gem")).to exist
+      end
     end
 
     it "does not update the cache if --no-cache is passed" do
       gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
-        gem "rack"
+        source "https://gem.repo1"
+        gem "myrack"
       G
       bundled_app("vendor/cache").mkpath
       expect(bundled_app("vendor/cache").children).to be_empty
diff --git a/spec/bundler/commands/check_spec.rb b/spec/bundler/commands/check_spec.rb
index 99a858e9e94d5a..fccaf761703c46 100644
--- a/spec/bundler/commands/check_spec.rb
+++ b/spec/bundler/commands/check_spec.rb
@@ -3,7 +3,7 @@
 RSpec.describe "bundle check" do
   it "returns success when the Gemfile is satisfied" do
     install_gemfile <<-G
-      source "#{file_uri_for(gem_repo1)}"
+      source "https://gem.repo1"
       gem "rails"
     G
 
@@ -13,17 +13,17 @@
 
   it "works with the --gemfile flag when not in the directory" do
     install_gemfile <<-G
-      source "#{file_uri_for(gem_repo1)}"
+      source "https://gem.repo1"
       gem "rails"
     G
 
-    bundle "check --gemfile bundled_app/Gemfile", :dir => tmp
+    bundle "check --gemfile bundled_app/Gemfile", dir: tmp
     expect(out).to include("The Gemfile's dependencies are satisfied")
   end
 
   it "creates a Gemfile.lock by default if one does not exist" do
     install_gemfile <<-G
-      source "#{file_uri_for(gem_repo1)}"
+      source "https://gem.repo1"
       gem "rails"
     G
 
@@ -36,7 +36,7 @@
 
   it "does not create a Gemfile.lock if --dry-run was passed" do
     install_gemfile <<-G
-      source "#{file_uri_for(gem_repo1)}"
+      source "https://gem.repo1"
       gem "rails"
     G
 
@@ -47,26 +47,57 @@
     expect(bundled_app_lock).not_to exist
   end
 
-  it "prints a generic error if the missing gems are unresolvable" do
-    system_gems ["rails-2.3.2"]
+  it "prints an error that shows missing gems" do
+    system_gems ["rails-2.3.2"], path: default_bundle_path
 
     gemfile <<-G
-      source "#{file_uri_for(gem_repo1)}"
+      source "https://gem.repo1"
       gem "rails"
     G
 
-    bundle :check, :raise_on_error => false
-    expect(err).to include("Bundler can't satisfy your Gemfile's dependencies.")
+    bundle :check, raise_on_error: false
+    expect(err).to include("The following gems are missing")
+    expect(err).to include(" * rake (#{rake_version})")
+    expect(err).to include(" * actionpack (2.3.2)")
+    expect(err).to include(" * activerecord (2.3.2)")
+    expect(err).to include(" * actionmailer (2.3.2)")
+    expect(err).to include(" * activeresource (2.3.2)")
+    expect(err).to include(" * activesupport (2.3.2)")
+    expect(err).to include("Install missing gems with `bundle install`")
   end
 
-  it "prints a generic error if a Gemfile.lock does not exist and a toplevel dependency does not exist" do
+  it "prints an error that shows missing gems if a Gemfile.lock does not exist and a toplevel dependency is missing" do
     gemfile <<-G
-      source "#{file_uri_for(gem_repo1)}"
+      source "https://gem.repo1"
       gem "rails"
     G
 
-    bundle :check, :raise_on_error => false
+    bundle :check, raise_on_error: false
     expect(exitstatus).to be > 0
+    expect(err).to include("The following gems are missing")
+    expect(err).to include(" * rails (2.3.2)")
+    expect(err).to include(" * rake (#{rake_version})")
+    expect(err).to include(" * actionpack (2.3.2)")
+    expect(err).to include(" * activerecord (2.3.2)")
+    expect(err).to include(" * actionmailer (2.3.2)")
+    expect(err).to include(" * activeresource (2.3.2)")
+    expect(err).to include(" * activesupport (2.3.2)")
+    expect(err).to include("Install missing gems with `bundle install`")
+  end
+
+  it "prints a generic error if gem git source is not checked out" do
+    build_git "foo", path: lib_path("foo")
+
+    bundle "config path vendor/bundle"
+
+    install_gemfile <<-G
+      source "https://gem.repo1"
+      gem "foo", git: "#{lib_path("foo")}"
+    G
+
+    FileUtils.rm_r bundled_app("vendor/bundle")
+    bundle :check, raise_on_error: false
+    expect(exitstatus).to eq 1
     expect(err).to include("Bundler can't satisfy your Gemfile's dependencies.")
   end
 
@@ -78,25 +109,25 @@
     end
 
     install_gemfile <<-G
-      source "#{file_uri_for(gem_repo2)}"
+      source "https://gem.repo2"
       gem 'rails'
     G
 
     gemfile <<-G
-      source "#{file_uri_for(gem_repo2)}"
+      source "https://gem.repo2"
       gem "rails"
       gem "rails_pinned_to_old_activesupport"
     G
 
-    bundle :check, :raise_on_error => false
+    bundle :check, raise_on_error: false
     expect(err).to include("Bundler can't satisfy your Gemfile's dependencies.")
   end
 
-  it "remembers --without option from install", :bundler => "< 3" do
+  it "remembers --without option from install" do
     gemfile <<-G
-      source "#{file_uri_for(gem_repo1)}"
+      source "https://gem.repo1"
       group :foo do
-        gem "rack"
+        gem "myrack"
       end
     G
 
@@ -108,9 +139,9 @@
   it "uses the without setting" do
     bundle "config set without foo"
     install_gemfile <<-G
-      source "#{file_uri_for(gem_repo1)}"
+      source "https://gem.repo1"
       group :foo do
-        gem "rack"
+        gem "myrack"
       end
     G
 
@@ -120,63 +151,63 @@
 
   it "ensures that gems are actually installed and not just cached" do
     gemfile <<-G
-      source "#{file_uri_for(gem_repo1)}"
-      gem "rack", :group => :foo
+      source "https://gem.repo1"
+      gem "myrack", :group => :foo
     G
 
     bundle "config set --local without foo"
     bundle :install
 
     gemfile <<-G
-      source "#{file_uri_for(gem_repo1)}"
-      gem "rack"
+      source "https://gem.repo1"
+      gem "myrack"
     G
 
-    bundle "check", :raise_on_error => false
-    expect(err).to include("* rack (1.0.0)")
+    bundle "check", raise_on_error: false
+    expect(err).to include("* myrack (1.0.0)")
     expect(exitstatus).to eq(1)
   end
 
   it "ensures that gems are actually installed and not just cached in applications' cache" do
     gemfile <<-G
-      source "#{file_uri_for(gem_repo1)}"
-      gem "rack"
+      source "https://gem.repo1"
+      gem "myrack"
     G
 
     bundle "config set --local path vendor/bundle"
     bundle :cache
 
-    gem_command "uninstall rack", :env => { "GEM_HOME" => vendored_gems.to_s }
+    gem_command "uninstall myrack", env: { "GEM_HOME" => vendored_gems.to_s }
 
-    bundle "check", :raise_on_error => false
-    expect(err).to include("* rack (1.0.0)")
+    bundle "check", raise_on_error: false
+    expect(err).to include("* myrack (1.0.0)")
     expect(exitstatus).to eq(1)
   end
 
   it "ignores missing gems restricted to other platforms" do
     gemfile <<-G
-      source "#{file_uri_for(gem_repo1)}"
-      gem "rack"
+      source "https://gem.repo1"
+      gem "myrack"
       platforms :#{not_local_tag} do
         gem "activesupport"
       end
     G
 
-    system_gems "rack-1.0.0", :path => default_bundle_path
+    system_gems "myrack-1.0.0", path: default_bundle_path
 
     lockfile <<-G
       GEM
-        remote: #{file_uri_for(gem_repo1)}/
+        remote: https://gem.repo1/
         specs:
           activesupport (2.3.5)
-          rack (1.0.0)
+          myrack (1.0.0)
 
       PLATFORMS
         #{generic_local_platform}
         #{not_local}
 
       DEPENDENCIES
-        rack
+        myrack
         activesupport
     G
 
@@ -186,28 +217,28 @@
 
   it "works with env conditionals" do
     gemfile <<-G
-      source "#{file_uri_for(gem_repo1)}"
-      gem "rack"
+      source "https://gem.repo1"
+      gem "myrack"
       env :NOT_GOING_TO_BE_SET do
         gem "activesupport"
       end
     G
 
-    system_gems "rack-1.0.0", :path => default_bundle_path
+    system_gems "myrack-1.0.0", path: default_bundle_path
 
     lockfile <<-G
       GEM
-        remote: #{file_uri_for(gem_repo1)}/
+        remote: https://gem.repo1/
         specs:
           activesupport (2.3.5)
-          rack (1.0.0)
+          myrack (1.0.0)
 
       PLATFORMS
         #{generic_local_platform}
         #{not_local}
 
       DEPENDENCIES
-        rack
+        myrack
         activesupport
     G
 
@@ -216,20 +247,20 @@
   end
 
   it "outputs an error when the default Gemfile is not found" do
-    bundle :check, :raise_on_error => false
+    bundle :check, raise_on_error: false
     expect(exitstatus).to eq(10)
     expect(err).to include("Could not locate Gemfile")
   end
 
   it "does not output fatal error message" do
-    bundle :check, :raise_on_error => false
+    bundle :check, raise_on_error: false
     expect(exitstatus).to eq(10)
     expect(err).not_to include("Unfortunately, a fatal error has occurred. ")
   end
 
-  it "fails when there's no lock file and frozen is set" do
+  it "fails when there's no lockfile and frozen is set" do
     install_gemfile <<-G
-      source "#{file_uri_for(gem_repo1)}"
+      source "https://gem.repo1"
       gem "foo"
     G
 
@@ -237,20 +268,20 @@
     bundle "install"
     FileUtils.rm(bundled_app_lock)
 
-    bundle :check, :raise_on_error => false
+    bundle :check, raise_on_error: false
     expect(last_command).to be_failure
   end
 
-  context "--path", :bundler => "< 3" do
+  context "--path" do
     context "after installing gems in the proper directory" do
       before do
         gemfile <<-G
-          source "#{file_uri_for(gem_repo1)}"
+          source "https://gem.repo1"
           gem "rails"
         G
         bundle "install --path vendor/bundle"
 
-        FileUtils.rm_rf(bundled_app(".bundle"))
+        FileUtils.rm_r(bundled_app(".bundle"))
       end
 
       it "returns success" do
@@ -267,11 +298,11 @@
     context "after installing gems on a different directory" do
       before do
         install_gemfile <<-G
-          source "#{file_uri_for(gem_repo1)}"
+          source "https://gem.repo1"
           gem "rails"
         G
 
-        bundle "check --path vendor/bundle", :raise_on_error => false
+        bundle "check --path vendor/bundle", raise_on_error: false
       end
 
       it "returns false" do
@@ -283,10 +314,10 @@
 
   describe "when locked" do
     before :each do
-      system_gems "rack-1.0.0"
+      system_gems "myrack-1.0.0"
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
-        gem "rack", "1.0"
+        source "https://gem.repo1"
+        gem "myrack", "1.0"
       G
     end
 
@@ -297,64 +328,65 @@
     end
 
     it "shows what is missing with the current Gemfile if it is not satisfied" do
-      simulate_new_machine
-      bundle :check, :raise_on_error => false
+      FileUtils.rm_r default_bundle_path
+      system_gems :bundler
+      bundle :check, raise_on_error: false
       expect(err).to match(/The following gems are missing/)
-      expect(err).to include("* rack (1.0")
+      expect(err).to include("* myrack (1.0")
     end
   end
 
   describe "when locked with multiple dependents with different requirements" do
     before :each do
       build_repo4 do
-        build_gem "depends_on_rack" do |s|
-          s.add_dependency "rack", ">= 1.0"
+        build_gem "depends_on_myrack" do |s|
+          s.add_dependency "myrack", ">= 1.0"
         end
-        build_gem "also_depends_on_rack" do |s|
-          s.add_dependency "rack", "~> 1.0"
+        build_gem "also_depends_on_myrack" do |s|
+          s.add_dependency "myrack", "~> 1.0"
         end
-        build_gem "rack"
+        build_gem "myrack"
       end
 
       gemfile <<-G
-        source "#{file_uri_for(gem_repo4)}"
-        gem "depends_on_rack"
-        gem "also_depends_on_rack"
+        source "https://gem.repo4"
+        gem "depends_on_myrack"
+        gem "also_depends_on_myrack"
       G
 
       bundle "lock"
     end
 
     it "shows what is missing with the current Gemfile without duplications" do
-      bundle :check, :raise_on_error => false
+      bundle :check, raise_on_error: false
       expect(err).to match(/The following gems are missing/)
-      expect(err).to include("* rack (1.0").once
+      expect(err).to include("* myrack (1.0").once
     end
   end
 
   describe "when locked under multiple platforms" do
     before :each do
       build_repo4 do
-        build_gem "rack"
+        build_gem "myrack"
       end
 
       gemfile <<-G
-        source "#{file_uri_for(gem_repo4)}"
-        gem "rack"
+        source "https://gem.repo4"
+        gem "myrack"
       G
 
       lockfile <<-L
         GEM
-          remote: #{file_uri_for(gem_repo4)}/
+          remote: https://gem.repo4/
           specs:
-            rack (1.0)
+            myrack (1.0)
 
         PLATFORMS
           ruby
           #{local_platform}
 
         DEPENDENCIES
-          rack
+          myrack
 
         BUNDLED WITH
            #{Bundler::VERSION}
@@ -362,25 +394,25 @@
     end
 
     it "shows what is missing with the current Gemfile without duplications" do
-      bundle :check, :raise_on_error => false
+      bundle :check, raise_on_error: false
       expect(err).to match(/The following gems are missing/)
-      expect(err).to include("* rack (1.0").once
+      expect(err).to include("* myrack (1.0").once
     end
   end
 
   describe "when using only scoped rubygems sources" do
     before do
       gemfile <<~G
-        source "#{file_uri_for(gem_repo2)}"
-        source "#{file_uri_for(gem_repo1)}" do
-          gem "rack"
+        source "https://gem.repo2"
+        source "https://gem.repo1" do
+          gem "myrack"
         end
       G
     end
 
     it "returns success when the Gemfile is satisfied" do
-      system_gems "rack-1.0.0", :path => default_bundle_path
-      bundle :check
+      system_gems "myrack-1.0.0", path: default_bundle_path
+      bundle :check, artifice: "compact_index"
       expect(out).to include("The Gemfile's dependencies are satisfied")
     end
   end
@@ -388,43 +420,49 @@
   describe "when using only scoped rubygems sources with indirect dependencies" do
     before do
       build_repo4 do
-        build_gem "depends_on_rack" do |s|
-          s.add_dependency "rack"
+        build_gem "depends_on_myrack" do |s|
+          s.add_dependency "myrack"
         end
 
-        build_gem "rack"
+        build_gem "myrack"
       end
 
       gemfile <<~G
-        source "#{file_uri_for(gem_repo1)}"
-        source "#{file_uri_for(gem_repo4)}" do
-          gem "depends_on_rack"
+        source "https://gem.repo1"
+        source "https://gem.repo4" do
+          gem "depends_on_myrack"
         end
       G
     end
 
     it "returns success when the Gemfile is satisfied and generates a correct lockfile" do
-      system_gems "depends_on_rack-1.0", "rack-1.0", :gem_repo => gem_repo4, :path => default_bundle_path
-      bundle :check
+      system_gems "depends_on_myrack-1.0", "myrack-1.0", gem_repo: gem_repo4, path: default_bundle_path
+      bundle :check, artifice: "compact_index"
+
+      checksums = checksums_section_when_enabled do |c|
+        c.checksum gem_repo4, "depends_on_myrack", "1.0"
+        c.checksum gem_repo4, "myrack", "1.0"
+      end
+
       expect(out).to include("The Gemfile's dependencies are satisfied")
       expect(lockfile).to eq <<~L
         GEM
-          remote: #{file_uri_for(gem_repo1)}/
+          remote: https://gem.repo1/
           specs:
 
         GEM
-          remote: #{file_uri_for(gem_repo4)}/
+          remote: https://gem.repo4/
           specs:
-            depends_on_rack (1.0)
-              rack
-            rack (1.0)
+            depends_on_myrack (1.0)
+              myrack
+            myrack (1.0)
 
         PLATFORMS
           #{lockfile_platforms}
 
         DEPENDENCIES
-          depends_on_rack!
-
+          depends_on_myrack!
+        #{checksums}
         BUNDLED WITH
            #{Bundler::VERSION}
       L
@@ -441,7 +479,7 @@
         build_gem "dex-dispatch-engine"
       end
 
-      build_lib("bundle-check-issue", :path => tmp.join("bundle-check-issue")) do |s|
+      build_lib("bundle-check-issue", path: tmp("bundle-check-issue")) do |s|
         s.write "Gemfile", <<-G
           source "https://localgemserver.test"
 
@@ -455,16 +493,24 @@
         s.add_dependency "awesome_print"
       end
 
-      bundle "install", :artifice => "compact_index_extra", :env => { "BUNDLER_SPEC_GEM_REPO" => gem_repo4.to_s }, :dir => tmp.join("bundle-check-issue")
+      bundle "install", artifice: "compact_index_extra", env: { "BUNDLER_SPEC_GEM_REPO" => gem_repo4.to_s }, dir: tmp("bundle-check-issue")
     end
 
     it "does not corrupt lockfile when changing version" do
-      version_file = tmp.join("bundle-check-issue/bundle-check-issue.gemspec")
+      version_file = tmp("bundle-check-issue/bundle-check-issue.gemspec")
       File.write(version_file, File.read(version_file).gsub(/s\.version = .+/, "s.version = '9999'"))
 
-      bundle "check --verbose", :dir => tmp.join("bundle-check-issue")
+      bundle "check --verbose", dir: tmp("bundle-check-issue")
+
+      lockfile = File.read(tmp("bundle-check-issue/Gemfile.lock"))
+
+      checksums = checksums_section_when_enabled(lockfile) do |c|
+        c.checksum gem_repo4, "awesome_print", "1.0"
+        c.no_checksum "bundle-check-issue", "9999"
+        c.checksum gem_repo2, "dex-dispatch-engine", "1.0"
+      end
 
-      expect(File.read(tmp.join("bundle-check-issue/Gemfile.lock"))).to eq <<~L
+      expect(lockfile).to eq <<~L
         PATH
           remote: .
           specs:
@@ -487,26 +533,80 @@
         DEPENDENCIES
           bundle-check-issue!
           dex-dispatch-engine!
-
+        #{checksums}
         BUNDLED WITH
            #{Bundler::VERSION}
       L
     end
   end
 
+  context "with scoped and unscoped sources" do
+    it "does not corrupt lockfile" do
+      build_repo2 do
+        build_gem "foo"
+        build_gem "wadus"
+        build_gem("baz") {|s| s.add_dependency "wadus" }
+      end
+
+      build_repo4 do
+        build_gem "bar"
+      end
+
+      bundle "config set path.system true"
+
+      # Add all gems to ensure all gems are installed so that a bundle check
+      # would be successful
+      install_gemfile(<<-G, artifice: "compact_index_extra")
+        source "https://gem.repo2"
+
+        source "https://gem.repo4" do
+          gem "bar"
+        end
+
+        gem "foo"
+        gem "baz"
+      G
+
+      original_lockfile = lockfile
+
+      # Remove "baz" gem from the Gemfile, and bundle install again to generate
+      # a functional lockfile with no "baz" dependency or "wadus" transitive
+      # dependency
+      install_gemfile(<<-G, artifice: "compact_index_extra")
+        source "https://gem.repo2"
+
+        source "https://gem.repo4" do
+          gem "bar"
+        end
+
+        gem "foo"
+      G
+
+      # Add back "baz" gem back to the Gemfile, but _crucially_ we do not perform a
+      # bundle install
+      gemfile(gemfile + 'gem "baz"')
+
+      bundle :check, verbose: true
+
+      # Bundle check should succeed and restore the lockfile to its original
+      # state
+      expect(lockfile).to eq(original_lockfile)
+    end
+  end
+
   describe "BUNDLED WITH" do
     def lock_with(bundler_version = nil)
       lock = <<~L
         GEM
-          remote: #{file_uri_for(gem_repo1)}/
+          remote: https://gem.repo1/
           specs:
-            rack (1.0.0)
+            myrack (1.0.0)
 
         PLATFORMS
           #{lockfile_platforms}
 
         DEPENDENCIES
-          rack
+          myrack
       L
 
       if bundler_version
@@ -520,8 +620,8 @@ def lock_with(bundler_version = nil)
       bundle "config set --local path vendor/bundle"
 
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
-        gem "rack"
+        source "https://gem.repo1"
+        gem "myrack"
       G
     end
 
diff --git a/spec/bundler/commands/clean_spec.rb b/spec/bundler/commands/clean_spec.rb
index 471cd6c354c26e..99a8f9c1416e5f 100644
--- a/spec/bundler/commands/clean_spec.rb
+++ b/spec/bundler/commands/clean_spec.rb
@@ -19,7 +19,7 @@ def should_not_have_gems(*gems)
 
   it "removes unused gems that are different" do
     gemfile <<-G
-      source "#{file_uri_for(gem_repo1)}"
+      source "https://gem.repo1"
 
       gem "thin"
       gem "foo"
@@ -30,7 +30,7 @@ def should_not_have_gems(*gems)
     bundle "install"
 
     gemfile <<-G
-      source "#{file_uri_for(gem_repo1)}"
+      source "https://gem.repo1"
 
       gem "thin"
     G
@@ -40,17 +40,17 @@ def should_not_have_gems(*gems)
 
     expect(out).to include("Removing foo (1.0)")
 
-    should_have_gems "thin-1.0", "rack-1.0.0"
+    should_have_gems "thin-1.0", "myrack-1.0.0"
     should_not_have_gems "foo-1.0"
 
-    expect(vendored_gems("bin/rackup")).to exist
+    expect(vendored_gems("bin/myrackup")).to exist
   end
 
   it "removes old version of gem if unused" do
     gemfile <<-G
-      source "#{file_uri_for(gem_repo1)}"
+      source "https://gem.repo1"
 
-      gem "rack", "0.9.1"
+      gem "myrack", "0.9.1"
       gem "foo"
     G
 
@@ -59,28 +59,28 @@ def should_not_have_gems(*gems)
     bundle "install"
 
     gemfile <<-G
-      source "#{file_uri_for(gem_repo1)}"
+      source "https://gem.repo1"
 
-      gem "rack", "1.0.0"
+      gem "myrack", "1.0.0"
       gem "foo"
     G
     bundle "install"
 
     bundle :clean
 
-    expect(out).to include("Removing rack (0.9.1)")
+    expect(out).to include("Removing myrack (0.9.1)")
 
-    should_have_gems "foo-1.0", "rack-1.0.0"
-    should_not_have_gems "rack-0.9.1"
+    should_have_gems "foo-1.0", "myrack-1.0.0"
+    should_not_have_gems "myrack-0.9.1"
 
-    expect(vendored_gems("bin/rackup")).to exist
+    expect(vendored_gems("bin/myrackup")).to exist
   end
 
   it "removes new version of gem if unused" do
     gemfile <<-G
-      source "#{file_uri_for(gem_repo1)}"
+      source "https://gem.repo1"
 
-      gem "rack", "1.0.0"
+      gem "myrack", "1.0.0"
       gem "foo"
     G
 
@@ -89,31 +89,31 @@ def should_not_have_gems(*gems)
     bundle "install"
 
     gemfile <<-G
-      source "#{file_uri_for(gem_repo1)}"
+      source "https://gem.repo1"
 
-      gem "rack", "0.9.1"
+      gem "myrack", "0.9.1"
       gem "foo"
     G
-    bundle "update rack"
+    bundle "update myrack"
 
     bundle :clean
 
-    expect(out).to include("Removing rack (1.0.0)")
+    expect(out).to include("Removing myrack (1.0.0)")
 
-    should_have_gems "foo-1.0", "rack-0.9.1"
-    should_not_have_gems "rack-1.0.0"
+    should_have_gems "foo-1.0", "myrack-0.9.1"
+    should_not_have_gems "myrack-1.0.0"
 
-    expect(vendored_gems("bin/rackup")).to exist
+    expect(vendored_gems("bin/myrackup")).to exist
   end
 
   it "removes gems in bundle without groups" do
     gemfile <<-G
-      source "#{file_uri_for(gem_repo1)}"
+      source "https://gem.repo1"
 
       gem "foo"
 
       group :test_group do
-        gem "rack", "1.0.0"
+        gem "myrack", "1.0.0"
       end
     G
 
@@ -123,12 +123,12 @@ def should_not_have_gems(*gems)
     bundle "install"
     bundle :clean
 
-    expect(out).to include("Removing rack (1.0.0)")
+    expect(out).to include("Removing myrack (1.0.0)")
 
     should_have_gems "foo-1.0"
-    should_not_have_gems "rack-1.0.0"
+    should_not_have_gems "myrack-1.0.0"
 
-    expect(vendored_gems("bin/rackup")).to_not exist
+    expect(vendored_gems("bin/myrackup")).to_not exist
   end
 
   it "does not remove cached git dir if it's being used" do
@@ -137,9 +137,9 @@ def should_not_have_gems(*gems)
     git_path = lib_path("foo-1.0")
 
     gemfile <<-G
-      source "#{file_uri_for(gem_repo1)}"
+      source "https://gem.repo1"
 
-      gem "rack", "1.0.0"
+      gem "myrack", "1.0.0"
       git "#{git_path}", :ref => "#{revision}" do
         gem "foo"
       end
@@ -151,19 +151,19 @@ def should_not_have_gems(*gems)
     bundle :clean
 
     digest = Digest(:SHA1).hexdigest(git_path.to_s)
-    cache_path = Bundler::VERSION.start_with?("2.") ? vendored_gems("cache/bundler/git/foo-1.0-#{digest}") : home(".bundle/cache/git/foo-1.0-#{digest}")
+    cache_path = Bundler.feature_flag.global_gem_cache? ? home(".bundle/cache/git/foo-1.0-#{digest}") : vendored_gems("cache/bundler/git/foo-1.0-#{digest}")
     expect(cache_path).to exist
   end
 
   it "removes unused git gems" do
-    build_git "foo", :path => lib_path("foo")
+    build_git "foo", path: lib_path("foo")
     git_path = lib_path("foo")
     revision = revision_for(git_path)
 
     gemfile <<-G
-      source "#{file_uri_for(gem_repo1)}"
+      source "https://gem.repo1"
 
-      gem "rack", "1.0.0"
+      gem "myrack", "1.0.0"
       git "#{git_path}", :ref => "#{revision}" do
         gem "foo"
       end
@@ -173,9 +173,9 @@ def should_not_have_gems(*gems)
     bundle "install"
 
     gemfile <<-G
-      source "#{file_uri_for(gem_repo1)}"
+      source "https://gem.repo1"
 
-      gem "rack", "1.0.0"
+      gem "myrack", "1.0.0"
     G
     bundle "install"
 
@@ -183,25 +183,25 @@ def should_not_have_gems(*gems)
 
     expect(out).to include("Removing foo (#{revision[0..11]})")
 
-    expect(vendored_gems("gems/rack-1.0.0")).to exist
+    expect(vendored_gems("gems/myrack-1.0.0")).to exist
     expect(vendored_gems("bundler/gems/foo-#{revision[0..11]}")).not_to exist
     digest = Digest(:SHA1).hexdigest(git_path.to_s)
     expect(vendored_gems("cache/bundler/git/foo-#{digest}")).not_to exist
 
-    expect(vendored_gems("specifications/rack-1.0.0.gemspec")).to exist
+    expect(vendored_gems("specifications/myrack-1.0.0.gemspec")).to exist
 
-    expect(vendored_gems("bin/rackup")).to exist
+    expect(vendored_gems("bin/myrackup")).to exist
   end
 
   it "keeps used git gems even if installed to a symlinked location" do
-    build_git "foo", :path => lib_path("foo")
+    build_git "foo", path: lib_path("foo")
     git_path = lib_path("foo")
     revision = revision_for(git_path)
 
     gemfile <<-G
-      source "#{file_uri_for(gem_repo1)}"
+      source "https://gem.repo1"
 
-      gem "rack", "1.0.0"
+      gem "myrack", "1.0.0"
       git "#{git_path}", :ref => "#{revision}" do
         gem "foo"
       end
@@ -221,13 +221,13 @@ def should_not_have_gems(*gems)
   end
 
   it "removes old git gems" do
-    build_git "foo-bar", :path => lib_path("foo-bar")
+    build_git "foo-bar", path: lib_path("foo-bar")
     revision = revision_for(lib_path("foo-bar"))
 
     gemfile <<-G
-      source "#{file_uri_for(gem_repo1)}"
+      source "https://gem.repo1"
 
-      gem "rack", "1.0.0"
+      gem "myrack", "1.0.0"
       git "#{lib_path("foo-bar")}" do
         gem "foo-bar"
       end
@@ -236,32 +236,32 @@ def should_not_have_gems(*gems)
     bundle "config set path vendor/bundle"
     bundle "install"
 
-    update_git "foo-bar", :path => lib_path("foo-bar")
+    update_git "foo-bar", path: lib_path("foo-bar")
     revision2 = revision_for(lib_path("foo-bar"))
 
-    bundle "update", :all => true
+    bundle "update", all: true
     bundle :clean
 
     expect(out).to include("Removing foo-bar (#{revision[0..11]})")
 
-    expect(vendored_gems("gems/rack-1.0.0")).to exist
+    expect(vendored_gems("gems/myrack-1.0.0")).to exist
     expect(vendored_gems("bundler/gems/foo-bar-#{revision[0..11]}")).not_to exist
     expect(vendored_gems("bundler/gems/foo-bar-#{revision2[0..11]}")).to exist
 
-    expect(vendored_gems("specifications/rack-1.0.0.gemspec")).to exist
+    expect(vendored_gems("specifications/myrack-1.0.0.gemspec")).to exist
 
-    expect(vendored_gems("bin/rackup")).to exist
+    expect(vendored_gems("bin/myrackup")).to exist
   end
 
   it "does not remove nested gems in a git repo" do
-    build_lib "activesupport", "3.0", :path => lib_path("rails/activesupport")
-    build_git "rails", "3.0", :path => lib_path("rails") do |s|
+    build_lib "activesupport", "3.0", path: lib_path("rails/activesupport")
+    build_git "rails", "3.0", path: lib_path("rails") do |s|
       s.add_dependency "activesupport", "= 3.0"
     end
     revision = revision_for(lib_path("rails"))
 
     gemfile <<-G
-      source "#{file_uri_for(gem_repo1)}"
+      source "https://gem.repo1"
       gem "activesupport", :git => "#{lib_path("rails")}", :ref => '#{revision}'
     G
 
@@ -274,14 +274,14 @@ def should_not_have_gems(*gems)
   end
 
   it "does not remove git sources that are in without groups" do
-    build_git "foo", :path => lib_path("foo")
+    build_git "foo", path: lib_path("foo")
     git_path = lib_path("foo")
     revision = revision_for(git_path)
 
     gemfile <<-G
-      source "#{file_uri_for(gem_repo1)}"
+      source "https://gem.repo1"
 
-      gem "rack", "1.0.0"
+      gem "myrack", "1.0.0"
       group :test do
         git "#{git_path}", :ref => "#{revision}" do
           gem "foo"
@@ -302,9 +302,9 @@ def should_not_have_gems(*gems)
 
   it "does not blow up when using without groups" do
     gemfile <<-G
-      source "#{file_uri_for(gem_repo1)}"
+      source "https://gem.repo1"
 
-      gem "rack"
+      gem "myrack"
 
       group :development do
         gem "foo"
@@ -321,12 +321,12 @@ def should_not_have_gems(*gems)
   it "displays an error when used without --path" do
     bundle "config set path.system true"
     install_gemfile <<-G
-      source "#{file_uri_for(gem_repo1)}"
+      source "https://gem.repo1"
 
-      gem "rack", "1.0.0"
+      gem "myrack", "1.0.0"
     G
 
-    bundle :clean, :raise_on_error => false
+    bundle :clean, raise_on_error: false
 
     expect(exitstatus).to eq(15)
     expect(err).to include("--force")
@@ -335,7 +335,7 @@ def should_not_have_gems(*gems)
   # handling bundle clean upgrade path from the pre's
   it "removes .gem/.gemspec file even if there's no corresponding gem dir" do
     gemfile <<-G
-      source "#{file_uri_for(gem_repo1)}"
+      source "https://gem.repo1"
 
       gem "thin"
       gem "foo"
@@ -345,71 +345,71 @@ def should_not_have_gems(*gems)
     bundle "install"
 
     gemfile <<-G
-      source "#{file_uri_for(gem_repo1)}"
+      source "https://gem.repo1"
 
       gem "foo"
     G
     bundle "install"
 
-    FileUtils.rm(vendored_gems("bin/rackup"))
-    FileUtils.rm_rf(vendored_gems("gems/thin-1.0"))
-    FileUtils.rm_rf(vendored_gems("gems/rack-1.0.0"))
+    FileUtils.rm(vendored_gems("bin/myrackup"))
+    FileUtils.rm_r(vendored_gems("gems/thin-1.0"))
+    FileUtils.rm_r(vendored_gems("gems/myrack-1.0.0"))
 
     bundle :clean
 
-    should_not_have_gems "thin-1.0", "rack-1.0"
+    should_not_have_gems "thin-1.0", "myrack-1.0"
     should_have_gems "foo-1.0"
 
-    expect(vendored_gems("bin/rackup")).not_to exist
+    expect(vendored_gems("bin/myrackup")).not_to exist
   end
 
   it "does not call clean automatically when using system gems" do
     bundle "config set path.system true"
 
     install_gemfile <<-G
-      source "#{file_uri_for(gem_repo1)}"
+      source "https://gem.repo1"
 
       gem "thin"
-      gem "rack"
+      gem "myrack"
     G
 
     install_gemfile <<-G
-      source "#{file_uri_for(gem_repo1)}"
+      source "https://gem.repo1"
 
-      gem "rack"
+      gem "myrack"
     G
 
     gem_command :list
-    expect(out).to include("rack (1.0.0)").and include("thin (1.0)")
+    expect(out).to include("myrack (1.0.0)").and include("thin (1.0)")
   end
 
-  it "--clean should override the bundle setting on install", :bundler => "< 3" do
+  it "--clean should override the bundle setting on install" do
     gemfile <<-G
-      source "#{file_uri_for(gem_repo1)}"
+      source "https://gem.repo1"
 
       gem "thin"
-      gem "rack"
+      gem "myrack"
     G
     bundle "config set path vendor/bundle"
     bundle "config set clean false"
     bundle "install --clean true"
 
     gemfile <<-G
-      source "#{file_uri_for(gem_repo1)}"
+      source "https://gem.repo1"
 
-      gem "rack"
+      gem "myrack"
     G
     bundle "install"
 
-    should_have_gems "rack-1.0.0"
+    should_have_gems "myrack-1.0.0"
     should_not_have_gems "thin-1.0"
   end
 
-  it "--clean should override the bundle setting on update", :bundler => "< 3" do
+  it "--clean should override the bundle setting on update" do
     build_repo2
 
     gemfile <<-G
-      source "#{file_uri_for(gem_repo2)}"
+      source "https://gem.repo2"
 
       gem "foo"
     G
@@ -421,17 +421,17 @@ def should_not_have_gems(*gems)
       build_gem "foo", "1.0.1"
     end
 
-    bundle "update", :all => true
+    bundle "update", all: true
 
     should_have_gems "foo-1.0.1"
     should_not_have_gems "foo-1.0"
   end
 
-  it "automatically cleans when path has not been set", :bundler => "3" do
+  it "automatically cleans when path has not been set", bundler: "4" do
     build_repo2
 
     install_gemfile <<-G
-      source "#{file_uri_for(gem_repo2)}"
+      source "https://gem.repo2"
 
       gem "foo"
     G
@@ -440,7 +440,7 @@ def should_not_have_gems(*gems)
       build_gem "foo", "1.0.1"
     end
 
-    bundle "update", :all => true
+    bundle "update", all: true
 
     files = Pathname.glob(bundled_app(".bundle", Bundler.ruby_scope, "*", "*"))
     files.map! {|f| f.to_s.sub(bundled_app(".bundle", Bundler.ruby_scope).to_s, "") }
@@ -453,29 +453,29 @@ def should_not_have_gems(*gems)
 
   it "does not clean automatically on --path" do
     gemfile <<-G
-      source "#{file_uri_for(gem_repo1)}"
+      source "https://gem.repo1"
 
       gem "thin"
-      gem "rack"
+      gem "myrack"
     G
     bundle "config set path vendor/bundle"
     bundle "install"
 
     gemfile <<-G
-      source "#{file_uri_for(gem_repo1)}"
+      source "https://gem.repo1"
 
-      gem "rack"
+      gem "myrack"
     G
     bundle "install"
 
-    should_have_gems "rack-1.0.0", "thin-1.0"
+    should_have_gems "myrack-1.0.0", "thin-1.0"
   end
 
   it "does not clean on bundle update with --path" do
     build_repo2
 
     gemfile <<-G
-      source "#{file_uri_for(gem_repo2)}"
+      source "https://gem.repo2"
 
       gem "foo"
     G
@@ -486,7 +486,7 @@ def should_not_have_gems(*gems)
       build_gem "foo", "1.0.1"
     end
 
-    bundle :update, :all => true
+    bundle :update, all: true
     should_have_gems "foo-1.0", "foo-1.0.1"
   end
 
@@ -496,7 +496,7 @@ def should_not_have_gems(*gems)
     build_repo2
 
     gemfile <<-G
-      source "#{file_uri_for(gem_repo2)}"
+      source "https://gem.repo2"
 
       gem "foo"
     G
@@ -505,7 +505,7 @@ def should_not_have_gems(*gems)
     update_repo2 do
       build_gem "foo", "1.0.1"
     end
-    bundle :update, :all => true
+    bundle :update, all: true
 
     gem_command :list
     expect(out).to include("foo (1.0.1, 1.0)")
@@ -515,17 +515,17 @@ def should_not_have_gems(*gems)
     bundle "config set path.system true"
 
     gemfile <<-G
-      source "#{file_uri_for(gem_repo1)}"
+      source "https://gem.repo1"
 
       gem "foo"
-      gem "rack"
+      gem "myrack"
     G
     bundle :install
 
     gemfile <<-G
-      source "#{file_uri_for(gem_repo1)}"
+      source "https://gem.repo1"
 
-      gem "rack"
+      gem "myrack"
     G
     bundle :install
     bundle "clean --force"
@@ -533,7 +533,7 @@ def should_not_have_gems(*gems)
     expect(out).to include("Removing foo (1.0)")
     gem_command :list
     expect(out).not_to include("foo (1.0)")
-    expect(out).to include("rack (1.0.0)")
+    expect(out).to include("myrack (1.0.0)")
   end
 
   describe "when missing permissions", :permissions do
@@ -544,30 +544,30 @@ def should_not_have_gems(*gems)
     end
     it "returns a helpful error message" do
       gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
+        source "https://gem.repo1"
 
         gem "foo"
-        gem "rack"
+        gem "myrack"
       G
       bundle :install
 
       gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
+        source "https://gem.repo1"
 
-        gem "rack"
+        gem "myrack"
       G
       bundle :install
 
       FileUtils.chmod(0o500, system_cache_path)
 
-      bundle :clean, :force => true, :raise_on_error => false
+      bundle :clean, force: true, raise_on_error: false
 
       expect(err).to include(system_gem_path.to_s)
       expect(err).to include("grant write permissions")
 
       gem_command :list
       expect(out).to include("foo (1.0)")
-      expect(out).to include("rack (1.0.0)")
+      expect(out).to include("myrack (1.0.0)")
     end
   end
 
@@ -576,7 +576,7 @@ def should_not_have_gems(*gems)
     revision = revision_for(lib_path("foo-1.0"))
 
     gemfile <<-G
-      source "#{file_uri_for(gem_repo1)}"
+      source "https://gem.repo1"
 
       gem "foo", :git => "#{lib_path("foo-1.0")}"
     G
@@ -612,7 +612,7 @@ def should_not_have_gems(*gems)
     end
 
     gemfile <<-G
-      source "#{file_uri_for(gem_repo2)}"
+      source "https://gem.repo2"
 
       gem "bindir"
     G
@@ -625,26 +625,20 @@ def should_not_have_gems(*gems)
     expect(out).to eq("1.0")
   end
 
-  it "when using --force, it doesn't remove default gem binaries", :realworld do
-    skip "does not work on old rubies because the realworld gems that need to be installed don't support them" if RUBY_VERSION < "2.7.0"
-
-    skip "does not work on rubygems versions where `--install_dir` doesn't respect --default" unless Gem::Installer.for_spec(loaded_gemspec, :install_dir => "/foo").default_spec_file == "/foo/specifications/default/bundler-#{Bundler::VERSION}.gemspec" # Since rubygems 3.2.0.rc.2
-
-    default_irb_version = ruby "gem 'irb', '< 999999'; require 'irb'; puts IRB::VERSION", :raise_on_error => false
+  it "when using --force, it doesn't remove default gem binaries" do
+    default_irb_version = ruby "gem 'irb', '< 999999'; require 'irb'; puts IRB::VERSION", raise_on_error: false
     skip "irb isn't a default gem" if default_irb_version.empty?
 
     # simulate executable for default gem
-    build_gem "irb", default_irb_version, :to_system => true, :default => true do |s|
+    build_gem "irb", default_irb_version, to_system: true, default: true do |s|
       s.executables = "irb"
     end
 
-    realworld_system_gems "tsort --version 0.1.0", "pathname --version 0.1.0", "set --version 1.0.1"
-
     install_gemfile <<-G
-      source "#{file_uri_for(gem_repo2)}"
+      source "https://gem.repo2"
     G
 
-    bundle "clean --force", :env => { "BUNDLER_GEM_DEFAULT_DIR" => system_gem_path.to_s }
+    bundle "clean --force", env: { "BUNDLER_GEM_DEFAULT_DIR" => system_gem_path.to_s }
 
     expect(out).not_to include("Removing irb")
   end
@@ -658,7 +652,7 @@ def should_not_have_gems(*gems)
     end
 
     gemfile <<-G
-      source "#{file_uri_for(gem_repo1)}"
+      source "https://gem.repo1"
 
       gem "foo"
       gem "bar", "1.0", :path => "#{relative_path}"
@@ -671,7 +665,7 @@ def should_not_have_gems(*gems)
 
   it "doesn't remove gems in dry-run mode with path set" do
     gemfile <<-G
-      source "#{file_uri_for(gem_repo1)}"
+      source "https://gem.repo1"
 
       gem "thin"
       gem "foo"
@@ -682,7 +676,7 @@ def should_not_have_gems(*gems)
     bundle "install"
 
     gemfile <<-G
-      source "#{file_uri_for(gem_repo1)}"
+      source "https://gem.repo1"
 
       gem "thin"
     G
@@ -694,14 +688,14 @@ def should_not_have_gems(*gems)
     expect(out).not_to include("Removing foo (1.0)")
     expect(out).to include("Would have removed foo (1.0)")
 
-    should_have_gems "thin-1.0", "rack-1.0.0", "foo-1.0"
+    should_have_gems "thin-1.0", "myrack-1.0.0", "foo-1.0"
 
-    expect(vendored_gems("bin/rackup")).to exist
+    expect(vendored_gems("bin/myrackup")).to exist
   end
 
   it "doesn't remove gems in dry-run mode with no path set" do
     gemfile <<-G
-      source "#{file_uri_for(gem_repo1)}"
+      source "https://gem.repo1"
 
       gem "thin"
       gem "foo"
@@ -712,7 +706,7 @@ def should_not_have_gems(*gems)
     bundle "install"
 
     gemfile <<-G
-      source "#{file_uri_for(gem_repo1)}"
+      source "https://gem.repo1"
 
       gem "thin"
     G
@@ -724,14 +718,14 @@ def should_not_have_gems(*gems)
     expect(out).not_to include("Removing foo (1.0)")
     expect(out).to include("Would have removed foo (1.0)")
 
-    should_have_gems "thin-1.0", "rack-1.0.0", "foo-1.0"
+    should_have_gems "thin-1.0", "myrack-1.0.0", "foo-1.0"
 
-    expect(vendored_gems("bin/rackup")).to exist
+    expect(vendored_gems("bin/myrackup")).to exist
   end
 
   it "doesn't store dry run as a config setting" do
     gemfile <<-G
-      source "#{file_uri_for(gem_repo1)}"
+      source "https://gem.repo1"
 
       gem "thin"
       gem "foo"
@@ -743,7 +737,7 @@ def should_not_have_gems(*gems)
     bundle "config set dry_run false"
 
     gemfile <<-G
-      source "#{file_uri_for(gem_repo1)}"
+      source "https://gem.repo1"
 
       gem "thin"
     G
@@ -755,15 +749,15 @@ def should_not_have_gems(*gems)
     expect(out).to include("Removing foo (1.0)")
     expect(out).not_to include("Would have removed foo (1.0)")
 
-    should_have_gems "thin-1.0", "rack-1.0.0"
+    should_have_gems "thin-1.0", "myrack-1.0.0"
     should_not_have_gems "foo-1.0"
 
-    expect(vendored_gems("bin/rackup")).to exist
+    expect(vendored_gems("bin/myrackup")).to exist
   end
 
   it "performs an automatic bundle install" do
     gemfile <<-G
-      source "#{file_uri_for(gem_repo1)}"
+      source "https://gem.repo1"
 
       gem "thin"
       gem "foo"
@@ -774,7 +768,7 @@ def should_not_have_gems(*gems)
     bundle "install"
 
     gemfile <<-G
-      source "#{file_uri_for(gem_repo1)}"
+      source "https://gem.repo1"
 
       gem "thin"
       gem "weakling"
@@ -783,7 +777,7 @@ def should_not_have_gems(*gems)
     bundle "config set auto_install 1"
     bundle :clean
     expect(out).to include("Installing weakling 0.0.3")
-    should_have_gems "thin-1.0", "rack-1.0.0", "weakling-0.0.3"
+    should_have_gems "thin-1.0", "myrack-1.0.0", "weakling-0.0.3"
     should_not_have_gems "foo-1.0"
   end
 
@@ -793,7 +787,7 @@ def should_not_have_gems(*gems)
     revision = revision_for(lib_path("very_simple_git_binary-1.0"))
 
     gemfile <<-G
-      source "#{file_uri_for(gem_repo1)}"
+      source "https://gem.repo1"
 
       gem "very_simple_git_binary", :git => "#{lib_path("very_simple_git_binary-1.0")}", :ref => "#{revision}"
     G
@@ -812,7 +806,7 @@ def should_not_have_gems(*gems)
 
   it "removes extension directories" do
     gemfile <<-G
-      source "#{file_uri_for(gem_repo1)}"
+      source "https://gem.repo1"
 
       gem "thin"
       gem "very_simple_binary"
@@ -832,7 +826,7 @@ def should_not_have_gems(*gems)
     expect(simple_binary_extensions_dir).to exist
 
     gemfile <<-G
-      source "#{file_uri_for(gem_repo1)}"
+      source "https://gem.repo1"
 
       gem "thin"
       gem "simple_binary"
@@ -853,7 +847,7 @@ def should_not_have_gems(*gems)
     short_revision = revision[0..11]
 
     gemfile <<-G
-      source "#{file_uri_for(gem_repo1)}"
+      source "https://gem.repo1"
 
       gem "thin"
       gem "very_simple_git_binary", :git => "#{lib_path("very_simple_git_binary-1.0")}", :ref => "#{revision}"
@@ -868,7 +862,7 @@ def should_not_have_gems(*gems)
     expect(very_simple_binary_extensions_dir).to exist
 
     gemfile <<-G
-      source "#{file_uri_for(gem_repo1)}"
+      source "https://gem.repo1"
       gem "very_simple_git_binary", :git => "#{lib_path("very_simple_git_binary-1.0")}", :ref => "#{revision}"
     G
 
@@ -878,7 +872,7 @@ def should_not_have_gems(*gems)
     expect(very_simple_binary_extensions_dir).to exist
 
     gemfile <<-G
-      source "#{file_uri_for(gem_repo1)}"
+      source "https://gem.repo1"
     G
 
     bundle "install"
@@ -895,7 +889,7 @@ def should_not_have_gems(*gems)
     short_revision = revision[0..11]
 
     gemfile <<-G
-      source "#{file_uri_for(gem_repo1)}"
+      source "https://gem.repo1"
 
       group :development do
         gem "very_simple_git_binary", :git => "#{lib_path("very_simple_git_binary-1.0")}", :ref => "#{revision}"
@@ -905,7 +899,7 @@ def should_not_have_gems(*gems)
     bundle :lock
     bundle "config set without development"
     bundle "config set path vendor/bundle"
-    bundle "install"
+    bundle "install", verbose: true
     bundle :clean
 
     very_simple_binary_extensions_dir =
diff --git a/spec/bundler/commands/config_spec.rb b/spec/bundler/commands/config_spec.rb
index ede93f99eb826c..1392b1731574a3 100644
--- a/spec/bundler/commands/config_spec.rb
+++ b/spec/bundler/commands/config_spec.rb
@@ -28,7 +28,7 @@
 
       context "with env overwrite" do
         it "prints config with env" do
-          bundle "config list --parseable", :env => { "BUNDLE_FOO" => "bar3" }
+          bundle "config list --parseable", env: { "BUNDLE_FOO" => "bar3" }
           expect(out).to include("foo=bar3")
         end
       end
@@ -38,8 +38,8 @@
   describe "location with a gemfile" do
     before :each do
       gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
-        gem "rack", "1.0.0"
+        source "https://gem.repo1"
+        gem "myrack", "1.0.0"
       G
     end
 
@@ -56,7 +56,7 @@
 
       expect(bundled_app(".bundle")).not_to exist
       expect(tmp("foo/bar/config")).to exist
-      expect(the_bundle).to include_gems "rack 1.0.0"
+      expect(the_bundle).to include_gems "myrack 1.0.0"
     end
 
     it "can provide a relative path with the environment variable" do
@@ -64,11 +64,11 @@
 
       ENV["BUNDLE_APP_CONFIG"] = "../foo"
       bundle "config set --local path vendor/bundle"
-      bundle "install", :dir => bundled_app("omg")
+      bundle "install", dir: bundled_app("omg")
 
       expect(bundled_app(".bundle")).not_to exist
       expect(bundled_app("../foo/config")).to exist
-      expect(the_bundle).to include_gems "rack 1.0.0", :dir => bundled_app("omg")
+      expect(the_bundle).to include_gems "myrack 1.0.0", dir: bundled_app("omg")
     end
   end
 
@@ -79,6 +79,14 @@
       expect(home(".bundle/config")).to exist
     end
 
+    it "does not list global settings as local" do
+      bundle "config set --global foo bar"
+      bundle "config list", dir: home
+
+      expect(out).to include("for the current user")
+      expect(out).not_to include("for your local app")
+    end
+
     it "works with an absolute path" do
       ENV["BUNDLE_APP_CONFIG"] = tmp("foo/bar").to_s
       bundle "config set --local path vendor/bundle"
@@ -96,8 +104,8 @@
     end
 
     it "can be configured through BUNDLE_USER_CONFIG" do
-      bundle "config set path vendor", :env => { "BUNDLE_USER_CONFIG" => bundle_user_config }
-      bundle "config get path", :env => { "BUNDLE_USER_CONFIG" => bundle_user_config }
+      bundle "config set path vendor", env: { "BUNDLE_USER_CONFIG" => bundle_user_config }
+      bundle "config get path", env: { "BUNDLE_USER_CONFIG" => bundle_user_config }
       expect(out).to include("Set for the current user (#{bundle_user_config}): \"vendor\"")
     end
 
@@ -105,8 +113,8 @@
       let(:bundle_user_home) { bundled_app(".bundle").to_s }
 
       it "uses the right location" do
-        bundle "config set path vendor", :env => { "BUNDLE_USER_HOME" => bundle_user_home }
-        bundle "config get path", :env => { "BUNDLE_USER_HOME" => bundle_user_home }
+        bundle "config set path vendor", env: { "BUNDLE_USER_HOME" => bundle_user_home }
+        bundle "config get path", env: { "BUNDLE_USER_HOME" => bundle_user_home }
         expect(out).to include("Set for the current user (#{bundle_user_home}/config): \"vendor\"")
       end
     end
@@ -115,8 +123,8 @@
   describe "global" do
     before(:each) do
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
-        gem "rack", "1.0.0"
+        source "https://gem.repo1"
+        gem "myrack", "1.0.0"
       G
     end
 
@@ -207,8 +215,8 @@
   describe "local" do
     before(:each) do
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
-        gem "rack", "1.0.0"
+        source "https://gem.repo1"
+        gem "myrack", "1.0.0"
       G
     end
 
@@ -263,8 +271,8 @@
   describe "env" do
     before(:each) do
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
-        gem "rack", "1.0.0"
+        source "https://gem.repo1"
+        gem "myrack", "1.0.0"
       G
     end
 
@@ -336,8 +344,8 @@
   describe "gem mirrors" do
     before(:each) do
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
-        gem "rack", "1.0.0"
+        source "https://gem.repo1"
+        gem "myrack", "1.0.0"
       G
     end
 
@@ -350,10 +358,16 @@
 E
       expect(out).to eq("http://gems.example.org/ => http://gem-mirror.example.org/")
     end
+
+    it "allows configuring fallback timeout for each mirror, and does not duplicate configs", rubygems: ">= 3.5.12" do
+      bundle "config set --global mirror.https://rubygems.org.fallback_timeout 1"
+      bundle "config set --global mirror.https://rubygems.org.fallback_timeout 2"
+      expect(File.read(home(".bundle/config"))).to include("BUNDLE_MIRROR").once
+    end
   end
 
   describe "quoting" do
-    before(:each) { gemfile "source \"#{file_uri_for(gem_repo1)}\"" }
+    before(:each) { gemfile "source 'https://gem.repo1'" }
     let(:long_string) do
       "--with-xml2-include=/usr/pkg/include/libxml2 --with-xml2-lib=/usr/pkg/lib " \
       "--with-xslt-dir=/usr/pkg"
@@ -403,8 +417,8 @@
   describe "very long lines" do
     before(:each) do
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
-        gem "rack", "1.0.0"
+        source "https://gem.repo1"
+        gem "myrack", "1.0.0"
       G
     end
 
@@ -439,11 +453,11 @@
     it "does not make bundler crash and ignores the configuration" do
       bundle "config list --parseable"
 
-      expect(out).to eq("#mirror.https://rails-assets.org/=http://localhost:9292")
+      expect(out).to be_empty
       expect(err).to be_empty
 
       ruby(<<~RUBY)
-        require "#{entrypoint}"
+        require "bundler"
         print Bundler.settings.mirror_for("https://rails-assets.org")
       RUBY
       expect(out).to eq("https://rails-assets.org/")
@@ -451,7 +465,7 @@
 
       bundle "config set mirror.all http://localhost:9293"
       ruby(<<~RUBY)
-        require "#{entrypoint}"
+        require "bundler"
         print Bundler.settings.mirror_for("https://rails-assets.org")
       RUBY
       expect(out).to eq("http://localhost:9293/")
@@ -461,26 +475,26 @@
 
   describe "subcommands" do
     it "list" do
-      bundle "config list", :env => { "BUNDLE_FOO" => "bar" }
+      bundle "config list", env: { "BUNDLE_FOO" => "bar" }
       expect(out).to eq "Settings are listed in order of priority. The top value will be used.\nfoo\nSet via BUNDLE_FOO: \"bar\""
 
-      bundle "config list", :env => { "BUNDLE_FOO" => "bar" }, :parseable => true
+      bundle "config list", env: { "BUNDLE_FOO" => "bar" }, parseable: true
       expect(out).to eq "foo=bar"
     end
 
     it "list with credentials" do
-      bundle "config list", :env => { "BUNDLE_GEMS__MYSERVER__COM" => "user:password" }
+      bundle "config list", env: { "BUNDLE_GEMS__MYSERVER__COM" => "user:password" }
       expect(out).to eq "Settings are listed in order of priority. The top value will be used.\ngems.myserver.com\nSet via BUNDLE_GEMS__MYSERVER__COM: \"user:[REDACTED]\""
 
-      bundle "config list", :parseable => true, :env => { "BUNDLE_GEMS__MYSERVER__COM" => "user:password" }
+      bundle "config list", parseable: true, env: { "BUNDLE_GEMS__MYSERVER__COM" => "user:password" }
       expect(out).to eq "gems.myserver.com=user:password"
     end
 
     it "list with API token credentials" do
-      bundle "config list", :env => { "BUNDLE_GEMS__MYSERVER__COM" => "api_token:x-oauth-basic" }
+      bundle "config list", env: { "BUNDLE_GEMS__MYSERVER__COM" => "api_token:x-oauth-basic" }
       expect(out).to eq "Settings are listed in order of priority. The top value will be used.\ngems.myserver.com\nSet via BUNDLE_GEMS__MYSERVER__COM: \"[REDACTED]:x-oauth-basic\""
 
-      bundle "config list", :parseable => true, :env => { "BUNDLE_GEMS__MYSERVER__COM" => "api_token:x-oauth-basic" }
+      bundle "config list", parseable: true, env: { "BUNDLE_GEMS__MYSERVER__COM" => "api_token:x-oauth-basic" }
       expect(out).to eq "gems.myserver.com=api_token:x-oauth-basic"
     end
 
@@ -515,7 +529,7 @@
       bundle "config set --local foo 4.1"
       expect(out).to eq "You are replacing the current local value of foo, which is currently \"4\""
 
-      bundle "config set --global --local foo 5", :raise_on_error => false
+      bundle "config set --global --local foo 5", raise_on_error: false
       expect(last_command).to be_failure
       expect(err).to eq "The options global and local were specified. Please only use one of the switches at a time."
     end
@@ -555,7 +569,7 @@
       expect(out).to eq ""
       expect(bundle("config get foo")).to eq "Settings for `foo` in order of priority. The top value will be used\nYou have not configured a value for `foo`"
 
-      bundle "config unset foo --local --global", :raise_on_error => false
+      bundle "config unset foo --local --global", raise_on_error: false
       expect(last_command).to be_failure
       expect(err).to eq "The options global and local were specified. Please only use one of the switches at a time."
     end
@@ -566,8 +580,8 @@
   context "when only the non-default Gemfile exists" do
     it "persists the gemfile location to .bundle/config" do
       gemfile bundled_app("NotGemfile"), <<-G
-        source "#{file_uri_for(gem_repo1)}"
-        gem 'rack'
+        source "https://gem.repo1"
+        gem 'myrack'
       G
 
       bundle "config set --local gemfile #{bundled_app("NotGemfile")}"
diff --git a/spec/bundler/commands/console_spec.rb b/spec/bundler/commands/console_spec.rb
index aa76096e3d5eee..ec44fe59f3a3f2 100644
--- a/spec/bundler/commands/console_spec.rb
+++ b/spec/bundler/commands/console_spec.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-RSpec.describe "bundle console", :bundler => "< 3", :readline => true do
+RSpec.describe "bundle console", readline: true do
   before :each do
     build_repo2 do
       # A minimal fake pry console
@@ -35,107 +35,180 @@ def __pry__
           end
         RUBY
       end
-    end
 
-    install_gemfile <<-G
-      source "#{file_uri_for(gem_repo2)}"
-      gem "rack"
-      gem "activesupport", :group => :test
-      gem "rack_middleware", :group => :development
-    G
+      build_dummy_irb
+    end
   end
 
-  it "starts IRB with the default group loaded" do
-    bundle "console" do |input, _, _|
-      input.puts("puts RACK")
-      input.puts("exit")
+  context "when the library requires a non-existent file" do
+    before do
+      build_lib "loadfuuu", "1.0.0" do |s|
+        s.write "lib/loadfuuu.rb", "require_relative 'loadfuuu/bar'"
+        s.write "lib/loadfuuu/bar.rb", "require 'not-in-bundle'"
+      end
+
+      install_gemfile <<-G
+        source "https://gem.repo2"
+        gem "irb"
+        path "#{lib_path}" do
+          gem "loadfuuu", require: true
+        end
+      G
     end
-    expect(out).to include("0.9.1")
-  end
 
-  it "uses IRB as default console" do
-    bundle "console" do |input, _, _|
-      input.puts("__FILE__")
-      input.puts("exit")
+    it "does not show the bug report template" do
+      bundle("console", raise_on_error: false) do |input, _, _|
+        input.puts("exit")
+      end
+
+      expect(err).not_to include("ERROR REPORT TEMPLATE")
     end
-    expect(out).to include("(irb)")
   end
 
-  it "starts another REPL if configured as such" do
-    install_gemfile <<-G
-      source "#{file_uri_for(gem_repo2)}"
-      gem "pry"
-    G
-    bundle "config set console pry"
+  context "when the library references a non-existent constant" do
+    before do
+      build_lib "loadfuuu", "1.0.0" do |s|
+        s.write "lib/loadfuuu.rb", "Some::NonExistent::Constant"
+      end
 
-    bundle "console" do |input, _, _|
-      input.puts("__method__")
-      input.puts("exit")
+      install_gemfile <<-G
+        source "https://gem.repo2"
+        gem "irb"
+        path "#{lib_path}" do
+          gem "loadfuuu", require: true
+        end
+      G
     end
-    expect(out).to include(":__pry__")
-  end
 
-  it "falls back to IRB if the other REPL isn't available" do
-    bundle "config set console pry"
-    # make sure pry isn't there
+    it "does not show the bug report template" do
+      bundle("console", raise_on_error: false) do |input, _, _|
+        input.puts("exit")
+      end
 
-    bundle "console" do |input, _, _|
-      input.puts("__FILE__")
-      input.puts("exit")
+      expect(err).not_to include("ERROR REPORT TEMPLATE")
     end
-    expect(out).to include("(irb)")
   end
 
-  it "doesn't load any other groups" do
-    bundle "console" do |input, _, _|
-      input.puts("puts ACTIVESUPPORT")
-      input.puts("exit")
+  context "when the library does not have any errors" do
+    before do
+      install_gemfile <<-G
+        source "https://gem.repo2"
+        gem "irb"
+        gem "myrack"
+        gem "activesupport", :group => :test
+        gem "myrack_middleware", :group => :development
+      G
     end
-    expect(out).to include("NameError")
-  end
 
-  describe "when given a group" do
-    it "loads the given group" do
-      bundle "console test" do |input, _, _|
-        input.puts("puts ACTIVESUPPORT")
+    it "starts IRB with the default group loaded" do
+      bundle "console" do |input, _, _|
+        input.puts("puts MYRACK")
         input.puts("exit")
       end
-      expect(out).to include("2.3.5")
+      expect(out).to include("0.9.1")
     end
 
-    it "loads the default group" do
-      bundle "console test" do |input, _, _|
-        input.puts("puts RACK")
+    it "uses IRB as default console" do
+      skip "Does not work in a ruby-core context if irb is in the default $LOAD_PATH because it enables the real IRB, not our dummy one" if ruby_core? && Gem.ruby_version < Gem::Version.new("3.5.0.a")
+
+      bundle "console" do |input, _, _|
+        input.puts("__method__")
         input.puts("exit")
       end
-      expect(out).to include("0.9.1")
+      expect(out).to include("__irb__")
+    end
+
+    it "starts another REPL if configured as such" do
+      install_gemfile <<-G
+        source "https://gem.repo2"
+        gem "irb"
+        gem "pry"
+      G
+      bundle "config set console pry"
+
+      bundle "console" do |input, _, _|
+        input.puts("__method__")
+        input.puts("exit")
+      end
+      expect(out).to include(":__pry__")
+    end
+
+    it "falls back to IRB if the other REPL isn't available" do
+      skip "Does not work in a ruby-core context if irb is in the default $LOAD_PATH because it enables the real IRB, not our dummy one" if ruby_core? && Gem.ruby_version < Gem::Version.new("3.5.0.a")
+
+      bundle "config set console pry"
+      # make sure pry isn't there
+
+      bundle "console" do |input, _, _|
+        input.puts("__method__")
+        input.puts("exit")
+      end
+      expect(out).to include("__irb__")
+    end
+
+    it "does not try IRB twice if no console is configured and IRB is not available" do
+      create_file("irb.rb", "raise LoadError, 'irb is not available'")
+
+      bundle("console", env: { "RUBYOPT" => "-I#{bundled_app} #{ENV["RUBYOPT"]}" }, raise_on_error: false) do |input, _, _|
+        input.puts("puts ACTIVESUPPORT")
+        input.puts("exit")
+      end
+      expect(err).not_to include("falling back to irb")
+      expect(err).to include("irb is not available")
     end
 
-    it "doesn't load other groups" do
-      bundle "console test" do |input, _, _|
-        input.puts("puts RACK_MIDDLEWARE")
+    it "doesn't load any other groups" do
+      bundle "console" do |input, _, _|
+        input.puts("puts ACTIVESUPPORT")
         input.puts("exit")
       end
       expect(out).to include("NameError")
     end
-  end
 
-  it "performs an automatic bundle install" do
-    gemfile <<-G
-      source "#{file_uri_for(gem_repo2)}"
-      gem "rack"
-      gem "activesupport", :group => :test
-      gem "rack_middleware", :group => :development
-      gem "foo"
-    G
-
-    bundle "config set auto_install 1"
-    bundle :console do |input, _, _|
-      input.puts("puts 'hello'")
-      input.puts("exit")
+    describe "when given a group" do
+      it "loads the given group" do
+        bundle "console test" do |input, _, _|
+          input.puts("puts ACTIVESUPPORT")
+          input.puts("exit")
+        end
+        expect(out).to include("2.3.5")
+      end
+
+      it "loads the default group" do
+        bundle "console test" do |input, _, _|
+          input.puts("puts MYRACK")
+          input.puts("exit")
+        end
+        expect(out).to include("0.9.1")
+      end
+
+      it "doesn't load other groups" do
+        bundle "console test" do |input, _, _|
+          input.puts("puts MYRACK_MIDDLEWARE")
+          input.puts("exit")
+        end
+        expect(out).to include("NameError")
+      end
+    end
+
+    it "performs an automatic bundle install" do
+      gemfile <<-G
+        source "https://gem.repo2"
+        gem "irb"
+        gem "myrack"
+        gem "activesupport", :group => :test
+        gem "myrack_middleware", :group => :development
+        gem "foo"
+      G
+
+      bundle "config set auto_install 1"
+      bundle :console do |input, _, _|
+        input.puts("puts 'hello'")
+        input.puts("exit")
+      end
+      expect(out).to include("Installing foo 1.0")
+      expect(out).to include("hello")
+      expect(the_bundle).to include_gems "foo 1.0"
     end
-    expect(out).to include("Installing foo 1.0")
-    expect(out).to include("hello")
-    expect(the_bundle).to include_gems "foo 1.0"
   end
 end
diff --git a/spec/bundler/commands/doctor_spec.rb b/spec/bundler/commands/doctor_spec.rb
index 13aaf2670c73d9..5ceaf37f29c0d2 100644
--- a/spec/bundler/commands/doctor_spec.rb
+++ b/spec/bundler/commands/doctor_spec.rb
@@ -4,17 +4,18 @@
 require "stringio"
 require "bundler/cli"
 require "bundler/cli/doctor"
+require "bundler/cli/doctor/diagnose"
 
 RSpec.describe "bundle doctor" do
   before(:each) do
     install_gemfile <<-G
-      source "#{file_uri_for(gem_repo1)}"
-      gem "rack"
+      source "https://gem.repo1"
+      gem "myrack"
     G
 
     @stdout = StringIO.new
 
-    [:error, :warn].each do |method|
+    [:error, :warn, :info].each do |method|
       allow(Bundler.ui).to receive(method).and_wrap_original do |m, message|
         m.call message
         @stdout.puts message
@@ -38,31 +39,44 @@
       allow(stat).to receive(:uid) { Process.uid }
       allow(File).to receive(:writable?).with(unwritable_file) { true }
       allow(File).to receive(:readable?).with(unwritable_file) { true }
+
+      # The following lines are for `Gem::PathSupport#initialize`.
+      allow(File).to receive(:exist?).with(Gem.default_dir)
+      allow(File).to receive(:writable?).with(Gem.default_dir)
+      allow(File).to receive(:writable?).with(File.expand_path("..", Gem.default_dir))
     end
 
-    it "exits with no message if the installed gem has no C extensions" do
-      expect { Bundler::CLI::Doctor.new({}).run }.not_to raise_error
-      expect(@stdout.string).to be_empty
+    it "exits with a success message if the installed gem has no C extensions" do
+      doctor = Bundler::CLI::Doctor::Diagnose.new({})
+      allow(doctor).to receive(:lookup_with_fiddle).and_return(false)
+      expect { doctor.run }.not_to raise_error
+      expect(@stdout.string).to include("No issues")
     end
 
-    it "exits with no message if the installed gem's C extension dylib breakage is fine" do
-      doctor = Bundler::CLI::Doctor.new({})
-      expect(doctor).to receive(:bundles_for_gem).exactly(2).times.and_return ["/path/to/rack/rack.bundle"]
+    it "exits with a success message if the installed gem's C extension dylib breakage is fine" do
+      doctor = Bundler::CLI::Doctor::Diagnose.new({})
+      expect(doctor).to receive(:bundles_for_gem).exactly(2).times.and_return ["/path/to/myrack/myrack.bundle"]
       expect(doctor).to receive(:dylibs).exactly(2).times.and_return ["/usr/lib/libSystem.dylib"]
-      allow(Fiddle).to receive(:dlopen).with("/usr/lib/libSystem.dylib").and_return(true)
+      allow(doctor).to receive(:lookup_with_fiddle).with("/usr/lib/libSystem.dylib").and_return(false)
       expect { doctor.run }.not_to raise_error
-      expect(@stdout.string).to be_empty
+      expect(@stdout.string).to include("No issues")
+    end
+
+    it "parses otool output correctly" do
+      doctor = Bundler::CLI::Doctor::Diagnose.new({})
+      expect(doctor).to receive(:`).with("/usr/bin/otool -L fake").and_return("/home/gem/ruby/3.4.3/gems/blake3-rb-1.5.4.4/lib/digest/blake3/blake3_ext.bundle:\n\t (compatibility version 0.0.0, current version 0.0.0)\n\t/usr/lib/libSystem.B.dylib (compatibility version 1.0.0, current version 1351.0.0)")
+      expect(doctor.dylibs_darwin("fake")).to eq(["/usr/lib/libSystem.B.dylib"])
     end
 
     it "exits with a message if one of the linked libraries is missing" do
-      doctor = Bundler::CLI::Doctor.new({})
-      expect(doctor).to receive(:bundles_for_gem).exactly(2).times.and_return ["/path/to/rack/rack.bundle"]
+      doctor = Bundler::CLI::Doctor::Diagnose.new({})
+      expect(doctor).to receive(:bundles_for_gem).exactly(2).times.and_return ["/path/to/myrack/myrack.bundle"]
       expect(doctor).to receive(:dylibs).exactly(2).times.and_return ["/usr/local/opt/icu4c/lib/libicui18n.57.1.dylib"]
-      allow(Fiddle).to receive(:dlopen).with("/usr/local/opt/icu4c/lib/libicui18n.57.1.dylib").and_raise(Fiddle::DLError)
+      allow(doctor).to receive(:lookup_with_fiddle).with("/usr/local/opt/icu4c/lib/libicui18n.57.1.dylib").and_return(true)
       expect { doctor.run }.to raise_error(Bundler::ProductionError, <<~E.strip), @stdout.string
         The following gems are missing OS dependencies:
          * bundler: /usr/local/opt/icu4c/lib/libicui18n.57.1.dylib
-         * rack: /usr/local/opt/icu4c/lib/libicui18n.57.1.dylib
+         * myrack: /usr/local/opt/icu4c/lib/libicui18n.57.1.dylib
       E
     end
   end
@@ -77,7 +91,9 @@
     end
 
     it "exits with an error if home contains files that are not readable/writable" do
-      expect { Bundler::CLI::Doctor.new({}).run }.not_to raise_error
+      doctor = Bundler::CLI::Doctor::Diagnose.new({})
+      allow(doctor).to receive(:lookup_with_fiddle).and_return(false)
+      expect { doctor.run }.not_to raise_error
       expect(@stdout.string).to include(
         "Broken links exist in the Bundler home. Please report them to the offending gem's upstream repo. These files are:\n - #{@broken_symlink}"
       )
@@ -96,38 +112,57 @@
       allow(File).to receive(:stat).with(@unwritable_file) { @stat }
     end
 
-    it "exits with an error if home contains files that are not readable/writable" do
+    it "exits with an error if home contains files that are not readable" do
+      doctor = Bundler::CLI::Doctor::Diagnose.new({})
+      allow(doctor).to receive(:lookup_with_fiddle).and_return(false)
       allow(@stat).to receive(:uid) { Process.uid }
       allow(File).to receive(:writable?).with(@unwritable_file) { false }
       allow(File).to receive(:readable?).with(@unwritable_file) { false }
-      expect { Bundler::CLI::Doctor.new({}).run }.not_to raise_error
+      expect { doctor.run }.not_to raise_error
       expect(@stdout.string).to include(
-        "Files exist in the Bundler home that are not readable/writable by the current user. These files are:\n - #{@unwritable_file}"
+        "Files exist in the Bundler home that are not readable by the current user. These files are:\n - #{@unwritable_file}"
       )
       expect(@stdout.string).not_to include("No issues")
     end
 
+    it "exits without an error if home contains files that are not writable" do
+      doctor = Bundler::CLI::Doctor::Diagnose.new({})
+      allow(doctor).to receive(:lookup_with_fiddle).and_return(false)
+      allow(@stat).to receive(:uid) { Process.uid }
+      allow(File).to receive(:writable?).with(@unwritable_file) { false }
+      allow(File).to receive(:readable?).with(@unwritable_file) { true }
+      expect { doctor.run }.not_to raise_error
+      expect(@stdout.string).not_to include(
+        "Files exist in the Bundler home that are not readable by the current user. These files are:\n - #{@unwritable_file}"
+      )
+      expect(@stdout.string).to include("No issues")
+    end
+
     context "when home contains files that are not owned by the current process", :permissions do
       before(:each) do
         allow(@stat).to receive(:uid) { 0o0000 }
       end
 
       it "exits with an error if home contains files that are not readable/writable and are not owned by the current user" do
+        doctor = Bundler::CLI::Doctor::Diagnose.new({})
+        allow(doctor).to receive(:lookup_with_fiddle).and_return(false)
         allow(File).to receive(:writable?).with(@unwritable_file) { false }
         allow(File).to receive(:readable?).with(@unwritable_file) { false }
-        expect { Bundler::CLI::Doctor.new({}).run }.not_to raise_error
+        expect { doctor.run }.not_to raise_error
         expect(@stdout.string).to include(
-          "Files exist in the Bundler home that are owned by another user, and are not readable/writable. These files are:\n - #{@unwritable_file}"
+          "Files exist in the Bundler home that are owned by another user, and are not readable. These files are:\n - #{@unwritable_file}"
         )
         expect(@stdout.string).not_to include("No issues")
       end
 
       it "exits with a warning if home contains files that are read/write but not owned by current user" do
+        doctor = Bundler::CLI::Doctor::Diagnose.new({})
+        allow(doctor).to receive(:lookup_with_fiddle).and_return(false)
         allow(File).to receive(:writable?).with(@unwritable_file) { true }
         allow(File).to receive(:readable?).with(@unwritable_file) { true }
-        expect { Bundler::CLI::Doctor.new({}).run }.not_to raise_error
+        expect { doctor.run }.not_to raise_error
         expect(@stdout.string).to include(
-          "Files exist in the Bundler home that are owned by another user, but are still readable/writable. These files are:\n - #{@unwritable_file}"
+          "Files exist in the Bundler home that are owned by another user, but are still readable. These files are:\n - #{@unwritable_file}"
         )
         expect(@stdout.string).not_to include("No issues")
       end
@@ -136,7 +171,7 @@
 
   context "when home contains filenames with special characters" do
     it "escape filename before command execute" do
-      doctor = Bundler::CLI::Doctor.new({})
+      doctor = Bundler::CLI::Doctor::Diagnose.new({})
       expect(doctor).to receive(:`).with("/usr/bin/otool -L \\$\\(date\\)\\ \\\"\\'\\\\.bundle").and_return("dummy string")
       doctor.dylibs_darwin('$(date) "\'\.bundle')
       expect(doctor).to receive(:`).with("/usr/bin/ldd \\$\\(date\\)\\ \\\"\\'\\\\.bundle").and_return("dummy string")
diff --git a/spec/bundler/commands/exec_spec.rb b/spec/bundler/commands/exec_spec.rb
index 7217c9d61f4660..4e8a816e957361 100644
--- a/spec/bundler/commands/exec_spec.rb
+++ b/spec/bundler/commands/exec_spec.rb
@@ -1,116 +1,97 @@
 # frozen_string_literal: true
 
 RSpec.describe "bundle exec" do
-  let(:system_gems_to_install) { %w[rack-1.0.0 rack-0.9.1] }
-
   it "works with --gemfile flag" do
-    system_gems(system_gems_to_install, :path => default_bundle_path)
+    system_gems(%w[myrack-1.0.0 myrack-0.9.1], path: default_bundle_path)
 
-    create_file "CustomGemfile", <<-G
-      source "#{file_uri_for(gem_repo1)}"
-      gem "rack", "1.0.0"
+    gemfile "CustomGemfile", <<-G
+      source "https://gem.repo1"
+      gem "myrack", "1.0.0"
     G
 
-    bundle "exec --gemfile CustomGemfile rackup"
+    bundle "exec --gemfile CustomGemfile myrackup"
     expect(out).to eq("1.0.0")
   end
 
   it "activates the correct gem" do
-    system_gems(system_gems_to_install, :path => default_bundle_path)
+    system_gems(%w[myrack-1.0.0 myrack-0.9.1], path: default_bundle_path)
 
     gemfile <<-G
-      source "#{file_uri_for(gem_repo1)}"
-      gem "rack", "0.9.1"
+      source "https://gem.repo1"
+      gem "myrack", "0.9.1"
     G
 
-    bundle "exec rackup"
+    bundle "exec myrackup"
     expect(out).to eq("0.9.1")
   end
 
   it "works and prints no warnings when HOME is not writable" do
-    system_gems(system_gems_to_install, :path => default_bundle_path)
+    system_gems(%w[myrack-1.0.0 myrack-0.9.1], path: default_bundle_path)
 
     gemfile <<-G
-      source "#{file_uri_for(gem_repo1)}"
-      gem "rack", "0.9.1"
+      source "https://gem.repo1"
+      gem "myrack", "0.9.1"
     G
 
-    bundle "exec rackup", :env => { "HOME" => "/" }
+    bundle "exec myrackup", env: { "HOME" => "/" }
     expect(out).to eq("0.9.1")
     expect(err).to be_empty
   end
 
   it "works when the bins are in ~/.bundle" do
     install_gemfile <<-G
-      source "#{file_uri_for(gem_repo1)}"
-      gem "rack"
+      source "https://gem.repo1"
+      gem "myrack"
     G
 
-    bundle "exec rackup"
+    bundle "exec myrackup"
     expect(out).to eq("1.0.0")
   end
 
   it "works when running from a random directory" do
     install_gemfile <<-G
-      source "#{file_uri_for(gem_repo1)}"
-      gem "rack"
+      source "https://gem.repo1"
+      gem "myrack"
     G
 
-    bundle "exec 'cd #{tmp("gems")} && rackup'"
+    bundle "exec 'cd #{tmp("gems")} && myrackup'"
 
     expect(out).to eq("1.0.0")
   end
 
   it "works when exec'ing something else" do
-    install_gemfile "source \"#{file_uri_for(gem_repo1)}\"; gem \"rack\""
+    install_gemfile "source \"https://gem.repo1\"; gem \"myrack\""
     bundle "exec echo exec"
     expect(out).to eq("exec")
   end
 
   it "works when exec'ing to ruby" do
-    install_gemfile "source \"#{file_uri_for(gem_repo1)}\"; gem \"rack\""
+    install_gemfile "source \"https://gem.repo1\"; gem \"myrack\""
     bundle "exec ruby -e 'puts %{hi}'"
     expect(out).to eq("hi")
   end
 
   it "works when exec'ing to rubygems" do
-    install_gemfile "source \"#{file_uri_for(gem_repo1)}\"; gem \"rack\""
+    install_gemfile "source \"https://gem.repo1\"; gem \"myrack\""
     bundle "exec #{gem_cmd} --version"
     expect(out).to eq(Gem::VERSION)
   end
 
   it "works when exec'ing to rubygems through sh -c" do
-    install_gemfile "source \"#{file_uri_for(gem_repo1)}\"; gem \"rack\""
+    install_gemfile "source \"https://gem.repo1\"; gem \"myrack\""
     bundle "exec sh -c '#{gem_cmd} --version'"
     expect(out).to eq(Gem::VERSION)
   end
 
-  it "works when exec'ing back to bundler with a lockfile that doesn't include the current platform" do
+  it "works when exec'ing back to bundler to run a remote resolve" do
     install_gemfile <<-G
-      source "#{file_uri_for(gem_repo1)}"
-      gem "rack", "0.9.1"
+      source "https://gem.repo1"
+      gem "myrack", "0.9.1"
     G
 
-    # simulate lockfile generated with old version not including specific platform
-    lockfile <<-L
-      GEM
-        remote: #{file_uri_for(gem_repo1)}/
-        specs:
-          rack (0.9.1)
-
-      PLATFORMS
-        RUBY
-
-      DEPENDENCIES
-        rack (= 0.9.1)
+    bundle "exec bundle lock", env: { "BUNDLER_VERSION" => Bundler::VERSION }
 
-      BUNDLED WITH
-          2.1.4
-    L
-
-    bundle "exec bundle cache", :env => { "BUNDLER_VERSION" => Bundler::VERSION }
-
-    expect(out).to include("Updating files in vendor/cache")
+    expect(out).to include("Writing lockfile")
   end
 
   it "respects custom process title when loading through ruby" do
@@ -120,20 +101,20 @@
       Process.setproctitle("1-2-3-4-5-6-7")
       puts `ps -ocommand= -p#{$$}`
     RUBY
-    create_file "Gemfile", "source \"#{file_uri_for(gem_repo1)}\""
+    gemfile "Gemfile", "source \"https://gem.repo1\""
     create_file "a.rb", script_that_changes_its_own_title_and_checks_if_picked_up_by_ps_unix_utility
     bundle "exec ruby a.rb"
     expect(out).to eq("1-2-3-4-5-6-7")
   end
 
   it "accepts --verbose" do
-    install_gemfile "source \"#{file_uri_for(gem_repo1)}\"; gem \"rack\""
+    install_gemfile "source \"https://gem.repo1\"; gem \"myrack\""
     bundle "exec --verbose echo foobar"
     expect(out).to eq("foobar")
   end
 
   it "passes --verbose to command if it is given after the command" do
-    install_gemfile "source \"#{file_uri_for(gem_repo1)}\"; gem \"rack\""
+    install_gemfile "source \"https://gem.repo1\"; gem \"myrack\""
     bundle "exec echo --verbose"
     expect(out).to eq("--verbose")
   end
@@ -157,7 +138,7 @@
       end
     G
 
-    install_gemfile "source \"#{file_uri_for(gem_repo1)}\""
+    install_gemfile "source \"https://gem.repo1\""
     sys_exec "#{Gem.ruby} #{command.path}"
 
     expect(out).to be_empty
@@ -165,7 +146,7 @@
   end
 
   it "accepts --keep-file-descriptors" do
-    install_gemfile "source \"#{file_uri_for(gem_repo1)}\""
+    install_gemfile "source \"https://gem.repo1\""
     bundle "exec --keep-file-descriptors echo foobar"
 
     expect(err).to be_empty
@@ -174,7 +155,7 @@
   it "can run a command named --verbose" do
     skip "https://github.com/rubygems/rubygems/issues/3351" if Gem.win_platform?
 
-    install_gemfile "source \"#{file_uri_for(gem_repo1)}\"; gem \"rack\""
+    install_gemfile "source \"https://gem.repo1\"; gem \"myrack\""
     File.open(bundled_app("--verbose"), "w") do |f|
       f.puts "#!/bin/sh"
       f.puts "echo foobar"
@@ -188,192 +169,185 @@
 
   it "handles different versions in different bundles" do
     build_repo2 do
-      build_gem "rack_two", "1.0.0" do |s|
-        s.executables = "rackup"
+      build_gem "myrack_two", "1.0.0" do |s|
+        s.executables = "myrackup"
       end
     end
 
     install_gemfile <<-G
-      source "#{file_uri_for(gem_repo1)}"
-      gem "rack", "0.9.1"
+      source "https://gem.repo1"
+      gem "myrack", "0.9.1"
     G
 
-    install_gemfile bundled_app2("Gemfile"), <<-G, :dir => bundled_app2
-      source "#{file_uri_for(gem_repo2)}"
-      gem "rack_two", "1.0.0"
+    install_gemfile bundled_app2("Gemfile"), <<-G, dir: bundled_app2
+      source "https://gem.repo2"
+      gem "myrack_two", "1.0.0"
     G
 
-    bundle "exec rackup"
+    bundle "exec myrackup"
 
     expect(out).to eq("0.9.1")
 
-    bundle "exec rackup", :dir => bundled_app2
+    bundle "exec myrackup", dir: bundled_app2
     expect(out).to eq("1.0.0")
   end
 
   context "with default gems" do
-    let(:default_irb_version) { ruby "gem 'irb', '< 999999'; require 'irb'; puts IRB::VERSION", :raise_on_error => false }
+    # TODO: Switch to ERB::VERSION once Ruby 3.4 support is dropped, so all
+    # supported rubies include an `erb` gem version where `ERB::VERSION` is
+    # public
+    let(:default_erb_version) { ruby "require 'erb/version'; puts ERB.const_get(:VERSION)" }
 
     context "when not specified in Gemfile" do
       before do
-        skip "irb isn't a default gem" if default_irb_version.empty?
-
-        install_gemfile "source \"#{file_uri_for(gem_repo1)}\""
+        install_gemfile "source \"https://gem.repo1\""
       end
 
       it "uses version provided by ruby" do
-        bundle "exec irb --version"
+        bundle "exec erb --version"
 
-        expect(out).to include(default_irb_version)
+        expect(stdboth).to eq(default_erb_version)
       end
     end
 
     context "when specified in Gemfile directly" do
-      let(:specified_irb_version) { "0.9.6" }
+      let(:specified_erb_version) { "2.0.0" }
 
       before do
-        skip "irb isn't a default gem" if default_irb_version.empty?
-
         build_repo2 do
-          build_gem "irb", specified_irb_version do |s|
-            s.executables = "irb"
+          build_gem "erb", specified_erb_version do |s|
+            s.executables = "erb"
           end
         end
 
         install_gemfile <<-G
-          source "#{file_uri_for(gem_repo2)}"
-          gem "irb", "#{specified_irb_version}"
+          source "https://gem.repo2"
+          gem "erb", "#{specified_erb_version}"
         G
       end
 
       it "uses version specified" do
-        bundle "exec irb --version"
+        bundle "exec erb --version"
 
-        expect(out).to eq(specified_irb_version)
-        expect(err).to be_empty
+        expect(stdboth).to eq(specified_erb_version)
       end
     end
 
     context "when specified in Gemfile indirectly" do
-      let(:indirect_irb_version) { "0.9.6" }
+      let(:indirect_erb_version) { "2.0.0" }
 
       before do
-        skip "irb isn't a default gem" if default_irb_version.empty?
-
         build_repo2 do
-          build_gem "irb", indirect_irb_version do |s|
-            s.executables = "irb"
+          build_gem "erb", indirect_erb_version do |s|
+            s.executables = "erb"
           end
 
-          build_gem "gem_depending_on_old_irb" do |s|
-            s.add_dependency "irb", indirect_irb_version
+          build_gem "gem_depending_on_old_erb" do |s|
+            s.add_dependency "erb", indirect_erb_version
           end
         end
 
         install_gemfile <<-G
-          source "#{file_uri_for(gem_repo2)}"
-          gem "gem_depending_on_old_irb"
+          source "https://gem.repo2"
+          gem "gem_depending_on_old_erb"
         G
-
-        bundle "exec irb --version"
       end
 
       it "uses resolved version" do
-        expect(out).to eq(indirect_irb_version)
-        expect(err).to be_empty
+        bundle "exec erb --version"
+
+        expect(stdboth).to eq(indirect_erb_version)
       end
     end
   end
 
   it "warns about executable conflicts" do
     build_repo2 do
-      build_gem "rack_two", "1.0.0" do |s|
-        s.executables = "rackup"
+      build_gem "myrack_two", "1.0.0" do |s|
+        s.executables = "myrackup"
       end
     end
 
     bundle "config set --global path.system true"
 
     install_gemfile <<-G
-      source "#{file_uri_for(gem_repo1)}"
-      gem "rack", "0.9.1"
+      source "https://gem.repo1"
+      gem "myrack", "0.9.1"
     G
 
-    install_gemfile bundled_app2("Gemfile"), <<-G, :dir => bundled_app2
-      source "#{file_uri_for(gem_repo2)}"
-      gem "rack_two", "1.0.0"
+    install_gemfile bundled_app2("Gemfile"), <<-G, dir: bundled_app2
+      source "https://gem.repo2"
+      gem "myrack_two", "1.0.0"
     G
 
-    bundle "exec rackup"
+    bundle "exec myrackup"
 
     expect(last_command.stderr).to eq(
-      "Bundler is using a binstub that was created for a different gem (rack).\n" \
-      "You should run `bundle binstub rack_two` to work around a system/bundle conflict."
+      "Bundler is using a binstub that was created for a different gem (myrack).\n" \
+      "You should run `bundle binstub myrack_two` to work around a system/bundle conflict."
     )
   end
 
   it "handles gems installed with --without" do
     bundle "config set --local without middleware"
     install_gemfile <<-G
-      source "#{file_uri_for(gem_repo1)}"
-      gem "rack" # rack 0.9.1 and 1.0 exist
+      source "https://gem.repo1"
+      gem "myrack" # myrack 0.9.1 and 1.0 exist
 
       group :middleware do
-        gem "rack_middleware" # rack_middleware depends on rack 0.9.1
+        gem "myrack_middleware" # myrack_middleware depends on myrack 0.9.1
       end
     G
 
-    bundle "exec rackup"
+    bundle "exec myrackup"
 
     expect(out).to eq("0.9.1")
-    expect(the_bundle).not_to include_gems "rack_middleware 1.0"
+    expect(the_bundle).not_to include_gems "myrack_middleware 1.0"
   end
 
   it "does not duplicate already exec'ed RUBYOPT" do
-    skip "https://github.com/rubygems/rubygems/issues/3351" if Gem.win_platform?
-
+    create_file("echoopt", "#!/usr/bin/env ruby\nprint ENV['RUBYOPT']")
     install_gemfile <<-G
-      source "#{file_uri_for(gem_repo1)}"
-      gem "rack"
+      source "https://gem.repo1"
+      gem "myrack"
     G
 
     bundler_setup_opt = "-r#{lib_dir}/bundler/setup"
 
     rubyopt = opt_add(bundler_setup_opt, ENV["RUBYOPT"])
 
-    bundle "exec 'echo $RUBYOPT'"
+    bundle "exec echoopt"
     expect(out.split(" ").count(bundler_setup_opt)).to eq(1)
 
-    bundle "exec 'echo $RUBYOPT'", :env => { "RUBYOPT" => rubyopt }
+    bundle "exec echoopt", env: { "RUBYOPT" => rubyopt }
     expect(out.split(" ").count(bundler_setup_opt)).to eq(1)
   end
 
   it "does not duplicate already exec'ed RUBYLIB" do
-    skip "https://github.com/rubygems/rubygems/issues/3351" if Gem.win_platform?
-
+    create_file("echolib", "#!/usr/bin/env ruby\nprint ENV['RUBYLIB']")
     install_gemfile <<-G
-      source "#{file_uri_for(gem_repo1)}"
-      gem "rack"
+      source "https://gem.repo1"
+      gem "myrack"
     G
 
     rubylib = ENV["RUBYLIB"]
     rubylib = rubylib.to_s.split(File::PATH_SEPARATOR).unshift lib_dir.to_s
     rubylib = rubylib.uniq.join(File::PATH_SEPARATOR)
 
-    bundle "exec 'echo $RUBYLIB'"
+    bundle "exec echolib"
     expect(out).to include(rubylib)
 
-    bundle "exec 'echo $RUBYLIB'", :env => { "RUBYLIB" => rubylib }
+    bundle "exec echolib", env: { "RUBYLIB" => rubylib }
     expect(out).to include(rubylib)
   end
 
   it "errors nicely when the argument doesn't exist" do
     install_gemfile <<-G
-      source "#{file_uri_for(gem_repo1)}"
-      gem "rack"
+      source "https://gem.repo1"
+      gem "myrack"
     G
 
-    bundle "exec foobarbaz", :raise_on_error => false
+    bundle "exec foobarbaz", raise_on_error: false
     expect(exitstatus).to eq(127)
     expect(err).to include("bundler: command not found: foobarbaz")
     expect(err).to include("Install missing gem executables with `bundle install`")
@@ -381,39 +355,39 @@
 
   it "errors nicely when the argument is not executable" do
     install_gemfile <<-G
-      source "#{file_uri_for(gem_repo1)}"
-      gem "rack"
+      source "https://gem.repo1"
+      gem "myrack"
     G
 
-    bundle "exec touch foo"
-    bundle "exec ./foo", :raise_on_error => false
+    bundled_app("foo").write("")
+    bundle "exec ./foo", raise_on_error: false
     expect(exitstatus).to eq(126)
     expect(err).to include("bundler: not executable: ./foo")
   end
 
   it "errors nicely when no arguments are passed" do
     install_gemfile <<-G
-      source "#{file_uri_for(gem_repo1)}"
-      gem "rack"
+      source "https://gem.repo1"
+      gem "myrack"
     G
 
-    bundle "exec", :raise_on_error => false
+    bundle "exec", raise_on_error: false
     expect(exitstatus).to eq(128)
     expect(err).to include("bundler: exec needs a command to run")
   end
 
   it "raises a helpful error when exec'ing to something outside of the bundle" do
-    system_gems(system_gems_to_install, :path => default_bundle_path)
+    system_gems(%w[myrack-1.0.0 myrack-0.9.1], path: default_bundle_path)
 
-    bundle "config set clean false" # want to keep the rackup binstub
+    bundle "config set clean false" # want to keep the myrackup binstub
     install_gemfile <<-G
-      source "#{file_uri_for(gem_repo1)}"
+      source "https://gem.repo1"
       gem "foo"
     G
     [true, false].each do |l|
       bundle "config set disable_exec_load #{l}"
-      bundle "exec rackup", :raise_on_error => false
-      expect(err).to include "can't find executable rackup for gem rack. rack is not currently included in the bundle, perhaps you meant to add it to your Gemfile?"
+      bundle "exec myrackup", raise_on_error: false
+      expect(err).to include "can't find executable myrackup for gem myrack. myrack is not currently included in the bundle, perhaps you meant to add it to your Gemfile?"
     end
   end
 
@@ -424,18 +398,15 @@
     each_prefix.call("exec") do |exec|
       describe "when #{exec} is used" do
         before(:each) do
-          skip "https://github.com/rubygems/rubygems/issues/3351" if Gem.win_platform?
-
           install_gemfile <<-G
-            source "#{file_uri_for(gem_repo1)}"
-            gem "rack"
+            source "https://gem.repo1"
+            gem "myrack"
           G
 
           create_file("print_args", <<-'RUBY')
             #!/usr/bin/env ruby
             puts "args: #{ARGV.inspect}"
           RUBY
-          bundled_app("print_args").chmod(0o755)
         end
 
         it "shows executable's man page when --help is after the executable" do
@@ -456,6 +427,7 @@
 
         it "shows executable's man page when the executable has a -" do
           FileUtils.mv(bundled_app("print_args"), bundled_app("docker-template"))
+          FileUtils.mv(bundled_app("print_args.bat"), bundled_app("docker-template.bat")) if Gem.win_platform?
           bundle "#{exec} docker-template build discourse --help"
           expect(out).to eq('args: ["build", "discourse", "--help"]')
         end
@@ -472,7 +444,7 @@
 
         it "shows bundle-exec's man page when --help is between exec and the executable" do
           with_fake_man do
-            bundle "#{exec} --help cat"
+            bundle "#{exec} --help echo"
           end
           expect(out).to include(%(["#{man_dir}/bundle-exec.1"]))
         end
@@ -512,31 +484,31 @@
     describe "run from a random directory" do
       before(:each) do
         install_gemfile <<-G
-          source "#{file_uri_for(gem_repo1)}"
-          gem "rack"
+          source "https://gem.repo1"
+          gem "myrack"
         G
       end
 
       it "works when unlocked" do
-        bundle "exec 'cd #{tmp("gems")} && rackup'"
+        bundle "exec 'cd #{tmp("gems")} && myrackup'"
         expect(out).to eq("1.0.0")
       end
 
       it "works when locked" do
         expect(the_bundle).to be_locked
-        bundle "exec 'cd #{tmp("gems")} && rackup'"
+        bundle "exec 'cd #{tmp("gems")} && myrackup'"
         expect(out).to eq("1.0.0")
       end
     end
 
     describe "from gems bundled via :path" do
       before(:each) do
-        build_lib "fizz", :path => home("fizz") do |s|
+        build_lib "fizz", path: home("fizz") do |s|
           s.executables = "fizz"
         end
 
         install_gemfile <<-G
-          source "#{file_uri_for(gem_repo1)}"
+          source "https://gem.repo1"
           gem "fizz", :path => "#{File.expand_path(home("fizz"))}"
         G
       end
@@ -561,7 +533,7 @@
         end
 
         install_gemfile <<-G
-          source "#{file_uri_for(gem_repo1)}"
+          source "https://gem.repo1"
           gem "fizz_git", :git => "#{lib_path("fizz_git-1.0")}"
         G
       end
@@ -580,12 +552,12 @@
 
     describe "from gems bundled via :git with no gemspec" do
       before(:each) do
-        build_git "fizz_no_gemspec", :gemspec => false do |s|
+        build_git "fizz_no_gemspec", gemspec: false do |s|
           s.executables = "fizz_no_gemspec"
         end
 
         install_gemfile <<-G
-          source "#{file_uri_for(gem_repo1)}"
+          source "https://gem.repo1"
           gem "fizz_no_gemspec", "1.0", :git => "#{lib_path("fizz_no_gemspec-1.0")}"
         G
       end
@@ -605,21 +577,34 @@
 
   it "performs an automatic bundle install" do
     gemfile <<-G
-      source "#{file_uri_for(gem_repo1)}"
-      gem "rack", "0.9.1"
+      source "https://gem.repo1"
+      gem "myrack", "0.9.1"
       gem "foo"
     G
 
     bundle "config set auto_install 1"
-    bundle "exec rackup"
+    bundle "exec myrackup", artifice: "compact_index"
     expect(out).to include("Installing foo 1.0")
   end
 
-  it "loads the correct optparse when `auto_install` is set, and optparse is a dependency" do
-    if Gem.ruby_version >= Gem::Version.new("3.0.0") && Gem.rubygems_version < Gem::Version.new("3.3.0.a")
-      skip "optparse is a default gem, and rubygems loads it during install"
+  it "performs an automatic bundle install with git gems" do
+    build_git "foo" do |s|
+      s.executables = "foo"
     end
+    gemfile <<-G
+      source "https://gem.repo1"
+      gem "myrack", "0.9.1"
+      gem "foo", :git => "#{lib_path("foo-1.0")}"
+    G
+
+    bundle "config set auto_install 1"
+    bundle "exec foo", artifice: "compact_index"
+    expect(out).to include("Fetching myrack 0.9.1")
+    expect(out).to include("Fetching #{lib_path("foo-1.0")}")
+    expect(out.lines).to end_with("1.0")
+  end
 
+  it "loads the correct optparse when `auto_install` is set, and optparse is a dependency" do
     build_repo4 do
       build_gem "fastlane", "2.192.0" do |s|
         s.executables = "fastlane"
@@ -630,17 +615,17 @@
       build_gem "optparse", "999.999.999"
     end
 
-    system_gems "optparse-999.999.998", :gem_repo => gem_repo4
+    system_gems "optparse-999.999.998", gem_repo: gem_repo4
 
     bundle "config set auto_install 1"
     bundle "config set --local path vendor/bundle"
 
     gemfile <<~G
-      source "#{file_uri_for(gem_repo4)}"
+      source "https://gem.repo4"
       gem "fastlane"
     G
 
-    bundle "exec fastlane"
+    bundle "exec fastlane", artifice: "compact_index"
     expect(out).to include("Installing optparse 999.999.999")
     expect(out).to include("2.192.0")
   end
@@ -657,19 +642,20 @@
             s.version = '1.0'
             s.summary = 'TODO: Add summary'
             s.authors = 'Me'
+            s.rubygems_version = nil
           end
         G
       end
 
       gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
+        source "https://gem.repo1"
         gem "foo", :path => "#{lib_path("foo-1.0")}"
       G
 
-      bundle "exec irb", :raise_on_error => false
+      bundle "exec erb", raise_on_error: false
 
       expect(err).to match("The gemspec at #{lib_path("foo-1.0").join("foo.gemspec")} is not valid")
-      expect(err).to match('"TODO" is not a summary')
+      expect(err).to match(/missing value for attribute rubygems_version|rubygems_version must not be nil/)
     end
   end
 
@@ -678,7 +664,7 @@
       skip "https://github.com/rubygems/rubygems/issues/3351" if Gem.win_platform?
 
       gemfile <<-G
-      source "#{file_uri_for(gem_repo1)}"
+      source "https://gem.repo1"
 
       module Monkey
         def bin_path(a,b,c)
@@ -689,50 +675,88 @@ def bin_path(a,b,c)
       G
       bundle "config set path.system true"
       bundle "install"
-      bundle "exec ruby -e '`bundle -v`; puts $?.success?'", :env => { "BUNDLER_VERSION" => Bundler::VERSION }
+      bundle "exec ruby -e '`bundle -v`; puts $?.success?'", env: { "BUNDLER_VERSION" => Bundler::VERSION }
       expect(out).to match("true")
     end
   end
 
+  describe "bundle exec gem uninstall" do
+    before do
+      build_repo4 do
+        build_gem "foo"
+      end
+
+      install_gemfile <<-G
+        source "https://gem.repo4"
+
+        gem "foo"
+      G
+    end
+
+    it "works" do
+      bundle "exec #{gem_cmd} uninstall foo"
+      expect(out).to eq("Successfully uninstalled foo-1.0")
+    end
+  end
+
+  describe "running gem commands in presence of rubygems plugins" do
+    before do
+      build_repo4 do
+        build_gem "foo" do |s|
+          s.write "lib/rubygems_plugin.rb", "puts 'FAIL'"
+        end
+      end
+
+      system_gems "foo-1.0", path: default_bundle_path, gem_repo: gem_repo4
+
+      install_gemfile <<-G
+        source "https://gem.repo4"
+      G
+    end
+
+    it "does not load plugins outside of the bundle" do
+      bundle "exec #{gem_cmd} -v"
+      expect(out).not_to include("FAIL")
+    end
+  end
+
   context "`load`ing a ruby file instead of `exec`ing" do
     let(:path) { bundled_app("ruby_executable") }
     let(:shebang) { "#!/usr/bin/env ruby" }
     let(:executable) { <<~RUBY.strip }
       #{shebang}
 
-      require "rack"
+      require "myrack"
       puts "EXEC: \#{caller.grep(/load/).empty? ? 'exec' : 'load'}"
       puts "ARGS: \#{$0} \#{ARGV.join(' ')}"
-      puts "RACK: \#{RACK}"
+      puts "MYRACK: \#{MYRACK}"
       process_title = `ps -o args -p \#{Process.pid}`.split("\n", 2).last.strip
       puts "PROCESS: \#{process_title}"
     RUBY
 
     before do
-      system_gems(system_gems_to_install, :path => default_bundle_path)
-
       bundled_app(path).open("w") {|f| f << executable }
       bundled_app(path).chmod(0o755)
 
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
-        gem "rack"
+        source "https://gem.repo1"
+        gem "myrack"
       G
     end
 
     let(:exec) { "EXEC: load" }
     let(:args) { "ARGS: #{path} arg1 arg2" }
-    let(:rack) { "RACK: 1.0.0" }
+    let(:myrack) { "MYRACK: 1.0.0" }
     let(:process) do
       title = "PROCESS: #{path}"
       title += " arg1 arg2"
       title
     end
     let(:exit_code) { 0 }
-    let(:expected) { [exec, args, rack, process].join("\n") }
+    let(:expected) { [exec, args, myrack, process].join("\n") }
     let(:expected_err) { "" }
 
-    subject { bundle "exec #{path} arg1 arg2", :raise_on_error => false }
+    subject { bundle "exec #{path} arg1 arg2", raise_on_error: false }
 
     it "runs" do
       skip "https://github.com/rubygems/rubygems/issues/3351" if Gem.win_platform?
@@ -814,8 +838,7 @@ def bin_path(a,b,c)
       let(:executable) { super() << "\nraise 'ERROR'" }
       let(:exit_code) { 1 }
       let(:expected_err) do
-        "bundler: failed to load command: #{path} (#{path})" \
-        "\n#{path}:10:in `<top (required)>': ERROR (RuntimeError)"
+        /\Abundler: failed to load command: #{Regexp.quote(path.to_s)} \(#{Regexp.quote(path.to_s)}\)\n#{Regexp.quote(path.to_s)}:10:in [`']<top \(required\)>': ERROR \(RuntimeError\)/
       end
 
       it "runs like a normally executed executable" do
@@ -823,7 +846,7 @@ def bin_path(a,b,c)
 
         subject
         expect(exitstatus).to eq(exit_code)
-        expect(err).to start_with(expected_err)
+        expect(err).to match(expected_err)
         expect(out).to eq(expected)
       end
     end
@@ -857,53 +880,26 @@ def bin_path(a,b,c)
       end
     end
 
-    context "when Bundler.setup fails", :bundler => "< 3" do
+    context "when Bundler.setup fails" do
       before do
-        gemfile <<-G
-          source "#{file_uri_for(gem_repo1)}"
-          gem 'rack', '2'
-        G
-        ENV["BUNDLER_FORCE_TTY"] = "true"
-      end
-
-      let(:exit_code) { Bundler::GemNotFound.new.status_code }
-      let(:expected) { "" }
-      let(:expected_err) { <<-EOS.strip }
-Could not find gem 'rack (= 2)' in locally installed gems.
-
-The source contains the following gems matching 'rack':
-  * rack-0.9.1
-  * rack-1.0.0
-Run `bundle install` to install missing gems.
-      EOS
-
-      it "runs" do
-        skip "https://github.com/rubygems/rubygems/issues/3351" if Gem.win_platform?
-
-        subject
-        expect(exitstatus).to eq(exit_code)
-        expect(err).to eq(expected_err)
-        expect(out).to eq(expected)
-      end
-    end
+        system_gems(%w[myrack-1.0.0 myrack-0.9.1], path: default_bundle_path)
 
-    context "when Bundler.setup fails", :bundler => "3" do
-      before do
         gemfile <<-G
-          source "#{file_uri_for(gem_repo1)}"
-          gem 'rack', '2'
+          source "https://gem.repo1"
+          gem 'myrack', '2'
         G
         ENV["BUNDLER_FORCE_TTY"] = "true"
       end
 
       let(:exit_code) { Bundler::GemNotFound.new.status_code }
       let(:expected) { "" }
-      let(:expected_err) { <<-EOS.strip }
-Could not find gem 'rack (= 2)' in locally installed gems.
+      let(:expected_err) { <<~EOS.strip }
+        Could not find gem 'myrack (= 2)' in locally installed gems.
 
-The source contains the following gems matching 'rack':
-  * rack-1.0.0
-Run `bundle install` to install missing gems.
+        The source contains the following gems matching 'myrack':
+          * myrack-0.9.1
+          * myrack-1.0.0
+        Run `bundle install` to install missing gems.
       EOS
 
       it "runs" do
@@ -918,9 +914,9 @@ def bin_path(a,b,c)
 
     context "when Bundler.setup fails and Gemfile is not the default" do
       before do
-        create_file "CustomGemfile", <<-G
-          source "#{file_uri_for(gem_repo1)}"
-          gem 'rack', '2'
+        gemfile "CustomGemfile", <<-G
+          source "https://gem.repo1"
+          gem 'myrack', '2'
         G
         ENV["BUNDLER_FORCE_TTY"] = "true"
         ENV["BUNDLE_GEMFILE"] = "CustomGemfile"
@@ -979,23 +975,30 @@ def bin_path(a,b,c)
         puts "__FILE__: #{__FILE__.inspect}"
       RUBY
 
-      let(:expected) { super() + <<-EOS.chomp }
+      context "when the path is absolute" do
+        let(:expected) { super() + <<~EOS.chomp }
 
-$0: #{path.to_s.inspect}
-__FILE__: #{path.to_s.inspect}
-      EOS
+          $0: #{path.to_s.inspect}
+          __FILE__: #{path.to_s.inspect}
+        EOS
 
-      it "runs" do
-        skip "https://github.com/rubygems/rubygems/issues/3351" if Gem.win_platform?
+        it "runs" do
+          skip "https://github.com/rubygems/rubygems/issues/3351" if Gem.win_platform?
 
-        subject
-        expect(exitstatus).to eq(exit_code)
-        expect(err).to eq(expected_err)
-        expect(out).to eq(expected)
+          subject
+          expect(exitstatus).to eq(exit_code)
+          expect(err).to eq(expected_err)
+          expect(out).to eq(expected)
+        end
       end
 
       context "when the path is relative" do
         let(:path) { super().relative_path_from(bundled_app) }
+        let(:expected) { super() + <<~EOS.chomp }
+
+          $0: #{path.to_s.inspect}
+          __FILE__: #{path.to_s.inspect}
+        EOS
 
         it "runs" do
           skip "https://github.com/rubygems/rubygems/issues/3351" if Gem.win_platform?
@@ -1009,8 +1012,20 @@ def bin_path(a,b,c)
 
       context "when the path is relative with a leading ./" do
         let(:path) { Pathname.new("./#{super().relative_path_from(bundled_app)}") }
+        let(:expected) { super() + <<~EOS.chomp }
 
-        pending "relative paths with ./ have absolute __FILE__"
+          $0: #{path.to_s.inspect}
+          __FILE__: #{File.expand_path(path, bundled_app).inspect}
+        EOS
+
+        it "runs" do
+          skip "https://github.com/rubygems/rubygems/issues/3351" if Gem.win_platform?
+
+          subject
+          expect(exitstatus).to eq(exit_code)
+          expect(err).to eq(expected_err)
+          expect(out).to eq(expected)
+        end
       end
     end
 
@@ -1082,8 +1097,8 @@ def bin_path(a,b,c)
         skip "https://github.com/rubygems/rubygems/issues/3351" if Gem.win_platform?
 
         gemfile <<-G
-          source "#{file_uri_for(gem_repo1)}"
-          gem "rack"
+          source "https://gem.repo1"
+          gem "myrack"
         G
         bundle "config set path vendor/bundler"
         bundle :install
@@ -1096,7 +1111,7 @@ def bin_path(a,b,c)
           puts `bundle exec echo foo`
         RUBY
         file.chmod(0o777)
-        bundle "exec #{file}", :env => { "PATH" => path }
+        bundle "exec #{file}", env: { "PATH" => path }
         expect(out).to eq("foo")
       end
     end
@@ -1105,7 +1120,7 @@ def bin_path(a,b,c)
       before do
         skip "https://github.com/rubygems/rubygems/issues/3351" if Gem.win_platform?
 
-        install_gemfile "source \"#{file_uri_for(gem_repo1)}\""
+        install_gemfile "source \"https://gem.repo1\""
       end
 
       it "does not undo the monkeypatches" do
@@ -1155,18 +1170,18 @@ def require(path)
         end
 
         bundle "config set path vendor/bundle"
-        bundle "config set gemfile gemfiles/rack_6_1.gemfile"
+        bundle "config set gemfile gemfiles/myrack_6_1.gemfile"
 
-        create_file(bundled_app("gemfiles/rack_6_1.gemfile"), <<~RUBY)
-          source "#{file_uri_for(gem_repo2)}"
+        gemfile(bundled_app("gemfiles/myrack_6_1.gemfile"), <<~RUBY)
+          source "https://gem.repo2"
 
           gem "rails", "6.1.0"
         RUBY
 
         # A Gemfile needs to be in the root to trick bundler's root resolution
-        create_file(bundled_app("Gemfile"), "source \"#{file_uri_for(gem_repo1)}\"")
+        gemfile "source 'https://gem.repo1'"
 
-        bundle "install"
+        bundle "install", artifice: "compact_index", env: { "BUNDLER_SPEC_GEM_REPO" => gem_repo2.to_s }
       end
 
       it "can still find gems after a nested subprocess" do
@@ -1185,17 +1200,34 @@ def require(path)
         expect(err).to be_empty
         expect(out).to eq("6.1.0")
       end
+
+      it "can still find gems after a nested subprocess when using bundler (with a final r) executable" do
+        script = bundled_app("bin/myscript")
+
+        create_file(script, <<~RUBY)
+          #!#{Gem.ruby}
+
+          puts `bundler exec rails`
+        RUBY
+
+        script.chmod(0o777)
+
+        bundle "exec #{script}"
+
+        expect(err).to be_empty
+        expect(out).to eq("6.1.0")
+      end
     end
 
     context "with a system gem that shadows a default gem" do
       let(:openssl_version) { "99.9.9" }
-      let(:expected) { ruby "gem 'openssl', '< 999999'; require 'openssl'; puts OpenSSL::VERSION", :artifice => nil, :raise_on_error => false }
 
       it "only leaves the default gem in the stdlib available" do
+        default_openssl_version = ruby "require 'openssl'; puts OpenSSL::VERSION"
+
         skip "https://github.com/rubygems/rubygems/issues/3351" if Gem.win_platform?
-        skip "openssl isn't a default gem" if expected.empty?
 
-        install_gemfile "source \"#{file_uri_for(gem_repo1)}\"" # must happen before installing the broken system gem
+        install_gemfile "source \"https://gem.repo1\"" # must happen before installing the broken system gem
 
         build_repo4 do
           build_gem "openssl", openssl_version do |s|
@@ -1205,7 +1237,7 @@ def require(path)
           end
         end
 
-        system_gems("openssl-#{openssl_version}", :gem_repo => gem_repo4)
+        system_gems("openssl-#{openssl_version}", gem_repo: gem_repo4)
 
         file = bundled_app("require_openssl.rb")
         create_file(file, <<-RUBY)
@@ -1218,15 +1250,15 @@ def require(path)
 
         env = { "PATH" => path }
         aggregate_failures do
-          expect(bundle("exec #{file}", :artifice => nil, :env => env)).to eq(expected)
-          expect(bundle("exec bundle exec #{file}", :artifice => nil, :env => env)).to eq(expected)
-          expect(bundle("exec ruby #{file}", :artifice => nil, :env => env)).to eq(expected)
-          expect(run(file.read, :artifice => nil, :env => env)).to eq(expected)
+          expect(bundle("exec #{file}", env: env)).to eq(default_openssl_version)
+          expect(bundle("exec bundle exec #{file}", env: env)).to eq(default_openssl_version)
+          expect(bundle("exec ruby #{file}", env: env)).to eq(default_openssl_version)
+          expect(run(file.read, artifice: nil, env: env)).to eq(default_openssl_version)
         end
 
         skip "ruby_core has openssl and rubygems in the same folder, and this test needs rubygems require but default openssl not in a directly added entry in $LOAD_PATH" if ruby_core?
         # sanity check that we get the newer, custom version without bundler
-        sys_exec "#{Gem.ruby} #{file}", :env => env, :raise_on_error => false
+        sys_exec "#{Gem.ruby} #{file}", env: env, raise_on_error: false
         expect(err).to include("custom openssl should not be loaded")
       end
     end
@@ -1236,7 +1268,7 @@ def require(path)
         build_git "simple_git_binary", &:add_c_extension
         bundle "config set --local path .bundle"
         install_gemfile <<-G
-          source "#{file_uri_for(gem_repo1)}"
+          source "https://gem.repo1"
           gem "simple_git_binary", :git => '#{lib_path("simple_git_binary-1.0")}'
         G
       end
@@ -1246,7 +1278,7 @@ def require(path)
       end
 
       it "allows calling bundle install after removing gem.build_complete" do
-        FileUtils.rm_rf Dir[bundled_app(".bundle/**/gem.build_complete")]
+        FileUtils.rm_r Dir[bundled_app(".bundle/**/gem.build_complete")]
         bundle "exec #{Gem.ruby} -S bundle install"
       end
     end
diff --git a/spec/bundler/commands/fund_spec.rb b/spec/bundler/commands/fund_spec.rb
index 5415b88eeb00e8..6f4e61da30d777 100644
--- a/spec/bundler/commands/fund_spec.rb
+++ b/spec/bundler/commands/fund_spec.rb
@@ -30,22 +30,22 @@
 
   it "prints fund information for all gems in the bundle" do
     install_gemfile <<-G
-      source "#{file_uri_for(gem_repo2)}"
+      source "https://gem.repo2"
       gem 'has_funding_and_other_metadata'
       gem 'has_funding'
-      gem 'rack-obama'
+      gem 'myrack-obama'
     G
 
     bundle "fund"
 
     expect(out).to include("* has_funding_and_other_metadata (1.0)\n  Funding: https://example.com/has_funding_and_other_metadata/funding")
     expect(out).to include("* has_funding (1.2.3)\n  Funding: https://example.com/has_funding/funding")
-    expect(out).to_not include("rack-obama")
+    expect(out).to_not include("myrack-obama")
   end
 
   it "does not consider fund information for gem dependencies" do
     install_gemfile <<-G
-      source "#{file_uri_for(gem_repo2)}"
+      source "https://gem.repo2"
       gem 'gem_with_dependent_funding'
     G
 
@@ -55,10 +55,46 @@
     expect(out).to_not include("gem_with_dependent_funding")
   end
 
+  it "does not consider fund information for uninstalled optional dependencies" do
+    install_gemfile <<-G
+      source "https://gem.repo2"
+      group :whatever, optional: true do
+        gem 'has_funding_and_other_metadata'
+      end
+      gem 'has_funding'
+      gem 'myrack-obama'
+    G
+
+    bundle "fund"
+
+    expect(out).to include("* has_funding (1.2.3)\n  Funding: https://example.com/has_funding/funding")
+    expect(out).to_not include("has_funding_and_other_metadata")
+    expect(out).to_not include("myrack-obama")
+  end
+
+  it "considers fund information for installed optional dependencies" do
+    bundle "config set with whatever"
+
+    install_gemfile <<-G
+      source "https://gem.repo2"
+      group :whatever, optional: true do
+        gem 'has_funding_and_other_metadata'
+      end
+      gem 'has_funding'
+      gem 'myrack-obama'
+    G
+
+    bundle "fund"
+
+    expect(out).to include("* has_funding_and_other_metadata (1.0)\n  Funding: https://example.com/has_funding_and_other_metadata/funding")
+    expect(out).to include("* has_funding (1.2.3)\n  Funding: https://example.com/has_funding/funding")
+    expect(out).to_not include("myrack-obama")
+  end
+
   it "prints message if none of the gems have fund information" do
     install_gemfile <<-G
-      source "#{file_uri_for(gem_repo2)}"
-      gem 'rack-obama'
+      source "https://gem.repo2"
+      gem 'myrack-obama'
     G
 
     bundle "fund"
@@ -69,7 +105,7 @@
   describe "with --group option" do
     it "prints fund message for only specified group gems" do
       install_gemfile <<-G
-      source "#{file_uri_for(gem_repo2)}"
+      source "https://gem.repo2"
         gem 'has_funding_and_other_metadata', :group => :development
         gem 'has_funding'
       G
diff --git a/spec/bundler/commands/help_spec.rb b/spec/bundler/commands/help_spec.rb
index 409c49f9e165d0..f9ad9fff143efc 100644
--- a/spec/bundler/commands/help_spec.rb
+++ b/spec/bundler/commands/help_spec.rb
@@ -15,6 +15,13 @@
     expect(out).to eq(%(["#{man_dir}/bundle-install.1"]))
   end
 
+  it "prexifes bundle commands with bundle- and resolves aliases when finding the man files" do
+    with_fake_man do
+      bundle "help package"
+    end
+    expect(out).to eq(%(["#{man_dir}/bundle-cache.1"]))
+  end
+
   it "simply outputs the human readable file when there is no man on the path" do
     with_path_as("") do
       bundle "help install"
@@ -22,11 +29,6 @@
     expect(out).to match(/bundle-install/)
   end
 
-  it "still outputs the old help for commands that do not have man pages yet" do
-    bundle "help fund"
-    expect(out).to include("Lists information about gems seeking funding assistance")
-  end
-
   it "looks for a binary and executes it with --help option if it's named bundler-<task>" do
     skip "Could not find command testtasks, probably because not a windows friendly executable" if Gem.win_platform?
 
@@ -71,7 +73,7 @@
 
   it "has helpful output when using --help flag for a non-existent command" do
     with_fake_man do
-      bundle "instill -h", :raise_on_error => false
+      bundle "instill -h", raise_on_error: false
     end
     expect(err).to include('Could not find command "instill".')
   end
diff --git a/spec/bundler/commands/info_spec.rb b/spec/bundler/commands/info_spec.rb
index 851f50240fd106..f403db684f4dcf 100644
--- a/spec/bundler/commands/info_spec.rb
+++ b/spec/bundler/commands/info_spec.rb
@@ -18,7 +18,7 @@
       end
 
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo2)}"
+        source "https://gem.repo2"
         gem "rails"
         gem "has_metadata"
         gem "thin"
@@ -56,40 +56,40 @@
       expect(out).to eq("2.3.2")
     end
 
-    it "doesn't claim that bundler has been deleted, even if using a custom path without bundler there" do
+    it "doesn't claim that bundler is missing, even if using a custom path without bundler there" do
       bundle "config set --local path vendor/bundle"
       bundle "install"
       bundle "info bundler"
       expect(out).to include("\tPath: #{root}")
-      expect(err).not_to match(/The gem bundler has been deleted/i)
+      expect(err).not_to match(/The gem bundler is missing/i)
     end
 
     it "complains if gem not in bundle" do
-      bundle "info missing", :raise_on_error => false
+      bundle "info missing", raise_on_error: false
       expect(err).to eq("Could not find gem 'missing'.")
     end
 
-    it "warns if path no longer exists on disk" do
-      FileUtils.rm_rf(default_bundle_path("gems", "rails-2.3.2"))
+    it "warns if path does not exist on disk, but specification is there" do
+      FileUtils.rm_r(default_bundle_path("gems", "rails-2.3.2"))
 
       bundle "info rails --path"
 
-      expect(err).to match(/The gem rails has been deleted/i)
-      expect(err).to match(default_bundle_path("gems", "rails-2.3.2").to_s)
+      expect(err).to include("The gem rails is missing.")
+      expect(err).to include(default_bundle_path("gems", "rails-2.3.2").to_s)
 
       bundle "info rail --path"
-      expect(err).to match(/The gem rails has been deleted/i)
-      expect(err).to match(default_bundle_path("gems", "rails-2.3.2").to_s)
+      expect(err).to include("The gem rails is missing.")
+      expect(err).to include(default_bundle_path("gems", "rails-2.3.2").to_s)
 
       bundle "info rails"
-      expect(err).to match(/The gem rails has been deleted/i)
-      expect(err).to match(default_bundle_path("gems", "rails-2.3.2").to_s)
+      expect(err).to include("The gem rails is missing.")
+      expect(err).to include(default_bundle_path("gems", "rails-2.3.2").to_s)
     end
 
-    context "given a default gem shippped in ruby", :ruby_repo do
+    context "given a default gem shipped in ruby", :ruby_repo do
       it "prints information about the default gem" do
-        bundle "info rdoc"
-        expect(out).to include("* rdoc")
+        bundle "info json"
+        expect(out).to include("* json")
         expect(out).to include("Default Gem: yes")
       end
     end
@@ -127,9 +127,9 @@
 
     context "when gem has a reverse dependency on any version" do
       it "prints the details" do
-        bundle "info rack"
+        bundle "info myrack"
 
-        expect(out).to include("Reverse Dependencies: \n\t\tthin (1.0) depends on rack (>= 0)")
+        expect(out).to include("Reverse Dependencies: \n\t\tthin (1.0) depends on myrack (>= 0)")
       end
     end
 
@@ -157,7 +157,7 @@
 
     it "prints out git info" do
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
+        source "https://gem.repo1"
         gem "foo", :git => "#{lib_path("foo-1.0")}"
       G
       expect(the_bundle).to include_gems "foo 1.0"
@@ -167,13 +167,13 @@
     end
 
     it "prints out branch names other than main" do
-      update_git "foo", :branch => "omg" do |s|
+      update_git "foo", branch: "omg" do |s|
         s.write "lib/foo.rb", "FOO = '1.0.omg'"
       end
       @revision = revision_for(lib_path("foo-1.0"))[0...6]
 
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
+        source "https://gem.repo1"
         gem "foo", :git => "#{lib_path("foo-1.0")}", :branch => "omg"
       G
       expect(the_bundle).to include_gems "foo 1.0.omg"
@@ -185,7 +185,7 @@
     it "doesn't print the branch when tied to a ref" do
       sha = revision_for(lib_path("foo-1.0"))
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
+        source "https://gem.repo1"
         gem "foo", :git => "#{lib_path("foo-1.0")}", :ref => "#{sha}"
       G
 
@@ -194,9 +194,9 @@
     end
 
     it "handles when a version is a '-' prerelease" do
-      @git = build_git("foo", "1.0.0-beta.1", :path => lib_path("foo"))
+      @git = build_git("foo", "1.0.0-beta.1", path: lib_path("foo"))
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
+        source "https://gem.repo1"
         gem "foo", "1.0.0-beta.1", :git => "#{lib_path("foo")}"
       G
       expect(the_bundle).to include_gems "foo 1.0.0.pre.beta.1"
@@ -209,26 +209,26 @@
   context "with a valid regexp for gem name" do
     it "presents alternatives", :readline do
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
-        gem "rack"
-        gem "rack-obama"
+        source "https://gem.repo1"
+        gem "myrack"
+        gem "myrack-obama"
       G
 
       bundle "info rac"
-      expect(out).to match(/\A1 : rack\n2 : rack-obama\n0 : - exit -(\n>.*)?\z/)
+      expect(out).to match(/\A1 : myrack\n2 : myrack-obama\n0 : - exit -(\n>|\z)/)
     end
   end
 
   context "with an invalid regexp for gem name" do
     it "does not find the gem" do
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
+        source "https://gem.repo1"
         gem "rails"
       G
 
       invalid_regexp = "[]"
 
-      bundle "info #{invalid_regexp}", :raise_on_error => false
+      bundle "info #{invalid_regexp}", raise_on_error: false
       expect(err).to include("Could not find gem '#{invalid_regexp}'.")
     end
   end
@@ -238,11 +238,11 @@
       bundle "config without test"
 
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
+        source "https://gem.repo1"
         gem "rails", group: :test
       G
 
-      bundle "info rails", :raise_on_error => false
+      bundle "info rails", raise_on_error: false
       expect(err).to include("Could not find gem 'rails', because it's in the group 'test', configured to be ignored.")
     end
   end
diff --git a/spec/bundler/commands/init_spec.rb b/spec/bundler/commands/init_spec.rb
index 6aa3e9edd19a3c..538e61fd47ee4e 100644
--- a/spec/bundler/commands/init_spec.rb
+++ b/spec/bundler/commands/init_spec.rb
@@ -24,7 +24,7 @@
 
     it "honours the current process umask when generating from a template" do
       FileUtils.mkdir(target_dir)
-      bundle :init, :dir => target_dir
+      bundle :init, dir: target_dir
       generated_mode = File.stat(File.join(target_dir, "Gemfile")).mode & 0o111
       expect(generated_mode).to be_zero
     end
@@ -32,17 +32,17 @@
 
   context "when a Gemfile already exists" do
     before do
-      create_file "Gemfile", <<-G
+      gemfile <<-G
         gem "rails"
       G
     end
 
     it "does not change existing Gemfiles" do
-      expect { bundle :init, :raise_on_error => false }.not_to change { File.read(bundled_app_gemfile) }
+      expect { bundle :init, raise_on_error: false }.not_to change { File.read(bundled_app_gemfile) }
     end
 
     it "notifies the user that an existing Gemfile already exists" do
-      bundle :init, :raise_on_error => false
+      bundle :init, raise_on_error: false
       expect(err).to include("Gemfile already exists")
     end
   end
@@ -55,7 +55,7 @@
 
       FileUtils.mkdir bundled_app(subdir)
 
-      bundle :init, :dir => bundled_app(subdir)
+      bundle :init, dir: bundled_app(subdir)
 
       expect(out).to include("Writing new Gemfile")
       expect(bundled_app("#{subdir}/Gemfile")).to be_file
@@ -71,7 +71,7 @@
       mode = File.stat(bundled_app(subdir)).mode ^ 0o222
       FileUtils.chmod mode, bundled_app(subdir)
 
-      bundle :init, :dir => bundled_app(subdir), :raise_on_error => false
+      bundle :init, dir: bundled_app(subdir), raise_on_error: false
 
       expect(err).to include("directory is not writable")
       expect(Dir[bundled_app("#{subdir}/*")]).to be_empty
@@ -79,24 +79,24 @@
   end
 
   context "given --gemspec option" do
-    let(:spec_file) { tmp.join("test.gemspec") }
+    let(:spec_file) { tmp("test.gemspec") }
 
     it "should generate from an existing gemspec" do
       File.open(spec_file, "w") do |file|
         file << <<-S
           Gem::Specification.new do |s|
           s.name = 'test'
-          s.add_dependency 'rack', '= 1.0.1'
+          s.add_dependency 'myrack', '= 1.0.1'
           s.add_development_dependency 'rspec', '1.2'
           end
         S
       end
 
-      bundle :init, :gemspec => spec_file
+      bundle :init, gemspec: spec_file
 
       gemfile = bundled_app_gemfile.read
       expect(gemfile).to match(%r{source 'https://rubygems.org'})
-      expect(gemfile.scan(/gem "rack", "= 1.0.1"/).size).to eq(1)
+      expect(gemfile.scan(/gem "myrack", "= 1.0.1"/).size).to eq(1)
       expect(gemfile.scan(/gem "rspec", "= 1.2"/).size).to eq(1)
       expect(gemfile.scan(/group :development/).size).to eq(1)
     end
@@ -112,7 +112,7 @@
           S
         end
 
-        bundle :init, :gemspec => spec_file, :raise_on_error => false
+        bundle :init, gemspec: spec_file, raise_on_error: false
         expect(err).to include("There was an error while loading `test.gemspec`")
       end
     end
@@ -129,17 +129,17 @@
 
     context "when gems.rb already exists" do
       before do
-        create_file("gems.rb", <<-G)
+        gemfile("gems.rb", <<-G)
           gem "rails"
         G
       end
 
       it "does not change existing Gemfiles" do
-        expect { bundle :init, :raise_on_error => false }.not_to change { File.read(bundled_app("gems.rb")) }
+        expect { bundle :init, raise_on_error: false }.not_to change { File.read(bundled_app("gems.rb")) }
       end
 
       it "notifies the user that an existing gems.rb already exists" do
-        bundle :init, :raise_on_error => false
+        bundle :init, raise_on_error: false
         expect(err).to include("gems.rb already exists")
       end
     end
@@ -152,7 +152,7 @@
 
         FileUtils.mkdir bundled_app(subdir)
 
-        bundle :init, :dir => bundled_app(subdir)
+        bundle :init, dir: bundled_app(subdir)
 
         expect(out).to include("Writing new gems.rb")
         expect(bundled_app("#{subdir}/gems.rb")).to be_file
@@ -160,14 +160,14 @@
     end
 
     context "given --gemspec option" do
-      let(:spec_file) { tmp.join("test.gemspec") }
+      let(:spec_file) { tmp("test.gemspec") }
 
       before do
         File.open(spec_file, "w") do |file|
           file << <<-S
             Gem::Specification.new do |s|
             s.name = 'test'
-            s.add_dependency 'rack', '= 1.0.1'
+            s.add_dependency 'myrack', '= 1.0.1'
             s.add_development_dependency 'rspec', '1.2'
             end
           S
@@ -175,17 +175,17 @@
       end
 
       it "should generate from an existing gemspec" do
-        bundle :init, :gemspec => spec_file
+        bundle :init, gemspec: spec_file
 
         gemfile = bundled_app("gems.rb").read
         expect(gemfile).to match(%r{source 'https://rubygems.org'})
-        expect(gemfile.scan(/gem "rack", "= 1.0.1"/).size).to eq(1)
+        expect(gemfile.scan(/gem "myrack", "= 1.0.1"/).size).to eq(1)
         expect(gemfile.scan(/gem "rspec", "= 1.2"/).size).to eq(1)
         expect(gemfile.scan(/group :development/).size).to eq(1)
       end
 
       it "prints message to user" do
-        bundle :init, :gemspec => spec_file
+        bundle :init, gemspec: spec_file
 
         expect(out).to include("Writing new gems.rb")
       end
@@ -196,7 +196,7 @@
     it "should use the --gemfile value to name the gemfile" do
       custom_gemfile_name = "NiceGemfileName"
 
-      bundle :init, :gemfile => custom_gemfile_name
+      bundle :init, gemfile: custom_gemfile_name
 
       expect(out).to include("Writing new #{custom_gemfile_name}")
       used_template = File.read("#{source_root}/lib/bundler/templates/Gemfile")
diff --git a/spec/bundler/commands/inject_spec.rb b/spec/bundler/commands/inject_spec.rb
index d711fe010d90f9..c39c2ae35bf600 100644
--- a/spec/bundler/commands/inject_spec.rb
+++ b/spec/bundler/commands/inject_spec.rb
@@ -1,18 +1,18 @@
 # frozen_string_literal: true
 
-RSpec.describe "bundle inject", :bundler => "< 3" do
+RSpec.describe "bundle inject" do
   before :each do
     gemfile <<-G
-      source "#{file_uri_for(gem_repo1)}"
-      gem "rack"
+      source "https://gem.repo1"
+      gem "myrack"
     G
   end
 
   context "without a lockfile" do
     it "locks with the injected gems" do
       expect(bundled_app_lock).not_to exist
-      bundle "inject 'rack-obama' '> 0'"
-      expect(bundled_app_lock.read).to match(/rack-obama/)
+      bundle "inject 'myrack-obama' '> 0'"
+      expect(bundled_app_lock.read).to match(/myrack-obama/)
     end
   end
 
@@ -22,28 +22,28 @@
     end
 
     it "adds the injected gems to the Gemfile" do
-      expect(bundled_app_gemfile.read).not_to match(/rack-obama/)
-      bundle "inject 'rack-obama' '> 0'"
-      expect(bundled_app_gemfile.read).to match(/rack-obama/)
+      expect(bundled_app_gemfile.read).not_to match(/myrack-obama/)
+      bundle "inject 'myrack-obama' '> 0'"
+      expect(bundled_app_gemfile.read).to match(/myrack-obama/)
     end
 
     it "locks with the injected gems" do
-      expect(bundled_app_lock.read).not_to match(/rack-obama/)
-      bundle "inject 'rack-obama' '> 0'"
-      expect(bundled_app_lock.read).to match(/rack-obama/)
+      expect(bundled_app_lock.read).not_to match(/myrack-obama/)
+      bundle "inject 'myrack-obama' '> 0'"
+      expect(bundled_app_lock.read).to match(/myrack-obama/)
     end
   end
 
   context "with injected gems already in the Gemfile" do
     it "doesn't add existing gems" do
-      bundle "inject 'rack' '> 0'", :raise_on_error => false
+      bundle "inject 'myrack' '> 0'", raise_on_error: false
       expect(err).to match(/cannot specify the same gem twice/i)
     end
   end
 
   context "incorrect arguments" do
     it "fails when more than 2 arguments are passed" do
-      bundle "inject gem_name 1 v", :raise_on_error => false
+      bundle "inject gem_name 1 v", raise_on_error: false
       expect(err).to eq(<<-E.strip)
 ERROR: "bundle inject" was called with arguments ["gem_name", "1", "v"]
 Usage: "bundle inject GEM VERSION"
@@ -53,25 +53,25 @@
 
   context "with source option" do
     it "add gem with source option in gemfile" do
-      bundle "inject 'foo' '>0' --source #{file_uri_for(gem_repo1)}"
+      bundle "inject 'foo' '>0' --source https://gem.repo1"
       gemfile = bundled_app_gemfile.read
-      str = "gem \"foo\", \"> 0\", :source => \"#{file_uri_for(gem_repo1)}\""
+      str = "gem \"foo\", \"> 0\", source: \"https://gem.repo1\""
       expect(gemfile).to include str
     end
   end
 
   context "with group option" do
     it "add gem with group option in gemfile" do
-      bundle "inject 'rack-obama' '>0' --group=development"
+      bundle "inject 'myrack-obama' '>0' --group=development"
       gemfile = bundled_app_gemfile.read
-      str = "gem \"rack-obama\", \"> 0\", :group => :development"
+      str = "gem \"myrack-obama\", \"> 0\", group: :development"
       expect(gemfile).to include str
     end
 
     it "add gem with multiple groups in gemfile" do
-      bundle "inject 'rack-obama' '>0' --group=development,test"
+      bundle "inject 'myrack-obama' '>0' --group=development,test"
       gemfile = bundled_app_gemfile.read
-      str = "gem \"rack-obama\", \"> 0\", :groups => [:development, :test]"
+      str = "gem \"myrack-obama\", \"> 0\", groups: [:development, :test]"
       expect(gemfile).to include str
     end
   end
@@ -79,39 +79,35 @@
   context "when frozen" do
     before do
       bundle "install"
-      if Bundler.feature_flag.bundler_3_mode?
-        bundle "config set --local deployment true"
-      else
-        bundle "config set --local frozen true"
-      end
+      bundle "config set --local frozen true"
     end
 
     it "injects anyway" do
-      bundle "inject 'rack-obama' '> 0'"
-      expect(bundled_app_gemfile.read).to match(/rack-obama/)
+      bundle "inject 'myrack-obama' '> 0'"
+      expect(bundled_app_gemfile.read).to match(/myrack-obama/)
     end
 
     it "locks with the injected gems" do
-      expect(bundled_app_lock.read).not_to match(/rack-obama/)
-      bundle "inject 'rack-obama' '> 0'"
-      expect(bundled_app_lock.read).to match(/rack-obama/)
+      expect(bundled_app_lock.read).not_to match(/myrack-obama/)
+      bundle "inject 'myrack-obama' '> 0'"
+      expect(bundled_app_lock.read).to match(/myrack-obama/)
     end
 
     it "restores frozen afterwards" do
-      bundle "inject 'rack-obama' '> 0'"
+      bundle "inject 'myrack-obama' '> 0'"
       config = Psych.load(bundled_app(".bundle/config").read)
       expect(config["BUNDLE_DEPLOYMENT"] || config["BUNDLE_FROZEN"]).to eq("true")
     end
 
     it "doesn't allow Gemfile changes" do
       gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
-        gem "rack-obama"
+        source "https://gem.repo1"
+        gem "myrack-obama"
       G
-      bundle "inject 'rack' '> 0'", :raise_on_error => false
+      bundle "inject 'myrack' '> 0'", raise_on_error: false
       expect(err).to match(/the lockfile can't be updated because frozen mode is set/)
 
-      expect(bundled_app_lock.read).not_to match(/rack-obama/)
+      expect(bundled_app_lock.read).not_to match(/myrack-obama/)
     end
   end
 end
diff --git a/spec/bundler/commands/install_spec.rb b/spec/bundler/commands/install_spec.rb
index 5271977ed95510..4a581b3058e76e 100644
--- a/spec/bundler/commands/install_spec.rb
+++ b/spec/bundler/commands/install_spec.rb
@@ -4,7 +4,7 @@
   describe "the simple case" do
     it "prints output and returns if no dependencies are specified" do
       gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
+        source "https://gem.repo1"
       G
 
       bundle :install
@@ -12,7 +12,7 @@
     end
 
     it "does not make a lockfile if the install fails" do
-      install_gemfile <<-G, :raise_on_error => false
+      install_gemfile <<-G, raise_on_error: false
         raise StandardError, "FAIL"
       G
 
@@ -22,17 +22,17 @@
 
     it "creates a Gemfile.lock" do
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
-        gem "rack"
+        source "https://gem.repo1"
+        gem "myrack"
       G
 
       expect(bundled_app_lock).to exist
     end
 
-    it "does not create ./.bundle by default", :bundler => "< 3" do
+    it "does not create ./.bundle by default" do
       gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
-        gem "rack"
+        source "https://gem.repo1"
+        gem "myrack"
       G
 
       bundle :install # can't use install_gemfile since it sets retry
@@ -41,18 +41,18 @@
 
     it "does not create ./.bundle by default when installing to system gems" do
       gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
-        gem "rack"
+        source "https://gem.repo1"
+        gem "myrack"
       G
 
-      bundle :install, :env => { "BUNDLE_PATH__SYSTEM" => "true" } # can't use install_gemfile since it sets retry
+      bundle :install, env: { "BUNDLE_PATH__SYSTEM" => "true" } # can't use install_gemfile since it sets retry
       expect(bundled_app(".bundle")).not_to exist
     end
 
-    it "creates lock files based on the Gemfile name" do
+    it "creates lockfiles based on the Gemfile name" do
       gemfile bundled_app("OmgFile"), <<-G
-        source "#{file_uri_for(gem_repo1)}"
-        gem "rack", "1.0"
+        source "https://gem.repo1"
+        gem "myrack", "1.0"
       G
 
       bundle "install --gemfile OmgFile"
@@ -62,13 +62,13 @@
 
     it "doesn't delete the lockfile if one already exists" do
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
-        gem 'rack'
+        source "https://gem.repo1"
+        gem 'myrack'
       G
 
       lockfile = File.read(bundled_app_lock)
 
-      install_gemfile <<-G, :raise_on_error => false
+      install_gemfile <<-G, raise_on_error: false
         raise StandardError, "FAIL"
       G
 
@@ -77,8 +77,8 @@
 
     it "does not touch the lockfile if nothing changed" do
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
-        gem "rack"
+        source "https://gem.repo1"
+        gem "myrack"
       G
 
       expect { run "1" }.not_to change { File.mtime(bundled_app_lock) }
@@ -86,60 +86,77 @@
 
     it "fetches gems" do
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
-        gem 'rack'
+        source "https://gem.repo1"
+        gem 'myrack'
       G
 
-      expect(default_bundle_path("gems/rack-1.0.0")).to exist
-      expect(the_bundle).to include_gems("rack 1.0.0")
+      expect(default_bundle_path("gems/myrack-1.0.0")).to exist
+      expect(the_bundle).to include_gems("myrack 1.0.0")
     end
 
     it "auto-heals missing gems" do
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
-        gem 'rack'
+        source "https://gem.repo1"
+        gem 'myrack'
       G
 
-      FileUtils.rm_rf(default_bundle_path("gems/rack-1.0.0"))
+      FileUtils.rm_r(default_bundle_path("gems/myrack-1.0.0"))
 
       bundle "install --verbose"
 
-      expect(out).to include("Installing rack 1.0.0")
-      expect(default_bundle_path("gems/rack-1.0.0")).to exist
-      expect(the_bundle).to include_gems("rack 1.0.0")
+      expect(out).to include("Installing myrack 1.0.0")
+      expect(default_bundle_path("gems/myrack-1.0.0")).to exist
+      expect(the_bundle).to include_gems("myrack 1.0.0")
+    end
+
+    it "does not state that it's constantly reinstalling empty gems" do
+      build_repo4 do
+        build_gem "empty", "1.0.0", no_default: true, allowed_warning: "no files specified"
+      end
+
+      install_gemfile <<~G
+        source "https://gem.repo4"
+
+        gem "empty"
+      G
+      gem_dir = default_bundle_path("gems/empty-1.0.0")
+      expect(gem_dir).to be_empty
+
+      bundle "install --verbose"
+      expect(out).not_to include("Installing empty")
     end
 
     it "fetches gems when multiple versions are specified" do
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
-        gem 'rack', "> 0.9", "< 1.0"
+        source "https://gem.repo1"
+        gem 'myrack', "> 0.9", "< 1.0"
       G
 
-      expect(default_bundle_path("gems/rack-0.9.1")).to exist
-      expect(the_bundle).to include_gems("rack 0.9.1")
+      expect(default_bundle_path("gems/myrack-0.9.1")).to exist
+      expect(the_bundle).to include_gems("myrack 0.9.1")
     end
 
     it "fetches gems when multiple versions are specified take 2" do
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
-        gem 'rack', "< 1.0", "> 0.9"
+        source "https://gem.repo1"
+        gem 'myrack', "< 1.0", "> 0.9"
       G
 
-      expect(default_bundle_path("gems/rack-0.9.1")).to exist
-      expect(the_bundle).to include_gems("rack 0.9.1")
+      expect(default_bundle_path("gems/myrack-0.9.1")).to exist
+      expect(the_bundle).to include_gems("myrack 0.9.1")
     end
 
     it "raises an appropriate error when gems are specified using symbols" do
-      install_gemfile <<-G, :raise_on_error => false
-        source "#{file_uri_for(gem_repo1)}"
-        gem :rack
+      install_gemfile <<-G, raise_on_error: false
+        source "https://gem.repo1"
+        gem :myrack
       G
       expect(exitstatus).to eq(4)
     end
 
     it "pulls in dependencies" do
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
+        source "https://gem.repo1"
         gem "rails"
       G
 
@@ -148,11 +165,11 @@
 
     it "does the right version" do
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
-        gem "rack", "0.9.1"
+        source "https://gem.repo1"
+        gem "myrack", "0.9.1"
       G
 
-      expect(the_bundle).to include_gems "rack 0.9.1"
+      expect(the_bundle).to include_gems "myrack 0.9.1"
     end
 
     it "does not install the development dependency" do
@@ -163,7 +180,7 @@
       end
 
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo2)}"
+        source "https://gem.repo2"
         gem "with_development_dependency"
       G
 
@@ -173,7 +190,7 @@
 
     it "resolves correctly" do
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
+        source "https://gem.repo1"
         gem "activemerchant"
         gem "rails"
       G
@@ -183,12 +200,12 @@
 
     it "activates gem correctly according to the resolved gems" do
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
+        source "https://gem.repo1"
         gem "activesupport", "2.3.5"
       G
 
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
+        source "https://gem.repo1"
         gem "activemerchant"
         gem "rails"
       G
@@ -197,7 +214,7 @@
     end
 
     it "does not reinstall any gem that is already available locally" do
-      system_gems "activesupport-2.3.2", :path => default_bundle_path
+      system_gems "activesupport-2.3.2", path: default_bundle_path
 
       build_repo2 do
         build_gem "activesupport", "2.3.2" do |s|
@@ -206,7 +223,7 @@
       end
 
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo2)}"
+        source "https://gem.repo2"
         gem "activerecord", "2.3.2"
       G
 
@@ -214,150 +231,177 @@
     end
 
     it "works when the gemfile specifies gems that only exist in the system" do
-      build_gem "foo", :to_bundle => true
+      build_gem "foo", to_bundle: true
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
-        gem "rack"
+        source "https://gem.repo1"
+        gem "myrack"
         gem "foo"
       G
 
-      expect(the_bundle).to include_gems "rack 1.0.0", "foo 1.0.0"
+      expect(the_bundle).to include_gems "myrack 1.0.0", "foo 1.0.0"
     end
 
     it "prioritizes local gems over remote gems" do
-      build_gem "rack", "1.0.0", :to_bundle => true do |s|
-        s.add_dependency "activesupport", "2.3.5"
-      end
+      build_gem "myrack", "9.0.0", to_bundle: true
 
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
-        gem "rack"
+        source "https://gem.repo1"
+        gem "myrack"
       G
 
-      expect(the_bundle).to include_gems "rack 1.0.0", "activesupport 2.3.5"
+      expect(the_bundle).to include_gems "myrack 9.0.0"
     end
 
     it "loads env plugins" do
       plugin_msg = "hello from an env plugin!"
       create_file "plugins/rubygems_plugin.rb", "puts '#{plugin_msg}'"
-      rubylib = ENV["RUBYLIB"].to_s.split(File::PATH_SEPARATOR).unshift(bundled_app("plugins").to_s).join(File::PATH_SEPARATOR)
-      install_gemfile <<-G, :env => { "RUBYLIB" => rubylib }
-        source "#{file_uri_for(gem_repo1)}"
-        gem "rack"
+      install_gemfile <<-G, env: { "RUBYLIB" => rubylib.unshift(bundled_app("plugins").to_s).join(File::PATH_SEPARATOR) }
+        source "https://gem.repo1"
+        gem "myrack"
       G
 
-      expect(last_command.stdboth).to include(plugin_msg)
+      expect(stdboth).to include(plugin_msg)
     end
 
     describe "with a gem that installs multiple platforms" do
       it "installs gems for the local platform as first choice" do
-        skip "version is 1.0, not 1.0.0" if Gem.win_platform?
+        simulate_platform "x86-darwin-100" do
+          install_gemfile <<-G
+            source "https://gem.repo1"
+            gem "platform_specific"
+          G
 
-        install_gemfile <<-G
-          source "#{file_uri_for(gem_repo1)}"
-          gem "platform_specific"
-        G
-
-        run "require 'platform_specific' ; puts PLATFORM_SPECIFIC"
-        expect(out).to eq("1.0.0 #{Bundler.local_platform}")
+          expect(the_bundle).to include_gems("platform_specific 1.0 x86-darwin-100")
+        end
       end
 
       it "falls back on plain ruby" do
-        simulate_platform "foo-bar-baz"
-        install_gemfile <<-G
-          source "#{file_uri_for(gem_repo1)}"
-          gem "platform_specific"
-        G
+        simulate_platform "foo-bar-baz" do
+          install_gemfile <<-G
+            source "https://gem.repo1"
+            gem "platform_specific"
+          G
 
-        run "require 'platform_specific' ; puts PLATFORM_SPECIFIC"
-        expect(out).to eq("1.0.0 RUBY")
+          expect(the_bundle).to include_gems("platform_specific 1.0 ruby")
+        end
       end
 
       it "installs gems for java" do
-        simulate_platform "java"
-        install_gemfile <<-G
-          source "#{file_uri_for(gem_repo1)}"
-          gem "platform_specific"
-        G
+        simulate_platform "java" do
+          install_gemfile <<-G
+            source "https://gem.repo1"
+            gem "platform_specific"
+          G
 
-        run "require 'platform_specific' ; puts PLATFORM_SPECIFIC"
-        expect(out).to eq("1.0.0 JAVA")
+          expect(the_bundle).to include_gems("platform_specific 1.0 java")
+        end
       end
 
       it "installs gems for windows" do
-        simulate_platform x86_mswin32
+        simulate_platform "x86-mswin32" do
+          install_gemfile <<-G
+            source "https://gem.repo1"
+            gem "platform_specific"
+          G
 
-        install_gemfile <<-G
-          source "#{file_uri_for(gem_repo1)}"
-          gem "platform_specific"
-        G
+          expect(the_bundle).to include_gems("platform_specific 1.0 x86-mswin32")
+        end
+      end
+
+      it "installs gems for aarch64-mingw-ucrt" do
+        simulate_platform "aarch64-mingw-ucrt" do
+          install_gemfile <<-G
+            source "https://gem.repo1"
+            gem "platform_specific"
+          G
+        end
 
-        run "require 'platform_specific' ; puts PLATFORM_SPECIFIC"
-        expect(out).to eq("1.0 x86-mswin32")
+        expect(out).to include("Installing platform_specific 1.0 (aarch64-mingw-ucrt)")
       end
     end
 
     describe "doing bundle install foo" do
       before do
         gemfile <<-G
-          source "#{file_uri_for(gem_repo1)}"
-          gem "rack"
+          source "https://gem.repo1"
+          gem "myrack"
         G
       end
 
       it "works" do
         bundle "config set --local path vendor"
         bundle "install"
-        expect(the_bundle).to include_gems "rack 1.0"
+        expect(the_bundle).to include_gems "myrack 1.0"
       end
 
-      it "allows running bundle install --system without deleting foo", :bundler => "< 3" do
+      it "allows running bundle install --system without deleting foo" do
         bundle "install --path vendor"
         bundle "install --system"
-        FileUtils.rm_rf(bundled_app("vendor"))
-        expect(the_bundle).to include_gems "rack 1.0"
+        FileUtils.rm_r(bundled_app("vendor"))
+        expect(the_bundle).to include_gems "myrack 1.0"
       end
 
-      it "allows running bundle install --system after deleting foo", :bundler => "< 3" do
+      it "allows running bundle install --system after deleting foo" do
         bundle "install --path vendor"
-        FileUtils.rm_rf(bundled_app("vendor"))
+        FileUtils.rm_r(bundled_app("vendor"))
         bundle "install --system"
-        expect(the_bundle).to include_gems "rack 1.0"
+        expect(the_bundle).to include_gems "myrack 1.0"
       end
     end
 
-    it "finds gems in multiple sources", :bundler => "< 3" do
+    it "finds gems in multiple sources" do
       build_repo2 do
-        build_gem "rack", "1.2" do |s|
-          s.executables = "rackup"
+        build_gem "myrack", "1.2" do |s|
+          s.executables = "myrackup"
         end
       end
 
-      install_gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
-        source "#{file_uri_for(gem_repo2)}"
+      install_gemfile <<-G, artifice: "compact_index_extra"
+        source "https://gemserver.test"
+        source "https://gemserver.test/extra"
 
         gem "activesupport", "1.2.3"
-        gem "rack", "1.2"
+        gem "myrack", "1.2"
       G
 
-      expect(the_bundle).to include_gems "rack 1.2", "activesupport 1.2.3"
+      expect(the_bundle).to include_gems "myrack 1.2", "activesupport 1.2.3"
     end
 
-    it "gives a useful error if no sources are set" do
-      install_gemfile <<-G, :raise_on_error => false
-        gem "rack"
+    it "gives useful errors if no global sources are set, and gems not installed locally, with and without a lockfile" do
+      install_gemfile <<-G, raise_on_error: false
+        gem "myrack"
       G
 
-      expect(err).to include("This Gemfile does not include an explicit global source. " \
-        "Not using an explicit global source may result in a different lockfile being generated depending on " \
-        "the gems you have installed locally before bundler is run. " \
-        "Instead, define a global source in your Gemfile like this: source \"https://rubygems.org\".")
+      expect(err).to eq("Could not find gem 'myrack' in locally installed gems.")
+
+      lockfile <<~L
+        GEM
+          specs:
+            myrack (1.0.0)
+
+        PLATFORMS
+          #{lockfile_platforms}
+
+        DEPENDENCIES
+          myrack
+
+        BUNDLED WITH
+           #{Bundler::VERSION}
+      L
+
+      bundle "install", raise_on_error: false
+
+      expect(err).to include(
+        "Because your Gemfile specifies no global remote source, your bundle is locked to " \
+        "myrack (1.0.0) from locally installed gems. However, myrack (1.0.0) is not installed. " \
+        "You'll need to either add a global remote source to your Gemfile or make sure myrack (1.0.0) " \
+        "is available locally before rerunning Bundler."
+      )
     end
 
     it "creates a Gemfile.lock on a blank Gemfile" do
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
+        source "https://gem.repo1"
       G
 
       expect(File.exist?(bundled_app_lock)).to eq(true)
@@ -367,12 +411,12 @@
       build_repo2
 
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo2)}"
-        gem "rack"
-        gem "rack"
+        source "https://gem.repo2"
+        gem "myrack"
+        gem "myrack"
       G
 
-      expect(err).to include("Your Gemfile lists the gem rack (>= 0) more than once.")
+      expect(err).to include("Your Gemfile lists the gem myrack (>= 0) more than once.")
       expect(err).to include("Remove any duplicate entries and specify the gem only once.")
       expect(err).to include("While it's not a problem now, it could cause errors if you change the version of one of them later.")
     end
@@ -381,12 +425,12 @@
       build_repo2
 
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo2)}"
-        gem "rack", "1.0"
-        gem "rack", "1.0"
+        source "https://gem.repo2"
+        gem "myrack", "1.0"
+        gem "myrack", "1.0"
       G
 
-      expect(err).to include("Your Gemfile lists the gem rack (= 1.0) more than once.")
+      expect(err).to include("Your Gemfile lists the gem myrack (= 1.0) more than once.")
       expect(err).to include("Remove any duplicate entries and specify the gem only once.")
       expect(err).to include("While it's not a problem now, it could cause errors if you change the version of one of them later.")
     end
@@ -395,20 +439,20 @@
       build_repo2
 
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo2)}"
-        gem "rack", :platform => :jruby
-        gem "rack"
+        source "https://gem.repo2"
+        gem "myrack", :platform => :jruby
+        gem "myrack"
       G
 
       bundle "install"
 
-      expect(err).to include("Your Gemfile lists the gem rack (>= 0) more than once.")
+      expect(err).to include("Your Gemfile lists the gem myrack (>= 0) more than once.")
       expect(err).to include("Remove any duplicate entries and specify the gem only once.")
       expect(err).to include("While it's not a problem now, it could cause errors if you change the version of one of them later.")
     end
 
     it "does not throw a warning if a gem is added once in Gemfile and also inside a gemspec as a development dependency" do
-      build_lib "my-gem", :path => bundled_app do |s|
+      build_lib "my-gem", path: bundled_app do |s|
         s.add_development_dependency "my-private-gem"
       end
 
@@ -417,7 +461,7 @@
       end
 
       gemfile <<~G
-        source "#{file_uri_for(gem_repo2)}"
+        source "https://gem.repo2"
 
         gemspec
 
@@ -430,45 +474,236 @@
       expect(the_bundle).to include_gems("my-private-gem 1.0")
     end
 
+    it "does not warn if a gem is added once in Gemfile and also inside a gemspec as a development dependency, with compatible requirements" do
+      build_lib "my-gem", path: bundled_app do |s|
+        s.add_development_dependency "rubocop", "~> 1.36.0"
+      end
+
+      build_repo4 do
+        build_gem "rubocop", "1.36.0"
+        build_gem "rubocop", "1.37.1"
+      end
+
+      gemfile <<~G
+        source "https://gem.repo4"
+
+        gemspec
+
+        gem "rubocop", group: :development
+      G
+
+      bundle :install
+
+      expect(err).to be_empty
+
+      expect(the_bundle).to include_gems("rubocop 1.36.0")
+    end
+
+    it "raises an error if a gem is added once in Gemfile and also inside a gemspec as a development dependency, with incompatible requirements" do
+      build_lib "my-gem", path: bundled_app do |s|
+        s.add_development_dependency "rubocop", "~> 1.36.0"
+      end
+
+      build_repo4 do
+        build_gem "rubocop", "1.36.0"
+        build_gem "rubocop", "1.37.1"
+      end
+
+      gemfile <<~G
+        source "https://gem.repo4"
+
+        gemspec
+
+        gem "rubocop", "~> 1.37.0", group: :development
+      G
+
+      bundle :install, raise_on_error: false
+
+      expect(err).to include("The rubocop dependency has conflicting requirements in Gemfile (~> 1.37.0) and gemspec (~> 1.36.0)")
+    end
+
+    it "includes the gem without warning if two gemspecs add it with the same requirement" do
+      gem1 = tmp("my-gem-1")
+      gem2 = tmp("my-gem-2")
+
+      build_lib "my-gem", path: gem1 do |s|
+        s.add_development_dependency "rubocop", "~> 1.36.0"
+      end
+
+      build_lib "my-gem-2", path: gem2 do |s|
+        s.add_development_dependency "rubocop", "~> 1.36.0"
+      end
+
+      build_repo4 do
+        build_gem "rubocop", "1.36.0"
+      end
+
+      gemfile <<~G
+        source "https://gem.repo4"
+
+        gemspec path: "#{gem1}"
+        gemspec path: "#{gem2}"
+      G
+
+      bundle :install
+
+      expect(err).to be_empty
+      expect(the_bundle).to include_gems("rubocop 1.36.0")
+    end
+
+    it "includes the gem without warning if two gemspecs add it with compatible requirements" do
+      gem1 = tmp("my-gem-1")
+      gem2 = tmp("my-gem-2")
+
+      build_lib "my-gem", path: gem1 do |s|
+        s.add_development_dependency "rubocop", "~> 1.0"
+      end
+
+      build_lib "my-gem-2", path: gem2 do |s|
+        s.add_development_dependency "rubocop", "~> 1.36.0"
+      end
+
+      build_repo4 do
+        build_gem "rubocop", "1.36.0"
+      end
+
+      gemfile <<~G
+        source "https://gem.repo4"
+
+        gemspec path: "#{gem1}"
+        gemspec path: "#{gem2}"
+      G
+
+      bundle :install
+
+      expect(err).to be_empty
+      expect(the_bundle).to include_gems("rubocop 1.36.0")
+    end
+
+    it "errors out if two gemspecs add it with incompatible requirements" do
+      gem1 = tmp("my-gem-1")
+      gem2 = tmp("my-gem-2")
+
+      build_lib "my-gem", path: gem1 do |s|
+        s.add_development_dependency "rubocop", "~> 2.0"
+      end
+
+      build_lib "my-gem-2", path: gem2 do |s|
+        s.add_development_dependency "rubocop", "~> 1.36.0"
+      end
+
+      build_repo4 do
+        build_gem "rubocop", "1.36.0"
+      end
+
+      gemfile <<~G
+        source "https://gem.repo4"
+
+        gemspec path: "#{gem1}"
+        gemspec path: "#{gem2}"
+      G
+
+      bundle :install, raise_on_error: false
+
+      expect(err).to include("Two gemspec development dependencies have conflicting requirements on the same gem: rubocop (~> 1.36.0) and rubocop (~> 2.0). Bundler cannot continue.")
+    end
+
+    it "does not warn if a gem is added once in Gemfile and also inside a gemspec as a development dependency, with same requirements, and different sources" do
+      build_lib "my-gem", path: bundled_app do |s|
+        s.add_development_dependency "activesupport"
+      end
+
+      build_repo4 do
+        build_gem "activesupport"
+      end
+
+      build_git "activesupport", "1.0", path: lib_path("activesupport")
+
+      install_gemfile <<~G
+        source "https://gem.repo4"
+
+        gemspec
+
+        gem "activesupport", :git => "#{lib_path("activesupport")}"
+      G
+
+      expect(err).to be_empty
+      expect(the_bundle).to include_gems "activesupport 1.0", source: "git@#{lib_path("activesupport")}"
+
+      # if the Gemfile dependency is specified first
+      install_gemfile <<~G
+        source "https://gem.repo4"
+
+        gem "activesupport", :git => "#{lib_path("activesupport")}"
+
+        gemspec
+      G
+
+      expect(err).to be_empty
+      expect(the_bundle).to include_gems "activesupport 1.0", source: "git@#{lib_path("activesupport")}"
+    end
+
+    it "considers both dependencies for resolution if a gem is added once in Gemfile and also inside a local gemspec as a runtime dependency, with different requirements" do
+      build_lib "my-gem", path: bundled_app do |s|
+        s.add_dependency "rubocop", "~> 1.36.0"
+      end
+
+      build_repo4 do
+        build_gem "rubocop", "1.36.0"
+        build_gem "rubocop", "1.37.1"
+      end
+
+      gemfile <<~G
+        source "https://gem.repo4"
+
+        gemspec
+
+        gem "rubocop"
+      G
+
+      bundle :install
+
+      expect(err).to be_empty
+      expect(the_bundle).to include_gems("rubocop 1.36.0")
+    end
+
     it "throws an error if a gem is added twice in Gemfile when version of one dependency is not specified" do
-      install_gemfile <<-G, :raise_on_error => false
-        source "#{file_uri_for(gem_repo2)}"
-        gem "rack"
-        gem "rack", "1.0"
+      install_gemfile <<-G, raise_on_error: false
+        source "https://gem.repo2"
+        gem "myrack"
+        gem "myrack", "1.0"
       G
 
       expect(err).to include("You cannot specify the same gem twice with different version requirements")
-      expect(err).to include("You specified: rack (>= 0) and rack (= 1.0).")
+      expect(err).to include("You specified: myrack (>= 0) and myrack (= 1.0).")
     end
 
     it "throws an error if a gem is added twice in Gemfile when different versions of both dependencies are specified" do
-      install_gemfile <<-G, :raise_on_error => false
-        source "#{file_uri_for(gem_repo2)}"
-        gem "rack", "1.0"
-        gem "rack", "1.1"
+      install_gemfile <<-G, raise_on_error: false
+        source "https://gem.repo2"
+        gem "myrack", "1.0"
+        gem "myrack", "1.1"
       G
 
       expect(err).to include("You cannot specify the same gem twice with different version requirements")
-      expect(err).to include("You specified: rack (= 1.0) and rack (= 1.1).")
+      expect(err).to include("You specified: myrack (= 1.0) and myrack (= 1.1).")
     end
 
     it "gracefully handles error when rubygems server is unavailable" do
-      skip "networking issue" if Gem.win_platform?
-
-      install_gemfile <<-G, :artifice => nil, :raise_on_error => false
-        source "#{file_uri_for(gem_repo1)}"
+      install_gemfile <<-G, artifice: nil, raise_on_error: false
+        source "https://gem.repo1"
         source "http://0.0.0.0:9384" do
           gem 'foo'
         end
       G
 
-      expect(err).to include("Could not fetch specs from http://0.0.0.0:9384/")
+      expect(err).to eq("Could not reach host 0.0.0.0:9384. Check your network connection and try again.")
       expect(err).not_to include("file://")
     end
 
     it "fails gracefully when downloading an invalid specification from the full index" do
-      build_repo2 do
-        build_gem "ajp-rails", "0.0.0", :gemspec => false, :skip_validation => true do |s|
+      build_repo2(build_compact_index: false) do
+        build_gem "ajp-rails", "0.0.0", gemspec: false, skip_validation: true do |s|
           bad_deps = [["ruby-ajp", ">= 0.2.0"], ["rails", ">= 0.14"]]
           s.
             instance_variable_get(:@spec).
@@ -479,13 +714,13 @@
         build_gem "ruby-ajp", "1.0.0"
       end
 
-      install_gemfile <<-G, :full_index => true, :raise_on_error => false
-        source "#{file_uri_for(gem_repo2)}"
+      install_gemfile <<-G, full_index: true, raise_on_error: false
+        source "https://gem.repo2"
 
         gem "ajp-rails", "0.0.0"
       G
 
-      expect(last_command.stdboth).not_to match(/Error Report/i)
+      expect(stdboth).not_to match(/Error Report/i)
       expect(err).to include("An error occurred while installing ajp-rails (0.0.0), and Bundler cannot continue.").
         and include("Bundler::APIResponseInvalidDependenciesError")
     end
@@ -495,7 +730,7 @@
       FileUtils.touch(bundled_app(".bundle/config"))
 
       install_gemfile(<<-G)
-        source "#{file_uri_for(gem_repo1)}"
+        source "https://gem.repo1"
 
         gem 'foo'
       G
@@ -506,7 +741,7 @@
       FileUtils.touch("#{Bundler.rubygems.user_home}/.bundle/config")
 
       install_gemfile(<<-G)
-        source "#{file_uri_for(gem_repo1)}"
+        source "https://gem.repo1"
 
         gem 'foo'
       G
@@ -516,9 +751,9 @@
   describe "Ruby version in Gemfile.lock" do
     context "and using an unsupported Ruby version" do
       it "prints an error" do
-        install_gemfile <<-G, :raise_on_error => false
+        install_gemfile <<-G, raise_on_error: false
           ruby '~> 1.2'
-          source "#{file_uri_for(gem_repo1)}"
+          source "https://gem.repo1"
         G
         expect(err).to include("Your Ruby version is #{Gem.ruby_version}, but your Gemfile specified ~> 1.2")
       end
@@ -528,21 +763,22 @@
       before do
         install_gemfile <<-G
           ruby '~> #{Gem.ruby_version}'
-          source "#{file_uri_for(gem_repo1)}"
+          source "https://gem.repo1"
         G
       end
 
       it "writes current Ruby version to Gemfile.lock" do
+        checksums = checksums_section_when_enabled
         expect(lockfile).to eq <<~L
          GEM
-           remote: #{file_uri_for(gem_repo1)}/
+           remote: https://gem.repo1/
            specs:
 
          PLATFORMS
            #{lockfile_platforms}
 
          DEPENDENCIES
-
+         #{checksums}
          RUBY VERSION
             #{Bundler::RubyVersion.system}
 
@@ -554,19 +790,21 @@
       it "updates Gemfile.lock with updated yet still compatible ruby version" do
         install_gemfile <<-G
           ruby '~> #{current_ruby_minor}'
-          source "#{file_uri_for(gem_repo1)}"
+          source "https://gem.repo1"
         G
 
+        checksums = checksums_section_when_enabled
+
         expect(lockfile).to eq <<~L
          GEM
-           remote: #{file_uri_for(gem_repo1)}/
+           remote: https://gem.repo1/
            specs:
 
          PLATFORMS
            #{lockfile_platforms}
 
          DEPENDENCIES
-
+         #{checksums}
          RUBY VERSION
             #{Bundler::RubyVersion.system}
 
@@ -577,7 +815,7 @@
 
       it "does not crash when unlocking" do
         gemfile <<-G
-          source "#{file_uri_for(gem_repo1)}"
+          source "https://gem.repo1"
           ruby '>= 2.1.0'
         G
 
@@ -596,14 +834,14 @@
 
       build_lib "foo"
       gemfile = <<-G
-        source "#{file_uri_for(gem_repo1)}"
+        source "https://gem.repo1"
         gem 'foo', :path => "#{lib_path("foo-1.0")}"
       G
       File.open("#{root_dir}/Gemfile", "w") do |file|
         file.puts gemfile
       end
 
-      bundle :install, :dir => root_dir
+      bundle :install, dir: root_dir
     end
 
     it "doesn't blow up when using the `gemspec` DSL" do
@@ -611,16 +849,16 @@
 
       FileUtils.mkdir_p(root_dir)
 
-      build_lib "foo", :path => root_dir
+      build_lib "foo", path: root_dir
       gemfile = <<-G
-        source "#{file_uri_for(gem_repo1)}"
+        source "https://gem.repo1"
         gemspec
       G
       File.open("#{root_dir}/Gemfile", "w") do |file|
         file.puts gemfile
       end
 
-      bundle :install, :dir => root_dir
+      bundle :install, dir: root_dir
     end
   end
 
@@ -629,11 +867,11 @@
       bundle "config set force_ruby_platform true"
 
       gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
-        gem 'rack'
+        source "https://gem.repo1"
+        gem 'myrack'
       G
 
-      bundle :install, :quiet => true
+      bundle :install, quiet: true
       expect(out).to be_empty
       expect(err).to be_empty
     end
@@ -659,25 +897,25 @@ def run
       RUBY
 
       gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
+        source "https://gem.repo1"
         gem 'non-existing-gem'
       G
 
-      bundle :install, :quiet => true, :raise_on_error => false, :env => { "RUBYOPT" => "-r#{bundled_app("install_with_warning.rb")}" }
+      bundle :install, quiet: true, raise_on_error: false, env: { "RUBYOPT" => "-r#{bundled_app("install_with_warning.rb")}" }
       expect(out).to be_empty
       expect(err).to include("Could not find gem 'non-existing-gem'")
       expect(err).to include("BOOOOO")
     end
   end
 
-  describe "when bundle path does not have write access", :permissions do
+  describe "when bundle path does not have cd permission", :permissions do
     let(:bundle_path) { bundled_app("vendor") }
 
     before do
       FileUtils.mkdir_p(bundle_path)
       gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
-        gem 'rack'
+        source "https://gem.repo1"
+        gem 'myrack'
       G
     end
 
@@ -685,20 +923,20 @@ def run
       FileUtils.chmod(0o500, bundle_path)
 
       bundle "config set --local path vendor"
-      bundle :install, :raise_on_error => false
+      bundle :install, raise_on_error: false
       expect(err).to include(bundle_path.to_s)
-      expect(err).to include("grant write permissions")
+      expect(err).to include("grant executable permissions")
     end
   end
 
-  describe "when bundle gems path does not have write access", :permissions do
+  describe "when bundle gems path does not have cd permission", :permissions do
     let(:gems_path) { bundled_app("vendor/#{Bundler.ruby_scope}/gems") }
 
     before do
       FileUtils.mkdir_p(gems_path)
       gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
-        gem 'rack'
+        source "https://gem.repo1"
+        gem 'myrack'
       G
     end
 
@@ -707,7 +945,7 @@ def run
       bundle "config set --local path vendor"
 
       begin
-        bundle :install, :raise_on_error => false
+        bundle :install, raise_on_error: false
       ensure
         FileUtils.chmod("+x", gems_path)
       end
@@ -715,19 +953,109 @@ def run
       expect(err).not_to include("ERROR REPORT TEMPLATE")
 
       expect(err).to include(
-        "There was an error while trying to create `#{gems_path.join("rack-1.0.0")}`. " \
+        "There was an error while trying to create `#{gems_path.join("myrack-1.0.0")}`. " \
         "It is likely that you need to grant executable permissions for all parent directories and write permissions for `#{gems_path}`."
       )
     end
   end
 
+  describe "when there's an empty install folder (like with default gems) without cd permissions", :permissions do
+    let(:full_gem_path) { bundled_app("vendor/#{Bundler.ruby_scope}/gems/myrack-1.0.0") }
+
+    before do
+      FileUtils.mkdir_p(full_gem_path)
+      gemfile <<-G
+        source "https://gem.repo1"
+        gem 'myrack'
+      G
+    end
+
+    it "should display a proper message to explain the problem" do
+      FileUtils.chmod("-x", full_gem_path)
+      bundle "config set --local path vendor"
+
+      begin
+        bundle :install, raise_on_error: false
+      ensure
+        FileUtils.chmod("+x", full_gem_path)
+      end
+
+      expect(err).not_to include("ERROR REPORT TEMPLATE")
+
+      expect(err).to include(
+        "There was an error while trying to write to `#{full_gem_path}`. " \
+        "It is likely that you need to grant write permissions for that path."
+      )
+    end
+  end
+
+  describe "when bundle bin dir does not have cd permission", :permissions do
+    let(:bin_dir) { bundled_app("vendor/#{Bundler.ruby_scope}/bin") }
+
+    before do
+      FileUtils.mkdir_p(bin_dir)
+      gemfile <<-G
+        source "https://gem.repo1"
+        gem 'myrack'
+      G
+    end
+
+    it "should display a proper message to explain the problem" do
+      FileUtils.chmod("-x", bin_dir)
+      bundle "config set --local path vendor"
+
+      begin
+        bundle :install, raise_on_error: false
+      ensure
+        FileUtils.chmod("+x", bin_dir)
+      end
+
+      expect(err).not_to include("ERROR REPORT TEMPLATE")
+
+      expect(err).to include(
+        "There was an error while trying to write to `#{bin_dir}`. " \
+        "It is likely that you need to grant write permissions for that path."
+      )
+    end
+  end
+
+  describe "when bundle bin dir does not have write access", :permissions do
+    let(:bin_dir) { bundled_app("vendor/#{Bundler.ruby_scope}/bin") }
+
+    before do
+      FileUtils.mkdir_p(bin_dir)
+      gemfile <<-G
+        source "https://gem.repo1"
+        gem "myrack"
+      G
+    end
+
+    it "should display a proper message to explain the problem" do
+      FileUtils.chmod("-w", bin_dir)
+      bundle "config set --local path vendor"
+
+      begin
+        bundle :install, raise_on_error: false
+      ensure
+        FileUtils.chmod("+w", bin_dir)
+      end
+
+      expect(err).not_to include("ERROR REPORT TEMPLATE")
+
+      expect(err).to include(
+        "There was an error while trying to write to `#{bin_dir}`. " \
+        "It is likely that you need to grant write permissions for that path."
+      )
+    end
+  end
+
   describe "when bundle extensions path does not have write access", :permissions do
     let(:extensions_path) { bundled_app("vendor/#{Bundler.ruby_scope}/extensions/#{Gem::Platform.local}/#{Gem.extension_api_version}") }
 
     before do
       FileUtils.mkdir_p(extensions_path)
       gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
+        source "https://gem.repo1"
         gem 'simple_binary'
       G
     end
@@ -737,7 +1065,7 @@ def run
       bundle "config set --local path vendor"
 
       begin
-        bundle :install, :raise_on_error => false
+        bundle :install, raise_on_error: false
       ensure
         FileUtils.chmod("+x", extensions_path)
       end
@@ -751,7 +1079,7 @@ def run
     end
   end
 
-  describe "when the path of a specific gem is not writable", :permissions do
+  describe "when the path of a specific gem does not have cd permission", :permissions do
     let(:gems_path) { bundled_app("vendor/#{Bundler.ruby_scope}/gems") }
     let(:foo_path) { gems_path.join("foo-1.0.0") }
 
@@ -763,7 +1091,7 @@ def run
       end
 
       gemfile <<-G
-        source "#{file_uri_for(gem_repo4)}"
+        source "https://gem.repo4"
         gem 'foo'
       G
     end
@@ -777,7 +1105,7 @@ def run
       FileUtils.chmod("-x", foo_path)
 
       begin
-        bundle "install --redownload", :raise_on_error => false
+        bundle "install --redownload", raise_on_error: false
       ensure
         FileUtils.chmod("+x", foo_path)
       end
@@ -788,40 +1116,185 @@ def run
     end
   end
 
-  describe "when bundle cache path does not have write access", :permissions do
-    let(:cache_path) { bundled_app("vendor/#{Bundler.ruby_scope}/cache") }
+  describe "when gem home does not have the writable bit set, yet it's still writable", :permissions do
+    let(:gem_home) { bundled_app("vendor/#{Bundler.ruby_scope}") }
 
     before do
-      FileUtils.mkdir_p(cache_path)
+      build_repo4 do
+        build_gem "foo", "1.0.0" do |s|
+          s.write "CHANGELOG.md", "foo"
+        end
+      end
+
       gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
-        gem 'rack'
+        source "https://gem.repo4"
+        gem 'foo'
       G
     end
 
-    it "should display a proper message to explain the problem" do
-      FileUtils.chmod(0o500, cache_path)
-
+    it "should still work" do
       bundle "config set --local path vendor"
-      bundle :install, :raise_on_error => false
-      expect(err).to include(cache_path.to_s)
-      expect(err).to include("grant write permissions")
-    end
-  end
+      bundle :install
+      expect(out).to include("Bundle complete!")
+      expect(err).to be_empty
+
+      FileUtils.chmod("-w", gem_home)
+
+      begin
+        bundle "install --redownload"
+      ensure
+        FileUtils.chmod("+w", gem_home)
+      end
+
+      expect(out).to include("Bundle complete!")
+      expect(err).to be_empty
+    end
+  end
+
+  describe "when gems path is world writable (no sticky bit set)", :permissions do
+    let(:gems_path) { bundled_app("vendor/#{Bundler.ruby_scope}/gems") }
+
+    before do
+      build_repo4 do
+        build_gem "foo", "1.0.0" do |s|
+          s.write "CHANGELOG.md", "foo"
+        end
+      end
+
+      gemfile <<-G
+        source "https://gem.repo4"
+        gem 'foo'
+      G
+    end
+
+    it "should display a proper message to explain the problem" do
+      bundle "config set --local path vendor"
+      bundle :install
+      expect(out).to include("Bundle complete!")
+      expect(err).to be_empty
+
+      FileUtils.chmod(0o777, gems_path)
+
+      bundle "install --redownload", raise_on_error: false
+
+      expect(err).to include("Bundler cannot reinstall foo-1.0.0 because there's a previous installation of it at #{gems_path}/foo-1.0.0 that is unsafe to remove")
+    end
+  end
+
+  describe "when gems path is world writable (no sticky bit set), but previous install is just an empty dir (like it happens with default gems)", :permissions do
+    let(:gems_path) { bundled_app("vendor/#{Bundler.ruby_scope}/gems") }
+    let(:full_path) { gems_path.join("foo-1.0.0") }
+
+    before do
+      build_repo4 do
+        build_gem "foo", "1.0.0" do |s|
+          s.write "CHANGELOG.md", "foo"
+        end
+      end
+
+      gemfile <<-G
+        source "https://gem.repo4"
+        gem 'foo'
+      G
+    end
+
+    it "does not try to remove the directory and thus don't abort with an error about unsafe directory removal" do
+      bundle "config set --local path vendor"
+
+      FileUtils.mkdir_p(gems_path)
+      FileUtils.chmod(0o777, gems_path)
+      Dir.mkdir(full_path)
+
+      bundle "install"
+    end
+  end
+
+  describe "when bundle cache path does not have write access", :permissions do
+    let(:cache_path) { bundled_app("vendor/#{Bundler.ruby_scope}/cache") }
+
+    before do
+      FileUtils.mkdir_p(cache_path)
+      gemfile <<-G
+        source "https://gem.repo1"
+        gem 'myrack'
+      G
+    end
+
+    it "should display a proper message to explain the problem" do
+      FileUtils.chmod(0o500, cache_path)
+
+      bundle "config set --local path vendor"
+      bundle :install, raise_on_error: false
+      expect(err).to include(cache_path.to_s)
+      expect(err).to include("grant write permissions")
+    end
+  end
+
+  describe "when gemspecs are unreadable", :permissions do
+    let(:gemspec_path) { vendored_gems("specifications/myrack-1.0.0.gemspec") }
+
+    before do
+      gemfile <<~G
+        source "https://gem.repo1"
+        gem 'myrack'
+      G
+      bundle "config path vendor/bundle"
+      bundle :install
+      expect(out).to include("Bundle complete!")
+      expect(err).to be_empty
+
+      FileUtils.chmod("-r", gemspec_path)
+    end
+
+    it "shows a good error" do
+      bundle :install, raise_on_error: false
+      expect(err).to include(gemspec_path.to_s)
+      expect(err).to include("grant read permissions")
+    end
+  end
+
+  describe "when configured path is UTF-8 and a file inside a gem package too" do
+    let(:app_path) do
+      path = tmp("♥")
+      FileUtils.mkdir_p(path)
+      path
+    end
+
+    let(:path) do
+      root.join("vendor/bundle")
+    end
+
+    before do
+      build_repo4 do
+        build_gem "mygem" do |s|
+          s.write "spec/fixtures/_posts/2016-04-01-错误.html"
+        end
+      end
+    end
+
+    it "works" do
+      bundle "config path #{app_path}/vendor/bundle", dir: app_path
+
+      install_gemfile app_path.join("Gemfile"),<<~G, dir: app_path
+        source "https://gem.repo4"
+        gem "mygem", "1.0"
+      G
+    end
+  end
 
   context "after installing with --standalone" do
     before do
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
-        gem "rack"
+        source "https://gem.repo1"
+        gem "myrack"
       G
       bundle "config set --local path bundle"
-      bundle "install", :standalone => true
+      bundle "install", standalone: true
     end
 
     it "includes the standalone path" do
-      bundle "binstubs rack", :standalone => true
-      standalone_line = File.read(bundled_app("bin/rackup")).each_line.find {|line| line.include? "$:.unshift" }.strip
+      bundle "binstubs myrack", standalone: true
+      standalone_line = File.read(bundled_app("bin/myrackup")).each_line.find {|line| line.include? "$:.unshift" }.strip
       expect(standalone_line).to eq %($:.unshift File.expand_path "../bundle", __dir__)
     end
   end
@@ -835,30 +1308,34 @@ def run
     end
 
     it "should display a helpful message explaining how to fix it" do
-      bundle :install, :env => { "BUNDLE_RUBYGEMS__ORG" => "user:pass{word" }, :raise_on_error => false
+      bundle :install, env: { "BUNDLE_RUBYGEMS__ORG" => "user:pass{word" }, raise_on_error: false
       expect(exitstatus).to eq(17)
       expect(err).to eq("Please CGI escape your usernames and passwords before " \
                         "setting them for authentication.")
     end
   end
 
-  context "in a frozen bundle" do
-    before do
+  context "when current platform not included in the lockfile" do
+    around do |example|
       build_repo4 do
         build_gem "libv8", "8.4.255.0" do |s|
           s.platform = "x86_64-darwin-19"
         end
+
+        build_gem "libv8", "8.4.255.0" do |s|
+          s.platform = "x86_64-linux"
+        end
       end
 
       gemfile <<-G
-        source "#{file_uri_for(gem_repo4)}"
+        source "https://gem.repo4"
 
         gem "libv8"
       G
 
       lockfile <<-L
         GEM
-          remote: #{file_uri_for(gem_repo4)}/
+          remote: https://gem.repo4/
           specs:
             libv8 (8.4.255.0-x86_64-darwin-19)
 
@@ -872,11 +1349,37 @@ def run
            #{Bundler::VERSION}
       L
 
-      bundle "config set --local deployment true"
+      simulate_platform("x86_64-linux", &example)
+    end
+
+    it "adds the current platform to the lockfile" do
+      bundle "install --verbose"
+
+      expect(out).to include("re-resolving dependencies because your lockfile is missing the current platform")
+      expect(out).not_to include("you are adding a new platform to your lockfile")
+
+      expect(lockfile).to eq <<~L
+        GEM
+          remote: https://gem.repo4/
+          specs:
+            libv8 (8.4.255.0-x86_64-darwin-19)
+            libv8 (8.4.255.0-x86_64-linux)
+
+        PLATFORMS
+          x86_64-darwin-19
+          x86_64-linux
+
+        DEPENDENCIES
+          libv8
+
+        BUNDLED WITH
+           #{Bundler::VERSION}
+      L
     end
 
-    it "should fail loudly if the lockfile platforms don't include the current platform" do
-      simulate_platform(Gem::Platform.new("x86_64-linux")) { bundle "install", :raise_on_error => false }
+    it "fails loudly if frozen mode set" do
+      bundle "config set --local deployment true"
+      bundle "install", raise_on_error: false
 
       expect(err).to eq(
         "Your bundle only supports platforms [\"x86_64-darwin-19\"] but your local platform is x86_64-linux. " \
@@ -888,23 +1391,23 @@ def run
   context "with missing platform specific gems in lockfile" do
     before do
       build_repo4 do
-        build_gem "racc", "1.5.2"
+        build_gem "racca", "1.5.2"
 
         build_gem "nokogiri", "1.12.4" do |s|
           s.platform = "x86_64-darwin"
-          s.add_runtime_dependency "racc", "~> 1.4"
+          s.add_dependency "racca", "~> 1.4"
         end
 
         build_gem "nokogiri", "1.12.4" do |s|
           s.platform = "x86_64-linux"
-          s.add_runtime_dependency "racc", "~> 1.4"
+          s.add_dependency "racca", "~> 1.4"
         end
 
         build_gem "crass", "1.0.6"
 
         build_gem "loofah", "2.12.0" do |s|
-          s.add_runtime_dependency "crass", "~> 1.0.2"
-          s.add_runtime_dependency "nokogiri", ">= 1.5.9"
+          s.add_dependency "crass", "~> 1.0.2"
+          s.add_dependency "nokogiri", ">= 1.5.9"
         end
       end
 
@@ -916,6 +1419,13 @@ def run
         gem "loofah", "~> 2.12.0"
       G
 
+      checksums = checksums_section do |c|
+        c.checksum gem_repo4, "crass", "1.0.6"
+        c.checksum gem_repo4, "loofah", "2.12.0"
+        c.checksum gem_repo4, "nokogiri", "1.12.4", "x86_64-darwin"
+        c.checksum gem_repo4, "racca", "1.5.2"
+      end
+
       lockfile <<-L
         GEM
           remote: https://gem.repo4/
@@ -925,8 +1435,8 @@ def run
               crass (~> 1.0.2)
               nokogiri (>= 1.5.9)
             nokogiri (1.12.4-x86_64-darwin)
-              racc (~> 1.4)
-            racc (1.5.2)
+              racca (~> 1.4)
+            racca (1.5.2)
 
         PLATFORMS
           x86_64-darwin-20
@@ -934,7 +1444,7 @@ def run
 
         DEPENDENCIES
           loofah (~> 2.12.0)
-
+        #{checksums}
         RUBY VERSION
            #{Bundler::RubyVersion.system}
 
@@ -947,7 +1457,15 @@ def run
       bundle "config set --local path vendor/bundle"
 
       simulate_platform "x86_64-linux" do
-        bundle "install", :artifice => "compact_index"
+        bundle "install", artifice: "compact_index"
+      end
+
+      checksums = checksums_section_when_enabled do |c|
+        c.checksum gem_repo4, "crass", "1.0.6"
+        c.checksum gem_repo4, "loofah", "2.12.0"
+        c.checksum gem_repo4, "nokogiri", "1.12.4", "x86_64-darwin"
+        c.checksum gem_repo4, "racca", "1.5.2"
+        c.checksum gem_repo4, "nokogiri", "1.12.4", "x86_64-linux"
       end
 
       expect(lockfile).to eq <<~L
@@ -959,10 +1477,10 @@ def run
               crass (~> 1.0.2)
               nokogiri (>= 1.5.9)
             nokogiri (1.12.4-x86_64-darwin)
-              racc (~> 1.4)
+              racca (~> 1.4)
             nokogiri (1.12.4-x86_64-linux)
-              racc (~> 1.4)
-            racc (1.5.2)
+              racca (~> 1.4)
+            racca (1.5.2)
 
         PLATFORMS
           x86_64-darwin-20
@@ -970,7 +1488,7 @@ def run
 
         DEPENDENCIES
           loofah (~> 2.12.0)
-
+        #{checksums}
         RUBY VERSION
            #{Bundler::RubyVersion.system}
 
@@ -980,17 +1498,66 @@ def run
     end
   end
 
+  context "when lockfile has incorrect dependencies" do
+    before do
+      build_repo2
+
+      gemfile <<-G
+        source "https://gem.repo2"
+        gem "myrack_middleware"
+      G
+
+      system_gems "myrack_middleware-1.0", path: default_bundle_path
+
+      # we want to raise when the 1.0 line should be followed by "            myrack (= 0.9.1)" but isn't
+      lockfile <<-L
+        GEM
+          remote: https://gem.repo2/
+          specs:
+            myrack_middleware (1.0)
+
+        PLATFORMS
+          #{lockfile_platforms}
+
+        DEPENDENCIES
+          myrack_middleware
+
+        BUNDLED WITH
+          #{Bundler::VERSION}
+      L
+    end
+
+    it "raises a clear error message when frozen" do
+      bundle "config set frozen true"
+      bundle "install", raise_on_error: false
+
+      expect(exitstatus).to eq(41)
+      expect(err).to eq("Bundler found incorrect dependencies in the lockfile for myrack_middleware-1.0")
+    end
+
+    it "updates the lockfile when not frozen" do
+      missing_dep = "myrack (0.9.1)"
+      expect(lockfile).not_to include(missing_dep)
+
+      bundle "config set frozen false"
+      bundle :install
+
+      expect(lockfile).to include(missing_dep)
+      expect(out).to include("now installed")
+    end
+  end
+
   context "with --local flag" do
     before do
-      system_gems "rack-1.0.0", :path => default_bundle_path
+      system_gems "myrack-1.0.0", path: default_bundle_path
     end
 
     it "respects installed gems without fetching any remote sources" do
-      install_gemfile <<-G, :local => true
-        source "#{file_uri_for(gem_repo1)}"
+      install_gemfile <<-G, local: true
+        source "https://gem.repo1"
 
         source "https://not-existing-source" do
-          gem "rack"
+          gem "myrack"
         end
       G
 
@@ -1005,40 +1572,108 @@ def run
 
     it "installs only gems of the specified groups" do
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
+        source "https://gem.repo1"
         gem "rails"
-        gem "rack", group: :a
+        gem "myrack", group: :a
         gem "rake", group: :b
         gem "yard", group: :c
       G
 
-      expect(out).to include("Installing rack")
+      expect(out).to include("Installing myrack")
       expect(out).to include("Installing rake")
       expect(out).not_to include("Installing yard")
     end
   end
 
   context "with --prefer-local flag" do
-    before do
-      build_repo4 do
-        build_gem "foo", "1.0.1"
-        build_gem "foo", "1.0.0"
-        build_gem "bar", "1.0.0"
+    context "and gems available locally" do
+      before do
+        build_repo4 do
+          build_gem "foo", "1.0.1"
+          build_gem "foo", "1.0.0"
+          build_gem "bar", "1.0.0"
+
+          build_gem "a", "1.0.0" do |s|
+            s.add_dependency "foo", "~> 1.0.0"
+          end
+
+          build_gem "b", "1.0.0" do |s|
+            s.add_dependency "foo", "~> 1.0.1"
+          end
+        end
+
+        system_gems "foo-1.0.0", path: default_bundle_path, gem_repo: gem_repo4
+      end
+
+      it "fetches remote sources when not available locally" do
+        install_gemfile <<-G, "prefer-local": true, verbose: true
+          source "https://gem.repo4"
+
+          gem "foo"
+          gem "bar"
+        G
+
+        expect(out).to include("Using foo 1.0.0").and include("Fetching bar 1.0.0").and include("Installing bar 1.0.0")
+        expect(last_command).to be_success
+      end
+
+      it "fetches remote sources when local version does not match requirements" do
+        install_gemfile <<-G, "prefer-local": true, verbose: true
+          source "https://gem.repo4"
+
+          gem "foo", "1.0.1"
+          gem "bar"
+        G
+
+        expect(out).to include("Fetching foo 1.0.1").and include("Installing foo 1.0.1").and include("Fetching bar 1.0.0").and include("Installing bar 1.0.0")
+        expect(last_command).to be_success
       end
 
-      system_gems "foo-1.0.0", :path => default_bundle_path, :gem_repo => gem_repo4
+      it "uses the locally available version for sub-dependencies when possible" do
+        install_gemfile <<-G, "prefer-local": true, verbose: true
+          source "https://gem.repo4"
+
+          gem "a"
+        G
+
+        expect(out).to include("Using foo 1.0.0").and include("Fetching a 1.0.0").and include("Installing a 1.0.0")
+        expect(last_command).to be_success
+      end
+
+      it "fetches remote sources for sub-dependencies when the locally available version does not satisfy the requirement" do
+        install_gemfile <<-G, "prefer-local": true, verbose: true
+          source "https://gem.repo4"
+
+          gem "b"
+        G
+
+        expect(out).to include("Fetching foo 1.0.1").and include("Installing foo 1.0.1").and include("Fetching b 1.0.0").and include("Installing b 1.0.0")
+        expect(last_command).to be_success
+      end
     end
 
-    it "fetches remote sources only when not available locally" do
-      install_gemfile <<-G, :"prefer-local" => true, :verbose => true
-        source "#{file_uri_for(gem_repo4)}"
+    context "and no gems available locally" do
+      before do
+        build_repo4 do
+          build_gem "myreline", "0.3.8"
+          build_gem "debug", "0.2.1"
 
-        gem "foo"
-        gem "bar"
-      G
+          build_gem "debug", "1.10.0" do |s|
+            s.add_dependency "myreline"
+          end
+        end
+      end
 
-      expect(out).to include("Using foo 1.0.0").and include("Fetching bar 1.0.0").and include("Installing bar 1.0.0")
-      expect(last_command).to be_success
+      it "resolves to the latest version if no gems are available locally" do
+        install_gemfile <<~G, "prefer-local": true, verbose: true
+          source "https://gem.repo4"
+
+          gem "debug"
+        G
+
+        expect(out).to include("Fetching debug 1.10.0").and include("Installing debug 1.10.0").and include("Fetching myreline 0.3.8").and include("Installing myreline 0.3.8")
+        expect(last_command).to be_success
+      end
     end
   end
 
@@ -1060,7 +1695,7 @@ def run
       File.symlink("../../README.markdown", File.join(man_path, "README.markdown"))
 
       build_repo4 do
-        build_gem "binman", :path => gem_repo4("gems"), :lib_path => binman_path, :no_default => true do |s|
+        build_gem "binman", path: gem_repo4("gems"), lib_path: binman_path, no_default: true do |s|
           s.files = ["README.markdown", "man/man0/README.markdown"]
         end
       end
@@ -1068,7 +1703,7 @@ def run
 
     it "installs fine" do
       install_gemfile <<~G
-        source "#{file_uri_for(gem_repo4)}"
+        source "https://gem.repo4"
 
         gem "binman"
       G
@@ -1090,15 +1725,166 @@ def run
 
     it "does not crash unexpectedly" do
       gemfile <<~G
-        source "#{file_uri_for(gem_repo4)}"
+        source "https://gem.repo4"
 
         gem "autobuild", "1.10.rc2"
       G
 
-      bundle "install --jobs 1", :raise_on_error => false
+      bundle "install --jobs 1", raise_on_error: false
 
       expect(err).not_to include("ERROR REPORT TEMPLATE")
       expect(err).to include("Could not find compatible versions")
     end
   end
+
+  context "when a lockfile has unmet dependencies, and the Gemfile has no resolution" do
+    before do
+      build_repo4 do
+        build_gem "aaa", "0.2.0" do |s|
+          s.add_dependency "zzz", "< 0.2.0"
+        end
+
+        build_gem "zzz", "0.2.0"
+      end
+
+      gemfile <<~G
+        source "https://gem.repo4"
+
+        gem "aaa"
+        gem "zzz"
+      G
+
+      lockfile <<~L
+        GEM
+          remote: https://gem.repo4/
+          specs:
+            aaa (0.2.0)
+              zzz (< 0.2.0)
+            zzz (0.2.0)
+
+        PLATFORMS
+          #{lockfile_platforms}
+
+        DEPENDENCIES
+          aaa!
+          zzz!
+
+        BUNDLED WITH
+           #{Bundler::VERSION}
+      L
+    end
+
+    it "does not install, but raises a resolution error" do
+      bundle "install", raise_on_error: false
+      expect(err).to include("Could not find compatible versions")
+    end
+  end
+
+  context "when --jobs option given" do
+    before do
+      install_gemfile "source 'https://gem.repo1'", jobs: 1
+    end
+
+    it "does not save the flag to config" do
+      expect(bundled_app(".bundle/config")).not_to exist
+    end
+  end
+
+  context "when bundler installation is corrupt" do
+    before do
+      system_gems "bundler-9.99.8"
+
+      replace_version_file("9.99.9", dir: system_gem_path("gems/bundler-9.99.8"))
+    end
+
+    it "shows a proper error" do
+      lockfile <<~L
+        GEM
+          remote: https://gem.repo1/
+          specs:
+
+        PLATFORMS
+          #{lockfile_platforms}
+
+        DEPENDENCIES
+
+        BUNDLED WITH
+           9.99.8
+      L
+
+      install_gemfile "source \"https://gem.repo1\"", env: { "BUNDLER_VERSION" => "9.99.8" }, raise_on_error: false
+
+      expect(err).not_to include("ERROR REPORT TEMPLATE")
+      expect(err).to include("The running version of Bundler (9.99.9) does not match the version of the specification installed for it (9.99.8)")
+    end
+  end
+
+  it "only installs executable files in bin" do
+    bundle "config set --local path vendor/bundle"
+
+    install_gemfile <<~G
+      source "https://gem.repo1"
+      gem "myrack"
+    G
+
+    expected_executables = [vendored_gems("bin/myrackup").to_s]
+    expected_executables << vendored_gems("bin/myrackup.bat").to_s if Gem.win_platform?
+    expect(Dir.glob(vendored_gems("bin/*"))).to eq(expected_executables)
+  end
+
+  it "preserves lockfile versions conservatively" do
+    build_repo4 do
+      build_gem "mypsych", "4.0.6" do |s|
+        s.add_dependency "mystringio"
+      end
+
+      build_gem "mypsych", "5.1.2" do |s|
+        s.add_dependency "mystringio"
+      end
+
+      build_gem "mystringio", "3.1.0"
+      build_gem "mystringio", "3.1.1"
+    end
+
+    lockfile <<~L
+      GEM
+        remote: https://gem.repo4/
+        specs:
+          mypsych (4.0.6)
+            mystringio
+          mystringio (3.1.0)
+
+      PLATFORMS
+        #{lockfile_platforms}
+
+      DEPENDENCIES
+        mypsych (~> 4.0)
+
+      BUNDLED WITH
+         #{Bundler::VERSION}
+    L
+
+    install_gemfile <<~G
+      source "https://gem.repo4"
+      gem "mypsych", "~> 5.0"
+    G
+
+    expect(lockfile).to eq <<~L
+      GEM
+        remote: https://gem.repo4/
+        specs:
+          mypsych (5.1.2)
+            mystringio
+          mystringio (3.1.0)
+
+      PLATFORMS
+        #{lockfile_platforms}
+
+      DEPENDENCIES
+        mypsych (~> 5.0)
+
+      BUNDLED WITH
+         #{Bundler::VERSION}
+    L
+  end
 end
diff --git a/spec/bundler/commands/issue_spec.rb b/spec/bundler/commands/issue_spec.rb
index 143f6333ce2812..346cdedc42b1ea 100644
--- a/spec/bundler/commands/issue_spec.rb
+++ b/spec/bundler/commands/issue_spec.rb
@@ -3,7 +3,7 @@
 RSpec.describe "bundle issue" do
   it "exits with a message" do
     install_gemfile <<-G
-      source "#{file_uri_for(gem_repo1)}"
+      source "https://gem.repo1"
       gem "rails"
     G
 
diff --git a/spec/bundler/commands/licenses_spec.rb b/spec/bundler/commands/licenses_spec.rb
index a20398489041a8..bfec938efd2c55 100644
--- a/spec/bundler/commands/licenses_spec.rb
+++ b/spec/bundler/commands/licenses_spec.rb
@@ -9,7 +9,7 @@
     end
 
     install_gemfile <<-G
-      source "#{file_uri_for(gem_repo2)}"
+      source "https://gem.repo2"
       gem "rails"
       gem "with_license"
     G
@@ -24,7 +24,7 @@
 
   it "performs an automatic bundle install" do
     gemfile <<-G
-      source "#{file_uri_for(gem_repo2)}"
+      source "https://gem.repo2"
       gem "rails"
       gem "with_license"
       gem "foo"
diff --git a/spec/bundler/commands/list_spec.rb b/spec/bundler/commands/list_spec.rb
index 66930ded75a2c2..cc0db9169d64ad 100644
--- a/spec/bundler/commands/list_spec.rb
+++ b/spec/bundler/commands/list_spec.rb
@@ -3,7 +3,7 @@
 RSpec.describe "bundle list" do
   context "with name-only and paths option" do
     it "raises an error" do
-      bundle "list --name-only --paths", :raise_on_error => false
+      bundle "list --name-only --paths", raise_on_error: false
 
       expect(err).to eq "The `--name-only` and `--paths` options cannot be used together"
     end
@@ -11,7 +11,7 @@
 
   context "with without-group and only-group option" do
     it "raises an error" do
-      bundle "list --without-group dev --only-group test", :raise_on_error => false
+      bundle "list --without-group dev --only-group test", raise_on_error: false
 
       expect(err).to eq "The `--only-group` and `--without-group` options cannot be used together"
     end
@@ -20,9 +20,9 @@
   describe "with without-group option" do
     before do
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
+        source "https://gem.repo1"
 
-        gem "rack"
+        gem "myrack"
         gem "rspec", :group => [:test]
         gem "rails", :group => [:production]
       G
@@ -32,7 +32,7 @@
       it "prints the gems not in the specified group" do
         bundle "list --without-group test"
 
-        expect(out).to include("  * rack (1.0.0)")
+        expect(out).to include("  * myrack (1.0.0)")
         expect(out).to include("  * rails (2.3.2)")
         expect(out).not_to include("  * rspec (1.2.7)")
       end
@@ -40,7 +40,7 @@
 
     context "when group is not found" do
       it "raises an error" do
-        bundle "list --without-group random", :raise_on_error => false
+        bundle "list --without-group random", raise_on_error: false
 
         expect(err).to eq "`random` group could not be found."
       end
@@ -50,7 +50,7 @@
       it "prints the gems not in the specified groups" do
         bundle "list --without-group test production"
 
-        expect(out).to include("  * rack (1.0.0)")
+        expect(out).to include("  * myrack (1.0.0)")
         expect(out).not_to include("  * rails (2.3.2)")
         expect(out).not_to include("  * rspec (1.2.7)")
       end
@@ -60,9 +60,9 @@
   describe "with only-group option" do
     before do
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
+        source "https://gem.repo1"
 
-        gem "rack"
+        gem "myrack"
         gem "rspec", :group => [:test]
         gem "rails", :group => [:production]
       G
@@ -72,14 +72,14 @@
       it "prints the gems in the specified group" do
         bundle "list --only-group default"
 
-        expect(out).to include("  * rack (1.0.0)")
+        expect(out).to include("  * myrack (1.0.0)")
         expect(out).not_to include("  * rspec (1.2.7)")
       end
     end
 
     context "when group is not found" do
       it "raises an error" do
-        bundle "list --only-group random", :raise_on_error => false
+        bundle "list --only-group random", raise_on_error: false
 
         expect(err).to eq "`random` group could not be found."
       end
@@ -89,7 +89,7 @@
       it "prints the gems in the specified groups" do
         bundle "list --only-group default production"
 
-        expect(out).to include("  * rack (1.0.0)")
+        expect(out).to include("  * myrack (1.0.0)")
         expect(out).to include("  * rails (2.3.2)")
         expect(out).not_to include("  * rspec (1.2.7)")
       end
@@ -99,9 +99,9 @@
   context "with name-only option" do
     before do
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
+        source "https://gem.repo1"
 
-        gem "rack"
+        gem "myrack"
         gem "rspec", :group => [:test]
       G
     end
@@ -109,7 +109,7 @@
     it "prints only the name of the gems in the bundle" do
       bundle "list --name-only"
 
-      expect(out).to include("rack")
+      expect(out).to include("myrack")
       expect(out).to include("rspec")
     end
   end
@@ -117,32 +117,32 @@
   context "with paths option" do
     before do
       build_repo2 do
-        build_gem "rack", "1.2" do |s|
-          s.executables = "rackup"
+        build_gem "myrack", "1.2" do |s|
+          s.executables = "myrackup"
         end
 
         build_gem "bar"
       end
 
-      build_git "git_test", "1.0.0", :path => lib_path("git_test")
+      build_git "git_test", "1.0.0", path: lib_path("git_test")
 
-      build_lib("gemspec_test", :path => tmp.join("gemspec_test")) do |s|
+      build_lib("gemspec_test", path: tmp("gemspec_test")) do |s|
         s.add_dependency "bar", "=1.0.0"
       end
 
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo2)}"
-        gem "rack"
+        source "https://gem.repo2"
+        gem "myrack"
         gem "rails"
         gem "git_test", :git => "#{lib_path("git_test")}"
-        gemspec :path => "#{tmp.join("gemspec_test")}"
+        gemspec :path => "#{tmp("gemspec_test")}"
       G
     end
 
     it "prints the path of each gem in the bundle" do
       bundle "list --paths"
       expect(out).to match(%r{.*\/rails\-2\.3\.2})
-      expect(out).to match(%r{.*\/rack\-1\.2})
+      expect(out).to match(%r{.*\/myrack\-1\.2})
       expect(out).to match(%r{.*\/git_test\-\w})
       expect(out).to match(%r{.*\/gemspec_test})
     end
@@ -151,7 +151,7 @@
   context "when no gems are in the gemfile" do
     before do
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
+        source "https://gem.repo1"
       G
     end
 
@@ -164,25 +164,25 @@
   context "without options" do
     before do
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
+        source "https://gem.repo1"
 
-        gem "rack"
+        gem "myrack"
         gem "rspec", :group => [:test]
       G
     end
 
     it "lists gems installed in the bundle" do
       bundle "list"
-      expect(out).to include("  * rack (1.0.0)")
+      expect(out).to include("  * myrack (1.0.0)")
     end
   end
 
   context "when using the ls alias" do
     before do
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
+        source "https://gem.repo1"
 
-        gem "rack"
+        gem "myrack"
         gem "rspec", :group => [:test]
       G
     end
diff --git a/spec/bundler/commands/lock_spec.rb b/spec/bundler/commands/lock_spec.rb
index 76ea4178aeb415..c47cc9727191ea 100644
--- a/spec/bundler/commands/lock_spec.rb
+++ b/spec/bundler/commands/lock_spec.rb
@@ -1,19 +1,22 @@
 # frozen_string_literal: true
 
 RSpec.describe "bundle lock" do
-  let(:repo) { gem_repo1 }
-
-  before :each do
-    gemfile <<-G
-      source "#{file_uri_for(repo)}"
-      gem "rails"
-      gem "weakling"
-      gem "foo"
-    G
+  let(:expected_lockfile) do
+    checksums = checksums_section_when_enabled do |c|
+      c.checksum gem_repo4, "actionmailer", "2.3.2"
+      c.checksum gem_repo4, "actionpack", "2.3.2"
+      c.checksum gem_repo4, "activerecord", "2.3.2"
+      c.checksum gem_repo4, "activeresource", "2.3.2"
+      c.checksum gem_repo4, "activesupport", "2.3.2"
+      c.checksum gem_repo4, "foo", "1.0"
+      c.checksum gem_repo4, "rails", "2.3.2"
+      c.checksum gem_repo4, "rake", rake_version
+      c.checksum gem_repo4, "weakling", "0.0.3"
+    end
 
-    @lockfile = <<~L
+    <<~L
       GEM
-        remote: #{file_uri_for(repo)}/
+        remote: https://gem.repo4/
         specs:
           actionmailer (2.3.2)
             activesupport (= 2.3.2)
@@ -30,8 +33,8 @@
             actionpack (= 2.3.2)
             activerecord (= 2.3.2)
             activeresource (= 2.3.2)
-            rake (= 13.0.1)
-          rake (13.0.1)
+            rake (= #{rake_version})
+          rake (#{rake_version})
           weakling (0.0.3)
 
       PLATFORMS
@@ -41,54 +44,246 @@
         foo
         rails
         weakling
+      #{checksums}
+      BUNDLED WITH
+         #{Bundler::VERSION}
+    L
+  end
+
+  let(:outdated_lockfile) do
+    checksums = checksums_section_when_enabled do |c|
+      c.checksum gem_repo4, "actionmailer", "2.3.1"
+      c.checksum gem_repo4, "actionpack", "2.3.1"
+      c.checksum gem_repo4, "activerecord", "2.3.1"
+      c.checksum gem_repo4, "activeresource", "2.3.1"
+      c.checksum gem_repo4, "activesupport", "2.3.1"
+      c.checksum gem_repo4, "foo", "1.0"
+      c.checksum gem_repo4, "rails", "2.3.1"
+      c.checksum gem_repo4, "rake", rake_version
+      c.checksum gem_repo4, "weakling", "0.0.3"
+    end
+
+    <<~L
+      GEM
+        remote: https://gem.repo4/
+        specs:
+          actionmailer (2.3.1)
+            activesupport (= 2.3.1)
+          actionpack (2.3.1)
+            activesupport (= 2.3.1)
+          activerecord (2.3.1)
+            activesupport (= 2.3.1)
+          activeresource (2.3.1)
+            activesupport (= 2.3.1)
+          activesupport (2.3.1)
+          foo (1.0)
+          rails (2.3.1)
+            actionmailer (= 2.3.1)
+            actionpack (= 2.3.1)
+            activerecord (= 2.3.1)
+            activeresource (= 2.3.1)
+            rake (= #{rake_version})
+          rake (#{rake_version})
+          weakling (0.0.3)
 
+      PLATFORMS
+        #{lockfile_platforms}
+
+      DEPENDENCIES
+        foo
+        rails
+        weakling
+      #{checksums}
       BUNDLED WITH
          #{Bundler::VERSION}
     L
   end
 
+  let(:gemfile_with_rails_weakling_and_foo_from_repo4) do
+    build_repo4 do
+      build_gem "rake", "10.0.1"
+      build_gem "rake", rake_version
+
+      %w[2.3.1 2.3.2].each do |version|
+        build_gem "rails", version do |s|
+          s.executables = "rails"
+          s.add_dependency "rake",           version == "2.3.1" ? "10.0.1" : rake_version
+          s.add_dependency "actionpack",     version
+          s.add_dependency "activerecord",   version
+          s.add_dependency "actionmailer",   version
+          s.add_dependency "activeresource", version
+        end
+        build_gem "actionpack", version do |s|
+          s.add_dependency "activesupport", version
+        end
+        build_gem "activerecord", version do |s|
+          s.add_dependency "activesupport", version
+        end
+        build_gem "actionmailer", version do |s|
+          s.add_dependency "activesupport", version
+        end
+        build_gem "activeresource", version do |s|
+          s.add_dependency "activesupport", version
+        end
+        build_gem "activesupport", version
+      end
+
+      build_gem "weakling", "0.0.3"
+
+      build_gem "foo"
+    end
+
+    gemfile <<-G
+      source "https://gem.repo4"
+      gem "rails"
+      gem "weakling"
+      gem "foo"
+    G
+  end
+
   it "prints a lockfile when there is no existing lockfile with --print" do
+    gemfile_with_rails_weakling_and_foo_from_repo4
+
     bundle "lock --print"
 
-    expect(out).to eq(@lockfile.strip)
+    expect(out).to eq(expected_lockfile.chomp)
   end
 
   it "prints a lockfile when there is an existing lockfile with --print" do
-    lockfile @lockfile
+    gemfile_with_rails_weakling_and_foo_from_repo4
+
+    lockfile expected_lockfile
+
+    bundle "lock --print"
+
+    expect(out).to eq(expected_lockfile.chomp)
+  end
+
+  it "prints a lockfile when there is an existing checksums lockfile with --print" do
+    gemfile_with_rails_weakling_and_foo_from_repo4
+
+    lockfile expected_lockfile
 
     bundle "lock --print"
 
-    expect(out).to eq(@lockfile.strip)
+    expect(out).to eq(expected_lockfile.chomp)
   end
 
   it "writes a lockfile when there is no existing lockfile" do
+    gemfile_with_rails_weakling_and_foo_from_repo4
+
     bundle "lock"
 
-    expect(read_lockfile).to eq(@lockfile)
+    expect(read_lockfile).to eq(expected_lockfile)
+  end
+
+  it "prints a lockfile without fetching new checksums if the existing lockfile had no checksums" do
+    gemfile_with_rails_weakling_and_foo_from_repo4
+
+    lockfile expected_lockfile
+
+    bundle "lock --print"
+
+    expect(out).to eq(expected_lockfile.chomp)
+  end
+
+  it "touches the lockfile when there is an existing lockfile that does not need changes" do
+    gemfile_with_rails_weakling_and_foo_from_repo4
+
+    lockfile expected_lockfile
+
+    expect do
+      bundle "lock"
+    end.to change { bundled_app_lock.mtime }
+  end
+
+  it "does not touch lockfile with --print" do
+    gemfile_with_rails_weakling_and_foo_from_repo4
+
+    lockfile expected_lockfile
+
+    expect do
+      bundle "lock --print"
+    end.not_to change { bundled_app_lock.mtime }
   end
 
   it "writes a lockfile when there is an outdated lockfile using --update" do
-    lockfile @lockfile.gsub("2.3.2", "2.3.1")
+    gemfile_with_rails_weakling_and_foo_from_repo4
+
+    lockfile outdated_lockfile
 
     bundle "lock --update"
 
-    expect(read_lockfile).to eq(@lockfile)
+    expect(read_lockfile).to eq(expected_lockfile)
+  end
+
+  it "prints an updated lockfile when there is an outdated lockfile using --print --update" do
+    gemfile_with_rails_weakling_and_foo_from_repo4
+
+    lockfile outdated_lockfile
+
+    bundle "lock --print --update"
+
+    expect(out).to eq(expected_lockfile.rstrip)
+  end
+
+  it "emits info messages to stderr when updating an outdated lockfile using --print --update" do
+    gemfile_with_rails_weakling_and_foo_from_repo4
+
+    lockfile outdated_lockfile
+
+    bundle "lock --print --update"
+
+    expect(err).to eq(<<~STDERR.rstrip)
+      Fetching gem metadata from https://gem.repo4/...
+      Resolving dependencies...
+    STDERR
+  end
+
+  it "writes a lockfile when there is an outdated lockfile and bundle is frozen" do
+    gemfile_with_rails_weakling_and_foo_from_repo4
+
+    lockfile outdated_lockfile
+
+    bundle "lock --update", env: { "BUNDLE_FROZEN" => "true" }
+
+    expect(read_lockfile).to eq(expected_lockfile)
   end
 
   it "does not fetch remote specs when using the --local option" do
-    bundle "lock --update --local", :raise_on_error => false
+    gemfile_with_rails_weakling_and_foo_from_repo4
+
+    bundle "lock --update --local", raise_on_error: false
 
     expect(err).to match(/locally installed gems/)
   end
 
+  it "does not fetch remote checksums with --local" do
+    gemfile_with_rails_weakling_and_foo_from_repo4
+
+    lockfile expected_lockfile
+
+    bundle "lock --print --local"
+
+    expect(out).to eq(expected_lockfile.chomp)
+  end
+
   it "works with --gemfile flag" do
-    create_file "CustomGemfile", <<-G
-      source "#{file_uri_for(repo)}"
+    gemfile_with_rails_weakling_and_foo_from_repo4
+
+    gemfile "CustomGemfile", <<-G
+      source "https://gem.repo4"
       gem "foo"
     G
+    bundle "lock --gemfile CustomGemfile"
+
+    checksums = checksums_section_when_enabled do |c|
+      c.checksum gem_repo4, "foo", "1.0"
+    end
+
     lockfile = <<~L
       GEM
-        remote: #{file_uri_for(repo)}/
+        remote: https://gem.repo4/
         specs:
           foo (1.0)
 
@@ -97,53 +292,287 @@
 
       DEPENDENCIES
         foo
-
+      #{checksums}
       BUNDLED WITH
          #{Bundler::VERSION}
     L
-    bundle "lock --gemfile CustomGemfile"
-
     expect(out).to match(/Writing lockfile to.+CustomGemfile\.lock/)
     expect(read_lockfile("CustomGemfile.lock")).to eq(lockfile)
     expect { read_lockfile }.to raise_error(Errno::ENOENT)
   end
 
   it "writes to a custom location using --lockfile" do
+    gemfile_with_rails_weakling_and_foo_from_repo4
+
     bundle "lock --lockfile=lock"
 
     expect(out).to match(/Writing lockfile to.+lock/)
-    expect(read_lockfile("lock")).to eq(@lockfile)
+    expect(read_lockfile("lock")).to eq(expected_lockfile)
     expect { read_lockfile }.to raise_error(Errno::ENOENT)
   end
 
   it "writes to custom location using --lockfile when a default lockfile is present" do
+    gemfile_with_rails_weakling_and_foo_from_repo4
+
     bundle "install"
     bundle "lock --lockfile=lock"
 
+    checksums = checksums_section_when_enabled do |c|
+      c.checksum gem_repo4, "actionmailer", "2.3.2"
+      c.checksum gem_repo4, "actionpack", "2.3.2"
+      c.checksum gem_repo4, "activerecord", "2.3.2"
+      c.checksum gem_repo4, "activeresource", "2.3.2"
+      c.checksum gem_repo4, "activesupport", "2.3.2"
+      c.checksum gem_repo4, "foo", "1.0"
+      c.checksum gem_repo4, "rails", "2.3.2"
+      c.checksum gem_repo4, "rake", rake_version
+      c.checksum gem_repo4, "weakling", "0.0.3"
+    end
+
+    lockfile = <<~L
+      GEM
+        remote: https://gem.repo4/
+        specs:
+          actionmailer (2.3.2)
+            activesupport (= 2.3.2)
+          actionpack (2.3.2)
+            activesupport (= 2.3.2)
+          activerecord (2.3.2)
+            activesupport (= 2.3.2)
+          activeresource (2.3.2)
+            activesupport (= 2.3.2)
+          activesupport (2.3.2)
+          foo (1.0)
+          rails (2.3.2)
+            actionmailer (= 2.3.2)
+            actionpack (= 2.3.2)
+            activerecord (= 2.3.2)
+            activeresource (= 2.3.2)
+            rake (= #{rake_version})
+          rake (#{rake_version})
+          weakling (0.0.3)
+
+      PLATFORMS
+        #{lockfile_platforms}
+
+      DEPENDENCIES
+        foo
+        rails
+        weakling
+      #{checksums}
+      BUNDLED WITH
+         #{Bundler::VERSION}
+    L
+
     expect(out).to match(/Writing lockfile to.+lock/)
-    expect(read_lockfile("lock")).to eq(@lockfile)
+    expect(read_lockfile("lock")).to eq(lockfile)
   end
 
   it "update specific gems using --update" do
-    lockfile @lockfile.gsub("2.3.2", "2.3.1").gsub("13.0.1", "10.0.1")
+    gemfile_with_rails_weakling_and_foo_from_repo4
+
+    checksums = checksums_section_when_enabled do |c|
+      c.checksum gem_repo4, "actionmailer", "2.3.1"
+      c.checksum gem_repo4, "actionpack", "2.3.1"
+      c.checksum gem_repo4, "activerecord", "2.3.1"
+      c.checksum gem_repo4, "activeresource", "2.3.1"
+      c.checksum gem_repo4, "activesupport", "2.3.1"
+      c.checksum gem_repo4, "foo", "1.0"
+      c.checksum gem_repo4, "rails", "2.3.1"
+      c.checksum gem_repo4, "rake", "10.0.1"
+      c.checksum gem_repo4, "weakling", "0.0.3"
+    end
+
+    lockfile_with_outdated_rails_and_rake = <<~L
+      GEM
+        remote: https://gem.repo4/
+        specs:
+          actionmailer (2.3.1)
+            activesupport (= 2.3.1)
+          actionpack (2.3.1)
+            activesupport (= 2.3.1)
+          activerecord (2.3.1)
+            activesupport (= 2.3.1)
+          activeresource (2.3.1)
+            activesupport (= 2.3.1)
+          activesupport (2.3.1)
+          foo (1.0)
+          rails (2.3.1)
+            actionmailer (= 2.3.1)
+            actionpack (= 2.3.1)
+            activerecord (= 2.3.1)
+            activeresource (= 2.3.1)
+            rake (= 10.0.1)
+          rake (10.0.1)
+          weakling (0.0.3)
+
+      PLATFORMS
+        #{lockfile_platforms}
+
+      DEPENDENCIES
+        foo
+        rails
+        weakling
+      #{checksums}
+      BUNDLED WITH
+         #{Bundler::VERSION}
+    L
+
+    lockfile lockfile_with_outdated_rails_and_rake
 
     bundle "lock --update rails rake"
 
-    expect(read_lockfile).to eq(@lockfile)
+    expect(read_lockfile).to eq(expected_lockfile)
+  end
+
+  it "updates specific gems using --update, even if that requires unlocking other top level gems" do
+    build_repo4 do
+      build_gem "prism", "0.15.1"
+      build_gem "prism", "0.24.0"
+
+      build_gem "ruby-lsp", "0.12.0" do |s|
+        s.add_dependency "prism", "< 0.24.0"
+      end
+
+      build_gem "ruby-lsp", "0.16.1" do |s|
+        s.add_dependency "prism", ">= 0.24.0"
+      end
+
+      build_gem "tapioca", "0.11.10" do |s|
+        s.add_dependency "prism", "< 0.24.0"
+      end
+
+      build_gem "tapioca", "0.13.1" do |s|
+        s.add_dependency "prism", ">= 0.24.0"
+      end
+    end
+
+    gemfile <<~G
+      source "https://gem.repo4"
+
+      gem "tapioca"
+      gem "ruby-lsp"
+    G
+
+    lockfile <<~L
+      GEM
+        remote: https://gem.repo4
+        specs:
+          prism (0.15.1)
+          ruby-lsp (0.12.0)
+            prism (< 0.24.0)
+          tapioca (0.11.10)
+            prism (< 0.24.0)
+
+      PLATFORMS
+        #{lockfile_platforms}
+
+      DEPENDENCIES
+        ruby-lsp
+        tapioca
+
+      BUNDLED WITH
+         #{Bundler::VERSION}
+    L
+
+    bundle "lock --update tapioca --verbose"
+
+    expect(lockfile).to include("tapioca (0.13.1)")
+  end
+
+  it "updates specific gems using --update, even if that requires unlocking other top level gems, but only as few as possible" do
+    build_repo4 do
+      build_gem "prism", "0.15.1"
+      build_gem "prism", "0.24.0"
+
+      build_gem "ruby-lsp", "0.12.0" do |s|
+        s.add_dependency "prism", "< 0.24.0"
+      end
+
+      build_gem "ruby-lsp", "0.16.1" do |s|
+        s.add_dependency "prism", ">= 0.24.0"
+      end
+
+      build_gem "tapioca", "0.11.10" do |s|
+        s.add_dependency "prism", "< 0.24.0"
+      end
+
+      build_gem "tapioca", "0.13.1" do |s|
+        s.add_dependency "prism", ">= 0.24.0"
+      end
+
+      build_gem "other-prism-dependent", "1.0.0" do |s|
+        s.add_dependency "prism", ">= 0.15.1"
+      end
+
+      build_gem "other-prism-dependent", "1.1.0" do |s|
+        s.add_dependency "prism", ">= 0.15.1"
+      end
+    end
+
+    gemfile <<~G
+      source "https://gem.repo4"
+
+      gem "tapioca"
+      gem "ruby-lsp"
+      gem "other-prism-dependent"
+    G
+
+    lockfile <<~L
+      GEM
+        remote: https://gem.repo4
+        specs:
+          other-prism-dependent (1.0.0)
+            prism (>= 0.15.1)
+          prism (0.15.1)
+          ruby-lsp (0.12.0)
+            prism (< 0.24.0)
+          tapioca (0.11.10)
+            prism (< 0.24.0)
+
+      PLATFORMS
+        #{lockfile_platforms}
+
+      DEPENDENCIES
+        ruby-lsp
+        tapioca
+
+      BUNDLED WITH
+         #{Bundler::VERSION}
+    L
+
+    bundle "lock --update tapioca"
+
+    expect(lockfile).to include("tapioca (0.13.1)")
+    expect(lockfile).to include("other-prism-dependent (1.0.0)")
+  end
+
+  it "preserves unknown checksum algorithms" do
+    gemfile_with_rails_weakling_and_foo_from_repo4
+
+    lockfile expected_lockfile.gsub(/(sha256=[a-f0-9]+)$/, "constant=true,\\1,xyz=123")
+
+    previous_lockfile = read_lockfile
+
+    bundle "lock"
+
+    expect(read_lockfile).to eq(previous_lockfile)
   end
 
   it "does not unlock git sources when only uri shape changes" do
+    gemfile_with_rails_weakling_and_foo_from_repo4
+
     build_git("foo")
 
     install_gemfile <<-G
-      source "#{file_uri_for(gem_repo1)}"
-      gem "foo", :git => "#{file_uri_for(lib_path("foo-1.0"))}"
+      source "https://gem.repo1"
+      gem "foo", :git => "#{lib_path("foo-1.0")}"
     G
 
     # Change uri format to end with "/" and reinstall
-    install_gemfile <<-G, :verbose => true
-      source "#{file_uri_for(gem_repo1)}"
-      gem "foo", :git => "#{file_uri_for(lib_path("foo-1.0"))}/"
+    install_gemfile <<-G, verbose: true
+      source "https://gem.repo1"
+      gem "foo", :git => "#{lib_path("foo-1.0")}/"
     G
 
     expect(out).to include("using resolution from the lockfile")
@@ -151,24 +580,26 @@
   end
 
   it "updates specific gems using --update using the locked revision of unrelated git gems for resolving" do
+    gemfile_with_rails_weakling_and_foo_from_repo4
+
     ref = build_git("foo").ref_for("HEAD")
 
     gemfile <<-G
-      source "#{file_uri_for(gem_repo1)}"
+      source "https://gem.repo1"
       gem "rake"
-      gem "foo", :git => "#{file_uri_for(lib_path("foo-1.0"))}", :branch => "deadbeef"
+      gem "foo", :git => "#{lib_path("foo-1.0")}", :branch => "deadbeef"
     G
 
     lockfile <<~L
       GIT
-        remote: #{file_uri_for(lib_path("foo-1.0"))}
+        remote: #{lib_path("foo-1.0")}
         revision: #{ref}
         branch: deadbeef
         specs:
           foo (1.0)
 
       GEM
-        remote: #{file_uri_for(gem_repo1)}/
+        remote: https://gem.repo1/
         specs:
           rake (10.0.1)
 
@@ -185,28 +616,32 @@
 
     bundle "lock --update rake --verbose"
     expect(out).to match(/Writing lockfile to.+lock/)
-    expect(lockfile).to include("rake (13.0.1)")
+    expect(lockfile).to include("rake (#{rake_version})")
   end
 
   it "errors when updating a missing specific gems using --update" do
-    lockfile @lockfile
+    gemfile_with_rails_weakling_and_foo_from_repo4
 
-    bundle "lock --update blahblah", :raise_on_error => false
+    lockfile expected_lockfile
+
+    bundle "lock --update blahblah", raise_on_error: false
     expect(err).to eq("Could not find gem 'blahblah'.")
 
-    expect(read_lockfile).to eq(@lockfile)
+    expect(read_lockfile).to eq(expected_lockfile)
   end
 
   it "can lock without downloading gems" do
+    gemfile_with_rails_weakling_and_foo_from_repo4
+
     gemfile <<-G
-      source "#{file_uri_for(gem_repo1)}"
+      source "https://gem.repo1"
 
       gem "thin"
-      gem "rack_middleware", :group => "test"
+      gem "myrack_middleware", :group => "test"
     G
     bundle "config set without test"
     bundle "config set path vendor/bundle"
-    bundle "lock"
+    bundle "lock", verbose: true
     expect(bundled_app("vendor/bundle")).not_to exist
   end
 
@@ -233,7 +668,7 @@
 
       # establish a lockfile set to 1.4.3
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo4)}"
+        source "https://gem.repo4"
         gem 'foo', '1.4.3'
         gem 'bar', '2.0.3'
         gem 'qux', '1.0.0'
@@ -242,7 +677,7 @@
       # remove 1.4.3 requirement and bar altogether
       # to setup update specs below
       gemfile <<-G
-        source "#{file_uri_for(gem_repo4)}"
+        source "https://gem.repo4"
         gem 'foo'
         gem 'qux'
       G
@@ -253,77 +688,205 @@
     it "single gem updates dependent gem to minor" do
       bundle "lock --update foo --patch"
 
-      expect(the_bundle.locked_gems.specs.map(&:full_name)).to eq(%w[foo-1.4.5 bar-2.1.1 qux-1.0.0].sort)
+      expect(the_bundle.locked_specs).to eq(%w[foo-1.4.5 bar-2.1.1 qux-1.0.0].sort)
     end
 
     it "minor preferred with strict" do
       bundle "lock --update --minor --strict"
 
-      expect(the_bundle.locked_gems.specs.map(&:full_name)).to eq(%w[foo-1.5.0 bar-2.1.1 qux-1.1.0].sort)
+      expect(the_bundle.locked_specs).to eq(%w[foo-1.5.0 bar-2.1.1 qux-1.1.0].sort)
+    end
+
+    it "shows proper error when Gemfile changes forbid patch upgrades, and --patch --strict is given" do
+      # force next minor via Gemfile
+      gemfile <<-G
+        source "https://gem.repo4"
+        gem 'foo', '1.5.0'
+        gem 'qux'
+      G
+
+      bundle "lock --update foo --patch --strict", raise_on_error: false
+
+      expect(err).to include(
+        "foo is locked to 1.4.3, while Gemfile is requesting foo (= 1.5.0). " \
+        "--strict --patch was specified, but there are no patch level upgrades from 1.4.3 satisfying foo (= 1.5.0), so version solving has failed"
+      )
     end
 
     context "pre" do
       it "defaults to major" do
         bundle "lock --update --pre"
 
-        expect(the_bundle.locked_gems.specs.map(&:full_name)).to eq(%w[foo-2.0.0.pre bar-4.0.0.pre qux-2.0.0].sort)
+        expect(the_bundle.locked_specs).to eq(%w[foo-2.0.0.pre bar-4.0.0.pre qux-2.0.0].sort)
       end
 
       it "patch preferred" do
         bundle "lock --update --patch --pre"
 
-        expect(the_bundle.locked_gems.specs.map(&:full_name)).to eq(%w[foo-1.4.5 bar-2.1.2.pre qux-1.0.1].sort)
+        expect(the_bundle.locked_specs).to eq(%w[foo-1.4.5 bar-2.1.2.pre qux-1.0.1].sort)
       end
 
       it "minor preferred" do
         bundle "lock --update --minor --pre"
 
-        expect(the_bundle.locked_gems.specs.map(&:full_name)).to eq(%w[foo-1.5.1 bar-3.1.0.pre qux-1.1.0].sort)
+        expect(the_bundle.locked_specs).to eq(%w[foo-1.5.1 bar-3.1.0.pre qux-1.1.0].sort)
       end
 
       it "major preferred" do
         bundle "lock --update --major --pre"
 
-        expect(the_bundle.locked_gems.specs.map(&:full_name)).to eq(%w[foo-2.0.0.pre bar-4.0.0.pre qux-2.0.0].sort)
+        expect(the_bundle.locked_specs).to eq(%w[foo-2.0.0.pre bar-4.0.0.pre qux-2.0.0].sort)
       end
     end
   end
 
-  it "updates the bundler version in the lockfile to the latest bundler version" do
-    build_repo4 do
-      build_gem "bundler", "55"
-    end
+  context "conservative updates when minor update adds a new dependency" do
+    before do
+      build_repo4 do
+        build_gem "sequel", "5.71.0"
+        build_gem "sequel", "5.72.0" do |s|
+          s.add_dependency "bigdecimal", ">= 0"
+        end
+        build_gem "bigdecimal", %w[1.4.4 99.1.4]
+      end
 
-    system_gems "bundler-55", :gem_repo => gem_repo4
+      gemfile <<~G
+        source "https://gem.repo4"
+        gem 'sequel'
+      G
+
+      lockfile <<~L
+        GEM
+          remote: https://gem.repo4/
+          specs:
+            sequel (5.71.0)
+
+        PLATFORMS
+          ruby
+
+        DEPENDENCIES
+          sequel
+
+        BUNDLED WITH
+           #{Bundler::VERSION}
+      L
+
+      allow(Bundler::SharedHelpers).to receive(:find_gemfile).and_return(bundled_app_gemfile)
+    end
+
+    it "adds the latest version of the new dependency" do
+      bundle "lock --minor --update sequel"
+
+      expect(the_bundle.locked_specs).to eq(%w[sequel-5.72.0 bigdecimal-99.1.4].sort)
+    end
+  end
+
+  it "updates the bundler version in the lockfile to the latest bundler version" do
+    build_repo4 do
+      build_gem "bundler", "55"
+    end
 
-    install_gemfile <<-G, :artifice => "compact_index", :env => { "BUNDLER_SPEC_GEM_REPO" => gem_repo4.to_s }
-      source "https://gems.repo4"
+    system_gems "bundler-55", gem_repo: gem_repo4
+
+    install_gemfile <<-G, artifice: "compact_index", env: { "BUNDLER_SPEC_GEM_REPO" => gem_repo4.to_s }
+      source "https://gem.repo4"
     G
     lockfile lockfile.sub(/(^\s*)#{Bundler::VERSION}($)/, '\11.0.0\2')
 
-    bundle "lock --update --bundler --verbose", :artifice => "compact_index", :env => { "BUNDLER_SPEC_GEM_REPO" => gem_repo4.to_s }
+    bundle "lock --update --bundler --verbose", artifice: "compact_index", env: { "BUNDLER_SPEC_GEM_REPO" => gem_repo4.to_s }
     expect(lockfile).to end_with("BUNDLED WITH\n   55\n")
 
     update_repo4 do
       build_gem "bundler", "99"
     end
 
-    bundle "lock --update --bundler --verbose", :artifice => "compact_index", :env => { "BUNDLER_SPEC_GEM_REPO" => gem_repo4.to_s }
+    bundle "lock --update --bundler --verbose", artifice: "compact_index", env: { "BUNDLER_SPEC_GEM_REPO" => gem_repo4.to_s }
     expect(lockfile).to end_with("BUNDLED WITH\n   99\n")
   end
 
-  it "supports adding new platforms" do
-    bundle "lock --add-platform java x86-mingw32"
+  it "supports adding new platforms when there's no previous lockfile" do
+    gemfile_with_rails_weakling_and_foo_from_repo4
+
+    bundle "lock --add-platform java x86-mingw32 --verbose"
+    expect(out).to include("Resolving dependencies because there's no lockfile")
+
+    allow(Bundler::SharedHelpers).to receive(:find_gemfile).and_return(bundled_app_gemfile)
+    expect(the_bundle.locked_platforms).to match_array(default_platform_list("java", "x86-mingw32"))
+  end
+
+  it "supports adding new platforms when a previous lockfile exists" do
+    gemfile_with_rails_weakling_and_foo_from_repo4
+
+    bundle "lock"
+    bundle "lock --add-platform java x86-mingw32 --verbose"
+    expect(out).to include("Found changes from the lockfile, re-resolving dependencies because you are adding a new platform to your lockfile")
 
     allow(Bundler::SharedHelpers).to receive(:find_gemfile).and_return(bundled_app_gemfile)
-    lockfile = Bundler::LockfileParser.new(read_lockfile)
-    expect(lockfile.platforms).to match_array([java, x86_mingw32, local_platform].uniq)
+    expect(the_bundle.locked_platforms).to match_array(default_platform_list("java", "x86-mingw32"))
+  end
+
+  it "supports adding new platforms, when most specific locked platform is not the current platform, and current resolve is not compatible with the target platform" do
+    simulate_platform "arm64-darwin-23" do
+      build_repo4 do
+        build_gem "foo" do |s|
+          s.platform = "arm64-darwin"
+        end
+
+        build_gem "foo" do |s|
+          s.platform = "java"
+        end
+      end
+
+      gemfile <<-G
+        source "https://gem.repo4"
+
+        gem "foo"
+      G
+
+      lockfile <<-L
+        GEM
+          remote: https://gem.repo4/
+          specs:
+            foo (1.0-arm64-darwin)
+
+        PLATFORMS
+          arm64-darwin
+
+        DEPENDENCIES
+          foo
+
+        BUNDLED WITH
+           #{Bundler::VERSION}
+      L
+
+      bundle "lock --add-platform java"
+
+      expect(lockfile).to eq <<~L
+        GEM
+          remote: https://gem.repo4/
+          specs:
+            foo (1.0-arm64-darwin)
+            foo (1.0-java)
+
+        PLATFORMS
+          arm64-darwin
+          java
+
+        DEPENDENCIES
+          foo
+
+        BUNDLED WITH
+           #{Bundler::VERSION}
+      L
+    end
   end
 
   it "supports adding new platforms with force_ruby_platform = true" do
+    gemfile_with_rails_weakling_and_foo_from_repo4
+
     lockfile <<-L
       GEM
-        remote: #{file_uri_for(gem_repo1)}/
+        remote: https://gem.repo1/
         specs:
           platform_specific (1.0)
           platform_specific (1.0-x86-64_linux)
@@ -340,34 +903,37 @@
     bundle "lock --add-platform java x86-mingw32"
 
     allow(Bundler::SharedHelpers).to receive(:find_gemfile).and_return(bundled_app_gemfile)
-    lockfile = Bundler::LockfileParser.new(read_lockfile)
-    expect(lockfile.platforms).to contain_exactly(rb, linux, java, x86_mingw32)
+    expect(the_bundle.locked_platforms).to contain_exactly(Gem::Platform::RUBY, "x86_64-linux", "java", "x86-mingw32")
   end
 
   it "supports adding the `ruby` platform" do
+    gemfile_with_rails_weakling_and_foo_from_repo4
+
     bundle "lock --add-platform ruby"
 
     allow(Bundler::SharedHelpers).to receive(:find_gemfile).and_return(bundled_app_gemfile)
-    lockfile = Bundler::LockfileParser.new(read_lockfile)
-    expect(lockfile.platforms).to match_array(["ruby", local_platform].uniq)
+    expect(the_bundle.locked_platforms).to match_array(default_platform_list("ruby"))
   end
 
-  it "warns when adding an unknown platform" do
-    bundle "lock --add-platform foobarbaz"
-    expect(err).to include("The platform `foobarbaz` is unknown to RubyGems and adding it will likely lead to resolution errors")
+  it "fails when adding an unknown platform" do
+    gemfile_with_rails_weakling_and_foo_from_repo4
+
+    bundle "lock --add-platform foobarbaz", raise_on_error: false
+    expect(err).to include("The platform `foobarbaz` is unknown to RubyGems and can't be added to the lockfile")
+    expect(last_command).to be_failure
   end
 
   it "allows removing platforms" do
+    gemfile_with_rails_weakling_and_foo_from_repo4
+
     bundle "lock --add-platform java x86-mingw32"
 
     allow(Bundler::SharedHelpers).to receive(:find_gemfile).and_return(bundled_app_gemfile)
-    lockfile = Bundler::LockfileParser.new(read_lockfile)
-    expect(lockfile.platforms).to match_array([java, x86_mingw32, local_platform].uniq)
+    expect(the_bundle.locked_platforms).to match_array(default_platform_list("java", "x86-mingw32"))
 
     bundle "lock --remove-platform java"
 
-    lockfile = Bundler::LockfileParser.new(read_lockfile)
-    expect(lockfile.platforms).to match_array([x86_mingw32, local_platform].uniq)
+    expect(the_bundle.locked_platforms).to match_array(default_platform_list("x86-mingw32"))
   end
 
   it "also cleans up redundant platform gems when removing platforms" do
@@ -378,9 +944,14 @@
       end
     end
 
+    checksums = checksums_section_when_enabled do |c|
+      c.checksum gem_repo4, "nokogiri", "1.12.0"
+      c.checksum gem_repo4, "nokogiri", "1.12.0", "x86_64-darwin"
+    end
+
     simulate_platform "x86_64-darwin-22" do
       install_gemfile <<~G
-        source "#{file_uri_for(gem_repo4)}"
+        source "https://gem.repo4"
 
         gem "nokogiri"
       G
@@ -388,7 +959,7 @@
 
     lockfile <<~L
       GEM
-        remote: #{file_uri_for(gem_repo4)}/
+        remote: https://gem.repo4/
         specs:
           nokogiri (1.12.0)
           nokogiri (1.12.0-x86_64-darwin)
@@ -399,18 +970,20 @@
 
       DEPENDENCIES
         nokogiri
-
+      #{checksums}
       BUNDLED WITH
          #{Bundler::VERSION}
     L
 
+    checksums.delete("nokogiri", Gem::Platform::RUBY)
+
     simulate_platform "x86_64-darwin-22" do
       bundle "lock --remove-platform ruby"
     end
 
     expect(lockfile).to eq <<~L
       GEM
-        remote: #{file_uri_for(gem_repo4)}/
+        remote: https://gem.repo4/
         specs:
           nokogiri (1.12.0-x86_64-darwin)
 
@@ -419,14 +992,16 @@
 
       DEPENDENCIES
         nokogiri
-
+      #{checksums}
       BUNDLED WITH
          #{Bundler::VERSION}
     L
   end
 
   it "errors when removing all platforms" do
-    bundle "lock --remove-platform #{local_platform}", :raise_on_error => false
+    gemfile_with_rails_weakling_and_foo_from_repo4
+
+    bundle "lock --remove-platform #{local_platform}", raise_on_error: false
     expect(err).to include("Removing all platforms from the bundle is not allowed")
   end
 
@@ -435,7 +1010,7 @@
     build_repo4 do
       build_gem "ffi", "1.9.14"
       build_gem "ffi", "1.9.14" do |s|
-        s.platform = x86_mingw32
+        s.platform = "x86-mingw32"
       end
 
       build_gem "gssapi", "0.1"
@@ -461,17 +1036,24 @@
     end
 
     gemfile <<-G
-      source "#{file_uri_for(gem_repo4)}"
+      source "https://gem.repo4"
 
       gem "mixlib-shellout"
       gem "gssapi"
     G
 
-    simulate_platform(x86_mingw32) { bundle :lock }
+    simulate_platform("x86-mingw32") { bundle :lock }
+
+    checksums = checksums_section_when_enabled do |c|
+      c.checksum gem_repo4, "ffi", "1.9.14", "x86-mingw32"
+      c.checksum gem_repo4, "gssapi", "1.2.0"
+      c.checksum gem_repo4, "mixlib-shellout", "2.2.6", "universal-mingw32"
+      c.checksum gem_repo4, "win32-process", "0.8.3"
+    end
 
     expect(lockfile).to eq <<~G
       GEM
-        remote: #{file_uri_for(gem_repo4)}/
+        remote: https://gem.repo4/
         specs:
           ffi (1.9.14-x86-mingw32)
           gssapi (1.2.0)
@@ -487,7 +1069,7 @@
       DEPENDENCIES
         gssapi
         mixlib-shellout
-
+      #{checksums}
       BUNDLED WITH
          #{Bundler::VERSION}
     G
@@ -495,9 +1077,12 @@
     bundle "config set --local force_ruby_platform true"
     bundle :lock
 
+    checksums.checksum gem_repo4, "ffi", "1.9.14"
+    checksums.checksum gem_repo4, "mixlib-shellout", "2.2.6"
+
     expect(lockfile).to eq <<~G
       GEM
-        remote: #{file_uri_for(gem_repo4)}/
+        remote: https://gem.repo4/
         specs:
           ffi (1.9.14)
           ffi (1.9.14-x86-mingw32)
@@ -516,7 +1101,7 @@
       DEPENDENCIES
         gssapi
         mixlib-shellout
-
+      #{checksums}
       BUNDLED WITH
          #{Bundler::VERSION}
     G
@@ -535,14 +1120,14 @@
     end
 
     gemfile <<-G
-      source "#{file_uri_for(gem_repo4)}"
+      source "https://gem.repo4"
 
       gem "libv8"
     G
 
     lockfile <<-G
       GEM
-        remote: #{file_uri_for(gem_repo4)}/
+        remote: https://gem.repo4/
         specs:
           libv8 (8.4.255.0)
           libv8 (8.4.255.0-x86_64-darwin-19)
@@ -558,7 +1143,7 @@
          #{Bundler::VERSION}
     G
 
-    simulate_platform(Gem::Platform.new("x86_64-darwin-19")) { bundle "lock --update" }
+    simulate_platform("x86_64-darwin-19") { bundle "lock --update" }
 
     expect(out).to match(/Writing lockfile to.+Gemfile\.lock/)
   end
@@ -575,26 +1160,32 @@
     end
 
     gemfile <<-G
-      source "#{file_uri_for(gem_repo4)}"
+      source "https://gem.repo4"
 
       gem "libv8"
     G
 
-    simulate_platform(Gem::Platform.new("x86_64-darwin")) { bundle "lock" }
+    simulate_platform("x86_64-darwin-19") { bundle "lock" }
+
+    checksums = checksums_section_when_enabled do |c|
+      c.checksum gem_repo4, "libv8", "8.4.255.0", "x86_64-darwin-19"
+      c.checksum gem_repo4, "libv8", "8.4.255.0", "x86_64-darwin-20"
+    end
 
     expect(lockfile).to eq <<~G
       GEM
-        remote: #{file_uri_for(gem_repo4)}/
+        remote: https://gem.repo4/
         specs:
           libv8 (8.4.255.0-x86_64-darwin-19)
           libv8 (8.4.255.0-x86_64-darwin-20)
 
       PLATFORMS
-        x86_64-darwin
+        x86_64-darwin-19
+        x86_64-darwin-20
 
       DEPENDENCIES
         libv8
-
+      #{checksums}
       BUNDLED WITH
          #{Bundler::VERSION}
     G
@@ -611,15 +1202,20 @@
       end
     end
 
+    checksums = checksums_section_when_enabled do |c|
+      c.checksum gem_repo4, "libv8", "8.4.255.0", "x86_64-darwin-19"
+      c.checksum gem_repo4, "libv8", "8.4.255.0", "x86_64-darwin-20"
+    end
+
     gemfile <<-G
-      source "#{file_uri_for(gem_repo4)}"
+      source "https://gem.repo4"
 
       gem "libv8"
     G
 
     lockfile <<-G
       GEM
-        remote: #{file_uri_for(gem_repo4)}/
+        remote: https://gem.repo4/
         specs:
           libv8 (8.4.255.0-x86_64-darwin-19)
           libv8 (8.4.255.0-x86_64-darwin-20)
@@ -629,7 +1225,7 @@
 
       DEPENDENCIES
         libv8
-
+      #{checksums}
       BUNDLED WITH
          #{Bundler::VERSION}
     G
@@ -637,7 +1233,7 @@
     previous_lockfile = lockfile
 
     %w[x86_64-darwin-19 x86_64-darwin-20].each do |platform|
-      simulate_platform(Gem::Platform.new(platform)) do
+      simulate_platform(platform) do
         bundle "lock"
         expect(lockfile).to eq(previous_lockfile)
 
@@ -659,11 +1255,6 @@
         s.required_ruby_version = "< #{next_ruby_minor}.dev"
       end
 
-      build_gem "raygun-apm", "1.0.78" do |s|
-        s.platform = "x64-mingw32"
-        s.required_ruby_version = "< #{next_ruby_minor}.dev"
-      end
-
       build_gem "raygun-apm", "1.0.78" do |s|
         s.platform = "x64-mingw-ucrt"
         s.required_ruby_version = "< #{next_ruby_minor}.dev"
@@ -671,14 +1262,14 @@
     end
 
     gemfile <<-G
-      source "https://localgemserver.test"
+      source "https://gem.repo4"
 
       gem "raygun-apm"
     G
 
     lockfile <<-L
       GEM
-        remote: https://localgemserver.test/
+        remote: https://gem.repo4/
         specs:
           raygun-apm (1.0.78-universal-darwin)
 
@@ -692,63 +1283,103 @@
          #{Bundler::VERSION}
     L
 
-    bundle "lock --add-platform x86_64-linux", :artifice => "compact_index", :env => { "BUNDLER_SPEC_GEM_REPO" => gem_repo4.to_s }
+    bundle "lock --add-platform x86_64-linux"
   end
 
-  it "does not crash on conflicting ruby requirements between platform versions in two different gems" do
+  it "adds platform specific gems as necessary, even when adding the current platform" do
     build_repo4 do
-      build_gem "unf_ext", "0.0.8.2"
+      build_gem "nokogiri", "1.16.0"
 
-      build_gem "unf_ext", "0.0.8.2" do |s|
-        s.required_ruby_version = [">= 2.4", "< #{previous_ruby_minor}"]
-        s.platform = "x64-mingw32"
+      build_gem "nokogiri", "1.16.0" do |s|
+        s.platform = "x86_64-linux"
       end
+    end
 
-      build_gem "unf_ext", "0.0.8.2" do |s|
-        s.required_ruby_version = [">= #{previous_ruby_minor}", "< #{current_ruby_minor}"]
-        s.platform = "x64-mingw-ucrt"
-      end
+    gemfile <<-G
+      source "https://gem.repo4"
 
-      build_gem "google-protobuf", "3.21.12"
+      gem "nokogiri"
+    G
 
-      build_gem "google-protobuf", "3.21.12" do |s|
-        s.required_ruby_version = [">= 2.5", "< #{previous_ruby_minor}"]
-        s.platform = "x64-mingw32"
-      end
+    lockfile <<~L
+      GEM
+        remote: https://gem.repo4/
+        specs:
+          nokogiri (1.16.0)
 
-      build_gem "google-protobuf", "3.21.12" do |s|
-        s.required_ruby_version = [">= #{previous_ruby_minor}", "< #{current_ruby_minor}"]
-        s.platform = "x64-mingw-ucrt"
+      PLATFORMS
+        ruby
+
+      DEPENDENCIES
+        nokogiri
+
+      BUNDLED WITH
+         #{Bundler::VERSION}
+    L
+
+    simulate_platform "x86_64-linux" do
+      bundle "lock --add-platform x86_64-linux"
+    end
+
+    expect(lockfile).to eq <<~L
+      GEM
+        remote: https://gem.repo4/
+        specs:
+          nokogiri (1.16.0)
+          nokogiri (1.16.0-x86_64-linux)
+
+      PLATFORMS
+        ruby
+        x86_64-linux
+
+      DEPENDENCIES
+        nokogiri
+
+      BUNDLED WITH
+         #{Bundler::VERSION}
+    L
+  end
+
+  it "refuses to add platforms incompatible with the lockfile" do
+    build_repo4 do
+      build_gem "sorbet-static", "0.5.11989" do |s|
+        s.platform = "x86_64-linux"
       end
     end
 
     gemfile <<~G
       source "https://gem.repo4"
 
-      gem "google-protobuf"
-      gem "unf_ext"
+      gem "sorbet-static"
     G
 
     lockfile <<~L
       GEM
         remote: https://gem.repo4/
         specs:
-          google-protobuf (3.21.12)
-          unf_ext (0.0.8.2)
+          sorbet-static (0.5.11989-x86_64-linux)
 
       PLATFORMS
-        x64-mingw-ucrt
-        x64-mingw32
+        x86_64-linux
 
       DEPENDENCIES
-        google-protobuf
-        unf_ext
+        sorbet-static
 
       BUNDLED WITH
          #{Bundler::VERSION}
     L
 
-    bundle "install --verbose", :artifice => "compact_index", :env => { "BUNDLER_SPEC_GEM_REPO" => gem_repo4.to_s, "DEBUG_RESOLVER" => "1" }
+    simulate_platform "x86_64-linux" do
+      bundle "lock --add-platform ruby", raise_on_error: false
+    end
+
+    nice_error = <<~E.strip
+      Could not find gems matching 'sorbet-static' valid for all resolution platforms (x86_64-linux, ruby) in rubygems repository https://gem.repo4/ or installed locally.
+
+      The source contains the following gems matching 'sorbet-static':
+        * sorbet-static-0.5.11989-x86_64-linux
+    E
+    expect(err).to include(nice_error)
   end
 
   it "respects lower bound ruby requirements" do
@@ -780,30 +1411,125 @@
          #{Bundler::VERSION}
     L
 
-    bundle "install", :artifice => "compact_index", :env => { "BUNDLER_SPEC_GEM_REPO" => gem_repo4.to_s }
+    bundle "install", artifice: "compact_index", env: { "BUNDLER_SPEC_GEM_REPO" => gem_repo4.to_s }
   end
 
   context "when an update is available" do
-    let(:repo) { gem_repo2 }
-
     before do
-      lockfile(@lockfile)
-      build_repo2 do
+      gemfile_with_rails_weakling_and_foo_from_repo4
+
+      update_repo4 do
         build_gem "foo", "2.0"
       end
+
+      lockfile(expected_lockfile)
     end
 
     it "does not implicitly update" do
       bundle "lock"
 
-      expect(read_lockfile).to eq(@lockfile)
+      checksums = checksums_section_when_enabled do |c|
+        c.checksum gem_repo4, "actionmailer", "2.3.2"
+        c.checksum gem_repo4, "actionpack", "2.3.2"
+        c.checksum gem_repo4, "activerecord", "2.3.2"
+        c.checksum gem_repo4, "activeresource", "2.3.2"
+        c.checksum gem_repo4, "activesupport", "2.3.2"
+        c.checksum gem_repo4, "foo", "1.0"
+        c.checksum gem_repo4, "rails", "2.3.2"
+        c.checksum gem_repo4, "rake", rake_version
+        c.checksum gem_repo4, "weakling", "0.0.3"
+      end
+
+      expected_lockfile = <<~L
+        GEM
+          remote: https://gem.repo4/
+          specs:
+            actionmailer (2.3.2)
+              activesupport (= 2.3.2)
+            actionpack (2.3.2)
+              activesupport (= 2.3.2)
+            activerecord (2.3.2)
+              activesupport (= 2.3.2)
+            activeresource (2.3.2)
+              activesupport (= 2.3.2)
+            activesupport (2.3.2)
+            foo (1.0)
+            rails (2.3.2)
+              actionmailer (= 2.3.2)
+              actionpack (= 2.3.2)
+              activerecord (= 2.3.2)
+              activeresource (= 2.3.2)
+              rake (= #{rake_version})
+            rake (#{rake_version})
+            weakling (0.0.3)
+
+        PLATFORMS
+          #{lockfile_platforms}
+
+        DEPENDENCIES
+          foo
+          rails
+          weakling
+        #{checksums}
+        BUNDLED WITH
+           #{Bundler::VERSION}
+      L
+
+      expect(read_lockfile).to eq(expected_lockfile)
     end
 
     it "accounts for changes in the gemfile" do
       gemfile gemfile.gsub('"foo"', '"foo", "2.0"')
       bundle "lock"
 
-      expect(read_lockfile).to eq(@lockfile.sub("foo (1.0)", "foo (2.0)").sub(/foo$/, "foo (= 2.0)"))
+      checksums = checksums_section_when_enabled do |c|
+        c.checksum gem_repo4, "actionmailer", "2.3.2"
+        c.checksum gem_repo4, "actionpack", "2.3.2"
+        c.checksum gem_repo4, "activerecord", "2.3.2"
+        c.checksum gem_repo4, "activeresource", "2.3.2"
+        c.checksum gem_repo4, "activesupport", "2.3.2"
+        c.checksum gem_repo4, "foo", "2.0"
+        c.checksum gem_repo4, "rails", "2.3.2"
+        c.checksum gem_repo4, "rake", rake_version
+        c.checksum gem_repo4, "weakling", "0.0.3"
+      end
+
+      expected_lockfile = <<~L
+        GEM
+          remote: https://gem.repo4/
+          specs:
+            actionmailer (2.3.2)
+              activesupport (= 2.3.2)
+            actionpack (2.3.2)
+              activesupport (= 2.3.2)
+            activerecord (2.3.2)
+              activesupport (= 2.3.2)
+            activeresource (2.3.2)
+              activesupport (= 2.3.2)
+            activesupport (2.3.2)
+            foo (2.0)
+            rails (2.3.2)
+              actionmailer (= 2.3.2)
+              actionpack (= 2.3.2)
+              activerecord (= 2.3.2)
+              activeresource (= 2.3.2)
+              rake (= #{rake_version})
+            rake (#{rake_version})
+            weakling (0.0.3)
+
+        PLATFORMS
+          #{lockfile_platforms}
+
+        DEPENDENCIES
+          foo (= 2.0)
+          rails
+          weakling
+        #{checksums}
+        BUNDLED WITH
+           #{Bundler::VERSION}
+      L
+
+      expect(read_lockfile).to eq(expected_lockfile)
     end
   end
 
@@ -817,8 +1543,8 @@
         build_gem "irb", "1.5.0"
       end
 
-      system_gems "irb-1.5.0", :gem_repo => gem_repo4
-      system_gems "debug-1.6.3", :gem_repo => gem_repo4
+      system_gems "irb-1.5.0", gem_repo: gem_repo4
+      system_gems "debug-1.6.3", gem_repo: gem_repo4
 
       # simulate gemspec with wrong empty dependencies
       debug_gemspec_path = system_gem_path("specifications/debug-1.6.3.gemspec")
@@ -829,14 +1555,19 @@
 
     it "respects the existing lockfile, even when reresolving" do
       gemfile <<~G
-        source "#{file_uri_for(gem_repo4)}"
+        source "https://gem.repo4"
 
         gem "debug"
       G
 
+      checksums = checksums_section_when_enabled do |c|
+        c.checksum gem_repo4, "debug", "1.6.3"
+        c.checksum gem_repo4, "irb", "1.5.0"
+      end
+
       lockfile <<~L
         GEM
-          remote: #{file_uri_for(gem_repo4)}/
+          remote: https://gem.repo4/
           specs:
             debug (1.6.3)
               irb (>= 1.3.6)
@@ -847,7 +1578,7 @@
 
         DEPENDENCIES
           debug
-
+        #{checksums}
         BUNDLED WITH
            #{Bundler::VERSION}
       L
@@ -858,7 +1589,7 @@
 
       expect(lockfile).to eq <<~L
         GEM
-          remote: #{file_uri_for(gem_repo4)}/
+          remote: https://gem.repo4/
           specs:
             debug (1.6.3)
               irb (>= 1.3.6)
@@ -870,7 +1601,65 @@
 
         DEPENDENCIES
           debug
+        #{checksums}
+        BUNDLED WITH
+           #{Bundler::VERSION}
+      L
+    end
+  end
+
+  context "when a system gem has incorrect dependencies, different from remote gems" do
+    before do
+      build_repo4 do
+        build_gem "foo", "1.0.0" do |s|
+          s.add_dependency "bar"
+        end
+
+        build_gem "bar", "1.0.0"
+      end
+
+      system_gems "foo-1.0.0", gem_repo: gem_repo4, path: default_bundle_path
+
+      # simulate gemspec with wrong empty dependencies
+      foo_gemspec_path = default_bundle_path("specifications/foo-1.0.0.gemspec")
+      foo_gemspec = Gem::Specification.load(foo_gemspec_path.to_s)
+      foo_gemspec.dependencies.clear
+      File.write(foo_gemspec_path, foo_gemspec.to_ruby)
+    end
+
+    it "generates a lockfile using remote dependencies, and prints a warning" do
+      gemfile <<~G
+        source "https://gem.repo4"
+
+        gem "foo"
+      G
+
+      checksums = checksums_section_when_enabled do |c|
+        c.checksum gem_repo4, "foo", "1.0.0"
+        c.checksum gem_repo4, "bar", "1.0.0"
+      end
+
+      simulate_platform "x86_64-linux" do
+        bundle "lock --verbose"
+      end
+
+      expect(err).to eq("Local specification for foo-1.0.0 has different dependencies than the remote gem, ignoring it")
+
+      expect(lockfile).to eq <<~L
+        GEM
+          remote: https://gem.repo4/
+          specs:
+            bar (1.0.0)
+            foo (1.0.0)
+              bar
+
+        PLATFORMS
+          ruby
+          x86_64-linux
 
+        DEPENDENCIES
+          foo
+        #{checksums}
         BUNDLED WITH
            #{Bundler::VERSION}
       L
@@ -897,13 +1686,13 @@
     end
 
     gemfile <<~G
-      source "#{file_uri_for(gem_repo4)}"
+      source "https://gem.repo4"
 
       gem "rails", ">= 7.0.3.1"
       gem "activeadmin", "2.13.1"
     G
 
-    bundle "lock", :raise_on_error => false
+    bundle "lock", raise_on_error: false
 
     expect(err).to eq <<~ERR.strip
       Could not find compatible versions
@@ -911,7 +1700,7 @@
       Because rails >= 7.0.4 depends on railties = 7.0.4
         and rails < 7.0.4 depends on railties = 7.0.3.1,
         railties = 7.0.3.1 OR = 7.0.4 is required.
-      So, because railties = 7.0.3.1 OR = 7.0.4 could not be found in rubygems repository #{file_uri_for(gem_repo4)}/ or installed locally,
+      So, because railties = 7.0.3.1 OR = 7.0.4 could not be found in rubygems repository https://gem.repo4/ or installed locally,
         version solving has failed.
     ERR
   end
@@ -952,7 +1741,7 @@
     end
 
     gemfile <<~G
-      source "#{file_uri_for(gem_repo4)}"
+      source "https://gem.repo4"
 
       gem "rails", ">= 7.0.2.3"
       gem "activeadmin", "= 2.13.1"
@@ -960,7 +1749,7 @@
 
     lockfile <<~L
       GEM
-        remote: #{file_uri_for(gem_repo4)}/
+        remote: https://gem.repo4/
         specs:
           activeadmin (2.13.1)
             ransack (= 3.1.0)
@@ -968,7 +1757,7 @@
             activemodel (>= 6.0.4)
 
       PLATFORMS
-        #{lockfile_platforms}
+        #{local_platform}
 
       DEPENDENCIES
         activeadmin (= 2.13.1)
@@ -978,54 +1767,34 @@
          #{Bundler::VERSION}
     L
 
-    bundle "lock", :raise_on_error => false
-
-    expect(err).to eq <<~ERR.strip
+    expected_error = <<~ERR.strip
       Could not find compatible versions
 
-          Because every version of activemodel depends on activesupport = 6.0.4
-            and rails >= 7.0.2.3, < 7.0.3.1 depends on activesupport = 7.0.2.3,
-            every version of activemodel is incompatible with rails >= 7.0.2.3, < 7.0.3.1.
-          And because rails >= 7.0.2.3, < 7.0.3.1 depends on activemodel = 7.0.2.3,
-            rails >= 7.0.2.3, < 7.0.3.1 cannot be used.
-      (1) So, because rails >= 7.0.3.1, < 7.0.4 depends on activemodel = 7.0.3.1
-            and rails >= 7.0.4 depends on activemodel = 7.0.4,
-            rails >= 7.0.2.3 requires activemodel = 7.0.3.1 OR = 7.0.4.
+          Because rails >= 7.0.4 depends on activemodel = 7.0.4
+            and rails >= 7.0.3.1, < 7.0.4 depends on activemodel = 7.0.3.1,
+            rails >= 7.0.3.1 requires activemodel = 7.0.3.1 OR = 7.0.4.
+      (1) So, because rails >= 7.0.2.3, < 7.0.3.1 depends on activemodel = 7.0.2.3
+            and every version of activemodel depends on activesupport = 6.0.4,
+            rails >= 7.0.2.3 requires activesupport = 6.0.4.
 
-          Because rails >= 7.0.2.3, < 7.0.3.1 depends on activemodel = 7.0.2.3
+          Because rails >= 7.0.2.3, < 7.0.3.1 depends on activesupport = 7.0.2.3
             and rails >= 7.0.3.1, < 7.0.4 depends on activesupport = 7.0.3.1,
-            rails >= 7.0.2.3, < 7.0.4 requires activemodel = 7.0.2.3 or activesupport = 7.0.3.1.
-          And because rails >= 7.0.4 depends on activesupport = 7.0.4
-            and every version of activemodel depends on activesupport = 6.0.4,
-            activemodel != 7.0.2.3 is incompatible with rails >= 7.0.2.3.
-          And because rails >= 7.0.2.3 requires activemodel = 7.0.3.1 OR = 7.0.4 (1),
+            rails >= 7.0.2.3, < 7.0.4 requires activesupport = 7.0.2.3 OR = 7.0.3.1.
+          And because rails >= 7.0.4 depends on activesupport = 7.0.4,
+            rails >= 7.0.2.3 requires activesupport = 7.0.2.3 OR = 7.0.3.1 OR = 7.0.4.
+          And because rails >= 7.0.2.3 requires activesupport = 6.0.4 (1),
             rails >= 7.0.2.3 cannot be used.
           So, because Gemfile depends on rails >= 7.0.2.3,
             version solving has failed.
     ERR
 
-    lockfile lockfile.gsub(/PLATFORMS\n  #{lockfile_platforms}/m, "PLATFORMS\n  #{lockfile_platforms("ruby")}")
-
-    bundle "lock", :raise_on_error => false
+    bundle "lock", raise_on_error: false
+    expect(err).to eq(expected_error)
 
-    expect(err).to eq <<~ERR.strip
-      Could not find compatible versions
+    lockfile lockfile.gsub(/PLATFORMS\n  #{local_platform}/m, "PLATFORMS\n  #{lockfile_platforms("ruby")}")
 
-      Because rails >= 7.0.3.1, < 7.0.4 depends on activemodel = 7.0.3.1
-        and rails >= 7.0.2.3, < 7.0.3.1 depends on activemodel = 7.0.2.3,
-        rails >= 7.0.2.3, < 7.0.4 requires activemodel = 7.0.2.3 OR = 7.0.3.1.
-      And because every version of activemodel depends on activesupport = 6.0.4,
-        rails >= 7.0.2.3, < 7.0.4 requires activesupport = 6.0.4.
-      Because rails >= 7.0.3.1, < 7.0.4 depends on activesupport = 7.0.3.1
-        and rails >= 7.0.2.3, < 7.0.3.1 depends on activesupport = 7.0.2.3,
-        rails >= 7.0.2.3, < 7.0.4 requires activesupport = 7.0.2.3 OR = 7.0.3.1.
-      Thus, rails >= 7.0.2.3, < 7.0.4 cannot be used.
-      And because rails >= 7.0.4 depends on activemodel = 7.0.4,
-        rails >= 7.0.2.3 requires activemodel = 7.0.4.
-      So, because activemodel = 7.0.4 could not be found in rubygems repository #{file_uri_for(gem_repo4)}/ or installed locally
-        and Gemfile depends on rails >= 7.0.2.3,
-        version solving has failed.
-    ERR
+    bundle "lock", raise_on_error: false
+    expect(err).to eq(expected_error)
   end
 
   it "does not accidentally resolves to prereleases" do
@@ -1045,7 +1814,7 @@
     end
 
     gemfile <<~G
-      source "#{file_uri_for(gem_repo4)}"
+      source "https://gem.repo4"
       gem "autoproj", ">= 2.0.0"
     G
 
@@ -1070,7 +1839,7 @@
     end
 
     gemfile <<~G
-      source "#{file_uri_for(gem_repo4)}"
+      source "https://gem.repo4"
       gem "rails"
     G
 
@@ -1093,34 +1862,260 @@
     end
 
     gemfile <<~G
-      source "#{file_uri_for(gem_repo4)}"
+      source "https://gem.repo4"
       gem "activerecord", "6.0.6"
       gem "activerecord-jdbc-adapter", "61.0"
     G
 
     simulate_platform "universal-java-19" do
-      bundle "lock", :raise_on_error => false
+      bundle "lock", raise_on_error: false
     end
 
     expect(err).to include("Could not find compatible versions")
     expect(err).not_to include("ERROR REPORT TEMPLATE")
   end
 
-  context "when re-resolving to include prereleases" do
-    before do
-      build_repo4 do
-        build_gem "tzinfo-data", "1.2022.7"
-        build_gem "rails", "7.1.0.alpha" do |s|
-          s.add_dependency "activesupport"
-        end
-        build_gem "activesupport", "7.1.0.alpha"
+  it "adds checksums to an existing lockfile, when re-resolving is necessary" do
+    build_repo4 do
+      build_gem "nokogiri", "1.14.2"
+      build_gem "nokogiri", "1.14.2" do |s|
+        s.platform = "x86_64-linux"
       end
     end
 
-    it "does not end up including gems scoped to other platforms in the lockfile" do
-      gemfile <<-G
-        source "#{file_uri_for(gem_repo4)}"
-        gem "rails"
+    gemfile <<-G
+      source "https://gem.repo4"
+
+      gem "nokogiri"
+    G
+
+    # lockfile has a typo (nogokiri) in the dependencies section, so Bundler
+    # sees dependencies have changed, and re-resolves
+    lockfile <<~L
+      GEM
+        remote: https://gem.repo4/
+        specs:
+          nokogiri (1.14.2)
+          nokogiri (1.14.2-x86_64-linux)
+
+      PLATFORMS
+        ruby
+        x86_64-linux
+
+      DEPENDENCIES
+        nogokiri
+
+      BUNDLED WITH
+         #{Bundler::VERSION}
+    L
+
+    simulate_platform "x86_64-linux" do
+      bundle "lock --add-checksums"
+    end
+
+    checksums = checksums_section do |c|
+      c.checksum gem_repo4, "nokogiri", "1.14.2"
+      c.checksum gem_repo4, "nokogiri", "1.14.2", "x86_64-linux"
+    end
+
+    expect(lockfile).to eq <<~L
+      GEM
+        remote: https://gem.repo4/
+        specs:
+          nokogiri (1.14.2)
+          nokogiri (1.14.2-x86_64-linux)
+
+      PLATFORMS
+        ruby
+        x86_64-linux
+
+      DEPENDENCIES
+        nokogiri
+      #{checksums}
+      BUNDLED WITH
+         #{Bundler::VERSION}
+    L
+  end
+
+  it "adds checksums to an existing lockfile, when no re-resolve is necessary" do
+    build_repo4 do
+      build_gem "nokogiri", "1.14.2"
+      build_gem "nokogiri", "1.14.2" do |s|
+        s.platform = "x86_64-linux"
+      end
+    end
+
+    gemfile <<-G
+      source "https://gem.repo4"
+
+      gem "nokogiri"
+    G
+
+    lockfile <<~L
+      GEM
+        remote: https://gem.repo4/
+        specs:
+          nokogiri (1.14.2)
+          nokogiri (1.14.2-x86_64-linux)
+
+      PLATFORMS
+        ruby
+        x86_64-linux
+
+      DEPENDENCIES
+        nokogiri
+
+      BUNDLED WITH
+         #{Bundler::VERSION}
+    L
+
+    simulate_platform "x86_64-linux" do
+      bundle "lock --add-checksums"
+    end
+
+    checksums = checksums_section do |c|
+      c.checksum gem_repo4, "nokogiri", "1.14.2"
+      c.checksum gem_repo4, "nokogiri", "1.14.2", "x86_64-linux"
+    end
+
+    expect(lockfile).to eq <<~L
+      GEM
+        remote: https://gem.repo4/
+        specs:
+          nokogiri (1.14.2)
+          nokogiri (1.14.2-x86_64-linux)
+
+      PLATFORMS
+        ruby
+        x86_64-linux
+
+      DEPENDENCIES
+        nokogiri
+      #{checksums}
+      BUNDLED WITH
+         #{Bundler::VERSION}
+    L
+  end
+
+  it "adds checksums to an existing lockfile, when gems are already installed" do
+    build_repo4 do
+      build_gem "nokogiri", "1.14.2"
+      build_gem "nokogiri", "1.14.2" do |s|
+        s.platform = "x86_64-linux"
+      end
+    end
+
+    gemfile <<-G
+      source "https://gem.repo4"
+
+      gem "nokogiri"
+    G
+
+    lockfile <<~L
+      GEM
+        remote: https://gem.repo4/
+        specs:
+          nokogiri (1.14.2)
+          nokogiri (1.14.2-x86_64-linux)
+
+      PLATFORMS
+        ruby
+        x86_64-linux
+
+      DEPENDENCIES
+        nokogiri
+
+      BUNDLED WITH
+         #{Bundler::VERSION}
+    L
+
+    simulate_platform "x86_64-linux" do
+      bundle "install"
+
+      bundle "lock --add-checksums"
+    end
+
+    checksums = checksums_section do |c|
+      c.checksum gem_repo4, "nokogiri", "1.14.2"
+      c.checksum gem_repo4, "nokogiri", "1.14.2", "x86_64-linux"
+    end
+
+    expect(lockfile).to eq <<~L
+      GEM
+        remote: https://gem.repo4/
+        specs:
+          nokogiri (1.14.2)
+          nokogiri (1.14.2-x86_64-linux)
+
+      PLATFORMS
+        ruby
+        x86_64-linux
+
+      DEPENDENCIES
+        nokogiri
+      #{checksums}
+      BUNDLED WITH
+         #{Bundler::VERSION}
+    L
+  end
+
+  it "generates checksums by default if configured to do so" do
+    build_repo4 do
+      build_gem "nokogiri", "1.14.2"
+      build_gem "nokogiri", "1.14.2" do |s|
+        s.platform = "x86_64-linux"
+      end
+    end
+
+    bundle "config lockfile_checksums true"
+
+    simulate_platform "x86_64-linux" do
+      install_gemfile <<-G
+        source "https://gem.repo4"
+
+        gem "nokogiri"
+      G
+    end
+
+    checksums = checksums_section do |c|
+      c.checksum gem_repo4, "nokogiri", "1.14.2"
+      c.checksum gem_repo4, "nokogiri", "1.14.2", "x86_64-linux"
+    end
+
+    expect(lockfile).to eq <<~L
+      GEM
+        remote: https://gem.repo4/
+        specs:
+          nokogiri (1.14.2)
+          nokogiri (1.14.2-x86_64-linux)
+
+      PLATFORMS
+        ruby
+        x86_64-linux
+
+      DEPENDENCIES
+        nokogiri
+      #{checksums}
+      BUNDLED WITH
+         #{Bundler::VERSION}
+    L
+  end
+
+  context "when re-resolving to include prereleases" do
+    before do
+      build_repo4 do
+        build_gem "tzinfo-data", "1.2022.7"
+        build_gem "rails", "7.1.0.alpha" do |s|
+          s.add_dependency "activesupport"
+        end
+        build_gem "activesupport", "7.1.0.alpha"
+      end
+    end
+
+    it "does not end up including gems scoped to other platforms in the lockfile" do
+      gemfile <<-G
+        source "https://gem.repo4"
+        gem "rails"
         gem "tzinfo-data", platform: :windows
       G
 
@@ -1134,7 +2129,7 @@
 
   context "when resolving platform specific gems as indirect dependencies on truffleruby", :truffleruby_only do
     before do
-      build_lib "foo", :path => bundled_app do |s|
+      build_lib "foo", path: bundled_app do |s|
         s.add_dependency "nokogiri"
       end
 
@@ -1146,12 +2141,18 @@
       end
 
       gemfile <<-G
-        source "#{file_uri_for(gem_repo4)}"
+        source "https://gem.repo4"
         gemspec
       G
     end
 
-    it "locks ruby specs" do
+    it "locks both ruby and platform specific specs" do
+      checksums = checksums_section_when_enabled do |c|
+        c.no_checksum "foo", "1.0"
+        c.checksum gem_repo4, "nokogiri", "1.14.2"
+        c.checksum gem_repo4, "nokogiri", "1.14.2", "x86_64-linux"
+      end
+
       simulate_platform "x86_64-linux" do
         bundle "lock"
       end
@@ -1164,20 +2165,89 @@
               nokogiri
 
         GEM
-          remote: #{file_uri_for(gem_repo4)}/
+          remote: https://gem.repo4/
           specs:
             nokogiri (1.14.2)
+            nokogiri (1.14.2-x86_64-linux)
 
         PLATFORMS
+          ruby
           x86_64-linux
 
         DEPENDENCIES
           foo!
-
+        #{checksums}
         BUNDLED WITH
            #{Bundler::VERSION}
       L
     end
+
+    context "and a lockfile with platform specific gems only already exists" do
+      before do
+        checksums = checksums_section_when_enabled do |c|
+          c.no_checksum "foo", "1.0"
+          c.checksum gem_repo4, "nokogiri", "1.14.2", "x86_64-linux"
+        end
+
+        lockfile <<~L
+          PATH
+            remote: .
+            specs:
+              foo (1.0)
+                nokogiri
+
+          GEM
+            remote: https://gem.repo4/
+            specs:
+              nokogiri (1.14.2-x86_64-linux)
+
+          PLATFORMS
+            x86_64-linux
+
+          DEPENDENCIES
+            foo!
+          #{checksums}
+          BUNDLED WITH
+             #{Bundler::VERSION}
+        L
+      end
+
+      it "keeps platform specific gems" do
+        checksums = checksums_section_when_enabled do |c|
+          c.no_checksum "foo", "1.0"
+          c.checksum gem_repo4, "nokogiri", "1.14.2"
+          c.checksum gem_repo4, "nokogiri", "1.14.2", "x86_64-linux"
+        end
+
+        simulate_platform "x86_64-linux" do
+          bundle "install"
+        end
+
+        expect(lockfile).to eq <<~L
+          PATH
+            remote: .
+            specs:
+              foo (1.0)
+                nokogiri
+
+          GEM
+            remote: https://gem.repo4/
+            specs:
+              nokogiri (1.14.2)
+              nokogiri (1.14.2-x86_64-linux)
+
+          PLATFORMS
+            ruby
+            x86_64-linux
+
+          DEPENDENCIES
+            foo!
+          #{checksums}
+          BUNDLED WITH
+             #{Bundler::VERSION}
+        L
+      end
+    end
   end
 
   context "when adding a new gem that requires unlocking other transitive deps" do
@@ -1201,7 +2271,7 @@
       end
 
       gemfile <<~G
-        source "#{file_uri_for(gem_repo4)}"
+        source "https://gem.repo4"
 
         gem "govuk_app_config"
         gem "activesupport", "7.0.4.3"
@@ -1212,7 +2282,7 @@
       # version
       lockfile <<~L
         GEM
-          remote: #{file_uri_for(gem_repo4)}/
+          remote: https://gem.repo4/
           specs:
             actionpack (7.0.4.1)
             activesupport (7.0.4.1)
@@ -1234,13 +2304,20 @@
     end
 
     it "does not downgrade top level dependencies" do
+      checksums = checksums_section_when_enabled do |c|
+        c.no_checksum "actionpack", "7.0.4.3"
+        c.no_checksum "activesupport", "7.0.4.3"
+        c.no_checksum "govuk_app_config", "4.13.0"
+        c.no_checksum "railties", "7.0.4.3"
+      end
+
       simulate_platform "arm64-darwin-22" do
         bundle "lock"
       end
 
       expect(lockfile).to eq <<~L
         GEM
-          remote: #{file_uri_for(gem_repo4)}/
+          remote: https://gem.repo4/
           specs:
             actionpack (7.0.4.3)
             activesupport (7.0.4.3)
@@ -1256,10 +2333,331 @@
         DEPENDENCIES
           activesupport (= 7.0.4.3)
           govuk_app_config
+        #{checksums}
+        BUNDLED WITH
+           #{Bundler::VERSION}
+      L
+    end
+  end
+
+  context "when lockfile has incorrectly indented platforms" do
+    before do
+      build_repo4 do
+        build_gem "ffi", "1.1.0" do |s|
+          s.platform = "x86_64-linux"
+        end
+
+        build_gem "ffi", "1.1.0" do |s|
+          s.platform = "arm64-darwin"
+        end
+      end
+
+      gemfile <<~G
+        source "https://gem.repo4"
+
+        gem "ffi"
+      G
+
+      lockfile <<~L
+        GEM
+          remote: https://gem.repo4/
+          specs:
+            ffi (1.1.0-arm64-darwin)
+
+        PLATFORMS
+           arm64-darwin
+
+        DEPENDENCIES
+          ffi
 
         BUNDLED WITH
            #{Bundler::VERSION}
       L
     end
+
+    it "does not remove any gems" do
+      simulate_platform "x86_64-linux" do
+        bundle "lock --update"
+      end
+
+      expect(lockfile).to eq <<~L
+        GEM
+          remote: https://gem.repo4/
+          specs:
+            ffi (1.1.0-arm64-darwin)
+            ffi (1.1.0-x86_64-linux)
+
+        PLATFORMS
+          arm64-darwin
+          x86_64-linux
+
+        DEPENDENCIES
+          ffi
+
+        BUNDLED WITH
+           #{Bundler::VERSION}
+      L
+    end
+  end
+
+  describe "--normalize-platforms on linux" do
+    let(:normalized_lockfile) do
+      <<~L
+        GEM
+          remote: https://gem.repo4/
+          specs:
+            irb (1.0.0)
+            irb (1.0.0-x86_64-linux)
+
+        PLATFORMS
+          ruby
+          x86_64-linux
+
+        DEPENDENCIES
+          irb
+
+        BUNDLED WITH
+           #{Bundler::VERSION}
+      L
+    end
+
+    before do
+      build_repo4 do
+        build_gem "irb", "1.0.0"
+
+        build_gem "irb", "1.0.0" do |s|
+          s.platform = "x86_64-linux"
+        end
+      end
+
+      gemfile <<~G
+        source "https://gem.repo4"
+
+        gem "irb"
+      G
+    end
+
+    context "when already normalized" do
+      before do
+        lockfile normalized_lockfile
+      end
+
+      it "is a noop" do
+        simulate_platform "x86_64-linux" do
+          bundle "lock --normalize-platforms"
+        end
+
+        expect(lockfile).to eq(normalized_lockfile)
+      end
+    end
+
+    context "when not already normalized" do
+      before do
+        lockfile <<~L
+          GEM
+            remote: https://gem.repo4/
+            specs:
+              irb (1.0.0)
+
+          PLATFORMS
+             ruby
+
+          DEPENDENCIES
+            irb
+
+          BUNDLED WITH
+             #{Bundler::VERSION}
+        L
+      end
+
+      it "normalizes the list of platforms and native gems in the lockfile" do
+        simulate_platform "x86_64-linux" do
+          bundle "lock --normalize-platforms"
+        end
+
+        expect(lockfile).to eq(normalized_lockfile)
+      end
+    end
+  end
+
+  describe "--normalize-platforms on darwin" do
+    let(:normalized_lockfile) do
+      <<~L
+        GEM
+          remote: https://gem.repo4/
+          specs:
+            irb (1.0.0)
+            irb (1.0.0-arm64-darwin)
+
+        PLATFORMS
+          arm64-darwin
+          ruby
+
+        DEPENDENCIES
+          irb
+
+        BUNDLED WITH
+           #{Bundler::VERSION}
+      L
+    end
+
+    before do
+      build_repo4 do
+        build_gem "irb", "1.0.0"
+
+        build_gem "irb", "1.0.0" do |s|
+          s.platform = "arm64-darwin"
+        end
+      end
+
+      gemfile <<~G
+        source "https://gem.repo4"
+
+        gem "irb"
+      G
+    end
+
+    context "when already normalized" do
+      before do
+        lockfile normalized_lockfile
+      end
+
+      it "is a noop" do
+        simulate_platform "arm64-darwin-23" do
+          bundle "lock --normalize-platforms"
+        end
+
+        expect(lockfile).to eq(normalized_lockfile)
+      end
+    end
+
+    context "when having only ruby" do
+      before do
+        lockfile <<~L
+          GEM
+            remote: https://gem.repo4/
+            specs:
+              irb (1.0.0)
+
+          PLATFORMS
+             ruby
+
+          DEPENDENCIES
+            irb
+
+          BUNDLED WITH
+             #{Bundler::VERSION}
+        L
+      end
+
+      it "normalizes the list of platforms and native gems in the lockfile" do
+        simulate_platform "arm64-darwin-23" do
+          bundle "lock --normalize-platforms"
+        end
+
+        expect(lockfile).to eq(normalized_lockfile)
+      end
+    end
+
+    context "when having only the current platform with version" do
+      before do
+        lockfile <<~L
+          GEM
+            remote: https://gem.repo4/
+            specs:
+              irb (1.0.0-arm64-darwin)
+
+          PLATFORMS
+             arm64-darwin-23
+
+          DEPENDENCIES
+            irb
+
+          BUNDLED WITH
+             #{Bundler::VERSION}
+        L
+      end
+
+      it "normalizes the list of platforms by removing version" do
+        simulate_platform "arm64-darwin-23" do
+          bundle "lock --normalize-platforms"
+        end
+
+        expect(lockfile).to eq(normalized_lockfile)
+      end
+    end
+
+    context "when having other platforms with version" do
+      before do
+        lockfile <<~L
+          GEM
+            remote: https://gem.repo4/
+            specs:
+              irb (1.0.0-arm64-darwin)
+
+          PLATFORMS
+             arm64-darwin-22
+
+          DEPENDENCIES
+            irb
+
+          BUNDLED WITH
+             #{Bundler::VERSION}
+        L
+      end
+
+      it "normalizes the list of platforms by removing version" do
+        simulate_platform "arm64-darwin-23" do
+          bundle "lock --normalize-platforms"
+        end
+
+        expect(lockfile).to eq(normalized_lockfile)
+      end
+    end
+  end
+
+  describe "--normalize-platforms with gems without generic variant" do
+    let(:original_lockfile) do
+      <<~L
+        GEM
+          remote: https://gem.repo4/
+          specs:
+            sorbet-static (1.0-x86_64-linux)
+
+        PLATFORMS
+          ruby
+          x86_64-linux
+
+        DEPENDENCIES
+          sorbet-static
+
+        BUNDLED WITH
+           #{Bundler::VERSION}
+      L
+    end
+
+    before do
+      build_repo4 do
+        build_gem "sorbet-static" do |s|
+          s.platform = "x86_64-linux"
+        end
+      end
+
+      gemfile <<~G
+        source "https://gem.repo4"
+
+        gem "sorbet-static"
+      G
+
+      lockfile original_lockfile
+    end
+
+    it "removes invalid platforms" do
+      simulate_platform "x86_64-linux" do
+        bundle "lock --normalize-platforms"
+      end
+
+      expect(lockfile).to eq(original_lockfile.gsub(/^  ruby\n/m, ""))
+    end
   end
 end
diff --git a/spec/bundler/commands/newgem_spec.rb b/spec/bundler/commands/newgem_spec.rb
index e06c8c8dd385ec..c1ab26ec10db2b 100644
--- a/spec/bundler/commands/newgem_spec.rb
+++ b/spec/bundler/commands/newgem_spec.rb
@@ -6,52 +6,58 @@ def gem_skeleton_assertions
     expect(bundled_app("#{gem_name}/README.md")).to exist
     expect(bundled_app("#{gem_name}/Gemfile")).to exist
     expect(bundled_app("#{gem_name}/Rakefile")).to exist
-    expect(bundled_app("#{gem_name}/lib/#{require_path}.rb")).to exist
-    expect(bundled_app("#{gem_name}/lib/#{require_path}/version.rb")).to exist
+    expect(bundled_app("#{gem_name}/lib/#{gem_name}.rb")).to exist
+    expect(bundled_app("#{gem_name}/lib/#{gem_name}/version.rb")).to exist
+
+    expect(ignore_paths).to include("bin/")
+    expect(ignore_paths).to include("Gemfile")
   end
 
   def bundle_exec_rubocop
     prepare_gemspec(bundled_app(gem_name, "#{gem_name}.gemspec"))
-    bundle "config set path #{rubocop_gems}", :dir => bundled_app(gem_name)
-    bundle "exec rubocop --debug --config .rubocop.yml", :dir => bundled_app(gem_name)
+    bundle "config set path #{rubocop_gem_path}", dir: bundled_app(gem_name)
+    bundle "exec rubocop --debug --config .rubocop.yml", dir: bundled_app(gem_name)
   end
 
   def bundle_exec_standardrb
     prepare_gemspec(bundled_app(gem_name, "#{gem_name}.gemspec"))
-    bundle "config set path #{standard_gems}", :dir => bundled_app(gem_name)
-    bundle "exec standardrb --debug", :dir => bundled_app(gem_name)
+    bundle "config set path #{standard_gem_path}", dir: bundled_app(gem_name)
+    bundle "exec standardrb --debug", dir: bundled_app(gem_name)
+  end
+
+  def ignore_paths
+    generated = bundled_app("#{gem_name}/#{gem_name}.gemspec").read
+    matched = generated.match(/^\s+f\.start_with\?\(\*%w\[(?<ignored>.*)\]\)$/)
+    matched[:ignored]&.split(" ")
   end
 
   let(:generated_gemspec) { Bundler.load_gemspec_uncached(bundled_app(gem_name).join("#{gem_name}.gemspec")) }
 
   let(:gem_name) { "mygem" }
 
-  let(:require_path) { "mygem" }
-
-  let(:minitest_test_file_path) { "test/test_mygem.rb" }
-
-  let(:minitest_test_class_name) { "class TestMygem < Minitest::Test" }
-
   before do
-    sys_exec("git config --global user.name 'Bundler User'")
-    sys_exec("git config --global user.email user@example.com")
-    sys_exec("git config --global github.user bundleuser")
+    git("config --global user.name 'Bundler User'")
+    git("config --global user.email user@example.com")
+    git("config --global github.user bundleuser")
+
+    global_config "BUNDLE_GEM__MIT" => "false", "BUNDLE_GEM__TEST" => "false", "BUNDLE_GEM__COC" => "false", "BUNDLE_GEM__LINTER" => "false",
+                  "BUNDLE_GEM__CI" => "false", "BUNDLE_GEM__CHANGELOG" => "false", "BUNDLE_GEM__BUNDLE" => "false"
   end
 
   describe "git repo initialization" do
-    it "generates a gem skeleton with a .git folder", :readline do
+    it "generates a gem skeleton with a .git folder" do
       bundle "gem #{gem_name}"
       gem_skeleton_assertions
       expect(bundled_app("#{gem_name}/.git")).to exist
     end
 
-    it "generates a gem skeleton with a .git folder when passing --git", :readline do
+    it "generates a gem skeleton with a .git folder when passing --git" do
       bundle "gem #{gem_name} --git"
       gem_skeleton_assertions
       expect(bundled_app("#{gem_name}/.git")).to exist
     end
 
-    it "generates a gem skeleton without a .git folder when passing --no-git", :readline do
+    it "generates a gem skeleton without a .git folder when passing --no-git" do
       bundle "gem #{gem_name} --no-git"
       gem_skeleton_assertions
       expect(bundled_app("#{gem_name}/.git")).not_to exist
@@ -62,8 +68,10 @@ def bundle_exec_standardrb
         Dir.mkdir(bundled_app("path with spaces"))
       end
 
-      it "properly initializes git repo", :readline do
-        bundle "gem #{gem_name}", :dir => bundled_app("path with spaces")
+      it "properly initializes git repo" do
+        skip "path with spaces needs special handling on Windows" if Gem.win_platform?
+
+        bundle "gem #{gem_name}", dir: bundled_app("path with spaces")
         expect(bundled_app("path with spaces/#{gem_name}/.git")).to exist
       end
     end
@@ -103,8 +111,8 @@ def bundle_exec_standardrb
       expect(bundled_app("#{gem_name}/README.md").read).to match(%r{https://github\.com/bundleuser/#{gem_name}/blob/.*/CODE_OF_CONDUCT.md})
     end
 
-    it "generates the README with a section for the Code of Conduct, respecting the configured git default branch", :git => ">= 2.28.0" do
-      sys_exec("git config --global init.defaultBranch main")
+    it "generates the README with a section for the Code of Conduct, respecting the configured git default branch", git: ">= 2.28.0" do
+      git("config --global init.defaultBranch main")
       bundle "gem #{gem_name} --coc"
 
       expect(bundled_app("#{gem_name}/README.md").read).to include("## Code of Conduct")
@@ -131,7 +139,7 @@ def bundle_exec_standardrb
     before do
       bundle "gem #{gem_name} --changelog"
     end
-    it "generates a gem skeleton with a CHANGELOG", :readline do
+    it "generates a gem skeleton with a CHANGELOG" do
       gem_skeleton_assertions
       expect(bundled_app("#{gem_name}/CHANGELOG.md")).to exist
     end
@@ -141,21 +149,42 @@ def bundle_exec_standardrb
     before do
       bundle "gem #{gem_name} --no-changelog"
     end
-    it "generates a gem skeleton without a CHANGELOG", :readline do
+    it "generates a gem skeleton without a CHANGELOG" do
       gem_skeleton_assertions
       expect(bundled_app("#{gem_name}/CHANGELOG.md")).to_not exist
     end
   end
 
+  shared_examples_for "--bundle flag" do
+    before do
+      bundle "gem #{gem_name} --bundle"
+    end
+    it "generates a gem skeleton with bundle install" do
+      gem_skeleton_assertions
+      expect(out).to include("Running bundle install in the new gem directory.")
+    end
+  end
+
+  shared_examples_for "--no-bundle flag" do
+    before do
+      bundle "gem #{gem_name} --no-bundle"
+    end
+    it "generates a gem skeleton without bundle install" do
+      gem_skeleton_assertions
+      expect(out).to_not include("Running bundle install in the new gem directory.")
+    end
+  end
+
   shared_examples_for "--rubocop flag" do
-    context "is deprecated", :bundler => "< 3" do
+    context "is deprecated" do
       before do
+        global_config "BUNDLE_GEM__LINTER" => nil
         bundle "gem #{gem_name} --rubocop"
       end
 
       it "generates a gem skeleton with rubocop" do
         gem_skeleton_assertions
-        expect(bundled_app("test-gem/Rakefile")).to read_as(
+        expect(bundled_app("#{gem_name}/Rakefile")).to read_as(
           include("# frozen_string_literal: true").
           and(include('require "rubocop/rake_task"').
           and(include("RuboCop::RakeTask.new").
@@ -175,11 +204,15 @@ def bundle_exec_standardrb
       it "generates a default .rubocop.yml" do
         expect(bundled_app("#{gem_name}/.rubocop.yml")).to exist
       end
+
+      it "includes .rubocop.yml into ignore list" do
+        expect(ignore_paths).to include(".rubocop.yml")
+      end
     end
   end
 
   shared_examples_for "--no-rubocop flag" do
-    context "is deprecated", :bundler => "< 3" do
+    context "is deprecated" do
       define_negated_matcher :exclude, :include
 
       before do
@@ -188,8 +221,8 @@ def bundle_exec_standardrb
 
       it "generates a gem skeleton without rubocop" do
         gem_skeleton_assertions
-        expect(bundled_app("test-gem/Rakefile")).to read_as(exclude("rubocop"))
-        expect(bundled_app("test-gem/#{gem_name}.gemspec")).to read_as(exclude("rubocop"))
+        expect(bundled_app("#{gem_name}/Rakefile")).to read_as(exclude("rubocop"))
+        expect(bundled_app("#{gem_name}/#{gem_name}.gemspec")).to read_as(exclude("rubocop"))
       end
 
       it "does not include rubocop in generated Gemfile" do
@@ -204,6 +237,10 @@ def bundle_exec_standardrb
       it "doesn't generate a default .rubocop.yml" do
         expect(bundled_app("#{gem_name}/.rubocop.yml")).to_not exist
       end
+
+      it "does not add .rubocop.yml into ignore list" do
+        expect(ignore_paths).not_to include(".rubocop.yml")
+      end
     end
   end
 
@@ -214,7 +251,7 @@ def bundle_exec_standardrb
 
     it "generates a gem skeleton with rubocop" do
       gem_skeleton_assertions
-      expect(bundled_app("test-gem/Rakefile")).to read_as(
+      expect(bundled_app("#{gem_name}/Rakefile")).to read_as(
         include("# frozen_string_literal: true").
         and(include('require "rubocop/rake_task"').
         and(include("RuboCop::RakeTask.new").
@@ -234,6 +271,10 @@ def bundle_exec_standardrb
     it "generates a default .rubocop.yml" do
       expect(bundled_app("#{gem_name}/.rubocop.yml")).to exist
     end
+
+    it "includes .rubocop.yml into ignore list" do
+      expect(ignore_paths).to include(".rubocop.yml")
+    end
   end
 
   shared_examples_for "--linter=standard flag" do
@@ -243,7 +284,7 @@ def bundle_exec_standardrb
 
     it "generates a gem skeleton with standard" do
       gem_skeleton_assertions
-      expect(bundled_app("test-gem/Rakefile")).to read_as(
+      expect(bundled_app("#{gem_name}/Rakefile")).to read_as(
         include('require "standard/rake"').
         and(match(/default:.+:standard/))
       )
@@ -261,19 +302,23 @@ def bundle_exec_standardrb
     it "generates a default .standard.yml" do
       expect(bundled_app("#{gem_name}/.standard.yml")).to exist
     end
+
+    it "includes .standard.yml into ignore list" do
+      expect(ignore_paths).to include(".standard.yml")
+    end
   end
 
-  shared_examples_for "--linter=none flag" do
+  shared_examples_for "--no-linter flag" do
     define_negated_matcher :exclude, :include
 
     before do
-      bundle "gem #{gem_name} --linter=none"
+      bundle "gem #{gem_name} --no-linter"
     end
 
     it "generates a gem skeleton without rubocop" do
       gem_skeleton_assertions
-      expect(bundled_app("test-gem/Rakefile")).to read_as(exclude("rubocop"))
-      expect(bundled_app("test-gem/#{gem_name}.gemspec")).to read_as(exclude("rubocop"))
+      expect(bundled_app("#{gem_name}/Rakefile")).to read_as(exclude("rubocop"))
+      expect(bundled_app("#{gem_name}/#{gem_name}.gemspec")).to read_as(exclude("rubocop"))
     end
 
     it "does not include rubocop in generated Gemfile" do
@@ -298,83 +343,87 @@ def bundle_exec_standardrb
       expect(bundled_app("#{gem_name}/.rubocop.yml")).to_not exist
     end
 
+    it "does not add .rubocop.yml into ignore list" do
+      expect(ignore_paths).not_to include(".rubocop.yml")
+    end
+
     it "doesn't generate a default .standard.yml" do
       expect(bundled_app("#{gem_name}/.standard.yml")).to_not exist
     end
+
+    it "does not add .standard.yml into ignore list" do
+      expect(ignore_paths).not_to include(".standard.yml")
+    end
   end
 
-  it "has no rubocop offenses when using --linter=rubocop flag", :readline do
+  it "has no rubocop offenses when using --linter=rubocop flag" do
     skip "ruby_core has an 'ast.rb' file that gets in the middle and breaks this spec" if ruby_core?
     bundle "gem #{gem_name} --linter=rubocop"
     bundle_exec_rubocop
     expect(last_command).to be_success
   end
 
-  it "has no rubocop offenses when using --ext=c and --linter=rubocop flag", :readline do
+  it "has no rubocop offenses when using --ext=c and --linter=rubocop flag" do
     skip "ruby_core has an 'ast.rb' file that gets in the middle and breaks this spec" if ruby_core?
     bundle "gem #{gem_name} --ext=c --linter=rubocop"
     bundle_exec_rubocop
     expect(last_command).to be_success
   end
 
-  it "has no rubocop offenses when using --ext=c, --test=minitest, and --linter=rubocop flag", :readline do
+  it "has no rubocop offenses when using --ext=c, --test=minitest, and --linter=rubocop flag" do
     skip "ruby_core has an 'ast.rb' file that gets in the middle and breaks this spec" if ruby_core?
     bundle "gem #{gem_name} --ext=c --test=minitest --linter=rubocop"
     bundle_exec_rubocop
     expect(last_command).to be_success
   end
 
-  it "has no rubocop offenses when using --ext=c, --test=rspec, and --linter=rubocop flag", :readline do
+  it "has no rubocop offenses when using --ext=c, --test=rspec, and --linter=rubocop flag" do
     skip "ruby_core has an 'ast.rb' file that gets in the middle and breaks this spec" if ruby_core?
     bundle "gem #{gem_name} --ext=c --test=rspec --linter=rubocop"
     bundle_exec_rubocop
     expect(last_command).to be_success
   end
 
-  it "has no rubocop offenses when using --ext=c, --test=test-unit, and --linter=rubocop flag", :readline do
+  it "has no rubocop offenses when using --ext=c, --test=test-unit, and --linter=rubocop flag" do
     skip "ruby_core has an 'ast.rb' file that gets in the middle and breaks this spec" if ruby_core?
     bundle "gem #{gem_name} --ext=c --test=test-unit --linter=rubocop"
     bundle_exec_rubocop
     expect(last_command).to be_success
   end
 
-  it "has no standard offenses when using --linter=standard flag", :readline do
+  it "has no standard offenses when using --linter=standard flag" do
     skip "ruby_core has an 'ast.rb' file that gets in the middle and breaks this spec" if ruby_core?
     bundle "gem #{gem_name} --linter=standard"
     bundle_exec_standardrb
     expect(last_command).to be_success
   end
 
-  it "has no rubocop offenses when using --ext=rust and --linter=rubocop flag", :readline do
+  it "has no rubocop offenses when using --ext=rust and --linter=rubocop flag" do
     skip "ruby_core has an 'ast.rb' file that gets in the middle and breaks this spec" if ruby_core?
-    skip "RubyGems incompatible with Rust builder" if ::Gem::Version.new("3.3.11") > ::Gem.rubygems_version
 
     bundle "gem #{gem_name} --ext=rust --linter=rubocop"
     bundle_exec_rubocop
     expect(last_command).to be_success
   end
 
-  it "has no rubocop offenses when using --ext=rust, --test=minitest, and --linter=rubocop flag", :readline do
+  it "has no rubocop offenses when using --ext=rust, --test=minitest, and --linter=rubocop flag" do
     skip "ruby_core has an 'ast.rb' file that gets in the middle and breaks this spec" if ruby_core?
-    skip "RubyGems incompatible with Rust builder" if ::Gem::Version.new("3.3.11") > ::Gem.rubygems_version
 
     bundle "gem #{gem_name} --ext=rust --test=minitest --linter=rubocop"
     bundle_exec_rubocop
     expect(last_command).to be_success
   end
 
-  it "has no rubocop offenses when using --ext=rust, --test=rspec, and --linter=rubocop flag", :readline do
+  it "has no rubocop offenses when using --ext=rust, --test=rspec, and --linter=rubocop flag" do
     skip "ruby_core has an 'ast.rb' file that gets in the middle and breaks this spec" if ruby_core?
-    skip "RubyGems incompatible with Rust builder" if ::Gem::Version.new("3.3.11") > ::Gem.rubygems_version
 
     bundle "gem #{gem_name} --ext=rust --test=rspec --linter=rubocop"
     bundle_exec_rubocop
     expect(last_command).to be_success
   end
 
-  it "has no rubocop offenses when using --ext=rust, --test=test-unit, and --linter=rubocop flag", :readline do
+  it "has no rubocop offenses when using --ext=rust, --test=test-unit, and --linter=rubocop flag" do
     skip "ruby_core has an 'ast.rb' file that gets in the middle and breaks this spec" if ruby_core?
-    skip "RubyGems incompatible with Rust builder" if ::Gem::Version.new("3.3.11") > ::Gem.rubygems_version
 
     bundle "gem #{gem_name} --ext=rust --test=test-unit --linter=rubocop"
     bundle_exec_rubocop
@@ -392,14 +441,20 @@ def bundle_exec_standardrb
   shared_examples_for "test framework is absent" do
     it "does not create any test framework files" do
       expect(bundled_app("#{gem_name}/.rspec")).to_not exist
-      expect(bundled_app("#{gem_name}/spec/#{require_path}_spec.rb")).to_not exist
+      expect(bundled_app("#{gem_name}/spec/#{gem_name}_spec.rb")).to_not exist
       expect(bundled_app("#{gem_name}/spec/spec_helper.rb")).to_not exist
-      expect(bundled_app("#{gem_name}/test/#{require_path}.rb")).to_not exist
+      expect(bundled_app("#{gem_name}/test/#{gem_name}.rb")).to_not exist
       expect(bundled_app("#{gem_name}/test/test_helper.rb")).to_not exist
     end
+
+    it "does not add any test framework files into ignore list" do
+      expect(ignore_paths).not_to include("test/")
+      expect(ignore_paths).not_to include(".rspec")
+      expect(ignore_paths).not_to include("spec/")
+    end
   end
 
-  context "README.md", :readline do
+  context "README.md" do
     context "git config github.user present" do
       before do
         bundle "gem #{gem_name}"
@@ -413,7 +468,7 @@ def bundle_exec_standardrb
 
     context "git config github.user is absent" do
       before do
-        sys_exec("git config --global --unset github.user")
+        git("config --global --unset github.user")
         bundle "gem #{gem_name}"
       end
 
@@ -422,20 +477,36 @@ def bundle_exec_standardrb
         expect(bundled_app("#{gem_name}/README.md").read).not_to include("github.com/bundleuser")
       end
     end
+
+    describe "test task name on readme" do
+      shared_examples_for "test task name on readme" do |framework, task_name|
+        before do
+          bundle "gem #{gem_name} --test=#{framework}"
+        end
+
+        it "renders with correct name" do
+          expect(bundled_app("#{gem_name}/README.md").read).to include("Then, run `rake #{task_name}` to run the tests.")
+        end
+      end
+
+      it_behaves_like "test task name on readme", "test-unit", "test"
+      it_behaves_like "test task name on readme", "minitest", "test"
+      it_behaves_like "test task name on readme", "rspec", "spec"
+    end
   end
 
-  it "creates a new git repository", :readline do
+  it "creates a new git repository" do
     bundle "gem #{gem_name}"
     expect(bundled_app("#{gem_name}/.git")).to exist
   end
 
-  context "when git is not available", :readline do
+  context "when git is not available" do
     # This spec cannot have `git` available in the test env
     before do
       load_paths = [lib_dir, spec_dir]
       load_path_str = "-I#{load_paths.join(File::PATH_SEPARATOR)}"
 
-      sys_exec "#{Gem.ruby} #{load_path_str} #{bindir.join("bundle")} gem #{gem_name}", :env => { "PATH" => "" }
+      sys_exec "#{Gem.ruby} #{load_path_str} #{bindir.join("bundle")} gem #{gem_name}", env: { "PATH" => "" }
     end
 
     it "creates the gem without the need for git" do
@@ -449,26 +520,32 @@ def bundle_exec_standardrb
     it "doesn't create a .gitignore file" do
       expect(bundled_app("#{gem_name}/.gitignore")).to_not exist
     end
+
+    it "does not add .gitignore into ignore list" do
+      expect(ignore_paths).not_to include(".gitignore")
+    end
   end
 
-  it "generates a valid gemspec", :readline, :ruby_repo do
+  it "generates a valid gemspec" do
     bundle "gem newgem --bin"
 
     prepare_gemspec(bundled_app("newgem", "newgem.gemspec"))
 
-    gems = ["rake-13.0.1"]
-    path = Bundler.feature_flag.default_install_uses_path? ? local_gem_path(:base => bundled_app("newgem")) : system_gem_path
-    system_gems gems, :path => path
-    bundle "exec rake build", :dir => bundled_app("newgem")
+    build_repo2 do
+      build_dummy_irb "9.9.9"
+    end
+    gems = ["rake-#{rake_version}", "irb-9.9.9"]
+    system_gems gems, path: system_gem_path, gem_repo: gem_repo2
+    bundle "exec rake build", dir: bundled_app("newgem")
 
-    expect(last_command.stdboth).not_to include("ERROR")
+    expect(stdboth).not_to include("ERROR")
   end
 
-  context "gem naming with relative paths", :readline do
+  context "gem naming with relative paths" do
     it "resolves ." do
       create_temporary_dir("tmp")
 
-      bundle "gem .", :dir => bundled_app("tmp")
+      bundle "gem .", dir: bundled_app("tmp")
 
       expect(bundled_app("tmp/lib/tmp.rb")).to exist
     end
@@ -476,7 +553,7 @@ def bundle_exec_standardrb
     it "resolves .." do
       create_temporary_dir("temp/empty_dir")
 
-      bundle "gem ..", :dir => bundled_app("temp/empty_dir")
+      bundle "gem ..", dir: bundled_app("temp/empty_dir")
 
       expect(bundled_app("temp/lib/temp.rb")).to exist
     end
@@ -484,7 +561,7 @@ def bundle_exec_standardrb
     it "resolves relative directory" do
       create_temporary_dir("tmp/empty/tmp")
 
-      bundle "gem ../../empty", :dir => bundled_app("tmp/empty/tmp")
+      bundle "gem ../../empty", dir: bundled_app("tmp/empty/tmp")
 
       expect(bundled_app("tmp/empty/lib/empty.rb")).to exist
     end
@@ -543,819 +620,1129 @@ def create_temporary_dir(dir)
     end
   end
 
-  shared_examples_for "generating a gem" do
-    it "generates a gem skeleton" do
-      bundle "gem #{gem_name}"
+  it "generates a gem skeleton" do
+    bundle "gem #{gem_name}"
 
-      expect(bundled_app("#{gem_name}/#{gem_name}.gemspec")).to exist
-      expect(bundled_app("#{gem_name}/Gemfile")).to exist
-      expect(bundled_app("#{gem_name}/Rakefile")).to exist
-      expect(bundled_app("#{gem_name}/lib/#{require_path}.rb")).to exist
-      expect(bundled_app("#{gem_name}/lib/#{require_path}/version.rb")).to exist
-      expect(bundled_app("#{gem_name}/sig/#{require_path}.rbs")).to exist
-      expect(bundled_app("#{gem_name}/.gitignore")).to exist
+    expect(bundled_app("#{gem_name}/#{gem_name}.gemspec")).to exist
+    expect(bundled_app("#{gem_name}/Gemfile")).to exist
+    expect(bundled_app("#{gem_name}/Rakefile")).to exist
+    expect(bundled_app("#{gem_name}/lib/#{gem_name}.rb")).to exist
+    expect(bundled_app("#{gem_name}/lib/#{gem_name}/version.rb")).to exist
+    expect(bundled_app("#{gem_name}/sig/#{gem_name}.rbs")).to exist
+    expect(bundled_app("#{gem_name}/.gitignore")).to exist
+
+    expect(bundled_app("#{gem_name}/bin/setup")).to exist
+    expect(bundled_app("#{gem_name}/bin/console")).to exist
 
-      expect(bundled_app("#{gem_name}/bin/setup")).to exist
-      expect(bundled_app("#{gem_name}/bin/console")).to exist
+    unless Gem.win_platform?
       expect(bundled_app("#{gem_name}/bin/setup")).to be_executable
       expect(bundled_app("#{gem_name}/bin/console")).to be_executable
-      expect(bundled_app("#{gem_name}/bin/setup").read).to start_with("#!")
-      expect(bundled_app("#{gem_name}/bin/console").read).to start_with("#!")
     end
 
-    it "starts with version 0.1.0" do
-      bundle "gem #{gem_name}"
+    expect(bundled_app("#{gem_name}/bin/setup").read).to start_with("#!")
+    expect(bundled_app("#{gem_name}/bin/console").read).to start_with("#!")
+  end
 
-      expect(bundled_app("#{gem_name}/lib/#{require_path}/version.rb").read).to match(/VERSION = "0.1.0"/)
-    end
+  it "includes bin/ into ignore list" do
+    bundle "gem #{gem_name}"
 
-    it "declare String type for VERSION constant" do
-      bundle "gem #{gem_name}"
+    expect(ignore_paths).to include("bin/")
+  end
 
-      expect(bundled_app("#{gem_name}/sig/#{require_path}.rbs").read).to match(/VERSION: String/)
-    end
+  it "includes Gemfile into ignore list" do
+    bundle "gem #{gem_name}"
 
-    context "git config user.{name,email} is set" do
-      before do
-        bundle "gem #{gem_name}"
-      end
+    expect(ignore_paths).to include("Gemfile")
+  end
 
-      it "sets gemspec author to git user.name if available" do
-        expect(generated_gemspec.authors.first).to eq("Bundler User")
-      end
+  it "includes .gitignore into ignore list" do
+    bundle "gem #{gem_name}"
 
-      it "sets gemspec email to git user.email if available" do
-        expect(generated_gemspec.email.first).to eq("user@example.com")
-      end
-    end
+    expect(ignore_paths).to include(".gitignore")
+  end
 
-    context "git config user.{name,email} is not set" do
-      before do
-        sys_exec("git config --global --unset user.name")
-        sys_exec("git config --global --unset user.email")
-        bundle "gem #{gem_name}"
-      end
+  it "starts with version 0.1.0" do
+    bundle "gem #{gem_name}"
 
-      it "sets gemspec author to default message if git user.name is not set or empty" do
-        expect(generated_gemspec.authors.first).to eq("TODO: Write your name")
-      end
+    expect(bundled_app("#{gem_name}/lib/#{gem_name}/version.rb").read).to match(/VERSION = "0.1.0"/)
+  end
 
-      it "sets gemspec email to default message if git user.email is not set or empty" do
-        expect(generated_gemspec.email.first).to eq("TODO: Write your email address")
-      end
-    end
+  it "declare String type for VERSION constant" do
+    bundle "gem #{gem_name}"
 
-    it "sets gemspec metadata['allowed_push_host']" do
-      bundle "gem #{gem_name}"
+    expect(bundled_app("#{gem_name}/sig/#{gem_name}.rbs").read).to match(/VERSION: String/)
+  end
 
-      expect(generated_gemspec.metadata["allowed_push_host"]).
-        to match(/example\.com/)
+  context "git config user.{name,email} is set" do
+    before do
+      bundle "gem #{gem_name}"
     end
 
-    it "sets a minimum ruby version" do
-      bundle "gem #{gem_name}"
+    it "sets gemspec author to git user.name if available" do
+      expect(generated_gemspec.authors.first).to eq("Bundler User")
+    end
 
-      expect(generated_gemspec.required_ruby_version.to_s).to start_with(">=")
+    it "sets gemspec email to git user.email if available" do
+      expect(generated_gemspec.email.first).to eq("user@example.com")
     end
+  end
 
-    it "requires the version file" do
+  context "git config user.{name,email} is not set" do
+    before do
+      git("config --global --unset user.name")
+      git("config --global --unset user.email")
       bundle "gem #{gem_name}"
-
-      expect(bundled_app("#{gem_name}/lib/#{require_path}.rb").read).to match(%r{require_relative "#{require_relative_path}/version"})
     end
 
-    it "creates a base error class" do
-      bundle "gem #{gem_name}"
+    it "sets gemspec author to default message if git user.name is not set or empty" do
+      expect(generated_gemspec.authors.first).to eq("TODO: Write your name")
+    end
 
-      expect(bundled_app("#{gem_name}/lib/#{require_path}.rb").read).to match(/class Error < StandardError; end$/)
+    it "sets gemspec email to default message if git user.email is not set or empty" do
+      expect(generated_gemspec.email.first).to eq("TODO: Write your email address")
     end
+  end
 
-    it "does not include the gemspec file in files" do
-      bundle "gem #{gem_name}"
+  it "sets gemspec metadata['allowed_push_host']" do
+    bundle "gem #{gem_name}"
 
-      bundler_gemspec = Bundler::GemHelper.new(bundled_app(gem_name), gem_name).gemspec
+    expect(generated_gemspec.metadata["allowed_push_host"]).
+      to match(/example\.com/)
+  end
 
-      expect(bundler_gemspec.files).not_to include("#{gem_name}.gemspec")
-    end
+  it "sets a minimum ruby version" do
+    bundle "gem #{gem_name}"
 
-    it "does not include the Gemfile file in files" do
-      bundle "gem #{gem_name}"
+    expect(generated_gemspec.required_ruby_version.to_s).to start_with(">=")
+  end
 
-      bundler_gemspec = Bundler::GemHelper.new(bundled_app(gem_name), gem_name).gemspec
+  it "does not include the gemspec file in files" do
+    bundle "gem #{gem_name}"
 
-      expect(bundler_gemspec.files).not_to include("Gemfile")
-    end
+    bundler_gemspec = Bundler::GemHelper.new(bundled_app(gem_name), gem_name).gemspec
 
-    it "runs rake without problems" do
-      bundle "gem #{gem_name}"
+    expect(bundler_gemspec.files).not_to include("#{gem_name}.gemspec")
+  end
 
-      system_gems ["rake-13.0.1"]
+  it "does not include the Gemfile file in files" do
+    bundle "gem #{gem_name}"
 
-      rakefile = <<~RAKEFILE
-        task :default do
-          puts 'SUCCESS'
-        end
-      RAKEFILE
-      File.open(bundled_app("#{gem_name}/Rakefile"), "w") do |file|
-        file.puts rakefile
-      end
+    bundler_gemspec = Bundler::GemHelper.new(bundled_app(gem_name), gem_name).gemspec
 
-      sys_exec(rake, :dir => bundled_app(gem_name))
-      expect(out).to include("SUCCESS")
-    end
+    expect(bundler_gemspec.files).not_to include("Gemfile")
+  end
 
-    context "--exe parameter set" do
-      before do
-        bundle "gem #{gem_name} --exe"
-      end
+  it "runs rake without problems" do
+    bundle "gem #{gem_name}"
 
-      it "builds exe skeleton" do
-        expect(bundled_app("#{gem_name}/exe/#{gem_name}")).to exist
-      end
+    system_gems ["rake-#{rake_version}"]
 
-      it "requires the main file" do
-        expect(bundled_app("#{gem_name}/exe/#{gem_name}").read).to match(/require "#{require_path}"/)
+    rakefile = <<~RAKEFILE
+      task :default do
+        puts 'SUCCESS'
       end
+    RAKEFILE
+    File.open(bundled_app("#{gem_name}/Rakefile"), "w") do |file|
+      file.puts rakefile
     end
 
-    context "--bin parameter set" do
-      before do
-        bundle "gem #{gem_name} --bin"
-      end
+    sys_exec(rake, dir: bundled_app(gem_name))
+    expect(out).to include("SUCCESS")
+  end
 
-      it "builds exe skeleton" do
-        expect(bundled_app("#{gem_name}/exe/#{gem_name}")).to exist
-      end
+  context "--exe parameter set" do
+    before do
+      bundle "gem #{gem_name} --exe"
+    end
 
-      it "requires the main file" do
-        expect(bundled_app("#{gem_name}/exe/#{gem_name}").read).to match(/require "#{require_path}"/)
+    it "builds exe skeleton" do
+      expect(bundled_app("#{gem_name}/exe/#{gem_name}")).to exist
+      unless Gem.win_platform?
+        expect(bundled_app("#{gem_name}/exe/#{gem_name}")).to be_executable
       end
     end
+  end
 
-    context "no --test parameter" do
-      before do
-        bundle "gem #{gem_name}"
-      end
+  context "--bin parameter set" do
+    before do
+      bundle "gem #{gem_name} --bin"
+    end
 
-      it_behaves_like "test framework is absent"
+    it "builds exe skeleton" do
+      expect(bundled_app("#{gem_name}/exe/#{gem_name}")).to exist
     end
+  end
 
-    context "--test parameter set to rspec" do
-      before do
-        bundle "gem #{gem_name} --test=rspec"
-      end
+  context "no --test parameter" do
+    before do
+      bundle "gem #{gem_name}"
+    end
 
-      it "builds spec skeleton" do
-        expect(bundled_app("#{gem_name}/.rspec")).to exist
-        expect(bundled_app("#{gem_name}/spec/#{require_path}_spec.rb")).to exist
-        expect(bundled_app("#{gem_name}/spec/spec_helper.rb")).to exist
-      end
+    it_behaves_like "test framework is absent"
+  end
 
-      it "depends on a specific version of rspec in generated Gemfile" do
-        allow(Bundler::SharedHelpers).to receive(:find_gemfile).and_return(bundled_app_gemfile)
-        builder = Bundler::Dsl.new
-        builder.eval_gemfile(bundled_app("#{gem_name}/Gemfile"))
-        builder.dependencies
-        rspec_dep = builder.dependencies.find {|d| d.name == "rspec" }
-        expect(rspec_dep).to be_specific
-      end
+  context "--test parameter set to rspec" do
+    before do
+      bundle "gem #{gem_name} --test=rspec"
+    end
 
-      it "requires the main file" do
-        expect(bundled_app("#{gem_name}/spec/spec_helper.rb").read).to include(%(require "#{require_path}"))
-      end
+    it "builds spec skeleton" do
+      expect(bundled_app("#{gem_name}/.rspec")).to exist
+      expect(bundled_app("#{gem_name}/spec/#{gem_name}_spec.rb")).to exist
+      expect(bundled_app("#{gem_name}/spec/spec_helper.rb")).to exist
+    end
 
-      it "creates a default test which fails" do
-        expect(bundled_app("#{gem_name}/spec/#{require_path}_spec.rb").read).to include("expect(false).to eq(true)")
-      end
+    it "includes .rspec and spec/ into ignore list" do
+      expect(ignore_paths).to include(".rspec")
+      expect(ignore_paths).to include("spec/")
     end
 
-    context "gem.test setting set to rspec" do
-      before do
-        bundle "config set gem.test rspec"
-        bundle "gem #{gem_name}"
-      end
+    it "depends on a specific version of rspec in generated Gemfile" do
+      allow(Bundler::SharedHelpers).to receive(:find_gemfile).and_return(bundled_app_gemfile)
+      builder = Bundler::Dsl.new
+      builder.eval_gemfile(bundled_app("#{gem_name}/Gemfile"))
+      builder.dependencies
+      rspec_dep = builder.dependencies.find {|d| d.name == "rspec" }
+      expect(rspec_dep).to be_specific
+    end
+  end
 
-      it "builds spec skeleton" do
-        expect(bundled_app("#{gem_name}/.rspec")).to exist
-        expect(bundled_app("#{gem_name}/spec/#{require_path}_spec.rb")).to exist
-        expect(bundled_app("#{gem_name}/spec/spec_helper.rb")).to exist
-      end
+  context "init_gems_rb setting to true" do
+    before do
+      bundle "config set init_gems_rb true"
+      bundle "gem #{gem_name}"
     end
 
-    context "gem.test setting set to rspec and --test is set to minitest" do
-      before do
-        bundle "config set gem.test rspec"
-        bundle "gem #{gem_name} --test=minitest"
-      end
+    it "generates gems.rb instead of Gemfile" do
+      expect(bundled_app("#{gem_name}/gems.rb")).to exist
+      expect(bundled_app("#{gem_name}/Gemfile")).to_not exist
+    end
 
-      it "builds spec skeleton" do
-        expect(bundled_app("#{gem_name}/#{minitest_test_file_path}")).to exist
-        expect(bundled_app("#{gem_name}/test/test_helper.rb")).to exist
-      end
+    it "includes gems.rb and gems.locked into ignore list" do
+      expect(ignore_paths).to include("gems.rb")
+      expect(ignore_paths).to include("gems.locked")
+      expect(ignore_paths).not_to include("Gemfile")
     end
+  end
 
-    context "--test parameter set to minitest" do
-      before do
-        bundle "gem #{gem_name} --test=minitest"
-      end
+  context "init_gems_rb setting to false" do
+    before do
+      bundle "config set init_gems_rb false"
+      bundle "gem #{gem_name}"
+    end
 
-      it "depends on a specific version of minitest" do
-        allow(Bundler::SharedHelpers).to receive(:find_gemfile).and_return(bundled_app_gemfile)
-        builder = Bundler::Dsl.new
-        builder.eval_gemfile(bundled_app("#{gem_name}/Gemfile"))
-        builder.dependencies
-        minitest_dep = builder.dependencies.find {|d| d.name == "minitest" }
-        expect(minitest_dep).to be_specific
-      end
+    it "generates Gemfile instead of gems.rb" do
+      expect(bundled_app("#{gem_name}/gems.rb")).to_not exist
+      expect(bundled_app("#{gem_name}/Gemfile")).to exist
+    end
 
-      it "builds spec skeleton" do
-        expect(bundled_app("#{gem_name}/#{minitest_test_file_path}")).to exist
-        expect(bundled_app("#{gem_name}/test/test_helper.rb")).to exist
-      end
+    it "includes Gemfile into ignore list" do
+      expect(ignore_paths).to include("Gemfile")
+      expect(ignore_paths).not_to include("gems.rb")
+      expect(ignore_paths).not_to include("gems.locked")
+    end
+  end
 
-      it "requires the main file" do
-        expect(bundled_app("#{gem_name}/test/test_helper.rb").read).to include(%(require "#{require_path}"))
-      end
+  context "gem.test setting set to rspec" do
+    before do
+      bundle "config set gem.test rspec"
+      bundle "gem #{gem_name}"
+    end
 
-      it "requires 'test_helper'" do
-        expect(bundled_app("#{gem_name}/#{minitest_test_file_path}").read).to include(%(require "test_helper"))
-      end
+    it "builds spec skeleton" do
+      expect(bundled_app("#{gem_name}/.rspec")).to exist
+      expect(bundled_app("#{gem_name}/spec/#{gem_name}_spec.rb")).to exist
+      expect(bundled_app("#{gem_name}/spec/spec_helper.rb")).to exist
+    end
 
-      it "defines valid test class name" do
-        expect(bundled_app("#{gem_name}/#{minitest_test_file_path}").read).to include(minitest_test_class_name)
-      end
+    it "includes .rspec and spec/ into ignore list" do
+      expect(ignore_paths).to include(".rspec")
+      expect(ignore_paths).to include("spec/")
+    end
+  end
 
-      it "creates a default test which fails" do
-        expect(bundled_app("#{gem_name}/#{minitest_test_file_path}").read).to include("assert false")
-      end
+  context "gem.test setting set to rspec and --test is set to minitest" do
+    before do
+      bundle "config set gem.test rspec"
+      bundle "gem #{gem_name} --test=minitest"
     end
 
-    context "gem.test setting set to minitest" do
-      before do
-        bundle "config set gem.test minitest"
-        bundle "gem #{gem_name}"
-      end
+    it "builds spec skeleton" do
+      expect(bundled_app("#{gem_name}/test/test_#{gem_name}.rb")).to exist
+      expect(bundled_app("#{gem_name}/test/test_helper.rb")).to exist
+    end
 
-      it "creates a default rake task to run the test suite" do
-        rakefile = <<~RAKEFILE
-          # frozen_string_literal: true
+    it "includes test/ into ignore list" do
+      expect(ignore_paths).to include("test/")
+    end
+  end
 
-          require "bundler/gem_tasks"
-          require "rake/testtask"
+  context "--test parameter set to minitest" do
+    before do
+      bundle "gem #{gem_name} --test=minitest"
+    end
 
-          Rake::TestTask.new(:test) do |t|
-            t.libs << "test"
-            t.libs << "lib"
-            t.test_files = FileList["test/**/test_*.rb"]
-          end
+    it "depends on a specific version of minitest" do
+      allow(Bundler::SharedHelpers).to receive(:find_gemfile).and_return(bundled_app_gemfile)
+      builder = Bundler::Dsl.new
+      builder.eval_gemfile(bundled_app("#{gem_name}/Gemfile"))
+      builder.dependencies
+      minitest_dep = builder.dependencies.find {|d| d.name == "minitest" }
+      expect(minitest_dep).to be_specific
+    end
 
-          task default: :test
-        RAKEFILE
+    it "builds spec skeleton" do
+      expect(bundled_app("#{gem_name}/test/test_#{gem_name}.rb")).to exist
+      expect(bundled_app("#{gem_name}/test/test_helper.rb")).to exist
+    end
 
-        expect(bundled_app("#{gem_name}/Rakefile").read).to eq(rakefile)
-      end
+    it "includes test/ into ignore list" do
+      expect(ignore_paths).to include("test/")
     end
 
-    context "--test parameter set to test-unit" do
-      before do
-        bundle "gem #{gem_name} --test=test-unit"
-      end
+    it "creates a default rake task to run the test suite" do
+      rakefile = <<~RAKEFILE
+        # frozen_string_literal: true
 
-      it "depends on a specific version of test-unit" do
-        allow(Bundler::SharedHelpers).to receive(:find_gemfile).and_return(bundled_app_gemfile)
-        builder = Bundler::Dsl.new
-        builder.eval_gemfile(bundled_app("#{gem_name}/Gemfile"))
-        builder.dependencies
-        test_unit_dep = builder.dependencies.find {|d| d.name == "test-unit" }
-        expect(test_unit_dep).to be_specific
-      end
+        require "bundler/gem_tasks"
+        require "minitest/test_task"
 
-      it "builds spec skeleton" do
-        expect(bundled_app("#{gem_name}/test/#{require_path}_test.rb")).to exist
-        expect(bundled_app("#{gem_name}/test/test_helper.rb")).to exist
-      end
+        Minitest::TestTask.create
 
-      it "requires the main file" do
-        expect(bundled_app("#{gem_name}/test/test_helper.rb").read).to include(%(require "#{require_path}"))
-      end
+        task default: :test
+      RAKEFILE
 
-      it "requires 'test_helper'" do
-        expect(bundled_app("#{gem_name}/test/#{require_path}_test.rb").read).to include(%(require "test_helper"))
-      end
+      expect(bundled_app("#{gem_name}/Rakefile").read).to eq(rakefile)
+    end
+  end
 
-      it "creates a default test which fails" do
-        expect(bundled_app("#{gem_name}/test/#{require_path}_test.rb").read).to include("assert_equal(\"expected\", \"actual\")")
-      end
+  context "gem.test setting set to minitest" do
+    before do
+      bundle "config set gem.test minitest"
+      bundle "gem #{gem_name}"
     end
 
-    context "gem.test setting set to test-unit" do
-      before do
-        bundle "config set gem.test test-unit"
-        bundle "gem #{gem_name}"
-      end
+    it "creates a default rake task to run the test suite" do
+      rakefile = <<~RAKEFILE
+        # frozen_string_literal: true
 
-      it "creates a default rake task to run the test suite" do
-        rakefile = <<~RAKEFILE
-          # frozen_string_literal: true
+        require "bundler/gem_tasks"
+        require "minitest/test_task"
 
-          require "bundler/gem_tasks"
-          require "rake/testtask"
+        Minitest::TestTask.create
 
-          Rake::TestTask.new(:test) do |t|
-            t.libs << "test"
-            t.libs << "lib"
-            t.test_files = FileList["test/**/*_test.rb"]
-          end
+        task default: :test
+      RAKEFILE
 
-          task default: :test
-        RAKEFILE
+      expect(bundled_app("#{gem_name}/Rakefile").read).to eq(rakefile)
+    end
+  end
 
-        expect(bundled_app("#{gem_name}/Rakefile").read).to eq(rakefile)
-      end
+  context "--test parameter set to test-unit" do
+    before do
+      bundle "gem #{gem_name} --test=test-unit"
     end
 
-    context "gem.test set to rspec and --test with no arguments", :hint_text do
-      before do
-        bundle "config set gem.test rspec"
-        bundle "gem #{gem_name} --test"
-      end
+    it "depends on a specific version of test-unit" do
+      allow(Bundler::SharedHelpers).to receive(:find_gemfile).and_return(bundled_app_gemfile)
+      builder = Bundler::Dsl.new
+      builder.eval_gemfile(bundled_app("#{gem_name}/Gemfile"))
+      builder.dependencies
+      test_unit_dep = builder.dependencies.find {|d| d.name == "test-unit" }
+      expect(test_unit_dep).to be_specific
+    end
 
-      it "builds spec skeleton" do
-        expect(bundled_app("#{gem_name}/.rspec")).to exist
-        expect(bundled_app("#{gem_name}/spec/#{require_path}_spec.rb")).to exist
-        expect(bundled_app("#{gem_name}/spec/spec_helper.rb")).to exist
-      end
+    it "builds spec skeleton" do
+      expect(bundled_app("#{gem_name}/test/#{gem_name}_test.rb")).to exist
+      expect(bundled_app("#{gem_name}/test/test_helper.rb")).to exist
+    end
 
-      it "hints that --test is already configured" do
-        expect(out).to match("rspec is already configured, ignoring --test flag.")
-      end
+    it "includes test/ into ignore list" do
+      expect(ignore_paths).to include("test/")
     end
 
-    context "gem.test setting set to false and --test with no arguments", :hint_text do
-      before do
-        bundle "config set gem.test false"
-        bundle "gem #{gem_name} --test"
-      end
+    it "creates a default rake task to run the test suite" do
+      rakefile = <<~RAKEFILE
+        # frozen_string_literal: true
 
-      it "asks to generate test files" do
-        expect(out).to match("Do you want to generate tests with your gem?")
-      end
+        require "bundler/gem_tasks"
+        require "rake/testtask"
 
-      it "hints that the choice will only be applied to the current gem" do
-        expect(out).to match("Your choice will only be applied to this gem.")
-      end
+        Rake::TestTask.new(:test) do |t|
+          t.libs << "test"
+          t.libs << "lib"
+          t.test_files = FileList["test/**/*_test.rb"]
+        end
+
+        task default: :test
+      RAKEFILE
 
-      it_behaves_like "test framework is absent"
+      expect(bundled_app("#{gem_name}/Rakefile").read).to eq(rakefile)
     end
+  end
 
-    context "gem.test setting not set and --test with no arguments", :hint_text do
-      before do
-        bundle "gem #{gem_name} --test"
-      end
+  context "--test parameter set to an invalid value" do
+    before do
+      bundle "gem #{gem_name} --test=foo", raise_on_error: false
+    end
 
-      it "asks to generate test files" do
-        expect(out).to match("Do you want to generate tests with your gem?")
-      end
+    it "fails loudly" do
+      expect(last_command).to be_failure
+      expect(err).to match(/Expected '--test' to be one of .*; got foo/)
+    end
+  end
 
-      it "hints that the choice will be applied to future bundle gem calls" do
-        hint = "Future `bundle gem` calls will use your choice. " \
-               "This setting can be changed anytime with `bundle config gem.test`."
-        expect(out).to match(hint)
-      end
+  context "gem.test set to rspec and --test with no arguments" do
+    before do
+      bundle "config set gem.test rspec"
+      bundle "gem #{gem_name} --test"
+    end
 
-      it_behaves_like "test framework is absent"
+    it "builds spec skeleton" do
+      expect(bundled_app("#{gem_name}/.rspec")).to exist
+      expect(bundled_app("#{gem_name}/spec/#{gem_name}_spec.rb")).to exist
+      expect(bundled_app("#{gem_name}/spec/spec_helper.rb")).to exist
     end
 
-    context "--ci with no argument" do
-      it "does not generate any CI config" do
-        bundle "gem #{gem_name}"
+    it "includes .rspec and spec/ into ignore list" do
+      expect(ignore_paths).to include(".rspec")
+      expect(ignore_paths).to include("spec/")
+    end
 
-        expect(bundled_app("#{gem_name}/.github/workflows/main.yml")).to_not exist
-        expect(bundled_app("#{gem_name}/.gitlab-ci.yml")).to_not exist
-        expect(bundled_app("#{gem_name}/.circleci/config.yml")).to_not exist
+    it "hints that --test is already configured" do
+      expect(out).to match("rspec is already configured, ignoring --test flag.")
+    end
+  end
+
+  context "gem.test setting set to false and --test with no arguments", :readline do
+    before do
+      bundle "config set gem.test false"
+      bundle "gem #{gem_name} --test" do |input, _, _|
+        input.puts
       end
     end
 
-    context "--ci set to travis" do
-      it "generates a GitHub Actions config file" do
-        bundle "gem #{gem_name} --ci=travis", :raise_on_error => false
-        expect(err).to include("Support for Travis CI was removed from gem skeleton generator.")
+    it "asks to generate test files" do
+      expect(out).to match("Do you want to generate tests with your gem?")
+    end
 
-        expect(bundled_app("#{gem_name}/.travis.yml")).to_not exist
-      end
+    it "hints that the choice will only be applied to the current gem" do
+      expect(out).to match("Your choice will only be applied to this gem.")
     end
 
-    context "--ci set to travis" do
-      it "generates a GitHub Actions config file" do
-        bundle "gem #{gem_name} --ci=travis", :raise_on_error => false
-        expect(err).to include("Support for Travis CI was removed from gem skeleton generator.")
+    it_behaves_like "test framework is absent"
+  end
 
-        expect(bundled_app("#{gem_name}/.travis.yml")).to_not exist
+  context "gem.test setting not set and --test with no arguments", :readline do
+    before do
+      global_config "BUNDLE_GEM__TEST" => nil
+      bundle "gem #{gem_name} --test" do |input, _, _|
+        input.puts
       end
     end
 
-    context "--ci set to github" do
-      it "generates a GitHub Actions config file" do
-        bundle "gem #{gem_name} --ci=github"
+    it "asks to generate test files" do
+      expect(out).to match("Do you want to generate tests with your gem?")
+    end
 
-        expect(bundled_app("#{gem_name}/.github/workflows/main.yml")).to exist
-      end
+    it "hints that the choice will be applied to future bundle gem calls" do
+      hint = "Future `bundle gem` calls will use your choice. " \
+             "This setting can be changed anytime with `bundle config gem.test`."
+      expect(out).to match(hint)
     end
 
-    context "--ci set to gitlab" do
-      it "generates a GitLab CI config file" do
-        bundle "gem #{gem_name} --ci=gitlab"
+    it_behaves_like "test framework is absent"
+  end
 
-        expect(bundled_app("#{gem_name}/.gitlab-ci.yml")).to exist
-      end
+  context "gem.test setting set to a test framework and --no-test" do
+    before do
+      bundle "config set gem.test rspec"
+      bundle "gem #{gem_name} --no-test"
     end
 
-    context "--ci set to circle" do
-      it "generates a CircleCI config file" do
-        bundle "gem #{gem_name} --ci=circle"
+    it_behaves_like "test framework is absent"
+  end
 
-        expect(bundled_app("#{gem_name}/.circleci/config.yml")).to exist
-      end
+  context "--ci with no argument" do
+    before do
+      bundle "gem #{gem_name}"
     end
 
-    context "gem.ci setting set to none" do
-      it "doesn't generate any CI config" do
-        expect(bundled_app("#{gem_name}/.github/workflows/main.yml")).to_not exist
-        expect(bundled_app("#{gem_name}/.gitlab-ci.yml")).to_not exist
-        expect(bundled_app("#{gem_name}/.circleci/config.yml")).to_not exist
-      end
+    it "does not generate any CI config" do
+      expect(bundled_app("#{gem_name}/.github/workflows/main.yml")).to_not exist
+      expect(bundled_app("#{gem_name}/.gitlab-ci.yml")).to_not exist
+      expect(bundled_app("#{gem_name}/.circleci/config.yml")).to_not exist
     end
 
-    context "gem.ci setting set to travis" do
-      it "errors with friendly message" do
-        bundle "config set gem.ci travis"
-        bundle "gem #{gem_name}", :raise_on_error => false
+    it "does not add any CI config files into ignore list" do
+      expect(ignore_paths).not_to include(".github/")
+      expect(ignore_paths).not_to include(".gitlab-ci.yml")
+      expect(ignore_paths).not_to include(".circleci/")
+    end
+  end
 
-        expect(err).to include("Support for Travis CI was removed from gem skeleton generator,")
-        expect(err).to include("bundle config unset gem.ci")
+  context "--ci set to github" do
+    before do
+      bundle "gem #{gem_name} --ci=github"
+    end
 
-        expect(bundled_app("#{gem_name}/.travis.yml")).to_not exist
-      end
+    it "generates a GitHub Actions config file" do
+      expect(bundled_app("#{gem_name}/.github/workflows/main.yml")).to exist
     end
 
-    context "gem.ci setting set to github" do
-      it "generates a GitHub Actions config file" do
-        bundle "config set gem.ci github"
-        bundle "gem #{gem_name}"
+    it "includes .github/ into ignore list" do
+      expect(ignore_paths).to include(".github/")
+    end
+  end
 
-        expect(bundled_app("#{gem_name}/.github/workflows/main.yml")).to exist
-      end
+  context "--ci set to gitlab" do
+    before do
+      bundle "gem #{gem_name} --ci=gitlab"
     end
 
-    context "gem.ci setting set to gitlab" do
-      it "generates a GitLab CI config file" do
-        bundle "config set gem.ci gitlab"
-        bundle "gem #{gem_name}"
+    it "generates a GitLab CI config file" do
+      expect(bundled_app("#{gem_name}/.gitlab-ci.yml")).to exist
+    end
 
-        expect(bundled_app("#{gem_name}/.gitlab-ci.yml")).to exist
-      end
+    it "includes .gitlab-ci.yml into ignore list" do
+      expect(ignore_paths).to include(".gitlab-ci.yml")
     end
+  end
 
-    context "gem.ci setting set to circle" do
-      it "generates a CircleCI config file" do
-        bundle "config set gem.ci circle"
-        bundle "gem #{gem_name}"
+  context "--ci set to circle" do
+    before do
+      bundle "gem #{gem_name} --ci=circle"
+    end
 
-        expect(bundled_app("#{gem_name}/.circleci/config.yml")).to exist
-      end
+    it "generates a CircleCI config file" do
+      expect(bundled_app("#{gem_name}/.circleci/config.yml")).to exist
     end
 
-    context "gem.ci set to github and --ci with no arguments", :hint_text do
-      before do
-        bundle "config set gem.ci github"
-        bundle "gem #{gem_name} --ci"
-      end
+    it "includes .circleci/ into ignore list" do
+      expect(ignore_paths).to include(".circleci/")
+    end
+  end
 
-      it "generates a GitHub Actions config file" do
-        expect(bundled_app("#{gem_name}/.github/workflows/main.yml")).to exist
-      end
+  context "--ci set to an invalid value" do
+    before do
+      bundle "gem #{gem_name} --ci=foo", raise_on_error: false
+    end
 
-      it "hints that --ci is already configured" do
-        expect(out).to match("github is already configured, ignoring --ci flag.")
-      end
+    it "fails loudly" do
+      expect(last_command).to be_failure
+      expect(err).to match(/Expected '--ci' to be one of .*; got foo/)
     end
+  end
 
-    context "gem.ci setting set to false and --ci with no arguments", :hint_text do
-      before do
-        bundle "config set gem.ci false"
-        bundle "gem #{gem_name} --ci"
-      end
+  context "gem.ci setting set to none" do
+    it "doesn't generate any CI config" do
+      expect(bundled_app("#{gem_name}/.github/workflows/main.yml")).to_not exist
+      expect(bundled_app("#{gem_name}/.gitlab-ci.yml")).to_not exist
+      expect(bundled_app("#{gem_name}/.circleci/config.yml")).to_not exist
+    end
+  end
 
-      it "asks to setup CI" do
-        expect(out).to match("Do you want to set up continuous integration for your gem?")
-      end
+  context "gem.ci setting set to github" do
+    it "generates a GitHub Actions config file" do
+      bundle "config set gem.ci github"
+      bundle "gem #{gem_name}"
 
-      it "hints that the choice will only be applied to the current gem" do
-        expect(out).to match("Your choice will only be applied to this gem.")
-      end
+      expect(bundled_app("#{gem_name}/.github/workflows/main.yml")).to exist
     end
+  end
 
-    context "gem.ci setting not set and --ci with no arguments", :hint_text do
-      before do
-        bundle "gem #{gem_name} --ci"
-      end
+  context "gem.ci setting set to gitlab" do
+    it "generates a GitLab CI config file" do
+      bundle "config set gem.ci gitlab"
+      bundle "gem #{gem_name}"
 
-      it "asks to setup CI" do
-        expect(out).to match("Do you want to set up continuous integration for your gem?")
-      end
+      expect(bundled_app("#{gem_name}/.gitlab-ci.yml")).to exist
+    end
+  end
 
-      it "hints that the choice will be applied to future bundle gem calls" do
-        hint = "Future `bundle gem` calls will use your choice. " \
-               "This setting can be changed anytime with `bundle config gem.ci`."
-        expect(out).to match(hint)
-      end
+  context "gem.ci setting set to circle" do
+    it "generates a CircleCI config file" do
+      bundle "config set gem.ci circle"
+      bundle "gem #{gem_name}"
+
+      expect(bundled_app("#{gem_name}/.circleci/config.yml")).to exist
     end
+  end
 
-    context "--linter with no argument" do
-      it "does not generate any linter config" do
-        bundle "gem #{gem_name}"
+  context "gem.ci set to github and --ci with no arguments" do
+    before do
+      bundle "config set gem.ci github"
+      bundle "gem #{gem_name} --ci"
+    end
 
-        expect(bundled_app("#{gem_name}/.rubocop.yml")).to_not exist
-        expect(bundled_app("#{gem_name}/.standard.yml")).to_not exist
-      end
+    it "generates a GitHub Actions config file" do
+      expect(bundled_app("#{gem_name}/.github/workflows/main.yml")).to exist
     end
 
-    context "--linter set to rubocop" do
-      it "generates a RuboCop config" do
-        bundle "gem #{gem_name} --linter=rubocop"
+    it "hints that --ci is already configured" do
+      expect(out).to match("github is already configured, ignoring --ci flag.")
+    end
+  end
 
-        expect(bundled_app("#{gem_name}/.rubocop.yml")).to exist
-        expect(bundled_app("#{gem_name}/.standard.yml")).to_not exist
+  context "gem.ci setting set to false and --ci with no arguments", :readline do
+    before do
+      bundle "config set gem.ci false"
+      bundle "gem #{gem_name} --ci" do |input, _, _|
+        input.puts "github"
       end
     end
 
-    context "--linter set to standard" do
-      it "generates a Standard config" do
-        bundle "gem #{gem_name} --linter=standard"
+    it "asks to setup CI" do
+      expect(out).to match("Do you want to set up continuous integration for your gem?")
+    end
+
+    it "hints that the choice will only be applied to the current gem" do
+      expect(out).to match("Your choice will only be applied to this gem.")
+    end
+  end
 
-        expect(bundled_app("#{gem_name}/.standard.yml")).to exist
-        expect(bundled_app("#{gem_name}/.rubocop.yml")).to_not exist
+  context "gem.ci setting not set and --ci with no arguments", :readline do
+    before do
+      global_config "BUNDLE_GEM__CI" => nil
+      bundle "gem #{gem_name} --ci" do |input, _, _|
+        input.puts "github"
       end
     end
 
-    context "gem.linter setting set to none" do
-      it "doesn't generate any linter config" do
-        bundle "gem #{gem_name}"
+    it "asks to setup CI" do
+      expect(out).to match("Do you want to set up continuous integration for your gem?")
+    end
 
-        expect(bundled_app("#{gem_name}/.rubocop.yml")).to_not exist
-        expect(bundled_app("#{gem_name}/.standard.yml")).to_not exist
-      end
+    it "hints that the choice will be applied to future bundle gem calls" do
+      hint = "Future `bundle gem` calls will use your choice. " \
+             "This setting can be changed anytime with `bundle config gem.ci`."
+      expect(out).to match(hint)
     end
+  end
 
-    context "gem.linter setting set to rubocop" do
-      it "generates a RuboCop config file" do
-        bundle "config set gem.linter rubocop"
-        bundle "gem #{gem_name}"
+  context "gem.ci setting set to a CI service and --no-ci" do
+    before do
+      bundle "config set gem.ci github"
+      bundle "gem #{gem_name} --no-ci"
+    end
 
-        expect(bundled_app("#{gem_name}/.rubocop.yml")).to exist
+    it "does not generate any CI config" do
+      expect(bundled_app("#{gem_name}/.github/workflows/main.yml")).to_not exist
+      expect(bundled_app("#{gem_name}/.gitlab-ci.yml")).to_not exist
+      expect(bundled_app("#{gem_name}/.circleci/config.yml")).to_not exist
+    end
+  end
+
+  context "--linter with no argument" do
+    before do
+      bundle "gem #{gem_name}"
+    end
+
+    it "does not generate any linter config" do
+      expect(bundled_app("#{gem_name}/.rubocop.yml")).to_not exist
+      expect(bundled_app("#{gem_name}/.standard.yml")).to_not exist
+    end
+
+    it "does not add any linter config files into ignore list" do
+      expect(ignore_paths).not_to include(".rubocop.yml")
+      expect(ignore_paths).not_to include(".standard.yml")
+    end
+  end
+
+  context "--linter set to rubocop" do
+    before do
+      bundle "gem #{gem_name} --linter=rubocop"
+    end
+
+    it "generates a RuboCop config" do
+      expect(bundled_app("#{gem_name}/.rubocop.yml")).to exist
+      expect(bundled_app("#{gem_name}/.standard.yml")).to_not exist
+    end
+
+    it "includes .rubocop.yml into ignore list" do
+      expect(ignore_paths).to include(".rubocop.yml")
+      expect(ignore_paths).not_to include(".standard.yml")
+    end
+  end
+
+  context "--linter set to standard" do
+    before do
+      bundle "gem #{gem_name} --linter=standard"
+    end
+
+    it "generates a Standard config" do
+      expect(bundled_app("#{gem_name}/.standard.yml")).to exist
+      expect(bundled_app("#{gem_name}/.rubocop.yml")).to_not exist
+    end
+
+    it "includes .standard.yml into ignore list" do
+      expect(ignore_paths).to include(".standard.yml")
+      expect(ignore_paths).not_to include(".rubocop.yml")
+    end
+  end
+
+  context "--linter set to an invalid value" do
+    before do
+      bundle "gem #{gem_name} --linter=foo", raise_on_error: false
+    end
+
+    it "fails loudly" do
+      expect(last_command).to be_failure
+      expect(err).to match(/Expected '--linter' to be one of .*; got foo/)
+    end
+  end
+
+  context "gem.linter setting set to none" do
+    before do
+      bundle "gem #{gem_name}"
+    end
+
+    it "doesn't generate any linter config" do
+      expect(bundled_app("#{gem_name}/.rubocop.yml")).to_not exist
+      expect(bundled_app("#{gem_name}/.standard.yml")).to_not exist
+    end
+
+    it "does not add any linter config files into ignore list" do
+      expect(ignore_paths).not_to include(".rubocop.yml")
+      expect(ignore_paths).not_to include(".standard.yml")
+    end
+  end
+
+  context "gem.linter setting set to rubocop" do
+    before do
+      bundle "config set gem.linter rubocop"
+      bundle "gem #{gem_name}"
+    end
+
+    it "generates a RuboCop config file" do
+      expect(bundled_app("#{gem_name}/.rubocop.yml")).to exist
+    end
+
+    it "includes .rubocop.yml into ignore list" do
+      expect(ignore_paths).to include(".rubocop.yml")
+    end
+  end
+
+  context "gem.linter setting set to standard" do
+    before do
+      bundle "config set gem.linter standard"
+      bundle "gem #{gem_name}"
+    end
+
+    it "generates a Standard config file" do
+      expect(bundled_app("#{gem_name}/.standard.yml")).to exist
+    end
+
+    it "includes .standard.yml into ignore list" do
+      expect(ignore_paths).to include(".standard.yml")
+    end
+  end
+
+  context "gem.rubocop setting set to true" do
+    before do
+      global_config "BUNDLE_GEM__LINTER" => nil
+      bundle "config set gem.rubocop true"
+      bundle "gem #{gem_name}"
+    end
+
+    it "generates rubocop config" do
+      expect(bundled_app("#{gem_name}/.rubocop.yml")).to exist
+    end
+
+    it "includes .rubocop.yml into ignore list" do
+      expect(ignore_paths).to include(".rubocop.yml")
+    end
+
+    it "unsets gem.rubocop" do
+      bundle "config gem.rubocop"
+      expect(out).to include("You have not configured a value for `gem.rubocop`")
+    end
+
+    it "sets gem.linter=rubocop instead" do
+      bundle "config gem.linter"
+      expect(out).to match(/Set for the current user .*: "rubocop"/)
+    end
+  end
+
+  context "gem.linter set to rubocop and --linter with no arguments" do
+    before do
+      bundle "config set gem.linter rubocop"
+      bundle "gem #{gem_name} --linter"
+    end
+
+    it "generates a RuboCop config file" do
+      expect(bundled_app("#{gem_name}/.rubocop.yml")).to exist
+    end
+
+    it "includes .rubocop.yml into ignore list" do
+      expect(ignore_paths).to include(".rubocop.yml")
+    end
+
+    it "hints that --linter is already configured" do
+      expect(out).to match("rubocop is already configured, ignoring --linter flag.")
+    end
+  end
+
+  context "gem.linter setting set to false and --linter with no arguments", :readline do
+    before do
+      bundle "config set gem.linter false"
+      bundle "gem #{gem_name} --linter" do |input, _, _|
+        input.puts "rubocop"
       end
     end
 
-    context "gem.linter setting set to standard" do
-      it "generates a Standard config file" do
-        bundle "config set gem.linter standard"
-        bundle "gem #{gem_name}"
+    it "asks to setup a linter" do
+      expect(out).to match("Do you want to add a code linter and formatter to your gem?")
+    end
 
-        expect(bundled_app("#{gem_name}/.standard.yml")).to exist
+    it "hints that the choice will only be applied to the current gem" do
+      expect(out).to match("Your choice will only be applied to this gem.")
+    end
+  end
+
+  context "gem.linter setting not set and --linter with no arguments", :readline do
+    before do
+      global_config "BUNDLE_GEM__LINTER" => nil
+      bundle "gem #{gem_name} --linter" do |input, _, _|
+        input.puts "rubocop"
       end
     end
 
-    context "gem.rubocop setting set to true", :bundler => "< 3" do
+    it "asks to setup a linter" do
+      expect(out).to match("Do you want to add a code linter and formatter to your gem?")
+    end
+
+    it "hints that the choice will be applied to future bundle gem calls" do
+      hint = "Future `bundle gem` calls will use your choice. " \
+             "This setting can be changed anytime with `bundle config gem.linter`."
+      expect(out).to match(hint)
+    end
+  end
+
+  context "gem.linter setting set to a linter and --no-linter" do
+    before do
+      bundle "config set gem.linter rubocop"
+      bundle "gem #{gem_name} --no-linter"
+    end
+
+    it "does not generate any linter config" do
+      expect(bundled_app("#{gem_name}/.rubocop.yml")).to_not exist
+      expect(bundled_app("#{gem_name}/.standard.yml")).to_not exist
+    end
+
+    it "does not add any linter config files into ignore list" do
+      expect(ignore_paths).not_to include(".rubocop.yml")
+      expect(ignore_paths).not_to include(".standard.yml")
+    end
+  end
+
+  context "--edit option" do
+    it "opens the generated gemspec in the user's text editor" do
+      output = bundle "gem #{gem_name} --edit=echo"
+      gemspec_path = File.join(bundled_app, gem_name, "#{gem_name}.gemspec")
+      expect(output).to include("echo \"#{gemspec_path}\"")
+    end
+  end
+
+  shared_examples_for "paths that depend on gem name" do
+    it "generates entrypoint, version file and signatures file at the proper path, with the proper content" do
+      bundle "gem #{gem_name}"
+
+      expect(bundled_app("#{gem_name}/lib/#{require_path}.rb")).to exist
+      expect(bundled_app("#{gem_name}/lib/#{require_path}.rb").read).to match(%r{require_relative "#{require_relative_path}/version"})
+      expect(bundled_app("#{gem_name}/lib/#{require_path}.rb").read).to match(/class Error < StandardError; end$/)
+
+      expect(bundled_app("#{gem_name}/lib/#{require_path}/version.rb")).to exist
+      expect(bundled_app("#{gem_name}/sig/#{require_path}.rbs")).to exist
+    end
+
+    context "--exe parameter set" do
       before do
-        bundle "config set gem.rubocop true"
-        bundle "gem #{gem_name}"
+        bundle "gem #{gem_name} --exe"
       end
 
-      it "generates rubocop config" do
-        expect(bundled_app("#{gem_name}/.rubocop.yml")).to exist
+      it "builds an exe file that requires the proper entrypoint" do
+        expect(bundled_app("#{gem_name}/exe/#{gem_name}")).to exist
+        expect(bundled_app("#{gem_name}/exe/#{gem_name}").read).to match(/require "#{require_path}"/)
       end
+    end
 
-      it "unsets gem.rubocop" do
-        bundle "config gem.rubocop"
-        expect(out).to include("You have not configured a value for `gem.rubocop`")
+    context "--bin parameter set" do
+      before do
+        bundle "gem #{gem_name} --bin"
       end
 
-      it "sets gem.linter=rubocop instead" do
-        bundle "config gem.linter"
-        expect(out).to match(/Set for the current user .*: "rubocop"/)
+      it "builds an exe file that requires the proper entrypoint" do
+        expect(bundled_app("#{gem_name}/exe/#{gem_name}")).to exist
+        expect(bundled_app("#{gem_name}/exe/#{gem_name}").read).to match(/require "#{require_path}"/)
       end
     end
 
-    context "gem.linter set to rubocop and --linter with no arguments", :hint_text do
+    context "--test parameter set to rspec" do
       before do
-        bundle "config set gem.linter rubocop"
-        bundle "gem #{gem_name} --linter"
-      end
-
-      it "generates a RuboCop config file" do
-        expect(bundled_app("#{gem_name}/.rubocop.yml")).to exist
+        bundle "gem #{gem_name} --test=rspec"
       end
 
-      it "hints that --linter is already configured" do
-        expect(out).to match("rubocop is already configured, ignoring --linter flag.")
+      it "builds a spec helper that requires the proper entrypoint, and a default test in the proper path which fails" do
+        expect(bundled_app("#{gem_name}/spec/spec_helper.rb")).to exist
+        expect(bundled_app("#{gem_name}/spec/spec_helper.rb").read).to include(%(require "#{require_path}"))
+        expect(bundled_app("#{gem_name}/spec/#{require_path}_spec.rb")).to exist
+        expect(bundled_app("#{gem_name}/spec/#{require_path}_spec.rb").read).to include("expect(false).to eq(true)")
       end
     end
 
-    context "gem.linter setting set to false and --linter with no arguments", :hint_text do
+    context "--test parameter set to minitest" do
       before do
-        bundle "config set gem.linter false"
-        bundle "gem #{gem_name} --linter"
+        bundle "gem #{gem_name} --test=minitest"
       end
 
-      it "asks to setup a linter" do
-        expect(out).to match("Do you want to add a code linter and formatter to your gem?")
-      end
+      it "builds a test helper that requires the proper entrypoint, and default test file in the proper path that defines the proper test class name, requires helper, and fails" do
+        expect(bundled_app("#{gem_name}/test/test_helper.rb")).to exist
+        expect(bundled_app("#{gem_name}/test/test_helper.rb").read).to include(%(require "#{require_path}"))
 
-      it "hints that the choice will only be applied to the current gem" do
-        expect(out).to match("Your choice will only be applied to this gem.")
+        expect(bundled_app("#{gem_name}/#{minitest_test_file_path}")).to exist
+        expect(bundled_app("#{gem_name}/#{minitest_test_file_path}").read).to include(minitest_test_class_name)
+        expect(bundled_app("#{gem_name}/#{minitest_test_file_path}").read).to include(%(require "test_helper"))
+        expect(bundled_app("#{gem_name}/#{minitest_test_file_path}").read).to include("assert false")
       end
     end
 
-    context "gem.linter setting not set and --linter with no arguments", :hint_text do
+    context "--test parameter set to test-unit" do
       before do
-        bundle "gem #{gem_name} --linter"
+        bundle "gem #{gem_name} --test=test-unit"
       end
 
-      it "asks to setup a linter" do
-        expect(out).to match("Do you want to add a code linter and formatter to your gem?")
+      it "builds a test helper that requires the proper entrypoint, and default test file in the proper path which requires helper and fails" do
+        expect(bundled_app("#{gem_name}/test/test_helper.rb")).to exist
+        expect(bundled_app("#{gem_name}/test/test_helper.rb").read).to include(%(require "#{require_path}"))
+        expect(bundled_app("#{gem_name}/test/#{require_path}_test.rb")).to exist
+        expect(bundled_app("#{gem_name}/test/#{require_path}_test.rb").read).to include(%(require "test_helper"))
+        expect(bundled_app("#{gem_name}/test/#{require_path}_test.rb").read).to include("assert_equal(\"expected\", \"actual\")")
       end
+    end
+  end
 
-      it "hints that the choice will be applied to future bundle gem calls" do
-        hint = "Future `bundle gem` calls will use your choice. " \
-               "This setting can be changed anytime with `bundle config gem.linter`."
-        expect(out).to match(hint)
-      end
+  context "with mit option in bundle config settings set to true" do
+    before do
+      global_config "BUNDLE_GEM__MIT" => "true"
     end
+    it_behaves_like "--mit flag"
+    it_behaves_like "--no-mit flag"
+  end
 
-    context "--edit option" do
-      it "opens the generated gemspec in the user's text editor" do
-        output = bundle "gem #{gem_name} --edit=echo"
-        gemspec_path = File.join(bundled_app, gem_name, "#{gem_name}.gemspec")
-        expect(output).to include("echo \"#{gemspec_path}\"")
-      end
+  context "with mit option in bundle config settings set to false" do
+    before do
+      global_config "BUNDLE_GEM__MIT" => "false"
     end
+    it_behaves_like "--mit flag"
+    it_behaves_like "--no-mit flag"
   end
 
-  context "testing --mit and --coc options against bundle config settings", :readline do
-    let(:gem_name) { "test-gem" }
+  context "with coc option in bundle config settings set to true" do
+    before do
+      global_config "BUNDLE_GEM__COC" => "true"
+    end
+    it_behaves_like "--coc flag"
+    it_behaves_like "--no-coc flag"
+  end
 
-    let(:require_path) { "test/gem" }
+  context "with coc option in bundle config settings set to false" do
+    before do
+      global_config "BUNDLE_GEM__COC" => "false"
+    end
+    it_behaves_like "--coc flag"
+    it_behaves_like "--no-coc flag"
+  end
 
-    context "with mit option in bundle config settings set to true" do
-      before do
-        global_config "BUNDLE_GEM__MIT" => "true"
-      end
-      it_behaves_like "--mit flag"
-      it_behaves_like "--no-mit flag"
+  context "with rubocop option in bundle config settings set to true" do
+    before do
+      global_config "BUNDLE_GEM__RUBOCOP" => "true"
+    end
+    it_behaves_like "--linter=rubocop flag"
+    it_behaves_like "--linter=standard flag"
+    it_behaves_like "--no-linter flag"
+    it_behaves_like "--rubocop flag"
+    it_behaves_like "--no-rubocop flag"
+  end
+
+  context "with rubocop option in bundle config settings set to false" do
+    before do
+      global_config "BUNDLE_GEM__RUBOCOP" => "false"
     end
+    it_behaves_like "--linter=rubocop flag"
+    it_behaves_like "--linter=standard flag"
+    it_behaves_like "--no-linter flag"
+    it_behaves_like "--rubocop flag"
+    it_behaves_like "--no-rubocop flag"
+  end
 
-    context "with mit option in bundle config settings set to false" do
-      before do
-        global_config "BUNDLE_GEM__MIT" => "false"
-      end
-      it_behaves_like "--mit flag"
-      it_behaves_like "--no-mit flag"
+  context "with linter option in bundle config settings set to rubocop" do
+    before do
+      global_config "BUNDLE_GEM__LINTER" => "rubocop"
     end
+    it_behaves_like "--linter=rubocop flag"
+    it_behaves_like "--linter=standard flag"
+    it_behaves_like "--no-linter flag"
+  end
 
-    context "with coc option in bundle config settings set to true" do
-      before do
-        global_config "BUNDLE_GEM__COC" => "true"
-      end
-      it_behaves_like "--coc flag"
-      it_behaves_like "--no-coc flag"
+  context "with linter option in bundle config settings set to standard" do
+    before do
+      global_config "BUNDLE_GEM__LINTER" => "standard"
     end
+    it_behaves_like "--linter=rubocop flag"
+    it_behaves_like "--linter=standard flag"
+    it_behaves_like "--no-linter flag"
+  end
 
-    context "with coc option in bundle config settings set to false" do
-      before do
-        global_config "BUNDLE_GEM__COC" => "false"
-      end
-      it_behaves_like "--coc flag"
-      it_behaves_like "--no-coc flag"
+  context "with linter option in bundle config settings set to false" do
+    before do
+      global_config "BUNDLE_GEM__LINTER" => "false"
     end
+    it_behaves_like "--linter=rubocop flag"
+    it_behaves_like "--linter=standard flag"
+    it_behaves_like "--no-linter flag"
+  end
 
-    context "with rubocop option in bundle config settings set to true" do
-      before do
-        global_config "BUNDLE_GEM__RUBOCOP" => "true"
-      end
-      it_behaves_like "--linter=rubocop flag"
-      it_behaves_like "--linter=standard flag"
-      it_behaves_like "--linter=none flag"
-      it_behaves_like "--rubocop flag"
-      it_behaves_like "--no-rubocop flag"
+  context "with changelog option in bundle config settings set to true" do
+    before do
+      global_config "BUNDLE_GEM__CHANGELOG" => "true"
     end
+    it_behaves_like "--changelog flag"
+    it_behaves_like "--no-changelog flag"
+  end
 
-    context "with rubocop option in bundle config settings set to false" do
-      before do
-        global_config "BUNDLE_GEM__RUBOCOP" => "false"
-      end
-      it_behaves_like "--linter=rubocop flag"
-      it_behaves_like "--linter=standard flag"
-      it_behaves_like "--linter=none flag"
-      it_behaves_like "--rubocop flag"
-      it_behaves_like "--no-rubocop flag"
+  context "with changelog option in bundle config settings set to false" do
+    before do
+      global_config "BUNDLE_GEM__CHANGELOG" => "false"
     end
+    it_behaves_like "--changelog flag"
+    it_behaves_like "--no-changelog flag"
+  end
 
-    context "with linter option in bundle config settings set to rubocop" do
-      before do
-        global_config "BUNDLE_GEM__LINTER" => "rubocop"
-      end
-      it_behaves_like "--linter=rubocop flag"
-      it_behaves_like "--linter=standard flag"
-      it_behaves_like "--linter=none flag"
+  context "with bundle option in bundle config settings set to true" do
+    before do
+      global_config "BUNDLE_GEM__BUNDLE" => "true"
     end
+    it_behaves_like "--bundle flag"
+    it_behaves_like "--no-bundle flag"
 
-    context "with linter option in bundle config settings set to standard" do
+    it "runs bundle install" do
+      bundle "gem #{gem_name}"
+      expect(out).to include("Running bundle install in the new gem directory.")
+    end
+  end
+
+  context "with bundle option in bundle config settings set to false" do
+    before do
+      global_config "BUNDLE_GEM__BUNDLE" => "false"
+    end
+    it_behaves_like "--bundle flag"
+    it_behaves_like "--no-bundle flag"
+
+    it "does not run bundle install" do
+      bundle "gem #{gem_name}"
+      expect(out).to_not include("Running bundle install in the new gem directory.")
+    end
+  end
+
+  context "without git config github.user set" do
+    before do
+      git("config --global --unset github.user")
+    end
+    context "with github-username option in bundle config settings set to some value" do
       before do
-        global_config "BUNDLE_GEM__LINTER" => "standard"
+        global_config "BUNDLE_GEM__GITHUB_USERNAME" => "different_username"
       end
-      it_behaves_like "--linter=rubocop flag"
-      it_behaves_like "--linter=standard flag"
-      it_behaves_like "--linter=none flag"
+      it_behaves_like "--github-username option", "gh_user"
     end
 
-    context "with linter option in bundle config settings set to false" do
+    it_behaves_like "github_username configuration"
+
+    context "with github-username option in bundle config settings set to false" do
       before do
-        global_config "BUNDLE_GEM__LINTER" => "false"
+        global_config "BUNDLE_GEM__GITHUB_USERNAME" => "false"
       end
-      it_behaves_like "--linter=rubocop flag"
-      it_behaves_like "--linter=standard flag"
-      it_behaves_like "--linter=none flag"
+      it_behaves_like "--github-username option", "gh_user"
     end
 
-    context "with changelog option in bundle config settings set to true" do
-      before do
-        global_config "BUNDLE_GEM__CHANGELOG" => "true"
+    context "when changelog is enabled" do
+      it "sets gemspec changelog_uri, homepage, homepage_uri, source_code_uri to TODOs" do
+        bundle "gem #{gem_name} --changelog"
+
+        expect(generated_gemspec.metadata["changelog_uri"]).
+          to eq("TODO: Put your gem's CHANGELOG.md URL here.")
+        expect(generated_gemspec.homepage).to eq("TODO: Put your gem's website or public repo URL here.")
+        expect(generated_gemspec.metadata["homepage_uri"]).to eq("TODO: Put your gem's website or public repo URL here.")
+        expect(generated_gemspec.metadata["source_code_uri"]).to eq("TODO: Put your gem's public repo URL here.")
       end
-      it_behaves_like "--changelog flag"
-      it_behaves_like "--no-changelog flag"
     end
 
-    context "with changelog option in bundle config settings set to false" do
-      before do
-        global_config "BUNDLE_GEM__CHANGELOG" => "false"
+    context "when changelog is not enabled" do
+      it "sets gemspec homepage, homepage_uri, source_code_uri to TODOs and changelog_uri to nil" do
+        bundle "gem #{gem_name}"
+
+        expect(generated_gemspec.metadata["changelog_uri"]).to be_nil
+        expect(generated_gemspec.homepage).to eq("TODO: Put your gem's website or public repo URL here.")
+        expect(generated_gemspec.metadata["homepage_uri"]).to eq("TODO: Put your gem's website or public repo URL here.")
+        expect(generated_gemspec.metadata["source_code_uri"]).to eq("TODO: Put your gem's public repo URL here.")
       end
-      it_behaves_like "--changelog flag"
-      it_behaves_like "--no-changelog flag"
     end
   end
 
-  context "testing --github-username option against git and bundle config settings", :readline do
-    context "without git config set" do
+  context "with git config github.user set" do
+    context "with github-username option in bundle config settings set to some value" do
       before do
-        sys_exec("git config --global --unset github.user")
-      end
-      context "with github-username option in bundle config settings set to some value" do
-        before do
-          global_config "BUNDLE_GEM__GITHUB_USERNAME" => "different_username"
-        end
-        it_behaves_like "--github-username option", "gh_user"
+        global_config "BUNDLE_GEM__GITHUB_USERNAME" => "different_username"
       end
+      it_behaves_like "--github-username option", "gh_user"
+    end
 
-      context "with github-username option in bundle config settings set to false" do
-        before do
-          global_config "BUNDLE_GEM__GITHUB_USERNAME" => "false"
-        end
-        it_behaves_like "--github-username option", "gh_user"
+    it_behaves_like "github_username configuration"
+
+    context "with github-username option in bundle config settings set to false" do
+      before do
+        global_config "BUNDLE_GEM__GITHUB_USERNAME" => "false"
       end
+      it_behaves_like "--github-username option", "gh_user"
     end
 
-    context "with git config set" do
-      context "with github-username option in bundle config settings set to some value" do
-        before do
-          global_config "BUNDLE_GEM__GITHUB_USERNAME" => "different_username"
-        end
-        it_behaves_like "--github-username option", "gh_user"
+    context "when changelog is enabled" do
+      it "sets gemspec changelog_uri, homepage, homepage_uri, source_code_uri based on git username" do
+        bundle "gem #{gem_name} --changelog"
+
+        expect(generated_gemspec.metadata["changelog_uri"]).
+          to eq("https://github.com/bundleuser/#{gem_name}/blob/main/CHANGELOG.md")
+        expect(generated_gemspec.homepage).to eq("https://github.com/bundleuser/#{gem_name}")
+        expect(generated_gemspec.metadata["homepage_uri"]).to eq("https://github.com/bundleuser/#{gem_name}")
+        expect(generated_gemspec.metadata["source_code_uri"]).to eq("https://github.com/bundleuser/#{gem_name}")
       end
+    end
 
-      context "with github-username option in bundle config settings set to false" do
-        before do
-          global_config "BUNDLE_GEM__GITHUB_USERNAME" => "false"
-        end
-        it_behaves_like "--github-username option", "gh_user"
+    context "when changelog is not enabled" do
+      it "sets gemspec source_code_uri, homepage, homepage_uri but not changelog_uri" do
+        bundle "gem #{gem_name}"
+
+        expect(generated_gemspec.metadata["changelog_uri"]).to be_nil
+        expect(generated_gemspec.homepage).to eq("https://github.com/bundleuser/#{gem_name}")
+        expect(generated_gemspec.metadata["homepage_uri"]).to eq("https://github.com/bundleuser/#{gem_name}")
+        expect(generated_gemspec.metadata["source_code_uri"]).to eq("https://github.com/bundleuser/#{gem_name}")
       end
     end
   end
 
-  context "testing github_username bundle config against git config settings", :readline do
-    context "without git config set" do
-      before do
-        sys_exec("git config --global --unset github.user")
-      end
+  context "standard gem naming" do
+    let(:require_path) { gem_name }
 
-      it_behaves_like "github_username configuration"
-    end
+    let(:require_relative_path) { gem_name }
 
-    context "with git config set" do
-      it_behaves_like "github_username configuration"
-    end
+    let(:minitest_test_file_path) { "test/test_#{gem_name}.rb" }
+
+    let(:minitest_test_class_name) { "class TestMygem < Minitest::Test" }
+
+    include_examples "paths that depend on gem name"
   end
 
-  context "gem naming with underscore", :readline do
+  context "gem naming with underscore" do
     let(:gem_name) { "test_gem" }
 
     let(:require_path) { "test_gem" }
@@ -1374,10 +1761,10 @@ def create_temporary_dir(dir)
       expect(bundled_app("#{gem_name}/lib/#{require_path}.rb").read).to match(/module TestGem/)
     end
 
-    include_examples "generating a gem"
+    include_examples "paths that depend on gem name"
 
     context "--ext parameter with no value" do
-      context "is deprecated", :bundler => "< 3" do
+      context "is deprecated" do
         it "prints deprecation when used after gem name" do
           bundle ["gem", "--ext", gem_name].compact.join(" ")
           expect(err).to include "[DEPRECATED]"
@@ -1414,7 +1801,7 @@ def create_temporary_dir(dir)
       it "includes rake-compiler, but no Rust related changes" do
         expect(bundled_app("#{gem_name}/Gemfile").read).to include('gem "rake-compiler"')
 
-        expect(bundled_app("#{gem_name}/Gemfile").read).to_not include('gem "rb_sys"')
+        expect(bundled_app("#{gem_name}/#{gem_name}.gemspec").read).to_not include('spec.add_dependency "rb_sys"')
         expect(bundled_app("#{gem_name}/#{gem_name}.gemspec").read).to_not include('spec.required_rubygems_version = ">= ')
       end
 
@@ -1427,7 +1814,9 @@ def create_temporary_dir(dir)
 
           task build: :compile
 
-          Rake::ExtensionTask.new("#{gem_name}") do |ext|
+          GEMSPEC = Gem::Specification.load("#{gem_name}.gemspec")
+
+          Rake::ExtensionTask.new("#{gem_name}", GEMSPEC) do |ext|
             ext.lib_dir = "lib/#{gem_name}"
           end
 
@@ -1438,24 +1827,10 @@ def create_temporary_dir(dir)
       end
     end
 
-    context "--ext parameter set with rust and old RubyGems" do
-      it "fails in friendly way" do
-        if ::Gem::Version.new("3.3.11") <= ::Gem.rubygems_version
-          skip "RubyGems compatible with Rust builder"
-        end
-
-        expect do
-          bundle ["gem", gem_name, "--ext=rust"].compact.join(" ")
-        end.to raise_error(RuntimeError, /too old to build Rust extension/)
-      end
-    end
-
     context "--ext parameter set with rust" do
       let(:flags) { "--ext=rust" }
 
       before do
-        skip "RubyGems incompatible with Rust builder" if ::Gem::Version.new("3.3.11") > ::Gem.rubygems_version
-
         bundle ["gem", gem_name, flags].compact.join(" ")
       end
 
@@ -1472,7 +1847,7 @@ def create_temporary_dir(dir)
 
       it "includes rake-compiler, rb_sys gems and required_rubygems_version constraint" do
         expect(bundled_app("#{gem_name}/Gemfile").read).to include('gem "rake-compiler"')
-        expect(bundled_app("#{gem_name}/Gemfile").read).to include('gem "rb_sys"')
+        expect(bundled_app("#{gem_name}/#{gem_name}.gemspec").read).to include('spec.add_dependency "rb_sys"')
         expect(bundled_app("#{gem_name}/#{gem_name}.gemspec").read).to include('spec.required_rubygems_version = ">= ')
       end
 
@@ -1485,7 +1860,9 @@ def create_temporary_dir(dir)
 
           task build: :compile
 
-          RbSys::ExtensionTask.new("#{gem_name}") do |ext|
+          GEMSPEC = Gem::Specification.load("#{gem_name}.gemspec")
+
+          RbSys::ExtensionTask.new("#{gem_name}", GEMSPEC) do |ext|
             ext.lib_dir = "lib/#{gem_name}"
           end
 
@@ -1497,7 +1874,7 @@ def create_temporary_dir(dir)
     end
   end
 
-  context "gem naming with dashed", :readline do
+  context "gem naming with dashed" do
     let(:gem_name) { "test-gem" }
 
     let(:require_path) { "test/gem" }
@@ -1514,33 +1891,33 @@ def create_temporary_dir(dir)
       expect(bundled_app("#{gem_name}/lib/#{require_path}.rb").read).to match(/module Test\n  module Gem/)
     end
 
-    include_examples "generating a gem"
+    include_examples "paths that depend on gem name"
   end
 
   describe "uncommon gem names" do
-    it "can deal with two dashes", :readline do
+    it "can deal with two dashes" do
       bundle "gem a--a"
 
       expect(bundled_app("a--a/a--a.gemspec")).to exist
     end
 
     it "fails gracefully with a ." do
-      bundle "gem foo.gemspec", :raise_on_error => false
+      bundle "gem foo.gemspec", raise_on_error: false
       expect(err).to end_with("Invalid gem name foo.gemspec -- `Foo.gemspec` is an invalid constant name")
     end
 
     it "fails gracefully with a ^" do
-      bundle "gem ^", :raise_on_error => false
+      bundle "gem ^", raise_on_error: false
       expect(err).to end_with("Invalid gem name ^ -- `^` is an invalid constant name")
     end
 
     it "fails gracefully with a space" do
-      bundle "gem 'foo bar'", :raise_on_error => false
+      bundle "gem 'foo bar'", raise_on_error: false
       expect(err).to end_with("Invalid gem name foo bar -- `Foo bar` is an invalid constant name")
     end
 
     it "fails gracefully when multiple names are passed" do
-      bundle "gem foo bar baz", :raise_on_error => false
+      bundle "gem foo bar baz", raise_on_error: false
       expect(err).to eq(<<-E.strip)
 ERROR: "bundle gem" was called with arguments ["foo", "bar", "baz"]
 Usage: "bundle gem NAME [OPTIONS]"
@@ -1548,9 +1925,9 @@ def create_temporary_dir(dir)
     end
   end
 
-  describe "#ensure_safe_gem_name", :readline do
+  describe "#ensure_safe_gem_name" do
     before do
-      bundle "gem #{subject}", :raise_on_error => false
+      bundle "gem #{subject}", raise_on_error: false
     end
 
     context "with an existing const name" do
@@ -1576,7 +1953,7 @@ def create_temporary_dir(dir)
 
   context "on first run", :readline do
     it "asks about test framework" do
-      global_config "BUNDLE_GEM__MIT" => "false", "BUNDLE_GEM__COC" => "false"
+      global_config "BUNDLE_GEM__TEST" => nil
 
       bundle "gem foobar" do |input, _, _|
         input.puts "rspec"
@@ -1599,7 +1976,7 @@ def create_temporary_dir(dir)
     end
 
     it "asks about CI service" do
-      global_config "BUNDLE_GEM__TEST" => "false", "BUNDLE_GEM__MIT" => "false", "BUNDLE_GEM__COC" => "false", "BUNDLE_GEM__LINTER" => "false"
+      global_config "BUNDLE_GEM__CI" => nil
 
       bundle "gem foobar" do |input, _, _|
         input.puts "github"
@@ -1608,8 +1985,8 @@ def create_temporary_dir(dir)
       expect(bundled_app("foobar/.github/workflows/main.yml")).to exist
     end
 
-    it "asks about MIT license" do
-      global_config "BUNDLE_GEM__TEST" => "false", "BUNDLE_GEM__COC" => "false", "BUNDLE_GEM__CI" => "false", "BUNDLE_GEM__LINTER" => "false"
+    it "asks about MIT license just once" do
+      global_config "BUNDLE_GEM__MIT" => nil
 
       bundle "config list"
 
@@ -1618,40 +1995,42 @@ def create_temporary_dir(dir)
       end
 
       expect(bundled_app("foobar/LICENSE.txt")).to exist
+      expect(out).to include("Using a MIT license means").once
     end
 
-    it "asks about CoC" do
-      global_config "BUNDLE_GEM__MIT" => "false", "BUNDLE_GEM__TEST" => "false", "BUNDLE_GEM__CI" => "false", "BUNDLE_GEM__LINTER" => "false"
+    it "asks about CoC just once" do
+      global_config "BUNDLE_GEM__COC" => nil
 
       bundle "gem foobar" do |input, _, _|
         input.puts "yes"
       end
 
       expect(bundled_app("foobar/CODE_OF_CONDUCT.md")).to exist
+      expect(out).to include("Codes of conduct can increase contributions to your project").once
     end
 
-    it "asks about CHANGELOG" do
-      global_config "BUNDLE_GEM__MIT" => "false", "BUNDLE_GEM__TEST" => "false", "BUNDLE_GEM__CI" => "false", "BUNDLE_GEM__LINTER" => "false",
-                    "BUNDLE_GEM__COC" => "false"
+    it "asks about CHANGELOG just once" do
+      global_config "BUNDLE_GEM__CHANGELOG" => nil
 
       bundle "gem foobar" do |input, _, _|
         input.puts "yes"
       end
 
       expect(bundled_app("foobar/CHANGELOG.md")).to exist
+      expect(out).to include("A changelog is a file which contains").once
     end
   end
 
-  context "on conflicts with a previously created file", :readline do
+  context "on conflicts with a previously created file" do
     it "should fail gracefully" do
       FileUtils.touch(bundled_app("conflict-foobar"))
-      bundle "gem conflict-foobar", :raise_on_error => false
+      bundle "gem conflict-foobar", raise_on_error: false
       expect(err).to eq("Couldn't create a new gem named `conflict-foobar` because there's an existing file named `conflict-foobar`.")
       expect(exitstatus).to eql(32)
     end
   end
 
-  context "on conflicts with a previously created directory", :readline do
+  context "on conflicts with a previously created directory" do
     it "should succeed" do
       FileUtils.mkdir_p(bundled_app("conflict-foobar/Gemfile"))
       bundle "gem conflict-foobar"
diff --git a/spec/bundler/commands/open_spec.rb b/spec/bundler/commands/open_spec.rb
index e30ebfea5bcbb0..e0c79aa407a3b3 100644
--- a/spec/bundler/commands/open_spec.rb
+++ b/spec/bundler/commands/open_spec.rb
@@ -4,33 +4,33 @@
   context "when opening a regular gem" do
     before do
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
+        source "https://gem.repo1"
         gem "rails"
       G
     end
 
     it "opens the gem with BUNDLER_EDITOR as highest priority" do
-      bundle "open rails", :env => { "EDITOR" => "echo editor", "VISUAL" => "echo visual", "BUNDLER_EDITOR" => "echo bundler_editor" }
+      bundle "open rails", env: { "EDITOR" => "echo editor", "VISUAL" => "echo visual", "BUNDLER_EDITOR" => "echo bundler_editor" }
       expect(out).to include("bundler_editor #{default_bundle_path("gems", "rails-2.3.2")}")
     end
 
     it "opens the gem with VISUAL as 2nd highest priority" do
-      bundle "open rails", :env => { "EDITOR" => "echo editor", "VISUAL" => "echo visual", "BUNDLER_EDITOR" => "" }
+      bundle "open rails", env: { "EDITOR" => "echo editor", "VISUAL" => "echo visual", "BUNDLER_EDITOR" => "" }
       expect(out).to include("visual #{default_bundle_path("gems", "rails-2.3.2")}")
     end
 
     it "opens the gem with EDITOR as 3rd highest priority" do
-      bundle "open rails", :env => { "EDITOR" => "echo editor", "VISUAL" => "", "BUNDLER_EDITOR" => "" }
+      bundle "open rails", env: { "EDITOR" => "echo editor", "VISUAL" => "", "BUNDLER_EDITOR" => "" }
       expect(out).to include("editor #{default_bundle_path("gems", "rails-2.3.2")}")
     end
 
     it "complains if no EDITOR is set" do
-      bundle "open rails", :env => { "EDITOR" => "", "VISUAL" => "", "BUNDLER_EDITOR" => "" }
+      bundle "open rails", env: { "EDITOR" => "", "VISUAL" => "", "BUNDLER_EDITOR" => "" }
       expect(out).to eq("To open a bundled gem, set $EDITOR or $BUNDLER_EDITOR")
     end
 
     it "complains if gem not in bundle" do
-      bundle "open missing", :env => { "EDITOR" => "echo editor", "VISUAL" => "", "BUNDLER_EDITOR" => "" }, :raise_on_error => false
+      bundle "open missing", env: { "EDITOR" => "echo editor", "VISUAL" => "", "BUNDLER_EDITOR" => "" }, raise_on_error: false
       expect(err).to match(/could not find gem 'missing'/i)
     end
 
@@ -39,113 +39,113 @@
       ref = git.ref_for("main", 11)
 
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
+        source "https://gem.repo1"
         gem 'foo', :git => "#{lib_path("foo-1.0")}"
       G
 
-      bundle "open foo", :env => { "EDITOR" => "echo editor", "VISUAL" => "", "BUNDLER_EDITOR" => "" }
-      expect(out).to match("editor #{default_bundle_path.join("bundler/gems/foo-1.0-#{ref}")}")
+      bundle "open foo", env: { "EDITOR" => "echo editor", "VISUAL" => "", "BUNDLER_EDITOR" => "" }
+      expect(out).to include("editor #{default_bundle_path("bundler", "gems", "foo-1.0-#{ref}")}")
     end
 
     it "suggests alternatives for similar-sounding gems" do
-      bundle "open Rails", :env => { "EDITOR" => "echo editor", "VISUAL" => "", "BUNDLER_EDITOR" => "" }, :raise_on_error => false
+      bundle "open Rails", env: { "EDITOR" => "echo editor", "VISUAL" => "", "BUNDLER_EDITOR" => "" }, raise_on_error: false
       expect(err).to match(/did you mean rails\?/i)
     end
 
     it "opens the gem with short words" do
-      bundle "open rec", :env => { "EDITOR" => "echo editor", "VISUAL" => "echo visual", "BUNDLER_EDITOR" => "echo bundler_editor" }
+      bundle "open rec", env: { "EDITOR" => "echo editor", "VISUAL" => "echo visual", "BUNDLER_EDITOR" => "echo bundler_editor" }
 
       expect(out).to include("bundler_editor #{default_bundle_path("gems", "activerecord-2.3.2")}")
     end
 
     it "opens subpath of the gem" do
-      bundle "open activerecord --path lib/activerecord", :env => { "EDITOR" => "echo editor", "VISUAL" => "", "BUNDLER_EDITOR" => "" }
+      bundle "open activerecord --path lib/activerecord", env: { "EDITOR" => "echo editor", "VISUAL" => "", "BUNDLER_EDITOR" => "" }
       expect(out).to include("editor #{default_bundle_path("gems", "activerecord-2.3.2")}/lib/activerecord")
     end
 
     it "opens subpath file of the gem" do
-      bundle "open activerecord --path lib/version.rb", :env => { "EDITOR" => "echo editor", "VISUAL" => "", "BUNDLER_EDITOR" => "" }
+      bundle "open activerecord --path lib/version.rb", env: { "EDITOR" => "echo editor", "VISUAL" => "", "BUNDLER_EDITOR" => "" }
       expect(out).to include("editor #{default_bundle_path("gems", "activerecord-2.3.2")}/lib/version.rb")
     end
 
     it "opens deep subpath of the gem" do
-      bundle "open activerecord --path lib/active_record", :env => { "EDITOR" => "echo editor", "VISUAL" => "", "BUNDLER_EDITOR" => "" }
+      bundle "open activerecord --path lib/active_record", env: { "EDITOR" => "echo editor", "VISUAL" => "", "BUNDLER_EDITOR" => "" }
       expect(out).to include("editor #{default_bundle_path("gems", "activerecord-2.3.2")}/lib/active_record")
     end
 
     it "requires value for --path arg" do
-      bundle "open activerecord --path", :env => { "EDITOR" => "echo editor", "VISUAL" => "", "BUNDLER_EDITOR" => "" }, :raise_on_error => false
+      bundle "open activerecord --path", env: { "EDITOR" => "echo editor", "VISUAL" => "", "BUNDLER_EDITOR" => "" }, raise_on_error: false
       expect(err).to eq "Cannot specify `--path` option without a value"
     end
 
     it "suggests alternatives for similar-sounding gems when using subpath" do
-      bundle "open Rails --path README.md", :env => { "EDITOR" => "echo editor", "VISUAL" => "", "BUNDLER_EDITOR" => "" }, :raise_on_error => false
+      bundle "open Rails --path README.md", env: { "EDITOR" => "echo editor", "VISUAL" => "", "BUNDLER_EDITOR" => "" }, raise_on_error: false
       expect(err).to match(/did you mean rails\?/i)
     end
 
     it "suggests alternatives for similar-sounding gems when using deep subpath" do
-      bundle "open Rails --path some/path/here", :env => { "EDITOR" => "echo editor", "VISUAL" => "", "BUNDLER_EDITOR" => "" }, :raise_on_error => false
+      bundle "open Rails --path some/path/here", env: { "EDITOR" => "echo editor", "VISUAL" => "", "BUNDLER_EDITOR" => "" }, raise_on_error: false
       expect(err).to match(/did you mean rails\?/i)
     end
 
     it "opens subpath of the short worded gem" do
-      bundle "open rec --path CHANGELOG.md", :env => { "EDITOR" => "echo editor", "VISUAL" => "", "BUNDLER_EDITOR" => "" }
+      bundle "open rec --path CHANGELOG.md", env: { "EDITOR" => "echo editor", "VISUAL" => "", "BUNDLER_EDITOR" => "" }
       expect(out).to include("editor #{default_bundle_path("gems", "activerecord-2.3.2")}/CHANGELOG.md")
     end
 
     it "opens deep subpath of the short worded gem" do
-      bundle "open rec --path lib/activerecord", :env => { "EDITOR" => "echo editor", "VISUAL" => "", "BUNDLER_EDITOR" => "" }
+      bundle "open rec --path lib/activerecord", env: { "EDITOR" => "echo editor", "VISUAL" => "", "BUNDLER_EDITOR" => "" }
       expect(out).to include("editor #{default_bundle_path("gems", "activerecord-2.3.2")}/lib/activerecord")
     end
 
     it "opens subpath of the selected matching gem", :readline do
       env = { "EDITOR" => "echo editor", "VISUAL" => "echo visual", "BUNDLER_EDITOR" => "echo bundler_editor" }
-      bundle "open active --path CHANGELOG.md", :env => env do |input, _, _|
+      bundle "open active --path CHANGELOG.md", env: env do |input, _, _|
         input.puts "2"
       end
 
-      expect(out).to match(%r{bundler_editor #{default_bundle_path('gems', 'activerecord-2.3.2')}/CHANGELOG\.md\z})
+      expect(out).to include("bundler_editor #{default_bundle_path("gems", "activerecord-2.3.2").join("CHANGELOG.md")}")
     end
 
     it "opens deep subpath of the selected matching gem", :readline do
       env = { "EDITOR" => "echo editor", "VISUAL" => "echo visual", "BUNDLER_EDITOR" => "echo bundler_editor" }
-      bundle "open active --path lib/activerecord/version.rb", :env => env do |input, _, _|
+      bundle "open active --path lib/activerecord/version.rb", env: env do |input, _, _|
         input.puts "2"
       end
 
-      expect(out).to match(%r{bundler_editor #{default_bundle_path('gems', 'activerecord-2.3.2')}/lib/activerecord/version\.rb\z})
+      expect(out).to include("bundler_editor #{default_bundle_path("gems", "activerecord-2.3.2").join("lib", "activerecord", "version.rb")}")
     end
 
     it "select the gem from many match gems", :readline do
       env = { "EDITOR" => "echo editor", "VISUAL" => "echo visual", "BUNDLER_EDITOR" => "echo bundler_editor" }
-      bundle "open active", :env => env do |input, _, _|
+      bundle "open active", env: env do |input, _, _|
         input.puts "2"
       end
 
-      expect(out).to match(/bundler_editor #{default_bundle_path('gems', 'activerecord-2.3.2')}\z/)
+      expect(out).to include("bundler_editor #{default_bundle_path("gems", "activerecord-2.3.2")}")
     end
 
     it "allows selecting exit from many match gems", :readline do
       env = { "EDITOR" => "echo editor", "VISUAL" => "echo visual", "BUNDLER_EDITOR" => "echo bundler_editor" }
-      bundle "open active", :env => env do |input, _, _|
+      bundle "open active", env: env do |input, _, _|
         input.puts "0"
       end
     end
 
     it "performs an automatic bundle install" do
       gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
+        source "https://gem.repo1"
         gem "rails"
         gem "foo"
       G
 
       bundle "config set auto_install 1"
-      bundle "open rails", :env => { "EDITOR" => "echo editor", "VISUAL" => "", "BUNDLER_EDITOR" => "" }
+      bundle "open rails", env: { "EDITOR" => "echo editor", "VISUAL" => "", "BUNDLER_EDITOR" => "" }
       expect(out).to include("Installing foo 1.0")
     end
 
     it "opens the editor with a clean env" do
-      bundle "open", :env => { "EDITOR" => "sh -c 'env'", "VISUAL" => "", "BUNDLER_EDITOR" => "" }, :raise_on_error => false
+      bundle "open", env: { "EDITOR" => "sh -c 'env'", "VISUAL" => "", "BUNDLER_EDITOR" => "" }, raise_on_error: false
       expect(out).not_to include("BUNDLE_GEMFILE=")
     end
   end
@@ -163,13 +163,12 @@
       skip "No default gems available on this test run" if default_gems.empty?
 
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
-        gem "json"
+        source "https://gem.repo1"
       G
     end
 
     it "throws proper error when trying to open default gem" do
-      bundle "open json", :env => { "EDITOR" => "echo editor", "VISUAL" => "echo visual", "BUNDLER_EDITOR" => "echo bundler_editor" }
+      bundle "open json", env: { "EDITOR" => "echo editor", "VISUAL" => "echo visual", "BUNDLER_EDITOR" => "echo bundler_editor" }
       expect(out).to include("Unable to open json because it's a default gem, so the directory it would normally be installed to does not exist.")
     end
   end
diff --git a/spec/bundler/commands/outdated_spec.rb b/spec/bundler/commands/outdated_spec.rb
index bbc3cb54ae8094..d3f9dae8c54fb2 100644
--- a/spec/bundler/commands/outdated_spec.rb
+++ b/spec/bundler/commands/outdated_spec.rb
@@ -4,12 +4,12 @@
   describe "with no arguments" do
     before do
       build_repo2 do
-        build_git "foo", :path => lib_path("foo")
-        build_git "zebra", :path => lib_path("zebra")
+        build_git "foo", path: lib_path("foo")
+        build_git "zebra", path: lib_path("zebra")
       end
 
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo2)}"
+        source "https://gem.repo2"
         gem "zebra", :git => "#{lib_path("zebra")}"
         gem "foo", :git => "#{lib_path("foo")}"
         gem "activesupport", "2.3.5"
@@ -23,11 +23,11 @@
       update_repo2 do
         build_gem "activesupport", "3.0"
         build_gem "weakling", "0.2"
-        update_git "foo", :path => lib_path("foo")
-        update_git "zebra", :path => lib_path("zebra")
+        update_git "foo", path: lib_path("foo")
+        update_git "zebra", path: lib_path("zebra")
       end
 
-      bundle "outdated", :raise_on_error => false
+      bundle "outdated", raise_on_error: false
 
       expected_output = <<~TABLE.gsub("x", "\\\h").tr(".", "\.").strip
         Gem            Current      Latest       Requested  Groups
@@ -46,11 +46,11 @@
       end
 
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo2)}"
+        source "https://gem.repo2"
         gem "AAA", "1.0.0"
       G
 
-      bundle "outdated", :raise_on_error => false
+      bundle "outdated", raise_on_error: false
 
       expected_output = <<~TABLE
         Gem  Current  Latest  Requested  Groups
@@ -63,10 +63,10 @@
     it "returns non zero exit status if outdated gems present" do
       update_repo2 do
         build_gem "activesupport", "3.0"
-        update_git "foo", :path => lib_path("foo")
+        update_git "foo", path: lib_path("foo")
       end
 
-      bundle "outdated", :raise_on_error => false
+      bundle "outdated", raise_on_error: false
 
       expect(exitstatus).to_not be_zero
     end
@@ -77,7 +77,7 @@
 
     it "adds gem group to dependency output when repo is updated" do
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo2)}"
+        source "https://gem.repo2"
 
         gem "terranova", '8'
 
@@ -89,7 +89,7 @@
       update_repo2 { build_gem "activesupport", "3.0" }
       update_repo2 { build_gem "terranova", "9" }
 
-      bundle "outdated", :raise_on_error => false
+      bundle "outdated", raise_on_error: false
 
       expected_output = <<~TABLE.strip
         Gem            Current  Latest  Requested  Groups
@@ -104,12 +104,12 @@
   describe "with --verbose option" do
     before do
       build_repo2 do
-        build_git "foo", :path => lib_path("foo")
-        build_git "zebra", :path => lib_path("zebra")
+        build_git "foo", path: lib_path("foo")
+        build_git "zebra", path: lib_path("zebra")
       end
 
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo2)}"
+        source "https://gem.repo2"
         gem "zebra", :git => "#{lib_path("zebra")}"
         gem "foo", :git => "#{lib_path("foo")}"
         gem "activesupport", "2.3.5"
@@ -126,20 +126,20 @@
       update_repo2 { build_gem "terranova", "9" }
 
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo2)}"
+        source "https://gem.repo2"
 
         gem "terranova", '9'
         gem 'activesupport', '2.3.5'
       G
 
       gemfile <<-G
-        source "#{file_uri_for(gem_repo2)}"
+        source "https://gem.repo2"
 
         gem "terranova", '8'
         gem 'activesupport', '2.3.5'
       G
 
-      bundle "outdated --verbose", :raise_on_error => false
+      bundle "outdated --verbose", raise_on_error: false
 
       expected_output = <<~TABLE.strip
         Gem            Current  Latest  Requested  Groups   Path
@@ -151,7 +151,7 @@
     end
   end
 
-  describe "with multiple, duplicated sources, with lockfile in old format", :bundler => "< 3" do
+  describe "with multiple, duplicated sources, with lockfile in old format" do
     before do
       build_repo2 do
         build_gem "dotenv", "2.7.6"
@@ -162,7 +162,7 @@
         build_gem "vcr", "6.0.0"
       end
 
-      build_repo gem_repo3 do
+      build_repo3 do
         build_gem "pkg-gem-flowbyte-with-dep", "1.0.0" do |s|
           s.add_dependency "oj"
         end
@@ -205,8 +205,8 @@
     end
 
     it "works" do
-      bundle :install, :artifice => "compact_index"
-      bundle :outdated, :artifice => "compact_index", :raise_on_error => false
+      bundle :install, artifice: "compact_index"
+      bundle :outdated, artifice: "compact_index", raise_on_error: false
 
       expected_output = <<~TABLE
         Gem  Current  Latest  Requested  Groups
@@ -220,12 +220,12 @@
   describe "with --group option" do
     before do
       build_repo2 do
-        build_git "foo", :path => lib_path("foo")
-        build_git "zebra", :path => lib_path("zebra")
+        build_git "foo", path: lib_path("foo")
+        build_git "zebra", path: lib_path("zebra")
       end
 
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo2)}"
+        source "https://gem.repo2"
 
         gem "weakling", "~> 0.0.1"
         gem "terranova", '8'
@@ -243,7 +243,7 @@ def test_group_option(group)
         build_gem "duradura", "8.0"
       end
 
-      bundle "outdated --group #{group}", :raise_on_error => false
+      bundle "outdated --group #{group}", raise_on_error: false
     end
 
     it "works when the bundle is up to date" do
@@ -251,6 +251,14 @@ def test_group_option(group)
       expect(out).to end_with("Bundle up to date!")
     end
 
+    it "works when only out of date gems are not in given group" do
+      update_repo2 do
+        build_gem "terranova", "9"
+      end
+      bundle "outdated --group development"
+      expect(out).to end_with("Bundle up to date!")
+    end
+
     it "returns a sorted list of outdated gems from one group => 'default'" do
       test_group_option("default")
 
@@ -290,8 +298,8 @@ def test_group_option(group)
   describe "with --groups option and outdated transitive dependencies" do
     before do
       build_repo2 do
-        build_git "foo", :path => lib_path("foo")
-        build_git "zebra", :path => lib_path("zebra")
+        build_git "foo", path: lib_path("foo")
+        build_git "zebra", path: lib_path("zebra")
 
         build_gem "bar", %w[2.0.0]
 
@@ -301,7 +309,7 @@ def test_group_option(group)
       end
 
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo2)}"
+        source "https://gem.repo2"
 
         gem "bar_dependant", '7.0'
       G
@@ -312,7 +320,7 @@ def test_group_option(group)
     end
 
     it "returns a sorted list of outdated gems" do
-      bundle "outdated --groups", :raise_on_error => false
+      bundle "outdated --groups", raise_on_error: false
 
       expected_output = <<~TABLE.strip
         Gem  Current  Latest  Requested  Groups
@@ -326,12 +334,12 @@ def test_group_option(group)
   describe "with --groups option" do
     before do
       build_repo2 do
-        build_git "foo", :path => lib_path("foo")
-        build_git "zebra", :path => lib_path("zebra")
+        build_git "foo", path: lib_path("foo")
+        build_git "zebra", path: lib_path("zebra")
       end
 
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo2)}"
+        source "https://gem.repo2"
 
         gem "weakling", "~> 0.0.1"
         gem "terranova", '8'
@@ -354,7 +362,7 @@ def test_group_option(group)
         build_gem "duradura", "8.0"
       end
 
-      bundle "outdated --groups", :raise_on_error => false
+      bundle "outdated --groups", raise_on_error: false
 
       expected_output = <<~TABLE.strip
         Gem            Current  Latest  Requested  Groups
@@ -370,12 +378,12 @@ def test_group_option(group)
   describe "with --local option" do
     before do
       build_repo2 do
-        build_git "foo", :path => lib_path("foo")
-        build_git "zebra", :path => lib_path("zebra")
+        build_git "foo", path: lib_path("foo")
+        build_git "zebra", path: lib_path("zebra")
       end
 
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo2)}"
+        source "https://gem.repo2"
 
         gem "weakling", "~> 0.0.1"
         gem "terranova", '8'
@@ -394,11 +402,11 @@ def test_group_option(group)
       bundle "config set clean false"
 
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo2)}"
+        source "https://gem.repo2"
         gem "activesupport", "2.3.4"
       G
 
-      bundle "outdated --local", :raise_on_error => false
+      bundle "outdated --local", raise_on_error: false
 
       expected_output = <<~TABLE.strip
         Gem            Current  Latest  Requested  Groups
@@ -409,7 +417,7 @@ def test_group_option(group)
     end
 
     it "doesn't hit repo2" do
-      FileUtils.rm_rf(gem_repo2)
+      FileUtils.rm_r(gem_repo2)
 
       bundle "outdated --local"
       expect(out).not_to match(/Fetching (gem|version|dependency) metadata from/)
@@ -420,15 +428,15 @@ def test_group_option(group)
     context "and gems are outdated" do
       before do
         build_repo2 do
-          build_git "foo", :path => lib_path("foo")
-          build_git "zebra", :path => lib_path("zebra")
+          build_git "foo", path: lib_path("foo")
+          build_git "zebra", path: lib_path("zebra")
 
           build_gem "activesupport", "3.0"
           build_gem "weakling", "0.2"
         end
 
         install_gemfile <<-G
-          source "#{file_uri_for(gem_repo2)}"
+          source "https://gem.repo2"
           gem "zebra", :git => "#{lib_path("zebra")}"
           gem "foo", :git => "#{lib_path("foo")}"
           gem "activesupport", "2.3.5"
@@ -438,30 +446,51 @@ def test_group_option(group)
         G
       end
 
-      it "outputs a sorted list of outdated gems with a more minimal format" do
+      it "outputs a sorted list of outdated gems with a more minimal format to stdout" do
         minimal_output = "activesupport (newest 3.0, installed 2.3.5, requested = 2.3.5)\n" \
                          "weakling (newest 0.2, installed 0.0.3, requested ~> 0.0.1)"
         subject
         expect(out).to eq(minimal_output)
       end
+
+      it "outputs progress to stderr" do
+        subject
+        expect(err).to include("Fetching gem metadata")
+      end
     end
 
     context "and no gems are outdated" do
-      it "has empty output" do
+      before do
+        build_repo2 do
+          build_gem "activesupport", "3.0"
+        end
+
+        install_gemfile <<-G
+          source "https://gem.repo2"
+          gem "activesupport", "3.0"
+        G
+      end
+
+      it "does not output to stdout" do
         subject
         expect(out).to be_empty
       end
+
+      it "outputs progress to stderr" do
+        subject
+        expect(err).to include("Fetching gem metadata")
+      end
     end
   end
 
   describe "with --parseable option" do
-    subject { bundle "outdated --parseable", :raise_on_error => false }
+    subject { bundle "outdated --parseable", raise_on_error: false }
 
     it_behaves_like "a minimal output is desired"
   end
 
   describe "with aliased --porcelain option" do
-    subject { bundle "outdated --porcelain", :raise_on_error => false }
+    subject { bundle "outdated --porcelain", raise_on_error: false }
 
     it_behaves_like "a minimal output is desired"
   end
@@ -469,12 +498,12 @@ def test_group_option(group)
   describe "with specified gems" do
     it "returns list of outdated gems" do
       build_repo2 do
-        build_git "foo", :path => lib_path("foo")
-        build_git "zebra", :path => lib_path("zebra")
+        build_git "foo", path: lib_path("foo")
+        build_git "zebra", path: lib_path("zebra")
       end
 
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo2)}"
+        source "https://gem.repo2"
         gem "zebra", :git => "#{lib_path("zebra")}"
         gem "foo", :git => "#{lib_path("foo")}"
         gem "activesupport", "2.3.5"
@@ -485,10 +514,10 @@ def test_group_option(group)
 
       update_repo2 do
         build_gem "activesupport", "3.0"
-        update_git "foo", :path => lib_path("foo")
+        update_git "foo", path: lib_path("foo")
       end
 
-      bundle "outdated foo", :raise_on_error => false
+      bundle "outdated foo", raise_on_error: false
 
       expected_output = <<~TABLE.gsub("x", "\\\h").tr(".", "\.").strip
         Gem  Current      Latest       Requested  Groups
@@ -497,17 +526,55 @@ def test_group_option(group)
 
       expect(out).to match(Regexp.new(expected_output))
     end
+
+    it "does not require gems to be installed" do
+      build_repo4 do
+        build_gem "zeitwerk", "1.0.0"
+        build_gem "zeitwerk", "2.0.0"
+      end
+
+      gemfile <<-G
+        source "https://gem.repo4"
+        gem "zeitwerk"
+      G
+
+      lockfile <<~L
+        GEM
+          remote: https://gem.repo4/
+          specs:
+            zeitwerk (1.0.0)
+
+        PLATFORMS
+          #{lockfile_platforms}
+
+        DEPENDENCIES
+          zeitwerk
+
+        BUNDLED WITH
+           #{Bundler::VERSION}
+      L
+
+      bundle "outdated zeitwerk", raise_on_error: false
+
+      expected_output = <<~TABLE.tr(".", "\.").strip
+        Gem       Current  Latest  Requested  Groups
+        zeitwerk  1.0.0    2.0.0   >= 0       default
+      TABLE
+
+      expect(out).to match(Regexp.new(expected_output))
+      expect(err).to be_empty
+    end
   end
 
   describe "pre-release gems" do
     before do
       build_repo2 do
-        build_git "foo", :path => lib_path("foo")
-        build_git "zebra", :path => lib_path("zebra")
+        build_git "foo", path: lib_path("foo")
+        build_git "zebra", path: lib_path("zebra")
       end
 
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo2)}"
+        source "https://gem.repo2"
         gem "zebra", :git => "#{lib_path("zebra")}"
         gem "foo", :git => "#{lib_path("foo")}"
         gem "activesupport", "2.3.5"
@@ -535,7 +602,7 @@ def test_group_option(group)
           build_gem "activesupport", "3.0.0.beta"
         end
 
-        bundle "outdated --pre", :raise_on_error => false
+        bundle "outdated --pre", raise_on_error: false
 
         expected_output = <<~TABLE.strip
           Gem            Current  Latest      Requested  Groups
@@ -554,11 +621,11 @@ def test_group_option(group)
         end
 
         install_gemfile <<-G
-          source "#{file_uri_for(gem_repo2)}"
+          source "https://gem.repo2"
           gem "activesupport", "3.0.0.beta.1"
         G
 
-        bundle "outdated", :raise_on_error => false
+        bundle "outdated", raise_on_error: false
 
         expected_output = <<~TABLE.strip
           Gem            Current       Latest        Requested       Groups
@@ -573,12 +640,12 @@ def test_group_option(group)
   describe "with --filter-strict option" do
     before do
       build_repo2 do
-        build_git "foo", :path => lib_path("foo")
-        build_git "zebra", :path => lib_path("zebra")
+        build_git "foo", path: lib_path("foo")
+        build_git "zebra", path: lib_path("zebra")
       end
 
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo2)}"
+        source "https://gem.repo2"
         gem "zebra", :git => "#{lib_path("zebra")}"
         gem "foo", :git => "#{lib_path("foo")}"
         gem "activesupport", "2.3.5"
@@ -594,7 +661,7 @@ def test_group_option(group)
         build_gem "weakling", "0.0.5"
       end
 
-      bundle :outdated, :"filter-strict" => true, :raise_on_error => false
+      bundle :outdated, "filter-strict": true, raise_on_error: false
 
       expected_output = <<~TABLE.strip
         Gem       Current  Latest  Requested  Groups
@@ -610,7 +677,7 @@ def test_group_option(group)
         build_gem "weakling", "0.0.5"
       end
 
-      bundle :outdated, :strict => true, :raise_on_error => false
+      bundle :outdated, strict: true, raise_on_error: false
 
       expected_output = <<~TABLE.strip
         Gem       Current  Latest  Requested  Groups
@@ -622,22 +689,22 @@ def test_group_option(group)
 
     it "doesn't crash when some deps unused on the current platform" do
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo2)}"
+        source "https://gem.repo2"
         gem "activesupport", platforms: [:ruby_22]
       G
 
-      bundle :outdated, :"filter-strict" => true
+      bundle :outdated, "filter-strict": true
 
       expect(out).to end_with("Bundle up to date!")
     end
 
     it "only reports gem dependencies when they can actually be updated" do
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo2)}"
-        gem "rack_middleware", "1.0"
+        source "https://gem.repo2"
+        gem "myrack_middleware", "1.0"
       G
 
-      bundle :outdated, :"filter-strict" => true
+      bundle :outdated, "filter-strict": true
 
       expect(out).to end_with("Bundle up to date!")
     end
@@ -645,7 +712,7 @@ def test_group_option(group)
     describe "and filter options" do
       it "only reports gems that match requirement and patch filter level" do
         install_gemfile <<-G
-          source "#{file_uri_for(gem_repo2)}"
+          source "https://gem.repo2"
           gem "activesupport", "~> 2.3"
           gem "weakling", ">= 0.0.1"
         G
@@ -667,7 +734,7 @@ def test_group_option(group)
 
       it "only reports gems that match requirement and minor filter level" do
         install_gemfile <<-G
-          source "#{file_uri_for(gem_repo2)}"
+          source "https://gem.repo2"
           gem "activesupport", "~> 2.3"
           gem "weakling", ">= 0.0.1"
         G
@@ -689,7 +756,7 @@ def test_group_option(group)
 
       it "only reports gems that match requirement and major filter level" do
         install_gemfile <<-G
-          source "#{file_uri_for(gem_repo2)}"
+          source "https://gem.repo2"
           gem "activesupport", "~> 2.3"
           gem "weakling", ">= 0.0.1"
         G
@@ -714,12 +781,12 @@ def test_group_option(group)
   describe "with invalid gem name" do
     before do
       build_repo2 do
-        build_git "foo", :path => lib_path("foo")
-        build_git "zebra", :path => lib_path("zebra")
+        build_git "foo", path: lib_path("foo")
+        build_git "zebra", path: lib_path("zebra")
       end
 
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo2)}"
+        source "https://gem.repo2"
         gem "zebra", :git => "#{lib_path("zebra")}"
         gem "foo", :git => "#{lib_path("foo")}"
         gem "activesupport", "2.3.5"
@@ -730,46 +797,46 @@ def test_group_option(group)
     end
 
     it "returns could not find gem name" do
-      bundle "outdated invalid_gem_name", :raise_on_error => false
+      bundle "outdated invalid_gem_name", raise_on_error: false
       expect(err).to include("Could not find gem 'invalid_gem_name'.")
     end
 
     it "returns non-zero exit code" do
-      bundle "outdated invalid_gem_name", :raise_on_error => false
+      bundle "outdated invalid_gem_name", raise_on_error: false
       expect(exitstatus).to_not be_zero
     end
   end
 
   it "performs an automatic bundle install" do
     gemfile <<-G
-      source "#{file_uri_for(gem_repo1)}"
-      gem "rack", "0.9.1"
+      source "https://gem.repo1"
+      gem "myrack", "0.9.1"
       gem "foo"
     G
 
     bundle "config set auto_install 1"
-    bundle :outdated, :raise_on_error => false
+    bundle :outdated, raise_on_error: false
     expect(out).to include("Installing foo 1.0")
   end
 
-  context "after bundle install --deployment", :bundler => "< 3" do
+  context "after bundle install --deployment" do
     before do
       build_repo2
 
       gemfile <<-G
-        source "#{file_uri_for(gem_repo2)}"
+        source "https://gem.repo2"
 
-        gem "rack"
+        gem "myrack"
         gem "foo"
       G
       bundle :lock
-      bundle :install, :deployment => true
+      bundle :install, deployment: true
     end
 
     it "outputs a helpful message about being in deployment mode" do
       update_repo2 { build_gem "activesupport", "3.0" }
 
-      bundle "outdated", :raise_on_error => false
+      bundle "outdated", raise_on_error: false
       expect(last_command).to be_failure
       expect(err).to include("You are trying to check outdated gems in deployment mode.")
       expect(err).to include("Run `bundle outdated` elsewhere.")
@@ -781,14 +848,14 @@ def test_group_option(group)
   context "after bundle config set --local deployment true" do
     before do
       build_repo2 do
-        build_git "foo", :path => lib_path("foo")
-        build_git "zebra", :path => lib_path("zebra")
+        build_git "foo", path: lib_path("foo")
+        build_git "zebra", path: lib_path("zebra")
       end
 
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo2)}"
+        source "https://gem.repo2"
 
-        gem "rack"
+        gem "myrack"
         gem "foo"
       G
       bundle "config set --local deployment true"
@@ -797,7 +864,7 @@ def test_group_option(group)
     it "outputs a helpful message about being in deployment mode" do
       update_repo2 { build_gem "activesupport", "3.0" }
 
-      bundle "outdated", :raise_on_error => false
+      bundle "outdated", raise_on_error: false
       expect(last_command).to be_failure
       expect(err).to include("You are trying to check outdated gems in deployment mode.")
       expect(err).to include("Run `bundle outdated` elsewhere.")
@@ -811,7 +878,7 @@ def test_group_option(group)
       build_repo2
 
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo2)}"
+        source "https://gem.repo2"
         gem "laduradura", '= 5.15.2'
       G
     end
@@ -829,7 +896,7 @@ def test_group_option(group)
 
     it "reports that updates are available if the Ruby platform is used" do
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo2)}"
+        source "https://gem.repo2"
         gem "laduradura", '= 5.15.2', :platforms => [:ruby, :jruby]
       G
 
@@ -839,11 +906,11 @@ def test_group_option(group)
 
     it "reports that updates are available if the JRuby platform is used", :jruby_only do
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo2)}"
+        source "https://gem.repo2"
         gem "laduradura", '= 5.15.2', :platforms => [:ruby, :jruby]
       G
 
-      bundle "outdated", :raise_on_error => false
+      bundle "outdated", raise_on_error: false
 
       expected_output = <<~TABLE.strip
         Gem         Current  Latest  Requested  Groups
@@ -867,12 +934,12 @@ def test_group_option(group)
   shared_examples_for "major version updates are detected" do
     before do
       build_repo2 do
-        build_git "foo", :path => lib_path("foo")
-        build_git "zebra", :path => lib_path("zebra")
+        build_git "foo", path: lib_path("foo")
+        build_git "zebra", path: lib_path("zebra")
       end
 
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo2)}"
+        source "https://gem.repo2"
         gem "zebra", :git => "#{lib_path("zebra")}"
         gem "foo", :git => "#{lib_path("foo")}"
         gem "activesupport", "2.3.5"
@@ -893,12 +960,12 @@ def test_group_option(group)
   context "when on a new machine" do
     before do
       build_repo2 do
-        build_git "foo", :path => lib_path("foo")
-        build_git "zebra", :path => lib_path("zebra")
+        build_git "foo", path: lib_path("foo")
+        build_git "zebra", path: lib_path("zebra")
       end
 
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo2)}"
+        source "https://gem.repo2"
         gem "zebra", :git => "#{lib_path("zebra")}"
         gem "foo", :git => "#{lib_path("foo")}"
         gem "activesupport", "2.3.5"
@@ -907,28 +974,28 @@ def test_group_option(group)
         gem "terranova", '8'
       G
 
-      simulate_new_machine
+      pristine_system_gems :bundler
 
-      update_git "foo", :path => lib_path("foo")
+      update_git "foo", path: lib_path("foo")
       update_repo2 do
         build_gem "activesupport", "3.3.5"
         build_gem "weakling", "0.8.0"
       end
     end
 
-    subject { bundle "outdated", :raise_on_error => false }
+    subject { bundle "outdated", raise_on_error: false }
     it_behaves_like "version update is detected"
   end
 
   shared_examples_for "minor version updates are detected" do
     before do
       build_repo2 do
-        build_git "foo", :path => lib_path("foo")
-        build_git "zebra", :path => lib_path("zebra")
+        build_git "foo", path: lib_path("foo")
+        build_git "zebra", path: lib_path("zebra")
       end
 
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo2)}"
+        source "https://gem.repo2"
         gem "zebra", :git => "#{lib_path("zebra")}"
         gem "foo", :git => "#{lib_path("foo")}"
         gem "activesupport", "2.3.5"
@@ -949,12 +1016,12 @@ def test_group_option(group)
   shared_examples_for "patch version updates are detected" do
     before do
       build_repo2 do
-        build_git "foo", :path => lib_path("foo")
-        build_git "zebra", :path => lib_path("zebra")
+        build_git "foo", path: lib_path("foo")
+        build_git "zebra", path: lib_path("zebra")
       end
 
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo2)}"
+        source "https://gem.repo2"
         gem "zebra", :git => "#{lib_path("zebra")}"
         gem "foo", :git => "#{lib_path("foo")}"
         gem "activesupport", "2.3.5"
@@ -982,12 +1049,12 @@ def test_group_option(group)
   shared_examples_for "major version is ignored" do
     before do
       build_repo2 do
-        build_git "foo", :path => lib_path("foo")
-        build_git "zebra", :path => lib_path("zebra")
+        build_git "foo", path: lib_path("foo")
+        build_git "zebra", path: lib_path("zebra")
       end
 
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo2)}"
+        source "https://gem.repo2"
         gem "zebra", :git => "#{lib_path("zebra")}"
         gem "foo", :git => "#{lib_path("foo")}"
         gem "activesupport", "2.3.5"
@@ -1008,12 +1075,12 @@ def test_group_option(group)
   shared_examples_for "minor version is ignored" do
     before do
       build_repo2 do
-        build_git "foo", :path => lib_path("foo")
-        build_git "zebra", :path => lib_path("zebra")
+        build_git "foo", path: lib_path("foo")
+        build_git "zebra", path: lib_path("zebra")
       end
 
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo2)}"
+        source "https://gem.repo2"
         gem "zebra", :git => "#{lib_path("zebra")}"
         gem "foo", :git => "#{lib_path("foo")}"
         gem "activesupport", "2.3.5"
@@ -1034,12 +1101,12 @@ def test_group_option(group)
   shared_examples_for "patch version is ignored" do
     before do
       build_repo2 do
-        build_git "foo", :path => lib_path("foo")
-        build_git "zebra", :path => lib_path("zebra")
+        build_git "foo", path: lib_path("foo")
+        build_git "zebra", path: lib_path("zebra")
       end
 
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo2)}"
+        source "https://gem.repo2"
         gem "zebra", :git => "#{lib_path("zebra")}"
         gem "foo", :git => "#{lib_path("foo")}"
         gem "activesupport", "2.3.5"
@@ -1058,7 +1125,7 @@ def test_group_option(group)
   end
 
   describe "with --filter-major option" do
-    subject { bundle "outdated --filter-major", :raise_on_error => false }
+    subject { bundle "outdated --filter-major", raise_on_error: false }
 
     it_behaves_like "major version updates are detected"
     it_behaves_like "minor version is ignored"
@@ -1066,7 +1133,7 @@ def test_group_option(group)
   end
 
   describe "with --filter-minor option" do
-    subject { bundle "outdated --filter-minor", :raise_on_error => false }
+    subject { bundle "outdated --filter-minor", raise_on_error: false }
 
     it_behaves_like "minor version updates are detected"
     it_behaves_like "major version is ignored"
@@ -1074,7 +1141,7 @@ def test_group_option(group)
   end
 
   describe "with --filter-patch option" do
-    subject { bundle "outdated --filter-patch", :raise_on_error => false }
+    subject { bundle "outdated --filter-patch", raise_on_error: false }
 
     it_behaves_like "patch version updates are detected"
     it_behaves_like "major version is ignored"
@@ -1082,7 +1149,7 @@ def test_group_option(group)
   end
 
   describe "with --filter-minor --filter-patch options" do
-    subject { bundle "outdated --filter-minor --filter-patch", :raise_on_error => false }
+    subject { bundle "outdated --filter-minor --filter-patch", raise_on_error: false }
 
     it_behaves_like "minor version updates are detected"
     it_behaves_like "patch version updates are detected"
@@ -1090,7 +1157,7 @@ def test_group_option(group)
   end
 
   describe "with --filter-major --filter-minor options" do
-    subject { bundle "outdated --filter-major --filter-minor", :raise_on_error => false }
+    subject { bundle "outdated --filter-major --filter-minor", raise_on_error: false }
 
     it_behaves_like "major version updates are detected"
     it_behaves_like "minor version updates are detected"
@@ -1098,7 +1165,7 @@ def test_group_option(group)
   end
 
   describe "with --filter-major --filter-patch options" do
-    subject { bundle "outdated --filter-major --filter-patch", :raise_on_error => false }
+    subject { bundle "outdated --filter-major --filter-patch", raise_on_error: false }
 
     it_behaves_like "major version updates are detected"
     it_behaves_like "patch version updates are detected"
@@ -1106,7 +1173,7 @@ def test_group_option(group)
   end
 
   describe "with --filter-major --filter-minor --filter-patch options" do
-    subject { bundle "outdated --filter-major --filter-minor --filter-patch", :raise_on_error => false }
+    subject { bundle "outdated --filter-major --filter-minor --filter-patch", raise_on_error: false }
 
     it_behaves_like "major version updates are detected"
     it_behaves_like "minor version updates are detected"
@@ -1123,7 +1190,7 @@ def test_group_option(group)
 
       # establish a lockfile set to 1.0.0
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo4)}"
+        source "https://gem.repo4"
         gem 'patch', '1.0.0'
         gem 'minor', '1.0.0'
         gem 'major', '1.0.0'
@@ -1131,7 +1198,7 @@ def test_group_option(group)
 
       # remove all version requirements
       gemfile <<-G
-        source "#{file_uri_for(gem_repo4)}"
+        source "https://gem.repo4"
         gem 'patch'
         gem 'minor'
         gem 'major'
@@ -1145,7 +1212,7 @@ def test_group_option(group)
     end
 
     it "shows all gems when patching and filtering to patch" do
-      bundle "outdated --patch --filter-patch", :raise_on_error => false
+      bundle "outdated --patch --filter-patch", raise_on_error: false
 
       expected_output = <<~TABLE.strip
         Gem    Current  Latest  Requested  Groups
@@ -1158,7 +1225,7 @@ def test_group_option(group)
     end
 
     it "shows minor and major when updating to minor and filtering to patch and minor" do
-      bundle "outdated --minor --filter-minor", :raise_on_error => false
+      bundle "outdated --minor --filter-minor", raise_on_error: false
 
       expected_output = <<~TABLE.strip
         Gem    Current  Latest  Requested  Groups
@@ -1170,7 +1237,7 @@ def test_group_option(group)
     end
 
     it "shows minor when updating to major and filtering to minor with parseable" do
-      bundle "outdated --major --filter-minor --parseable", :raise_on_error => false
+      bundle "outdated --major --filter-minor --parseable", raise_on_error: false
 
       expect(out).not_to include("patch (newest")
       expect(out).to include("minor (newest")
@@ -1196,7 +1263,7 @@ def test_group_option(group)
 
       # establish a lockfile set to 1.4.3
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo4)}"
+        source "https://gem.repo4"
         gem 'foo', '1.4.3'
         gem 'bar', '2.0.3'
         gem 'qux', '1.0.0'
@@ -1205,14 +1272,14 @@ def test_group_option(group)
       # remove 1.4.3 requirement and bar altogether
       # to setup update specs below
       gemfile <<-G
-        source "#{file_uri_for(gem_repo4)}"
+        source "https://gem.repo4"
         gem 'foo'
         gem 'qux'
       G
     end
 
     it "shows gems updating to patch and filtering to patch" do
-      bundle "outdated --patch --filter-patch", :raise_on_error => false, :env => { "DEBUG_RESOLVER" => "1" }
+      bundle "outdated --patch --filter-patch", raise_on_error: false, env: { "DEBUG_RESOLVER" => "1" }
 
       expected_output = <<~TABLE.strip
         Gem  Current  Latest  Requested  Groups
@@ -1224,7 +1291,7 @@ def test_group_option(group)
     end
 
     it "shows gems updating to patch and filtering to patch, in debug mode" do
-      bundle "outdated --patch --filter-patch", :raise_on_error => false, :env => { "DEBUG" => "1" }
+      bundle "outdated --patch --filter-patch", raise_on_error: false, env: { "DEBUG" => "1" }
 
       expected_output = <<~TABLE.strip
         Gem  Current  Latest  Requested  Groups   Path
@@ -1246,17 +1313,17 @@ def test_group_option(group)
       end
 
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo4)}"
+        source "https://gem.repo4"
         gem 'weakling', '0.2'
         gem 'bar', '2.1'
       G
 
       gemfile  <<-G
-        source "#{file_uri_for(gem_repo4)}"
+        source "https://gem.repo4"
         gem 'weakling'
       G
 
-      bundle "outdated --only-explicit", :raise_on_error => false
+      bundle "outdated --only-explicit", raise_on_error: false
 
       expected_output = <<~TABLE.strip
         Gem       Current  Latest  Requested  Groups
@@ -1283,7 +1350,7 @@ def test_group_option(group)
 
       lockfile <<~L
         GEM
-          remote: #{file_uri_for(gem_repo4)}/
+          remote: https://gem.repo4/
           specs:
             nokogiri (1.11.1)
             nokogiri (1.11.1-#{Bundler.local_platform})
@@ -1300,13 +1367,13 @@ def test_group_option(group)
       L
 
       gemfile <<-G
-        source "#{file_uri_for(gem_repo4)}"
+        source "https://gem.repo4"
         gem "nokogiri"
       G
     end
 
     it "reports a single entry per gem" do
-      bundle "outdated", :raise_on_error => false
+      bundle "outdated", raise_on_error: false
 
       expected_output = <<~TABLE.strip
         Gem       Current  Latest  Requested  Groups
@@ -1330,14 +1397,14 @@ def test_group_option(group)
       end
 
       gemfile <<~G
-        source "#{file_uri_for(gem_repo4)}"
+        source "https://gem.repo4"
 
         gem "mini_portile2"
       G
 
       lockfile <<~L
         GEM
-          remote: #{file_uri_for(gem_repo4)}/
+          remote: https://gem.repo4/
           specs:
             mini_portile2 (2.5.2)
               net-ftp (~> 0.1)
@@ -1355,7 +1422,7 @@ def test_group_option(group)
     end
 
     it "works" do
-      bundle "outdated", :raise_on_error => false
+      bundle "outdated", raise_on_error: false
 
       expected_output = <<~TABLE.strip
         Gem            Current  Latest  Requested  Groups
diff --git a/spec/bundler/commands/platform_spec.rb b/spec/bundler/commands/platform_spec.rb
index 688bf7b6df9d07..d42fa2adb3655b 100644
--- a/spec/bundler/commands/platform_spec.rb
+++ b/spec/bundler/commands/platform_spec.rb
@@ -4,7 +4,7 @@
   context "without flags" do
     it "returns all the output" do
       gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
+        source "https://gem.repo1"
 
         #{ruby_version_correct}
 
@@ -27,7 +27,7 @@
 
     it "returns all the output including the patchlevel" do
       gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
+        source "https://gem.repo1"
 
         #{ruby_version_correct_patchlevel}
 
@@ -50,7 +50,7 @@
 
     it "doesn't print ruby version requirement if it isn't specified" do
       gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
+        source "https://gem.repo1"
 
         gem "foo"
       G
@@ -68,7 +68,7 @@
 
     it "doesn't match the ruby version requirement" do
       gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
+        source "https://gem.repo1"
 
         #{ruby_version_incorrect}
 
@@ -93,7 +93,7 @@
   context "--ruby" do
     it "returns ruby version when explicit" do
       gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
+        source "https://gem.repo1"
         ruby "1.9.3", :engine => 'ruby', :engine_version => '1.9.3'
 
         gem "foo"
@@ -106,7 +106,7 @@
 
     it "defaults to MRI" do
       gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
+        source "https://gem.repo1"
         ruby "1.9.3"
 
         gem "foo"
@@ -119,7 +119,7 @@
 
     it "handles jruby" do
       gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
+        source "https://gem.repo1"
         ruby "1.8.7", :engine => 'jruby', :engine_version => '1.6.5'
 
         gem "foo"
@@ -132,7 +132,7 @@
 
     it "handles rbx" do
       gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
+        source "https://gem.repo1"
         ruby "1.8.7", :engine => 'rbx', :engine_version => '1.2.4'
 
         gem "foo"
@@ -145,7 +145,7 @@
 
     it "handles truffleruby" do
       gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
+        source "https://gem.repo1"
         ruby "2.5.1", :engine => 'truffleruby', :engine_version => '1.0.0-rc6'
 
         gem "foo"
@@ -158,46 +158,46 @@
 
     it "raises an error if engine is used but engine version is not" do
       gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
+        source "https://gem.repo1"
         ruby "1.8.7", :engine => 'rbx'
 
         gem "foo"
       G
 
-      bundle "platform", :raise_on_error => false
+      bundle "platform", raise_on_error: false
 
       expect(exitstatus).not_to eq(0)
     end
 
     it "raises an error if engine_version is used but engine is not" do
       gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
+        source "https://gem.repo1"
         ruby "1.8.7", :engine_version => '1.2.4'
 
         gem "foo"
       G
 
-      bundle "platform", :raise_on_error => false
+      bundle "platform", raise_on_error: false
 
       expect(exitstatus).not_to eq(0)
     end
 
     it "raises an error if engine version doesn't match ruby version for MRI" do
       gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
+        source "https://gem.repo1"
         ruby "1.8.7", :engine => 'ruby', :engine_version => '1.2.4'
 
         gem "foo"
       G
 
-      bundle "platform", :raise_on_error => false
+      bundle "platform", raise_on_error: false
 
       expect(exitstatus).not_to eq(0)
     end
 
     it "should print if no ruby version is specified" do
       gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
+        source "https://gem.repo1"
 
         gem "foo"
       G
@@ -209,13 +209,13 @@
 
     it "handles when there is a locked requirement" do
       gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
+        source "https://gem.repo1"
         ruby "< 1.8.7"
       G
 
       lockfile <<-L
         GEM
-          remote: #{file_uri_for(gem_repo1)}/
+          remote: https://gem.repo1/
           specs:
 
         PLATFORMS
@@ -236,12 +236,12 @@
 
     it "handles when there is a lockfile with no requirement" do
       gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
+        source "https://gem.repo1"
       G
 
       lockfile <<-L
         GEM
-          remote: #{file_uri_for(gem_repo1)}/
+          remote: https://gem.repo1/
           specs:
 
         PLATFORMS
@@ -259,7 +259,7 @@
 
     it "handles when there is a requirement in the gemfile" do
       gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
+        source "https://gem.repo1"
         ruby ">= 1.8.7"
       G
 
@@ -269,7 +269,7 @@
 
     it "handles when there are multiple requirements in the gemfile" do
       gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
+        source "https://gem.repo1"
         ruby ">= 1.8.7", "< 2.0.0"
       G
 
@@ -315,8 +315,8 @@ def should_be_patchlevel_fixnum
   context "bundle install" do
     it "installs fine when the ruby version matches" do
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
-        gem "rack"
+        source "https://gem.repo1"
+        gem "myrack"
 
         #{ruby_version_correct}
       G
@@ -326,8 +326,8 @@ def should_be_patchlevel_fixnum
 
     it "installs fine with any engine", :jruby_only do
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
-        gem "rack"
+        source "https://gem.repo1"
+        gem "myrack"
 
         #{ruby_version_correct_engineless}
       G
@@ -337,8 +337,8 @@ def should_be_patchlevel_fixnum
 
     it "installs fine when the patchlevel matches" do
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
-        gem "rack"
+        source "https://gem.repo1"
+        gem "myrack"
 
         #{ruby_version_correct_patchlevel}
       G
@@ -347,9 +347,9 @@ def should_be_patchlevel_fixnum
     end
 
     it "doesn't install when the ruby version doesn't match" do
-      install_gemfile <<-G, :raise_on_error => false
-        source "#{file_uri_for(gem_repo1)}"
-        gem "rack"
+      install_gemfile <<-G, raise_on_error: false
+        source "https://gem.repo1"
+        gem "myrack"
 
         #{ruby_version_incorrect}
       G
@@ -359,9 +359,9 @@ def should_be_patchlevel_fixnum
     end
 
     it "doesn't install when engine doesn't match" do
-      install_gemfile <<-G, :raise_on_error => false
-        source "#{file_uri_for(gem_repo1)}"
-        gem "rack"
+      install_gemfile <<-G, raise_on_error: false
+        source "https://gem.repo1"
+        gem "myrack"
 
         #{engine_incorrect}
       G
@@ -371,9 +371,9 @@ def should_be_patchlevel_fixnum
     end
 
     it "doesn't install when engine version doesn't match", :jruby_only do
-      install_gemfile <<-G, :raise_on_error => false
-        source "#{file_uri_for(gem_repo1)}"
-        gem "rack"
+      install_gemfile <<-G, raise_on_error: false
+        source "https://gem.repo1"
+        gem "myrack"
 
         #{engine_version_incorrect}
       G
@@ -383,9 +383,9 @@ def should_be_patchlevel_fixnum
     end
 
     it "doesn't install when patchlevel doesn't match" do
-      install_gemfile <<-G, :raise_on_error => false
-        source "#{file_uri_for(gem_repo1)}"
-        gem "rack"
+      install_gemfile <<-G, raise_on_error: false
+        source "https://gem.repo1"
+        gem "myrack"
 
         #{patchlevel_incorrect}
       G
@@ -398,13 +398,13 @@ def should_be_patchlevel_fixnum
   context "bundle check" do
     it "checks fine when the ruby version matches" do
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
-        gem "rack"
+        source "https://gem.repo1"
+        gem "myrack"
       G
 
       gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
-        gem "rack"
+        source "https://gem.repo1"
+        gem "myrack"
 
         #{ruby_version_correct}
       G
@@ -415,13 +415,13 @@ def should_be_patchlevel_fixnum
 
     it "checks fine with any engine", :jruby_only do
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
-        gem "rack"
+        source "https://gem.repo1"
+        gem "myrack"
       G
 
       gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
-        gem "rack"
+        source "https://gem.repo1"
+        gem "myrack"
 
         #{ruby_version_correct_engineless}
       G
@@ -432,69 +432,69 @@ def should_be_patchlevel_fixnum
 
     it "fails when ruby version doesn't match" do
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
-        gem "rack"
+        source "https://gem.repo1"
+        gem "myrack"
       G
 
       gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
-        gem "rack"
+        source "https://gem.repo1"
+        gem "myrack"
 
         #{ruby_version_incorrect}
       G
 
-      bundle :check, :raise_on_error => false
+      bundle :check, raise_on_error: false
       should_be_ruby_version_incorrect
     end
 
     it "fails when engine doesn't match" do
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
-        gem "rack"
+        source "https://gem.repo1"
+        gem "myrack"
       G
 
       gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
-        gem "rack"
+        source "https://gem.repo1"
+        gem "myrack"
 
         #{engine_incorrect}
       G
 
-      bundle :check, :raise_on_error => false
+      bundle :check, raise_on_error: false
       should_be_engine_incorrect
     end
 
     it "fails when engine version doesn't match", :jruby_only do
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
-        gem "rack"
+        source "https://gem.repo1"
+        gem "myrack"
       G
 
       gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
-        gem "rack"
+        source "https://gem.repo1"
+        gem "myrack"
 
         #{engine_version_incorrect}
       G
 
-      bundle :check, :raise_on_error => false
+      bundle :check, raise_on_error: false
       should_be_engine_version_incorrect
     end
 
     it "fails when patchlevel doesn't match" do
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
-        gem "rack"
+        source "https://gem.repo1"
+        gem "myrack"
       G
 
       gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
-        gem "rack"
+        source "https://gem.repo1"
+        gem "myrack"
 
         #{patchlevel_incorrect}
       G
 
-      bundle :check, :raise_on_error => false
+      bundle :check, raise_on_error: false
       should_be_patchlevel_incorrect
     end
   end
@@ -504,57 +504,57 @@ def should_be_patchlevel_fixnum
       build_repo2
 
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo2)}"
+        source "https://gem.repo2"
         gem "activesupport"
-        gem "rack-obama"
+        gem "myrack-obama"
       G
     end
 
     it "updates successfully when the ruby version matches" do
       gemfile <<-G
-        source "#{file_uri_for(gem_repo2)}"
+        source "https://gem.repo2"
         gem "activesupport"
-        gem "rack-obama"
+        gem "myrack-obama"
 
         #{ruby_version_correct}
       G
       update_repo2 do
-        build_gem "rack", "1.2" do |s|
-          s.executables = "rackup"
+        build_gem "myrack", "1.2" do |s|
+          s.executables = "myrackup"
         end
 
         build_gem "activesupport", "3.0"
       end
 
-      bundle "update", :all => true
-      expect(the_bundle).to include_gems "rack 1.2", "rack-obama 1.0", "activesupport 3.0"
+      bundle "update", all: true
+      expect(the_bundle).to include_gems "myrack 1.2", "myrack-obama 1.0", "activesupport 3.0"
     end
 
     it "updates fine with any engine", :jruby_only do
       gemfile <<-G
-        source "#{file_uri_for(gem_repo2)}"
+        source "https://gem.repo2"
         gem "activesupport"
-        gem "rack-obama"
+        gem "myrack-obama"
 
         #{ruby_version_correct_engineless}
       G
       update_repo2 do
-        build_gem "rack", "1.2" do |s|
-          s.executables = "rackup"
+        build_gem "myrack", "1.2" do |s|
+          s.executables = "myrackup"
         end
 
         build_gem "activesupport", "3.0"
       end
 
-      bundle "update", :all => true
-      expect(the_bundle).to include_gems "rack 1.2", "rack-obama 1.0", "activesupport 3.0"
+      bundle "update", all: true
+      expect(the_bundle).to include_gems "myrack 1.2", "myrack-obama 1.0", "activesupport 3.0"
     end
 
     it "fails when ruby version doesn't match" do
       gemfile <<-G
-        source "#{file_uri_for(gem_repo2)}"
+        source "https://gem.repo2"
         gem "activesupport"
-        gem "rack-obama"
+        gem "myrack-obama"
 
         #{ruby_version_incorrect}
       G
@@ -562,15 +562,15 @@ def should_be_patchlevel_fixnum
         build_gem "activesupport", "3.0"
       end
 
-      bundle :update, :all => true, :raise_on_error => false
+      bundle :update, all: true, raise_on_error: false
       should_be_ruby_version_incorrect
     end
 
     it "fails when ruby engine doesn't match", :jruby_only do
       gemfile <<-G
-        source "#{file_uri_for(gem_repo2)}"
+        source "https://gem.repo2"
         gem "activesupport"
-        gem "rack-obama"
+        gem "myrack-obama"
 
         #{engine_incorrect}
       G
@@ -578,15 +578,15 @@ def should_be_patchlevel_fixnum
         build_gem "activesupport", "3.0"
       end
 
-      bundle :update, :all => true, :raise_on_error => false
+      bundle :update, all: true, raise_on_error: false
       should_be_engine_incorrect
     end
 
     it "fails when ruby engine version doesn't match", :jruby_only do
       gemfile <<-G
-        source "#{file_uri_for(gem_repo2)}"
+        source "https://gem.repo2"
         gem "activesupport"
-        gem "rack-obama"
+        gem "myrack-obama"
 
         #{engine_version_incorrect}
       G
@@ -594,14 +594,14 @@ def should_be_patchlevel_fixnum
         build_gem "activesupport", "3.0"
       end
 
-      bundle :update, :all => true, :raise_on_error => false
+      bundle :update, all: true, raise_on_error: false
       should_be_engine_version_incorrect
     end
 
     it "fails when patchlevel doesn't match" do
       gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
-        gem "rack"
+        source "https://gem.repo1"
+        gem "myrack"
 
         #{patchlevel_incorrect}
       G
@@ -609,7 +609,7 @@ def should_be_patchlevel_fixnum
         build_gem "activesupport", "3.0"
       end
 
-      bundle :update, :all => true, :raise_on_error => false
+      bundle :update, all: true, raise_on_error: false
       should_be_patchlevel_incorrect
     end
   end
@@ -617,14 +617,14 @@ def should_be_patchlevel_fixnum
   context "bundle info" do
     before do
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
+        source "https://gem.repo1"
         gem "rails"
       G
     end
 
     it "prints path if ruby version is correct" do
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
+        source "https://gem.repo1"
         gem "rails"
 
         #{ruby_version_correct}
@@ -636,7 +636,7 @@ def should_be_patchlevel_fixnum
 
     it "prints path if ruby version is correct for any engine", :jruby_only do
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
+        source "https://gem.repo1"
         gem "rails"
 
         #{ruby_version_correct_engineless}
@@ -646,46 +646,46 @@ def should_be_patchlevel_fixnum
       expect(out).to eq(default_bundle_path("gems", "rails-2.3.2").to_s)
     end
 
-    it "fails if ruby version doesn't match", :bundler => "< 3" do
+    it "fails if ruby version doesn't match" do
       gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
+        source "https://gem.repo1"
         gem "rails"
 
         #{ruby_version_incorrect}
       G
 
-      bundle "show rails", :raise_on_error => false
+      bundle "show rails", raise_on_error: false
       should_be_ruby_version_incorrect
     end
 
-    it "fails if engine doesn't match", :bundler => "< 3" do
+    it "fails if engine doesn't match" do
       gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
+        source "https://gem.repo1"
         gem "rails"
 
         #{engine_incorrect}
       G
 
-      bundle "show rails", :raise_on_error => false
+      bundle "show rails", raise_on_error: false
       should_be_engine_incorrect
     end
 
-    it "fails if engine version doesn't match", :bundler => "< 3", :jruby_only => true do
+    it "fails if engine version doesn't match", jruby_only: true do
       gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
+        source "https://gem.repo1"
         gem "rails"
 
         #{engine_version_incorrect}
       G
 
-      bundle "show rails", :raise_on_error => false
+      bundle "show rails", raise_on_error: false
       should_be_engine_version_incorrect
     end
 
-    it "fails when patchlevel doesn't match", :bundler => "< 3" do
+    it "fails when patchlevel doesn't match" do
       gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
-        gem "rack"
+        source "https://gem.repo1"
+        gem "myrack"
 
         #{patchlevel_incorrect}
       G
@@ -693,7 +693,7 @@ def should_be_patchlevel_fixnum
         build_gem "activesupport", "3.0"
       end
 
-      bundle "show rails", :raise_on_error => false
+      bundle "show rails", raise_on_error: false
       should_be_patchlevel_incorrect
     end
   end
@@ -701,80 +701,80 @@ def should_be_patchlevel_fixnum
   context "bundle cache" do
     before do
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
-        gem 'rack'
+        source "https://gem.repo1"
+        gem 'myrack'
       G
     end
 
     it "copies the .gem file to vendor/cache when ruby version matches" do
       gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
-        gem 'rack'
+        source "https://gem.repo1"
+        gem 'myrack'
 
         #{ruby_version_correct}
       G
 
       bundle :cache
-      expect(bundled_app("vendor/cache/rack-1.0.0.gem")).to exist
+      expect(bundled_app("vendor/cache/myrack-1.0.0.gem")).to exist
     end
 
     it "copies the .gem file to vendor/cache when ruby version matches for any engine", :jruby_only do
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
-        gem 'rack'
+        source "https://gem.repo1"
+        gem 'myrack'
 
         #{ruby_version_correct_engineless}
       G
 
       bundle :cache
-      expect(bundled_app("vendor/cache/rack-1.0.0.gem")).to exist
+      expect(bundled_app("vendor/cache/myrack-1.0.0.gem")).to exist
     end
 
     it "fails if the ruby version doesn't match" do
       gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
-        gem 'rack'
+        source "https://gem.repo1"
+        gem 'myrack'
 
         #{ruby_version_incorrect}
       G
 
-      bundle :cache, :raise_on_error => false
+      bundle :cache, raise_on_error: false
       should_be_ruby_version_incorrect
     end
 
     it "fails if the engine doesn't match" do
       gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
-        gem 'rack'
+        source "https://gem.repo1"
+        gem 'myrack'
 
         #{engine_incorrect}
       G
 
-      bundle :cache, :raise_on_error => false
+      bundle :cache, raise_on_error: false
       should_be_engine_incorrect
     end
 
     it "fails if the engine version doesn't match", :jruby_only do
       gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
-        gem 'rack'
+        source "https://gem.repo1"
+        gem 'myrack'
 
         #{engine_version_incorrect}
       G
 
-      bundle :cache, :raise_on_error => false
+      bundle :cache, raise_on_error: false
       should_be_engine_version_incorrect
     end
 
     it "fails when patchlevel doesn't match" do
       gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
-        gem "rack"
+        source "https://gem.repo1"
+        gem "myrack"
 
         #{patchlevel_incorrect}
       G
 
-      bundle :cache, :raise_on_error => false
+      bundle :cache, raise_on_error: false
       should_be_patchlevel_incorrect
     end
   end
@@ -782,80 +782,80 @@ def should_be_patchlevel_fixnum
   context "bundle pack" do
     before do
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
-        gem 'rack'
+        source "https://gem.repo1"
+        gem 'myrack'
       G
     end
 
     it "copies the .gem file to vendor/cache when ruby version matches" do
       gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
-        gem 'rack'
+        source "https://gem.repo1"
+        gem 'myrack'
 
         #{ruby_version_correct}
       G
 
       bundle :cache
-      expect(bundled_app("vendor/cache/rack-1.0.0.gem")).to exist
+      expect(bundled_app("vendor/cache/myrack-1.0.0.gem")).to exist
     end
 
     it "copies the .gem file to vendor/cache when ruby version matches any engine", :jruby_only do
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
-        gem 'rack'
+        source "https://gem.repo1"
+        gem 'myrack'
 
         #{ruby_version_correct_engineless}
       G
 
       bundle :cache
-      expect(bundled_app("vendor/cache/rack-1.0.0.gem")).to exist
+      expect(bundled_app("vendor/cache/myrack-1.0.0.gem")).to exist
     end
 
     it "fails if the ruby version doesn't match" do
       gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
-        gem 'rack'
+        source "https://gem.repo1"
+        gem 'myrack'
 
         #{ruby_version_incorrect}
       G
 
-      bundle :cache, :raise_on_error => false
+      bundle :cache, raise_on_error: false
       should_be_ruby_version_incorrect
     end
 
     it "fails if the engine doesn't match" do
       gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
-        gem 'rack'
+        source "https://gem.repo1"
+        gem 'myrack'
 
         #{engine_incorrect}
       G
 
-      bundle :cache, :raise_on_error => false
+      bundle :cache, raise_on_error: false
       should_be_engine_incorrect
     end
 
     it "fails if the engine version doesn't match", :jruby_only do
       gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
-        gem 'rack'
+        source "https://gem.repo1"
+        gem 'myrack'
 
         #{engine_version_incorrect}
       G
 
-      bundle :cache, :raise_on_error => false
+      bundle :cache, raise_on_error: false
       should_be_engine_version_incorrect
     end
 
     it "fails when patchlevel doesn't match" do
       gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
-        gem "rack"
+        source "https://gem.repo1"
+        gem "myrack"
 
         #{patchlevel_incorrect}
       G
 
-      bundle :cache, :raise_on_error => false
+      bundle :cache, raise_on_error: false
       should_be_patchlevel_incorrect
     end
   end
@@ -863,179 +863,142 @@ def should_be_patchlevel_fixnum
   context "bundle exec" do
     before do
       ENV["BUNDLER_FORCE_TTY"] = "true"
-      system_gems "rack-1.0.0", "rack-0.9.1", :path => default_bundle_path
+      system_gems "myrack-1.0.0", "myrack-0.9.1", path: default_bundle_path
     end
 
     it "activates the correct gem when ruby version matches" do
       gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
-        gem "rack", "0.9.1"
+        source "https://gem.repo1"
+        gem "myrack", "0.9.1"
 
         #{ruby_version_correct}
       G
 
-      bundle "exec rackup"
+      bundle "exec myrackup"
       expect(out).to include("0.9.1")
     end
 
     it "activates the correct gem when ruby version matches any engine", :jruby_only do
-      system_gems "rack-1.0.0", "rack-0.9.1", :path => default_bundle_path
+      system_gems "myrack-1.0.0", "myrack-0.9.1", path: default_bundle_path
       gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
-        gem "rack", "0.9.1"
+        source "https://gem.repo1"
+        gem "myrack", "0.9.1"
 
         #{ruby_version_correct_engineless}
       G
 
-      bundle "exec rackup"
+      bundle "exec myrackup"
       expect(out).to include("0.9.1")
     end
 
     it "fails when the ruby version doesn't match" do
       gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
-        gem "rack", "0.9.1"
+        source "https://gem.repo1"
+        gem "myrack", "0.9.1"
 
         #{ruby_version_incorrect}
       G
 
-      bundle "exec rackup", :raise_on_error => false
+      bundle "exec myrackup", raise_on_error: false
       should_be_ruby_version_incorrect
     end
 
     it "fails when the engine doesn't match" do
       gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
-        gem "rack", "0.9.1"
+        source "https://gem.repo1"
+        gem "myrack", "0.9.1"
 
         #{engine_incorrect}
       G
 
-      bundle "exec rackup", :raise_on_error => false
+      bundle "exec myrackup", raise_on_error: false
       should_be_engine_incorrect
     end
 
-    # it "fails when the engine version doesn't match", :jruby_only do
-    #   gemfile <<-G
-    #     gem "rack", "0.9.1"
-    #
-    #     #{engine_version_incorrect}
-    #   G
-    #
-    #   bundle "exec rackup"
-    #   should_be_engine_version_incorrect
-    # end
+    it "fails when the engine version doesn't match", :jruby_only do
+      gemfile <<-G
+        gem "myrack", "0.9.1"
+
+        #{engine_version_incorrect}
+      G
+
+      bundle "exec myrackup", raise_on_error: false
+      should_be_engine_version_incorrect
+    end
 
     it "fails when patchlevel doesn't match" do
       gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
-        gem "rack"
+        source "https://gem.repo1"
+        gem "myrack"
 
         #{patchlevel_incorrect}
       G
 
-      bundle "exec rackup", :raise_on_error => false
+      bundle "exec myrackup", raise_on_error: false
       should_be_patchlevel_incorrect
     end
   end
 
-  context "bundle console", :bundler => "< 3" do
+  context "bundle console" do
     before do
+      build_repo2 do
+        build_dummy_irb
+      end
+
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
-        gem "rack"
+        source "https://gem.repo2"
+        gem "irb"
+        gem "myrack"
         gem "activesupport", :group => :test
-        gem "rack_middleware", :group => :development
+        gem "myrack_middleware", :group => :development
       G
     end
 
     it "starts IRB with the default group loaded when ruby version matches", :readline do
-      gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
-        gem "rack"
-        gem "activesupport", :group => :test
-        gem "rack_middleware", :group => :development
-
-        #{ruby_version_correct}
-      G
+      gemfile gemfile + "\n\n#{ruby_version_correct}\n"
 
       bundle "console" do |input, _, _|
-        input.puts("puts RACK")
+        input.puts("puts MYRACK")
         input.puts("exit")
       end
       expect(out).to include("0.9.1")
     end
 
     it "starts IRB with the default group loaded when ruby version matches", :readline, :jruby_only do
-      gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
-        gem "rack"
-        gem "activesupport", :group => :test
-        gem "rack_middleware", :group => :development
-
-        #{ruby_version_correct_engineless}
-      G
+      gemfile gemfile + "\n\n#{ruby_version_correct_engineless}\n"
 
       bundle "console" do |input, _, _|
-        input.puts("puts RACK")
+        input.puts("puts MYRACK")
         input.puts("exit")
       end
       expect(out).to include("0.9.1")
     end
 
     it "fails when ruby version doesn't match" do
-      gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
-        gem "rack"
-        gem "activesupport", :group => :test
-        gem "rack_middleware", :group => :development
-
-        #{ruby_version_incorrect}
-      G
+      gemfile gemfile + "\n\n#{ruby_version_incorrect}\n"
 
-      bundle "console", :raise_on_error => false
+      bundle "console", raise_on_error: false
       should_be_ruby_version_incorrect
     end
 
     it "fails when engine doesn't match" do
-      gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
-        gem "rack"
-        gem "activesupport", :group => :test
-        gem "rack_middleware", :group => :development
-
-        #{engine_incorrect}
-      G
+      gemfile gemfile + "\n\n#{engine_incorrect}\n"
 
-      bundle "console", :raise_on_error => false
+      bundle "console", raise_on_error: false
       should_be_engine_incorrect
     end
 
     it "fails when engine version doesn't match", :jruby_only do
-      gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
-        gem "rack"
-        gem "activesupport", :group => :test
-        gem "rack_middleware", :group => :development
-
-        #{engine_version_incorrect}
-      G
+      gemfile gemfile + "\n\n#{engine_version_incorrect}\n"
 
-      bundle "console", :raise_on_error => false
+      bundle "console", raise_on_error: false
       should_be_engine_version_incorrect
     end
 
     it "fails when patchlevel doesn't match" do
-      gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
-        gem "rack"
-        gem "activesupport", :group => :test
-        gem "rack_middleware", :group => :development
-
-        #{patchlevel_incorrect}
-      G
+      gemfile gemfile + "\n\n#{patchlevel_incorrect}\n"
 
-      bundle "console", :raise_on_error => false
+      bundle "console", raise_on_error: false
       should_be_patchlevel_incorrect
     end
   end
@@ -1043,9 +1006,9 @@ def should_be_patchlevel_fixnum
   context "Bundler.setup" do
     before do
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
+        source "https://gem.repo1"
         gem "yard"
-        gem "rack", :group => :test
+        gem "myrack", :group => :test
       G
 
       ENV["BUNDLER_FORCE_TTY"] = "true"
@@ -1053,9 +1016,9 @@ def should_be_patchlevel_fixnum
 
     it "makes a Gemfile.lock if setup succeeds" do
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
+        source "https://gem.repo1"
         gem "yard"
-        gem "rack"
+        gem "myrack"
 
         #{ruby_version_correct}
       G
@@ -1068,9 +1031,9 @@ def should_be_patchlevel_fixnum
 
     it "makes a Gemfile.lock if setup succeeds for any engine", :jruby_only do
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
+        source "https://gem.repo1"
         gem "yard"
-        gem "rack"
+        gem "myrack"
 
         #{ruby_version_correct_engineless}
       G
@@ -1082,68 +1045,68 @@ def should_be_patchlevel_fixnum
     end
 
     it "fails when ruby version doesn't match" do
-      install_gemfile <<-G, :raise_on_error => false
-        source "#{file_uri_for(gem_repo1)}"
+      install_gemfile <<-G, raise_on_error: false
+        source "https://gem.repo1"
         gem "yard"
-        gem "rack"
+        gem "myrack"
 
         #{ruby_version_incorrect}
       G
 
       FileUtils.rm(bundled_app_lock)
 
-      ruby "require 'bundler/setup'", :env => { "BUNDLER_VERSION" => Bundler::VERSION }, :raise_on_error => false
+      ruby "require 'bundler/setup'", env: { "BUNDLER_VERSION" => Bundler::VERSION }, raise_on_error: false
 
       expect(bundled_app_lock).not_to exist
       should_be_ruby_version_incorrect
     end
 
     it "fails when engine doesn't match" do
-      install_gemfile <<-G, :raise_on_error => false
-        source "#{file_uri_for(gem_repo1)}"
+      install_gemfile <<-G, raise_on_error: false
+        source "https://gem.repo1"
         gem "yard"
-        gem "rack"
+        gem "myrack"
 
         #{engine_incorrect}
       G
 
       FileUtils.rm(bundled_app_lock)
 
-      ruby "require 'bundler/setup'", :env => { "BUNDLER_VERSION" => Bundler::VERSION }, :raise_on_error => false
+      ruby "require 'bundler/setup'", env: { "BUNDLER_VERSION" => Bundler::VERSION }, raise_on_error: false
 
       expect(bundled_app_lock).not_to exist
       should_be_engine_incorrect
     end
 
     it "fails when engine version doesn't match", :jruby_only do
-      install_gemfile <<-G, :raise_on_error => false
-        source "#{file_uri_for(gem_repo1)}"
+      install_gemfile <<-G, raise_on_error: false
+        source "https://gem.repo1"
         gem "yard"
-        gem "rack"
+        gem "myrack"
 
         #{engine_version_incorrect}
       G
 
       FileUtils.rm(bundled_app_lock)
 
-      ruby "require 'bundler/setup'", :env => { "BUNDLER_VERSION" => Bundler::VERSION }, :raise_on_error => false
+      ruby "require 'bundler/setup'", env: { "BUNDLER_VERSION" => Bundler::VERSION }, raise_on_error: false
 
       expect(bundled_app_lock).not_to exist
       should_be_engine_version_incorrect
     end
 
     it "fails when patchlevel doesn't match" do
-      install_gemfile <<-G, :raise_on_error => false
-        source "#{file_uri_for(gem_repo1)}"
+      install_gemfile <<-G, raise_on_error: false
+        source "https://gem.repo1"
         gem "yard"
-        gem "rack"
+        gem "myrack"
 
         #{patchlevel_incorrect}
       G
 
       FileUtils.rm(bundled_app_lock)
 
-      ruby "require 'bundler/setup'", :env => { "BUNDLER_VERSION" => Bundler::VERSION }, :raise_on_error => false
+      ruby "require 'bundler/setup'", env: { "BUNDLER_VERSION" => Bundler::VERSION }, raise_on_error: false
 
       expect(bundled_app_lock).not_to exist
       should_be_patchlevel_incorrect
@@ -1153,11 +1116,11 @@ def should_be_patchlevel_fixnum
   context "bundle outdated" do
     before do
       build_repo2 do
-        build_git "foo", :path => lib_path("foo")
+        build_git "foo", path: lib_path("foo")
       end
 
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo2)}"
+        source "https://gem.repo2"
         gem "activesupport", "2.3.5"
         gem "foo", :git => "#{lib_path("foo")}"
       G
@@ -1166,18 +1129,18 @@ def should_be_patchlevel_fixnum
     it "returns list of outdated gems when the ruby version matches" do
       update_repo2 do
         build_gem "activesupport", "3.0"
-        update_git "foo", :path => lib_path("foo")
+        update_git "foo", path: lib_path("foo")
       end
 
       gemfile <<-G
-        source "#{file_uri_for(gem_repo2)}"
+        source "https://gem.repo2"
         gem "activesupport", "2.3.5"
         gem "foo", :git => "#{lib_path("foo")}"
 
         #{ruby_version_correct}
       G
 
-      bundle "outdated", :raise_on_error => false
+      bundle "outdated", raise_on_error: false
 
       expected_output = <<~TABLE.gsub("x", "\\\h").tr(".", "\.").strip
         Gem            Current      Latest       Requested  Groups
@@ -1192,18 +1155,18 @@ def should_be_patchlevel_fixnum
       bundle :install
       update_repo2 do
         build_gem "activesupport", "3.0"
-        update_git "foo", :path => lib_path("foo")
+        update_git "foo", path: lib_path("foo")
       end
 
       gemfile <<-G
-        source "#{file_uri_for(gem_repo2)}"
+        source "https://gem.repo2"
         gem "activesupport", "2.3.5"
         gem "foo", :git => "#{lib_path("foo")}"
 
         #{ruby_version_correct_engineless}
       G
 
-      bundle "outdated", :raise_on_error => false
+      bundle "outdated", raise_on_error: false
 
       expected_output = <<~TABLE.gsub("x", "\\\h").tr(".", "\.").strip
         Gem            Current      Latest       Requested  Groups
@@ -1217,90 +1180,90 @@ def should_be_patchlevel_fixnum
     it "fails when the ruby version doesn't match" do
       update_repo2 do
         build_gem "activesupport", "3.0"
-        update_git "foo", :path => lib_path("foo")
+        update_git "foo", path: lib_path("foo")
       end
 
       gemfile <<-G
-        source "#{file_uri_for(gem_repo2)}"
+        source "https://gem.repo2"
         gem "activesupport", "2.3.5"
         gem "foo", :git => "#{lib_path("foo")}"
 
         #{ruby_version_incorrect}
       G
 
-      bundle "outdated", :raise_on_error => false
+      bundle "outdated", raise_on_error: false
       should_be_ruby_version_incorrect
     end
 
     it "fails when the engine doesn't match" do
       update_repo2 do
         build_gem "activesupport", "3.0"
-        update_git "foo", :path => lib_path("foo")
+        update_git "foo", path: lib_path("foo")
       end
 
       gemfile <<-G
-        source "#{file_uri_for(gem_repo2)}"
+        source "https://gem.repo2"
         gem "activesupport", "2.3.5"
         gem "foo", :git => "#{lib_path("foo")}"
 
         #{engine_incorrect}
       G
 
-      bundle "outdated", :raise_on_error => false
+      bundle "outdated", raise_on_error: false
       should_be_engine_incorrect
     end
 
     it "fails when the engine version doesn't match", :jruby_only do
       update_repo2 do
         build_gem "activesupport", "3.0"
-        update_git "foo", :path => lib_path("foo")
+        update_git "foo", path: lib_path("foo")
       end
 
       gemfile <<-G
-        source "#{file_uri_for(gem_repo2)}"
+        source "https://gem.repo2"
         gem "activesupport", "2.3.5"
         gem "foo", :git => "#{lib_path("foo")}"
 
         #{engine_version_incorrect}
       G
 
-      bundle "outdated", :raise_on_error => false
+      bundle "outdated", raise_on_error: false
       should_be_engine_version_incorrect
     end
 
     it "fails when the patchlevel doesn't match", :jruby_only do
       update_repo2 do
         build_gem "activesupport", "3.0"
-        update_git "foo", :path => lib_path("foo")
+        update_git "foo", path: lib_path("foo")
       end
 
       gemfile <<-G
-        source "#{file_uri_for(gem_repo2)}"
+        source "https://gem.repo2"
         gem "activesupport", "2.3.5"
         gem "foo", :git => "#{lib_path("foo")}"
 
         #{patchlevel_incorrect}
       G
 
-      bundle "outdated", :raise_on_error => false
+      bundle "outdated", raise_on_error: false
       should_be_patchlevel_incorrect
     end
 
     it "fails when the patchlevel is a fixnum", :jruby_only do
       update_repo2 do
         build_gem "activesupport", "3.0"
-        update_git "foo", :path => lib_path("foo")
+        update_git "foo", path: lib_path("foo")
       end
 
       gemfile <<-G
-        source "#{file_uri_for(gem_repo2)}"
+        source "https://gem.repo2"
         gem "activesupport", "2.3.5"
         gem "foo", :git => "#{lib_path("foo")}"
 
         #{patchlevel_fixnum}
       G
 
-      bundle "outdated", :raise_on_error => false
+      bundle "outdated", raise_on_error: false
       should_be_patchlevel_fixnum
     end
   end
diff --git a/spec/bundler/commands/post_bundle_message_spec.rb b/spec/bundler/commands/post_bundle_message_spec.rb
index 3050b87754bb65..1dfa58dfd7b748 100644
--- a/spec/bundler/commands/post_bundle_message_spec.rb
+++ b/spec/bundler/commands/post_bundle_message_spec.rb
@@ -3,13 +3,13 @@
 RSpec.describe "post bundle message" do
   before :each do
     gemfile <<-G
-      source "#{file_uri_for(gem_repo1)}"
-      gem "rack"
+      source "https://gem.repo1"
+      gem "myrack"
       gem "activesupport", "2.3.5", :group => [:emo, :test]
       group :test do
         gem "rspec"
       end
-      gem "rack-obama", :group => :obama
+      gem "myrack-obama", :group => :obama
     G
   end
 
@@ -19,142 +19,147 @@
   let(:bundle_complete_message)    { "Bundle complete!" }
   let(:bundle_updated_message)     { "Bundle updated!" }
   let(:installed_gems_stats)       { "4 Gemfile dependencies, 5 gems now installed." }
-  let(:bundle_show_message)        { Bundler::VERSION.split(".").first.to_i < 3 ? bundle_show_system_message : bundle_show_path_message }
 
-  describe "for fresh bundle install" do
+  describe "when installing to system gems" do
+    before do
+      bundle "config set --local path.system true"
+    end
+
     it "shows proper messages according to the configured groups" do
       bundle :install
-      expect(out).to include(bundle_show_message)
+      expect(out).to include(bundle_show_system_message)
       expect(out).not_to include("Gems in the group")
       expect(out).to include(bundle_complete_message)
       expect(out).to include(installed_gems_stats)
 
       bundle "config set --local without emo"
       bundle :install
-      expect(out).to include(bundle_show_message)
+      expect(out).to include(bundle_show_system_message)
       expect(out).to include("Gems in the group 'emo' were not installed")
       expect(out).to include(bundle_complete_message)
       expect(out).to include(installed_gems_stats)
 
       bundle "config set --local without emo test"
       bundle :install
-      expect(out).to include(bundle_show_message)
+      expect(out).to include(bundle_show_system_message)
       expect(out).to include("Gems in the groups 'emo' and 'test' were not installed")
       expect(out).to include(bundle_complete_message)
       expect(out).to include("4 Gemfile dependencies, 3 gems now installed.")
 
       bundle "config set --local without emo obama test"
       bundle :install
-      expect(out).to include(bundle_show_message)
+      expect(out).to include(bundle_show_system_message)
       expect(out).to include("Gems in the groups 'emo', 'obama' and 'test' were not installed")
       expect(out).to include(bundle_complete_message)
       expect(out).to include("4 Gemfile dependencies, 2 gems now installed.")
     end
 
-    describe "with `path` configured" do
-      let(:bundle_path) { "./vendor" }
-
-      it "shows proper messages according to the configured groups" do
-        bundle "config set --local path vendor"
-        bundle :install
-        expect(out).to include(bundle_show_path_message)
-        expect(out).to_not include("Gems in the group")
+    describe "for second bundle install run" do
+      it "without any options" do
+        2.times { bundle :install }
+        expect(out).to include(bundle_show_system_message)
+        expect(out).to_not include("Gems in the groups")
         expect(out).to include(bundle_complete_message)
+        expect(out).to include(installed_gems_stats)
+      end
+    end
+  end
 
-        bundle "config set --local path vendor"
-        bundle "config set --local without emo"
-        bundle :install
-        expect(out).to include(bundle_show_path_message)
-        expect(out).to include("Gems in the group 'emo' were not installed")
-        expect(out).to include(bundle_complete_message)
+  describe "with `path` configured" do
+    let(:bundle_path) { "./vendor" }
 
-        bundle "config set --local path vendor"
-        bundle "config set --local without emo test"
-        bundle :install
-        expect(out).to include(bundle_show_path_message)
-        expect(out).to include("Gems in the groups 'emo' and 'test' were not installed")
-        expect(out).to include(bundle_complete_message)
+    it "shows proper messages according to the configured groups" do
+      bundle "config set --local path vendor"
+      bundle :install
+      expect(out).to include(bundle_show_path_message)
+      expect(out).to_not include("Gems in the group")
+      expect(out).to include(bundle_complete_message)
 
-        bundle "config set --local path vendor"
-        bundle "config set --local without emo obama test"
-        bundle :install
-        expect(out).to include(bundle_show_path_message)
-        expect(out).to include("Gems in the groups 'emo', 'obama' and 'test' were not installed")
-        expect(out).to include(bundle_complete_message)
-      end
-    end
+      bundle "config set --local path vendor"
+      bundle "config set --local without emo"
+      bundle :install
+      expect(out).to include(bundle_show_path_message)
+      expect(out).to include("Gems in the group 'emo' were not installed")
+      expect(out).to include(bundle_complete_message)
 
-    describe "with an absolute `path` inside the cwd configured" do
-      let(:bundle_path) { bundled_app("cache") }
+      bundle "config set --local path vendor"
+      bundle "config set --local without emo test"
+      bundle :install
+      expect(out).to include(bundle_show_path_message)
+      expect(out).to include("Gems in the groups 'emo' and 'test' were not installed")
+      expect(out).to include(bundle_complete_message)
 
-      it "shows proper messages according to the configured groups" do
-        bundle "config set --local path #{bundle_path}"
-        bundle :install
-        expect(out).to include("Bundled gems are installed into `./cache`")
-        expect(out).to_not include("Gems in the group")
-        expect(out).to include(bundle_complete_message)
-      end
+      bundle "config set --local path vendor"
+      bundle "config set --local without emo obama test"
+      bundle :install
+      expect(out).to include(bundle_show_path_message)
+      expect(out).to include("Gems in the groups 'emo', 'obama' and 'test' were not installed")
+      expect(out).to include(bundle_complete_message)
     end
+  end
 
-    describe "with `path` configured to an absolute path outside the cwd" do
-      let(:bundle_path) { tmp("not_bundled_app") }
+  describe "with an absolute `path` inside the cwd configured" do
+    let(:bundle_path) { bundled_app("cache") }
 
-      it "shows proper messages according to the configured groups" do
-        bundle "config set --local path #{bundle_path}"
-        bundle :install
-        expect(out).to include("Bundled gems are installed into `#{tmp("not_bundled_app")}`")
-        expect(out).to_not include("Gems in the group")
-        expect(out).to include(bundle_complete_message)
-      end
+    it "shows proper messages according to the configured groups" do
+      bundle "config set --local path #{bundle_path}"
+      bundle :install
+      expect(out).to include("Bundled gems are installed into `./cache`")
+      expect(out).to_not include("Gems in the group")
+      expect(out).to include(bundle_complete_message)
     end
+  end
 
-    describe "with misspelled or non-existent gem name" do
-      before do
-        bundle "config set force_ruby_platform true"
-      end
-
-      it "should report a helpful error message" do
-        install_gemfile <<-G, :raise_on_error => false
-          source "#{file_uri_for(gem_repo1)}"
-          gem "rack"
-          gem "not-a-gem", :group => :development
-        G
-        expect(err).to include <<-EOS.strip
-Could not find gem 'not-a-gem' in rubygems repository #{file_uri_for(gem_repo1)}/ or installed locally.
-        EOS
-      end
+  describe "with `path` configured to an absolute path outside the cwd" do
+    let(:bundle_path) { tmp("not_bundled_app") }
 
-      it "should report a helpful error message with reference to cache if available" do
-        install_gemfile <<-G
-          source "#{file_uri_for(gem_repo1)}"
-          gem "rack"
-        G
-        bundle :cache
-        expect(bundled_app("vendor/cache/rack-1.0.0.gem")).to exist
-        install_gemfile <<-G, :raise_on_error => false
-          source "#{file_uri_for(gem_repo1)}"
-          gem "rack"
-          gem "not-a-gem", :group => :development
-        G
-        expect(err).to include("Could not find gem 'not-a-gem' in").
-          and include("or in gems cached in vendor/cache.")
-      end
+    it "shows proper messages according to the configured groups" do
+      bundle "config set --local path #{bundle_path}"
+      bundle :install
+      expect(out).to include("Bundled gems are installed into `#{tmp("not_bundled_app")}`")
+      expect(out).to_not include("Gems in the group")
+      expect(out).to include(bundle_complete_message)
     end
   end
 
-  describe "for second bundle install run", :bundler => "< 3" do
-    it "without any options" do
-      2.times { bundle :install }
-      expect(out).to include(bundle_show_message)
-      expect(out).to_not include("Gems in the groups")
-      expect(out).to include(bundle_complete_message)
-      expect(out).to include(installed_gems_stats)
+  describe "with misspelled or non-existent gem name" do
+    before do
+      bundle "config set force_ruby_platform true"
+    end
+
+    it "should report a helpful error message" do
+      install_gemfile <<-G, raise_on_error: false
+        source "https://gem.repo1"
+        gem "myrack"
+        gem "not-a-gem", :group => :development
+      G
+      expect(err).to include <<~EOS.strip
+        Could not find gem 'not-a-gem' in rubygems repository https://gem.repo1/ or installed locally.
+      EOS
     end
 
+    it "should report a helpful error message with reference to cache if available" do
+      install_gemfile <<-G
+        source "https://gem.repo1"
+        gem "myrack"
+      G
+      bundle :cache
+      expect(bundled_app("vendor/cache/myrack-1.0.0.gem")).to exist
+      install_gemfile <<-G, raise_on_error: false
+        source "https://gem.repo1"
+        gem "myrack"
+        gem "not-a-gem", :group => :development
+      G
+      expect(err).to include("Could not find gem 'not-a-gem' in").
+        and include("or in gems cached in vendor/cache.")
+    end
+  end
+
+  describe "for second bundle install run after first run using --without" do
     it "with --without one group" do
       bundle "install --without emo"
       bundle :install
-      expect(out).to include(bundle_show_message)
+      expect(out).to include(bundle_show_system_message)
       expect(out).to include("Gems in the group 'emo' were not installed")
       expect(out).to include(bundle_complete_message)
       expect(out).to include(installed_gems_stats)
@@ -163,7 +168,7 @@
     it "with --without two groups" do
       bundle "install --without emo test"
       bundle :install
-      expect(out).to include(bundle_show_message)
+      expect(out).to include(bundle_show_system_message)
       expect(out).to include("Gems in the groups 'emo' and 'test' were not installed")
       expect(out).to include(bundle_complete_message)
     end
@@ -171,7 +176,7 @@
     it "with --without more groups" do
       bundle "install --without emo obama test"
       bundle :install
-      expect(out).to include(bundle_show_message)
+      expect(out).to include(bundle_show_system_message)
       expect(out).to include("Gems in the groups 'emo', 'obama' and 'test' were not installed")
       expect(out).to include(bundle_complete_message)
     end
@@ -179,25 +184,25 @@
 
   describe "for bundle update" do
     it "shows proper messages according to the configured groups" do
-      bundle :update, :all => true
+      bundle :update, all: true
       expect(out).not_to include("Gems in the groups")
       expect(out).to include(bundle_updated_message)
 
       bundle "config set --local without emo"
       bundle :install
-      bundle :update, :all => true
+      bundle :update, all: true
       expect(out).to include("Gems in the group 'emo' were not updated")
       expect(out).to include(bundle_updated_message)
 
       bundle "config set --local without emo test"
       bundle :install
-      bundle :update, :all => true
+      bundle :update, all: true
       expect(out).to include("Gems in the groups 'emo' and 'test' were not updated")
       expect(out).to include(bundle_updated_message)
 
       bundle "config set --local without emo obama test"
       bundle :install
-      bundle :update, :all => true
+      bundle :update, all: true
       expect(out).to include("Gems in the groups 'emo', 'obama' and 'test' were not updated")
       expect(out).to include(bundle_updated_message)
     end
diff --git a/spec/bundler/commands/pristine_spec.rb b/spec/bundler/commands/pristine_spec.rb
index 9e496dc91a9f89..da61dc819920fb 100644
--- a/spec/bundler/commands/pristine_spec.rb
+++ b/spec/bundler/commands/pristine_spec.rb
@@ -4,7 +4,7 @@
 
 RSpec.describe "bundle pristine" do
   before :each do
-    build_lib "baz", :path => bundled_app do |s|
+    build_lib "baz", path: bundled_app do |s|
       s.version = "1.0.0"
       s.add_development_dependency "baz-dev", "=1.0.0"
     end
@@ -13,13 +13,13 @@
       build_gem "weakling"
       build_gem "baz-dev", "1.0.0"
       build_gem "very_simple_binary", &:add_c_extension
-      build_git "foo", :path => lib_path("foo")
-      build_git "git_with_ext", :path => lib_path("git_with_ext"), &:add_c_extension
-      build_lib "bar", :path => lib_path("bar")
+      build_git "foo", path: lib_path("foo")
+      build_git "git_with_ext", path: lib_path("git_with_ext"), &:add_c_extension
+      build_lib "bar", path: lib_path("bar")
     end
 
     install_gemfile <<-G
-      source "#{file_uri_for(gem_repo2)}"
+      source "https://gem.repo2"
       gem "weakling"
       gem "very_simple_binary"
       gem "foo", :git => "#{lib_path("foo")}", :branch => "main"
@@ -49,13 +49,7 @@
       bundle "pristine"
       bundle "-v"
 
-      expected = if Bundler::VERSION < "3.0"
-        "Bundler version"
-      else
-        Bundler::VERSION
-      end
-
-      expect(out).to start_with(expected)
+      expect(out).to end_with(Bundler::VERSION)
     end
   end
 
@@ -164,7 +158,7 @@
     end
 
     it "raises when one of them is not in the lockfile" do
-      bundle "pristine abcabcabc", :raise_on_error => false
+      bundle "pristine abcabcabc", raise_on_error: false
       expect(err).to include("Could not find gem 'abcabcabc'.")
     end
   end
@@ -181,8 +175,8 @@
       bundle "pristine"
 
       makefile_contents = File.read(c_ext_dir.join("Makefile").to_s)
-      expect(makefile_contents).to match(/libpath =.*#{c_ext_dir}/)
-      expect(makefile_contents).to match(/LIBPATH =.*-L#{c_ext_dir}/)
+      expect(makefile_contents).to match(/libpath =.*#{Regexp.escape(c_ext_dir.to_s)}/)
+      expect(makefile_contents).to match(/LIBPATH =.*-L#{Regexp.escape(c_ext_dir.to_s)}/)
     end
   end
 
@@ -198,14 +192,14 @@
       bundle "pristine"
 
       makefile_contents = File.read(c_ext_dir.join("Makefile").to_s)
-      expect(makefile_contents).to match(/libpath =.*#{c_ext_dir}/)
-      expect(makefile_contents).to match(/LIBPATH =.*-L#{c_ext_dir}/)
+      expect(makefile_contents).to match(/libpath =.*#{Regexp.escape(c_ext_dir.to_s)}/)
+      expect(makefile_contents).to match(/LIBPATH =.*-L#{Regexp.escape(c_ext_dir.to_s)}/)
     end
   end
 
   context "when BUNDLE_GEMFILE doesn't exist" do
     before do
-      bundle "pristine", :env => { "BUNDLE_GEMFILE" => "does/not/exist" }, :raise_on_error => false
+      bundle "pristine", env: { "BUNDLE_GEMFILE" => "does/not/exist" }, raise_on_error: false
     end
 
     it "shows a meaningful error" do
diff --git a/spec/bundler/commands/remove_spec.rb b/spec/bundler/commands/remove_spec.rb
index d757e0be4bbbab..3e163461959cd1 100644
--- a/spec/bundler/commands/remove_spec.rb
+++ b/spec/bundler/commands/remove_spec.rb
@@ -4,10 +4,10 @@
   context "when no gems are specified" do
     it "throws error" do
       gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
+        source "https://gem.repo1"
       G
 
-      bundle "remove", :raise_on_error => false
+      bundle "remove", raise_on_error: false
 
       expect(err).to include("Please specify gems to remove.")
     end
@@ -16,45 +16,45 @@
   context "after 'bundle install' is run" do
     describe "running 'bundle remove GEM_NAME'" do
       it "removes it from the lockfile" do
-        rack_dep = <<~L
+        myrack_dep = <<~L
 
           DEPENDENCIES
-            rack
+            myrack
 
         L
 
         gemfile <<-G
-          source "#{file_uri_for(gem_repo1)}"
+          source "https://gem.repo1"
 
-          gem "rack"
+          gem "myrack"
         G
 
         bundle "install"
 
-        expect(lockfile).to include(rack_dep)
+        expect(lockfile).to include(myrack_dep)
 
-        bundle "remove rack"
+        bundle "remove myrack"
 
         expect(gemfile).to eq <<~G
-          source "#{file_uri_for(gem_repo1)}"
+          source "https://gem.repo1"
         G
-        expect(lockfile).to_not include(rack_dep)
+        expect(lockfile).to_not include(myrack_dep)
       end
     end
   end
 
-  context "when --install flag is specified", :bundler => "< 3" do
+  context "when --install flag is specified" do
     it "removes gems from .bundle" do
       gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
+        source "https://gem.repo1"
 
-        gem "rack"
+        gem "myrack"
       G
 
-      bundle "remove rack --install"
+      bundle "remove myrack --install"
 
-      expect(out).to include("rack was removed.")
-      expect(the_bundle).to_not include_gems "rack"
+      expect(out).to include("myrack was removed.")
+      expect(the_bundle).to_not include_gems "myrack"
     end
   end
 
@@ -62,39 +62,39 @@
     context "when gem is present in gemfile" do
       it "shows success for removed gem" do
         gemfile <<-G
-          source "#{file_uri_for(gem_repo1)}"
+          source "https://gem.repo1"
 
-          gem "rack"
+          gem "myrack"
         G
 
-        bundle "remove rack"
+        bundle "remove myrack"
 
-        expect(out).to include("rack was removed.")
-        expect(the_bundle).to_not include_gems "rack"
+        expect(out).to include("myrack was removed.")
+        expect(the_bundle).to_not include_gems "myrack"
         expect(gemfile).to eq <<~G
-          source "#{file_uri_for(gem_repo1)}"
+          source "https://gem.repo1"
         G
       end
 
       context "when gem is specified in multiple lines" do
         it "shows success for removed gem" do
-          build_git "rack"
+          build_git "myrack"
 
           gemfile <<-G
-            source '#{file_uri_for(gem_repo1)}'
+            source 'https://gem.repo1'
 
             gem 'git'
-            gem 'rack',
-                git: "#{lib_path("rack-1.0")}",
+            gem 'myrack',
+                git: "#{lib_path("myrack-1.0")}",
                 branch: 'main'
             gem 'nokogiri'
           G
 
-          bundle "remove rack"
+          bundle "remove myrack"
 
-          expect(out).to include("rack was removed.")
+          expect(out).to include("myrack was removed.")
           expect(gemfile).to eq <<~G
-            source '#{file_uri_for(gem_repo1)}'
+            source 'https://gem.repo1'
 
             gem 'git'
             gem 'nokogiri'
@@ -106,12 +106,12 @@
     context "when gem is not present in gemfile" do
       it "shows warning for gem that could not be removed" do
         gemfile <<-G
-          source "#{file_uri_for(gem_repo1)}"
+          source "https://gem.repo1"
         G
 
-        bundle "remove rack", :raise_on_error => false
+        bundle "remove myrack", raise_on_error: false
 
-        expect(err).to include("`rack` is not specified in #{bundled_app_gemfile} so it could not be removed.")
+        expect(err).to include("`myrack` is not specified in #{bundled_app_gemfile} so it could not be removed.")
       end
     end
   end
@@ -120,18 +120,18 @@
     context "when all gems are present in gemfile" do
       it "shows success fir all removed gems" do
         gemfile <<-G
-          source "#{file_uri_for(gem_repo1)}"
+          source "https://gem.repo1"
 
-          gem "rack"
+          gem "myrack"
           gem "rails"
         G
 
-        bundle "remove rack rails"
+        bundle "remove myrack rails"
 
-        expect(out).to include("rack was removed.")
+        expect(out).to include("myrack was removed.")
         expect(out).to include("rails was removed.")
         expect(gemfile).to eq <<~G
-        source "#{file_uri_for(gem_repo1)}"
+        source "https://gem.repo1"
         G
       end
     end
@@ -139,18 +139,18 @@
     context "when some gems are not present in the gemfile" do
       it "shows warning for those not present and success for those that can be removed" do
         gemfile <<-G
-          source "#{file_uri_for(gem_repo1)}"
+          source "https://gem.repo1"
 
           gem "rails"
           gem "minitest"
           gem "rspec"
         G
 
-        bundle "remove rails rack minitest", :raise_on_error => false
+        bundle "remove rails myrack minitest", raise_on_error: false
 
-        expect(err).to include("`rack` is not specified in #{bundled_app_gemfile} so it could not be removed.")
+        expect(err).to include("`myrack` is not specified in #{bundled_app_gemfile} so it could not be removed.")
         expect(gemfile).to eq <<~G
-          source "#{file_uri_for(gem_repo1)}"
+          source "https://gem.repo1"
 
           gem "rails"
           gem "minitest"
@@ -163,16 +163,16 @@
   context "with inline groups" do
     it "removes the specified gem" do
       gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
+        source "https://gem.repo1"
 
-        gem "rack", :group => [:dev]
+        gem "myrack", :group => [:dev]
       G
 
-      bundle "remove rack"
+      bundle "remove myrack"
 
-      expect(out).to include("rack was removed.")
+      expect(out).to include("myrack was removed.")
       expect(gemfile).to eq <<~G
-        source "#{file_uri_for(gem_repo1)}"
+        source "https://gem.repo1"
       G
     end
   end
@@ -181,7 +181,7 @@
     context "when single group block with gem to be removed is present" do
       it "removes the group block" do
         gemfile <<-G
-          source "#{file_uri_for(gem_repo1)}"
+          source "https://gem.repo1"
 
           group :test do
             gem "rspec"
@@ -192,7 +192,7 @@
 
         expect(out).to include("rspec was removed.")
         expect(gemfile).to eq <<~G
-          source "#{file_uri_for(gem_repo1)}"
+          source "https://gem.repo1"
         G
       end
     end
@@ -200,19 +200,19 @@
     context "when gem to be removed is outside block" do
       it "does not modify group" do
         gemfile <<-G
-          source "#{file_uri_for(gem_repo1)}"
+          source "https://gem.repo1"
 
-          gem "rack"
+          gem "myrack"
           group :test do
             gem "coffee-script-source"
           end
         G
 
-        bundle "remove rack"
+        bundle "remove myrack"
 
-        expect(out).to include("rack was removed.")
+        expect(out).to include("myrack was removed.")
         expect(gemfile).to eq <<~G
-          source "#{file_uri_for(gem_repo1)}"
+          source "https://gem.repo1"
 
           group :test do
             gem "coffee-script-source"
@@ -224,7 +224,7 @@
     context "when an empty block is also present" do
       it "removes all empty blocks" do
         gemfile <<-G
-          source "#{file_uri_for(gem_repo1)}"
+          source "https://gem.repo1"
 
           group :test do
             gem "rspec"
@@ -238,7 +238,7 @@
 
         expect(out).to include("rspec was removed.")
         expect(gemfile).to eq <<~G
-          source "#{file_uri_for(gem_repo1)}"
+          source "https://gem.repo1"
         G
       end
     end
@@ -246,7 +246,7 @@
     context "when the gem belongs to multiple groups" do
       it "removes the groups" do
         gemfile <<-G
-          source "#{file_uri_for(gem_repo1)}"
+          source "https://gem.repo1"
 
           group :test, :serioustest do
             gem "rspec"
@@ -257,7 +257,7 @@
 
         expect(out).to include("rspec was removed.")
         expect(gemfile).to eq <<~G
-          source "#{file_uri_for(gem_repo1)}"
+          source "https://gem.repo1"
         G
       end
     end
@@ -265,7 +265,7 @@
     context "when the gem is present in multiple groups" do
       it "removes all empty blocks" do
         gemfile <<-G
-          source "#{file_uri_for(gem_repo1)}"
+          source "https://gem.repo1"
 
           group :one do
             gem "rspec"
@@ -280,7 +280,7 @@
 
         expect(out).to include("rspec was removed.")
         expect(gemfile).to eq <<~G
-          source "#{file_uri_for(gem_repo1)}"
+          source "https://gem.repo1"
         G
       end
     end
@@ -290,7 +290,7 @@
     context "when all the groups will be empty after removal" do
       it "removes the empty nested blocks" do
         gemfile <<-G
-          source "#{file_uri_for(gem_repo1)}"
+          source "https://gem.repo1"
 
           group :test do
             group :serioustest do
@@ -303,7 +303,7 @@
 
         expect(out).to include("rspec was removed.")
         expect(gemfile).to eq <<~G
-          source "#{file_uri_for(gem_repo1)}"
+          source "https://gem.repo1"
         G
       end
     end
@@ -311,10 +311,10 @@
     context "when outer group will not be empty after removal" do
       it "removes only empty blocks" do
         install_gemfile <<-G
-          source "#{file_uri_for(gem_repo1)}"
+          source "https://gem.repo1"
 
           group :test do
-            gem "rack-test"
+            gem "myrack-test"
 
             group :serioustest do
               gem "rspec"
@@ -326,10 +326,10 @@
 
         expect(out).to include("rspec was removed.")
         expect(gemfile).to eq <<~G
-          source "#{file_uri_for(gem_repo1)}"
+          source "https://gem.repo1"
 
           group :test do
-            gem "rack-test"
+            gem "myrack-test"
 
           end
         G
@@ -339,12 +339,12 @@
     context "when inner group will not be empty after removal" do
       it "removes only empty blocks" do
         install_gemfile <<-G
-          source "#{file_uri_for(gem_repo1)}"
+          source "https://gem.repo1"
 
           group :test do
             group :serioustest do
               gem "rspec"
-              gem "rack-test"
+              gem "myrack-test"
             end
           end
         G
@@ -353,11 +353,11 @@
 
         expect(out).to include("rspec was removed.")
         expect(gemfile).to eq <<~G
-          source "#{file_uri_for(gem_repo1)}"
+          source "https://gem.repo1"
 
           group :test do
             group :serioustest do
-              gem "rack-test"
+              gem "myrack-test"
             end
           end
         G
@@ -369,38 +369,38 @@
     context "when multiple gems are present in same line" do
       it "shows warning for gems not removed" do
         install_gemfile <<-G
-          source "#{file_uri_for(gem_repo1)}"
-          gem "rack"; gem "rails"
+          source "https://gem.repo1"
+          gem "myrack"; gem "rails"
         G
 
-        bundle "remove rails", :raise_on_error => false
+        bundle "remove rails", raise_on_error: false
 
-        expect(err).to include("Gems could not be removed. rack (>= 0) would also have been removed.")
+        expect(err).to include("Gems could not be removed. myrack (>= 0) would also have been removed.")
         expect(gemfile).to eq <<~G
-          source "#{file_uri_for(gem_repo1)}"
-          gem "rack"; gem "rails"
+          source "https://gem.repo1"
+          gem "myrack"; gem "rails"
         G
       end
     end
 
     context "when some gems could not be removed" do
       it "shows warning for gems not removed and success for those removed" do
-        install_gemfile <<-G, :raise_on_error => false
-          source "#{file_uri_for(gem_repo1)}"
-          gem"rack"
+        install_gemfile <<-G, raise_on_error: false
+          source "https://gem.repo1"
+          gem"myrack"
           gem"rspec"
           gem "rails"
           gem "minitest"
         G
 
-        bundle "remove rails rack rspec minitest"
+        bundle "remove rails myrack rspec minitest"
 
         expect(out).to include("rails was removed.")
         expect(out).to include("minitest was removed.")
-        expect(out).to include("rack, rspec could not be removed.")
+        expect(out).to include("myrack, rspec could not be removed.")
         expect(gemfile).to eq <<~G
-          source "#{file_uri_for(gem_repo1)}"
-          gem"rack"
+          source "https://gem.repo1"
+          gem"myrack"
           gem"rspec"
         G
       end
@@ -409,18 +409,18 @@
 
   context "with sources" do
     before do
-      build_repo gem_repo3 do
+      build_repo3 do
         build_gem "rspec"
       end
     end
 
     it "removes gems and empty source blocks" do
       gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
+        source "https://gem.repo1"
 
-        gem "rack"
+        gem "myrack"
 
-        source "#{file_uri_for(gem_repo3)}" do
+        source "https://gem.repo3" do
           gem "rspec"
         end
       G
@@ -431,9 +431,9 @@
 
       expect(out).to include("rspec was removed.")
       expect(gemfile).to eq <<~G
-        source "#{file_uri_for(gem_repo1)}"
+        source "https://gem.repo1"
 
-        gem "rack"
+        gem "myrack"
       G
     end
   end
@@ -441,40 +441,40 @@
   describe "with eval_gemfile" do
     context "when gems are present in both gemfiles" do
       it "removes the gems" do
-        create_file "Gemfile-other", <<-G
-          gem "rack"
+        gemfile "Gemfile-other", <<-G
+          gem "myrack"
         G
 
         install_gemfile <<-G
-          source "#{file_uri_for(gem_repo1)}"
+          source "https://gem.repo1"
 
           eval_gemfile "Gemfile-other"
 
-          gem "rack"
+          gem "myrack"
         G
 
-        bundle "remove rack"
+        bundle "remove myrack"
 
-        expect(out).to include("rack was removed.")
+        expect(out).to include("myrack was removed.")
       end
     end
 
     context "when gems are present in other gemfile" do
       it "removes the gems" do
-        create_file "Gemfile-other", <<-G
-          gem "rack"
+        gemfile "Gemfile-other", <<-G
+          gem "myrack"
         G
 
         install_gemfile <<-G
-          source "#{file_uri_for(gem_repo1)}"
+          source "https://gem.repo1"
 
           eval_gemfile "Gemfile-other"
         G
 
-        bundle "remove rack"
+        bundle "remove myrack"
 
-        expect(bundled_app("Gemfile-other").read).to_not include("gem \"rack\"")
-        expect(out).to include("rack was removed.")
+        expect(bundled_app("Gemfile-other").read).to_not include("gem \"myrack\"")
+        expect(out).to include("myrack was removed.")
       end
     end
 
@@ -486,36 +486,36 @@
         G
 
         install_gemfile <<-G
-          source "#{file_uri_for(gem_repo1)}"
+          source "https://gem.repo1"
 
           eval_gemfile "Gemfile-other"
         G
 
-        bundle "remove rack", :raise_on_error => false
+        bundle "remove myrack", raise_on_error: false
 
-        expect(err).to include("`rack` is not specified in #{bundled_app_gemfile} so it could not be removed.")
+        expect(err).to include("`myrack` is not specified in #{bundled_app_gemfile} so it could not be removed.")
       end
     end
 
     context "when the gem is present in parent file but not in gemfile specified by eval_gemfile" do
       it "removes the gem" do
-        create_file "Gemfile-other", <<-G
+        gemfile "Gemfile-other", <<-G
           gem "rails"
         G
 
         install_gemfile <<-G
-          source "#{file_uri_for(gem_repo1)}"
+          source "https://gem.repo1"
 
           eval_gemfile "Gemfile-other"
-          gem "rack"
+          gem "myrack"
         G
 
-        bundle "remove rack", :raise_on_error => false
+        bundle "remove myrack", raise_on_error: false
 
-        expect(out).to include("rack was removed.")
-        expect(err).to include("`rack` is not specified in #{bundled_app("Gemfile-other")} so it could not be removed.")
+        expect(out).to include("myrack was removed.")
+        expect(err).to include("`myrack` is not specified in #{bundled_app("Gemfile-other")} so it could not be removed.")
         expect(gemfile).to eq <<~G
-          source "#{file_uri_for(gem_repo1)}"
+          source "https://gem.repo1"
 
           eval_gemfile "Gemfile-other"
         G
@@ -524,23 +524,23 @@
 
     context "when gems cannot be removed from other gemfile" do
       it "shows error" do
-        create_file "Gemfile-other", <<-G
-          gem "rails"; gem "rack"
+        gemfile "Gemfile-other", <<-G
+          gem "rails"; gem "myrack"
         G
 
         install_gemfile <<-G
-          source "#{file_uri_for(gem_repo1)}"
+          source "https://gem.repo1"
 
           eval_gemfile "Gemfile-other"
-          gem "rack"
+          gem "myrack"
         G
 
-        bundle "remove rack", :raise_on_error => false
+        bundle "remove myrack", raise_on_error: false
 
-        expect(out).to include("rack was removed.")
+        expect(out).to include("myrack was removed.")
         expect(err).to include("Gems could not be removed. rails (>= 0) would also have been removed.")
         expect(gemfile).to eq <<~G
-          source "#{file_uri_for(gem_repo1)}"
+          source "https://gem.repo1"
 
           eval_gemfile "Gemfile-other"
         G
@@ -549,47 +549,47 @@
 
     context "when gems could not be removed from parent gemfile" do
       it "shows error" do
-        create_file "Gemfile-other", <<-G
-          gem "rack"
+        gemfile "Gemfile-other", <<-G
+          gem "myrack"
         G
 
         install_gemfile <<-G
-          source "#{file_uri_for(gem_repo1)}"
+          source "https://gem.repo1"
 
           eval_gemfile "Gemfile-other"
-          gem "rails"; gem "rack"
+          gem "rails"; gem "myrack"
         G
 
-        bundle "remove rack", :raise_on_error => false
+        bundle "remove myrack", raise_on_error: false
 
         expect(err).to include("Gems could not be removed. rails (>= 0) would also have been removed.")
-        expect(bundled_app("Gemfile-other").read).to include("gem \"rack\"")
+        expect(bundled_app("Gemfile-other").read).to include("gem \"myrack\"")
         expect(gemfile).to eq <<~G
-          source "#{file_uri_for(gem_repo1)}"
+          source "https://gem.repo1"
 
           eval_gemfile "Gemfile-other"
-          gem "rails"; gem "rack"
+          gem "rails"; gem "myrack"
         G
       end
     end
 
     context "when gem present in gemfiles but could not be removed from one from one of them" do
       it "removes gem which can be removed and shows warning for file from which it cannot be removed" do
-        create_file "Gemfile-other", <<-G
-          gem "rack"
+        gemfile "Gemfile-other", <<-G
+          gem "myrack"
         G
 
         install_gemfile <<-G
-          source "#{file_uri_for(gem_repo1)}"
+          source "https://gem.repo1"
 
           eval_gemfile "Gemfile-other"
-          gem"rack"
+          gem"myrack"
         G
 
-        bundle "remove rack"
+        bundle "remove myrack"
 
-        expect(out).to include("rack was removed.")
-        expect(bundled_app("Gemfile-other").read).to_not include("gem \"rack\"")
+        expect(out).to include("myrack was removed.")
+        expect(bundled_app("Gemfile-other").read).to_not include("gem \"myrack\"")
       end
     end
   end
@@ -597,18 +597,18 @@
   context "with install_if" do
     it "removes gems inside blocks and empty blocks" do
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
+        source "https://gem.repo1"
 
         install_if(lambda { false }) do
-          gem "rack"
+          gem "myrack"
         end
       G
 
-      bundle "remove rack"
+      bundle "remove myrack"
 
-      expect(out).to include("rack was removed.")
+      expect(out).to include("myrack was removed.")
       expect(gemfile).to eq <<~G
-        source "#{file_uri_for(gem_repo1)}"
+        source "https://gem.repo1"
       G
     end
   end
@@ -616,32 +616,32 @@
   context "with env" do
     it "removes gems inside blocks and empty blocks" do
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
+        source "https://gem.repo1"
 
         env "BUNDLER_TEST" do
-          gem "rack"
+          gem "myrack"
         end
       G
 
-      bundle "remove rack"
+      bundle "remove myrack"
 
-      expect(out).to include("rack was removed.")
+      expect(out).to include("myrack was removed.")
       expect(gemfile).to eq <<~G
-        source "#{file_uri_for(gem_repo1)}"
+        source "https://gem.repo1"
       G
     end
   end
 
   context "with gemspec" do
     it "should not remove the gem" do
-      build_lib("foo", :path => tmp.join("foo")) do |s|
+      build_lib("foo", path: tmp("foo")) do |s|
         s.write("foo.gemspec", "")
-        s.add_dependency "rack"
+        s.add_dependency "myrack"
       end
 
       install_gemfile(<<-G)
-        source "#{file_uri_for(gem_repo1)}"
-        gemspec :path => '#{tmp.join("foo")}', :name => 'foo'
+        source "https://gem.repo1"
+        gemspec :path => '#{tmp("foo")}', :name => 'foo'
       G
 
       bundle "remove foo"
@@ -654,19 +654,19 @@
     context "when comment is a separate line comment" do
       it "does not remove the line comment" do
         gemfile <<-G
-          source "#{file_uri_for(gem_repo1)}"
+          source "https://gem.repo1"
 
-          # gem "rack" might be used in the future
-          gem "rack"
+          # gem "myrack" might be used in the future
+          gem "myrack"
         G
 
-        bundle "remove rack"
+        bundle "remove myrack"
 
-        expect(out).to include("rack was removed.")
+        expect(out).to include("myrack was removed.")
         expect(gemfile).to eq <<~G
-          source "#{file_uri_for(gem_repo1)}"
+          source "https://gem.repo1"
 
-          # gem "rack" might be used in the future
+          # gem "myrack" might be used in the future
         G
       end
     end
@@ -674,16 +674,16 @@
     context "when gem specified for removal has an inline comment" do
       it "removes the inline comment" do
         gemfile <<-G
-          source "#{file_uri_for(gem_repo1)}"
+          source "https://gem.repo1"
 
-          gem "rack" # this can be removed
+          gem "myrack" # this can be removed
         G
 
-        bundle "remove rack"
+        bundle "remove myrack"
 
-        expect(out).to include("rack was removed.")
+        expect(out).to include("myrack was removed.")
         expect(gemfile).to eq <<~G
-          source "#{file_uri_for(gem_repo1)}"
+          source "https://gem.repo1"
         G
       end
     end
@@ -691,19 +691,19 @@
     context "when gem specified for removal is mentioned in other gem's comment" do
       it "does not remove other gem" do
         gemfile <<-G
-          source "#{file_uri_for(gem_repo1)}"
-          gem "puma" # implements interface provided by gem "rack"
+          source "https://gem.repo1"
+          gem "puma" # implements interface provided by gem "myrack"
 
-          gem "rack"
+          gem "myrack"
         G
 
-        bundle "remove rack"
+        bundle "remove myrack"
 
         expect(out).to_not include("puma was removed.")
-        expect(out).to include("rack was removed.")
+        expect(out).to include("myrack was removed.")
         expect(gemfile).to eq <<~G
-          source "#{file_uri_for(gem_repo1)}"
-          gem "puma" # implements interface provided by gem "rack"
+          source "https://gem.repo1"
+          gem "puma" # implements interface provided by gem "myrack"
         G
       end
     end
@@ -711,22 +711,41 @@
     context "when gem specified for removal has a comment that mentions other gem" do
       it "does not remove other gem" do
         gemfile <<-G
-          source "#{file_uri_for(gem_repo1)}"
-          gem "puma" # implements interface provided by gem "rack"
+          source "https://gem.repo1"
+          gem "puma" # implements interface provided by gem "myrack"
 
-          gem "rack"
+          gem "myrack"
         G
 
         bundle "remove puma"
 
         expect(out).to include("puma was removed.")
-        expect(out).to_not include("rack was removed.")
+        expect(out).to_not include("myrack was removed.")
         expect(gemfile).to eq <<~G
-          source "#{file_uri_for(gem_repo1)}"
+          source "https://gem.repo1"
 
-          gem "rack"
+          gem "myrack"
         G
       end
     end
   end
+
+  context "when gem definition has parentheses" do
+    it "removes the gem" do
+      gemfile <<-G
+        source "https://gem.repo1"
+
+        gem("myrack")
+        gem("myrack", ">= 0")
+        gem("myrack", require: false)
+      G
+
+      bundle "remove myrack"
+
+      expect(out).to include("myrack was removed.")
+      expect(gemfile).to eq <<~G
+        source "https://gem.repo1"
+      G
+    end
+  end
 end
diff --git a/spec/bundler/commands/show_spec.rb b/spec/bundler/commands/show_spec.rb
index 1c6244be415d22..82ec6e51f2e74e 100644
--- a/spec/bundler/commands/show_spec.rb
+++ b/spec/bundler/commands/show_spec.rb
@@ -1,10 +1,10 @@
 # frozen_string_literal: true
 
-RSpec.describe "bundle show", :bundler => "< 3" do
+RSpec.describe "bundle show" do
   context "with a standard Gemfile" do
     before :each do
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
+        source "https://gem.repo1"
         gem "rails"
       G
     end
@@ -35,12 +35,12 @@
       expect(out).to eq(default_bundle_path("gems", "rails-2.3.2").to_s)
     end
 
-    it "warns if path no longer exists on disk" do
-      FileUtils.rm_rf(default_bundle_path("gems", "rails-2.3.2"))
+    it "warns if specification is installed, but path does not exist on disk" do
+      FileUtils.rm_r(default_bundle_path("gems", "rails-2.3.2"))
 
       bundle "show rails"
 
-      expect(err).to match(/has been deleted/i)
+      expect(err).to match(/is missing/i)
       expect(err).to match(default_bundle_path("gems", "rails-2.3.2").to_s)
     end
 
@@ -50,14 +50,14 @@
     end
 
     it "complains if gem not in bundle" do
-      bundle "show missing", :raise_on_error => false
+      bundle "show missing", raise_on_error: false
       expect(err).to match(/could not find gem 'missing'/i)
     end
 
     it "prints path of all gems in bundle sorted by name" do
       bundle "show --paths"
 
-      expect(out).to include(default_bundle_path("gems", "rake-13.0.1").to_s)
+      expect(out).to include(default_bundle_path("gems", "rake-#{rake_version}").to_s)
       expect(out).to include(default_bundle_path("gems", "rails-2.3.2").to_s)
 
       # Gem names are the last component of their path.
@@ -104,7 +104,7 @@
     end
 
     it "prints out branch names other than main" do
-      update_git "foo", :branch => "omg" do |s|
+      update_git "foo", branch: "omg" do |s|
         s.write "lib/foo.rb", "FOO = '1.0.omg'"
       end
       @revision = revision_for(lib_path("foo-1.0"))[0...6]
@@ -129,7 +129,7 @@
     end
 
     it "handles when a version is a '-' prerelease" do
-      @git = build_git("foo", "1.0.0-beta.1", :path => lib_path("foo"))
+      @git = build_git("foo", "1.0.0-beta.1", path: lib_path("foo"))
       install_gemfile <<-G
         gem "foo", "1.0.0-beta.1", :git => "#{lib_path("foo")}"
       G
@@ -142,20 +142,20 @@
 
   context "in a fresh gem in a blank git repo" do
     before :each do
-      build_git "foo", :path => lib_path("foo")
+      build_git "foo", path: lib_path("foo")
       File.open(lib_path("foo/Gemfile"), "w") {|f| f.puts "gemspec" }
-      sys_exec "rm -rf .git && git init", :dir => lib_path("foo")
+      sys_exec "rm -rf .git && git init", dir: lib_path("foo")
     end
 
     it "does not output git errors" do
-      bundle :show, :dir => lib_path("foo")
+      bundle :show, dir: lib_path("foo")
       expect(err_without_deprecations).to be_empty
     end
   end
 
   it "performs an automatic bundle install" do
     gemfile <<-G
-      source "#{file_uri_for(gem_repo1)}"
+      source "https://gem.repo1"
       gem "foo"
     G
 
@@ -167,26 +167,26 @@
   context "with a valid regexp for gem name" do
     it "presents alternatives", :readline do
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
-        gem "rack"
-        gem "rack-obama"
+        source "https://gem.repo1"
+        gem "myrack"
+        gem "myrack-obama"
       G
 
       bundle "show rac"
-      expect(out).to match(/\A1 : rack\n2 : rack-obama\n0 : - exit -(\n>.*)?\z/)
+      expect(out).to match(/\A1 : myrack\n2 : myrack-obama\n0 : - exit -(\n>|\z)/)
     end
   end
 
   context "with an invalid regexp for gem name" do
     it "does not find the gem" do
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
+        source "https://gem.repo1"
         gem "rails"
       G
 
       invalid_regexp = "[]"
 
-      bundle "show #{invalid_regexp}", :raise_on_error => false
+      bundle "show #{invalid_regexp}", raise_on_error: false
       expect(err).to include("Could not find gem '#{invalid_regexp}'.")
     end
   end
@@ -199,7 +199,7 @@
 
     it "doesn't update gems to newer versions" do
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo2)}"
+        source "https://gem.repo2"
         gem "rails"
       G
 
@@ -219,6 +219,6 @@
   end
 end
 
-RSpec.describe "bundle show", :bundler => "3" do
+RSpec.describe "bundle show", bundler: "4" do
   pending "shows a friendly error about the command removal"
 end
diff --git a/spec/bundler/commands/ssl_spec.rb b/spec/bundler/commands/ssl_spec.rb
new file mode 100644
index 00000000000000..b4aca55194e23f
--- /dev/null
+++ b/spec/bundler/commands/ssl_spec.rb
@@ -0,0 +1,372 @@
+# frozen_string_literal: true
+
+require "bundler/cli"
+require "bundler/cli/doctor"
+require "bundler/cli/doctor/ssl"
+require_relative "../support/artifice/helpers/artifice"
+require "bundler/vendored_persistent.rb"
+
+RSpec.describe "bundle doctor ssl" do
+  before(:each) do
+    require_rack_test
+    require_relative "../support/artifice/helpers/endpoint"
+
+    @dummy_endpoint = Class.new(Endpoint) do
+      get "/" do
+      end
+    end
+
+    @previous_level = Bundler.ui.level
+    Bundler.ui.instance_variable_get(:@warning_history).clear
+    @previous_client = Gem::Request::ConnectionPools.client
+    Bundler.ui.level = "info"
+    Artifice.activate_with(@dummy_endpoint)
+    Gem::Request::ConnectionPools.client = Gem::Net::HTTP
+  end
+
+  after(:each) do
+    Bundler.ui.level = @previous_level
+    Artifice.deactivate
+    Gem::Request::ConnectionPools.client = @previous_client
+  end
+
+  context "when a diagnostic fails" do
+    it "prints the diagnostic when openssl can't be loaded" do
+      subject = Bundler::CLI::Doctor::SSL.new({})
+      allow(subject).to receive(:require).with("openssl").and_raise(LoadError)
+
+      expected_err = <<~MSG
+        Oh no! Your Ruby doesn't have OpenSSL, so it can't connect to rubygems.org.
+        You'll need to recompile or reinstall Ruby with OpenSSL support and try again.
+      MSG
+
+      expect { subject.run }.to output("").to_stdout.and output(expected_err).to_stderr
+    end
+
+    it "fails due to certificate verification", :ruby_repo do
+      net_http = Class.new(Artifice::Net::HTTP) do
+        def connect
+          raise OpenSSL::SSL::SSLError, "certificate verify failed"
+        end
+      end
+
+      Artifice.replace_net_http(net_http)
+      Gem::Request::ConnectionPools.client = net_http
+      Gem::RemoteFetcher.fetcher.close_all
+
+      expected_out = <<~MSG
+        Here's your OpenSSL environment:
+
+        OpenSSL:       #{OpenSSL::VERSION}
+        Compiled with: #{OpenSSL::OPENSSL_VERSION}
+        Loaded with:   #{OpenSSL::OPENSSL_LIBRARY_VERSION}
+
+        Trying connections to https://rubygems.org:
+      MSG
+
+      expected_err = <<~MSG
+        Bundler:       failed     (certificate verification)
+        RubyGems:      failed     (certificate verification)
+        Ruby net/http: failed
+
+        Unfortunately, this Ruby can't connect to rubygems.org.
+
+        Below affect only Ruby net/http connections:
+        SSL_CERT_FILE: exists     #{OpenSSL::X509::DEFAULT_CERT_FILE}
+        SSL_CERT_DIR:  exists     #{OpenSSL::X509::DEFAULT_CERT_DIR}
+
+        Your Ruby can't connect to rubygems.org because you are missing the certificate files OpenSSL needs to verify you are connecting to the genuine rubygems.org servers.
+
+      MSG
+
+      subject = Bundler::CLI::Doctor::SSL.new({})
+      expect { subject.run }.to output(expected_out).to_stdout.and output(expected_err).to_stderr
+    end
+
+    it "fails due to a too old tls version" do
+      subject = Bundler::CLI::Doctor::SSL.new({})
+
+      net_http = Class.new(Artifice::Net::HTTP) do
+        def connect
+          raise OpenSSL::SSL::SSLError, "read server hello A"
+        end
+      end
+
+      Artifice.replace_net_http(net_http)
+      Gem::Request::ConnectionPools.client = Gem::Net::HTTP
+      Gem::RemoteFetcher.fetcher.close_all
+
+      expected_out = <<~MSG
+        Here's your OpenSSL environment:
+
+        OpenSSL:       #{OpenSSL::VERSION}
+        Compiled with: #{OpenSSL::OPENSSL_VERSION}
+        Loaded with:   #{OpenSSL::OPENSSL_LIBRARY_VERSION}
+
+        Trying connections to https://rubygems.org:
+      MSG
+
+      expected_err = <<~MSG
+        Bundler:       failed     (SSL/TLS protocol version mismatch)
+        RubyGems:      failed     (SSL/TLS protocol version mismatch)
+        Ruby net/http: failed
+
+        Unfortunately, this Ruby can't connect to rubygems.org.
+
+        Your Ruby can't connect to rubygems.org because your version of OpenSSL is too old.
+        You'll need to upgrade your OpenSSL install and/or recompile Ruby to use a newer OpenSSL.
+
+      MSG
+
+      expect { subject.run }.to output(expected_out).to_stdout.and output(expected_err).to_stderr
+    end
+
+    it "fails due to unsupported tls 1.3 version" do
+      net_http = Class.new(Artifice::Net::HTTP) do
+        def connect
+          raise OpenSSL::SSL::SSLError, "read server hello A"
+        end
+      end
+
+      Artifice.replace_net_http(net_http)
+      Gem::Request::ConnectionPools.client = net_http
+      Gem::RemoteFetcher.fetcher.close_all
+
+      expected_out = <<~MSG
+        Here's your OpenSSL environment:
+
+        OpenSSL:       #{OpenSSL::VERSION}
+        Compiled with: #{OpenSSL::OPENSSL_VERSION}
+        Loaded with:   #{OpenSSL::OPENSSL_LIBRARY_VERSION}
+
+        Trying connections to https://rubygems.org:
+      MSG
+
+      expected_err = <<~MSG
+        Bundler:       failed     (SSL/TLS protocol version mismatch)
+        RubyGems:      failed     (SSL/TLS protocol version mismatch)
+        Ruby net/http: failed
+
+        Unfortunately, this Ruby can't connect to rubygems.org.
+
+        Your Ruby can't connect to rubygems.org because TLS1_3 isn't supported yet.
+
+      MSG
+
+      subject = Bundler::CLI::Doctor::SSL.new("tls-version": "1.3")
+      expect { subject.run }.to output(expected_out).to_stdout.and output(expected_err).to_stderr
+    end
+
+    it "fails due to a bundler and rubygems connection error" do
+      endpoint = Class.new(Endpoint) do
+        get "/" do
+          raise OpenSSL::SSL::SSLError, "read server hello A"
+        end
+      end
+
+      Artifice.activate_with(endpoint)
+      Gem::Request::ConnectionPools.client = Gem::Net::HTTP
+
+      expected_out = <<~MSG
+        Here's your OpenSSL environment:
+
+        OpenSSL:       #{OpenSSL::VERSION}
+        Compiled with: #{OpenSSL::OPENSSL_VERSION}
+        Loaded with:   #{OpenSSL::OPENSSL_LIBRARY_VERSION}
+
+        Trying connections to https://rubygems.org:
+        Ruby net/http: success
+
+        For some reason, your Ruby installation can connect to rubygems.org, but neither RubyGems nor Bundler can.
+        The most likely fix is to manually upgrade RubyGems by following the instructions at http://ruby.to/ssl-check-failed.
+        After you've done that, run `gem install bundler` to upgrade Bundler, and then run this script again to make sure everything worked. ❣
+
+      MSG
+
+      expected_err = <<~MSG
+        Bundler:       failed     (SSL/TLS protocol version mismatch)
+        RubyGems:      failed     (SSL/TLS protocol version mismatch)
+      MSG
+
+      subject = Bundler::CLI::Doctor::SSL.new({})
+      expect { subject.run }.to output(expected_out).to_stdout.and output(expected_err).to_stderr
+    end
+
+    it "fails due to a bundler connection error" do
+      endpoint = Class.new(Endpoint) do
+        get "/" do
+          if request.user_agent.include?("bundler")
+            raise OpenSSL::SSL::SSLError, "read server hello A"
+          end
+        end
+      end
+
+      Artifice.activate_with(endpoint)
+      Gem::Request::ConnectionPools.client = Gem::Net::HTTP
+
+      expected_out = <<~MSG
+        Here's your OpenSSL environment:
+
+        OpenSSL:       #{OpenSSL::VERSION}
+        Compiled with: #{OpenSSL::OPENSSL_VERSION}
+        Loaded with:   #{OpenSSL::OPENSSL_LIBRARY_VERSION}
+
+        Trying connections to https://rubygems.org:
+        RubyGems:      success
+        Ruby net/http: success
+
+        Although your Ruby installation and RubyGems can both connect to rubygems.org, Bundler is having trouble.
+        The most likely way to fix this is to upgrade Bundler by running `gem install bundler`.
+        Run this script again after doing that to make sure everything is all set.
+        If you're still having trouble, check out the troubleshooting guide at http://ruby.to/ssl-check-failed.
+
+      MSG
+
+      expected_err = <<~MSG
+        Bundler:       failed     (SSL/TLS protocol version mismatch)
+      MSG
+
+      subject = Bundler::CLI::Doctor::SSL.new({})
+      expect { subject.run }.to output(expected_out).to_stdout.and output(expected_err).to_stderr
+    end
+
+    it "fails due to a RubyGems connection error" do
+      endpoint = Class.new(Endpoint) do
+        get "/" do
+          if request.user_agent.include?("Ruby, RubyGems")
+            raise OpenSSL::SSL::SSLError, "read server hello A"
+          end
+        end
+      end
+
+      Artifice.activate_with(endpoint)
+      Gem::Request::ConnectionPools.client = Gem::Net::HTTP
+
+      expected_out = <<~MSG
+        Here's your OpenSSL environment:
+
+        OpenSSL:       #{OpenSSL::VERSION}
+        Compiled with: #{OpenSSL::OPENSSL_VERSION}
+        Loaded with:   #{OpenSSL::OPENSSL_LIBRARY_VERSION}
+
+        Trying connections to https://rubygems.org:
+        Bundler:       success
+        Ruby net/http: success
+
+        It looks like Ruby and Bundler can connect to rubygems.org, but RubyGems itself cannot.
+        You can likely solve this by manually downloading and installing a RubyGems update.
+        Visit http://ruby.to/ssl-check-failed for instructions on how to manually upgrade RubyGems.
+
+      MSG
+
+      expected_err = <<~MSG
+        RubyGems:      failed     (SSL/TLS protocol version mismatch)
+      MSG
+
+      subject = Bundler::CLI::Doctor::SSL.new({})
+      expect { subject.run }.to output(expected_out).to_stdout.and output(expected_err).to_stderr
+    end
+  end
+
+  context "when no diagnostic fails" do
+    it "prints the SSL environment" do
+      expected_out = <<~MSG
+        Here's your OpenSSL environment:
+
+        OpenSSL:       #{OpenSSL::VERSION}
+        Compiled with: #{OpenSSL::OPENSSL_VERSION}
+        Loaded with:   #{OpenSSL::OPENSSL_LIBRARY_VERSION}
+
+        Trying connections to https://rubygems.org:
+        Bundler:       success
+        RubyGems:      success
+        Ruby net/http: success
+
+        Hooray! This Ruby can connect to rubygems.org.
+        You are all set to use Bundler and RubyGems.
+
+      MSG
+
+      subject = Bundler::CLI::Doctor::SSL.new({})
+      expect { subject.run }.to output(expected_out).to_stdout.and output("").to_stderr
+    end
+
+    it "uses the tls_version verify mode and host when given as option" do
+      net_http = Class.new(Artifice::Net::HTTP) do
+        class << self
+          attr_accessor :verify_mode, :min_version, :max_version
+        end
+
+        def connect
+          self.class.verify_mode = verify_mode
+          self.class.min_version = min_version
+          self.class.max_version = max_version
+
+          super
+        end
+      end
+
+      net_http.endpoint = @dummy_endpoint
+      Artifice.replace_net_http(net_http)
+      Gem::Request::ConnectionPools.client = net_http
+      Gem::RemoteFetcher.fetcher.close_all
+
+      expected_out = <<~MSG
+        Here's your OpenSSL environment:
+
+        OpenSSL:       #{OpenSSL::VERSION}
+        Compiled with: #{OpenSSL::OPENSSL_VERSION}
+        Loaded with:   #{OpenSSL::OPENSSL_LIBRARY_VERSION}
+
+        Trying connections to https://example.org:
+        Bundler:       success
+        RubyGems:      success
+        Ruby net/http: success
+
+        Hooray! This Ruby can connect to example.org.
+        You are all set to use Bundler and RubyGems.
+
+      MSG
+
+      subject = Bundler::CLI::Doctor::SSL.new("tls-version": "1.3", "verify-mode": :none, host: "example.org")
+      expect { subject.run }.to output(expected_out).to_stdout.and output("").to_stderr
+      expect(net_http.verify_mode).to eq(0)
+      expect(net_http.min_version.to_s).to eq("TLS1_3")
+      expect(net_http.max_version.to_s).to eq("TLS1_3")
+    end
+
+    it "warns when TLS1.2 is not supported" do
+      expected_out = <<~MSG
+        Here's your OpenSSL environment:
+
+        OpenSSL:       #{OpenSSL::VERSION}
+        Compiled with: #{OpenSSL::OPENSSL_VERSION}
+        Loaded with:   #{OpenSSL::OPENSSL_LIBRARY_VERSION}
+
+        Trying connections to https://rubygems.org:
+        Bundler:       success
+        RubyGems:      success
+        Ruby net/http: success
+
+        Hooray! This Ruby can connect to rubygems.org.
+        You are all set to use Bundler and RubyGems.
+
+      MSG
+
+      expected_err = <<~MSG
+
+        WARNING: Although your Ruby can connect to rubygems.org today, your OpenSSL is very old!
+        WARNING: You will need to upgrade OpenSSL to use rubygems.org.
+
+      MSG
+
+      previous_version = OpenSSL::SSL::TLS1_2_VERSION
+      OpenSSL::SSL.send(:remove_const, :TLS1_2_VERSION)
+
+      subject = Bundler::CLI::Doctor::SSL.new({})
+      expect { subject.run }.to output(expected_out).to_stdout.and output(expected_err).to_stderr
+    ensure
+      OpenSSL::SSL.const_set(:TLS1_2_VERSION, previous_version)
+    end
+  end
+end
diff --git a/spec/bundler/commands/update_spec.rb b/spec/bundler/commands/update_spec.rb
index 84042709bf0269..22bb1662e6571c 100644
--- a/spec/bundler/commands/update_spec.rb
+++ b/spec/bundler/commands/update_spec.rb
@@ -6,17 +6,17 @@
       build_repo2
 
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo2)}"
+        source "https://gem.repo2"
         gem "activesupport"
-        gem "rack-obama"
+        gem "myrack-obama"
         gem "platform_specific"
       G
     end
 
     it "updates the entire bundle" do
       update_repo2 do
-        build_gem "rack", "1.2" do |s|
-          s.executables = "rackup"
+        build_gem "myrack", "1.2" do |s|
+          s.executables = "myrackup"
         end
 
         build_gem "activesupport", "3.0"
@@ -24,69 +24,86 @@
 
       bundle "update"
       expect(out).to include("Bundle updated!")
-      expect(the_bundle).to include_gems "rack 1.2", "rack-obama 1.0", "activesupport 3.0"
+      expect(the_bundle).to include_gems "myrack 1.2", "myrack-obama 1.0", "activesupport 3.0"
     end
 
     it "doesn't delete the Gemfile.lock file if something goes wrong" do
       gemfile <<-G
-        source "#{file_uri_for(gem_repo2)}"
+        source "https://gem.repo2"
         gem "activesupport"
-        gem "rack-obama"
+        gem "myrack-obama"
         exit!
       G
-      bundle "update", :raise_on_error => false
+      bundle "update", raise_on_error: false
       expect(bundled_app_lock).to exist
     end
   end
 
+  describe "with --verbose" do
+    before do
+      build_repo2
+
+      install_gemfile <<~G
+        source "https://gem.repo2"
+        gem "myrack"
+      G
+    end
+
+    it "logs the reason for re-resolving" do
+      bundle "update --verbose"
+      expect(out).not_to include("Found changes from the lockfile")
+      expect(out).to include("Re-resolving dependencies because bundler is unlocking")
+    end
+  end
+
   describe "with --all" do
     before do
       build_repo2
 
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo2)}"
+        source "https://gem.repo2"
         gem "activesupport"
-        gem "rack-obama"
+        gem "myrack-obama"
         gem "platform_specific"
       G
     end
 
     it "updates the entire bundle" do
       update_repo2 do
-        build_gem "rack", "1.2" do |s|
-          s.executables = "rackup"
+        build_gem "myrack", "1.2" do |s|
+          s.executables = "myrackup"
         end
 
         build_gem "activesupport", "3.0"
       end
 
-      bundle "update", :all => true
+      bundle "update", all: true
       expect(out).to include("Bundle updated!")
-      expect(the_bundle).to include_gems "rack 1.2", "rack-obama 1.0", "activesupport 3.0"
+      expect(the_bundle).to include_gems "myrack 1.2", "myrack-obama 1.0", "activesupport 3.0"
     end
 
     it "doesn't delete the Gemfile.lock file if something goes wrong" do
-      install_gemfile "source \"#{file_uri_for(gem_repo1)}\""
+      install_gemfile "source 'https://gem.repo1'"
 
       gemfile <<-G
-        source "#{file_uri_for(gem_repo2)}"
+        source "https://gem.repo2"
         gem "activesupport"
-        gem "rack-obama"
+        gem "myrack-obama"
         exit!
       G
-      bundle "update", :all => true, :raise_on_error => false
+      bundle "update", all: true, raise_on_error: false
       expect(bundled_app_lock).to exist
     end
   end
 
   describe "with --gemfile" do
-    it "creates lock files based on the Gemfile name" do
+    it "creates lockfiles based on the Gemfile name" do
       gemfile bundled_app("OmgFile"), <<-G
-        source "#{file_uri_for(gem_repo1)}"
-        gem "rack", "1.0"
+        source "https://gem.repo1"
+        gem "myrack", "1.0"
       G
 
-      bundle "update --gemfile OmgFile", :all => true
+      bundle "update --gemfile OmgFile", all: true
 
       expect(bundled_app("OmgFile.lock")).to exist
     end
@@ -96,19 +113,19 @@
     before { bundle "config set update_requires_all_flag true" }
 
     it "errors when passed nothing" do
-      install_gemfile "source \"#{file_uri_for(gem_repo1)}\""
-      bundle :update, :raise_on_error => false
+      install_gemfile "source 'https://gem.repo1'"
+      bundle :update, raise_on_error: false
       expect(err).to eq("To update everything, pass the `--all` flag.")
     end
 
     it "errors when passed --all and another option" do
-      install_gemfile "source \"#{file_uri_for(gem_repo1)}\""
-      bundle "update --all foo", :raise_on_error => false
+      install_gemfile "source 'https://gem.repo1'"
+      bundle "update --all foo", raise_on_error: false
       expect(err).to eq("Cannot specify --all along with specific options.")
     end
 
     it "updates everything when passed --all" do
-      install_gemfile "source \"#{file_uri_for(gem_repo1)}\""
+      install_gemfile "source 'https://gem.repo1'"
       bundle "update --all"
       expect(out).to include("Bundle updated!")
     end
@@ -119,9 +136,9 @@
       build_repo2
 
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo2)}"
+        source "https://gem.repo2"
         gem "activesupport"
-        gem "rack-obama"
+        gem "myrack-obama"
         gem "platform_specific"
       G
     end
@@ -137,24 +154,24 @@
       build_repo2
 
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo2)}"
+        source "https://gem.repo2"
         gem "activesupport"
-        gem "rack-obama"
+        gem "myrack-obama"
         gem "platform_specific"
       G
     end
 
     it "unlocks all child dependencies that are unrelated to other locked dependencies" do
       update_repo2 do
-        build_gem "rack", "1.2" do |s|
-          s.executables = "rackup"
+        build_gem "myrack", "1.2" do |s|
+          s.executables = "myrackup"
         end
 
         build_gem "activesupport", "3.0"
       end
 
-      bundle "update rack-obama"
-      expect(the_bundle).to include_gems "rack 1.2", "rack-obama 1.0", "activesupport 2.3.5"
+      bundle "update myrack-obama"
+      expect(the_bundle).to include_gems "myrack 1.2", "myrack-obama 1.0", "activesupport 2.3.5"
     end
   end
 
@@ -163,19 +180,19 @@
       build_repo2
 
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo2)}"
+        source "https://gem.repo2"
         gem "activesupport"
-        gem "rack-obama"
+        gem "myrack-obama"
         gem "platform_specific"
       G
     end
 
     it "should inform the user" do
-      bundle "update halting-problem-solver", :raise_on_error => false
+      bundle "update halting-problem-solver", raise_on_error: false
       expect(err).to include "Could not find gem 'halting-problem-solver'"
     end
     it "should suggest alternatives" do
-      bundle "update platformspecific", :raise_on_error => false
+      bundle "update platformspecific", raise_on_error: false
       expect(err).to include "Did you mean platform_specific?"
     end
   end
@@ -185,22 +202,22 @@
       build_repo2
 
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo2)}"
+        source "https://gem.repo2"
         gem "activesupport"
-        gem "rack-obama"
+        gem "myrack-obama"
         gem "platform_specific"
       G
     end
 
     it "should update the child dependency" do
       update_repo2 do
-        build_gem "rack", "1.2" do |s|
-          s.executables = "rackup"
+        build_gem "myrack", "1.2" do |s|
+          s.executables = "myrackup"
         end
       end
 
-      bundle "update rack"
-      expect(the_bundle).to include_gems "rack 1.2"
+      bundle "update myrack"
+      expect(the_bundle).to include_gems "myrack 1.2"
     end
   end
 
@@ -223,7 +240,7 @@
       end
 
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo4)}"
+        source "https://gem.repo4"
         gem "slim-rails"
         gem "slim_lint"
       G
@@ -236,7 +253,7 @@
         end
       end
 
-      bundle "update", :all => true
+      bundle "update", all: true
 
       expect(the_bundle).to include_gems("slim 3.0.9", "slim-rails 3.1.3", "slim_lint 0.16.1")
     end
@@ -269,15 +286,20 @@
       end
 
       gemfile <<~G
-        source "#{file_uri_for(gem_repo4)}"
+        source "https://gem.repo4"
 
         gem "country_select"
         gem "countries"
       G
 
+      checksums = checksums_section_when_enabled do |c|
+        c.checksum(gem_repo4, "countries", "3.1.0")
+        c.checksum(gem_repo4, "country_select", "5.1.0")
+      end
+
       lockfile <<~L
         GEM
-          remote: #{file_uri_for(gem_repo4)}/
+          remote: https://gem.repo4/
           specs:
             countries (3.1.0)
             country_select (5.1.0)
@@ -289,14 +311,14 @@
         DEPENDENCIES
           countries
           country_select
-
+        #{checksums}
         BUNDLED WITH
            #{Bundler::VERSION}
       L
 
       previous_lockfile = lockfile
 
-      bundle "lock --update"
+      bundle "lock --update", env: { "DEBUG" => "1" }, verbose: true
 
       expect(lockfile).to eq(previous_lockfile)
     end
@@ -326,7 +348,7 @@
       end
 
       gemfile <<-G
-        source "#{file_uri_for(gem_repo4)}"
+        source "https://gem.repo4"
 
         gem "oauth2"
         gem "quickbooks-ruby"
@@ -334,7 +356,7 @@
 
       lockfile <<~L
         GEM
-          remote: #{file_uri_for(gem_repo4)}/
+          remote: https://gem.repo4/
           specs:
             faraday (2.5.2)
             multi_json (1.15.0)
@@ -385,7 +407,7 @@
       end
 
       gemfile <<-G
-        source "#{file_uri_for(gem_repo4)}"
+        source "https://gem.repo4"
 
         gemspec
 
@@ -399,7 +421,7 @@
           specs:
 
         GEM
-          remote: #{file_uri_for(gem_repo4)}/
+          remote: https://gem.repo4/
           specs:
             rake (13.0.6)
             sneakers (2.11.0)
@@ -423,6 +445,72 @@
       expect(out).to include("Installing sneakers 2.11.0").and include("Installing rake 13.0.6")
     end
 
+    it "does not downgrade direct dependencies unnecessarily" do
+      build_repo4 do
+        build_gem "redis", "4.8.1"
+        build_gem "redis", "5.3.0"
+
+        build_gem "sidekiq", "6.5.5" do |s|
+          s.add_dependency "redis", ">= 4.5.0"
+        end
+
+        build_gem "sidekiq", "6.5.12" do |s|
+          s.add_dependency "redis", ">= 4.5.0", "< 5"
+        end
+
+        # one version of sidekiq above Gemfile's range is needed to make the
+        # resolver choose `redis` first and trying to upgrade it, reproducing
+        # the accidental sidekiq downgrade as a result
+        build_gem "sidekiq", "7.0.0 " do |s|
+          s.add_dependency "redis", ">= 4.2.0"
+        end
+
+        build_gem "sentry-sidekiq", "5.22.0" do |s|
+          s.add_dependency "sidekiq", ">= 3.0"
+        end
+
+        build_gem "sentry-sidekiq", "5.22.4" do |s|
+          s.add_dependency "sidekiq", ">= 3.0"
+        end
+      end
+
+      gemfile <<~G
+        source "https://gem.repo4"
+
+        gem "redis"
+        gem "sidekiq", "~> 6.5"
+        gem "sentry-sidekiq"
+      G
+
+      original_lockfile = <<~L
+        GEM
+          remote: https://gem.repo4/
+          specs:
+            redis (4.8.1)
+            sentry-sidekiq (5.22.0)
+              sidekiq (>= 3.0)
+            sidekiq (6.5.12)
+              redis (>= 4.5.0, < 5)
+
+        PLATFORMS
+          #{lockfile_platforms}
+
+        DEPENDENCIES
+          redis
+          sentry-sidekiq
+          sidekiq (~> 6.5)
+
+        BUNDLED WITH
+           #{Bundler::VERSION}
+      L
+
+      lockfile original_lockfile
+
+      bundle "lock --update sentry-sidekiq"
+
+      expect(lockfile).to eq(original_lockfile.sub("sentry-sidekiq (5.22.0)", "sentry-sidekiq (5.22.4)"))
+    end
+
     it "does not downgrade indirect dependencies unnecessarily" do
       build_repo4 do
         build_gem "a" do |s|
@@ -434,8 +522,8 @@
         build_gem "c", "2.0"
       end
 
-      install_gemfile <<-G, :verbose => true
-        source "#{file_uri_for(gem_repo4)}"
+      install_gemfile <<-G, verbose: true
+        source "https://gem.repo4"
         gem "a"
       G
 
@@ -447,7 +535,7 @@
         end
       end
 
-      bundle "update", :all => true, :verbose => true
+      bundle "update", all: true, verbose: true
       expect(the_bundle).to include_gems("a 1.0", "b 1.0", "c 2.0")
     end
 
@@ -459,7 +547,7 @@
       end
 
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo4)}"
+        source "https://gem.repo4"
         gem "a"
         gem "b"
       G
@@ -467,7 +555,7 @@
       expect(the_bundle).to include_gems("a 1.0", "b 2.0")
 
       gemfile <<-G
-        source "#{file_uri_for(gem_repo4)}"
+        source "https://gem.repo4"
         gem "a"
         gem "b", "1.0"
       G
@@ -492,22 +580,27 @@
       end
 
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo4)}"
+        source "https://gem.repo4"
         gem "activesupport", "~> 6.1.0"
       G
 
       expect(the_bundle).to include_gems("activesupport 6.1.4.1", "tzinfo 2.0.4")
 
       gemfile <<-G
-        source "#{file_uri_for(gem_repo4)}"
+        source "https://gem.repo4"
         gem "activesupport", "~> 6.0.0"
       G
 
       original_lockfile = lockfile
 
+      checksums = checksums_section_when_enabled do |c|
+        c.checksum gem_repo4, "activesupport", "6.0.4.1"
+        c.checksum gem_repo4, "tzinfo", "1.2.9"
+      end
+
       expected_lockfile = <<~L
         GEM
-          remote: #{file_uri_for(gem_repo4)}/
+          remote: https://gem.repo4/
           specs:
             activesupport (6.0.4.1)
               tzinfo (~> 1.1)
@@ -518,7 +611,7 @@
 
         DEPENDENCIES
           activesupport (~> 6.0.0)
-
+        #{checksums}
         BUNDLED WITH
            #{Bundler::VERSION}
       L
@@ -543,19 +636,45 @@
     before do
       build_repo2
 
-      install_gemfile <<-G
-        source "#{file_uri_for(gem_repo2)}"
+      gemfile <<-G
+        source "https://gem.repo2"
         gem "activesupport"
-        gem "rack-obama"
+        gem "myrack-obama"
         gem "platform_specific"
       G
     end
 
     it "doesn't hit repo2" do
-      FileUtils.rm_rf(gem_repo2)
-
-      bundle "update --local --all"
-      expect(out).not_to include("Fetching source index")
+      simulate_platform "x86-darwin-100" do
+        lockfile <<~L
+          GEM
+            remote: https://gem.repo2/
+            specs:
+              activesupport (2.3.5)
+              platform_specific (1.0-x86-darwin-100)
+              myrack (1.0.0)
+              myrack-obama (1.0)
+                myrack
+
+          PLATFORMS
+            x86-darwin-100
+
+          DEPENDENCIES
+            activesupport
+            platform_specific
+            myrack-obama
+
+          BUNDLED WITH
+             #{Bundler::VERSION}
+        L
+
+        bundle "install"
+
+        FileUtils.rm_r(gem_repo2)
+
+        bundle "update --local --all"
+        expect(out).not_to include("Fetching source index")
+      end
     end
   end
 
@@ -566,26 +685,26 @@
 
     it "should update only specified group gems" do
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo2)}"
+        source "https://gem.repo2"
         gem "activesupport", :group => :development
-        gem "rack"
+        gem "myrack"
       G
       update_repo2 do
-        build_gem "rack", "1.2" do |s|
-          s.executables = "rackup"
+        build_gem "myrack", "1.2" do |s|
+          s.executables = "myrackup"
         end
 
         build_gem "activesupport", "3.0"
       end
       bundle "update --group development"
       expect(the_bundle).to include_gems "activesupport 3.0"
-      expect(the_bundle).not_to include_gems "rack 1.2"
+      expect(the_bundle).not_to include_gems "myrack 1.2"
     end
 
     context "when conservatively updating a group with non-group sub-deps" do
       it "should update only specified group gems" do
         install_gemfile <<-G
-          source "#{file_uri_for(gem_repo2)}"
+          source "https://gem.repo2"
           gem "activemerchant", :group => :development
           gem "activesupport"
         G
@@ -601,9 +720,9 @@
 
     context "when there is a source with the same name as a gem in a group" do
       before do
-        build_git "foo", :path => lib_path("activesupport")
+        build_git "foo", path: lib_path("activesupport")
         install_gemfile <<-G
-          source "#{file_uri_for(gem_repo2)}"
+          source "https://gem.repo2"
           gem "activesupport", :group => :development
           gem "foo", :git => "#{lib_path("activesupport")}"
         G
@@ -611,7 +730,7 @@
 
       it "should not update the gems from that source" do
         update_repo2 { build_gem "activesupport", "3.0" }
-        update_git "foo", "2.0", :path => lib_path("activesupport")
+        update_git "foo", "2.0", path: lib_path("activesupport")
 
         bundle "update --group development"
         expect(the_bundle).to include_gems "activesupport 3.0"
@@ -622,13 +741,13 @@
     context "when bundler itself is a transitive dependency" do
       it "executes without error" do
         install_gemfile <<-G
-          source "#{file_uri_for(gem_repo1)}"
+          source "https://gem.repo1"
           gem "activesupport", :group => :development
-          gem "rack"
+          gem "myrack"
         G
         update_repo2 do
-          build_gem "rack", "1.2" do |s|
-            s.executables = "rackup"
+          build_gem "myrack", "1.2" do |s|
+            s.executables = "myrackup"
           end
 
           build_gem "activesupport", "3.0"
@@ -636,7 +755,7 @@
         bundle "update --group development"
         expect(the_bundle).to include_gems "activesupport 2.3.5"
         expect(the_bundle).to include_gems "bundler #{Bundler::VERSION}"
-        expect(the_bundle).not_to include_gems "rack 1.2"
+        expect(the_bundle).not_to include_gems "myrack 1.2"
       end
     end
   end
@@ -646,40 +765,48 @@
       build_repo2
 
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo2)}"
+        source "https://gem.repo2"
         gem "activesupport"
-        gem "rack-obama"
+        gem "myrack-obama"
         gem "platform_specific"
       G
     end
 
-    it "should fail loudly", :bundler => "< 3" do
+    it "should fail loudly" do
       bundle "install --deployment"
-      bundle "update", :all => true, :raise_on_error => false
+      bundle "update", all: true, raise_on_error: false
 
       expect(last_command).to be_failure
-      expect(err).to match(/Bundler is unlocking, but the lockfile can't be updated because frozen mode is set/)
-      expect(err).to match(/freeze by running `bundle config set frozen false`./)
+      expect(err).to eq <<~ERROR.strip
+        Bundler is unlocking, but the lockfile can't be updated because frozen mode is set
+
+        If this is a development machine, remove the Gemfile.lock freeze by running `bundle config set frozen false`.
+      ERROR
     end
 
     it "should fail loudly when frozen is set globally" do
       bundle "config set --global frozen 1"
-      bundle "update", :all => true, :raise_on_error => false
-      expect(err).to match(/Bundler is unlocking, but the lockfile can't be updated because frozen mode is set/).
-        and match(/freeze by running `bundle config set frozen false`./)
+      bundle "update", all: true, raise_on_error: false
+      expect(err).to eq <<~ERROR.strip
+        Bundler is unlocking, but the lockfile can't be updated because frozen mode is set
+
+        If this is a development machine, remove the Gemfile.lock freeze by running `bundle config set frozen false`.
+      ERROR
     end
 
     it "should fail loudly when deployment is set globally" do
       bundle "config set --global deployment true"
-      bundle "update", :all => true, :raise_on_error => false
-      expect(err).to match(/Bundler is unlocking, but the lockfile can't be updated because frozen mode is set/).
-        and match(/freeze by running `bundle config set frozen false`./)
+      bundle "update", all: true, raise_on_error: false
+      expect(err).to eq <<~ERROR.strip
+        Bundler is unlocking, but the lockfile can't be updated because frozen mode is set
+
+        If this is a development machine, remove the Gemfile.lock freeze by running `bundle config set frozen false`.
+      ERROR
     end
 
     it "should not suggest any command to unfreeze bundler if frozen is set through ENV" do
-      bundle "update", :all => true, :raise_on_error => false, :env => { "BUNDLE_FROZEN" => "true" }
-      expect(err).to match(/Bundler is unlocking, but the lockfile can't be updated because frozen mode is set/)
-      expect(err).not_to match(/by running/)
+      bundle "update", all: true, raise_on_error: false, env: { "BUNDLE_FROZEN" => "true" }
+      expect(err).to eq("Bundler is unlocking, but the lockfile can't be updated because frozen mode is set")
     end
   end
 
@@ -690,7 +817,7 @@
 
     it "should not update gems not included in the source that happen to have the same name" do
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo2)}"
+        source "https://gem.repo2"
         gem "activesupport"
       G
       update_repo2 { build_gem "activesupport", "3.0" }
@@ -701,7 +828,7 @@
 
     it "should not update gems not included in the source that happen to have the same name" do
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo2)}"
+        source "https://gem.repo2"
         gem "activesupport"
       G
       update_repo2 { build_gem "activesupport", "3.0" }
@@ -721,7 +848,7 @@
       end
 
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo2)}"
+        source "https://gem.repo2"
         gem "harry"
         gem "fred"
       G
@@ -753,7 +880,7 @@
       end
 
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo2)}"
+        source "https://gem.repo2"
         gem "harry"
         gem "fred"
       G
@@ -776,18 +903,18 @@
     build_repo2
 
     install_gemfile <<-G
-      source "#{file_uri_for(gem_repo2)}"
+      source "https://gem.repo2"
       gem "activesupport"
     G
 
-    bundle "update", :all => true, :verbose => true
+    bundle "update", all: true, verbose: true
     expect(out).to include("Using activesupport 2.3.5")
 
     update_repo2 do
       build_gem "activesupport", "3.0"
     end
 
-    bundle "update", :all => true
+    bundle "update", all: true
     expect(out).to include("Installing activesupport 3.0 (was 2.3.5)")
   end
 
@@ -798,35 +925,118 @@
     end
 
     install_gemfile <<-G
-      source "#{file_uri_for(gem_repo4)}"
+      source "https://gem.repo4"
       gem "bar"
       gem "foo"
     G
 
-    bundle "update", :all => true
+    bundle "update", all: true
     expect(out).to match(/Resolving dependencies\.\.\.\.*\nBundle updated!/)
 
     update_repo4 do
       build_gem "foo", "2.0"
     end
 
-    bundle "update", :all => true
-    out.sub!("Removing foo (1.0)\n", "")
-    expect(out).to match(/Resolving dependencies\.\.\.\.*\nFetching foo 2\.0 \(was 1\.0\)\nInstalling foo 2\.0 \(was 1\.0\)\nBundle updated/)
+    bundle "update", all: true
+    expect(out.sub("Removing foo (1.0)\n", "")).to match(/Resolving dependencies\.\.\.\.*\nFetching foo 2\.0 \(was 1\.0\)\nInstalling foo 2\.0 \(was 1\.0\)\nBundle updated/)
   end
 
   it "shows error message when Gemfile.lock is not preset and gem is specified" do
     gemfile <<-G
-      source "#{file_uri_for(gem_repo2)}"
+      source "https://gem.repo2"
       gem "activesupport"
     G
 
-    bundle "update nonexisting", :raise_on_error => false
+    bundle "update nonexisting", raise_on_error: false
     expect(err).to include("This Bundle hasn't been installed yet. Run `bundle install` to update and install the bundled gems.")
     expect(exitstatus).to eq(22)
   end
 
-  context "with multiple, duplicated sources, with lockfile in old format", :bundler => "< 3" do
+  context "with multiple sources and caching enabled" do
+    before do
+      build_repo2 do
+        build_gem "myrack", "1.0.0"
+
+        build_gem "request_store", "1.0.0" do |s|
+          s.add_dependency "myrack", "1.0.0"
+        end
+      end
+
+      build_repo4 do
+        # set up repo with no gems
+      end
+
+      gemfile <<~G
+        source "https://gem.repo2"
+
+        gem "request_store"
+
+        source "https://gem.repo4" do
+        end
+      G
+
+      lockfile <<~L
+        GEM
+          remote: https://gem.repo2/
+          specs:
+            myrack (1.0.0)
+            request_store (1.0.0)
+              myrack (= 1.0.0)
+
+        GEM
+          remote: https://gem.repo4/
+          specs:
+
+        PLATFORMS
+          #{local_platform}
+
+        DEPENDENCIES
+          request_store
+
+        BUNDLED WITH
+           #{Bundler::VERSION}
+      L
+    end
+
+    it "works" do
+      bundle :install
+      bundle :cache
+
+      update_repo2 do
+        build_gem "request_store", "1.1.0" do |s|
+          s.add_dependency "myrack", "1.0.0"
+        end
+      end
+
+      bundle "update request_store"
+
+      expect(out).to include("Bundle updated!")
+
+      expect(lockfile).to eq <<~L
+        GEM
+          remote: https://gem.repo2/
+          specs:
+            myrack (1.0.0)
+            request_store (1.1.0)
+              myrack (= 1.0.0)
+
+        GEM
+          remote: https://gem.repo4/
+          specs:
+
+        PLATFORMS
+          #{local_platform}
+
+        DEPENDENCIES
+          request_store
+
+        BUNDLED WITH
+           #{Bundler::VERSION}
+      L
+    end
+  end
+
+  context "with multiple, duplicated sources, with lockfile in old format" do
     before do
       build_repo2 do
         build_gem "dotenv", "2.7.6"
@@ -837,7 +1047,7 @@
         build_gem "vcr", "6.0.0"
       end
 
-      build_repo gem_repo3 do
+      build_repo3 do
         build_gem "pkg-gem-flowbyte-with-dep", "1.0.0" do |s|
           s.add_dependency "oj"
         end
@@ -880,8 +1090,8 @@
     end
 
     it "works" do
-      bundle :install, :artifice => "compact_index"
-      bundle "update oj", :artifice => "compact_index"
+      bundle :install, artifice: "compact_index"
+      bundle "update oj", artifice: "compact_index"
 
       expect(out).to include("Bundle updated!")
       expect(the_bundle).to include_gems "oj 3.11.5"
@@ -896,49 +1106,49 @@
 
   it "will eagerly unlock dependencies of a specified gem" do
     install_gemfile <<-G
-      source "#{file_uri_for(gem_repo2)}"
+      source "https://gem.repo2"
 
       gem "thin"
-      gem "rack-obama"
+      gem "myrack-obama"
     G
 
     update_repo2 do
-      build_gem "rack", "1.2" do |s|
-        s.executables = "rackup"
+      build_gem "myrack", "1.2" do |s|
+        s.executables = "myrackup"
       end
 
       build_gem "thin", "2.0" do |s|
-        s.add_dependency "rack"
+        s.add_dependency "myrack"
       end
     end
 
     bundle "update thin"
-    expect(the_bundle).to include_gems "thin 2.0", "rack 1.2", "rack-obama 1.0"
+    expect(the_bundle).to include_gems "thin 2.0", "myrack 1.2", "myrack-obama 1.0"
   end
 
   it "will warn when some explicitly updated gems are not updated" do
     install_gemfile <<-G
-      source "#{file_uri_for(gem_repo2)}"
+      source "https://gem.repo2"
 
       gem "thin"
-      gem "rack-obama"
+      gem "myrack-obama"
     G
 
     update_repo2 do
-      build_gem("thin", "2.0") {|s| s.add_dependency "rack" }
-      build_gem "rack", "10.0"
+      build_gem("thin", "2.0") {|s| s.add_dependency "myrack" }
+      build_gem "myrack", "10.0"
     end
 
-    bundle "update thin rack-obama"
-    expect(last_command.stdboth).to include "Bundler attempted to update rack-obama but its version stayed the same"
-    expect(the_bundle).to include_gems "thin 2.0", "rack 10.0", "rack-obama 1.0"
+    bundle "update thin myrack-obama"
+    expect(stdboth).to include "Bundler attempted to update myrack-obama but its version stayed the same"
+    expect(the_bundle).to include_gems "thin 2.0", "myrack 10.0", "myrack-obama 1.0"
   end
 
   it "will not warn when an explicitly updated git gem changes sha but not version" do
     build_git "foo"
 
     install_gemfile <<-G
-      source "#{file_uri_for(gem_repo1)}"
+      source "https://gem.repo1"
       gem "foo", :git => '#{lib_path("foo-1.0")}'
     G
 
@@ -948,32 +1158,32 @@
 
     bundle "update foo"
 
-    expect(last_command.stdboth).not_to include "attempted to update"
+    expect(stdboth).not_to include "attempted to update"
   end
 
   it "will not warn when changing gem sources but not versions" do
-    build_git "rack"
+    build_git "myrack"
 
     install_gemfile <<-G
-      source "#{file_uri_for(gem_repo2)}"
-      gem "rack", :git => '#{lib_path("rack-1.0")}'
+      source "https://gem.repo2"
+      gem "myrack", :git => '#{lib_path("myrack-1.0")}'
     G
 
     gemfile <<-G
-      source "#{file_uri_for(gem_repo1)}"
-      gem "rack"
+      source "https://gem.repo1"
+      gem "myrack"
     G
 
-    bundle "update rack"
+    bundle "update myrack"
 
-    expect(last_command.stdboth).not_to include "attempted to update"
+    expect(stdboth).not_to include "attempted to update"
   end
 
   it "will update only from pinned source" do
     install_gemfile <<-G
-      source "#{file_uri_for(gem_repo2)}"
+      source "https://gem.repo2"
 
-      source "#{file_uri_for(gem_repo1)}" do
+      source "https://gem.repo1" do
         gem "thin"
       end
     G
@@ -982,12 +1192,12 @@
       build_gem "thin", "2.0"
     end
 
-    bundle "update"
+    bundle "update", artifice: "compact_index"
     expect(the_bundle).to include_gems "thin 1.0"
   end
 
   context "when the lockfile is for a different platform" do
-    before do
+    around do |example|
       build_repo4 do
         build_gem("a", "0.9")
         build_gem("a", "0.9") {|s| s.platform = "java" }
@@ -996,13 +1206,13 @@
       end
 
       gemfile <<-G
-        source "#{file_uri_for(gem_repo4)}"
+        source "https://gem.repo4"
         gem "a"
       G
 
       lockfile <<-L
         GEM
-          remote: #{file_uri_for(gem_repo4)}
+          remote: https://gem.repo4
           specs:
             a (0.9-java)
 
@@ -1013,11 +1223,11 @@
           a
       L
 
-      simulate_platform linux
+      simulate_platform "x86_64-linux", &example
     end
 
     it "allows updating" do
-      bundle :update, :all => true
+      bundle :update, all: true
       expect(the_bundle).to include_gem "a 1.1"
     end
 
@@ -1035,13 +1245,13 @@
       end
 
       gemfile <<-G
-        source "#{file_uri_for(gem_repo4)}"
+        source "https://gem.repo4"
         gem "a", platform: :jruby
       G
 
       lockfile <<-L
         GEM
-          remote: #{file_uri_for(gem_repo4)}
+          remote: https://gem.repo4
           specs:
             a (0.9-java)
 
@@ -1051,14 +1261,14 @@
         DEPENDENCIES
           a
       L
-
-      simulate_platform linux
     end
 
     it "is not updated because it is not actually included in the bundle" do
-      bundle "update a"
-      expect(last_command.stdboth).to include "Bundler attempted to update a but it was not considered because it is for a different platform from the current one"
-      expect(the_bundle).to_not include_gem "a"
+      simulate_platform "x86_64-linux" do
+        bundle "update a"
+        expect(stdboth).to include "Bundler attempted to update a but it was not considered because it is for a different platform from the current one"
+        expect(the_bundle).to_not include_gem "a"
+      end
     end
   end
 end
@@ -1068,14 +1278,14 @@
     build_repo2
 
     gemfile <<-G
-      source "#{file_uri_for(gem_repo2)}"
+      source "https://gem.repo2"
 
-      gem "rack", "1.0"
+      gem "myrack", "1.0"
     G
 
-    bundle "update", :all => true
+    bundle "update", all: true
 
-    expect(the_bundle).to include_gems "rack 1.0.0"
+    expect(the_bundle).to include_gems "myrack 1.0.0"
   end
 end
 
@@ -1083,23 +1293,23 @@
   before do
     build_repo2 do
       build_gem "rails", "3.0.1" do |s|
-        s.add_dependency "bundler", Bundler::VERSION.succ
+        s.add_dependency "bundler", "9.9.9"
       end
 
-      build_gem "bundler", Bundler::VERSION.succ
+      build_gem "bundler", "9.9.9"
     end
 
     gemfile <<-G
-      source "#{file_uri_for(gem_repo2)}"
+      source "https://gem.repo2"
       gem "rails", "3.0.1"
     G
   end
 
   it "should explain that bundler conflicted and how to resolve the conflict" do
-    bundle "update", :all => true, :raise_on_error => false
-    expect(last_command.stdboth).not_to match(/in snapshot/i)
+    bundle "update", all: true, raise_on_error: false
+    expect(stdboth).not_to match(/in snapshot/i)
     expect(err).to match(/current Bundler version/i).
-      and match(/Install the necessary version with `gem install bundler:#{Bundler::VERSION.succ}`/i)
+      and match(/Install the necessary version with `gem install bundler:9\.9\.9`/i)
   end
 end
 
@@ -1108,26 +1318,27 @@
     before do
       install_gemfile <<-G
         ruby '~> #{Gem.ruby_version}'
-        source "#{file_uri_for(gem_repo1)}"
+        source "https://gem.repo1"
       G
 
       gemfile <<-G
-          source "#{file_uri_for(gem_repo1)}"
+        source "https://gem.repo1"
       G
     end
+
     it "removes the Ruby from the Gemfile.lock" do
       bundle "update --ruby"
 
       expect(lockfile).to eq <<~L
        GEM
-         remote: #{file_uri_for(gem_repo1)}/
+         remote: https://gem.repo1/
          specs:
 
        PLATFORMS
          #{lockfile_platforms}
 
        DEPENDENCIES
-
+       #{checksums_section_when_enabled}
        BUNDLED WITH
           #{Bundler::VERSION}
       L
@@ -1138,32 +1349,33 @@
     before do
       install_gemfile <<-G
         ruby '~> #{Gem.ruby_version}'
-        source "#{file_uri_for(gem_repo1)}"
+        source "https://gem.repo1"
       G
 
       gemfile <<-G
-          ruby '~> #{current_ruby_minor}'
-          source "#{file_uri_for(gem_repo1)}"
+        ruby '~> #{current_ruby_minor}'
+        source "https://gem.repo1"
       G
     end
+
     it "updates the Gemfile.lock with the latest version" do
       bundle "update --ruby"
 
       expect(lockfile).to eq <<~L
-       GEM
-         remote: #{file_uri_for(gem_repo1)}/
-         specs:
-
-       PLATFORMS
-         #{lockfile_platforms}
+        GEM
+          remote: https://gem.repo1/
+          specs:
 
-       DEPENDENCIES
+        PLATFORMS
+          #{lockfile_platforms}
 
-       RUBY VERSION
-          #{Bundler::RubyVersion.system}
+        DEPENDENCIES
+        #{checksums_section_when_enabled}
+        RUBY VERSION
+           #{Bundler::RubyVersion.system}
 
-       BUNDLED WITH
-          #{Bundler::VERSION}
+        BUNDLED WITH
+           #{Bundler::VERSION}
       L
     end
   end
@@ -1172,16 +1384,16 @@
     before do
       install_gemfile <<-G
         ruby '~> #{Gem.ruby_version}'
-        source "#{file_uri_for(gem_repo1)}"
+        source "https://gem.repo1"
       G
 
       gemfile <<-G
           ruby '~> 2.1.0'
-          source "#{file_uri_for(gem_repo1)}"
+          source "https://gem.repo1"
       G
     end
     it "shows a helpful error message" do
-      bundle "update --ruby", :raise_on_error => false
+      bundle "update --ruby", raise_on_error: false
 
       expect(err).to include("Your Ruby version is #{Bundler::RubyVersion.system.gem_version}, but your Gemfile specified ~> 2.1.0")
     end
@@ -1191,7 +1403,7 @@
     before do
       lockfile <<~L
        GEM
-         remote: #{file_uri_for(gem_repo1)}/
+         remote: https://gem.repo1/
          specs:
 
        PLATFORMS
@@ -1199,6 +1411,8 @@
 
        DEPENDENCIES
 
+       CHECKSUMS
+
        RUBY VERSION
           ruby 2.1.4p222
 
@@ -1208,15 +1422,16 @@
 
       gemfile <<-G
           ruby '~> #{Gem.ruby_version}'
-          source "#{file_uri_for(gem_repo1)}"
+          source "https://gem.repo1"
       G
     end
+
     it "updates the Gemfile.lock with the latest version" do
       bundle "update --ruby"
 
       expect(lockfile).to eq <<~L
        GEM
-         remote: #{file_uri_for(gem_repo1)}/
+         remote: https://gem.repo1/
          specs:
 
        PLATFORMS
@@ -1224,6 +1439,8 @@
 
        DEPENDENCIES
 
+       CHECKSUMS
+
        RUBY VERSION
           #{Bundler::RubyVersion.system}
 
@@ -1237,225 +1454,347 @@
 RSpec.describe "bundle update --bundler" do
   it "updates the bundler version in the lockfile" do
     build_repo4 do
-      build_gem "rack", "1.0"
+      build_gem "bundler", "2.5.9"
+      build_gem "myrack", "1.0"
+    end
+
+    checksums = checksums_section_when_enabled do |c|
+      c.checksum(gem_repo4, "myrack", "1.0")
     end
 
     install_gemfile <<-G
-      source "#{file_uri_for(gem_repo4)}"
-      gem "rack"
+      source "https://gem.repo4"
+      gem "myrack"
     G
+    expect(lockfile).to eq <<~L
+      GEM
+        remote: https://gem.repo4/
+        specs:
+          myrack (1.0)
+
+      PLATFORMS
+        #{lockfile_platforms}
+
+      DEPENDENCIES
+        myrack
+      #{checksums}
+      BUNDLED WITH
+         #{Bundler::VERSION}
+    L
     lockfile lockfile.sub(/(^\s*)#{Bundler::VERSION}($)/, '\11.0.0\2')
 
-    bundle :update, :bundler => true, :artifice => "compact_index", :verbose => true
+    bundle :update, bundler: true, verbose: true
     expect(out).to include("Using bundler #{Bundler::VERSION}")
 
     expect(lockfile).to eq <<~L
       GEM
-        remote: #{file_uri_for(gem_repo4)}/
+        remote: https://gem.repo4/
         specs:
-          rack (1.0)
+          myrack (1.0)
 
       PLATFORMS
         #{lockfile_platforms}
 
       DEPENDENCIES
-        rack
-
+        myrack
+      #{checksums}
       BUNDLED WITH
          #{Bundler::VERSION}
     L
 
-    expect(the_bundle).to include_gem "rack 1.0"
+    expect(the_bundle).to include_gem "myrack 1.0"
   end
 
   it "updates the bundler version in the lockfile without re-resolving if the highest version is already installed" do
-    system_gems "bundler-2.3.9"
-
     build_repo4 do
-      build_gem "rack", "1.0"
+      build_gem "bundler", "2.3.9"
+      build_gem "myrack", "1.0"
     end
 
     install_gemfile <<-G
-      source "#{file_uri_for(gem_repo4)}"
-      gem "rack"
+      source "https://gem.repo4"
+      gem "myrack"
     G
     lockfile lockfile.sub(/(^\s*)#{Bundler::VERSION}($)/, "2.3.9")
 
-    bundle :update, :bundler => true, :artifice => "compact_index", :verbose => true
+    checksums = checksums_section_when_enabled do |c|
+      c.checksum(gem_repo4, "myrack", "1.0")
+    end
+
+    bundle :update, bundler: true, verbose: true
     expect(out).to include("Using bundler #{Bundler::VERSION}")
 
     expect(lockfile).to eq <<~L
       GEM
-        remote: #{file_uri_for(gem_repo4)}/
+        remote: https://gem.repo4/
         specs:
-          rack (1.0)
+          myrack (1.0)
 
       PLATFORMS
         #{lockfile_platforms}
 
       DEPENDENCIES
-        rack
-
+        myrack
+      #{checksums}
       BUNDLED WITH
          #{Bundler::VERSION}
     L
 
-    expect(the_bundle).to include_gem "rack 1.0"
+    expect(the_bundle).to include_gem "myrack 1.0"
   end
 
-  it "updates the bundler version in the lockfile even if the latest version is not installed", :ruby_repo, :realworld do
-    pristine_system_gems "bundler-2.3.9"
+  it "updates the bundler version in the lockfile even if the latest version is not installed", :ruby_repo do
+    bundle "config path.system true"
+
+    pristine_system_gems "bundler-9.0.0"
 
     build_repo4 do
-      build_gem "rack", "1.0"
+      build_gem "myrack", "1.0"
+
+      build_bundler "999.0.0"
     end
 
-    install_gemfile <<-G, :env => { "BUNDLER_IGNORE_DEFAULT_GEM" => "true" }
-      source "#{file_uri_for(gem_repo4)}"
-      gem "rack"
+    checksums = checksums_section do |c|
+      c.checksum(gem_repo4, "myrack", "1.0")
+    end
+
+    install_gemfile <<-G
+      source "https://gem.repo4"
+      gem "myrack"
     G
-    lockfile lockfile.sub(/(^\s*)#{Bundler::VERSION}($)/, "2.3.9")
 
-    bundle :update, :bundler => true, :artifice => "vcr", :verbose => true, :env => { "BUNDLER_IGNORE_DEFAULT_GEM" => "true" }
+    bundle :update, bundler: true, verbose: true
 
-    # Only updates properly on modern RubyGems.
+    expect(out).to include("Updating bundler to 999.0.0")
+    expect(out).to include("Running `bundle update --bundler \"> 0.a\" --verbose` with bundler 999.0.0")
+    expect(out).not_to include("Installing Bundler 2.99.9 and restarting using that version.")
 
-    if Gem.rubygems_version >= Gem::Version.new("3.3.0.dev")
-      expect(out).to include("Updating bundler to 2.3.10")
-      expect(out).to include("Using bundler 2.3.10")
-      expect(out).not_to include("Installing Bundler 2.3.9 and restarting using that version.")
+    expect(lockfile).to eq <<~L
+      GEM
+        remote: https://gem.repo4/
+        specs:
+          myrack (1.0)
 
-      expect(lockfile).to eq <<~L
-        GEM
-          remote: #{file_uri_for(gem_repo4)}/
-          specs:
-            rack (1.0)
+      PLATFORMS
+        #{lockfile_platforms}
 
-        PLATFORMS
-          #{lockfile_platforms}
+      DEPENDENCIES
+        myrack
+      #{checksums}
+      BUNDLED WITH
+         999.0.0
+    L
 
-        DEPENDENCIES
-          rack
+    expect(the_bundle).to include_gems "bundler 999.0.0"
+    expect(the_bundle).to include_gems "myrack 1.0"
+  end
 
-        BUNDLED WITH
-           2.3.10
-      L
+  it "does not claim to update to Bundler version to a wrong version when cached gems are present" do
+    pristine_system_gems "bundler-2.99.0"
+
+    build_repo4 do
+      build_gem "myrack", "3.0.9.1"
 
-      expect(the_bundle).to include_gems "bundler 2.3.10"
+      build_bundler "2.99.0"
     end
 
-    expect(the_bundle).to include_gems "rack 1.0"
+    gemfile <<~G
+      source "https://gem.repo4"
+      gem "myrack"
+    G
+
+    lockfile <<~L
+      GEM
+        remote: https://gem.repo4/
+        specs:
+          myrack (3.0.9.1)
+
+      PLATFORMS
+        #{lockfile_platforms}
+
+      DEPENDENCIES
+       myrack
+
+      BUNDLED WITH
+         2.99.0
+    L
+
+    bundle :cache, verbose: true
+
+    bundle :update, bundler: true, verbose: true
+
+    expect(out).not_to include("Updating bundler to")
   end
 
-  it "errors if the explicit target version does not exist", :realworld do
-    pristine_system_gems "bundler-2.3.9"
+  it "does not update the bundler version in the lockfile if the latest version is not compatible with current ruby", :ruby_repo do
+    pristine_system_gems "bundler-9.9.9"
 
     build_repo4 do
-      build_gem "rack", "1.0"
+      build_gem "myrack", "1.0"
+
+      build_bundler "9.9.9"
+      build_bundler "999.0.0" do |s|
+        s.required_ruby_version = "> #{Gem.ruby_version}"
+      end
     end
 
-    install_gemfile <<-G, :env => { "BUNDLER_IGNORE_DEFAULT_GEM" => "true" }
-      source "#{file_uri_for(gem_repo4)}"
-      gem "rack"
+    checksums = checksums_section do |c|
+      c.checksum(gem_repo4, "myrack", "1.0")
+    end
+
+    install_gemfile <<-G
+      source "https://gem.repo4"
+      gem "myrack"
     G
-    lockfile lockfile.sub(/(^\s*)#{Bundler::VERSION}($)/, "2.3.9")
 
-    bundle :update, :bundler => "999.999.999", :artifice => "vcr", :raise_on_error => false
+    bundle :update, bundler: true, verbose: true
 
-    # Only gives a meaningful error message on modern RubyGems.
+    expect(out).to include("Using bundler 9.9.9")
 
-    if Gem.rubygems_version >= Gem::Version.new("3.3.0.dev")
-      expect(last_command).to be_failure
-      expect(err).to include("The `bundle update --bundler` target version (999.999.999) does not exist")
+    expect(lockfile).to eq <<~L
+      GEM
+        remote: https://gem.repo4/
+        specs:
+          myrack (1.0)
+
+      PLATFORMS
+        #{lockfile_platforms}
+
+      DEPENDENCIES
+        myrack
+      #{checksums}
+      BUNDLED WITH
+         9.9.9
+    L
+
+    expect(the_bundle).to include_gems "bundler 9.9.9"
+    expect(the_bundle).to include_gems "myrack 1.0"
+  end
+
+  it "errors if the explicit target version does not exist" do
+    pristine_system_gems "bundler-9.9.9"
+
+    build_repo4 do
+      build_gem "myrack", "1.0"
+    end
+
+    install_gemfile <<-G
+      source "https://gem.repo4"
+      gem "myrack"
+    G
+
+    bundle :update, bundler: "999.999.999", raise_on_error: false
+
+    expect(last_command).to be_failure
+    expect(err).to eq("The `bundle update --bundler` target version (999.999.999) does not exist")
+  end
+
+  it "errors if the explicit target version does not exist, even if auto switching is disabled" do
+    pristine_system_gems "bundler-9.9.9"
+
+    build_repo4 do
+      build_gem "myrack", "1.0"
     end
+
+    install_gemfile <<-G
+      source "https://gem.repo4"
+      gem "myrack"
+    G
+
+    bundle :update, bundler: "999.999.999", raise_on_error: false, env: { "BUNDLER_VERSION" => "9.9.9" }
+
+    expect(last_command).to be_failure
+    expect(err).to eq("The `bundle update --bundler` target version (999.999.999) does not exist")
   end
 
   it "allows updating to development versions if already installed locally" do
-    system_gems "bundler-2.3.0.dev"
+    system_gems "bundler-9.9.9"
 
     build_repo4 do
-      build_gem "rack", "1.0"
+      build_gem "myrack", "1.0"
     end
 
     install_gemfile <<-G
-      source "#{file_uri_for(gem_repo4)}"
-      gem "rack"
+      source "https://gem.repo4"
+      gem "myrack"
     G
 
-    bundle :update, :bundler => "2.3.0.dev", :verbose => "true"
+    system_gems "bundler-9.0.0.dev", path: local_gem_path
+    bundle :update, bundler: "9.0.0.dev", verbose: "true"
 
-    # Only updates properly on modern RubyGems.
+    checksums = checksums_section_when_enabled do |c|
+      c.checksum(gem_repo4, "myrack", "1.0")
+    end
 
-    if Gem.rubygems_version >= Gem::Version.new("3.3.0.dev")
-      expect(lockfile).to eq <<~L
+    expect(lockfile).to eq <<~L
         GEM
-          remote: #{file_uri_for(gem_repo4)}/
+          remote: https://gem.repo4/
           specs:
-            rack (1.0)
+            myrack (1.0)
 
         PLATFORMS
           #{lockfile_platforms}
 
         DEPENDENCIES
-          rack
-
+          myrack
+        #{checksums}
         BUNDLED WITH
-           2.3.0.dev
+           9.0.0.dev
       L
 
-      expect(out).to include("Using bundler 2.3.0.dev")
-    end
+    expect(out).to include("Using bundler 9.0.0.dev")
   end
 
   it "does not touch the network if not necessary" do
-    system_gems "bundler-2.3.9"
+    system_gems "bundler-9.9.9"
 
     build_repo4 do
-      build_gem "rack", "1.0"
+      build_gem "myrack", "1.0"
     end
 
     install_gemfile <<-G
-      source "#{file_uri_for(gem_repo4)}"
-      gem "rack"
+      source "https://gem.repo4"
+      gem "myrack"
     G
-
-    bundle :update, :bundler => "2.3.9", :raise_on_error => false, :verbose => true
+    system_gems "bundler-9.0.0", path: local_gem_path
+    bundle :update, bundler: "9.0.0", verbose: true
 
     expect(out).not_to include("Fetching gem metadata from https://rubygems.org/")
 
     # Only updates properly on modern RubyGems.
+    checksums = checksums_section_when_enabled do |c|
+      c.checksum(gem_repo4, "myrack", "1.0")
+    end
 
-    if Gem.rubygems_version >= Gem::Version.new("3.3.0.dev")
-      expect(lockfile).to eq <<~L
+    expect(lockfile).to eq <<~L
         GEM
-          remote: #{file_uri_for(gem_repo4)}/
+          remote: https://gem.repo4/
           specs:
-            rack (1.0)
+            myrack (1.0)
 
         PLATFORMS
           #{lockfile_platforms}
 
         DEPENDENCIES
-          rack
-
+          myrack
+        #{checksums}
         BUNDLED WITH
-           2.3.9
+           9.0.0
       L
 
-      expect(out).to include("Using bundler 2.3.9")
-    end
+    expect(out).to include("Using bundler 9.0.0")
   end
 
   it "prints an error when trying to update bundler in frozen mode" do
-    system_gems "bundler-2.3.9"
+    system_gems "bundler-9.0.0"
 
     gemfile <<~G
-      source "#{file_uri_for(gem_repo2)}"
+      source "https://gem.repo2"
     G
 
     lockfile <<-L
       GEM
-        remote: #{file_uri_for(gem_repo2)}/
+        remote: https://gem.repo2/
         specs:
 
       PLATFORMS
@@ -1464,10 +1803,12 @@
       DEPENDENCIES
 
       BUNDLED WITH
-         2.1.4
+         9.0.0
     L
 
-    bundle "update --bundler=2.3.9", :env => { "BUNDLE_FROZEN" => "true" }, :raise_on_error => false
+    system_gems "bundler-9.9.9", path: local_gem_path
+
+    bundle "update --bundler=9.9.9", env: { "BUNDLE_FROZEN" => "true" }, raise_on_error: false
     expect(err).to include("An update to the version of bundler itself was requested, but the lockfile can't be updated because frozen mode is set")
   end
 end
@@ -1495,7 +1836,7 @@
 
       # establish a lockfile set to 1.4.3
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo4)}"
+        source "https://gem.repo4"
         gem 'foo', '1.4.3'
         gem 'bar', '2.0.3'
         gem 'qux', '1.0.0'
@@ -1504,7 +1845,7 @@
       # remove 1.4.3 requirement and bar altogether
       # to setup update specs below
       gemfile <<-G
-        source "#{file_uri_for(gem_repo4)}"
+        source "https://gem.repo4"
         gem 'foo'
         gem 'qux'
       G
@@ -1527,7 +1868,7 @@
       end
 
       it "update all" do
-        bundle "update --patch", :all => true
+        bundle "update --patch", all: true
 
         expect(the_bundle).to include_gems "foo 1.4.5", "bar 2.1.1", "qux 1.0.1"
       end
@@ -1549,7 +1890,7 @@
       end
 
       it "minor preferred" do
-        bundle "update --minor --strict", :all => true
+        bundle "update --minor --strict", all: true
 
         expect(the_bundle).to include_gems "foo 1.5.0", "bar 2.1.1", "qux 1.1.0"
       end
@@ -1600,7 +1941,7 @@
       end
 
       gemfile <<-G
-        source "#{file_uri_for(gem_repo4)}"
+        source "https://gem.repo4"
         gem 'isolated_owner'
 
         gem 'shared_owner_a'
@@ -1609,7 +1950,7 @@
 
       lockfile <<~L
         GEM
-          remote: #{file_uri_for(gem_repo4)}/
+          remote: https://gem.repo4/
           specs:
             isolated_dep (2.0.1)
             isolated_owner (1.0.1)
@@ -1628,6 +1969,8 @@
           shared_owner_a
           shared_owner_b
 
+        CHECKSUMS
+
         BUNDLED WITH
            #{Bundler::VERSION}
       L
@@ -1660,9 +2003,17 @@
     it "should only change direct dependencies when updating the lockfile with --conservative" do
       bundle "lock --update --conservative"
 
+      checksums = checksums_section_when_enabled do |c|
+        c.checksum gem_repo4, "isolated_dep", "2.0.1"
+        c.checksum gem_repo4, "isolated_owner", "1.0.2"
+        c.checksum gem_repo4, "shared_dep", "5.0.1"
+        c.checksum gem_repo4, "shared_owner_a", "3.0.2"
+        c.checksum gem_repo4, "shared_owner_b", "4.0.2"
+      end
+
       expect(lockfile).to eq <<~L
         GEM
-          remote: #{file_uri_for(gem_repo4)}/
+          remote: https://gem.repo4/
           specs:
             isolated_dep (2.0.1)
             isolated_owner (1.0.2)
@@ -1680,7 +2031,7 @@
           isolated_owner
           shared_owner_a
           shared_owner_b
-
+        #{checksums}
         BUNDLED WITH
            #{Bundler::VERSION}
       L
@@ -1688,7 +2039,7 @@
 
     it "should match bundle install conservative update behavior when not eagerly unlocking" do
       gemfile <<-G
-        source "#{file_uri_for(gem_repo4)}"
+        source "https://gem.repo4"
         gem 'isolated_owner', '1.0.2'
 
         gem 'shared_owner_a', '3.0.2'
@@ -1697,17 +2048,63 @@
 
       bundle "install"
 
-      expect(the_bundle).to include_gems "isolated_owner 1.0.2", "isolated_dep 2.0.2", "shared_dep 5.0.1", "shared_owner_a 3.0.2", "shared_owner_b 4.0.1"
+      expect(the_bundle).to include_gems "isolated_owner 1.0.2", "isolated_dep 2.0.1", "shared_dep 5.0.1", "shared_owner_a 3.0.2", "shared_owner_b 4.0.1"
+    end
+  end
+
+  context "when Gemfile dependencies have changed" do
+    before do
+      build_repo4 do
+        build_gem "nokogiri", "1.16.4" do |s|
+          s.platform = "arm64-darwin"
+        end
+
+        build_gem "nokogiri", "1.16.4" do |s|
+          s.platform = "x86_64-linux"
+        end
+
+        build_gem "prism", "0.25.0"
+      end
+
+      gemfile <<~G
+        source "https://gem.repo4"
+        gem "nokogiri", ">=1.16.4"
+        gem "prism", ">=0.25.0"
+      G
+
+      lockfile <<~L
+        GEM
+          remote: https://gem.repo4/
+          specs:
+            nokogiri (1.16.4-arm64-darwin)
+            nokogiri (1.16.4-x86_64-linux)
+
+        PLATFORMS
+          arm64-darwin
+          x86_64-linux
+
+        DEPENDENCIES
+          nokogiri (>= 1.16.4)
+
+        BUNDLED WITH
+           #{Bundler::VERSION}
+      L
+    end
+
+    it "still works" do
+      simulate_platform "arm64-darwin-23" do
+        bundle "update"
+      end
     end
   end
 
   context "error handling" do
     before do
-      gemfile "source \"#{file_uri_for(gem_repo1)}\""
+      gemfile "source 'https://gem.repo1'"
     end
 
     it "raises if too many flags are provided" do
-      bundle "update --patch --minor", :all => true, :raise_on_error => false
+      bundle "update --patch --minor", all: true, raise_on_error: false
 
       expect(err).to eq "Provide only one of the following options: minor, patch"
     end
diff --git a/spec/bundler/commands/version_spec.rb b/spec/bundler/commands/version_spec.rb
index 53d545f5faf454..1019803c8705d4 100644
--- a/spec/bundler/commands/version_spec.rb
+++ b/spec/bundler/commands/version_spec.rb
@@ -4,44 +4,62 @@
 
 RSpec.describe "bundle version" do
   if Spec::Path.ruby_core?
-    COMMIT_HASH = /unknown|[a-fA-F0-9]{7,}/.freeze
+    COMMIT_HASH = /unknown|[a-fA-F0-9]{7,}/
   else
-    COMMIT_HASH = /[a-fA-F0-9]{7,}/.freeze
+    COMMIT_HASH = /[a-fA-F0-9]{7,}/
   end
 
   context "with -v" do
-    it "outputs the version", :bundler => "< 3" do
+    it "outputs the version and virtual version if set" do
       bundle "-v"
       expect(out).to eq("Bundler version #{Bundler::VERSION}")
-    end
 
-    it "outputs the version", :bundler => "3" do
+      bundle "config simulate_version 4"
       bundle "-v"
-      expect(out).to eq(Bundler::VERSION)
+      expect(out).to eq("#{Bundler::VERSION} (simulating Bundler 4)")
     end
   end
 
   context "with --version" do
-    it "outputs the version", :bundler => "< 3" do
+    it "outputs the version and virtual version if set" do
       bundle "--version"
       expect(out).to eq("Bundler version #{Bundler::VERSION}")
-    end
 
-    it "outputs the version", :bundler => "3" do
+      bundle "config simulate_version 4"
       bundle "--version"
-      expect(out).to eq(Bundler::VERSION)
+      expect(out).to eq("#{Bundler::VERSION} (simulating Bundler 4)")
     end
   end
 
   context "with version" do
-    it "outputs the version with build metadata", :bundler => "< 3" do
-      bundle "version"
-      expect(out).to match(/\ABundler version #{Regexp.escape(Bundler::VERSION)} \(\d{4}-\d{2}-\d{2} commit #{COMMIT_HASH}\)\z/)
+    context "when released", :ruby_repo do
+      before do
+        system_gems "bundler-2.9.9", released: true
+      end
+
+      it "outputs the version, virtual version if set, and build metadata" do
+        bundle "version"
+        expect(out).to match(/\ABundler version 2\.9\.9 \(2100-01-01 commit #{COMMIT_HASH}\)\z/)
+
+        bundle "config simulate_version 4"
+        bundle "version"
+        expect(out).to match(/\A2\.9\.9 \(simulating Bundler 4\) \(2100-01-01 commit #{COMMIT_HASH}\)\z/)
+      end
     end
 
-    it "outputs the version with build metadata", :bundler => "3" do
-      bundle "version"
-      expect(out).to match(/\A#{Regexp.escape(Bundler::VERSION)} \(\d{4}-\d{2}-\d{2} commit #{COMMIT_HASH}\)\z/)
+    context "when not released" do
+      before do
+        system_gems "bundler-2.9.9", released: false
+      end
+
+      it "outputs the version, virtual version if set, and build metadata" do
+        bundle "version"
+        expect(out).to match(/\ABundler version 2\.9\.9 \(20\d{2}-\d{2}-\d{2} commit #{COMMIT_HASH}\)\z/)
+
+        bundle "config simulate_version 4"
+        bundle "version"
+        expect(out).to match(/\A2\.9\.9 \(simulating Bundler 4\) \(20\d{2}-\d{2}-\d{2} commit #{COMMIT_HASH}\)\z/)
+      end
     end
   end
 end
diff --git a/spec/bundler/commands/viz_spec.rb b/spec/bundler/commands/viz_spec.rb
index b25683bfb38e15..0ad285104c4e38 100644
--- a/spec/bundler/commands/viz_spec.rb
+++ b/spec/bundler/commands/viz_spec.rb
@@ -1,21 +1,21 @@
 # frozen_string_literal: true
 
-RSpec.describe "bundle viz", :bundler => "< 3", :if => Bundler.which("dot"), :realworld => true do
+RSpec.describe "bundle viz", if: Bundler.which("dot") do
   before do
-    realworld_system_gems "ruby-graphviz --version 1.2.5"
+    base_system_gems "rexml", "ruby-graphviz"
   end
 
   it "graphs gems from the Gemfile" do
     install_gemfile <<-G
-      source "#{file_uri_for(gem_repo1)}"
-      gem "rack"
-      gem "rack-obama"
+      source "https://gem.repo1"
+      gem "myrack"
+      gem "myrack-obama"
     G
 
     bundle "viz"
     expect(out).to include("gem_graph.png")
 
-    bundle "viz", :format => "debug"
+    bundle "viz", format: "debug"
     expect(out).to eq(<<~DOT.strip)
       digraph Gemfile {
       concentrate = "true";
@@ -25,11 +25,11 @@
       node[ fontname  =  "Arial, Helvetica, SansSerif"];
       edge[ fontname  =  "Arial, Helvetica, SansSerif" , fontsize  =  "12"];
       default [style = "filled", fillcolor = "#B9B9D5", shape = "box3d", fontsize = "16", label = "default"];
-      rack [style = "filled", fillcolor = "#B9B9D5", label = "rack"];
-        default -> rack [constraint = "false"];
-      "rack-obama" [style = "filled", fillcolor = "#B9B9D5", label = "rack-obama"];
-        default -> "rack-obama" [constraint = "false"];
-        "rack-obama" -> rack;
+      myrack [style = "filled", fillcolor = "#B9B9D5", label = "myrack"];
+        default -> myrack [constraint = "false"];
+      "myrack-obama" [style = "filled", fillcolor = "#B9B9D5", label = "myrack-obama"];
+        default -> "myrack-obama" [constraint = "false"];
+        "myrack-obama" -> myrack;
       }
       debugging bundle viz...
     DOT
@@ -37,19 +37,19 @@
 
   it "graphs gems that are prereleases" do
     build_repo2 do
-      build_gem "rack", "1.3.pre"
+      build_gem "myrack", "1.3.pre"
     end
 
     install_gemfile <<-G
-      source "#{file_uri_for(gem_repo2)}"
-      gem "rack", "= 1.3.pre"
-      gem "rack-obama"
+      source "https://gem.repo2"
+      gem "myrack", "= 1.3.pre"
+      gem "myrack-obama"
     G
 
     bundle "viz"
     expect(out).to include("gem_graph.png")
 
-    bundle "viz", :format => :debug, :version => true
+    bundle "viz", format: :debug, version: true
     expect(out).to eq(<<~EOS.strip)
       digraph Gemfile {
       concentrate = "true";
@@ -59,11 +59,11 @@
       node[ fontname  =  "Arial, Helvetica, SansSerif"];
       edge[ fontname  =  "Arial, Helvetica, SansSerif" , fontsize  =  "12"];
       default [style = "filled", fillcolor = "#B9B9D5", shape = "box3d", fontsize = "16", label = "default"];
-      rack [style = "filled", fillcolor = "#B9B9D5", label = "rack\\n1.3.pre"];
-        default -> rack [constraint = "false"];
-      "rack-obama" [style = "filled", fillcolor = "#B9B9D5", label = "rack-obama\\n1.0"];
-        default -> "rack-obama" [constraint = "false"];
-        "rack-obama" -> rack;
+      myrack [style = "filled", fillcolor = "#B9B9D5", label = "myrack\\n1.3.pre"];
+        default -> myrack [constraint = "false"];
+      "myrack-obama" [style = "filled", fillcolor = "#B9B9D5", label = "myrack-obama\\n1.0"];
+        default -> "myrack-obama" [constraint = "false"];
+        "myrack-obama" -> myrack;
       }
       debugging bundle viz...
     EOS
@@ -71,23 +71,23 @@
 
   context "with another gem that has a graphviz file" do
     before do
-      build_repo4 do
+      update_repo4 do
         build_gem "graphviz", "999" do |s|
           s.write("lib/graphviz.rb", "abort 'wrong graphviz gem loaded'")
         end
       end
 
-      system_gems "graphviz-999", :gem_repo => gem_repo4
+      system_gems "graphviz-999", gem_repo: gem_repo4
     end
 
     it "loads the correct ruby-graphviz gem" do
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
-        gem "rack"
-        gem "rack-obama"
+        source "https://gem.repo1"
+        gem "myrack"
+        gem "myrack-obama"
       G
 
-      bundle "viz", :format => "debug"
+      bundle "viz", format: "debug"
       expect(out).to eq(<<~DOT.strip)
         digraph Gemfile {
         concentrate = "true";
@@ -97,11 +97,11 @@
         node[ fontname  =  "Arial, Helvetica, SansSerif"];
         edge[ fontname  =  "Arial, Helvetica, SansSerif" , fontsize  =  "12"];
         default [style = "filled", fillcolor = "#B9B9D5", shape = "box3d", fontsize = "16", label = "default"];
-        rack [style = "filled", fillcolor = "#B9B9D5", label = "rack"];
-          default -> rack [constraint = "false"];
-        "rack-obama" [style = "filled", fillcolor = "#B9B9D5", label = "rack-obama"];
-          default -> "rack-obama" [constraint = "false"];
-          "rack-obama" -> rack;
+        myrack [style = "filled", fillcolor = "#B9B9D5", label = "myrack"];
+          default -> myrack [constraint = "false"];
+        "myrack-obama" [style = "filled", fillcolor = "#B9B9D5", label = "myrack-obama"];
+          default -> "myrack-obama" [constraint = "false"];
+          "myrack-obama" -> myrack;
         }
         debugging bundle viz...
       DOT
@@ -111,7 +111,7 @@
   context "--without option" do
     it "one group" do
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
+        source "https://gem.repo1"
         gem "activesupport"
 
         group :rails do
@@ -125,11 +125,11 @@
 
     it "two groups" do
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
+        source "https://gem.repo1"
         gem "activesupport"
 
-        group :rack do
-          gem "rack"
+        group :myrack do
+          gem "myrack"
         end
 
         group :rails do
@@ -137,7 +137,7 @@
         end
       G
 
-      bundle "viz --without=rails:rack"
+      bundle "viz --without=rails:myrack"
       expect(out).to include("gem_graph.png")
     end
   end
diff --git a/spec/bundler/install/allow_offline_install_spec.rb b/spec/bundler/install/allow_offline_install_spec.rb
index 75c7aa90851b65..abe6009c08e4d3 100644
--- a/spec/bundler/install/allow_offline_install_spec.rb
+++ b/spec/bundler/install/allow_offline_install_spec.rb
@@ -7,17 +7,17 @@
 
   context "with no cached data locally" do
     it "still installs" do
-      install_gemfile <<-G, :artifice => "compact_index"
+      install_gemfile <<-G, artifice: "compact_index"
         source "http://testgemserver.local"
-        gem "rack-obama"
+        gem "myrack-obama"
       G
-      expect(the_bundle).to include_gem("rack 1.0")
+      expect(the_bundle).to include_gem("myrack 1.0")
     end
 
     it "still fails when the network is down" do
-      install_gemfile <<-G, :artifice => "fail", :raise_on_error => false
+      install_gemfile <<-G, artifice: "fail", raise_on_error: false
         source "http://testgemserver.local"
-        gem "rack-obama"
+        gem "myrack-obama"
       G
       expect(err).to include("Could not reach host testgemserver.local.")
       expect(the_bundle).to_not be_locked
@@ -26,26 +26,26 @@
 
   context "with cached data locally" do
     it "will install from the compact index" do
-      system_gems ["rack-1.0.0"], :path => default_bundle_path
+      system_gems ["myrack-1.0.0"], path: default_bundle_path
 
       bundle "config set clean false"
-      install_gemfile <<-G, :artifice => "compact_index"
+      install_gemfile <<-G, artifice: "compact_index"
         source "http://testgemserver.local"
-        gem "rack-obama"
-        gem "rack", "< 1.0"
+        gem "myrack-obama"
+        gem "myrack", "< 1.0"
       G
 
-      expect(the_bundle).to include_gems("rack-obama 1.0", "rack 0.9.1")
+      expect(the_bundle).to include_gems("myrack-obama 1.0", "myrack 0.9.1")
 
       gemfile <<-G
         source "http://testgemserver.local"
-        gem "rack-obama"
+        gem "myrack-obama"
       G
 
-      bundle :update, :artifice => "fail", :all => true
-      expect(last_command.stdboth).to include "Using the cached data for the new index because of a network error"
+      bundle :update, artifice: "fail", all: true
+      expect(stdboth).to include "Using the cached data for the new index because of a network error"
 
-      expect(the_bundle).to include_gems("rack-obama 1.0", "rack 1.0.0")
+      expect(the_bundle).to include_gems("myrack-obama 1.0", "myrack 1.0.0")
     end
 
     def break_git_remote_ops!
@@ -53,10 +53,10 @@ def break_git_remote_ops!
       File.open(tmp("broken_path/git"), "w", 0o755) do |f|
         f.puts <<~RUBY
           #!/usr/bin/env ruby
-          fetch_args = %w(fetch --force --quiet)
+          fetch_args = %w(fetch --force --quiet --no-tags)
           clone_args = %w(clone --bare --no-hardlinks --quiet)
 
-          if (fetch_args.-(ARGV).empty? || clone_args.-(ARGV).empty?) && ARGV.any? {|arg| arg.start_with?("file://") }
+          if (fetch_args.-(ARGV).empty? || clone_args.-(ARGV).empty?) && File.exist?(ARGV[ARGV.index("--") + 1])
             warn "git remote ops have been disabled"
             exit 1
           end
@@ -75,20 +75,20 @@ def break_git_remote_ops!
     it "will install from a cached git repo" do
       skip "doesn't print errors" if Gem.win_platform?
 
-      git = build_git "a", "1.0.0", :path => lib_path("a")
-      update_git("a", :path => git.path, :branch => "new_branch")
+      git = build_git "a", "1.0.0", path: lib_path("a")
+      update_git("a", path: git.path, branch: "new_branch")
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
+        source "https://gem.repo1"
         gem "a", :git => #{git.path.to_s.dump}
       G
 
-      break_git_remote_ops! { bundle :update, :all => true }
+      break_git_remote_ops! { bundle :update, all: true }
       expect(err).to include("Using cached git data because of network errors")
       expect(the_bundle).to be_locked
 
       break_git_remote_ops! do
         install_gemfile <<-G
-          source "#{file_uri_for(gem_repo1)}"
+          source "https://gem.repo1"
           gem "a", :git => #{git.path.to_s.dump}, :branch => "new_branch"
         G
       end
diff --git a/spec/bundler/install/binstubs_spec.rb b/spec/bundler/install/binstubs_spec.rb
index 928ba80b159e50..00765ac6dd6813 100644
--- a/spec/bundler/install/binstubs_spec.rb
+++ b/spec/bundler/install/binstubs_spec.rb
@@ -6,14 +6,14 @@
       expect(Pathname.new("/usr/bin")).not_to be_writable
       gemfile <<-G
         def Gem.bindir; "/usr/bin"; end
-        source "#{file_uri_for(gem_repo1)}"
-        gem "rack"
+        source "https://gem.repo1"
+        gem "myrack"
       G
 
       config "BUNDLE_SYSTEM_BINDIR" => system_gem_path("altbin").to_s
       bundle :install
-      expect(the_bundle).to include_gems "rack 1.0.0"
-      expect(system_gem_path("altbin/rackup")).to exist
+      expect(the_bundle).to include_gems "myrack 1.0.0"
+      expect(system_gem_path("altbin/myrackup")).to exist
     end
   end
 
@@ -21,26 +21,26 @@ def Gem.bindir; "/usr/bin"; end
     before do
       build_repo2 do
         build_gem "fake", "14" do |s|
-          s.executables = "rackup"
+          s.executables = "myrackup"
         end
       end
 
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo2)}"
+        source "https://gem.repo2"
         gem "fake"
-        gem "rack"
+        gem "myrack"
       G
     end
 
     it "warns about the situation" do
-      bundle "exec rackup"
+      bundle "exec myrackup"
 
       expect(last_command.stderr).to include(
-        "The `rackup` executable in the `fake` gem is being loaded, but it's also present in other gems (rack).\n" \
+        "The `myrackup` executable in the `fake` gem is being loaded, but it's also present in other gems (myrack).\n" \
         "If you meant to run the executable for another gem, make sure you use a project specific binstub (`bundle binstub <gem_name>`).\n" \
         "If you plan to use multiple conflicting executables, generate binstubs for them and disambiguate their names."
       ).or include(
-        "The `rackup` executable in the `rack` gem is being loaded, but it's also present in other gems (fake).\n" \
+        "The `myrackup` executable in the `myrack` gem is being loaded, but it's also present in other gems (fake).\n" \
         "If you meant to run the executable for another gem, make sure you use a project specific binstub (`bundle binstub <gem_name>`).\n" \
         "If you plan to use multiple conflicting executables, generate binstubs for them and disambiguate their names."
       )
diff --git a/spec/bundler/install/bundler_spec.rb b/spec/bundler/install/bundler_spec.rb
index a0d5332e96e134..56f843118166ac 100644
--- a/spec/bundler/install/bundler_spec.rb
+++ b/spec/bundler/install/bundler_spec.rb
@@ -5,7 +5,7 @@
     before(:each) do
       build_repo2 do
         build_gem "rails", "3.0" do |s|
-          s.add_dependency "bundler", ">= 0.9.0.pre"
+          s.add_dependency "bundler", ">= 0.9.0"
         end
         build_gem "bundler", "0.9.1"
         build_gem "bundler", Bundler::VERSION
@@ -14,7 +14,7 @@
 
     it "are forced to the current bundler version" do
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo2)}"
+        source "https://gem.repo2"
         gem "rails", "3.0"
       G
 
@@ -23,15 +23,15 @@
 
     it "are forced to the current bundler version even if not already present" do
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
-        gem "rack"
+        source "https://gem.repo1"
+        gem "myrack"
       G
       expect(the_bundle).to include_gems "bundler #{Bundler::VERSION}"
     end
 
     it "causes a conflict if explicitly requesting a different version of bundler" do
-      install_gemfile <<-G, :raise_on_error => false
-        source "#{file_uri_for(gem_repo2)}"
+      install_gemfile <<-G, raise_on_error: false
+        source "https://gem.repo2"
         gem "rails", "3.0"
         gem "bundler", "0.9.1"
       G
@@ -50,8 +50,8 @@
     end
 
     it "causes a conflict if explicitly requesting a non matching requirement on bundler" do
-      install_gemfile <<-G, :raise_on_error => false
-        source "#{file_uri_for(gem_repo2)}"
+      install_gemfile <<-G, raise_on_error: false
+        source "https://gem.repo2"
         gem "rails", "3.0"
         gem "bundler", "~> 0.8"
       G
@@ -59,8 +59,8 @@
       nice_error = <<~E.strip
         Could not find compatible versions
 
-        Because rails >= 3.0 depends on bundler >= 0.9.0.pre
-          and the current Bundler version (#{Bundler::VERSION}) does not satisfy bundler >= 0.9.0.pre, < 1.A,
+        Because rails >= 3.0 depends on bundler >= 0.9.0
+          and the current Bundler version (#{Bundler::VERSION}) does not satisfy bundler >= 0.9.0, < 1.A,
           rails >= 3.0 requires bundler >= 1.A.
         So, because Gemfile depends on rails = 3.0
           and Gemfile depends on bundler ~> 0.8,
@@ -73,8 +73,8 @@
     end
 
     it "causes a conflict if explicitly requesting a version of bundler that doesn't exist" do
-      install_gemfile <<-G, :raise_on_error => false
-        source "#{file_uri_for(gem_repo2)}"
+      install_gemfile <<-G, raise_on_error: false
+        source "https://gem.repo2"
         gem "rails", "3.0"
         gem "bundler", "0.9.2"
       G
@@ -99,16 +99,16 @@
       end
 
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo2)}"
+        source "https://gem.repo2"
 
         gem "multiple_versioned_deps"
       G
 
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo2)}"
+        source "https://gem.repo2"
 
         gem "multiple_versioned_deps"
-        gem "rack"
+        gem "myrack"
       G
 
       expect(the_bundle).to include_gems "multiple_versioned_deps 1.0.0"
@@ -116,7 +116,7 @@
 
     it "includes bundler in the bundle when it's a child dependency" do
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo2)}"
+        source "https://gem.repo2"
         gem "rails", "3.0"
       G
 
@@ -126,8 +126,8 @@
 
     it "allows gem 'bundler' when Bundler is not in the Gemfile or its dependencies" do
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo2)}"
-        gem "rack"
+        source "https://gem.repo2"
+        gem "myrack"
       G
 
       run "begin; gem 'bundler'; puts 'WIN'; rescue Gem::LoadError => e; puts e.backtrace; end"
@@ -143,8 +143,8 @@
         end
       end
 
-      install_gemfile <<-G, :raise_on_error => false
-        source "#{file_uri_for(gem_repo2)}"
+      install_gemfile <<-G, raise_on_error: false
+        source "https://gem.repo2"
         gem "activemerchant"
         gem "rails_pinned_to_old_activesupport"
       G
@@ -171,8 +171,8 @@
         end
       end
 
-      install_gemfile <<-G, :raise_on_error => false
-        source "#{file_uri_for(gem_repo2)}"
+      install_gemfile <<-G, raise_on_error: false
+        source "https://gem.repo2"
         gem "rails_pinned_to_old_activesupport"
         gem "activesupport", "2.3.5"
       G
@@ -197,12 +197,12 @@
       end
 
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo2)}"
+        source "https://gem.repo2"
         gem 'rails', "2.3.2"
       G
 
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo2)}"
+        source "https://gem.repo2"
         gem "rails_pinned_to_old_activesupport"
       G
 
@@ -219,17 +219,17 @@
       bundle "config set path.system true"
 
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo4)}"
+        source "https://gem.repo4"
         gem 'rails', "7.0.4"
       G
 
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo4)}"
+        source "https://gem.repo4"
         gem 'rails', "7.0.3"
       G
 
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo4)}"
+        source "https://gem.repo4"
         gem 'rails', "7.0.4"
       G
 
@@ -243,7 +243,7 @@
       system_gems "bundler-99999999.99.1"
 
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo2)}"
+        source "https://gem.repo2"
         gem "rails", "3.0"
       G
 
@@ -257,7 +257,7 @@
       system_gems "bundler-99999999.99.1"
 
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo2)}"
+        source "https://gem.repo2"
         gem "rails", "3.0"
       G
 
diff --git a/spec/bundler/install/deploy_spec.rb b/spec/bundler/install/deploy_spec.rb
index 045d643a8f6854..4d378d494190c6 100644
--- a/spec/bundler/install/deploy_spec.rb
+++ b/spec/bundler/install/deploy_spec.rb
@@ -3,31 +3,31 @@
 RSpec.describe "install in deployment or frozen mode" do
   before do
     gemfile <<-G
-      source "#{file_uri_for(gem_repo1)}"
-      gem "rack"
+      source "https://gem.repo1"
+      gem "myrack"
     G
   end
 
-  context "with CLI flags", :bundler => "< 3" do
+  context "with CLI flags" do
     it "fails without a lockfile and says that --deployment requires a lock" do
-      bundle "install --deployment", :raise_on_error => false
-      expect(err).to include("The --deployment flag requires a Gemfile.lock")
+      bundle "install --deployment", raise_on_error: false
+      expect(err).to include("The --deployment flag requires a lockfile")
     end
 
     it "fails without a lockfile and says that --frozen requires a lock" do
-      bundle "install --frozen", :raise_on_error => false
-      expect(err).to include("The --frozen flag requires a Gemfile.lock")
+      bundle "install --frozen", raise_on_error: false
+      expect(err).to include("The --frozen flag requires a lockfile")
     end
 
     it "disallows --deployment --system" do
-      bundle "install --deployment --system", :raise_on_error => false
+      bundle "install --deployment --system", raise_on_error: false
       expect(err).to include("You have specified both --deployment")
       expect(err).to include("Please choose only one option")
       expect(exitstatus).to eq(15)
     end
 
     it "disallows --deployment --path --system" do
-      bundle "install --deployment --path . --system", :raise_on_error => false
+      bundle "install --deployment --path . --system", raise_on_error: false
       expect(err).to include("You have specified both --path")
       expect(err).to include("as well as --system")
       expect(err).to include("Please choose only one option")
@@ -35,9 +35,9 @@
     end
 
     it "doesn't mess up a subsequent `bundle install` after you try to deploy without a lock" do
-      bundle "install --deployment", :raise_on_error => false
+      bundle "install --deployment", raise_on_error: false
       bundle :install
-      expect(the_bundle).to include_gems "rack 1.0"
+      expect(the_bundle).to include_gems "myrack 1.0"
     end
 
     it "installs gems by default to vendor/bundle" do
@@ -60,33 +60,45 @@
     it "explodes with the --deployment flag if you make a change and don't check in the lockfile" do
       bundle :lock
       gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
-        gem "rack"
-        gem "rack-obama"
+        source "https://gem.repo1"
+        gem "myrack"
+        gem "myrack-obama"
       G
 
-      bundle "install --deployment", :raise_on_error => false
+      bundle "install --deployment", raise_on_error: false
       expect(err).to include("frozen mode")
       expect(err).to include("You have added to the Gemfile")
-      expect(err).to include("* rack-obama")
+      expect(err).to include("* myrack-obama")
       expect(err).not_to include("You have deleted from the Gemfile")
       expect(err).not_to include("You have changed in the Gemfile")
     end
   end
 
+  it "fails without a lockfile and says that deployment requires a lock" do
+    bundle "config deployment true"
+    bundle "install", raise_on_error: false
+    expect(err).to include("The deployment setting requires a lockfile")
+  end
+
+  it "fails without a lockfile and says that frozen requires a lock" do
+    bundle "config frozen true"
+    bundle "install", raise_on_error: false
+    expect(err).to include("The frozen setting requires a lockfile")
+  end
+
   it "still works if you are not in the app directory and specify --gemfile" do
     bundle "install"
-    simulate_new_machine
+    pristine_system_gems :bundler
     bundle "config set --local deployment true"
     bundle "config set --local path vendor/bundle"
-    bundle "install --gemfile #{tmp}/bundled_app/Gemfile", :dir => tmp
-    expect(the_bundle).to include_gems "rack 1.0"
+    bundle "install --gemfile #{tmp}/bundled_app/Gemfile", dir: tmp
+    expect(the_bundle).to include_gems "myrack 1.0"
   end
 
   it "works if you exclude a group with a git gem" do
     build_git "foo"
     gemfile <<-G
-      source "#{file_uri_for(gem_repo1)}"
+      source "https://gem.repo1"
       group :test do
         gem "foo", :git => "#{lib_path("foo-1.0")}"
       end
@@ -103,14 +115,14 @@
     bundle :install
     bundle "config set --local deployment true"
     bundle :install
-    bundle "exec bundle check", :env => { "PATH" => path }
+    bundle "exec bundle check", env: { "PATH" => path }
   end
 
   it "works when using path gems from the same path and the version is specified" do
-    build_lib "foo", :path => lib_path("nested/foo")
-    build_lib "bar", :path => lib_path("nested/bar")
+    build_lib "foo", path: lib_path("nested/foo")
+    build_lib "bar", path: lib_path("nested/bar")
     gemfile <<-G
-      source "#{file_uri_for(gem_repo1)}"
+      source "https://gem.repo1"
       gem "foo", "1.0", :path => "#{lib_path("nested")}"
       gem "bar", :path => "#{lib_path("nested")}"
     G
@@ -121,9 +133,9 @@
   end
 
   it "works when path gems are specified twice" do
-    build_lib "foo", :path => lib_path("nested/foo")
+    build_lib "foo", path: lib_path("nested/foo")
     gemfile <<-G
-      source "#{file_uri_for(gem_repo1)}"
+      source "https://gem.repo1"
       gem "foo", :path => "#{lib_path("nested/foo")}"
       gem "foo", :path => "#{lib_path("nested/foo")}"
     G
@@ -134,28 +146,28 @@
   end
 
   it "works when there are credentials in the source URL" do
-    install_gemfile(<<-G, :artifice => "endpoint_strict_basic_authentication", :quiet => true)
+    install_gemfile(<<-G, artifice: "endpoint_strict_basic_authentication", quiet: true)
       source "http://user:pass@localgemserver.test/"
 
-      gem "rack-obama", ">= 1.0"
+      gem "myrack-obama", ">= 1.0"
     G
 
     bundle "config set --local deployment true"
-    bundle :install, :artifice => "endpoint_strict_basic_authentication"
+    bundle :install, artifice: "endpoint_strict_basic_authentication"
   end
 
   it "works with sources given by a block" do
     install_gemfile <<-G
-      source "#{file_uri_for(gem_repo1)}"
-      source "#{file_uri_for(gem_repo1)}" do
-        gem "rack"
+      source "https://gem.repo1"
+      source "https://gem.repo1" do
+        gem "myrack"
       end
     G
 
     bundle "config set --local deployment true"
     bundle :install
 
-    expect(the_bundle).to include_gems "rack 1.0"
+    expect(the_bundle).to include_gems "myrack 1.0"
   end
 
   context "when replacing a host with the same host with credentials" do
@@ -164,69 +176,29 @@
       bundle "install"
       gemfile <<-G
         source "http://user_name:password@localgemserver.test/"
-        gem "rack"
+        gem "myrack"
       G
 
       lockfile <<-G
         GEM
           remote: http://localgemserver.test/
           specs:
-            rack (1.0.0)
+            myrack (1.0.0)
 
         PLATFORMS
           #{generic_local_platform}
 
         DEPENDENCIES
-          rack
+          myrack
       G
 
       bundle "config set --local deployment true"
     end
 
-    it "prevents the replace by default" do
-      bundle :install, :raise_on_error => false
-
-      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, :raise_on_error => false
-
-        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
+    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, :raise_on_error => false
-
-        expect(err).to match(/The list of sources changed/)
-      end
+      expect(out).to match(/Bundle complete!/)
     end
   end
 
@@ -237,7 +209,9 @@
 
     it "installs gems by default to vendor/bundle" do
       bundle "config set deployment true"
-      bundle "install"
+      expect do
+        bundle "install"
+      end.not_to change { bundled_app_lock.mtime }
       expect(out).to include("vendor/bundle")
     end
 
@@ -250,31 +224,35 @@
 
     it "installs gems to custom path if specified, even when configured through ENV" do
       bundle "config set deployment true"
-      bundle "install", :env => { "BUNDLE_PATH" => "vendor/bundle2" }
+      bundle "install", env: { "BUNDLE_PATH" => "vendor/bundle2" }
       expect(out).to include("vendor/bundle2")
     end
 
     it "works with the `frozen` setting" do
       bundle "config set frozen true"
-      bundle "install"
+      expect do
+        bundle "install"
+      end.not_to change { bundled_app_lock.mtime }
     end
 
     it "works with BUNDLE_FROZEN if you didn't change anything" do
-      bundle :install, :env => { "BUNDLE_FROZEN" => "true" }
+      expect do
+        bundle :install, env: { "BUNDLE_FROZEN" => "true" }
+      end.not_to change { bundled_app_lock.mtime }
     end
 
     it "explodes with the `deployment` setting if you make a change and don't check in the lockfile" do
       gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
-        gem "rack"
-        gem "rack-obama"
+        source "https://gem.repo1"
+        gem "myrack"
+        gem "myrack-obama"
       G
 
       bundle "config set --local deployment true"
-      bundle :install, :raise_on_error => false
+      bundle :install, raise_on_error: false
       expect(err).to include("frozen mode")
       expect(err).to include("You have added to the Gemfile")
-      expect(err).to include("* rack-obama")
+      expect(err).to include("* myrack-obama")
       expect(err).not_to include("You have deleted from the Gemfile")
       expect(err).not_to include("You have changed in the Gemfile")
     end
@@ -282,7 +260,7 @@
     it "works if a path gem is missing but is in a without group" do
       build_lib "path_gem"
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
+        source "https://gem.repo1"
         gem "rake"
         gem "path_gem", :path => "#{lib_path("path_gem-1.0")}", :group => :development
       G
@@ -292,7 +270,7 @@
       bundle "config set --local path .bundle"
       bundle "config set --local without development"
       bundle "config set --local deployment true"
-      bundle :install, :env => { "DEBUG" => "1" }
+      bundle :install, env: { "DEBUG" => "1" }
       run "puts :WIN"
       expect(out).to eq("WIN")
     end
@@ -301,14 +279,14 @@
       build_repo2
 
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo2)}"
+        source "https://gem.repo2"
 
-        source "#{file_uri_for(gem_repo1)}" do
+        source "https://gem.repo1" do
           gem "rake", platform: :#{not_local_tag}
         end
       G
 
-      bundle :install, :env => { "BUNDLE_FROZEN" => "true" }
+      bundle :install, env: { "BUNDLE_FROZEN" => "true" }
       expect(last_command).to be_success
     end
 
@@ -342,14 +320,14 @@
            #{Bundler::VERSION}
       L
 
-      bundle :install, :env => { "BUNDLE_FROZEN" => "true" }, :raise_on_error => false, :artifice => "compact_index"
-      expect(err).to include("Your lock file is missing \"bar\", but the lockfile can't be updated because frozen mode is set")
+      bundle :install, env: { "BUNDLE_FROZEN" => "true" }, raise_on_error: false, artifice: "compact_index"
+      expect(err).to include("Your lockfile is missing \"bar\", but can't be updated because frozen mode is set")
     end
 
     it "explodes if a path gem is missing" do
       build_lib "path_gem"
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
+        source "https://gem.repo1"
         gem "rake"
         gem "path_gem", :path => "#{lib_path("path_gem-1.0")}", :group => :development
       G
@@ -358,38 +336,38 @@
 
       bundle "config set --local path .bundle"
       bundle "config set --local deployment true"
-      bundle :install, :raise_on_error => false
+      bundle :install, raise_on_error: false
       expect(err).to include("The path `#{lib_path("path_gem-1.0")}` does not exist.")
     end
 
     it "can have --frozen set via an environment variable" do
       gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
-        gem "rack"
-        gem "rack-obama"
+        source "https://gem.repo1"
+        gem "myrack"
+        gem "myrack-obama"
       G
 
       ENV["BUNDLE_FROZEN"] = "1"
-      bundle "install", :raise_on_error => false
+      bundle "install", raise_on_error: false
       expect(err).to include("frozen mode")
       expect(err).to include("You have added to the Gemfile")
-      expect(err).to include("* rack-obama")
+      expect(err).to include("* myrack-obama")
       expect(err).not_to include("You have deleted from the Gemfile")
       expect(err).not_to include("You have changed in the Gemfile")
     end
 
     it "can have --deployment set via an environment variable" do
       gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
-        gem "rack"
-        gem "rack-obama"
+        source "https://gem.repo1"
+        gem "myrack"
+        gem "myrack-obama"
       G
 
       ENV["BUNDLE_DEPLOYMENT"] = "true"
-      bundle "install", :raise_on_error => false
+      bundle "install", raise_on_error: false
       expect(err).to include("frozen mode")
       expect(err).to include("You have added to the Gemfile")
-      expect(err).to include("* rack-obama")
+      expect(err).to include("* myrack-obama")
       expect(err).not_to include("You have deleted from the Gemfile")
       expect(err).not_to include("You have changed in the Gemfile")
     end
@@ -409,9 +387,9 @@
 
     it "can have --frozen set to false via an environment variable" do
       gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
-        gem "rack"
-        gem "rack-obama"
+        source "https://gem.repo1"
+        gem "myrack"
+        gem "myrack-obama"
       G
 
       ENV["BUNDLE_FROZEN"] = "false"
@@ -419,77 +397,109 @@
       bundle "install"
       expect(out).not_to include("frozen mode")
       expect(out).not_to include("You have added to the Gemfile")
-      expect(out).not_to include("* rack-obama")
+      expect(out).not_to include("* myrack-obama")
     end
 
-    it "explodes if you remove a gem and don't check in the lockfile" do
+    it "explodes if you replace a gem and don't check in the lockfile" do
       gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
+        source "https://gem.repo1"
         gem "activesupport"
       G
 
       bundle "config set --local deployment true"
-      bundle :install, :raise_on_error => false
+      bundle :install, raise_on_error: false
       expect(err).to include("frozen mode")
       expect(err).to include("You have added to the Gemfile:\n* activesupport\n\n")
-      expect(err).to include("You have deleted from the Gemfile:\n* rack")
+      expect(err).to include("You have deleted from the Gemfile:\n* myrack")
+      expect(err).not_to include("You have changed in the Gemfile")
+    end
+
+    it "explodes if you remove a gem and don't check in the lockfile" do
+      gemfile 'source "https://gem.repo1"'
+
+      bundle "config set --local deployment true"
+      bundle :install, raise_on_error: false
+      expect(err).to include("Some dependencies were deleted")
+      expect(err).to include("frozen mode")
+      expect(err).to include("You have deleted from the Gemfile:\n* myrack")
       expect(err).not_to include("You have changed in the Gemfile")
     end
 
     it "explodes if you add a source" do
       gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
-        gem "rack", :git => "git://hubz.com"
+        source "https://gem.repo1"
+        gem "myrack", :git => "git://hubz.com"
       G
 
       bundle "config set --local deployment true"
-      bundle :install, :raise_on_error => false
+      bundle :install, raise_on_error: false
       expect(err).to include("frozen mode")
       expect(err).not_to include("You have added to the Gemfile")
-      expect(err).to include("You have changed in the Gemfile:\n* rack from `no specified source` to `git://hubz.com`")
+      expect(err).to include("You have changed in the Gemfile:\n* myrack from `no specified source` to `git://hubz.com`")
     end
 
-    it "explodes if you change a source" do
-      build_git "rack"
+    it "explodes if you change a source from git to the default" do
+      build_git "myrack"
 
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
-        gem "rack", :git => "#{lib_path("rack-1.0")}"
+        source "https://gem.repo1"
+        gem "myrack", :git => "#{lib_path("myrack-1.0")}"
       G
 
       gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
-        gem "rack"
+        source "https://gem.repo1"
+        gem "myrack"
       G
 
       bundle "config set --local deployment true"
-      bundle :install, :raise_on_error => false
+      bundle :install, raise_on_error: false
       expect(err).to include("frozen mode")
       expect(err).not_to include("You have deleted from the Gemfile")
       expect(err).not_to include("You have added to the Gemfile")
-      expect(err).to include("You have changed in the Gemfile:\n* rack from `#{lib_path("rack-1.0")}` to `no specified source`")
+      expect(err).to include("You have changed in the Gemfile:\n* myrack from `#{lib_path("myrack-1.0")}` to `no specified source`")
     end
 
-    it "explodes if you change a source" do
-      build_lib "foo", :path => lib_path("rack/foo")
-      build_git "rack", :path => lib_path("rack")
+    it "explodes if you change a source from git to the default, in presence of other git sources" do
+      build_lib "foo", path: lib_path("myrack/foo")
+      build_git "myrack", path: lib_path("myrack")
 
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
-        gem "rack", :git => "#{lib_path("rack")}"
-        gem "foo", :git => "#{lib_path("rack")}"
+        source "https://gem.repo1"
+        gem "myrack", :git => "#{lib_path("myrack")}"
+        gem "foo", :git => "#{lib_path("myrack")}"
       G
 
       gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
-        gem "rack"
-        gem "foo", :git => "#{lib_path("rack")}"
+        source "https://gem.repo1"
+        gem "myrack"
+        gem "foo", :git => "#{lib_path("myrack")}"
       G
 
       bundle "config set --local deployment true"
-      bundle :install, :raise_on_error => false
+      bundle :install, raise_on_error: false
+      expect(err).to include("frozen mode")
+      expect(err).to include("You have changed in the Gemfile:\n* myrack from `#{lib_path("myrack")}` to `no specified source`")
+      expect(err).not_to include("You have added to the Gemfile")
+      expect(err).not_to include("You have deleted from the Gemfile")
+    end
+
+    it "explodes if you change a source from path to git" do
+      build_git "myrack", path: lib_path("myrack")
+
+      install_gemfile <<-G
+        source "https://gem.repo1"
+        gem "myrack", :path => "#{lib_path("myrack")}"
+      G
+
+      gemfile <<-G
+        source "https://gem.repo1"
+        gem "myrack", :git => "https:/my-git-repo-for-myrack"
+      G
+
+      bundle "config set --local frozen true"
+      bundle :install, raise_on_error: false
       expect(err).to include("frozen mode")
-      expect(err).to include("You have changed in the Gemfile:\n* rack from `#{lib_path("rack")}` to `no specified source`")
+      expect(err).to include("You have changed in the Gemfile:\n* myrack from `#{lib_path("myrack")}` to `https:/my-git-repo-for-myrack`")
       expect(err).not_to include("You have added to the Gemfile")
       expect(err).not_to include("You have deleted from the Gemfile")
     end
@@ -500,30 +510,30 @@
       bundle "config set --local deployment true"
 
       gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
-        gem "rack", "1.0.0"
-        gem "rack-obama"
+        source "https://gem.repo1"
+        gem "myrack", "1.0.0"
+        gem "myrack-obama"
       G
 
-      run "require 'rack'", :raise_on_error => false
+      run "require 'myrack'", raise_on_error: false
       expect(err).to include <<~E.strip
         The dependencies in your gemfile changed, but the lockfile can't be updated because frozen mode is set (Bundler::ProductionError)
 
         You have added to the Gemfile:
-        * rack (= 1.0.0)
-        * rack-obama
+        * myrack (= 1.0.0)
+        * myrack-obama
 
         You have deleted from the Gemfile:
-        * rack
+        * myrack
       E
     end
   end
 
   context "with path in Gemfile and packed" do
     it "works fine after bundle package and bundle install --local" do
-      build_lib "foo", :path => lib_path("foo")
+      build_lib "foo", path: lib_path("foo")
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
+        source "https://gem.repo1"
         gem "foo", :path => "#{lib_path("foo")}"
       G
 
@@ -537,10 +547,10 @@
       bundle "install --local"
       expect(out).to include("Updating files in vendor/cache")
 
-      simulate_new_machine
+      pristine_system_gems :bundler
       bundle "config set --local deployment true"
       bundle "install --verbose"
-      expect(out).not_to include("but the lockfile can't be updated because frozen mode is set")
+      expect(out).not_to include("can't be updated because frozen mode is set")
       expect(out).not_to include("You have added to the Gemfile")
       expect(out).not_to include("You have deleted from the Gemfile")
       expect(out).to include("vendor/cache/foo")
diff --git a/spec/bundler/install/failure_spec.rb b/spec/bundler/install/failure_spec.rb
index 4a9c33754f00fc..2c2773e8491752 100644
--- a/spec/bundler/install/failure_spec.rb
+++ b/spec/bundler/install/failure_spec.rb
@@ -14,8 +14,8 @@
         end
       end
 
-      install_gemfile <<-G, :raise_on_error => false
-        source "#{file_uri_for(gem_repo2)}"
+      install_gemfile <<-G, raise_on_error: false
+        source "https://gem.repo2"
         gem "rails"
       G
       expect(err).to start_with("Gem::Ext::BuildError: ERROR: Failed to build gem native extension.")
@@ -39,8 +39,8 @@
       end
 
       it "removes the downloaded .gem" do
-        install_gemfile <<-G, :raise_on_error => false
-          source "#{file_uri_for(gem_repo4)}"
+        install_gemfile <<-G, raise_on_error: false
+          source "https://gem.repo4"
           gem "a"
         G
 
diff --git a/spec/bundler/install/gemfile/eval_gemfile_spec.rb b/spec/bundler/install/gemfile/eval_gemfile_spec.rb
index 02283291b4223e..a507e524859307 100644
--- a/spec/bundler/install/gemfile/eval_gemfile_spec.rb
+++ b/spec/bundler/install/gemfile/eval_gemfile_spec.rb
@@ -2,7 +2,7 @@
 
 RSpec.describe "bundle install with gemfile that uses eval_gemfile" do
   before do
-    build_lib("gunks", :path => bundled_app.join("gems/gunks")) do |s|
+    build_lib("gunks", path: bundled_app("gems/gunks")) do |s|
       s.name    = "gunks"
       s.version = "0.0.1"
     end
@@ -10,21 +10,21 @@
 
   context "eval-ed Gemfile points to an internal gemspec" do
     before do
-      create_file "Gemfile-other", <<-G
-        source "#{file_uri_for(gem_repo1)}"
+      gemfile "Gemfile-other", <<-G
+        source "https://gem.repo1"
         gemspec :path => 'gems/gunks'
       G
     end
 
     it "installs the gemspec specified gem" do
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
+        source "https://gem.repo1"
         eval_gemfile 'Gemfile-other'
       G
       expect(out).to include("Resolving dependencies")
       expect(out).to include("Bundle complete")
 
-      expect(the_bundle).to include_gem "gunks 0.0.1", :source => "path@#{bundled_app("gems", "gunks")}"
+      expect(the_bundle).to include_gem "gunks 0.0.1", source: "path@#{bundled_app("gems", "gunks")}"
     end
   end
 
@@ -36,12 +36,12 @@
         build_gem "zip-zip", "0.3"
       end
 
-      create_file bundled_app("gems/Gemfile"), <<-G
-        source "#{file_uri_for(gem_repo2)}"
+      gemfile bundled_app("gems/Gemfile"), <<-G
+        source "https://gem.repo2"
 
         gemspec :path => "\#{__dir__}/gunks"
 
-        source "#{file_uri_for(gem_repo2)}" do
+        source "https://gem.repo2" do
           gem "zip-zip"
         end
       G
@@ -49,7 +49,7 @@
 
     it "installs and finds gems correctly" do
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo2)}"
+        source "https://gem.repo2"
 
         gem "rails"
 
@@ -64,14 +64,14 @@
 
   context "eval-ed Gemfile has relative-path gems" do
     before do
-      build_lib("a", :path => bundled_app("gems/a"))
-      create_file bundled_app("nested/Gemfile-nested"), <<-G
-        source "#{file_uri_for(gem_repo1)}"
+      build_lib("a", path: bundled_app("gems/a"))
+      gemfile bundled_app("nested/Gemfile-nested"), <<-G
+        source "https://gem.repo1"
         gem "a", :path => "../gems/a"
       G
 
       gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
+        source "https://gem.repo1"
         eval_gemfile "nested/Gemfile-nested"
       G
     end
@@ -95,28 +95,28 @@
 
     it "installs the gemspec specified gem" do
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
+        source "https://gem.repo1"
         eval_gemfile 'other/Gemfile-other'
         gemspec :path => 'gems/gunks'
       G
       expect(out).to include("Resolving dependencies")
       expect(out).to include("Bundle complete")
 
-      expect(the_bundle).to include_gem "gunks 0.0.1", :source => "path@#{bundled_app("gems", "gunks")}"
+      expect(the_bundle).to include_gem "gunks 0.0.1", source: "path@#{bundled_app("gems", "gunks")}"
     end
   end
 
   context "eval-ed Gemfile references other gemfiles" do
     it "works with relative paths" do
-      create_file "other/Gemfile-other", "gem 'rack'"
-      create_file "other/Gemfile", "eval_gemfile 'Gemfile-other'"
-      create_file "Gemfile-alt", <<-G
-        source "#{file_uri_for(gem_repo1)}"
+      gemfile "other/Gemfile-other", "gem 'myrack'"
+      gemfile "other/Gemfile", "eval_gemfile 'Gemfile-other'"
+      gemfile "Gemfile-alt", <<-G
+        source "https://gem.repo1"
         eval_gemfile "other/Gemfile"
       G
       install_gemfile "eval_gemfile File.expand_path('Gemfile-alt')"
 
-      expect(the_bundle).to include_gem "rack 1.0.0"
+      expect(the_bundle).to include_gem "myrack 1.0.0"
     end
   end
 end
diff --git a/spec/bundler/install/gemfile/force_ruby_platform_spec.rb b/spec/bundler/install/gemfile/force_ruby_platform_spec.rb
index 0e9f1f0292b7d3..926e7527e667ef 100644
--- a/spec/bundler/install/gemfile/force_ruby_platform_spec.rb
+++ b/spec/bundler/install/gemfile/force_ruby_platform_spec.rb
@@ -5,77 +5,68 @@
     before do
       build_repo4 do
         # Build a gem with platform specific versions
-        build_gem("platform_specific") do |s|
-          s.write "lib/platform_specific.rb", "PLATFORM_SPECIFIC = '1.0.0 RUBY'"
-        end
+        build_gem("platform_specific")
 
         build_gem("platform_specific") do |s|
           s.platform = Bundler.local_platform
-          s.write "lib/platform_specific.rb", "PLATFORM_SPECIFIC = '1.0.0 #{Bundler.local_platform}'"
         end
 
         # Build the exact same gem with a different name to compare using vs not using the option
-        build_gem("platform_specific_forced") do |s|
-          s.write "lib/platform_specific_forced.rb", "PLATFORM_SPECIFIC_FORCED = '1.0.0 RUBY'"
-        end
+        build_gem("platform_specific_forced")
 
         build_gem("platform_specific_forced") do |s|
           s.platform = Bundler.local_platform
-          s.write "lib/platform_specific_forced.rb", "PLATFORM_SPECIFIC_FORCED = '1.0.0 #{Bundler.local_platform}'"
         end
       end
     end
 
     it "pulls the pure ruby variant of the given gem" do
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo4)}"
+        source "https://gem.repo4"
 
         gem "platform_specific_forced", :force_ruby_platform => true
         gem "platform_specific"
       G
 
-      expect(the_bundle).to include_gems "platform_specific_forced 1.0.0 RUBY"
-      expect(the_bundle).to include_gems "platform_specific 1.0.0 #{Bundler.local_platform}"
+      expect(the_bundle).to include_gems "platform_specific_forced 1.0 ruby"
+      expect(the_bundle).to include_gems "platform_specific 1.0 #{Bundler.local_platform}"
     end
 
     it "still respects a global `force_ruby_platform` config" do
-      install_gemfile <<-G, :env => { "BUNDLE_FORCE_RUBY_PLATFORM" => "true" }
-        source "#{file_uri_for(gem_repo4)}"
+      install_gemfile <<-G, env: { "BUNDLE_FORCE_RUBY_PLATFORM" => "true" }
+        source "https://gem.repo4"
 
         gem "platform_specific_forced", :force_ruby_platform => true
         gem "platform_specific"
       G
 
-      expect(the_bundle).to include_gems "platform_specific_forced 1.0.0 RUBY"
-      expect(the_bundle).to include_gems "platform_specific 1.0.0 RUBY"
+      expect(the_bundle).to include_gems "platform_specific_forced 1.0 ruby"
+      expect(the_bundle).to include_gems "platform_specific 1.0 ruby"
     end
   end
 
   context "when also a transitive dependency" do
     before do
       build_repo4 do
-        build_gem("depends_on_platform_specific") {|s| s.add_runtime_dependency "platform_specific" }
+        build_gem("depends_on_platform_specific") {|s| s.add_dependency "platform_specific" }
 
-        build_gem("platform_specific") do |s|
-          s.write "lib/platform_specific.rb", "PLATFORM_SPECIFIC = '1.0.0 RUBY'"
-        end
+        build_gem("platform_specific")
 
         build_gem("platform_specific") do |s|
           s.platform = Bundler.local_platform
-          s.write "lib/platform_specific.rb", "PLATFORM_SPECIFIC = '1.0.0 #{Bundler.local_platform}'"
         end
       end
     end
 
     it "still pulls the ruby variant" do
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo4)}"
+        source "https://gem.repo4"
 
         gem "depends_on_platform_specific"
         gem "platform_specific", :force_ruby_platform => true
       G
 
-      expect(the_bundle).to include_gems "platform_specific 1.0.0 RUBY"
+      expect(the_bundle).to include_gems "platform_specific 1.0 ruby"
     end
   end
 
@@ -83,36 +74,63 @@
     before do
       build_repo4 do
         build_gem("depends_on_platform_specific") do |s|
-          s.add_runtime_dependency "platform_specific"
-          s.write "lib/depends_on_platform_specific.rb", "DEPENDS_ON_PLATFORM_SPECIFIC = '1.0.0 RUBY'"
+          s.add_dependency "platform_specific"
         end
 
         build_gem("depends_on_platform_specific") do |s|
-          s.add_runtime_dependency "platform_specific"
+          s.add_dependency "platform_specific"
           s.platform = Bundler.local_platform
-          s.write "lib/depends_on_platform_specific.rb", "DEPENDS_ON_PLATFORM_SPECIFIC = '1.0.0 #{Bundler.local_platform}'"
         end
 
-        build_gem("platform_specific") do |s|
-          s.write "lib/platform_specific.rb", "PLATFORM_SPECIFIC = '1.0.0 RUBY'"
-        end
+        build_gem("platform_specific")
 
         build_gem("platform_specific") do |s|
           s.platform = Bundler.local_platform
-          s.write "lib/platform_specific.rb", "PLATFORM_SPECIFIC = '1.0.0 #{Bundler.local_platform}'"
         end
       end
     end
 
     it "ignores ruby variants for the transitive dependencies" do
-      install_gemfile <<-G, :env => { "DEBUG_RESOLVER" => "true" }
-        source "#{file_uri_for(gem_repo4)}"
+      install_gemfile <<-G, env: { "DEBUG_RESOLVER" => "true" }
+        source "https://gem.repo4"
 
         gem "depends_on_platform_specific", :force_ruby_platform => true
       G
 
-      expect(the_bundle).to include_gems "depends_on_platform_specific 1.0.0 RUBY"
-      expect(the_bundle).to include_gems "platform_specific 1.0.0 #{Bundler.local_platform}"
+      expect(the_bundle).to include_gems "depends_on_platform_specific 1.0 ruby"
+      expect(the_bundle).to include_gems "platform_specific 1.0 #{Bundler.local_platform}"
+    end
+
+    it "reinstalls the ruby variant when a platform specific variant is already installed, the lockile has only ruby platform, and :force_ruby_platform is used in the Gemfile" do
+      skip "Can't simulate platform reliably on JRuby, installing a platform specific gem fails to activate io-wait because only the -java version is present, and we're simulating a different platform" if RUBY_ENGINE == "jruby"
+
+      lockfile <<-L
+        GEM
+          remote: https://gem.repo4
+          specs:
+            platform_specific (1.0)
+
+        PLATFORMS
+          ruby
+
+        DEPENDENCIES
+          platform_specific
+
+        BUNDLED WITH
+            #{Bundler::VERSION}
+      L
+
+      simulate_platform "x86-darwin-100" do
+        system_gems "platform_specific-1.0-x86-darwin-100", path: default_bundle_path
+
+        install_gemfile <<-G, env: { "BUNDLER_SPEC_GEM_REPO" => gem_repo4.to_s }, artifice: "compact_index"
+          source "https://gem.repo4"
+
+          gem "platform_specific", :force_ruby_platform => true
+        G
+
+        expect(the_bundle).to include_gems "platform_specific 1.0 ruby"
+      end
     end
   end
 end
diff --git a/spec/bundler/install/gemfile/gemspec_spec.rb b/spec/bundler/install/gemfile/gemspec_spec.rb
index 346120446dffcd..d9469e5ca8f00f 100644
--- a/spec/bundler/install/gemfile/gemspec_spec.rb
+++ b/spec/bundler/install/gemfile/gemspec_spec.rb
@@ -8,56 +8,36 @@
     end
   end
 
-  let(:x64_mingw_archs) do
-    if RUBY_PLATFORM == "x64-mingw-ucrt"
-      if Gem.rubygems_version >= Gem::Version.new("3.2.28")
-        ["x64-mingw-ucrt", "x64-mingw32"]
-      else
-        ["x64-mingw32", "x64-unknown"]
-      end
-    else
-      ["x64-mingw32"]
-    end
-  end
-
-  let(:x64_mingw_gems) do
-    x64_mingw_archs.map {|p| "platform_specific (1.0-#{p})" }.join("\n    ")
-  end
-
-  let(:x64_mingw_platforms) do
-    x64_mingw_archs.join("\n  ")
-  end
-
   it "should install runtime and development dependencies" do
-    build_lib("foo", :path => tmp.join("foo")) do |s|
+    build_lib("foo", path: tmp("foo")) do |s|
       s.write("Gemfile", "source :rubygems\ngemspec")
       s.add_dependency "bar", "=1.0.0"
       s.add_development_dependency "bar-dev", "=1.0.0"
     end
     install_gemfile <<-G
-      source "#{file_uri_for(gem_repo2)}"
-      gemspec :path => '#{tmp.join("foo")}'
+      source "https://gem.repo2"
+      gemspec :path => '#{tmp("foo")}'
     G
 
     expect(the_bundle).to include_gems "bar 1.0.0"
-    expect(the_bundle).to include_gems "bar-dev 1.0.0", :groups => :development
+    expect(the_bundle).to include_gems "bar-dev 1.0.0", groups: :development
   end
 
   it "that is hidden should install runtime and development dependencies" do
-    build_lib("foo", :path => tmp.join("foo")) do |s|
+    build_lib("foo", path: tmp("foo")) do |s|
       s.write("Gemfile", "source :rubygems\ngemspec")
       s.add_dependency "bar", "=1.0.0"
       s.add_development_dependency "bar-dev", "=1.0.0"
     end
-    FileUtils.mv tmp.join("foo", "foo.gemspec"), tmp.join("foo", ".gemspec")
+    FileUtils.mv tmp("foo", "foo.gemspec"), tmp("foo", ".gemspec")
 
     install_gemfile <<-G
-      source "#{file_uri_for(gem_repo2)}"
-      gemspec :path => '#{tmp.join("foo")}'
+      source "https://gem.repo2"
+      gemspec :path => '#{tmp("foo")}'
     G
 
     expect(the_bundle).to include_gems "bar 1.0.0"
-    expect(the_bundle).to include_gems "bar-dev 1.0.0", :groups => :development
+    expect(the_bundle).to include_gems "bar-dev 1.0.0", groups: :development
   end
 
   it "should handle a list of requirements" do
@@ -66,153 +46,153 @@
       build_gem "baz", "1.1"
     end
 
-    build_lib("foo", :path => tmp.join("foo")) do |s|
+    build_lib("foo", path: tmp("foo")) do |s|
       s.write("Gemfile", "source :rubygems\ngemspec")
       s.add_dependency "baz", ">= 1.0", "< 1.1"
     end
     install_gemfile <<-G
-      source "#{file_uri_for(gem_repo2)}"
-      gemspec :path => '#{tmp.join("foo")}'
+      source "https://gem.repo2"
+      gemspec :path => '#{tmp("foo")}'
     G
 
     expect(the_bundle).to include_gems "baz 1.0"
   end
 
   it "should raise if there are no gemspecs available" do
-    build_lib("foo", :path => tmp.join("foo"), :gemspec => false)
+    build_lib("foo", path: tmp("foo"), gemspec: false)
 
-    install_gemfile <<-G, :raise_on_error => false
-      source "#{file_uri_for(gem_repo2)}"
-      gemspec :path => '#{tmp.join("foo")}'
+    install_gemfile <<-G, raise_on_error: false
+      source "https://gem.repo2"
+      gemspec :path => '#{tmp("foo")}'
     G
-    expect(err).to match(/There are no gemspecs at #{tmp.join('foo')}/)
+    expect(err).to match(/There are no gemspecs at #{tmp("foo")}/)
   end
 
   it "should raise if there are too many gemspecs available" do
-    build_lib("foo", :path => tmp.join("foo")) do |s|
+    build_lib("foo", path: tmp("foo")) do |s|
       s.write("foo2.gemspec", build_spec("foo", "4.0").first.to_ruby)
     end
 
-    install_gemfile <<-G, :raise_on_error => false
-      source "#{file_uri_for(gem_repo2)}"
-      gemspec :path => '#{tmp.join("foo")}'
+    install_gemfile <<-G, raise_on_error: false
+      source "https://gem.repo2"
+      gemspec :path => '#{tmp("foo")}'
     G
-    expect(err).to match(/There are multiple gemspecs at #{tmp.join('foo')}/)
+    expect(err).to match(/There are multiple gemspecs at #{tmp("foo")}/)
   end
 
   it "should pick a specific gemspec" do
-    build_lib("foo", :path => tmp.join("foo")) do |s|
+    build_lib("foo", path: tmp("foo")) do |s|
       s.write("foo2.gemspec", "")
       s.add_dependency "bar", "=1.0.0"
       s.add_development_dependency "bar-dev", "=1.0.0"
     end
 
     install_gemfile(<<-G)
-      source "#{file_uri_for(gem_repo2)}"
-      gemspec :path => '#{tmp.join("foo")}', :name => 'foo'
+      source "https://gem.repo2"
+      gemspec :path => '#{tmp("foo")}', :name => 'foo'
     G
 
     expect(the_bundle).to include_gems "bar 1.0.0"
-    expect(the_bundle).to include_gems "bar-dev 1.0.0", :groups => :development
+    expect(the_bundle).to include_gems "bar-dev 1.0.0", groups: :development
   end
 
   it "should use a specific group for development dependencies" do
-    build_lib("foo", :path => tmp.join("foo")) do |s|
+    build_lib("foo", path: tmp("foo")) do |s|
       s.write("foo2.gemspec", "")
       s.add_dependency "bar", "=1.0.0"
       s.add_development_dependency "bar-dev", "=1.0.0"
     end
 
     install_gemfile(<<-G)
-      source "#{file_uri_for(gem_repo2)}"
-      gemspec :path => '#{tmp.join("foo")}', :name => 'foo', :development_group => :dev
+      source "https://gem.repo2"
+      gemspec :path => '#{tmp("foo")}', :name => 'foo', :development_group => :dev
     G
 
     expect(the_bundle).to include_gems "bar 1.0.0"
-    expect(the_bundle).not_to include_gems "bar-dev 1.0.0", :groups => :development
-    expect(the_bundle).to include_gems "bar-dev 1.0.0", :groups => :dev
+    expect(the_bundle).not_to include_gems "bar-dev 1.0.0", groups: :development
+    expect(the_bundle).to include_gems "bar-dev 1.0.0", groups: :dev
   end
 
   it "should match a lockfile even if the gemspec defines development dependencies" do
-    build_lib("foo", :path => tmp.join("foo")) do |s|
-      s.write("Gemfile", "source '#{file_uri_for(gem_repo1)}'\ngemspec")
+    build_lib("foo", path: tmp("foo")) do |s|
+      s.write("Gemfile", "source 'https://gem.repo1'\ngemspec")
       s.add_dependency "actionpack", "=2.3.2"
-      s.add_development_dependency "rake", "=13.0.1"
+      s.add_development_dependency "rake", rake_version
     end
 
-    bundle "install", :dir => tmp.join("foo")
+    bundle "install", dir: tmp("foo"), artifice: "compact_index", env: { "BUNDLER_SPEC_GEM_REPO" => gem_repo1.to_s }
     # This should really be able to rely on $stderr, but, it's not written
     # right, so we can't. In fact, this is a bug negation test, and so it'll
     # ghost pass in future, and will only catch a regression if the message
     # doesn't change. Exit codes should be used correctly (they can be more
     # than just 0 and 1).
     bundle "config set --local deployment true"
-    output = bundle("install", :dir => tmp.join("foo"))
+    output = bundle("install", dir: tmp("foo"), artifice: "compact_index", env: { "BUNDLER_SPEC_GEM_REPO" => gem_repo1.to_s })
     expect(output).not_to match(/You have added to the Gemfile/)
     expect(output).not_to match(/You have deleted from the Gemfile/)
     expect(output).not_to match(/the lockfile can't be updated because frozen mode is set/)
   end
 
   it "should match a lockfile without needing to re-resolve" do
-    build_lib("foo", :path => tmp.join("foo")) do |s|
-      s.add_dependency "rack"
+    build_lib("foo", path: tmp("foo")) do |s|
+      s.add_dependency "myrack"
     end
 
     install_gemfile <<-G
-      source "#{file_uri_for(gem_repo1)}"
-      gemspec :path => '#{tmp.join("foo")}'
+      source "https://gem.repo1"
+      gemspec :path => '#{tmp("foo")}'
     G
 
-    bundle "install", :verbose => true
+    bundle "install", verbose: true
 
     message = "Found no changes, using resolution from the lockfile"
     expect(out.scan(message).size).to eq(1)
   end
 
   it "should match a lockfile without needing to re-resolve with development dependencies" do
-    simulate_platform java
-
-    build_lib("foo", :path => tmp.join("foo")) do |s|
-      s.add_dependency "rack"
-      s.add_development_dependency "thin"
-    end
+    simulate_platform "java" do
+      build_lib("foo", path: tmp("foo")) do |s|
+        s.add_dependency "myrack"
+        s.add_development_dependency "thin"
+      end
 
-    install_gemfile <<-G
-      source "#{file_uri_for(gem_repo1)}"
-      gemspec :path => '#{tmp.join("foo")}'
-    G
+      install_gemfile <<-G
+        source "https://gem.repo1"
+        gemspec :path => '#{tmp("foo")}'
+      G
 
-    bundle "install", :verbose => true
+      bundle "install", verbose: true
 
-    message = "Found no changes, using resolution from the lockfile"
-    expect(out.scan(message).size).to eq(1)
+      message = "Found no changes, using resolution from the lockfile"
+      expect(out.scan(message).size).to eq(1)
+    end
   end
 
   it "should match a lockfile on non-ruby platforms with a transitive platform dependency", :jruby_only do
-    build_lib("foo", :path => tmp.join("foo")) do |s|
+    build_lib("foo", path: tmp("foo")) do |s|
       s.add_dependency "platform_specific"
     end
 
-    system_gems "platform_specific-1.0-java", :path => default_bundle_path
+    system_gems "platform_specific-1.0-java", path: default_bundle_path
 
     install_gemfile <<-G
-      gemspec :path => '#{tmp.join("foo")}'
+      gemspec :path => '#{tmp("foo")}'
     G
 
-    bundle "update --bundler", :artifice => "compact_index", :verbose => true
-    expect(the_bundle).to include_gems "foo 1.0", "platform_specific 1.0 JAVA"
+    bundle "update --bundler", artifice: "compact_index", verbose: true
+    expect(the_bundle).to include_gems "foo 1.0", "platform_specific 1.0 java"
   end
 
   it "should evaluate the gemspec in its directory" do
-    build_lib("foo", :path => tmp.join("foo"))
-    File.open(tmp.join("foo/foo.gemspec"), "w") do |s|
-      s.write "raise 'ahh' unless Dir.pwd == '#{tmp.join("foo")}'"
+    build_lib("foo", path: tmp("foo"))
+    File.open(tmp("foo/foo.gemspec"), "w") do |s|
+      s.write "raise 'ahh' unless Dir.pwd == '#{tmp("foo")}'"
     end
 
-    install_gemfile <<-G, :raise_on_error => false
-      gemspec :path => '#{tmp.join("foo")}'
+    install_gemfile <<-G, raise_on_error: false
+      gemspec :path => '#{tmp("foo")}'
     G
-    expect(last_command.stdboth).not_to include("ahh")
+    expect(stdboth).not_to include("ahh")
   end
 
   it "allows the gemspec to activate other gems" do
@@ -221,16 +201,16 @@
     #
     # issue was caused by rubygems having an unresolved gem during a require,
     # so emulate that
-    system_gems %w[rack-1.0.0 rack-0.9.1 rack-obama-1.0]
+    system_gems %w[myrack-1.0.0 myrack-0.9.1 myrack-obama-1.0]
 
-    build_lib("foo", :path => bundled_app)
+    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 'myrack-obama'; require 'myrack/obama' }"
     end
 
     install_gemfile <<-G
-      source "#{file_uri_for(gem_repo1)}"
+      source "https://gem.repo1"
       gemspec
     G
 
@@ -238,26 +218,26 @@
   end
 
   it "allows conflicts" do
-    build_lib("foo", :path => tmp.join("foo")) do |s|
+    build_lib("foo", path: tmp("foo")) do |s|
       s.version = "1.0.0"
       s.add_dependency "bar", "= 1.0.0"
     end
-    build_gem "deps", :to_bundle => true do |s|
+    build_gem "deps", to_bundle: true do |s|
       s.add_dependency "foo", "= 0.0.1"
     end
-    build_gem "foo", "0.0.1", :to_bundle => true
+    build_gem "foo", "0.0.1", to_bundle: true
 
     install_gemfile <<-G
-      source "#{file_uri_for(gem_repo2)}"
+      source "https://gem.repo2"
       gem "deps"
-      gemspec :path => '#{tmp.join("foo")}', :name => 'foo'
+      gemspec :path => '#{tmp("foo")}', :name => 'foo'
     G
 
     expect(the_bundle).to include_gems "foo 1.0.0"
   end
 
   it "does not break Gem.finish_resolve with conflicts" do
-    build_lib("foo", :path => tmp.join("foo")) do |s|
+    build_lib("foo", path: tmp("foo")) do |s|
       s.version = "1.0.0"
       s.add_dependency "bar", "= 1.0.0"
     end
@@ -269,9 +249,9 @@
     end
 
     install_gemfile <<-G
-      source "#{file_uri_for(gem_repo2)}"
+      source "https://gem.repo2"
       gem "deps"
-      gemspec :path => '#{tmp.join("foo")}', :name => 'foo'
+      gemspec :path => '#{tmp("foo")}', :name => 'foo'
     G
 
     expect(the_bundle).to include_gems "foo 1.0.0"
@@ -280,15 +260,34 @@
     expect(out).to eq("WIN")
   end
 
+  it "does not make Gem.try_activate warn when local gem has extensions" do
+    build_lib("foo", path: tmp("foo")) do |s|
+      s.version = "1.0.0"
+      s.add_c_extension
+    end
+    build_repo2
+
+    install_gemfile <<-G
+      source "https://gem.repo2"
+      gemspec :path => '#{tmp("foo")}'
+    G
+
+    expect(the_bundle).to include_gems "foo 1.0.0"
+
+    run "Gem.try_activate('irb/lc/es/error.rb'); puts 'WIN'"
+    expect(out).to eq("WIN")
+    expect(err).to be_empty
+  end
+
   it "handles downgrades" do
-    build_lib "omg", "2.0", :path => lib_path("omg")
+    build_lib "omg", "2.0", path: lib_path("omg")
 
     install_gemfile <<-G
-      source "#{file_uri_for(gem_repo1)}"
+      source "https://gem.repo1"
       gemspec :path => "#{lib_path("omg")}"
     G
 
-    build_lib "omg", "1.0", :path => lib_path("omg")
+    build_lib "omg", "1.0", path: lib_path("omg")
 
     bundle :install
 
@@ -298,23 +297,23 @@
   context "in deployment mode" do
     context "when the lockfile was not updated after a change to the gemspec's dependencies" do
       it "reports that installation failed" do
-        build_lib "cocoapods", :path => bundled_app do |s|
+        build_lib "cocoapods", path: bundled_app do |s|
           s.add_dependency "activesupport", ">= 1"
         end
 
         install_gemfile <<-G
-          source "#{file_uri_for(gem_repo1)}"
+          source "https://gem.repo1"
           gemspec
         G
 
         expect(the_bundle).to include_gems("cocoapods 1.0", "activesupport 2.3.5")
 
-        build_lib "cocoapods", :path => bundled_app do |s|
+        build_lib "cocoapods", path: bundled_app do |s|
           s.add_dependency "activesupport", ">= 1.0.1"
         end
 
         bundle "config set --local deployment true"
-        bundle :install, :raise_on_error => false
+        bundle :install, raise_on_error: false
 
         expect(err).to include("changed")
       end
@@ -324,24 +323,24 @@
   context "when child gemspecs conflict with a released gemspec" do
     before do
       # build the "parent" gem that depends on another gem in the same repo
-      build_lib "source_conflict", :path => bundled_app do |s|
-        s.add_dependency "rack_middleware"
+      build_lib "source_conflict", path: bundled_app do |s|
+        s.add_dependency "myrack_middleware"
       end
 
       # build the "child" gem that is the same version as a released gem, but
       # has completely different and conflicting dependency requirements
-      build_lib "rack_middleware", "1.0", :path => bundled_app("rack_middleware") do |s|
-        s.add_dependency "rack", "1.0" # anything other than 0.9.1
+      build_lib "myrack_middleware", "1.0", path: bundled_app("myrack_middleware") do |s|
+        s.add_dependency "myrack", "1.0" # anything other than 0.9.1
       end
     end
 
     it "should install the child gemspec's deps" do
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
+        source "https://gem.repo1"
         gemspec
       G
 
-      expect(the_bundle).to include_gems "rack 1.0"
+      expect(the_bundle).to include_gems "myrack 1.0"
     end
   end
 
@@ -349,8 +348,8 @@
     let(:source_uri) { "http://localgemserver.test" }
 
     before do
-      build_lib("foo", :path => tmp.join("foo")) do |s|
-        s.add_dependency "rack", "=1.0.0"
+      build_lib("foo", path: tmp("foo")) do |s|
+        s.add_dependency "myrack", "=1.0.0"
       end
 
       gemfile <<-G
@@ -358,24 +357,28 @@
         gemspec :path => "../foo"
       G
 
+      checksums = checksums_section_when_enabled do |c|
+        c.no_checksum "foo", "1.0"
+      end
+
       lockfile <<-L
         PATH
           remote: ../foo
           specs:
             foo (1.0)
-              rack (= 1.0.0)
+              myrack (= 1.0.0)
 
         GEM
           remote: #{source_uri}
           specs:
-            rack (1.0.0)
+            myrack (1.0.0)
 
         PLATFORMS
-          #{generic_local_platform}
+          ruby
 
         DEPENDENCIES
           foo!
-
+        #{checksums}
         BUNDLED WITH
            #{Bundler::VERSION}
       L
@@ -384,9 +387,9 @@
     context "using JRuby with explicit platform", :jruby_only do
       before do
         create_file(
-          tmp.join("foo", "foo-java.gemspec"),
+          tmp("foo", "foo-java.gemspec"),
           build_spec("foo", "1.0", "java") do
-            dep "rack", "=1.0.0"
+            dep "myrack", "=1.0.0"
             @spec.authors = "authors"
             @spec.summary = "summary"
           end.first.to_ruby
@@ -394,16 +397,16 @@
       end
 
       it "should install" do
-        results = bundle "install", :artifice => "endpoint"
-        expect(results).to include("Installing rack 1.0.0")
-        expect(the_bundle).to include_gems "rack 1.0.0"
+        results = bundle "install", artifice: "endpoint"
+        expect(results).to include("Installing myrack 1.0.0")
+        expect(the_bundle).to include_gems "myrack 1.0.0"
       end
     end
 
     it "should install", :jruby do
-      results = bundle "install", :artifice => "endpoint"
-      expect(results).to include("Installing rack 1.0.0")
-      expect(the_bundle).to include_gems "rack 1.0.0"
+      results = bundle "install", artifice: "endpoint"
+      expect(results).to include("Installing myrack 1.0.0")
+      expect(the_bundle).to include_gems "myrack 1.0.0"
     end
 
     context "bundled for multiple platforms" do
@@ -416,7 +419,7 @@
           end
         end
 
-        build_lib "foo", :path => bundled_app do |s|
+        build_lib "foo", path: bundled_app do |s|
           if platform_specific_type == :runtime
             s.add_runtime_dependency dependency
           elsif platform_specific_type == :development
@@ -427,7 +430,7 @@
         end
 
         gemfile <<-G
-          source "#{file_uri_for(gem_repo2)}"
+          source "https://gem.repo2"
           gemspec
         G
 
@@ -436,7 +439,8 @@
 
         simulate_new_machine
         simulate_platform("jruby") { bundle "install" }
-        simulate_platform(x64_mingw32) { bundle "install" }
+        expect(lockfile).to include("platform_specific (1.0-java)")
+        simulate_platform("x64-mingw-ucrt") { bundle "install" }
       end
 
       context "on ruby" do
@@ -447,7 +451,15 @@
 
         context "as a runtime dependency" do
           it "keeps all platform dependencies in the lockfile" do
-            expect(the_bundle).to include_gems "foo 1.0", "platform_specific 1.0 RUBY"
+            expect(the_bundle).to include_gems "foo 1.0", "platform_specific 1.0 ruby"
+
+            checksums = checksums_section_when_enabled do |c|
+              c.no_checksum "foo", "1.0"
+              c.checksum gem_repo2, "platform_specific", "1.0"
+              c.checksum gem_repo2, "platform_specific", "1.0", "java"
+              c.checksum gem_repo2, "platform_specific", "1.0", "x64-mingw-ucrt"
+            end
+
             expect(lockfile).to eq <<~L
               PATH
                 remote: .
@@ -456,20 +468,20 @@
                     platform_specific
 
               GEM
-                remote: #{file_uri_for(gem_repo2)}/
+                remote: https://gem.repo2/
                 specs:
                   platform_specific (1.0)
                   platform_specific (1.0-java)
-                  #{x64_mingw_gems}
+                  platform_specific (1.0-x64-mingw-ucrt)
 
               PLATFORMS
                 java
                 ruby
-                #{x64_mingw_platforms}
+                x64-mingw-ucrt
 
               DEPENDENCIES
                 foo!
-
+              #{checksums}
               BUNDLED WITH
                  #{Bundler::VERSION}
             L
@@ -480,7 +492,15 @@
           let(:platform_specific_type) { :development }
 
           it "keeps all platform dependencies in the lockfile" do
-            expect(the_bundle).to include_gems "foo 1.0", "platform_specific 1.0 RUBY"
+            expect(the_bundle).to include_gems "foo 1.0", "platform_specific 1.0 ruby"
+
+            checksums = checksums_section_when_enabled do |c|
+              c.no_checksum "foo", "1.0"
+              c.checksum gem_repo2, "platform_specific", "1.0"
+              c.checksum gem_repo2, "platform_specific", "1.0", "java"
+              c.checksum gem_repo2, "platform_specific", "1.0", "x64-mingw-ucrt"
+            end
+
             expect(lockfile).to eq <<~L
               PATH
                 remote: .
@@ -488,21 +508,21 @@
                   foo (1.0)
 
               GEM
-                remote: #{file_uri_for(gem_repo2)}/
+                remote: https://gem.repo2/
                 specs:
                   platform_specific (1.0)
                   platform_specific (1.0-java)
-                  #{x64_mingw_gems}
+                  platform_specific (1.0-x64-mingw-ucrt)
 
               PLATFORMS
                 java
                 ruby
-                #{x64_mingw_platforms}
+                x64-mingw-ucrt
 
               DEPENDENCIES
                 foo!
                 platform_specific
-
+              #{checksums}
               BUNDLED WITH
                  #{Bundler::VERSION}
             L
@@ -514,7 +534,16 @@
           let(:dependency) { "indirect_platform_specific" }
 
           it "keeps all platform dependencies in the lockfile" do
-            expect(the_bundle).to include_gems "foo 1.0", "indirect_platform_specific 1.0", "platform_specific 1.0 RUBY"
+            expect(the_bundle).to include_gems "foo 1.0", "indirect_platform_specific 1.0", "platform_specific 1.0 ruby"
+
+            checksums = checksums_section_when_enabled do |c|
+              c.no_checksum "foo", "1.0"
+              c.checksum gem_repo2, "indirect_platform_specific", "1.0"
+              c.checksum gem_repo2, "platform_specific", "1.0"
+              c.checksum gem_repo2, "platform_specific", "1.0", "java"
+              c.checksum gem_repo2, "platform_specific", "1.0", "x64-mingw-ucrt"
+            end
+
             expect(lockfile).to eq <<~L
               PATH
                 remote: .
@@ -522,23 +551,23 @@
                   foo (1.0)
 
               GEM
-                remote: #{file_uri_for(gem_repo2)}/
+                remote: https://gem.repo2/
                 specs:
                   indirect_platform_specific (1.0)
                     platform_specific
                   platform_specific (1.0)
                   platform_specific (1.0-java)
-                  #{x64_mingw_gems}
+                  platform_specific (1.0-x64-mingw-ucrt)
 
               PLATFORMS
                 java
                 ruby
-                #{x64_mingw_platforms}
+                x64-mingw-ucrt
 
               DEPENDENCIES
                 foo!
                 indirect_platform_specific
-
+              #{checksums}
               BUNDLED WITH
                  #{Bundler::VERSION}
             L
@@ -550,10 +579,10 @@
 
   context "with multiple platforms" do
     before do
-      build_lib("foo", :path => tmp.join("foo")) do |s|
+      build_lib("foo", path: tmp("foo")) do |s|
         s.version = "1.0.0"
-        s.add_development_dependency "rack"
-        s.write "foo-universal-java.gemspec", build_spec("foo", "1.0.0", "universal-java") {|sj| sj.runtime "rack", "1.0.0" }.first.to_ruby
+        s.add_development_dependency "myrack"
+        s.write "foo-universal-java.gemspec", build_spec("foo", "1.0.0", "universal-java") {|sj| sj.runtime "myrack", "1.0.0" }.first.to_ruby
       end
     end
 
@@ -561,11 +590,11 @@
       bundle "config set --local force_ruby_platform true"
 
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
-        gemspec :path => '#{tmp.join("foo")}', :name => 'foo'
+        source "https://gem.repo1"
+        gemspec :path => '#{tmp("foo")}', :name => 'foo'
       G
 
-      expect(the_bundle).to include_gems "foo 1.0.0", "rack 1.0.0"
+      expect(the_bundle).to include_gems "foo 1.0.0", "myrack 1.0.0"
     end
 
     it "installs the ruby platform gemspec and skips dev deps with `without development` configured" do
@@ -573,56 +602,60 @@
 
       bundle "config set --local without development"
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
-        gemspec :path => '#{tmp.join("foo")}', :name => 'foo'
+        source "https://gem.repo1"
+        gemspec :path => '#{tmp("foo")}', :name => 'foo'
       G
 
       expect(the_bundle).to include_gem "foo 1.0.0"
-      expect(the_bundle).not_to include_gem "rack"
+      expect(the_bundle).not_to include_gem "myrack"
     end
   end
 
   context "with multiple platforms and resolving for more specific platforms" do
     before do
-      build_lib("chef", :path => tmp.join("chef")) do |s|
+      build_lib("chef", path: tmp("chef")) do |s|
         s.version = "17.1.17"
-        s.write "chef-universal-mingw32.gemspec", build_spec("chef", "17.1.17", "universal-mingw32") {|sw| sw.runtime "win32-api", "~> 1.5.3" }.first.to_ruby
+        s.write "chef-universal-mingw-ucrt.gemspec", build_spec("chef", "17.1.17", "universal-mingw-ucrt") {|sw| sw.runtime "win32-api", "~> 1.5.3" }.first.to_ruby
       end
     end
 
     it "does not remove the platform specific specs from the lockfile when updating" do
       build_repo4 do
         build_gem "win32-api", "1.5.3" do |s|
-          s.platform = "universal-mingw32"
+          s.platform = "universal-mingw-ucrt"
         end
       end
 
       gemfile <<-G
-        source "#{file_uri_for(gem_repo4)}"
+        source "https://gem.repo4"
         gemspec :path => "../chef"
       G
 
+      checksums = checksums_section_when_enabled do |c|
+        c.no_checksum "chef", "17.1.17"
+        c.no_checksum "chef", "17.1.17", "universal-mingw-ucrt"
+        c.checksum gem_repo4, "win32-api", "1.5.3", "universal-mingw-ucrt"
+      end
+
       initial_lockfile = <<~L
         PATH
           remote: ../chef
           specs:
             chef (17.1.17)
-            chef (17.1.17-universal-mingw32)
+            chef (17.1.17-universal-mingw-ucrt)
               win32-api (~> 1.5.3)
 
         GEM
-          remote: #{file_uri_for(gem_repo4)}/
+          remote: https://gem.repo4/
           specs:
-            win32-api (1.5.3-universal-mingw32)
+            win32-api (1.5.3-universal-mingw-ucrt)
 
         PLATFORMS
-          ruby
-          #{x64_mingw_platforms}
-          x86-mingw32
+          #{lockfile_platforms("ruby", "x64-mingw-ucrt", "x86-mingw32")}
 
         DEPENDENCIES
           chef!
-
+        #{checksums}
         BUNDLED WITH
            #{Bundler::VERSION}
       L
@@ -637,7 +670,7 @@
 
   context "with multiple locked platforms" do
     before do
-      build_lib("activeadmin", :path => tmp.join("activeadmin")) do |s|
+      build_lib("activeadmin", path: tmp("activeadmin")) do |s|
         s.version = "2.9.0"
         s.add_dependency "railties", ">= 5.2", "< 6.2"
       end
@@ -651,7 +684,7 @@
       end
 
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo4)}"
+        source "https://gem.repo4"
         gemspec :path => "../activeadmin"
         gem "jruby-openssl", :platform => :jruby
       G
@@ -660,6 +693,12 @@
     end
 
     it "does not remove the platform specific specs from the lockfile when re-resolving due to gemspec changes" do
+      checksums = checksums_section_when_enabled do |c|
+        c.no_checksum "activeadmin", "2.9.0"
+        c.checksum gem_repo4, "jruby-openssl", "0.10.7", "java"
+        c.checksum gem_repo4, "railties", "6.1.4"
+      end
+
       expect(lockfile).to eq <<~L
         PATH
           remote: ../activeadmin
@@ -668,7 +707,7 @@
               railties (>= 5.2, < 6.2)
 
         GEM
-          remote: #{file_uri_for(gem_repo4)}/
+          remote: https://gem.repo4/
           specs:
             jruby-openssl (0.10.7-java)
             railties (6.1.4)
@@ -679,12 +718,12 @@
         DEPENDENCIES
           activeadmin!
           jruby-openssl
-
+        #{checksums}
         BUNDLED WITH
            #{Bundler::VERSION}
       L
 
-      gemspec = tmp.join("activeadmin/activeadmin.gemspec")
+      gemspec = tmp("activeadmin/activeadmin.gemspec")
       File.write(gemspec, File.read(gemspec).sub(">= 5.2", ">= 6.0"))
 
       previous_lockfile = lockfile
diff --git a/spec/bundler/install/gemfile/git_spec.rb b/spec/bundler/install/gemfile/git_spec.rb
index 910f96f4ab2aa7..9104af1679aaa7 100644
--- a/spec/bundler/install/gemfile/git_spec.rb
+++ b/spec/bundler/install/gemfile/git_spec.rb
@@ -8,7 +8,7 @@
       end
 
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
+        source "https://gem.repo1"
         git "#{lib_path("foo-1.0")}" do
           gem 'foo'
         end
@@ -26,22 +26,21 @@
       expect(out).to eq("WIN")
     end
 
-    it "caches the git repo", :bundler => "< 3" do
-      expect(Dir["#{default_bundle_path}/cache/bundler/git/foo-1.0-*"]).to have_attributes :size => 1
+    it "caches the git repo" do
+      expect(Dir["#{default_bundle_path}/cache/bundler/git/foo-1.0-*"]).to have_attributes size: 1
     end
 
     it "does not write to cache on bundler/setup" do
-      cache_path = default_bundle_path.join("cache")
-      FileUtils.rm_rf(cache_path)
+      FileUtils.rm_r(default_cache_path)
       ruby "require 'bundler/setup'"
-      expect(cache_path).not_to exist
+      expect(default_cache_path).not_to exist
     end
 
     it "caches the git repo globally and properly uses the cached repo on the next invocation" do
-      simulate_new_machine
+      pristine_system_gems :bundler
       bundle "config set global_gem_cache true"
       bundle :install
-      expect(Dir["#{home}/.bundle/cache/git/foo-1.0-*"]).to have_attributes :size => 1
+      expect(Dir["#{home}/.bundle/cache/git/foo-1.0-*"]).to have_attributes size: 1
 
       bundle "install --verbose"
       expect(err).to be_empty
@@ -59,7 +58,7 @@
       bundle "update foo"
 
       sha = git.ref_for("main", 11)
-      spec_file = default_bundle_path.join("bundler/gems/foo-1.0-#{sha}/foo.gemspec")
+      spec_file = default_bundle_path("bundler/gems/foo-1.0-#{sha}/foo.gemspec")
       expect(spec_file).to exist
       ruby_code = Gem::Specification.load(spec_file.to_s).to_ruby
       file_code = File.read(spec_file)
@@ -69,8 +68,8 @@
     it "does not update the git source implicitly" do
       update_git "foo"
 
-      install_gemfile bundled_app2("Gemfile"), <<-G, :dir => bundled_app2
-        source "#{file_uri_for(gem_repo1)}"
+      install_gemfile bundled_app2("Gemfile"), <<-G, dir: bundled_app2
+        source "https://gem.repo1"
         git "#{lib_path("foo-1.0")}" do
           gem 'foo'
         end
@@ -92,8 +91,8 @@
     it "complains if pinned specs don't exist in the git repo" do
       build_git "foo"
 
-      install_gemfile <<-G, :raise_on_error => false
-        source "#{file_uri_for(gem_repo1)}"
+      install_gemfile <<-G, raise_on_error: false
+        source "https://gem.repo1"
         gem "foo", "1.1", :git => "#{lib_path("foo-1.0")}"
       G
 
@@ -105,8 +104,8 @@
         s.platform = "java"
       end
 
-      install_gemfile <<-G, :raise_on_error => false
-        source "#{file_uri_for(gem_repo1)}"
+      install_gemfile <<-G, raise_on_error: false
+        source "https://gem.repo1"
         platforms :jruby do
           gem "only_java", "1.2", :git => "#{lib_path("only_java-1.0-java")}"
         end
@@ -125,8 +124,8 @@
         s.write "only_java1-0.gemspec", File.read("#{lib_path("only_java-1.0-java")}/only_java.gemspec")
       end
 
-      install_gemfile <<-G, :raise_on_error => false
-        source "#{file_uri_for(gem_repo1)}"
+      install_gemfile <<-G, raise_on_error: false
+        source "https://gem.repo1"
         platforms :jruby do
           gem "only_java", "1.2", :git => "#{lib_path("only_java-1.1-java")}"
         end
@@ -141,7 +140,7 @@
 
       FileUtils.mv bundled_app, tmp("bundled_app.bck")
 
-      expect(the_bundle).to include_gems "foo 1.0", :dir => tmp("bundled_app.bck")
+      expect(the_bundle).to include_gems "foo 1.0", dir: tmp("bundled_app.bck")
     end
 
     it "can still install after moving the application directory" do
@@ -150,20 +149,20 @@
 
       FileUtils.mv bundled_app, tmp("bundled_app.bck")
 
-      update_git "foo", "1.1", :path => lib_path("foo-1.0")
+      update_git "foo", "1.1", path: lib_path("foo-1.0")
 
       gemfile tmp("bundled_app.bck/Gemfile"), <<-G
-        source "#{file_uri_for(gem_repo1)}"
+        source "https://gem.repo1"
         git "#{lib_path("foo-1.0")}" do
           gem 'foo'
         end
 
-        gem "rack", "1.0"
+        gem "myrack", "1.0"
       G
 
-      bundle "update foo", :dir => tmp("bundled_app.bck")
+      bundle "update foo", dir: tmp("bundled_app.bck")
 
-      expect(the_bundle).to include_gems "foo 1.1", "rack 1.0", :dir => tmp("bundled_app.bck")
+      expect(the_bundle).to include_gems "foo 1.1", "myrack 1.0", dir: tmp("bundled_app.bck")
     end
   end
 
@@ -171,8 +170,8 @@
     before do
       build_git "foo"
       gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
-        gem "rack"
+        source "https://gem.repo1"
+        gem "myrack"
 
         git "#{lib_path("foo-1.0")}" do
           # this page left intentionally blank
@@ -182,7 +181,7 @@
 
     it "does not explode" do
       bundle "install"
-      expect(the_bundle).to include_gems "rack 1.0"
+      expect(the_bundle).to include_gems "myrack 1.0"
     end
   end
 
@@ -195,7 +194,7 @@
 
     it "works" do
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
+        source "https://gem.repo1"
         git "#{lib_path("foo-1.0")}", :ref => "#{@revision}" do
           gem "foo"
         end
@@ -212,7 +211,7 @@
 
     it "works when the revision is a symbol" do
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
+        source "https://gem.repo1"
         git "#{lib_path("foo-1.0")}", :ref => #{@revision.to_sym.inspect} do
           gem "foo"
         end
@@ -229,14 +228,14 @@
 
     it "works when an abbreviated revision is added after an initial, potentially shallow clone" do
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
+        source "https://gem.repo1"
         git "#{lib_path("foo-1.0")}" do
           gem "foo"
         end
       G
 
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
+        source "https://gem.repo1"
         git "#{lib_path("foo-1.0")}", :ref => #{@revision[0..7].inspect} do
           gem "foo"
         end
@@ -245,21 +244,21 @@
 
     it "works when a tag that does not look like a commit hash is used as the value of :ref" do
       build_git "foo"
-      @remote = build_git("bar", :bare => true)
-      update_git "foo", :remote => file_uri_for(@remote.path)
-      update_git "foo", :push => "main"
+      @remote = build_git("bar", bare: true)
+      update_git "foo", remote: @remote.path
+      update_git "foo", push: "main"
 
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
+        source "https://gem.repo1"
         gem 'foo', :git => "#{@remote.path}"
       G
 
       # Create a new tag on the remote that needs fetching
-      update_git "foo", :tag => "v1.0.0"
-      update_git "foo", :push => "v1.0.0"
+      update_git "foo", tag: "v1.0.0"
+      update_git "foo", push: "v1.0.0"
 
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
+        source "https://gem.repo1"
         gem 'foo', :git => "#{@remote.path}", :ref => "v1.0.0"
       G
 
@@ -268,19 +267,19 @@
 
     it "works when the revision is a non-head ref" do
       # want to ensure we don't fallback to main
-      update_git "foo", :path => lib_path("foo-1.0") do |s|
+      update_git "foo", path: lib_path("foo-1.0") do |s|
         s.write("lib/foo.rb", "raise 'FAIL'")
       end
 
-      sys_exec("git update-ref -m \"Bundler Spec!\" refs/bundler/1 main~1", :dir => lib_path("foo-1.0"))
+      git("update-ref -m \"Bundler Spec!\" refs/bundler/1 main~1", lib_path("foo-1.0"))
 
       # want to ensure we don't fallback to HEAD
-      update_git "foo", :path => lib_path("foo-1.0"), :branch => "rando" do |s|
+      update_git "foo", path: lib_path("foo-1.0"), branch: "rando" do |s|
         s.write("lib/foo.rb", "raise 'FAIL_FROM_RANDO'")
       end
 
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
+        source "https://gem.repo1"
         git "#{lib_path("foo-1.0")}", :ref => "refs/bundler/1" do
           gem "foo"
         end
@@ -297,26 +296,26 @@
 
     it "works when the revision is a non-head ref and it was previously downloaded" do
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
+        source "https://gem.repo1"
         git "#{lib_path("foo-1.0")}" do
           gem "foo"
         end
       G
 
       # want to ensure we don't fallback to main
-      update_git "foo", :path => lib_path("foo-1.0") do |s|
+      update_git "foo", path: lib_path("foo-1.0") do |s|
         s.write("lib/foo.rb", "raise 'FAIL'")
       end
 
-      sys_exec("git update-ref -m \"Bundler Spec!\" refs/bundler/1 main~1", :dir => lib_path("foo-1.0"))
+      git("update-ref -m \"Bundler Spec!\" refs/bundler/1 main~1", lib_path("foo-1.0"))
 
       # want to ensure we don't fallback to HEAD
-      update_git "foo", :path => lib_path("foo-1.0"), :branch => "rando" do |s|
+      update_git "foo", path: lib_path("foo-1.0"), branch: "rando" do |s|
         s.write("lib/foo.rb", "raise 'FAIL_FROM_RANDO'")
       end
 
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
+        source "https://gem.repo1"
         git "#{lib_path("foo-1.0")}", :ref => "refs/bundler/1" do
           gem "foo"
         end
@@ -332,21 +331,21 @@
     end
 
     it "does not download random non-head refs" do
-      sys_exec("git update-ref -m \"Bundler Spec!\" refs/bundler/1 main~1", :dir => lib_path("foo-1.0"))
+      git("update-ref -m \"Bundler Spec!\" refs/bundler/1 main~1", lib_path("foo-1.0"))
 
       bundle "config set global_gem_cache true"
 
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
+        source "https://gem.repo1"
         git "#{lib_path("foo-1.0")}" do
           gem "foo"
         end
       G
 
       # ensure we also git fetch after cloning
-      bundle :update, :all => true
+      bundle :update, all: true
 
-      sys_exec("git ls-remote .", :dir => Dir[home(".bundle/cache/git/foo-*")].first)
+      git("ls-remote .", Dir[home(".bundle/cache/git/foo-*")].first)
 
       expect(out).not_to include("refs/bundler/1")
     end
@@ -357,10 +356,10 @@
     let(:repo) { build_git("foo").path }
 
     it "works" do
-      update_git("foo", :path => repo, :branch => branch)
+      update_git("foo", path: repo, branch: branch)
 
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
+        source "https://gem.repo1"
         git "#{repo}", :branch => #{branch.dump} do
           gem "foo"
         end
@@ -374,10 +373,10 @@
       it "works" do
         skip "git does not accept this" if Gem.win_platform?
 
-        update_git("foo", :path => repo, :branch => branch)
+        update_git("foo", path: repo, branch: branch)
 
         install_gemfile <<-G
-          source "#{file_uri_for(gem_repo1)}"
+          source "https://gem.repo1"
           git "#{repo}", :branch => #{branch.dump} do
             gem "foo"
           end
@@ -392,10 +391,10 @@
       it "works" do
         skip "git does not accept this" if Gem.win_platform?
 
-        update_git("foo", :path => repo, :branch => branch)
+        update_git("foo", path: repo, branch: branch)
 
         install_gemfile <<-G
-          source "#{file_uri_for(gem_repo1)}"
+          source "https://gem.repo1"
           git "#{repo}", :branch => #{branch.dump} do
             gem "foo"
           end
@@ -411,10 +410,10 @@
     let(:repo) { build_git("foo").path }
 
     it "works" do
-      update_git("foo", :path => repo, :tag => tag)
+      update_git("foo", path: repo, tag: tag)
 
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
+        source "https://gem.repo1"
         git "#{repo}", :tag => #{tag.dump} do
           gem "foo"
         end
@@ -428,10 +427,10 @@
       it "works" do
         skip "git does not accept this" if Gem.win_platform?
 
-        update_git("foo", :path => repo, :tag => tag)
+        update_git("foo", path: repo, tag: tag)
 
         install_gemfile <<-G
-         source "#{file_uri_for(gem_repo1)}"
+         source "https://gem.repo1"
           git "#{repo}", :tag => #{tag.dump} do
             gem "foo"
           end
@@ -446,10 +445,10 @@
       it "works" do
         skip "git does not accept this" if Gem.win_platform?
 
-        update_git("foo", :path => repo, :tag => tag)
+        update_git("foo", path: repo, tag: tag)
 
         install_gemfile <<-G
-          source "#{file_uri_for(gem_repo1)}"
+          source "https://gem.repo1"
           git "#{repo}", :tag => #{tag.dump} do
             gem "foo"
           end
@@ -462,100 +461,100 @@
 
   describe "when specifying local override" do
     it "uses the local repository instead of checking a new one out" do
-      build_git "rack", "0.8", :path => lib_path("local-rack") do |s|
-        s.write "lib/rack.rb", "puts :LOCAL"
+      build_git "myrack", "0.8", path: lib_path("local-myrack") do |s|
+        s.write "lib/myrack.rb", "puts :LOCAL"
       end
 
       gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
-        gem "rack", :git => "#{lib_path("rack-0.8")}", :branch => "main"
+        source "https://gem.repo1"
+        gem "myrack", :git => "#{lib_path("myrack-0.8")}", :branch => "main"
       G
 
-      bundle %(config set local.rack #{lib_path("local-rack")})
+      bundle %(config set local.myrack #{lib_path("local-myrack")})
       bundle :install
 
-      run "require 'rack'"
+      run "require 'myrack'"
       expect(out).to eq("LOCAL")
     end
 
     it "chooses the local repository on runtime" do
-      build_git "rack", "0.8"
+      build_git "myrack", "0.8"
 
-      FileUtils.cp_r("#{lib_path("rack-0.8")}/.", lib_path("local-rack"))
+      FileUtils.cp_r("#{lib_path("myrack-0.8")}/.", lib_path("local-myrack"))
 
-      update_git "rack", "0.8", :path => lib_path("local-rack") do |s|
-        s.write "lib/rack.rb", "puts :LOCAL"
+      update_git "myrack", "0.8", path: lib_path("local-myrack") do |s|
+        s.write "lib/myrack.rb", "puts :LOCAL"
       end
 
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
-        gem "rack", :git => "#{lib_path("rack-0.8")}", :branch => "main"
+        source "https://gem.repo1"
+        gem "myrack", :git => "#{lib_path("myrack-0.8")}", :branch => "main"
       G
 
-      bundle %(config set local.rack #{lib_path("local-rack")})
-      run "require 'rack'"
+      bundle %(config set local.myrack #{lib_path("local-myrack")})
+      run "require 'myrack'"
       expect(out).to eq("LOCAL")
     end
 
     it "unlocks the source when the dependencies have changed while switching to the local" do
-      build_git "rack", "0.8"
+      build_git "myrack", "0.8"
 
-      FileUtils.cp_r("#{lib_path("rack-0.8")}/.", lib_path("local-rack"))
+      FileUtils.cp_r("#{lib_path("myrack-0.8")}/.", lib_path("local-myrack"))
 
-      update_git "rack", "0.8", :path => lib_path("local-rack") do |s|
-        s.write "rack.gemspec", build_spec("rack", "0.8") { runtime "rspec", "> 0" }.first.to_ruby
-        s.write "lib/rack.rb", "puts :LOCAL"
+      update_git "myrack", "0.8", path: lib_path("local-myrack") do |s|
+        s.write "myrack.gemspec", build_spec("myrack", "0.8") { runtime "rspec", "> 0" }.first.to_ruby
+        s.write "lib/myrack.rb", "puts :LOCAL"
       end
 
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
-        gem "rack", :git => "#{lib_path("rack-0.8")}", :branch => "main"
+        source "https://gem.repo1"
+        gem "myrack", :git => "#{lib_path("myrack-0.8")}", :branch => "main"
       G
 
-      bundle %(config set local.rack #{lib_path("local-rack")})
+      bundle %(config set local.myrack #{lib_path("local-myrack")})
       bundle :install
-      run "require 'rack'"
+      run "require 'myrack'"
       expect(out).to eq("LOCAL")
     end
 
     it "updates specs on runtime" do
       system_gems "nokogiri-1.4.2"
 
-      build_git "rack", "0.8"
+      build_git "myrack", "0.8"
 
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
-        gem "rack", :git => "#{lib_path("rack-0.8")}", :branch => "main"
+        source "https://gem.repo1"
+        gem "myrack", :git => "#{lib_path("myrack-0.8")}", :branch => "main"
       G
 
       lockfile0 = File.read(bundled_app_lock)
 
-      FileUtils.cp_r("#{lib_path("rack-0.8")}/.", lib_path("local-rack"))
-      update_git "rack", "0.8", :path => lib_path("local-rack") do |s|
+      FileUtils.cp_r("#{lib_path("myrack-0.8")}/.", lib_path("local-myrack"))
+      update_git "myrack", "0.8", path: lib_path("local-myrack") do |s|
         s.add_dependency "nokogiri", "1.4.2"
       end
 
-      bundle %(config set local.rack #{lib_path("local-rack")})
-      run "require 'rack'"
+      bundle %(config set local.myrack #{lib_path("local-myrack")})
+      run "require 'myrack'"
 
       lockfile1 = File.read(bundled_app_lock)
       expect(lockfile1).not_to eq(lockfile0)
     end
 
     it "updates ref on install" do
-      build_git "rack", "0.8"
+      build_git "myrack", "0.8"
 
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
-        gem "rack", :git => "#{lib_path("rack-0.8")}", :branch => "main"
+        source "https://gem.repo1"
+        gem "myrack", :git => "#{lib_path("myrack-0.8")}", :branch => "main"
       G
 
       lockfile0 = File.read(bundled_app_lock)
 
-      FileUtils.cp_r("#{lib_path("rack-0.8")}/.", lib_path("local-rack"))
-      update_git "rack", "0.8", :path => lib_path("local-rack")
+      FileUtils.cp_r("#{lib_path("myrack-0.8")}/.", lib_path("local-myrack"))
+      update_git "myrack", "0.8", path: lib_path("local-myrack")
 
-      bundle %(config set local.rack #{lib_path("local-rack")})
+      bundle %(config set local.myrack #{lib_path("local-myrack")})
       bundle :install
 
       lockfile1 = File.read(bundled_app_lock)
@@ -563,18 +562,18 @@
     end
 
     it "explodes and gives correct solution if given path does not exist on install" do
-      build_git "rack", "0.8"
+      build_git "myrack", "0.8"
 
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
-        gem "rack", :git => "#{lib_path("rack-0.8")}", :branch => "main"
+        source "https://gem.repo1"
+        gem "myrack", :git => "#{lib_path("myrack-0.8")}", :branch => "main"
       G
 
-      bundle %(config set local.rack #{lib_path("local-rack")})
-      bundle :install, :raise_on_error => false
-      expect(err).to match(/Cannot use local override for rack-0.8 because #{Regexp.escape(lib_path('local-rack').to_s)} does not exist/)
+      bundle %(config set local.myrack #{lib_path("local-myrack")})
+      bundle :install, raise_on_error: false
+      expect(err).to match(/Cannot use local override for myrack-0.8 because #{Regexp.escape(lib_path("local-myrack").to_s)} does not exist/)
 
-      solution = "config unset local.rack"
+      solution = "config unset local.myrack"
       expect(err).to match(/Run `bundle #{solution}` to remove the local override/)
 
       bundle solution
@@ -584,19 +583,19 @@
     end
 
     it "explodes and gives correct solution if branch is not given on install" do
-      build_git "rack", "0.8"
-      FileUtils.cp_r("#{lib_path("rack-0.8")}/.", lib_path("local-rack"))
+      build_git "myrack", "0.8"
+      FileUtils.cp_r("#{lib_path("myrack-0.8")}/.", lib_path("local-myrack"))
 
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
-        gem "rack", :git => "#{lib_path("rack-0.8")}"
+        source "https://gem.repo1"
+        gem "myrack", :git => "#{lib_path("myrack-0.8")}"
       G
 
-      bundle %(config set local.rack #{lib_path("local-rack")})
-      bundle :install, :raise_on_error => false
-      expect(err).to match(/Cannot use local override for rack-0.8 at #{Regexp.escape(lib_path('local-rack').to_s)} because :branch is not specified in Gemfile/)
+      bundle %(config set local.myrack #{lib_path("local-myrack")})
+      bundle :install, raise_on_error: false
+      expect(err).to match(/Cannot use local override for myrack-0.8 at #{Regexp.escape(lib_path("local-myrack").to_s)} because :branch is not specified in Gemfile/)
 
-      solution = "config unset local.rack"
+      solution = "config unset local.myrack"
       expect(err).to match(/Specify a branch or run `bundle #{solution}` to remove the local override/)
 
       bundle solution
@@ -606,69 +605,69 @@
     end
 
     it "does not explode if disable_local_branch_check is given" do
-      build_git "rack", "0.8"
-      FileUtils.cp_r("#{lib_path("rack-0.8")}/.", lib_path("local-rack"))
+      build_git "myrack", "0.8"
+      FileUtils.cp_r("#{lib_path("myrack-0.8")}/.", lib_path("local-myrack"))
 
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
-        gem "rack", :git => "#{lib_path("rack-0.8")}"
+        source "https://gem.repo1"
+        gem "myrack", :git => "#{lib_path("myrack-0.8")}"
       G
 
-      bundle %(config set local.rack #{lib_path("local-rack")})
+      bundle %(config set local.myrack #{lib_path("local-myrack")})
       bundle %(config set disable_local_branch_check true)
       bundle :install
       expect(out).to match(/Bundle complete!/)
     end
 
     it "explodes on different branches on install" do
-      build_git "rack", "0.8"
+      build_git "myrack", "0.8"
 
-      FileUtils.cp_r("#{lib_path("rack-0.8")}/.", lib_path("local-rack"))
+      FileUtils.cp_r("#{lib_path("myrack-0.8")}/.", lib_path("local-myrack"))
 
-      update_git "rack", "0.8", :path => lib_path("local-rack"), :branch => "another" do |s|
-        s.write "lib/rack.rb", "puts :LOCAL"
+      update_git "myrack", "0.8", path: lib_path("local-myrack"), branch: "another" do |s|
+        s.write "lib/myrack.rb", "puts :LOCAL"
       end
 
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
-        gem "rack", :git => "#{lib_path("rack-0.8")}", :branch => "main"
+        source "https://gem.repo1"
+        gem "myrack", :git => "#{lib_path("myrack-0.8")}", :branch => "main"
       G
 
-      bundle %(config set local.rack #{lib_path("local-rack")})
-      bundle :install, :raise_on_error => false
+      bundle %(config set local.myrack #{lib_path("local-myrack")})
+      bundle :install, raise_on_error: false
       expect(err).to match(/is using branch another but Gemfile specifies main/)
     end
 
     it "explodes on invalid revision on install" do
-      build_git "rack", "0.8"
+      build_git "myrack", "0.8"
 
-      build_git "rack", "0.8", :path => lib_path("local-rack") do |s|
-        s.write "lib/rack.rb", "puts :LOCAL"
+      build_git "myrack", "0.8", path: lib_path("local-myrack") do |s|
+        s.write "lib/myrack.rb", "puts :LOCAL"
       end
 
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
-        gem "rack", :git => "#{lib_path("rack-0.8")}", :branch => "main"
+        source "https://gem.repo1"
+        gem "myrack", :git => "#{lib_path("myrack-0.8")}", :branch => "main"
       G
 
-      bundle %(config set local.rack #{lib_path("local-rack")})
-      bundle :install, :raise_on_error => false
+      bundle %(config set local.myrack #{lib_path("local-myrack")})
+      bundle :install, raise_on_error: false
       expect(err).to match(/The Gemfile lock is pointing to revision \w+/)
     end
 
     it "does not explode on invalid revision on install" do
-      build_git "rack", "0.8"
+      build_git "myrack", "0.8"
 
-      build_git "rack", "0.8", :path => lib_path("local-rack") do |s|
-        s.write "lib/rack.rb", "puts :LOCAL"
+      build_git "myrack", "0.8", path: lib_path("local-myrack") do |s|
+        s.write "lib/myrack.rb", "puts :LOCAL"
       end
 
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
-        gem "rack", :git => "#{lib_path("rack-0.8")}", :branch => "main"
+        source "https://gem.repo1"
+        gem "myrack", :git => "#{lib_path("myrack-0.8")}", :branch => "main"
       G
 
-      bundle %(config set local.rack #{lib_path("local-rack")})
+      bundle %(config set local.myrack #{lib_path("local-myrack")})
       bundle %(config set disable_local_revision_check true)
       bundle :install
       expect(out).to match(/Bundle complete!/)
@@ -693,76 +692,76 @@
     # end
 
     it "installs from git even if a newer gem is available elsewhere" do
-      build_git "rack", "0.8"
+      build_git "myrack", "0.8"
 
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
-        gem "rack", :git => "#{lib_path("rack-0.8")}"
+        source "https://gem.repo1"
+        gem "myrack", :git => "#{lib_path("myrack-0.8")}"
       G
 
-      expect(the_bundle).to include_gems "rack 0.8"
+      expect(the_bundle).to include_gems "myrack 0.8"
     end
 
     it "installs dependencies from git even if a newer gem is available elsewhere" do
-      system_gems "rack-1.0.0"
+      system_gems "myrack-1.0.0"
 
-      build_lib "rack", "1.0", :path => lib_path("nested/bar") do |s|
-        s.write "lib/rack.rb", "puts 'WIN OVERRIDE'"
+      build_lib "myrack", "1.0", path: lib_path("nested/bar") do |s|
+        s.write "lib/myrack.rb", "puts 'WIN OVERRIDE'"
       end
 
-      build_git "foo", :path => lib_path("nested") do |s|
-        s.add_dependency "rack", "= 1.0"
+      build_git "foo", path: lib_path("nested") do |s|
+        s.add_dependency "myrack", "= 1.0"
       end
 
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
+        source "https://gem.repo1"
         gem "foo", :git => "#{lib_path("nested")}"
       G
 
-      run "require 'rack'"
+      run "require 'myrack'"
       expect(out).to eq("WIN OVERRIDE")
     end
 
     it "correctly unlocks when changing to a git source" do
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
-        gem "rack", "0.9.1"
+        source "https://gem.repo1"
+        gem "myrack", "0.9.1"
       G
 
-      build_git "rack", :path => lib_path("rack")
+      build_git "myrack", path: lib_path("myrack")
 
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
-        gem "rack", "1.0.0", :git => "#{lib_path("rack")}"
+        source "https://gem.repo1"
+        gem "myrack", "1.0.0", :git => "#{lib_path("myrack")}"
       G
 
-      expect(the_bundle).to include_gems "rack 1.0.0"
+      expect(the_bundle).to include_gems "myrack 1.0.0"
     end
 
     it "correctly unlocks when changing to a git source without versions" do
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
-        gem "rack"
+        source "https://gem.repo1"
+        gem "myrack"
       G
 
-      build_git "rack", "1.2", :path => lib_path("rack")
+      build_git "myrack", "1.2", path: lib_path("myrack")
 
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
-        gem "rack", :git => "#{lib_path("rack")}"
+        source "https://gem.repo1"
+        gem "myrack", :git => "#{lib_path("myrack")}"
       G
 
-      expect(the_bundle).to include_gems "rack 1.2"
+      expect(the_bundle).to include_gems "myrack 1.2"
     end
   end
 
   describe "block syntax" do
     it "pulls all gems from a git block" do
-      build_lib "omg", :path => lib_path("hi2u/omg")
-      build_lib "hi2u", :path => lib_path("hi2u")
+      build_lib "omg", path: lib_path("hi2u/omg")
+      build_lib "hi2u", path: lib_path("hi2u")
 
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
+        source "https://gem.repo1"
         path "#{lib_path("hi2u")}" do
           gem "omg"
           gem "hi2u"
@@ -779,7 +778,7 @@
     update_git "foo"
 
     install_gemfile <<-G
-      source "#{file_uri_for(gem_repo1)}"
+      source "https://gem.repo1"
       gem "foo", :git => "#{lib_path("foo-1.0")}", :ref => "#{@revision}"
     G
 
@@ -797,7 +796,7 @@
     end
 
     install_gemfile <<-G
-      source "#{file_uri_for(gem_repo1)}"
+      source "https://gem.repo1"
       gem "foo", :git => "#{lib_path("foo-1.0")}"
       gem "rails", "2.3.2"
     G
@@ -807,7 +806,7 @@
   end
 
   it "runs the gemspec in the context of its parent directory" do
-    build_lib "bar", :path => lib_path("foo/bar"), :gemspec => false do |s|
+    build_lib "bar", path: lib_path("foo/bar"), gemspec: false do |s|
       s.write lib_path("foo/bar/lib/version.rb"), %(BAR_VERSION = '1.0')
       s.write "bar.gemspec", <<-G
         $:.unshift Dir.pwd
@@ -822,12 +821,12 @@
       G
     end
 
-    build_git "foo", :path => lib_path("foo") do |s|
+    build_git "foo", path: lib_path("foo") do |s|
       s.write "bin/foo", ""
     end
 
     install_gemfile <<-G
-      source "#{file_uri_for(gem_repo1)}"
+      source "https://gem.repo1"
       gem "bar", :git => "#{lib_path("foo")}"
       gem "rails", "2.3.2"
     G
@@ -836,15 +835,41 @@
     expect(the_bundle).to include_gems "rails 2.3.2"
   end
 
+  it "runs the gemspec in the context of its parent directory, when using local overrides" do
+    build_git "foo", path: lib_path("foo"), gemspec: false do |s|
+      s.write lib_path("foo/lib/foo/version.rb"), %(FOO_VERSION = '1.0')
+      s.write "foo.gemspec", <<-G
+        $:.unshift Dir.pwd
+        require 'lib/foo/version'
+        Gem::Specification.new do |s|
+          s.name        = 'foo'
+          s.author      = 'no one'
+          s.version     = FOO_VERSION
+          s.summary     = 'Foo'
+          s.files       = Dir["lib/**/*.rb"]
+        end
+      G
+    end
+
+    gemfile <<-G
+      source "https://gem.repo1"
+      gem "foo", :git => "https://github.com/gems/foo", branch: "main"
+    G
+
+    bundle %(config set local.foo #{lib_path("foo")})
+
+    expect(the_bundle).to include_gems "foo 1.0"
+  end
+
   it "installs from git even if a rubygems gem is present" do
-    build_gem "foo", "1.0", :path => lib_path("fake_foo"), :to_system => true do |s|
+    build_gem "foo", "1.0", path: lib_path("fake_foo"), to_system: true do |s|
       s.write "lib/foo.rb", "raise 'FAIL'"
     end
 
     build_git "foo", "1.0"
 
     install_gemfile <<-G
-      source "#{file_uri_for(gem_repo1)}"
+      source "https://gem.repo1"
       gem "foo", "1.0", :git => "#{lib_path("foo-1.0")}"
     G
 
@@ -852,10 +877,10 @@
   end
 
   it "fakes the gem out if there is no gemspec" do
-    build_git "foo", :gemspec => false
+    build_git "foo", gemspec: false
 
     install_gemfile <<-G
-      source "#{file_uri_for(gem_repo1)}"
+      source "https://gem.repo1"
       gem "foo", "1.0", :git => "#{lib_path("foo-1.0")}"
       gem "rails", "2.3.2"
     G
@@ -866,11 +891,11 @@
 
   it "catches git errors and spits out useful output" do
     gemfile <<-G
-      source "#{file_uri_for(gem_repo1)}"
+      source "https://gem.repo1"
       gem "foo", "1.0", :git => "omgomg"
     G
 
-    bundle :install, :raise_on_error => false
+    bundle :install, raise_on_error: false
 
     expect(err).to include("Git error:")
     expect(err).to include("fatal")
@@ -878,10 +903,10 @@
   end
 
   it "works when the gem path has spaces in it" do
-    build_git "foo", :path => lib_path("foo space-1.0")
+    build_git "foo", path: lib_path("foo space-1.0")
 
     install_gemfile <<-G
-      source "#{file_uri_for(gem_repo1)}"
+      source "https://gem.repo1"
       gem "foo", :git => "#{lib_path("foo space-1.0")}"
     G
 
@@ -892,7 +917,7 @@
     build_git "forced", "1.0"
 
     install_gemfile <<-G
-      source "#{file_uri_for(gem_repo1)}"
+      source "https://gem.repo1"
       git "#{lib_path("forced-1.0")}" do
         gem 'forced'
       end
@@ -903,12 +928,12 @@
       s.write "lib/forced.rb", "FORCED = '1.1'"
     end
 
-    bundle "update", :all => true
+    bundle "update", all: true
     expect(the_bundle).to include_gems "forced 1.1"
 
-    sys_exec("git reset --hard HEAD^", :dir => lib_path("forced-1.0"))
+    git("reset --hard HEAD^", lib_path("forced-1.0"))
 
-    bundle "update", :all => true
+    bundle "update", all: true
     expect(the_bundle).to include_gems "forced 1.0"
   end
 
@@ -920,16 +945,16 @@
     build_git "has_submodule", "1.0" do |s|
       s.add_dependency "submodule"
     end
-    sys_exec "git submodule add #{lib_path("submodule-1.0")} submodule-1.0", :dir => lib_path("has_submodule-1.0")
-    sys_exec "git commit -m \"submodulator\"", :dir => lib_path("has_submodule-1.0")
+    git "submodule add #{lib_path("submodule-1.0")} submodule-1.0", lib_path("has_submodule-1.0")
+    git "commit -m \"submodulator\"", lib_path("has_submodule-1.0")
 
-    install_gemfile <<-G, :raise_on_error => false
-      source "#{file_uri_for(gem_repo1)}"
+    install_gemfile <<-G, raise_on_error: false
+      source "https://gem.repo1"
       git "#{lib_path("has_submodule-1.0")}" do
         gem "has_submodule"
       end
     G
-    expect(err).to match(%r{submodule >= 0 could not be found in rubygems repository #{file_uri_for(gem_repo1)}/ or installed locally})
+    expect(err).to match(%r{submodule >= 0 could not be found in rubygems repository https://gem.repo1/ or installed locally})
 
     expect(the_bundle).not_to include_gems "has_submodule 1.0"
   end
@@ -942,11 +967,11 @@
     build_git "has_submodule", "1.0" do |s|
       s.add_dependency "submodule"
     end
-    sys_exec "git submodule add #{lib_path("submodule-1.0")} submodule-1.0", :dir => lib_path("has_submodule-1.0")
-    sys_exec "git commit -m \"submodulator\"", :dir => lib_path("has_submodule-1.0")
+    git "submodule add #{lib_path("submodule-1.0")} submodule-1.0", lib_path("has_submodule-1.0")
+    git "commit -m \"submodulator\"", lib_path("has_submodule-1.0")
 
     install_gemfile <<-G
-      source "#{file_uri_for(gem_repo1)}"
+      source "https://gem.repo1"
       git "#{lib_path("has_submodule-1.0")}", :submodules => true do
         gem "has_submodule"
       end
@@ -962,11 +987,11 @@
     build_git "submodule", "1.0"
     build_git "has_submodule", "1.0"
 
-    sys_exec "git submodule add #{lib_path("submodule-1.0")} submodule-1.0", :dir => lib_path("has_submodule-1.0")
-    sys_exec "git commit -m \"submodulator\"", :dir => lib_path("has_submodule-1.0")
+    git "submodule add #{lib_path("submodule-1.0")} submodule-1.0", lib_path("has_submodule-1.0")
+    git "commit -m \"submodulator\"", lib_path("has_submodule-1.0")
 
     install_gemfile <<-G
-      source "#{file_uri_for(gem_repo1)}"
+      source "https://gem.repo1"
       git "#{lib_path("has_submodule-1.0")}" do
         gem "has_submodule"
       end
@@ -981,7 +1006,7 @@
     git = build_git "foo"
 
     install_gemfile <<-G
-      source "#{file_uri_for(gem_repo1)}"
+      source "https://gem.repo1"
       git "#{lib_path("foo-1.0")}" do
         gem "foo"
       end
@@ -991,7 +1016,7 @@
     update_git "foo"
 
     install_gemfile <<-G
-      source "#{file_uri_for(gem_repo1)}"
+      source "https://gem.repo1"
       git "#{lib_path("foo-1.0")}", :ref => "#{git.ref_for("HEAD^")}" do
         gem "foo"
       end
@@ -1009,11 +1034,11 @@
     build_git "foo"
 
     install_gemfile <<-G
-      source "#{file_uri_for(gem_repo1)}"
+      source "https://gem.repo1"
       gem "foo", :git => "#{lib_path("foo-1.0")}"
     G
 
-    FileUtils.rm_rf(lib_path("foo-1.0"))
+    FileUtils.rm_r(lib_path("foo-1.0"))
 
     bundle "install"
     expect(out).not_to match(/updating/i)
@@ -1023,7 +1048,7 @@
     build_git "foo"
 
     gemfile <<-G
-      source "#{file_uri_for(gem_repo1)}"
+      source "https://gem.repo1"
       gem "foo", :git => "#{lib_path("foo-1.0")}"
     G
 
@@ -1037,26 +1062,26 @@
     FileUtils.mkdir_p(default_bundle_path)
     FileUtils.touch(default_bundle_path("bundler"))
 
-    install_gemfile <<-G, :raise_on_error => false
-      source "#{file_uri_for(gem_repo1)}"
+    install_gemfile <<-G, raise_on_error: false
+      source "https://gem.repo1"
       gem "foo", :git => "#{lib_path("foo-1.0")}"
     G
 
-    expect(exitstatus).to_not eq(0)
+    expect(last_command).to be_failure
     expect(err).to include("Bundler could not install a gem because it " \
                            "needs to create a directory, but a file exists " \
                            "- #{default_bundle_path("bundler")}")
   end
 
   it "does not duplicate git gem sources" do
-    build_lib "foo", :path => lib_path("nested/foo")
-    build_lib "bar", :path => lib_path("nested/bar")
+    build_lib "foo", path: lib_path("nested/foo")
+    build_lib "bar", path: lib_path("nested/bar")
 
-    build_git "foo", :path => lib_path("nested")
-    build_git "bar", :path => lib_path("nested")
+    build_git "foo", path: lib_path("nested")
+    build_git "bar", path: lib_path("nested")
 
     install_gemfile <<-G
-      source "#{file_uri_for(gem_repo1)}"
+      source "https://gem.repo1"
       gem "foo", :git => "#{lib_path("nested")}"
       gem "bar", :git => "#{lib_path("nested")}"
     G
@@ -1066,21 +1091,21 @@
 
   describe "switching sources" do
     it "doesn't explode when switching Path to Git sources" do
-      build_gem "foo", "1.0", :to_system => true do |s|
+      build_gem "foo", "1.0", to_system: true do |s|
         s.write "lib/foo.rb", "raise 'fail'"
       end
-      build_lib "foo", "1.0", :path => lib_path("bar/foo")
-      build_git "bar", "1.0", :path => lib_path("bar") do |s|
+      build_lib "foo", "1.0", path: lib_path("bar/foo")
+      build_git "bar", "1.0", path: lib_path("bar") do |s|
         s.add_dependency "foo"
       end
 
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
+        source "https://gem.repo1"
         gem "bar", :path => "#{lib_path("bar")}"
       G
 
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
+        source "https://gem.repo1"
         gem "bar", :git => "#{lib_path("bar")}"
       G
 
@@ -1089,24 +1114,67 @@
 
     it "doesn't explode when switching Gem to Git source" do
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
-        gem "rack-obama"
-        gem "rack", "1.0.0"
+        source "https://gem.repo1"
+        gem "myrack-obama"
+        gem "myrack", "1.0.0"
       G
 
-      build_git "rack", "1.0" do |s|
+      build_git "myrack", "1.0" do |s|
         s.write "lib/new_file.rb", "puts 'USING GIT'"
       end
 
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
-        gem "rack-obama"
-        gem "rack", "1.0.0", :git => "#{lib_path("rack-1.0")}"
+        source "https://gem.repo1"
+        gem "myrack-obama"
+        gem "myrack", "1.0.0", :git => "#{lib_path("myrack-1.0")}"
       G
 
       run "require 'new_file'"
       expect(out).to eq("USING GIT")
     end
+
+    it "doesn't explode when removing an explicit exact version from a git gem with dependencies" do
+      build_lib "activesupport", "7.1.4", path: lib_path("rails/activesupport")
+      build_git "rails", "7.1.4", path: lib_path("rails") do |s|
+        s.add_dependency "activesupport", "= 7.1.4"
+      end
+
+      install_gemfile <<-G
+        source "https://gem.repo1"
+        gem "rails", "7.1.4", :git => "#{lib_path("rails")}"
+      G
+
+      install_gemfile <<-G
+        source "https://gem.repo1"
+        gem "rails", :git => "#{lib_path("rails")}"
+      G
+
+      expect(the_bundle).to include_gem "rails 7.1.4", "activesupport 7.1.4"
+    end
+
+    it "doesn't explode when adding an explicit ref to a git gem with dependencies" do
+      lib_root = lib_path("rails")
+
+      build_lib "activesupport", "7.1.4", path: lib_root.join("activesupport")
+      build_git "rails", "7.1.4", path: lib_root do |s|
+        s.add_dependency "activesupport", "= 7.1.4"
+      end
+
+      old_revision = revision_for(lib_root)
+      update_git "rails", "7.1.4", path: lib_root
+
+      install_gemfile <<-G
+        source "https://gem.repo1"
+        gem "rails", "7.1.4", :git => "#{lib_root}"
+      G
+
+      install_gemfile <<-G
+        source "https://gem.repo1"
+        gem "rails", :git => "#{lib_root}", :ref => "#{old_revision}"
+      G
+
+      expect(the_bundle).to include_gem "rails 7.1.4", "activesupport 7.1.4"
+    end
   end
 
   describe "bundle install after the remote has been updated" do
@@ -1114,8 +1182,8 @@
       build_git "valim"
 
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
-        gem "valim", :git => "#{file_uri_for(lib_path("valim-1.0"))}"
+        source "https://gem.repo1"
+        gem "valim", :git => "#{lib_path("valim-1.0")}"
       G
 
       old_revision = revision_for(lib_path("valim-1.0"))
@@ -1140,14 +1208,14 @@
       revision = revision_for(lib_path("foo-1.0"))
 
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
-        gem "foo", :git => "#{file_uri_for(lib_path("foo-1.0"))}", :ref => "#{revision}"
+        source "https://gem.repo1"
+        gem "foo", :git => "#{lib_path("foo-1.0")}", :ref => "#{revision}"
       G
       expect(out).to_not match(/Revision.*does not exist/)
 
-      install_gemfile <<-G, :raise_on_error => false
-        source "#{file_uri_for(gem_repo1)}"
-        gem "foo", :git => "#{file_uri_for(lib_path("foo-1.0"))}", :ref => "deadbeef"
+      install_gemfile <<-G, raise_on_error: false
+        source "https://gem.repo1"
+        gem "foo", :git => "#{lib_path("foo-1.0")}", :ref => "deadbeef"
       G
       expect(err).to include("Revision deadbeef does not exist in the repository")
     end
@@ -1155,9 +1223,9 @@
     it "gives a helpful error message when the remote branch no longer exists" do
       build_git "foo"
 
-      install_gemfile <<-G, :env => { "LANG" => "en" }, :raise_on_error => false
-        source "#{file_uri_for(gem_repo1)}"
-        gem "foo", :git => "#{file_uri_for(lib_path("foo-1.0"))}", :branch => "deadbeef"
+      install_gemfile <<-G, env: { "LANG" => "en" }, raise_on_error: false
+        source "https://gem.repo1"
+        gem "foo", :git => "#{lib_path("foo-1.0")}", :branch => "deadbeef"
       G
 
       expect(err).to include("Revision deadbeef does not exist in the repository")
@@ -1166,14 +1234,14 @@
 
   describe "bundle install with deployment mode configured and git sources" do
     it "works" do
-      build_git "valim", :path => lib_path("valim")
+      build_git "valim", path: lib_path("valim")
 
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
+        source "https://gem.repo1"
         gem "valim", "= 1.0", :git => "#{lib_path("valim")}"
       G
 
-      simulate_new_machine
+      pristine_system_gems :bundler
 
       bundle "config set --local deployment true"
       bundle :install
@@ -1184,7 +1252,7 @@
     it "runs pre-install hooks" do
       build_git "foo"
       gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
+        source "https://gem.repo1"
         gem "foo", :git => "#{lib_path("foo-1.0")}"
       G
 
@@ -1197,14 +1265,14 @@
       end
 
       bundle :install,
-        :requires => [lib_path("install_hooks.rb")]
+        requires: [lib_path("install_hooks.rb")]
       expect(err_without_deprecations).to eq("Ran pre-install hook: foo-1.0")
     end
 
     it "runs post-install hooks" do
       build_git "foo"
       gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
+        source "https://gem.repo1"
         gem "foo", :git => "#{lib_path("foo-1.0")}"
       G
 
@@ -1217,14 +1285,14 @@
       end
 
       bundle :install,
-        :requires => [lib_path("install_hooks.rb")]
+        requires: [lib_path("install_hooks.rb")]
       expect(err_without_deprecations).to eq("Ran post-install hook: foo-1.0")
     end
 
     it "complains if the install hook fails" do
       build_git "foo"
       gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
+        source "https://gem.repo1"
         gem "foo", :git => "#{lib_path("foo-1.0")}"
       G
 
@@ -1236,7 +1304,7 @@
         H
       end
 
-      bundle :install, :requires => [lib_path("install_hooks.rb")], :raise_on_error => false
+      bundle :install, requires: [lib_path("install_hooks.rb")], raise_on_error: false
       expect(err).to include("failed for foo-1.0")
     end
   end
@@ -1258,7 +1326,7 @@
       end
 
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
+        source "https://gem.repo1"
         gem "foo", :git => "#{lib_path("foo-1.0")}"
       G
 
@@ -1275,11 +1343,10 @@
     end
 
     it "does not use old extension after ref changes" do
-      git_reader = build_git "foo", :no_default => true do |s|
+      git_reader = build_git "foo", no_default: true do |s|
         s.extensions = ["ext/extconf.rb"]
         s.write "ext/extconf.rb", <<-RUBY
           require "mkmf"
-          $extout = "$(topdir)/" + RbConfig::CONFIG["EXTOUT"]
           create_makefile("foo")
         RUBY
         s.write "ext/foo.c", "void Init_foo() {}"
@@ -1293,12 +1360,12 @@
             void Init_foo() { rb_define_global_function("foo", &foo, 0); }
           C
         end
-        sys_exec("git commit -m \"commit for iteration #{i}\" ext/foo.c", :dir => git_reader.path)
+        git("commit -m \"commit for iteration #{i}\" ext/foo.c", git_reader.path)
 
         git_commit_sha = git_reader.ref_for("HEAD")
 
         install_gemfile <<-G
-          source "#{file_uri_for(gem_repo1)}"
+          source "https://gem.repo1"
           gem "foo", :git => "#{lib_path("foo-1.0")}", :ref => "#{git_commit_sha}"
         G
 
@@ -1322,8 +1389,8 @@
         RUBY
       end
 
-      install_gemfile <<-G, :raise_on_error => false
-        source "#{file_uri_for(gem_repo1)}"
+      install_gemfile <<-G, raise_on_error: false
+        source "https://gem.repo1"
         gem "foo", :git => "#{lib_path("foo-1.0")}"
       G
 
@@ -1353,7 +1420,7 @@
       end
 
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
+        source "https://gem.repo1"
         gem "foo", :git => "#{lib_path("foo-1.0")}"
       G
 
@@ -1366,7 +1433,7 @@
       expect(installed_time).to match(/\A\d+\.\d+\z/)
 
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
+        source "https://gem.repo1"
         gem "foo", :git => "#{lib_path("foo-1.0")}"
       G
 
@@ -1394,8 +1461,8 @@
       end
 
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
-        gem "rack", "0.9.1"
+        source "https://gem.repo1"
+        gem "myrack", "0.9.1"
         gem "foo", :git => "#{lib_path("foo-1.0")}"
       G
 
@@ -1408,8 +1475,8 @@
       expect(installed_time).to match(/\A\d+\.\d+\z/)
 
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
-        gem "rack", "1.0.0"
+        source "https://gem.repo1"
+        gem "myrack", "1.0.0"
         gem "foo", :git => "#{lib_path("foo-1.0")}"
       G
 
@@ -1437,7 +1504,7 @@
       end
 
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
+        source "https://gem.repo1"
         gem "foo", :git => "#{lib_path("foo-1.0")}"
       G
 
@@ -1448,12 +1515,12 @@
 
       installed_time = out
 
-      update_git("foo", :branch => "branch2")
+      update_git("foo", branch: "branch2")
 
       expect(installed_time).to match(/\A\d+\.\d+\z/)
 
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
+        source "https://gem.repo1"
         gem "foo", :git => "#{lib_path("foo-1.0")}", :branch => "branch2"
       G
 
@@ -1486,7 +1553,7 @@
       ENV["GIT_WORK_TREE"] = "bar"
 
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
+        source "https://gem.repo1"
         git "#{lib_path("xxxxxx-1.0")}" do
           gem 'xxxxxx'
         end
@@ -1500,7 +1567,7 @@
   describe "without git installed" do
     it "prints a better error message when installing" do
       gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
+        source "https://gem.repo1"
 
         gem "rake", git: "https://github.com/ruby/rake"
       G
@@ -1527,7 +1594,7 @@
       L
 
       with_path_as("") do
-        bundle "install", :raise_on_error => false
+        bundle "install", raise_on_error: false
       end
       expect(err).
         to include("You need to install git to be able to use gems from git repositories. For help installing git, please refer to GitHub's tutorial at https://help.github.com/articles/set-up-git")
@@ -1537,33 +1604,33 @@
       build_git "foo"
 
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
+        source "https://gem.repo1"
         git "#{lib_path("foo-1.0")}" do
           gem 'foo'
         end
       G
 
       with_path_as("") do
-        bundle "update", :all => true, :raise_on_error => false
+        bundle "update", all: true, raise_on_error: false
       end
       expect(err).
         to include("You need to install git to be able to use gems from git repositories. For help installing git, please refer to GitHub's tutorial at https://help.github.com/articles/set-up-git")
     end
 
-    it "installs a packaged git gem successfully" do
+    it "doesn't need git in the new machine if an installed git gem is copied to another machine" do
       build_git "foo"
 
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
+        source "https://gem.repo1"
         git "#{lib_path("foo-1.0")}" do
           gem 'foo'
         end
       G
-      bundle "config set cache_all true"
-      bundle :cache
-      simulate_new_machine
+      bundle "config set --global path vendor/bundle"
+      bundle :install
+      pristine_system_gems :bundler
 
-      bundle "install", :env => { "PATH" => "" }
+      bundle "install", env: { "PATH" => "" }
       expect(out).to_not include("You need to install git to be able to use gems from git repositories.")
     end
   end
@@ -1581,10 +1648,10 @@
       end
 
       it "installs successfully" do
-        build_git "foo", "1.0", :path => lib_path("foo")
+        build_git "foo", "1.0", path: lib_path("foo")
 
         gemfile <<-G
-          source "#{file_uri_for(gem_repo1)}"
+          source "https://gem.repo1"
           gem "foo", :git => "#{lib_path("foo")}", :branch => "main"
         G
 
@@ -1599,14 +1666,14 @@
       let(:credentials) { "user1:password1" }
 
       it "does not display the password" do
-        install_gemfile <<-G, :raise_on_error => false
-          source "#{file_uri_for(gem_repo1)}"
+        install_gemfile <<-G, raise_on_error: false
+          source "https://gem.repo1"
           git "https://#{credentials}@github.com/company/private-repo" do
             gem "foo"
           end
         G
 
-        expect(last_command.stdboth).to_not include("password1")
+        expect(stdboth).to_not include("password1")
         expect(out).to include("Fetching https://user1@github.com/company/private-repo")
       end
     end
@@ -1615,14 +1682,14 @@
       let(:credentials) { "oauth_token" }
 
       it "displays the oauth scheme but not the oauth token" do
-        install_gemfile <<-G, :raise_on_error => false
-          source "#{file_uri_for(gem_repo1)}"
+        install_gemfile <<-G, raise_on_error: false
+          source "https://gem.repo1"
           git "https://#{credentials}:x-oauth-basic@github.com/company/private-repo" do
             gem "foo"
           end
         G
 
-        expect(last_command.stdboth).to_not include("oauth_token")
+        expect(stdboth).to_not include("oauth_token")
         expect(out).to include("Fetching https://x-oauth-basic@github.com/company/private-repo")
       end
     end
diff --git a/spec/bundler/install/gemfile/groups_spec.rb b/spec/bundler/install/gemfile/groups_spec.rb
index 734e012e849b73..52a34715780a04 100644
--- a/spec/bundler/install/gemfile/groups_spec.rb
+++ b/spec/bundler/install/gemfile/groups_spec.rb
@@ -4,8 +4,8 @@
   describe "installing with no options" do
     before :each do
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
-        gem "rack"
+        source "https://gem.repo1"
+        gem "myrack"
         group :emo do
           gem "activesupport", "2.3.5"
         end
@@ -14,7 +14,7 @@
     end
 
     it "installs gems in the default group" do
-      expect(the_bundle).to include_gems "rack 1.0.0"
+      expect(the_bundle).to include_gems "myrack 1.0.0"
     end
 
     it "installs gems in a group block into that group" do
@@ -40,7 +40,7 @@
     end
 
     it "sets up everything if Bundler.setup is used with no groups" do
-      output = run("require 'rack'; puts RACK")
+      output = run("require 'myrack'; puts MYRACK")
       expect(output).to eq("1.0.0")
 
       output = run("require 'activesupport'; puts ACTIVESUPPORT")
@@ -74,8 +74,8 @@
     describe "with gems assigned to a single group" do
       before :each do
         gemfile <<-G
-          source "#{file_uri_for(gem_repo1)}"
-          gem "rack"
+          source "https://gem.repo1"
+          gem "myrack"
           group :emo do
             gem "activesupport", "2.3.5"
           end
@@ -88,32 +88,32 @@
       it "installs gems in the default group" do
         bundle "config set --local without emo"
         bundle :install
-        expect(the_bundle).to include_gems "rack 1.0.0", :groups => [:default]
+        expect(the_bundle).to include_gems "myrack 1.0.0", groups: [:default]
       end
 
       it "respects global `without` configuration, but does not save it locally" do
         bundle "config set --global without emo"
         bundle :install
-        expect(the_bundle).to include_gems "rack 1.0.0", :groups => [:default]
+        expect(the_bundle).to include_gems "myrack 1.0.0", groups: [:default]
         bundle "config list"
         expect(out).not_to include("Set for your local app (#{bundled_app(".bundle/config")}): [:emo]")
         expect(out).to include("Set for the current user (#{home(".bundle/config")}): [:emo]")
       end
 
-      it "allows running application where groups where configured by a different user", :bundler => "< 3" do
+      it "allows running application where groups where configured by a different user" do
         bundle "config set without emo"
         bundle :install
-        bundle "exec ruby -e 'puts 42'", :env => { "BUNDLE_USER_HOME" => tmp("new_home").to_s }
+        bundle "exec ruby -e 'puts 42'", env: { "BUNDLE_USER_HOME" => tmp("new_home").to_s }
         expect(out).to include("42")
       end
 
       it "does not install gems from the excluded group" do
         bundle "config set --local without emo"
         bundle :install
-        expect(the_bundle).not_to include_gems "activesupport 2.3.5", :groups => [:default]
+        expect(the_bundle).not_to include_gems "activesupport 2.3.5", groups: [:default]
       end
 
-      it "remembers previous exclusion with `--without`", :bundler => "< 3" do
+      it "remembers previous exclusion with `--without`" do
         bundle "install --without emo"
         expect(the_bundle).not_to include_gems "activesupport 2.3.5"
         bundle :install
@@ -129,13 +129,13 @@
       it "allows Bundler.setup for specific groups" do
         bundle "config set --local without emo"
         bundle :install
-        run("require 'rack'; puts RACK", :default)
+        run("require 'myrack'; puts MYRACK", :default)
         expect(out).to eq("1.0.0")
       end
 
       it "does not effect the resolve" do
         gemfile <<-G
-          source "#{file_uri_for(gem_repo1)}"
+          source "https://gem.repo1"
           gem "activesupport"
           group :emo do
             gem "rails", "2.3.2"
@@ -144,7 +144,7 @@
 
         bundle "config set --local without emo"
         bundle :install
-        expect(the_bundle).to include_gems "activesupport 2.3.2", :groups => [:default]
+        expect(the_bundle).to include_gems "activesupport 2.3.2", groups: [:default]
       end
 
       it "still works when BUNDLE_WITHOUT is set" do
@@ -153,20 +153,20 @@
         bundle :install
         expect(out).not_to include("activesupport")
 
-        expect(the_bundle).to include_gems "rack 1.0.0", :groups => [:default]
-        expect(the_bundle).not_to include_gems "activesupport 2.3.5", :groups => [:default]
+        expect(the_bundle).to include_gems "myrack 1.0.0", groups: [:default]
+        expect(the_bundle).not_to include_gems "activesupport 2.3.5", groups: [:default]
 
         ENV["BUNDLE_WITHOUT"] = nil
       end
 
-      it "clears --without when passed an empty list", :bundler => "< 3" do
+      it "clears --without when passed an empty list" do
         bundle "install --without emo"
 
         bundle "install --without ''"
         expect(the_bundle).to include_gems "activesupport 2.3.5"
       end
 
-      it "doesn't clear without when nothing is passed", :bundler => "< 3" do
+      it "doesn't clear without when nothing is passed" do
         bundle "install --without emo"
 
         bundle :install
@@ -184,7 +184,7 @@
         expect(the_bundle).to include_gems "thin 1.0"
       end
 
-      it "installs gems from the previously requested group", :bundler => "< 3" do
+      it "installs gems from the previously requested group" do
         bundle "install --with debugging"
         expect(the_bundle).to include_gems "thin 1.0"
         bundle :install
@@ -198,26 +198,26 @@
         ENV["BUNDLE_WITH"] = nil
       end
 
-      it "clears --with when passed an empty list", :bundler => "< 3" do
+      it "clears --with when passed an empty list" do
         bundle "install --with debugging"
         bundle "install --with ''"
         expect(the_bundle).not_to include_gems "thin 1.0"
       end
 
-      it "removes groups from without when passed at --with", :bundler => "< 3" do
+      it "removes groups from without when passed at --with" do
         bundle "config set --local without emo"
         bundle "install --with emo"
         expect(the_bundle).to include_gems "activesupport 2.3.5"
       end
 
-      it "removes groups from with when passed at --without", :bundler => "< 3" do
+      it "removes groups from with when passed at --without" do
         bundle "config set --local with debugging"
-        bundle "install --without debugging", :raise_on_error => false
+        bundle "install --without debugging", raise_on_error: false
         expect(the_bundle).not_to include_gem "thin 1.0"
       end
 
-      it "errors out when passing a group to with and without via CLI flags", :bundler => "< 3" do
-        bundle "install --with emo debugging --without emo", :raise_on_error => false
+      it "errors out when passing a group to with and without via CLI flags" do
+        bundle "install --with emo debugging --without emo", raise_on_error: false
         expect(last_command).to be_failure
         expect(err).to include("The offending groups are: emo")
       end
@@ -235,7 +235,7 @@
         expect(the_bundle).to include_gem "thin 1.0"
       end
 
-      it "can add and remove a group at the same time", :bundler => "< 3" do
+      it "can add and remove a group at the same time" do
         bundle "install --with debugging --without emo"
         expect(the_bundle).to include_gems "thin 1.0"
         expect(the_bundle).not_to include_gems "activesupport 2.3.5"
@@ -257,8 +257,8 @@
     describe "with gems assigned to multiple groups" do
       before :each do
         gemfile <<-G
-          source "#{file_uri_for(gem_repo1)}"
-          gem "rack"
+          source "https://gem.repo1"
+          gem "myrack"
           group :emo, :lolercoaster do
             gem "activesupport", "2.3.5"
           end
@@ -268,20 +268,20 @@
       it "installs gems in the default group" do
         bundle "config set --local without emo lolercoaster"
         bundle :install
-        expect(the_bundle).to include_gems "rack 1.0.0"
+        expect(the_bundle).to include_gems "myrack 1.0.0"
       end
 
       it "installs the gem if any of its groups are installed" do
         bundle "config set --local without emo"
         bundle :install
-        expect(the_bundle).to include_gems "rack 1.0.0", "activesupport 2.3.5"
+        expect(the_bundle).to include_gems "myrack 1.0.0", "activesupport 2.3.5"
       end
 
       describe "with a gem defined multiple times in different groups" do
         before :each do
           gemfile <<-G
-            source "#{file_uri_for(gem_repo1)}"
-            gem "rack"
+            source "https://gem.repo1"
+            gem "myrack"
 
             group :emo do
               gem "activesupport", "2.3.5"
@@ -316,8 +316,8 @@
     describe "nesting groups" do
       before :each do
         gemfile <<-G
-          source "#{file_uri_for(gem_repo1)}"
-          gem "rack"
+          source "https://gem.repo1"
+          gem "myrack"
           group :emo do
             group :lolercoaster do
               gem "activesupport", "2.3.5"
@@ -329,13 +329,13 @@
       it "installs gems in the default group" do
         bundle "config set --local without emo lolercoaster"
         bundle :install
-        expect(the_bundle).to include_gems "rack 1.0.0"
+        expect(the_bundle).to include_gems "myrack 1.0.0"
       end
 
       it "installs the gem if any of its groups are installed" do
         bundle "config set --local without emo"
         bundle :install
-        expect(the_bundle).to include_gems "rack 1.0.0", "activesupport 2.3.5"
+        expect(the_bundle).to include_gems "myrack 1.0.0", "activesupport 2.3.5"
       end
     end
   end
@@ -343,16 +343,16 @@
   describe "when loading only the default group" do
     it "should not load all groups" do
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
-        gem "rack"
+        source "https://gem.repo1"
+        gem "myrack"
         gem "activesupport", :groups => :development
       G
 
       ruby <<-R
-        require "#{entrypoint}"
+        require "bundler"
         Bundler.setup :default
         Bundler.require :default
-        puts RACK
+        puts MYRACK
         begin
           require "activesupport"
         rescue LoadError
@@ -369,35 +369,35 @@
     before(:each) do
       build_repo2
 
-      system_gems "rack-0.9.1"
+      system_gems "myrack-0.9.1"
 
-      bundle "config set --local without rack"
+      bundle "config set --local without myrack"
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo2)}"
-        gem "rack"
+        source "https://gem.repo2"
+        gem "myrack"
 
-        group :rack do
-          gem "rack_middleware"
+        group :myrack do
+          gem "myrack_middleware"
         end
       G
     end
 
     it "uses the correct versions even if --without was used on the original" do
-      expect(the_bundle).to include_gems "rack 0.9.1"
-      expect(the_bundle).not_to include_gems "rack_middleware 1.0"
+      expect(the_bundle).to include_gems "myrack 0.9.1"
+      expect(the_bundle).not_to include_gems "myrack_middleware 1.0"
       simulate_new_machine
 
       bundle :install
 
-      expect(the_bundle).to include_gems "rack 0.9.1"
-      expect(the_bundle).to include_gems "rack_middleware 1.0"
+      expect(the_bundle).to include_gems "myrack 0.9.1"
+      expect(the_bundle).to include_gems "myrack_middleware 1.0"
     end
 
     it "does not hit the remote a second time" do
-      FileUtils.rm_rf gem_repo2
-      bundle "config set --local without rack"
-      bundle :install, :verbose => true
-      expect(last_command.stdboth).not_to match(/fetching/i)
+      FileUtils.rm_r gem_repo2
+      bundle "config set --local without myrack"
+      bundle :install, verbose: true
+      expect(stdboth).not_to match(/fetching/i)
     end
   end
 end
diff --git a/spec/bundler/install/gemfile/install_if_spec.rb b/spec/bundler/install/gemfile/install_if_spec.rb
index 3d2d15a698c172..170b58c4c0dc04 100644
--- a/spec/bundler/install/gemfile/install_if_spec.rb
+++ b/spec/bundler/install/gemfile/install_if_spec.rb
@@ -3,7 +3,7 @@
 RSpec.describe "bundle install with install_if conditionals" do
   it "follows the install_if DSL" do
     install_gemfile <<-G
-      source "#{file_uri_for(gem_repo1)}"
+      source "https://gem.repo1"
       install_if(lambda { true }) do
         gem "activesupport", "2.3.5"
       end
@@ -11,22 +11,29 @@
       install_if(lambda { false }) do
         gem "foo"
       end
-      gem "rack"
+      gem "myrack"
     G
 
-    expect(the_bundle).to include_gems("rack 1.0", "activesupport 2.3.5")
+    expect(the_bundle).to include_gems("myrack 1.0", "activesupport 2.3.5")
     expect(the_bundle).not_to include_gems("thin")
     expect(the_bundle).not_to include_gems("foo")
 
+    checksums = checksums_section_when_enabled do |c|
+      c.checksum gem_repo1, "activesupport", "2.3.5"
+      c.checksum gem_repo1, "foo", "1.0"
+      c.checksum gem_repo1, "myrack", "1.0.0"
+      c.checksum gem_repo1, "thin", "1.0"
+    end
+
     expect(lockfile).to eq <<~L
       GEM
-        remote: #{file_uri_for(gem_repo1)}/
+        remote: https://gem.repo1/
         specs:
           activesupport (2.3.5)
           foo (1.0)
-          rack (1.0.0)
+          myrack (1.0.0)
           thin (1.0)
-            rack
+            myrack
 
       PLATFORMS
         #{lockfile_platforms}
@@ -34,9 +41,9 @@
       DEPENDENCIES
         activesupport (= 2.3.5)
         foo
-        rack
+        myrack
         thin
-
+      #{checksums}
       BUNDLED WITH
          #{Bundler::VERSION}
     L
diff --git a/spec/bundler/install/gemfile/lockfile_spec.rb b/spec/bundler/install/gemfile/lockfile_spec.rb
index 313e99d0b81a17..ee747c05de6322 100644
--- a/spec/bundler/install/gemfile/lockfile_spec.rb
+++ b/spec/bundler/install/gemfile/lockfile_spec.rb
@@ -2,13 +2,14 @@
 
 RSpec.describe "bundle install with a lockfile present" do
   let(:gf) { <<-G }
-    source "#{file_uri_for(gem_repo1)}"
+    source "https://gem.repo1"
 
-    gem "rack", "1.0.0"
+    gem "myrack", "1.0.0"
   G
 
-  subject do
+  it "touches the lockfile on install even when nothing has changed" do
     install_gemfile(gf)
+    expect { bundle :install }.to change { bundled_app_lock.mtime }
   end
 
   context "gemfile evaluation" do
@@ -17,31 +18,24 @@
     context "with plugins disabled" do
       before do
         bundle "config set plugins false"
-        subject
       end
 
-      it "does not evaluate the gemfile twice" do
+      it "does not evaluate the gemfile twice when the gem is already installed" do
+        install_gemfile(gf)
         bundle :install
 
-        with_env_vars("BUNDLER_SPEC_NO_APPEND" => "1") { expect(the_bundle).to include_gem "rack 1.0.0" }
+        with_env_vars("BUNDLER_SPEC_NO_APPEND" => "1") { expect(the_bundle).to include_gem "myrack 1.0.0" }
 
-        # The first eval is from the initial install, we're testing that the
-        # second install doesn't double-eval
         expect(bundled_app("evals").read.lines.to_a.size).to eq(2)
       end
 
-      context "when the gem is not installed" do
-        before { FileUtils.rm_rf bundled_app(".bundle") }
-
-        it "does not evaluate the gemfile twice" do
-          bundle :install
+      it "does not evaluate the gemfile twice when the gem is not installed" do
+        gemfile(gf)
+        bundle :install
 
-          with_env_vars("BUNDLER_SPEC_NO_APPEND" => "1") { expect(the_bundle).to include_gem "rack 1.0.0" }
+        with_env_vars("BUNDLER_SPEC_NO_APPEND" => "1") { expect(the_bundle).to include_gem "myrack 1.0.0" }
 
-          # The first eval is from the initial install, we're testing that the
-          # second install doesn't double-eval
-          expect(bundled_app("evals").read.lines.to_a.size).to eq(2)
-        end
+        expect(bundled_app("evals").read.lines.to_a.size).to eq(1)
       end
     end
   end
diff --git a/spec/bundler/install/gemfile/path_spec.rb b/spec/bundler/install/gemfile/path_spec.rb
index a5207036c36d3f..55bf11928d6acd 100644
--- a/spec/bundler/install/gemfile/path_spec.rb
+++ b/spec/bundler/install/gemfile/path_spec.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 RSpec.describe "bundle install with explicit source paths" do
-  it "fetches gems with a global path source", :bundler => "< 3" do
+  it "fetches gems with a global path source" do
     build_lib "foo"
 
     install_gemfile <<-G
@@ -16,7 +16,6 @@
     build_lib "foo"
 
     install_gemfile <<-G
-      source "#{file_uri_for(gem_repo1)}"
       path "#{lib_path("foo-1.0")}" do
         gem 'foo'
       end
@@ -29,7 +28,6 @@
     build_lib "foo"
 
     install_gemfile <<-G
-      source "#{file_uri_for(gem_repo1)}"
       gem 'foo', :path => "#{lib_path("foo-1.0")}"
     G
 
@@ -42,7 +40,6 @@
     relative_path = lib_path("foo-1.0").relative_path_from(bundled_app)
 
     install_gemfile <<-G
-      source "#{file_uri_for(gem_repo1)}"
       gem 'foo', :path => "#{relative_path}"
     G
 
@@ -55,7 +52,6 @@
     relative_path = lib_path("foo-1.0").relative_path_from(Pathname.new("~").expand_path)
 
     install_gemfile <<-G
-      source "#{file_uri_for(gem_repo1)}"
       gem 'foo', :path => "~/#{relative_path}"
     G
 
@@ -69,8 +65,7 @@
     username = "some_unexisting_user"
     relative_path = lib_path("foo-1.0").relative_path_from(Pathname.new("/home/#{username}").expand_path)
 
-    install_gemfile <<-G, :raise_on_error => false
-      source "#{file_uri_for(gem_repo1)}"
+    install_gemfile <<-G, raise_on_error: false
       gem 'foo', :path => "~#{username}/#{relative_path}"
     G
     expect(err).to match("There was an error while trying to use the path `~#{username}/#{relative_path}`.")
@@ -78,26 +73,30 @@
   end
 
   it "expands paths relative to Bundler.root" do
-    build_lib "foo", :path => bundled_app("foo-1.0")
+    build_lib "foo", path: bundled_app("foo-1.0")
 
     install_gemfile <<-G
-      source "#{file_uri_for(gem_repo1)}"
       gem 'foo', :path => "./foo-1.0"
     G
 
-    expect(the_bundle).to include_gems("foo 1.0", :dir => bundled_app("subdir").mkpath)
+    expect(the_bundle).to include_gems("foo 1.0", dir: bundled_app("subdir").mkpath)
   end
 
   it "sorts paths consistently on install and update when they start with ./" do
-    build_lib "demo", :path => lib_path("demo")
-    build_lib "aaa", :path => lib_path("demo/aaa")
+    build_lib "demo", path: lib_path("demo")
+    build_lib "aaa", path: lib_path("demo/aaa")
 
     gemfile lib_path("demo/Gemfile"), <<-G
-      source "#{file_uri_for(gem_repo1)}"
+      source "https://gem.repo1"
       gemspec
       gem "aaa", :path => "./aaa"
     G
 
+    checksums = checksums_section_when_enabled do |c|
+      c.no_checksum "aaa", "1.0"
+      c.no_checksum "demo", "1.0"
+    end
+
     lockfile = <<~L
       PATH
         remote: .
@@ -110,7 +109,7 @@
           aaa (1.0)
 
       GEM
-        remote: #{file_uri_for(gem_repo1)}/
+        remote: https://gem.repo1/
         specs:
 
       PLATFORMS
@@ -119,22 +118,21 @@
       DEPENDENCIES
         aaa!
         demo!
-
+      #{checksums}
       BUNDLED WITH
          #{Bundler::VERSION}
     L
 
-    bundle :install, :dir => lib_path("demo")
+    bundle :install, dir: lib_path("demo")
     expect(lib_path("demo/Gemfile.lock")).to read_as(lockfile)
-    bundle :update, :all => true, :dir => lib_path("demo")
+    bundle :update, all: true, dir: lib_path("demo")
     expect(lib_path("demo/Gemfile.lock")).to read_as(lockfile)
   end
 
   it "expands paths when comparing locked paths to Gemfile paths" do
-    build_lib "foo", :path => bundled_app("foo-1.0")
+    build_lib "foo", path: bundled_app("foo-1.0")
 
     install_gemfile <<-G
-      source "#{file_uri_for(gem_repo1)}"
       gem 'foo', :path => File.expand_path("foo-1.0", __dir__)
     G
 
@@ -143,38 +141,36 @@
   end
 
   it "installs dependencies from the path even if a newer gem is available elsewhere" do
-    system_gems "rack-1.0.0"
+    system_gems "myrack-1.0.0"
 
-    build_lib "rack", "1.0", :path => lib_path("nested/bar") do |s|
-      s.write "lib/rack.rb", "puts 'WIN OVERRIDE'"
+    build_lib "myrack", "1.0", path: lib_path("nested/bar") do |s|
+      s.write "lib/myrack.rb", "puts 'WIN OVERRIDE'"
     end
 
-    build_lib "foo", :path => lib_path("nested") do |s|
-      s.add_dependency "rack", "= 1.0"
+    build_lib "foo", path: lib_path("nested") do |s|
+      s.add_dependency "myrack", "= 1.0"
     end
 
     install_gemfile <<-G
-      source "#{file_uri_for(gem_repo1)}"
       gem "foo", :path => "#{lib_path("nested")}"
     G
 
-    run "require 'rack'"
+    run "require 'myrack'"
     expect(out).to eq("WIN OVERRIDE")
   end
 
   it "works" do
-    build_gem "foo", "1.0.0", :to_system => true do |s|
+    build_gem "foo", "1.0.0", to_system: true do |s|
       s.write "lib/foo.rb", "puts 'FAIL'"
     end
 
-    build_lib "omg", "1.0", :path => lib_path("omg") do |s|
+    build_lib "omg", "1.0", path: lib_path("omg") do |s|
       s.add_dependency "foo"
     end
 
-    build_lib "foo", "1.0.0", :path => lib_path("omg/foo")
+    build_lib "foo", "1.0.0", path: lib_path("omg/foo")
 
     install_gemfile <<-G
-      source "#{file_uri_for(gem_repo1)}"
       gem "omg", :path => "#{lib_path("omg")}"
     G
 
@@ -182,10 +178,10 @@
   end
 
   it "works when using prereleases of 0.0.0" do
-    build_lib "foo", "0.0.0.dev", :path => lib_path("foo")
+    build_lib "foo", "0.0.0.dev", path: lib_path("foo")
 
     gemfile <<~G
-      source "#{file_uri_for(gem_repo1)}"
+      source "https://gem.repo1"
       gem "foo", :path => "#{lib_path("foo")}"
     G
 
@@ -196,7 +192,7 @@
           foo (0.0.0.dev)
 
       GEM
-        remote: #{file_uri_for(gem_repo1)}/
+        remote: https://gem.repo1/
         specs:
 
       PLATFORMS
@@ -215,10 +211,10 @@
   end
 
   it "works when using uppercase prereleases of 0.0.0" do
-    build_lib "foo", "0.0.0.SNAPSHOT", :path => lib_path("foo")
+    build_lib "foo", "0.0.0.SNAPSHOT", path: lib_path("foo")
 
     gemfile <<~G
-      source "#{file_uri_for(gem_repo1)}"
+      source "https://gem.repo1"
       gem "foo", :path => "#{lib_path("foo")}"
     G
 
@@ -229,7 +225,7 @@
           foo (0.0.0.SNAPSHOT)
 
       GEM
-        remote: #{file_uri_for(gem_repo1)}/
+        remote: https://gem.repo1/
         specs:
 
       PLATFORMS
@@ -248,14 +244,13 @@
   end
 
   it "handles downgrades" do
-    build_lib "omg", "2.0", :path => lib_path("omg")
+    build_lib "omg", "2.0", path: lib_path("omg")
 
     install_gemfile <<-G
-      source "#{file_uri_for(gem_repo1)}"
       gem "omg", :path => "#{lib_path("omg")}"
     G
 
-    build_lib "omg", "1.0", :path => lib_path("omg")
+    build_lib "omg", "1.0", path: lib_path("omg")
 
     bundle :install
 
@@ -263,7 +258,7 @@
   end
 
   it "prefers gemspecs closer to the path root" do
-    build_lib "premailer", "1.0.0", :path => lib_path("premailer") do |s|
+    build_lib "premailer", "1.0.0", path: lib_path("premailer") do |s|
       s.write "gemfiles/ruby187.gemspec", <<-G
         Gem::Specification.new do |s|
           s.name    = 'premailer'
@@ -275,7 +270,6 @@
     end
 
     install_gemfile <<-G
-      source "#{file_uri_for(gem_repo1)}"
       gem "premailer", :path => "#{lib_path("premailer")}"
     G
 
@@ -296,30 +290,28 @@
       G
     end
 
-    install_gemfile <<-G, :raise_on_error => false
-      source "#{file_uri_for(gem_repo1)}"
+    install_gemfile <<-G, raise_on_error: false
       gem "foo", :path => "#{lib_path("foo-1.0")}"
     G
 
-    expect(err).to_not include("Your Gemfile has no gem server sources.")
     expect(err).to match(/is not valid. Please fix this gemspec./)
     expect(err).to match(/The validation error was 'missing value for attribute version'/)
     expect(err).to match(/You have one or more invalid gemspecs that need to be fixed/)
   end
 
   it "supports gemspec syntax" do
-    build_lib "foo", "1.0", :path => lib_path("foo") do |s|
-      s.add_dependency "rack", "1.0"
+    build_lib "foo", "1.0", path: lib_path("foo") do |s|
+      s.add_dependency "myrack", "1.0"
     end
 
     gemfile lib_path("foo/Gemfile"), <<-G
-      source "#{file_uri_for(gem_repo1)}"
+      source "https://gem.repo1"
       gemspec
     G
 
-    bundle "install", :dir => lib_path("foo")
-    expect(the_bundle).to include_gems "foo 1.0", :dir => lib_path("foo")
-    expect(the_bundle).to include_gems "rack 1.0", :dir => lib_path("foo")
+    bundle "install", dir: lib_path("foo")
+    expect(the_bundle).to include_gems "foo 1.0", dir: lib_path("foo")
+    expect(the_bundle).to include_gems "myrack 1.0", dir: lib_path("foo")
   end
 
   it "does not unlock dependencies of path sources" do
@@ -328,19 +320,24 @@
       build_gem "graphql", "2.0.16"
     end
 
-    build_lib "foo", "0.1.0", :path => lib_path("foo") do |s|
+    build_lib "foo", "0.1.0", path: lib_path("foo") do |s|
       s.add_dependency "graphql", "~> 2.0"
     end
 
     gemfile_path = lib_path("foo/Gemfile")
 
     gemfile gemfile_path, <<-G
-      source "#{file_uri_for(gem_repo4)}"
+      source "https://gem.repo4"
       gemspec
     G
 
     lockfile_path = lib_path("foo/Gemfile.lock")
 
+    checksums = checksums_section_when_enabled do |c|
+      c.no_checksum "foo", "0.1.0"
+      c.checksum gem_repo4, "graphql", "2.0.15"
+    end
+
     original_lockfile = <<~L
       PATH
         remote: .
@@ -349,7 +346,7 @@
             graphql (~> 2.0)
 
       GEM
-        remote: #{file_uri_for(gem_repo4)}/
+        remote: https://gem.repo4/
         specs:
           graphql (2.0.15)
 
@@ -358,79 +355,78 @@
 
       DEPENDENCIES
         foo!
-
+      #{checksums}
       BUNDLED WITH
          #{Bundler::VERSION}
     L
 
     lockfile lockfile_path, original_lockfile
 
-    build_lib "foo", "0.1.1", :path => lib_path("foo") do |s|
+    build_lib "foo", "0.1.1", path: lib_path("foo") do |s|
       s.add_dependency "graphql", "~> 2.0"
     end
 
-    bundle "install", :dir => lib_path("foo")
+    bundle "install", dir: lib_path("foo")
     expect(lockfile_path).to read_as(original_lockfile.gsub("foo (0.1.0)", "foo (0.1.1)"))
   end
 
   it "supports gemspec syntax with an alternative path" do
-    build_lib "foo", "1.0", :path => lib_path("foo") do |s|
-      s.add_dependency "rack", "1.0"
+    build_lib "foo", "1.0", path: lib_path("foo") do |s|
+      s.add_dependency "myrack", "1.0"
     end
 
     install_gemfile <<-G
-      source "#{file_uri_for(gem_repo1)}"
+      source "https://gem.repo1"
       gemspec :path => "#{lib_path("foo")}"
     G
 
     expect(the_bundle).to include_gems "foo 1.0"
-    expect(the_bundle).to include_gems "rack 1.0"
+    expect(the_bundle).to include_gems "myrack 1.0"
   end
 
   it "doesn't automatically unlock dependencies when using the gemspec syntax" do
-    build_lib "foo", "1.0", :path => lib_path("foo") do |s|
-      s.add_dependency "rack", ">= 1.0"
+    build_lib "foo", "1.0", path: lib_path("foo") do |s|
+      s.add_dependency "myrack", ">= 1.0"
     end
 
-    install_gemfile lib_path("foo/Gemfile"), <<-G, :dir => lib_path("foo")
-      source "#{file_uri_for(gem_repo1)}"
+    install_gemfile lib_path("foo/Gemfile"), <<-G, dir: lib_path("foo")
+      source "https://gem.repo1"
       gemspec
     G
 
-    build_gem "rack", "1.0.1", :to_system => true
+    build_gem "myrack", "1.0.1", to_system: true
 
-    bundle "install", :dir => lib_path("foo")
+    bundle "install", dir: lib_path("foo")
 
-    expect(the_bundle).to include_gems "foo 1.0", :dir => lib_path("foo")
-    expect(the_bundle).to include_gems "rack 1.0", :dir => lib_path("foo")
+    expect(the_bundle).to include_gems "foo 1.0", dir: lib_path("foo")
+    expect(the_bundle).to include_gems "myrack 1.0", dir: lib_path("foo")
   end
 
   it "doesn't automatically unlock dependencies when using the gemspec syntax and the gem has development dependencies" do
-    build_lib "foo", "1.0", :path => lib_path("foo") do |s|
-      s.add_dependency "rack", ">= 1.0"
+    build_lib "foo", "1.0", path: lib_path("foo") do |s|
+      s.add_dependency "myrack", ">= 1.0"
       s.add_development_dependency "activesupport"
     end
 
-    install_gemfile lib_path("foo/Gemfile"), <<-G, :dir => lib_path("foo")
-      source "#{file_uri_for(gem_repo1)}"
+    install_gemfile lib_path("foo/Gemfile"), <<-G, dir: lib_path("foo")
+      source "https://gem.repo1"
       gemspec
     G
 
-    build_gem "rack", "1.0.1", :to_system => true
+    build_gem "myrack", "1.0.1", to_system: true
 
-    bundle "install", :dir => lib_path("foo")
+    bundle "install", dir: lib_path("foo")
 
-    expect(the_bundle).to include_gems "foo 1.0", :dir => lib_path("foo")
-    expect(the_bundle).to include_gems "rack 1.0", :dir => lib_path("foo")
+    expect(the_bundle).to include_gems "foo 1.0", dir: lib_path("foo")
+    expect(the_bundle).to include_gems "myrack 1.0", dir: lib_path("foo")
   end
 
   it "raises if there are multiple gemspecs" do
-    build_lib "foo", "1.0", :path => lib_path("foo") do |s|
+    build_lib "foo", "1.0", path: lib_path("foo") do |s|
       s.write "bar.gemspec", build_spec("bar", "1.0").first.to_ruby
     end
 
-    install_gemfile <<-G, :raise_on_error => false
-      source "#{file_uri_for(gem_repo1)}"
+    install_gemfile <<-G, raise_on_error: false
       gemspec :path => "#{lib_path("foo")}"
     G
 
@@ -439,12 +435,11 @@
   end
 
   it "allows :name to be specified to resolve ambiguity" do
-    build_lib "foo", "1.0", :path => lib_path("foo") do |s|
+    build_lib "foo", "1.0", path: lib_path("foo") do |s|
       s.write "bar.gemspec"
     end
 
     install_gemfile <<-G
-      source "#{file_uri_for(gem_repo1)}"
       gemspec :path => "#{lib_path("foo")}", :name => "foo"
     G
 
@@ -456,8 +451,7 @@
       s.executables = "foobar"
     end
 
-    install_gemfile <<-G, :verbose => true
-      source "#{file_uri_for(gem_repo1)}"
+    install_gemfile <<-G, verbose: true
       path "#{lib_path("foo-1.0")}" do
         gem 'foo'
       end
@@ -475,7 +469,6 @@
     lib_path("foo-1.0").join("bin/performance").mkpath
 
     install_gemfile <<-G
-      source "#{file_uri_for(gem_repo1)}"
       gem 'foo', '1.0', :path => "#{lib_path("foo-1.0")}"
     G
     expect(err).to be_empty
@@ -485,7 +478,6 @@
     build_lib "foo"
 
     install_gemfile <<-G
-      source "#{file_uri_for(gem_repo1)}"
       gem 'foo', :path => "#{lib_path("foo-1.0")}"
     G
 
@@ -498,7 +490,6 @@
       build_lib "hi2u"
 
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
         path "#{lib_path}" do
           gem "omg"
           gem "hi2u"
@@ -510,14 +501,13 @@
   end
 
   it "keeps source pinning" do
-    build_lib "foo", "1.0", :path => lib_path("foo")
-    build_lib "omg", "1.0", :path => lib_path("omg")
-    build_lib "foo", "1.0", :path => lib_path("omg/foo") do |s|
+    build_lib "foo", "1.0", path: lib_path("foo")
+    build_lib "omg", "1.0", path: lib_path("omg")
+    build_lib "foo", "1.0", path: lib_path("omg/foo") do |s|
       s.write "lib/foo.rb", "puts 'FAIL'"
     end
 
     install_gemfile <<-G
-      source "#{file_uri_for(gem_repo1)}"
       gem "foo", :path => "#{lib_path("foo")}"
       gem "omg", :path => "#{lib_path("omg")}"
     G
@@ -526,10 +516,9 @@
   end
 
   it "works when the path does not have a gemspec" do
-    build_lib "foo", :gemspec => false
+    build_lib "foo", gemspec: false
 
     gemfile <<-G
-      source "#{file_uri_for(gem_repo1)}"
       gem "foo", "1.0", :path => "#{lib_path("foo-1.0")}"
     G
 
@@ -543,15 +532,11 @@
       PATH
         remote: vendor/bar
         specs:
-
-      GEM
-        remote: http://rubygems.org/
     L
 
     FileUtils.mkdir_p(bundled_app("vendor/bar"))
 
     install_gemfile <<-G
-      source "http://rubygems.org"
       gem "bar", "1.0.0", path: "vendor/bar", require: "bar/nyard"
     G
   end
@@ -559,34 +544,34 @@
   context "existing lockfile" do
     it "rubygems gems don't re-resolve without changes" do
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
-        gem 'rack-obama', '1.0'
+        source "https://gem.repo1"
+        gem 'myrack-obama', '1.0'
         gem 'net-ssh', '1.0'
       G
 
-      bundle :check, :env => { "DEBUG" => "1" }
+      bundle :check, env: { "DEBUG" => "1" }
       expect(out).to match(/using resolution from the lockfile/)
-      expect(the_bundle).to include_gems "rack-obama 1.0", "net-ssh 1.0"
+      expect(the_bundle).to include_gems "myrack-obama 1.0", "net-ssh 1.0"
     end
 
     it "source path gems w/deps don't re-resolve without changes" do
-      build_lib "rack-obama", "1.0", :path => lib_path("omg") do |s|
+      build_lib "myrack-obama", "1.0", path: lib_path("omg") do |s|
         s.add_dependency "yard"
       end
 
-      build_lib "net-ssh", "1.0", :path => lib_path("omg") do |s|
+      build_lib "net-ssh", "1.0", path: lib_path("omg") do |s|
         s.add_dependency "yard"
       end
 
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
-        gem 'rack-obama', :path => "#{lib_path("omg")}"
+        source "https://gem.repo1"
+        gem 'myrack-obama', :path => "#{lib_path("omg")}"
         gem 'net-ssh', :path => "#{lib_path("omg")}"
       G
 
-      bundle :check, :env => { "DEBUG" => "1" }
+      bundle :check, env: { "DEBUG" => "1" }
       expect(out).to match(/using resolution from the lockfile/)
-      expect(the_bundle).to include_gems "rack-obama 1.0", "net-ssh 1.0"
+      expect(the_bundle).to include_gems "myrack-obama 1.0", "net-ssh 1.0"
     end
   end
 
@@ -596,7 +581,6 @@
     end
 
     install_gemfile <<-G
-      source "#{file_uri_for(gem_repo1)}"
       gem "foo", :path => "#{lib_path("foo-1.0")}"
     G
 
@@ -606,19 +590,18 @@
 
   describe "when the gem version in the path is updated" do
     before :each do
-      build_lib "foo", "1.0", :path => lib_path("foo") do |s|
+      build_lib "foo", "1.0", path: lib_path("foo") do |s|
         s.add_dependency "bar"
       end
-      build_lib "bar", "1.0", :path => lib_path("foo/bar")
+      build_lib "bar", "1.0", path: lib_path("foo/bar")
 
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
         gem "foo", :path => "#{lib_path("foo")}"
       G
     end
 
     it "unlocks all gems when the top level gem is updated" do
-      build_lib "foo", "2.0", :path => lib_path("foo") do |s|
+      build_lib "foo", "2.0", path: lib_path("foo") do |s|
         s.add_dependency "bar"
       end
 
@@ -628,7 +611,7 @@
     end
 
     it "unlocks all gems when a child dependency gem is updated" do
-      build_lib "bar", "2.0", :path => lib_path("foo/bar")
+      build_lib "bar", "2.0", path: lib_path("foo/bar")
 
       bundle "install"
 
@@ -638,57 +621,62 @@
 
   describe "when dependencies in the path are updated" do
     before :each do
-      build_lib "foo", "1.0", :path => lib_path("foo")
+      build_lib "foo", "1.0", path: lib_path("foo")
 
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
+        source "https://gem.repo1"
         gem "foo", :path => "#{lib_path("foo")}"
       G
     end
 
     it "gets dependencies that are updated in the path" do
-      build_lib "foo", "1.0", :path => lib_path("foo") do |s|
-        s.add_dependency "rack"
+      build_lib "foo", "1.0", path: lib_path("foo") do |s|
+        s.add_dependency "myrack"
       end
 
       bundle "install"
 
-      expect(the_bundle).to include_gems "rack 1.0.0"
+      expect(the_bundle).to include_gems "myrack 1.0.0"
     end
 
     it "keeps using the same version if it's compatible" do
-      build_lib "foo", "1.0", :path => lib_path("foo") do |s|
-        s.add_dependency "rack", "0.9.1"
+      build_lib "foo", "1.0", path: lib_path("foo") do |s|
+        s.add_dependency "myrack", "0.9.1"
       end
 
       bundle "install"
 
-      expect(the_bundle).to include_gems "rack 0.9.1"
+      expect(the_bundle).to include_gems "myrack 0.9.1"
+
+      checksums = checksums_section_when_enabled do |c|
+        c.no_checksum "foo", "1.0"
+        c.checksum gem_repo1, "myrack", "0.9.1"
+      end
 
       expect(lockfile).to eq <<~G
         PATH
           remote: #{lib_path("foo")}
           specs:
             foo (1.0)
-              rack (= 0.9.1)
+              myrack (= 0.9.1)
 
         GEM
-          remote: #{file_uri_for(gem_repo1)}/
+          remote: https://gem.repo1/
           specs:
-            rack (0.9.1)
+            myrack (0.9.1)
 
         PLATFORMS
           #{lockfile_platforms}
 
         DEPENDENCIES
           foo!
-
+        #{checksums}
         BUNDLED WITH
            #{Bundler::VERSION}
       G
 
-      build_lib "foo", "1.0", :path => lib_path("foo") do |s|
-        s.add_dependency "rack"
+      build_lib "foo", "1.0", path: lib_path("foo") do |s|
+        s.add_dependency "myrack"
       end
 
       bundle "install"
@@ -698,94 +686,105 @@
           remote: #{lib_path("foo")}
           specs:
             foo (1.0)
-              rack
+              myrack
 
         GEM
-          remote: #{file_uri_for(gem_repo1)}/
+          remote: https://gem.repo1/
           specs:
-            rack (0.9.1)
+            myrack (0.9.1)
 
         PLATFORMS
           #{lockfile_platforms}
 
         DEPENDENCIES
           foo!
-
+        #{checksums}
         BUNDLED WITH
            #{Bundler::VERSION}
       G
 
-      expect(the_bundle).to include_gems "rack 0.9.1"
+      expect(the_bundle).to include_gems "myrack 0.9.1"
     end
 
     it "keeps using the same version even when another dependency is added" do
-      build_lib "foo", "1.0", :path => lib_path("foo") do |s|
-        s.add_dependency "rack", "0.9.1"
+      build_lib "foo", "1.0", path: lib_path("foo") do |s|
+        s.add_dependency "myrack", "0.9.1"
       end
 
       bundle "install"
 
-      expect(the_bundle).to include_gems "rack 0.9.1"
+      expect(the_bundle).to include_gems "myrack 0.9.1"
+
+      checksums = checksums_section_when_enabled do |c|
+        c.no_checksum "foo", "1.0"
+        c.checksum gem_repo1, "myrack", "0.9.1"
+      end
 
       expect(lockfile).to eq <<~G
         PATH
           remote: #{lib_path("foo")}
           specs:
             foo (1.0)
-              rack (= 0.9.1)
+              myrack (= 0.9.1)
 
         GEM
-          remote: #{file_uri_for(gem_repo1)}/
+          remote: https://gem.repo1/
           specs:
-            rack (0.9.1)
+            myrack (0.9.1)
 
         PLATFORMS
           #{lockfile_platforms}
 
         DEPENDENCIES
           foo!
-
+        #{checksums}
         BUNDLED WITH
            #{Bundler::VERSION}
       G
 
-      build_lib "foo", "1.0", :path => lib_path("foo") do |s|
-        s.add_dependency "rack"
-        s.add_dependency "rake", "13.0.1"
+      build_lib "foo", "1.0", path: lib_path("foo") do |s|
+        s.add_dependency "myrack"
+        s.add_dependency "rake", rake_version
       end
 
       bundle "install"
 
+      checksums.checksum gem_repo1, "rake", rake_version
+
       expect(lockfile).to eq <<~G
         PATH
           remote: #{lib_path("foo")}
           specs:
             foo (1.0)
-              rack
-              rake (= 13.0.1)
+              myrack
+              rake (= #{rake_version})
 
         GEM
-          remote: #{file_uri_for(gem_repo1)}/
+          remote: https://gem.repo1/
           specs:
-            rack (0.9.1)
-            rake (13.0.1)
+            myrack (0.9.1)
+            rake (#{rake_version})
 
         PLATFORMS
           #{lockfile_platforms}
 
         DEPENDENCIES
           foo!
-
+        #{checksums}
         BUNDLED WITH
            #{Bundler::VERSION}
       G
 
-      expect(the_bundle).to include_gems "rack 0.9.1"
+      expect(the_bundle).to include_gems "myrack 0.9.1"
     end
 
     it "does not remove existing ruby platform" do
-      build_lib "foo", "1.0", :path => lib_path("foo") do |s|
-        s.add_dependency "rack", "0.9.1"
+      build_lib "foo", "1.0", path: lib_path("foo") do |s|
+        s.add_dependency "myrack", "0.9.1"
+      end
+
+      checksums = checksums_section_when_enabled do |c|
+        c.no_checksum "foo", "1.0"
       end
 
       lockfile <<~L
@@ -799,31 +798,33 @@
 
         DEPENDENCIES
           foo!
-
+        #{checksums}
         BUNDLED WITH
            #{Bundler::VERSION}
       L
 
       bundle "lock"
 
+      checksums.checksum gem_repo1, "myrack", "0.9.1"
+
       expect(lockfile).to eq <<~G
         PATH
           remote: #{lib_path("foo")}
           specs:
             foo (1.0)
-              rack (= 0.9.1)
+              myrack (= 0.9.1)
 
         GEM
-          remote: #{file_uri_for(gem_repo1)}/
+          remote: https://gem.repo1/
           specs:
-            rack (0.9.1)
+            myrack (0.9.1)
 
         PLATFORMS
           #{lockfile_platforms("ruby")}
 
         DEPENDENCIES
           foo!
-
+        #{checksums}
         BUNDLED WITH
            #{Bundler::VERSION}
       G
@@ -832,21 +833,19 @@
 
   describe "switching sources" do
     it "doesn't switch pinned git sources to rubygems when pinning the parent gem to a path source" do
-      build_gem "foo", "1.0", :to_system => true do |s|
+      build_gem "foo", "1.0", to_system: true do |s|
         s.write "lib/foo.rb", "raise 'fail'"
       end
-      build_lib "foo", "1.0", :path => lib_path("bar/foo")
-      build_git "bar", "1.0", :path => lib_path("bar") do |s|
+      build_lib "foo", "1.0", path: lib_path("bar/foo")
+      build_git "bar", "1.0", path: lib_path("bar") do |s|
         s.add_dependency "foo"
       end
 
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
         gem "bar", :git => "#{lib_path("bar")}"
       G
 
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
         gem "bar", :path => "#{lib_path("bar")}"
       G
 
@@ -854,23 +853,23 @@
     end
 
     it "switches the source when the gem existed in rubygems and the path was already being used for another gem" do
-      build_lib "foo", "1.0", :path => lib_path("foo")
-      build_gem "bar", "1.0", :to_bundle => true do |s|
+      build_lib "foo", "1.0", path: lib_path("foo")
+      build_gem "bar", "1.0", to_bundle: true do |s|
         s.write "lib/bar.rb", "raise 'fail'"
       end
 
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
+        source "https://gem.repo1"
         gem "bar"
         path "#{lib_path("foo")}" do
           gem "foo"
         end
       G
 
-      build_lib "bar", "1.0", :path => lib_path("foo/bar")
+      build_lib "bar", "1.0", path: lib_path("foo/bar")
 
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
+        source "https://gem.repo1"
         path "#{lib_path("foo")}" do
           gem "foo"
           gem "bar"
@@ -883,17 +882,17 @@
 
   describe "when there are both a gemspec and remote gems" do
     it "doesn't query rubygems for local gemspec name" do
-      build_lib "private_lib", "2.2", :path => lib_path("private_lib")
+      build_lib "private_lib", "2.2", path: lib_path("private_lib")
       gemfile lib_path("private_lib/Gemfile"), <<-G
         source "http://localgemserver.test"
         gemspec
-        gem 'rack'
+        gem 'myrack'
       G
-      bundle :install, :env => { "DEBUG" => "1" }, :artifice => "endpoint", :dir => lib_path("private_lib")
-      expect(out).to match(%r{^HTTP GET http://localgemserver\.test/api/v1/dependencies\?gems=rack$})
+      bundle :install, env: { "DEBUG" => "1" }, artifice: "endpoint", dir: lib_path("private_lib")
+      expect(out).to match(%r{^HTTP GET http://localgemserver\.test/api/v1/dependencies\?gems=myrack$})
       expect(out).not_to match(/^HTTP GET.*private_lib/)
-      expect(the_bundle).to include_gems "private_lib 2.2", :dir => lib_path("private_lib")
-      expect(the_bundle).to include_gems "rack 1.0", :dir => lib_path("private_lib")
+      expect(the_bundle).to include_gems "private_lib 2.2", dir: lib_path("private_lib")
+      expect(the_bundle).to include_gems "myrack 1.0", dir: lib_path("private_lib")
     end
   end
 
@@ -901,7 +900,6 @@
     it "runs pre-install hooks" do
       build_git "foo"
       gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
         gem "foo", :git => "#{lib_path("foo-1.0")}"
       G
 
@@ -914,14 +912,13 @@
       end
 
       bundle :install,
-        :requires => [lib_path("install_hooks.rb")]
+        requires: [lib_path("install_hooks.rb")]
       expect(err_without_deprecations).to eq("Ran pre-install hook: foo-1.0")
     end
 
     it "runs post-install hooks" do
       build_git "foo"
       gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
         gem "foo", :git => "#{lib_path("foo-1.0")}"
       G
 
@@ -934,14 +931,13 @@
       end
 
       bundle :install,
-        :requires => [lib_path("install_hooks.rb")]
+        requires: [lib_path("install_hooks.rb")]
       expect(err_without_deprecations).to eq("Ran post-install hook: foo-1.0")
     end
 
     it "complains if the install hook fails" do
       build_git "foo"
       gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
         gem "foo", :git => "#{lib_path("foo-1.0")}"
       G
 
@@ -953,7 +949,7 @@
         H
       end
 
-      bundle :install, :requires => [lib_path("install_hooks.rb")], :raise_on_error => false
+      bundle :install, requires: [lib_path("install_hooks.rb")], raise_on_error: false
       expect(err).to include("failed for foo-1.0")
     end
 
@@ -972,7 +968,6 @@
       end
 
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
         gem "foo", :path => "#{lib_path("foo-1.0")}"
         gem "bar", :path => "#{lib_path("bar-1.0")}"
       G
diff --git a/spec/bundler/install/gemfile/platform_spec.rb b/spec/bundler/install/gemfile/platform_spec.rb
index d28c7b781f29d3..d517c12125bed9 100644
--- a/spec/bundler/install/gemfile/platform_spec.rb
+++ b/spec/bundler/install/gemfile/platform_spec.rb
@@ -4,30 +4,30 @@
   it "maintains the same lockfile if all gems are compatible across platforms" do
     lockfile <<-G
       GEM
-        remote: #{file_uri_for(gem_repo1)}/
+        remote: https://gem.repo1/
         specs:
-          rack (0.9.1)
+          myrack (0.9.1)
 
       PLATFORMS
         #{not_local}
 
       DEPENDENCIES
-        rack
+        myrack
     G
 
     install_gemfile <<-G
-      source "#{file_uri_for(gem_repo1)}"
+      source "https://gem.repo1"
 
-      gem "rack"
+      gem "myrack"
     G
 
-    expect(the_bundle).to include_gems "rack 0.9.1"
+    expect(the_bundle).to include_gems "myrack 0.9.1"
   end
 
   it "pulls in the correct platform specific gem" do
     lockfile <<-G
       GEM
-        remote: #{file_uri_for(gem_repo1)}
+        remote: https://gem.repo1
         specs:
           platform_specific (1.0)
           platform_specific (1.0-java)
@@ -40,20 +40,21 @@
         platform_specific
     G
 
-    simulate_platform "java"
-    install_gemfile <<-G
-      source "#{file_uri_for(gem_repo1)}"
+    simulate_platform "java" do
+      install_gemfile <<-G
+        source "https://gem.repo1"
 
-      gem "platform_specific"
-    G
+        gem "platform_specific"
+      G
 
-    expect(the_bundle).to include_gems "platform_specific 1.0 JAVA"
+      expect(the_bundle).to include_gems "platform_specific 1.0 java"
+    end
   end
 
   it "pulls the pure ruby version on jruby if the java platform is not present in the lockfile and bundler is run in frozen mode", :jruby_only do
     lockfile <<-G
       GEM
-        remote: #{file_uri_for(gem_repo1)}
+        remote: https://gem.repo1
         specs:
           platform_specific (1.0)
 
@@ -67,12 +68,13 @@
     bundle "config set --local frozen true"
 
     install_gemfile <<-G
-      source "#{file_uri_for(gem_repo1)}"
+      source "https://gem.repo1"
 
       gem "platform_specific"
     G
 
-    expect(the_bundle).to include_gems "platform_specific 1.0 RUBY"
+    expect(the_bundle).to include_gems "platform_specific 1.0 ruby"
+    expect(err).to be_empty
   end
 
   context "on universal Rubies" do
@@ -80,15 +82,12 @@
       build_repo4 do
         build_gem "darwin_single_arch" do |s|
           s.platform = "ruby"
-          s.write "lib/darwin_single_arch.rb", "DARWIN_SINGLE_ARCH = '1.0 RUBY'"
         end
         build_gem "darwin_single_arch" do |s|
           s.platform = "arm64-darwin"
-          s.write "lib/darwin_single_arch.rb", "DARWIN_SINGLE_ARCH = '1.0 arm64-darwin'"
         end
         build_gem "darwin_single_arch" do |s|
           s.platform = "x86_64-darwin"
-          s.write "lib/darwin_single_arch.rb", "DARWIN_SINGLE_ARCH = '1.0 x86_64-darwin'"
         end
       end
     end
@@ -96,7 +95,7 @@
     it "pulls in the correct architecture gem" do
       lockfile <<-G
         GEM
-          remote: #{file_uri_for(gem_repo4)}
+          remote: https://gem.repo4
           specs:
             darwin_single_arch (1.0)
             darwin_single_arch (1.0-arm64-darwin)
@@ -109,22 +108,23 @@
           darwin_single_arch
       G
 
-      simulate_platform "universal-darwin-21"
-      simulate_ruby_platform "universal.x86_64-darwin21" do
-        install_gemfile <<-G
-          source "#{file_uri_for(gem_repo4)}"
+      simulate_platform "universal-darwin-21" do
+        simulate_ruby_platform "universal.x86_64-darwin21" do
+          install_gemfile <<-G
+            source "https://gem.repo4"
 
-          gem "darwin_single_arch"
-        G
+            gem "darwin_single_arch"
+          G
 
-        expect(the_bundle).to include_gems "darwin_single_arch 1.0 x86_64-darwin"
+          expect(the_bundle).to include_gems "darwin_single_arch 1.0 x86_64-darwin"
+        end
       end
     end
 
     it "pulls in the correct architecture gem on arm64e macOS Ruby" do
       lockfile <<-G
         GEM
-          remote: #{file_uri_for(gem_repo4)}
+          remote: https://gem.repo4
           specs:
             darwin_single_arch (1.0)
             darwin_single_arch (1.0-arm64-darwin)
@@ -137,41 +137,42 @@
           darwin_single_arch
       G
 
-      simulate_platform "universal-darwin-21"
-      simulate_ruby_platform "universal.arm64e-darwin21" do
-        install_gemfile <<-G
-          source "#{file_uri_for(gem_repo4)}"
+      simulate_platform "universal-darwin-21" do
+        simulate_ruby_platform "universal.arm64e-darwin21" do
+          install_gemfile <<-G
+            source "https://gem.repo4"
 
-          gem "darwin_single_arch"
-        G
+            gem "darwin_single_arch"
+          G
 
-        expect(the_bundle).to include_gems "darwin_single_arch 1.0 arm64-darwin"
+          expect(the_bundle).to include_gems "darwin_single_arch 1.0 arm64-darwin"
+        end
       end
     end
   end
 
   it "works with gems that have different dependencies" do
-    simulate_platform "java"
-    install_gemfile <<-G
-      source "#{file_uri_for(gem_repo1)}"
+    simulate_platform "java" do
+      install_gemfile <<-G
+        source "https://gem.repo1"
 
-      gem "nokogiri"
-    G
+        gem "nokogiri"
+      G
 
-    expect(the_bundle).to include_gems "nokogiri 1.4.2 JAVA", "weakling 0.0.3"
+      expect(the_bundle).to include_gems "nokogiri 1.4.2 java", "weakling 0.0.3"
 
-    simulate_new_machine
-    bundle "config set --local force_ruby_platform true"
-    bundle "install"
+      pristine_system_gems :bundler
+      bundle "config set --local force_ruby_platform true"
+      bundle "install"
 
-    expect(the_bundle).to include_gems "nokogiri 1.4.2"
-    expect(the_bundle).not_to include_gems "weakling"
+      expect(the_bundle).to include_gems "nokogiri 1.4.2"
+      expect(the_bundle).not_to include_gems "weakling"
 
-    simulate_new_machine
-    simulate_platform "java"
-    bundle "install"
+      simulate_new_machine
+      bundle "install"
 
-    expect(the_bundle).to include_gems "nokogiri 1.4.2 JAVA", "weakling 0.0.3"
+      expect(the_bundle).to include_gems "nokogiri 1.4.2 java", "weakling 0.0.3"
+    end
   end
 
   it "does not keep unneeded platforms for gems that are used" do
@@ -179,178 +180,189 @@
       build_gem "empyrean", "0.1.0"
       build_gem "coderay", "1.1.2"
       build_gem "method_source", "0.9.0"
-      build_gem("spoon", "0.0.6") {|s| s.add_runtime_dependency "ffi" }
+      build_gem("spoon", "0.0.6") {|s| s.add_dependency "ffi" }
       build_gem "pry", "0.11.3" do |s|
         s.platform = "java"
-        s.add_runtime_dependency "coderay", "~> 1.1.0"
-        s.add_runtime_dependency "method_source", "~> 0.9.0"
-        s.add_runtime_dependency "spoon", "~> 0.0"
+        s.add_dependency "coderay", "~> 1.1.0"
+        s.add_dependency "method_source", "~> 0.9.0"
+        s.add_dependency "spoon", "~> 0.0"
       end
       build_gem "pry", "0.11.3" do |s|
-        s.add_runtime_dependency "coderay", "~> 1.1.0"
-        s.add_runtime_dependency "method_source", "~> 0.9.0"
+        s.add_dependency "coderay", "~> 1.1.0"
+        s.add_dependency "method_source", "~> 0.9.0"
       end
       build_gem("ffi", "1.9.23") {|s| s.platform = "java" }
       build_gem("ffi", "1.9.23")
     end
 
-    simulate_platform java
-
-    install_gemfile <<-G
-      source "#{file_uri_for(gem_repo4)}"
-
-      gem "empyrean", "0.1.0"
-      gem "pry"
-    G
-
-    expect(lockfile).to eq <<~L
-      GEM
-        remote: #{file_uri_for(gem_repo4)}/
-        specs:
-          coderay (1.1.2)
-          empyrean (0.1.0)
-          ffi (1.9.23-java)
-          method_source (0.9.0)
-          pry (0.11.3-java)
-            coderay (~> 1.1.0)
-            method_source (~> 0.9.0)
-            spoon (~> 0.0)
-          spoon (0.0.6)
-            ffi
+    simulate_platform "java" do
+      install_gemfile <<-G
+        source "https://gem.repo4"
 
-      PLATFORMS
-        java
-
-      DEPENDENCIES
-        empyrean (= 0.1.0)
-        pry
-
-      BUNDLED WITH
-         #{Bundler::VERSION}
-    L
-
-    bundle "lock --add-platform ruby"
-
-    good_lockfile = <<~L
-      GEM
-        remote: #{file_uri_for(gem_repo4)}/
-        specs:
-          coderay (1.1.2)
-          empyrean (0.1.0)
-          ffi (1.9.23-java)
-          method_source (0.9.0)
-          pry (0.11.3)
-            coderay (~> 1.1.0)
-            method_source (~> 0.9.0)
-          pry (0.11.3-java)
-            coderay (~> 1.1.0)
-            method_source (~> 0.9.0)
-            spoon (~> 0.0)
-          spoon (0.0.6)
-            ffi
+        gem "empyrean", "0.1.0"
+        gem "pry"
+      G
 
-      PLATFORMS
-        java
-        ruby
+      checksums = checksums_section_when_enabled do |c|
+        c.checksum gem_repo4, "coderay", "1.1.2"
+        c.checksum gem_repo4, "empyrean", "0.1.0"
+        c.checksum gem_repo4, "ffi", "1.9.23", "java"
+        c.checksum gem_repo4, "method_source", "0.9.0"
+        c.checksum gem_repo4, "pry", "0.11.3", "java"
+        c.checksum gem_repo4, "spoon", "0.0.6"
+      end
 
-      DEPENDENCIES
-        empyrean (= 0.1.0)
-        pry
+      expect(lockfile).to eq <<~L
+        GEM
+          remote: https://gem.repo4/
+          specs:
+            coderay (1.1.2)
+            empyrean (0.1.0)
+            ffi (1.9.23-java)
+            method_source (0.9.0)
+            pry (0.11.3-java)
+              coderay (~> 1.1.0)
+              method_source (~> 0.9.0)
+              spoon (~> 0.0)
+            spoon (0.0.6)
+              ffi
 
-      BUNDLED WITH
-         #{Bundler::VERSION}
-    L
+        PLATFORMS
+          java
 
-    expect(lockfile).to eq good_lockfile
+        DEPENDENCIES
+          empyrean (= 0.1.0)
+          pry
+        #{checksums}
+        BUNDLED WITH
+           #{Bundler::VERSION}
+      L
 
-    bad_lockfile = <<~L
-      GEM
-        remote: #{file_uri_for(gem_repo4)}/
-        specs:
-          coderay (1.1.2)
-          empyrean (0.1.0)
-          ffi (1.9.23)
-          ffi (1.9.23-java)
-          method_source (0.9.0)
-          pry (0.11.3)
-            coderay (~> 1.1.0)
-            method_source (~> 0.9.0)
-          pry (0.11.3-java)
-            coderay (~> 1.1.0)
-            method_source (~> 0.9.0)
-            spoon (~> 0.0)
-          spoon (0.0.6)
-            ffi
+      bundle "lock --add-platform ruby"
 
-      PLATFORMS
-        java
-        ruby
+      checksums.checksum gem_repo4, "pry", "0.11.3"
 
-      DEPENDENCIES
-        empyrean (= 0.1.0)
-        pry
+      good_lockfile = <<~L
+        GEM
+          remote: https://gem.repo4/
+          specs:
+            coderay (1.1.2)
+            empyrean (0.1.0)
+            ffi (1.9.23-java)
+            method_source (0.9.0)
+            pry (0.11.3)
+              coderay (~> 1.1.0)
+              method_source (~> 0.9.0)
+            pry (0.11.3-java)
+              coderay (~> 1.1.0)
+              method_source (~> 0.9.0)
+              spoon (~> 0.0)
+            spoon (0.0.6)
+              ffi
 
-      BUNDLED WITH
-         1.16.1
-    L
+        PLATFORMS
+          java
+          ruby
 
-    aggregate_failures do
-      lockfile bad_lockfile
-      bundle :install, :env => { "BUNDLER_VERSION" => Bundler::VERSION }
-      expect(lockfile).to eq good_lockfile
+        DEPENDENCIES
+          empyrean (= 0.1.0)
+          pry
+        #{checksums}
+        BUNDLED WITH
+           #{Bundler::VERSION}
+      L
 
-      lockfile bad_lockfile
-      bundle :update, :all => true, :env => { "BUNDLER_VERSION" => Bundler::VERSION }
       expect(lockfile).to eq good_lockfile
 
-      lockfile bad_lockfile
-      bundle "update ffi", :env => { "BUNDLER_VERSION" => Bundler::VERSION }
-      expect(lockfile).to eq good_lockfile
+      bad_lockfile = <<~L
+        GEM
+          remote: https://gem.repo4/
+          specs:
+            coderay (1.1.2)
+            empyrean (0.1.0)
+            ffi (1.9.23)
+            ffi (1.9.23-java)
+            method_source (0.9.0)
+            pry (0.11.3)
+              coderay (~> 1.1.0)
+              method_source (~> 0.9.0)
+            pry (0.11.3-java)
+              coderay (~> 1.1.0)
+              method_source (~> 0.9.0)
+              spoon (~> 0.0)
+            spoon (0.0.6)
+              ffi
 
-      lockfile bad_lockfile
-      bundle "update empyrean", :env => { "BUNDLER_VERSION" => Bundler::VERSION }
-      expect(lockfile).to eq good_lockfile
+        PLATFORMS
+          java
+          ruby
 
-      lockfile bad_lockfile
-      bundle :lock, :env => { "BUNDLER_VERSION" => Bundler::VERSION }
-      expect(lockfile).to eq good_lockfile
+        DEPENDENCIES
+          empyrean (= 0.1.0)
+          pry
+        #{checksums}
+        BUNDLED WITH
+           1.16.1
+      L
+
+      aggregate_failures do
+        lockfile bad_lockfile
+        bundle :install, env: { "BUNDLER_VERSION" => Bundler::VERSION }
+        expect(lockfile).to eq good_lockfile
+
+        lockfile bad_lockfile
+        bundle :update, all: true, env: { "BUNDLER_VERSION" => Bundler::VERSION }
+        expect(lockfile).to eq good_lockfile
+
+        lockfile bad_lockfile
+        bundle "update ffi", env: { "BUNDLER_VERSION" => Bundler::VERSION }
+        expect(lockfile).to eq good_lockfile
+
+        lockfile bad_lockfile
+        bundle "update empyrean", env: { "BUNDLER_VERSION" => Bundler::VERSION }
+        expect(lockfile).to eq good_lockfile
+
+        lockfile bad_lockfile
+        bundle :lock, env: { "BUNDLER_VERSION" => Bundler::VERSION }
+        expect(lockfile).to eq good_lockfile
+      end
     end
   end
 
   it "works with gems with platform-specific dependency having different requirements order" do
-    simulate_platform x64_mac
-
-    update_repo2 do
-      build_gem "fspath", "3"
-      build_gem "image_optim_pack", "1.2.3" do |s|
-        s.add_runtime_dependency "fspath", ">= 2.1", "< 4"
-      end
-      build_gem "image_optim_pack", "1.2.3" do |s|
-        s.platform = "universal-darwin"
-        s.add_runtime_dependency "fspath", "< 4", ">= 2.1"
+    simulate_platform "x86_64-darwin-15" do
+      update_repo2 do
+        build_gem "fspath", "3"
+        build_gem "image_optim_pack", "1.2.3" do |s|
+          s.add_dependency "fspath", ">= 2.1", "< 4"
+        end
+        build_gem "image_optim_pack", "1.2.3" do |s|
+          s.platform = "universal-darwin"
+          s.add_dependency "fspath", "< 4", ">= 2.1"
+        end
       end
-    end
 
-    install_gemfile <<-G
-      source "#{file_uri_for(gem_repo2)}"
-    G
+      install_gemfile <<-G
+        source "https://gem.repo2"
+      G
 
-    install_gemfile <<-G
-      source "#{file_uri_for(gem_repo2)}"
+      install_gemfile <<-G
+        source "https://gem.repo2"
 
-      gem "image_optim_pack"
-    G
+        gem "image_optim_pack"
+      G
 
-    expect(err).not_to include "Unable to use the platform-specific"
+      expect(err).not_to include "Unable to use the platform-specific"
 
-    expect(the_bundle).to include_gem "image_optim_pack 1.2.3 universal-darwin"
+      expect(the_bundle).to include_gem "image_optim_pack 1.2.3 universal-darwin"
+    end
   end
 
   it "fetches gems again after changing the version of Ruby" do
     gemfile <<-G
-      source "#{file_uri_for(gem_repo1)}"
+      source "https://gem.repo1"
 
-      gem "rack", "1.0.0"
+      gem "myrack", "1.0.0"
     G
 
     bundle "config set --local path vendor/bundle"
@@ -359,13 +371,18 @@
     FileUtils.mv(vendored_gems, bundled_app("vendor/bundle", Gem.ruby_engine, "1.8"))
 
     bundle :install
-    expect(vendored_gems("gems/rack-1.0.0")).to exist
+    expect(vendored_gems("gems/myrack-1.0.0")).to exist
   end
 
   it "keeps existing platforms when installing with force_ruby_platform" do
+    checksums = checksums_section_when_enabled do |c|
+      c.checksum gem_repo1, "platform_specific", "1.0"
+      c.checksum gem_repo1, "platform_specific", "1.0", "java"
+    end
+
     lockfile <<-G
       GEM
-        remote: #{file_uri_for(gem_repo1)}/
+        remote: https://gem.repo1/
         specs:
           platform_specific (1.0-java)
 
@@ -374,20 +391,23 @@
 
       DEPENDENCIES
         platform_specific
+      #{checksums}
     G
 
     bundle "config set --local force_ruby_platform true"
 
     install_gemfile <<-G
-      source "#{file_uri_for(gem_repo1)}"
+      source "https://gem.repo1"
       gem "platform_specific"
     G
 
-    expect(the_bundle).to include_gem "platform_specific 1.0 RUBY"
+    checksums.checksum gem_repo1, "platform_specific", "1.0"
+
+    expect(the_bundle).to include_gem "platform_specific 1.0 ruby"
 
     expect(lockfile).to eq <<~G
       GEM
-        remote: #{file_uri_for(gem_repo1)}/
+        remote: https://gem.repo1/
         specs:
           platform_specific (1.0)
           platform_specific (1.0-java)
@@ -398,7 +418,7 @@
 
       DEPENDENCIES
         platform_specific
-
+      #{checksums}
       BUNDLED WITH
          #{Bundler::VERSION}
     G
@@ -408,7 +428,7 @@
 RSpec.describe "bundle install with platform conditionals" do
   it "installs gems tagged w/ the current platforms" do
     install_gemfile <<-G
-      source "#{file_uri_for(gem_repo1)}"
+      source "https://gem.repo1"
 
       platforms :#{local_tag} do
         gem "nokogiri"
@@ -420,14 +440,14 @@
 
   it "does not install gems tagged w/ another platforms" do
     install_gemfile <<-G
-      source "#{file_uri_for(gem_repo1)}"
-      gem "rack"
+      source "https://gem.repo1"
+      gem "myrack"
       platforms :#{not_local_tag} do
         gem "nokogiri"
       end
     G
 
-    expect(the_bundle).to include_gems "rack 1.0"
+    expect(the_bundle).to include_gems "myrack 1.0"
     expect(the_bundle).not_to include_gems "nokogiri 1.4.2"
   end
 
@@ -441,7 +461,7 @@
     end
 
     gemfile <<~G
-      source "#{file_uri_for(gem_repo4)}"
+      source "https://gem.repo4"
 
       gem "activesupport"
 
@@ -452,7 +472,7 @@
 
     lockfile <<~L
       GEM
-        remote: #{file_uri_for(gem_repo4)}/
+        remote: https://gem.repo4/
         specs:
           activesupport (6.1.4.1)
             tzinfo (~> 2.0)
@@ -476,7 +496,7 @@
 
   it "installs gems tagged w/ the current platforms inline" do
     install_gemfile <<-G
-      source "#{file_uri_for(gem_repo1)}"
+      source "https://gem.repo1"
       gem "nokogiri", :platforms => :#{local_tag}
     G
     expect(the_bundle).to include_gems "nokogiri 1.4.2"
@@ -484,17 +504,17 @@
 
   it "does not install gems tagged w/ another platforms inline" do
     install_gemfile <<-G
-      source "#{file_uri_for(gem_repo1)}"
-      gem "rack"
+      source "https://gem.repo1"
+      gem "myrack"
       gem "nokogiri", :platforms => :#{not_local_tag}
     G
-    expect(the_bundle).to include_gems "rack 1.0"
+    expect(the_bundle).to include_gems "myrack 1.0"
     expect(the_bundle).not_to include_gems "nokogiri 1.4.2"
   end
 
   it "installs gems tagged w/ the current platform inline" do
     install_gemfile <<-G
-      source "#{file_uri_for(gem_repo1)}"
+      source "https://gem.repo1"
       gem "nokogiri", :platform => :#{local_tag}
     G
     expect(the_bundle).to include_gems "nokogiri 1.4.2"
@@ -502,7 +522,7 @@
 
   it "doesn't install gems tagged w/ another platform inline" do
     install_gemfile <<-G
-      source "#{file_uri_for(gem_repo1)}"
+      source "https://gem.repo1"
       gem "nokogiri", :platform => :#{not_local_tag}
     G
     expect(the_bundle).not_to include_gems "nokogiri 1.4.2"
@@ -512,7 +532,7 @@
     build_git "foo"
 
     install_gemfile <<-G
-      source "#{file_uri_for(gem_repo1)}"
+      source "https://gem.repo1"
       platform :#{not_local_tag} do
         gem "foo", :git => "#{lib_path("foo-1.0")}"
       end
@@ -525,7 +545,7 @@
     bundle "config set --local force_ruby_platform true"
 
     gemfile <<-G
-      source "#{file_uri_for(gem_repo1)}"
+      source "https://gem.repo1"
       gem "some_gem", :platform => :rbx
     G
 
@@ -536,7 +556,7 @@
   it "does not attempt to install gems from other rubies when using --local" do
     bundle "config set --local force_ruby_platform true"
     gemfile <<-G
-      source "#{file_uri_for(gem_repo1)}"
+      source "https://gem.repo1"
       gem "some_gem", platform: :ruby_22
     G
 
@@ -548,9 +568,9 @@
     bundle "config set --local force_ruby_platform true"
 
     gemfile <<-G
-      source "#{file_uri_for(gem_repo1)}"
+      source "https://gem.repo1"
 
-      gem "rack", :platform => [:windows, :mswin, :mswin64, :mingw, :x64_mingw, :jruby]
+      gem "myrack", :platform => [:windows, :jruby]
     G
 
     bundle "install"
@@ -559,15 +579,15 @@
 
     expect(lockfile).to eq <<~L
       GEM
-        remote: #{file_uri_for(gem_repo1)}/
+        remote: https://gem.repo1/
         specs:
 
       PLATFORMS
         ruby
 
       DEPENDENCIES
-        rack
-
+        myrack
+      #{checksums_section_when_enabled}
       BUNDLED WITH
          #{Bundler::VERSION}
     L
@@ -585,7 +605,7 @@
     end
 
     install_gemfile <<~G
-      source "#{file_uri_for(gem_repo4)}"
+      source "https://gem.repo4"
 
       gem "listen"
       gem "ffi", :platform => :windows
@@ -596,23 +616,23 @@
 
 RSpec.describe "when a gem has no architecture" do
   it "still installs correctly" do
-    simulate_platform x86_mswin32
-
-    build_repo2 do
-      # The rcov gem is platform mswin32, but has no arch
-      build_gem "rcov" do |s|
-        s.platform = Gem::Platform.new([nil, "mswin32", nil])
-        s.write "lib/rcov.rb", "RCOV = '1.0.0'"
+    simulate_platform "x86-mswin32" do
+      build_repo2 do
+        # The rcov gem is platform mswin32, but has no arch
+        build_gem "rcov" do |s|
+          s.platform = Gem::Platform.new([nil, "mswin32", nil])
+          s.write "lib/rcov.rb", "RCOV = '1.0.0'"
+        end
       end
-    end
 
-    gemfile <<-G
-      # Try to install gem with nil arch
-      source "http://localgemserver.test/"
-      gem "rcov"
-    G
+      gemfile <<-G
+        # Try to install gem with nil arch
+        source "http://localgemserver.test/"
+        gem "rcov"
+      G
 
-    bundle :install, :artifice => "windows", :env => { "BUNDLER_SPEC_GEM_REPO" => gem_repo2.to_s }
-    expect(the_bundle).to include_gems "rcov 1.0.0"
+      bundle :install, artifice: "windows", env: { "BUNDLER_SPEC_GEM_REPO" => gem_repo2.to_s }
+      expect(the_bundle).to include_gems "rcov 1.0.0"
+    end
   end
 end
diff --git a/spec/bundler/install/gemfile/ruby_spec.rb b/spec/bundler/install/gemfile/ruby_spec.rb
index 39f09031b7abca..3e15d82bbe25cc 100644
--- a/spec/bundler/install/gemfile/ruby_spec.rb
+++ b/spec/bundler/install/gemfile/ruby_spec.rb
@@ -10,77 +10,77 @@ def locked_ruby_version
   # requirement. This test verifies the fix, committed in bfbad5c5.
   it "allows adding gems" do
     install_gemfile <<-G
-      source "#{file_uri_for(gem_repo1)}"
+      source "https://gem.repo1"
       ruby "#{Gem.ruby_version}"
-      gem "rack"
+      gem "myrack"
     G
 
     install_gemfile <<-G
-      source "#{file_uri_for(gem_repo1)}"
+      source "https://gem.repo1"
       ruby "#{Gem.ruby_version}"
-      gem "rack"
-      gem "rack-obama"
+      gem "myrack"
+      gem "myrack-obama"
     G
 
-    expect(the_bundle).to include_gems "rack-obama 1.0"
+    expect(the_bundle).to include_gems "myrack-obama 1.0"
   end
 
   it "allows removing the ruby version requirement" do
     install_gemfile <<-G
-      source "#{file_uri_for(gem_repo1)}"
+      source "https://gem.repo1"
       ruby "~> #{Gem.ruby_version}"
-      gem "rack"
+      gem "myrack"
     G
 
     expect(lockfile).to include("RUBY VERSION")
 
     install_gemfile <<-G
-      source "#{file_uri_for(gem_repo1)}"
-      gem "rack"
+      source "https://gem.repo1"
+      gem "myrack"
     G
 
-    expect(the_bundle).to include_gems "rack 1.0.0"
+    expect(the_bundle).to include_gems "myrack 1.0.0"
     expect(lockfile).not_to include("RUBY VERSION")
   end
 
   it "allows changing the ruby version requirement to something compatible" do
     install_gemfile <<-G
-      source "#{file_uri_for(gem_repo1)}"
+      source "https://gem.repo1"
       ruby ">= #{current_ruby_minor}"
-      gem "rack"
+      gem "myrack"
     G
 
     allow(Bundler::SharedHelpers).to receive(:find_gemfile).and_return(bundled_app_gemfile)
     expect(locked_ruby_version).to eq(Bundler::RubyVersion.system)
 
     install_gemfile <<-G
-      source "#{file_uri_for(gem_repo1)}"
+      source "https://gem.repo1"
       ruby ">= #{Gem.ruby_version}"
-      gem "rack"
+      gem "myrack"
     G
 
-    expect(the_bundle).to include_gems "rack 1.0.0"
+    expect(the_bundle).to include_gems "myrack 1.0.0"
     expect(locked_ruby_version).to eq(Bundler::RubyVersion.system)
   end
 
   it "allows changing the ruby version requirement to something incompatible" do
     install_gemfile <<-G
-      source "#{file_uri_for(gem_repo1)}"
+      source "https://gem.repo1"
       ruby ">= 1.0.0"
-      gem "rack"
+      gem "myrack"
     G
 
     lockfile <<~L
       GEM
-        remote: #{file_uri_for(gem_repo1)}/
+        remote: https://gem.repo1/
         specs:
-          rack (1.0.0)
+          myrack (1.0.0)
 
       PLATFORMS
         #{lockfile_platforms}
 
       DEPENDENCIES
-        rack
+        myrack
 
       RUBY VERSION
          ruby 2.1.4p422
@@ -92,32 +92,66 @@ def locked_ruby_version
     allow(Bundler::SharedHelpers).to receive(:find_gemfile).and_return(bundled_app_gemfile)
 
     install_gemfile <<-G
-      source "#{file_uri_for(gem_repo1)}"
+      source "https://gem.repo1"
       ruby ">= #{current_ruby_minor}"
-      gem "rack"
+      gem "myrack"
     G
 
-    expect(the_bundle).to include_gems "rack 1.0.0"
+    expect(the_bundle).to include_gems "myrack 1.0.0"
     expect(locked_ruby_version).to eq(Bundler::RubyVersion.system)
   end
 
   it "allows requirements with trailing whitespace" do
     install_gemfile <<-G
-      source "#{file_uri_for(gem_repo1)}"
+      source "https://gem.repo1"
       ruby "#{Gem.ruby_version}\\n \t\\n"
-      gem "rack"
+      gem "myrack"
     G
 
-    expect(the_bundle).to include_gems "rack 1.0.0"
+    expect(the_bundle).to include_gems "myrack 1.0.0"
   end
 
   it "fails gracefully with malformed requirements" do
-    install_gemfile <<-G, :raise_on_error => false
-      source "#{file_uri_for(gem_repo1)}"
+    install_gemfile <<-G, raise_on_error: false
+      source "https://gem.repo1"
       ruby ">= 0", "-.\\0"
-      gem "rack"
+      gem "myrack"
     G
 
     expect(err).to include("There was an error parsing") # i.e. DSL error, not error template
   end
+
+  it "allows picking up ruby version from a file" do
+    create_file ".ruby-version", Gem.ruby_version.to_s
+
+    install_gemfile <<-G
+      source "https://gem.repo1"
+      ruby file: ".ruby-version"
+      gem "myrack"
+    G
+
+    expect(lockfile).to include("RUBY VERSION")
+  end
+
+  it "reads the ruby version file from the right folder when nested Gemfiles are involved" do
+    create_file ".ruby-version", Gem.ruby_version.to_s
+
+    gemfile <<-G
+      source "https://gem.repo1"
+      ruby file: ".ruby-version"
+      gem "myrack"
+    G
+
+    nested_dir = bundled_app(".ruby-lsp")
+
+    FileUtils.mkdir nested_dir
+
+    gemfile ".ruby-lsp/Gemfile", <<-G
+      eval_gemfile(File.expand_path("../Gemfile", __dir__))
+    G
+
+    bundle "install", dir: nested_dir
+
+    expect(bundled_app(".ruby-lsp/Gemfile.lock").read).to include("RUBY VERSION")
+  end
 end
diff --git a/spec/bundler/install/gemfile/sources_spec.rb b/spec/bundler/install/gemfile/sources_spec.rb
index 8cb04768212e9b..406d881541adf0 100644
--- a/spec/bundler/install/gemfile/sources_spec.rb
+++ b/spec/bundler/install/gemfile/sources_spec.rb
@@ -2,76 +2,121 @@
 
 RSpec.describe "bundle install with gems on multiple sources" do
   # repo1 is built automatically before all of the specs run
-  # it contains rack-obama 1.0.0 and rack 0.9.1 & 1.0.0 amongst other gems
+  # it contains myrack-obama 1.0.0 and myrack 0.9.1 & 1.0.0 amongst other gems
 
   context "without source affinity" do
     before do
-      # Oh no! Someone evil is trying to hijack rack :(
+      # Oh no! Someone evil is trying to hijack myrack :(
       # need this to be broken to check for correct source ordering
-      build_repo gem_repo3 do
-        build_gem "rack", repo3_rack_version do |s|
-          s.write "lib/rack.rb", "RACK = 'FAIL'"
+      build_repo3 do
+        build_gem "myrack", repo3_myrack_version do |s|
+          s.write "lib/myrack.rb", "MYRACK = 'FAIL'"
         end
       end
     end
 
     context "with multiple toplevel sources" do
-      let(:repo3_rack_version) { "1.0.0" }
+      let(:repo3_myrack_version) { "1.0.0" }
 
       before do
         gemfile <<-G
           source "https://gem.repo3"
           source "https://gem.repo1"
-          gem "rack-obama"
-          gem "rack"
+          gem "myrack-obama"
+          gem "myrack"
         G
       end
 
-      it "warns about ambiguous gems, but installs anyway, prioritizing sources last to first", :bundler => "< 3" do
-        bundle :install, :artifice => "compact_index"
+      it "refuses to install mismatched checksum because one gem has been tampered with" do
+        lockfile <<~L
+          GEM
+            remote: https://gem.repo3/
+            remote: https://gem.repo1/
+            specs:
+              myrack (1.0.0)
 
-        expect(err).to include("Warning: the gem 'rack' was found in multiple sources.")
-        expect(err).to include("Installed from: https://gem.repo1")
-        expect(the_bundle).to include_gems("rack-obama 1.0.0", "rack 1.0.0", :source => "remote1")
-      end
+          PLATFORMS
+            #{local_platform}
 
-      it "does not use the full index unnecessarily", :bundler => "< 3" do
-        bundle :install, :artifice => "compact_index", :verbose => true
+          DEPENDENCIES
+            depends_on_myrack!
 
-        expect(out).to include("https://gem.repo1/versions")
-        expect(out).to include("https://gem.repo3/versions")
-        expect(out).not_to include("https://gem.repo1/quick/Marshal.4.8/")
-        expect(out).not_to include("https://gem.repo3/quick/Marshal.4.8/")
+          BUNDLED WITH
+            #{Bundler::VERSION}
+        L
+
+        bundle :install, artifice: "compact_index", raise_on_error: false
+
+        expect(exitstatus).to eq(37)
+        expect(err).to eq <<~E.strip
+          [DEPRECATED] Your Gemfile contains multiple global sources. Using `source` more than once without a block is a security risk, and may result in installing unexpected gems. To resolve this warning, use a block to indicate which gems should come from the secondary source.
+          Bundler found mismatched checksums. This is a potential security risk.
+            #{checksum_to_lock(gem_repo1, "myrack", "1.0.0")}
+              from the API at https://gem.repo1/
+            #{checksum_to_lock(gem_repo3, "myrack", "1.0.0")}
+              from the API at https://gem.repo3/
+
+          Mismatched checksums each have an authoritative source:
+            1. the API at https://gem.repo1/
+            2. the API at https://gem.repo3/
+          You may need to alter your Gemfile sources to resolve this issue.
+
+          To ignore checksum security warnings, disable checksum validation with
+            `bundle config set --local disable_checksum_validation true`
+        E
       end
 
-      it "fails", :bundler => "3" do
-        bundle :install, :artifice => "compact_index", :raise_on_error => false
-        expect(err).to include("Each source after the first must include a block")
-        expect(exitstatus).to eq(4)
+      context "when checksum validation is disabled" do
+        before do
+          bundle "config set --local disable_checksum_validation true"
+        end
+
+        it "warns about ambiguous gems, but installs anyway, prioritizing sources last to first" do
+          bundle :install, artifice: "compact_index"
+
+          expect(err).to include("Warning: the gem 'myrack' was found in multiple sources.")
+          expect(err).to include("Installed from: https://gem.repo1")
+          expect(the_bundle).to include_gems("myrack-obama 1.0.0", "myrack 1.0.0", source: "remote1")
+        end
+
+        it "does not use the full index unnecessarily" do
+          bundle :install, artifice: "compact_index", verbose: true
+
+          expect(out).to include("https://gem.repo1/versions")
+          expect(out).to include("https://gem.repo3/versions")
+          expect(out).not_to include("https://gem.repo1/quick/Marshal.4.8/")
+          expect(out).not_to include("https://gem.repo3/quick/Marshal.4.8/")
+        end
+
+        it "fails", bundler: "4" do
+          bundle :install, artifice: "compact_index", raise_on_error: false
+          expect(err).to include("Each source after the first must include a block")
+          expect(exitstatus).to eq(4)
+        end
       end
     end
 
     context "when different versions of the same gem are in multiple sources" do
-      let(:repo3_rack_version) { "1.2" }
+      let(:repo3_myrack_version) { "1.2" }
 
       before do
         gemfile <<-G
           source "https://gem.repo3"
           source "https://gem.repo1"
-          gem "rack-obama"
-          gem "rack", "1.0.0" # force it to install the working version in repo1
+          gem "myrack-obama"
+          gem "myrack", "1.0.0" # force it to install the working version in repo1
         G
       end
 
-      it "warns about ambiguous gems, but installs anyway", :bundler => "< 3" do
-        bundle :install, :artifice => "compact_index"
-        expect(err).to include("Warning: the gem 'rack' was found in multiple sources.")
+      it "warns about ambiguous gems, but installs anyway" do
+        bundle :install, artifice: "compact_index"
+        expect(err).to include("Warning: the gem 'myrack' was found in multiple sources.")
         expect(err).to include("Installed from: https://gem.repo1")
-        expect(the_bundle).to include_gems("rack-obama 1.0.0", "rack 1.0.0", :source => "remote1")
+        expect(the_bundle).to include_gems("myrack-obama 1.0.0", "myrack 1.0.0", source: "remote1")
       end
 
-      it "fails", :bundler => "3" do
-        bundle :install, :artifice => "compact_index", :raise_on_error => false
+      it "fails", bundler: "4" do
+        bundle :install, artifice: "compact_index", raise_on_error: false
         expect(err).to include("Each source after the first must include a block")
         expect(exitstatus).to eq(4)
       end
@@ -100,23 +145,24 @@
       G
     end
 
-    it "works in standalone mode", :bundler => "< 3" do
-      bundle "install --standalone", :artifice => "compact_index"
+    it "works in standalone mode" do
+      gem_checksum = checksum_digest(gem_repo4, "foo", "1.0")
+      bundle "install --standalone", artifice: "compact_index", env: { "BUNDLER_SPEC_FOO_CHECKSUM" => gem_checksum }
     end
   end
 
   context "with source affinity" do
     context "with sources given by a block" do
       before do
-        # Oh no! Someone evil is trying to hijack rack :(
+        # Oh no! Someone evil is trying to hijack myrack :(
         # need this to be broken to check for correct source ordering
-        build_repo gem_repo3 do
-          build_gem "rack", "1.0.0" do |s|
-            s.write "lib/rack.rb", "RACK = 'FAIL'"
+        build_repo3 do
+          build_gem "myrack", "1.0.0" do |s|
+            s.write "lib/myrack.rb", "MYRACK = 'FAIL'"
           end
 
-          build_gem "rack-obama" do |s|
-            s.add_dependency "rack"
+          build_gem "myrack-obama" do |s|
+            s.add_dependency "myrack"
           end
         end
 
@@ -124,76 +170,76 @@
           source "https://gem.repo3"
           source "https://gem.repo1" do
             gem "thin" # comes first to test name sorting
-            gem "rack"
+            gem "myrack"
           end
-          gem "rack-obama" # should come from repo3!
+          gem "myrack-obama" # should come from repo3!
         G
       end
 
       it "installs the gems without any warning" do
-        bundle :install, :artifice => "compact_index"
+        bundle :install, artifice: "compact_index"
         expect(err).not_to include("Warning")
-        expect(the_bundle).to include_gems("rack-obama 1.0.0")
-        expect(the_bundle).to include_gems("rack 1.0.0", :source => "remote1")
+        expect(the_bundle).to include_gems("myrack-obama 1.0.0")
+        expect(the_bundle).to include_gems("myrack 1.0.0", source: "remote1")
       end
 
       it "can cache and deploy" do
-        bundle :cache, :artifice => "compact_index"
+        bundle :cache, artifice: "compact_index"
 
-        expect(bundled_app("vendor/cache/rack-1.0.0.gem")).to exist
-        expect(bundled_app("vendor/cache/rack-obama-1.0.gem")).to exist
+        expect(bundled_app("vendor/cache/myrack-1.0.0.gem")).to exist
+        expect(bundled_app("vendor/cache/myrack-obama-1.0.gem")).to exist
 
         bundle "config set --local deployment true"
-        bundle :install, :artifice => "compact_index"
+        bundle :install, artifice: "compact_index"
 
-        expect(the_bundle).to include_gems("rack-obama 1.0.0", "rack 1.0.0")
+        expect(the_bundle).to include_gems("myrack-obama 1.0.0", "myrack 1.0.0")
       end
     end
 
     context "with sources set by an option" do
       before do
-        # Oh no! Someone evil is trying to hijack rack :(
+        # Oh no! Someone evil is trying to hijack myrack :(
         # need this to be broken to check for correct source ordering
-        build_repo gem_repo3 do
-          build_gem "rack", "1.0.0" do |s|
-            s.write "lib/rack.rb", "RACK = 'FAIL'"
+        build_repo3 do
+          build_gem "myrack", "1.0.0" do |s|
+            s.write "lib/myrack.rb", "MYRACK = 'FAIL'"
           end
 
-          build_gem "rack-obama" do |s|
-            s.add_dependency "rack"
+          build_gem "myrack-obama" do |s|
+            s.add_dependency "myrack"
           end
         end
 
-        install_gemfile <<-G, :artifice => "compact_index"
+        install_gemfile <<-G, artifice: "compact_index"
           source "https://gem.repo3"
-          gem "rack-obama" # should come from repo3!
-          gem "rack", :source => "https://gem.repo1"
+          gem "myrack-obama" # should come from repo3!
+          gem "myrack", :source => "https://gem.repo1"
         G
       end
 
       it "installs the gems without any warning" do
         expect(err).not_to include("Warning")
-        expect(the_bundle).to include_gems("rack-obama 1.0.0", "rack 1.0.0")
+        expect(the_bundle).to include_gems("myrack-obama 1.0.0", "myrack 1.0.0")
       end
     end
 
     context "when a pinned gem has an indirect dependency in the pinned source" do
       before do
-        build_repo gem_repo3 do
-          build_gem "depends_on_rack", "1.0.1" do |s|
-            s.add_dependency "rack"
+        build_repo3 do
+          build_gem "depends_on_myrack", "1.0.1" do |s|
+            s.add_dependency "myrack"
           end
         end
 
-        # we need a working rack gem in repo3
+        # we need a working myrack gem in repo3
         update_repo gem_repo3 do
-          build_gem "rack", "1.0.0"
+          build_gem "myrack", "1.0.0"
         end
 
         gemfile <<-G
           source "https://gem.repo2"
           source "https://gem.repo3" do
-            gem "depends_on_rack"
+            gem "depends_on_myrack"
           end
         G
       end
@@ -204,9 +250,9 @@
         end
 
         it "installs from the same source without any warning" do
-          bundle :install, :artifice => "compact_index"
+          bundle :install, artifice: "compact_index"
           expect(err).not_to include("Warning")
-          expect(the_bundle).to include_gems("depends_on_rack 1.0.1", "rack 1.0.0", :source => "remote3")
+          expect(the_bundle).to include_gems("depends_on_myrack 1.0.1", "myrack 1.0.0", source: "remote3")
         end
       end
 
@@ -214,57 +260,57 @@
         before do
           # need this to be broken to check for correct source ordering
           build_repo gem_repo2 do
-            build_gem "rack", "1.0.0" do |s|
-              s.write "lib/rack.rb", "RACK = 'FAIL'"
+            build_gem "myrack", "1.0.0" do |s|
+              s.write "lib/myrack.rb", "MYRACK = 'FAIL'"
             end
           end
         end
 
         it "installs from the same source without any warning" do
-          bundle :install, :artifice => "compact_index"
+          bundle :install, artifice: "compact_index"
 
-          expect(err).not_to include("Warning: the gem 'rack' was found in multiple sources.")
-          expect(the_bundle).to include_gems("depends_on_rack 1.0.1", "rack 1.0.0", :source => "remote3")
+          expect(err).not_to include("Warning: the gem 'myrack' was found in multiple sources.")
+          expect(the_bundle).to include_gems("depends_on_myrack 1.0.1", "myrack 1.0.0", source: "remote3")
 
           # In https://github.com/bundler/bundler/issues/3585 this failed
-          # when there is already a lock file, and the gems are missing, so try again
+          # when there is already a lockfile, and the gems are missing, so try again
           system_gems []
-          bundle :install, :artifice => "compact_index"
+          bundle :install, artifice: "compact_index"
 
-          expect(err).not_to include("Warning: the gem 'rack' was found in multiple sources.")
-          expect(the_bundle).to include_gems("depends_on_rack 1.0.1", "rack 1.0.0", :source => "remote3")
+          expect(err).not_to include("Warning: the gem 'myrack' was found in multiple sources.")
+          expect(the_bundle).to include_gems("depends_on_myrack 1.0.1", "myrack 1.0.0", source: "remote3")
         end
       end
     end
 
     context "when a pinned gem has an indirect dependency in a different source" do
       before do
-        # In these tests, we need a working rack gem in repo2 and not repo3
+        # In these tests, we need a working myrack gem in repo2 and not repo3
 
-        build_repo gem_repo3 do
-          build_gem "depends_on_rack", "1.0.1" do |s|
-            s.add_dependency "rack"
+        build_repo3 do
+          build_gem "depends_on_myrack", "1.0.1" do |s|
+            s.add_dependency "myrack"
           end
         end
 
         build_repo gem_repo2 do
-          build_gem "rack", "1.0.0"
+          build_gem "myrack", "1.0.0"
         end
       end
 
       context "and not in any other sources" do
         before do
-          install_gemfile <<-G, :artifice => "compact_index"
+          install_gemfile <<-G, artifice: "compact_index"
             source "https://gem.repo2"
             source "https://gem.repo3" do
-              gem "depends_on_rack"
+              gem "depends_on_myrack"
             end
           G
         end
 
         it "installs from the other source without any warning" do
           expect(err).not_to include("Warning")
-          expect(the_bundle).to include_gems("depends_on_rack 1.0.1", "rack 1.0.0")
+          expect(the_bundle).to include_gems("depends_on_myrack 1.0.1", "myrack 1.0.0")
         end
       end
 
@@ -274,46 +320,138 @@
             source "https://gem.repo1"
             source "https://gem.repo2"
             source "https://gem.repo3" do
-              gem "depends_on_rack"
+              gem "depends_on_myrack"
             end
           G
         end
 
-        it "installs from the other source and warns about ambiguous gems", :bundler => "< 3" do
-          bundle :install, :artifice => "compact_index"
-          expect(err).to include("Warning: the gem 'rack' was found in multiple sources.")
+        it "fails when the two sources don't have the same checksum" do
+          bundle :install, artifice: "compact_index", raise_on_error: false
+
+          expect(err).to eq(<<~E.strip)
+            [DEPRECATED] Your Gemfile contains multiple global sources. Using `source` more than once without a block is a security risk, and may result in installing unexpected gems. To resolve this warning, use a block to indicate which gems should come from the secondary source.
+            Bundler found mismatched checksums. This is a potential security risk.
+              #{checksum_to_lock(gem_repo2, "myrack", "1.0.0")}
+                from the API at https://gem.repo2/
+              #{checksum_to_lock(gem_repo1, "myrack", "1.0.0")}
+                from the API at https://gem.repo1/
+
+            Mismatched checksums each have an authoritative source:
+              1. the API at https://gem.repo2/
+              2. the API at https://gem.repo1/
+            You may need to alter your Gemfile sources to resolve this issue.
+
+            To ignore checksum security warnings, disable checksum validation with
+              `bundle config set --local disable_checksum_validation true`
+          E
+          expect(exitstatus).to eq(37)
+        end
+
+        it "fails when the two sources agree, but the local gem calculates a different checksum" do
+          myrack_checksum = "c0ffee11" * 8
+          bundle :install, artifice: "compact_index", env: { "BUNDLER_SPEC_MYRACK_CHECKSUM" => myrack_checksum }, raise_on_error: false
+
+          expect(err).to eq(<<~E.strip)
+            [DEPRECATED] Your Gemfile contains multiple global sources. Using `source` more than once without a block is a security risk, and may result in installing unexpected gems. To resolve this warning, use a block to indicate which gems should come from the secondary source.
+            Bundler found mismatched checksums. This is a potential security risk.
+              myrack (1.0.0) sha256=#{myrack_checksum}
+                from the API at https://gem.repo2/
+                and the API at https://gem.repo1/
+              #{checksum_to_lock(gem_repo2, "myrack", "1.0.0")}
+                from the gem at #{default_bundle_path("cache", "myrack-1.0.0.gem")}
+
+            If you trust the API at https://gem.repo2/, to resolve this issue you can:
+              1. remove the gem at #{default_bundle_path("cache", "myrack-1.0.0.gem")}
+              2. run `bundle install`
+
+            To ignore checksum security warnings, disable checksum validation with
+              `bundle config set --local disable_checksum_validation true`
+          E
+          expect(exitstatus).to eq(37)
+        end
+
+        it "installs from the other source and warns about ambiguous gems when the sources have the same checksum" do
+          gem_checksum = checksum_digest(gem_repo2, "myrack", "1.0.0")
+          bundle :install, artifice: "compact_index", env: { "BUNDLER_SPEC_MYRACK_CHECKSUM" => gem_checksum, "DEBUG" => "1" }
+
+          expect(err).to include("Warning: the gem 'myrack' was found in multiple sources.")
           expect(err).to include("Installed from: https://gem.repo2")
 
+          checksums = checksums_section_when_enabled do |c|
+            c.checksum gem_repo3, "depends_on_myrack", "1.0.1"
+            c.checksum gem_repo2, "myrack", "1.0.0"
+          end
+
           expect(lockfile).to eq <<~L
             GEM
               remote: https://gem.repo1/
               remote: https://gem.repo2/
               specs:
-                rack (1.0.0)
+                myrack (1.0.0)
 
             GEM
               remote: https://gem.repo3/
               specs:
-                depends_on_rack (1.0.1)
-                  rack
+                depends_on_myrack (1.0.1)
+                  myrack
 
             PLATFORMS
-              #{local_platform}
+              #{lockfile_platforms}
 
             DEPENDENCIES
-              depends_on_rack!
+              depends_on_myrack!
+            #{checksums}
+            BUNDLED WITH
+               #{Bundler::VERSION}
+          L
+
+          previous_lockfile = lockfile
+          expect(the_bundle).to include_gems("depends_on_myrack 1.0.1", "myrack 1.0.0")
+          expect(lockfile).to eq(previous_lockfile)
+        end
+
+        it "installs from the other source and warns about ambiguous gems when checksum validation is disabled" do
+          bundle "config set --local disable_checksum_validation true"
+          bundle :install, artifice: "compact_index"
+
+          expect(err).to include("Warning: the gem 'myrack' was found in multiple sources.")
+          expect(err).to include("Installed from: https://gem.repo2")
+
+          checksums = checksums_section_when_enabled do |c|
+            c.no_checksum "depends_on_myrack", "1.0.1"
+            c.no_checksum "myrack", "1.0.0"
+          end
+
+          expect(lockfile).to eq <<~L
+            GEM
+              remote: https://gem.repo1/
+              remote: https://gem.repo2/
+              specs:
+                myrack (1.0.0)
 
+            GEM
+              remote: https://gem.repo3/
+              specs:
+                depends_on_myrack (1.0.1)
+                  myrack
+
+            PLATFORMS
+              #{lockfile_platforms}
+
+            DEPENDENCIES
+              depends_on_myrack!
+            #{checksums}
             BUNDLED WITH
                #{Bundler::VERSION}
           L
 
           previous_lockfile = lockfile
-          expect(the_bundle).to include_gems("depends_on_rack 1.0.1", "rack 1.0.0")
+          expect(the_bundle).to include_gems("depends_on_myrack 1.0.1", "myrack 1.0.0")
           expect(lockfile).to eq(previous_lockfile)
         end
 
-        it "fails", :bundler => "3" do
-          bundle :install, :artifice => "compact_index", :raise_on_error => false
+        it "fails", bundler: "4" do
+          bundle :install, artifice: "compact_index", raise_on_error: false
           expect(err).to include("Each source after the first must include a block")
           expect(exitstatus).to eq(4)
         end
@@ -323,37 +461,37 @@
         before do
           # need this to be broken to check for correct source ordering
           build_repo gem_repo2 do
-            build_gem "rack", "1.0.0" do |s|
-              s.write "lib/rack.rb", "RACK = 'FAIL'"
+            build_gem "myrack", "1.0.0" do |s|
+              s.write "lib/myrack.rb", "MYRACK = 'FAIL'"
             end
           end
 
           gemfile <<-G
-            source "https://gem.repo3" # contains depends_on_rack
-            source "https://gem.repo2" # contains broken rack
+            source "https://gem.repo3" # contains depends_on_myrack
+            source "https://gem.repo2" # contains broken myrack
 
-            gem "depends_on_rack" # installed from gem_repo3
-            gem "rack", :source => "https://gem.repo1"
+            gem "depends_on_myrack" # installed from gem_repo3
+            gem "myrack", :source => "https://gem.repo1"
           G
         end
 
-        it "installs the dependency from the pinned source without warning", :bundler => "< 3" do
-          bundle :install, :artifice => "compact_index"
+        it "installs the dependency from the pinned source without warning" do
+          bundle :install, artifice: "compact_index"
 
-          expect(err).not_to include("Warning: the gem 'rack' was found in multiple sources.")
-          expect(the_bundle).to include_gems("depends_on_rack 1.0.1", "rack 1.0.0")
+          expect(err).not_to include("Warning: the gem 'myrack' was found in multiple sources.")
+          expect(the_bundle).to include_gems("depends_on_myrack 1.0.1", "myrack 1.0.0")
 
           # In https://github.com/rubygems/bundler/issues/3585 this failed
-          # when there is already a lock file, and the gems are missing, so try again
+          # when there is already a lockfile, and the gems are missing, so try again
           system_gems []
-          bundle :install, :artifice => "compact_index"
+          bundle :install, artifice: "compact_index"
 
-          expect(err).not_to include("Warning: the gem 'rack' was found in multiple sources.")
-          expect(the_bundle).to include_gems("depends_on_rack 1.0.1", "rack 1.0.0")
+          expect(err).not_to include("Warning: the gem 'myrack' was found in multiple sources.")
+          expect(the_bundle).to include_gems("depends_on_myrack 1.0.1", "myrack 1.0.0")
         end
 
-        it "fails", :bundler => "3" do
-          bundle :install, :artifice => "compact_index", :raise_on_error => false
+        it "fails", bundler: "4" do
+          bundle :install, artifice: "compact_index", raise_on_error: false
           expect(err).to include("Each source after the first must include a block")
           expect(exitstatus).to eq(4)
         end
@@ -364,7 +502,7 @@
       before do
         build_repo2
 
-        build_repo gem_repo3 do
+        build_repo3 do
           build_gem "private_gem_1", "1.0.0"
           build_gem "private_gem_2", "1.0.0"
         end
@@ -381,16 +519,16 @@
       end
 
       it "fails" do
-        bundle :install, :artifice => "compact_index", :raise_on_error => false
+        bundle :install, artifice: "compact_index", raise_on_error: false
         expect(err).to include("Could not find gem 'private_gem_1' in rubygems repository https://gem.repo2/ or installed locally.")
       end
     end
 
-    context "when an indirect dependency can't be found in the aggregate rubygems source", :bundler => "< 3" do
+    context "when an indirect dependency can't be found in the aggregate rubygems source" do
       before do
         build_repo2
 
-        build_repo gem_repo3 do
+        build_repo3 do
           build_gem "depends_on_missing", "1.0.1" do |s|
             s.add_dependency "missing"
           end
@@ -406,7 +544,7 @@
       end
 
       it "fails" do
-        bundle :install, :artifice => "compact_index", :raise_on_error => false
+        bundle :install, artifice: "compact_index", raise_on_error: false
         expect(err).to end_with <<~E.strip
           Could not find compatible versions
 
@@ -422,19 +560,19 @@
     context "when a top-level gem has an indirect dependency" do
       before do
         build_repo gem_repo2 do
-          build_gem "depends_on_rack", "1.0.1" do |s|
-            s.add_dependency "rack"
+          build_gem "depends_on_myrack", "1.0.1" do |s|
+            s.add_dependency "myrack"
           end
         end
 
-        build_repo gem_repo3 do
+        build_repo3 do
           build_gem "unrelated_gem", "1.0.0"
         end
 
         gemfile <<-G
           source "https://gem.repo2"
 
-          gem "depends_on_rack"
+          gem "depends_on_myrack"
 
           source "https://gem.repo3" do
             gem "unrelated_gem"
@@ -445,37 +583,37 @@
       context "and the dependency is only in the top-level source" do
         before do
           update_repo gem_repo2 do
-            build_gem "rack", "1.0.0"
+            build_gem "myrack", "1.0.0"
           end
         end
 
         it "installs the dependency from the top-level source without warning" do
-          bundle :install, :artifice => "compact_index"
+          bundle :install, artifice: "compact_index"
           expect(err).not_to include("Warning")
-          expect(the_bundle).to include_gems("depends_on_rack 1.0.1", "rack 1.0.0", "unrelated_gem 1.0.0")
-          expect(the_bundle).to include_gems("depends_on_rack 1.0.1", "rack 1.0.0", :source => "remote2")
-          expect(the_bundle).to include_gems("unrelated_gem 1.0.0", :source => "remote3")
+          expect(the_bundle).to include_gems("depends_on_myrack 1.0.1", "myrack 1.0.0", "unrelated_gem 1.0.0")
+          expect(the_bundle).to include_gems("depends_on_myrack 1.0.1", "myrack 1.0.0", source: "remote2")
+          expect(the_bundle).to include_gems("unrelated_gem 1.0.0", source: "remote3")
         end
       end
 
       context "and the dependency is only in a pinned source" do
         before do
           update_repo gem_repo3 do
-            build_gem "rack", "1.0.0" do |s|
-              s.write "lib/rack.rb", "RACK = 'FAIL'"
+            build_gem "myrack", "1.0.0" do |s|
+              s.write "lib/myrack.rb", "MYRACK = 'FAIL'"
             end
           end
         end
 
         it "does not find the dependency" do
-          bundle :install, :artifice => "compact_index", :raise_on_error => false
+          bundle :install, artifice: "compact_index", raise_on_error: false
           expect(err).to end_with <<~E.strip
             Could not find compatible versions
 
-            Because every version of depends_on_rack depends on rack >= 0
-              and rack >= 0 could not be found in rubygems repository https://gem.repo2/ or installed locally,
-              depends_on_rack cannot be used.
-            So, because Gemfile depends on depends_on_rack >= 0,
+            Because every version of depends_on_myrack depends on myrack >= 0
+              and myrack >= 0 could not be found in rubygems repository https://gem.repo2/ or installed locally,
+              depends_on_myrack cannot be used.
+            So, because Gemfile depends on depends_on_myrack >= 0,
               version solving has failed.
           E
         end
@@ -484,36 +622,36 @@
       context "and the dependency is in both the top-level and a pinned source" do
         before do
           update_repo gem_repo2 do
-            build_gem "rack", "1.0.0"
+            build_gem "myrack", "1.0.0"
           end
 
           update_repo gem_repo3 do
-            build_gem "rack", "1.0.0" do |s|
-              s.write "lib/rack.rb", "RACK = 'FAIL'"
+            build_gem "myrack", "1.0.0" do |s|
+              s.write "lib/myrack.rb", "MYRACK = 'FAIL'"
             end
           end
         end
 
         it "installs the dependency from the top-level source without warning" do
-          bundle :install, :artifice => "compact_index"
+          bundle :install, artifice: "compact_index"
           expect(err).not_to include("Warning")
-          expect(run("require 'rack'; puts RACK")).to eq("1.0.0")
-          expect(the_bundle).to include_gems("depends_on_rack 1.0.1", "rack 1.0.0", "unrelated_gem 1.0.0")
-          expect(the_bundle).to include_gems("depends_on_rack 1.0.1", "rack 1.0.0", :source => "remote2")
-          expect(the_bundle).to include_gems("unrelated_gem 1.0.0", :source => "remote3")
+          expect(run("require 'myrack'; puts MYRACK")).to eq("1.0.0")
+          expect(the_bundle).to include_gems("depends_on_myrack 1.0.1", "myrack 1.0.0", "unrelated_gem 1.0.0")
+          expect(the_bundle).to include_gems("depends_on_myrack 1.0.1", "myrack 1.0.0", source: "remote2")
+          expect(the_bundle).to include_gems("unrelated_gem 1.0.0", source: "remote3")
         end
       end
     end
 
     context "when a scoped gem has a deeply nested indirect dependency" do
       before do
-        build_repo gem_repo3 do
-          build_gem "depends_on_depends_on_rack", "1.0.1" do |s|
-            s.add_dependency "depends_on_rack"
+        build_repo3 do
+          build_gem "depends_on_depends_on_myrack", "1.0.1" do |s|
+            s.add_dependency "depends_on_myrack"
           end
 
-          build_gem "depends_on_rack", "1.0.1" do |s|
-            s.add_dependency "rack"
+          build_gem "depends_on_myrack", "1.0.1" do |s|
+            s.add_dependency "myrack"
           end
         end
 
@@ -521,7 +659,7 @@
           source "https://gem.repo2"
 
           source "https://gem.repo3" do
-            gem "depends_on_depends_on_rack"
+            gem "depends_on_depends_on_myrack"
           end
         G
       end
@@ -529,15 +667,15 @@
       context "and the dependency is only in the top-level source" do
         before do
           update_repo gem_repo2 do
-            build_gem "rack", "1.0.0"
+            build_gem "myrack", "1.0.0"
           end
         end
 
         it "installs the dependency from the top-level source" do
-          bundle :install, :artifice => "compact_index"
-          expect(the_bundle).to include_gems("depends_on_depends_on_rack 1.0.1", "depends_on_rack 1.0.1", "rack 1.0.0")
-          expect(the_bundle).to include_gems("rack 1.0.0", :source => "remote2")
-          expect(the_bundle).to include_gems("depends_on_depends_on_rack 1.0.1", "depends_on_rack 1.0.1", :source => "remote3")
+          bundle :install, artifice: "compact_index"
+          expect(the_bundle).to include_gems("depends_on_depends_on_myrack 1.0.1", "depends_on_myrack 1.0.1", "myrack 1.0.0")
+          expect(the_bundle).to include_gems("myrack 1.0.0", source: "remote2")
+          expect(the_bundle).to include_gems("depends_on_depends_on_myrack 1.0.1", "depends_on_myrack 1.0.1", source: "remote3")
         end
       end
 
@@ -546,32 +684,32 @@
           build_repo2
 
           update_repo gem_repo3 do
-            build_gem "rack", "1.0.0"
+            build_gem "myrack", "1.0.0"
           end
         end
 
         it "installs the dependency from the pinned source" do
-          bundle :install, :artifice => "compact_index"
-          expect(the_bundle).to include_gems("depends_on_depends_on_rack 1.0.1", "depends_on_rack 1.0.1", "rack 1.0.0", :source => "remote3")
+          bundle :install, artifice: "compact_index"
+          expect(the_bundle).to include_gems("depends_on_depends_on_myrack 1.0.1", "depends_on_myrack 1.0.1", "myrack 1.0.0", source: "remote3")
         end
       end
 
       context "and the dependency is in both the top-level and a pinned source" do
         before do
           update_repo gem_repo2 do
-            build_gem "rack", "1.0.0" do |s|
-              s.write "lib/rack.rb", "RACK = 'FAIL'"
+            build_gem "myrack", "1.0.0" do |s|
+              s.write "lib/myrack.rb", "MYRACK = 'FAIL'"
             end
           end
 
           update_repo gem_repo3 do
-            build_gem "rack", "1.0.0"
+            build_gem "myrack", "1.0.0"
           end
         end
 
         it "installs the dependency from the pinned source without warning" do
-          bundle :install, :artifice => "compact_index"
-          expect(the_bundle).to include_gems("depends_on_depends_on_rack 1.0.1", "depends_on_rack 1.0.1", "rack 1.0.0", :source => "remote3")
+          bundle :install, artifice: "compact_index"
+          expect(the_bundle).to include_gems("depends_on_depends_on_myrack 1.0.1", "depends_on_myrack 1.0.1", "myrack 1.0.0", source: "remote3")
         end
       end
     end
@@ -604,12 +742,12 @@
           end
 
           build_gem "minitest", "5.14.3"
-          build_gem "rack", "2.2.3"
+          build_gem "myrack", "2.2.3"
           build_gem "redis", "4.2.5"
 
           build_gem "sidekiq", "6.1.3" do |s|
             s.add_dependency "connection_pool", ">= 2.2.2"
-            s.add_dependency "rack", "~> 2.0"
+            s.add_dependency "myrack", "~> 2.0"
             s.add_dependency "redis", ">= 4.2.0"
           end
 
@@ -626,7 +764,7 @@
           build_gem "zeitwerk", "2.4.2"
         end
 
-        build_repo gem_repo3 do
+        build_repo3 do
           build_gem "sidekiq-pro", "5.2.1" do |s|
             s.add_dependency "connection_pool", ">= 2.2.3"
             s.add_dependency "sidekiq", ">= 6.1.0"
@@ -645,6 +783,21 @@
           end
         G
 
+        @locked_checksums = checksums_section_when_enabled do |c|
+          c.checksum gem_repo2, "activesupport", "6.0.3.4"
+          c.checksum gem_repo2, "concurrent-ruby", "1.1.8"
+          c.checksum gem_repo2, "connection_pool", "2.2.3"
+          c.checksum gem_repo2, "i18n", "1.8.9"
+          c.checksum gem_repo2, "minitest", "5.14.3"
+          c.checksum gem_repo2, "myrack", "2.2.3"
+          c.checksum gem_repo2, "redis", "4.2.5"
+          c.checksum gem_repo2, "sidekiq", "6.1.3"
+          c.checksum gem_repo3, "sidekiq-pro", "5.2.1"
+          c.checksum gem_repo2, "thread_safe", "0.3.6"
+          c.checksum gem_repo2, "tzinfo", "1.2.9"
+          c.checksum gem_repo2, "zeitwerk", "2.4.2"
+        end
+
         lockfile <<~L
           GEM
             remote: https://gem.repo2/
@@ -661,11 +814,11 @@
               i18n (1.8.9)
                 concurrent-ruby (~> 1.0)
               minitest (5.14.3)
-              rack (2.2.3)
+              myrack (2.2.3)
               redis (4.2.5)
               sidekiq (6.1.3)
                 connection_pool (>= 2.2.2)
-                rack (~> 2.0)
+                myrack (~> 2.0)
                 redis (>= 4.2.0)
               sidekiq-pro (5.2.1)
                 connection_pool (>= 2.2.3)
@@ -676,19 +829,19 @@
               zeitwerk (2.4.2)
 
           PLATFORMS
-            #{local_platform}
+            #{lockfile_platforms}
 
           DEPENDENCIES
             activesupport
             sidekiq-pro!
-
+          #{@locked_checksums}
           BUNDLED WITH
              #{Bundler::VERSION}
         L
       end
 
       it "does not install newer versions but updates the lockfile format when running bundle install in non frozen mode, and doesn't warn" do
-        bundle :install, :artifice => "compact_index"
+        bundle :install, artifice: "compact_index"
         expect(err).to be_empty
 
         expect(the_bundle).to include_gems("activesupport 6.0.3.4")
@@ -713,11 +866,11 @@
               i18n (1.8.9)
                 concurrent-ruby (~> 1.0)
               minitest (5.14.3)
-              rack (2.2.3)
+              myrack (2.2.3)
               redis (4.2.5)
               sidekiq (6.1.3)
                 connection_pool (>= 2.2.2)
-                rack (~> 2.0)
+                myrack (~> 2.0)
                 redis (>= 4.2.0)
               thread_safe (0.3.6)
               tzinfo (1.2.9)
@@ -732,22 +885,22 @@
                 sidekiq (>= 6.1.0)
 
           PLATFORMS
-            #{local_platform}
+            #{lockfile_platforms}
 
           DEPENDENCIES
             activesupport
             sidekiq-pro!
-
+          #{@locked_checksums}
           BUNDLED WITH
              #{Bundler::VERSION}
         L
       end
 
-      it "does not install newer versions or generate lockfile changes when running bundle install in frozen mode, and warns", :bundler => "< 3" do
+      it "does not install newer versions or generate lockfile changes when running bundle install in frozen mode, and warns" do
         initial_lockfile = lockfile
 
         bundle "config set --local frozen true"
-        bundle :install, :artifice => "compact_index"
+        bundle :install, artifice: "compact_index"
 
         expect(err).to include("Your lockfile contains a single rubygems source section with multiple remotes, which is insecure.")
 
@@ -761,11 +914,11 @@
         expect(lockfile).to eq(initial_lockfile)
       end
 
-      it "fails when running bundle install in frozen mode", :bundler => "3" do
+      it "fails when running bundle install in frozen mode", bundler: "4" do
         initial_lockfile = lockfile
 
         bundle "config set --local frozen true"
-        bundle :install, :artifice => "compact_index", :raise_on_error => false
+        bundle :install, artifice: "compact_index", raise_on_error: false
 
         expect(err).to include("Your lockfile contains a single rubygems source section with multiple remotes, which is insecure.")
 
@@ -773,15 +926,21 @@
       end
 
       it "splits sections and upgrades gems when running bundle update, and doesn't warn" do
-        bundle "update --all", :artifice => "compact_index"
+        bundle "update --all", artifice: "compact_index"
         expect(err).to be_empty
 
         expect(the_bundle).not_to include_gems("activesupport 6.0.3.4")
         expect(the_bundle).to include_gems("activesupport 6.1.2.1")
+        @locked_checksums.checksum gem_repo2, "activesupport", "6.1.2.1"
+
         expect(the_bundle).not_to include_gems("tzinfo 1.2.9")
         expect(the_bundle).to include_gems("tzinfo 2.0.4")
+        @locked_checksums.checksum gem_repo2, "tzinfo", "2.0.4"
+        @locked_checksums.delete "thread_safe"
+
         expect(the_bundle).not_to include_gems("concurrent-ruby 1.1.8")
         expect(the_bundle).to include_gems("concurrent-ruby 1.1.9")
+        @locked_checksums.checksum gem_repo2, "concurrent-ruby", "1.1.9"
 
         expect(lockfile).to eq <<~L
           GEM
@@ -798,11 +957,11 @@
               i18n (1.8.9)
                 concurrent-ruby (~> 1.0)
               minitest (5.14.3)
-              rack (2.2.3)
+              myrack (2.2.3)
               redis (4.2.5)
               sidekiq (6.1.3)
                 connection_pool (>= 2.2.2)
-                rack (~> 2.0)
+                myrack (~> 2.0)
                 redis (>= 4.2.0)
               tzinfo (2.0.4)
                 concurrent-ruby (~> 1.0)
@@ -816,19 +975,19 @@
                 sidekiq (>= 6.1.0)
 
           PLATFORMS
-            #{local_platform}
+            #{lockfile_platforms}
 
           DEPENDENCIES
             activesupport
             sidekiq-pro!
-
+          #{@locked_checksums}
           BUNDLED WITH
              #{Bundler::VERSION}
         L
       end
 
       it "upgrades the lockfile format and upgrades the requested gem when running bundle update with an argument" do
-        bundle "update concurrent-ruby", :artifice => "compact_index"
+        bundle "update concurrent-ruby", artifice: "compact_index"
         expect(err).to be_empty
 
         expect(the_bundle).to include_gems("activesupport 6.0.3.4")
@@ -838,6 +997,8 @@
         expect(the_bundle).to include_gems("concurrent-ruby 1.1.9")
         expect(the_bundle).not_to include_gems("concurrent-ruby 1.1.8")
 
+        @locked_checksums.checksum gem_repo2, "concurrent-ruby", "1.1.9"
+
         expect(lockfile).to eq <<~L
           GEM
             remote: https://gem.repo2/
@@ -853,11 +1014,11 @@
               i18n (1.8.9)
                 concurrent-ruby (~> 1.0)
               minitest (5.14.3)
-              rack (2.2.3)
+              myrack (2.2.3)
               redis (4.2.5)
               sidekiq (6.1.3)
                 connection_pool (>= 2.2.2)
-                rack (~> 2.0)
+                myrack (~> 2.0)
                 redis (>= 4.2.0)
               thread_safe (0.3.6)
               tzinfo (1.2.9)
@@ -872,12 +1033,12 @@
                 sidekiq (>= 6.1.0)
 
           PLATFORMS
-            #{local_platform}
+            #{lockfile_platforms}
 
           DEPENDENCIES
             activesupport
             sidekiq-pro!
-
+          #{@locked_checksums}
           BUNDLED WITH
              #{Bundler::VERSION}
         L
@@ -886,8 +1047,8 @@
 
     context "when a top-level gem has an indirect dependency present in the default source, but with a different version from the one resolved" do
       before do
-        build_lib "activesupport", "7.0.0.alpha", :path => lib_path("rails/activesupport")
-        build_lib "rails", "7.0.0.alpha", :path => lib_path("rails") do |s|
+        build_lib "activesupport", "7.0.0.alpha", path: lib_path("rails/activesupport")
+        build_lib "rails", "7.0.0.alpha", path: lib_path("rails") do |s|
           s.add_dependency "activesupport", "= 7.0.0.alpha"
         end
 
@@ -909,17 +1070,17 @@
       end
 
       it "installs all gems without warning" do
-        bundle :install, :artifice => "compact_index"
+        bundle :install, artifice: "compact_index"
         expect(err).not_to include("Warning")
         expect(the_bundle).to include_gems("activesupport 7.0.0.alpha", "rails 7.0.0.alpha")
-        expect(the_bundle).to include_gems("activesupport 7.0.0.alpha", :source => "path@#{lib_path("rails/activesupport")}")
-        expect(the_bundle).to include_gems("rails 7.0.0.alpha", :source => "path@#{lib_path("rails")}")
+        expect(the_bundle).to include_gems("activesupport 7.0.0.alpha", source: "path@#{lib_path("rails/activesupport")}")
+        expect(the_bundle).to include_gems("rails 7.0.0.alpha", source: "path@#{lib_path("rails")}")
       end
     end
 
     context "when a pinned gem has an indirect dependency with more than one level of indirection in the default source " do
       before do
-        build_repo gem_repo3 do
+        build_repo3 do
           build_gem "handsoap", "0.2.5.5" do |s|
             s.add_dependency "nokogiri", ">= 1.2.3"
           end
@@ -945,6 +1106,12 @@
       end
 
       it "installs from the default source without any warnings or errors and generates a proper lockfile" do
+        checksums = checksums_section_when_enabled do |c|
+          c.checksum gem_repo3, "handsoap", "0.2.5.5"
+          c.checksum gem_repo2, "nokogiri", "1.11.1"
+          c.checksum gem_repo2, "racca", "1.5.2"
+        end
+
         expected_lockfile = <<~L
           GEM
             remote: https://gem.repo2/
@@ -960,41 +1127,41 @@
                 nokogiri (>= 1.2.3)
 
           PLATFORMS
-            #{local_platform}
+            #{lockfile_platforms}
 
           DEPENDENCIES
             handsoap!
             nokogiri
-
+          #{checksums}
           BUNDLED WITH
              #{Bundler::VERSION}
         L
 
-        bundle "install --verbose", :artifice => "compact_index"
+        bundle "install --verbose", artifice: "compact_index"
         expect(err).not_to include("Warning")
         expect(the_bundle).to include_gems("handsoap 0.2.5.5", "nokogiri 1.11.1", "racca 1.5.2")
-        expect(the_bundle).to include_gems("handsoap 0.2.5.5", :source => "remote3")
-        expect(the_bundle).to include_gems("nokogiri 1.11.1", "racca 1.5.2", :source => "remote2")
+        expect(the_bundle).to include_gems("handsoap 0.2.5.5", source: "remote3")
+        expect(the_bundle).to include_gems("nokogiri 1.11.1", "racca 1.5.2", source: "remote2")
         expect(lockfile).to eq(expected_lockfile)
 
         # Even if the gems are already installed
         FileUtils.rm bundled_app_lock
-        bundle "install --verbose", :artifice => "compact_index"
+        bundle "install --verbose", artifice: "compact_index"
         expect(err).not_to include("Warning")
         expect(the_bundle).to include_gems("handsoap 0.2.5.5", "nokogiri 1.11.1", "racca 1.5.2")
-        expect(the_bundle).to include_gems("handsoap 0.2.5.5", :source => "remote3")
-        expect(the_bundle).to include_gems("nokogiri 1.11.1", "racca 1.5.2", :source => "remote2")
+        expect(the_bundle).to include_gems("handsoap 0.2.5.5", source: "remote3")
+        expect(the_bundle).to include_gems("nokogiri 1.11.1", "racca 1.5.2", source: "remote2")
         expect(lockfile).to eq(expected_lockfile)
       end
     end
 
     context "with a gem that is only found in the wrong source" do
       before do
-        build_repo gem_repo3 do
+        build_repo3 do
           build_gem "not_in_repo1", "1.0.0"
         end
 
-        install_gemfile <<-G, :artifice => "compact_index", :raise_on_error => false
+        install_gemfile <<-G, artifice: "compact_index", raise_on_error: false
           source "https://gem.repo3"
           gem "not_in_repo1", :source => "https://gem.repo1"
         G
@@ -1007,7 +1174,7 @@
 
     context "with an existing lockfile" do
       before do
-        system_gems "rack-0.9.1", "rack-1.0.0", :path => default_bundle_path
+        system_gems "myrack-0.9.1", "myrack-1.0.0", path: default_bundle_path
 
         lockfile <<-L
           GEM
@@ -1017,26 +1184,26 @@
           GEM
             remote: https://gem.repo3
             specs:
-              rack (0.9.1)
+              myrack (0.9.1)
 
           PLATFORMS
-            #{local_platform}
+            #{lockfile_platforms}
 
           DEPENDENCIES
-            rack!
+            myrack!
         L
 
         gemfile <<-G
           source "https://gem.repo1"
           source "https://gem.repo3" do
-            gem 'rack'
+            gem 'myrack'
           end
         G
       end
 
       # Reproduction of https://github.com/rubygems/bundler/issues/3298
       it "does not unlock the installed gem on exec" do
-        expect(the_bundle).to include_gems("rack 0.9.1")
+        expect(the_bundle).to include_gems("myrack 0.9.1")
       end
     end
 
@@ -1047,13 +1214,13 @@
             remote: https://gem.repo1/
             remote: https://gem.repo3/
             specs:
-              rack (0.9.1)
+              myrack (0.9.1)
 
           PLATFORMS
-            #{local_platform}
+            #{lockfile_platforms}
 
           DEPENDENCIES
-            rack!
+            myrack!
 
           BUNDLED WITH
              #{Bundler::VERSION}
@@ -1069,13 +1236,13 @@
           GEM
             remote: https://gem.repo3/
             specs:
-              rack (0.9.1)
+              myrack (0.9.1)
 
           PLATFORMS
-            #{local_platform}
+            #{lockfile_platforms}
 
           DEPENDENCIES
-            rack!
+            myrack!
 
           BUNDLED WITH
              #{Bundler::VERSION}
@@ -1083,34 +1250,62 @@
       end
 
       before do
-        build_repo gem_repo3 do
-          build_gem "rack", "0.9.1"
+        build_repo3 do
+          build_gem "myrack", "0.9.1"
         end
 
         gemfile <<-G
           source "https://gem.repo1"
           source "https://gem.repo3" do
-            gem 'rack'
+            gem 'myrack'
           end
         G
 
         lockfile aggregate_gem_section_lockfile
       end
 
-      it "installs the existing lockfile but prints a warning", :bundler => "< 3" do
+      it "installs the existing lockfile but prints a warning when checksum validation is disabled" do
         bundle "config set --local deployment true"
+        bundle "config set --local disable_checksum_validation true"
 
-        bundle "install", :artifice => "compact_index"
+        bundle "install", artifice: "compact_index"
 
         expect(lockfile).to eq(aggregate_gem_section_lockfile)
         expect(err).to include("Your lockfile contains a single rubygems source section with multiple remotes, which is insecure.")
-        expect(the_bundle).to include_gems("rack 0.9.1", :source => "remote3")
+        expect(the_bundle).to include_gems("myrack 0.9.1", source: "remote3")
+      end
+
+      it "prints a checksum warning when the checksums from both sources do not match" do
+        bundle "config set --local deployment true"
+
+        bundle "install", artifice: "compact_index", raise_on_error: false
+
+        api_checksum1 = checksum_digest(gem_repo1, "myrack", "0.9.1")
+        api_checksum3 = checksum_digest(gem_repo3, "myrack", "0.9.1")
+
+        expect(exitstatus).to eq(37)
+        expect(err).to eq(<<~E.strip)
+          [DEPRECATED] Your lockfile contains a single rubygems source section with multiple remotes, which is insecure. Make sure you run `bundle install` in non frozen mode and commit the result to make your lockfile secure.
+          Bundler found mismatched checksums. This is a potential security risk.
+            myrack (0.9.1) sha256=#{api_checksum3}
+              from the API at https://gem.repo3/
+            myrack (0.9.1) sha256=#{api_checksum1}
+              from the API at https://gem.repo1/
+
+          Mismatched checksums each have an authoritative source:
+            1. the API at https://gem.repo3/
+            2. the API at https://gem.repo1/
+          You may need to alter your Gemfile sources to resolve this issue.
+
+          To ignore checksum security warnings, disable checksum validation with
+            `bundle config set --local disable_checksum_validation true`
+        E
       end
 
-      it "refuses to install the existing lockfile and prints an error", :bundler => "3" do
+      it "refuses to install the existing lockfile and prints an error", bundler: "4" do
         bundle "config set --local deployment true"
 
-        bundle "install", :artifice => "compact_index", :raise_on_error => false
+        bundle "install", artifice: "compact_index", raise_on_error: false
 
         expect(lockfile).to eq(aggregate_gem_section_lockfile)
         expect(err).to include("Your lockfile contains a single rubygems source section with multiple remotes, which is insecure.")
@@ -1123,14 +1318,14 @@
         build_lib "foo"
 
         gemfile <<-G
-          source "#{file_uri_for(gem_repo1)}"
-          gem "rack", :source => "https://gem.repo1"
+          source "https://gem.repo1"
+          gem "myrack", :source => "https://gem.repo1"
           gem "foo", :path => "#{lib_path("foo-1.0")}"
         G
       end
 
       it "does not unlock the non-path gem after install" do
-        bundle :install, :artifice => "compact_index"
+        bundle :install, artifice: "compact_index"
 
         bundle %(exec ruby -e 'puts "OK"')
 
@@ -1141,17 +1336,17 @@
 
   context "when an older version of the same gem also ships with Ruby" do
     before do
-      system_gems "rack-0.9.1"
+      system_gems "myrack-0.9.1"
 
-      install_gemfile <<-G, :artifice => "compact_index"
+      install_gemfile <<-G, artifice: "compact_index"
         source "https://gem.repo1"
-        gem "rack" # should come from repo1!
+        gem "myrack" # should come from repo1!
       G
     end
 
     it "installs the gems without any warning" do
       expect(err).not_to include("Warning")
-      expect(the_bundle).to include_gems("rack 1.0.0")
+      expect(the_bundle).to include_gems("myrack 1.0.0")
     end
   end
 
@@ -1166,13 +1361,13 @@
       # Installing this gemfile...
       gemfile <<-G
         source 'https://gem.repo1'
-        gem 'rack'
+        gem 'myrack'
         gem 'foo', '~> 0.1', :source => 'https://gem.repo4'
         gem 'bar', '~> 0.1', :source => 'https://gem.repo4'
       G
 
       bundle "config set --local path ../gems/system"
-      bundle :install, :artifice => "compact_index"
+      bundle :install, artifice: "compact_index"
 
       # And then we add some new versions...
       update_repo4 do
@@ -1183,9 +1378,9 @@
 
     it "allows them to be unlocked separately" do
       # And install this gemfile, updating only foo.
-      install_gemfile <<-G, :artifice => "compact_index"
+      install_gemfile <<-G, artifice: "compact_index"
         source 'https://gem.repo1'
-        gem 'rack'
+        gem 'myrack'
         gem 'foo', '~> 0.2', :source => 'https://gem.repo4'
         gem 'bar', '~> 0.1', :source => 'https://gem.repo4'
       G
@@ -1198,8 +1393,8 @@
   context "re-resolving" do
     context "when there is a mix of sources in the gemfile" do
       before do
-        build_repo gem_repo3 do
-          build_gem "rack"
+        build_repo3 do
+          build_gem "myrack"
         end
 
         build_lib "path1"
@@ -1207,12 +1402,12 @@
         build_git "git1"
         build_git "git2"
 
-        install_gemfile <<-G, :artifice => "compact_index"
+        install_gemfile <<-G, artifice: "compact_index"
           source "https://gem.repo1"
           gem "rails"
 
           source "https://gem.repo3" do
-            gem "rack"
+            gem "myrack"
           end
 
           gem "path1", :path => "#{lib_path("path1-1.0")}"
@@ -1223,7 +1418,7 @@
       end
 
       it "does not re-resolve" do
-        bundle :install, :artifice => "compact_index", :verbose => true
+        bundle :install, artifice: "compact_index", verbose: true
         expect(out).to include("using resolution from the lockfile")
         expect(out).not_to include("re-resolving dependencies")
       end
@@ -1232,28 +1427,28 @@
 
   context "when a gem is installed to system gems" do
     before do
-      install_gemfile <<-G, :artifice => "compact_index"
+      install_gemfile <<-G, artifice: "compact_index"
         source "https://gem.repo1"
-        gem "rack"
+        gem "myrack"
       G
     end
 
     context "and the gemfile changes" do
       it "is still able to find that gem from remote sources" do
         build_repo4 do
-          build_gem "rack", "2.0.1.1.forked"
+          build_gem "myrack", "2.0.1.1.forked"
           build_gem "thor", "0.19.1.1.forked"
         end
 
         # When this gemfile is installed...
-        install_gemfile <<-G, :artifice => "compact_index"
+        install_gemfile <<-G, artifice: "compact_index"
           source "https://gem.repo1"
 
           source "https://gem.repo4" do
-            gem "rack", "2.0.1.1.forked"
+            gem "myrack", "2.0.1.1.forked"
             gem "thor"
           end
-          gem "rack-obama"
+          gem "myrack-obama"
         G
 
         # Then we change the Gemfile by adding a version to thor
@@ -1261,47 +1456,47 @@
           source "https://gem.repo1"
 
           source "https://gem.repo4" do
-            gem "rack", "2.0.1.1.forked"
+            gem "myrack", "2.0.1.1.forked"
             gem "thor", "0.19.1.1.forked"
           end
-          gem "rack-obama"
+          gem "myrack-obama"
         G
 
-        # But we should still be able to find rack 2.0.1.1.forked and install it
-        bundle :install, :artifice => "compact_index"
+        # But we should still be able to find myrack 2.0.1.1.forked and install it
+        bundle :install, artifice: "compact_index"
       end
     end
   end
 
   describe "source changed to one containing a higher version of a dependency" do
     before do
-      install_gemfile <<-G, :artifice => "compact_index"
+      install_gemfile <<-G, artifice: "compact_index"
         source "https://gem.repo1"
 
-        gem "rack"
+        gem "myrack"
       G
 
       build_repo2 do
-        build_gem "rack", "1.2" do |s|
-          s.executables = "rackup"
+        build_gem "myrack", "1.2" do |s|
+          s.executables = "myrackup"
         end
 
         build_gem "bar"
       end
 
-      build_lib("gemspec_test", :path => tmp.join("gemspec_test")) do |s|
+      build_lib("gemspec_test", path: tmp("gemspec_test")) do |s|
         s.add_dependency "bar", "=1.0.0"
       end
 
-      install_gemfile <<-G, :artifice => "compact_index"
+      install_gemfile <<-G, artifice: "compact_index"
         source "https://gem.repo2"
-        gem "rack"
-        gemspec :path => "#{tmp.join("gemspec_test")}"
+        gem "myrack"
+        gemspec :path => "#{tmp("gemspec_test")}"
       G
     end
 
     it "conservatively installs the existing locked version" do
-      expect(the_bundle).to include_gems("rack 1.0.0")
+      expect(the_bundle).to include_gems("myrack 1.0.0")
     end
   end
 
@@ -1311,18 +1506,18 @@
         build_gem "bar"
       end
 
-      build_lib("gemspec_test", :path => tmp.join("gemspec_test")) do |s|
+      build_lib("gemspec_test", path: tmp("gemspec_test")) do |s|
         s.add_development_dependency "bar"
       end
 
-      install_gemfile <<-G, :artifice => "compact_index"
+      install_gemfile <<-G, artifice: "compact_index"
         source "https://gem.repo1"
 
         source "https://gem.repo4" do
           gem "bar"
         end
 
-        gemspec :path => "#{tmp.join("gemspec_test")}"
+        gemspec :path => "#{tmp("gemspec_test")}"
       G
     end
 
@@ -1340,7 +1535,7 @@
       build_gem "example", "1.0.2"
     end
 
-    install_gemfile <<-G, :artifice => "compact_index"
+    install_gemfile <<-G, artifice: "compact_index"
       source "https://gem.repo4"
 
       gem "example", :source => "https://gem.repo2"
@@ -1349,9 +1544,9 @@
     bundle "info example"
     expect(out).to include("example (0.1.0)")
 
-    system_gems "example-1.0.2", :path => default_bundle_path, :gem_repo => gem_repo4
+    system_gems "example-1.0.2", path: default_bundle_path, gem_repo: gem_repo4
 
-    bundle "update example --verbose", :artifice => "compact_index"
+    bundle "update example --verbose", artifice: "compact_index"
     expect(out).not_to include("Using example 1.0.2")
     expect(out).to include("Using example 0.1.0")
   end
@@ -1365,11 +1560,9 @@
       end
     G
 
-    simulate_bundler_version_when_missing_prerelease_default_gem_activation do
-      ruby <<~R, :raise_on_error => false
-        require 'bundler/setup'
-      R
-    end
+    ruby <<~R, raise_on_error: false
+      require 'bundler/setup'
+    R
 
     expect(last_command).to be_failure
     expect(err).to include("Could not find gem 'example' in locally installed gems.")
@@ -1384,36 +1577,36 @@
       end
     G
 
-    bundle "install", :artifice => nil, :raise_on_error => false
+    bundle "install", artifice: nil, raise_on_error: false
 
     expect(last_command).to be_failure
     expect(err).to include("Could not reach host gem.repo4. Check your network connection and try again.")
   end
 
-  context "when an indirect dependency is available from multiple ambiguous sources", :bundler => "< 3" do
+  context "when an indirect dependency is available from multiple ambiguous sources" do
     it "succeeds but warns, suggesting a source block" do
       build_repo4 do
-        build_gem "depends_on_rack" do |s|
-          s.add_dependency "rack"
+        build_gem "depends_on_myrack" do |s|
+          s.add_dependency "myrack"
         end
-        build_gem "rack"
+        build_gem "myrack"
       end
 
-      install_gemfile <<-G, :artifice => "compact_index", :raise_on_error => false
-        source "#{file_uri_for(gem_repo1)}"
+      install_gemfile <<-G, artifice: "compact_index_extra_api", raise_on_error: false
+        source "https://global.source"
 
-        source "https://gem.repo4" do
-          gem "depends_on_rack"
+        source "https://scoped.source/extra" do
+          gem "depends_on_myrack"
         end
 
-        source "https://gem.repo1" do
+        source "https://scoped.source" do
           gem "thin"
         end
       G
       expect(err).to eq <<~EOS.strip
-        Warning: The gem 'rack' was found in multiple relevant sources.
-          * rubygems repository https://gem.repo1/
-          * rubygems repository https://gem.repo4/
+        Warning: The gem 'myrack' was found in multiple relevant sources.
+          * rubygems repository https://scoped.source/
+          * rubygems repository https://scoped.source/extra/
         You should add this gem to the source block for the source you wish it to be installed from.
       EOS
       expect(last_command).to be_success
@@ -1421,29 +1614,31 @@
     end
   end
 
-  context "when an indirect dependency is available from multiple ambiguous sources", :bundler => "3" do
+  context "when an indirect dependency is available from multiple ambiguous sources", bundler: "4" do
     it "raises, suggesting a source block" do
       build_repo4 do
-        build_gem "depends_on_rack" do |s|
-          s.add_dependency "rack"
+        build_gem "depends_on_myrack" do |s|
+          s.add_dependency "myrack"
         end
-        build_gem "rack"
+        build_gem "myrack"
       end
 
-      install_gemfile <<-G, :artifice => "compact_index", :raise_on_error => false
-        source "#{file_uri_for(gem_repo1)}"
-        source "https://gem.repo4" do
-          gem "depends_on_rack"
+      install_gemfile <<-G, artifice: "compact_index_extra_api", raise_on_error: false
+        source "https://global.source"
+
+        source "https://scoped.source/extra" do
+          gem "depends_on_myrack"
         end
-        source "https://gem.repo1" do
+
+        source "https://scoped.source" do
           gem "thin"
         end
       G
       expect(last_command).to be_failure
       expect(err).to eq <<~EOS.strip
-        The gem 'rack' was found in multiple relevant sources.
-          * rubygems repository https://gem.repo1/
-          * rubygems repository https://gem.repo4/
+        The gem 'myrack' was found in multiple relevant sources.
+          * rubygems repository https://scoped.source/
+          * rubygems repository https://scoped.source/extra/
         You must add this gem to the source block for the source you wish it to be installed from.
       EOS
       expect(the_bundle).not_to be_locked
@@ -1484,16 +1679,23 @@
             mime-types (3.3.1)
 
         PLATFORMS
-          #{local_platform}
+          #{lockfile_platforms}
 
         DEPENDENCIES
           capybara (~> 2.5.0)
           mime-types (~> 3.0)!
+
+        CHECKSUMS
       L
     end
 
     it "upgrades the lockfile correctly" do
-      bundle "lock --update", :artifice => "compact_index"
+      bundle "lock --update", artifice: "compact_index"
+
+      checksums = checksums_section_when_enabled do |c|
+        c.checksum gem_repo2, "capybara", "2.5.0"
+        c.checksum gem_repo4, "mime-types", "3.0.0"
+      end
 
       expect(lockfile).to eq <<~L
         GEM
@@ -1508,12 +1710,12 @@
             mime-types (3.0.0)
 
         PLATFORMS
-          #{local_platform}
+          #{lockfile_platforms}
 
         DEPENDENCIES
           capybara (~> 2.5.0)
           mime-types (~> 3.0)!
-
+        #{checksums}
         BUNDLED WITH
            #{Bundler::VERSION}
       L
@@ -1540,33 +1742,38 @@
       end
 
       gemfile <<~G
-        source "https://localgemserver.test"
+        source "https://gem.repo4"
 
-        gem "ruport", "= 1.7.0.3", :source => "https://localgemserver.test/extra"
+        gem "ruport", "= 1.7.0.3", :source => "https://gem.repo4/extra"
       G
     end
 
     it "handles that fine" do
-      bundle "install", :artifice => "compact_index_extra", :env => { "BUNDLER_SPEC_GEM_REPO" => gem_repo4.to_s }
+      bundle "install", artifice: "compact_index_extra"
+
+      checksums = checksums_section_when_enabled do |c|
+        c.checksum gem_repo4, "pdf-writer", "1.1.8"
+        c.checksum gem_repo2, "ruport", "1.7.0.3"
+      end
 
       expect(lockfile).to eq <<~L
         GEM
-          remote: https://localgemserver.test/
+          remote: https://gem.repo4/
           specs:
             pdf-writer (1.1.8)
 
         GEM
-          remote: https://localgemserver.test/extra/
+          remote: https://gem.repo4/extra/
           specs:
             ruport (1.7.0.3)
               pdf-writer (= 1.1.8)
 
         PLATFORMS
-          #{local_platform}
+          #{lockfile_platforms}
 
         DEPENDENCIES
           ruport (= 1.7.0.3)!
-
+        #{checksums}
         BUNDLED WITH
            #{Bundler::VERSION}
       L
@@ -1593,33 +1800,38 @@
       end
 
       gemfile <<~G
-        source "https://localgemserver.test"
+        source "https://gem.repo4"
 
-        gem "ruport", "= 1.7.0.3", :source => "https://localgemserver.test/extra"
+        gem "ruport", "= 1.7.0.3", :source => "https://gem.repo4/extra"
       G
     end
 
     it "handles that fine" do
-      bundle "install", :artifice => "compact_index_extra", :env => { "BUNDLER_SPEC_GEM_REPO" => gem_repo4.to_s }
+      bundle "install", artifice: "compact_index_extra"
+
+      checksums = checksums_section_when_enabled do |c|
+        c.checksum gem_repo4, "pdf-writer", "1.1.8"
+        c.checksum gem_repo2, "ruport", "1.7.0.3"
+      end
 
       expect(lockfile).to eq <<~L
         GEM
-          remote: https://localgemserver.test/
+          remote: https://gem.repo4/
           specs:
             pdf-writer (1.1.8)
 
         GEM
-          remote: https://localgemserver.test/extra/
+          remote: https://gem.repo4/extra/
           specs:
             ruport (1.7.0.3)
               pdf-writer (= 1.1.8)
 
         PLATFORMS
-          #{local_platform}
+          #{lockfile_platforms}
 
         DEPENDENCIES
           ruport (= 1.7.0.3)!
-
+        #{checksums}
         BUNDLED WITH
            #{Bundler::VERSION}
       L
@@ -1640,27 +1852,31 @@
       end
 
       gemfile <<~G
-        source "https://localgemserver.test"
+        source "https://gem.repo4"
 
         gem "pdf-writer", "= 1.1.8"
       G
     end
 
     it "handles that fine" do
-      bundle "install --verbose", :artifice => "endpoint", :env => { "BUNDLER_SPEC_GEM_REPO" => gem_repo4.to_s }
+      bundle "install --verbose", artifice: "endpoint"
+
+      checksums = checksums_section_when_enabled do |c|
+        c.checksum gem_repo4, "pdf-writer", "1.1.8"
+      end
 
       expect(lockfile).to eq <<~L
         GEM
-          remote: https://localgemserver.test/
+          remote: https://gem.repo4/
           specs:
             pdf-writer (1.1.8)
 
         PLATFORMS
-          #{local_platform}
+          #{lockfile_platforms}
 
         DEPENDENCIES
           pdf-writer (= 1.1.8)
-
+        #{checksums}
         BUNDLED WITH
            #{Bundler::VERSION}
       L
@@ -1679,7 +1895,7 @@
         build_gem "example", "1.0.0"
       end
 
-      install_gemfile <<~G, :artifice => "compact_index"
+      install_gemfile <<~G, artifice: "compact_index"
         source "https://gem.repo2"
 
         source "https://gem.repo4" do
@@ -1699,10 +1915,76 @@
 
     it "shows a proper error message and does not generate a corrupted lockfile" do
       expect do
-        bundle :install, :artifice => "compact_index", :raise_on_error => false, :env => { "BUNDLER_SPEC_GEM_REPO" => gem_repo4.to_s }
+        bundle :install, artifice: "compact_index", raise_on_error: false, env: { "BUNDLER_SPEC_GEM_REPO" => gem_repo4.to_s }
       end.not_to change { lockfile }
 
       expect(err).to include("Could not find gem 'example' in rubygems repository https://gem.repo4/")
     end
   end
+
+  context "when a gem has versions in two sources, but only the locked one has updates" do
+    let(:original_lockfile) do
+      <<~L
+        GEM
+          remote: https://main.source/
+          specs:
+            activesupport (1.0)
+              bigdecimal
+            bigdecimal (1.0.0)
+
+        GEM
+          remote: https://main.source/extra/
+          specs:
+            foo (1.0)
+              bigdecimal
+
+        PLATFORMS
+          #{lockfile_platforms}
+
+        DEPENDENCIES
+          activesupport
+          foo!
+
+        BUNDLED WITH
+           #{Bundler::VERSION}
+      L
+    end
+
+    before do
+      build_repo3 do
+        build_gem "activesupport" do |s|
+          s.add_dependency "bigdecimal"
+        end
+
+        build_gem "bigdecimal", "1.0.0"
+        build_gem "bigdecimal", "3.3.1"
+      end
+
+      build_repo4 do
+        build_gem "foo" do |s|
+          s.add_dependency "bigdecimal"
+        end
+
+        build_gem "bigdecimal", "1.0.0"
+      end
+
+      gemfile <<~G
+        source "https://main.source"
+
+        gem "activesupport"
+
+        source "https://main.source/extra" do
+          gem "foo"
+        end
+      G
+
+      lockfile original_lockfile
+    end
+
+    it "properly upgrades the lockfile when updating that specific gem" do
+      bundle "update bigdecimal --conservative", artifice: "compact_index_extra_api", env: { "BUNDLER_SPEC_GEM_REPO" => gem_repo3.to_s }
+
+      expect(lockfile).to eq original_lockfile.gsub("bigdecimal (1.0.0)", "bigdecimal (3.3.1)")
+    end
+  end
 end
diff --git a/spec/bundler/install/gemfile/specific_platform_spec.rb b/spec/bundler/install/gemfile/specific_platform_spec.rb
index cab53a663a9fc1..228ae7b0d06cc1 100644
--- a/spec/bundler/install/gemfile/specific_platform_spec.rb
+++ b/spec/bundler/install/gemfile/specific_platform_spec.rb
@@ -2,7 +2,7 @@
 
 RSpec.describe "bundle install with specific platforms" do
   let(:google_protobuf) { <<-G }
-    source "#{file_uri_for(gem_repo2)}"
+    source "https://gem.repo2"
     gem "google-protobuf"
   G
 
@@ -11,11 +11,57 @@
       setup_multiplatform_gem
       install_gemfile(google_protobuf)
       allow(Bundler::SharedHelpers).to receive(:find_gemfile).and_return(bundled_app_gemfile)
-      expect(the_bundle.locked_gems.platforms).to eq([pl("x86_64-darwin-15")])
+      expect(the_bundle.locked_platforms).to include("universal-darwin")
       expect(the_bundle).to include_gem("google-protobuf 3.0.0.alpha.5.0.5.1 universal-darwin")
-      expect(the_bundle.locked_gems.specs.map(&:full_name)).to eq(%w[
-        google-protobuf-3.0.0.alpha.5.0.5.1-universal-darwin
-      ])
+      expect(the_bundle.locked_gems.specs.map(&:full_name)).to include(
+        "google-protobuf-3.0.0.alpha.5.0.5.1-universal-darwin"
+      )
+    end
+  end
+
+  it "still installs the platform specific variant when locked only to ruby, and the platform specific variant has different dependencies" do
+    simulate_platform "x86_64-darwin-15" do
+      build_repo4 do
+        build_gem("sass-embedded", "1.72.0") do |s|
+          s.add_dependency "rake"
+        end
+
+        build_gem("sass-embedded", "1.72.0") do |s|
+          s.platform = "x86_64-darwin-15"
+        end
+
+        build_gem "rake"
+      end
+
+      gemfile <<~G
+        source "https://gem.repo4"
+
+        gem "sass-embedded"
+      G
+
+      lockfile <<~L
+        GEM
+          remote: https://gem.repo4/
+          specs:
+            rake (1.0)
+            sass-embedded (1.72.0)
+              rake
+
+        PLATFORMS
+          ruby
+
+        DEPENDENCIES
+          sass-embedded
+
+        BUNDLED WITH
+           #{Bundler::VERSION}
+      L
+
+      bundle "install --verbose"
+      expect(err).to include("The following platform specific gems are getting installed, yet the lockfile includes only their generic ruby version")
+      expect(out).to include("Installing sass-embedded 1.72.0 (x86_64-darwin-15)")
+
+      expect(the_bundle).to include_gem("sass-embedded 1.72.0 x86_64-darwin-15")
     end
   end
 
@@ -23,17 +69,15 @@
     simulate_platform "x86_64-darwin-15" do
       setup_multiplatform_gem
 
-      system_gems "bundler-2.1.4"
-
       # Consistent location to install and look for gems
-      bundle "config set --local path vendor/bundle", :env => { "BUNDLER_VERSION" => "2.1.4" }
+      bundle "config set --local path vendor/bundle"
 
-      install_gemfile(google_protobuf, :env => { "BUNDLER_VERSION" => "2.1.4" })
+      install_gemfile(google_protobuf)
 
       # simulate lockfile created with old bundler, which only locks for ruby platform
       lockfile <<-L
         GEM
-          remote: #{file_uri_for(gem_repo2)}/
+          remote: https://gem.repo2/
           specs:
             google-protobuf (3.0.0.alpha.5.0.5.1)
 
@@ -44,32 +88,34 @@
           google-protobuf
 
         BUNDLED WITH
-           2.1.4
+           #{Bundler::VERSION}
       L
 
-      # force strict usage of the lock file by setting frozen mode
-      bundle "config set --local frozen true", :env => { "BUNDLER_VERSION" => "2.1.4" }
+      # force strict usage of the lockfile by setting frozen mode
+      bundle "config set --local frozen true"
 
       # make sure the platform that got actually installed with the old bundler is used
       expect(the_bundle).to include_gem("google-protobuf 3.0.0.alpha.5.0.5.1 universal-darwin")
     end
   end
 
-  it "understands that a non-platform specific gem in a new lockfile locked only to RUBY doesn't necessarily mean installing the non-specific variant" do
+  it "understands that a non-platform specific gem in a new lockfile locked only to ruby doesn't necessarily mean installing the non-specific variant" do
     simulate_platform "x86_64-darwin-15" do
       setup_multiplatform_gem
 
-      system_gems "bundler-2.1.4"
-
       # Consistent location to install and look for gems
-      bundle "config set --local path vendor/bundle", :env => { "BUNDLER_VERSION" => "2.1.4" }
+      bundle "config set --local path vendor/bundle"
 
       gemfile google_protobuf
 
+      checksums = checksums_section_when_enabled do |c|
+        c.checksum gem_repo2, "google-protobuf", "3.0.0.alpha.4.0"
+      end
+
       # simulate lockfile created with old bundler, which only locks for ruby platform
       lockfile <<-L
         GEM
-          remote: #{file_uri_for(gem_repo2)}/
+          remote: https://gem.repo2/
           specs:
             google-protobuf (3.0.0.alpha.4.0)
 
@@ -78,12 +124,15 @@
 
         DEPENDENCIES
           google-protobuf
-
+        #{checksums}
         BUNDLED WITH
-           2.1.4
+           #{Bundler::VERSION}
       L
 
-      bundle "update", :env => { "BUNDLER_VERSION" => Bundler::VERSION }
+      bundle "update"
+      expect(err).to include("The following platform specific gems are getting installed, yet the lockfile includes only their generic ruby version")
+
+      checksums.checksum gem_repo2, "google-protobuf", "3.0.0.alpha.5.0.5.1"
 
       # make sure the platform that the platform specific dependency is used, since we're only locked to ruby
       expect(the_bundle).to include_gem("google-protobuf 3.0.0.alpha.5.0.5.1 universal-darwin")
@@ -91,7 +140,7 @@
       # make sure we're still only locked to ruby
       expect(lockfile).to eq <<~L
         GEM
-          remote: #{file_uri_for(gem_repo2)}/
+          remote: https://gem.repo2/
           specs:
             google-protobuf (3.0.0.alpha.5.0.5.1)
 
@@ -100,14 +149,14 @@
 
         DEPENDENCIES
           google-protobuf
-
+        #{checksums}
         BUNDLED WITH
            #{Bundler::VERSION}
       L
     end
   end
 
-  context "when running on a legacy lockfile locked only to RUBY" do
+  context "when running on a legacy lockfile locked only to ruby" do
     around do |example|
       build_repo4 do
         build_gem "nokogiri", "1.3.10"
@@ -118,14 +167,14 @@
       end
 
       gemfile <<~G
-        source "#{file_uri_for(gem_repo4)}"
+        source "https://gem.repo4"
 
         gem "nokogiri"
       G
 
       lockfile <<-L
         GEM
-          remote: #{file_uri_for(gem_repo4)}/
+          remote: https://gem.repo4/
           specs:
             nokogiri (1.3.10)
 
@@ -142,13 +191,13 @@
       simulate_platform "arm64-darwin-22", &example
     end
 
-    it "still installs the generic RUBY variant if necessary" do
-      bundle "install --verbose", :artifice => "compact_index", :env => { "BUNDLER_SPEC_GEM_REPO" => gem_repo4.to_s }
+    it "still installs the generic ruby variant if necessary" do
+      bundle "install --verbose"
       expect(out).to include("Installing nokogiri 1.3.10")
     end
 
-    it "still installs the generic RUBY variant if necessary, even in frozen mode" do
-      bundle "install --verbose", :artifice => "compact_index", :env => { "BUNDLER_SPEC_GEM_REPO" => gem_repo4.to_s, "BUNDLE_FROZEN" => "true" }
+    it "still installs the generic ruby variant if necessary, even in frozen mode" do
+      bundle "install --verbose", env: { "BUNDLE_FROZEN" => "true" }
       expect(out).to include("Installing nokogiri 1.3.10")
     end
   end
@@ -160,24 +209,22 @@
         build_gem("libv8", "8.4.255.0") {|s| s.platform = "universal-darwin" }
 
         build_gem("mini_racer", "1.0.0") do |s|
-          s.add_runtime_dependency "libv8"
+          s.add_dependency "libv8"
         end
       end
 
-      system_gems "bundler-2.1.4"
-
       # Consistent location to install and look for gems
-      bundle "config set --local path vendor/bundle", :env => { "BUNDLER_VERSION" => "2.1.4" }
+      bundle "config set --local path vendor/bundle"
 
       gemfile <<-G
-        source "https://localgemserver.test"
+        source "https://gem.repo2"
         gem "libv8"
       G
 
       # simulate lockfile created with old bundler, which only locks for ruby platform
       lockfile <<-L
         GEM
-          remote: https://localgemserver.test/
+          remote: https://gem.repo2/
           specs:
             libv8 (8.4.255.0)
 
@@ -188,13 +235,14 @@
           libv8
 
         BUNDLED WITH
-           2.1.4
+           #{Bundler::VERSION}
       L
 
-      bundle "install --verbose", :artifice => "compact_index", :env => { "BUNDLER_VERSION" => "2.1.4", "BUNDLER_SPEC_GEM_REPO" => gem_repo2.to_s }
+      bundle "install --verbose"
+      expect(err).to include("The following platform specific gems are getting installed, yet the lockfile includes only their generic ruby version")
       expect(out).to include("Installing libv8 8.4.255.0 (universal-darwin)")
 
-      bundle "add mini_racer --verbose", :artifice => "compact_index", :env => { "BUNDLER_SPEC_GEM_REPO" => gem_repo2.to_s }
+      bundle "add mini_racer --verbose"
       expect(out).to include("Using libv8 8.4.255.0 (universal-darwin)")
     end
   end
@@ -207,14 +255,14 @@
       end
 
       gemfile <<-G
-        source "https://localgemserver.test"
+        source "https://gem.repo4"
         gem "grpc"
       G
 
       # simulate lockfile created with old bundler, which only locks for ruby platform
       lockfile <<-L
         GEM
-          remote: https://localgemserver.test/
+          remote: https://gem.repo4/
           specs:
             grpc (1.50.0)
 
@@ -228,7 +276,8 @@
            #{Bundler::VERSION}
       L
 
-      bundle "install --verbose", :artifice => "compact_index_precompiled_before", :env => { "BUNDLER_SPEC_GEM_REPO" => gem_repo4.to_s }
+      bundle "install --verbose", artifice: "compact_index_precompiled_before"
+      expect(err).to include("The following platform specific gems are getting installed, yet the lockfile includes only their generic ruby version")
       expect(out).to include("Installing grpc 1.50.0 (universal-darwin)")
     end
   end
@@ -262,7 +311,7 @@
     git = build_git "pg_array_parser", "1.0"
 
     gemfile <<-G
-      source "#{file_uri_for(gem_repo1)}"
+      source "https://gem.repo1"
       gem "pg_array_parser", :git => "#{lib_path("pg_array_parser-1.0")}"
     G
 
@@ -278,8 +327,7 @@
         specs:
 
       PLATFORMS
-        java
-        #{lockfile_platforms}
+        #{lockfile_platforms("java")}
 
       DEPENDENCIES
         pg_array_parser!
@@ -298,15 +346,15 @@
     simulate_platform "x86_64-darwin-15" do
       setup_multiplatform_gem_with_different_dependencies_per_platform
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo2)}"
+        source "https://gem.repo2"
         gem "facter"
       G
       allow(Bundler::SharedHelpers).to receive(:find_gemfile).and_return(bundled_app_gemfile)
 
-      expect(the_bundle.locked_gems.platforms).to eq([pl("x86_64-darwin-15")])
+      expect(the_bundle.locked_platforms).to include("universal-darwin")
       expect(the_bundle).to include_gems("facter 2.4.6 universal-darwin", "CFPropertyList 1.0")
-      expect(the_bundle.locked_gems.specs.map(&:full_name)).to eq(["CFPropertyList-1.0",
-                                                                   "facter-2.4.6-universal-darwin"])
+      expect(the_bundle.locked_gems.specs.map(&:full_name)).to include("CFPropertyList-1.0",
+                                                                       "facter-2.4.6-universal-darwin")
     end
   end
 
@@ -319,12 +367,12 @@
       simulate_platform "x86_64-darwin-15" do
         setup_multiplatform_gem
         install_gemfile(google_protobuf)
-        bundle "lock --add-platform=#{x64_mingw32}"
+        bundle "lock --add-platform=x64-mingw-ucrt"
 
-        expect(the_bundle.locked_gems.platforms).to eq([x64_mingw32, pl("x86_64-darwin-15")])
-        expect(the_bundle.locked_gems.specs.map(&:full_name)).to eq(%w[
+        expect(the_bundle.locked_platforms).to include("x64-mingw-ucrt", "universal-darwin")
+        expect(the_bundle.locked_gems.specs.map(&:full_name)).to include(*%w[
           google-protobuf-3.0.0.alpha.5.0.5.1-universal-darwin
-          google-protobuf-3.0.0.alpha.5.0.5.1-x64-mingw32
+          google-protobuf-3.0.0.alpha.5.0.5.1-x64-mingw-ucrt
         ])
       end
     end
@@ -333,13 +381,13 @@
       simulate_platform "x86_64-darwin-15" do
         setup_multiplatform_gem
         install_gemfile(google_protobuf)
-        bundle "lock --add-platform=#{java}"
+        bundle "lock --add-platform=java"
 
-        expect(the_bundle.locked_gems.platforms).to eq([java, pl("x86_64-darwin-15")])
-        expect(the_bundle.locked_gems.specs.map(&:full_name)).to eq(%w[
-          google-protobuf-3.0.0.alpha.5.0.5.1
-          google-protobuf-3.0.0.alpha.5.0.5.1-universal-darwin
-        ])
+        expect(the_bundle.locked_platforms).to include("java", "universal-darwin")
+        expect(the_bundle.locked_gems.specs.map(&:full_name)).to include(
+          "google-protobuf-3.0.0.alpha.5.0.5.1",
+          "google-protobuf-3.0.0.alpha.5.0.5.1-universal-darwin"
+        )
       end
     end
   end
@@ -352,14 +400,14 @@
     end
 
     gemfile <<~G
-      source "#{file_uri_for(gem_repo2)}"
+      source "https://gem.repo2"
 
       gem "sorbet-static", "0.5.6403"
     G
 
     lockfile <<~L
       GEM
-        remote: #{file_uri_for(gem_repo2)}/
+        remote: https://gem.repo2/
         specs:
           sorbet-static (0.5.6403-#{Bundler.local_platform})
 
@@ -383,13 +431,13 @@
     end
 
     gemfile <<~G
-      source "#{file_uri_for(gem_repo4)}"
+      source "https://gem.repo4"
 
       gem "sorbet-static", "0.5.6433"
     G
 
     error_message = <<~ERROR.strip
-      Could not find gem 'sorbet-static (= 0.5.6433)' with platform 'arm64-darwin-21' in rubygems repository #{file_uri_for(gem_repo4)}/ or installed locally.
+      Could not find gem 'sorbet-static (= 0.5.6433)' with platform 'arm64-darwin-21' in rubygems repository https://gem.repo4/ or installed locally.
 
       The source contains the following gems matching 'sorbet-static (= 0.5.6433)':
         * sorbet-static-0.5.6433-universal-darwin-20
@@ -397,7 +445,7 @@
     ERROR
 
     simulate_platform "arm64-darwin-21" do
-      bundle "lock", :raise_on_error => false
+      bundle "lock", raise_on_error: false
     end
 
     expect(err).to include(error_message).once
@@ -405,7 +453,7 @@
     # Make sure it doesn't print error twice in verbose mode
 
     simulate_platform "arm64-darwin-21" do
-      bundle "lock --verbose", :raise_on_error => false
+      bundle "lock --verbose", raise_on_error: false
     end
 
     expect(err).to include(error_message).once
@@ -419,7 +467,7 @@
     end
 
     gemfile <<~G
-      source "#{file_uri_for(gem_repo4)}"
+      source "https://gem.repo4"
 
       gem "sorbet", "0.5.6433"
     G
@@ -428,7 +476,7 @@
       Could not find compatible versions
 
       Because every version of sorbet depends on sorbet-static = 0.5.6433
-        and sorbet-static = 0.5.6433 could not be found in rubygems repository #{file_uri_for(gem_repo4)}/ or installed locally for any resolution platforms (arm64-darwin-21),
+        and sorbet-static = 0.5.6433 could not be found in rubygems repository https://gem.repo4/ or installed locally for any resolution platforms (arm64-darwin-21),
         sorbet cannot be used.
       So, because Gemfile depends on sorbet = 0.5.6433,
         version solving has failed.
@@ -439,7 +487,7 @@
     ERROR
 
     simulate_platform "arm64-darwin-21" do
-      bundle "lock", :raise_on_error => false
+      bundle "lock", raise_on_error: false
     end
 
     expect(err).to include(error_message).once
@@ -447,42 +495,42 @@
     # Make sure it doesn't print error twice in verbose mode
 
     simulate_platform "arm64-darwin-21" do
-      bundle "lock --verbose", :raise_on_error => false
+      bundle "lock --verbose", raise_on_error: false
     end
 
     expect(err).to include(error_message).once
   end
 
-  it "does not generate a lockfile if RUBY platform is forced and some gem has no RUBY variant available" do
+  it "does not generate a lockfile if ruby platform is forced and some gem has no ruby variant available" do
     build_repo4 do
       build_gem("sorbet-static", "0.5.9889") {|s| s.platform = Gem::Platform.local }
     end
 
     gemfile <<~G
-      source "#{file_uri_for(gem_repo4)}"
+      source "https://gem.repo4"
 
       gem "sorbet-static", "0.5.9889"
     G
 
-    bundle "lock", :raise_on_error => false, :env => { "BUNDLE_FORCE_RUBY_PLATFORM" => "true" }
+    bundle "lock", raise_on_error: false, env: { "BUNDLE_FORCE_RUBY_PLATFORM" => "true" }
 
     expect(err).to include <<~ERROR.rstrip
-      Could not find gem 'sorbet-static (= 0.5.9889)' with platform 'ruby' in rubygems repository #{file_uri_for(gem_repo4)}/ or installed locally.
+      Could not find gem 'sorbet-static (= 0.5.9889)' with platform 'ruby' in rubygems repository https://gem.repo4/ or installed locally.
 
       The source contains the following gems matching 'sorbet-static (= 0.5.9889)':
         * sorbet-static-0.5.9889-#{Gem::Platform.local}
     ERROR
   end
 
-  it "automatically fixes the lockfile if RUBY platform is locked and some gem has no RUBY variant available" do
+  it "automatically fixes the lockfile if ruby platform is locked and some gem has no ruby variant available" do
     build_repo4 do
       build_gem("sorbet-static-and-runtime", "0.5.10160") do |s|
-        s.add_runtime_dependency "sorbet", "= 0.5.10160"
-        s.add_runtime_dependency "sorbet-runtime", "= 0.5.10160"
+        s.add_dependency "sorbet", "= 0.5.10160"
+        s.add_dependency "sorbet-runtime", "= 0.5.10160"
       end
 
       build_gem("sorbet", "0.5.10160") do |s|
-        s.add_runtime_dependency "sorbet-static", "= 0.5.10160"
+        s.add_dependency "sorbet-static", "= 0.5.10160"
       end
 
       build_gem("sorbet-runtime", "0.5.10160")
@@ -493,14 +541,14 @@
     end
 
     gemfile <<~G
-      source "#{file_uri_for(gem_repo4)}"
+      source "https://gem.repo4"
 
       gem "sorbet-static-and-runtime"
     G
 
     lockfile <<~L
       GEM
-        remote: #{file_uri_for(gem_repo4)}/
+        remote: https://gem.repo4/
         specs:
           sorbet (0.5.10160)
             sorbet-static (= 0.5.10160)
@@ -511,7 +559,7 @@
             sorbet-runtime (= 0.5.10160)
 
       PLATFORMS
-        #{lockfile_platforms("ruby")}
+        #{lockfile_platforms}
 
       DEPENDENCIES
         sorbet-static-and-runtime
@@ -522,9 +570,16 @@
 
     bundle "update"
 
+    checksums = checksums_section_when_enabled do |c|
+      c.checksum gem_repo4, "sorbet", "0.5.10160"
+      c.checksum gem_repo4, "sorbet-runtime", "0.5.10160"
+      c.checksum gem_repo4, "sorbet-static", "0.5.10160", Gem::Platform.local
+      c.checksum gem_repo4, "sorbet-static-and-runtime", "0.5.10160"
+    end
+
     expect(lockfile).to eq <<~L
       GEM
-        remote: #{file_uri_for(gem_repo4)}/
+        remote: https://gem.repo4/
         specs:
           sorbet (0.5.10160)
             sorbet-static (= 0.5.10160)
@@ -535,17 +590,17 @@
             sorbet-runtime (= 0.5.10160)
 
       PLATFORMS
-        #{lockfile_platforms}
+        #{local_platform}
 
       DEPENDENCIES
         sorbet-static-and-runtime
-
+      #{checksums}
       BUNDLED WITH
          #{Bundler::VERSION}
     L
   end
 
-  it "automatically fixes the lockfile if both RUBY platform and a more specific platform are locked, and some gem has no RUBY variant available" do
+  it "automatically fixes the lockfile if both ruby platform and a more specific platform are locked, and some gem has no ruby variant available" do
     build_repo4 do
       build_gem "nokogiri", "1.12.0"
       build_gem "nokogiri", "1.12.0" do |s|
@@ -564,16 +619,21 @@
 
     simulate_platform "x86_64-darwin-22" do
       install_gemfile <<~G
-        source "#{file_uri_for(gem_repo4)}"
+        source "https://gem.repo4"
 
         gem "nokogiri"
         gem "sorbet-static"
       G
     end
 
+    checksums = checksums_section_when_enabled do |c|
+      c.checksum gem_repo4, "nokogiri", "1.13.0", "x86_64-darwin"
+      c.checksum gem_repo4, "sorbet-static", "0.5.10601", "x86_64-darwin"
+    end
+
     lockfile <<~L
       GEM
-        remote: #{file_uri_for(gem_repo4)}/
+        remote: https://gem.repo4/
         specs:
           nokogiri (1.12.0)
           nokogiri (1.12.0-x86_64-darwin)
@@ -585,8 +645,8 @@
 
       DEPENDENCIES
         nokogiri
-        sorbet
-
+        sorbet-static
+      #{checksums}
       BUNDLED WITH
          #{Bundler::VERSION}
     L
@@ -597,7 +657,7 @@
 
     expect(lockfile).to eq <<~L
       GEM
-        remote: #{file_uri_for(gem_repo4)}/
+        remote: https://gem.repo4/
         specs:
           nokogiri (1.13.0-x86_64-darwin)
           sorbet-static (0.5.10601-x86_64-darwin)
@@ -608,21 +668,21 @@
       DEPENDENCIES
         nokogiri
         sorbet-static
-
+      #{checksums}
       BUNDLED WITH
          #{Bundler::VERSION}
     L
   end
 
-  it "automatically fixes the lockfile if only RUBY platform is locked and some gem has no RUBY variant available" do
+  it "automatically fixes the lockfile if only ruby platform is locked and some gem has no ruby variant available" do
     build_repo4 do
       build_gem("sorbet-static-and-runtime", "0.5.10160") do |s|
-        s.add_runtime_dependency "sorbet", "= 0.5.10160"
-        s.add_runtime_dependency "sorbet-runtime", "= 0.5.10160"
+        s.add_dependency "sorbet", "= 0.5.10160"
+        s.add_dependency "sorbet-runtime", "= 0.5.10160"
       end
 
       build_gem("sorbet", "0.5.10160") do |s|
-        s.add_runtime_dependency "sorbet-static", "= 0.5.10160"
+        s.add_dependency "sorbet-static", "= 0.5.10160"
       end
 
       build_gem("sorbet-runtime", "0.5.10160")
@@ -633,14 +693,14 @@
     end
 
     gemfile <<~G
-      source "#{file_uri_for(gem_repo4)}"
+      source "https://gem.repo4"
 
       gem "sorbet-static-and-runtime"
     G
 
     lockfile <<~L
       GEM
-        remote: #{file_uri_for(gem_repo4)}/
+        remote: https://gem.repo4/
         specs:
           sorbet (0.5.10160)
             sorbet-static (= 0.5.10160)
@@ -662,9 +722,16 @@
 
     bundle "update"
 
+    checksums = checksums_section_when_enabled do |c|
+      c.checksum gem_repo4, "sorbet", "0.5.10160"
+      c.checksum gem_repo4, "sorbet-runtime", "0.5.10160"
+      c.checksum gem_repo4, "sorbet-static", "0.5.10160", Gem::Platform.local
+      c.checksum gem_repo4, "sorbet-static-and-runtime", "0.5.10160"
+    end
+
     expect(lockfile).to eq <<~L
       GEM
-        remote: #{file_uri_for(gem_repo4)}/
+        remote: https://gem.repo4/
         specs:
           sorbet (0.5.10160)
             sorbet-static (= 0.5.10160)
@@ -675,16 +742,160 @@
             sorbet-runtime (= 0.5.10160)
 
       PLATFORMS
-        #{lockfile_platforms}
+        #{local_platform}
 
       DEPENDENCIES
         sorbet-static-and-runtime
-
+      #{checksums}
       BUNDLED WITH
          #{Bundler::VERSION}
     L
   end
 
+  it "automatically fixes the lockfile when adding a gem that introduces dependencies with no ruby platform variants transitively" do
+    simulate_platform "x86_64-linux" do
+      build_repo4 do
+        build_gem "nokogiri", "1.18.2"
+
+        build_gem "nokogiri", "1.18.2" do |s|
+          s.platform = "x86_64-linux"
+        end
+
+        build_gem("sorbet", "0.5.11835") do |s|
+          s.add_dependency "sorbet-static", "= 0.5.11835"
+        end
+
+        build_gem "sorbet-static", "0.5.11835" do |s|
+          s.platform = "x86_64-linux"
+        end
+      end
+
+      gemfile <<~G
+        source "https://gem.repo4"
+
+        gem "nokogiri"
+        gem "sorbet"
+      G
+
+      lockfile <<~L
+        GEM
+          remote: https://gem.repo4/
+          specs:
+            nokogiri (1.18.2)
+            nokogiri (1.18.2-x86_64-linux)
+
+        PLATFORMS
+          ruby
+          x86_64-linux
+
+        DEPENDENCIES
+          nokogiri
+
+        BUNDLED WITH
+           #{Bundler::VERSION}
+      L
+
+      bundle "lock"
+
+      checksums = checksums_section_when_enabled do |c|
+        c.checksum gem_repo4, "nokogiri", "1.18.2", "x86_64-linux"
+        c.checksum gem_repo4, "sorbet", "0.5.11835"
+        c.checksum gem_repo4, "sorbet-static", "0.5.11835", "x86_64-linux"
+      end
+
+      expect(lockfile).to eq <<~L
+        GEM
+          remote: https://gem.repo4/
+          specs:
+            nokogiri (1.18.2)
+            nokogiri (1.18.2-x86_64-linux)
+            sorbet (0.5.11835)
+              sorbet-static (= 0.5.11835)
+            sorbet-static (0.5.11835-x86_64-linux)
+
+        PLATFORMS
+          x86_64-linux
+
+        DEPENDENCIES
+          nokogiri
+          sorbet
+        #{checksums}
+        BUNDLED WITH
+           #{Bundler::VERSION}
+      L
+    end
+  end
+
+  it "automatically fixes the lockfile if multiple platforms locked, but no valid versions of direct dependencies for all of them" do
+    simulate_platform "x86_64-linux" do
+      build_repo4 do
+        build_gem "nokogiri", "1.14.0" do |s|
+          s.platform = "x86_64-linux"
+        end
+        build_gem "nokogiri", "1.14.0" do |s|
+          s.platform = "arm-linux"
+        end
+
+        build_gem "sorbet-static", "0.5.10696" do |s|
+          s.platform = "x86_64-linux"
+        end
+      end
+
+      gemfile <<~G
+        source "https://gem.repo4"
+
+        gem "nokogiri"
+        gem "sorbet-static"
+      G
+
+      lockfile <<~L
+        GEM
+          remote: https://gem.repo4/
+          specs:
+            nokogiri (1.14.0-arm-linux)
+            nokogiri (1.14.0-x86_64-linux)
+            sorbet-static (0.5.10696-x86_64-linux)
+
+        PLATFORMS
+          aarch64-linux
+          arm-linux
+          x86_64-linux
+
+        DEPENDENCIES
+          nokogiri
+          sorbet-static
+
+        BUNDLED WITH
+           #{Bundler::VERSION}
+      L
+
+      bundle "update"
+
+      checksums = checksums_section_when_enabled do |c|
+        c.checksum gem_repo4, "nokogiri", "1.14.0", "x86_64-linux"
+        c.checksum gem_repo4, "sorbet-static", "0.5.10696", "x86_64-linux"
+      end
+
+      expect(lockfile).to eq <<~L
+        GEM
+          remote: https://gem.repo4/
+          specs:
+            nokogiri (1.14.0-x86_64-linux)
+            sorbet-static (0.5.10696-x86_64-linux)
+
+        PLATFORMS
+          x86_64-linux
+
+        DEPENDENCIES
+          nokogiri
+          sorbet-static
+        #{checksums}
+        BUNDLED WITH
+           #{Bundler::VERSION}
+      L
+    end
+  end
+
   it "automatically fixes the lockfile without removing other variants if it's missing platform gems, but they are installed locally" do
     simulate_platform "x86_64-darwin-21" do
       build_repo4 do
@@ -699,15 +910,20 @@
 
       # Make sure sorbet-static-0.5.10549-universal-darwin-21 is installed
       install_gemfile <<~G
-        source "#{file_uri_for(gem_repo4)}"
+        source "https://gem.repo4"
 
         gem "sorbet-static", "= 0.5.10549"
       G
 
+      checksums = checksums_section_when_enabled do |c|
+        c.checksum gem_repo4, "sorbet-static", "0.5.10549", "universal-darwin-20"
+        c.checksum gem_repo4, "sorbet-static", "0.5.10549", "universal-darwin-21"
+      end
+
       # Make sure the lockfile is missing sorbet-static-0.5.10549-universal-darwin-21
       lockfile <<~L
         GEM
-          remote: #{file_uri_for(gem_repo4)}/
+          remote: https://gem.repo4/
           specs:
             sorbet-static (0.5.10549-universal-darwin-20)
 
@@ -716,7 +932,7 @@
 
         DEPENDENCIES
           sorbet-static (= 0.5.10549)
-
+        #{checksums}
         BUNDLED WITH
            #{Bundler::VERSION}
       L
@@ -725,7 +941,7 @@
 
       expect(lockfile).to eq <<~L
         GEM
-          remote: #{file_uri_for(gem_repo4)}/
+          remote: https://gem.repo4/
           specs:
             sorbet-static (0.5.10549-universal-darwin-20)
             sorbet-static (0.5.10549-universal-darwin-21)
@@ -735,6 +951,63 @@
 
         DEPENDENCIES
           sorbet-static (= 0.5.10549)
+        #{checksums}
+        BUNDLED WITH
+           #{Bundler::VERSION}
+      L
+    end
+  end
+
+  it "automatically fixes the lockfile if locked only to ruby, and some locked specs don't meet locked dependencies" do
+    simulate_platform "x86_64-linux" do
+      build_repo4 do
+        build_gem("ibandit", "0.7.0") do |s|
+          s.add_dependency "i18n", "~> 0.7.0"
+        end
+
+        build_gem("i18n", "0.7.0.beta1")
+        build_gem("i18n", "0.7.0")
+      end
+
+      gemfile <<~G
+        source "https://gem.repo4"
+
+        gem "ibandit", "~> 0.7.0"
+      G
+
+      lockfile <<~L
+        GEM
+          remote: https://gem.repo4/
+          specs:
+            i18n (0.7.0.beta1)
+            ibandit (0.7.0)
+              i18n (~> 0.7.0)
+
+        PLATFORMS
+          ruby
+
+        DEPENDENCIES
+          ibandit (~> 0.7.0)
+
+        BUNDLED WITH
+           #{Bundler::VERSION}
+      L
+
+      bundle "lock --update i18n"
+
+      expect(lockfile).to eq <<~L
+        GEM
+          remote: https://gem.repo4/
+          specs:
+            i18n (0.7.0)
+            ibandit (0.7.0)
+              i18n (~> 0.7.0)
+
+        PLATFORMS
+          ruby
+
+        DEPENDENCIES
+          ibandit (~> 0.7.0)
 
         BUNDLED WITH
            #{Bundler::VERSION}
@@ -751,16 +1024,21 @@
     end
 
     gemfile <<~G
-      source "#{file_uri_for(gem_repo4)}"
+      source "https://gem.repo4"
 
       gem "nokogiri"
 
       gem "tzinfo", "~> 1.2", platform: :#{not_local_tag}
     G
 
+    checksums = checksums_section_when_enabled do |c|
+      c.checksum gem_repo4, "nokogiri", "1.13.8"
+      c.checksum gem_repo4, "nokogiri", "1.13.8", Gem::Platform.local
+    end
+
     original_lockfile = <<~L
       GEM
-        remote: #{file_uri_for(gem_repo4)}/
+        remote: https://gem.repo4/
         specs:
           nokogiri (1.13.8)
           nokogiri (1.13.8-#{Gem::Platform.local})
@@ -771,7 +1049,7 @@
       DEPENDENCIES
         nokogiri
         tzinfo (~> 1.2)
-
+      #{checksums}
       BUNDLED WITH
          #{Bundler::VERSION}
     L
@@ -783,22 +1061,73 @@
     expect(lockfile).to eq(original_lockfile)
   end
 
+  it "does not remove ruby if gems for other platforms, and not present in the lockfile, exist in the Gemfile, and the lockfile only has ruby" do
+    build_repo4 do
+      build_gem "nokogiri", "1.13.8"
+      build_gem "nokogiri", "1.13.8" do |s|
+        s.platform = "arm64-darwin"
+      end
+    end
+
+    gemfile <<~G
+      source "https://gem.repo4"
+
+      gem "nokogiri"
+
+      gem "tzinfo", "~> 1.2", platforms: %i[windows jruby]
+    G
+
+    checksums = checksums_section_when_enabled do |c|
+      c.checksum gem_repo4, "nokogiri", "1.13.8"
+    end
+
+    original_lockfile = <<~L
+      GEM
+        remote: https://gem.repo4/
+        specs:
+          nokogiri (1.13.8)
+
+      PLATFORMS
+        ruby
+
+      DEPENDENCIES
+        nokogiri
+        tzinfo (~> 1.2)
+      #{checksums}
+      BUNDLED WITH
+         #{Bundler::VERSION}
+    L
+
+    lockfile original_lockfile
+
+    simulate_platform "arm64-darwin-23" do
+      bundle "lock --update"
+    end
+
+    expect(lockfile).to eq(original_lockfile)
+  end
+
   it "does not remove ruby when adding a new gem to the Gemfile" do
     build_repo4 do
       build_gem "concurrent-ruby", "1.2.2"
-      build_gem "rack", "3.0.7"
+      build_gem "myrack", "3.0.7"
     end
 
     gemfile <<~G
-      source "#{file_uri_for(gem_repo4)}"
+      source "https://gem.repo4"
 
       gem "concurrent-ruby"
-      gem "rack"
+      gem "myrack"
     G
 
+    checksums = checksums_section_when_enabled do |c|
+      c.checksum gem_repo4, "concurrent-ruby", "1.2.2"
+      c.checksum gem_repo4, "myrack", "3.0.7"
+    end
+
     lockfile <<~L
       GEM
-        remote: #{file_uri_for(gem_repo4)}/
+        remote: https://gem.repo4/
         specs:
           concurrent-ruby (1.2.2)
 
@@ -807,7 +1136,7 @@
 
       DEPENDENCIES
         concurrent-ruby
-
+      #{checksums}
       BUNDLED WITH
          #{Bundler::VERSION}
     L
@@ -816,18 +1145,18 @@
 
     expect(lockfile).to eq <<~L
       GEM
-        remote: #{file_uri_for(gem_repo4)}/
+        remote: https://gem.repo4/
         specs:
           concurrent-ruby (1.2.2)
-          rack (3.0.7)
+          myrack (3.0.7)
 
       PLATFORMS
-        #{formatted_lockfile_platforms(*["ruby", generic_local_platform].uniq)}
+        #{lockfile_platforms(generic_default_locked_platform || local_platform, defaults: ["ruby"])}
 
       DEPENDENCIES
         concurrent-ruby
-        rack
-
+        myrack
+      #{checksums}
       BUNDLED WITH
          #{Bundler::VERSION}
     L
@@ -836,10 +1165,8 @@
   it "can fallback to a source gem when platform gems are incompatible with current ruby version" do
     setup_multiplatform_gem_with_source_gem
 
-    source = file_uri_for(gem_repo2)
-
     gemfile <<~G
-      source "#{source}"
+      source "https://gem.repo2"
 
       gem "my-precompiled-gem"
     G
@@ -849,7 +1176,7 @@
     # - A source gem with compatible ruby version
     lockfile <<-L
       GEM
-        remote: #{source}/
+        remote: https://gem.repo2/
         specs:
           my-precompiled-gem (3.0.0)
           my-precompiled-gem (3.0.0-#{Bundler.local_platform})
@@ -868,7 +1195,7 @@
     bundle :install
   end
 
-  it "automatically fixes the lockfile if the specific platform is locked and we move to a newer ruby version for which a native package is not available" do
+  it "automatically adds the ruby variant to the lockfile if the specific platform is locked and we move to a newer ruby version for which a native package is not available" do
     #
     # Given an existing application using native gems (e.g., nokogiri)
     # And a lockfile generated with a stable ruby version
@@ -885,14 +1212,18 @@
       end
 
       gemfile <<~G
-        source "#{file_uri_for(gem_repo4)}"
+        source "https://gem.repo4"
 
         gem "nokogiri", "1.14.0"
       G
 
+      checksums = checksums_section_when_enabled do |c|
+        c.checksum gem_repo4, "nokogiri", "1.14.0", "x86_64-linux"
+      end
+
       lockfile <<~L
         GEM
-          remote: #{file_uri_for(gem_repo4)}/
+          remote: https://gem.repo4/
           specs:
             nokogiri (1.14.0-x86_64-linux)
 
@@ -901,42 +1232,602 @@
 
         DEPENDENCIES
           nokogiri (= 1.14.0)
-
+        #{checksums}
         BUNDLED WITH
            #{Bundler::VERSION}
       L
 
       bundle :install
 
+      checksums = checksums_section_when_enabled do |c|
+        c.checksum gem_repo4, "nokogiri", "1.14.0"
+        c.checksum gem_repo4, "nokogiri", "1.14.0", "x86_64-linux"
+      end
+
       expect(lockfile).to eq(<<~L)
         GEM
-          remote: #{file_uri_for(gem_repo4)}/
+          remote: https://gem.repo4/
           specs:
             nokogiri (1.14.0)
+            nokogiri (1.14.0-x86_64-linux)
 
         PLATFORMS
           x86_64-linux
 
         DEPENDENCIES
           nokogiri (= 1.14.0)
+        #{checksums}
+        BUNDLED WITH
+           #{Bundler::VERSION}
+      L
+    end
+  end
+
+  it "automatically fixes the lockfile when only ruby platform locked, and adding a dependency with subdependencies not valid for ruby" do
+    simulate_platform "x86_64-linux" do
+      build_repo4 do
+        build_gem("sorbet", "0.5.10160") do |s|
+          s.add_dependency "sorbet-static", "= 0.5.10160"
+        end
+
+        build_gem("sorbet-static", "0.5.10160") do |s|
+          s.platform = "x86_64-linux"
+        end
+      end
+
+      gemfile <<~G
+        source "https://gem.repo4"
+
+        gem "sorbet"
+      G
+
+      lockfile <<~L
+        GEM
+          remote: https://gem.repo4/
+          specs:
+
+        PLATFORMS
+          ruby
+
+        DEPENDENCIES
+
+        BUNDLED WITH
+           #{Bundler::VERSION}
+      L
+
+      bundle "lock"
+
+      expect(lockfile).to eq <<~L
+        GEM
+          remote: https://gem.repo4/
+          specs:
+            sorbet (0.5.10160)
+              sorbet-static (= 0.5.10160)
+            sorbet-static (0.5.10160-x86_64-linux)
+
+        PLATFORMS
+          x86_64-linux
+
+        DEPENDENCIES
+          sorbet
+
+        BUNDLED WITH
+           #{Bundler::VERSION}
+      L
+    end
+  end
+
+  it "locks specific platforms automatically" do
+    simulate_platform "x86_64-linux" do
+      build_repo4 do
+        build_gem "nokogiri", "1.14.0"
+        build_gem "nokogiri", "1.14.0" do |s|
+          s.platform = "x86_64-linux"
+        end
+        build_gem "nokogiri", "1.14.0" do |s|
+          s.platform = "arm-linux"
+        end
+        build_gem "nokogiri", "1.14.0" do |s|
+          s.platform = "x64-mingw-ucrt"
+        end
+        build_gem "nokogiri", "1.14.0" do |s|
+          s.platform = "java"
+        end
+
+        build_gem "sorbet-static", "0.5.10696" do |s|
+          s.platform = "x86_64-linux"
+        end
+        build_gem "sorbet-static", "0.5.10696" do |s|
+          s.platform = "universal-darwin-22"
+        end
+      end
+
+      gemfile <<~G
+        source "https://gem.repo4"
+
+        gem "nokogiri"
+      G
+
+      bundle "lock"
+
+      checksums = checksums_section_when_enabled do |c|
+        c.checksum gem_repo4, "nokogiri", "1.14.0"
+        c.checksum gem_repo4, "nokogiri", "1.14.0", "arm-linux"
+        c.checksum gem_repo4, "nokogiri", "1.14.0", "x86_64-linux"
+      end
+
+      # locks all compatible platforms, excluding Java and Windows
+      expect(lockfile).to eq(<<~L)
+        GEM
+          remote: https://gem.repo4/
+          specs:
+            nokogiri (1.14.0)
+            nokogiri (1.14.0-arm-linux)
+            nokogiri (1.14.0-x86_64-linux)
+
+        PLATFORMS
+          arm-linux
+          ruby
+          x86_64-linux
+
+        DEPENDENCIES
+          nokogiri
+        #{checksums}
+        BUNDLED WITH
+           #{Bundler::VERSION}
+      L
 
+      gemfile <<~G
+        source "https://gem.repo4"
+
+        gem "nokogiri"
+        gem "sorbet-static"
+      G
+
+      FileUtils.rm bundled_app_lock
+
+      bundle "lock"
+
+      checksums.delete "nokogiri", "arm-linux"
+      checksums.checksum gem_repo4, "sorbet-static", "0.5.10696", "universal-darwin-22"
+      checksums.checksum gem_repo4, "sorbet-static", "0.5.10696", "x86_64-linux"
+
+      # locks only platforms compatible with all gems in the bundle
+      expect(lockfile).to eq(<<~L)
+        GEM
+          remote: https://gem.repo4/
+          specs:
+            nokogiri (1.14.0)
+            nokogiri (1.14.0-x86_64-linux)
+            sorbet-static (0.5.10696-universal-darwin-22)
+            sorbet-static (0.5.10696-x86_64-linux)
+
+        PLATFORMS
+          universal-darwin-22
+          x86_64-linux
+
+        DEPENDENCIES
+          nokogiri
+          sorbet-static
+        #{checksums}
+        BUNDLED WITH
+           #{Bundler::VERSION}
+      L
+    end
+  end
+
+  it "does not fail when a platform variant is incompatible with the current ruby and another equivalent platform specific variant is part of the resolution", rubygems: ">= 3.3.21" do
+    build_repo4 do
+      build_gem "nokogiri", "1.15.5"
+
+      build_gem "nokogiri", "1.15.5" do |s|
+        s.platform = "x86_64-linux"
+        s.required_ruby_version = "< #{current_ruby_minor}.dev"
+      end
+
+      build_gem "sass-embedded", "1.69.5"
+
+      build_gem "sass-embedded", "1.69.5" do |s|
+        s.platform = "x86_64-linux-gnu"
+      end
+    end
+
+    gemfile <<~G
+      source "https://gem.repo4"
+
+      gem "nokogiri"
+      gem "sass-embedded"
+    G
+
+    checksums = checksums_section_when_enabled do |c|
+      c.checksum gem_repo4, "nokogiri", "1.15.5"
+      c.checksum gem_repo4, "sass-embedded", "1.69.5"
+      c.checksum gem_repo4, "sass-embedded", "1.69.5", "x86_64-linux-gnu"
+    end
+
+    simulate_platform "x86_64-linux" do
+      bundle "install --verbose"
+
+      # locks all compatible platforms, excluding Java and Windows
+      expect(lockfile).to eq(<<~L)
+        GEM
+          remote: https://gem.repo4/
+          specs:
+            nokogiri (1.15.5)
+            sass-embedded (1.69.5)
+            sass-embedded (1.69.5-x86_64-linux-gnu)
+
+        PLATFORMS
+          ruby
+          x86_64-linux
+
+        DEPENDENCIES
+          nokogiri
+          sass-embedded
+        #{checksums}
+        BUNDLED WITH
+           #{Bundler::VERSION}
+      L
+    end
+  end
+
+  it "does not add ruby platform gem if it brings extra dependencies not resolved originally" do
+    build_repo4 do
+      build_gem "nokogiri", "1.15.5" do |s|
+        s.add_dependency "mini_portile2", "~> 2.8.2"
+      end
+
+      build_gem "nokogiri", "1.15.5" do |s|
+        s.platform = "x86_64-linux"
+      end
+    end
+
+    gemfile <<~G
+      source "https://gem.repo4"
+
+      gem "nokogiri"
+    G
+
+    checksums = checksums_section_when_enabled do |c|
+      c.checksum gem_repo4, "nokogiri", "1.15.5", "x86_64-linux"
+    end
+
+    simulate_platform "x86_64-linux" do
+      bundle "install --verbose"
+
+      expect(lockfile).to eq(<<~L)
+        GEM
+          remote: https://gem.repo4/
+          specs:
+            nokogiri (1.15.5-x86_64-linux)
+
+        PLATFORMS
+          x86_64-linux
+
+        DEPENDENCIES
+          nokogiri
+        #{checksums}
         BUNDLED WITH
            #{Bundler::VERSION}
       L
     end
   end
 
+  ["x86_64-linux", "x86_64-linux-musl"].each do |host_platform|
+    describe "on host platform #{host_platform}" do
+      it "adds current musl platform" do
+        build_repo4 do
+          build_gem "rcee_precompiled", "0.5.0" do |s|
+            s.platform = "x86_64-linux"
+          end
+
+          build_gem "rcee_precompiled", "0.5.0" do |s|
+            s.platform = "x86_64-linux-musl"
+          end
+        end
+
+        gemfile <<~G
+          source "https://gem.repo4"
+
+          gem "rcee_precompiled", "0.5.0"
+        G
+
+        simulate_platform host_platform do
+          bundle "lock"
+
+          checksums = checksums_section_when_enabled do |c|
+            c.checksum gem_repo4, "rcee_precompiled", "0.5.0", "x86_64-linux"
+            c.checksum gem_repo4, "rcee_precompiled", "0.5.0", "x86_64-linux-musl"
+          end
+
+          expect(lockfile).to eq(<<~L)
+            GEM
+              remote: https://gem.repo4/
+              specs:
+                rcee_precompiled (0.5.0-x86_64-linux)
+                rcee_precompiled (0.5.0-x86_64-linux-musl)
+
+            PLATFORMS
+              x86_64-linux
+              x86_64-linux-musl
+
+            DEPENDENCIES
+              rcee_precompiled (= 0.5.0)
+            #{checksums}
+            BUNDLED WITH
+               #{Bundler::VERSION}
+          L
+        end
+      end
+    end
+  end
+
+  it "adds current musl platform, when there are also gnu variants", rubygems: ">= 3.3.21" do
+    build_repo4 do
+      build_gem "rcee_precompiled", "0.5.0" do |s|
+        s.platform = "x86_64-linux-gnu"
+      end
+
+      build_gem "rcee_precompiled", "0.5.0" do |s|
+        s.platform = "x86_64-linux-musl"
+      end
+    end
+
+    gemfile <<~G
+      source "https://gem.repo4"
+
+      gem "rcee_precompiled", "0.5.0"
+    G
+
+    simulate_platform "x86_64-linux-musl" do
+      bundle "lock"
+
+      checksums = checksums_section_when_enabled do |c|
+        c.checksum gem_repo4, "rcee_precompiled", "0.5.0", "x86_64-linux-gnu"
+        c.checksum gem_repo4, "rcee_precompiled", "0.5.0", "x86_64-linux-musl"
+      end
+
+      expect(lockfile).to eq(<<~L)
+        GEM
+          remote: https://gem.repo4/
+          specs:
+            rcee_precompiled (0.5.0-x86_64-linux-gnu)
+            rcee_precompiled (0.5.0-x86_64-linux-musl)
+
+        PLATFORMS
+          x86_64-linux-gnu
+          x86_64-linux-musl
+
+        DEPENDENCIES
+          rcee_precompiled (= 0.5.0)
+        #{checksums}
+        BUNDLED WITH
+           #{Bundler::VERSION}
+      L
+    end
+  end
+
+  it "does not add current platform if there's an equivalent less specific platform among the ones resolved" do
+    build_repo4 do
+      build_gem "rcee_precompiled", "0.5.0" do |s|
+        s.platform = "universal-darwin"
+      end
+    end
+
+    gemfile <<~G
+      source "https://gem.repo4"
+
+      gem "rcee_precompiled", "0.5.0"
+    G
+
+    simulate_platform "x86_64-darwin-15" do
+      bundle "lock"
+
+      checksums = checksums_section_when_enabled do |c|
+        c.checksum gem_repo4, "rcee_precompiled", "0.5.0", "universal-darwin"
+      end
+
+      expect(lockfile).to eq(<<~L)
+        GEM
+          remote: https://gem.repo4/
+          specs:
+            rcee_precompiled (0.5.0-universal-darwin)
+
+        PLATFORMS
+          universal-darwin
+
+        DEPENDENCIES
+          rcee_precompiled (= 0.5.0)
+        #{checksums}
+        BUNDLED WITH
+           #{Bundler::VERSION}
+      L
+    end
+  end
+
+  it "does not re-resolve when a specific platform, but less specific than the current platform, is locked" do
+    build_repo4 do
+      build_gem "nokogiri"
+    end
+
+    gemfile <<~G
+      source "https://gem.repo4"
+
+      gem "nokogiri"
+    G
+
+    lockfile <<~L
+      GEM
+        remote: https://gem.repo4/
+        specs:
+          nokogiri (1.0)
+
+      PLATFORMS
+        arm64-darwin
+
+      DEPENDENCIES
+        nokogiri!
+
+      BUNDLED WITH
+         #{Bundler::VERSION}
+    L
+
+    simulate_platform "arm64-darwin-23" do
+      bundle "install --verbose"
+
+      expect(out).to include("Found no changes, using resolution from the lockfile")
+    end
+  end
+
+  it "does not remove generic platform gems locked for a specific platform from lockfile when unlocking an unrelated gem" do
+    build_repo4 do
+      build_gem "ffi"
+
+      build_gem "ffi" do |s|
+        s.platform = "x86_64-linux"
+      end
+
+      build_gem "nokogiri"
+    end
+
+    gemfile <<~G
+      source "https://gem.repo4"
+
+      gem "ffi"
+      gem "nokogiri"
+    G
+
+    original_lockfile = <<~L
+      GEM
+        remote: https://gem.repo4/
+        specs:
+          ffi (1.0)
+          nokogiri (1.0)
+
+      PLATFORMS
+        x86_64-linux
+
+      DEPENDENCIES
+        ffi
+        nokogiri
+
+      BUNDLED WITH
+         #{Bundler::VERSION}
+    L
+
+    lockfile original_lockfile
+
+    simulate_platform "x86_64-linux" do
+      bundle "lock --update nokogiri"
+
+      expect(lockfile).to eq(original_lockfile)
+    end
+  end
+
+  it "does not remove generic platform gems locked for a specific platform from lockfile when unlocking an unrelated gem, and variants for other platform also locked" do
+    build_repo4 do
+      build_gem "ffi"
+
+      build_gem "ffi" do |s|
+        s.platform = "x86_64-linux"
+      end
+
+      build_gem "ffi" do |s|
+        s.platform = "java"
+      end
+
+      build_gem "nokogiri"
+    end
+
+    gemfile <<~G
+      source "https://gem.repo4"
+
+      gem "ffi"
+      gem "nokogiri"
+    G
+
+    original_lockfile = <<~L
+      GEM
+        remote: https://gem.repo4/
+        specs:
+          ffi (1.0)
+          ffi (1.0-java)
+          nokogiri (1.0)
+
+      PLATFORMS
+        java
+        x86_64-linux
+
+      DEPENDENCIES
+        ffi
+        nokogiri
+
+      BUNDLED WITH
+         #{Bundler::VERSION}
+    L
+
+    lockfile original_lockfile
+
+    simulate_platform "x86_64-linux" do
+      bundle "lock --update nokogiri"
+
+      expect(lockfile).to eq(original_lockfile)
+    end
+  end
+
+  it "does not remove platform specific gems from lockfile when using a ruby version that does not match their ruby requirements, since they may be useful in other rubies" do
+    build_repo4 do
+      build_gem("google-protobuf", "3.25.5")
+      build_gem("google-protobuf", "3.25.5") do |s|
+        s.required_ruby_version = "< #{current_ruby_minor}.dev"
+        s.platform = "x86_64-linux"
+      end
+    end
+
+    gemfile <<~G
+      source "https://gem.repo4"
+
+      gem "google-protobuf", "~> 3.0"
+    G
+
+    original_lockfile = <<~L
+      GEM
+        remote: https://gem.repo4/
+        specs:
+          google-protobuf (3.25.5)
+          google-protobuf (3.25.5-x86_64-linux)
+
+      PLATFORMS
+        ruby
+        x86_64-linux
+
+      DEPENDENCIES
+        google-protobuf (~> 3.0)
+
+      BUNDLED WITH
+         #{Bundler::VERSION}
+    L
+
+    lockfile original_lockfile
+
+    simulate_platform "x86_64-linux" do
+      bundle "lock --update"
+    end
+
+    expect(lockfile).to eq(original_lockfile)
+  end
+
   private
 
   def setup_multiplatform_gem
     build_repo2 do
       build_gem("google-protobuf", "3.0.0.alpha.5.0.5.1")
       build_gem("google-protobuf", "3.0.0.alpha.5.0.5.1") {|s| s.platform = "x86_64-linux" }
-      build_gem("google-protobuf", "3.0.0.alpha.5.0.5.1") {|s| s.platform = "x64-mingw32" }
+      build_gem("google-protobuf", "3.0.0.alpha.5.0.5.1") {|s| s.platform = "x64-mingw-ucrt" }
       build_gem("google-protobuf", "3.0.0.alpha.5.0.5.1") {|s| s.platform = "universal-darwin" }
 
       build_gem("google-protobuf", "3.0.0.alpha.5.0.5") {|s| s.platform = "x86_64-linux" }
-      build_gem("google-protobuf", "3.0.0.alpha.5.0.5") {|s| s.platform = "x64-mingw32" }
+      build_gem("google-protobuf", "3.0.0.alpha.5.0.5") {|s| s.platform = "x64-mingw-ucrt" }
       build_gem("google-protobuf", "3.0.0.alpha.5.0.5")
 
       build_gem("google-protobuf", "3.0.0.alpha.5.0.4") {|s| s.platform = "universal-darwin" }
@@ -951,7 +1842,7 @@ def setup_multiplatform_gem_with_different_dependencies_per_platform
       build_gem("facter", "2.4.6")
       build_gem("facter", "2.4.6") do |s|
         s.platform = "universal-darwin"
-        s.add_runtime_dependency "CFPropertyList"
+        s.add_dependency "CFPropertyList"
       end
       build_gem("CFPropertyList")
     end
diff --git a/spec/bundler/install/gemfile_spec.rb b/spec/bundler/install/gemfile_spec.rb
index e643573454fadb..0e3b8477678388 100644
--- a/spec/bundler/install/gemfile_spec.rb
+++ b/spec/bundler/install/gemfile_spec.rb
@@ -3,8 +3,8 @@
 RSpec.describe "bundle install" do
   context "with duplicated gems" do
     it "will display a warning" do
-      install_gemfile <<-G, :raise_on_error => false
-        source "#{file_uri_for(gem_repo1)}"
+      install_gemfile <<-G, raise_on_error: false
+        source "https://gem.repo1"
 
         gem 'rails', '~> 4.0.0'
         gem 'rails', '~> 4.0.0'
@@ -16,24 +16,24 @@
   context "with --gemfile" do
     it "finds the gemfile" do
       gemfile bundled_app("NotGemfile"), <<-G
-        source "#{file_uri_for(gem_repo1)}"
-        gem 'rack'
+        source "https://gem.repo1"
+        gem 'myrack'
       G
 
-      bundle :install, :gemfile => bundled_app("NotGemfile")
+      bundle :install, gemfile: bundled_app("NotGemfile")
 
       # Specify BUNDLE_GEMFILE for `the_bundle`
       # to retrieve the proper Gemfile
       ENV["BUNDLE_GEMFILE"] = "NotGemfile"
-      expect(the_bundle).to include_gems "rack 1.0.0"
+      expect(the_bundle).to include_gems "myrack 1.0.0"
     end
   end
 
   context "with gemfile set via config" do
     before do
       gemfile bundled_app("NotGemfile"), <<-G
-        source "#{file_uri_for(gem_repo1)}"
-        gem 'rack'
+        source "https://gem.repo1"
+        gem 'myrack'
       G
 
       bundle "config set --local gemfile #{bundled_app("NotGemfile")}"
@@ -42,34 +42,79 @@
       bundle "install"
       bundle "list"
 
-      expect(out).to include("rack (1.0.0)")
+      expect(out).to include("myrack (1.0.0)")
     end
     it "uses the gemfile while in a subdirectory" do
       bundled_app("subdir").mkpath
-      bundle "install", :dir => bundled_app("subdir")
-      bundle "list", :dir => bundled_app("subdir")
+      bundle "install", dir: bundled_app("subdir")
+      bundle "list", dir: bundled_app("subdir")
 
-      expect(out).to include("rack (1.0.0)")
+      expect(out).to include("myrack (1.0.0)")
     end
   end
 
-  context "with deprecated features" do
-    it "reports that lib is an invalid option" do
-      gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
+  it "reports that lib is an invalid option" do
+    gemfile <<-G
+      source "https://gem.repo1"
 
-        gem "rack", :lib => "rack"
-      G
+      gem "myrack", :lib => "myrack"
+    G
+
+    bundle :install, raise_on_error: false
+    expect(err).to match(/You passed :lib as an option for gem 'myrack', but it is invalid/)
+  end
+
+  it "reports that type is an invalid option" do
+    gemfile <<-G
+      source "https://gem.repo1"
+
+      gem "myrack", :type => "development"
+    G
+
+    bundle :install, raise_on_error: false
+    expect(err).to match(/You passed :type as an option for gem 'myrack', but it is invalid/)
+  end
+
+  it "reports that gemfile is an invalid option" do
+    gemfile <<-G
+      source "https://gem.repo1"
+
+      gem "myrack", :gemfile => "foo"
+    G
+
+    bundle :install, raise_on_error: false
+    expect(err).to match(/You passed :gemfile as an option for gem 'myrack', but it is invalid/)
+  end
+
+  context "when an internal error happens" do
+    let(:bundler_bug) do
+      create_file("bundler_bug.rb", <<~RUBY)
+        require "bundler"
+
+        module Bundler
+          class Dsl
+            def source(source, *args, &blk)
+              nil.name
+            end
+          end
+        end
+      RUBY
+
+      bundled_app("bundler_bug.rb").to_s
+    end
+
+    it "shows culprit file and line" do
+      skip "ruby-core test setup has always \"lib\" in $LOAD_PATH so `require \"bundler\"` always activates the local version rather than using RubyGems gem activation stuff, causing conflicts" if ruby_core?
 
-      bundle :install, :raise_on_error => false
-      expect(err).to match(/You passed :lib as an option for gem 'rack', but it is invalid/)
+      install_gemfile "source 'https://gem.repo1'", requires: [bundler_bug], artifice: nil, raise_on_error: false
+      expect(err).to include("bundler_bug.rb:6")
     end
   end
 
   context "with engine specified in symbol", :jruby_only do
     it "does not raise any error parsing Gemfile" do
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
+        source "https://gem.repo1"
         ruby "#{RUBY_VERSION}", :engine => :jruby, :engine_version => "#{RUBY_ENGINE_VERSION}"
       G
 
@@ -78,19 +123,19 @@
 
     it "installation succeeds" do
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
+        source "https://gem.repo1"
         ruby "#{RUBY_VERSION}", :engine => :jruby, :engine_version => "#{RUBY_ENGINE_VERSION}"
-        gem "rack"
+        gem "myrack"
       G
 
-      expect(the_bundle).to include_gems "rack 1.0.0"
+      expect(the_bundle).to include_gems "myrack 1.0.0"
     end
   end
 
   context "with a Gemfile containing non-US-ASCII characters" do
     it "reads the Gemfile with the UTF-8 encoding by default" do
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
+        source "https://gem.repo1"
 
         str = "Il était une fois ..."
         puts "The source encoding is: " + str.encoding.name
@@ -105,7 +150,7 @@
       # NOTE: This works thanks to #eval interpreting the magic encoding comment
       install_gemfile <<-G
         # encoding: iso-8859-1
-        source "#{file_uri_for(gem_repo1)}"
+        source "https://gem.repo1"
 
         str = "Il #{"\xE9".dup.force_encoding("binary")}tait une fois ..."
         puts "The source encoding is: " + str.encoding.name
diff --git a/spec/bundler/install/gems/compact_index_spec.rb b/spec/bundler/install/gems/compact_index_spec.rb
index 1d193a0f202e15..823b5aab110b03 100644
--- a/spec/bundler/install/gems/compact_index_spec.rb
+++ b/spec/bundler/install/gems/compact_index_spec.rb
@@ -7,12 +7,27 @@
   it "should use the API" do
     gemfile <<-G
       source "#{source_uri}"
-      gem "rack"
+      gem "myrack"
     G
 
-    bundle :install, :artifice => "compact_index"
+    bundle :install, artifice: "compact_index"
     expect(out).to include("Fetching gem metadata from #{source_uri}")
-    expect(the_bundle).to include_gems "rack 1.0.0"
+    expect(the_bundle).to include_gems "myrack 1.0.0"
+  end
+
+  it "has a debug mode" do
+    gemfile <<-G
+      source "#{source_uri}"
+      gem "myrack"
+    G
+
+    bundle :install, artifice: "compact_index", env: { "DEBUG_COMPACT_INDEX" => "true" }
+    expect(out).to include("Fetching gem metadata from #{source_uri}")
+    expect(err).to include("[Bundler::CompactIndexClient] available?")
+    expect(err).to include("[Bundler::CompactIndexClient] fetching versions")
+    expect(err).to include("[Bundler::CompactIndexClient] info(myrack)")
+    expect(err).to include("[Bundler::CompactIndexClient] fetching info/myrack")
+    expect(the_bundle).to include_gems "myrack 1.0.0"
   end
 
   it "should URI encode gem names" do
@@ -21,7 +36,7 @@
       gem " sinatra"
     G
 
-    bundle :install, :artifice => "compact_index", :raise_on_error => false
+    bundle :install, artifice: "compact_index", raise_on_error: false
     expect(err).to include("' sinatra' is not a valid gem name because it contains whitespace.")
   end
 
@@ -31,7 +46,7 @@
       gem "rails"
     G
 
-    bundle :install, :artifice => "compact_index"
+    bundle :install, artifice: "compact_index"
     expect(out).to include("Fetching gem metadata from #{source_uri}")
     expect(the_bundle).to include_gems(
       "rails 2.3.2",
@@ -44,23 +59,23 @@
   end
 
   it "should handle case sensitivity conflicts" do
-    build_repo4 do
-      build_gem "rack", "1.0" do |s|
-        s.add_runtime_dependency("Rack", "0.1")
+    build_repo4(build_compact_index: false) do
+      build_gem "myrack", "1.0" do |s|
+        s.add_dependency("Myrack", "0.1")
       end
-      build_gem "Rack", "0.1"
+      build_gem "Myrack", "0.1"
     end
 
-    install_gemfile <<-G, :artifice => "compact_index", :env => { "BUNDLER_SPEC_GEM_REPO" => gem_repo4.to_s }
+    install_gemfile <<-G, artifice: "compact_index", env: { "BUNDLER_SPEC_GEM_REPO" => gem_repo4.to_s }
       source "#{source_uri}"
-      gem "rack", "1.0"
-      gem "Rack", "0.1"
+      gem "myrack", "1.0"
+      gem "Myrack", "0.1"
     G
 
     # can't use `include_gems` here since the `require` will conflict on a
     # case-insensitive FS
-    run "Bundler.require; puts Gem.loaded_specs.values_at('rack', 'Rack').map(&:full_name)"
-    expect(out).to eq("rack-1.0\nRack-0.1")
+    run "Bundler.require; puts Gem.loaded_specs.values_at('myrack', 'Myrack').map(&:full_name)"
+    expect(out).to eq("myrack-1.0\nMyrack-0.1")
   end
 
   it "should handle multiple gem dependencies on the same gem" do
@@ -69,22 +84,21 @@
       gem "net-sftp"
     G
 
-    bundle :install, :artifice => "compact_index"
+    bundle :install, artifice: "compact_index"
     expect(the_bundle).to include_gems "net-sftp 1.1.1"
   end
 
   it "should use the endpoint when using deployment mode" do
     gemfile <<-G
       source "#{source_uri}"
-      gem "rack"
+      gem "myrack"
     G
-    bundle :install, :artifice => "compact_index"
+    bundle :install, artifice: "compact_index"
 
     bundle "config set --local deployment true"
-    bundle "config set --local path vendor/bundle"
-    bundle :install, :artifice => "compact_index"
+    bundle :install, artifice: "compact_index"
     expect(out).to include("Fetching gem metadata from #{source_uri}")
-    expect(the_bundle).to include_gems "rack 1.0.0"
+    expect(the_bundle).to include_gems "myrack 1.0.0"
   end
 
   it "handles git dependencies that are in rubygems" do
@@ -95,12 +109,12 @@
 
     gemfile <<-G
       source "#{source_uri}"
-      git "#{file_uri_for(lib_path("foo-1.0"))}" do
+      git "#{lib_path("foo-1.0")}" do
         gem 'foo'
       end
     G
 
-    bundle :install, :artifice => "compact_index"
+    bundle :install, artifice: "compact_index"
 
     expect(the_bundle).to include_gems("rails 2.3.2")
   end
@@ -113,13 +127,13 @@
 
     gemfile <<-G
       source "#{source_uri}"
-      gem 'foo', :git => "#{file_uri_for(lib_path("foo-1.0"))}"
+      gem 'foo', :git => "#{lib_path("foo-1.0")}"
     G
 
-    bundle :install, :artifice => "compact_index"
+    bundle :install, artifice: "compact_index"
 
     bundle "config set --local deployment true"
-    bundle :install, :artifice => "compact_index"
+    bundle :install, artifice: "compact_index"
 
     expect(the_bundle).to include_gems("rails 2.3.2")
   end
@@ -128,12 +142,12 @@
     build_git "foo"
     gemfile <<-G
       source "#{source_uri}"
-      gem 'foo', :git => "#{file_uri_for(lib_path("foo-1.0"))}"
+      gem 'foo', :git => "#{lib_path("foo-1.0")}"
     G
 
-    bundle "install", :artifice => "compact_index"
+    bundle "install", artifice: "compact_index"
     bundle "config set --local deployment true"
-    bundle :install, :artifice => "compact_index"
+    bundle :install, artifice: "compact_index"
 
     expect(the_bundle).to include_gems("foo 1.0")
   end
@@ -141,41 +155,41 @@
   it "falls back when the API URL returns 403 Forbidden" do
     gemfile <<-G
       source "#{source_uri}"
-      gem "rack"
+      gem "myrack"
     G
 
-    bundle :install, :verbose => true, :artifice => "compact_index_forbidden"
+    bundle :install, verbose: true, artifice: "compact_index_forbidden"
     expect(out).to include("Fetching gem metadata from #{source_uri}")
-    expect(the_bundle).to include_gems "rack 1.0.0"
+    expect(the_bundle).to include_gems "myrack 1.0.0"
   end
 
   it "falls back when the versions endpoint has a checksum mismatch" do
     gemfile <<-G
       source "#{source_uri}"
-      gem "rack"
+      gem "myrack"
     G
 
-    bundle :install, :verbose => true, :artifice => "compact_index_checksum_mismatch"
+    bundle :install, verbose: true, artifice: "compact_index_checksum_mismatch"
     expect(out).to include("Fetching gem metadata from #{source_uri}")
-    expect(out).to include <<-'WARN'
-The checksum of /versions does not match the checksum provided by the server! Something is wrong (local checksum is "\"d41d8cd98f00b204e9800998ecf8427e\"", was expecting "\"123\"").
-    WARN
-    expect(the_bundle).to include_gems "rack 1.0.0"
+    expect(out).to include("The checksum of /versions does not match the checksum provided by the server!")
+    expect(out).to include("Calculated checksums #{{ "sha-256" => "8KfZiM/fszVkqhP/m5s9lvE6M9xKu4I1bU4Izddp5Ms=" }.inspect} did not match expected #{{ "sha-256" => "ungWv48Bz+pBQUDeXa4iI7ADYaOWF3qctBD/YfIAFa0=" }.inspect}")
+    expect(the_bundle).to include_gems "myrack 1.0.0"
   end
 
   it "shows proper path when permission errors happen", :permissions do
     gemfile <<-G
       source "#{source_uri}"
-      gem "rack"
+      gem "myrack"
     G
 
-    versions = File.join(Bundler.rubygems.user_home, ".bundle", "cache", "compact_index",
-      "localgemserver.test.80.dd34752a738ee965a2a4298dc16db6c5", "versions")
-    FileUtils.mkdir_p(File.dirname(versions))
-    FileUtils.touch(versions)
+    versions = compact_index_cache_path.join(
+      "localgemserver.test.80.dd34752a738ee965a2a4298dc16db6c5", "versions"
+    )
+    versions.dirname.mkpath
+    versions.write("created_at")
     FileUtils.chmod("-r", versions)
 
-    bundle :install, :artifice => "compact_index", :raise_on_error => false
+    bundle :install, artifice: "compact_index", raise_on_error: false
 
     expect(err).to include(
       "There was an error while trying to read from `#{versions}`. It is likely that you need to grant read permissions for that path."
@@ -187,28 +201,28 @@
 
     gemfile <<-G
       source "#{source_uri}"
-      gem "rack"
+      gem "myrack"
     G
 
-    bundle :install, :artifice => "compact_index"
+    bundle :install, artifice: "compact_index"
     expect(out).to include("Fetching gem metadata from #{source_uri}")
-    expect(the_bundle).to include_gems "rack 1.0.0"
+    expect(the_bundle).to include_gems "myrack 1.0.0"
   end
 
   it "handles host redirects" do
     gemfile <<-G
       source "#{source_uri}"
-      gem "rack"
+      gem "myrack"
     G
 
-    bundle :install, :artifice => "compact_index_host_redirect"
-    expect(the_bundle).to include_gems "rack 1.0.0"
+    bundle :install, artifice: "compact_index_host_redirect"
+    expect(the_bundle).to include_gems "myrack 1.0.0"
   end
 
-  it "handles host redirects without Net::HTTP::Persistent" do
+  it "handles host redirects without Gem::Net::HTTP::Persistent" do
     gemfile <<-G
       source "#{source_uri}"
-      gem "rack"
+      gem "myrack"
     G
 
     FileUtils.mkdir_p lib_path
@@ -224,18 +238,18 @@ def require(*args)
       H
     end
 
-    bundle :install, :artifice => "compact_index_host_redirect", :requires => [lib_path("disable_net_http_persistent.rb")]
+    bundle :install, artifice: "compact_index_host_redirect", requires: [lib_path("disable_net_http_persistent.rb")]
     expect(out).to_not match(/Too many redirects/)
-    expect(the_bundle).to include_gems "rack 1.0.0"
+    expect(the_bundle).to include_gems "myrack 1.0.0"
   end
 
   it "times out when Bundler::Fetcher redirects too much" do
     gemfile <<-G
       source "#{source_uri}"
-      gem "rack"
+      gem "myrack"
     G
 
-    bundle :install, :artifice => "compact_index_redirects", :raise_on_error => false
+    bundle :install, artifice: "compact_index_redirects", raise_on_error: false
     expect(err).to match(/Too many redirects/)
   end
 
@@ -243,23 +257,23 @@ def require(*args)
     it "should use the modern index for install" do
       gemfile <<-G
         source "#{source_uri}"
-        gem "rack"
+        gem "myrack"
       G
 
-      bundle "install --full-index", :artifice => "compact_index"
+      bundle "install --full-index", artifice: "compact_index"
       expect(out).to include("Fetching source index from #{source_uri}")
-      expect(the_bundle).to include_gems "rack 1.0.0"
+      expect(the_bundle).to include_gems "myrack 1.0.0"
     end
 
     it "should use the modern index for update" do
       gemfile <<-G
         source "#{source_uri}"
-        gem "rack"
+        gem "myrack"
       G
 
-      bundle "update --full-index", :artifice => "compact_index", :all => true
+      bundle "update --full-index", artifice: "compact_index", all: true
       expect(out).to include("Fetching source index from #{source_uri}")
-      expect(the_bundle).to include_gems "rack 1.0.0"
+      expect(the_bundle).to include_gems "myrack 1.0.0"
     end
   end
 
@@ -287,27 +301,27 @@ def require(*args)
       end
     end
 
-    system_gems %w[rack-1.0.0 thin-1.0 net_a-1.0], :gem_repo => gem_repo2
+    system_gems %w[myrack-1.0.0 thin-1.0 net_a-1.0], gem_repo: gem_repo2
     bundle "config set --local path.system true"
     ENV["BUNDLER_SPEC_ALL_REQUESTS"] = <<~EOS.strip
       #{source_uri}/versions
-      #{source_uri}/info/rack
+      #{source_uri}/info/myrack
     EOS
 
-    install_gemfile <<-G, :artifice => "compact_index", :verbose => true, :env => { "BUNDLER_SPEC_GEM_REPO" => gem_repo2.to_s }
+    install_gemfile <<-G, artifice: "compact_index", verbose: true, env: { "BUNDLER_SPEC_GEM_REPO" => gem_repo2.to_s }
       source "#{source_uri}"
-      gem "rack"
+      gem "myrack"
     G
 
-    expect(last_command.stdboth).not_to include "Double checking"
+    expect(stdboth).not_to include "Double checking"
   end
 
-  it "fetches again when more dependencies are found in subsequent sources", :bundler => "< 3" do
+  it "fetches again when more dependencies are found in subsequent sources" do
     build_repo2 do
       build_gem "back_deps" do |s|
         s.add_dependency "foo"
       end
-      FileUtils.rm_rf Dir[gem_repo2("gems/foo-*.gem")]
+      FileUtils.rm_r Dir[gem_repo2("gems/foo-*.gem")]
     end
 
     gemfile <<-G
@@ -316,7 +330,7 @@ def require(*args)
       gem "back_deps"
     G
 
-    bundle :install, :artifice => "compact_index_extra"
+    bundle :install, artifice: "compact_index_extra"
     expect(the_bundle).to include_gems "back_deps 1.0", "foo 1.0"
   end
 
@@ -325,10 +339,10 @@ def require(*args)
       build_gem "back_deps" do |s|
         s.add_dependency "foo"
       end
-      FileUtils.rm_rf Dir[gem_repo2("gems/foo-*.gem")]
+      FileUtils.rm_r Dir[gem_repo2("gems/foo-*.gem")]
     end
 
-    install_gemfile <<-G, :artifice => "compact_index_extra", :verbose => true
+    install_gemfile <<-G, artifice: "compact_index_extra", verbose: true
       source "#{source_uri}"
       source "#{source_uri}/extra" do
         gem "back_deps"
@@ -341,27 +355,27 @@ def require(*args)
   it "fetches gem versions even when those gems are already installed" do
     gemfile <<-G
       source "#{source_uri}"
-      gem "rack", "1.0.0"
+      gem "myrack", "1.0.0"
     G
-    bundle :install, :artifice => "compact_index_extra_api"
-    expect(the_bundle).to include_gems "rack 1.0.0"
+    bundle :install, artifice: "compact_index_extra_api"
+    expect(the_bundle).to include_gems "myrack 1.0.0"
 
     build_repo4 do
-      build_gem "rack", "1.2" do |s|
-        s.executables = "rackup"
+      build_gem "myrack", "1.2" do |s|
+        s.executables = "myrackup"
       end
     end
 
     gemfile <<-G
       source "#{source_uri}" do; end
       source "#{source_uri}/extra"
-      gem "rack", "1.2"
+      gem "myrack", "1.2"
     G
-    bundle :install, :artifice => "compact_index_extra_api"
-    expect(the_bundle).to include_gems "rack 1.2"
+    bundle :install, artifice: "compact_index_extra_api"
+    expect(the_bundle).to include_gems "myrack 1.2"
   end
 
-  it "considers all possible versions of dependencies from all api gem sources", :bundler => "< 3" do
+  it "considers all possible versions of dependencies from all api gem sources" do
     # In this scenario, the gem "somegem" only exists in repo4.  It depends on specific version of activesupport that
     # exists only in repo1.  There happens also be a version of activesupport in repo4, but not the one that version 1.0.0
     # of somegem wants. This test makes sure that bundler actually finds version 1.2.3 of active support in the other
@@ -379,7 +393,7 @@ def require(*args)
       gem 'somegem', '1.0.0'
     G
 
-    bundle :install, :artifice => "compact_index_extra_api"
+    bundle :install, artifice: "compact_index_extra_api"
 
     expect(the_bundle).to include_gems "somegem 1.0.0"
     expect(the_bundle).to include_gems "activesupport 1.2.3"
@@ -390,7 +404,7 @@ def require(*args)
       build_gem "back_deps" do |s|
         s.add_dependency "foo"
       end
-      FileUtils.rm_rf Dir[gem_repo2("gems/foo-*.gem")]
+      FileUtils.rm_r Dir[gem_repo2("gems/foo-*.gem")]
     end
 
     gemfile <<-G
@@ -400,7 +414,7 @@ def require(*args)
       end
     G
 
-    bundle :install, :artifice => "compact_index_extra"
+    bundle :install, artifice: "compact_index_extra"
 
     expect(out).to include("Fetching gem metadata from http://localgemserver.test/")
     expect(out).to include("Fetching source index from http://localgemserver.test/extra")
@@ -413,10 +427,10 @@ def require(*args)
       end
       build_gem "missing"
 
-      FileUtils.rm_rf Dir[gem_repo2("gems/foo-*.gem")]
+      FileUtils.rm_r Dir[gem_repo2("gems/foo-*.gem")]
     end
 
-    install_gemfile <<-G, :artifice => "compact_index_extra_missing", :env => env_for_missing_prerelease_default_gem_activation
+    install_gemfile <<-G, artifice: "compact_index_extra_missing"
       source "#{source_uri}"
       source "#{source_uri}/extra" do
         gem "back_deps"
@@ -433,10 +447,10 @@ def require(*args)
       end
       build_gem "missing"
 
-      FileUtils.rm_rf Dir[gem_repo4("gems/foo-*.gem")]
+      FileUtils.rm_r Dir[gem_repo4("gems/foo-*.gem")]
     end
 
-    install_gemfile <<-G, :artifice => "compact_index_extra_api_missing", :env => env_for_missing_prerelease_default_gem_activation
+    install_gemfile <<-G, artifice: "compact_index_extra_api_missing"
       source "#{source_uri}"
       source "#{source_uri}/extra" do
         gem "back_deps"
@@ -453,16 +467,16 @@ def require(*args)
       gem 'foo'
     G
 
-    bundle :install, :artifice => "compact_index_api_missing"
+    bundle :install, artifice: "compact_index_api_missing"
     expect(the_bundle).to include_gems "foo 1.0"
   end
 
-  it "fetches again when more dependencies are found in subsequent sources using deployment mode", :bundler => "< 3" do
+  it "fetches again when more dependencies are found in subsequent sources using deployment mode" do
     build_repo2 do
       build_gem "back_deps" do |s|
         s.add_dependency "foo"
       end
-      FileUtils.rm_rf Dir[gem_repo2("gems/foo-*.gem")]
+      FileUtils.rm_r Dir[gem_repo2("gems/foo-*.gem")]
     end
 
     gemfile <<-G
@@ -471,9 +485,9 @@ def require(*args)
       gem "back_deps"
     G
 
-    bundle :install, :artifice => "compact_index_extra"
+    bundle :install, artifice: "compact_index_extra"
     bundle "config --set local deployment true"
-    bundle :install, :artifice => "compact_index_extra"
+    bundle :install, artifice: "compact_index_extra"
     expect(the_bundle).to include_gems "back_deps 1.0"
   end
 
@@ -482,7 +496,7 @@ def require(*args)
       build_gem "back_deps" do |s|
         s.add_dependency "foo"
       end
-      FileUtils.rm_rf Dir[gem_repo2("gems/foo-*.gem")]
+      FileUtils.rm_r Dir[gem_repo2("gems/foo-*.gem")]
     end
 
     gemfile <<-G
@@ -492,9 +506,9 @@ def require(*args)
       end
     G
 
-    bundle :install, :artifice => "compact_index_extra"
+    bundle :install, artifice: "compact_index_extra"
     bundle "config set --local deployment true"
-    bundle :install, :artifice => "compact_index_extra"
+    bundle :install, artifice: "compact_index_extra"
     expect(the_bundle).to include_gems "back_deps 1.0"
   end
 
@@ -511,70 +525,70 @@ def require(*args)
       gem "bundler_dep"
     G
 
-    bundle :install, :artifice => "compact_index", :env => { "BUNDLER_SPEC_GEM_REPO" => gem_repo2.to_s }
+    bundle :install, artifice: "compact_index", env: { "BUNDLER_SPEC_GEM_REPO" => gem_repo2.to_s }
     expect(out).to include("Fetching gem metadata from #{source_uri}")
   end
 
-  it "installs the binstubs", :bundler => "< 3" do
+  it "installs the binstubs" do
     gemfile <<-G
       source "#{source_uri}"
-      gem "rack"
+      gem "myrack"
     G
 
-    bundle "install --binstubs", :artifice => "compact_index"
+    bundle "install --binstubs", artifice: "compact_index"
 
-    gembin "rackup"
+    gembin "myrackup"
     expect(out).to eq("1.0.0")
   end
 
-  it "installs the bins when using --path and uses autoclean", :bundler => "< 3" do
+  it "installs the bins when using --path and uses autoclean" do
     gemfile <<-G
       source "#{source_uri}"
-      gem "rack"
+      gem "myrack"
     G
 
-    bundle "install --path vendor/bundle", :artifice => "compact_index"
+    bundle "install --path vendor/bundle", artifice: "compact_index"
 
-    expect(vendored_gems("bin/rackup")).to exist
+    expect(vendored_gems("bin/myrackup")).to exist
   end
 
-  it "installs the bins when using --path and uses bundle clean", :bundler => "< 3" do
+  it "installs the bins when using --path and uses bundle clean" do
     gemfile <<-G
       source "#{source_uri}"
-      gem "rack"
+      gem "myrack"
     G
 
-    bundle "install --path vendor/bundle --no-clean", :artifice => "compact_index"
+    bundle "install --path vendor/bundle --no-clean", artifice: "compact_index"
 
-    expect(vendored_gems("bin/rackup")).to exist
+    expect(vendored_gems("bin/myrackup")).to exist
   end
 
   it "prints post_install_messages" do
     gemfile <<-G
       source "#{source_uri}"
-      gem 'rack-obama'
+      gem 'myrack-obama'
     G
 
-    bundle :install, :artifice => "compact_index"
-    expect(out).to include("Post-install message from rack:")
+    bundle :install, artifice: "compact_index"
+    expect(out).to include("Post-install message from myrack:")
   end
 
   it "should display the post install message for a dependency" do
     gemfile <<-G
       source "#{source_uri}"
-      gem 'rack_middleware'
+      gem 'myrack_middleware'
     G
 
-    bundle :install, :artifice => "compact_index"
-    expect(out).to include("Post-install message from rack:")
-    expect(out).to include("Rack's post install message")
+    bundle :install, artifice: "compact_index"
+    expect(out).to include("Post-install message from myrack:")
+    expect(out).to include("Myrack's post install message")
   end
 
   context "when using basic authentication" do
     let(:user)     { "user" }
     let(:password) { "pass" }
     let(:basic_auth_source_uri) do
-      uri          = Bundler::URI.parse(source_uri)
+      uri          = Gem::URI.parse(source_uri)
       uri.user     = user
       uri.password = password
 
@@ -584,110 +598,110 @@ def require(*args)
     it "passes basic authentication details and strips out creds" do
       gemfile <<-G
         source "#{basic_auth_source_uri}"
-        gem "rack"
+        gem "myrack"
       G
 
-      bundle :install, :artifice => "compact_index_basic_authentication"
+      bundle :install, artifice: "compact_index_basic_authentication"
       expect(out).not_to include("#{user}:#{password}")
-      expect(the_bundle).to include_gems "rack 1.0.0"
+      expect(the_bundle).to include_gems "myrack 1.0.0"
     end
 
     it "passes basic authentication details and strips out creds also in verbose mode" do
       gemfile <<-G
         source "#{basic_auth_source_uri}"
-        gem "rack"
+        gem "myrack"
       G
 
-      bundle :install, :verbose => true, :artifice => "compact_index_basic_authentication"
+      bundle :install, verbose: true, artifice: "compact_index_basic_authentication"
       expect(out).not_to include("#{user}:#{password}")
-      expect(the_bundle).to include_gems "rack 1.0.0"
+      expect(the_bundle).to include_gems "myrack 1.0.0"
     end
 
-    it "strips http basic auth creds when warning about ambiguous sources", :bundler => "< 3" do
+    it "strips http basic auth creds when warning about ambiguous sources" do
       gemfile <<-G
         source "#{basic_auth_source_uri}"
         source "#{file_uri_for(gem_repo1)}"
-        gem "rack"
+        gem "myrack"
       G
 
-      bundle :install, :artifice => "compact_index_basic_authentication"
-      expect(err).to include("Warning: the gem 'rack' was found in multiple sources.")
+      bundle :install, artifice: "compact_index_basic_authentication"
+      expect(err).to include("Warning: the gem 'myrack' was found in multiple sources.")
       expect(err).not_to include("#{user}:#{password}")
-      expect(the_bundle).to include_gems "rack 1.0.0"
+      expect(the_bundle).to include_gems "myrack 1.0.0"
     end
 
     it "does not pass the user / password to different hosts on redirect" do
       gemfile <<-G
         source "#{basic_auth_source_uri}"
-        gem "rack"
+        gem "myrack"
       G
 
-      bundle :install, :artifice => "compact_index_creds_diff_host"
-      expect(the_bundle).to include_gems "rack 1.0.0"
+      bundle :install, artifice: "compact_index_creds_diff_host"
+      expect(the_bundle).to include_gems "myrack 1.0.0"
     end
 
     describe "with authentication details in bundle config" do
       before do
         gemfile <<-G
           source "#{source_uri}"
-          gem "rack"
+          gem "myrack"
         G
       end
 
       it "reads authentication details by host name from bundle config" do
         bundle "config set #{source_hostname} #{user}:#{password}"
 
-        bundle :install, :artifice => "compact_index_strict_basic_authentication"
+        bundle :install, artifice: "compact_index_strict_basic_authentication"
 
         expect(out).to include("Fetching gem metadata from #{source_uri}")
-        expect(the_bundle).to include_gems "rack 1.0.0"
+        expect(the_bundle).to include_gems "myrack 1.0.0"
       end
 
       it "reads authentication details by full url from bundle config" do
         # The trailing slash is necessary here; Fetcher canonicalizes the URI.
         bundle "config set #{source_uri}/ #{user}:#{password}"
 
-        bundle :install, :artifice => "compact_index_strict_basic_authentication"
+        bundle :install, artifice: "compact_index_strict_basic_authentication"
 
         expect(out).to include("Fetching gem metadata from #{source_uri}")
-        expect(the_bundle).to include_gems "rack 1.0.0"
+        expect(the_bundle).to include_gems "myrack 1.0.0"
       end
 
       it "should use the API" do
         bundle "config set #{source_hostname} #{user}:#{password}"
-        bundle :install, :artifice => "compact_index_strict_basic_authentication"
+        bundle :install, artifice: "compact_index_strict_basic_authentication"
         expect(out).to include("Fetching gem metadata from #{source_uri}")
-        expect(the_bundle).to include_gems "rack 1.0.0"
+        expect(the_bundle).to include_gems "myrack 1.0.0"
       end
 
       it "prefers auth supplied in the source uri" do
         gemfile <<-G
           source "#{basic_auth_source_uri}"
-          gem "rack"
+          gem "myrack"
         G
 
         bundle "config set #{source_hostname} otheruser:wrong"
 
-        bundle :install, :artifice => "compact_index_strict_basic_authentication"
-        expect(the_bundle).to include_gems "rack 1.0.0"
+        bundle :install, artifice: "compact_index_strict_basic_authentication"
+        expect(the_bundle).to include_gems "myrack 1.0.0"
       end
 
       it "shows instructions if auth is not provided for the source" do
-        bundle :install, :artifice => "compact_index_strict_basic_authentication", :raise_on_error => false
+        bundle :install, artifice: "compact_index_strict_basic_authentication", raise_on_error: false
         expect(err).to include("bundle config set --global #{source_hostname} username:password")
       end
 
       it "fails if authentication has already been provided, but failed" do
         bundle "config set #{source_hostname} #{user}:wrong"
 
-        bundle :install, :artifice => "compact_index_strict_basic_authentication", :raise_on_error => false
+        bundle :install, artifice: "compact_index_strict_basic_authentication", raise_on_error: false
         expect(err).to include("Bad username or password")
       end
 
       it "does not fallback to old dependency API if bad authentication is provided" do
         bundle "config set #{source_hostname} #{user}:wrong"
 
-        bundle :install, :artifice => "compact_index_strict_basic_authentication", :raise_on_error => false, :verbose => true
+        bundle :install, artifice: "compact_index_strict_basic_authentication", raise_on_error: false, verbose: true
         expect(err).to include("Bad username or password")
         expect(out).to include("HTTP 401 Unauthorized http://user@localgemserver.test/versions")
         expect(out).not_to include("HTTP 401 Unauthorized http://user@localgemserver.test/api/v1/dependencies")
@@ -700,11 +714,11 @@ def require(*args)
       it "passes basic authentication details" do
         gemfile <<-G
           source "#{basic_auth_source_uri}"
-          gem "rack"
+          gem "myrack"
         G
 
-        bundle :install, :artifice => "compact_index_basic_authentication"
-        expect(the_bundle).to include_gems "rack 1.0.0"
+        bundle :install, artifice: "compact_index_basic_authentication"
+        expect(the_bundle).to include_gems "myrack 1.0.0"
       end
     end
   end
@@ -722,14 +736,14 @@ def require(*args)
       end
     end
 
-    it "explains what to do to get it" do
+    it "explains what to do to get it, and includes original error" do
       gemfile <<-G
         source "#{source_uri.gsub(/http/, "https")}"
-        gem "rack"
+        gem "myrack"
       G
 
-      bundle :install, :env => { "RUBYOPT" => opt_add("-I#{bundled_app("broken_ssl")}", ENV["RUBYOPT"]) }, :raise_on_error => false
-      expect(err).to include("OpenSSL")
+      bundle :install, env: { "RUBYOPT" => "-I#{bundled_app("broken_ssl")}" }, raise_on_error: false, artifice: nil
+      expect(err).to include("recompile Ruby").and include("cannot load such file")
     end
   end
 
@@ -738,17 +752,17 @@ def require(*args)
       # Install a monkeypatch that reproduces the effects of openssl raising
       # a certificate validation error when RubyGems tries to connect.
       gemfile <<-G
-        class Net::HTTP
+        class Gem::Net::HTTP
           def start
             raise OpenSSL::SSL::SSLError, "certificate verify failed"
           end
         end
 
         source "#{source_uri.gsub(/http/, "https")}"
-        gem "rack"
+        gem "myrack"
       G
 
-      bundle :install, :raise_on_error => false
+      bundle :install, raise_on_error: false
       expect(err).to match(/could not verify the SSL certificate/i)
     end
   end
@@ -756,118 +770,203 @@ def start
   context ".gemrc with sources is present" do
     it "uses other sources declared in the Gemfile" do
       File.open(home(".gemrc"), "w") do |file|
-        file.puts({ :sources => ["https://rubygems.org"] }.to_yaml)
+        file.puts({ sources: ["https://rubygems.org"] }.to_yaml)
       end
 
       begin
         gemfile <<-G
           source "#{source_uri}"
-          gem 'rack'
+          gem 'myrack'
         G
 
-        bundle :install, :artifice => "compact_index_forbidden"
+        bundle :install, artifice: "compact_index_forbidden"
       ensure
         home(".gemrc").rmtree
       end
     end
   end
 
-  it "performs partial update with a non-empty range" do
+  it "performs update with etag not-modified" do
+    versions_etag = compact_index_cache_path.join(
+      "localgemserver.test.80.dd34752a738ee965a2a4298dc16db6c5", "versions.etag"
+    )
+    expect(versions_etag.file?).to eq(false)
+
     gemfile <<-G
       source "#{source_uri}"
-      gem 'rack', '0.9.1'
+      gem 'myrack', '0.9.1'
     G
 
-    # Initial install creates the cached versions file
-    bundle :install, :artifice => "compact_index"
+    # Initial install creates the cached versions file and etag file
+    bundle :install, artifice: "compact_index"
+
+    expect(versions_etag.file?).to eq(true)
+    previous_content = versions_etag.binread
 
     # Update the Gemfile so we can check subsequent install was successful
     gemfile <<-G
       source "#{source_uri}"
-      gem 'rack', '1.0.0'
+      gem 'myrack', '1.0.0'
     G
 
-    # Second install should make only a partial request to /versions
-    bundle :install, :artifice => "compact_index_partial_update"
+    # Second install should match etag
+    bundle :install, artifice: "compact_index_etag_match"
 
-    expect(the_bundle).to include_gems "rack 1.0.0"
+    expect(versions_etag.binread).to eq(previous_content)
+    expect(the_bundle).to include_gems "myrack 1.0.0"
+  end
+
+  it "performs full update when range is ignored" do
+    gemfile <<-G
+      source "#{source_uri}"
+      gem 'myrack', '0.9.1'
+    G
+
+    # Initial install creates the cached versions file and etag file
+    bundle :install, artifice: "compact_index"
+
+    gemfile <<-G
+      source "#{source_uri}"
+      gem 'myrack', '1.0.0'
+    G
+
+    versions = compact_index_cache_path.join(
+      "localgemserver.test.80.dd34752a738ee965a2a4298dc16db6c5", "versions"
+    )
+    # Modify the cached file. The ranged request will be based on this but,
+    # in this test, the range is ignored so this gets overwritten, allowing install.
+    versions.write "ruining this file"
+
+    bundle :install, artifice: "compact_index_range_ignored"
+
+    expect(the_bundle).to include_gems "myrack 1.0.0"
+  end
+
+  it "performs partial update with a non-empty range" do
+    build_repo4 do
+      build_gem "myrack", "0.9.1"
+    end
+
+    # Initial install creates the cached versions file
+    install_gemfile <<-G, artifice: "compact_index", env: { "BUNDLER_SPEC_GEM_REPO" => gem_repo4.to_s }
+      source "#{source_uri}"
+      gem 'myrack', '0.9.1'
+    G
+
+    update_repo4 do
+      build_gem "myrack", "1.0.0"
+    end
+
+    install_gemfile <<-G, artifice: "compact_index_partial_update", env: { "BUNDLER_SPEC_GEM_REPO" => gem_repo4.to_s }
+      source "#{source_uri}"
+      gem 'myrack', '1.0.0'
+    G
+
+    expect(the_bundle).to include_gems "myrack 1.0.0"
   end
 
   it "performs partial update while local cache is updated by another process" do
     gemfile <<-G
       source "#{source_uri}"
-      gem 'rack'
+      gem 'myrack'
+    G
+
+    # Create a partial cache versions file
+    versions = compact_index_cache_path.join(
+      "localgemserver.test.80.dd34752a738ee965a2a4298dc16db6c5", "versions"
+    )
+    versions.dirname.mkpath
+    versions.write("created_at")
+
+    bundle :install, artifice: "compact_index_concurrent_download"
+
+    expect(versions.read).to start_with("created_at")
+    expect(the_bundle).to include_gems "myrack 1.0.0"
+  end
+
+  it "performs a partial update that fails digest check, then a full update" do
+    build_repo4 do
+      build_gem "myrack", "0.9.1"
+    end
+
+    install_gemfile <<-G, artifice: "compact_index", env: { "BUNDLER_SPEC_GEM_REPO" => gem_repo4.to_s }
+      source "#{source_uri}"
+      gem 'myrack', '0.9.1'
     G
 
-    # Create an empty file to trigger a partial download
-    versions = File.join(Bundler.rubygems.user_home, ".bundle", "cache", "compact_index",
-      "localgemserver.test.80.dd34752a738ee965a2a4298dc16db6c5", "versions")
-    FileUtils.mkdir_p(File.dirname(versions))
-    FileUtils.touch(versions)
+    update_repo4 do
+      build_gem "myrack", "1.0.0"
+    end
 
-    bundle :install, :artifice => "compact_index_concurrent_download"
+    install_gemfile <<-G, artifice: "compact_index_partial_update_bad_digest", env: { "BUNDLER_SPEC_GEM_REPO" => gem_repo4.to_s }
+      source "#{source_uri}"
+      gem 'myrack', '1.0.0'
+    G
 
-    expect(File.read(versions)).to start_with("created_at")
-    expect(the_bundle).to include_gems "rack 1.0.0"
+    expect(the_bundle).to include_gems "myrack 1.0.0"
   end
 
-  it "performs full update if server endpoints serve partial content responses but don't have incremental content and provide no Etag" do
+  it "performs full update if server endpoints serve partial content responses but don't have incremental content and provide no digest" do
     build_repo4 do
-      build_gem "rack", "0.9.1"
+      build_gem "myrack", "0.9.1"
     end
 
-    install_gemfile <<-G, :artifice => "compact_index", :env => { "BUNDLER_SPEC_GEM_REPO" => gem_repo4.to_s }
+    install_gemfile <<-G, artifice: "compact_index", env: { "BUNDLER_SPEC_GEM_REPO" => gem_repo4.to_s }
       source "#{source_uri}"
-      gem 'rack', '0.9.1'
+      gem 'myrack', '0.9.1'
     G
 
     update_repo4 do
-      build_gem "rack", "1.0.0"
+      build_gem "myrack", "1.0.0"
     end
 
-    install_gemfile <<-G, :artifice => "compact_index_partial_update_no_etag_not_incremental", :env => { "BUNDLER_SPEC_GEM_REPO" => gem_repo4.to_s }
+    install_gemfile <<-G, artifice: "compact_index_partial_update_no_digest_not_incremental", env: { "BUNDLER_SPEC_GEM_REPO" => gem_repo4.to_s }
       source "#{source_uri}"
-      gem 'rack', '1.0.0'
+      gem 'myrack', '1.0.0'
     G
 
-    expect(the_bundle).to include_gems "rack 1.0.0"
+    expect(the_bundle).to include_gems "myrack 1.0.0"
   end
 
   it "performs full update of compact index info cache if range is not satisfiable" do
     gemfile <<-G
       source "#{source_uri}"
-      gem 'rack', '0.9.1'
+      gem 'myrack', '0.9.1'
     G
 
-    rake_info_path = File.join(Bundler.rubygems.user_home, ".bundle", "cache", "compact_index",
-      "localgemserver.test.80.dd34752a738ee965a2a4298dc16db6c5", "info", "rack")
+    bundle :install, artifice: "compact_index"
+
+    cache_path = compact_index_cache_path.join("localgemserver.test.80.dd34752a738ee965a2a4298dc16db6c5")
 
-    bundle :install, :artifice => "compact_index"
+    # We must remove the etag so that we don't ignore the range and get a 304 Not Modified.
+    myrack_info_etag_path = File.join(cache_path, "info-etags", "myrack-92f3313ce5721296f14445c3a6b9c073")
+    File.unlink(myrack_info_etag_path) if File.exist?(myrack_info_etag_path)
 
-    expected_rack_info_content = File.read(rake_info_path)
+    myrack_info_path = File.join(cache_path, "info", "myrack")
+    expected_myrack_info_content = File.read(myrack_info_path)
 
-    # Modify the cache files. We expect them to be reset to the normal ones when we re-run :install
-    File.open(rake_info_path, "w") {|f| f << (expected_rack_info_content + "this is different") }
+    # Modify the cache files to make the range not satisfiable
+    File.open(myrack_info_path, "a") {|f| f << "0.9.2 |checksum:c55b525b421fd833a93171ad3d7f04528ca8e87d99ac273f8933038942a5888c" }
 
     # Update the Gemfile so the next install does its normal things
     gemfile <<-G
       source "#{source_uri}"
-      gem 'rack', '1.0.0'
+      gem 'myrack', '1.0.0'
     G
 
     # The cache files now being longer means the requested range is going to be not satisfiable
     # Bundler must end up requesting the whole file to fix things up.
-    bundle :install, :artifice => "compact_index_range_not_satisfiable"
+    bundle :install, artifice: "compact_index_range_not_satisfiable"
 
-    resulting_rack_info_content = File.read(rake_info_path)
+    resulting_myrack_info_content = File.read(myrack_info_path)
 
-    expect(resulting_rack_info_content).to eq(expected_rack_info_content)
+    expect(resulting_myrack_info_content).to eq(expected_myrack_info_content)
   end
 
   it "fails gracefully when the source URI has an invalid scheme" do
-    install_gemfile <<-G, :raise_on_error => false
+    install_gemfile <<-G, raise_on_error: false
       source "htps://rubygems.org"
-      gem "rack"
+      gem "myrack"
     G
     expect(exitstatus).to eq(15)
     expect(err).to end_with(<<-E.strip)
@@ -876,79 +975,125 @@ def start
   end
 
   describe "checksum validation" do
+    before do
+      lockfile <<-L
+        GEM
+          remote: #{source_uri}
+          specs:
+            myrack (1.0.0)
+
+        PLATFORMS
+          ruby
+
+        DEPENDENCIES
+        #{checksums_section}
+        BUNDLED WITH
+            #{Bundler::VERSION}
+      L
+    end
+
+    it "handles checksums from the server in base64" do
+      api_checksum = checksum_digest(gem_repo1, "myrack", "1.0.0")
+      myrack_checksum = [[api_checksum].pack("H*")].pack("m0")
+      install_gemfile <<-G, artifice: "compact_index", env: { "BUNDLER_SPEC_MYRACK_CHECKSUM" => myrack_checksum }
+        source "#{source_uri}"
+        gem "myrack"
+      G
+
+      expect(out).to include("Fetching gem metadata from #{source_uri}")
+      expect(the_bundle).to include_gems("myrack 1.0.0")
+    end
+
     it "raises when the checksum does not match" do
-      install_gemfile <<-G, :artifice => "compact_index_wrong_gem_checksum", :raise_on_error => false
+      install_gemfile <<-G, artifice: "compact_index_wrong_gem_checksum", raise_on_error: false
         source "#{source_uri}"
-        gem "rack"
+        gem "myrack"
       G
 
-      expect(exitstatus).to eq(19)
-      expect(err).
-        to  include("Bundler cannot continue installing rack (1.0.0).").
-        and include("The checksum for the downloaded `rack-1.0.0.gem` does not match the checksum given by the server.").
-        and include("This means the contents of the downloaded gem is different from what was uploaded to the server, and could be a potential security issue.").
-        and include("To resolve this issue:").
-        and include("1. delete the downloaded gem located at: `#{default_bundle_path}/gems/rack-1.0.0/rack-1.0.0.gem`").
-        and include("2. run `bundle install`").
-        and include("If you wish to continue installing the downloaded gem, and are certain it does not pose a security issue despite the mismatching checksum, do the following:").
-        and include("1. run `bundle config set --local disable_checksum_validation true` to turn off checksum verification").
-        and include("2. run `bundle install`").
-        and match(/\(More info: The expected SHA256 checksum was "#{"ab" * 22}", but the checksum for the downloaded gem was ".+?"\.\)/)
+      gem_path = if Bundler.feature_flag.global_gem_cache?
+        default_cache_path.dirname.join("cache", "gems", "localgemserver.test.80.dd34752a738ee965a2a4298dc16db6c5", "myrack-1.0.0.gem")
+      else
+        default_cache_path.dirname.join("myrack-1.0.0.gem")
+      end
+
+      expect(exitstatus).to eq(37)
+      expect(err).to eq <<~E.strip
+        Bundler found mismatched checksums. This is a potential security risk.
+          myrack (1.0.0) sha256=2222222222222222222222222222222222222222222222222222222222222222
+            from the API at http://localgemserver.test/
+          #{checksum_to_lock(gem_repo1, "myrack", "1.0.0")}
+            from the gem at #{gem_path}
+
+        If you trust the API at http://localgemserver.test/, to resolve this issue you can:
+          1. remove the gem at #{gem_path}
+          2. run `bundle install`
+
+        To ignore checksum security warnings, disable checksum validation with
+          `bundle config set --local disable_checksum_validation true`
+      E
     end
 
     it "raises when the checksum is the wrong length" do
-      install_gemfile <<-G, :artifice => "compact_index_wrong_gem_checksum", :env => { "BUNDLER_SPEC_RACK_CHECKSUM" => "checksum!", "DEBUG" => "1" }, :verbose => true, :raise_on_error => false
+      install_gemfile <<-G, artifice: "compact_index_wrong_gem_checksum", env: { "BUNDLER_SPEC_MYRACK_CHECKSUM" => "checksum!", "DEBUG" => "1" }, verbose: true, raise_on_error: false
         source "#{source_uri}"
-        gem "rack"
+        gem "myrack"
       G
-      expect(exitstatus).to eq(5)
-      expect(err).to include("The given checksum for rack-1.0.0 (\"checksum!\") is not a valid SHA256 hexdigest nor base64digest")
+      expect(exitstatus).to eq(14)
+      expect(err).to include('Invalid checksum for myrack-0.9.1: "checksum!" is not a valid SHA256 hex or base64 digest')
     end
 
     it "does not raise when disable_checksum_validation is set" do
       bundle "config set disable_checksum_validation true"
-      install_gemfile <<-G, :artifice => "compact_index_wrong_gem_checksum"
+      install_gemfile <<-G, artifice: "compact_index_wrong_gem_checksum"
         source "#{source_uri}"
-        gem "rack"
+        gem "myrack"
       G
     end
   end
 
   it "works when cache dir is world-writable" do
-    install_gemfile <<-G, :artifice => "compact_index"
+    install_gemfile <<-G, artifice: "compact_index"
       File.umask(0000)
       source "#{source_uri}"
-      gem "rack"
+      gem "myrack"
     G
   end
 
   it "doesn't explode when the API dependencies are wrong" do
-    install_gemfile <<-G, :artifice => "compact_index_wrong_dependencies", :env => { "DEBUG" => "true" }, :raise_on_error => false
+    install_gemfile <<-G, artifice: "compact_index_wrong_dependencies", env: { "DEBUG" => "true" }, raise_on_error: false
       source "#{source_uri}"
       gem "rails"
     G
-    deps = [Gem::Dependency.new("rake", "= 13.0.1"),
+    deps = [Gem::Dependency.new("rake", "= #{rake_version}"),
             Gem::Dependency.new("actionpack", "= 2.3.2"),
             Gem::Dependency.new("activerecord", "= 2.3.2"),
             Gem::Dependency.new("actionmailer", "= 2.3.2"),
             Gem::Dependency.new("activeresource", "= 2.3.2")]
-    expect(out).to include("rails-2.3.2 from rubygems remote at #{source_uri}/ has either corrupted API or lockfile dependencies")
+    expect(out).to include("rails-2.3.2 from rubygems remote at #{source_uri}/ has corrupted API dependencies")
     expect(err).to include(<<-E.strip)
-Bundler::APIResponseMismatchError: Downloading rails-2.3.2 revealed dependencies not in the API or the lockfile (#{deps.map(&:to_s).join(", ")}).
+Bundler::APIResponseMismatchError: Downloading rails-2.3.2 revealed dependencies not in the API (#{deps.map(&:to_s).join(", ")}).
 Running `bundle update rails` should fix the problem.
     E
   end
 
   it "does not duplicate specs in the lockfile when updating and a dependency is not installed" do
-    install_gemfile <<-G, :artifice => "compact_index"
-      source "#{file_uri_for(gem_repo1)}"
+    install_gemfile <<-G, artifice: "compact_index"
+      source "https://gem.repo1"
       source "#{source_uri}" do
         gem "rails"
         gem "activemerchant"
       end
     G
     gem_command "uninstall activemerchant"
-    bundle "update rails", :artifice => "compact_index"
-    expect(lockfile.scan(/activemerchant \(/).size).to eq(1)
+    bundle "update rails", artifice: "compact_index"
+    count = lockfile.match?("CHECKSUMS") ? 2 : 1 # Once in the specs, and once in CHECKSUMS
+    expect(lockfile.scan(/activemerchant \(/).size).to eq(count)
+  end
+
+  it "handles an API that does not provide checksums info (undocumented, support may get removed)" do
+    install_gemfile <<-G, artifice: "compact_index_no_checksums"
+      source "https://gem.repo1"
+      gem "rake"
+    G
   end
 end
diff --git a/spec/bundler/install/gems/dependency_api_fallback_spec.rb b/spec/bundler/install/gems/dependency_api_fallback_spec.rb
new file mode 100644
index 00000000000000..7890cbdb993bbc
--- /dev/null
+++ b/spec/bundler/install/gems/dependency_api_fallback_spec.rb
@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+RSpec.describe "gemcutter's dependency API" do
+  context "when Gemcutter API takes too long to respond" do
+    before do
+      bundle "config set timeout 1"
+    end
+
+    it "times out and falls back on the modern index" do
+      install_gemfile <<-G, artifice: "endpoint_timeout"
+        source "https://gem.repo1"
+        gem "myrack"
+      G
+
+      expect(out).to include("Fetching source index from https://gem.repo1/")
+      expect(the_bundle).to include_gems "myrack 1.0.0"
+    end
+  end
+end
diff --git a/spec/bundler/install/gems/dependency_api_spec.rb b/spec/bundler/install/gems/dependency_api_spec.rb
index a54f1db7726471..b7953b3d61c307 100644
--- a/spec/bundler/install/gems/dependency_api_spec.rb
+++ b/spec/bundler/install/gems/dependency_api_spec.rb
@@ -7,12 +7,12 @@
   it "should use the API" do
     gemfile <<-G
       source "#{source_uri}"
-      gem "rack"
+      gem "myrack"
     G
 
-    bundle :install, :artifice => "endpoint"
+    bundle :install, artifice: "endpoint"
     expect(out).to include("Fetching gem metadata from #{source_uri}")
-    expect(the_bundle).to include_gems "rack 1.0.0"
+    expect(the_bundle).to include_gems "myrack 1.0.0"
   end
 
   it "should URI encode gem names" do
@@ -21,7 +21,7 @@
       gem " sinatra"
     G
 
-    bundle :install, :artifice => "endpoint", :raise_on_error => false
+    bundle :install, artifice: "endpoint", raise_on_error: false
     expect(err).to include("' sinatra' is not a valid gem name because it contains whitespace.")
   end
 
@@ -31,7 +31,7 @@
       gem "rails"
     G
 
-    bundle :install, :artifice => "endpoint"
+    bundle :install, artifice: "endpoint"
     expect(out).to include("Fetching gem metadata from #{source_uri}/...")
     expect(the_bundle).to include_gems(
       "rails 2.3.2",
@@ -49,22 +49,21 @@
       gem "net-sftp"
     G
 
-    bundle :install, :artifice => "endpoint"
+    bundle :install, artifice: "endpoint"
     expect(the_bundle).to include_gems "net-sftp 1.1.1"
   end
 
   it "should use the endpoint when using deployment mode" do
     gemfile <<-G
       source "#{source_uri}"
-      gem "rack"
+      gem "myrack"
     G
-    bundle :install, :artifice => "endpoint"
+    bundle :install, artifice: "endpoint"
 
     bundle "config set --local deployment true"
-    bundle "config set --local path vendor/bundle"
-    bundle :install, :artifice => "endpoint"
+    bundle :install, artifice: "endpoint"
     expect(out).to include("Fetching gem metadata from #{source_uri}")
-    expect(the_bundle).to include_gems "rack 1.0.0"
+    expect(the_bundle).to include_gems "myrack 1.0.0"
   end
 
   it "handles git dependencies that are in rubygems" do
@@ -75,12 +74,12 @@
 
     gemfile <<-G
       source "#{source_uri}"
-      git "#{file_uri_for(lib_path("foo-1.0"))}" do
+      git "#{lib_path("foo-1.0")}" do
         gem 'foo'
       end
     G
 
-    bundle :install, :artifice => "endpoint"
+    bundle :install, artifice: "endpoint"
 
     expect(the_bundle).to include_gems("rails 2.3.2")
   end
@@ -93,13 +92,13 @@
 
     gemfile <<-G
       source "#{source_uri}"
-      gem 'foo', :git => "#{file_uri_for(lib_path("foo-1.0"))}"
+      gem 'foo', :git => "#{lib_path("foo-1.0")}"
     G
 
-    bundle :install, :artifice => "endpoint"
+    bundle :install, artifice: "endpoint"
 
     bundle "config set --local deployment true"
-    bundle :install, :artifice => "endpoint"
+    bundle :install, artifice: "endpoint"
 
     expect(the_bundle).to include_gems("rails 2.3.2")
   end
@@ -108,35 +107,35 @@
     build_git "foo"
     gemfile <<-G
       source "#{source_uri}"
-      gem 'foo', :git => "#{file_uri_for(lib_path("foo-1.0"))}"
+      gem 'foo', :git => "#{lib_path("foo-1.0")}"
     G
 
-    bundle "install", :artifice => "endpoint"
+    bundle "install", artifice: "endpoint"
     bundle "config set --local deployment true"
-    bundle :install, :artifice => "endpoint"
+    bundle :install, artifice: "endpoint"
 
     expect(the_bundle).to include_gems("foo 1.0")
   end
 
   it "falls back when the API errors out" do
-    simulate_platform x86_mswin32
-
-    build_repo2 do
-      # The rcov gem is platform mswin32, but has no arch
-      build_gem "rcov" do |s|
-        s.platform = Gem::Platform.new([nil, "mswin32", nil])
-        s.write "lib/rcov.rb", "RCOV = '1.0.0'"
+    simulate_platform "x86-mswin32" do
+      build_repo2 do
+        # The rcov gem is platform mswin32, but has no arch
+        build_gem "rcov" do |s|
+          s.platform = Gem::Platform.new([nil, "mswin32", nil])
+          s.write "lib/rcov.rb", "RCOV = '1.0.0'"
+        end
       end
-    end
 
-    gemfile <<-G
-      source "#{source_uri}"
-      gem "rcov"
-    G
+      gemfile <<-G
+        source "#{source_uri}"
+        gem "rcov"
+      G
 
-    bundle :install, :artifice => "windows", :env => { "BUNDLER_SPEC_GEM_REPO" => gem_repo2.to_s }
-    expect(out).to include("Fetching source index from #{source_uri}")
-    expect(the_bundle).to include_gems "rcov 1.0.0"
+      bundle :install, artifice: "windows", env: { "BUNDLER_SPEC_GEM_REPO" => gem_repo2.to_s }
+      expect(out).to include("Fetching source index from #{source_uri}")
+      expect(the_bundle).to include_gems "rcov 1.0.0"
+    end
   end
 
   it "falls back when hitting the Gemcutter Dependency Limit" do
@@ -147,10 +146,10 @@
       gem "actionmailer"
       gem "activeresource"
       gem "thin"
-      gem "rack"
+      gem "myrack"
       gem "rails"
     G
-    bundle :install, :artifice => "endpoint_fallback"
+    bundle :install, artifice: "endpoint_fallback"
     expect(out).to include("Fetching source index from #{source_uri}")
 
     expect(the_bundle).to include_gems(
@@ -160,7 +159,7 @@
       "activeresource 2.3.2",
       "activesupport 2.3.2",
       "thin 1.0.0",
-      "rack 1.0.0",
+      "myrack 1.0.0",
       "rails 2.3.2"
     )
   end
@@ -168,39 +167,39 @@
   it "falls back when Gemcutter API doesn't return proper Marshal format" do
     gemfile <<-G
       source "#{source_uri}"
-      gem "rack"
+      gem "myrack"
     G
 
-    bundle :install, :verbose => true, :artifice => "endpoint_marshal_fail"
+    bundle :install, verbose: true, artifice: "endpoint_marshal_fail"
     expect(out).to include("could not fetch from the dependency API, trying the full index")
-    expect(the_bundle).to include_gems "rack 1.0.0"
+    expect(the_bundle).to include_gems "myrack 1.0.0"
   end
 
   it "falls back when the API URL returns 403 Forbidden" do
     gemfile <<-G
       source "#{source_uri}"
-      gem "rack"
+      gem "myrack"
     G
 
-    bundle :install, :verbose => true, :artifice => "endpoint_api_forbidden"
+    bundle :install, verbose: true, artifice: "endpoint_api_forbidden"
     expect(out).to include("Fetching source index from #{source_uri}")
-    expect(the_bundle).to include_gems "rack 1.0.0"
+    expect(the_bundle).to include_gems "myrack 1.0.0"
   end
 
   it "handles host redirects" do
     gemfile <<-G
       source "#{source_uri}"
-      gem "rack"
+      gem "myrack"
     G
 
-    bundle :install, :artifice => "endpoint_host_redirect"
-    expect(the_bundle).to include_gems "rack 1.0.0"
+    bundle :install, artifice: "endpoint_host_redirect"
+    expect(the_bundle).to include_gems "myrack 1.0.0"
   end
 
-  it "handles host redirects without Net::HTTP::Persistent" do
+  it "handles host redirects without Gem::Net::HTTP::Persistent" do
     gemfile <<-G
       source "#{source_uri}"
-      gem "rack"
+      gem "myrack"
     G
 
     FileUtils.mkdir_p lib_path
@@ -216,18 +215,18 @@ def require(*args)
       H
     end
 
-    bundle :install, :artifice => "endpoint_host_redirect", :requires => [lib_path("disable_net_http_persistent.rb")]
+    bundle :install, artifice: "endpoint_host_redirect", requires: [lib_path("disable_net_http_persistent.rb")]
     expect(out).to_not match(/Too many redirects/)
-    expect(the_bundle).to include_gems "rack 1.0.0"
+    expect(the_bundle).to include_gems "myrack 1.0.0"
   end
 
   it "timeouts when Bundler::Fetcher redirects too much" do
     gemfile <<-G
       source "#{source_uri}"
-      gem "rack"
+      gem "myrack"
     G
 
-    bundle :install, :artifice => "endpoint_redirect", :raise_on_error => false
+    bundle :install, artifice: "endpoint_redirect", raise_on_error: false
     expect(err).to match(/Too many redirects/)
   end
 
@@ -235,32 +234,32 @@ def require(*args)
     it "should use the modern index for install" do
       gemfile <<-G
         source "#{source_uri}"
-        gem "rack"
+        gem "myrack"
       G
 
-      bundle "install --full-index", :artifice => "endpoint"
+      bundle "install --full-index", artifice: "endpoint"
       expect(out).to include("Fetching source index from #{source_uri}")
-      expect(the_bundle).to include_gems "rack 1.0.0"
+      expect(the_bundle).to include_gems "myrack 1.0.0"
     end
 
     it "should use the modern index for update" do
       gemfile <<-G
         source "#{source_uri}"
-        gem "rack"
+        gem "myrack"
       G
 
-      bundle "update --full-index", :artifice => "endpoint", :all => true
+      bundle "update --full-index", artifice: "endpoint", all: true
       expect(out).to include("Fetching source index from #{source_uri}")
-      expect(the_bundle).to include_gems "rack 1.0.0"
+      expect(the_bundle).to include_gems "myrack 1.0.0"
     end
   end
 
-  it "fetches again when more dependencies are found in subsequent sources", :bundler => "< 3" do
+  it "fetches again when more dependencies are found in subsequent sources" do
     build_repo2 do
       build_gem "back_deps" do |s|
         s.add_dependency "foo"
       end
-      FileUtils.rm_rf Dir[gem_repo2("gems/foo-*.gem")]
+      FileUtils.rm_r Dir[gem_repo2("gems/foo-*.gem")]
     end
 
     gemfile <<-G
@@ -269,7 +268,7 @@ def require(*args)
       gem "back_deps"
     G
 
-    bundle :install, :artifice => "endpoint_extra"
+    bundle :install, artifice: "endpoint_extra"
     expect(the_bundle).to include_gems "back_deps 1.0", "foo 1.0"
   end
 
@@ -278,7 +277,7 @@ def require(*args)
       build_gem "back_deps" do |s|
         s.add_dependency "foo"
       end
-      FileUtils.rm_rf Dir[gem_repo2("gems/foo-*.gem")]
+      FileUtils.rm_r Dir[gem_repo2("gems/foo-*.gem")]
     end
 
     gemfile <<-G
@@ -288,33 +287,33 @@ def require(*args)
       end
     G
 
-    bundle :install, :artifice => "endpoint_extra"
+    bundle :install, artifice: "endpoint_extra"
     expect(the_bundle).to include_gems "back_deps 1.0", "foo 1.0"
   end
 
   it "fetches gem versions even when those gems are already installed" do
     gemfile <<-G
       source "#{source_uri}"
-      gem "rack", "1.0.0"
+      gem "myrack", "1.0.0"
     G
-    bundle :install, :artifice => "endpoint_extra_api"
+    bundle :install, artifice: "endpoint_extra_api"
 
     build_repo4 do
-      build_gem "rack", "1.2" do |s|
-        s.executables = "rackup"
+      build_gem "myrack", "1.2" do |s|
+        s.executables = "myrackup"
       end
     end
 
     gemfile <<-G
       source "#{source_uri}" do; end
       source "#{source_uri}/extra"
-      gem "rack", "1.2"
+      gem "myrack", "1.2"
     G
-    bundle :install, :artifice => "endpoint_extra_api"
-    expect(the_bundle).to include_gems "rack 1.2"
+    bundle :install, artifice: "endpoint_extra_api"
+    expect(the_bundle).to include_gems "myrack 1.2"
   end
 
-  it "considers all possible versions of dependencies from all api gem sources", :bundler => "< 3" do
+  it "considers all possible versions of dependencies from all api gem sources" do
     # In this scenario, the gem "somegem" only exists in repo4.  It depends on specific version of activesupport that
     # exists only in repo1.  There happens also be a version of activesupport in repo4, but not the one that version 1.0.0
     # of somegem wants. This test makes sure that bundler actually finds version 1.2.3 of active support in the other
@@ -332,7 +331,7 @@ def require(*args)
       gem 'somegem', '1.0.0'
     G
 
-    bundle :install, :artifice => "endpoint_extra_api"
+    bundle :install, artifice: "endpoint_extra_api"
 
     expect(the_bundle).to include_gems "somegem 1.0.0"
     expect(the_bundle).to include_gems "activesupport 1.2.3"
@@ -343,7 +342,7 @@ def require(*args)
       build_gem "back_deps" do |s|
         s.add_dependency "foo"
       end
-      FileUtils.rm_rf Dir[gem_repo2("gems/foo-*.gem")]
+      FileUtils.rm_r Dir[gem_repo2("gems/foo-*.gem")]
     end
 
     gemfile <<-G
@@ -353,23 +352,23 @@ def require(*args)
       end
     G
 
-    bundle :install, :artifice => "endpoint_extra"
+    bundle :install, artifice: "endpoint_extra"
 
     expect(out).to include("Fetching gem metadata from http://localgemserver.test/.")
     expect(out).to include("Fetching source index from http://localgemserver.test/extra")
   end
 
-  it "does not fetch every spec when doing back deps", :bundler => "< 3" do
+  it "does not fetch every spec when doing back deps" do
     build_repo2 do
       build_gem "back_deps" do |s|
         s.add_dependency "foo"
       end
       build_gem "missing"
 
-      FileUtils.rm_rf Dir[gem_repo2("gems/foo-*.gem")]
+      FileUtils.rm_r Dir[gem_repo2("gems/foo-*.gem")]
     end
 
-    install_gemfile <<-G, :artifice => "endpoint_extra_missing", :env => env_for_missing_prerelease_default_gem_activation
+    install_gemfile <<-G, artifice: "endpoint_extra_missing"
       source "#{source_uri}"
       source "#{source_uri}/extra"
       gem "back_deps"
@@ -385,10 +384,10 @@ def require(*args)
       end
       build_gem "missing"
 
-      FileUtils.rm_rf Dir[gem_repo2("gems/foo-*.gem")]
+      FileUtils.rm_r Dir[gem_repo2("gems/foo-*.gem")]
     end
 
-    install_gemfile <<-G, :artifice => "endpoint_extra_missing", :env => env_for_missing_prerelease_default_gem_activation
+    install_gemfile <<-G, artifice: "endpoint_extra_missing"
       source "#{source_uri}"
       source "#{source_uri}/extra" do
         gem "back_deps"
@@ -398,12 +397,12 @@ def require(*args)
     expect(the_bundle).to include_gems "back_deps 1.0"
   end
 
-  it "fetches again when more dependencies are found in subsequent sources using deployment mode", :bundler => "< 3" do
+  it "fetches again when more dependencies are found in subsequent sources using deployment mode" do
     build_repo2 do
       build_gem "back_deps" do |s|
         s.add_dependency "foo"
       end
-      FileUtils.rm_rf Dir[gem_repo2("gems/foo-*.gem")]
+      FileUtils.rm_r Dir[gem_repo2("gems/foo-*.gem")]
     end
 
     gemfile <<-G
@@ -412,9 +411,9 @@ def require(*args)
       gem "back_deps"
     G
 
-    bundle :install, :artifice => "endpoint_extra"
+    bundle :install, artifice: "endpoint_extra"
     bundle "config set --local deployment true"
-    bundle :install, :artifice => "endpoint_extra"
+    bundle :install, artifice: "endpoint_extra"
     expect(the_bundle).to include_gems "back_deps 1.0"
   end
 
@@ -423,7 +422,7 @@ def require(*args)
       build_gem "back_deps" do |s|
         s.add_dependency "foo"
       end
-      FileUtils.rm_rf Dir[gem_repo2("gems/foo-*.gem")]
+      FileUtils.rm_r Dir[gem_repo2("gems/foo-*.gem")]
     end
 
     gemfile <<-G
@@ -433,9 +432,9 @@ def require(*args)
       end
     G
 
-    bundle :install, :artifice => "endpoint_extra"
+    bundle :install, artifice: "endpoint_extra"
     bundle "config set --local deployment true"
-    bundle "install", :artifice => "endpoint_extra"
+    bundle "install", artifice: "endpoint_extra"
     expect(the_bundle).to include_gems "back_deps 1.0"
   end
 
@@ -445,7 +444,7 @@ def require(*args)
       build_gem "foo", "2.0"
     end
 
-    install_gemfile <<-G, :artifice => "endpoint", :env => { "BUNDLER_SPEC_GEM_REPO" => gem_repo2.to_s }, :verbose => true
+    install_gemfile <<-G, artifice: "endpoint", env: { "BUNDLER_SPEC_GEM_REPO" => gem_repo2.to_s }, verbose: true
       source "#{source_uri}"
 
       gem "foo"
@@ -468,70 +467,70 @@ def require(*args)
       gem "bundler_dep"
     G
 
-    bundle :install, :artifice => "endpoint", :env => { "BUNDLER_SPEC_GEM_REPO" => gem_repo2.to_s }
+    bundle :install, artifice: "endpoint", env: { "BUNDLER_SPEC_GEM_REPO" => gem_repo2.to_s }
     expect(out).to include("Fetching gem metadata from #{source_uri}")
   end
 
-  it "installs the binstubs", :bundler => "< 3" do
+  it "installs the binstubs" do
     gemfile <<-G
       source "#{source_uri}"
-      gem "rack"
+      gem "myrack"
     G
 
-    bundle "install --binstubs", :artifice => "endpoint"
+    bundle "install --binstubs", artifice: "endpoint"
 
-    gembin "rackup"
+    gembin "myrackup"
     expect(out).to eq("1.0.0")
   end
 
-  it "installs the bins when using --path and uses autoclean", :bundler => "< 3" do
+  it "installs the bins when using --path and uses autoclean" do
     gemfile <<-G
       source "#{source_uri}"
-      gem "rack"
+      gem "myrack"
     G
 
-    bundle "install --path vendor/bundle", :artifice => "endpoint"
+    bundle "install --path vendor/bundle", artifice: "endpoint"
 
-    expect(vendored_gems("bin/rackup")).to exist
+    expect(vendored_gems("bin/myrackup")).to exist
   end
 
-  it "installs the bins when using --path and uses bundle clean", :bundler => "< 3" do
+  it "installs the bins when using --path and uses bundle clean" do
     gemfile <<-G
       source "#{source_uri}"
-      gem "rack"
+      gem "myrack"
     G
 
-    bundle "install --path vendor/bundle --no-clean", :artifice => "endpoint"
+    bundle "install --path vendor/bundle --no-clean", artifice: "endpoint"
 
-    expect(vendored_gems("bin/rackup")).to exist
+    expect(vendored_gems("bin/myrackup")).to exist
   end
 
   it "prints post_install_messages" do
     gemfile <<-G
       source "#{source_uri}"
-      gem 'rack-obama'
+      gem 'myrack-obama'
     G
 
-    bundle :install, :artifice => "endpoint"
-    expect(out).to include("Post-install message from rack:")
+    bundle :install, artifice: "endpoint"
+    expect(out).to include("Post-install message from myrack:")
   end
 
   it "should display the post install message for a dependency" do
     gemfile <<-G
       source "#{source_uri}"
-      gem 'rack_middleware'
+      gem 'myrack_middleware'
     G
 
-    bundle :install, :artifice => "endpoint"
-    expect(out).to include("Post-install message from rack:")
-    expect(out).to include("Rack's post install message")
+    bundle :install, artifice: "endpoint"
+    expect(out).to include("Post-install message from myrack:")
+    expect(out).to include("Myrack's post install message")
   end
 
   context "when using basic authentication" do
     let(:user)     { "user" }
     let(:password) { "pass" }
     let(:basic_auth_source_uri) do
-      uri          = Bundler::URI.parse(source_uri)
+      uri          = Gem::URI.parse(source_uri)
       uri.user     = user
       uri.password = password
 
@@ -541,82 +540,82 @@ def require(*args)
     it "passes basic authentication details and strips out creds" do
       gemfile <<-G
         source "#{basic_auth_source_uri}"
-        gem "rack"
+        gem "myrack"
       G
 
-      bundle :install, :artifice => "endpoint_basic_authentication"
+      bundle :install, artifice: "endpoint_basic_authentication"
       expect(out).not_to include("#{user}:#{password}")
-      expect(the_bundle).to include_gems "rack 1.0.0"
+      expect(the_bundle).to include_gems "myrack 1.0.0"
     end
 
     it "passes basic authentication details and strips out creds also in verbose mode" do
       gemfile <<-G
         source "#{basic_auth_source_uri}"
-        gem "rack"
+        gem "myrack"
       G
 
-      bundle :install, :verbose => true, :artifice => "endpoint_basic_authentication"
+      bundle :install, verbose: true, artifice: "endpoint_basic_authentication"
       expect(out).not_to include("#{user}:#{password}")
-      expect(the_bundle).to include_gems "rack 1.0.0"
+      expect(the_bundle).to include_gems "myrack 1.0.0"
     end
 
     it "strips http basic authentication creds for modern index" do
       gemfile <<-G
         source "#{basic_auth_source_uri}"
-        gem "rack"
+        gem "myrack"
       G
 
-      bundle :install, :artifice => "endpoint_marshal_fail_basic_authentication"
+      bundle :install, artifice: "endpoint_marshal_fail_basic_authentication"
       expect(out).not_to include("#{user}:#{password}")
-      expect(the_bundle).to include_gems "rack 1.0.0"
+      expect(the_bundle).to include_gems "myrack 1.0.0"
     end
 
     it "strips http basic auth creds when it can't reach the server" do
       gemfile <<-G
         source "#{basic_auth_source_uri}"
-        gem "rack"
+        gem "myrack"
       G
 
-      bundle :install, :artifice => "endpoint_500", :raise_on_error => false
+      bundle :install, artifice: "endpoint_500", raise_on_error: false
       expect(out).not_to include("#{user}:#{password}")
     end
 
-    it "strips http basic auth creds when warning about ambiguous sources", :bundler => "< 3" do
+    it "strips http basic auth creds when warning about ambiguous sources" do
       gemfile <<-G
         source "#{basic_auth_source_uri}"
         source "#{file_uri_for(gem_repo1)}"
-        gem "rack"
+        gem "myrack"
       G
 
-      bundle :install, :artifice => "endpoint_basic_authentication"
-      expect(err).to include("Warning: the gem 'rack' was found in multiple sources.")
+      bundle :install, artifice: "endpoint_basic_authentication"
+      expect(err).to include("Warning: the gem 'myrack' was found in multiple sources.")
       expect(err).not_to include("#{user}:#{password}")
-      expect(the_bundle).to include_gems "rack 1.0.0"
+      expect(the_bundle).to include_gems "myrack 1.0.0"
     end
 
     it "does not pass the user / password to different hosts on redirect" do
       gemfile <<-G
         source "#{basic_auth_source_uri}"
-        gem "rack"
+        gem "myrack"
       G
 
-      bundle :install, :artifice => "endpoint_creds_diff_host"
-      expect(the_bundle).to include_gems "rack 1.0.0"
+      bundle :install, artifice: "endpoint_creds_diff_host"
+      expect(the_bundle).to include_gems "myrack 1.0.0"
     end
 
     describe "with host including dashes" do
       before do
         gemfile <<-G
           source "http://local-gemserver.test"
-          gem "rack"
+          gem "myrack"
         G
       end
 
       it "reads authentication details from a valid ENV variable" do
-        bundle :install, :artifice => "endpoint_strict_basic_authentication", :env => { "BUNDLE_LOCAL___GEMSERVER__TEST" => "#{user}:#{password}" }
+        bundle :install, artifice: "endpoint_strict_basic_authentication", env: { "BUNDLE_LOCAL___GEMSERVER__TEST" => "#{user}:#{password}" }
 
         expect(out).to include("Fetching gem metadata from http://local-gemserver.test")
-        expect(the_bundle).to include_gems "rack 1.0.0"
+        expect(the_bundle).to include_gems "myrack 1.0.0"
       end
     end
 
@@ -624,57 +623,57 @@ def require(*args)
       before do
         gemfile <<-G
           source "#{source_uri}"
-          gem "rack"
+          gem "myrack"
         G
       end
 
       it "reads authentication details by host name from bundle config" do
         bundle "config set #{source_hostname} #{user}:#{password}"
 
-        bundle :install, :artifice => "endpoint_strict_basic_authentication"
+        bundle :install, artifice: "endpoint_strict_basic_authentication"
 
         expect(out).to include("Fetching gem metadata from #{source_uri}")
-        expect(the_bundle).to include_gems "rack 1.0.0"
+        expect(the_bundle).to include_gems "myrack 1.0.0"
       end
 
       it "reads authentication details by full url from bundle config" do
         # The trailing slash is necessary here; Fetcher canonicalizes the URI.
         bundle "config set #{source_uri}/ #{user}:#{password}"
 
-        bundle :install, :artifice => "endpoint_strict_basic_authentication"
+        bundle :install, artifice: "endpoint_strict_basic_authentication"
 
         expect(out).to include("Fetching gem metadata from #{source_uri}")
-        expect(the_bundle).to include_gems "rack 1.0.0"
+        expect(the_bundle).to include_gems "myrack 1.0.0"
       end
 
       it "should use the API" do
         bundle "config set #{source_hostname} #{user}:#{password}"
-        bundle :install, :artifice => "endpoint_strict_basic_authentication"
+        bundle :install, artifice: "endpoint_strict_basic_authentication"
         expect(out).to include("Fetching gem metadata from #{source_uri}")
-        expect(the_bundle).to include_gems "rack 1.0.0"
+        expect(the_bundle).to include_gems "myrack 1.0.0"
       end
 
       it "prefers auth supplied in the source uri" do
         gemfile <<-G
           source "#{basic_auth_source_uri}"
-          gem "rack"
+          gem "myrack"
         G
 
         bundle "config set #{source_hostname} otheruser:wrong"
 
-        bundle :install, :artifice => "endpoint_strict_basic_authentication"
-        expect(the_bundle).to include_gems "rack 1.0.0"
+        bundle :install, artifice: "endpoint_strict_basic_authentication"
+        expect(the_bundle).to include_gems "myrack 1.0.0"
       end
 
       it "shows instructions if auth is not provided for the source" do
-        bundle :install, :artifice => "endpoint_strict_basic_authentication", :raise_on_error => false
+        bundle :install, artifice: "endpoint_strict_basic_authentication", raise_on_error: false
         expect(err).to include("bundle config set --global #{source_hostname} username:password")
       end
 
       it "fails if authentication has already been provided, but failed" do
         bundle "config set #{source_hostname} #{user}:wrong"
 
-        bundle :install, :artifice => "endpoint_strict_basic_authentication", :raise_on_error => false
+        bundle :install, artifice: "endpoint_strict_basic_authentication", raise_on_error: false
         expect(err).to include("Bad username or password")
       end
     end
@@ -685,11 +684,11 @@ def require(*args)
       it "passes basic authentication details" do
         gemfile <<-G
           source "#{basic_auth_source_uri}"
-          gem "rack"
+          gem "myrack"
         G
 
-        bundle :install, :artifice => "endpoint_basic_authentication"
-        expect(the_bundle).to include_gems "rack 1.0.0"
+        bundle :install, artifice: "endpoint_basic_authentication"
+        expect(the_bundle).to include_gems "myrack 1.0.0"
       end
     end
   end
@@ -707,14 +706,14 @@ def require(*args)
       end
     end
 
-    it "explains what to do to get it" do
+    it "explains what to do to get it, and includes original error" do
       gemfile <<-G
         source "#{source_uri.gsub(/http/, "https")}"
-        gem "rack"
+        gem "myrack"
       G
 
-      bundle :install, :env => { "RUBYOPT" => opt_add("-I#{bundled_app("broken_ssl")}", ENV["RUBYOPT"]) }, :raise_on_error => false
-      expect(err).to include("OpenSSL")
+      bundle :install, artifice: "fail", env: { "RUBYOPT" => "-I#{bundled_app("broken_ssl")}" }, raise_on_error: false
+      expect(err).to include("recompile Ruby").and include("cannot load such file")
     end
   end
 
@@ -723,17 +722,17 @@ def require(*args)
       # Install a monkeypatch that reproduces the effects of openssl raising
       # a certificate validation error when RubyGems tries to connect.
       gemfile <<-G
-        class Net::HTTP
+        class Gem::Net::HTTP
           def start
             raise OpenSSL::SSL::SSLError, "certificate verify failed"
           end
         end
 
         source "#{source_uri.gsub(/http/, "https")}"
-        gem "rack"
+        gem "myrack"
       G
 
-      bundle :install, :raise_on_error => false
+      bundle :install, raise_on_error: false
       expect(err).to match(/could not verify the SSL certificate/i)
     end
   end
@@ -741,16 +740,16 @@ def start
   context ".gemrc with sources is present" do
     it "uses other sources declared in the Gemfile" do
       File.open(home(".gemrc"), "w") do |file|
-        file.puts({ :sources => ["https://rubygems.org"] }.to_yaml)
+        file.puts({ sources: ["https://rubygems.org"] }.to_yaml)
       end
 
       begin
         gemfile <<-G
           source "#{source_uri}"
-          gem 'rack'
+          gem 'myrack'
         G
 
-        bundle "install", :artifice => "endpoint_marshal_fail"
+        bundle "install", artifice: "endpoint_marshal_fail"
       ensure
         home(".gemrc").rmtree
       end
diff --git a/spec/bundler/install/gems/env_spec.rb b/spec/bundler/install/gems/env_spec.rb
index a6dfadcfc80d7e..6d5aa456fe9ea4 100644
--- a/spec/bundler/install/gems/env_spec.rb
+++ b/spec/bundler/install/gems/env_spec.rb
@@ -4,104 +4,104 @@
   describe "when just setting an ENV key as a string" do
     before :each do
       gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
+        source "https://gem.repo1"
 
         env "BUNDLER_TEST" do
-          gem "rack"
+          gem "myrack"
         end
       G
     end
 
     it "excludes the gems when the ENV variable is not set" do
       bundle :install
-      expect(the_bundle).not_to include_gems "rack"
+      expect(the_bundle).not_to include_gems "myrack"
     end
 
     it "includes the gems when the ENV variable is set" do
       ENV["BUNDLER_TEST"] = "1"
       bundle :install
-      expect(the_bundle).to include_gems "rack 1.0"
+      expect(the_bundle).to include_gems "myrack 1.0"
     end
   end
 
   describe "when just setting an ENV key as a symbol" do
     before :each do
       gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
+        source "https://gem.repo1"
 
         env :BUNDLER_TEST do
-          gem "rack"
+          gem "myrack"
         end
       G
     end
 
     it "excludes the gems when the ENV variable is not set" do
       bundle :install
-      expect(the_bundle).not_to include_gems "rack"
+      expect(the_bundle).not_to include_gems "myrack"
     end
 
     it "includes the gems when the ENV variable is set" do
       ENV["BUNDLER_TEST"] = "1"
       bundle :install
-      expect(the_bundle).to include_gems "rack 1.0"
+      expect(the_bundle).to include_gems "myrack 1.0"
     end
   end
 
   describe "when setting a string to match the env" do
     before :each do
       gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
+        source "https://gem.repo1"
 
         env "BUNDLER_TEST" => "foo" do
-          gem "rack"
+          gem "myrack"
         end
       G
     end
 
     it "excludes the gems when the ENV variable is not set" do
       bundle :install
-      expect(the_bundle).not_to include_gems "rack"
+      expect(the_bundle).not_to include_gems "myrack"
     end
 
     it "excludes the gems when the ENV variable is set but does not match the condition" do
       ENV["BUNDLER_TEST"] = "1"
       bundle :install
-      expect(the_bundle).not_to include_gems "rack"
+      expect(the_bundle).not_to include_gems "myrack"
     end
 
     it "includes the gems when the ENV variable is set and matches the condition" do
       ENV["BUNDLER_TEST"] = "foo"
       bundle :install
-      expect(the_bundle).to include_gems "rack 1.0"
+      expect(the_bundle).to include_gems "myrack 1.0"
     end
   end
 
   describe "when setting a regex to match the env" do
     before :each do
       gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
+        source "https://gem.repo1"
 
         env "BUNDLER_TEST" => /foo/ do
-          gem "rack"
+          gem "myrack"
         end
       G
     end
 
     it "excludes the gems when the ENV variable is not set" do
       bundle :install
-      expect(the_bundle).not_to include_gems "rack"
+      expect(the_bundle).not_to include_gems "myrack"
     end
 
     it "excludes the gems when the ENV variable is set but does not match the condition" do
       ENV["BUNDLER_TEST"] = "fo"
       bundle :install
-      expect(the_bundle).not_to include_gems "rack"
+      expect(the_bundle).not_to include_gems "myrack"
     end
 
     it "includes the gems when the ENV variable is set and matches the condition" do
       ENV["BUNDLER_TEST"] = "foobar"
       bundle :install
-      expect(the_bundle).to include_gems "rack 1.0"
+      expect(the_bundle).to include_gems "myrack 1.0"
     end
   end
 end
diff --git a/spec/bundler/install/gems/flex_spec.rb b/spec/bundler/install/gems/flex_spec.rb
index ddb9480343de46..522ee6b779c462 100644
--- a/spec/bundler/install/gems/flex_spec.rb
+++ b/spec/bundler/install/gems/flex_spec.rb
@@ -3,30 +3,30 @@
 RSpec.describe "bundle flex_install" do
   it "installs the gems as expected" do
     install_gemfile <<-G
-      source "#{file_uri_for(gem_repo1)}"
-      gem 'rack'
+      source "https://gem.repo1"
+      gem 'myrack'
     G
 
-    expect(the_bundle).to include_gems "rack 1.0.0"
+    expect(the_bundle).to include_gems "myrack 1.0.0"
     expect(the_bundle).to be_locked
   end
 
   it "installs even when the lockfile is invalid" do
     install_gemfile <<-G
-      source "#{file_uri_for(gem_repo1)}"
-      gem 'rack'
+      source "https://gem.repo1"
+      gem 'myrack'
     G
 
-    expect(the_bundle).to include_gems "rack 1.0.0"
+    expect(the_bundle).to include_gems "myrack 1.0.0"
     expect(the_bundle).to be_locked
 
     gemfile <<-G
-      source "#{file_uri_for(gem_repo1)}"
-      gem 'rack', '1.0'
+      source "https://gem.repo1"
+      gem 'myrack', '1.0'
     G
 
     bundle :install
-    expect(the_bundle).to include_gems "rack 1.0.0"
+    expect(the_bundle).to include_gems "myrack 1.0.0"
     expect(the_bundle).to be_locked
   end
 
@@ -34,19 +34,19 @@
     build_repo2
 
     install_gemfile <<-G
-      source "#{file_uri_for(gem_repo2)}"
-      gem "rack-obama"
+      source "https://gem.repo2"
+      gem "myrack-obama"
     G
 
-    expect(the_bundle).to include_gems "rack 1.0.0", "rack-obama 1.0.0"
+    expect(the_bundle).to include_gems "myrack 1.0.0", "myrack-obama 1.0.0"
 
     update_repo2
     install_gemfile <<-G
-      source "#{file_uri_for(gem_repo2)}"
-      gem "rack-obama", "1.0"
+      source "https://gem.repo2"
+      gem "myrack-obama", "1.0"
     G
 
-    expect(the_bundle).to include_gems "rack 1.0.0", "rack-obama 1.0.0"
+    expect(the_bundle).to include_gems "myrack 1.0.0", "myrack-obama 1.0.0"
   end
 
   describe "adding new gems" do
@@ -54,38 +54,38 @@
       build_repo2
 
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo2)}"
-        gem 'rack'
+        source "https://gem.repo2"
+        gem 'myrack'
       G
 
       update_repo2
 
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo2)}"
-        gem 'rack'
+        source "https://gem.repo2"
+        gem 'myrack'
         gem 'activesupport', '2.3.5'
       G
 
-      expect(the_bundle).to include_gems "rack 1.0.0", "activesupport 2.3.5"
+      expect(the_bundle).to include_gems "myrack 1.0.0", "activesupport 2.3.5"
     end
 
     it "keeps child dependencies pinned" do
       build_repo2
 
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo2)}"
-        gem "rack-obama"
+        source "https://gem.repo2"
+        gem "myrack-obama"
       G
 
       update_repo2
 
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo2)}"
-        gem "rack-obama"
+        source "https://gem.repo2"
+        gem "myrack-obama"
         gem "thin"
       G
 
-      expect(the_bundle).to include_gems "rack 1.0.0", "rack-obama 1.0", "thin 1.0"
+      expect(the_bundle).to include_gems "myrack 1.0.0", "myrack-obama 1.0", "thin 1.0"
     end
   end
 
@@ -93,43 +93,43 @@
     it "removes gems without changing the versions of remaining gems" do
       build_repo2
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo2)}"
-        gem 'rack'
+        source "https://gem.repo2"
+        gem 'myrack'
         gem 'activesupport', '2.3.5'
       G
 
       update_repo2
 
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo2)}"
-        gem 'rack'
+        source "https://gem.repo2"
+        gem 'myrack'
       G
 
-      expect(the_bundle).to include_gems "rack 1.0.0"
+      expect(the_bundle).to include_gems "myrack 1.0.0"
       expect(the_bundle).not_to include_gems "activesupport 2.3.5"
 
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo2)}"
-        gem 'rack'
+        source "https://gem.repo2"
+        gem 'myrack'
         gem 'activesupport', '2.3.2'
       G
 
-      expect(the_bundle).to include_gems "rack 1.0.0", "activesupport 2.3.2"
+      expect(the_bundle).to include_gems "myrack 1.0.0", "activesupport 2.3.2"
     end
 
     it "removes top level dependencies when removed from the Gemfile while leaving other dependencies intact" do
       build_repo2
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo2)}"
-        gem 'rack'
+        source "https://gem.repo2"
+        gem 'myrack'
         gem 'activesupport', '2.3.5'
       G
 
       update_repo2
 
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo2)}"
-        gem 'rack'
+        source "https://gem.repo2"
+        gem 'myrack'
       G
 
       expect(the_bundle).not_to include_gems "activesupport 2.3.5"
@@ -138,21 +138,21 @@
     it "removes child dependencies" do
       build_repo2
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo2)}"
-        gem 'rack-obama'
+        source "https://gem.repo2"
+        gem 'myrack-obama'
         gem 'activesupport'
       G
 
-      expect(the_bundle).to include_gems "rack 1.0.0", "rack-obama 1.0.0", "activesupport 2.3.5"
+      expect(the_bundle).to include_gems "myrack 1.0.0", "myrack-obama 1.0.0", "activesupport 2.3.5"
 
       update_repo2
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo2)}"
+        source "https://gem.repo2"
         gem 'activesupport'
       G
 
       expect(the_bundle).to include_gems "activesupport 2.3.5"
-      expect(the_bundle).not_to include_gems "rack-obama", "rack"
+      expect(the_bundle).not_to include_gems "myrack-obama", "myrack"
     end
   end
 
@@ -160,34 +160,34 @@
     before(:each) do
       build_repo2
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo2)}"
-        gem "rack_middleware"
+        source "https://gem.repo2"
+        gem "myrack_middleware"
       G
 
-      expect(the_bundle).to include_gems "rack_middleware 1.0", "rack 0.9.1"
+      expect(the_bundle).to include_gems "myrack_middleware 1.0", "myrack 0.9.1"
 
       build_repo2 do
-        build_gem "rack-obama", "2.0" do |s|
-          s.add_dependency "rack", "=1.2"
+        build_gem "myrack-obama", "2.0" do |s|
+          s.add_dependency "myrack", "=1.2"
         end
-        build_gem "rack_middleware", "2.0" do |s|
-          s.add_dependency "rack", ">=1.0"
+        build_gem "myrack_middleware", "2.0" do |s|
+          s.add_dependency "myrack", ">=1.0"
         end
       end
 
       gemfile <<-G
-        source "#{file_uri_for(gem_repo2)}"
-        gem "rack-obama", "2.0"
-        gem "rack_middleware"
+        source "https://gem.repo2"
+        gem "myrack-obama", "2.0"
+        gem "myrack_middleware"
       G
     end
 
     it "does not install gems whose dependencies are not met" do
-      bundle :install, :raise_on_error => false
-      ruby <<-RUBY, :raise_on_error => false
+      bundle :install, raise_on_error: false
+      ruby <<-RUBY, raise_on_error: false
         require 'bundler/setup'
       RUBY
-      expect(err).to match(/could not find gem 'rack-obama/i)
+      expect(err).to match(/could not find gem 'myrack-obama/i)
     end
 
     it "discards the locked gems when the Gemfile requires different versions than the lock" do
@@ -196,14 +196,14 @@
       nice_error = <<~E.strip
         Could not find compatible versions
 
-        Because rack-obama >= 2.0 depends on rack = 1.2
-          and rack = 1.2 could not be found in rubygems repository #{file_uri_for(gem_repo2)}/ or installed locally,
-          rack-obama >= 2.0 cannot be used.
-        So, because Gemfile depends on rack-obama = 2.0,
+        Because myrack-obama >= 2.0 depends on myrack = 1.2
+          and myrack = 1.2 could not be found in rubygems repository https://gem.repo2/ or installed locally,
+          myrack-obama >= 2.0 cannot be used.
+        So, because Gemfile depends on myrack-obama = 2.0,
           version solving has failed.
       E
 
-      bundle :install, :retry => 0, :raise_on_error => false
+      bundle :install, retry: 0, raise_on_error: false
       expect(err).to end_with(nice_error)
     end
 
@@ -211,12 +211,12 @@
       bundle "config set force_ruby_platform true"
 
       bad_error = <<~E.strip
-        Bundler could not find compatible versions for gem "rack-obama":
+        Bundler could not find compatible versions for gem "myrack-obama":
           In Gemfile:
-            rack-obama (= 2.0)
+            myrack-obama (= 2.0)
       E
 
-      bundle "update rack_middleware", :retry => 0, :raise_on_error => false
+      bundle "update myrack_middleware", retry: 0, raise_on_error: false
       expect(err).not_to end_with(bad_error)
     end
   end
@@ -233,19 +233,19 @@
       end
 
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo4)}"
+        source "https://gem.repo4"
         gem "jekyll-feed", "~> 0.12"
       G
 
       gemfile <<-G
-        source "#{file_uri_for(gem_repo4)}"
+        source "https://gem.repo4"
         gem "github-pages", "~> 226"
         gem "jekyll-feed", "~> 0.12"
       G
     end
 
     it "discards the conflicting lockfile information and resolves properly" do
-      bundle :update, :raise_on_error => false, :all => true
+      bundle :update, raise_on_error: false, all: true
       expect(err).to be_empty
     end
   end
@@ -253,43 +253,72 @@
   describe "subtler cases" do
     before :each do
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
-        gem "rack"
-        gem "rack-obama"
+        source "https://gem.repo1"
+        gem "myrack"
+        gem "myrack-obama"
       G
 
       gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
-        gem "rack", "0.9.1"
-        gem "rack-obama"
+        source "https://gem.repo1"
+        gem "myrack", "0.9.1"
+        gem "myrack-obama"
       G
     end
 
     it "should work when you install" do
       bundle "install"
 
+      checksums = checksums_section_when_enabled do |c|
+        c.checksum gem_repo1, "myrack", "0.9.1"
+        c.checksum gem_repo1, "myrack-obama", "1.0"
+      end
+
       expect(lockfile).to eq <<~L
         GEM
-          remote: #{file_uri_for(gem_repo1)}/
+          remote: https://gem.repo1/
           specs:
-            rack (0.9.1)
-            rack-obama (1.0)
-              rack
+            myrack (0.9.1)
+            myrack-obama (1.0)
+              myrack
 
         PLATFORMS
           #{lockfile_platforms}
 
         DEPENDENCIES
-          rack (= 0.9.1)
-          rack-obama
-
+          myrack (= 0.9.1)
+          myrack-obama
+        #{checksums}
         BUNDLED WITH
            #{Bundler::VERSION}
       L
     end
 
     it "should work when you update" do
-      bundle "update rack"
+      bundle "update myrack"
+
+      checksums = checksums_section_when_enabled do |c|
+        c.checksum gem_repo1, "myrack", "0.9.1"
+        c.checksum gem_repo1, "myrack-obama", "1.0"
+      end
+
+      expect(lockfile).to eq <<~L
+        GEM
+          remote: https://gem.repo1/
+          specs:
+            myrack (0.9.1)
+            myrack-obama (1.0)
+              myrack
+
+        PLATFORMS
+          #{lockfile_platforms}
+
+        DEPENDENCIES
+          myrack (= 0.9.1)
+          myrack-obama
+        #{checksums}
+        BUNDLED WITH
+           #{Bundler::VERSION}
+      L
     end
   end
 
@@ -297,33 +326,37 @@
     it "updates the lockfile" do
       build_repo2
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
-        gem "rack"
+        source "https://gem.repo1"
+        gem "myrack"
       G
 
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
-        source "#{file_uri_for(gem_repo2)}" do
+        source "https://gem.repo1"
+        source "https://gem.repo2" do
         end
-        gem "rack"
+        gem "myrack"
       G
 
+      checksums = checksums_section_when_enabled do |c|
+        c.checksum gem_repo1, "myrack", "1.0.0"
+      end
+
       expect(lockfile).to eq <<~L
         GEM
-          remote: #{file_uri_for(gem_repo1)}/
+          remote: https://gem.repo1/
           specs:
-            rack (1.0.0)
+            myrack (1.0.0)
 
         GEM
-          remote: #{file_uri_for(gem_repo2)}/
+          remote: https://gem.repo2/
           specs:
 
         PLATFORMS
           #{lockfile_platforms}
 
         DEPENDENCIES
-          rack
-
+          myrack
+        #{checksums}
         BUNDLED WITH
            #{Bundler::VERSION}
       L
@@ -335,17 +368,17 @@
     before(:each) do
       build_repo2 do
         build_gem "capybara", "0.3.9" do |s|
-          s.add_dependency "rack", ">= 1.0.0"
+          s.add_dependency "myrack", ">= 1.0.0"
         end
 
-        build_gem "rack", "1.1.0"
+        build_gem "myrack", "1.1.0"
         build_gem "rails", "3.0.0.rc4" do |s|
-          s.add_dependency "rack", "~> 1.1.0"
+          s.add_dependency "myrack", "~> 1.1.0"
         end
 
-        build_gem "rack", "1.2.1"
+        build_gem "myrack", "1.2.1"
         build_gem "rails", "3.0.0" do |s|
-          s.add_dependency "rack", "~> 1.2.1"
+          s.add_dependency "myrack", "~> 1.2.1"
         end
       end
     end
@@ -353,14 +386,14 @@
     it "resolves them" do
       # install Rails 3.0.0.rc
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo2)}"
+        source "https://gem.repo2"
         gem "rails", "3.0.0.rc4"
         gem "capybara", "0.3.9"
       G
 
       # upgrade Rails to 3.0.0 and then install again
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo2)}"
+        source "https://gem.repo2"
         gem "rails", "3.0.0"
         gem "capybara", "0.3.9"
       G
diff --git a/spec/bundler/install/gems/fund_spec.rb b/spec/bundler/install/gems/fund_spec.rb
index 9aadc9ed250e16..0855a62b86c7d2 100644
--- a/spec/bundler/install/gems/fund_spec.rb
+++ b/spec/bundler/install/gems/fund_spec.rb
@@ -32,10 +32,10 @@
     context "when gems include a fund URI" do
       it "displays the plural fund message after installing" do
         install_gemfile <<-G
-          source "#{file_uri_for(gem_repo2)}"
+          source "https://gem.repo2"
           gem 'has_funding_and_other_metadata'
           gem 'has_funding'
-          gem 'rack-obama'
+          gem 'myrack-obama'
         G
 
         expect(out).to include("2 installed gems you directly depend on are looking for funding.")
@@ -43,9 +43,9 @@
 
       it "displays the singular fund message after installing" do
         install_gemfile <<-G
-          source "#{file_uri_for(gem_repo2)}"
+          source "https://gem.repo2"
           gem 'has_funding'
-          gem 'rack-obama'
+          gem 'myrack-obama'
         G
 
         expect(out).to include("1 installed gem you directly depend on is looking for funding.")
@@ -59,10 +59,10 @@
 
       it "does not display the plural fund message after installing" do
         install_gemfile <<-G
-          source "#{file_uri_for(gem_repo2)}"
+          source "https://gem.repo2"
           gem 'has_funding_and_other_metadata'
           gem 'has_funding'
-          gem 'rack-obama'
+          gem 'myrack-obama'
         G
 
         expect(out).not_to include("2 installed gems you directly depend on are looking for funding.")
@@ -70,9 +70,9 @@
 
       it "does not display the singular fund message after installing" do
         install_gemfile <<-G
-          source "#{file_uri_for(gem_repo2)}"
+          source "https://gem.repo2"
           gem 'has_funding'
-          gem 'rack-obama'
+          gem 'myrack-obama'
         G
 
         expect(out).not_to include("1 installed gem you directly depend on is looking for funding.")
@@ -82,7 +82,7 @@
     context "when gems do not include fund messages" do
       it "does not display any fund messages" do
         install_gemfile <<-G
-          source "#{file_uri_for(gem_repo2)}"
+          source "https://gem.repo2"
           gem "activesupport"
         G
 
@@ -93,7 +93,7 @@
     context "when a dependency includes a fund message" do
       it "does not display the fund message" do
         install_gemfile <<-G
-          source "#{file_uri_for(gem_repo2)}"
+          source "https://gem.repo2"
           gem 'gem_with_dependent_funding'
         G
 
@@ -111,7 +111,7 @@
           }
         end
         install_gemfile <<-G
-          source "#{file_uri_for(gem_repo1)}"
+          source "https://gem.repo1"
           gem 'also_has_funding', :git => '#{lib_path("also_has_funding-1.0")}'
         G
 
@@ -125,7 +125,7 @@
           }
         end
         install_gemfile <<-G
-          source "#{file_uri_for(gem_repo1)}"
+          source "https://gem.repo1"
           gem 'also_has_funding', :git => '#{lib_path("also_has_funding-1.0")}'
         G
 
@@ -135,7 +135,7 @@
           }
         end
         install_gemfile <<-G
-          source "#{file_uri_for(gem_repo1)}"
+          source "https://gem.repo1"
           gem 'also_has_funding', :git => '#{lib_path("also_has_funding-1.1")}'
         G
 
@@ -149,7 +149,7 @@
           }
         end
         gemfile <<-G
-          source "#{file_uri_for(gem_repo1)}"
+          source "https://gem.repo1"
           gem 'also_has_funding', :git => '#{lib_path("also_has_funding-1.0")}'
         G
 
diff --git a/spec/bundler/install/gems/gemfile_source_header_spec.rb b/spec/bundler/install/gems/gemfile_source_header_spec.rb
new file mode 100644
index 00000000000000..9e63fa7551a4da
--- /dev/null
+++ b/spec/bundler/install/gems/gemfile_source_header_spec.rb
@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+RSpec.describe "fetching dependencies with a mirrored source" do
+  let(:mirror) { "https://server.example.org" }
+
+  before do
+    build_repo2
+
+    gemfile <<-G
+      source "#{mirror}"
+      gem 'weakling'
+    G
+
+    bundle "config set --local mirror.#{mirror} https://gem.repo2"
+  end
+
+  it "sets the 'X-Gemfile-Source' and 'User-Agent' headers and bundles successfully" do
+    bundle :install, artifice: "endpoint_mirror_source"
+
+    expect(out).to include("Installing weakling")
+    expect(out).to include("Bundle complete")
+    expect(the_bundle).to include_gems "weakling 0.0.3"
+  end
+end
diff --git a/spec/bundler/install/gems/mirror_probe_spec.rb b/spec/bundler/install/gems/mirror_probe_spec.rb
new file mode 100644
index 00000000000000..436f116cacf37a
--- /dev/null
+++ b/spec/bundler/install/gems/mirror_probe_spec.rb
@@ -0,0 +1,68 @@
+# frozen_string_literal: true
+
+RSpec.describe "fetching dependencies with a not available mirror" do
+  before do
+    build_repo2
+
+    gemfile <<-G
+      source "https://gem.repo2"
+      gem 'weakling'
+    G
+  end
+
+  context "with a specific fallback timeout" do
+    before do
+      global_config("BUNDLE_MIRROR__HTTPS://GEM__REPO2/__FALLBACK_TIMEOUT/" => "true",
+                    "BUNDLE_MIRROR__HTTPS://GEM__REPO2/" => "https://gem.mirror")
+    end
+
+    it "install a gem using the original uri when the mirror is not responding" do
+      bundle :install, env: { "BUNDLER_SPEC_FAKE_RESOLVE" => "gem.mirror" }, verbose: true
+
+      expect(out).to include("Installing weakling")
+      expect(out).to include("Bundle complete")
+      expect(the_bundle).to include_gems "weakling 0.0.3"
+    end
+  end
+
+  context "with a global fallback timeout" do
+    before do
+      global_config("BUNDLE_MIRROR__ALL__FALLBACK_TIMEOUT/" => "1",
+                    "BUNDLE_MIRROR__ALL" => "https://gem.mirror")
+    end
+
+    it "install a gem using the original uri when the mirror is not responding" do
+      bundle :install, env: { "BUNDLER_SPEC_FAKE_RESOLVE" => "gem.mirror" }
+
+      expect(out).to include("Installing weakling")
+      expect(out).to include("Bundle complete")
+      expect(the_bundle).to include_gems "weakling 0.0.3"
+    end
+  end
+
+  context "with a specific mirror without a fallback timeout" do
+    before do
+      global_config("BUNDLE_MIRROR__HTTPS://GEM__REPO2/" => "https://gem.mirror")
+    end
+
+    it "fails to install the gem with a timeout error when the mirror is not responding" do
+      bundle :install, artifice: "compact_index_mirror_down", raise_on_error: false
+
+      expect(out).to be_empty
+      expect(err).to eq("Could not reach host gem.mirror. Check your network connection and try again.")
+    end
+  end
+
+  context "with a global mirror without a fallback timeout" do
+    before do
+      global_config("BUNDLE_MIRROR__ALL" => "https://gem.mirror")
+    end
+
+    it "fails to install the gem with a timeout error when the mirror is not responding" do
+      bundle :install, artifice: "compact_index_mirror_down", raise_on_error: false
+
+      expect(out).to be_empty
+      expect(err).to eq("Could not reach host gem.mirror. Check your network connection and try again.")
+    end
+  end
+end
diff --git a/spec/bundler/install/gems/mirror_spec.rb b/spec/bundler/install/gems/mirror_spec.rb
index 9611973701ee8b..70c0da50ef8145 100644
--- a/spec/bundler/install/gems/mirror_spec.rb
+++ b/spec/bundler/install/gems/mirror_spec.rb
@@ -4,17 +4,17 @@
   describe "when the mirror does not match the gem source" do
     before :each do
       gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
+        source "https://gem.repo1"
 
-        gem "rack"
+        gem "myrack"
       G
       bundle "config set --local mirror.http://gems.example.org http://gem-mirror.example.org"
     end
 
     it "installs from the normal location" do
       bundle :install
-      expect(out).to include("Fetching source index from #{file_uri_for(gem_repo1)}")
-      expect(the_bundle).to include_gems "rack 1.0"
+      expect(out).to include("Fetching gem metadata from https://gem.repo1")
+      expect(the_bundle).to include_gems "myrack 1.0"
     end
   end
 
@@ -22,18 +22,18 @@
     before :each do
       gemfile <<-G
         # This source is bogus and doesn't have the gem we're looking for
-        source "#{file_uri_for(gem_repo2)}"
+        source "https://gem.repo2"
 
-        gem "rack"
+        gem "myrack"
       G
-      bundle "config set --local mirror.#{file_uri_for(gem_repo2)} #{file_uri_for(gem_repo1)}"
+      bundle "config set --local mirror.https://gem.repo2 https://gem.repo1"
     end
 
     it "installs the gem from the mirror" do
-      bundle :install
-      expect(out).to include("Fetching source index from #{file_uri_for(gem_repo1)}")
-      expect(out).not_to include("Fetching source index from #{file_uri_for(gem_repo2)}")
-      expect(the_bundle).to include_gems "rack 1.0"
+      bundle :install, artifice: "compact_index", env: { "BUNDLER_SPEC_GEM_REPO" => gem_repo1.to_s }
+      expect(out).to include("Fetching gem metadata from https://gem.repo1")
+      expect(out).not_to include("Fetching gem metadata from https://gem.repo2")
+      expect(the_bundle).to include_gems "myrack 1.0"
     end
   end
 end
diff --git a/spec/bundler/install/gems/native_extensions_spec.rb b/spec/bundler/install/gems/native_extensions_spec.rb
index 5c18d2cc51c5e8..874818fa874f92 100644
--- a/spec/bundler/install/gems/native_extensions_spec.rb
+++ b/spec/bundler/install/gems/native_extensions_spec.rb
@@ -7,7 +7,6 @@
         s.extensions = ["ext/extconf.rb"]
         s.write "ext/extconf.rb", <<-E
           require "mkmf"
-          $extout = "$(topdir)/" + RbConfig::CONFIG["EXTOUT"]
           name = "c_extension_bundle"
           dir_config(name)
           raise "OMG" unless with_config("c_extension") == "hello"
@@ -34,7 +33,7 @@
     end
 
     gemfile <<-G
-      source "#{file_uri_for(gem_repo2)}"
+      source "https://gem.repo2"
       gem "c_extension"
     G
 
@@ -52,7 +51,6 @@
       s.extensions = ["ext/extconf.rb"]
       s.write "ext/extconf.rb", <<-E
         require "mkmf"
-        $extout = "$(topdir)/" + RbConfig::CONFIG["EXTOUT"]
         name = "c_extension_bundle"
         dir_config(name)
         raise "OMG" unless with_config("c_extension") == "hello"
@@ -80,7 +78,7 @@
     bundle "config set build.c_extension --with-c_extension=hello"
 
     install_gemfile <<-G
-      source "#{file_uri_for(gem_repo1)}"
+      source "https://gem.repo1"
       gem "c_extension", :git => #{lib_path("c_extension-1.0").to_s.dump}
     G
 
@@ -93,11 +91,10 @@
   it "installs correctly from git when multiple gems with extensions share one repository" do
     build_repo2 do
       ["one", "two"].each do |n|
-        build_lib "c_extension_#{n}", "1.0", :path => lib_path("gems/c_extension_#{n}") do |s|
+        build_lib "c_extension_#{n}", "1.0", path: lib_path("gems/c_extension_#{n}") do |s|
           s.extensions = ["ext/extconf.rb"]
           s.write "ext/extconf.rb", <<-E
             require "mkmf"
-            $extout = "$(topdir)/" + RbConfig::CONFIG["EXTOUT"]
             name = "c_extension_bundle_#{n}"
             dir_config(name)
             raise "OMG" unless with_config("c_extension_#{n}") == "#{n}"
@@ -122,7 +119,7 @@
           C
         end
       end
-      build_git "gems", :path => lib_path("gems"), :gemspec => false
+      build_git "gems", path: lib_path("gems"), gemspec: false
     end
 
     bundle "config set build.c_extension_one --with-c_extension_one=one"
@@ -130,13 +127,13 @@
 
     # 1st time, require only one gem -- only one of the extensions gets built.
     install_gemfile <<-G
-      source "#{file_uri_for(gem_repo1)}"
+      source "https://gem.repo1"
       gem "c_extension_one", :git => #{lib_path("gems").to_s.dump}
     G
 
     # 2nd time, require both gems -- we need both extensions to be built now.
     install_gemfile <<-G
-      source "#{file_uri_for(gem_repo1)}"
+      source "https://gem.repo1"
       gem "c_extension_one", :git => #{lib_path("gems").to_s.dump}
       gem "c_extension_two", :git => #{lib_path("gems").to_s.dump}
     G
@@ -150,7 +147,6 @@
       s.extensions = ["ext/extconf.rb"]
       s.write "ext/extconf.rb", <<-E
         require "mkmf"
-        $extout = "$(topdir)/" + RbConfig::CONFIG["EXTOUT"]
         name = "c_extension_bundle"
         dir_config(name)
         raise "OMG" unless with_config("c_extension") == "hello" && with_config("c_extension_bundle-dir") == "hola"
@@ -178,7 +174,7 @@
     bundle "config set build.c_extension --with-c_extension=hello --with-c_extension_bundle-dir=hola"
 
     install_gemfile <<-G
-      source "#{file_uri_for(gem_repo1)}"
+      source "https://gem.repo1"
       gem "c_extension", :git => #{lib_path("c_extension-1.0").to_s.dump}
     G
 
diff --git a/spec/bundler/install/gems/post_install_spec.rb b/spec/bundler/install/gems/post_install_spec.rb
index 7426f5487702ed..af753dba3e3ec7 100644
--- a/spec/bundler/install/gems/post_install_spec.rb
+++ b/spec/bundler/install/gems/post_install_spec.rb
@@ -5,26 +5,26 @@
     context "when gems include post install messages" do
       it "should display the post-install messages after installing" do
         gemfile <<-G
-          source "#{file_uri_for(gem_repo1)}"
-          gem 'rack'
+          source "https://gem.repo1"
+          gem 'myrack'
           gem 'thin'
-          gem 'rack-obama'
+          gem 'myrack-obama'
         G
 
         bundle :install
-        expect(out).to include("Post-install message from rack:")
-        expect(out).to include("Rack's post install message")
+        expect(out).to include("Post-install message from myrack:")
+        expect(out).to include("Myrack's post install message")
         expect(out).to include("Post-install message from thin:")
         expect(out).to include("Thin's post install message")
-        expect(out).to include("Post-install message from rack-obama:")
-        expect(out).to include("Rack-obama's post install message")
+        expect(out).to include("Post-install message from myrack-obama:")
+        expect(out).to include("Myrack-obama's post install message")
       end
     end
 
     context "when gems do not include post install messages" do
       it "should not display any post-install messages" do
         gemfile <<-G
-          source "#{file_uri_for(gem_repo1)}"
+          source "https://gem.repo1"
           gem "activesupport"
         G
 
@@ -36,13 +36,13 @@
     context "when a dependency includes a post install message" do
       it "should display the post install message" do
         gemfile <<-G
-          source "#{file_uri_for(gem_repo1)}"
-          gem 'rack_middleware'
+          source "https://gem.repo1"
+          gem 'myrack_middleware'
         G
 
         bundle :install
-        expect(out).to include("Post-install message from rack:")
-        expect(out).to include("Rack's post install message")
+        expect(out).to include("Post-install message from myrack:")
+        expect(out).to include("Myrack's post install message")
       end
     end
   end
@@ -54,7 +54,7 @@
           s.post_install_message = "Foo's post install message"
         end
         gemfile <<-G
-          source "#{file_uri_for(gem_repo1)}"
+          source "https://gem.repo1"
           gem 'foo', :git => '#{lib_path("foo-1.0")}'
         G
 
@@ -68,7 +68,7 @@
           s.post_install_message = "Foo's post install message"
         end
         gemfile <<-G
-          source "#{file_uri_for(gem_repo1)}"
+          source "https://gem.repo1"
           gem 'foo', :git => '#{lib_path("foo-1.0")}'
         G
         bundle :install
@@ -77,7 +77,7 @@
           s.post_install_message = "Foo's 1.1 post install message"
         end
         gemfile <<-G
-          source "#{file_uri_for(gem_repo1)}"
+          source "https://gem.repo1"
           gem 'foo', :git => '#{lib_path("foo-1.1")}'
         G
         bundle :install
@@ -91,7 +91,7 @@
           s.post_install_message = "Foo's post install message"
         end
         gemfile <<-G
-          source "#{file_uri_for(gem_repo1)}"
+          source "https://gem.repo1"
           gem 'foo', :git => '#{lib_path("foo-1.0")}'
         G
 
@@ -110,7 +110,7 @@
           s.post_install_message = nil
         end
         gemfile <<-G
-          source "#{file_uri_for(gem_repo1)}"
+          source "https://gem.repo1"
           gem 'foo', :git => '#{lib_path("foo-1.0")}'
         G
 
@@ -123,11 +123,11 @@
   context "when ignore post-install messages for gem is set" do
     it "doesn't display any post-install messages" do
       gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
-        gem "rack"
+        source "https://gem.repo1"
+        gem "myrack"
       G
 
-      bundle "config set ignore_messages.rack true"
+      bundle "config set ignore_messages.myrack true"
 
       bundle :install
       expect(out).not_to include("Post-install message")
@@ -137,8 +137,8 @@
   context "when ignore post-install messages for all gems" do
     it "doesn't display any post-install messages" do
       gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
-        gem "rack"
+        source "https://gem.repo1"
+        gem "myrack"
       G
 
       bundle "config set ignore_messages true"
diff --git a/spec/bundler/install/gems/resolving_spec.rb b/spec/bundler/install/gems/resolving_spec.rb
index acaadea6321938..21e4a12107ddf1 100644
--- a/spec/bundler/install/gems/resolving_spec.rb
+++ b/spec/bundler/install/gems/resolving_spec.rb
@@ -66,7 +66,7 @@
 
   it "installs gems with implicit rake dependencies" do
     install_gemfile <<-G
-      source "#{file_uri_for(gem_repo2)}"
+      source "https://gem.repo2"
       gem "with_implicit_rake_dep"
       gem "another_implicit_rake_dep"
       gem "rake"
@@ -84,7 +84,7 @@
   it "installs gems with implicit rake dependencies without rake previously installed" do
     with_path_as("") do
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo2)}"
+        source "https://gem.repo2"
         gem "with_implicit_rake_dep"
         gem "another_implicit_rake_dep"
         gem "rake"
@@ -100,30 +100,32 @@
     expect(out).to eq("YES\nYES")
   end
 
-  it "installs gems with a dependency with no type" do
+  it "does not install gems with a dependency with no type" do
     build_repo2
 
     path = "#{gem_repo2}/#{Gem::MARSHAL_SPEC_DIR}/actionpack-2.3.2.gemspec.rz"
     spec = Marshal.load(Bundler.rubygems.inflate(File.binread(path)))
     spec.dependencies.each do |d|
-      d.instance_variable_set(:@type, :fail)
+      d.instance_variable_set(:@type, "fail")
     end
     File.open(path, "wb") do |f|
       f.write Gem.deflate(Marshal.dump(spec))
     end
 
-    install_gemfile <<-G
-      source "#{file_uri_for(gem_repo2)}"
+    install_gemfile <<-G, raise_on_error: false
+      source "https://gem.repo2"
       gem "actionpack", "2.3.2"
     G
 
-    expect(the_bundle).to include_gems "actionpack 2.3.2", "activesupport 2.3.2"
+    expect(err).to include("Downloading actionpack-2.3.2 revealed dependencies not in the API (activesupport (= 2.3.2)).")
+
+    expect(the_bundle).not_to include_gems "actionpack 2.3.2", "activesupport 2.3.2"
   end
 
   describe "with crazy rubygem plugin stuff" do
     it "installs plugins" do
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo2)}"
+        source "https://gem.repo2"
         gem "net_b"
       G
 
@@ -131,8 +133,8 @@
     end
 
     it "installs plugins depended on by other plugins" do
-      install_gemfile <<-G, :env => { "DEBUG" => "1" }
-        source "#{file_uri_for(gem_repo2)}"
+      install_gemfile <<-G, env: { "DEBUG" => "1" }
+        source "https://gem.repo2"
         gem "net_a"
       G
 
@@ -140,8 +142,8 @@
     end
 
     it "installs multiple levels of dependencies" do
-      install_gemfile <<-G, :env => { "DEBUG" => "1" }
-        source "#{file_uri_for(gem_repo2)}"
+      install_gemfile <<-G, env: { "DEBUG" => "1" }
+        source "https://gem.repo2"
         gem "net_c"
         gem "net_e"
       G
@@ -152,12 +154,12 @@
     context "with ENV['BUNDLER_DEBUG_RESOLVER'] set" do
       it "produces debug output" do
         gemfile <<-G
-          source "#{file_uri_for(gem_repo2)}"
+          source "https://gem.repo2"
           gem "net_c"
           gem "net_e"
         G
 
-        bundle :install, :env => { "BUNDLER_DEBUG_RESOLVER" => "1", "DEBUG" => "1" }
+        bundle :install, env: { "BUNDLER_DEBUG_RESOLVER" => "1", "DEBUG" => "1" }
 
         expect(out).to include("Resolving dependencies...")
       end
@@ -166,12 +168,12 @@
     context "with ENV['DEBUG_RESOLVER'] set" do
       it "produces debug output" do
         gemfile <<-G
-          source "#{file_uri_for(gem_repo2)}"
+          source "https://gem.repo2"
           gem "net_c"
           gem "net_e"
         G
 
-        bundle :install, :env => { "DEBUG_RESOLVER" => "1", "DEBUG" => "1" }
+        bundle :install, env: { "DEBUG_RESOLVER" => "1", "DEBUG" => "1" }
 
         expect(out).to include("Resolving dependencies...")
       end
@@ -180,12 +182,12 @@
     context "with ENV['DEBUG_RESOLVER_TREE'] set" do
       it "produces debug output" do
         gemfile <<-G
-          source "#{file_uri_for(gem_repo2)}"
+          source "https://gem.repo2"
           gem "net_c"
           gem "net_e"
         G
 
-        bundle :install, :env => { "DEBUG_RESOLVER_TREE" => "1", "DEBUG" => "1" }
+        bundle :install, env: { "DEBUG_RESOLVER_TREE" => "1", "DEBUG" => "1" }
 
         expect(out).to include(" net_b").
           and include("Resolving dependencies...").
@@ -199,44 +201,44 @@
     context "allows only an older version" do
       it "installs the older version" do
         build_repo2 do
-          build_gem "rack", "1.2" do |s|
-            s.executables = "rackup"
+          build_gem "myrack", "1.2" do |s|
+            s.executables = "myrackup"
           end
 
-          build_gem "rack", "9001.0.0" do |s|
+          build_gem "myrack", "9001.0.0" do |s|
             s.required_ruby_version = "> 9000"
           end
         end
 
-        install_gemfile <<-G, :artifice => "compact_index", :env => { "BUNDLER_SPEC_GEM_REPO" => gem_repo2.to_s }
+        install_gemfile <<-G
           ruby "#{Gem.ruby_version}"
-          source "http://localgemserver.test/"
-          gem 'rack'
+          source "https://gem.repo2"
+          gem 'myrack'
         G
 
-        expect(err).to_not include("rack-9001.0.0 requires ruby version > 9000")
-        expect(the_bundle).to include_gems("rack 1.2")
+        expect(err).to_not include("myrack-9001.0.0 requires ruby version > 9000")
+        expect(the_bundle).to include_gems("myrack 1.2")
       end
 
       it "installs the older version when using servers not implementing the compact index API" do
         build_repo2 do
-          build_gem "rack", "1.2" do |s|
-            s.executables = "rackup"
+          build_gem "myrack", "1.2" do |s|
+            s.executables = "myrackup"
           end
 
-          build_gem "rack", "9001.0.0" do |s|
+          build_gem "myrack", "9001.0.0" do |s|
             s.required_ruby_version = "> 9000"
           end
         end
 
-        install_gemfile <<-G, :artifice => "endpoint", :env => { "BUNDLER_SPEC_GEM_REPO" => gem_repo2.to_s }
+        install_gemfile <<-G, artifice: "endpoint"
           ruby "#{Gem.ruby_version}"
-          source "http://localgemserver.test/"
-          gem 'rack'
+          source "https://gem.repo2"
+          gem 'myrack'
         G
 
-        expect(err).to_not include("rack-9001.0.0 requires ruby version > 9000")
-        expect(the_bundle).to include_gems("rack 1.2")
+        expect(err).to_not include("myrack-9001.0.0 requires ruby version > 9000")
+        expect(the_bundle).to include_gems("myrack 1.2")
       end
 
       context "when there is a lockfile using the newer incompatible version" do
@@ -252,13 +254,17 @@
           end
 
           gemfile <<-G
-            source "http://localgemserver.test/"
+            source "https://gem.repo2"
             gem 'parallel_tests'
           G
 
+          checksums = checksums_section do |c|
+            c.checksum gem_repo2, "parallel_tests", "3.8.0"
+          end
+
           lockfile <<~L
             GEM
-              remote: http://localgemserver.test/
+              remote: https://gem.repo2/
               specs:
                 parallel_tests (3.8.0)
 
@@ -267,18 +273,22 @@
 
             DEPENDENCIES
               parallel_tests
-
+            #{checksums}
             BUNDLED WITH
                #{Bundler::VERSION}
           L
         end
 
         it "automatically updates lockfile to use the older version" do
-          bundle "install --verbose", :artifice => "compact_index", :env => { "BUNDLER_SPEC_GEM_REPO" => gem_repo2.to_s }
+          bundle "install --verbose"
+
+          checksums = checksums_section_when_enabled do |c|
+            c.checksum gem_repo2, "parallel_tests", "3.7.0"
+          end
 
           expect(lockfile).to eq <<~L
             GEM
-              remote: http://localgemserver.test/
+              remote: https://gem.repo2/
               specs:
                 parallel_tests (3.7.0)
 
@@ -287,7 +297,7 @@
 
             DEPENDENCIES
               parallel_tests
-
+            #{checksums}
             BUNDLED WITH
                #{Bundler::VERSION}
           L
@@ -295,11 +305,10 @@
 
         it "gives a meaningful error if we're in frozen mode" do
           expect do
-            bundle "install --verbose", :artifice => "compact_index", :env => { "BUNDLER_SPEC_GEM_REPO" => gem_repo2.to_s, "BUNDLE_FROZEN" => "true" }, :raise_on_error => false
+            bundle "install", env: { "BUNDLE_FROZEN" => "true" }, raise_on_error: false
           end.not_to change { lockfile }
 
-          expect(err).to include("parallel_tests-3.8.0 requires ruby version >= #{next_ruby_minor}")
-          expect(err).not_to include("That means the author of parallel_tests (3.8.0) has removed it.")
+          expect(err).to eq("parallel_tests-3.8.0 requires ruby version >= #{next_ruby_minor}, which is incompatible with the current version, #{Gem.ruby_version}")
         end
       end
 
@@ -328,13 +337,18 @@
           end
 
           gemfile <<-G
-            source "http://localgemserver.test/"
+            source "https://gem.repo2"
             gem 'rubocop'
           G
 
+          checksums = checksums_section do |c|
+            c.checksum gem_repo2, "rubocop", "1.35.0"
+            c.checksum gem_repo2, "rubocop-ast", "1.21.0"
+          end
+
           lockfile <<~L
             GEM
-              remote: http://localgemserver.test/
+              remote: https://gem.repo2/
               specs:
                 rubocop (1.35.0)
                   rubocop-ast (>= 1.20.1, < 2.0)
@@ -345,18 +359,23 @@
 
             DEPENDENCIES
               parallel_tests
-
+            #{checksums}
             BUNDLED WITH
                #{Bundler::VERSION}
           L
         end
 
         it "automatically updates lockfile to use the older compatible versions" do
-          bundle "install --verbose", :artifice => "compact_index", :env => { "BUNDLER_SPEC_GEM_REPO" => gem_repo2.to_s }
+          bundle "install --verbose"
+
+          checksums = checksums_section_when_enabled do |c|
+            c.checksum gem_repo2, "rubocop", "1.28.2"
+            c.checksum gem_repo2, "rubocop-ast", "1.17.0"
+          end
 
           expect(lockfile).to eq <<~L
             GEM
-              remote: http://localgemserver.test/
+              remote: https://gem.repo2/
               specs:
                 rubocop (1.28.2)
                   rubocop-ast (>= 1.17.0, < 2.0)
@@ -367,14 +386,14 @@
 
             DEPENDENCIES
               rubocop
-
+            #{checksums}
             BUNDLED WITH
                #{Bundler::VERSION}
           L
         end
       end
 
-      context "with a Gemfile and lock file that don't resolve under the current platform" do
+      context "with a Gemfile and lockfile that don't resolve under the current platform" do
         before do
           build_repo4 do
             build_gem "sorbet", "0.5.10554" do |s|
@@ -387,13 +406,13 @@
           end
 
           gemfile <<~G
-            source "#{file_uri_for(gem_repo4)}"
+            source "https://gem.repo4"
             gem 'sorbet', '= 0.5.10554'
           G
 
           lockfile <<~L
             GEM
-              remote: #{file_uri_for(gem_repo4)}/
+              remote: https://gem.repo4/
               specs:
                 sorbet (0.5.10554)
                   sorbet-static (= 0.5.10554)
@@ -412,11 +431,11 @@
 
         it "raises a proper error" do
           simulate_platform "aarch64-linux" do
-            bundle "install", :raise_on_error => false
+            bundle "install", raise_on_error: false
           end
 
           nice_error = <<~E.strip
-            Could not find gem 'sorbet-static (= 0.5.10554)' with platforms 'arm64-darwin-21', 'aarch64-linux' in rubygems repository #{file_uri_for(gem_repo4)}/ or installed locally.
+            Could not find gems matching 'sorbet-static (= 0.5.10554)' valid for all resolution platforms (arm64-darwin-21, aarch64-linux) in rubygems repository https://gem.repo4/ or installed locally.
 
             The source contains the following gems matching 'sorbet-static (= 0.5.10554)':
               * sorbet-static-0.5.10554-universal-darwin-21
@@ -425,6 +444,120 @@
         end
       end
 
+      context "when adding a new gem that does not resolve under all locked platforms" do
+        before do
+          simulate_platform "x86_64-linux" do
+            build_repo4 do
+              build_gem "nokogiri", "1.14.0" do |s|
+                s.platform = "x86_64-linux"
+              end
+              build_gem "nokogiri", "1.14.0" do |s|
+                s.platform = "arm-linux"
+              end
+
+              build_gem "sorbet-static", "0.5.10696" do |s|
+                s.platform = "x86_64-linux"
+              end
+            end
+
+            lockfile <<~L
+              GEM
+                remote: https://gem.repo4/
+                specs:
+                  nokogiri (1.14.0-arm-linux)
+                  nokogiri (1.14.0-x86_64-linux)
+
+              PLATFORMS
+                arm-linux
+                x86_64-linux
+
+              DEPENDENCIES
+                nokogiri
+
+              BUNDLED WITH
+                 #{Bundler::VERSION}
+            L
+
+            gemfile <<~G
+              source "https://gem.repo4"
+
+              gem "nokogiri"
+              gem "sorbet-static"
+            G
+
+            bundle "lock", raise_on_error: false
+          end
+        end
+
+        it "raises a proper error" do
+          nice_error = <<~E.strip
+            Could not find gems matching 'sorbet-static' valid for all resolution platforms (arm-linux, x86_64-linux) in rubygems repository https://gem.repo4/ or installed locally.
+
+            The source contains the following gems matching 'sorbet-static':
+              * sorbet-static-0.5.10696-x86_64-linux
+          E
+          expect(err).to end_with(nice_error)
+        end
+      end
+
+      context "when locked generic variant supports current Ruby, but locked specific variant does not" do
+        let(:original_lockfile) do
+          <<~L
+            GEM
+              remote: https://gem.repo4/
+              specs:
+                nokogiri (1.16.3)
+                nokogiri (1.16.3-x86_64-linux)
+
+            PLATFORMS
+              ruby
+              x86_64-linux
+
+            DEPENDENCIES
+              nokogiri
+
+            BUNDLED WITH
+               #{Bundler::VERSION}
+          L
+        end
+
+        before do
+          build_repo4 do
+            build_gem "nokogiri", "1.16.3"
+            build_gem "nokogiri", "1.16.3" do |s|
+              s.required_ruby_version = "< #{Gem.ruby_version}"
+              s.platform = "x86_64-linux"
+            end
+          end
+
+          gemfile <<~G
+            source "https://gem.repo4"
+
+            gem "nokogiri"
+          G
+
+          lockfile original_lockfile
+        end
+
+        it "keeps both variants in the lockfile when installing, and uses the generic one since it's compatible" do
+          simulate_platform "x86_64-linux" do
+            bundle "install --verbose"
+
+            expect(lockfile).to eq(original_lockfile)
+            expect(the_bundle).to include_gems("nokogiri 1.16.3")
+          end
+        end
+
+        it "keeps both variants in the lockfile when updating, and uses the generic one since it's compatible" do
+          simulate_platform "x86_64-linux" do
+            bundle "update --verbose"
+
+            expect(lockfile).to eq(original_lockfile)
+            expect(the_bundle).to include_gems("nokogiri 1.16.3")
+          end
+        end
+      end
+
       it "gives a meaningful error on ruby version mismatches between dependencies" do
         build_repo4 do
           build_gem "requires-old-ruby" do |s|
@@ -432,14 +565,14 @@
           end
         end
 
-        build_lib("foo", :path => bundled_app) do |s|
+        build_lib("foo", path: bundled_app) do |s|
           s.required_ruby_version = ">= #{Gem.ruby_version}"
 
           s.add_dependency "requires-old-ruby"
         end
 
-        install_gemfile <<-G, :raise_on_error => false
-          source "#{file_uri_for(gem_repo4)}"
+        install_gemfile <<-G, raise_on_error: false
+          source "https://gem.repo4"
           gemspec
         G
 
@@ -457,47 +590,47 @@
 
       it "installs the older version under rate limiting conditions" do
         build_repo4 do
-          build_gem "rack", "9001.0.0" do |s|
+          build_gem "myrack", "9001.0.0" do |s|
             s.required_ruby_version = "> 9000"
           end
-          build_gem "rack", "1.2"
+          build_gem "myrack", "1.2"
           build_gem "foo1", "1.0"
         end
 
-        install_gemfile <<-G, :artifice => "compact_index_rate_limited", :env => { "BUNDLER_SPEC_GEM_REPO" => gem_repo4.to_s }
+        install_gemfile <<-G, artifice: "compact_index_rate_limited"
           ruby "#{Gem.ruby_version}"
-          source "http://localgemserver.test/"
-          gem 'rack'
+          source "https://gem.repo4"
+          gem 'myrack'
           gem 'foo1'
         G
 
-        expect(err).to_not include("rack-9001.0.0 requires ruby version > 9000")
-        expect(the_bundle).to include_gems("rack 1.2")
+        expect(err).to_not include("myrack-9001.0.0 requires ruby version > 9000")
+        expect(the_bundle).to include_gems("myrack 1.2")
       end
 
       it "installs the older not platform specific version" do
         build_repo4 do
-          build_gem "rack", "9001.0.0" do |s|
+          build_gem "myrack", "9001.0.0" do |s|
             s.required_ruby_version = "> 9000"
           end
-          build_gem "rack", "1.2" do |s|
-            s.platform = x86_mingw32
+          build_gem "myrack", "1.2" do |s|
+            s.platform = "x86-mingw32"
             s.required_ruby_version = "> 9000"
           end
-          build_gem "rack", "1.2"
+          build_gem "myrack", "1.2"
         end
 
-        simulate_platform x86_mingw32 do
-          install_gemfile <<-G, :artifice => "compact_index", :env => { "BUNDLER_SPEC_GEM_REPO" => gem_repo4.to_s }
+        simulate_platform "x86-mingw32" do
+          install_gemfile <<-G, artifice: "compact_index"
             ruby "#{Gem.ruby_version}"
-            source "http://localgemserver.test/"
-            gem 'rack'
+            source "https://gem.repo4"
+            gem 'myrack'
           G
         end
 
-        expect(err).to_not include("rack-9001.0.0 requires ruby version > 9000")
-        expect(err).to_not include("rack-1.2-#{Bundler.local_platform} requires ruby version > 9000")
-        expect(the_bundle).to include_gems("rack 1.2")
+        expect(err).to_not include("myrack-9001.0.0 requires ruby version > 9000")
+        expect(err).to_not include("myrack-1.2-#{Bundler.local_platform} requires ruby version > 9000")
+        expect(the_bundle).to include_gems("myrack 1.2")
       end
     end
 
@@ -514,8 +647,8 @@
       let(:error_message_requirement) { "= #{Gem.ruby_version}" }
 
       it "raises a proper error that mentions the current Ruby version during resolution" do
-        install_gemfile <<-G, :artifice => "compact_index", :env => { "BUNDLER_SPEC_GEM_REPO" => gem_repo2.to_s }, :raise_on_error => false
-          source "http://localgemserver.test/"
+        install_gemfile <<-G, raise_on_error: false
+          source "https://gem.repo2"
           gem 'require_ruby'
         G
 
@@ -535,8 +668,8 @@
 
       shared_examples_for "ruby version conflicts" do
         it "raises an error during resolution" do
-          install_gemfile <<-G, :artifice => "compact_index", :env => { "BUNDLER_SPEC_GEM_REPO" => gem_repo2.to_s }, :raise_on_error => false
-            source "http://localgemserver.test/"
+          install_gemfile <<-G, raise_on_error: false
+            source "https://gem.repo2"
             ruby #{ruby_requirement}
             gem 'require_ruby'
           G
@@ -581,8 +714,8 @@
         end
       end
 
-      install_gemfile <<-G, :raise_on_error => false
-        source "#{file_uri_for(gem_repo2)}"
+      install_gemfile <<-G, raise_on_error: false
+        source "https://gem.repo2"
         gem 'require_rubygems'
       G
 
@@ -597,4 +730,55 @@
       expect(err).to end_with(nice_error)
     end
   end
+
+  context "when non platform specific gems bring more dependencies", :truffleruby_only do
+    before do
+      build_repo4 do
+        build_gem "foo", "1.0" do |s|
+          s.add_dependency "bar"
+        end
+
+        build_gem "foo", "2.0" do |s|
+          s.platform = "x86_64-linux"
+        end
+
+        build_gem "bar"
+      end
+
+      gemfile <<-G
+        source "https://gem.repo4"
+        gem "foo"
+      G
+    end
+
+    it "locks both ruby and current platform, and resolve to ruby variants that install on truffleruby" do
+      checksums = checksums_section_when_enabled do |c|
+        c.checksum gem_repo4, "foo", "1.0"
+        c.checksum gem_repo4, "bar", "1.0"
+      end
+
+      simulate_platform "x86_64-linux" do
+        bundle "install"
+
+        expect(lockfile).to eq <<~L
+          GEM
+            remote: https://gem.repo4/
+            specs:
+              bar (1.0)
+              foo (1.0)
+                bar
+
+          PLATFORMS
+            ruby
+            x86_64-linux
+
+          DEPENDENCIES
+            foo
+          #{checksums}
+          BUNDLED WITH
+             #{Bundler::VERSION}
+        L
+      end
+    end
+  end
 end
diff --git a/spec/bundler/install/gems/standalone_spec.rb b/spec/bundler/install/gems/standalone_spec.rb
index 4d087522562261..80735594791026 100644
--- a/spec/bundler/install/gems/standalone_spec.rb
+++ b/spec/bundler/install/gems/standalone_spec.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-RSpec.shared_examples "bundle install --standalone" do
+RSpec.describe "bundle install --standalone" do
   shared_examples "common functionality" do
     it "still makes the gems available to normal bundler" do
       args = expected_gems.map {|k, v| "#{k} #{v}" }
@@ -8,9 +8,9 @@
     end
 
     it "still makes system gems unavailable to normal bundler" do
-      system_gems "rack-1.0.0"
+      system_gems "myrack-1.0.0"
 
-      expect(the_bundle).to_not include_gems("rack")
+      expect(the_bundle).to_not include_gems("myrack")
     end
 
     it "generates a bundle/bundler/setup.rb" do
@@ -63,14 +63,14 @@
     end
 
     it "makes system gems unavailable without bundler" do
-      system_gems "rack-1.0.0"
+      system_gems "myrack-1.0.0"
 
       testrb = String.new <<-RUBY
         $:.unshift File.expand_path("bundle")
         require "bundler/setup"
 
         begin
-          require "rack"
+          require "myrack"
         rescue LoadError
           puts "LoadError"
         end
@@ -97,7 +97,23 @@
         testrb << "\nrequire \"#{k}\""
         testrb << "\nputs #{k.upcase}"
       end
-      ruby testrb, :dir => "#{bundled_app}2"
+      ruby testrb, dir: "#{bundled_app}2"
+
+      expect(out).to eq(expected_gems.values.join("\n"))
+    end
+
+    it "skips activating gems" do
+      testrb = String.new <<-RUBY
+        $:.unshift File.expand_path("bundle")
+        require "bundler/setup"
+
+        gem "do_not_activate_me"
+      RUBY
+      expected_gems.each do |k, _|
+        testrb << "\nrequire \"#{k}\""
+        testrb << "\nputs #{k.upcase}"
+      end
+      sys_exec %(#{Gem.ruby} -w -e #{testrb.shellescape})
 
       expect(out).to eq(expected_gems.values.join("\n"))
     end
@@ -106,11 +122,11 @@
   describe "with simple gems" do
     before do
       gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
+        source "https://gem.repo1"
         gem "rails"
       G
       bundle "config set --local path #{bundled_app("bundle")}"
-      bundle :install, :standalone => true, :dir => cwd
+      bundle :install, standalone: true, dir: cwd
     end
 
     let(:expected_gems) do
@@ -124,22 +140,14 @@
   end
 
   describe "with default gems and a lockfile", :ruby_repo do
-    before do
-      skip "does not work on rubygems versions where `--install_dir` doesn't respect --default" unless Gem::Installer.for_spec(loaded_gemspec, :install_dir => "/foo").default_spec_file == "/foo/specifications/default/bundler-#{Bundler::VERSION}.gemspec" # Since rubygems 3.2.0.rc.2
-      skip "does not work on old rubies because the realworld gems that need to be installed don't support them" if RUBY_VERSION < "2.7.0"
+    it "works and points to the vendored copies, not to the default copies" do
+      base_system_gems "stringio", "psych", "etc", path: scoped_gem_path(bundled_app("bundle"))
 
-      realworld_system_gems "tsort --version 0.1.0"
-
-      necessary_system_gems = ["optparse --version 0.1.1", "psych --version 3.3.2", "logger --version 1.4.3", "etc --version 1.2.0", "stringio --version 3.0.1"]
-      necessary_system_gems += ["shellwords --version 0.1.0", "base64 --version 0.1.0", "resolv --version 0.2.1"] if Gem.rubygems_version < Gem::Version.new("3.3.a")
-      necessary_system_gems += ["yaml --version 0.1.1"] if Gem.rubygems_version < Gem::Version.new("3.4.a")
-      realworld_system_gems(*necessary_system_gems, :path => scoped_gem_path(bundled_app("bundle")))
-
-      build_gem "foo", "1.0.0", :to_system => true, :default => true do |s|
+      build_gem "foo", "1.0.0", to_system: true, default: true do |s|
         s.add_dependency "bar"
       end
 
-      build_gem "bar", "1.0.0", :to_system => true, :default => true
+      build_gem "bar", "1.0.0", to_system: true, default: true
 
       build_repo4 do
         build_gem "foo", "1.0.0" do |s|
@@ -154,12 +162,11 @@
         gem "foo"
       G
 
-      bundle "lock", :dir => cwd, :artifice => "compact_index"
-    end
+      bundle "lock", dir: cwd
 
-    it "works and points to the vendored copies, not to the default copies", :realworld do
       bundle "config set --local path #{bundled_app("bundle")}"
-      bundle :install, :standalone => true, :dir => cwd, :artifice => "compact_index", :env => { "BUNDLER_GEM_DEFAULT_DIR" => system_gem_path.to_s }
+
+      bundle :install, standalone: true, dir: cwd, env: { "BUNDLER_GEM_DEFAULT_DIR" => system_gem_path.to_s }
 
       load_path_lines = bundled_app("bundle/bundler/setup.rb").read.split("\n").select {|line| line.start_with?("$:.unshift") }
 
@@ -168,27 +175,57 @@
         '$:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/gems/foo-1.0.0/lib")',
       ]
     end
+
+    it "works for gems with extensions and points to the vendored copies, not to the default copies" do
+      simulate_platform "arm64-darwin-23" do
+        base_system_gems "stringio", "psych", "etc", "shellwords", "open3", path: scoped_gem_path(bundled_app("bundle"))
+
+        build_gem "baz", "1.0.0", to_system: true, default: true, &:add_c_extension
+
+        build_repo4 do
+          build_gem "baz", "1.0.0", &:add_c_extension
+        end
+
+        gemfile <<-G
+          source "https://gem.repo4"
+          gem "baz"
+        G
+
+        bundle "config set --local path #{bundled_app("bundle")}"
+
+        bundle "lock", dir: cwd
+
+        bundle :install, standalone: true, dir: cwd, env: { "BUNDLER_GEM_DEFAULT_DIR" => system_gem_path.to_s }
+      end
+
+      load_path_lines = bundled_app("bundle/bundler/setup.rb").read.split("\n").select {|line| line.start_with?("$:.unshift") }
+
+      expect(load_path_lines).to eq [
+        '$:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/extensions/arm64-darwin-23/#{Gem.extension_api_version}/baz-1.0.0")',
+        '$:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/gems/baz-1.0.0/lib")',
+      ]
+    end
   end
 
   describe "with Gemfiles using absolute path sources and resulting bundle moved to a folder hierarchy with different nesting" do
     before do
-      build_lib "minitest", "1.0.0", :path => lib_path("minitest")
+      build_lib "minitest", "1.0.0", path: lib_path("minitest")
 
       Dir.mkdir bundled_app("app")
 
       gemfile bundled_app("app/Gemfile"), <<-G
-        source "#{file_uri_for(gem_repo1)}"
+        source "https://gem.repo1"
         gem "minitest", :path => "#{lib_path("minitest")}"
       G
 
-      bundle "install", :standalone => true, :dir => bundled_app("app")
+      bundle "install", standalone: true, dir: bundled_app("app")
 
       Dir.mkdir tmp("one_more_level")
       FileUtils.mv bundled_app, tmp("one_more_level")
     end
 
     it "also works" do
-      ruby <<-RUBY, :dir => tmp("one_more_level/bundled_app/app")
+      ruby <<-RUBY, dir: tmp("one_more_level/bundled_app/app")
         require "./bundle/bundler/setup"
 
         require "minitest"
@@ -200,24 +237,26 @@
     end
   end
 
+  let(:cwd) { bundled_app }
+
   describe "with Gemfiles using relative path sources and app moved to a different root" do
     before do
       FileUtils.mkdir_p bundled_app("app/vendor")
 
-      build_lib "minitest", "1.0.0", :path => bundled_app("app/vendor/minitest")
+      build_lib "minitest", "1.0.0", path: bundled_app("app/vendor/minitest")
 
       gemfile bundled_app("app/Gemfile"), <<-G
-        source "#{file_uri_for(gem_repo1)}"
+        source "https://gem.repo1"
         gem "minitest", :path => "vendor/minitest"
       G
 
-      bundle "install", :standalone => true, :dir => bundled_app("app")
+      bundle "install", standalone: true, dir: bundled_app("app")
 
       FileUtils.mv(bundled_app("app"), bundled_app2("app"))
     end
 
     it "also works" do
-      ruby <<-RUBY, :dir => bundled_app2("app")
+      ruby <<-RUBY, dir: bundled_app2("app")
         require "./bundle/bundler/setup"
 
         require "minitest"
@@ -232,8 +271,8 @@
   describe "with gems with native extension" do
     before do
       bundle "config set --local path #{bundled_app("bundle")}"
-      install_gemfile <<-G, :standalone => true, :dir => cwd
-        source "#{file_uri_for(gem_repo1)}"
+      install_gemfile <<-G, standalone: true, dir: cwd
+        source "https://gem.repo1"
         gem "very_simple_binary"
       G
     end
@@ -252,7 +291,7 @@
 
   describe "with gem that has an invalid gemspec" do
     before do
-      build_git "bar", :gemspec => false do |s|
+      build_git "bar", gemspec: false do |s|
         s.write "lib/bar/version.rb", %(BAR_VERSION = '1.0')
         s.write "bar.gemspec", <<-G
           lib = File.expand_path('lib/', __dir__)
@@ -270,15 +309,15 @@
         G
       end
       bundle "config set --local path #{bundled_app("bundle")}"
-      install_gemfile <<-G, :standalone => true, :dir => cwd, :raise_on_error => false
-        source "#{file_uri_for(gem_repo1)}"
+      install_gemfile <<-G, standalone: true, dir: cwd, raise_on_error: false
+        source "https://gem.repo1"
         gem "bar", :git => "#{lib_path("bar-1.0")}"
       G
     end
 
     it "outputs a helpful error message" do
       expect(err).to include("You have one or more invalid gemspecs that need to be fixed.")
-      expect(err).to include("bar 1.0 has an invalid gemspec")
+      expect(err).to include("bar.gemspec is not valid")
     end
   end
 
@@ -287,12 +326,12 @@
       build_git "devise", "1.0"
 
       gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
+        source "https://gem.repo1"
         gem "rails"
         gem "devise", :git => "#{lib_path("devise-1.0")}"
       G
       bundle "config set --local path #{bundled_app("bundle")}"
-      bundle :install, :standalone => true, :dir => cwd
+      bundle :install, standalone: true, dir: cwd
     end
 
     let(:expected_gems) do
@@ -311,16 +350,16 @@
       build_git "devise", "1.0"
 
       gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
+        source "https://gem.repo1"
         gem "rails"
 
         group :test do
           gem "rspec"
-          gem "rack-test"
+          gem "myrack-test"
         end
       G
       bundle "config set --local path #{bundled_app("bundle")}"
-      bundle :install, :standalone => true, :dir => cwd
+      bundle :install, standalone: true, dir: cwd
     end
 
     let(:expected_gems) do
@@ -334,7 +373,7 @@
 
     it "allows creating a standalone file with limited groups" do
       bundle "config set --local path #{bundled_app("bundle")}"
-      bundle :install, :standalone => "default", :dir => cwd
+      bundle :install, standalone: "default", dir: cwd
 
       load_error_ruby <<-RUBY, "spec"
         $:.unshift File.expand_path("bundle")
@@ -352,7 +391,7 @@
     it "allows `without` configuration to limit the groups used in a standalone" do
       bundle "config set --local path #{bundled_app("bundle")}"
       bundle "config set --local without test"
-      bundle :install, :standalone => true, :dir => cwd
+      bundle :install, standalone: true, dir: cwd
 
       load_error_ruby <<-RUBY, "spec"
         $:.unshift File.expand_path("bundle")
@@ -369,7 +408,7 @@
 
     it "allows `path` configuration to change the location of the standalone bundle" do
       bundle "config set --local path path/to/bundle"
-      bundle "install", :standalone => true, :dir => cwd
+      bundle "install", standalone: true, dir: cwd
 
       ruby <<-RUBY
         $:.unshift File.expand_path("path/to/bundle")
@@ -384,9 +423,9 @@
 
     it "allows `without` to limit the groups used in a standalone" do
       bundle "config set --local without test"
-      bundle :install, :dir => cwd
+      bundle :install, dir: cwd
       bundle "config set --local path #{bundled_app("bundle")}"
-      bundle :install, :standalone => true, :dir => cwd
+      bundle :install, standalone: true, dir: cwd
 
       load_error_ruby <<-RUBY, "spec"
         $:.unshift File.expand_path("bundle")
@@ -412,7 +451,7 @@
           gem "rails"
         G
         bundle "config set --local path #{bundled_app("bundle")}"
-        bundle :install, :standalone => true, :artifice => "endpoint", :dir => cwd
+        bundle :install, standalone: true, artifice: "endpoint", dir: cwd
       end
 
       let(:expected_gems) do
@@ -426,14 +465,14 @@
     end
   end
 
-  describe "with --binstubs", :bundler => "< 3" do
+  describe "with --binstubs" do
     before do
       gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
+        source "https://gem.repo1"
         gem "rails"
       G
       bundle "config set --local path #{bundled_app("bundle")}"
-      bundle :install, :standalone => true, :binstubs => true, :dir => cwd
+      bundle :install, standalone: true, binstubs: true, dir: cwd
     end
 
     let(:expected_gems) do
@@ -451,7 +490,7 @@
 
     it "creates stubs that can be executed from anywhere" do
       require "tmpdir"
-      sys_exec(%(#{bundled_app("bin/rails")} -v), :dir => Dir.tmpdir)
+      sys_exec(%(#{bundled_app("bin/rails")} -v), dir: Dir.tmpdir)
       expect(out).to eq("2.3.2")
     end
 
@@ -474,38 +513,55 @@
   end
 end
 
-RSpec.describe "bundle install --standalone" do
-  let(:cwd) { bundled_app }
-
-  include_examples("bundle install --standalone")
-end
-
 RSpec.describe "bundle install --standalone run in a subdirectory" do
   let(:cwd) { bundled_app("bob").tap(&:mkpath) }
 
-  include_examples("bundle install --standalone")
+  before do
+    gemfile <<-G
+      source "https://gem.repo1"
+      gem "rails"
+    G
+  end
+
+  it "generates the script in the proper place" do
+    bundle :install, standalone: true, dir: cwd
+
+    expect(bundled_app("bundle/bundler/setup.rb")).to exist
+  end
+
+  context "when path set to a relative path" do
+    before do
+      bundle "config set --local path bundle"
+    end
+
+    it "generates the script in the proper place" do
+      bundle :install, standalone: true, dir: cwd
+
+      expect(bundled_app("bundle/bundler/setup.rb")).to exist
+    end
+  end
 end
 
 RSpec.describe "bundle install --standalone --local" do
   before do
     gemfile <<-G
-      source "#{file_uri_for(gem_repo1)}"
-      gem "rack"
+      source "https://gem.repo1"
+      gem "myrack"
     G
 
-    system_gems "rack-1.0.0", :path => default_bundle_path
+    system_gems "myrack-1.0.0", path: default_bundle_path
   end
 
   it "generates script pointing to system gems" do
     bundle "install --standalone --local --verbose"
 
-    expect(out).to include("Using rack 1.0.0")
+    expect(out).to include("Using myrack 1.0.0")
 
     load_error_ruby <<-RUBY, "spec"
       require "./bundler/setup"
 
-      require "rack"
-      puts RACK
+      require "myrack"
+      puts MYRACK
       require "spec"
     RUBY
 
diff --git a/spec/bundler/install/gems/win32_spec.rb b/spec/bundler/install/gems/win32_spec.rb
index 419b14ff0ff772..be37673aa11957 100644
--- a/spec/bundler/install/gems/win32_spec.rb
+++ b/spec/bundler/install/gems/win32_spec.rb
@@ -4,22 +4,22 @@
   it "should read lockfile" do
     File.open(bundled_app_lock, "wb") do |f|
       f << "GEM\r\n"
-      f << "  remote: #{file_uri_for(gem_repo1)}/\r\n"
+      f << "  remote: https://gem.repo1/\r\n"
       f << "  specs:\r\n"
       f << "\r\n"
-      f << "    rack (1.0.0)\r\n"
+      f << "    myrack (1.0.0)\r\n"
       f << "\r\n"
       f << "PLATFORMS\r\n"
       f << "  ruby\r\n"
       f << "\r\n"
       f << "DEPENDENCIES\r\n"
-      f << "  rack\r\n"
+      f << "  myrack\r\n"
     end
 
     install_gemfile <<-G
-      source "#{file_uri_for(gem_repo1)}"
+      source "https://gem.repo1"
 
-      gem "rack"
+      gem "myrack"
     G
   end
 end
diff --git a/spec/bundler/install/gemspecs_spec.rb b/spec/bundler/install/gemspecs_spec.rb
index 7b58ea98391504..dee8e547e44a45 100644
--- a/spec/bundler/install/gemspecs_spec.rb
+++ b/spec/bundler/install/gemspecs_spec.rb
@@ -4,13 +4,13 @@
   describe "when a gem has a YAML gemspec" do
     before :each do
       build_repo2 do
-        build_gem "yaml_spec", :gemspec => :yaml
+        build_gem "yaml_spec", gemspec: :yaml
       end
     end
 
     it "still installs correctly" do
       gemfile <<-G
-        source "#{file_uri_for(gem_repo2)}"
+        source "https://gem.repo2"
         gem "yaml_spec"
       G
       bundle :install
@@ -18,10 +18,10 @@
     end
 
     it "still installs correctly when using path" do
-      build_lib "yaml_spec", :gemspec => :yaml
+      build_lib "yaml_spec", gemspec: :yaml
 
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
+        source "https://gem.repo1"
         gem 'yaml_spec', :path => "#{lib_path("yaml_spec-1.0")}"
       G
       expect(err).to be_empty
@@ -30,23 +30,23 @@
 
   it "should use gemspecs in the system cache when available" do
     gemfile <<-G
-      source "http://localtestserver.gem"
-      gem 'rack'
+      source "http://localgemserver.test"
+      gem 'myrack'
     G
 
-    system_gems "rack-1.0.0", :path => default_bundle_path
+    system_gems "myrack-1.0.0", path: default_bundle_path
 
     FileUtils.mkdir_p "#{default_bundle_path}/specifications"
-    File.open("#{default_bundle_path}/specifications/rack-1.0.0.gemspec", "w+") do |f|
+    File.open("#{default_bundle_path}/specifications/myrack-1.0.0.gemspec", "w+") do |f|
       spec = Gem::Specification.new do |s|
-        s.name = "rack"
+        s.name = "myrack"
         s.version = "1.0.0"
-        s.add_runtime_dependency "activesupport", "2.3.2"
+        s.add_dependency "activesupport", "2.3.2"
       end
       f.write spec.to_ruby
     end
-    bundle :install, :artifice => "endpoint_marshal_fail" # force gemspec load
-    expect(the_bundle).to include_gems "rack 1.0.0", "activesupport 2.3.2"
+    bundle :install, artifice: "endpoint_marshal_fail" # force gemspec load
+    expect(the_bundle).to include_gems "myrack 1.0.0", "activesupport 2.3.2"
   end
 
   it "does not hang when gemspec has incompatible encoding" do
@@ -59,8 +59,8 @@
       end
     G
 
-    install_gemfile <<-G, :env => { "LANG" => "C" }
-      source "#{file_uri_for(gem_repo1)}"
+    install_gemfile <<-G, env: { "LANG" => "C" }
+      source "https://gem.repo1"
       gemspec
     G
 
@@ -86,7 +86,7 @@ module Persistent💎
     G
 
     install_gemfile <<-G
-      source "#{file_uri_for(gem_repo1)}"
+      source "https://gem.repo1"
       gemspec
     G
 
@@ -95,43 +95,43 @@ module Persistent💎
 
   context "when ruby version is specified in gemspec and gemfile" do
     it "installs when patch level is not specified and the version matches",
-      :if => RUBY_PATCHLEVEL >= 0 do
-      build_lib("foo", :path => bundled_app) do |s|
+      if: RUBY_PATCHLEVEL >= 0 do
+      build_lib("foo", path: bundled_app) do |s|
         s.required_ruby_version = "~> #{RUBY_VERSION}.0"
       end
 
       install_gemfile <<-G
         ruby '#{RUBY_VERSION}', :engine_version => '#{RUBY_VERSION}', :engine => 'ruby'
-        source "#{file_uri_for(gem_repo1)}"
+        source "https://gem.repo1"
         gemspec
       G
       expect(the_bundle).to include_gems "foo 1.0"
     end
 
     it "installs when patch level is specified and the version still matches the current version",
-      :if => RUBY_PATCHLEVEL >= 0 do
-      build_lib("foo", :path => bundled_app) do |s|
+      if: RUBY_PATCHLEVEL >= 0 do
+      build_lib("foo", path: bundled_app) do |s|
         s.required_ruby_version = "#{RUBY_VERSION}.#{RUBY_PATCHLEVEL}"
       end
 
-      install_gemfile <<-G, :raise_on_error => false
+      install_gemfile <<-G, raise_on_error: false
         ruby '#{RUBY_VERSION}', :engine_version => '#{RUBY_VERSION}', :engine => 'ruby', :patchlevel => '#{RUBY_PATCHLEVEL}'
-        source "#{file_uri_for(gem_repo1)}"
+        source "https://gem.repo1"
         gemspec
       G
       expect(the_bundle).to include_gems "foo 1.0"
     end
 
     it "fails and complains about patchlevel on patchlevel mismatch",
-      :if => RUBY_PATCHLEVEL >= 0 do
+      if: RUBY_PATCHLEVEL >= 0 do
       patchlevel = RUBY_PATCHLEVEL.to_i + 1
-      build_lib("foo", :path => bundled_app) do |s|
+      build_lib("foo", path: bundled_app) do |s|
         s.required_ruby_version = "#{RUBY_VERSION}.#{patchlevel}"
       end
 
-      install_gemfile <<-G, :raise_on_error => false
+      install_gemfile <<-G, raise_on_error: false
         ruby '#{RUBY_VERSION}', :engine_version => '#{RUBY_VERSION}', :engine => 'ruby', :patchlevel => '#{patchlevel}'
-        source "#{file_uri_for(gem_repo1)}"
+        source "https://gem.repo1"
         gemspec
       G
 
@@ -143,13 +143,13 @@ module Persistent💎
     it "fails and complains about version on version mismatch" do
       version = Gem::Requirement.create(RUBY_VERSION).requirements.first.last.bump.version
 
-      build_lib("foo", :path => bundled_app) do |s|
+      build_lib("foo", path: bundled_app) do |s|
         s.required_ruby_version = version
       end
 
-      install_gemfile <<-G, :raise_on_error => false
+      install_gemfile <<-G, raise_on_error: false
         ruby '#{version}', :engine_version => '#{version}', :engine => 'ruby'
-        source "#{file_uri_for(gem_repo1)}"
+        source "https://gem.repo1"
         gemspec
       G
 
@@ -157,5 +157,25 @@ module Persistent💎
       expect(err).to include("but your Gemfile specified")
       expect(exitstatus).to eq(18)
     end
+
+    it "validates gemspecs just once when everything installed and lockfile up to date" do
+      build_lib "foo"
+
+      install_gemfile <<-G
+        source "https://gem.repo1"
+        gemspec path: "#{lib_path("foo-1.0")}"
+
+        module Monkey
+          def validate(spec)
+            puts "Validate called on \#{spec.full_name}"
+          end
+        end
+        Bundler.rubygems.extend(Monkey)
+      G
+
+      bundle "install"
+
+      expect(out).to include("Validate called on foo-1.0").once
+    end
   end
 end
diff --git a/spec/bundler/install/git_spec.rb b/spec/bundler/install/git_spec.rb
index 882f2a2d422767..f9d96e488f9dcd 100644
--- a/spec/bundler/install/git_spec.rb
+++ b/spec/bundler/install/git_spec.rb
@@ -3,64 +3,77 @@
 RSpec.describe "bundle install" do
   context "git sources" do
     it "displays the revision hash of the gem repository" do
-      build_git "foo", "1.0", :path => lib_path("foo")
+      build_git "foo", "1.0", path: lib_path("foo")
 
-      install_gemfile <<-G, :verbose => true
-        source "#{file_uri_for(gem_repo1)}"
-        gem "foo", :git => "#{file_uri_for(lib_path("foo"))}"
+      install_gemfile <<-G, verbose: true
+        source "https://gem.repo1"
+        gem "foo", :git => "#{lib_path("foo")}"
       G
 
-      expect(out).to include("Using foo 1.0 from #{file_uri_for(lib_path("foo"))} (at main@#{revision_for(lib_path("foo"))[0..6]})")
-      expect(the_bundle).to include_gems "foo 1.0", :source => "git@#{lib_path("foo")}"
+      expect(out).to include("Using foo 1.0 from #{lib_path("foo")} (at main@#{revision_for(lib_path("foo"))[0..6]})")
+      expect(the_bundle).to include_gems "foo 1.0", source: "git@#{lib_path("foo")}"
     end
 
-    it "displays the correct default branch", :git => ">= 2.28.0" do
-      build_git "foo", "1.0", :path => lib_path("foo"), :default_branch => "main"
+    it "displays the revision hash of the gem repository when passed a relative local path" do
+      build_git "foo", "1.0", path: lib_path("foo")
 
-      install_gemfile <<-G, :verbose => true
-        source "#{file_uri_for(gem_repo1)}"
-        gem "foo", :git => "#{file_uri_for(lib_path("foo"))}"
+      relative_path = lib_path("foo").relative_path_from(bundled_app)
+      install_gemfile <<-G, verbose: true
+        source "https://gem.repo1"
+        gem "foo", :git => "#{relative_path}"
       G
 
-      expect(out).to include("Using foo 1.0 from #{file_uri_for(lib_path("foo"))} (at main@#{revision_for(lib_path("foo"))[0..6]})")
-      expect(the_bundle).to include_gems "foo 1.0", :source => "git@#{lib_path("foo")}"
+      expect(out).to include("Using foo 1.0 from #{relative_path} (at main@#{revision_for(lib_path("foo"))[0..6]})")
+      expect(the_bundle).to include_gems "foo 1.0", source: "git@#{lib_path("foo")}"
+    end
+
+    it "displays the correct default branch", git: ">= 2.28.0" do
+      build_git "foo", "1.0", path: lib_path("foo"), default_branch: "non-standard"
+
+      install_gemfile <<-G, verbose: true
+        source "https://gem.repo1"
+        gem "foo", :git => "#{lib_path("foo")}"
+      G
+
+      expect(out).to include("Using foo 1.0 from #{lib_path("foo")} (at non-standard@#{revision_for(lib_path("foo"))[0..6]})")
+      expect(the_bundle).to include_gems "foo 1.0", source: "git@#{lib_path("foo")}"
     end
 
     it "displays the ref of the gem repository when using branch~num as a ref" do
       skip "maybe branch~num notation doesn't work on Windows' git" if Gem.win_platform?
 
-      build_git "foo", "1.0", :path => lib_path("foo")
+      build_git "foo", "1.0", path: lib_path("foo")
       rev = revision_for(lib_path("foo"))[0..6]
-      update_git "foo", "2.0", :path => lib_path("foo"), :gemspec => true
+      update_git "foo", "2.0", path: lib_path("foo"), gemspec: true
       rev2 = revision_for(lib_path("foo"))[0..6]
-      update_git "foo", "3.0", :path => lib_path("foo"), :gemspec => true
+      update_git "foo", "3.0", path: lib_path("foo"), gemspec: true
 
-      install_gemfile <<-G, :verbose => true
-        source "#{file_uri_for(gem_repo1)}"
-        gem "foo", :git => "#{file_uri_for(lib_path("foo"))}", :ref => "main~2"
+      install_gemfile <<-G, verbose: true
+        source "https://gem.repo1"
+        gem "foo", :git => "#{lib_path("foo")}", :ref => "main~2"
       G
 
-      expect(out).to include("Using foo 1.0 from #{file_uri_for(lib_path("foo"))} (at main~2@#{rev})")
-      expect(the_bundle).to include_gems "foo 1.0", :source => "git@#{lib_path("foo")}"
+      expect(out).to include("Using foo 1.0 from #{lib_path("foo")} (at main~2@#{rev})")
+      expect(the_bundle).to include_gems "foo 1.0", source: "git@#{lib_path("foo")}"
 
-      update_git "foo", "4.0", :path => lib_path("foo"), :gemspec => true
+      update_git "foo", "4.0", path: lib_path("foo"), gemspec: true
 
-      bundle :update, :all => true, :verbose => true
-      expect(out).to include("Using foo 2.0 (was 1.0) from #{file_uri_for(lib_path("foo"))} (at main~2@#{rev2})")
-      expect(the_bundle).to include_gems "foo 2.0", :source => "git@#{lib_path("foo")}"
+      bundle :update, all: true, verbose: true
+      expect(out).to include("Using foo 2.0 (was 1.0) from #{lib_path("foo")} (at main~2@#{rev2})")
+      expect(the_bundle).to include_gems "foo 2.0", source: "git@#{lib_path("foo")}"
     end
 
-    it "should allows git repos that are missing but not being installed" do
+    it "allows git repos that are missing but not being installed" do
       revision = build_git("foo").ref_for("HEAD")
 
       gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
-        gem "foo", :git => "#{file_uri_for(lib_path("foo-1.0"))}", :group => :development
+        source "https://gem.repo1"
+        gem "foo", :git => "#{lib_path("foo-1.0")}", :group => :development
       G
 
       lockfile <<-L
         GIT
-          remote: #{file_uri_for(lib_path("foo-1.0"))}
+          remote: #{lib_path("foo-1.0")}
           revision: #{revision}
           specs:
             foo (1.0)
@@ -81,15 +94,15 @@
 
     it "allows multiple gems from the same git source" do
       build_repo2 do
-        build_lib "foo", "1.0", :path => lib_path("gems/foo")
-        build_lib "zebra", "2.0", :path => lib_path("gems/zebra")
-        build_git "gems", :path => lib_path("gems"), :gemspec => false
+        build_lib "foo", "1.0", path: lib_path("gems/foo")
+        build_lib "zebra", "2.0", path: lib_path("gems/zebra")
+        build_git "gems", path: lib_path("gems"), gemspec: false
       end
 
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo2)}"
-        gem "foo", :git => "#{file_uri_for(lib_path("gems"))}", :glob => "foo/*.gemspec"
-        gem "zebra", :git => "#{file_uri_for(lib_path("gems"))}", :glob => "zebra/*.gemspec"
+        source "https://gem.repo2"
+        gem "foo", :git => "#{lib_path("gems")}", :glob => "foo/*.gemspec"
+        gem "zebra", :git => "#{lib_path("gems")}", :glob => "zebra/*.gemspec"
       G
 
       bundle "info foo"
@@ -106,13 +119,13 @@
 
       # NOTE: both gems MUST have the same path! It has to be two gems in one repo.
 
-      test = build_git "test", "1.0.0", :path => lib_path("test-and-other")
-      other = build_git "other", "1.0.0", :path => lib_path("test-and-other")
+      test = build_git "test", "1.0.0", path: lib_path("test-and-other")
+      other = build_git "other", "1.0.0", path: lib_path("test-and-other")
       test_ref = test.ref_for("HEAD")
       other_ref = other.ref_for("HEAD")
 
       gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
+        source "https://gem.repo1"
 
         gem "test", git: #{test.path.to_s.inspect}
         gem "other", ref: #{other_ref.inspect}, git: #{other.path.to_s.inspect}
@@ -133,7 +146,7 @@
             other (1.0.0)
 
         GEM
-          remote: #{file_uri_for(gem_repo1)}/
+          remote: https://gem.repo1/
           specs:
 
         PLATFORMS
@@ -170,5 +183,111 @@
 
       expect(out).to include("Bundle complete!")
     end
+
+    it "allows older revisions of git source when clean true" do
+      build_git "foo", "1.0", path: lib_path("foo")
+      rev = revision_for(lib_path("foo"))
+
+      bundle "config set path vendor/bundle"
+      bundle "config set clean true"
+      install_gemfile <<-G, verbose: true
+        source "https://gem.repo1"
+        gem "foo", :git => "#{lib_path("foo")}"
+      G
+
+      expect(out).to include("Using foo 1.0 from #{lib_path("foo")} (at main@#{rev[0..6]})")
+      expect(the_bundle).to include_gems "foo 1.0", source: "git@#{lib_path("foo")}"
+
+      old_lockfile = lockfile
+
+      update_git "foo", "2.0", path: lib_path("foo"), gemspec: true
+      rev2 = revision_for(lib_path("foo"))
+
+      bundle :update, all: true, verbose: true
+      expect(out).to include("Using foo 2.0 (was 1.0) from #{lib_path("foo")} (at main@#{rev2[0..6]})")
+      expect(out).to include("Removing foo (#{rev[0..11]})")
+      expect(the_bundle).to include_gems "foo 2.0", source: "git@#{lib_path("foo")}"
+
+      lockfile(old_lockfile)
+
+      bundle :install, verbose: true
+      expect(out).to include("Using foo 1.0 from #{lib_path("foo")} (at main@#{rev[0..6]})")
+      expect(the_bundle).to include_gems "foo 1.0", source: "git@#{lib_path("foo")}"
+    end
+
+    context "when install directory exists" do
+      let(:checkout_confirmation_log_message) { "Checking out revision" }
+      let(:using_foo_confirmation_log_message) { "Using foo 1.0 from #{lib_path("foo")} (at main@#{revision_for(lib_path("foo"))[0..6]})" }
+
+      context "and no contents besides .git directory are present" do
+        it "reinstalls gem" do
+          build_git "foo", "1.0", path: lib_path("foo")
+
+          gemfile = <<-G
+            source "https://gem.repo1"
+            gem "foo", :git => "#{lib_path("foo")}"
+          G
+
+          install_gemfile gemfile, verbose: true
+
+          expect(out).to include(checkout_confirmation_log_message)
+          expect(out).to include(using_foo_confirmation_log_message)
+          expect(the_bundle).to include_gems "foo 1.0", source: "git@#{lib_path("foo")}"
+
+          # validate that the installed directory exists and has some expected contents
+          install_directory = default_bundle_path("bundler/gems/foo-#{revision_for(lib_path("foo"))[0..11]}")
+          dot_git_directory = install_directory.join(".git")
+          lib_directory = install_directory.join("lib")
+          gemspec = install_directory.join("foo.gemspec")
+          expect([install_directory, dot_git_directory, lib_directory, gemspec]).to all exist
+
+          # remove all elements in the install directory except .git directory
+          FileUtils.rm_r(lib_directory)
+          gemspec.delete
+
+          expect(dot_git_directory).to exist
+          expect(lib_directory).not_to exist
+          expect(gemspec).not_to exist
+
+          # rerun bundle install
+          install_gemfile gemfile, verbose: true
+
+          expect(out).to include(checkout_confirmation_log_message)
+          expect(out).to include(using_foo_confirmation_log_message)
+          expect(the_bundle).to include_gems "foo 1.0", source: "git@#{lib_path("foo")}"
+
+          # validate that it reinstalls all components
+          expect([install_directory, dot_git_directory, lib_directory, gemspec]).to all exist
+        end
+      end
+
+      context "and contents besides .git directory are present" do
+        # we want to confirm that the change to try to detect partial installs and reinstall does not
+        # result in repeatedly reinstalling the gem when it is fully installed
+        it "does not reinstall gem" do
+          build_git "foo", "1.0", path: lib_path("foo")
+
+          gemfile = <<-G
+            source "https://gem.repo1"
+            gem "foo", :git => "#{lib_path("foo")}"
+          G
+
+          install_gemfile gemfile, verbose: true
+
+          expect(out).to include(checkout_confirmation_log_message)
+          expect(out).to include(using_foo_confirmation_log_message)
+          expect(the_bundle).to include_gems "foo 1.0", source: "git@#{lib_path("foo")}"
+
+          # rerun bundle install
+          install_gemfile gemfile, verbose: true
+
+          # it isn't altogether straight-forward to validate that bundle didn't do soething on the second run, however,
+          # the presence of the 2nd log message confirms install got past the point that it would have logged the above if
+          # it was going to
+          expect(out).not_to include(checkout_confirmation_log_message)
+          expect(out).to include(using_foo_confirmation_log_message)
+        end
+      end
+    end
   end
 end
diff --git a/spec/bundler/install/global_cache_spec.rb b/spec/bundler/install/global_cache_spec.rb
index be34d8b5bc9363..884112d62109a6 100644
--- a/spec/bundler/install/global_cache_spec.rb
+++ b/spec/bundler/install/global_cache_spec.rb
@@ -7,174 +7,217 @@
     let(:source)  { "http://localgemserver.test" }
     let(:source2) { "http://gemserver.example.org" }
 
+    def cache_base
+      home(".bundle", "cache", "gems")
+    end
+
     def source_global_cache(*segments)
-      home(".bundle", "cache", "gems", "localgemserver.test.80.dd34752a738ee965a2a4298dc16db6c5", *segments)
+      cache_base.join("localgemserver.test.80.dd34752a738ee965a2a4298dc16db6c5", *segments)
     end
 
     def source2_global_cache(*segments)
-      home(".bundle", "cache", "gems", "gemserver.example.org.80.1ae1663619ffe0a3c9d97712f44c705b", *segments)
+      cache_base.join("gemserver.example.org.80.1ae1663619ffe0a3c9d97712f44c705b", *segments)
     end
 
     it "caches gems into the global cache on download" do
-      install_gemfile <<-G, :artifice => "compact_index"
+      install_gemfile <<-G, artifice: "compact_index"
         source "#{source}"
-        gem "rack"
+        gem "myrack"
       G
 
-      expect(the_bundle).to include_gems "rack 1.0.0"
-      expect(source_global_cache("rack-1.0.0.gem")).to exist
+      expect(the_bundle).to include_gems "myrack 1.0.0"
+      expect(source_global_cache("myrack-1.0.0.gem")).to exist
     end
 
     it "uses globally cached gems if they exist" do
       source_global_cache.mkpath
-      FileUtils.cp(gem_repo1("gems/rack-1.0.0.gem"), source_global_cache("rack-1.0.0.gem"))
+      FileUtils.cp(gem_repo1("gems/myrack-1.0.0.gem"), source_global_cache("myrack-1.0.0.gem"))
 
-      install_gemfile <<-G, :artifice => "compact_index_no_gem"
+      install_gemfile <<-G, artifice: "compact_index_no_gem"
         source "#{source}"
-        gem "rack"
+        gem "myrack"
       G
 
-      expect(the_bundle).to include_gems "rack 1.0.0"
+      expect(the_bundle).to include_gems "myrack 1.0.0"
     end
 
     it "shows a proper error message if a cached gem is corrupted" do
       source_global_cache.mkpath
-      FileUtils.touch(source_global_cache("rack-1.0.0.gem"))
+      FileUtils.touch(source_global_cache("myrack-1.0.0.gem"))
 
-      install_gemfile <<-G, :artifice => "compact_index_no_gem", :raise_on_error => false
+      install_gemfile <<-G, artifice: "compact_index_no_gem", raise_on_error: false
         source "#{source}"
-        gem "rack"
+        gem "myrack"
       G
 
-      expect(err).to include("Gem::Package::FormatError: package metadata is missing in #{source_global_cache("rack-1.0.0.gem")}")
+      expect(err).to include("Gem::Package::FormatError: package metadata is missing in #{source_global_cache("myrack-1.0.0.gem")}")
+    end
+
+    it "uses a shorter path for the cache to not hit filesystem limits" do
+      install_gemfile <<-G, artifice: "compact_index", verbose: true
+        source "http://#{"a" * 255}.test"
+        gem "myrack"
+      G
+
+      expect(the_bundle).to include_gems "myrack 1.0.0"
+      source_segment = "a" * 222 + ".a3cb26de2edfce9f509a65c611d99c4b"
+      source_cache = cache_base.join(source_segment)
+      cached_gem = source_cache.join("myrack-1.0.0.gem")
+      expect(cached_gem).to exist
+    ensure
+      # We cleanup dummy files created by this spec manually because due to a
+      # Ruby on Windows bug, `FileUtils.rm_rf` (run in our global after hook)
+      # cannot traverse directories with such long names. So we delete
+      # everything explicitly to workaround the bug. An alternative workaround
+      # would be to shell out to `rm -rf`. That also works fine, but I went with
+      # the more verbose and explicit approach. This whole ensure block can be
+      # removed once/if https://bugs.ruby-lang.org/issues/21177 is fixed, and
+      # once the fix propagates to all supported rubies.
+      File.delete cached_gem
+      Dir.rmdir source_cache
+
+      File.delete compact_index_cache_path.join(source_segment, "info", "myrack")
+      Dir.rmdir compact_index_cache_path.join(source_segment, "info")
+      File.delete compact_index_cache_path.join(source_segment, "info-etags", "myrack-92f3313ce5721296f14445c3a6b9c073")
+      Dir.rmdir compact_index_cache_path.join(source_segment, "info-etags")
+      Dir.rmdir compact_index_cache_path.join(source_segment, "info-special-characters")
+      File.delete compact_index_cache_path.join(source_segment, "versions")
+      File.delete compact_index_cache_path.join(source_segment, "versions.etag")
+      Dir.rmdir compact_index_cache_path.join(source_segment)
     end
 
     describe "when the same gem from different sources is installed" do
       it "should use the appropriate one from the global cache" do
-        install_gemfile <<-G, :artifice => "compact_index"
+        bundle "config path.system true"
+
+        install_gemfile <<-G, artifice: "compact_index"
           source "#{source}"
-          gem "rack"
+          gem "myrack"
         G
 
-        simulate_new_machine
-        expect(the_bundle).not_to include_gems "rack 1.0.0"
-        expect(source_global_cache("rack-1.0.0.gem")).to exist
-        # rack 1.0.0 is not installed and it is in the global cache
+        pristine_system_gems :bundler
+        expect(the_bundle).not_to include_gems "myrack 1.0.0"
+        expect(source_global_cache("myrack-1.0.0.gem")).to exist
+        # myrack 1.0.0 is not installed and it is in the global cache
 
-        install_gemfile <<-G, :artifice => "compact_index"
+        install_gemfile <<-G, artifice: "compact_index"
           source "#{source2}"
-          gem "rack", "0.9.1"
+          gem "myrack", "0.9.1"
         G
 
-        simulate_new_machine
-        expect(the_bundle).not_to include_gems "rack 0.9.1"
-        expect(source2_global_cache("rack-0.9.1.gem")).to exist
-        # rack 0.9.1 is not installed and it is in the global cache
+        pristine_system_gems :bundler
+        expect(the_bundle).not_to include_gems "myrack 0.9.1"
+        expect(source2_global_cache("myrack-0.9.1.gem")).to exist
+        # myrack 0.9.1 is not installed and it is in the global cache
 
         gemfile <<-G
           source "#{source}"
-          gem "rack", "1.0.0"
+          gem "myrack", "1.0.0"
         G
 
-        bundle :install, :artifice => "compact_index_no_gem"
-        # rack 1.0.0 is installed and rack 0.9.1 is not
-        expect(the_bundle).to include_gems "rack 1.0.0"
-        expect(the_bundle).not_to include_gems "rack 0.9.1"
-        simulate_new_machine
+        bundle :install, artifice: "compact_index_no_gem"
+        # myrack 1.0.0 is installed and myrack 0.9.1 is not
+        expect(the_bundle).to include_gems "myrack 1.0.0"
+        expect(the_bundle).not_to include_gems "myrack 0.9.1"
+        pristine_system_gems :bundler
 
         gemfile <<-G
           source "#{source2}"
-          gem "rack", "0.9.1"
+          gem "myrack", "0.9.1"
         G
 
-        bundle :install, :artifice => "compact_index_no_gem"
-        # rack 0.9.1 is installed and rack 1.0.0 is not
-        expect(the_bundle).to include_gems "rack 0.9.1"
-        expect(the_bundle).not_to include_gems "rack 1.0.0"
+        bundle :install, artifice: "compact_index_no_gem"
+        # myrack 0.9.1 is installed and myrack 1.0.0 is not
+        expect(the_bundle).to include_gems "myrack 0.9.1"
+        expect(the_bundle).not_to include_gems "myrack 1.0.0"
       end
 
       it "should not install if the wrong source is provided" do
+        bundle "config path.system true"
+
         gemfile <<-G
           source "#{source}"
-          gem "rack"
+          gem "myrack"
         G
 
-        bundle :install, :artifice => "compact_index"
-        simulate_new_machine
-        expect(the_bundle).not_to include_gems "rack 1.0.0"
-        expect(source_global_cache("rack-1.0.0.gem")).to exist
-        # rack 1.0.0 is not installed and it is in the global cache
+        bundle :install, artifice: "compact_index"
+        pristine_system_gems :bundler
+        expect(the_bundle).not_to include_gems "myrack 1.0.0"
+        expect(source_global_cache("myrack-1.0.0.gem")).to exist
+        # myrack 1.0.0 is not installed and it is in the global cache
 
         gemfile <<-G
           source "#{source2}"
-          gem "rack", "0.9.1"
+          gem "myrack", "0.9.1"
         G
 
-        bundle :install, :artifice => "compact_index"
-        simulate_new_machine
-        expect(the_bundle).not_to include_gems "rack 0.9.1"
-        expect(source2_global_cache("rack-0.9.1.gem")).to exist
-        # rack 0.9.1 is not installed and it is in the global cache
+        bundle :install, artifice: "compact_index"
+        pristine_system_gems :bundler
+        expect(the_bundle).not_to include_gems "myrack 0.9.1"
+        expect(source2_global_cache("myrack-0.9.1.gem")).to exist
+        # myrack 0.9.1 is not installed and it is in the global cache
 
         gemfile <<-G
           source "#{source2}"
-          gem "rack", "1.0.0"
+          gem "myrack", "1.0.0"
         G
 
-        expect(source_global_cache("rack-1.0.0.gem")).to exist
-        expect(source2_global_cache("rack-0.9.1.gem")).to exist
-        bundle :install, :artifice => "compact_index_no_gem", :raise_on_error => false
+        expect(source_global_cache("myrack-1.0.0.gem")).to exist
+        expect(source2_global_cache("myrack-0.9.1.gem")).to exist
+        bundle :install, artifice: "compact_index_no_gem", raise_on_error: false
         expect(err).to include("Internal Server Error 500")
         expect(err).not_to include("ERROR REPORT TEMPLATE")
 
-        # rack 1.0.0 is not installed and rack 0.9.1 is not
-        expect(the_bundle).not_to include_gems "rack 1.0.0"
-        expect(the_bundle).not_to include_gems "rack 0.9.1"
+        # myrack 1.0.0 is not installed and myrack 0.9.1 is not
+        expect(the_bundle).not_to include_gems "myrack 1.0.0"
+        expect(the_bundle).not_to include_gems "myrack 0.9.1"
 
         gemfile <<-G
           source "#{source}"
-          gem "rack", "0.9.1"
+          gem "myrack", "0.9.1"
         G
 
-        expect(source_global_cache("rack-1.0.0.gem")).to exist
-        expect(source2_global_cache("rack-0.9.1.gem")).to exist
-        bundle :install, :artifice => "compact_index_no_gem", :raise_on_error => false
+        expect(source_global_cache("myrack-1.0.0.gem")).to exist
+        expect(source2_global_cache("myrack-0.9.1.gem")).to exist
+        bundle :install, artifice: "compact_index_no_gem", raise_on_error: false
         expect(err).to include("Internal Server Error 500")
         expect(err).not_to include("ERROR REPORT TEMPLATE")
 
-        # rack 0.9.1 is not installed and rack 1.0.0 is not
-        expect(the_bundle).not_to include_gems "rack 0.9.1"
-        expect(the_bundle).not_to include_gems "rack 1.0.0"
+        # myrack 0.9.1 is not installed and myrack 1.0.0 is not
+        expect(the_bundle).not_to include_gems "myrack 0.9.1"
+        expect(the_bundle).not_to include_gems "myrack 1.0.0"
       end
     end
 
     describe "when installing gems from a different directory" do
       it "uses the global cache as a source" do
-        install_gemfile <<-G, :artifice => "compact_index"
+        bundle "config path.system true"
+
+        install_gemfile <<-G, artifice: "compact_index"
           source "#{source}"
-          gem "rack"
+          gem "myrack"
           gem "activesupport"
         G
 
         # Both gems are installed and in the global cache
-        expect(the_bundle).to include_gems "rack 1.0.0"
+        expect(the_bundle).to include_gems "myrack 1.0.0"
         expect(the_bundle).to include_gems "activesupport 2.3.5"
-        expect(source_global_cache("rack-1.0.0.gem")).to exist
+        expect(source_global_cache("myrack-1.0.0.gem")).to exist
         expect(source_global_cache("activesupport-2.3.5.gem")).to exist
-        simulate_new_machine
+        pristine_system_gems :bundler
         # Both gems are now only in the global cache
-        expect(the_bundle).not_to include_gems "rack 1.0.0"
+        expect(the_bundle).not_to include_gems "myrack 1.0.0"
         expect(the_bundle).not_to include_gems "activesupport 2.3.5"
 
-        install_gemfile <<-G, :artifice => "compact_index_no_gem"
+        install_gemfile <<-G, artifice: "compact_index_no_gem"
           source "#{source}"
-          gem "rack"
+          gem "myrack"
         G
 
-        # rack is installed and both are in the global cache
-        expect(the_bundle).to include_gems "rack 1.0.0"
+        # myrack is installed and both are in the global cache
+        expect(the_bundle).to include_gems "myrack 1.0.0"
         expect(the_bundle).not_to include_gems "activesupport 2.3.5"
-        expect(source_global_cache("rack-1.0.0.gem")).to exist
+        expect(source_global_cache("myrack-1.0.0.gem")).to exist
         expect(source_global_cache("activesupport-2.3.5.gem")).to exist
 
         create_file bundled_app2("gems.rb"), <<-G
@@ -183,22 +226,20 @@ def source2_global_cache(*segments)
         G
 
         # Neither gem is installed and both are in the global cache
-        expect(the_bundle).not_to include_gems "rack 1.0.0", :dir => bundled_app2
-        expect(the_bundle).not_to include_gems "activesupport 2.3.5", :dir => bundled_app2
-        expect(source_global_cache("rack-1.0.0.gem")).to exist
+        expect(the_bundle).not_to include_gems "myrack 1.0.0", dir: bundled_app2
+        expect(the_bundle).not_to include_gems "activesupport 2.3.5", dir: bundled_app2
+        expect(source_global_cache("myrack-1.0.0.gem")).to exist
         expect(source_global_cache("activesupport-2.3.5.gem")).to exist
 
         # Install using the global cache instead of by downloading the .gem
         # from the server
-        bundle :install, :artifice => "compact_index_no_gem", :dir => bundled_app2
+        bundle :install, artifice: "compact_index_no_gem", dir: bundled_app2
 
         # activesupport is installed and both are in the global cache
-        simulate_bundler_version_when_missing_prerelease_default_gem_activation do
-          expect(the_bundle).not_to include_gems "rack 1.0.0", :dir => bundled_app2
-          expect(the_bundle).to include_gems "activesupport 2.3.5", :dir => bundled_app2
-        end
+        expect(the_bundle).not_to include_gems "myrack 1.0.0", dir: bundled_app2
+        expect(the_bundle).to include_gems "activesupport 2.3.5", dir: bundled_app2
 
-        expect(source_global_cache("rack-1.0.0.gem")).to exist
+        expect(source_global_cache("myrack-1.0.0.gem")).to exist
         expect(source_global_cache("activesupport-2.3.5.gem")).to exist
       end
     end
@@ -207,13 +248,14 @@ def source2_global_cache(*segments)
   describe "extension caching" do
     it "works" do
       skip "gets incorrect ref in path" if Gem.win_platform?
+      skip "fails for unknown reason when run by ruby-core" if ruby_core?
 
       build_git "very_simple_git_binary", &:add_c_extension
       build_lib "very_simple_path_binary", &:add_c_extension
       revision = revision_for(lib_path("very_simple_git_binary-1.0"))[0, 12]
 
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
+        source "https://gem.repo1"
 
         gem "very_simple_binary"
         gem "very_simple_git_binary", :git => "#{lib_path("very_simple_git_binary-1.0")}"
@@ -221,7 +263,7 @@ def source2_global_cache(*segments)
       G
 
       gem_binary_cache = home(".bundle", "cache", "extensions", local_platform.to_s, Bundler.ruby_scope,
-        Digest(:MD5).hexdigest("#{gem_repo1}/"), "very_simple_binary-1.0")
+        "gem.repo1.443.#{Digest(:MD5).hexdigest("gem.repo1.443./")}", "very_simple_binary-1.0")
       git_binary_cache = home(".bundle", "cache", "extensions", local_platform.to_s, Bundler.ruby_scope,
         "very_simple_git_binary-1.0-#{revision}", "very_simple_git_binary-1.0")
 
@@ -234,7 +276,7 @@ def source2_global_cache(*segments)
       R
       expect(out).to eq "VERY_SIMPLE_BINARY_IN_C\nVERY_SIMPLE_GIT_BINARY_IN_C"
 
-      FileUtils.rm Dir[home(".bundle", "cache", "extensions", "**", "*binary_c*")]
+      FileUtils.rm_r Dir[home(".bundle", "cache", "extensions", "**", "*binary_c*")]
 
       gem_binary_cache.join("very_simple_binary_c.rb").open("w") {|f| f << "puts File.basename(__FILE__)" }
       git_binary_cache.join("very_simple_git_binary_c.rb").open("w") {|f| f << "puts File.basename(__FILE__)" }
diff --git a/spec/bundler/install/path_spec.rb b/spec/bundler/install/path_spec.rb
index bd5385b2659c3d..0ede8df8ffcdf9 100644
--- a/spec/bundler/install/path_spec.rb
+++ b/spec/bundler/install/path_spec.rb
@@ -3,27 +3,27 @@
 RSpec.describe "bundle install" do
   describe "with path configured" do
     before :each do
-      build_gem "rack", "1.0.0", :to_system => true do |s|
-        s.write "lib/rack.rb", "puts 'FAIL'"
+      build_gem "myrack", "1.0.0", to_system: true do |s|
+        s.write "lib/myrack.rb", "puts 'FAIL'"
       end
 
       gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
-        gem "rack"
+        source "https://gem.repo1"
+        gem "myrack"
       G
     end
 
     it "does not use available system gems with `vendor/bundle" do
       bundle "config set --local path vendor/bundle"
       bundle :install
-      expect(the_bundle).to include_gems "rack 1.0.0"
+      expect(the_bundle).to include_gems "myrack 1.0.0"
     end
 
     it "uses system gems with `path.system` configured with more priority than `path`" do
       bundle "config set --local path.system true"
       bundle "config set --global path vendor/bundle"
       bundle :install
-      run "require 'rack'", :raise_on_error => false
+      run "require 'myrack'", raise_on_error: false
       expect(out).to include("FAIL")
     end
 
@@ -32,7 +32,7 @@
       dir.mkpath
 
       bundle "config set --local path #{dir.join("vendor/bundle")}"
-      bundle :install, :dir => dir
+      bundle :install, dir: dir
       expect(out).to include("installed into `./vendor/bundle`")
 
       dir.rmtree
@@ -44,56 +44,68 @@
       expect(out).to include("gems are installed into `./vendor/bundle`")
     end
 
-    it "disallows --path vendor/bundle --system", :bundler => "< 3" do
-      bundle "install --path vendor/bundle --system", :raise_on_error => false
+    it "disallows --path vendor/bundle --system" do
+      bundle "install --path vendor/bundle --system", raise_on_error: false
       expect(err).to include("Please choose only one option.")
       expect(exitstatus).to eq(15)
     end
 
-    it "remembers to disable system gems after the first time with bundle --path vendor/bundle", :bundler => "< 3" do
+    it "remembers to disable system gems after the first time with bundle --path vendor/bundle" do
       bundle "install --path vendor/bundle"
-      FileUtils.rm_rf bundled_app("vendor")
+      FileUtils.rm_r bundled_app("vendor")
       bundle "install"
 
-      expect(vendored_gems("gems/rack-1.0.0")).to be_directory
-      expect(the_bundle).to include_gems "rack 1.0.0"
+      expect(vendored_gems("gems/myrack-1.0.0")).to be_directory
+      expect(the_bundle).to include_gems "myrack 1.0.0"
     end
 
-    context "with path_relative_to_cwd set to true" do
-      before { bundle "config set path_relative_to_cwd true" }
+    it "installs the bundle relatively to repository root, when Bundler run from the same directory" do
+      bundle "config path vendor/bundle", dir: bundled_app.parent
+      bundle "install --gemfile='#{bundled_app}/Gemfile'", dir: bundled_app.parent
+      expect(out).to include("installed into `./bundled_app/vendor/bundle`")
+      expect(bundled_app("vendor/bundle")).to be_directory
+      expect(the_bundle).to include_gems "myrack 1.0.0"
+    end
 
-      it "installs the bundle relatively to current working directory", :bundler => "< 3" do
-        bundle "install --gemfile='#{bundled_app}/Gemfile' --path vendor/bundle", :dir => bundled_app.parent
-        expect(out).to include("installed into `./vendor/bundle`")
-        expect(bundled_app("../vendor/bundle")).to be_directory
-        expect(the_bundle).to include_gems "rack 1.0.0"
-      end
+    it "installs the bundle relatively to repository root, when Bundler run from a different directory" do
+      bundle "config path vendor/bundle", dir: bundled_app
+      bundle "install --gemfile='#{bundled_app}/Gemfile'", dir: bundled_app.parent
+      expect(out).to include("installed into `./bundled_app/vendor/bundle`")
+      expect(bundled_app("vendor/bundle")).to be_directory
+      expect(the_bundle).to include_gems "myrack 1.0.0"
+    end
 
-      it "installs the standalone bundle relative to the cwd" do
-        bundle :install, :gemfile => bundled_app_gemfile, :standalone => true, :dir => bundled_app.parent
-        expect(out).to include("installed into `./bundled_app/bundle`")
-        expect(bundled_app("bundle")).to be_directory
-        expect(bundled_app("bundle/ruby")).to be_directory
+    it "installs the bundle relatively to Gemfile folder, when repository root can't be inferred from settings" do
+      bundle "install --gemfile='#{bundled_app}/Gemfile' --path vendor/bundle", dir: bundled_app.parent
+      expect(out).to include("installed into `./bundled_app/vendor/bundle`")
+      expect(bundled_app("vendor/bundle")).to be_directory
+      expect(the_bundle).to include_gems "myrack 1.0.0"
+    end
 
-        bundle "config unset path"
+    it "installs the standalone bundle relative to the cwd" do
+      bundle :install, gemfile: bundled_app_gemfile, standalone: true, dir: bundled_app.parent
+      expect(out).to include("installed into `./bundled_app/bundle`")
+      expect(bundled_app("bundle")).to be_directory
+      expect(bundled_app("bundle/ruby")).to be_directory
 
-        bundle :install, :gemfile => bundled_app_gemfile, :standalone => true, :dir => bundled_app("subdir").tap(&:mkpath)
-        expect(out).to include("installed into `../bundle`")
-        expect(bundled_app("bundle")).to be_directory
-        expect(bundled_app("bundle/ruby")).to be_directory
-      end
+      bundle "config unset path"
+
+      bundle :install, gemfile: bundled_app_gemfile, standalone: true, dir: bundled_app("subdir").tap(&:mkpath)
+      expect(out).to include("installed into `../bundle`")
+      expect(bundled_app("bundle")).to be_directory
+      expect(bundled_app("bundle/ruby")).to be_directory
     end
   end
 
   describe "when BUNDLE_PATH or the global path config is set" do
     before :each do
-      build_lib "rack", "1.0.0", :to_system => true do |s|
-        s.write "lib/rack.rb", "raise 'FAIL'"
+      build_lib "myrack", "1.0.0", to_system: true do |s|
+        s.write "lib/myrack.rb", "raise 'FAIL'"
       end
 
       gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
-        gem "rack"
+        source "https://gem.repo1"
+        gem "myrack"
       G
     end
 
@@ -112,9 +124,9 @@ def set_bundle_path(type, location)
           bundle "config set --local path vendor/bundle"
           bundle :install
 
-          expect(vendored_gems("gems/rack-1.0.0")).to be_directory
+          expect(vendored_gems("gems/myrack-1.0.0")).to be_directory
           expect(bundled_app("vendor2")).not_to be_directory
-          expect(the_bundle).to include_gems "rack 1.0.0"
+          expect(the_bundle).to include_gems "myrack 1.0.0"
         end
 
         it "installs gems to ." do
@@ -123,9 +135,9 @@ def set_bundle_path(type, location)
 
           bundle :install
 
-          paths_to_exist = %w[cache/rack-1.0.0.gem gems/rack-1.0.0 specifications/rack-1.0.0.gemspec].map {|path| bundled_app(Bundler.ruby_scope, path) }
+          paths_to_exist = %w[cache/myrack-1.0.0.gem gems/myrack-1.0.0 specifications/myrack-1.0.0.gemspec].map {|path| bundled_app(Bundler.ruby_scope, path) }
           expect(paths_to_exist).to all exist
-          expect(the_bundle).to include_gems "rack 1.0.0"
+          expect(the_bundle).to include_gems "myrack 1.0.0"
         end
 
         it "installs gems to the path" do
@@ -133,18 +145,18 @@ def set_bundle_path(type, location)
 
           bundle :install
 
-          expect(bundled_app("vendor", Bundler.ruby_scope, "gems/rack-1.0.0")).to be_directory
-          expect(the_bundle).to include_gems "rack 1.0.0"
+          expect(bundled_app("vendor", Bundler.ruby_scope, "gems/myrack-1.0.0")).to be_directory
+          expect(the_bundle).to include_gems "myrack 1.0.0"
         end
 
         it "installs gems to the path relative to root when relative" do
           set_bundle_path(type, "vendor")
 
           FileUtils.mkdir_p bundled_app("lol")
-          bundle :install, :dir => bundled_app("lol")
+          bundle :install, dir: bundled_app("lol")
 
-          expect(bundled_app("vendor", Bundler.ruby_scope, "gems/rack-1.0.0")).to be_directory
-          expect(the_bundle).to include_gems "rack 1.0.0"
+          expect(bundled_app("vendor", Bundler.ruby_scope, "gems/myrack-1.0.0")).to be_directory
+          expect(the_bundle).to include_gems "myrack 1.0.0"
         end
       end
     end
@@ -154,35 +166,35 @@ def set_bundle_path(type, location)
 
       bundle :install
 
-      expect(vendored_gems("gems/rack-1.0.0")).to be_directory
-      expect(the_bundle).to include_gems "rack 1.0.0"
+      expect(vendored_gems("gems/myrack-1.0.0")).to be_directory
+      expect(the_bundle).to include_gems "myrack 1.0.0"
     end
 
     it "sets BUNDLE_PATH as the first argument to bundle install" do
       bundle "config set --local path ./vendor/bundle"
       bundle :install
 
-      expect(vendored_gems("gems/rack-1.0.0")).to be_directory
-      expect(the_bundle).to include_gems "rack 1.0.0"
+      expect(vendored_gems("gems/myrack-1.0.0")).to be_directory
+      expect(the_bundle).to include_gems "myrack 1.0.0"
     end
 
     it "disables system gems when passing a path to install" do
       # This is so that vendored gems can be distributed to others
-      build_gem "rack", "1.1.0", :to_system => true
+      build_gem "myrack", "1.1.0", to_system: true
       bundle "config set --local path ./vendor/bundle"
       bundle :install
 
-      expect(vendored_gems("gems/rack-1.0.0")).to be_directory
-      expect(the_bundle).to include_gems "rack 1.0.0"
+      expect(vendored_gems("gems/myrack-1.0.0")).to be_directory
+      expect(the_bundle).to include_gems "myrack 1.0.0"
     end
 
     it "re-installs gems whose extensions have been deleted" do
-      build_lib "very_simple_binary", "1.0.0", :to_system => true do |s|
+      build_lib "very_simple_binary", "1.0.0", to_system: true do |s|
         s.write "lib/very_simple_binary.rb", "raise 'FAIL'"
       end
 
       gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
+        source "https://gem.repo1"
         gem "very_simple_binary"
       G
 
@@ -191,11 +203,11 @@ def set_bundle_path(type, location)
 
       expect(vendored_gems("gems/very_simple_binary-1.0")).to be_directory
       expect(vendored_gems("extensions")).to be_directory
-      expect(the_bundle).to include_gems "very_simple_binary 1.0", :source => "remote1"
+      expect(the_bundle).to include_gems "very_simple_binary 1.0", source: "remote1"
 
       vendored_gems("extensions").rmtree
 
-      run "require 'very_simple_binary_c'", :raise_on_error => false
+      run "require 'very_simple_binary_c'", raise_on_error: false
       expect(err).to include("Bundler::GemNotFound")
 
       bundle "config set --local path ./vendor/bundle"
@@ -203,7 +215,7 @@ def set_bundle_path(type, location)
 
       expect(vendored_gems("gems/very_simple_binary-1.0")).to be_directory
       expect(vendored_gems("extensions")).to be_directory
-      expect(the_bundle).to include_gems "very_simple_binary 1.0", :source => "remote1"
+      expect(the_bundle).to include_gems "very_simple_binary 1.0", source: "remote1"
     end
   end
 
@@ -214,12 +226,12 @@ def set_bundle_path(type, location)
 
     it "reports the file exists" do
       gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
-        gem "rack"
+        source "https://gem.repo1"
+        gem "myrack"
       G
 
       bundle "config set --local path bundle"
-      bundle :install, :raise_on_error => false
+      bundle :install, raise_on_error: false
       expect(err).to include("file already exists")
     end
   end
diff --git a/spec/bundler/install/prereleases_spec.rb b/spec/bundler/install/prereleases_spec.rb
index 629eb89dacf544..9f764d127c877a 100644
--- a/spec/bundler/install/prereleases_spec.rb
+++ b/spec/bundler/install/prereleases_spec.rb
@@ -13,7 +13,7 @@
   describe "when prerelease gems are available" do
     it "finds prereleases" do
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo2)}"
+        source "https://gem.repo2"
         gem "not_released"
       G
       expect(the_bundle).to include_gems "not_released 1.0.pre"
@@ -21,7 +21,7 @@
 
     it "uses regular releases if available" do
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo2)}"
+        source "https://gem.repo2"
         gem "has_prerelease"
       G
       expect(the_bundle).to include_gems "has_prerelease 1.0"
@@ -29,7 +29,7 @@
 
     it "uses prereleases if requested" do
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo2)}"
+        source "https://gem.repo2"
         gem "has_prerelease", "1.1.pre"
       G
       expect(the_bundle).to include_gems "has_prerelease 1.1.pre"
@@ -38,17 +38,17 @@
 
   describe "when prerelease gems are not available" do
     it "still works" do
-      build_repo gem_repo3 do
-        build_gem "rack"
+      build_repo3 do
+        build_gem "myrack"
       end
-      FileUtils.rm_rf Dir[gem_repo3("prerelease*")]
+      FileUtils.rm_r Dir[gem_repo3("prerelease*")]
 
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo3)}"
-        gem "rack"
+        source "https://gem.repo3"
+        gem "myrack"
       G
 
-      expect(the_bundle).to include_gems "rack 1.0"
+      expect(the_bundle).to include_gems "myrack 1.0"
     end
   end
 end
diff --git a/spec/bundler/install/process_lock_spec.rb b/spec/bundler/install/process_lock_spec.rb
index 1f8c62f26eb069..344caa3a931243 100644
--- a/spec/bundler/install/process_lock_spec.rb
+++ b/spec/bundler/install/process_lock_spec.rb
@@ -8,23 +8,23 @@
       thread = Thread.new do
         Bundler::ProcessLock.lock(default_bundle_path) do
           sleep 1 # ignore quality_spec
-          expect(the_bundle).not_to include_gems "rack 1.0"
+          expect(the_bundle).not_to include_gems "myrack 1.0"
         end
       end
 
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
-        gem "rack"
+        source "https://gem.repo1"
+        gem "myrack"
       G
 
       thread.join
-      expect(the_bundle).to include_gems "rack 1.0"
+      expect(the_bundle).to include_gems "myrack 1.0"
     end
 
     context "when creating a lock raises Errno::ENOTSUP" do
       before { allow(File).to receive(:open).and_raise(Errno::ENOTSUP) }
 
-      it "skips creating the lock file and yields" do
+      it "skips creating the lockfile and yields" do
         processed = false
         Bundler::ProcessLock.lock(default_bundle_path) { processed = true }
 
@@ -35,7 +35,7 @@
     context "when creating a lock raises Errno::EPERM" do
       before { allow(File).to receive(:open).and_raise(Errno::EPERM) }
 
-      it "skips creating the lock file and yields" do
+      it "skips creating the lockfile and yields" do
         processed = false
         Bundler::ProcessLock.lock(default_bundle_path) { processed = true }
 
@@ -46,7 +46,7 @@
     context "when creating a lock raises Errno::EROFS" do
       before { allow(File).to receive(:open).and_raise(Errno::EROFS) }
 
-      it "skips creating the lock file and yields" do
+      it "skips creating the lockfile and yields" do
         processed = false
         Bundler::ProcessLock.lock(default_bundle_path) { processed = true }
 
diff --git a/spec/bundler/install/redownload_spec.rb b/spec/bundler/install/redownload_spec.rb
index a936b2b5365bb2..0b2e2b2f49d076 100644
--- a/spec/bundler/install/redownload_spec.rb
+++ b/spec/bundler/install/redownload_spec.rb
@@ -3,29 +3,29 @@
 RSpec.describe "bundle install" do
   before :each do
     gemfile <<-G
-      source "#{file_uri_for(gem_repo1)}"
-      gem "rack"
+      source "https://gem.repo1"
+      gem "myrack"
     G
   end
 
   shared_examples_for "an option to force redownloading gems" do
     it "re-installs installed gems" do
-      rack_lib = default_bundle_path("gems/rack-1.0.0/lib/rack.rb")
+      myrack_lib = default_bundle_path("gems/myrack-1.0.0/lib/myrack.rb")
 
       bundle :install
-      rack_lib.open("w") {|f| f.write("blah blah blah") }
+      myrack_lib.open("w") {|f| f.write("blah blah blah") }
       bundle :install, flag => true
 
-      expect(out).to include "Installing rack 1.0.0"
-      expect(rack_lib.open(&:read)).to eq("RACK = '1.0.0'\n")
-      expect(the_bundle).to include_gems "rack 1.0.0"
+      expect(out).to include "Installing myrack 1.0.0"
+      expect(myrack_lib.open(&:read)).to eq("MYRACK = '1.0.0'\n")
+      expect(the_bundle).to include_gems "myrack 1.0.0"
     end
 
     it "works on first bundle install" do
       bundle :install, flag => true
 
-      expect(out).to include "Installing rack 1.0.0"
-      expect(the_bundle).to include_gems "rack 1.0.0"
+      expect(out).to include "Installing myrack 1.0.0"
+      expect(the_bundle).to include_gems "myrack 1.0.0"
     end
 
     context "with a git gem" do
@@ -33,7 +33,7 @@
 
       before do
         gemfile <<-G
-          source "#{file_uri_for(gem_repo1)}"
+          source "https://gem.repo1"
           gem "foo", :git => "#{lib_path("foo-1.0")}"
         G
       end
@@ -57,7 +57,7 @@
     end
   end
 
-  describe "with --force", :bundler => 2 do
+  describe "with --force" do
     it_behaves_like "an option to force redownloading gems" do
       let(:flag) { "force" }
     end
diff --git a/spec/bundler/install/security_policy_spec.rb b/spec/bundler/install/security_policy_spec.rb
index 43c3069c4eb18b..e7f64dc2272940 100644
--- a/spec/bundler/install/security_policy_spec.rb
+++ b/spec/bundler/install/security_policy_spec.rb
@@ -9,30 +9,30 @@
   before do
     build_security_repo
     gemfile <<-G
-      source "#{file_uri_for(security_repo)}"
-      gem "rack"
+      source "https://gems.security"
+      gem "myrack"
       gem "signed_gem"
     G
   end
 
   it "will work after you try to deploy without a lock" do
-    bundle "install --deployment", :raise_on_error => false
+    bundle "install --deployment", raise_on_error: false
     bundle :install
-    expect(the_bundle).to include_gems "rack 1.0", "signed_gem 1.0"
+    expect(the_bundle).to include_gems "myrack 1.0", "signed_gem 1.0"
   end
 
   it "will fail when given invalid security policy" do
-    bundle "install --trust-policy=InvalidPolicyName", :raise_on_error => false
+    bundle "install --trust-policy=InvalidPolicyName", raise_on_error: false
     expect(err).to include("RubyGems doesn't know about trust policy")
   end
 
   it "will fail with High Security setting due to presence of unsigned gem" do
-    bundle "install --trust-policy=HighSecurity", :raise_on_error => false
+    bundle "install --trust-policy=HighSecurity", raise_on_error: false
     expect(err).to include("security policy didn't allow")
   end
 
   it "will fail with Medium Security setting due to presence of unsigned gem" do
-    bundle "install --trust-policy=MediumSecurity", :raise_on_error => false
+    bundle "install --trust-policy=MediumSecurity", raise_on_error: false
     expect(err).to include("security policy didn't allow")
   end
 
@@ -45,18 +45,18 @@
   before do
     build_security_repo
     gemfile <<-G
-      source "#{file_uri_for(security_repo)}"
+      source "https://gems.security"
       gem "signed_gem"
     G
   end
 
   it "will fail with High Security setting, gem is self-signed" do
-    bundle "install --trust-policy=HighSecurity", :raise_on_error => false
+    bundle "install --trust-policy=HighSecurity", raise_on_error: false
     expect(err).to include("security policy didn't allow")
   end
 
   it "will fail with Medium Security setting, gem is self-signed" do
-    bundle "install --trust-policy=MediumSecurity", :raise_on_error => false
+    bundle "install --trust-policy=MediumSecurity", raise_on_error: false
     expect(err).to include("security policy didn't allow")
   end
 
diff --git a/spec/bundler/install/yanked_spec.rb b/spec/bundler/install/yanked_spec.rb
index dc054b50bbe85b..ffe962d9f37c72 100644
--- a/spec/bundler/install/yanked_spec.rb
+++ b/spec/bundler/install/yanked_spec.rb
@@ -1,16 +1,14 @@
 # frozen_string_literal: true
 
 RSpec.context "when installing a bundle that includes yanked gems" do
-  before(:each) do
+  it "throws an error when the original gem version is yanked" do
     build_repo4 do
       build_gem "foo", "9.0.0"
     end
-  end
 
-  it "throws an error when the original gem version is yanked" do
     lockfile <<-L
        GEM
-         remote: #{file_uri_for(gem_repo4)}
+         remote: https://gem.repo4
          specs:
            foo (10.0.0)
 
@@ -22,20 +20,43 @@
 
     L
 
-    install_gemfile <<-G, :raise_on_error => false
-      source "#{file_uri_for(gem_repo4)}"
+    install_gemfile <<-G, raise_on_error: false
+      source "https://gem.repo4"
       gem "foo", "10.0.0"
     G
 
     expect(err).to include("Your bundle is locked to foo (10.0.0)")
   end
 
-  context "when a re-resolve is necessary, and a yanked version is considered by the resolver" do
+  context "when a platform specific yanked version is included in the lockfile, and a generic variant is available remotely" do
+    let(:original_lockfile) do
+      <<~L
+        GEM
+          remote: https://gem.repo4/
+          specs:
+            actiontext (6.1.6)
+              nokogiri (>= 1.8)
+            foo (1.0.0)
+            nokogiri (1.13.8-#{Bundler.local_platform})
+
+        PLATFORMS
+          #{lockfile_platforms}
+
+        DEPENDENCIES
+          actiontext (= 6.1.6)
+          foo (= 1.0.0)
+
+        BUNDLED WITH
+           #{Bundler::VERSION}
+      L
+    end
+
     before do
       skip "Materialization on Windows is not yet strict, so the example does not detect the gem has been yanked" if Gem.win_platform?
 
       build_repo4 do
-        build_gem "foo", "1.0.0", "1.0.1"
+        build_gem "foo", "1.0.0"
+        build_gem "foo", "1.0.1"
         build_gem "actiontext", "6.1.7" do |s|
           s.add_dependency "nokogiri", ">= 1.8"
         end
@@ -49,58 +70,58 @@
       end
 
       gemfile <<~G
-        source "#{source_uri}"
-        gem "foo", "1.0.1"
+        source "https://gem.repo4"
+        gem "foo", "1.0.0"
         gem "actiontext", "6.1.6"
       G
 
-      lockfile <<~L
-        GEM
-          remote: #{source_uri}/
-          specs:
-            actiontext (6.1.6)
-              nokogiri (>= 1.8)
-            foo (1.0.0)
-            nokogiri (1.13.8-#{Bundler.local_platform})
-
-        PLATFORMS
-          #{lockfile_platforms}
+      lockfile original_lockfile
+    end
 
-        DEPENDENCIES
-          actiontext (= 6.1.6)
-          foo (= 1.0.0)
+    context "and a re-resolve is necessary" do
+      before do
+        gemfile gemfile.sub('"foo", "1.0.0"', '"foo", "1.0.1"')
+      end
 
-        BUNDLED WITH
-           #{Bundler::VERSION}
-      L
-    end
+      it "reresolves, and replaces the yanked gem with the generic version, printing a warning, when the old index is used" do
+        bundle "install", artifice: "endpoint", verbose: true
 
-    context "and the old index is used" do
-      let(:source_uri) { file_uri_for(gem_repo4) }
+        expect(out).to include("Installing nokogiri 1.13.8").and include("Installing foo 1.0.1")
+        expect(lockfile).to eq(original_lockfile.sub("nokogiri (1.13.8-#{Bundler.local_platform})", "nokogiri (1.13.8)").gsub("1.0.0", "1.0.1"))
+        expect(err).to include("Some locked specs have possibly been yanked (nokogiri-1.13.8-#{Bundler.local_platform}). Ignoring them...")
+      end
 
-      it "reports the yanked gem properly" do
-        bundle "install", :raise_on_error => false
+      it "reresolves, and replaces the yanked gem with the generic version, printing a warning, when the compact index API is used" do
+        bundle "install", artifice: "compact_index", verbose: true
 
-        expect(err).to include("Your bundle is locked to nokogiri (1.13.8-#{Bundler.local_platform})")
+        expect(out).to include("Installing nokogiri 1.13.8").and include("Installing foo 1.0.1")
+        expect(lockfile).to eq(original_lockfile.sub("nokogiri (1.13.8-#{Bundler.local_platform})", "nokogiri (1.13.8)").gsub("1.0.0", "1.0.1"))
+        expect(err).to include("Some locked specs have possibly been yanked (nokogiri-1.13.8-#{Bundler.local_platform}). Ignoring them...")
       end
     end
 
-    context "and the compact index API is used" do
-      let(:source_uri) { "https://gem.repo4" }
+    it "reports the yanked gem properly when the old index is used" do
+      bundle "install", artifice: "endpoint", raise_on_error: false
+
+      expect(err).to include("Your bundle is locked to nokogiri (1.13.8-#{Bundler.local_platform})")
+    end
 
-      it "reports the yanked gem properly" do
-        bundle "install", :artifice => "compact_index", :raise_on_error => false
+    it "reports the yanked gem properly when the compact index API is used" do
+      bundle "install", artifice: "compact_index", raise_on_error: false
 
-        expect(err).to include("Your bundle is locked to nokogiri (1.13.8-#{Bundler.local_platform})")
-      end
+      expect(err).to include("Your bundle is locked to nokogiri (1.13.8-#{Bundler.local_platform})")
     end
   end
 
   it "throws the original error when only the Gemfile specifies a gem version that doesn't exist" do
+    build_repo4 do
+      build_gem "foo", "9.0.0"
+    end
+
     bundle "config set force_ruby_platform true"
 
-    install_gemfile <<-G, :raise_on_error => false
-      source "#{file_uri_for(gem_repo4)}"
+    install_gemfile <<-G, raise_on_error: false
+      source "https://gem.repo4"
       gem "foo", "10.0.0"
     G
 
@@ -120,7 +141,7 @@
 
     lockfile <<-L
       GEM
-        remote: #{file_uri_for(gem_repo4)}
+        remote: https://gem.repo4
         specs:
           foo (9.0.0)
           bar (1.0.0)
@@ -137,7 +158,7 @@
     L
 
     gemfile <<-G
-      source "#{file_uri_for(gem_repo4)}"
+      source "https://gem.repo4"
       gem "foo"
       gem "bar"
     G
@@ -148,7 +169,7 @@
 
     expect(lockfile).to eq <<~L
       GEM
-        remote: #{file_uri_for(gem_repo4)}/
+        remote: https://gem.repo4/
         specs:
           bar (2.0.0)
           foo (9.0.0)
@@ -169,65 +190,65 @@
 RSpec.context "when using gem before installing" do
   it "does not suggest the author has yanked the gem" do
     gemfile <<-G
-      source "#{file_uri_for(gem_repo1)}"
-      gem "rack", "0.9.1"
+      source "https://gem.repo1"
+      gem "myrack", "0.9.1"
     G
 
     lockfile <<-L
       GEM
-        remote: #{file_uri_for(gem_repo1)}
+        remote: https://gem.repo1
         specs:
-          rack (0.9.1)
+          myrack (0.9.1)
 
       PLATFORMS
         #{lockfile_platforms}
 
       DEPENDENCIES
-        rack (= 0.9.1)
+        myrack (= 0.9.1)
     L
 
-    bundle :list, :raise_on_error => false
+    bundle :list, raise_on_error: false
 
-    expect(err).to include("Could not find rack-0.9.1 in locally installed gems")
-    expect(err).to_not include("Your bundle is locked to rack (0.9.1) from")
-    expect(err).to_not include("If you haven't changed sources, that means the author of rack (0.9.1) has removed it.")
-    expect(err).to_not include("You'll need to update your bundle to a different version of rack (0.9.1) that hasn't been removed in order to install.")
+    expect(err).to include("Could not find myrack-0.9.1 in locally installed gems")
+    expect(err).to_not include("Your bundle is locked to myrack (0.9.1) from")
+    expect(err).to_not include("If you haven't changed sources, that means the author of myrack (0.9.1) has removed it.")
+    expect(err).to_not include("You'll need to update your bundle to a different version of myrack (0.9.1) that hasn't been removed in order to install.")
 
     # Check error message is still correct when multiple platforms are locked
     lockfile lockfile.gsub(/PLATFORMS\n  #{lockfile_platforms}/m, "PLATFORMS\n  #{lockfile_platforms("ruby")}")
 
-    bundle :list, :raise_on_error => false
-    expect(err).to include("Could not find rack-0.9.1 in locally installed gems")
+    bundle :list, raise_on_error: false
+    expect(err).to include("Could not find myrack-0.9.1 in locally installed gems")
   end
 
   it "does not suggest the author has yanked the gem when using more than one gem, but shows all gems that couldn't be found in the source" do
     gemfile <<-G
-      source "#{file_uri_for(gem_repo1)}"
-      gem "rack", "0.9.1"
-      gem "rack_middleware", "1.0"
+      source "https://gem.repo1"
+      gem "myrack", "0.9.1"
+      gem "myrack_middleware", "1.0"
     G
 
     lockfile <<-L
       GEM
-        remote: #{file_uri_for(gem_repo1)}
+        remote: https://gem.repo1
         specs:
-          rack (0.9.1)
-          rack_middleware (1.0)
+          myrack (0.9.1)
+          myrack_middleware (1.0)
 
       PLATFORMS
         #{lockfile_platforms}
 
       DEPENDENCIES
-        rack (= 0.9.1)
-        rack_middleware (1.0)
+        myrack (= 0.9.1)
+        myrack_middleware (1.0)
     L
 
-    bundle :list, :raise_on_error => false
+    bundle :list, raise_on_error: false
 
-    expect(err).to include("Could not find rack-0.9.1, rack_middleware-1.0 in locally installed gems")
+    expect(err).to include("Could not find myrack-0.9.1, myrack_middleware-1.0 in locally installed gems")
     expect(err).to include("Install missing gems with `bundle install`.")
-    expect(err).to_not include("Your bundle is locked to rack (0.9.1) from")
-    expect(err).to_not include("If you haven't changed sources, that means the author of rack (0.9.1) has removed it.")
-    expect(err).to_not include("You'll need to update your bundle to a different version of rack (0.9.1) that hasn't been removed in order to install.")
+    expect(err).to_not include("Your bundle is locked to myrack (0.9.1) from")
+    expect(err).to_not include("If you haven't changed sources, that means the author of myrack (0.9.1) has removed it.")
+    expect(err).to_not include("You'll need to update your bundle to a different version of myrack (0.9.1) that hasn't been removed in order to install.")
   end
 end
diff --git a/spec/bundler/lock/git_spec.rb b/spec/bundler/lock/git_spec.rb
index ac3d10223c26d0..49c0a2af1c20fc 100644
--- a/spec/bundler/lock/git_spec.rb
+++ b/spec/bundler/lock/git_spec.rb
@@ -1,21 +1,25 @@
 # frozen_string_literal: true
 
 RSpec.describe "bundle lock with git gems" do
-  before :each do
+  let(:install_gemfile_with_foo_as_a_git_dependency) do
     build_git "foo"
 
     install_gemfile <<-G
-      source "#{file_uri_for(gem_repo1)}"
+      source "https://gem.repo1"
       gem 'foo', :git => "#{lib_path("foo-1.0")}"
     G
   end
 
   it "doesn't break right after running lock" do
+    install_gemfile_with_foo_as_a_git_dependency
+
     expect(the_bundle).to include_gems "foo 1.0.0"
   end
 
   it "doesn't print errors even if running lock after removing the cache" do
-    FileUtils.rm_rf(Dir[default_cache_path("git/foo-1.0-*")].first)
+    install_gemfile_with_foo_as_a_git_dependency
+
+    FileUtils.rm_r(Dir[default_cache_path("git/foo-1.0-*")].first)
 
     bundle "lock --verbose"
 
@@ -23,17 +27,21 @@
   end
 
   it "prints a proper error when changing a locked Gemfile to point to a bad branch" do
+    install_gemfile_with_foo_as_a_git_dependency
+
     gemfile <<-G
-      source "#{file_uri_for(gem_repo1)}"
+      source "https://gem.repo1"
       gem 'foo', :git => "#{lib_path("foo-1.0")}", :branch => "bad"
     G
 
-    bundle "lock --update foo", :env => { "LANG" => "en" }, :raise_on_error => false
+    bundle "lock --update foo", env: { "LANG" => "en" }, raise_on_error: false
 
     expect(err).to include("Revision bad does not exist in the repository")
   end
 
   it "prints a proper error when installing a Gemfile with a locked ref that does not exist" do
+    install_gemfile_with_foo_as_a_git_dependency
+
     lockfile <<~L
       GIT
         remote: #{lib_path("foo-1.0")}
@@ -42,7 +50,7 @@
           foo (1.0)
 
       GEM
-        remote: #{file_uri_for(gem_repo1)}/
+        remote: https://gem.repo1/
         specs:
 
       PLATFORMS
@@ -55,12 +63,14 @@
          #{Bundler::VERSION}
     L
 
-    bundle "install", :raise_on_error => false
+    bundle "install", raise_on_error: false
 
     expect(err).to include("Revision #{"a" * 40} does not exist in the repository")
   end
 
   it "locks a git source to the current ref" do
+    install_gemfile_with_foo_as_a_git_dependency
+
     update_git "foo"
     bundle :install
 
@@ -73,13 +83,17 @@
   end
 
   it "properly clones a git source locked to an out of date ref" do
+    install_gemfile_with_foo_as_a_git_dependency
+
     update_git "foo"
 
-    bundle :install, :env => { "BUNDLE_PATH" => "foo" }
+    bundle :install, env: { "BUNDLE_PATH" => "foo" }
     expect(err).to be_empty
   end
 
   it "properly fetches a git source locked to an unreachable ref" do
+    install_gemfile_with_foo_as_a_git_dependency
+
     # Create a commit and make it unreachable
     git "checkout -b foo ", lib_path("foo-1.0")
     unreachable_sha = update_git("foo").ref_for("HEAD")
@@ -87,7 +101,7 @@
     git "branch -D foo ", lib_path("foo-1.0")
 
     gemfile <<-G
-      source "#{file_uri_for(gem_repo1)}"
+      source "https://gem.repo1"
       gem 'foo', :git => "#{lib_path("foo-1.0")}"
     G
 
@@ -99,7 +113,7 @@
           foo (1.0)
 
       GEM
-        remote: #{file_uri_for(gem_repo1)}/
+        remote: https://gem.repo1/
         specs:
 
       PLATFORMS
@@ -118,12 +132,14 @@
   end
 
   it "properly fetches a git source locked to an annotated tag" do
+    install_gemfile_with_foo_as_a_git_dependency
+
     # Create an annotated tag
     git("tag -a v1.0 -m 'Annotated v1.0'", lib_path("foo-1.0"))
     annotated_tag = git("rev-parse v1.0", lib_path("foo-1.0"))
 
     gemfile <<-G
-      source "#{file_uri_for(gem_repo1)}"
+      source "https://gem.repo1"
       gem 'foo', :git => "#{lib_path("foo-1.0")}"
     G
 
@@ -135,7 +151,7 @@
           foo (1.0)
 
       GEM
-        remote: #{file_uri_for(gem_repo1)}/
+        remote: https://gem.repo1/
         specs:
 
       PLATFORMS
@@ -154,9 +170,54 @@
   end
 
   it "provides correct #full_gem_path" do
+    install_gemfile_with_foo_as_a_git_dependency
+
     run <<-RUBY
       puts Bundler.rubygems.find_name('foo').first.full_gem_path
     RUBY
     expect(out).to eq(bundle("info foo --path"))
   end
+
+  it "does not lock versions that don't exist in the repository when changing a GEM transitive dep to a GIT direct dep" do
+    build_repo4 do
+      build_gem "activesupport", "8.0.0" do |s|
+        s.add_dependency "securerandom"
+      end
+
+      build_gem "securerandom", "0.3.1"
+    end
+
+    path = lib_path("securerandom")
+
+    build_git "securerandom", "0.3.2", path: path
+
+    lockfile <<~L
+      GEM
+        remote: https://gem.repo4/
+        specs:
+          activesupport (8.0.0)
+            securerandom
+          securerandom (0.3.1)
+
+      PLATFORMS
+        #{lockfile_platforms}
+
+      DEPENDENCIES
+        activesupport
+
+      BUNDLED WITH
+         #{Bundler::VERSION}
+    L
+
+    gemfile <<~G
+      source "https://gem.repo4"
+
+      gem "activesupport"
+      gem "securerandom", git: "#{path}"
+    G
+
+    bundle "lock"
+
+    expect(lockfile).to include("securerandom (0.3.2)")
+  end
 end
diff --git a/spec/bundler/lock/lockfile_spec.rb b/spec/bundler/lock/lockfile_spec.rb
index ccf23a9e3c2144..e1fbe6934a1b6e 100644
--- a/spec/bundler/lock/lockfile_spec.rb
+++ b/spec/bundler/lock/lockfile_spec.rb
@@ -6,24 +6,28 @@
   end
 
   it "generates a simple lockfile for a single source, gem" do
+    checksums = checksums_section_when_enabled do |c|
+      c.checksum(gem_repo2, "myrack", "1.0.0")
+    end
+
     install_gemfile <<-G
-      source "#{file_uri_for(gem_repo2)}"
+      source "https://gem.repo2"
 
-      gem "rack"
+      gem "myrack"
     G
 
     expect(lockfile).to eq <<~G
       GEM
-        remote: #{file_uri_for(gem_repo2)}/
+        remote: https://gem.repo2/
         specs:
-          rack (1.0.0)
+          myrack (1.0.0)
 
       PLATFORMS
         #{lockfile_platforms}
 
       DEPENDENCIES
-        rack
-
+        myrack
+      #{checksums}
       BUNDLED WITH
          #{Bundler::VERSION}
     G
@@ -39,25 +43,25 @@
         specs:
 
       GEM
-        remote: #{file_uri_for(gem_repo2)}/
+        remote: https://gem.repo2/
         specs:
-          rack (1.0.0)
+          myrack (1.0.0)
 
       PLATFORMS
         #{lockfile_platforms}
 
       DEPENDENCIES
         omg!
-        rack
+        myrack
 
       BUNDLED WITH
          1.8.2
     L
 
-    install_gemfile <<-G, :verbose => true, :env => { "BUNDLER_VERSION" => Bundler::VERSION }
-      source "#{file_uri_for(gem_repo2)}"
+    install_gemfile <<-G, verbose: true, env: { "BUNDLER_VERSION" => Bundler::VERSION }
+      source "https://gem.repo2"
 
-      gem "rack"
+      gem "myrack"
     G
 
     expect(out).not_to include("Bundler #{Bundler::VERSION} is running, but your lockfile was generated with 1.8.2.")
@@ -65,44 +69,50 @@
 
     expect(lockfile).to eq <<~G
       GEM
-        remote: #{file_uri_for(gem_repo2)}/
+        remote: https://gem.repo2/
         specs:
-          rack (1.0.0)
+          myrack (1.0.0)
 
       PLATFORMS
         #{lockfile_platforms}
 
       DEPENDENCIES
-        rack
+        myrack
 
       BUNDLED WITH
          #{Bundler::VERSION}
     G
   end
 
-  it "does not update the lockfile's bundler version if nothing changed during bundle install, but uses the locked version", :rubygems => ">= 3.3.0.a", :realworld => true do
+  it "does not update the lockfile's bundler version if nothing changed during bundle install, but uses the locked version" do
     version = "2.3.0"
 
+    build_repo4 do
+      build_gem "myrack", "1.0.0"
+
+      build_bundler version
+    end
+
     lockfile <<-L
       GEM
-        remote: #{file_uri_for(gem_repo2)}/
+        remote: https://gem.repo4/
         specs:
-          rack (1.0.0)
+          myrack (1.0.0)
 
       PLATFORMS
         #{lockfile_platforms}
 
       DEPENDENCIES
-        rack
+        myrack
 
       BUNDLED WITH
          #{version}
     L
 
-    install_gemfile <<-G, :verbose => true, :artifice => "vcr"
-      source "#{file_uri_for(gem_repo2)}"
+    install_gemfile <<-G, verbose: true
+      source "https://gem.repo4"
 
-      gem "rack"
+      gem "myrack"
     G
 
     expect(out).to include("Bundler #{Bundler::VERSION} is running, but your lockfile was generated with #{version}.")
@@ -110,222 +120,296 @@
 
     expect(lockfile).to eq <<~G
       GEM
-        remote: #{file_uri_for(gem_repo2)}/
+        remote: https://gem.repo4/
         specs:
-          rack (1.0.0)
+          myrack (1.0.0)
 
       PLATFORMS
         #{lockfile_platforms}
 
       DEPENDENCIES
-        rack
+        myrack
 
       BUNDLED WITH
          #{version}
     G
   end
 
-  it "does not update the lockfile's bundler version if nothing changed during bundle install, and uses the latest version", :rubygems => "< 3.3.0.a" do
-    version = "#{Bundler::VERSION.split(".").first}.0.0.a"
-
+  it "adds the BUNDLED WITH section if not present" do
     lockfile <<-L
       GEM
-        remote: #{file_uri_for(gem_repo2)}/
+        remote: https://gem.repo2/
         specs:
-          rack (1.0.0)
+          myrack (1.0.0)
 
       PLATFORMS
         #{lockfile_platforms}
 
       DEPENDENCIES
-        rack
-
-      BUNDLED WITH
-         #{version}
+        myrack
     L
 
-    install_gemfile <<-G, :verbose => true
-      source "#{file_uri_for(gem_repo2)}"
+    install_gemfile <<-G
+      source "https://gem.repo2"
 
-      gem "rack"
+      gem "myrack", "> 0"
     G
 
-    expect(out).not_to include("Bundler #{Bundler::VERSION} is running, but your lockfile was generated with #{version}.")
-    expect(out).to include("Using bundler #{Bundler::VERSION}")
-
     expect(lockfile).to eq <<~G
       GEM
-        remote: #{file_uri_for(gem_repo2)}/
+        remote: https://gem.repo2/
         specs:
-          rack (1.0.0)
+          myrack (1.0.0)
 
       PLATFORMS
         #{lockfile_platforms}
 
       DEPENDENCIES
-        rack
+        myrack (> 0)
 
       BUNDLED WITH
-         #{version}
+         #{Bundler::VERSION}
     G
   end
 
-  it "adds the BUNDLED WITH section if not present" do
+  it "update the bundler major version just fine" do
+    current_version = Bundler::VERSION
+    older_major = previous_major(current_version)
+
+    system_gems "bundler-#{older_major}"
+
     lockfile <<-L
       GEM
-        remote: #{file_uri_for(gem_repo2)}/
+        remote: https://gem.repo2/
         specs:
-          rack (1.0.0)
+          myrack (1.0.0)
 
       PLATFORMS
         #{lockfile_platforms}
 
       DEPENDENCIES
-        rack
+        myrack
+
+      BUNDLED WITH
+         #{older_major}
     L
 
-    install_gemfile <<-G
-      source "#{file_uri_for(gem_repo2)}"
+    install_gemfile <<-G, env: { "BUNDLER_VERSION" => Bundler::VERSION }
+      source "https://gem.repo2/"
 
-      gem "rack", "> 0"
+      gem "myrack"
     G
 
+    expect(err).to be_empty
+
     expect(lockfile).to eq <<~G
       GEM
-        remote: #{file_uri_for(gem_repo2)}/
+        remote: https://gem.repo2/
         specs:
-          rack (1.0.0)
+          myrack (1.0.0)
 
       PLATFORMS
         #{lockfile_platforms}
 
       DEPENDENCIES
-        rack (> 0)
+        myrack
 
       BUNDLED WITH
-         #{Bundler::VERSION}
+         #{current_version}
     G
   end
 
-  it "update the bundler major version just fine" do
-    current_version = Bundler::VERSION
-    older_major = previous_major(current_version)
+  it "generates a simple lockfile for a single source, gem with dependencies" do
+    install_gemfile <<-G
+      source "https://gem.repo2/"
 
-    system_gems "bundler-#{older_major}"
+      gem "myrack-obama"
+    G
 
-    lockfile <<-L
+    checksums = checksums_section_when_enabled do |c|
+      c.checksum gem_repo2, "myrack", "1.0.0"
+      c.checksum gem_repo2, "myrack-obama", "1.0"
+    end
+
+    expect(lockfile).to eq <<~G
       GEM
-        remote: #{file_uri_for(gem_repo2)}/
+        remote: https://gem.repo2/
         specs:
-          rack (1.0.0)
+          myrack (1.0.0)
+          myrack-obama (1.0)
+            myrack
 
       PLATFORMS
         #{lockfile_platforms}
 
       DEPENDENCIES
-        rack
-
+        myrack-obama
+      #{checksums}
       BUNDLED WITH
-         #{older_major}
-    L
+         #{Bundler::VERSION}
+    G
+  end
 
-    install_gemfile <<-G, :env => { "BUNDLER_VERSION" => Bundler::VERSION }
-      source "#{file_uri_for(gem_repo2)}/"
+  it "generates a simple lockfile for a single source, gem with a version requirement" do
+    install_gemfile <<-G
+      source "https://gem.repo2/"
 
-      gem "rack"
+      gem "myrack-obama", ">= 1.0"
     G
 
-    expect(err).to be_empty
+    checksums = checksums_section_when_enabled do |c|
+      c.checksum gem_repo2, "myrack", "1.0.0"
+      c.checksum gem_repo2, "myrack-obama", "1.0"
+    end
 
     expect(lockfile).to eq <<~G
       GEM
-        remote: #{file_uri_for(gem_repo2)}/
+        remote: https://gem.repo2/
         specs:
-          rack (1.0.0)
+          myrack (1.0.0)
+          myrack-obama (1.0)
+            myrack
 
       PLATFORMS
         #{lockfile_platforms}
 
       DEPENDENCIES
-        rack
-
+        myrack-obama (>= 1.0)
+      #{checksums}
       BUNDLED WITH
-         #{current_version}
+         #{Bundler::VERSION}
     G
   end
 
-  it "generates a simple lockfile for a single source, gem with dependencies" do
-    install_gemfile <<-G
-      source "#{file_uri_for(gem_repo2)}/"
+  it "generates a lockfile without credentials" do
+    bundle "config set https://localgemserver.test/ user:pass"
+
+    install_gemfile(<<-G, artifice: "endpoint_strict_basic_authentication", quiet: true)
+      source "https://gem.repo1"
+
+      source "https://localgemserver.test/" do
 
-      gem "rack-obama"
+      end
+
+      source "https://user:pass@othergemserver.test/" do
+        gem "myrack-obama", ">= 1.0"
+      end
     G
 
+    checksums = checksums_section_when_enabled do |c|
+      c.checksum gem_repo2, "myrack", "1.0.0"
+      c.checksum gem_repo2, "myrack-obama", "1.0"
+    end
+
     expect(lockfile).to eq <<~G
       GEM
-        remote: #{file_uri_for(gem_repo2)}/
+        remote: https://gem.repo1/
+        specs:
+
+      GEM
+        remote: https://localgemserver.test/
+        specs:
+
+      GEM
+        remote: https://othergemserver.test/
         specs:
-          rack (1.0.0)
-          rack-obama (1.0)
-            rack
+          myrack (1.0.0)
+          myrack-obama (1.0)
+            myrack
 
       PLATFORMS
         #{lockfile_platforms}
 
       DEPENDENCIES
-        rack-obama
-
+        myrack-obama (>= 1.0)!
+      #{checksums}
       BUNDLED WITH
          #{Bundler::VERSION}
     G
   end
 
-  it "generates a simple lockfile for a single source, gem with a version requirement" do
-    install_gemfile <<-G
-      source "#{file_uri_for(gem_repo2)}/"
+  it "does not add credentials to lockfile when it does not have them already" do
+    bundle "config set http://localgemserver.test/ user:pass"
+
+    gemfile <<~G
+      source "https://gem.repo1"
+
+      source "http://localgemserver.test/" do
 
-      gem "rack-obama", ">= 1.0"
+      end
+
+      source "http://user:pass@othergemserver.test/" do
+        gem "myrack-obama", ">= 1.0"
+      end
     G
 
-    expect(lockfile).to eq <<~G
+    checksums = checksums_section_when_enabled do |c|
+      c.checksum gem_repo2, "myrack", "1.0.0"
+      c.checksum gem_repo2, "myrack-obama", "1.0"
+    end
+
+    lockfile_without_credentials = <<~L
       GEM
-        remote: #{file_uri_for(gem_repo2)}/
+        remote: http://localgemserver.test/
+        specs:
+
+      GEM
+        remote: http://othergemserver.test/
+        specs:
+          myrack (1.0.0)
+          myrack-obama (1.0)
+            myrack
+
+      GEM
+        remote: https://gem.repo1/
         specs:
-          rack (1.0.0)
-          rack-obama (1.0)
-            rack
 
       PLATFORMS
         #{lockfile_platforms}
 
       DEPENDENCIES
-        rack-obama (>= 1.0)
-
+        myrack-obama (>= 1.0)!
+      #{checksums}
       BUNDLED WITH
          #{Bundler::VERSION}
-    G
+    L
+
+    lockfile lockfile_without_credentials
+
+    # when not re-resolving
+    bundle "install", artifice: "endpoint_strict_basic_authentication", quiet: true
+    expect(lockfile).to eq lockfile_without_credentials
+
+    # when re-resolving with full unlock
+    bundle "update", artifice: "endpoint_strict_basic_authentication"
+    expect(lockfile).to eq lockfile_without_credentials
+
+    # when re-resolving without ful unlocking
+    bundle "update myrack-obama", artifice: "endpoint_strict_basic_authentication"
+    expect(lockfile).to eq lockfile_without_credentials
   end
 
-  it "generates a lockfile without credentials for a configured source" do
+  it "keeps credentials in lockfile if already there" do
     bundle "config set http://localgemserver.test/ user:pass"
 
-    install_gemfile(<<-G, :artifice => "endpoint_strict_basic_authentication", :quiet => true)
-      source "#{file_uri_for(gem_repo1)}"
+    gemfile <<~G
+      source "https://gem.repo1"
 
       source "http://localgemserver.test/" do
 
       end
 
       source "http://user:pass@othergemserver.test/" do
-        gem "rack-obama", ">= 1.0"
+        gem "myrack-obama", ">= 1.0"
       end
     G
 
-    expect(lockfile).to eq <<~G
-      GEM
-        remote: #{file_uri_for(gem_repo1)}/
-        specs:
+    checksums = checksums_section_when_enabled do |c|
+      c.checksum gem_repo2, "myrack", "1.0.0"
+      c.checksum gem_repo2, "myrack-obama", "1.0"
+    end
 
+    lockfile_with_credentials = <<~L
       GEM
         remote: http://localgemserver.test/
         specs:
@@ -333,30 +417,45 @@
       GEM
         remote: http://user:pass@othergemserver.test/
         specs:
-          rack (1.0.0)
-          rack-obama (1.0)
-            rack
+          myrack (1.0.0)
+          myrack-obama (1.0)
+            myrack
+
+      GEM
+        remote: https://gem.repo1/
+        specs:
 
       PLATFORMS
         #{lockfile_platforms}
 
       DEPENDENCIES
-        rack-obama (>= 1.0)!
-
+        myrack-obama (>= 1.0)!
+      #{checksums}
       BUNDLED WITH
          #{Bundler::VERSION}
-    G
+    L
+
+    lockfile lockfile_with_credentials
+
+    bundle "install", artifice: "endpoint_strict_basic_authentication", quiet: true
+
+    expect(lockfile).to eq lockfile_with_credentials
   end
 
   it "generates lockfiles with multiple requirements" do
     install_gemfile <<-G
-      source "#{file_uri_for(gem_repo2)}/"
+      source "https://gem.repo2/"
       gem "net-sftp"
     G
 
+    checksums = checksums_section_when_enabled do |c|
+      c.checksum gem_repo2, "net-sftp", "1.1.1"
+      c.checksum gem_repo2, "net-ssh", "1.0"
+    end
+
     expect(lockfile).to eq <<~G
       GEM
-        remote: #{file_uri_for(gem_repo2)}/
+        remote: https://gem.repo2/
         specs:
           net-sftp (1.1.1)
             net-ssh (>= 1.0.0, < 1.99.0)
@@ -367,7 +466,7 @@
 
       DEPENDENCIES
         net-sftp
-
+      #{checksums}
       BUNDLED WITH
          #{Bundler::VERSION}
     G
@@ -379,10 +478,14 @@
     git = build_git "foo"
 
     install_gemfile <<-G
-      source "#{file_uri_for(gem_repo1)}"
+      source "https://gem.repo1"
       gem "foo", :git => "#{lib_path("foo-1.0")}"
     G
 
+    checksums = checksums_section_when_enabled do |c|
+      c.no_checksum "foo", "1.0"
+    end
+
     expect(lockfile).to eq <<~G
       GIT
         remote: #{lib_path("foo-1.0")}
@@ -391,7 +494,7 @@
           foo (1.0)
 
       GEM
-        remote: #{file_uri_for(gem_repo1)}/
+        remote: https://gem.repo1/
         specs:
 
       PLATFORMS
@@ -399,23 +502,23 @@
 
       DEPENDENCIES
         foo!
-
+      #{checksums}
       BUNDLED WITH
          #{Bundler::VERSION}
     G
   end
 
   it "does not asplode when a platform specific dependency is present and the Gemfile has not been resolved on that platform" do
-    build_lib "omg", :path => lib_path("omg")
+    build_lib "omg", path: lib_path("omg")
 
     gemfile <<-G
-      source "#{file_uri_for(gem_repo2)}/"
+      source "https://gem.repo2/"
 
       platforms :#{not_local_tag} do
         gem "omg", :path => "#{lib_path("omg")}"
       end
 
-      gem "rack"
+      gem "myrack"
     G
 
     lockfile <<-L
@@ -425,30 +528,34 @@
         specs:
 
       GEM
-        remote: #{file_uri_for(gem_repo2)}//
+        remote: https://gem.repo2//
         specs:
-          rack (1.0.0)
+          myrack (1.0.0)
 
       PLATFORMS
         #{not_local}
 
       DEPENDENCIES
         omg!
-        rack
+        myrack
 
       BUNDLED WITH
          #{Bundler::VERSION}
     L
 
     bundle "install"
-    expect(the_bundle).to include_gems "rack 1.0.0"
+    expect(the_bundle).to include_gems "myrack 1.0.0"
   end
 
   it "serializes global git sources" do
     git = build_git "foo"
 
+    checksums = checksums_section_when_enabled do |c|
+      c.no_checksum "foo", "1.0"
+    end
+
     install_gemfile <<-G
-      source "#{file_uri_for(gem_repo1)}"
+      source "https://gem.repo1"
       git "#{lib_path("foo-1.0")}" do
         gem "foo"
       end
@@ -462,7 +569,7 @@
           foo (1.0)
 
       GEM
-        remote: #{file_uri_for(gem_repo1)}/
+        remote: https://gem.repo1/
         specs:
 
       PLATFORMS
@@ -470,7 +577,7 @@
 
       DEPENDENCIES
         foo!
-
+      #{checksums}
       BUNDLED WITH
          #{Bundler::VERSION}
     G
@@ -478,10 +585,14 @@
 
   it "generates a lockfile with a ref for a single pinned source, git gem with a branch requirement" do
     git = build_git "foo"
-    update_git "foo", :branch => "omg"
+    update_git "foo", branch: "omg"
+
+    checksums = checksums_section_when_enabled do |c|
+      c.no_checksum "foo", "1.0"
+    end
 
     install_gemfile <<-G
-      source "#{file_uri_for(gem_repo1)}"
+      source "https://gem.repo1"
       gem "foo", :git => "#{lib_path("foo-1.0")}", :branch => "omg"
     G
 
@@ -494,7 +605,7 @@
           foo (1.0)
 
       GEM
-        remote: #{file_uri_for(gem_repo1)}/
+        remote: https://gem.repo1/
         specs:
 
       PLATFORMS
@@ -502,7 +613,7 @@
 
       DEPENDENCIES
         foo!
-
+      #{checksums}
       BUNDLED WITH
          #{Bundler::VERSION}
     G
@@ -510,10 +621,14 @@
 
   it "generates a lockfile with a ref for a single pinned source, git gem with a tag requirement" do
     git = build_git "foo"
-    update_git "foo", :tag => "omg"
+    update_git "foo", tag: "omg"
+
+    checksums = checksums_section_when_enabled do |c|
+      c.no_checksum "foo", "1.0"
+    end
 
     install_gemfile <<-G
-      source "#{file_uri_for(gem_repo1)}"
+      source "https://gem.repo1"
       gem "foo", :git => "#{lib_path("foo-1.0")}", :tag => "omg"
     G
 
@@ -526,7 +641,7 @@
           foo (1.0)
 
       GEM
-        remote: #{file_uri_for(gem_repo1)}/
+        remote: https://gem.repo1/
         specs:
 
       PLATFORMS
@@ -534,7 +649,7 @@
 
       DEPENDENCIES
         foo!
-
+      #{checksums}
       BUNDLED WITH
          #{Bundler::VERSION}
     G
@@ -548,29 +663,29 @@
 
     FileUtils.mkdir_p lib_path("ckeditor/lib")
 
-    @remote = build_git("ckeditor_remote", :bare => true)
+    @remote = build_git("ckeditor_remote", bare: true)
 
-    build_git "ckeditor", :path => lib_path("ckeditor") do |s|
+    build_git "ckeditor", path: lib_path("ckeditor") do |s|
       s.write "lib/ckeditor.rb", "CKEDITOR = '4.0.7'"
       s.version = "4.0.7"
       s.add_dependency "orm_adapter"
     end
 
-    update_git "ckeditor", :path => lib_path("ckeditor"), :remote => file_uri_for(@remote.path)
-    update_git "ckeditor", :path => lib_path("ckeditor"), :tag => "v4.0.7"
-    old_git = update_git "ckeditor", :path => lib_path("ckeditor"), :push => "v4.0.7"
+    update_git "ckeditor", path: lib_path("ckeditor"), remote: @remote.path
+    update_git "ckeditor", path: lib_path("ckeditor"), tag: "v4.0.7"
+    old_git = update_git "ckeditor", path: lib_path("ckeditor"), push: "v4.0.7"
 
-    update_git "ckeditor", :path => lib_path("ckeditor"), :gemspec => true do |s|
+    update_git "ckeditor", path: lib_path("ckeditor"), gemspec: true do |s|
       s.write "lib/ckeditor.rb", "CKEDITOR = '4.0.8'"
       s.version = "4.0.8"
       s.add_dependency "orm_adapter"
     end
-    update_git "ckeditor", :path => lib_path("ckeditor"), :tag => "v4.0.8"
+    update_git "ckeditor", path: lib_path("ckeditor"), tag: "v4.0.8"
 
-    new_git = update_git "ckeditor", :path => lib_path("ckeditor"), :push => "v4.0.8"
+    new_git = update_git "ckeditor", path: lib_path("ckeditor"), push: "v4.0.8"
 
     gemfile <<-G
-      source "#{file_uri_for(gem_repo4)}"
+      source "https://gem.repo4"
       gem "ckeditor", :git => "#{@remote.path}", :tag => "v4.0.8"
     G
 
@@ -584,7 +699,7 @@
             orm_adapter
 
       GEM
-        remote: #{file_uri_for(gem_repo4)}/
+        remote: https://gem.repo4/
         specs:
           orm_adapter (0.4.1)
 
@@ -611,7 +726,7 @@
             orm_adapter
 
       GEM
-        remote: #{file_uri_for(gem_repo4)}/
+        remote: https://gem.repo4/
         specs:
           orm_adapter (0.4.1)
 
@@ -629,8 +744,12 @@
   it "serializes pinned path sources to the lockfile" do
     build_lib "foo"
 
+    checksums = checksums_section_when_enabled do |c|
+      c.no_checksum "foo", "1.0"
+    end
+
     install_gemfile <<-G
-      source "#{file_uri_for(gem_repo1)}"
+      source "https://gem.repo1"
       gem "foo", :path => "#{lib_path("foo-1.0")}"
     G
 
@@ -641,7 +760,7 @@
           foo (1.0)
 
       GEM
-        remote: #{file_uri_for(gem_repo1)}/
+        remote: https://gem.repo1/
         specs:
 
       PLATFORMS
@@ -649,7 +768,7 @@
 
       DEPENDENCIES
         foo!
-
+      #{checksums}
       BUNDLED WITH
          #{Bundler::VERSION}
     G
@@ -659,13 +778,17 @@
     build_lib "foo"
 
     install_gemfile <<-G
-      source "#{file_uri_for(gem_repo1)}"
+      source "https://gem.repo1"
       gem "foo", :path => "#{lib_path("foo-1.0")}"
     G
 
+    checksums = checksums_section_when_enabled do |c|
+      c.no_checksum "foo", "1.0"
+    end
+
     bundle "config set cache_all true"
     bundle :cache
-    bundle :install, :local => true
+    bundle :install, local: true
 
     expect(lockfile).to eq <<~G
       PATH
@@ -674,7 +797,7 @@
           foo (1.0)
 
       GEM
-        remote: #{file_uri_for(gem_repo1)}/
+        remote: https://gem.repo1/
         specs:
 
       PLATFORMS
@@ -682,7 +805,7 @@
 
       DEPENDENCIES
         foo!
-
+      #{checksums}
       BUNDLED WITH
          #{Bundler::VERSION}
     G
@@ -692,10 +815,16 @@
     build_lib "foo"
     bar = build_git "bar"
 
+    checksums = checksums_section_when_enabled do |c|
+      c.no_checksum "foo", "1.0"
+      c.no_checksum "bar", "1.0"
+      c.checksum gem_repo2, "myrack", "1.0.0"
+    end
+
     install_gemfile <<-G
-      source "#{file_uri_for(gem_repo2)}/"
+      source "https://gem.repo2/"
 
-      gem "rack"
+      gem "myrack"
       gem "foo", :path => "#{lib_path("foo-1.0")}"
       gem "bar", :git => "#{lib_path("bar-1.0")}"
     G
@@ -713,9 +842,9 @@
           foo (1.0)
 
       GEM
-        remote: #{file_uri_for(gem_repo2)}/
+        remote: https://gem.repo2/
         specs:
-          rack (1.0.0)
+          myrack (1.0.0)
 
       PLATFORMS
         #{lockfile_platforms}
@@ -723,8 +852,8 @@
       DEPENDENCIES
         bar!
         foo!
-        rack
-
+        myrack
+      #{checksums}
       BUNDLED WITH
          #{Bundler::VERSION}
     G
@@ -732,23 +861,27 @@
 
   it "removes redundant sources" do
     install_gemfile <<-G
-      source "#{file_uri_for(gem_repo2)}/"
+      source "https://gem.repo2/"
 
-      gem "rack", :source => "#{file_uri_for(gem_repo2)}/"
+      gem "myrack", :source => "https://gem.repo2/"
     G
 
+    checksums = checksums_section_when_enabled do |c|
+      c.checksum gem_repo2, "myrack", "1.0.0"
+    end
+
     expect(lockfile).to eq <<~G
       GEM
-        remote: #{file_uri_for(gem_repo2)}/
+        remote: https://gem.repo2/
         specs:
-          rack (1.0.0)
+          myrack (1.0.0)
 
       PLATFORMS
         #{lockfile_platforms}
 
       DEPENDENCIES
-        rack!
-
+        myrack!
+      #{checksums}
       BUNDLED WITH
          #{Bundler::VERSION}
     G
@@ -756,34 +889,42 @@
 
   it "lists gems alphabetically" do
     install_gemfile <<-G
-      source "#{file_uri_for(gem_repo2)}/"
+      source "https://gem.repo2/"
 
       gem "thin"
       gem "actionpack"
-      gem "rack-obama"
+      gem "myrack-obama"
     G
 
+    checksums = checksums_section_when_enabled do |c|
+      c.checksum gem_repo2, "actionpack", "2.3.2"
+      c.checksum gem_repo2, "activesupport", "2.3.2"
+      c.checksum gem_repo2, "myrack", "1.0.0"
+      c.checksum gem_repo2, "myrack-obama", "1.0"
+      c.checksum gem_repo2, "thin", "1.0"
+    end
+
     expect(lockfile).to eq <<~G
       GEM
-        remote: #{file_uri_for(gem_repo2)}/
+        remote: https://gem.repo2/
         specs:
           actionpack (2.3.2)
             activesupport (= 2.3.2)
           activesupport (2.3.2)
-          rack (1.0.0)
-          rack-obama (1.0)
-            rack
+          myrack (1.0.0)
+          myrack-obama (1.0)
+            myrack
           thin (1.0)
-            rack
+            myrack
 
       PLATFORMS
         #{lockfile_platforms}
 
       DEPENDENCIES
         actionpack
-        rack-obama
+        myrack-obama
         thin
-
+      #{checksums}
       BUNDLED WITH
          #{Bundler::VERSION}
     G
@@ -791,14 +932,24 @@
 
   it "orders dependencies' dependencies in alphabetical order" do
     install_gemfile <<-G
-      source "#{file_uri_for(gem_repo2)}/"
+      source "https://gem.repo2/"
 
       gem "rails"
     G
 
+    checksums = checksums_section_when_enabled do |c|
+      c.checksum gem_repo2, "actionmailer", "2.3.2"
+      c.checksum gem_repo2, "actionpack", "2.3.2"
+      c.checksum gem_repo2, "activerecord", "2.3.2"
+      c.checksum gem_repo2, "activeresource", "2.3.2"
+      c.checksum gem_repo2, "activesupport", "2.3.2"
+      c.checksum gem_repo2, "rails", "2.3.2"
+      c.checksum gem_repo2, "rake", rake_version
+    end
+
     expect(lockfile).to eq <<~G
       GEM
-        remote: #{file_uri_for(gem_repo2)}/
+        remote: https://gem.repo2/
         specs:
           actionmailer (2.3.2)
             activesupport (= 2.3.2)
@@ -814,15 +965,15 @@
             actionpack (= 2.3.2)
             activerecord (= 2.3.2)
             activeresource (= 2.3.2)
-            rake (= 13.0.1)
-          rake (13.0.1)
+            rake (= #{rake_version})
+          rake (#{rake_version})
 
       PLATFORMS
         #{lockfile_platforms}
 
       DEPENDENCIES
         rails
-
+      #{checksums}
       BUNDLED WITH
          #{Bundler::VERSION}
     G
@@ -833,20 +984,25 @@
       # Capistrano did this (at least until version 2.5.10)
       # RubyGems 2.2 doesn't allow the specifying of a dependency twice
       # See https://github.com/rubygems/rubygems/commit/03dbac93a3396a80db258d9bc63500333c25bd2f
-      build_gem "double_deps", "1.0", :skip_validation => true do |s|
+      build_gem "double_deps", "1.0", skip_validation: true do |s|
         s.add_dependency "net-ssh", ">= 1.0.0"
         s.add_dependency "net-ssh"
       end
     end
 
     install_gemfile <<-G
-      source "#{file_uri_for(gem_repo2)}/"
+      source "https://gem.repo2"
       gem 'double_deps'
     G
 
+    checksums = checksums_section_when_enabled do |c|
+      c.checksum gem_repo2, "double_deps", "1.0"
+      c.checksum gem_repo2, "net-ssh", "1.0"
+    end
+
     expect(lockfile).to eq <<~G
       GEM
-        remote: #{file_uri_for(gem_repo2)}/
+        remote: https://gem.repo2/
         specs:
           double_deps (1.0)
             net-ssh
@@ -858,7 +1014,7 @@
 
       DEPENDENCIES
         double_deps
-
+      #{checksums}
       BUNDLED WITH
          #{Bundler::VERSION}
     G
@@ -866,25 +1022,30 @@
 
   it "does not add the :require option to the lockfile" do
     install_gemfile <<-G
-      source "#{file_uri_for(gem_repo2)}/"
+      source "https://gem.repo2/"
 
-      gem "rack-obama", ">= 1.0", :require => "rack/obama"
+      gem "myrack-obama", ">= 1.0", :require => "myrack/obama"
     G
 
+    checksums = checksums_section_when_enabled do |c|
+      c.checksum gem_repo2, "myrack", "1.0.0"
+      c.checksum gem_repo2, "myrack-obama", "1.0"
+    end
+
     expect(lockfile).to eq <<~G
       GEM
-        remote: #{file_uri_for(gem_repo2)}/
+        remote: https://gem.repo2/
         specs:
-          rack (1.0.0)
-          rack-obama (1.0)
-            rack
+          myrack (1.0.0)
+          myrack-obama (1.0)
+            myrack
 
       PLATFORMS
         #{lockfile_platforms}
 
       DEPENDENCIES
-        rack-obama (>= 1.0)
-
+        myrack-obama (>= 1.0)
+      #{checksums}
       BUNDLED WITH
          #{Bundler::VERSION}
     G
@@ -892,35 +1053,44 @@
 
   it "does not add the :group option to the lockfile" do
     install_gemfile <<-G
-      source "#{file_uri_for(gem_repo2)}/"
+      source "https://gem.repo2/"
 
-      gem "rack-obama", ">= 1.0", :group => :test
+      gem "myrack-obama", ">= 1.0", :group => :test
     G
 
+    checksums = checksums_section_when_enabled do |c|
+      c.checksum gem_repo2, "myrack", "1.0.0"
+      c.checksum gem_repo2, "myrack-obama", "1.0"
+    end
+
     expect(lockfile).to eq <<~G
       GEM
-        remote: #{file_uri_for(gem_repo2)}/
+        remote: https://gem.repo2/
         specs:
-          rack (1.0.0)
-          rack-obama (1.0)
-            rack
+          myrack (1.0.0)
+          myrack-obama (1.0)
+            myrack
 
       PLATFORMS
         #{lockfile_platforms}
 
       DEPENDENCIES
-        rack-obama (>= 1.0)
-
+        myrack-obama (>= 1.0)
+      #{checksums}
       BUNDLED WITH
          #{Bundler::VERSION}
     G
   end
 
   it "stores relative paths when the path is provided in a relative fashion and in Gemfile dir" do
-    build_lib "foo", :path => bundled_app("foo")
+    build_lib "foo", path: bundled_app("foo")
+
+    checksums = checksums_section_when_enabled do |c|
+      c.no_checksum "foo", "1.0"
+    end
 
     install_gemfile <<-G
-      source "#{file_uri_for(gem_repo1)}"
+      source "https://gem.repo1"
       path "foo" do
         gem "foo"
       end
@@ -933,7 +1103,7 @@
           foo (1.0)
 
       GEM
-        remote: #{file_uri_for(gem_repo1)}/
+        remote: https://gem.repo1/
         specs:
 
       PLATFORMS
@@ -941,17 +1111,21 @@
 
       DEPENDENCIES
         foo!
-
+      #{checksums}
       BUNDLED WITH
          #{Bundler::VERSION}
     G
   end
 
   it "stores relative paths when the path is provided in a relative fashion and is above Gemfile dir" do
-    build_lib "foo", :path => bundled_app(File.join("..", "foo"))
+    build_lib "foo", path: bundled_app(File.join("..", "foo"))
+
+    checksums = checksums_section_when_enabled do |c|
+      c.no_checksum "foo", "1.0"
+    end
 
     install_gemfile <<-G
-      source "#{file_uri_for(gem_repo1)}"
+      source "https://gem.repo1"
       path "../foo" do
         gem "foo"
       end
@@ -964,7 +1138,7 @@
           foo (1.0)
 
       GEM
-        remote: #{file_uri_for(gem_repo1)}/
+        remote: https://gem.repo1/
         specs:
 
       PLATFORMS
@@ -972,22 +1146,26 @@
 
       DEPENDENCIES
         foo!
-
+      #{checksums}
       BUNDLED WITH
          #{Bundler::VERSION}
     G
   end
 
   it "stores relative paths when the path is provided in an absolute fashion but is relative" do
-    build_lib "foo", :path => bundled_app("foo")
+    build_lib "foo", path: bundled_app("foo")
 
     install_gemfile <<-G
-      source "#{file_uri_for(gem_repo1)}"
+      source "https://gem.repo1"
       path File.expand_path("foo", __dir__) do
         gem "foo"
       end
     G
 
+    checksums = checksums_section_when_enabled do |c|
+      c.no_checksum "foo", "1.0"
+    end
+
     expect(lockfile).to eq <<~G
       PATH
         remote: foo
@@ -995,7 +1173,7 @@
           foo (1.0)
 
       GEM
-        remote: #{file_uri_for(gem_repo1)}/
+        remote: https://gem.repo1/
         specs:
 
       PLATFORMS
@@ -1003,17 +1181,21 @@
 
       DEPENDENCIES
         foo!
-
+      #{checksums}
       BUNDLED WITH
          #{Bundler::VERSION}
     G
   end
 
   it "stores relative paths when the path is provided for gemspec" do
-    build_lib("foo", :path => tmp.join("foo"))
+    build_lib("foo", path: tmp("foo"))
+
+    checksums = checksums_section_when_enabled do |c|
+      c.no_checksum "foo", "1.0"
+    end
 
     install_gemfile <<-G
-      source "#{file_uri_for(gem_repo1)}"
+      source "https://gem.repo1"
       gemspec :path => "../foo"
     G
 
@@ -1024,7 +1206,7 @@
           foo (1.0)
 
       GEM
-        remote: #{file_uri_for(gem_repo1)}/
+        remote: https://gem.repo1/
         specs:
 
       PLATFORMS
@@ -1032,52 +1214,103 @@
 
       DEPENDENCIES
         foo!
-
+      #{checksums}
       BUNDLED WITH
          #{Bundler::VERSION}
     G
   end
 
   it "keeps existing platforms in the lockfile" do
+    checksums = checksums_section_when_enabled do |c|
+      c.no_checksum "myrack", "1.0.0"
+    end
+
     lockfile <<-G
       GEM
-        remote: #{file_uri_for(gem_repo2)}/
+        remote: https://gem.repo2/
         specs:
-          rack (1.0.0)
+          myrack (1.0.0)
 
       PLATFORMS
         java
 
       DEPENDENCIES
-        rack
-
+        myrack
+      #{checksums}
       BUNDLED WITH
          #{Bundler::VERSION}
     G
 
     install_gemfile <<-G
-      source "#{file_uri_for(gem_repo2)}/"
+      source "https://gem.repo2/"
 
-      gem "rack"
+      gem "myrack"
     G
 
+    checksums.checksum(gem_repo2, "myrack", "1.0.0")
+
     expect(lockfile).to eq <<~G
       GEM
-        remote: #{file_uri_for(gem_repo2)}/
+        remote: https://gem.repo2/
         specs:
-          rack (1.0.0)
+          myrack (1.0.0)
 
       PLATFORMS
-        #{lockfile_platforms("java")}
+        #{lockfile_platforms("java", local_platform, defaults: [])}
 
       DEPENDENCIES
-        rack
-
+        myrack
+      #{checksums}
       BUNDLED WITH
          #{Bundler::VERSION}
     G
   end
 
+  it "adds compatible platform specific variants to the lockfile, even if resolution fallback to ruby due to some other incompatible platform specific variant" do
+    simulate_platform "arm64-darwin-23" do
+      build_repo4 do
+        build_gem "google-protobuf", "3.25.1"
+        build_gem "google-protobuf", "3.25.1" do |s|
+          s.platform = "arm64-darwin-23"
+        end
+        build_gem "google-protobuf", "3.25.1" do |s|
+          s.platform = "x64-mingw-ucrt"
+          s.required_ruby_version = "> #{Gem.ruby_version}"
+        end
+      end
+
+      gemfile <<-G
+        source "https://gem.repo4"
+        gem "google-protobuf"
+      G
+      bundle "lock --add-platform x64-mingw-ucrt"
+
+      checksums = checksums_section_when_enabled do |c|
+        c.checksum gem_repo4, "google-protobuf", "3.25.1"
+        c.checksum gem_repo4, "google-protobuf", "3.25.1", "arm64-darwin-23"
+      end
+
+      expect(lockfile).to eq <<~L
+        GEM
+          remote: https://gem.repo4/
+          specs:
+            google-protobuf (3.25.1)
+            google-protobuf (3.25.1-arm64-darwin-23)
+
+        PLATFORMS
+          arm64-darwin-23
+          ruby
+          x64-mingw-ucrt
+
+        DEPENDENCIES
+          google-protobuf
+        #{checksums}
+        BUNDLED WITH
+           #{Bundler::VERSION}
+      L
+    end
+  end
+
   it "persists the spec's specific platform to the lockfile" do
     build_repo2 do
       build_gem "platform_specific", "1.0" do |s|
@@ -1085,197 +1318,226 @@
       end
     end
 
-    simulate_platform "universal-java-16"
-
-    install_gemfile <<-G
-      source "#{file_uri_for(gem_repo2)}"
-      gem "platform_specific"
-    G
+    simulate_platform "universal-java-16" do
+      install_gemfile <<-G
+        source "https://gem.repo2"
+        gem "platform_specific"
+      G
 
-    expect(lockfile).to eq <<~G
-      GEM
-        remote: #{file_uri_for(gem_repo2)}/
-        specs:
-          platform_specific (1.0-universal-java-16)
+      checksums = checksums_section_when_enabled do |c|
+        c.checksum gem_repo2, "platform_specific", "1.0", "universal-java-16"
+      end
 
-      PLATFORMS
-        universal-java-16
+      expect(lockfile).to eq <<~G
+        GEM
+          remote: https://gem.repo2/
+          specs:
+            platform_specific (1.0-universal-java-16)
 
-      DEPENDENCIES
-        platform_specific
+        PLATFORMS
+          universal-java-16
 
-      BUNDLED WITH
-         #{Bundler::VERSION}
-    G
+        DEPENDENCIES
+          platform_specific
+        #{checksums}
+        BUNDLED WITH
+           #{Bundler::VERSION}
+      G
+    end
   end
 
   it "does not add duplicate gems" do
+    checksums = checksums_section_when_enabled do |c|
+      c.checksum(gem_repo2, "activesupport", "2.3.5")
+      c.checksum(gem_repo2, "myrack", "1.0.0")
+    end
+
     install_gemfile <<-G
-      source "#{file_uri_for(gem_repo2)}/"
-      gem "rack"
+      source "https://gem.repo2/"
+      gem "myrack"
     G
 
     install_gemfile <<-G
-      source "#{file_uri_for(gem_repo2)}/"
-      gem "rack"
+      source "https://gem.repo2/"
+      gem "myrack"
       gem "activesupport"
     G
 
     expect(lockfile).to eq <<~G
       GEM
-        remote: #{file_uri_for(gem_repo2)}/
+        remote: https://gem.repo2/
         specs:
           activesupport (2.3.5)
-          rack (1.0.0)
+          myrack (1.0.0)
 
       PLATFORMS
         #{lockfile_platforms}
 
       DEPENDENCIES
         activesupport
-        rack
-
+        myrack
+      #{checksums}
       BUNDLED WITH
          #{Bundler::VERSION}
     G
   end
 
   it "does not add duplicate dependencies" do
+    checksums = checksums_section_when_enabled do |c|
+      c.checksum(gem_repo2, "myrack", "1.0.0")
+    end
+
     install_gemfile <<-G
-      source "#{file_uri_for(gem_repo2)}/"
-      gem "rack"
-      gem "rack"
+      source "https://gem.repo2/"
+      gem "myrack"
+      gem "myrack"
     G
 
     expect(lockfile).to eq <<~G
       GEM
-        remote: #{file_uri_for(gem_repo2)}/
+        remote: https://gem.repo2/
         specs:
-          rack (1.0.0)
+          myrack (1.0.0)
 
       PLATFORMS
         #{lockfile_platforms}
 
       DEPENDENCIES
-        rack
-
+        myrack
+      #{checksums}
       BUNDLED WITH
          #{Bundler::VERSION}
     G
   end
 
   it "does not add duplicate dependencies with versions" do
+    checksums = checksums_section_when_enabled do |c|
+      c.checksum(gem_repo2, "myrack", "1.0.0")
+    end
+
     install_gemfile <<-G
-      source "#{file_uri_for(gem_repo2)}/"
-      gem "rack", "1.0"
-      gem "rack", "1.0"
+      source "https://gem.repo2/"
+      gem "myrack", "1.0"
+      gem "myrack", "1.0"
     G
 
     expect(lockfile).to eq <<~G
       GEM
-        remote: #{file_uri_for(gem_repo2)}/
+        remote: https://gem.repo2/
         specs:
-          rack (1.0.0)
+          myrack (1.0.0)
 
       PLATFORMS
         #{lockfile_platforms}
 
       DEPENDENCIES
-        rack (= 1.0)
-
+        myrack (= 1.0)
+      #{checksums}
       BUNDLED WITH
          #{Bundler::VERSION}
     G
   end
 
   it "does not add duplicate dependencies in different groups" do
+    checksums = checksums_section_when_enabled do |c|
+      c.checksum(gem_repo2, "myrack", "1.0.0")
+    end
+
     install_gemfile <<-G
-      source "#{file_uri_for(gem_repo2)}/"
-      gem "rack", "1.0", :group => :one
-      gem "rack", "1.0", :group => :two
+      source "https://gem.repo2/"
+      gem "myrack", "1.0", :group => :one
+      gem "myrack", "1.0", :group => :two
     G
 
     expect(lockfile).to eq <<~G
       GEM
-        remote: #{file_uri_for(gem_repo2)}/
+        remote: https://gem.repo2/
         specs:
-          rack (1.0.0)
+          myrack (1.0.0)
 
       PLATFORMS
         #{lockfile_platforms}
 
       DEPENDENCIES
-        rack (= 1.0)
-
+        myrack (= 1.0)
+      #{checksums}
       BUNDLED WITH
          #{Bundler::VERSION}
     G
   end
 
   it "raises if two different versions are used" do
-    install_gemfile <<-G, :raise_on_error => false
-      source "#{file_uri_for(gem_repo2)}/"
-      gem "rack", "1.0"
-      gem "rack", "1.1"
+    install_gemfile <<-G, raise_on_error: false
+      source "https://gem.repo2/"
+      gem "myrack", "1.0"
+      gem "myrack", "1.1"
     G
 
     expect(bundled_app_lock).not_to exist
-    expect(err).to include "rack (= 1.0) and rack (= 1.1)"
+    expect(err).to include "myrack (= 1.0) and myrack (= 1.1)"
   end
 
   it "raises if two different sources are used" do
-    install_gemfile <<-G, :raise_on_error => false
-      source "#{file_uri_for(gem_repo2)}/"
-      gem "rack"
-      gem "rack", :git => "git://hubz.com"
+    install_gemfile <<-G, raise_on_error: false
+      source "https://gem.repo2/"
+      gem "myrack"
+      gem "myrack", :git => "git://hubz.com"
     G
 
     expect(bundled_app_lock).not_to exist
-    expect(err).to include "rack (>= 0) should come from an unspecified source and git://hubz.com"
+    expect(err).to include "myrack (>= 0) should come from an unspecified source and git://hubz.com"
   end
 
   it "works correctly with multiple version dependencies" do
+    checksums = checksums_section_when_enabled do |c|
+      c.checksum(gem_repo2, "myrack", "0.9.1")
+    end
+
     install_gemfile <<-G
-      source "#{file_uri_for(gem_repo2)}/"
-      gem "rack", "> 0.9", "< 1.0"
+      source "https://gem.repo2/"
+      gem "myrack", "> 0.9", "< 1.0"
     G
 
     expect(lockfile).to eq <<~G
       GEM
-        remote: #{file_uri_for(gem_repo2)}/
+        remote: https://gem.repo2/
         specs:
-          rack (0.9.1)
+          myrack (0.9.1)
 
       PLATFORMS
         #{lockfile_platforms}
 
       DEPENDENCIES
-        rack (> 0.9, < 1.0)
-
+        myrack (> 0.9, < 1.0)
+      #{checksums}
       BUNDLED WITH
          #{Bundler::VERSION}
     G
   end
 
   it "captures the Ruby version in the lockfile" do
+    checksums = checksums_section_when_enabled do |c|
+      c.checksum(gem_repo2, "myrack", "0.9.1")
+    end
+
     install_gemfile <<-G
-      source "#{file_uri_for(gem_repo2)}/"
+      source "https://gem.repo2/"
       ruby '#{Gem.ruby_version}'
-      gem "rack", "> 0.9", "< 1.0"
+      gem "myrack", "> 0.9", "< 1.0"
     G
 
     expect(lockfile).to eq <<~G
       GEM
-        remote: #{file_uri_for(gem_repo2)}/
+        remote: https://gem.repo2/
         specs:
-          rack (0.9.1)
+          myrack (0.9.1)
 
       PLATFORMS
         #{lockfile_platforms}
 
       DEPENDENCIES
-        rack (> 0.9, < 1.0)
-
+        myrack (> 0.9, < 1.0)
+      #{checksums}
       RUBY VERSION
          #{Bundler::RubyVersion.system}
 
@@ -1284,27 +1546,274 @@
     G
   end
 
-  it "raises a helpful error message when the lockfile is missing deps" do
+  it "automatically fixes the lockfile when it's missing deps" do
     lockfile <<-L
       GEM
-        remote: #{file_uri_for(gem_repo2)}/
+        remote: https://gem.repo2/
         specs:
-          rack_middleware (1.0)
+          myrack_middleware (1.0)
 
       PLATFORMS
         #{lockfile_platforms}
 
       DEPENDENCIES
-        rack_middleware
+        myrack_middleware
+
+      BUNDLED WITH
+         #{Bundler::VERSION}
     L
 
-    install_gemfile <<-G, :raise_on_error => false
-      source "#{file_uri_for(gem_repo2)}"
-      gem "rack_middleware"
+    install_gemfile <<-G
+      source "https://gem.repo2"
+      gem "myrack_middleware"
+    G
+
+    expect(lockfile).to eq <<~L
+      GEM
+        remote: https://gem.repo2/
+        specs:
+          myrack (0.9.1)
+          myrack_middleware (1.0)
+            myrack (= 0.9.1)
+
+      PLATFORMS
+        #{lockfile_platforms}
+
+      DEPENDENCIES
+        myrack_middleware
+
+      BUNDLED WITH
+         #{Bundler::VERSION}
+    L
+  end
+
+  it "raises a clear error when frozen mode is set and lockfile is missing deps, and does not install any gems" do
+    lockfile <<-L
+      GEM
+        remote: https://gem.repo2/
+        specs:
+          myrack_middleware (1.0)
+
+      PLATFORMS
+        #{lockfile_platforms}
+
+      DEPENDENCIES
+        myrack_middleware
+
+      BUNDLED WITH
+         #{Bundler::VERSION}
+    L
+
+    install_gemfile <<-G, env: { "BUNDLE_FROZEN" => "true" }, raise_on_error: false
+      source "https://gem.repo2"
+      gem "myrack_middleware"
+    G
+
+    expect(err).to eq("Bundler found incorrect dependencies in the lockfile for myrack_middleware-1.0")
+    expect(the_bundle).not_to include_gems "myrack_middleware 1.0"
+  end
+
+  it "raises a clear error when frozen mode is set and lockfile is missing entries in CHECKSUMS section, and does not install any gems" do
+    lockfile <<-L
+      GEM
+        remote: https://gem.repo2/
+        specs:
+          myrack_middleware (1.0)
+
+      PLATFORMS
+        #{lockfile_platforms}
+
+      DEPENDENCIES
+        myrack_middleware
+
+      CHECKSUMS
+
+      BUNDLED WITH
+         #{Bundler::VERSION}
+    L
+
+    install_gemfile <<-G, env: { "BUNDLE_FROZEN" => "true" }, raise_on_error: false
+      source "https://gem.repo2"
+      gem "myrack_middleware"
+    G
+
+    expect(err).to eq <<~L.strip
+      Your lockfile is missing a checksums entry for \"myrack_middleware\", but can't be updated because frozen mode is set
+
+      Run `bundle install` elsewhere and add the updated Gemfile.lock to version control.
+    L
+
+    expect(the_bundle).not_to include_gems "myrack_middleware 1.0"
+  end
+
+  it "automatically fixes the lockfile when it's missing deps, they conflict with other locked deps, but conflicts are fixable" do
+    build_repo4 do
+      build_gem "other_dep", "0.9"
+      build_gem "other_dep", "1.0"
+
+      build_gem "myrack", "0.9.1"
+
+      build_gem "myrack_middleware", "1.0" do |s|
+        s.add_dependency "myrack", "= 0.9.1"
+        s.add_dependency "other_dep", "= 0.9"
+      end
+    end
+
+    lockfile <<~L
+      GEM
+        remote: https://gem.repo4/
+        specs:
+          myrack_middleware (1.0)
+          other_dep (1.0)
+
+      PLATFORMS
+        #{lockfile_platforms}
+
+      DEPENDENCIES
+        myrack_middleware
+        other_dep
+
+      BUNDLED WITH
+         #{Bundler::VERSION}
+    L
+
+    install_gemfile <<-G
+      source "https://gem.repo4"
+      gem "myrack_middleware"
+      gem "other_dep"
     G
 
-    expect(err).to include("Downloading rack_middleware-1.0 revealed dependencies not in the API or the lockfile (#{Gem::Dependency.new("rack", "= 0.9.1")}).").
-      and include("Running `bundle update rack_middleware` should fix the problem.")
+    expect(lockfile).to eq <<~L
+      GEM
+        remote: https://gem.repo4/
+        specs:
+          myrack (0.9.1)
+          myrack_middleware (1.0)
+            myrack (= 0.9.1)
+            other_dep (= 0.9)
+          other_dep (0.9)
+
+      PLATFORMS
+        #{lockfile_platforms}
+
+      DEPENDENCIES
+        myrack_middleware
+        other_dep
+
+      BUNDLED WITH
+         #{Bundler::VERSION}
+    L
+  end
+
+  it "automatically fixes the lockfile when it's missing multiple deps, they conflict with other locked deps, but conflicts are fixable" do
+    build_repo4 do
+      build_gem "other_dep", "0.9"
+      build_gem "other_dep", "1.0"
+
+      build_gem "myrack", "0.9.1"
+
+      build_gem "myrack_middleware", "1.0" do |s|
+        s.add_dependency "myrack", "= 0.9.1"
+      end
+
+      build_gem "another_dep_middleware", "1.0" do |s|
+        s.add_dependency "other_dep", "= 0.9"
+      end
+    end
+
+    lockfile <<~L
+      GEM
+        remote: https://gem.repo4/
+        specs:
+          myrack_middleware (1.0)
+          another_dep_middleware (1.0)
+
+      PLATFORMS
+        #{lockfile_platforms}
+
+      DEPENDENCIES
+        myrack_middleware
+        another_dep_middleware
+
+      BUNDLED WITH
+         #{Bundler::VERSION}
+    L
+
+    install_gemfile <<-G
+      source "https://gem.repo4"
+      gem "myrack_middleware"
+      gem "another_dep_middleware"
+    G
+
+    expect(lockfile).to eq <<~L
+      GEM
+        remote: https://gem.repo4/
+        specs:
+          another_dep_middleware (1.0)
+            other_dep (= 0.9)
+          myrack (0.9.1)
+          myrack_middleware (1.0)
+            myrack (= 0.9.1)
+          other_dep (0.9)
+
+      PLATFORMS
+        #{lockfile_platforms}
+
+      DEPENDENCIES
+        another_dep_middleware
+        myrack_middleware
+
+      BUNDLED WITH
+         #{Bundler::VERSION}
+    L
+  end
+
+  it "raises a resolution error when lockfile is missing deps, they conflict with other locked deps, and conflicts are not fixable" do
+    build_repo4 do
+      build_gem "other_dep", "0.9"
+      build_gem "other_dep", "1.0"
+
+      build_gem "myrack", "0.9.1"
+
+      build_gem "myrack_middleware", "1.0" do |s|
+        s.add_dependency "myrack", "= 0.9.1"
+        s.add_dependency "other_dep", "= 0.9"
+      end
+    end
+
+    lockfile <<~L
+      GEM
+        remote: https://gem.repo4/
+        specs:
+          myrack_middleware (1.0)
+          other_dep (1.0)
+
+      PLATFORMS
+        #{lockfile_platforms}
+
+      DEPENDENCIES
+        myrack_middleware
+        other_dep
+
+      BUNDLED WITH
+         #{Bundler::VERSION}
+    L
+
+    install_gemfile <<-G, raise_on_error: false
+      source "https://gem.repo4"
+      gem "myrack_middleware"
+      gem "other_dep", "1.0"
+    G
+
+    expect(err).to eq <<~ERROR.strip
+      Could not find compatible versions
+
+      Because every version of myrack_middleware depends on other_dep = 0.9
+        and Gemfile depends on myrack_middleware >= 0,
+        other_dep = 0.9 is required.
+      So, because Gemfile depends on other_dep = 1.0,
+        version solving has failed.
+    ERROR
   end
 
   it "regenerates a lockfile with no specs" do
@@ -1320,7 +1829,7 @@
 
     lockfile <<-G
       GEM
-        remote: #{file_uri_for(gem_repo4)}/
+        remote: https://gem.repo4/
         specs:
 
       PLATFORMS
@@ -1334,21 +1843,21 @@
     G
 
     install_gemfile <<-G
-      source "#{file_uri_for(gem_repo4)}"
+      source "https://gem.repo4"
 
       gem "direct_dependency"
     G
 
     expect(lockfile).to eq <<~G
       GEM
-        remote: #{file_uri_for(gem_repo4)}/
+        remote: https://gem.repo4/
         specs:
           direct_dependency (4.5.6)
             indirect_dependency
           indirect_dependency (1.2.3)
 
       PLATFORMS
-        #{formatted_lockfile_platforms(*["ruby", generic_local_platform].uniq)}
+        #{lockfile_platforms(generic_default_locked_platform || local_platform, defaults: ["ruby"])}
 
       DEPENDENCIES
         direct_dependency
@@ -1358,6 +1867,217 @@
     G
   end
 
+  it "automatically fixes the lockfile when it's missing deps and the full index is in use" do
+    lockfile <<-L
+      GEM
+        remote: https://gem.repo2/
+        specs:
+          myrack_middleware (1.0)
+
+      PLATFORMS
+        #{lockfile_platforms}
+
+      DEPENDENCIES
+        myrack_middleware
+
+      BUNDLED WITH
+         #{Bundler::VERSION}
+    L
+
+    install_gemfile <<-G
+      source "#{file_uri_for(gem_repo2)}"
+      gem "myrack_middleware"
+    G
+
+    expect(lockfile).to eq <<~L
+      GEM
+        remote: #{file_uri_for(gem_repo2)}/
+        specs:
+          myrack (0.9.1)
+          myrack_middleware (1.0)
+            myrack (= 0.9.1)
+
+      PLATFORMS
+        #{lockfile_platforms}
+
+      DEPENDENCIES
+        myrack_middleware
+
+      BUNDLED WITH
+         #{Bundler::VERSION}
+    L
+  end
+
+  it "automatically fixes the lockfile when it includes a gem under the correct GIT section, but also under an incorrect GEM section, with a higher version, and with no explicit Gemfile requirement" do
+    git = build_git "foo"
+
+    gemfile <<~G
+      source "https://gem.repo1/"
+      gem "foo", git: "#{lib_path("foo-1.0")}"
+    G
+
+    # If the lockfile erroneously lists platform versions of the gem
+    # that don't match the locked version of the git repo we should remove them.
+
+    lockfile <<~L
+      GIT
+        remote: #{lib_path("foo-1.0")}
+        revision: #{git.ref_for("main")}
+        specs:
+          foo (1.0)
+
+      GEM
+        remote: https://gem.repo1/
+        specs:
+          foo (1.1-x86_64-linux-gnu)
+
+      PLATFORMS
+        #{lockfile_platforms}
+
+      DEPENDENCIES
+        foo!
+
+      BUNDLED WITH
+         #{Bundler::VERSION}
+    L
+
+    bundle "install"
+
+    expect(lockfile).to eq <<~L
+      GIT
+        remote: #{lib_path("foo-1.0")}
+        revision: #{git.ref_for("main")}
+        specs:
+          foo (1.0)
+
+      GEM
+        remote: https://gem.repo1/
+        specs:
+
+      PLATFORMS
+        #{lockfile_platforms}
+
+      DEPENDENCIES
+        foo!
+
+      BUNDLED WITH
+         #{Bundler::VERSION}
+    L
+  end
+
+  it "automatically fixes the lockfile when it includes a gem under the correct GIT section, but also under an incorrect GEM section, with a higher version" do
+    git = build_git "foo"
+
+    gemfile <<~G
+      source "https://gem.repo1/"
+      gem "foo", "= 1.0", git: "#{lib_path("foo-1.0")}"
+    G
+
+    # If the lockfile erroneously lists platform versions of the gem
+    # that don't match the locked version of the git repo we should remove them.
+
+    lockfile <<~L
+      GIT
+        remote: #{lib_path("foo-1.0")}
+        revision: #{git.ref_for("main")}
+        specs:
+          foo (1.0)
+
+      GEM
+        remote: https://gem.repo1/
+        specs:
+          foo (1.1-x86_64-linux-gnu)
+
+      PLATFORMS
+        #{lockfile_platforms}
+
+      DEPENDENCIES
+        foo (= 1.0)!
+
+      BUNDLED WITH
+         #{Bundler::VERSION}
+    L
+
+    bundle "install"
+
+    expect(lockfile).to eq <<~L
+      GIT
+        remote: #{lib_path("foo-1.0")}
+        revision: #{git.ref_for("main")}
+        specs:
+          foo (1.0)
+
+      GEM
+        remote: https://gem.repo1/
+        specs:
+
+      PLATFORMS
+        #{lockfile_platforms}
+
+      DEPENDENCIES
+        foo (= 1.0)!
+
+      BUNDLED WITH
+         #{Bundler::VERSION}
+    L
+  end
+
+  it "automatically fixes the lockfile when it has incorrect deps, keeping the locked version" do
+    build_repo4 do
+      build_gem "net-smtp", "0.5.0" do |s|
+        s.add_dependency "net-protocol"
+      end
+
+      build_gem "net-smtp", "0.5.1" do |s|
+        s.add_dependency "net-protocol"
+      end
+
+      build_gem "net-protocol", "0.2.2"
+    end
+
+    gemfile <<~G
+      source "#{file_uri_for(gem_repo4)}"
+      gem "net-smtp"
+    G
+
+    lockfile <<~L
+      GEM
+        remote: #{file_uri_for(gem_repo4)}/
+        specs:
+          net-protocol (0.2.2)
+          net-smtp (0.5.0)
+
+      PLATFORMS
+        #{lockfile_platforms}
+
+      DEPENDENCIES
+        net-smtp
+
+      BUNDLED WITH
+         #{Bundler::VERSION}
+    L
+
+    bundle "install"
+
+    expect(lockfile).to eq <<~L
+      GEM
+        remote: #{file_uri_for(gem_repo4)}/
+        specs:
+          net-protocol (0.2.2)
+          net-smtp (0.5.0)
+            net-protocol
+
+      PLATFORMS
+        #{lockfile_platforms}
+
+      DEPENDENCIES
+        net-smtp
+
+      BUNDLED WITH
+         #{Bundler::VERSION}
+    L
+  end
+
   shared_examples_for "a lockfile missing dependent specs" do
     it "auto-heals" do
       build_repo4 do
@@ -1369,14 +2089,14 @@
       end
 
       gemfile <<~G
-        source "#{file_uri_for(gem_repo4)}"
+        source "https://gem.repo4"
         gem "minitest-bisect"
       G
 
       # Corrupt lockfile (completely missing path_expander)
       lockfile <<~L
         GEM
-          remote: #{file_uri_for(gem_repo4)}/
+          remote: https://gem.repo4/
           specs:
             minitest-bisect (1.6.0)
 
@@ -1390,12 +2110,12 @@
            #{Bundler::VERSION}
       L
 
-      cache_gems "minitest-bisect-1.6.0", "path_expander-1.1.1", :gem_repo => gem_repo4
+      cache_gems "minitest-bisect-1.6.0", "path_expander-1.1.1", gem_repo: gem_repo4
       bundle :install
 
       expect(lockfile).to eq <<~L
         GEM
-          remote: #{file_uri_for(gem_repo4)}/
+          remote: https://gem.repo4/
           specs:
             minitest-bisect (1.6.0)
               path_expander (~> 1.1)
@@ -1435,13 +2155,13 @@
     end
 
     gemfile <<~G
-      source "#{file_uri_for(gem_repo4)}"
+      source "https://gem.repo4"
       gem "minitest-bisect"
     G
 
     lockfile <<~L
       GEM
-        remote: #{file_uri_for(gem_repo4)}/
+        remote: https://gem.repo4/
         specs:
           minitest-bisect (1.6.0)
             path_expander (~> 1.1)
@@ -1457,11 +2177,11 @@
     L
 
     bundle "install --verbose"
-    expect(out).to include("re-resolving dependencies because your lock file is missing \"minitest-bisect\"")
+    expect(out).to include("re-resolving dependencies because your lockfile includes \"minitest-bisect\" but not some of its dependencies")
 
     expect(lockfile).to eq <<~L
       GEM
-        remote: #{file_uri_for(gem_repo4)}/
+        remote: https://gem.repo4/
         specs:
           minitest-bisect (1.6.0)
             path_expander (~> 1.1)
@@ -1487,36 +2207,36 @@ def set_lockfile_mtime_to_known_value
       build_repo2
 
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo2)}"
-        gem "rack"
+        source "https://gem.repo2"
+        gem "myrack"
       G
       set_lockfile_mtime_to_known_value
     end
 
     it "generates Gemfile.lock with \\n line endings" do
       expect(File.read(bundled_app_lock)).not_to match("\r\n")
-      expect(the_bundle).to include_gems "rack 1.0"
+      expect(the_bundle).to include_gems "myrack 1.0"
     end
 
     context "during updates" do
       it "preserves Gemfile.lock \\n line endings" do
         update_repo2 do
-          build_gem "rack", "1.2" do |s|
-            s.executables = "rackup"
+          build_gem "myrack", "1.2" do |s|
+            s.executables = "myrackup"
           end
         end
 
-        expect { bundle "update", :all => true }.to change { File.mtime(bundled_app_lock) }
+        expect { bundle "update", all: true }.to change { File.mtime(bundled_app_lock) }
         expect(File.read(bundled_app_lock)).not_to match("\r\n")
-        expect(the_bundle).to include_gems "rack 1.2"
+        expect(the_bundle).to include_gems "myrack 1.2"
       end
 
       it "preserves Gemfile.lock \\n\\r line endings" do
         skip "needs to be adapted" if Gem.win_platform?
 
         update_repo2 do
-          build_gem "rack", "1.2" do |s|
-            s.executables = "rackup"
+          build_gem "myrack", "1.2" do |s|
+            s.executables = "myrackup"
           end
         end
 
@@ -1524,12 +2244,10 @@ def set_lockfile_mtime_to_known_value
         File.open(bundled_app_lock, "wb") {|f| f.puts(win_lock) }
         set_lockfile_mtime_to_known_value
 
-        expect { bundle "update", :all => true }.to change { File.mtime(bundled_app_lock) }
+        expect { bundle "update", all: true }.to change { File.mtime(bundled_app_lock) }
         expect(File.read(bundled_app_lock)).to match("\r\n")
 
-        simulate_bundler_version_when_missing_prerelease_default_gem_activation do
-          expect(the_bundle).to include_gems "rack 1.2"
-        end
+        expect(the_bundle).to include_gems "myrack 1.2"
       end
     end
 
@@ -1550,7 +2268,7 @@ def set_lockfile_mtime_to_known_value
 
         expect do
           ruby <<-RUBY
-                   require '#{entrypoint}'
+                   require 'bundler'
                    Bundler.setup
                  RUBY
         end.not_to change { File.mtime(bundled_app_lock) }
@@ -1561,27 +2279,27 @@ def set_lockfile_mtime_to_known_value
   it "refuses to install if Gemfile.lock contains conflict markers" do
     lockfile <<-L
       GEM
-        remote: #{file_uri_for(gem_repo2)}//
+        remote: https://gem.repo2//
         specs:
       <<<<<<<
-          rack (1.0.0)
+          myrack (1.0.0)
       =======
-          rack (1.0.1)
+          myrack (1.0.1)
       >>>>>>>
 
       PLATFORMS
         #{lockfile_platforms}
 
       DEPENDENCIES
-        rack
+        myrack
 
       BUNDLED WITH
          #{Bundler::VERSION}
     L
 
-    install_gemfile <<-G, :raise_on_error => false
-      source "#{file_uri_for(gem_repo2)}/"
-      gem "rack"
+    install_gemfile <<-G, raise_on_error: false
+      source "https://gem.repo2/"
+      gem "myrack"
     G
 
     expect(err).to match(/your Gemfile.lock contains merge conflicts/i)
@@ -1590,19 +2308,7 @@ def set_lockfile_mtime_to_known_value
 
   private
 
-  def prerelease?(version)
-    Gem::Version.new(version).prerelease?
-  end
-
   def previous_major(version)
     version.split(".").map.with_index {|v, i| i == 0 ? v.to_i - 1 : v }.join(".")
   end
-
-  def bump_minor(version)
-    bump(version, 1)
-  end
-
-  def bump(version, segment)
-    version.split(".").map.with_index {|v, i| i == segment ? v.to_i + 1 : v }.join(".")
-  end
 end
diff --git a/spec/bundler/other/cli_dispatch_spec.rb b/spec/bundler/other/cli_dispatch_spec.rb
index 2d6080296f27f6..1039737b993983 100644
--- a/spec/bundler/other/cli_dispatch_spec.rb
+++ b/spec/bundler/other/cli_dispatch_spec.rb
@@ -2,19 +2,19 @@
 
 RSpec.describe "bundle command names" do
   it "work when given fully" do
-    bundle "install", :raise_on_error => false
+    bundle "install", raise_on_error: false
     expect(err).to eq("Could not locate Gemfile")
-    expect(last_command.stdboth).not_to include("Ambiguous command")
+    expect(stdboth).not_to include("Ambiguous command")
   end
 
   it "work when not ambiguous" do
-    bundle "ins", :raise_on_error => false
+    bundle "ins", raise_on_error: false
     expect(err).to eq("Could not locate Gemfile")
-    expect(last_command.stdboth).not_to include("Ambiguous command")
+    expect(stdboth).not_to include("Ambiguous command")
   end
 
   it "print a friendly error when ambiguous" do
-    bundle "in", :raise_on_error => false
+    bundle "in", raise_on_error: false
     expect(err).to eq("Ambiguous command in matches [info, init, inject, install]")
   end
 end
diff --git a/spec/bundler/other/cli_man_pages_spec.rb b/spec/bundler/other/cli_man_pages_spec.rb
new file mode 100644
index 00000000000000..84ffca14e62379
--- /dev/null
+++ b/spec/bundler/other/cli_man_pages_spec.rb
@@ -0,0 +1,63 @@
+# frozen_string_literal: true
+
+RSpec.describe "bundle commands" do
+  it "expects all commands to have a man page" do
+    Bundler::CLI.all_commands.each_key do |command_name|
+      next if command_name == "cli_help"
+
+      expect(man_page(command_name)).to exist
+    end
+  end
+
+  it "expects all commands to have all options documented" do
+    Bundler::CLI.all_commands.each do |command_name, command|
+      next if command_name == "cli_help"
+
+      man_page_content = man_page(command_name).read
+
+      command.options.each do |_, option|
+        aliases = option.aliases
+        formatted_aliases = aliases.sort.map {|name| "`#{name}`" }.join(", ") if aliases
+
+        help = if option.type == :boolean
+          "* #{append_aliases("`#{option.switch_name}`", formatted_aliases)}:"
+        elsif option.enum
+          formatted_aliases = "`#{option.switch_name}`" if aliases.empty? && option.lazy_default
+          "* #{prepend_aliases(option.enum.sort.map {|enum| "`#{option.switch_name}=#{enum}`" }.join(", "), formatted_aliases)}:"
+        else
+          names = [option.switch_name, *aliases]
+          value =
+            case option.type
+            when :array then "<list>"
+            when :numeric then "<number>"
+            else option.name.upcase
+            end
+
+          value = option.type != :numeric && option.lazy_default ? "[=#{value}]" : "=#{value}"
+
+          "* #{names.map {|name| "`#{name}#{value}`" }.join(", ")}:"
+        end
+
+        expect(man_page_content).to include(help)
+      end
+    end
+  end
+
+  private
+
+  def append_aliases(text, aliases)
+    return text if aliases.empty?
+
+    "#{text}, #{aliases}"
+  end
+
+  def prepend_aliases(text, aliases)
+    return text if aliases.empty?
+
+    "#{aliases}, #{text}"
+  end
+
+  def man_page(command_name)
+    source_root.join("lib/bundler/man/bundle-#{command_name}.1.ronn")
+  end
+end
diff --git a/spec/bundler/other/ext_spec.rb b/spec/bundler/other/ext_spec.rb
index 9b829a2b36a3db..a883eefe0667b4 100644
--- a/spec/bundler/other/ext_spec.rb
+++ b/spec/bundler/other/ext_spec.rb
@@ -1,65 +1,50 @@
 # frozen_string_literal: true
 
-RSpec.describe "Gem::Specification#match_platform" do
+RSpec.describe "Gem::Specification#installable_on_platform?" do
   it "does not match platforms other than the gem platform" do
     darwin = gem "lol", "1.0", "platform_specific-1.0-x86-darwin-10"
-    expect(darwin.match_platform(pl("java"))).to eq(false)
+    expect(darwin.installable_on_platform?(pl("java"))).to eq(false)
   end
 
   context "when platform is a string" do
     it "matches when platform is a string" do
       lazy_spec = Bundler::LazySpecification.new("lol", "1.0", "universal-mingw32")
-      expect(lazy_spec.match_platform(pl("x86-mingw32"))).to eq(true)
-      expect(lazy_spec.match_platform(pl("x64-mingw32"))).to eq(true)
+      expect(lazy_spec.installable_on_platform?(pl("x86-mingw32"))).to eq(true)
+      expect(lazy_spec.installable_on_platform?(pl("x64-mingw32"))).to eq(true)
     end
   end
 end
 
-RSpec.describe "Bundler::GemHelpers#generic" do
-  include Bundler::GemHelpers
-
-  it "converts non-windows platforms into ruby" do
-    expect(generic(pl("x86-darwin-10"))).to eq(pl("ruby"))
-    expect(generic(pl("ruby"))).to eq(pl("ruby"))
-  end
-
-  it "converts java platform variants into java" do
-    expect(generic(pl("universal-java-17"))).to eq(pl("java"))
-    expect(generic(pl("java"))).to eq(pl("java"))
-  end
-
-  it "converts mswin platform variants into x86-mswin32" do
-    expect(generic(pl("mswin32"))).to eq(pl("x86-mswin32"))
-    expect(generic(pl("i386-mswin32"))).to eq(pl("x86-mswin32"))
-    expect(generic(pl("x86-mswin32"))).to eq(pl("x86-mswin32"))
-  end
-
-  it "converts 32-bit mingw platform variants into x86-mingw32" do
-    expect(generic(pl("mingw32"))).to eq(pl("x86-mingw32"))
-    expect(generic(pl("i386-mingw32"))).to eq(pl("x86-mingw32"))
-    expect(generic(pl("x86-mingw32"))).to eq(pl("x86-mingw32"))
-  end
-
-  it "converts 64-bit mingw platform variants into x64-mingw32" do
-    expect(generic(pl("x64-mingw32"))).to eq(pl("x64-mingw32"))
-    expect(generic(pl("x86_64-mingw32"))).to eq(pl("x64-mingw32"))
-  end
-
-  it "converts 64-bit mingw UCRT platform variants into x64-mingw-ucrt" do
-    expect(generic(pl("x64-mingw-ucrt"))).to eq(pl("x64-mingw-ucrt"))
-  end
-end
-
 RSpec.describe "Gem::SourceIndex#refresh!" do
   before do
     install_gemfile <<-G
-      source "#{file_uri_for(gem_repo1)}"
-      gem "rack"
+      source "https://gem.repo1"
+      gem "myrack"
     G
   end
 
   it "does not explode when called" do
-    run "Gem.source_index.refresh!", :raise_on_error => false
-    run "Gem::SourceIndex.new([]).refresh!", :raise_on_error => false
+    run "Gem.source_index.refresh!", raise_on_error: false
+    run "Gem::SourceIndex.new([]).refresh!", raise_on_error: false
+  end
+end
+
+RSpec.describe "Gem::NameTuple" do
+  describe "#initialize" do
+    it "creates a Gem::NameTuple with equality regardless of platform type" do
+      gem_platform = Gem::NameTuple.new "a", v("1"), pl("x86_64-linux")
+      str_platform = Gem::NameTuple.new "a", v("1"), "x86_64-linux"
+      expect(gem_platform).to eq(str_platform)
+      expect(gem_platform.hash).to eq(str_platform.hash)
+      expect(gem_platform.to_a).to eq(str_platform.to_a)
+    end
+  end
+
+  describe "#lock_name" do
+    it "returns the lock name" do
+      expect(Gem::NameTuple.new("a", v("1.0.0"), pl("x86_64-linux")).lock_name).to eq("a (1.0.0-x86_64-linux)")
+      expect(Gem::NameTuple.new("a", v("1.0.0"), "ruby").lock_name).to eq("a (1.0.0)")
+      expect(Gem::NameTuple.new("a", v("1.0.0")).lock_name).to eq("a (1.0.0)")
+    end
   end
 end
diff --git a/spec/bundler/other/major_deprecation_spec.rb b/spec/bundler/other/major_deprecation_spec.rb
index 7b7ceb458668ba..a0a19582449473 100644
--- a/spec/bundler/other/major_deprecation_spec.rb
+++ b/spec/bundler/other/major_deprecation_spec.rb
@@ -6,8 +6,8 @@
   describe "Bundler" do
     before do
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
-        gem "rack"
+        source "https://gem.repo1"
+        gem "myrack"
       G
     end
 
@@ -17,14 +17,14 @@
         bundle "exec ruby -e #{source.dump}"
       end
 
-      it "is deprecated in favor of .unbundled_env", :bundler => "< 3" do
+      it "is deprecated in favor of .unbundled_env" do
         expect(deprecations).to include \
           "`Bundler.clean_env` has been deprecated in favor of `Bundler.unbundled_env`. " \
           "If you instead want the environment before bundler was originally loaded, use `Bundler.original_env` " \
           "(called at -e:1)"
       end
 
-      pending "is removed and shows a helpful error message about it", :bundler => "3"
+      pending "is removed and shows a helpful error message about it", bundler: "4"
     end
 
     describe ".with_clean_env" do
@@ -33,7 +33,7 @@
         bundle "exec ruby -e #{source.dump}"
       end
 
-      it "is deprecated in favor of .unbundled_env", :bundler => "< 3" do
+      it "is deprecated in favor of .unbundled_env" do
         expect(deprecations).to include(
           "`Bundler.with_clean_env` has been deprecated in favor of `Bundler.with_unbundled_env`. " \
           "If you instead want the environment before bundler was originally loaded, use `Bundler.with_original_env` " \
@@ -41,7 +41,7 @@
         )
       end
 
-      pending "is removed and shows a helpful error message about it", :bundler => "3"
+      pending "is removed and shows a helpful error message about it", bundler: "4"
     end
 
     describe ".clean_system" do
@@ -50,7 +50,7 @@
         bundle "exec ruby -e #{source.dump}"
       end
 
-      it "is deprecated in favor of .unbundled_system", :bundler => "< 3" do
+      it "is deprecated in favor of .unbundled_system" do
         expect(deprecations).to include(
           "`Bundler.clean_system` has been deprecated in favor of `Bundler.unbundled_system`. " \
           "If you instead want to run the command in the environment before bundler was originally loaded, use `Bundler.original_system` " \
@@ -58,7 +58,7 @@
         )
       end
 
-      pending "is removed and shows a helpful error message about it", :bundler => "3"
+      pending "is removed and shows a helpful error message about it", bundler: "4"
     end
 
     describe ".clean_exec" do
@@ -67,7 +67,7 @@
         bundle "exec ruby -e #{source.dump}"
       end
 
-      it "is deprecated in favor of .unbundled_exec", :bundler => "< 3" do
+      it "is deprecated in favor of .unbundled_exec" do
         expect(deprecations).to include(
           "`Bundler.clean_exec` has been deprecated in favor of `Bundler.unbundled_exec`. " \
           "If you instead want to exec to a command in the environment before bundler was originally loaded, use `Bundler.original_exec` " \
@@ -75,7 +75,7 @@
         )
       end
 
-      pending "is removed and shows a helpful error message about it", :bundler => "3"
+      pending "is removed and shows a helpful error message about it", bundler: "4"
     end
 
     describe ".environment" do
@@ -84,29 +84,29 @@
         bundle "exec ruby -e #{source.dump}"
       end
 
-      it "is deprecated in favor of .load", :bundler => "< 3" do
+      it "is deprecated in favor of .load" do
         expect(deprecations).to include "Bundler.environment has been removed in favor of Bundler.load (called at -e:1)"
       end
 
-      pending "is removed and shows a helpful error message about it", :bundler => "3"
+      pending "is removed and shows a helpful error message about it", bundler: "4"
     end
   end
 
   describe "bundle exec --no-keep-file-descriptors" do
     before do
-      bundle "exec --no-keep-file-descriptors -e 1", :raise_on_error => false
+      bundle "exec --no-keep-file-descriptors -e 1", raise_on_error: false
     end
 
-    it "is deprecated", :bundler => "< 3" do
+    it "is deprecated" do
       expect(deprecations).to include "The `--no-keep-file-descriptors` has been deprecated. `bundle exec` no longer mess with your file descriptors. Close them in the exec'd script if you need to"
     end
 
-    pending "is removed and shows a helpful error message about it", :bundler => "3"
+    pending "is removed and shows a helpful error message about it", bundler: "4"
   end
 
   describe "bundle update --quiet" do
     it "does not print any deprecations" do
-      bundle :update, :quiet => true, :raise_on_error => false
+      bundle :update, quiet: true, raise_on_error: false
       expect(deprecations).to be_empty
     end
   end
@@ -114,58 +114,58 @@
   context "bundle check --path" do
     before do
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
-        gem "rack"
+        source "https://gem.repo1"
+        gem "myrack"
       G
 
-      bundle "check --path vendor/bundle", :raise_on_error => false
+      bundle "check --path vendor/bundle", raise_on_error: false
     end
 
-    it "should print a deprecation warning", :bundler => "< 3" do
+    it "should print a deprecation warning" do
       expect(deprecations).to include(
         "The `--path` flag is deprecated because it relies on being " \
         "remembered across bundler invocations, which bundler will no " \
-        "longer do in future versions. Instead please use `bundle config set --local " \
+        "longer do in future versions. Instead please use `bundle config set " \
         "path 'vendor/bundle'`, and stop using this flag"
       )
     end
 
-    pending "fails with a helpful error", :bundler => "3"
+    pending "fails with a helpful error", bundler: "4"
   end
 
   context "bundle check --path=" do
     before do
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
-        gem "rack"
+        source "https://gem.repo1"
+        gem "myrack"
       G
 
-      bundle "check --path=vendor/bundle", :raise_on_error => false
+      bundle "check --path=vendor/bundle", raise_on_error: false
     end
 
-    it "should print a deprecation warning", :bundler => "< 3" do
+    it "should print a deprecation warning" do
       expect(deprecations).to include(
         "The `--path` flag is deprecated because it relies on being " \
         "remembered across bundler invocations, which bundler will no " \
-        "longer do in future versions. Instead please use `bundle config set --local " \
+        "longer do in future versions. Instead please use `bundle config set " \
         "path 'vendor/bundle'`, and stop using this flag"
       )
     end
 
-    pending "fails with a helpful error", :bundler => "3"
+    pending "fails with a helpful error", bundler: "4"
   end
 
   context "bundle cache --all" do
     before do
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
-        gem "rack"
+        source "https://gem.repo1"
+        gem "myrack"
       G
 
-      bundle "cache --all", :raise_on_error => false
+      bundle "cache --all", raise_on_error: false
     end
 
-    it "should print a deprecation warning", :bundler => "< 3" do
+    it "should print a deprecation warning" do
       expect(deprecations).to include(
         "The `--all` flag is deprecated because it relies on being " \
         "remembered across bundler invocations, which bundler will no " \
@@ -174,20 +174,20 @@
       )
     end
 
-    pending "fails with a helpful error", :bundler => "3"
+    pending "fails with a helpful error", bundler: "4"
   end
 
   context "bundle cache --path" do
     before do
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
-        gem "rack"
+        source "https://gem.repo1"
+        gem "myrack"
       G
 
-      bundle "cache --path foo", :raise_on_error => false
+      bundle "cache --path foo", raise_on_error: false
     end
 
-    it "should print a deprecation warning", :bundler => "< 3" do
+    it "should print a deprecation warning" do
       expect(deprecations).to include(
         "The `--path` flag is deprecated because its semantics are unclear. " \
         "Use `bundle config cache_path` to configure the path of your cache of gems, " \
@@ -196,7 +196,7 @@
       )
     end
 
-    pending "fails with a helpful error", :bundler => "3"
+    pending "fails with a helpful error", bundler: "4"
   end
 
   describe "bundle config" do
@@ -205,11 +205,11 @@
         bundle "config"
       end
 
-      it "warns", :bundler => "3" do
+      it "warns", bundler: "4" do
         expect(deprecations).to include("Using the `config` command without a subcommand [list, get, set, unset] is deprecated and will be removed in the future. Use `bundle config list` instead.")
       end
 
-      pending "fails with a helpful error", :bundler => "3"
+      pending "fails with a helpful error", bundler: "5"
     end
 
     describe "old get interface" do
@@ -217,11 +217,11 @@
         bundle "config waka"
       end
 
-      it "warns", :bundler => "3" do
+      it "warns", bundler: "4" do
         expect(deprecations).to include("Using the `config` command without a subcommand [list, get, set, unset] is deprecated and will be removed in the future. Use `bundle config get waka` instead.")
       end
 
-      pending "fails with a helpful error", :bundler => "3"
+      pending "fails with a helpful error", bundler: "5"
     end
 
     describe "old set interface" do
@@ -229,11 +229,11 @@
         bundle "config waka wakapun"
       end
 
-      it "warns", :bundler => "3" do
+      it "warns", bundler: "4" do
         expect(deprecations).to include("Using the `config` command without a subcommand [list, get, set, unset] is deprecated and will be removed in the future. Use `bundle config set waka wakapun` instead.")
       end
 
-      pending "fails with a helpful error", :bundler => "3"
+      pending "fails with a helpful error", bundler: "5"
     end
 
     describe "old set interface with --local" do
@@ -241,11 +241,11 @@
         bundle "config --local waka wakapun"
       end
 
-      it "warns", :bundler => "3" do
+      it "warns", bundler: "4" do
         expect(deprecations).to include("Using the `config` command without a subcommand [list, get, set, unset] is deprecated and will be removed in the future. Use `bundle config set --local waka wakapun` instead.")
       end
 
-      pending "fails with a helpful error", :bundler => "3"
+      pending "fails with a helpful error", bundler: "5"
     end
 
     describe "old set interface with --global" do
@@ -253,11 +253,11 @@
         bundle "config --global waka wakapun"
       end
 
-      it "warns", :bundler => "3" do
+      it "warns", bundler: "4" do
         expect(deprecations).to include("Using the `config` command without a subcommand [list, get, set, unset] is deprecated and will be removed in the future. Use `bundle config set --global waka wakapun` instead.")
       end
 
-      pending "fails with a helpful error", :bundler => "3"
+      pending "fails with a helpful error", bundler: "5"
     end
 
     describe "old unset interface" do
@@ -265,11 +265,11 @@
         bundle "config --delete waka"
       end
 
-      it "warns", :bundler => "3" do
+      it "warns", bundler: "4" do
         expect(deprecations).to include("Using the `config` command without a subcommand [list, get, set, unset] is deprecated and will be removed in the future. Use `bundle config unset waka` instead.")
       end
 
-      pending "fails with a helpful error", :bundler => "3"
+      pending "fails with a helpful error", bundler: "5"
     end
 
     describe "old unset interface with --local" do
@@ -277,11 +277,11 @@
         bundle "config --delete --local waka"
       end
 
-      it "warns", :bundler => "3" do
+      it "warns", bundler: "4" do
         expect(deprecations).to include("Using the `config` command without a subcommand [list, get, set, unset] is deprecated and will be removed in the future. Use `bundle config unset --local waka` instead.")
       end
 
-      pending "fails with a helpful error", :bundler => "3"
+      pending "fails with a helpful error", bundler: "5"
     end
 
     describe "old unset interface with --global" do
@@ -289,28 +289,28 @@
         bundle "config --delete --global waka"
       end
 
-      it "warns", :bundler => "3" do
+      it "warns", bundler: "4" do
         expect(deprecations).to include("Using the `config` command without a subcommand [list, get, set, unset] is deprecated and will be removed in the future. Use `bundle config unset --global waka` instead.")
       end
 
-      pending "fails with a helpful error", :bundler => "3"
+      pending "fails with a helpful error", bundler: "5"
     end
   end
 
   describe "bundle update" do
     before do
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
-        gem "rack"
+        source "https://gem.repo1"
+        gem "myrack"
       G
     end
 
-    it "warns when no options are given", :bundler => "3" do
+    it "warns when no options are given", bundler: "4" do
       bundle "update"
       expect(deprecations).to include("Pass --all to `bundle update` to update everything")
     end
 
-    pending "fails with a helpful error when no options are given", :bundler => "3"
+    pending "fails with a helpful error when no options are given", bundler: "5"
 
     it "does not warn when --all is passed" do
       bundle "update --all"
@@ -320,24 +320,24 @@
 
   describe "bundle install --binstubs" do
     before do
-      install_gemfile <<-G, :binstubs => true
-        source "#{file_uri_for(gem_repo1)}"
-        gem "rack"
+      install_gemfile <<-G, binstubs: true
+        source "https://gem.repo1"
+        gem "myrack"
       G
     end
 
-    it "should output a deprecation warning", :bundler => "< 3" do
+    it "should output a deprecation warning" do
       expect(deprecations).to include("The --binstubs option will be removed in favor of `bundle binstubs --all`")
     end
 
-    pending "fails with a helpful error", :bundler => "3"
+    pending "fails with a helpful error", bundler: "4"
   end
 
   context "bundle install with both gems.rb and Gemfile present" do
     it "should not warn about gems.rb" do
-      create_file "gems.rb", <<-G
-        source "#{file_uri_for(gem_repo1)}"
-        gem "rack"
+      gemfile "gems.rb", <<-G
+        source "https://gem.repo1"
+        gem "myrack"
       G
 
       bundle :install
@@ -345,17 +345,17 @@
     end
 
     it "should print a proper warning, and use gems.rb" do
-      create_file "gems.rb", "source \"#{file_uri_for(gem_repo1)}\""
+      gemfile "gems.rb", "source 'https://gem.repo1'"
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
-        gem "rack"
+        source "https://gem.repo1"
+        gem "myrack"
       G
 
       expect(warnings).to include(
         "Multiple gemfiles (gems.rb and Gemfile) detected. Make sure you remove Gemfile and Gemfile.lock since bundler is ignoring them in favor of gems.rb and gems.locked."
       )
 
-      expect(the_bundle).not_to include_gem "rack 1.0"
+      expect(the_bundle).not_to include_gem "myrack 1.0"
     end
   end
 
@@ -364,22 +364,22 @@
       bundle "config set --local path vendor/bundle"
 
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
-        gem "rack"
+        source "https://gem.repo1"
+        gem "myrack"
       G
     end
 
     {
-      "clean" => ["clean", true],
-      "deployment" => ["deployment", true],
-      "frozen" => ["frozen", true],
-      "no-deployment" => ["deployment", false],
-      "no-prune" => ["no_prune", true],
-      "path" => ["path", "vendor/bundle"],
-      "shebang" => ["shebang", "ruby27"],
-      "system" => ["system", true],
-      "without" => ["without", "development"],
-      "with" => ["with", "development"],
+      "clean" => ["clean", "true"],
+      "deployment" => ["deployment", "true"],
+      "frozen" => ["frozen", "true"],
+      "no-deployment" => ["deployment", "false"],
+      "no-prune" => ["no_prune", "true"],
+      "path" => ["path", "'vendor/bundle'"],
+      "shebang" => ["shebang", "'ruby27'"],
+      "system" => ["path.system", "true"],
+      "without" => ["without", "'development'"],
+      "with" => ["with", "'development'"],
     }.each do |name, expectations|
       option_name, value = *expectations
       flag_name = "--#{name}"
@@ -390,16 +390,16 @@
           bundle "install #{flag_name} #{value}"
         end
 
-        it "should print a deprecation warning", :bundler => "< 3" do
+        it "should print a deprecation warning" do
           expect(deprecations).to include(
             "The `#{flag_name}` flag is deprecated because it relies on " \
             "being remembered across bundler invocations, which bundler " \
             "will no longer do in future versions. Instead please use " \
-            "`bundle config set --local #{option_name} '#{value}'`, and stop using this flag"
+            "`bundle config set #{option_name} #{value}`, and stop using this flag"
           )
         end
 
-        pending "fails with a helpful error", :bundler => "3"
+        pending "fails with a helpful error", bundler: "4"
       end
     end
   end
@@ -407,12 +407,12 @@
   context "bundle install with multiple sources" do
     before do
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo3)}"
-        source "#{file_uri_for(gem_repo1)}"
+        source "https://gem.repo3"
+        source "https://gem.repo1"
       G
     end
 
-    it "shows a deprecation", :bundler => "< 3" do
+    it "shows a deprecation" do
       expect(deprecations).to include(
         "Your Gemfile contains multiple global sources. " \
         "Using `source` more than once without a block is a security risk, and " \
@@ -421,7 +421,7 @@
       )
     end
 
-    it "doesn't show lockfile deprecations if there's a lockfile", :bundler => "< 3" do
+    it "doesn't show lockfile deprecations if there's a lockfile" do
       bundle "install"
 
       expect(deprecations).to include(
@@ -449,34 +449,34 @@
       )
     end
 
-    pending "fails with a helpful error", :bundler => "3"
+    pending "fails with a helpful error", bundler: "4"
   end
 
   context "bundle install in frozen mode with a lockfile with a single rubygems section with multiple remotes" do
     before do
-      build_repo gem_repo3 do
-        build_gem "rack", "0.9.1"
+      build_repo3 do
+        build_gem "myrack", "0.9.1"
       end
 
       gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
-        source "#{file_uri_for(gem_repo3)}" do
-          gem 'rack'
+        source "https://gem.repo1"
+        source "https://gem.repo3" do
+          gem 'myrack'
         end
       G
 
       lockfile <<~L
         GEM
-          remote: #{file_uri_for(gem_repo1)}/
-          remote: #{file_uri_for(gem_repo3)}/
+          remote: https://gem.repo1/
+          remote: https://gem.repo3/
           specs:
-            rack (0.9.1)
+            myrack (0.9.1)
 
         PLATFORMS
           ruby
 
         DEPENDENCIES
-          rack!
+          myrack!
 
         BUNDLED WITH
            #{Bundler::VERSION}
@@ -485,25 +485,25 @@
       bundle "config set --local frozen true"
     end
 
-    it "shows a deprecation", :bundler => "< 3" do
+    it "shows a deprecation" do
       bundle "install"
 
       expect(deprecations).to include("Your lockfile contains a single rubygems source section with multiple remotes, which is insecure. Make sure you run `bundle install` in non frozen mode and commit the result to make your lockfile secure.")
     end
 
-    pending "fails with a helpful error", :bundler => "3"
+    pending "fails with a helpful error", bundler: "4"
   end
 
   context "when Bundler.setup is run in a ruby script" do
     before do
-      create_file "gems.rb", "source \"#{file_uri_for(gem_repo1)}\""
+      create_file "gems.rb", "source 'https://gem.repo1'"
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
-        gem "rack", :group => :test
+        source "https://gem.repo1"
+        gem "myrack", :group => :test
       G
 
       ruby <<-RUBY
-        require '#{entrypoint}'
+        require 'bundler'
 
         Bundler.setup
         Bundler.setup
@@ -519,26 +519,26 @@
 
   context "when `bundler/deployment` is required in a ruby script" do
     before do
-      ruby(<<-RUBY, :env => env_for_missing_prerelease_default_gem_activation)
+      ruby <<-RUBY
         require 'bundler/deployment'
       RUBY
     end
 
-    it "should print a capistrano deprecation warning", :bundler => "< 3" do
+    it "should print a capistrano deprecation warning" do
       expect(deprecations).to include("Bundler no longer integrates " \
                              "with Capistrano, but Capistrano provides " \
                              "its own integration with Bundler via the " \
                              "capistrano-bundler gem. Use it instead.")
     end
 
-    pending "fails with a helpful error", :bundler => "3"
+    pending "fails with a helpful error", bundler: "4"
   end
 
   context "bundle show" do
     before do
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
-        gem "rack"
+        source "https://gem.repo1"
+        gem "myrack"
       G
     end
 
@@ -547,67 +547,75 @@
         bundle "show --outdated"
       end
 
-      it "prints a deprecation warning informing about its removal", :bundler => "< 3" do
+      it "prints a deprecation warning informing about its removal" do
         expect(deprecations).to include("the `--outdated` flag to `bundle show` was undocumented and will be removed without replacement")
       end
 
-      pending "fails with a helpful message", :bundler => "3"
+      pending "fails with a helpful message", bundler: "4"
     end
   end
 
   context "bundle remove" do
     before do
       gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
-        gem "rack"
+        source "https://gem.repo1"
+        gem "myrack"
       G
     end
 
     context "with --install" do
-      it "shows a deprecation warning", :bundler => "< 3" do
-        bundle "remove rack --install"
+      it "shows a deprecation warning" do
+        bundle "remove myrack --install"
 
         expect(err).to include "[DEPRECATED] The `--install` flag has been deprecated. `bundle install` is triggered by default."
       end
 
-      pending "fails with a helpful message", :bundler => "3"
+      pending "fails with a helpful message", bundler: "4"
     end
   end
 
-  context "bundle console" do
+  context "bundle viz" do
     before do
-      bundle "console", :raise_on_error => false
+      create_file "gems.rb", "source 'https://gem.repo1'"
+      bundle "viz"
     end
 
-    it "prints a deprecation warning", :bundler => "< 3" do
-      expect(deprecations).to include \
-        "bundle console will be replaced by `bin/console` generated by `bundle gem <name>`"
+    it "prints a deprecation warning" do
+      expect(deprecations).to include "The `viz` command has been renamed to `graph` and moved to a plugin. See https://github.com/rubygems/bundler-graph"
     end
 
-    pending "fails with a helpful message", :bundler => "3"
+    pending "fails with a helpful message", bundler: "4"
   end
 
-  context "bundle viz", :realworld do
+  context "bundle plugin install --local_git" do
     before do
-      realworld_system_gems "ruby-graphviz --version 1.2.5"
-      create_file "gems.rb", "source \"#{file_uri_for(gem_repo1)}\""
-      bundle "viz"
+      build_git "foo" do |s|
+        s.write "plugins.rb"
+      end
     end
 
-    it "prints a deprecation warning", :bundler => "< 3" do
-      expect(deprecations).to include "The `viz` command has been renamed to `graph` and moved to a plugin. See https://github.com/rubygems/bundler-graph"
+    it "prints a deprecation warning" do
+      bundle "plugin install foo --local_git #{lib_path("foo-1.0")}"
+
+      expect(out).to include("Installed plugin foo")
+      expect(deprecations).to include "--local_git is deprecated, use --git"
     end
 
-    pending "fails with a helpful message", :bundler => "3"
+    pending "fails with a helpful message", bundler: "4"
   end
 
-  describe "deprecating rubocop", :readline do
+  describe "deprecating rubocop" do
+    before do
+      global_config "BUNDLE_GEM__MIT" => "false", "BUNDLE_GEM__TEST" => "false", "BUNDLE_GEM__COC" => "false",
+                    "BUNDLE_GEM__CI" => "false", "BUNDLE_GEM__CHANGELOG" => "false"
+    end
+
     context "bundle gem --rubocop" do
       before do
-        bundle "gem my_new_gem --rubocop", :raise_on_error => false
+        bundle "gem my_new_gem --rubocop", raise_on_error: false
       end
 
-      it "prints a deprecation warning", :bundler => "< 3" do
+      it "prints a deprecation warning" do
         expect(deprecations).to include \
           "--rubocop is deprecated, use --linter=rubocop"
       end
@@ -615,10 +623,10 @@
 
     context "bundle gem --no-rubocop" do
       before do
-        bundle "gem my_new_gem --no-rubocop", :raise_on_error => false
+        bundle "gem my_new_gem --no-rubocop", raise_on_error: false
       end
 
-      it "prints a deprecation warning", :bundler => "< 3" do
+      it "prints a deprecation warning" do
         expect(deprecations).to include \
           "--no-rubocop is deprecated, use --linter"
       end
@@ -626,10 +634,10 @@
 
     context "bundle gem with gem.rubocop set to true" do
       before do
-        bundle "gem my_new_gem", :env => { "BUNDLE_GEM__RUBOCOP" => "true" }, :raise_on_error => false
+        bundle "gem my_new_gem", env: { "BUNDLE_GEM__RUBOCOP" => "true" }, raise_on_error: false
       end
 
-      it "prints a deprecation warning", :bundler => "< 3" do
+      it "prints a deprecation warning" do
         expect(deprecations).to include \
           "config gem.rubocop is deprecated; we've updated your config to use gem.linter instead"
       end
@@ -637,10 +645,10 @@
 
     context "bundle gem with gem.rubocop set to false" do
       before do
-        bundle "gem my_new_gem", :env => { "BUNDLE_GEM__RUBOCOP" => "false" }, :raise_on_error => false
+        bundle "gem my_new_gem", env: { "BUNDLE_GEM__RUBOCOP" => "false" }, raise_on_error: false
       end
 
-      it "prints a deprecation warning", :bundler => "< 3" do
+      it "prints a deprecation warning" do
         expect(deprecations).to include \
           "config gem.rubocop is deprecated; we've updated your config to use gem.linter instead"
       end
diff --git a/spec/bundler/plugins/command_spec.rb b/spec/bundler/plugins/command_spec.rb
index 3a7adf4b48c42e..f8dacb0e51eec6 100644
--- a/spec/bundler/plugins/command_spec.rb
+++ b/spec/bundler/plugins/command_spec.rb
@@ -18,7 +18,7 @@ def exec(command, args)
       end
     end
 
-    bundle "plugin install command-mah --source #{file_uri_for(gem_repo2)}"
+    bundle "plugin install command-mah --source https://gem.repo2"
   end
 
   it "executes without arguments" do
@@ -29,7 +29,7 @@ def exec(command, args)
   end
 
   it "accepts the arguments" do
-    build_repo2 do
+    update_repo2 do
       build_plugin "the-echoer" do |s|
         s.write "plugins.rb", <<-RUBY
           module Resonance
@@ -46,7 +46,7 @@ def exec(command, args)
       end
     end
 
-    bundle "plugin install the-echoer --source #{file_uri_for(gem_repo2)}"
+    bundle "plugin install the-echoer --source https://gem.repo2"
     expect(out).to include("Installed plugin the-echoer")
 
     bundle "echo tacos tofu lasange"
@@ -54,7 +54,7 @@ def exec(command, args)
   end
 
   it "raises error on redeclaration of command" do
-    build_repo2 do
+    update_repo2 do
       build_plugin "copycat" do |s|
         s.write "plugins.rb", <<-RUBY
           module CopyCat
@@ -69,7 +69,7 @@ def exec(command, args)
       end
     end
 
-    bundle "plugin install copycat --source #{file_uri_for(gem_repo2)}", :raise_on_error => false
+    bundle "plugin install copycat --source https://gem.repo2", raise_on_error: false
 
     expect(out).not_to include("Installed plugin copycat")
 
diff --git a/spec/bundler/plugins/hook_spec.rb b/spec/bundler/plugins/hook_spec.rb
index 72feb14d84ee08..3f9053bbc83d48 100644
--- a/spec/bundler/plugins/hook_spec.rb
+++ b/spec/bundler/plugins/hook_spec.rb
@@ -13,17 +13,17 @@
         end
       end
 
-      bundle "plugin install before-install-all-plugin --source #{file_uri_for(gem_repo2)}"
+      bundle "plugin install before-install-all-plugin --source https://gem.repo2"
     end
 
     it "runs before all rubygems are installed" do
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
+        source "https://gem.repo1"
         gem "rake"
-        gem "rack"
+        gem "myrack"
       G
 
-      expect(out).to include "gems to be installed rake, rack"
+      expect(out).to include "gems to be installed rake, myrack"
     end
   end
 
@@ -39,18 +39,18 @@
         end
       end
 
-      bundle "plugin install before-install-plugin --source #{file_uri_for(gem_repo2)}"
+      bundle "plugin install before-install-plugin --source https://gem.repo2"
     end
 
     it "runs before each rubygem is installed" do
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
+        source "https://gem.repo1"
         gem "rake"
-        gem "rack"
+        gem "myrack"
       G
 
       expect(out).to include "installing gem rake"
-      expect(out).to include "installing gem rack"
+      expect(out).to include "installing gem myrack"
     end
   end
 
@@ -66,17 +66,17 @@
         end
       end
 
-      bundle "plugin install after-install-all-plugin --source #{file_uri_for(gem_repo2)}"
+      bundle "plugin install after-install-all-plugin --source https://gem.repo2"
     end
 
-    it "runs after each rubygem is installed" do
+    it "runs after each all rubygems are installed" do
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
+        source "https://gem.repo1"
         gem "rake"
-        gem "rack"
+        gem "myrack"
       G
 
-      expect(out).to include "installed gems rake, rack"
+      expect(out).to include "installed gems rake, myrack"
     end
   end
 
@@ -92,18 +92,117 @@
         end
       end
 
-      bundle "plugin install after-install-plugin --source #{file_uri_for(gem_repo2)}"
+      bundle "plugin install after-install-plugin --source https://gem.repo2"
     end
 
     it "runs after each rubygem is installed" do
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
+        source "https://gem.repo1"
         gem "rake"
-        gem "rack"
+        gem "myrack"
       G
 
       expect(out).to include "installed gem rake : installed"
-      expect(out).to include "installed gem rack : installed"
+      expect(out).to include "installed gem myrack : installed"
+    end
+  end
+
+  context "before-require-all hook" do
+    before do
+      build_repo2 do
+        build_plugin "before-require-all-plugin" do |s|
+          s.write "plugins.rb", <<-RUBY
+            Bundler::Plugin::API.hook Bundler::Plugin::Events::GEM_BEFORE_REQUIRE_ALL do |deps|
+              puts "gems to be required \#{deps.map(&:name).join(", ")}"
+            end
+          RUBY
+        end
+      end
+
+      bundle "plugin install before-require-all-plugin --source https://gem.repo2"
+    end
+
+    it "runs before all rubygems are required" do
+      install_gemfile_and_bundler_require
+      expect(out).to include "gems to be required rake, myrack"
     end
   end
+
+  context "before-require hook" do
+    before do
+      build_repo2 do
+        build_plugin "before-require-plugin" do |s|
+          s.write "plugins.rb", <<-RUBY
+            Bundler::Plugin::API.hook Bundler::Plugin::Events::GEM_BEFORE_REQUIRE do |dep|
+              puts "requiring gem \#{dep.name}"
+            end
+          RUBY
+        end
+      end
+
+      bundle "plugin install before-require-plugin --source https://gem.repo2"
+    end
+
+    it "runs before each rubygem is required" do
+      install_gemfile_and_bundler_require
+      expect(out).to include "requiring gem rake"
+      expect(out).to include "requiring gem myrack"
+    end
+  end
+
+  context "after-require-all hook" do
+    before do
+      build_repo2 do
+        build_plugin "after-require-all-plugin" do |s|
+          s.write "plugins.rb", <<-RUBY
+            Bundler::Plugin::API.hook Bundler::Plugin::Events::GEM_AFTER_REQUIRE_ALL do |deps|
+              puts "required gems \#{deps.map(&:name).join(", ")}"
+            end
+          RUBY
+        end
+      end
+
+      bundle "plugin install after-require-all-plugin --source https://gem.repo2"
+    end
+
+    it "runs after all rubygems are required" do
+      install_gemfile_and_bundler_require
+      expect(out).to include "required gems rake, myrack"
+    end
+  end
+
+  context "after-require hook" do
+    before do
+      build_repo2 do
+        build_plugin "after-require-plugin" do |s|
+          s.write "plugins.rb", <<-RUBY
+            Bundler::Plugin::API.hook Bundler::Plugin::Events::GEM_AFTER_REQUIRE do |dep|
+              puts "required gem \#{dep.name}"
+            end
+          RUBY
+        end
+      end
+
+      bundle "plugin install after-require-plugin --source https://gem.repo2"
+    end
+
+    it "runs after each rubygem is required" do
+      install_gemfile_and_bundler_require
+      expect(out).to include "required gem rake"
+      expect(out).to include "required gem myrack"
+    end
+  end
+
+  def install_gemfile_and_bundler_require
+    install_gemfile <<-G
+      source "https://gem.repo1"
+      gem "rake"
+      gem "myrack"
+    G
+
+    ruby <<-RUBY
+      require "bundler"
+      Bundler.require
+    RUBY
+  end
 end
diff --git a/spec/bundler/plugins/install_spec.rb b/spec/bundler/plugins/install_spec.rb
index aec131f2eeb2bb..1ccefabc0b50a9 100644
--- a/spec/bundler/plugins/install_spec.rb
+++ b/spec/bundler/plugins/install_spec.rb
@@ -9,28 +9,28 @@
   end
 
   it "shows proper message when gem in not found in the source" do
-    bundle "plugin install no-foo --source #{file_uri_for(gem_repo1)}", :raise_on_error => false
+    bundle "plugin install no-foo --source https://gem.repo1", raise_on_error: false
 
     expect(err).to include("Could not find")
     plugin_should_not_be_installed("no-foo")
   end
 
   it "installs from rubygems source" do
-    bundle "plugin install foo --source #{file_uri_for(gem_repo2)}"
+    bundle "plugin install foo --source https://gem.repo2"
 
     expect(out).to include("Installed plugin foo")
     plugin_should_be_installed("foo")
   end
 
   it "installs from rubygems source in frozen mode" do
-    bundle "plugin install foo --source #{file_uri_for(gem_repo2)}", :env => { "BUNDLE_DEPLOYMENT" => "true" }
+    bundle "plugin install foo --source https://gem.repo2", env: { "BUNDLE_DEPLOYMENT" => "true" }
 
     expect(out).to include("Installed plugin foo")
     plugin_should_be_installed("foo")
   end
 
   it "installs from sources configured as Gem.sources without any flags" do
-    bundle "plugin install foo", :env => { "BUNDLER_SPEC_GEM_SOURCES" => file_uri_for(gem_repo2).to_s }
+    bundle "plugin install foo", artifice: "compact_index", env: { "BUNDLER_SPEC_GEM_SOURCES" => "https://gem.repo2" }
 
     expect(out).to include("Installed plugin foo")
     plugin_should_be_installed("foo")
@@ -45,18 +45,18 @@
 
   context "plugin is already installed" do
     before do
-      bundle "plugin install foo --source #{file_uri_for(gem_repo2)}"
+      bundle "plugin install foo --source https://gem.repo2"
     end
 
     it "doesn't install plugin again" do
-      bundle "plugin install foo --source #{file_uri_for(gem_repo2)}"
+      bundle "plugin install foo --source https://gem.repo2"
       expect(out).not_to include("Installing plugin foo")
       expect(out).not_to include("Installed plugin foo")
     end
   end
 
   it "installs multiple plugins" do
-    bundle "plugin install foo kung-foo --source #{file_uri_for(gem_repo2)}"
+    bundle "plugin install foo kung-foo --source https://gem.repo2"
 
     expect(out).to include("Installed plugin foo")
     expect(out).to include("Installed plugin kung-foo")
@@ -70,7 +70,7 @@
       build_plugin "kung-foo", "1.1"
     end
 
-    bundle "plugin install foo kung-foo --version '1.0' --source #{file_uri_for(gem_repo2)}"
+    bundle "plugin install foo kung-foo --version '1.0' --source https://gem.repo2"
 
     expect(out).to include("Installing foo 1.0")
     expect(out).to include("Installing kung-foo 1.0")
@@ -82,30 +82,32 @@
       build_plugin "foo", "1.1"
     end
 
-    bundle "plugin install foo --version 1.0 --source #{file_uri_for(gem_repo2)} --verbose"
+    bundle "plugin install foo --version 1.0 --source https://gem.repo2 --verbose"
     expect(out).to include("Installing foo 1.0")
 
-    bundle "plugin install foo --source #{file_uri_for(gem_repo2)} --verbose"
+    bundle "plugin install foo --source https://gem.repo2 --verbose"
     expect(out).to include("Installing foo 1.1")
 
-    bundle "plugin install foo --source #{file_uri_for(gem_repo2)} --verbose"
+    bundle "plugin install foo --source https://gem.repo2 --verbose"
     expect(out).to include("Using foo 1.1")
   end
 
-  it "installs when --branch specified" do
-    bundle "plugin install foo --branch main --source #{file_uri_for(gem_repo2)}"
+  it "raises an error when when --branch specified" do
+    bundle "plugin install foo --branch main --source https://gem.repo2", raise_on_error: false
 
-    expect(out).to include("Installed plugin foo")
+    expect(out).not_to include("Installed plugin foo")
+
+    expect(err).to include("--branch can only be used with git sources")
   end
 
-  it "installs when --ref specified" do
-    bundle "plugin install foo --ref v1.2.3 --source #{file_uri_for(gem_repo2)}"
+  it "raises an error when --ref specified" do
+    bundle "plugin install foo --ref v1.2.3 --source https://gem.repo2", raise_on_error: false
 
-    expect(out).to include("Installed plugin foo")
+    expect(err).to include("--ref can only be used with git sources")
   end
 
   it "raises error when both --branch and --ref options are specified" do
-    bundle "plugin install foo --source #{file_uri_for(gem_repo2)} --branch main --ref v1.2.3", :raise_on_error => false
+    bundle "plugin install foo --source https://gem.repo2 --branch main --ref v1.2.3", raise_on_error: false
 
     expect(out).not_to include("Installed plugin foo")
 
@@ -129,7 +131,7 @@ def exec(command, args)
         s.write("src/fubar.rb")
       end
     end
-    bundle "plugin install testing --source #{file_uri_for(gem_repo2)}"
+    bundle "plugin install testing --source https://gem.repo2"
 
     bundle "check2", "no-color" => false
     expect(out).to eq("mate")
@@ -142,17 +144,17 @@ def exec(command, args)
         build_plugin "kung-foo", "1.1"
       end
 
-      bundle "plugin install foo kung-foo --version '1.0' --source #{file_uri_for(gem_repo2)}"
+      bundle "plugin install foo kung-foo --version '1.0' --source https://gem.repo2"
 
       expect(out).to include("Installing foo 1.0")
       expect(out).to include("Installing kung-foo 1.0")
       plugin_should_be_installed("foo", "kung-foo")
 
-      build_repo2 do
+      update_repo2 do
         build_gem "charlie"
       end
 
-      bundle "plugin install charlie --source #{file_uri_for(gem_repo2)}", :raise_on_error => false
+      bundle "plugin install charlie --source https://gem.repo2", raise_on_error: false
 
       expect(err).to include("Failed to install plugin `charlie`, due to Bundler::Plugin::MalformattedPlugin (plugins.rb was not found in the plugin.)")
 
@@ -171,7 +173,7 @@ def exec(command, args)
         end
       end
 
-      bundle "plugin install chaplin --source #{file_uri_for(gem_repo2)}", :raise_on_error => false
+      bundle "plugin install chaplin --source https://gem.repo2", raise_on_error: false
 
       expect(global_plugin_gem("chaplin-1.0")).not_to be_directory
 
@@ -185,7 +187,7 @@ def exec(command, args)
         s.write "plugins.rb"
       end
 
-      bundle "plugin install foo --git #{file_uri_for(lib_path("foo-1.0"))}"
+      bundle "plugin install foo --git #{lib_path("foo-1.0")}"
 
       expect(out).to include("Installed plugin foo")
       plugin_should_be_installed("foo")
@@ -196,20 +198,58 @@ def exec(command, args)
         s.write "plugins.rb"
       end
 
-      bundle "plugin install foo --local_git #{lib_path("foo-1.0")}"
+      bundle "plugin install foo --git #{lib_path("foo-1.0")}"
 
       expect(out).to include("Installed plugin foo")
       plugin_should_be_installed("foo")
     end
 
     it "raises an error when both git and local git sources are specified" do
-      bundle "plugin install foo --local_git /phony/path/project --git git@gitphony.com:/repo/project", :raise_on_error => false
+      bundle "plugin install foo --git /phony/path/project --local_git git@gitphony.com:/repo/project", raise_on_error: false
 
       expect(exitstatus).not_to eq(0)
       expect(err).to eq("Remote and local plugin git sources can't be both specified")
     end
   end
 
+  context "path plugins" do
+    it "installs from a path source" do
+      build_lib "path_plugin" do |s|
+        s.write "plugins.rb"
+      end
+      bundle "plugin install path_plugin --path #{lib_path("path_plugin-1.0")}"
+
+      expect(out).to include("Installed plugin path_plugin")
+      plugin_should_be_installed("path_plugin")
+    end
+
+    it "installs from a relative path source" do
+      build_lib "path_plugin" do |s|
+        s.write "plugins.rb"
+      end
+      path = lib_path("path_plugin-1.0").relative_path_from(bundled_app)
+      bundle "plugin install path_plugin --path #{path}"
+
+      expect(out).to include("Installed plugin path_plugin")
+      plugin_should_be_installed("path_plugin")
+    end
+
+    it "installs from a relative path source when inside an app" do
+      allow(Bundler::SharedHelpers).to receive(:find_gemfile).and_return(bundled_app_gemfile)
+      gemfile ""
+
+      build_lib "ga-plugin" do |s|
+        s.write "plugins.rb"
+      end
+
+      path = lib_path("ga-plugin-1.0").relative_path_from(bundled_app)
+      bundle "plugin install ga-plugin --path #{path}"
+
+      plugin_should_be_installed("ga-plugin")
+      expect(local_plugin_gem("foo-1.0")).not_to be_directory
+    end
+  end
+
   context "Gemfile eval" do
     before do
       allow(Bundler::SharedHelpers).to receive(:find_gemfile).and_return(bundled_app_gemfile)
@@ -217,9 +257,9 @@ def exec(command, args)
 
     it "installs plugins listed in gemfile" do
       gemfile <<-G
-        source '#{file_uri_for(gem_repo2)}'
+        source 'https://gem.repo2'
         plugin 'foo'
-        gem 'rack', "1.0.0"
+        gem 'myrack', "1.0.0"
       G
 
       bundle "install"
@@ -228,7 +268,7 @@ def exec(command, args)
 
       expect(out).to include("Bundle complete!")
 
-      expect(the_bundle).to include_gems("rack 1.0.0")
+      expect(the_bundle).to include_gems("myrack 1.0.0")
       plugin_should_be_installed("foo")
     end
 
@@ -238,7 +278,7 @@ def exec(command, args)
       end
 
       gemfile <<-G
-        source '#{file_uri_for(gem_repo2)}'
+        source 'https://gem.repo2'
         plugin 'foo', "1.0"
       G
 
@@ -257,7 +297,7 @@ def exec(command, args)
       end
 
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
+        source "https://gem.repo1"
         plugin 'ga-plugin', :git => "#{lib_path("ga-plugin-1.0")}"
       G
 
@@ -271,7 +311,7 @@ def exec(command, args)
       end
 
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
+        source "https://gem.repo1"
         plugin 'ga-plugin', :path => "#{lib_path("ga-plugin-1.0")}"
       G
 
@@ -279,25 +319,40 @@ def exec(command, args)
       plugin_should_be_installed("ga-plugin")
     end
 
+    it "accepts relative path sources" do
+      build_lib "ga-plugin" do |s|
+        s.write "plugins.rb"
+      end
+
+      path = lib_path("ga-plugin-1.0").relative_path_from(bundled_app)
+      install_gemfile <<-G
+        source "https://gem.repo1"
+        plugin 'ga-plugin', :path => "#{path}"
+      G
+
+      expect(out).to include("Installed plugin ga-plugin")
+      plugin_should_be_installed("ga-plugin")
+    end
+
     context "in deployment mode" do
       it "installs plugins" do
         install_gemfile <<-G
-          source '#{file_uri_for(gem_repo2)}'
-          gem 'rack', "1.0.0"
+          source 'https://gem.repo2'
+          gem 'myrack', "1.0.0"
         G
 
         bundle "config set --local deployment true"
         install_gemfile <<-G
-          source '#{file_uri_for(gem_repo2)}'
+          source 'https://gem.repo2'
           plugin 'foo'
-          gem 'rack', "1.0.0"
+          gem 'myrack', "1.0.0"
         G
 
         expect(out).to include("Installed plugin foo")
 
         expect(out).to include("Bundle complete!")
 
-        expect(the_bundle).to include_gems("rack 1.0.0")
+        expect(the_bundle).to include_gems("myrack 1.0.0")
         plugin_should_be_installed("foo")
       end
     end
@@ -309,12 +364,12 @@ def exec(command, args)
         require "bundler/inline"
 
         gemfile do
-          source '#{file_uri_for(gem_repo2)}'
+          source 'https://gem.repo2'
           plugin 'foo'
         end
       RUBY
 
-      ruby code, :env => { "BUNDLER_VERSION" => Bundler::VERSION }
+      ruby code, artifice: "compact_index", env: { "BUNDLER_VERSION" => Bundler::VERSION }
       expect(local_plugin_gem("foo-1.0", "plugins.rb")).to exist
     end
   end
@@ -323,7 +378,7 @@ def exec(command, args)
     it "is installed when inside an app" do
       allow(Bundler::SharedHelpers).to receive(:find_gemfile).and_return(bundled_app_gemfile)
       gemfile ""
-      bundle "plugin install foo --source #{file_uri_for(gem_repo2)}"
+      bundle "plugin install foo --source https://gem.repo2"
 
       plugin_should_be_installed("foo")
       expect(local_plugin_gem("foo-1.0")).to be_directory
@@ -346,7 +401,7 @@ def exec(command, args)
         end
 
         # inside the app
-        gemfile "source '#{file_uri_for(gem_repo2)}'\nplugin 'fubar'"
+        gemfile "source 'https://gem.repo2'\nplugin 'fubar'"
         bundle "install"
 
         update_repo2 do
@@ -364,7 +419,7 @@ def exec(command, args)
         end
 
         # outside the app
-        bundle "plugin install fubar --source #{file_uri_for(gem_repo2)}", :dir => tmp
+        bundle "plugin install fubar --source https://gem.repo2", dir: tmp
       end
 
       it "inside the app takes precedence over global plugin" do
@@ -373,7 +428,7 @@ def exec(command, args)
       end
 
       it "outside the app global plugin is used" do
-        bundle "shout", :dir => tmp
+        bundle "shout", dir: tmp
         expect(out).to eq("global_one")
       end
     end
diff --git a/spec/bundler/plugins/list_spec.rb b/spec/bundler/plugins/list_spec.rb
index 4a686415ad74a8..30e3f82467e637 100644
--- a/spec/bundler/plugins/list_spec.rb
+++ b/spec/bundler/plugins/list_spec.rb
@@ -38,7 +38,7 @@ def exec(command, args)
 
   context "single plugin installed" do
     it "shows plugin name with commands list" do
-      bundle "plugin install foo --source #{file_uri_for(gem_repo2)}"
+      bundle "plugin install foo --source https://gem.repo2"
       plugin_should_be_installed("foo")
       bundle "plugin list"
 
@@ -49,7 +49,7 @@ def exec(command, args)
 
   context "multiple plugins installed" do
     it "shows plugin names with commands list" do
-      bundle "plugin install foo bar --source #{file_uri_for(gem_repo2)}"
+      bundle "plugin install foo bar --source https://gem.repo2"
       plugin_should_be_installed("foo", "bar")
       bundle "plugin list"
 
diff --git a/spec/bundler/plugins/source/example_spec.rb b/spec/bundler/plugins/source/example_spec.rb
index 9d153b606347d6..f9624463144ab4 100644
--- a/spec/bundler/plugins/source/example_spec.rb
+++ b/spec/bundler/plugins/source/example_spec.rb
@@ -52,7 +52,7 @@ def install(spec, opts)
       build_lib "a-path-gem"
 
       gemfile <<-G
-        source "#{file_uri_for(gem_repo2)}" # plugin source
+        source "https://gem.repo2" # plugin source
         source "#{lib_path("a-path-gem-1.0")}", :type => :mpath do
           gem "a-path-gem"
         end
@@ -67,9 +67,13 @@ def install(spec, opts)
       expect(the_bundle).to include_gems("a-path-gem 1.0")
     end
 
-    it "writes to lock file" do
+    it "writes to lockfile" do
       bundle "install"
 
+      checksums = checksums_section_when_enabled do |c|
+        c.no_checksum "a-path-gem", "1.0"
+      end
+
       expect(lockfile).to eq <<~G
         PLUGIN SOURCE
           remote: #{lib_path("a-path-gem-1.0")}
@@ -78,7 +82,7 @@ def install(spec, opts)
             a-path-gem (1.0)
 
         GEM
-          remote: #{file_uri_for(gem_repo2)}/
+          remote: https://gem.repo2/
           specs:
 
         PLATFORMS
@@ -86,7 +90,7 @@ def install(spec, opts)
 
         DEPENDENCIES
           a-path-gem!
-
+        #{checksums}
         BUNDLED WITH
            #{Bundler::VERSION}
       G
@@ -106,7 +110,7 @@ def install(spec, opts)
       end
 
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo2)}" # plugin source
+        source "https://gem.repo2" # plugin source
         source "#{lib_path("gem_with_bin-1.0")}", :type => :mpath do
           gem "gem_with_bin"
         end
@@ -127,7 +131,7 @@ def install(spec, opts)
         expect(bundled_app("vendor/cache/a-path-gem-1.0-#{uri_hash}/.git")).not_to exist
         expect(bundled_app("vendor/cache/a-path-gem-1.0-#{uri_hash}/.bundlecache")).to be_file
 
-        FileUtils.rm_rf lib_path("a-path-gem-1.0")
+        FileUtils.rm_r lib_path("a-path-gem-1.0")
         expect(the_bundle).to include_gems("a-path-gem 1.0")
       end
 
@@ -139,7 +143,7 @@ def install(spec, opts)
 
         expect(bundled_app("vendor/cache/a-path-gem-1.0-#{uri_hash}")).to exist
 
-        FileUtils.rm_rf lib_path("a-path-gem-1.0")
+        FileUtils.rm_r lib_path("a-path-gem-1.0")
         expect(the_bundle).to include_gems("a-path-gem 1.0")
       end
 
@@ -151,7 +155,7 @@ def install(spec, opts)
 
         expect(bundled_app("vendor/cache/a-path-gem-1.0-#{uri_hash}")).to exist
 
-        FileUtils.rm_rf lib_path("a-path-gem-1.0")
+        FileUtils.rm_r lib_path("a-path-gem-1.0")
         expect(the_bundle).to include_gems("a-path-gem 1.0")
       end
     end
@@ -166,7 +170,7 @@ def install(spec, opts)
               a-path-gem (1.0)
 
           GEM
-            remote: #{file_uri_for(gem_repo2)}/
+            remote: https://gem.repo2/
             specs:
 
           PLATFORMS
@@ -319,8 +323,8 @@ def installed?
       build_git "ma-gitp-gem"
 
       gemfile <<-G
-        source "#{file_uri_for(gem_repo2)}" # plugin source
-        source "#{file_uri_for(lib_path("ma-gitp-gem-1.0"))}", :type => :gitp do
+        source "https://gem.repo2" # plugin source
+        source "#{lib_path("ma-gitp-gem-1.0")}", :type => :gitp do
           gem "ma-gitp-gem"
         end
       G
@@ -332,20 +336,24 @@ def installed?
       expect(the_bundle).to include_gems("ma-gitp-gem 1.0")
     end
 
-    it "writes to lock file" do
+    it "writes to lockfile" do
       revision = revision_for(lib_path("ma-gitp-gem-1.0"))
       bundle "install"
 
+      checksums = checksums_section_when_enabled do |c|
+        c.no_checksum "ma-gitp-gem", "1.0"
+      end
+
       expect(lockfile).to eq <<~G
         PLUGIN SOURCE
-          remote: #{file_uri_for(lib_path("ma-gitp-gem-1.0"))}
+          remote: #{lib_path("ma-gitp-gem-1.0")}
           type: gitp
           revision: #{revision}
           specs:
             ma-gitp-gem (1.0)
 
         GEM
-          remote: #{file_uri_for(gem_repo2)}/
+          remote: https://gem.repo2/
           specs:
 
         PLATFORMS
@@ -353,7 +361,7 @@ def installed?
 
         DEPENDENCIES
           ma-gitp-gem!
-
+        #{checksums}
         BUNDLED WITH
            #{Bundler::VERSION}
       G
@@ -364,14 +372,14 @@ def installed?
         revision = revision_for(lib_path("ma-gitp-gem-1.0"))
         lockfile <<-G
           PLUGIN SOURCE
-            remote: #{file_uri_for(lib_path("ma-gitp-gem-1.0"))}
+            remote: #{lib_path("ma-gitp-gem-1.0")}
             type: gitp
             revision: #{revision}
             specs:
               ma-gitp-gem (1.0)
 
           GEM
-            remote: #{file_uri_for(gem_repo2)}/
+            remote: https://gem.repo2/
             specs:
 
           PLATFORMS
@@ -413,10 +421,10 @@ def installed?
       end
 
       it "updates the deps on change in gemfile" do
-        update_git "ma-gitp-gem", "1.1", :path => lib_path("ma-gitp-gem-1.0"), :gemspec => true
+        update_git "ma-gitp-gem", "1.1", path: lib_path("ma-gitp-gem-1.0"), gemspec: true
         gemfile <<-G
-          source "#{file_uri_for(gem_repo2)}" # plugin source
-          source "#{file_uri_for(lib_path("ma-gitp-gem-1.0"))}", :type => :gitp do
+          source "https://gem.repo2" # plugin source
+          source "#{lib_path("ma-gitp-gem-1.0")}", :type => :gitp do
             gem "ma-gitp-gem", "1.1"
           end
         G
@@ -432,7 +440,7 @@ def installed?
         ref = git.ref_for("main", 11)
 
         install_gemfile <<-G
-          source "#{file_uri_for(gem_repo2)}" # plugin source
+          source "https://gem.repo2" # plugin source
           source  '#{lib_path("foo-1.0")}', :type => :gitp do
             gem "foo"
           end
@@ -444,7 +452,7 @@ def installed?
         expect(bundled_app("vendor/cache/foo-1.0-#{ref}/.git")).not_to exist
         expect(bundled_app("vendor/cache/foo-1.0-#{ref}/.bundlecache")).to be_file
 
-        FileUtils.rm_rf lib_path("foo-1.0")
+        FileUtils.rm_r lib_path("foo-1.0")
         expect(the_bundle).to include_gems "foo 1.0"
       end
     end
diff --git a/spec/bundler/plugins/source_spec.rb b/spec/bundler/plugins/source_spec.rb
index 14643e5c81dc9d..995e50e653c9ce 100644
--- a/spec/bundler/plugins/source_spec.rb
+++ b/spec/bundler/plugins/source_spec.rb
@@ -16,8 +16,8 @@ class OPSource < Bundler::Plugin::API
 
     it "installs bundler-source-* gem when no handler for source is present" do
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo2)}"
-        source "#{file_uri_for(lib_path("gitp"))}", :type => :psource do
+        source "https://gem.repo2"
+        source "#{lib_path("gitp")}", :type => :psource do
         end
       G
 
@@ -38,8 +38,8 @@ class PSource < Bundler::Plugin::API
       end
 
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo2)}"
-        source "#{file_uri_for(lib_path("gitp"))}", :type => :psource do
+        source "https://gem.repo2"
+        source "#{lib_path("gitp")}", :type => :psource do
         end
       G
 
@@ -62,11 +62,11 @@ class Cheater < Bundler::Plugin::API
       context "explicit presence in gemfile" do
         before do
           install_gemfile <<-G
-            source "#{file_uri_for(gem_repo2)}"
+            source "https://gem.repo2"
 
             plugin "another-psource"
 
-            source "#{file_uri_for(lib_path("gitp"))}", :type => :psource do
+            source "#{lib_path("gitp")}", :type => :psource do
             end
           G
         end
@@ -88,11 +88,11 @@ class Cheater < Bundler::Plugin::API
       context "explicit default source" do
         before do
           install_gemfile <<-G
-            source "#{file_uri_for(gem_repo2)}"
+            source "https://gem.repo2"
 
             plugin "bundler-source-psource"
 
-            source "#{file_uri_for(lib_path("gitp"))}", :type => :psource do
+            source "#{lib_path("gitp")}", :type => :psource do
             end
           G
         end
diff --git a/spec/bundler/plugins/uninstall_spec.rb b/spec/bundler/plugins/uninstall_spec.rb
index 8180241911336c..dedcc9f37c6600 100644
--- a/spec/bundler/plugins/uninstall_spec.rb
+++ b/spec/bundler/plugins/uninstall_spec.rb
@@ -14,7 +14,7 @@
   end
 
   it "uninstalls specified plugins" do
-    bundle "plugin install foo kung-foo --source #{file_uri_for(gem_repo2)}"
+    bundle "plugin install foo kung-foo --source https://gem.repo2"
     plugin_should_be_installed("foo")
     plugin_should_be_installed("kung-foo")
 
@@ -30,9 +30,34 @@
     plugin_should_not_be_installed("foo")
   end
 
+  it "doesn't wipe out path plugins" do
+    build_lib "path_plugin" do |s|
+      s.write "plugins.rb"
+    end
+    path = lib_path("path_plugin-1.0")
+    expect(path).to be_a_directory
+
+    allow(Bundler::SharedHelpers).to receive(:find_gemfile).and_return(bundled_app_gemfile)
+
+    install_gemfile <<-G
+      source 'https://gem.repo2'
+      plugin 'path_plugin', :path => "#{path}"
+      gem 'myrack', '1.0.0'
+    G
+
+    plugin_should_be_installed("path_plugin")
+    expect(Bundler::Plugin.index.plugin_path("path_plugin")).to eq path
+
+    bundle "plugin uninstall path_plugin"
+    expect(out).to include("Uninstalled plugin path_plugin")
+    plugin_should_not_be_installed("path_plugin")
+    # the actual gem still exists though
+    expect(path).to be_a_directory
+  end
+
   describe "with --all" do
     it "uninstalls all installed plugins" do
-      bundle "plugin install foo kung-foo --source #{file_uri_for(gem_repo2)}"
+      bundle "plugin install foo kung-foo --source https://gem.repo2"
       plugin_should_be_installed("foo")
       plugin_should_be_installed("kung-foo")
 
diff --git a/spec/bundler/quality_spec.rb b/spec/bundler/quality_spec.rb
index a98815158eef82..669b8f0d3545c0 100644
--- a/spec/bundler/quality_spec.rb
+++ b/spec/bundler/quality_spec.rb
@@ -40,16 +40,14 @@ def check_for_extra_spaces(filename)
     "#{filename} has spaces on the EOL on lines #{failing_lines.join(", ")}"
   end
 
-  def check_for_straneous_quotes(filename)
-    return if File.expand_path(filename) == __FILE__
-
+  def check_for_extraneous_quotes(filename)
     failing_lines = []
     each_line(filename) do |line, number|
-      failing_lines << number + 1 if /’/.match?(line)
+      failing_lines << number + 1 if /\u{2019}/.match?(line)
     end
 
     return if failing_lines.empty?
-    "#{filename} has an straneous quote on lines #{failing_lines.join(", ")}"
+    "#{filename} has an extraneous quote on lines #{failing_lines.join(", ")}"
   end
 
   def check_for_expendable_words(filename)
@@ -96,12 +94,12 @@ def check_for_specific_pronouns(filename)
     expect(error_messages.compact).to be_well_formed
   end
 
-  it "has no estraneous quotes" do
+  it "has no extraneous quotes" do
     exempt = /vendor|vcr_cassettes|LICENSE|rbreadline\.diff/
     error_messages = []
     tracked_files.each do |filename|
       next if filename&.match?(exempt)
-      error_messages << check_for_straneous_quotes(filename)
+      error_messages << check_for_extraneous_quotes(filename)
     end
     expect(error_messages.compact).to be_well_formed
   end
@@ -146,6 +144,7 @@ def check_for_specific_pronouns(filename)
       gem.coc
       gem.linter
       gem.mit
+      gem.bundle
       gem.rubocop
       gem.test
       git.allow_insecure
@@ -167,7 +166,8 @@ def check_for_specific_pronouns(filename)
         line.scan(/Bundler\.settings\[:#{key_pattern}\]/).flatten.each {|s| all_settings[s] << "referenced at `#{filename}:#{number.succ}`" }
       end
     end
-    documented_settings = File.read("lib/bundler/man/bundle-config.1.ronn")[/LIST OF AVAILABLE KEYS.*/m].scan(/^\* `#{key_pattern}`/).flatten
+    settings_section = File.read("lib/bundler/man/bundle-config.1.ronn").split(/^## /).find {|section| section.start_with?("LIST OF AVAILABLE KEYS") }
+    documented_settings = settings_section.scan(/^\* `#{key_pattern}`/).flatten
 
     documented_settings.each do |s|
       all_settings.delete(s)
@@ -193,9 +193,10 @@ def check_for_specific_pronouns(filename)
   end
 
   it "ships the correct set of files" do
-    git_list = git_ls_files(ruby_core? ? "lib/bundler lib/bundler.rb libexec/bundle*" : "lib exe CHANGELOG.md LICENSE.md README.md bundler.gemspec")
+    git_list = tracked_files.reject {|f| f.start_with?("spec/") }
 
     gem_list = loaded_gemspec.files
+    gem_list.map! {|f| f.sub(%r{\Aexe/}, "libexec/") } if ruby_core?
 
     expect(git_list).to match_array(gem_list)
   end
@@ -217,7 +218,7 @@ def check_for_specific_pronouns(filename)
       end
     end
 
-    warnings = last_command.stdboth.split("\n")
+    warnings = stdboth.split("\n")
     # ignore warnings around deprecated Object#=~ method in RubyGems
     warnings.reject! {|w| w =~ %r{rubygems\/version.rb.*deprecated\ Object#=~} }
 
@@ -237,9 +238,24 @@ def check_for_specific_pronouns(filename)
     expect(all_bad_requires).to be_empty, "#{all_bad_requires.size} internal requires that should use `require_relative`: #{all_bad_requires}"
   end
 
+  # We don't want our artifice code to activate bundler, but it needs to use the
+  # namespaced implementation of `Net::HTTP`. So we duplicate the file in
+  # bundler that loads that.
+  it "keeps vendored_net_http spec code in sync with the lib implementation" do
+    lib_implementation_path = File.join(source_lib_dir, "bundler", "vendored_net_http.rb")
+    expect(File.exist?(lib_implementation_path)).to be_truthy
+    lib_code = File.read(lib_implementation_path)
+
+    spec_implementation_path = File.join(spec_dir, "support", "vendored_net_http.rb")
+    expect(File.exist?(spec_implementation_path)).to be_truthy
+    spec_code = File.read(spec_implementation_path)
+
+    expect(lib_code).to eq(spec_code)
+  end
+
   private
 
   def each_line(filename, &block)
-    File.readlines(filename, :encoding => "UTF-8").each_with_index(&block)
+    File.readlines(filename, encoding: "UTF-8").each_with_index(&block)
   end
 end
diff --git a/spec/bundler/realworld/dependency_api_spec.rb b/spec/bundler/realworld/dependency_api_spec.rb
deleted file mode 100644
index 14f99bd262f805..00000000000000
--- a/spec/bundler/realworld/dependency_api_spec.rb
+++ /dev/null
@@ -1,46 +0,0 @@
-# frozen_string_literal: true
-
-require_relative "../support/silent_logger"
-
-RSpec.describe "gemcutter's dependency API", :realworld => true do
-  context "when Gemcutter API takes too long to respond" do
-    before do
-      require_rack
-
-      port = find_unused_port
-      @server_uri = "http://127.0.0.1:#{port}"
-
-      require_relative "../support/artifice/endpoint_timeout"
-
-      @t = Thread.new do
-        server = Rack::Server.start(:app => EndpointTimeout,
-                                    :Host => "0.0.0.0",
-                                    :Port => port,
-                                    :server => "webrick",
-                                    :AccessLog => [],
-                                    :Logger => Spec::SilentLogger.new)
-        server.start
-      end
-      @t.run
-
-      wait_for_server("127.0.0.1", port)
-      bundle "config set timeout 1"
-    end
-
-    after do
-      Artifice.deactivate
-      @t.kill
-      @t.join
-    end
-
-    it "times out and falls back on the modern index" do
-      install_gemfile <<-G, :artifice => nil
-        source "#{@server_uri}"
-        gem "rack"
-      G
-
-      expect(out).to include("Fetching source index from #{@server_uri}/")
-      expect(the_bundle).to include_gems "rack 1.0.0"
-    end
-  end
-end
diff --git a/spec/bundler/realworld/double_check_spec.rb b/spec/bundler/realworld/double_check_spec.rb
index d7f28d10bb28a2..0741560395be9e 100644
--- a/spec/bundler/realworld/double_check_spec.rb
+++ b/spec/bundler/realworld/double_check_spec.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-RSpec.describe "double checking sources", :realworld => true do
+RSpec.describe "double checking sources", realworld: true do
   it "finds already-installed gems" do
     create_file("rails.gemspec", <<-RUBY)
       Gem::Specification.new do |s|
@@ -25,9 +25,9 @@
     RUBY
 
     cmd = <<-RUBY
-      require "#{entrypoint}"
+      require "bundler"
       require "#{spec_dir}/support/artifice/vcr"
-      require "#{entrypoint}/inline"
+      require "bundler/inline"
       gemfile(true) do
         source "https://rubygems.org"
         gem "rails", path: "."
diff --git a/spec/bundler/realworld/edgecases_spec.rb b/spec/bundler/realworld/edgecases_spec.rb
index 2f465b7b25c2ce..fb434aba7069b9 100644
--- a/spec/bundler/realworld/edgecases_spec.rb
+++ b/spec/bundler/realworld/edgecases_spec.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-RSpec.describe "real world edgecases", :realworld => true do
+RSpec.describe "real world edgecases", realworld: true do
   def rubygems_version(name, requirement)
     ruby <<-RUBY
       require "#{spec_dir}/support/artifice/vcr"
@@ -8,9 +8,10 @@ def rubygems_version(name, requirement)
       require "bundler/source/rubygems/remote"
       require "bundler/fetcher"
       rubygem = Bundler.ui.silence do
-        source = Bundler::Source::Rubygems::Remote.new(Bundler::URI("https://rubygems.org"))
-        fetcher = Bundler::Fetcher.new(source)
-        index = fetcher.specs([#{name.dump}], nil)
+        remote = Bundler::Source::Rubygems::Remote.new(Gem::URI("https://rubygems.org"))
+        source = Bundler::Source::Rubygems.new
+        fetcher = Bundler::Fetcher.new(remote)
+        index = fetcher.specs([#{name.dump}], source)
         requirement = Gem::Requirement.create(#{requirement.dump})
         index.search(#{name.dump}).select {|spec| requirement.satisfied_by?(spec.version) }.last
       end
@@ -192,24 +193,13 @@ def rubygems_version(name, requirement)
         rails (~> 4.2.7.1)
     L
 
-    bundle "lock --update paperclip", :env => { "BUNDLER_VERSION" => "1.99.0" }
+    bundle "lock --update paperclip", env: { "BUNDLER_VERSION" => "1.99.0" }
 
     expect(lockfile).to include(rubygems_version("paperclip", "~> 5.1.0"))
   end
 
-  it "outputs a helpful error message when gems have invalid gemspecs", :rubygems => "< 3.3.16" do
-    install_gemfile <<-G, :standalone => true, :raise_on_error => false, :env => { "BUNDLE_FORCE_RUBY_PLATFORM" => "1" }
-      source 'https://rubygems.org'
-      gem "resque-scheduler", "2.2.0"
-      gem "redis-namespace", "1.6.0" # for a consistent resolution including ruby 2.3.0
-      gem "ruby2_keywords", "0.0.5"
-    G
-    expect(err).to include("You have one or more invalid gemspecs that need to be fixed.")
-    expect(err).to include("resque-scheduler 2.2.0 has an invalid gemspec")
-  end
-
-  it "outputs a helpful warning when gems have a gemspec with invalid `require_paths`", :rubygems => ">= 3.3.16" do
-    install_gemfile <<-G, :standalone => true, :env => { "BUNDLE_FORCE_RUBY_PLATFORM" => "1" }
+  it "outputs a helpful warning when gems have a gemspec with invalid `require_paths`" do
+    install_gemfile <<-G, standalone: true, env: { "BUNDLE_FORCE_RUBY_PLATFORM" => "1" }
       source 'https://rubygems.org'
       gem "resque-scheduler", "2.2.0"
       gem "redis-namespace", "1.6.0" # for a consistent resolution including ruby 2.3.0
@@ -217,300 +207,4 @@ def rubygems_version(name, requirement)
     G
     expect(err).to include("resque-scheduler 2.2.0 includes a gemspec with `require_paths` set to an array of arrays. Newer versions of this gem might've already fixed this").once
   end
-
-  it "doesn't hang on big gemfile" do
-    skip "Only for ruby 2.7" unless RUBY_VERSION.start_with?("2.7")
-
-    gemfile <<~G
-      # frozen_string_literal: true
-
-      source "https://rubygems.org"
-
-      ruby "~> 2.7.7"
-
-      gem "rails"
-      gem "pg", ">= 0.18", "< 2.0"
-      gem "goldiloader"
-      gem "awesome_nested_set"
-      gem "circuitbox"
-      gem "passenger"
-      gem "globalid"
-      gem "rack-cors"
-      gem "rails-pg-extras"
-      gem "linear_regression_trend"
-      gem "rack-protection"
-      gem "pundit"
-      gem "remote_ip_proxy_scrubber"
-      gem "bcrypt"
-      gem "searchkick"
-      gem "excon"
-      gem "faraday_middleware-aws-sigv4"
-      gem "typhoeus"
-      gem "sidekiq"
-      gem "sidekiq-undertaker"
-      gem "sidekiq-cron"
-      gem "storext"
-      gem "appsignal"
-      gem "fcm"
-      gem "business_time"
-      gem "tzinfo"
-      gem "holidays"
-      gem "bigdecimal"
-      gem "progress_bar"
-      gem "redis"
-      gem "hiredis"
-      gem "state_machines"
-      gem "state_machines-audit_trail"
-      gem "state_machines-activerecord"
-      gem "interactor"
-      gem "ar_transaction_changes"
-      gem "redis-rails"
-      gem "seed_migration"
-      gem "lograge"
-      gem "graphiql-rails", group: :development
-      gem "graphql"
-      gem "pusher"
-      gem "rbnacl"
-      gem "jwt"
-      gem "json-schema"
-      gem "discard"
-      gem "money"
-      gem "strip_attributes"
-      gem "validates_email_format_of"
-      gem "audited"
-      gem "concurrent-ruby"
-      gem "with_advisory_lock"
-
-      group :test do
-        gem "rspec-sidekiq"
-        gem "simplecov", require: false
-      end
-
-      group :development, :test do
-        gem "byebug", platform: :mri
-        gem "guard"
-        gem "guard-bundler"
-        gem "guard-rspec"
-        gem "rb-fsevent"
-        gem "rspec_junit_formatter"
-        gem "rspec-collection_matchers"
-        gem "rspec-rails"
-        gem "rspec-retry"
-        gem "state_machines-rspec"
-        gem "dotenv-rails"
-        gem "database_cleaner-active_record"
-        gem "database_cleaner-redis"
-        gem "timecop"
-      end
-
-      gem "factory_bot_rails"
-      gem "faker"
-
-      group :development do
-        gem "listen"
-        gem "sql_queries_count"
-        gem "rubocop"
-        gem "rubocop-performance"
-        gem "rubocop-rspec"
-        gem "rubocop-rails"
-        gem "brakeman"
-        gem "bundler-audit"
-        gem "solargraph"
-        gem "annotate"
-      end
-    G
-
-    if Bundler.feature_flag.bundler_3_mode?
-      # Conflicts on bundler version, so we count attempts differently
-      bundle :lock, :env => { "DEBUG_RESOLVER" => "1" }, :raise_on_error => false
-      expect(out.split("\n").grep(/backtracking to/).count).to eq(16)
-    else
-      bundle :lock, :env => { "DEBUG_RESOLVER" => "1" }
-      expect(out).to include("Solution found after 7 attempts")
-    end
-  end
-
-  it "doesn't hang on tricky gemfile" do
-    skip "Only for ruby 2.7" unless RUBY_VERSION.start_with?("2.7")
-
-    gemfile <<~G
-      source 'https://rubygems.org'
-
-      group :development do
-        gem "puppet-module-posix-default-r2.7", '~> 0.3'
-        gem "puppet-module-posix-dev-r2.7", '~> 0.3'
-        gem "beaker-rspec"
-        gem "beaker-puppet"
-        gem "beaker-docker"
-        gem "beaker-puppet_install_helper"
-        gem "beaker-module_install_helper"
-      end
-    G
-
-    bundle :lock, :env => { "DEBUG_RESOLVER" => "1" }
-
-    expect(out).to include("Solution found after 6 attempts")
-  end
-
-  it "doesn't hang on nix gemfile" do
-    skip "Only for ruby 3.0" unless RUBY_VERSION.start_with?("3.0")
-
-    gemfile <<~G
-      source "https://rubygems.org"
-
-      gem "addressable"
-      gem "atk"
-      gem "awesome_print"
-      gem "bacon"
-      gem "byebug"
-      gem "cairo"
-      gem "cairo-gobject"
-      gem "camping"
-      gem "charlock_holmes"
-      gem "cld3"
-      gem "cocoapods"
-      gem "cocoapods-acknowledgements"
-      gem "cocoapods-art"
-      gem "cocoapods-bin"
-      gem "cocoapods-browser"
-      gem "cocoapods-bugsnag"
-      gem "cocoapods-check"
-      gem "cocoapods-clean"
-      gem "cocoapods-clean_build_phases_scripts"
-      gem "cocoapods-core"
-      gem "cocoapods-coverage"
-      gem "cocoapods-deintegrate"
-      gem "cocoapods-dependencies"
-      gem "cocoapods-deploy"
-      gem "cocoapods-downloader"
-      gem "cocoapods-expert-difficulty"
-      gem "cocoapods-fix-react-native"
-      gem "cocoapods-generate"
-      gem "cocoapods-git_url_rewriter"
-      gem "cocoapods-keys"
-      gem "cocoapods-no-dev-schemes"
-      gem "cocoapods-open"
-      gem "cocoapods-packager"
-      gem "cocoapods-playgrounds"
-      gem "cocoapods-plugins"
-      gem "cocoapods-prune-localizations"
-      gem "cocoapods-rome"
-      gem "cocoapods-search"
-      gem "cocoapods-sorted-search"
-      gem "cocoapods-static-swift-framework"
-      gem "cocoapods-stats"
-      gem "cocoapods-tdfire-binary"
-      gem "cocoapods-testing"
-      gem "cocoapods-trunk"
-      gem "cocoapods-try"
-      gem "cocoapods-try-release-fix"
-      gem "cocoapods-update-if-you-dare"
-      gem "cocoapods-whitelist"
-      gem "cocoapods-wholemodule"
-      gem "coderay"
-      gem "concurrent-ruby"
-      gem "curb"
-      gem "curses"
-      gem "daemons"
-      gem "dep-selector-libgecode"
-      gem "digest-sha3"
-      gem "domain_name"
-      gem "do_sqlite3"
-      gem "ethon"
-      gem "eventmachine"
-      gem "excon"
-      gem "faraday"
-      gem "ffi"
-      gem "ffi-rzmq-core"
-      gem "fog-dnsimple"
-      gem "gdk_pixbuf2"
-      gem "gio2"
-      gem "gitlab-markup"
-      gem "glib2"
-      gem "gpgme"
-      gem "gtk2"
-      gem "hashie"
-      gem "highline"
-      gem "hike"
-      gem "hitimes"
-      gem "hpricot"
-      gem "httpclient"
-      gem "http-cookie"
-      gem "iconv"
-      gem "idn-ruby"
-      gem "jbuilder"
-      gem "jekyll"
-      gem "jmespath"
-      gem "jwt"
-      gem "libv8"
-      gem "libxml-ruby"
-      gem "magic"
-      gem "markaby"
-      gem "method_source"
-      gem "mini_magick"
-      gem "msgpack"
-      gem "mysql2"
-      gem "ncursesw"
-      gem "netrc"
-      gem "net-scp"
-      gem "net-ssh"
-      gem "nokogiri"
-      gem "opus-ruby"
-      gem "ovirt-engine-sdk"
-      gem "pango"
-      gem "patron"
-      gem "pcaprub"
-      gem "pg"
-      gem "pry"
-      gem "pry-byebug"
-      gem "pry-doc"
-      gem "public_suffix"
-      gem "puma"
-      gem "rails"
-      gem "rainbow"
-      gem "rbnacl"
-      gem "rb-readline"
-      gem "re2"
-      gem "redis"
-      gem "redis-rack"
-      gem "rest-client"
-      gem "rmagick"
-      gem "rpam2"
-      gem "rspec"
-      gem "rubocop"
-      gem "rubocop-performance"
-      gem "ruby-libvirt"
-      gem "ruby-lxc"
-      gem "ruby-progressbar"
-      gem "ruby-terminfo"
-      gem "ruby-vips"
-      gem "rubyzip"
-      gem "rugged"
-      gem "sassc"
-      gem "scrypt"
-      gem "semian"
-      gem "sequel"
-      gem "sequel_pg"
-      gem "simplecov"
-      gem "sinatra"
-      gem "slop"
-      gem "snappy"
-      gem "sqlite3"
-      gem "taglib-ruby"
-      gem "thrift"
-      gem "tilt"
-      gem "tiny_tds"
-      gem "treetop"
-      gem "typhoeus"
-      gem "tzinfo"
-      gem "unf_ext"
-      gem "uuid4r"
-      gem "whois"
-      gem "zookeeper"
-    G
-
-    bundle :lock, :env => { "DEBUG_RESOLVER" => "1" }
-
-    expect(out).to include("Solution found after 4 attempts")
-  end
 end
diff --git a/spec/bundler/realworld/ffi_spec.rb b/spec/bundler/realworld/ffi_spec.rb
index fdefc140910f39..5f40b43a0f943d 100644
--- a/spec/bundler/realworld/ffi_spec.rb
+++ b/spec/bundler/realworld/ffi_spec.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-RSpec.describe "loading dynamically linked library on a bundle exec context", :realworld => true do
+RSpec.describe "loading dynamically linked library on a bundle exec context", realworld: true do
   it "passes ENV right after argv in memory" do
     create_file "foo.rb", <<~RUBY
       require 'ffi'
diff --git a/spec/bundler/realworld/fixtures/tapioca/Gemfile b/spec/bundler/realworld/fixtures/tapioca/Gemfile
new file mode 100644
index 00000000000000..447d7157064498
--- /dev/null
+++ b/spec/bundler/realworld/fixtures/tapioca/Gemfile
@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+
+source "https://rubygems.org"
+
+gem "tapioca"
diff --git a/spec/bundler/realworld/fixtures/tapioca/Gemfile.lock b/spec/bundler/realworld/fixtures/tapioca/Gemfile.lock
new file mode 100644
index 00000000000000..c9ded0fd787030
--- /dev/null
+++ b/spec/bundler/realworld/fixtures/tapioca/Gemfile.lock
@@ -0,0 +1,49 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    erubi (1.13.1)
+    netrc (0.11.0)
+    parallel (1.26.3)
+    prism (1.3.0)
+    rbi (0.2.2)
+      prism (~> 1.0)
+      sorbet-runtime (>= 0.5.9204)
+    sorbet (0.5.11725)
+      sorbet-static (= 0.5.11725)
+    sorbet-runtime (0.5.11725)
+    sorbet-static (0.5.11725-aarch64-linux)
+    sorbet-static (0.5.11725-universal-darwin)
+    sorbet-static (0.5.11725-x86_64-linux)
+    sorbet-static-and-runtime (0.5.11725)
+      sorbet (= 0.5.11725)
+      sorbet-runtime (= 0.5.11725)
+    spoom (1.5.0)
+      erubi (>= 1.10.0)
+      prism (>= 0.28.0)
+      sorbet-static-and-runtime (>= 0.5.10187)
+      thor (>= 0.19.2)
+    tapioca (0.16.6)
+      bundler (>= 2.2.25)
+      netrc (>= 0.11.0)
+      parallel (>= 1.21.0)
+      rbi (~> 0.2)
+      sorbet-static-and-runtime (>= 0.5.11087)
+      spoom (>= 1.2.0)
+      thor (>= 1.2.0)
+      yard-sorbet
+    thor (1.3.2)
+    yard (0.9.37)
+    yard-sorbet (0.9.0)
+      sorbet-runtime
+      yard
+
+PLATFORMS
+  aarch64-linux
+  universal-darwin
+  x86_64-linux
+
+DEPENDENCIES
+  tapioca
+
+BUNDLED WITH
+   2.7.0.dev
diff --git a/spec/bundler/realworld/fixtures/warbler/Gemfile b/spec/bundler/realworld/fixtures/warbler/Gemfile
index 4fbf2d05a7f416..07dc301d031eb7 100644
--- a/spec/bundler/realworld/fixtures/warbler/Gemfile
+++ b/spec/bundler/realworld/fixtures/warbler/Gemfile
@@ -2,6 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "demo", :path => "./demo"
-gem "jruby-jars", "~> 9.2"
-gem "warbler", "~> 2.0"
+gem "demo", path: "./demo"
+gem "jruby-jars", "~> 10.0"
+gem "warbler", github: "https://github.com/jruby/warbler/pull/557"
diff --git a/spec/bundler/realworld/fixtures/warbler/Gemfile.lock b/spec/bundler/realworld/fixtures/warbler/Gemfile.lock
index 5b476f8df27e8a..f6d50aad359018 100644
--- a/spec/bundler/realworld/fixtures/warbler/Gemfile.lock
+++ b/spec/bundler/realworld/fixtures/warbler/Gemfile.lock
@@ -1,3 +1,15 @@
+GIT
+  remote: https://github.com/jruby/warbler.git
+  revision: 3a3a89e9a055ab1badb4e6fee860e8617b4acfe1
+  ref: refs/pull/557/head
+  specs:
+    warbler (2.0.5)
+      jruby-jars (>= 9.0.0)
+      jruby-rack (>= 1.1.1, < 1.3)
+      rake (>= 13.0.3)
+      rexml (~> 3.0)
+      rubyzip (>= 1.0.0)
+
 PATH
   remote: demo
   specs:
@@ -6,25 +18,22 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    jruby-jars (9.2.16.0)
-    jruby-rack (1.1.21)
-    rake (13.0.1)
-    rubyzip (1.3.0)
-    warbler (2.0.5)
-      jruby-jars (>= 9.0.0.0)
-      jruby-rack (>= 1.1.1, < 1.3)
-      rake (>= 10.1.0)
-      rubyzip (~> 1.0, < 1.4)
+    jruby-jars (10.0.0.1)
+    jruby-rack (1.2.2)
+    rake (13.3.0)
+    rexml (3.4.1)
+    rubyzip (2.4.1)
 
 PLATFORMS
+  arm64-darwin
   java
   ruby
-  universal-java-11
+  universal-java
 
 DEPENDENCIES
   demo!
-  jruby-jars (~> 9.2)
-  warbler (~> 2.0)
+  jruby-jars (~> 10.0)
+  warbler!
 
 BUNDLED WITH
-   2.5.0.dev
+   2.7.0.dev
diff --git a/spec/bundler/realworld/gemfile_source_header_spec.rb b/spec/bundler/realworld/gemfile_source_header_spec.rb
deleted file mode 100644
index 60c0055a621106..00000000000000
--- a/spec/bundler/realworld/gemfile_source_header_spec.rb
+++ /dev/null
@@ -1,53 +0,0 @@
-# frozen_string_literal: true
-
-require_relative "../support/silent_logger"
-
-RSpec.describe "fetching dependencies with a mirrored source", :realworld => true do
-  let(:mirror) { "https://server.example.org" }
-  let(:original) { "http://127.0.0.1:#{@port}" }
-
-  before do
-    setup_server
-    bundle "config set --local mirror.#{mirror} #{original}"
-  end
-
-  after do
-    Artifice.deactivate
-    @t.kill
-    @t.join
-  end
-
-  it "sets the 'X-Gemfile-Source' header and bundles successfully" do
-    gemfile <<-G
-      source "#{mirror}"
-      gem 'weakling'
-    G
-
-    bundle :install, :artifice => nil
-
-    expect(out).to include("Installing weakling")
-    expect(out).to include("Bundle complete")
-    expect(the_bundle).to include_gems "weakling 0.0.3"
-  end
-
-  private
-
-  def setup_server
-    require_rack
-    @port = find_unused_port
-    @server_uri = "http://127.0.0.1:#{@port}"
-
-    require_relative "../support/artifice/endpoint_mirror_source"
-
-    @t = Thread.new do
-      Rack::Server.start(:app => EndpointMirrorSource,
-                         :Host => "0.0.0.0",
-                         :Port => @port,
-                         :server => "webrick",
-                         :AccessLog => [],
-                         :Logger => Spec::SilentLogger.new)
-    end.run
-
-    wait_for_server("127.0.0.1", @port)
-  end
-end
diff --git a/spec/bundler/realworld/git_spec.rb b/spec/bundler/realworld/git_spec.rb
index 3d352626ea75d0..9eff74f1c9214b 100644
--- a/spec/bundler/realworld/git_spec.rb
+++ b/spec/bundler/realworld/git_spec.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-RSpec.describe "github source", :realworld => true do
+RSpec.describe "github source", realworld: true do
   it "properly fetches PRs" do
     install_gemfile <<-G
       source "https://rubygems.org"
diff --git a/spec/bundler/realworld/mirror_probe_spec.rb b/spec/bundler/realworld/mirror_probe_spec.rb
deleted file mode 100644
index f2ce477c107393..00000000000000
--- a/spec/bundler/realworld/mirror_probe_spec.rb
+++ /dev/null
@@ -1,131 +0,0 @@
-# frozen_string_literal: true
-
-require_relative "../support/silent_logger"
-
-RSpec.describe "fetching dependencies with a not available mirror", :realworld => true do
-  let(:mirror) { @mirror_uri }
-  let(:original) { @server_uri }
-  let(:server_port) { @server_port }
-  let(:host) { "127.0.0.1" }
-
-  before do
-    require_rack
-    setup_server
-    setup_mirror
-  end
-
-  after do
-    Artifice.deactivate
-    @server_thread.kill
-    @server_thread.join
-  end
-
-  context "with a specific fallback timeout" do
-    before do
-      global_config("BUNDLE_MIRROR__HTTP://127__0__0__1:#{server_port}/__FALLBACK_TIMEOUT/" => "true",
-                    "BUNDLE_MIRROR__HTTP://127__0__0__1:#{server_port}/" => mirror)
-    end
-
-    it "install a gem using the original uri when the mirror is not responding" do
-      gemfile <<-G
-        source "#{original}"
-        gem 'weakling'
-      G
-
-      bundle :install, :artifice => nil
-
-      expect(out).to include("Installing weakling")
-      expect(out).to include("Bundle complete")
-      expect(the_bundle).to include_gems "weakling 0.0.3"
-    end
-  end
-
-  context "with a global fallback timeout" do
-    before do
-      global_config("BUNDLE_MIRROR__ALL__FALLBACK_TIMEOUT/" => "1",
-                    "BUNDLE_MIRROR__ALL" => mirror)
-    end
-
-    it "install a gem using the original uri when the mirror is not responding" do
-      gemfile <<-G
-        source "#{original}"
-        gem 'weakling'
-      G
-
-      bundle :install, :artifice => nil
-
-      expect(out).to include("Installing weakling")
-      expect(out).to include("Bundle complete")
-      expect(the_bundle).to include_gems "weakling 0.0.3"
-    end
-  end
-
-  context "with a specific mirror without a fallback timeout" do
-    before do
-      global_config("BUNDLE_MIRROR__HTTP://127__0__0__1:#{server_port}/" => mirror)
-    end
-
-    it "fails to install the gem with a timeout error" do
-      gemfile <<-G
-        source "#{original}"
-        gem 'weakling'
-      G
-
-      bundle :install, :artifice => nil, :raise_on_error => false
-
-      expect(out).to include("Fetching source index from #{mirror}")
-
-      err_lines = err.split("\n")
-      expect(err_lines).to include(%r{\ARetrying fetcher due to error \(2/4\): Bundler::HTTPError Could not fetch specs from #{mirror}/ due to underlying error <})
-      expect(err_lines).to include(%r{\ARetrying fetcher due to error \(3/4\): Bundler::HTTPError Could not fetch specs from #{mirror}/ due to underlying error <})
-      expect(err_lines).to include(%r{\ARetrying fetcher due to error \(4/4\): Bundler::HTTPError Could not fetch specs from #{mirror}/ due to underlying error <})
-      expect(err_lines).to include(%r{\ACould not fetch specs from #{mirror}/ due to underlying error <})
-    end
-  end
-
-  context "with a global mirror without a fallback timeout" do
-    before do
-      global_config("BUNDLE_MIRROR__ALL" => mirror)
-    end
-
-    it "fails to install the gem with a timeout error" do
-      gemfile <<-G
-        source "#{original}"
-        gem 'weakling'
-      G
-
-      bundle :install, :artifice => nil, :raise_on_error => false
-
-      expect(out).to include("Fetching source index from #{mirror}")
-
-      err_lines = err.split("\n")
-      expect(err_lines).to include(%r{\ARetrying fetcher due to error \(2/4\): Bundler::HTTPError Could not fetch specs from #{mirror}/ due to underlying error <})
-      expect(err_lines).to include(%r{\ARetrying fetcher due to error \(3/4\): Bundler::HTTPError Could not fetch specs from #{mirror}/ due to underlying error <})
-      expect(err_lines).to include(%r{\ARetrying fetcher due to error \(4/4\): Bundler::HTTPError Could not fetch specs from #{mirror}/ due to underlying error <})
-      expect(err_lines).to include(%r{\ACould not fetch specs from #{mirror}/ due to underlying error <})
-    end
-  end
-
-  def setup_server
-    @server_port = find_unused_port
-    @server_uri = "http://#{host}:#{@server_port}"
-
-    require_relative "../support/artifice/endpoint"
-
-    @server_thread = Thread.new do
-      Rack::Server.start(:app => Endpoint,
-                         :Host => host,
-                         :Port => @server_port,
-                         :server => "webrick",
-                         :AccessLog => [],
-                         :Logger => Spec::SilentLogger.new)
-    end.run
-
-    wait_for_server(host, @server_port)
-  end
-
-  def setup_mirror
-    @mirror_port = find_unused_port
-    @mirror_uri = "http://#{host}:#{@mirror_port}"
-  end
-end
diff --git a/spec/bundler/realworld/parallel_spec.rb b/spec/bundler/realworld/parallel_spec.rb
index a1e4f8390994ec..b57fdfd0ee6f53 100644
--- a/spec/bundler/realworld/parallel_spec.rb
+++ b/spec/bundler/realworld/parallel_spec.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-RSpec.describe "parallel", :realworld => true do
+RSpec.describe "parallel", realworld: true do
   it "installs" do
     gemfile <<-G
       source "https://rubygems.org"
@@ -9,7 +9,7 @@
       gem 'i18n', '~> 0.6.0' # Because 0.7+ requires Ruby 1.9.3+
     G
 
-    bundle :install, :jobs => 4, :env => { "DEBUG" => "1" }
+    bundle :install, jobs: 4, env: { "DEBUG" => "1" }
 
     expect(out).to match(/[1-3]: /)
 
@@ -34,7 +34,7 @@
       gem 'i18n', '~> 0.6.0' # Because 0.7+ requires Ruby 1.9.3+
     G
 
-    bundle :update, :jobs => 4, :env => { "DEBUG" => "1" }, :all => true
+    bundle :update, jobs: 4, env: { "DEBUG" => "1" }, all: true
 
     expect(out).to match(/[1-3]: /)
 
@@ -51,7 +51,7 @@
       gem "diff-lcs"
     G
 
-    bundle :install, :standalone => true, :jobs => 4
+    bundle :install, standalone: true, jobs: 4
 
     ruby <<-RUBY
       $:.unshift File.expand_path("bundle")
diff --git a/spec/bundler/realworld/slow_perf_spec.rb b/spec/bundler/realworld/slow_perf_spec.rb
index aa8a48fcc70919..5b74b9ea9eb493 100644
--- a/spec/bundler/realworld/slow_perf_spec.rb
+++ b/spec/bundler/realworld/slow_perf_spec.rb
@@ -2,7 +2,7 @@
 
 require "spec_helper"
 
-RSpec.describe "bundle install with complex dependencies", :realworld => true do
+RSpec.describe "bundle install with complex dependencies", realworld: true do
   it "resolves quickly" do
     gemfile <<-G
       source 'https://rubygems.org'
@@ -11,7 +11,8 @@
       gem "mongoid", ">= 0.10.2"
     G
 
-    expect { bundle "lock" }.to take_less_than(18) # seconds
+    bundle "lock", env: { "DEBUG_RESOLVER" => "1" }
+    expect(out).to include("Solution found after 1 attempts")
   end
 
   it "resolves quickly (case 2)" do
@@ -28,6 +29,110 @@
       gem 'rspec-rails'
     G
 
-    expect { bundle "lock" }.to take_less_than(30) # seconds
+    bundle "lock", env: { "DEBUG_RESOLVER" => "1" }
+    expect(out).to include("Solution found after 1 attempts")
+  end
+
+  it "resolves big gemfile quickly" do
+    gemfile <<~G
+      # frozen_string_literal: true
+
+      source "https://rubygems.org"
+
+      gem "rails"
+      gem "pg", ">= 0.18", "< 2.0"
+      gem "goldiloader"
+      gem "awesome_nested_set"
+      gem "circuitbox"
+      gem "passenger"
+      gem "globalid"
+      gem "rack-cors"
+      gem "rails-pg-extras"
+      gem "linear_regression_trend"
+      gem "rack-protection"
+      gem "pundit"
+      gem "remote_ip_proxy_scrubber"
+      gem "bcrypt"
+      gem "searchkick"
+      gem "excon"
+      gem "faraday_middleware-aws-sigv4"
+      gem "typhoeus"
+      gem "sidekiq"
+      gem "sidekiq-undertaker"
+      gem "sidekiq-cron"
+      gem "storext"
+      gem "appsignal"
+      gem "fcm"
+      gem "business_time"
+      gem "tzinfo"
+      gem "holidays"
+      gem "bigdecimal"
+      gem "progress_bar"
+      gem "redis"
+      gem "hiredis"
+      gem "state_machines"
+      gem "state_machines-audit_trail"
+      gem "state_machines-activerecord"
+      gem "interactor"
+      gem "ar_transaction_changes"
+      gem "redis-rails"
+      gem "seed_migration"
+      gem "lograge"
+      gem "graphiql-rails", group: :development
+      gem "graphql"
+      gem "pusher"
+      gem "rbnacl"
+      gem "jwt"
+      gem "json-schema"
+      gem "discard"
+      gem "money"
+      gem "strip_attributes"
+      gem "validates_email_format_of"
+      gem "audited"
+      gem "concurrent-ruby"
+      gem "with_advisory_lock"
+
+      group :test do
+        gem "rspec-sidekiq"
+        gem "simplecov", require: false
+      end
+
+      group :development, :test do
+        gem "byebug", platform: :mri
+        gem "guard"
+        gem "guard-bundler"
+        gem "guard-rspec"
+        gem "rb-fsevent"
+        gem "rspec_junit_formatter"
+        gem "rspec-collection_matchers"
+        gem "rspec-rails"
+        gem "rspec-retry"
+        gem "state_machines-rspec"
+        gem "dotenv-rails"
+        gem "database_cleaner-active_record"
+        gem "database_cleaner-redis"
+        gem "timecop"
+      end
+
+      gem "factory_bot_rails"
+      gem "faker"
+
+      group :development do
+        gem "listen"
+        gem "sql_queries_count"
+        gem "rubocop"
+        gem "rubocop-performance"
+        gem "rubocop-rspec"
+        gem "rubocop-rails"
+        gem "brakeman"
+        gem "bundler-audit"
+        gem "solargraph"
+        gem "annotate"
+      end
+    G
+
+    bundle "lock", env: { "DEBUG_RESOLVER" => "1" }
+
+    expect(out).to include("Solution found after 10 attempts")
   end
 end
diff --git a/spec/bundler/resolver/basic_spec.rb b/spec/bundler/resolver/basic_spec.rb
index 151d10c61cd1e5..185df1b1c73393 100644
--- a/spec/bundler/resolver/basic_spec.rb
+++ b/spec/bundler/resolver/basic_spec.rb
@@ -6,15 +6,15 @@
   end
 
   it "resolves a single gem" do
-    dep "rack"
+    dep "myrack"
 
-    should_resolve_as %w[rack-1.1]
+    should_resolve_as %w[myrack-1.1]
   end
 
   it "resolves a gem with dependencies" do
     dep "actionpack"
 
-    should_resolve_as %w[actionpack-2.3.5 activesupport-2.3.5 rack-1.0]
+    should_resolve_as %w[actionpack-2.3.5 activesupport-2.3.5 myrack-1.0]
   end
 
   it "resolves a conflicting index" do
@@ -84,7 +84,7 @@
     dep "activesupport", "= 3.0.0.beta"
     dep "actionpack"
 
-    should_resolve_as %w[activesupport-3.0.0.beta actionpack-3.0.0.beta rack-1.1 rack-mount-0.6]
+    should_resolve_as %w[activesupport-3.0.0.beta actionpack-3.0.0.beta myrack-1.1 myrack-mount-0.6]
   end
 
   it "prefers non-pre-releases when doing conservative updates" do
@@ -100,13 +100,22 @@
   end
 
   it "raises an exception if a child dependency is not resolved" do
-    @index = a_unresovable_child_index
+    @index = a_unresolvable_child_index
     dep "chef_app_error"
     expect do
       resolve
     end.to raise_error(Bundler::SolveFailure)
   end
 
+  it "does not try to re-resolve including prereleases if gems involved don't have prereleases" do
+    @index = a_unresolvable_child_index
+    dep "chef_app_error"
+    expect(Bundler.ui).not_to receive(:debug).with("Retrying resolution...", any_args)
+    expect do
+      resolve
+    end.to raise_error(Bundler::SolveFailure)
+  end
+
   it "raises an exception with the minimal set of conflicting dependencies" do
     @index = build_index do
       %w[0.9 1.0 2.0].each {|v| gem("a", v) }
@@ -202,12 +211,12 @@
 
     it "resolves all gems to latest patch" do
       # strict is not set, so bar goes up a minor version due to dependency from foo 1.4.5
-      should_conservative_resolve_and_include :patch, [], %w[foo-1.4.5 bar-2.1.1]
+      should_conservative_resolve_and_include :patch, true, %w[foo-1.4.5 bar-2.1.1]
     end
 
     it "resolves all gems to latest patch strict" do
       # strict is set, so foo can only go up to 1.4.4 to avoid bar going up a minor version, and bar can go up to 2.0.5
-      should_conservative_resolve_and_include [:patch, :strict], [], %w[foo-1.4.4 bar-2.0.5]
+      should_conservative_resolve_and_include [:patch, :strict], true, %w[foo-1.4.4 bar-2.0.5]
     end
 
     it "resolves foo only to latest patch - same dependency case" do
@@ -229,7 +238,7 @@
     it "resolves foo only to latest patch - changing dependency declared case" do
       # bar is locked AND a declared dependency in the Gemfile, so it will not move, and therefore
       # foo can only move up to 1.4.4.
-      @base << build_spec("bar", "2.0.3").first
+      @base = Bundler::SpecSet.new([Bundler::LazySpecification.new("bar", Gem::Version.new("2.0.3"), nil)])
       should_conservative_resolve_and_include :patch, ["foo"], %w[foo-1.4.4 bar-2.0.3]
     end
 
@@ -247,20 +256,20 @@
 
     it "resolves all gems to latest minor" do
       # strict is not set, so bar goes up a major version due to dependency from foo 1.4.5
-      should_conservative_resolve_and_include :minor, [], %w[foo-1.5.1 bar-3.0.0]
+      should_conservative_resolve_and_include :minor, true, %w[foo-1.5.1 bar-3.0.0]
     end
 
     it "resolves all gems to latest minor strict" do
       # strict is set, so foo can only go up to 1.5.0 to avoid bar going up a major version
-      should_conservative_resolve_and_include [:minor, :strict], [], %w[foo-1.5.0 bar-2.1.1]
+      should_conservative_resolve_and_include [:minor, :strict], true, %w[foo-1.5.0 bar-2.1.1]
     end
 
     it "resolves all gems to latest major" do
-      should_conservative_resolve_and_include :major, [], %w[foo-2.0.0 bar-3.0.0]
+      should_conservative_resolve_and_include :major, true, %w[foo-2.0.0 bar-3.0.0]
     end
 
     it "resolves all gems to latest major strict" do
-      should_conservative_resolve_and_include [:major, :strict], [], %w[foo-2.0.0 bar-3.0.0]
+      should_conservative_resolve_and_include [:major, :strict], true, %w[foo-2.0.0 bar-3.0.0]
     end
 
     # Why would this happen in real life? If bar 2.2 has a bug that the author of foo wants to bypass
@@ -283,31 +292,31 @@
       end
 
       it "could revert to a previous version level patch" do
-        should_conservative_resolve_and_include :patch, [], %w[foo-1.4.4 bar-2.1.1]
+        should_conservative_resolve_and_include :patch, true, %w[foo-1.4.4 bar-2.1.1]
       end
 
       it "cannot revert to a previous version in strict mode level patch" do
         # fall back to the locked resolution since strict means we can't regress either version
-        should_conservative_resolve_and_include [:patch, :strict], [], %w[foo-1.4.3 bar-2.2.3]
+        should_conservative_resolve_and_include [:patch, :strict], true, %w[foo-1.4.3 bar-2.2.3]
       end
 
       it "could revert to a previous version level minor" do
-        should_conservative_resolve_and_include :minor, [], %w[foo-1.5.0 bar-2.0.5]
+        should_conservative_resolve_and_include :minor, true, %w[foo-1.5.0 bar-2.0.5]
       end
 
       it "cannot revert to a previous version in strict mode level minor" do
         # fall back to the locked resolution since strict means we can't regress either version
-        should_conservative_resolve_and_include [:minor, :strict], [], %w[foo-1.4.3 bar-2.2.3]
+        should_conservative_resolve_and_include [:minor, :strict], true, %w[foo-1.4.3 bar-2.2.3]
       end
     end
   end
 
   it "handles versions that redundantly depend on themselves" do
     @index = build_index do
-      gem "rack", "3.0.0"
+      gem "myrack", "3.0.0"
 
       gem "standalone_migrations", "7.1.0" do
-        dep "rack", "~> 2.0"
+        dep "myrack", "~> 2.0"
       end
 
       gem "standalone_migrations", "2.0.4" do
@@ -315,22 +324,22 @@
       end
 
       gem "standalone_migrations", "1.0.13" do
-        dep "rack", ">= 0"
+        dep "myrack", ">= 0"
       end
     end
 
-    dep "rack", "~> 3.0"
+    dep "myrack", "~> 3.0"
     dep "standalone_migrations"
 
-    should_resolve_as %w[rack-3.0.0 standalone_migrations-2.0.4]
+    should_resolve_as %w[myrack-3.0.0 standalone_migrations-2.0.4]
   end
 
   it "ignores versions that incorrectly depend on themselves" do
     @index = build_index do
-      gem "rack", "3.0.0"
+      gem "myrack", "3.0.0"
 
       gem "standalone_migrations", "7.1.0" do
-        dep "rack", "~> 2.0"
+        dep "myrack", "~> 2.0"
       end
 
       gem "standalone_migrations", "2.0.4" do
@@ -338,22 +347,22 @@
       end
 
       gem "standalone_migrations", "1.0.13" do
-        dep "rack", ">= 0"
+        dep "myrack", ">= 0"
       end
     end
 
-    dep "rack", "~> 3.0"
+    dep "myrack", "~> 3.0"
     dep "standalone_migrations"
 
-    should_resolve_as %w[rack-3.0.0 standalone_migrations-1.0.13]
+    should_resolve_as %w[myrack-3.0.0 standalone_migrations-1.0.13]
   end
 
   it "does not ignore versions that incorrectly depend on themselves when dependency_api is not available" do
     @index = build_index do
-      gem "rack", "3.0.0"
+      gem "myrack", "3.0.0"
 
       gem "standalone_migrations", "7.1.0" do
-        dep "rack", "~> 2.0"
+        dep "myrack", "~> 2.0"
       end
 
       gem "standalone_migrations", "2.0.4" do
@@ -361,13 +370,53 @@
       end
 
       gem "standalone_migrations", "1.0.13" do
-        dep "rack", ">= 0"
+        dep "myrack", ">= 0"
       end
     end
 
-    dep "rack", "~> 3.0"
+    dep "myrack", "~> 3.0"
     dep "standalone_migrations"
 
-    should_resolve_without_dependency_api %w[rack-3.0.0 standalone_migrations-2.0.4]
+    should_resolve_without_dependency_api %w[myrack-3.0.0 standalone_migrations-2.0.4]
+  end
+
+  it "resolves fine cases that need joining unbounded disjoint ranges" do
+    @index = build_index do
+      gem "inspec", "5.22.3" do
+        dep "ruby", ">= 3.2.2"
+        dep "train-kubernetes", ">= 0.1.7"
+      end
+
+      gem "ruby", "3.2.2"
+
+      gem "train-kubernetes", "0.1.12" do
+        dep "k8s-ruby", ">= 0.14.0"
+      end
+
+      gem "train-kubernetes", "0.1.10" do
+        dep "k8s-ruby", "= 0.10.5"
+      end
+
+      gem "train-kubernetes", "0.1.7" do
+        dep "k8s-ruby", ">= 0.10.5"
+      end
+
+      gem "k8s-ruby", "0.10.5" do
+        dep "ruby","< 3.2.2"
+      end
+
+      gem "k8s-ruby", "0.11.0" do
+        dep "ruby", ">= 3.2.2"
+      end
+
+      gem "k8s-ruby", "0.14.0" do
+        dep "ruby", "< 3.2.2"
+      end
+    end
+
+    dep "inspec", "5.22.3"
+    dep "ruby", "3.2.2"
+
+    should_resolve_as %w[inspec-5.22.3 ruby-3.2.2 train-kubernetes-0.1.7 k8s-ruby-0.11.0]
   end
 end
diff --git a/spec/bundler/resolver/platform_spec.rb b/spec/bundler/resolver/platform_spec.rb
index a710dfcb28247a..13f3e152828e16 100644
--- a/spec/bundler/resolver/platform_spec.rb
+++ b/spec/bundler/resolver/platform_spec.rb
@@ -48,11 +48,11 @@
   it "takes the latest ruby gem, even if an older platform specific version is available" do
     @index = build_index do
       gem "foo", "1.0.0"
-      gem "foo", "1.0.0", "x64-mingw32"
+      gem "foo", "1.0.0", "x64-mingw-ucrt"
       gem "foo", "1.1.0"
     end
     dep "foo"
-    platforms "x64-mingw32"
+    platforms "x64-mingw-ucrt"
 
     should_resolve_as %w[foo-1.1.0]
   end
@@ -61,12 +61,12 @@
     @index = build_index do
       gem "bar", "1.0.0"
       gem "foo", "1.0.0"
-      gem "foo", "1.0.0", "x64-mingw32" do
+      gem "foo", "1.0.0", "x64-mingw-ucrt" do
         dep "bar", "< 1"
       end
     end
     dep "foo"
-    platforms "x64-mingw32"
+    platforms "x64-mingw-ucrt"
 
     should_resolve_as %w[foo-1.0.0]
   end
@@ -74,15 +74,15 @@
   it "prefers the platform specific gem to the ruby version" do
     @index = build_index do
       gem "foo", "1.0.0"
-      gem "foo", "1.0.0", "x64-mingw32"
+      gem "foo", "1.0.0", "x64-mingw-ucrt"
     end
     dep "foo"
-    platforms "x64-mingw32"
+    platforms "x64-mingw-ucrt"
 
-    should_resolve_as %w[foo-1.0.0-x64-mingw32]
+    should_resolve_as %w[foo-1.0.0-x64-mingw-ucrt]
   end
 
-  describe "on a linux platform", :rubygems => ">= 3.1.0.pre.1" do
+  describe "on a linux platform" do
     # Ruby's platform is *-linux => platform's libc is glibc, so not musl
     # Ruby's platform is *-linux-musl => platform's libc is musl, so not glibc
     # Gem's platform is *-linux => gem is glibc + maybe musl compatible
@@ -159,15 +159,15 @@
     before do
       @index = build_index do
         gem "foo", "1.0.0"
-        gem "foo", "1.0.0", "x64-mingw32"
+        gem "foo", "1.0.0", "x64-mingw-ucrt"
         gem "foo", "1.1.0"
-        gem "foo", "1.1.0", "x64-mingw32" do |s|
+        gem "foo", "1.1.0", "x64-mingw-ucrt" do |s|
           s.required_ruby_version = [">= 2.0", "< 2.4"]
         end
         gem "Ruby\0", "2.5.1"
       end
       dep "Ruby\0", "2.5.1"
-      platforms "x64-mingw32"
+      platforms "x64-mingw-ucrt"
     end
 
     it "takes the latest ruby gem" do
@@ -186,18 +186,18 @@
   it "takes the latest ruby gem with required_ruby_version if the platform specific gem doesn't match the required_ruby_version" do
     @index = build_index do
       gem "foo", "1.0.0"
-      gem "foo", "1.0.0", "x64-mingw32"
+      gem "foo", "1.0.0", "x64-mingw-ucrt"
       gem "foo", "1.1.0" do |s|
         s.required_ruby_version = [">= 2.0"]
       end
-      gem "foo", "1.1.0", "x64-mingw32" do |s|
+      gem "foo", "1.1.0", "x64-mingw-ucrt" do |s|
         s.required_ruby_version = [">= 2.0", "< 2.4"]
       end
       gem "Ruby\0", "2.5.1"
     end
     dep "foo"
     dep "Ruby\0", "2.5.1"
-    platforms "x64-mingw32"
+    platforms "x64-mingw-ucrt"
 
     should_resolve_as %w[foo-1.1.0]
   end
@@ -205,18 +205,18 @@
   it "takes the latest ruby gem if the platform specific gem doesn't match the required_ruby_version with multiple platforms" do
     @index = build_index do
       gem "foo", "1.0.0"
-      gem "foo", "1.0.0", "x64-mingw32"
+      gem "foo", "1.0.0", "x64-mingw-ucrt"
       gem "foo", "1.1.0" do |s|
         s.required_ruby_version = [">= 2.0"]
       end
-      gem "foo", "1.1.0", "x64-mingw32" do |s|
+      gem "foo", "1.1.0", "x64-mingw-ucrt" do |s|
         s.required_ruby_version = [">= 2.0", "< 2.4"]
       end
       gem "Ruby\0", "2.5.1"
     end
     dep "foo"
     dep "Ruby\0", "2.5.1"
-    platforms "x86_64-linux", "x64-mingw32"
+    platforms "x86_64-linux", "x64-mingw-ucrt"
 
     should_resolve_as %w[foo-1.1.0]
   end
@@ -342,7 +342,7 @@
   describe "with mingw32" do
     before :each do
       @index = build_index do
-        platforms "mingw32 mswin32 x64-mingw32 x64-mingw-ucrt" do |platform|
+        platforms "mingw32 mswin32 x64-mingw-ucrt" do |platform|
           gem "thin", "1.2.7", platform
         end
         gem "win32-api", "1.5.1", "universal-mingw32"
@@ -363,10 +363,10 @@
       should_resolve_as %w[thin-1.2.7-mingw32]
     end
 
-    it "finds x64-mingw32 gems" do
-      platforms "x64-mingw32"
+    it "finds x64-mingw-ucrt gems" do
+      platforms "x64-mingw-ucrt"
       dep "thin"
-      should_resolve_as %w[thin-1.2.7-x64-mingw32]
+      should_resolve_as %w[thin-1.2.7-x64-mingw-ucrt]
     end
 
     it "finds universal-mingw gems on x86-mingw" do
@@ -376,25 +376,21 @@
     end
 
     it "finds universal-mingw gems on x64-mingw" do
-      platform "x64-mingw32"
+      platform "x64-mingw-ucrt"
       dep "win32-api"
       should_resolve_as %w[win32-api-1.5.1-universal-mingw32]
     end
 
-    if Gem.rubygems_version >= Gem::Version.new("3.2.28")
-      it "finds x64-mingw-ucrt gems" do
-        platforms "x64-mingw-ucrt"
-        dep "thin"
-        should_resolve_as %w[thin-1.2.7-x64-mingw-ucrt]
-      end
+    it "finds x64-mingw-ucrt gems" do
+      platforms "x64-mingw-ucrt"
+      dep "thin"
+      should_resolve_as %w[thin-1.2.7-x64-mingw-ucrt]
     end
 
-    if Gem.rubygems_version >= Gem::Version.new("3.3.18")
-      it "finds universal-mingw gems on x64-mingw-ucrt" do
-        platform "x64-mingw-ucrt"
-        dep "win32-api"
-        should_resolve_as %w[win32-api-1.5.1-universal-mingw32]
-      end
+    it "finds universal-mingw gems on x64-mingw-ucrt", rubygems: ">= 3.3.18" do
+      platform "x64-mingw-ucrt"
+      dep "win32-api"
+      should_resolve_as %w[win32-api-1.5.1-universal-mingw32]
     end
   end
 
diff --git a/spec/bundler/runtime/env_helpers_spec.rb b/spec/bundler/runtime/env_helpers_spec.rb
new file mode 100644
index 00000000000000..42605b6ea00073
--- /dev/null
+++ b/spec/bundler/runtime/env_helpers_spec.rb
@@ -0,0 +1,304 @@
+# frozen_string_literal: true
+
+RSpec.describe "env helpers" do
+  def bundle_exec_ruby(args, options = {})
+    build_bundler_context options.dup
+    bundle "exec '#{Gem.ruby}' #{args}", options
+  end
+
+  def build_bundler_context(options = {})
+    bundle "config set path vendor/bundle", options.dup
+    gemfile "source 'https://gem.repo1'"
+    bundle "install", options
+  end
+
+  def run_bundler_script(env, script)
+    system(env, "ruby", "-I#{lib_dir}", "-rbundler", script.to_s)
+  end
+
+  describe "Bundler.original_env" do
+    it "should return the PATH present before bundle was activated" do
+      create_file("source.rb", <<-RUBY)
+        print Bundler.original_env["PATH"]
+      RUBY
+      path = `getconf PATH`.strip + "#{File::PATH_SEPARATOR}/foo"
+      with_path_as(path) do
+        bundle_exec_ruby(bundled_app("source.rb").to_s)
+        expect(stdboth).to eq(path)
+      end
+    end
+
+    it "should return the GEM_PATH present before bundle was activated" do
+      create_file("source.rb", <<-RUBY)
+        print Bundler.original_env['GEM_PATH']
+      RUBY
+      gem_path = ENV["GEM_PATH"] + "#{File::PATH_SEPARATOR}/foo"
+      with_gem_path_as(gem_path) do
+        bundle_exec_ruby(bundled_app("source.rb").to_s)
+        expect(stdboth).to eq(gem_path)
+      end
+    end
+
+    it "works with nested bundle exec invocations", :ruby_repo do
+      create_file("exe.rb", <<-'RUBY')
+        count = ARGV.first.to_i
+        exit if count < 0
+        STDERR.puts "#{count} #{ENV["PATH"].end_with?("#{File::PATH_SEPARATOR}/foo")}"
+        if count == 2
+          ENV["PATH"] = "#{ENV["PATH"]}#{File::PATH_SEPARATOR}/foo"
+        end
+        exec(Gem.ruby, __FILE__, (count - 1).to_s)
+      RUBY
+      path = `getconf PATH`.strip + File::PATH_SEPARATOR + File.dirname(Gem.ruby)
+      with_path_as(path) do
+        build_bundler_context
+        bundle_exec_ruby("#{bundled_app("exe.rb")} 2")
+      end
+      expect(err).to eq <<-EOS.strip
+2 false
+1 true
+0 true
+      EOS
+    end
+
+    it "removes variables that bundler added", :ruby_repo do
+      original = ruby('puts ENV.to_a.map {|e| e.join("=") }.sort.join("\n")', artifice: "fail")
+      create_file("source.rb", <<-RUBY)
+        puts Bundler.original_env.to_a.map {|e| e.join("=") }.sort.join("\n")
+      RUBY
+      bundle_exec_ruby bundled_app("source.rb"), artifice: "fail"
+      expect(out).to eq original
+    end
+  end
+
+  shared_examples_for "an unbundling helper" do
+    it "should delete BUNDLE_PATH" do
+      create_file("source.rb", <<-RUBY)
+        print #{modified_env}.has_key?('BUNDLE_PATH')
+      RUBY
+      ENV["BUNDLE_PATH"] = "./foo"
+      bundle_exec_ruby bundled_app("source.rb")
+      expect(stdboth).to include "false"
+    end
+
+    it "should remove absolute path to 'bundler/setup' from RUBYOPT even if it was present in original env" do
+      create_file("source.rb", <<-RUBY)
+        print #{modified_env}['RUBYOPT']
+      RUBY
+      setup_require = "-r#{lib_dir}/bundler/setup"
+      ENV["BUNDLER_ORIG_RUBYOPT"] = "-W2 #{setup_require} #{ENV["RUBYOPT"]}"
+      bundle_exec_ruby bundled_app("source.rb")
+      expect(stdboth).not_to include(setup_require)
+    end
+
+    it "should remove relative path to 'bundler/setup' from RUBYOPT even if it was present in original env" do
+      create_file("source.rb", <<-RUBY)
+        print #{modified_env}['RUBYOPT']
+      RUBY
+      ENV["BUNDLER_ORIG_RUBYOPT"] = "-W2 -rbundler/setup #{ENV["RUBYOPT"]}"
+      bundle_exec_ruby bundled_app("source.rb")
+      expect(stdboth).not_to include("-rbundler/setup")
+    end
+
+    it "should delete BUNDLER_SETUP even if it was present in original env" do
+      create_file("source.rb", <<-RUBY)
+        print #{modified_env}.has_key?('BUNDLER_SETUP')
+      RUBY
+      ENV["BUNDLER_ORIG_BUNDLER_SETUP"] = system_gem_path("gems/bundler-#{Bundler::VERSION}/lib/bundler/setup").to_s
+      bundle_exec_ruby bundled_app("source.rb")
+      expect(stdboth).to include "false"
+    end
+
+    it "should restore RUBYLIB", :ruby_repo do
+      create_file("source.rb", <<-RUBY)
+        print #{modified_env}['RUBYLIB']
+      RUBY
+      ENV["RUBYLIB"] = lib_dir.to_s + File::PATH_SEPARATOR + "/foo"
+      ENV["BUNDLER_ORIG_RUBYLIB"] = lib_dir.to_s + File::PATH_SEPARATOR + "/foo-original"
+      bundle_exec_ruby bundled_app("source.rb")
+      expect(stdboth).to include("/foo-original")
+    end
+
+    it "should restore the original MANPATH" do
+      create_file("source.rb", <<-RUBY)
+        print #{modified_env}['MANPATH']
+      RUBY
+      ENV["MANPATH"] = "/foo"
+      ENV["BUNDLER_ORIG_MANPATH"] = "/foo-original"
+      bundle_exec_ruby bundled_app("source.rb")
+      expect(stdboth).to include("/foo-original")
+    end
+  end
+
+  describe "Bundler.unbundled_env" do
+    let(:modified_env) { "Bundler.unbundled_env" }
+
+    it_behaves_like "an unbundling helper"
+  end
+
+  describe "Bundler.clean_env" do
+    let(:modified_env) { "Bundler.clean_env" }
+
+    it_behaves_like "an unbundling helper"
+  end
+
+  describe "Bundler.with_original_env" do
+    it "should set ENV to original_env in the block" do
+      expected = Bundler.original_env
+      actual = Bundler.with_original_env { ENV.to_hash }
+      expect(actual).to eq(expected)
+    end
+
+    it "should restore the environment after execution" do
+      Bundler.with_original_env do
+        ENV["FOO"] = "hello"
+      end
+
+      expect(ENV).not_to have_key("FOO")
+    end
+  end
+
+  describe "Bundler.with_clean_env" do
+    it "should set ENV to unbundled_env in the block" do
+      expected = Bundler.unbundled_env
+
+      actual = Bundler.ui.silence do
+        Bundler.with_clean_env { ENV.to_hash }
+      end
+
+      expect(actual).to eq(expected)
+    end
+
+    it "should restore the environment after execution" do
+      Bundler.ui.silence do
+        Bundler.with_clean_env { ENV["FOO"] = "hello" }
+      end
+
+      expect(ENV).not_to have_key("FOO")
+    end
+  end
+
+  describe "Bundler.with_unbundled_env" do
+    it "should set ENV to unbundled_env in the block" do
+      expected = Bundler.unbundled_env
+      actual = Bundler.with_unbundled_env { ENV.to_hash }
+      expect(actual).to eq(expected)
+    end
+
+    it "should restore the environment after execution" do
+      Bundler.with_unbundled_env do
+        ENV["FOO"] = "hello"
+      end
+
+      expect(ENV).not_to have_key("FOO")
+    end
+  end
+
+  describe "Bundler.original_system" do
+    before do
+      create_file("source.rb", <<-'RUBY')
+        Bundler.original_system("ruby", "-e", "exit(42) if ENV['BUNDLE_FOO'] == 'bar'")
+
+        exit $?.exitstatus
+      RUBY
+    end
+
+    it "runs system inside with_original_env" do
+      run_bundler_script({ "BUNDLE_FOO" => "bar" }, bundled_app("source.rb"))
+      expect($?.exitstatus).to eq(42)
+    end
+  end
+
+  describe "Bundler.clean_system" do
+    before do
+      create_file("source.rb", <<-'RUBY')
+        Bundler.ui.silence { Bundler.clean_system("ruby", "-e", "exit(42) unless ENV['BUNDLE_FOO'] == 'bar'") }
+
+        exit $?.exitstatus
+      RUBY
+    end
+
+    it "runs system inside with_clean_env" do
+      run_bundler_script({ "BUNDLE_FOO" => "bar" }, bundled_app("source.rb"))
+      expect($?.exitstatus).to eq(42)
+    end
+  end
+
+  describe "Bundler.unbundled_system" do
+    before do
+      create_file("source.rb", <<-'RUBY')
+        Bundler.unbundled_system("ruby", "-e", "exit(42) unless ENV['BUNDLE_FOO'] == 'bar'")
+
+        exit $?.exitstatus
+      RUBY
+    end
+
+    it "runs system inside with_unbundled_env" do
+      run_bundler_script({ "BUNDLE_FOO" => "bar" }, bundled_app("source.rb"))
+      expect($?.exitstatus).to eq(42)
+    end
+  end
+
+  describe "Bundler.original_exec" do
+    before do
+      create_file("source.rb", <<-'RUBY')
+        Process.fork do
+          exit Bundler.original_exec(%(test "\$BUNDLE_FOO" = "bar"))
+        end
+
+        _, status = Process.wait2
+
+        exit(status.exitstatus)
+      RUBY
+    end
+
+    it "runs exec inside with_original_env" do
+      skip "Fork not implemented" if Gem.win_platform?
+
+      run_bundler_script({ "BUNDLE_FOO" => "bar" }, bundled_app("source.rb"))
+      expect($?.exitstatus).to eq(0)
+    end
+  end
+
+  describe "Bundler.clean_exec" do
+    before do
+      create_file("source.rb", <<-'RUBY')
+        Process.fork do
+          exit Bundler.ui.silence { Bundler.clean_exec(%(test "\$BUNDLE_FOO" = "bar")) }
+        end
+
+        _, status = Process.wait2
+
+        exit(status.exitstatus)
+      RUBY
+    end
+
+    it "runs exec inside with_clean_env" do
+      skip "Fork not implemented" if Gem.win_platform?
+
+      run_bundler_script({ "BUNDLE_FOO" => "bar" }, bundled_app("source.rb"))
+      expect($?.exitstatus).to eq(1)
+    end
+  end
+
+  describe "Bundler.unbundled_exec" do
+    before do
+      create_file("source.rb", <<-'RUBY')
+        Process.fork do
+          exit Bundler.unbundled_exec(%(test "\$BUNDLE_FOO" = "bar"))
+        end
+
+        _, status = Process.wait2
+
+        exit(status.exitstatus)
+      RUBY
+    end
+
+    it "runs exec inside with_clean_env" do
+      skip "Fork not implemented" if Gem.win_platform?
+
+      run_bundler_script({ "BUNDLE_FOO" => "bar" }, bundled_app("source.rb"))
+      expect($?.exitstatus).to eq(1)
+    end
+  end
+end
diff --git a/spec/bundler/runtime/executable_spec.rb b/spec/bundler/runtime/executable_spec.rb
index a11f547648dae6..7cab24218f869a 100644
--- a/spec/bundler/runtime/executable_spec.rb
+++ b/spec/bundler/runtime/executable_spec.rb
@@ -3,140 +3,142 @@
 RSpec.describe "Running bin/* commands" do
   before :each do
     install_gemfile <<-G
-      source "#{file_uri_for(gem_repo1)}"
-      gem "rack"
+      source "https://gem.repo1"
+      gem "myrack"
     G
   end
 
   it "runs the bundled command when in the bundle" do
-    bundle "binstubs rack"
+    bundle "binstubs myrack"
 
-    build_gem "rack", "2.0", :to_system => true do |s|
-      s.executables = "rackup"
+    build_gem "myrack", "2.0", to_system: true do |s|
+      s.executables = "myrackup"
     end
 
-    gembin "rackup"
+    gembin "myrackup"
     expect(out).to eq("1.0.0")
   end
 
   it "allows the location of the gem stubs to be specified" do
-    bundle "binstubs rack", :path => "gbin"
+    bundle "binstubs myrack", path: "gbin"
 
     expect(bundled_app("bin")).not_to exist
-    expect(bundled_app("gbin/rackup")).to exist
+    expect(bundled_app("gbin/myrackup")).to exist
 
-    gembin bundled_app("gbin/rackup")
+    gembin bundled_app("gbin/myrackup")
     expect(out).to eq("1.0.0")
   end
 
   it "allows absolute paths as a specification of where to install bin stubs" do
-    bundle "binstubs rack", :path => tmp("bin")
+    bundle "binstubs myrack", path: tmp("bin")
 
-    gembin tmp("bin/rackup")
+    gembin tmp("bin/myrackup")
     expect(out).to eq("1.0.0")
   end
 
   it "uses the default ruby install name when shebang is not specified" do
-    bundle "binstubs rack"
-    expect(File.readlines(bundled_app("bin/rackup")).first).to eq("#!/usr/bin/env #{RbConfig::CONFIG["ruby_install_name"]}\n")
+    bundle "binstubs myrack"
+    expect(File.readlines(bundled_app("bin/myrackup")).first).to eq("#!/usr/bin/env #{RbConfig::CONFIG["ruby_install_name"]}\n")
   end
 
   it "allows the name of the shebang executable to be specified" do
-    bundle "binstubs rack", :shebang => "ruby-foo"
-    expect(File.readlines(bundled_app("bin/rackup")).first).to eq("#!/usr/bin/env ruby-foo\n")
+    bundle "binstubs myrack", shebang: "ruby-foo"
+    expect(File.readlines(bundled_app("bin/myrackup")).first).to eq("#!/usr/bin/env ruby-foo\n")
   end
 
   it "runs the bundled command when out of the bundle" do
-    bundle "binstubs rack"
+    bundle "binstubs myrack"
 
-    build_gem "rack", "2.0", :to_system => true do |s|
-      s.executables = "rackup"
+    build_gem "myrack", "2.0", to_system: true do |s|
+      s.executables = "myrackup"
     end
 
-    gembin "rackup", :dir => tmp
+    gembin "myrackup", dir: tmp
     expect(out).to eq("1.0.0")
   end
 
   it "works with gems in path" do
-    build_lib "rack", :path => lib_path("rack") do |s|
-      s.executables = "rackup"
+    build_lib "myrack", path: lib_path("myrack") do |s|
+      s.executables = "myrackup"
     end
 
     gemfile <<-G
-      source "#{file_uri_for(gem_repo1)}"
-      gem "rack", :path => "#{lib_path("rack")}"
+      source "https://gem.repo1"
+      gem "myrack", :path => "#{lib_path("myrack")}"
     G
 
-    bundle "binstubs rack"
+    bundle "binstubs myrack"
 
-    build_gem "rack", "2.0", :to_system => true do |s|
-      s.executables = "rackup"
+    build_gem "myrack", "2.0", to_system: true do |s|
+      s.executables = "myrackup"
     end
 
-    gembin "rackup"
+    gembin "myrackup"
     expect(out).to eq("1.0")
   end
 
-  it "creates a bundle binstub" do
+  it "does not create a bundle binstub" do
     gemfile <<-G
-      source "#{file_uri_for(gem_repo1)}"
+      source "https://gem.repo1"
       gem "bundler"
     G
 
     bundle "binstubs bundler"
 
-    expect(bundled_app("bin/bundle")).to exist
+    expect(bundled_app("bin/bundle")).not_to exist
+
+    expect(err).to include("Bundler itself does not use binstubs because its version is selected by RubyGems")
   end
 
   it "does not generate bin stubs if the option was not specified" do
     bundle "install"
 
-    expect(bundled_app("bin/rackup")).not_to exist
+    expect(bundled_app("bin/myrackup")).not_to exist
   end
 
-  it "allows you to stop installing binstubs", :bundler => "< 3" do
+  it "allows you to stop installing binstubs" do
     skip "delete permission error" if Gem.win_platform?
 
     bundle "install --binstubs bin/"
-    bundled_app("bin/rackup").rmtree
+    bundled_app("bin/myrackup").rmtree
     bundle "install --binstubs \"\""
 
-    expect(bundled_app("bin/rackup")).not_to exist
+    expect(bundled_app("bin/myrackup")).not_to exist
 
     bundle "config bin"
     expect(out).to include("You have not configured a value for `bin`")
   end
 
-  it "remembers that the option was specified", :bundler => "< 3" do
+  it "remembers that the option was specified" do
     gemfile <<-G
-      source "#{file_uri_for(gem_repo1)}"
+      source "https://gem.repo1"
       gem "activesupport"
     G
 
-    bundle :install, :binstubs => "bin"
+    bundle :install, binstubs: "bin"
 
     gemfile <<-G
-      source "#{file_uri_for(gem_repo1)}"
+      source "https://gem.repo1"
       gem "activesupport"
-      gem "rack"
+      gem "myrack"
     G
 
     bundle "install"
 
-    expect(bundled_app("bin/rackup")).to exist
+    expect(bundled_app("bin/myrackup")).to exist
   end
 
-  it "rewrites bins on binstubs (to maintain backwards compatibility)" do
+  it "rewrites bins on binstubs with --force option" do
     install_gemfile <<-G
-      source "#{file_uri_for(gem_repo1)}"
-      gem "rack"
+      source "https://gem.repo1"
+      gem "myrack"
     G
 
-    create_file("bin/rackup", "OMG")
+    create_file("bin/myrackup", "OMG")
 
-    bundle "binstubs rack"
+    bundle "binstubs myrack", { force: true }
 
-    expect(bundled_app("bin/rackup").read).to_not eq("OMG")
+    expect(bundled_app("bin/myrackup").read.strip).to_not eq("OMG")
   end
 
   it "use BUNDLE_GEMFILE gemfile for binstub" do
@@ -148,8 +150,8 @@
       build_gem("bindir") {|s| s.executables = "foo" }
     end
 
-    create_file("OtherGemfile", <<-G)
-      source "#{file_uri_for(gem_repo2)}"
+    gemfile("OtherGemfile", <<-G)
+      source "https://gem.repo2"
       gem 'bindir'
     G
 
diff --git a/spec/bundler/runtime/gem_tasks_spec.rb b/spec/bundler/runtime/gem_tasks_spec.rb
index b89fdf2cb11de0..6a8de2b949253a 100644
--- a/spec/bundler/runtime/gem_tasks_spec.rb
+++ b/spec/bundler/runtime/gem_tasks_spec.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 RSpec.describe "require 'bundler/gem_tasks'" do
-  before :each do
+  let(:define_local_gem_using_gem_tasks) do
     bundled_app("foo.gemspec").open("w") do |f|
       f.write <<-GEMSPEC
         Gem::Specification.new do |s|
@@ -20,15 +20,54 @@
     end
 
     install_gemfile <<-G
-      source "#{file_uri_for(gem_repo1)}"
+      source "https://gem.repo1"
+
+      gem "rake"
+    G
+  end
+
+  let(:define_local_gem_with_extensions_using_gem_tasks_and_gemspec_dsl) do
+    bundled_app("foo.gemspec").open("w") do |f|
+      f.write <<-GEMSPEC
+        Gem::Specification.new do |s|
+          s.name = "foo"
+          s.version = "1.0"
+          s.summary = "dummy"
+          s.author = "Perry Mason"
+          s.extensions = "ext/extconf.rb"
+        end
+      GEMSPEC
+    end
+
+    bundled_app("Rakefile").open("w") do |f|
+      f.write <<-RAKEFILE
+        require "bundler/gem_tasks"
+      RAKEFILE
+    end
+
+    Dir.mkdir bundled_app("ext")
+
+    bundled_app("ext/extconf.rb").open("w") do |f|
+      f.write <<-EXTCONF
+        require "mkmf"
+        File.write("Makefile", dummy_makefile($srcdir).join)
+      EXTCONF
+    end
+
+    install_gemfile <<-G
+      source "https://gem.repo1"
+
+      gemspec
 
       gem "rake"
     G
   end
 
   it "includes the relevant tasks" do
-    with_gem_path_as(base_system_gem_path.to_s) do
-      sys_exec "#{rake} -T", :env => { "GEM_HOME" => system_gem_path.to_s }
+    define_local_gem_using_gem_tasks
+
+    with_gem_path_as(scoped_base_system_gem_path.to_s) do
+      sys_exec "#{rake} -T", env: { "GEM_HOME" => system_gem_path.to_s }
     end
 
     expect(err).to be_empty
@@ -44,8 +83,10 @@
   end
 
   it "defines a working `rake install` task", :ruby_repo do
-    with_gem_path_as(base_system_gem_path.to_s) do
-      sys_exec "#{rake} install", :env => { "GEM_HOME" => system_gem_path.to_s }
+    define_local_gem_using_gem_tasks
+
+    with_gem_path_as(scoped_base_system_gem_path.to_s) do
+      sys_exec "#{rake} install", env: { "GEM_HOME" => system_gem_path.to_s }
     end
 
     expect(err).to be_empty
@@ -55,11 +96,21 @@
     expect(err).to be_empty
   end
 
+  it "defines a working `rake install` task for local gems with extensions", :ruby_repo do
+    define_local_gem_with_extensions_using_gem_tasks_and_gemspec_dsl
+
+    bundle "exec rake install"
+
+    expect(err).to be_empty
+  end
+
   context "rake build when path has spaces", :ruby_repo do
     before do
-      spaced_bundled_app = tmp.join("bundled app")
+      define_local_gem_using_gem_tasks
+
+      spaced_bundled_app = tmp("bundled app")
       FileUtils.cp_r bundled_app, spaced_bundled_app
-      bundle "exec rake build", :dir => spaced_bundled_app
+      bundle "exec rake build", dir: spaced_bundled_app
     end
 
     it "still runs successfully" do
@@ -69,9 +120,11 @@
 
   context "rake build when path has brackets", :ruby_repo do
     before do
-      bracketed_bundled_app = tmp.join("bundled[app")
+      define_local_gem_using_gem_tasks
+
+      bracketed_bundled_app = tmp("bundled[app")
       FileUtils.cp_r bundled_app, bracketed_bundled_app
-      bundle "exec rake build", :dir => bracketed_bundled_app
+      bundle "exec rake build", dir: bracketed_bundled_app
     end
 
     it "still runs successfully" do
@@ -81,12 +134,14 @@
 
   context "bundle path configured locally" do
     before do
+      define_local_gem_using_gem_tasks
+
       bundle "config set path vendor/bundle"
     end
 
     it "works", :ruby_repo do
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
+        source "https://gem.repo1"
 
         gem "rake"
       G
@@ -98,8 +153,10 @@
   end
 
   it "adds 'pkg' to rake/clean's CLOBBER" do
-    with_gem_path_as(base_system_gem_path.to_s) do
-      sys_exec %(#{rake} -e 'load "Rakefile"; puts CLOBBER.inspect'), :env => { "GEM_HOME" => system_gem_path.to_s }
+    define_local_gem_using_gem_tasks
+
+    with_gem_path_as(scoped_base_system_gem_path.to_s) do
+      sys_exec %(#{rake} -e 'load "Rakefile"; puts CLOBBER.inspect'), env: { "GEM_HOME" => system_gem_path.to_s }
     end
     expect(out).to eq '["pkg"]'
   end
diff --git a/spec/bundler/runtime/inline_spec.rb b/spec/bundler/runtime/inline_spec.rb
index 29ef036828986a..0467d8b14abdcb 100644
--- a/spec/bundler/runtime/inline_spec.rb
+++ b/spec/bundler/runtime/inline_spec.rb
@@ -2,10 +2,9 @@
 
 RSpec.describe "bundler/inline#gemfile" do
   def script(code, options = {})
-    requires = ["#{entrypoint}/inline"]
-    requires.unshift "#{spec_dir}/support/artifice/" + options.delete(:artifice) if options.key?(:artifice)
-    requires = requires.map {|r| "require '#{r}'" }.join("\n")
-    ruby("#{requires}\n\n" + code, options)
+    options[:artifice] ||= "compact_index"
+    options[:env] ||= { "BUNDLER_SPEC_GEM_REPO" => gem_repo1.to_s }
+    ruby("require 'bundler/inline'\n\n" + code, options)
   end
 
   before :each do
@@ -28,7 +27,7 @@ def script(code, options = {})
       s.write "lib/four.rb", "puts 'four'"
     end
 
-    build_lib "five", "1.0.0", :no_default => true do |s|
+    build_lib "five", "1.0.0", no_default: true do |s|
       s.write "lib/mofive.rb", "puts 'five'"
     end
 
@@ -48,7 +47,7 @@ def script(code, options = {})
   it "requires the gems" do
     script <<-RUBY
       gemfile do
-        source "#{file_uri_for(gem_repo1)}"
+        source "https://gem.repo1"
         path "#{lib_path}" do
           gem "two"
         end
@@ -57,9 +56,9 @@ def script(code, options = {})
 
     expect(out).to eq("two")
 
-    script <<-RUBY, :raise_on_error => false
+    script <<-RUBY, raise_on_error: false
       gemfile do
-        source "#{file_uri_for(gem_repo1)}"
+        source "https://gem.repo1"
         path "#{lib_path}" do
           gem "eleven"
         end
@@ -73,29 +72,29 @@ def script(code, options = {})
 
     script <<-RUBY
       gemfile(true) do
-        source "#{file_uri_for(gem_repo1)}"
-        gem "rack"
+        source "https://gem.repo1"
+        gem "myrack"
       end
     RUBY
 
-    expect(out).to include("Rack's post install message")
+    expect(out).to include("Myrack's post install message")
 
-    script <<-RUBY, :artifice => "endpoint"
+    script <<-RUBY, artifice: "endpoint"
       gemfile(true) do
-        source "https://notaserver.com"
+        source "https://notaserver.test"
         gem "activesupport", :require => true
       end
     RUBY
 
     expect(out).to include("Installing activesupport")
     err_lines = err.split("\n")
-    err_lines.reject! {|line| line =~ /\.rb:\d+: warning: / } unless RUBY_VERSION < "2.7"
+    err_lines.reject! {|line| line =~ /\.rb:\d+: warning: / }
     expect(err_lines).to be_empty
   end
 
   it "lets me use my own ui object" do
-    script <<-RUBY, :artifice => "endpoint"
-      require '#{entrypoint}'
+    script <<-RUBY, artifice: "endpoint"
+      require 'bundler'
       class MyBundlerUI < Bundler::UI::Shell
         def confirm(msg, newline = nil)
           puts "CONFIRMED!"
@@ -104,7 +103,7 @@ def confirm(msg, newline = nil)
       my_ui = MyBundlerUI.new
       my_ui.level = "confirm"
       gemfile(true, :ui => my_ui) do
-        source "https://notaserver.com"
+        source "https://notaserver.test"
         gem "activesupport", :require => true
       end
     RUBY
@@ -113,11 +112,11 @@ def confirm(msg, newline = nil)
   end
 
   it "has an option for quiet installation" do
-    script <<-RUBY, :artifice => "endpoint"
-      require '#{entrypoint}/inline'
+    script <<-RUBY, artifice: "endpoint"
+      require 'bundler/inline'
 
       gemfile(true, :quiet => true) do
-        source "https://notaserver.com"
+        source "https://notaserver.test"
         gem "activesupport", :require => true
       end
     RUBY
@@ -126,7 +125,7 @@ def confirm(msg, newline = nil)
   end
 
   it "raises an exception if passed unknown arguments" do
-    script <<-RUBY, :raise_on_error => false
+    script <<-RUBY, raise_on_error: false
       gemfile(true, :arglebargle => true) do
         path "#{lib_path}"
         gem "two"
@@ -140,10 +139,10 @@ def confirm(msg, newline = nil)
 
   it "does not mutate the option argument" do
     script <<-RUBY
-      require '#{entrypoint}'
+      require 'bundler'
       options = { :ui => Bundler::UI::Shell.new }
       gemfile(false, options) do
-        source "#{file_uri_for(gem_repo1)}"
+        source "https://gem.repo1"
         path "#{lib_path}" do
           gem "two"
         end
@@ -157,11 +156,11 @@ def confirm(msg, newline = nil)
   it "installs quietly if necessary when the install option is not set" do
     script <<-RUBY
       gemfile do
-        source "#{file_uri_for(gem_repo1)}"
-        gem "rack"
+        source "https://gem.repo1"
+        gem "myrack"
       end
 
-      puts RACK
+      puts MYRACK
     RUBY
 
     expect(out).to eq("1.0.0")
@@ -170,21 +169,21 @@ def confirm(msg, newline = nil)
 
   it "installs subdependencies quietly if necessary when the install option is not set" do
     build_repo4 do
-      build_gem "rack" do |s|
-        s.add_dependency "rackdep"
+      build_gem "myrack" do |s|
+        s.add_dependency "myrackdep"
       end
 
-      build_gem "rackdep", "1.0.0"
+      build_gem "myrackdep", "1.0.0"
     end
 
-    script <<-RUBY
+    script <<-RUBY, env: { "BUNDLER_SPEC_GEM_REPO" => gem_repo4.to_s }
       gemfile do
-        source "#{file_uri_for(gem_repo4)}"
-        gem "rack"
+        source "https://gem.repo4"
+        gem "myrack"
       end
 
-      require "rackdep"
-      puts RACKDEP
+      require "myrackdep"
+      puts MYRACKDEP
     RUBY
 
     expect(out).to eq("1.0.0")
@@ -193,23 +192,23 @@ def confirm(msg, newline = nil)
 
   it "installs subdependencies quietly if necessary when the install option is not set, and multiple sources used" do
     build_repo4 do
-      build_gem "rack" do |s|
-        s.add_dependency "rackdep"
+      build_gem "myrack" do |s|
+        s.add_dependency "myrackdep"
       end
 
-      build_gem "rackdep", "1.0.0"
+      build_gem "myrackdep", "1.0.0"
     end
 
-    script <<-RUBY
+    script <<-RUBY, artifice: "compact_index_extra_api"
       gemfile do
-        source "#{file_uri_for(gem_repo1)}"
-        source "#{file_uri_for(gem_repo4)}" do
-          gem "rack"
+        source "https://test.repo"
+        source "https://test.repo/extra" do
+          gem "myrack"
         end
       end
 
-      require "rackdep"
-      puts RACKDEP
+      require "myrackdep"
+      puts MYRACKDEP
     RUBY
 
     expect(out).to eq("1.0.0")
@@ -221,7 +220,7 @@ def confirm(msg, newline = nil)
     baz_ref = build_git("baz", "2.0.0").ref_for("HEAD")
     script <<-RUBY
       gemfile do
-        source "#{file_uri_for(gem_repo1)}"
+        source "https://gem.repo1"
         gem "foo", :git => #{lib_path("foo-1.0.0").to_s.dump}
         gem "baz", :git => #{lib_path("baz-2.0.0").to_s.dump}, :ref => #{baz_ref.dump}
       end
@@ -238,14 +237,14 @@ def confirm(msg, newline = nil)
     script <<-RUBY
       gemfile do
         path "#{lib_path}" do
-          source "#{file_uri_for(gem_repo1)}"
+          source "https://gem.repo1"
           gem "two"
         end
       end
 
       gemfile do
         path "#{lib_path}" do
-          source "#{file_uri_for(gem_repo1)}"
+          source "https://gem.repo1"
           gem "four"
         end
       end
@@ -256,73 +255,73 @@ def confirm(msg, newline = nil)
   end
 
   it "doesn't reinstall already installed gems" do
-    system_gems "rack-1.0.0"
+    system_gems "myrack-1.0.0"
 
     script <<-RUBY
-      require '#{entrypoint}'
+      require 'bundler'
       ui = Bundler::UI::Shell.new
       ui.level = "confirm"
 
       gemfile(true, ui: ui) do
-        source "#{file_uri_for(gem_repo1)}"
+        source "https://gem.repo1"
         gem "activesupport"
-        gem "rack"
+        gem "myrack"
       end
     RUBY
 
     expect(out).to include("Installing activesupport")
-    expect(out).not_to include("Installing rack")
+    expect(out).not_to include("Installing myrack")
     expect(err).to be_empty
   end
 
   it "installs gems in later gemfile calls" do
-    system_gems "rack-1.0.0"
+    system_gems "myrack-1.0.0"
 
     script <<-RUBY
-      require '#{entrypoint}'
+      require 'bundler'
       ui = Bundler::UI::Shell.new
       ui.level = "confirm"
       gemfile(true, ui: ui) do
-        source "#{file_uri_for(gem_repo1)}"
-        gem "rack"
+        source "https://gem.repo1"
+        gem "myrack"
       end
 
       gemfile(true, ui: ui) do
-        source "#{file_uri_for(gem_repo1)}"
+        source "https://gem.repo1"
         gem "activesupport"
       end
     RUBY
 
     expect(out).to include("Installing activesupport")
-    expect(out).not_to include("Installing rack")
+    expect(out).not_to include("Installing myrack")
     expect(err).to be_empty
   end
 
   it "doesn't reinstall already installed gems in later gemfile calls" do
-    system_gems "rack-1.0.0"
+    system_gems "myrack-1.0.0"
 
     script <<-RUBY
-      require '#{entrypoint}'
+      require 'bundler'
       ui = Bundler::UI::Shell.new
       ui.level = "confirm"
       gemfile(true, ui: ui) do
-        source "#{file_uri_for(gem_repo1)}"
+        source "https://gem.repo1"
         gem "activesupport"
       end
 
       gemfile(true, ui: ui) do
-        source "#{file_uri_for(gem_repo1)}"
-        gem "rack"
+        source "https://gem.repo1"
+        gem "myrack"
       end
     RUBY
 
     expect(out).to include("Installing activesupport")
-    expect(out).not_to include("Installing rack")
+    expect(out).not_to include("Installing myrack")
     expect(err).to be_empty
   end
 
   it "installs gems with native extensions in later gemfile calls" do
-    system_gems "rack-1.0.0"
+    system_gems "myrack-1.0.0"
 
     build_git "foo" do |s|
       s.add_dependency "rake"
@@ -339,16 +338,16 @@ def confirm(msg, newline = nil)
     end
 
     script <<-RUBY
-      require '#{entrypoint}'
+      require 'bundler'
       ui = Bundler::UI::Shell.new
       ui.level = "confirm"
       gemfile(true, ui: ui) do
-        source "#{file_uri_for(gem_repo1)}"
-        gem "rack"
+        source "https://gem.repo1"
+        gem "myrack"
       end
 
       gemfile(true, ui: ui) do
-        source "#{file_uri_for(gem_repo1)}"
+        source "https://gem.repo1"
         gem "foo", :git => "#{lib_path("foo-1.0")}"
       end
 
@@ -364,7 +363,7 @@ def confirm(msg, newline = nil)
 
   it "installs inline gems when a Gemfile.lock is present" do
     gemfile <<-G
-      source "https://notaserver.com"
+      source "https://notaserver.test"
       gem "rake"
     G
 
@@ -386,11 +385,11 @@ def confirm(msg, newline = nil)
 
     script <<-RUBY
       gemfile do
-        source "#{file_uri_for(gem_repo1)}"
-        gem "rack"
+        source "https://gem.repo1"
+        gem "myrack"
       end
 
-      puts RACK
+      puts MYRACK
     RUBY
 
     expect(err).to be_empty
@@ -398,7 +397,7 @@ def confirm(msg, newline = nil)
 
   it "does not leak Gemfile.lock versions to the installation output" do
     gemfile <<-G
-      source "https://notaserver.com"
+      source "https://notaserver.test"
       gem "rake"
     G
 
@@ -420,37 +419,37 @@ def confirm(msg, newline = nil)
 
     script <<-RUBY
       gemfile(true) do
-        source "#{file_uri_for(gem_repo1)}"
-        gem "rake", "~> 13.0"
+        source "https://gem.repo1"
+        gem "rake", "#{rake_version}"
       end
     RUBY
 
-    expect(out).to include("Installing rake 13.0")
+    expect(out).to include("Installing rake #{rake_version}")
     expect(out).not_to include("was 11.3.0")
     expect(err).to be_empty
   end
 
   it "installs inline gems when frozen is set" do
-    script <<-RUBY, :env => { "BUNDLE_FROZEN" => "true" }
+    script <<-RUBY, env: { "BUNDLE_FROZEN" => "true", "BUNDLER_SPEC_GEM_REPO" => gem_repo1.to_s }
       gemfile do
-        source "#{file_uri_for(gem_repo1)}"
-        gem "rack"
+        source "https://gem.repo1"
+        gem "myrack"
       end
 
-      puts RACK
+      puts MYRACK
     RUBY
 
     expect(last_command.stderr).to be_empty
   end
 
   it "installs inline gems when deployment is set" do
-    script <<-RUBY, :env => { "BUNDLE_DEPLOYMENT" => "true" }
+    script <<-RUBY, env: { "BUNDLE_DEPLOYMENT" => "true", "BUNDLER_SPEC_GEM_REPO" => gem_repo1.to_s }
       gemfile do
-        source "#{file_uri_for(gem_repo1)}"
-        gem "rack"
+        source "https://gem.repo1"
+        gem "myrack"
       end
 
-      puts RACK
+      puts MYRACK
     RUBY
 
     expect(last_command.stderr).to be_empty
@@ -461,11 +460,11 @@ def confirm(msg, newline = nil)
 
     script <<-RUBY
       gemfile do
-        source "#{file_uri_for(gem_repo1)}"
-        gem "rack"
+        source "https://gem.repo1"
+        gem "myrack"
       end
 
-      puts RACK
+      puts MYRACK
     RUBY
 
     expect(err).to be_empty
@@ -476,11 +475,11 @@ def confirm(msg, newline = nil)
 
     script <<-RUBY
       gemfile do
-        source "#{file_uri_for(gem_repo1)}"
-        gem "rack" # has the rackup executable
+        source "https://gem.repo1"
+        gem "myrack" # has the myrackup executable
       end
 
-      puts RACK
+      puts MYRACK
     RUBY
     expect(last_command).to be_success
     expect(out).to eq "1.0.0"
@@ -488,14 +487,14 @@ def confirm(msg, newline = nil)
 
   context "when BUNDLE_PATH is set" do
     it "installs inline gems to the system path regardless" do
-      script <<-RUBY, :env => { "BUNDLE_PATH" => "./vendor/inline" }
+      script <<-RUBY, env: { "BUNDLE_PATH" => "./vendor/inline", "BUNDLER_SPEC_GEM_REPO" => gem_repo1.to_s }
         gemfile(true) do
-          source "#{file_uri_for(gem_repo1)}"
-          gem "rack"
+          source "https://gem.repo1"
+          gem "myrack"
         end
       RUBY
       expect(last_command).to be_success
-      expect(system_gem_path("gems/rack-1.0.0")).to exist
+      expect(system_gem_path("gems/myrack-1.0.0")).to exist
     end
   end
 
@@ -504,8 +503,8 @@ def confirm(msg, newline = nil)
 
     script <<-RUBY
       gemfile(true) do
-        source "#{file_uri_for(gem_repo1)}"
-        gem "rack", platform: :jruby
+        source "https://gem.repo1"
+        gem "myrack", platform: :jruby
       end
     RUBY
 
@@ -517,21 +516,21 @@ def confirm(msg, newline = nil)
 
     script <<-RUBY
       gemfile do
-        source "#{file_uri_for(gem_repo1)}"
-        gem "rack"
+        source "https://gem.repo1"
+        gem "myrack"
       end
     RUBY
 
     expect(last_command).to be_success
-    expect(system_gem_path("gems/rack-1.0.0")).to exist
+    expect(system_gem_path("gems/myrack-1.0.0")).to exist
   end
 
   it "preserves previous BUNDLE_GEMFILE value" do
     ENV["BUNDLE_GEMFILE"] = ""
     script <<-RUBY
       gemfile do
-        source "#{file_uri_for(gem_repo1)}"
-        gem "rack"
+        source "https://gem.repo1"
+        gem "myrack"
       end
 
       puts "BUNDLE_GEMFILE is empty" if ENV["BUNDLE_GEMFILE"].empty?
@@ -547,8 +546,8 @@ def confirm(msg, newline = nil)
     ENV["BUNDLE_GEMFILE"] = nil
     script <<-RUBY
       gemfile do
-        source "#{file_uri_for(gem_repo1)}"
-        gem "rack"
+        source "https://gem.repo1"
+        gem "myrack"
       end
 
       puts "BUNDLE_GEMFILE is empty" if ENV["BUNDLE_GEMFILE"].empty?
@@ -576,9 +575,9 @@ def confirm(msg, newline = nil)
       s.write "lib/foo.rb", foo_code
     end
 
-    script <<-RUBY, :dir => tmp("path_without_gemfile")
+    script <<-RUBY, dir: tmp("path_without_gemfile"), env: { "BUNDLER_SPEC_GEM_REPO" => gem_repo2.to_s }
       gemfile do
-        source "#{file_uri_for(gem_repo2)}"
+        source "https://gem.repo2"
         path "#{lib_path}" do
           gem "foo", require: false
         end
@@ -591,36 +590,120 @@ def confirm(msg, newline = nil)
     expect(err).to be_empty
   end
 
-  it "when requiring fileutils after does not show redefinition warnings", :realworld do
-    dependency_installer_loads_fileutils = ruby "require 'rubygems/dependency_installer'; puts $LOADED_FEATURES.grep(/fileutils/)", :raise_on_error => false
-    skip "does not work if rubygems/dependency_installer loads fileutils, which happens until rubygems 3.2.0" unless dependency_installer_loads_fileutils.empty?
+  it "does not load default timeout" do
+    default_timeout_version = ruby "gem 'timeout', '< 999999'; require 'timeout'; puts Timeout::VERSION", raise_on_error: false
+    skip "timeout isn't a default gem" if default_timeout_version.empty?
 
-    skip "pathname does not install cleanly on this ruby" if RUBY_VERSION < "2.7.0"
+    # This only works on RubyGems 3.5.0 or higher
+    ruby "require 'rubygems/timeout'", raise_on_error: false
+    skip "rubygems under test does not yet vendor timeout" unless last_command.success?
 
-    Dir.mkdir tmp("path_without_gemfile")
+    build_repo4 do
+      build_gem "timeout", "999"
+    end
+
+    script <<-RUBY, env: { "BUNDLER_SPEC_GEM_REPO" => gem_repo4.to_s }
+      require "bundler/inline"
+
+      gemfile(true) do
+        source "https://gem.repo4"
+
+        gem "timeout"
+      end
+    RUBY
+
+    expect(out).to include("Installing timeout 999")
+  end
+
+  it "does not upcase ENV" do
+    script <<-RUBY
+      require 'bundler/inline'
+
+      ENV['Test_Variable'] = 'value string'
+      puts("before: \#{ENV.each_key.select { |key| key.match?(/test_variable/i) }}")
+
+      gemfile do
+        source "https://gem.repo1"
+      end
+
+      puts("after: \#{ENV.each_key.select { |key| key.match?(/test_variable/i) }}")
+    RUBY
+
+    expect(out).to include("before: [\"Test_Variable\"]")
+    expect(out).to include("after: [\"Test_Variable\"]")
+  end
+
+  it "does not create a lockfile" do
+    script <<-RUBY
+      require 'bundler/inline'
+
+      gemfile do
+        source "https://gem.repo1"
+      end
+
+      puts Dir.glob("Gemfile.lock")
+    RUBY
+
+    expect(out).to be_empty
+  end
 
-    default_fileutils_version = ruby "gem 'fileutils', '< 999999'; require 'fileutils'; puts FileUtils::VERSION", :raise_on_error => false
-    skip "fileutils isn't a default gem" if default_fileutils_version.empty?
+  it "does not reset ENV" do
+    script <<-RUBY
+      require 'bundler/inline'
 
-    realworld_system_gems "fileutils --version 1.4.1"
+      gemfile do
+        source "https://gem.repo1"
 
-    realworld_system_gems "pathname --version 0.2.0"
+        ENV['FOO'] = 'bar'
+      end
 
-    realworld_system_gems "timeout uri" # this spec uses net/http which requires these default gems
+      puts ENV['FOO']
+    RUBY
 
-    # on prerelease rubies, a required_rubygems_version constraint is added by RubyGems to the resolution, causing Molinillo to load the `set` gem
-    realworld_system_gems "set --version 1.0.3" if Gem.ruby_version.prerelease?
+    expect(out).to eq("bar")
+  end
 
-    script <<-RUBY, :dir => tmp("path_without_gemfile"), :env => { "BUNDLER_GEM_DEFAULT_DIR" => system_gem_path.to_s }
+  it "does not load specified version of psych and stringio", :ruby_repo do
+    build_repo4 do
+      build_gem "psych", "999"
+      build_gem "stringio", "999"
+    end
+
+    script <<-RUBY, env: { "BUNDLER_SPEC_GEM_REPO" => gem_repo4.to_s }
       require "bundler/inline"
 
       gemfile(true) do
-        source "#{file_uri_for(gem_repo2)}"
+        source "https://gem.repo4"
+
+        gem "psych"
+        gem "stringio"
       end
+    RUBY
+
+    expect(out).to include("Installing psych 999")
+    expect(out).to include("Installing stringio 999")
+    expect(out).to include("The psych gem was resolved to 999")
+    expect(out).to include("The stringio gem was resolved to 999")
+  end
+
+  it "leaves a lockfile in the same directory as the inline script alone" do
+    install_gemfile <<~G
+      source "https://gem.repo1"
+      gem "foo"
+    G
 
-      require "fileutils"
+    original_lockfile = lockfile
+
+    script <<-RUBY, env: { "BUNDLER_SPEC_GEM_REPO" => gem_repo1.to_s }
+      require "bundler/inline"
+
+      gemfile(true) do
+        source "https://gem.repo1"
+
+        gem "myrack"
+      end
     RUBY
 
-    expect(err).to eq("The Gemfile specifies no dependencies")
+    expect(lockfile).to eq(original_lockfile)
   end
 end
diff --git a/spec/bundler/runtime/load_spec.rb b/spec/bundler/runtime/load_spec.rb
index 96a22a46cc9992..15f3d0eb5bcd6c 100644
--- a/spec/bundler/runtime/load_spec.rb
+++ b/spec/bundler/runtime/load_spec.rb
@@ -4,18 +4,18 @@
   describe "with a gemfile" do
     before(:each) do
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
-        gem "rack"
+        source "https://gem.repo1"
+        gem "myrack"
       G
       allow(Bundler::SharedHelpers).to receive(:pwd).and_return(bundled_app)
     end
 
     it "provides a list of the env dependencies" do
-      expect(Bundler.load.dependencies).to have_dep("rack", ">= 0")
+      expect(Bundler.load.dependencies).to have_dep("myrack", ">= 0")
     end
 
     it "provides a list of the resolved gems" do
-      expect(Bundler.load.gems).to have_gem("rack-1.0.0", "bundler-#{Bundler::VERSION}")
+      expect(Bundler.load.gems).to have_gem("myrack-1.0.0", "bundler-#{Bundler::VERSION}")
     end
 
     it "ignores blank BUNDLE_GEMFILEs" do
@@ -28,20 +28,20 @@
 
   describe "with a gems.rb file" do
     before(:each) do
-      create_file "gems.rb", <<-G
-        source "#{file_uri_for(gem_repo1)}"
-        gem "rack"
+      gemfile "gems.rb", <<-G
+        source "https://gem.repo1"
+        gem "myrack"
       G
       bundle :install
       allow(Bundler::SharedHelpers).to receive(:pwd).and_return(bundled_app)
     end
 
     it "provides a list of the env dependencies" do
-      expect(Bundler.load.dependencies).to have_dep("rack", ">= 0")
+      expect(Bundler.load.dependencies).to have_dep("myrack", ">= 0")
     end
 
     it "provides a list of the resolved gems" do
-      expect(Bundler.load.gems).to have_gem("rack-1.0.0", "bundler-#{Bundler::VERSION}")
+      expect(Bundler.load.gems).to have_gem("myrack-1.0.0", "bundler-#{Bundler::VERSION}")
     end
   end
 
@@ -76,16 +76,16 @@
   describe "when called twice" do
     it "doesn't try to load the runtime twice" do
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
-        gem "rack"
+        source "https://gem.repo1"
+        gem "myrack"
         gem "activesupport", :group => :test
       G
 
       ruby <<-RUBY
-        require "#{entrypoint}"
+        require "bundler"
         Bundler.setup :default
         Bundler.require :default
-        puts RACK
+        puts MYRACK
         begin
           require "activesupport"
         rescue LoadError
@@ -100,7 +100,7 @@
   describe "not hurting brittle rubygems" do
     it "does not inject #source into the generated YAML of the gem specs" do
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
+        source "https://gem.repo1"
         gem "activerecord"
       G
       allow(Bundler::SharedHelpers).to receive(:find_gemfile).and_return(bundled_app_gemfile)
diff --git a/spec/bundler/runtime/platform_spec.rb b/spec/bundler/runtime/platform_spec.rb
index b31bc4abe8a5b3..cf1f85286f4239 100644
--- a/spec/bundler/runtime/platform_spec.rb
+++ b/spec/bundler/runtime/platform_spec.rb
@@ -3,26 +3,26 @@
 RSpec.describe "Bundler.setup with multi platform stuff" do
   it "raises a friendly error when gems are missing locally" do
     gemfile <<-G
-      source "#{file_uri_for(gem_repo1)}"
-      gem "rack"
+      source "https://gem.repo1"
+      gem "myrack"
     G
 
     lockfile <<-G
       GEM
-        remote: #{file_uri_for(gem_repo1)}/
+        remote: https://gem.repo1/
         specs:
-          rack (1.0)
+          myrack (1.0)
 
       PLATFORMS
         #{local_tag}
 
       DEPENDENCIES
-        rack
+        myrack
     G
 
     ruby <<-R
       begin
-        require '#{entrypoint}'
+        require 'bundler'
         Bundler.ui.silence { Bundler.setup }
       rescue Bundler::GemNotFound => e
         puts "WIN"
@@ -35,7 +35,7 @@
   it "will resolve correctly on the current platform when the lockfile was targeted for a different one" do
     lockfile <<-G
       GEM
-        remote: #{file_uri_for(gem_repo1)}/
+        remote: https://gem.repo1/
         specs:
           nokogiri (1.4.2-java)
             weakling (= 0.0.3)
@@ -48,55 +48,63 @@
         nokogiri
     G
 
-    simulate_platform "x86-darwin-10"
-    install_gemfile <<-G
-      source "#{file_uri_for(gem_repo1)}"
-      gem "nokogiri"
-    G
+    simulate_platform "x86-darwin-10" do
+      install_gemfile <<-G
+        source "https://gem.repo1"
+        gem "nokogiri"
+      G
 
-    expect(the_bundle).to include_gems "nokogiri 1.4.2"
+      expect(the_bundle).to include_gems "nokogiri 1.4.2"
+    end
   end
 
   it "will keep both platforms when both ruby and a specific ruby platform are locked and the bundle is unlocked" do
     build_repo4 do
       build_gem "nokogiri", "1.11.1" do |s|
         s.add_dependency "mini_portile2", "~> 2.5.0"
-        s.add_dependency "racc", "~> 1.5.2"
+        s.add_dependency "racca", "~> 1.5.2"
       end
 
       build_gem "nokogiri", "1.11.1" do |s|
         s.platform = Bundler.local_platform
-        s.add_dependency "racc", "~> 1.4"
+        s.add_dependency "racca", "~> 1.4"
       end
 
       build_gem "mini_portile2", "2.5.0"
-      build_gem "racc", "1.5.2"
+      build_gem "racca", "1.5.2"
+    end
+
+    checksums = checksums_section do |c|
+      c.checksum gem_repo4, "mini_portile2", "2.5.0"
+      c.checksum gem_repo4, "nokogiri", "1.11.1"
+      c.checksum gem_repo4, "nokogiri", "1.11.1", Bundler.local_platform
+      c.checksum gem_repo4, "racca", "1.5.2"
     end
 
     good_lockfile = <<~L
       GEM
-        remote: #{file_uri_for(gem_repo4)}/
+        remote: https://gem.repo4/
         specs:
           mini_portile2 (2.5.0)
           nokogiri (1.11.1)
             mini_portile2 (~> 2.5.0)
-            racc (~> 1.5.2)
+            racca (~> 1.5.2)
           nokogiri (1.11.1-#{Bundler.local_platform})
-            racc (~> 1.4)
-          racc (1.5.2)
+            racca (~> 1.4)
+          racca (1.5.2)
 
       PLATFORMS
         #{lockfile_platforms("ruby")}
 
       DEPENDENCIES
         nokogiri (~> 1.11)
-
+      #{checksums}
       BUNDLED WITH
          #{Bundler::VERSION}
     L
 
     gemfile <<-G
-      source "#{file_uri_for(gem_repo4)}"
+      source "https://gem.repo4"
       gem "nokogiri", "~> 1.11"
     G
 
@@ -118,13 +126,13 @@
     end
 
     gemfile <<-G
-      source "https://gems.repo4"
+      source "https://gem.repo4"
       gem "nokogiri"
     G
 
     lockfile <<~L
       GEM
-        remote: https://gems.repo4/
+        remote: https://gem.repo4/
         specs:
           nokogiri (1.11.1)
 
@@ -138,7 +146,7 @@
          #{Bundler::VERSION}
     L
 
-    bundle "install", :artifice => "compact_index", :env => { "BUNDLER_SPEC_GEM_REPO" => gem_repo4.to_s }
+    bundle "install"
 
     expect(out).to include("Fetching nokogiri 1.11.1")
     expect(the_bundle).to include_gems "nokogiri 1.11.1"
@@ -147,13 +155,13 @@
 
   it "will use the java platform if both generic java and generic ruby platforms are locked", :jruby_only do
     gemfile <<-G
-      source "#{file_uri_for(gem_repo1)}"
+      source "https://gem.repo1"
       gem "nokogiri"
     G
 
     lockfile <<-G
       GEM
-        remote: #{file_uri_for(gem_repo1)}/
+        remote: https://gem.repo1/
         specs:
           nokogiri (1.4.2)
           nokogiri (1.4.2-java)
@@ -174,13 +182,13 @@
     bundle "install"
 
     expect(out).to include("Fetching nokogiri 1.4.2 (java)")
-    expect(the_bundle).to include_gems "nokogiri 1.4.2 JAVA"
+    expect(the_bundle).to include_gems "nokogiri 1.4.2 java"
   end
 
   it "will add the resolve for the current platform" do
     lockfile <<-G
       GEM
-        remote: #{file_uri_for(gem_repo1)}/
+        remote: https://gem.repo1/
         specs:
           nokogiri (1.4.2-java)
             weakling (= 0.0.3)
@@ -193,20 +201,20 @@
         nokogiri
     G
 
-    simulate_platform "x86-darwin-100"
-
-    install_gemfile <<-G
-      source "#{file_uri_for(gem_repo1)}"
-      gem "nokogiri"
-      gem "platform_specific"
-    G
+    simulate_platform "x86-darwin-100" do
+      install_gemfile <<-G
+        source "https://gem.repo1"
+        gem "nokogiri"
+        gem "platform_specific"
+      G
 
-    expect(the_bundle).to include_gems "nokogiri 1.4.2", "platform_specific 1.0 x86-darwin-100"
+      expect(the_bundle).to include_gems "nokogiri 1.4.2", "platform_specific 1.0 x86-darwin-100"
+    end
   end
 
   it "allows specifying only-ruby-platform on jruby", :jruby_only do
     install_gemfile <<-G
-      source "#{file_uri_for(gem_repo1)}"
+      source "https://gem.repo1"
       gem "nokogiri"
       gem "platform_specific"
     G
@@ -215,12 +223,12 @@
 
     bundle "install"
 
-    expect(the_bundle).to include_gems "nokogiri 1.4.2", "platform_specific 1.0 RUBY"
+    expect(the_bundle).to include_gems "nokogiri 1.4.2", "platform_specific 1.0 ruby"
   end
 
   it "allows specifying only-ruby-platform" do
     gemfile <<-G
-      source "#{file_uri_for(gem_repo1)}"
+      source "https://gem.repo1"
       gem "nokogiri"
       gem "platform_specific"
     G
@@ -229,12 +237,12 @@
 
     bundle "install"
 
-    expect(the_bundle).to include_gems "nokogiri 1.4.2", "platform_specific 1.0 RUBY"
+    expect(the_bundle).to include_gems "nokogiri 1.4.2", "platform_specific 1.0 ruby"
   end
 
   it "allows specifying only-ruby-platform even if the lockfile is locked to a specific compatible platform" do
     install_gemfile <<-G
-      source "#{file_uri_for(gem_repo1)}"
+      source "https://gem.repo1"
       gem "nokogiri"
       gem "platform_specific"
     G
@@ -243,27 +251,27 @@
 
     bundle "install"
 
-    expect(the_bundle).to include_gems "nokogiri 1.4.2", "platform_specific 1.0 RUBY"
+    expect(the_bundle).to include_gems "nokogiri 1.4.2", "platform_specific 1.0 ruby"
   end
 
   it "doesn't pull platform specific gems on truffleruby", :truffleruby_only do
     install_gemfile <<-G
-     source "#{file_uri_for(gem_repo1)}"
+     source "https://gem.repo1"
      gem "platform_specific"
     G
 
-    expect(the_bundle).to include_gems "platform_specific 1.0 RUBY"
+    expect(the_bundle).to include_gems "platform_specific 1.0 ruby"
   end
 
-  it "doesn't pull platform specific gems on truffleruby (except when whitelisted) even if lockfile was generated with an older version that declared RUBY as platform", :truffleruby_only do
+  it "doesn't pull platform specific gems on truffleruby (except when whitelisted) even if lockfile was generated with an older version that declared ruby as platform", :truffleruby_only do
     gemfile <<-G
-      source "#{file_uri_for(gem_repo1)}"
+      source "https://gem.repo1"
       gem "platform_specific"
     G
 
     lockfile <<-L
       GEM
-        remote: #{file_uri_for(gem_repo1)}/
+        remote: https://gem.repo1/
         specs:
           platform_specific (1.0)
 
@@ -279,7 +287,7 @@
 
     bundle "install"
 
-    expect(the_bundle).to include_gems "platform_specific 1.0 RUBY"
+    expect(the_bundle).to include_gems "platform_specific 1.0 ruby"
 
     simulate_platform "x86_64-linux" do
       build_repo4 do
@@ -291,13 +299,13 @@
       end
 
       gemfile <<-G
-        source "#{file_uri_for(gem_repo4)}"
+        source "https://gem.repo4"
         gem "libv8"
       G
 
       lockfile <<-L
         GEM
-          remote: #{file_uri_for(gem_repo4)}/
+          remote: https://gem.repo4/
           specs:
             libv8 (1.0)
 
@@ -319,13 +327,13 @@
 
   it "doesn't pull platform specific gems on truffleruby, even if lockfile only includes those", :truffleruby_only do
     gemfile <<-G
-      source "#{file_uri_for(gem_repo1)}"
+      source "https://gem.repo1"
       gem "platform_specific"
     G
 
     lockfile <<-L
       GEM
-        remote: #{file_uri_for(gem_repo1)}/
+        remote: https://gem.repo1/
         specs:
           platform_specific (1.0-x86-darwin-100)
 
@@ -341,7 +349,7 @@
 
     bundle "install"
 
-    expect(the_bundle).to include_gems "platform_specific 1.0 RUBY"
+    expect(the_bundle).to include_gems "platform_specific 1.0 ruby"
   end
 
   it "pulls platform specific gems correctly on musl" do
@@ -352,8 +360,8 @@
     end
 
     simulate_platform "aarch64-linux-musl" do
-      install_gemfile <<-G, :artifice => "compact_index", :env => { "BUNDLER_SPEC_GEM_REPO" => gem_repo4.to_s }, :verbose => true
-        source "https://gems.repo4"
+      install_gemfile <<-G, verbose: true
+        source "https://gem.repo4"
         gem "nokogiri"
       G
     end
@@ -362,10 +370,10 @@
   end
 
   it "allows specifying only-ruby-platform on windows with dependency platforms" do
-    simulate_windows do
+    simulate_platform "x86-mswin32" do
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
-        gem "nokogiri", :platforms => [:windows, :mswin, :mswin64, :mingw, :x64_mingw, :jruby]
+        source "https://gem.repo1"
+        gem "nokogiri", :platforms => [:windows, :jruby]
         gem "platform_specific"
       G
 
@@ -373,27 +381,27 @@
 
       bundle "install"
 
-      expect(the_bundle).to include_gems "platform_specific 1.0 RUBY"
+      expect(the_bundle).to include_gems "platform_specific 1.0 ruby"
       expect(the_bundle).to not_include_gems "nokogiri"
     end
   end
 
   it "allows specifying only-ruby-platform on windows with gemspec dependency" do
-    build_lib("foo", "1.0", :path => bundled_app) do |s|
-      s.add_dependency "rack"
+    build_lib("foo", "1.0", path: bundled_app) do |s|
+      s.add_dependency "myrack"
     end
 
     gemfile <<-G
-      source "#{file_uri_for(gem_repo1)}"
+      source "https://gem.repo1"
       gemspec
     G
     bundle :lock
 
-    simulate_windows do
+    simulate_platform "x86-mswin32" do
       bundle "config set force_ruby_platform true"
       bundle "install"
 
-      expect(the_bundle).to include_gems "rack 1.0"
+      expect(the_bundle).to include_gems "myrack 1.0"
     end
   end
 
@@ -403,41 +411,39 @@
         s.add_dependency "platform_specific"
       end
     end
-    simulate_windows x64_mingw32 do
+    simulate_platform "x64-mingw-ucrt" do
       lockfile <<-L
         GEM
-          remote: #{file_uri_for(gem_repo2)}/
+          remote: https://gem.repo2/
           specs:
             platform_specific (1.0-x86-mingw32)
             requires_platform_specific (1.0)
               platform_specific
 
         PLATFORMS
-          x64-mingw32
+          x64-mingw-ucrt
           x86-mingw32
 
         DEPENDENCIES
           requires_platform_specific
       L
 
-      install_gemfile <<-G, :verbose => true
-        source "#{file_uri_for(gem_repo2)}"
+      install_gemfile <<-G, verbose: true
+        source "https://gem.repo2"
         gem "requires_platform_specific"
       G
 
       expect(out).to include("lockfile does not have all gems needed for the current platform")
-      expect(the_bundle).to include_gem "platform_specific 1.0 x64-mingw32"
+      expect(the_bundle).to include_gem "platform_specific 1.0 x64-mingw-ucrt"
     end
   end
 
-  %w[x86-mswin32 x64-mswin64 x86-mingw32 x64-mingw32 x64-mingw-ucrt].each do |arch|
-    it "allows specifying platform windows on #{arch} arch" do
-      platform = send(arch.tr("-", "_"))
-
-      simulate_windows platform do
+  %w[x86-mswin32 x64-mswin64 x86-mingw32 x64-mingw-ucrt aarch64-mingw-ucrt].each do |platform|
+    it "allows specifying platform windows on #{platform} platform" do
+      simulate_platform platform do
         lockfile <<-L
           GEM
-            remote: #{file_uri_for(gem_repo1)}/
+            remote: https://gem.repo1/
             specs:
               platform_specific (1.0-#{platform})
               requires_platform_specific (1.0)
@@ -451,12 +457,10 @@
         L
 
         install_gemfile <<-G
-          source "#{file_uri_for(gem_repo1)}"
+          source "https://gem.repo1"
           gem "platform_specific", :platforms => [:windows]
         G
 
-        bundle "install"
-
         expect(the_bundle).to include_gems "platform_specific 1.0 #{platform}"
       end
     end
diff --git a/spec/bundler/runtime/require_spec.rb b/spec/bundler/runtime/require_spec.rb
index e59fa564f60fe3..46613286d23fe4 100644
--- a/spec/bundler/runtime/require_spec.rb
+++ b/spec/bundler/runtime/require_spec.rb
@@ -21,7 +21,7 @@
       s.write "lib/four.rb", "puts 'four'"
     end
 
-    build_lib "five", "1.0.0", :no_default => true do |s|
+    build_lib "five", "1.0.0", no_default: true do |s|
       s.write "lib/mofive.rb", "puts 'five'"
     end
 
@@ -46,7 +46,7 @@
     end
 
     gemfile <<-G
-      source "#{file_uri_for(gem_repo1)}"
+      source "https://gem.repo1"
       path "#{lib_path}" do
         gem "one", :group => :bar, :require => %w[baz qux]
         gem "two"
@@ -113,17 +113,15 @@
 
   it "raises an exception if a require is specified but the file does not exist" do
     gemfile <<-G
-      source "#{file_uri_for(gem_repo1)}"
+      source "https://gem.repo1"
       path "#{lib_path}" do
         gem "two", :require => 'fail'
       end
     G
 
-    load_error_run <<-R, "fail"
-      Bundler.require
-    R
+    run "Bundler.require", raise_on_error: false
 
-    expect(err_without_deprecations).to eq("ZOMG LOAD ERROR")
+    expect(err_without_deprecations).to include("cannot load such file -- fail")
   end
 
   it "displays a helpful message if the required gem throws an error" do
@@ -132,13 +130,13 @@
     end
 
     gemfile <<-G
-      source "#{file_uri_for(gem_repo1)}"
+      source "https://gem.repo1"
       path "#{lib_path}" do
         gem "faulty"
       end
     G
 
-    run "Bundler.require", :raise_on_error => false
+    run "Bundler.require", raise_on_error: false
     expect(err).to match("error while trying to load the gem 'faulty'")
     expect(err).to match("Gem Internal Error Message")
   end
@@ -149,22 +147,15 @@
     end
 
     gemfile <<-G
-      source "#{file_uri_for(gem_repo1)}"
+      source "https://gem.repo1"
       path "#{lib_path}" do
         gem "loadfuuu"
       end
     G
 
-    cmd = <<-RUBY
-      begin
-        Bundler.require
-      rescue LoadError => e
-        warn "ZOMG LOAD ERROR: \#{e.message}"
-      end
-    RUBY
-    run(cmd)
+    run "Bundler.require", raise_on_error: false
 
-    expect(err_without_deprecations).to eq("ZOMG LOAD ERROR: cannot load such file -- load-bar")
+    expect(err_without_deprecations).to include("cannot load such file -- load-bar")
   end
 
   describe "with namespaced gems" do
@@ -176,7 +167,7 @@
 
     it "requires gem names that are namespaced" do
       gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
+        source "https://gem.repo1"
         path '#{lib_path}' do
           gem 'jquery-rails'
         end
@@ -187,11 +178,11 @@
     end
 
     it "silently passes if the require fails" do
-      build_lib "bcrypt-ruby", "1.0.0", :no_default => true do |s|
+      build_lib "bcrypt-ruby", "1.0.0", no_default: true do |s|
         s.write "lib/brcrypt.rb", "BCrypt = '1.0.0'"
       end
       gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
+        source "https://gem.repo1"
 
         path "#{lib_path}" do
           gem "bcrypt-ruby"
@@ -199,7 +190,7 @@
       G
 
       cmd = <<-RUBY
-        require '#{entrypoint}'
+        require 'bundler'
         Bundler.require
       RUBY
       ruby(cmd)
@@ -209,16 +200,15 @@
 
     it "does not mangle explicitly given requires" do
       gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
+        source "https://gem.repo1"
         path "#{lib_path}" do
           gem 'jquery-rails', :require => 'jquery-rails'
         end
       G
 
-      load_error_run <<-R, "jquery-rails"
-        Bundler.require
-      R
-      expect(err_without_deprecations).to eq("ZOMG LOAD ERROR")
+      run "Bundler.require", raise_on_error: false
+
+      expect(err_without_deprecations).to include("cannot load such file -- jquery-rails")
     end
 
     it "handles the case where regex fails" do
@@ -227,22 +217,15 @@
       end
 
       gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
+        source "https://gem.repo1"
         path "#{lib_path}" do
           gem "load-fuuu"
         end
       G
 
-      cmd = <<-RUBY
-        begin
-          Bundler.require
-        rescue LoadError => e
-          warn "ZOMG LOAD ERROR" if e.message.include?("Could not open library 'libfuuu-1.0'")
-        end
-      RUBY
-      run(cmd)
+      run "Bundler.require", raise_on_error: false
 
-      expect(err_without_deprecations).to eq("ZOMG LOAD ERROR")
+      expect(err_without_deprecations).to include("libfuuu-1.0").and include("cannot open shared object file")
     end
 
     it "doesn't swallow the error when the library has an unrelated error" do
@@ -251,22 +234,15 @@
       end
 
       gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
+        source "https://gem.repo1"
         path "#{lib_path}" do
           gem "load-fuuu"
         end
       G
 
-      cmd = <<-RUBY
-        begin
-          Bundler.require
-        rescue LoadError => e
-          warn "ZOMG LOAD ERROR: \#{e.message}"
-        end
-      RUBY
-      run(cmd)
+      run "Bundler.require", raise_on_error: false
 
-      expect(err_without_deprecations).to eq("ZOMG LOAD ERROR: cannot load such file -- load-bar")
+      expect(err_without_deprecations).to include("cannot load such file -- load-bar")
     end
   end
 
@@ -310,7 +286,7 @@ def self.two
 
     it "works when the gems are in the Gemfile in the correct order" do
       gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
+        source "https://gem.repo1"
         path "#{lib_path}" do
           gem "two"
           gem "one"
@@ -323,13 +299,13 @@ def self.two
 
     describe "a gem with different requires for different envs" do
       before(:each) do
-        build_gem "multi_gem", :to_bundle => true do |s|
+        build_gem "multi_gem", to_bundle: true do |s|
           s.write "lib/one.rb", "puts 'ONE'"
           s.write "lib/two.rb", "puts 'TWO'"
         end
 
         install_gemfile <<-G
-          source "#{file_uri_for(gem_repo1)}"
+          source "https://gem.repo1"
           gem "multi_gem", :require => "one", :group => :one
           gem "multi_gem", :require => "two", :group => :two
         G
@@ -353,7 +329,7 @@ def self.two
 
     it "fails when the gems are in the Gemfile in the wrong order" do
       gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
+        source "https://gem.repo1"
         path "#{lib_path}" do
           gem "one"
           gem "two"
@@ -366,31 +342,30 @@ def self.two
 
     describe "with busted gems" do
       it "should be busted" do
-        build_gem "busted_require", :to_bundle => true do |s|
+        build_gem "busted_require", to_bundle: true do |s|
           s.write "lib/busted_require.rb", "require 'no_such_file_omg'"
         end
 
         install_gemfile <<-G
-          source "#{file_uri_for(gem_repo1)}"
+          source "https://gem.repo1"
           gem "busted_require"
         G
 
-        load_error_run <<-R, "no_such_file_omg"
-          Bundler.require
-        R
-        expect(err_without_deprecations).to eq("ZOMG LOAD ERROR")
+        run "Bundler.require", raise_on_error: false
+
+        expect(err_without_deprecations).to include("cannot load such file -- no_such_file_omg")
       end
     end
   end
 
   it "does not load rubygems gemspecs that are used" do
     install_gemfile <<-G
-      source "#{file_uri_for(gem_repo1)}"
-      gem "rack"
+      source "https://gem.repo1"
+      gem "myrack"
     G
 
     run <<-R
-      path = File.join(Gem.dir, "specifications", "rack-1.0.0.gemspec")
+      path = File.join(Gem.dir, "specifications", "myrack-1.0.0.gemspec")
       contents = File.read(path)
       contents = contents.lines.to_a.insert(-2, "\n  raise 'broken gemspec'\n").join
       File.open(path, "w") do |f|
@@ -410,7 +385,7 @@ def self.two
     build_git "foo"
 
     install_gemfile <<-G
-      source "#{file_uri_for(gem_repo1)}"
+      source "https://gem.repo1"
       gem "foo", :git => "#{lib_path("foo-1.0")}"
     G
 
@@ -430,18 +405,58 @@ def self.two
 
     expect(out).to eq("WIN")
   end
+
+  it "does not load plugins" do
+    install_gemfile <<-G
+      source "https://gem.repo1"
+      gem "myrack"
+    G
+
+    create_file "plugins/rubygems_plugin.rb", "puts 'FAIL'"
+
+    run <<~R, env: { "RUBYLIB" => rubylib.unshift(bundled_app("plugins").to_s).join(File::PATH_SEPARATOR) }
+      Bundler.require
+      puts "WIN"
+    R
+
+    expect(out).to eq("WIN")
+  end
+
+  it "does not extract gemspecs from application cache packages" do
+    gemfile <<-G
+      source "https://gem.repo1"
+      gem "myrack"
+    G
+
+    bundle :cache
+
+    path = cached_gem("myrack-1.0.0")
+
+    run <<-R
+      File.open("#{path}", "w") do |f|
+        f.write "broken package"
+      end
+    R
+
+    run <<-R
+      Bundler.require
+      puts "WIN"
+    R
+
+    expect(out).to eq("WIN")
+  end
 end
 
 RSpec.describe "Bundler.require with platform specific dependencies" do
   it "does not require the gems that are pinned to other platforms" do
     install_gemfile <<-G
-      source "#{file_uri_for(gem_repo1)}"
+      source "https://gem.repo1"
 
       platforms :#{not_local_tag} do
         gem "platform_specific", :require => "omgomg"
       end
 
-      gem "rack", "1.0.0"
+      gem "myrack", "1.0.0"
     G
 
     run "Bundler.require"
@@ -450,14 +465,14 @@ def self.two
 
   it "requires gems pinned to multiple platforms, including the current one" do
     install_gemfile <<-G
-      source "#{file_uri_for(gem_repo1)}"
+      source "https://gem.repo1"
 
       platforms :#{not_local_tag}, :#{local_tag} do
-        gem "rack", :require => "rack"
+        gem "myrack", :require => "myrack"
       end
     G
 
-    run "Bundler.require; puts RACK"
+    run "Bundler.require; puts MYRACK"
 
     expect(out).to eq("1.0.0")
     expect(err).to be_empty
diff --git a/spec/bundler/runtime/requiring_spec.rb b/spec/bundler/runtime/requiring_spec.rb
new file mode 100644
index 00000000000000..f0e0aeacafd846
--- /dev/null
+++ b/spec/bundler/runtime/requiring_spec.rb
@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+RSpec.describe "Requiring bundler" do
+  it "takes care of requiring rubygems when entrypoint is bundler/setup" do
+    sys_exec("#{Gem.ruby} -I#{lib_dir} -rbundler/setup -e'puts true'", env: { "RUBYOPT" => "--disable=gems" })
+
+    expect(stdboth).to eq("true")
+  end
+
+  it "takes care of requiring rubygems when requiring just bundler" do
+    sys_exec("#{Gem.ruby} -I#{lib_dir} -rbundler -e'puts true'", env: { "RUBYOPT" => "--disable=gems" })
+
+    expect(stdboth).to eq("true")
+  end
+end
diff --git a/spec/bundler/runtime/self_management_spec.rb b/spec/bundler/runtime/self_management_spec.rb
index 3e49db4f32c3f7..2cb2d0175ff7a1 100644
--- a/spec/bundler/runtime/self_management_spec.rb
+++ b/spec/bundler/runtime/self_management_spec.rb
@@ -1,52 +1,75 @@
 # frozen_string_literal: true
 
-RSpec.describe "Self management", :rubygems => ">= 3.3.0.dev", :realworld => true do
+RSpec.describe "Self management" do
   describe "auto switching" do
     let(:previous_minor) do
-      "2.3.0"
+      "9.3.0"
     end
 
     let(:current_version) do
-      "2.4.0"
+      "9.4.0"
     end
 
     before do
-      build_repo2
+      build_repo4 do
+        build_bundler previous_minor
+
+        build_bundler current_version
+
+        build_gem "myrack", "1.0.0"
+      end
 
       gemfile <<-G
-        source "#{file_uri_for(gem_repo2)}"
+        source "https://gem.repo4"
 
-        gem "rack"
+        gem "myrack"
       G
+
+      pristine_system_gems "bundler-#{current_version}"
     end
 
     it "installs locked version when using system path and uses it" do
       lockfile_bundled_with(previous_minor)
 
       bundle "config set --local path.system true"
-      bundle "install", :artifice => "vcr"
-      expect(out).to include("Bundler #{Bundler::VERSION} is running, but your lockfile was generated with #{previous_minor}. Installing Bundler #{previous_minor} and restarting using that version.")
+      bundle "install"
+      expect(out).to include("Bundler #{current_version} is running, but your lockfile was generated with #{previous_minor}. Installing Bundler #{previous_minor} and restarting using that version.")
 
       # It uninstalls the older system bundler
-      bundle "clean --force"
-      expect(out).to eq("Removing bundler (#{Bundler::VERSION})")
+      bundle "clean --force", artifice: nil
+      expect(out).to eq("Removing bundler (#{current_version})")
 
       # App now uses locked version
-      bundle "-v"
-      expect(out).to end_with(previous_minor[0] == "2" ? "Bundler version #{previous_minor}" : previous_minor)
+      bundle "-v", artifice: nil
+      expect(out).to eq(previous_minor)
+
+      # ruby-core test setup has always "lib" in $LOAD_PATH so `require "bundler/setup"` always activate the local version rather than using RubyGems gem activation stuff
+      unless ruby_core?
+        # App now uses locked version, even when not using the CLI directly
+        file = bundled_app("bin/bundle_version.rb")
+        create_file file, <<-RUBY
+          #!#{Gem.ruby}
+          require 'bundler/setup'
+          puts '#{previous_minor}'
+        RUBY
+        file.chmod(0o777)
+        cmd = Gem.win_platform? ? "#{Gem.ruby} bin/bundle_version.rb" : "bin/bundle_version.rb"
+        sys_exec cmd, artifice: nil
+        expect(out).to eq(previous_minor)
+      end
 
       # Subsequent installs use the locked version without reinstalling
-      bundle "install --verbose"
+      bundle "install --verbose", artifice: nil
       expect(out).to include("Using bundler #{previous_minor}")
-      expect(out).not_to include("Bundler #{Bundler::VERSION} is running, but your lockfile was generated with #{previous_minor}. Installing Bundler #{previous_minor} and restarting using that version.")
+      expect(out).not_to include("Bundler #{current_version} is running, but your lockfile was generated with #{previous_minor}. Installing Bundler #{previous_minor} and restarting using that version.")
     end
 
     it "installs locked version when using local path and uses it" do
       lockfile_bundled_with(previous_minor)
 
       bundle "config set --local path vendor/bundle"
-      bundle "install", :artifice => "vcr"
-      expect(out).to include("Bundler #{Bundler::VERSION} is running, but your lockfile was generated with #{previous_minor}. Installing Bundler #{previous_minor} and restarting using that version.")
+      bundle "install"
+      expect(out).to include("Bundler #{current_version} is running, but your lockfile was generated with #{previous_minor}. Installing Bundler #{previous_minor} and restarting using that version.")
       expect(vendored_gems("gems/bundler-#{previous_minor}")).to exist
 
       # It does not uninstall the locked bundler
@@ -55,20 +78,39 @@
 
       # App now uses locked version
       bundle "-v"
-      expect(out).to end_with(previous_minor[0] == "2" ? "Bundler version #{previous_minor}" : previous_minor)
+      expect(out).to eq(previous_minor)
+
+      # Preserves original gem home when auto-switching
+      bundle "exec ruby -e 'puts Bundler.original_env[\"GEM_HOME\"]'"
+      expect(out).to eq(ENV["GEM_HOME"])
+
+      # ruby-core test setup has always "lib" in $LOAD_PATH so `require "bundler/setup"` always activate the local version rather than using RubyGems gem activation stuff
+      unless ruby_core?
+        # App now uses locked version, even when not using the CLI directly
+        file = bundled_app("bin/bundle_version.rb")
+        create_file file, <<-RUBY
+          #!#{Gem.ruby}
+          require 'bundler/setup'
+          puts '#{previous_minor}'
+        RUBY
+        file.chmod(0o777)
+        cmd = Gem.win_platform? ? "#{Gem.ruby} bin/bundle_version.rb" : "bin/bundle_version.rb"
+        sys_exec cmd, artifice: nil
+        expect(out).to eq(previous_minor)
+      end
 
       # Subsequent installs use the locked version without reinstalling
       bundle "install --verbose"
       expect(out).to include("Using bundler #{previous_minor}")
-      expect(out).not_to include("Bundler #{Bundler::VERSION} is running, but your lockfile was generated with #{previous_minor}. Installing Bundler #{previous_minor} and restarting using that version.")
+      expect(out).not_to include("Bundler #{current_version} is running, but your lockfile was generated with #{previous_minor}. Installing Bundler #{previous_minor} and restarting using that version.")
     end
 
     it "installs locked version when using deployment option and uses it" do
       lockfile_bundled_with(previous_minor)
 
       bundle "config set --local deployment true"
-      bundle "install", :artifice => "vcr"
-      expect(out).to include("Bundler #{Bundler::VERSION} is running, but your lockfile was generated with #{previous_minor}. Installing Bundler #{previous_minor} and restarting using that version.")
+      bundle "install"
+      expect(out).to include("Bundler #{current_version} is running, but your lockfile was generated with #{previous_minor}. Installing Bundler #{previous_minor} and restarting using that version.")
       expect(vendored_gems("gems/bundler-#{previous_minor}")).to exist
 
       # It does not uninstall the locked bundler
@@ -77,12 +119,12 @@
 
       # App now uses locked version
       bundle "-v"
-      expect(out).to end_with(previous_minor[0] == "2" ? "Bundler version #{previous_minor}" : previous_minor)
+      expect(out).to eq(previous_minor)
 
       # Subsequent installs use the locked version without reinstalling
       bundle "install --verbose"
       expect(out).to include("Using bundler #{previous_minor}")
-      expect(out).not_to include("Bundler #{Bundler::VERSION} is running, but your lockfile was generated with #{previous_minor}. Installing Bundler #{previous_minor} and restarting using that version.")
+      expect(out).not_to include("Bundler #{current_version} is running, but your lockfile was generated with #{previous_minor}. Installing Bundler #{previous_minor} and restarting using that version.")
     end
 
     it "does not try to install a development version" do
@@ -92,48 +134,108 @@
       expect(out).not_to match(/restarting using that version/)
 
       bundle "-v"
-      expect(out).to eq(Bundler::VERSION[0] == "2" ? "Bundler version #{Bundler::VERSION}" : Bundler::VERSION)
+      expect(out).to eq(current_version)
+    end
+
+    it "does not try to install when --local is passed" do
+      lockfile_bundled_with(previous_minor)
+      system_gems "myrack-1.0.0", path: local_gem_path
+
+      bundle "install --local"
+      expect(out).not_to match(/Installing Bundler/)
+
+      bundle "-v"
+      expect(out).to eq(current_version)
     end
 
     it "shows a discrete message if locked bundler does not exist" do
-      missing_minor = "#{Bundler::VERSION[0]}.999.999"
+      missing_minor = "#{current_version[0]}.999.999"
 
       lockfile_bundled_with(missing_minor)
 
-      bundle "install", :artifice => "vcr"
-      expect(err).to eq("Your lockfile is locked to a version of bundler (#{missing_minor}) that doesn't exist at https://rubygems.org/. Going on using #{Bundler::VERSION}")
+      bundle "install"
+      expect(err).to eq("Your lockfile is locked to a version of bundler (#{missing_minor}) that doesn't exist at https://rubygems.org/. Going on using #{current_version}")
 
       bundle "-v"
-      expect(out).to eq(Bundler::VERSION[0] == "2" ? "Bundler version #{Bundler::VERSION}" : Bundler::VERSION)
+      expect(out).to eq(current_version)
     end
 
     it "installs BUNDLE_VERSION version when using bundle config version x.y.z" do
       lockfile_bundled_with(current_version)
 
       bundle "config set --local version #{previous_minor}"
-      bundle "install", :artifice => "vcr"
-      expect(out).to include("Bundler #{Bundler::VERSION} is running, but your configuration was #{previous_minor}. Installing Bundler #{previous_minor} and restarting using that version.")
+      bundle "install"
+      expect(out).to include("Bundler #{current_version} is running, but your configuration was #{previous_minor}. Installing Bundler #{previous_minor} and restarting using that version.")
 
       bundle "-v"
-      expect(out).to eq(previous_minor[0] == "2" ? "Bundler version #{previous_minor}" : previous_minor)
+      expect(out).to eq(previous_minor)
     end
 
     it "does not try to install when using bundle config version global" do
       lockfile_bundled_with(previous_minor)
 
       bundle "config set version system"
-      bundle "install", :artifice => "vcr"
+      bundle "install"
       expect(out).not_to match(/restarting using that version/)
 
       bundle "-v"
-      expect(out).to eq(Bundler::VERSION[0] == "2" ? "Bundler version #{Bundler::VERSION}" : Bundler::VERSION)
+      expect(out).to eq(current_version)
+    end
+
+    it "does not try to install when using bundle config version <dev-version>" do
+      lockfile_bundled_with(previous_minor)
+
+      bundle "config set version #{previous_minor}.dev"
+      bundle "install"
+      expect(out).not_to match(/restarting using that version/)
+
+      bundle "-v"
+      expect(out).to eq(current_version)
     end
 
     it "ignores malformed lockfile version" do
       lockfile_bundled_with("2.3.")
 
       bundle "install --verbose"
-      expect(out).to include("Using bundler #{Bundler::VERSION}")
+      expect(out).to include("Using bundler #{current_version}")
+    end
+
+    it "uses the right original script when re-execing, if `$0` has been changed to something that's not a script", :ruby_repo do
+      system_gems "bundler-9.9.9", path: local_gem_path
+
+      test = bundled_app("test.rb")
+
+      create_file test, <<~RUBY
+        $0 = "this is the program name"
+        require "bundler/setup"
+      RUBY
+
+      lockfile_bundled_with("9.9.9")
+
+      sys_exec "#{Gem.ruby} #{test}", artifice: nil, raise_on_error: false
+      expect(err).to include("Could not find myrack-1.0.0")
+      expect(err).not_to include("this is the program name")
+    end
+
+    it "uses modified $0 when re-execing, if `$0` has been changed to a script", :ruby_repo do
+      system_gems "bundler-9.9.9", path: local_gem_path
+
+      runner = bundled_app("runner.rb")
+
+      create_file runner, <<~RUBY
+        $0 = ARGV.shift
+        load $0
+      RUBY
+
+      script = bundled_app("script.rb")
+      create_file script, <<~RUBY
+        require "bundler/setup"
+      RUBY
+
+      lockfile_bundled_with("9.9.9")
+
+      sys_exec "#{Gem.ruby} #{runner} #{script}", artifice: nil, raise_on_error: false
+      expect(err).to include("Could not find myrack-1.0.0")
     end
 
     private
@@ -141,15 +243,15 @@
     def lockfile_bundled_with(version)
       lockfile <<~L
         GEM
-          remote: #{file_uri_for(gem_repo2)}/
+          remote: https://gem.repo4/
           specs:
-            rack (1.0.0)
+            myrack (1.0.0)
 
         PLATFORMS
           #{lockfile_platforms}
 
         DEPENDENCIES
-          rack
+          myrack
 
         BUNDLED WITH
            #{version}
diff --git a/spec/bundler/runtime/setup_spec.rb b/spec/bundler/runtime/setup_spec.rb
index f02f81f6974104..74ada2f8b3d514 100644
--- a/spec/bundler/runtime/setup_spec.rb
+++ b/spec/bundler/runtime/setup_spec.rb
@@ -6,16 +6,16 @@
   describe "with no arguments" do
     it "makes all groups available" do
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
-        gem "rack", :group => :test
+        source "https://gem.repo1"
+        gem "myrack", :group => :test
       G
 
       ruby <<-RUBY
         require 'bundler'
         Bundler.setup
 
-        require 'rack'
-        puts RACK
+        require 'myrack'
+        puts MYRACK
       RUBY
       expect(err).to be_empty
       expect(out).to eq("1.0.0")
@@ -25,9 +25,9 @@
   describe "when called with groups" do
     before(:each) do
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
+        source "https://gem.repo1"
         gem "yard"
-        gem "rack", :group => :test
+        gem "myrack", :group => :test
       G
     end
 
@@ -37,7 +37,7 @@
         Bundler.setup(:default)
 
         begin
-          require 'rack'
+          require 'myrack'
         rescue LoadError
           puts "WIN"
         end
@@ -51,8 +51,8 @@
         require 'bundler'
         Bundler.setup(:default, 'test')
 
-        require 'rack'
-        puts RACK
+        require 'myrack'
+        puts MYRACK
       RUBY
       expect(err).to be_empty
       expect(out).to eq("1.0.0")
@@ -64,8 +64,8 @@
         Bundler.setup
         Bundler.setup(:default)
 
-        require 'rack'
-        puts RACK
+        require 'myrack'
+        puts MYRACK
       RUBY
       expect(err).to be_empty
       expect(out).to eq("1.0.0")
@@ -89,16 +89,16 @@
     end
 
     it "handles multiple non-additive invocations" do
-      ruby <<-RUBY, :raise_on_error => false
+      ruby <<-RUBY, raise_on_error: false
         require 'bundler'
         Bundler.setup(:default, :test)
         Bundler.setup(:default)
-        require 'rack'
+        require 'myrack'
 
         puts "FAIL"
       RUBY
 
-      expect(err).to match("rack")
+      expect(err).to match("myrack")
       expect(err).to match("LoadError")
       expect(out).not_to match("FAIL")
     end
@@ -113,8 +113,8 @@ def clean_load_path(lp)
 
     it "puts loaded gems after -I and RUBYLIB", :ruby_repo do
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
-        gem "rack"
+        source "https://gem.repo1"
+        gem "myrack"
       G
 
       ENV["RUBYOPT"] = "#{ENV["RUBYOPT"]} -Idash_i_dir"
@@ -127,18 +127,18 @@ def clean_load_path(lp)
       RUBY
 
       load_path = out.split("\n")
-      rack_load_order = load_path.index {|path| path.include?("rack") }
+      myrack_load_order = load_path.index {|path| path.include?("myrack") }
 
       expect(err).to be_empty
       expect(load_path).to include(a_string_ending_with("dash_i_dir"), "rubylib_dir")
-      expect(rack_load_order).to be > 0
+      expect(myrack_load_order).to be > 0
     end
 
     it "orders the load path correctly when there are dependencies" do
       bundle "config set path.system true"
 
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
+        source "https://gem.repo1"
         gem "rails"
       G
 
@@ -158,7 +158,7 @@ def clean_load_path(lp)
         "/gems/actionpack-2.3.2/lib",
         "/gems/actionmailer-2.3.2/lib",
         "/gems/activesupport-2.3.2/lib",
-        "/gems/rake-13.0.1/lib"
+        "/gems/rake-#{rake_version}/lib"
       )
     end
 
@@ -166,7 +166,7 @@ def clean_load_path(lp)
       bundle "config set path.system true"
 
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
+        source "https://gem.repo1"
         gem "weakling"
         gem "duradura"
         gem "terranova"
@@ -189,12 +189,12 @@ def clean_load_path(lp)
 
   it "raises if the Gemfile was not yet installed" do
     gemfile <<-G
-      source "#{file_uri_for(gem_repo1)}"
-      gem "rack"
+      source "https://gem.repo1"
+      gem "myrack"
     G
 
     ruby <<-R
-      require '#{entrypoint}'
+      require 'bundler'
 
       begin
         Bundler.setup
@@ -209,11 +209,11 @@ def clean_load_path(lp)
 
   it "doesn't create a Gemfile.lock if the setup fails" do
     gemfile <<-G
-      source "#{file_uri_for(gem_repo1)}"
-      gem "rack"
+      source "https://gem.repo1"
+      gem "myrack"
     G
 
-    ruby <<-R, :raise_on_error => false
+    ruby <<-R, raise_on_error: false
       require 'bundler'
 
       Bundler.setup
@@ -224,19 +224,19 @@ def clean_load_path(lp)
 
   it "doesn't change the Gemfile.lock if the setup fails" do
     install_gemfile <<-G
-      source "#{file_uri_for(gem_repo1)}"
-      gem "rack"
+      source "https://gem.repo1"
+      gem "myrack"
     G
 
     lockfile = File.read(bundled_app_lock)
 
     gemfile <<-G
-      source "#{file_uri_for(gem_repo1)}"
-      gem "rack"
+      source "https://gem.repo1"
+      gem "myrack"
       gem "nosuchgem", "10.0"
     G
 
-    ruby <<-R, :raise_on_error => false
+    ruby <<-R, raise_on_error: false
       require 'bundler'
 
       Bundler.setup
@@ -247,8 +247,8 @@ def clean_load_path(lp)
 
   it "makes a Gemfile.lock if setup succeeds" do
     install_gemfile <<-G
-      source "#{file_uri_for(gem_repo1)}"
-      gem "rack"
+      source "https://gem.repo1"
+      gem "myrack"
     G
 
     File.read(bundled_app_lock)
@@ -263,12 +263,12 @@ def clean_load_path(lp)
     context "user provides an absolute path" do
       it "uses BUNDLE_GEMFILE to locate the gemfile if present" do
         gemfile <<-G
-          source "#{file_uri_for(gem_repo1)}"
-          gem "rack"
+          source "https://gem.repo1"
+          gem "myrack"
         G
 
         gemfile bundled_app("4realz"), <<-G
-          source "#{file_uri_for(gem_repo1)}"
+          source "https://gem.repo1"
           gem "activesupport", "2.3.5"
         G
 
@@ -282,7 +282,7 @@ def clean_load_path(lp)
     context "an absolute path is not provided" do
       it "uses BUNDLE_GEMFILE to locate the gemfile if present and doesn't fail in deployment mode" do
         gemfile <<-G
-          source "#{file_uri_for(gem_repo1)}"
+          source "https://gem.repo1"
         G
 
         bundle "install"
@@ -308,23 +308,23 @@ def clean_load_path(lp)
   it "prioritizes gems in BUNDLE_PATH over gems in GEM_HOME" do
     ENV["BUNDLE_PATH"] = bundled_app(".bundle").to_s
     install_gemfile <<-G
-      source "#{file_uri_for(gem_repo1)}"
-      gem "rack", "1.0.0"
+      source "https://gem.repo1"
+      gem "myrack", "1.0.0"
     G
 
-    build_gem "rack", "1.0", :to_system => true do |s|
-      s.write "lib/rack.rb", "RACK = 'FAIL'"
+    build_gem "myrack", "1.0", to_system: true do |s|
+      s.write "lib/myrack.rb", "MYRACK = 'FAIL'"
     end
 
-    expect(the_bundle).to include_gems "rack 1.0.0"
+    expect(the_bundle).to include_gems "myrack 1.0.0"
   end
 
   describe "integrate with rubygems" do
     describe "by replacing #gem" do
       before :each do
         install_gemfile <<-G
-          source "#{file_uri_for(gem_repo1)}"
-          gem "rack", "0.9.1"
+          source "https://gem.repo1"
+          gem "myrack", "0.9.1"
         G
       end
 
@@ -344,7 +344,7 @@ def clean_load_path(lp)
       it "replaces #gem but raises when the version is wrong" do
         run <<-R
           begin
-            gem "rack", "1.0.0"
+            gem "myrack", "1.0.0"
             puts "FAIL"
           rescue LoadError
             puts "WIN"
@@ -359,20 +359,21 @@ def clean_load_path(lp)
       before :each do
         system_gems "activesupport-2.3.5"
         install_gemfile <<-G
-          source "#{file_uri_for(gem_repo1)}"
+          source "https://gem.repo1"
           gem "yard"
         G
       end
 
       it "removes system gems from Gem.source_index" do
         run "require 'yard'"
-        expect(out).to eq("bundler-#{Bundler::VERSION}\nyard-1.0")
+        expect(out).to include("bundler-#{Bundler::VERSION}").and include("yard-1.0")
+        expect(out).not_to include("activesupport-2.3.5")
       end
 
       context "when the ruby stdlib is a substring of Gem.path" do
         it "does not reject the stdlib from $LOAD_PATH" do
           substring = "/" + $LOAD_PATH.find {|p| p.include?("vendor_ruby") }.split("/")[2]
-          run "puts 'worked!'", :env => { "GEM_PATH" => substring }
+          run "puts 'worked!'", env: { "GEM_PATH" => substring }
           expect(out).to eq("worked!")
         end
       end
@@ -381,37 +382,37 @@ def clean_load_path(lp)
 
   describe "with paths" do
     it "activates the gems in the path source" do
-      system_gems "rack-1.0.0"
+      system_gems "myrack-1.0.0"
 
-      build_lib "rack", "1.0.0" do |s|
-        s.write "lib/rack.rb", "puts 'WIN'"
+      build_lib "myrack", "1.0.0" do |s|
+        s.write "lib/myrack.rb", "puts 'WIN'"
       end
 
       gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
-        path "#{lib_path("rack-1.0.0")}" do
-          gem "rack"
+        source "https://gem.repo1"
+        path "#{lib_path("myrack-1.0.0")}" do
+          gem "myrack"
         end
       G
 
-      run "require 'rack'"
+      run "require 'myrack'"
       expect(out).to eq("WIN")
     end
   end
 
   describe "with git" do
     before do
-      build_git "rack", "1.0.0"
+      build_git "myrack", "1.0.0"
 
       gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
-        gem "rack", :git => "#{lib_path("rack-1.0.0")}"
+        source "https://gem.repo1"
+        gem "myrack", :git => "#{lib_path("myrack-1.0.0")}"
       G
     end
 
     it "provides a useful exception when the git repo is not checked out yet" do
-      run "1", :raise_on_error => false
-      expect(err).to match(/the git source #{lib_path('rack-1.0.0')} is not yet checked out. Please run `bundle install`/i)
+      run "1", raise_on_error: false
+      expect(err).to match(/the git source #{lib_path("myrack-1.0.0")} is not yet checked out. Please run `bundle install`/i)
     end
 
     it "does not hit the git binary if the lockfile is available and up to date" do
@@ -441,7 +442,7 @@ def clean_load_path(lp)
       break_git!
 
       ruby <<-R
-        require "#{entrypoint}"
+        require "bundler"
 
         begin
           Bundler.setup
@@ -451,16 +452,15 @@ def clean_load_path(lp)
         end
       R
 
-      run "puts 'FAIL'", :raise_on_error => false
+      run "puts 'FAIL'", raise_on_error: false
 
       expect(err).not_to include "This is not the git you are looking for"
     end
 
     it "works even when the cache directory has been deleted" do
-      bundle "config set --local path vendor/bundle"
       bundle :install
-      FileUtils.rm_rf vendored_gems("cache")
-      expect(the_bundle).to include_gems "rack 1.0.0"
+      FileUtils.rm_r default_cache_path
+      expect(the_bundle).to include_gems "myrack 1.0.0"
     end
 
     it "does not randomly change the path when specifying --path and the bundle directory becomes read only" do
@@ -468,7 +468,7 @@ def clean_load_path(lp)
       bundle :install
 
       with_read_only("#{bundled_app}/**/*") do
-        expect(the_bundle).to include_gems "rack 1.0.0"
+        expect(the_bundle).to include_gems "myrack 1.0.0"
       end
     end
 
@@ -477,91 +477,91 @@ def clean_load_path(lp)
       bundle "install"
 
       with_read_only("#{bundled_app(".bundle")}/**/*") do
-        expect(the_bundle).to include_gems "rack 1.0.0"
+        expect(the_bundle).to include_gems "myrack 1.0.0"
       end
     end
   end
 
   describe "when specifying local override" do
     it "explodes if given path does not exist on runtime" do
-      build_git "rack", "0.8"
+      build_git "myrack", "0.8"
 
-      FileUtils.cp_r("#{lib_path("rack-0.8")}/.", lib_path("local-rack"))
+      FileUtils.cp_r("#{lib_path("myrack-0.8")}/.", lib_path("local-myrack"))
 
       gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
-        gem "rack", :git => "#{lib_path("rack-0.8")}", :branch => "main"
+        source "https://gem.repo1"
+        gem "myrack", :git => "#{lib_path("myrack-0.8")}", :branch => "main"
       G
 
-      bundle %(config set local.rack #{lib_path("local-rack")})
+      bundle %(config set local.myrack #{lib_path("local-myrack")})
       bundle :install
 
-      FileUtils.rm_rf(lib_path("local-rack"))
-      run "require 'rack'", :raise_on_error => false
-      expect(err).to match(/Cannot use local override for rack-0.8 because #{Regexp.escape(lib_path('local-rack').to_s)} does not exist/)
+      FileUtils.rm_r(lib_path("local-myrack"))
+      run "require 'myrack'", raise_on_error: false
+      expect(err).to match(/Cannot use local override for myrack-0.8 because #{Regexp.escape(lib_path("local-myrack").to_s)} does not exist/)
     end
 
     it "explodes if branch is not given on runtime" do
-      build_git "rack", "0.8"
+      build_git "myrack", "0.8"
 
-      FileUtils.cp_r("#{lib_path("rack-0.8")}/.", lib_path("local-rack"))
+      FileUtils.cp_r("#{lib_path("myrack-0.8")}/.", lib_path("local-myrack"))
 
       gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
-        gem "rack", :git => "#{lib_path("rack-0.8")}", :branch => "main"
+        source "https://gem.repo1"
+        gem "myrack", :git => "#{lib_path("myrack-0.8")}", :branch => "main"
       G
 
-      bundle %(config set local.rack #{lib_path("local-rack")})
+      bundle %(config set local.myrack #{lib_path("local-myrack")})
       bundle :install
 
       gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
-        gem "rack", :git => "#{lib_path("rack-0.8")}"
+        source "https://gem.repo1"
+        gem "myrack", :git => "#{lib_path("myrack-0.8")}"
       G
 
-      run "require 'rack'", :raise_on_error => false
+      run "require 'myrack'", raise_on_error: false
       expect(err).to match(/because :branch is not specified in Gemfile/)
     end
 
     it "explodes on different branches on runtime" do
-      build_git "rack", "0.8"
+      build_git "myrack", "0.8"
 
-      FileUtils.cp_r("#{lib_path("rack-0.8")}/.", lib_path("local-rack"))
+      FileUtils.cp_r("#{lib_path("myrack-0.8")}/.", lib_path("local-myrack"))
 
       gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
-        gem "rack", :git => "#{lib_path("rack-0.8")}", :branch => "main"
+        source "https://gem.repo1"
+        gem "myrack", :git => "#{lib_path("myrack-0.8")}", :branch => "main"
       G
 
-      bundle %(config set local.rack #{lib_path("local-rack")})
+      bundle %(config set local.myrack #{lib_path("local-myrack")})
       bundle :install
 
       gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
-        gem "rack", :git => "#{lib_path("rack-0.8")}", :branch => "changed"
+        source "https://gem.repo1"
+        gem "myrack", :git => "#{lib_path("myrack-0.8")}", :branch => "changed"
       G
 
-      run "require 'rack'", :raise_on_error => false
+      run "require 'myrack'", raise_on_error: false
       expect(err).to match(/is using branch main but Gemfile specifies changed/)
     end
 
     it "explodes on refs with different branches on runtime" do
-      build_git "rack", "0.8"
+      build_git "myrack", "0.8"
 
-      FileUtils.cp_r("#{lib_path("rack-0.8")}/.", lib_path("local-rack"))
+      FileUtils.cp_r("#{lib_path("myrack-0.8")}/.", lib_path("local-myrack"))
 
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
-        gem "rack", :git => "#{lib_path("rack-0.8")}", :ref => "main", :branch => "main"
+        source "https://gem.repo1"
+        gem "myrack", :git => "#{lib_path("myrack-0.8")}", :ref => "main", :branch => "main"
       G
 
       gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
-        gem "rack", :git => "#{lib_path("rack-0.8")}", :ref => "main", :branch => "nonexistent"
+        source "https://gem.repo1"
+        gem "myrack", :git => "#{lib_path("myrack-0.8")}", :ref => "main", :branch => "nonexistent"
       G
 
-      bundle %(config set local.rack #{lib_path("local-rack")})
-      run "require 'rack'", :raise_on_error => false
+      bundle %(config set local.myrack #{lib_path("local-myrack")})
+      run "require 'myrack'", raise_on_error: false
       expect(err).to match(/is using branch main but Gemfile specifies nonexistent/)
     end
   end
@@ -570,7 +570,7 @@ def clean_load_path(lp)
     it "doesn't change the resolve if --without is used" do
       bundle "config set --local without rails"
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
+        source "https://gem.repo1"
         gem "activesupport"
 
         group :rails do
@@ -580,13 +580,13 @@ def clean_load_path(lp)
 
       system_gems "activesupport-2.3.5"
 
-      expect(the_bundle).to include_gems "activesupport 2.3.2", :groups => :default
+      expect(the_bundle).to include_gems "activesupport 2.3.2", groups: :default
     end
 
     it "remembers --without and does not bail on bare Bundler.setup" do
       bundle "config set --local without rails"
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
+        source "https://gem.repo1"
         gem "activesupport"
 
         group :rails do
@@ -603,17 +603,17 @@ def clean_load_path(lp)
       bundle "config set --local without development"
 
       path = bundled_app(File.join("vendor", "foo"))
-      build_lib "foo", :path => path
+      build_lib "foo", path: path
 
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
+        source "https://gem.repo1"
         gem "activesupport", "2.3.2"
         gem 'foo', :path => 'vendor/foo', :group => :development
       G
 
-      FileUtils.rm_rf(path)
+      FileUtils.rm_r(path)
 
-      ruby "require 'bundler'; Bundler.setup", :env => { "DEBUG" => "1" }
+      ruby "require 'bundler'; Bundler.setup", env: { "DEBUG" => "1" }
       expect(out).to include("Assuming that source at `vendor/foo` has not changed since fetching its specs errored")
       expect(out).to include("Found no changes, using resolution from the lockfile")
       expect(err).to be_empty
@@ -629,11 +629,11 @@ def clean_load_path(lp)
       end
 
       install_gemfile <<~G
-        source "#{file_uri_for(gem_repo4)}"
+        source "https://gem.repo4"
         gem "depends_on_bundler"
       G
 
-      ruby "require '#{system_gem_path("gems/bundler-9.99.9.beta1/lib/bundler.rb")}'; Bundler.setup", :env => { "DEBUG" => "1" }
+      ruby "require '#{system_gem_path("gems/bundler-9.99.9.beta1/lib/bundler.rb")}'; Bundler.setup", env: { "DEBUG" => "1" }
       expect(out).to include("Found no changes, using resolution from the lockfile")
       expect(out).not_to include("lockfile does not have all gems needed for the current platform")
       expect(err).to be_empty
@@ -641,24 +641,24 @@ def clean_load_path(lp)
 
     it "doesn't fail in frozen mode when bundler is a Gemfile dependency" do
       install_gemfile <<~G
-        source "#{file_uri_for(gem_repo4)}"
+        source "https://gem.repo4"
         gem "bundler"
       G
 
-      bundle "install --verbose", :env => { "BUNDLE_FROZEN" => "true" }
+      bundle "install --verbose", env: { "BUNDLE_FROZEN" => "true" }
       expect(err).to be_empty
     end
 
     it "doesn't re-resolve when deleting dependencies" do
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
-        gem "rack"
+        source "https://gem.repo1"
+        gem "myrack"
         gem "actionpack"
       G
 
-      install_gemfile <<-G, :verbose => true
-        source "#{file_uri_for(gem_repo1)}"
-        gem "rack"
+      install_gemfile <<-G, verbose: true
+        source "https://gem.repo1"
+        gem "myrack"
       G
 
       expect(out).to include("Some dependencies were deleted, using a subset of the resolution from the lockfile")
@@ -668,11 +668,11 @@ def clean_load_path(lp)
     it "remembers --without and does not include groups passed to Bundler.setup" do
       bundle "config set --local without rails"
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
+        source "https://gem.repo1"
         gem "activesupport"
 
-        group :rack do
-          gem "rack"
+        group :myrack do
+          gem "myrack"
         end
 
         group :rails do
@@ -680,19 +680,19 @@ def clean_load_path(lp)
         end
       G
 
-      expect(the_bundle).not_to include_gems "activesupport 2.3.2", :groups => :rack
-      expect(the_bundle).to include_gems "rack 1.0.0", :groups => :rack
+      expect(the_bundle).not_to include_gems "activesupport 2.3.2", groups: :myrack
+      expect(the_bundle).to include_gems "myrack 1.0.0", groups: :myrack
     end
   end
 
   # RubyGems returns loaded_from as a string
   it "has loaded_from as a string on all specs" do
     build_git "foo"
-    build_git "no-gemspec", :gemspec => false
+    build_git "no-gemspec", gemspec: false
 
     install_gemfile <<-G
-      source "#{file_uri_for(gem_repo1)}"
-      gem "rack"
+      source "https://gem.repo1"
+      gem "myrack"
       gem "foo", :git => "#{lib_path("foo-1.0")}"
       gem "no-gemspec", "1.0", :git => "#{lib_path("no-gemspec-1.0")}"
     G
@@ -706,10 +706,25 @@ def clean_load_path(lp)
     expect(out).to be_empty
   end
 
+  it "has gem_dir pointing to local repo" do
+    build_lib "foo", "1.0", path: bundled_app
+
+    install_gemfile <<-G
+      source "https://gem.repo1"
+      gemspec
+    G
+
+    run <<-R
+      puts Gem.loaded_specs['foo'].gem_dir
+    R
+
+    expect(out).to eq(bundled_app.to_s)
+  end
+
   it "does not load all gemspecs" do
     install_gemfile <<-G
-      source "#{file_uri_for(gem_repo1)}"
-      gem "rack"
+      source "https://gem.repo1"
+      gem "myrack"
     G
 
     run <<-R
@@ -727,6 +742,27 @@ def clean_load_path(lp)
       end
     R
 
+    run <<-R
+      File.open(File.join(Gem.dir, "specifications", "broken-ext.gemspec"), "w") do |f|
+        f.write <<-RUBY
+# -*- encoding: utf-8 -*-
+# stub: broken-ext 1.0.0 ruby lib
+# stub: a.ext\\0b.ext
+
+Gem::Specification.new do |s|
+  s.name = "broken-ext"
+  s.version = "1.0.0"
+  raise "BROKEN GEMSPEC EXT"
+end
+        RUBY
+      end
+      # Need to write the gem.build_complete file,
+      # otherwise the full spec is loaded to check the installed_by_version
+      extensions_dir = Gem.default_ext_dir_for(Gem.dir) || File.join(Gem.dir, "extensions", Gem::Platform.local.to_s, Gem.extension_api_version)
+      Bundler::FileUtils.mkdir_p(File.join(extensions_dir, "broken-ext-1.0.0"))
+      File.open(File.join(extensions_dir, "broken-ext-1.0.0", "gem.build_complete"), "w") {}
+    R
+
     run <<-R
       puts "WIN"
     R
@@ -736,8 +772,8 @@ def clean_load_path(lp)
 
   it "ignores empty gem paths" do
     install_gemfile <<-G
-      source "#{file_uri_for(gem_repo1)}"
-      gem "rack"
+      source "https://gem.repo1"
+      gem "myrack"
     G
 
     ENV["GEM_HOME"] = ""
@@ -746,6 +782,18 @@ def clean_load_path(lp)
     expect(err).to be_empty
   end
 
+  it "can require rubygems without warnings, when using a local cache", :truffleruby do
+    install_gemfile <<-G
+      source "https://gem.repo1"
+      gem "myrack"
+    G
+
+    bundle "package"
+    bundle %(exec ruby -w -e "require 'rubygems'")
+
+    expect(err).to be_empty
+  end
+
   context "when the user has `MANPATH` set", :man do
     before { ENV["MANPATH"] = "/foo#{File::PATH_SEPARATOR}" }
 
@@ -757,7 +805,7 @@ def clean_load_path(lp)
       end
 
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo4)}"
+        source "https://gem.repo4"
         gem "with_man"
       G
 
@@ -781,7 +829,7 @@ def clean_load_path(lp)
       end
 
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo4)}"
+        source "https://gem.repo4"
         gem "with_man"
       G
 
@@ -794,7 +842,7 @@ def clean_load_path(lp)
       expect(out).to eq("#{default_bundle_path("gems/with_man-1.0/man")}#{File::PATH_SEPARATOR}\ntrue")
 
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo4)}"
+        source "https://gem.repo4"
         gem "with_man_overriding_system_man"
       G
 
@@ -821,7 +869,7 @@ def clean_load_path(lp)
     end
 
     install_gemfile <<-G
-      source "#{file_uri_for(gem_repo2)}"
+      source "https://gem.repo2"
       gem "requirepaths", :require => nil
     G
 
@@ -832,21 +880,14 @@ def clean_load_path(lp)
   it "should clean $LOAD_PATH properly" do
     gem_name = "very_simple_binary"
     full_gem_name = gem_name + "-1.0"
-    ext_dir = File.join(tmp("extensions", full_gem_name))
 
     system_gems full_gem_name
 
     install_gemfile <<-G
-      source "#{file_uri_for(gem_repo1)}"
+      source "https://gem.repo1"
     G
 
     ruby <<-R
-      s = Gem::Specification.find_by_name '#{gem_name}'
-      s.extension_dir = '#{ext_dir}'
-
-      # Don't build extensions.
-      s.class.send(:define_method, :build_extensions) { nil }
-
       require 'bundler'
       gem '#{gem_name}'
 
@@ -884,9 +925,9 @@ def clean_load_path(lp)
     end
 
     it "should not remove itself from the LOAD_PATH and require a different copy of 'bundler/setup'" do
-      install_gemfile "source \"#{file_uri_for(gem_repo1)}\""
+      install_gemfile "source 'https://gem.repo1'"
 
-      ruby <<-R, :env => { "GEM_PATH" => symlinked_gem_home }
+      ruby <<-R, env: { "GEM_PATH" => symlinked_gem_home }
         TracePoint.trace(:class) do |tp|
           if tp.path.include?("bundler") && !tp.path.start_with?("#{source_root}")
             puts "OMG. Defining a class from another bundler at \#{tp.path}:\#{tp.lineno}"
@@ -901,17 +942,17 @@ def clean_load_path(lp)
   end
 
   it "does not reveal system gems even when Gem.refresh is called" do
-    system_gems "rack-1.0.0"
+    system_gems "myrack-1.0.0"
 
     install_gemfile <<-G
-      source "#{file_uri_for(gem_repo1)}"
+      source "https://gem.repo1"
       gem "activesupport"
     G
 
     run <<-R
-      puts Bundler.rubygems.all_specs.map(&:name)
+      puts Bundler.rubygems.installed_specs.map(&:name)
       Gem.refresh
-      puts Bundler.rubygems.all_specs.map(&:name)
+      puts Bundler.rubygems.installed_specs.map(&:name)
     R
 
     expect(out).to eq("activesupport\nbundler\nactivesupport\nbundler")
@@ -926,18 +967,18 @@ def clean_load_path(lp)
 
     it "should resolve paths relative to the Gemfile" do
       path = bundled_app(File.join("vendor", "foo"))
-      build_lib "foo", :path => path
+      build_lib "foo", path: path
 
       # If the .gemspec exists, then Bundler handles the path differently.
       # See Source::Path.load_spec_files for details.
       FileUtils.rm(File.join(path, "foo.gemspec"))
 
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
+        source "https://gem.repo1"
         gem 'foo', '1.2.3', :path => 'vendor/foo'
       G
 
-      run <<-R, :env => { "BUNDLE_GEMFILE" => bundled_app_gemfile.to_s }, :dir => bundled_app.parent
+      run <<-R, env: { "BUNDLE_GEMFILE" => bundled_app_gemfile.to_s }, dir: bundled_app.parent
         require 'foo'
       R
       expect(err).to be_empty
@@ -947,20 +988,20 @@ def clean_load_path(lp)
       relative_path = File.join("vendor", Dir.pwd.gsub(/^#{filesystem_root}/, ""))
       absolute_path = bundled_app(relative_path)
       FileUtils.mkdir_p(absolute_path)
-      build_lib "foo", :path => absolute_path
+      build_lib "foo", path: absolute_path
 
       # If the .gemspec exists, then Bundler handles the path differently.
       # See Source::Path.load_spec_files for details.
       FileUtils.rm(File.join(absolute_path, "foo.gemspec"))
 
       gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
+        source "https://gem.repo1"
         gem 'foo', '1.2.3', :path => '#{relative_path}'
       G
 
       bundle :install
 
-      run <<-R, :env => { "BUNDLE_GEMFILE" => bundled_app_gemfile.to_s }, :dir => bundled_app.parent
+      run <<-R, env: { "BUNDLE_GEMFILE" => bundled_app_gemfile.to_s }, dir: bundled_app.parent
         require 'foo'
       R
 
@@ -970,10 +1011,10 @@ 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
-        source "#{file_uri_for(gem_repo1)}"
+        source "https://gem.repo1"
         gem "no_gemspec", "1.0", :git => "#{lib_path("no_gemspec-1.0")}"
       G
     end
@@ -990,10 +1031,10 @@ def clean_load_path(lp)
 
   describe "with bundled and system gems" do
     before :each do
-      system_gems "rack-1.0.0"
+      system_gems "myrack-1.0.0"
 
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
+        source "https://gem.repo1"
 
         gem "activesupport", "2.3.5"
       G
@@ -1002,7 +1043,7 @@ def clean_load_path(lp)
     it "does not pull in system gems" do
       run <<-R
         begin;
-          require 'rack'
+          require 'myrack'
         rescue LoadError
           puts 'WIN'
         end
@@ -1024,13 +1065,13 @@ def clean_load_path(lp)
     it "raises an exception if gem is used to invoke a system gem not in the bundle" do
       run <<-R
         begin
-          gem 'rack'
+          gem 'myrack'
         rescue LoadError => e
           puts e.message
         end
       R
 
-      expect(out).to eq("rack is not part of the bundle. Add it to your Gemfile.")
+      expect(out).to eq("myrack is not part of the bundle. Add it to your Gemfile.")
     end
 
     it "sets GEM_HOME appropriately" do
@@ -1042,11 +1083,11 @@ def clean_load_path(lp)
   describe "with system gems in the bundle" do
     before :each do
       bundle "config set path.system true"
-      system_gems "rack-1.0.0"
+      system_gems "myrack-1.0.0"
 
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
-        gem "rack", "1.0.0"
+        source "https://gem.repo1"
+        gem "myrack", "1.0.0"
         gem "activesupport", "2.3.5"
       G
     end
@@ -1060,7 +1101,7 @@ def clean_load_path(lp)
 
   describe "with a gemspec that requires other files" do
     before :each do
-      build_git "bar", :gemspec => false do |s|
+      build_git "bar", gemspec: false do |s|
         s.write "lib/bar/version.rb", %(BAR_VERSION = '1.0')
         s.write "bar.gemspec", <<-G
           require_relative 'lib/bar/version'
@@ -1076,7 +1117,7 @@ def clean_load_path(lp)
       end
 
       gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
+        source "https://gem.repo1"
         gem "bar", :git => "#{lib_path("bar-1.0")}"
       G
     end
@@ -1090,10 +1131,10 @@ def clean_load_path(lp)
     it "error intelligently if the gemspec has a LoadError" do
       skip "whitespace issue?" if Gem.win_platform?
 
-      ref = update_git "bar", :gemspec => false do |s|
+      ref = update_git "bar", gemspec: false do |s|
         s.write "bar.gemspec", "require 'foobarbaz'"
       end.ref_for("HEAD")
-      bundle :install, :raise_on_error => false
+      bundle :install, raise_on_error: false
 
       expect(err.lines.map(&:chomp)).to include(
         a_string_starting_with("[!] There was an error while loading `bar.gemspec`:"),
@@ -1123,7 +1164,7 @@ def Bundler.require(path)
   describe "when Bundler is bundled" do
     it "doesn't blow up" do
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
+        source "https://gem.repo1"
         gem "bundler", :path => "#{root}"
       G
 
@@ -1136,15 +1177,15 @@ def Bundler.require(path)
     def lock_with(bundler_version = nil)
       lock = <<~L
         GEM
-          remote: #{file_uri_for(gem_repo1)}/
+          remote: https://gem.repo1/
           specs:
-            rack (1.0.0)
+            myrack (1.0.0)
 
         PLATFORMS
           #{lockfile_platforms}
 
         DEPENDENCIES
-          rack
+          myrack
       L
 
       if bundler_version
@@ -1158,15 +1199,15 @@ def lock_with(bundler_version = nil)
       bundle "config set --local path.system true"
 
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
-        gem "rack"
+        source "https://gem.repo1"
+        gem "myrack"
       G
     end
 
     context "is not present" do
       it "does not change the lock" do
         lockfile lock_with(nil)
-        ruby "require '#{entrypoint}/setup'"
+        ruby "require 'bundler/setup'"
         expect(lockfile).to eq lock_with(nil)
       end
     end
@@ -1185,7 +1226,7 @@ def lock_with(bundler_version = nil)
       it "does not change the lock" do
         system_gems "bundler-1.10.1"
         lockfile lock_with("1.10.1")
-        ruby "require '#{entrypoint}/setup'"
+        ruby "require 'bundler/setup'"
         expect(lockfile).to eq lock_with("1.10.1")
       end
     end
@@ -1195,17 +1236,22 @@ def lock_with(bundler_version = nil)
     let(:ruby_version) { nil }
 
     def lock_with(ruby_version = nil)
+      checksums = checksums_section do |c|
+        c.checksum gem_repo1, "myrack", "1.0.0"
+      end
+
       lock = <<~L
         GEM
-          remote: #{file_uri_for(gem_repo1)}/
+          remote: https://gem.repo1/
           specs:
-            rack (1.0.0)
+            myrack (1.0.0)
 
         PLATFORMS
           #{lockfile_platforms}
 
         DEPENDENCIES
-          rack
+          myrack
+        #{checksums}
       L
 
       if ruby_version
@@ -1224,8 +1270,8 @@ def lock_with(ruby_version = nil)
     before do
       install_gemfile <<-G
         ruby ">= 0"
-        source "#{file_uri_for(gem_repo1)}"
-        gem "rack"
+        source "https://gem.repo1"
+        gem "myrack"
       G
       lockfile lock_with(ruby_version)
     end
@@ -1255,9 +1301,7 @@ def lock_with(ruby_version = nil)
 
   describe "with gemified standard libraries" do
     it "does not load Digest", :ruby_repo do
-      skip "Only for Ruby 3.0+" unless RUBY_VERSION >= "3.0"
-
-      build_git "bar", :gemspec => false do |s|
+      build_git "bar", gemspec: false do |s|
         s.write "lib/bar/version.rb", %(BAR_VERSION = '1.0')
         s.write "bar.gemspec", <<-G
           require_relative 'lib/bar/version'
@@ -1269,20 +1313,20 @@ def lock_with(ruby_version = nil)
             s.files       = Dir["lib/**/*.rb"]
             s.author      = 'no one'
 
-            s.add_runtime_dependency 'digest'
+            s.add_dependency 'digest'
           end
         G
       end
 
       gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
+        source "https://gem.repo1"
         gem "bar", :git => "#{lib_path("bar-1.0")}"
       G
 
       bundle :install
 
-      ruby <<-RUBY
-        require '#{entrypoint}/setup'
+      ruby <<-RUBY, artifice: nil
+        require 'bundler/setup'
         puts defined?(::Digest) ? "Digest defined" : "Digest undefined"
         require 'digest'
       RUBY
@@ -1290,9 +1334,9 @@ def lock_with(ruby_version = nil)
     end
 
     it "does not load Psych" do
-      gemfile "source \"#{file_uri_for(gem_repo1)}\""
+      gemfile "source 'https://gem.repo1'"
       ruby <<-RUBY
-        require '#{entrypoint}/setup'
+        require 'bundler/setup'
         puts defined?(Psych::VERSION) ? Psych::VERSION : "undefined"
         require 'psych'
         puts Psych::VERSION
@@ -1303,8 +1347,8 @@ def lock_with(ruby_version = nil)
     end
 
     it "does not load openssl" do
-      install_gemfile "source \"#{file_uri_for(gem_repo1)}\""
-      ruby <<-RUBY
+      install_gemfile "source 'https://gem.repo1'"
+      ruby <<-RUBY, artifice: nil
         require "bundler/setup"
         puts defined?(OpenSSL) || "undefined"
         require "openssl"
@@ -1313,13 +1357,55 @@ def lock_with(ruby_version = nil)
       expect(out).to eq("undefined\nconstant")
     end
 
+    it "does not load uri while reading gemspecs", rubygems: ">= 3.6.0.dev" do
+      Dir.mkdir bundled_app("test")
+
+      create_file(bundled_app("test/test.gemspec"), <<-G)
+        Gem::Specification.new do |s|
+          s.name = "test"
+          s.version = "1.0.0"
+          s.summary = "test"
+          s.authors = ['John Doe']
+          s.homepage = 'https://example.com'
+        end
+      G
+
+      install_gemfile <<-G
+        source "https://gem.repo1"
+        gem "test", path: "#{bundled_app("test")}"
+      G
+
+      ruby <<-RUBY, artifice: nil
+        require "bundler/setup"
+        puts defined?(URI) || "undefined"
+        require "uri"
+        puts defined?(URI) || "undefined"
+      RUBY
+      expect(out).to eq("undefined\nconstant")
+    end
+
+    it "activates default gems when they are part of the bundle, but not installed explicitly", :ruby_repo do
+      default_delegate_version = ruby "gem 'delegate'; require 'delegate'; puts Delegator::VERSION"
+
+      build_repo2 do
+        build_gem "delegate", default_delegate_version
+      end
+
+      gemfile "source \"https://gem.repo2\"; gem 'delegate'"
+
+      ruby <<-RUBY
+        require "bundler/setup"
+        require "delegate"
+        puts defined?(::Delegator) ? "Delegator defined" : "Delegator undefined"
+      RUBY
+
+      expect(out).to eq("Delegator defined")
+      expect(err).to be_empty
+    end
+
     describe "default gem activation" do
       let(:exemptions) do
-        exempts = %w[did_you_mean bundler]
-        exempts << "uri" if Gem.ruby_version >= Gem::Version.new("2.7")
-        exempts << "pathname" if Gem.ruby_version >= Gem::Version.new("3.0")
-        exempts << "set" unless Gem.rubygems_version >= Gem::Version.new("3.2.6")
-        exempts << "tsort" unless Gem.rubygems_version >= Gem::Version.new("3.2.31")
+        exempts = %w[did_you_mean bundler uri pathname]
         exempts << "error_highlight" # added in Ruby 3.1 as a default gem
         exempts << "ruby2_keywords" # added in Ruby 3.1 as a default gem
         exempts << "syntax_suggest" # added in Ruby 3.2 as a default gem
@@ -1360,25 +1446,25 @@ def lock_with(ruby_version = nil)
       RUBY
 
       it "activates no gems with -rbundler/setup" do
-        install_gemfile "source \"#{file_uri_for(gem_repo1)}\""
-        ruby code, :env => { "RUBYOPT" => activation_warning_hack_rubyopt + " -rbundler/setup" }
+        install_gemfile "source 'https://gem.repo1'"
+        ruby code, env: { "RUBYOPT" => activation_warning_hack_rubyopt + " -rbundler/setup" }, artifice: nil
         expect(out).to eq("{}")
       end
 
       it "activates no gems with bundle exec" do
-        install_gemfile "source \"#{file_uri_for(gem_repo1)}\""
+        install_gemfile "source 'https://gem.repo1'"
         create_file("script.rb", code)
-        bundle "exec ruby ./script.rb", :env => { "RUBYOPT" => activation_warning_hack_rubyopt }
+        bundle "exec ruby ./script.rb", env: { "RUBYOPT" => activation_warning_hack_rubyopt }
         expect(out).to eq("{}")
       end
 
       it "activates no gems with bundle exec that is loaded" do
         skip "not executable" if Gem.win_platform?
 
-        install_gemfile "source \"#{file_uri_for(gem_repo1)}\""
+        install_gemfile "source 'https://gem.repo1'"
         create_file("script.rb", "#!/usr/bin/env ruby\n\n#{code}")
         FileUtils.chmod(0o777, bundled_app("script.rb"))
-        bundle "exec ./script.rb", :artifice => nil, :env => { "RUBYOPT" => activation_warning_hack_rubyopt }
+        bundle "exec ./script.rb", env: { "RUBYOPT" => activation_warning_hack_rubyopt }
         expect(out).to eq("{}")
       end
 
@@ -1387,10 +1473,10 @@ def lock_with(ruby_version = nil)
           build_gem "net-http-pipeline", "1.0.1"
         end
 
-        system_gems "net-http-pipeline-1.0.1", :gem_repo => gem_repo4
+        system_gems "net-http-pipeline-1.0.1", gem_repo: gem_repo4
 
         gemfile <<-G
-          source "#{file_uri_for(gem_repo4)}"
+          source "https://gem.repo4"
           gem "net-http-pipeline", "1.0.1"
         G
 
@@ -1412,11 +1498,11 @@ def lock_with(ruby_version = nil)
           end
 
           install_gemfile <<-G
-            source "#{file_uri_for(gem_repo4)}"
+            source "https://gem.repo4"
             gem "#{g}", "999999"
           G
 
-          expect(the_bundle).to include_gem("#{g} 999999", :env => { "RUBYOPT" => activation_warning_hack_rubyopt })
+          expect(the_bundle).to include_gem("#{g} 999999", env: { "RUBYOPT" => activation_warning_hack_rubyopt }, artifice: nil)
         end
 
         it "activates older versions of #{g}", :ruby_repo do
@@ -1427,84 +1513,63 @@ def lock_with(ruby_version = nil)
           end
 
           install_gemfile <<-G
-            source "#{file_uri_for(gem_repo4)}"
+            source "https://gem.repo4"
             gem "#{g}", "0.0.0.a"
           G
 
-          expect(the_bundle).to include_gem("#{g} 0.0.0.a", :env => { "RUBYOPT" => activation_warning_hack_rubyopt })
+          expect(the_bundle).to include_gem("#{g} 0.0.0.a", env: { "RUBYOPT" => activation_warning_hack_rubyopt }, artifice: nil)
         end
       end
     end
   end
 
   describe "after setup" do
-    it "allows calling #gem on random objects", :bundler => "< 3" do
+    it "keeps Kernel#gem private" do
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
-        gem "rack"
+        source "https://gem.repo1"
+        gem "myrack"
       G
 
-      ruby <<-RUBY
+      ruby <<-RUBY, raise_on_error: false
         require "bundler/setup"
-        Object.new.gem "rack"
-        puts Gem.loaded_specs["rack"].full_name
-      RUBY
-
-      expect(out).to eq("rack-1.0.0")
-    end
-
-    it "keeps Kernel#gem private", :bundler => "3" do
-      install_gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
-        gem "rack"
-      G
-
-      ruby <<-RUBY, :raise_on_error => false
-        require "bundler/setup"
-        Object.new.gem "rack"
+        Object.new.gem "myrack"
         puts "FAIL"
       RUBY
 
-      expect(last_command.stdboth).not_to include "FAIL"
-      expect(err).to include "private method `gem'"
+      expect(stdboth).not_to include "FAIL"
+      expect(err).to match(/private method [`']gem'/)
     end
 
     it "keeps Kernel#require private" do
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
-        gem "rack"
+        source "https://gem.repo1"
+        gem "myrack"
       G
 
-      ruby <<-RUBY, :raise_on_error => false
+      ruby <<-RUBY, raise_on_error: false
         require "bundler/setup"
-        Object.new.require "rack"
+        Object.new.require "myrack"
         puts "FAIL"
       RUBY
 
-      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} -rbundler/setup -e'puts true'", :env => { "RUBYOPT" => opt_add("--disable=gems", ENV["RUBYOPT"]) })
-
-      expect(last_command.stdboth).to eq("true")
+      expect(stdboth).not_to include "FAIL"
+      expect(err).to match(/private method [`']require'/)
     end
 
     it "memoizes initial set of specs when requiring bundler/setup, so that even if further code mutates dependencies, Bundler.definition.specs is not affected" do
       install_gemfile <<~G
-        source "#{file_uri_for(gem_repo1)}"
+        source "https://gem.repo1"
         gem "yard"
-        gem "rack", :group => :test
+        gem "myrack", :group => :test
       G
 
-      ruby <<-RUBY, :raise_on_error => false
+      ruby <<-RUBY, raise_on_error: false
         require "bundler/setup"
         Bundler.require(:test).select! {|d| (d.groups & [:test]).any? }
         puts Bundler.definition.specs.map(&:name).join(", ")
       RUBY
 
-      expect(out).to include("rack, yard")
+      expect(out).to include("myrack, yard")
     end
 
     it "does not cause double loads when higher versions of default gems are activated before bundler" do
@@ -1518,9 +1583,9 @@ module JSON
         end
       end
 
-      system_gems "json-999.999.999", :gem_repo => gem_repo2
+      system_gems "json-999.999.999", gem_repo: gem_repo2
 
-      install_gemfile "source \"#{file_uri_for(gem_repo1)}\""
+      install_gemfile "source 'https://gem.repo1'"
       ruby <<-RUBY
         require "json"
         require "bundler/setup"
@@ -1531,8 +1596,8 @@ module JSON
     end
   end
 
-  it "does not undo the Kernel.require decorations", :rubygems => ">= 3.4.6" do
-    install_gemfile "source \"#{file_uri_for(gem_repo1)}\""
+  it "does not undo the Kernel.require decorations", rubygems: ">= 3.4.6" do
+    install_gemfile "source 'https://gem.repo1'"
     script = bundled_app("bin/script")
     create_file(script, <<~RUBY)
       module Kernel
@@ -1552,132 +1617,57 @@ def require(path)
       require "foo"
     RUBY
 
-    sys_exec "#{Gem.ruby} #{script}", :raise_on_error => false
+    sys_exec "#{Gem.ruby} #{script}", raise_on_error: false
     expect(out).to include("requiring foo used the monkeypatch")
   end
 
-  it "warn with bundled gems when it's loaded" do
-    build_repo4 do
-      build_gem "rack"
-    end
-
-    install_gemfile <<-G
-      source "#{file_uri_for(gem_repo4)}"
-      gem "rack"
-    G
-
-    ruby <<-R
-      Gem.send(:remove_const, :BUNDLED_GEMS) if defined?(Gem::BUNDLED_GEMS)
-      module Gem::BUNDLED_GEMS
-        SINCE = { "csv" => "1.0.0" }
-      end
-      require 'bundler/setup'
-      require 'csv'
-    R
-
-    expect(err).to include("csv is not part of the default gems")
-  end
-
-  it "don't warn with bundled gems when it's loaded twice" do
+  it "performs an automatic bundle install" do
     build_repo4 do
-      build_gem "rack"
+      build_gem "myrack", "1.0.0"
     end
 
-    install_gemfile <<-G
-      source "#{file_uri_for(gem_repo4)}"
-      gem "rack"
+    gemfile <<-G
+      source "https://gem.repo1"
+      gem "myrack", :group => :test
     G
 
-    ruby <<-R
-      Gem.send(:remove_const, :BUNDLED_GEMS) if defined?(Gem::BUNDLED_GEMS)
-      module Gem::BUNDLED_GEMS
-        SINCE = { "csv" => "1.0.0" }
-      end
-      require 'csv'
-      require 'bundler/setup'
-      require 'csv'
-    R
-
-    expect(err).not_to include("Add csv to your Gemfile")
-  end
+    bundle "config set auto_install 1"
 
-  it "don't warn with bundled gems when it's declared in Gemfile" do
-    build_repo4 do
-      build_gem "csv"
-    end
-
-    install_gemfile <<-G
-      source "#{file_uri_for(gem_repo4)}"
-      gem "csv"
-    G
-
-    ruby <<-R
-      Gem.send(:remove_const, :BUNDLED_GEMS) if defined?(Gem::BUNDLED_GEMS)
-      module Gem::BUNDLED_GEMS
-        SINCE = { "csv" => "1.0.0" }
-      end
+    ruby <<-RUBY, artifice: "compact_index"
       require 'bundler/setup'
-      require 'csv'
-    R
-
+    RUBY
     expect(err).to be_empty
+    expect(out).to include("Installing myrack 1.0.0")
   end
 
-  it "warn foo-bar style gems correct name" do
-    build_repo4 do
-      build_gem "net-imap" do |s|
-        s.write "lib/net/imap.rb", "NET_IMAP = '0.0.1'"
-      end
-      build_gem "csv"
-    end
+  context "in a read-only filesystem" do
+    before do
+      gemfile <<-G
+        source "https://gem.repo4"
+      G
 
-    install_gemfile <<-G
-      source "#{file_uri_for(gem_repo4)}"
-      gem "csv"
-    G
+      lockfile <<-L
+        GEM
+          remote: https://gem.repo4/
 
-    ruby <<-R
-      Gem.send(:remove_const, :BUNDLED_GEMS) if defined?(Gem::BUNDLED_GEMS)
-      module Gem::BUNDLED_GEMS
-        SINCE = { "csv" => "1.0.0", "net-imap" => "0.0.1" }
-      end
-      require 'bundler/setup'
-      begin
-        require 'net/imap'
-      rescue LoadError
-      end
-    R
+        PLATFORMS
+          x86_64-darwin-19
 
-    expect(err).to include("net-imap is not part of the default gems")
-  end
+        DEPENDENCIES
 
-  it "calls #to_path on the name to require" do
-    build_repo4 do
-      build_gem "net-imap" do |s|
-        s.write "lib/net/imap.rb", "NET_IMAP = '0.0.1'"
-      end
-      build_gem "csv"
+        BUNDLED WITH
+           #{Bundler::VERSION}
+      L
     end
 
-    install_gemfile <<-G
-      source "#{file_uri_for(gem_repo4)}"
-      gem "csv"
-    G
-
-    ruby <<-R
-      Gem.send(:remove_const, :BUNDLED_GEMS) if defined?(Gem::BUNDLED_GEMS)
-      module Gem::BUNDLED_GEMS
-        SINCE = { "csv" => "1.0.0", "net-imap" => "0.0.1" }
-      end
-      path = BasicObject.new
-      def path.to_path; 'net/imap'; end
-      require 'bundler/setup'
-      begin
-        require path
-      rescue LoadError
+    it "should fail loudly if the lockfile platforms don't include the current platform" do
+      simulate_platform "x86_64-linux" do
+        ruby <<-RUBY, raise_on_error: false, env: { "BUNDLER_SPEC_READ_ONLY" => "true", "BUNDLER_FORCE_TTY" => "true" }
+          require "bundler/setup"
+        RUBY
       end
-    R
 
-    expect(err).to include("net-imap is not part of the default gems")
+      expect(err).to include("Your lockfile is missing the current platform, but can't be updated because file system is read-only")
+    end
   end
 end
diff --git a/spec/bundler/runtime/with_unbundled_env_spec.rb b/spec/bundler/runtime/with_unbundled_env_spec.rb
deleted file mode 100644
index 731a9921a27840..00000000000000
--- a/spec/bundler/runtime/with_unbundled_env_spec.rb
+++ /dev/null
@@ -1,302 +0,0 @@
-# frozen_string_literal: true
-
-RSpec.describe "Bundler.with_env helpers" do
-  def bundle_exec_ruby(args, options = {})
-    build_bundler_context options
-    bundle "exec '#{Gem.ruby}' #{args}", options
-  end
-
-  def build_bundler_context(options = {})
-    bundle "config set path vendor/bundle"
-    gemfile "source \"#{file_uri_for(gem_repo1)}\""
-    bundle "install", options
-  end
-
-  def run_bundler_script(env, script)
-    system(env, "ruby", "-I#{lib_dir}", "-rbundler", script.to_s)
-  end
-
-  describe "Bundler.original_env" do
-    it "should return the PATH present before bundle was activated" do
-      create_file("source.rb", <<-RUBY)
-        print Bundler.original_env["PATH"]
-      RUBY
-      path = `getconf PATH`.strip + "#{File::PATH_SEPARATOR}/foo"
-      with_path_as(path) do
-        bundle_exec_ruby(bundled_app("source.rb").to_s)
-        expect(last_command.stdboth).to eq(path)
-      end
-    end
-
-    it "should return the GEM_PATH present before bundle was activated" do
-      create_file("source.rb", <<-RUBY)
-        print Bundler.original_env['GEM_PATH']
-      RUBY
-      gem_path = ENV["GEM_PATH"] + "#{File::PATH_SEPARATOR}/foo"
-      with_gem_path_as(gem_path) do
-        bundle_exec_ruby(bundled_app("source.rb").to_s)
-        expect(last_command.stdboth).to eq(gem_path)
-      end
-    end
-
-    it "works with nested bundle exec invocations", :ruby_repo do
-      create_file("exe.rb", <<-'RUBY')
-        count = ARGV.first.to_i
-        exit if count < 0
-        STDERR.puts "#{count} #{ENV["PATH"].end_with?("#{File::PATH_SEPARATOR}/foo")}"
-        if count == 2
-          ENV["PATH"] = "#{ENV["PATH"]}#{File::PATH_SEPARATOR}/foo"
-        end
-        exec(Gem.ruby, __FILE__, (count - 1).to_s)
-      RUBY
-      path = `getconf PATH`.strip + File::PATH_SEPARATOR + File.dirname(Gem.ruby)
-      with_path_as(path) do
-        build_bundler_context
-        bundle_exec_ruby("#{bundled_app("exe.rb")} 2")
-      end
-      expect(err).to eq <<-EOS.strip
-2 false
-1 true
-0 true
-      EOS
-    end
-
-    it "removes variables that bundler added", :ruby_repo do
-      # Simulate bundler has not yet been loaded
-      ENV.replace(ENV.to_hash.delete_if {|k, _v| k.start_with?(Bundler::EnvironmentPreserver::BUNDLER_PREFIX) })
-
-      original = ruby('puts ENV.to_a.map {|e| e.join("=") }.sort.join("\n")')
-      create_file("source.rb", <<-RUBY)
-        puts Bundler.original_env.to_a.map {|e| e.join("=") }.sort.join("\n")
-      RUBY
-      bundle_exec_ruby bundled_app("source.rb")
-      expect(out).to eq original
-    end
-  end
-
-  shared_examples_for "an unbundling helper" do
-    it "should delete BUNDLE_PATH" do
-      create_file("source.rb", <<-RUBY)
-        print #{modified_env}.has_key?('BUNDLE_PATH')
-      RUBY
-      ENV["BUNDLE_PATH"] = "./foo"
-      bundle_exec_ruby bundled_app("source.rb")
-      expect(last_command.stdboth).to include "false"
-    end
-
-    it "should remove absolute path to 'bundler/setup' from RUBYOPT even if it was present in original env" do
-      create_file("source.rb", <<-RUBY)
-        print #{modified_env}['RUBYOPT']
-      RUBY
-      setup_require = "-r#{lib_dir}/bundler/setup"
-      ENV["BUNDLER_ORIG_RUBYOPT"] = "-W2 #{setup_require} #{ENV["RUBYOPT"]}"
-      simulate_bundler_version_when_missing_prerelease_default_gem_activation do
-        bundle_exec_ruby bundled_app("source.rb")
-      end
-      expect(last_command.stdboth).not_to include(setup_require)
-    end
-
-    it "should remove relative path to 'bundler/setup' from RUBYOPT even if it was present in original env" do
-      create_file("source.rb", <<-RUBY)
-        print #{modified_env}['RUBYOPT']
-      RUBY
-      ENV["BUNDLER_ORIG_RUBYOPT"] = "-W2 -rbundler/setup #{ENV["RUBYOPT"]}"
-      simulate_bundler_version_when_missing_prerelease_default_gem_activation do
-        bundle_exec_ruby bundled_app("source.rb")
-      end
-      expect(last_command.stdboth).not_to include("-rbundler/setup")
-    end
-
-    it "should restore RUBYLIB", :ruby_repo do
-      create_file("source.rb", <<-RUBY)
-        print #{modified_env}['RUBYLIB']
-      RUBY
-      ENV["RUBYLIB"] = lib_dir.to_s + File::PATH_SEPARATOR + "/foo"
-      ENV["BUNDLER_ORIG_RUBYLIB"] = lib_dir.to_s + File::PATH_SEPARATOR + "/foo-original"
-      bundle_exec_ruby bundled_app("source.rb")
-      expect(last_command.stdboth).to include("/foo-original")
-    end
-
-    it "should restore the original MANPATH" do
-      create_file("source.rb", <<-RUBY)
-        print #{modified_env}['MANPATH']
-      RUBY
-      ENV["MANPATH"] = "/foo"
-      ENV["BUNDLER_ORIG_MANPATH"] = "/foo-original"
-      bundle_exec_ruby bundled_app("source.rb")
-      expect(last_command.stdboth).to include("/foo-original")
-    end
-  end
-
-  describe "Bundler.unbundled_env" do
-    let(:modified_env) { "Bundler.unbundled_env" }
-
-    it_behaves_like "an unbundling helper"
-  end
-
-  describe "Bundler.clean_env", :bundler => 2 do
-    let(:modified_env) { "Bundler.clean_env" }
-
-    it_behaves_like "an unbundling helper"
-  end
-
-  describe "Bundler.with_original_env" do
-    it "should set ENV to original_env in the block" do
-      expected = Bundler.original_env
-      actual = Bundler.with_original_env { Bundler::EnvironmentPreserver.env_to_hash(ENV) }
-      expect(actual).to eq(expected)
-    end
-
-    it "should restore the environment after execution" do
-      Bundler.with_original_env do
-        ENV["FOO"] = "hello"
-      end
-
-      expect(ENV).not_to have_key("FOO")
-    end
-  end
-
-  describe "Bundler.with_clean_env", :bundler => 2 do
-    it "should set ENV to unbundled_env in the block" do
-      expected = Bundler.unbundled_env
-
-      actual = Bundler.ui.silence do
-        Bundler.with_clean_env { Bundler::EnvironmentPreserver.env_to_hash(ENV) }
-      end
-
-      expect(actual).to eq(expected)
-    end
-
-    it "should restore the environment after execution" do
-      Bundler.ui.silence do
-        Bundler.with_clean_env { ENV["FOO"] = "hello" }
-      end
-
-      expect(ENV).not_to have_key("FOO")
-    end
-  end
-
-  describe "Bundler.with_unbundled_env" do
-    it "should set ENV to unbundled_env in the block" do
-      expected = Bundler.unbundled_env
-      actual = Bundler.with_unbundled_env { Bundler::EnvironmentPreserver.env_to_hash(ENV) }
-      expect(actual).to eq(expected)
-    end
-
-    it "should restore the environment after execution" do
-      Bundler.with_unbundled_env do
-        ENV["FOO"] = "hello"
-      end
-
-      expect(ENV).not_to have_key("FOO")
-    end
-  end
-
-  describe "Bundler.original_system" do
-    before do
-      create_file("source.rb", <<-'RUBY')
-        Bundler.original_system("ruby", "-e", "exit(42) if ENV['BUNDLE_FOO'] == 'bar'")
-
-        exit $?.exitstatus
-      RUBY
-    end
-
-    it "runs system inside with_original_env" do
-      run_bundler_script({ "BUNDLE_FOO" => "bar" }, bundled_app("source.rb"))
-      expect($?.exitstatus).to eq(42)
-    end
-  end
-
-  describe "Bundler.clean_system", :bundler => 2 do
-    before do
-      create_file("source.rb", <<-'RUBY')
-        Bundler.ui.silence { Bundler.clean_system("ruby", "-e", "exit(42) unless ENV['BUNDLE_FOO'] == 'bar'") }
-
-        exit $?.exitstatus
-      RUBY
-    end
-
-    it "runs system inside with_clean_env" do
-      run_bundler_script({ "BUNDLE_FOO" => "bar" }, bundled_app("source.rb"))
-      expect($?.exitstatus).to eq(42)
-    end
-  end
-
-  describe "Bundler.unbundled_system" do
-    before do
-      create_file("source.rb", <<-'RUBY')
-        Bundler.unbundled_system("ruby", "-e", "exit(42) unless ENV['BUNDLE_FOO'] == 'bar'")
-
-        exit $?.exitstatus
-      RUBY
-    end
-
-    it "runs system inside with_unbundled_env" do
-      run_bundler_script({ "BUNDLE_FOO" => "bar" }, bundled_app("source.rb"))
-      expect($?.exitstatus).to eq(42)
-    end
-  end
-
-  describe "Bundler.original_exec" do
-    before do
-      create_file("source.rb", <<-'RUBY')
-        Process.fork do
-          exit Bundler.original_exec(%(test "\$BUNDLE_FOO" = "bar"))
-        end
-
-        _, status = Process.wait2
-
-        exit(status.exitstatus)
-      RUBY
-    end
-
-    it "runs exec inside with_original_env" do
-      skip "Fork not implemented" if Gem.win_platform?
-
-      run_bundler_script({ "BUNDLE_FOO" => "bar" }, bundled_app("source.rb"))
-      expect($?.exitstatus).to eq(0)
-    end
-  end
-
-  describe "Bundler.clean_exec", :bundler => 2 do
-    before do
-      create_file("source.rb", <<-'RUBY')
-        Process.fork do
-          exit Bundler.ui.silence { Bundler.clean_exec(%(test "\$BUNDLE_FOO" = "bar")) }
-        end
-
-        _, status = Process.wait2
-
-        exit(status.exitstatus)
-      RUBY
-    end
-
-    it "runs exec inside with_clean_env" do
-      skip "Fork not implemented" if Gem.win_platform?
-
-      run_bundler_script({ "BUNDLE_FOO" => "bar" }, bundled_app("source.rb"))
-      expect($?.exitstatus).to eq(1)
-    end
-  end
-
-  describe "Bundler.unbundled_exec" do
-    before do
-      create_file("source.rb", <<-'RUBY')
-        Process.fork do
-          exit Bundler.unbundled_exec(%(test "\$BUNDLE_FOO" = "bar"))
-        end
-
-        _, status = Process.wait2
-
-        exit(status.exitstatus)
-      RUBY
-    end
-
-    it "runs exec inside with_clean_env" do
-      skip "Fork not implemented" if Gem.win_platform?
-
-      run_bundler_script({ "BUNDLE_FOO" => "bar" }, bundled_app("source.rb"))
-      expect($?.exitstatus).to eq(1)
-    end
-  end
-end
diff --git a/spec/bundler/spec_helper.rb b/spec/bundler/spec_helper.rb
index 6a7e2891a6dec5..35b249bb92a0ec 100644
--- a/spec/bundler/spec_helper.rb
+++ b/spec/bundler/spec_helper.rb
@@ -9,14 +9,23 @@
   abort "The bundler specs cannot be run from a path that contains special characters (particularly #{$1.inspect})"
 end
 
+# Bundler CLI will have different help text depending on whether any of these
+# variables is set, since the `-e` flag `bundle gem` with require an explicit
+# value if they are not set, but will use their value by default if set. So make
+# sure they are `nil` before loading bundler to get a consistent help text,
+# since some tests rely on that.
+ENV["EDITOR"] = nil
+ENV["VISUAL"] = nil
+ENV["BUNDLER_EDITOR"] = nil
 require "bundler"
+
 require "rspec/core"
 require "rspec/expectations"
 require "rspec/mocks"
 require "rspec/support/differ"
 
 require_relative "support/builders"
-require_relative "support/build_metadata"
+require_relative "support/checksums"
 require_relative "support/filters"
 require_relative "support/helpers"
 require_relative "support/indexes"
@@ -34,6 +43,7 @@ def self.ruby=(ruby)
 
 RSpec.configure do |config|
   config.include Spec::Builders
+  config.include Spec::Checksums
   config.include Spec::Helpers
   config.include Spec::Indexes
   config.include Spec::Matchers
@@ -46,6 +56,9 @@ def self.ruby=(ruby)
 
   config.silence_filter_announcements = !ENV["TEST_ENV_NUMBER"].nil?
 
+  config.backtrace_exclusion_patterns <<
+    %r{./spec/(spec_helper\.rb|support/.+)}
+
   config.disable_monkey_patching!
 
   # Since failures cause us to keep a bunch of long strings in memory, stop
@@ -71,8 +84,11 @@ def self.ruby=(ruby)
 
     require_relative "support/rubygems_ext"
     Spec::Rubygems.test_setup
+
+    # Simulate bundler has not yet been loaded
+    ENV.replace(ENV.to_hash.delete_if {|k, _v| k.start_with?(Bundler::EnvironmentPreserver::BUNDLER_PREFIX) })
+
     ENV["BUNDLER_SPEC_RUN"] = "true"
-    ENV["BUNDLER_NO_OLD_RUBYGEMS_WARNING"] = "true"
     ENV["BUNDLE_USER_CONFIG"] = ENV["BUNDLE_USER_CACHE"] = ENV["BUNDLE_USER_PLUGIN"] = nil
     ENV["BUNDLE_APP_CONFIG"] = nil
     ENV["BUNDLE_SILENCE_ROOT_WARNING"] = nil
@@ -83,16 +99,11 @@ def self.ruby=(ruby)
     # Don't wrap output in tests
     ENV["THOR_COLUMNS"] = "10000"
 
-    extend(Spec::Helpers)
-    system_gems :bundler, :path => pristine_system_gem_path
-  end
-
-  config.before :all do
-    check_test_gems!
+    extend(Spec::Builders)
 
     build_repo1
 
-    reset_paths!
+    reset!
   end
 
   config.around :each do |example|
@@ -112,8 +123,4 @@ def self.ruby=(ruby)
   ensure
     reset!
   end
-
-  config.after :suite do
-    FileUtils.rm_r Spec::Path.pristine_system_gem_path
-  end
 end
diff --git a/spec/bundler/support/activate.rb b/spec/bundler/support/activate.rb
index e19a6d0ed1e866..143b77833d9db7 100644
--- a/spec/bundler/support/activate.rb
+++ b/spec/bundler/support/activate.rb
@@ -5,5 +5,5 @@
 
 require_relative "path"
 bundler_gemspec = Spec::Path.loaded_gemspec
-bundler_gemspec.instance_variable_set(:@full_gem_path, Spec::Path.source_root)
+bundler_gemspec.instance_variable_set(:@full_gem_path, Spec::Path.source_root.to_s)
 bundler_gemspec.activate if bundler_gemspec.respond_to?(:activate)
diff --git a/spec/bundler/support/artifice/compact_index_checksum_mismatch.rb b/spec/bundler/support/artifice/compact_index_checksum_mismatch.rb
index a6545b9ee4b574..83b147d2aecc96 100644
--- a/spec/bundler/support/artifice/compact_index_checksum_mismatch.rb
+++ b/spec/bundler/support/artifice/compact_index_checksum_mismatch.rb
@@ -4,10 +4,10 @@
 
 class CompactIndexChecksumMismatch < CompactIndexAPI
   get "/versions" do
-    headers "ETag" => quote("123")
+    headers "Repr-Digest" => "sha-256=:ungWv48Bz+pBQUDeXa4iI7ADYaOWF3qctBD/YfIAFa0=:"
     headers "Surrogate-Control" => "max-age=2592000, stale-while-revalidate=60"
     content_type "text/plain"
-    body ""
+    body "content does not match the checksum"
   end
 end
 
diff --git a/spec/bundler/support/artifice/compact_index_concurrent_download.rb b/spec/bundler/support/artifice/compact_index_concurrent_download.rb
index 35548f278c8232..5d55b8a72b0d8c 100644
--- a/spec/bundler/support/artifice/compact_index_concurrent_download.rb
+++ b/spec/bundler/support/artifice/compact_index_concurrent_download.rb
@@ -7,11 +7,12 @@ class CompactIndexConcurrentDownload < CompactIndexAPI
     versions = File.join(Bundler.rubygems.user_home, ".bundle", "cache", "compact_index",
       "localgemserver.test.80.dd34752a738ee965a2a4298dc16db6c5", "versions")
 
-    # Verify the original (empty) content hasn't been deleted, e.g. on a retry
-    File.binread(versions) == "" || raise("Original file should be present and empty")
+    # Verify the original content hasn't been deleted, e.g. on a retry
+    data = File.binread(versions)
+    data == "created_at" || raise("Original file should be present with expected content")
 
     # Verify this is only requested once for a partial download
-    env["HTTP_RANGE"] || raise("Missing Range header for expected partial download")
+    env["HTTP_RANGE"] == "bytes=#{data.bytesize - 1}-" || raise("Missing Range header for expected partial download")
 
     # Overwrite the file in parallel, which should be then overwritten
     # after a successful download to prevent corruption
diff --git a/spec/bundler/support/artifice/compact_index_creds_diff_host.rb b/spec/bundler/support/artifice/compact_index_creds_diff_host.rb
index 401e8a98d8d9df..282e9c8961388a 100644
--- a/spec/bundler/support/artifice/compact_index_creds_diff_host.rb
+++ b/spec/bundler/support/artifice/compact_index_creds_diff_host.rb
@@ -24,7 +24,7 @@ def protected!
   end
 
   get "/gems/:id" do
-    redirect "http://diffhost.com/no/creds/#{params[:id]}"
+    redirect "http://diffhost.test/no/creds/#{params[:id]}"
   end
 
   get "/no/creds/:id" do
diff --git a/spec/bundler/support/artifice/compact_index_etag_match.rb b/spec/bundler/support/artifice/compact_index_etag_match.rb
new file mode 100644
index 00000000000000..08d7b5ec539129
--- /dev/null
+++ b/spec/bundler/support/artifice/compact_index_etag_match.rb
@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+require_relative "helpers/compact_index"
+
+class CompactIndexEtagMatch < CompactIndexAPI
+  get "/versions" do
+    raise "ETag header should be present" unless env["HTTP_IF_NONE_MATCH"]
+    headers "ETag" => env["HTTP_IF_NONE_MATCH"]
+    status 304
+    body ""
+  end
+end
+
+require_relative "helpers/artifice"
+
+Artifice.activate_with(CompactIndexEtagMatch)
diff --git a/spec/bundler/support/artifice/compact_index_host_redirect.rb b/spec/bundler/support/artifice/compact_index_host_redirect.rb
index 9a711186dbb155..4f82bf38121946 100644
--- a/spec/bundler/support/artifice/compact_index_host_redirect.rb
+++ b/spec/bundler/support/artifice/compact_index_host_redirect.rb
@@ -3,7 +3,7 @@
 require_relative "helpers/compact_index"
 
 class CompactIndexHostRedirect < CompactIndexAPI
-  get "/fetch/actual/gem/:id", :host_name => "localgemserver.test" do
+  get "/fetch/actual/gem/:id", host_name: "localgemserver.test" do
     redirect "http://bundler.localgemserver.test#{request.path_info}"
   end
 
diff --git a/spec/bundler/support/artifice/compact_index_mirror_down.rb b/spec/bundler/support/artifice/compact_index_mirror_down.rb
new file mode 100644
index 00000000000000..88983c715d169e
--- /dev/null
+++ b/spec/bundler/support/artifice/compact_index_mirror_down.rb
@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+require_relative "helpers/compact_index"
+require_relative "helpers/artifice"
+require_relative "helpers/rack_request"
+
+module Artifice
+  module Net
+    class HTTPMirrorDown < HTTP
+      def connect
+        raise SocketError if address == "gem.mirror"
+
+        super
+      end
+    end
+
+    HTTP.endpoint = CompactIndexAPI
+  end
+
+  replace_net_http(Net::HTTPMirrorDown)
+end
diff --git a/spec/bundler/support/artifice/compact_index_no_checksums.rb b/spec/bundler/support/artifice/compact_index_no_checksums.rb
new file mode 100644
index 00000000000000..ecb7fc7d7c347c
--- /dev/null
+++ b/spec/bundler/support/artifice/compact_index_no_checksums.rb
@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+require_relative "helpers/compact_index"
+
+class CompactIndexNoChecksums < CompactIndexAPI
+  get "/info/:name" do
+    etag_response do
+      gem = gems.find {|g| g.name == params[:name] }
+      gem.versions.map(&:number).join("\n")
+    end
+  end
+end
+
+require_relative "helpers/artifice"
+
+Artifice.activate_with(CompactIndexNoChecksums)
diff --git a/spec/bundler/support/artifice/compact_index_partial_update.rb b/spec/bundler/support/artifice/compact_index_partial_update.rb
index 8c73011346b2ce..f111d91ef94ba8 100644
--- a/spec/bundler/support/artifice/compact_index_partial_update.rb
+++ b/spec/bundler/support/artifice/compact_index_partial_update.rb
@@ -23,7 +23,7 @@ def not_modified?(_checksum)
     # Verify that a partial request is made, starting from the index of the
     # final byte of the cached file.
     unless env["HTTP_RANGE"] == "bytes=#{File.binread(cached_versions_path).bytesize - 1}-"
-      raise("Range header should be present, and start from the index of the final byte of the cache.")
+      raise("Range header should be present, and start from the index of the final byte of the cache. #{env["HTTP_RANGE"].inspect}")
     end
 
     etag_response do
diff --git a/spec/bundler/support/artifice/compact_index_partial_update_bad_digest.rb b/spec/bundler/support/artifice/compact_index_partial_update_bad_digest.rb
new file mode 100644
index 00000000000000..ac04336636f442
--- /dev/null
+++ b/spec/bundler/support/artifice/compact_index_partial_update_bad_digest.rb
@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+require_relative "helpers/compact_index"
+
+# The purpose of this Artifice is to test that an incremental response is invalidated
+# and a second request is issued for the full content.
+class CompactIndexPartialUpdateBadDigest < CompactIndexAPI
+  def partial_update_bad_digest
+    response_body = yield
+    if request.env["HTTP_RANGE"]
+      headers "Repr-Digest" => "sha-256=:#{Digest::SHA256.base64digest("wrong digest on ranged request")}:"
+    else
+      headers "Repr-Digest" => "sha-256=:#{Digest::SHA256.base64digest(response_body)}:"
+    end
+    headers "Surrogate-Control" => "max-age=2592000, stale-while-revalidate=60"
+    content_type "text/plain"
+    requested_range_for(response_body)
+  end
+
+  get "/versions" do
+    partial_update_bad_digest do
+      file = tmp("versions.list")
+      FileUtils.rm_f(file)
+      file = CompactIndex::VersionsFile.new(file.to_s)
+      file.create(gems)
+      file.contents([], calculate_info_checksums: true)
+    end
+  end
+
+  get "/info/:name" do
+    partial_update_bad_digest do
+      gem = gems.find {|g| g.name == params[:name] }
+      CompactIndex.info(gem ? gem.versions : [])
+    end
+  end
+end
+
+require_relative "helpers/artifice"
+
+Artifice.activate_with(CompactIndexPartialUpdateBadDigest)
diff --git a/spec/bundler/support/artifice/compact_index_partial_update_no_digest_not_incremental.rb b/spec/bundler/support/artifice/compact_index_partial_update_no_digest_not_incremental.rb
new file mode 100644
index 00000000000000..99bae039f0f4b7
--- /dev/null
+++ b/spec/bundler/support/artifice/compact_index_partial_update_no_digest_not_incremental.rb
@@ -0,0 +1,42 @@
+# frozen_string_literal: true
+
+require_relative "helpers/compact_index"
+
+# The purpose of this Artifice is to test that an incremental response  is ignored
+# when the digest is not present to verify that the partial response is valid.
+class CompactIndexPartialUpdateNoDigestNotIncremental < CompactIndexAPI
+  def partial_update_no_digest
+    response_body = yield
+    headers "Surrogate-Control" => "max-age=2592000, stale-while-revalidate=60"
+    content_type "text/plain"
+    requested_range_for(response_body)
+  end
+
+  get "/versions" do
+    partial_update_no_digest do
+      file = tmp("versions.list")
+      FileUtils.rm_f(file)
+      file = CompactIndex::VersionsFile.new(file.to_s)
+      file.create(gems)
+      lines = file.contents([], calculate_info_checksums: true).split("\n")
+      name, versions, checksum = lines.last.split(" ")
+
+      # shuffle versions so new versions are not appended to the end
+      [*lines[0..-2], [name, versions.split(",").reverse.join(","), checksum].join(" ")].join("\n")
+    end
+  end
+
+  get "/info/:name" do
+    partial_update_no_digest do
+      gem = gems.find {|g| g.name == params[:name] }
+      lines = CompactIndex.info(gem ? gem.versions : []).split("\n")
+
+      # shuffle versions so new versions are not appended to the end
+      [lines.first, lines.last, *lines[1..-2]].join("\n")
+    end
+  end
+end
+
+require_relative "helpers/artifice"
+
+Artifice.activate_with(CompactIndexPartialUpdateNoDigestNotIncremental)
diff --git a/spec/bundler/support/artifice/compact_index_partial_update_no_etag_not_incremental.rb b/spec/bundler/support/artifice/compact_index_partial_update_no_etag_not_incremental.rb
deleted file mode 100644
index 20546ba4c3a80b..00000000000000
--- a/spec/bundler/support/artifice/compact_index_partial_update_no_etag_not_incremental.rb
+++ /dev/null
@@ -1,40 +0,0 @@
-# frozen_string_literal: true
-
-require_relative "helpers/compact_index"
-
-class CompactIndexPartialUpdateNoEtagNotIncremental < CompactIndexAPI
-  def partial_update_no_etag
-    response_body = yield
-    headers "Surrogate-Control" => "max-age=2592000, stale-while-revalidate=60"
-    content_type "text/plain"
-    requested_range_for(response_body)
-  end
-
-  get "/versions" do
-    partial_update_no_etag do
-      file = tmp("versions.list")
-      FileUtils.rm_f(file)
-      file = CompactIndex::VersionsFile.new(file.to_s)
-      file.create(gems)
-      lines = file.contents([], :calculate_info_checksums => true).split("\n")
-      name, versions, checksum = lines.last.split(" ")
-
-      # shuffle versions so new versions are not appended to the end
-      [*lines[0..-2], [name, versions.split(",").reverse.join(","), checksum].join(" ")].join("\n")
-    end
-  end
-
-  get "/info/:name" do
-    partial_update_no_etag do
-      gem = gems.find {|g| g.name == params[:name] }
-      lines = CompactIndex.info(gem ? gem.versions : []).split("\n")
-
-      # shuffle versions so new versions are not appended to the end
-      [lines.first, lines.last, *lines[1..-2]].join("\n")
-    end
-  end
-end
-
-require_relative "helpers/artifice"
-
-Artifice.activate_with(CompactIndexPartialUpdateNoEtagNotIncremental)
diff --git a/spec/bundler/support/artifice/compact_index_range_ignored.rb b/spec/bundler/support/artifice/compact_index_range_ignored.rb
new file mode 100644
index 00000000000000..2303682c1f21f7
--- /dev/null
+++ b/spec/bundler/support/artifice/compact_index_range_ignored.rb
@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+require_relative "helpers/compact_index"
+
+class CompactIndexRangeIgnored < CompactIndexAPI
+  # Stub the server to not return 304 so that we don't bypass all the logic
+  def not_modified?(_checksum)
+    false
+  end
+
+  get "/versions" do
+    cached_versions_path = File.join(
+      Bundler.rubygems.user_home, ".bundle", "cache", "compact_index",
+      "localgemserver.test.80.dd34752a738ee965a2a4298dc16db6c5", "versions"
+    )
+
+    # Verify a cached copy of the versions file exists
+    unless File.binread(cached_versions_path).size > 0
+      raise("Cached versions file should be present and have content")
+    end
+
+    # Verify that a partial request is made, starting from the index of the
+    # final byte of the cached file.
+    unless env.delete("HTTP_RANGE")
+      raise("Expected client to write the full response on the first try")
+    end
+
+    etag_response do
+      file = tmp("versions.list")
+      FileUtils.rm_f(file)
+      file = CompactIndex::VersionsFile.new(file.to_s)
+      file.create(gems)
+      file.contents
+    end
+  end
+end
+
+require_relative "helpers/artifice"
+
+Artifice.activate_with(CompactIndexRangeIgnored)
diff --git a/spec/bundler/support/artifice/compact_index_wrong_gem_checksum.rb b/spec/bundler/support/artifice/compact_index_wrong_gem_checksum.rb
index acc13a56ff1ca2..9bd2ca0a9d6db9 100644
--- a/spec/bundler/support/artifice/compact_index_wrong_gem_checksum.rb
+++ b/spec/bundler/support/artifice/compact_index_wrong_gem_checksum.rb
@@ -7,7 +7,8 @@ class CompactIndexWrongGemChecksum < CompactIndexAPI
     etag_response do
       name = params[:name]
       gem = gems.find {|g| g.name == name }
-      checksum = ENV.fetch("BUNDLER_SPEC_#{name.upcase}_CHECKSUM") { "ab" * 22 }
+      # This generates the hexdigest "2222222222222222222222222222222222222222222222222222222222222222"
+      checksum = ENV.fetch("BUNDLER_SPEC_#{name.upcase}_CHECKSUM") { "IiIiIiIiIiIiIiIiIiIiIiIiIiIiIiIiIiIiIiIiIiI=" }
       versions = gem ? gem.versions : []
       versions.each {|v| v.checksum = checksum }
       CompactIndex.info(versions)
diff --git a/spec/bundler/support/artifice/endpoint_500.rb b/spec/bundler/support/artifice/endpoint_500.rb
index d8ab6b65bcf871..9dd373bbf6e075 100644
--- a/spec/bundler/support/artifice/endpoint_500.rb
+++ b/spec/bundler/support/artifice/endpoint_500.rb
@@ -2,7 +2,7 @@
 
 require_relative "../path"
 
-$LOAD_PATH.unshift(*Dir[Spec::Path.base_system_gem_path.join("gems/{mustermann,rack,tilt,sinatra,ruby2_keywords}-*/lib")].map(&:to_s))
+$LOAD_PATH.unshift(*Spec::Path.sinatra_dependency_paths)
 
 require "sinatra/base"
 
diff --git a/spec/bundler/support/artifice/endpoint_creds_diff_host.rb b/spec/bundler/support/artifice/endpoint_creds_diff_host.rb
index ce30de0a68c5e9..9cbb4de61aa651 100644
--- a/spec/bundler/support/artifice/endpoint_creds_diff_host.rb
+++ b/spec/bundler/support/artifice/endpoint_creds_diff_host.rb
@@ -24,7 +24,7 @@ def protected!
   end
 
   get "/gems/:id" do
-    redirect "http://diffhost.com/no/creds/#{params[:id]}"
+    redirect "http://diffhost.test/no/creds/#{params[:id]}"
   end
 
   get "/no/creds/:id" do
diff --git a/spec/bundler/support/artifice/endpoint_host_redirect.rb b/spec/bundler/support/artifice/endpoint_host_redirect.rb
index 0efb6cda02ecdd..6ce51bed930d4b 100644
--- a/spec/bundler/support/artifice/endpoint_host_redirect.rb
+++ b/spec/bundler/support/artifice/endpoint_host_redirect.rb
@@ -3,7 +3,7 @@
 require_relative "helpers/endpoint"
 
 class EndpointHostRedirect < Endpoint
-  get "/fetch/actual/gem/:id", :host_name => "localgemserver.test" do
+  get "/fetch/actual/gem/:id", host_name: "localgemserver.test" do
     redirect "http://bundler.localgemserver.test#{request.path_info}"
   end
 
diff --git a/spec/bundler/support/artifice/endpoint_mirror_source.rb b/spec/bundler/support/artifice/endpoint_mirror_source.rb
index 6ea1a77eca7047..fed7a746b984e9 100644
--- a/spec/bundler/support/artifice/endpoint_mirror_source.rb
+++ b/spec/bundler/support/artifice/endpoint_mirror_source.rb
@@ -4,7 +4,7 @@
 
 class EndpointMirrorSource < Endpoint
   get "/gems/:id" do
-    if request.env["HTTP_X_GEMFILE_SOURCE"] == "https://server.example.org/"
+    if request.env["HTTP_X_GEMFILE_SOURCE"] == "https://server.example.org/" && request.env["HTTP_USER_AGENT"].start_with?("bundler")
       File.binread("#{gem_repo1}/gems/#{params[:id]}")
     else
       halt 500
diff --git a/spec/bundler/support/artifice/fail.rb b/spec/bundler/support/artifice/fail.rb
index 6286e43fbddae0..5ddbc4e5905c1a 100644
--- a/spec/bundler/support/artifice/fail.rb
+++ b/spec/bundler/support/artifice/fail.rb
@@ -1,11 +1,11 @@
 # frozen_string_literal: true
 
-require "net/http"
+require_relative "../vendored_net_http"
 
-class Fail < Net::HTTP
-  # Net::HTTP uses a @newimpl instance variable to decide whether
+class Fail < Gem::Net::HTTP
+  # Gem::Net::HTTP uses a @newimpl instance variable to decide whether
   # to use a legacy implementation. Since we are subclassing
-  # Net::HTTP, we must set it
+  # Gem::Net::HTTP, we must set it
   @newimpl = true
 
   def request(req, body = nil, &block)
@@ -17,13 +17,11 @@ def connect
   end
 
   def exception(req)
-    name = ENV.fetch("BUNDLER_SPEC_EXCEPTION") { "Errno::ENETUNREACH" }
-    const = name.split("::").reduce(Object) {|mod, sym| mod.const_get(sym) }
-    const.new("host down: Bundler spec artifice fail! #{req["PATH_INFO"]}")
+    Errno::ENETUNREACH.new("host down: Bundler spec artifice fail! #{req["PATH_INFO"]}")
   end
 end
 
 require_relative "helpers/artifice"
 
-# Replace Net::HTTP with our failing subclass
+# Replace Gem::Net::HTTP with our failing subclass
 Artifice.replace_net_http(::Fail)
diff --git a/spec/bundler/support/artifice/helpers/artifice.rb b/spec/bundler/support/artifice/helpers/artifice.rb
index b8c78614fb63b9..788268295c7d94 100644
--- a/spec/bundler/support/artifice/helpers/artifice.rb
+++ b/spec/bundler/support/artifice/helpers/artifice.rb
@@ -4,7 +4,7 @@
 module Artifice
   # Activate Artifice with a particular Rack endpoint.
   #
-  # Calling this method will replace the Net::HTTP system
+  # Calling this method will replace the Gem::Net::HTTP system
   # with a replacement that routes all requests to the
   # Rack endpoint.
   #
@@ -18,11 +18,11 @@ def self.activate_with(endpoint)
 
   # Deactivate the Artifice replacement.
   def self.deactivate
-    replace_net_http(::Net::HTTP)
+    replace_net_http(::Gem::Net::HTTP)
   end
 
   def self.replace_net_http(value)
-    ::Net.class_eval do
+    ::Gem::Net.class_eval do
       remove_const(:HTTP)
       const_set(:HTTP, value)
     end
diff --git a/spec/bundler/support/artifice/helpers/compact_index.rb b/spec/bundler/support/artifice/helpers/compact_index.rb
index 4df47a9659de49..e61fe921ec3b05 100644
--- a/spec/bundler/support/artifice/helpers/compact_index.rb
+++ b/spec/bundler/support/artifice/helpers/compact_index.rb
@@ -2,8 +2,9 @@
 
 require_relative "endpoint"
 
-$LOAD_PATH.unshift Dir[Spec::Path.base_system_gem_path.join("gems/compact_index*/lib")].first.to_s
+$LOAD_PATH.unshift Dir[Spec::Path.scoped_base_system_gem_path.join("gems/compact_index*/lib")].first.to_s
 require "compact_index"
+require "digest"
 
 class CompactIndexAPI < Endpoint
   helpers do
@@ -17,9 +18,10 @@ def load_spec(name, version, platform, gem_repo)
 
     def etag_response
       response_body = yield
-      checksum = Digest(:MD5).hexdigest(response_body)
-      return if not_modified?(checksum)
-      headers "ETag" => quote(checksum)
+      etag = Digest::MD5.hexdigest(response_body)
+      headers "ETag" => quote(etag)
+      return if not_modified?(etag)
+      headers "Repr-Digest" => "sha-256=:#{Digest::SHA256.base64digest(response_body)}:"
       headers "Surrogate-Control" => "max-age=2592000, stale-while-revalidate=60"
       content_type "text/plain"
       requested_range_for(response_body)
@@ -29,17 +31,16 @@ def etag_response
       raise
     end
 
-    def not_modified?(checksum)
+    def not_modified?(etag)
       etags = parse_etags(request.env["HTTP_IF_NONE_MATCH"])
 
-      return unless etags.include?(checksum)
-      headers "ETag" => quote(checksum)
+      return unless etags.include?(etag)
       status 304
       body ""
     end
 
     def requested_range_for(response_body)
-      ranges = Rack::Utils.byte_ranges(env, response_body.bytesize)
+      ranges = Rack::Utils.get_byte_ranges(env["HTTP_RANGE"], response_body.bytesize)
 
       if ranges
         status 206
@@ -66,24 +67,29 @@ def gems(gem_repo = default_gem_repo)
       @gems ||= {}
       @gems[gem_repo] ||= begin
         specs = Bundler::Deprecate.skip_during do
-          %w[specs.4.8 prerelease_specs.4.8].map do |filename|
-            Marshal.load(File.open(gem_repo.join(filename)).read).map do |name, version, platform|
+          %w[specs.4.8 prerelease_specs.4.8].flat_map do |filename|
+            spec_index = gem_repo.join(filename)
+            next [] unless File.exist?(spec_index)
+
+            Marshal.load(File.binread(spec_index)).map do |name, version, platform|
               load_spec(name, version, platform, gem_repo)
             end
-          end.flatten
+          end
         end
 
         specs.group_by(&:name).map do |name, versions|
           gem_versions = versions.map do |spec|
-            deps = spec.dependencies.select {|d| d.type == :runtime }.map do |d|
+            deps = spec.runtime_dependencies.map do |d|
               reqs = d.requirement.requirements.map {|r| r.join(" ") }.join(", ")
               CompactIndex::Dependency.new(d.name, reqs)
             end
-            checksum = begin
-                         Digest(:SHA256).file("#{gem_repo}/gems/#{spec.original_name}.gem").base64digest
-                       rescue StandardError
-                         nil
-                       end
+            begin
+              checksum = ENV.fetch("BUNDLER_SPEC_#{name.upcase}_CHECKSUM") do
+                Digest(:SHA256).file("#{gem_repo}/gems/#{spec.original_name}.gem").hexdigest
+              end
+            rescue StandardError
+              checksum = nil
+            end
             CompactIndex::GemVersion.new(spec.version.version, spec.platform.to_s, checksum, nil,
               deps, spec.required_ruby_version.to_s, spec.required_rubygems_version.to_s)
           end
diff --git a/spec/bundler/support/artifice/helpers/endpoint.rb b/spec/bundler/support/artifice/helpers/endpoint.rb
index fc0381dc38e4df..9590611dfe237e 100644
--- a/spec/bundler/support/artifice/helpers/endpoint.rb
+++ b/spec/bundler/support/artifice/helpers/endpoint.rb
@@ -2,7 +2,7 @@
 
 require_relative "../../path"
 
-$LOAD_PATH.unshift(*Dir[Spec::Path.base_system_gem_path.join("gems/{mustermann,rack,tilt,sinatra,ruby2_keywords}-*/lib")].map(&:to_s))
+$LOAD_PATH.unshift(*Spec::Path.sinatra_dependency_paths)
 
 require "sinatra/base"
 
@@ -27,6 +27,7 @@ def self.all_requests
 
   set :raise_errors, true
   set :show_exceptions, false
+  set :host_authorization, permitted_hosts: [".example.org", ".local", ".mirror", ".repo", ".repo1", ".repo2", ".repo3", ".repo4", ".rubygems.org", ".security", ".source", ".test", "127.0.0.1"]
 
   def call!(*)
     super.tap do
@@ -62,21 +63,21 @@ def dependencies_for(gem_names, gem_repo = default_gem_repo)
       return [] if gem_names.nil? || gem_names.empty?
 
       all_specs = %w[specs.4.8 prerelease_specs.4.8].map do |filename|
-        Marshal.load(File.open(gem_repo.join(filename)).read)
+        Marshal.load(File.binread(gem_repo.join(filename)))
       end.inject(:+)
 
-      all_specs.map do |name, version, platform|
+      all_specs.filter_map do |name, version, platform|
         spec = load_spec(name, version, platform, gem_repo)
         next unless gem_names.include?(spec.name)
         {
-          :name => spec.name,
-          :number => spec.version.version,
-          :platform => spec.platform.to_s,
-          :dependencies => spec.dependencies.select {|dep| dep.type == :runtime }.map do |dep|
+          name: spec.name,
+          number: spec.version.version,
+          platform: spec.platform.to_s,
+          dependencies: spec.runtime_dependencies.map do |dep|
             [dep.name, dep.requirement.requirements.map {|a| a.join(" ") }.join(", ")]
           end,
         }
-      end.compact
+      end
     end
 
     def load_spec(name, version, platform, gem_repo)
diff --git a/spec/bundler/support/artifice/helpers/rack_request.rb b/spec/bundler/support/artifice/helpers/rack_request.rb
index c4a07812a6a817..05ff034463f614 100644
--- a/spec/bundler/support/artifice/helpers/rack_request.rb
+++ b/spec/bundler/support/artifice/helpers/rack_request.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require "rack/test"
-require "net/http"
+require_relative "../../vendored_net_http"
 
 module Artifice
   module Net
@@ -16,25 +16,25 @@ def initialize(app)
       end
     end
 
-    class HTTP < ::Net::HTTP
+    class HTTP < ::Gem::Net::HTTP
       class << self
         attr_accessor :endpoint
       end
 
-      # Net::HTTP uses a @newimpl instance variable to decide whether
+      # Gem::Net::HTTP uses a @newimpl instance variable to decide whether
       # to use a legacy implementation. Since we are subclassing
-      # Net::HTTP, we must set it
+      # Gem::Net::HTTP, we must set it
       @newimpl = true
 
       # We don't need to connect, so blank out this method
       def connect
       end
 
-      # Replace the Net::HTTP request method with a method
+      # Replace the Gem::Net::HTTP request method with a method
       # that converts the request into a Rack request and
       # dispatches it to the Rack endpoint.
       #
-      # @param [Net::HTTPRequest] req A Net::HTTPRequest
+      # @param [Net::HTTPRequest] req A Gem::Net::HTTPRequest
       #   object, or one if its subclasses
       # @param [optional, String, #read] body This should
       #   be sent as "rack.input". If it's a String, it will
@@ -42,7 +42,7 @@ def connect
       # @return [Net::HTTPResponse]
       #
       # @yield [Net::HTTPResponse] If a block is provided,
-      #   this method will yield the Net::HTTPResponse to
+      #   this method will yield the Gem::Net::HTTPResponse to
       #   it after the body is read.
       def request(req, body = nil, &block)
         rack_request = RackRequest.new(self.class.endpoint)
@@ -56,17 +56,17 @@ def request(req, body = nil, &block)
         body_stream_contents = req.body_stream.read if req.body_stream
 
         response = rack_request.request("#{prefix}#{req.path}",
-          { :method => req.method, :input => body || req.body || body_stream_contents })
+          { method: req.method, input: body || req.body || body_stream_contents })
 
         make_net_http_response(response, &block)
       end
 
       private
 
-      # This method takes a Rack response and creates a Net::HTTPResponse
+      # This method takes a Rack response and creates a Gem::Net::HTTPResponse
       # Instead of trying to mock HTTPResponse directly, we just convert
       # the Rack response into a String that looks like a normal HTTP
-      # response and call Net::HTTPResponse.read_new
+      # response and call Gem::Net::HTTPResponse.read_new
       #
       # @param [Array(#to_i, Hash, #each)] response a Rack response
       # @return [Net::HTTPResponse]
@@ -86,8 +86,8 @@ def make_net_http_response(response)
 
         response_string << "" << body
 
-        response_io = ::Net::BufferedIO.new(StringIO.new(response_string.join("\n")))
-        res = ::Net::HTTPResponse.read_new(response_io)
+        response_io = ::Gem::Net::BufferedIO.new(StringIO.new(response_string.join("\n")))
+        res = ::Gem::Net::HTTPResponse.read_new(response_io)
 
         res.reading_body(response_io, true) do
           yield res if block_given?
diff --git a/spec/bundler/support/artifice/vcr.rb b/spec/bundler/support/artifice/vcr.rb
index 6a346f1ff96553..2386a4c6b73d97 100644
--- a/spec/bundler/support/artifice/vcr.rb
+++ b/spec/bundler/support/artifice/vcr.rb
@@ -1,13 +1,13 @@
 # frozen_string_literal: true
 
-require "net/http"
+require_relative "../vendored_net_http"
 require_relative "../path"
 
-CASSETTE_PATH = "#{Spec::Path.spec_dir}/support/artifice/vcr_cassettes"
-USED_CASSETTES_PATH = "#{Spec::Path.spec_dir}/support/artifice/used_cassettes.txt"
+CASSETTE_PATH = "#{Spec::Path.spec_dir}/support/artifice/vcr_cassettes".freeze
+USED_CASSETTES_PATH = "#{Spec::Path.spec_dir}/support/artifice/used_cassettes.txt".freeze
 CASSETTE_NAME = ENV.fetch("BUNDLER_SPEC_VCR_CASSETTE_NAME") { "realworld" }
 
-class BundlerVCRHTTP < Net::HTTP
+class BundlerVCRHTTP < Gem::Net::HTTP
   class RequestHandler
     attr_reader :http, :request, :body, :response_block
     def initialize(http, request, body = nil, &response_block)
@@ -41,8 +41,8 @@ def recorded_response?
 
     def recorded_response
       File.open(request_pair_paths.last, "rb:ASCII-8BIT") do |response_file|
-        response_io = ::Net::BufferedIO.new(response_file)
-        ::Net::HTTPResponse.read_new(response_io).tap do |response|
+        response_io = ::Gem::Net::BufferedIO.new(response_file)
+        ::Gem::Net::HTTPResponse.read_new(response_io).tap do |response|
           response.decode_content = request.decode_content if request.respond_to?(:decode_content)
           response.uri = request.uri
 
@@ -148,5 +148,5 @@ def request_with_vcr(request, *args, &block)
 
 require_relative "helpers/artifice"
 
-# Replace Net::HTTP with our VCR subclass
+# Replace Gem::Net::HTTP with our VCR subclass
 Artifice.replace_net_http(BundlerVCRHTTP)
diff --git a/spec/bundler/support/artifice/windows.rb b/spec/bundler/support/artifice/windows.rb
index 4d90e0a4266c63..3056540beb2512 100644
--- a/spec/bundler/support/artifice/windows.rb
+++ b/spec/bundler/support/artifice/windows.rb
@@ -2,7 +2,7 @@
 
 require_relative "../path"
 
-$LOAD_PATH.unshift(*Dir[Spec::Path.base_system_gem_path.join("gems/{mustermann,rack,tilt,sinatra,ruby2_keywords}-*/lib")].map(&:to_s))
+$LOAD_PATH.unshift(*Spec::Path.sinatra_dependency_paths)
 
 require "sinatra/base"
 
diff --git a/spec/bundler/support/build_metadata.rb b/spec/bundler/support/build_metadata.rb
index 98d8ac23c893d4..2eade4137bd68f 100644
--- a/spec/bundler/support/build_metadata.rb
+++ b/spec/bundler/support/build_metadata.rb
@@ -8,22 +8,21 @@ module BuildMetadata
     include Spec::Path
     include Spec::Helpers
 
-    def write_build_metadata(dir: source_root)
+    def write_build_metadata(dir: source_root, version: Bundler::VERSION)
       build_metadata = {
-        :git_commit_sha => git_commit_sha,
-        :built_at => loaded_gemspec.date.utc.strftime("%Y-%m-%d"),
-        :release => true,
+        git_commit_sha: git_commit_sha,
+        built_at: release_date_for(version, dir: dir),
       }
 
-      replace_build_metadata(build_metadata, dir: dir) # rubocop:disable Style/HashSyntax
+      replace_build_metadata(build_metadata, dir: dir)
     end
 
     def reset_build_metadata(dir: source_root)
       build_metadata = {
-        :release => false,
+        built_at: nil,
       }
 
-      replace_build_metadata(build_metadata, dir: dir) # rubocop:disable Style/HashSyntax
+      replace_build_metadata(build_metadata, dir: dir)
     end
 
     private
@@ -41,7 +40,12 @@ def replace_build_metadata(build_metadata, dir:)
     end
 
     def git_commit_sha
-      ruby_core_tarball? ? "unknown" : sys_exec("git rev-parse --short HEAD", :dir => source_root).strip
+      ruby_core_tarball? ? "unknown" : git("rev-parse --short HEAD", source_root).strip
+    end
+
+    def release_date_for(version, dir:)
+      changelog = File.expand_path("CHANGELOG.md", dir)
+      File.readlines(changelog)[2].scan(/^## #{Regexp.escape(version)} \((.*)\)/).first&.first if File.exist?(changelog)
     end
 
     extend self
diff --git a/spec/bundler/support/builders.rb b/spec/bundler/support/builders.rb
index 7b91aaef57de79..5cfbed3864c39c 100644
--- a/spec/bundler/support/builders.rb
+++ b/spec/bundler/support/builders.rb
@@ -3,8 +3,15 @@
 require "bundler/shared_helpers"
 require "shellwords"
 
+require_relative "build_metadata"
+
 module Spec
   module Builders
+    def self.extended(mod)
+      mod.extend Path
+      mod.extend Helpers
+    end
+
     def self.constantize(name)
       name.delete("-").upcase
     end
@@ -18,8 +25,6 @@ def pl(platform)
     end
 
     def build_repo1
-      rake_path = Dir["#{Path.base_system_gems}/**/rake*.gem"].first
-
       build_repo gem_repo1 do
         FileUtils.cp rake_path, "#{gem_repo1}/gems/"
 
@@ -28,28 +33,28 @@ def build_repo1
         build_gem "puma"
         build_gem "minitest"
 
-        build_gem "rack", %w[0.9.1 1.0.0] do |s|
-          s.executables = "rackup"
-          s.post_install_message = "Rack's post install message"
+        build_gem "myrack", %w[0.9.1 1.0.0] do |s|
+          s.executables = "myrackup"
+          s.post_install_message = "Myrack's post install message"
         end
 
         build_gem "thin" do |s|
-          s.add_dependency "rack"
+          s.add_dependency "myrack"
           s.post_install_message = "Thin's post install message"
         end
 
-        build_gem "rack-obama" do |s|
-          s.add_dependency "rack"
-          s.post_install_message = "Rack-obama's post install message"
+        build_gem "myrack-obama" do |s|
+          s.add_dependency "myrack"
+          s.post_install_message = "Myrack-obama's post install message"
         end
 
-        build_gem "rack_middleware", "1.0" do |s|
-          s.add_dependency "rack", "0.9.1"
+        build_gem "myrack_middleware", "1.0" do |s|
+          s.add_dependency "myrack", "0.9.1"
         end
 
         build_gem "rails", "2.3.2" do |s|
           s.executables = "rails"
-          s.add_dependency "rake",           "13.0.1"
+          s.add_dependency "rake",           rake_version
           s.add_dependency "actionpack",     "2.3.2"
           s.add_dependency "activerecord",   "2.3.2"
           s.add_dependency "actionmailer",   "2.3.2"
@@ -73,84 +78,66 @@ def build_repo1
           s.add_dependency "activesupport", ">= 2.0.0"
         end
 
-        build_gem "rspec", "1.2.7", :no_default => true do |s|
+        build_gem "rspec", "1.2.7", no_default: true do |s|
           s.write "lib/spec.rb", "SPEC = '1.2.7'"
         end
 
-        build_gem "rack-test", :no_default => true do |s|
-          s.write "lib/rack/test.rb", "RACK_TEST = '1.0'"
-        end
-
-        build_gem "platform_specific" do |s|
-          s.platform = Gem::Platform.local
-          s.write "lib/platform_specific.rb", "PLATFORM_SPECIFIC = '1.0.0 #{Gem::Platform.local}'"
+        build_gem "myrack-test", no_default: true do |s|
+          s.write "lib/myrack/test.rb", "MYRACK_TEST = '1.0'"
         end
 
         build_gem "platform_specific" do |s|
           s.platform = "java"
-          s.write "lib/platform_specific.rb", "PLATFORM_SPECIFIC = '1.0.0 JAVA'"
         end
 
         build_gem "platform_specific" do |s|
           s.platform = "ruby"
-          s.write "lib/platform_specific.rb", "PLATFORM_SPECIFIC = '1.0.0 RUBY'"
         end
 
         build_gem "platform_specific" do |s|
           s.platform = "x86-mswin32"
-          s.write "lib/platform_specific.rb", "PLATFORM_SPECIFIC = '1.0 x86-mswin32'"
         end
 
         build_gem "platform_specific" do |s|
           s.platform = "x64-mswin64"
-          s.write "lib/platform_specific.rb", "PLATFORM_SPECIFIC = '1.0 x64-mswin64'"
         end
 
         build_gem "platform_specific" do |s|
           s.platform = "x86-mingw32"
-          s.write "lib/platform_specific.rb", "PLATFORM_SPECIFIC = '1.0 x86-mingw32'"
         end
 
         build_gem "platform_specific" do |s|
-          s.platform = "x64-mingw32"
-          s.write "lib/platform_specific.rb", "PLATFORM_SPECIFIC = '1.0 x64-mingw32'"
+          s.platform = "x64-mingw-ucrt"
         end
 
         build_gem "platform_specific" do |s|
-          s.platform = "x64-mingw-ucrt"
-          s.write "lib/platform_specific.rb", "PLATFORM_SPECIFIC = '1.0 x64-mingw-ucrt'"
+          s.platform = "aarch64-mingw-ucrt"
         end
 
         build_gem "platform_specific" do |s|
           s.platform = "x86-darwin-100"
-          s.write "lib/platform_specific.rb", "PLATFORM_SPECIFIC = '1.0.0 x86-darwin-100'"
         end
 
         build_gem "only_java", "1.0" do |s|
           s.platform = "java"
-          s.write "lib/only_java.rb", "ONLY_JAVA = '1.0.0 JAVA'"
         end
 
         build_gem "only_java", "1.1" do |s|
           s.platform = "java"
-          s.write "lib/only_java.rb", "ONLY_JAVA = '1.1.0 JAVA'"
         end
 
         build_gem "nokogiri", "1.4.2"
         build_gem "nokogiri", "1.4.2" do |s|
           s.platform = "java"
-          s.write "lib/nokogiri.rb", "NOKOGIRI = '1.4.2 JAVA'"
           s.add_dependency "weakling", ">= 0.0.3"
         end
 
         build_gem "laduradura", "5.15.2"
         build_gem "laduradura", "5.15.2" do |s|
           s.platform = "java"
-          s.write "lib/laduradura.rb", "LADURADURA = '5.15.2 JAVA'"
         end
         build_gem "laduradura", "5.15.3" do |s|
           s.platform = "java"
-          s.write "lib/laduradura.rb", "LADURADURA = '5.15.2 JAVA'"
         end
 
         build_gem "weakling", "0.0.3"
@@ -164,7 +151,7 @@ def build_repo1
 
         build_gem "bundler", "0.9" do |s|
           s.executables = "bundle"
-          s.write "bin/bundle", "puts 'FAIL'"
+          s.write "bin/bundle", "#!/usr/bin/env ruby\nputs 'FAIL'"
         end
 
         # The bundler 0.8 gem has a rubygems plugin that always loads :(
@@ -191,30 +178,41 @@ def build_repo1
       end
     end
 
-    def build_repo2(&blk)
-      FileUtils.rm_rf gem_repo2
-      FileUtils.cp_r gem_repo1, gem_repo2
-      update_repo2(&blk) if block_given?
+    def build_repo2(**kwargs, &blk)
+      FileUtils.cp_r gem_repo1, gem_repo2, remove_destination: true
+      update_repo2(**kwargs, &blk) if block_given?
     end
 
     # A repo that has no pre-installed gems included. (The caller completely
     # determines the contents with the block.)
-    def build_repo4(&blk)
-      FileUtils.rm_rf gem_repo4
-      build_repo(gem_repo4, &blk)
+    def build_repo3(**kwargs, &blk)
+      raise "gem_repo3 already exists -- use update_repo3 instead" if File.exist?(gem_repo3)
+      build_repo gem_repo3, **kwargs, &blk
     end
 
-    def update_repo4(&blk)
-      update_repo(gem_repo4, &blk)
+    # Like build_repo3, this is a repo that has no pre-installed gems included.
+    # We have two different methods for situations where two different empty
+    # sources are needed.
+    def build_repo4(**kwargs, &blk)
+      raise "gem_repo4 already exists -- use update_repo4 instead" if File.exist?(gem_repo4)
+      build_repo gem_repo4, **kwargs, &blk
     end
 
-    def update_repo2(&blk)
-      update_repo(gem_repo2, &blk)
+    def update_repo2(**kwargs, &blk)
+      update_repo(gem_repo2, **kwargs, &blk)
+    end
+
+    def update_repo3(&blk)
+      update_repo(gem_repo3, &blk)
+    end
+
+    def update_repo4(&blk)
+      update_repo(gem_repo4, &blk)
     end
 
     def build_security_repo
       build_repo security_repo do
-        build_gem "rack"
+        build_gem "myrack"
 
         build_gem "signed_gem" do |s|
           cert = "signing-cert.pem"
@@ -227,38 +225,65 @@ def build_security_repo
       end
     end
 
-    def build_repo(path, &blk)
-      return if File.directory?(path)
-
-      FileUtils.mkdir_p("#{path}/gems")
-
-      update_repo(path, &blk)
+    # A minimal fake irb console
+    def build_dummy_irb(version = "9.9.9")
+      build_gem "irb", version do |s|
+        s.write "lib/irb.rb", <<-RUBY
+          class IRB
+            class << self
+              def toplevel_binding
+                unless defined?(@toplevel_binding) && @toplevel_binding
+                  TOPLEVEL_BINDING.eval %{
+                    def self.__irb__; binding; end
+                    IRB.instance_variable_set(:@toplevel_binding, __irb__)
+                    class << self; undef __irb__; end
+                  }
+                end
+                @toplevel_binding.eval('private')
+                @toplevel_binding
+              end
+
+              def __irb__
+                while line = gets
+                  begin
+                    puts eval(line, toplevel_binding).inspect.sub(/^"(.*)"$/, '=> \\1')
+                  rescue Exception => e
+                    puts "\#{e.class}: \#{e.message}"
+                    puts e.backtrace.first
+                  end
+                end
+              end
+              alias start __irb__
+            end
+          end
+        RUBY
+      end
     end
 
-    def check_test_gems!
-      rake_path = Dir["#{Path.base_system_gems}/**/rake*.gem"].first
+    def build_repo(path, **kwargs, &blk)
+      return if File.directory?(path)
 
-      if rake_path.nil?
-        FileUtils.rm_rf(Path.base_system_gems)
-        Spec::Rubygems.install_test_deps
-        rake_path = Dir["#{Path.base_system_gems}/**/rake*.gem"].first
-      end
+      FileUtils.mkdir_p("#{path}/gems")
 
-      if rake_path.nil?
-        abort "Your test gems are missing! Run `rm -rf #{tmp}` and try again."
-      end
+      update_repo(path,**kwargs, &blk)
     end
 
-    def update_repo(path)
-      if path == gem_repo1 && caller.first.split(" ").last == "`build_repo`"
+    def update_repo(path, build_compact_index: true)
+      exempted_caller = Gem.ruby_version >= Gem::Version.new("3.4.0.dev") && RUBY_ENGINE != "jruby" ? "#{Module.nesting.first}#build_repo" : "build_repo"
+      if path == gem_repo1 && caller_locations(1, 1).first.label != exempted_caller
         raise "Updating gem_repo1 is unsupported -- use gem_repo2 instead"
       end
       return unless block_given?
       @_build_path = "#{path}/gems"
       @_build_repo = File.basename(path)
       yield
-      with_gem_path_as Path.base_system_gem_path do
-        gem_command :generate_index, :dir => path
+      with_gem_path_as scoped_base_system_gem_path do
+        Dir[scoped_base_system_gem_path.join("gems/rubygems-generate_index*/lib")].first ||
+          raise("Could not find rubygems-generate_index lib directory in #{scoped_base_system_gem_path}")
+
+        command = "generate_index"
+        command += " --no-compact" if !build_compact_index && gem_command(command + " --help").include?("--[no-]compact")
+        gem_command command, dir: path
       end
     ensure
       @_build_path = nil
@@ -288,6 +313,10 @@ def build_lib(name, *args, &blk)
       build_with(LibBuilder, name, args, &blk)
     end
 
+    def build_bundler(*args, &blk)
+      build_with(BundlerBuilder, "bundler", args, &blk)
+    end
+
     def build_gem(name, *args, &blk)
       build_with(GemBuilder, name, args, &blk)
     end
@@ -393,6 +422,51 @@ def required_ruby_version=(*reqs)
       alias_method :dep, :runtime
     end
 
+    class BundlerBuilder
+      attr_writer :required_ruby_version
+
+      def initialize(context, name, version)
+        raise "can only build bundler" unless name == "bundler"
+
+        @context = context
+        @version = version || Bundler::VERSION
+      end
+
+      def _build(options = {})
+        full_name = "bundler-#{@version}"
+        build_path = @context.tmp + full_name
+        bundler_path = build_path + "#{full_name}.gem"
+
+        require "fileutils"
+        FileUtils.mkdir_p build_path
+
+        @context.shipped_files.each do |shipped_file|
+          target_shipped_file = shipped_file
+          target_shipped_file = shipped_file.sub(/\Alibexec/, "exe") if @context.ruby_core?
+          target_shipped_file = build_path + target_shipped_file
+          target_shipped_dir = File.dirname(target_shipped_file)
+          FileUtils.mkdir_p target_shipped_dir unless File.directory?(target_shipped_dir)
+          FileUtils.cp File.expand_path(shipped_file, @context.source_root), target_shipped_file, preserve: true
+        end
+
+        @context.replace_version_file(@version, dir: build_path)
+        @context.replace_changelog(@version, dir: build_path) if options[:released]
+        @context.replace_required_ruby_version(@required_ruby_version, dir: build_path) if @required_ruby_version
+
+        Spec::BuildMetadata.write_build_metadata(dir: build_path, version: @version)
+
+        @context.gem_command "build #{@context.relative_gemspec}", dir: build_path
+
+        if block_given?
+          yield(bundler_path)
+        else
+          FileUtils.mv bundler_path, options[:path]
+        end
+      ensure
+        build_path.rmtree
+      end
+    end
+
     class LibBuilder
       def initialize(context, name, version)
         @context = context
@@ -406,6 +480,7 @@ def initialize(context, name, version)
           s.email       = "foo@bar.baz"
           s.homepage    = "http://example.com"
           s.license     = "MIT"
+          s.required_ruby_version = ">= 3.0"
         end
         @files = {}
       end
@@ -422,24 +497,17 @@ def executables=(val)
         @spec.executables = Array(val)
         @spec.executables.each do |file|
           executable = "#{@spec.bindir}/#{file}"
-          shebang = if Bundler.current_ruby.jruby?
-            "#!/usr/bin/env jruby\n"
-          else
-            "#!/usr/bin/env ruby\n"
-          end
+          shebang = "#!/usr/bin/env ruby\n"
           @spec.files << executable
           write executable, "#{shebang}require_relative '../lib/#{@name}' ; puts #{Builders.constantize(@name)}"
         end
       end
 
       def add_c_extension
-        require_paths << "ext"
         extensions << "ext/extconf.rb"
         write "ext/extconf.rb", <<-RUBY
           require "mkmf"
 
-          $extout = "$(topdir)/" + RbConfig::CONFIG["EXTOUT"]
-
           extension_name = "#{name}_c"
           if extra_lib_dir = with_config("ext-lib")
             # add extra libpath if --with-ext-lib is
@@ -453,7 +521,7 @@ def add_c_extension
         write "ext/#{name}.c", <<-C
           #include "ruby.h"
 
-          void Init_#{name}_c() {
+          void Init_#{name}_c(void) {
             rb_define_module("#{Builders.constantize(name)}_IN_C");
           }
         C
@@ -464,7 +532,6 @@ def _build(options)
 
         if options[:rubygems_version]
           @spec.rubygems_version = options[:rubygems_version]
-          def @spec.mark_version; end
 
           def @spec.validate(*); end
         end
@@ -483,18 +550,16 @@ def @spec.validate(*); end
         when false
           # do nothing
         when :yaml
-          @spec.files << "#{name}.gemspec"
           @files["#{name}.gemspec"] = @spec.to_yaml
         else
-          @spec.files << "#{name}.gemspec"
           @files["#{name}.gemspec"] = @spec.to_ruby
         end
 
         @files.each do |file, source|
-          file = Pathname.new(path).join(file)
-          FileUtils.mkdir_p(file.dirname)
-          File.open(file, "w") {|f| f.puts source }
-          File.chmod("+x", file) if @spec.executables.map {|exe| "#{@spec.bindir}/#{exe}" }.include?(file)
+          full_path = Pathname.new(path).join(file)
+          FileUtils.mkdir_p(full_path.dirname)
+          File.open(full_path, "w") {|f| f.puts source }
+          FileUtils.chmod("+x", full_path) if @spec.executables.map {|exe| "#{@spec.bindir}/#{exe}" }.include?(file)
         end
         path
       end
@@ -521,7 +586,7 @@ def _build(options)
         default_branch = options[:default_branch] || "main"
         path = options[:path] || _default_path
         source = options[:source] || "git@#{path}"
-        super(options.merge(:path => path, :source => source))
+        super(options.merge(path: path, source: source))
         @context.git("config --global init.defaultBranch #{default_branch}", path)
         @context.git("init", path)
         @context.git("add *", path)
@@ -535,7 +600,7 @@ def _build(options)
     class GitBareBuilder < LibBuilder
       def _build(options)
         path = options[:path] || _default_path
-        super(options.merge(:path => path))
+        super(options.merge(path: path))
         @context.git("init --bare", path)
       end
     end
@@ -560,7 +625,7 @@ def _build(options)
         _default_files.keys.each do |path|
           _default_files[path] += "\n#{Builders.constantize(name)}_PREV_REF = '#{current_ref}'"
         end
-        super(options.merge(:path => libpath, :gemspec => update_gemspec, :source => source))
+        super(options.merge(path: libpath, gemspec: update_gemspec, source: source))
         @context.git("commit -am BUMP", libpath)
       end
     end
@@ -583,25 +648,25 @@ def ref_for(ref, len = nil)
     class GemBuilder < LibBuilder
       def _build(opts)
         lib_path = opts[:lib_path] || @context.tmp(".tmp/#{@spec.full_name}")
-        lib_path = super(opts.merge(:path => lib_path, :no_default => opts[:no_default]))
+        lib_path = super(opts.merge(path: lib_path, no_default: opts[:no_default]))
         destination = opts[:path] || _default_path
         FileUtils.mkdir_p(lib_path.join(destination))
 
-        if opts[:gemspec] == :yaml || opts[:gemspec] == false
+        if [:yaml, false].include?(opts[:gemspec])
           Dir.chdir(lib_path) do
             Bundler.rubygems.build(@spec, opts[:skip_validation])
           end
         elsif opts[:skip_validation]
-          @context.gem_command "build --force #{@spec.name}", :dir => lib_path
+          @context.gem_command "build --force #{@spec.name}", dir: lib_path
         else
-          @context.gem_command "build #{@spec.name}", :dir => lib_path
+          @context.gem_command "build #{@spec.name}", dir: lib_path, allowed_warning: opts[:allowed_warning]
         end
 
         gem_path = File.expand_path("#{@spec.full_name}.gem", lib_path)
         if opts[:to_system]
-          @context.system_gems gem_path, :default => opts[:default]
+          @context.system_gems gem_path, default: opts[:default]
         elsif opts[:to_bundle]
-          @context.system_gems gem_path, :path => @context.default_bundle_path
+          @context.system_gems gem_path, path: @context.default_bundle_path
         else
           FileUtils.mv(gem_path, destination)
         end
diff --git a/spec/bundler/support/bundle b/spec/bundler/support/bundle
new file mode 100755
index 00000000000000..8f8b5352951537
--- /dev/null
+++ b/spec/bundler/support/bundle
@@ -0,0 +1,6 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+require_relative "../bundler/support/activate"
+
+load File.expand_path("bundle", Spec::Path.exedir)
diff --git a/spec/bundler/support/bundle.rb b/spec/bundler/support/bundle.rb
index 5d6d6580405c0f..aa7b12170694e3 100644
--- a/spec/bundler/support/bundle.rb
+++ b/spec/bundler/support/bundle.rb
@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
-require_relative "activate"
+require_relative "path"
 
-load File.expand_path("bundle", Spec::Path.bindir)
+warn "#{__FILE__} is deprecated. Please use #{Spec::Path.dev_binstub} instead"
+
+load Spec::Path.dev_binstub
diff --git a/spec/bundler/support/checksums.rb b/spec/bundler/support/checksums.rb
new file mode 100644
index 00000000000000..8e0dea4a717f96
--- /dev/null
+++ b/spec/bundler/support/checksums.rb
@@ -0,0 +1,126 @@
+# frozen_string_literal: true
+
+module Spec
+  module Checksums
+    class ChecksumsBuilder
+      def initialize(enabled = true, &block)
+        @enabled = enabled
+        @checksums = {}
+        yield self if block_given?
+      end
+
+      def initialize_copy(original)
+        super
+        @checksums = @checksums.dup
+      end
+
+      def checksum(repo, name, version, platform = Gem::Platform::RUBY)
+        name_tuple = Gem::NameTuple.new(name, version, platform)
+        gem_file = File.join(repo, "gems", "#{name_tuple.full_name}.gem")
+        File.open(gem_file, "rb") do |f|
+          register(name_tuple, Bundler::Checksum.from_gem(f, "#{gem_file} (via ChecksumsBuilder#checksum)"))
+        end
+      end
+
+      def no_checksum(name, version, platform = Gem::Platform::RUBY)
+        name_tuple = Gem::NameTuple.new(name, version, platform)
+        register(name_tuple, nil)
+      end
+
+      def delete(name, platform = nil)
+        @checksums.reject! {|k, _| k.name == name && (platform.nil? || k.platform == platform) }
+      end
+
+      def to_s
+        return "" unless @enabled
+
+        locked_checksums = @checksums.map do |name_tuple, checksum|
+          checksum &&= " #{checksum.to_lock}"
+          "  #{name_tuple.lock_name}#{checksum}\n"
+        end
+
+        "\nCHECKSUMS\n#{locked_checksums.sort.join}"
+      end
+
+      private
+
+      def register(name_tuple, checksum)
+        delete(name_tuple.name, name_tuple.platform)
+        @checksums[name_tuple] = checksum
+      end
+    end
+
+    def checksums_section(enabled = true, &block)
+      ChecksumsBuilder.new(enabled, &block)
+    end
+
+    def checksums_section_when_enabled(target_lockfile = nil, &block)
+      begin
+        enabled = (target_lockfile || lockfile).match?(/^CHECKSUMS$/)
+      rescue Errno::ENOENT
+        enabled = Bundler.feature_flag.bundler_4_mode?
+      end
+      checksums_section(enabled, &block)
+    end
+
+    def checksum_to_lock(*args)
+      checksums_section do |c|
+        c.checksum(*args)
+      end.to_s.sub(/^CHECKSUMS\n/, "").strip
+    end
+
+    def checksum_digest(*args)
+      checksum_to_lock(*args).split(Bundler::Checksum::ALGO_SEPARATOR, 2).last
+    end
+
+    # if prefixes is given, removes all checksums where the line
+    # has any of the prefixes on the line before the checksum
+    # otherwise, removes all checksums from the lockfile
+    def remove_checksums_from_lockfile(lockfile, *prefixes)
+      head, remaining = lockfile.split(/^CHECKSUMS$/, 2)
+      return lockfile unless remaining
+      checksums, tail = remaining.split("\n\n", 2)
+
+      prefixes =
+        if prefixes.empty?
+          nil
+        else
+          /(#{prefixes.map {|p| Regexp.escape(p) }.join("|")})/
+        end
+
+      checksums = checksums.each_line.map do |line|
+        if prefixes.nil? || line.match?(prefixes)
+          line.gsub(/ sha256=[a-f0-9]{64}/i, "")
+        else
+          line
+        end
+      end
+
+      head.concat(
+        "CHECKSUMS",
+        checksums.join,
+        "\n\n",
+        tail
+      )
+    end
+
+    def remove_checksums_section_from_lockfile(lockfile)
+      head, remaining = lockfile.split(/^CHECKSUMS$/, 2)
+      return lockfile unless remaining
+      _checksums, tail = remaining.split("\n\n", 2)
+      head.concat(tail)
+    end
+
+    def checksum_from_package(gem_file, name, version)
+      name_tuple = Gem::NameTuple.new(name, version)
+
+      checksum = nil
+
+      File.open(gem_file, "rb") do |f|
+        checksum = Bundler::Checksum.from_gem(f, gemfile)
+      end
+
+      "#{name_tuple.lock_name} #{checksum.to_lock}"
+    end
+  end
+end
diff --git a/spec/bundler/support/command_execution.rb b/spec/bundler/support/command_execution.rb
index 68e5c56c759c2b..02726744d3b5b0 100644
--- a/spec/bundler/support/command_execution.rb
+++ b/spec/bundler/support/command_execution.rb
@@ -1,7 +1,37 @@
 # frozen_string_literal: true
 
 module Spec
-  CommandExecution = Struct.new(:command, :working_directory, :exitstatus, :stdout, :stderr) do
+  class CommandExecution
+    def initialize(command, working_directory:, timeout:)
+      @command = command
+      @working_directory = working_directory
+      @timeout = timeout
+      @original_stdout = String.new
+      @original_stderr = String.new
+    end
+
+    attr_accessor :exitstatus, :command, :original_stdout, :original_stderr
+    attr_reader :timeout
+    attr_writer :failure_reason
+
+    def raise_error!
+      return unless failure?
+
+      error_header = if failure_reason == :timeout
+        "Invoking `#{command}` was aborted after #{timeout} seconds with output:"
+      else
+        "Invoking `#{command}` failed with output:"
+      end
+
+      raise <<~ERROR
+        #{error_header}
+
+        ----------------------------------------------------------------------
+        #{stdboth}
+        ----------------------------------------------------------------------
+      ERROR
+    end
+
     def to_s
       "$ #{command}"
     end
@@ -11,6 +41,14 @@ def stdboth
       @stdboth ||= [stderr, stdout].join("\n").strip
     end
 
+    def stdout
+      normalize(original_stdout)
+    end
+
+    def stderr
+      normalize(original_stderr)
+    end
+
     def to_s_verbose
       [
         to_s,
@@ -29,5 +67,13 @@ def failure?
       return true unless exitstatus
       exitstatus > 0
     end
+
+    private
+
+    attr_reader :failure_reason
+
+    def normalize(string)
+      string.force_encoding(Encoding::UTF_8).strip.gsub("\r\n", "\n")
+    end
   end
 end
diff --git a/spec/bundler/support/env.rb b/spec/bundler/support/env.rb
new file mode 100644
index 00000000000000..0899bd82a31096
--- /dev/null
+++ b/spec/bundler/support/env.rb
@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+module Spec
+  module Env
+    def ruby_core?
+      File.exist?(File.expand_path("../../../lib/bundler/bundler.gemspec", __dir__))
+    end
+
+    def rubylib
+      ENV["RUBYLIB"].to_s.split(File::PATH_SEPARATOR)
+    end
+  end
+end
diff --git a/spec/bundler/support/filters.rb b/spec/bundler/support/filters.rb
index 78545d2e64614c..15b4adf62e387b 100644
--- a/spec/bundler/support/filters.rb
+++ b/spec/bundler/support/filters.rb
@@ -1,11 +1,11 @@
 # frozen_string_literal: true
 
 class RequirementChecker < Proc
-  def self.against(present)
-    provided = Gem::Version.new(present)
-
+  def self.against(provided)
     new do |required|
-      !Gem::Requirement.new(required).satisfied_by?(provided)
+      requirement = Gem::Requirement.new(required)
+
+      !requirement.satisfied_by?(provided)
     end.tap do |checker|
       checker.provided = provided
     end
@@ -14,25 +14,25 @@ def self.against(present)
   attr_accessor :provided
 
   def inspect
-    "\"!= #{provided}\""
+    "\"#{provided}\""
   end
 end
 
 RSpec.configure do |config|
-  config.filter_run_excluding :realworld => true
-
-  git_version = Bundler::Source::Git::GitProxy.new(nil, nil).version
+  config.filter_run_excluding realworld: true
 
-  config.filter_run_excluding :git => RequirementChecker.against(git_version)
-  config.filter_run_excluding :bundler => RequirementChecker.against(Bundler::VERSION.split(".")[0])
-  config.filter_run_excluding :rubygems => RequirementChecker.against(Gem::VERSION)
-  config.filter_run_excluding :ruby_repo => !ENV["GEM_COMMAND"].nil?
-  config.filter_run_excluding :no_color_tty => Gem.win_platform? || !ENV["GITHUB_ACTION"].nil?
-  config.filter_run_excluding :permissions => Gem.win_platform?
-  config.filter_run_excluding :readline => Gem.win_platform?
-  config.filter_run_excluding :jruby_only => RUBY_ENGINE != "jruby"
-  config.filter_run_excluding :truffleruby_only => RUBY_ENGINE != "truffleruby"
-  config.filter_run_excluding :man => Gem.win_platform?
+  config.filter_run_excluding rubygems: RequirementChecker.against(Gem.rubygems_version)
+  config.filter_run_excluding ruby_repo: !ENV["GEM_COMMAND"].nil?
+  config.filter_run_excluding no_color_tty: Gem.win_platform? || !ENV["GITHUB_ACTION"].nil?
+  config.filter_run_excluding permissions: Gem.win_platform?
+  config.filter_run_excluding readline: Gem.win_platform?
+  config.filter_run_excluding jruby_only: RUBY_ENGINE != "jruby"
+  config.filter_run_excluding truffleruby_only: RUBY_ENGINE != "truffleruby"
+  config.filter_run_excluding man: Gem.win_platform?
 
   config.filter_run_when_matching :focus unless ENV["CI"]
+
+  config.before(:each, bundler: "4") do
+    bundle "config simulate_version 4"
+  end
 end
diff --git a/spec/bundler/support/hax.rb b/spec/bundler/support/hax.rb
index c7fe3637cc5ecb..772a125ec7e71f 100644
--- a/spec/bundler/support/hax.rb
+++ b/spec/bundler/support/hax.rb
@@ -19,35 +19,50 @@ def self.ruby=(ruby)
     @default_specifications_dir = nil
   end
 
-  if ENV["BUNDLER_SPEC_WINDOWS"]
-    @@win_platform = true # rubocop:disable Style/ClassVars
-  end
+  spec_platform = ENV["BUNDLER_SPEC_PLATFORM"]
+  if spec_platform
+    if /mingw|mswin/.match?(spec_platform)
+      @@win_platform = nil # rubocop:disable Style/ClassVars
+      RbConfig::CONFIG["host_os"] = spec_platform.gsub(/^[^-]+-/, "").tr("-", "_")
+    end
 
-  if ENV["BUNDLER_SPEC_PLATFORM"]
-    previous_platforms = @platforms
-    previous_local = Platform.local
+    RbConfig::CONFIG["arch"] = spec_platform
 
     class Platform
-      @local = new(ENV["BUNDLER_SPEC_PLATFORM"])
+      @local = nil
     end
-    @platforms = previous_platforms.map {|platform| platform == previous_local ? Platform.local : platform }
+    @platforms = []
   end
 
   if ENV["BUNDLER_SPEC_GEM_SOURCES"]
     self.sources = [ENV["BUNDLER_SPEC_GEM_SOURCES"]]
   end
 
-  if ENV["BUNDLER_IGNORE_DEFAULT_GEM"]
-    module RemoveDefaultBundlerStub
-      def default_stubs(pattern = "*")
-        super.delete_if {|stub| stub.name == "bundler" }
+  if ENV["BUNDLER_SPEC_READ_ONLY"]
+    module ReadOnly
+      def open(file, mode)
+        if file != IO::NULL && mode == "wb"
+          raise Errno::EROFS
+        else
+          super
+        end
       end
     end
 
-    class Specification
-      class << self
-        prepend RemoveDefaultBundlerStub
+    File.singleton_class.prepend ReadOnly
+  end
+
+  if ENV["BUNDLER_SPEC_FAKE_RESOLVE"]
+    module FakeResolv
+      def getaddrinfo(host, port)
+        if host == ENV["BUNDLER_SPEC_FAKE_RESOLVE"]
+          [["AF_INET", port, "127.0.0.1", "127.0.0.1", 2, 2, 17]]
+        else
+          super
+        end
       end
     end
+
+    Socket.singleton_class.prepend FakeResolv
   end
 end
diff --git a/spec/bundler/support/helpers.rb b/spec/bundler/support/helpers.rb
index 73621685baf5fc..acf13c9733d3a7 100644
--- a/spec/bundler/support/helpers.rb
+++ b/spec/bundler/support/helpers.rb
@@ -1,24 +1,29 @@
 # frozen_string_literal: true
 
-require_relative "command_execution"
 require_relative "the_bundle"
 require_relative "path"
+require_relative "options"
+require_relative "subprocess"
 
 module Spec
   module Helpers
     include Spec::Path
+    include Spec::Options
+    include Spec::Subprocess
+
+    def self.extended(mod)
+      mod.extend Spec::Path
+      mod.extend Spec::Options
+      mod.extend Spec::Subprocess
+    end
 
     def reset!
       Dir.glob("#{tmp}/{gems/*,*}", File::FNM_DOTMATCH).each do |dir|
         next if %w[base base_system remote1 rubocop standard gems rubygems . ..].include?(File.basename(dir))
-        FileUtils.rm_rf(dir)
+        FileUtils.rm_r(dir)
       end
       FileUtils.mkdir_p(home)
       FileUtils.mkdir_p(tmpdir)
-      reset_paths!
-    end
-
-    def reset_paths!
       Bundler.reset!
       Gem.clear_paths
     end
@@ -27,23 +32,7 @@ def the_bundle(*args)
       TheBundle.new(*args)
     end
 
-    def command_executions
-      @command_executions ||= []
-    end
-
-    def last_command
-      command_executions.last || raise("There is no last command")
-    end
-
-    def out
-      last_command.stdout
-    end
-
-    def err
-      last_command.stderr
-    end
-
-    MAJOR_DEPRECATION = /^\[DEPRECATED\]\s*/.freeze
+    MAJOR_DEPRECATION = /^\[DEPRECATED\]\s*/
 
     def err_without_deprecations
       err.gsub(/#{MAJOR_DEPRECATION}.+[\n]?/, "")
@@ -53,14 +42,10 @@ def deprecations
       err.split("\n").select {|l| l =~ MAJOR_DEPRECATION }.join("\n").split(MAJOR_DEPRECATION)
     end
 
-    def exitstatus
-      last_command.exitstatus
-    end
-
     def run(cmd, *args)
       opts = args.last.is_a?(Hash) ? args.pop : {}
       groups = args.map(&:inspect).join(", ")
-      setup = "require '#{entrypoint}' ; Bundler.ui.silence { Bundler.setup(#{groups}) }"
+      setup = "require 'bundler' ; Bundler.ui.silence { Bundler.setup(#{groups}) }"
       ruby([setup, cmd].join(" ; "), opts)
     end
 
@@ -84,29 +69,24 @@ def bundle(cmd, options = {}, &block)
       env = options.delete(:env) || {}
 
       requires = options.delete(:requires) || []
-      realworld = RSpec.current_example.metadata[:realworld]
 
-      artifice = options.delete(:artifice) do
-        if realworld
-          "vcr"
-        else
-          "fail"
-        end
-      end
-      if artifice
-        requires << "#{Path.spec_dir}/support/artifice/#{artifice}.rb"
-      end
+      dir = options.delete(:dir) || bundled_app
+      custom_load_path = options.delete(:load_path)
 
       load_path = []
-      load_path << spec_dir
+      load_path << custom_load_path if custom_load_path
+
+      build_env_options = { load_path: load_path, requires: requires, env: env }
+      build_env_options.merge!(artifice: options.delete(:artifice)) if options.key?(:artifice) || cmd.start_with?("exec")
+
+      match_source(cmd)
+
+      env = build_env(build_env_options)
 
-      dir = options.delete(:dir) || bundled_app
       raise_on_error = options.delete(:raise_on_error)
 
       args = options.map do |k, v|
         case v
-        when nil
-          next
         when true
           " --#{k}"
         when false
@@ -116,20 +96,30 @@ def bundle(cmd, options = {}, &block)
         end
       end.join
 
-      ruby_cmd = build_ruby_cmd({ :load_path => load_path, :requires => requires })
-      cmd = "#{ruby_cmd} #{bundle_bin} #{cmd}#{args}"
-      sys_exec(cmd, { :env => env, :dir => dir, :raise_on_error => raise_on_error }, &block)
+      cmd = "#{Gem.ruby} #{bundle_bin} #{cmd}#{args}"
+      sys_exec(cmd, { env: env, dir: dir, raise_on_error: raise_on_error }, &block)
+    end
+
+    def main_source(dir)
+      gemfile = File.expand_path("Gemfile", dir)
+      return unless File.exist?(gemfile)
+
+      match = File.readlines(gemfile).first.match(/source ["'](?<source>[^"']+)["']/)
+      return unless match
+
+      match[:source]
     end
 
     def bundler(cmd, options = {})
-      options[:bundle_bin] = system_gem_path.join("bin/bundler")
+      options[:bundle_bin] = system_gem_path("bin/bundler")
       bundle(cmd, options)
     end
 
     def ruby(ruby, options = {})
-      ruby_cmd = build_ruby_cmd
+      env = build_env({ artifice: nil }.merge(options))
       escaped_ruby = ruby.shellescape
-      sys_exec(%(#{ruby_cmd} -w -e #{escaped_ruby}), options)
+      options[:env] = env if env
+      sys_exec(%(#{Gem.ruby} -w -e #{escaped_ruby}), options)
     end
 
     def load_error_ruby(ruby, name, opts = {})
@@ -142,15 +132,44 @@ def load_error_ruby(ruby, name, opts = {})
       R
     end
 
-    def build_ruby_cmd(options = {})
-      libs = options.delete(:load_path)
-      lib_option = libs ? "-I#{libs.join(File::PATH_SEPARATOR)}" : []
+    def build_env(options = {})
+      env = options.delete(:env) || {}
+      libs = options.delete(:load_path) || []
+      env["RUBYOPT"] = opt_add("-I#{libs.join(File::PATH_SEPARATOR)}", env["RUBYOPT"]) if libs.any?
+
+      current_example = RSpec.current_example
+
+      main_source = @gemfile_source if defined?(@gemfile_source)
+      compact_index_main_source = main_source&.start_with?("https://gem.repo", "https://gems.security")
 
       requires = options.delete(:requires) || []
-      requires << "#{Path.spec_dir}/support/hax.rb"
-      require_option = requires.map {|r| "-r#{r}" }
+      requires << hax
+
+      artifice = options.delete(:artifice) do
+        if current_example && current_example.metadata[:realworld]
+          "vcr"
+        elsif compact_index_main_source
+          env["BUNDLER_SPEC_GEM_REPO"] ||=
+            case main_source
+            when "https://gem.repo1" then gem_repo1.to_s
+            when "https://gem.repo2" then gem_repo2.to_s
+            when "https://gem.repo3" then gem_repo3.to_s
+            when "https://gem.repo4" then gem_repo4.to_s
+            when "https://gems.security" then security_repo.to_s
+            end
+
+          "compact_index"
+        else
+          "fail"
+        end
+      end
+      if artifice
+        requires << "#{Path.spec_dir}/support/artifice/#{artifice}.rb"
+      end
+
+      requires.each {|r| env["RUBYOPT"] = opt_add("-r#{r}", env["RUBYOPT"]) }
 
-      [Gem.ruby, *lib_option, *require_option].compact.join(" ")
+      env
     end
 
     def gembin(cmd, options = {})
@@ -160,72 +179,51 @@ def gembin(cmd, options = {})
 
     def gem_command(command, options = {})
       env = options[:env] || {}
-      env["RUBYOPT"] = opt_add(opt_add("-r#{spec_dir}/support/hax.rb", env["RUBYOPT"]), ENV["RUBYOPT"])
+      env["RUBYOPT"] = opt_add(opt_add("-r#{hax}", env["RUBYOPT"]), ENV["RUBYOPT"])
       options[:env] = env
-      sys_exec("#{Path.gem_bin} #{command}", options)
+
+      # Sometimes `gem install` commands hang at dns resolution, which has a
+      # default timeout of 60 seconds. When that happens, the timeout for a
+      # command is expired too. So give `gem install` commands a bit more time.
+      options[:timeout] = 120
+
+      allowed_warning = options.delete(:allowed_warning)
+
+      output = sys_exec("#{Path.gem_bin} #{command}", options)
+      stderr = last_command.stderr
+
+      raise stderr if stderr.include?("WARNING") && !allowed_rubygems_warning?(stderr, allowed_warning)
+      output
     end
 
     def rake
       "#{Gem.ruby} -S #{ENV["GEM_PATH"]}/bin/rake"
     end
 
-    def git(cmd, path, options = {})
-      sys_exec("git #{cmd}", options.merge(:dir => path))
-    end
-
-    def sys_exec(cmd, options = {})
+    def sys_exec(cmd, options = {}, &block)
       env = options[:env] || {}
       env["RUBYOPT"] = opt_add(opt_add("-r#{spec_dir}/support/switch_rubygems.rb", env["RUBYOPT"]), ENV["RUBYOPT"])
-      dir = options[:dir] || bundled_app
-      command_execution = CommandExecution.new(cmd.to_s, dir)
-
-      require "open3"
-      require "shellwords"
-      Open3.popen3(env, *cmd.shellsplit, :chdir => dir) do |stdin, stdout, stderr, wait_thr|
-        yield stdin, stdout, wait_thr if block_given?
-        stdin.close
-
-        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
-
-        status = wait_thr.value
-        command_execution.exitstatus = if status.exited?
-          status.exitstatus
-        elsif status.signaled?
-          exit_status_for_signal(status.termsig)
-        end
-      end
-
-      unless options[:raise_on_error] == false || command_execution.success?
-        raise <<~ERROR
-
-          Invoking `#{cmd}` failed with output:
-          ----------------------------------------------------------------------
-          #{command_execution.stdboth}
-          ----------------------------------------------------------------------
-        ERROR
-      end
-
-      command_executions << command_execution
+      options[:env] = env
+      options[:dir] ||= bundled_app
 
-      command_execution.stdout
+      sh(cmd, options, &block)
     end
 
-    def all_commands_output
-      return "" if command_executions.empty?
+    def config(config = nil, path = bundled_app(".bundle/config"))
+      current = File.exist?(path) ? Psych.load_file(path) : {}
+      return current unless config
 
-      "\n\nCommands:\n#{command_executions.map(&:to_s_verbose).join("\n\n")}"
-    end
+      current = {} if current.empty?
 
-    def config(config = nil, path = bundled_app(".bundle/config"))
-      return Psych.load_file(path) unless config
       FileUtils.mkdir_p(File.dirname(path))
-      File.open(path, "w") do |f|
-        f.puts config.to_yaml
+
+      new_config = current.merge(config).compact
+
+      File.open(path, "w+") do |f|
+        f.puts new_config.to_yaml
       end
-      config
+
+      new_config
     end
 
     def global_config(config = nil)
@@ -233,10 +231,20 @@ def global_config(config = nil)
     end
 
     def create_file(path, contents = "")
+      contents = strip_whitespace(contents)
       path = Pathname.new(path).expand_path(bundled_app) unless path.is_a?(Pathname)
       path.dirname.mkpath
-      File.open(path.to_s, "w") do |f|
-        f.puts strip_whitespace(contents)
+      path.write(contents)
+
+      # if the file is a script, create respective bat file on Windows
+      if contents.start_with?("#!")
+        path.chmod(0o755)
+        if Gem.win_platform?
+          path.sub_ext(".bat").write <<~SCRIPT
+            @ECHO OFF
+            @"ruby.exe" "%~dpn0" %*
+          SCRIPT
+        end
       end
     end
 
@@ -246,6 +254,7 @@ def gemfile(*args)
       if contents.nil?
         read_gemfile
       else
+        match_source(contents)
         create_file(args.pop || "Gemfile", contents)
       end
     end
@@ -290,62 +299,48 @@ def lock_gemfile(*args)
       bundle :lock, opts
     end
 
+    def base_system_gems(*names, **options)
+      system_gems names.map {|name| find_base_path(name) }, **options
+    end
+
     def system_gems(*gems)
       gems = gems.flatten
       options = gems.last.is_a?(Hash) ? gems.pop : {}
-      path = options.fetch(:path, system_gem_path)
+      install_dir = options.fetch(:path, system_gem_path)
       default = options.fetch(:default, false)
-      with_gem_path_as(path) do
-        gem_repo = options.fetch(:gem_repo, gem_repo1)
-        gems.each do |g|
-          gem_name = g.to_s
-          if gem_name.start_with?("bundler")
-            version = gem_name.match(/\Abundler-(?<version>.*)\z/)[:version] if gem_name != "bundler"
-            with_built_bundler(version) {|gem_path| install_gem(gem_path, default) }
-          elsif %r{\A(?:[a-zA-Z]:)?/.*\.gem\z}.match?(gem_name)
-            install_gem(gem_name, default)
-          else
-            install_gem("#{gem_repo}/gems/#{gem_name}.gem", default)
-          end
+      gems.each do |g|
+        gem_name = g.to_s
+        if gem_name.start_with?("bundler")
+          version = gem_name.match(/\Abundler-(?<version>.*)\z/)[:version] if gem_name != "bundler"
+          with_built_bundler(version, released: options.fetch(:released, false)) {|gem_path| install_gem(gem_path, install_dir, default) }
+        elsif %r{\A(?:[a-zA-Z]:)?/.*\.gem\z}.match?(gem_name)
+          install_gem(gem_name, install_dir, default)
+        else
+          gem_repo = options.fetch(:gem_repo, gem_repo1)
+          install_gem("#{gem_repo}/gems/#{gem_name}.gem", install_dir, default)
         end
       end
     end
 
-    def install_gem(path, default = false)
-      raise "OMG `#{path}` does not exist!" unless File.exist?(path)
-
-      args = "--no-document --ignore-dependencies --verbose --local"
-      args += " --default --install-dir #{system_gem_path}" if default
+    def self.install_dev_bundler
+      extend self
 
-      gem_command "install #{args} '#{path}'"
+      system_gems :bundler, path: pristine_system_gem_path
     end
 
-    def with_built_bundler(version = nil)
-      version ||= Bundler::VERSION
-      full_name = "bundler-#{version}"
-      build_path = tmp + full_name
-      bundler_path = build_path + "#{full_name}.gem"
-
-      Dir.mkdir build_path
-
-      begin
-        shipped_files.each do |shipped_file|
-          target_shipped_file = build_path + shipped_file
-          target_shipped_dir = File.dirname(target_shipped_file)
-          FileUtils.mkdir_p target_shipped_dir unless File.directory?(target_shipped_dir)
-          FileUtils.cp shipped_file, target_shipped_file, :preserve => true
-        end
+    def install_gem(path, install_dir, default = false)
+      raise "OMG `#{path}` does not exist!" unless File.exist?(path)
 
-        replace_version_file(version, dir: build_path) # rubocop:disable Style/HashSyntax
+      args = "--no-document --ignore-dependencies --verbose --local --install-dir #{install_dir}"
+      args += " --default" if default
 
-        Spec::BuildMetadata.write_build_metadata(dir: build_path) # rubocop:disable Style/HashSyntax
+      gem_command "install #{args} '#{path}'"
+    end
 
-        gem_command "build #{relative_gemspec}", :dir => build_path
+    def with_built_bundler(version = nil, opts = {}, &block)
+      require_relative "builders"
 
-        yield(bundler_path)
-      ensure
-        build_path.rmtree
-      end
+      Builders::BundlerBuilder.new(self, "bundler", version)._build(opts, &block)
     end
 
     def with_gem_path_as(path)
@@ -379,16 +374,6 @@ def with_path_added(path)
       end
     end
 
-    def opt_add(option, options)
-      [option.strip, options].compact.reject(&:empty?).join(" ")
-    end
-
-    def opt_remove(option, options)
-      return unless options
-
-      options.split(" ").reject {|opt| opt.strip == option.strip }.join(" ")
-    end
-
     def break_git!
       FileUtils.mkdir_p(tmp("broken_path"))
       File.open(tmp("broken_path/git"), "w", 0o755) do |f|
@@ -399,37 +384,23 @@ def break_git!
     end
 
     def with_fake_man
-      skip "fake_man is not a Windows friendly binstub" if Gem.win_platform?
-
       FileUtils.mkdir_p(tmp("fake_man"))
-      File.open(tmp("fake_man/man"), "w", 0o755) do |f|
-        f.puts "#!/usr/bin/env ruby\nputs ARGV.inspect\n"
-      end
+      create_file(tmp("fake_man/man"), <<~SCRIPT)
+        #!/usr/bin/env ruby
+        puts ARGV.inspect
+      SCRIPT
       with_path_added(tmp("fake_man")) { yield }
     end
 
     def pristine_system_gems(*gems)
-      FileUtils.rm_rf(system_gem_path)
+      FileUtils.rm_r(system_gem_path)
 
       system_gems(*gems)
     end
 
-    def realworld_system_gems(*gems)
-      gems = gems.flatten
-      opts = gems.last.is_a?(Hash) ? gems.pop : {}
-      path = opts.fetch(:path, system_gem_path)
-
-      with_gem_path_as(path) do
-        gems.each do |gem|
-          gem_command "install --no-document #{gem}"
-        end
-      end
-    end
-
     def cache_gems(*gems, gem_repo: gem_repo1)
       gems = gems.flatten
 
-      FileUtils.rm_rf("#{bundled_app}/vendor/cache")
       FileUtils.mkdir_p("#{bundled_app}/vendor/cache")
 
       gems.each do |g|
@@ -440,7 +411,7 @@ def cache_gems(*gems, gem_repo: gem_repo1)
     end
 
     def simulate_new_machine
-      FileUtils.rm_rf bundled_app(".bundle")
+      FileUtils.rm_r bundled_app(".bundle")
       pristine_system_gems :bundler
     end
 
@@ -455,39 +426,9 @@ def simulate_ruby_platform(ruby_platform)
     def simulate_platform(platform)
       old = ENV["BUNDLER_SPEC_PLATFORM"]
       ENV["BUNDLER_SPEC_PLATFORM"] = platform.to_s
-      yield if block_given?
-    ensure
-      ENV["BUNDLER_SPEC_PLATFORM"] = old if block_given?
-    end
-
-    def simulate_windows(platform = x86_mswin32)
-      old = ENV["BUNDLER_SPEC_WINDOWS"]
-      ENV["BUNDLER_SPEC_WINDOWS"] = "true"
-      simulate_platform platform do
-        simulate_bundler_version_when_missing_prerelease_default_gem_activation do
-          yield
-        end
-      end
-    ensure
-      ENV["BUNDLER_SPEC_WINDOWS"] = old
-    end
-
-    def simulate_bundler_version_when_missing_prerelease_default_gem_activation
-      return yield unless rubygems_version_failing_to_activate_bundler_prereleases
-
-      old = ENV["BUNDLER_VERSION"]
-      ENV["BUNDLER_VERSION"] = Bundler::VERSION
       yield
     ensure
-      ENV["BUNDLER_VERSION"] = old
-    end
-
-    def env_for_missing_prerelease_default_gem_activation
-      if rubygems_version_failing_to_activate_bundler_prereleases
-        { "BUNDLER_VERSION" => Bundler::VERSION }
-      else
-        {}
-      end
+      ENV["BUNDLER_SPEC_PLATFORM"] = old if block_given?
     end
 
     def current_ruby_minor
@@ -498,24 +439,12 @@ def next_ruby_minor
       ruby_major_minor.map.with_index {|s, i| i == 1 ? s + 1 : s }.join(".")
     end
 
-    def previous_ruby_minor
-      return "2.7" if ruby_major_minor == [3, 0]
-
-      ruby_major_minor.map.with_index {|s, i| i == 1 ? s - 1 : s }.join(".")
-    end
-
     def ruby_major_minor
       Gem.ruby_version.segments[0..1]
     end
 
-    # versions not including
-    # https://github.com/rubygems/rubygems/commit/929e92d752baad3a08f3ac92eaec162cb96aedd1
-    def rubygems_version_failing_to_activate_bundler_prereleases
-      Gem.rubygems_version < Gem::Version.new("3.1.0.pre.1")
-    end
-
     def revision_for(path)
-      sys_exec("git rev-parse HEAD", :dir => path).strip
+      git("rev-parse HEAD", path).strip
     end
 
     def with_read_only(pattern)
@@ -567,41 +496,42 @@ def with_env_vars(env_hash, &block)
       end
     end
 
-    def require_rack
-      # need to hack, so we can require rack
+    def require_rack_test
+      # need to hack, so we can require rack for testing
       old_gem_home = ENV["GEM_HOME"]
-      ENV["GEM_HOME"] = Spec::Path.base_system_gem_path.to_s
-      require "rack"
+      ENV["GEM_HOME"] = Spec::Path.scoped_base_system_gem_path.to_s
+      require "rack/test"
       ENV["GEM_HOME"] = old_gem_home
     end
 
-    def wait_for_server(host, port, seconds = 15)
-      tries = 0
-      sleep 0.5
-      TCPSocket.new(host, port)
-    rescue StandardError => e
-      raise(e) if tries > (seconds * 2)
-      tries += 1
-      retry
-    end
-
-    def find_unused_port
-      port = 21_453
-      begin
-        port += 1 while TCPSocket.new("127.0.0.1", port)
-      rescue StandardError
-        false
-      end
-      port
-    end
-
     def exit_status_for_signal(signal_number)
       # For details see: https://en.wikipedia.org/wiki/Exit_status#Shell_and_scripts
       128 + signal_number
     end
 
+    def empty_repo4
+      FileUtils.rm_r gem_repo4
+
+      build_repo4 {}
+    end
+
     private
 
+    def allowed_rubygems_warning?(text, extra_allowed_warning)
+      allowed_warnings = ["open-ended", "is a symlink", "rake based", "expected RubyGems version"]
+      allowed_warnings << extra_allowed_warning if extra_allowed_warning
+      allowed_warnings.any? do |warning|
+        text.include?(warning)
+      end
+    end
+
+    def match_source(contents)
+      match = /source ["']?(?<source>http[^"']+)["']?/.match(contents)
+      return unless match
+
+      @gemfile_source = match[:source]
+    end
+
     def git_root_dir?
       root.to_s == `git rev-parse --show-toplevel`.chomp
     end
diff --git a/spec/bundler/support/indexes.rb b/spec/bundler/support/indexes.rb
index 14f515f870b084..1fbdd49abe9663 100644
--- a/spec/bundler/support/indexes.rb
+++ b/spec/bundler/support/indexes.rb
@@ -16,8 +16,8 @@ def platform(*args)
 
     def resolve(args = [], dependency_api_available: true)
       @platforms ||= ["ruby"]
-      default_source = instance_double("Bundler::Source::Rubygems", :specs => @index, :to_s => "locally install gems", :dependency_api_available? => dependency_api_available)
-      source_requirements = { :default => default_source }
+      default_source = instance_double("Bundler::Source::Rubygems", specs: @index, to_s: "locally install gems", dependency_api_available?: dependency_api_available)
+      source_requirements = { default: default_source }
       base = args[0] || Bundler::SpecSet.new([])
       base.each {|ls| ls.source = default_source }
       gem_version_promoter = args[1] || Bundler::GemVersionPromoter.new
@@ -27,7 +27,7 @@ def resolve(args = [], dependency_api_available: true)
         name = d.name
         source_requirements[name] = d.source = default_source
       end
-      packages = Bundler::Resolver::Base.new(source_requirements, @deps, base, @platforms, :locked_specs => originally_locked, :unlock => unlock)
+      packages = Bundler::Resolver::Base.new(source_requirements, @deps, base, @platforms, locked_specs: originally_locked, unlock: unlock)
       Bundler::Resolver.new(packages, gem_version_promoter).start
     end
 
@@ -42,7 +42,7 @@ def should_resolve_as(specs)
     end
 
     def should_resolve_without_dependency_api(specs)
-      got = resolve(:dependency_api_available => false)
+      got = resolve(dependency_api_available: false)
       got = got.map(&:full_name).sort
       expect(got).to eq(specs.sort)
     end
@@ -66,7 +66,6 @@ def locked(*args)
     end
 
     def should_conservative_resolve_and_include(opts, unlock, specs)
-      # empty unlock means unlock all
       opts = Array(opts)
       search = Bundler::GemVersionPromoter.new.tap do |s|
         s.level = opts.first
@@ -77,8 +76,8 @@ def should_conservative_resolve_and_include(opts, unlock, specs)
 
     def an_awesome_index
       build_index do
-        gem "rack", %w[0.8 0.9 0.9.1 0.9.2 1.0 1.1]
-        gem "rack-mount", %w[0.4 0.5 0.5.1 0.5.2 0.6]
+        gem "myrack", %w[0.8 0.9 0.9.1 0.9.2 1.0 1.1]
+        gem "myrack-mount", %w[0.4 0.5 0.5.1 0.5.2 0.6]
 
         # --- Pre-release support
         gem "RubyGems\0", ["1.3.2"]
@@ -89,10 +88,10 @@ def an_awesome_index
           gem "actionpack", version do
             dep "activesupport", version
             if version >= v("3.0.0.beta")
-              dep "rack", "~> 1.1"
-              dep "rack-mount", ">= 0.5"
-            elsif version > v("2.3")   then dep "rack", "~> 1.0.0"
-            elsif version > v("2.0.0") then dep "rack", "~> 0.9.0"
+              dep "myrack", "~> 1.1"
+              dep "myrack-mount", ">= 0.5"
+            elsif version > v("2.3")   then dep "myrack", "~> 1.0.0"
+            elsif version > v("2.0.0") then dep "myrack", "~> 0.9.0"
             end
           end
           gem "activerecord", version do
@@ -123,7 +122,7 @@ def an_awesome_index
         end
 
         versions "1.0 1.2 1.2.1 1.2.2 1.3 1.3.0.1 1.3.5 1.4.0 1.4.2 1.4.2.1" do |version|
-          platforms "ruby java mswin32 mingw32 x64-mingw32" do |platform|
+          platforms "ruby java mswin32 mingw32 x64-mingw-ucrt" do |platform|
             next if version == v("1.4.2.1") && platform != pl("x86-mswin32")
             next if version == v("1.4.2") && platform == pl("x86-mswin32")
             gem "nokogiri", version, platform do
@@ -304,7 +303,7 @@ def a_complicated_index
       end
     end
 
-    def a_unresovable_child_index
+    def a_unresolvable_child_index
       build_index do
         gem "json", %w[1.8.0]
 
@@ -367,7 +366,7 @@ def a_index_with_root_conflict_on_child
 
     def a_circular_index
       build_index do
-        gem "rack", "1.0.1"
+        gem "myrack", "1.0.1"
         gem("foo", "0.2.6") do
           dep "bar", ">= 0"
         end
diff --git a/spec/bundler/support/matchers.rb b/spec/bundler/support/matchers.rb
index ea7c784683517e..9f311fc0d77c39 100644
--- a/spec/bundler/support/matchers.rb
+++ b/spec/bundler/support/matchers.rb
@@ -97,18 +97,6 @@ def self.define_compound_matcher(matcher, preconditions, &declarations)
       end
     end
 
-    RSpec::Matchers.define :take_less_than do |seconds|
-      match do |actual|
-        start_time = Time.now
-
-        actual.call
-
-        (Time.now - start_time).to_f < seconds
-      end
-
-      supports_block_expectations
-    end
-
     define_compound_matcher :read_as, [exist] do |file_contents|
       diffable
 
@@ -128,8 +116,9 @@ def indent(string, padding = 4, indent_character = " ")
         source = opts.delete(:source)
         groups = Array(opts.delete(:groups)).map(&:inspect).join(", ")
         opts[:raise_on_error] = false
-        @errors = names.map do |full_name|
+        @errors = names.filter_map do |full_name|
           name, version, platform = full_name.split(/\s+/)
+          platform ||= "ruby"
           require_path = name.tr("-", "/")
           version_const = name == "bundler" ? "Bundler::VERSION" : Spec::Builders.constantize(name)
           source_const = "#{Spec::Builders.constantize(name)}_SOURCE"
@@ -139,6 +128,7 @@ def indent(string, padding = 4, indent_character = " ")
 
             require '#{require_path}'
             actual_version, actual_platform = #{version_const}.split(/\s+/, 2)
+            actual_platform ||= "ruby"
             unless Gem::Version.new(actual_version) == Gem::Version.new('#{version}')
               puts actual_version
               exit 64
@@ -162,14 +152,14 @@ def indent(string, padding = 4, indent_character = " ")
           end
           if exitstatus == 65
             actual_platform = out.split("\n").last
-            next "#{name} was expected to be of platform #{platform || "ruby"} but was #{actual_platform || "ruby"}"
+            next "#{name} was expected to be of platform #{platform} but was #{actual_platform}"
           end
           if exitstatus == 66
             actual_source = out.split("\n").last
             next "Expected #{name} (#{version}) to be installed from `#{source}`, was actually from `#{actual_source}`"
           end
           next "Command to check for inclusion of gem #{full_name} failed"
-        end.compact
+        end
 
         @errors.empty?
       end
@@ -178,7 +168,7 @@ def indent(string, padding = 4, indent_character = " ")
         opts = names.last.is_a?(Hash) ? names.pop : {}
         groups = Array(opts.delete(:groups)).map(&:inspect).join(", ")
         opts[:raise_on_error] = false
-        @errors = names.map do |name|
+        @errors = names.filter_map do |name|
           name, version = name.split(/\s+/, 2)
           ruby <<-R, opts
             begin
@@ -204,7 +194,7 @@ def indent(string, padding = 4, indent_character = " ")
           next "command to check version of #{name} installed failed" unless exitstatus == 64
           next "expected #{name} to not be installed, but it was" if version.nil?
           next "expected #{name} (#{version}) not to be installed, but it was"
-        end.compact
+        end
 
         @errors.empty?
       end
diff --git a/spec/bundler/support/options.rb b/spec/bundler/support/options.rb
new file mode 100644
index 00000000000000..551fa1acd87aba
--- /dev/null
+++ b/spec/bundler/support/options.rb
@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module Spec
+  module Options
+    def opt_add(option, options)
+      [option.strip, options].compact.reject(&:empty?).join(" ")
+    end
+
+    def opt_remove(option, options)
+      return unless options
+
+      options.split(" ").reject {|opt| opt.strip == option.strip }.join(" ")
+    end
+  end
+end
diff --git a/spec/bundler/support/path.rb b/spec/bundler/support/path.rb
index 240cfe7bc97f8c..b5ea9bc5b64e87 100644
--- a/spec/bundler/support/path.rb
+++ b/spec/bundler/support/path.rb
@@ -3,8 +3,12 @@
 require "pathname"
 require "rbconfig"
 
+require_relative "env"
+
 module Spec
   module Path
+    include Spec::Env
+
     def source_root
       @source_root ||= Pathname.new(ruby_core? ? "../../.." : "../..").expand_path(__dir__)
     end
@@ -21,12 +25,8 @@ def relative_gemspec
       @relative_gemspec ||= ruby_core? ? "lib/bundler/bundler.gemspec" : "bundler.gemspec"
     end
 
-    def gemspec_dir
-      @gemspec_dir ||= gemspec.parent
-    end
-
     def loaded_gemspec
-      @loaded_gemspec ||= Gem::Specification.load(gemspec.to_s)
+      @loaded_gemspec ||= Dir.chdir(source_root) { Gem::Specification.load(gemspec.to_s) }
     end
 
     def test_gemfile
@@ -42,12 +42,19 @@ def standard_gemfile
     end
 
     def dev_gemfile
-      name = RUBY_VERSION.start_with?("2.6") ? "dev26_gems.rb" : "dev_gems.rb"
-      @dev_gemfile ||= tool_dir.join(name)
+      @dev_gemfile ||= tool_dir.join("dev_gems.rb")
+    end
+
+    def dev_binstub
+      @dev_binstub ||= bindir.join("bundle")
     end
 
     def bindir
-      @bindir ||= source_root.join(ruby_core? ? "libexec" : "exe")
+      @bindir ||= source_root.join(ruby_core? ? "spec/bin" : "bin")
+    end
+
+    def exedir
+      @exedir ||= source_root.join(ruby_core? ? "libexec" : "exe")
     end
 
     def installed_bindir
@@ -59,12 +66,12 @@ def gem_cmd
     end
 
     def gem_bin
-      @gem_bin ||= ruby_core? ? ENV["GEM_COMMAND"] : "gem"
+      @gem_bin ||= ENV["GEM_COMMAND"] || "gem"
     end
 
     def path
       env_path = ENV["PATH"]
-      env_path = env_path.split(File::PATH_SEPARATOR).reject {|path| path == bindir.to_s }.join(File::PATH_SEPARATOR) if ruby_core?
+      env_path = env_path.split(File::PATH_SEPARATOR).reject {|path| path == exedir.to_s }.join(File::PATH_SEPARATOR) if ruby_core?
       env_path
     end
 
@@ -76,12 +83,22 @@ def man_dir
       @man_dir ||= lib_dir.join("bundler/man")
     end
 
+    def hax
+      @hax ||= spec_dir.join("support/hax.rb")
+    end
+
     def tracked_files
       @tracked_files ||= git_ls_files(tracked_files_glob)
     end
 
     def shipped_files
-      @shipped_files ||= loaded_gemspec.files
+      @shipped_files ||= if ruby_core_tarball?
+        loaded_gemspec.files.map {|f| f.gsub(%r{^exe/}, "libexec/") }
+      elsif ruby_core?
+        tracked_files
+      else
+        loaded_gemspec.files
+      end
     end
 
     def lib_tracked_files
@@ -93,7 +110,18 @@ def man_tracked_files
     end
 
     def tmp(*path)
-      source_root.join("tmp", scope, *path)
+      tmp_root.join("#{test_env_version}.#{scope}").join(*path)
+    end
+
+    def tmp_root
+      source_root.join("tmp")
+    end
+
+    # Bump this version whenever you make a breaking change to the spec setup
+    # that requires regenerating tmp/.
+
+    def test_env_version
+      2
     end
 
     def scope
@@ -104,11 +132,11 @@ def scope
     end
 
     def home(*path)
-      tmp.join("home", *path)
+      tmp("home", *path)
     end
 
     def default_bundle_path(*path)
-      if Bundler.feature_flag.default_install_uses_path?
+      if Bundler.feature_flag.bundler_4_mode?
         local_gem_path(*path)
       else
         system_gem_path(*path)
@@ -123,14 +151,18 @@ def default_cache_path(*path)
       end
     end
 
+    def compact_index_cache_path
+      home(".bundle/cache/compact_index")
+    end
+
     def bundled_app(*path)
-      root = tmp.join("bundled_app")
+      root = tmp("bundled_app")
       FileUtils.mkdir_p(root)
       root.join(*path)
     end
 
     def bundled_app2(*path)
-      root = tmp.join("bundled_app2")
+      root = tmp("bundled_app2")
       FileUtils.mkdir_p(root)
       root.join(*path)
     end
@@ -151,20 +183,20 @@ def bundled_app_lock
       bundled_app("Gemfile.lock")
     end
 
-    def base_system_gem_path
-      scoped_gem_path(base_system_gems)
+    def scoped_base_system_gem_path
+      scoped_gem_path(base_system_gem_path)
     end
 
-    def base_system_gems
-      tmp.join("gems/base")
+    def base_system_gem_path
+      tmp_root.join("gems/base")
     end
 
-    def rubocop_gems
-      tmp.join("gems/rubocop")
+    def rubocop_gem_path
+      tmp_root.join("gems/rubocop")
     end
 
-    def standard_gems
-      tmp.join("gems/standard")
+    def standard_gem_path
+      tmp_root.join("gems/standard")
     end
 
     def file_uri_for(path)
@@ -175,35 +207,35 @@ def file_uri_for(path)
     end
 
     def gem_repo1(*args)
-      tmp("gems/remote1", *args)
+      gem_path("remote1", *args)
     end
 
     def gem_repo_missing(*args)
-      tmp("gems/missing", *args)
+      gem_path("missing", *args)
     end
 
     def gem_repo2(*args)
-      tmp("gems/remote2", *args)
+      gem_path("remote2", *args)
     end
 
     def gem_repo3(*args)
-      tmp("gems/remote3", *args)
+      gem_path("remote3", *args)
     end
 
     def gem_repo4(*args)
-      tmp("gems/remote4", *args)
+      gem_path("remote4", *args)
     end
 
     def security_repo(*args)
-      tmp("gems/security_repo", *args)
+      gem_path("security_repo", *args)
     end
 
     def system_gem_path(*path)
-      tmp("gems/system", *path)
+      gem_path("system", *path)
     end
 
     def pristine_system_gem_path
-      tmp("gems/base_system")
+      tmp_root.join("gems/pristine_system")
     end
 
     def local_gem_path(*path, base: bundled_app)
@@ -214,6 +246,10 @@ def scoped_gem_path(base)
       base.join(Gem.ruby_engine, RbConfig::CONFIG["ruby_version"])
     end
 
+    def gem_path(*args)
+      tmp("gems", *args)
+    end
+
     def lib_path(*args)
       tmp("libs", *args)
     end
@@ -226,13 +262,6 @@ def lib_dir
       root.join("lib")
     end
 
-    # Sometimes rubygems version under test does not include
-    # https://github.com/rubygems/rubygems/pull/2728 and will not always end up
-    # activating the current bundler. In that case, require bundler absolutely.
-    def entrypoint
-      Gem.rubygems_version < Gem::Version.new("3.1.a") ? "#{lib_dir}/bundler" : "bundler"
-    end
-
     def global_plugin_gem(*args)
       home ".bundle", "plugin", "gems", *args
     end
@@ -248,35 +277,64 @@ def tmpdir(*args)
     def replace_version_file(version, dir: source_root)
       version_file = File.expand_path("lib/bundler/version.rb", dir)
       contents = File.read(version_file)
-      contents.sub!(/(^\s+VERSION\s*=\s*)"#{Gem::Version::VERSION_PATTERN}"/, %(\\1"#{version}"))
+      contents.sub!(/(^\s+VERSION\s*=\s*).*$/, %(\\1"#{version}"))
       File.open(version_file, "w") {|f| f << contents }
     end
 
-    def ruby_core?
-      # avoid to warnings
-      @ruby_core ||= nil
+    def replace_required_ruby_version(version, dir:)
+      gemspec_file = File.expand_path("bundler.gemspec", dir)
+      contents = File.read(gemspec_file)
+      contents.sub!(/(^\s+s\.required_ruby_version\s*=\s*)"[^"]+"/, %(\\1"#{version}"))
+      File.open(gemspec_file, "w") {|f| f << contents }
+    end
 
-      if @ruby_core.nil?
-        @ruby_core = true & ENV["GEM_COMMAND"]
-      else
-        @ruby_core
-      end
+    def replace_changelog(version, dir:)
+      changelog = File.expand_path("CHANGELOG.md", dir)
+      contents = File.readlines(changelog)
+      contents = [contents[0], contents[1], "## #{version} (2100-01-01)\n", *contents[3..-1]].join
+      File.open(changelog, "w") {|f| f << contents }
     end
 
     def git_root
       ruby_core? ? source_root : source_root.parent
     end
 
+    def rake_path
+      find_base_path("rake")
+    end
+
+    def rake_version
+      File.basename(rake_path).delete_prefix("rake-").delete_suffix(".gem")
+    end
+
+    def sinatra_dependency_paths
+      deps = %w[
+        mustermann
+        rack
+        tilt
+        sinatra
+        ruby2_keywords
+        base64
+        logger
+        cgi
+      ]
+      Dir[scoped_base_system_gem_path.join("gems/{#{deps.join(",")}}-*/lib")].map(&:to_s)
+    end
+
     private
 
+    def find_base_path(name)
+      Dir["#{scoped_base_system_gem_path}/**/#{name}-*.gem"].first
+    end
+
     def git_ls_files(glob)
       skip "Not running on a git context, since running tests from a tarball" if ruby_core_tarball?
 
-      sys_exec("git ls-files -z -- #{glob}", :dir => source_root).split("\x0")
+      git("ls-files -z -- #{glob}", source_root).split("\x0")
     end
 
     def tracked_files_glob
-      ruby_core? ? "lib/bundler lib/bundler.rb spec/bundler man/bundle*" : ""
+      ruby_core? ? "libexec/bundle* lib/bundler lib/bundler.rb spec/bundler man/bundle*" : "lib exe spec CHANGELOG.md LICENSE.md README.md bundler.gemspec"
     end
 
     def lib_tracked_files_glob
@@ -292,11 +350,11 @@ def ruby_core_tarball?
     end
 
     def rubocop_gemfile_basename
-      tool_dir.join(RUBY_VERSION.start_with?("2.6") ? "rubocop26_gems.rb" : "rubocop_gems.rb")
+      tool_dir.join("rubocop_gems.rb")
     end
 
     def standard_gemfile_basename
-      tool_dir.join(RUBY_VERSION.start_with?("2.6") ? "standard26_gems.rb" : "standard_gems.rb")
+      tool_dir.join("standard_gems.rb")
     end
 
     def tool_dir
diff --git a/spec/bundler/support/platforms.rb b/spec/bundler/support/platforms.rb
index eca1b2e60d4371..56a08430056b98 100644
--- a/spec/bundler/support/platforms.rb
+++ b/spec/bundler/support/platforms.rb
@@ -2,64 +2,22 @@
 
 module Spec
   module Platforms
-    include Bundler::GemHelpers
-
-    def rb
-      Gem::Platform::RUBY
-    end
-
-    def mac
-      Gem::Platform.new("x86-darwin-10")
-    end
-
-    def x64_mac
-      Gem::Platform.new("x86_64-darwin-15")
-    end
-
-    def java
-      Gem::Platform.new([nil, "java", nil])
-    end
-
-    def linux
-      Gem::Platform.new("x86_64-linux")
-    end
-
-    def x86_mswin32
-      Gem::Platform.new(["x86", "mswin32", nil])
-    end
-
-    def x64_mswin64
-      Gem::Platform.new(["x64", "mswin64", nil])
-    end
-
-    def x86_mingw32
-      Gem::Platform.new(["x86", "mingw32", nil])
-    end
-
-    def x64_mingw32
-      Gem::Platform.new(["x64", "mingw32", nil])
-    end
-
-    def x64_mingw_ucrt
-      Gem::Platform.new(["x64", "mingw", "ucrt"])
+    def not_local
+      generic_local_platform == Gem::Platform::RUBY ? "java" : Gem::Platform::RUBY
     end
 
-    def windows_platforms
-      [x86_mswin32, x64_mswin64, x86_mingw32, x64_mingw32, x64_mingw_ucrt]
+    def local_platform
+      Bundler.local_platform
     end
 
-    def all_platforms
-      [rb, java, linux, windows_platforms].flatten
-    end
-
-    def not_local
-      all_platforms.find {|p| p != generic_local_platform }
+    def generic_local_platform
+      Gem::Platform.generic(local_platform)
     end
 
     def local_tag
-      if RUBY_PLATFORM == "java"
+      if Gem.java_platform?
         :jruby
-      elsif ["x64-mingw32", "x64-mingw-ucrt"].include?(RUBY_PLATFORM)
+      elsif Gem.win_platform?
         :windows
       else
         :ruby
@@ -95,12 +53,23 @@ def not_local_patchlevel
       9999
     end
 
-    def lockfile_platforms(*extra)
-      formatted_lockfile_platforms(local_platform, *extra)
+    def default_platform_list(*extra, defaults: default_locked_platforms)
+      defaults.concat(extra).map(&:to_s).uniq
+    end
+
+    def lockfile_platforms(*extra, defaults: default_locked_platforms)
+      platforms = default_platform_list(*extra, defaults: defaults)
+      platforms.sort.join("\n  ")
     end
 
-    def formatted_lockfile_platforms(*platforms)
-      platforms.map(&:to_s).sort.join("\n  ")
+    def default_locked_platforms
+      [local_platform, generic_default_locked_platform].compact
+    end
+
+    def generic_default_locked_platform
+      return unless Bundler::MatchPlatform.generic_local_platform_is_ruby?
+
+      Gem::Platform::RUBY
     end
   end
 end
diff --git a/spec/bundler/support/rubygems_ext.rb b/spec/bundler/support/rubygems_ext.rb
index 936c82d08cc16b..2d681529aac2ef 100644
--- a/spec/bundler/support/rubygems_ext.rb
+++ b/spec/bundler/support/rubygems_ext.rb
@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+abort "RubyGems only supports Ruby 3.2 or higher" if RUBY_VERSION < "3.2.0"
+
 require_relative "path"
 
 $LOAD_PATH.unshift(Spec::Path.source_lib_dir.to_s)
@@ -8,10 +10,6 @@ module Spec
   module Rubygems
     extend self
 
-    def dev_setup
-      install_gems(dev_gemfile)
-    end
-
     def gem_load(gem_name, bin_container)
       require_relative "switch_rubygems"
 
@@ -24,12 +22,15 @@ def gem_load_and_possibly_install(gem_name, bin_container)
       gem_load_activate_and_possibly_install(gem_name, bin_container)
     end
 
-    def gem_require(gem_name)
+    def gem_require(gem_name, entrypoint)
       gem_activate(gem_name)
-      require gem_name
+      require entrypoint
     end
 
     def test_setup
+      # Install test dependencies unless parallel-rspec is being used, since in that case they should be setup already
+      install_test_deps unless ENV["RSPEC_FORMATTER_OUTPUT_ID"]
+
       setup_test_paths
 
       require "fileutils"
@@ -38,42 +39,29 @@ def test_setup
       FileUtils.mkdir_p(Path.tmpdir)
 
       ENV["HOME"] = Path.home.to_s
+      # Remove "RUBY_CODESIGN", which is used by mkmf-generated Makefile to
+      # sign extension bundles on macOS, to avoid trying to find the specified key
+      # from the fake $HOME/Library/Keychains directory.
+      ENV.delete "RUBY_CODESIGN"
       ENV["TMPDIR"] = Path.tmpdir.to_s
 
       require "rubygems/user_interaction"
       Gem::DefaultUserInteraction.ui = Gem::SilentUI.new
     end
 
-    def install_parallel_test_deps
-      Gem.clear_paths
-
-      require "parallel"
-      require "fileutils"
-
-      install_test_deps
-
-      (2..Parallel.processor_count).each do |n|
-        source = Path.source_root.join("tmp", "1")
-        destination = Path.source_root.join("tmp", n.to_s)
-
-        FileUtils.rm_rf destination
-        FileUtils.cp_r source, destination
-      end
-    end
-
     def setup_test_paths
-      Gem.clear_paths
-
       ENV["BUNDLE_PATH"] = nil
-      ENV["GEM_HOME"] = ENV["GEM_PATH"] = Path.base_system_gem_path.to_s
-      ENV["PATH"] = [Path.system_gem_path.join("bin"), ENV["PATH"]].join(File::PATH_SEPARATOR)
-      ENV["PATH"] = [Path.bindir, ENV["PATH"]].join(File::PATH_SEPARATOR) if Path.ruby_core?
+      ENV["PATH"] = [Path.system_gem_path("bin"), ENV["PATH"]].join(File::PATH_SEPARATOR)
+      ENV["PATH"] = [Path.exedir, ENV["PATH"]].join(File::PATH_SEPARATOR) if Path.ruby_core?
     end
 
     def install_test_deps
-      install_gems(test_gemfile, Path.base_system_gems.to_s)
-      install_gems(rubocop_gemfile, Path.rubocop_gems.to_s)
-      install_gems(standard_gemfile, Path.standard_gems.to_s)
+      dev_bundle("install", gemfile: test_gemfile, path: Path.base_system_gem_path.to_s)
+      dev_bundle("install", gemfile: rubocop_gemfile, path: Path.rubocop_gem_path.to_s)
+      dev_bundle("install", gemfile: standard_gemfile, path: Path.standard_gem_path.to_s)
+
+      require_relative "helpers"
+      Helpers.install_dev_bundler
     end
 
     def check_source_control_changes(success_message:, error_message:)
@@ -86,7 +74,7 @@ def check_source_control_changes(success_message:, error_message:)
         puts success_message
         puts
       else
-        system("git status --porcelain")
+        system("git diff")
 
         puts
         puts error_message
@@ -96,6 +84,36 @@ def check_source_control_changes(success_message:, error_message:)
       end
     end
 
+    def dev_bundle(*args, gemfile: dev_gemfile, path: nil)
+      old_gemfile = ENV["BUNDLE_GEMFILE"]
+      old_orig_gemfile = ENV["BUNDLER_ORIG_BUNDLE_GEMFILE"]
+      ENV["BUNDLE_GEMFILE"] = gemfile.to_s
+      ENV["BUNDLER_ORIG_BUNDLE_GEMFILE"] = nil
+
+      if path
+        old_path = ENV["BUNDLE_PATH"]
+        ENV["BUNDLE_PATH"] = path
+      else
+        old_path__system = ENV["BUNDLE_PATH__SYSTEM"]
+        ENV["BUNDLE_PATH__SYSTEM"] = "true"
+      end
+
+      require "shellwords"
+      # We don't use `Open3` here because it does not work on JRuby + Windows
+      output = `ruby #{Path.dev_binstub} #{args.shelljoin}`
+      raise output unless $?.success?
+      output
+    ensure
+      if path
+        ENV["BUNDLE_PATH"] = old_path
+      else
+        ENV["BUNDLE_PATH__SYSTEM"] = old_path__system
+      end
+
+      ENV["BUNDLER_ORIG_BUNDLE_GEMFILE"] = old_orig_gemfile
+      ENV["BUNDLE_GEMFILE"] = old_gemfile
+    end
+
     private
 
     def gem_load_and_activate(gem_name, bin_container)
@@ -124,33 +142,6 @@ def gem_activate(gem_name)
       gem gem_name, gem_requirement
     end
 
-    def install_gems(gemfile, path = nil)
-      old_gemfile = ENV["BUNDLE_GEMFILE"]
-      old_orig_gemfile = ENV["BUNDLER_ORIG_BUNDLE_GEMFILE"]
-      ENV["BUNDLE_GEMFILE"] = gemfile.to_s
-      ENV["BUNDLER_ORIG_BUNDLE_GEMFILE"] = nil
-
-      if path
-        old_path = ENV["BUNDLE_PATH"]
-        ENV["BUNDLE_PATH"] = path
-      else
-        old_path__system = ENV["BUNDLE_PATH__SYSTEM"]
-        ENV["BUNDLE_PATH__SYSTEM"] = "true"
-      end
-
-      puts `#{Gem.ruby} #{File.expand_path("support/bundle.rb", Path.spec_dir)} install --verbose`
-      raise unless $?.success?
-    ensure
-      if path
-        ENV["BUNDLE_PATH"] = old_path
-      else
-        ENV["BUNDLE_PATH__SYSTEM"] = old_path__system
-      end
-
-      ENV["BUNDLER_ORIG_BUNDLE_GEMFILE"] = old_orig_gemfile
-      ENV["BUNDLE_GEMFILE"] = old_gemfile
-    end
-
     def test_gemfile
       Path.test_gemfile
     end
diff --git a/spec/bundler/support/rubygems_version_manager.rb b/spec/bundler/support/rubygems_version_manager.rb
index 5653601ae89176..c174c461f01915 100644
--- a/spec/bundler/support/rubygems_version_manager.rb
+++ b/spec/bundler/support/rubygems_version_manager.rb
@@ -1,12 +1,13 @@
 # frozen_string_literal: true
 
-require "pathname"
-require_relative "helpers"
-require_relative "path"
+require_relative "options"
+require_relative "env"
+require_relative "subprocess"
 
 class RubygemsVersionManager
-  include Spec::Helpers
-  include Spec::Path
+  include Spec::Options
+  include Spec::Env
+  include Spec::Subprocess
 
   def initialize(source)
     @source = source
@@ -30,11 +31,10 @@ def assert_system_features_not_loaded!
       rubygems_default_path = rubygems_path + "/defaults"
 
       bundler_path = rubylibdir + "/bundler"
-      bundler_exemptions = Gem.rubygems_version < Gem::Version.new("3.2.0") ? [bundler_path + "/errors.rb"] : []
 
       bad_loaded_features = $LOADED_FEATURES.select do |loaded_feature|
         (loaded_feature.start_with?(rubygems_path) && !loaded_feature.start_with?(rubygems_default_path)) ||
-          (loaded_feature.start_with?(bundler_path) && !bundler_exemptions.any? {|bundler_exemption| loaded_feature.start_with?(bundler_exemption) })
+          loaded_feature.start_with?(bundler_path)
       end
 
       errors = if bad_loaded_features.any?
@@ -58,7 +58,7 @@ def reexec_if_needed
 
     cmd = [RbConfig.ruby, $0, *ARGV].compact
 
-    ENV["RUBYOPT"] = opt_add("-I#{local_copy_path.join("lib")}", opt_remove("--disable-gems", ENV["RUBYOPT"]))
+    ENV["RUBYOPT"] = opt_add("-I#{File.join(local_copy_path, "lib")}", opt_remove("--disable-gems", ENV["RUBYOPT"]))
 
     exec(ENV, *cmd)
   end
@@ -66,14 +66,14 @@ def reexec_if_needed
   def switch_local_copy_if_needed
     return unless local_copy_switch_needed?
 
-    sys_exec("git checkout #{target_tag}", :dir => local_copy_path)
+    git("checkout #{target_tag}", local_copy_path)
 
-    ENV["RGV"] = local_copy_path.to_s
+    ENV["RGV"] = local_copy_path
   end
 
   def rubygems_unrequire_needed?
     require "rubygems"
-    !$LOADED_FEATURES.include?(local_copy_path.join("lib/rubygems.rb").to_s)
+    !$LOADED_FEATURES.include?(File.join(local_copy_path, "lib/rubygems.rb"))
   end
 
   def local_copy_switch_needed?
@@ -85,7 +85,7 @@ def target_tag
   end
 
   def local_copy_tag
-    sys_exec("git rev-parse --abbrev-ref HEAD", :dir => local_copy_path)
+    git("rev-parse --abbrev-ref HEAD", local_copy_path)
   end
 
   def local_copy_path
@@ -95,21 +95,25 @@ def local_copy_path
   def resolve_local_copy_path
     return expanded_source if source_is_path?
 
-    rubygems_path = source_root.join("tmp/rubygems")
+    rubygems_path = File.join(source_root, "tmp/rubygems")
 
-    unless rubygems_path.directory?
-      sys_exec("git clone .. #{rubygems_path}", :dir => source_root)
+    unless File.directory?(rubygems_path)
+      git("clone .. #{rubygems_path}", source_root)
     end
 
     rubygems_path
   end
 
   def source_is_path?
-    expanded_source.directory?
+    File.directory?(expanded_source)
   end
 
   def expanded_source
-    @expanded_source ||= Pathname.new(@source).expand_path(source_root)
+    @expanded_source ||= File.expand_path(@source, source_root)
+  end
+
+  def source_root
+    @source_root ||= File.expand_path(ruby_core? ? "../../.." : "../..", __dir__)
   end
 
   def resolve_target_tag
diff --git a/spec/bundler/support/setup.rb b/spec/bundler/support/setup.rb
new file mode 100644
index 00000000000000..4ac2e5b472dc9e
--- /dev/null
+++ b/spec/bundler/support/setup.rb
@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+require_relative "switch_rubygems"
+
+require_relative "rubygems_ext"
+Spec::Rubygems.install_test_deps
+
+require_relative "path"
+$LOAD_PATH.unshift(File.expand_path("../../lib", __dir__)) if Spec::Path.ruby_core?
diff --git a/spec/bundler/support/silent_logger.rb b/spec/bundler/support/silent_logger.rb
deleted file mode 100644
index 8665beb2c9f380..00000000000000
--- a/spec/bundler/support/silent_logger.rb
+++ /dev/null
@@ -1,10 +0,0 @@
-# frozen_string_literal: true
-
-require "logger"
-module Spec
-  class SilentLogger
-    (::Logger.instance_methods - Object.instance_methods).each do |logger_instance_method|
-      define_method(logger_instance_method) {|*args, &blk| }
-    end
-  end
-end
diff --git a/spec/bundler/support/subprocess.rb b/spec/bundler/support/subprocess.rb
new file mode 100644
index 00000000000000..e160d5c9cf0e01
--- /dev/null
+++ b/spec/bundler/support/subprocess.rb
@@ -0,0 +1,112 @@
+# frozen_string_literal: true
+
+require_relative "command_execution"
+
+module Spec
+  module Subprocess
+    class TimeoutExceeded < StandardError; end
+
+    def command_executions
+      @command_executions ||= []
+    end
+
+    def last_command
+      command_executions.last || raise("There is no last command")
+    end
+
+    def out
+      last_command.stdout
+    end
+
+    def err
+      last_command.stderr
+    end
+
+    def stdboth
+      last_command.stdboth
+    end
+
+    def exitstatus
+      last_command.exitstatus
+    end
+
+    def git(cmd, path = Dir.pwd, options = {})
+      sh("git #{cmd}", options.merge(dir: path))
+    end
+
+    def sh(cmd, options = {})
+      dir = options[:dir]
+      env = options[:env] || {}
+
+      command_execution = CommandExecution.new(cmd.to_s, working_directory: dir, timeout: options[:timeout] || 60)
+
+      require "open3"
+      require "shellwords"
+      Open3.popen3(env, *cmd.shellsplit, chdir: dir) do |stdin, stdout, stderr, wait_thr|
+        yield stdin, stdout, wait_thr if block_given?
+        stdin.close
+
+        stdout_handler = ->(data) { command_execution.original_stdout << data }
+        stderr_handler = ->(data) { command_execution.original_stderr << data }
+
+        stdout_thread = read_stream(stdout, stdout_handler, timeout: command_execution.timeout)
+        stderr_thread = read_stream(stderr, stderr_handler, timeout: command_execution.timeout)
+
+        stdout_thread.join
+        stderr_thread.join
+
+        status = wait_thr.value
+        command_execution.exitstatus = if status.exited?
+          status.exitstatus
+        elsif status.signaled?
+          exit_status_for_signal(status.termsig)
+        end
+      rescue TimeoutExceeded
+        command_execution.failure_reason = :timeout
+        command_execution.exitstatus = exit_status_for_signal(Signal.list["INT"])
+      end
+
+      unless options[:raise_on_error] == false || command_execution.success?
+        command_execution.raise_error!
+      end
+
+      command_executions << command_execution
+
+      command_execution.stdout
+    end
+
+    # Mostly copied from https://github.com/piotrmurach/tty-command/blob/49c37a895ccea107e8b78d20e4cb29de6a1a53c8/lib/tty/command/process_runner.rb#L165-L193
+    def read_stream(stream, handler, timeout:)
+      Thread.new do
+        Thread.current.report_on_exception = false
+        cmd_start = Time.now
+        readers = [stream]
+
+        while readers.any?
+          ready = IO.select(readers, nil, readers, timeout)
+          raise TimeoutExceeded if ready.nil?
+
+          ready[0].each do |reader|
+            chunk = reader.readpartial(16 * 1024)
+            handler.call(chunk)
+
+            # control total time spent reading
+            runtime = Time.now - cmd_start
+            time_left = timeout - runtime
+            raise TimeoutExceeded if time_left < 0.0
+          rescue Errno::EAGAIN, Errno::EINTR
+          rescue EOFError, Errno::EPIPE, Errno::EIO
+            readers.delete(reader)
+            reader.close
+          end
+        end
+      end
+    end
+
+    def all_commands_output
+      return "" if command_executions.empty?
+
+      "\n\nCommands:\n#{command_executions.map(&:to_s_verbose).join("\n\n")}"
+    end
+  end
+end
diff --git a/spec/bundler/support/the_bundle.rb b/spec/bundler/support/the_bundle.rb
index f252a4515bb9c8..bda717f3b00bf3 100644
--- a/spec/bundler/support/the_bundle.rb
+++ b/spec/bundler/support/the_bundle.rb
@@ -31,5 +31,13 @@ def locked_gems
       raise "Cannot read lockfile if it doesn't exist" unless locked?
       Bundler::LockfileParser.new(lockfile.read)
     end
+
+    def locked_specs
+      locked_gems.specs.map(&:full_name)
+    end
+
+    def locked_platforms
+      locked_gems.platforms.map(&:to_s)
+    end
   end
 end
diff --git a/spec/bundler/support/vendored_net_http.rb b/spec/bundler/support/vendored_net_http.rb
new file mode 100644
index 00000000000000..8ff2ccd1fe877d
--- /dev/null
+++ b/spec/bundler/support/vendored_net_http.rb
@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+# This defined? guard can be removed once RubyGems 3.4 support is dropped.
+#
+# Bundler specs load this code from `spec/support/vendored_net_http.rb` to avoid
+# activating the Bundler gem too early. Without this guard, we get redefinition
+# warnings once Bundler is actually activated and
+# `lib/bundler/vendored_net_http.rb` is required. This is not an issue in
+# RubyGems versions including `rubygems/vendored_net_http` since `require` takes
+# care of avoiding the double load.
+#
+unless defined?(Gem::Net)
+  begin
+    require "rubygems/vendored_net_http"
+  rescue LoadError
+    begin
+      require "rubygems/net/http"
+    rescue LoadError
+      require "net/http"
+      Gem::Net = Net
+    end
+  end
+end
diff --git a/spec/bundler/update/gemfile_spec.rb b/spec/bundler/update/gemfile_spec.rb
index 1c5294101ecf72..cb94799061f008 100644
--- a/spec/bundler/update/gemfile_spec.rb
+++ b/spec/bundler/update/gemfile_spec.rb
@@ -4,25 +4,25 @@
   context "with --gemfile" do
     it "finds the gemfile" do
       gemfile bundled_app("NotGemfile"), <<-G
-        source "#{file_uri_for(gem_repo1)}"
-        gem 'rack'
+        source "https://gem.repo1"
+        gem 'myrack'
       G
 
-      bundle :install, :gemfile => bundled_app("NotGemfile")
-      bundle :update, :gemfile => bundled_app("NotGemfile"), :all => true
+      bundle :install, gemfile: bundled_app("NotGemfile")
+      bundle :update, gemfile: bundled_app("NotGemfile"), all: true
 
       # Specify BUNDLE_GEMFILE for `the_bundle`
       # to retrieve the proper Gemfile
       ENV["BUNDLE_GEMFILE"] = "NotGemfile"
-      expect(the_bundle).to include_gems "rack 1.0.0"
+      expect(the_bundle).to include_gems "myrack 1.0.0"
     end
   end
 
   context "with gemfile set via config" do
     before do
       gemfile bundled_app("NotGemfile"), <<-G
-        source "#{file_uri_for(gem_repo1)}"
-        gem 'rack'
+        source "https://gem.repo1"
+        gem 'myrack'
       G
 
       bundle "config set --local gemfile #{bundled_app("NotGemfile")}"
@@ -30,18 +30,18 @@
     end
 
     it "uses the gemfile to update" do
-      bundle "update", :all => true
+      bundle "update", all: true
       bundle "list"
 
-      expect(out).to include("rack (1.0.0)")
+      expect(out).to include("myrack (1.0.0)")
     end
 
     it "uses the gemfile while in a subdirectory" do
       bundled_app("subdir").mkpath
-      bundle "update", :all => true, :dir => bundled_app("subdir")
-      bundle "list", :dir => bundled_app("subdir")
+      bundle "update", all: true, dir: bundled_app("subdir")
+      bundle "list", dir: bundled_app("subdir")
 
-      expect(out).to include("rack (1.0.0)")
+      expect(out).to include("myrack (1.0.0)")
     end
   end
 end
diff --git a/spec/bundler/update/gems/fund_spec.rb b/spec/bundler/update/gems/fund_spec.rb
index d80f4018f3ad97..a5624d3e0ad957 100644
--- a/spec/bundler/update/gems/fund_spec.rb
+++ b/spec/bundler/update/gems/fund_spec.rb
@@ -24,7 +24,7 @@
     end
 
     gemfile <<-G
-      source "#{file_uri_for(gem_repo2)}"
+      source "https://gem.repo2"
       gem 'has_funding_and_other_metadata'
       gem 'has_funding', '< 2.0'
     G
@@ -35,12 +35,12 @@
   context "when listed gems are updated" do
     before do
       gemfile <<-G
-        source "#{file_uri_for(gem_repo2)}"
+        source "https://gem.repo2"
         gem 'has_funding_and_other_metadata'
         gem 'has_funding'
       G
 
-      bundle :update, :all => true
+      bundle :update, all: true
     end
 
     it "displays fund message" do
diff --git a/spec/bundler/update/gems/post_install_spec.rb b/spec/bundler/update/gems/post_install_spec.rb
index 3aaa659d574925..9c71f6e0e3866e 100644
--- a/spec/bundler/update/gems/post_install_spec.rb
+++ b/spec/bundler/update/gems/post_install_spec.rb
@@ -5,8 +5,8 @@
 
   before do
     gemfile <<-G
-      source "#{file_uri_for(gem_repo1)}"
-      gem 'rack', "< 1.0"
+      source "https://gem.repo1"
+      gem 'myrack', "< 1.0"
       gem 'thin'
     G
 
@@ -17,10 +17,10 @@
 
   shared_examples "a config observer" do
     context "when ignore post-install messages for gem is set" do
-      let(:config) { "ignore_messages.rack true" }
+      let(:config) { "ignore_messages.myrack true" }
 
       it "doesn't display gem's post-install message" do
-        expect(out).not_to include("Rack's post install message")
+        expect(out).not_to include("Myrack's post install message")
       end
     end
 
@@ -35,8 +35,8 @@
 
   shared_examples "a post-install message outputter" do
     it "should display post-install messages for updated gems" do
-      expect(out).to include("Post-install message from rack:")
-      expect(out).to include("Rack's post install message")
+      expect(out).to include("Post-install message from myrack:")
+      expect(out).to include("Myrack's post install message")
     end
 
     it "should not display the post-install message for non-updated gems" do
@@ -47,12 +47,12 @@
   context "when listed gem is updated" do
     before do
       gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
-        gem 'rack'
+        source "https://gem.repo1"
+        gem 'myrack'
         gem 'thin'
       G
 
-      bundle :update, :all => true
+      bundle :update, all: true
     end
 
     it_behaves_like "a post-install message outputter"
@@ -62,12 +62,12 @@
   context "when dependency triggers update" do
     before do
       gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
-        gem 'rack-obama'
+        source "https://gem.repo1"
+        gem 'myrack-obama'
         gem 'thin'
       G
 
-      bundle :update, :all => true
+      bundle :update, all: true
     end
 
     it_behaves_like "a post-install message outputter"
diff --git a/spec/bundler/update/git_spec.rb b/spec/bundler/update/git_spec.rb
index 59e3d2f5fb5c89..2cb0abe02fb57b 100644
--- a/spec/bundler/update/git_spec.rb
+++ b/spec/bundler/update/git_spec.rb
@@ -4,10 +4,10 @@
   describe "git sources" do
     it "floats on a branch when :branch is used" do
       build_git "foo", "1.0"
-      update_git "foo", :branch => "omg"
+      update_git "foo", branch: "omg"
 
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
+        source "https://gem.repo1"
         git "#{lib_path("foo-1.0")}", :branch => "omg" do
           gem 'foo'
         end
@@ -17,20 +17,20 @@
         s.write "lib/foo.rb", "FOO = '1.1'"
       end
 
-      bundle "update", :all => true
+      bundle "update", all: true
 
       expect(the_bundle).to include_gems "foo 1.1"
     end
 
     it "updates correctly when you have like craziness" do
-      build_lib "activesupport", "3.0", :path => lib_path("rails/activesupport")
-      build_git "rails", "3.0", :path => lib_path("rails") do |s|
+      build_lib "activesupport", "3.0", path: lib_path("rails/activesupport")
+      build_git "rails", "3.0", path: lib_path("rails") do |s|
         s.add_dependency "activesupport", "= 3.0"
       end
 
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
-        gem "rails", :git => "#{file_uri_for(lib_path("rails"))}"
+        source "https://gem.repo1"
+        gem "rails", :git => "#{lib_path("rails")}"
       G
 
       bundle "update rails"
@@ -38,17 +38,17 @@
     end
 
     it "floats on a branch when :branch is used and the source is specified in the update" do
-      build_git "foo", "1.0", :path => lib_path("foo")
-      update_git "foo", :branch => "omg", :path => lib_path("foo")
+      build_git "foo", "1.0", path: lib_path("foo")
+      update_git "foo", branch: "omg", path: lib_path("foo")
 
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
+        source "https://gem.repo1"
         git "#{lib_path("foo")}", :branch => "omg" do
           gem 'foo'
         end
       G
 
-      update_git "foo", :path => lib_path("foo") do |s|
+      update_git "foo", path: lib_path("foo") do |s|
         s.write "lib/foo.rb", "FOO = '1.1'"
       end
 
@@ -58,18 +58,18 @@
     end
 
     it "floats on main when updating all gems that are pinned to the source even if you have child dependencies" do
-      build_git "foo", :path => lib_path("foo")
-      build_gem "bar", :to_bundle => true do |s|
+      build_git "foo", path: lib_path("foo")
+      build_gem "bar", to_bundle: true do |s|
         s.add_dependency "foo"
       end
 
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
-        gem "foo", :git => "#{file_uri_for(lib_path("foo"))}"
+        source "https://gem.repo1"
+        gem "foo", :git => "#{lib_path("foo")}"
         gem "bar"
       G
 
-      update_git "foo", :path => lib_path("foo") do |s|
+      update_git "foo", path: lib_path("foo") do |s|
         s.write "lib/foo.rb", "FOO = '1.1'"
       end
 
@@ -79,47 +79,47 @@
     end
 
     it "notices when you change the repo url in the Gemfile" do
-      build_git "foo", :path => lib_path("foo_one")
-      build_git "foo", :path => lib_path("foo_two")
+      build_git "foo", path: lib_path("foo_one")
+      build_git "foo", path: lib_path("foo_two")
 
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
-        gem "foo", "1.0", :git => "#{file_uri_for(lib_path("foo_one"))}"
+        source "https://gem.repo1"
+        gem "foo", "1.0", :git => "#{lib_path("foo_one")}"
       G
 
-      FileUtils.rm_rf lib_path("foo_one")
+      FileUtils.rm_r lib_path("foo_one")
 
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
-        gem "foo", "1.0", :git => "#{file_uri_for(lib_path("foo_two"))}"
+        source "https://gem.repo1"
+        gem "foo", "1.0", :git => "#{lib_path("foo_two")}"
       G
 
       expect(err).to be_empty
-      expect(out).to include("Fetching #{file_uri_for(lib_path)}/foo_two")
+      expect(out).to include("Fetching #{lib_path}/foo_two")
       expect(out).to include("Bundle complete!")
     end
 
     it "fetches tags from the remote" do
       build_git "foo"
-      @remote = build_git("bar", :bare => true)
-      update_git "foo", :remote => file_uri_for(@remote.path)
-      update_git "foo", :push => "main"
+      @remote = build_git("bar", bare: true)
+      update_git "foo", remote: @remote.path
+      update_git "foo", push: "main"
 
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
+        source "https://gem.repo1"
         gem 'foo', :git => "#{@remote.path}"
       G
 
       # Create a new tag on the remote that needs fetching
-      update_git "foo", :tag => "fubar"
-      update_git "foo", :push => "fubar"
+      update_git "foo", tag: "fubar"
+      update_git "foo", push: "fubar"
 
       gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
+        source "https://gem.repo1"
         gem 'foo', :git => "#{@remote.path}", :tag => "fubar"
       G
 
-      bundle "update", :all => true
+      bundle "update", all: true
       expect(err).to be_empty
     end
 
@@ -142,13 +142,13 @@
           s.add_dependency "submodule"
         end
 
-        sys_exec "git submodule add #{lib_path("submodule-1.0")} submodule-1.0", :dir => lib_path("has_submodule-1.0")
-        sys_exec "git commit -m \"submodulator\"", :dir => lib_path("has_submodule-1.0")
+        git "submodule add #{lib_path("submodule-1.0")} submodule-1.0", lib_path("has_submodule-1.0")
+        git "commit -m \"submodulator\"", lib_path("has_submodule-1.0")
       end
 
       it "it unlocks the source when submodules are added to a git source" do
         install_gemfile <<-G
-          source "#{file_uri_for(gem_repo4)}"
+          source "https://gem.repo4"
           git "#{lib_path("has_submodule-1.0")}" do
             gem "has_submodule"
           end
@@ -158,7 +158,7 @@
         expect(out).to eq("GEM")
 
         install_gemfile <<-G
-          source "#{file_uri_for(gem_repo4)}"
+          source "https://gem.repo4"
           git "#{lib_path("has_submodule-1.0")}", :submodules => true do
             gem "has_submodule"
           end
@@ -168,9 +168,9 @@
         expect(out).to eq("GIT")
       end
 
-      it "unlocks the source when submodules are removed from git source", :git => ">= 2.9.0" do
+      it "unlocks the source when submodules are removed from git source", git: ">= 2.9.0" do
         install_gemfile <<-G
-          source "#{file_uri_for(gem_repo4)}"
+          source "https://gem.repo4"
           git "#{lib_path("has_submodule-1.0")}", :submodules => true do
             gem "has_submodule"
           end
@@ -180,7 +180,7 @@
         expect(out).to eq("GIT")
 
         install_gemfile <<-G
-          source "#{file_uri_for(gem_repo4)}"
+          source "https://gem.repo4"
           git "#{lib_path("has_submodule-1.0")}" do
             gem "has_submodule"
           end
@@ -195,67 +195,67 @@
       build_git "foo", "1.0"
 
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
-        gem "foo", :git => "#{file_uri_for(lib_path("foo-1.0"))}"
+        source "https://gem.repo1"
+        gem "foo", :git => "#{lib_path("foo-1.0")}"
       G
 
       lib_path("foo-1.0").join(".git").rmtree
 
-      bundle :update, :all => true, :raise_on_error => false
+      bundle :update, all: true, raise_on_error: false
       expect(err).to include(lib_path("foo-1.0").to_s).
         and match(/Git error: command `git fetch.+has failed/)
     end
 
     it "should not explode on invalid revision on update of gem by name" do
-      build_git "rack", "0.8"
+      build_git "myrack", "0.8"
 
-      build_git "rack", "0.8", :path => lib_path("local-rack") do |s|
-        s.write "lib/rack.rb", "puts :LOCAL"
+      build_git "myrack", "0.8", path: lib_path("local-myrack") do |s|
+        s.write "lib/myrack.rb", "puts :LOCAL"
       end
 
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
-        gem "rack", :git => "#{file_uri_for(lib_path("rack-0.8"))}", :branch => "main"
+        source "https://gem.repo1"
+        gem "myrack", :git => "#{lib_path("myrack-0.8")}", :branch => "main"
       G
 
-      bundle %(config set local.rack #{lib_path("local-rack")})
-      bundle "update rack"
+      bundle %(config set local.myrack #{lib_path("local-myrack")})
+      bundle "update myrack"
       expect(out).to include("Bundle updated!")
     end
 
     it "shows the previous version of the gem" do
-      build_git "rails", "2.3.2", :path => lib_path("rails")
+      build_git "rails", "2.3.2", path: lib_path("rails")
 
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
-        gem "rails", :git => "#{file_uri_for(lib_path("rails"))}"
+        source "https://gem.repo1"
+        gem "rails", :git => "#{lib_path("rails")}"
       G
 
-      update_git "rails", "3.0", :path => lib_path("rails"), :gemspec => true
+      update_git "rails", "3.0", path: lib_path("rails"), gemspec: true
 
-      bundle "update", :all => true
-      expect(out).to include("Using rails 3.0 (was 2.3.2) from #{file_uri_for(lib_path("rails"))} (at main@#{revision_for(lib_path("rails"))[0..6]})")
+      bundle "update", all: true
+      expect(out).to include("Using rails 3.0 (was 2.3.2) from #{lib_path("rails")} (at main@#{revision_for(lib_path("rails"))[0..6]})")
     end
   end
 
   describe "with --source flag" do
     before :each do
       build_repo2
-      @git = build_git "foo", :path => lib_path("foo") do |s|
+      @git = build_git "foo", path: lib_path("foo") do |s|
         s.executables = "foobar"
       end
 
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo2)}"
+        source "https://gem.repo2"
         git "#{lib_path("foo")}" do
           gem 'foo'
         end
-        gem 'rack'
+        gem 'myrack'
       G
     end
 
     it "updates the source" do
-      update_git "foo", :path => @git.path
+      update_git "foo", path: @git.path
 
       bundle "update --source foo"
 
@@ -268,7 +268,7 @@
     end
 
     it "unlocks gems that were originally pulled in by the source" do
-      update_git "foo", "2.0", :path => @git.path
+      update_git "foo", "2.0", path: @git.path
 
       bundle "update --source foo"
       expect(the_bundle).to include_gems "foo 2.0"
@@ -276,24 +276,24 @@
 
     it "leaves all other gems frozen" do
       update_repo2
-      update_git "foo", :path => @git.path
+      update_git "foo", path: @git.path
 
       bundle "update --source foo"
-      expect(the_bundle).to include_gems "rack 1.0"
+      expect(the_bundle).to include_gems "myrack 1.0"
     end
   end
 
   context "when the gem and the repository have different names" do
     before :each do
       build_repo2
-      @git = build_git "foo", :path => lib_path("bar")
+      @git = build_git "foo", path: lib_path("bar")
 
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo2)}"
+        source "https://gem.repo2"
         git "#{lib_path("bar")}" do
           gem 'foo'
         end
-        gem 'rack'
+        gem 'myrack'
       G
     end
 
@@ -301,7 +301,7 @@
       spec_lines = lib_path("bar/foo.gemspec").read.split("\n")
       spec_lines[5] = "s.version = '2.0'"
 
-      update_git "foo", "2.0", :path => @git.path do |s|
+      update_git "foo", "2.0", path: @git.path do |s|
         s.write "foo.gemspec", spec_lines.join("\n")
       end
 
@@ -309,6 +309,11 @@
 
       bundle "update --source bar"
 
+      checksums = checksums_section_when_enabled do |c|
+        c.no_checksum "foo", "2.0"
+        c.checksum gem_repo2, "myrack", "1.0.0"
+      end
+
       expect(lockfile).to eq <<~G
         GIT
           remote: #{@git.path}
@@ -317,17 +322,17 @@
             foo (2.0)
 
         GEM
-          remote: #{file_uri_for(gem_repo2)}/
+          remote: https://gem.repo2/
           specs:
-            rack (1.0.0)
+            myrack (1.0.0)
 
         PLATFORMS
           #{lockfile_platforms}
 
         DEPENDENCIES
           foo!
-          rack
-
+          myrack
+        #{checksums}
         BUNDLED WITH
            #{Bundler::VERSION}
       G
diff --git a/spec/bundler/update/path_spec.rb b/spec/bundler/update/path_spec.rb
index 756770313bff9a..8c76c94e1a107b 100644
--- a/spec/bundler/update/path_spec.rb
+++ b/spec/bundler/update/path_spec.rb
@@ -3,14 +3,14 @@
 RSpec.describe "path sources" do
   describe "bundle update --source" do
     it "shows the previous version of the gem when updated from path source" do
-      build_lib "activesupport", "2.3.5", :path => lib_path("rails/activesupport")
+      build_lib "activesupport", "2.3.5", path: lib_path("rails/activesupport")
 
       install_gemfile <<-G
-      source "#{file_uri_for(gem_repo1)}"
+      source "https://gem.repo1"
       gem "activesupport", :path => "#{lib_path("rails/activesupport")}"
       G
 
-      build_lib "activesupport", "3.0", :path => lib_path("rails/activesupport")
+      build_lib "activesupport", "3.0", path: lib_path("rails/activesupport")
 
       bundle "update --source activesupport"
       expect(out).to include("Using activesupport 3.0 (was 2.3.5) from source at `#{lib_path("rails/activesupport")}`")
diff --git a/spec/bundler/update/redownload_spec.rb b/spec/bundler/update/redownload_spec.rb
index b55593d077642f..1fe25f56066c6d 100644
--- a/spec/bundler/update/redownload_spec.rb
+++ b/spec/bundler/update/redownload_spec.rb
@@ -3,42 +3,42 @@
 RSpec.describe "bundle update" do
   before :each do
     install_gemfile <<-G
-      source "#{file_uri_for(gem_repo1)}"
-      gem "rack"
+      source "https://gem.repo1"
+      gem "myrack"
     G
   end
 
   describe "with --force" do
-    it "shows a deprecation when single flag passed", :bundler => 2 do
-      bundle "update rack --force"
+    it "shows a deprecation when single flag passed" do
+      bundle "update myrack --force"
       expect(err).to include "[DEPRECATED] The `--force` option has been renamed to `--redownload`"
     end
 
-    it "shows a deprecation when multiple flags passed", :bundler => 2 do
-      bundle "update rack --no-color --force"
+    it "shows a deprecation when multiple flags passed" do
+      bundle "update myrack --no-color --force"
       expect(err).to include "[DEPRECATED] The `--force` option has been renamed to `--redownload`"
     end
   end
 
   describe "with --redownload" do
     it "does not show a deprecation when single flag passed" do
-      bundle "update rack --redownload"
+      bundle "update myrack --redownload"
       expect(err).not_to include "[DEPRECATED] The `--force` option has been renamed to `--redownload`"
     end
 
     it "does not show a deprecation when single multiple flags passed" do
-      bundle "update rack --no-color --redownload"
+      bundle "update myrack --no-color --redownload"
       expect(err).not_to include "[DEPRECATED] The `--force` option has been renamed to `--redownload`"
     end
 
     it "re-installs installed gems" do
-      rack_lib = default_bundle_path("gems/rack-1.0.0/lib/rack.rb")
-      rack_lib.open("w") {|f| f.write("blah blah blah") }
-      bundle :update, :redownload => true
+      myrack_lib = default_bundle_path("gems/myrack-1.0.0/lib/myrack.rb")
+      myrack_lib.open("w") {|f| f.write("blah blah blah") }
+      bundle :update, redownload: true
 
-      expect(out).to include "Installing rack 1.0.0"
-      expect(rack_lib.open(&:read)).to eq("RACK = '1.0.0'\n")
-      expect(the_bundle).to include_gems "rack 1.0.0"
+      expect(out).to include "Installing myrack 1.0.0"
+      expect(myrack_lib.open(&:read)).to eq("MYRACK = '1.0.0'\n")
+      expect(the_bundle).to include_gems "myrack 1.0.0"
     end
   end
 end
diff --git a/spec/default.mspec b/spec/default.mspec
index e2ad19e1173ade..058835cd10d91c 100644
--- a/spec/default.mspec
+++ b/spec/default.mspec
@@ -3,10 +3,14 @@ $VERBOSE = false
 if (opt = ENV["RUBYOPT"]) and (opt = opt.dup).sub!(/(?:\A|\s)-w(?=\z|\s)/, '')
   ENV["RUBYOPT"] = opt
 end
+
+# Enable constant leak checks by ruby/mspec
+ENV["CHECK_CONSTANT_LEAKS"] ||= "true"
+
 require "./rbconfig" unless defined?(RbConfig)
 require_relative "../tool/test-coverage" if ENV.key?("COVERAGE")
 load File.dirname(__FILE__) + '/ruby/default.mspec'
-OBJDIR = File.expand_path("spec/ruby/optional/capi/ext")
+OBJDIR = File.expand_path("spec/ruby/optional/capi/ext") unless defined?(OBJDIR)
 class MSpecScript
   @testing_ruby = true
 
@@ -27,6 +31,18 @@ class MSpecScript
     ]
   end
 
+  # Disable to run for bundled gems in test-spec
+  set :bundled_gems, (File.readlines("#{srcdir}/gems/bundled_gems").map do |line|
+    next if /^\s*(?:#|$)/ =~ line
+    gem = line.split.first
+    gem = "openstruct" if gem == "ostruct"
+    "#{srcdir}/spec/ruby/library/#{gem}"
+  end.compact)
+  set :stdlibs, Dir.glob("#{srcdir}/spec/ruby/library/*")
+  set :library, get(:stdlibs).to_a - get(:bundled_gems).to_a
+
+  set :files, get(:command_line) + get(:language) + get(:core) + get(:library) + get(:security) + get(:optional)
+
   if ENV.key?("COVERAGE")
     set :excludes, ["Coverage"]
   end
@@ -75,7 +91,8 @@ require 'mspec/runner/formatters/dotted'
 
 class DottedFormatter
   prepend Module.new {
-    BASE = __dir__ + "/ruby/"
+    BASE = __dir__ + "/ruby/" unless defined?(BASE)
+    COUNT_WIDTH = 6 unless defined?(COUNT_WIDTH)
 
     def initialize(out = nil)
       super
@@ -83,7 +100,10 @@ class DottedFormatter
         @columns = nil
       else
         columns = ENV["COLUMNS"]&.to_i
-        @columns = columns&.nonzero? || 80
+        columns = 80 unless columns&.nonzero?
+        w = COUNT_WIDTH + 1
+        round = 20
+        @columns = (columns - w) / round * round + w
       end
       @dotted = 0
       @loaded = false
@@ -99,7 +119,7 @@ class DottedFormatter
     def after(*)
       if @columns
         if @dotted == 0
-          s = sprintf("%6d ", @count)
+          s = sprintf("%*d ", COUNT_WIDTH, @count)
           print(s)
           @dotted += s.size
         end
diff --git a/spec/mmtk.mspec b/spec/mmtk.mspec
new file mode 100644
index 00000000000000..ac0998708cb9c6
--- /dev/null
+++ b/spec/mmtk.mspec
@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+# Testing behaviour specific to default GC
+MSpec.register(:exclude, "GC.stat increases major_gc_count after GC is run")
+MSpec.register(:exclude, "GC.stat provides some number for heap_free_slots")
+# GC::Profiler is not implemented
+MSpec.register(:exclude, "GC::Profiler.disable disables the profiler")
+MSpec.register(:exclude, "GC::Profiler.enable enables the profiler")
+MSpec.register(:exclude, "GC::Profiler.enabled? reports as disabled when disabled")
+MSpec.register(:exclude, "GC::Profiler.enabled? reports as enabled when enabled")
+MSpec.register(:exclude, "GC::Profiler.result returns a string")
+MSpec.register(:exclude, "GC::Profiler.total_time returns an float")
diff --git a/spec/mspec/lib/mspec/commands/mkspec.rb b/spec/mspec/lib/mspec/commands/mkspec.rb
old mode 100755
new mode 100644
index a31cb2191c495a..f75e683b19846a
--- a/spec/mspec/lib/mspec/commands/mkspec.rb
+++ b/spec/mspec/lib/mspec/commands/mkspec.rb
@@ -1,5 +1,3 @@
-#!/usr/bin/env ruby
-
 require 'rbconfig'
 require 'mspec/version'
 require 'mspec/utils/options'
diff --git a/spec/mspec/lib/mspec/commands/mspec-ci.rb b/spec/mspec/lib/mspec/commands/mspec-ci.rb
index a31db1d7dcbb5f..9959059ca1c7f2 100644
--- a/spec/mspec/lib/mspec/commands/mspec-ci.rb
+++ b/spec/mspec/lib/mspec/commands/mspec-ci.rb
@@ -1,7 +1,3 @@
-#!/usr/bin/env ruby
-
-$:.unshift File.expand_path(File.dirname(__FILE__) + '/../lib')
-
 require 'mspec/version'
 require 'mspec/utils/options'
 require 'mspec/utils/script'
diff --git a/spec/mspec/lib/mspec/commands/mspec-run.rb b/spec/mspec/lib/mspec/commands/mspec-run.rb
index 4d8f4d9984e82e..0fb338fa23db2b 100644
--- a/spec/mspec/lib/mspec/commands/mspec-run.rb
+++ b/spec/mspec/lib/mspec/commands/mspec-run.rb
@@ -1,7 +1,3 @@
-#!/usr/bin/env ruby
-
-$:.unshift File.expand_path(File.dirname(__FILE__) + '/../lib')
-
 require 'mspec/version'
 require 'mspec/utils/options'
 require 'mspec/utils/script'
@@ -32,6 +28,7 @@ def options(argv = ARGV)
     options.chdir
     options.prefix
     options.configure { |f| load f }
+    options.env
     options.randomize
     options.repeat
     options.pretend
@@ -52,6 +49,9 @@ def options(argv = ARGV)
     options.doc "\n When to perform it"
     options.action_filters
 
+    options.doc "\n Launchable"
+    options.launchable
+
     options.doc "\n Help!"
     options.debug
     options.version MSpec::VERSION
diff --git a/spec/mspec/lib/mspec/commands/mspec-tag.rb b/spec/mspec/lib/mspec/commands/mspec-tag.rb
index e1d04d14465e11..8b1cb8380949cd 100644
--- a/spec/mspec/lib/mspec/commands/mspec-tag.rb
+++ b/spec/mspec/lib/mspec/commands/mspec-tag.rb
@@ -1,5 +1,3 @@
-#!/usr/bin/env ruby
-
 require 'mspec/version'
 require 'mspec/utils/options'
 require 'mspec/utils/script'
diff --git a/spec/mspec/lib/mspec/commands/mspec.rb b/spec/mspec/lib/mspec/commands/mspec.rb
old mode 100755
new mode 100644
index f5341c699df48e..a9d94ca3546389
--- a/spec/mspec/lib/mspec/commands/mspec.rb
+++ b/spec/mspec/lib/mspec/commands/mspec.rb
@@ -1,5 +1,3 @@
-#!/usr/bin/env ruby
-
 require 'mspec/version'
 require 'mspec/utils/options'
 require 'mspec/utils/script'
diff --git a/spec/mspec/lib/mspec/guards/platform.rb b/spec/mspec/lib/mspec/guards/platform.rb
index e87b08a4c1317f..fadd8d75efb84c 100644
--- a/spec/mspec/lib/mspec/guards/platform.rb
+++ b/spec/mspec/lib/mspec/guards/platform.rb
@@ -53,16 +53,27 @@ def self.wsl?
     end
   end
 
+  # In bits
   WORD_SIZE = 1.size * 8
+  deprecate_constant :WORD_SIZE
 
+  # In bits
   POINTER_SIZE = begin
     require 'rbconfig/sizeof'
     RbConfig::SIZEOF["void*"] * 8
   rescue LoadError
-    WORD_SIZE
+    [0].pack('j').size * 8
+  end
+
+  # In bits
+  C_LONG_SIZE = if defined?(RbConfig::SIZEOF[])
+    RbConfig::SIZEOF["long"] * 8
+  else
+    [0].pack('l!').size * 8
   end
 
   def self.wordsize?(size)
+    warn "#wordsize? is deprecated, use #c_long_size?"
     size == WORD_SIZE
   end
 
@@ -70,6 +81,10 @@ def self.pointer_size?(size)
     size == POINTER_SIZE
   end
 
+  def self.c_long_size?(size)
+    size == C_LONG_SIZE
+  end
+
   def initialize(*args)
     if args.last.is_a?(Hash)
       @options, @platforms = args.last, args[0..-2]
@@ -85,10 +100,13 @@ def match?
       case key
       when :os
         match &&= PlatformGuard.os?(*value)
-      when :wordsize
-        match &&= PlatformGuard.wordsize? value
       when :pointer_size
         match &&= PlatformGuard.pointer_size? value
+      when :wordsize
+        warn ":wordsize is deprecated, use :c_long_size"
+        match &&= PlatformGuard.wordsize? value
+      when :c_long_size
+        match &&= PlatformGuard::c_long_size? value
       end
     end
     match
diff --git a/spec/mspec/lib/mspec/helpers/numeric.rb b/spec/mspec/lib/mspec/helpers/numeric.rb
index c1ed81a2332dde..0b47855cd29495 100644
--- a/spec/mspec/lib/mspec/helpers/numeric.rb
+++ b/spec/mspec/lib/mspec/helpers/numeric.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'mspec/guards/platform'
 
 def nan_value
@@ -15,11 +16,11 @@ def bignum_value(plus = 0)
 end
 
 def max_long
-  2**(0.size * 8 - 1) - 1
+  2**(PlatformGuard::C_LONG_SIZE - 1) - 1
 end
 
 def min_long
-  -(2**(0.size * 8 - 1))
+  -(2**(PlatformGuard::C_LONG_SIZE - 1))
 end
 
 # This is a bit hairy, but we need to be able to write specs that cover the
@@ -28,7 +29,24 @@ def min_long
 # specs based on the relationship between values rather than specific
 # values.
 if PlatformGuard.standard? or PlatformGuard.implementation? :topaz
-  if PlatformGuard.wordsize? 32
+  limits_available = begin
+    require 'rbconfig/sizeof'
+    defined?(RbConfig::LIMITS.[]) && ['FIXNUM_MAX', 'FIXNUM_MIN'].all? do |key|
+      Integer === RbConfig::LIMITS[key]
+    end
+  rescue LoadError
+    false
+  end
+
+  if limits_available
+    def fixnum_max
+      RbConfig::LIMITS['FIXNUM_MAX']
+    end
+
+    def fixnum_min
+      RbConfig::LIMITS['FIXNUM_MIN']
+    end
+  elsif PlatformGuard.c_long_size? 32
     def fixnum_max
       (2**30) - 1
     end
@@ -36,7 +54,7 @@ def fixnum_max
     def fixnum_min
       -(2**30)
     end
-  elsif PlatformGuard.wordsize? 64
+  elsif PlatformGuard.c_long_size? 64
     def fixnum_max
       (2**62) - 1
     end
diff --git a/spec/mspec/lib/mspec/helpers/tmp.rb b/spec/mspec/lib/mspec/helpers/tmp.rb
index b2a38ee983ea94..e903dd9f50cbf0 100644
--- a/spec/mspec/lib/mspec/helpers/tmp.rb
+++ b/spec/mspec/lib/mspec/helpers/tmp.rb
@@ -12,7 +12,7 @@
 end
 SPEC_TEMP_DIR = spec_temp_dir
 
-SPEC_TEMP_UNIQUIFIER = "0"
+SPEC_TEMP_UNIQUIFIER = +"0"
 
 at_exit do
   begin
@@ -36,11 +36,25 @@
 end
 
 def tmp(name, uniquify = true)
-  mkdir_p SPEC_TEMP_DIR unless Dir.exist? SPEC_TEMP_DIR
+  if Dir.exist? SPEC_TEMP_DIR
+    stat = File.stat(SPEC_TEMP_DIR)
+    if stat.world_writable? and !stat.sticky?
+      raise ArgumentError, "SPEC_TEMP_DIR (#{SPEC_TEMP_DIR}) is world writable but not sticky"
+    end
+  else
+    platform_is_not :windows do
+      umask = File.umask
+      if (umask & 0002) == 0 # o+w
+        raise ArgumentError, "File.umask #=> #{umask.to_s(8)} (world-writable)"
+      end
+    end
+    mkdir_p SPEC_TEMP_DIR
+  end
 
   if uniquify and !name.empty?
     slash = name.rindex "/"
     index = slash ? slash + 1 : 0
+    name = +name
     name.insert index, "#{SPEC_TEMP_UNIQUIFIER.succ!}-"
   end
 
diff --git a/spec/mspec/lib/mspec/mocks/mock.rb b/spec/mspec/lib/mspec/mocks/mock.rb
index 28a083cc1505dd..c61ba35ea7196c 100644
--- a/spec/mspec/lib/mspec/mocks/mock.rb
+++ b/spec/mspec/lib/mspec/mocks/mock.rb
@@ -18,20 +18,16 @@ def self.stubs
     @stubs ||= Hash.new { |h,k| h[k] = [] }
   end
 
-  def self.replaced_name(obj, sym)
-    :"__mspec_#{obj.__id__}_#{sym}__"
+  def self.replaced_name(key)
+    :"__mspec_#{key.last}__"
   end
 
   def self.replaced_key(obj, sym)
-    [replaced_name(obj, sym), sym]
+    [obj.__id__, sym]
   end
 
-  def self.has_key?(keys, sym)
-    !!keys.find { |k| k.first == sym }
-  end
-
-  def self.replaced?(sym)
-    has_key?(mocks.keys, sym) or has_key?(stubs.keys, sym)
+  def self.replaced?(key)
+    mocks.include?(key) or stubs.include?(key)
   end
 
   def self.clear_replaced(key)
@@ -40,8 +36,9 @@ def self.clear_replaced(key)
   end
 
   def self.mock_respond_to?(obj, sym, include_private = false)
-    name = replaced_name(obj, :respond_to?)
-    if replaced? name
+    key = replaced_key(obj, :respond_to?)
+    if replaced? key
+      name = replaced_name(key)
       obj.__send__ name, sym, include_private
     else
       obj.respond_to? sym, include_private
@@ -59,8 +56,8 @@ def self.install_method(obj, sym, type = nil)
       return
     end
 
-    if (sym == :respond_to? or mock_respond_to?(obj, sym, true)) and !replaced?(key.first)
-      meta.__send__ :alias_method, key.first, sym
+    if (sym == :respond_to? or mock_respond_to?(obj, sym, true)) and !replaced?(key)
+      meta.__send__ :alias_method, replaced_name(key), sym
     end
 
     suppress_warning {
@@ -191,7 +188,7 @@ def self.cleanup
         next
       end
 
-      replaced = key.first
+      replaced = replaced_name(key)
       sym = key.last
       meta = obj.singleton_class
 
diff --git a/spec/mspec/lib/mspec/runner/actions/leakchecker.rb b/spec/mspec/lib/mspec/runner/actions/leakchecker.rb
index 69181b71d3a4ad..0a8c9c32521347 100644
--- a/spec/mspec/lib/mspec/runner/actions/leakchecker.rb
+++ b/spec/mspec/lib/mspec/runner/actions/leakchecker.rb
@@ -132,14 +132,14 @@ class << self
         attr_accessor :count
       end
 
-      def new(data)
+      def new(...)
         LeakChecker::TempfileCounter.count += 1
-        super(data)
+        super
       end
     }
     LeakChecker.const_set(:TempfileCounter, m)
 
-    class << Tempfile::Remover
+    class << Tempfile
       prepend LeakChecker::TempfileCounter
     end
   end
@@ -301,6 +301,7 @@ def register
   end
 
   def start
+    disable_nss_modules
     @checker = LeakChecker.new
   end
 
@@ -316,4 +317,61 @@ def after(state)
       end
     end
   end
+
+  private
+
+  # This function is intended to disable all NSS modules when ruby is compiled
+  # against glibc. NSS modules allow the system administrator to load custom
+  # shared objects into all processes using glibc, and use them to customise
+  # the behaviour of username, groupname, hostname, etc lookups. This is
+  # normally configured in the file /etc/nsswitch.conf.
+  # These modules often do things like open cache files or connect to system
+  # daemons like sssd or dbus, which of course means they have open file
+  # descriptors of their own. This can cause the leak-checking functionality
+  # in this file to report that such descriptors have been leaked, and fail
+  # the test suite.
+  # This function uses glibc's __nss_configure_lookup function to override any
+  # configuration in /etc/nsswitch.conf, and just use the built in files/dns
+  # name lookup functionality (which is of course perfectly sufficient for
+  # running ruby/spec).
+  def disable_nss_modules
+    begin
+      require 'fiddle'
+    rescue LoadError
+      # Make sure it's possible to run the test suite on a ruby implementation
+      # which does not (yet?) have Fiddle.
+      return
+    end
+
+    begin
+      libc = Fiddle.dlopen(nil)
+      # Older versions of fiddle don't have Fiddle::Type (and instead rely on Fiddle::TYPE_)
+      # Even older versions of fiddle don't have CONST_STRING,
+      string_type = defined?(Fiddle::TYPE_CONST_STRING) ? Fiddle::TYPE_CONST_STRING : Fiddle::TYPE_VOIDP
+      nss_configure_lookup = Fiddle::Function.new(
+        libc['__nss_configure_lookup'],
+        [string_type, string_type],
+        Fiddle::TYPE_INT
+      )
+    rescue Fiddle::DLError
+      # We're not running with glibc - no need to do this.
+      return
+    end
+
+    nss_configure_lookup.call 'passwd', 'files'
+    nss_configure_lookup.call 'shadow', 'files'
+    nss_configure_lookup.call 'group', 'files'
+    nss_configure_lookup.call 'hosts', 'files dns'
+    nss_configure_lookup.call 'services', 'files'
+    nss_configure_lookup.call 'netgroup', 'files'
+    nss_configure_lookup.call 'automount', 'files'
+    nss_configure_lookup.call 'aliases', 'files'
+    nss_configure_lookup.call 'ethers', 'files'
+    nss_configure_lookup.call 'gshadow', 'files'
+    nss_configure_lookup.call 'initgroups', 'files'
+    nss_configure_lookup.call 'networks', 'files dns'
+    nss_configure_lookup.call 'protocols', 'files'
+    nss_configure_lookup.call 'publickey', 'files'
+    nss_configure_lookup.call 'rpc', 'files'
+  end
 end
diff --git a/spec/mspec/lib/mspec/runner/actions/timeout.rb b/spec/mspec/lib/mspec/runner/actions/timeout.rb
index 499001c95265e1..1200926872b520 100644
--- a/spec/mspec/lib/mspec/runner/actions/timeout.rb
+++ b/spec/mspec/lib/mspec/runner/actions/timeout.rb
@@ -48,11 +48,12 @@ def start
 
               show_backtraces
               if MSpec.subprocesses.empty?
-                exit 2
+                exit! 2
               else
                 # Do not exit but signal the subprocess so we can get their output
                 MSpec.subprocesses.each do |pid|
-                  Process.kill :SIGTERM, pid
+                  kill_wait_one_second :SIGTERM, pid
+                  hard_kill :SIGKILL, pid
                 end
                 @fail = true
                 @current_state = nil
@@ -80,7 +81,7 @@ def after(state = nil)
 
     if @fail
       STDERR.puts "\n\nThe last example #{@error_message}. See above for the subprocess stacktrace."
-      exit 2
+      exit! 2
     end
   end
 
@@ -89,12 +90,28 @@ def finish
     @thread.join
   end
 
+  private def hard_kill(signal, pid)
+    begin
+      Process.kill signal, pid
+    rescue Errno::ESRCH
+      # Process already terminated
+    end
+  end
+
+  private def kill_wait_one_second(signal, pid)
+    begin
+      Process.kill signal, pid
+      sleep 1
+    rescue Errno::ESRCH
+      # Process already terminated
+    end
+  end
+
   private def show_backtraces
     java_stacktraces = -> pid {
       if RUBY_ENGINE == 'truffleruby' || RUBY_ENGINE == 'jruby'
         STDERR.puts 'Java stacktraces:'
-        Process.kill :SIGQUIT, pid
-        sleep 1
+        kill_wait_one_second :SIGQUIT, pid
       end
     }
 
@@ -118,8 +135,7 @@ def finish
 
         if RUBY_ENGINE == 'truffleruby'
           STDERR.puts "\nRuby backtraces:"
-          Process.kill :SIGALRM, pid
-          sleep 1
+          kill_wait_one_second :SIGALRM, pid
         else
           STDERR.puts "Don't know how to print backtraces of a subprocess on #{RUBY_ENGINE}"
         end
diff --git a/spec/mspec/lib/mspec/runner/formatters/base.rb b/spec/mspec/lib/mspec/runner/formatters/base.rb
index 54a83c9c32152a..e3b5bb23e0bfd0 100644
--- a/spec/mspec/lib/mspec/runner/formatters/base.rb
+++ b/spec/mspec/lib/mspec/runner/formatters/base.rb
@@ -5,6 +5,9 @@
 
 if ENV['CHECK_LEAKS']
   require 'mspec/runner/actions/leakchecker'
+end
+
+if ENV['CHECK_LEAKS'] || ENV['CHECK_CONSTANT_LEAKS']
   require 'mspec/runner/actions/constants_leak_checker'
 end
 
@@ -40,8 +43,11 @@ def register
     @counter = @tally.counter
 
     if ENV['CHECK_LEAKS']
-      save = ENV['CHECK_LEAKS'] == 'save'
       LeakCheckerAction.new.register
+    end
+
+    if ENV['CHECK_LEAKS'] || ENV['CHECK_CONSTANT_LEAKS']
+      save = ENV['CHECK_LEAKS'] == 'save' || ENV['CHECK_CONSTANT_LEAKS'] == 'save'
       ConstantsLeakCheckerAction.new(save).register
     end
 
diff --git a/spec/mspec/lib/mspec/runner/formatters/launchable.rb b/spec/mspec/lib/mspec/runner/formatters/launchable.rb
new file mode 100644
index 00000000000000..f738781c71ac79
--- /dev/null
+++ b/spec/mspec/lib/mspec/runner/formatters/launchable.rb
@@ -0,0 +1,88 @@
+module LaunchableFormatter
+  def self.extend_object(obj)
+    super
+    obj.init
+  end
+
+  def self.setDir(dir)
+    @@path = File.join(dir, "#{rand.to_s}.json")
+    self
+  end
+
+  def init
+    @timer = nil
+    @tests = []
+  end
+
+  def before(state = nil)
+    super
+    @timer = TimerAction.new
+    @timer.start
+  end
+
+  def after(state = nil)
+    super
+    @timer.finish
+    file = MSpec.file
+    return if file.nil? || state&.example.nil? || exception?
+
+    @tests << {:test => state, :file => file, :exception => false, duration: @timer.elapsed}
+  end
+
+  def exception(exception)
+    super
+    @timer.finish
+    file = MSpec.file
+    return if file.nil?
+
+    @tests << {:test => exception, :file => file, :exception => true, duration: @timer.elapsed}
+  end
+
+  def finish
+    super
+
+    require_relative '../../../../../../tool/lib/launchable'
+
+    @writer = writer = Launchable::JsonStreamWriter.new(@@path)
+    @writer.write_array('testCases')
+    at_exit {
+      @writer.close
+    }
+
+    repo_path = File.expand_path("#{__dir__}/../../../../../../")
+
+    @tests.each do |t|
+      testcase = t[:test].description
+      relative_path = t[:file].delete_prefix("#{repo_path}/")
+      # The test path is a URL-encoded representation.
+      # https://github.com/launchableinc/cli/blob/v1.81.0/launchable/testpath.py#L18
+      test_path = {file: relative_path, testcase: testcase}.map{|key, val|
+        "#{encode_test_path_component(key)}=#{encode_test_path_component(val)}"
+      }.join('#')
+
+      status = 'TEST_PASSED'
+      if t[:exception]
+        message = t[:test].message
+        backtrace = t[:test].backtrace
+        e = "#{message}\n#{backtrace}"
+        status = 'TEST_FAILED'
+      end
+
+      @writer.write_object(
+        {
+          testPath: test_path,
+          status: status,
+          duration: t[:duration],
+          createdAt: Time.now.to_s,
+          stderr: e,
+          stdout: nil
+        }
+      )
+    end
+  end
+
+  private
+  def encode_test_path_component component
+    component.to_s.gsub('%', '%25').gsub('=', '%3D').gsub('#', '%23').gsub('&', '%26').tr("\x00-\x08", "")
+  end
+end
diff --git a/spec/mspec/lib/mspec/runner/formatters/multi.rb b/spec/mspec/lib/mspec/runner/formatters/multi.rb
index a723ae8eb92c1f..fa1da3766b97ea 100644
--- a/spec/mspec/lib/mspec/runner/formatters/multi.rb
+++ b/spec/mspec/lib/mspec/runner/formatters/multi.rb
@@ -42,6 +42,6 @@ def aggregate_results(files)
   end
 
   def print_exception(exc, count)
-    print "\n#{count})\n#{exc}\n"
+    @err.print "\n#{count})\n#{exc}\n"
   end
 end
diff --git a/spec/mspec/lib/mspec/utils/options.rb b/spec/mspec/lib/mspec/utils/options.rb
index 3b5962dbe6e751..adeafa1f813cb9 100644
--- a/spec/mspec/lib/mspec/utils/options.rb
+++ b/spec/mspec/lib/mspec/utils/options.rb
@@ -204,6 +204,13 @@ def configure(&block)
        "Load FILE containing configuration options", &block)
   end
 
+  def env
+    on("--env", "KEY=VALUE", "Set environment variable") do |env|
+      key, value = env.split('=', 2)
+      ENV[key] = value
+    end
+  end
+
   def targets
     on("-t", "--target", "TARGET",
        "Implementation to run the specs, where TARGET is:") do |t|
@@ -482,8 +489,17 @@ def debug
     end
   end
 
+  def launchable
+    on("--launchable-test-reports", "DIR",
+       "DIR The directory for reporting test results in Launchable JSON format") do |o|
+      require 'mspec/runner/formatters/launchable'
+      config[:launchable] = LaunchableFormatter.setDir(o)
+    end
+  end
+
   def all
     configure {}
+    env
     targets
     formatters
     filters
@@ -500,5 +516,6 @@ def all
     action_filters
     actions
     debug
+    launchable
   end
 end
diff --git a/spec/mspec/lib/mspec/utils/script.rb b/spec/mspec/lib/mspec/utils/script.rb
index e86beaab86f2f6..15fd23fabfe880 100644
--- a/spec/mspec/lib/mspec/utils/script.rb
+++ b/spec/mspec/lib/mspec/utils/script.rb
@@ -159,8 +159,14 @@ def config_formatter
     end
 
     if config[:formatter]
-      config[:formatter].new(config[:output])
+      config[:formatter] = config[:formatter].new(config[:output])
     end
+
+    if config[:launchable]
+      config[:formatter].extend config[:launchable]
+    end
+
+    config[:formatter]
   end
 
   # Callback for enabling custom actions, etc. This version is a
diff --git a/spec/mspec/spec/guards/platform_spec.rb b/spec/mspec/spec/guards/platform_spec.rb
index 88a7ad86f23072..bd37432800457f 100644
--- a/spec/mspec/spec/guards/platform_spec.rb
+++ b/spec/mspec/spec/guards/platform_spec.rb
@@ -81,44 +81,44 @@
   end
 end
 
-RSpec.describe Object, "#platform_is :wordsize => SIZE_SPEC" do
+RSpec.describe Object, "#platform_is :c_long_size => SIZE_SPEC" do
   before :each do
-    @guard = PlatformGuard.new :darwin, :wordsize => 32
+    @guard = PlatformGuard.new :darwin, :c_long_size => 32
     allow(PlatformGuard).to receive(:os?).and_return(true)
     allow(PlatformGuard).to receive(:new).and_return(@guard)
     ScratchPad.clear
   end
 
-  it "yields when #wordsize? returns true" do
-    allow(PlatformGuard).to receive(:wordsize?).and_return(true)
-    platform_is(:wordsize => 32) { ScratchPad.record :yield }
+  it "yields when #c_long_size? returns true" do
+    allow(PlatformGuard).to receive(:c_long_size?).and_return(true)
+    platform_is(:c_long_size => 32) { ScratchPad.record :yield }
     expect(ScratchPad.recorded).to eq(:yield)
   end
 
-  it "doesn not yield when #wordsize? returns false" do
-    allow(PlatformGuard).to receive(:wordsize?).and_return(false)
-    platform_is(:wordsize => 32) { ScratchPad.record :yield }
+  it "doesn not yield when #c_long_size? returns false" do
+    allow(PlatformGuard).to receive(:c_long_size?).and_return(false)
+    platform_is(:c_long_size => 32) { ScratchPad.record :yield }
     expect(ScratchPad.recorded).not_to eq(:yield)
   end
 end
 
-RSpec.describe Object, "#platform_is_not :wordsize => SIZE_SPEC" do
+RSpec.describe Object, "#platform_is_not :c_long_size => SIZE_SPEC" do
   before :each do
-    @guard = PlatformGuard.new :darwin, :wordsize => 32
+    @guard = PlatformGuard.new :darwin, :c_long_size => 32
     allow(PlatformGuard).to receive(:os?).and_return(true)
     allow(PlatformGuard).to receive(:new).and_return(@guard)
     ScratchPad.clear
   end
 
-  it "yields when #wordsize? returns false" do
-    allow(PlatformGuard).to receive(:wordsize?).and_return(false)
-    platform_is_not(:wordsize => 32) { ScratchPad.record :yield }
+  it "yields when #c_long_size? returns false" do
+    allow(PlatformGuard).to receive(:c_long_size?).and_return(false)
+    platform_is_not(:c_long_size => 32) { ScratchPad.record :yield }
     expect(ScratchPad.recorded).to eq(:yield)
   end
 
-  it "doesn not yield when #wordsize? returns true" do
-    allow(PlatformGuard).to receive(:wordsize?).and_return(true)
-    platform_is_not(:wordsize => 32) { ScratchPad.record :yield }
+  it "doesn not yield when #c_long_size? returns true" do
+    allow(PlatformGuard).to receive(:c_long_size?).and_return(true)
+    platform_is_not(:c_long_size => 32) { ScratchPad.record :yield }
     expect(ScratchPad.recorded).not_to eq(:yield)
   end
 end
@@ -184,13 +184,13 @@
   end
 end
 
-RSpec.describe PlatformGuard, ".wordsize?" do
+RSpec.describe PlatformGuard, ".c_long_size?" do
   it "returns true when arg is 32 and 1.size is 4" do
-    expect(PlatformGuard.wordsize?(32)).to eq(1.size == 4)
+    expect(PlatformGuard.c_long_size?(32)).to eq(1.size == 4)
   end
 
   it "returns true when arg is 64 and 1.size is 8" do
-    expect(PlatformGuard.wordsize?(64)).to eq(1.size == 8)
+    expect(PlatformGuard.c_long_size?(64)).to eq(1.size == 8)
   end
 end
 
diff --git a/spec/mspec/spec/integration/run_spec.rb b/spec/mspec/spec/integration/run_spec.rb
index 90dc051543853e..ea0735e9b289f4 100644
--- a/spec/mspec/spec/integration/run_spec.rb
+++ b/spec/mspec/spec/integration/run_spec.rb
@@ -1,20 +1,21 @@
 require 'spec_helper'
 
 RSpec.describe "Running mspec" do
+  q = BACKTRACE_QUOTE
   a_spec_output = <<EOS
 
 1)
 Foo#bar errors FAILED
 Expected 1 == 2
 to be truthy but was false
-CWD/spec/fixtures/a_spec.rb:8:in `block (2 levels) in <top (required)>'
-CWD/spec/fixtures/a_spec.rb:2:in `<top (required)>'
+CWD/spec/fixtures/a_spec.rb:8:in #{q}block (2 levels) in <top (required)>'
+CWD/spec/fixtures/a_spec.rb:2:in #{q}<top (required)>'
 
 2)
 Foo#bar fails ERROR
 RuntimeError: failure
-CWD/spec/fixtures/a_spec.rb:12:in `block (2 levels) in <top (required)>'
-CWD/spec/fixtures/a_spec.rb:2:in `<top (required)>'
+CWD/spec/fixtures/a_spec.rb:12:in #{q}block (2 levels) in <top (required)>'
+CWD/spec/fixtures/a_spec.rb:2:in #{q}<top (required)>'
 
 Finished in D.DDDDDD seconds
 EOS
diff --git a/spec/mspec/spec/integration/tag_spec.rb b/spec/mspec/spec/integration/tag_spec.rb
index 33df1cfd4067f8..ae08e9d45f8ef9 100644
--- a/spec/mspec/spec/integration/tag_spec.rb
+++ b/spec/mspec/spec/integration/tag_spec.rb
@@ -13,6 +13,7 @@
   it "tags the failing specs" do
     fixtures = "spec/fixtures"
     out, ret = run_mspec("tag", "--add fails --fail #{fixtures}/tagging_spec.rb")
+    q = BACKTRACE_QUOTE
     expect(out).to eq <<EOS
 RUBY_DESCRIPTION
 .FF
@@ -26,15 +27,15 @@
 Tag#me errors FAILED
 Expected 1 == 2
 to be truthy but was false
-CWD/spec/fixtures/tagging_spec.rb:9:in `block (2 levels) in <top (required)>'
-CWD/spec/fixtures/tagging_spec.rb:3:in `<top (required)>'
+CWD/spec/fixtures/tagging_spec.rb:9:in #{q}block (2 levels) in <top (required)>'
+CWD/spec/fixtures/tagging_spec.rb:3:in #{q}<top (required)>'
 
 2)
 Tag#me érròrs in unicode FAILED
 Expected 1 == 2
 to be truthy but was false
-CWD/spec/fixtures/tagging_spec.rb:13:in `block (2 levels) in <top (required)>'
-CWD/spec/fixtures/tagging_spec.rb:3:in `<top (required)>'
+CWD/spec/fixtures/tagging_spec.rb:13:in #{q}block (2 levels) in <top (required)>'
+CWD/spec/fixtures/tagging_spec.rb:3:in #{q}<top (required)>'
 
 Finished in D.DDDDDD seconds
 
diff --git a/spec/mspec/spec/mocks/mock_spec.rb b/spec/mspec/spec/mocks/mock_spec.rb
index 73f9bdfa141436..7426e0ff88cb7c 100644
--- a/spec/mspec/spec/mocks/mock_spec.rb
+++ b/spec/mspec/spec/mocks/mock_spec.rb
@@ -22,14 +22,14 @@
 RSpec.describe Mock, ".replaced_name" do
   it "returns the name for a method that is being replaced by a mock method" do
     m = double('a fake id')
-    expect(Mock.replaced_name(m, :method_call)).to eq(:"__mspec_#{m.object_id}_method_call__")
+    expect(Mock.replaced_name(Mock.replaced_key(m, :method_call))).to eq(:"__mspec_method_call__")
   end
 end
 
 RSpec.describe Mock, ".replaced_key" do
   it "returns a key used internally by Mock" do
     m = double('a fake id')
-    expect(Mock.replaced_key(m, :method_call)).to eq([:"__mspec_#{m.object_id}_method_call__", :method_call])
+    expect(Mock.replaced_key(m, :method_call)).to eq([m.object_id, :method_call])
   end
 end
 
@@ -42,16 +42,16 @@
 
   it "returns true if a method has been stubbed on an object" do
     Mock.install_method @mock, :method_call
-    expect(Mock.replaced?(Mock.replaced_name(@mock, :method_call))).to be_truthy
+    expect(Mock.replaced?(Mock.replaced_key(@mock, :method_call))).to be_truthy
   end
 
   it "returns true if a method has been mocked on an object" do
     Mock.install_method @mock, :method_call, :stub
-    expect(Mock.replaced?(Mock.replaced_name(@mock, :method_call))).to be_truthy
+    expect(Mock.replaced?(Mock.replaced_key(@mock, :method_call))).to be_truthy
   end
 
   it "returns false if a method has not been stubbed or mocked" do
-    expect(Mock.replaced?(Mock.replaced_name(@mock, :method_call))).to be_falsey
+    expect(Mock.replaced?(Mock.replaced_key(@mock, :method_call))).to be_falsey
   end
 end
 
@@ -197,11 +197,11 @@
 
     Mock.install_method @mock, :method_call
     expect(@mock).to respond_to(:method_call)
-    expect(@mock).not_to respond_to(Mock.replaced_name(@mock, :method_call))
+    expect(@mock).not_to respond_to(Mock.replaced_name(Mock.replaced_key(@mock, :method_call)))
 
     Mock.install_method @mock, :method_call, :stub
     expect(@mock).to respond_to(:method_call)
-    expect(@mock).not_to respond_to(Mock.replaced_name(@mock, :method_call))
+    expect(@mock).not_to respond_to(Mock.replaced_name(Mock.replaced_key(@mock, :method_call)))
   end
 end
 
@@ -493,7 +493,7 @@ class MockAndRaiseError < Exception; end
   it "removes the replaced method if the mock method overrides an existing method" do
     def @mock.already_here() :hey end
     expect(@mock).to respond_to(:already_here)
-    replaced_name = Mock.replaced_name(@mock, :already_here)
+    replaced_name = Mock.replaced_name(Mock.replaced_key(@mock, :already_here))
     Mock.install_method @mock, :already_here
     expect(@mock).to respond_to(replaced_name)
 
@@ -521,10 +521,9 @@ def @mock.already_here() :hey end
     replaced_key = Mock.replaced_key(@mock, :method_call)
     expect(Mock).to receive(:clear_replaced).with(replaced_key)
 
-    replaced_name = Mock.replaced_name(@mock, :method_call)
-    expect(Mock.replaced?(replaced_name)).to be_truthy
+    expect(Mock.replaced?(replaced_key)).to be_truthy
 
     Mock.cleanup
-    expect(Mock.replaced?(replaced_name)).to be_falsey
+    expect(Mock.replaced?(replaced_key)).to be_falsey
   end
 end
diff --git a/spec/mspec/spec/spec_helper.rb b/spec/mspec/spec/spec_helper.rb
index 3a749581eee710..5cabfe5626448b 100644
--- a/spec/mspec/spec/spec_helper.rb
+++ b/spec/mspec/spec/spec_helper.rb
@@ -66,3 +66,5 @@ def ensure_mspec_method(method)
   include MSpecMatchers
   public :raise_error
 }.new
+
+BACKTRACE_QUOTE = RUBY_VERSION >= "3.4" ? "'" : "`"
diff --git a/spec/mspec/tool/remove_old_guards.rb b/spec/mspec/tool/remove_old_guards.rb
old mode 100644
new mode 100755
index 3fd95e6b319465..75c48e058433e7
--- a/spec/mspec/tool/remove_old_guards.rb
+++ b/spec/mspec/tool/remove_old_guards.rb
@@ -1,6 +1,23 @@
+#!/usr/bin/env ruby
+
 # Removes old version guards in ruby/spec.
 # Run it from the ruby/spec repository root.
 # The argument is the new minimum supported version.
+#
+#   cd spec
+#   ../mspec/tool/remove_old_guards.rb <ruby-version>
+#
+# where <ruby-version> is a version guard with which should be removed
+#
+# Example:
+#   tool/remove_old_guards.rb 3.1
+#
+# As a result guards like
+#   ruby_version_is "3.1" do
+#     # ...
+#   end
+#
+# will be removed.
 
 def dedent(line)
   if line.start_with?("  ")
@@ -105,6 +122,8 @@ def search(regexp)
   end
 end
 
+abort "usage: #{$0} <ruby-version>" if ARGV.empty?
+
 version = Regexp.escape(ARGV.fetch(0))
 version += "(?:\\.0)?" if version.count(".") < 2
 remove_guards(/ruby_version_is (["'])#{version}\1 do/, true)
diff --git a/spec/mspec/tool/sync/sync-rubyspec.rb b/spec/mspec/tool/sync/sync-rubyspec.rb
index 13f1d8004dcbd0..effccc1567c156 100644
--- a/spec/mspec/tool/sync/sync-rubyspec.rb
+++ b/spec/mspec/tool/sync/sync-rubyspec.rb
@@ -23,6 +23,8 @@
 CHECK_LAST_MERGE = !MSPEC && ENV['CHECK_LAST_MERGE'] != 'false'
 TEST_MASTER = ENV['TEST_MASTER'] != 'false'
 
+ONLY_FILTER = ENV['ONLY_FILTER'] == 'true'
+
 MSPEC_REPO = File.expand_path("../../..", __FILE__)
 raise MSPEC_REPO if !Dir.exist?(MSPEC_REPO) or !Dir.exist?("#{MSPEC_REPO}/.git")
 
@@ -230,15 +232,17 @@ def main(impls)
     impl = RubyImplementation.new(impl, data)
     update_repo(impl)
     filter_commits(impl)
-    rebase_commits(impl)
-    if new_commits?(impl)
-      test_new_specs
-      verify_commits(impl)
-      fast_forward_master(impl)
-      check_ci
-    else
-      STDERR.puts "#{BRIGHT_YELLOW}No new commits#{RESET}"
-      fast_forward_master(impl)
+    unless ONLY_FILTER
+      rebase_commits(impl)
+      if new_commits?(impl)
+        test_new_specs
+        verify_commits(impl)
+        fast_forward_master(impl)
+        check_ci
+      else
+        STDERR.puts "#{BRIGHT_YELLOW}No new commits#{RESET}"
+        fast_forward_master(impl)
+      end
     end
   end
 end
diff --git a/spec/mspec/tool/tag_from_output.rb b/spec/mspec/tool/tag_from_output.rb
index a6e60945cdf83f..b6b46038556ae1 100755
--- a/spec/mspec/tool/tag_from_output.rb
+++ b/spec/mspec/tool/tag_from_output.rb
@@ -3,6 +3,8 @@
 # Adds tags based on error and failures output (e.g., from a CI log),
 # without running any spec code.
 
+tag = ENV["TAG"] || "fails"
+
 tags_dir = %w[
   spec/tags
   spec/tags/ruby
@@ -30,9 +32,9 @@
   if spec_file
     spec_file = spec_file[SPEC_FILE, 1] or raise
   else
-    if error_line =~ /^(\w+)[#\.](\w+) /
-      module_method = error_line.split(' ', 2).first
-      file = "#{$1.downcase}/#{$2}_spec.rb"
+    if error_line =~ /^([\w:]+)[#\.](\w+) /
+      mod, method = $1, $2
+      file = "#{mod.downcase.gsub('::', '/')}/#{method}_spec.rb"
       spec_file = ['spec/ruby/core', 'spec/ruby/library', *Dir.glob('spec/ruby/library/*')].find { |dir|
         path = "#{dir}/#{file}"
         break path if File.exist?(path)
@@ -54,7 +56,7 @@
   dir = File.dirname(tags_file)
   Dir.mkdir(dir) unless Dir.exist?(dir)
 
-  tag_line = "fails:#{description}"
+  tag_line = "#{tag}:#{description}"
   lines = File.exist?(tags_file) ? File.readlines(tags_file, chomp: true) : []
   unless lines.include?(tag_line)
     puts tags_file
diff --git a/spec/ruby/.mspec.constants b/spec/ruby/.mspec.constants
index 6e09a44362df22..4da36337152b0e 100644
--- a/spec/ruby/.mspec.constants
+++ b/spec/ruby/.mspec.constants
@@ -146,6 +146,7 @@ Prime
 Private
 ProcFromMethod
 Psych
+RactorLocalSingleton
 REXML
 RUBY_SIGNALS
 RbReadline
diff --git a/spec/ruby/.rubocop.yml b/spec/ruby/.rubocop.yml
index 99209b607bd3aa..68cce312808bce 100644
--- a/spec/ruby/.rubocop.yml
+++ b/spec/ruby/.rubocop.yml
@@ -1,13 +1,17 @@
 inherit_from: .rubocop_todo.yml
 
 AllCops:
-  TargetRubyVersion: 3.0
+  TargetRubyVersion: 3.2
   DisplayCopNames: true
   Exclude:
     - command_line/fixtures/bad_syntax.rb
+    - core/exception/fixtures/syntax_error.rb
   DisabledByDefault: true
   NewCops: disable
 
+Layout/IndentationConsistency:
+  Enabled: true
+
 Layout/TrailingWhitespace:
   Enabled: true
 
@@ -33,18 +37,33 @@ Lint/AssignmentInCondition:
 Lint/BooleanSymbol:
   Enabled: false
 
+Lint/DeprecatedOpenSSLConstant:
+  Exclude:
+    - library/openssl/digest/**/*.rb
+
 Lint/InterpolationCheck:
   Enabled: false
 
 Lint/LiteralAsCondition:
   Enabled: false
 
+# Required to support Ruby 3.0
 Lint/RedundantRequireStatement:
-  Enabled: false
+  Exclude:
+    - core/fiber/**/*.rb
+    - library/fiber/**/*.rb
+    - optional/capi/fiber_spec.rb
+
+Lint/RedundantSafeNavigation:
+  Exclude:
+    - language/safe_navigator_spec.rb
 
 Lint/RedundantSplatExpansion:
   Enabled: false
 
+Lint/RescueException:
+  Enabled: false
+
 Lint/UnifiedInteger:
   Enabled: false
 
@@ -102,6 +121,9 @@ Lint/OutOfRangeRegexpRef:
 Lint/InheritException:
   Enabled: false
 
+Lint/SafeNavigationChain:
+  Enabled: false
+
 Lint/ElseLayout:
   Exclude:
     - 'language/if_spec.rb'
diff --git a/spec/ruby/.rubocop_todo.yml b/spec/ruby/.rubocop_todo.yml
index a59e64bd58b6e0..6b43db9b9a4dd7 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 2019-12-12 22:16:26 +0900 using RuboCop version 0.77.0.
+# on 2024-10-12 16:01:45 UTC using RuboCop version 1.66.1.
 # 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
@@ -21,6 +21,7 @@ Lint/DuplicateMethods:
     - 'fixtures/class.rb'
 
 # Offense count: 8
+# This cop supports safe autocorrection (--autocorrect).
 Lint/EnsureReturn:
   Exclude:
     - 'language/fixtures/ensure.rb'
@@ -39,6 +40,7 @@ Lint/FloatOutOfRange:
     - 'core/string/modulo_spec.rb'
 
 # Offense count: 2
+# This cop supports safe autocorrection (--autocorrect).
 Lint/ImplicitStringConcatenation:
   Exclude:
     - 'language/string_spec.rb'
@@ -50,8 +52,8 @@ Lint/IneffectiveAccessModifier:
     - 'core/module/fixtures/classes.rb'
     - 'language/fixtures/private.rb'
 
-# Offense count: 72
-# Cop supports --auto-correct.
+# Offense count: 71
+# This cop supports safe autocorrection (--autocorrect).
 Lint/LiteralInInterpolation:
   Exclude:
     - 'core/module/refine_spec.rb'
@@ -63,50 +65,30 @@ Lint/LiteralInInterpolation:
     - 'language/string_spec.rb'
     - 'language/symbol_spec.rb'
     - 'language/undef_spec.rb'
-    - 'library/net/ftp/connect_spec.rb'
 
 # Offense count: 8
-# Cop supports --auto-correct.
+# This cop supports safe autocorrection (--autocorrect).
 Lint/MultipleComparison:
   Exclude:
     - 'language/precedence_spec.rb'
 
 # Offense count: 9
+# This cop supports safe autocorrection (--autocorrect).
 Lint/ParenthesesAsGroupedExpression:
   Exclude:
-    - 'core/string/fixtures/freeze_magic_comment.rb'
     - 'language/block_spec.rb'
-    - 'language/fixtures/send.rb'
     - 'language/method_spec.rb'
 
 # Offense count: 2
-# Cop supports --auto-correct.
+# This cop supports safe autocorrection (--autocorrect).
 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: 22
-Lint/RescueException:
+Lint/SelfAssignment:
   Exclude:
-    - 'command_line/fixtures/debug_info.rb'
-    - 'core/dir/fileno_spec.rb'
-    - 'core/exception/cause_spec.rb'
-    - 'core/exception/no_method_error_spec.rb'
-    - 'core/fiber/kill_spec.rb'
-    - 'core/kernel/fixtures/autoload_frozen.rb'
-    - 'core/kernel/raise_spec.rb'
-    - 'core/module/autoload_spec.rb'
-    - 'core/mutex/sleep_spec.rb'
-    - 'core/thread/abort_on_exception_spec.rb'
-    - 'core/thread/shared/exit.rb'
-    - 'language/rescue_spec.rb'
-    - 'library/erb/filename_spec.rb'
+    - 'core/gc/auto_compact_spec.rb'
 
 # Offense count: 4
 # Configuration parameters: IgnoreImplicitReferences.
@@ -114,8 +96,8 @@ Lint/ShadowedArgument:
   Exclude:
     - 'language/fixtures/super.rb'
 
-# Offense count: 39
-# Configuration parameters: AllowComments.
+# Offense count: 45
+# Configuration parameters: AllowComments, AllowNil.
 Lint/SuppressedException:
   Enabled: false
 
@@ -128,7 +110,8 @@ Lint/UnderscorePrefixedVariableName:
     - 'language/block_spec.rb'
 
 # Offense count: 7
-# Configuration parameters: ContextCreatingMethods, MethodCreatingMethods.
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: AutoCorrect, ContextCreatingMethods, MethodCreatingMethods.
 Lint/UselessAccessModifier:
   Exclude:
     - 'core/module/define_method_spec.rb'
diff --git a/spec/ruby/CONTRIBUTING.md b/spec/ruby/CONTRIBUTING.md
index 4a1e1d46bdba97..366b484bada1c1 100644
--- a/spec/ruby/CONTRIBUTING.md
+++ b/spec/ruby/CONTRIBUTING.md
@@ -113,9 +113,9 @@ Also `have_constant`, `have_private_instance_method`, `have_singleton_method`, e
 }
 ```
 
-##### should_not raise_error
+##### `should_not raise_error`
 
-**To avoid!** Instead, use an expectation testing what the code in the lambda does.
+**Avoid this!** Instead, use an expectation testing what the code in the lambda does.
 If an exception is raised, it will fail the example anyway.
 
 ```ruby
@@ -164,7 +164,7 @@ end
 platform_is_not :linux, :darwin do # Not Linux and not Darwin
 end
 
-platform_is wordsize: 64 do
+platform_is pointer_size: 64 do
   # 64-bit platform
 end
 
@@ -179,6 +179,9 @@ In case there is a bug in MRI and the fix will be backported to previous version
 If it is not backported or not likely, use `ruby_version_is` instead.
 First, file a bug at https://bugs.ruby-lang.org/.
 The problem is `ruby_bug` would make non-MRI implementations fail this spec while MRI itself does not pass it, so it should only be used if the bug is/will be fixed and backported.
+Otherwise, non-MRI implementations would have to choose between being incompatible with the latest release of MRI (which has the bug) to pass the spec, or behave the same as the latest release of MRI (which has the bug) and fail the spec, both which make no sense.
+
+IOW, `ruby_bug '#NN', ''...'X.Y' do` is equivalent to `guard_not { RUBY_ENGINE == "ruby" && ruby_version_is ''...'X.Y' } do`. So it skips tests on MRI on specified versions (where a bug is present) and runs tests on alternative implementations only.
 
 ```ruby
 ruby_bug '#13669', ''...'3.2' do
@@ -276,13 +279,13 @@ describe :kernel_sprintf, shared: true do
 end
 
 describe "Kernel#sprintf" do
-  it_behaves_like :kernel_sprintf, -> (format, *args) {
+  it_behaves_like :kernel_sprintf, -> format, *args {
     sprintf(format, *args)
   }
 end
 
 describe "Kernel.sprintf" do
-  it_behaves_like :kernel_sprintf, -> (format, *args) {
+  it_behaves_like :kernel_sprintf, -> format, *args {
     Kernel.sprintf(format, *args)
   }
 end
diff --git a/spec/ruby/README.md b/spec/ruby/README.md
index 536388e7c89a6b..56d6c3c5426a7a 100644
--- a/spec/ruby/README.md
+++ b/spec/ruby/README.md
@@ -30,12 +30,12 @@ ruby/spec is known to be tested in these implementations for every commit:
 * [Opal](https://github.com/opal/opal/tree/master/spec)
 * [Artichoke](https://github.com/artichoke/spec/tree/artichoke-vendor)
 
-ruby/spec describes the behavior of Ruby 3.0 and more recent Ruby versions.
-More precisely, every latest stable MRI release should [pass](https://github.com/ruby/spec/actions/workflows/ci.yml) all specs of ruby/spec (3.0.x, 3.1.x, 3.2.x, etc), and those are tested in CI.
+ruby/spec describes the behavior of Ruby 3.2 and more recent Ruby versions.
+More precisely, every latest stable MRI release should [pass](https://github.com/ruby/spec/actions/workflows/ci.yml) all specs of ruby/spec (3.2.x, 3.3.x, etc), and those are tested in CI.
 
 ### Synchronization with Ruby Implementations
 
-The specs are synchronized both ways around once a month by @eregon between ruby/spec, MRI, JRuby and TruffleRuby,
+The specs are synchronized both ways around once a month by @andrykonchin between ruby/spec, MRI, JRuby and TruffleRuby,
 using [this script](https://github.com/ruby/mspec/blob/master/tool/sync/sync-rubyspec.rb).
 Each of these repositories has a full copy of the specs under `spec/ruby` to ease editing specs.
 Any of these repositories can be used to add or edit specs, use what is most convenient for you.
@@ -44,7 +44,7 @@ For *testing* the development version of a Ruby implementation, one should alway
 Also, this repository doesn't always contain the latest spec changes from MRI (it's synchronized monthly), and does not contain tags (specs marked as failing on that Ruby implementation).
 Running specs on a Ruby implementation can be done with:
 
-```
+```console
 $ cd ruby_implementation/spec/ruby
 # Add ../ruby_implementation/bin in PATH, or pass -t /path/to/bin/ruby
 $ ../mspec/bin/mspec
@@ -62,6 +62,8 @@ For older specs try these commits:
 * Ruby 2.5.9 - [Suite](https://github.com/ruby/spec/commit/c503335d3d9f6ec6ef24de60a0716c34af69b64f) using [MSpec](https://github.com/ruby/mspec/commit/0091e8a62e954717cd54641f935eaf1403692041)
 * Ruby 2.6.10 - [Suite](https://github.com/ruby/spec/commit/aaf998fb8c92c4e63ad423a2e7ca6e6921818c6e) using [MSpec](https://github.com/ruby/mspec/commit/5e36c684e9e2b92b1187589bba1df22c640a8661)
 * Ruby 2.7.8 - [Suite](https://github.com/ruby/spec/commit/93787e6035c925b593a9c0c6fb0e7e07a6f1df1f) using [MSpec](https://github.com/ruby/mspec/commit/1d8cf64722d8a7529f7cd205be5f16a89b7a67fd)
+* Ruby 3.0.7 - [Suite](https://github.com/ruby/spec/commit/affef93d9940f615e4836f64b011da211f570913) using [MSpec](https://github.com/ruby/mspec/commit/0aabb3e548eb5ea6cad0125f8f46cee34542b6b7)
+* Ruby 3.1.6 - [Suite](https://github.com/ruby/spec/commit/ec960f2389d1c2265d32397fa8afa6d462014efc) using [MSpec](https://github.com/ruby/mspec/commit/484310dbed35b84c74484fd674602f88c42d063a)
 
 ### Running the specs
 
@@ -128,6 +130,12 @@ MSpec can automatically add new top-level constants in this file with:
 
     $ CHECK_LEAKS=save mspec ../mspec/bin/mspec file
 
+### Running Specs on S390x CPU Architecture
+
+Run the specs with `DFLTCC=0` if you see failing specs related to the zlib library on s390x CPU architecture. The failures can happen with the zlib library applying the patch madler/zlib#410 to enable the deflate algorithm producing a different compressed byte stream.
+
+    $ DFLTCC=0 ../mspec/bin/mspec
+
 ### Contributing and Writing Specs
 
 See [CONTRIBUTING.md](https://github.com/ruby/spec/blob/master/CONTRIBUTING.md) for documentation about contributing and writing specs (guards, matchers, etc).
diff --git a/spec/ruby/bin/rubocop b/spec/ruby/bin/rubocop
new file mode 100755
index 00000000000000..38254f13e48771
--- /dev/null
+++ b/spec/ruby/bin/rubocop
@@ -0,0 +1,12 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+require 'bundler/inline'
+
+gemfile do
+  source 'https://rubygems.org'
+
+  gem 'rubocop', '1.66.1'
+end
+
+exec(Gem.bin_path('rubocop', 'rubocop'), *ARGV)
diff --git a/spec/ruby/command_line/backtrace_limit_spec.rb b/spec/ruby/command_line/backtrace_limit_spec.rb
index bc40a542a0725b..4d57bc268b5f14 100644
--- a/spec/ruby/command_line/backtrace_limit_spec.rb
+++ b/spec/ruby/command_line/backtrace_limit_spec.rb
@@ -1,46 +1,93 @@
 require_relative '../spec_helper'
 
 describe "The --backtrace-limit command line option" do
-  it "limits top-level backtraces to a given number of entries" do
-    file = fixture(__FILE__ , "backtrace.rb")
-    out = ruby_exe(file, options: "--backtrace-limit=2", args: "top 2>&1", exit_status: 1)
-    out = out.gsub(__dir__, '')
+  ruby_version_is ""..."3.4" do
+    it "limits top-level backtraces to a given number of entries" do
+      file = fixture(__FILE__ , "backtrace.rb")
+      out = ruby_exe(file, options: "--backtrace-limit=2", args: "top 2>&1", exit_status: 1)
+      out = out.gsub(__dir__, '')
 
-    out.should == <<-MSG
+      out.should == <<-MSG
 top
 /fixtures/backtrace.rb:2:in `a': oops (RuntimeError)
 \tfrom /fixtures/backtrace.rb:6:in `b'
 \tfrom /fixtures/backtrace.rb:10:in `c'
 \t ... 2 levels...
-    MSG
-  end
+      MSG
+    end
 
-  it "affects Exception#full_message" do
-    file = fixture(__FILE__ , "backtrace.rb")
-    out = ruby_exe(file, options: "--backtrace-limit=2", args: "full_message 2>&1")
-    out = out.gsub(__dir__, '')
+    it "affects Exception#full_message" do
+      file = fixture(__FILE__ , "backtrace.rb")
+      out = ruby_exe(file, options: "--backtrace-limit=2", args: "full_message 2>&1")
+      out = out.gsub(__dir__, '')
 
-    out.should == <<-MSG
+      out.should == <<-MSG
 full_message
 /fixtures/backtrace.rb:2:in `a': oops (RuntimeError)
 \tfrom /fixtures/backtrace.rb:6:in `b'
 \tfrom /fixtures/backtrace.rb:10:in `c'
 \t ... 2 levels...
-    MSG
-  end
+      MSG
+    end
 
-  it "does not affect Exception#backtrace" do
-    file = fixture(__FILE__ , "backtrace.rb")
-    out = ruby_exe(file, options: "--backtrace-limit=2", args: "backtrace 2>&1")
-    out = out.gsub(__dir__, '')
+    it "does not affect Exception#backtrace" do
+      file = fixture(__FILE__ , "backtrace.rb")
+      out = ruby_exe(file, options: "--backtrace-limit=2", args: "backtrace 2>&1")
+      out = out.gsub(__dir__, '')
 
-    out.should == <<-MSG
+      out.should == <<-MSG
 backtrace
 /fixtures/backtrace.rb:2:in `a'
 /fixtures/backtrace.rb:6:in `b'
 /fixtures/backtrace.rb:10:in `c'
 /fixtures/backtrace.rb:14:in `d'
 /fixtures/backtrace.rb:29:in `<main>'
-    MSG
+      MSG
+    end
+  end
+
+  ruby_version_is "3.4" do
+    it "limits top-level backtraces to a given number of entries" do
+      file = fixture(__FILE__ , "backtrace.rb")
+      out = ruby_exe(file, options: "--backtrace-limit=2", args: "top 2>&1", exit_status: 1)
+      out = out.gsub(__dir__, '')
+
+      out.should == <<-MSG
+top
+/fixtures/backtrace.rb:2:in 'Object#a': oops (RuntimeError)
+\tfrom /fixtures/backtrace.rb:6:in 'Object#b'
+\tfrom /fixtures/backtrace.rb:10:in 'Object#c'
+\t ... 2 levels...
+      MSG
+    end
+
+    it "affects Exception#full_message" do
+      file = fixture(__FILE__ , "backtrace.rb")
+      out = ruby_exe(file, options: "--backtrace-limit=2", args: "full_message 2>&1")
+      out = out.gsub(__dir__, '')
+
+      out.should == <<-MSG
+full_message
+/fixtures/backtrace.rb:2:in 'Object#a': oops (RuntimeError)
+\tfrom /fixtures/backtrace.rb:6:in 'Object#b'
+\tfrom /fixtures/backtrace.rb:10:in 'Object#c'
+\t ... 2 levels...
+      MSG
+    end
+
+    it "does not affect Exception#backtrace" do
+      file = fixture(__FILE__ , "backtrace.rb")
+      out = ruby_exe(file, options: "--backtrace-limit=2", args: "backtrace 2>&1")
+      out = out.gsub(__dir__, '')
+
+      out.should == <<-MSG
+backtrace
+/fixtures/backtrace.rb:2:in 'Object#a'
+/fixtures/backtrace.rb:6:in 'Object#b'
+/fixtures/backtrace.rb:10:in 'Object#c'
+/fixtures/backtrace.rb:14:in 'Object#d'
+/fixtures/backtrace.rb:29:in '<main>'
+      MSG
+    end
   end
 end
diff --git a/spec/ruby/command_line/dash_0_spec.rb b/spec/ruby/command_line/dash_0_spec.rb
new file mode 100755
index 00000000000000..73c5e29004eb42
--- /dev/null
+++ b/spec/ruby/command_line/dash_0_spec.rb
@@ -0,0 +1,13 @@
+require_relative '../spec_helper'
+
+describe "The -0 command line option" do
+  it "sets $/ and $-0" do
+    ruby_exe("puts $/, $-0", options: "-072").should == ":\n:\n"
+  end
+
+  ruby_version_is "3.5" do
+    it "sets $/ and $-0 as a frozen string" do
+      ruby_exe("puts $/.frozen?, $-0.frozen?", options: "-072").should == "true\ntrue\n"
+    end
+  end
+end
diff --git a/spec/ruby/command_line/dash_a_spec.rb b/spec/ruby/command_line/dash_a_spec.rb
index 9ea135dc76f345..43d923ce1644bb 100644
--- a/spec/ruby/command_line/dash_a_spec.rb
+++ b/spec/ruby/command_line/dash_a_spec.rb
@@ -6,13 +6,13 @@
   end
 
   it "runs the code in loop conditional on Kernel.gets()" do
-    ruby_exe("puts $F.last", options: "-n -a", escape: true,
+    ruby_exe("puts $F.last", options: "-n -a",
                              args: " < #{@names}").should ==
       "jones\nfield\ngrey\n"
   end
 
   it "sets $-a" do
-    ruby_exe("puts $-a", options: "-n -a", escape: true,
+    ruby_exe("puts $-a", options: "-n -a",
                          args: " < #{@names}").should ==
       "true\ntrue\ntrue\n"
   end
diff --git a/spec/ruby/command_line/dash_l_spec.rb b/spec/ruby/command_line/dash_l_spec.rb
index 5c1d3cf4cd9d09..44a98445f37984 100644
--- a/spec/ruby/command_line/dash_l_spec.rb
+++ b/spec/ruby/command_line/dash_l_spec.rb
@@ -6,25 +6,25 @@
   end
 
   it "chomps lines with default separator" do
-    ruby_exe('puts $_.end_with?("\n")', options: "-n -l", escape: true,
+    ruby_exe('puts $_.end_with?("\n")', options: "-n -l",
              args: " < #{@names}").should ==
         "false\nfalse\nfalse\n"
   end
 
   it "chomps last line based on $/" do
-    ruby_exe('BEGIN { $/ = "ones\n" }; puts $_', options: "-W0 -n -l", escape: true,
+    ruby_exe('BEGIN { $/ = "ones\n" }; puts $_', options: "-W0 -n -l",
              args: " < #{@names}").should ==
         "alice j\nbob field\njames grey\n"
   end
 
   it "sets $\\ to the value of $/" do
-    ruby_exe("puts $\\ == $/", options: "-W0 -n -l", escape: true,
+    ruby_exe("puts $\\ == $/", options: "-W0 -n -l",
              args: " < #{@names}").should ==
         "true\ntrue\ntrue\n"
   end
 
   it "sets $-l" do
-    ruby_exe("puts $-l", options: "-n -l", escape: true,
+    ruby_exe("puts $-l", options: "-n -l",
                          args: " < #{@names}").should ==
       "true\ntrue\ntrue\n"
   end
diff --git a/spec/ruby/command_line/dash_n_spec.rb b/spec/ruby/command_line/dash_n_spec.rb
index 9d331d6065db0b..1dd9379259b459 100644
--- a/spec/ruby/command_line/dash_n_spec.rb
+++ b/spec/ruby/command_line/dash_n_spec.rb
@@ -6,19 +6,19 @@
   end
 
   it "runs the code in loop conditional on Kernel.gets()" do
-    ruby_exe("puts $_", options: "-n", escape: true,
+    ruby_exe("puts $_", options: "-n",
                         args: " < #{@names}").should ==
       "alice\nbob\njames\n"
   end
 
   it "only evaluates BEGIN blocks once" do
-    ruby_exe("BEGIN { puts \"hi\" }; puts $_", options: "-n", escape: true,
+    ruby_exe("BEGIN { puts \"hi\" }; puts $_", options: "-n",
                                                args: " < #{@names}").should ==
       "hi\nalice\nbob\njames\n"
   end
 
   it "only evaluates END blocks once" do
-    ruby_exe("puts $_; END {puts \"bye\"}", options: "-n", escape: true,
+    ruby_exe("puts $_; END {puts \"bye\"}", options: "-n",
                                             args: " < #{@names}").should ==
       "alice\nbob\njames\nbye\n"
   end
@@ -29,7 +29,7 @@
     $total += 1
     END { puts $total }
     script
-    ruby_exe(script, options: "-n", escape: true,
+    ruby_exe(script, options: "-n",
                      args: " < #{@names}").should ==
       "3\n"
   end
diff --git a/spec/ruby/command_line/dash_p_spec.rb b/spec/ruby/command_line/dash_p_spec.rb
index 39827c3868ccf6..967e3796de2221 100644
--- a/spec/ruby/command_line/dash_p_spec.rb
+++ b/spec/ruby/command_line/dash_p_spec.rb
@@ -6,13 +6,13 @@
   end
 
   it "runs the code in loop conditional on Kernel.gets() and prints $_" do
-    ruby_exe("$_ = $_.upcase", options: "-p", escape: true,
+    ruby_exe("$_ = $_.upcase", options: "-p",
                                args: " < #{@names}").should ==
       "ALICE\nBOB\nJAMES\n"
   end
 
   it "sets $-p" do
-    ruby_exe("$_ = $-p", options: "-p", escape: true,
+    ruby_exe("$_ = $-p", options: "-p",
                          args: " < #{@names}").should ==
       "truetruetrue"
   end
diff --git a/spec/ruby/command_line/dash_r_spec.rb b/spec/ruby/command_line/dash_r_spec.rb
index ea5bde5adf9257..9f673c53dcc097 100644
--- a/spec/ruby/command_line/dash_r_spec.rb
+++ b/spec/ruby/command_line/dash_r_spec.rb
@@ -16,7 +16,10 @@
     out = ruby_exe(fixture(__FILE__, "bad_syntax.rb"), options: "-r #{@test_file}", args: "2>&1", exit_status: 1)
     $?.should_not.success?
     out.should include("REQUIRED")
-    out.should include("syntax error")
+
+    # it's tempting not to rely on error message and rely only on exception class name,
+    # but CRuby before 3.2 doesn't print class name for syntax error
+    out.should include_any_of("syntax error", "SyntaxError")
   end
 
   it "does not require the file if the main script file does not exist" do
diff --git a/spec/ruby/command_line/dash_upper_f_spec.rb b/spec/ruby/command_line/dash_upper_f_spec.rb
index 967acc2ece1f7c..5c10a7140d1620 100644
--- a/spec/ruby/command_line/dash_upper_f_spec.rb
+++ b/spec/ruby/command_line/dash_upper_f_spec.rb
@@ -6,7 +6,7 @@
   end
 
   it "specifies the field separator pattern for -a" do
-    ruby_exe("puts $F[0]", options: "-naF:", escape: true,
+    ruby_exe("puts $F[0]", options: "-naF:",
                            args: " < #{@passwd}").should ==
       "nobody\nroot\ndaemon\n"
   end
diff --git a/spec/ruby/command_line/dash_upper_u_spec.rb b/spec/ruby/command_line/dash_upper_u_spec.rb
index 15854e7b7361bf..2c210eb603304f 100644
--- a/spec/ruby/command_line/dash_upper_u_spec.rb
+++ b/spec/ruby/command_line/dash_upper_u_spec.rb
@@ -2,8 +2,8 @@
 
 describe "ruby -U" do
   it "sets Encoding.default_internal to UTF-8" do
-     ruby_exe('print Encoding.default_internal.name',
-              options: '-U').should == 'UTF-8'
+    ruby_exe('print Encoding.default_internal.name',
+             options: '-U').should == 'UTF-8'
   end
 
   it "sets Encoding.default_internal to UTF-8 when RUBYOPT is empty or only spaces" do
@@ -14,25 +14,25 @@
   end
 
   it "does nothing different if specified multiple times" do
-     ruby_exe('print Encoding.default_internal.name',
-              options: '-U -U').should == 'UTF-8'
+    ruby_exe('print Encoding.default_internal.name',
+             options: '-U -U').should == 'UTF-8'
   end
 
   it "is overruled by Encoding.default_internal=" do
-     ruby_exe('Encoding.default_internal="ascii"; print Encoding.default_internal.name',
-              options: '-U').should == 'US-ASCII'
+    ruby_exe('Encoding.default_internal="ascii"; print Encoding.default_internal.name',
+             options: '-U').should == 'US-ASCII'
   end
 
   it "does not affect the default external encoding" do
-     ruby_exe('Encoding.default_external="ascii"; print Encoding.default_external.name',
-              options: '-U').should == 'US-ASCII'
+    ruby_exe('Encoding.default_external="ascii"; print Encoding.default_external.name',
+             options: '-U').should == 'US-ASCII'
   end
 
   it "does not affect the source encoding" do
-     ruby_exe("print __ENCODING__.name",
-              options: '-U -KE').should == 'EUC-JP'
-     ruby_exe("print __ENCODING__.name",
-              options: '-KE -U').should == 'EUC-JP'
+    ruby_exe("print __ENCODING__.name",
+             options: '-U -KE').should == 'EUC-JP'
+    ruby_exe("print __ENCODING__.name",
+             options: '-KE -U').should == 'EUC-JP'
   end
 
   # I assume IO redirection will break on Windows...
diff --git a/spec/ruby/command_line/dash_v_spec.rb b/spec/ruby/command_line/dash_v_spec.rb
index 9b570fa1eb6dfc..d30efa37d68c23 100644
--- a/spec/ruby/command_line/dash_v_spec.rb
+++ b/spec/ruby/command_line/dash_v_spec.rb
@@ -6,8 +6,10 @@
 
   describe "when used alone" do
     it "prints version and ends" do
-      ruby_exe(nil, args: '-v').should include(RUBY_DESCRIPTION)
+      ruby_exe(nil, args: '-v').sub("+PRISM ", "").should include(RUBY_DESCRIPTION.sub("+PRISM ", ""))
     end unless (defined?(RubyVM::YJIT) && RubyVM::YJIT.enabled?) ||
-               (defined?(RubyVM::RJIT) && RubyVM::RJIT.enabled?)
+               (defined?(RubyVM::RJIT) && RubyVM::RJIT.enabled?) ||
+               (ENV['RUBY_GC_LIBRARY'] && ENV['RUBY_GC_LIBRARY'].length > 0) ||
+               (ENV['RUBY_MN_THREADS'] == '1')
   end
 end
diff --git a/spec/ruby/command_line/fixtures/debug_info.rb b/spec/ruby/command_line/fixtures/debug_info.rb
index ee607910c0d8f4..f02b0419208c34 100644
--- a/spec/ruby/command_line/fixtures/debug_info.rb
+++ b/spec/ruby/command_line/fixtures/debug_info.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 a = 'string'
 b = a
 c = b
diff --git a/spec/ruby/command_line/fixtures/string_literal_frozen_comment.rb b/spec/ruby/command_line/fixtures/string_literal_frozen_comment.rb
new file mode 100644
index 00000000000000..fb84b546c0a7b9
--- /dev/null
+++ b/spec/ruby/command_line/fixtures/string_literal_frozen_comment.rb
@@ -0,0 +1,4 @@
+# frozen_string_literal: true
+frozen = "test".frozen?
+interned = "test".equal?("test")
+puts "frozen:#{frozen} interned:#{interned}"
diff --git a/spec/ruby/command_line/fixtures/string_literal_mutable_comment.rb b/spec/ruby/command_line/fixtures/string_literal_mutable_comment.rb
new file mode 100644
index 00000000000000..381a74200171dd
--- /dev/null
+++ b/spec/ruby/command_line/fixtures/string_literal_mutable_comment.rb
@@ -0,0 +1,4 @@
+# frozen_string_literal: false
+frozen = "test".frozen?
+interned = "test".equal?("test")
+puts "frozen:#{frozen} interned:#{interned}"
diff --git a/spec/ruby/command_line/fixtures/string_literal_raw.rb b/spec/ruby/command_line/fixtures/string_literal_raw.rb
new file mode 100644
index 00000000000000..56b1841296b572
--- /dev/null
+++ b/spec/ruby/command_line/fixtures/string_literal_raw.rb
@@ -0,0 +1,3 @@
+frozen = "test".frozen?
+interned = "test".equal?("test")
+puts "frozen:#{frozen} interned:#{interned}"
diff --git a/spec/ruby/command_line/frozen_strings_spec.rb b/spec/ruby/command_line/frozen_strings_spec.rb
index 647b69daed19e3..014153e0b4afbe 100644
--- a/spec/ruby/command_line/frozen_strings_spec.rb
+++ b/spec/ruby/command_line/frozen_strings_spec.rb
@@ -19,11 +19,56 @@
   end
 end
 
+describe "The --disable-frozen-string-literal flag causes string literals to" do
+
+  it "produce a different object each time" do
+    ruby_exe(fixture(__FILE__, "freeze_flag_one_literal.rb"), options: "--disable-frozen-string-literal").chomp.should == "false"
+  end
+
+end
+
+describe "With neither --enable-frozen-string-literal nor --disable-frozen-string-literal flag set" do
+  before do
+    # disable --enable-frozen-string-literal and --disable-frozen-string-literal passed in $RUBYOPT
+    @rubyopt = ENV["RUBYOPT"]
+    ENV["RUBYOPT"] = ""
+  end
+
+  after do
+    ENV["RUBYOPT"] = @rubyopt
+  end
+
+  it "produce a different object each time" do
+    ruby_exe(fixture(__FILE__, "freeze_flag_one_literal.rb")).chomp.should == "false"
+  end
+
+  it "if file has no frozen_string_literal comment produce different mutable strings each time" do
+    ruby_exe(fixture(__FILE__, "string_literal_raw.rb")).chomp.should == "frozen:false interned:false"
+  end
+
+  it "if file has frozen_string_literal:true comment produce same frozen strings each time" do
+    ruby_exe(fixture(__FILE__, "string_literal_frozen_comment.rb")).chomp.should == "frozen:true interned:true"
+  end
+
+  it "if file has frozen_string_literal:false comment produce different mutable strings each time" do
+    ruby_exe(fixture(__FILE__, "string_literal_mutable_comment.rb")).chomp.should == "frozen:false interned:false"
+  end
+end
+
 describe "The --debug flag produces" do
   it "debugging info on attempted frozen string modification" do
-    error_str = ruby_exe(fixture(__FILE__, 'debug_info.rb'), options: '--debug',  args: "2>&1")
+    error_str = ruby_exe(fixture(__FILE__, 'debug_info.rb'), options: '--enable-frozen-string-literal --debug',  args: "2>&1")
     error_str.should include("can't modify frozen String")
     error_str.should include("created at")
-    error_str.should include("command_line/fixtures/debug_info.rb:2")
+    error_str.should include("command_line/fixtures/debug_info.rb:1")
+  end
+
+  guard -> { ruby_version_is "3.4" and !"test".frozen? } do
+    it "debugging info on mutating chilled string" do
+      error_str = ruby_exe(fixture(__FILE__, 'debug_info.rb'), options: '-w --debug',  args: "2>&1")
+      error_str.should include("literal string will be frozen in the future")
+      error_str.should include("the string was created here")
+      error_str.should include("command_line/fixtures/debug_info.rb:1")
+    end
   end
 end
diff --git a/spec/ruby/command_line/rubyopt_spec.rb b/spec/ruby/command_line/rubyopt_spec.rb
index bbea4d557d165d..e940f912af8f7b 100644
--- a/spec/ruby/command_line/rubyopt_spec.rb
+++ b/spec/ruby/command_line/rubyopt_spec.rb
@@ -11,52 +11,52 @@
 
   it "adds the -I path to $LOAD_PATH" do
     ENV["RUBYOPT"] = "-Ioptrubyspecincl"
-    result = ruby_exe("puts $LOAD_PATH.grep(/byspecin/)", escape: true)
+    result = ruby_exe("puts $LOAD_PATH.grep(/byspecin/)")
     result.chomp[-15..-1].should == "optrubyspecincl"
   end
 
   it "sets $DEBUG to true for '-d'" do
     ENV["RUBYOPT"] = '-d'
     command = %[puts "value of $DEBUG is \#{$DEBUG}"]
-    result = ruby_exe(command, escape: true, args: "2>&1")
+    result = ruby_exe(command, args: "2>&1")
     result.should =~ /value of \$DEBUG is true/
   end
 
-  guard -> { not CROSS_COMPILING } do
+  guard -> { RbConfig::CONFIG["CROSS_COMPILING"] != "yes" } do
     it "prints the version number for '-v'" do
       ENV["RUBYOPT"] = '-v'
-      ruby_exe("")[/\A.*/].should == RUBY_DESCRIPTION
+      ruby_exe("").sub("+PRISM ", "").sub(/\+GC(\[\w+\]\s|\s)?/, "")[/\A.*/].should == RUBY_DESCRIPTION.sub("+PRISM ", "").sub(/\+GC(\[\w+\]\s|\s)?/, "")
     end
 
     it "ignores whitespace around the option" do
       ENV["RUBYOPT"] = ' -v '
-      ruby_exe("")[/\A.*/].should == RUBY_DESCRIPTION
+      ruby_exe("").sub("+PRISM ", "").sub(/\+GC(\[\w+\]\s|\s)?/, "")[/\A.*/].should == RUBY_DESCRIPTION.sub("+PRISM ", "").sub(/\+GC(\[\w+\]\s|\s)?/, "")
     end
   end
 
   it "sets $VERBOSE to true for '-w'" do
     ENV["RUBYOPT"] = '-w'
-    ruby_exe("p $VERBOSE", escape: true).chomp.should == "true"
+    ruby_exe("p $VERBOSE").chomp.should == "true"
   end
 
   it "sets $VERBOSE to true for '-W'" do
     ENV["RUBYOPT"] = '-W'
-    ruby_exe("p $VERBOSE", escape: true).chomp.should == "true"
+    ruby_exe("p $VERBOSE").chomp.should == "true"
   end
 
   it "sets $VERBOSE to nil for '-W0'" do
     ENV["RUBYOPT"] = '-W0'
-    ruby_exe("p $VERBOSE", escape: true).chomp.should == "nil"
+    ruby_exe("p $VERBOSE").chomp.should == "nil"
   end
 
   it "sets $VERBOSE to false for '-W1'" do
     ENV["RUBYOPT"] = '-W1'
-    ruby_exe("p $VERBOSE", escape: true).chomp.should == "false"
+    ruby_exe("p $VERBOSE").chomp.should == "false"
   end
 
   it "sets $VERBOSE to true for '-W2'" do
     ENV["RUBYOPT"] = '-W2'
-    ruby_exe("p $VERBOSE", escape: true).chomp.should == "true"
+    ruby_exe("p $VERBOSE").chomp.should == "true"
   end
 
   it "suppresses deprecation warnings for '-W:no-deprecated'" do
diff --git a/spec/ruby/command_line/syntax_error_spec.rb b/spec/ruby/command_line/syntax_error_spec.rb
index 444ea9635cbafb..9ba87b9e22795b 100644
--- a/spec/ruby/command_line/syntax_error_spec.rb
+++ b/spec/ruby/command_line/syntax_error_spec.rb
@@ -3,11 +3,17 @@
 describe "The interpreter" do
   it "prints an error when given a file with invalid syntax" do
     out = ruby_exe(fixture(__FILE__, "bad_syntax.rb"), args: "2>&1", exit_status: 1)
-    out.should include "syntax error"
+
+    # it's tempting not to rely on error message and rely only on exception class name,
+    # but CRuby before 3.2 doesn't print class name for syntax error
+    out.should include_any_of("syntax error", "SyntaxError")
   end
 
   it "prints an error when given code via -e with invalid syntax" do
     out = ruby_exe(nil, args: "-e 'a{' 2>&1", exit_status: 1)
-    out.should include "syntax error"
+
+    # it's tempting not to rely on error message and rely only on exception class name,
+    # but CRuby before 3.2 doesn't print class name for syntax error
+    out.should include_any_of("syntax error", "SyntaxError")
   end
 end
diff --git a/spec/ruby/core/argf/readpartial_spec.rb b/spec/ruby/core/argf/readpartial_spec.rb
index 5e284b34233cb4..ea4301f25c690d 100644
--- a/spec/ruby/core/argf/readpartial_spec.rb
+++ b/spec/ruby/core/argf/readpartial_spec.rb
@@ -29,7 +29,7 @@
 
   it "clears output buffer even if EOFError is raised because @argf is at end" do
     begin
-      output = "to be cleared"
+      output = +"to be cleared"
 
       argf [@file1_name] do
         @argf.read
@@ -69,7 +69,7 @@
       print ARGF.readpartial(#{@stdin.size})
       ARGF.readpartial(1) rescue print $!.class
     STR
-    stdin = ruby_exe(ruby_str, args: "< #{@stdin_name}", escape: true)
+    stdin = ruby_exe(ruby_str, args: "< #{@stdin_name}")
     stdin.should == @stdin + "EOFError"
   end
 end
diff --git a/spec/ruby/core/argf/shared/getc.rb b/spec/ruby/core/argf/shared/getc.rb
index 8be39c60b6fd78..d63372d9d70a2a 100644
--- a/spec/ruby/core/argf/shared/getc.rb
+++ b/spec/ruby/core/argf/shared/getc.rb
@@ -9,7 +9,7 @@
 
   it "reads each char of files" do
     argf [@file1, @file2] do
-      chars = ""
+      chars = +""
       @chars.size.times { chars << @argf.send(@method) }
       chars.should == @chars
     end
diff --git a/spec/ruby/core/argf/shared/read.rb b/spec/ruby/core/argf/shared/read.rb
index fe903983c085a4..e76d0221390139 100644
--- a/spec/ruby/core/argf/shared/read.rb
+++ b/spec/ruby/core/argf/shared/read.rb
@@ -15,7 +15,7 @@
 
   it "treats second argument as an output buffer" do
     argf [@file1_name] do
-      buffer = ""
+      buffer = +""
       @argf.send(@method, @file1.size, buffer)
       buffer.should == @file1
     end
@@ -23,7 +23,7 @@
 
   it "clears output buffer before appending to it" do
     argf [@file1_name] do
-      buffer = "to be cleared"
+      buffer = +"to be cleared"
       @argf.send(@method, @file1.size, buffer)
       buffer.should == @file1
     end
diff --git a/spec/ruby/core/array/assoc_spec.rb b/spec/ruby/core/array/assoc_spec.rb
index af95528281872f..f0be3de7957807 100644
--- a/spec/ruby/core/array/assoc_spec.rb
+++ b/spec/ruby/core/array/assoc_spec.rb
@@ -37,4 +37,16 @@
     a.assoc(s1.first).should equal(s1)
     a.assoc(s2.first).should equal(s2)
   end
+
+  it "calls to_ary on non-array elements" do
+    s1 = [1, 2]
+    s2 = ArraySpecs::ArrayConvertible.new(2, 3)
+    a = [s1, s2]
+
+    s1.should_not_receive(:to_ary)
+    a.assoc(s1.first).should equal(s1)
+
+    a.assoc(2).should == [2, 3]
+    s2.called.should equal(:to_ary)
+  end
 end
diff --git a/spec/ruby/core/array/bsearch_index_spec.rb b/spec/ruby/core/array/bsearch_index_spec.rb
index df2c7c098e282f..94d85b37f33583 100644
--- a/spec/ruby/core/array/bsearch_index_spec.rb
+++ b/spec/ruby/core/array/bsearch_index_spec.rb
@@ -63,10 +63,6 @@
       @array.bsearch_index { |x| -1 }.should be_nil
     end
 
-    it "returns the middle element when block always returns zero" do
-      @array.bsearch_index { |x| 0 }.should == 2
-    end
-
     context "magnitude does not effect the result" do
       it "returns the index of any matched elements where element is between 4n <= xn < 8n" do
         [1, 2].should include(@array.bsearch_index { |x| (1 - x / 4) * (2**100) })
diff --git a/spec/ruby/core/array/drop_spec.rb b/spec/ruby/core/array/drop_spec.rb
index 0ea748e47d1bed..5926c291b84d29 100644
--- a/spec/ruby/core/array/drop_spec.rb
+++ b/spec/ruby/core/array/drop_spec.rb
@@ -7,7 +7,7 @@
   end
 
   it "raises an ArgumentError if the number of elements specified is negative" do
-   -> { [1, 2].drop(-3) }.should raise_error(ArgumentError)
+    -> { [1, 2].drop(-3) }.should raise_error(ArgumentError)
   end
 
   it "returns an empty Array if all elements are dropped" do
diff --git a/spec/ruby/core/array/each_spec.rb b/spec/ruby/core/array/each_spec.rb
index 57d6082f012c54..f4b5b758d0aa9a 100644
--- a/spec/ruby/core/array/each_spec.rb
+++ b/spec/ruby/core/array/each_spec.rb
@@ -7,7 +7,7 @@
 # Mutating the array while it is being iterated is discouraged as it can result in confusing behavior.
 # Yet a Ruby implementation must not crash in such a case, and following the simple CRuby behavior makes sense.
 # CRuby simply reads the array storage and checks the size for every iteration;
-# like `i = 0; while i < size; yield self[i]; end`
+# like `i = 0; while i < size; yield self[i]; i += 1; end`
 
 describe "Array#each" do
   it "yields each element to the block" do
diff --git a/spec/ruby/core/array/fetch_values_spec.rb b/spec/ruby/core/array/fetch_values_spec.rb
new file mode 100644
index 00000000000000..cf377b3b716476
--- /dev/null
+++ b/spec/ruby/core/array/fetch_values_spec.rb
@@ -0,0 +1,55 @@
+require_relative '../../spec_helper'
+require_relative 'fixtures/classes'
+
+describe "Array#fetch_values" do
+  before :each do
+    @array = [:a, :b, :c]
+  end
+
+  ruby_version_is "3.4" do
+    describe "with matched indexes" do
+      it "returns the values for indexes" do
+        @array.fetch_values(0).should == [:a]
+        @array.fetch_values(0, 2).should == [:a, :c]
+        @array.fetch_values(-1).should == [:c]
+      end
+
+      it "returns the values for indexes ordered in the order of the requested indexes" do
+        @array.fetch_values(2, 0).should == [:c, :a]
+      end
+    end
+
+    describe "with unmatched indexes" do
+      it "raises a index error if no block is provided" do
+        -> { @array.fetch_values(0, 1, 44) }.should raise_error(IndexError, "index 44 outside of array bounds: -3...3")
+      end
+
+      it "returns the default value from block" do
+        @array.fetch_values(44) { |index| "`#{index}' is not found" }.should == ["`44' is not found"]
+        @array.fetch_values(0, 44) { |index| "`#{index}' is not found" }.should == [:a, "`44' is not found"]
+      end
+    end
+
+    describe "without keys" do
+      it "returns an empty Array" do
+        @array.fetch_values.should == []
+      end
+    end
+
+    it "tries to convert the passed argument to an Integer using #to_int" do
+      obj = mock('to_int')
+      obj.should_receive(:to_int).and_return(2)
+      @array.fetch_values(obj).should == [:c]
+    end
+
+    it "does not support a Range object as argument" do
+      -> {
+        @array.fetch_values(1..2)
+      }.should raise_error(TypeError, "no implicit conversion of Range into Integer")
+    end
+
+    it "raises a TypeError when the passed argument can't be coerced to Integer" do
+      -> { [].fetch_values("cat") }.should raise_error(TypeError, "no implicit conversion of String into Integer")
+    end
+  end
+end
diff --git a/spec/ruby/core/array/fill_spec.rb b/spec/ruby/core/array/fill_spec.rb
index 02360e550dbf42..2c3b5d9e84b6d3 100644
--- a/spec/ruby/core/array/fill_spec.rb
+++ b/spec/ruby/core/array/fill_spec.rb
@@ -21,7 +21,7 @@
 
   it "does not replicate the filler" do
     ary = [1, 2, 3, 4]
-    str = "x"
+    str = +"x"
     ary.fill(str).should == [str, str, str, str]
     str << "y"
     ary.should == [str, str, str, str]
diff --git a/spec/ruby/core/array/fixtures/classes.rb b/spec/ruby/core/array/fixtures/classes.rb
index 8596245fb8899c..05283c0f7447cb 100644
--- a/spec/ruby/core/array/fixtures/classes.rb
+++ b/spec/ruby/core/array/fixtures/classes.rb
@@ -56,23 +56,20 @@ def self.empty_recursive_array
     101.621, 102.816, 104.010, 105.202, 106.393, 107.583, 108.771, 109.958, 111.144, 112.329,
     113.512, 114.695, 115.876, 117.057, 118.236, 119.414, 120.591, 121.767, 122.942, 124.116,
     125.289, 126.462, 127.633, 128.803, 129.973, 131.141, 132.309, 133.476, 134.642, 135.807,
-      ]
+  ]
 
   def self.measure_sample_fairness(size, samples, iters)
     ary = Array.new(size) { |x| x }
+    expected = iters.fdiv size
     (samples).times do |i|
       chi_results = []
       3.times do
-        counts = Array.new(size) { 0 }
-        expected = iters / size
+        counts = Array.new(size, 0)
         iters.times do
           x = ary.sample(samples)[i]
           counts[x] += 1
         end
-        chi_squared = 0.0
-        counts.each do |count|
-          chi_squared += (((count - expected) ** 2) * 1.0 / expected)
-        end
+        chi_squared = counts.sum {|count| (count - expected) ** 2} / expected
         chi_results << chi_squared
         break if chi_squared <= CHI_SQUARED_CRITICAL_VALUES[size]
       end
@@ -83,17 +80,14 @@ def self.measure_sample_fairness(size, samples, iters)
 
   def self.measure_sample_fairness_large_sample_size(size, samples, iters)
     ary = Array.new(size) { |x| x }
-    counts = Array.new(size) { 0 }
-    expected = iters * samples / size
+    counts = Array.new(size, 0)
+    expected = (iters * samples).fdiv size
     iters.times do
       ary.sample(samples).each do |sample|
         counts[sample] += 1
       end
     end
-    chi_squared = 0.0
-    counts.each do |count|
-      chi_squared += (((count - expected) ** 2) * 1.0 / expected)
-    end
+    chi_squared = counts.sum {|count| (count - expected) ** 2} / expected
 
     # Chi squared critical values for tests with 4 degrees of freedom
     # Values obtained from NIST Engineering Statistic Handbook at
@@ -223,366 +217,370 @@ def self.universal_pack_object
     obj
   end
 
-  LargeArray = ["test_create_table_with_force_true_does_not_drop_nonexisting_table",
- "test_add_table",
- "assert_difference",
- "assert_operator",
- "instance_variables",
- "class",
- "instance_variable_get",
- "__class__",
- "expects",
- "assert_no_difference",
- "name",
- "assert_blank",
- "assert_not_same",
- "is_a?",
- "test_add_table_with_decimals",
- "test_create_table_with_timestamps_should_create_datetime_columns",
- "assert_present",
- "assert_no_match",
- "__instance_of__",
- "assert_deprecated",
- "assert",
- "assert_throws",
- "kind_of?",
- "try",
- "__instance_variable_get__",
- "object_id",
- "timeout",
- "instance_variable_set",
- "assert_nothing_thrown",
- "__instance_variable_set__",
- "copy_object",
- "test_create_table_with_timestamps_should_create_datetime_columns_with_options",
- "assert_not_deprecated",
- "assert_in_delta",
- "id",
- "copy_metaclass",
- "test_create_table_without_a_block",
- "dup",
- "assert_not_nil",
- "send",
- "__instance_variables__",
- "to_sql",
- "mock",
- "assert_send",
- "instance_variable_defined?",
- "clone",
- "require",
- "test_migrator",
- "__instance_variable_defined_eh__",
- "frozen?",
- "test_add_column_not_null_with_default",
- "freeze",
- "test_migrator_one_up",
- "test_migrator_one_down",
- "singleton_methods",
- "method_exists?",
- "create_fixtures",
- "test_migrator_one_up_one_down",
- "test_native_decimal_insert_manual_vs_automatic",
- "instance_exec",
- "__is_a__",
- "test_migrator_double_up",
- "stub",
- "private_methods",
- "stubs",
- "test_migrator_double_down",
- "fixture_path",
- "private_singleton_methods",
- "stub_everything",
- "test_migrator_one_up_with_exception_and_rollback",
- "sequence",
- "protected_methods",
- "enum_for",
- "test_finds_migrations",
- "run_before_mocha",
- "states",
- "protected_singleton_methods",
- "to_json",
- "instance_values",
- "==",
- "mocha_setup",
- "public_methods",
- "test_finds_pending_migrations",
- "mocha_verify",
- "assert_kind_of",
- "===",
- "=~",
- "test_relative_migrations",
- "mocha_teardown",
- "gem",
- "mocha",
- "test_only_loads_pending_migrations",
- "test_add_column_with_precision_and_scale",
- "require_or_load",
- "eql?",
- "require_dependency",
- "test_native_types",
- "test_target_version_zero_should_run_only_once",
- "extend",
- "to_matcher",
- "unloadable",
- "require_association",
- "hash",
- "__id__",
- "load_dependency",
- "equals",
- "test_migrator_db_has_no_schema_migrations_table",
- "test_migrator_verbosity",
- "kind_of",
- "to_yaml",
- "to_bool",
- "test_migrator_verbosity_off",
- "taint",
- "test_migrator_going_down_due_to_version_target",
- "tainted?",
- "mocha_inspect",
- "test_migrator_rollback",
- "vim",
- "untaint",
- "taguri=",
- "test_migrator_forward",
- "test_schema_migrations_table_name",
- "test_proper_table_name",
- "all_of",
- "test_add_drop_table_with_prefix_and_suffix",
- "_setup_callbacks",
- "setup",
- "Not",
- "test_create_table_with_binary_column",
- "assert_not_equal",
- "enable_warnings",
- "acts_like?",
- "Rational",
- "_removed_setup_callbacks",
- "Table",
- "bind",
- "any_of",
- "__method__",
- "test_migrator_with_duplicates",
- "_teardown_callbacks",
- "method",
- "test_migrator_with_duplicate_names",
- "_removed_teardown_callbacks",
- "any_parameters",
- "test_migrator_with_missing_version_numbers",
- "test_add_remove_single_field_using_string_arguments",
- "test_create_table_with_custom_sequence_name",
- "test_add_remove_single_field_using_symbol_arguments",
- "_one_time_conditions_valid_14?",
- "_one_time_conditions_valid_16?",
- "run_callbacks",
- "anything",
- "silence_warnings",
- "instance_variable_names",
- "_fixture_path",
- "copy_instance_variables_from",
- "fixture_path?",
- "has_entry",
- "__marshal__",
- "_fixture_table_names",
- "__kind_of__",
- "fixture_table_names?",
- "test_add_rename",
- "assert_equal",
- "_fixture_class_names",
- "fixture_class_names?",
- "has_entries",
- "_use_transactional_fixtures",
- "people",
- "test_rename_column_using_symbol_arguments",
- "use_transactional_fixtures?",
- "instance_eval",
- "blank?",
- "with_warnings",
- "__nil__",
- "load",
- "metaclass",
- "_use_instantiated_fixtures",
- "has_key",
- "class_eval",
- "present?",
- "test_rename_column",
- "teardown",
- "use_instantiated_fixtures?",
- "method_name",
- "silence_stderr",
- "presence",
- "test_rename_column_preserves_default_value_not_null",
- "silence_stream",
- "_pre_loaded_fixtures",
- "__metaclass__",
- "__fixnum__",
- "pre_loaded_fixtures?",
- "has_value",
- "suppress",
- "to_yaml_properties",
- "test_rename_nonexistent_column",
- "test_add_index",
- "includes",
- "find_correlate_in",
- "equality_predicate_sql",
- "assert_nothing_raised",
- "let",
- "not_predicate_sql",
- "test_rename_column_with_sql_reserved_word",
- "singleton_class",
- "test_rename_column_with_an_index",
- "display",
- "taguri",
- "to_yaml_style",
- "test_remove_column_with_index",
- "size",
- "current_adapter?",
- "test_remove_column_with_multi_column_index",
- "respond_to?",
- "test_change_type_of_not_null_column",
- "is_a",
- "to_a",
- "test_rename_table_for_sqlite_should_work_with_reserved_words",
- "require_library_or_gem",
- "setup_fixtures",
- "equal?",
- "teardown_fixtures",
- "nil?",
- "fixture_table_names",
- "fixture_class_names",
- "test_create_table_without_id",
- "use_transactional_fixtures",
- "test_add_column_with_primary_key_attribute",
- "repair_validations",
- "use_instantiated_fixtures",
- "instance_of?",
- "test_create_table_adds_id",
- "test_rename_table",
- "pre_loaded_fixtures",
- "to_enum",
- "test_create_table_with_not_null_column",
- "instance_of",
- "test_change_column_nullability",
- "optionally",
- "test_rename_table_with_an_index",
- "run",
- "test_change_column",
- "default_test",
- "assert_raise",
- "test_create_table_with_defaults",
- "assert_nil",
- "flunk",
- "regexp_matches",
- "duplicable?",
- "reset_mocha",
- "stubba_method",
- "filter_backtrace",
- "test_create_table_with_limits",
- "responds_with",
- "stubba_object",
- "test_change_column_with_nil_default",
- "assert_block",
- "__show__",
- "assert_date_from_db",
- "__respond_to_eh__",
- "run_in_transaction?",
- "inspect",
- "assert_sql",
- "test_change_column_with_new_default",
- "yaml_equivalent",
- "build_message",
- "to_s",
- "test_change_column_default",
- "assert_queries",
- "pending",
- "as_json",
- "assert_no_queries",
- "test_change_column_quotes_column_names",
- "assert_match",
- "test_keeping_default_and_notnull_constraint_on_change",
- "methods",
- "connection_allow_concurrency_setup",
- "connection_allow_concurrency_teardown",
- "test_create_table_with_primary_key_prefix_as_table_name_with_underscore",
- "__send__",
- "make_connection",
- "assert_raises",
- "tap",
- "with_kcode",
- "assert_instance_of",
- "test_create_table_with_primary_key_prefix_as_table_name",
- "assert_respond_to",
- "test_change_column_default_to_null",
- "assert_same",
- "__extend__"]
-
-  LargeTestArraySorted = ["test_add_column_not_null_with_default",
- "test_add_column_with_precision_and_scale",
- "test_add_column_with_primary_key_attribute",
- "test_add_drop_table_with_prefix_and_suffix",
- "test_add_index",
- "test_add_remove_single_field_using_string_arguments",
- "test_add_remove_single_field_using_symbol_arguments",
- "test_add_rename",
- "test_add_table",
- "test_add_table_with_decimals",
- "test_change_column",
- "test_change_column_default",
- "test_change_column_default_to_null",
- "test_change_column_nullability",
- "test_change_column_quotes_column_names",
- "test_change_column_with_new_default",
- "test_change_column_with_nil_default",
- "test_change_type_of_not_null_column",
- "test_create_table_adds_id",
- "test_create_table_with_binary_column",
- "test_create_table_with_custom_sequence_name",
- "test_create_table_with_defaults",
- "test_create_table_with_force_true_does_not_drop_nonexisting_table",
- "test_create_table_with_limits",
- "test_create_table_with_not_null_column",
- "test_create_table_with_primary_key_prefix_as_table_name",
- "test_create_table_with_primary_key_prefix_as_table_name_with_underscore",
- "test_create_table_with_timestamps_should_create_datetime_columns",
- "test_create_table_with_timestamps_should_create_datetime_columns_with_options",
- "test_create_table_without_a_block",
- "test_create_table_without_id",
- "test_finds_migrations",
- "test_finds_pending_migrations",
- "test_keeping_default_and_notnull_constraint_on_change",
- "test_migrator",
- "test_migrator_db_has_no_schema_migrations_table",
- "test_migrator_double_down",
- "test_migrator_double_up",
- "test_migrator_forward",
- "test_migrator_going_down_due_to_version_target",
- "test_migrator_one_down",
- "test_migrator_one_up",
- "test_migrator_one_up_one_down",
- "test_migrator_one_up_with_exception_and_rollback",
- "test_migrator_rollback",
- "test_migrator_verbosity",
- "test_migrator_verbosity_off",
- "test_migrator_with_duplicate_names",
- "test_migrator_with_duplicates",
- "test_migrator_with_missing_version_numbers",
- "test_native_decimal_insert_manual_vs_automatic",
- "test_native_types",
- "test_only_loads_pending_migrations",
- "test_proper_table_name",
- "test_relative_migrations",
- "test_remove_column_with_index",
- "test_remove_column_with_multi_column_index",
- "test_rename_column",
- "test_rename_column_preserves_default_value_not_null",
- "test_rename_column_using_symbol_arguments",
- "test_rename_column_with_an_index",
- "test_rename_column_with_sql_reserved_word",
- "test_rename_nonexistent_column",
- "test_rename_table",
- "test_rename_table_for_sqlite_should_work_with_reserved_words",
- "test_rename_table_with_an_index",
- "test_schema_migrations_table_name",
- "test_target_version_zero_should_run_only_once"]
+  LargeArray = [
+    "test_create_table_with_force_true_does_not_drop_nonexisting_table",
+    "test_add_table",
+    "assert_difference",
+    "assert_operator",
+    "instance_variables",
+    "class",
+    "instance_variable_get",
+    "__class__",
+    "expects",
+    "assert_no_difference",
+    "name",
+    "assert_blank",
+    "assert_not_same",
+    "is_a?",
+    "test_add_table_with_decimals",
+    "test_create_table_with_timestamps_should_create_datetime_columns",
+    "assert_present",
+    "assert_no_match",
+    "__instance_of__",
+    "assert_deprecated",
+    "assert",
+    "assert_throws",
+    "kind_of?",
+    "try",
+    "__instance_variable_get__",
+    "object_id",
+    "timeout",
+    "instance_variable_set",
+    "assert_nothing_thrown",
+    "__instance_variable_set__",
+    "copy_object",
+    "test_create_table_with_timestamps_should_create_datetime_columns_with_options",
+    "assert_not_deprecated",
+    "assert_in_delta",
+    "id",
+    "copy_metaclass",
+    "test_create_table_without_a_block",
+    "dup",
+    "assert_not_nil",
+    "send",
+    "__instance_variables__",
+    "to_sql",
+    "mock",
+    "assert_send",
+    "instance_variable_defined?",
+    "clone",
+    "require",
+    "test_migrator",
+    "__instance_variable_defined_eh__",
+    "frozen?",
+    "test_add_column_not_null_with_default",
+    "freeze",
+    "test_migrator_one_up",
+    "test_migrator_one_down",
+    "singleton_methods",
+    "method_exists?",
+    "create_fixtures",
+    "test_migrator_one_up_one_down",
+    "test_native_decimal_insert_manual_vs_automatic",
+    "instance_exec",
+    "__is_a__",
+    "test_migrator_double_up",
+    "stub",
+    "private_methods",
+    "stubs",
+    "test_migrator_double_down",
+    "fixture_path",
+    "private_singleton_methods",
+    "stub_everything",
+    "test_migrator_one_up_with_exception_and_rollback",
+    "sequence",
+    "protected_methods",
+    "enum_for",
+    "test_finds_migrations",
+    "run_before_mocha",
+    "states",
+    "protected_singleton_methods",
+    "to_json",
+    "instance_values",
+    "==",
+    "mocha_setup",
+    "public_methods",
+    "test_finds_pending_migrations",
+    "mocha_verify",
+    "assert_kind_of",
+    "===",
+    "=~",
+    "test_relative_migrations",
+    "mocha_teardown",
+    "gem",
+    "mocha",
+    "test_only_loads_pending_migrations",
+    "test_add_column_with_precision_and_scale",
+    "require_or_load",
+    "eql?",
+    "require_dependency",
+    "test_native_types",
+    "test_target_version_zero_should_run_only_once",
+    "extend",
+    "to_matcher",
+    "unloadable",
+    "require_association",
+    "hash",
+    "__id__",
+    "load_dependency",
+    "equals",
+    "test_migrator_db_has_no_schema_migrations_table",
+    "test_migrator_verbosity",
+    "kind_of",
+    "to_yaml",
+    "to_bool",
+    "test_migrator_verbosity_off",
+    "taint",
+    "test_migrator_going_down_due_to_version_target",
+    "tainted?",
+    "mocha_inspect",
+    "test_migrator_rollback",
+    "vim",
+    "untaint",
+    "taguri=",
+    "test_migrator_forward",
+    "test_schema_migrations_table_name",
+    "test_proper_table_name",
+    "all_of",
+    "test_add_drop_table_with_prefix_and_suffix",
+    "_setup_callbacks",
+    "setup",
+    "Not",
+    "test_create_table_with_binary_column",
+    "assert_not_equal",
+    "enable_warnings",
+    "acts_like?",
+    "Rational",
+    "_removed_setup_callbacks",
+    "Table",
+    "bind",
+    "any_of",
+    "__method__",
+    "test_migrator_with_duplicates",
+    "_teardown_callbacks",
+    "method",
+    "test_migrator_with_duplicate_names",
+    "_removed_teardown_callbacks",
+    "any_parameters",
+    "test_migrator_with_missing_version_numbers",
+    "test_add_remove_single_field_using_string_arguments",
+    "test_create_table_with_custom_sequence_name",
+    "test_add_remove_single_field_using_symbol_arguments",
+    "_one_time_conditions_valid_14?",
+    "_one_time_conditions_valid_16?",
+    "run_callbacks",
+    "anything",
+    "silence_warnings",
+    "instance_variable_names",
+    "_fixture_path",
+    "copy_instance_variables_from",
+    "fixture_path?",
+    "has_entry",
+    "__marshal__",
+    "_fixture_table_names",
+    "__kind_of__",
+    "fixture_table_names?",
+    "test_add_rename",
+    "assert_equal",
+    "_fixture_class_names",
+    "fixture_class_names?",
+    "has_entries",
+    "_use_transactional_fixtures",
+    "people",
+    "test_rename_column_using_symbol_arguments",
+    "use_transactional_fixtures?",
+    "instance_eval",
+    "blank?",
+    "with_warnings",
+    "__nil__",
+    "load",
+    "metaclass",
+    "_use_instantiated_fixtures",
+    "has_key",
+    "class_eval",
+    "present?",
+    "test_rename_column",
+    "teardown",
+    "use_instantiated_fixtures?",
+    "method_name",
+    "silence_stderr",
+    "presence",
+    "test_rename_column_preserves_default_value_not_null",
+    "silence_stream",
+    "_pre_loaded_fixtures",
+    "__metaclass__",
+    "__fixnum__",
+    "pre_loaded_fixtures?",
+    "has_value",
+    "suppress",
+    "to_yaml_properties",
+    "test_rename_nonexistent_column",
+    "test_add_index",
+    "includes",
+    "find_correlate_in",
+    "equality_predicate_sql",
+    "assert_nothing_raised",
+    "let",
+    "not_predicate_sql",
+    "test_rename_column_with_sql_reserved_word",
+    "singleton_class",
+    "test_rename_column_with_an_index",
+    "display",
+    "taguri",
+    "to_yaml_style",
+    "test_remove_column_with_index",
+    "size",
+    "current_adapter?",
+    "test_remove_column_with_multi_column_index",
+    "respond_to?",
+    "test_change_type_of_not_null_column",
+    "is_a",
+    "to_a",
+    "test_rename_table_for_sqlite_should_work_with_reserved_words",
+    "require_library_or_gem",
+    "setup_fixtures",
+    "equal?",
+    "teardown_fixtures",
+    "nil?",
+    "fixture_table_names",
+    "fixture_class_names",
+    "test_create_table_without_id",
+    "use_transactional_fixtures",
+    "test_add_column_with_primary_key_attribute",
+    "repair_validations",
+    "use_instantiated_fixtures",
+    "instance_of?",
+    "test_create_table_adds_id",
+    "test_rename_table",
+    "pre_loaded_fixtures",
+    "to_enum",
+    "test_create_table_with_not_null_column",
+    "instance_of",
+    "test_change_column_nullability",
+    "optionally",
+    "test_rename_table_with_an_index",
+    "run",
+    "test_change_column",
+    "default_test",
+    "assert_raise",
+    "test_create_table_with_defaults",
+    "assert_nil",
+    "flunk",
+    "regexp_matches",
+    "duplicable?",
+    "reset_mocha",
+    "stubba_method",
+    "filter_backtrace",
+    "test_create_table_with_limits",
+    "responds_with",
+    "stubba_object",
+    "test_change_column_with_nil_default",
+    "assert_block",
+    "__show__",
+    "assert_date_from_db",
+    "__respond_to_eh__",
+    "run_in_transaction?",
+    "inspect",
+    "assert_sql",
+    "test_change_column_with_new_default",
+    "yaml_equivalent",
+    "build_message",
+    "to_s",
+    "test_change_column_default",
+    "assert_queries",
+    "pending",
+    "as_json",
+    "assert_no_queries",
+    "test_change_column_quotes_column_names",
+    "assert_match",
+    "test_keeping_default_and_notnull_constraint_on_change",
+    "methods",
+    "connection_allow_concurrency_setup",
+    "connection_allow_concurrency_teardown",
+    "test_create_table_with_primary_key_prefix_as_table_name_with_underscore",
+    "__send__",
+    "make_connection",
+    "assert_raises",
+    "tap",
+    "with_kcode",
+    "assert_instance_of",
+    "test_create_table_with_primary_key_prefix_as_table_name",
+    "assert_respond_to",
+    "test_change_column_default_to_null",
+    "assert_same",
+    "__extend__",
+  ]
+
+  LargeTestArraySorted = [
+    "test_add_column_not_null_with_default",
+    "test_add_column_with_precision_and_scale",
+    "test_add_column_with_primary_key_attribute",
+    "test_add_drop_table_with_prefix_and_suffix",
+    "test_add_index",
+    "test_add_remove_single_field_using_string_arguments",
+    "test_add_remove_single_field_using_symbol_arguments",
+    "test_add_rename",
+    "test_add_table",
+    "test_add_table_with_decimals",
+    "test_change_column",
+    "test_change_column_default",
+    "test_change_column_default_to_null",
+    "test_change_column_nullability",
+    "test_change_column_quotes_column_names",
+    "test_change_column_with_new_default",
+    "test_change_column_with_nil_default",
+    "test_change_type_of_not_null_column",
+    "test_create_table_adds_id",
+    "test_create_table_with_binary_column",
+    "test_create_table_with_custom_sequence_name",
+    "test_create_table_with_defaults",
+    "test_create_table_with_force_true_does_not_drop_nonexisting_table",
+    "test_create_table_with_limits",
+    "test_create_table_with_not_null_column",
+    "test_create_table_with_primary_key_prefix_as_table_name",
+    "test_create_table_with_primary_key_prefix_as_table_name_with_underscore",
+    "test_create_table_with_timestamps_should_create_datetime_columns",
+    "test_create_table_with_timestamps_should_create_datetime_columns_with_options",
+    "test_create_table_without_a_block",
+    "test_create_table_without_id",
+    "test_finds_migrations",
+    "test_finds_pending_migrations",
+    "test_keeping_default_and_notnull_constraint_on_change",
+    "test_migrator",
+    "test_migrator_db_has_no_schema_migrations_table",
+    "test_migrator_double_down",
+    "test_migrator_double_up",
+    "test_migrator_forward",
+    "test_migrator_going_down_due_to_version_target",
+    "test_migrator_one_down",
+    "test_migrator_one_up",
+    "test_migrator_one_up_one_down",
+    "test_migrator_one_up_with_exception_and_rollback",
+    "test_migrator_rollback",
+    "test_migrator_verbosity",
+    "test_migrator_verbosity_off",
+    "test_migrator_with_duplicate_names",
+    "test_migrator_with_duplicates",
+    "test_migrator_with_missing_version_numbers",
+    "test_native_decimal_insert_manual_vs_automatic",
+    "test_native_types",
+    "test_only_loads_pending_migrations",
+    "test_proper_table_name",
+    "test_relative_migrations",
+    "test_remove_column_with_index",
+    "test_remove_column_with_multi_column_index",
+    "test_rename_column",
+    "test_rename_column_preserves_default_value_not_null",
+    "test_rename_column_using_symbol_arguments",
+    "test_rename_column_with_an_index",
+    "test_rename_column_with_sql_reserved_word",
+    "test_rename_nonexistent_column",
+    "test_rename_table",
+    "test_rename_table_for_sqlite_should_work_with_reserved_words",
+    "test_rename_table_with_an_index",
+    "test_schema_migrations_table_name",
+    "test_target_version_zero_should_run_only_once",
+  ]
 
   class PrivateToAry
     private
diff --git a/spec/ruby/core/array/fixtures/encoded_strings.rb b/spec/ruby/core/array/fixtures/encoded_strings.rb
index 5b85bd0e066191..b5888d86ae6a9b 100644
--- a/spec/ruby/core/array/fixtures/encoded_strings.rb
+++ b/spec/ruby/core/array/fixtures/encoded_strings.rb
@@ -2,14 +2,14 @@
 module ArraySpecs
   def self.array_with_usascii_and_7bit_utf8_strings
     [
-      'foo'.force_encoding('US-ASCII'),
+      'foo'.dup.force_encoding('US-ASCII'),
       'bar'
     ]
   end
 
   def self.array_with_usascii_and_utf8_strings
     [
-      'foo'.force_encoding('US-ASCII'),
+      'foo'.dup.force_encoding('US-ASCII'),
       'báz'
     ]
   end
@@ -17,7 +17,7 @@ def self.array_with_usascii_and_utf8_strings
   def self.array_with_7bit_utf8_and_usascii_strings
     [
       'bar',
-      'foo'.force_encoding('US-ASCII')
+      'foo'.dup.force_encoding('US-ASCII')
     ]
   end
 
@@ -25,13 +25,13 @@ def self.array_with_utf8_and_usascii_strings
     [
       'báz',
       'bar',
-      'foo'.force_encoding('US-ASCII')
+      'foo'.dup.force_encoding('US-ASCII')
     ]
   end
 
   def self.array_with_usascii_and_utf8_strings
     [
-      'foo'.force_encoding('US-ASCII'),
+      'foo'.dup.force_encoding('US-ASCII'),
       'bar',
       'báz'
     ]
@@ -41,7 +41,7 @@ def self.array_with_utf8_and_7bit_binary_strings
     [
       'bar',
       'báz',
-      'foo'.force_encoding('BINARY')
+      'foo'.dup.force_encoding('BINARY')
     ]
   end
 
@@ -55,14 +55,14 @@ def self.array_with_utf8_and_binary_strings
 
   def self.array_with_usascii_and_7bit_binary_strings
     [
-      'bar'.force_encoding('US-ASCII'),
-      'foo'.force_encoding('BINARY')
+      'bar'.dup.force_encoding('US-ASCII'),
+      'foo'.dup.force_encoding('BINARY')
     ]
   end
 
   def self.array_with_usascii_and_binary_strings
     [
-      'bar'.force_encoding('US-ASCII'),
+      'bar'.dup.force_encoding('US-ASCII'),
       [255].pack('C').force_encoding('BINARY')
     ]
   end
diff --git a/spec/ruby/core/array/intersect_spec.rb b/spec/ruby/core/array/intersect_spec.rb
index 62ac157278f5b5..456aa26c6e6bfe 100644
--- a/spec/ruby/core/array/intersect_spec.rb
+++ b/spec/ruby/core/array/intersect_spec.rb
@@ -2,65 +2,63 @@
 require_relative 'fixtures/classes'
 
 describe 'Array#intersect?' do
-  ruby_version_is '3.1' do # https://bugs.ruby-lang.org/issues/15198
-    describe 'when at least one element in two Arrays is the same' do
-      it 'returns true' do
-        [1, 2].intersect?([2, 3, 4]).should == true
-        [2, 3, 4].intersect?([1, 2]).should == true
-      end
+  describe 'when at least one element in two Arrays is the same' do
+    it 'returns true' do
+      [1, 2].intersect?([2, 3, 4]).should == true
+      [2, 3, 4].intersect?([1, 2]).should == true
     end
+  end
 
-    describe 'when there are no elements in common between two Arrays' do
-      it 'returns false' do
-        [0, 1, 2].intersect?([3, 4]).should == false
-        [3, 4].intersect?([0, 1, 2]).should == false
-        [3, 4].intersect?([]).should == false
-        [].intersect?([0, 1, 2]).should == false
-      end
+  describe 'when there are no elements in common between two Arrays' do
+    it 'returns false' do
+      [0, 1, 2].intersect?([3, 4]).should == false
+      [3, 4].intersect?([0, 1, 2]).should == false
+      [3, 4].intersect?([]).should == false
+      [].intersect?([0, 1, 2]).should == false
     end
+  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])
+  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].intersect?(obj).should == true
-    end
+    [1, 2].intersect?(obj).should == true
+  end
 
-    it "determines equivalence between elements in the sense of eql?" do
-      obj1 = mock('1')
-      obj2 = mock('2')
-      obj1.stub!(:hash).and_return(0)
-      obj2.stub!(:hash).and_return(0)
-      obj1.stub!(:eql?).and_return(true)
-      obj2.stub!(:eql?).and_return(true)
+  it "determines equivalence between elements in the sense of eql?" do
+    obj1 = mock('1')
+    obj2 = mock('2')
+    obj1.stub!(:hash).and_return(0)
+    obj2.stub!(:hash).and_return(0)
+    obj1.stub!(:eql?).and_return(true)
+    obj2.stub!(:eql?).and_return(true)
 
-      [obj1].intersect?([obj2]).should == true
+    [obj1].intersect?([obj2]).should == true
 
-      obj1 = mock('3')
-      obj2 = mock('4')
-      obj1.stub!(:hash).and_return(0)
-      obj2.stub!(:hash).and_return(0)
-      obj1.stub!(:eql?).and_return(false)
-      obj2.stub!(:eql?).and_return(false)
+    obj1 = mock('3')
+    obj2 = mock('4')
+    obj1.stub!(:hash).and_return(0)
+    obj2.stub!(:hash).and_return(0)
+    obj1.stub!(:eql?).and_return(false)
+    obj2.stub!(:eql?).and_return(false)
 
-      [obj1].intersect?([obj2]).should == false
-    end
+    [obj1].intersect?([obj2]).should == false
+  end
 
-    it "does not call to_ary on array subclasses" do
-      [5, 6].intersect?(ArraySpecs::ToAryArray[1, 2, 5, 6]).should == true
-    end
+  it "does not call to_ary on array subclasses" do
+    [5, 6].intersect?(ArraySpecs::ToAryArray[1, 2, 5, 6]).should == true
+  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.
+  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].intersect?([x]).should == true
-    end
+    [x].intersect?([x]).should == true
+  end
 
-    it "has semantic of !(a & b).empty?" do
-      [].intersect?([]).should == false
-      [nil].intersect?([nil]).should == true
-    end
+  it "has semantic of !(a & b).empty?" do
+    [].intersect?([]).should == false
+    [nil].intersect?([nil]).should == true
   end
 end
diff --git a/spec/ruby/core/array/pack/a_spec.rb b/spec/ruby/core/array/pack/a_spec.rb
index f4a40502c27d8c..8245cd54709a2e 100644
--- a/spec/ruby/core/array/pack/a_spec.rb
+++ b/spec/ruby/core/array/pack/a_spec.rb
@@ -1,4 +1,4 @@
-# -*- encoding: binary -*-
+# encoding: binary
 require_relative '../../../spec_helper'
 require_relative '../fixtures/classes'
 require_relative 'shared/basic'
@@ -27,7 +27,7 @@
     ["abc"].pack("A*").should == "abc"
   end
 
-  it "padds the output with spaces when the count exceeds the size of the String" do
+  it "pads the output with spaces when the count exceeds the size of the String" do
     ["abc"].pack("A6").should == "abc   "
   end
 
@@ -55,7 +55,7 @@
     ["abc"].pack("a*").should == "abc"
   end
 
-  it "padds the output with NULL bytes when the count exceeds the size of the String" do
+  it "pads the output with NULL bytes when the count exceeds the size of the String" do
     ["abc"].pack("a6").should == "abc\x00\x00\x00"
   end
 
diff --git a/spec/ruby/core/array/pack/at_spec.rb b/spec/ruby/core/array/pack/at_spec.rb
index 394267791335d3..bb9801440a14d9 100644
--- a/spec/ruby/core/array/pack/at_spec.rb
+++ b/spec/ruby/core/array/pack/at_spec.rb
@@ -1,4 +1,4 @@
-# -*- encoding: binary -*-
+# encoding: binary
 require_relative '../../../spec_helper'
 require_relative '../fixtures/classes'
 require_relative 'shared/basic'
diff --git a/spec/ruby/core/array/pack/b_spec.rb b/spec/ruby/core/array/pack/b_spec.rb
index ec82b7d1abff9f..247a9ca023f48d 100644
--- a/spec/ruby/core/array/pack/b_spec.rb
+++ b/spec/ruby/core/array/pack/b_spec.rb
@@ -1,4 +1,4 @@
-# -*- encoding: binary -*-
+# encoding: binary
 require_relative '../../../spec_helper'
 require_relative '../fixtures/classes'
 require_relative 'shared/basic'
diff --git a/spec/ruby/core/array/pack/buffer_spec.rb b/spec/ruby/core/array/pack/buffer_spec.rb
index ecb40bfd06fd76..b77b2d1efa5048 100644
--- a/spec/ruby/core/array/pack/buffer_spec.rb
+++ b/spec/ruby/core/array/pack/buffer_spec.rb
@@ -13,13 +13,13 @@
   it "adds result at the end of buffer content" do
     n = [ 65, 66, 67 ] # result without buffer is "ABC"
 
-    buffer = ""
+    buffer = +""
     n.pack("ccc", buffer: buffer).should == "ABC"
 
-    buffer = "123"
+    buffer = +"123"
     n.pack("ccc", buffer: buffer).should == "123ABC"
 
-    buffer = "12345"
+    buffer = +"12345"
     n.pack("ccc", buffer: buffer).should == "12345ABC"
   end
 
@@ -28,22 +28,32 @@
       TypeError, "buffer must be String, not Array")
   end
 
+  it "raise FrozenError if buffer is frozen" do
+    -> { [65].pack("c", buffer: "frozen-string".freeze) }.should raise_error(FrozenError)
+  end
+
+  it "preserves the encoding of the given buffer" do
+    buffer = ''.encode(Encoding::ISO_8859_1)
+    [65, 66, 67].pack("ccc", buffer: buffer)
+    buffer.encoding.should == Encoding::ISO_8859_1
+  end
+
   context "offset (@) is specified" do
     it 'keeps buffer content if it is longer than offset' do
       n = [ 65, 66, 67 ]
-      buffer = "123456"
+      buffer = +"123456"
       n.pack("@3ccc", buffer: buffer).should == "123ABC"
     end
 
     it "fills the gap with \\0 if buffer content is shorter than offset" do
       n = [ 65, 66, 67 ]
-      buffer = "123"
+      buffer = +"123"
       n.pack("@6ccc", buffer: buffer).should == "123\0\0\0ABC"
     end
 
     it 'does not keep buffer content if it is longer than offset + result' do
       n = [ 65, 66, 67 ]
-      buffer = "1234567890"
+      buffer = +"1234567890"
       n.pack("@3ccc", buffer: buffer).should == "123ABC"
     end
   end
diff --git a/spec/ruby/core/array/pack/c_spec.rb b/spec/ruby/core/array/pack/c_spec.rb
index ac133ff9b69893..47b71b663d6a98 100644
--- a/spec/ruby/core/array/pack/c_spec.rb
+++ b/spec/ruby/core/array/pack/c_spec.rb
@@ -1,4 +1,4 @@
-# -*- encoding: binary -*-
+# encoding: binary
 
 require_relative '../../../spec_helper'
 require_relative '../fixtures/classes'
diff --git a/spec/ruby/core/array/pack/comment_spec.rb b/spec/ruby/core/array/pack/comment_spec.rb
index 254c827ccce8c1..daf1cff06adee5 100644
--- a/spec/ruby/core/array/pack/comment_spec.rb
+++ b/spec/ruby/core/array/pack/comment_spec.rb
@@ -1,4 +1,4 @@
-# -*- encoding: binary -*-
+# encoding: binary
 require_relative '../../../spec_helper'
 require_relative '../fixtures/classes'
 
diff --git a/spec/ruby/core/array/pack/h_spec.rb b/spec/ruby/core/array/pack/h_spec.rb
index 2c1dac8d4a445e..ba188874ba6e33 100644
--- a/spec/ruby/core/array/pack/h_spec.rb
+++ b/spec/ruby/core/array/pack/h_spec.rb
@@ -1,4 +1,4 @@
-# -*- encoding: binary -*-
+# encoding: binary
 require_relative '../../../spec_helper'
 require_relative '../fixtures/classes'
 require_relative 'shared/basic'
diff --git a/spec/ruby/core/array/pack/l_spec.rb b/spec/ruby/core/array/pack/l_spec.rb
index b446a7a36a8a4f..f6dfb1da83b1a2 100644
--- a/spec/ruby/core/array/pack/l_spec.rb
+++ b/spec/ruby/core/array/pack/l_spec.rb
@@ -29,7 +29,7 @@
     it_behaves_like :array_pack_32bit_be, 'L>'
   end
 
-  platform_is wordsize: 32 do
+  platform_is c_long_size: 32 do
     describe "with modifier '<' and '_'" do
       it_behaves_like :array_pack_32bit_le, 'L<_'
       it_behaves_like :array_pack_32bit_le, 'L_<'
@@ -51,7 +51,7 @@
     end
   end
 
-  platform_is wordsize: 64 do
+  platform_is c_long_size: 64 do
     describe "with modifier '<' and '_'" do
       it_behaves_like :array_pack_64bit_le, 'L<_'
       it_behaves_like :array_pack_64bit_le, 'L_<'
@@ -83,7 +83,7 @@
     it_behaves_like :array_pack_32bit_be, 'l>'
   end
 
-  platform_is wordsize: 32 do
+  platform_is c_long_size: 32 do
     describe "with modifier '<' and '_'" do
       it_behaves_like :array_pack_32bit_le, 'l<_'
       it_behaves_like :array_pack_32bit_le, 'l_<'
@@ -105,7 +105,7 @@
     end
   end
 
-  platform_is wordsize: 64 do
+  platform_is c_long_size: 64 do
     describe "with modifier '<' and '_'" do
       it_behaves_like :array_pack_64bit_le, 'l<_'
       it_behaves_like :array_pack_64bit_le, 'l_<'
@@ -137,7 +137,7 @@
     it_behaves_like :array_pack_32bit_le, 'l'
   end
 
-  platform_is wordsize: 32 do
+  platform_is c_long_size: 32 do
     describe "Array#pack with format 'L' with modifier '_'" do
       it_behaves_like :array_pack_32bit_le, 'L_'
     end
@@ -155,7 +155,7 @@
     end
   end
 
-  platform_is wordsize: 64 do
+  platform_is c_long_size: 64 do
     describe "Array#pack with format 'L' with modifier '_'" do
       it_behaves_like :array_pack_64bit_le, 'L_'
     end
@@ -183,7 +183,7 @@
     it_behaves_like :array_pack_32bit_be, 'l'
   end
 
-  platform_is wordsize: 32 do
+  platform_is c_long_size: 32 do
     describe "Array#pack with format 'L' with modifier '_'" do
       it_behaves_like :array_pack_32bit_be, 'L_'
     end
@@ -201,7 +201,7 @@
     end
   end
 
-  platform_is wordsize: 64 do
+  platform_is c_long_size: 64 do
     describe "Array#pack with format 'L' with modifier '_'" do
       it_behaves_like :array_pack_64bit_be, 'L_'
     end
diff --git a/spec/ruby/core/array/pack/m_spec.rb b/spec/ruby/core/array/pack/m_spec.rb
index c6364af12da7f2..a80f91275c9c1f 100644
--- a/spec/ruby/core/array/pack/m_spec.rb
+++ b/spec/ruby/core/array/pack/m_spec.rb
@@ -1,4 +1,4 @@
-# -*- encoding: binary -*-
+# encoding: binary
 require_relative '../../../spec_helper'
 require_relative '../fixtures/classes'
 require_relative 'shared/basic'
diff --git a/spec/ruby/core/array/pack/shared/basic.rb b/spec/ruby/core/array/pack/shared/basic.rb
index 5e3eea55f91fcd..ebd9f75d9dc66a 100644
--- a/spec/ruby/core/array/pack/shared/basic.rb
+++ b/spec/ruby/core/array/pack/shared/basic.rb
@@ -32,16 +32,7 @@
     [@obj, @obj, @obj, @obj].pack("aa #{pack_format} # some comment \n#{pack_format}").should be_an_instance_of(String)
   end
 
-  ruby_version_is ""..."3.2" do
-    it "warns in verbose mode that a directive is unknown" do
-      # additional directive ('a') is required for the X directive
-      -> { [@obj, @obj].pack("a R" + pack_format) }.should complain(/unknown pack directive 'R'/, verbose: true)
-      -> { [@obj, @obj].pack("a 0" + pack_format) }.should complain(/unknown pack directive '0'/, verbose: true)
-      -> { [@obj, @obj].pack("a :" + pack_format) }.should complain(/unknown pack directive ':'/, verbose: true)
-    end
-  end
-
-  ruby_version_is "3.2"..."3.3" do
+  ruby_version_is ""..."3.3" do
     # https://bugs.ruby-lang.org/issues/19150
     # NOTE: it's just a plan of the Ruby core team
     it "warns that a directive is unknown" do
@@ -57,9 +48,9 @@
     # NOTE: Added this case just to not forget about the decision in the ticket
     it "raise ArgumentError when a directive is unknown" do
       # additional directive ('a') is required for the X directive
-      -> { [@obj, @obj].pack("a R" + pack_format) }.should raise_error(ArgumentError)
-      -> { [@obj, @obj].pack("a 0" + pack_format) }.should raise_error(ArgumentError)
-      -> { [@obj, @obj].pack("a :" + pack_format) }.should raise_error(ArgumentError)
+      -> { [@obj, @obj].pack("a R" + pack_format) }.should raise_error(ArgumentError, /unknown pack directive 'R'/)
+      -> { [@obj, @obj].pack("a 0" + pack_format) }.should raise_error(ArgumentError, /unknown pack directive '0'/)
+      -> { [@obj, @obj].pack("a :" + pack_format) }.should raise_error(ArgumentError, /unknown pack directive ':'/)
     end
   end
 
diff --git a/spec/ruby/core/array/pack/shared/float.rb b/spec/ruby/core/array/pack/shared/float.rb
index 1780d7635eda43..76c800b74dc5f1 100644
--- a/spec/ruby/core/array/pack/shared/float.rb
+++ b/spec/ruby/core/array/pack/shared/float.rb
@@ -1,4 +1,4 @@
-# -*- encoding: binary -*-
+# encoding: binary
 
 describe :array_pack_float_le, shared: true do
   it "encodes a positive Float" do
diff --git a/spec/ruby/core/array/pack/shared/integer.rb b/spec/ruby/core/array/pack/shared/integer.rb
index fd21b25b19f204..61f7cca184a9b0 100644
--- a/spec/ruby/core/array/pack/shared/integer.rb
+++ b/spec/ruby/core/array/pack/shared/integer.rb
@@ -1,4 +1,4 @@
-# -*- encoding: binary -*-
+# encoding: binary
 
 describe :array_pack_16bit_le, shared: true do
   it "encodes the least significant 16 bits of a positive number" do
@@ -273,7 +273,7 @@
     str.should == "\x78\x65\x43\x12\xcd\xab\xf0\xde\x21\x43\x65\x78"
   end
 
-  platform_is wordsize: 64 do
+  platform_is c_long_size: 64 do
     it "encodes the least significant 32 bits of a number that is greater than 32 bits" do
       [ [[0xff_7865_4321],  "\x21\x43\x65\x78"],
         [[-0xff_7865_4321], "\xdf\xbc\x9a\x87"]
@@ -299,7 +299,7 @@
     str.should == "\x12\x43\x65\x78\xde\xf0\xab\xcd\x78\x65\x43\x21"
   end
 
-  platform_is wordsize: 64 do
+  platform_is c_long_size: 64 do
     it "encodes the least significant 32 bits of a number that is greater than 32 bits" do
       [ [[0xff_7865_4321],  "\x78\x65\x43\x21"],
         [[-0xff_7865_4321], "\x87\x9a\xbc\xdf"]
diff --git a/spec/ruby/core/array/pack/shared/string.rb b/spec/ruby/core/array/pack/shared/string.rb
index 8c82e8c617b266..805f78b53b682d 100644
--- a/spec/ruby/core/array/pack/shared/string.rb
+++ b/spec/ruby/core/array/pack/shared/string.rb
@@ -1,4 +1,4 @@
-# -*- encoding: binary -*-
+# encoding: binary
 describe :array_pack_string, shared: true do
   it "adds count bytes of a String to the output" do
     ["abc"].pack(pack_format(2)).should == "ab"
@@ -40,7 +40,7 @@
     f = pack_format("*")
     [ [["\u{3042 3044 3046 3048}", 0x2000B].pack(f+"U"),       Encoding::BINARY],
       [["abcde\xd1", "\xFF\xFe\x81\x82"].pack(f+"u"),          Encoding::BINARY],
-      [["a".force_encoding("ascii"), "\xFF\xFe\x81\x82"].pack(f+"u"), Encoding::BINARY],
+      [["a".dup.force_encoding("ascii"), "\xFF\xFe\x81\x82"].pack(f+"u"), Encoding::BINARY],
       # under discussion [ruby-dev:37294]
       [["\u{3042 3044 3046 3048}", 1].pack(f+"N"),             Encoding::BINARY]
     ].should be_computed_by(:encoding)
diff --git a/spec/ruby/core/array/pack/u_spec.rb b/spec/ruby/core/array/pack/u_spec.rb
index b20093a64791ef..1f84095ac46003 100644
--- a/spec/ruby/core/array/pack/u_spec.rb
+++ b/spec/ruby/core/array/pack/u_spec.rb
@@ -1,4 +1,4 @@
-# -*- encoding: binary -*-
+# encoding: binary
 require_relative '../../../spec_helper'
 require_relative '../fixtures/classes'
 require_relative 'shared/basic'
diff --git a/spec/ruby/core/array/pack/w_spec.rb b/spec/ruby/core/array/pack/w_spec.rb
index 48ed4496a536a2..e770288d67b4d2 100644
--- a/spec/ruby/core/array/pack/w_spec.rb
+++ b/spec/ruby/core/array/pack/w_spec.rb
@@ -1,4 +1,4 @@
-# -*- encoding: binary -*-
+# encoding: binary
 require_relative '../../../spec_helper'
 require_relative '../fixtures/classes'
 require_relative 'shared/basic'
diff --git a/spec/ruby/core/array/pack/x_spec.rb b/spec/ruby/core/array/pack/x_spec.rb
index 86c3ad1aa41c03..012fe4567f9cc2 100644
--- a/spec/ruby/core/array/pack/x_spec.rb
+++ b/spec/ruby/core/array/pack/x_spec.rb
@@ -1,4 +1,4 @@
-# -*- encoding: binary -*-
+# encoding: binary
 require_relative '../../../spec_helper'
 require_relative '../fixtures/classes'
 require_relative 'shared/basic'
diff --git a/spec/ruby/core/array/pack/z_spec.rb b/spec/ruby/core/array/pack/z_spec.rb
index 5ad3afd69e1d2e..60f8f7bf10c860 100644
--- a/spec/ruby/core/array/pack/z_spec.rb
+++ b/spec/ruby/core/array/pack/z_spec.rb
@@ -1,4 +1,4 @@
-# -*- encoding: binary -*-
+# encoding: binary
 require_relative '../../../spec_helper'
 require_relative '../fixtures/classes'
 require_relative 'shared/basic'
@@ -26,7 +26,7 @@
     ["abc"].pack("Z*").should == "abc\x00"
   end
 
-  it "padds the output with NULL bytes when the count exceeds the size of the String" do
+  it "pads the output with NULL bytes when the count exceeds the size of the String" do
     ["abc"].pack("Z6").should == "abc\x00\x00\x00"
   end
 
diff --git a/spec/ruby/core/array/plus_spec.rb b/spec/ruby/core/array/plus_spec.rb
index 635bd131c9aed1..b7153fd3ef1969 100644
--- a/spec/ruby/core/array/plus_spec.rb
+++ b/spec/ruby/core/array/plus_spec.rb
@@ -21,7 +21,7 @@
       ([1, 2, 3] + obj).should == [1, 2, 3, "x", "y"]
     end
 
-    it "raises a Typeerror if the given argument can't be converted to an array" do
+    it "raises a TypeError if the given argument can't be converted to an array" do
       -> { [1, 2, 3] + nil }.should raise_error(TypeError)
       -> { [1, 2, 3] + "abc" }.should raise_error(TypeError)
     end
diff --git a/spec/ruby/core/array/rassoc_spec.rb b/spec/ruby/core/array/rassoc_spec.rb
index 62fbd40611fe2a..632a05e8b3778b 100644
--- a/spec/ruby/core/array/rassoc_spec.rb
+++ b/spec/ruby/core/array/rassoc_spec.rb
@@ -35,4 +35,18 @@ def o.==(other); other == 'foobar'; end
 
     [[1, :foobar, o], [2, o, 1], [3, mock('foo')]].rassoc(key).should == [2, o, 1]
   end
+
+  ruby_version_is "3.3" do
+    it "calls to_ary on non-array elements" do
+      s1 = [1, 2]
+      s2 = ArraySpecs::ArrayConvertible.new(2, 3)
+      a = [s1, s2]
+
+      s1.should_not_receive(:to_ary)
+      a.rassoc(2).should equal(s1)
+
+      a.rassoc(3).should == [2, 3]
+      s2.called.should equal(:to_ary)
+    end
+  end
 end
diff --git a/spec/ruby/core/array/sample_spec.rb b/spec/ruby/core/array/sample_spec.rb
index 6ef78594f0d084..d4e945152d72cf 100644
--- a/spec/ruby/core/array/sample_spec.rb
+++ b/spec/ruby/core/array/sample_spec.rb
@@ -114,6 +114,13 @@
 
         -> { [1, 2].sample(random: random) }.should raise_error(RangeError)
       end
+
+      it "raises a RangeError if the value is greater than the Array size" do
+        random = mock("array_sample_random")
+        random.should_receive(:rand).and_return(3)
+
+        -> { [1, 2].sample(random: random) }.should raise_error(RangeError)
+      end
     end
   end
 
diff --git a/spec/ruby/core/array/shared/inspect.rb b/spec/ruby/core/array/shared/inspect.rb
index a2b43d49599881..af5128c645ac29 100644
--- a/spec/ruby/core/array/shared/inspect.rb
+++ b/spec/ruby/core/array/shared/inspect.rb
@@ -19,7 +19,7 @@
   end
 
   it "does not call #to_s on a String returned from #inspect" do
-    str = "abc"
+    str = +"abc"
     str.should_not_receive(:to_s)
 
     [str].send(@method).should == '["abc"]'
@@ -98,8 +98,8 @@
     end
 
     it "does not raise if inspected result is not default external encoding" do
-      utf_16be = mock("utf_16be")
-      utf_16be.should_receive(:inspect).and_return(%<"utf_16be \u3042">.encode!(Encoding::UTF_16BE))
+      utf_16be = mock(+"utf_16be")
+      utf_16be.should_receive(:inspect).and_return(%<"utf_16be \u3042">.encode(Encoding::UTF_16BE))
 
       [utf_16be].send(@method).should == '["utf_16be \u3042"]'
     end
diff --git a/spec/ruby/core/array/shared/slice.rb b/spec/ruby/core/array/shared/slice.rb
index d2866970a55f55..b80261d32fd64d 100644
--- a/spec/ruby/core/array/shared/slice.rb
+++ b/spec/ruby/core/array/shared/slice.rb
@@ -754,99 +754,97 @@ def to.to_int() -2 end
     a.send(@method, (...-9)).should == []
   end
 
-  ruby_version_is "3.2" do
-    describe "can be sliced with Enumerator::ArithmeticSequence" do
-      it "with infinite/inverted ranges and negative steps" do
-        @array = [0, 1, 2, 3, 4, 5]
-        @array.send(@method, (2..).step(-1)).should == [2, 1, 0]
-        @array.send(@method, (2..).step(-2)).should == [2, 0]
-        @array.send(@method, (2..).step(-3)).should == [2]
-        @array.send(@method, (2..).step(-4)).should == [2]
-
-        @array.send(@method, (-3..).step(-1)).should == [3, 2, 1, 0]
-        @array.send(@method, (-3..).step(-2)).should == [3, 1]
-        @array.send(@method, (-3..).step(-3)).should == [3, 0]
-        @array.send(@method, (-3..).step(-4)).should == [3]
-        @array.send(@method, (-3..).step(-5)).should == [3]
-
-        @array.send(@method, (..0).step(-1)).should == [5, 4, 3, 2, 1, 0]
-        @array.send(@method, (..0).step(-2)).should == [5, 3, 1]
-        @array.send(@method, (..0).step(-3)).should == [5, 2]
-        @array.send(@method, (..0).step(-4)).should == [5, 1]
-        @array.send(@method, (..0).step(-5)).should == [5, 0]
-        @array.send(@method, (..0).step(-6)).should == [5]
-        @array.send(@method, (..0).step(-7)).should == [5]
-
-        @array.send(@method, (...0).step(-1)).should == [5, 4, 3, 2, 1]
-        @array.send(@method, (...0).step(-2)).should == [5, 3, 1]
-        @array.send(@method, (...0).step(-3)).should == [5, 2]
-        @array.send(@method, (...0).step(-4)).should == [5, 1]
-        @array.send(@method, (...0).step(-5)).should == [5]
-        @array.send(@method, (...0).step(-6)).should == [5]
-
-        @array.send(@method, (...1).step(-1)).should == [5, 4, 3, 2]
-        @array.send(@method, (...1).step(-2)).should == [5, 3]
-        @array.send(@method, (...1).step(-3)).should == [5, 2]
-        @array.send(@method, (...1).step(-4)).should == [5]
-        @array.send(@method, (...1).step(-5)).should == [5]
-
-        @array.send(@method, (..-5).step(-1)).should == [5, 4, 3, 2, 1]
-        @array.send(@method, (..-5).step(-2)).should == [5, 3, 1]
-        @array.send(@method, (..-5).step(-3)).should == [5, 2]
-        @array.send(@method, (..-5).step(-4)).should == [5, 1]
-        @array.send(@method, (..-5).step(-5)).should == [5]
-        @array.send(@method, (..-5).step(-6)).should == [5]
-
-        @array.send(@method, (...-5).step(-1)).should == [5, 4, 3, 2]
-        @array.send(@method, (...-5).step(-2)).should == [5, 3]
-        @array.send(@method, (...-5).step(-3)).should == [5, 2]
-        @array.send(@method, (...-5).step(-4)).should == [5]
-        @array.send(@method, (...-5).step(-5)).should == [5]
-
-        @array.send(@method, (4..1).step(-1)).should == [4, 3, 2, 1]
-        @array.send(@method, (4..1).step(-2)).should == [4, 2]
-        @array.send(@method, (4..1).step(-3)).should == [4, 1]
-        @array.send(@method, (4..1).step(-4)).should == [4]
-        @array.send(@method, (4..1).step(-5)).should == [4]
-
-        @array.send(@method, (4...1).step(-1)).should == [4, 3, 2]
-        @array.send(@method, (4...1).step(-2)).should == [4, 2]
-        @array.send(@method, (4...1).step(-3)).should == [4]
-        @array.send(@method, (4...1).step(-4)).should == [4]
-
-        @array.send(@method, (-2..1).step(-1)).should == [4, 3, 2, 1]
-        @array.send(@method, (-2..1).step(-2)).should == [4, 2]
-        @array.send(@method, (-2..1).step(-3)).should == [4, 1]
-        @array.send(@method, (-2..1).step(-4)).should == [4]
-        @array.send(@method, (-2..1).step(-5)).should == [4]
-
-        @array.send(@method, (-2...1).step(-1)).should == [4, 3, 2]
-        @array.send(@method, (-2...1).step(-2)).should == [4, 2]
-        @array.send(@method, (-2...1).step(-3)).should == [4]
-        @array.send(@method, (-2...1).step(-4)).should == [4]
-
-        @array.send(@method, (4..-5).step(-1)).should == [4, 3, 2, 1]
-        @array.send(@method, (4..-5).step(-2)).should == [4, 2]
-        @array.send(@method, (4..-5).step(-3)).should == [4, 1]
-        @array.send(@method, (4..-5).step(-4)).should == [4]
-        @array.send(@method, (4..-5).step(-5)).should == [4]
-
-        @array.send(@method, (4...-5).step(-1)).should == [4, 3, 2]
-        @array.send(@method, (4...-5).step(-2)).should == [4, 2]
-        @array.send(@method, (4...-5).step(-3)).should == [4]
-        @array.send(@method, (4...-5).step(-4)).should == [4]
-
-        @array.send(@method, (-2..-5).step(-1)).should == [4, 3, 2, 1]
-        @array.send(@method, (-2..-5).step(-2)).should == [4, 2]
-        @array.send(@method, (-2..-5).step(-3)).should == [4, 1]
-        @array.send(@method, (-2..-5).step(-4)).should == [4]
-        @array.send(@method, (-2..-5).step(-5)).should == [4]
-
-        @array.send(@method, (-2...-5).step(-1)).should == [4, 3, 2]
-        @array.send(@method, (-2...-5).step(-2)).should == [4, 2]
-        @array.send(@method, (-2...-5).step(-3)).should == [4]
-        @array.send(@method, (-2...-5).step(-4)).should == [4]
-      end
+  describe "can be sliced with Enumerator::ArithmeticSequence" do
+    it "with infinite/inverted ranges and negative steps" do
+      @array = [0, 1, 2, 3, 4, 5]
+      @array.send(@method, (2..).step(-1)).should == [2, 1, 0]
+      @array.send(@method, (2..).step(-2)).should == [2, 0]
+      @array.send(@method, (2..).step(-3)).should == [2]
+      @array.send(@method, (2..).step(-4)).should == [2]
+
+      @array.send(@method, (-3..).step(-1)).should == [3, 2, 1, 0]
+      @array.send(@method, (-3..).step(-2)).should == [3, 1]
+      @array.send(@method, (-3..).step(-3)).should == [3, 0]
+      @array.send(@method, (-3..).step(-4)).should == [3]
+      @array.send(@method, (-3..).step(-5)).should == [3]
+
+      @array.send(@method, (..0).step(-1)).should == [5, 4, 3, 2, 1, 0]
+      @array.send(@method, (..0).step(-2)).should == [5, 3, 1]
+      @array.send(@method, (..0).step(-3)).should == [5, 2]
+      @array.send(@method, (..0).step(-4)).should == [5, 1]
+      @array.send(@method, (..0).step(-5)).should == [5, 0]
+      @array.send(@method, (..0).step(-6)).should == [5]
+      @array.send(@method, (..0).step(-7)).should == [5]
+
+      @array.send(@method, (...0).step(-1)).should == [5, 4, 3, 2, 1]
+      @array.send(@method, (...0).step(-2)).should == [5, 3, 1]
+      @array.send(@method, (...0).step(-3)).should == [5, 2]
+      @array.send(@method, (...0).step(-4)).should == [5, 1]
+      @array.send(@method, (...0).step(-5)).should == [5]
+      @array.send(@method, (...0).step(-6)).should == [5]
+
+      @array.send(@method, (...1).step(-1)).should == [5, 4, 3, 2]
+      @array.send(@method, (...1).step(-2)).should == [5, 3]
+      @array.send(@method, (...1).step(-3)).should == [5, 2]
+      @array.send(@method, (...1).step(-4)).should == [5]
+      @array.send(@method, (...1).step(-5)).should == [5]
+
+      @array.send(@method, (..-5).step(-1)).should == [5, 4, 3, 2, 1]
+      @array.send(@method, (..-5).step(-2)).should == [5, 3, 1]
+      @array.send(@method, (..-5).step(-3)).should == [5, 2]
+      @array.send(@method, (..-5).step(-4)).should == [5, 1]
+      @array.send(@method, (..-5).step(-5)).should == [5]
+      @array.send(@method, (..-5).step(-6)).should == [5]
+
+      @array.send(@method, (...-5).step(-1)).should == [5, 4, 3, 2]
+      @array.send(@method, (...-5).step(-2)).should == [5, 3]
+      @array.send(@method, (...-5).step(-3)).should == [5, 2]
+      @array.send(@method, (...-5).step(-4)).should == [5]
+      @array.send(@method, (...-5).step(-5)).should == [5]
+
+      @array.send(@method, (4..1).step(-1)).should == [4, 3, 2, 1]
+      @array.send(@method, (4..1).step(-2)).should == [4, 2]
+      @array.send(@method, (4..1).step(-3)).should == [4, 1]
+      @array.send(@method, (4..1).step(-4)).should == [4]
+      @array.send(@method, (4..1).step(-5)).should == [4]
+
+      @array.send(@method, (4...1).step(-1)).should == [4, 3, 2]
+      @array.send(@method, (4...1).step(-2)).should == [4, 2]
+      @array.send(@method, (4...1).step(-3)).should == [4]
+      @array.send(@method, (4...1).step(-4)).should == [4]
+
+      @array.send(@method, (-2..1).step(-1)).should == [4, 3, 2, 1]
+      @array.send(@method, (-2..1).step(-2)).should == [4, 2]
+      @array.send(@method, (-2..1).step(-3)).should == [4, 1]
+      @array.send(@method, (-2..1).step(-4)).should == [4]
+      @array.send(@method, (-2..1).step(-5)).should == [4]
+
+      @array.send(@method, (-2...1).step(-1)).should == [4, 3, 2]
+      @array.send(@method, (-2...1).step(-2)).should == [4, 2]
+      @array.send(@method, (-2...1).step(-3)).should == [4]
+      @array.send(@method, (-2...1).step(-4)).should == [4]
+
+      @array.send(@method, (4..-5).step(-1)).should == [4, 3, 2, 1]
+      @array.send(@method, (4..-5).step(-2)).should == [4, 2]
+      @array.send(@method, (4..-5).step(-3)).should == [4, 1]
+      @array.send(@method, (4..-5).step(-4)).should == [4]
+      @array.send(@method, (4..-5).step(-5)).should == [4]
+
+      @array.send(@method, (4...-5).step(-1)).should == [4, 3, 2]
+      @array.send(@method, (4...-5).step(-2)).should == [4, 2]
+      @array.send(@method, (4...-5).step(-3)).should == [4]
+      @array.send(@method, (4...-5).step(-4)).should == [4]
+
+      @array.send(@method, (-2..-5).step(-1)).should == [4, 3, 2, 1]
+      @array.send(@method, (-2..-5).step(-2)).should == [4, 2]
+      @array.send(@method, (-2..-5).step(-3)).should == [4, 1]
+      @array.send(@method, (-2..-5).step(-4)).should == [4]
+      @array.send(@method, (-2..-5).step(-5)).should == [4]
+
+      @array.send(@method, (-2...-5).step(-1)).should == [4, 3, 2]
+      @array.send(@method, (-2...-5).step(-2)).should == [4, 2]
+      @array.send(@method, (-2...-5).step(-3)).should == [4]
+      @array.send(@method, (-2...-5).step(-4)).should == [4]
     end
   end
 
diff --git a/spec/ruby/core/array/shuffle_spec.rb b/spec/ruby/core/array/shuffle_spec.rb
index 1d528c124f772b..b84394bcb5b7cb 100644
--- a/spec/ruby/core/array/shuffle_spec.rb
+++ b/spec/ruby/core/array/shuffle_spec.rb
@@ -69,9 +69,18 @@
     -> { [1, 2].shuffle(random: random) }.should raise_error(RangeError)
   end
 
-  it "raises a RangeError if the value is equal to one" do
+  it "raises a RangeError if the value is equal to the Array size" do
     value = mock("array_shuffle_random_value")
-    value.should_receive(:to_int).at_least(1).times.and_return(1)
+    value.should_receive(:to_int).at_least(1).times.and_return(2)
+    random = mock("array_shuffle_random")
+    random.should_receive(:rand).at_least(1).times.and_return(value)
+
+    -> { [1, 2].shuffle(random: random) }.should raise_error(RangeError)
+  end
+
+  it "raises a RangeError if the value is greater than the Array size" do
+    value = mock("array_shuffle_random_value")
+    value.should_receive(:to_int).at_least(1).times.and_return(3)
     random = mock("array_shuffle_random")
     random.should_receive(:rand).at_least(1).times.and_return(value)
 
diff --git a/spec/ruby/core/array/to_h_spec.rb b/spec/ruby/core/array/to_h_spec.rb
index f4578211a1f1f5..1c814f3d012c96 100644
--- a/spec/ruby/core/array/to_h_spec.rb
+++ b/spec/ruby/core/array/to_h_spec.rb
@@ -45,6 +45,12 @@
       [:a, :b].to_h { |k| [k, k.to_s] }.should == { a: 'a', b: 'b' }
     end
 
+    it "passes to a block each element as a single argument" do
+      ScratchPad.record []
+      [[:a, 1], [:b, 2]].to_h { |*args| ScratchPad << args; [args[0], args[1]] }
+      ScratchPad.recorded.sort.should == [[[:a, 1]], [[:b, 2]]]
+    end
+
     it "raises ArgumentError if block returns longer or shorter array" do
       -> do
         [:a, :b].to_h { |k| [k, k.to_s, 1] }
diff --git a/spec/ruby/core/basicobject/equal_spec.rb b/spec/ruby/core/basicobject/equal_spec.rb
index 3c1ad56d4ab51e..ce28eaed95547b 100644
--- a/spec/ruby/core/basicobject/equal_spec.rb
+++ b/spec/ruby/core/basicobject/equal_spec.rb
@@ -11,8 +11,10 @@
   it "is unaffected by overriding __id__" do
     o1 = mock("object")
     o2 = mock("object")
-    def o1.__id__; 10; end
-    def o2.__id__; 10; end
+    suppress_warning {
+      def o1.__id__; 10; end
+      def o2.__id__; 10; end
+    }
     o1.equal?(o2).should be_false
   end
 
diff --git a/spec/ruby/core/basicobject/instance_eval_spec.rb b/spec/ruby/core/basicobject/instance_eval_spec.rb
index 1f3a43f341b7fb..633b5c2cb1d9bb 100644
--- a/spec/ruby/core/basicobject/instance_eval_spec.rb
+++ b/spec/ruby/core/basicobject/instance_eval_spec.rb
@@ -141,22 +141,11 @@ class B; end
       caller.get_constant_with_string(receiver).should == :singleton_class
     end
 
-    ruby_version_is ""..."3.1" do
-      it "looks in the caller scope next" do
-        receiver = BasicObjectSpecs::InstEval::Constants::ConstantInReceiverClass::ReceiverScope::Receiver.new
-        caller = BasicObjectSpecs::InstEval::Constants::ConstantInReceiverClass::CallerScope::Caller.new
+    it "looks in the receiver class next" do
+      receiver = BasicObjectSpecs::InstEval::Constants::ConstantInReceiverClass::ReceiverScope::Receiver.new
+      caller = BasicObjectSpecs::InstEval::Constants::ConstantInReceiverClass::CallerScope::Caller.new
 
-        caller.get_constant_with_string(receiver).should == :Caller
-      end
-    end
-
-    ruby_version_is "3.1" do
-      it "looks in the receiver class next" do
-        receiver = BasicObjectSpecs::InstEval::Constants::ConstantInReceiverClass::ReceiverScope::Receiver.new
-        caller = BasicObjectSpecs::InstEval::Constants::ConstantInReceiverClass::CallerScope::Caller.new
-
-        caller.get_constant_with_string(receiver).should == :Receiver
-      end
+      caller.get_constant_with_string(receiver).should == :Receiver
     end
 
     it "looks in the caller class next" do
diff --git a/spec/ruby/core/basicobject/instance_exec_spec.rb b/spec/ruby/core/basicobject/instance_exec_spec.rb
index 289fdd889b5dc3..370f03d33c6bd2 100644
--- a/spec/ruby/core/basicobject/instance_exec_spec.rb
+++ b/spec/ruby/core/basicobject/instance_exec_spec.rb
@@ -84,17 +84,17 @@ def foo
     end.should raise_error(TypeError)
   end
 
-quarantine! do # Not clean, leaves cvars lying around to break other specs
-  it "scopes class var accesses in the caller when called on an Integer" do
-    # Integer can take instance vars
-    Integer.class_eval "@@__tmp_instance_exec_spec = 1"
-    (defined? @@__tmp_instance_exec_spec).should == nil
-
-    @@__tmp_instance_exec_spec = 2
-    1.instance_exec { @@__tmp_instance_exec_spec }.should == 2
-    Integer.__send__(:remove_class_variable, :@@__tmp_instance_exec_spec)
+  quarantine! do # Not clean, leaves cvars lying around to break other specs
+    it "scopes class var accesses in the caller when called on an Integer" do
+      # Integer can take instance vars
+      Integer.class_eval "@@__tmp_instance_exec_spec = 1"
+      (defined? @@__tmp_instance_exec_spec).should == nil
+
+      @@__tmp_instance_exec_spec = 2
+      1.instance_exec { @@__tmp_instance_exec_spec }.should == 2
+      Integer.__send__(:remove_class_variable, :@@__tmp_instance_exec_spec)
+    end
   end
-end
 
   it "raises a TypeError when defining methods on numerics" do
     -> do
diff --git a/spec/ruby/core/basicobject/singleton_method_added_spec.rb b/spec/ruby/core/basicobject/singleton_method_added_spec.rb
index ab6b2a2d10cbea..bd21458ea76f20 100644
--- a/spec/ruby/core/basicobject/singleton_method_added_spec.rb
+++ b/spec/ruby/core/basicobject/singleton_method_added_spec.rb
@@ -94,8 +94,10 @@ class << self
         -> {
           def self.foo
           end
-        }.should raise_error(NoMethodError, /undefined method `singleton_method_added' for/)
+        }.should raise_error(NoMethodError, /undefined method [`']singleton_method_added' for/)
       end
+    ensure
+      BasicObjectSpecs.send(:remove_const, :NoSingletonMethodAdded)
     end
 
     it "raises NoMethodError for a singleton instance" do
@@ -106,16 +108,16 @@ class << object
         -> {
           def foo
           end
-        }.should raise_error(NoMethodError, /undefined method `singleton_method_added' for #<Object:/)
+        }.should raise_error(NoMethodError, /undefined method [`']singleton_method_added' for #<Object:/)
 
         -> {
           define_method(:bar) {}
-        }.should raise_error(NoMethodError, /undefined method `singleton_method_added' for #<Object:/)
+        }.should raise_error(NoMethodError, /undefined method [`']singleton_method_added' for #<Object:/)
       end
 
       -> {
         object.define_singleton_method(:baz) {}
-      }.should raise_error(NoMethodError, /undefined method `singleton_method_added' for #<Object:/)
+      }.should raise_error(NoMethodError, /undefined method [`']singleton_method_added' for #<Object:/)
     end
 
     it "calls #method_missing" do
diff --git a/spec/ruby/core/binding/clone_spec.rb b/spec/ruby/core/binding/clone_spec.rb
index ebd40f5377e167..f1769ac6dea5f6 100644
--- a/spec/ruby/core/binding/clone_spec.rb
+++ b/spec/ruby/core/binding/clone_spec.rb
@@ -4,4 +4,10 @@
 
 describe "Binding#clone" do
   it_behaves_like :binding_clone, :clone
+
+  it "preserves frozen status" do
+    bind = binding.freeze
+    bind.frozen?.should == true
+    bind.clone.frozen?.should == true
+  end
 end
diff --git a/spec/ruby/core/binding/dup_spec.rb b/spec/ruby/core/binding/dup_spec.rb
index 43968213c8f643..4eff66bd9a4cc9 100644
--- a/spec/ruby/core/binding/dup_spec.rb
+++ b/spec/ruby/core/binding/dup_spec.rb
@@ -4,4 +4,27 @@
 
 describe "Binding#dup" do
   it_behaves_like :binding_clone, :dup
+
+  it "resets frozen status" do
+    bind = binding.freeze
+    bind.frozen?.should == true
+    bind.dup.frozen?.should == false
+  end
+
+  it "retains original binding variables but the list is distinct" do
+    bind1 = binding
+    eval "a = 1", bind1
+
+    bind2 = bind1.dup
+    eval("a = 2", bind2)
+    eval("a", bind1).should == 2
+    eval("a", bind2).should == 2
+
+    eval("b = 2", bind2)
+    -> { eval("b", bind1) }.should raise_error(NameError)
+    eval("b", bind2).should == 2
+
+    bind1.local_variables.sort.should == [:a, :bind1, :bind2]
+    bind2.local_variables.sort.should == [:a, :b, :bind1, :bind2]
+  end
 end
diff --git a/spec/ruby/core/binding/fixtures/irb.rb b/spec/ruby/core/binding/fixtures/irb.rb
deleted file mode 100644
index 5f305f2d5d7f2b..00000000000000
--- a/spec/ruby/core/binding/fixtures/irb.rb
+++ /dev/null
@@ -1,3 +0,0 @@
-a = 10
-
-binding.irb
diff --git a/spec/ruby/core/binding/fixtures/irbrc b/spec/ruby/core/binding/fixtures/irbrc
deleted file mode 100644
index 2bc12af2f76959..00000000000000
--- a/spec/ruby/core/binding/fixtures/irbrc
+++ /dev/null
@@ -1 +0,0 @@
-# empty configuration
diff --git a/spec/ruby/core/binding/irb_spec.rb b/spec/ruby/core/binding/irb_spec.rb
deleted file mode 100644
index b3bc274f78ff95..00000000000000
--- a/spec/ruby/core/binding/irb_spec.rb
+++ /dev/null
@@ -1,16 +0,0 @@
-require_relative '../../spec_helper'
-
-describe "Binding#irb" do
-  it "creates an IRB session with the binding in scope" do
-    irb_fixture = fixture __FILE__, "irb.rb"
-    irbrc_fixture = fixture __FILE__, "irbrc"
-
-    out = IO.popen([{"IRBRC"=>irbrc_fixture}, *ruby_exe, irb_fixture], "r+") do |pipe|
-      pipe.puts "a ** 2"
-      pipe.puts "exit"
-      pipe.readlines.map(&:chomp)
-    end
-
-    out[-3..-1].should == ["a ** 2", "100", "exit"]
-  end
-end
diff --git a/spec/ruby/core/binding/shared/clone.rb b/spec/ruby/core/binding/shared/clone.rb
index 0e934ac1b52c39..2d854fce965ab2 100644
--- a/spec/ruby/core/binding/shared/clone.rb
+++ b/spec/ruby/core/binding/shared/clone.rb
@@ -31,4 +31,26 @@
       b2.local_variable_defined?(:x).should == false
     end
   end
+
+  ruby_version_is "3.4" do
+    it "copies instance variables" do
+      @b1.instance_variable_set(:@ivar, 1)
+      cl = @b1.send(@method)
+      cl.instance_variables.should == [:@ivar]
+    end
+
+    it "copies the finalizer" do
+      code = <<-'RUBY'
+        obj = binding
+
+        ObjectSpace.define_finalizer(obj, Proc.new { STDOUT.write "finalized\n" })
+
+        obj.clone
+
+        exit 0
+      RUBY
+
+      ruby_exe(code).lines.sort.should == ["finalized\n", "finalized\n"]
+    end
+  end
 end
diff --git a/spec/ruby/core/builtin_constants/builtin_constants_spec.rb b/spec/ruby/core/builtin_constants/builtin_constants_spec.rb
index 1960f5721f90a7..eaf311783a4a08 100644
--- a/spec/ruby/core/builtin_constants/builtin_constants_spec.rb
+++ b/spec/ruby/core/builtin_constants/builtin_constants_spec.rb
@@ -4,6 +4,10 @@
   it "is a String" do
     RUBY_VERSION.should be_kind_of(String)
   end
+
+  it "is frozen" do
+    RUBY_VERSION.should.frozen?
+  end
 end
 
 describe "RUBY_PATCHLEVEL" do
@@ -16,34 +20,58 @@
   it "is a String" do
     RUBY_COPYRIGHT.should be_kind_of(String)
   end
+
+  it "is frozen" do
+    RUBY_COPYRIGHT.should.frozen?
+  end
 end
 
 describe "RUBY_DESCRIPTION" do
   it "is a String" do
     RUBY_DESCRIPTION.should be_kind_of(String)
   end
+
+  it "is frozen" do
+    RUBY_DESCRIPTION.should.frozen?
+  end
 end
 
 describe "RUBY_ENGINE" do
   it "is a String" do
     RUBY_ENGINE.should be_kind_of(String)
   end
+
+  it "is frozen" do
+    RUBY_ENGINE.should.frozen?
+  end
 end
 
 describe "RUBY_PLATFORM" do
   it "is a String" do
     RUBY_PLATFORM.should be_kind_of(String)
   end
+
+  it "is frozen" do
+    RUBY_PLATFORM.should.frozen?
+  end
 end
 
 describe "RUBY_RELEASE_DATE" do
   it "is a String" do
     RUBY_RELEASE_DATE.should be_kind_of(String)
   end
+
+  it "is frozen" do
+    RUBY_RELEASE_DATE.should.frozen?
+  end
 end
 
 describe "RUBY_REVISION" do
   it "is a String" do
     RUBY_REVISION.should be_kind_of(String)
   end
+
+  it "is frozen" do
+    RUBY_REVISION.should.frozen?
+  end
 end
diff --git a/spec/ruby/core/class/attached_object_spec.rb b/spec/ruby/core/class/attached_object_spec.rb
index 115d5fa5631c3b..8f8a0734c6e71f 100644
--- a/spec/ruby/core/class/attached_object_spec.rb
+++ b/spec/ruby/core/class/attached_object_spec.rb
@@ -1,31 +1,29 @@
 require_relative '../../spec_helper'
 
-ruby_version_is '3.2' do
-  describe "Class#attached_object" do
-    it "returns the object that is attached to a singleton class" do
-      a = Class.new
+describe "Class#attached_object" do
+  it "returns the object that is attached to a singleton class" do
+    a = Class.new
 
-      a_obj = a.new
-      a_obj.singleton_class.attached_object.should == a_obj
-    end
+    a_obj = a.new
+    a_obj.singleton_class.attached_object.should == a_obj
+  end
 
-    it "returns the class object that is attached to a class's singleton class" do
-      a = Class.new
-      singleton_class = (class << a; self; end)
+  it "returns the class object that is attached to a class's singleton class" do
+    a = Class.new
+    singleton_class = (class << a; self; end)
 
-      singleton_class.attached_object.should == a
-    end
+    singleton_class.attached_object.should == a
+  end
 
-    it "raises TypeError if the class is not a singleton class" do
-      a = Class.new
+  it "raises TypeError if the class is not a singleton class" do
+    a = Class.new
 
-      -> { a.attached_object }.should raise_error(TypeError)
-    end
+    -> { a.attached_object }.should raise_error(TypeError, /is not a singleton class/)
+  end
 
-    it "raises TypeError for special singleton classes" do
-      -> { nil.singleton_class.attached_object }.should raise_error(TypeError)
-      -> { true.singleton_class.attached_object }.should raise_error(TypeError)
-      -> { false.singleton_class.attached_object }.should raise_error(TypeError)
-    end
+  it "raises TypeError for special singleton classes" do
+    -> { nil.singleton_class.attached_object }.should raise_error(TypeError, /[`']NilClass' is not a singleton class/)
+    -> { true.singleton_class.attached_object }.should raise_error(TypeError, /[`']TrueClass' is not a singleton class/)
+    -> { false.singleton_class.attached_object }.should raise_error(TypeError, /[`']FalseClass' is not a singleton class/)
   end
 end
diff --git a/spec/ruby/core/class/dup_spec.rb b/spec/ruby/core/class/dup_spec.rb
index c09ed71b311527..1ff9abf7b44afb 100644
--- a/spec/ruby/core/class/dup_spec.rb
+++ b/spec/ruby/core/class/dup_spec.rb
@@ -59,6 +59,8 @@ def self.message
   it "stores the new name if assigned to a constant" do
     CoreClassSpecs::RecordCopy = CoreClassSpecs::Record.dup
     CoreClassSpecs::RecordCopy.name.should == "CoreClassSpecs::RecordCopy"
+  ensure
+    CoreClassSpecs.send(:remove_const, :RecordCopy)
   end
 
   it "raises TypeError if called on BasicObject" do
diff --git a/spec/ruby/core/class/inherited_spec.rb b/spec/ruby/core/class/inherited_spec.rb
index 8ef8bb8c35c1bf..2a8d1ff813aa54 100644
--- a/spec/ruby/core/class/inherited_spec.rb
+++ b/spec/ruby/core/class/inherited_spec.rb
@@ -98,4 +98,21 @@ class << top; protected :inherited; end
     -> { Class.new(top) }.should_not raise_error
   end
 
+  it "if the subclass is assigned to a constant, it is all set" do
+    ScratchPad.record []
+
+    parent = Class.new do
+      def self.inherited(subclass)
+        ScratchPad << defined?(self::C)
+        ScratchPad << const_defined?(:C)
+        ScratchPad << constants
+        ScratchPad << const_get(:C)
+        ScratchPad << subclass.name.match?(/\A#<Class:0x\w+>::C\z/)
+      end
+    end
+
+    class parent::C < parent; end
+
+    ScratchPad.recorded.should == ["constant", true, [:C], parent::C, true]
+  end
 end
diff --git a/spec/ruby/core/class/new_spec.rb b/spec/ruby/core/class/new_spec.rb
index 93152a83ee57c3..6fe54c3209b3b7 100644
--- a/spec/ruby/core/class/new_spec.rb
+++ b/spec/ruby/core/class/new_spec.rb
@@ -83,6 +83,8 @@ def message2; "hello"; end
     a = Class.new
     MyClass::NestedClass = a
     MyClass::NestedClass.name.should == "MyClass::NestedClass"
+  ensure
+    Object.send(:remove_const, :MyClass)
   end
 
   it "sets the new class' superclass to the given class" do
diff --git a/spec/ruby/core/class/subclasses_spec.rb b/spec/ruby/core/class/subclasses_spec.rb
index a16b934d4fc5d6..f6921527871077 100644
--- a/spec/ruby/core/class/subclasses_spec.rb
+++ b/spec/ruby/core/class/subclasses_spec.rb
@@ -1,60 +1,85 @@
 require_relative '../../spec_helper'
 require_relative '../module/fixtures/classes'
 
-ruby_version_is '3.1' do
-  describe "Class#subclasses" do
-    it "returns a list of classes directly inheriting from self" do
-      assert_subclasses(ModuleSpecs::Parent, [ModuleSpecs::Child, ModuleSpecs::Child2])
-    end
+describe "Class#subclasses" do
+  it "returns a list of classes directly inheriting from self" do
+    assert_subclasses(ModuleSpecs::Parent, [ModuleSpecs::Child, ModuleSpecs::Child2])
+  end
 
-    it "does not return included modules" do
-      parent = Class.new
-      child = Class.new(parent)
-      mod = Module.new
-      parent.include(mod)
+  it "does not return included modules from the parent" do
+    parent = Class.new
+    child = Class.new(parent)
+    mod = Module.new
+    parent.include(mod)
 
-      assert_subclasses(parent, [child])
-    end
+    assert_subclasses(parent, [child])
+  end
 
-    it "does not return singleton classes" do
-      a = Class.new
+  it "does not return included modules from the child" do
+    parent = Class.new
+    child = Class.new(parent)
+    mod = Module.new
+    parent.include(mod)
 
-      a_obj = a.new
-      def a_obj.force_singleton_class
-        42
-      end
+    assert_subclasses(parent, [child])
+  end
 
-      a.subclasses.should_not include(a_obj.singleton_class)
-    end
+  it "does not return prepended modules from the parent" do
+    parent = Class.new
+    child = Class.new(parent)
+    mod = Module.new
+    parent.prepend(mod)
+
+    assert_subclasses(parent, [child])
+  end
+
+  it "does not return prepended modules from the child" do
+    parent = Class.new
+    child = Class.new(parent)
+    mod = Module.new
+    child.prepend(mod)
+
+    assert_subclasses(parent, [child])
+  end
+
+  it "does not return singleton classes" do
+    a = Class.new
 
-    it "has 1 entry per module or class" do
-      ModuleSpecs::Parent.subclasses.should == ModuleSpecs::Parent.subclasses.uniq
+    a_obj = a.new
+    def a_obj.force_singleton_class
+      42
     end
 
-    it "works when creating subclasses concurrently" do
-      t = 16
-      n = 1000
-      go = false
-      superclass = Class.new
-
-      threads = t.times.map do
-        Thread.new do
-          Thread.pass until go
-          n.times.map do
-            Class.new(superclass)
-          end
+    a.subclasses.should_not include(a_obj.singleton_class)
+  end
+
+  it "has 1 entry per module or class" do
+    ModuleSpecs::Parent.subclasses.should == ModuleSpecs::Parent.subclasses.uniq
+  end
+
+  it "works when creating subclasses concurrently" do
+    t = 16
+    n = 1000
+    go = false
+    superclass = Class.new
+
+    threads = t.times.map do
+      Thread.new do
+        Thread.pass until go
+        n.times.map do
+          Class.new(superclass)
         end
       end
+    end
 
-      go = true
-      classes = threads.map(&:value)
+    go = true
+    classes = threads.map(&:value)
 
-      superclass.subclasses.size.should == t * n
-      superclass.subclasses.each { |c| c.should be_kind_of(Class) }
-    end
+    superclass.subclasses.size.should == t * n
+    superclass.subclasses.each { |c| c.should be_kind_of(Class) }
+  end
 
-    def assert_subclasses(mod,subclasses)
-      mod.subclasses.sort_by(&:inspect).should == subclasses.sort_by(&:inspect)
-    end
+  def assert_subclasses(mod,subclasses)
+    mod.subclasses.sort_by(&:inspect).should == subclasses.sort_by(&:inspect)
   end
 end
diff --git a/spec/ruby/core/complex/equal_value_spec.rb b/spec/ruby/core/complex/equal_value_spec.rb
index ad7236b1bd5deb..97c486d8204470 100644
--- a/spec/ruby/core/complex/equal_value_spec.rb
+++ b/spec/ruby/core/complex/equal_value_spec.rb
@@ -76,7 +76,7 @@
       (Complex(real, 0) == @other).should be_true
     end
 
-    it "returns false when when the imaginary part is not zero" do
+    it "returns false when the imaginary part is not zero" do
       (Complex(3, 1) == @other).should be_false
     end
   end
diff --git a/spec/ruby/core/complex/inspect_spec.rb b/spec/ruby/core/complex/inspect_spec.rb
index 7a89ec6854b95c..045be94b225ce2 100644
--- a/spec/ruby/core/complex/inspect_spec.rb
+++ b/spec/ruby/core/complex/inspect_spec.rb
@@ -17,7 +17,8 @@
 
   it "calls #inspect on real and imaginary" do
     real = NumericSpecs::Subclass.new
-    real.should_receive(:inspect).and_return("1")
+    # + because of https://bugs.ruby-lang.org/issues/20337
+    real.should_receive(:inspect).and_return(+"1")
     imaginary = NumericSpecs::Subclass.new
     imaginary.should_receive(:inspect).and_return("2")
     imaginary.should_receive(:<).any_number_of_times.and_return(false)
@@ -26,7 +27,8 @@
 
   it "adds an `*' before the `i' if the last character of the imaginary part is not numeric" do
     real = NumericSpecs::Subclass.new
-    real.should_receive(:inspect).and_return("(1)")
+    # + because of https://bugs.ruby-lang.org/issues/20337
+    real.should_receive(:inspect).and_return(+"(1)")
     imaginary = NumericSpecs::Subclass.new
     imaginary.should_receive(:inspect).and_return("(2)")
     imaginary.should_receive(:<).any_number_of_times.and_return(false)
diff --git a/spec/ruby/core/complex/polar_spec.rb b/spec/ruby/core/complex/polar_spec.rb
index 3bb3751bc637c2..56335584efe0c5 100644
--- a/spec/ruby/core/complex/polar_spec.rb
+++ b/spec/ruby/core/complex/polar_spec.rb
@@ -11,20 +11,18 @@
     ->{ Complex.polar(nil, nil) }.should raise_error(TypeError)
   end
 
-  ruby_bug "#19004", ""..."3.2" do
-    it "computes the real values of the real & imaginary parts from the polar form" do
-      a = Complex.polar(1.0+0.0i, Math::PI/2+0.0i)
-      a.real.should be_close(0.0, TOLERANCE)
-      a.imag.should be_close(1.0, TOLERANCE)
-      a.real.real?.should be_true
-      a.imag.real?.should be_true
+  it "computes the real values of the real & imaginary parts from the polar form" do
+    a = Complex.polar(1.0+0.0i, Math::PI/2+0.0i)
+    a.real.should be_close(0.0, TOLERANCE)
+    a.imag.should be_close(1.0, TOLERANCE)
+    a.real.real?.should be_true
+    a.imag.real?.should be_true
 
-      b = Complex.polar(1+0.0i)
-      b.real.should be_close(1.0, TOLERANCE)
-      b.imag.should be_close(0.0, TOLERANCE)
-      b.real.real?.should be_true
-      b.imag.real?.should be_true
-    end
+    b = Complex.polar(1+0.0i)
+    b.real.should be_close(1.0, TOLERANCE)
+    b.imag.should be_close(0.0, TOLERANCE)
+    b.real.real?.should be_true
+    b.imag.real?.should be_true
   end
 end
 
diff --git a/spec/ruby/core/complex/shared/rect.rb b/spec/ruby/core/complex/shared/rect.rb
index 9f5de1ffeb3de3..4ac294e7716bd6 100644
--- a/spec/ruby/core/complex/shared/rect.rb
+++ b/spec/ruby/core/complex/shared/rect.rb
@@ -24,15 +24,15 @@
   end
 
   it "returns the real part of self as the first element" do
-   @numbers.each do |number|
-     number.send(@method).first.should == number.real
-   end
+    @numbers.each do |number|
+      number.send(@method).first.should == number.real
+    end
   end
 
   it "returns the imaginary part of self as the last element" do
-     @numbers.each do |number|
-       number.send(@method).last.should == number.imaginary
-     end
+    @numbers.each do |number|
+      number.send(@method).last.should == number.imaginary
+    end
   end
 
   it "raises an ArgumentError if given any arguments" do
diff --git a/spec/ruby/core/complex/to_r_spec.rb b/spec/ruby/core/complex/to_r_spec.rb
index 45599214925a6e..788027a50039c5 100644
--- a/spec/ruby/core/complex/to_r_spec.rb
+++ b/spec/ruby/core/complex/to_r_spec.rb
@@ -34,8 +34,16 @@
   end
 
   describe "when the imaginary part is Float 0.0" do
-    it "raises RangeError" do
-      -> { Complex(0, 0.0).to_r }.should raise_error(RangeError)
+    ruby_version_is ''...'3.4' do
+      it "raises RangeError" do
+        -> { Complex(0, 0.0).to_r }.should raise_error(RangeError)
+      end
+    end
+
+    ruby_version_is '3.4' do
+      it "returns a Rational" do
+        Complex(0, 0.0).to_r.should == 0r
+      end
     end
   end
 end
diff --git a/spec/ruby/core/complex/to_s_spec.rb b/spec/ruby/core/complex/to_s_spec.rb
index 7677dcd0b56eda..ceccffe4703779 100644
--- a/spec/ruby/core/complex/to_s_spec.rb
+++ b/spec/ruby/core/complex/to_s_spec.rb
@@ -45,7 +45,8 @@
 
   it "treats real and imaginary parts as strings" do
     real = NumericSpecs::Subclass.new
-    real.should_receive(:to_s).and_return("1")
+    # + because of https://bugs.ruby-lang.org/issues/20337
+    real.should_receive(:to_s).and_return(+"1")
     imaginary = NumericSpecs::Subclass.new
     imaginary.should_receive(:to_s).and_return("2")
     imaginary.should_receive(:<).any_number_of_times.and_return(false)
diff --git a/spec/ruby/core/conditionvariable/broadcast_spec.rb b/spec/ruby/core/conditionvariable/broadcast_spec.rb
index d88159df234877..55a7b89c7295c2 100644
--- a/spec/ruby/core/conditionvariable/broadcast_spec.rb
+++ b/spec/ruby/core/conditionvariable/broadcast_spec.rb
@@ -1,5 +1,4 @@
 require_relative '../../spec_helper'
-require 'thread'
 
 describe "ConditionVariable#broadcast" do
   it "releases all threads waiting in line for this resource" do
diff --git a/spec/ruby/core/conditionvariable/marshal_dump_spec.rb b/spec/ruby/core/conditionvariable/marshal_dump_spec.rb
index f951a13e28973e..88b1cc38c14296 100644
--- a/spec/ruby/core/conditionvariable/marshal_dump_spec.rb
+++ b/spec/ruby/core/conditionvariable/marshal_dump_spec.rb
@@ -1,5 +1,4 @@
 require_relative '../../spec_helper'
-require 'thread'
 
 describe "ConditionVariable#marshal_dump" do
   it "raises a TypeError" do
diff --git a/spec/ruby/core/conditionvariable/signal_spec.rb b/spec/ruby/core/conditionvariable/signal_spec.rb
index 86383073f1bde2..43a9cc611b5e7e 100644
--- a/spec/ruby/core/conditionvariable/signal_spec.rb
+++ b/spec/ruby/core/conditionvariable/signal_spec.rb
@@ -1,5 +1,4 @@
 require_relative '../../spec_helper'
-require 'thread'
 
 describe "ConditionVariable#signal" do
   it "releases the first thread waiting in line for this resource" do
diff --git a/spec/ruby/core/conditionvariable/wait_spec.rb b/spec/ruby/core/conditionvariable/wait_spec.rb
index 9a68c2b5a14ec0..fe73e513c07653 100644
--- a/spec/ruby/core/conditionvariable/wait_spec.rb
+++ b/spec/ruby/core/conditionvariable/wait_spec.rb
@@ -1,5 +1,4 @@
 require_relative '../../spec_helper'
-require 'thread'
 
 describe "ConditionVariable#wait" do
   it "calls #sleep on the given object" do
diff --git a/spec/ruby/core/data/constants_spec.rb b/spec/ruby/core/data/constants_spec.rb
index 2eb43d501e6d9b..ad0b1ddea7a1f0 100644
--- a/spec/ruby/core/data/constants_spec.rb
+++ b/spec/ruby/core/data/constants_spec.rb
@@ -1,21 +1,11 @@
 require_relative '../../spec_helper'
 
-ruby_version_is ''...'3.2' do
-  describe "Data" do
-    it "does not exist anymore" do
-      Object.should_not have_constant(:Data)
-    end
+describe "Data" do
+  it "is a new constant" do
+    Data.superclass.should == Object
   end
-end
-
-ruby_version_is '3.2' do
-  describe "Data" do
-    it "is a new constant" do
-      Data.superclass.should == Object
-    end
 
-    it "is not deprecated" do
-      -> { Data }.should_not complain
-    end
+  it "is not deprecated" do
+    -> { Data }.should_not complain
   end
 end
diff --git a/spec/ruby/core/data/deconstruct_keys_spec.rb b/spec/ruby/core/data/deconstruct_keys_spec.rb
new file mode 100644
index 00000000000000..df378f8b986d70
--- /dev/null
+++ b/spec/ruby/core/data/deconstruct_keys_spec.rb
@@ -0,0 +1,130 @@
+require_relative '../../spec_helper'
+require_relative 'fixtures/classes'
+
+describe "Data#deconstruct_keys" do
+  it "returns a hash of attributes" do
+    klass = Data.define(:x, :y)
+    d = klass.new(1, 2)
+
+    d.deconstruct_keys([:x, :y]).should == {x: 1, y: 2}
+  end
+
+  it "requires one argument" do
+    klass = Data.define(:x, :y)
+    d = klass.new(1, 2)
+
+    -> {
+      d.deconstruct_keys
+    }.should raise_error(ArgumentError, /wrong number of arguments \(given 0, expected 1\)/)
+  end
+
+  it "returns only specified keys" do
+    klass = Data.define(:x, :y)
+    d = klass.new(1, 2)
+
+    d.deconstruct_keys([:x, :y]).should == {x: 1, y: 2}
+    d.deconstruct_keys([:x]    ).should == {x: 1}
+    d.deconstruct_keys([]      ).should == {}
+  end
+
+  it "accepts string attribute names" do
+    klass = Data.define(:x, :y)
+    d = klass.new(1, 2)
+
+    d.deconstruct_keys(['x', 'y']).should == {'x' => 1, 'y' => 2}
+  end
+
+  it "accepts argument position number as well but returns them as keys" do
+    klass = Data.define(:x, :y)
+    d = klass.new(1, 2)
+
+    d.deconstruct_keys([0, 1]).should == {0 => 1, 1 => 2}
+    d.deconstruct_keys([0]   ).should == {0 => 1}
+    d.deconstruct_keys([-1]  ).should == {-1 => 2}
+  end
+
+  it "ignores incorrect position numbers" do
+    klass = Data.define(:x, :y)
+    d = klass.new(1, 2)
+
+    d.deconstruct_keys([0, 3]).should == {0 => 1}
+  end
+
+  it "support mixing attribute names and argument position numbers" do
+    klass = Data.define(:x, :y)
+    d = klass.new(1, 2)
+
+    d.deconstruct_keys([0, :x]).should == {0 => 1, :x => 1}
+  end
+
+  it "returns an empty hash when there are more keys than attributes" do
+    klass = Data.define(:x, :y)
+    d = klass.new(1, 2)
+
+    d.deconstruct_keys([:x, :y, :x]).should == {}
+  end
+
+  it "returns at first not existing attribute name" do
+    klass = Data.define(:x, :y)
+    d = klass.new(1, 2)
+
+    d.deconstruct_keys([:a, :x]).should == {}
+    d.deconstruct_keys([:x, :a]).should == {x: 1}
+  end
+
+  it "returns at first not existing argument position number" do
+    klass = Data.define(:x, :y)
+    d = klass.new(1, 2)
+
+    d.deconstruct_keys([3, 0]).should == {}
+    d.deconstruct_keys([0, 3]).should == {0 => 1}
+  end
+
+  it "accepts nil argument and return all the attributes" do
+    klass = Data.define(:x, :y)
+    d = klass.new(1, 2)
+
+    d.deconstruct_keys(nil).should == {x: 1, y: 2}
+  end
+
+  it "tries to convert a key with #to_int if index is not a String nor a Symbol, but responds to #to_int" do
+    klass = Data.define(:x, :y)
+    d = klass.new(1, 2)
+
+    key = mock("to_int")
+    key.should_receive(:to_int).and_return(1)
+
+    d.deconstruct_keys([key]).should == { key => 2 }
+  end
+
+  it "raises a TypeError if the conversion with #to_int does not return an Integer" do
+    klass = Data.define(:x, :y)
+    d = klass.new(1, 2)
+
+    key = mock("to_int")
+    key.should_receive(:to_int).and_return("not an Integer")
+
+    -> {
+      d.deconstruct_keys([key])
+    }.should raise_error(TypeError, /can't convert MockObject to Integer/)
+  end
+
+  it "raises TypeError if index is not a String, a Symbol and not convertible to Integer " do
+    klass = Data.define(:x, :y)
+    d = klass.new(1, 2)
+
+    -> {
+      d.deconstruct_keys([0, []])
+    }.should raise_error(TypeError, "no implicit conversion of Array into Integer")
+  end
+
+  it "raise TypeError if passed anything except nil or array" do
+    klass = Data.define(:x, :y)
+    d = klass.new(1, 2)
+
+    -> { d.deconstruct_keys('x') }.should raise_error(TypeError, /expected Array or nil/)
+    -> { d.deconstruct_keys(1)   }.should raise_error(TypeError, /expected Array or nil/)
+    -> { d.deconstruct_keys(:x)  }.should raise_error(TypeError, /expected Array or nil/)
+    -> { d.deconstruct_keys({})  }.should raise_error(TypeError, /expected Array or nil/)
+  end
+end
diff --git a/spec/ruby/core/data/deconstruct_spec.rb b/spec/ruby/core/data/deconstruct_spec.rb
new file mode 100644
index 00000000000000..4ca0b870396a5c
--- /dev/null
+++ b/spec/ruby/core/data/deconstruct_spec.rb
@@ -0,0 +1,8 @@
+require_relative '../../spec_helper'
+require_relative 'fixtures/classes'
+
+describe "Data#deconstruct" do
+  it "returns an array of attribute values" do
+    DataSpecs::Measure.new(42, "km").deconstruct.should == [42, "km"]
+  end
+end
diff --git a/spec/ruby/core/data/define_spec.rb b/spec/ruby/core/data/define_spec.rb
index 2aa2c50d4c68bc..c0b4671e395ba9 100644
--- a/spec/ruby/core/data/define_spec.rb
+++ b/spec/ruby/core/data/define_spec.rb
@@ -1,36 +1,34 @@
 require_relative '../../spec_helper'
 require_relative 'fixtures/classes'
 
-ruby_version_is "3.2" do
-  describe "Data.define" do
-    it "accepts no arguments" do
-      empty_data = Data.define
-      empty_data.members.should == []
-    end
+describe "Data.define" do
+  it "accepts no arguments" do
+    empty_data = Data.define
+    empty_data.members.should == []
+  end
 
-    it "accepts symbols" do
-      movie = Data.define(:title, :year)
-      movie.members.should == [:title, :year]
-    end
+  it "accepts symbols" do
+    movie = Data.define(:title, :year)
+    movie.members.should == [:title, :year]
+  end
 
-    it "accepts strings" do
-      movie = Data.define("title", "year")
-      movie.members.should == [:title, :year]
-    end
+  it "accepts strings" do
+    movie = Data.define("title", "year")
+    movie.members.should == [:title, :year]
+  end
 
-    it "accepts a mix of strings and symbols" do
-      movie = Data.define("title", :year, "genre")
-      movie.members.should == [:title, :year, :genre]
-    end
+  it "accepts a mix of strings and symbols" do
+    movie = Data.define("title", :year, "genre")
+    movie.members.should == [:title, :year, :genre]
+  end
 
-    it "accepts a block" do
-      movie = Data.define(:title, :year) do
-        def title_with_year
-          "#{title} (#{year})"
-        end
+  it "accepts a block" do
+    movie = Data.define(:title, :year) do
+      def title_with_year
+        "#{title} (#{year})"
       end
-      movie.members.should == [:title, :year]
-      movie.new("Matrix", 1999).title_with_year.should == "Matrix (1999)"
     end
+    movie.members.should == [:title, :year]
+    movie.new("Matrix", 1999).title_with_year.should == "Matrix (1999)"
   end
 end
diff --git a/spec/ruby/core/data/eql_spec.rb b/spec/ruby/core/data/eql_spec.rb
new file mode 100644
index 00000000000000..6958d5de4a9826
--- /dev/null
+++ b/spec/ruby/core/data/eql_spec.rb
@@ -0,0 +1,63 @@
+require_relative '../../spec_helper'
+require_relative 'fixtures/classes'
+
+describe "Data#eql?" do
+  it "returns true if the other is the same object" do
+    a = DataSpecs::Measure.new(42, "km")
+    a.should.eql?(a)
+  end
+
+  it "returns true if the other has all the same fields" do
+    a = DataSpecs::Measure.new(42, "km")
+    b = DataSpecs::Measure.new(42, "km")
+    a.should.eql?(b)
+  end
+
+  it "returns false if the other is a different object or has different fields" do
+    a = DataSpecs::Measure.new(42, "km")
+    b = DataSpecs::Measure.new(42, "mi")
+    a.should_not.eql?(b)
+  end
+
+  it "returns false if other is of a different class" do
+    a = DataSpecs::Measure.new(42, "km")
+    klass = Data.define(*DataSpecs::Measure.members)
+    b = klass.new(42, "km")
+    a.should_not.eql?(b)
+  end
+
+  it "returns false if any corresponding elements are not equal with #eql?" do
+    a = DataSpecs::Measure.new(42, "km")
+    b = DataSpecs::Measure.new(42.0, "mi")
+    a.should_not.eql?(b)
+  end
+
+  context "recursive structure" do
+    it "returns true the other is the same object" do
+      a = DataSpecs::Measure.allocate
+      a.send(:initialize, amount: 42, unit: a)
+
+      a.should.eql?(a)
+    end
+
+    it "returns true if the other has all the same fields" do
+      a = DataSpecs::Measure.allocate
+      a.send(:initialize, amount: 42, unit: a)
+
+      b = DataSpecs::Measure.allocate
+      b.send(:initialize, amount: 42, unit: b)
+
+      a.should.eql?(b)
+    end
+
+    it "returns false if any corresponding elements are not equal with #eql?" do
+      a = DataSpecs::Measure.allocate
+      a.send(:initialize, amount: a, unit: "km")
+
+      b = DataSpecs::Measure.allocate
+      b.send(:initialize, amount: b, unit: "mi")
+
+      a.should_not.eql?(b)
+    end
+  end
+end
diff --git a/spec/ruby/core/data/equal_value_spec.rb b/spec/ruby/core/data/equal_value_spec.rb
new file mode 100644
index 00000000000000..d9a0dcff3ecb8d
--- /dev/null
+++ b/spec/ruby/core/data/equal_value_spec.rb
@@ -0,0 +1,63 @@
+require_relative '../../spec_helper'
+require_relative 'fixtures/classes'
+
+describe "Data#==" do
+  it "returns true if the other is the same object" do
+    a = DataSpecs::Measure.new(42, "km")
+    a.should == a
+  end
+
+  it "returns true if the other has all the same fields" do
+    a = DataSpecs::Measure.new(42, "km")
+    b = DataSpecs::Measure.new(42, "km")
+    a.should == b
+  end
+
+  it "returns false if the other is a different object or has different fields" do
+    a = DataSpecs::Measure.new(42, "km")
+    b = DataSpecs::Measure.new(42, "mi")
+    a.should_not == b
+  end
+
+  it "returns false if other is of a different class" do
+    a = DataSpecs::Measure.new(42, "km")
+    klass = Data.define(*DataSpecs::Measure.members)
+    b = klass.new(42, "km")
+    a.should_not == b
+  end
+
+  it "returns false if any corresponding elements are not equal with #==" do
+    a = DataSpecs::Measure.new(42, "km")
+    b = DataSpecs::Measure.new(42.0, "mi")
+    a.should_not == b
+  end
+
+  context "recursive structure" do
+    it "returns true the other is the same object" do
+      a = DataSpecs::Measure.allocate
+      a.send(:initialize, amount: 42, unit: a)
+
+      a.should == a
+    end
+
+    it "returns true if the other has all the same fields" do
+      a = DataSpecs::Measure.allocate
+      a.send(:initialize, amount: 42, unit: a)
+
+      b = DataSpecs::Measure.allocate
+      b.send(:initialize, amount: 42, unit: b)
+
+      a.should == b
+    end
+
+    it "returns false if any corresponding elements are not equal with #==" do
+      a = DataSpecs::Measure.allocate
+      a.send(:initialize, amount: a, unit: "km")
+
+      b = DataSpecs::Measure.allocate
+      b.send(:initialize, amount: b, unit: "mi")
+
+      a.should_not == b
+    end
+  end
+end
diff --git a/spec/ruby/core/data/fixtures/classes.rb b/spec/ruby/core/data/fixtures/classes.rb
index 46a6b48bb21d75..ffd361d781d7a0 100644
--- a/spec/ruby/core/data/fixtures/classes.rb
+++ b/spec/ruby/core/data/fixtures/classes.rb
@@ -1,5 +1,28 @@
 module DataSpecs
-  guard -> { ruby_version_is "3.2" and Data.respond_to?(:define) } do
+  if Data.respond_to?(:define)
     Measure = Data.define(:amount, :unit)
+
+    class MeasureWithOverriddenName < Measure
+      def self.name
+        "A"
+      end
+    end
+
+    class DataSubclass < Data; end
+
+    MeasureSubclass = Class.new(Measure) do
+      def initialize(amount:, unit:)
+        super
+      end
+    end
+
+    Empty = Data.define()
+
+    DataWithOverriddenInitialize = Data.define(:amount, :unit) do
+      def initialize(*rest, **kw)
+        super
+        ScratchPad.record [:initialize, rest, kw]
+      end
+    end
   end
 end
diff --git a/spec/ruby/core/data/hash_spec.rb b/spec/ruby/core/data/hash_spec.rb
new file mode 100644
index 00000000000000..c23f08a71d61cc
--- /dev/null
+++ b/spec/ruby/core/data/hash_spec.rb
@@ -0,0 +1,25 @@
+require_relative '../../spec_helper'
+require_relative 'fixtures/classes'
+
+describe "Data#hash" do
+  it "returns the same integer for objects with the same content" do
+    a = DataSpecs::Measure.new(42, "km")
+    b = DataSpecs::Measure.new(42, "km")
+    a.hash.should == b.hash
+    a.hash.should be_an_instance_of(Integer)
+  end
+
+  it "returns different hashes for objects with different values" do
+    a = DataSpecs::Measure.new(42, "km")
+    b = DataSpecs::Measure.new(42, "ml")
+    a.hash.should_not == b.hash
+
+    a = DataSpecs::Measure.new(42, "km")
+    b = DataSpecs::Measure.new(13, "km")
+    a.hash.should_not == b.hash
+  end
+
+  it "returns different hashes for different classes" do
+    Data.define(:x).new(1).hash.should != Data.define(:x).new(1).hash
+  end
+end
diff --git a/spec/ruby/core/data/initialize_spec.rb b/spec/ruby/core/data/initialize_spec.rb
index 94470cd1080da9..9d272780a85b23 100644
--- a/spec/ruby/core/data/initialize_spec.rb
+++ b/spec/ruby/core/data/initialize_spec.rb
@@ -1,58 +1,114 @@
 require_relative '../../spec_helper'
 require_relative 'fixtures/classes'
 
-ruby_version_is "3.2" do
-  describe "Data#initialize" do
-    it "accepts positional arguments" do
-      data = DataSpecs::Measure.new(42, "km")
+describe "Data#initialize" do
+  it "accepts positional arguments" do
+    data = DataSpecs::Measure.new(42, "km")
 
-      data.amount.should == 42
-      data.unit.should == "km"
-    end
+    data.amount.should == 42
+    data.unit.should == "km"
+  end
 
-    it "accepts alternative positional arguments" do
-      data = DataSpecs::Measure[42, "km"]
+  it "accepts alternative positional arguments" do
+    data = DataSpecs::Measure[42, "km"]
 
-      data.amount.should == 42
-      data.unit.should == "km"
-    end
+    data.amount.should == 42
+    data.unit.should == "km"
+  end
+
+  it "accepts keyword arguments" do
+    data = DataSpecs::Measure.new(amount: 42, unit: "km")
+
+    data.amount.should == 42
+    data.unit.should == "km"
+  end
 
-    it "accepts keyword arguments" do
-      data = DataSpecs::Measure.new(amount: 42, unit: "km")
+  it "accepts alternative keyword arguments" do
+    data = DataSpecs::Measure[amount: 42, unit: "km"]
 
-      data.amount.should == 42
-      data.unit.should == "km"
+    data.amount.should == 42
+    data.unit.should == "km"
+  end
+
+  it "accepts String keyword arguments" do
+    data = DataSpecs::Measure.new("amount" => 42, "unit" => "km")
+
+    data.amount.should == 42
+    data.unit.should == "km"
+  end
+
+  it "raises ArgumentError if no arguments are given" do
+    -> {
+      DataSpecs::Measure.new
+    }.should raise_error(ArgumentError) { |e|
+      e.message.should.include?("missing keywords: :amount, :unit")
+    }
+  end
+
+  it "raises ArgumentError if at least one argument is missing" do
+    -> {
+      DataSpecs::Measure.new(unit: "km")
+    }.should raise_error(ArgumentError) { |e|
+      e.message.should.include?("missing keyword: :amount")
+    }
+  end
+
+  it "raises ArgumentError if unknown keyword is given" do
+    -> {
+      DataSpecs::Measure.new(amount: 42, unit: "km", system: "metric")
+    }.should raise_error(ArgumentError) { |e|
+      e.message.should.include?("unknown keyword: :system")
+    }
+  end
+
+  it "supports super from a subclass" do
+    ms = DataSpecs::MeasureSubclass.new(amount: 1, unit: "km")
+
+    ms.amount.should == 1
+    ms.unit.should == "km"
+  end
+
+  it "supports Data with no fields" do
+    -> { DataSpecs::Empty.new }.should_not raise_error
+  end
+
+  it "can be overridden" do
+    ScratchPad.record []
+
+    measure_class = Data.define(:amount, :unit) do
+      def initialize(*, **)
+        super
+        ScratchPad << :initialize
+      end
     end
 
-    it "accepts alternative keyword arguments" do
-      data = DataSpecs::Measure[amount: 42, unit: "km"]
+    measure_class.new(42, "m")
+    ScratchPad.recorded.should == [:initialize]
+  end
 
-      data.amount.should == 42
-      data.unit.should == "km"
+  context "when it is overridden" do
+    it "is called with keyword arguments when given positional arguments" do
+      ScratchPad.clear
+      DataSpecs::DataWithOverriddenInitialize.new(42, "m")
+      ScratchPad.recorded.should == [:initialize, [], {amount: 42, unit: "m"}]
     end
 
-    it "raises ArgumentError if no arguments are given" do
-      -> {
-        DataSpecs::Measure.new
-      }.should raise_error(ArgumentError) { |e|
-        e.message.should.include?("missing keywords: :amount, :unit")
-      }
+    it "is called with keyword arguments when given keyword arguments" do
+      ScratchPad.clear
+      DataSpecs::DataWithOverriddenInitialize.new(amount: 42, unit: "m")
+      ScratchPad.recorded.should == [:initialize, [], {amount: 42, unit: "m"}]
     end
 
-    it "raises ArgumentError if at least one argument is missing" do
-      -> {
-        DataSpecs::Measure.new(unit: "km")
-      }.should raise_error(ArgumentError) { |e|
-        e.message.should.include?("missing keyword: :amount")
-      }
+    it "is called with keyword arguments when given alternative positional arguments" do
+      ScratchPad.clear
+      DataSpecs::DataWithOverriddenInitialize[42, "m"]
+      ScratchPad.recorded.should == [:initialize, [], {amount: 42, unit: "m"}]
     end
 
-    it "raises ArgumentError if unknown keyword is given" do
-      -> {
-        DataSpecs::Measure.new(amount: 42, unit: "km", system: "metric")
-      }.should raise_error(ArgumentError) { |e|
-        e.message.should.include?("unknown keyword: :system")
-      }
+    it "is called with keyword arguments when given alternative keyword arguments" do
+      ScratchPad.clear
+      DataSpecs::DataWithOverriddenInitialize[amount: 42, unit: "m"]
+      ScratchPad.recorded.should == [:initialize, [], {amount: 42, unit: "m"}]
     end
   end
 end
diff --git a/spec/ruby/core/data/inspect_spec.rb b/spec/ruby/core/data/inspect_spec.rb
new file mode 100644
index 00000000000000..38642910a04563
--- /dev/null
+++ b/spec/ruby/core/data/inspect_spec.rb
@@ -0,0 +1,6 @@
+require_relative '../../spec_helper'
+require_relative 'shared/inspect'
+
+describe "Data#inspect" do
+  it_behaves_like :data_inspect, :inspect
+end
diff --git a/spec/ruby/core/data/members_spec.rb b/spec/ruby/core/data/members_spec.rb
new file mode 100644
index 00000000000000..457a90a0d650b7
--- /dev/null
+++ b/spec/ruby/core/data/members_spec.rb
@@ -0,0 +1,21 @@
+require_relative '../../spec_helper'
+require_relative 'fixtures/classes'
+
+describe "Data#members" do
+  it "returns an array of attribute names" do
+    measure = DataSpecs::Measure.new(amount: 42, unit: 'km')
+    measure.members.should == [:amount, :unit]
+  end
+end
+
+describe "DataClass#members" do
+  it "returns an array of attribute names" do
+    DataSpecs::Measure.members.should == [:amount, :unit]
+  end
+
+  context "class inheriting Data" do
+    it "isn't available in a subclass" do
+      DataSpecs::DataSubclass.should_not.respond_to?(:members)
+    end
+  end
+end
diff --git a/spec/ruby/core/data/shared/inspect.rb b/spec/ruby/core/data/shared/inspect.rb
new file mode 100644
index 00000000000000..6cd5664da7757e
--- /dev/null
+++ b/spec/ruby/core/data/shared/inspect.rb
@@ -0,0 +1,62 @@
+require_relative '../fixtures/classes'
+
+describe :data_inspect, shared: true do
+  it "returns a string representation showing members and values" do
+    a = DataSpecs::Measure.new(42, "km")
+    a.send(@method).should == '#<data DataSpecs::Measure amount=42, unit="km">'
+  end
+
+  it "returns a string representation without the class name for anonymous structs" do
+    Data.define(:a).new("").send(@method).should == '#<data a="">'
+  end
+
+  it "returns a string representation without the class name for structs nested in anonymous classes" do
+    c = Class.new
+    c.class_eval <<~DOC
+        Foo = Data.define(:a)
+      DOC
+
+    c::Foo.new("").send(@method).should == '#<data a="">'
+  end
+
+  it "returns a string representation without the class name for structs nested in anonymous modules" do
+    m = Module.new
+    m.class_eval <<~DOC
+        Foo = Data.define(:a)
+      DOC
+
+    m::Foo.new("").send(@method).should == '#<data a="">'
+  end
+
+  it "does not call #name method" do
+    struct = DataSpecs::MeasureWithOverriddenName.new(42, "km")
+    struct.send(@method).should == '#<data DataSpecs::MeasureWithOverriddenName amount=42, unit="km">'
+  end
+
+  it "does not call #name method when struct is anonymous" do
+    klass = Class.new(DataSpecs::Measure) do
+      def self.name
+        "A"
+      end
+    end
+    struct = klass.new(42, "km")
+    struct.send(@method).should == '#<data amount=42, unit="km">'
+  end
+
+  context "recursive structure" do
+    it "returns string representation with recursive attribute replaced with ..." do
+      a = DataSpecs::Measure.allocate
+      a.send(:initialize, amount: 42, unit: a)
+
+      a.send(@method).should == "#<data DataSpecs::Measure amount=42, unit=#<data DataSpecs::Measure:...>>"
+    end
+
+    it "returns string representation with recursive attribute replaced with ... when an anonymous class" do
+      klass = Class.new(DataSpecs::Measure)
+      a = klass.allocate
+      a.send(:initialize, amount: 42, unit: a)
+
+      a.send(@method).should =~ /#<data amount=42, unit=#<data #<Class:0x.+?>:\.\.\.>>/
+    end
+  end
+end
diff --git a/spec/ruby/core/data/to_h_spec.rb b/spec/ruby/core/data/to_h_spec.rb
new file mode 100644
index 00000000000000..64816b72510ae9
--- /dev/null
+++ b/spec/ruby/core/data/to_h_spec.rb
@@ -0,0 +1,63 @@
+require_relative '../../spec_helper'
+require_relative 'fixtures/classes'
+
+describe "Data#to_h" do
+  it "transforms the data object into a hash" do
+    data = DataSpecs::Measure.new(amount: 42, unit: 'km')
+    data.to_h.should == { amount: 42, unit: 'km' }
+  end
+
+  context "with block" do
+    it "transforms [key, value] pairs returned by the block into a hash" do
+      data = DataSpecs::Measure.new(amount: 42, unit: 'km')
+      data.to_h { |key, value| [value, key] }.should == { 42 => :amount, 'km' => :unit }
+    end
+
+    it "passes to a block each pair's key and value as separate arguments" do
+      ScratchPad.record []
+      data = DataSpecs::Measure.new(amount: 42, unit: 'km')
+      data.to_h { |k, v| ScratchPad << [k, v]; [k, v] }
+      ScratchPad.recorded.sort.should == [[:amount, 42], [:unit, 'km']]
+
+      ScratchPad.record []
+      data.to_h { |*args| ScratchPad << args; [args[0], args[1]] }
+      ScratchPad.recorded.sort.should == [[:amount, 42], [:unit, 'km']]
+    end
+
+    it "raises ArgumentError if block returns longer or shorter array" do
+      data = DataSpecs::Measure.new(amount: 42, unit: 'km')
+      -> do
+        data.to_h { |k, v| [k.to_s, v*v, 1] }
+      end.should raise_error(ArgumentError, /element has wrong array length/)
+
+      -> do
+        data.to_h { |k, v| [k] }
+      end.should raise_error(ArgumentError, /element has wrong array length/)
+    end
+
+    it "raises TypeError if block returns something other than Array" do
+      data = DataSpecs::Measure.new(amount: 42, unit: 'km')
+      -> do
+        data.to_h { |k, v| "not-array" }
+      end.should raise_error(TypeError, /wrong element type String/)
+    end
+
+    it "coerces returned pair to Array with #to_ary" do
+      x = mock('x')
+      x.stub!(:to_ary).and_return([:b, 'b'])
+      data = DataSpecs::Measure.new(amount: 42, unit: 'km')
+
+      data.to_h { |k| x }.should == { :b => 'b' }
+    end
+
+    it "does not coerce returned pair to Array with #to_a" do
+      x = mock('x')
+      x.stub!(:to_a).and_return([:b, 'b'])
+      data = DataSpecs::Measure.new(amount: 42, unit: 'km')
+
+      -> do
+        data.to_h { |k| x }
+      end.should raise_error(TypeError, /wrong element type MockObject/)
+    end
+  end
+end
diff --git a/spec/ruby/core/data/to_s_spec.rb b/spec/ruby/core/data/to_s_spec.rb
new file mode 100644
index 00000000000000..2b4a670e8e301b
--- /dev/null
+++ b/spec/ruby/core/data/to_s_spec.rb
@@ -0,0 +1,6 @@
+require_relative '../../spec_helper'
+require_relative 'shared/inspect'
+
+describe "Data#to_s" do
+  it_behaves_like :data_inspect, :to_s
+end
diff --git a/spec/ruby/core/data/with_spec.rb b/spec/ruby/core/data/with_spec.rb
new file mode 100644
index 00000000000000..fd0a99d1fadaab
--- /dev/null
+++ b/spec/ruby/core/data/with_spec.rb
@@ -0,0 +1,57 @@
+require_relative '../../spec_helper'
+require_relative 'fixtures/classes'
+
+describe "Data#with" do
+  it "returns self if given no arguments" do
+    data = DataSpecs::Measure.new(amount: 42, unit: "km")
+    data = data.with.should.equal?(data)
+  end
+
+  it "accepts keyword arguments" do
+    data = DataSpecs::Measure.new(amount: 42, unit: "km")
+    data = data.with(amount: 4, unit: "m")
+
+    data.amount.should == 4
+    data.unit.should == "m"
+  end
+
+  it "accepts String keyword arguments" do
+    data = DataSpecs::Measure.new(amount: 42, unit: "km")
+    data = data.with("amount" => 4, "unit" => "m")
+
+    data.amount.should == 4
+    data.unit.should == "m"
+  end
+
+  it "raises ArgumentError if no keyword arguments are given" do
+    data = DataSpecs::Measure.new(amount: 42, unit: "km")
+
+    -> {
+      data.with(4, "m")
+    }.should raise_error(ArgumentError, "wrong number of arguments (given 2, expected 0)")
+  end
+
+  it "does not depend on the Data.new method" do
+    subclass = Class.new(DataSpecs::Measure)
+    data = subclass.new(amount: 42, unit: "km")
+
+    def subclass.new(*)
+      raise "Data.new is called"
+    end
+
+    data_copy = data.with(unit: "m")
+    data_copy.amount.should == 42
+    data_copy.unit.should == "m"
+  end
+
+  ruby_version_is "3.3" do
+    it "calls #initialize" do
+      data = DataSpecs::DataWithOverriddenInitialize.new(42, "m")
+      ScratchPad.clear
+
+      data.with(amount: 0)
+
+      ScratchPad.recorded.should == [:initialize, [], {amount: 0, unit: "m"}]
+    end
+  end
+end
diff --git a/spec/ruby/core/dir/chdir_spec.rb b/spec/ruby/core/dir/chdir_spec.rb
index 729ac403e35baa..015386a9026cf3 100644
--- a/spec/ruby/core/dir/chdir_spec.rb
+++ b/spec/ruby/core/dir/chdir_spec.rb
@@ -19,14 +19,14 @@
   end
 
   it "defaults to $HOME with no arguments" do
-    if ENV['HOME']
-      Dir.chdir
-      current_dir = Dir.pwd
+    skip "$HOME not valid directory" unless ENV['HOME'] && File.directory?(ENV['HOME'])
 
-      Dir.chdir(ENV['HOME'])
-      home = Dir.pwd
-      current_dir.should == home
-    end
+    Dir.chdir
+    current_dir = Dir.pwd
+
+    Dir.chdir(ENV['HOME'])
+    home = Dir.pwd
+    current_dir.should == home
   end
 
   it "changes to the specified directory" do
@@ -70,6 +70,8 @@ def to_str;  DirSpecs.mock_dir; end
   end
 
   it "defaults to the home directory when given a block but no argument" do
+    skip "$HOME not valid directory" unless ENV['HOME'] && File.directory?(ENV['HOME'])
+
     # Windows will return a path with forward slashes for ENV["HOME"] so we have
     # to compare the route representations returned by Dir.chdir.
     current_dir = ""
@@ -93,10 +95,10 @@ def to_str;  DirSpecs.mock_dir; end
   end
 
   it "raises an Errno::ENOENT if the original directory no longer exists" do
-    dir1 = tmp('/testdir1')
-    dir2 = tmp('/testdir2')
-    File.should_not.exist?(dir1)
-    File.should_not.exist?(dir2)
+    dir1 = tmp('testdir1')
+    dir2 = tmp('testdir2')
+    Dir.should_not.exist?(dir1)
+    Dir.should_not.exist?(dir2)
     Dir.mkdir dir1
     Dir.mkdir dir2
     begin
@@ -106,8 +108,8 @@ def to_str;  DirSpecs.mock_dir; end
         end
       }.should raise_error(Errno::ENOENT)
     ensure
-      Dir.unlink dir1 if File.exist?(dir1)
-      Dir.unlink dir2 if File.exist?(dir2)
+      Dir.unlink dir1 if Dir.exist?(dir1)
+      Dir.unlink dir2 if Dir.exist?(dir2)
     end
   end
 
@@ -122,3 +124,97 @@ def to_str;  DirSpecs.mock_dir; end
     Dir.pwd.should == @original
   end
 end
+
+ruby_version_is '3.3' do
+  describe "Dir#chdir" do
+    before :all do
+      DirSpecs.create_mock_dirs
+    end
+
+    after :all do
+      DirSpecs.delete_mock_dirs
+    end
+
+    before :each do
+      @original = Dir.pwd
+    end
+
+    after :each do
+      Dir.chdir(@original)
+    end
+
+    it "changes the current working directory to self" do
+      dir = Dir.new(DirSpecs.mock_dir)
+      dir.chdir
+      Dir.pwd.should == DirSpecs.mock_dir
+    ensure
+      dir.close
+    end
+
+    it "changes the current working directory to self for duration of the block when a block is given" do
+      dir = Dir.new(DirSpecs.mock_dir)
+      pwd_in_block = nil
+
+      dir.chdir { pwd_in_block = Dir.pwd }
+
+      pwd_in_block.should == DirSpecs.mock_dir
+      Dir.pwd.should == @original
+    ensure
+      dir.close
+    end
+
+    it "returns 0 when successfully changing directory" do
+      dir = Dir.new(DirSpecs.mock_dir)
+      dir.chdir.should == 0
+    ensure
+      dir.close
+    end
+
+    it "returns the value of the block when a block is given" do
+      dir = Dir.new(DirSpecs.mock_dir)
+      dir.chdir { :block_value }.should == :block_value
+    ensure
+      dir.close
+    end
+
+    platform_is_not :windows do
+      it "does not raise an Errno::ENOENT if the original directory no longer exists" do
+        dir_name1 = tmp('testdir1')
+        dir_name2 = tmp('testdir2')
+        Dir.should_not.exist?(dir_name1)
+        Dir.should_not.exist?(dir_name2)
+        Dir.mkdir dir_name1
+        Dir.mkdir dir_name2
+
+        dir2 = Dir.new(dir_name2)
+
+        begin
+          Dir.chdir(dir_name1) do
+            dir2.chdir { Dir.unlink dir_name1 }
+          end
+          Dir.pwd.should == @original
+        ensure
+          Dir.unlink dir_name1 if Dir.exist?(dir_name1)
+          Dir.unlink dir_name2 if Dir.exist?(dir_name2)
+        end
+      ensure
+        dir2.close
+      end
+    end
+
+    it "always returns to the original directory when given a block" do
+      dir = Dir.new(DirSpecs.mock_dir)
+
+      begin
+        dir.chdir do
+          raise StandardError, "something bad happened"
+        end
+      rescue StandardError
+      end
+
+      Dir.pwd.should == @original
+    ensure
+      dir.close
+    end
+  end
+end
diff --git a/spec/ruby/core/dir/children_spec.rb b/spec/ruby/core/dir/children_spec.rb
index 03698cc246a81f..0ad3df4669e36d 100644
--- a/spec/ruby/core/dir/children_spec.rb
+++ b/spec/ruby/core/dir/children_spec.rb
@@ -47,7 +47,7 @@
     encoding = Encoding.find("filesystem")
     encoding = Encoding::BINARY if encoding == Encoding::US_ASCII
     platform_is_not :windows do
-      children.should include("こんにちは.txt".force_encoding(encoding))
+      children.should include("こんにちは.txt".dup.force_encoding(encoding))
     end
     children.first.encoding.should equal(Encoding.find("filesystem"))
   end
@@ -113,7 +113,7 @@
     encoding = Encoding.find("filesystem")
     encoding = Encoding::BINARY if encoding == Encoding::US_ASCII
     platform_is_not :windows do
-      children.should include("こんにちは.txt".force_encoding(encoding))
+      children.should include("こんにちは.txt".dup.force_encoding(encoding))
     end
     children.first.encoding.should equal(Encoding.find("filesystem"))
   end
@@ -131,4 +131,17 @@
     children = @dir.children.sort
     children.first.encoding.should equal(Encoding::EUC_KR)
   end
+
+  it "returns the same result when called repeatedly" do
+    @dir = Dir.open DirSpecs.mock_dir
+
+    a = []
+    @dir.each {|dir| a << dir}
+
+    b = []
+    @dir.each {|dir| b << dir}
+
+    a.sort.should == b.sort
+    a.sort.should == DirSpecs.expected_paths
+  end
 end
diff --git a/spec/ruby/core/dir/close_spec.rb b/spec/ruby/core/dir/close_spec.rb
index 5fad5eecfb9b65..f7cce318b8b17d 100644
--- a/spec/ruby/core/dir/close_spec.rb
+++ b/spec/ruby/core/dir/close_spec.rb
@@ -11,9 +11,43 @@
 
   it "does not raise an IOError even if the Dir instance is closed" do
     dir = Dir.open DirSpecs.mock_dir
-    dir.close
-    -> {
-      dir.close
-    }.should_not raise_error(IOError)
+    dir.close.should == nil
+    dir.close.should == nil
+
+    platform_is_not :windows do
+      -> { dir.fileno }.should raise_error(IOError, /closed directory/)
+    end
+  end
+
+  it "returns nil" do
+    dir = Dir.open DirSpecs.mock_dir
+    dir.close.should == nil
+  end
+
+  ruby_version_is '3.3'...'3.4' do
+    platform_is_not :windows do
+      it "does not raise an error even if the file descriptor is closed with another Dir instance" do
+        dir = Dir.open DirSpecs.mock_dir
+        dir_new = Dir.for_fd(dir.fileno)
+
+        dir.close
+        dir_new.close
+
+        -> { dir.fileno }.should raise_error(IOError, /closed directory/)
+        -> { dir_new.fileno }.should raise_error(IOError, /closed directory/)
+      end
+    end
+  end
+
+  ruby_version_is '3.4' do
+    platform_is_not :windows do
+      it "raises an error if the file descriptor is closed with another Dir instance" do
+        dir = Dir.open DirSpecs.mock_dir
+        dir_new = Dir.for_fd(dir.fileno)
+        dir.close
+
+        -> { dir_new.close }.should raise_error(Errno::EBADF, 'Bad file descriptor - closedir')
+      end
+    end
   end
 end
diff --git a/spec/ruby/core/dir/each_child_spec.rb b/spec/ruby/core/dir/each_child_spec.rb
index 520186e79ef310..7194273b9529c4 100644
--- a/spec/ruby/core/dir/each_child_spec.rb
+++ b/spec/ruby/core/dir/each_child_spec.rb
@@ -86,6 +86,19 @@
     @dir.each_child { |f| f }.should == @dir
   end
 
+  it "returns the same result when called repeatedly" do
+    @dir = Dir.open DirSpecs.mock_dir
+
+    a = []
+    @dir.each {|dir| a << dir}
+
+    b = []
+    @dir.each {|dir| b << dir}
+
+    a.sort.should == b.sort
+    a.sort.should == DirSpecs.expected_paths
+  end
+
   describe "when no block is given" do
     it "returns an Enumerator" do
       @dir = Dir.new(DirSpecs.mock_dir)
diff --git a/spec/ruby/core/dir/each_spec.rb b/spec/ruby/core/dir/each_spec.rb
index 8c69a7212be3c2..7674663d82b0e4 100644
--- a/spec/ruby/core/dir/each_spec.rb
+++ b/spec/ruby/core/dir/each_spec.rb
@@ -35,6 +35,17 @@
     ls.should include(@dir.read)
   end
 
+  it "returns the same result when called repeatedly" do
+    a = []
+    @dir.each {|dir| a << dir}
+
+    b = []
+    @dir.each {|dir| b << dir}
+
+    a.sort.should == b.sort
+    a.sort.should == DirSpecs.expected_paths
+  end
+
   describe "when no block is given" do
     it "returns an Enumerator" do
       @dir.each.should be_an_instance_of(Enumerator)
diff --git a/spec/ruby/core/dir/entries_spec.rb b/spec/ruby/core/dir/entries_spec.rb
index 91c30fccae0c14..7462542acf42e2 100644
--- a/spec/ruby/core/dir/entries_spec.rb
+++ b/spec/ruby/core/dir/entries_spec.rb
@@ -47,7 +47,7 @@
     encoding = Encoding.find("filesystem")
     encoding = Encoding::BINARY if encoding == Encoding::US_ASCII
     platform_is_not :windows do
-      entries.should include("こんにちは.txt".force_encoding(encoding))
+      entries.should include("こんにちは.txt".dup.force_encoding(encoding))
     end
     entries.first.encoding.should equal(Encoding.find("filesystem"))
   end
diff --git a/spec/ruby/core/dir/exist_spec.rb b/spec/ruby/core/dir/exist_spec.rb
index 9023de533fd3ff..0b8e521894d5e1 100644
--- a/spec/ruby/core/dir/exist_spec.rb
+++ b/spec/ruby/core/dir/exist_spec.rb
@@ -14,10 +14,8 @@
   it_behaves_like :dir_exist, :exist?
 end
 
-ruby_version_is "3.2" do
-  describe "Dir.exists?" do
-    it "has been removed" do
-      Dir.should_not.respond_to?(:exists?)
-    end
+describe "Dir.exists?" do
+  it "has been removed" do
+    Dir.should_not.respond_to?(:exists?)
   end
 end
diff --git a/spec/ruby/core/dir/fchdir_spec.rb b/spec/ruby/core/dir/fchdir_spec.rb
index 429e569691245b..52600a95f2b80c 100644
--- a/spec/ruby/core/dir/fchdir_spec.rb
+++ b/spec/ruby/core/dir/fchdir_spec.rb
@@ -2,7 +2,7 @@
 require_relative 'fixtures/common'
 
 ruby_version_is '3.3' do
-  guard -> { Dir.respond_to? :fchdir } do
+  platform_is_not :windows do
     describe "Dir.fchdir" do
       before :all do
         DirSpecs.create_mock_dirs
@@ -13,51 +13,56 @@
       end
 
       before :each do
-        @dirs = [Dir.new('.')]
-        @original = @dirs.first.fileno
+        @original = Dir.pwd
       end
 
       after :each do
-        Dir.fchdir(@original)
-        @dirs.each(&:close)
+        Dir.chdir(@original)
       end
 
-      it "changes to the specified directory" do
+      it "changes the current working directory to the directory specified by the integer file descriptor" do
         dir = Dir.new(DirSpecs.mock_dir)
-        @dirs << dir
         Dir.fchdir dir.fileno
         Dir.pwd.should == DirSpecs.mock_dir
+      ensure
+        dir.close
       end
 
       it "returns 0 when successfully changing directory" do
-        Dir.fchdir(@original).should == 0
+        dir = Dir.new(DirSpecs.mock_dir)
+        Dir.fchdir(dir.fileno).should == 0
+      ensure
+        dir.close
       end
 
       it "returns the value of the block when a block is given" do
-        Dir.fchdir(@original) { :block_value }.should == :block_value
+        dir = Dir.new(DirSpecs.mock_dir)
+        Dir.fchdir(dir.fileno) { :block_value }.should == :block_value
+      ensure
+        dir.close
       end
 
       it "changes to the specified directory for the duration of the block" do
-        pwd = Dir.pwd
         dir = Dir.new(DirSpecs.mock_dir)
-        @dirs << dir
         Dir.fchdir(dir.fileno) { Dir.pwd }.should == DirSpecs.mock_dir
-        Dir.pwd.should == pwd
+        Dir.pwd.should == @original
+      ensure
+        dir.close
       end
 
       it "raises a SystemCallError if the file descriptor given is not valid" do
-        -> { Dir.fchdir(-1) }.should raise_error(SystemCallError)
-        -> { Dir.fchdir(-1) { } }.should raise_error(SystemCallError)
+        -> { Dir.fchdir(-1) }.should raise_error(SystemCallError, "Bad file descriptor - fchdir")
+        -> { Dir.fchdir(-1) { } }.should raise_error(SystemCallError, "Bad file descriptor - fchdir")
       end
 
       it "raises a SystemCallError if the file descriptor given is not for a directory" do
-        -> { Dir.fchdir $stdout.fileno }.should raise_error(SystemCallError)
-        -> { Dir.fchdir($stdout.fileno) { } }.should raise_error(SystemCallError)
+        -> { Dir.fchdir $stdout.fileno }.should raise_error(SystemCallError, /(Not a directory|Invalid argument) - fchdir/)
+        -> { Dir.fchdir($stdout.fileno) { } }.should raise_error(SystemCallError, /(Not a directory|Invalid argument) - fchdir/)
       end
     end
   end
 
-  guard_not -> { Dir.respond_to? :fchdir } do
+  platform_is :windows do
     describe "Dir.fchdir" do
       it "raises NotImplementedError" do
         -> { Dir.fchdir 1 }.should raise_error(NotImplementedError)
diff --git a/spec/ruby/core/dir/fixtures/common.rb b/spec/ruby/core/dir/fixtures/common.rb
index 087f46b331e249..848656c9b9a184 100644
--- a/spec/ruby/core/dir/fixtures/common.rb
+++ b/spec/ruby/core/dir/fixtures/common.rb
@@ -192,13 +192,7 @@ def self.expected_paths
     ]
   end
 
-  if RUBY_VERSION > '3.1'
-    def self.expected_glob_paths
-      expected_paths - ['..']
-    end
-  else
-    def self.expected_glob_paths
-      expected_paths
-    end
+  def self.expected_glob_paths
+    expected_paths - ['..']
   end
 end
diff --git a/spec/ruby/core/dir/for_fd_spec.rb b/spec/ruby/core/dir/for_fd_spec.rb
new file mode 100644
index 00000000000000..ba467f2f86d928
--- /dev/null
+++ b/spec/ruby/core/dir/for_fd_spec.rb
@@ -0,0 +1,79 @@
+require_relative '../../spec_helper'
+require_relative 'fixtures/common'
+
+quarantine! do # leads to "Errno::EBADF: Bad file descriptor - closedir" in DirSpecs.delete_mock_dirs
+ruby_version_is '3.3' do
+  platform_is_not :windows do
+    describe "Dir.for_fd" do
+      before :all do
+        DirSpecs.create_mock_dirs
+      end
+
+      after :all do
+        DirSpecs.delete_mock_dirs
+      end
+
+      before :each do
+        @original = Dir.pwd
+      end
+
+      after :each do
+        Dir.chdir(@original)
+      end
+
+      it "returns a new Dir object representing the directory specified by the given integer directory file descriptor" do
+        dir = Dir.new(DirSpecs.mock_dir)
+        dir_new = Dir.for_fd(dir.fileno)
+
+        dir_new.should.instance_of?(Dir)
+        dir_new.children.should == dir.children
+        dir_new.fileno.should == dir.fileno
+      ensure
+        dir.close
+      end
+
+      it "returns a new Dir object without associated path" do
+        dir = Dir.new(DirSpecs.mock_dir)
+        dir_new = Dir.for_fd(dir.fileno)
+
+        dir_new.path.should == nil
+      ensure
+        dir.close
+      end
+
+      it "calls #to_int to convert a value to an Integer" do
+        dir = Dir.new(DirSpecs.mock_dir)
+        obj = mock("fd")
+        obj.should_receive(:to_int).and_return(dir.fileno)
+
+        dir_new = Dir.for_fd(obj)
+        dir_new.fileno.should == dir.fileno
+      ensure
+        dir.close
+      end
+
+      it "raises TypeError when value cannot be converted to Integer" do
+        -> {
+          Dir.for_fd(nil)
+        }.should raise_error(TypeError, "no implicit conversion from nil to integer")
+      end
+
+      it "raises a SystemCallError if the file descriptor given is not valid" do
+        -> { Dir.for_fd(-1) }.should raise_error(SystemCallError, "Bad file descriptor - fdopendir")
+      end
+
+      it "raises a SystemCallError if the file descriptor given is not for a directory" do
+        -> { Dir.for_fd $stdout.fileno }.should raise_error(SystemCallError, "Not a directory - fdopendir")
+      end
+    end
+  end
+
+  platform_is :windows do
+    describe "Dir.for_fd" do
+      it "raises NotImplementedError" do
+        -> { Dir.for_fd 1 }.should raise_error(NotImplementedError)
+      end
+    end
+  end
+end
+end
diff --git a/spec/ruby/core/dir/glob_spec.rb b/spec/ruby/core/dir/glob_spec.rb
index 61115b5eec20db..a60b233bc0f2d8 100644
--- a/spec/ruby/core/dir/glob_spec.rb
+++ b/spec/ruby/core/dir/glob_spec.rb
@@ -89,31 +89,15 @@
     Dir.glob('**/', File::FNM_DOTMATCH).sort.should == expected
   end
 
-  ruby_version_is ''...'3.1' do
-    it "recursively matches files and directories in nested dot subdirectory with 'nested/**/*' from the current directory and option File::FNM_DOTMATCH" do
-      expected = %w[
-        nested/.
-        nested/.dotsubir
-        nested/.dotsubir/.
-        nested/.dotsubir/.dotfile
-        nested/.dotsubir/nondotfile
-      ]
-
-      Dir.glob('nested/**/*', File::FNM_DOTMATCH).sort.should == expected.sort
-    end
-  end
-
-  ruby_version_is '3.1' do
-    it "recursively matches files and directories in nested dot subdirectory except . with 'nested/**/*' from the current directory and option File::FNM_DOTMATCH" do
-      expected = %w[
-       nested/.
-       nested/.dotsubir
-       nested/.dotsubir/.dotfile
-       nested/.dotsubir/nondotfile
-     ]
+  it "recursively matches files and directories in nested dot subdirectory except . with 'nested/**/*' from the current directory and option File::FNM_DOTMATCH" do
+    expected = %w[
+      nested/.
+      nested/.dotsubir
+      nested/.dotsubir/.dotfile
+      nested/.dotsubir/nondotfile
+    ]
 
-      Dir.glob('nested/**/*', File::FNM_DOTMATCH).sort.should == expected.sort
-    end
+    Dir.glob('nested/**/*', File::FNM_DOTMATCH).sort.should == expected.sort
   end
 
   # This is a separate case to check **/ coming after a constant
@@ -260,34 +244,31 @@
     Dir.glob('**/.*', base: "deeply/nested").sort.should == expected
   end
 
-  # < 3.1 include a "." entry for every dir: ["directory/.", "directory/structure/.", ...]
-  ruby_version_is '3.1' do
-    it "handles **/.* with base keyword argument and FNM_DOTMATCH" do
-      expected = %w[
-        .
-        .dotfile.ext
-        directory/structure/.ext
-      ].sort
+  it "handles **/.* with base keyword argument and FNM_DOTMATCH" do
+    expected = %w[
+      .
+      .dotfile.ext
+      directory/structure/.ext
+    ].sort
 
-      Dir.glob('**/.*', File::FNM_DOTMATCH, base: "deeply/nested").sort.should == expected
-    end
+    Dir.glob('**/.*', File::FNM_DOTMATCH, base: "deeply/nested").sort.should == expected
+  end
 
-    it "handles **/** with base keyword argument and FNM_DOTMATCH" do
-      expected = %w[
-        .
-        .dotfile.ext
-        directory
-        directory/structure
-        directory/structure/.ext
-        directory/structure/bar
-        directory/structure/baz
-        directory/structure/file_one
-        directory/structure/file_one.ext
-        directory/structure/foo
-      ].sort
-
-      Dir.glob('**/**', File::FNM_DOTMATCH, base: "deeply/nested").sort.should == expected
-    end
+  it "handles **/** with base keyword argument and FNM_DOTMATCH" do
+    expected = %w[
+      .
+      .dotfile.ext
+      directory
+      directory/structure
+      directory/structure/.ext
+      directory/structure/bar
+      directory/structure/baz
+      directory/structure/file_one
+      directory/structure/file_one.ext
+      directory/structure/foo
+    ].sort
+
+    Dir.glob('**/**', File::FNM_DOTMATCH, base: "deeply/nested").sort.should == expected
   end
 
   it "handles **/*pattern* with base keyword argument and FNM_DOTMATCH" do
diff --git a/spec/ruby/core/dir/home_spec.rb b/spec/ruby/core/dir/home_spec.rb
index 90a008faf12ae8..966ac38af3ec04 100644
--- a/spec/ruby/core/dir/home_spec.rb
+++ b/spec/ruby/core/dir/home_spec.rb
@@ -33,13 +33,11 @@
     end
 
     platform_is :windows do
-      ruby_version_is "3.2" do
-        it "returns the home directory with forward slashs and as UTF-8" do
-          ENV['HOME'] = "C:\\rubyspäc\\home"
-          home = Dir.home
-          home.should == "C:/rubyspäc/home"
-          home.encoding.should == Encoding::UTF_8
-        end
+      it "returns the home directory with forward slashs and as UTF-8" do
+        ENV['HOME'] = "C:\\rubyspäc\\home"
+        home = Dir.home
+        home.should == "C:/rubyspäc/home"
+        home.encoding.should == Encoding::UTF_8
       end
 
       it "retrieves the directory from HOME, USERPROFILE, HOMEDRIVE/HOMEPATH and the WinAPI in that order" do
@@ -50,8 +48,7 @@
         ENV['HOMEPATH'] = "\\rubyspec\\home1"
         Dir.home.should == "C:/rubyspec/home1"
         ENV['USERPROFILE'] = "C:\\rubyspec\\home2"
-        # https://bugs.ruby-lang.org/issues/19244
-        # Dir.home.should == "C:/rubyspec/home2"
+        Dir.home.should == "C:/rubyspec/home2"
         ENV['HOME'] = "C:\\rubyspec\\home3"
         Dir.home.should == "C:/rubyspec/home3"
       ensure
@@ -61,13 +58,7 @@
   end
 
   describe "when called with the current user name" do
-    platform_is :solaris do
-      it "returns the named user's home directory from the user database" do
-        Dir.home(ENV['USER']).should == `getent passwd #{ENV['USER']}|cut -d: -f6`.chomp
-      end
-    end
-
-    platform_is_not :windows, :solaris, :android, :wasi do
+    platform_is_not :windows, :android, :wasi do
       it "returns the named user's home directory, from the user database" do
         Dir.home(ENV['USER']).should == `echo ~#{ENV['USER']}`.chomp
       end
diff --git a/spec/ruby/core/dir/shared/delete.rb b/spec/ruby/core/dir/shared/delete.rb
index 49e88360e84a8f..a81b0597593ddd 100644
--- a/spec/ruby/core/dir/shared/delete.rb
+++ b/spec/ruby/core/dir/shared/delete.rb
@@ -17,20 +17,10 @@
     Dir.send(@method, p)
   end
 
-  platform_is_not :solaris do
-    it "raises an Errno::ENOTEMPTY when trying to remove a nonempty directory" do
-      -> do
-        Dir.send @method, DirSpecs.mock_rmdir("nonempty")
-      end.should raise_error(Errno::ENOTEMPTY)
-    end
-  end
-
-  platform_is :solaris do
-    it "raises an Errno::EEXIST when trying to remove a nonempty directory" do
-      -> do
-        Dir.send @method, DirSpecs.mock_rmdir("nonempty")
-      end.should raise_error(Errno::EEXIST)
-    end
+  it "raises an Errno::ENOTEMPTY when trying to remove a nonempty directory" do
+    -> do
+      Dir.send @method, DirSpecs.mock_rmdir("nonempty")
+    end.should raise_error(Errno::ENOTEMPTY)
   end
 
   it "raises an Errno::ENOENT when trying to remove a non-existing directory" do
diff --git a/spec/ruby/core/dir/shared/exist.rb b/spec/ruby/core/dir/shared/exist.rb
index 2ea4f88a80f1c2..3097f57715118c 100644
--- a/spec/ruby/core/dir/shared/exist.rb
+++ b/spec/ruby/core/dir/shared/exist.rb
@@ -34,6 +34,7 @@
   end
 
   it "doesn't expand paths" do
+    skip "$HOME not valid directory" unless ENV['HOME'] && File.directory?(ENV['HOME'])
     Dir.send(@method, File.expand_path('~')).should be_true
     Dir.send(@method, '~').should be_false
   end
diff --git a/spec/ruby/core/dir/shared/glob.rb b/spec/ruby/core/dir/shared/glob.rb
index 27ae0e300057b3..b1fc924f0838ad 100644
--- a/spec/ruby/core/dir/shared/glob.rb
+++ b/spec/ruby/core/dir/shared/glob.rb
@@ -12,7 +12,7 @@
   end
 
   it "raises an Encoding::CompatibilityError if the argument encoding is not compatible with US-ASCII" do
-    pattern = "file*".force_encoding Encoding::UTF_16BE
+    pattern = "files*".dup.force_encoding Encoding::UTF_16BE
     -> { Dir.send(@method, pattern) }.should raise_error(Encoding::CompatibilityError)
   end
 
@@ -42,25 +42,10 @@
     result.sort.should == Dir.send(@method, '*').sort
   end
 
-  ruby_version_is ""..."3.1" do
-    it "result is sorted with any non false value of sort:" do
-      result = Dir.send(@method, '*', sort: 0)
-      result.should == result.sort
-
-      result = Dir.send(@method, '*', sort: nil)
-      result.should == result.sort
-
-      result = Dir.send(@method, '*', sort: 'false')
-      result.should == result.sort
-    end
-  end
-
-  ruby_version_is "3.1" do
-    it "raises an ArgumentError if sort: is not true or false" do
-      -> { Dir.send(@method, '*', sort: 0) }.should raise_error ArgumentError, /expected true or false/
-      -> { Dir.send(@method, '*', sort: nil) }.should raise_error ArgumentError, /expected true or false/
-      -> { Dir.send(@method, '*', sort: 'false') }.should raise_error ArgumentError, /expected true or false/
-    end
+  it "raises an ArgumentError if sort: is not true or false" do
+    -> { Dir.send(@method, '*', sort: 0) }.should raise_error ArgumentError, /expected true or false/
+    -> { Dir.send(@method, '*', sort: nil) }.should raise_error ArgumentError, /expected true or false/
+    -> { Dir.send(@method, '*', sort: 'false') }.should raise_error ArgumentError, /expected true or false/
   end
 
   it "matches non-dotfiles with '*'" do
@@ -151,16 +136,8 @@
     Dir.send(@method, 'special/test\{1\}/*').should == ['special/test{1}/file[1]']
   end
 
-  ruby_version_is ''...'3.1' do
-    it "matches dotfiles with '.*'" do
-      Dir.send(@method, '.*').sort.should == %w|. .. .dotfile .dotsubdir|.sort
-    end
-  end
-
-  ruby_version_is '3.1' do
-    it "matches dotfiles except .. with '.*'" do
-      Dir.send(@method, '.*').sort.should == %w|. .dotfile .dotsubdir|.sort
-    end
+  it "matches dotfiles except .. with '.*'" do
+    Dir.send(@method, '.*').sort.should == %w|. .dotfile .dotsubdir|.sort
   end
 
   it "matches non-dotfiles with '*<non-special characters>'" do
@@ -205,16 +182,8 @@
     Dir.send(@method, '**').sort.should == expected
   end
 
-  ruby_version_is ''...'3.1' do
-    it "matches dotfiles in the current directory with '.**'" do
-      Dir.send(@method, '.**').sort.should == %w|. .. .dotsubdir .dotfile|.sort
-    end
-  end
-
-  ruby_version_is '3.1' do
-    it "matches dotfiles in the current directory except .. with '.**'" do
-      Dir.send(@method, '.**').sort.should == %w|. .dotsubdir .dotfile|.sort
-    end
+  it "matches dotfiles in the current directory except .. with '.**'" do
+    Dir.send(@method, '.**').sort.should == %w|. .dotsubdir .dotfile|.sort
   end
 
   it "recursively matches any nondot subdirectories with '**/'" do
@@ -245,19 +214,9 @@
     Dir.send(@method, '**/*ory', base: 'deeply').sort.should == expected
   end
 
-  ruby_version_is ''...'3.1' do
-    it "recursively matches any subdirectories including ./ and ../ with '.**/'" do
-      Dir.chdir("#{DirSpecs.mock_dir}/subdir_one") do
-        Dir.send(@method, '.**/').sort.should == %w|./ ../|.sort
-      end
-    end
-  end
-
-  ruby_version_is '3.1' do
-    it "recursively matches any subdirectories including ./ with '.**/'" do
-      Dir.chdir("#{DirSpecs.mock_dir}/subdir_one") do
-        Dir.send(@method, '.**/').should == ['./']
-      end
+  it "recursively matches any subdirectories including ./ with '.**/'" do
+    Dir.chdir("#{DirSpecs.mock_dir}/subdir_one") do
+      Dir.send(@method, '.**/').should == ['./']
     end
   end
 
diff --git a/spec/ruby/core/encoding/compatible_spec.rb b/spec/ruby/core/encoding/compatible_spec.rb
index 80ecab6155844a..31376a3b758984 100644
--- a/spec/ruby/core/encoding/compatible_spec.rb
+++ b/spec/ruby/core/encoding/compatible_spec.rb
@@ -1,4 +1,4 @@
-# -*- encoding: binary -*-
+# encoding: binary
 
 require_relative '../../spec_helper'
 
@@ -7,7 +7,7 @@
 describe "Encoding.compatible? String, String" do
   describe "when the first's Encoding is valid US-ASCII" do
     before :each do
-      @str = "abc".force_encoding Encoding::US_ASCII
+      @str = "abc".dup.force_encoding Encoding::US_ASCII
     end
 
     it "returns US-ASCII when the second's is US-ASCII" do
@@ -33,28 +33,28 @@
 
   describe "when the first's Encoding is ASCII compatible and ASCII only" do
     it "returns the first's Encoding if the second is ASCII compatible and ASCII only" do
-      [ [Encoding, "abc".force_encoding("UTF-8"), "123".force_encoding("Shift_JIS"), Encoding::UTF_8],
-        [Encoding, "123".force_encoding("Shift_JIS"), "abc".force_encoding("UTF-8"), Encoding::Shift_JIS]
+      [ [Encoding, "abc".dup.force_encoding("UTF-8"), "123".dup.force_encoding("Shift_JIS"), Encoding::UTF_8],
+        [Encoding, "123".dup.force_encoding("Shift_JIS"), "abc".dup.force_encoding("UTF-8"), Encoding::Shift_JIS]
       ].should be_computed_by(:compatible?)
     end
 
     it "returns the first's Encoding if the second is ASCII compatible and ASCII only" do
-      [ [Encoding, "abc".force_encoding("BINARY"), "123".force_encoding("US-ASCII"), Encoding::BINARY],
-        [Encoding, "123".force_encoding("US-ASCII"), "abc".force_encoding("BINARY"), Encoding::US_ASCII]
+      [ [Encoding, "abc".dup.force_encoding("BINARY"), "123".dup.force_encoding("US-ASCII"), Encoding::BINARY],
+        [Encoding, "123".dup.force_encoding("US-ASCII"), "abc".dup.force_encoding("BINARY"), Encoding::US_ASCII]
       ].should be_computed_by(:compatible?)
     end
 
     it "returns the second's Encoding if the second is ASCII compatible but not ASCII only" do
-      [ [Encoding, "abc".force_encoding("UTF-8"), "\xff".force_encoding("Shift_JIS"), Encoding::Shift_JIS],
-        [Encoding, "123".force_encoding("Shift_JIS"), "\xff".force_encoding("UTF-8"), Encoding::UTF_8],
-        [Encoding, "abc".force_encoding("BINARY"), "\xff".force_encoding("US-ASCII"), Encoding::US_ASCII],
-        [Encoding, "123".force_encoding("US-ASCII"), "\xff".force_encoding("BINARY"), Encoding::BINARY],
+      [ [Encoding, "abc".dup.force_encoding("UTF-8"), "\xff".dup.force_encoding("Shift_JIS"), Encoding::Shift_JIS],
+        [Encoding, "123".dup.force_encoding("Shift_JIS"), "\xff".dup.force_encoding("UTF-8"), Encoding::UTF_8],
+        [Encoding, "abc".dup.force_encoding("BINARY"), "\xff".dup.force_encoding("US-ASCII"), Encoding::US_ASCII],
+        [Encoding, "123".dup.force_encoding("US-ASCII"), "\xff".dup.force_encoding("BINARY"), Encoding::BINARY],
       ].should be_computed_by(:compatible?)
     end
 
     it "returns nil if the second's Encoding is not ASCII compatible" do
-      a = "abc".force_encoding("UTF-8")
-      b = "1234".force_encoding("UTF-16LE")
+      a = "abc".dup.force_encoding("UTF-8")
+      b = "1234".dup.force_encoding("UTF-16LE")
       Encoding.compatible?(a, b).should be_nil
     end
   end
@@ -75,7 +75,7 @@
 
   describe "when the first's Encoding is not ASCII compatible" do
     before :each do
-      @str = "abc".force_encoding Encoding::UTF_7
+      @str = "abc".dup.force_encoding Encoding::UTF_7
     end
 
     it "returns nil when the second String is US-ASCII" do
@@ -91,14 +91,14 @@
     end
 
     it "returns the Encoding when the second's Encoding is not ASCII compatible but the same as the first's Encoding" do
-      encoding = Encoding.compatible?(@str, "def".force_encoding("utf-7"))
+      encoding = Encoding.compatible?(@str, "def".dup.force_encoding("utf-7"))
       encoding.should == Encoding::UTF_7
     end
   end
 
   describe "when the first's Encoding is invalid" do
     before :each do
-      @str = "\xff".force_encoding Encoding::UTF_8
+      @str = "\xff".dup.force_encoding Encoding::UTF_8
     end
 
     it "returns the first's Encoding when the second's Encoding is US-ASCII" do
@@ -114,11 +114,11 @@
     end
 
     it "returns nil when the second's Encoding is invalid and ASCII only" do
-      Encoding.compatible?(@str, "\x7f".force_encoding("utf-16be")).should be_nil
+      Encoding.compatible?(@str, "\x7f\x7f".dup.force_encoding("utf-16be")).should be_nil
     end
 
     it "returns nil when the second's Encoding is invalid and not ASCII only" do
-      Encoding.compatible?(@str, "\xff".force_encoding("utf-16be")).should be_nil
+      Encoding.compatible?(@str, "\xff\xff".dup.force_encoding("utf-16be")).should be_nil
     end
 
     it "returns the Encoding when the second's Encoding is invalid but the same as the first" do
@@ -129,7 +129,7 @@
   describe "when the first String is empty and the second is not" do
     describe "and the first's Encoding is ASCII compatible" do
       before :each do
-        @str = "".force_encoding("utf-8")
+        @str = "".dup.force_encoding("utf-8")
       end
 
       it "returns the first's encoding when the second String is ASCII only" do
@@ -143,7 +143,7 @@
 
     describe "when the first's Encoding is not ASCII compatible" do
       before :each do
-        @str = "".force_encoding Encoding::UTF_7
+        @str = "".dup.force_encoding Encoding::UTF_7
       end
 
       it "returns the second string's encoding" do
@@ -154,18 +154,391 @@
 
   describe "when the second String is empty" do
     before :each do
-      @str = "abc".force_encoding("utf-7")
+      @str = "abc".dup.force_encoding("utf-7")
     end
 
     it "returns the first Encoding" do
       Encoding.compatible?(@str, "").should == Encoding::UTF_7
     end
   end
+
+  # Encoding negotiation depends on whether encodings are ASCII-compatible, empty
+  # and contain only ASCII characters (that take 7 bits). Check US-ASCII, UTF-8 and
+  # BINARY encodings (as most common) as well as an ASCII-compatible, a non-ASCII-compatible and a dummy
+  # encodings in all possible combinations.
+  describe "compatibility matrix" do
+
+#     Use the following script to regenerate the matrix:
+#
+#     ```
+#       # encoding: binary
+#
+#       ENCODINGS = [
+#         "US-ASCII",
+#         "UTF-8",
+#         "ASCII-8BIT",
+#         "ISO-8859-1",  # ASCII-compatible
+#         "UTF-16BE",    # non-ASCII-compatible
+#         "ISO-2022-JP"  # dummy
+#       ]
+#
+#       TYPES = [:empty, :"7bits", :non7bits]
+#
+#       VALUES = {
+#         empty: "",
+#         :"7bits" => "\x01\x01",
+#         non7bits: "\x01\x81"
+#       }
+#
+#       ENCODINGS.product(TYPES, ENCODINGS, TYPES).each do |encoding1, type1, encoding2, type2|
+#         value1 = VALUES[type1].dup.force_encoding(encoding1)
+#         value2 = VALUES[type2].dup.force_encoding(encoding2)
+#
+#         result_encoding = Encoding.compatible?(value1, value2)
+#
+#         puts "[#{encoding1.inspect}, #{value1.inspect}, #{encoding2.inspect}, #{value2.inspect}, #{result_encoding&.name.inspect}],"
+#       end
+#     ```
+
+    matrix = [
+      ["US-ASCII", "", "US-ASCII", "", "US-ASCII"],
+      ["US-ASCII", "", "US-ASCII", "\x01\x01", "US-ASCII"],
+      ["US-ASCII", "", "US-ASCII", "\x01\x81", "US-ASCII"],
+      ["US-ASCII", "", "UTF-8", "", "US-ASCII"],
+      ["US-ASCII", "", "UTF-8", "\u0001\u0001", "US-ASCII"],
+      ["US-ASCII", "", "UTF-8", "\u0001\x81", "UTF-8"],
+      ["US-ASCII", "", "ASCII-8BIT", "", "US-ASCII"],
+      ["US-ASCII", "", "ASCII-8BIT", "\x01\x01", "US-ASCII"],
+      ["US-ASCII", "", "ASCII-8BIT", "\x01\x81", "ASCII-8BIT"],
+      ["US-ASCII", "", "ISO-8859-1", "", "US-ASCII"],
+      ["US-ASCII", "", "ISO-8859-1", "\x01\x01", "US-ASCII"],
+      ["US-ASCII", "", "ISO-8859-1", "\x01\x81", "ISO-8859-1"],
+      ["US-ASCII", "", "UTF-16BE", "", "US-ASCII"],
+      ["US-ASCII", "", "UTF-16BE", "\u0101", "UTF-16BE"],
+      ["US-ASCII", "", "UTF-16BE", "\u0181", "UTF-16BE"],
+      ["US-ASCII", "", "ISO-2022-JP", "", "US-ASCII"],
+      ["US-ASCII", "", "ISO-2022-JP", "\x01\x01", "ISO-2022-JP"],
+      ["US-ASCII", "", "ISO-2022-JP", "\x01\x81", "ISO-2022-JP"],
+      ["US-ASCII", "\x01\x01", "US-ASCII", "", "US-ASCII"],
+      ["US-ASCII", "\x01\x01", "US-ASCII", "\x01\x01", "US-ASCII"],
+      ["US-ASCII", "\x01\x01", "US-ASCII", "\x01\x81", "US-ASCII"],
+      ["US-ASCII", "\x01\x01", "UTF-8", "", "US-ASCII"],
+      ["US-ASCII", "\x01\x01", "UTF-8", "\u0001\u0001", "US-ASCII"],
+      ["US-ASCII", "\x01\x01", "UTF-8", "\u0001\x81", "UTF-8"],
+      ["US-ASCII", "\x01\x01", "ASCII-8BIT", "", "US-ASCII"],
+      ["US-ASCII", "\x01\x01", "ASCII-8BIT", "\x01\x01", "US-ASCII"],
+      ["US-ASCII", "\x01\x01", "ASCII-8BIT", "\x01\x81", "ASCII-8BIT"],
+      ["US-ASCII", "\x01\x01", "ISO-8859-1", "", "US-ASCII"],
+      ["US-ASCII", "\x01\x01", "ISO-8859-1", "\x01\x01", "US-ASCII"],
+      ["US-ASCII", "\x01\x01", "ISO-8859-1", "\x01\x81", "ISO-8859-1"],
+      ["US-ASCII", "\x01\x01", "UTF-16BE", "", "US-ASCII"],
+      ["US-ASCII", "\x01\x01", "UTF-16BE", "\u0101", nil],
+      ["US-ASCII", "\x01\x01", "UTF-16BE", "\u0181", nil],
+      ["US-ASCII", "\x01\x01", "ISO-2022-JP", "", "US-ASCII"],
+      ["US-ASCII", "\x01\x01", "ISO-2022-JP", "\x01\x01", nil],
+      ["US-ASCII", "\x01\x01", "ISO-2022-JP", "\x01\x81", nil],
+      ["US-ASCII", "\x01\x81", "US-ASCII", "", "US-ASCII"],
+      ["US-ASCII", "\x01\x81", "US-ASCII", "\x01\x01", "US-ASCII"],
+      ["US-ASCII", "\x01\x81", "US-ASCII", "\x01\x81", "US-ASCII"],
+      ["US-ASCII", "\x01\x81", "UTF-8", "", "US-ASCII"],
+      ["US-ASCII", "\x01\x81", "UTF-8", "\u0001\u0001", "US-ASCII"],
+      ["US-ASCII", "\x01\x81", "UTF-8", "\u0001\x81", nil],
+      ["US-ASCII", "\x01\x81", "ASCII-8BIT", "", "US-ASCII"],
+      ["US-ASCII", "\x01\x81", "ASCII-8BIT", "\x01\x01", "US-ASCII"],
+      ["US-ASCII", "\x01\x81", "ASCII-8BIT", "\x01\x81", nil],
+      ["US-ASCII", "\x01\x81", "ISO-8859-1", "", "US-ASCII"],
+      ["US-ASCII", "\x01\x81", "ISO-8859-1", "\x01\x01", "US-ASCII"],
+      ["US-ASCII", "\x01\x81", "ISO-8859-1", "\x01\x81", nil],
+      ["US-ASCII", "\x01\x81", "UTF-16BE", "", "US-ASCII"],
+      ["US-ASCII", "\x01\x81", "UTF-16BE", "\u0101", nil],
+      ["US-ASCII", "\x01\x81", "UTF-16BE", "\u0181", nil],
+      ["US-ASCII", "\x01\x81", "ISO-2022-JP", "", "US-ASCII"],
+      ["US-ASCII", "\x01\x81", "ISO-2022-JP", "\x01\x01", nil],
+      ["US-ASCII", "\x01\x81", "ISO-2022-JP", "\x01\x81", nil],
+      ["UTF-8", "", "US-ASCII", "", "UTF-8"],
+      ["UTF-8", "", "US-ASCII", "\x01\x01", "UTF-8"],
+      ["UTF-8", "", "US-ASCII", "\x01\x81", "US-ASCII"],
+      ["UTF-8", "", "UTF-8", "", "UTF-8"],
+      ["UTF-8", "", "UTF-8", "\u0001\u0001", "UTF-8"],
+      ["UTF-8", "", "UTF-8", "\u0001\x81", "UTF-8"],
+      ["UTF-8", "", "ASCII-8BIT", "", "UTF-8"],
+      ["UTF-8", "", "ASCII-8BIT", "\x01\x01", "UTF-8"],
+      ["UTF-8", "", "ASCII-8BIT", "\x01\x81", "ASCII-8BIT"],
+      ["UTF-8", "", "ISO-8859-1", "", "UTF-8"],
+      ["UTF-8", "", "ISO-8859-1", "\x01\x01", "UTF-8"],
+      ["UTF-8", "", "ISO-8859-1", "\x01\x81", "ISO-8859-1"],
+      ["UTF-8", "", "UTF-16BE", "", "UTF-8"],
+      ["UTF-8", "", "UTF-16BE", "\u0101", "UTF-16BE"],
+      ["UTF-8", "", "UTF-16BE", "\u0181", "UTF-16BE"],
+      ["UTF-8", "", "ISO-2022-JP", "", "UTF-8"],
+      ["UTF-8", "", "ISO-2022-JP", "\x01\x01", "ISO-2022-JP"],
+      ["UTF-8", "", "ISO-2022-JP", "\x01\x81", "ISO-2022-JP"],
+      ["UTF-8", "\u0001\u0001", "US-ASCII", "", "UTF-8"],
+      ["UTF-8", "\u0001\u0001", "US-ASCII", "\x01\x01", "UTF-8"],
+      ["UTF-8", "\u0001\u0001", "US-ASCII", "\x01\x81", "US-ASCII"],
+      ["UTF-8", "\u0001\u0001", "UTF-8", "", "UTF-8"],
+      ["UTF-8", "\u0001\u0001", "UTF-8", "\u0001\u0001", "UTF-8"],
+      ["UTF-8", "\u0001\u0001", "UTF-8", "\u0001\x81", "UTF-8"],
+      ["UTF-8", "\u0001\u0001", "ASCII-8BIT", "", "UTF-8"],
+      ["UTF-8", "\u0001\u0001", "ASCII-8BIT", "\x01\x01", "UTF-8"],
+      ["UTF-8", "\u0001\u0001", "ASCII-8BIT", "\x01\x81", "ASCII-8BIT"],
+      ["UTF-8", "\u0001\u0001", "ISO-8859-1", "", "UTF-8"],
+      ["UTF-8", "\u0001\u0001", "ISO-8859-1", "\x01\x01", "UTF-8"],
+      ["UTF-8", "\u0001\u0001", "ISO-8859-1", "\x01\x81", "ISO-8859-1"],
+      ["UTF-8", "\u0001\u0001", "UTF-16BE", "", "UTF-8"],
+      ["UTF-8", "\u0001\u0001", "UTF-16BE", "\u0101", nil],
+      ["UTF-8", "\u0001\u0001", "UTF-16BE", "\u0181", nil],
+      ["UTF-8", "\u0001\u0001", "ISO-2022-JP", "", "UTF-8"],
+      ["UTF-8", "\u0001\u0001", "ISO-2022-JP", "\x01\x01", nil],
+      ["UTF-8", "\u0001\u0001", "ISO-2022-JP", "\x01\x81", nil],
+      ["UTF-8", "\u0001\x81", "US-ASCII", "", "UTF-8"],
+      ["UTF-8", "\u0001\x81", "US-ASCII", "\x01\x01", "UTF-8"],
+      ["UTF-8", "\u0001\x81", "US-ASCII", "\x01\x81", nil],
+      ["UTF-8", "\u0001\x81", "UTF-8", "", "UTF-8"],
+      ["UTF-8", "\u0001\x81", "UTF-8", "\u0001\u0001", "UTF-8"],
+      ["UTF-8", "\u0001\x81", "UTF-8", "\u0001\x81", "UTF-8"],
+      ["UTF-8", "\u0001\x81", "ASCII-8BIT", "", "UTF-8"],
+      ["UTF-8", "\u0001\x81", "ASCII-8BIT", "\x01\x01", "UTF-8"],
+      ["UTF-8", "\u0001\x81", "ASCII-8BIT", "\x01\x81", nil],
+      ["UTF-8", "\u0001\x81", "ISO-8859-1", "", "UTF-8"],
+      ["UTF-8", "\u0001\x81", "ISO-8859-1", "\x01\x01", "UTF-8"],
+      ["UTF-8", "\u0001\x81", "ISO-8859-1", "\x01\x81", nil],
+      ["UTF-8", "\u0001\x81", "UTF-16BE", "", "UTF-8"],
+      ["UTF-8", "\u0001\x81", "UTF-16BE", "\u0101", nil],
+      ["UTF-8", "\u0001\x81", "UTF-16BE", "\u0181", nil],
+      ["UTF-8", "\u0001\x81", "ISO-2022-JP", "", "UTF-8"],
+      ["UTF-8", "\u0001\x81", "ISO-2022-JP", "\x01\x01", nil],
+      ["UTF-8", "\u0001\x81", "ISO-2022-JP", "\x01\x81", nil],
+      ["ASCII-8BIT", "", "US-ASCII", "", "ASCII-8BIT"],
+      ["ASCII-8BIT", "", "US-ASCII", "\x01\x01", "ASCII-8BIT"],
+      ["ASCII-8BIT", "", "US-ASCII", "\x01\x81", "US-ASCII"],
+      ["ASCII-8BIT", "", "UTF-8", "", "ASCII-8BIT"],
+      ["ASCII-8BIT", "", "UTF-8", "\u0001\u0001", "ASCII-8BIT"],
+      ["ASCII-8BIT", "", "UTF-8", "\u0001\x81", "UTF-8"],
+      ["ASCII-8BIT", "", "ASCII-8BIT", "", "ASCII-8BIT"],
+      ["ASCII-8BIT", "", "ASCII-8BIT", "\x01\x01", "ASCII-8BIT"],
+      ["ASCII-8BIT", "", "ASCII-8BIT", "\x01\x81", "ASCII-8BIT"],
+      ["ASCII-8BIT", "", "ISO-8859-1", "", "ASCII-8BIT"],
+      ["ASCII-8BIT", "", "ISO-8859-1", "\x01\x01", "ASCII-8BIT"],
+      ["ASCII-8BIT", "", "ISO-8859-1", "\x01\x81", "ISO-8859-1"],
+      ["ASCII-8BIT", "", "UTF-16BE", "", "ASCII-8BIT"],
+      ["ASCII-8BIT", "", "UTF-16BE", "\u0101", "UTF-16BE"],
+      ["ASCII-8BIT", "", "UTF-16BE", "\u0181", "UTF-16BE"],
+      ["ASCII-8BIT", "", "ISO-2022-JP", "", "ASCII-8BIT"],
+      ["ASCII-8BIT", "", "ISO-2022-JP", "\x01\x01", "ISO-2022-JP"],
+      ["ASCII-8BIT", "", "ISO-2022-JP", "\x01\x81", "ISO-2022-JP"],
+      ["ASCII-8BIT", "\x01\x01", "US-ASCII", "", "ASCII-8BIT"],
+      ["ASCII-8BIT", "\x01\x01", "US-ASCII", "\x01\x01", "ASCII-8BIT"],
+      ["ASCII-8BIT", "\x01\x01", "US-ASCII", "\x01\x81", "US-ASCII"],
+      ["ASCII-8BIT", "\x01\x01", "UTF-8", "", "ASCII-8BIT"],
+      ["ASCII-8BIT", "\x01\x01", "UTF-8", "\u0001\u0001", "ASCII-8BIT"],
+      ["ASCII-8BIT", "\x01\x01", "UTF-8", "\u0001\x81", "UTF-8"],
+      ["ASCII-8BIT", "\x01\x01", "ASCII-8BIT", "", "ASCII-8BIT"],
+      ["ASCII-8BIT", "\x01\x01", "ASCII-8BIT", "\x01\x01", "ASCII-8BIT"],
+      ["ASCII-8BIT", "\x01\x01", "ASCII-8BIT", "\x01\x81", "ASCII-8BIT"],
+      ["ASCII-8BIT", "\x01\x01", "ISO-8859-1", "", "ASCII-8BIT"],
+      ["ASCII-8BIT", "\x01\x01", "ISO-8859-1", "\x01\x01", "ASCII-8BIT"],
+      ["ASCII-8BIT", "\x01\x01", "ISO-8859-1", "\x01\x81", "ISO-8859-1"],
+      ["ASCII-8BIT", "\x01\x01", "UTF-16BE", "", "ASCII-8BIT"],
+      ["ASCII-8BIT", "\x01\x01", "UTF-16BE", "\u0101", nil],
+      ["ASCII-8BIT", "\x01\x01", "UTF-16BE", "\u0181", nil],
+      ["ASCII-8BIT", "\x01\x01", "ISO-2022-JP", "", "ASCII-8BIT"],
+      ["ASCII-8BIT", "\x01\x01", "ISO-2022-JP", "\x01\x01", nil],
+      ["ASCII-8BIT", "\x01\x01", "ISO-2022-JP", "\x01\x81", nil],
+      ["ASCII-8BIT", "\x01\x81", "US-ASCII", "", "ASCII-8BIT"],
+      ["ASCII-8BIT", "\x01\x81", "US-ASCII", "\x01\x01", "ASCII-8BIT"],
+      ["ASCII-8BIT", "\x01\x81", "US-ASCII", "\x01\x81", nil],
+      ["ASCII-8BIT", "\x01\x81", "UTF-8", "", "ASCII-8BIT"],
+      ["ASCII-8BIT", "\x01\x81", "UTF-8", "\u0001\u0001", "ASCII-8BIT"],
+      ["ASCII-8BIT", "\x01\x81", "UTF-8", "\u0001\x81", nil],
+      ["ASCII-8BIT", "\x01\x81", "ASCII-8BIT", "", "ASCII-8BIT"],
+      ["ASCII-8BIT", "\x01\x81", "ASCII-8BIT", "\x01\x01", "ASCII-8BIT"],
+      ["ASCII-8BIT", "\x01\x81", "ASCII-8BIT", "\x01\x81", "ASCII-8BIT"],
+      ["ASCII-8BIT", "\x01\x81", "ISO-8859-1", "", "ASCII-8BIT"],
+      ["ASCII-8BIT", "\x01\x81", "ISO-8859-1", "\x01\x01", "ASCII-8BIT"],
+      ["ASCII-8BIT", "\x01\x81", "ISO-8859-1", "\x01\x81", nil],
+      ["ASCII-8BIT", "\x01\x81", "UTF-16BE", "", "ASCII-8BIT"],
+      ["ASCII-8BIT", "\x01\x81", "UTF-16BE", "\u0101", nil],
+      ["ASCII-8BIT", "\x01\x81", "UTF-16BE", "\u0181", nil],
+      ["ASCII-8BIT", "\x01\x81", "ISO-2022-JP", "", "ASCII-8BIT"],
+      ["ASCII-8BIT", "\x01\x81", "ISO-2022-JP", "\x01\x01", nil],
+      ["ASCII-8BIT", "\x01\x81", "ISO-2022-JP", "\x01\x81", nil],
+      ["ISO-8859-1", "", "US-ASCII", "", "ISO-8859-1"],
+      ["ISO-8859-1", "", "US-ASCII", "\x01\x01", "ISO-8859-1"],
+      ["ISO-8859-1", "", "US-ASCII", "\x01\x81", "US-ASCII"],
+      ["ISO-8859-1", "", "UTF-8", "", "ISO-8859-1"],
+      ["ISO-8859-1", "", "UTF-8", "\u0001\u0001", "ISO-8859-1"],
+      ["ISO-8859-1", "", "UTF-8", "\u0001\x81", "UTF-8"],
+      ["ISO-8859-1", "", "ASCII-8BIT", "", "ISO-8859-1"],
+      ["ISO-8859-1", "", "ASCII-8BIT", "\x01\x01", "ISO-8859-1"],
+      ["ISO-8859-1", "", "ASCII-8BIT", "\x01\x81", "ASCII-8BIT"],
+      ["ISO-8859-1", "", "ISO-8859-1", "", "ISO-8859-1"],
+      ["ISO-8859-1", "", "ISO-8859-1", "\x01\x01", "ISO-8859-1"],
+      ["ISO-8859-1", "", "ISO-8859-1", "\x01\x81", "ISO-8859-1"],
+      ["ISO-8859-1", "", "UTF-16BE", "", "ISO-8859-1"],
+      ["ISO-8859-1", "", "UTF-16BE", "\u0101", "UTF-16BE"],
+      ["ISO-8859-1", "", "UTF-16BE", "\u0181", "UTF-16BE"],
+      ["ISO-8859-1", "", "ISO-2022-JP", "", "ISO-8859-1"],
+      ["ISO-8859-1", "", "ISO-2022-JP", "\x01\x01", "ISO-2022-JP"],
+      ["ISO-8859-1", "", "ISO-2022-JP", "\x01\x81", "ISO-2022-JP"],
+      ["ISO-8859-1", "\x01\x01", "US-ASCII", "", "ISO-8859-1"],
+      ["ISO-8859-1", "\x01\x01", "US-ASCII", "\x01\x01", "ISO-8859-1"],
+      ["ISO-8859-1", "\x01\x01", "US-ASCII", "\x01\x81", "US-ASCII"],
+      ["ISO-8859-1", "\x01\x01", "UTF-8", "", "ISO-8859-1"],
+      ["ISO-8859-1", "\x01\x01", "UTF-8", "\u0001\u0001", "ISO-8859-1"],
+      ["ISO-8859-1", "\x01\x01", "UTF-8", "\u0001\x81", "UTF-8"],
+      ["ISO-8859-1", "\x01\x01", "ASCII-8BIT", "", "ISO-8859-1"],
+      ["ISO-8859-1", "\x01\x01", "ASCII-8BIT", "\x01\x01", "ISO-8859-1"],
+      ["ISO-8859-1", "\x01\x01", "ASCII-8BIT", "\x01\x81", "ASCII-8BIT"],
+      ["ISO-8859-1", "\x01\x01", "ISO-8859-1", "", "ISO-8859-1"],
+      ["ISO-8859-1", "\x01\x01", "ISO-8859-1", "\x01\x01", "ISO-8859-1"],
+      ["ISO-8859-1", "\x01\x01", "ISO-8859-1", "\x01\x81", "ISO-8859-1"],
+      ["ISO-8859-1", "\x01\x01", "UTF-16BE", "", "ISO-8859-1"],
+      ["ISO-8859-1", "\x01\x01", "UTF-16BE", "\u0101", nil],
+      ["ISO-8859-1", "\x01\x01", "UTF-16BE", "\u0181", nil],
+      ["ISO-8859-1", "\x01\x01", "ISO-2022-JP", "", "ISO-8859-1"],
+      ["ISO-8859-1", "\x01\x01", "ISO-2022-JP", "\x01\x01", nil],
+      ["ISO-8859-1", "\x01\x01", "ISO-2022-JP", "\x01\x81", nil],
+      ["ISO-8859-1", "\x01\x81", "US-ASCII", "", "ISO-8859-1"],
+      ["ISO-8859-1", "\x01\x81", "US-ASCII", "\x01\x01", "ISO-8859-1"],
+      ["ISO-8859-1", "\x01\x81", "US-ASCII", "\x01\x81", nil],
+      ["ISO-8859-1", "\x01\x81", "UTF-8", "", "ISO-8859-1"],
+      ["ISO-8859-1", "\x01\x81", "UTF-8", "\u0001\u0001", "ISO-8859-1"],
+      ["ISO-8859-1", "\x01\x81", "UTF-8", "\u0001\x81", nil],
+      ["ISO-8859-1", "\x01\x81", "ASCII-8BIT", "", "ISO-8859-1"],
+      ["ISO-8859-1", "\x01\x81", "ASCII-8BIT", "\x01\x01", "ISO-8859-1"],
+      ["ISO-8859-1", "\x01\x81", "ASCII-8BIT", "\x01\x81", nil],
+      ["ISO-8859-1", "\x01\x81", "ISO-8859-1", "", "ISO-8859-1"],
+      ["ISO-8859-1", "\x01\x81", "ISO-8859-1", "\x01\x01", "ISO-8859-1"],
+      ["ISO-8859-1", "\x01\x81", "ISO-8859-1", "\x01\x81", "ISO-8859-1"],
+      ["ISO-8859-1", "\x01\x81", "UTF-16BE", "", "ISO-8859-1"],
+      ["ISO-8859-1", "\x01\x81", "UTF-16BE", "\u0101", nil],
+      ["ISO-8859-1", "\x01\x81", "UTF-16BE", "\u0181", nil],
+      ["ISO-8859-1", "\x01\x81", "ISO-2022-JP", "", "ISO-8859-1"],
+      ["ISO-8859-1", "\x01\x81", "ISO-2022-JP", "\x01\x01", nil],
+      ["ISO-8859-1", "\x01\x81", "ISO-2022-JP", "\x01\x81", nil],
+      ["UTF-16BE", "", "US-ASCII", "", "UTF-16BE"],
+      ["UTF-16BE", "", "US-ASCII", "\x01\x01", "US-ASCII"],
+      ["UTF-16BE", "", "US-ASCII", "\x01\x81", "US-ASCII"],
+      ["UTF-16BE", "", "UTF-8", "", "UTF-16BE"],
+      ["UTF-16BE", "", "UTF-8", "\u0001\u0001", "UTF-8"],
+      ["UTF-16BE", "", "UTF-8", "\u0001\x81", "UTF-8"],
+      ["UTF-16BE", "", "ASCII-8BIT", "", "UTF-16BE"],
+      ["UTF-16BE", "", "ASCII-8BIT", "\x01\x01", "ASCII-8BIT"],
+      ["UTF-16BE", "", "ASCII-8BIT", "\x01\x81", "ASCII-8BIT"],
+      ["UTF-16BE", "", "ISO-8859-1", "", "UTF-16BE"],
+      ["UTF-16BE", "", "ISO-8859-1", "\x01\x01", "ISO-8859-1"],
+      ["UTF-16BE", "", "ISO-8859-1", "\x01\x81", "ISO-8859-1"],
+      ["UTF-16BE", "", "UTF-16BE", "", "UTF-16BE"],
+      ["UTF-16BE", "", "UTF-16BE", "\u0101", "UTF-16BE"],
+      ["UTF-16BE", "", "UTF-16BE", "\u0181", "UTF-16BE"],
+      ["UTF-16BE", "", "ISO-2022-JP", "", "UTF-16BE"],
+      ["UTF-16BE", "", "ISO-2022-JP", "\x01\x01", "ISO-2022-JP"],
+      ["UTF-16BE", "", "ISO-2022-JP", "\x01\x81", "ISO-2022-JP"],
+      ["UTF-16BE", "\u0101", "US-ASCII", "", "UTF-16BE"],
+      ["UTF-16BE", "\u0101", "US-ASCII", "\x01\x01", nil],
+      ["UTF-16BE", "\u0101", "US-ASCII", "\x01\x81", nil],
+      ["UTF-16BE", "\u0101", "UTF-8", "", "UTF-16BE"],
+      ["UTF-16BE", "\u0101", "UTF-8", "\u0001\u0001", nil],
+      ["UTF-16BE", "\u0101", "UTF-8", "\u0001\x81", nil],
+      ["UTF-16BE", "\u0101", "ASCII-8BIT", "", "UTF-16BE"],
+      ["UTF-16BE", "\u0101", "ASCII-8BIT", "\x01\x01", nil],
+      ["UTF-16BE", "\u0101", "ASCII-8BIT", "\x01\x81", nil],
+      ["UTF-16BE", "\u0101", "ISO-8859-1", "", "UTF-16BE"],
+      ["UTF-16BE", "\u0101", "ISO-8859-1", "\x01\x01", nil],
+      ["UTF-16BE", "\u0101", "ISO-8859-1", "\x01\x81", nil],
+      ["UTF-16BE", "\u0101", "UTF-16BE", "", "UTF-16BE"],
+      ["UTF-16BE", "\u0101", "UTF-16BE", "\u0101", "UTF-16BE"],
+      ["UTF-16BE", "\u0101", "UTF-16BE", "\u0181", "UTF-16BE"],
+      ["UTF-16BE", "\u0101", "ISO-2022-JP", "", "UTF-16BE"],
+      ["UTF-16BE", "\u0101", "ISO-2022-JP", "\x01\x01", nil],
+      ["UTF-16BE", "\u0101", "ISO-2022-JP", "\x01\x81", nil],
+      ["UTF-16BE", "\u0181", "US-ASCII", "", "UTF-16BE"],
+      ["UTF-16BE", "\u0181", "US-ASCII", "\x01\x01", nil],
+      ["UTF-16BE", "\u0181", "US-ASCII", "\x01\x81", nil],
+      ["UTF-16BE", "\u0181", "UTF-8", "", "UTF-16BE"],
+      ["UTF-16BE", "\u0181", "UTF-8", "\u0001\u0001", nil],
+      ["UTF-16BE", "\u0181", "UTF-8", "\u0001\x81", nil],
+      ["UTF-16BE", "\u0181", "ASCII-8BIT", "", "UTF-16BE"],
+      ["UTF-16BE", "\u0181", "ASCII-8BIT", "\x01\x01", nil],
+      ["UTF-16BE", "\u0181", "ASCII-8BIT", "\x01\x81", nil],
+      ["UTF-16BE", "\u0181", "ISO-8859-1", "", "UTF-16BE"],
+      ["UTF-16BE", "\u0181", "ISO-8859-1", "\x01\x01", nil],
+      ["UTF-16BE", "\u0181", "ISO-8859-1", "\x01\x81", nil],
+      ["UTF-16BE", "\u0181", "UTF-16BE", "", "UTF-16BE"],
+      ["UTF-16BE", "\u0181", "UTF-16BE", "\u0101", "UTF-16BE"],
+      ["UTF-16BE", "\u0181", "UTF-16BE", "\u0181", "UTF-16BE"],
+      ["UTF-16BE", "\u0181", "ISO-2022-JP", "", "UTF-16BE"],
+      ["UTF-16BE", "\u0181", "ISO-2022-JP", "\x01\x01", nil],
+      ["UTF-16BE", "\u0181", "ISO-2022-JP", "\x01\x81", nil],
+      ["ISO-2022-JP", "", "US-ASCII", "", "ISO-2022-JP"],
+      ["ISO-2022-JP", "", "US-ASCII", "\x01\x01", "US-ASCII"],
+      ["ISO-2022-JP", "", "US-ASCII", "\x01\x81", "US-ASCII"],
+      ["ISO-2022-JP", "", "UTF-8", "", "ISO-2022-JP"],
+      ["ISO-2022-JP", "", "UTF-8", "\u0001\u0001", "UTF-8"],
+      ["ISO-2022-JP", "", "UTF-8", "\u0001\x81", "UTF-8"],
+      ["ISO-2022-JP", "", "ASCII-8BIT", "", "ISO-2022-JP"],
+      ["ISO-2022-JP", "", "ASCII-8BIT", "\x01\x01", "ASCII-8BIT"],
+      ["ISO-2022-JP", "", "ASCII-8BIT", "\x01\x81", "ASCII-8BIT"],
+      ["ISO-2022-JP", "", "ISO-8859-1", "", "ISO-2022-JP"],
+      ["ISO-2022-JP", "", "ISO-8859-1", "\x01\x01", "ISO-8859-1"],
+      ["ISO-2022-JP", "", "ISO-8859-1", "\x01\x81", "ISO-8859-1"],
+      ["ISO-2022-JP", "", "UTF-16BE", "", "ISO-2022-JP"],
+      ["ISO-2022-JP", "", "UTF-16BE", "\u0101", "UTF-16BE"],
+      ["ISO-2022-JP", "", "UTF-16BE", "\u0181", "UTF-16BE"],
+      ["ISO-2022-JP", "", "ISO-2022-JP", "", "ISO-2022-JP"],
+      ["ISO-2022-JP", "", "ISO-2022-JP", "\x01\x01", "ISO-2022-JP"],
+      ["ISO-2022-JP", "", "ISO-2022-JP", "\x01\x81", "ISO-2022-JP"],
+      ["ISO-2022-JP", "\x01\x01", "US-ASCII", "", "ISO-2022-JP"],
+      ["ISO-2022-JP", "\x01\x01", "US-ASCII", "\x01\x01", nil],
+      ["ISO-2022-JP", "\x01\x01", "US-ASCII", "\x01\x81", nil],
+      ["ISO-2022-JP", "\x01\x01", "UTF-8", "", "ISO-2022-JP"],
+      ["ISO-2022-JP", "\x01\x01", "UTF-8", "\u0001\u0001", nil],
+      ["ISO-2022-JP", "\x01\x01", "UTF-8", "\u0001\x81", nil],
+      ["ISO-2022-JP", "\x01\x01", "ASCII-8BIT", "", "ISO-2022-JP"],
+      ["ISO-2022-JP", "\x01\x01", "ASCII-8BIT", "\x01\x01", nil],
+      ["ISO-2022-JP", "\x01\x01", "ASCII-8BIT", "\x01\x81", nil],
+      ["ISO-2022-JP", "\x01\x01", "ISO-8859-1", "", "ISO-2022-JP"],
+      ["ISO-2022-JP", "\x01\x01", "ISO-8859-1", "\x01\x01", nil],
+      ["ISO-2022-JP", "\x01\x01", "ISO-8859-1", "\x01\x81", nil],
+      ["ISO-2022-JP", "\x01\x01", "UTF-16BE", "", "ISO-2022-JP"],
+      ["ISO-2022-JP", "\x01\x01", "UTF-16BE", "\u0101", nil],
+      ["ISO-2022-JP", "\x01\x01", "UTF-16BE", "\u0181", nil],
+      ["ISO-2022-JP", "\x01\x01", "ISO-2022-JP", "", "ISO-2022-JP"],
+      ["ISO-2022-JP", "\x01\x01", "ISO-2022-JP", "\x01\x01", "ISO-2022-JP"],
+      ["ISO-2022-JP", "\x01\x01", "ISO-2022-JP", "\x01\x81", "ISO-2022-JP"],
+      ["ISO-2022-JP", "\x01\x81", "US-ASCII", "", "ISO-2022-JP"],
+      ["ISO-2022-JP", "\x01\x81", "US-ASCII", "\x01\x01", nil],
+      ["ISO-2022-JP", "\x01\x81", "US-ASCII", "\x01\x81", nil],
+      ["ISO-2022-JP", "\x01\x81", "UTF-8", "", "ISO-2022-JP"],
+      ["ISO-2022-JP", "\x01\x81", "UTF-8", "\u0001\u0001", nil],
+      ["ISO-2022-JP", "\x01\x81", "UTF-8", "\u0001\x81", nil],
+      ["ISO-2022-JP", "\x01\x81", "ASCII-8BIT", "", "ISO-2022-JP"],
+      ["ISO-2022-JP", "\x01\x81", "ASCII-8BIT", "\x01\x01", nil],
+      ["ISO-2022-JP", "\x01\x81", "ASCII-8BIT", "\x01\x81", nil],
+      ["ISO-2022-JP", "\x01\x81", "ISO-8859-1", "", "ISO-2022-JP"],
+      ["ISO-2022-JP", "\x01\x81", "ISO-8859-1", "\x01\x01", nil],
+      ["ISO-2022-JP", "\x01\x81", "ISO-8859-1", "\x01\x81", nil],
+      ["ISO-2022-JP", "\x01\x81", "UTF-16BE", "", "ISO-2022-JP"],
+      ["ISO-2022-JP", "\x01\x81", "UTF-16BE", "\u0101", nil],
+      ["ISO-2022-JP", "\x01\x81", "UTF-16BE", "\u0181", nil],
+      ["ISO-2022-JP", "\x01\x81", "ISO-2022-JP", "", "ISO-2022-JP"],
+      ["ISO-2022-JP", "\x01\x81", "ISO-2022-JP", "\x01\x01", "ISO-2022-JP"],
+      ["ISO-2022-JP", "\x01\x81", "ISO-2022-JP", "\x01\x81", "ISO-2022-JP"],
+    ]
+
+    matrix.each do |encoding1, value1, encoding2, value2, compatible_encoding|
+      it "returns #{compatible_encoding} for #{value1.inspect} in #{encoding1} and #{value2.inspect} in #{encoding2}" do
+        actual_encoding = Encoding.compatible?(value1.dup.force_encoding(encoding1), value2.dup.force_encoding(encoding2))
+        actual_encoding&.name.should == compatible_encoding
+      end
+    end
+  end
 end
 
 describe "Encoding.compatible? String, Regexp" do
   it "returns US-ASCII if both are US-ASCII" do
-    str = "abc".force_encoding("us-ascii")
+    str = "abc".dup.force_encoding("us-ascii")
     Encoding.compatible?(str, /abc/).should == Encoding::US_ASCII
   end
 
@@ -180,15 +553,15 @@
   it "returns the String's Encoding if the String is not ASCII only" do
     [ [Encoding, "\xff",                                  Encoding::BINARY],
       [Encoding, "\u3042".encode("utf-8"),                Encoding::UTF_8],
-      [Encoding, "\xa4\xa2".force_encoding("euc-jp"),     Encoding::EUC_JP],
-      [Encoding, "\x82\xa0".force_encoding("shift_jis"),  Encoding::Shift_JIS],
+      [Encoding, "\xa4\xa2".dup.force_encoding("euc-jp"),     Encoding::EUC_JP],
+      [Encoding, "\x82\xa0".dup.force_encoding("shift_jis"),  Encoding::Shift_JIS],
     ].should be_computed_by(:compatible?, /abc/)
   end
 end
 
 describe "Encoding.compatible? String, Symbol" do
   it "returns US-ASCII if both are ASCII only" do
-    str = "abc".force_encoding("us-ascii")
+    str = "abc".dup.force_encoding("us-ascii")
     Encoding.compatible?(str, :abc).should == Encoding::US_ASCII
   end
 
@@ -203,8 +576,8 @@
   it "returns the String's Encoding if the String is not ASCII only" do
     [ [Encoding, "\xff",                                  Encoding::BINARY],
       [Encoding, "\u3042".encode("utf-8"),                Encoding::UTF_8],
-      [Encoding, "\xa4\xa2".force_encoding("euc-jp"),     Encoding::EUC_JP],
-      [Encoding, "\x82\xa0".force_encoding("shift_jis"),  Encoding::Shift_JIS],
+      [Encoding, "\xa4\xa2".dup.force_encoding("euc-jp"),     Encoding::EUC_JP],
+      [Encoding, "\x82\xa0".dup.force_encoding("shift_jis"),  Encoding::Shift_JIS],
     ].should be_computed_by(:compatible?, :abc)
   end
 end
@@ -221,8 +594,8 @@
   it "returns the String's encoding if the Encoding is US-ASCII" do
     [ [Encoding, "\xff",                                  Encoding::BINARY],
       [Encoding, "\u3042".encode("utf-8"),                Encoding::UTF_8],
-      [Encoding, "\xa4\xa2".force_encoding("euc-jp"),     Encoding::EUC_JP],
-      [Encoding, "\x82\xa0".force_encoding("shift_jis"),  Encoding::Shift_JIS],
+      [Encoding, "\xa4\xa2".dup.force_encoding("euc-jp"),     Encoding::EUC_JP],
+      [Encoding, "\x82\xa0".dup.force_encoding("shift_jis"),  Encoding::Shift_JIS],
     ].should be_computed_by(:compatible?, Encoding::US_ASCII)
   end
 
@@ -242,7 +615,7 @@
 
 describe "Encoding.compatible? Regexp, String" do
   it "returns US-ASCII if both are US-ASCII" do
-    str = "abc".force_encoding("us-ascii")
+    str = "abc".dup.force_encoding("us-ascii")
     Encoding.compatible?(/abc/, str).should == Encoding::US_ASCII
   end
 
@@ -256,8 +629,8 @@
   it "returns the first's Encoding if it is not US-ASCII and not ASCII only" do
     [ [Encoding, Regexp.new("\xff"),                                  Encoding::BINARY],
       [Encoding, Regexp.new("\u3042".encode("utf-8")),                Encoding::UTF_8],
-      [Encoding, Regexp.new("\xa4\xa2".force_encoding("euc-jp")),     Encoding::EUC_JP],
-      [Encoding, Regexp.new("\x82\xa0".force_encoding("shift_jis")),  Encoding::Shift_JIS],
+      [Encoding, Regexp.new("\xa4\xa2".dup.force_encoding("euc-jp")),     Encoding::EUC_JP],
+      [Encoding, Regexp.new("\x82\xa0".dup.force_encoding("shift_jis")),  Encoding::Shift_JIS],
     ].should be_computed_by(:compatible?, /abc/)
   end
 end
@@ -270,15 +643,15 @@
   it "returns the first's Encoding if it is not US-ASCII and not ASCII only" do
     [ [Encoding, Regexp.new("\xff"),                                  Encoding::BINARY],
       [Encoding, Regexp.new("\u3042".encode("utf-8")),                Encoding::UTF_8],
-      [Encoding, Regexp.new("\xa4\xa2".force_encoding("euc-jp")),     Encoding::EUC_JP],
-      [Encoding, Regexp.new("\x82\xa0".force_encoding("shift_jis")),  Encoding::Shift_JIS],
+      [Encoding, Regexp.new("\xa4\xa2".dup.force_encoding("euc-jp")),     Encoding::EUC_JP],
+      [Encoding, Regexp.new("\x82\xa0".dup.force_encoding("shift_jis")),  Encoding::Shift_JIS],
     ].should be_computed_by(:compatible?, /abc/)
   end
 end
 
 describe "Encoding.compatible? Symbol, String" do
   it "returns US-ASCII if both are ASCII only" do
-    str = "abc".force_encoding("us-ascii")
+    str = "abc".dup.force_encoding("us-ascii")
     Encoding.compatible?(str, :abc).should == Encoding::US_ASCII
   end
 end
@@ -291,8 +664,8 @@
   it "returns the Regexp's Encoding if it is not US-ASCII and not ASCII only" do
     a = Regexp.new("\xff")
     b = Regexp.new("\u3042".encode("utf-8"))
-    c = Regexp.new("\xa4\xa2".force_encoding("euc-jp"))
-    d = Regexp.new("\x82\xa0".force_encoding("shift_jis"))
+    c = Regexp.new("\xa4\xa2".dup.force_encoding("euc-jp"))
+    d = Regexp.new("\x82\xa0".dup.force_encoding("shift_jis"))
 
     [ [Encoding, :abc, a, Encoding::BINARY],
       [Encoding, :abc, b, Encoding::UTF_8],
@@ -310,8 +683,8 @@
   it "returns the first's Encoding if it is not ASCII only" do
     [ [Encoding, "\xff".to_sym,                                  Encoding::BINARY],
       [Encoding, "\u3042".encode("utf-8").to_sym,                Encoding::UTF_8],
-      [Encoding, "\xa4\xa2".force_encoding("euc-jp").to_sym,     Encoding::EUC_JP],
-      [Encoding, "\x82\xa0".force_encoding("shift_jis").to_sym,  Encoding::Shift_JIS],
+      [Encoding, "\xa4\xa2".dup.force_encoding("euc-jp").to_sym,     Encoding::EUC_JP],
+      [Encoding, "\x82\xa0".dup.force_encoding("shift_jis").to_sym,  Encoding::Shift_JIS],
     ].should be_computed_by(:compatible?, :abc)
   end
 end
@@ -377,3 +750,9 @@
     Encoding.compatible?(:sym, Object.new).should be_nil
   end
 end
+
+describe "Encoding.compatible? nil, nil" do
+  it "returns nil" do
+    Encoding.compatible?(nil, nil).should be_nil
+  end
+end
diff --git a/spec/ruby/core/encoding/converter/convert_spec.rb b/spec/ruby/core/encoding/converter/convert_spec.rb
index 95a9e0b7589d2c..8533af45650c7a 100644
--- a/spec/ruby/core/encoding/converter/convert_spec.rb
+++ b/spec/ruby/core/encoding/converter/convert_spec.rb
@@ -1,4 +1,5 @@
-# -*- encoding: binary -*-
+# encoding: binary
+# frozen_string_literal: true
 require_relative '../../../spec_helper'
 
 describe "Encoding::Converter#convert" do
@@ -9,31 +10,31 @@
 
   it "sets the encoding of the result to the target encoding" do
     ec = Encoding::Converter.new('ascii', 'utf-8')
-    str = 'glark'.force_encoding('ascii')
+    str = 'glark'.dup.force_encoding('ascii')
     ec.convert(str).encoding.should == Encoding::UTF_8
   end
 
   it "transcodes the given String to the target encoding" do
     ec = Encoding::Converter.new("utf-8", "euc-jp")
-    ec.convert("\u3042".force_encoding('UTF-8')).should == \
-      "\xA4\xA2".force_encoding('EUC-JP')
+    ec.convert("\u3042".dup.force_encoding('UTF-8')).should == \
+      "\xA4\xA2".dup.force_encoding('EUC-JP')
   end
 
   it "allows Strings of different encodings to the source encoding" do
     ec = Encoding::Converter.new('ascii', 'utf-8')
-    str = 'glark'.force_encoding('SJIS')
+    str = 'glark'.dup.force_encoding('SJIS')
     ec.convert(str).encoding.should == Encoding::UTF_8
   end
 
   it "reuses the given encoding pair if called multiple times" do
     ec = Encoding::Converter.new('ascii', 'SJIS')
-    ec.convert('a'.force_encoding('ASCII')).should == 'a'.force_encoding('SJIS')
-    ec.convert('b'.force_encoding('ASCII')).should == 'b'.force_encoding('SJIS')
+    ec.convert('a'.dup.force_encoding('ASCII')).should == 'a'.dup.force_encoding('SJIS')
+    ec.convert('b'.dup.force_encoding('ASCII')).should == 'b'.dup.force_encoding('SJIS')
   end
 
   it "raises UndefinedConversionError if the String contains characters invalid for the target encoding" do
     ec = Encoding::Converter.new('UTF-8', Encoding.find('macCyrillic'))
-    -> { ec.convert("\u{6543}".force_encoding('UTF-8')) }.should \
+    -> { ec.convert("\u{6543}".dup.force_encoding('UTF-8')) }.should \
       raise_error(Encoding::UndefinedConversionError)
   end
 
diff --git a/spec/ruby/core/encoding/converter/finish_spec.rb b/spec/ruby/core/encoding/converter/finish_spec.rb
index 11ca7e8510f1aa..22e66df38cae2f 100644
--- a/spec/ruby/core/encoding/converter/finish_spec.rb
+++ b/spec/ruby/core/encoding/converter/finish_spec.rb
@@ -16,8 +16,8 @@
   end
 
   it "returns the last part of the converted String if it hasn't already" do
-     @ec.convert("\u{9999}").should == "\e$B9a".force_encoding('iso-2022-jp')
-     @ec.finish.should == "\e(B".force_encoding('iso-2022-jp')
+    @ec.convert("\u{9999}").should == "\e$B9a".dup.force_encoding('iso-2022-jp')
+    @ec.finish.should == "\e(B".dup.force_encoding('iso-2022-jp')
   end
 
   it "returns a String in the destination encoding" do
diff --git a/spec/ruby/core/encoding/converter/last_error_spec.rb b/spec/ruby/core/encoding/converter/last_error_spec.rb
index 68567737b7e7ee..ff2a2b4cbe2505 100644
--- a/spec/ruby/core/encoding/converter/last_error_spec.rb
+++ b/spec/ruby/core/encoding/converter/last_error_spec.rb
@@ -1,4 +1,4 @@
-# -*- encoding: binary -*-
+# encoding: binary
 require_relative '../../../spec_helper'
 
 describe "Encoding::Converter#last_error" do
@@ -9,45 +9,45 @@
 
   it "returns nil when the last conversion did not produce an error" do
     ec = Encoding::Converter.new('ascii','utf-8')
-    ec.convert('a'.force_encoding('ascii'))
+    ec.convert('a'.dup.force_encoding('ascii'))
     ec.last_error.should be_nil
   end
 
   it "returns nil when #primitive_convert last returned :destination_buffer_full" do
     ec = Encoding::Converter.new("utf-8", "iso-2022-jp")
-    ec.primitive_convert("\u{9999}", "", 0, 0, partial_input: false) \
+    ec.primitive_convert(+"\u{9999}", +"", 0, 0, partial_input: false) \
       .should == :destination_buffer_full
     ec.last_error.should be_nil
   end
 
   it "returns nil when #primitive_convert last returned :finished" do
     ec = Encoding::Converter.new("utf-8", "iso-8859-1")
-    ec.primitive_convert("glark".force_encoding('utf-8'),"").should == :finished
+    ec.primitive_convert("glark".dup.force_encoding('utf-8'), +"").should == :finished
     ec.last_error.should be_nil
   end
 
   it "returns nil if the last conversion succeeded but the penultimate failed" do
     ec = Encoding::Converter.new("utf-8", "iso-8859-1")
-    ec.primitive_convert("\xf1abcd","").should == :invalid_byte_sequence
-    ec.primitive_convert("glark".force_encoding('utf-8'),"").should == :finished
+    ec.primitive_convert(+"\xf1abcd", +"").should == :invalid_byte_sequence
+    ec.primitive_convert("glark".dup.force_encoding('utf-8'), +"").should == :finished
     ec.last_error.should be_nil
   end
 
   it "returns an Encoding::InvalidByteSequenceError when #primitive_convert last returned :invalid_byte_sequence" do
     ec = Encoding::Converter.new("utf-8", "iso-8859-1")
-    ec.primitive_convert("\xf1abcd","").should == :invalid_byte_sequence
+    ec.primitive_convert(+"\xf1abcd", +"").should == :invalid_byte_sequence
     ec.last_error.should be_an_instance_of(Encoding::InvalidByteSequenceError)
   end
 
   it "returns an Encoding::UndefinedConversionError when #primitive_convert last returned :undefined_conversion" do
     ec = Encoding::Converter.new("utf-8", "iso-8859-1")
-    ec.primitive_convert("\u{9876}","").should == :undefined_conversion
+    ec.primitive_convert(+"\u{9876}", +"").should == :undefined_conversion
     ec.last_error.should be_an_instance_of(Encoding::UndefinedConversionError)
   end
 
   it "returns an Encoding::InvalidByteSequenceError when #primitive_convert last returned :incomplete_input" do
     ec = Encoding::Converter.new("EUC-JP", "ISO-8859-1")
-    ec.primitive_convert("\xa4", "", nil, 10).should == :incomplete_input
+    ec.primitive_convert(+"\xa4", +"", nil, 10).should == :incomplete_input
     ec.last_error.should be_an_instance_of(Encoding::InvalidByteSequenceError)
   end
 
diff --git a/spec/ruby/core/encoding/converter/new_spec.rb b/spec/ruby/core/encoding/converter/new_spec.rb
index 1f7affc72b82cc..a7bef538092339 100644
--- a/spec/ruby/core/encoding/converter/new_spec.rb
+++ b/spec/ruby/core/encoding/converter/new_spec.rb
@@ -1,4 +1,4 @@
-# -*- encoding: binary -*-
+# encoding: binary
 require_relative '../../../spec_helper'
 
 describe "Encoding::Converter.new" do
@@ -107,7 +107,7 @@
 
       it "sets the replacement String to '\\uFFFD'" do
         conv = Encoding::Converter.new("us-ascii", "utf-8", replace: nil)
-        conv.replacement.should == "\u{fffd}".force_encoding("utf-8")
+        conv.replacement.should == "\u{fffd}".dup.force_encoding("utf-8")
       end
 
       it "sets the replacement String encoding to UTF-8" do
diff --git a/spec/ruby/core/encoding/converter/primitive_convert_spec.rb b/spec/ruby/core/encoding/converter/primitive_convert_spec.rb
index ab34ebf33fe0e6..e4aeed103e08de 100644
--- a/spec/ruby/core/encoding/converter/primitive_convert_spec.rb
+++ b/spec/ruby/core/encoding/converter/primitive_convert_spec.rb
@@ -1,4 +1,5 @@
-# -*- encoding: binary -*-
+# encoding: binary
+# frozen_string_literal: false
 require_relative '../../../spec_helper'
 
 describe "Encoding::Converter#primitive_convert" do
diff --git a/spec/ruby/core/encoding/converter/primitive_errinfo_spec.rb b/spec/ruby/core/encoding/converter/primitive_errinfo_spec.rb
index 1f836b259fdbd0..5ee8b1fecd1a41 100644
--- a/spec/ruby/core/encoding/converter/primitive_errinfo_spec.rb
+++ b/spec/ruby/core/encoding/converter/primitive_errinfo_spec.rb
@@ -1,4 +1,5 @@
-# -*- encoding: binary -*-
+# encoding: binary
+# frozen_string_literal: false
 require_relative '../../../spec_helper'
 
 describe "Encoding::Converter#primitive_errinfo" do
diff --git a/spec/ruby/core/encoding/converter/putback_spec.rb b/spec/ruby/core/encoding/converter/putback_spec.rb
index c4e0a5da213c9f..04bb5656553b64 100644
--- a/spec/ruby/core/encoding/converter/putback_spec.rb
+++ b/spec/ruby/core/encoding/converter/putback_spec.rb
@@ -1,10 +1,10 @@
-# -*- encoding: binary -*-
+# encoding: binary
 require_relative '../../../spec_helper'
 
 describe "Encoding::Converter#putback" do
   before :each do
     @ec = Encoding::Converter.new("EUC-JP", "ISO-8859-1")
-    @ret = @ec.primitive_convert(@src="abc\xa1def", @dst="", nil, 10)
+    @ret = @ec.primitive_convert(@src=+"abc\xa1def", @dst=+"", nil, 10)
   end
 
   it "returns a String" do
@@ -36,21 +36,21 @@
 
   it "returns the problematic bytes for UTF-16LE" do
     ec = Encoding::Converter.new("utf-16le", "iso-8859-1")
-    src = "\x00\xd8\x61\x00"
-    dst = ""
+    src = +"\x00\xd8\x61\x00"
+    dst = +""
     ec.primitive_convert(src, dst).should == :invalid_byte_sequence
     ec.primitive_errinfo.should == [:invalid_byte_sequence, "UTF-16LE", "UTF-8", "\x00\xD8", "a\x00"]
-    ec.putback.should == "a\x00".force_encoding("utf-16le")
+    ec.putback.should == "a\x00".dup.force_encoding("utf-16le")
     ec.putback.should == ""
   end
 
   it "accepts an integer argument corresponding to the number of bytes to be put back" do
     ec = Encoding::Converter.new("utf-16le", "iso-8859-1")
-    src = "\x00\xd8\x61\x00"
-    dst = ""
+    src = +"\x00\xd8\x61\x00"
+    dst = +""
     ec.primitive_convert(src, dst).should == :invalid_byte_sequence
     ec.primitive_errinfo.should == [:invalid_byte_sequence, "UTF-16LE", "UTF-8", "\x00\xD8", "a\x00"]
-    ec.putback(2).should == "a\x00".force_encoding("utf-16le")
+    ec.putback(2).should == "a\x00".dup.force_encoding("utf-16le")
     ec.putback.should == ""
   end
 end
diff --git a/spec/ruby/core/encoding/converter/replacement_spec.rb b/spec/ruby/core/encoding/converter/replacement_spec.rb
index 5ca42e7e5a0f3b..ea514ca8ddf79d 100644
--- a/spec/ruby/core/encoding/converter/replacement_spec.rb
+++ b/spec/ruby/core/encoding/converter/replacement_spec.rb
@@ -13,7 +13,7 @@
 
   it "returns \\uFFFD when the destination encoding is UTF-8" do
     ec = Encoding::Converter.new("us-ascii", "utf-8")
-    ec.replacement.should == "\u{fffd}".force_encoding('utf-8')
+    ec.replacement.should == "\u{fffd}".dup.force_encoding('utf-8')
     ec.replacement.encoding.should == Encoding::UTF_8
   end
 end
@@ -38,33 +38,33 @@
 
   it "sets #replacement" do
     ec = Encoding::Converter.new("us-ascii", "utf-8")
-    ec.replacement.should == "\u{fffd}".force_encoding('utf-8')
+    ec.replacement.should == "\u{fffd}".dup.force_encoding('utf-8')
     ec.replacement = '?'.encode('utf-8')
-    ec.replacement.should == '?'.force_encoding('utf-8')
+    ec.replacement.should == '?'.dup.force_encoding('utf-8')
   end
 
   it "raises an UndefinedConversionError is the argument cannot be converted into the destination encoding" do
     ec = Encoding::Converter.new("sjis", "ascii")
-    utf8_q = "\u{986}".force_encoding('utf-8')
-    ec.primitive_convert(utf8_q.dup, "").should == :undefined_conversion
+    utf8_q = "\u{986}".dup.force_encoding('utf-8')
+    ec.primitive_convert(utf8_q.dup, +"").should == :undefined_conversion
     -> { ec.replacement = utf8_q }.should \
       raise_error(Encoding::UndefinedConversionError)
   end
 
   it "does not change the replacement character if the argument cannot be converted into the destination encoding" do
     ec = Encoding::Converter.new("sjis", "ascii")
-    utf8_q = "\u{986}".force_encoding('utf-8')
-    ec.primitive_convert(utf8_q.dup, "").should == :undefined_conversion
+    utf8_q = "\u{986}".dup.force_encoding('utf-8')
+    ec.primitive_convert(utf8_q.dup, +"").should == :undefined_conversion
     -> { ec.replacement = utf8_q }.should \
       raise_error(Encoding::UndefinedConversionError)
-    ec.replacement.should == "?".force_encoding('us-ascii')
+    ec.replacement.should == "?".dup.force_encoding('us-ascii')
   end
 
   it "uses the replacement character" do
     ec = Encoding::Converter.new("utf-8", "us-ascii", :invalid => :replace, :undef => :replace)
     ec.replacement = "!"
-    dest = ""
-    status = ec.primitive_convert "中文123", dest
+    dest = +""
+    status = ec.primitive_convert(+"中文123", dest)
 
     status.should == :finished
     dest.should == "!!123"
diff --git a/spec/ruby/core/encoding/converter/search_convpath_spec.rb b/spec/ruby/core/encoding/converter/search_convpath_spec.rb
index 0882af5539d65c..59fe4520c05a2e 100644
--- a/spec/ruby/core/encoding/converter/search_convpath_spec.rb
+++ b/spec/ruby/core/encoding/converter/search_convpath_spec.rb
@@ -23,8 +23,8 @@
   end
 
   it "raises an Encoding::ConverterNotFoundError if no conversion path exists" do
-   -> do
-     Encoding::Converter.search_convpath(Encoding::BINARY, Encoding::Emacs_Mule)
-   end.should raise_error(Encoding::ConverterNotFoundError)
+    -> do
+      Encoding::Converter.search_convpath(Encoding::BINARY, Encoding::Emacs_Mule)
+    end.should raise_error(Encoding::ConverterNotFoundError)
   end
 end
diff --git a/spec/ruby/core/encoding/fixtures/classes.rb b/spec/ruby/core/encoding/fixtures/classes.rb
index 12e9a4f3485e9a..943865e8d862ec 100644
--- a/spec/ruby/core/encoding/fixtures/classes.rb
+++ b/spec/ruby/core/encoding/fixtures/classes.rb
@@ -1,4 +1,4 @@
-# -*- encoding: binary -*-
+# encoding: binary
 module EncodingSpecs
   class UndefinedConversionError
     def self.exception
diff --git a/spec/ruby/core/encoding/inspect_spec.rb b/spec/ruby/core/encoding/inspect_spec.rb
index 9a930b2a77608e..df96141db90498 100644
--- a/spec/ruby/core/encoding/inspect_spec.rb
+++ b/spec/ruby/core/encoding/inspect_spec.rb
@@ -5,9 +5,23 @@
     Encoding::UTF_8.inspect.should be_an_instance_of(String)
   end
 
-  it "returns #<Encoding:name> for a non-dummy encoding named 'name'" do
-    Encoding.list.to_a.reject {|e| e.dummy? }.each do |enc|
-      enc.inspect.should =~ /#<Encoding:#{enc.name}>/
+  ruby_version_is ""..."3.4" do
+    it "returns #<Encoding:name> for a non-dummy encoding named 'name'" do
+      Encoding.list.to_a.reject {|e| e.dummy? }.each do |enc|
+        enc.inspect.should =~ /#<Encoding:#{enc.name}>/
+      end
+    end
+  end
+
+  ruby_version_is "3.4" do
+    it "returns #<Encoding:name> for a non-dummy encoding named 'name'" do
+      Encoding.list.to_a.reject {|e| e.dummy? }.each do |enc|
+        if enc.name == "ASCII-8BIT"
+          enc.inspect.should == "#<Encoding:BINARY (ASCII-8BIT)>"
+        else
+          enc.inspect.should =~ /#<Encoding:#{enc.name}>/
+        end
+      end
     end
   end
 
diff --git a/spec/ruby/core/encoding/invalid_byte_sequence_error/error_bytes_spec.rb b/spec/ruby/core/encoding/invalid_byte_sequence_error/error_bytes_spec.rb
index d2fc360dce4fae..8b7e87960f8c59 100644
--- a/spec/ruby/core/encoding/invalid_byte_sequence_error/error_bytes_spec.rb
+++ b/spec/ruby/core/encoding/invalid_byte_sequence_error/error_bytes_spec.rb
@@ -1,4 +1,4 @@
-# -*- encoding: binary -*-
+# encoding: binary
 require_relative "../../../spec_helper"
 require_relative '../fixtures/classes'
 
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 94201a9b153470..83606f77b4d70b 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
@@ -1,4 +1,4 @@
-# -*- encoding: binary -*-
+# encoding: binary
 require_relative '../../../spec_helper'
 
 describe "Encoding::InvalidByteSequenceError#incomplete_input?" do
@@ -8,7 +8,7 @@
 
   it "returns true if #primitive_convert returned :incomplete_input for the same data" do
     ec = Encoding::Converter.new("EUC-JP", "ISO-8859-1")
-    ec.primitive_convert("\xA1",'').should == :incomplete_input
+    ec.primitive_convert(+"\xA1", +'').should == :incomplete_input
     begin
       ec.convert("\xA1")
     rescue Encoding::InvalidByteSequenceError => e
@@ -18,7 +18,7 @@
 
   it "returns false if #primitive_convert returned :invalid_byte_sequence for the same data" do
     ec = Encoding::Converter.new("ascii", "utf-8")
-    ec.primitive_convert("\xfffffffff",'').should == :invalid_byte_sequence
+    ec.primitive_convert(+"\xfffffffff", +'').should == :invalid_byte_sequence
     begin
       ec.convert("\xfffffffff")
     rescue Encoding::InvalidByteSequenceError => e
diff --git a/spec/ruby/core/encoding/invalid_byte_sequence_error/readagain_bytes_spec.rb b/spec/ruby/core/encoding/invalid_byte_sequence_error/readagain_bytes_spec.rb
index 9866310c250891..e5ad0a61bd716f 100644
--- a/spec/ruby/core/encoding/invalid_byte_sequence_error/readagain_bytes_spec.rb
+++ b/spec/ruby/core/encoding/invalid_byte_sequence_error/readagain_bytes_spec.rb
@@ -1,4 +1,4 @@
-# -*- encoding: binary -*-
+# encoding: binary
 require_relative "../../../spec_helper"
 require_relative '../fixtures/classes'
 
@@ -15,11 +15,11 @@
 
   it "returns the bytes to be read again" do
     @exception.readagain_bytes.size.should == 1
-    @exception.readagain_bytes.should == "a".force_encoding('binary')
+    @exception.readagain_bytes.should == "a".dup.force_encoding('binary')
     @exception.readagain_bytes.should == @errinfo[-1]
 
     @exception2.readagain_bytes.size.should == 1
-    @exception2.readagain_bytes.should == "\xFF".force_encoding('binary')
+    @exception2.readagain_bytes.should == "\xFF".dup.force_encoding('binary')
     @exception2.readagain_bytes.should == @errinfo2[-1]
   end
 
diff --git a/spec/ruby/core/encoding/replicate_spec.rb b/spec/ruby/core/encoding/replicate_spec.rb
index 498d03581ac6e5..2da998837f866b 100644
--- a/spec/ruby/core/encoding/replicate_spec.rb
+++ b/spec/ruby/core/encoding/replicate_spec.rb
@@ -1,4 +1,4 @@
-# -*- encoding: binary -*-
+# encoding: binary
 require_relative '../../spec_helper'
 
 describe "Encoding#replicate" do
@@ -18,8 +18,8 @@
       e.name.should == name
       Encoding.find(name).should == e
 
-      "a".force_encoding(e).valid_encoding?.should be_true
-      "\x80".force_encoding(e).valid_encoding?.should be_false
+      "a".dup.force_encoding(e).valid_encoding?.should be_true
+      "\x80".dup.force_encoding(e).valid_encoding?.should be_false
     end
 
     it "returns a replica of UTF-8" do
@@ -28,9 +28,9 @@
       e.name.should == name
       Encoding.find(name).should == e
 
-      "a".force_encoding(e).valid_encoding?.should be_true
-      "\u3042".force_encoding(e).valid_encoding?.should be_true
-      "\x80".force_encoding(e).valid_encoding?.should be_false
+      "a".dup.force_encoding(e).valid_encoding?.should be_true
+      "\u3042".dup.force_encoding(e).valid_encoding?.should be_true
+      "\x80".dup.force_encoding(e).valid_encoding?.should be_false
     end
 
     it "returns a replica of UTF-16BE" do
@@ -39,9 +39,9 @@
       e.name.should == name
       Encoding.find(name).should == e
 
-      "a".force_encoding(e).valid_encoding?.should be_false
-      "\x30\x42".force_encoding(e).valid_encoding?.should be_true
-      "\x80".force_encoding(e).valid_encoding?.should be_false
+      "a".dup.force_encoding(e).valid_encoding?.should be_false
+      "\x30\x42".dup.force_encoding(e).valid_encoding?.should be_true
+      "\x80".dup.force_encoding(e).valid_encoding?.should be_false
     end
 
     it "returns a replica of ISO-2022-JP" do
@@ -61,18 +61,23 @@
       e.name.should == name
       Encoding.find(name).should == e
 
-      s = "abc".force_encoding(e)
+      s = "abc".dup.force_encoding(e)
       s.encoding.should == e
       s.encoding.name.should == name
     end
   end
 
-  ruby_version_is "3.2"..."3.3" do
+  ruby_version_is ""..."3.3" do
     it "warns about deprecation" do
       -> {
         Encoding::US_ASCII.replicate('MY-US-ASCII')
       }.should complain(/warning: Encoding#replicate is deprecated and will be removed in Ruby 3.3; use the original encoding instead/)
     end
+
+    it "raises EncodingError if too many encodings" do
+      code = '1_000.times {|i| Encoding::US_ASCII.replicate("R_#{i}") }'
+      ruby_exe(code, args: "2>&1", exit_status: 1).should.include?('too many encoding (> 256) (EncodingError)')
+    end
   end
 
   ruby_version_is "3.3" do
diff --git a/spec/ruby/core/enumerable/collect_concat_spec.rb b/spec/ruby/core/enumerable/collect_concat_spec.rb
index 6e34c9eb939089..59317cfe341185 100644
--- a/spec/ruby/core/enumerable/collect_concat_spec.rb
+++ b/spec/ruby/core/enumerable/collect_concat_spec.rb
@@ -3,5 +3,5 @@
 require_relative 'shared/collect_concat'
 
 describe "Enumerable#collect_concat" do
-  it_behaves_like :enumerable_collect_concat , :collect_concat
+  it_behaves_like :enumerable_collect_concat, :collect_concat
 end
diff --git a/spec/ruby/core/enumerable/collect_spec.rb b/spec/ruby/core/enumerable/collect_spec.rb
index 1016b677982571..cfa2895cce21ce 100644
--- a/spec/ruby/core/enumerable/collect_spec.rb
+++ b/spec/ruby/core/enumerable/collect_spec.rb
@@ -3,5 +3,5 @@
 require_relative 'shared/collect'
 
 describe "Enumerable#collect" do
-  it_behaves_like :enumerable_collect , :collect
+  it_behaves_like :enumerable_collect, :collect
 end
diff --git a/spec/ruby/core/enumerable/compact_spec.rb b/spec/ruby/core/enumerable/compact_spec.rb
index 86e95dce085e96..1895430c4ed23f 100644
--- a/spec/ruby/core/enumerable/compact_spec.rb
+++ b/spec/ruby/core/enumerable/compact_spec.rb
@@ -1,11 +1,9 @@
 require_relative '../../spec_helper'
 require_relative 'fixtures/classes'
 
-ruby_version_is '3.1' do
-  describe "Enumerable#compact" do
-    it 'returns array without nil elements' do
-      arr = EnumerableSpecs::Numerous.new(nil, 1, 2, nil, true)
-      arr.compact.should == [1, 2, true]
-    end
+describe "Enumerable#compact" do
+  it 'returns array without nil elements' do
+    arr = EnumerableSpecs::Numerous.new(nil, 1, 2, nil, true)
+    arr.compact.should == [1, 2, true]
   end
 end
diff --git a/spec/ruby/core/enumerable/detect_spec.rb b/spec/ruby/core/enumerable/detect_spec.rb
index e912134fedadfe..6959aadc44b7db 100644
--- a/spec/ruby/core/enumerable/detect_spec.rb
+++ b/spec/ruby/core/enumerable/detect_spec.rb
@@ -3,5 +3,5 @@
 require_relative 'shared/find'
 
 describe "Enumerable#detect" do
-  it_behaves_like :enumerable_find , :detect
+  it_behaves_like :enumerable_find, :detect
 end
diff --git a/spec/ruby/core/enumerable/each_cons_spec.rb b/spec/ruby/core/enumerable/each_cons_spec.rb
index 8fb31fb9257738..ed77741862432e 100644
--- a/spec/ruby/core/enumerable/each_cons_spec.rb
+++ b/spec/ruby/core/enumerable/each_cons_spec.rb
@@ -56,10 +56,8 @@
     multi.each_cons(2).to_a.should == [[[1, 2], [3, 4, 5]], [[3, 4, 5], [6, 7, 8, 9]]]
   end
 
-  ruby_version_is "3.1" do
-    it "returns self when a block is given" do
-      @enum.each_cons(3){}.should == @enum
-    end
+  it "returns self when a block is given" do
+    @enum.each_cons(3){}.should == @enum
   end
 
   describe "when no block is given" do
diff --git a/spec/ruby/core/enumerable/each_slice_spec.rb b/spec/ruby/core/enumerable/each_slice_spec.rb
index a57a1dba81fbad..47b8c9ba334f1d 100644
--- a/spec/ruby/core/enumerable/each_slice_spec.rb
+++ b/spec/ruby/core/enumerable/each_slice_spec.rb
@@ -57,10 +57,8 @@
     e.to_a.should == @sliced
   end
 
-  ruby_version_is "3.1" do
-    it "returns self when a block is given" do
-      @enum.each_slice(3){}.should == @enum
-    end
+  it "returns self when a block is given" do
+    @enum.each_slice(3){}.should == @enum
   end
 
   it "gathers whole arrays as elements when each yields multiple" do
diff --git a/spec/ruby/core/enumerable/entries_spec.rb b/spec/ruby/core/enumerable/entries_spec.rb
index 83232cfa061bbf..2de4fc756a23a8 100644
--- a/spec/ruby/core/enumerable/entries_spec.rb
+++ b/spec/ruby/core/enumerable/entries_spec.rb
@@ -3,5 +3,5 @@
 require_relative 'shared/entries'
 
 describe "Enumerable#entries" do
-  it_behaves_like :enumerable_entries , :entries
+  it_behaves_like :enumerable_entries, :entries
 end
diff --git a/spec/ruby/core/enumerable/filter_spec.rb b/spec/ruby/core/enumerable/filter_spec.rb
index 7e4f8c0b505d1c..1c3a7e9ff59c0c 100644
--- a/spec/ruby/core/enumerable/filter_spec.rb
+++ b/spec/ruby/core/enumerable/filter_spec.rb
@@ -3,5 +3,5 @@
 require_relative 'shared/find_all'
 
 describe "Enumerable#filter" do
-  it_behaves_like(:enumerable_find_all , :filter)
+  it_behaves_like :enumerable_find_all, :filter
 end
diff --git a/spec/ruby/core/enumerable/find_all_spec.rb b/spec/ruby/core/enumerable/find_all_spec.rb
index ce9058fe772e37..9cd635f2470bb2 100644
--- a/spec/ruby/core/enumerable/find_all_spec.rb
+++ b/spec/ruby/core/enumerable/find_all_spec.rb
@@ -3,5 +3,5 @@
 require_relative 'shared/find_all'
 
 describe "Enumerable#find_all" do
-  it_behaves_like :enumerable_find_all , :find_all
+  it_behaves_like :enumerable_find_all, :find_all
 end
diff --git a/spec/ruby/core/enumerable/find_spec.rb b/spec/ruby/core/enumerable/find_spec.rb
index 25aa3bf1032643..5ddebc05f837ba 100644
--- a/spec/ruby/core/enumerable/find_spec.rb
+++ b/spec/ruby/core/enumerable/find_spec.rb
@@ -3,5 +3,5 @@
 require_relative 'shared/find'
 
 describe "Enumerable#find" do
-  it_behaves_like :enumerable_find , :find
+  it_behaves_like :enumerable_find, :find
 end
diff --git a/spec/ruby/core/enumerable/fixtures/classes.rb b/spec/ruby/core/enumerable/fixtures/classes.rb
index fb4951c6e626a0..b5feafcfb70fbb 100644
--- a/spec/ruby/core/enumerable/fixtures/classes.rb
+++ b/spec/ruby/core/enumerable/fixtures/classes.rb
@@ -38,12 +38,14 @@ def each(*arg)
   class Empty
     include Enumerable
     def each
+      self
     end
   end
 
   class EmptyWithSize
     include Enumerable
     def each
+      self
     end
     def size
       0
@@ -342,4 +344,7 @@ def ===(*args)
       @block.call(*args)
     end
   end
+
+  class SetSubclass < Set
+  end
 end # EnumerableSpecs utility classes
diff --git a/spec/ruby/core/enumerable/flat_map_spec.rb b/spec/ruby/core/enumerable/flat_map_spec.rb
index a294b9ddad26c8..bd07eab6c5c132 100644
--- a/spec/ruby/core/enumerable/flat_map_spec.rb
+++ b/spec/ruby/core/enumerable/flat_map_spec.rb
@@ -3,5 +3,5 @@
 require_relative 'shared/collect_concat'
 
 describe "Enumerable#flat_map" do
-  it_behaves_like :enumerable_collect_concat , :flat_map
+  it_behaves_like :enumerable_collect_concat, :flat_map
 end
diff --git a/spec/ruby/core/enumerable/map_spec.rb b/spec/ruby/core/enumerable/map_spec.rb
index d65aec238c0575..98a70781cfc7f0 100644
--- a/spec/ruby/core/enumerable/map_spec.rb
+++ b/spec/ruby/core/enumerable/map_spec.rb
@@ -3,5 +3,5 @@
 require_relative 'shared/collect'
 
 describe "Enumerable#map" do
-  it_behaves_like :enumerable_collect , :map
+  it_behaves_like :enumerable_collect, :map
 end
diff --git a/spec/ruby/core/enumerable/select_spec.rb b/spec/ruby/core/enumerable/select_spec.rb
index 11168eb42e25d6..7fc61926f9008a 100644
--- a/spec/ruby/core/enumerable/select_spec.rb
+++ b/spec/ruby/core/enumerable/select_spec.rb
@@ -3,5 +3,5 @@
 require_relative 'shared/find_all'
 
 describe "Enumerable#select" do
-  it_behaves_like :enumerable_find_all , :select
+  it_behaves_like :enumerable_find_all, :select
 end
diff --git a/spec/ruby/core/enumerable/shared/inject.rb b/spec/ruby/core/enumerable/shared/inject.rb
index 693d34d675d1aa..aae9e06c974fa0 100644
--- a/spec/ruby/core/enumerable/shared/inject.rb
+++ b/spec/ruby/core/enumerable/shared/inject.rb
@@ -16,6 +16,23 @@
 
   it "can take two argument" do
     EnumerableSpecs::Numerous.new(1, 2, 3).send(@method, 10, :-).should == 4
+    EnumerableSpecs::Numerous.new(1, 2, 3).send(@method, 10, "-").should == 4
+
+    [1, 2, 3].send(@method, 10, :-).should == 4
+    [1, 2, 3].send(@method, 10, "-").should == 4
+  end
+
+  it "converts non-Symbol method name argument to String with #to_str if two arguments" do
+    name = Object.new
+    def name.to_str; "-"; end
+
+    EnumerableSpecs::Numerous.new(1, 2, 3).send(@method, 10, name).should == 4
+    [1, 2, 3].send(@method, 10, name).should == 4
+  end
+
+  it "raises TypeError when the second argument is not Symbol or String and it cannot be converted to String if two arguments" do
+    -> { EnumerableSpecs::Numerous.new(1, 2, 3).send(@method, 10, Object.new) }.should raise_error(TypeError, /is not a symbol nor a string/)
+    -> { [1, 2, 3].send(@method, 10, Object.new) }.should raise_error(TypeError, /is not a symbol nor a string/)
   end
 
   it "ignores the block if two arguments" do
@@ -39,6 +56,25 @@
 
   it "can take a symbol argument" do
     EnumerableSpecs::Numerous.new(10, 1, 2, 3).send(@method, :-).should == 4
+    [10, 1, 2, 3].send(@method, :-).should == 4
+  end
+
+  it "can take a String argument" do
+    EnumerableSpecs::Numerous.new(10, 1, 2, 3).send(@method, "-").should == 4
+    [10, 1, 2, 3].send(@method, "-").should == 4
+  end
+
+  it "converts non-Symbol method name argument to String with #to_str" do
+    name = Object.new
+    def name.to_str; "-"; end
+
+    EnumerableSpecs::Numerous.new(10, 1, 2, 3).send(@method, name).should == 4
+    [10, 1, 2, 3].send(@method, name).should == 4
+  end
+
+  it "raises TypeError when passed not Symbol or String method name argument and it cannot be converted to String" do
+    -> { EnumerableSpecs::Numerous.new(10, 1, 2, 3).send(@method, Object.new) }.should raise_error(TypeError, /is not a symbol nor a string/)
+    -> { [10, 1, 2, 3].send(@method, Object.new) }.should raise_error(TypeError, /is not a symbol nor a string/)
   end
 
   it "without argument takes a block with an accumulator (with first element as initial value) and the current element. Value of block becomes new accumulator" do
@@ -77,7 +113,6 @@
     EnumerableSpecs::EachDefiner.new('a','b','c').send(@method) {|result, i| i+result}.should == "cba"
     EnumerableSpecs::EachDefiner.new(3, 4, 5).send(@method) {|result, i| result*i}.should == 60
     EnumerableSpecs::EachDefiner.new([1], 2, 'a','b').send(@method){|r,i| r<<i}.should == [1, 2, 'a', 'b']
-
   end
 
   it "returns nil when fails(legacy rubycon)" do
@@ -100,10 +135,8 @@
     actual.sort_by(&:to_s).should == expected.sort_by(&:to_s)
   end
 
-  ruby_bug '#18635', ''...'3.2' do
-    it "raises an ArgumentError when no parameters or block is given" do
-      -> { [1,2].send(@method) }.should raise_error(ArgumentError)
-      -> { {one: 1, two: 2}.send(@method) }.should raise_error(ArgumentError)
-    end
+  it "raises an ArgumentError when no parameters or block is given" do
+    -> { [1,2].send(@method) }.should raise_error(ArgumentError)
+    -> { {one: 1, two: 2}.send(@method) }.should raise_error(ArgumentError)
   end
 end
diff --git a/spec/ruby/core/enumerable/tally_spec.rb b/spec/ruby/core/enumerable/tally_spec.rb
index e0edc8dc7503ab..95c64c12949505 100644
--- a/spec/ruby/core/enumerable/tally_spec.rb
+++ b/spec/ruby/core/enumerable/tally_spec.rb
@@ -32,62 +32,60 @@
   end
 end
 
-ruby_version_is "3.1" do
-  describe "Enumerable#tally with a hash" do
-    before :each do
-      ScratchPad.record []
-    end
-
-    it "returns a hash with counts according to the value" do
-      enum = EnumerableSpecs::Numerous.new('foo', 'bar', 'foo', 'baz')
-      enum.tally({ 'foo' => 1 }).should == { 'foo' => 3, 'bar' => 1, 'baz' => 1}
-    end
-
-    it "returns the given hash" do
-      enum = EnumerableSpecs::Numerous.new('foo', 'bar', 'foo', 'baz')
-      hash = { 'foo' => 1 }
-      enum.tally(hash).should equal(hash)
-    end
-
-    it "calls #to_hash to convert argument to Hash implicitly if passed not a Hash" do
-      enum = EnumerableSpecs::Numerous.new('foo', 'bar', 'foo', 'baz')
-      object = Object.new
-      def object.to_hash; { 'foo' => 1 }; end
-      enum.tally(object).should == { 'foo' => 3, 'bar' => 1, 'baz' => 1}
-    end
-
-    it "raises a FrozenError and does not update the given hash when the hash is frozen" do
-      enum = EnumerableSpecs::Numerous.new('foo', 'bar', 'foo', 'baz')
-      hash = { 'foo' => 1 }.freeze
-      -> { enum.tally(hash) }.should raise_error(FrozenError)
-      hash.should == { 'foo' => 1 }
-    end
-
-    it "raises a FrozenError even if enumerable is empty" do
-      enum = EnumerableSpecs::Numerous.new()
-      hash = { 'foo' => 1 }.freeze
-      -> { enum.tally(hash) }.should raise_error(FrozenError)
-    end
-
-    it "does not call given block" do
-      enum = EnumerableSpecs::Numerous.new('foo', 'bar', 'foo', 'baz')
-      enum.tally({ 'foo' => 1 }) { |v| ScratchPad << v }
-      ScratchPad.recorded.should == []
-    end
-
-    it "ignores the default value" do
-      enum = EnumerableSpecs::Numerous.new('foo', 'bar', 'foo', 'baz')
-      enum.tally(Hash.new(100)).should == { 'foo' => 2, 'bar' => 1, 'baz' => 1}
-    end
-
-    it "ignores the default proc" do
-      enum = EnumerableSpecs::Numerous.new('foo', 'bar', 'foo', 'baz')
-      enum.tally(Hash.new {100}).should == { 'foo' => 2, 'bar' => 1, 'baz' => 1}
-    end
-
-    it "needs the values counting each elements to be an integer" do
-      enum = EnumerableSpecs::Numerous.new('foo')
-      -> { enum.tally({ 'foo' => 'bar' }) }.should raise_error(TypeError)
-    end
+describe "Enumerable#tally with a hash" do
+  before :each do
+    ScratchPad.record []
+  end
+
+  it "returns a hash with counts according to the value" do
+    enum = EnumerableSpecs::Numerous.new('foo', 'bar', 'foo', 'baz')
+    enum.tally({ 'foo' => 1 }).should == { 'foo' => 3, 'bar' => 1, 'baz' => 1}
+  end
+
+  it "returns the given hash" do
+    enum = EnumerableSpecs::Numerous.new('foo', 'bar', 'foo', 'baz')
+    hash = { 'foo' => 1 }
+    enum.tally(hash).should equal(hash)
+  end
+
+  it "calls #to_hash to convert argument to Hash implicitly if passed not a Hash" do
+    enum = EnumerableSpecs::Numerous.new('foo', 'bar', 'foo', 'baz')
+    object = Object.new
+    def object.to_hash; { 'foo' => 1 }; end
+    enum.tally(object).should == { 'foo' => 3, 'bar' => 1, 'baz' => 1}
+  end
+
+  it "raises a FrozenError and does not update the given hash when the hash is frozen" do
+    enum = EnumerableSpecs::Numerous.new('foo', 'bar', 'foo', 'baz')
+    hash = { 'foo' => 1 }.freeze
+    -> { enum.tally(hash) }.should raise_error(FrozenError)
+    hash.should == { 'foo' => 1 }
+  end
+
+  it "raises a FrozenError even if enumerable is empty" do
+    enum = EnumerableSpecs::Numerous.new()
+    hash = { 'foo' => 1 }.freeze
+    -> { enum.tally(hash) }.should raise_error(FrozenError)
+  end
+
+  it "does not call given block" do
+    enum = EnumerableSpecs::Numerous.new('foo', 'bar', 'foo', 'baz')
+    enum.tally({ 'foo' => 1 }) { |v| ScratchPad << v }
+    ScratchPad.recorded.should == []
+  end
+
+  it "ignores the default value" do
+    enum = EnumerableSpecs::Numerous.new('foo', 'bar', 'foo', 'baz')
+    enum.tally(Hash.new(100)).should == { 'foo' => 2, 'bar' => 1, 'baz' => 1}
+  end
+
+  it "ignores the default proc" do
+    enum = EnumerableSpecs::Numerous.new('foo', 'bar', 'foo', 'baz')
+    enum.tally(Hash.new {100}).should == { 'foo' => 2, 'bar' => 1, 'baz' => 1}
+  end
+
+  it "needs the values counting each elements to be an integer" do
+    enum = EnumerableSpecs::Numerous.new('foo')
+    -> { enum.tally({ 'foo' => 'bar' }) }.should raise_error(TypeError)
   end
 end
diff --git a/spec/ruby/core/enumerable/to_a_spec.rb b/spec/ruby/core/enumerable/to_a_spec.rb
index 0f3060dc483d85..723f9225740c8e 100644
--- a/spec/ruby/core/enumerable/to_a_spec.rb
+++ b/spec/ruby/core/enumerable/to_a_spec.rb
@@ -3,5 +3,5 @@
 require_relative 'shared/entries'
 
 describe "Enumerable#to_a" do
-  it_behaves_like :enumerable_entries , :to_a
+  it_behaves_like :enumerable_entries, :to_a
 end
diff --git a/spec/ruby/core/enumerable/to_h_spec.rb b/spec/ruby/core/enumerable/to_h_spec.rb
index 0489134552ef45..11a4933c10c453 100644
--- a/spec/ruby/core/enumerable/to_h_spec.rb
+++ b/spec/ruby/core/enumerable/to_h_spec.rb
@@ -53,6 +53,14 @@ def enum.each(*args)
       @enum.to_h { |k| [k, k.to_s] }.should == { a: 'a', b: 'b' }
     end
 
+    it "passes to a block each element as a single argument" do
+      enum_of_arrays = EnumerableSpecs::EachDefiner.new([:a, 1], [:b, 2])
+
+      ScratchPad.record []
+      enum_of_arrays.to_h { |*args| ScratchPad << args; [args[0], args[1]] }
+      ScratchPad.recorded.sort.should == [[[:a, 1]], [[:b, 2]]]
+    end
+
     it "raises ArgumentError if block returns longer or shorter array" do
       -> do
         @enum.to_h { |k| [k, k.to_s, 1] }
diff --git a/spec/ruby/core/enumerable/to_set_spec.rb b/spec/ruby/core/enumerable/to_set_spec.rb
new file mode 100644
index 00000000000000..e0437fea613bd9
--- /dev/null
+++ b/spec/ruby/core/enumerable/to_set_spec.rb
@@ -0,0 +1,38 @@
+require_relative '../../spec_helper'
+require_relative 'fixtures/classes'
+
+describe "Enumerable#to_set" do
+  it "returns a new Set created from self" do
+    [1, 2, 3].to_set.should == Set[1, 2, 3]
+    {a: 1, b: 2}.to_set.should == Set[[:b, 2], [:a, 1]]
+  end
+
+  it "passes down passed blocks" do
+    [1, 2, 3].to_set { |x| x * x }.should == Set[1, 4, 9]
+  end
+
+  ruby_version_is "3.5" do
+    it "instantiates an object of provided as the first argument set class" do
+      set = nil
+      proc{set = [1, 2, 3].to_set(EnumerableSpecs::SetSubclass)}.should complain(/Enumerable#to_set/)
+      set.should be_kind_of(EnumerableSpecs::SetSubclass)
+      set.to_a.sort.should == [1, 2, 3]
+    end
+  end
+
+  ruby_version_is ""..."3.5" do
+    it "instantiates an object of provided as the first argument set class" do
+      set = [1, 2, 3].to_set(EnumerableSpecs::SetSubclass)
+      set.should be_kind_of(EnumerableSpecs::SetSubclass)
+      set.to_a.sort.should == [1, 2, 3]
+    end
+  end
+
+  it "does not need explicit `require 'set'`" do
+    output = ruby_exe(<<~RUBY, options: '--disable-gems', args: '2>&1')
+      puts [1, 2, 3].to_set.to_a.inspect
+    RUBY
+
+    output.chomp.should == "[1, 2, 3]"
+  end
+end
diff --git a/spec/ruby/core/enumerator/each_with_index_spec.rb b/spec/ruby/core/enumerator/each_with_index_spec.rb
index 96e53a2804c0c6..4898e86fa9c643 100644
--- a/spec/ruby/core/enumerator/each_with_index_spec.rb
+++ b/spec/ruby/core/enumerator/each_with_index_spec.rb
@@ -1,5 +1,5 @@
 require_relative '../../spec_helper'
-require_relative '../../shared/enumerator/with_index'
+require_relative 'shared/with_index'
 require_relative '../enumerable/shared/enumeratorized'
 
 describe "Enumerator#each_with_index" do
@@ -21,16 +21,16 @@
 
   it "passes on the given block's return value" do
     arr = [1,2,3]
-    arr.delete_if.with_index { |a,b| false }
+    arr.delete_if.each_with_index { |a,b| false }
     arr.should == [1,2,3]
   end
 
   it "returns the iterator's return value" do
-    [1,2,3].select.with_index { |a,b| false }.should == []
+    [1,2,3].select.each_with_index { |a,b| false }.should == []
+    [1,2,3].select.each_with_index { |a,b| true }.should == [1,2,3]
   end
 
   it "returns the correct value if chained with itself" do
     [:a].each_with_index.each_with_index.to_a.should == [[[:a,0],0]]
-    [:a].each.with_index.with_index.to_a.should == [[[:a,0],0]]
   end
 end
diff --git a/spec/ruby/core/enumerator/each_with_object_spec.rb b/spec/ruby/core/enumerator/each_with_object_spec.rb
index 68524dc74af65a..84a45ae89dfc50 100644
--- a/spec/ruby/core/enumerator/each_with_object_spec.rb
+++ b/spec/ruby/core/enumerator/each_with_object_spec.rb
@@ -1,5 +1,5 @@
 require_relative '../../spec_helper'
-require_relative '../../shared/enumerator/with_object'
+require_relative 'shared/with_object'
 
 describe "Enumerator#each_with_object" do
   it_behaves_like :enum_with_object, :each_with_object
diff --git a/spec/ruby/core/enumerator/enum_for_spec.rb b/spec/ruby/core/enumerator/enum_for_spec.rb
index fd33f463bfeb12..fbdf98545a964d 100644
--- a/spec/ruby/core/enumerator/enum_for_spec.rb
+++ b/spec/ruby/core/enumerator/enum_for_spec.rb
@@ -1,5 +1,5 @@
 require_relative '../../spec_helper'
-require_relative '../../shared/enumerator/enum_for'
+require_relative 'shared/enum_for'
 
 describe "Enumerator#enum_for" do
   it_behaves_like :enum_for, :enum_for
diff --git a/spec/ruby/fixtures/enumerator/classes.rb b/spec/ruby/core/enumerator/fixtures/classes.rb
similarity index 100%
rename from spec/ruby/fixtures/enumerator/classes.rb
rename to spec/ruby/core/enumerator/fixtures/classes.rb
diff --git a/spec/ruby/core/enumerator/lazy/compact_spec.rb b/spec/ruby/core/enumerator/lazy/compact_spec.rb
index e678bc71eb9836..65c544f0629bbc 100644
--- a/spec/ruby/core/enumerator/lazy/compact_spec.rb
+++ b/spec/ruby/core/enumerator/lazy/compact_spec.rb
@@ -1,16 +1,14 @@
 require_relative '../../../spec_helper'
 require_relative 'fixtures/classes'
 
-ruby_version_is '3.1' do
-  describe "Enumerator::Lazy#compact" do
-    it 'returns array without nil elements' do
-      arr = [1, nil, 3, false, 5].to_enum.lazy.compact
-      arr.should be_an_instance_of(Enumerator::Lazy)
-      arr.force.should == [1, 3, false, 5]
-    end
+describe "Enumerator::Lazy#compact" do
+  it 'returns array without nil elements' do
+    arr = [1, nil, 3, false, 5].to_enum.lazy.compact
+    arr.should be_an_instance_of(Enumerator::Lazy)
+    arr.force.should == [1, 3, false, 5]
+  end
 
-    it "sets #size to nil" do
-      Enumerator::Lazy.new(Object.new, 100) {}.compact.size.should == nil
-    end
+  it "sets #size to nil" do
+    Enumerator::Lazy.new(Object.new, 100) {}.compact.size.should == nil
   end
 end
diff --git a/spec/ruby/core/enumerator/lazy/lazy_spec.rb b/spec/ruby/core/enumerator/lazy/lazy_spec.rb
index 0fb104e25ab7cf..b43864b6739905 100644
--- a/spec/ruby/core/enumerator/lazy/lazy_spec.rb
+++ b/spec/ruby/core/enumerator/lazy/lazy_spec.rb
@@ -9,16 +9,11 @@
 
   it "defines lazy versions of a whitelist of Enumerator methods" do
     lazy_methods = [
-      :chunk, :collect, :collect_concat, :drop, :drop_while, :enum_for,
+      :chunk, :chunk_while, :collect, :collect_concat, :compact, :drop, :drop_while, :enum_for,
       :find_all, :flat_map, :force, :grep, :grep_v, :lazy, :map, :reject,
       :select, :slice_after, :slice_before, :slice_when, :take, :take_while,
-      :to_enum, :zip
+      :to_enum, :uniq, :zip
     ]
-    lazy_methods += [:chunk_while, :uniq]
-
-    ruby_version_is '3.1' do
-      lazy_methods += [:compact]
-    end
 
     Enumerator::Lazy.instance_methods(false).should include(*lazy_methods)
   end
diff --git a/spec/ruby/core/enumerator/next_values_spec.rb b/spec/ruby/core/enumerator/next_values_spec.rb
index 201b5d323ffbf8..2202700c588832 100644
--- a/spec/ruby/core/enumerator/next_values_spec.rb
+++ b/spec/ruby/core/enumerator/next_values_spec.rb
@@ -11,6 +11,7 @@ def o.each
       yield :e1, :e2, :e3
       yield nil
       yield
+      yield [:f1, :f2]
     end
 
     @e = o.to_enum
@@ -48,8 +49,13 @@ def o.each
     @e.next_values.should == []
   end
 
-  it "raises StopIteration if called on a finished enumerator" do
+  it "returns an array of array if yield is called with an array" do
     7.times { @e.next }
+    @e.next_values.should == [[:f1, :f2]]
+  end
+
+  it "raises StopIteration if called on a finished enumerator" do
+    8.times { @e.next }
     -> { @e.next_values }.should raise_error(StopIteration)
   end
 end
diff --git a/spec/ruby/core/enumerator/peek_values_spec.rb b/spec/ruby/core/enumerator/peek_values_spec.rb
index 7865546515d460..8b84fc8afcde8f 100644
--- a/spec/ruby/core/enumerator/peek_values_spec.rb
+++ b/spec/ruby/core/enumerator/peek_values_spec.rb
@@ -11,6 +11,7 @@ def o.each
       yield :e1, :e2, :e3
       yield nil
       yield
+      yield [:f1, :f2]
     end
 
     @e = o.to_enum
@@ -50,8 +51,13 @@ def o.each
     @e.peek_values.should == []
   end
 
-  it "raises StopIteration if called on a finished enumerator" do
+  it "returns an array of array if yield is called with an array" do
     7.times { @e.next }
+    @e.peek_values.should == [[:f1, :f2]]
+  end
+
+  it "raises StopIteration if called on a finished enumerator" do
+    8.times { @e.next }
     -> { @e.peek_values }.should raise_error(StopIteration)
   end
 end
diff --git a/spec/ruby/core/enumerator/product/each_spec.rb b/spec/ruby/core/enumerator/product/each_spec.rb
index 868a1ea6bf498e..88f115a7124bdb 100644
--- a/spec/ruby/core/enumerator/product/each_spec.rb
+++ b/spec/ruby/core/enumerator/product/each_spec.rb
@@ -1,73 +1,71 @@
 require_relative '../../../spec_helper'
 require_relative '../../enumerable/shared/enumeratorized'
 
-ruby_version_is "3.2" do
-  describe "Enumerator::Product#each" do
-    it_behaves_like :enumeratorized_with_origin_size, :each, Enumerator::Product.new([1, 2], [:a, :b])
+describe "Enumerator::Product#each" do
+  it_behaves_like :enumeratorized_with_origin_size, :each, Enumerator::Product.new([1, 2], [:a, :b])
 
-    it "yields each element of Cartesian product of enumerators" do
-      enum = Enumerator::Product.new([1, 2], [:a, :b])
-      acc = []
-      enum.each { |e| acc << e }
-      acc.should == [[1, :a], [1, :b], [2, :a], [2, :b]]
-    end
-
-    it "calls #each_entry method on enumerators" do
-      object1 = Object.new
-      def object1.each_entry
-        yield 1
-        yield 2
-      end
-
-      object2 = Object.new
-      def object2.each_entry
-        yield :a
-        yield :b
-      end
+  it "yields each element of Cartesian product of enumerators" do
+    enum = Enumerator::Product.new([1, 2], [:a, :b])
+    acc = []
+    enum.each { |e| acc << e }
+    acc.should == [[1, :a], [1, :b], [2, :a], [2, :b]]
+  end
 
-      enum = Enumerator::Product.new(object1, object2)
-      acc = []
-      enum.each { |e| acc << e }
-      acc.should == [[1, :a], [1, :b], [2, :a], [2, :b]]
+  it "calls #each_entry method on enumerators" do
+    object1 = Object.new
+    def object1.each_entry
+      yield 1
+      yield 2
     end
 
-    it "raises a NoMethodError if the object doesn't respond to #each_entry" do
-      -> {
-        Enumerator::Product.new(Object.new).each {}
-      }.should raise_error(NoMethodError, /undefined method `each_entry' for/)
+    object2 = Object.new
+    def object2.each_entry
+      yield :a
+      yield :b
     end
 
-    it "returns enumerator if not given a block" do
-      enum = Enumerator::Product.new([1, 2], [:a, :b])
-      enum.each.should.kind_of?(Enumerator)
+    enum = Enumerator::Product.new(object1, object2)
+    acc = []
+    enum.each { |e| acc << e }
+    acc.should == [[1, :a], [1, :b], [2, :a], [2, :b]]
+  end
 
-      enum = Enumerator::Product.new([1, 2], [:a, :b])
-      enum.each.to_a.should == [[1, :a], [1, :b], [2, :a], [2, :b]]
-    end
+  it "raises a NoMethodError if the object doesn't respond to #each_entry" do
+    -> {
+      Enumerator::Product.new(Object.new).each {}
+    }.should raise_error(NoMethodError, /undefined method [`']each_entry' for/)
+  end
 
-    it "returns self if given a block" do
-      enum = Enumerator::Product.new([1, 2], [:a, :b])
-      enum.each {}.should.equal?(enum)
-    end
+  it "returns enumerator if not given a block" do
+    enum = Enumerator::Product.new([1, 2], [:a, :b])
+    enum.each.should.kind_of?(Enumerator)
 
-    it "doesn't accept arguments" do
-      Enumerator::Product.instance_method(:each).arity.should == 0
-    end
+    enum = Enumerator::Product.new([1, 2], [:a, :b])
+    enum.each.to_a.should == [[1, :a], [1, :b], [2, :a], [2, :b]]
+  end
 
-    it "yields each element to a block that takes multiple arguments" do
-      enum = Enumerator::Product.new([1, 2], [:a, :b])
+  it "returns self if given a block" do
+    enum = Enumerator::Product.new([1, 2], [:a, :b])
+    enum.each {}.should.equal?(enum)
+  end
 
-      acc = []
-      enum.each { |x, y| acc << x }
-      acc.should == [1, 1, 2, 2]
+  it "doesn't accept arguments" do
+    Enumerator::Product.instance_method(:each).arity.should == 0
+  end
 
-      acc = []
-      enum.each { |x, y| acc << y }
-      acc.should == [:a, :b, :a, :b]
+  it "yields each element to a block that takes multiple arguments" do
+    enum = Enumerator::Product.new([1, 2], [:a, :b])
 
-      acc = []
-      enum.each { |x, y, z| acc << z }
-      acc.should == [nil, nil, nil, nil]
-    end
+    acc = []
+    enum.each { |x, y| acc << x }
+    acc.should == [1, 1, 2, 2]
+
+    acc = []
+    enum.each { |x, y| acc << y }
+    acc.should == [:a, :b, :a, :b]
+
+    acc = []
+    enum.each { |x, y, z| acc << z }
+    acc.should == [nil, nil, nil, nil]
   end
 end
diff --git a/spec/ruby/core/enumerator/product/initialize_copy_spec.rb b/spec/ruby/core/enumerator/product/initialize_copy_spec.rb
index 46e8421322a563..b1b9f3ca9b91ea 100644
--- a/spec/ruby/core/enumerator/product/initialize_copy_spec.rb
+++ b/spec/ruby/core/enumerator/product/initialize_copy_spec.rb
@@ -1,54 +1,52 @@
 require_relative '../../../spec_helper'
 
-ruby_version_is "3.2" do
-  describe "Enumerator::Product#initialize_copy" do
-    it "replaces content of the receiver with content of the other object" do
-      enum = Enumerator::Product.new([true, false])
-      enum2 = Enumerator::Product.new([1, 2], [:a, :b])
+describe "Enumerator::Product#initialize_copy" do
+  it "replaces content of the receiver with content of the other object" do
+    enum = Enumerator::Product.new([true, false])
+    enum2 = Enumerator::Product.new([1, 2], [:a, :b])
 
-      enum.send(:initialize_copy, enum2)
-      enum.each.to_a.should == [[1, :a], [1, :b], [2, :a], [2, :b]]
-    end
+    enum.send(:initialize_copy, enum2)
+    enum.each.to_a.should == [[1, :a], [1, :b], [2, :a], [2, :b]]
+  end
 
-    it "returns self" do
-      enum = Enumerator::Product.new([true, false])
-      enum2 = Enumerator::Product.new([1, 2], [:a, :b])
+  it "returns self" do
+    enum = Enumerator::Product.new([true, false])
+    enum2 = Enumerator::Product.new([1, 2], [:a, :b])
 
-      enum.send(:initialize_copy, enum2).should.equal?(enum)
-    end
+    enum.send(:initialize_copy, enum2).should.equal?(enum)
+  end
 
-    it "is a private method" do
-      Enumerator::Product.should have_private_instance_method(:initialize_copy, false)
-    end
+  it "is a private method" do
+    Enumerator::Product.should have_private_instance_method(:initialize_copy, false)
+  end
 
-    it "does nothing if the argument is the same as the receiver" do
-      enum = Enumerator::Product.new(1..2)
-      enum.send(:initialize_copy, enum).should.equal?(enum)
+  it "does nothing if the argument is the same as the receiver" do
+    enum = Enumerator::Product.new(1..2)
+    enum.send(:initialize_copy, enum).should.equal?(enum)
 
-      enum.freeze
-      enum.send(:initialize_copy, enum).should.equal?(enum)
-    end
+    enum.freeze
+    enum.send(:initialize_copy, enum).should.equal?(enum)
+  end
 
-    it "raises FrozenError if the receiver is frozen" do
-      enum = Enumerator::Product.new(1..2)
-      enum2 = Enumerator::Product.new(3..4)
+  it "raises FrozenError if the receiver is frozen" do
+    enum = Enumerator::Product.new(1..2)
+    enum2 = Enumerator::Product.new(3..4)
 
-      -> { enum.freeze.send(:initialize_copy, enum2) }.should raise_error(FrozenError)
-    end
+    -> { enum.freeze.send(:initialize_copy, enum2) }.should raise_error(FrozenError)
+  end
 
-    it "raises TypeError if the objects are of different class" do
-      enum = Enumerator::Product.new(1..2)
-      enum2 = Class.new(Enumerator::Product).new(3..4)
+  it "raises TypeError if the objects are of different class" do
+    enum = Enumerator::Product.new(1..2)
+    enum2 = Class.new(Enumerator::Product).new(3..4)
 
-      -> { enum.send(:initialize_copy, enum2) }.should raise_error(TypeError, 'initialize_copy should take same class object')
-      -> { enum2.send(:initialize_copy, enum) }.should raise_error(TypeError, 'initialize_copy should take same class object')
-    end
+    -> { enum.send(:initialize_copy, enum2) }.should raise_error(TypeError, 'initialize_copy should take same class object')
+    -> { enum2.send(:initialize_copy, enum) }.should raise_error(TypeError, 'initialize_copy should take same class object')
+  end
 
-    it "raises ArgumentError if the argument is not initialized yet" do
-      enum = Enumerator::Product.new(1..2)
-      enum2 = Enumerator::Product.allocate
+  it "raises ArgumentError if the argument is not initialized yet" do
+    enum = Enumerator::Product.new(1..2)
+    enum2 = Enumerator::Product.allocate
 
-      -> { enum.send(:initialize_copy, enum2) }.should raise_error(ArgumentError, 'uninitialized product')
-    end
+    -> { enum.send(:initialize_copy, enum2) }.should raise_error(ArgumentError, 'uninitialized product')
   end
 end
diff --git a/spec/ruby/core/enumerator/product/initialize_spec.rb b/spec/ruby/core/enumerator/product/initialize_spec.rb
index 4b60564240436b..ed2a8a2a1350c6 100644
--- a/spec/ruby/core/enumerator/product/initialize_spec.rb
+++ b/spec/ruby/core/enumerator/product/initialize_spec.rb
@@ -1,33 +1,31 @@
 require_relative '../../../spec_helper'
 
-ruby_version_is "3.2" do
-  describe "Enumerator::Product#initialize" do
-    before :each do
-      @uninitialized = Enumerator::Product.allocate
-    end
+describe "Enumerator::Product#initialize" do
+  before :each do
+    @uninitialized = Enumerator::Product.allocate
+  end
 
-    it "is a private method" do
-      Enumerator::Product.should have_private_instance_method(:initialize, false)
-    end
+  it "is a private method" do
+    Enumerator::Product.should have_private_instance_method(:initialize, false)
+  end
 
-    it "returns self" do
-      @uninitialized.send(:initialize).should equal(@uninitialized)
-    end
+  it "returns self" do
+    @uninitialized.send(:initialize).should equal(@uninitialized)
+  end
 
-    it "accepts many arguments" do
-      @uninitialized.send(:initialize, 0..1, 2..3, 4..5).should equal(@uninitialized)
-    end
+  it "accepts many arguments" do
+    @uninitialized.send(:initialize, 0..1, 2..3, 4..5).should equal(@uninitialized)
+  end
 
-    it "accepts arguments that are not Enumerable nor responding to :each_entry" do
-      @uninitialized.send(:initialize, Object.new).should equal(@uninitialized)
-    end
+  it "accepts arguments that are not Enumerable nor responding to :each_entry" do
+    @uninitialized.send(:initialize, Object.new).should equal(@uninitialized)
+  end
 
-    describe "on frozen instance" do
-      it "raises a FrozenError" do
-        -> {
-          @uninitialized.freeze.send(:initialize, 0..1)
-        }.should raise_error(FrozenError)
-      end
+  describe "on frozen instance" do
+    it "raises a FrozenError" do
+      -> {
+        @uninitialized.freeze.send(:initialize, 0..1)
+      }.should raise_error(FrozenError)
     end
   end
 end
diff --git a/spec/ruby/core/enumerator/product/inspect_spec.rb b/spec/ruby/core/enumerator/product/inspect_spec.rb
index 1ea8e9c49b6f43..e0d7441f2677aa 100644
--- a/spec/ruby/core/enumerator/product/inspect_spec.rb
+++ b/spec/ruby/core/enumerator/product/inspect_spec.rb
@@ -1,22 +1,20 @@
 require_relative '../../../spec_helper'
 
-ruby_version_is "3.2" do
-  describe "Enumerator::Product#inspect" do
-    it "returns a String including enumerators" do
-      enum = Enumerator::Product.new([1, 2], [:a, :b])
-      enum.inspect.should == "#<Enumerator::Product: [[1, 2], [:a, :b]]>"
-    end
+describe "Enumerator::Product#inspect" do
+  it "returns a String including enumerators" do
+    enum = Enumerator::Product.new([1, 2], [:a, :b])
+    enum.inspect.should == "#<Enumerator::Product: [[1, 2], [:a, :b]]>"
+  end
 
-    it "represents a recursive element with '[...]'" do
-      enum = [1, 2]
-      enum_recursive = Enumerator::Product.new(enum)
+  it "represents a recursive element with '[...]'" do
+    enum = [1, 2]
+    enum_recursive = Enumerator::Product.new(enum)
 
-      enum << enum_recursive
-      enum_recursive.inspect.should == "#<Enumerator::Product: [[1, 2, #<Enumerator::Product: ...>]]>"
-    end
+    enum << enum_recursive
+    enum_recursive.inspect.should == "#<Enumerator::Product: [[1, 2, #<Enumerator::Product: ...>]]>"
+  end
 
-    it "returns a not initialized representation if #initialized is not called yet" do
-      Enumerator::Product.allocate.inspect.should == "#<Enumerator::Product: uninitialized>"
-    end
+  it "returns a not initialized representation if #initialized is not called yet" do
+    Enumerator::Product.allocate.inspect.should == "#<Enumerator::Product: uninitialized>"
   end
 end
diff --git a/spec/ruby/core/enumerator/product/rewind_spec.rb b/spec/ruby/core/enumerator/product/rewind_spec.rb
index e8ee7302397cb0..2beffaf5c170a7 100644
--- a/spec/ruby/core/enumerator/product/rewind_spec.rb
+++ b/spec/ruby/core/enumerator/product/rewind_spec.rb
@@ -1,64 +1,62 @@
 require_relative '../../../spec_helper'
 
-ruby_version_is "3.2" do
-  describe "Enumerator::Product#rewind" do
-    before :each do
-      @enum = Enumerator::Product.new([1, 2].each.to_enum, [:a, :b].each.to_enum)
-    end
+describe "Enumerator::Product#rewind" do
+  before :each do
+    @enum = Enumerator::Product.new([1, 2].each.to_enum, [:a, :b].each.to_enum)
+  end
 
-    it "resets the enumerator to its initial state" do
-      @enum.each.to_a.should == [[1, :a], [1, :b], [2, :a], [2, :b]]
-      @enum.rewind
-      @enum.each.to_a.should == [[1, :a], [1, :b], [2, :a], [2, :b]]
-    end
+  it "resets the enumerator to its initial state" do
+    @enum.each.to_a.should == [[1, :a], [1, :b], [2, :a], [2, :b]]
+    @enum.rewind
+    @enum.each.to_a.should == [[1, :a], [1, :b], [2, :a], [2, :b]]
+  end
 
-    it "returns self" do
-      @enum.rewind.should.equal? @enum
-    end
+  it "returns self" do
+    @enum.rewind.should.equal? @enum
+  end
 
-    it "has no effect on a new enumerator" do
-      @enum.rewind
-      @enum.each.to_a.should == [[1, :a], [1, :b], [2, :a], [2, :b]]
-    end
+  it "has no effect on a new enumerator" do
+    @enum.rewind
+    @enum.each.to_a.should == [[1, :a], [1, :b], [2, :a], [2, :b]]
+  end
 
-    it "has no effect if called multiple, consecutive times" do
-      @enum.each.to_a.should == [[1, :a], [1, :b], [2, :a], [2, :b]]
-      @enum.rewind
-      @enum.rewind
-      @enum.each.to_a.should == [[1, :a], [1, :b], [2, :a], [2, :b]]
-    end
+  it "has no effect if called multiple, consecutive times" do
+    @enum.each.to_a.should == [[1, :a], [1, :b], [2, :a], [2, :b]]
+    @enum.rewind
+    @enum.rewind
+    @enum.each.to_a.should == [[1, :a], [1, :b], [2, :a], [2, :b]]
+  end
 
-    it "calls the enclosed object's rewind method if one exists" do
-      obj = mock('rewinder')
-      enum = Enumerator::Product.new(obj.to_enum)
+  it "calls the enclosed object's rewind method if one exists" do
+    obj = mock('rewinder')
+    enum = Enumerator::Product.new(obj.to_enum)
 
-      obj.should_receive(:rewind)
-      enum.rewind
-    end
+    obj.should_receive(:rewind)
+    enum.rewind
+  end
 
-    it "does nothing if the object doesn't have a #rewind method" do
-      obj = mock('rewinder')
-      enum = Enumerator::Product.new(obj.to_enum)
+  it "does nothing if the object doesn't have a #rewind method" do
+    obj = mock('rewinder')
+    enum = Enumerator::Product.new(obj.to_enum)
 
-      enum.rewind.should == enum
-    end
+    enum.rewind.should == enum
+  end
 
-    it "calls a rewind method on each enumerable in direct order" do
-      ScratchPad.record []
+  it "calls a rewind method on each enumerable in direct order" do
+    ScratchPad.record []
 
-      object1 = Object.new
-      def object1.rewind; ScratchPad << :object1; end
+    object1 = Object.new
+    def object1.rewind; ScratchPad << :object1; end
 
-      object2 = Object.new
-      def object2.rewind; ScratchPad << :object2; end
+    object2 = Object.new
+    def object2.rewind; ScratchPad << :object2; end
 
-      object3 = Object.new
-      def object3.rewind; ScratchPad << :object3; end
+    object3 = Object.new
+    def object3.rewind; ScratchPad << :object3; end
 
-      enum = Enumerator::Product.new(object1, object2, object3)
-      enum.rewind
+    enum = Enumerator::Product.new(object1, object2, object3)
+    enum.rewind
 
-      ScratchPad.recorded.should == [:object1, :object2, :object3]
-    end
+    ScratchPad.recorded.should == [:object1, :object2, :object3]
   end
 end
diff --git a/spec/ruby/core/enumerator/product/size_spec.rb b/spec/ruby/core/enumerator/product/size_spec.rb
index fb0efdf748243f..96632d6eeecb1a 100644
--- a/spec/ruby/core/enumerator/product/size_spec.rb
+++ b/spec/ruby/core/enumerator/product/size_spec.rb
@@ -1,64 +1,54 @@
 require_relative '../../../spec_helper'
 
-ruby_version_is "3.2" do
-  describe "Enumerator::Product#size" do
-    it "returns the total size of the enumerator product calculated by multiplying the sizes of enumerables in the product" do
-      product = Enumerator::Product.new(1..2, 1..3, 1..4)
-      product.size.should == 24 # 2 * 3 * 4
-    end
-
-    it "returns nil if any enumerable reports its size as nil" do
-      enum = Object.new
-      def enum.size; nil; end
-
-      product = Enumerator::Product.new(1..2, enum)
-      product.size.should == nil
-    end
+describe "Enumerator::Product#size" do
+  it "returns the total size of the enumerator product calculated by multiplying the sizes of enumerables in the product" do
+    product = Enumerator::Product.new(1..2, 1..3, 1..4)
+    product.size.should == 24 # 2 * 3 * 4
+  end
 
-    it "returns Float::INFINITY if any enumerable reports its size as Float::INFINITY" do
-      enum = Object.new
-      def enum.size; Float::INFINITY; end
+  it "returns nil if any enumerable reports its size as nil" do
+    enum = Object.new
+    def enum.size; nil; end
 
-      product = Enumerator::Product.new(1..2, enum)
-      product.size.should == Float::INFINITY
-    end
+    product = Enumerator::Product.new(1..2, enum)
+    product.size.should == nil
+  end
 
-    it "returns -Float::INFINITY if any enumerable reports its size as -Float::INFINITY" do
-      enum = Object.new
-      def enum.size; -Float::INFINITY; end
+  it "returns Float::INFINITY if any enumerable reports its size as Float::INFINITY" do
+    enum = Object.new
+    def enum.size; Float::INFINITY; end
 
-      product = Enumerator::Product.new(1..2, enum)
-      product.size.should == -Float::INFINITY
-    end
+    product = Enumerator::Product.new(1..2, enum)
+    product.size.should == Float::INFINITY
+  end
 
-    it "returns nil if any enumerable reports its size as Float::NAN" do
-      enum = Object.new
-      def enum.size; Float::NAN; end
+  it "returns nil if any enumerable reports its size as Float::NAN" do
+    enum = Object.new
+    def enum.size; Float::NAN; end
 
-      product = Enumerator::Product.new(1..2, enum)
-      product.size.should == nil
-    end
+    product = Enumerator::Product.new(1..2, enum)
+    product.size.should == nil
+  end
 
-    it "returns nil if any enumerable doesn't respond to #size" do
-      enum = Object.new
-      product = Enumerator::Product.new(1..2, enum)
-      product.size.should == nil
-    end
+  it "returns nil if any enumerable doesn't respond to #size" do
+    enum = Object.new
+    product = Enumerator::Product.new(1..2, enum)
+    product.size.should == nil
+  end
 
-    it "returns nil if any enumerable reports a not-convertible to Integer" do
-      enum = Object.new
-      def enum.size; :symbol; end
+  it "returns nil if any enumerable reports a not-convertible to Integer" do
+    enum = Object.new
+    def enum.size; :symbol; end
 
-      product = Enumerator::Product.new(1..2, enum)
-      product.size.should == nil
-    end
+    product = Enumerator::Product.new(1..2, enum)
+    product.size.should == nil
+  end
 
-    it "returns nil if any enumerable reports a non-Integer but convertible to Integer size" do
-      enum = Object.new
-      def enum.size; 1.0; end
+  it "returns nil if any enumerable reports a non-Integer but convertible to Integer size" do
+    enum = Object.new
+    def enum.size; 1.0; end
 
-      product = Enumerator::Product.new(1..2, enum)
-      product.size.should == nil
-    end
+    product = Enumerator::Product.new(1..2, enum)
+    product.size.should == nil
   end
 end
diff --git a/spec/ruby/core/enumerator/product_spec.rb b/spec/ruby/core/enumerator/product_spec.rb
index 0fb00fc7ee84fc..83c7cb8e0e8643 100644
--- a/spec/ruby/core/enumerator/product_spec.rb
+++ b/spec/ruby/core/enumerator/product_spec.rb
@@ -1,93 +1,91 @@
 require_relative '../../spec_helper'
 
-ruby_version_is "3.2" do
-  describe "Enumerator.product" do
-    it "returns a Cartesian product of enumerators" do
-      enum = Enumerator.product(1..2, ["A", "B"])
-      enum.to_a.should == [[1, "A"], [1, "B"], [2, "A"], [2, "B"]]
-    end
-
-    it "accepts a list of enumerators of any length" do
-      enum = Enumerator.product(1..2)
-      enum.to_a.should == [[1], [2]]
+describe "Enumerator.product" do
+  it "returns a Cartesian product of enumerators" do
+    enum = Enumerator.product(1..2, ["A", "B"])
+    enum.to_a.should == [[1, "A"], [1, "B"], [2, "A"], [2, "B"]]
+  end
 
-      enum = Enumerator.product(1..2, ["A"])
-      enum.to_a.should == [[1, "A"], [2, "A"]]
+  it "accepts a list of enumerators of any length" do
+    enum = Enumerator.product(1..2)
+    enum.to_a.should == [[1], [2]]
 
-      enum = Enumerator.product(1..2, ["A"], ["B"])
-      enum.to_a.should == [[1, "A", "B"], [2, "A", "B"]]
+    enum = Enumerator.product(1..2, ["A"])
+    enum.to_a.should == [[1, "A"], [2, "A"]]
 
-      enum = Enumerator.product(2..3, ["A"], ["B"], ["C"])
-      enum.to_a.should == [[2, "A", "B", "C"], [3, "A", "B", "C"]]
-    end
+    enum = Enumerator.product(1..2, ["A"], ["B"])
+    enum.to_a.should == [[1, "A", "B"], [2, "A", "B"]]
 
-    it "returns an enumerator with an empty array when no arguments passed" do
-      enum = Enumerator.product
-      enum.to_a.should == [[]]
-    end
+    enum = Enumerator.product(2..3, ["A"], ["B"], ["C"])
+    enum.to_a.should == [[2, "A", "B", "C"], [3, "A", "B", "C"]]
+  end
 
-    it "returns an instance of Enumerator::Product" do
-      enum = Enumerator.product
-      enum.class.should == Enumerator::Product
-    end
+  it "returns an enumerator with an empty array when no arguments passed" do
+    enum = Enumerator.product
+    enum.to_a.should == [[]]
+  end
 
-    it "accepts infinite enumerators and returns infinite enumerator" do
-      enum = Enumerator.product(1.., ["A", "B"])
-      enum.take(5).should == [[1, "A"], [1, "B"], [2, "A"], [2, "B"], [3, "A"]]
-      enum.size.should == Float::INFINITY
-    end
+  it "returns an instance of Enumerator::Product" do
+    enum = Enumerator.product
+    enum.class.should == Enumerator::Product
+  end
 
-    it "accepts a block" do
-      elems = []
-      enum = Enumerator.product(1..2, ["X", "Y"]) { elems << _1 }
+  it "accepts infinite enumerators and returns infinite enumerator" do
+    enum = Enumerator.product(1.., ["A", "B"])
+    enum.take(5).should == [[1, "A"], [1, "B"], [2, "A"], [2, "B"], [3, "A"]]
+    enum.size.should == Float::INFINITY
+  end
 
-      elems.should == [[1, "X"], [1, "Y"], [2, "X"], [2, "Y"]]
-    end
+  it "accepts a block" do
+    elems = []
+    enum = Enumerator.product(1..2, ["X", "Y"]) { elems << _1 }
 
-    it "returns nil when a block passed" do
-      Enumerator.product(1..2) {}.should == nil
-    end
+    elems.should == [[1, "X"], [1, "Y"], [2, "X"], [2, "Y"]]
+  end
 
-    # https://bugs.ruby-lang.org/issues/19829
-    it "reject keyword arguments" do
-      -> {
-        Enumerator.product(1..3, foo: 1, bar: 2)
-      }.should raise_error(ArgumentError, "unknown keywords: :foo, :bar")
-    end
+  it "returns nil when a block passed" do
+    Enumerator.product(1..2) {}.should == nil
+  end
 
-    it "calls only #each_entry method on arguments" do
-      object = Object.new
-      def object.each_entry
-        yield 1
-        yield 2
-      end
+  # https://bugs.ruby-lang.org/issues/19829
+  it "reject keyword arguments" do
+    -> {
+      Enumerator.product(1..3, foo: 1, bar: 2)
+    }.should raise_error(ArgumentError, "unknown keywords: :foo, :bar")
+  end
 
-      enum = Enumerator.product(object, ["A", "B"])
-      enum.to_a.should == [[1, "A"], [1, "B"], [2, "A"], [2, "B"]]
+  it "calls only #each_entry method on arguments" do
+    object = Object.new
+    def object.each_entry
+      yield 1
+      yield 2
     end
 
-    it "raises NoMethodError when argument doesn't respond to #each_entry" do
-      -> {
-        Enumerator.product(Object.new).to_a
-      }.should raise_error(NoMethodError, /undefined method `each_entry' for/)
-    end
+    enum = Enumerator.product(object, ["A", "B"])
+    enum.to_a.should == [[1, "A"], [1, "B"], [2, "A"], [2, "B"]]
+  end
 
-    it "calls #each_entry lazily" do
-      Enumerator.product(Object.new).should be_kind_of(Enumerator)
-    end
+  it "raises NoMethodError when argument doesn't respond to #each_entry" do
+    -> {
+      Enumerator.product(Object.new).to_a
+    }.should raise_error(NoMethodError, /undefined method [`']each_entry' for/)
+  end
+
+  it "calls #each_entry lazily" do
+    Enumerator.product(Object.new).should be_kind_of(Enumerator)
+  end
 
-    it "iterates through consuming enumerator elements only once" do
-      a = [1, 2, 3]
-      i = 0
+  it "iterates through consuming enumerator elements only once" do
+    a = [1, 2, 3]
+    i = 0
 
-      enum = Enumerator.new do |y|
-        while i < a.size
-          y << a[i]
-          i += 1
-        end
+    enum = Enumerator.new do |y|
+      while i < a.size
+        y << a[i]
+        i += 1
       end
-
-      Enumerator.product(['a', 'b'], enum).to_a.should == [["a", 1], ["a", 2], ["a", 3]]
     end
+
+    Enumerator.product(['a', 'b'], enum).to_a.should == [["a", 1], ["a", 2], ["a", 3]]
   end
 end
diff --git a/spec/ruby/shared/enumerator/enum_for.rb b/spec/ruby/core/enumerator/shared/enum_for.rb
similarity index 100%
rename from spec/ruby/shared/enumerator/enum_for.rb
rename to spec/ruby/core/enumerator/shared/enum_for.rb
diff --git a/spec/ruby/shared/enumerator/with_index.rb b/spec/ruby/core/enumerator/shared/with_index.rb
similarity index 89%
rename from spec/ruby/shared/enumerator/with_index.rb
rename to spec/ruby/core/enumerator/shared/with_index.rb
index 89f40070e0d94a..78771ffe82d8da 100644
--- a/spec/ruby/shared/enumerator/with_index.rb
+++ b/spec/ruby/core/enumerator/shared/with_index.rb
@@ -1,8 +1,8 @@
-require_relative '../../spec_helper'
+require_relative '../../../spec_helper'
 
 describe :enum_with_index, shared: true do
 
-  require_relative '../../fixtures/enumerator/classes'
+  require_relative '../fixtures/classes'
 
   before :each do
     @origin = [1, 2, 3, 4]
diff --git a/spec/ruby/shared/enumerator/with_object.rb b/spec/ruby/core/enumerator/shared/with_object.rb
similarity index 96%
rename from spec/ruby/shared/enumerator/with_object.rb
rename to spec/ruby/core/enumerator/shared/with_object.rb
index c2e3a793666c64..d8e9d8e9f7be4b 100644
--- a/spec/ruby/shared/enumerator/with_object.rb
+++ b/spec/ruby/core/enumerator/shared/with_object.rb
@@ -1,4 +1,4 @@
-require_relative '../../spec_helper'
+require_relative '../../../spec_helper'
 
 describe :enum_with_object, shared: true do
   before :each do
diff --git a/spec/ruby/core/enumerator/to_enum_spec.rb b/spec/ruby/core/enumerator/to_enum_spec.rb
index cadfcf63144629..7fb73d0c3cdd6c 100644
--- a/spec/ruby/core/enumerator/to_enum_spec.rb
+++ b/spec/ruby/core/enumerator/to_enum_spec.rb
@@ -1,6 +1,6 @@
 require_relative '../../spec_helper'
-require_relative '../../shared/enumerator/enum_for'
+require_relative 'shared/enum_for'
 
 describe "Enumerator#to_enum" do
-  it_behaves_like :enum_for, :enum_for
+  it_behaves_like :enum_for, :to_enum
 end
diff --git a/spec/ruby/core/enumerator/with_index_spec.rb b/spec/ruby/core/enumerator/with_index_spec.rb
index ac37cee508fa14..e49aa7a939b9e8 100644
--- a/spec/ruby/core/enumerator/with_index_spec.rb
+++ b/spec/ruby/core/enumerator/with_index_spec.rb
@@ -1,5 +1,5 @@
 require_relative '../../spec_helper'
-require_relative '../../shared/enumerator/with_index'
+require_relative 'shared/with_index'
 require_relative '../enumerable/shared/enumeratorized'
 
 describe "Enumerator#with_index" do
@@ -69,4 +69,21 @@
     @enum.with_index(-1) { |*x| res << x}
     res.should == [[1,-1], [2,0], [3,1], [4,2]]
   end
+
+  it "passes on the given block's return value" do
+    arr = [1,2,3]
+    arr.delete_if.with_index { |a,b| false }
+    arr.should == [1,2,3]
+
+    arr.delete_if.with_index { |a,b| true }
+    arr.should == []
+  end
+
+  it "returns the iterator's return value" do
+    @enum.select.with_index { |a,b| false }.should == []
+  end
+
+  it "returns the correct value if chained with itself" do
+    [:a].each.with_index.with_index.to_a.should == [[[:a,0],0]]
+  end
 end
diff --git a/spec/ruby/core/enumerator/with_object_spec.rb b/spec/ruby/core/enumerator/with_object_spec.rb
index e7ba83fd9f7eab..58031fd765d5b1 100644
--- a/spec/ruby/core/enumerator/with_object_spec.rb
+++ b/spec/ruby/core/enumerator/with_object_spec.rb
@@ -1,5 +1,5 @@
 require_relative '../../spec_helper'
-require_relative '../../shared/enumerator/with_object'
+require_relative 'shared/with_object'
 
 describe "Enumerator#with_object" do
   it_behaves_like :enum_with_object, :with_object
diff --git a/spec/ruby/core/env/clone_spec.rb b/spec/ruby/core/env/clone_spec.rb
index 991e4e6774b861..01a29c6ab48a18 100644
--- a/spec/ruby/core/env/clone_spec.rb
+++ b/spec/ruby/core/env/clone_spec.rb
@@ -13,11 +13,9 @@
     }.should raise_error(ArgumentError)
   end
 
-  ruby_version_is "3.2" do
-    it "raises TypeError" do
-      -> {
-        ENV.clone
-      }.should raise_error(TypeError, /Cannot clone ENV, use ENV.to_h to get a copy of ENV as a hash/)
-    end
+  it "raises TypeError" do
+    -> {
+      ENV.clone
+    }.should raise_error(TypeError, /Cannot clone ENV, use ENV.to_h to get a copy of ENV as a hash/)
   end
 end
diff --git a/spec/ruby/core/env/dup_spec.rb b/spec/ruby/core/env/dup_spec.rb
index 46d125aca8af8f..ac66b455cdebe9 100644
--- a/spec/ruby/core/env/dup_spec.rb
+++ b/spec/ruby/core/env/dup_spec.rb
@@ -1,11 +1,9 @@
 require_relative '../../spec_helper'
 
 describe "ENV#dup" do
-  ruby_version_is "3.1" do
-    it "raises TypeError" do
-      -> {
-        ENV.dup
-      }.should raise_error(TypeError, /Cannot dup ENV, use ENV.to_h to get a copy of ENV as a hash/)
-    end
+  it "raises TypeError" do
+    -> {
+      ENV.dup
+    }.should raise_error(TypeError, /Cannot dup ENV, use ENV.to_h to get a copy of ENV as a hash/)
   end
 end
diff --git a/spec/ruby/core/env/element_reference_spec.rb b/spec/ruby/core/env/element_reference_spec.rb
index 560c127a9cb705..66a9bc96906afd 100644
--- a/spec/ruby/core/env/element_reference_spec.rb
+++ b/spec/ruby/core/env/element_reference_spec.rb
@@ -1,4 +1,4 @@
-# -*- encoding: binary -*-
+# encoding: binary
 require_relative '../../spec_helper'
 require_relative 'fixtures/common'
 
diff --git a/spec/ruby/core/env/fetch_spec.rb b/spec/ruby/core/env/fetch_spec.rb
index b2e7a88cabd9d9..2c5d7cc3a0059c 100644
--- a/spec/ruby/core/env/fetch_spec.rb
+++ b/spec/ruby/core/env/fetch_spec.rb
@@ -47,7 +47,7 @@
 
   it "warns on block and default parameter given" do
     -> do
-       ENV.fetch("foo", "default") { "bar" }.should == "bar"
+      ENV.fetch("foo", "default") { "bar" }.should == "bar"
     end.should complain(/block supersedes default value argument/)
   end
 
diff --git a/spec/ruby/core/env/inspect_spec.rb b/spec/ruby/core/env/inspect_spec.rb
index 3c611c24a177c8..7dd92b120ffbb2 100644
--- a/spec/ruby/core/env/inspect_spec.rb
+++ b/spec/ruby/core/env/inspect_spec.rb
@@ -4,7 +4,7 @@
 
   it "returns a String that looks like a Hash with real data" do
     ENV["foo"] = "bar"
-    ENV.inspect.should =~ /\{.*"foo"=>"bar".*\}/
+    ENV.inspect.should =~ /\{.*"foo" *=> *"bar".*\}/
     ENV.delete "foo"
   end
 
diff --git a/spec/ruby/core/env/length_spec.rb b/spec/ruby/core/env/length_spec.rb
index 536af9edf51a9a..c6f90628921b0a 100644
--- a/spec/ruby/core/env/length_spec.rb
+++ b/spec/ruby/core/env/length_spec.rb
@@ -2,5 +2,5 @@
 require_relative 'shared/length'
 
 describe "ENV.length" do
- it_behaves_like :env_length, :length
+  it_behaves_like :env_length, :length
 end
diff --git a/spec/ruby/core/env/shared/update.rb b/spec/ruby/core/env/shared/update.rb
index 7d4799955bdd52..e1b1c9c290e2db 100644
--- a/spec/ruby/core/env/shared/update.rb
+++ b/spec/ruby/core/env/shared/update.rb
@@ -15,12 +15,10 @@
     ENV["bar"].should == "1"
   end
 
-  ruby_version_is "3.2" do
-    it "adds the multiple parameter hashes to ENV, returning ENV" do
-      ENV.send(@method, {"foo" => "multi1"}, {"bar" => "multi2"}).should equal(ENV)
-      ENV["foo"].should == "multi1"
-      ENV["bar"].should == "multi2"
-    end
+  it "adds the multiple parameter hashes to ENV, returning ENV" do
+    ENV.send(@method, {"foo" => "multi1"}, {"bar" => "multi2"}).should equal(ENV)
+    ENV["foo"].should == "multi1"
+    ENV["bar"].should == "multi2"
   end
 
   it "returns ENV when no block given" do
diff --git a/spec/ruby/core/env/size_spec.rb b/spec/ruby/core/env/size_spec.rb
index f050e9e5a90973..7c8072481ed96c 100644
--- a/spec/ruby/core/env/size_spec.rb
+++ b/spec/ruby/core/env/size_spec.rb
@@ -2,5 +2,5 @@
 require_relative 'shared/length'
 
 describe "ENV.size" do
- it_behaves_like :env_length, :size
+  it_behaves_like :env_length, :size
 end
diff --git a/spec/ruby/core/env/to_h_spec.rb b/spec/ruby/core/env/to_h_spec.rb
index 3c4a92aa579a98..58ea2d2030e5e3 100644
--- a/spec/ruby/core/env/to_h_spec.rb
+++ b/spec/ruby/core/env/to_h_spec.rb
@@ -18,6 +18,18 @@
       ENV.to_h { |k, v| [k, v.upcase] }.should == { 'a' => "B", 'c' => "D" }
     end
 
+    it "passes to a block each pair's key and value as separate arguments" do
+      ENV.replace("a" => "b", "c" => "d")
+
+      ScratchPad.record []
+      ENV.to_h { |k, v| ScratchPad << [k, v]; [k, v] }
+      ScratchPad.recorded.sort.should == [["a", "b"], ["c", "d"]]
+
+      ScratchPad.record []
+      ENV.to_h { |*args| ScratchPad << args; [args[0], args[1]] }
+      ScratchPad.recorded.sort.should == [["a", "b"], ["c", "d"]]
+    end
+
     it "does not require the array elements to be strings" do
       ENV.replace("a" => "b", "c" => "d")
       ENV.to_h { |k, v| [k.to_sym, v.to_sym] }.should == { :a => :b, :c => :d }
diff --git a/spec/ruby/core/exception/backtrace_spec.rb b/spec/ruby/core/exception/backtrace_spec.rb
index 3f74c4cefe0882..9a65ea3820e1fc 100644
--- a/spec/ruby/core/exception/backtrace_spec.rb
+++ b/spec/ruby/core/exception/backtrace_spec.rb
@@ -27,7 +27,7 @@
   end
 
   it "includes the name of the method from where self raised in the first element" do
-    @backtrace.first.should =~ /in `backtrace'/
+    @backtrace.first.should =~ /in [`'](?:ExceptionSpecs::Backtrace\.)?backtrace'/
   end
 
   it "includes the filename of the location immediately prior to where self raised in the second element" do
@@ -38,12 +38,25 @@
     @backtrace[1].should =~ /:6(:in )?/
   end
 
-  it "contains lines of the same format for each prior position in the stack" do
-    @backtrace[2..-1].each do |line|
-      # This regexp is deliberately imprecise to account for the need to abstract out
-      # the paths of the included mspec files and the desire to avoid specifying in any
-      # detail what the in `...' portion looks like.
-      line.should =~ /^.+:\d+:in `[^`]+'$/
+  ruby_version_is ""..."3.4" do
+    it "contains lines of the same format for each prior position in the stack" do
+      @backtrace[2..-1].each do |line|
+        # This regexp is deliberately imprecise to account for the need to abstract out
+        # the paths of the included mspec files and the desire to avoid specifying in any
+        # detail what the in `...' portion looks like.
+        line.should =~ /^.+:\d+:in `[^`]+'$/
+      end
+    end
+  end
+
+  ruby_version_is "3.4" do
+    it "contains lines of the same format for each prior position in the stack" do
+      @backtrace[2..-1].each do |line|
+        # This regexp is deliberately imprecise to account for the need to abstract out
+        # the paths of the included mspec files and the desire to avoid specifying in any
+        # detail what the in '...' portion looks like.
+        line.should =~ /^.+:\d+:in '[^`]+'$/
+      end
     end
   end
 
diff --git a/spec/ruby/core/exception/detailed_message_spec.rb b/spec/ruby/core/exception/detailed_message_spec.rb
index bd85927dbe6550..9df164a1cf393b 100644
--- a/spec/ruby/core/exception/detailed_message_spec.rb
+++ b/spec/ruby/core/exception/detailed_message_spec.rb
@@ -2,34 +2,49 @@
 require_relative 'fixtures/common'
 
 describe "Exception#detailed_message" do
-  ruby_version_is "3.2" do
-    it "returns decorated message" do
-      RuntimeError.new("new error").detailed_message.should == "new error (RuntimeError)"
-    end
+  it "returns decorated message" do
+    RuntimeError.new("new error").detailed_message.should == "new error (RuntimeError)"
+  end
 
-    it "accepts highlight keyword argument and adds escape control sequences" do
-      RuntimeError.new("new error").detailed_message(highlight: true).should == "\e[1mnew error (\e[1;4mRuntimeError\e[m\e[1m)\e[m"
+  it "is called by #full_message to allow message customization" do
+    exception = Exception.new("new error")
+    def exception.detailed_message(**)
+      "<prefix>#{message}<suffix>"
     end
+    exception.full_message(highlight: false).should.include? "<prefix>new error<suffix>"
+  end
 
-    it "allows and ignores other keyword arguments" do
-      RuntimeError.new("new error").detailed_message(foo: true).should == "new error (RuntimeError)"
-    end
+  it "returns just a message if exception class is anonymous" do
+    Class.new(RuntimeError).new("message").detailed_message.should == "message"
+  end
 
-    it "returns just a message if exception class is anonymous" do
-      Class.new(RuntimeError).new("message").detailed_message.should == "message"
-    end
+  it "returns 'unhandled exception' for an instance of RuntimeError with empty message" do
+    RuntimeError.new("").detailed_message.should == "unhandled exception"
+  end
 
-    it "returns 'unhandled exception' for an instance of RuntimeError with empty message" do
-      RuntimeError.new("").detailed_message.should == "unhandled exception"
-    end
+  it "returns just class name for an instance other than RuntimeError with empty message" do
+    DetailedMessageSpec::C.new("").detailed_message.should == "DetailedMessageSpec::C"
+    StandardError.new("").detailed_message.should == "StandardError"
+  end
 
-    it "returns just class name for an instance of RuntimeError sublass with empty message" do
-      DetailedMessageSpec::C.new("").detailed_message.should == "DetailedMessageSpec::C"
-    end
+  it "returns a generated class name for an instance of RuntimeError anonymous subclass with empty message" do
+    klass = Class.new(RuntimeError)
+    klass.new("").detailed_message.should =~ /\A#<Class:0x\h+>\z/
+  end
 
-    it "returns a generated class name for an instance of RuntimeError anonymous subclass with empty message" do
-      klass = Class.new(RuntimeError)
-      klass.new("").detailed_message.should =~  /\A#<Class:0x\h+>\z/
-    end
+  it "accepts highlight keyword argument and adds escape control sequences" do
+    RuntimeError.new("new error").detailed_message(highlight: true).should == "\e[1mnew error (\e[1;4mRuntimeError\e[m\e[1m)\e[m"
+  end
+
+  it "accepts highlight keyword argument and adds escape control sequences for an instance of RuntimeError with empty message" do
+    RuntimeError.new("").detailed_message(highlight: true).should == "\e[1;4munhandled exception\e[m"
+  end
+
+  it "accepts highlight keyword argument and adds escape control sequences for an instance other than RuntimeError with empty message" do
+    StandardError.new("").detailed_message(highlight: true).should == "\e[1;4mStandardError\e[m"
+  end
+
+  it "allows and ignores other keyword arguments" do
+    RuntimeError.new("new error").detailed_message(foo: true).should == "new error (RuntimeError)"
   end
 end
diff --git a/spec/ruby/core/exception/errno_spec.rb b/spec/ruby/core/exception/errno_spec.rb
index a063e522eaaabd..1ab42777004f1d 100644
--- a/spec/ruby/core/exception/errno_spec.rb
+++ b/spec/ruby/core/exception/errno_spec.rb
@@ -29,6 +29,8 @@
     ExceptionSpecs::EMFILESub = Class.new(Errno::EMFILE)
     exc = ExceptionSpecs::EMFILESub.new
     exc.should be_an_instance_of(ExceptionSpecs::EMFILESub)
+  ensure
+    ExceptionSpecs.send(:remove_const, :EMFILESub)
   end
 end
 
diff --git a/spec/ruby/core/exception/fixtures/common.rb b/spec/ruby/core/exception/fixtures/common.rb
index 1e243098bd0876..3d8a3c34308fdf 100644
--- a/spec/ruby/core/exception/fixtures/common.rb
+++ b/spec/ruby/core/exception/fixtures/common.rb
@@ -84,6 +84,9 @@ class NoMethodErrorD; end
 
   class InstanceException < Exception
   end
+
+  class AClass; end
+  module AModule; end
 end
 
 class NameErrorSpecs
diff --git a/spec/ruby/core/exception/fixtures/syntax_error.rb b/spec/ruby/core/exception/fixtures/syntax_error.rb
new file mode 100644
index 00000000000000..ccec62f7a1a8f5
--- /dev/null
+++ b/spec/ruby/core/exception/fixtures/syntax_error.rb
@@ -0,0 +1,3 @@
+# rubocop:disable Lint/Syntax
+1+1=2
+# rubocop:enable Lint/Syntax
diff --git a/spec/ruby/core/exception/frozen_error_spec.rb b/spec/ruby/core/exception/frozen_error_spec.rb
index 2efdc239d8273d..51eb79cacef6ae 100644
--- a/spec/ruby/core/exception/frozen_error_spec.rb
+++ b/spec/ruby/core/exception/frozen_error_spec.rb
@@ -20,3 +20,33 @@ def o.x; end
     end
   end
 end
+
+describe "FrozenError#message" do
+  it "includes a receiver" do
+    object = Object.new
+    object.freeze
+
+    -> {
+      def object.x; end
+    }.should raise_error(FrozenError, "can't modify frozen object: #{object}")
+
+    object = [].freeze
+    -> { object << nil }.should raise_error(FrozenError, "can't modify frozen Array: []")
+  end
+end
+
+describe "Modifying a frozen object" do
+  context "#inspect is redefined and modifies the object" do
+    it "returns ... instead of String representation of object" do
+      object = Object.new
+      def object.inspect; @a = 1 end
+      def object.modify; @a = 2 end
+
+      object.freeze
+
+      # CRuby's message contains multiple whitespaces before '...'.
+      # So handle both multiple and single whitespace.
+      -> { object.modify }.should raise_error(FrozenError, /can't modify frozen .*?: \s*.../)
+    end
+  end
+end
diff --git a/spec/ruby/core/exception/full_message_spec.rb b/spec/ruby/core/exception/full_message_spec.rb
index ee66582022e0b5..0761d2b40ce850 100644
--- a/spec/ruby/core/exception/full_message_spec.rb
+++ b/spec/ruby/core/exception/full_message_spec.rb
@@ -42,16 +42,77 @@
     e = RuntimeError.new("Some runtime error")
     e.backtrace.should == nil
     full_message = e.full_message(highlight: false, order: :top).lines
-    full_message[0].should.start_with?("#{__FILE__}:#{__LINE__-1}:in `")
+    full_message[0].should.start_with?("#{__FILE__}:#{__LINE__-1}:in ")
     full_message[0].should.end_with?("': Some runtime error (RuntimeError)\n")
   end
 
+  describe "includes details about whether an exception was handled" do
+    describe "RuntimeError" do
+      it "should report as unhandled if message is empty" do
+        err = RuntimeError.new("")
+
+        err.full_message.should =~ /unhandled exception/
+        err.full_message(highlight: true).should =~ /unhandled exception/
+        err.full_message(highlight: false).should =~ /unhandled exception/
+      end
+
+      it "should not report as unhandled if the message is not empty" do
+        err = RuntimeError.new("non-empty")
+
+        err.full_message.should !~ /unhandled exception/
+        err.full_message(highlight: true).should !~ /unhandled exception/
+        err.full_message(highlight: false).should !~ /unhandled exception/
+      end
+
+      it "should not report as unhandled if the message is nil" do
+        err = RuntimeError.new(nil)
+
+        err.full_message.should !~ /unhandled exception/
+        err.full_message(highlight: true).should !~ /unhandled exception/
+        err.full_message(highlight: false).should !~ /unhandled exception/
+      end
+
+      it "should not report as unhandled if the message is not specified" do
+        err = RuntimeError.new()
+
+        err.full_message.should !~ /unhandled exception/
+        err.full_message(highlight: true).should !~ /unhandled exception/
+        err.full_message(highlight: false).should !~ /unhandled exception/
+      end
+
+      it "adds escape sequences to highlight some strings if the message is not specified and :highlight option is specified" do
+        e = RuntimeError.new("")
+
+        full_message = e.full_message(highlight: true, order: :top).lines
+        full_message[0].should.end_with? "\e[1;4munhandled exception\e[m\n"
+
+        full_message = e.full_message(highlight: true, order: :bottom).lines
+        full_message[0].should == "\e[1mTraceback\e[m (most recent call last):\n"
+        full_message[-1].should.end_with? "\e[1;4munhandled exception\e[m\n"
+
+        full_message = e.full_message(highlight: false, order: :top).lines
+        full_message[0].should.end_with? "unhandled exception\n"
+
+        full_message = e.full_message(highlight: false, order: :bottom).lines
+        full_message[0].should == "Traceback (most recent call last):\n"
+        full_message[-1].should.end_with? "unhandled exception\n"
+      end
+    end
+
+    describe "generic Error" do
+      it "should not report as unhandled in any event" do
+        StandardError.new("").full_message.should !~ /unhandled exception/
+        StandardError.new("non-empty").full_message.should !~ /unhandled exception/
+      end
+    end
+  end
+
   it "shows the exception class at the end of the first line of the message when the message contains multiple lines" do
     begin
       line = __LINE__; raise "first line\nsecond line"
     rescue => e
       full_message = e.full_message(highlight: false, order: :top).lines
-      full_message[0].should.start_with?("#{__FILE__}:#{line}:in `")
+      full_message[0].should.start_with?("#{__FILE__}:#{line}:in ")
       full_message[0].should.end_with?(": first line (RuntimeError)\n")
       full_message[1].should == "second line\n"
     end
@@ -62,7 +123,7 @@
       line = __LINE__; raise "first line\nsecond line\nthird line"
     rescue => e
       full_message = e.full_message(highlight: true, order: :top).lines
-      full_message[0].should.start_with?("#{__FILE__}:#{line}:in `")
+      full_message[0].should.start_with?("#{__FILE__}:#{line}:in ")
       full_message[0].should.end_with?(": \e[1mfirst line (\e[1;4mRuntimeError\e[m\e[1m)\e[m\n")
       full_message[1].should == "\e[1msecond line\e[m\n"
       full_message[2].should == "\e[1mthird line\e[m\n"
@@ -104,24 +165,62 @@
     exception.full_message.should include "origin exception"
   end
 
-  ruby_version_is "3.2" do
-    it "relies on #detailed_message" do
-      e = RuntimeError.new("new error")
-      e.define_singleton_method(:detailed_message) { |**opt| "DETAILED MESSAGE" }
+  it "relies on #detailed_message" do
+    e = RuntimeError.new("new error")
+    e.define_singleton_method(:detailed_message) { |**| "DETAILED MESSAGE" }
+
+    e.full_message.lines.first.should =~ /DETAILED MESSAGE/
+  end
 
-      e.full_message.lines.first.should =~ /DETAILED MESSAGE/
+  it "passes all its own keyword arguments (with :highlight default value and without :order default value) to #detailed_message" do
+    e = RuntimeError.new("new error")
+    options_passed = nil
+    e.define_singleton_method(:detailed_message) do |**options|
+      options_passed = options
+      "DETAILED MESSAGE"
     end
 
-    it "passes all its own keyword arguments to #detailed_message" do
-      e = RuntimeError.new("new error")
-      opt_ = nil
-      e.define_singleton_method(:detailed_message) do |**opt|
-        opt_ = opt
-        "DETAILED MESSAGE"
-      end
+    e.full_message(foo: "bar")
+    options_passed.should == { foo: "bar", highlight: Exception.to_tty? }
+  end
+
+  it "converts #detailed_message returned value to String if it isn't a String" do
+    message = Object.new
+    def message.to_str; "DETAILED MESSAGE"; end
+
+    e = RuntimeError.new("new error")
+    e.define_singleton_method(:detailed_message) { |**| message }
+
+    e.full_message.lines.first.should =~ /DETAILED MESSAGE/
+  end
+
+  it "uses class name if #detailed_message returns nil" do
+    e = RuntimeError.new("new error")
+    e.define_singleton_method(:detailed_message) { |**| nil }
+
+    e.full_message(highlight: false).lines.first.should =~ /RuntimeError/
+    e.full_message(highlight: true).lines.first.should =~ /#{Regexp.escape("\e[1;4mRuntimeError\e[m")}/
+  end
 
-      e.full_message(foo: "bar")
-      opt_.should == { foo: "bar", highlight: Exception.to_tty? }
+  it "uses class name if exception object doesn't respond to #detailed_message" do
+    e = RuntimeError.new("new error")
+    class << e
+      undef :detailed_message
     end
+
+    e.full_message(highlight: false).lines.first.should =~ /RuntimeError/
+    e.full_message(highlight: true).lines.first.should =~ /#{Regexp.escape("\e[1;4mRuntimeError\e[m")}/
+  end
+
+  it "allows cause with empty backtrace" do
+    begin
+      raise RuntimeError.new("Some runtime error"), cause: RuntimeError.new("Some other runtime error")
+    rescue => e
+    end
+
+    full_message = e.full_message
+    full_message.should include "RuntimeError"
+    full_message.should include "Some runtime error"
+    full_message.should include "Some other runtime error"
   end
 end
diff --git a/spec/ruby/core/exception/interrupt_spec.rb b/spec/ruby/core/exception/interrupt_spec.rb
index 299b5b81f33d34..90d261e4703024 100644
--- a/spec/ruby/core/exception/interrupt_spec.rb
+++ b/spec/ruby/core/exception/interrupt_spec.rb
@@ -54,7 +54,7 @@
       err = IO.popen([*ruby_exe, '-e', 'Process.kill :INT, Process.pid; sleep'], err: [:child, :out], &:read)
       $?.termsig.should == Signal.list.fetch('INT')
       err.should.include? ': Interrupt'
-      err.should.include? "from -e:1:in `<main>'"
+      err.should =~ /from -e:1:in [`']<main>'/
     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 4621e36f4488da..772c569f67963e 100644
--- a/spec/ruby/core/exception/no_method_error_spec.rb
+++ b/spec/ruby/core/exception/no_method_error_spec.rb
@@ -62,12 +62,12 @@
       NoMethodErrorSpecs::NoMethodErrorC.new.a_private_method
     rescue Exception => e
       e.should be_kind_of(NoMethodError)
-      e.message.lines[0].should =~ /private method `a_private_method' called for /
+      e.message.lines[0].should =~ /private method [`']a_private_method' called for /
     end
   end
 
   ruby_version_is ""..."3.3" do
-    it "calls receiver.inspect only when calling Exception#message" do
+    it "calls #inspect when calling Exception#message" do
       ScratchPad.record []
       test_class = Class.new do
         def inspect
@@ -76,19 +76,163 @@ def inspect
         end
       end
       instance = test_class.new
+
       begin
         instance.bar
-      rescue Exception => e
-        e.name.should == :bar
-        ScratchPad.recorded.should == []
-        e.message.should =~ /undefined method.+\bbar\b/
+      rescue NoMethodError => error
+        error.message.should =~ /\Aundefined method [`']bar' for <inspect>:#<Class:0x\h+>$/
         ScratchPad.recorded.should == [:inspect_called]
       end
     end
+
+    it "fallbacks to a simpler representation of the receiver when receiver.inspect raises an exception" do
+      test_class = Class.new do
+        def inspect
+          raise NoMethodErrorSpecs::InstanceException
+        end
+      end
+      instance = test_class.new
+
+      begin
+        instance.bar
+      rescue NoMethodError => error
+        message = error.message
+        message.should =~ /undefined method.+\bbar\b/
+        message.should include test_class.inspect
+      end
+    end
+
+    it "uses #name to display the receiver if it is a class" do
+      klass = Class.new { def self.name; "MyClass"; end }
+
+      begin
+        klass.foo
+      rescue NoMethodError => error
+        error.message.should =~ /\Aundefined method [`']foo' for MyClass:Class$/
+      end
+    end
+
+    it "uses #name to display the receiver if it is a module" do
+      mod = Module.new { def self.name; "MyModule"; end }
+
+      begin
+        mod.foo
+      rescue NoMethodError => error
+        error.message.should =~ /\Aundefined method [`']foo' for MyModule:Module$/
+      end
+    end
   end
 
   ruby_version_is "3.3" do
-    it "does not call receiver.inspect even when calling Exception#message" do
+    it "uses a literal name when receiver is nil" do
+      begin
+        nil.foo
+      rescue NoMethodError => error
+        error.message.should =~ /\Aundefined method [`']foo' for nil\Z/
+      end
+    end
+
+    it "uses a literal name when receiver is true" do
+      begin
+        true.foo
+      rescue NoMethodError => error
+        error.message.should =~ /\Aundefined method [`']foo' for true\Z/
+      end
+    end
+
+    it "uses a literal name when receiver is false" do
+      begin
+        false.foo
+      rescue NoMethodError => error
+        error.message.should =~ /\Aundefined method [`']foo' for false\Z/
+      end
+    end
+
+    it "uses #name when receiver is a class" do
+      klass = Class.new { def self.name; "MyClass"; end }
+
+      begin
+        klass.foo
+      rescue NoMethodError => error
+        error.message.should =~ /\Aundefined method [`']foo' for class MyClass\Z/
+      end
+    end
+
+    it "uses class' string representation when receiver is an anonymous class" do
+      klass = Class.new
+
+      begin
+        klass.foo
+      rescue NoMethodError => error
+        error.message.should =~ /\Aundefined method [`']foo' for class #<Class:0x\h+>\Z/
+      end
+    end
+
+    it "uses class' string representation when receiver is a singleton class" do
+      obj = Object.new
+      singleton_class = obj.singleton_class
+
+      begin
+        singleton_class.foo
+      rescue NoMethodError => error
+        error.message.should =~ /\Aundefined method [`']foo' for class #<Class:#<Object:0x\h+>>\Z/
+      end
+    end
+
+    it "uses #name when receiver is a module" do
+      mod = Module.new { def self.name; "MyModule"; end }
+
+      begin
+        mod.foo
+      rescue NoMethodError => error
+        error.message.should =~ /\Aundefined method [`']foo' for module MyModule\Z/
+      end
+    end
+
+    it "uses module's string representation when receiver is an anonymous module" do
+      m = Module.new
+
+      begin
+        m.foo
+      rescue NoMethodError => error
+        error.message.should =~ /\Aundefined method [`']foo' for module #<Module:0x\h+>\Z/
+      end
+    end
+
+    it "uses class #name when receiver is an ordinary object" do
+      klass = Class.new { def self.name; "MyClass"; end }
+      instance = klass.new
+
+      begin
+        instance.bar
+      rescue NoMethodError => error
+        error.message.should =~ /\Aundefined method [`']bar' for an instance of MyClass\Z/
+      end
+    end
+
+    it "uses class string representation when receiver is an instance of anonymous class" do
+      klass = Class.new
+      instance = klass.new
+
+      begin
+        instance.bar
+      rescue NoMethodError => error
+        error.message.should =~ /\Aundefined method [`']bar' for an instance of #<Class:0x\h+>\Z/
+      end
+    end
+
+    it "uses class name when receiver has a singleton class" do
+      instance = NoMethodErrorSpecs::NoMethodErrorA.new
+      def instance.foo; end
+
+      begin
+        instance.bar
+      rescue NoMethodError => error
+        error.message.should =~ /\Aundefined method [`']bar' for #<NoMethodErrorSpecs::NoMethodErrorA:0x\h+>\Z/
+      end
+    end
+
+    it "does not call #inspect when calling Exception#message" do
       ScratchPad.record []
       test_class = Class.new do
         def inspect
@@ -97,47 +241,29 @@ def inspect
         end
       end
       instance = test_class.new
+
       begin
         instance.bar
-      rescue Exception => e
-        e.name.should == :bar
-        ScratchPad.recorded.should == []
-        e.message.should =~ /undefined method.+\bbar\b/
+      rescue NoMethodError => error
+        error.message.should =~ /\Aundefined method [`']bar' for an instance of #<Class:0x\h+>\Z/
         ScratchPad.recorded.should == []
       end
     end
-  end
 
-  it "fallbacks to a simpler representation of the receiver when receiver.inspect raises an exception" do
-    test_class = Class.new do
-      def inspect
-        raise NoMethodErrorSpecs::InstanceException
-      end
-    end
-    instance = test_class.new
-    begin
-      instance.bar
-    rescue Exception => e
-      e.name.should == :bar
-      message = e.message
-      message.should =~ /undefined method.+\bbar\b/
-      message.should include test_class.inspect
-    end
-  end
+    it "does not truncate long class names" do
+      class_name = 'ExceptionSpecs::A' + 'a'*100
 
-  it "uses #name to display the receiver if it is a class or a module" do
-    klass = Class.new { def self.name; "MyClass"; end }
-    begin
-      klass.foo
-    rescue NoMethodError => error
-      error.message.lines.first.chomp.should =~ /^undefined method `foo' for /
-    end
+      begin
+        eval <<~RUBY
+          class #{class_name}
+          end
 
-    mod = Module.new { def self.name; "MyModule"; end }
-    begin
-      mod.foo
-    rescue NoMethodError => error
-      error.message.lines.first.chomp.should =~ /^undefined method `foo' for /
+          obj = #{class_name}.new
+          obj.foo
+        RUBY
+      rescue NoMethodError => error
+        error.message.should =~ /\Aundefined method [`']foo' for an instance of #{class_name}\Z/
+      end
     end
   end
 end
diff --git a/spec/ruby/core/exception/set_backtrace_spec.rb b/spec/ruby/core/exception/set_backtrace_spec.rb
index ba2e1bf7aa4df4..2cd93326ecfb36 100644
--- a/spec/ruby/core/exception/set_backtrace_spec.rb
+++ b/spec/ruby/core/exception/set_backtrace_spec.rb
@@ -1,56 +1,23 @@
 require_relative '../../spec_helper'
 require_relative 'fixtures/common'
+require_relative 'shared/set_backtrace'
 
 describe "Exception#set_backtrace" do
-  it "accepts an Array of Strings" do
-    err = RuntimeError.new
-    err.set_backtrace ["unhappy"]
-    err.backtrace.should == ["unhappy"]
-  end
-
   it "allows the user to set the backtrace from a rescued exception" do
     bt  = ExceptionSpecs::Backtrace.backtrace
     err = RuntimeError.new
+    err.backtrace.should == nil
+    err.backtrace_locations.should == nil
 
     err.set_backtrace bt
-    err.backtrace.should == bt
-  end
-
-  it "accepts an empty Array" do
-    err = RuntimeError.new
-    err.set_backtrace []
-    err.backtrace.should == []
-  end
-
-  it "accepts a String" do
-    err = RuntimeError.new
-    err.set_backtrace "unhappy"
-    err.backtrace.should == ["unhappy"]
-  end
 
-  it "accepts nil" do
-    err = RuntimeError.new
-    err.set_backtrace nil
-    err.backtrace.should be_nil
-  end
-
-  it "raises a TypeError when passed a Symbol" do
-    err = RuntimeError.new
-    -> { err.set_backtrace :unhappy }.should raise_error(TypeError)
+    err.backtrace.should == bt
+    err.backtrace_locations.should == nil
   end
 
-  it "raises a TypeError when the Array contains a Symbol" do
+  it_behaves_like :exception_set_backtrace, -> backtrace {
     err = RuntimeError.new
-    -> { err.set_backtrace ["String", :unhappy] }.should raise_error(TypeError)
-  end
-
-  it "raises a TypeError when the array contains nil" do
-    err = Exception.new
-    -> { err.set_backtrace ["String", nil] }.should raise_error(TypeError)
-  end
-
-  it "raises a TypeError when the argument is a nested array" do
-    err = Exception.new
-    -> { err.set_backtrace ["String", ["String"]] }.should raise_error(TypeError)
-  end
+    err.set_backtrace(backtrace)
+    err
+  }
 end
diff --git a/spec/ruby/core/exception/shared/set_backtrace.rb b/spec/ruby/core/exception/shared/set_backtrace.rb
new file mode 100644
index 00000000000000..c6213b42b48920
--- /dev/null
+++ b/spec/ruby/core/exception/shared/set_backtrace.rb
@@ -0,0 +1,64 @@
+require_relative '../fixtures/common'
+
+describe :exception_set_backtrace, shared: true do
+  it "accepts an Array of Strings" do
+    err = @method.call(["unhappy"])
+    err.backtrace.should == ["unhappy"]
+  end
+
+  it "allows the user to set the backtrace from a rescued exception" do
+    bt  = ExceptionSpecs::Backtrace.backtrace
+    err = @method.call(bt)
+    err.backtrace.should == bt
+  end
+
+  ruby_version_is "3.4" do
+    it "allows the user to set backtrace locations from a rescued exception" do
+      bt_locations = ExceptionSpecs::Backtrace.backtrace_locations
+      err = @method.call(bt_locations)
+      err.backtrace_locations.size.should == bt_locations.size
+      err.backtrace_locations.each_with_index do |loc, index|
+        other_loc = bt_locations[index]
+
+        loc.path.should == other_loc.path
+        loc.label.should == other_loc.label
+        loc.base_label.should == other_loc.base_label
+        loc.lineno.should == other_loc.lineno
+        loc.absolute_path.should == other_loc.absolute_path
+        loc.to_s.should == other_loc.to_s
+      end
+      err.backtrace.size.should == err.backtrace_locations.size
+    end
+  end
+
+  it "accepts an empty Array" do
+    err = @method.call([])
+    err.backtrace.should == []
+  end
+
+  it "accepts a String" do
+    err = @method.call("unhappy")
+    err.backtrace.should == ["unhappy"]
+  end
+
+  it "accepts nil" do
+    err = @method.call(nil)
+    err.backtrace.should be_nil
+  end
+
+  it "raises a TypeError when passed a Symbol" do
+    -> { @method.call(:unhappy) }.should raise_error(TypeError)
+  end
+
+  it "raises a TypeError when the Array contains a Symbol" do
+    -> { @method.call(["String", :unhappy]) }.should raise_error(TypeError)
+  end
+
+  it "raises a TypeError when the array contains nil" do
+    -> { @method.call(["String", nil]) }.should raise_error(TypeError)
+  end
+
+  it "raises a TypeError when the argument is a nested array" do
+    -> { @method.call(["String", ["String"]]) }.should raise_error(TypeError)
+  end
+end
diff --git a/spec/ruby/core/exception/syntax_error_spec.rb b/spec/ruby/core/exception/syntax_error_spec.rb
new file mode 100644
index 00000000000000..4c713a35077d2a
--- /dev/null
+++ b/spec/ruby/core/exception/syntax_error_spec.rb
@@ -0,0 +1,25 @@
+require_relative '../../spec_helper'
+
+describe "SyntaxError#path" do
+  it "returns the file path provided to eval" do
+    filename = "speccing.rb"
+
+    -> {
+      eval("if true", TOPLEVEL_BINDING, filename)
+    }.should raise_error(SyntaxError) { |e|
+      e.path.should == filename
+    }
+  end
+
+  it "returns the file path that raised an exception" do
+    expected_path = fixture(__FILE__, "syntax_error.rb")
+
+    -> {
+      require_relative "fixtures/syntax_error"
+    }.should raise_error(SyntaxError) { |e| e.path.should == expected_path }
+  end
+
+  it "returns nil when constructed directly" do
+    SyntaxError.new.path.should == nil
+  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 73167bc28892ba..4fe51901c84241 100644
--- a/spec/ruby/core/exception/system_call_error_spec.rb
+++ b/spec/ruby/core/exception/system_call_error_spec.rb
@@ -16,6 +16,8 @@ def initialize
     exc = ExceptionSpecs::SCESub.new
     ScratchPad.recorded.should equal(:initialize)
     exc.should be_an_instance_of(ExceptionSpecs::SCESub)
+  ensure
+    ExceptionSpecs.send(:remove_const, :SCESub)
   end
 end
 
@@ -25,6 +27,7 @@ def initialize
     @example_errno_class = Errno::EINVAL
     @last_known_errno = Errno.constants.size - 1
     @unknown_errno = Errno.constants.size
+    @some_human_readable = /[[:graph:]]+/
   end
 
   it "requires at least one argument" do
@@ -53,6 +56,11 @@ def initialize
     e.should be_an_instance_of(@example_errno_class)
   end
 
+  it "sets an error message corresponding to an appropriate Errno class" do
+    e = SystemCallError.new(@example_errno)
+    e.message.should == 'Invalid argument'
+  end
+
   it "accepts an optional custom message preceding the errno" do
     exc = SystemCallError.new("custom message", @example_errno)
     exc.should be_an_instance_of(@example_errno_class)
@@ -81,6 +89,23 @@ def initialize
     SystemCallError.new('foo', 2.9).should == SystemCallError.new('foo', 2)
   end
 
+  it "treats nil errno as unknown error value" do
+    SystemCallError.new(nil).should be_an_instance_of(SystemCallError)
+  end
+
+  it "treats nil custom message as if it is not passed at all" do
+    exc = SystemCallError.new(nil, @example_errno)
+    exc.message.should == 'Invalid argument'
+  end
+
+  it "sets an 'unknown error' message when an unknown error number" do
+    SystemCallError.new(-1).message.should =~ @some_human_readable
+  end
+
+  it "adds a custom error message to an 'unknown error' message when an unknown error number and a custom message specified" do
+    SystemCallError.new("custom message", -1).message.should =~ /#{@some_human_readable}.* - custom message/
+  end
+
   it "converts to Integer if errno is a Complex convertible to Integer" do
     SystemCallError.new('foo', Complex(2.9, 0)).should == SystemCallError.new('foo', 2)
   end
@@ -115,12 +140,7 @@ def initialize
 
 describe "SystemCallError#message" do
   it "returns the default message when no message is given" do
-    platform_is :aix do
-      SystemCallError.new(2**28).message.should =~ /Error .*occurred/i
-    end
-    platform_is_not :aix do
-      SystemCallError.new(2**28).message.should =~ /Unknown error/i
-    end
+    SystemCallError.new(2**28).message.should =~ @some_human_readable
   end
 
   it "returns the message given as an argument to new" do
diff --git a/spec/ruby/core/exception/to_s_spec.rb b/spec/ruby/core/exception/to_s_spec.rb
index 4c4c7ab432fa7e..65c0d73a988e92 100644
--- a/spec/ruby/core/exception/to_s_spec.rb
+++ b/spec/ruby/core/exception/to_s_spec.rb
@@ -23,7 +23,7 @@
     begin
       puts not_defined
     rescue => exception
-      exception.message.should =~ /undefined local variable or method `not_defined'/
+      exception.message.should =~ /undefined local variable or method [`']not_defined'/
     end
   end
 
diff --git a/spec/ruby/core/exception/top_level_spec.rb b/spec/ruby/core/exception/top_level_spec.rb
index bcd09205b6906d..cc961d06d565df 100644
--- a/spec/ruby/core/exception/top_level_spec.rb
+++ b/spec/ruby/core/exception/top_level_spec.rb
@@ -2,30 +2,38 @@
 
 describe "An Exception reaching the top level" do
   it "is printed on STDERR" do
-    ruby_exe('raise "foo"', args: "2>&1", exit_status: 1).should.include?("in `<main>': foo (RuntimeError)")
+    ruby_exe('raise "foo"', args: "2>&1", exit_status: 1).should =~ /in [`']<main>': foo \(RuntimeError\)/
   end
 
   it "the Exception#cause is printed to STDERR with backtraces" do
     code = <<-RUBY
     def raise_cause
-      raise "the cause"
+      raise "the cause" # 2
     end
     def raise_wrapped
-      raise "wrapped"
+      raise "wrapped" # 5
     end
     begin
-      raise_cause
+      raise_cause # 8
     rescue
-      raise_wrapped
+      raise_wrapped # 10
     end
     RUBY
     lines = ruby_exe(code, args: "2>&1", exit_status: 1).lines
-    lines.reject! { |l| l.include?('rescue in') }
-    lines.map! { |l| l.chomp[/:(in.+)/, 1] }
-    lines.should == ["in `raise_wrapped': wrapped (RuntimeError)",
-                     "in `<main>'",
-                     "in `raise_cause': the cause (RuntimeError)",
-                     "in `<main>'"]
+
+    lines.map! { |l| l.chomp[/:(\d+:in.+)/, 1] }
+    lines[0].should =~ /\A5:in [`'](?:Object#)?raise_wrapped': wrapped \(RuntimeError\)\z/
+    if lines[1].include? 'rescue in'
+      # CRuby < 3.4 has an extra 'rescue in' backtrace entry
+      lines[1].should =~ /\A10:in [`']rescue in <main>'\z/
+      lines.delete_at 1
+      lines[1].should =~ /\A7:in [`']<main>'\z/
+    else
+      lines[1].should =~ /\A10:in [`']<main>'\z/
+    end
+    lines[2].should =~ /\A2:in [`'](?:Object#)?raise_cause': the cause \(RuntimeError\)\z/
+    lines[3].should =~ /\A8:in [`']<main>'\z/
+    lines.size.should == 4
   end
 
   describe "with a custom backtrace" do
diff --git a/spec/ruby/library/fiber/alive_spec.rb b/spec/ruby/core/fiber/alive_spec.rb
similarity index 98%
rename from spec/ruby/library/fiber/alive_spec.rb
rename to spec/ruby/core/fiber/alive_spec.rb
index 47149d5279e19f..a1df5824356d69 100644
--- a/spec/ruby/library/fiber/alive_spec.rb
+++ b/spec/ruby/core/fiber/alive_spec.rb
@@ -1,7 +1,5 @@
 require_relative '../../spec_helper'
 
-require 'fiber'
-
 describe "Fiber#alive?" do
   it "returns true for a Fiber that hasn't had #resume called" do
     fiber = Fiber.new { true }
diff --git a/spec/ruby/core/fiber/blocking_spec.rb b/spec/ruby/core/fiber/blocking_spec.rb
index ebefa116af7ca1..d5caf81fbe1441 100644
--- a/spec/ruby/core/fiber/blocking_spec.rb
+++ b/spec/ruby/core/fiber/blocking_spec.rb
@@ -1,8 +1,6 @@
 require_relative '../../spec_helper'
 require_relative 'shared/blocking'
 
-require "fiber"
-
 describe "Fiber.blocking?" do
   it_behaves_like :non_blocking_fiber, -> { Fiber.blocking? }
 
@@ -59,19 +57,17 @@
   end
 end
 
-ruby_version_is "3.2" do
-  describe "Fiber.blocking" do
-    context "when fiber is non-blocking" do
-      it "can become blocking" do
-        fiber = Fiber.new(blocking: false) do
-          Fiber.blocking do |f|
-            f.blocking? ? :blocking : :non_blocking
-          end
+describe "Fiber.blocking" do
+  context "when fiber is non-blocking" do
+    it "can become blocking" do
+      fiber = Fiber.new(blocking: false) do
+        Fiber.blocking do |f|
+          f.blocking? ? :blocking : :non_blocking
         end
-
-        blocking = fiber.resume
-        blocking.should == :blocking
       end
+
+      blocking = fiber.resume
+      blocking.should == :blocking
     end
   end
 end
diff --git a/spec/ruby/library/fiber/current_spec.rb b/spec/ruby/core/fiber/current_spec.rb
similarity index 84%
rename from spec/ruby/library/fiber/current_spec.rb
rename to spec/ruby/core/fiber/current_spec.rb
index 1467a88d0da09b..b93df77a8996a4 100644
--- a/spec/ruby/library/fiber/current_spec.rb
+++ b/spec/ruby/core/fiber/current_spec.rb
@@ -1,14 +1,6 @@
 require_relative '../../spec_helper'
 
-require 'fiber'
-
 describe "Fiber.current" do
-  ruby_version_is "3.1" do
-    it "is available without an extra require" do
-      ruby_exe("print Fiber.current.class", options: '--disable-gems --disable-did-you-mean').should == "Fiber"
-    end
-  end
-
   it "returns the root Fiber when called outside of a Fiber" do
     root = Fiber.current
     root.should be_an_instance_of(Fiber)
diff --git a/spec/ruby/core/fiber/inspect_spec.rb b/spec/ruby/core/fiber/inspect_spec.rb
index f20a153fc2ef8a..fcfef20716fdf9 100644
--- a/spec/ruby/core/fiber/inspect_spec.rb
+++ b/spec/ruby/core/fiber/inspect_spec.rb
@@ -1,5 +1,4 @@
 require_relative '../../spec_helper'
-require 'fiber'
 
 describe "Fiber#inspect" do
   describe "status" do
diff --git a/spec/ruby/core/fiber/raise_spec.rb b/spec/ruby/core/fiber/raise_spec.rb
index eb4b39c8be55df..124f56fe7da650 100644
--- a/spec/ruby/core/fiber/raise_spec.rb
+++ b/spec/ruby/core/fiber/raise_spec.rb
@@ -42,7 +42,7 @@
     -> { FiberSpecs::NewFiberToRaise.raise FiberSpecs::CustomError, 'test error' }.should raise_error(FiberSpecs::CustomError, 'test error')
   end
 
-  it 'accepts error class with with error message and backtrace information' do
+  it 'accepts error class with error message and backtrace information' do
     -> {
       FiberSpecs::NewFiberToRaise.raise FiberSpecs::CustomError, 'test error', ['foo', 'boo']
     }.should raise_error(FiberSpecs::CustomError) { |e|
@@ -91,12 +91,45 @@
 
     fiber_two.resume.should == [:yield_one, :rescued]
   end
+
+  ruby_version_is "3.4" do
+    it "raises on the resumed fiber" do
+      root_fiber = Fiber.current
+      f1 = Fiber.new { root_fiber.transfer }
+      f2 = Fiber.new { f1.resume }
+      f2.transfer
+
+      -> do
+        f2.raise(RuntimeError, "Expected error")
+      end.should raise_error(RuntimeError, "Expected error")
+    end
+
+    it "raises on itself" do
+      -> do
+        Fiber.current.raise(RuntimeError, "Expected error")
+      end.should raise_error(RuntimeError, "Expected error")
+    end
+
+    it "should raise on parent fiber" do
+      f2 = nil
+      f1 = Fiber.new do
+        # This is equivalent to Kernel#raise:
+        f2.raise(RuntimeError, "Expected error")
+      end
+      f2 = Fiber.new do
+        f1.resume
+      end
+
+      -> do
+        f2.resume
+      end.should raise_error(RuntimeError, "Expected error")
+    end
+  end
 end
 
 
 describe "Fiber#raise" do
   it "transfers and raises on a transferring fiber" do
-    require "fiber"
     root = Fiber.current
     fiber = Fiber.new { root.transfer }
     fiber.transfer
diff --git a/spec/ruby/core/fiber/resume_spec.rb b/spec/ruby/core/fiber/resume_spec.rb
index ab9a6799abf196..4b20f4b4bfba18 100644
--- a/spec/ruby/core/fiber/resume_spec.rb
+++ b/spec/ruby/core/fiber/resume_spec.rb
@@ -1,5 +1,5 @@
 require_relative '../../spec_helper'
-require_relative '../../shared/fiber/resume'
+require_relative 'shared/resume'
 
 describe "Fiber#resume" do
   it_behaves_like :fiber_resume, :resume
@@ -67,4 +67,17 @@
 
     ruby_exe(code).should == "ensure executed\n"
   end
+
+  it "can work with Fiber#transfer" do
+    fiber1 = Fiber.new { true }
+    fiber2 = Fiber.new { fiber1.transfer; Fiber.yield 10 ; Fiber.yield 20; raise }
+    fiber2.resume.should == 10
+    fiber2.resume.should == 20
+  end
+
+  it "raises a FiberError if the Fiber attempts to resume a resuming fiber" do
+    root_fiber = Fiber.current
+    fiber1 = Fiber.new { root_fiber.resume }
+    -> { fiber1.resume }.should raise_error(FiberError, /attempt to resume a resuming fiber/)
+  end
 end
diff --git a/spec/ruby/shared/fiber/resume.rb b/spec/ruby/core/fiber/shared/resume.rb
similarity index 95%
rename from spec/ruby/shared/fiber/resume.rb
rename to spec/ruby/core/fiber/shared/resume.rb
index f3477804ad1554..5ee27d1d24f281 100644
--- a/spec/ruby/shared/fiber/resume.rb
+++ b/spec/ruby/core/fiber/shared/resume.rb
@@ -1,7 +1,7 @@
 describe :fiber_resume, shared: true do
   it "can be invoked from the root Fiber" do
-   fiber = Fiber.new { :fiber }
-   fiber.send(@method).should == :fiber
+    fiber = Fiber.new { :fiber }
+    fiber.send(@method).should == :fiber
   end
 
   it "raises a FiberError if invoked from a different Thread" do
diff --git a/spec/ruby/core/fiber/storage_spec.rb b/spec/ruby/core/fiber/storage_spec.rb
index 5c87ed5d41d560..015caaf3bbff48 100644
--- a/spec/ruby/core/fiber/storage_spec.rb
+++ b/spec/ruby/core/fiber/storage_spec.rb
@@ -1,158 +1,181 @@
 require_relative '../../spec_helper'
 
-ruby_version_is "3.2" do
-  describe "Fiber.new(storage:)" do
-    it "creates a Fiber with the given storage" do
-      storage = {life: 42}
-      fiber = Fiber.new(storage: storage) { Fiber.current.storage }
-      fiber.resume.should == storage
-    end
+describe "Fiber.new(storage:)" do
+  it "creates a Fiber with the given storage" do
+    storage = {life: 42}
+    fiber = Fiber.new(storage: storage) { Fiber.current.storage }
+    fiber.resume.should == storage
+  end
 
-    it "creates a fiber with lazily initialized storage" do
-      Fiber.new(storage: nil) { Fiber[:x] = 10; Fiber.current.storage }.resume.should == {x: 10}
-    end
+  it "creates a fiber with lazily initialized storage" do
+    Fiber.new(storage: nil) { Fiber[:x] = 10; Fiber.current.storage }.resume.should == {x: 10}
+  end
 
-    it "creates a fiber by inheriting the storage of the parent fiber" do
-      fiber = Fiber.new(storage: {life: 42}) do
-        Fiber.new { Fiber.current.storage }.resume
-      end
-      fiber.resume.should == {life: 42}
+  it "creates a fiber by inheriting the storage of the parent fiber" do
+    fiber = Fiber.new(storage: {life: 42}) do
+      Fiber.new { Fiber.current.storage }.resume
     end
+    fiber.resume.should == {life: 42}
+  end
 
-    it "cannot create a fiber with non-hash storage" do
-      -> { Fiber.new(storage: 42) {} }.should raise_error(TypeError)
-    end
+  it "cannot create a fiber with non-hash storage" do
+    -> { Fiber.new(storage: 42) {} }.should raise_error(TypeError)
+  end
 
-    it "cannot create a fiber with a frozen hash as storage" do
-      -> { Fiber.new(storage: {life: 43}.freeze) {} }.should raise_error(FrozenError)
-    end
+  it "cannot create a fiber with a frozen hash as storage" do
+    -> { Fiber.new(storage: {life: 43}.freeze) {} }.should raise_error(FrozenError)
+  end
 
-    it "cannot create a fiber with a storage hash with non-symbol keys" do
-      -> { Fiber.new(storage: {life: 43, Object.new => 44}) {} }.should raise_error(TypeError)
-    end
+  it "cannot create a fiber with a storage hash with non-symbol keys" do
+    -> { Fiber.new(storage: {life: 43, Object.new => 44}) {} }.should raise_error(TypeError)
   end
+end
 
-  describe "Fiber#storage" do
-    it "cannot be accessed from a different fiber" do
-      f = Fiber.new(storage: {life: 42}) { nil }
-      -> {
-        f.storage
-      }.should raise_error(ArgumentError, /Fiber storage can only be accessed from the Fiber it belongs to/)
-    end
+describe "Fiber#storage" do
+  it "cannot be accessed from a different fiber" do
+    f = Fiber.new(storage: {life: 42}) { nil }
+    -> {
+      f.storage
+    }.should raise_error(ArgumentError, /Fiber storage can only be accessed from the Fiber it belongs to/)
   end
+end
 
-  describe "Fiber#storage=" do
-    it "can clear the storage of the fiber" do
-      fiber = Fiber.new(storage: {life: 42}) do
-        Fiber.current.storage = nil
-        Fiber[:x] = 10
-        Fiber.current.storage
-      end
-      fiber.resume.should == {x: 10}
+describe "Fiber#storage=" do
+  it "can clear the storage of the fiber" do
+    fiber = Fiber.new(storage: {life: 42}) do
+      Fiber.current.storage = nil
+      Fiber[:x] = 10
+      Fiber.current.storage
     end
+    fiber.resume.should == {x: 10}
+  end
 
-    it "can set the storage of the fiber" do
-      fiber = Fiber.new(storage: {life: 42}) do
-        Fiber.current.storage = {life: 43}
-        Fiber.current.storage
-      end
-      fiber.resume.should == {life: 43}
+  it "can set the storage of the fiber" do
+    fiber = Fiber.new(storage: {life: 42}) do
+      Fiber.current.storage = {life: 43}
+      Fiber.current.storage
     end
+    fiber.resume.should == {life: 43}
+  end
 
-    it "can't set the storage of the fiber to non-hash" do
-      -> { Fiber.current.storage = 42 }.should raise_error(TypeError)
-    end
+  it "can't set the storage of the fiber to non-hash" do
+    -> { Fiber.current.storage = 42 }.should raise_error(TypeError)
+  end
 
-    it "can't set the storage of the fiber to a frozen hash" do
-      -> { Fiber.current.storage = {life: 43}.freeze }.should raise_error(FrozenError)
-    end
+  it "can't set the storage of the fiber to a frozen hash" do
+    -> { Fiber.current.storage = {life: 43}.freeze }.should raise_error(FrozenError)
+  end
 
-    it "can't set the storage of the fiber to a hash with non-symbol keys" do
-      -> { Fiber.current.storage = {life: 43, Object.new => 44} }.should raise_error(TypeError)
-    end
+  it "can't set the storage of the fiber to a hash with non-symbol keys" do
+    -> { Fiber.current.storage = {life: 43, Object.new => 44} }.should raise_error(TypeError)
   end
+end
 
-  describe "Fiber.[]" do
-    it "returns the value of the given key in the storage of the current fiber" do
-      Fiber.new(storage: {life: 42}) { Fiber[:life] }.resume.should == 42
-    end
+describe "Fiber.[]" do
+  it "returns the value of the given key in the storage of the current fiber" do
+    Fiber.new(storage: {life: 42}) { Fiber[:life] }.resume.should == 42
+  end
 
-    it "returns nil if the key is not present in the storage of the current fiber" do
-      Fiber.new(storage: {life: 42}) { Fiber[:death] }.resume.should be_nil
-    end
+  it "returns nil if the key is not present in the storage of the current fiber" do
+    Fiber.new(storage: {life: 42}) { Fiber[:death] }.resume.should be_nil
+  end
+
+  it "returns nil if the current fiber has no storage" do
+    Fiber.new { Fiber[:life] }.resume.should be_nil
+  end
 
-    it "returns nil if the current fiber has no storage" do
-      Fiber.new { Fiber[:life] }.resume.should be_nil
+  ruby_version_is "3.2.3" do
+    it "can use dynamically defined keys" do
+      key = :"#{self.class.name}#.#{self.object_id}"
+      Fiber.new { Fiber[key] = 42; Fiber[key] }.resume.should == 42
     end
 
-    ruby_version_is "3.2.3" do
-      it "can use dynamically defined keys" do
-        key = :"#{self.class.name}#.#{self.object_id}"
-        Fiber.new { Fiber[key] = 42; Fiber[key] }.resume.should == 42
+    it "can't use invalid keys" do
+      invalid_keys = [Object.new, 12]
+      invalid_keys.each do |key|
+        -> { Fiber[key] }.should raise_error(TypeError)
       end
+    end
+  end
 
-      it "can't use invalid keys" do
-        invalid_keys = [Object.new, "Foo", 12]
-        invalid_keys.each do |key|
-          -> { Fiber[key] }.should raise_error(TypeError)
-        end
-      end
+  ruby_bug "#20978", ""..."3.4" do
+    it "can use keys as strings" do
+      key = Object.new
+      def key.to_str; "Foo"; end
+      Fiber.new { Fiber[key] = 42; Fiber["Foo"] }.resume.should == 42
     end
 
-    it "can access the storage of the parent fiber" do
-      f = Fiber.new(storage: {life: 42}) do
-        Fiber.new { Fiber[:life] }.resume
-      end
-      f.resume.should == 42
+    it "converts a String key into a Symbol" do
+      Fiber.new { Fiber["key"] = 42; Fiber[:key] }.resume.should == 42
+      Fiber.new { Fiber[:key] = 42; Fiber["key"] }.resume.should == 42
     end
 
-    it "can't access the storage of the fiber with non-symbol keys" do
-      -> { Fiber[Object.new] }.should raise_error(TypeError)
+    it "can use any object that responds to #to_str as a key" do
+      key = mock("key")
+      key.should_receive(:to_str).twice.and_return("key")
+      Fiber.new { Fiber[key] = 42; Fiber[key] }.resume.should == 42
     end
   end
 
-  describe "Fiber.[]=" do
-    it "sets the value of the given key in the storage of the current fiber" do
-      Fiber.new(storage: {life: 42}) { Fiber[:life] = 43; Fiber[:life] }.resume.should == 43
-    end
+  it "does not call #to_sym on the key" do
+    key = mock("key")
+    key.should_not_receive(:to_sym)
+    -> { Fiber[key] }.should raise_error(TypeError)
+  end
 
-    it "sets the value of the given key in the storage of the current fiber" do
-      Fiber.new(storage: {life: 42}) { Fiber[:death] = 43; Fiber[:death] }.resume.should == 43
+  it "can access the storage of the parent fiber" do
+    f = Fiber.new(storage: {life: 42}) do
+      Fiber.new { Fiber[:life] }.resume
     end
+    f.resume.should == 42
+  end
 
-    it "sets the value of the given key in the storage of the current fiber" do
-      Fiber.new { Fiber[:life] = 43; Fiber[:life] }.resume.should == 43
-    end
+  it "can't access the storage of the fiber with non-symbol keys" do
+    -> { Fiber[Object.new] }.should raise_error(TypeError)
+  end
+end
 
-    it "does not overwrite the storage of the parent fiber" do
-      f = Fiber.new(storage: {life: 42}) do
-        Fiber.yield Fiber.new { Fiber[:life] = 43; Fiber[:life] }.resume
-        Fiber[:life]
-      end
-      f.resume.should == 43 # Value of the inner fiber
-      f.resume.should == 42 # Value of the outer fiber
-    end
+describe "Fiber.[]=" do
+  it "sets the value of the given key in the storage of the current fiber" do
+    Fiber.new(storage: {life: 42}) { Fiber[:life] = 43; Fiber[:life] }.resume.should == 43
+  end
+
+  it "sets the value of the given key in the storage of the current fiber" do
+    Fiber.new(storage: {life: 42}) { Fiber[:death] = 43; Fiber[:death] }.resume.should == 43
+  end
+
+  it "sets the value of the given key in the storage of the current fiber" do
+    Fiber.new { Fiber[:life] = 43; Fiber[:life] }.resume.should == 43
+  end
 
-    it "can't access the storage of the fiber with non-symbol keys" do
-      -> { Fiber[Object.new] = 44 }.should raise_error(TypeError)
+  it "does not overwrite the storage of the parent fiber" do
+    f = Fiber.new(storage: {life: 42}) do
+      Fiber.yield Fiber.new { Fiber[:life] = 43; Fiber[:life] }.resume
+      Fiber[:life]
     end
+    f.resume.should == 43 # Value of the inner fiber
+    f.resume.should == 42 # Value of the outer fiber
+  end
 
-    ruby_version_is "3.3" do
-      it "deletes the fiber storage key when assigning nil" do
-        Fiber.new(storage: {life: 42}) {
-          Fiber[:life] = nil
-          Fiber.current.storage
-        }.resume.should == {}
-      end
+  it "can't access the storage of the fiber with non-symbol keys" do
+    -> { Fiber[Object.new] = 44 }.should raise_error(TypeError)
+  end
+
+  ruby_version_is "3.3" do
+    it "deletes the fiber storage key when assigning nil" do
+      Fiber.new(storage: {life: 42}) {
+        Fiber[:life] = nil
+        Fiber.current.storage
+      }.resume.should == {}
     end
   end
+end
 
-  describe "Thread.new" do
-    it "creates a thread with the storage of the current fiber" do
-      fiber = Fiber.new(storage: {life: 42}) do
-        Thread.new { Fiber.current.storage }.value
-      end
-      fiber.resume.should == {life: 42}
+describe "Thread.new" do
+  it "creates a thread with the storage of the current fiber" do
+    fiber = Fiber.new(storage: {life: 42}) do
+      Thread.new { Fiber.current.storage }.value
     end
+    fiber.resume.should == {life: 42}
   end
 end
diff --git a/spec/ruby/library/fiber/transfer_spec.rb b/spec/ruby/core/fiber/transfer_spec.rb
similarity index 97%
rename from spec/ruby/library/fiber/transfer_spec.rb
rename to spec/ruby/core/fiber/transfer_spec.rb
index e20d51352e179d..238721475dd84b 100644
--- a/spec/ruby/library/fiber/transfer_spec.rb
+++ b/spec/ruby/core/fiber/transfer_spec.rb
@@ -1,7 +1,5 @@
 require_relative '../../spec_helper'
-require_relative '../../shared/fiber/resume'
-
-require 'fiber'
+require_relative 'shared/resume'
 
 describe "Fiber#transfer" do
   it_behaves_like :fiber_resume, :transfer
diff --git a/spec/ruby/core/file/atime_spec.rb b/spec/ruby/core/file/atime_spec.rb
index 1b47576e6b996f..e47e70e5acf35b 100644
--- a/spec/ruby/core/file/atime_spec.rb
+++ b/spec/ruby/core/file/atime_spec.rb
@@ -27,6 +27,9 @@
         else
           File.atime(__FILE__).usec.should == 0
         end
+      rescue Errno::ENOENT => e
+        # Native Windows don't have stat command.
+        skip e.message
       end
     end
   end
diff --git a/spec/ruby/core/file/birthtime_spec.rb b/spec/ruby/core/file/birthtime_spec.rb
index 755601df64885a..f82eaf7ccaf6a2 100644
--- a/spec/ruby/core/file/birthtime_spec.rb
+++ b/spec/ruby/core/file/birthtime_spec.rb
@@ -1,60 +1,56 @@
 require_relative '../../spec_helper'
 
-describe "File.birthtime" do
-  before :each do
-    @file = __FILE__
-  end
+platform_is :windows, :darwin, :freebsd, :netbsd, :linux do
+  not_implemented_messages = [
+    "birthtime() function is unimplemented", # unsupported OS/version
+    "birthtime is unimplemented",            # unsupported filesystem
+  ]
+
+  describe "File.birthtime" do
+    before :each do
+      @file = __FILE__
+    end
 
-  after :each do
-    @file = nil
-  end
+    after :each do
+      @file = nil
+    end
 
-  platform_is :windows, :darwin, :freebsd, :netbsd do
     it "returns the birth time for the named file as a Time object" do
       File.birthtime(@file)
       File.birthtime(@file).should be_kind_of(Time)
+    rescue NotImplementedError => e
+      e.message.should.start_with?(*not_implemented_messages)
     end
 
     it "accepts an object that has a #to_path method" do
+      File.birthtime(@file) # Avoid to failure of mock object with old Kernel and glibc
       File.birthtime(mock_to_path(@file))
+    rescue NotImplementedError => e
+      e.message.should.start_with?(*not_implemented_messages)
     end
 
     it "raises an Errno::ENOENT exception if the file is not found" do
       -> { File.birthtime('bogus') }.should raise_error(Errno::ENOENT)
+    rescue NotImplementedError => e
+      e.message.should.start_with?(*not_implemented_messages)
     end
   end
 
-  platform_is :openbsd do
-    it "raises an NotImplementedError" do
-      -> { File.birthtime(@file) }.should raise_error(NotImplementedError)
+  describe "File#birthtime" do
+    before :each do
+      @file = File.open(__FILE__)
     end
-  end
-
-  # TODO: depends on Linux kernel version
-end
 
-describe "File#birthtime" do
-  before :each do
-    @file = File.open(__FILE__)
-  end
-
-  after :each do
-    @file.close
-    @file = nil
-  end
+    after :each do
+      @file.close
+      @file = nil
+    end
 
-  platform_is :windows, :darwin, :freebsd, :netbsd do
     it "returns the birth time for self" do
       @file.birthtime
       @file.birthtime.should be_kind_of(Time)
+    rescue NotImplementedError => e
+      e.message.should.start_with?(*not_implemented_messages)
     end
   end
-
-  platform_is :openbsd do
-    it "raises an NotImplementedError" do
-      -> { @file.birthtime }.should raise_error(NotImplementedError)
-    end
-  end
-
-  # TODO: depends on Linux kernel version
 end
diff --git a/spec/ruby/core/file/chown_spec.rb b/spec/ruby/core/file/chown_spec.rb
index 8cc8f0d04be60e..4db0e3712c2152 100644
--- a/spec/ruby/core/file/chown_spec.rb
+++ b/spec/ruby/core/file/chown_spec.rb
@@ -78,15 +78,15 @@
 end
 
 describe "File#chown" do
-    before :each do
-      @fname = tmp('file_chown_test')
-      @file = File.open(@fname, 'w')
-    end
+  before :each do
+    @fname = tmp('file_chown_test')
+    @file = File.open(@fname, 'w')
+  end
 
-    after :each do
-      @file.close unless @file.closed?
-      rm_r @fname
-    end
+  after :each do
+    @file.close unless @file.closed?
+    rm_r @fname
+  end
 
   as_superuser do
     platform_is :windows do
diff --git a/spec/ruby/core/file/constants/constants_spec.rb b/spec/ruby/core/file/constants/constants_spec.rb
index 86946822c56fde..bba248c21e20ad 100644
--- a/spec/ruby/core/file/constants/constants_spec.rb
+++ b/spec/ruby/core/file/constants/constants_spec.rb
@@ -4,7 +4,7 @@
   "FNM_DOTMATCH", "FNM_EXTGLOB", "FNM_NOESCAPE", "FNM_PATHNAME",
   "FNM_SYSCASE", "LOCK_EX", "LOCK_NB", "LOCK_SH",
   "LOCK_UN", "NONBLOCK", "RDONLY",
-  "RDWR", "TRUNC", "WRONLY"].each do |const|
+  "RDWR", "TRUNC", "WRONLY", "SHARE_DELETE"].each do |const|
   describe "File::Constants::#{const}" do
     it "is defined" do
       File::Constants.const_defined?(const).should be_true
diff --git a/spec/ruby/core/file/ctime_spec.rb b/spec/ruby/core/file/ctime_spec.rb
index d17ba1a77f29a0..718f26d5cc9f8d 100644
--- a/spec/ruby/core/file/ctime_spec.rb
+++ b/spec/ruby/core/file/ctime_spec.rb
@@ -22,6 +22,9 @@
       else
         File.ctime(__FILE__).usec.should == 0
       end
+    rescue Errno::ENOENT => e
+      # Windows don't have stat command.
+      skip e.message
     end
   end
 
diff --git a/spec/ruby/core/file/dirname_spec.rb b/spec/ruby/core/file/dirname_spec.rb
index 8dd6c4ca881599..8e6016ce6fef5b 100644
--- a/spec/ruby/core/file/dirname_spec.rb
+++ b/spec/ruby/core/file/dirname_spec.rb
@@ -11,34 +11,32 @@
     File.dirname('/foo/foo').should == '/foo'
   end
 
-  ruby_version_is '3.1' do
-    context "when level is passed" do
-      it "returns all the components of filename except the last parts by the level" do
-        File.dirname('/home/jason', 2).should == '/'
-        File.dirname('/home/jason/poot.txt', 2).should == '/home'
-      end
-
-      it "returns the same String if the level is 0" do
-        File.dirname('poot.txt', 0).should == 'poot.txt'
-        File.dirname('/', 0).should == '/'
-      end
-
-      it "raises ArgumentError if the level is negative" do
-        -> {
-          File.dirname('/home/jason', -1)
-        }.should raise_error(ArgumentError, "negative level: -1")
-      end
-
-      it "returns '/' when level exceeds the number of segments in the path" do
-        File.dirname("/home/jason", 100).should == '/'
-      end
-
-      it "calls #to_int if passed not numeric value" do
-        object = Object.new
-        def object.to_int; 2; end
-
-        File.dirname("/a/b/c/d", object).should == '/a/b'
-      end
+  context "when level is passed" do
+    it "returns all the components of filename except the last parts by the level" do
+      File.dirname('/home/jason', 2).should == '/'
+      File.dirname('/home/jason/poot.txt', 2).should == '/home'
+    end
+
+    it "returns the same String if the level is 0" do
+      File.dirname('poot.txt', 0).should == 'poot.txt'
+      File.dirname('/', 0).should == '/'
+    end
+
+    it "raises ArgumentError if the level is negative" do
+      -> {
+        File.dirname('/home/jason', -1)
+      }.should raise_error(ArgumentError, "negative level: -1")
+    end
+
+    it "returns '/' when level exceeds the number of segments in the path" do
+      File.dirname("/home/jason", 100).should == '/'
+    end
+
+    it "calls #to_int if passed not numeric value" do
+      object = Object.new
+      def object.to_int; 2; end
+
+      File.dirname("/a/b/c/d", object).should == '/a/b'
     end
   end
 
@@ -65,19 +63,19 @@ def object.to_int; 2; end
   end
 
   it "returns all the components of filename except the last one (edge cases on all platforms)" do
-      File.dirname("").should == "."
-      File.dirname(".").should == "."
-      File.dirname("./").should == "."
-      File.dirname("./b/./").should == "./b"
-      File.dirname("..").should == "."
-      File.dirname("../").should == "."
-      File.dirname("/").should == "/"
-      File.dirname("/.").should == "/"
-      File.dirname("/foo/").should == "/"
-      File.dirname("/foo/.").should == "/foo"
-      File.dirname("/foo/./").should == "/foo"
-      File.dirname("/foo/../.").should == "/foo/.."
-      File.dirname("foo/../").should == "foo"
+    File.dirname("").should == "."
+    File.dirname(".").should == "."
+    File.dirname("./").should == "."
+    File.dirname("./b/./").should == "./b"
+    File.dirname("..").should == "."
+    File.dirname("../").should == "."
+    File.dirname("/").should == "/"
+    File.dirname("/.").should == "/"
+    File.dirname("/foo/").should == "/"
+    File.dirname("/foo/.").should == "/foo"
+    File.dirname("/foo/./").should == "/foo"
+    File.dirname("/foo/../.").should == "/foo/.."
+    File.dirname("foo/../").should == "foo"
   end
 
   platform_is_not :windows do
diff --git a/spec/ruby/core/file/empty_spec.rb b/spec/ruby/core/file/empty_spec.rb
index 77f132303e535d..e8c99416767d72 100644
--- a/spec/ruby/core/file/empty_spec.rb
+++ b/spec/ruby/core/file/empty_spec.rb
@@ -4,10 +4,4 @@
 describe "File.empty?" do
   it_behaves_like :file_zero, :empty?, File
   it_behaves_like :file_zero_missing, :empty?, File
-
-  platform_is :solaris do
-    it "returns false for /dev/null" do
-      File.empty?('/dev/null').should == true
-    end
-  end
 end
diff --git a/spec/ruby/core/file/exist_spec.rb b/spec/ruby/core/file/exist_spec.rb
index 2633376880b91d..b5600e5b078108 100644
--- a/spec/ruby/core/file/exist_spec.rb
+++ b/spec/ruby/core/file/exist_spec.rb
@@ -5,10 +5,8 @@
   it_behaves_like :file_exist, :exist?, File
 end
 
-ruby_version_is "3.2" do
-  describe "File.exists?" do
-    it "has been removed" do
-      File.should_not.respond_to?(:exists?)
-    end
+describe "File.exists?" do
+  it "has been removed" do
+    File.should_not.respond_to?(:exists?)
   end
 end
diff --git a/spec/ruby/core/file/expand_path_spec.rb b/spec/ruby/core/file/expand_path_spec.rb
index c31f885b92f2d2..1abcf93900c3a8 100644
--- a/spec/ruby/core/file/expand_path_spec.rb
+++ b/spec/ruby/core/file/expand_path_spec.rb
@@ -137,7 +137,7 @@
   it "returns a String in the same encoding as the argument" do
     Encoding.default_external = Encoding::SHIFT_JIS
 
-    path = "./a".force_encoding Encoding::CP1251
+    path = "./a".dup.force_encoding Encoding::CP1251
     File.expand_path(path).encoding.should equal(Encoding::CP1251)
 
     weird_path = [222, 173, 190, 175].pack('C*')
diff --git a/spec/ruby/core/file/flock_spec.rb b/spec/ruby/core/file/flock_spec.rb
index 751e99d994ef35..23ddf89ed8f35e 100644
--- a/spec/ruby/core/file/flock_spec.rb
+++ b/spec/ruby/core/file/flock_spec.rb
@@ -30,7 +30,7 @@
   it "returns false if trying to lock an exclusively locked file" do
     @file.flock File::LOCK_EX
 
-    ruby_exe(<<-END_OF_CODE, escape: true).should == "false"
+    ruby_exe(<<-END_OF_CODE).should == "false"
       File.open('#{@name}', "w") do |f2|
         print f2.flock(File::LOCK_EX | File::LOCK_NB).to_s
       end
@@ -40,7 +40,7 @@
   it "blocks if trying to lock an exclusively locked file" do
     @file.flock File::LOCK_EX
 
-    out = ruby_exe(<<-END_OF_CODE, escape: true)
+    out = ruby_exe(<<-END_OF_CODE)
       running = false
 
       t = Thread.new do
@@ -72,35 +72,3 @@
     end
   end
 end
-
-platform_is :solaris do
-  describe "File#flock on Solaris" do
-    before :each do
-      @name = tmp("flock_test")
-      touch(@name)
-
-      @read_file = File.open @name, "r"
-      @write_file = File.open @name, "w"
-    end
-
-    after :each do
-      @read_file.flock File::LOCK_UN
-      @read_file.close
-      @write_file.flock File::LOCK_UN
-      @write_file.close
-      rm_r @name
-    end
-
-    it "fails with EBADF acquiring exclusive lock on read-only File" do
-      -> do
-        @read_file.flock File::LOCK_EX
-      end.should raise_error(Errno::EBADF)
-    end
-
-    it "fails with EBADF acquiring shared lock on read-only File" do
-      -> do
-        @write_file.flock File::LOCK_SH
-      end.should raise_error(Errno::EBADF)
-    end
-  end
-end
diff --git a/spec/ruby/core/file/lchmod_spec.rb b/spec/ruby/core/file/lchmod_spec.rb
index 7420b95e4a36ce..3c44374983c416 100644
--- a/spec/ruby/core/file/lchmod_spec.rb
+++ b/spec/ruby/core/file/lchmod_spec.rb
@@ -1,7 +1,7 @@
 require_relative '../../spec_helper'
 
 describe "File.lchmod" do
-  platform_is_not :linux, :windows, :openbsd, :solaris, :aix do
+  platform_is_not :linux, :windows, :openbsd, :aix do
     before :each do
       @fname = tmp('file_chmod_test')
       @lname = @fname + '.lnk'
diff --git a/spec/ruby/core/file/lutime_spec.rb b/spec/ruby/core/file/lutime_spec.rb
index 1f0625f61ebc2f..0f6df42ea37df5 100644
--- a/spec/ruby/core/file/lutime_spec.rb
+++ b/spec/ruby/core/file/lutime_spec.rb
@@ -1,7 +1,12 @@
 require_relative '../../spec_helper'
+require_relative 'shared/update_time'
 
-describe "File.lutime" do
-  platform_is_not :windows do
+platform_is_not :windows do
+  describe "File.lutime" do
+    it_behaves_like :update_time, :lutime
+  end
+
+  describe "File.lutime" do
     before :each do
       @atime = Time.utc(2000)
       @mtime = Time.utc(2001)
diff --git a/spec/ruby/core/file/mtime_spec.rb b/spec/ruby/core/file/mtime_spec.rb
index 5304bbf057bb1d..0e9c95caee310a 100644
--- a/spec/ruby/core/file/mtime_spec.rb
+++ b/spec/ruby/core/file/mtime_spec.rb
@@ -26,6 +26,9 @@
         else
           File.mtime(__FILE__).usec.should == 0
         end
+      rescue Errno::ENOENT => e
+        # Windows don't have stat command.
+        skip e.message
       end
     end
   end
diff --git a/spec/ruby/core/file/new_spec.rb b/spec/ruby/core/file/new_spec.rb
index 715ac1aaf337e6..1e82a070b10dff 100644
--- a/spec/ruby/core/file/new_spec.rb
+++ b/spec/ruby/core/file/new_spec.rb
@@ -100,7 +100,7 @@
     File.should.exist?(@file)
   end
 
-  it "raises an Errorno::EEXIST if the file exists when create a new file with File::CREAT|File::EXCL" do
+  it "raises an Errno::EEXIST if the file exists when create a new file with File::CREAT|File::EXCL" do
     -> { @fh = File.new(@file, File::CREAT|File::EXCL) }.should raise_error(Errno::EEXIST)
   end
 
@@ -188,6 +188,12 @@
     }.should raise_error(Errno::EEXIST, /File exists/)
   end
 
+  it "does not use the given block and warns to use File::open" do
+    -> {
+      @fh = File.new(@file) { raise }
+    }.should complain(/warning: File::new\(\) does not take block; use File::open\(\) instead/)
+  end
+
   it "raises a TypeError if the first parameter can't be coerced to a string" do
     -> { File.new(true) }.should raise_error(TypeError)
     -> { File.new(false) }.should raise_error(TypeError)
diff --git a/spec/ruby/core/file/open_spec.rb b/spec/ruby/core/file/open_spec.rb
index 4c41f70e12b3f0..6bfc16bbf97782 100644
--- a/spec/ruby/core/file/open_spec.rb
+++ b/spec/ruby/core/file/open_spec.rb
@@ -354,7 +354,7 @@
     end
   end
 
-  it "raises an Errorno::EEXIST if the file exists when open with File::CREAT|File::EXCL" do
+  it "raises an Errno::EEXIST if the file exists when open with File::CREAT|File::EXCL" do
     -> {
       File.open(@file, File::CREAT|File::EXCL) do |f|
         f.puts("writing")
@@ -423,7 +423,7 @@
       }.should raise_error(IOError)
     end
 
-    it "raises an Errorno::EEXIST if the file exists when open with File::RDONLY|File::TRUNC" do
+    it "raises an Errno::EEXIST if the file exists when open with File::RDONLY|File::TRUNC" do
       -> {
         File.open(@file, File::RDONLY|File::TRUNC) do |f|
           f.puts("writing").should == nil
@@ -441,7 +441,7 @@
       }.should raise_error(Errno::EINVAL)
     end
 
-    it "raises an Errorno::EEXIST if the file exists when open with File::RDONLY|File::TRUNC" do
+    it "raises an Errno::EEXIST if the file exists when open with File::RDONLY|File::TRUNC" do
       -> {
         File.open(@file, File::RDONLY|File::TRUNC) do |f|
           f.puts("writing").should == nil
diff --git a/spec/ruby/core/file/setuid_spec.rb b/spec/ruby/core/file/setuid_spec.rb
index 281ef01ab9ec61..9e5e86df61337b 100644
--- a/spec/ruby/core/file/setuid_spec.rb
+++ b/spec/ruby/core/file/setuid_spec.rb
@@ -26,10 +26,6 @@
 
   platform_is_not :windows do
     it "returns true when the gid bit is set" do
-      platform_is :solaris do
-        # Solaris requires execute bit before setting suid
-        system "chmod u+x #{@name}"
-      end
       system "chmod u+s #{@name}"
 
       File.setuid?(@name).should == true
diff --git a/spec/ruby/core/file/shared/fnmatch.rb b/spec/ruby/core/file/shared/fnmatch.rb
index 94f22144b06046..db4b5c5d8c6b30 100644
--- a/spec/ruby/core/file/shared/fnmatch.rb
+++ b/spec/ruby/core/file/shared/fnmatch.rb
@@ -102,6 +102,7 @@
 
   it "matches ranges of characters using exclusive bracket expression (e.g. [^t] or [!t])" do
     File.send(@method, 'ca[^t]', 'cat').should == false
+    File.send(@method, 'ca[^t]', 'cas').should == true
     File.send(@method, 'ca[!t]', 'cat').should == false
   end
 
@@ -125,6 +126,13 @@
     end
   end
 
+  it "matches wildcard with characters when flags includes FNM_PATHNAME" do
+    File.send(@method, '*a', 'aa', File::FNM_PATHNAME).should == true
+    File.send(@method, 'a*', 'aa', File::FNM_PATHNAME).should == true
+    File.send(@method, 'a*', 'aaa', File::FNM_PATHNAME).should == true
+    File.send(@method, '*a', 'aaa', File::FNM_PATHNAME).should == true
+  end
+
   it "does not match '/' characters with ? or * when flags includes FNM_PATHNAME" do
     File.send(@method, '?', '/', File::FNM_PATHNAME).should == false
     File.send(@method, '*', '/', File::FNM_PATHNAME).should == false
@@ -165,9 +173,19 @@
     File.should_not.send(@method, '*/*', 'dave/.profile', File::FNM_PATHNAME)
   end
 
-  it "matches patterns with leading periods to dotfiles by default" do
+  it "matches patterns with leading periods to dotfiles" do
     File.send(@method, '.*', '.profile').should == true
+    File.send(@method, '.*', '.profile', File::FNM_PATHNAME).should == true
     File.send(@method, ".*file", "nondotfile").should == false
+    File.send(@method, ".*file", "nondotfile", File::FNM_PATHNAME).should == false
+  end
+
+  it "does not match directories with leading periods by default with FNM_PATHNAME" do
+    File.send(@method, '.*', '.directory/nondotfile', File::FNM_PATHNAME).should == false
+    File.send(@method, '.*', '.directory/.profile', File::FNM_PATHNAME).should == false
+    File.send(@method, '.*', 'foo/.directory/nondotfile', File::FNM_PATHNAME).should == false
+    File.send(@method, '.*', 'foo/.directory/.profile', File::FNM_PATHNAME).should == false
+    File.send(@method, '**/.dotfile', '.dotsubdir/.dotfile', File::FNM_PATHNAME).should == false
   end
 
   it "matches leading periods in filenames when flags includes FNM_DOTMATCH" do
@@ -221,6 +239,33 @@
     File.send(@method, pattern, 'a/.b/c/foo', File::FNM_PATHNAME | File::FNM_DOTMATCH).should be_true
   end
 
+  it "has special handling for ./ when using * and FNM_PATHNAME" do
+    File.send(@method, './*', '.', File::FNM_PATHNAME).should be_false
+    File.send(@method, './*', './', File::FNM_PATHNAME).should be_true
+    File.send(@method, './*/', './', File::FNM_PATHNAME).should be_false
+    File.send(@method, './**', './', File::FNM_PATHNAME).should be_true
+    File.send(@method, './**/', './', File::FNM_PATHNAME).should be_true
+    File.send(@method, './*', '.', File::FNM_PATHNAME | File::FNM_DOTMATCH).should be_false
+    File.send(@method, './*', './', File::FNM_PATHNAME | File::FNM_DOTMATCH).should be_true
+    File.send(@method, './*/', './', File::FNM_PATHNAME | File::FNM_DOTMATCH).should be_false
+    File.send(@method, './**', './', File::FNM_PATHNAME | File::FNM_DOTMATCH).should be_true
+    File.send(@method, './**/', './', File::FNM_PATHNAME | File::FNM_DOTMATCH).should be_true
+  end
+
+  it "matches **/* with FNM_PATHNAME to recurse directories" do
+    File.send(@method, 'nested/**/*', 'nested/subdir', File::FNM_PATHNAME).should be_true
+    File.send(@method, 'nested/**/*', 'nested/subdir/file', File::FNM_PATHNAME).should be_true
+    File.send(@method, 'nested/**/*', 'nested/.dotsubdir', File::FNM_PATHNAME | File::FNM_DOTMATCH).should be_true
+    File.send(@method, 'nested/**/*', 'nested/.dotsubir/.dotfile', File::FNM_PATHNAME | File::FNM_DOTMATCH).should be_true
+  end
+
+  it "matches ** with FNM_PATHNAME only in current directory" do
+    File.send(@method, 'nested/**', 'nested/subdir', File::FNM_PATHNAME).should be_true
+    File.send(@method, 'nested/**', 'nested/subdir/file', File::FNM_PATHNAME).should be_false
+    File.send(@method, 'nested/**', 'nested/.dotsubdir', File::FNM_PATHNAME | File::FNM_DOTMATCH).should be_true
+    File.send(@method, 'nested/**', 'nested/.dotsubir/.dotfile', File::FNM_PATHNAME | File::FNM_DOTMATCH).should be_false
+  end
+
   it "accepts an object that has a #to_path method" do
     File.send(@method, '\*', mock_to_path('a')).should == false
   end
diff --git a/spec/ruby/core/file/shared/path.rb b/spec/ruby/core/file/shared/path.rb
index ee8109ba0599ca..5a9fe1b0c50e22 100644
--- a/spec/ruby/core/file/shared/path.rb
+++ b/spec/ruby/core/file/shared/path.rb
@@ -1,7 +1,7 @@
 describe :file_path, shared: true do
   before :each do
-    @name = "file_to_path"
-    @path = tmp(@name)
+    @path = tmp("file_to_path")
+    @name = File.basename(@path)
     touch @path
   end
 
@@ -77,18 +77,6 @@
       after :each do
         rm_r @dir
       end
-
-      ruby_version_is ""..."3.1" do
-        it "raises IOError if file was opened with File::TMPFILE" do
-          begin
-            File.open(@dir, File::RDWR | File::TMPFILE) do |f|
-              -> { f.send(@method) }.should raise_error(IOError)
-            end
-          rescue Errno::EOPNOTSUPP, Errno::EINVAL, Errno::EISDIR
-            skip "no support from the filesystem"
-          end
-        end
-      end
     end
   end
 end
diff --git a/spec/ruby/core/file/shared/update_time.rb b/spec/ruby/core/file/shared/update_time.rb
new file mode 100644
index 00000000000000..3fe7266a00e2e7
--- /dev/null
+++ b/spec/ruby/core/file/shared/update_time.rb
@@ -0,0 +1,105 @@
+describe :update_time, shared: true do
+  before :all do
+    @time_is_float = platform_is :windows
+  end
+
+  before :each do
+    @atime = Time.now
+    @mtime = Time.now
+    @file1 = tmp("specs_file_utime1")
+    @file2 = tmp("specs_file_utime2")
+    touch @file1
+    touch @file2
+  end
+
+  after :each do
+    rm_r @file1, @file2
+  end
+
+  it "sets the access and modification time of each file" do
+    File.send(@method, @atime, @mtime, @file1, @file2)
+
+    if @time_is_float
+      File.atime(@file1).should be_close(@atime, 0.0001)
+      File.mtime(@file1).should be_close(@mtime, 0.0001)
+      File.atime(@file2).should be_close(@atime, 0.0001)
+      File.mtime(@file2).should be_close(@mtime, 0.0001)
+    else
+      File.atime(@file1).to_i.should be_close(@atime.to_i, TIME_TOLERANCE)
+      File.mtime(@file1).to_i.should be_close(@mtime.to_i, TIME_TOLERANCE)
+      File.atime(@file2).to_i.should be_close(@atime.to_i, TIME_TOLERANCE)
+      File.mtime(@file2).to_i.should be_close(@mtime.to_i, TIME_TOLERANCE)
+    end
+  end
+
+  it "uses the current times if two nil values are passed" do
+    tn = Time.now
+    File.send(@method, nil, nil, @file1, @file2)
+
+    if @time_is_float
+      File.atime(@file1).should be_close(tn, 0.050)
+      File.mtime(@file1).should be_close(tn, 0.050)
+      File.atime(@file2).should be_close(tn, 0.050)
+      File.mtime(@file2).should be_close(tn, 0.050)
+    else
+      File.atime(@file1).to_i.should be_close(Time.now.to_i, TIME_TOLERANCE)
+      File.mtime(@file1).to_i.should be_close(Time.now.to_i, TIME_TOLERANCE)
+      File.atime(@file2).to_i.should be_close(Time.now.to_i, TIME_TOLERANCE)
+      File.mtime(@file2).to_i.should be_close(Time.now.to_i, TIME_TOLERANCE)
+    end
+  end
+
+  it "accepts an object that has a #to_path method" do
+    File.send(@method, @atime, @mtime, mock_to_path(@file1), mock_to_path(@file2))
+  end
+
+  it "accepts numeric atime and mtime arguments" do
+    if @time_is_float
+      File.send(@method, @atime.to_f, @mtime.to_f, @file1, @file2)
+
+      File.atime(@file1).should be_close(@atime, 0.0001)
+      File.mtime(@file1).should be_close(@mtime, 0.0001)
+      File.atime(@file2).should be_close(@atime, 0.0001)
+      File.mtime(@file2).should be_close(@mtime, 0.0001)
+    else
+      File.send(@method, @atime.to_i, @mtime.to_i, @file1, @file2)
+
+      File.atime(@file1).to_i.should be_close(@atime.to_i, TIME_TOLERANCE)
+      File.mtime(@file1).to_i.should be_close(@mtime.to_i, TIME_TOLERANCE)
+      File.atime(@file2).to_i.should be_close(@atime.to_i, TIME_TOLERANCE)
+      File.mtime(@file2).to_i.should be_close(@mtime.to_i, TIME_TOLERANCE)
+    end
+  end
+
+  it "may set nanosecond precision" do
+    t = Time.utc(2007, 11, 1, 15, 25, 0, 123456.789r)
+    File.send(@method, t, t, @file1)
+
+    File.atime(@file1).nsec.should.between?(0, 123500000)
+    File.mtime(@file1).nsec.should.between?(0, 123500000)
+  end
+
+  it "returns the number of filenames in the arguments" do
+    File.send(@method, @atime.to_f, @mtime.to_f, @file1, @file2).should == 2
+  end
+
+  platform_is :linux do
+    platform_is pointer_size: 64 do
+      it "allows Time instances in the far future to set mtime and atime (but some filesystems limit it up to 2446-05-10 or 2038-01-19 or 2486-07-02)" do
+        # https://ext4.wiki.kernel.org/index.php/Ext4_Disk_Layout#Inode_Timestamps
+        # "Therefore, timestamps should not overflow until May 2446."
+        # https://lwn.net/Articles/804382/
+        # "On-disk timestamps hitting the y2038 limit..."
+        # The problem seems to be being improved, but currently it actually fails on XFS on RHEL8
+        # https://rubyci.org/logs/rubyci.s3.amazonaws.com/rhel8/ruby-master/log/20201112T123004Z.fail.html.gz
+        # Amazon Linux 2023 returns 2486-07-02 in this example
+        # http://rubyci.s3.amazonaws.com/amazon2023/ruby-master/log/20230322T063004Z.fail.html.gz
+        time = Time.at(1<<44)
+        File.send(@method, time, time, @file1)
+
+        [559444, 2486, 2446, 2038].should.include? File.atime(@file1).year
+        [559444, 2486, 2446, 2038].should.include? File.mtime(@file1).year
+      end
+    end
+  end
+end
diff --git a/spec/ruby/core/file/stat/birthtime_spec.rb b/spec/ruby/core/file/stat/birthtime_spec.rb
index a727bbe5666d7a..adecee15b0ec86 100644
--- a/spec/ruby/core/file/stat/birthtime_spec.rb
+++ b/spec/ruby/core/file/stat/birthtime_spec.rb
@@ -1,27 +1,29 @@
 require_relative '../../../spec_helper'
 
-describe "File::Stat#birthtime" do
-  before :each do
-    @file = tmp('i_exist')
-    touch(@file) { |f| f.write "rubinius" }
-  end
+platform_is(:windows, :darwin, :freebsd, :netbsd,
+            *ruby_version_is("3.5") { :linux },
+           ) do
+  not_implemented_messages = [
+    "birthtime() function is unimplemented", # unsupported OS/version
+    "birthtime is unimplemented",            # unsupported filesystem
+  ]
 
-  after :each do
-    rm_r @file
-  end
+  describe "File::Stat#birthtime" do
+    before :each do
+      @file = tmp('i_exist')
+      touch(@file) { |f| f.write "rubinius" }
+    end
+
+    after :each do
+      rm_r @file
+    end
 
-  platform_is :windows, :darwin, :freebsd, :netbsd do
     it "returns the birthtime of a File::Stat object" do
       st = File.stat(@file)
       st.birthtime.should be_kind_of(Time)
       st.birthtime.should <= Time.now
-    end
-  end
-
-  platform_is :linux, :openbsd do
-    it "raises an NotImplementedError" do
-      st = File.stat(@file)
-      -> { st.birthtime }.should raise_error(NotImplementedError)
+    rescue NotImplementedError => e
+      e.message.should.start_with?(*not_implemented_messages)
     end
   end
 end
diff --git a/spec/ruby/core/file/stat/rdev_major_spec.rb b/spec/ruby/core/file/stat/rdev_major_spec.rb
index f8a8d1b107274e..e08d19c03ad95e 100644
--- a/spec/ruby/core/file/stat/rdev_major_spec.rb
+++ b/spec/ruby/core/file/stat/rdev_major_spec.rb
@@ -2,19 +2,12 @@
 
 describe "File::Stat#rdev_major" do
   before :each do
-    platform_is :solaris do
-      @name = "/dev/zfs"
-    end
-    platform_is_not :solaris do
-      @name = tmp("file.txt")
-      touch(@name)
-    end
+    @name = tmp("file.txt")
+    touch(@name)
   end
 
   after :each do
-    platform_is_not :solaris do
-      rm_r @name
-    end
+    rm_r @name
   end
 
   platform_is_not :windows do
diff --git a/spec/ruby/core/file/stat/rdev_minor_spec.rb b/spec/ruby/core/file/stat/rdev_minor_spec.rb
index dc30c1f56cda52..ace5b8a7320e3f 100644
--- a/spec/ruby/core/file/stat/rdev_minor_spec.rb
+++ b/spec/ruby/core/file/stat/rdev_minor_spec.rb
@@ -2,19 +2,12 @@
 
 describe "File::Stat#rdev_minor" do
   before :each do
-    platform_is :solaris do
-      @name = "/dev/zfs"
-    end
-    platform_is_not :solaris do
-      @name = tmp("file.txt")
-      touch(@name)
-    end
+    @name = tmp("file.txt")
+    touch(@name)
   end
 
   after :each do
-    platform_is_not :solaris do
-      rm_r @name
-    end
+    rm_r @name
   end
 
   platform_is_not :windows do
diff --git a/spec/ruby/core/file/utime_spec.rb b/spec/ruby/core/file/utime_spec.rb
index 0b0e4f979c9356..d87626be509458 100644
--- a/spec/ruby/core/file/utime_spec.rb
+++ b/spec/ruby/core/file/utime_spec.rb
@@ -1,102 +1,6 @@
 require_relative '../../spec_helper'
+require_relative 'shared/update_time'
 
 describe "File.utime" do
-
-  before :all do
-    @time_is_float = platform_is :windows
-  end
-
-  before :each do
-    @atime = Time.now
-    @mtime = Time.now
-    @file1 = tmp("specs_file_utime1")
-    @file2 = tmp("specs_file_utime2")
-    touch @file1
-    touch @file2
-  end
-
-  after :each do
-    rm_r @file1, @file2
-  end
-
-  it "sets the access and modification time of each file" do
-    File.utime(@atime, @mtime, @file1, @file2)
-    if @time_is_float
-      File.atime(@file1).should be_close(@atime, 0.0001)
-      File.mtime(@file1).should be_close(@mtime, 0.0001)
-      File.atime(@file2).should be_close(@atime, 0.0001)
-      File.mtime(@file2).should be_close(@mtime, 0.0001)
-    else
-      File.atime(@file1).to_i.should be_close(@atime.to_i, TIME_TOLERANCE)
-      File.mtime(@file1).to_i.should be_close(@mtime.to_i, TIME_TOLERANCE)
-      File.atime(@file2).to_i.should be_close(@atime.to_i, TIME_TOLERANCE)
-      File.mtime(@file2).to_i.should be_close(@mtime.to_i, TIME_TOLERANCE)
-    end
-  end
-
-  it "uses the current times if two nil values are passed" do
-    tn = Time.now
-    File.utime(nil, nil, @file1, @file2)
-    if @time_is_float
-      File.atime(@file1).should be_close(tn, 0.050)
-      File.mtime(@file1).should be_close(tn, 0.050)
-      File.atime(@file2).should be_close(tn, 0.050)
-      File.mtime(@file2).should be_close(tn, 0.050)
-    else
-      File.atime(@file1).to_i.should be_close(Time.now.to_i, TIME_TOLERANCE)
-      File.mtime(@file1).to_i.should be_close(Time.now.to_i, TIME_TOLERANCE)
-      File.atime(@file2).to_i.should be_close(Time.now.to_i, TIME_TOLERANCE)
-      File.mtime(@file2).to_i.should be_close(Time.now.to_i, TIME_TOLERANCE)
-    end
-  end
-
-  it "accepts an object that has a #to_path method" do
-    File.utime(@atime, @mtime, mock_to_path(@file1), mock_to_path(@file2))
-  end
-
-  it "accepts numeric atime and mtime arguments" do
-    if @time_is_float
-      File.utime(@atime.to_f, @mtime.to_f, @file1, @file2)
-      File.atime(@file1).should be_close(@atime, 0.0001)
-      File.mtime(@file1).should be_close(@mtime, 0.0001)
-      File.atime(@file2).should be_close(@atime, 0.0001)
-      File.mtime(@file2).should be_close(@mtime, 0.0001)
-    else
-      File.utime(@atime.to_i, @mtime.to_i, @file1, @file2)
-      File.atime(@file1).to_i.should be_close(@atime.to_i, TIME_TOLERANCE)
-      File.mtime(@file1).to_i.should be_close(@mtime.to_i, TIME_TOLERANCE)
-      File.atime(@file2).to_i.should be_close(@atime.to_i, TIME_TOLERANCE)
-      File.mtime(@file2).to_i.should be_close(@mtime.to_i, TIME_TOLERANCE)
-    end
-  end
-
-  it "may set nanosecond precision" do
-    t = Time.utc(2007, 11, 1, 15, 25, 0, 123456.789r)
-    File.utime(t, t, @file1)
-    File.atime(@file1).nsec.should.between?(0, 123500000)
-    File.mtime(@file1).nsec.should.between?(0, 123500000)
-  end
-
-  it "returns the number of filenames in the arguments" do
-    File.utime(@atime.to_f, @mtime.to_f, @file1, @file2).should == 2
-  end
-
-  platform_is :linux do
-    platform_is wordsize: 64 do
-      it "allows Time instances in the far future to set mtime and atime (but some filesystems limit it up to 2446-05-10 or 2038-01-19 or 2486-07-02)" do
-        # https://ext4.wiki.kernel.org/index.php/Ext4_Disk_Layout#Inode_Timestamps
-        # "Therefore, timestamps should not overflow until May 2446."
-        # https://lwn.net/Articles/804382/
-        # "On-disk timestamps hitting the y2038 limit..."
-        # The problem seems to be being improved, but currently it actually fails on XFS on RHEL8
-        # https://rubyci.org/logs/rubyci.s3.amazonaws.com/rhel8/ruby-master/log/20201112T123004Z.fail.html.gz
-        # Amazon Linux 2023 returns 2486-07-02 in this example
-        # http://rubyci.s3.amazonaws.com/amazon2023/ruby-master/log/20230322T063004Z.fail.html.gz
-        time = Time.at(1<<44)
-        File.utime(time, time, @file1)
-        [559444, 2486, 2446, 2038].should.include? File.atime(@file1).year
-        [559444, 2486, 2446, 2038].should.include? File.mtime(@file1).year
-      end
-    end
-  end
+  it_behaves_like :update_time, :utime
 end
diff --git a/spec/ruby/core/file/zero_spec.rb b/spec/ruby/core/file/zero_spec.rb
index 63dd85ee46a924..01c7505ef226bc 100644
--- a/spec/ruby/core/file/zero_spec.rb
+++ b/spec/ruby/core/file/zero_spec.rb
@@ -4,10 +4,4 @@
 describe "File.zero?" do
   it_behaves_like :file_zero, :zero?, File
   it_behaves_like :file_zero_missing, :zero?, File
-
-  platform_is :solaris do
-    it "returns false for /dev/null" do
-      File.zero?('/dev/null').should == true
-    end
-  end
 end
diff --git a/spec/ruby/core/filetest/exist_spec.rb b/spec/ruby/core/filetest/exist_spec.rb
index 4d14bea2311738..612ffa9fcbec28 100644
--- a/spec/ruby/core/filetest/exist_spec.rb
+++ b/spec/ruby/core/filetest/exist_spec.rb
@@ -4,3 +4,9 @@
 describe "FileTest.exist?" do
   it_behaves_like :file_exist, :exist?, FileTest
 end
+
+describe "FileTest.exists?" do
+  it "has been removed" do
+    FileTest.should_not.respond_to?(:exists?)
+  end
+end
diff --git a/spec/ruby/core/filetest/zero_spec.rb b/spec/ruby/core/filetest/zero_spec.rb
index dd6a164ec96c9b..92cab67f1b4ff7 100644
--- a/spec/ruby/core/filetest/zero_spec.rb
+++ b/spec/ruby/core/filetest/zero_spec.rb
@@ -4,10 +4,4 @@
 describe "FileTest.zero?" do
   it_behaves_like :file_zero, :zero?, FileTest
   it_behaves_like :file_zero_missing, :zero?, FileTest
-
-  platform_is :solaris do
-    it "returns false for /dev/null" do
-      File.zero?('/dev/null').should == true
-    end
-  end
 end
diff --git a/spec/ruby/core/float/ceil_spec.rb b/spec/ruby/core/float/ceil_spec.rb
index 7fc18d304c26ae..75f56102922e82 100644
--- a/spec/ruby/core/float/ceil_spec.rb
+++ b/spec/ruby/core/float/ceil_spec.rb
@@ -1,6 +1,11 @@
 require_relative '../../spec_helper'
+require_relative '../integer/shared/integer_ceil_precision'
 
 describe "Float#ceil" do
+  context "with precision" do
+    it_behaves_like :integer_ceil_precision, :Float
+  end
+
   it "returns the smallest Integer greater than or equal to self" do
     -1.2.ceil.should eql( -1)
     -1.0.ceil.should eql( -1)
diff --git a/spec/ruby/core/float/comparison_spec.rb b/spec/ruby/core/float/comparison_spec.rb
index 1373b3a1fb2fe7..0cd290f4ad4e2d 100644
--- a/spec/ruby/core/float/comparison_spec.rb
+++ b/spec/ruby/core/float/comparison_spec.rb
@@ -72,7 +72,7 @@ def coerce(other)
     (-Float::MAX.to_i*2 <=> -infinity_value).should == 1
   end
 
-  it "returns 0 when self is Infinity and other other is infinite?=1" do
+  it "returns 0 when self is Infinity and other is infinite?=1" do
     obj = Object.new
     def obj.infinite?
       1
@@ -91,7 +91,7 @@ def obj.infinite?
   it "returns 1 when self is Infinity and other is infinite?=nil (which means finite)" do
     obj = Object.new
     def obj.infinite?
-        nil
+      nil
     end
     (infinity_value <=> obj).should == 1
   end
diff --git a/spec/ruby/core/float/floor_spec.rb b/spec/ruby/core/float/floor_spec.rb
index 046216d36d4a88..8b492ef4732fb7 100644
--- a/spec/ruby/core/float/floor_spec.rb
+++ b/spec/ruby/core/float/floor_spec.rb
@@ -1,6 +1,11 @@
 require_relative '../../spec_helper'
+require_relative '../integer/shared/integer_floor_precision'
 
 describe "Float#floor" do
+  context "with precision" do
+    it_behaves_like :integer_floor_precision, :Float
+  end
+
   it "returns the largest Integer less than or equal to self" do
     -1.2.floor.should eql( -2)
     -1.0.floor.should eql( -1)
diff --git a/spec/ruby/core/float/round_spec.rb b/spec/ruby/core/float/round_spec.rb
index 9b4c307f9d19fb..7e8c792051b9d5 100644
--- a/spec/ruby/core/float/round_spec.rb
+++ b/spec/ruby/core/float/round_spec.rb
@@ -30,6 +30,11 @@
     12.345678.round(3.999).should == 12.346
   end
 
+  it "correctly rounds exact floats with a numerous digits in a fraction part" do
+    0.8241000000000004.round(10).should == 0.8241
+    0.8241000000000002.round(10).should == 0.8241
+  end
+
   it "returns zero when passed a negative argument with magnitude greater than magnitude of the whole number portion of the Float" do
     0.8346268.round(-1).should eql(0)
   end
@@ -68,6 +73,10 @@
     0.42.round(2.0**30).should == 0.42
   end
 
+  it "returns rounded values for not so big argument" do
+    0.42.round(2.0**23).should == 0.42
+  end
+
   it "returns big values rounded to nearest" do
     +2.5e20.round(-20).should   eql( +3 * 10 ** 20  )
     -2.5e20.round(-20).should   eql( -3 * 10 ** 20  )
diff --git a/spec/ruby/core/gc/measure_total_time_spec.rb b/spec/ruby/core/gc/measure_total_time_spec.rb
index 05d4598ebc76e6..f5377c18fd1264 100644
--- a/spec/ruby/core/gc/measure_total_time_spec.rb
+++ b/spec/ruby/core/gc/measure_total_time_spec.rb
@@ -1,19 +1,17 @@
 require_relative '../../spec_helper'
 
-ruby_version_is "3.1" do
-  describe "GC.measure_total_time" do
-    before :each do
-      @default = GC.measure_total_time
-    end
+describe "GC.measure_total_time" do
+  before :each do
+    @default = GC.measure_total_time
+  end
 
-    after :each do
-      GC.measure_total_time = @default
-    end
+  after :each do
+    GC.measure_total_time = @default
+  end
 
-    it "can set and get a boolean value" do
-      original = GC.measure_total_time
-      GC.measure_total_time = !original
-      GC.measure_total_time.should == !original
-    end
+  it "can set and get a boolean value" do
+    original = GC.measure_total_time
+    GC.measure_total_time = !original
+    GC.measure_total_time.should == !original
   end
 end
diff --git a/spec/ruby/core/gc/total_time_spec.rb b/spec/ruby/core/gc/total_time_spec.rb
index fcc8f45a834f6a..a8430fbe9ad76f 100644
--- a/spec/ruby/core/gc/total_time_spec.rb
+++ b/spec/ruby/core/gc/total_time_spec.rb
@@ -1,15 +1,13 @@
 require_relative '../../spec_helper'
 
-ruby_version_is "3.1" do
-  describe "GC.total_time" do
-    it "returns an Integer" do
-      GC.total_time.should be_kind_of(Integer)
-    end
+describe "GC.total_time" do
+  it "returns an Integer" do
+    GC.total_time.should be_kind_of(Integer)
+  end
 
-    it "increases as collections are run" do
-      time_before = GC.total_time
-      GC.start
-      GC.total_time.should >= time_before
-    end
+  it "increases as collections are run" do
+    time_before = GC.total_time
+    GC.start
+    GC.total_time.should >= time_before
   end
 end
diff --git a/spec/ruby/core/hash/assoc_spec.rb b/spec/ruby/core/hash/assoc_spec.rb
index 64442918d1e9bb..62b2a11b30024c 100644
--- a/spec/ruby/core/hash/assoc_spec.rb
+++ b/spec/ruby/core/hash/assoc_spec.rb
@@ -22,11 +22,11 @@
   end
 
   it "only returns the first matching key-value pair for identity hashes" do
-    # Avoid literal String keys in Hash#[]= due to https://bugs.ruby-lang.org/issues/12855
+    # Avoid literal String keys since string literals can be frozen and interned e.g. with --enable-frozen-string-literal
     h = {}.compare_by_identity
-    k1 = 'pear'
+    k1 = 'pear'.dup
     h[k1] = :red
-    k2 = 'pear'
+    k2 = 'pear'.dup
     h[k2] = :green
     h.size.should == 2
     h.keys.grep(/pear/).size.should == 2
diff --git a/spec/ruby/core/hash/compare_by_identity_spec.rb b/spec/ruby/core/hash/compare_by_identity_spec.rb
index 874cd46eb7cc7f..2975526a97a5f0 100644
--- a/spec/ruby/core/hash/compare_by_identity_spec.rb
+++ b/spec/ruby/core/hash/compare_by_identity_spec.rb
@@ -85,19 +85,21 @@ def o.hash; 123; end
     -> { @h.compare_by_identity }.should raise_error(FrozenError)
   end
 
-  # Behaviour confirmed in bug #1871
+  # Behaviour confirmed in https://bugs.ruby-lang.org/issues/1871
   it "persists over #dups" do
-    @idh['foo'] = :bar
-    @idh['foo'] = :glark
+    @idh['foo'.dup] = :bar
+    @idh['foo'.dup] = :glark
     @idh.dup.should == @idh
     @idh.dup.size.should == @idh.size
+    @idh.dup.should.compare_by_identity?
   end
 
   it "persists over #clones" do
-    @idh['foo'] = :bar
-    @idh['foo'] = :glark
+    @idh['foo'.dup] = :bar
+    @idh['foo'.dup] = :glark
     @idh.clone.should == @idh
     @idh.clone.size.should == @idh.size
+    @idh.dup.should.compare_by_identity?
   end
 
   it "does not copy string keys" do
@@ -108,9 +110,16 @@ def o.hash; 123; end
     @idh.keys.first.should equal foo
   end
 
+  # Check `#[]=` call with a String literal.
+  # Don't use `#+` because with `#+` it's no longer a String literal.
+  #
+  # See https://bugs.ruby-lang.org/issues/12855
   it "gives different identity for string literals" do
+    eval <<~RUBY
+    # frozen_string_literal: false
     @idh['foo'] = 1
     @idh['foo'] = 2
+    RUBY
     @idh.values.should == [1, 2]
     @idh.size.should == 2
   end
diff --git a/spec/ruby/core/hash/delete_spec.rb b/spec/ruby/core/hash/delete_spec.rb
index b262e8846b77d1..3e3479c69c9f5a 100644
--- a/spec/ruby/core/hash/delete_spec.rb
+++ b/spec/ruby/core/hash/delete_spec.rb
@@ -24,7 +24,7 @@
   it "allows removing a key while iterating" do
     h = { a: 1, b: 2 }
     visited = []
-    h.each_pair { |k,v|
+    h.each_pair { |k, v|
       visited << k
       h.delete(k)
     }
@@ -32,13 +32,27 @@
     h.should == {}
   end
 
+  it "allows removing a key while iterating for big hashes" do
+    h = { a: 1, b: 2, c: 3, d: 4, e: 5, f: 6, g: 7, h: 8, i: 9, j: 10,
+          k: 11, l: 12, m: 13, n: 14, o: 15, p: 16, q: 17, r: 18, s: 19, t: 20,
+          u: 21, v: 22, w: 23, x: 24, y: 25, z: 26 }
+    visited = []
+    h.each_pair { |k, v|
+      visited << k
+      h.delete(k)
+    }
+    visited.should == [:a, :b, :c, :d, :e, :f, :g, :h, :i, :j, :k, :l, :m,
+                       :n, :o, :p, :q, :r, :s, :t, :u, :v, :w, :x, :y, :z]
+    h.should == {}
+  end
+
   it "accepts keys with private #hash method" do
     key = HashSpecs::KeyWithPrivateHash.new
     { key => 5 }.delete(key).should == 5
   end
 
   it "raises a FrozenError if called on a frozen instance" do
-    -> { HashSpecs.frozen_hash.delete("foo")  }.should raise_error(FrozenError)
+    -> { HashSpecs.frozen_hash.delete("foo") }.should raise_error(FrozenError)
     -> { HashSpecs.empty_frozen_hash.delete("foo") }.should raise_error(FrozenError)
   end
 end
diff --git a/spec/ruby/core/hash/element_reference_spec.rb b/spec/ruby/core/hash/element_reference_spec.rb
index e271f37ea6b485..d5859cb3427518 100644
--- a/spec/ruby/core/hash/element_reference_spec.rb
+++ b/spec/ruby/core/hash/element_reference_spec.rb
@@ -12,7 +12,7 @@
     h[[]].should == "baz"
   end
 
-  it "returns nil as default default value" do
+  it "returns nil as default value" do
     { 0 => 0 }[5].should == nil
   end
 
@@ -30,7 +30,7 @@
   end
 
   it "does not create copies of the immediate default value" do
-    str = "foo"
+    str = +"foo"
     h = Hash.new(str)
     a = h[:a]
     b = h[:b]
diff --git a/spec/ruby/core/hash/hash_spec.rb b/spec/ruby/core/hash/hash_spec.rb
index 2ccb4831208d2c..cd67f7a6528f37 100644
--- a/spec/ruby/core/hash/hash_spec.rb
+++ b/spec/ruby/core/hash/hash_spec.rb
@@ -42,12 +42,10 @@
     # Like above, because h.eql?(x: [h])
   end
 
-  ruby_version_is "3.1" do
-    it "allows ommiting values" do
-      a = 1
-      b = 2
+  it "allows omitting values" do
+    a = 1
+    b = 2
 
-     eval('{a:, b:}.should == { a: 1, b: 2 }')
-    end
+    {a:, b:}.should == { a: 1, b: 2 }
   end
 end
diff --git a/spec/ruby/core/hash/new_spec.rb b/spec/ruby/core/hash/new_spec.rb
index 6279815fd6e660..5ae3e1f98d6205 100644
--- a/spec/ruby/core/hash/new_spec.rb
+++ b/spec/ruby/core/hash/new_spec.rb
@@ -34,7 +34,7 @@
     -> { Hash.new(nil) { 0 } }.should raise_error(ArgumentError)
   end
 
-  ruby_version_is "3.3" do
+  ruby_version_is "3.3"..."3.4" do
     it "emits a deprecation warning if keyword arguments are passed" do
       -> { Hash.new(unknown: true) }.should complain(
         Regexp.new(Regexp.escape("Calling Hash.new with keyword arguments is deprecated and will be removed in Ruby 3.4; use Hash.new({ key: value }) instead"))
@@ -46,4 +46,22 @@
       Hash.new({ unknown: true }).default.should == { unknown: true }
     end
   end
+
+  ruby_version_is "3.4" do
+    it "accepts a capacity: argument" do
+      Hash.new(5, capacity: 42).default.should == 5
+      Hash.new(capacity: 42).default.should == nil
+      (Hash.new(capacity: 42) { 1 }).default_proc.should_not == nil
+    end
+
+    it "ignores negative capacity" do
+      -> { Hash.new(capacity: -42) }.should_not raise_error
+    end
+
+    it "raises an error if unknown keyword arguments are passed" do
+      -> { Hash.new(unknown: true) }.should raise_error(ArgumentError)
+      -> { Hash.new(1, unknown: true) }.should raise_error(ArgumentError)
+      -> { Hash.new(unknown: true) { 0 } }.should raise_error(ArgumentError)
+    end
+  end
 end
diff --git a/spec/ruby/core/hash/rehash_spec.rb b/spec/ruby/core/hash/rehash_spec.rb
index 00490804566ed9..db3e91b166ef4a 100644
--- a/spec/ruby/core/hash/rehash_spec.rb
+++ b/spec/ruby/core/hash/rehash_spec.rb
@@ -77,6 +77,36 @@ def k1.hash; 1; end
     h.keys.should_not.include? [1]
   end
 
+  it "iterates keys in insertion order" do
+    key = Class.new do
+      attr_reader :name
+
+      def initialize(name)
+        @name = name
+      end
+
+      def hash
+        123
+      end
+    end
+
+    a, b, c, d = key.new('a'), key.new('b'), key.new('c'), key.new('d')
+    h = { a => 1, b => 2, c => 3, d => 4 }
+    h.size.should == 4
+
+    key.class_exec do
+      def eql?(other)
+        true
+      end
+    end
+
+    h.rehash
+    h.size.should == 1
+    k, v = h.first
+    k.name.should == 'a'
+    v.should == 4
+  end
+
   it "raises a FrozenError if called on a frozen instance" do
     -> { HashSpecs.frozen_hash.rehash  }.should raise_error(FrozenError)
     -> { HashSpecs.empty_frozen_hash.rehash }.should raise_error(FrozenError)
diff --git a/spec/ruby/core/hash/replace_spec.rb b/spec/ruby/core/hash/replace_spec.rb
index 92b2118fd33ee9..a26a31f5f9a9b6 100644
--- a/spec/ruby/core/hash/replace_spec.rb
+++ b/spec/ruby/core/hash/replace_spec.rb
@@ -1,7 +1,70 @@
 require_relative '../../spec_helper'
 require_relative 'fixtures/classes'
-require_relative 'shared/replace'
 
 describe "Hash#replace" do
-  it_behaves_like :hash_replace, :replace
+  it "replaces the contents of self with other" do
+    h = { a: 1, b: 2 }
+    h.replace(c: -1, d: -2).should equal(h)
+    h.should == { c: -1, d: -2 }
+  end
+
+  it "tries to convert the passed argument to a hash using #to_hash" do
+    obj = mock('{1=>2,3=>4}')
+    obj.should_receive(:to_hash).and_return({ 1 => 2, 3 => 4 })
+
+    h = {}
+    h.replace(obj)
+    h.should == { 1 => 2, 3 => 4 }
+  end
+
+  it "calls to_hash on hash subclasses" do
+    h = {}
+    h.replace(HashSpecs::ToHashHash[1 => 2])
+    h.should == { 1 => 2 }
+  end
+
+  it "transfers the compare_by_identity flag" do
+    hash_a = { a: 1 }
+    hash_b = { b: 2 }
+    hash_b.compare_by_identity
+    hash_a.should_not.compare_by_identity?
+    hash_a.replace(hash_b)
+    hash_a.should.compare_by_identity?
+
+    hash_a = { a: 1 }
+    hash_b = { b: 2 }
+    hash_a.compare_by_identity
+    hash_a.should.compare_by_identity?
+    hash_a.replace(hash_b)
+    hash_a.should_not.compare_by_identity?
+  end
+
+  it "does not transfer default values" do
+    hash_a = {}
+    hash_b = Hash.new(5)
+    hash_a.replace(hash_b)
+    hash_a.default.should == 5
+
+    hash_a = {}
+    hash_b = Hash.new { |h, k| k * 2 }
+    hash_a.replace(hash_b)
+    hash_a.default(5).should == 10
+
+    hash_a = Hash.new { |h, k| k * 5 }
+    hash_b = Hash.new(-> { raise "Should not invoke lambda" })
+    hash_a.replace(hash_b)
+    hash_a.default.should == hash_b.default
+  end
+
+  it "raises a FrozenError if called on a frozen instance that would not be modified" do
+    -> do
+      HashSpecs.frozen_hash.replace(HashSpecs.frozen_hash)
+    end.should raise_error(FrozenError)
+  end
+
+  it "raises a FrozenError if called on a frozen instance that is modified" do
+    -> do
+      HashSpecs.frozen_hash.replace(HashSpecs.empty_frozen_hash)
+    end.should raise_error(FrozenError)
+  end
 end
diff --git a/spec/ruby/core/hash/shared/replace.rb b/spec/ruby/core/hash/shared/replace.rb
deleted file mode 100644
index bea64384bba098..00000000000000
--- a/spec/ruby/core/hash/shared/replace.rb
+++ /dev/null
@@ -1,51 +0,0 @@
-describe :hash_replace, shared: true do
-  it "replaces the contents of self with other" do
-    h = { a: 1, b: 2 }
-    h.send(@method, c: -1, d: -2).should equal(h)
-    h.should == { c: -1, d: -2 }
-  end
-
-  it "tries to convert the passed argument to a hash using #to_hash" do
-    obj = mock('{1=>2,3=>4}')
-    obj.should_receive(:to_hash).and_return({ 1 => 2, 3 => 4 })
-
-    h = {}
-    h.send(@method, obj)
-    h.should == { 1 => 2, 3 => 4 }
-  end
-
-  it "calls to_hash on hash subclasses" do
-    h = {}
-    h.send(@method, HashSpecs::ToHashHash[1 => 2])
-    h.should == { 1 => 2 }
-  end
-
-  it "does not transfer default values" do
-    hash_a = {}
-    hash_b = Hash.new(5)
-    hash_a.send(@method, hash_b)
-    hash_a.default.should == 5
-
-    hash_a = {}
-    hash_b = Hash.new { |h, k| k * 2 }
-    hash_a.send(@method, hash_b)
-    hash_a.default(5).should == 10
-
-    hash_a = Hash.new { |h, k| k * 5 }
-    hash_b = Hash.new(-> { raise "Should not invoke lambda" })
-    hash_a.send(@method, hash_b)
-    hash_a.default.should == hash_b.default
-  end
-
-  it "raises a FrozenError if called on a frozen instance that would not be modified" do
-    -> do
-      HashSpecs.frozen_hash.send(@method, HashSpecs.frozen_hash)
-    end.should raise_error(FrozenError)
-  end
-
-  it "raises a FrozenError if called on a frozen instance that is modified" do
-    -> do
-      HashSpecs.frozen_hash.send(@method, HashSpecs.empty_frozen_hash)
-    end.should raise_error(FrozenError)
-  end
-end
diff --git a/spec/ruby/core/hash/shared/store.rb b/spec/ruby/core/hash/shared/store.rb
index b823ea45ca60ea..72a462a42f4fe5 100644
--- a/spec/ruby/core/hash/shared/store.rb
+++ b/spec/ruby/core/hash/shared/store.rb
@@ -9,7 +9,7 @@
 
   it "duplicates string keys using dup semantics" do
     # dup doesn't copy singleton methods
-    key = "foo"
+    key = +"foo"
     def key.reverse() "bar" end
     h = {}
     h.send(@method, key, 0)
@@ -44,7 +44,7 @@ def key.reverse() "bar" end
   end
 
   it "duplicates and freezes string keys" do
-    key = "foo"
+    key = +"foo"
     h = {}
     h.send(@method, key, 0)
     key << "bar"
@@ -75,8 +75,8 @@ def key.reverse() "bar" end
 
   it "keeps the existing String key in the hash if there is a matching one" do
     h = { "a" => 1, "b" => 2, "c" => 3, "d" => 4 }
-    key1 = "foo"
-    key2 = "foo"
+    key1 = "foo".dup
+    key2 = "foo".dup
     key1.should_not equal(key2)
     h[key1] = 41
     frozen_key = h.keys.last
@@ -91,9 +91,9 @@ def key.reverse() "bar" end
   end
 
   it "does not raise an exception if changing the value of an existing key during iteration" do
-      hash = {1 => 2, 3 => 4, 5 => 6}
-      hash.each { hash.send(@method, 1, :foo) }
-      hash.should == {1 => :foo, 3 => 4, 5 => 6}
+    hash = {1 => 2, 3 => 4, 5 => 6}
+    hash.each { hash.send(@method, 1, :foo) }
+    hash.should == {1 => :foo, 3 => 4, 5 => 6}
   end
 
   it "does not dispatch to hash for Boolean, Integer, Float, String, or Symbol" do
diff --git a/spec/ruby/core/hash/shared/to_s.rb b/spec/ruby/core/hash/shared/to_s.rb
index 2db3a96583bcc1..e116b8878b9699 100644
--- a/spec/ruby/core/hash/shared/to_s.rb
+++ b/spec/ruby/core/hash/shared/to_s.rb
@@ -4,14 +4,8 @@
 describe :hash_to_s, shared: true do
   it "returns a string representation with same order as each()" do
     h = { a: [1, 2], b: -2, d: -6, nil => nil }
-
-    pairs = []
-    h.each do |key, value|
-      pairs << key.inspect + '=>' + value.inspect
-    end
-
-    str = '{' + pairs.join(', ') + '}'
-    h.send(@method).should == str
+    expected = ruby_version_is("3.4") ? "{a: [1, 2], b: -2, d: -6, nil => nil}" : "{:a=>[1, 2], :b=>-2, :d=>-6, nil=>nil}"
+    h.send(@method).should == expected
   end
 
   it "calls #inspect on keys and values" do
@@ -19,31 +13,31 @@
     val = mock('val')
     key.should_receive(:inspect).and_return('key')
     val.should_receive(:inspect).and_return('val')
-
-    { key => val }.send(@method).should == '{key=>val}'
+    expected = ruby_version_is("3.4") ? "{key => val}" : "{key=>val}"
+    { key => val }.send(@method).should == expected
   end
 
   it "does not call #to_s on a String returned from #inspect" do
-    str = "abc"
+    str = +"abc"
     str.should_not_receive(:to_s)
-
-    { a: str }.send(@method).should == '{:a=>"abc"}'
+    expected = ruby_version_is("3.4") ? '{a: "abc"}' : '{:a=>"abc"}'
+    { a: str }.send(@method).should == expected
   end
 
   it "calls #to_s on the object returned from #inspect if the Object isn't a String" do
     obj = mock("Hash#inspect/to_s calls #to_s")
     obj.should_receive(:inspect).and_return(obj)
     obj.should_receive(:to_s).and_return("abc")
-
-    { a: obj }.send(@method).should == "{:a=>abc}"
+    expected = ruby_version_is("3.4") ? "{a: abc}" : "{:a=>abc}"
+    { a: obj }.send(@method).should == expected
   end
 
   it "does not call #to_str on the object returned from #inspect when it is not a String" do
     obj = mock("Hash#inspect/to_s does not call #to_str")
     obj.should_receive(:inspect).and_return(obj)
     obj.should_not_receive(:to_str)
-
-    { a: obj }.send(@method).should =~ /^\{:a=>#<MockObject:0x[0-9a-f]+>\}$/
+    expected_pattern = ruby_version_is("3.4") ? /^\{a: #<MockObject:0x[0-9a-f]+>\}$/ : /^\{:a=>#<MockObject:0x[0-9a-f]+>\}$/
+    { a: obj }.send(@method).should =~ expected_pattern
   end
 
   it "does not call #to_str on the object returned from #to_s when it is not a String" do
@@ -51,8 +45,8 @@
     obj.should_receive(:inspect).and_return(obj)
     obj.should_receive(:to_s).and_return(obj)
     obj.should_not_receive(:to_str)
-
-    { a: obj }.send(@method).should =~ /^\{:a=>#<MockObject:0x[0-9a-f]+>\}$/
+    expected_pattern = ruby_version_is("3.4") ? /^\{a: #<MockObject:0x[0-9a-f]+>\}$/ : /^\{:a=>#<MockObject:0x[0-9a-f]+>\}$/
+    { a: obj }.send(@method).should =~ expected_pattern
   end
 
   it "does not swallow exceptions raised by #to_s" do
@@ -66,24 +60,34 @@
   it "handles hashes with recursive values" do
     x = {}
     x[0] = x
-    x.send(@method).should == '{0=>{...}}'
+    expected = ruby_version_is("3.4") ? '{0 => {...}}' : '{0=>{...}}'
+    x.send(@method).should == expected
 
     x = {}
     y = {}
     x[0] = y
     y[1] = x
-    x.send(@method).should == "{0=>{1=>{...}}}"
-    y.send(@method).should == "{1=>{0=>{...}}}"
+    expected_x = ruby_version_is("3.4") ? '{0 => {1 => {...}}}' : '{0=>{1=>{...}}}'
+    expected_y = ruby_version_is("3.4") ? '{1 => {0 => {...}}}' : '{1=>{0=>{...}}}'
+    x.send(@method).should == expected_x
+    y.send(@method).should == expected_y
   end
 
   it "does not raise if inspected result is not default external encoding" do
     utf_16be = mock("utf_16be")
-    utf_16be.should_receive(:inspect).and_return(%<"utf_16be \u3042">.encode!(Encoding::UTF_16BE))
-
-    {a: utf_16be}.send(@method).should == '{:a=>"utf_16be \u3042"}'
+    utf_16be.should_receive(:inspect).and_return(%<"utf_16be \u3042">.encode(Encoding::UTF_16BE))
+    expected = ruby_version_is("3.4") ? '{a: "utf_16be \u3042"}' : '{:a=>"utf_16be \u3042"}'
+    {a: utf_16be}.send(@method).should == expected
   end
 
   it "works for keys and values whose #inspect return a frozen String" do
-    { true => false }.to_s.should == "{true=>false}"
+    expected = ruby_version_is("3.4") ? "{true => false}" : "{true=>false}"
+    { true => false }.to_s.should == expected
+  end
+
+  ruby_version_is "3.4" do
+    it "adds quotes to symbol keys that are not valid symbol literals" do
+      { "needs-quotes": 1 }.send(@method).should == '{"needs-quotes": 1}'
+    end
   end
 end
diff --git a/spec/ruby/core/hash/shift_spec.rb b/spec/ruby/core/hash/shift_spec.rb
index ea36488a04dfaf..3f31b9864cd4dc 100644
--- a/spec/ruby/core/hash/shift_spec.rb
+++ b/spec/ruby/core/hash/shift_spec.rb
@@ -30,45 +30,22 @@
     h.should == {}
   end
 
-  ruby_version_is '3.2' do
-    it "returns nil if the Hash is empty" do
-      h = {}
-      def h.default(key)
-        raise
-      end
-      h.shift.should == nil
-    end
-  end
-
-  ruby_version_is ''...'3.2' do
-    it "calls #default with nil if the Hash is empty" do
-      h = {}
-      def h.default(key)
-        key.should == nil
-        :foo
-      end
-      h.shift.should == :foo
+  it "returns nil if the Hash is empty" do
+    h = {}
+    def h.default(key)
+      raise
     end
+    h.shift.should == nil
   end
 
   it "returns nil from an empty hash" do
     {}.shift.should == nil
   end
 
-  ruby_version_is '3.2' do
-    it "returns nil for empty hashes with defaults and default procs" do
-      Hash.new(5).shift.should == nil
-      h = Hash.new { |*args| args }
-      h.shift.should == nil
-    end
-  end
-
-  ruby_version_is ''...'3.2' do
-    it "returns (computed) default for empty hashes" do
-      Hash.new(5).shift.should == 5
-      h = Hash.new { |*args| args }
-      h.shift.should == [h, nil]
-    end
+  it "returns nil for empty hashes with defaults and default procs" do
+    Hash.new(5).shift.should == nil
+    h = Hash.new { |*args| args }
+    h.shift.should == nil
   end
 
   it "preserves Hash invariants when removing the last item" do
diff --git a/spec/ruby/core/hash/to_h_spec.rb b/spec/ruby/core/hash/to_h_spec.rb
index 75ebce68b1eb7e..e17ca7e67112f6 100644
--- a/spec/ruby/core/hash/to_h_spec.rb
+++ b/spec/ruby/core/hash/to_h_spec.rb
@@ -37,6 +37,16 @@
       { a: 1, b: 2 }.to_h { |k, v| [k.to_s, v*v]}.should == { "a" => 1, "b" => 4 }
     end
 
+    it "passes to a block each pair's key and value as separate arguments" do
+      ScratchPad.record []
+      { a: 1, b: 2 }.to_h { |k, v| ScratchPad << [k, v]; [k, v] }
+      ScratchPad.recorded.sort.should == [[:a, 1], [:b, 2]]
+
+      ScratchPad.record []
+      { a: 1, b: 2 }.to_h { |*args| ScratchPad << args; [args[0], args[1]] }
+      ScratchPad.recorded.sort.should == [[:a, 1], [:b, 2]]
+    end
+
     it "raises ArgumentError if block returns longer or shorter array" do
       -> do
         { a: 1, b: 2 }.to_h { |k, v| [k.to_s, v*v, 1] }
diff --git a/spec/ruby/core/hash/transform_keys_spec.rb b/spec/ruby/core/hash/transform_keys_spec.rb
index 2fbb17a8e2856d..f63d39ecc88f5c 100644
--- a/spec/ruby/core/hash/transform_keys_spec.rb
+++ b/spec/ruby/core/hash/transform_keys_spec.rb
@@ -76,24 +76,12 @@
     @hash.should == { b: 1, c: 2, d: 3, e: 4 }
   end
 
-  ruby_version_is ""..."3.0.2" do # https://bugs.ruby-lang.org/issues/17735
-    it "returns the processed keys if we break from the block" do
-      @hash.transform_keys! do |v|
-        break if v == :c
-        v.succ
-      end
-      @hash.should == { b: 1, c: 2 }
-    end
-  end
-
-  ruby_version_is "3.0.2" do
-    it "returns the processed keys and non evaluated keys if we break from the block" do
-      @hash.transform_keys! do |v|
-        break if v == :c
-        v.succ
-      end
-      @hash.should == { b: 1, c: 2, d: 4 }
+  it "returns the processed keys and non evaluated keys if we break from the block" do
+    @hash.transform_keys! do |v|
+      break if v == :c
+      v.succ
     end
+    @hash.should == { b: 1, c: 2, d: 4 }
   end
 
   it "keeps later pair if new keys conflict" do
@@ -129,7 +117,7 @@
     end
 
     it "raises a FrozenError on hash argument" do
-     ->{ @hash.transform_keys!({ a: :A, b: :B, c: :C }) }.should raise_error(FrozenError)
+      ->{ @hash.transform_keys!({ a: :A, b: :B, c: :C }) }.should raise_error(FrozenError)
     end
 
     context "when no block is given" do
diff --git a/spec/ruby/core/integer/ceil_spec.rb b/spec/ruby/core/integer/ceil_spec.rb
index 13bdaf838d988f..eb633fba78432f 100644
--- a/spec/ruby/core/integer/ceil_spec.rb
+++ b/spec/ruby/core/integer/ceil_spec.rb
@@ -1,11 +1,16 @@
 require_relative '../../spec_helper'
 require_relative 'shared/to_i'
 require_relative 'shared/integer_rounding'
+require_relative 'shared/integer_ceil_precision'
 
 describe "Integer#ceil" do
   it_behaves_like :integer_to_i, :ceil
   it_behaves_like :integer_rounding_positive_precision, :ceil
 
+  context "with precision" do
+    it_behaves_like :integer_ceil_precision, :Integer
+  end
+
   context "precision argument specified as part of the ceil method is negative" do
     it "returns the smallest integer greater than self with at least precision.abs trailing zeros" do
       18.ceil(-1).should eql(20)
diff --git a/spec/ruby/core/integer/ceildiv_spec.rb b/spec/ruby/core/integer/ceildiv_spec.rb
index 18d07c66d0a8bd..c6e22a457dd2bd 100644
--- a/spec/ruby/core/integer/ceildiv_spec.rb
+++ b/spec/ruby/core/integer/ceildiv_spec.rb
@@ -1,22 +1,20 @@
 require_relative '../../spec_helper'
 
 describe "Integer#ceildiv" do
-  ruby_version_is '3.2' do
-    it "returns a quotient of division which is rounded up to the nearest integer" do
-      0.ceildiv(3).should eql(0)
-      1.ceildiv(3).should eql(1)
-      3.ceildiv(3).should eql(1)
-      4.ceildiv(3).should eql(2)
+  it "returns a quotient of division which is rounded up to the nearest integer" do
+    0.ceildiv(3).should eql(0)
+    1.ceildiv(3).should eql(1)
+    3.ceildiv(3).should eql(1)
+    4.ceildiv(3).should eql(2)
 
-      4.ceildiv(-3).should eql(-1)
-      -4.ceildiv(3).should eql(-1)
-      -4.ceildiv(-3).should eql(2)
+    4.ceildiv(-3).should eql(-1)
+    -4.ceildiv(3).should eql(-1)
+    -4.ceildiv(-3).should eql(2)
 
-      3.ceildiv(1.2).should eql(3)
-      3.ceildiv(6/5r).should eql(3)
+    3.ceildiv(1.2).should eql(3)
+    3.ceildiv(6/5r).should eql(3)
 
-      (10**100-11).ceildiv(10**99-1).should eql(10)
-      (10**100-9).ceildiv(10**99-1).should eql(11)
-    end
+    (10**100-11).ceildiv(10**99-1).should eql(10)
+    (10**100-9).ceildiv(10**99-1).should eql(11)
   end
 end
diff --git a/spec/ruby/core/integer/chr_spec.rb b/spec/ruby/core/integer/chr_spec.rb
index 8fe20ff81277f7..39cafe287457f9 100644
--- a/spec/ruby/core/integer/chr_spec.rb
+++ b/spec/ruby/core/integer/chr_spec.rb
@@ -10,12 +10,12 @@
   end
 
   it "raises a RangeError is self is less than 0" do
-    -> { -1.chr }.should raise_error(RangeError)
-    -> { (-bignum_value).chr }.should raise_error(RangeError)
+    -> { -1.chr }.should raise_error(RangeError, /-1 out of char range/)
+    -> { (-bignum_value).chr }.should raise_error(RangeError, /bignum out of char range/)
   end
 
   it "raises a RangeError if self is too large" do
-    -> { 2206368128.chr(Encoding::UTF_8) }.should raise_error(RangeError)
+    -> { 2206368128.chr(Encoding::UTF_8) }.should raise_error(RangeError, /2206368128 out of char range/)
   end
 
   describe "when Encoding.default_internal is nil" do
@@ -48,8 +48,8 @@
     end
 
     it "raises a RangeError is self is greater than 255" do
-      -> { 256.chr }.should raise_error(RangeError)
-      -> { bignum_value.chr }.should raise_error(RangeError)
+      -> { 256.chr }.should raise_error(RangeError, /256 out of char range/)
+      -> { bignum_value.chr }.should raise_error(RangeError, /bignum out of char range/)
     end
   end
 
@@ -137,7 +137,7 @@
           [620,    "TIS-620"]
         ].each do |integer, encoding_name|
           Encoding.default_internal = Encoding.find(encoding_name)
-          -> { integer.chr }.should raise_error(RangeError)
+          -> { integer.chr }.should raise_error(RangeError, /(invalid codepoint|out of char range)/)
         end
       end
     end
@@ -165,12 +165,12 @@
 
   # http://redmine.ruby-lang.org/issues/4869
   it "raises a RangeError is self is less than 0" do
-    -> { -1.chr(Encoding::UTF_8) }.should raise_error(RangeError)
-    -> { (-bignum_value).chr(Encoding::EUC_JP) }.should raise_error(RangeError)
+    -> { -1.chr(Encoding::UTF_8) }.should raise_error(RangeError, /-1 out of char range/)
+    -> { (-bignum_value).chr(Encoding::EUC_JP) }.should raise_error(RangeError, /bignum out of char range/)
   end
 
   it "raises a RangeError if self is too large" do
-    -> { 2206368128.chr(Encoding::UTF_8) }.should raise_error(RangeError)
+    -> { 2206368128.chr(Encoding::UTF_8) }.should raise_error(RangeError, /2206368128 out of char range/)
   end
 
   it "returns a String with the specified encoding" do
diff --git a/spec/ruby/core/integer/coerce_spec.rb b/spec/ruby/core/integer/coerce_spec.rb
index f1f32560323924..1d6dc9713f5f78 100644
--- a/spec/ruby/core/integer/coerce_spec.rb
+++ b/spec/ruby/core/integer/coerce_spec.rb
@@ -1,7 +1,5 @@
 require_relative '../../spec_helper'
 
-require 'bigdecimal'
-
 describe "Integer#coerce" do
   context "fixnum" do
     describe "when given a Fixnum" do
@@ -90,15 +88,4 @@
       ary.should == [1.2, a.to_f]
     end
   end
-
-  context "bigdecimal" do
-    it "produces Floats" do
-      x, y = 3.coerce(BigDecimal("3.4"))
-      x.class.should == Float
-      x.should == 3.4
-      y.class.should == Float
-      y.should == 3.0
-    end
-  end
-
 end
diff --git a/spec/ruby/core/integer/constants_spec.rb b/spec/ruby/core/integer/constants_spec.rb
index 2077ad451ed186..937806c72f9eb7 100644
--- a/spec/ruby/core/integer/constants_spec.rb
+++ b/spec/ruby/core/integer/constants_spec.rb
@@ -1,41 +1,13 @@
 require_relative '../../spec_helper'
 
 describe "Fixnum" do
-  ruby_version_is ""..."3.2" do
-    it "is unified into Integer" do
-      suppress_warning do
-        Fixnum.should equal(Integer)
-      end
-    end
-
-    it "is deprecated" do
-      -> { Fixnum }.should complain(/constant ::Fixnum is deprecated/)
-    end
-  end
-
-  ruby_version_is "3.2" do
-    it "is no longer defined" do
-      Object.should_not.const_defined?(:Fixnum)
-    end
+  it "is no longer defined" do
+    Object.should_not.const_defined?(:Fixnum)
   end
 end
 
 describe "Bignum" do
-  ruby_version_is ""..."3.2" do
-    it "is unified into Integer" do
-      suppress_warning do
-        Bignum.should equal(Integer)
-      end
-    end
-
-    it "is deprecated" do
-      -> { Bignum }.should complain(/constant ::Bignum is deprecated/)
-    end
-  end
-
-  ruby_version_is "3.2" do
-    it "is no longer defined" do
-      Object.should_not.const_defined?(:Bignum)
-    end
+  it "is no longer defined" do
+    Object.should_not.const_defined?(:Bignum)
   end
 end
diff --git a/spec/ruby/core/integer/div_spec.rb b/spec/ruby/core/integer/div_spec.rb
index 344e0951797408..2eb9c0623bf6c5 100644
--- a/spec/ruby/core/integer/div_spec.rb
+++ b/spec/ruby/core/integer/div_spec.rb
@@ -143,4 +143,12 @@
       -> { @bignum.div(-0) }.should raise_error(ZeroDivisionError)
     end
   end
+
+  context "rational" do
+    it "returns self divided by the given argument as an Integer" do
+      2.div(6/5r).should == 1
+      1.div(6/5r).should == 0
+      5.div(6/5r).should == 4
+    end
+  end
 end
diff --git a/spec/ruby/core/integer/divide_spec.rb b/spec/ruby/core/integer/divide_spec.rb
index a878c4668c71b7..0d5e16e986825a 100644
--- a/spec/ruby/core/integer/divide_spec.rb
+++ b/spec/ruby/core/integer/divide_spec.rb
@@ -12,6 +12,17 @@
 
     it "supports dividing negative numbers" do
       (-1 / 10).should == -1
+      (-1 / 10**10).should == -1
+      (-1 / 10**20).should == -1
+    end
+
+    it "preservers sign correctly" do
+      (4 / 3).should == 1
+      (4 / -3).should == -2
+      (-4 / 3).should == -2
+      (-4 / -3).should == 1
+      (0 / -3).should == 0
+      (0 / 3).should == 0
     end
 
     it "returns result the same class as the argument" do
@@ -58,6 +69,15 @@
       ((10**50) / -(10**40 + 1)).should == -10000000000
     end
 
+    it "preservers sign correctly" do
+      (4 / bignum_value).should == 0
+      (4 / -bignum_value).should == -1
+      (-4 / bignum_value).should == -1
+      (-4 / -bignum_value).should == 0
+      (0 / bignum_value).should == 0
+      (0 / -bignum_value).should == 0
+    end
+
     it "returns self divided by Float" do
       not_supported_on :opal do
         (bignum_value(88) / 4294967295.0).should be_close(4294967297.0, TOLERANCE)
@@ -86,4 +106,21 @@
       -> { @bignum / :symbol }.should raise_error(TypeError)
     end
   end
+
+  it "coerces the RHS and calls #coerce" do
+    obj = mock("integer plus")
+    obj.should_receive(:coerce).with(6).and_return([6, 3])
+    (6 / obj).should == 2
+  end
+
+  it "coerces the RHS and calls #coerce even if it's private" do
+    obj = Object.new
+    class << obj
+      private def coerce(n)
+        [n, 3]
+      end
+    end
+
+    (6 / obj).should == 2
+  end
 end
diff --git a/spec/ruby/core/integer/floor_spec.rb b/spec/ruby/core/integer/floor_spec.rb
index aaa816fdc53ef0..8fb84d58cb8af6 100644
--- a/spec/ruby/core/integer/floor_spec.rb
+++ b/spec/ruby/core/integer/floor_spec.rb
@@ -1,19 +1,13 @@
 require_relative '../../spec_helper'
 require_relative 'shared/to_i'
 require_relative 'shared/integer_rounding'
+require_relative 'shared/integer_floor_precision'
 
 describe "Integer#floor" do
   it_behaves_like :integer_to_i, :floor
   it_behaves_like :integer_rounding_positive_precision, :floor
 
-  context "precision argument specified as part of the floor method is negative" do
-    it "returns the largest integer less than self with at least precision.abs trailing zeros" do
-      1832.floor(-1).should eql(1830)
-      1832.floor(-2).should eql(1800)
-      1832.floor(-3).should eql(1000)
-      -1832.floor(-1).should eql(-1840)
-      -1832.floor(-2).should eql(-1900)
-      -1832.floor(-3).should eql(-2000)
-    end
+  context "with precision" do
+    it_behaves_like :integer_floor_precision, :Integer
   end
 end
diff --git a/spec/ruby/core/integer/left_shift_spec.rb b/spec/ruby/core/integer/left_shift_spec.rb
index 0781371d9399a6..86c2b18ae298ba 100644
--- a/spec/ruby/core/integer/left_shift_spec.rb
+++ b/spec/ruby/core/integer/left_shift_spec.rb
@@ -181,10 +181,8 @@
       (bignum_value << -(2**40)).should == 0
     end
 
-    ruby_bug "#18517", ""..."3.2" do
-      it "returns 0 when m > 0 long and n == 0" do
-        (0 << (2**40)).should == 0
-      end
+    it "returns 0 when m > 0 long and n == 0" do
+      (0 << (2**40)).should == 0
     end
 
     it "returns 0 when m > 0 bignum and n == 0" do
diff --git a/spec/ruby/core/integer/minus_spec.rb b/spec/ruby/core/integer/minus_spec.rb
index aadf416a0521ca..6072ba7c8b8a24 100644
--- a/spec/ruby/core/integer/minus_spec.rb
+++ b/spec/ruby/core/integer/minus_spec.rb
@@ -40,4 +40,21 @@
       -> { @bignum - :symbol }.should raise_error(TypeError)
     end
   end
+
+  it "coerces the RHS and calls #coerce" do
+    obj = mock("integer plus")
+    obj.should_receive(:coerce).with(5).and_return([5, 10])
+    (5 - obj).should == -5
+  end
+
+  it "coerces the RHS and calls #coerce even if it's private" do
+    obj = Object.new
+    class << obj
+      private def coerce(n)
+        [n, 10]
+      end
+    end
+
+    (5 - obj).should == -5
+  end
 end
diff --git a/spec/ruby/core/integer/plus_spec.rb b/spec/ruby/core/integer/plus_spec.rb
index d01a76ab58e8e6..38428e56c5b0c2 100644
--- a/spec/ruby/core/integer/plus_spec.rb
+++ b/spec/ruby/core/integer/plus_spec.rb
@@ -55,4 +55,21 @@ def +(other)
     RUBY
     ruby_exe(code).should == "-1"
   end
+
+  it "coerces the RHS and calls #coerce" do
+    obj = mock("integer plus")
+    obj.should_receive(:coerce).with(6).and_return([6, 3])
+    (6 + obj).should == 9
+  end
+
+  it "coerces the RHS and calls #coerce even if it's private" do
+    obj = Object.new
+    class << obj
+      private def coerce(n)
+        [n, 3]
+      end
+    end
+
+    (6 + obj).should == 9
+  end
 end
diff --git a/spec/ruby/core/integer/pow_spec.rb b/spec/ruby/core/integer/pow_spec.rb
index 47129110952d24..ecaca01eff3bc2 100644
--- a/spec/ruby/core/integer/pow_spec.rb
+++ b/spec/ruby/core/integer/pow_spec.rb
@@ -19,13 +19,13 @@
       2.pow(61, 5843009213693951).should eql 3697379018277258
       2.pow(62, 5843009213693952).should eql 1551748822859776
       2.pow(63, 5843009213693953).should eql 3103497645717974
-      2.pow(64, 5843009213693954).should eql  363986077738838
+      2.pow(64, 5843009213693954).should eql 363986077738838
     end
 
     it "handles sign like #divmod does" do
-       2.pow(5,  12).should ==  8
-       2.pow(5, -12).should == -4
-      -2.pow(5,  12).should ==  4
+      2.pow(5, 12).should == 8
+      2.pow(5, -12).should == -4
+      -2.pow(5, 12).should == 4
       -2.pow(5, -12).should == -8
     end
 
diff --git a/spec/ruby/core/integer/remainder_spec.rb b/spec/ruby/core/integer/remainder_spec.rb
index 96268b3af5cbc7..757e42fbe84f69 100644
--- a/spec/ruby/core/integer/remainder_spec.rb
+++ b/spec/ruby/core/integer/remainder_spec.rb
@@ -15,8 +15,8 @@
     end
 
     it "keeps sign of self" do
-       5.remainder( 3).should ==  2
-       5.remainder(-3).should ==  2
+      5.remainder( 3).should == 2
+      5.remainder(-3).should == 2
       -5.remainder( 3).should == -2
       -5.remainder(-3).should == -2
     end
diff --git a/spec/ruby/core/integer/right_shift_spec.rb b/spec/ruby/core/integer/right_shift_spec.rb
index e91613d8d143ab..c902674e2f3e26 100644
--- a/spec/ruby/core/integer/right_shift_spec.rb
+++ b/spec/ruby/core/integer/right_shift_spec.rb
@@ -203,10 +203,8 @@
       (bignum_value >> (2**40)).should == 0
     end
 
-    ruby_bug "#18517", ""..."3.2" do
-      it "returns 0 when m < 0 long and n == 0" do
-        (0 >> -(2**40)).should == 0
-      end
+    it "returns 0 when m < 0 long and n == 0" do
+      (0 >> -(2**40)).should == 0
     end
 
     it "returns 0 when m < 0 bignum and n == 0" do
diff --git a/spec/ruby/core/integer/round_spec.rb b/spec/ruby/core/integer/round_spec.rb
index 45ac126fd3604b..189384f11adf88 100644
--- a/spec/ruby/core/integer/round_spec.rb
+++ b/spec/ruby/core/integer/round_spec.rb
@@ -21,10 +21,8 @@
     (-25 * 10**70).round(-71).should eql(-30 * 10**70)
   end
 
-  platform_is_not wordsize: 32 do
-    it "raises a RangeError when passed a big negative value" do
-      -> { 42.round(fixnum_min) }.should raise_error(RangeError)
-    end
+  it "raises a RangeError when passed a big negative value" do
+    -> { 42.round(min_long - 1) }.should raise_error(RangeError)
   end
 
   it "raises a RangeError when passed Float::INFINITY" do
diff --git a/spec/ruby/core/integer/shared/exponent.rb b/spec/ruby/core/integer/shared/exponent.rb
index 15df518b7e49e3..5ef6d686d809d4 100644
--- a/spec/ruby/core/integer/shared/exponent.rb
+++ b/spec/ruby/core/integer/shared/exponent.rb
@@ -48,10 +48,18 @@
       (-1).send(@method, 4611686018427387905).should eql(-1)
     end
 
-    it "returns Float::INFINITY when the number is too big" do
-      -> {
-        2.send(@method, 427387904).should == Float::INFINITY
-      }.should complain(/warning: in a\*\*b, b may be too big/)
+    ruby_version_is ""..."3.4" do
+      it "returns Float::INFINITY when the number is too big" do
+        -> {
+          2.send(@method, 427387904).should == Float::INFINITY
+        }.should complain(/warning: in a\*\*b, b may be too big/)
+      end
+    end
+
+    ruby_version_is "3.4" do
+      it "raises an ArgumentError when the number is too big" do
+        -> { 100000000.send(@method, 1000000000) }.should raise_error(ArgumentError)
+      end
     end
 
     it "raises a ZeroDivisionError for 0 ** -1" do
@@ -108,13 +116,23 @@
       -> { @bignum.send(@method, :symbol) }.should raise_error(TypeError)
     end
 
-    it "switch to a Float when the values is too big" do
-      flt = nil
-      -> {
-        flt = @bignum.send(@method, @bignum)
-      }.should complain(/warning: in a\*\*b, b may be too big/)
-      flt.should be_kind_of(Float)
-      flt.infinite?.should == 1
+    ruby_version_is ""..."3.4" do
+      it "switch to a Float when the values is too big" do
+        flt = nil
+        -> {
+          flt = @bignum.send(@method, @bignum)
+        }.should complain(/warning: in a\*\*b, b may be too big/)
+        flt.should be_kind_of(Float)
+        flt.infinite?.should == 1
+      end
+    end
+
+    ruby_version_is "3.4" do
+      it "does not switch to a Float when the values is too big" do
+        -> {
+          @bignum.send(@method, @bignum)
+        }.should raise_error(ArgumentError)
+      end
     end
 
     it "returns a complex number when negative and raised to a fractional power" do
diff --git a/spec/ruby/core/integer/shared/integer_ceil_precision.rb b/spec/ruby/core/integer/shared/integer_ceil_precision.rb
new file mode 100644
index 00000000000000..9f31c2cf615ed0
--- /dev/null
+++ b/spec/ruby/core/integer/shared/integer_ceil_precision.rb
@@ -0,0 +1,43 @@
+describe :integer_ceil_precision, shared: true do
+  context "precision is zero" do
+    it "returns integer self" do
+      send(@method, 0).ceil(0).should.eql?(0)
+      send(@method, 123).ceil(0).should.eql?(123)
+      send(@method, -123).ceil(0).should.eql?(-123)
+    end
+  end
+
+  context "precision is positive" do
+    it "returns self" do
+      send(@method, 0).ceil(1).should.eql?(send(@method, 0))
+      send(@method, 0).ceil(10).should.eql?(send(@method, 0))
+
+      send(@method, 123).ceil(10).should.eql?(send(@method, 123))
+      send(@method, -123).ceil(10).should.eql?(send(@method, -123))
+    end
+  end
+
+  context "precision is negative" do
+    it "always returns 0 when self is 0" do
+      send(@method, 0).ceil(-1).should.eql?(0)
+      send(@method, 0).ceil(-10).should.eql?(0)
+    end
+
+    it "returns largest integer less than self with at least precision.abs trailing zeros" do
+      send(@method, 123).ceil(-1).should.eql?(130)
+      send(@method, 123).ceil(-2).should.eql?(200)
+      send(@method, 123).ceil(-3).should.eql?(1000)
+
+      send(@method, -123).ceil(-1).should.eql?(-120)
+      send(@method, -123).ceil(-2).should.eql?(-100)
+      send(@method, -123).ceil(-3).should.eql?(0)
+    end
+
+    ruby_bug "#20654", ""..."3.4" do
+      it "returns 10**precision.abs when precision.abs is larger than the number digits of self" do
+        send(@method, 123).ceil(-20).should.eql?(100000000000000000000)
+        send(@method, 123).ceil(-50).should.eql?(100000000000000000000000000000000000000000000000000)
+      end
+    end
+  end
+end
diff --git a/spec/ruby/core/integer/shared/integer_floor_precision.rb b/spec/ruby/core/integer/shared/integer_floor_precision.rb
new file mode 100644
index 00000000000000..4c5888c6c4818d
--- /dev/null
+++ b/spec/ruby/core/integer/shared/integer_floor_precision.rb
@@ -0,0 +1,43 @@
+describe :integer_floor_precision, shared: true do
+  context "precision is zero" do
+    it "returns integer self" do
+      send(@method, 0).floor(0).should.eql?(0)
+      send(@method, 123).floor(0).should.eql?(123)
+      send(@method, -123).floor(0).should.eql?(-123)
+    end
+  end
+
+  context "precision is positive" do
+    it "returns self" do
+      send(@method, 0).floor(1).should.eql?(send(@method, 0))
+      send(@method, 0).floor(10).should.eql?(send(@method, 0))
+
+      send(@method, 123).floor(10).should.eql?(send(@method, 123))
+      send(@method, -123).floor(10).should.eql?(send(@method, -123))
+    end
+  end
+
+  context "precision is negative" do
+    it "always returns 0 when self is 0" do
+      send(@method, 0).floor(-1).should.eql?(0)
+      send(@method, 0).floor(-10).should.eql?(0)
+    end
+
+    it "returns largest integer less than self with at least precision.abs trailing zeros" do
+      send(@method, 123).floor(-1).should.eql?(120)
+      send(@method, 123).floor(-2).should.eql?(100)
+      send(@method, 123).floor(-3).should.eql?(0)
+
+      send(@method, -123).floor(-1).should.eql?(-130)
+      send(@method, -123).floor(-2).should.eql?(-200)
+      send(@method, -123).floor(-3).should.eql?(-1000)
+    end
+
+    ruby_bug "#20654", ""..."3.4" do
+      it "returns -(10**precision.abs) when self is negative and precision.abs is larger than the number digits of self" do
+        send(@method, -123).floor(-20).should.eql?(-100000000000000000000)
+        send(@method, -123).floor(-50).should.eql?(-100000000000000000000000000000000000000000000000000)
+      end
+    end
+  end
+end
diff --git a/spec/ruby/core/integer/size_spec.rb b/spec/ruby/core/integer/size_spec.rb
index a134e823842134..725e9eb062bfa2 100644
--- a/spec/ruby/core/integer/size_spec.rb
+++ b/spec/ruby/core/integer/size_spec.rb
@@ -1,7 +1,7 @@
 require_relative '../../spec_helper'
 
 describe "Integer#size" do
-  platform_is wordsize: 32 do
+  platform_is c_long_size: 32 do
     it "returns the number of bytes in the machine representation of self" do
       -1.size.should == 4
       0.size.should == 4
@@ -9,7 +9,7 @@
     end
   end
 
-  platform_is wordsize: 64 do
+  platform_is c_long_size: 64 do
     it "returns the number of bytes in the machine representation of self" do
       -1.size.should == 8
       0.size.should == 8
diff --git a/spec/ruby/core/integer/try_convert_spec.rb b/spec/ruby/core/integer/try_convert_spec.rb
index 4bc7d3851a0b60..8a0ca671a9335b 100644
--- a/spec/ruby/core/integer/try_convert_spec.rb
+++ b/spec/ruby/core/integer/try_convert_spec.rb
@@ -1,50 +1,48 @@
 require_relative '../../spec_helper'
 require_relative 'fixtures/classes'
 
-ruby_version_is "3.1" do
-  describe "Integer.try_convert" do
-    it "returns the argument if it's an Integer" do
-      x = 42
-      Integer.try_convert(x).should equal(x)
-    end
+describe "Integer.try_convert" do
+  it "returns the argument if it's an Integer" do
+    x = 42
+    Integer.try_convert(x).should equal(x)
+  end
 
-    it "returns nil when the argument does not respond to #to_int" do
-      Integer.try_convert(Object.new).should be_nil
-    end
+  it "returns nil when the argument does not respond to #to_int" do
+    Integer.try_convert(Object.new).should be_nil
+  end
 
-    it "sends #to_int to the argument and returns the result if it's nil" do
-      obj = mock("to_int")
-      obj.should_receive(:to_int).and_return(nil)
-      Integer.try_convert(obj).should be_nil
-    end
+  it "sends #to_int to the argument and returns the result if it's nil" do
+    obj = mock("to_int")
+    obj.should_receive(:to_int).and_return(nil)
+    Integer.try_convert(obj).should be_nil
+  end
 
-    it "sends #to_int to the argument and returns the result if it's an Integer" do
-      x = 234
-      obj = mock("to_int")
-      obj.should_receive(:to_int).and_return(x)
-      Integer.try_convert(obj).should equal(x)
-    end
+  it "sends #to_int to the argument and returns the result if it's an Integer" do
+    x = 234
+    obj = mock("to_int")
+    obj.should_receive(:to_int).and_return(x)
+    Integer.try_convert(obj).should equal(x)
+  end
 
-    it "sends #to_int to the argument and raises TypeError if it's not a kind of Integer" do
-      obj = mock("to_int")
-      obj.should_receive(:to_int).and_return(Object.new)
-      -> {
-        Integer.try_convert obj
-      }.should raise_error(TypeError, "can't convert MockObject to Integer (MockObject#to_int gives Object)")
-    end
+  it "sends #to_int to the argument and raises TypeError if it's not a kind of Integer" do
+    obj = mock("to_int")
+    obj.should_receive(:to_int).and_return(Object.new)
+    -> {
+      Integer.try_convert obj
+    }.should raise_error(TypeError, "can't convert MockObject to Integer (MockObject#to_int gives Object)")
+  end
 
-    it "responds with a different error message when it raises a TypeError, depending on the type of the non-Integer object :to_int returns" do
-      obj = mock("to_int")
-      obj.should_receive(:to_int).and_return("A String")
-      -> {
-        Integer.try_convert obj
-      }.should raise_error(TypeError, "can't convert MockObject to Integer (MockObject#to_int gives String)")
-    end
+  it "responds with a different error message when it raises a TypeError, depending on the type of the non-Integer object :to_int returns" do
+    obj = mock("to_int")
+    obj.should_receive(:to_int).and_return("A String")
+    -> {
+      Integer.try_convert obj
+    }.should raise_error(TypeError, "can't convert MockObject to Integer (MockObject#to_int gives String)")
+  end
 
-    it "does not rescue exceptions raised by #to_int" do
-      obj = mock("to_int")
-      obj.should_receive(:to_int).and_raise(RuntimeError)
-      -> { Integer.try_convert obj }.should raise_error(RuntimeError)
-    end
+  it "does not rescue exceptions raised by #to_int" do
+    obj = mock("to_int")
+    obj.should_receive(:to_int).and_raise(RuntimeError)
+    -> { Integer.try_convert obj }.should raise_error(RuntimeError)
   end
 end
diff --git a/spec/ruby/core/io/autoclose_spec.rb b/spec/ruby/core/io/autoclose_spec.rb
new file mode 100644
index 00000000000000..715ada7c9348f9
--- /dev/null
+++ b/spec/ruby/core/io/autoclose_spec.rb
@@ -0,0 +1,77 @@
+require_relative '../../spec_helper'
+require_relative 'fixtures/classes'
+
+describe "IO#autoclose?" do
+  before :each do
+    @io = IOSpecs.io_fixture "lines.txt"
+  end
+
+  after :each do
+    @io.autoclose = true unless @io.closed?
+    @io.close unless @io.closed?
+  end
+
+  it "is set to true by default" do
+    @io.should.autoclose?
+  end
+
+  it "cannot be queried on a closed IO object" do
+    @io.close
+    -> { @io.autoclose? }.should raise_error(IOError, /closed stream/)
+  end
+end
+
+describe "IO#autoclose=" do
+  before :each do
+    @io = IOSpecs.io_fixture "lines.txt"
+  end
+
+  after :each do
+    @io.autoclose = true unless @io.closed?
+    @io.close unless @io.closed?
+  end
+
+  it "can be set to true" do
+    @io.autoclose = false
+    @io.autoclose = true
+    @io.should.autoclose?
+  end
+
+  it "can be set to false" do
+    @io.autoclose = true
+    @io.autoclose = false
+    @io.should_not.autoclose?
+  end
+
+  it "can be set to any truthy value" do
+    @io.autoclose = false
+    @io.autoclose = 42
+    @io.should.autoclose?
+
+    @io.autoclose = false
+    @io.autoclose = Object.new
+    @io.should.autoclose?
+  end
+
+  it "can be set to any falsy value" do
+    @io.autoclose = true
+    @io.autoclose = nil
+    @io.should_not.autoclose?
+  end
+
+  it "can be set multiple times" do
+    @io.autoclose = true
+    @io.should.autoclose?
+
+    @io.autoclose = false
+    @io.should_not.autoclose?
+
+    @io.autoclose = true
+    @io.should.autoclose?
+  end
+
+  it "cannot be set on a closed IO object" do
+    @io.close
+    -> { @io.autoclose = false }.should raise_error(IOError, /closed stream/)
+  end
+end
diff --git a/spec/ruby/core/io/close_read_spec.rb b/spec/ruby/core/io/close_read_spec.rb
index 26454bfddd1635..e700e85bd99919 100644
--- a/spec/ruby/core/io/close_read_spec.rb
+++ b/spec/ruby/core/io/close_read_spec.rb
@@ -4,7 +4,8 @@
 describe "IO#close_read" do
 
   before :each do
-    @io = IO.popen 'cat', "r+"
+    cmd = platform_is(:windows) ? 'rem' : 'cat'
+    @io = IO.popen cmd, "r+"
     @path = tmp('io.close.txt')
   end
 
diff --git a/spec/ruby/core/io/close_write_spec.rb b/spec/ruby/core/io/close_write_spec.rb
index 14835e4e2c08bf..70610a3e9d6dc9 100644
--- a/spec/ruby/core/io/close_write_spec.rb
+++ b/spec/ruby/core/io/close_write_spec.rb
@@ -3,7 +3,8 @@
 
 describe "IO#close_write" do
   before :each do
-    @io = IO.popen 'cat', 'r+'
+    cmd = platform_is(:windows) ? 'rem' : 'cat'
+    @io = IO.popen cmd, 'r+'
     @path = tmp('io.close.txt')
   end
 
@@ -48,12 +49,15 @@
     io.should.closed?
   end
 
-  it "flushes and closes the write stream" do
-    @io.puts '12345'
+  # Windows didn't have command like cat
+  platform_is_not :windows do
+    it "flushes and closes the write stream" do
+      @io.puts '12345'
 
-    @io.close_write
+      @io.close_write
 
-    @io.read.should == "12345\n"
+      @io.read.should == "12345\n"
+    end
   end
 
   it "does nothing on closed stream" do
diff --git a/spec/ruby/core/io/copy_stream_spec.rb b/spec/ruby/core/io/copy_stream_spec.rb
index df9c5c7390e446..ffa2ea992ce488 100644
--- a/spec/ruby/core/io/copy_stream_spec.rb
+++ b/spec/ruby/core/io/copy_stream_spec.rb
@@ -69,9 +69,12 @@
   end
 
   it "raises an IOError if the destination IO is not open for writing" do
-    @to_io.close
-    @to_io = new_io @to_name, "r"
-    -> { IO.copy_stream @object.from, @to_io }.should raise_error(IOError)
+    to_io = new_io __FILE__, "r"
+    begin
+      -> { IO.copy_stream @object.from, to_io }.should raise_error(IOError)
+    ensure
+      to_io.close
+    end
   end
 
   it "does not close the destination IO" do
@@ -109,7 +112,8 @@
   end
 
   after :each do
-    rm_r @to_name, @from_bigfile
+    rm_r @to_name if @to_name
+    rm_r @from_bigfile
   end
 
   describe "from an IO" do
@@ -164,6 +168,25 @@
       it_behaves_like :io_copy_stream_to_io, nil, IOSpecs::CopyStream
       it_behaves_like :io_copy_stream_to_io_with_offset, nil, IOSpecs::CopyStream
     end
+
+    describe "to a Tempfile" do
+      before :all do
+        require 'tempfile'
+      end
+
+      before :each do
+        @to_io = Tempfile.new("rubyspec_copy_stream", encoding: Encoding::BINARY, mode: File::RDONLY)
+        @to_name = @to_io.path
+      end
+
+      after :each do
+        @to_io.close!
+        @to_name = nil # do not rm_r it, already done by Tempfile#close!
+      end
+
+      it_behaves_like :io_copy_stream_to_io, nil, IOSpecs::CopyStream
+      it_behaves_like :io_copy_stream_to_io_with_offset, nil, IOSpecs::CopyStream
+    end
   end
 
   describe "from a file name" do
@@ -277,10 +300,8 @@
       @io.should_not_receive(:pos)
       IO.copy_stream(@io, @to_name)
     end
-
   end
 
-
   describe "with a destination that does partial reads" do
     before do
       @from_out, @from_in = IO.pipe
diff --git a/spec/ruby/core/io/dup_spec.rb b/spec/ruby/core/io/dup_spec.rb
index 68d538377f680f..564e00743871b9 100644
--- a/spec/ruby/core/io/dup_spec.rb
+++ b/spec/ruby/core/io/dup_spec.rb
@@ -25,27 +25,27 @@
     @i.fileno.should_not == @f.fileno
   end
 
-quarantine! do # This does not appear to be consistent across platforms
-  it "shares the original stream between the two IOs" do
-    start = @f.pos
-    @i.pos.should == start
+  quarantine! do # This does not appear to be consistent across platforms
+    it "shares the original stream between the two IOs" do
+      start = @f.pos
+      @i.pos.should == start
 
-    s =  "Hello, wo.. wait, where am I?\n"
-    s2 = "<evil voice>       Muhahahaa!"
+      s =  "Hello, wo.. wait, where am I?\n"
+      s2 = "<evil voice>       Muhahahaa!"
 
-    @f.write s
-    @i.pos.should == @f.pos
+      @f.write s
+      @i.pos.should == @f.pos
 
-    @i.rewind
-    @i.gets.should == s
+      @i.rewind
+      @i.gets.should == s
 
-    @i.rewind
-    @i.write s2
+      @i.rewind
+      @i.write s2
 
-    @f.rewind
-    @f.gets.should == "#{s2}\n"
+      @f.rewind
+      @f.gets.should == "#{s2}\n"
+    end
   end
-end
 
   it "allows closing the new IO without affecting the original" do
     @i.close
diff --git a/spec/ruby/core/io/external_encoding_spec.rb b/spec/ruby/core/io/external_encoding_spec.rb
index 2fcf1c72181b34..7765c6c0f51042 100644
--- a/spec/ruby/core/io/external_encoding_spec.rb
+++ b/spec/ruby/core/io/external_encoding_spec.rb
@@ -94,12 +94,10 @@
     rm_r @name
   end
 
-  ruby_version_is '3.1' do
-    it "can be retrieved from a closed stream" do
-      io = IOSpecs.io_fixture("lines.txt", "r")
-      io.close
-      io.external_encoding.should equal(Encoding.default_external)
-    end
+  it "can be retrieved from a closed stream" do
+    io = IOSpecs.io_fixture("lines.txt", "r")
+    io.close
+    io.external_encoding.should equal(Encoding.default_external)
   end
 
   describe "with 'r' mode" do
diff --git a/spec/ruby/core/io/gets_spec.rb b/spec/ruby/core/io/gets_spec.rb
index 73d76b3abdf507..ca64bf860e4148 100644
--- a/spec/ruby/core/io/gets_spec.rb
+++ b/spec/ruby/core/io/gets_spec.rb
@@ -24,6 +24,12 @@
     end
   end
 
+  it "sets $_ to nil after the last line has been read" do
+    while @io.gets
+    end
+    $_.should be_nil
+  end
+
   it "returns nil if called at the end of the stream" do
     IOSpecs.lines.length.times { @io.gets }
     @io.gets.should == nil
diff --git a/spec/ruby/core/io/internal_encoding_spec.rb b/spec/ruby/core/io/internal_encoding_spec.rb
index 60afaf2ebd1a77..7a583d4bcb13a6 100644
--- a/spec/ruby/core/io/internal_encoding_spec.rb
+++ b/spec/ruby/core/io/internal_encoding_spec.rb
@@ -113,12 +113,10 @@
     Encoding.default_internal = @internal
   end
 
-  ruby_version_is '3.1' do
-    it "can be retrieved from a closed stream" do
-      io = IOSpecs.io_fixture("lines.txt", "r")
-      io.close
-      io.internal_encoding.should equal(Encoding.default_internal)
-    end
+  it "can be retrieved from a closed stream" do
+    io = IOSpecs.io_fixture("lines.txt", "r")
+    io.close
+    io.internal_encoding.should equal(Encoding.default_internal)
   end
 
   describe "with 'r' mode" do
diff --git a/spec/ruby/core/io/ioctl_spec.rb b/spec/ruby/core/io/ioctl_spec.rb
index 8dcd9eb2c61646..3f7b5ad5d7cbb6 100644
--- a/spec/ruby/core/io/ioctl_spec.rb
+++ b/spec/ruby/core/io/ioctl_spec.rb
@@ -12,7 +12,7 @@
     guard -> { RUBY_PLATFORM.include?("86") } do # x86 / x86_64
       it "resizes an empty String to match the output size" do
         File.open(__FILE__, 'r') do |f|
-          buffer = ''
+          buffer = +''
           # FIONREAD in /usr/include/asm-generic/ioctls.h
           f.ioctl 0x541B, buffer
           buffer.unpack('I').first.should be_kind_of(Integer)
diff --git a/spec/ruby/core/io/lineno_spec.rb b/spec/ruby/core/io/lineno_spec.rb
index 9a4ad908800843..e82cdd9f17ecab 100644
--- a/spec/ruby/core/io/lineno_spec.rb
+++ b/spec/ruby/core/io/lineno_spec.rb
@@ -26,7 +26,8 @@
   end
 
   it "raises an IOError on a duplexed stream with the read side closed" do
-    IO.popen('cat', 'r+') do |p|
+    cmd = platform_is(:windows) ? 'rem' : 'cat'
+    IO.popen(cmd, 'r+') do |p|
       p.close_read
       -> { p.lineno }.should raise_error(IOError)
     end
@@ -70,7 +71,8 @@
   end
 
   it "raises an IOError on a duplexed stream with the read side closed" do
-    IO.popen('cat', 'r+') do |p|
+    cmd = platform_is(:windows) ? 'rem' : 'cat'
+    IO.popen(cmd, 'r+') do |p|
       p.close_read
       -> { p.lineno = 0 }.should raise_error(IOError)
     end
diff --git a/spec/ruby/core/io/new_spec.rb b/spec/ruby/core/io/new_spec.rb
index 9d14ec18ad4099..979ac0efcbd78f 100644
--- a/spec/ruby/core/io/new_spec.rb
+++ b/spec/ruby/core/io/new_spec.rb
@@ -5,6 +5,12 @@
 
 describe "IO.new" do
   it_behaves_like :io_new, :new
+
+  it "does not use the given block and warns to use IO::open" do
+    -> {
+      @io = IO.send(@method, @fd) { raise }
+    }.should complain(/warning: IO::new\(\) does not take block; use IO::open\(\) instead/)
+  end
 end
 
 describe "IO.new" do
diff --git a/spec/ruby/core/io/open_spec.rb b/spec/ruby/core/io/open_spec.rb
index d3a3961df759d2..d151da9ce5aea3 100644
--- a/spec/ruby/core/io/open_spec.rb
+++ b/spec/ruby/core/io/open_spec.rb
@@ -37,6 +37,19 @@
     ScratchPad.recorded.should == :called
   end
 
+  it "propagate an exception in the block after calling #close" do
+    -> do
+      IO.open(@fd, "w") do |io|
+        IOSpecs.io_mock(io, :close) do
+          super()
+          ScratchPad.record :called
+        end
+        raise Exception
+      end
+    end.should raise_error(Exception)
+    ScratchPad.recorded.should == :called
+  end
+
   it "propagates an exception raised by #close that is not a StandardError" do
     -> do
       IO.open(@fd, "w") do |io|
diff --git a/spec/ruby/core/io/path_spec.rb b/spec/ruby/core/io/path_spec.rb
index 8145c32f39fa3e..798adb2163279f 100644
--- a/spec/ruby/core/io/path_spec.rb
+++ b/spec/ruby/core/io/path_spec.rb
@@ -1,14 +1,12 @@
 require_relative '../../spec_helper'
 
 describe "IO#path" do
-  ruby_version_is "3.2" do
-    it "returns the path of the file associated with the IO object" do
-      path = tmp("io_path.txt")
-      File.open(path, "w") do |file|
-        IO.new(file.fileno, path: file.path, autoclose: false).path.should == file.path
-      end
-    ensure
-      File.unlink(path)
+  it "returns the path of the file associated with the IO object" do
+    path = tmp("io_path.txt")
+    File.open(path, "w") do |file|
+      IO.new(file.fileno, path: file.path, autoclose: false).path.should == file.path
     end
+  ensure
+    File.unlink(path)
   end
 end
diff --git a/spec/ruby/core/io/popen_spec.rb b/spec/ruby/core/io/popen_spec.rb
index e9d32c5c7dcc6a..6043862614bc76 100644
--- a/spec/ruby/core/io/popen_spec.rb
+++ b/spec/ruby/core/io/popen_spec.rb
@@ -95,6 +95,22 @@
     @io = IO.popen(ruby_cmd('exit 0'), mode)
   end
 
+  it "accepts a path using the chdir: keyword argument" do
+    path = File.dirname(@fname)
+
+    @io = IO.popen(ruby_cmd("puts Dir.pwd"), "r", chdir: path)
+    @io.read.chomp.should == path
+  end
+
+  it "accepts a path using the chdir: keyword argument and a coercible path" do
+    path = File.dirname(@fname)
+    object = mock("path")
+    object.should_receive(:to_path).and_return(path)
+
+    @io = IO.popen(ruby_cmd("puts Dir.pwd"), "r", chdir: object)
+    @io.read.chomp.should == path
+  end
+
   describe "with a block" do
     it "yields an open IO to the block" do
       IO.popen(ruby_cmd('exit'), "r") do |io|
diff --git a/spec/ruby/core/io/pread_spec.rb b/spec/ruby/core/io/pread_spec.rb
index fb0645dec6817b..dc7bcedf3e5c2f 100644
--- a/spec/ruby/core/io/pread_spec.rb
+++ b/spec/ruby/core/io/pread_spec.rb
@@ -21,16 +21,106 @@
     end
 
     it "accepts a length, an offset, and an output buffer" do
-      buffer = "foo"
-      @file.pread(3, 4, buffer)
+      buffer = +"foo"
+      @file.pread(3, 4, buffer).should.equal?(buffer)
       buffer.should == "567"
     end
 
+    it "shrinks the buffer in case of less bytes read" do
+      buffer = +"foo"
+      @file.pread(1, 0, buffer)
+      buffer.should == "1"
+    end
+
+    it "grows the buffer in case of more bytes read" do
+      buffer = +"foo"
+      @file.pread(5, 0, buffer)
+      buffer.should == "12345"
+    end
+
+    it "preserves the encoding of the given buffer" do
+      buffer = ''.encode(Encoding::ISO_8859_1)
+      @file.pread(10, 0, buffer)
+
+      buffer.encoding.should == Encoding::ISO_8859_1
+    end
+
     it "does not advance the file pointer" do
       @file.pread(4, 0).should == "1234"
       @file.read.should == "1234567890"
     end
 
+    it "ignores the current offset" do
+      @file.pos = 3
+      @file.pread(4, 0).should == "1234"
+    end
+
+    it "returns an empty string for maxlen = 0" do
+      @file.pread(0, 4).should == ""
+    end
+
+    it "returns a buffer for maxlen = 0 when buffer specified" do
+      buffer = +"foo"
+      @file.pread(0, 4, buffer).should.equal?(buffer)
+      buffer.should == "foo"
+    end
+
+    it "ignores the offset for maxlen = 0, even if it is out of file bounds" do
+      @file.pread(0, 400).should == ""
+    end
+
+    it "does not reset the buffer when reading with maxlen = 0" do
+      buffer = +"foo"
+      @file.pread(0, 4, buffer)
+      buffer.should == "foo"
+
+      @file.pread(0, 400, buffer)
+      buffer.should == "foo"
+    end
+
+    it "converts maxlen to Integer using #to_int" do
+      maxlen = mock('maxlen')
+      maxlen.should_receive(:to_int).and_return(4)
+      @file.pread(maxlen, 0).should == "1234"
+    end
+
+    it "converts offset to Integer using #to_int" do
+      offset = mock('offset')
+      offset.should_receive(:to_int).and_return(0)
+      @file.pread(4, offset).should == "1234"
+    end
+
+    it "converts a buffer to String using to_str" do
+      buffer = mock('buffer')
+      buffer.should_receive(:to_str).at_least(1).and_return(+"foo")
+      @file.pread(4, 0, buffer)
+      buffer.should_not.is_a?(String)
+      buffer.to_str.should == "1234"
+    end
+
+    it "raises TypeError if maxlen is not an Integer and cannot be coerced into Integer" do
+      maxlen = Object.new
+      -> { @file.pread(maxlen, 0) }.should raise_error(TypeError, 'no implicit conversion of Object into Integer')
+    end
+
+    it "raises TypeError if offset is not an Integer and cannot be coerced into Integer" do
+      offset = Object.new
+      -> { @file.pread(4, offset) }.should raise_error(TypeError, 'no implicit conversion of Object into Integer')
+    end
+
+    it "raises ArgumentError for negative values of maxlen" do
+      -> { @file.pread(-4, 0) }.should raise_error(ArgumentError, 'negative string size (or size too big)')
+    end
+
+    it "raised Errno::EINVAL for negative values of offset" do
+      -> { @file.pread(4, -1) }.should raise_error(Errno::EINVAL, /Invalid argument/)
+    end
+
+    it "raises TypeError if the buffer is not a String and cannot be coerced into String" do
+      buffer = Object.new
+      -> { @file.pread(4, 0, buffer) }.should raise_error(TypeError, 'no implicit conversion of Object into String')
+    end
+
     it "raises EOFError if end-of-file is reached" do
       -> { @file.pread(1, 10) }.should raise_error(EOFError)
     end
diff --git a/spec/ruby/core/io/puts_spec.rb b/spec/ruby/core/io/puts_spec.rb
index 9a708fffef1a6e..a186ddaa5d83a3 100644
--- a/spec/ruby/core/io/puts_spec.rb
+++ b/spec/ruby/core/io/puts_spec.rb
@@ -6,7 +6,7 @@
     @before_separator = $/
     @name = tmp("io_puts.txt")
     @io = new_io @name
-    ScratchPad.record ""
+    ScratchPad.record(+"")
     def @io.write(str)
       ScratchPad << str
     end
@@ -33,7 +33,7 @@ def @io.write(str)
     ScratchPad.recorded.should == "\n"
   end
 
-  it "writes empty string with a newline when when given nil as multiple args" do
+  it "writes empty string with a newline when given nil as multiple args" do
     @io.puts(nil, nil).should == nil
     ScratchPad.recorded.should == "\n\n"
   end
diff --git a/spec/ruby/core/io/pwrite_spec.rb b/spec/ruby/core/io/pwrite_spec.rb
index c10578a8eb1718..2bc508b37d1660 100644
--- a/spec/ruby/core/io/pwrite_spec.rb
+++ b/spec/ruby/core/io/pwrite_spec.rb
@@ -28,16 +28,42 @@
       @file.pread(6, 0).should == "foobar"
     end
 
+    it "calls #to_s on the object to be written" do
+      object = mock("to_s")
+      object.should_receive(:to_s).and_return("foo")
+      @file.pwrite(object, 0)
+      @file.pread(3, 0).should == "foo"
+    end
+
+    it "calls #to_int on the offset" do
+      offset = mock("to_int")
+      offset.should_receive(:to_int).and_return(2)
+      @file.pwrite("foo", offset)
+      @file.pread(3, 2).should == "foo"
+    end
+
     it "raises IOError when file is not open in write mode" do
       File.open(@fname, "r") do |file|
-        -> { file.pwrite("foo", 1) }.should raise_error(IOError)
+        -> { file.pwrite("foo", 1) }.should raise_error(IOError, "not opened for writing")
       end
     end
 
     it "raises IOError when file is closed" do
       file = File.open(@fname, "w+")
       file.close
-      -> { file.pwrite("foo", 1) }.should raise_error(IOError)
+      -> { file.pwrite("foo", 1) }.should raise_error(IOError, "closed stream")
+    end
+
+    it "raises a NoMethodError if object does not respond to #to_s" do
+      -> {
+        @file.pwrite(BasicObject.new, 0)
+      }.should raise_error(NoMethodError, /undefined method [`']to_s'/)
+    end
+
+    it "raises a TypeError if the offset cannot be converted to an Integer" do
+      -> {
+        @file.pwrite("foo", Object.new)
+      }.should raise_error(TypeError, "no implicit conversion of Object into Integer")
     end
   end
 end
diff --git a/spec/ruby/core/io/read_nonblock_spec.rb b/spec/ruby/core/io/read_nonblock_spec.rb
index a62b75274c6774..51e7cd6bd2fdd4 100644
--- a/spec/ruby/core/io/read_nonblock_spec.rb
+++ b/spec/ruby/core/io/read_nonblock_spec.rb
@@ -96,21 +96,21 @@
   end
 
   it "reads into the passed buffer" do
-    buffer = ""
+    buffer = +""
     @write.write("1")
     @read.read_nonblock(1, buffer)
     buffer.should == "1"
   end
 
   it "returns the passed buffer" do
-    buffer = ""
+    buffer = +""
     @write.write("1")
     output = @read.read_nonblock(1, buffer)
     output.should equal(buffer)
   end
 
   it "discards the existing buffer content upon successful read" do
-    buffer = "existing content"
+    buffer = +"existing content"
     @write.write("hello world")
     @write.close
     @read.read_nonblock(11, buffer)
@@ -118,7 +118,7 @@
   end
 
   it "discards the existing buffer content upon error" do
-    buffer = "existing content"
+    buffer = +"existing content"
     @write.close
     -> { @read.read_nonblock(1, buffer) }.should raise_error(EOFError)
     buffer.should be_empty
diff --git a/spec/ruby/core/io/read_spec.rb b/spec/ruby/core/io/read_spec.rb
index bd22fb6d6ea64d..567daa55dfc464 100644
--- a/spec/ruby/core/io/read_spec.rb
+++ b/spec/ruby/core/io/read_spec.rb
@@ -113,6 +113,15 @@
     IO.read(@fname, 1, 10).should == nil
   end
 
+  it "returns an empty string when reading zero bytes" do
+    IO.read(@fname, 0).should == ''
+  end
+
+  it "returns a String in BINARY when passed a size" do
+    IO.read(@fname, 1).encoding.should == Encoding::BINARY
+    IO.read(@fname, 0).encoding.should == Encoding::BINARY
+  end
+
   it "raises an Errno::ENOENT when the requested file does not exist" do
     rm_r @fname
     -> { IO.read @fname }.should raise_error(Errno::ENOENT)
@@ -208,19 +217,19 @@
     end
   end
 
-quarantine! do # The process tried to write to a nonexistent pipe.
-  platform_is :windows do
-    # TODO: It should raise Errno::ESPIPE on Windows as well
-    # once https://bugs.ruby-lang.org/issues/12230 is fixed.
-    it "raises Errno::EINVAL if passed an offset" do
-      -> {
-        suppress_warning do # https://bugs.ruby-lang.org/issues/19630
-          IO.read("|cmd.exe /C echo hello", 1, 1)
-        end
-      }.should raise_error(Errno::EINVAL)
+  quarantine! do # The process tried to write to a nonexistent pipe.
+    platform_is :windows do
+      # TODO: It should raise Errno::ESPIPE on Windows as well
+      # once https://bugs.ruby-lang.org/issues/12230 is fixed.
+      it "raises Errno::EINVAL if passed an offset" do
+        -> {
+          suppress_warning do # https://bugs.ruby-lang.org/issues/19630
+            IO.read("|cmd.exe /C echo hello", 1, 1)
+          end
+        }.should raise_error(Errno::EINVAL)
+      end
     end
   end
-end
 
   ruby_version_is "3.3" do
     # https://bugs.ruby-lang.org/issues/19630
@@ -274,21 +283,55 @@
     @io.read(4).should == '7890'
   end
 
+  it "treats first nil argument as no length limit" do
+    @io.read(nil).should == @contents
+  end
+
+  it "raises an ArgumentError when not passed a valid length" do
+    -> { @io.read(-1) }.should raise_error(ArgumentError)
+  end
+
   it "clears the output buffer if there is nothing to read" do
     @io.pos = 10
 
-    buf = 'non-empty string'
+    buf = +'non-empty string'
 
     @io.read(10, buf).should == nil
 
     buf.should == ''
+
+    buf = +'non-empty string'
+
+    @io.read(nil, buf).should == ""
+
+    buf.should == ''
+
+    buf = +'non-empty string'
+
+    @io.read(0, buf).should == ""
+
+    buf.should == ''
+  end
+
+  it "raise FrozenError if the output buffer is frozen" do
+    @io.read
+    -> { @io.read(0, 'frozen-string'.freeze) }.should raise_error(FrozenError)
+    -> { @io.read(1, 'frozen-string'.freeze) }.should raise_error(FrozenError)
+    -> { @io.read(nil, 'frozen-string'.freeze) }.should raise_error(FrozenError)
+  end
+
+  ruby_bug "", ""..."3.3" do
+    it "raise FrozenError if the output buffer is frozen (2)" do
+      @io.read
+      -> { @io.read(1, ''.freeze) }.should raise_error(FrozenError)
+    end
   end
 
   it "consumes zero bytes when reading zero bytes" do
     @io.read(0).should == ''
     @io.pos.should == 0
 
-    @io.getc.chr.should == '1'
+    @io.getc.should == '1'
   end
 
   it "is at end-of-file when everything has been read" do
@@ -301,53 +344,68 @@
   end
 
   it "places the specified number of bytes in the buffer" do
-    buf = ""
+    buf = +""
     @io.read 5, buf
 
     buf.should == "12345"
   end
 
   it "expands the buffer when too small" do
-    buf = "ABCDE"
+    buf = +"ABCDE"
     @io.read nil, buf
 
     buf.should == @contents
   end
 
   it "overwrites the buffer" do
-    buf = "ABCDEFGHIJ"
+    buf = +"ABCDEFGHIJ"
     @io.read nil, buf
 
     buf.should == @contents
   end
 
   it "truncates the buffer when too big" do
-    buf = "ABCDEFGHIJKLMNO"
+    buf = +"ABCDEFGHIJKLMNO"
     @io.read nil, buf
     buf.should == @contents
 
     @io.rewind
 
-    buf = "ABCDEFGHIJKLMNO"
+    buf = +"ABCDEFGHIJKLMNO"
     @io.read 5, buf
     buf.should == @contents[0..4]
   end
 
+  it "preserves the encoding of the given buffer" do
+    buffer = ''.encode(Encoding::ISO_8859_1)
+    @io.read(10, buffer)
+
+    buffer.encoding.should == Encoding::ISO_8859_1
+  end
+
+  # https://bugs.ruby-lang.org/issues/20416
+  it "does not preserve the encoding of the given buffer when max length is not provided" do
+    buffer = ''.encode(Encoding::ISO_8859_1)
+    @io.read(nil, buffer)
+
+    buffer.encoding.should_not == Encoding::ISO_8859_1
+  end
+
   it "returns the given buffer" do
-    buf = ""
+    buf = +""
 
     @io.read(nil, buf).should equal buf
   end
 
   it "returns the given buffer when there is nothing to read" do
-    buf = ""
+    buf = +""
 
     @io.read
     @io.read(nil, buf).should equal buf
   end
 
   it "coerces the second argument to string and uses it as a buffer" do
-    buf = "ABCDE"
+    buf = +"ABCDE"
     obj = mock("buff")
     obj.should_receive(:to_str).any_number_of_times.and_return(buf)
 
@@ -545,13 +603,13 @@
 
   describe "when passed nil for limit" do
     it "sets the buffer to a transcoded String" do
-      result = @io.read(nil, buf = "")
+      result = @io.read(nil, buf = +"")
       buf.should equal(result)
       buf.should == "ありがとう\n"
     end
 
     it "sets the buffer's encoding to the internal encoding" do
-      buf = "".force_encoding Encoding::ISO_8859_1
+      buf = "".dup.force_encoding Encoding::ISO_8859_1
       @io.read(nil, buf)
       buf.encoding.should equal(Encoding::UTF_8)
     end
@@ -565,17 +623,18 @@
 
   it "returns a String in BINARY when passed a size" do
     @io.read(4).encoding.should equal(Encoding::BINARY)
+    @io.read(0).encoding.should equal(Encoding::BINARY)
   end
 
   it "does not change the buffer's encoding when passed a limit" do
-    buf = "".force_encoding Encoding::ISO_8859_1
+    buf = "".dup.force_encoding Encoding::ISO_8859_1
     @io.read(4, buf)
     buf.should == [164, 162, 164, 234].pack('C*').force_encoding(Encoding::ISO_8859_1)
     buf.encoding.should equal(Encoding::ISO_8859_1)
   end
 
   it "truncates the buffer but does not change the buffer's encoding when no data remains" do
-    buf = "abc".force_encoding Encoding::ISO_8859_1
+    buf = "abc".dup.force_encoding Encoding::ISO_8859_1
     @io.read
 
     @io.read(1, buf).should be_nil
diff --git a/spec/ruby/core/io/readpartial_spec.rb b/spec/ruby/core/io/readpartial_spec.rb
index 2901b429c25181..2fcfaf520370e3 100644
--- a/spec/ruby/core/io/readpartial_spec.rb
+++ b/spec/ruby/core/io/readpartial_spec.rb
@@ -1,4 +1,4 @@
-# -*- encoding: binary -*-
+# encoding: binary
 require_relative '../../spec_helper'
 require_relative 'fixtures/classes'
 
@@ -59,10 +59,10 @@
   end
 
   it "discards the existing buffer content upon successful read" do
-    buffer = "existing content"
+    buffer = +"existing content"
     @wr.write("hello world")
     @wr.close
-    @rd.readpartial(11, buffer)
+    @rd.readpartial(11, buffer).should.equal?(buffer)
     buffer.should == "hello world"
   end
 
@@ -74,7 +74,7 @@
   end
 
   it "discards the existing buffer content upon error" do
-    buffer = 'hello'
+    buffer = +'hello'
     @wr.close
     -> { @rd.readpartial(1, buffer) }.should raise_error(EOFError)
     buffer.should be_empty
@@ -93,12 +93,10 @@
     @rd.readpartial(0).should == ""
   end
 
-  ruby_bug "#18421", ""..."3.0.4" do
-    it "clears and returns the given buffer if the length argument is 0" do
-      buffer = "existing content"
-      @rd.readpartial(0, buffer).should == buffer
-      buffer.should == ""
-    end
+  it "clears and returns the given buffer if the length argument is 0" do
+    buffer = +"existing content"
+    @rd.readpartial(0, buffer).should == buffer
+    buffer.should == ""
   end
 
   it "preserves the encoding of the given buffer" do
@@ -106,6 +104,7 @@
     @wr.write("abc")
     @wr.close
     @rd.readpartial(10, buffer)
+
     buffer.encoding.should == Encoding::ISO_8859_1
   end
 end
diff --git a/spec/ruby/core/io/select_spec.rb b/spec/ruby/core/io/select_spec.rb
index 1e4e50a81b7a3c..3893e7620f9e10 100644
--- a/spec/ruby/core/io/select_spec.rb
+++ b/spec/ruby/core/io/select_spec.rb
@@ -114,6 +114,39 @@
   it "raises an ArgumentError when passed a negative timeout" do
     -> { IO.select(nil, nil, nil, -5)}.should raise_error(ArgumentError)
   end
+
+  describe "returns the available descriptors when the file descriptor" do
+    it "is in both read and error arrays" do
+      @wr.write("foobar")
+      result = IO.select([@rd], nil, [@rd])
+      result.should == [[@rd], [], []]
+    end
+
+    it "is in both write and error arrays" do
+      result = IO.select(nil, [@wr], [@wr])
+      result.should == [[], [@wr], []]
+    end
+
+    it "is in both read and write arrays" do
+      filename = tmp("IO_select_read_write_file")
+      w = File.open(filename, 'w+')
+      begin
+        IO.select([w], [w], []).should == [[w], [w], []]
+      ensure
+        w.close
+        rm_r filename
+      end
+
+      IO.select([@wr], [@wr], []).should == [[], [@wr], []]
+
+      @wr.write("foobar")
+      # CRuby on macOS returns [[@rd], [@rd], []], weird but we accept it here, probably only for pipe read-end
+      [
+        [[@rd], [], []],
+        [[@rd], [@rd], []]
+      ].should.include? IO.select([@rd], [@rd], [])
+    end
+  end
 end
 
 describe "IO.select when passed nil for timeout" do
diff --git a/spec/ruby/core/io/set_encoding_by_bom_spec.rb b/spec/ruby/core/io/set_encoding_by_bom_spec.rb
index 92433d66405aae..30d5ce5a5af16c 100644
--- a/spec/ruby/core/io/set_encoding_by_bom_spec.rb
+++ b/spec/ruby/core/io/set_encoding_by_bom_spec.rb
@@ -62,11 +62,11 @@
     @io.rewind
     @io.set_encoding(Encoding::ASCII_8BIT)
 
-    File.binwrite(@name, "\xFE\xFFabc")
+    File.binwrite(@name, "\xFE\xFFabcd")
 
     @io.set_encoding_by_bom.should == Encoding::UTF_16BE
     @io.external_encoding.should == Encoding::UTF_16BE
-    @io.read.b.should == "abc".b
+    @io.read.b.should == "abcd".b
   end
 
   it "returns the result encoding if found BOM UTF_32LE sequence" do
@@ -94,11 +94,11 @@
     @io.rewind
     @io.set_encoding(Encoding::ASCII_8BIT)
 
-    File.binwrite(@name, "\x00\x00\xFE\xFFabc")
+    File.binwrite(@name, "\x00\x00\xFE\xFFabcd")
 
     @io.set_encoding_by_bom.should == Encoding::UTF_32BE
     @io.external_encoding.should == Encoding::UTF_32BE
-    @io.read.b.should == "abc".b
+    @io.read.b.should == "abcd".b
   end
 
   it "returns nil if io is empty" do
diff --git a/spec/ruby/core/io/shared/each.rb b/spec/ruby/core/io/shared/each.rb
index dbc0178dd63975..0747f31b8a84d3 100644
--- a/spec/ruby/core/io/shared/each.rb
+++ b/spec/ruby/core/io/shared/each.rb
@@ -33,10 +33,6 @@
       $_.should == "test"
     end
 
-    it "returns self" do
-      @io.send(@method) { |l| l }.should equal(@io)
-    end
-
     it "raises an IOError when self is not readable" do
       -> { IOSpecs.closed_io.send(@method) {} }.should raise_error(IOError)
     end
@@ -206,20 +202,10 @@
   end
 
   describe "when passed chomp and nil as a separator" do
-    ruby_version_is "3.2" do
-      it "yields self's content" do
-        @io.pos = 100
-        @io.send(@method, nil, chomp: true) { |s| ScratchPad << s }
-        ScratchPad.recorded.should == ["qui a linha cinco.\nHere is line six.\n"]
-      end
-    end
-
-    ruby_version_is ""..."3.2" do
-      it "yields self's content without trailing new line character" do
-        @io.pos = 100
-        @io.send(@method, nil, chomp: true) { |s| ScratchPad << s }
-        ScratchPad.recorded.should == ["qui a linha cinco.\nHere is line six."]
-      end
+    it "yields self's content" do
+      @io.pos = 100
+      @io.send(@method, nil, chomp: true) { |s| ScratchPad << s }
+      ScratchPad.recorded.should == ["qui a linha cinco.\nHere is line six.\n"]
     end
   end
 
diff --git a/spec/ruby/core/io/shared/gets_ascii.rb b/spec/ruby/core/io/shared/gets_ascii.rb
index 2a8fe3c9a5fda1..2bd5470d997673 100644
--- a/spec/ruby/core/io/shared/gets_ascii.rb
+++ b/spec/ruby/core/io/shared/gets_ascii.rb
@@ -1,4 +1,4 @@
-# -*- encoding: binary -*-
+# encoding: binary
 describe :io_gets_ascii, shared: true do
   describe "with ASCII separator" do
     before :each do
diff --git a/spec/ruby/core/io/shared/readlines.rb b/spec/ruby/core/io/shared/readlines.rb
index d2b604bba357f7..6c1fa11a596800 100644
--- a/spec/ruby/core/io/shared/readlines.rb
+++ b/spec/ruby/core/io/shared/readlines.rb
@@ -99,7 +99,7 @@
       end
 
       it "accepts non-ASCII data as separator" do
-        result = IO.send(@method, @name, "\303\250".force_encoding("utf-8"), &@object)
+        result = IO.send(@method, @name, "\303\250".dup.force_encoding("utf-8"), &@object)
         (result ? result : ScratchPad.recorded).should == IOSpecs.lines_arbitrary_separator
       end
     end
diff --git a/spec/ruby/core/io/stat_spec.rb b/spec/ruby/core/io/stat_spec.rb
index 58eba02b8fb9c0..717c45d0a3fe6d 100644
--- a/spec/ruby/core/io/stat_spec.rb
+++ b/spec/ruby/core/io/stat_spec.rb
@@ -3,7 +3,8 @@
 
 describe "IO#stat" do
   before :each do
-    @io = IO.popen 'cat', "r+"
+    cmd = platform_is(:windows) ? 'rem' : 'cat'
+    @io = IO.popen cmd, "r+"
   end
 
   after :each do
diff --git a/spec/ruby/core/io/sysread_spec.rb b/spec/ruby/core/io/sysread_spec.rb
index e7f63cefec70e5..d56a27b3af3e85 100644
--- a/spec/ruby/core/io/sysread_spec.rb
+++ b/spec/ruby/core/io/sysread_spec.rb
@@ -21,25 +21,25 @@
   end
 
   it "reads the specified number of bytes from the file to the buffer" do
-    buf = "" # empty buffer
+    buf = +"" # empty buffer
     @file.sysread(15, buf).should == buf
     buf.should == "012345678901234"
 
     @file.rewind
 
-    buf = "ABCDE" # small buffer
+    buf = +"ABCDE" # small buffer
     @file.sysread(15, buf).should == buf
     buf.should == "012345678901234"
 
     @file.rewind
 
-    buf = "ABCDE" * 5 # large buffer
+    buf = +"ABCDE" * 5 # large buffer
     @file.sysread(15, buf).should == buf
     buf.should == "012345678901234"
   end
 
   it "coerces the second argument to string and uses it as a buffer" do
-    buf = "ABCDE"
+    buf = +"ABCDE"
     (obj = mock("buff")).should_receive(:to_str).any_number_of_times.and_return(buf)
     @file.sysread(15, obj).should == buf
     buf.should == "012345678901234"
@@ -90,23 +90,30 @@
   end
 
   it "immediately returns the given buffer if the length argument is 0" do
-    buffer = "existing content"
+    buffer = +"existing content"
     @file.sysread(0, buffer).should == buffer
     buffer.should == "existing content"
   end
 
   it "discards the existing buffer content upon successful read" do
-    buffer = "existing content"
-    @file.sysread(11, buffer)
+    buffer = +"existing content"
+    @file.sysread(11, buffer).should.equal?(buffer)
     buffer.should == "01234567890"
   end
 
   it "discards the existing buffer content upon error" do
-    buffer = "existing content"
+    buffer = +"existing content"
     @file.seek(0, :END)
     -> { @file.sysread(1, buffer) }.should raise_error(EOFError)
     buffer.should be_empty
   end
+
+  it "preserves the encoding of the given buffer" do
+    buffer = ''.encode(Encoding::ISO_8859_1)
+    string = @file.sysread(10, buffer)
+
+    buffer.encoding.should == Encoding::ISO_8859_1
+  end
 end
 
 describe "IO#sysread" do
@@ -124,9 +131,7 @@
     @read.sysread(3).should == "ab"
   end
 
-  guard_not -> { platform_is :windows and ruby_version_is ""..."3.2" } do # https://bugs.ruby-lang.org/issues/18880
-    it "raises ArgumentError when length is less than 0" do
-      -> { @read.sysread(-1) }.should raise_error(ArgumentError)
-    end
+  it "raises ArgumentError when length is less than 0" do
+    -> { @read.sysread(-1) }.should raise_error(ArgumentError)
   end
 end
diff --git a/spec/ruby/core/io/write_nonblock_spec.rb b/spec/ruby/core/io/write_nonblock_spec.rb
index c403c864fd2c30..5bfc690f9bab3d 100644
--- a/spec/ruby/core/io/write_nonblock_spec.rb
+++ b/spec/ruby/core/io/write_nonblock_spec.rb
@@ -43,7 +43,7 @@
 
     it "checks if the file is writable if writing zero bytes" do
       -> {
-         @readonly_file.write_nonblock("")
+        @readonly_file.write_nonblock("")
       }.should raise_error(IOError)
     end
   end
diff --git a/spec/ruby/core/kernel/Float_spec.rb b/spec/ruby/core/kernel/Float_spec.rb
index 015bcb33d6e195..1705205996a9ad 100644
--- a/spec/ruby/core/kernel/Float_spec.rb
+++ b/spec/ruby/core/kernel/Float_spec.rb
@@ -41,7 +41,7 @@
   end
 
   it "converts Strings to floats without calling #to_f" do
-    string = "10"
+    string = +"10"
     string.should_not_receive(:to_f)
     @object.send(:Float, string).should == 10.0
   end
@@ -157,6 +157,24 @@ def to_f() 1.2 end
     @object.send(:Float, "1\t\n").should == 1.0
   end
 
+  ruby_version_is ""..."3.4" do
+    it "raises ArgumentError if a fractional part is missing" do
+      -> { @object.send(:Float, "1.") }.should raise_error(ArgumentError)
+      -> { @object.send(:Float, "+1.") }.should raise_error(ArgumentError)
+      -> { @object.send(:Float, "-1.") }.should raise_error(ArgumentError)
+      -> { @object.send(:Float, "1.e+0") }.should raise_error(ArgumentError)
+    end
+  end
+
+  ruby_version_is "3.4" do
+    it "allows String representation without a fractional part" do
+      @object.send(:Float, "1.").should == 1.0
+      @object.send(:Float, "+1.").should == 1.0
+      @object.send(:Float, "-1.").should == -1.0
+      @object.send(:Float, "1.e+0").should == 1.0
+    end
+  end
+
   %w(e E).each do |e|
     it "raises an ArgumentError if #{e} is the trailing character" do
       -> { @object.send(:Float, "2#{e}") }.should raise_error(ArgumentError)
@@ -204,59 +222,99 @@ def to_f() 1.2 end
     end
   end
 
-  describe "for hexadecimal literals with binary exponent" do
-    %w(p P).each do |p|
-      it "interprets the fractional part (on the left side of '#{p}') in hexadecimal" do
-        @object.send(:Float, "0x10#{p}0").should == 16.0
-      end
-
-      it "interprets the exponent (on the right of '#{p}') in decimal" do
-        @object.send(:Float, "0x1#{p}10").should == 1024.0
-      end
-
-      it "raises an ArgumentError if #{p} is the trailing character" do
-        -> { @object.send(:Float, "0x1#{p}") }.should raise_error(ArgumentError)
-      end
-
-      it "raises an ArgumentError if #{p} is the leading character" do
-        -> { @object.send(:Float, "0x#{p}1") }.should raise_error(ArgumentError)
-      end
-
-      it "returns Infinity for '0x1#{p}10000'" do
-        @object.send(:Float, "0x1#{p}10000").should == Float::INFINITY
-      end
-
-      it "returns 0 for '0x1#{p}-10000'" do
-        @object.send(:Float, "0x1#{p}-10000").should == 0
-      end
+  context "for hexadecimal literals" do
+    it "interprets the 0x prefix as hexadecimal" do
+      @object.send(:Float, "0x10").should == 16.0
+      @object.send(:Float, "0x0F").should == 15.0
+      @object.send(:Float, "0x0f").should == 15.0
+    end
 
-      it "allows embedded _ in a number on either side of the #{p}" do
-        @object.send(:Float, "0x1_0#{p}10").should == 16384.0
-        @object.send(:Float, "0x10#{p}1_0").should == 16384.0
-        @object.send(:Float, "0x1_0#{p}1_0").should == 16384.0
-      end
+    it "accepts embedded _ if the number does not contain a-f" do
+      @object.send(:Float, "0x1_0").should == 16.0
+    end
 
-      it "raises an exception if a space is embedded on either side of the '#{p}'" do
-        -> { @object.send(:Float, "0x1 0#{p}10") }.should raise_error(ArgumentError)
-        -> { @object.send(:Float, "0x10#{p}1 0") }.should raise_error(ArgumentError)
+    ruby_version_is ""..."3.4.3" do
+      it "does not accept embedded _ if the number contains a-f" do
+        -> { @object.send(:Float, "0x1_0a") }.should raise_error(ArgumentError)
+        @object.send(:Float, "0x1_0a", exception: false).should be_nil
       end
+    end
 
-      it "raises an exception if there's a leading _ on either side of the '#{p}'" do
-        -> { @object.send(:Float, "0x_10#{p}10") }.should raise_error(ArgumentError)
-        -> { @object.send(:Float, "0x10#{p}_10") }.should raise_error(ArgumentError)
+    ruby_version_is "3.4.3" do
+      it "accepts embedded _ if the number contains a-f" do
+        @object.send(:Float, "0x1_0a").should == 0x10a.to_f
       end
+    end
 
-      it "raises an exception if there's a trailing _ on either side of the '#{p}'" do
-        -> { @object.send(:Float, "0x10_#{p}10") }.should raise_error(ArgumentError)
-        -> { @object.send(:Float, "0x10#{p}10_") }.should raise_error(ArgumentError)
-      end
+    it "does not accept _ before, after or inside the 0x prefix" do
+      -> { @object.send(:Float, "_0x10") }.should raise_error(ArgumentError)
+      -> { @object.send(:Float, "0_x10") }.should raise_error(ArgumentError)
+      -> { @object.send(:Float, "0x_10") }.should raise_error(ArgumentError)
+      @object.send(:Float, "_0x10", exception: false).should be_nil
+      @object.send(:Float, "0_x10", exception: false).should be_nil
+      @object.send(:Float, "0x_10", exception: false).should be_nil
+    end
 
-      it "allows hexadecimal points on the left side of the '#{p}'" do
-        @object.send(:Float, "0x1.8#{p}0").should == 1.5
+    ruby_version_is "3.4" do
+      it "accepts a fractional part" do
+        @object.send(:Float, "0x0.8").should == 0.5
       end
+    end
 
-      it "raises an ArgumentError if there's a decimal point on the right side of the '#{p}'" do
-        -> { @object.send(:Float, "0x1#{p}1.0") }.should raise_error(ArgumentError)
+    describe "with binary exponent" do
+      %w(p P).each do |p|
+        it "interprets the fractional part (on the left side of '#{p}') in hexadecimal" do
+          @object.send(:Float, "0x10#{p}0").should == 16.0
+        end
+
+        it "interprets the exponent (on the right of '#{p}') in decimal" do
+          @object.send(:Float, "0x1#{p}10").should == 1024.0
+        end
+
+        it "raises an ArgumentError if #{p} is the trailing character" do
+          -> { @object.send(:Float, "0x1#{p}") }.should raise_error(ArgumentError)
+        end
+
+        it "raises an ArgumentError if #{p} is the leading character" do
+          -> { @object.send(:Float, "0x#{p}1") }.should raise_error(ArgumentError)
+        end
+
+        it "returns Infinity for '0x1#{p}10000'" do
+          @object.send(:Float, "0x1#{p}10000").should == Float::INFINITY
+        end
+
+        it "returns 0 for '0x1#{p}-10000'" do
+          @object.send(:Float, "0x1#{p}-10000").should == 0
+        end
+
+        it "allows embedded _ in a number on either side of the #{p}" do
+          @object.send(:Float, "0x1_0#{p}10").should == 16384.0
+          @object.send(:Float, "0x10#{p}1_0").should == 16384.0
+          @object.send(:Float, "0x1_0#{p}1_0").should == 16384.0
+        end
+
+        it "raises an exception if a space is embedded on either side of the '#{p}'" do
+          -> { @object.send(:Float, "0x1 0#{p}10") }.should raise_error(ArgumentError)
+          -> { @object.send(:Float, "0x10#{p}1 0") }.should raise_error(ArgumentError)
+        end
+
+        it "raises an exception if there's a leading _ on either side of the '#{p}'" do
+          -> { @object.send(:Float, "0x_10#{p}10") }.should raise_error(ArgumentError)
+          -> { @object.send(:Float, "0x10#{p}_10") }.should raise_error(ArgumentError)
+        end
+
+        it "raises an exception if there's a trailing _ on either side of the '#{p}'" do
+          -> { @object.send(:Float, "0x10_#{p}10") }.should raise_error(ArgumentError)
+          -> { @object.send(:Float, "0x10#{p}10_") }.should raise_error(ArgumentError)
+        end
+
+        it "allows hexadecimal points on the left side of the '#{p}'" do
+          @object.send(:Float, "0x1.8#{p}0").should == 1.5
+        end
+
+        it "raises an ArgumentError if there's a decimal point on the right side of the '#{p}'" do
+          -> { @object.send(:Float, "0x1#{p}1.0") }.should raise_error(ArgumentError)
+        end
       end
     end
   end
@@ -280,7 +338,7 @@ def to_f() 1.2 end
     nan2.should equal(nan)
   end
 
-  it "returns the identical Infinity if to_f is called and it returns Infinity" do
+  it "returns the identical Infinity if #to_f is called and it returns Infinity" do
     infinity = infinity_value
     (infinity_to_f = mock('Infinity')).should_receive(:to_f).once.and_return(infinity)
     infinity2 = @object.send(:Float, infinity_to_f)
diff --git a/spec/ruby/core/kernel/Integer_spec.rb b/spec/ruby/core/kernel/Integer_spec.rb
index c37733e88d213d..74dd3e0dd2ef27 100644
--- a/spec/ruby/core/kernel/Integer_spec.rb
+++ b/spec/ruby/core/kernel/Integer_spec.rb
@@ -586,6 +586,21 @@
     Integer("777", obj).should == 0777
   end
 
+  # https://bugs.ruby-lang.org/issues/19349
+  ruby_version_is ''...'3.3' do
+    it "ignores the base if it is not an integer and does not respond to #to_i" do
+      Integer("777", "8").should == 777
+    end
+  end
+
+  ruby_version_is '3.3' do
+    it "raises a TypeError if it is not an integer and does not respond to #to_i" do
+      -> {
+        Integer("777", "8")
+      }.should raise_error(TypeError, "no implicit conversion of String into Integer")
+    end
+  end
+
   describe "when passed exception: false" do
     describe "and valid argument" do
       it "returns an Integer number" do
diff --git a/spec/ruby/core/kernel/Rational_spec.rb b/spec/ruby/core/kernel/Rational_spec.rb
index 2d1051db7f4a06..841c8e8c64d147 100644
--- a/spec/ruby/core/kernel/Rational_spec.rb
+++ b/spec/ruby/core/kernel/Rational_spec.rb
@@ -1,6 +1,150 @@
 require_relative '../../spec_helper'
-require_relative '../../shared/rational/Rational'
+require_relative '../rational/fixtures/rational'
 
 describe "Kernel.Rational" do
-  it_behaves_like :kernel_Rational, :Rational
+  describe "passed Integer" do
+    # Guard against the Mathn library
+    guard -> { !defined?(Math.rsqrt) } do
+      it "returns a new Rational number with 1 as the denominator" do
+        Rational(1).should eql(Rational(1, 1))
+        Rational(-3).should eql(Rational(-3, 1))
+        Rational(bignum_value).should eql(Rational(bignum_value, 1))
+      end
+    end
+  end
+
+  describe "passed two integers" do
+    it "returns a new Rational number" do
+      rat = Rational(1, 2)
+      rat.numerator.should == 1
+      rat.denominator.should == 2
+      rat.should be_an_instance_of(Rational)
+
+      rat = Rational(-3, -5)
+      rat.numerator.should == 3
+      rat.denominator.should == 5
+      rat.should be_an_instance_of(Rational)
+
+      rat = Rational(bignum_value, 3)
+      rat.numerator.should == bignum_value
+      rat.denominator.should == 3
+      rat.should be_an_instance_of(Rational)
+    end
+
+    it "reduces the Rational" do
+      rat = Rational(2, 4)
+      rat.numerator.should == 1
+      rat.denominator.should == 2
+
+      rat = Rational(3, 9)
+      rat.numerator.should == 1
+      rat.denominator.should == 3
+    end
+  end
+
+  describe "when passed a String" do
+    it "converts the String to a Rational using the same method as String#to_r" do
+      r = Rational(13, 25)
+      s_r = ".52".to_r
+      r_s = Rational(".52")
+
+      r_s.should == r
+      r_s.should == s_r
+    end
+
+    it "scales the Rational value of the first argument by the Rational value of the second" do
+      Rational(".52", ".6").should == Rational(13, 15)
+      Rational(".52", "1.6").should == Rational(13, 40)
+    end
+
+    it "does not use the same method as Float#to_r" do
+      r = Rational(3, 5)
+      f_r = 0.6.to_r
+      r_s = Rational("0.6")
+
+      r_s.should == r
+      r_s.should_not == f_r
+    end
+  end
+
+  describe "when passed a Numeric" do
+    it "calls #to_r to convert the first argument to a Rational" do
+      num = RationalSpecs::SubNumeric.new(2)
+
+      Rational(num).should == Rational(2)
+    end
+  end
+
+  describe "when passed a Complex" do
+    it "returns a Rational from the real part if the imaginary part is 0" do
+      Rational(Complex(1, 0)).should == Rational(1)
+    end
+
+    it "raises a RangeError if the imaginary part is not 0" do
+      -> { Rational(Complex(1, 2)) }.should raise_error(RangeError)
+    end
+  end
+
+  it "raises a ZeroDivisionError if the second argument is 0" do
+    -> { Rational(1, 0) }.should raise_error(ZeroDivisionError, "divided by 0")
+    -> { Rational(1, 0.0) }.should raise_error(ZeroDivisionError, "divided by 0")
+  end
+
+  it "raises a TypeError if the first argument is nil" do
+    -> { Rational(nil) }.should raise_error(TypeError)
+  end
+
+  it "raises a TypeError if the second argument is nil" do
+    -> { Rational(1, nil) }.should raise_error(TypeError)
+  end
+
+  it "raises a TypeError if the first argument is a Symbol" do
+    -> { Rational(:sym) }.should raise_error(TypeError)
+  end
+
+  it "raises a TypeError if the second argument is a Symbol" do
+    -> { Rational(1, :sym) }.should raise_error(TypeError)
+  end
+
+  describe "when passed exception: false" do
+    describe "and [non-Numeric]" do
+      it "swallows an error" do
+        Rational(:sym, exception: false).should == nil
+        Rational("abc", exception: false).should == nil
+      end
+    end
+
+    describe "and [non-Numeric, Numeric]" do
+      it "swallows an error" do
+        Rational(:sym, 1, exception: false).should == nil
+        Rational("abc", 1, exception: false).should == nil
+      end
+    end
+
+    describe "and [anything, non-Numeric]" do
+      it "swallows an error" do
+        Rational(:sym, :sym, exception: false).should == nil
+        Rational("abc", :sym, exception: false).should == nil
+      end
+    end
+
+    describe "and non-Numeric String arguments" do
+      it "swallows an error" do
+        Rational("a", "b", exception: false).should == nil
+        Rational("a", 0, exception: false).should == nil
+        Rational(0, "b", exception: false).should == nil
+      end
+    end
+
+    describe "and nil arguments" do
+      it "swallows an error" do
+        Rational(nil, exception: false).should == nil
+        Rational(nil, nil, exception: false).should == nil
+      end
+    end
+  end
+
+  it "freezes its result" do
+    Rational(1).frozen?.should == true
+  end
 end
diff --git a/spec/ruby/core/kernel/String_spec.rb b/spec/ruby/core/kernel/String_spec.rb
index 47ee797be5b99b..7caec6eda5c384 100644
--- a/spec/ruby/core/kernel/String_spec.rb
+++ b/spec/ruby/core/kernel/String_spec.rb
@@ -78,7 +78,7 @@ def method_missing(meth, *args)
   end
 
   it "returns the same object if it is already a String" do
-    string = "Hello"
+    string = +"Hello"
     string.should_not_receive(:to_s)
     string2 = @object.send(@method, string)
     string.should equal(string2)
diff --git a/spec/ruby/core/kernel/block_given_spec.rb b/spec/ruby/core/kernel/block_given_spec.rb
index b00bfabfc38551..aece4c821d1df0 100644
--- a/spec/ruby/core/kernel/block_given_spec.rb
+++ b/spec/ruby/core/kernel/block_given_spec.rb
@@ -5,15 +5,20 @@
   it "returns true if and only if a block is supplied" do
     @object.accept_block {}.should == true
     @object.accept_block_as_argument {}.should == true
+    @object.accept_block_inside_block {}.should == true
+    @object.accept_block_as_argument_inside_block {}.should == true
 
     @object.accept_block.should == false
     @object.accept_block_as_argument.should == false
+    @object.accept_block_inside_block.should == false
+    @object.accept_block_as_argument_inside_block.should == false
   end
 
   # Clarify: Based on http://www.ruby-forum.com/topic/137822 it appears
   # that Matz wanted this to be true in 1.9.
   it "returns false when a method defined by define_method is called with a block" do
     @object.defined_block {}.should == false
+    @object.defined_block_inside_block {}.should == false
   end
 end
 
diff --git a/spec/ruby/core/kernel/caller_locations_spec.rb b/spec/ruby/core/kernel/caller_locations_spec.rb
index 5994b28fa3116c..6074879d594f8f 100644
--- a/spec/ruby/core/kernel/caller_locations_spec.rb
+++ b/spec/ruby/core/kernel/caller_locations_spec.rb
@@ -71,14 +71,40 @@
   end
 
   guard -> { Kernel.instance_method(:tap).source_location } do
-    it "includes core library methods defined in Ruby" do
-      file, line = Kernel.instance_method(:tap).source_location
-      file.should.start_with?('<internal:')
-
-      loc = nil
-      tap { loc = caller_locations(1, 1)[0] }
-      loc.label.should == "tap"
-      loc.path.should.start_with? "<internal:"
+    ruby_version_is ""..."3.4" do
+      it "includes core library methods defined in Ruby" do
+        file, line = Kernel.instance_method(:tap).source_location
+        file.should.start_with?('<internal:')
+
+        loc = nil
+        tap { loc = caller_locations(1, 1)[0] }
+        loc.label.should == "tap"
+        loc.path.should.start_with? "<internal:"
+      end
+    end
+
+    ruby_version_is "3.4"..."3.5" do
+      it "includes core library methods defined in Ruby" do
+        file, line = Kernel.instance_method(:tap).source_location
+        file.should.start_with?('<internal:')
+
+        loc = nil
+        tap { loc = caller_locations(1, 1)[0] }
+        loc.label.should == "Kernel#tap"
+        loc.path.should.start_with? "<internal:"
+      end
+    end
+
+    ruby_version_is "3.5" do
+      it "does not include core library methods defined in Ruby" do
+        file, line = Kernel.instance_method(:tap).source_location
+        file.should.start_with?('<internal:')
+
+        loc = nil
+        tap { loc = caller_locations(1, 1)[0] }
+        loc.label.should == "Kernel#tap"
+        loc.path.should == __FILE__
+      end
     end
   end
 end
diff --git a/spec/ruby/core/kernel/caller_spec.rb b/spec/ruby/core/kernel/caller_spec.rb
index f1ff7044b8dbb1..4bf9f7c2c224e5 100644
--- a/spec/ruby/core/kernel/caller_spec.rb
+++ b/spec/ruby/core/kernel/caller_spec.rb
@@ -38,33 +38,72 @@
   it "returns an Array with the block given to #at_exit at the base of the stack" do
     path = fixture(__FILE__, "caller_at_exit.rb")
     lines = ruby_exe(path).lines
-    lines.should == [
-      "#{path}:6:in `foo'\n",
-      "#{path}:2:in `block in <main>'\n"
-    ]
+    lines.size.should == 2
+    lines[0].should =~ /\A#{path}:6:in [`'](?:Object#)?foo'\n\z/
+    lines[1].should =~ /\A#{path}:2:in [`']block in <main>'\n\z/
+  end
+
+  it "can be called with a range" do
+    locations1 = caller(0)
+    locations2 = caller(2..4)
+    locations1[2..4].should == locations2
   end
 
   it "works with endless ranges" do
     locations1 = KernelSpecs::CallerTest.locations(0)
     locations2 = KernelSpecs::CallerTest.locations(eval("(2..)"))
-    locations2.map(&:to_s).should == locations1[2..-1].map(&:to_s)
+    locations2.should == locations1[2..-1]
   end
 
   it "works with beginless ranges" do
     locations1 = KernelSpecs::CallerTest.locations(0)
     locations2 = KernelSpecs::CallerTest.locations((..5))
-    locations2.map(&:to_s)[eval("(2..)")].should == locations1[(..5)].map(&:to_s)[eval("(2..)")]
+    locations2[eval("(2..)")].should == locations1[(..5)][eval("(2..)")]
+  end
+
+  it "can be called with a range whose end is negative" do
+    locations1 = caller(0)
+    locations2 = caller(2..-1)
+    locations3 = caller(2..-2)
+    locations1[2..-1].should == locations2
+    locations1[2..-2].should == locations3
+  end
+
+  it "must return nil if omitting more locations than available" do
+    caller(100).should == nil
+    caller(100..-1).should == nil
+  end
+
+  it "must return [] if omitting exactly the number of locations available" do
+    omit = caller(0).length
+    caller(omit).should == []
+  end
+
+  it "must return the same locations when called with 1..-1 and when called with no arguments" do
+    caller.should == caller(1..-1)
   end
 
   guard -> { Kernel.instance_method(:tap).source_location } do
-    it "includes core library methods defined in Ruby" do
-      file, line = Kernel.instance_method(:tap).source_location
-      file.should.start_with?('<internal:')
-
-      loc = nil
-      tap { loc = caller(1, 1)[0] }
-      loc.should.end_with? "in `tap'"
-      loc.should.start_with? "<internal:"
+    ruby_version_is ""..."3.5" do
+      it "includes core library methods defined in Ruby" do
+        file, line = Kernel.instance_method(:tap).source_location
+        file.should.start_with?('<internal:')
+
+        loc = nil
+        tap { loc = caller(1, 1)[0] }
+        loc.should =~ /\A<internal:.*in [`'](?:Kernel#)?tap'\z/
+      end
+    end
+
+    ruby_version_is "3.5" do
+      it "includes core library methods defined in Ruby" do
+        file, line = Kernel.instance_method(:tap).source_location
+        file.should.start_with?('<internal:')
+
+        loc = nil
+        tap { loc = caller(1, 1)[0] }
+        loc.should =~ /\A#{ __FILE__ }:.*in [`'](?:Kernel#)?tap'\z/
+      end
     end
   end
 end
diff --git a/spec/ruby/core/kernel/catch_spec.rb b/spec/ruby/core/kernel/catch_spec.rb
index 4060172429a4a1..9f59d3b384e032 100644
--- a/spec/ruby/core/kernel/catch_spec.rb
+++ b/spec/ruby/core/kernel/catch_spec.rb
@@ -35,7 +35,7 @@
   end
 
   it "raises an ArgumentError if a String with different identity is thrown" do
-    -> { catch("exit") { throw "exit" } }.should raise_error(ArgumentError)
+    -> { catch("exit".dup) { throw "exit".dup } }.should raise_error(ArgumentError)
   end
 
   it "catches a Symbol when thrown a matching Symbol" do
diff --git a/spec/ruby/core/kernel/class_spec.rb b/spec/ruby/core/kernel/class_spec.rb
index 2725bde19b47f4..b1d9df16718bb4 100644
--- a/spec/ruby/core/kernel/class_spec.rb
+++ b/spec/ruby/core/kernel/class_spec.rb
@@ -19,7 +19,7 @@
   end
 
   it "returns the first non-singleton class" do
-    a = "hello"
+    a = +"hello"
     def a.my_singleton_method; end
     a.class.should equal(String)
   end
diff --git a/spec/ruby/core/kernel/eval_spec.rb b/spec/ruby/core/kernel/eval_spec.rb
index 3dfc863368869b..e027294347526a 100644
--- a/spec/ruby/core/kernel/eval_spec.rb
+++ b/spec/ruby/core/kernel/eval_spec.rb
@@ -135,7 +135,7 @@
   it "includes file and line information in syntax error" do
     expected = 'speccing.rb'
     -> {
-      eval('if true',TOPLEVEL_BINDING, expected)
+      eval('if true', TOPLEVEL_BINDING, expected)
     }.should raise_error(SyntaxError) { |e|
       e.message.should =~ /#{expected}:1:.+/
     }
@@ -144,7 +144,7 @@
   it "evaluates string with given filename and negative linenumber" do
     expected_file = 'speccing.rb'
     -> {
-      eval('if true',TOPLEVEL_BINDING, expected_file, -100)
+      eval('if true', TOPLEVEL_BINDING, expected_file, -100)
     }.should raise_error(SyntaxError) { |e|
       e.message.should =~ /#{expected_file}:-100:.+/
     }
@@ -175,6 +175,75 @@ class Object
     end
   end
 
+  context "parameter forwarding" do
+    it "allows anonymous rest parameter forwarding" do
+      object = Object.new
+      def object.foo(a, b, c)
+        [a, b, c]
+      end
+      def object.bar(*)
+        eval "foo(*)"
+      end
+
+      object.bar(1, 2, 3).should == [1, 2, 3]
+    end
+
+    it "allows anonymous keyword parameters forwarding" do
+      object = Object.new
+      def object.foo(a:, b:, c:)
+        [a, b, c]
+      end
+      def object.bar(**)
+        eval "foo(**)"
+      end
+
+      object.bar(a: 1, b: 2, c: 3).should == [1, 2, 3]
+    end
+
+    it "allows anonymous block parameter forwarding" do
+      object = Object.new
+      def object.foo(&block)
+        block.call
+      end
+      def object.bar(&)
+        eval "foo(&)"
+      end
+
+      object.bar { :foobar }.should == :foobar
+    end
+
+    it "allows ... forwarding" do
+      object = Object.new
+      def object.foo(a, b:, &block)
+        [a, b, block.call]
+      end
+      def object.bar(...)
+        eval "foo(...)"
+      end
+
+      object.bar(1, b: 2) { 3 }.should == [1, 2, 3]
+    end
+
+    it "allows parameter forwarding to super" do
+      m = Module.new do
+        def foo(a, b:, &block)
+          [a, b, block.call]
+        end
+      end
+
+      c = Class.new do
+        include m
+
+        def foo(a, b:, &block)
+          eval "super"
+        end
+      end
+
+      object = c.new
+      object.foo(1, b: 2) { 3 }.should == [1, 2, 3]
+    end
+  end
+
   ruby_version_is "3.3" do
     it "uses (eval at __FILE__:__LINE__) if none is provided" do
       eval("__FILE__").should == "(eval at #{__FILE__}:#{__LINE__})"
@@ -261,6 +330,39 @@ class EvalSpecs
     end
   end
 
+  it "makes flip-flop operator work correctly" do
+    ScratchPad.record []
+
+    eval "10.times { |i| ScratchPad << i if (i == 4)...(i == 4) }"
+    ScratchPad.recorded.should == [4, 5, 6, 7, 8, 9]
+
+    ScratchPad.clear
+  end
+
+  it "returns nil if given an empty string" do
+    eval("").should == nil
+  end
+
+  context "with shebang" do
+    it "ignores shebang with ruby interpreter" do
+      pid = eval(<<~CODE.b)
+        #!/usr/bin/env ruby
+        Process.pid
+      CODE
+
+      pid.should == Process.pid
+    end
+
+    it "ignores shebang with non-ruby interpreter" do
+      pid = eval(<<~CODE.b)
+        #!/usr/bin/env puma
+        Process.pid
+      CODE
+
+      pid.should == Process.pid
+    end
+  end
+
   # See language/magic_comment_spec.rb for more magic comments specs
   describe "with a magic encoding comment" do
     it "uses the magic comment encoding for the encoding of literal strings" do
@@ -280,6 +382,8 @@ class EvalSpecs
       eval(code)
       EvalSpecs.constants(false).should include(:"Vπ")
       EvalSpecs::Vπ.should == 3.14
+    ensure
+      EvalSpecs.send(:remove_const, :Vπ)
     end
 
     it "allows an emacs-style magic comment encoding" do
@@ -293,6 +397,8 @@ class EvalSpecs
       eval(code)
       EvalSpecs.constants(false).should include(:"Vπemacs")
       EvalSpecs::Vπemacs.should == 3.14
+    ensure
+      EvalSpecs.send(:remove_const, :Vπemacs)
     end
 
     it "allows spaces before the magic encoding comment" do
@@ -306,6 +412,8 @@ class EvalSpecs
       eval(code)
       EvalSpecs.constants(false).should include(:"Vπspaces")
       EvalSpecs::Vπspaces.should == 3.14
+    ensure
+      EvalSpecs.send(:remove_const, :Vπspaces)
     end
 
     it "allows a shebang line before the magic encoding comment" do
@@ -320,6 +428,8 @@ class EvalSpecs
       eval(code)
       EvalSpecs.constants(false).should include(:"Vπshebang")
       EvalSpecs::Vπshebang.should == 3.14
+    ensure
+      EvalSpecs.send(:remove_const, :Vπshebang)
     end
 
     it "allows a shebang line and some spaces before the magic encoding comment" do
@@ -334,15 +444,16 @@ class EvalSpecs
       eval(code)
       EvalSpecs.constants(false).should include(:"Vπshebang_spaces")
       EvalSpecs::Vπshebang_spaces.should == 3.14
+    ensure
+      EvalSpecs.send(:remove_const, :Vπshebang_spaces)
     end
 
     it "allows a magic encoding comment and a subsequent frozen_string_literal magic comment" do
-      # Make sure frozen_string_literal is not default true
-      eval("'foo'".b).frozen?.should be_false
+      frozen_string_default = "test".frozen?
 
       code = <<CODE.b
 # encoding: UTF-8
-# frozen_string_literal: true
+# frozen_string_literal: #{!frozen_string_default}
 class EvalSpecs
   Vπstring = "frozen"
 end
@@ -352,7 +463,9 @@ class EvalSpecs
       EvalSpecs.constants(false).should include(:"Vπstring")
       EvalSpecs::Vπstring.should == "frozen"
       EvalSpecs::Vπstring.encoding.should == Encoding::UTF_8
-      EvalSpecs::Vπstring.frozen?.should be_true
+      EvalSpecs::Vπstring.frozen?.should == !frozen_string_default
+    ensure
+      EvalSpecs.send(:remove_const, :Vπstring)
     end
 
     it "allows a magic encoding comment and a frozen_string_literal magic comment on the same line in emacs style" do
@@ -368,11 +481,14 @@ class EvalSpecs
       EvalSpecs::Vπsame_line.should == "frozen"
       EvalSpecs::Vπsame_line.encoding.should == Encoding::UTF_8
       EvalSpecs::Vπsame_line.frozen?.should be_true
+    ensure
+      EvalSpecs.send(:remove_const, :Vπsame_line)
     end
 
     it "ignores the magic encoding comment if it is after a frozen_string_literal magic comment" do
+      frozen_string_default = "test".frozen?
       code = <<CODE.b
-# frozen_string_literal: true
+# frozen_string_literal: #{!frozen_string_default}
 # encoding: UTF-8
 class EvalSpecs
   Vπfrozen_first = "frozen"
@@ -386,23 +502,26 @@ class EvalSpecs
       value = EvalSpecs.const_get(binary_constant)
       value.should == "frozen"
       value.encoding.should == Encoding::BINARY
-      value.frozen?.should be_true
+      value.frozen?.should == !frozen_string_default
+    ensure
+      EvalSpecs.send(:remove_const, binary_constant)
     end
 
     it "ignores the frozen_string_literal magic comment if it appears after a token and warns if $VERBOSE is true" do
+      frozen_string_default = "test".frozen?
       code = <<CODE
 some_token_before_magic_comment = :anything
-# frozen_string_literal: true
+# frozen_string_literal: #{!frozen_string_default}
 class EvalSpecs
   Vπstring_not_frozen = "not frozen"
 end
 CODE
-      -> { eval(code) }.should complain(/warning: `frozen_string_literal' is ignored after any tokens/, verbose: true)
-      EvalSpecs::Vπstring_not_frozen.frozen?.should be_false
+      -> { eval(code) }.should complain(/warning: [`']frozen_string_literal' is ignored after any tokens/, verbose: true)
+      EvalSpecs::Vπstring_not_frozen.frozen?.should == frozen_string_default
       EvalSpecs.send :remove_const, :Vπstring_not_frozen
 
       -> { eval(code) }.should_not complain(verbose: false)
-      EvalSpecs::Vπstring_not_frozen.frozen?.should be_false
+      EvalSpecs::Vπstring_not_frozen.frozen?.should == frozen_string_default
       EvalSpecs.send :remove_const, :Vπstring_not_frozen
     end
   end
diff --git a/spec/ruby/core/kernel/exec_spec.rb b/spec/ruby/core/kernel/exec_spec.rb
index 1b4a7ae6f487ae..3d9520ad67a6f7 100644
--- a/spec/ruby/core/kernel/exec_spec.rb
+++ b/spec/ruby/core/kernel/exec_spec.rb
@@ -7,12 +7,12 @@
   end
 
   it "runs the specified command, replacing current process" do
-    ruby_exe('exec "echo hello"; puts "fail"', escape: true).should == "hello\n"
+    ruby_exe('exec "echo hello"; puts "fail"').should == "hello\n"
   end
 end
 
 describe "Kernel.exec" do
   it "runs the specified command, replacing current process" do
-    ruby_exe('Kernel.exec "echo hello"; puts "fail"', escape: true).should == "hello\n"
+    ruby_exe('Kernel.exec "echo hello"; puts "fail"').should == "hello\n"
   end
 end
diff --git a/spec/ruby/core/kernel/extend_spec.rb b/spec/ruby/core/kernel/extend_spec.rb
index 47b22f3a182418..6342d8cae15871 100644
--- a/spec/ruby/core/kernel/extend_spec.rb
+++ b/spec/ruby/core/kernel/extend_spec.rb
@@ -76,4 +76,16 @@ def self.append_features(o)
       -> { @frozen.extend @module }.should raise_error(FrozenError)
     end
   end
+
+  it "updated class methods of a module when it extends self and includes another module" do
+    a = Module.new do
+      extend self
+    end
+    b = Module.new do
+      def foo; :foo; end
+    end
+
+    a.include b
+    a.foo.should == :foo
+  end
 end
diff --git a/spec/ruby/core/kernel/fixtures/classes.rb b/spec/ruby/core/kernel/fixtures/classes.rb
index 541a4c075e550c..0e2b81988fdfc7 100644
--- a/spec/ruby/core/kernel/fixtures/classes.rb
+++ b/spec/ruby/core/kernel/fixtures/classes.rb
@@ -219,10 +219,28 @@ def self.accept_block_as_argument(&block)
       block_given?
     end
 
+    def self.accept_block_inside_block()
+      yield_self {
+        block_given?
+      }
+    end
+
+    def self.accept_block_as_argument_inside_block(&block)
+      yield_self {
+        block_given?
+      }
+    end
+
     class << self
       define_method(:defined_block) do
         block_given?
       end
+
+      define_method(:defined_block_inside_block) do
+        yield_self {
+          block_given?
+        }
+      end
     end
   end
 
@@ -235,10 +253,28 @@ def self.accept_block_as_argument(&block)
       self.send(:block_given?)
     end
 
+    def self.accept_block_inside_block
+      yield_self {
+        self.send(:block_given?)
+      }
+    end
+
+    def self.accept_block_as_argument_inside_block(&block)
+      yield_self {
+        self.send(:block_given?)
+      }
+    end
+
     class << self
       define_method(:defined_block) do
         self.send(:block_given?)
       end
+
+      define_method(:defined_block_inside_block) do
+        yield_self {
+          self.send(:block_given?)
+        }
+      end
     end
   end
 
@@ -251,10 +287,28 @@ def self.accept_block_as_argument(&block)
       Kernel.block_given?
     end
 
+    def self.accept_block_inside_block
+      yield_self {
+        Kernel.block_given?
+      }
+    end
+
+    def self.accept_block_as_argument_inside_block(&block)
+      yield_self {
+        Kernel.block_given?
+      }
+    end
+
     class << self
       define_method(:defined_block) do
         Kernel.block_given?
       end
+
+      define_method(:defined_block_inside_block) do
+        yield_self {
+          Kernel.block_given?
+        }
+      end
     end
   end
 
diff --git a/spec/ruby/core/kernel/format_spec.rb b/spec/ruby/core/kernel/format_spec.rb
index e8b031e4801465..1d0c000c158761 100644
--- a/spec/ruby/core/kernel/format_spec.rb
+++ b/spec/ruby/core/kernel/format_spec.rb
@@ -12,4 +12,36 @@
   it "is accessible as a module function" do
     Kernel.format("%s", "hello").should == "hello"
   end
+
+  describe "when $VERBOSE is true" do
+    it "warns if too many arguments are passed" do
+      code = <<~RUBY
+        $VERBOSE = true
+        format("test", 1)
+      RUBY
+
+      ruby_exe(code, args: "2>&1").should include("warning: too many arguments for format string")
+    end
+
+    it "does not warns if too many keyword arguments are passed" do
+      code = <<~RUBY
+        $VERBOSE = true
+        format("test %{test}", test: 1, unused: 2)
+      RUBY
+
+      ruby_exe(code, args: "2>&1").should_not include("warning")
+    end
+
+    ruby_bug "#20593", ""..."3.4" do
+      it "doesn't warns if keyword arguments are passed and none are used" do
+        code = <<~RUBY
+          $VERBOSE = true
+          format("test", test: 1)
+          format("test", {})
+        RUBY
+
+        ruby_exe(code, args: "2>&1").should_not include("warning")
+      end
+    end
+  end
 end
diff --git a/spec/ruby/core/kernel/inspect_spec.rb b/spec/ruby/core/kernel/inspect_spec.rb
index 1f9ce834ab5e84..e60f7576c54572 100644
--- a/spec/ruby/core/kernel/inspect_spec.rb
+++ b/spec/ruby/core/kernel/inspect_spec.rb
@@ -28,4 +28,34 @@ class << obj
     end
     obj.inspect.should be_kind_of(String)
   end
+
+  ruby_version_is "3.5" do
+    it "calls #instance_variables_to_inspect private method to know which variables to display" do
+      obj = Object.new
+      obj.instance_eval do
+        @host = "localhost"
+        @user = "root"
+        @password = "hunter2"
+      end
+      obj.singleton_class.class_eval do
+        private def instance_variables_to_inspect = %i[@host @user @does_not_exist]
+      end
+
+      inspected = obj.inspect.sub(/^#<Object:0x[0-9a-f]+/, '#<Object:0x00')
+      inspected.should == '#<Object:0x00 @host="localhost", @user="root">'
+
+      obj = Object.new
+      obj.instance_eval do
+        @host = "localhost"
+        @user = "root"
+        @password = "hunter2"
+      end
+      obj.singleton_class.class_eval do
+        private def instance_variables_to_inspect = []
+      end
+
+      inspected = obj.inspect.sub(/^#<Object:0x[0-9a-f]+/, '#<Object:0x00')
+      inspected.should == "#<Object:0x00>"
+    end
+  end
 end
diff --git a/spec/ruby/core/kernel/is_a_spec.rb b/spec/ruby/core/kernel/is_a_spec.rb
index dc69766f835cc7..bd8c96529a84a6 100644
--- a/spec/ruby/core/kernel/is_a_spec.rb
+++ b/spec/ruby/core/kernel/is_a_spec.rb
@@ -2,5 +2,5 @@
 require_relative 'shared/kind_of'
 
 describe "Kernel#is_a?" do
-  it_behaves_like :kernel_kind_of , :is_a?
+  it_behaves_like :kernel_kind_of, :is_a?
 end
diff --git a/spec/ruby/core/kernel/kind_of_spec.rb b/spec/ruby/core/kernel/kind_of_spec.rb
index 734035620c3a72..c988edccb5bbd2 100644
--- a/spec/ruby/core/kernel/kind_of_spec.rb
+++ b/spec/ruby/core/kernel/kind_of_spec.rb
@@ -2,5 +2,5 @@
 require_relative 'shared/kind_of'
 
 describe "Kernel#kind_of?" do
-  it_behaves_like :kernel_kind_of , :kind_of?
+  it_behaves_like :kernel_kind_of, :kind_of?
 end
diff --git a/spec/ruby/core/kernel/lambda_spec.rb b/spec/ruby/core/kernel/lambda_spec.rb
index 2f7abc749cb739..565536ac0d6f5e 100644
--- a/spec/ruby/core/kernel/lambda_spec.rb
+++ b/spec/ruby/core/kernel/lambda_spec.rb
@@ -26,42 +26,44 @@
     l.lambda?.should be_true
   end
 
-  it "creates a lambda-style Proc if given a literal block via Kernel.public_send" do
-    suppress_warning do
-      l = Kernel.public_send(:lambda) { 42 }
-      l.lambda?.should be_true
+  ruby_version_is ""..."3.3" do
+    it "creates a lambda-style Proc if given a literal block via Kernel.public_send" do
+      suppress_warning do
+        l = Kernel.public_send(:lambda) { 42 }
+        l.lambda?.should be_true
+      end
     end
-  end
 
-  it "returns the passed Proc if given an existing Proc" do
-    some_proc = proc {}
-    l = suppress_warning {lambda(&some_proc)}
-    l.should equal(some_proc)
-    l.lambda?.should be_false
-  end
+    it "returns the passed Proc if given an existing Proc" do
+      some_proc = proc {}
+      l = suppress_warning {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
-    suppress_warning do
-      l = KernelSpecs::LambdaSpecs::ForwardBlockWithZSuper.new.lambda { 42 }
-      l.lambda?.should be_true
-      l.call.should == 42
+    it "creates a lambda-style Proc when called with zsuper" do
+      suppress_warning 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)
+        lambda { l.call(:extra) }.should raise_error(ArgumentError)
+      end
     end
-  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 "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 "does not create lambda-style Procs when captured with #method" do
-    kernel_lambda = method(:lambda)
-    l = suppress_warning {kernel_lambda.call { 42 }}
-    l.lambda?.should be_false
-    l.call(:extra).should == 42
+    it "does not create lambda-style Procs when captured with #method" do
+      kernel_lambda = method(:lambda)
+      l = suppress_warning {kernel_lambda.call { 42 }}
+      l.lambda?.should be_false
+      l.call(:extra).should == 42
+    end
   end
 
   it "checks the arity of the call when no args are specified" do
@@ -137,8 +139,16 @@ def ret
   end
 
   context "when called without a literal block" do
-    it "warns when proc isn't a lambda" do
-      -> { lambda(&proc{}) }.should complain("#{__FILE__}:#{__LINE__}: warning: lambda without a literal block is deprecated; use the proc without lambda instead\n")
+    ruby_version_is ""..."3.3" do
+      it "warns when proc isn't a lambda" do
+        -> { lambda(&proc{}) }.should complain("#{__FILE__}:#{__LINE__}: warning: lambda without a literal block is deprecated; use the proc without lambda instead\n")
+      end
+    end
+
+    ruby_version_is "3.3" do
+      it "raises when proc isn't a lambda" do
+        -> { lambda(&proc{}) }.should raise_error(ArgumentError, /the lambda method requires a literal block/)
+      end
     end
 
     it "doesn't warn when proc is lambda" do
diff --git a/spec/ruby/core/kernel/match_spec.rb b/spec/ruby/core/kernel/match_spec.rb
index aa25006163ffaa..cd6330fe91c117 100644
--- a/spec/ruby/core/kernel/match_spec.rb
+++ b/spec/ruby/core/kernel/match_spec.rb
@@ -1,30 +1,7 @@
 require_relative '../../spec_helper'
 
 describe "Kernel#=~" do
-  ruby_version_is ''...'3.2' do
-    it "returns nil matching any object" do
-      o = Object.new
-
-      suppress_warning do
-        (o =~ /Object/).should   be_nil
-        (o =~ 'Object').should   be_nil
-        (o =~ Object).should     be_nil
-        (o =~ Object.new).should be_nil
-        (o =~ nil).should        be_nil
-        (o =~ true).should       be_nil
-      end
-    end
-
-    it "is deprecated" do
-      -> do
-        Object.new =~ /regexp/
-      end.should complain(/deprecated Object#=~ is called on Object/, verbose: true)
-    end
-  end
-
-  ruby_version_is '3.2' do
-    it "is no longer defined" do
-      Object.new.should_not.respond_to?(:=~)
-    end
+  it "is no longer defined" do
+    Object.new.should_not.respond_to?(:=~)
   end
 end
diff --git a/spec/ruby/core/kernel/not_match_spec.rb b/spec/ruby/core/kernel/not_match_spec.rb
index 906f18df2c66e1..082e56fed7dff6 100644
--- a/spec/ruby/core/kernel/not_match_spec.rb
+++ b/spec/ruby/core/kernel/not_match_spec.rb
@@ -14,6 +14,10 @@ def !~(obj)
     (obj !~ :foo).should == false
   end
 
+  it "raises NoMethodError if self does not respond to #=~" do
+    -> { Object.new !~ :foo }.should raise_error(NoMethodError)
+  end
+
   it 'can be overridden in subclasses' do
     obj = KernelSpecs::NotMatch.new
     (obj !~ :bar).should == :foo
diff --git a/spec/ruby/core/kernel/open_spec.rb b/spec/ruby/core/kernel/open_spec.rb
index bb42c31f31e414..6d00af395d9d3c 100644
--- a/spec/ruby/core/kernel/open_spec.rb
+++ b/spec/ruby/core/kernel/open_spec.rb
@@ -106,7 +106,7 @@
       ScratchPad.clear
     end
 
-    it "calls #to_path to covert the argument to a String before calling #to_str" do
+    it "calls #to_path to convert the argument to a String before calling #to_str" do
       obj = mock("open to_path")
       obj.should_receive(:to_path).at_least(1).times.and_return(@name)
       obj.should_not_receive(:to_str)
diff --git a/spec/ruby/core/kernel/printf_spec.rb b/spec/ruby/core/kernel/printf_spec.rb
index d8f93ce429308d..61bf955c25959e 100644
--- a/spec/ruby/core/kernel/printf_spec.rb
+++ b/spec/ruby/core/kernel/printf_spec.rb
@@ -31,6 +31,13 @@
     object.should_receive(:write).with("string")
     Kernel.printf(object, "%s", "string")
   end
+
+  it "calls #to_str to convert the format object to a String" do
+    object = mock('format string')
+    object.should_receive(:to_str).and_return("to_str: %i")
+    $stdout.should_receive(:write).with("to_str: 42")
+    Kernel.printf($stdout, object, 42)
+  end
 end
 
 describe "Kernel.printf" do
diff --git a/spec/ruby/core/kernel/public_send_spec.rb b/spec/ruby/core/kernel/public_send_spec.rb
index 4dae419ff9d080..b684b1729c78ed 100644
--- a/spec/ruby/core/kernel/public_send_spec.rb
+++ b/spec/ruby/core/kernel/public_send_spec.rb
@@ -105,11 +105,11 @@ def bar
   end
 
   it "includes `public_send` in the backtrace when passed not enough arguments" do
-    -> { public_send() }.should raise_error(ArgumentError) { |e| e.backtrace[0].should.include?("`public_send'") }
+    -> { public_send() }.should raise_error(ArgumentError) { |e| e.backtrace[0].should =~ /[`'](?:Kernel#)?public_send'/ }
   end
 
   it "includes `public_send` in the backtrace when passed a single incorrect argument" do
-    -> { public_send(Object.new) }.should raise_error(TypeError) { |e| e.backtrace[0].should.include?("`public_send'") }
+    -> { public_send(Object.new) }.should raise_error(TypeError) { |e| e.backtrace[0].should =~ /[`'](?:Kernel#)?public_send'/ }
   end
 
   it_behaves_like :basicobject_send, :public_send
diff --git a/spec/ruby/core/kernel/raise_spec.rb b/spec/ruby/core/kernel/raise_spec.rb
index 4f190c120b7dd7..a4ab963fa35d12 100644
--- a/spec/ruby/core/kernel/raise_spec.rb
+++ b/spec/ruby/core/kernel/raise_spec.rb
@@ -44,7 +44,242 @@
 
   it "raises an ArgumentError when only cause is given" do
     cause = StandardError.new
-    -> { raise(cause: cause) }.should raise_error(ArgumentError)
+    -> { raise(cause: cause) }.should raise_error(ArgumentError, "only cause is given with no arguments")
+  end
+
+  it "raises an ArgumentError when only cause is given even if it has nil value" do
+    -> { raise(cause: nil) }.should raise_error(ArgumentError, "only cause is given with no arguments")
+  end
+
+  it "raises an ArgumentError when given cause is not an instance of Exception" do
+    -> { raise "message", cause: Object.new }.should raise_error(TypeError, "exception object expected")
+  end
+
+  it "doesn't raise an ArgumentError when given cause is nil" do
+    -> { raise "message", cause: nil }.should raise_error(RuntimeError, "message")
+  end
+
+  it "allows cause equal an exception" do
+    e = RuntimeError.new("message")
+    -> { raise e, cause: e }.should raise_error(e)
+  end
+
+  it "doesn't set given cause when it equals an exception" do
+    e = RuntimeError.new("message")
+
+    begin
+      raise e, cause: e
+    rescue
+    end
+
+    e.cause.should == nil
+  end
+
+  it "raises ArgumentError when exception is part of the cause chain" do
+    -> {
+      begin
+        raise "Error 1"
+      rescue => e1
+        begin
+          raise "Error 2"
+        rescue => e2
+          begin
+            raise "Error 3"
+          rescue => e3
+            raise e1, cause: e3
+          end
+        end
+      end
+    }.should raise_error(ArgumentError, "circular causes")
+  end
+
+  it "re-raises a rescued exception" do
+    -> do
+      begin
+        raise StandardError, "aaa"
+      rescue Exception
+        begin
+          raise ArgumentError
+        rescue ArgumentError
+        end
+
+        # should raise StandardError "aaa"
+        raise
+      end
+    end.should raise_error(StandardError, "aaa")
+  end
+
+  it "re-raises a previously rescued exception without overwriting the cause" do
+    begin
+      begin
+        begin
+          begin
+            raise "Error 1"
+          rescue => e1
+            raise "Error 2"
+          end
+        rescue => e2
+          raise "Error 3"
+        end
+      rescue
+        e2.cause.should == e1
+        raise e2
+      end
+    rescue => e
+      e.cause.should == e1
+    end
+  end
+
+  it "re-raises a previously rescued exception with overwriting the cause when it's explicitly specified with :cause option" do
+    e4 = RuntimeError.new("Error 4")
+
+    begin
+      begin
+        begin
+          begin
+            raise "Error 1"
+          rescue => e1
+            raise "Error 2"
+          end
+        rescue => e2
+          raise "Error 3"
+        end
+      rescue
+        e2.cause.should == e1
+        raise e2, cause: e4
+      end
+    rescue => e
+      e.cause.should == e4
+    end
+  end
+
+  it "re-raises a previously rescued exception without overwriting the cause when it's explicitly specified with :cause option and has nil value" do
+    begin
+      begin
+        begin
+          begin
+            raise "Error 1"
+          rescue => e1
+            raise "Error 2"
+          end
+        rescue => e2
+          raise "Error 3"
+        end
+      rescue
+        e2.cause.should == e1
+        raise e2, cause: nil
+      end
+    rescue => e
+      e.cause.should == e1
+    end
+  end
+
+  it "re-raises a previously rescued exception without setting a cause implicitly" do
+    begin
+      begin
+        raise "Error 1"
+      rescue => e1
+        raise
+      end
+    rescue => e
+      e.should == e1
+      e.cause.should == nil
+    end
+  end
+
+  it "re-raises a previously rescued exception that has a cause without setting a cause implicitly" do
+    begin
+      begin
+        raise "Error 1"
+      rescue => e1
+        begin
+          raise "Error 2"
+        rescue => e2
+          raise
+        end
+      end
+    rescue => e
+      e.should == e2
+      e.cause.should == e1
+    end
+  end
+
+  it "re-raises a previously rescued exception that doesn't have a cause and isn't a cause of any other exception with setting a cause implicitly" do
+    begin
+      begin
+        raise "Error 1"
+      rescue => e1
+        begin
+          raise "Error 2"
+        rescue => e2
+          raise "Error 3"
+        end
+      end
+    rescue => e
+      e.message.should == "Error 3"
+      e.cause.should == e2
+    end
+  end
+
+  it "re-raises a previously rescued exception that doesn't have a cause and is a cause of other exception without setting a cause implicitly" do
+    begin
+      begin
+        raise "Error 1"
+      rescue => e1
+        begin
+          raise "Error 2"
+        rescue => e2
+          e1.cause.should == nil
+          e2.cause.should == e1
+          raise e1
+        end
+      end
+    rescue => e
+      e.should == e1
+      e.cause.should == nil
+    end
+  end
+
+  it "re-raises a previously rescued exception that doesn't have a cause and is a cause of other exception (that wasn't raised explicitly) without setting a cause implicitly" do
+    begin
+      begin
+        raise "Error 1"
+      rescue => e1
+        begin
+          foo # raises NameError
+        rescue => e2
+          e1.cause.should == nil
+          e2.cause.should == e1
+          raise e1
+        end
+      end
+    rescue => e
+      e.should == e1
+      e.cause.should == nil
+    end
+  end
+
+  it "re-raises a previously rescued exception that has a cause but isn't a cause of any other exception without setting a cause implicitly" do
+    begin
+      begin
+        raise "Error 1"
+      rescue => e1
+        begin
+          raise "Error 2"
+        rescue => e2
+          begin
+            raise "Error 3", cause: RuntimeError.new("Error 4")
+          rescue => e3
+            e2.cause.should == e1
+            e3.cause.should_not == e2
+            raise e2
+          end
+        end
+      end
+    rescue => e
+      e.should == e2
+      e.cause.should == e1
+    end
   end
 end
 
diff --git a/spec/ruby/core/kernel/require_spec.rb b/spec/ruby/core/kernel/require_spec.rb
index 896afb840a6bbb..945f68aba9ec9b 100644
--- a/spec/ruby/core/kernel/require_spec.rb
+++ b/spec/ruby/core/kernel/require_spec.rb
@@ -16,9 +16,9 @@
     Kernel.should have_private_instance_method(:require)
   end
 
-  provided = %w[complex enumerator rational thread ruby2_keywords]
-  ruby_version_is "3.1" do
-    provided << "fiber"
+  provided = %w[complex enumerator fiber rational thread ruby2_keywords]
+  ruby_version_is "3.5" do
+    provided << "set"
   end
 
   it "#{provided.join(', ')} are already required" do
@@ -26,7 +26,7 @@
     features = out.lines.map { |line| File.basename(line.chomp, '.*') }
 
     # Ignore CRuby internals
-    features -= %w[encdb transdb windows_1252]
+    features -= %w[encdb transdb windows_1252 windows_31j]
     features.reject! { |feature| feature.end_with?('-fake') }
 
     features.sort.should == provided.sort
diff --git a/spec/ruby/core/kernel/select_spec.rb b/spec/ruby/core/kernel/select_spec.rb
index e0d82f3079b43d..df23414b2848e7 100644
--- a/spec/ruby/core/kernel/select_spec.rb
+++ b/spec/ruby/core/kernel/select_spec.rb
@@ -10,9 +10,9 @@
 describe "Kernel.select" do
   it 'does not block when timeout is 0' do
     IO.pipe do |read, write|
-      IO.select([read], [], [], 0).should == nil
+      select([read], [], [], 0).should == nil
       write.write 'data'
-      IO.select([read], [], [], 0).should == [[read], [], []]
+      select([read], [], [], 0).should == [[read], [], []]
     end
   end
 end
diff --git a/spec/ruby/core/kernel/shared/load.rb b/spec/ruby/core/kernel/shared/load.rb
index 5c41c19bf6c230..62c5c7be9bf55c 100644
--- a/spec/ruby/core/kernel/shared/load.rb
+++ b/spec/ruby/core/kernel/shared/load.rb
@@ -1,5 +1,6 @@
 main = self
 
+# The big difference is Kernel#load does not attempt to add an extension to the passed path, unlike Kernel#require
 describe :kernel_load, shared: true do
   before :each do
     CodeLoadingSpecs.spec_setup
@@ -10,22 +11,31 @@
     CodeLoadingSpecs.spec_cleanup
   end
 
-  it "loads a non-extensioned file as a Ruby source file" do
-    path = File.expand_path "load_fixture", CODE_LOADING_DIR
-    @object.load(path).should be_true
-    ScratchPad.recorded.should == [:no_ext]
-  end
+  describe "(path resolution)" do
+    # This behavior is specific to Kernel#load, it differs for Kernel#require
+    it "loads a non-extensioned file as a Ruby source file" do
+      path = File.expand_path "load_fixture", CODE_LOADING_DIR
+      @object.load(path).should be_true
+      ScratchPad.recorded.should == [:no_ext]
+    end
 
-  it "loads a non .rb extensioned file as a Ruby source file" do
-    path = File.expand_path "load_fixture.ext", CODE_LOADING_DIR
-    @object.load(path).should be_true
-    ScratchPad.recorded.should == [:no_rb_ext]
-  end
+    it "loads a non .rb extensioned file as a Ruby source file" do
+      path = File.expand_path "load_fixture.ext", CODE_LOADING_DIR
+      @object.load(path).should be_true
+      ScratchPad.recorded.should == [:no_rb_ext]
+    end
 
-  it "loads from the current working directory" do
-    Dir.chdir CODE_LOADING_DIR do
-      @object.load("load_fixture.rb").should be_true
-      ScratchPad.recorded.should == [:loaded]
+    it "loads from the current working directory" do
+      Dir.chdir CODE_LOADING_DIR do
+        @object.load("load_fixture.rb").should be_true
+        ScratchPad.recorded.should == [:loaded]
+      end
+    end
+
+    # This behavior is specific to Kernel#load, it differs for Kernel#require
+    it "does not look for a c-extension file when passed a path without extension (when no .rb is present)" do
+      path = File.join CODE_LOADING_DIR, "a", "load_fixture"
+      -> { @object.send(@method, path) }.should raise_error(LoadError)
     end
   end
 
@@ -155,37 +165,35 @@
   end
 
   describe "when passed a module for 'wrap'" do
-    ruby_version_is "3.1" do
-      it "sets the enclosing scope to the supplied module" do
-        path = File.expand_path "load_wrap_fixture.rb", CODE_LOADING_DIR
-        mod = Module.new
-        @object.load(path, mod)
+    it "sets the enclosing scope to the supplied module" do
+      path = File.expand_path "load_wrap_fixture.rb", CODE_LOADING_DIR
+      mod = Module.new
+      @object.load(path, mod)
 
-        Object.const_defined?(:LoadSpecWrap).should be_false
-        mod.const_defined?(:LoadSpecWrap).should be_true
+      Object.const_defined?(:LoadSpecWrap).should be_false
+      mod.const_defined?(:LoadSpecWrap).should be_true
 
-        wrap_module = ScratchPad.recorded[1]
-        wrap_module.should == mod
-      end
+      wrap_module = ScratchPad.recorded[1]
+      wrap_module.should == mod
+    end
 
-      it "makes constants and instance methods in the source file reachable with the supplied module" do
-        path = File.expand_path "load_wrap_fixture.rb", CODE_LOADING_DIR
-        mod = Module.new
-        @object.load(path, mod)
+    it "makes constants and instance methods in the source file reachable with the supplied module" do
+      path = File.expand_path "load_wrap_fixture.rb", CODE_LOADING_DIR
+      mod = Module.new
+      @object.load(path, mod)
 
-        mod::LOAD_WRAP_SPECS_TOP_LEVEL_CONSTANT.should == 1
-        obj = Object.new
-        obj.extend(mod)
-        obj.send(:load_wrap_specs_top_level_method).should == :load_wrap_specs_top_level_method
-      end
+      mod::LOAD_WRAP_SPECS_TOP_LEVEL_CONSTANT.should == 1
+      obj = Object.new
+      obj.extend(mod)
+      obj.send(:load_wrap_specs_top_level_method).should == :load_wrap_specs_top_level_method
+    end
 
-      it "makes instance methods in the source file private" do
-        path = File.expand_path "load_wrap_fixture.rb", CODE_LOADING_DIR
-        mod = Module.new
-        @object.load(path, mod)
+    it "makes instance methods in the source file private" do
+      path = File.expand_path "load_wrap_fixture.rb", CODE_LOADING_DIR
+      mod = Module.new
+      @object.load(path, mod)
 
-        mod.private_instance_methods.include?(:load_wrap_specs_top_level_method).should == true
-      end
+      mod.private_instance_methods.include?(:load_wrap_specs_top_level_method).should == true
     end
   end
 
diff --git a/spec/ruby/core/kernel/shared/require.rb b/spec/ruby/core/kernel/shared/require.rb
index 61081b200c3e61..52f86f73e50f48 100644
--- a/spec/ruby/core/kernel/shared/require.rb
+++ b/spec/ruby/core/kernel/shared/require.rb
@@ -212,6 +212,34 @@
 
 describe :kernel_require, shared: true do
   describe "(path resolution)" do
+    it "loads .rb file when passed absolute path without extension" do
+      path = File.expand_path "load_fixture", CODE_LOADING_DIR
+      @object.send(@method, path).should be_true
+      # This should _not_ be [:no_ext]
+      ScratchPad.recorded.should == [:loaded]
+    end
+
+    platform_is :linux, :darwin do
+      it "loads c-extension file when passed absolute path without extension when no .rb is present" do
+        # the error message is specific to what dlerror() returns
+        path = File.join CODE_LOADING_DIR, "a", "load_fixture"
+        -> { @object.send(@method, path) }.should raise_error(LoadError)
+      end
+    end
+
+    platform_is :darwin do
+      it "loads .bundle file when passed absolute path with .so" do
+        # the error message is specific to what dlerror() returns
+        path = File.join CODE_LOADING_DIR, "a", "load_fixture.so"
+        -> { @object.send(@method, path) }.should raise_error(LoadError)
+      end
+    end
+
+    it "does not try an extra .rb if the path already ends in .rb" do
+      path = File.join CODE_LOADING_DIR, "d", "load_fixture.rb"
+      -> { @object.send(@method, path) }.should raise_error(LoadError)
+    end
+
     # For reference see [ruby-core:24155] in which matz confirms this feature is
     # intentional for security reasons.
     it "does not load a bare filename unless the current working directory is in $LOAD_PATH" do
@@ -268,6 +296,16 @@
       $LOAD_PATH.replace [File.expand_path("b", CODE_LOADING_DIR), CODE_LOADING_DIR]
       @object.require("load_fixture").should be_false
     end
+
+    it "stores the missing path in a LoadError object" do
+      path = "abcd1234"
+
+      -> {
+        @object.send(@method, path)
+      }.should raise_error(LoadError) { |e|
+        e.path.should == path
+      }
+    end
   end
 
   describe "(file extensions)" do
@@ -787,4 +825,24 @@
       e.path.should == path
     }
   end
+
+  platform_is :linux, :darwin do
+    it "does not store the missing path in a LoadError object when c-extension file exists but loading fails and passed absolute path without extension" do
+      # the error message is specific to what dlerror() returns
+      path = File.join CODE_LOADING_DIR, "a", "load_fixture"
+      -> { @object.send(@method, path) }.should raise_error(LoadError) { |e|
+        e.path.should == nil
+      }
+    end
+  end
+
+  platform_is :darwin do
+    it "does not store the missing path in a LoadError object when c-extension file exists but loading fails and passed absolute path with extension" do
+      # the error message is specific to what dlerror() returns
+      path = File.join CODE_LOADING_DIR, "a", "load_fixture.bundle"
+      -> { @object.send(@method, path) }.should raise_error(LoadError) { |e|
+        e.path.should == nil
+      }
+    end
+  end
 end
diff --git a/spec/ruby/core/kernel/shared/sprintf.rb b/spec/ruby/core/kernel/shared/sprintf.rb
index 13dc6e97f0f03d..a68389a7b407a2 100644
--- a/spec/ruby/core/kernel/shared/sprintf.rb
+++ b/spec/ruby/core/kernel/shared/sprintf.rb
@@ -22,6 +22,7 @@ def obj.to_i; 10; end
       @method.call("%d", "112").should == "112"
       @method.call("%d", "0127").should == "87"
       @method.call("%d", "0xc4").should == "196"
+      @method.call("%d", "0").should == "0"
     end
 
     it "raises TypeError exception if cannot convert to Integer" do
@@ -57,6 +58,11 @@ def obj.to_i; 10; end
         it "works well with large numbers" do
           @method.call("%#{f}", 1234567890987654321).should == "1234567890987654321"
         end
+
+        it "converts to the empty string if precision is 0 and value is 0" do
+          @method.call("%.#{f}", 0).should == ""
+          @method.call("%.0#{f}", 0).should == ""
+        end
       end
     end
 
@@ -289,28 +295,12 @@ def obj.to_i; 10; end
         @method.call("%c", "a").should == "a"
       end
 
-      ruby_version_is ""..."3.2" do
-        it "raises ArgumentError if argument is a string of several characters" do
-          -> {
-            @method.call("%c", "abc")
-          }.should raise_error(ArgumentError, /%c requires a character/)
-        end
-
-        it "raises ArgumentError if argument is an empty string" do
-          -> {
-            @method.call("%c", "")
-          }.should raise_error(ArgumentError, /%c requires a character/)
-        end
+      it "displays only the first character if argument is a string of several characters" do
+        @method.call("%c", "abc").should == "a"
       end
 
-      ruby_version_is "3.2" do
-        it "displays only the first character if argument is a string of several characters" do
-          @method.call("%c", "abc").should == "a"
-        end
-
-        it "displays no characters if argument is an empty string" do
-          @method.call("%c", "").should == ""
-        end
+      it "displays no characters if argument is an empty string" do
+        @method.call("%c", "").should == ""
       end
 
       it "raises TypeError if argument is not String or Integer and cannot be converted to them" do
@@ -372,6 +362,10 @@ def obj.to_int
         obj.should_receive(:inspect).and_return("<inspect-result>")
         @method.call("%p", obj).should == "<inspect-result>"
       end
+
+      it "substitutes 'nil' for nil" do
+        @method.call("%p", nil).should == "nil"
+      end
     end
 
     describe "s" do
diff --git a/spec/ruby/core/kernel/shared/sprintf_encoding.rb b/spec/ruby/core/kernel/shared/sprintf_encoding.rb
index 9cedb8b662466b..7ec0fe4c48cfd4 100644
--- a/spec/ruby/core/kernel/shared/sprintf_encoding.rb
+++ b/spec/ruby/core/kernel/shared/sprintf_encoding.rb
@@ -14,14 +14,14 @@
   end
 
   it "returns a String in the same encoding as the format String if compatible" do
-    string = "%s".force_encoding(Encoding::KOI8_U)
+    string = "%s".dup.force_encoding(Encoding::KOI8_U)
     result = @method.call(string, "dogs")
     result.encoding.should equal(Encoding::KOI8_U)
   end
 
   it "returns a String in the argument's encoding if format encoding is more restrictive" do
-    string = "foo %s".force_encoding(Encoding::US_ASCII)
-    argument = "b\303\274r".force_encoding(Encoding::UTF_8)
+    string = "foo %s".dup.force_encoding(Encoding::US_ASCII)
+    argument = "b\303\274r".dup.force_encoding(Encoding::UTF_8)
 
     result = @method.call(string, argument)
     result.encoding.should equal(Encoding::UTF_8)
@@ -56,7 +56,7 @@
     end
 
     it "uses the encoding of the format string to interpret codepoints" do
-      format = "%c".force_encoding("euc-jp")
+      format = "%c".dup.force_encoding("euc-jp")
       result = @method.call(format, 9415601)
 
       result.encoding.should == Encoding::EUC_JP
diff --git a/spec/ruby/core/kernel/sleep_spec.rb b/spec/ruby/core/kernel/sleep_spec.rb
index 44b417a92e8e8f..4401e542563a9d 100644
--- a/spec/ruby/core/kernel/sleep_spec.rb
+++ b/spec/ruby/core/kernel/sleep_spec.rb
@@ -1,5 +1,4 @@
 require_relative '../../spec_helper'
-require_relative 'fixtures/classes'
 
 describe "Kernel#sleep" do
   it "is a private method" do
@@ -22,7 +21,7 @@
     sleep(Rational(1, 999)).should >= 0
   end
 
-  it "accepts any Object that reponds to divmod" do
+  it "accepts any Object that responds to divmod" do
     o = Object.new
     def o.divmod(*); [0, 0.001]; end
     sleep(o).should >= 0
@@ -52,6 +51,17 @@ def o.divmod(*); [0, 0.001]; end
     t.value.should == 5
   end
 
+  it "sleeps with nanosecond precision" do
+    start_time = Process.clock_gettime(Process::CLOCK_MONOTONIC)
+    100.times do
+      sleep(0.0001)
+    end
+    end_time = Process.clock_gettime(Process::CLOCK_MONOTONIC)
+
+    actual_duration = end_time - start_time
+    actual_duration.should > 0.01 # 100 * 0.0001 => 0.01
+  end
+
   ruby_version_is ""..."3.3" do
     it "raises a TypeError when passed nil" do
       -> { sleep(nil)   }.should raise_error(TypeError)
diff --git a/spec/ruby/core/kernel/sprintf_spec.rb b/spec/ruby/core/kernel/sprintf_spec.rb
index 7adf71be76f003..9ef7f86f16d833 100644
--- a/spec/ruby/core/kernel/sprintf_spec.rb
+++ b/spec/ruby/core/kernel/sprintf_spec.rb
@@ -3,6 +3,14 @@
 require_relative 'shared/sprintf'
 require_relative 'shared/sprintf_encoding'
 
+describe :kernel_sprintf_to_str, shared: true do
+  it "calls #to_str to convert the format object to a String" do
+    obj = mock('format string')
+    obj.should_receive(:to_str).and_return("to_str: %i")
+    @method.call(obj, 42).should == "to_str: 42"
+  end
+end
+
 describe "Kernel#sprintf" do
   it_behaves_like :kernel_sprintf, -> format, *args {
     sprintf(format, *args)
@@ -11,6 +19,10 @@
   it_behaves_like :kernel_sprintf_encoding, -> format, *args {
     sprintf(format, *args)
   }
+
+  it_behaves_like :kernel_sprintf_to_str, -> format, *args {
+    sprintf(format, *args)
+  }
 end
 
 describe "Kernel.sprintf" do
@@ -21,4 +33,8 @@
   it_behaves_like :kernel_sprintf_encoding, -> format, *args {
     Kernel.sprintf(format, *args)
   }
+
+  it_behaves_like :kernel_sprintf_to_str, -> format, *args {
+    Kernel.sprintf(format, *args)
+  }
 end
diff --git a/spec/ruby/core/kernel/system_spec.rb b/spec/ruby/core/kernel/system_spec.rb
index 9671a650cc5330..9bc03924dd883d 100644
--- a/spec/ruby/core/kernel/system_spec.rb
+++ b/spec/ruby/core/kernel/system_spec.rb
@@ -64,6 +64,23 @@
     end
   end
 
+  platform_is_not :windows do
+    before :each do
+      require 'tmpdir'
+      @shell_command = File.join(Dir.mktmpdir, "noshebang.cmd")
+      File.write(@shell_command, %[echo "$PATH"\n], perm: 0o700)
+    end
+
+    after :each do
+      File.unlink(@shell_command)
+      Dir.rmdir(File.dirname(@shell_command))
+    end
+
+    it "executes with `sh` if the command is executable but not binary and there is no shebang" do
+      -> { @object.system(@shell_command) }.should output_to_fd(ENV['PATH'] + "\n")
+    end
+  end
+
   before :each do
     ENV['TEST_SH_EXPANSION'] = 'foo'
     @shell_var = '$TEST_SH_EXPANSION'
diff --git a/spec/ruby/core/kernel/taint_spec.rb b/spec/ruby/core/kernel/taint_spec.rb
index 0c16b1dbbffaad..9a2efbaea074b8 100644
--- a/spec/ruby/core/kernel/taint_spec.rb
+++ b/spec/ruby/core/kernel/taint_spec.rb
@@ -2,26 +2,7 @@
 require_relative 'fixtures/classes'
 
 describe "Kernel#taint" do
-  ruby_version_is ""..."3.2" do
-    it "is a no-op" do
-      suppress_warning do
-        o = Object.new
-        o.taint
-        o.should_not.tainted?
-      end
-    end
-
-    it "warns in verbose mode" do
-      -> {
-        obj = mock("tainted")
-        obj.taint
-      }.should complain(/Object#taint is deprecated and will be removed in Ruby 3.2/, verbose: true)
-    end
-  end
-
-  ruby_version_is "3.2" do
-    it "has been removed" do
-      Object.new.should_not.respond_to?(:taint)
-    end
+  it "has been removed" do
+    Object.new.should_not.respond_to?(:taint)
   end
 end
diff --git a/spec/ruby/core/kernel/tainted_spec.rb b/spec/ruby/core/kernel/tainted_spec.rb
index fcae433069cc06..837eb1dafbf882 100644
--- a/spec/ruby/core/kernel/tainted_spec.rb
+++ b/spec/ruby/core/kernel/tainted_spec.rb
@@ -2,28 +2,7 @@
 require_relative 'fixtures/classes'
 
 describe "Kernel#tainted?" do
-  ruby_version_is ""..."3.2" do
-    it "is a no-op" do
-      suppress_warning do
-        o = mock('o')
-        p = mock('p')
-        p.taint
-        o.should_not.tainted?
-        p.should_not.tainted?
-      end
-    end
-
-    it "warns in verbose mode" do
-      -> {
-        o = mock('o')
-        o.tainted?
-      }.should complain(/Object#tainted\? is deprecated and will be removed in Ruby 3.2/, verbose: true)
-    end
-  end
-
-  ruby_version_is "3.2" do
-    it "has been removed" do
-      Object.new.should_not.respond_to?(:tainted?)
-    end
+  it "has been removed" do
+    Object.new.should_not.respond_to?(:tainted?)
   end
 end
diff --git a/spec/ruby/core/kernel/trust_spec.rb b/spec/ruby/core/kernel/trust_spec.rb
index db6f17e0fb061f..ef3fa9a3e15463 100644
--- a/spec/ruby/core/kernel/trust_spec.rb
+++ b/spec/ruby/core/kernel/trust_spec.rb
@@ -2,27 +2,7 @@
 require_relative 'fixtures/classes'
 
 describe "Kernel#trust" do
-  ruby_version_is ""..."3.2" do
-    it "is a no-op" do
-      suppress_warning do
-        o = Object.new.untrust
-        o.should_not.untrusted?
-        o.trust
-        o.should_not.untrusted?
-      end
-    end
-
-    it "warns in verbose mode" do
-      -> {
-        o = Object.new.untrust
-        o.trust
-      }.should complain(/Object#trust is deprecated and will be removed in Ruby 3.2/, verbose: true)
-    end
-  end
-
-  ruby_version_is "3.2" do
-    it "has been removed" do
-      Object.new.should_not.respond_to?(:trust)
-    end
+  it "has been removed" do
+    Object.new.should_not.respond_to?(:trust)
   end
 end
diff --git a/spec/ruby/core/kernel/untaint_spec.rb b/spec/ruby/core/kernel/untaint_spec.rb
index 26b2aabbe91473..47e8544bd40035 100644
--- a/spec/ruby/core/kernel/untaint_spec.rb
+++ b/spec/ruby/core/kernel/untaint_spec.rb
@@ -2,27 +2,7 @@
 require_relative 'fixtures/classes'
 
 describe "Kernel#untaint" do
-  ruby_version_is ""..."3.2" do
-    it "is a no-op" do
-      suppress_warning do
-        o = Object.new.taint
-        o.should_not.tainted?
-        o.untaint
-        o.should_not.tainted?
-      end
-    end
-
-    it "warns in verbose mode" do
-      -> {
-        o = Object.new.taint
-        o.untaint
-      }.should complain(/Object#untaint is deprecated and will be removed in Ruby 3.2/, verbose: true)
-    end
-  end
-
-  ruby_version_is "3.2" do
-    it "has been removed" do
-      Object.new.should_not.respond_to?(:untaint)
-    end
+  it "has been removed" do
+    Object.new.should_not.respond_to?(:untaint)
   end
 end
diff --git a/spec/ruby/core/kernel/untrust_spec.rb b/spec/ruby/core/kernel/untrust_spec.rb
index 5310cd8eb4ef2f..8787ab3fc9c000 100644
--- a/spec/ruby/core/kernel/untrust_spec.rb
+++ b/spec/ruby/core/kernel/untrust_spec.rb
@@ -2,26 +2,7 @@
 require_relative 'fixtures/classes'
 
 describe "Kernel#untrust" do
-  ruby_version_is ""..."3.2" do
-    it "is a no-op" do
-      suppress_warning do
-        o = Object.new
-        o.untrust
-        o.should_not.untrusted?
-      end
-    end
-
-    it "warns in verbose mode" do
-      -> {
-        o = Object.new
-        o.untrust
-      }.should complain(/Object#untrust is deprecated and will be removed in Ruby 3.2/, verbose: true)
-    end
-  end
-
-  ruby_version_is "3.2" do
-    it "has been removed" do
-      Object.new.should_not.respond_to?(:untrust)
-    end
+  it "has been removed" do
+    Object.new.should_not.respond_to?(:untrust)
   end
 end
diff --git a/spec/ruby/core/kernel/untrusted_spec.rb b/spec/ruby/core/kernel/untrusted_spec.rb
index ea36d6c98c4c4b..29261be9c450cf 100644
--- a/spec/ruby/core/kernel/untrusted_spec.rb
+++ b/spec/ruby/core/kernel/untrusted_spec.rb
@@ -2,27 +2,7 @@
 require_relative 'fixtures/classes'
 
 describe "Kernel#untrusted?" do
-  ruby_version_is ""..."3.2" do
-    it "is a no-op" do
-      suppress_warning do
-        o = mock('o')
-        o.should_not.untrusted?
-        o.untrust
-        o.should_not.untrusted?
-      end
-    end
-
-    it "warns in verbose mode" do
-      -> {
-        o = mock('o')
-        o.untrusted?
-      }.should complain(/Object#untrusted\? is deprecated and will be removed in Ruby 3.2/, verbose: true)
-    end
-  end
-
-  ruby_version_is "3.2" do
-    it "has been removed" do
-      Object.new.should_not.respond_to?(:untrusted?)
-    end
+  it "has been removed" do
+    Object.new.should_not.respond_to?(:untrusted?)
   end
 end
diff --git a/spec/ruby/core/main/private_spec.rb b/spec/ruby/core/main/private_spec.rb
index e8c1f3f44c48ad..76895fd6493d5e 100644
--- a/spec/ruby/core/main/private_spec.rb
+++ b/spec/ruby/core/main/private_spec.rb
@@ -30,16 +30,8 @@
     end
   end
 
-  ruby_version_is ''...'3.1' do
-    it "returns Object" do
-      eval("private :main_public_method", TOPLEVEL_BINDING).should equal(Object)
-    end
-  end
-
-  ruby_version_is '3.1' do
-    it "returns argument" do
-      eval("private :main_public_method", TOPLEVEL_BINDING).should equal(:main_public_method)
-    end
+  it "returns argument" do
+    eval("private :main_public_method", TOPLEVEL_BINDING).should equal(:main_public_method)
   end
 
   it "raises a NameError when at least one of given method names is undefined" do
diff --git a/spec/ruby/core/main/public_spec.rb b/spec/ruby/core/main/public_spec.rb
index 31baad4583c7d4..3c77798fbcf016 100644
--- a/spec/ruby/core/main/public_spec.rb
+++ b/spec/ruby/core/main/public_spec.rb
@@ -30,16 +30,8 @@
     end
   end
 
-  ruby_version_is ''...'3.1' do
-    it "returns Object" do
-      eval("public :main_private_method", TOPLEVEL_BINDING).should equal(Object)
-    end
-  end
-
-  ruby_version_is '3.1' do
-    it "returns argument" do
-      eval("public :main_private_method", TOPLEVEL_BINDING).should equal(:main_private_method)
-    end
+  it "returns argument" do
+    eval("public :main_private_method", TOPLEVEL_BINDING).should equal(:main_private_method)
   end
 
 
diff --git a/spec/ruby/core/main/using_spec.rb b/spec/ruby/core/main/using_spec.rb
index 8a23970c4bf248..5b9a75159544f7 100644
--- a/spec/ruby/core/main/using_spec.rb
+++ b/spec/ruby/core/main/using_spec.rb
@@ -142,11 +142,9 @@ def bar; 'quux'; end
     end.should raise_error(RuntimeError)
   end
 
-  ruby_version_is "3.2" do
-    it "does not raise error when wrapped with module" do
-      -> do
-        load File.expand_path('../fixtures/using.rb', __FILE__), true
-      end.should_not raise_error
-    end
+  it "does not raise error when wrapped with module" do
+    -> do
+      load File.expand_path('../fixtures/using.rb', __FILE__), true
+    end.should_not raise_error
   end
 end
diff --git a/spec/ruby/core/marshal/dump_spec.rb b/spec/ruby/core/marshal/dump_spec.rb
index eaf238bbd93a85..283016b8db8ea0 100644
--- a/spec/ruby/core/marshal/dump_spec.rb
+++ b/spec/ruby/core/marshal/dump_spec.rb
@@ -1,4 +1,4 @@
-# -*- encoding: binary -*-
+# encoding: binary
 require_relative '../../spec_helper'
 require_relative 'fixtures/classes'
 require_relative 'fixtures/marshal_data'
@@ -38,7 +38,7 @@
       ].should be_computed_by(:dump)
     end
 
-    platform_is wordsize: 64 do
+    platform_is c_long_size: 64 do
       it "dumps a positive Fixnum > 31 bits as a Bignum" do
         Marshal.dump(2**31 + 1).should == "\x04\bl+\a\x01\x00\x00\x80"
       end
@@ -47,6 +47,11 @@
         Marshal.dump(-2**31 - 1).should == "\x04\bl-\a\x01\x00\x00\x80"
       end
     end
+
+    it "does not use object links for objects repeatedly dumped" do
+      Marshal.dump([0, 0]).should == "\x04\b[\ai\x00i\x00"
+      Marshal.dump([2**16, 2**16]).should == "\x04\b[\ai\x03\x00\x00\x01i\x03\x00\x00\x01"
+    end
   end
 
   describe "with a Symbol" do
@@ -76,7 +81,7 @@
     end
 
     it "dumps a binary encoded Symbol" do
-      s = "\u2192".force_encoding("binary").to_sym
+      s = "\u2192".dup.force_encoding("binary").to_sym
       Marshal.dump(s).should == "\x04\b:\b\xE2\x86\x92"
     end
 
@@ -85,14 +90,19 @@
       symbol1 = "I:\t\xE2\x82\xACa\x06:\x06ET"
       symbol2 = "I:\t\xE2\x82\xACb\x06;\x06T"
       value = [
-        "€a".force_encoding(Encoding::UTF_8).to_sym,
-        "€b".force_encoding(Encoding::UTF_8).to_sym
+        "€a".dup.force_encoding(Encoding::UTF_8).to_sym,
+        "€b".dup.force_encoding(Encoding::UTF_8).to_sym
       ]
       Marshal.dump(value).should == "\x04\b[\a#{symbol1}#{symbol2}"
 
       value = [*value, value[0]]
       Marshal.dump(value).should == "\x04\b[\b#{symbol1}#{symbol2};\x00"
     end
+
+    it "uses symbol links for objects repeatedly dumped" do
+      symbol = :foo
+      Marshal.dump([symbol, symbol]).should == "\x04\b[\a:\bfoo;\x00" # ;\x00 is a link to the symbol object
+    end
   end
 
   describe "with an object responding to #marshal_dump" do
@@ -108,6 +118,20 @@
     it "raises TypeError if an Object is an instance of an anonymous class" do
       -> { Marshal.dump(Class.new(UserMarshal).new) }.should raise_error(TypeError, /can't dump anonymous class/)
     end
+
+    it "uses object links for objects repeatedly dumped" do
+      obj = UserMarshal.new
+      Marshal.dump([obj, obj]).should == "\x04\b[\aU:\x10UserMarshal:\tdata@\x06" # @\x06 is a link to the object
+    end
+
+    it "adds instance variables of a dumped object after the object itself into the objects table" do
+      value = "<foo>"
+      obj = MarshalSpec::UserMarshalDumpWithIvar.new("string", value)
+
+      # expect a link to the object (@\x06, that means Integer 1) is smaller than a link
+      # to the instance variable value (@\t, that means Integer 4)
+      Marshal.dump([obj, obj, value]).should == "\x04\b[\bU:)MarshalSpec::UserMarshalDumpWithIvarI[\x06\"\vstring\x06:\t@foo\"\n<foo>@\x06@\t"
+    end
   end
 
   describe "with an object responding to #_dump" do
@@ -150,7 +174,7 @@
     it "indexes instance variables of a String returned by #_dump at first and then indexes the object itself" do
       class MarshalSpec::M1::A
         def _dump(level)
-          s = "<dump>"
+          s = +"<dump>"
           s.instance_variable_set(:@foo, "bar")
           s
         end
@@ -166,6 +190,20 @@ def _dump(level)
       Marshal.dump([a, a]).should == "\x04\b[\aIu:\x17MarshalSpec::M1::A\v<dump>\x06:\t@foo\"\bbar#{reference}"
     end
 
+    it "uses object links for objects repeatedly dumped" do
+      obj = UserDefined.new
+      Marshal.dump([obj, obj]).should == "\x04\b[\au:\x10UserDefined\x12\x04\b[\a:\nstuff;\x00@\x06" # @\x06 is a link to the object
+    end
+
+    it "adds instance variables of a dumped String before the object itself into the objects table" do
+      value = "<foo>"
+      obj = MarshalSpec::UserDefinedDumpWithIVars.new(+"string", value)
+
+      # expect a link to the object (@\a, that means Integer 2) is greater than a link
+      # to the instance variable value (@\x06, that means Integer 1)
+      Marshal.dump([obj, obj, value]).should == "\x04\b[\bIu:*MarshalSpec::UserDefinedDumpWithIVars\vstring\x06:\t@foo\"\n<foo>@\a@\x06"
+    end
+
     describe "Core library classes with #_dump returning a String with instance variables" do
       it "indexes instance variables and then a Time object itself" do
         t = Time.utc(2022)
@@ -193,9 +231,16 @@ def _dump(level)
       Marshal.dump(MarshalSpec::ClassWithOverriddenName).should == "\x04\bc)MarshalSpec::ClassWithOverriddenName"
     end
 
-    it "dumps a class with multibyte characters in name" do
-      source_object = eval("MarshalSpec::MultibyteぁあぃいClass".force_encoding(Encoding::UTF_8))
-      Marshal.dump(source_object).should == "\x04\bc,MarshalSpec::Multibyte\xE3\x81\x81\xE3\x81\x82\xE3\x81\x83\xE3\x81\x84Class"
+    ruby_version_is "3.5" do
+      it "dumps a class with multibyte characters in name" do
+        source_object = eval("MarshalSpec::MultibyteぁあぃいClass".dup.force_encoding(Encoding::UTF_8))
+        Marshal.dump(source_object).should == "\x04\bIc,MarshalSpec::Multibyte\xE3\x81\x81\xE3\x81\x82\xE3\x81\x83\xE3\x81\x84Class\x06:\x06ET"
+        Marshal.load(Marshal.dump(source_object)) == source_object
+      end
+    end
+
+    it "uses object links for objects repeatedly dumped" do
+      Marshal.dump([String, String]).should == "\x04\b[\ac\vString@\x06" # @\x06 is a link to the object
     end
 
     it "raises TypeError with an anonymous Class" do
@@ -216,9 +261,16 @@ def _dump(level)
       Marshal.dump(MarshalSpec::ModuleWithOverriddenName).should == "\x04\bc*MarshalSpec::ModuleWithOverriddenName"
     end
 
-    it "dumps a module with multibyte characters in name" do
-      source_object = eval("MarshalSpec::MultibyteけげこごModule".force_encoding(Encoding::UTF_8))
-      Marshal.dump(source_object).should == "\x04\bm-MarshalSpec::Multibyte\xE3\x81\x91\xE3\x81\x92\xE3\x81\x93\xE3\x81\x94Module"
+    ruby_version_is "3.5" do
+      it "dumps a module with multibyte characters in name" do
+        source_object = eval("MarshalSpec::MultibyteけげこごModule".dup.force_encoding(Encoding::UTF_8))
+        Marshal.dump(source_object).should == "\x04\bIm-MarshalSpec::Multibyte\xE3\x81\x91\xE3\x81\x92\xE3\x81\x93\xE3\x81\x94Module\x06:\x06ET"
+        Marshal.load(Marshal.dump(source_object)) == source_object
+      end
+    end
+
+    it "uses object links for objects repeatedly dumped" do
+      Marshal.dump([Marshal, Marshal]).should == "\x04\b[\am\fMarshal@\x06" # @\x06 is a link to the object
     end
 
     it "raises TypeError with an anonymous Module" do
@@ -239,6 +291,23 @@ def _dump(level)
         [Marshal,  nan_value,      "\004\bf\bnan"],
       ].should be_computed_by(:dump)
     end
+
+    it "may or may not use object links for objects repeatedly dumped" do
+      # it's an MRI implementation detail - on x86 architecture object links
+      # aren't used for Float values but on amd64 - object links are used
+
+      dump = Marshal.dump([0.0, 0.0])
+      ["\x04\b[\af\x060@\x06", "\x04\b[\af\x060f\x060"].should.include?(dump)
+
+      # if object links aren't used - entries in the objects table are still
+      # occupied by Float values
+      if dump == "\x04\b[\af\x060f\x060"
+        s = "string"
+        # an index of "string" ("@\b") in the object table equals 3 (`"\b".ord - 5`),
+        # so `0.0, 0,0` elements occupied indices 1 and 2
+        Marshal.dump([0.0, 0.0, s, s]).should == "\x04\b[\tf\x060f\x060\"\vstring@\b"
+      end
+    end
   end
 
   describe "with a Bignum" do
@@ -256,6 +325,11 @@ def _dump(level)
       ].should be_computed_by(:dump)
     end
 
+    it "uses object links for objects repeatedly dumped" do
+      n = 2**64
+      Marshal.dump([n, n]).should == "\x04\b[\al+\n\x00\x00\x00\x00\x00\x00\x00\x00\x01\x00@\x06" # @\x06 is a link to the object
+    end
+
     it "increases the object links counter" do
       obj = Object.new
       object_1_link = "\x06" # representing of (0-based) index=1 (by adding 5 for small Integers)
@@ -275,21 +349,56 @@ def _dump(level)
     it "dumps a Rational" do
       Marshal.dump(Rational(2, 3)).should == "\x04\bU:\rRational[\ai\ai\b"
     end
+
+    it "uses object links for objects repeatedly dumped" do
+      r = Rational(2, 3)
+      Marshal.dump([r, r]).should == "\x04\b[\aU:\rRational[\ai\ai\b@\x06" # @\x06 is a link to the object
+    end
   end
 
   describe "with a Complex" do
     it "dumps a Complex" do
       Marshal.dump(Complex(2, 3)).should == "\x04\bU:\fComplex[\ai\ai\b"
     end
+
+    it "uses object links for objects repeatedly dumped" do
+      c = Complex(2, 3)
+      Marshal.dump([c, c]).should == "\x04\b[\aU:\fComplex[\ai\ai\b@\x06" # @\x06 is a link to the object
+    end
+  end
+
+  describe "with a Data" do
+    it "dumps a Data" do
+      Marshal.dump(MarshalSpec::DataSpec::Measure.new(100, 'km')).should == "\x04\bS:#MarshalSpec::DataSpec::Measure\a:\vamountii:\tunit\"\akm"
+    end
+
+    it "dumps an extended Data" do
+      obj = MarshalSpec::DataSpec::MeasureExtended.new(100, "km")
+      Marshal.dump(obj).should == "\x04\bS:+MarshalSpec::DataSpec::MeasureExtended\a:\vamountii:\tunit\"\akm"
+    end
+
+    it "ignores overridden name method" do
+      obj = MarshalSpec::DataSpec::MeasureWithOverriddenName.new(100, "km")
+      Marshal.dump(obj).should == "\x04\bS:5MarshalSpec::DataSpec::MeasureWithOverriddenName\a:\vamountii:\tunit\"\akm"
+    end
+
+    it "uses object links for objects repeatedly dumped" do
+      d = MarshalSpec::DataSpec::Measure.new(100, 'km')
+      Marshal.dump([d, d]).should == "\x04\b[\aS:#MarshalSpec::DataSpec::Measure\a:\vamountii:\tunit\"\akm@\x06" # @\x06 is a link to the object
+    end
+
+    it "raises TypeError with an anonymous Struct" do
+      -> { Marshal.dump(Data.define(:a).new(1)) }.should raise_error(TypeError, /can't dump anonymous class/)
+    end
   end
 
   describe "with a String" do
     it "dumps a blank String" do
-      Marshal.dump("".force_encoding("binary")).should == "\004\b\"\000"
+      Marshal.dump("".dup.force_encoding("binary")).should == "\004\b\"\000"
     end
 
     it "dumps a short String" do
-      Marshal.dump("short".force_encoding("binary")).should == "\004\b\"\012short"
+      Marshal.dump("short".dup.force_encoding("binary")).should == "\004\b\"\012short"
     end
 
     it "dumps a long String" do
@@ -297,7 +406,7 @@ def _dump(level)
     end
 
     it "dumps a String extended with a Module" do
-      Marshal.dump("".extend(Meths).force_encoding("binary")).should == "\004\be:\nMeths\"\000"
+      Marshal.dump("".dup.extend(Meths).force_encoding("binary")).should == "\004\be:\nMeths\"\000"
     end
 
     it "dumps a String subclass" do
@@ -314,23 +423,23 @@ def _dump(level)
     end
 
     it "dumps a String with instance variables" do
-      str = ""
+      str = +""
       str.instance_variable_set("@foo", "bar")
       Marshal.dump(str.force_encoding("binary")).should == "\x04\bI\"\x00\x06:\t@foo\"\bbar"
     end
 
     it "dumps a US-ASCII String" do
-      str = "abc".force_encoding("us-ascii")
+      str = "abc".dup.force_encoding("us-ascii")
       Marshal.dump(str).should == "\x04\bI\"\babc\x06:\x06EF"
     end
 
     it "dumps a UTF-8 String" do
-      str = "\x6d\xc3\xb6\x68\x72\x65".force_encoding("utf-8")
+      str = "\x6d\xc3\xb6\x68\x72\x65".dup.force_encoding("utf-8")
       Marshal.dump(str).should == "\x04\bI\"\vm\xC3\xB6hre\x06:\x06ET"
     end
 
     it "dumps a String in another encoding" do
-      str = "\x6d\x00\xf6\x00\x68\x00\x72\x00\x65\x00".force_encoding("utf-16le")
+      str = "\x6d\x00\xf6\x00\x68\x00\x72\x00\x65\x00".dup.force_encoding("utf-16le")
       result = "\x04\bI\"\x0Fm\x00\xF6\x00h\x00r\x00e\x00\x06:\rencoding\"\rUTF-16LE"
       Marshal.dump(str).should == result
     end
@@ -338,6 +447,21 @@ def _dump(level)
     it "dumps multiple strings using symlinks for the :E (encoding) symbol" do
       Marshal.dump(["".encode("us-ascii"), "".encode("utf-8")]).should == "\x04\b[\aI\"\x00\x06:\x06EFI\"\x00\x06;\x00T"
     end
+
+    it "uses object links for objects repeatedly dumped" do
+      s = "string"
+      Marshal.dump([s, s]).should == "\x04\b[\a\"\vstring@\x06" # @\x06 is a link to the object
+    end
+
+    it "adds instance variables after the object itself into the objects table" do
+      obj = +"string"
+      value = "<foo>"
+      obj.instance_variable_set :@foo, value
+
+      # expect a link to the object (@\x06, that means Integer 1) is smaller than a link
+      # to the instance variable value (@\a, that means Integer 2)
+      Marshal.dump([obj, obj, value]).should == "\x04\b[\bI\"\vstring\x06:\t@foo\"\n<foo>@\x06@\a"
+    end
   end
 
   describe "with a Regexp" do
@@ -364,7 +488,7 @@ def _dump(level)
     end
 
     it "dumps a binary Regexp" do
-      o = Regexp.new("".force_encoding("binary"), Regexp::FIXEDENCODING)
+      o = Regexp.new("".dup.force_encoding("binary"), Regexp::FIXEDENCODING)
       Marshal.dump(o).should == "\x04\b/\x00\x10"
     end
 
@@ -383,18 +507,18 @@ def _dump(level)
     end
 
     it "dumps a UTF-8 Regexp" do
-      o = Regexp.new("".force_encoding("utf-8"), Regexp::FIXEDENCODING)
+      o = Regexp.new("".dup.force_encoding("utf-8"), Regexp::FIXEDENCODING)
       Marshal.dump(o).should == "\x04\bI/\x00\x10\x06:\x06ET"
 
-      o = Regexp.new("a".force_encoding("utf-8"), Regexp::FIXEDENCODING)
+      o = Regexp.new("a".dup.force_encoding("utf-8"), Regexp::FIXEDENCODING)
       Marshal.dump(o).should == "\x04\bI/\x06a\x10\x06:\x06ET"
 
-      o = Regexp.new("\u3042".force_encoding("utf-8"), Regexp::FIXEDENCODING)
+      o = Regexp.new("\u3042".dup.force_encoding("utf-8"), Regexp::FIXEDENCODING)
       Marshal.dump(o).should == "\x04\bI/\b\xE3\x81\x82\x10\x06:\x06ET"
     end
 
     it "dumps a Regexp in another encoding" do
-      o = Regexp.new("".force_encoding("utf-16le"), Regexp::FIXEDENCODING)
+      o = Regexp.new("".dup.force_encoding("utf-16le"), Regexp::FIXEDENCODING)
       Marshal.dump(o).should == "\x04\bI/\x00\x10\x06:\rencoding\"\rUTF-16LE"
 
       o = Regexp.new("a".encode("utf-16le"), Regexp::FIXEDENCODING)
@@ -405,6 +529,11 @@ def _dump(level)
       obj = MarshalSpec::RegexpWithOverriddenName.new("")
       Marshal.dump(obj).should == "\x04\bIC:*MarshalSpec::RegexpWithOverriddenName/\x00\x00\x06:\x06EF"
     end
+
+    it "uses object links for objects repeatedly dumped" do
+      r = /\A.\Z/
+      Marshal.dump([r, r]).should == "\x04\b[\aI/\n\\A.\\Z\x00\x06:\x06EF@\x06" # @\x06 is a link to the object
+    end
   end
 
   describe "with an Array" do
@@ -440,6 +569,21 @@ def _dump(level)
       obj = MarshalSpec::ArrayWithOverriddenName.new
       Marshal.dump(obj).should == "\x04\bC:)MarshalSpec::ArrayWithOverriddenName[\x00"
     end
+
+    it "uses object links for objects repeatedly dumped" do
+      a = [1]
+      Marshal.dump([a, a]).should == "\x04\b[\a[\x06i\x06@\x06" # @\x06 is a link to the object
+    end
+
+    it "adds instance variables after the object itself into the objects table" do
+      obj = []
+      value = "<foo>"
+      obj.instance_variable_set :@foo, value
+
+      # expect a link to the object (@\x06, that means Integer 1) is smaller than a link
+      # to the instance variable value (@\a, that means Integer 2)
+      Marshal.dump([obj, obj, value]).should == "\x04\b[\bI[\x00\x06:\t@foo\"\n<foo>@\x06@\a"
+    end
   end
 
   describe "with a Hash" do
@@ -459,20 +603,18 @@ def _dump(level)
       Marshal.dump(Hash.new(1)).should == "\004\b}\000i\006"
     end
 
-    ruby_version_is "3.1" do
-      it "dumps a Hash with compare_by_identity" do
-        h = {}
-        h.compare_by_identity
+    it "dumps a Hash with compare_by_identity" do
+      h = {}
+      h.compare_by_identity
 
-        Marshal.dump(h).should == "\004\bC:\tHash{\x00"
-      end
+      Marshal.dump(h).should == "\004\bC:\tHash{\x00"
+    end
 
-      it "dumps a Hash subclass with compare_by_identity" do
-        h = UserHash.new
-        h.compare_by_identity
+    it "dumps a Hash subclass with compare_by_identity" do
+      h = UserHash.new
+      h.compare_by_identity
 
-        Marshal.dump(h).should == "\x04\bC:\rUserHashC:\tHash{\x00"
-      end
+      Marshal.dump(h).should == "\x04\bC:\rUserHashC:\tHash{\x00"
     end
 
     it "raises a TypeError with hash having default proc" do
@@ -497,6 +639,21 @@ def _dump(level)
       obj = MarshalSpec::HashWithOverriddenName.new
       Marshal.dump(obj).should == "\x04\bC:(MarshalSpec::HashWithOverriddenName{\x00"
     end
+
+    it "uses object links for objects repeatedly dumped" do
+      h = {a: 1}
+      Marshal.dump([h, h]).should == "\x04\b[\a{\x06:\x06ai\x06@\x06" # @\x06 is a link to the object
+    end
+
+    it "adds instance variables after the object itself into the objects table" do
+      obj = {}
+      value = "<foo>"
+      obj.instance_variable_set :@foo, value
+
+      # expect a link to the object (@\x06, that means Integer 1) is smaller than a link
+      # to the instance variable value (@\a, that means Integer 2)
+      Marshal.dump([obj, obj, value]).should == "\x04\b[\bI{\x00\x06:\t@foo\"\n<foo>@\x06@\a"
+    end
   end
 
   describe "with a Struct" do
@@ -531,9 +688,24 @@ def _dump(level)
       Marshal.dump(obj).should == "\x04\bS:*MarshalSpec::StructWithOverriddenName\x06:\x06a\"\vmember"
     end
 
+    it "uses object links for objects repeatedly dumped" do
+      s = Struct::Pyramid.new
+      Marshal.dump([s, s]).should == "\x04\b[\aS:\x14Struct::Pyramid\x00@\x06" # @\x06 is a link to the object
+    end
+
     it "raises TypeError with an anonymous Struct" do
       -> { Marshal.dump(Struct.new(:a).new(1)) }.should raise_error(TypeError, /can't dump anonymous class/)
     end
+
+    it "adds instance variables after the object itself into the objects table" do
+      obj = Struct::Pyramid.new
+      value = "<foo>"
+      obj.instance_variable_set :@foo, value
+
+      # expect a link to the object (@\x06, that means Integer 1) is smaller than a link
+      # to the instance variable value (@\a, that means Integer 2)
+      Marshal.dump([obj, obj, value]).should == "\x04\b[\bIS:\x14Struct::Pyramid\x00\x06:\t@foo\"\n<foo>@\x06@\a"
+    end
   end
 
   describe "with an Object" do
@@ -553,7 +725,7 @@ def _dump(level)
 
     it "dumps an Object with a non-US-ASCII instance variable" do
       obj = Object.new
-      ivar = "@é".force_encoding(Encoding::UTF_8).to_sym
+      ivar = "@é".dup.force_encoding(Encoding::UTF_8).to_sym
       obj.instance_variable_set(ivar, 1)
       Marshal.dump(obj).should == "\x04\bo:\vObject\x06I:\b@\xC3\xA9\x06:\x06ETi\x06"
     end
@@ -623,21 +795,45 @@ def finalizer.noop(_)
       ObjectSpace.define_finalizer(obj, finalizer.method(:noop))
       Marshal.load(Marshal.dump(obj)).class.should == Object
     end
+
+    it "uses object links for objects repeatedly dumped" do
+      obj = Object.new
+      Marshal.dump([obj, obj]).should == "\x04\b[\ao:\vObject\x00@\x06" # @\x06 is a link to the object
+    end
+
+    it "adds instance variables after the object itself into the objects table" do
+      obj = Object.new
+      value = "<foo>"
+      obj.instance_variable_set :@foo, value
+
+      # expect a link to the object (@\x06, that means Integer 1) is smaller than a link
+      # to the instance variable value (@\a, that means Integer 2)
+      Marshal.dump([obj, obj, value]).should == "\x04\b[\bo:\vObject\x06:\t@foo\"\n<foo>@\x06@\a"
+    end
   end
 
   describe "with a Range" do
-    it "dumps a Range inclusive of end (with indeterminant order)" do
+    it "dumps a Range inclusive of end" do
       dump = Marshal.dump(1..2)
+      dump.should == "\x04\bo:\nRange\b:\texclF:\nbegini\x06:\bendi\a"
+
       load = Marshal.load(dump)
       load.should == (1..2)
     end
 
-    it "dumps a Range exclusive of end (with indeterminant order)" do
+    it "dumps a Range exclusive of end" do
       dump = Marshal.dump(1...2)
+      dump.should == "\x04\bo:\nRange\b:\texclT:\nbegini\x06:\bendi\a"
+
       load = Marshal.load(dump)
       load.should == (1...2)
     end
 
+    it "uses object links for objects repeatedly dumped" do
+      r = 1..2
+      Marshal.dump([r, r]).should == "\x04\b[\ao:\nRange\b:\texclF:\nbegini\x06:\bendi\a@\x06" # @\x06 is a link to the object
+    end
+
     it "raises TypeError with an anonymous Range subclass" do
       -> { Marshal.dump(Class.new(Range).new(1, 2)) }.should raise_error(TypeError, /can't dump anonymous class/)
     end
@@ -684,9 +880,32 @@ def finalizer.noop(_)
       Marshal.dump(obj).should include("MarshalSpec::TimeWithOverriddenName")
     end
 
-    it "dumps a Time subclass with multibyte characters in name" do
-      source_object = eval("MarshalSpec::MultibyteぁあぃいTime".force_encoding(Encoding::UTF_8))
-      Marshal.dump(source_object).should == "\x04\bc+MarshalSpec::Multibyte\xE3\x81\x81\xE3\x81\x82\xE3\x81\x83\xE3\x81\x84Time"
+    ruby_version_is "3.5" do
+      it "dumps a Time subclass with multibyte characters in name" do
+        source_object = eval("MarshalSpec::MultibyteぁあぃいTime".dup.force_encoding(Encoding::UTF_8))
+        Marshal.dump(source_object).should == "\x04\bIc+MarshalSpec::Multibyte\xE3\x81\x81\xE3\x81\x82\xE3\x81\x83\xE3\x81\x84Time\x06:\x06ET"
+        Marshal.load(Marshal.dump(source_object)) == source_object
+      end
+    end
+
+    it "uses object links for objects repeatedly dumped" do
+      # order of the offset and zone instance variables is a subject to change
+      # and may be different on different CRuby versions
+      base = Regexp.quote("\x04\b[\aIu:\tTime\r\xF5\xEF\e\x80\x00\x00\x00\x00\a")
+      offset = Regexp.quote(":\voffseti\x020*:\tzoneI\"\bAST\x06:\x06EF")
+      zone = Regexp.quote(":\tzoneI\"\bAST\x06:\x06EF:\voffseti\x020*")
+      instance_variables = /#{offset}|#{zone}/
+      Marshal.dump([@t, @t]).should =~ /\A#{base}#{instance_variables}@\a\Z/ # @\a is a link to the object
+    end
+
+    it "adds instance variables before the object itself into the objects table" do
+      obj = @utc
+      value = "<foo>"
+      obj.instance_variable_set :@foo, value
+
+      # expect a link to the object (@\b, that means Integer 3) is greater than a link
+      # to the instance variable value (@\x06, that means Integer 1)
+      Marshal.dump([obj, obj, value]).should == "\x04\b[\bIu:\tTime\r \x00\x1C\xC0\x00\x00\x00\x00\a:\t@foo\"\n<foo>:\tzoneI\"\bUTC\x06:\x06EF@\b@\x06"
     end
 
     it "raises TypeError with an anonymous Time subclass" do
@@ -740,7 +959,22 @@ def finalizer.noop(_)
       rescue => e
       end
 
-      Marshal.dump(e).should =~ /undefined method `foo' for ("":String|an instance of String)/
+      Marshal.dump(e).should =~ /undefined method [`']foo' for ("":String|an instance of String)/
+    end
+
+    it "uses object links for objects repeatedly dumped" do
+      e = Exception.new
+      Marshal.dump([e, e]).should == "\x04\b[\ao:\x0EException\a:\tmesg0:\abt0@\x06" # @\x\a is a link to the object
+    end
+
+    it "adds instance variables after the object itself into the objects table" do
+      obj = Exception.new
+      value = "<foo>"
+      obj.instance_variable_set :@foo, value
+
+      # expect a link to the object (@\x06, that means Integer 1) is smaller than a link
+      # to the instance variable value (@\a, that means Integer 2)
+      Marshal.dump([obj, obj, value]).should == "\x04\b[\bo:\x0EException\b:\tmesg0:\abt0:\t@foo\"\n<foo>@\x06@\a"
     end
 
     it "raises TypeError if an Object is an instance of an anonymous class" do
diff --git a/spec/ruby/core/marshal/fixtures/marshal_data.rb b/spec/ruby/core/marshal/fixtures/marshal_data.rb
index 680cb08ac7f0a3..c16d9e4bb68205 100644
--- a/spec/ruby/core/marshal/fixtures/marshal_data.rb
+++ b/spec/ruby/core/marshal/fixtures/marshal_data.rb
@@ -1,4 +1,7 @@
-# -*- encoding: binary -*-
+# encoding: binary
+
+require_relative 'marshal_multibyte_data'
+
 class UserDefined
   class Nested
     def ==(other)
@@ -38,7 +41,7 @@ class UserDefinedWithIvar
   attr_reader :a, :b, :c
 
   def initialize
-    @a = 'stuff'
+    @a = +'stuff'
     @a.instance_variable_set :@foo, :UserDefinedWithIvar
     @b = 'more'
     @c = @b
@@ -94,6 +97,25 @@ def self._load(data)
   end
 end
 
+module MarshalSpec
+  class UserDefinedDumpWithIVars
+    attr_reader :string
+
+    def initialize(string, ivar_value)
+      @string = string
+      @string.instance_variable_set(:@foo, ivar_value)
+    end
+
+    def _dump(depth)
+      @string
+    end
+
+    def self._load(data)
+      new(data)
+    end
+  end
+end
+
 class UserPreviouslyDefinedWithInitializedIvar
   attr_accessor :field1, :field2
 end
@@ -136,6 +158,32 @@ def ==(other)
   end
 end
 
+module MarshalSpec
+  class UserMarshalDumpWithIvar
+    attr_reader :data
+
+    def initialize(data, ivar_value)
+      @data = data
+      @ivar_value = ivar_value
+    end
+
+    def marshal_dump
+      obj = [data]
+      obj.instance_variable_set(:@foo, @ivar_value)
+      obj
+    end
+
+    def marshal_load(o)
+      @data = o[0]
+    end
+
+    def ==(other)
+      self.class === other and
+        @data = other.data
+    end
+  end
+end
+
 class UserArray < Array
 end
 
@@ -267,17 +315,6 @@ def self.name
     end
   end
 
-  module_eval(<<~ruby.force_encoding(Encoding::UTF_8))
-    class MultibyteぁあぃいClass
-    end
-
-    module MultibyteけげこごModule
-    end
-
-    class MultibyteぁあぃいTime < Time
-    end
-  ruby
-
   class ObjectWithFreezeRaisingException < Object
     def freeze
       raise
@@ -313,7 +350,7 @@ class ObjectWithoutFreeze < Object
                        "\004\b\"\012small"],
     "String big" => ['big' * 100,
                      "\004\b\"\002,\001#{'big' * 100}"],
-    "String extended" => [''.extend(Meths), # TODO: check for module on load
+    "String extended" => [''.dup.extend(Meths), # TODO: check for module on load
                           "\004\be:\nMeths\"\000"],
     "String subclass" => [UserString.new,
                           "\004\bC:\017UserString\"\000"],
@@ -420,7 +457,7 @@ class ObjectWithoutFreeze < Object
                     "\x04\bI\"\nsmall\x06:\x06EF"],
     "String big" => ['big' * 100,
                     "\x04\bI\"\x02,\x01bigbigbigbigbigbigbigbigbigbigbigbigbigbigbigbigbigbigbigbigbigbigbigbigbigbigbigbigbigbigbigbigbigbigbigbigbigbigbigbigbigbigbigbigbigbigbigbigbigbigbigbigbigbigbigbigbigbigbigbigbigbigbigbigbigbigbigbigbigbigbigbigbigbigbigbigbigbigbigbigbigbigbigbigbigbigbigbigbigbigbigbigbigbigbigbigbigbigbigbig\x06:\x06EF"],
-    "String extended" => [''.extend(Meths), # TODO: check for module on load
+    "String extended" => [''.dup.extend(Meths), # TODO: check for module on load
                           "\x04\bIe:\nMeths\"\x00\x06:\x06EF"],
     "String subclass" => [UserString.new,
                           "\004\bC:\017UserString\"\000"],
@@ -494,6 +531,20 @@ class ObjectWithoutFreeze < Object
                  "\004\bS:\024Struct::Pyramid\000"],
     "Random" => random_data,
   }
+
+  module DataSpec
+    Measure = Data.define(:amount, :unit)
+    Empty = Data.define
+
+    MeasureExtended = Class.new(Measure)
+    MeasureExtended.extend(Enumerable)
+
+    class MeasureWithOverriddenName < Measure
+      def self.name
+        "Foo"
+      end
+    end
+  end
 end
 
 class ArraySub < Array
diff --git a/spec/ruby/core/marshal/fixtures/marshal_multibyte_data.rb b/spec/ruby/core/marshal/fixtures/marshal_multibyte_data.rb
new file mode 100644
index 00000000000000..98a0d43392183b
--- /dev/null
+++ b/spec/ruby/core/marshal/fixtures/marshal_multibyte_data.rb
@@ -0,0 +1,12 @@
+# -*- encoding: utf-8 -*-
+
+module MarshalSpec
+  class MultibyteぁあぃいClass
+  end
+
+  module MultibyteけげこごModule
+  end
+
+  class MultibyteぁあぃいTime < Time
+  end
+end
diff --git a/spec/ruby/core/marshal/shared/load.rb b/spec/ruby/core/marshal/shared/load.rb
index b70fb7a974c02c..204a4d34e3edff 100644
--- a/spec/ruby/core/marshal/shared/load.rb
+++ b/spec/ruby/core/marshal/shared/load.rb
@@ -1,4 +1,4 @@
-# -*- encoding: binary -*-
+# encoding: binary
 require_relative '../fixtures/marshal_data'
 
 describe :marshal_load, shared: true do
@@ -23,252 +23,166 @@
     -> { Marshal.send(@method, kaboom) }.should raise_error(ArgumentError)
   end
 
-  ruby_version_is "3.1" do
-    describe "when called with freeze: true" do
-      it "returns frozen strings" do
-        string = Marshal.send(@method, Marshal.dump("foo"), freeze: true)
-        string.should == "foo"
-        string.should.frozen?
-
-        utf8_string = "foo".encode(Encoding::UTF_8)
-        string = Marshal.send(@method, Marshal.dump(utf8_string), freeze: true)
-        string.should == utf8_string
-        string.should.frozen?
-      end
-
-      it "returns frozen arrays" do
-        array = Marshal.send(@method, Marshal.dump([1, 2, 3]), freeze: true)
-        array.should == [1, 2, 3]
-        array.should.frozen?
-      end
-
-      it "returns frozen hashes" do
-        hash = Marshal.send(@method, Marshal.dump({foo: 42}), freeze: true)
-        hash.should == {foo: 42}
-        hash.should.frozen?
-      end
-
-      it "returns frozen regexps" do
-        regexp = Marshal.send(@method, Marshal.dump(/foo/), freeze: true)
-        regexp.should == /foo/
-        regexp.should.frozen?
-      end
+  describe "when called with freeze: true" do
+    it "returns frozen strings" do
+      string = Marshal.send(@method, Marshal.dump("foo"), freeze: true)
+      string.should == "foo"
+      string.should.frozen?
 
-      it "returns frozen structs" do
-        struct = Marshal.send(@method, Marshal.dump(MarshalSpec::StructToDump.new(1, 2)), freeze: true)
-        struct.should == MarshalSpec::StructToDump.new(1, 2)
-        struct.should.frozen?
-      end
+      utf8_string = "foo".encode(Encoding::UTF_8)
+      string = Marshal.send(@method, Marshal.dump(utf8_string), freeze: true)
+      string.should == utf8_string
+      string.should.frozen?
+    end
 
-      it "returns frozen objects" do
-        source_object = Object.new
+    it "returns frozen arrays" do
+      array = Marshal.send(@method, Marshal.dump([1, 2, 3]), freeze: true)
+      array.should == [1, 2, 3]
+      array.should.frozen?
+    end
 
-        object = Marshal.send(@method, Marshal.dump(source_object), freeze: true)
-        object.should.frozen?
-      end
+    it "returns frozen hashes" do
+      hash = Marshal.send(@method, Marshal.dump({foo: 42}), freeze: true)
+      hash.should == {foo: 42}
+      hash.should.frozen?
+    end
 
-      describe "deep freezing" do
-        it "returns hashes with frozen keys and values" do
-          key = Object.new
-          value = Object.new
-          source_object = {key => value}
+    it "returns frozen regexps" do
+      regexp = Marshal.send(@method, Marshal.dump(/foo/), freeze: true)
+      regexp.should == /foo/
+      regexp.should.frozen?
+    end
 
-          hash = Marshal.send(@method, Marshal.dump(source_object), freeze: true)
-          hash.size.should == 1
-          hash.keys[0].should.frozen?
-          hash.values[0].should.frozen?
-        end
+    it "returns frozen structs" do
+      struct = Marshal.send(@method, Marshal.dump(MarshalSpec::StructToDump.new(1, 2)), freeze: true)
+      struct.should == MarshalSpec::StructToDump.new(1, 2)
+      struct.should.frozen?
+    end
 
-        it "returns arrays with frozen elements" do
-          object = Object.new
-          source_object = [object]
+    it "returns frozen objects" do
+      source_object = Object.new
 
-          array = Marshal.send(@method, Marshal.dump(source_object), freeze: true)
-          array.size.should == 1
-          array[0].should.frozen?
-        end
+      object = Marshal.send(@method, Marshal.dump(source_object), freeze: true)
+      object.should.frozen?
+    end
 
-        it "returns structs with frozen members" do
-          object1 = Object.new
-          object2 = Object.new
-          source_object = MarshalSpec::StructToDump.new(object1, object2)
+    describe "deep freezing" do
+      it "returns hashes with frozen keys and values" do
+        key = Object.new
+        value = Object.new
+        source_object = {key => value}
 
-          struct = Marshal.send(@method, Marshal.dump(source_object), freeze: true)
-          struct.a.should.frozen?
-          struct.b.should.frozen?
-        end
+        hash = Marshal.send(@method, Marshal.dump(source_object), freeze: true)
+        hash.size.should == 1
+        hash.keys[0].should.frozen?
+        hash.values[0].should.frozen?
+      end
 
-        it "returns objects with frozen instance variables" do
-          source_object = Object.new
-          instance_variable = Object.new
-          source_object.instance_variable_set(:@a, instance_variable)
+      it "returns arrays with frozen elements" do
+        object = Object.new
+        source_object = [object]
 
-          object = Marshal.send(@method, Marshal.dump(source_object), freeze: true)
-          object.instance_variable_get(:@a).should != nil
-          object.instance_variable_get(:@a).should.frozen?
-        end
+        array = Marshal.send(@method, Marshal.dump(source_object), freeze: true)
+        array.size.should == 1
+        array[0].should.frozen?
+      end
 
-        it "deduplicates frozen strings" do
-          source_object = ["foo" + "bar", "foobar"]
-          object = Marshal.send(@method, Marshal.dump(source_object), freeze: true)
+      it "returns structs with frozen members" do
+        object1 = Object.new
+        object2 = Object.new
+        source_object = MarshalSpec::StructToDump.new(object1, object2)
 
-          object[0].should equal(object[1])
-        end
+        struct = Marshal.send(@method, Marshal.dump(source_object), freeze: true)
+        struct.a.should.frozen?
+        struct.b.should.frozen?
       end
 
-      it "does not freeze modules" do
-        object = Marshal.send(@method, Marshal.dump(Kernel), freeze: true)
-        object.should_not.frozen?
-        Kernel.should_not.frozen?
-      end
+      it "returns objects with frozen instance variables" do
+        source_object = Object.new
+        instance_variable = Object.new
+        source_object.instance_variable_set(:@a, instance_variable)
 
-      it "does not freeze classes" do
-        object = Marshal.send(@method, Marshal.dump(Object), freeze: true)
-        object.should_not.frozen?
-        Object.should_not.frozen?
+        object = Marshal.send(@method, Marshal.dump(source_object), freeze: true)
+        object.instance_variable_get(:@a).should != nil
+        object.instance_variable_get(:@a).should.frozen?
       end
 
-      ruby_bug "#19427", ""..."3.3" do
-        it "does freeze extended objects" do
-          object = Marshal.load("\x04\be:\x0FEnumerableo:\vObject\x00", freeze: true)
-          object.should.frozen?
-        end
+      it "deduplicates frozen strings" do
+        source_object = ["foo" + "bar", "foobar"]
+        object = Marshal.send(@method, Marshal.dump(source_object), freeze: true)
 
-        it "does freeze extended objects with instance variables" do
-          object = Marshal.load("\x04\be:\x0FEnumerableo:\vObject\x06:\n@ivarT", freeze: true)
-          object.should.frozen?
-        end
+        object[0].should equal(object[1])
       end
+    end
 
-      ruby_bug "#19427", "3.1"..."3.3" do
-        it "returns frozen object having #_dump method" do
-          object = Marshal.send(@method, Marshal.dump(UserDefined.new), freeze: true)
-          object.should.frozen?
-        end
-
-        it "returns frozen object responding to #marshal_dump and #marshal_load" do
-          object = Marshal.send(@method, Marshal.dump(UserMarshal.new), freeze: true)
-          object.should.frozen?
-        end
+    it "does not freeze modules" do
+      object = Marshal.send(@method, Marshal.dump(Kernel), freeze: true)
+      object.should_not.frozen?
+      Kernel.should_not.frozen?
+    end
 
-        it "returns frozen object extended by a module" do
-          object = Object.new
-          object.extend(MarshalSpec::ModuleToExtendBy)
+    it "does not freeze classes" do
+      object = Marshal.send(@method, Marshal.dump(Object), freeze: true)
+      object.should_not.frozen?
+      Object.should_not.frozen?
+    end
 
-          object = Marshal.send(@method, Marshal.dump(object), freeze: true)
-          object.should.frozen?
-        end
+    ruby_bug "#19427", ""..."3.3" do
+      it "does freeze extended objects" do
+        object = Marshal.load("\x04\be:\x0FEnumerableo:\vObject\x00", freeze: true)
+        object.should.frozen?
       end
 
-      it "does not call freeze method" do
-        object = MarshalSpec::ObjectWithFreezeRaisingException.new
-        object = Marshal.send(@method, Marshal.dump(object), freeze: true)
+      it "does freeze extended objects with instance variables" do
+        object = Marshal.load("\x04\be:\x0FEnumerableo:\vObject\x06:\n@ivarT", freeze: true)
         object.should.frozen?
       end
+    end
 
-      it "returns frozen object even if object does not respond to freeze method" do
-        object = MarshalSpec::ObjectWithoutFreeze.new
-        object = Marshal.send(@method, Marshal.dump(object), freeze: true)
+    ruby_bug "#19427", ""..."3.3" do
+      it "returns frozen object having #_dump method" do
+        object = Marshal.send(@method, Marshal.dump(UserDefined.new), freeze: true)
         object.should.frozen?
       end
 
-      it "returns a frozen object when is an instance of String/Array/Regexp/Hash subclass and has instance variables" do
-        source_object = UserString.new
-        source_object.instance_variable_set(:@foo, "bar")
-
-        object = Marshal.send(@method, Marshal.dump(source_object), freeze: true)
+      it "returns frozen object responding to #marshal_dump and #marshal_load" do
+        object = Marshal.send(@method, Marshal.dump(UserMarshal.new), freeze: true)
         object.should.frozen?
       end
 
-      describe "when called with a proc" do
-        it "call the proc with frozen objects" do
-          arr = []
-          s = 'hi'
-          s.instance_variable_set(:@foo, 5)
-          st = Struct.new("Brittle", :a).new
-          st.instance_variable_set(:@clue, 'none')
-          st.a = 0.0
-          h = Hash.new('def')
-          h['nine'] = 9
-          a = [:a, :b, :c]
-          a.instance_variable_set(:@two, 2)
-          obj = [s, 10, s, s, st, a]
-          obj.instance_variable_set(:@zoo, 'ant')
-          proc = Proc.new { |o| arr << o; o}
-
-          Marshal.send(
-            @method,
-            "\x04\bI[\vI\"\ahi\a:\x06EF:\t@fooi\ni\x0F@\x06@\x06IS:\x14Struct::Brittle\x06:\x06af\x060\x06:\n@clueI\"\tnone\x06;\x00FI[\b;\b:\x06b:\x06c\x06:\t@twoi\a\x06:\t@zooI\"\bant\x06;\x00F",
-            proc,
-            freeze: true,
-          )
-
-          arr.should == [
-            false, 5, "hi", 10, "hi", "hi", 0.0, false, "none", st,
-            :b, :c, 2, a, false, "ant", ["hi", 10, "hi", "hi", st, [:a, :b, :c]],
-          ]
-
-          arr.each do |v|
-            v.should.frozen?
-          end
-
-          Struct.send(:remove_const, :Brittle)
-        end
+      it "returns frozen object extended by a module" do
+        object = Object.new
+        object.extend(MarshalSpec::ModuleToExtendBy)
 
-        it "does not freeze the object returned by the proc" do
-          string = Marshal.send(@method, Marshal.dump("foo"), proc { |o| o.upcase }, freeze: true)
-          string.should == "FOO"
-          string.should_not.frozen?
-        end
+        object = Marshal.send(@method, Marshal.dump(object), freeze: true)
+        object.should.frozen?
       end
     end
-  end
 
-  describe "when called with a proc" do
-    ruby_bug "#18141", ""..."3.1" do
-      it "call the proc with fully initialized strings" do
-        utf8_string = "foo".encode(Encoding::UTF_8)
-        Marshal.send(@method, Marshal.dump(utf8_string), proc { |arg|
-          if arg.is_a?(String)
-            arg.should == utf8_string
-            arg.encoding.should == Encoding::UTF_8
-          end
-          arg
-        })
-      end
-
-      it "no longer mutate the object after it was passed to the proc" do
-        string = Marshal.load(Marshal.dump("foo"), :freeze.to_proc)
-        string.should.frozen?
-      end
+    it "does not call freeze method" do
+      object = MarshalSpec::ObjectWithFreezeRaisingException.new
+      object = Marshal.send(@method, Marshal.dump(object), freeze: true)
+      object.should.frozen?
     end
 
-    ruby_bug "#19427", ""..."3.3" do
-      it "call the proc with extended objects" do
-        objs = []
-        obj = Marshal.load("\x04\be:\x0FEnumerableo:\vObject\x00", Proc.new { |o| objs << o; o })
-        objs.should == [obj]
-      end
+    it "returns frozen object even if object does not respond to freeze method" do
+      object = MarshalSpec::ObjectWithoutFreeze.new
+      object = Marshal.send(@method, Marshal.dump(object), freeze: true)
+      object.should.frozen?
     end
 
-    it "returns the value of the proc" do
-      Marshal.send(@method, Marshal.dump([1,2]), proc { [3,4] }).should ==  [3,4]
-    end
+    it "returns a frozen object when is an instance of String/Array/Regexp/Hash subclass and has instance variables" do
+      source_object = UserString.new
+      source_object.instance_variable_set(:@foo, "bar")
 
-    ruby_bug "#18141", ""..."3.1" do
-      it "calls the proc for recursively visited data" do
-        a = [1]
-        a << a
-        ret = []
-        Marshal.send(@method, Marshal.dump(a), proc { |arg| ret << arg.inspect; arg })
-        ret[0].should == 1.inspect
-        ret[1].should == a.inspect
-        ret.size.should == 2
-      end
+      object = Marshal.send(@method, Marshal.dump(source_object), freeze: true)
+      object.should.frozen?
+    end
 
-      it "loads an Array with proc" do
+    describe "when called with a proc" do
+      it "call the proc with frozen objects" do
         arr = []
-        s = 'hi'
+        s = +'hi'
         s.instance_variable_set(:@foo, 5)
         st = Struct.new("Brittle", :a).new
         st.instance_variable_set(:@clue, 'none')
@@ -279,16 +193,96 @@
         a.instance_variable_set(:@two, 2)
         obj = [s, 10, s, s, st, a]
         obj.instance_variable_set(:@zoo, 'ant')
-        proc = Proc.new { |o| arr << o.dup; o}
+        proc = Proc.new { |o| arr << o; o}
 
-        Marshal.send(@method, "\x04\bI[\vI\"\ahi\a:\x06EF:\t@fooi\ni\x0F@\x06@\x06IS:\x14Struct::Brittle\x06:\x06af\x060\x06:\n@clueI\"\tnone\x06;\x00FI[\b;\b:\x06b:\x06c\x06:\t@twoi\a\x06:\t@zooI\"\bant\x06;\x00F", proc)
+        Marshal.send(
+          @method,
+          "\x04\bI[\vI\"\ahi\a:\x06EF:\t@fooi\ni\x0F@\x06@\x06IS:\x14Struct::Brittle\x06:\x06af\x060\x06:\n@clueI\"\tnone\x06;\x00FI[\b;\b:\x06b:\x06c\x06:\t@twoi\a\x06:\t@zooI\"\bant\x06;\x00F",
+          proc,
+          freeze: true,
+        )
 
         arr.should == [
           false, 5, "hi", 10, "hi", "hi", 0.0, false, "none", st,
           :b, :c, 2, a, false, "ant", ["hi", 10, "hi", "hi", st, [:a, :b, :c]],
         ]
+
+        arr.each do |v|
+          v.should.frozen?
+        end
+
         Struct.send(:remove_const, :Brittle)
       end
+
+      it "does not freeze the object returned by the proc" do
+        string = Marshal.send(@method, Marshal.dump("foo"), proc { |o| o.upcase }, freeze: true)
+        string.should == "FOO"
+        string.should_not.frozen?
+      end
+    end
+  end
+
+  describe "when called with a proc" do
+    it "call the proc with fully initialized strings" do
+      utf8_string = "foo".encode(Encoding::UTF_8)
+      Marshal.send(@method, Marshal.dump(utf8_string), proc { |arg|
+        if arg.is_a?(String)
+          arg.should == utf8_string
+          arg.encoding.should == Encoding::UTF_8
+        end
+        arg
+      })
+    end
+
+    it "no longer mutate the object after it was passed to the proc" do
+      string = Marshal.load(Marshal.dump("foo"), :freeze.to_proc)
+      string.should.frozen?
+    end
+
+    ruby_bug "#19427", ""..."3.3" do
+      it "call the proc with extended objects" do
+        objs = []
+        obj = Marshal.load("\x04\be:\x0FEnumerableo:\vObject\x00", Proc.new { |o| objs << o; o })
+        objs.should == [obj]
+      end
+    end
+
+    it "returns the value of the proc" do
+      Marshal.send(@method, Marshal.dump([1,2]), proc { [3,4] }).should ==  [3,4]
+    end
+
+    it "calls the proc for recursively visited data" do
+      a = [1]
+      a << a
+      ret = []
+      Marshal.send(@method, Marshal.dump(a), proc { |arg| ret << arg.inspect; arg })
+      ret[0].should == 1.inspect
+      ret[1].should == a.inspect
+      ret.size.should == 2
+    end
+
+    it "loads an Array with proc" do
+      arr = []
+      s = +'hi'
+      s.instance_variable_set(:@foo, 5)
+      st = Struct.new("Brittle", :a).new
+      st.instance_variable_set(:@clue, 'none')
+      st.a = 0.0
+      h = Hash.new('def')
+      h['nine'] = 9
+      a = [:a, :b, :c]
+      a.instance_variable_set(:@two, 2)
+      obj = [s, 10, s, s, st, a]
+      obj.instance_variable_set(:@zoo, 'ant')
+      proc = Proc.new { |o| arr << o.dup; o}
+
+      Marshal.send(@method, "\x04\bI[\vI\"\ahi\a:\x06EF:\t@fooi\ni\x0F@\x06@\x06IS:\x14Struct::Brittle\x06:\x06af\x060\x06:\n@clueI\"\tnone\x06;\x00FI[\b;\b:\x06b:\x06c\x06:\t@twoi\a\x06:\t@zooI\"\bant\x06;\x00F", proc)
+
+      arr.should == [
+        false, 5, "hi", 10, "hi", "hi", 0.0, false, "none", st,
+        :b, :c, 2, a, false, "ant", ["hi", 10, "hi", "hi", st, [:a, :b, :c]],
+      ]
+      Struct.send(:remove_const, :Brittle)
     end
   end
 
@@ -364,39 +358,37 @@
     end
   end
 
-  ruby_bug "#18141", ""..."3.1" do
-    it "loads an array containing objects having _dump method, and with proc" do
-      arr = []
-      myproc = Proc.new { |o| arr << o.dup; o }
-      o1 = UserDefined.new;
-      o2 = UserDefinedWithIvar.new
-      obj = [o1, o2, o1, o2]
+  it "loads an array containing objects having _dump method, and with proc" do
+    arr = []
+    myproc = Proc.new { |o| arr << o.dup; o }
+    o1 = UserDefined.new;
+    o2 = UserDefinedWithIvar.new
+    obj = [o1, o2, o1, o2]
 
-      Marshal.send(@method, "\x04\b[\tu:\x10UserDefined\x18\x04\b[\aI\"\nstuff\x06:\x06EF@\x06u:\x18UserDefinedWithIvar>\x04\b[\bI\"\nstuff\a:\x06EF:\t@foo:\x18UserDefinedWithIvarI\"\tmore\x06;\x00F@\a@\x06@\a", myproc)
+    Marshal.send(@method, "\x04\b[\tu:\x10UserDefined\x18\x04\b[\aI\"\nstuff\x06:\x06EF@\x06u:\x18UserDefinedWithIvar>\x04\b[\bI\"\nstuff\a:\x06EF:\t@foo:\x18UserDefinedWithIvarI\"\tmore\x06;\x00F@\a@\x06@\a", myproc)
 
-      arr[0].should == o1
-      arr[1].should == o2
-      arr[2].should == obj
-      arr.size.should == 3
-    end
+    arr[0].should == o1
+    arr[1].should == o2
+    arr[2].should == obj
+    arr.size.should == 3
+  end
 
-    it "loads an array containing objects having marshal_dump method, and with proc" do
-      arr = []
-      proc = Proc.new { |o| arr << o.dup; o }
-      o1 = UserMarshal.new
-      o2 = UserMarshalWithIvar.new
+  it "loads an array containing objects having marshal_dump method, and with proc" do
+    arr = []
+    proc = Proc.new { |o| arr << o.dup; o }
+    o1 = UserMarshal.new
+    o2 = UserMarshalWithIvar.new
 
-      Marshal.send(@method, "\004\b[\tU:\020UserMarshal\"\nstuffU:\030UserMarshalWithIvar[\006\"\fmy data@\006@\b", proc)
+    Marshal.send(@method, "\004\b[\tU:\020UserMarshal\"\nstuffU:\030UserMarshalWithIvar[\006\"\fmy data@\006@\b", proc)
 
-      arr[0].should == 'stuff'
-      arr[1].should == o1
-      arr[2].should == 'my data'
-      arr[3].should == ['my data']
-      arr[4].should == o2
-      arr[5].should == [o1, o2, o1, o2]
+    arr[0].should == 'stuff'
+    arr[1].should == o1
+    arr[2].should == 'my data'
+    arr[3].should == ['my data']
+    arr[4].should == o2
+    arr[5].should == [o1, o2, o1, o2]
 
-      arr.size.should == 6
-    end
+    arr.size.should == 6
   end
 
   it "assigns classes to nested subclasses of Array correctly" do
@@ -413,13 +405,13 @@
   end
 
   it "raises a TypeError with bad Marshal version" do
-    marshal_data = '\xff\xff'
+    marshal_data = +'\xff\xff'
     marshal_data[0] = (Marshal::MAJOR_VERSION).chr
     marshal_data[1] = (Marshal::MINOR_VERSION + 1).chr
 
     -> { Marshal.send(@method, marshal_data) }.should raise_error(TypeError)
 
-    marshal_data = '\xff\xff'
+    marshal_data = +'\xff\xff'
     marshal_data[0] = (Marshal::MAJOR_VERSION - 1).chr
     marshal_data[1] = (Marshal::MINOR_VERSION).chr
 
@@ -470,7 +462,7 @@
     end
 
     it "loads an array having ivar" do
-      s = 'well'
+      s = +'well'
       s.instance_variable_set(:@foo, 10)
       obj = ['5', s, 'hi'].extend(Meths, MethsMore)
       obj.instance_variable_set(:@mix, s)
@@ -516,7 +508,7 @@
     end
 
     it "preserves hash ivars when hash contains a string having ivar" do
-      s = 'string'
+      s = +'string'
       s.instance_variable_set :@string_ivar, 'string ivar'
       h = { key: s }
       h.instance_variable_set :@hash_ivar, 'hash ivar'
@@ -526,28 +518,26 @@
       unmarshalled[:key].instance_variable_get(:@string_ivar).should == 'string ivar'
     end
 
-    ruby_version_is "3.1" do
-      it "preserves compare_by_identity behaviour" do
-        h = { a: 1 }
-        h.compare_by_identity
-        unmarshalled = Marshal.send(@method, Marshal.dump(h))
-        unmarshalled.should.compare_by_identity?
+    it "preserves compare_by_identity behaviour" do
+      h = { a: 1 }
+      h.compare_by_identity
+      unmarshalled = Marshal.send(@method, Marshal.dump(h))
+      unmarshalled.should.compare_by_identity?
 
-        h = { a: 1 }
-        unmarshalled = Marshal.send(@method, Marshal.dump(h))
-        unmarshalled.should_not.compare_by_identity?
-      end
+      h = { a: 1 }
+      unmarshalled = Marshal.send(@method, Marshal.dump(h))
+      unmarshalled.should_not.compare_by_identity?
+    end
 
-      it "preserves compare_by_identity behaviour for a Hash subclass" do
-        h = UserHash.new({ a: 1 })
-        h.compare_by_identity
-        unmarshalled = Marshal.send(@method, Marshal.dump(h))
-        unmarshalled.should.compare_by_identity?
+    it "preserves compare_by_identity behaviour for a Hash subclass" do
+      h = UserHash.new({ a: 1 })
+      h.compare_by_identity
+      unmarshalled = Marshal.send(@method, Marshal.dump(h))
+      unmarshalled.should.compare_by_identity?
 
-        h = UserHash.new({ a: 1 })
-        unmarshalled = Marshal.send(@method, Marshal.dump(h))
-        unmarshalled.should_not.compare_by_identity?
-      end
+      h = UserHash.new({ a: 1 })
+      unmarshalled = Marshal.send(@method, Marshal.dump(h))
+      unmarshalled.should_not.compare_by_identity?
     end
 
     it "allocates an instance of the proper class when Hash subclass with compare_by_identity behaviour" do
@@ -600,7 +590,7 @@
     end
 
     it "loads a binary encoded Symbol" do
-      s = "\u2192".force_encoding("binary").to_sym
+      s = "\u2192".dup.force_encoding("binary").to_sym
       sym = Marshal.send(@method, "\x04\b:\b\xE2\x86\x92")
       sym.should == s
       sym.encoding.should == Encoding::BINARY
@@ -614,8 +604,8 @@
       value = Marshal.send(@method, dump)
       value.map(&:encoding).should == [Encoding::UTF_8, Encoding::UTF_8]
       expected = [
-        "€a".force_encoding(Encoding::UTF_8).to_sym,
-        "€b".force_encoding(Encoding::UTF_8).to_sym
+        "€a".dup.force_encoding(Encoding::UTF_8).to_sym,
+        "€b".dup.force_encoding(Encoding::UTF_8).to_sym
       ]
       value.should == expected
 
@@ -635,7 +625,7 @@
 
   describe "for a String" do
     it "loads a string having ivar with ref to self" do
-      obj = 'hi'
+      obj = +'hi'
       obj.instance_variable_set(:@self, obj)
       Marshal.send(@method, "\004\bI\"\ahi\006:\n@self@\000").should == obj
     end
@@ -663,7 +653,7 @@ def io.binmode; raise "binmode"; end
     end
 
     it "loads a US-ASCII String" do
-      str = "abc".force_encoding("us-ascii")
+      str = "abc".dup.force_encoding("us-ascii")
       data = "\x04\bI\"\babc\x06:\x06EF"
       result = Marshal.send(@method, data)
       result.should == str
@@ -671,7 +661,7 @@ def io.binmode; raise "binmode"; end
     end
 
     it "loads a UTF-8 String" do
-      str = "\x6d\xc3\xb6\x68\x72\x65".force_encoding("utf-8")
+      str = "\x6d\xc3\xb6\x68\x72\x65".dup.force_encoding("utf-8")
       data = "\x04\bI\"\vm\xC3\xB6hre\x06:\x06ET"
       result = Marshal.send(@method, data)
       result.should == str
@@ -679,7 +669,7 @@ def io.binmode; raise "binmode"; end
     end
 
     it "loads a String in another encoding" do
-      str = "\x6d\x00\xf6\x00\x68\x00\x72\x00\x65\x00".force_encoding("utf-16le")
+      str = "\x6d\x00\xf6\x00\x68\x00\x72\x00\x65\x00".dup.force_encoding("utf-16le")
       data = "\x04\bI\"\x0Fm\x00\xF6\x00h\x00r\x00e\x00\x06:\rencoding\"\rUTF-16LE"
       result = Marshal.send(@method, data)
       result.should == str
@@ -687,8 +677,8 @@ def io.binmode; raise "binmode"; end
     end
 
     it "loads a String as BINARY if no encoding is specified at the end" do
-      str = "\xC3\xB8".force_encoding("BINARY")
-      data = "\x04\b\"\a\xC3\xB8".force_encoding("UTF-8")
+      str = "\xC3\xB8".dup.force_encoding("BINARY")
+      data = "\x04\b\"\a\xC3\xB8".dup.force_encoding("UTF-8")
       result = Marshal.send(@method, data)
       result.encoding.should == Encoding::BINARY
       result.should == str
@@ -749,6 +739,32 @@ def io.binmode; raise "binmode"; end
     end
   end
 
+  describe "for a Data" do
+    it "loads a Data" do
+      obj = MarshalSpec::DataSpec::Measure.new(100, 'km')
+      dumped = "\x04\bS:#MarshalSpec::DataSpec::Measure\a:\vamountii:\tunit\"\akm"
+      Marshal.dump(obj).should == dumped
+
+      Marshal.send(@method, dumped).should == obj
+    end
+
+    it "loads an extended Data" do
+      obj = MarshalSpec::DataSpec::MeasureExtended.new(100, "km")
+      dumped = "\x04\bS:+MarshalSpec::DataSpec::MeasureExtended\a:\vamountii:\tunit\"\akm"
+      Marshal.dump(obj).should == dumped
+
+      Marshal.send(@method, dumped).should == obj
+    end
+
+    it "returns a frozen object" do
+      obj = MarshalSpec::DataSpec::Measure.new(100, 'km')
+      dumped = "\x04\bS:#MarshalSpec::DataSpec::Measure\a:\vamountii:\tunit\"\akm"
+      Marshal.dump(obj).should == dumped
+
+      Marshal.send(@method, dumped).should.frozen?
+    end
+  end
+
   describe "for an Exception" do
     it "loads a marshalled exception with no message" do
       obj = Exception.new
@@ -823,7 +839,7 @@ def io.binmode; raise "binmode"; end
     end
 
     it "loads an Object with a non-US-ASCII instance variable" do
-      ivar = "@é".force_encoding(Encoding::UTF_8).to_sym
+      ivar = "@é".dup.force_encoding(Encoding::UTF_8).to_sym
       obj = Marshal.send(@method, "\x04\bo:\vObject\x06I:\b@\xC3\xA9\x06:\x06ETi\x06")
       obj.instance_variables.should == [ivar]
       obj.instance_variables[0].encoding.should == Encoding::UTF_8
@@ -1049,7 +1065,7 @@ def io.binmode; raise "binmode"; end
   end
 
   describe "for a Bignum" do
-    platform_is wordsize: 64 do
+    platform_is c_long_size: 64 do
       context "that is Bignum on 32-bit platforms but Fixnum on 64-bit" do
         it "dumps a Fixnum" do
           val = Marshal.send(@method, "\004\bl+\ab:wU")
diff --git a/spec/ruby/core/matchdata/begin_spec.rb b/spec/ruby/core/matchdata/begin_spec.rb
index 85c454da562d35..54b4e0a33fe47b 100644
--- a/spec/ruby/core/matchdata/begin_spec.rb
+++ b/spec/ruby/core/matchdata/begin_spec.rb
@@ -36,6 +36,18 @@
       match_data = /(.)(.)(\d+)(\d)/.match("THX1138.")
       match_data.begin(obj).should == 2
     end
+
+    it "raises IndexError if index is out of bounds" do
+      match_data = /(?<f>foo)(?<b>bar)/.match("foobar")
+
+      -> {
+        match_data.begin(-1)
+      }.should raise_error(IndexError, "index -1 out of matches")
+
+      -> {
+        match_data.begin(3)
+      }.should raise_error(IndexError, "index 3 out of matches")
+    end
   end
 
   context "when passed a String argument" do
@@ -68,6 +80,14 @@
       match_data = /(?<æ>.)(.)(?<b>\d+)(\d)/.match("THX1138.")
       match_data.begin("æ").should == 1
     end
+
+    it "raises IndexError if there is no group with the provided name" do
+      match_data = /(?<f>foo)(?<b>bar)/.match("foobar")
+
+      -> {
+        match_data.begin("y")
+      }.should raise_error(IndexError, "undefined group name reference: y")
+    end
   end
 
   context "when passed a Symbol argument" do
@@ -100,5 +120,13 @@
       match_data = /(?<æ>.)(.)(?<b>\d+)(\d)/.match("THX1138.")
       match_data.begin(:æ).should == 1
     end
+
+    it "raises IndexError if there is no group with the provided name" do
+      match_data = /(?<f>foo)(?<b>bar)/.match("foobar")
+
+      -> {
+        match_data.begin(:y)
+      }.should raise_error(IndexError, "undefined group name reference: y")
+    end
   end
 end
diff --git a/spec/ruby/core/matchdata/byteoffset_spec.rb b/spec/ruby/core/matchdata/byteoffset_spec.rb
index 60360978349238..fb8f5fb67d4e6a 100644
--- a/spec/ruby/core/matchdata/byteoffset_spec.rb
+++ b/spec/ruby/core/matchdata/byteoffset_spec.rb
@@ -1,95 +1,93 @@
 require_relative '../../spec_helper'
 
 describe "MatchData#byteoffset" do
-  ruby_version_is "3.2" do
-    it "returns beginning and ending byte-based offset of whole matched substring for 0 element" do
-      m = /(.)(.)(\d+)(\d)/.match("THX1138.")
-      m.byteoffset(0).should == [1, 7]
-    end
+  it "returns beginning and ending byte-based offset of whole matched substring for 0 element" do
+    m = /(.)(.)(\d+)(\d)/.match("THX1138.")
+    m.byteoffset(0).should == [1, 7]
+  end
 
-    it "returns beginning and ending byte-based offset of n-th match, all the subsequent elements are capturing groups" do
-      m = /(.)(.)(\d+)(\d)/.match("THX1138.")
+  it "returns beginning and ending byte-based offset of n-th match, all the subsequent elements are capturing groups" do
+    m = /(.)(.)(\d+)(\d)/.match("THX1138.")
 
-      m.byteoffset(2).should == [2, 3]
-      m.byteoffset(3).should == [3, 6]
-      m.byteoffset(4).should == [6, 7]
-    end
+    m.byteoffset(2).should == [2, 3]
+    m.byteoffset(3).should == [3, 6]
+    m.byteoffset(4).should == [6, 7]
+  end
 
-    it "accepts String as a reference to a named capture" do
-      m = /(?<f>foo)(?<b>bar)/.match("foobar")
+  it "accepts String as a reference to a named capture" do
+    m = /(?<f>foo)(?<b>bar)/.match("foobar")
 
-      m.byteoffset("f").should == [0, 3]
-      m.byteoffset("b").should == [3, 6]
-    end
+    m.byteoffset("f").should == [0, 3]
+    m.byteoffset("b").should == [3, 6]
+  end
 
-    it "accepts Symbol as a reference to a named capture" do
-      m = /(?<f>foo)(?<b>bar)/.match("foobar")
+  it "accepts Symbol as a reference to a named capture" do
+    m = /(?<f>foo)(?<b>bar)/.match("foobar")
 
-      m.byteoffset(:f).should == [0, 3]
-      m.byteoffset(:b).should == [3, 6]
-    end
+    m.byteoffset(:f).should == [0, 3]
+    m.byteoffset(:b).should == [3, 6]
+  end
 
-    it "returns [nil, nil] if a capturing group is optional and doesn't match" do
-      m = /(?<x>q..)?/.match("foobarbaz")
+  it "returns [nil, nil] if a capturing group is optional and doesn't match" do
+    m = /(?<x>q..)?/.match("foobarbaz")
 
-      m.byteoffset("x").should == [nil, nil]
-      m.byteoffset(1).should == [nil, nil]
-    end
+    m.byteoffset("x").should == [nil, nil]
+    m.byteoffset(1).should == [nil, nil]
+  end
 
-    it "returns correct beginning and ending byte-based offset for multi-byte strings" do
-      m = /\A\u3042(.)(.)?(.)\z/.match("\u3042\u3043\u3044")
+  it "returns correct beginning and ending byte-based offset for multi-byte strings" do
+    m = /\A\u3042(.)(.)?(.)\z/.match("\u3042\u3043\u3044")
 
-      m.byteoffset(1).should == [3, 6]
-      m.byteoffset(3).should == [6, 9]
-    end
+    m.byteoffset(1).should == [3, 6]
+    m.byteoffset(3).should == [6, 9]
+  end
 
-    it "returns [nil, nil] if a capturing group is optional and doesn't match for multi-byte string" do
-      m = /\A\u3042(.)(.)?(.)\z/.match("\u3042\u3043\u3044")
+  it "returns [nil, nil] if a capturing group is optional and doesn't match for multi-byte string" do
+    m = /\A\u3042(.)(.)?(.)\z/.match("\u3042\u3043\u3044")
 
-      m.byteoffset(2).should == [nil, nil]
-    end
+    m.byteoffset(2).should == [nil, nil]
+  end
 
-    it "converts argument into integer if is not String nor Symbol" do
-      m = /(?<f>foo)(?<b>bar)/.match("foobar")
+  it "converts argument into integer if is not String nor Symbol" do
+    m = /(?<f>foo)(?<b>bar)/.match("foobar")
 
-      obj = Object.new
-      def obj.to_int; 2; end
+    obj = Object.new
+    def obj.to_int; 2; end
 
-      m.byteoffset(1r).should == [0, 3]
-      m.byteoffset(1.1).should == [0, 3]
-      m.byteoffset(obj).should == [3, 6]
-    end
+    m.byteoffset(1r).should == [0, 3]
+    m.byteoffset(1.1).should == [0, 3]
+    m.byteoffset(obj).should == [3, 6]
+  end
 
-    it "raises IndexError if there is no group with provided name" do
-      m = /(?<f>foo)(?<b>bar)/.match("foobar")
+  it "raises IndexError if there is no group with the provided name" do
+    m = /(?<f>foo)(?<b>bar)/.match("foobar")
 
-      -> {
-        m.byteoffset("y")
-      }.should raise_error(IndexError, "undefined group name reference: y")
+    -> {
+      m.byteoffset("y")
+    }.should raise_error(IndexError, "undefined group name reference: y")
 
-      -> {
-        m.byteoffset(:y)
-      }.should raise_error(IndexError, "undefined group name reference: y")
-    end
+    -> {
+      m.byteoffset(:y)
+    }.should raise_error(IndexError, "undefined group name reference: y")
+  end
 
-    it "raises IndexError if index is out of matches" do
-      m = /(?<f>foo)(?<b>bar)/.match("foobar")
+  it "raises IndexError if index is out of bounds" do
+    m = /(?<f>foo)(?<b>bar)/.match("foobar")
 
-      -> {
-        m.byteoffset(-1)
-      }.should raise_error(IndexError, "index -1 out of matches")
+    -> {
+      m.byteoffset(-1)
+    }.should raise_error(IndexError, "index -1 out of matches")
 
-      -> {
-        m.byteoffset(3)
-      }.should raise_error(IndexError, "index 3 out of matches")
-    end
+    -> {
+      m.byteoffset(3)
+    }.should raise_error(IndexError, "index 3 out of matches")
+  end
 
-    it "raises TypeError if can't convert argument into Integer" do
-      m = /(?<f>foo)(?<b>bar)/.match("foobar")
+  it "raises TypeError if can't convert argument into Integer" do
+    m = /(?<f>foo)(?<b>bar)/.match("foobar")
 
-      -> {
-        m.byteoffset([])
-      }.should raise_error(TypeError, "no implicit conversion of Array into Integer")
-    end
+    -> {
+      m.byteoffset([])
+    }.should raise_error(TypeError, "no implicit conversion of Array into Integer")
   end
 end
diff --git a/spec/ruby/core/matchdata/deconstruct_keys_spec.rb b/spec/ruby/core/matchdata/deconstruct_keys_spec.rb
index 5b68f886c7cbe4..bf22bc33ff7ade 100644
--- a/spec/ruby/core/matchdata/deconstruct_keys_spec.rb
+++ b/spec/ruby/core/matchdata/deconstruct_keys_spec.rb
@@ -1,65 +1,63 @@
 require_relative '../../spec_helper'
 
 describe "MatchData#deconstruct_keys" do
-  ruby_version_is "3.2" do
-    it "returns whole hash for nil as an argument" do
-      m = /(?<f>foo)(?<b>bar)/.match("foobar")
+  it "returns whole hash for nil as an argument" do
+    m = /(?<f>foo)(?<b>bar)/.match("foobar")
 
-      m.deconstruct_keys(nil).should == { f: "foo", b: "bar" }
-    end
+    m.deconstruct_keys(nil).should == { f: "foo", b: "bar" }
+  end
 
-    it "returns only specified keys" do
-      m = /(?<f>foo)(?<b>bar)/.match("foobar")
+  it "returns only specified keys" do
+    m = /(?<f>foo)(?<b>bar)/.match("foobar")
 
-      m.deconstruct_keys([:f]).should == { f: "foo" }
-    end
+    m.deconstruct_keys([:f]).should == { f: "foo" }
+  end
 
-    it "requires one argument" do
-      m = /l/.match("l")
+  it "requires one argument" do
+    m = /l/.match("l")
 
-      -> {
-        m.deconstruct_keys
-      }.should raise_error(ArgumentError, "wrong number of arguments (given 0, expected 1)")
-    end
+    -> {
+      m.deconstruct_keys
+    }.should raise_error(ArgumentError, "wrong number of arguments (given 0, expected 1)")
+  end
 
-    it "it raises error when argument is neither nil nor array" do
-      m = /(?<f>foo)(?<b>bar)/.match("foobar")
+  it "it raises error when argument is neither nil nor array" do
+    m = /(?<f>foo)(?<b>bar)/.match("foobar")
 
-      -> { m.deconstruct_keys(1) }.should raise_error(TypeError, "wrong argument type Integer (expected Array)")
-      -> { m.deconstruct_keys("asd") }.should raise_error(TypeError, "wrong argument type String (expected Array)")
-      -> { m.deconstruct_keys(:x) }.should raise_error(TypeError, "wrong argument type Symbol (expected Array)")
-      -> { m.deconstruct_keys({}) }.should raise_error(TypeError, "wrong argument type Hash (expected Array)")
-    end
+    -> { m.deconstruct_keys(1) }.should raise_error(TypeError, "wrong argument type Integer (expected Array)")
+    -> { m.deconstruct_keys("asd") }.should raise_error(TypeError, "wrong argument type String (expected Array)")
+    -> { m.deconstruct_keys(:x) }.should raise_error(TypeError, "wrong argument type Symbol (expected Array)")
+    -> { m.deconstruct_keys({}) }.should raise_error(TypeError, "wrong argument type Hash (expected Array)")
+  end
 
-    it "returns {} when passed []" do
-      m = /(?<f>foo)(?<b>bar)/.match("foobar")
+  it "returns {} when passed []" do
+    m = /(?<f>foo)(?<b>bar)/.match("foobar")
 
-      m.deconstruct_keys([]).should == {}
-    end
+    m.deconstruct_keys([]).should == {}
+  end
 
-    it "does not accept non-Symbol keys" do
-      m = /(?<f>foo)(?<b>bar)/.match("foobar")
+  it "does not accept non-Symbol keys" do
+    m = /(?<f>foo)(?<b>bar)/.match("foobar")
 
-      -> {
-        m.deconstruct_keys(['year', :foo])
-      }.should raise_error(TypeError, "wrong argument type String (expected Symbol)")
-    end
+    -> {
+      m.deconstruct_keys(['year', :foo])
+    }.should raise_error(TypeError, "wrong argument type String (expected Symbol)")
+  end
 
-    it "process keys till the first non-existing one" do
-      m = /(?<f>foo)(?<b>bar)(?<c>baz)/.match("foobarbaz")
+  it "process keys till the first non-existing one" do
+    m = /(?<f>foo)(?<b>bar)(?<c>baz)/.match("foobarbaz")
 
-      m.deconstruct_keys([:f, :a, :b]).should == { f: "foo" }
-    end
+    m.deconstruct_keys([:f, :a, :b]).should == { f: "foo" }
+  end
 
-    it "returns {} when there are no named captured groups at all" do
-      m = /foo.+/.match("foobar")
+  it "returns {} when there are no named captured groups at all" do
+    m = /foo.+/.match("foobar")
 
-      m.deconstruct_keys(nil).should == {}
-    end
+    m.deconstruct_keys(nil).should == {}
+  end
 
-    it "returns {} when passed more keys than named captured groups" do
-      m = /(?<f>foo)(?<b>bar)/.match("foobar")
-      m.deconstruct_keys([:f, :b, :c]).should == {}
-    end
+  it "returns {} when passed more keys than named captured groups" do
+    m = /(?<f>foo)(?<b>bar)/.match("foobar")
+    m.deconstruct_keys([:f, :b, :c]).should == {}
   end
 end
diff --git a/spec/ruby/core/matchdata/deconstruct_spec.rb b/spec/ruby/core/matchdata/deconstruct_spec.rb
index 6af55113b68a6f..c55095665df940 100644
--- a/spec/ruby/core/matchdata/deconstruct_spec.rb
+++ b/spec/ruby/core/matchdata/deconstruct_spec.rb
@@ -2,7 +2,5 @@
 require_relative 'shared/captures'
 
 describe "MatchData#deconstruct" do
-  ruby_version_is "3.2" do
-    it_behaves_like :matchdata_captures, :deconstruct
-  end
+  it_behaves_like :matchdata_captures, :deconstruct
 end
diff --git a/spec/ruby/core/matchdata/element_reference_spec.rb b/spec/ruby/core/matchdata/element_reference_spec.rb
index 1be399cfe1ed14..0924be0aaec4cf 100644
--- a/spec/ruby/core/matchdata/element_reference_spec.rb
+++ b/spec/ruby/core/matchdata/element_reference_spec.rb
@@ -20,6 +20,11 @@
     # negative index is larger than the number of match values
     /(.)(.)(\d+)(\d)/.match("THX1138.")[-30, 2].should == nil
 
+    # positive index larger than number of match values
+    /(.)(.)(\d+)(\d)/.match("THX1138.")[5, 2].should == []
+    /(.)(.)(\d+)(\d)/.match("THX1138.")[6, 2].should == nil
+    /(.)(.)(\d+)(\d)/.match("THX1138.")[30, 2].should == nil
+
     # length argument larger than number of match values is capped to match value length
     /(.)(.)(\d+)(\d)/.match("THX1138.")[3, 10].should == %w|113 8|
 
@@ -113,7 +118,7 @@
 
   it "returns matches in the String's encoding" do
     rex = /(?<t>t(?<a>ack))/u
-    md = 'haystack'.force_encoding('euc-jp').match(rex)
+    md = 'haystack'.dup.force_encoding('euc-jp').match(rex)
     md[:t].encoding.should == Encoding::EUC_JP
   end
 end
diff --git a/spec/ruby/core/matchdata/match_length_spec.rb b/spec/ruby/core/matchdata/match_length_spec.rb
index f7785ab1a05298..824f94a3972028 100644
--- a/spec/ruby/core/matchdata/match_length_spec.rb
+++ b/spec/ruby/core/matchdata/match_length_spec.rb
@@ -2,33 +2,31 @@
 
 require_relative '../../spec_helper'
 
-ruby_version_is "3.1" do
-  describe "MatchData#match_length" do
-    it "returns the length of the corresponding match when given an Integer" do
-      md = /(.)(.)(\d+)(\d)/.match("THX1138.")
+describe "MatchData#match_length" do
+  it "returns the length of the corresponding match when given an Integer" do
+    md = /(.)(.)(\d+)(\d)/.match("THX1138.")
 
-      md.match_length(0).should == 6
-      md.match_length(1).should == 1
-      md.match_length(2).should == 1
-      md.match_length(3).should == 3
-      md.match_length(4).should == 1
-    end
+    md.match_length(0).should == 6
+    md.match_length(1).should == 1
+    md.match_length(2).should == 1
+    md.match_length(3).should == 3
+    md.match_length(4).should == 1
+  end
 
-    it "returns nil on non-matching index matches" do
-      md = /\d+(\w)?/.match("THX1138.")
-      md.match_length(1).should == nil
-    end
+  it "returns nil on non-matching index matches" do
+    md = /\d+(\w)?/.match("THX1138.")
+    md.match_length(1).should == nil
+  end
 
-    it "returns the length of the corresponding named match when given a Symbol" do
-      md = 'haystack'.match(/(?<t>t(?<a>ack))/)
-      md.match_length(:a).should == 3
-      md.match_length(:t).should == 4
-    end
+  it "returns the length of the corresponding named match when given a Symbol" do
+    md = 'haystack'.match(/(?<t>t(?<a>ack))/)
+    md.match_length(:a).should == 3
+    md.match_length(:t).should == 4
+  end
 
-    it "returns nil on non-matching index matches" do
-      md = 'haystack'.match(/(?<t>t)(?<a>all)?/)
-      md.match_length(:t).should == 1
-      md.match_length(:a).should == nil
-    end
+  it "returns nil on non-matching index matches" do
+    md = 'haystack'.match(/(?<t>t)(?<a>all)?/)
+    md.match_length(:t).should == 1
+    md.match_length(:a).should == nil
   end
 end
diff --git a/spec/ruby/core/matchdata/match_spec.rb b/spec/ruby/core/matchdata/match_spec.rb
index 545de6f93fe624..a16914ea1587bb 100644
--- a/spec/ruby/core/matchdata/match_spec.rb
+++ b/spec/ruby/core/matchdata/match_spec.rb
@@ -2,33 +2,31 @@
 
 require_relative '../../spec_helper'
 
-ruby_version_is "3.1" do
-  describe "MatchData#match" do
-    it "returns the corresponding match when given an Integer" do
-      md = /(.)(.)(\d+)(\d)/.match("THX1138.")
+describe "MatchData#match" do
+  it "returns the corresponding match when given an Integer" do
+    md = /(.)(.)(\d+)(\d)/.match("THX1138.")
 
-      md.match(0).should == 'HX1138'
-      md.match(1).should == 'H'
-      md.match(2).should == 'X'
-      md.match(3).should == '113'
-      md.match(4).should == '8'
-    end
+    md.match(0).should == 'HX1138'
+    md.match(1).should == 'H'
+    md.match(2).should == 'X'
+    md.match(3).should == '113'
+    md.match(4).should == '8'
+  end
 
-    it "returns nil on non-matching index matches" do
-      md = /\d+(\w)?/.match("THX1138.")
-      md.match(1).should == nil
-    end
+  it "returns nil on non-matching index matches" do
+    md = /\d+(\w)?/.match("THX1138.")
+    md.match(1).should == nil
+  end
 
-    it "returns the corresponding named match when given a Symbol" do
-      md = 'haystack'.match(/(?<t>t(?<a>ack))/)
-      md.match(:a).should == 'ack'
-      md.match(:t).should == 'tack'
-    end
+  it "returns the corresponding named match when given a Symbol" do
+    md = 'haystack'.match(/(?<t>t(?<a>ack))/)
+    md.match(:a).should == 'ack'
+    md.match(:t).should == 'tack'
+  end
 
-    it "returns nil on non-matching index matches" do
-      md = 'haystack'.match(/(?<t>t)(?<a>all)?/)
-      md.match(:t).should == 't'
-      md.match(:a).should == nil
-    end
+  it "returns nil on non-matching index matches" do
+    md = 'haystack'.match(/(?<t>t)(?<a>all)?/)
+    md.match(:t).should == 't'
+    md.match(:a).should == nil
   end
 end
diff --git a/spec/ruby/core/matchdata/post_match_spec.rb b/spec/ruby/core/matchdata/post_match_spec.rb
index b8d1e032eb29ea..7bfe6df119b299 100644
--- a/spec/ruby/core/matchdata/post_match_spec.rb
+++ b/spec/ruby/core/matchdata/post_match_spec.rb
@@ -8,12 +8,12 @@
   end
 
   it "sets the encoding to the encoding of the source String" do
-    str = "abc".force_encoding Encoding::EUC_JP
+    str = "abc".dup.force_encoding Encoding::EUC_JP
     str.match(/b/).post_match.encoding.should equal(Encoding::EUC_JP)
   end
 
   it "sets an empty result to the encoding of the source String" do
-    str = "abc".force_encoding Encoding::ISO_8859_1
+    str = "abc".dup.force_encoding Encoding::ISO_8859_1
     str.match(/c/).post_match.encoding.should equal(Encoding::ISO_8859_1)
   end
 
diff --git a/spec/ruby/core/matchdata/pre_match_spec.rb b/spec/ruby/core/matchdata/pre_match_spec.rb
index 741cb6e9236f56..2f1ba9b8f64702 100644
--- a/spec/ruby/core/matchdata/pre_match_spec.rb
+++ b/spec/ruby/core/matchdata/pre_match_spec.rb
@@ -8,12 +8,12 @@
   end
 
   it "sets the encoding to the encoding of the source String" do
-    str = "abc".force_encoding Encoding::EUC_JP
+    str = "abc".dup.force_encoding Encoding::EUC_JP
     str.match(/b/).pre_match.encoding.should equal(Encoding::EUC_JP)
   end
 
   it "sets an empty result to the encoding of the source String" do
-    str = "abc".force_encoding Encoding::ISO_8859_1
+    str = "abc".dup.force_encoding Encoding::ISO_8859_1
     str.match(/a/).pre_match.encoding.should equal(Encoding::ISO_8859_1)
   end
 
diff --git a/spec/ruby/core/matchdata/string_spec.rb b/spec/ruby/core/matchdata/string_spec.rb
index 420233e1f39b2a..952e95331849c1 100644
--- a/spec/ruby/core/matchdata/string_spec.rb
+++ b/spec/ruby/core/matchdata/string_spec.rb
@@ -17,8 +17,9 @@
     md.string.should equal(md.string)
   end
 
-  it "returns a frozen copy of the matched string for gsub(String)" do
-    'he[[o'.gsub!('[', ']')
+  it "returns a frozen copy of the matched string for gsub!(String)" do
+    s = +'he[[o'
+    s.gsub!('[', ']')
     $~.string.should == 'he[[o'
     $~.string.should.frozen?
   end
diff --git a/spec/ruby/core/matchdata/values_at_spec.rb b/spec/ruby/core/matchdata/values_at_spec.rb
index 4fd0bfc42ab327..535719a2ee38c6 100644
--- a/spec/ruby/core/matchdata/values_at_spec.rb
+++ b/spec/ruby/core/matchdata/values_at_spec.rb
@@ -1,6 +1,6 @@
 require_relative '../../spec_helper'
 
-describe "Struct#values_at" do
+describe "MatchData#values_at" do
   # Should be synchronized with core/array/values_at_spec.rb and core/struct/values_at_spec.rb
   #
   # /(.)(.)(\d+)(\d)/.match("THX1138: The Movie").to_a # => ["HX1138", "H", "X", "113", "8"]
@@ -34,7 +34,7 @@
     end
 
     it "supports beginningless Range" do
-      /(.)(.)(\d+)(\d)/.match("THX1138: The Movie").values_at(0..2).should == ["HX1138", "H", "X"]
+      /(.)(.)(\d+)(\d)/.match("THX1138: The Movie").values_at(..2).should == ["HX1138", "H", "X"]
     end
 
     it "returns an empty Array when Range is empty" do
diff --git a/spec/ruby/core/math/atanh_spec.rb b/spec/ruby/core/math/atanh_spec.rb
index 21fb209941af8c..edcb8f2e520316 100644
--- a/spec/ruby/core/math/atanh_spec.rb
+++ b/spec/ruby/core/math/atanh_spec.rb
@@ -1,6 +1,6 @@
 require_relative '../../spec_helper'
-require_relative '../../fixtures/math/common'
-require_relative '../../shared/math/atanh'
+require_relative 'fixtures/common'
+require_relative 'shared/atanh'
 
 describe "Math.atanh" do
   it_behaves_like :math_atanh_base, :atanh, Math
diff --git a/spec/ruby/fixtures/math/common.rb b/spec/ruby/core/math/fixtures/common.rb
similarity index 100%
rename from spec/ruby/fixtures/math/common.rb
rename to spec/ruby/core/math/fixtures/common.rb
diff --git a/spec/ruby/shared/math/atanh.rb b/spec/ruby/core/math/shared/atanh.rb
similarity index 100%
rename from spec/ruby/shared/math/atanh.rb
rename to spec/ruby/core/math/shared/atanh.rb
diff --git a/spec/ruby/core/method/clone_spec.rb b/spec/ruby/core/method/clone_spec.rb
index 3fe4000fb798d7..b0eb5751a992fc 100644
--- a/spec/ruby/core/method/clone_spec.rb
+++ b/spec/ruby/core/method/clone_spec.rb
@@ -1,14 +1,13 @@
 require_relative '../../spec_helper'
-require_relative 'fixtures/classes'
+require_relative 'shared/dup'
 
 describe "Method#clone" do
-  it "returns a copy of the method" do
-    m1 = MethodSpecs::Methods.new.method(:foo)
-    m2 = m1.clone
+  it_behaves_like :method_dup, :clone
 
-    m1.should == m2
-    m1.should_not equal(m2)
-
-    m1.call.should == m2.call
+  it "preserves frozen status" do
+    method = Object.new.method(:method)
+    method.freeze
+    method.frozen?.should == true
+    method.clone.frozen?.should == true
   end
 end
diff --git a/spec/ruby/core/method/dup_spec.rb b/spec/ruby/core/method/dup_spec.rb
new file mode 100644
index 00000000000000..e3e29d8a68bae7
--- /dev/null
+++ b/spec/ruby/core/method/dup_spec.rb
@@ -0,0 +1,15 @@
+require_relative '../../spec_helper'
+require_relative 'shared/dup'
+
+describe "Method#dup" do
+  ruby_version_is "3.4" do
+    it_behaves_like :method_dup, :dup
+
+    it "resets frozen status" do
+      method = Object.new.method(:method)
+      method.freeze
+      method.frozen?.should == true
+      method.dup.frozen?.should == false
+    end
+  end
+end
diff --git a/spec/ruby/core/method/owner_spec.rb b/spec/ruby/core/method/owner_spec.rb
index 05422f1697824e..1cdc4edfa79905 100644
--- a/spec/ruby/core/method/owner_spec.rb
+++ b/spec/ruby/core/method/owner_spec.rb
@@ -24,9 +24,7 @@
     end
   end
 
-  ruby_version_is "3.2" do
-    it "returns the class on which public was called for a private method in ancestor" do
-      MethodSpecs::InheritedMethods::C.new.method(:derp).owner.should == MethodSpecs::InheritedMethods::C
-    end
+  it "returns the class on which public was called for a private method in ancestor" do
+    MethodSpecs::InheritedMethods::C.new.method(:derp).owner.should == MethodSpecs::InheritedMethods::C
   end
 end
diff --git a/spec/ruby/core/method/parameters_spec.rb b/spec/ruby/core/method/parameters_spec.rb
index 0f730fe0135a47..f1c2523cf0c837 100644
--- a/spec/ruby/core/method/parameters_spec.rb
+++ b/spec/ruby/core/method/parameters_spec.rb
@@ -7,6 +7,7 @@ def one_key(a: 1); end
     def one_keyrest(**a); end
 
     def one_keyreq(a:); end
+    def one_nokey(**nil); end
 
     def one_splat_one_req(*a,b); end
     def one_splat_two_req(*a,b,c); end
@@ -15,11 +16,14 @@ def one_splat_one_req_with_block(*a,b,&blk); end
     def one_opt_with_stabby(a=-> b { true }); end
 
     def one_unnamed_splat(*); end
+    def one_unnamed_keyrest(**); end
 
     def one_splat_one_block(*args, &block)
       local_is_not_parameter = {}
     end
 
+    def forward_parameters(...) end
+
     def underscore_parameters(_, _, _ = 1, *_, _:, _: 2, **_, &_); end
 
     define_method(:one_optional_defined_method) {|x = 1|}
@@ -178,6 +182,11 @@ def underscore_parameters(_, _, _ = 1, *_, _:, _: 2, **_, &_); end
     m.parameters.should == [[:keyreq,:a]]
   end
 
+  it "returns [[:nokey]] for a method with a single **nil parameter" do
+    m = MethodSpecs::Methods.instance_method(:one_nokey)
+    m.parameters.should == [[:nokey]]
+  end
+
   it "works with ->(){} as the value of an optional argument" do
     m = MethodSpecs::Methods.instance_method(:one_opt_with_stabby)
     m.parameters.should == [[:opt,:a]]
@@ -224,18 +233,27 @@ def underscore_parameters(_, _, _ = 1, *_, _:, _: 2, **_, &_); end
     m.method(:handled_via_method_missing).parameters.should == [[:rest]]
   end
 
-  ruby_version_is '3.2' do
-    it "adds * rest arg for \"star\" argument" do
-      m = MethodSpecs::Methods.new
-      m.method(:one_unnamed_splat).parameters.should == [[:rest, :*]]
-    end
+  it "adds rest arg with name * for \"star\" argument" do
+    m = MethodSpecs::Methods.new
+    m.method(:one_unnamed_splat).parameters.should == [[:rest, :*]]
+  end
+
+  it "adds keyrest arg with ** as a name for \"double star\" argument" do
+    m = MethodSpecs::Methods.new
+    m.method(:one_unnamed_keyrest).parameters.should == [[:keyrest, :**]]
   end
 
-  ruby_version_is ''...'3.2' do
-    it "adds nameless rest arg for \"star\" argument" do
-      m = MethodSpecs::Methods.new
-      m.method(:one_unnamed_splat).parameters.should == [[:rest]]
+  it "adds block arg with name & for anonymous block argument" do
+    object = Object.new
+    def object.foo(&)
     end
+
+    object.method(:foo).parameters.should == [[:block, :&]]
+  end
+
+  it "returns [:rest, :*], [:keyrest, :**], [:block, :&] for forward parameters operator" do
+    m = MethodSpecs::Methods.new
+    m.method(:forward_parameters).parameters.should == [[:rest, :*], [:keyrest, :**], [:block, :&]]
   end
 
   it "returns the args and block for a splat and block argument" do
diff --git a/spec/ruby/core/method/private_spec.rb b/spec/ruby/core/method/private_spec.rb
index fd550036a31956..e708542b2e9a25 100644
--- a/spec/ruby/core/method/private_spec.rb
+++ b/spec/ruby/core/method/private_spec.rb
@@ -2,27 +2,8 @@
 require_relative 'fixtures/classes'
 
 describe "Method#private?" do
-  ruby_version_is "3.1"..."3.2" do
-    it "returns false when the method is public" do
-      obj = MethodSpecs::Methods.new
-      obj.method(:my_public_method).private?.should == false
-    end
-
-    it "returns false when the method is protected" do
-      obj = MethodSpecs::Methods.new
-      obj.method(:my_protected_method).private?.should == false
-    end
-
-    it "returns true when the method is private" do
-      obj = MethodSpecs::Methods.new
-      obj.method(:my_private_method).private?.should == true
-    end
-  end
-
-  ruby_version_is "3.2" do
-    it "has been removed" do
-      obj = MethodSpecs::Methods.new
-      obj.method(:my_private_method).should_not.respond_to?(:private?)
-    end
+  it "has been removed" do
+    obj = MethodSpecs::Methods.new
+    obj.method(:my_private_method).should_not.respond_to?(:private?)
   end
 end
diff --git a/spec/ruby/core/method/protected_spec.rb b/spec/ruby/core/method/protected_spec.rb
index 8423e8c64c8d3d..f9e422ae3d22bf 100644
--- a/spec/ruby/core/method/protected_spec.rb
+++ b/spec/ruby/core/method/protected_spec.rb
@@ -2,27 +2,8 @@
 require_relative 'fixtures/classes'
 
 describe "Method#protected?" do
-  ruby_version_is "3.1"..."3.2" do
-    it "returns false when the method is public" do
-      obj = MethodSpecs::Methods.new
-      obj.method(:my_public_method).protected?.should == false
-    end
-
-    it "returns true when the method is protected" do
-      obj = MethodSpecs::Methods.new
-      obj.method(:my_protected_method).protected?.should == true
-    end
-
-    it "returns false when the method is private" do
-      obj = MethodSpecs::Methods.new
-      obj.method(:my_private_method).protected?.should == false
-    end
-  end
-
-  ruby_version_is "3.2" do
-    it "has been removed" do
-      obj = MethodSpecs::Methods.new
-      obj.method(:my_protected_method).should_not.respond_to?(:protected?)
-    end
+  it "has been removed" do
+    obj = MethodSpecs::Methods.new
+    obj.method(:my_protected_method).should_not.respond_to?(:protected?)
   end
 end
diff --git a/spec/ruby/core/method/public_spec.rb b/spec/ruby/core/method/public_spec.rb
index 20d0081a27f996..4cb23f4cf191f7 100644
--- a/spec/ruby/core/method/public_spec.rb
+++ b/spec/ruby/core/method/public_spec.rb
@@ -2,27 +2,8 @@
 require_relative 'fixtures/classes'
 
 describe "Method#public?" do
-  ruby_version_is "3.1"..."3.2" do
-    it "returns true when the method is public" do
-      obj = MethodSpecs::Methods.new
-      obj.method(:my_public_method).public?.should == true
-    end
-
-    it "returns false when the method is protected" do
-      obj = MethodSpecs::Methods.new
-      obj.method(:my_protected_method).public?.should == false
-    end
-
-    it "returns false when the method is private" do
-      obj = MethodSpecs::Methods.new
-      obj.method(:my_private_method).public?.should == false
-    end
-  end
-
-  ruby_version_is "3.2" do
-    it "has been removed" do
-      obj = MethodSpecs::Methods.new
-      obj.method(:my_public_method).should_not.respond_to?(:public?)
-    end
+  it "has been removed" do
+    obj = MethodSpecs::Methods.new
+    obj.method(:my_public_method).should_not.respond_to?(:public?)
   end
 end
diff --git a/spec/ruby/core/method/shared/dup.rb b/spec/ruby/core/method/shared/dup.rb
new file mode 100644
index 00000000000000..c74847083f807d
--- /dev/null
+++ b/spec/ruby/core/method/shared/dup.rb
@@ -0,0 +1,32 @@
+describe :method_dup, shared: true do
+  it "returns a copy of self" do
+    a = Object.new.method(:method)
+    b = a.send(@method)
+
+    a.should == b
+    a.should_not equal(b)
+  end
+
+  ruby_version_is "3.4" do
+    it "copies instance variables" do
+      method = Object.new.method(:method)
+      method.instance_variable_set(:@ivar, 1)
+      cl = method.send(@method)
+      cl.instance_variables.should == [:@ivar]
+    end
+
+    it "copies the finalizer" do
+      code = <<-'RUBY'
+        obj = Object.new.method(:method)
+
+        ObjectSpace.define_finalizer(obj, Proc.new { STDOUT.write "finalized\n" })
+
+        obj.clone
+
+        exit 0
+      RUBY
+
+      ruby_exe(code).lines.sort.should == ["finalized\n", "finalized\n"]
+    end
+  end
+end
diff --git a/spec/ruby/core/method/source_location_spec.rb b/spec/ruby/core/method/source_location_spec.rb
index c5b296f6e2a7b0..23d956ebec050a 100644
--- a/spec/ruby/core/method/source_location_spec.rb
+++ b/spec/ruby/core/method/source_location_spec.rb
@@ -11,23 +11,23 @@
   end
 
   it "sets the first value to the path of the file in which the method was defined" do
-    file = @method.source_location.first
+    file = @method.source_location[0]
     file.should be_an_instance_of(String)
     file.should == File.realpath('fixtures/classes.rb', __dir__)
   end
 
   it "sets the last value to an Integer representing the line on which the method was defined" do
-    line = @method.source_location.last
+    line = @method.source_location[1]
     line.should be_an_instance_of(Integer)
     line.should == 5
   end
 
   it "returns the last place the method was defined" do
-    MethodSpecs::SourceLocation.method(:redefined).source_location.last.should == 13
+    MethodSpecs::SourceLocation.method(:redefined).source_location[1].should == 13
   end
 
   it "returns the location of the original method even if it was aliased" do
-    MethodSpecs::SourceLocation.new.method(:aka).source_location.last.should == 17
+    MethodSpecs::SourceLocation.new.method(:aka).source_location[1].should == 17
   end
 
   it "works for methods defined with a block" do
@@ -108,7 +108,13 @@ def f
     c = Class.new do
       eval('def self.m; end', nil, "foo", 100)
     end
-    c.method(:m).source_location.should == ["foo", 100]
+    location = c.method(:m).source_location
+    ruby_version_is(""..."3.5") do
+      location.should == ["foo", 100]
+    end
+    ruby_version_is("3.5") do
+      location.should == ["foo", 100, 0, 100, 15]
+    end
   end
 
   describe "for a Method generated by respond_to_missing?" do
diff --git a/spec/ruby/core/method/super_method_spec.rb b/spec/ruby/core/method/super_method_spec.rb
index f9a18f38785861..c63a7aaa0fc4af 100644
--- a/spec/ruby/core/method/super_method_spec.rb
+++ b/spec/ruby/core/method/super_method_spec.rb
@@ -55,12 +55,10 @@ def overridden; end
     end
   end
 
-  ruby_version_is "2.7.3" do
-    context "after aliasing an inherited method" do
-      it "returns the expected super_method" do
-        method = MethodSpecs::InheritedMethods::C.new.method(:meow)
-        method.super_method.owner.should == MethodSpecs::InheritedMethods::A
-      end
+  context "after aliasing an inherited method" do
+    it "returns the expected super_method" do
+      method = MethodSpecs::InheritedMethods::C.new.method(:meow)
+      method.super_method.owner.should == MethodSpecs::InheritedMethods::A
     end
   end
 end
diff --git a/spec/ruby/core/method/to_proc_spec.rb b/spec/ruby/core/method/to_proc_spec.rb
index 29b7bec2b30790..4993cce2392c81 100644
--- a/spec/ruby/core/method/to_proc_spec.rb
+++ b/spec/ruby/core/method/to_proc_spec.rb
@@ -35,7 +35,7 @@
   end
 
   it "returns a proc that can be used by define_method" do
-    x = 'test'
+    x = +'test'
     to_s = class << x
       define_method :foo, method(:to_s).to_proc
       to_s
diff --git a/spec/ruby/core/method/unbind_spec.rb b/spec/ruby/core/method/unbind_spec.rb
index bdedd513cea20b..0b630e4d883ef6 100644
--- a/spec/ruby/core/method/unbind_spec.rb
+++ b/spec/ruby/core/method/unbind_spec.rb
@@ -27,16 +27,8 @@
       @string.should =~ /MethodSpecs::MyMod/
     end
 
-    ruby_version_is ""..."3.2" do
-      it "returns a String containing the Module the method is referenced from" do
-        @string.should =~ /MethodSpecs::MySub/
-      end
-    end
-
-    ruby_version_is "3.2" do
-      it "returns a String containing the Module the method is referenced from" do
-        @string.should =~ /MethodSpecs::MyMod/
-      end
+    it "returns a String containing the Module the method is referenced from" do
+      @string.should =~ /MethodSpecs::MyMod/
     end
   end
 
diff --git a/spec/ruby/core/module/ancestors_spec.rb b/spec/ruby/core/module/ancestors_spec.rb
index 5e4c1962066a6d..34679575b5dd95 100644
--- a/spec/ruby/core/module/ancestors_spec.rb
+++ b/spec/ruby/core/module/ancestors_spec.rb
@@ -7,10 +7,17 @@
     ModuleSpecs.ancestors.should == [ModuleSpecs]
     ModuleSpecs::Basic.ancestors.should == [ModuleSpecs::Basic]
     ModuleSpecs::Super.ancestors.should == [ModuleSpecs::Super, ModuleSpecs::Basic]
-    ModuleSpecs.without_test_modules(ModuleSpecs::Parent.ancestors).should ==
-      [ModuleSpecs::Parent, Object, Kernel, BasicObject]
-    ModuleSpecs.without_test_modules(ModuleSpecs::Child.ancestors).should ==
-      [ModuleSpecs::Child, ModuleSpecs::Super, ModuleSpecs::Basic, ModuleSpecs::Parent, Object, Kernel, BasicObject]
+    if defined?(Namespace) && Namespace.enabled?
+      ModuleSpecs.without_test_modules(ModuleSpecs::Parent.ancestors).should ==
+        [ModuleSpecs::Parent, Object, Namespace::Loader, Kernel, BasicObject]
+      ModuleSpecs.without_test_modules(ModuleSpecs::Child.ancestors).should ==
+        [ModuleSpecs::Child, ModuleSpecs::Super, ModuleSpecs::Basic, ModuleSpecs::Parent, Object, Namespace::Loader, Kernel, BasicObject]
+    else
+      ModuleSpecs.without_test_modules(ModuleSpecs::Parent.ancestors).should ==
+        [ModuleSpecs::Parent, Object, Kernel, BasicObject]
+      ModuleSpecs.without_test_modules(ModuleSpecs::Child.ancestors).should ==
+        [ModuleSpecs::Child, ModuleSpecs::Super, ModuleSpecs::Basic, ModuleSpecs::Parent, Object, Kernel, BasicObject]
+    end
   end
 
   it "returns only modules and classes" do
@@ -21,6 +28,17 @@ class << ModuleSpecs::Child; self; end.ancestors.should include(ModuleSpecs::Int
     ModuleSpecs::Parent.ancestors.should == ModuleSpecs::Parent.ancestors.uniq
   end
 
+  it "returns a module that is included later into a nested module as well" do
+    m1 = Module.new
+    m2 = Module.new
+    m3 = Module.new do
+      include m2
+    end
+    m2.include m1 # should be after m3 includes m2
+
+    m3.ancestors.should == [m3, m2, m1]
+  end
+
   describe "when called on a singleton class" do
     it "includes the singleton classes of ancestors" do
       parent  = Class.new
diff --git a/spec/ruby/core/module/attr_accessor_spec.rb b/spec/ruby/core/module/attr_accessor_spec.rb
index eea5b4b64b849c..503dccc61ede1d 100644
--- a/spec/ruby/core/module/attr_accessor_spec.rb
+++ b/spec/ruby/core/module/attr_accessor_spec.rb
@@ -1,5 +1,6 @@
 require_relative '../../spec_helper'
 require_relative 'fixtures/classes'
+require_relative 'shared/attr_added'
 
 describe "Module#attr_accessor" do
   it "creates a getter and setter for each given attribute name" do
@@ -106,4 +107,6 @@ class Integer
       1.foobar.should be_nil
     end
   end
+
+  it_behaves_like :module_attr_added, :attr_accessor
 end
diff --git a/spec/ruby/core/module/attr_reader_spec.rb b/spec/ruby/core/module/attr_reader_spec.rb
index 0b6d9967192f8d..37fd537ff5c990 100644
--- a/spec/ruby/core/module/attr_reader_spec.rb
+++ b/spec/ruby/core/module/attr_reader_spec.rb
@@ -1,5 +1,6 @@
 require_relative '../../spec_helper'
 require_relative 'fixtures/classes'
+require_relative 'shared/attr_added'
 
 describe "Module#attr_reader" do
   it "creates a getter for each given attribute name" do
@@ -67,4 +68,6 @@ class TrueClass
       (attr_reader :foo, 'bar').should == [:foo, :bar]
     end
   end
+
+  it_behaves_like :module_attr_added, :attr_reader
 end
diff --git a/spec/ruby/core/module/attr_spec.rb b/spec/ruby/core/module/attr_spec.rb
index 72a6646b1eee2b..2f9f4e26dc54e6 100644
--- a/spec/ruby/core/module/attr_spec.rb
+++ b/spec/ruby/core/module/attr_spec.rb
@@ -1,5 +1,6 @@
 require_relative '../../spec_helper'
 require_relative 'fixtures/classes'
+require_relative 'shared/attr_added'
 
 describe "Module#attr" do
   before :each do
@@ -153,4 +154,6 @@ def initialize
       (attr :qux, true).should == [:qux, :qux=]
     end
   end
+
+  it_behaves_like :module_attr_added, :attr
 end
diff --git a/spec/ruby/core/module/attr_writer_spec.rb b/spec/ruby/core/module/attr_writer_spec.rb
index aaea0ce43f590a..5b863ef88c1624 100644
--- a/spec/ruby/core/module/attr_writer_spec.rb
+++ b/spec/ruby/core/module/attr_writer_spec.rb
@@ -1,5 +1,6 @@
 require_relative '../../spec_helper'
 require_relative 'fixtures/classes'
+require_relative 'shared/attr_added'
 
 describe "Module#attr_writer" do
   it "creates a setter for each given attribute name" do
@@ -77,4 +78,6 @@ class TrueClass
       (attr_writer :foo, 'bar').should == [:foo=, :bar=]
     end
   end
+
+  it_behaves_like :module_attr_added, :attr_writer
 end
diff --git a/spec/ruby/core/module/autoload_spec.rb b/spec/ruby/core/module/autoload_spec.rb
index af04ab26c87405..bba911e75279ca 100644
--- a/spec/ruby/core/module/autoload_spec.rb
+++ b/spec/ruby/core/module/autoload_spec.rb
@@ -1,7 +1,6 @@
 require_relative '../../spec_helper'
 require_relative '../../fixtures/code_loading'
 require_relative 'fixtures/classes'
-require 'thread'
 
 describe "Module#autoload?" do
   it "returns the name of the file that will be autoloaded" do
@@ -343,6 +342,29 @@ module ModuleSpecs::Autoload
     end
   end
 
+  def check_before_during_thread_after(const, &check)
+    before = check.call
+    to_autoload_thread, from_autoload_thread = Queue.new, Queue.new
+    ScratchPad.record -> {
+      from_autoload_thread.push check.call
+      to_autoload_thread.pop
+    }
+    t = Thread.new {
+      in_loading_thread = from_autoload_thread.pop
+      in_other_thread = check.call
+      to_autoload_thread.push :done
+      [in_loading_thread, in_other_thread]
+    }
+    in_loading_thread, in_other_thread = nil
+    begin
+      ModuleSpecs::Autoload.const_get(const)
+    ensure
+      in_loading_thread, in_other_thread = t.value
+    end
+    after = check.call
+    [before, in_loading_thread, in_other_thread, after]
+  end
+
   describe "during the autoload before the constant is assigned" do
     before :each do
       @path = fixture(__FILE__, "autoload_during_autoload.rb")
@@ -351,58 +373,83 @@ module ModuleSpecs::Autoload
       raise unless ModuleSpecs::Autoload.autoload?(:DuringAutoload) == @path
     end
 
-    def check_before_during_thread_after(&check)
-      before = check.call
-      to_autoload_thread, from_autoload_thread = Queue.new, Queue.new
-      ScratchPad.record -> {
-        from_autoload_thread.push check.call
-        to_autoload_thread.pop
-      }
-      t = Thread.new {
-        in_loading_thread = from_autoload_thread.pop
-        in_other_thread = check.call
-        to_autoload_thread.push :done
-        [in_loading_thread, in_other_thread]
-      }
-      in_loading_thread, in_other_thread = nil
-      begin
-        ModuleSpecs::Autoload::DuringAutoload
-      ensure
-        in_loading_thread, in_other_thread = t.value
-      end
-      after = check.call
-      [before, in_loading_thread, in_other_thread, after]
-    end
-
     it "returns nil in autoload thread and 'constant' otherwise for defined?" do
-      results = check_before_during_thread_after {
+      results = check_before_during_thread_after(:DuringAutoload) {
         defined?(ModuleSpecs::Autoload::DuringAutoload)
       }
       results.should == ['constant', nil, 'constant', 'constant']
     end
 
     it "keeps the constant in Module#constants" do
-      results = check_before_during_thread_after {
+      results = check_before_during_thread_after(:DuringAutoload) {
         ModuleSpecs::Autoload.constants(false).include?(:DuringAutoload)
       }
       results.should == [true, true, true, true]
     end
 
     it "returns false in autoload thread and true otherwise for Module#const_defined?" do
-      results = check_before_during_thread_after {
+      results = check_before_during_thread_after(:DuringAutoload) {
         ModuleSpecs::Autoload.const_defined?(:DuringAutoload, false)
       }
       results.should == [true, false, true, true]
     end
 
     it "returns nil in autoload thread and returns the path in other threads for Module#autoload?" do
-      results = check_before_during_thread_after {
+      results = check_before_during_thread_after(:DuringAutoload) {
         ModuleSpecs::Autoload.autoload?(:DuringAutoload)
       }
       results.should == [@path, nil, @path, nil]
     end
   end
 
+  describe "during the autoload after the constant is assigned" do
+    before :each do
+      @path = fixture(__FILE__, "autoload_during_autoload_after_define.rb")
+      ModuleSpecs::Autoload.autoload :DuringAutoloadAfterDefine, @path
+      @autoload_location = [__FILE__, __LINE__ - 1]
+      @const_location = [@path, 2]
+      @remove << :DuringAutoloadAfterDefine
+      raise unless ModuleSpecs::Autoload.autoload?(:DuringAutoloadAfterDefine) == @path
+    end
+
+    it "returns 'constant' in both threads" do
+      results = check_before_during_thread_after(:DuringAutoloadAfterDefine) {
+        defined?(ModuleSpecs::Autoload::DuringAutoloadAfterDefine)
+      }
+      results.should == ['constant', 'constant', 'constant', 'constant']
+    end
+
+    it "Module#constants include the autoloaded in both threads" do
+      results = check_before_during_thread_after(:DuringAutoloadAfterDefine) {
+        ModuleSpecs::Autoload.constants(false).include?(:DuringAutoloadAfterDefine)
+      }
+      results.should == [true, true, true, true]
+    end
+
+    it "Module#const_defined? returns true in both threads" do
+      results = check_before_during_thread_after(:DuringAutoloadAfterDefine) {
+        ModuleSpecs::Autoload.const_defined?(:DuringAutoloadAfterDefine, false)
+      }
+      results.should == [true, true, true, true]
+    end
+
+    it "returns nil in autoload thread and returns the path in other threads for Module#autoload?" do
+      results = check_before_during_thread_after(:DuringAutoloadAfterDefine) {
+        ModuleSpecs::Autoload.autoload?(:DuringAutoloadAfterDefine)
+      }
+      results.should == [@path, nil, @path, nil]
+    end
+
+    ruby_bug("#20188", ""..."3.4") do
+      it "returns the real constant location in autoload thread and returns the autoload location in other threads for Module#const_source_location" do
+        results = check_before_during_thread_after(:DuringAutoloadAfterDefine) {
+          ModuleSpecs::Autoload.const_source_location(:DuringAutoloadAfterDefine)
+        }
+        results.should == [@autoload_location, @const_location, @autoload_location, @const_location]
+      end
+    end
+  end
+
   it "does not remove the constant from Module#constants if load fails and keeps it as an autoload" do
     ModuleSpecs::Autoload.autoload :Fail, @non_existent
 
@@ -439,42 +486,21 @@ def check_before_during_thread_after(&check)
     ScratchPad.recorded.should == [:raise, :raise]
   end
 
-  ruby_version_is "3.1" do
-    it "removes the constant from Module#constants if the loaded file does not define it" do
-      path = fixture(__FILE__, "autoload_o.rb")
-      ScratchPad.record []
-      ModuleSpecs::Autoload.autoload :O, path
-
-      ModuleSpecs::Autoload.const_defined?(:O).should == true
-      ModuleSpecs::Autoload.should have_constant(:O)
-      ModuleSpecs::Autoload.autoload?(:O).should == path
-
-      -> { ModuleSpecs::Autoload::O }.should raise_error(NameError)
-
-      ModuleSpecs::Autoload.const_defined?(:O).should == false
-      ModuleSpecs::Autoload.should_not have_constant(:O)
-      ModuleSpecs::Autoload.autoload?(:O).should == nil
-      -> { ModuleSpecs::Autoload.const_get(:O) }.should raise_error(NameError)
-    end
-  end
-
-  ruby_version_is ""..."3.1" do
-    it "does not remove the constant from Module#constants if the loaded file does not define it, but leaves it as 'undefined'" do
-      path = fixture(__FILE__, "autoload_o.rb")
-      ScratchPad.record []
-      ModuleSpecs::Autoload.autoload :O, path
+  it "removes the constant from Module#constants if the loaded file does not define it" do
+    path = fixture(__FILE__, "autoload_o.rb")
+    ScratchPad.record []
+    ModuleSpecs::Autoload.autoload :O, path
 
-      ModuleSpecs::Autoload.const_defined?(:O).should == true
-      ModuleSpecs::Autoload.should have_constant(:O)
-      ModuleSpecs::Autoload.autoload?(:O).should == path
+    ModuleSpecs::Autoload.const_defined?(:O).should == true
+    ModuleSpecs::Autoload.should have_constant(:O)
+    ModuleSpecs::Autoload.autoload?(:O).should == path
 
-      -> { ModuleSpecs::Autoload::O }.should raise_error(NameError)
+    -> { ModuleSpecs::Autoload::O }.should raise_error(NameError)
 
-      ModuleSpecs::Autoload.const_defined?(:O).should == false
-      ModuleSpecs::Autoload.should have_constant(:O)
-      ModuleSpecs::Autoload.autoload?(:O).should == nil
-      -> { ModuleSpecs::Autoload.const_get(:O) }.should raise_error(NameError)
-    end
+    ModuleSpecs::Autoload.const_defined?(:O).should == false
+    ModuleSpecs::Autoload.should_not have_constant(:O)
+    ModuleSpecs::Autoload.autoload?(:O).should == nil
+    -> { ModuleSpecs::Autoload.const_get(:O) }.should raise_error(NameError)
   end
 
   it "does not try to load the file again if the loaded file did not define the constant" do
@@ -577,78 +603,51 @@ class LexicalScope
       end
     end
 
-    ruby_version_is "3.2" do
-      it "warns once in verbose mode if the constant was defined in a parent scope" do
-        ScratchPad.record -> {
-          ModuleSpecs::DeclaredInCurrentDefinedInParent = :declared_in_current_defined_in_parent
-        }
+    it "warns once in verbose mode if the constant was defined in a parent scope" do
+      ScratchPad.record -> {
+        ModuleSpecs::DeclaredInCurrentDefinedInParent = :declared_in_current_defined_in_parent
+      }
 
-        module ModuleSpecs
-          module Autoload
-            autoload :DeclaredInCurrentDefinedInParent, fixture(__FILE__, "autoload_callback.rb")
-            self.autoload?(:DeclaredInCurrentDefinedInParent).should == fixture(__FILE__, "autoload_callback.rb")
-            const_defined?(:DeclaredInCurrentDefinedInParent).should == true
-
-            -> {
-              DeclaredInCurrentDefinedInParent
-            }.should complain(
-              /Expected .*autoload_callback.rb to define ModuleSpecs::Autoload::DeclaredInCurrentDefinedInParent but it didn't/,
-              verbose: true,
-            )
-
-            -> {
-              DeclaredInCurrentDefinedInParent
-            }.should_not complain(/.*/, verbose: true)
-            self.autoload?(:DeclaredInCurrentDefinedInParent).should == nil
-            const_defined?(:DeclaredInCurrentDefinedInParent).should == false
-            ModuleSpecs.const_defined?(:DeclaredInCurrentDefinedInParent).should == true
-          end
+      module ModuleSpecs
+        module Autoload
+          autoload :DeclaredInCurrentDefinedInParent, fixture(__FILE__, "autoload_callback.rb")
+          self.autoload?(:DeclaredInCurrentDefinedInParent).should == fixture(__FILE__, "autoload_callback.rb")
+          const_defined?(:DeclaredInCurrentDefinedInParent).should == true
+
+          -> {
+            DeclaredInCurrentDefinedInParent
+          }.should complain(
+            /Expected .*autoload_callback.rb to define ModuleSpecs::Autoload::DeclaredInCurrentDefinedInParent but it didn't/,
+            verbose: true,
+          )
+
+          -> {
+            DeclaredInCurrentDefinedInParent
+          }.should_not complain(/.*/, verbose: true)
+          self.autoload?(:DeclaredInCurrentDefinedInParent).should == nil
+          const_defined?(:DeclaredInCurrentDefinedInParent).should == false
+          ModuleSpecs.const_defined?(:DeclaredInCurrentDefinedInParent).should == true
         end
       end
     end
 
-    ruby_version_is "3.1" do
-      it "looks up in parent scope after failed autoload" do
-        @remove << :DeclaredInCurrentDefinedInParent
-        module ModuleSpecs::Autoload
-          ScratchPad.record -> {
-            DeclaredInCurrentDefinedInParent = :declared_in_current_defined_in_parent
-          }
-
-          class LexicalScope
-            autoload :DeclaredInCurrentDefinedInParent, fixture(__FILE__, "autoload_callback.rb")
-            -> { DeclaredInCurrentDefinedInParent }.should_not raise_error(NameError)
-            # Basically, the autoload constant remains in a "undefined" state
-            self.autoload?(:DeclaredInCurrentDefinedInParent).should == nil
-            const_defined?(:DeclaredInCurrentDefinedInParent).should == false
-            -> { const_get(:DeclaredInCurrentDefinedInParent) }.should raise_error(NameError)
-          end
+    it "looks up in parent scope after failed autoload" do
+      @remove << :DeclaredInCurrentDefinedInParent
+      module ModuleSpecs::Autoload
+        ScratchPad.record -> {
+          DeclaredInCurrentDefinedInParent = :declared_in_current_defined_in_parent
+        }
 
-          DeclaredInCurrentDefinedInParent.should == :declared_in_current_defined_in_parent
+        class LexicalScope
+          autoload :DeclaredInCurrentDefinedInParent, fixture(__FILE__, "autoload_callback.rb")
+          -> { DeclaredInCurrentDefinedInParent }.should_not raise_error(NameError)
+          # Basically, the autoload constant remains in a "undefined" state
+          self.autoload?(:DeclaredInCurrentDefinedInParent).should == nil
+          const_defined?(:DeclaredInCurrentDefinedInParent).should == false
+          -> { const_get(:DeclaredInCurrentDefinedInParent) }.should raise_error(NameError)
         end
-      end
-    end
-
-    ruby_version_is ""..."3.1" do
-      it "and fails when finding the undefined autoload constant in the current scope when declared in current and defined in parent" do
-        @remove << :DeclaredInCurrentDefinedInParent
-        module ModuleSpecs::Autoload
-          ScratchPad.record -> {
-            DeclaredInCurrentDefinedInParent = :declared_in_current_defined_in_parent
-          }
 
-          class LexicalScope
-            autoload :DeclaredInCurrentDefinedInParent, fixture(__FILE__, "autoload_callback.rb")
-            -> { DeclaredInCurrentDefinedInParent }.should raise_error(NameError)
-            # Basically, the autoload constant remains in a "undefined" state
-            self.autoload?(:DeclaredInCurrentDefinedInParent).should == nil
-            const_defined?(:DeclaredInCurrentDefinedInParent).should == false
-            self.should have_constant(:DeclaredInCurrentDefinedInParent)
-            -> { const_get(:DeclaredInCurrentDefinedInParent) }.should raise_error(NameError)
-          end
-
-          DeclaredInCurrentDefinedInParent.should == :declared_in_current_defined_in_parent
-        end
+        DeclaredInCurrentDefinedInParent.should == :declared_in_current_defined_in_parent
       end
     end
 
diff --git a/spec/ruby/core/module/const_added_spec.rb b/spec/ruby/core/module/const_added_spec.rb
index f9edda3a074d3d..739be3ead84488 100644
--- a/spec/ruby/core/module/const_added_spec.rb
+++ b/spec/ruby/core/module/const_added_spec.rb
@@ -1,160 +1,236 @@
 require_relative '../../spec_helper'
 require_relative 'fixtures/classes'
+require_relative 'fixtures/const_added'
 
 describe "Module#const_added" do
-  ruby_version_is "3.2" do
-    it "is a private instance method" do
-      Module.should have_private_instance_method(:const_added)
+  it "is a private instance method" do
+    Module.should have_private_instance_method(:const_added)
+  end
+
+  it "returns nil in the default implementation" do
+    Module.new do
+      const_added(:TEST).should == nil
     end
+  end
 
-    it "returns nil in the default implementation" do
-      Module.new do
-        const_added(:TEST).should == nil
+  it "for a class defined with the `class` keyword, const_added runs before inherited" do
+    ScratchPad.record []
+
+    mod = Module.new do
+      def self.const_added(_)
+        ScratchPad << :const_added
       end
     end
 
-    it "is called when a new constant is assigned on self" do
-      ScratchPad.record []
-
-      mod = Module.new do
-        def self.const_added(name)
-          ScratchPad << name
-        end
+    parent = Class.new do
+      def self.inherited(_)
+        ScratchPad << :inherited
       end
+    end
 
-      mod.module_eval(<<-RUBY, __FILE__, __LINE__ + 1)
-        TEST = 1
-      RUBY
+    class mod::C < parent; end
 
-      ScratchPad.recorded.should == [:TEST]
-    end
+    ScratchPad.recorded.should == [:const_added, :inherited]
+  end
 
-    it "is called when a new constant is assigned on self through const_set" do
-      ScratchPad.record []
+  it "the superclass of a class assigned to a constant is set before const_added is called" do
+    ScratchPad.record []
 
-      mod = Module.new do
-        def self.const_added(name)
-          ScratchPad << name
-        end
+    parent = Class.new do
+      def self.const_added(name)
+        ScratchPad << name
+        ScratchPad << const_get(name).superclass
       end
+    end
+
+    class parent::C < parent; end
 
-      mod.const_set(:TEST, 1)
+    ScratchPad.recorded.should == [:C, parent]
+  end
+
+  it "is called when a new constant is assigned on self" do
+    ScratchPad.record []
 
-      ScratchPad.recorded.should == [:TEST]
+    mod = Module.new do
+      def self.const_added(name)
+        ScratchPad << name
+      end
     end
 
-    it "is called when a new module is defined under self" do
-      ScratchPad.record []
+    mod.module_eval(<<-RUBY, __FILE__, __LINE__ + 1)
+      TEST = 1
+    RUBY
 
-      mod = Module.new do
-        def self.const_added(name)
-          ScratchPad << name
-        end
+    ScratchPad.recorded.should == [:TEST]
+  end
+
+  it "is called when a new constant is assigned on self through const_set" do
+    ScratchPad.record []
+
+    mod = Module.new do
+      def self.const_added(name)
+        ScratchPad << name
       end
+    end
 
-      mod.module_eval(<<-RUBY, __FILE__, __LINE__ + 1)
-        module SubModule
-        end
+    mod.const_set(:TEST, 1)
 
-        module SubModule
-        end
-      RUBY
+    ScratchPad.recorded.should == [:TEST]
+  end
 
-      ScratchPad.recorded.should == [:SubModule]
+  it "is called when a new module is defined under self" do
+    ScratchPad.record []
+
+    mod = Module.new do
+      def self.const_added(name)
+        ScratchPad << name
+      end
     end
 
-    it "is called when a new class is defined under self" do
-      ScratchPad.record []
+    mod.module_eval(<<-RUBY, __FILE__, __LINE__ + 1)
+      module SubModule
+      end
+
+      module SubModule
+      end
+    RUBY
+
+    ScratchPad.recorded.should == [:SubModule]
+  end
+
+  it "is called when a new module is defined under a named module (assigned to a constant)" do
+    ScratchPad.record []
+
+    ModuleSpecs::ConstAddedSpecs::NamedModule = Module.new do
+      def self.const_added(name)
+        ScratchPad << name
+      end
 
-      mod = Module.new do
+      module self::A
         def self.const_added(name)
           ScratchPad << name
         end
-      end
 
-      mod.module_eval(<<-RUBY, __FILE__, __LINE__ + 1)
-        class SubClass
+        module self::B
         end
+      end
+    end
 
-        class SubClass
-        end
-      RUBY
+    ScratchPad.recorded.should == [:A, :B]
+  end
+
+  it "is called when a new class is defined under self" do
+    ScratchPad.record []
 
-      ScratchPad.recorded.should == [:SubClass]
+    mod = Module.new do
+      def self.const_added(name)
+        ScratchPad << name
+      end
     end
 
-    it "is called when an autoload is defined" do
-      ScratchPad.record []
+    mod.module_eval(<<-RUBY, __FILE__, __LINE__ + 1)
+      class SubClass
+      end
 
-      mod = Module.new do
-        def self.const_added(name)
-          ScratchPad << name
-        end
+      class SubClass
       end
+    RUBY
 
-      mod.autoload :Autoload, "foo"
-      ScratchPad.recorded.should == [:Autoload]
-    end
+    ScratchPad.recorded.should == [:SubClass]
+  end
+
+  it "is called when a new class is defined under a named module (assigned to a constant)" do
+    ScratchPad.record []
 
-    it "is called with a precise caller location with the line of definition" do
-      ScratchPad.record []
+    ModuleSpecs::ConstAddedSpecs::NamedModuleB = Module.new do
+      def self.const_added(name)
+        ScratchPad << name
+      end
 
-      mod = Module.new do
+      class self::A
         def self.const_added(name)
-          location = caller_locations(1, 1)[0]
-          ScratchPad << location.lineno
+          ScratchPad << name
+        end
+
+        class self::B
         end
       end
+    end
 
-      line = __LINE__
-      mod.module_eval(<<-RUBY, __FILE__, __LINE__ + 1)
-        TEST = 1
+    ScratchPad.recorded.should == [:A, :B]
+  end
 
-        module SubModule
-        end
+  it "is called when an autoload is defined" do
+    ScratchPad.record []
 
-        class SubClass
-        end
-      RUBY
+    mod = Module.new do
+      def self.const_added(name)
+        ScratchPad << name
+      end
+    end
 
-      mod.const_set(:CONST_SET, 1)
+    mod.autoload :Autoload, "foo"
+    ScratchPad.recorded.should == [:Autoload]
+  end
 
-      ScratchPad.recorded.should == [line + 2, line + 4, line + 7, line + 11]
+  it "is called with a precise caller location with the line of definition" do
+    ScratchPad.record []
+
+    mod = Module.new do
+      def self.const_added(name)
+        location = caller_locations(1, 1)[0]
+        ScratchPad << location.lineno
+      end
     end
 
-    it "is called when the constant is already assigned a value" do
-      ScratchPad.record []
+    line = __LINE__
+    mod.module_eval(<<-RUBY, __FILE__, __LINE__ + 1)
+      TEST = 1
 
-      mod = Module.new do
-        def self.const_added(name)
-          ScratchPad.record const_get(name)
-        end
+      module SubModule
       end
 
-      mod.module_eval(<<-RUBY, __FILE__, __LINE__ + 1)
-        TEST = 123
-      RUBY
+      class SubClass
+      end
+    RUBY
 
-      ScratchPad.recorded.should == 123
-    end
+    mod.const_set(:CONST_SET, 1)
 
-    it "records re-definition of existing constants" do
-      ScratchPad.record []
+    ScratchPad.recorded.should == [line + 2, line + 4, line + 7, line + 11]
+  end
 
-      mod = Module.new do
-        def self.const_added(name)
-          ScratchPad << const_get(name)
-        end
+  it "is called when the constant is already assigned a value" do
+    ScratchPad.record []
+
+    mod = Module.new do
+      def self.const_added(name)
+        ScratchPad.record const_get(name)
       end
+    end
+
+    mod.module_eval(<<-RUBY, __FILE__, __LINE__ + 1)
+      TEST = 123
+    RUBY
 
-      -> {
-        mod.module_eval(<<-RUBY, __FILE__, __LINE__ + 1)
-          TEST = 123
-          TEST = 456
-        RUBY
-      }.should complain(/warning: already initialized constant .+::TEST/)
+    ScratchPad.recorded.should == 123
+  end
+
+  it "records re-definition of existing constants" do
+    ScratchPad.record []
 
-      ScratchPad.recorded.should == [123, 456]
+    mod = Module.new do
+      def self.const_added(name)
+        ScratchPad << const_get(name)
+      end
     end
+
+    -> {
+      mod.module_eval(<<-RUBY, __FILE__, __LINE__ + 1)
+        TEST = 123
+        TEST = 456
+      RUBY
+    }.should complain(/warning: already initialized constant .+::TEST/)
+
+    ScratchPad.recorded.should == [123, 456]
   end
 end
diff --git a/spec/ruby/core/module/const_defined_spec.rb b/spec/ruby/core/module/const_defined_spec.rb
index 027cf5a245a550..8b137cd1340c50 100644
--- a/spec/ruby/core/module/const_defined_spec.rb
+++ b/spec/ruby/core/module/const_defined_spec.rb
@@ -65,6 +65,8 @@
     str = "CS_CONSTλ".encode("euc-jp")
     ConstantSpecs.const_set str, 1
     ConstantSpecs.const_defined?(str).should be_true
+  ensure
+    ConstantSpecs.send(:remove_const, str)
   end
 
   it "returns false if the constant is not defined in the receiver, its superclass, or any included modules" do
diff --git a/spec/ruby/core/module/const_get_spec.rb b/spec/ruby/core/module/const_get_spec.rb
index 0233118f4b42c8..4b53cbe7b3fe4e 100644
--- a/spec/ruby/core/module/const_get_spec.rb
+++ b/spec/ruby/core/module/const_get_spec.rb
@@ -131,7 +131,7 @@
   end
 
   it "does read private constants" do
-     ConstantSpecs.const_get(:CS_PRIVATE).should == :cs_private
+    ConstantSpecs.const_get(:CS_PRIVATE).should == :cs_private
   end
 
   it 'does autoload a constant' do
@@ -202,40 +202,60 @@
 
       ConstantSpecs::ContainerA::ChildA::CS_CONST301 = :const301_5
       ConstantSpecs::ContainerA::ChildA.const_get(:CS_CONST301).should == :const301_5
+    ensure
+      ConstantSpecs::ClassA.send(:remove_const, :CS_CONST301)
+      ConstantSpecs::ModuleA.send(:remove_const, :CS_CONST301)
+      ConstantSpecs::ParentA.send(:remove_const, :CS_CONST301)
+      ConstantSpecs::ContainerA::ChildA.send(:remove_const, :CS_CONST301)
     end
 
     it "searches a module included in the immediate class before the superclass" do
       ConstantSpecs::ParentB::CS_CONST302 = :const302_1
       ConstantSpecs::ModuleF::CS_CONST302 = :const302_2
       ConstantSpecs::ContainerB::ChildB.const_get(:CS_CONST302).should == :const302_2
+    ensure
+      ConstantSpecs::ParentB.send(:remove_const, :CS_CONST302)
+      ConstantSpecs::ModuleF.send(:remove_const, :CS_CONST302)
     end
 
     it "searches the superclass before a module included in the superclass" do
       ConstantSpecs::ModuleE::CS_CONST303 = :const303_1
       ConstantSpecs::ParentB::CS_CONST303 = :const303_2
       ConstantSpecs::ContainerB::ChildB.const_get(:CS_CONST303).should == :const303_2
+    ensure
+      ConstantSpecs::ModuleE.send(:remove_const, :CS_CONST303)
+      ConstantSpecs::ParentB.send(:remove_const, :CS_CONST303)
     end
 
     it "searches a module included in the superclass" do
       ConstantSpecs::ModuleA::CS_CONST304 = :const304_1
       ConstantSpecs::ModuleE::CS_CONST304 = :const304_2
       ConstantSpecs::ContainerB::ChildB.const_get(:CS_CONST304).should == :const304_2
+    ensure
+      ConstantSpecs::ModuleA.send(:remove_const, :CS_CONST304)
+      ConstantSpecs::ModuleE.send(:remove_const, :CS_CONST304)
     end
 
     it "searches the superclass chain" do
       ConstantSpecs::ModuleA::CS_CONST305 = :const305
       ConstantSpecs::ContainerB::ChildB.const_get(:CS_CONST305).should == :const305
+    ensure
+      ConstantSpecs::ModuleA.send(:remove_const, :CS_CONST305)
     end
 
     it "returns a toplevel constant when the receiver is a Class" do
       Object::CS_CONST306 = :const306
       ConstantSpecs::ContainerB::ChildB.const_get(:CS_CONST306).should == :const306
+    ensure
+      Object.send(:remove_const, :CS_CONST306)
     end
 
     it "returns a toplevel constant when the receiver is a Module" do
       Object::CS_CONST308 = :const308
       ConstantSpecs.const_get(:CS_CONST308).should == :const308
       ConstantSpecs::ModuleA.const_get(:CS_CONST308).should == :const308
+    ensure
+      Object.send(:remove_const, :CS_CONST308)
     end
 
     it "returns the updated value of a constant" do
@@ -246,6 +266,8 @@
         ConstantSpecs::ClassB::CS_CONST309 = :const309_2
       }.should complain(/already initialized constant/)
       ConstantSpecs::ClassB.const_get(:CS_CONST309).should == :const309_2
+    ensure
+      ConstantSpecs::ClassB.send(:remove_const, :CS_CONST309)
     end
   end
 end
diff --git a/spec/ruby/core/module/const_set_spec.rb b/spec/ruby/core/module/const_set_spec.rb
index 5bdfd7b68f89ec..823768b882a74b 100644
--- a/spec/ruby/core/module/const_set_spec.rb
+++ b/spec/ruby/core/module/const_set_spec.rb
@@ -8,16 +8,23 @@
 
     ConstantSpecs.const_set "CS_CONST402", :const402
     ConstantSpecs.const_get(:CS_CONST402).should == :const402
+  ensure
+    ConstantSpecs.send(:remove_const, :CS_CONST401)
+    ConstantSpecs.send(:remove_const, :CS_CONST402)
   end
 
   it "returns the value set" do
     ConstantSpecs.const_set(:CS_CONST403, :const403).should == :const403
+  ensure
+    ConstantSpecs.send(:remove_const, :CS_CONST403)
   end
 
   it "sets the name of an anonymous module" do
     m = Module.new
     ConstantSpecs.const_set(:CS_CONST1000, m)
     m.name.should == "ConstantSpecs::CS_CONST1000"
+  ensure
+    ConstantSpecs.send(:remove_const, :CS_CONST1000)
   end
 
   it "sets the name of a module scoped by an anonymous module" do
@@ -38,6 +45,8 @@
     b.name.should == "ModuleSpecs_CS3::B"
     c.name.should == "ModuleSpecs_CS3::B::C"
     d.name.should == "ModuleSpecs_CS3::D"
+  ensure
+    Object.send(:remove_const, :ModuleSpecs_CS3)
   end
 
   it "raises a NameError if the name does not start with a capital letter" do
@@ -55,6 +64,8 @@
     ConstantSpecs.const_set("CS_CONST404", :const404).should == :const404
     -> { ConstantSpecs.const_set "Name=", 1 }.should raise_error(NameError)
     -> { ConstantSpecs.const_set "Name?", 1 }.should raise_error(NameError)
+  ensure
+    ConstantSpecs.send(:remove_const, :CS_CONST404)
   end
 
   it "calls #to_str to convert the given name to a String" do
@@ -62,6 +73,8 @@
     name.should_receive(:to_str).and_return("CS_CONST405")
     ConstantSpecs.const_set(name, :const405).should == :const405
     ConstantSpecs::CS_CONST405.should == :const405
+  ensure
+    ConstantSpecs.send(:remove_const, :CS_CONST405)
   end
 
   it "raises a TypeError if conversion to a String by calling #to_str fails" do
diff --git a/spec/ruby/core/module/const_source_location_spec.rb b/spec/ruby/core/module/const_source_location_spec.rb
index ded2aa51d7daed..06b3b215c29921 100644
--- a/spec/ruby/core/module/const_source_location_spec.rb
+++ b/spec/ruby/core/module/const_source_location_spec.rb
@@ -19,40 +19,60 @@
 
       ConstantSpecs::ContainerA::ChildA::CSL_CONST301 = :const301_5
       ConstantSpecs::ContainerA::ChildA.const_source_location(:CSL_CONST301).should == [__FILE__, __LINE__ - 1]
+    ensure
+      ConstantSpecs::ClassA.send(:remove_const, :CSL_CONST301)
+      ConstantSpecs::ModuleA.send(:remove_const, :CSL_CONST301)
+      ConstantSpecs::ParentA.send(:remove_const, :CSL_CONST301)
+      ConstantSpecs::ContainerA::ChildA.send(:remove_const, :CSL_CONST301)
     end
 
     it "searches a path in a module included in the immediate class before the superclass" do
       ConstantSpecs::ParentB::CSL_CONST302 = :const302_1
       ConstantSpecs::ModuleF::CSL_CONST302 = :const302_2
       ConstantSpecs::ContainerB::ChildB.const_source_location(:CSL_CONST302).should == [__FILE__, __LINE__ - 1]
+    ensure
+      ConstantSpecs::ParentB.send(:remove_const, :CSL_CONST302)
+      ConstantSpecs::ModuleF.send(:remove_const, :CSL_CONST302)
     end
 
     it "searches a path in the superclass before a module included in the superclass" do
       ConstantSpecs::ModuleE::CSL_CONST303 = :const303_1
       ConstantSpecs::ParentB::CSL_CONST303 = :const303_2
       ConstantSpecs::ContainerB::ChildB.const_source_location(:CSL_CONST303).should == [__FILE__, __LINE__ - 1]
+    ensure
+      ConstantSpecs::ModuleE.send(:remove_const, :CSL_CONST303)
+      ConstantSpecs::ParentB.send(:remove_const, :CSL_CONST303)
     end
 
     it "searches a path in a module included in the superclass" do
       ConstantSpecs::ModuleA::CSL_CONST304 = :const304_1
       ConstantSpecs::ModuleE::CSL_CONST304 = :const304_2
       ConstantSpecs::ContainerB::ChildB.const_source_location(:CSL_CONST304).should == [__FILE__, __LINE__ - 1]
+    ensure
+      ConstantSpecs::ModuleA.send(:remove_const, :CSL_CONST304)
+      ConstantSpecs::ModuleE.send(:remove_const, :CSL_CONST304)
     end
 
     it "searches a path in the superclass chain" do
       ConstantSpecs::ModuleA::CSL_CONST305 = :const305
       ConstantSpecs::ContainerB::ChildB.const_source_location(:CSL_CONST305).should == [__FILE__, __LINE__ - 1]
+    ensure
+      ConstantSpecs::ModuleA.send(:remove_const, :CSL_CONST305)
     end
 
     it "returns path to a toplevel constant when the receiver is a Class" do
       Object::CSL_CONST306 = :const306
       ConstantSpecs::ContainerB::ChildB.const_source_location(:CSL_CONST306).should == [__FILE__, __LINE__ - 1]
+    ensure
+      Object.send(:remove_const, :CSL_CONST306)
     end
 
     it "returns path to a toplevel constant when the receiver is a Module" do
       Object::CSL_CONST308 = :const308
       ConstantSpecs.const_source_location(:CSL_CONST308).should == [__FILE__, __LINE__ - 1]
       ConstantSpecs::ModuleA.const_source_location(:CSL_CONST308).should == [__FILE__, __LINE__ - 2]
+    ensure
+      Object.send(:remove_const, :CSL_CONST308)
     end
 
     it "returns path to the updated value of a constant" do
@@ -63,6 +83,8 @@
         ConstantSpecs::ClassB::CSL_CONST309 = :const309_2
       }.should complain(/already initialized constant/)
       ConstantSpecs::ClassB.const_source_location(:CSL_CONST309).should == [__FILE__, __LINE__ - 2]
+    ensure
+      ConstantSpecs::ClassB.send(:remove_const, :CSL_CONST309)
     end
   end
 
@@ -207,7 +229,7 @@
   end
 
   it "does search private constants path" do
-     ConstantSpecs.const_source_location(:CS_PRIVATE).should == [@constants_fixture_path, ConstantSpecs::CS_PRIVATE_LINE]
+    ConstantSpecs.const_source_location(:CS_PRIVATE).should == [@constants_fixture_path, ConstantSpecs::CS_PRIVATE_LINE]
   end
 
   it "works for eval with a given line" do
@@ -233,5 +255,17 @@
       line = ConstantSpecs::CONST_LOCATION
       ConstantSpecs.const_source_location('CONST_LOCATION').should == [file, line]
     end
+
+    ruby_bug("#20188", ""..."3.4") do
+      it 'returns the real constant location as soon as it is defined' do
+        file = fixture(__FILE__, 'autoload_const_source_location.rb')
+        ConstantSpecs.autoload :ConstSource, file
+        autoload_location = [__FILE__, __LINE__ - 1]
+
+        ConstantSpecs.const_source_location(:ConstSource).should == autoload_location
+        ConstantSpecs::ConstSource::LOCATION.should == ConstantSpecs.const_source_location(:ConstSource)
+        ConstantSpecs::BEFORE_DEFINE_LOCATION.should == autoload_location
+      end
+    end
   end
 end
diff --git a/spec/ruby/core/module/define_method_spec.rb b/spec/ruby/core/module/define_method_spec.rb
index d742ece6bc6121..c5dfc53764a036 100644
--- a/spec/ruby/core/module/define_method_spec.rb
+++ b/spec/ruby/core/module/define_method_spec.rb
@@ -476,6 +476,9 @@ class DefineMethodSpecClass
       ChildClass = Class.new(ParentClass) { define_method(:foo) { :baz } }
       ParentClass.send :define_method, :foo, ChildClass.instance_method(:foo)
     }.should raise_error(TypeError, /bind argument must be a subclass of ChildClass/)
+  ensure
+    Object.send(:remove_const, :ParentClass)
+    Object.send(:remove_const, :ChildClass)
   end
 
   it "raises a TypeError when an UnboundMethod from one class is defined on an unrelated class" do
@@ -724,7 +727,7 @@ def foo; end
   end
 end
 
-describe "Method#define_method when passed a Method object" do
+describe "Module#define_method when passed a Method object" do
   before :each do
     @klass = Class.new do
       def m(a, b, *c)
@@ -749,7 +752,7 @@ def m(a, b, *c)
   end
 end
 
-describe "Method#define_method when passed an UnboundMethod object" do
+describe "Module#define_method when passed an UnboundMethod object" do
   before :each do
     @klass = Class.new do
       def m(a, b, *c)
@@ -774,7 +777,7 @@ def m(a, b, *c)
   end
 end
 
-describe "Method#define_method when passed a Proc object" do
+describe "Module#define_method when passed a Proc object" do
   describe "and a method is defined inside" do
     it "defines the nested method in the default definee where the Proc was created" do
       prc = nil
@@ -799,7 +802,7 @@ def nested_method_in_proc_for_define_method
   end
 end
 
-describe "Method#define_method when passed a block" do
+describe "Module#define_method when passed a block" do
   describe "behaves exactly like a lambda" do
     it "for return" do
       Class.new do
diff --git a/spec/ruby/core/module/deprecate_constant_spec.rb b/spec/ruby/core/module/deprecate_constant_spec.rb
index aabef934c4b5cc..ec0de6782ffaf5 100644
--- a/spec/ruby/core/module/deprecate_constant_spec.rb
+++ b/spec/ruby/core/module/deprecate_constant_spec.rb
@@ -44,6 +44,15 @@
     end
   end
 
+  ruby_bug '#20900', ''...'3.4' do
+    describe "when removing the deprecated module" do
+      it "warns with a message" do
+        @module.deprecate_constant :PUBLIC1
+        -> { @module.module_eval {remove_const :PUBLIC1} }.should complain(/warning: constant .+::PUBLIC1 is deprecated/)
+      end
+    end
+  end
+
   it "accepts multiple symbols and strings as constant names" do
     @module.deprecate_constant "PUBLIC1", :PUBLIC2
 
diff --git a/spec/ruby/core/module/fixtures/autoload_const_source_location.rb b/spec/ruby/core/module/fixtures/autoload_const_source_location.rb
new file mode 100644
index 00000000000000..ee0e5a689ffeef
--- /dev/null
+++ b/spec/ruby/core/module/fixtures/autoload_const_source_location.rb
@@ -0,0 +1,6 @@
+module ConstantSpecs
+  BEFORE_DEFINE_LOCATION = const_source_location(:ConstSource)
+  module ConstSource
+    LOCATION = Object.const_source_location(name)
+  end
+end
diff --git a/spec/ruby/core/module/fixtures/autoload_during_autoload_after_define.rb b/spec/ruby/core/module/fixtures/autoload_during_autoload_after_define.rb
new file mode 100644
index 00000000000000..a9d886dfd6d8b7
--- /dev/null
+++ b/spec/ruby/core/module/fixtures/autoload_during_autoload_after_define.rb
@@ -0,0 +1,6 @@
+module ModuleSpecs::Autoload
+  class DuringAutoloadAfterDefine
+    block = ScratchPad.recorded
+    ScratchPad.record(block.call)
+  end
+end
diff --git a/spec/ruby/core/module/fixtures/const_added.rb b/spec/ruby/core/module/fixtures/const_added.rb
new file mode 100644
index 00000000000000..0f5baad65db24e
--- /dev/null
+++ b/spec/ruby/core/module/fixtures/const_added.rb
@@ -0,0 +1,4 @@
+module ModuleSpecs
+  module ConstAddedSpecs
+  end
+end
diff --git a/spec/ruby/core/module/fixtures/name.rb b/spec/ruby/core/module/fixtures/name.rb
index fb9e66c309e356..25c74d3944a959 100644
--- a/spec/ruby/core/module/fixtures/name.rb
+++ b/spec/ruby/core/module/fixtures/name.rb
@@ -7,4 +7,7 @@ def name
       Cß.name
     end
   end
+
+  module NameSpecs
+  end
 end
diff --git a/spec/ruby/core/module/fixtures/set_temporary_name.rb b/spec/ruby/core/module/fixtures/set_temporary_name.rb
new file mode 100644
index 00000000000000..901b3b94d122b4
--- /dev/null
+++ b/spec/ruby/core/module/fixtures/set_temporary_name.rb
@@ -0,0 +1,4 @@
+module ModuleSpecs
+  module SetTemporaryNameSpec
+  end
+end
diff --git a/spec/ruby/core/module/include_spec.rb b/spec/ruby/core/module/include_spec.rb
index c073bc31ca0eea..210918b2e7ac6a 100644
--- a/spec/ruby/core/module/include_spec.rb
+++ b/spec/ruby/core/module/include_spec.rb
@@ -44,7 +44,23 @@ def self.append_features(mod)
   end
 
   it "does not raise a TypeError when the argument is an instance of a subclass of Module" do
-    -> { ModuleSpecs::SubclassSpec.include(ModuleSpecs::Subclass.new) }.should_not raise_error(TypeError)
+    class ModuleSpecs::SubclassSpec::AClass
+    end
+    -> { ModuleSpecs::SubclassSpec::AClass.include(ModuleSpecs::Subclass.new) }.should_not raise_error(TypeError)
+  ensure
+    ModuleSpecs::SubclassSpec.send(:remove_const, :AClass)
+  end
+
+  it "raises a TypeError when the argument is a refinement" do
+    refinement = nil
+
+    Module.new do
+      refine String do
+        refinement = self
+      end
+    end
+
+    -> { ModuleSpecs::Basic.include(refinement) }.should raise_error(TypeError, "Cannot include refinement")
   end
 
   it "imports constants to modules and classes" do
@@ -399,6 +415,8 @@ def self.foo
       M.const_set(:FOO, 'm')
       B.foo.should == 'm'
     end
+  ensure
+    ModuleSpecs.send(:remove_const, :ConstUpdated)
   end
 
   it "updates the constant when a module included after a call is later updated" do
@@ -425,6 +443,8 @@ module M
       M.const_set(:FOO, 'm')
       B.foo.should == 'm'
     end
+  ensure
+    ModuleSpecs.send(:remove_const, :ConstLaterUpdated)
   end
 
   it "updates the constant when a module included in another module after a call is later updated" do
@@ -451,6 +471,8 @@ module M
       M.const_set(:FOO, 'm')
       B.foo.should == 'm'
     end
+  ensure
+    ModuleSpecs.send(:remove_const, :ConstModuleLaterUpdated)
   end
 
   it "updates the constant when a nested included module is updated" do
@@ -479,6 +501,8 @@ def self.foo
       N.const_set(:FOO, 'n')
       B.foo.should == 'n'
     end
+  ensure
+    ModuleSpecs.send(:remove_const, :ConstUpdatedNestedIncludeUpdated)
   end
 
   it "updates the constant when a new module is included" do
@@ -503,6 +527,8 @@ def self.foo
       B.include(M)
       B.foo.should == 'm'
     end
+  ensure
+    ModuleSpecs.send(:remove_const, :ConstUpdatedNewInclude)
   end
 
   it "updates the constant when a new module with nested module is included" do
@@ -531,6 +557,8 @@ def self.foo
       B.include M
       B.foo.should == 'n'
     end
+  ensure
+    ModuleSpecs.send(:remove_const, :ConstUpdatedNestedIncluded)
   end
 
   it "overrides a previous super method call" do
@@ -553,6 +581,29 @@ def foo
     c2.include(m)
     c2.new.foo.should == [:c2, :m1]
   end
+
+  it "update a module when a nested module is updated and includes a module on its own" do
+    m1 = Module.new
+    m2 = Module.new do
+      def m2; [:m2]; end
+    end
+    m3 = Module.new do
+      def m3; [:m3]; end
+    end
+    m4 = Module.new do
+      def m4; [:m4]; end
+    end
+    c = Class.new
+
+    c.include(m1)
+    m1.include(m2)
+    m2.include(m3)
+    m3.include(m4)
+
+    c.new.m2.should == [:m2]
+    c.new.m3.should == [:m3]
+    c.new.m4.should == [:m4]
+  end
 end
 
 describe "Module#include?" do
diff --git a/spec/ruby/core/module/instance_method_spec.rb b/spec/ruby/core/module/instance_method_spec.rb
index 8d006e647e210c..182cdf5c54389a 100644
--- a/spec/ruby/core/module/instance_method_spec.rb
+++ b/spec/ruby/core/module/instance_method_spec.rb
@@ -48,11 +48,6 @@
 
     @mod_um.inspect.should =~ /\bbar\b/
     @mod_um.inspect.should =~ /\bModuleSpecs::InstanceMethMod\b/
-
-    ruby_version_is ""..."3.2" do
-      @child_um.inspect.should =~ /\bModuleSpecs::InstanceMethChild\b/
-      @mod_um.inspect.should =~ /\bModuleSpecs::InstanceMethChild\b/
-    end
   end
 
   it "raises a TypeError if the given name is not a String/Symbol" do
diff --git a/spec/ruby/core/module/module_function_spec.rb b/spec/ruby/core/module/module_function_spec.rb
index 1c3ec5471b1292..51f647142e72e0 100644
--- a/spec/ruby/core/module/module_function_spec.rb
+++ b/spec/ruby/core/module/module_function_spec.rb
@@ -38,22 +38,11 @@ def test3() end
     m.respond_to?(:test3).should == false
   end
 
-  ruby_version_is ""..."3.1" do
-    it "returns self" do
-      Module.new do
-        def foo; end
-        module_function(:foo).should equal(self)
-      end
-    end
-  end
-
-  ruby_version_is "3.1" do
-    it "returns argument or arguments if given" do
-      Module.new do
-        def foo; end
-        module_function(:foo).should equal(:foo)
-        module_function(:foo, :foo).should == [:foo, :foo]
-      end
+  it "returns argument or arguments if given" do
+    Module.new do
+      def foo; end
+      module_function(:foo).should equal(:foo)
+      module_function(:foo, :foo).should == [:foo, :foo]
     end
   end
 
@@ -216,19 +205,9 @@ def test2() end
     m.respond_to?(:test2).should == true
   end
 
-  ruby_version_is ""..."3.1" do
-    it "returns self" do
-      Module.new do
-        module_function.should equal(self)
-      end
-    end
-  end
-
-  ruby_version_is "3.1" do
-    it "returns nil" do
-      Module.new do
-        module_function.should equal(nil)
-      end
+  it "returns nil" do
+    Module.new do
+      module_function.should equal(nil)
     end
   end
 
diff --git a/spec/ruby/core/module/name_spec.rb b/spec/ruby/core/module/name_spec.rb
index 0d1f4e24d58729..fd28ee0a33a718 100644
--- a/spec/ruby/core/module/name_spec.rb
+++ b/spec/ruby/core/module/name_spec.rb
@@ -30,6 +30,8 @@ module m::N; end
     m::N.name.should =~ /\A#<Module:0x\h+>::N\z/
     ModuleSpecs::Anonymous::WasAnnon = m::N
     m::N.name.should == "ModuleSpecs::Anonymous::WasAnnon"
+  ensure
+    ModuleSpecs::Anonymous.send(:remove_const, :WasAnnon)
   end
 
   it "may be the repeated in different module objects" do
@@ -76,12 +78,16 @@ module m::Child; end
     m = Module.new
     ModuleSpecs::Anonymous::A = m
     m.name.should == "ModuleSpecs::Anonymous::A"
+  ensure
+    ModuleSpecs::Anonymous.send(:remove_const, :A)
   end
 
   it "is set when assigning to a constant (constant path does not match outer module name)" do
     m = Module.new
     ModuleSpecs::Anonymous::SameChild::A = m
     m.name.should == "ModuleSpecs::Anonymous::Child::A"
+  ensure
+    ModuleSpecs::Anonymous::SameChild.send(:remove_const, :A)
   end
 
   it "is not modified when assigning to a new constant after it has been accessed" do
@@ -90,6 +96,9 @@ module m::Child; end
     m.name.should == "ModuleSpecs::Anonymous::B"
     ModuleSpecs::Anonymous::C = m
     m.name.should == "ModuleSpecs::Anonymous::B"
+  ensure
+    ModuleSpecs::Anonymous.send(:remove_const, :B)
+    ModuleSpecs::Anonymous.send(:remove_const, :C)
   end
 
   it "is not modified when assigned to a different anonymous module" do
@@ -125,6 +134,8 @@ module ModuleSpecs::Anonymous
     m::N = Module.new
     ModuleSpecs::Anonymous::E = m
     m::N.name.should == "ModuleSpecs::Anonymous::E::N"
+  ensure
+    ModuleSpecs::Anonymous.send(:remove_const, :E)
   end
 
   # https://bugs.ruby-lang.org/issues/19681
@@ -138,6 +149,47 @@ module ModuleSpecs::Anonymous
       "ModuleSpecs::Anonymous::StoredInMultiplePlaces::O"
     ]
     valid_names.should include(m::N.name) # You get one of the two, but you don't know which one.
+  ensure
+    ModuleSpecs::Anonymous.send(:remove_const, :StoredInMultiplePlaces)
+  end
+
+  it "is set in #const_added callback when a module defined in the top-level scope" do
+    ruby_exe(<<~RUBY, args: "2>&1").chomp.should == "TEST1\nTEST2"
+      class Module
+        def const_added(name)
+          puts const_get(name).name
+        end
+      end
+
+      # module with name
+      module TEST1
+      end
+
+      # anonymous module
+      TEST2 = Module.new
+    RUBY
+  end
+
+  it "is set in #const_added callback for a nested module when an outer module defined in the top-level scope" do
+    ScratchPad.record []
+
+    ModuleSpecs::NameSpecs::NamedModule = Module.new do
+      def self.const_added(name)
+        ScratchPad << const_get(name).name
+      end
+
+      module self::A
+        def self.const_added(name)
+          ScratchPad << const_get(name).name
+        end
+
+        module self::B
+        end
+      end
+    end
+
+    ScratchPad.recorded.should.one?(/#<Module.+>::A$/)
+    ScratchPad.recorded.should.one?(/#<Module.+>::A::B$/)
   end
 
   it "returns a frozen String" do
diff --git a/spec/ruby/core/module/new_spec.rb b/spec/ruby/core/module/new_spec.rb
index da7f3b87207435..ec521360bd7f84 100644
--- a/spec/ruby/core/module/new_spec.rb
+++ b/spec/ruby/core/module/new_spec.rb
@@ -6,6 +6,10 @@
     Module.new.is_a?(Module).should == true
   end
 
+  it "creates a module without a name" do
+    Module.new.name.should be_nil
+  end
+
   it "creates a new Module and passes it to the provided block" do
     test_mod = nil
     m = Module.new do |mod|
diff --git a/spec/ruby/core/module/prepend_spec.rb b/spec/ruby/core/module/prepend_spec.rb
index 96598e72096c29..71e82c513ea169 100644
--- a/spec/ruby/core/module/prepend_spec.rb
+++ b/spec/ruby/core/module/prepend_spec.rb
@@ -75,6 +75,26 @@ def foo
     foo.call.should == 'm'
   end
 
+  it "updates the optimized method when a prepended module is updated" do
+    out = ruby_exe(<<~RUBY)
+    module M; end
+    class Integer
+      prepend M
+    end
+    l = -> { 1 + 2 }
+    p l.call
+    M.module_eval do
+      def +(o)
+        $called = true
+        super(o)
+      end
+    end
+    p l.call
+    p $called
+    RUBY
+    out.should == "3\n3\ntrue\n"
+  end
+
   it "updates the method when there is a base included method and the prepended module overrides it" do
     base_module = Module.new do
       def foo
@@ -241,6 +261,8 @@ def self.foo
       B.prepend M
       B.foo.should == 'm'
     end
+  ensure
+    ModuleSpecs.send(:remove_const, :ConstUpdatePrepended)
   end
 
   it "updates the constant when a prepended module is updated" do
@@ -261,6 +283,8 @@ def self.foo
       M.const_set(:FOO, 'm')
       B.foo.should == 'm'
     end
+  ensure
+    ModuleSpecs.send(:remove_const, :ConstPrependedUpdated)
   end
 
   it "updates the constant when there is a base included constant and the prepended module overrides it" do
@@ -282,6 +306,8 @@ module M
       A.prepend M
       A.foo.should == 'm'
     end
+  ensure
+    ModuleSpecs.send(:remove_const, :ConstIncludedPrependedOverride)
   end
 
   it "updates the constant when there is a base included constant and the prepended module is later updated" do
@@ -305,6 +331,8 @@ module M
       M.const_set(:FOO, 'm')
       A.foo.should == 'm'
     end
+  ensure
+    ModuleSpecs.send(:remove_const, :ConstIncludedPrependedLaterUpdated)
   end
 
   it "updates the constant when a module prepended after a constant is later updated" do
@@ -328,6 +356,8 @@ def self.foo
       M.const_set(:FOO, 'm')
       B.foo.should == 'm'
     end
+  ensure
+    ModuleSpecs.send(:remove_const, :ConstUpdatedPrependedAfterLaterUpdated)
   end
 
   it "updates the constant when a module is prepended after another and the constant is defined later on that module" do
@@ -352,6 +382,8 @@ module N
       N.const_set(:FOO, 'n')
       A.foo.should == 'n'
     end
+  ensure
+    ModuleSpecs.send(:remove_const, :ConstUpdatedPrependedAfterConstDefined)
   end
 
   it "updates the constant when a module is included in a prepended module and the constant is defined later" do
@@ -379,6 +411,8 @@ module M
       N.const_set(:FOO, 'n')
       A.foo.should == 'n'
     end
+  ensure
+    ModuleSpecs.send(:remove_const, :ConstUpdatedIncludedInPrependedConstDefinedLater)
   end
 
   it "updates the constant when a new module with an included module is prepended" do
@@ -405,6 +439,8 @@ module M
       B.prepend M
       B.foo.should == 'n'
     end
+  ensure
+    ModuleSpecs.send(:remove_const, :ConstUpdatedNewModuleIncludedPrepended)
   end
 
   it "raises a TypeError when the argument is not a Module" do
@@ -412,7 +448,23 @@ module M
   end
 
   it "does not raise a TypeError when the argument is an instance of a subclass of Module" do
-    -> { ModuleSpecs::SubclassSpec.prepend(ModuleSpecs::Subclass.new) }.should_not raise_error(TypeError)
+    class ModuleSpecs::SubclassSpec::AClass
+    end
+    -> { ModuleSpecs::SubclassSpec::AClass.prepend(ModuleSpecs::Subclass.new) }.should_not raise_error(TypeError)
+  ensure
+    ModuleSpecs::SubclassSpec.send(:remove_const, :AClass)
+  end
+
+  it "raises a TypeError when the argument is a refinement" do
+    refinement = nil
+
+    Module.new do
+      refine String do
+        refinement = self
+      end
+    end
+
+    -> { ModuleSpecs::Basic.prepend(refinement) }.should raise_error(TypeError, "Cannot prepend refinement")
   end
 
   it "imports constants" do
@@ -726,6 +778,33 @@ def foo(ary)
     ary.should == [3, 2, 1]
   end
 
+  it "does not prepend a second copy if the module already indirectly exists in the hierarchy" do
+    mod = Module.new do; end
+    submod = Module.new do; end
+    klass = Class.new do; end
+    klass.include(mod)
+    mod.prepend(submod)
+    klass.include(mod)
+
+    klass.ancestors.take(4).should == [klass, submod, mod, Object]
+  end
+
+  # https://bugs.ruby-lang.org/issues/17423
+  describe "when module already exists in ancestor chain" do
+    it "modifies the ancestor chain" do
+      m = Module.new do; end
+      a = Module.new do; end
+      b = Class.new do; end
+
+      b.include(a)
+      a.prepend(m)
+      b.ancestors.take(4).should == [b, m, a, Object]
+
+      b.prepend(m)
+      b.ancestors.take(5).should == [m, b, m, a, Object]
+    end
+  end
+
   describe "called on a module" do
     describe "included into a class"
     it "does not obscure the module's methods from reflective access" do
diff --git a/spec/ruby/core/module/private_spec.rb b/spec/ruby/core/module/private_spec.rb
index ead806637c9c1e..9e1a297eea1d64 100644
--- a/spec/ruby/core/module/private_spec.rb
+++ b/spec/ruby/core/module/private_spec.rb
@@ -38,25 +38,13 @@ class << obj
                   :module_specs_public_method_on_object_for_kernel_private)
   end
 
-  ruby_version_is ""..."3.1" do
-    it "returns self" do
-      (class << Object.new; self; end).class_eval do
-        def foo; end
-        private(:foo).should equal(self)
-        private.should equal(self)
-      end
-    end
-  end
-
-  ruby_version_is "3.1" do
-    it "returns argument or arguments if given" do
-      (class << Object.new; self; end).class_eval do
-        def foo; end
-        private(:foo).should equal(:foo)
-        private([:foo, :foo]).should == [:foo, :foo]
-        private(:foo, :foo).should == [:foo, :foo]
-        private.should equal(nil)
-      end
+  it "returns argument or arguments if given" do
+    (class << Object.new; self; end).class_eval do
+      def foo; end
+      private(:foo).should equal(:foo)
+      private([:foo, :foo]).should == [:foo, :foo]
+      private(:foo, :foo).should == [:foo, :foo]
+      private.should equal(nil)
     end
   end
 
diff --git a/spec/ruby/core/module/protected_spec.rb b/spec/ruby/core/module/protected_spec.rb
index 058d49d751e0ce..9e37223e18112b 100644
--- a/spec/ruby/core/module/protected_spec.rb
+++ b/spec/ruby/core/module/protected_spec.rb
@@ -39,25 +39,13 @@ class << ModuleSpecs::Parent
                   :module_specs_public_method_on_object_for_kernel_protected)
   end
 
-  ruby_version_is ""..."3.1" do
-    it "returns self" do
-      (class << Object.new; self; end).class_eval do
-        def foo; end
-        protected(:foo).should equal(self)
-        protected.should equal(self)
-      end
-    end
-  end
-
-  ruby_version_is "3.1" do
-    it "returns argument or arguments if given" do
-      (class << Object.new; self; end).class_eval do
-        def foo; end
-        protected(:foo).should equal(:foo)
-        protected([:foo, :foo]).should == [:foo, :foo]
-        protected(:foo, :foo).should == [:foo, :foo]
-        protected.should equal(nil)
-      end
+  it "returns argument or arguments if given" do
+    (class << Object.new; self; end).class_eval do
+      def foo; end
+      protected(:foo).should equal(:foo)
+      protected([:foo, :foo]).should == [:foo, :foo]
+      protected(:foo, :foo).should == [:foo, :foo]
+      protected.should equal(nil)
     end
   end
 
diff --git a/spec/ruby/core/module/public_spec.rb b/spec/ruby/core/module/public_spec.rb
index e3b183f228a119..ce31eb5d0e7a6a 100644
--- a/spec/ruby/core/module/public_spec.rb
+++ b/spec/ruby/core/module/public_spec.rb
@@ -27,25 +27,13 @@
                   :module_specs_private_method_on_object_for_kernel_public)
   end
 
-  ruby_version_is ""..."3.1" do
-    it "returns self" do
-      (class << Object.new; self; end).class_eval do
-        def foo; end
-        public(:foo).should equal(self)
-        public.should equal(self)
-      end
-    end
-  end
-
-  ruby_version_is "3.1" do
-    it "returns argument or arguments if given" do
-      (class << Object.new; self; end).class_eval do
-        def foo; end
-        public(:foo).should equal(:foo)
-        public([:foo, :foo]).should == [:foo, :foo]
-        public(:foo, :foo).should == [:foo, :foo]
-        public.should equal(nil)
-      end
+  it "returns argument or arguments if given" do
+    (class << Object.new; self; end).class_eval do
+      def foo; end
+      public(:foo).should equal(:foo)
+      public([:foo, :foo]).should == [:foo, :foo]
+      public(:foo, :foo).should == [:foo, :foo]
+      public.should equal(nil)
     end
   end
 
diff --git a/spec/ruby/core/module/refine_spec.rb b/spec/ruby/core/module/refine_spec.rb
index 11085c325b1325..d219b98825023f 100644
--- a/spec/ruby/core/module/refine_spec.rb
+++ b/spec/ruby/core/module/refine_spec.rb
@@ -243,36 +243,10 @@ def foo; "foo from singleton class"; end
       result.should == "foo from singleton class"
     end
 
-    ruby_version_is ""..."3.2" do
-      it "looks in the included modules for builtin methods" do
-          result = ruby_exe(<<-RUBY)
-          a = Module.new do
-            def /(other) quo(other) end
-          end
-
-          refinement = Module.new do
-            refine Integer do
-              include a
-            end
-          end
-
-          result = nil
-          Module.new do
-            using refinement
-            result = 1 / 2
-          end
-
-          print result.class
-        RUBY
-
-        result.should == 'Rational'
-      end
-    end
-
     it "looks in later included modules of the refined module first" do
       a = Module.new do
         def foo
-         "foo from A"
+          "foo from A"
         end
       end
 
@@ -300,67 +274,6 @@ def foo
       result.should == "foo from IncludeMeLater"
     end
 
-    ruby_version_is ""..."3.1" do
-      it "looks in prepended modules from the refinement first" do
-        refined_class = ModuleSpecs.build_refined_class
-
-        refinement = Module.new do
-          refine refined_class do
-            include ModuleSpecs::IncludedModule
-            prepend ModuleSpecs::PrependedModule
-
-            def foo; "foo from refinement"; end
-          end
-        end
-
-        result = nil
-        Module.new do
-          using refinement
-          result = refined_class.new.foo
-        end
-
-        result.should == "foo from prepended module"
-      end
-
-      it "looks in refinement then" do
-        refined_class = ModuleSpecs.build_refined_class
-
-        refinement = Module.new do
-          refine(refined_class) do
-            include ModuleSpecs::IncludedModule
-
-            def foo; "foo from refinement"; end
-          end
-        end
-
-        result = nil
-        Module.new do
-          using refinement
-          result = refined_class.new.foo
-        end
-
-        result.should == "foo from refinement"
-      end
-
-      it "looks in included modules from the refinement then" do
-        refined_class = ModuleSpecs.build_refined_class
-
-        refinement = Module.new do
-          refine refined_class do
-            include ModuleSpecs::IncludedModule
-          end
-        end
-
-        result = nil
-        Module.new do
-          using refinement
-          result = refined_class.new.foo
-        end
-
-        result.should == "foo from included module"
-      end
-    end
-
     it "looks in the class then" do
       refined_class = ModuleSpecs.build_refined_class
 
@@ -606,30 +519,6 @@ def to_proc(*args)
   end
 
   context "when super is called in a refinement" do
-    ruby_version_is ""..."3.1" do
-      it "looks in the included to refinery module" do
-        refined_class = ModuleSpecs.build_refined_class
-
-        refinement = Module.new do
-          refine refined_class do
-            include ModuleSpecs::IncludedModule
-
-            def foo
-              super
-            end
-          end
-        end
-
-        result = nil
-        Module.new do
-          using refinement
-          result = refined_class.new.foo
-        end
-
-        result.should == "foo from included module"
-      end
-    end
-
     it "looks in the refined class" do
       refined_class = ModuleSpecs.build_refined_class
 
@@ -650,59 +539,6 @@ def foo
       result.should == "foo"
     end
 
-    ruby_version_is ""..."3.1" do
-      it "looks in the refined class from included module" do
-        refined_class = ModuleSpecs.build_refined_class(for_super: true)
-
-        a = Module.new do
-          def foo
-            [:A] + super
-          end
-        end
-
-        refinement = Module.new do
-          refine refined_class do
-            include a
-          end
-        end
-
-        result = nil
-        Module.new do
-          using refinement
-
-          result = refined_class.new.foo
-        end
-
-        result.should == [:A, :C]
-      end
-
-      it "looks in the refined ancestors from included module" do
-        refined_class = ModuleSpecs.build_refined_class(for_super: true)
-        subclass = Class.new(refined_class)
-
-        a = Module.new do
-          def foo
-            [:A] + super
-          end
-        end
-
-        refinement = Module.new do
-          refine refined_class do
-            include a
-          end
-        end
-
-        result = nil
-        Module.new do
-          using refinement
-
-          result = subclass.new.foo
-        end
-
-        result.should == [:A, :C]
-      end
-    end
-
     # super in a method of a refinement invokes the method in the refined
     # class even if there is another refinement which has been activated
     # in the same context.
@@ -763,179 +599,6 @@ def bar
         }.should raise_error(NoMethodError)
       end
     end
-
-    ruby_version_is ""..."3.1" do
-      it "does't have access to active refinements for C from included module" do
-        refined_class = ModuleSpecs.build_refined_class
-
-        a = Module.new do
-          def foo
-            super + bar
-          end
-        end
-
-        refinement = Module.new do
-          refine refined_class do
-            include a
-
-            def bar
-              "bar is not seen from A methods"
-            end
-          end
-        end
-
-        Module.new do
-          using refinement
-          -> {
-            refined_class.new.foo
-          }.should raise_error(NameError) { |e| e.name.should == :bar }
-        end
-      end
-
-      it "does't have access to other active refinements from included module" do
-        refined_class = ModuleSpecs.build_refined_class
-
-        refinement_integer = Module.new do
-          refine Integer do
-            def bar
-              "bar is not seen from A methods"
-            end
-          end
-        end
-
-        a = Module.new do
-          def foo
-            super + 1.bar
-          end
-        end
-
-        refinement = Module.new do
-          refine refined_class do
-            include a
-          end
-        end
-
-        Module.new do
-          using refinement
-          using refinement_integer
-          -> {
-            refined_class.new.foo
-          }.should raise_error(NameError) { |e| e.name.should == :bar }
-        end
-      end
-
-      # https://bugs.ruby-lang.org/issues/16977
-      it "looks in the another active refinement if super called from included modules" do
-        refined_class = ModuleSpecs.build_refined_class(for_super: true)
-
-        a = Module.new do
-          def foo
-            [:A] + super
-          end
-        end
-
-        b = Module.new do
-          def foo
-            [:B] + super
-          end
-        end
-
-        refinement_a = Module.new do
-          refine refined_class do
-            include a
-          end
-        end
-
-        refinement_b = Module.new do
-          refine refined_class do
-            include b
-          end
-        end
-
-        result = nil
-        Module.new do
-          using refinement_a
-          using refinement_b
-          result = refined_class.new.foo
-        end
-
-        result.should == [:B, :A, :C]
-      end
-
-      it "looks in the current active refinement from included modules" do
-        refined_class = ModuleSpecs.build_refined_class(for_super: true)
-
-        a = Module.new do
-          def foo
-            [:A] + super
-          end
-        end
-
-        b = Module.new do
-          def foo
-            [:B] + super
-          end
-        end
-
-        refinement = Module.new do
-          refine refined_class do
-            def foo
-              [:LAST] + super
-            end
-          end
-        end
-
-        refinement_a_b = Module.new do
-          refine refined_class do
-            include a
-            include b
-          end
-        end
-
-        result = nil
-        Module.new do
-          using refinement
-          using refinement_a_b
-          result = refined_class.new.foo
-        end
-
-        result.should == [:B, :A, :LAST, :C]
-      end
-
-      it "looks in the lexical scope refinements before other active refinements" do
-        refined_class = ModuleSpecs.build_refined_class(for_super: true)
-
-        refinement_local = Module.new do
-          refine refined_class do
-            def foo
-              [:LOCAL] + super
-            end
-          end
-        end
-
-        a = Module.new do
-          using refinement_local
-
-          def foo
-            [:A] + super
-          end
-        end
-
-        refinement = Module.new do
-          refine refined_class do
-            include a
-          end
-        end
-
-        result = nil
-        Module.new do
-          using refinement
-          result = refined_class.new.foo
-        end
-
-        result.should == [:A, :LOCAL, :C]
-      end
-    end
   end
 
   it 'and alias aliases a method within a refinement module, but not outside it' do
diff --git a/spec/ruby/core/module/refinements_spec.rb b/spec/ruby/core/module/refinements_spec.rb
index 5648fcbd6f1486..05658a8b0e8083 100644
--- a/spec/ruby/core/module/refinements_spec.rb
+++ b/spec/ruby/core/module/refinements_spec.rb
@@ -1,45 +1,43 @@
 require_relative '../../spec_helper'
 
 describe "Module#refinements" do
-  ruby_version_is "3.2" do
-    it "returns refinements defined in a module" do
-      ScratchPad.record []
-
-      m = Module.new do
-        refine String do
-          ScratchPad << self
-        end
-
-        refine Array do
-          ScratchPad << self
-        end
+  it "returns refinements defined in a module" do
+    ScratchPad.record []
+
+    m = Module.new do
+      refine String do
+        ScratchPad << self
       end
 
-      m.refinements.sort_by(&:object_id).should == ScratchPad.recorded.sort_by(&:object_id)
+      refine Array do
+        ScratchPad << self
+      end
     end
 
-    it "does not return refinements defined in the included module" do
-      ScratchPad.record []
+    m.refinements.sort_by(&:object_id).should == ScratchPad.recorded.sort_by(&:object_id)
+  end
 
-      m1 = Module.new do
-        refine Integer do
-          nil
-        end
+  it "does not return refinements defined in the included module" do
+    ScratchPad.record []
+
+    m1 = Module.new do
+      refine Integer do
+        nil
       end
+    end
 
-      m2 = Module.new do
-        include m1
+    m2 = Module.new do
+      include m1
 
-        refine String do
-          ScratchPad << self
-        end
+      refine String do
+        ScratchPad << self
       end
-
-      m2.refinements.should == ScratchPad.recorded
     end
 
-    it "returns an empty array if no refinements defined in a module" do
-      Module.new.refinements.should == []
-    end
+    m2.refinements.should == ScratchPad.recorded
+  end
+
+  it "returns an empty array if no refinements defined in a module" do
+    Module.new.refinements.should == []
   end
 end
diff --git a/spec/ruby/core/module/remove_const_spec.rb b/spec/ruby/core/module/remove_const_spec.rb
index 0ac23f05a5299b..35a9d65105dc2d 100644
--- a/spec/ruby/core/module/remove_const_spec.rb
+++ b/spec/ruby/core/module/remove_const_spec.rb
@@ -101,5 +101,7 @@ def self.foo
       A.send(:remove_const,:FOO)
       A.foo.should == 'm'
     end
+  ensure
+    ConstantSpecs.send(:remove_const, :RemovedConstantUpdate)
   end
 end
diff --git a/spec/ruby/core/module/ruby2_keywords_spec.rb b/spec/ruby/core/module/ruby2_keywords_spec.rb
index dc16d712c7f6c7..a9afad4aee3820 100644
--- a/spec/ruby/core/module/ruby2_keywords_spec.rb
+++ b/spec/ruby/core/module/ruby2_keywords_spec.rb
@@ -22,7 +22,6 @@ def regular(*args)
     end
 
     h = {a: 1}
-    obj.regular(**h).should.equal?(h)
 
     last = mark(**h).last
     Hash.ruby2_keywords_hash?(last).should == true
@@ -77,122 +76,60 @@ def kwargs(**kw)
     Hash.ruby2_keywords_hash?(marked).should == true
   end
 
-  ruby_version_is "3.2" do
-    it "makes a copy and unmark the Hash when calling a method taking (*args)" do
-      obj = Object.new
-      obj.singleton_class.class_exec do
-        def splat(*args)
-          args.last
-        end
-
-        def splat1(arg, *args)
-          args.last
-        end
+  it "makes a copy and unmark the Hash when calling a method taking (*args)" do
+    obj = Object.new
+    obj.singleton_class.class_exec do
+      def splat(*args)
+        args.last
+      end
 
-        def proc_call(*args)
-          -> *a { a.last }.call(*args)
-        end
+      def splat1(arg, *args)
+        args.last
       end
 
-      h = { a: 1 }
-      args = mark(**h)
-      marked = args.last
-      Hash.ruby2_keywords_hash?(marked).should == true
-
-      after_usage = obj.splat(*args)
-      after_usage.should == h
-      after_usage.should_not.equal?(h)
-      after_usage.should_not.equal?(marked)
-      Hash.ruby2_keywords_hash?(after_usage).should == false
-      Hash.ruby2_keywords_hash?(marked).should == true
-
-      args = mark(1, **h)
-      marked = args.last
-      after_usage = obj.splat1(*args)
-      after_usage.should == h
-      after_usage.should_not.equal?(h)
-      after_usage.should_not.equal?(marked)
-      Hash.ruby2_keywords_hash?(after_usage).should == false
-      Hash.ruby2_keywords_hash?(marked).should == true
-
-      args = mark(**h)
-      marked = args.last
-      after_usage = obj.proc_call(*args)
-      after_usage.should == h
-      after_usage.should_not.equal?(h)
-      after_usage.should_not.equal?(marked)
-      Hash.ruby2_keywords_hash?(after_usage).should == false
-      Hash.ruby2_keywords_hash?(marked).should == true
-
-      args = mark(**h)
-      marked = args.last
-      after_usage = obj.send(:splat, *args)
-      after_usage.should == h
-      after_usage.should_not.equal?(h)
-      after_usage.should_not.equal?(marked)
-      Hash.ruby2_keywords_hash?(after_usage).should == false
-      Hash.ruby2_keywords_hash?(marked).should == true
+      def proc_call(*args)
+        -> *a { a.last }.call(*args)
+      end
     end
-  end
 
-  ruby_version_is ""..."3.2" do
-    # https://bugs.ruby-lang.org/issues/18625
-    it "does NOT copy the Hash when calling a method taking (*args)" do
-      obj = Object.new
-      obj.singleton_class.class_exec do
-        def splat(*args)
-          args.last
-        end
+    h = { a: 1 }
+    args = mark(**h)
+    marked = args.last
+    Hash.ruby2_keywords_hash?(marked).should == true
 
-        def splat1(arg, *args)
-          args.last
-        end
+    after_usage = obj.splat(*args)
+    after_usage.should == h
+    after_usage.should_not.equal?(h)
+    after_usage.should_not.equal?(marked)
+    Hash.ruby2_keywords_hash?(after_usage).should == false
+    Hash.ruby2_keywords_hash?(marked).should == true
 
-        def proc_call(*args)
-          -> *a { a.last }.call(*args)
-        end
-      end
+    args = mark(1, **h)
+    marked = args.last
+    after_usage = obj.splat1(*args)
+    after_usage.should == h
+    after_usage.should_not.equal?(h)
+    after_usage.should_not.equal?(marked)
+    Hash.ruby2_keywords_hash?(after_usage).should == false
+    Hash.ruby2_keywords_hash?(marked).should == true
 
-      h = { a: 1 }
-      args = mark(**h)
-      marked = args.last
-      Hash.ruby2_keywords_hash?(marked).should == true
-
-      after_usage = obj.splat(*args)
-      after_usage.should == h
-      after_usage.should_not.equal?(h)
-      after_usage.should.equal?(marked) # https://bugs.ruby-lang.org/issues/18625
-      Hash.ruby2_keywords_hash?(after_usage).should == true # https://bugs.ruby-lang.org/issues/18625
-      Hash.ruby2_keywords_hash?(marked).should == true
-
-      args = mark(1, **h)
-      marked = args.last
-      after_usage = obj.splat1(*args)
-      after_usage.should == h
-      after_usage.should_not.equal?(h)
-      after_usage.should.equal?(marked) # https://bugs.ruby-lang.org/issues/18625
-      Hash.ruby2_keywords_hash?(after_usage).should == true # https://bugs.ruby-lang.org/issues/18625
-      Hash.ruby2_keywords_hash?(marked).should == true
-
-      args = mark(**h)
-      marked = args.last
-      after_usage = obj.proc_call(*args)
-      after_usage.should == h
-      after_usage.should_not.equal?(h)
-      after_usage.should.equal?(marked) # https://bugs.ruby-lang.org/issues/18625
-      Hash.ruby2_keywords_hash?(after_usage).should == true # https://bugs.ruby-lang.org/issues/18625
-      Hash.ruby2_keywords_hash?(marked).should == true
-
-      args = mark(**h)
-      marked = args.last
-      after_usage = obj.send(:splat, *args)
-      after_usage.should == h
-      after_usage.should_not.equal?(h)
-      send_copies = RUBY_ENGINE == "ruby" # inconsistent with Proc#call above for CRuby
-      after_usage.equal?(marked).should == !send_copies
-      Hash.ruby2_keywords_hash?(after_usage).should == !send_copies
-      Hash.ruby2_keywords_hash?(marked).should == true
-    end
+    args = mark(**h)
+    marked = args.last
+    after_usage = obj.proc_call(*args)
+    after_usage.should == h
+    after_usage.should_not.equal?(h)
+    after_usage.should_not.equal?(marked)
+    Hash.ruby2_keywords_hash?(after_usage).should == false
+    Hash.ruby2_keywords_hash?(marked).should == true
+
+    args = mark(**h)
+    marked = args.last
+    after_usage = obj.send(:splat, *args)
+    after_usage.should == h
+    after_usage.should_not.equal?(h)
+    after_usage.should_not.equal?(marked)
+    Hash.ruby2_keywords_hash?(after_usage).should == false
+    Hash.ruby2_keywords_hash?(marked).should == true
   end
 
   it "applies to the underlying method and applies across aliasing" do
@@ -238,7 +175,7 @@ def foo(*a) end
       obj.singleton_class.class_exec do
         ruby2_keywords :not_existing
       end
-    }.should raise_error(NameError, /undefined method `not_existing'/)
+    }.should raise_error(NameError, /undefined method [`']not_existing'/)
   end
 
   it "accepts String as well" do
diff --git a/spec/ruby/core/module/set_temporary_name_spec.rb b/spec/ruby/core/module/set_temporary_name_spec.rb
index f5886a33988ee1..12c1c214ddf852 100644
--- a/spec/ruby/core/module/set_temporary_name_spec.rb
+++ b/spec/ruby/core/module/set_temporary_name_spec.rb
@@ -1,4 +1,5 @@
 require_relative '../../spec_helper'
+require_relative 'fixtures/set_temporary_name'
 
 ruby_version_is "3.3" do
   describe "Module#set_temporary_name" do
@@ -13,13 +14,34 @@
       m.name.should be_nil
     end
 
+    it "returns self" do
+      m = Module.new
+      m.set_temporary_name("fake_name").should.equal? m
+    end
+
     it "can assign a temporary name which is not a valid constant path" do
       m = Module.new
-      m.set_temporary_name("a::B")
-      m.name.should == "a::B"
+
+      m.set_temporary_name("name")
+      m.name.should == "name"
 
       m.set_temporary_name("Template['foo.rb']")
       m.name.should == "Template['foo.rb']"
+
+      m.set_temporary_name("a::B")
+      m.name.should == "a::B"
+
+      m.set_temporary_name("A::b")
+      m.name.should == "A::b"
+
+      m.set_temporary_name("A::B::")
+      m.name.should == "A::B::"
+
+      m.set_temporary_name("A::::B")
+      m.name.should == "A::::B"
+
+      m.set_temporary_name("A=")
+      m.name.should == "A="
     end
 
     it "can't assign empty string as name" do
@@ -43,7 +65,7 @@
       -> { Object.set_temporary_name("fake_name") }.should raise_error(RuntimeError, "can't change permanent name")
     end
 
-    it "can assign a temporary name to a nested module" do
+    it "can assign a temporary name to a module nested into an anonymous module" do
       m = Module.new
       module m::N; end
       m::N.name.should =~ /\A#<Module:0x\h+>::N\z/
@@ -55,6 +77,17 @@ module m::N; end
       m::N.name.should be_nil
     end
 
+    it "discards a temporary name when an outer anonymous module gets a permanent name" do
+      m = Module.new
+      module m::N; end
+
+      m::N.set_temporary_name("fake_name")
+      m::N.name.should == "fake_name"
+
+      ModuleSpecs::SetTemporaryNameSpec::M = m
+      m::N.name.should == "ModuleSpecs::SetTemporaryNameSpec::M::N"
+    end
+
     it "can update the name when assigned to a constant" do
       m = Module.new
       m::N = Module.new
@@ -64,5 +97,50 @@ module m::N; end
       m::M = m::N
       m::M.name.should =~ /\A#<Module:0x\h+>::M\z/m
     end
+
+    it "can reassign a temporary name repeatedly" do
+      m = Module.new
+
+      m.set_temporary_name("fake_name")
+      m.name.should == "fake_name"
+
+      m.set_temporary_name("fake_name_2")
+      m.name.should == "fake_name_2"
+    end
+
+    ruby_bug "#21094", ""..."3.5" do
+      it "also updates a name of a nested module" do
+        m = Module.new
+        m::N = Module.new
+        m::N.name.should =~ /\A#<Module:0x\h+>::N\z/
+
+        m.set_temporary_name "m"
+        m::N.name.should == "m::N"
+
+        m.set_temporary_name nil
+        m::N.name.should == nil
+      end
+    end
+
+    it "keeps temporary name when assigned in an anonymous module" do
+      outer = Module.new
+      m = Module.new
+      m.set_temporary_name "m"
+      m.name.should == "m"
+      outer::M = m
+      m.name.should == "m"
+      m.inspect.should == "m"
+    end
+
+    it "keeps temporary name when assigned in an anonymous module and nested before" do
+      outer = Module.new
+      m = Module.new
+      outer::A = m
+      m.set_temporary_name "m"
+      m.name.should == "m"
+      outer::M = m
+      m.name.should == "m"
+      m.inspect.should == "m"
+    end
   end
 end
diff --git a/spec/ruby/core/module/shared/attr_added.rb b/spec/ruby/core/module/shared/attr_added.rb
new file mode 100644
index 00000000000000..ce832cdcff2727
--- /dev/null
+++ b/spec/ruby/core/module/shared/attr_added.rb
@@ -0,0 +1,34 @@
+describe :module_attr_added, shared: true do
+  it "calls method_added for normal classes" do
+    ScratchPad.record []
+
+    cls = Class.new do
+      class << self
+        def method_added(name)
+          ScratchPad.recorded << name
+        end
+      end
+    end
+
+    cls.send(@method, :foo)
+
+    ScratchPad.recorded.each {|name| name.to_s.should =~ /foo[=]?/}
+  end
+
+  it "calls singleton_method_added for singleton classes" do
+    ScratchPad.record []
+    cls = Class.new do
+      class << self
+        def singleton_method_added(name)
+          # called for this def so ignore it
+          return if name == :singleton_method_added
+          ScratchPad.recorded << name
+        end
+      end
+    end
+
+    cls.singleton_class.send(@method, :foo)
+
+    ScratchPad.recorded.each {|name| name.to_s.should =~ /foo[=]?/}
+  end
+end
diff --git a/spec/ruby/core/module/to_s_spec.rb b/spec/ruby/core/module/to_s_spec.rb
index 6b1a615ef97f86..83c0ae0825b12d 100644
--- a/spec/ruby/core/module/to_s_spec.rb
+++ b/spec/ruby/core/module/to_s_spec.rb
@@ -51,6 +51,8 @@ module ModuleSpecs::RefinementInspect
 
     ModuleSpecs::RefinementInspect::R.name.should == 'ModuleSpecs::RefinementInspect::R'
     ModuleSpecs::RefinementInspect::R.to_s.should == '#<refinement:String@ModuleSpecs::RefinementInspect>'
+  ensure
+    ModuleSpecs.send(:remove_const, :RefinementInspect)
   end
 
   it 'does not call #inspect or #to_s for singleton classes' do
diff --git a/spec/ruby/core/module/undef_method_spec.rb b/spec/ruby/core/module/undef_method_spec.rb
index c2ad2005361bc9..d4efcd51cbe411 100644
--- a/spec/ruby/core/module/undef_method_spec.rb
+++ b/spec/ruby/core/module/undef_method_spec.rb
@@ -50,7 +50,7 @@ def another_method_to_undef() 1 end
   end
 
   it "raises a NameError when passed a missing name for a module" do
-    -> { @module.send :undef_method, :not_exist }.should raise_error(NameError, /undefined method `not_exist' for module `#{@module}'/) { |e|
+    -> { @module.send :undef_method, :not_exist }.should raise_error(NameError, /undefined method [`']not_exist' for module [`']#{@module}'/) { |e|
       # a NameError and not a NoMethodError
       e.class.should == NameError
     }
@@ -58,7 +58,7 @@ def another_method_to_undef() 1 end
 
   it "raises a NameError when passed a missing name for a class" do
     klass = Class.new
-    -> { klass.send :undef_method, :not_exist }.should raise_error(NameError, /undefined method `not_exist' for class `#{klass}'/) { |e|
+    -> { klass.send :undef_method, :not_exist }.should raise_error(NameError, /undefined method [`']not_exist' for class [`']#{klass}'/) { |e|
       # a NameError and not a NoMethodError
       e.class.should == NameError
     }
@@ -69,8 +69,8 @@ def another_method_to_undef() 1 end
     obj = klass.new
     sclass = obj.singleton_class
 
-    -> { sclass.send :undef_method, :not_exist }.should raise_error(NameError, /undefined method `not_exist' for class `#{sclass}'/) { |e|
-      e.message.should include('`#<Class:#<#<Class:')
+    -> { sclass.send :undef_method, :not_exist }.should raise_error(NameError, /undefined method [`']not_exist' for class [`']#{sclass}'/) { |e|
+      e.message.should =~ /[`']#<Class:#<#<Class:/
 
       # a NameError and not a NoMethodError
       e.class.should == NameError
@@ -79,7 +79,7 @@ def another_method_to_undef() 1 end
 
   it "raises a NameError when passed a missing name for a metaclass" do
     klass = String.singleton_class
-    -> { klass.send :undef_method, :not_exist }.should raise_error(NameError, /undefined method `not_exist' for class `String'/) { |e|
+    -> { klass.send :undef_method, :not_exist }.should raise_error(NameError, /undefined method [`']not_exist' for class [`']String'/) { |e|
       # a NameError and not a NoMethodError
       e.class.should == NameError
     }
diff --git a/spec/ruby/core/module/undefined_instance_methods_spec.rb b/spec/ruby/core/module/undefined_instance_methods_spec.rb
index 3be860d0537829..d33ee93fc11177 100644
--- a/spec/ruby/core/module/undefined_instance_methods_spec.rb
+++ b/spec/ruby/core/module/undefined_instance_methods_spec.rb
@@ -2,25 +2,23 @@
 require_relative 'fixtures/classes'
 
 describe "Module#undefined_instance_methods" do
-  ruby_version_is "3.2" do
-    it "returns methods undefined in the class" do
-      methods = ModuleSpecs::UndefinedInstanceMethods::Parent.undefined_instance_methods
-      methods.should == [:undefed_method]
-    end
+  it "returns methods undefined in the class" do
+    methods = ModuleSpecs::UndefinedInstanceMethods::Parent.undefined_instance_methods
+    methods.should == [:undefed_method]
+  end
 
-    it "returns inherited methods undefined in the class" do
-      methods = ModuleSpecs::UndefinedInstanceMethods::Child.undefined_instance_methods
-      methods.should include(:parent_method, :another_parent_method)
-    end
+  it "returns inherited methods undefined in the class" do
+    methods = ModuleSpecs::UndefinedInstanceMethods::Child.undefined_instance_methods
+    methods.should include(:parent_method, :another_parent_method)
+  end
 
-    it "returns methods from an included module that are undefined in the class" do
-      methods = ModuleSpecs::UndefinedInstanceMethods::Grandchild.undefined_instance_methods
-      methods.should include(:super_included_method)
-    end
+  it "returns methods from an included module that are undefined in the class" do
+    methods = ModuleSpecs::UndefinedInstanceMethods::Grandchild.undefined_instance_methods
+    methods.should include(:super_included_method)
+  end
 
-    it "does not returns ancestors undefined methods" do
-      methods = ModuleSpecs::UndefinedInstanceMethods::Grandchild.undefined_instance_methods
-      methods.should_not include(:parent_method, :another_parent_method)
-    end
+  it "does not returns ancestors undefined methods" do
+    methods = ModuleSpecs::UndefinedInstanceMethods::Grandchild.undefined_instance_methods
+    methods.should_not include(:parent_method, :another_parent_method)
   end
 end
diff --git a/spec/ruby/core/module/used_refinements_spec.rb b/spec/ruby/core/module/used_refinements_spec.rb
index c16cab0e3c38dc..40dd4a444e1a8b 100644
--- a/spec/ruby/core/module/used_refinements_spec.rb
+++ b/spec/ruby/core/module/used_refinements_spec.rb
@@ -1,87 +1,85 @@
 require_relative '../../spec_helper'
 
 describe "Module.used_refinements" do
-  ruby_version_is "3.2" do
-    it "returns list of all refinements imported in the current scope" do
-      refinement_int = nil
-      refinement_str = nil
-      ScratchPad.record []
-
-      m1 = Module.new do
-        refine Integer do
-          refinement_int = self
-        end
+  it "returns list of all refinements imported in the current scope" do
+    refinement_int = nil
+    refinement_str = nil
+    ScratchPad.record []
+
+    m1 = Module.new do
+      refine Integer do
+        refinement_int = self
       end
+    end
 
-      m2 = Module.new do
-        refine String do
-          refinement_str = self
-        end
+    m2 = Module.new do
+      refine String do
+        refinement_str = self
       end
+    end
 
-      Module.new do
-        using m1
-        using m2
+    Module.new do
+      using m1
+      using m2
 
-        Module.used_refinements.each { |r| ScratchPad << r }
-      end
-
-      ScratchPad.recorded.sort_by(&:object_id).should == [refinement_int, refinement_str].sort_by(&:object_id)
+      Module.used_refinements.each { |r| ScratchPad << r }
     end
 
-    it "returns empty array if does not have any refinements imported" do
-      used_refinements = nil
+    ScratchPad.recorded.sort_by(&:object_id).should == [refinement_int, refinement_str].sort_by(&:object_id)
+  end
 
-      Module.new do
-        used_refinements = Module.used_refinements
-      end
+  it "returns empty array if does not have any refinements imported" do
+    used_refinements = nil
 
-      used_refinements.should == []
+    Module.new do
+      used_refinements = Module.used_refinements
     end
 
-    it "ignores refinements imported in a module that is included into the current one" do
-      used_refinements = nil
+    used_refinements.should == []
+  end
 
-      m1 = Module.new do
-        refine Integer do
-          nil
-        end
-      end
+  it "ignores refinements imported in a module that is included into the current one" do
+    used_refinements = nil
 
-      m2 = Module.new do
-        using m1
+    m1 = Module.new do
+      refine Integer do
+        nil
       end
+    end
 
-      Module.new do
-        include m2
+    m2 = Module.new do
+      using m1
+    end
 
-        used_refinements = Module.used_refinements
-      end
+    Module.new do
+      include m2
 
-      used_refinements.should == []
+      used_refinements = Module.used_refinements
     end
 
-    it "returns refinements even not defined directly in a module refinements are imported from" do
-      used_refinements = nil
-      ScratchPad.record []
+    used_refinements.should == []
+  end
 
-      m1 = Module.new do
-        refine Integer do
-          ScratchPad << self
-        end
-      end
+  it "returns refinements even not defined directly in a module refinements are imported from" do
+    used_refinements = nil
+    ScratchPad.record []
 
-      m2 = Module.new do
-        include m1
+    m1 = Module.new do
+      refine Integer do
+        ScratchPad << self
       end
+    end
 
-      Module.new do
-        using m2
+    m2 = Module.new do
+      include m1
+    end
 
-        used_refinements = Module.used_refinements
-      end
+    Module.new do
+      using m2
 
-      used_refinements.should == ScratchPad.recorded
+      used_refinements = Module.used_refinements
     end
+
+    used_refinements.should == ScratchPad.recorded
   end
 end
diff --git a/spec/ruby/core/module/using_spec.rb b/spec/ruby/core/module/using_spec.rb
index 4781b99bb7b483..a908363c960114 100644
--- a/spec/ruby/core/module/using_spec.rb
+++ b/spec/ruby/core/module/using_spec.rb
@@ -316,7 +316,7 @@ def foo; "foo from refinement"; end
         using refinement
 
         def initialize
-          @a = "1703"
+          @a = +"1703"
 
           @a.instance_eval do
             def abc
diff --git a/spec/ruby/core/numeric/shared/imag.rb b/spec/ruby/core/numeric/shared/imag.rb
index ac2da40a3be5f9..4f117e243ad7db 100644
--- a/spec/ruby/core/numeric/shared/imag.rb
+++ b/spec/ruby/core/numeric/shared/imag.rb
@@ -19,8 +19,8 @@
   end
 
   it "raises an ArgumentError if given any arguments" do
-   @numbers.each do |number|
-     -> { number.send(@method, number) }.should raise_error(ArgumentError)
-   end
+    @numbers.each do |number|
+      -> { number.send(@method, number) }.should raise_error(ArgumentError)
+    end
   end
 end
diff --git a/spec/ruby/core/numeric/shared/rect.rb b/spec/ruby/core/numeric/shared/rect.rb
index 9cde19a398168a..120a69b1c48fbf 100644
--- a/spec/ruby/core/numeric/shared/rect.rb
+++ b/spec/ruby/core/numeric/shared/rect.rb
@@ -25,24 +25,24 @@
   end
 
   it "returns self as the first element" do
-   @numbers.each do |number|
-     if Float === number and number.nan?
-       number.send(@method).first.nan?.should be_true
-     else
-       number.send(@method).first.should == number
-     end
-   end
+    @numbers.each do |number|
+      if Float === number and number.nan?
+        number.send(@method).first.nan?.should be_true
+      else
+        number.send(@method).first.should == number
+      end
+    end
   end
 
   it "returns 0 as the last element" do
-   @numbers.each do |number|
-     number.send(@method).last.should == 0
-   end
+    @numbers.each do |number|
+      number.send(@method).last.should == 0
+    end
   end
 
   it "raises an ArgumentError if given any arguments" do
-   @numbers.each do |number|
-     -> { number.send(@method, number) }.should raise_error(ArgumentError)
-   end
+    @numbers.each do |number|
+      -> { number.send(@method, number) }.should raise_error(ArgumentError)
+    end
   end
 end
diff --git a/spec/ruby/core/objectspace/_id2ref_spec.rb b/spec/ruby/core/objectspace/_id2ref_spec.rb
index c088ae2743fb55..7c0e0e7a713f07 100644
--- a/spec/ruby/core/objectspace/_id2ref_spec.rb
+++ b/spec/ruby/core/objectspace/_id2ref_spec.rb
@@ -1,52 +1,65 @@
 require_relative '../../spec_helper'
 
-describe "ObjectSpace._id2ref" do
-  it "converts an object id to a reference to the object" do
-    s = "I am a string"
-    r = ObjectSpace._id2ref(s.object_id)
-    r.should == s
+ruby_version_is "3.5" do
+  describe "ObjectSpace._id2ref" do
+    it "is deprecated" do
+      id = nil.object_id
+      -> {
+        ObjectSpace._id2ref(id)
+      }.should complain(/warning: ObjectSpace\._id2ref is deprecated/)
+    end
   end
+end
 
-  it "retrieves true by object_id" do
-    ObjectSpace._id2ref(true.object_id).should == true
-  end
+ruby_version_is ""..."3.5" do
+  describe "ObjectSpace._id2ref" do
+    it "converts an object id to a reference to the object" do
+      s = "I am a string"
+      r = ObjectSpace._id2ref(s.object_id)
+      r.should == s
+    end
 
-  it "retrieves false by object_id" do
-    ObjectSpace._id2ref(false.object_id).should == false
-  end
+    it "retrieves true by object_id" do
+      ObjectSpace._id2ref(true.object_id).should == true
+    end
 
-  it "retrieves nil by object_id" do
-    ObjectSpace._id2ref(nil.object_id).should == nil
-  end
+    it "retrieves false by object_id" do
+      ObjectSpace._id2ref(false.object_id).should == false
+    end
 
-  it "retrieves a small Integer by object_id" do
-    ObjectSpace._id2ref(1.object_id).should == 1
-    ObjectSpace._id2ref((-42).object_id).should == -42
-  end
+    it "retrieves nil by object_id" do
+      ObjectSpace._id2ref(nil.object_id).should == nil
+    end
 
-  it "retrieves a large Integer by object_id" do
-    obj = 1 << 88
-    ObjectSpace._id2ref(obj.object_id).should.equal?(obj)
-  end
+    it "retrieves a small Integer by object_id" do
+      ObjectSpace._id2ref(1.object_id).should == 1
+      ObjectSpace._id2ref((-42).object_id).should == -42
+    end
 
-  it "retrieves a Symbol by object_id" do
-    ObjectSpace._id2ref(:sym.object_id).should.equal?(:sym)
-  end
+    it "retrieves a large Integer by object_id" do
+      obj = 1 << 88
+      ObjectSpace._id2ref(obj.object_id).should.equal?(obj)
+    end
 
-  it "retrieves a String by object_id" do
-    obj = "str"
-    ObjectSpace._id2ref(obj.object_id).should.equal?(obj)
-  end
+    it "retrieves a Symbol by object_id" do
+      ObjectSpace._id2ref(:sym.object_id).should.equal?(:sym)
+    end
 
-  it "retrieves a frozen literal String by object_id" do
-    ObjectSpace._id2ref("frozen string literal _id2ref".freeze.object_id).should.equal?("frozen string literal _id2ref".freeze)
-  end
+    it "retrieves a String by object_id" do
+      obj = "str"
+      ObjectSpace._id2ref(obj.object_id).should.equal?(obj)
+    end
 
-  it "retrieves an Encoding by object_id" do
-    ObjectSpace._id2ref(Encoding::UTF_8.object_id).should.equal?(Encoding::UTF_8)
-  end
+    it "retrieves a frozen literal String by object_id" do
+      ObjectSpace._id2ref("frozen string literal _id2ref".freeze.object_id).should.equal?("frozen string literal _id2ref".freeze)
+    end
+
+    it "retrieves an Encoding by object_id" do
+      ObjectSpace._id2ref(Encoding::UTF_8.object_id).should.equal?(Encoding::UTF_8)
+    end
 
-  it 'raises RangeError when an object could not be found' do
-    proc { ObjectSpace._id2ref(1 << 60) }.should raise_error(RangeError)
+    it 'raises RangeError when an object could not be found' do
+      proc { ObjectSpace._id2ref(1 << 60) }.should raise_error(RangeError)
+    end
   end
 end
diff --git a/spec/ruby/core/objectspace/add_finalizer_spec.rb b/spec/ruby/core/objectspace/add_finalizer_spec.rb
deleted file mode 100644
index 3540ac0413d89c..00000000000000
--- a/spec/ruby/core/objectspace/add_finalizer_spec.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-require_relative '../../spec_helper'
-
-describe "ObjectSpace.add_finalizer" do
-  it "needs to be reviewed for spec completeness"
-end
diff --git a/spec/ruby/core/objectspace/call_finalizer_spec.rb b/spec/ruby/core/objectspace/call_finalizer_spec.rb
deleted file mode 100644
index 6dce92ddd6eedf..00000000000000
--- a/spec/ruby/core/objectspace/call_finalizer_spec.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-require_relative '../../spec_helper'
-
-describe "ObjectSpace.call_finalizer" do
-  it "needs to be reviewed for spec completeness"
-end
diff --git a/spec/ruby/core/objectspace/define_finalizer_spec.rb b/spec/ruby/core/objectspace/define_finalizer_spec.rb
index 6be83e518e4494..0f4b54c3458553 100644
--- a/spec/ruby/core/objectspace/define_finalizer_spec.rb
+++ b/spec/ruby/core/objectspace/define_finalizer_spec.rb
@@ -52,7 +52,7 @@ def scoped
         Proc.new { puts "finalizer run" }
       end
       handler = scoped
-      obj = "Test"
+      obj = +"Test"
       ObjectSpace.define_finalizer(obj, handler)
       exit 0
     RUBY
@@ -111,7 +111,7 @@ def initialize
 
   it "calls a finalizer at exit even if it is self-referencing" do
     code = <<-RUBY
-      obj = "Test"
+      obj = +"Test"
       handler = Proc.new { puts "finalizer run" }
       ObjectSpace.define_finalizer(obj, handler)
       exit 0
@@ -141,9 +141,9 @@ def finalizer(zelf)
 
   it "calls a finalizer defined in a finalizer running at exit" do
     code = <<-RUBY
-      obj = "Test"
+      obj = +"Test"
       handler = Proc.new do
-        obj2 = "Test"
+        obj2 = +"Test"
         handler2 = Proc.new { puts "finalizer 2 run" }
         ObjectSpace.define_finalizer(obj2, handler2)
         exit 0
@@ -156,7 +156,7 @@ def finalizer(zelf)
   end
 
   it "allows multiple finalizers with different 'callables' to be defined" do
-    code = <<-RUBY
+    code = <<-'RUBY'
       obj = Object.new
 
       ObjectSpace.define_finalizer(obj, Proc.new { STDOUT.write "finalized1\n" })
@@ -168,25 +168,48 @@ def finalizer(zelf)
     ruby_exe(code).lines.sort.should == ["finalized1\n", "finalized2\n"]
   end
 
-  ruby_version_is "3.1" do
-    describe "when $VERBOSE is not nil" do
-      it "warns if an exception is raised in finalizer" do
-        code = <<-RUBY
-          ObjectSpace.define_finalizer(Object.new) { raise "finalizing" }
-        RUBY
+  it "defines same finalizer only once" do
+    code = <<~RUBY
+      obj = Object.new
+      p = proc { |id| print "ok" }
+      ObjectSpace.define_finalizer(obj, p.dup)
+      ObjectSpace.define_finalizer(obj, p.dup)
+    RUBY
 
-        ruby_exe(code, args: "2>&1").should include("warning: Exception in finalizer", "finalizing")
-      end
+    ruby_exe(code).should == "ok"
+  end
+
+  it "returns the defined finalizer" do
+    obj = Object.new
+    p = proc { |id| }
+    p2 = p.dup
+
+    ret = ObjectSpace.define_finalizer(obj, p)
+    ret.should == [0, p]
+    ret[1].should.equal?(p)
+
+    ret = ObjectSpace.define_finalizer(obj, p2)
+    ret.should == [0, p]
+    ret[1].should.equal?(p)
+  end
+
+  describe "when $VERBOSE is not nil" do
+    it "warns if an exception is raised in finalizer" do
+      code = <<-RUBY
+        ObjectSpace.define_finalizer(Object.new) { raise "finalizing" }
+      RUBY
+
+      ruby_exe(code, args: "2>&1").should include("warning: Exception in finalizer", "finalizing")
     end
+  end
 
-    describe "when $VERBOSE is nil" do
-      it "does not warn even if an exception is raised in finalizer" do
-        code = <<-RUBY
-          ObjectSpace.define_finalizer(Object.new) { raise "finalizing" }
-        RUBY
+  describe "when $VERBOSE is nil" do
+    it "does not warn even if an exception is raised in finalizer" do
+      code = <<-RUBY
+        ObjectSpace.define_finalizer(Object.new) { raise "finalizing" }
+      RUBY
 
-        ruby_exe(code, args: "2>&1", options: "-W0").should == ""
-      end
+      ruby_exe(code, args: "2>&1", options: "-W0").should == ""
     end
   end
 end
diff --git a/spec/ruby/core/objectspace/finalizers_spec.rb b/spec/ruby/core/objectspace/finalizers_spec.rb
deleted file mode 100644
index e7f20fc8a020a5..00000000000000
--- a/spec/ruby/core/objectspace/finalizers_spec.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-require_relative '../../spec_helper'
-
-describe "ObjectSpace.finalizers" do
-  it "needs to be reviewed for spec completeness"
-end
diff --git a/spec/ruby/core/objectspace/remove_finalizer_spec.rb b/spec/ruby/core/objectspace/remove_finalizer_spec.rb
deleted file mode 100644
index 0b2b8cf16b60c6..00000000000000
--- a/spec/ruby/core/objectspace/remove_finalizer_spec.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-require_relative '../../spec_helper'
-
-describe "ObjectSpace.remove_finalizer" do
-  it "needs to be reviewed for spec completeness"
-end
diff --git a/spec/ruby/core/objectspace/undefine_finalizer_spec.rb b/spec/ruby/core/objectspace/undefine_finalizer_spec.rb
index 11d43121f868e4..f57d5a78452631 100644
--- a/spec/ruby/core/objectspace/undefine_finalizer_spec.rb
+++ b/spec/ruby/core/objectspace/undefine_finalizer_spec.rb
@@ -1,5 +1,33 @@
 require_relative '../../spec_helper'
 
 describe "ObjectSpace.undefine_finalizer" do
-  it "needs to be reviewed for spec completeness"
+  it "removes finalizers for an object" do
+    code = <<~RUBY
+      obj = Object.new
+      ObjectSpace.define_finalizer(obj, proc { |id| puts "hello" })
+      ObjectSpace.undefine_finalizer(obj)
+    RUBY
+
+    ruby_exe(code).should.empty?
+  end
+
+  it "should not remove finalizers for a frozen object" do
+    code = <<~RUBY
+      obj = Object.new
+      ObjectSpace.define_finalizer(obj, proc { |id| print "ok" })
+      obj.freeze
+      begin
+        ObjectSpace.undefine_finalizer(obj)
+      rescue
+      end
+    RUBY
+
+    ruby_exe(code).should == "ok"
+  end
+
+  it "should raise when removing finalizers for a frozen object" do
+    obj = Object.new
+    obj.freeze
+    -> { ObjectSpace.undefine_finalizer(obj) }.should raise_error(FrozenError)
+  end
 end
diff --git a/spec/ruby/core/objectspace/weakkeymap/clear_spec.rb b/spec/ruby/core/objectspace/weakkeymap/clear_spec.rb
new file mode 100644
index 00000000000000..8050e2c30729d6
--- /dev/null
+++ b/spec/ruby/core/objectspace/weakkeymap/clear_spec.rb
@@ -0,0 +1,27 @@
+require_relative '../../../spec_helper'
+
+ruby_version_is '3.3' do
+  describe "ObjectSpace::WeakKeyMap#clear" do
+    it "removes all the entries" do
+      m = ObjectSpace::WeakKeyMap.new
+
+      key = Object.new
+      value = Object.new
+      m[key] = value
+
+      key2 = Object.new
+      value2 = Object.new
+      m[key2] = value2
+
+      m.clear
+
+      m.key?(key).should == false
+      m.key?(key2).should == false
+    end
+
+    it "returns self" do
+      m = ObjectSpace::WeakKeyMap.new
+      m.clear.should.equal?(m)
+    end
+  end
+end
diff --git a/spec/ruby/core/objectspace/weakkeymap/delete_spec.rb b/spec/ruby/core/objectspace/weakkeymap/delete_spec.rb
index 6e534b8ea8b6a6..3cd61355d64f9f 100644
--- a/spec/ruby/core/objectspace/weakkeymap/delete_spec.rb
+++ b/spec/ruby/core/objectspace/weakkeymap/delete_spec.rb
@@ -33,8 +33,19 @@
     end
 
     it "returns nil if the key is not found when no block is given" do
-      m = ObjectSpace::WeakMap.new
+      m = ObjectSpace::WeakKeyMap.new
       m.delete(Object.new).should == nil
     end
+
+    it "returns nil when a key cannot be garbage collected" do
+      map = ObjectSpace::WeakKeyMap.new
+
+      map.delete(1).should == nil
+      map.delete(1.0).should == nil
+      map.delete(:a).should == nil
+      map.delete(true).should == nil
+      map.delete(false).should == nil
+      map.delete(nil).should == nil
+    end
   end
 end
diff --git a/spec/ruby/core/objectspace/weakkeymap/element_reference_spec.rb b/spec/ruby/core/objectspace/weakkeymap/element_reference_spec.rb
index 862480cd02f600..51368e8d3ba3af 100644
--- a/spec/ruby/core/objectspace/weakkeymap/element_reference_spec.rb
+++ b/spec/ruby/core/objectspace/weakkeymap/element_reference_spec.rb
@@ -1,4 +1,5 @@
 require_relative '../../../spec_helper'
+require_relative 'fixtures/classes'
 
 ruby_version_is "3.3" do
   describe "ObjectSpace::WeakKeyMap#[]" do
@@ -15,12 +16,92 @@
       map[key2].should == ref2
     end
 
-    it "matches using equality semantics" do
+    it "compares keys with #eql? semantics" do
+      map = ObjectSpace::WeakKeyMap.new
+      key = [1.0]
+      map[key] = "x"
+      map[[1]].should == nil
+      map[[1.0]].should == "x"
+      key.should == [1.0] # keep the key alive until here to keep the map entry
+
+      map = ObjectSpace::WeakKeyMap.new
+      key = [1]
+      map[key] = "x"
+      map[[1.0]].should == nil
+      map[[1]].should == "x"
+      key.should == [1] # keep the key alive until here to keep the map entry
+
       map = ObjectSpace::WeakKeyMap.new
       key1, key2 = %w[a a].map(&:upcase)
       ref = "x"
       map[key1] = ref
       map[key2].should == ref
     end
+
+    it "compares key via #hash first" do
+      x = mock('0')
+      x.should_receive(:hash).and_return(0)
+
+      map = ObjectSpace::WeakKeyMap.new
+      key = 'foo'
+      map[key] = :bar
+      map[x].should == nil
+    end
+
+    it "does not compare keys with different #hash values via #eql?" do
+      x = mock('x')
+      x.should_not_receive(:eql?)
+      x.stub!(:hash).and_return(0)
+
+      y = mock('y')
+      y.should_not_receive(:eql?)
+      y.stub!(:hash).and_return(1)
+
+      map = ObjectSpace::WeakKeyMap.new
+      map[y] = 1
+      map[x].should == nil
+    end
+
+    it "compares keys with the same #hash value via #eql?" do
+      x = mock('x')
+      x.should_receive(:eql?).and_return(true)
+      x.stub!(:hash).and_return(42)
+
+      y = mock('y')
+      y.should_not_receive(:eql?)
+      y.stub!(:hash).and_return(42)
+
+      map = ObjectSpace::WeakKeyMap.new
+      map[y] = 1
+      map[x].should == 1
+    end
+
+    it "finds a value via an identical key even when its #eql? isn't reflexive" do
+      x = mock('x')
+      x.should_receive(:hash).at_least(1).and_return(42)
+      x.stub!(:eql?).and_return(false) # Stubbed for clarity and latitude in implementation; not actually sent by MRI.
+
+      map = ObjectSpace::WeakKeyMap.new
+      map[x] = :x
+      map[x].should == :x
+    end
+
+    it "supports keys with private #hash method" do
+      key = WeakKeyMapSpecs::KeyWithPrivateHash.new
+      map = ObjectSpace::WeakKeyMap.new
+      map[key] = 42
+      map[key].should == 42
+    end
+
+    it "returns nil and does not raise error when a key cannot be garbage collected" do
+      map = ObjectSpace::WeakKeyMap.new
+
+      map[1].should == nil
+      map[1.0].should == nil
+      map[:a].should == nil
+      map[true].should == nil
+      map[false].should == nil
+      map[nil].should == nil
+    end
   end
 end
diff --git a/spec/ruby/core/objectspace/weakkeymap/element_set_spec.rb b/spec/ruby/core/objectspace/weakkeymap/element_set_spec.rb
index 689509d8203d87..8db8d780c71a86 100644
--- a/spec/ruby/core/objectspace/weakkeymap/element_set_spec.rb
+++ b/spec/ruby/core/objectspace/weakkeymap/element_set_spec.rb
@@ -8,10 +8,6 @@ def should_accept(map, key, value)
       map[key].should == value
     end
 
-    def should_not_accept(map, key, value)
-      -> { map[key] = value }.should raise_error(ArgumentError)
-    end
-
     it "is correct" do
       map = ObjectSpace::WeakKeyMap.new
       key1, key2 = %w[a b].map(&:upcase)
@@ -24,7 +20,7 @@ def should_not_accept(map, key, value)
 
     it "requires the keys to implement #hash" do
       map = ObjectSpace::WeakKeyMap.new
-      -> { map[BasicObject.new] = 1 }.should raise_error(NoMethodError, "undefined method `hash' for an instance of BasicObject")
+      -> { map[BasicObject.new] = 1 }.should raise_error(NoMethodError, /undefined method [`']hash' for an instance of BasicObject/)
     end
 
     it "accepts frozen keys or values" do
@@ -40,32 +36,47 @@ def should_not_accept(map, key, value)
       should_accept(map, y, x)
     end
 
-    it "rejects symbols as keys" do
+    it "does not duplicate and freeze String keys (like Hash#[]= does)" do
       map = ObjectSpace::WeakKeyMap.new
-      should_not_accept(map, :foo, true)
-      should_not_accept(map, rand.to_s.to_sym, true)
-    end
+      key = +"a"
+      map[key] = 1
 
-    it "rejects integers as keys" do
-      map = ObjectSpace::WeakKeyMap.new
-      should_not_accept(map, 42, true)
-      should_not_accept(map, 2 ** 68, true)
-    end
+      map.getkey("a").should.equal? key
+      map.getkey("a").should_not.frozen?
 
-    it "rejects floats as keys" do
-      map = ObjectSpace::WeakKeyMap.new
-      should_not_accept(map, 4.2, true)
+      key.should == "a" # keep the key alive until here to keep the map entry
     end
 
-    it "rejects booleans as keys" do
-      map = ObjectSpace::WeakKeyMap.new
-      should_not_accept(map, true, true)
-      should_not_accept(map, false, true)
-    end
+    context "a key cannot be garbage collected" do
+      it "raises ArgumentError when Integer is used as a key" do
+        map = ObjectSpace::WeakKeyMap.new
+        -> { map[1] = "x" }.should raise_error(ArgumentError, /WeakKeyMap (keys )?must be garbage collectable/)
+      end
 
-    it "rejects nil as keys" do
-      map = ObjectSpace::WeakKeyMap.new
-      should_not_accept(map, nil, true)
+      it "raises ArgumentError when Float is used as a key" do
+        map = ObjectSpace::WeakKeyMap.new
+        -> { map[1.0] = "x" }.should raise_error(ArgumentError, /WeakKeyMap (keys )?must be garbage collectable/)
+      end
+
+      it "raises ArgumentError when Symbol is used as a key" do
+        map = ObjectSpace::WeakKeyMap.new
+        -> { map[:a] = "x" }.should raise_error(ArgumentError, /WeakKeyMap (keys )?must be garbage collectable/)
+      end
+
+      it "raises ArgumentError when true is used as a key" do
+        map = ObjectSpace::WeakKeyMap.new
+        -> { map[true] = "x" }.should raise_error(ArgumentError, /WeakKeyMap (keys )?must be garbage collectable/)
+      end
+
+      it "raises ArgumentError when false is used as a key" do
+        map = ObjectSpace::WeakKeyMap.new
+        -> { map[false] = "x" }.should raise_error(ArgumentError, /WeakKeyMap (keys )?must be garbage collectable/)
+      end
+
+      it "raises ArgumentError when nil is used as a key" do
+        map = ObjectSpace::WeakKeyMap.new
+        -> { map[nil] = "x" }.should raise_error(ArgumentError, /WeakKeyMap (keys )?must be garbage collectable/)
+      end
     end
   end
 end
diff --git a/spec/ruby/core/objectspace/weakkeymap/fixtures/classes.rb b/spec/ruby/core/objectspace/weakkeymap/fixtures/classes.rb
new file mode 100644
index 00000000000000..0fd04551b50720
--- /dev/null
+++ b/spec/ruby/core/objectspace/weakkeymap/fixtures/classes.rb
@@ -0,0 +1,5 @@
+module WeakKeyMapSpecs
+  class KeyWithPrivateHash
+    private :hash
+  end
+end
diff --git a/spec/ruby/core/objectspace/weakkeymap/getkey_spec.rb b/spec/ruby/core/objectspace/weakkeymap/getkey_spec.rb
index 3af0186f2787a0..8a2dbf809d8c23 100644
--- a/spec/ruby/core/objectspace/weakkeymap/getkey_spec.rb
+++ b/spec/ruby/core/objectspace/weakkeymap/getkey_spec.rb
@@ -9,6 +9,20 @@
       map[key1] = true
       map.getkey(key2).should equal(key1)
       map.getkey("X").should == nil
+
+      key1.should == "A" # keep the key alive until here to keep the map entry
+      key2.should == "A" # keep the key alive until here to keep the map entry
+    end
+
+    it "returns nil when a key cannot be garbage collected" do
+      map = ObjectSpace::WeakKeyMap.new
+
+      map.getkey(1).should == nil
+      map.getkey(1.0).should == nil
+      map.getkey(:a).should == nil
+      map.getkey(true).should == nil
+      map.getkey(false).should == nil
+      map.getkey(nil).should == nil
     end
   end
 end
diff --git a/spec/ruby/core/objectspace/weakkeymap/inspect_spec.rb b/spec/ruby/core/objectspace/weakkeymap/inspect_spec.rb
index 557fbc87332327..319f050970e31a 100644
--- a/spec/ruby/core/objectspace/weakkeymap/inspect_spec.rb
+++ b/spec/ruby/core/objectspace/weakkeymap/inspect_spec.rb
@@ -12,6 +12,10 @@
       map.inspect.should =~ /\A\#<ObjectSpace::WeakKeyMap:0x\h+ size=2>\z/
       map[key3] = 3
       map.inspect.should =~ /\A\#<ObjectSpace::WeakKeyMap:0x\h+ size=2>\z/
+
+      key1.should == "foo" # keep the key alive until here to keep the map entry
+      key2.should == "bar" # keep the key alive until here to keep the map entry
+      key3.should == "bar" # keep the key alive until here to keep the map entry
     end
   end
 end
diff --git a/spec/ruby/core/objectspace/weakkeymap/key_spec.rb b/spec/ruby/core/objectspace/weakkeymap/key_spec.rb
index 2af9c2b8e792f3..a9a2e12432c845 100644
--- a/spec/ruby/core/objectspace/weakkeymap/key_spec.rb
+++ b/spec/ruby/core/objectspace/weakkeymap/key_spec.rb
@@ -29,5 +29,16 @@
       map[key] = nil
       map.key?(key).should == true
     end
+
+    it "returns false when a key cannot be garbage collected" do
+      map = ObjectSpace::WeakKeyMap.new
+
+      map.key?(1).should == false
+      map.key?(1.0).should == false
+      map.key?(:a).should == false
+      map.key?(true).should == false
+      map.key?(false).should == false
+      map.key?(nil).should == false
+    end
   end
 end
diff --git a/spec/ruby/core/proc/arity_spec.rb b/spec/ruby/core/proc/arity_spec.rb
index f7cb5ad0f88cac..5c7728cb3000d1 100644
--- a/spec/ruby/core/proc/arity_spec.rb
+++ b/spec/ruby/core/proc/arity_spec.rb
@@ -268,6 +268,14 @@
         @a.arity.should == 3
         @b.arity.should == 3
       end
+
+      # implicit rest
+      evaluate <<-ruby do
+          @a = lambda { |a, | }
+      ruby
+
+        @a.arity.should == 1
+      end
     end
 
     context "returns negative values" do
@@ -530,6 +538,14 @@
         @a.arity.should == 1
         @b.arity.should == 5
       end
+
+      # implicit rest
+      evaluate <<-ruby do
+          @a = proc { |a, | }
+      ruby
+
+        @a.arity.should == 1
+      end
     end
 
     context "returns negative values" do
diff --git a/spec/ruby/core/proc/clone_spec.rb b/spec/ruby/core/proc/clone_spec.rb
index a1a1292654700e..730dc421a87086 100644
--- a/spec/ruby/core/proc/clone_spec.rb
+++ b/spec/ruby/core/proc/clone_spec.rb
@@ -1,6 +1,30 @@
 require_relative '../../spec_helper'
+require_relative 'fixtures/common'
 require_relative 'shared/dup'
 
 describe "Proc#clone" do
   it_behaves_like :proc_dup, :clone
+
+  ruby_bug "cloning a frozen proc is broken on Ruby 3.3", "3.3"..."3.4" do
+    it "preserves frozen status" do
+      proc = Proc.new { }
+      proc.freeze
+      proc.frozen?.should == true
+      proc.clone.frozen?.should == true
+    end
+  end
+
+  ruby_version_is "3.3" do
+    it "calls #initialize_clone on subclass" do
+      obj = ProcSpecs::MyProc2.new(:a, 2) { }
+      dup = obj.clone
+
+      dup.should_not equal(obj)
+      dup.class.should == ProcSpecs::MyProc2
+
+      dup.first.should == :a
+      dup.second.should == 2
+      dup.initializer.should == :clone
+    end
+  end
 end
diff --git a/spec/ruby/core/proc/curry_spec.rb b/spec/ruby/core/proc/curry_spec.rb
index 24df2a8a72f4a5..6daabe0ee17051 100644
--- a/spec/ruby/core/proc/curry_spec.rb
+++ b/spec/ruby/core/proc/curry_spec.rb
@@ -159,15 +159,14 @@
   end
 
   it "can be passed more than _arity_ arguments if created from a proc" do
-    -> { @proc_add.curry(3)[1,2,3,4].should == 6 }.should_not
-      raise_error(ArgumentError)
-    -> { @proc_add.curry(1)[1,2].curry(3)[3,4,5,6].should == 6 }.should_not
-      raise_error(ArgumentError)
+    @proc_add.curry(3)[1,2,3,4].should == 6
+
+    @proc_add.curry(3)[1,2].curry(3)[3,4,5,6].should == 6
   end
 
   it "raises an ArgumentError if passed more than _arity_ arguments when created from a lambda" do
     -> { @lambda_add.curry(3)[1,2,3,4] }.should raise_error(ArgumentError)
-    -> { @lambda_add.curry(1)[1,2].curry(3)[3,4,5,6] }.should raise_error(ArgumentError)
+    -> { @lambda_add.curry(3)[1,2].curry(3)[3,4,5,6] }.should raise_error(ArgumentError)
   end
 
   it "returns Procs with arities of -1 regardless of the value of _arity_" do
diff --git a/spec/ruby/core/proc/dup_spec.rb b/spec/ruby/core/proc/dup_spec.rb
index 6da2f3080c8261..716357d1f0e327 100644
--- a/spec/ruby/core/proc/dup_spec.rb
+++ b/spec/ruby/core/proc/dup_spec.rb
@@ -1,6 +1,28 @@
 require_relative '../../spec_helper'
+require_relative 'fixtures/common'
 require_relative 'shared/dup'
 
 describe "Proc#dup" do
   it_behaves_like :proc_dup, :dup
+
+  it "resets frozen status" do
+    proc = Proc.new { }
+    proc.freeze
+    proc.frozen?.should == true
+    proc.dup.frozen?.should == false
+  end
+
+  ruby_version_is "3.3" do
+    it "calls #initialize_dup on subclass" do
+      obj = ProcSpecs::MyProc2.new(:a, 2) { }
+      dup = obj.dup
+
+      dup.should_not equal(obj)
+      dup.class.should == ProcSpecs::MyProc2
+
+      dup.first.should == :a
+      dup.second.should == 2
+      dup.initializer.should == :dup
+    end
+  end
 end
diff --git a/spec/ruby/core/proc/fixtures/common.rb b/spec/ruby/core/proc/fixtures/common.rb
index 6e27a2dee74fbc..dfe67d7ba803eb 100644
--- a/spec/ruby/core/proc/fixtures/common.rb
+++ b/spec/ruby/core/proc/fixtures/common.rb
@@ -32,7 +32,28 @@ def initialize(a, b)
       @second = b
     end
 
-    attr_reader :first, :second
+    attr_reader :first, :second, :initializer
+
+    def initialize_copy(other)
+      super
+      @initializer = :copy
+      @first = other.first
+      @second = other.second
+    end
+
+    def initialize_dup(other)
+      super
+      @initializer = :dup
+      @first = other.first
+      @second = other.second
+    end
+
+    def initialize_clone(other, **options)
+      super
+      @initializer = :clone
+      @first = other.first
+      @second = other.second
+    end
   end
 
   class Arity
diff --git a/spec/ruby/core/proc/fixtures/proc_aref.rb b/spec/ruby/core/proc/fixtures/proc_aref.rb
index a305667797ed80..8ee355b14ca6df 100644
--- a/spec/ruby/core/proc/fixtures/proc_aref.rb
+++ b/spec/ruby/core/proc/fixtures/proc_aref.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: false
 module ProcArefSpecs
   def self.aref
     proc {|a| a }["sometext"]
diff --git a/spec/ruby/core/proc/lambda_spec.rb b/spec/ruby/core/proc/lambda_spec.rb
index b2d3f503502463..5c3c38fc2a64c1 100644
--- a/spec/ruby/core/proc/lambda_spec.rb
+++ b/spec/ruby/core/proc/lambda_spec.rb
@@ -14,9 +14,11 @@
     Proc.new {}.lambda?.should be_false
   end
 
-  it "is preserved when passing a Proc with & to the lambda keyword" do
-    suppress_warning {lambda(&->{})}.lambda?.should be_true
-    suppress_warning {lambda(&proc{})}.lambda?.should be_false
+  ruby_version_is ""..."3.3" do
+    it "is preserved when passing a Proc with & to the lambda keyword" do
+      suppress_warning {lambda(&->{})}.lambda?.should be_true
+      suppress_warning {lambda(&proc{})}.lambda?.should be_false
+    end
   end
 
   it "is preserved when passing a Proc with & to the proc keyword" do
diff --git a/spec/ruby/core/proc/parameters_spec.rb b/spec/ruby/core/proc/parameters_spec.rb
index 1ffaf173157798..e9bc9a1c5798af 100644
--- a/spec/ruby/core/proc/parameters_spec.rb
+++ b/spec/ruby/core/proc/parameters_spec.rb
@@ -20,19 +20,27 @@
     proc {|x| }.parameters.first.first.should == :opt
   end
 
-  ruby_version_is "3.2" do
-    it "sets the first element of each sub-Array to :req if argument would be required if a lambda if lambda keyword used" do
-      proc {|x| }.parameters(lambda: true).first.first.should == :req
-      proc {|y,*x| }.parameters(lambda: true).first.first.should == :req
-    end
+  it "sets the first element of each sub-Array to :req for required argument if lambda keyword used" do
+    proc {|x| }.parameters(lambda: true).first.first.should == :req
+    proc {|y,*x| }.parameters(lambda: true).first.first.should == :req
+  end
+
+  it "regards named parameters in procs as required if lambda keyword used" do
+    proc {|x| }.parameters(lambda: true).first.first.should == :req
+  end
 
-    it "regards named parameters in procs as required if lambda keyword used" do
-      proc {|x| }.parameters(lambda: true).first.first.should == :req
-    end
+  it "regards named parameters in lambda as optional if lambda: false keyword used" do
+    -> x { }.parameters(lambda: false).first.first.should == :opt
+  end
+
+  it "regards named parameters in procs and lambdas as required if lambda keyword is truthy" do
+    proc {|x| }.parameters(lambda: 123).first.first.should == :req
+    -> x { }.parameters(lambda: 123).first.first.should == :req
+  end
 
-    it "regards named parameters in lambda as optional if lambda: false keyword used" do
-      -> x { }.parameters(lambda: false).first.first.should == :opt
-    end
+  it "ignores the lambda keyword if it is nil" do
+    proc {|x|}.parameters(lambda: nil).first.first.should == :opt
+    -> x { }.parameters(lambda: nil).first.first.should == :req
   end
 
   it "regards optional keyword parameters in procs as optional" do
@@ -54,7 +62,7 @@
   end
 
   it "regards keyword parameters in lambdas as required" do
-    eval("lambda {|x:| }").parameters.first.first.should == :keyreq
+    -> x: { }.parameters.first.first.should == :keyreq
   end
 
   it "sets the first element of each sub-Array to :rest for parameters prefixed with asterisks" do
@@ -91,20 +99,25 @@
     proc {|&block| }.parameters.first.last.should == :block
   end
 
-  it "ignores unnamed rest args" do
+  it "ignores unnamed rest arguments" do
     -> x {}.parameters.should == [[:req, :x]]
   end
 
-  ruby_version_is '3.2' do
-    it "adds * rest arg for \"star\" argument" do
-      -> x, * {}.parameters.should == [[:req, :x], [:rest, :*]]
-    end
+  it "ignores implicit rest arguments" do
+    proc { |x, | }.parameters.should == [[:opt, :x]]
+    -> x { }.parameters.should == [[:req, :x]]
   end
 
-  ruby_version_is ''...'3.2' do
-    it "adds nameless rest arg for \"star\" argument" do
-      -> x, * {}.parameters.should == [[:req, :x], [:rest]]
-    end
+  it "adds rest arg with name * for \"star\" argument" do
+    -> * {}.parameters.should == [[:rest, :*]]
+  end
+
+  it "adds keyrest arg with ** as a name for \"double star\" argument" do
+    -> ** {}.parameters.should == [[:keyrest, :**]]
+  end
+
+  it "adds block arg with name & for anonymous block argument" do
+    -> & {}.parameters.should == [[:block, :&]]
   end
 
   it "does not add locals as block options with a block and splat" do
@@ -141,4 +154,8 @@
       [:block, :_]
     ]
   end
+
+  it "returns :nokey for **nil parameter" do
+    proc { |**nil| }.parameters.should == [[:nokey]]
+  end
 end
diff --git a/spec/ruby/core/proc/shared/dup.rb b/spec/ruby/core/proc/shared/dup.rb
index 4480f3d0c98f87..1266337f94b1e2 100644
--- a/spec/ruby/core/proc/shared/dup.rb
+++ b/spec/ruby/core/proc/shared/dup.rb
@@ -8,11 +8,32 @@
     a.call.should == b.call
   end
 
-  ruby_version_is "3.2" do
-    it "returns an instance of subclass" do
-      cl = Class.new(Proc)
+  it "returns an instance of subclass" do
+    cl = Class.new(Proc)
 
-      cl.new{}.send(@method).class.should == cl
+    cl.new{}.send(@method).class.should == cl
+  end
+
+  ruby_version_is "3.4" do
+    it "copies instance variables" do
+      proc = -> { "hello" }
+      proc.instance_variable_set(:@ivar, 1)
+      cl = proc.send(@method)
+      cl.instance_variables.should == [:@ivar]
+    end
+
+    it "copies the finalizer" do
+      code = <<-'RUBY'
+        obj = Proc.new { }
+
+        ObjectSpace.define_finalizer(obj, Proc.new { STDOUT.write "finalized\n" })
+
+        obj.clone
+
+        exit 0
+      RUBY
+
+      ruby_exe(code).lines.sort.should == ["finalized\n", "finalized\n"]
     end
   end
 end
diff --git a/spec/ruby/core/proc/shared/to_s.rb b/spec/ruby/core/proc/shared/to_s.rb
index f1e2f416fc78b8..a52688a89f6294 100644
--- a/spec/ruby/core/proc/shared/to_s.rb
+++ b/spec/ruby/core/proc/shared/to_s.rb
@@ -31,13 +31,13 @@
 
   describe "for a proc created with UnboundMethod#to_proc" do
     it "returns a description including '(lambda)' and optionally including file and line number" do
-        def hello; end
-        s = method("hello").to_proc.send(@method)
-        if s.include? __FILE__
-          s.should =~ /^#<Proc:([^ ]*?) #{Regexp.escape __FILE__}:#{__LINE__ - 3} \(lambda\)>$/
-        else
-          s.should =~ /^#<Proc:([^ ]*?) \(lambda\)>$/
-        end
+      def hello; end
+      s = method("hello").to_proc.send(@method)
+      if s.include? __FILE__
+        s.should =~ /^#<Proc:([^ ]*?) #{Regexp.escape __FILE__}:#{__LINE__ - 3} \(lambda\)>$/
+      else
+        s.should =~ /^#<Proc:([^ ]*?) \(lambda\)>$/
+      end
     end
 
     it "has a binary encoding" do
diff --git a/spec/ruby/core/proc/source_location_spec.rb b/spec/ruby/core/proc/source_location_spec.rb
index a8b99287d5c380..484466f5774771 100644
--- a/spec/ruby/core/proc/source_location_spec.rb
+++ b/spec/ruby/core/proc/source_location_spec.rb
@@ -17,57 +17,64 @@
   end
 
   it "sets the first value to the path of the file in which the proc was defined" do
-    file = @proc.source_location.first
+    file = @proc.source_location[0]
     file.should be_an_instance_of(String)
     file.should == File.realpath('fixtures/source_location.rb', __dir__)
 
-    file = @proc_new.source_location.first
+    file = @proc_new.source_location[0]
     file.should be_an_instance_of(String)
     file.should == File.realpath('fixtures/source_location.rb', __dir__)
 
-    file = @lambda.source_location.first
+    file = @lambda.source_location[0]
     file.should be_an_instance_of(String)
     file.should == File.realpath('fixtures/source_location.rb', __dir__)
 
-    file = @method.source_location.first
+    file = @method.source_location[0]
     file.should be_an_instance_of(String)
     file.should == File.realpath('fixtures/source_location.rb', __dir__)
   end
 
-  it "sets the last value to an Integer representing the line on which the proc was defined" do
-    line = @proc.source_location.last
+  it "sets the second value to an Integer representing the line on which the proc was defined" do
+    line = @proc.source_location[1]
     line.should be_an_instance_of(Integer)
     line.should == 4
 
-    line = @proc_new.source_location.last
+    line = @proc_new.source_location[1]
     line.should be_an_instance_of(Integer)
     line.should == 12
 
-    line = @lambda.source_location.last
+    line = @lambda.source_location[1]
     line.should be_an_instance_of(Integer)
     line.should == 8
 
-    line = @method.source_location.last
+    line = @method.source_location[1]
     line.should be_an_instance_of(Integer)
     line.should == 15
   end
 
   it "works even if the proc was created on the same line" do
-    proc { true }.source_location.should == [__FILE__, __LINE__]
-    Proc.new { true }.source_location.should == [__FILE__, __LINE__]
-    -> { true }.source_location.should == [__FILE__, __LINE__]
+    ruby_version_is(""..."3.5") do
+      proc { true }.source_location.should == [__FILE__, __LINE__]
+      Proc.new { true }.source_location.should == [__FILE__, __LINE__]
+      -> { true }.source_location.should == [__FILE__, __LINE__]
+    end
+    ruby_version_is("3.5") do
+      proc { true }.source_location.should == [__FILE__, __LINE__, 11, __LINE__, 19]
+      Proc.new { true }.source_location.should == [__FILE__, __LINE__, 15, __LINE__, 23]
+      -> { true }.source_location.should == [__FILE__, __LINE__, 8, __LINE__, 17]
+    end
   end
 
   it "returns the first line of a multi-line proc (i.e. the line containing 'proc do')" do
-    ProcSpecs::SourceLocation.my_multiline_proc.source_location.last.should == 20
-    ProcSpecs::SourceLocation.my_multiline_proc_new.source_location.last.should == 34
-    ProcSpecs::SourceLocation.my_multiline_lambda.source_location.last.should == 27
+    ProcSpecs::SourceLocation.my_multiline_proc.source_location[1].should == 20
+    ProcSpecs::SourceLocation.my_multiline_proc_new.source_location[1].should == 34
+    ProcSpecs::SourceLocation.my_multiline_lambda.source_location[1].should == 27
   end
 
   it "returns the location of the proc's body; not necessarily the proc itself" do
-    ProcSpecs::SourceLocation.my_detached_proc.source_location.last.should == 41
-    ProcSpecs::SourceLocation.my_detached_proc_new.source_location.last.should == 51
-    ProcSpecs::SourceLocation.my_detached_lambda.source_location.last.should == 46
+    ProcSpecs::SourceLocation.my_detached_proc.source_location[1].should == 41
+    ProcSpecs::SourceLocation.my_detached_proc_new.source_location[1].should == 51
+    ProcSpecs::SourceLocation.my_detached_lambda.source_location[1].should == 46
   end
 
   it "returns the same value for a proc-ified method as the method reports" do
@@ -86,6 +93,12 @@
 
   it "works for eval with a given line" do
     proc = eval('-> {}', nil, "foo", 100)
-    proc.source_location.should == ["foo", 100]
+    location = proc.source_location
+    ruby_version_is(""..."3.5") do
+      location.should == ["foo", 100]
+    end
+    ruby_version_is("3.5") do
+      location.should == ["foo", 100, 2, 100, 5]
+    end
   end
 end
diff --git a/spec/ruby/core/process/_fork_spec.rb b/spec/ruby/core/process/_fork_spec.rb
index 6f711ad2dd7d0f..e1f45e2656de1a 100644
--- a/spec/ruby/core/process/_fork_spec.rb
+++ b/spec/ruby/core/process/_fork_spec.rb
@@ -1,24 +1,24 @@
 require_relative '../../spec_helper'
 
-ruby_version_is "3.1" do
-  describe "Process._fork" do
-    it "for #respond_to? returns the same as Process.respond_to?(:fork)" do
-      Process.respond_to?(:_fork).should == Process.respond_to?(:fork)
-    end
+describe "Process._fork" do
+  it "for #respond_to? returns the same as Process.respond_to?(:fork)" do
+    Process.respond_to?(:_fork).should == Process.respond_to?(:fork)
+  end
 
-    guard_not -> { Process.respond_to?(:fork) } do
-      it "raises a NotImplementedError when called" do
-        -> { Process._fork }.should raise_error(NotImplementedError)
-      end
+  # Using respond_to? in a guard here is OK because the correct semantics
+  # are that _fork is implemented if and only if fork is (see above).
+  guard_not -> { Process.respond_to?(:fork) } do
+    it "raises a NotImplementedError when called" do
+      -> { Process._fork }.should raise_error(NotImplementedError)
     end
+  end
 
-    guard -> { Process.respond_to?(:fork) } do
-      it "is called by Process#fork" do
-        Process.should_receive(:_fork).once.and_return(42)
+  guard -> { Process.respond_to?(:fork) } do
+    it "is called by Process#fork" do
+      Process.should_receive(:_fork).once.and_return(42)
 
-        pid = Process.fork {}
-        pid.should equal(42)
-      end
+      pid = Process.fork {}
+      pid.should equal(42)
     end
   end
 end
diff --git a/spec/ruby/core/process/constants_spec.rb b/spec/ruby/core/process/constants_spec.rb
index 4130bb58a5548e..57cacadef2ba7b 100644
--- a/spec/ruby/core/process/constants_spec.rb
+++ b/spec/ruby/core/process/constants_spec.rb
@@ -2,63 +2,91 @@
 
 describe "Process::Constants" do
   platform_is :darwin, :netbsd, :freebsd do
-    it "has the correct constant values on BSD-like systems" do
-      Process::WNOHANG.should == 1
-      Process::WUNTRACED.should == 2
-      Process::PRIO_PROCESS.should == 0
-      Process::PRIO_PGRP.should == 1
-      Process::PRIO_USER.should == 2
-      Process::RLIM_INFINITY.should == 9223372036854775807
-      Process::RLIMIT_CPU.should == 0
-      Process::RLIMIT_FSIZE.should == 1
-      Process::RLIMIT_DATA.should == 2
-      Process::RLIMIT_STACK.should == 3
-      Process::RLIMIT_CORE.should == 4
-      Process::RLIMIT_RSS.should == 5
-      Process::RLIMIT_MEMLOCK.should == 6
-      Process::RLIMIT_NPROC.should == 7
-      Process::RLIMIT_NOFILE.should == 8
+    it "are all present on BSD-like systems" do
+      %i[
+          WNOHANG
+          WUNTRACED
+          PRIO_PROCESS
+          PRIO_PGRP
+          PRIO_USER
+          RLIM_INFINITY
+          RLIMIT_CPU
+          RLIMIT_FSIZE
+          RLIMIT_DATA
+          RLIMIT_STACK
+          RLIMIT_CORE
+          RLIMIT_RSS
+          RLIMIT_MEMLOCK
+          RLIMIT_NPROC
+          RLIMIT_NOFILE
+      ].each do |const|
+        Process.const_defined?(const).should be_true
+        Process.const_get(const).should be_an_instance_of(Integer)
+      end
     end
   end
 
   platform_is :darwin do
-    it "has the correct constant values on Darwin" do
-      Process::RLIM_SAVED_MAX.should == 9223372036854775807
-      Process::RLIM_SAVED_CUR.should == 9223372036854775807
-      Process::RLIMIT_AS.should == 5
+    it "are all present on Darwin" do
+      %i[
+        RLIM_SAVED_MAX
+        RLIM_SAVED_CUR
+        RLIMIT_AS
+      ].each do |const|
+        Process.const_defined?(const).should be_true
+        Process.const_get(const).should be_an_instance_of(Integer)
+      end
     end
   end
 
   platform_is :linux do
-    it "has the correct constant values on Linux" do
-      Process::WNOHANG.should == 1
-      Process::WUNTRACED.should == 2
-      Process::PRIO_PROCESS.should == 0
-      Process::PRIO_PGRP.should == 1
-      Process::PRIO_USER.should == 2
-      Process::RLIMIT_CPU.should == 0
-      Process::RLIMIT_FSIZE.should == 1
-      Process::RLIMIT_DATA.should == 2
-      Process::RLIMIT_STACK.should == 3
-      Process::RLIMIT_CORE.should == 4
-      Process::RLIMIT_RSS.should == 5
-      Process::RLIMIT_NPROC.should == 6
-      Process::RLIMIT_NOFILE.should == 7
-      Process::RLIMIT_MEMLOCK.should == 8
-      Process::RLIMIT_AS.should == 9
-
-      # These values appear to change according to the platform.
-      values = [4294967295, 9223372036854775807, 18446744073709551615]
-      values.include?(Process::RLIM_INFINITY).should be_true
-      values.include?(Process::RLIM_SAVED_MAX).should be_true
-      values.include?(Process::RLIM_SAVED_CUR).should be_true
+    it "are all present on Linux" do
+      %i[
+        WNOHANG
+        WUNTRACED
+        PRIO_PROCESS
+        PRIO_PGRP
+        PRIO_USER
+        RLIMIT_CPU
+        RLIMIT_FSIZE
+        RLIMIT_DATA
+        RLIMIT_STACK
+        RLIMIT_CORE
+        RLIMIT_RSS
+        RLIMIT_NPROC
+        RLIMIT_NOFILE
+        RLIMIT_MEMLOCK
+        RLIMIT_AS
+        RLIM_INFINITY
+        RLIM_SAVED_MAX
+        RLIM_SAVED_CUR
+      ].each do |const|
+        Process.const_defined?(const).should be_true
+        Process.const_get(const).should be_an_instance_of(Integer)
+      end
     end
   end
 
   platform_is :netbsd, :freebsd do
-    it "Process::RLIMIT_SBSIZE" do
-      Process::RLIMIT_SBSIZE.should == 9 # FIXME: what's it equal?
-      Process::RLIMIT_AS.should == 10
+    it "are all present on NetBSD and FreeBSD" do
+      %i[
+        RLIMIT_SBSIZE
+        RLIMIT_AS
+      ].each do |const|
+        Process.const_defined?(const).should be_true
+        Process.const_get(const).should be_an_instance_of(Integer)
+      end
+    end
+  end
+
+  platform_is :freebsd do
+    it "are all present on FreeBSD" do
+      %i[
+        RLIMIT_NPTS
+      ].each do |const|
+        Process.const_defined?(const).should be_true
+        Process.const_get(const).should be_an_instance_of(Integer)
+      end
     end
   end
 
diff --git a/spec/ruby/core/process/daemon_spec.rb b/spec/ruby/core/process/daemon_spec.rb
index 70ffd1b32015dd..20b0d743b9a907 100644
--- a/spec/ruby/core/process/daemon_spec.rb
+++ b/spec/ruby/core/process/daemon_spec.rb
@@ -2,6 +2,9 @@
 require_relative 'fixtures/common'
 
 platform_is_not :windows do
+  # macOS 15 is not working this examples
+  return if /darwin/ =~ RUBY_PLATFORM && /15/ =~ `sw_vers -productVersion`
+
   describe :process_daemon_keep_stdio_open_false, shared: true do
     it "redirects stdout to /dev/null" do
       @daemon.invoke("keep_stdio_open_false_stdout", @object).should == ""
diff --git a/spec/ruby/core/process/exec_spec.rb b/spec/ruby/core/process/exec_spec.rb
index 2fa8b089750bb7..0f371b39c81499 100644
--- a/spec/ruby/core/process/exec_spec.rb
+++ b/spec/ruby/core/process/exec_spec.rb
@@ -34,16 +34,16 @@
   end
 
   it "runs the specified command, replacing current process" do
-    ruby_exe('Process.exec "echo hello"; puts "fail"', escape: true).should == "hello\n"
+    ruby_exe('Process.exec "echo hello"; puts "fail"').should == "hello\n"
   end
 
   it "sets the current directory when given the :chdir option" do
     tmpdir = tmp("")[0..-2]
     platform_is_not :windows do
-      ruby_exe("Process.exec(\"pwd\", chdir: #{tmpdir.inspect})", escape: true).should == "#{tmpdir}\n"
+      ruby_exe("Process.exec(\"pwd\", chdir: #{tmpdir.inspect})").should == "#{tmpdir}\n"
     end
     platform_is :windows do
-      ruby_exe("Process.exec(\"cd\", chdir: #{tmpdir.inspect})", escape: true).tr('\\', '/').should == "#{tmpdir}\n"
+      ruby_exe("Process.exec(\"cd\", chdir: #{tmpdir.inspect})").tr('\\', '/').should == "#{tmpdir}\n"
     end
   end
 
@@ -73,13 +73,13 @@
     platform_is_not :windows do
       it "subjects the specified command to shell expansion" do
         result = Dir.chdir(@dir) do
-          ruby_exe('Process.exec "echo *"', escape: true)
+          ruby_exe('Process.exec "echo *"')
         end
         result.chomp.should == @name
       end
 
       it "creates an argument array with shell parsing semantics for whitespace" do
-        ruby_exe('Process.exec "echo a b  c   d"', escape: true).should == "a b c d\n"
+        ruby_exe('Process.exec "echo a b  c   d"').should == "a b c d\n"
       end
     end
 
@@ -87,13 +87,13 @@
       # There is no shell expansion on Windows
       it "does not subject the specified command to shell expansion on Windows" do
         result = Dir.chdir(@dir) do
-          ruby_exe('Process.exec "echo *"', escape: true)
+          ruby_exe('Process.exec "echo *"')
         end
         result.should == "*\n"
       end
 
       it "does not create an argument array with shell parsing semantics for whitespace on Windows" do
-        ruby_exe('Process.exec "echo a b  c   d"', escape: true).should == "a b  c   d\n"
+        ruby_exe('Process.exec "echo a b  c   d"').should == "a b  c   d\n"
       end
     end
 
@@ -105,7 +105,7 @@
       platform_is :windows do
         cmd = '"cmd.exe", "/C", "echo", "*"'
       end
-      ruby_exe("Process.exec #{cmd}", escape: true).should == "*\n"
+      ruby_exe("Process.exec #{cmd}").should == "*\n"
     end
   end
 
@@ -124,29 +124,29 @@
     end
 
     it "sets environment variables in the child environment" do
-      ruby_exe('Process.exec({"FOO" => "BAR"}, "echo ' + var + '")', escape: true).should == "BAR\n"
+      ruby_exe('Process.exec({"FOO" => "BAR"}, "echo ' + var + '")').should == "BAR\n"
     end
 
     it "unsets environment variables whose value is nil" do
       platform_is_not :windows do
-        ruby_exe('Process.exec({"FOO" => nil}, "echo ' + var + '")', escape: true).should == "\n"
+        ruby_exe('Process.exec({"FOO" => nil}, "echo ' + var + '")').should == "\n"
       end
       platform_is :windows do
         # On Windows, echo-ing a non-existent env var is treated as echo-ing any other string of text
-        ruby_exe('Process.exec({"FOO" => nil}, "echo ' + var + '")', escape: true).should == var + "\n"
+        ruby_exe('Process.exec({"FOO" => nil}, "echo ' + var + '")').should == var + "\n"
       end
     end
 
     it "coerces environment argument using to_hash" do
-      ruby_exe('o = Object.new; def o.to_hash; {"FOO" => "BAR"}; end; Process.exec(o, "echo ' + var + '")', escape: true).should == "BAR\n"
+      ruby_exe('o = Object.new; def o.to_hash; {"FOO" => "BAR"}; end; Process.exec(o, "echo ' + var + '")').should == "BAR\n"
     end
 
     it "unsets other environment variables when given a true :unsetenv_others option" do
       platform_is_not :windows do
-        ruby_exe('Process.exec("echo ' + var + '", unsetenv_others: true)', escape: true).should == "\n"
+        ruby_exe('Process.exec("echo ' + var + '", unsetenv_others: true)').should == "\n"
       end
       platform_is :windows do
-        ruby_exe('Process.exec("' + ENV['COMSPEC'].gsub('\\', '\\\\\\') + ' /C echo ' + var + '", unsetenv_others: true)', escape: true).should == var + "\n"
+        ruby_exe('Process.exec("' + ENV['COMSPEC'].gsub('\\', '\\\\\\') + ' /C echo ' + var + '", unsetenv_others: true)').should == var + "\n"
       end
     end
   end
@@ -154,19 +154,19 @@
   describe "with a command array" do
     it "uses the first element as the command name and the second as the argv[0] value" do
       platform_is_not :windows do
-        ruby_exe('Process.exec(["/bin/sh", "argv_zero"], "-c", "echo $0")', escape: true).should == "argv_zero\n"
+        ruby_exe('Process.exec(["/bin/sh", "argv_zero"], "-c", "echo $0")').should == "argv_zero\n"
       end
       platform_is :windows do
-        ruby_exe('Process.exec(["cmd.exe", "/C"], "/C", "echo", "argv_zero")', escape: true).should == "argv_zero\n"
+        ruby_exe('Process.exec(["cmd.exe", "/C"], "/C", "echo", "argv_zero")').should == "argv_zero\n"
       end
     end
 
     it "coerces the argument using to_ary" do
       platform_is_not :windows do
-        ruby_exe('o = Object.new; def o.to_ary; ["/bin/sh", "argv_zero"]; end; Process.exec(o, "-c", "echo $0")', escape: true).should == "argv_zero\n"
+        ruby_exe('o = Object.new; def o.to_ary; ["/bin/sh", "argv_zero"]; end; Process.exec(o, "-c", "echo $0")').should == "argv_zero\n"
       end
       platform_is :windows do
-        ruby_exe('o = Object.new; def o.to_ary; ["cmd.exe", "/C"]; end; Process.exec(o, "/C", "echo", "argv_zero")', escape: true).should == "argv_zero\n"
+        ruby_exe('o = Object.new; def o.to_ary; ["cmd.exe", "/C"]; end; Process.exec(o, "/C", "echo", "argv_zero")').should == "argv_zero\n"
       end
     end
 
@@ -200,7 +200,7 @@
             end
             EOC
 
-          ruby_exe(cmd, escape: true)
+          ruby_exe(cmd)
           child_fd = IO.read(@child_fd_file).to_i
           child_fd.to_i.should > STDERR.fileno
 
@@ -216,7 +216,7 @@
             Process.exec("#{ruby_cmd(map_fd_fixture)} \#{f.fileno}", f.fileno => f.fileno)
             EOC
 
-          output = ruby_exe(cmd, escape: true)
+          output = ruby_exe(cmd)
           child_fd, close_on_exec = output.split
 
           child_fd.to_i.should > STDERR.fileno
@@ -232,7 +232,7 @@
             puts(f.close_on_exec?)
             EOC
 
-          output = ruby_exe(cmd, escape: true)
+          output = ruby_exe(cmd)
           output.split.should == ['true', 'false']
         end
       end
diff --git a/spec/ruby/core/process/fixtures/clocks.rb b/spec/ruby/core/process/fixtures/clocks.rb
index f043f6ac1ff49d..5757e280be0ad5 100644
--- a/spec/ruby/core/process/fixtures/clocks.rb
+++ b/spec/ruby/core/process/fixtures/clocks.rb
@@ -2,7 +2,7 @@ module ProcessSpecs
   def self.clock_constants
     clocks = []
 
-    platform_is_not :windows, :solaris do
+    platform_is_not :windows do
       clocks += Process.constants.select { |c| c.to_s.start_with?('CLOCK_') }
 
       # These require CAP_WAKE_ALARM and are not documented in
diff --git a/spec/ruby/core/process/fixtures/kill.rb b/spec/ruby/core/process/fixtures/kill.rb
index 0b88f8ee1fdcf8..b922a043f196d2 100644
--- a/spec/ruby/core/process/fixtures/kill.rb
+++ b/spec/ruby/core/process/fixtures/kill.rb
@@ -1,5 +1,3 @@
-require 'thread'
-
 pid_file = ARGV.shift
 scenario = ARGV.shift
 
diff --git a/spec/ruby/core/process/gid_spec.rb b/spec/ruby/core/process/gid_spec.rb
index 07221da420a8fe..ca935ed52093fd 100644
--- a/spec/ruby/core/process/gid_spec.rb
+++ b/spec/ruby/core/process/gid_spec.rb
@@ -3,8 +3,8 @@
 describe "Process.gid" do
   platform_is_not :windows do
     it "returns the correct gid for the user executing this process" do
-       current_gid_according_to_unix = `id -gr`.to_i
-       Process.gid.should == current_gid_according_to_unix
+      current_gid_according_to_unix = `id -gr`.to_i
+      Process.gid.should == current_gid_according_to_unix
     end
   end
 
diff --git a/spec/ruby/core/process/setrlimit_spec.rb b/spec/ruby/core/process/setrlimit_spec.rb
index b92f98fd406b5e..ba8d1e04ca011a 100644
--- a/spec/ruby/core/process/setrlimit_spec.rb
+++ b/spec/ruby/core/process/setrlimit_spec.rb
@@ -73,20 +73,18 @@
         Process.setrlimit(:STACK, *Process.getrlimit(Process::RLIMIT_STACK)).should be_nil
       end
 
-      platform_is_not :solaris, :aix do
+      platform_is_not :aix do
         it "coerces :MEMLOCK into RLIMIT_MEMLOCK" do
           Process.setrlimit(:MEMLOCK, *Process.getrlimit(Process::RLIMIT_MEMLOCK)).should be_nil
         end
       end
 
-      platform_is_not :solaris do
-        it "coerces :NPROC into RLIMIT_NPROC" do
-          Process.setrlimit(:NPROC, *Process.getrlimit(Process::RLIMIT_NPROC)).should be_nil
-        end
+      it "coerces :NPROC into RLIMIT_NPROC" do
+        Process.setrlimit(:NPROC, *Process.getrlimit(Process::RLIMIT_NPROC)).should be_nil
+      end
 
-        it "coerces :RSS into RLIMIT_RSS" do
-          Process.setrlimit(:RSS, *Process.getrlimit(Process::RLIMIT_RSS)).should be_nil
-        end
+      it "coerces :RSS into RLIMIT_RSS" do
+        Process.setrlimit(:RSS, *Process.getrlimit(Process::RLIMIT_RSS)).should be_nil
       end
 
       platform_is :netbsd, :freebsd do
@@ -155,20 +153,18 @@
         Process.setrlimit("STACK", *Process.getrlimit(Process::RLIMIT_STACK)).should be_nil
       end
 
-      platform_is_not :solaris, :aix do
+      platform_is_not :aix do
         it "coerces 'MEMLOCK' into RLIMIT_MEMLOCK" do
           Process.setrlimit("MEMLOCK", *Process.getrlimit(Process::RLIMIT_MEMLOCK)).should be_nil
         end
       end
 
-      platform_is_not :solaris do
-        it "coerces 'NPROC' into RLIMIT_NPROC" do
-          Process.setrlimit("NPROC", *Process.getrlimit(Process::RLIMIT_NPROC)).should be_nil
-        end
+      it "coerces 'NPROC' into RLIMIT_NPROC" do
+        Process.setrlimit("NPROC", *Process.getrlimit(Process::RLIMIT_NPROC)).should be_nil
+      end
 
-        it "coerces 'RSS' into RLIMIT_RSS" do
-          Process.setrlimit("RSS", *Process.getrlimit(Process::RLIMIT_RSS)).should be_nil
-        end
+      it "coerces 'RSS' into RLIMIT_RSS" do
+        Process.setrlimit("RSS", *Process.getrlimit(Process::RLIMIT_RSS)).should be_nil
       end
 
       platform_is :netbsd, :freebsd do
diff --git a/spec/ruby/core/process/status/bit_and_spec.rb b/spec/ruby/core/process/status/bit_and_spec.rb
index 97f768fdc1a920..0e0edb0afa3958 100644
--- a/spec/ruby/core/process/status/bit_and_spec.rb
+++ b/spec/ruby/core/process/status/bit_and_spec.rb
@@ -1,5 +1,38 @@
 require_relative '../../../spec_helper'
 
-describe "Process::Status#&" do
-  it "needs to be reviewed for spec completeness"
+ruby_version_is ""..."3.5" do
+
+  describe "Process::Status#&" do
+    it "returns a bitwise and of the integer status of an exited child" do
+      suppress_warning do
+        ruby_exe("exit(29)", exit_status: 29)
+        ($? & 0).should == 0
+        ($? & $?.to_i).should == $?.to_i
+
+        # Actual value is implementation specific
+        platform_is :linux do
+          # 29 == 0b11101
+          ($? & 0b1011100000000).should == 0b1010100000000
+        end
+      end
+    end
+
+    ruby_version_is "3.3"..."3.5" do
+      it "raises an ArgumentError if mask is negative" do
+        suppress_warning do
+          ruby_exe("exit(0)")
+          -> {
+            $? & -1
+          }.should raise_error(ArgumentError, 'negative mask value: -1')
+        end
+      end
+
+      it "shows a deprecation warning" do
+        ruby_exe("exit(0)")
+        -> {
+          $? & 0
+        }.should complain(/warning: Process::Status#& is deprecated and will be removed .*use other Process::Status predicates instead/)
+      end
+    end
+  end
 end
diff --git a/spec/ruby/core/process/status/right_shift_spec.rb b/spec/ruby/core/process/status/right_shift_spec.rb
index e9dda437e8b174..a1ab75141a3822 100644
--- a/spec/ruby/core/process/status/right_shift_spec.rb
+++ b/spec/ruby/core/process/status/right_shift_spec.rb
@@ -1,5 +1,37 @@
 require_relative '../../../spec_helper'
 
-describe "Process::Status#>>" do
-  it "needs to be reviewed for spec completeness"
+ruby_version_is ""..."3.5" do
+
+  describe "Process::Status#>>" do
+    it "returns a right shift of the integer status of an exited child" do
+      suppress_warning do
+        ruby_exe("exit(29)", exit_status: 29)
+        ($? >> 0).should == $?.to_i
+        ($? >> 1).should == $?.to_i >> 1
+
+        # Actual value is implementation specific
+        platform_is :linux do
+          ($? >> 8).should == 29
+        end
+      end
+    end
+
+    ruby_version_is "3.3"..."3.5" do
+      it "raises an ArgumentError if shift value is negative" do
+        suppress_warning do
+          ruby_exe("exit(0)")
+          -> {
+            $? >> -1
+          }.should raise_error(ArgumentError, 'negative shift value: -1')
+        end
+      end
+
+      it "shows a deprecation warning" do
+        ruby_exe("exit(0)")
+        -> {
+          $? >> 0
+        }.should complain(/warning: Process::Status#>> is deprecated and will be removed .*use other Process::Status attributes instead/)
+      end
+    end
+  end
 end
diff --git a/spec/ruby/core/process/status/termsig_spec.rb b/spec/ruby/core/process/status/termsig_spec.rb
index 5d286950f88f1a..9a22dbea7180c6 100644
--- a/spec/ruby/core/process/status/termsig_spec.rb
+++ b/spec/ruby/core/process/status/termsig_spec.rb
@@ -6,7 +6,7 @@
       ruby_exe("exit(0)")
     end
 
-    it "returns true" do
+    it "returns nil" do
       $?.termsig.should be_nil
     end
   end
diff --git a/spec/ruby/core/process/times_spec.rb b/spec/ruby/core/process/times_spec.rb
index d2610f64157c45..d3bff2cda9fc59 100644
--- a/spec/ruby/core/process/times_spec.rb
+++ b/spec/ruby/core/process/times_spec.rb
@@ -16,31 +16,4 @@
       Process.times.utime.should > user
     end
   end
-
-  # TODO: The precision of `getrusage` depends on platforms (OpenBSD
-  # seems not supporting under-milliseconds in fact); this example is
-  # very questionable as an example of Ruby, and it just repeats the
-  # guard condition.
-  guard -> do
-    1000.times.any? do
-      # If getrusage has precision beyond milliseconds, there will be
-      # very likely at least one non-zero microsecond results when
-      # repeating enough.
-      time = Process.clock_gettime(:GETRUSAGE_BASED_CLOCK_PROCESS_CPUTIME_ID)
-      not ('%.6f' % time).end_with?('000')
-    end
-  rescue Errno::EINVAL
-    false
-  end do
-    it "uses getrusage when available to improve precision beyond milliseconds" do
-      max = 10_000
-
-      found = (max * 100).times.find do
-        time = Process.times.utime
-        !('%.6f' % time).end_with?('000')
-      end
-
-      found.should_not == nil
-    end
-  end
 end
diff --git a/spec/ruby/core/process/tms/cstime_spec.rb b/spec/ruby/core/process/tms/cstime_spec.rb
new file mode 100644
index 00000000000000..9c2d9e8632e218
--- /dev/null
+++ b/spec/ruby/core/process/tms/cstime_spec.rb
@@ -0,0 +1,17 @@
+require_relative '../../../spec_helper'
+
+describe "Process::Tms#cstime" do
+  it "returns cstime attribute" do
+    cstime = Object.new
+    Process::Tms.new(nil, nil, nil, cstime).cstime.should == cstime
+  end
+end
+
+describe "Process::Tms#cstime=" do
+  it "assigns a value to the cstime attribute" do
+    cstime = Object.new
+    tms = Process::Tms.new
+    tms.cstime = cstime
+    tms.cstime.should == cstime
+  end
+end
diff --git a/spec/ruby/core/process/tms/cutime_spec.rb b/spec/ruby/core/process/tms/cutime_spec.rb
new file mode 100644
index 00000000000000..0ac3ff1964fe64
--- /dev/null
+++ b/spec/ruby/core/process/tms/cutime_spec.rb
@@ -0,0 +1,17 @@
+require_relative '../../../spec_helper'
+
+describe "Process::Tms#cutime" do
+  it "returns cutime attribute" do
+    cutime = Object.new
+    Process::Tms.new(nil, nil, cutime, nil).cutime.should == cutime
+  end
+end
+
+describe "Process::Tms#cutime=" do
+  it "assigns a value to the cutime attribute" do
+    cutime = Object.new
+    tms = Process::Tms.new
+    tms.cutime = cutime
+    tms.cutime.should == cutime
+  end
+end
diff --git a/spec/ruby/core/process/tms/stime_spec.rb b/spec/ruby/core/process/tms/stime_spec.rb
new file mode 100644
index 00000000000000..1e8371475f0d1a
--- /dev/null
+++ b/spec/ruby/core/process/tms/stime_spec.rb
@@ -0,0 +1,17 @@
+require_relative '../../../spec_helper'
+
+describe "Process::Tms#stime" do
+  it "returns stime attribute" do
+    stime = Object.new
+    Process::Tms.new(nil, stime, nil, nil).stime.should == stime
+  end
+end
+
+describe "Process::Tms#stime=" do
+  it "assigns a value to the stime attribute" do
+    stime = Object.new
+    tms = Process::Tms.new
+    tms.stime = stime
+    tms.stime.should == stime
+  end
+end
diff --git a/spec/ruby/core/process/tms/utime_spec.rb b/spec/ruby/core/process/tms/utime_spec.rb
new file mode 100644
index 00000000000000..403a31e2e6ed69
--- /dev/null
+++ b/spec/ruby/core/process/tms/utime_spec.rb
@@ -0,0 +1,17 @@
+require_relative '../../../spec_helper'
+
+describe "Process::Tms#utime" do
+  it "returns utime attribute" do
+    utime = Object.new
+    Process::Tms.new(utime, nil, nil, nil).utime.should == utime
+  end
+end
+
+describe "Process::Tms#utime=" do
+  it "assigns a value to the ctime attribute" do
+    utime = Object.new
+    tms = Process::Tms.new
+    tms.utime = utime
+    tms.utime.should == utime
+  end
+end
diff --git a/spec/ruby/core/process/waitpid_spec.rb b/spec/ruby/core/process/waitpid_spec.rb
index f7cf1a45a81402..a02147b663c364 100644
--- a/spec/ruby/core/process/waitpid_spec.rb
+++ b/spec/ruby/core/process/waitpid_spec.rb
@@ -2,7 +2,8 @@
 
 describe "Process.waitpid" do
   it "returns nil when the process has not yet completed and WNOHANG is specified" do
-    pid = spawn("sleep 5")
+    cmd = platform_is(:windows) ? "timeout" : "sleep"
+    pid = spawn("#{cmd} 5")
     begin
       Process.waitpid(pid, Process::WNOHANG).should == nil
       Process.kill("KILL", pid)
diff --git a/spec/ruby/core/queue/deq_spec.rb b/spec/ruby/core/queue/deq_spec.rb
index f84d4220ea466c..a2784e6a63f5ca 100644
--- a/spec/ruby/core/queue/deq_spec.rb
+++ b/spec/ruby/core/queue/deq_spec.rb
@@ -7,7 +7,5 @@
 end
 
 describe "Queue operations with timeout" do
-  ruby_version_is "3.2" do
-    it_behaves_like :rb_num2dbl_fails, nil, -> v { q = Queue.new; q.push(1); q.deq(timeout: v) }
-  end
+  it_behaves_like :rb_num2dbl_fails, nil, -> v { q = Queue.new; q.push(1); q.deq(timeout: v) }
 end
diff --git a/spec/ruby/core/queue/freeze_spec.rb b/spec/ruby/core/queue/freeze_spec.rb
new file mode 100644
index 00000000000000..ced2cc52dde6ff
--- /dev/null
+++ b/spec/ruby/core/queue/freeze_spec.rb
@@ -0,0 +1,6 @@
+require_relative '../../spec_helper'
+require_relative '../../shared/queue/freeze'
+
+describe "Queue#freeze" do
+  it_behaves_like :queue_freeze, :freeze, -> { Queue.new }
+end
diff --git a/spec/ruby/core/queue/initialize_spec.rb b/spec/ruby/core/queue/initialize_spec.rb
index c6c1ae63c5eb49..592fbe24870d0e 100644
--- a/spec/ruby/core/queue/initialize_spec.rb
+++ b/spec/ruby/core/queue/initialize_spec.rb
@@ -11,9 +11,21 @@
     Queue.private_instance_methods.include?(:initialize).should == true
   end
 
-  ruby_version_is '3.1' do
-    it "adds all elements of the passed Enumerable to self" do
-      q = Queue.new([1, 2, 3])
+  it "adds all elements of the passed Enumerable to self" do
+    q = Queue.new([1, 2, 3])
+    q.size.should == 3
+    q.should_not.empty?
+    q.pop.should == 1
+    q.pop.should == 2
+    q.pop.should == 3
+    q.should.empty?
+  end
+
+  describe "converts the given argument to an Array using #to_a" do
+    it "uses #to_a on the provided Enumerable" do
+      enumerable = MockObject.new('mock-enumerable')
+      enumerable.should_receive(:to_a).and_return([1, 2, 3])
+      q = Queue.new(enumerable)
       q.size.should == 3
       q.should_not.empty?
       q.pop.should == 1
@@ -22,41 +34,27 @@
       q.should.empty?
     end
 
-    describe "converts the given argument to an Array using #to_a" do
-      it "uses #to_a on the provided Enumerable" do
-        enumerable = MockObject.new('mock-enumerable')
-        enumerable.should_receive(:to_a).and_return([1, 2, 3])
-        q = Queue.new(enumerable)
-        q.size.should == 3
-        q.should_not.empty?
-        q.pop.should == 1
-        q.pop.should == 2
-        q.pop.should == 3
-        q.should.empty?
-      end
-
-      it "raises a TypeError if the given argument can't be converted to an Array" do
-        -> { Queue.new(42) }.should raise_error(TypeError)
-        -> { Queue.new(:abc) }.should raise_error(TypeError)
-      end
-
-      it "raises a NoMethodError if the given argument raises a NoMethodError during type coercion to an Array" do
-        enumerable = MockObject.new('mock-enumerable')
-        enumerable.should_receive(:to_a).and_raise(NoMethodError)
-        -> { Queue.new(enumerable) }.should raise_error(NoMethodError)
-      end
+    it "raises a TypeError if the given argument can't be converted to an Array" do
+      -> { Queue.new(42) }.should raise_error(TypeError)
+      -> { Queue.new(:abc) }.should raise_error(TypeError)
     end
 
-    it "raises TypeError if the provided Enumerable does not respond to #to_a" do
+    it "raises a NoMethodError if the given argument raises a NoMethodError during type coercion to an Array" do
       enumerable = MockObject.new('mock-enumerable')
-      -> { Queue.new(enumerable) }.should raise_error(TypeError, "can't convert MockObject into Array")
+      enumerable.should_receive(:to_a).and_raise(NoMethodError)
+      -> { Queue.new(enumerable) }.should raise_error(NoMethodError)
     end
+  end
 
-    it "raises TypeError if #to_a does not return Array" do
-      enumerable = MockObject.new('mock-enumerable')
-      enumerable.should_receive(:to_a).and_return("string")
+  it "raises TypeError if the provided Enumerable does not respond to #to_a" do
+    enumerable = MockObject.new('mock-enumerable')
+    -> { Queue.new(enumerable) }.should raise_error(TypeError, "can't convert MockObject into Array")
+  end
 
-      -> { Queue.new(enumerable) }.should raise_error(TypeError, "can't convert MockObject to Array (MockObject#to_a gives String)")
-    end
+  it "raises TypeError if #to_a does not return Array" do
+    enumerable = MockObject.new('mock-enumerable')
+    enumerable.should_receive(:to_a).and_return("string")
+
+    -> { Queue.new(enumerable) }.should raise_error(TypeError, "can't convert MockObject to Array (MockObject#to_a gives String)")
   end
 end
diff --git a/spec/ruby/core/queue/pop_spec.rb b/spec/ruby/core/queue/pop_spec.rb
index d344740834521c..3dff7db242700c 100644
--- a/spec/ruby/core/queue/pop_spec.rb
+++ b/spec/ruby/core/queue/pop_spec.rb
@@ -7,7 +7,5 @@
 end
 
 describe "Queue operations with timeout" do
-  ruby_version_is "3.2" do
-    it_behaves_like :rb_num2dbl_fails, nil, -> v { q = Queue.new; q.push(1); q.pop(timeout: v) }
-  end
+  it_behaves_like :rb_num2dbl_fails, nil, -> v { q = Queue.new; q.push(1); q.pop(timeout: v) }
 end
diff --git a/spec/ruby/core/queue/shift_spec.rb b/spec/ruby/core/queue/shift_spec.rb
index 64165e0b61ef5a..c105da74b2ec4f 100644
--- a/spec/ruby/core/queue/shift_spec.rb
+++ b/spec/ruby/core/queue/shift_spec.rb
@@ -7,7 +7,5 @@
 end
 
 describe "Queue operations with timeout" do
-  ruby_version_is "3.2" do
-    it_behaves_like :rb_num2dbl_fails, nil, -> v { q = Queue.new; q.push(1); q.shift(timeout: v) }
-  end
+  it_behaves_like :rb_num2dbl_fails, nil, -> v { q = Queue.new; q.push(1); q.shift(timeout: v) }
 end
diff --git a/spec/ruby/core/random/bytes_spec.rb b/spec/ruby/core/random/bytes_spec.rb
index b42dc61234d174..c9be07cd3f2eaf 100644
--- a/spec/ruby/core/random/bytes_spec.rb
+++ b/spec/ruby/core/random/bytes_spec.rb
@@ -1,4 +1,4 @@
-# -*- encoding: binary -*-
+# encoding: binary
 require_relative '../../spec_helper'
 require_relative 'shared/bytes'
 
diff --git a/spec/ruby/core/random/default_spec.rb b/spec/ruby/core/random/default_spec.rb
index 01d7430df871bf..9e4845986d933c 100644
--- a/spec/ruby/core/random/default_spec.rb
+++ b/spec/ruby/core/random/default_spec.rb
@@ -1,35 +1,7 @@
 require_relative '../../spec_helper'
 
 describe "Random::DEFAULT" do
-  ruby_version_is ''...'3.2' do
-    it "returns a random number generator" do
-      suppress_warning do
-        Random::DEFAULT.should respond_to(:rand)
-      end
-    end
-
-    it "changes seed on reboot" do
-      seed1 = ruby_exe('p Random::DEFAULT.seed', options: '--disable-gems')
-      seed2 = ruby_exe('p Random::DEFAULT.seed', options: '--disable-gems')
-      seed1.should != seed2
-    end
-
-    it "refers to the Random class" do
-      suppress_warning do
-        Random::DEFAULT.should.equal?(Random)
-      end
-    end
-
-    it "is deprecated" do
-      -> {
-        Random::DEFAULT.should.equal?(Random)
-      }.should complain(/constant Random::DEFAULT is deprecated/)
-    end
-  end
-
-  ruby_version_is '3.2' do
-    it "is no longer defined" do
-      Random.should_not.const_defined?(:DEFAULT)
-    end
+  it "is no longer defined" do
+    Random.should_not.const_defined?(:DEFAULT)
   end
 end
diff --git a/spec/ruby/core/range/bsearch_spec.rb b/spec/ruby/core/range/bsearch_spec.rb
index 9c93671d85d12f..5254ab756cb1ca 100644
--- a/spec/ruby/core/range/bsearch_spec.rb
+++ b/spec/ruby/core/range/bsearch_spec.rb
@@ -9,22 +9,30 @@
   it_behaves_like :enumeratorized_with_unknown_size, :bsearch, (1..3)
 
   it "raises a TypeError if the block returns an Object" do
-    -> { (0..1).bsearch { Object.new } }.should raise_error(TypeError)
+    -> { (0..1).bsearch { Object.new } }.should raise_error(TypeError, "wrong argument type Object (must be numeric, true, false or nil)")
   end
 
-  it "raises a TypeError if the block returns a String" do
-    -> { (0..1).bsearch { "1" } }.should raise_error(TypeError)
+  it "raises a TypeError if the block returns a String and boundaries are Integer values" do
+    -> { (0..1).bsearch { "1" } }.should raise_error(TypeError, "wrong argument type String (must be numeric, true, false or nil)")
+  end
+
+  it "raises a TypeError if the block returns a String and boundaries are Float values" do
+    -> { (0.0..1.0).bsearch { "1" } }.should raise_error(TypeError, "wrong argument type String (must be numeric, true, false or nil)")
   end
 
   it "raises a TypeError if the Range has Object values" do
     value = mock("range bsearch")
     r = Range.new value, value
 
-    -> { r.bsearch { true } }.should raise_error(TypeError)
+    -> { r.bsearch { true } }.should raise_error(TypeError, "can't do binary search for MockObject")
   end
 
   it "raises a TypeError if the Range has String values" do
-    -> { ("a".."e").bsearch { true } }.should raise_error(TypeError)
+    -> { ("a".."e").bsearch { true } }.should raise_error(TypeError, "can't do binary search for String")
+  end
+
+  it "raises TypeError when non-Numeric begin/end and block not passed" do
+    -> { ("a".."e").bsearch }.should raise_error(TypeError, "can't do binary search for String")
   end
 
   context "with Integer values" do
@@ -94,6 +102,10 @@
       (4..2).bsearch { 0 }.should == nil
       (4..2).bsearch { -1 }.should == nil
     end
+
+    it "returns enumerator when block not passed" do
+      (0...3).bsearch.kind_of?(Enumerator).should == true
+    end
   end
 
   context "with Float values" do
@@ -156,7 +168,6 @@
 
       it "returns nil if the block returns greater than zero for every element" do
         (0.3..3.0).bsearch { |x| x <=> -1 }.should be_nil
-
       end
 
       it "returns nil if the block never returns zero" do
@@ -213,6 +224,10 @@
         (0...inf).bsearch { |x| x >= Float::MAX ? 0 : 1 }.should == Float::MAX
       end
     end
+
+    it "returns enumerator when block not passed" do
+      (0.1...2.3).bsearch.kind_of?(Enumerator).should == true
+    end
   end
 
   context "with endless ranges and Integer values" do
@@ -250,6 +265,10 @@
         [1, 2, 3].should include(result)
       end
     end
+
+    it "returns enumerator when block not passed" do
+      eval("(-2..)").bsearch.kind_of?(Enumerator).should == true
+    end
   end
 
   context "with endless ranges and Float values" do
@@ -327,8 +346,11 @@
         eval("(0.0...)").bsearch { 0 }.should != inf
       end
     end
-  end
 
+    it "returns enumerator when block not passed" do
+      eval("(0.1..)").bsearch.kind_of?(Enumerator).should == true
+    end
+  end
 
   context "with beginless ranges and Integer values" do
     context "with a block returning true or false" do
@@ -361,6 +383,10 @@
         [1, 2, 3].should include(result)
       end
     end
+
+    it "returns enumerator when block not passed" do
+      (..10).bsearch.kind_of?(Enumerator).should == true
+    end
   end
 
   context "with beginless ranges and Float values" do
@@ -432,5 +458,9 @@
         (...inf).bsearch { |x| 3 - x }.should == 3
       end
     end
+
+    it "returns enumerator when block not passed" do
+      (..-0.1).bsearch.kind_of?(Enumerator).should == true
+    end
   end
 end
diff --git a/spec/ruby/core/range/case_compare_spec.rb b/spec/ruby/core/range/case_compare_spec.rb
index 65878aaabe72e3..c9b253f0a585d9 100644
--- a/spec/ruby/core/range/case_compare_spec.rb
+++ b/spec/ruby/core/range/case_compare_spec.rb
@@ -11,7 +11,7 @@
   it_behaves_like :range_cover_and_include, :===
   it_behaves_like :range_cover, :===
 
-  ruby_bug "#19533", "3.2"..."3.3" do
+  ruby_bug "#19533", ""..."3.3" do
     it "returns true on any value if begin and end are both nil" do
       (nil..nil).should === 1
     end
diff --git a/spec/ruby/core/range/cover_spec.rb b/spec/ruby/core/range/cover_spec.rb
index eb7cddc9673f2f..c05bb50614e61c 100644
--- a/spec/ruby/core/range/cover_spec.rb
+++ b/spec/ruby/core/range/cover_spec.rb
@@ -1,4 +1,4 @@
-# -*- encoding: binary -*-
+# encoding: binary
 require_relative '../../spec_helper'
 require_relative 'shared/cover_and_include'
 require_relative 'shared/cover'
diff --git a/spec/ruby/core/range/each_spec.rb b/spec/ruby/core/range/each_spec.rb
index ecae17c8819b54..f10330d61d7769 100644
--- a/spec/ruby/core/range/each_spec.rb
+++ b/spec/ruby/core/range/each_spec.rb
@@ -40,21 +40,21 @@
 
   it "works with endless ranges" do
     a = []
-    eval("(-2..)").each { |x| break if x > 2; a << x }
+    (-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 }
+    (-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'..).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'...).each { |x| break if x > "D"; a << x }
     a.should == ["A", "B", "C", "D"]
   end
 
@@ -82,27 +82,14 @@
     enum.to_a.should == [1, 2, 3]
   end
 
-  ruby_version_is "3.1" do
-    it "supports Time objects that respond to #succ" do
-      t = Time.utc(1970)
-      def t.succ; self + 1 end
-      t_succ = t.succ
-      def t_succ.succ; self + 1; end
+  it "supports Time objects that respond to #succ" do
+    t = Time.utc(1970)
+    def t.succ; self + 1 end
+    t_succ = t.succ
+    def t_succ.succ; self + 1; end
 
-      (t..t_succ).to_a.should == [Time.utc(1970), Time.utc(1970, nil, nil, nil, nil, 1)]
-      (t...t_succ).to_a.should == [Time.utc(1970)]
-    end
-  end
-
-  ruby_version_is ""..."3.1" do
-    it "raises a TypeError if the first element is a Time object even if it responds to #succ" do
-      t = Time.utc(1970)
-      def t.succ; self + 1 end
-      t_succ = t.succ
-      def t_succ.succ; self + 1; end
-
-      -> { (t..t_succ).each { |i| i } }.should raise_error(TypeError)
-    end
+    (t..t_succ).to_a.should == [Time.utc(1970), Time.utc(1970, nil, nil, nil, nil, 1)]
+    (t...t_succ).to_a.should == [Time.utc(1970)]
   end
 
   it "passes each Symbol element by using #succ" do
diff --git a/spec/ruby/core/range/include_spec.rb b/spec/ruby/core/range/include_spec.rb
index 277de205d10521..449e18985b9505 100644
--- a/spec/ruby/core/range/include_spec.rb
+++ b/spec/ruby/core/range/include_spec.rb
@@ -1,4 +1,4 @@
-# -*- encoding: binary -*-
+# encoding: binary
 require_relative '../../spec_helper'
 require_relative 'shared/cover_and_include'
 require_relative 'shared/include'
diff --git a/spec/ruby/core/range/last_spec.rb b/spec/ruby/core/range/last_spec.rb
index 6698686dd569a9..82b3e2ff5340cb 100644
--- a/spec/ruby/core/range/last_spec.rb
+++ b/spec/ruby/core/range/last_spec.rb
@@ -8,10 +8,8 @@
     (1..5).last(3).should == [3, 4, 5]
   end
 
-  ruby_bug '#18994', '2.7'...'3.2' do
-    it "returns the specified number if elements for single element inclusive range" do
-      (1..1).last(1).should == [1]
-    end
+  it "returns the specified number if elements for single element inclusive range" do
+    (1..1).last(1).should == [1]
   end
 
   it "returns an empty array for an empty Range" do
diff --git a/spec/ruby/core/range/max_spec.rb b/spec/ruby/core/range/max_spec.rb
index a3bbc31e7d90fd..8b83f69a5a2121 100644
--- a/spec/ruby/core/range/max_spec.rb
+++ b/spec/ruby/core/range/max_spec.rb
@@ -55,10 +55,24 @@
     (..1.0).max.should == 1.0
   end
 
-  it "raises for an exclusive beginless range" do
+  ruby_version_is ""..."3.5" do
+    it "raises for an exclusive beginless Integer range" do
+      -> {
+        (...1).max
+      }.should raise_error(TypeError, 'cannot exclude end value with non Integer begin value')
+    end
+  end
+
+  ruby_version_is "3.5" do
+    it "returns the end point for exclusive beginless Integer ranges" do
+      (...1).max.should == 0
+    end
+  end
+
+  it "raises for an exclusive beginless non Integer range" do
     -> {
-      (...1).max
-    }.should raise_error(TypeError, 'cannot exclude end value with non Integer begin value')
+      (...1.0).max
+    }.should raise_error(TypeError, 'cannot exclude non Integer end value')
   end
 end
 
diff --git a/spec/ruby/core/range/member_spec.rb b/spec/ruby/core/range/member_spec.rb
index ab61f929514405..78299ae9e5ea3b 100644
--- a/spec/ruby/core/range/member_spec.rb
+++ b/spec/ruby/core/range/member_spec.rb
@@ -1,4 +1,4 @@
-# -*- encoding: binary -*-
+# encoding: binary
 require_relative '../../spec_helper'
 require_relative 'shared/cover_and_include'
 require_relative 'shared/include'
diff --git a/spec/ruby/core/range/overlap_spec.rb b/spec/ruby/core/range/overlap_spec.rb
new file mode 100644
index 00000000000000..9b6fc134934208
--- /dev/null
+++ b/spec/ruby/core/range/overlap_spec.rb
@@ -0,0 +1,89 @@
+require_relative '../../spec_helper'
+
+ruby_version_is '3.3' do
+  describe "Range#overlap?" do
+    it "returns true if other Range overlaps self" do
+      (0..2).overlap?(1..3).should == true
+      (1..3).overlap?(0..2).should == true
+      (0..2).overlap?(0..2).should == true
+      (0..3).overlap?(1..2).should == true
+      (1..2).overlap?(0..3).should == true
+
+      ('a'..'c').overlap?('b'..'d').should == true
+    end
+
+    it "returns false if other Range does not overlap self" do
+      (0..2).overlap?(3..4).should == false
+      (0..2).overlap?(-4..-1).should == false
+
+      ('a'..'c').overlap?('d'..'f').should == false
+    end
+
+    it "raises TypeError when called with non-Range argument" do
+      -> {
+        (0..2).overlap?(1)
+      }.should raise_error(TypeError, "wrong argument type Integer (expected Range)")
+    end
+
+    it "returns true when beginningless and endless Ranges overlap" do
+      (0..2).overlap?(..3).should == true
+      (0..2).overlap?(..1).should == true
+      (0..2).overlap?(..0).should == true
+
+      (..3).overlap?(0..2).should == true
+      (..1).overlap?(0..2).should == true
+      (..0).overlap?(0..2).should == true
+
+      (0..2).overlap?(-1..).should == true
+      (0..2).overlap?(1..).should == true
+      (0..2).overlap?(2..).should == true
+
+      (-1..).overlap?(0..2).should == true
+      (1..).overlap?(0..2).should == true
+      (2..).overlap?(0..2).should == true
+
+      (0..).overlap?(2..).should == true
+      (..0).overlap?(..2).should == true
+    end
+
+    it "returns false when beginningless and endless Ranges do not overlap" do
+      (0..2).overlap?(..-1).should == false
+      (0..2).overlap?(3..).should == false
+
+      (..-1).overlap?(0..2).should == false
+      (3..).overlap?(0..2).should == false
+    end
+
+    it "returns false when Ranges are not compatible" do
+      (0..2).overlap?('a'..'d').should == false
+    end
+
+    it "return false when self is empty" do
+      (2..0).overlap?(1..3).should == false
+      (2...2).overlap?(1..3).should == false
+      (1...1).overlap?(1...1).should == false
+      (2..0).overlap?(2..0).should == false
+
+      ('c'..'a').overlap?('b'..'d').should == false
+      ('a'...'a').overlap?('b'..'d').should == false
+      ('b'...'b').overlap?('b'...'b').should == false
+      ('c'...'a').overlap?('c'...'a').should == false
+    end
+
+    it "return false when other Range is empty" do
+      (1..3).overlap?(2..0).should == false
+      (1..3).overlap?(2...2).should == false
+
+      ('b'..'d').overlap?('c'..'a').should == false
+      ('b'..'d').overlap?('c'...'c').should == false
+    end
+
+    it "takes into account exclusive end" do
+      (0...2).overlap?(2..4).should == false
+      (2..4).overlap?(0...2).should == false
+
+      ('a'...'c').overlap?('c'..'e').should == false
+      ('c'..'e').overlap?('a'...'c').should == false
+    end
+  end
+end
diff --git a/spec/ruby/core/range/reverse_each_spec.rb b/spec/ruby/core/range/reverse_each_spec.rb
new file mode 100644
index 00000000000000..b51e04c3fff24e
--- /dev/null
+++ b/spec/ruby/core/range/reverse_each_spec.rb
@@ -0,0 +1,103 @@
+require_relative '../../spec_helper'
+
+ruby_version_is "3.3" do
+  describe "Range#reverse_each" do
+    it "traverses the Range in reverse order and passes each element to block" do
+      a = []
+      (1..3).reverse_each { |i| a << i }
+      a.should == [3, 2, 1]
+
+      a = []
+      (1...3).reverse_each { |i| a << i }
+      a.should == [2, 1]
+    end
+
+    it "returns self" do
+      r = (1..3)
+      r.reverse_each { |x| }.should equal(r)
+    end
+
+    it "returns an Enumerator if no block given" do
+      enum = (1..3).reverse_each
+      enum.should be_an_instance_of(Enumerator)
+      enum.to_a.should == [3, 2, 1]
+    end
+
+    it "raises a TypeError for endless Ranges of Integers" do
+      -> {
+        (1..).reverse_each.take(3)
+      }.should raise_error(TypeError, "can't iterate from NilClass")
+    end
+
+    it "raises a TypeError for endless Ranges of non-Integers" do
+      -> {
+        ("a"..).reverse_each.take(3)
+      }.should raise_error(TypeError, "can't iterate from NilClass")
+    end
+
+    context "Integer boundaries" do
+      it "supports beginningless Ranges" do
+        (..5).reverse_each.take(3).should == [5, 4, 3]
+      end
+    end
+
+    context "non-Integer boundaries" do
+      it "uses #succ to iterate a Range of non-Integer elements" do
+        y = mock('y')
+        x = mock('x')
+
+        x.should_receive(:succ).any_number_of_times.and_return(y)
+        x.should_receive(:<=>).with(y).any_number_of_times.and_return(-1)
+        x.should_receive(:<=>).with(x).any_number_of_times.and_return(0)
+        y.should_receive(:<=>).with(x).any_number_of_times.and_return(1)
+        y.should_receive(:<=>).with(y).any_number_of_times.and_return(0)
+
+        a = []
+        (x..y).each { |i| a << i }
+        a.should == [x, y]
+      end
+
+      it "uses #succ to iterate a Range of Strings" do
+        a = []
+        ('A'..'D').reverse_each { |i| a << i }
+        a.should == ['D','C','B','A']
+      end
+
+      it "uses #succ to iterate a Range of Symbols" do
+        a = []
+        (:A..:D).reverse_each { |i| a << i }
+        a.should == [:D, :C, :B, :A]
+      end
+
+      it "raises a TypeError when `begin` value does not respond to #succ" do
+        -> { (Time.now..Time.now).reverse_each { |x| x } }.should raise_error(TypeError, /can't iterate from Time/)
+        -> { (//..//).reverse_each { |x| x } }.should raise_error(TypeError, /can't iterate from Regexp/)
+        -> { ([]..[]).reverse_each { |x| x } }.should raise_error(TypeError, /can't iterate from Array/)
+      end
+
+      it "does not support beginningless Ranges" do
+        -> {
+          (..'a').reverse_each { |x| x }
+        }.should raise_error(TypeError, /can't iterate from NilClass/)
+      end
+    end
+
+    context "when no block is given" do
+      describe "returned Enumerator size" do
+        it "returns the Range size when Range size is finite" do
+          (1..3).reverse_each.size.should == 3
+        end
+
+        ruby_bug "#20936", "3.4"..."3.5" do
+          it "returns Infinity when Range size is infinite" do
+            (..3).reverse_each.size.should == Float::INFINITY
+          end
+        end
+
+        it "returns nil when Range size is unknown" do
+          ('a'..'z').reverse_each.size.should == nil
+        end
+      end
+    end
+  end
+end
diff --git a/spec/ruby/core/range/shared/cover.rb b/spec/ruby/core/range/shared/cover.rb
index 0b41a264557ce2..eaefb45942f59d 100644
--- a/spec/ruby/core/range/shared/cover.rb
+++ b/spec/ruby/core/range/shared/cover.rb
@@ -1,4 +1,4 @@
-# -*- encoding: binary -*-
+# encoding: binary
 require_relative '../../../spec_helper'
 require_relative '../fixtures/classes'
 
diff --git a/spec/ruby/core/range/shared/cover_and_include.rb b/spec/ruby/core/range/shared/cover_and_include.rb
index f36a2cef8b500a..13fc5e17906d03 100644
--- a/spec/ruby/core/range/shared/cover_and_include.rb
+++ b/spec/ruby/core/range/shared/cover_and_include.rb
@@ -1,4 +1,4 @@
-# -*- encoding: binary -*-
+# encoding: binary
 require_relative '../../../spec_helper'
 
 describe :range_cover_and_include, shared: true do
@@ -20,8 +20,8 @@
   end
 
   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
+    (1..).send(@method, 2.4).should == true
+    (0.5...).send(@method, 2.4).should == true
   end
 
   it "returns true if other is an element of self for beginless ranges" do
@@ -29,6 +29,17 @@
     (...10.5).send(@method, 2.4).should == true
   end
 
+  it "returns false if values are not comparable" do
+    (1..10).send(@method, nil).should == false
+    (1...10).send(@method, nil).should == false
+
+    (..10).send(@method, nil).should == false
+    (...10).send(@method, nil).should == false
+
+    (1..).send(@method, nil).should == false
+    (1...).send(@method, nil).should == false
+  end
+
   it "compares values using <=>" do
     rng = (1..5)
     m = mock("int")
diff --git a/spec/ruby/core/range/shared/include.rb b/spec/ruby/core/range/shared/include.rb
index c6c5c2becf9931..15a0e5fb9fbb3c 100644
--- a/spec/ruby/core/range/shared/include.rb
+++ b/spec/ruby/core/range/shared/include.rb
@@ -1,4 +1,4 @@
-# -*- encoding: binary -*-
+# encoding: binary
 require_relative '../../../spec_helper'
 require_relative '../fixtures/classes'
 
diff --git a/spec/ruby/core/range/size_spec.rb b/spec/ruby/core/range/size_spec.rb
index 81ea5a3846ab37..1a3ddd197e9d82 100644
--- a/spec/ruby/core/range/size_spec.rb
+++ b/spec/ruby/core/range/size_spec.rb
@@ -4,46 +4,25 @@
   it "returns the number of elements in the range" do
     (1..16).size.should == 16
     (1...16).size.should == 15
-
-    (1.0..16.0).size.should == 16
-    (1.0...16.0).size.should == 15
-    (1.0..15.9).size.should == 15
-    (1.1..16.0).size.should == 15
-    (1.1..15.9).size.should == 15
   end
 
   it "returns 0 if last is less than first" do
     (16..0).size.should == 0
-    (16.0..0.0).size.should == 0
-    (Float::INFINITY..0).size.should == 0
   end
 
   it 'returns Float::INFINITY for increasing, infinite ranges' do
     (0..Float::INFINITY).size.should == Float::INFINITY
-    (-Float::INFINITY..0).size.should == Float::INFINITY
-    (-Float::INFINITY..Float::INFINITY).size.should == Float::INFINITY
   end
 
   it 'returns Float::INFINITY for endless ranges if the start is numeric' do
     eval("(1..)").size.should == Float::INFINITY
-    eval("(0.5...)").size.should == Float::INFINITY
   end
 
   it 'returns nil for endless ranges if the start is not numeric' do
     eval("('z'..)").size.should == nil
-    eval("([]...)").size.should == nil
-  end
-
-  ruby_version_is ""..."3.2" do
-    it 'returns Float::INFINITY for all beginless ranges' do
-      (..1).size.should == Float::INFINITY
-      (...0.5).size.should == Float::INFINITY
-      (..nil).size.should == Float::INFINITY
-      (...'o').size.should == Float::INFINITY
-    end
   end
 
-  ruby_version_is "3.2" do
+  ruby_version_is ""..."3.4" do
     it 'returns Float::INFINITY for all beginless ranges if the end is numeric' do
       (..1).size.should == Float::INFINITY
       (...0.5).size.should == Float::INFINITY
@@ -58,6 +37,54 @@
     end
   end
 
+  ruby_version_is ""..."3.4" do
+    it "returns the number of elements in the range" do
+      (1.0..16.0).size.should == 16
+      (1.0...16.0).size.should == 15
+      (1.0..15.9).size.should == 15
+      (1.1..16.0).size.should == 15
+      (1.1..15.9).size.should == 15
+    end
+
+    it "returns 0 if last is less than first" do
+      (16.0..0.0).size.should == 0
+      (Float::INFINITY..0).size.should == 0
+    end
+
+    it 'returns Float::INFINITY for increasing, infinite ranges' do
+      (-Float::INFINITY..0).size.should == Float::INFINITY
+      (-Float::INFINITY..Float::INFINITY).size.should == Float::INFINITY
+    end
+
+    it 'returns Float::INFINITY for endless ranges if the start is numeric' do
+      eval("(0.5...)").size.should == Float::INFINITY
+    end
+
+    it 'returns nil for endless ranges if the start is not numeric' do
+      eval("([]...)").size.should == nil
+    end
+  end
+
+  ruby_version_is "3.4" do
+    it 'raises TypeError if a range is not iterable' do
+      -> { (1.0..16.0).size }.should raise_error(TypeError, /can't iterate from/)
+      -> { (1.0...16.0).size }.should raise_error(TypeError, /can't iterate from/)
+      -> { (1.0..15.9).size }.should raise_error(TypeError, /can't iterate from/)
+      -> { (1.1..16.0).size }.should raise_error(TypeError, /can't iterate from/)
+      -> { (1.1..15.9).size }.should raise_error(TypeError, /can't iterate from/)
+      -> { (16.0..0.0).size }.should raise_error(TypeError, /can't iterate from/)
+      -> { (Float::INFINITY..0).size }.should raise_error(TypeError, /can't iterate from/)
+      -> { (-Float::INFINITY..0).size }.should raise_error(TypeError, /can't iterate from/)
+      -> { (-Float::INFINITY..Float::INFINITY).size }.should raise_error(TypeError, /can't iterate from/)
+      -> { (..1).size }.should raise_error(TypeError, /can't iterate from/)
+      -> { (...0.5).size }.should raise_error(TypeError, /can't iterate from/)
+      -> { (..nil).size }.should raise_error(TypeError, /can't iterate from/)
+      -> { (...'o').size }.should raise_error(TypeError, /can't iterate from/)
+      -> { eval("(0.5...)").size }.should raise_error(TypeError, /can't iterate from/)
+      -> { eval("([]...)").size }.should raise_error(TypeError, /can't iterate from/)
+    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 64ea3de4ed5576..0d0caf746d35ab 100644
--- a/spec/ruby/core/range/step_spec.rb
+++ b/spec/ruby/core/range/step_spec.rb
@@ -10,44 +10,50 @@
     r.step { }.should equal(r)
   end
 
-  it "raises TypeError if step" do
-    obj = mock("mock")
-    -> { (1..10).step(obj) { } }.should raise_error(TypeError)
-  end
+  ruby_version_is ""..."3.4" do
+    it "calls #to_int to coerce step to an Integer" do
+      obj = mock("Range#step")
+      obj.should_receive(:to_int).and_return(1)
 
-  it "calls #to_int to coerce step to an Integer" do
-    obj = mock("Range#step")
-    obj.should_receive(:to_int).and_return(1)
+      (1..2).step(obj) { |x| ScratchPad << x }
+      ScratchPad.recorded.should eql([1, 2])
+    end
 
-    (1..2).step(obj) { |x| ScratchPad << x }
-    ScratchPad.recorded.should eql([1, 2])
-  end
+    it "raises a TypeError if step does not respond to #to_int" do
+      obj = mock("Range#step non-integer")
 
-  it "raises a TypeError if step does not respond to #to_int" do
-    obj = mock("Range#step non-integer")
+      -> { (1..2).step(obj) { } }.should raise_error(TypeError)
+    end
 
-    -> { (1..2).step(obj) { } }.should raise_error(TypeError)
-  end
+    it "raises a TypeError if #to_int does not return an Integer" do
+      obj = mock("Range#step non-integer")
+      obj.should_receive(:to_int).and_return("1")
 
-  it "raises a TypeError if #to_int does not return an Integer" do
-    obj = mock("Range#step non-integer")
-    obj.should_receive(:to_int).and_return("1")
+      -> { (1..2).step(obj) { } }.should raise_error(TypeError)
+    end
 
-    -> { (1..2).step(obj) { } }.should raise_error(TypeError)
-  end
+    it "raises a TypeError if the first element does not respond to #succ" do
+      obj = mock("Range#step non-comparable")
+      obj.should_receive(:<=>).with(obj).and_return(1)
 
-  it "coerces the argument to integer by invoking to_int" do
-    (obj = mock("2")).should_receive(:to_int).and_return(2)
-    res = []
-    (1..10).step(obj) {|x| res << x}
-    res.should == [1, 3, 5, 7, 9]
+      -> { (obj..obj).step { |x| x } }.should raise_error(TypeError)
+    end
   end
 
-  it "raises a TypeError if the first element does not respond to #succ" do
-    obj = mock("Range#step non-comparable")
-    obj.should_receive(:<=>).with(obj).and_return(1)
+  ruby_version_is "3.4" do
+    it "calls #coerce to coerce step to an Integer" do
+      obj = mock("Range#step")
+      obj.should_receive(:coerce).at_least(:once).and_return([1, 2])
+
+      (1..3).step(obj) { |x| ScratchPad << x }
+      ScratchPad.recorded.should eql([1, 3])
+    end
 
-    -> { (obj..obj).step { |x| x } }.should raise_error(TypeError)
+    it "raises a TypeError if step does not respond to #coerce" do
+      obj = mock("Range#step non-coercible")
+
+      -> { (1..2).step(obj) { } }.should raise_error(TypeError)
+    end
   end
 
   it "raises an ArgumentError if step is 0" do
@@ -58,8 +64,17 @@
     -> { (-1..1).step(0.0) { |x| x } }.should raise_error(ArgumentError)
   end
 
-  it "raises an ArgumentError if step is negative" do
-    -> { (-1..1).step(-2) { |x| x } }.should raise_error(ArgumentError)
+  ruby_version_is "3.4" do
+    it "does not raise an ArgumentError if step is 0 for non-numeric ranges" do
+      t = Time.utc(2023, 2, 24)
+      -> { (t..t+1).step(0) { break } }.should_not raise_error(ArgumentError)
+    end
+  end
+
+  ruby_version_is ""..."3.4" do
+    it "raises an ArgumentError if step is negative" do
+      -> { (-1..1).step(-2) { |x| x } }.should raise_error(ArgumentError)
+    end
   end
 
   describe "with inclusive end" do
@@ -78,6 +93,18 @@
         (-2..2).step(1.5) { |x| ScratchPad << x }
         ScratchPad.recorded.should eql([-2.0, -0.5, 1.0])
       end
+
+      ruby_version_is "3.4" do
+        it "does not iterate if step is negative for forward range" do
+          (-1..1).step(-1) { |x| ScratchPad << x }
+          ScratchPad.recorded.should eql([])
+        end
+
+        it "iterates backward if step is negative for backward range" do
+          (1..-1).step(-1) { |x| ScratchPad << x }
+          ScratchPad.recorded.should eql([1, 0, -1])
+        end
+      end
     end
 
     describe "and Float values" do
@@ -162,13 +189,96 @@
         -> { ("A".."G").step(2.0) { } }.should raise_error(TypeError)
       end
 
-      it "calls #succ on begin and each element returned by #succ" do
-        obj = mock("Range#step String start")
-        obj.should_receive(:<=>).exactly(3).times.and_return(-1, -1, -1, 0)
-        obj.should_receive(:succ).exactly(2).times.and_return(obj)
+      ruby_version_is ""..."3.4" do
+        it "calls #succ on begin and each element returned by #succ" do
+          obj = mock("Range#step String start")
+          obj.should_receive(:<=>).exactly(3).times.and_return(-1, -1, -1, 0)
+          obj.should_receive(:succ).exactly(2).times.and_return(obj)
+
+          (obj..obj).step { |x| ScratchPad << x }
+          ScratchPad.recorded.should == [obj, obj, obj]
+        end
+      end
+
+      ruby_version_is "3.4" do
+        it "yields String values adjusted by step and less than or equal to end" do
+          ("A".."AAA").step("A") { |x| ScratchPad << x }
+          ScratchPad.recorded.should == ["A", "AA", "AAA"]
+        end
+
+        it "raises a TypeError when passed an incompatible type step" do
+          -> { ("A".."G").step([]) { } }.should raise_error(TypeError)
+        end
+
+        it "calls #+ on begin and each element returned by #+" do
+          start = mock("Range#step String start")
+          stop = mock("Range#step String stop")
+
+          mid1 = mock("Range#step String mid1")
+          mid2 = mock("Range#step String mid2")
+
+          step = mock("Range#step String step")
+
+          # Deciding on the direction of iteration
+          start.should_receive(:<=>).with(stop).at_least(:twice).and_return(-1)
+          # Deciding whether the step moves iteration in the right direction
+          start.should_receive(:<=>).with(mid1).and_return(-1)
+          # Iteration 1
+          start.should_receive(:+).at_least(:once).with(step).and_return(mid1)
+          # Iteration 2
+          mid1.should_receive(:<=>).with(stop).and_return(-1)
+          mid1.should_receive(:+).with(step).and_return(mid2)
+          # Iteration 3
+          mid2.should_receive(:<=>).with(stop).and_return(0)
+
+          (start..stop).step(step) { |x| ScratchPad << x }
+          ScratchPad.recorded.should == [start, mid1, mid2]
+        end
+
+        it "iterates backward if the step is decreasing values, and the range is backward" do
+          start = mock("Range#step String start")
+          stop = mock("Range#step String stop")
+
+          mid1 = mock("Range#step String mid1")
+          mid2 = mock("Range#step String mid2")
+
+          step = mock("Range#step String step")
+
+          # Deciding on the direction of iteration
+          start.should_receive(:<=>).with(stop).at_least(:twice).and_return(1)
+          # Deciding whether the step moves iteration in the right direction
+          start.should_receive(:<=>).with(mid1).and_return(1)
+          # Iteration 1
+          start.should_receive(:+).at_least(:once).with(step).and_return(mid1)
+          # Iteration 2
+          mid1.should_receive(:<=>).with(stop).and_return(1)
+          mid1.should_receive(:+).with(step).and_return(mid2)
+          # Iteration 3
+          mid2.should_receive(:<=>).with(stop).and_return(0)
+
+          (start..stop).step(step) { |x| ScratchPad << x }
+          ScratchPad.recorded.should == [start, mid1, mid2]
+        end
+
+        it "does no iteration of the direction of the range and of the step don't match" do
+          start = mock("Range#step String start")
+          stop = mock("Range#step String stop")
 
-        (obj..obj).step { |x| ScratchPad << x }
-        ScratchPad.recorded.should == [obj, obj, obj]
+          mid1 = mock("Range#step String mid1")
+          mid2 = mock("Range#step String mid2")
+
+          step = mock("Range#step String step")
+
+          # Deciding on the direction of iteration: stop > start
+          start.should_receive(:<=>).with(stop).at_least(:twice).and_return(1)
+          # Deciding whether the step moves iteration in the right direction
+          # start + step < start, the direction is opposite to the range's
+          start.should_receive(:+).with(step).and_return(mid1)
+          start.should_receive(:<=>).with(mid1).and_return(-1)
+
+          (start..stop).step(step) { |x| ScratchPad << x }
+          ScratchPad.recorded.should == []
+        end
       end
     end
   end
@@ -212,13 +322,11 @@
         ScratchPad.recorded.should eql([1.0, 2.8, 4.6])
       end
 
-      ruby_version_is '3.1' do
-        it "correctly handles values near the upper limit" do # https://bugs.ruby-lang.org/issues/16612
-          (1.0...55.6).step(18.2) { |x| ScratchPad << x }
-          ScratchPad.recorded.should eql([1.0, 19.2, 37.4, 55.599999999999994])
+      it "correctly handles values near the upper limit" do # https://bugs.ruby-lang.org/issues/16612
+        (1.0...55.6).step(18.2) { |x| ScratchPad << x }
+        ScratchPad.recorded.should eql([1.0, 19.2, 37.4, 55.599999999999994])
 
-          (1.0...55.6).step(18.2).size.should == 4
-        end
+        (1.0...55.6).step(18.2).size.should == 4
       end
 
       it "handles infinite values at either end" do
@@ -266,18 +374,31 @@
     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
-        ("A"..."E").step { |x| ScratchPad << x }
-        ScratchPad.recorded.should == ["A", "B", "C", "D"]
-      end
+      ruby_version_is ""..."3.4" do
+        it "yields String values incremented by #succ and less than or equal to end when not passed a step" do
+          ("A"..."E").step { |x| ScratchPad << x }
+          ScratchPad.recorded.should == ["A", "B", "C", "D"]
+        end
 
-      it "yields String values incremented by #succ called Integer step times" do
-        ("A"..."G").step(2) { |x| ScratchPad << x }
-        ScratchPad.recorded.should == ["A", "C", "E"]
+        it "yields String values incremented by #succ called Integer step times" do
+          ("A"..."G").step(2) { |x| ScratchPad << x }
+          ScratchPad.recorded.should == ["A", "C", "E"]
+        end
+
+        it "raises a TypeError when passed a Float step" do
+          -> { ("A"..."G").step(2.0) { } }.should raise_error(TypeError)
+        end
       end
 
-      it "raises a TypeError when passed a Float step" do
-        -> { ("A"..."G").step(2.0) { } }.should raise_error(TypeError)
+      ruby_version_is "3.4" do
+        it "yields String values adjusted by step and less than or equal to end" do
+          ("A"..."AAA").step("A") { |x| ScratchPad << x }
+          ScratchPad.recorded.should == ["A", "AA"]
+        end
+
+        it "raises a TypeError when passed an incompatible type step" do
+          -> { ("A".."G").step([]) { } }.should raise_error(TypeError)
+        end
       end
     end
   end
@@ -285,93 +406,109 @@
   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 }
+        (-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 }
+        (-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 }
+        (-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 }
+        (-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 }
+        (-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 }
+        (-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 }
+        (-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 }
+        (-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 }
+        (-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 }
+        (-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 }
+        (-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 }
+        (-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 }
+        (-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 }
+        (-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 }
+        ('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 }
+        ('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 }
+        ('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 }
+        ('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)
+        -> { ('A'..).step(2.0) { } }.should raise_error(TypeError)
+        -> { ('A'...).step(2.0) { } }.should raise_error(TypeError)
+      end
+
+      ruby_version_is "3.4" do
+        it "yields String values adjusted by step" do
+          ('A'..).step("A") { |x| break if x > "AAA"; ScratchPad << x }
+          ScratchPad.recorded.should == ["A", "AA", "AAA"]
+
+          ScratchPad.record []
+          ('A'...).step("A") { |x| break if x > "AAA"; ScratchPad << x }
+          ScratchPad.recorded.should == ["A", "AA", "AAA"]
+        end
+
+        it "raises a TypeError when passed an incompatible type step" do
+          -> { ('A'..).step([]) { } }.should raise_error(TypeError)
+          -> { ('A'...).step([]) { } }.should raise_error(TypeError)
+        end
       end
     end
   end
@@ -383,15 +520,24 @@
 
     describe "returned Enumerator" do
       describe "size" do
-        it "raises a TypeError if step does not respond to #to_int" do
-          obj = mock("Range#step non-integer")
-          -> { (1..2).step(obj) }.should raise_error(TypeError)
+        ruby_version_is ""..."3.4" do
+          it "raises a TypeError if step does not respond to #to_int" do
+            obj = mock("Range#step non-integer")
+            -> { (1..2).step(obj) }.should raise_error(TypeError)
+          end
+
+          it "raises a TypeError if #to_int does not return an Integer" do
+            obj = mock("Range#step non-integer")
+            obj.should_receive(:to_int).and_return("1")
+            -> { (1..2).step(obj) }.should raise_error(TypeError)
+          end
         end
 
-        it "raises a TypeError if #to_int does not return an Integer" do
-          obj = mock("Range#step non-integer")
-          obj.should_receive(:to_int).and_return("1")
-          -> { (1..2).step(obj) }.should raise_error(TypeError)
+        ruby_version_is "3.4" do
+          it "does not raise if step is incompatible" do
+            obj = mock("Range#step non-integer")
+            -> { (1..2).step(obj) }.should_not raise_error
+          end
         end
 
         it "returns the ceil of range size divided by the number of steps" do
@@ -431,19 +577,36 @@
           (1.0...6.4).step(1.8).size.should == 3
         end
 
-        it "returns nil with begin and end are String" do
-          ("A".."E").step(2).size.should == nil
-          ("A"..."E").step(2).size.should == nil
-          ("A".."E").step.size.should == nil
-          ("A"..."E").step.size.should == nil
+        ruby_version_is ""..."3.4" do
+          it "returns nil with begin and end are String" do
+            ("A".."E").step(2).size.should == nil
+            ("A"..."E").step(2).size.should == nil
+            ("A".."E").step.size.should == nil
+            ("A"..."E").step.size.should == nil
+          end
+
+          it "return nil and not raises a TypeError if the first element does not respond to #succ" do
+            obj = mock("Range#step non-comparable")
+            obj.should_receive(:<=>).with(obj).and_return(1)
+            enum = (obj..obj).step
+            -> { enum.size }.should_not raise_error
+            enum.size.should == nil
+          end
         end
 
-        it "return nil and not raises a TypeError if the first element does not respond to #succ" do
-          obj = mock("Range#step non-comparable")
-          obj.should_receive(:<=>).with(obj).and_return(1)
-          enum = (obj..obj).step
-          -> { enum.size }.should_not raise_error
-          enum.size.should == nil
+        ruby_version_is "3.4" do
+          it "returns nil with begin and end are String" do
+            ("A".."E").step("A").size.should == nil
+            ("A"..."E").step("A").size.should == nil
+          end
+
+          it "return nil and not raises a TypeError if the first element is not of compatible type" do
+            obj = mock("Range#step non-comparable")
+            obj.should_receive(:<=>).with(obj).and_return(1)
+            enum = (obj..obj).step(obj)
+            -> { enum.size }.should_not raise_error
+            enum.size.should == nil
+          end
         end
       end
 
@@ -470,22 +633,48 @@
             (1..).step(2).take(3).should == [1, 3, 5]
           end
 
-          it "returns an instance of Enumerator when begin is not numeric" do
-            ("a"..).step.class.should == Enumerator
-            ("a"..).step(2).take(3).should == %w[a c e]
+          ruby_version_is ""..."3.4" do
+            it "returns an instance of Enumerator when begin is not numeric" do
+              ("a"..).step.class.should == Enumerator
+              ("a"..).step(2).take(3).should == %w[a c e]
+            end
+          end
+
+          ruby_version_is "3.4" do
+            it "returns an instance of Enumerator when begin is not numeric" do
+              ("a"..).step("a").class.should == Enumerator
+              ("a"..).step("a").take(3).should == %w[a aa aaa]
+            end
           end
         end
 
         context "when range is beginless and endless" do
-          it "returns an instance of Enumerator" do
-            Range.new(nil, nil).step.class.should == Enumerator
+          ruby_version_is ""..."3.4" do
+            it "returns an instance of Enumerator" do
+              Range.new(nil, nil).step.class.should == Enumerator
+            end
+          end
+
+          ruby_version_is "3.4" do
+            it "raises an ArgumentError" do
+              -> { Range.new(nil, nil).step(1) }.should raise_error(ArgumentError)
+            end
           end
         end
 
         context "when begin and end are not numerics" do
-          it "returns an instance of Enumerator" do
-            ("a".."z").step.class.should == Enumerator
-            ("a".."z").step(3).take(4).should == %w[a d g j]
+          ruby_version_is ""..."3.4" do
+            it "returns an instance of Enumerator" do
+              ("a".."z").step.class.should == Enumerator
+              ("a".."z").step(3).take(4).should == %w[a d g j]
+            end
+          end
+
+          ruby_version_is "3.4" do
+            it "returns an instance of Enumerator" do
+              ("a".."z").step("a").class.should == Enumerator
+              ("a".."z").step("a").take(4).should == %w[a aa aaa aaaa]
+            end
           end
         end
       end
diff --git a/spec/ruby/core/rational/abs_spec.rb b/spec/ruby/core/rational/abs_spec.rb
index 7272ad24220835..54099aa14d0ce0 100644
--- a/spec/ruby/core/rational/abs_spec.rb
+++ b/spec/ruby/core/rational/abs_spec.rb
@@ -1,5 +1,5 @@
 require_relative "../../spec_helper"
-require_relative '../../shared/rational/abs'
+require_relative 'shared/abs'
 
 describe "Rational#abs" do
   it_behaves_like :rational_abs, :abs
diff --git a/spec/ruby/core/rational/ceil_spec.rb b/spec/ruby/core/rational/ceil_spec.rb
index e73635160431ed..d5bdadf3b6b000 100644
--- a/spec/ruby/core/rational/ceil_spec.rb
+++ b/spec/ruby/core/rational/ceil_spec.rb
@@ -1,6 +1,45 @@
 require_relative "../../spec_helper"
-require_relative '../../shared/rational/ceil'
 
 describe "Rational#ceil" do
-  it_behaves_like :rational_ceil, :ceil
+  before do
+    @rational = Rational(2200, 7)
+  end
+
+  describe "with no arguments (precision = 0)" do
+    it "returns an Integer" do
+      @rational.ceil.should be_kind_of(Integer)
+    end
+
+    it "returns the truncated value toward positive infinity" do
+      @rational.ceil.should == 315
+      Rational(1, 2).ceil.should == 1
+      Rational(-1, 2).ceil.should == 0
+    end
+  end
+
+  describe "with a precision < 0" do
+    it "returns an Integer" do
+      @rational.ceil(-2).should be_kind_of(Integer)
+      @rational.ceil(-1).should be_kind_of(Integer)
+    end
+
+    it "moves the truncation point n decimal places left" do
+      @rational.ceil(-3).should == 1000
+      @rational.ceil(-2).should == 400
+      @rational.ceil(-1).should == 320
+    end
+  end
+
+  describe "with precision > 0" do
+    it "returns a Rational" do
+      @rational.ceil(1).should be_kind_of(Rational)
+      @rational.ceil(2).should be_kind_of(Rational)
+    end
+
+    it "moves the truncation point n decimal places right" do
+      @rational.ceil(1).should == Rational(3143, 10)
+      @rational.ceil(2).should == Rational(31429, 100)
+      @rational.ceil(3).should == Rational(157143, 500)
+    end
+  end
 end
diff --git a/spec/ruby/core/rational/coerce_spec.rb b/spec/ruby/core/rational/coerce_spec.rb
deleted file mode 100644
index 9c0f05829b42e5..00000000000000
--- a/spec/ruby/core/rational/coerce_spec.rb
+++ /dev/null
@@ -1,6 +0,0 @@
-require_relative "../../spec_helper"
-require_relative '../../shared/rational/coerce'
-
-describe "Rational#coerce" do
-  it_behaves_like :rational_coerce, :coerce
-end
diff --git a/spec/ruby/core/rational/comparison_spec.rb b/spec/ruby/core/rational/comparison_spec.rb
index 877069fb8fc04a..c9db60d5c78258 100644
--- a/spec/ruby/core/rational/comparison_spec.rb
+++ b/spec/ruby/core/rational/comparison_spec.rb
@@ -1,23 +1,93 @@
 require_relative "../../spec_helper"
-require_relative '../../shared/rational/comparison'
+require_relative 'fixtures/rational'
 
 describe "Rational#<=> when passed a Rational object" do
-  it_behaves_like :rational_cmp_rat, :<=>
+  it "returns 1 when self is greater than the passed argument" do
+    (Rational(4, 4) <=> Rational(3, 4)).should equal(1)
+    (Rational(-3, 4) <=> Rational(-4, 4)).should equal(1)
+  end
+
+  it "returns 0 when self is equal to the passed argument" do
+    (Rational(4, 4) <=> Rational(4, 4)).should equal(0)
+    (Rational(-3, 4) <=> Rational(-3, 4)).should equal(0)
+  end
+
+  it "returns -1 when self is less than the passed argument" do
+    (Rational(3, 4) <=> Rational(4, 4)).should equal(-1)
+    (Rational(-4, 4) <=> Rational(-3, 4)).should equal(-1)
+  end
 end
 
 describe "Rational#<=> when passed an Integer object" do
-  it_behaves_like :rational_cmp_int, :<=>
+  it "returns 1 when self is greater than the passed argument" do
+    (Rational(4, 4) <=> 0).should equal(1)
+    (Rational(4, 4) <=> -10).should equal(1)
+    (Rational(-3, 4) <=> -1).should equal(1)
+  end
+
+  it "returns 0 when self is equal to the passed argument" do
+    (Rational(4, 4) <=> 1).should equal(0)
+    (Rational(-8, 4) <=> -2).should equal(0)
+  end
+
+  it "returns -1 when self is less than the passed argument" do
+    (Rational(3, 4) <=> 1).should equal(-1)
+    (Rational(-4, 4) <=> 0).should equal(-1)
+  end
 end
 
 describe "Rational#<=> when passed a Float object" do
-  it_behaves_like :rational_cmp_float, :<=>
+  it "returns 1 when self is greater than the passed argument" do
+    (Rational(4, 4) <=> 0.5).should equal(1)
+    (Rational(4, 4) <=> -1.5).should equal(1)
+    (Rational(-3, 4) <=> -0.8).should equal(1)
+  end
+
+  it "returns 0 when self is equal to the passed argument" do
+    (Rational(4, 4) <=> 1.0).should equal(0)
+    (Rational(-6, 4) <=> -1.5).should equal(0)
+  end
+
+  it "returns -1 when self is less than the passed argument" do
+    (Rational(3, 4) <=> 1.2).should equal(-1)
+    (Rational(-4, 4) <=> 0.5).should equal(-1)
+  end
 end
 
 describe "Rational#<=> when passed an Object that responds to #coerce" do
-  it_behaves_like :rational_cmp_coerce, :<=>
-  it_behaves_like :rational_cmp_coerce_exception, :<=>
+  it "calls #coerce on the passed argument with self" do
+    rational = Rational(3, 4)
+
+    obj = mock("Object")
+    obj.should_receive(:coerce).with(rational).and_return([1, 2])
+
+    rational <=> obj
+  end
+
+  it "calls #<=> on the coerced Rational with the coerced Object" do
+    rational = Rational(3, 4)
+
+    coerced_rational = mock("Coerced Rational")
+    coerced_rational.should_receive(:<=>).and_return(:result)
+
+    coerced_obj = mock("Coerced Object")
+
+    obj = mock("Object")
+    obj.should_receive(:coerce).and_return([coerced_rational, coerced_obj])
+
+    (rational <=> obj).should == :result
+  end
+
+  it "does not rescue exception raised in other#coerce" do
+    b = mock("numeric with failed #coerce")
+    b.should_receive(:coerce).and_raise(RationalSpecs::CoerceError)
+
+    -> { Rational(3, 4) <=> b }.should raise_error(RationalSpecs::CoerceError)
+  end
 end
 
 describe "Rational#<=> when passed a non-Numeric Object that doesn't respond to #coerce" do
-  it_behaves_like :rational_cmp_other, :<=>
+  it "returns nil" do
+    (Rational <=> mock("Object")).should be_nil
+  end
 end
diff --git a/spec/ruby/core/rational/denominator_spec.rb b/spec/ruby/core/rational/denominator_spec.rb
index c2f49b4190f2b1..468724489398b2 100644
--- a/spec/ruby/core/rational/denominator_spec.rb
+++ b/spec/ruby/core/rational/denominator_spec.rb
@@ -1,6 +1,14 @@
 require_relative "../../spec_helper"
-require_relative '../../shared/rational/denominator'
 
 describe "Rational#denominator" do
-  it_behaves_like :rational_denominator, :denominator
+  it "returns the denominator" do
+    Rational(3, 4).denominator.should equal(4)
+    Rational(3, -4).denominator.should equal(4)
+
+    Rational(1, bignum_value).denominator.should == bignum_value
+  end
+
+  it "returns 1 if no denominator was given" do
+    Rational(80).denominator.should == 1
+  end
 end
diff --git a/spec/ruby/core/rational/div_spec.rb b/spec/ruby/core/rational/div_spec.rb
index bee7d01a67446c..d3adb9b53676ef 100644
--- a/spec/ruby/core/rational/div_spec.rb
+++ b/spec/ruby/core/rational/div_spec.rb
@@ -1,18 +1,54 @@
 require_relative "../../spec_helper"
-require_relative '../../shared/rational/div'
 
 describe "Rational#div" do
-  it_behaves_like :rational_div, :div
+  it "returns an Integer" do
+    Rational(229, 21).div(82).should be_kind_of(Integer)
+  end
+
+  it "raises an ArgumentError if passed more than one argument" do
+    -> { Rational(3, 4).div(2,3) }.should raise_error(ArgumentError)
+  end
+
+  # See http://redmine.ruby-lang.org/issues/show/1648
+  it "raises a TypeError if passed a non-numeric argument" do
+    -> { Rational(3, 4).div([]) }.should raise_error(TypeError)
+  end
 end
 
 describe "Rational#div passed a Rational" do
-  it_behaves_like :rational_div_rat, :div
+  it "performs integer division and returns the result" do
+    Rational(2, 3).div(Rational(2, 3)).should == 1
+    Rational(-2, 9).div(Rational(-9, 2)).should == 0
+  end
+
+  it "raises a ZeroDivisionError when the argument has a numerator of 0" do
+    -> { Rational(3, 4).div(Rational(0, 3)) }.should raise_error(ZeroDivisionError)
+  end
+
+  it "raises a ZeroDivisionError when the argument has a numerator of 0.0" do
+    -> { Rational(3, 4).div(Rational(0.0, 3)) }.should raise_error(ZeroDivisionError)
+  end
 end
 
 describe "Rational#div passed an Integer" do
-  it_behaves_like :rational_div_int, :div
+  it "performs integer division and returns the result" do
+    Rational(2, 1).div(1).should == 2
+    Rational(25, 5).div(-50).should == -1
+  end
+
+  it "raises a ZeroDivisionError when the argument is 0" do
+    -> { Rational(3, 4).div(0) }.should raise_error(ZeroDivisionError)
+  end
 end
 
 describe "Rational#div passed a Float" do
-  it_behaves_like :rational_div_float, :div
+  it "performs integer division and returns the result" do
+    Rational(2, 3).div(30.333).should == 0
+    Rational(2, 9).div(Rational(-8.6)).should == -1
+    Rational(3.12).div(0.5).should == 6
+  end
+
+  it "raises a ZeroDivisionError when the argument is 0.0" do
+    -> { Rational(3, 4).div(0.0) }.should raise_error(ZeroDivisionError)
+  end
 end
diff --git a/spec/ruby/core/rational/divide_spec.rb b/spec/ruby/core/rational/divide_spec.rb
index 14e8c4c195f04d..8f5ca1fdec7a93 100644
--- a/spec/ruby/core/rational/divide_spec.rb
+++ b/spec/ruby/core/rational/divide_spec.rb
@@ -1,20 +1,74 @@
 require_relative "../../spec_helper"
-require_relative '../../shared/rational/divide'
-require_relative '../../shared/rational/arithmetic_exception_in_coerce'
+require_relative 'shared/arithmetic_exception_in_coerce'
 
 describe "Rational#/" do
-  it_behaves_like :rational_divide, :/
+  it "calls #coerce on the passed argument with self" do
+    rational = Rational(3, 4)
+    obj = mock("Object")
+    obj.should_receive(:coerce).with(rational).and_return([1, 2])
+
+    rational / obj
+  end
+
+  it "calls #/ on the coerced Rational with the coerced Object" do
+    rational = Rational(3, 4)
+
+    coerced_rational = mock("Coerced Rational")
+    coerced_rational.should_receive(:/).and_return(:result)
+
+    coerced_obj = mock("Coerced Object")
+
+    obj = mock("Object")
+    obj.should_receive(:coerce).and_return([coerced_rational, coerced_obj])
+
+    (rational / obj).should == :result
+  end
+
   it_behaves_like :rational_arithmetic_exception_in_coerce, :/
 end
 
 describe "Rational#/ when passed an Integer" do
-  it_behaves_like :rational_divide_int, :/
+  it "returns self divided by other as a Rational" do
+    (Rational(3, 4) / 2).should eql(Rational(3, 8))
+    (Rational(2, 4) / 2).should eql(Rational(1, 4))
+    (Rational(6, 7) / -2).should eql(Rational(-3, 7))
+  end
+
+  it "raises a ZeroDivisionError when passed 0" do
+    -> { Rational(3, 4) / 0 }.should raise_error(ZeroDivisionError)
+  end
 end
 
 describe "Rational#/ when passed a Rational" do
-  it_behaves_like :rational_divide_rat, :/
+  it "returns self divided by other as a Rational" do
+    (Rational(3, 4) / Rational(3, 4)).should eql(Rational(1, 1))
+    (Rational(2, 4) / Rational(1, 4)).should eql(Rational(2, 1))
+
+    (Rational(2, 4) / 2).should == Rational(1, 4)
+    (Rational(6, 7) / -2).should == Rational(-3, 7)
+  end
+
+  it "raises a ZeroDivisionError when passed a Rational with a numerator of 0" do
+    -> { Rational(3, 4) / Rational(0, 1) }.should raise_error(ZeroDivisionError)
+  end
 end
 
 describe "Rational#/ when passed a Float" do
-  it_behaves_like :rational_divide_float, :/
+  it "returns self divided by other as a Float" do
+    (Rational(3, 4) / 0.75).should eql(1.0)
+    (Rational(3, 4) / 0.25).should eql(3.0)
+    (Rational(3, 4) / 0.3).should eql(2.5)
+
+    (Rational(-3, 4) / 0.3).should eql(-2.5)
+    (Rational(3, -4) / 0.3).should eql(-2.5)
+    (Rational(3, 4) / -0.3).should eql(-2.5)
+  end
+
+  it "returns infinity when passed 0" do
+    (Rational(3, 4) / 0.0).infinite?.should eql(1)
+    (Rational(-3, -4) / 0.0).infinite?.should eql(1)
+
+    (Rational(-3, 4) / 0.0).infinite?.should eql(-1)
+    (Rational(3, -4) / 0.0).infinite?.should eql(-1)
+  end
 end
diff --git a/spec/ruby/core/rational/divmod_spec.rb b/spec/ruby/core/rational/divmod_spec.rb
index 7ffdde74f47959..f0555294a3a52f 100644
--- a/spec/ruby/core/rational/divmod_spec.rb
+++ b/spec/ruby/core/rational/divmod_spec.rb
@@ -1,14 +1,42 @@
 require_relative "../../spec_helper"
-require_relative '../../shared/rational/divmod'
 
 describe "Rational#divmod when passed a Rational" do
-  it_behaves_like :rational_divmod_rat, :divmod
+  it "returns the quotient as Integer and the remainder as Rational" do
+    Rational(7, 4).divmod(Rational(1, 2)).should eql([3, Rational(1, 4)])
+    Rational(7, 4).divmod(Rational(-1, 2)).should eql([-4, Rational(-1, 4)])
+    Rational(0, 4).divmod(Rational(4, 3)).should eql([0, Rational(0, 1)])
+
+    Rational(bignum_value, 4).divmod(Rational(4, 3)).should eql([3458764513820540928, Rational(0, 1)])
+  end
+
+  it "raises a ZeroDivisionError when passed a Rational with a numerator of 0" do
+    -> { Rational(7, 4).divmod(Rational(0, 3)) }.should raise_error(ZeroDivisionError)
+  end
 end
 
 describe "Rational#divmod when passed an Integer" do
-  it_behaves_like :rational_divmod_int, :divmod
+  it "returns the quotient as Integer and the remainder as Rational" do
+    Rational(7, 4).divmod(2).should eql([0, Rational(7, 4)])
+    Rational(7, 4).divmod(-2).should eql([-1, Rational(-1, 4)])
+
+    Rational(bignum_value, 4).divmod(3).should eql([1537228672809129301, Rational(1, 1)])
+  end
+
+  it "raises a ZeroDivisionError when passed 0" do
+    -> { Rational(7, 4).divmod(0) }.should raise_error(ZeroDivisionError)
+  end
 end
 
 describe "Rational#divmod when passed a Float" do
-  it_behaves_like :rational_divmod_float, :divmod
+  it "returns the quotient as Integer and the remainder as Float" do
+    Rational(7, 4).divmod(0.5).should eql([3, 0.25])
+  end
+
+  it "returns the quotient as Integer and the remainder as Float" do
+    Rational(7, 4).divmod(-0.5).should eql([-4, -0.25])
+  end
+
+  it "raises a ZeroDivisionError when passed 0" do
+    -> { Rational(7, 4).divmod(0.0) }.should raise_error(ZeroDivisionError)
+  end
 end
diff --git a/spec/ruby/core/rational/equal_value_spec.rb b/spec/ruby/core/rational/equal_value_spec.rb
index c6f7f4c6a29b62..ba40d29c3b1350 100644
--- a/spec/ruby/core/rational/equal_value_spec.rb
+++ b/spec/ruby/core/rational/equal_value_spec.rb
@@ -1,18 +1,39 @@
 require_relative "../../spec_helper"
-require_relative '../../shared/rational/equal_value'
 
 describe "Rational#==" do
-  it_behaves_like :rational_equal_value, :==
+  it "returns the result of calling #== with self on the passed argument" do
+    obj = mock("Object")
+    obj.should_receive(:==).and_return(:result)
+
+    (Rational(3, 4) == obj).should_not be_false
+  end
 end
 
 describe "Rational#== when passed a Rational" do
-  it_behaves_like :rational_equal_value_rat, :==
+  it "returns true if self has the same numerator and denominator as the passed argument" do
+    (Rational(3, 4) == Rational(3, 4)).should be_true
+    (Rational(-3, -4) == Rational(3, 4)).should be_true
+    (Rational(-4, 5) == Rational(4, -5)).should be_true
+
+    (Rational(bignum_value, 3) == Rational(bignum_value, 3)).should be_true
+    (Rational(-bignum_value, 3) == Rational(bignum_value, -3)).should be_true
+  end
 end
 
 describe "Rational#== when passed a Float" do
-  it_behaves_like :rational_equal_value_float, :==
+  it "converts self to a Float and compares it with the passed argument" do
+    (Rational(3, 4) == 0.75).should be_true
+    (Rational(4, 2) == 2.0).should be_true
+    (Rational(-4, 2) == -2.0).should be_true
+    (Rational(4, -2) == -2.0).should be_true
+  end
 end
 
 describe "Rational#== when passed an Integer" do
-  it_behaves_like :rational_equal_value_int, :==
+  it "returns true if self has the passed argument as numerator and a denominator of 1" do
+    # Rational(x, y) reduces x and y automatically
+    (Rational(4, 2) == 2).should be_true
+    (Rational(-4, 2) == -2).should be_true
+    (Rational(4, -2) == -2).should be_true
+  end
 end
diff --git a/spec/ruby/core/rational/exponent_spec.rb b/spec/ruby/core/rational/exponent_spec.rb
index 7e35b4ebc19001..65fbf2ed1ca895 100644
--- a/spec/ruby/core/rational/exponent_spec.rb
+++ b/spec/ruby/core/rational/exponent_spec.rb
@@ -1,6 +1,236 @@
 require_relative "../../spec_helper"
-require_relative '../../shared/rational/exponent'
 
 describe "Rational#**" do
-  it_behaves_like :rational_exponent, :**
+  describe "when passed Rational" do
+    # Guard against the Mathn library
+    guard -> { !defined?(Math.rsqrt) } do
+      it "returns Rational(1) if the exponent is Rational(0)" do
+        (Rational(0) ** Rational(0)).should eql(Rational(1))
+        (Rational(1) ** Rational(0)).should eql(Rational(1))
+        (Rational(3, 4) ** Rational(0)).should eql(Rational(1))
+        (Rational(-1) ** Rational(0)).should eql(Rational(1))
+        (Rational(-3, 4) ** Rational(0)).should eql(Rational(1))
+        (Rational(bignum_value) ** Rational(0)).should eql(Rational(1))
+        (Rational(-bignum_value) ** Rational(0)).should eql(Rational(1))
+      end
+
+      it "returns self raised to the argument as a Rational if the exponent's denominator is 1" do
+        (Rational(3, 4) ** Rational(1, 1)).should eql(Rational(3, 4))
+        (Rational(3, 4) ** Rational(2, 1)).should eql(Rational(9, 16))
+        (Rational(3, 4) ** Rational(-1, 1)).should eql(Rational(4, 3))
+        (Rational(3, 4) ** Rational(-2, 1)).should eql(Rational(16, 9))
+      end
+
+      it "returns self raised to the argument as a Float if the exponent's denominator is not 1" do
+        (Rational(3, 4) ** Rational(4, 3)).should be_close(0.681420222312052, TOLERANCE)
+        (Rational(3, 4) ** Rational(-4, 3)).should be_close(1.46752322173095, TOLERANCE)
+        (Rational(3, 4) ** Rational(4, -3)).should be_close(1.46752322173095, TOLERANCE)
+      end
+
+      it "returns a complex number when self is negative and the passed argument is not 0" do
+        (Rational(-3, 4) ** Rational(-4, 3)).should be_close(Complex(-0.7337616108654732, 1.2709123906625817), TOLERANCE)
+      end
+    end
+  end
+
+  describe "when passed Integer" do
+    it "returns the Rational value of self raised to the passed argument" do
+      (Rational(3, 4) ** 4).should == Rational(81, 256)
+      (Rational(3, 4) ** -4).should == Rational(256, 81)
+      (Rational(-3, 4) ** -4).should == Rational(256, 81)
+      (Rational(3, -4) ** -4).should == Rational(256, 81)
+
+      (Rational(bignum_value, 4) ** 4).should == Rational(452312848583266388373324160190187140051835877600158453279131187530910662656, 1)
+      (Rational(3, bignum_value) ** -4).should == Rational(115792089237316195423570985008687907853269984665640564039457584007913129639936, 81)
+      (Rational(-bignum_value, 4) ** -4).should == Rational(1, 452312848583266388373324160190187140051835877600158453279131187530910662656)
+      (Rational(3, -bignum_value) ** -4).should == Rational(115792089237316195423570985008687907853269984665640564039457584007913129639936, 81)
+    end
+
+    # Guard against the Mathn library
+    guard -> { !defined?(Math.rsqrt) } do
+      it "returns Rational(1, 1) when the passed argument is 0" do
+        (Rational(3, 4) ** 0).should eql(Rational(1, 1))
+        (Rational(-3, 4) ** 0).should eql(Rational(1, 1))
+        (Rational(3, -4) ** 0).should eql(Rational(1, 1))
+
+        (Rational(bignum_value, 4) ** 0).should eql(Rational(1, 1))
+        (Rational(3, -bignum_value) ** 0).should eql(Rational(1, 1))
+      end
+    end
+  end
+
+  describe "when passed Bignum" do
+    # #5713
+    it "returns Rational(0) when self is Rational(0) and the exponent is positive" do
+      (Rational(0) ** bignum_value).should eql(Rational(0))
+    end
+
+    it "raises ZeroDivisionError when self is Rational(0) and the exponent is negative" do
+      -> { Rational(0) ** -bignum_value }.should raise_error(ZeroDivisionError)
+    end
+
+    it "returns Rational(1) when self is Rational(1)" do
+      (Rational(1) **  bignum_value).should eql(Rational(1))
+      (Rational(1) ** -bignum_value).should eql(Rational(1))
+    end
+
+    it "returns Rational(1) when self is Rational(-1) and the exponent is positive and even" do
+      (Rational(-1) ** bignum_value(0)).should eql(Rational(1))
+      (Rational(-1) ** bignum_value(2)).should eql(Rational(1))
+    end
+
+    it "returns Rational(-1) when self is Rational(-1) and the exponent is positive and odd" do
+      (Rational(-1) ** bignum_value(1)).should eql(Rational(-1))
+      (Rational(-1) ** bignum_value(3)).should eql(Rational(-1))
+    end
+
+    ruby_version_is ""..."3.4" do
+      it "returns positive Infinity when self is > 1" do
+        -> {
+          (Rational(2) ** bignum_value).infinite?.should == 1
+        }.should complain(/warning: in a\*\*b, b may be too big/)
+        -> {
+          (Rational(fixnum_max) ** bignum_value).infinite?.should == 1
+        }.should complain(/warning: in a\*\*b, b may be too big/)
+      end
+
+      it "returns 0.0 when self is > 1 and the exponent is negative" do
+        -> {
+          (Rational(2) ** -bignum_value).should eql(0.0)
+        }.should complain(/warning: in a\*\*b, b may be too big/)
+        -> {
+          (Rational(fixnum_max) ** -bignum_value).should eql(0.0)
+        }.should complain(/warning: in a\*\*b, b may be too big/)
+      end
+    end
+
+    ruby_version_is "3.4" do
+      it "raises an ArgumentError when self is > 1" do
+        -> {
+          (Rational(2) ** bignum_value)
+        }.should raise_error(ArgumentError)
+        -> {
+          (Rational(fixnum_max) ** bignum_value)
+        }.should raise_error(ArgumentError)
+      end
+
+      it "raises an ArgumentError when self is > 1 and the exponent is negative" do
+        -> {
+          (Rational(2) ** -bignum_value)
+        }.should raise_error(ArgumentError)
+        -> {
+          (Rational(fixnum_max) ** -bignum_value)
+        }.should raise_error(ArgumentError)
+      end
+
+      it "raises an ArgumentError when self is < -1" do
+        -> {
+          (Rational(-2) ** bignum_value)
+        }.should raise_error(ArgumentError)
+        -> {
+          (Rational(fixnum_min) ** bignum_value)
+        }.should raise_error(ArgumentError)
+      end
+
+      it "raises an ArgumentError when self is < -1 and the exponent is negative" do
+        -> {
+          (Rational(-2) ** -bignum_value)
+        }.should raise_error(ArgumentError)
+        -> {
+          (Rational(fixnum_min) ** -bignum_value)
+        }.should raise_error(ArgumentError)
+      end
+    end
+
+    # Fails on linux due to pow() bugs in glibc: http://sources.redhat.com/bugzilla/show_bug.cgi?id=3866
+    platform_is_not :linux do
+      ruby_version_is ""..."3.4" do
+        it "returns positive Infinity when self < -1" do
+          -> {
+            (Rational(-2) ** bignum_value).infinite?.should == 1
+          }.should complain(/warning: in a\*\*b, b may be too big/)
+          -> {
+            (Rational(-2) ** (bignum_value + 1)).infinite?.should == 1
+          }.should complain(/warning: in a\*\*b, b may be too big/)
+          -> {
+            (Rational(fixnum_min) ** bignum_value).infinite?.should == 1
+          }.should complain(/warning: in a\*\*b, b may be too big/)
+        end
+
+        it "returns 0.0 when self is < -1 and the exponent is negative" do
+          -> {
+            (Rational(-2) ** -bignum_value).should eql(0.0)
+          }.should complain(/warning: in a\*\*b, b may be too big/)
+          -> {
+            (Rational(fixnum_min) ** -bignum_value).should eql(0.0)
+          }.should complain(/warning: in a\*\*b, b may be too big/)
+        end
+      end
+    end
+  end
+
+  describe "when passed Float" do
+    it "returns self converted to Float and raised to the passed argument" do
+      (Rational(3, 1) ** 3.0).should eql(27.0)
+      (Rational(3, 1) ** 1.5).should be_close(5.19615242270663, TOLERANCE)
+      (Rational(3, 1) ** -1.5).should be_close(0.192450089729875, TOLERANCE)
+    end
+
+    it "returns a complex number if self is negative and the passed argument is not 0" do
+      (Rational(-3, 2) ** 1.5).should be_close(Complex(0.0, -1.8371173070873836), TOLERANCE)
+      (Rational(3, -2) ** 1.5).should be_close(Complex(0.0, -1.8371173070873836), TOLERANCE)
+      (Rational(3, -2) ** -1.5).should be_close(Complex(0.0, 0.5443310539518174), TOLERANCE)
+    end
+
+    it "returns Complex(1.0) when the passed argument is 0.0" do
+      (Rational(3, 4) ** 0.0).should == Complex(1.0)
+      (Rational(-3, 4) ** 0.0).should == Complex(1.0)
+      (Rational(-3, 4) ** 0.0).should == Complex(1.0)
+    end
+  end
+
+  it "calls #coerce on the passed argument with self" do
+    rational = Rational(3, 4)
+    obj      = mock("Object")
+    obj.should_receive(:coerce).with(rational).and_return([1, 2])
+
+    rational ** obj
+  end
+
+  it "calls #** on the coerced Rational with the coerced Object" do
+    rational = Rational(3, 4)
+
+    coerced_rational = mock("Coerced Rational")
+    coerced_rational.should_receive(:**).and_return(:result)
+
+    coerced_obj = mock("Coerced Object")
+
+    obj = mock("Object")
+    obj.should_receive(:coerce).and_return([coerced_rational, coerced_obj])
+
+    (rational ** obj).should == :result
+  end
+
+  it "raises ZeroDivisionError for Rational(0, 1) passed a negative Integer" do
+    [-1, -4, -9999].each do |exponent|
+      -> { Rational(0, 1) ** exponent }.should raise_error(ZeroDivisionError, "divided by 0")
+    end
+  end
+
+  it "raises ZeroDivisionError for Rational(0, 1) passed a negative Rational with denominator 1" do
+    [Rational(-1, 1), Rational(-3, 1)].each do |exponent|
+      -> { Rational(0, 1) ** exponent }.should raise_error(ZeroDivisionError, "divided by 0")
+    end
+  end
+
+  # #7513
+  it "raises ZeroDivisionError for Rational(0, 1) passed a negative Rational" do
+    -> { Rational(0, 1) ** Rational(-3, 2) }.should raise_error(ZeroDivisionError, "divided by 0")
+  end
+
+  it "returns Infinity for Rational(0, 1) passed a negative Float" do
+    [-1.0, -3.0, -3.14].each do |exponent|
+      (Rational(0, 1) ** exponent).infinite?.should == 1
+    end
+  end
 end
diff --git a/spec/ruby/core/rational/fdiv_spec.rb b/spec/ruby/core/rational/fdiv_spec.rb
index b75f39abd58408..118d93dbe726bf 100644
--- a/spec/ruby/core/rational/fdiv_spec.rb
+++ b/spec/ruby/core/rational/fdiv_spec.rb
@@ -1,6 +1,5 @@
 require_relative "../../spec_helper"
-require_relative '../../shared/rational/fdiv'
 
 describe "Rational#fdiv" do
-  it_behaves_like :rational_fdiv, :fdiv
+  it "needs to be reviewed for spec completeness"
 end
diff --git a/spec/ruby/fixtures/rational.rb b/spec/ruby/core/rational/fixtures/rational.rb
similarity index 100%
rename from spec/ruby/fixtures/rational.rb
rename to spec/ruby/core/rational/fixtures/rational.rb
diff --git a/spec/ruby/core/rational/floor_spec.rb b/spec/ruby/core/rational/floor_spec.rb
index 70db0499d0d71b..8068aaf119e70f 100644
--- a/spec/ruby/core/rational/floor_spec.rb
+++ b/spec/ruby/core/rational/floor_spec.rb
@@ -1,6 +1,45 @@
 require_relative "../../spec_helper"
-require_relative '../../shared/rational/floor'
 
 describe "Rational#floor" do
-  it_behaves_like :rational_floor, :floor
+  before do
+    @rational = Rational(2200, 7)
+  end
+
+  describe "with no arguments (precision = 0)" do
+    it "returns an integer" do
+      @rational.floor.should be_kind_of(Integer)
+    end
+
+    it "returns the truncated value toward negative infinity" do
+      @rational.floor.should == 314
+      Rational(1, 2).floor.should == 0
+      Rational(-1, 2).floor.should == -1
+    end
+  end
+
+  describe "with a precision < 0" do
+    it "returns an integer" do
+      @rational.floor(-2).should be_kind_of(Integer)
+      @rational.floor(-1).should be_kind_of(Integer)
+    end
+
+    it "moves the truncation point n decimal places left" do
+      @rational.floor(-3).should == 0
+      @rational.floor(-2).should == 300
+      @rational.floor(-1).should == 310
+    end
+  end
+
+  describe "with a precision > 0" do
+    it "returns a Rational" do
+      @rational.floor(1).should be_kind_of(Rational)
+      @rational.floor(2).should be_kind_of(Rational)
+    end
+
+    it "moves the truncation point n decimal places right" do
+      @rational.floor(1).should == Rational(1571, 5)
+      @rational.floor(2).should == Rational(7857, 25)
+      @rational.floor(3).should == Rational(62857, 200)
+    end
+  end
 end
diff --git a/spec/ruby/core/rational/hash_spec.rb b/spec/ruby/core/rational/hash_spec.rb
index 7e8d30049b3257..528638056a0290 100644
--- a/spec/ruby/core/rational/hash_spec.rb
+++ b/spec/ruby/core/rational/hash_spec.rb
@@ -1,6 +1,9 @@
 require_relative "../../spec_helper"
-require_relative '../../shared/rational/hash'
 
 describe "Rational#hash" do
-  it_behaves_like :rational_hash, :hash
+  # BUG: Rational(2, 3).hash == Rational(3, 2).hash
+  it "is static" do
+    Rational(2, 3).hash.should == Rational(2, 3).hash
+    Rational(2, 4).hash.should_not == Rational(2, 3).hash
+  end
 end
diff --git a/spec/ruby/core/rational/inspect_spec.rb b/spec/ruby/core/rational/inspect_spec.rb
index 2cbf6cadc14db9..edc5cffee94887 100644
--- a/spec/ruby/core/rational/inspect_spec.rb
+++ b/spec/ruby/core/rational/inspect_spec.rb
@@ -1,6 +1,14 @@
 require_relative "../../spec_helper"
-require_relative '../../shared/rational/inspect'
 
 describe "Rational#inspect" do
-  it_behaves_like :rational_inspect, :inspect
+  it "returns a string representation of self" do
+    Rational(3, 4).inspect.should == "(3/4)"
+    Rational(-5, 8).inspect.should == "(-5/8)"
+    Rational(-1, -2).inspect.should == "(1/2)"
+
+    # Guard against the Mathn library
+    guard -> { !defined?(Math.rsqrt) } do
+      Rational(bignum_value, 1).inspect.should == "(#{bignum_value}/1)"
+    end
+  end
 end
diff --git a/spec/ruby/core/rational/magnitude_spec.rb b/spec/ruby/core/rational/magnitude_spec.rb
index 27d9af6a8146be..f5f667edb1b4ac 100644
--- a/spec/ruby/core/rational/magnitude_spec.rb
+++ b/spec/ruby/core/rational/magnitude_spec.rb
@@ -1,5 +1,5 @@
 require_relative "../../spec_helper"
-require_relative '../../shared/rational/abs'
+require_relative 'shared/abs'
 
 describe "Rational#abs" do
   it_behaves_like :rational_abs, :magnitude
diff --git a/spec/ruby/core/rational/minus_spec.rb b/spec/ruby/core/rational/minus_spec.rb
index a61b62ebe641a4..8aee85f9dd6d3e 100644
--- a/spec/ruby/core/rational/minus_spec.rb
+++ b/spec/ruby/core/rational/minus_spec.rb
@@ -1,5 +1,5 @@
 require_relative '../../spec_helper'
-require_relative '../../shared/rational/arithmetic_exception_in_coerce'
+require_relative 'shared/arithmetic_exception_in_coerce'
 
 describe "Rational#-" do
   it_behaves_like :rational_arithmetic_exception_in_coerce, :-
diff --git a/spec/ruby/core/rational/modulo_spec.rb b/spec/ruby/core/rational/modulo_spec.rb
index 7a60c176acfd7d..23ed93e118e601 100644
--- a/spec/ruby/core/rational/modulo_spec.rb
+++ b/spec/ruby/core/rational/modulo_spec.rb
@@ -1,6 +1,43 @@
 require_relative "../../spec_helper"
-require_relative '../../shared/rational/modulo'
 
 describe "Rational#%" do
-  it_behaves_like :rational_modulo, :%
+  it "returns the remainder when this value is divided by other" do
+    (Rational(2, 3) % Rational(2, 3)).should == Rational(0, 1)
+    (Rational(4, 3) % Rational(2, 3)).should == Rational(0, 1)
+    (Rational(2, -3) % Rational(-2, 3)).should == Rational(0, 1)
+    (Rational(0, -1) % -1).should == Rational(0, 1)
+
+    (Rational(7, 4) % Rational(1, 2)).should == Rational(1, 4)
+    (Rational(7, 4) % 1).should == Rational(3, 4)
+    (Rational(7, 4) % Rational(1, 7)).should == Rational(1, 28)
+
+    (Rational(3, 4) % -1).should == Rational(-1, 4)
+    (Rational(1, -5) % -1).should == Rational(-1, 5)
+  end
+
+  it "returns a Float value when the argument is Float" do
+    (Rational(7, 4) % 1.0).should be_kind_of(Float)
+    (Rational(7, 4) % 1.0).should == 0.75
+    (Rational(7, 4) % 0.26).should be_close(0.19, 0.0001)
+  end
+
+  it "raises ZeroDivisionError on zero denominator" do
+    -> {
+      Rational(3, 5) % Rational(0, 1)
+    }.should raise_error(ZeroDivisionError)
+
+    -> {
+      Rational(0, 1) % Rational(0, 1)
+    }.should raise_error(ZeroDivisionError)
+
+    -> {
+      Rational(3, 5) % 0
+    }.should raise_error(ZeroDivisionError)
+  end
+
+  it "raises a ZeroDivisionError when the argument is 0.0" do
+    -> {
+      Rational(3, 5) % 0.0
+    }.should raise_error(ZeroDivisionError)
+  end
 end
diff --git a/spec/ruby/core/rational/multiply_spec.rb b/spec/ruby/core/rational/multiply_spec.rb
index 7413376bb16610..87fb4de2b449f8 100644
--- a/spec/ruby/core/rational/multiply_spec.rb
+++ b/spec/ruby/core/rational/multiply_spec.rb
@@ -1,20 +1,65 @@
 require_relative "../../spec_helper"
-require_relative '../../shared/rational/multiply'
-require_relative '../../shared/rational/arithmetic_exception_in_coerce'
+require_relative 'shared/arithmetic_exception_in_coerce'
 
 describe "Rational#*" do
-  it_behaves_like :rational_multiply, :*
+  it "calls #coerce on the passed argument with self" do
+    rational = Rational(3, 4)
+    obj = mock("Object")
+    obj.should_receive(:coerce).with(rational).and_return([1, 2])
+
+    rational * obj
+  end
+
+  it "calls #* on the coerced Rational with the coerced Object" do
+    rational = Rational(3, 4)
+
+    coerced_rational = mock("Coerced Rational")
+    coerced_rational.should_receive(:*).and_return(:result)
+
+    coerced_obj = mock("Coerced Object")
+
+    obj = mock("Object")
+    obj.should_receive(:coerce).and_return([coerced_rational, coerced_obj])
+
+    (rational * obj).should == :result
+  end
+
   it_behaves_like :rational_arithmetic_exception_in_coerce, :*
 end
 
 describe "Rational#* passed a Rational" do
-  it_behaves_like :rational_multiply_rat, :*
+  it "returns self divided by other as a Rational" do
+    (Rational(3, 4) * Rational(3, 4)).should eql(Rational(9, 16))
+    (Rational(2, 4) * Rational(1, 4)).should eql(Rational(1, 8))
+
+    (Rational(3, 4) * Rational(0, 1)).should eql(Rational(0, 4))
+  end
 end
 
 describe "Rational#* passed a Float" do
-  it_behaves_like :rational_multiply_float, :*
+  it "returns self divided by other as a Float" do
+    (Rational(3, 4) * 0.75).should eql(0.5625)
+    (Rational(3, 4) * 0.25).should eql(0.1875)
+    (Rational(3, 4) * 0.3).should be_close(0.225, TOLERANCE)
+
+    (Rational(-3, 4) * 0.3).should be_close(-0.225, TOLERANCE)
+    (Rational(3, -4) * 0.3).should be_close(-0.225, TOLERANCE)
+    (Rational(3, 4) * -0.3).should be_close(-0.225, TOLERANCE)
+
+    (Rational(3, 4) * 0.0).should eql(0.0)
+    (Rational(-3, -4) * 0.0).should eql(0.0)
+
+    (Rational(-3, 4) * 0.0).should eql(0.0)
+    (Rational(3, -4) * 0.0).should eql(0.0)
+  end
 end
 
 describe "Rational#* passed an Integer" do
-  it_behaves_like :rational_multiply_int, :*
+  it "returns self divided by other as a Rational" do
+    (Rational(3, 4) * 2).should eql(Rational(3, 2))
+    (Rational(2, 4) * 2).should eql(Rational(1, 1))
+    (Rational(6, 7) * -2).should eql(Rational(-12, 7))
+
+    (Rational(3, 4) * 0).should eql(Rational(0, 4))
+  end
 end
diff --git a/spec/ruby/core/rational/numerator_spec.rb b/spec/ruby/core/rational/numerator_spec.rb
index 6f9a9c0e3b2a01..2b9fe2ff5c154b 100644
--- a/spec/ruby/core/rational/numerator_spec.rb
+++ b/spec/ruby/core/rational/numerator_spec.rb
@@ -1,6 +1,10 @@
 require_relative "../../spec_helper"
-require_relative '../../shared/rational/numerator'
 
 describe "Rational#numerator" do
-  it_behaves_like :rational_numerator, :numerator
+  it "returns the numerator" do
+    Rational(3, 4).numerator.should equal(3)
+    Rational(3, -4).numerator.should equal(-3)
+
+    Rational(bignum_value, 1).numerator.should == bignum_value
+  end
 end
diff --git a/spec/ruby/core/rational/plus_spec.rb b/spec/ruby/core/rational/plus_spec.rb
index 67c0ff63d236f5..01df5f67192ec7 100644
--- a/spec/ruby/core/rational/plus_spec.rb
+++ b/spec/ruby/core/rational/plus_spec.rb
@@ -1,19 +1,50 @@
 require_relative "../../spec_helper"
-require_relative '../../shared/rational/plus'
-require_relative '../../shared/rational/arithmetic_exception_in_coerce'
+require_relative 'shared/arithmetic_exception_in_coerce'
 
 describe "Rational#+" do
-  it_behaves_like :rational_plus, :+
+  it "calls #coerce on the passed argument with self" do
+    rational = Rational(3, 4)
+    obj = mock("Object")
+    obj.should_receive(:coerce).with(rational).and_return([1, 2])
+
+    rational + obj
+  end
+
+  it "calls #+ on the coerced Rational with the coerced Object" do
+    rational = Rational(3, 4)
+
+    coerced_rational = mock("Coerced Rational")
+    coerced_rational.should_receive(:+).and_return(:result)
+
+    coerced_obj = mock("Coerced Object")
+
+    obj = mock("Object")
+    obj.should_receive(:coerce).and_return([coerced_rational, coerced_obj])
+
+    (rational + obj).should == :result
+  end
+
   it_behaves_like :rational_arithmetic_exception_in_coerce, :+
 end
 
 describe "Rational#+ with a Rational" do
-  it_behaves_like :rational_plus_rat, :+
+  it "returns the result of subtracting other from self as a Rational" do
+    (Rational(3, 4) + Rational(0, 1)).should eql(Rational(3, 4))
+    (Rational(3, 4) + Rational(1, 4)).should eql(Rational(1, 1))
+
+    (Rational(3, 4) + Rational(2, 1)).should eql(Rational(11, 4))
+  end
 end
 describe "Rational#+ with a Float" do
-  it_behaves_like :rational_plus_float, :+
+  it "returns the result of subtracting other from self as a Float" do
+    (Rational(3, 4) + 0.2).should eql(0.95)
+    (Rational(3, 4) + 2.5).should eql(3.25)
+  end
 end
 
 describe "Rational#+ with an Integer" do
-  it_behaves_like :rational_plus_int, :+
+  it "returns the result of subtracting other from self as a Rational" do
+    (Rational(3, 4) + 1).should eql(Rational(7, 4))
+    (Rational(3, 4) + 2).should eql(Rational(11, 4))
+  end
 end
diff --git a/spec/ruby/core/rational/quo_spec.rb b/spec/ruby/core/rational/quo_spec.rb
index 181f091f7c6300..907898ad34920a 100644
--- a/spec/ruby/core/rational/quo_spec.rb
+++ b/spec/ruby/core/rational/quo_spec.rb
@@ -1,6 +1,25 @@
 require_relative "../../spec_helper"
-require_relative '../../shared/rational/divide'
 
 describe "Rational#quo" do
-  it_behaves_like :rational_divide, :quo
+  it "calls #coerce on the passed argument with self" do
+    rational = Rational(3, 4)
+    obj = mock("Object")
+    obj.should_receive(:coerce).with(rational).and_return([1, 2])
+
+    rational.quo(obj)
+  end
+
+  it "calls #/ on the coerced Rational with the coerced Object" do
+    rational = Rational(3, 4)
+
+    coerced_rational = mock("Coerced Rational")
+    coerced_rational.should_receive(:/).and_return(:result)
+
+    coerced_obj = mock("Coerced Object")
+
+    obj = mock("Object")
+    obj.should_receive(:coerce).and_return([coerced_rational, coerced_obj])
+
+    rational.quo(obj).should == :result
+  end
 end
diff --git a/spec/ruby/core/rational/remainder_spec.rb b/spec/ruby/core/rational/remainder_spec.rb
index 1c0035e5f4a8bd..86ba4674e63a2d 100644
--- a/spec/ruby/core/rational/remainder_spec.rb
+++ b/spec/ruby/core/rational/remainder_spec.rb
@@ -1,6 +1,5 @@
 require_relative "../../spec_helper"
-require_relative '../../shared/rational/remainder'
 
 describe "Rational#remainder" do
-  it_behaves_like :rational_remainder, :remainder
+  it "needs to be reviewed for spec completeness"
 end
diff --git a/spec/ruby/core/rational/round_spec.rb b/spec/ruby/core/rational/round_spec.rb
index 36614a552de019..ac3dcafe7bd755 100644
--- a/spec/ruby/core/rational/round_spec.rb
+++ b/spec/ruby/core/rational/round_spec.rb
@@ -1,6 +1,106 @@
 require_relative '../../spec_helper'
-require_relative '../../shared/rational/round'
 
 describe "Rational#round" do
-  it_behaves_like :rational_round, :round
+  before do
+    @rational = Rational(2200, 7)
+  end
+
+  describe "with no arguments (precision = 0)" do
+    it "returns an integer" do
+      @rational.round.should be_kind_of(Integer)
+      Rational(0, 1).round(0).should be_kind_of(Integer)
+      Rational(124, 1).round(0).should be_kind_of(Integer)
+    end
+
+    it "returns the truncated value toward the nearest integer" do
+      @rational.round.should == 314
+      Rational(0, 1).round(0).should == 0
+      Rational(2, 1).round(0).should == 2
+    end
+
+    it "returns the rounded value toward the nearest integer" do
+      Rational(1, 2).round.should == 1
+      Rational(-1, 2).round.should == -1
+      Rational(3, 2).round.should == 2
+      Rational(-3, 2).round.should == -2
+      Rational(5, 2).round.should == 3
+      Rational(-5, 2).round.should == -3
+    end
+  end
+
+  describe "with a precision < 0" do
+    it "returns an integer" do
+      @rational.round(-2).should be_kind_of(Integer)
+      @rational.round(-1).should be_kind_of(Integer)
+      Rational(0, 1).round(-1).should be_kind_of(Integer)
+      Rational(2, 1).round(-1).should be_kind_of(Integer)
+    end
+
+    it "moves the truncation point n decimal places left" do
+      @rational.round(-3).should == 0
+      @rational.round(-2).should == 300
+      @rational.round(-1).should == 310
+    end
+  end
+
+  describe "with a precision > 0" do
+    it "returns a Rational" do
+      @rational.round(1).should be_kind_of(Rational)
+      @rational.round(2).should be_kind_of(Rational)
+      # Guard against the Mathn library
+      guard -> { !defined?(Math.rsqrt) } do
+        Rational(0, 1).round(1).should be_kind_of(Rational)
+        Rational(2, 1).round(1).should be_kind_of(Rational)
+      end
+    end
+
+    it "moves the truncation point n decimal places right" do
+      @rational.round(1).should == Rational(3143, 10)
+      @rational.round(2).should == Rational(31429, 100)
+      @rational.round(3).should == Rational(157143, 500)
+      Rational(0, 1).round(1).should == Rational(0, 1)
+      Rational(2, 1).round(1).should == Rational(2, 1)
+    end
+
+    it "doesn't alter the value if the precision is too great" do
+      Rational(3, 2).round(10).should == Rational(3, 2).round(20)
+    end
+
+    # #6605
+    it "doesn't fail when rounding to an absurdly large positive precision" do
+      Rational(3, 2).round(2_097_171).should == Rational(3, 2)
+    end
+  end
+
+  describe "with half option" do
+    it "returns an Integer when precision is not passed" do
+      Rational(10, 4).round(half: nil).should == 3
+      Rational(10, 4).round(half: :up).should == 3
+      Rational(10, 4).round(half: :down).should == 2
+      Rational(10, 4).round(half: :even).should == 2
+      Rational(-10, 4).round(half: nil).should == -3
+      Rational(-10, 4).round(half: :up).should == -3
+      Rational(-10, 4).round(half: :down).should == -2
+      Rational(-10, 4).round(half: :even).should == -2
+    end
+
+    it "returns a Rational when the precision is greater than 0" do
+      Rational(25, 100).round(1, half: nil).should == Rational(3, 10)
+      Rational(25, 100).round(1, half: :up).should == Rational(3, 10)
+      Rational(25, 100).round(1, half: :down).should == Rational(1, 5)
+      Rational(25, 100).round(1, half: :even).should == Rational(1, 5)
+      Rational(35, 100).round(1, half: nil).should == Rational(2, 5)
+      Rational(35, 100).round(1, half: :up).should == Rational(2, 5)
+      Rational(35, 100).round(1, half: :down).should == Rational(3, 10)
+      Rational(35, 100).round(1, half: :even).should == Rational(2, 5)
+      Rational(-25, 100).round(1, half: nil).should == Rational(-3, 10)
+      Rational(-25, 100).round(1, half: :up).should == Rational(-3, 10)
+      Rational(-25, 100).round(1, half: :down).should == Rational(-1, 5)
+      Rational(-25, 100).round(1, half: :even).should == Rational(-1, 5)
+    end
+
+    it "raise for a non-existent round mode" do
+      -> { Rational(10, 4).round(half: :nonsense) }.should raise_error(ArgumentError, "invalid rounding mode: nonsense")
+    end
+  end
 end
diff --git a/spec/ruby/shared/rational/abs.rb b/spec/ruby/core/rational/shared/abs.rb
similarity index 90%
rename from spec/ruby/shared/rational/abs.rb
rename to spec/ruby/core/rational/shared/abs.rb
index 8beb20da7e3f89..3d64bcc1a0e94f 100644
--- a/spec/ruby/shared/rational/abs.rb
+++ b/spec/ruby/core/rational/shared/abs.rb
@@ -1,4 +1,4 @@
-require_relative '../../spec_helper'
+require_relative '../../../spec_helper'
 
 describe :rational_abs, shared: true do
   it "returns self's absolute value" do
diff --git a/spec/ruby/shared/rational/arithmetic_exception_in_coerce.rb b/spec/ruby/core/rational/shared/arithmetic_exception_in_coerce.rb
similarity index 89%
rename from spec/ruby/shared/rational/arithmetic_exception_in_coerce.rb
rename to spec/ruby/core/rational/shared/arithmetic_exception_in_coerce.rb
index 0dff91d522b7cd..f4cf70d147d22b 100644
--- a/spec/ruby/shared/rational/arithmetic_exception_in_coerce.rb
+++ b/spec/ruby/core/rational/shared/arithmetic_exception_in_coerce.rb
@@ -1,4 +1,4 @@
-require_relative '../../fixtures/rational'
+require_relative '../fixtures/rational'
 
 describe :rational_arithmetic_exception_in_coerce, shared: true do
   it "does not rescue exception raised in other#coerce" do
diff --git a/spec/ruby/core/rational/to_f_spec.rb b/spec/ruby/core/rational/to_f_spec.rb
index a9cd1be3b5342f..d0da49d3772b50 100644
--- a/spec/ruby/core/rational/to_f_spec.rb
+++ b/spec/ruby/core/rational/to_f_spec.rb
@@ -1,6 +1,16 @@
 require_relative "../../spec_helper"
-require_relative '../../shared/rational/to_f'
 
 describe "Rational#to_f" do
-  it_behaves_like :rational_to_f, :to_f
+  it "returns self converted to a Float" do
+    Rational(3, 4).to_f.should eql(0.75)
+    Rational(3, -4).to_f.should eql(-0.75)
+    Rational(-1, 4).to_f.should eql(-0.25)
+    Rational(-1, -4).to_f.should eql(0.25)
+  end
+
+  it "converts to a Float for large numerator and denominator" do
+    num = 1000000000000000000000000000000000048148248609680896326399448564623182963452541226153892315137780403285956264146010000000000000000000000000000000000048148248609680896326399448564623182963452541226153892315137780403285956264146010000000000000000000000000000000000048148248609680896326399448564623182963452541226153892315137780403285956264146009
+    den = 2000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+    Rational(num, den).to_f.should == 500.0
+  end
 end
diff --git a/spec/ruby/core/rational/to_i_spec.rb b/spec/ruby/core/rational/to_i_spec.rb
index 22cf02b4daea13..520a380b2aeb61 100644
--- a/spec/ruby/core/rational/to_i_spec.rb
+++ b/spec/ruby/core/rational/to_i_spec.rb
@@ -1,6 +1,12 @@
 require_relative "../../spec_helper"
-require_relative '../../shared/rational/to_i'
 
 describe "Rational#to_i" do
-  it_behaves_like :rational_to_i, :to_i
+  it "converts self to an Integer by truncation" do
+    Rational(7, 4).to_i.should eql(1)
+    Rational(11, 4).to_i.should eql(2)
+  end
+
+  it "converts self to an Integer by truncation" do
+    Rational(-7, 4).to_i.should eql(-1)
+  end
 end
diff --git a/spec/ruby/core/rational/to_r_spec.rb b/spec/ruby/core/rational/to_r_spec.rb
index 03f204daf1746f..34f16d7890d772 100644
--- a/spec/ruby/core/rational/to_r_spec.rb
+++ b/spec/ruby/core/rational/to_r_spec.rb
@@ -1,8 +1,13 @@
 require_relative "../../spec_helper"
-require_relative '../../shared/rational/to_r'
 
 describe "Rational#to_r" do
-  it_behaves_like :rational_to_r, :to_r
+  it "returns self" do
+    a = Rational(3, 4)
+    a.to_r.should equal(a)
+
+    a = Rational(bignum_value, 4)
+    a.to_r.should equal(a)
+  end
 
   it "raises TypeError trying to convert BasicObject" do
     obj = BasicObject.new
diff --git a/spec/ruby/core/rational/to_s_spec.rb b/spec/ruby/core/rational/to_s_spec.rb
index 5d90c7d80b0425..24e30778e5a6c5 100644
--- a/spec/ruby/core/rational/to_s_spec.rb
+++ b/spec/ruby/core/rational/to_s_spec.rb
@@ -1,6 +1,14 @@
 require_relative "../../spec_helper"
-require_relative '../../shared/rational/to_s'
 
 describe "Rational#to_s" do
-  it_behaves_like :rational_to_s, :to_s
+  it "returns a string representation of self" do
+    # Guard against the Mathn library
+    guard -> { !defined?(Math.rsqrt) } do
+      Rational(1, 1).to_s.should == "1/1"
+      Rational(2, 1).to_s.should == "2/1"
+    end
+    Rational(1, 2).to_s.should == "1/2"
+    Rational(-1, 3).to_s.should == "-1/3"
+    Rational(1, -3).to_s.should == "-1/3"
+  end
 end
diff --git a/spec/ruby/core/rational/truncate_spec.rb b/spec/ruby/core/rational/truncate_spec.rb
index 47a7cdf17c8d40..728fca34eaeac1 100644
--- a/spec/ruby/core/rational/truncate_spec.rb
+++ b/spec/ruby/core/rational/truncate_spec.rb
@@ -1,6 +1,71 @@
 require_relative "../../spec_helper"
-require_relative '../../shared/rational/truncate'
 
 describe "Rational#truncate" do
-  it_behaves_like :rational_truncate, :truncate
+  before do
+    @rational = Rational(2200, 7)
+  end
+
+  describe "with no arguments (precision = 0)" do
+    it "returns an integer" do
+      @rational.truncate.should be_kind_of(Integer)
+    end
+
+    it "returns the truncated value toward 0" do
+      @rational.truncate.should == 314
+      Rational(1, 2).truncate.should == 0
+      Rational(-1, 2).truncate.should == 0
+    end
+  end
+
+  describe "with an explicit precision = 0" do
+    it "returns an integer" do
+      @rational.truncate(0).should be_kind_of(Integer)
+    end
+
+    it "returns the truncated value toward 0" do
+      @rational.truncate(0).should == 314
+      Rational(1, 2).truncate(0).should == 0
+      Rational(-1, 2).truncate(0).should == 0
+    end
+  end
+
+  describe "with a precision < 0" do
+    it "returns an integer" do
+      @rational.truncate(-2).should be_kind_of(Integer)
+      @rational.truncate(-1).should be_kind_of(Integer)
+    end
+
+    it "moves the truncation point n decimal places left" do
+      @rational.truncate(-3).should == 0
+      @rational.truncate(-2).should == 300
+      @rational.truncate(-1).should == 310
+    end
+  end
+
+  describe "with a precision > 0" do
+    it "returns a Rational" do
+      @rational.truncate(1).should be_kind_of(Rational)
+      @rational.truncate(2).should be_kind_of(Rational)
+    end
+
+    it "moves the truncation point n decimal places right" do
+      @rational.truncate(1).should == Rational(1571, 5)
+      @rational.truncate(2).should == Rational(7857, 25)
+      @rational.truncate(3).should == Rational(62857, 200)
+    end
+  end
+
+  describe "with an invalid value for precision" do
+    it "raises a TypeError" do
+      -> { @rational.truncate(nil) }.should raise_error(TypeError, "not an integer")
+      -> { @rational.truncate(1.0) }.should raise_error(TypeError, "not an integer")
+      -> { @rational.truncate('') }.should raise_error(TypeError, "not an integer")
+    end
+
+    it "does not call to_int on the argument" do
+      object = Object.new
+      object.should_not_receive(:to_int)
+      -> { @rational.truncate(object) }.should raise_error(TypeError, "not an integer")
+    end
+  end
 end
diff --git a/spec/ruby/core/refinement/append_features_spec.rb b/spec/ruby/core/refinement/append_features_spec.rb
index fb84f245bd567b..f7e5f32bc1d305 100644
--- a/spec/ruby/core/refinement/append_features_spec.rb
+++ b/spec/ruby/core/refinement/append_features_spec.rb
@@ -1,20 +1,18 @@
 require_relative '../../spec_helper'
 
 describe "Refinement#append_features" do
-  ruby_version_is "3.2" do
-    it "is not defined" do
-      Refinement.should_not have_private_instance_method(:append_features)
-    end
+  it "is not defined" do
+    Refinement.should_not have_private_instance_method(:append_features)
+  end
 
-    it "is not called by Module#include" do
-      c = Class.new
-      Module.new do
-        refine c do
-          called = false
-          define_method(:append_features){called = true}
-          proc{c.include(self)}.should raise_error(TypeError)
-          called.should == false
-        end
+  it "is not called by Module#include" do
+    c = Class.new
+    Module.new do
+      refine c do
+        called = false
+        define_method(:append_features){called = true}
+        proc{c.include(self)}.should raise_error(TypeError)
+        called.should == false
       end
     end
   end
diff --git a/spec/ruby/core/refinement/extend_object_spec.rb b/spec/ruby/core/refinement/extend_object_spec.rb
index 6c2a0af4f3e623..4da8b359cccc58 100644
--- a/spec/ruby/core/refinement/extend_object_spec.rb
+++ b/spec/ruby/core/refinement/extend_object_spec.rb
@@ -1,22 +1,20 @@
 require_relative '../../spec_helper'
 
 describe "Refinement#extend_object" do
-  ruby_version_is "3.2" do
-    it "is not defined" do
-      Refinement.should_not have_private_instance_method(:extend_object)
-    end
+  it "is not defined" do
+    Refinement.should_not have_private_instance_method(:extend_object)
+  end
 
-    it "is not called by Object#extend" do
-      c = Class.new
-      Module.new do
-        refine c do
-          called = false
-          define_method(:extend_object) { called = true }
-          -> {
-            c.extend(self)
-          }.should raise_error(TypeError)
-          called.should == false
-        end
+  it "is not called by Object#extend" do
+    c = Class.new
+    Module.new do
+      refine c do
+        called = false
+        define_method(:extend_object) { called = true }
+        -> {
+          c.extend(self)
+        }.should raise_error(TypeError)
+        called.should == false
       end
     end
   end
diff --git a/spec/ruby/core/refinement/import_methods_spec.rb b/spec/ruby/core/refinement/import_methods_spec.rb
index 05973b2380b062..13c0b1004cdfea 100644
--- a/spec/ruby/core/refinement/import_methods_spec.rb
+++ b/spec/ruby/core/refinement/import_methods_spec.rb
@@ -2,137 +2,76 @@
 require_relative 'fixtures/classes'
 
 describe "Refinement#import_methods" do
-  ruby_version_is "3.1" do
-    context "when methods are defined in Ruby code" do
-      it "imports methods" do
-        str_utils = Module.new do
-          def indent(level)
-            " " * level + self
-          end
-        end
-
-        Module.new do
-          refine String do
-            import_methods str_utils
-            "foo".indent(3).should == "   foo"
-          end
+  context "when methods are defined in Ruby code" do
+    it "imports methods" do
+      str_utils = Module.new do
+        def indent(level)
+          " " * level + self
         end
       end
 
-      it "throws an exception when argument is not a module" do
-        Module.new do
-          refine String do
-            -> {
-              import_methods Integer
-            }.should raise_error(TypeError, "wrong argument type Class (expected Module)")
-          end
+      Module.new do
+        refine String do
+          import_methods str_utils
+          "foo".indent(3).should == "   foo"
         end
       end
+    end
 
-      it "imports methods from multiple modules" do
-        str_utils = Module.new do
-          def indent(level)
-            " " * level + self
-          end
-        end
-
-        str_utils_fancy = Module.new do
-          def indent_star(level)
-            "*" * level + self
-          end
-        end
-
-        Module.new do
-          refine String do
-            import_methods str_utils, str_utils_fancy
-            "foo".indent(3).should == "   foo"
-            "foo".indent_star(3).should == "***foo"
-          end
+    it "throws an exception when argument is not a module" do
+      Module.new do
+        refine String do
+          -> {
+            import_methods Integer
+          }.should raise_error(TypeError, "wrong argument type Class (expected Module)")
         end
       end
+    end
 
-      it "imports a method defined in the last module if method with same name is defined in multiple modules" do
-        str_utils = Module.new do
-          def indent(level)
-            " " * level + self
-          end
-        end
-
-        str_utils_fancy = Module.new do
-          def indent(level)
-            "*" * level + self
-          end
-        end
-
-        Module.new do
-          refine String do
-            import_methods str_utils, str_utils_fancy
-            "foo".indent(3).should == "***foo"
-          end
+    it "imports methods from multiple modules" do
+      str_utils = Module.new do
+        def indent(level)
+          " " * level + self
         end
       end
 
-      it "still imports methods of modules listed before a module that contains method not defined in Ruby" do
-        str_utils = Module.new do
-          def indent(level)
-            " " * level + self
-          end
-        end
-
-        string_refined = Module.new do
-          refine String do
-            -> {
-              import_methods str_utils, Kernel
-            }.should raise_error(ArgumentError)
-          end
+      str_utils_fancy = Module.new do
+        def indent_star(level)
+          "*" * level + self
         end
+      end
 
-        Module.new do
-          using string_refined
+      Module.new do
+        refine String do
+          import_methods str_utils, str_utils_fancy
           "foo".indent(3).should == "   foo"
+          "foo".indent_star(3).should == "***foo"
         end
       end
     end
 
-    it "warns if a module includes/prepends some other module" do
-      module1 = Module.new do
-      end
-
-      module2 = Module.new do
-        include module1
-      end
-
-      Module.new do
-        refine String do
-          -> {
-            import_methods module2
-          }.should complain(/warning: #<Module:\w*> has ancestors, but Refinement#import_methods doesn't import their methods/)
+    it "imports a method defined in the last module if method with same name is defined in multiple modules" do
+      str_utils = Module.new do
+        def indent(level)
+          " " * level + self
         end
       end
 
-      Module.new do
-        refine String do
-          -> {
-            import_methods RefinementSpec::ModuleWithAncestors
-          }.should complain(/warning: RefinementSpec::ModuleWithAncestors has ancestors, but Refinement#import_methods doesn't import their methods/)
+      str_utils_fancy = Module.new do
+        def indent(level)
+          "*" * level + self
         end
       end
-    end
 
-    it "doesn't import methods from included/prepended modules" do
       Module.new do
         refine String do
-          suppress_warning { import_methods RefinementSpec::ModuleWithAncestors }
+          import_methods str_utils, str_utils_fancy
+          "foo".indent(3).should == "***foo"
         end
-
-        using self
-        -> {
-          "foo".indent(3)
-        }.should raise_error(NoMethodError, /undefined method `indent' for ("foo":String|an instance of String)/)
       end
     end
 
-    it "doesn't import any methods if one of the arguments is not a module" do
+    it "still imports methods of modules listed before a module that contains method not defined in Ruby" do
       str_utils = Module.new do
         def indent(level)
           " " * level + self
@@ -142,126 +81,185 @@ def indent(level)
       string_refined = Module.new do
         refine String do
           -> {
-            import_methods str_utils, Integer
-          }.should raise_error(TypeError)
+            import_methods str_utils, Kernel
+          }.should raise_error(ArgumentError)
         end
       end
 
       Module.new do
         using string_refined
+        "foo".indent(3).should == "   foo"
+      end
+    end
+  end
+
+  it "warns if a module includes/prepends some other module" do
+    module1 = Module.new do
+    end
+
+    module2 = Module.new do
+      include module1
+    end
+
+    Module.new do
+      refine String do
         -> {
-          "foo".indent(3)
-        }.should raise_error(NoMethodError)
+          import_methods module2
+        }.should complain(/warning: #<Module:\w*> has ancestors, but Refinement#import_methods doesn't import their methods/)
       end
     end
 
-    it "imports methods from multiple modules so that methods see other's module's methods" do
-      str_utils = Module.new do
-        def indent(level)
-          " " * level + self
-        end
+    Module.new do
+      refine String do
+        -> {
+          import_methods RefinementSpec::ModuleWithAncestors
+        }.should complain(/warning: RefinementSpec::ModuleWithAncestors has ancestors, but Refinement#import_methods doesn't import their methods/)
+      end
+    end
+  end
+
+  it "doesn't import methods from included/prepended modules" do
+    Module.new do
+      refine String do
+        suppress_warning { import_methods RefinementSpec::ModuleWithAncestors }
       end
 
-      str_utils_normal = Module.new do
-        def indent_normal(level)
-          self.indent(level)
-        end
+      using self
+      -> {
+        "foo".indent(3)
+      }.should raise_error(NoMethodError, /undefined method [`']indent' for ("foo":String|an instance of String)/)
+    end
+  end
+
+  it "doesn't import any methods if one of the arguments is not a module" do
+    str_utils = Module.new do
+      def indent(level)
+        " " * level + self
       end
+    end
 
-      Module.new do
-        refine String do
-          import_methods str_utils, str_utils_normal
-        end
+    string_refined = Module.new do
+      refine String do
+        -> {
+          import_methods str_utils, Integer
+        }.should raise_error(TypeError)
+      end
+    end
 
-        using self
-        "foo".indent_normal(3).should == "   foo"
+    Module.new do
+      using string_refined
+      -> {
+        "foo".indent(3)
+      }.should raise_error(NoMethodError)
+    end
+  end
+
+  it "imports methods from multiple modules so that methods see other's module's methods" do
+    str_utils = Module.new do
+      def indent(level)
+        " " * level + self
       end
     end
 
-    it "imports methods from module so that methods can see each other" do
-      str_utils = Module.new do
-        def indent(level)
-          " " * level + self
-        end
+    str_utils_normal = Module.new do
+      def indent_normal(level)
+        self.indent(level)
+      end
+    end
 
-        def indent_with_dot(level)
-          self.indent(level) + "."
-        end
+    Module.new do
+      refine String do
+        import_methods str_utils, str_utils_normal
       end
 
-      Module.new do
-        refine String do
-          import_methods str_utils
-        end
+      using self
+      "foo".indent_normal(3).should == "   foo"
+    end
+  end
 
-        using self
-        "foo".indent_with_dot(3).should == "   foo."
+  it "imports methods from module so that methods can see each other" do
+    str_utils = Module.new do
+      def indent(level)
+        " " * level + self
+      end
+
+      def indent_with_dot(level)
+        self.indent(level) + "."
       end
     end
 
-    it "doesn't import module's class methods" do
-      str_utils = Module.new do
-        def self.indent(level)
-          " " * level + self
-        end
+    Module.new do
+      refine String do
+        import_methods str_utils
       end
 
-      Module.new do
-        refine String do
-          import_methods str_utils
-        end
+      using self
+      "foo".indent_with_dot(3).should == "   foo."
+    end
+  end
 
-        using self
-        -> {
-          String.indent(3)
-        }.should raise_error(NoMethodError, /undefined method `indent' for (String:Class|class String)/)
+  it "doesn't import module's class methods" do
+    str_utils = Module.new do
+      def self.indent(level)
+        " " * level + self
       end
     end
 
-    it "imports module methods with super" do
-      class_to_refine = Class.new do
-        def foo(number)
-          2 * number
-        end
+    Module.new do
+      refine String do
+        import_methods str_utils
       end
 
-      extension = Module.new do
-        def foo(number)
-          super * 2
-        end
+      using self
+      -> {
+        String.indent(3)
+      }.should raise_error(NoMethodError, /undefined method [`']indent' for (String:Class|class String)/)
+    end
+  end
+
+  it "imports module methods with super" do
+    class_to_refine = Class.new do
+      def foo(number)
+        2 * number
       end
+    end
 
-      refinement = Module.new do
-        refine class_to_refine do
-          import_methods extension
-        end
+    extension = Module.new do
+      def foo(number)
+        super * 2
       end
+    end
 
-      Module.new do
-        using refinement
-        class_to_refine.new.foo(2).should == 8
+    refinement = Module.new do
+      refine class_to_refine do
+        import_methods extension
       end
     end
 
-    context "when methods are not defined in Ruby code" do
-      it "raises ArgumentError" do
-        Module.new do
-          refine String do
-            -> {
-              import_methods Kernel
-            }.should raise_error(ArgumentError)
-          end
+    Module.new do
+      using refinement
+      class_to_refine.new.foo(2).should == 8
+    end
+  end
+
+  context "when methods are not defined in Ruby code" do
+    it "raises ArgumentError" do
+      Module.new do
+        refine String do
+          -> {
+            import_methods Kernel
+          }.should raise_error(ArgumentError)
         end
       end
+    end
 
-      it "raises ArgumentError when importing methods from C extension" do
-        require 'zlib'
-        Module.new do
-          refine String do
-            -> {
-              import_methods Zlib
-            }.should raise_error(ArgumentError, /Can't import method which is not defined with Ruby code: Zlib#*/)
-          end
+    it "raises ArgumentError when importing methods from C extension" do
+      require 'zlib'
+      Module.new do
+        refine String do
+          -> {
+            import_methods Zlib
+          }.should raise_error(ArgumentError, /Can't import method which is not defined with Ruby code: Zlib#*/)
         end
       end
     end
diff --git a/spec/ruby/core/refinement/include_spec.rb b/spec/ruby/core/refinement/include_spec.rb
index 25a53f0ec71f41..57451bd9bc9fca 100644
--- a/spec/ruby/core/refinement/include_spec.rb
+++ b/spec/ruby/core/refinement/include_spec.rb
@@ -1,26 +1,12 @@
 require_relative '../../spec_helper'
 
 describe "Refinement#include" do
-  ruby_version_is "3.1"..."3.2" do
-    it "warns about deprecation" do
-      Module.new do
-        refine String do
-          -> {
-            include Module.new
-          }.should complain(/warning: Refinement#include is deprecated and will be removed in Ruby 3.2/)
-        end
-      end
-    end
-  end
-
-  ruby_version_is "3.2" do
-    it "raises a TypeError" do
-      Module.new do
-        refine String do
-          -> {
-            include Module.new
-          }.should raise_error(TypeError, "Refinement#include has been removed")
-        end
+  it "raises a TypeError" do
+    Module.new do
+      refine String do
+        -> {
+          include Module.new
+        }.should raise_error(TypeError, "Refinement#include has been removed")
       end
     end
   end
diff --git a/spec/ruby/core/refinement/prepend_features_spec.rb b/spec/ruby/core/refinement/prepend_features_spec.rb
index 9fdea199a219c3..fbc431bbd233d8 100644
--- a/spec/ruby/core/refinement/prepend_features_spec.rb
+++ b/spec/ruby/core/refinement/prepend_features_spec.rb
@@ -1,20 +1,18 @@
 require_relative '../../spec_helper'
 
 describe "Refinement#prepend_features" do
-  ruby_version_is "3.2" do
-    it "is not defined" do
-      Refinement.should_not have_private_instance_method(:prepend_features)
-    end
+  it "is not defined" do
+    Refinement.should_not have_private_instance_method(:prepend_features)
+  end
 
-    it "is not called by Module#prepend" do
-      c = Class.new
-      Module.new do
-        refine c do
-          called = false
-          define_method(:prepend_features){called = true}
-          proc{c.prepend(self)}.should raise_error(TypeError)
-          called.should == false
-        end
+  it "is not called by Module#prepend" do
+    c = Class.new
+    Module.new do
+      refine c do
+        called = false
+        define_method(:prepend_features){called = true}
+        proc{c.prepend(self)}.should raise_error(TypeError)
+        called.should == false
       end
     end
   end
diff --git a/spec/ruby/core/refinement/prepend_spec.rb b/spec/ruby/core/refinement/prepend_spec.rb
index 27b70d392a0012..64cf7cd17f7ff8 100644
--- a/spec/ruby/core/refinement/prepend_spec.rb
+++ b/spec/ruby/core/refinement/prepend_spec.rb
@@ -1,26 +1,12 @@
 require_relative '../../spec_helper'
 
 describe "Refinement#prepend" do
-  ruby_version_is "3.1"..."3.2" do
-    it "warns about deprecation" do
-      Module.new do
-        refine String do
-          -> {
-            prepend Module.new
-          }.should complain(/warning: Refinement#prepend is deprecated and will be removed in Ruby 3.2/)
-        end
-      end
-    end
-  end
-
-  ruby_version_is "3.2" do
-    it "raises a TypeError" do
-      Module.new do
-        refine String do
-          -> {
-            prepend Module.new
-          }.should raise_error(TypeError, "Refinement#prepend has been removed")
-        end
+  it "raises a TypeError" do
+    Module.new do
+      refine String do
+        -> {
+          prepend Module.new
+        }.should raise_error(TypeError, "Refinement#prepend has been removed")
       end
     end
   end
diff --git a/spec/ruby/core/refinement/refined_class_spec.rb b/spec/ruby/core/refinement/refined_class_spec.rb
index 00b65d08955ab3..60a58380ccf00b 100644
--- a/spec/ruby/core/refinement/refined_class_spec.rb
+++ b/spec/ruby/core/refinement/refined_class_spec.rb
@@ -1,8 +1,29 @@
-require_relative '../../spec_helper'
+require_relative "../../spec_helper"
+require_relative 'shared/target'
 
 describe "Refinement#refined_class" do
-  ruby_version_is "3.2"..."3.3" do
-    it "returns the class refined by the receiver" do
+  ruby_version_is ""..."3.3" do
+    it_behaves_like :refinement_target, :refined_class
+  end
+
+  ruby_version_is "3.3"..."3.4" do
+    it "has been deprecated in favour of Refinement#target" do
+      refinement_int = nil
+
+      Module.new do
+        refine Integer do
+          refinement_int = self
+        end
+      end
+
+      -> {
+        refinement_int.refined_class
+      }.should complain(/warning: Refinement#refined_class is deprecated and will be removed in Ruby 3.4; use Refinement#target instead/)
+    end
+  end
+
+  ruby_version_is "3.4" do
+    it "has been removed" do
       refinement_int = nil
 
       Module.new do
@@ -11,7 +32,7 @@
         end
       end
 
-      refinement_int.refined_class.should == Integer
+      refinement_int.should_not.respond_to?(:refined_class)
     end
   end
 end
diff --git a/spec/ruby/core/refinement/shared/target.rb b/spec/ruby/core/refinement/shared/target.rb
new file mode 100644
index 00000000000000..79557bea0b9679
--- /dev/null
+++ b/spec/ruby/core/refinement/shared/target.rb
@@ -0,0 +1,13 @@
+describe :refinement_target, shared: true do
+  it "returns the class refined by the receiver" do
+    refinement_int = nil
+
+    Module.new do
+      refine Integer do
+        refinement_int = self
+      end
+    end
+
+    refinement_int.send(@method).should == Integer
+  end
+end
diff --git a/spec/ruby/core/refinement/target_spec.rb b/spec/ruby/core/refinement/target_spec.rb
new file mode 100644
index 00000000000000..fee9588a96ed65
--- /dev/null
+++ b/spec/ruby/core/refinement/target_spec.rb
@@ -0,0 +1,8 @@
+require_relative "../../spec_helper"
+require_relative 'shared/target'
+
+describe "Refinement#target" do
+  ruby_version_is "3.3" do
+    it_behaves_like :refinement_target, :target
+  end
+end
diff --git a/spec/ruby/core/regexp/linear_time_spec.rb b/spec/ruby/core/regexp/linear_time_spec.rb
index 4dc436264fd7e7..c3b3500549b2e6 100644
--- a/spec/ruby/core/regexp/linear_time_spec.rb
+++ b/spec/ruby/core/regexp/linear_time_spec.rb
@@ -1,25 +1,27 @@
 require_relative '../../spec_helper'
 
-ruby_version_is "3.2" do
-  describe "Regexp.linear_time?" do
-    it "returns true if matching can be done in linear time" do
-      Regexp.linear_time?(/a/).should == true
-      Regexp.linear_time?('a').should == true
-    end
+describe "Regexp.linear_time?" do
+  it "returns true if matching can be done in linear time" do
+    Regexp.linear_time?(/a/).should == true
+    Regexp.linear_time?('a').should == true
+  end
 
-    it "return false if matching can't be done in linear time" do
-      Regexp.linear_time?(/(a)\1/).should == false
-      Regexp.linear_time?("(a)\\1").should == false
-    end
+  it "returns true if matching can be done in linear time for a binary Regexp" do
+    Regexp.linear_time?(/[\x80-\xff]/n).should == true
+  end
 
-    it "accepts flags for string argument" do
-      Regexp.linear_time?('a', Regexp::IGNORECASE).should == true
-    end
+  it "return false if matching can't be done in linear time" do
+    Regexp.linear_time?(/(a)\1/).should == false
+    Regexp.linear_time?("(a)\\1").should == false
+  end
+
+  it "accepts flags for string argument" do
+    Regexp.linear_time?('a', Regexp::IGNORECASE).should == true
+  end
 
-    it "warns about flags being ignored for regexp arguments" do
-      -> {
-        Regexp.linear_time?(/a/, Regexp::IGNORECASE)
-      }.should complain(/warning: flags ignored/)
-    end
+  it "warns about flags being ignored for regexp arguments" do
+    -> {
+      Regexp.linear_time?(/a/, Regexp::IGNORECASE)
+    }.should complain(/warning: flags ignored/)
   end
 end
diff --git a/spec/ruby/core/regexp/shared/new.rb b/spec/ruby/core/regexp/shared/new.rb
index 773882e4954a95..921736d2990853 100644
--- a/spec/ruby/core/regexp/shared/new.rb
+++ b/spec/ruby/core/regexp/shared/new.rb
@@ -1,4 +1,4 @@
-# -*- encoding: binary -*-
+# encoding: binary
 
 describe :regexp_new, shared: true do
   it "requires one argument and creates a new regular expression object" do
@@ -56,7 +56,7 @@ def obj.to_str() [] end
   end
 
   it "raises a RegexpError when passed an incorrect regexp" do
-    -> { Regexp.send(@method, "^[$", 0) }.should raise_error(RegexpError)
+    -> { Regexp.send(@method, "^[$", 0) }.should raise_error(RegexpError, Regexp.new(Regexp.escape("premature end of char-class: /^[$/")))
   end
 
   it "does not set Regexp options if only given one argument" do
@@ -128,124 +128,67 @@ def obj.to_str() [] end
     obj = Object.new
     def obj.to_int() ScratchPad.record(:called) end
 
-    Regexp.send(@method, "Hi", obj)
+    -> {
+      Regexp.send(@method, "Hi", obj)
+    }.should complain(/expected true or false as ignorecase/, {verbose: true})
 
     ScratchPad.recorded.should == nil
   end
 
-  ruby_version_is ""..."3.2" do
-    it "treats any non-Integer, non-nil, non-false second argument as IGNORECASE" do
+  it "warns any non-Integer, non-nil, non-false second argument" do
+    r = nil
+    -> {
       r = Regexp.send(@method, 'Hi', Object.new)
-      (r.options & Regexp::IGNORECASE).should_not == 0
-      (r.options & Regexp::MULTILINE).should == 0
-      not_supported_on :opal do
-        (r.options & Regexp::EXTENDED).should == 0
-      end
-    end
-  end
-
-  ruby_version_is "3.2" do
-    it "warns any non-Integer, non-nil, non-false second argument" do
-      r = nil
-      -> {
-        r = Regexp.send(@method, 'Hi', Object.new)
-      }.should complain(/expected true or false as ignorecase/, {verbose: true})
-      (r.options & Regexp::IGNORECASE).should_not == 0
-      (r.options & Regexp::MULTILINE).should == 0
-      not_supported_on :opal do
-        (r.options & Regexp::EXTENDED).should == 0
-      end
-    end
-
-    it "accepts a String of supported flags as the second argument" do
-      r = Regexp.send(@method, 'Hi', 'i')
-      (r.options & Regexp::IGNORECASE).should_not == 0
-      (r.options & Regexp::MULTILINE).should == 0
-      not_supported_on :opal do
-        (r.options & Regexp::EXTENDED).should == 0
-      end
-
-      r = Regexp.send(@method, 'Hi', 'imx')
-      (r.options & Regexp::IGNORECASE).should_not == 0
-      (r.options & Regexp::MULTILINE).should_not == 0
-      not_supported_on :opal do
-        (r.options & Regexp::EXTENDED).should_not == 0
-      end
-
-      r = Regexp.send(@method, 'Hi', 'mimi')
-      (r.options & Regexp::IGNORECASE).should_not == 0
-      (r.options & Regexp::MULTILINE).should_not == 0
-      not_supported_on :opal do
-        (r.options & Regexp::EXTENDED).should == 0
-      end
-
-      r = Regexp.send(@method, 'Hi', '')
-      (r.options & Regexp::IGNORECASE).should == 0
-      (r.options & Regexp::MULTILINE).should == 0
-      not_supported_on :opal do
-        (r.options & Regexp::EXTENDED).should == 0
-      end
-    end
-
-    it "raises an Argument error if the second argument contains unsupported chars" do
-      -> { Regexp.send(@method, 'Hi', 'e') }.should raise_error(ArgumentError)
-      -> { Regexp.send(@method, 'Hi', 'n') }.should raise_error(ArgumentError)
-      -> { Regexp.send(@method, 'Hi', 's') }.should raise_error(ArgumentError)
-      -> { Regexp.send(@method, 'Hi', 'u') }.should raise_error(ArgumentError)
-      -> { Regexp.send(@method, 'Hi', 'j') }.should raise_error(ArgumentError)
-      -> { Regexp.send(@method, 'Hi', 'mjx') }.should raise_error(ArgumentError)
+    }.should complain(/expected true or false as ignorecase/, {verbose: true})
+    (r.options & Regexp::IGNORECASE).should_not == 0
+    (r.options & Regexp::MULTILINE).should == 0
+    not_supported_on :opal do
+      (r.options & Regexp::EXTENDED).should == 0
     end
   end
 
-  ruby_version_is ""..."3.2" do
-    it "ignores the third argument if it is 'e' or 'euc' (case-insensitive)" do
-      -> {
-        Regexp.send(@method, 'Hi', nil, 'e').encoding.should == Encoding::US_ASCII
-        Regexp.send(@method, 'Hi', nil, 'euc').encoding.should == Encoding::US_ASCII
-        Regexp.send(@method, 'Hi', nil, 'E').encoding.should == Encoding::US_ASCII
-        Regexp.send(@method, 'Hi', nil, 'EUC').encoding.should == Encoding::US_ASCII
-      }.should complain(/encoding option is ignored/)
+  it "accepts a String of supported flags as the second argument" do
+    r = Regexp.send(@method, 'Hi', 'i')
+    (r.options & Regexp::IGNORECASE).should_not == 0
+    (r.options & Regexp::MULTILINE).should == 0
+    not_supported_on :opal do
+      (r.options & Regexp::EXTENDED).should == 0
     end
 
-    it "ignores the third argument if it is 's' or 'sjis' (case-insensitive)" do
-      -> {
-        Regexp.send(@method, 'Hi', nil, 's').encoding.should == Encoding::US_ASCII
-        Regexp.send(@method, 'Hi', nil, 'sjis').encoding.should == Encoding::US_ASCII
-        Regexp.send(@method, 'Hi', nil, 'S').encoding.should == Encoding::US_ASCII
-        Regexp.send(@method, 'Hi', nil, 'SJIS').encoding.should == Encoding::US_ASCII
-      }.should complain(/encoding option is ignored/)
+    r = Regexp.send(@method, 'Hi', 'imx')
+    (r.options & Regexp::IGNORECASE).should_not == 0
+    (r.options & Regexp::MULTILINE).should_not == 0
+    not_supported_on :opal do
+      (r.options & Regexp::EXTENDED).should_not == 0
     end
 
-    it "ignores the third argument if it is 'u' or 'utf8' (case-insensitive)" do
-      -> {
-        Regexp.send(@method, 'Hi', nil, 'u').encoding.should == Encoding::US_ASCII
-        Regexp.send(@method, 'Hi', nil, 'utf8').encoding.should == Encoding::US_ASCII
-        Regexp.send(@method, 'Hi', nil, 'U').encoding.should == Encoding::US_ASCII
-        Regexp.send(@method, 'Hi', nil, 'UTF8').encoding.should == Encoding::US_ASCII
-      }.should complain(/encoding option is ignored/)
+    r = Regexp.send(@method, 'Hi', 'mimi')
+    (r.options & Regexp::IGNORECASE).should_not == 0
+    (r.options & Regexp::MULTILINE).should_not == 0
+    not_supported_on :opal do
+      (r.options & Regexp::EXTENDED).should == 0
     end
 
-    it "uses US_ASCII encoding if third argument is 'n' or 'none' (case insensitive) and only ascii characters" do
-      Regexp.send(@method, 'Hi', nil, 'n').encoding.should == Encoding::US_ASCII
-      Regexp.send(@method, 'Hi', nil, 'none').encoding.should == Encoding::US_ASCII
-      Regexp.send(@method, 'Hi', nil, 'N').encoding.should == Encoding::US_ASCII
-      Regexp.send(@method, 'Hi', nil, 'NONE').encoding.should == Encoding::US_ASCII
+    r = Regexp.send(@method, 'Hi', '')
+    (r.options & Regexp::IGNORECASE).should == 0
+    (r.options & Regexp::MULTILINE).should == 0
+    not_supported_on :opal do
+      (r.options & Regexp::EXTENDED).should == 0
     end
+  end
 
-    it "uses ASCII_8BIT encoding if third argument is 'n' or 'none' (case insensitive) and non-ascii characters" do
-      a = "(?:[\x8E\xA1-\xFE])"
-      str = "\A(?:#{a}|x*)\z"
-
-      Regexp.send(@method, str, nil, 'N').encoding.should == Encoding::BINARY
-      Regexp.send(@method, str, nil, 'n').encoding.should == Encoding::BINARY
-      Regexp.send(@method, str, nil, 'none').encoding.should == Encoding::BINARY
-      Regexp.send(@method, str, nil, 'NONE').encoding.should == Encoding::BINARY
-    end
+  it "raises an Argument error if the second argument contains unsupported chars" do
+    -> { Regexp.send(@method, 'Hi', 'e') }.should raise_error(ArgumentError, "unknown regexp option: e")
+    -> { Regexp.send(@method, 'Hi', 'n') }.should raise_error(ArgumentError, "unknown regexp option: n")
+    -> { Regexp.send(@method, 'Hi', 's') }.should raise_error(ArgumentError, "unknown regexp option: s")
+    -> { Regexp.send(@method, 'Hi', 'u') }.should raise_error(ArgumentError, "unknown regexp option: u")
+    -> { Regexp.send(@method, 'Hi', 'j') }.should raise_error(ArgumentError, "unknown regexp option: j")
+    -> { Regexp.send(@method, 'Hi', 'mjx') }.should raise_error(ArgumentError, /unknown regexp option: mjx\b/)
   end
 
   describe "with escaped characters" do
     it "raises a Regexp error if there is a trailing backslash" do
-      -> { Regexp.send(@method, "\\") }.should raise_error(RegexpError)
+      -> { Regexp.send(@method, "\\") }.should raise_error(RegexpError, Regexp.new(Regexp.escape("too short escape sequence: /\\/")))
     end
 
     it "does not raise a Regexp error if there is an escaped trailing backslash" do
@@ -277,7 +220,7 @@ def obj.to_int() ScratchPad.record(:called) end
     end
 
     it "raises a RegexpError if \\x is not followed by any hexadecimal digits" do
-      -> { Regexp.send(@method, "\\" + "xn") }.should raise_error(RegexpError)
+      -> { Regexp.send(@method, "\\" + "xn") }.should raise_error(RegexpError, Regexp.new(Regexp.escape("invalid hex escape: /\\xn/")))
     end
 
     it "accepts an escaped string interpolation" do
@@ -437,15 +380,19 @@ def obj.to_int() ScratchPad.record(:called) end
     end
 
     it "raises a RegexpError if less than four digits are given for \\uHHHH" do
-      -> { Regexp.send(@method, "\\" + "u304") }.should raise_error(RegexpError)
+      -> { Regexp.send(@method, "\\" + "u304") }.should raise_error(RegexpError, Regexp.new(Regexp.escape("invalid Unicode escape: /\\u304/")))
     end
 
     it "raises a RegexpError if the \\u{} escape is empty" do
-      -> { Regexp.send(@method, "\\" + "u{}") }.should raise_error(RegexpError)
+      -> { Regexp.send(@method, "\\" + "u{}") }.should raise_error(RegexpError, Regexp.new(Regexp.escape("invalid Unicode list: /\\u{}/")))
+    end
+
+    it "raises a RegexpError if the \\u{} escape contains non hexadecimal digits" do
+      -> { Regexp.send(@method, "\\" + "u{abcX}") }.should raise_error(RegexpError, Regexp.new(Regexp.escape("invalid Unicode list: /\\u{abcX}/")))
     end
 
     it "raises a RegexpError if more than six hexadecimal digits are given" do
-      -> { Regexp.send(@method, "\\" + "u{0ffffff}") }.should raise_error(RegexpError)
+      -> { Regexp.send(@method, "\\" + "u{0ffffff}") }.should raise_error(RegexpError, Regexp.new(Regexp.escape("invalid Unicode range: /\\u{0ffffff}/")))
     end
 
     it "returns a Regexp with US-ASCII encoding if only 7-bit ASCII characters are present regardless of the input String's encoding" do
@@ -473,12 +420,12 @@ def obj.to_int() ScratchPad.record(:called) end
     end
 
     it "returns a Regexp with the input String's encoding" do
-      str = "\x82\xa0".force_encoding(Encoding::Shift_JIS)
+      str = "\x82\xa0".dup.force_encoding(Encoding::Shift_JIS)
       Regexp.send(@method, str).encoding.should == Encoding::Shift_JIS
     end
 
     it "returns a Regexp with source String having the input String's encoding" do
-      str = "\x82\xa0".force_encoding(Encoding::Shift_JIS)
+      str = "\x82\xa0".dup.force_encoding(Encoding::Shift_JIS)
       Regexp.send(@method, str).source.encoding.should == Encoding::Shift_JIS
     end
   end
@@ -603,11 +550,5 @@ def obj.to_int() ScratchPad.record(:called) end
     it "sets the encoding to US-ASCII if the Regexp literal has the 'n' option and the source String is ASCII only" do
       Regexp.send(@method, /Hi/n).encoding.should == Encoding::US_ASCII
     end
-
-    ruby_version_is ''...'3.2' do
-      it "sets the encoding to source String's encoding if the Regexp literal has the 'n' option and the source String is not ASCII only" do
-        Regexp.send(@method, Regexp.new("\\xff", nil, 'n')).encoding.should == Encoding::BINARY
-      end
-    end
   end
 end
diff --git a/spec/ruby/core/regexp/shared/quote.rb b/spec/ruby/core/regexp/shared/quote.rb
index 953310276692f9..3f46a18b5bf8bb 100644
--- a/spec/ruby/core/regexp/shared/quote.rb
+++ b/spec/ruby/core/regexp/shared/quote.rb
@@ -1,9 +1,9 @@
-# -*- encoding: binary -*-
+# encoding: binary
 
 describe :regexp_quote, shared: true do
   it "escapes any characters with special meaning in a regular expression" do
-    Regexp.send(@method, '\*?{}.+^[]()- ').should == '\\\\\*\?\{\}\.\+\^\[\]\(\)\-\\ '
-    Regexp.send(@method, "\*?{}.+^[]()- ").should == '\\*\\?\\{\\}\\.\\+\\^\\[\\]\\(\\)\\-\\ '
+    Regexp.send(@method, '\*?{}.+^$[]()- ').should == '\\\\\*\?\{\}\.\+\^\$\[\]\(\)\-\\ '
+    Regexp.send(@method, "\*?{}.+^$[]()- ").should == '\\*\\?\\{\\}\\.\\+\\^\\$\\[\\]\\(\\)\\-\\ '
     Regexp.send(@method, '\n\r\f\t').should == '\\\\n\\\\r\\\\f\\\\t'
     Regexp.send(@method, "\n\r\f\t").should == '\\n\\r\\f\\t'
   end
@@ -18,23 +18,23 @@
   end
 
   it "works for broken strings" do
-    Regexp.send(@method, "a.\x85b.".force_encoding("US-ASCII")).should =="a\\.\x85b\\.".force_encoding("US-ASCII")
-    Regexp.send(@method, "a.\x80".force_encoding("UTF-8")).should == "a\\.\x80".force_encoding("UTF-8")
+    Regexp.send(@method, "a.\x85b.".dup.force_encoding("US-ASCII")).should =="a\\.\x85b\\.".dup.force_encoding("US-ASCII")
+    Regexp.send(@method, "a.\x80".dup.force_encoding("UTF-8")).should == "a\\.\x80".dup.force_encoding("UTF-8")
   end
 
   it "sets the encoding of the result to US-ASCII if there are only US-ASCII characters present in the input String" do
-    str = "abc".force_encoding("euc-jp")
+    str = "abc".dup.force_encoding("euc-jp")
     Regexp.send(@method, str).encoding.should == Encoding::US_ASCII
   end
 
   it "sets the encoding of the result to the encoding of the String if any non-US-ASCII characters are present in an input String with valid encoding" do
-    str = "ありがとう".force_encoding("utf-8")
+    str = "ありがとう".dup.force_encoding("utf-8")
     str.valid_encoding?.should be_true
     Regexp.send(@method, str).encoding.should == Encoding::UTF_8
   end
 
   it "sets the encoding of the result to BINARY if any non-US-ASCII characters are present in an input String with invalid encoding" do
-    str = "\xff".force_encoding "us-ascii"
+    str = "\xff".dup.force_encoding "us-ascii"
     str.valid_encoding?.should be_false
     Regexp.send(@method, "\xff").encoding.should == Encoding::BINARY
   end
diff --git a/spec/ruby/core/regexp/timeout_spec.rb b/spec/ruby/core/regexp/timeout_spec.rb
index 6fce261814ef48..c64103c82cb129 100644
--- a/spec/ruby/core/regexp/timeout_spec.rb
+++ b/spec/ruby/core/regexp/timeout_spec.rb
@@ -1,35 +1,33 @@
 require_relative '../../spec_helper'
 
-ruby_version_is "3.2" do
-  describe "Regexp.timeout" do
-    after :each do
-      Regexp.timeout = nil
-    end
+describe "Regexp.timeout" do
+  after :each do
+    Regexp.timeout = nil
+  end
 
-    it "returns global timeout" do
-      Regexp.timeout = 3
-      Regexp.timeout.should == 3
-    end
+  it "returns global timeout" do
+    Regexp.timeout = 3
+    Regexp.timeout.should == 3
+  end
 
-    it "raises Regexp::TimeoutError after global timeout elapsed" do
-      Regexp.timeout = 0.001
-      Regexp.timeout.should == 0.001
+  it "raises Regexp::TimeoutError after global timeout elapsed" do
+    Regexp.timeout = 0.001
+    Regexp.timeout.should == 0.001
 
-      -> {
-        # A typical ReDoS case
-        /^(a*)*$/ =~ "a" * 1000000 + "x"
-      }.should raise_error(Regexp::TimeoutError, "regexp match timeout")
-    end
+    -> {
+      # A typical ReDoS case
+      /^(a*)*$/ =~ "a" * 1000000 + "x"
+    }.should raise_error(Regexp::TimeoutError, "regexp match timeout")
+  end
 
-    it "raises Regexp::TimeoutError after timeout keyword value elapsed" do
-      Regexp.timeout = 3 # This should be ignored
-      Regexp.timeout.should == 3
+  it "raises Regexp::TimeoutError after timeout keyword value elapsed" do
+    Regexp.timeout = 3 # This should be ignored
+    Regexp.timeout.should == 3
 
-      re = Regexp.new("^a*b?a*$", timeout: 0.001)
+    re = Regexp.new("^a*b?a*$", timeout: 0.001)
 
-      -> {
-        re =~ "a" * 1000000 + "x"
-      }.should raise_error(Regexp::TimeoutError, "regexp match timeout")
-    end
+    -> {
+      re =~ "a" * 1000000 + "x"
+    }.should raise_error(Regexp::TimeoutError, "regexp match timeout")
   end
 end
diff --git a/spec/ruby/core/regexp/union_spec.rb b/spec/ruby/core/regexp/union_spec.rb
index 80768364710168..ea5a5053f7258b 100644
--- a/spec/ruby/core/regexp/union_spec.rb
+++ b/spec/ruby/core/regexp/union_spec.rb
@@ -43,6 +43,27 @@
     Regexp.union("\u00A9".encode("ISO-8859-1"), "a".encode("UTF-8")).encoding.should == Encoding::ISO_8859_1
   end
 
+  it "returns ASCII-8BIT if the regexp encodings are ASCII-8BIT and at least one has non-ASCII characters" do
+    us_ascii_implicit, us_ascii_explicit, binary = /abc/, /[\x00-\x7f]/n, /[\x80-\xBF]/n
+    us_ascii_implicit.encoding.should == Encoding::US_ASCII
+    us_ascii_explicit.encoding.should == Encoding::US_ASCII
+    binary.encoding.should == Encoding::BINARY
+
+    Regexp.union(us_ascii_implicit, us_ascii_explicit, binary).encoding.should == Encoding::BINARY
+    Regexp.union(us_ascii_implicit, binary, us_ascii_explicit).encoding.should == Encoding::BINARY
+    Regexp.union(us_ascii_explicit, us_ascii_implicit, binary).encoding.should == Encoding::BINARY
+    Regexp.union(us_ascii_explicit, binary, us_ascii_implicit).encoding.should == Encoding::BINARY
+    Regexp.union(binary, us_ascii_implicit, us_ascii_explicit).encoding.should == Encoding::BINARY
+    Regexp.union(binary, us_ascii_explicit, us_ascii_implicit).encoding.should == Encoding::BINARY
+  end
+
+  it "return US-ASCII if all patterns are ASCII-only" do
+    Regexp.union(/abc/e, /def/e).encoding.should == Encoding::US_ASCII
+    Regexp.union(/abc/n, /def/n).encoding.should == Encoding::US_ASCII
+    Regexp.union(/abc/s, /def/s).encoding.should == Encoding::US_ASCII
+    Regexp.union(/abc/u, /def/u).encoding.should == Encoding::US_ASCII
+  end
+
   it "returns a Regexp with UTF-8 if one part is UTF-8" do
     Regexp.union(/probl[éeè]me/i, /help/i).encoding.should == Encoding::UTF_8
   end
@@ -54,83 +75,83 @@
   it "raises ArgumentError if the arguments include conflicting ASCII-incompatible Strings" do
     -> {
       Regexp.union("a".encode("UTF-16LE"), "b".encode("UTF-16BE"))
-    }.should raise_error(ArgumentError)
+    }.should raise_error(ArgumentError, 'incompatible encodings: UTF-16LE and UTF-16BE')
   end
 
   it "raises ArgumentError if the arguments include conflicting ASCII-incompatible Regexps" do
     -> {
       Regexp.union(Regexp.new("a".encode("UTF-16LE")),
                    Regexp.new("b".encode("UTF-16BE")))
-    }.should raise_error(ArgumentError)
+    }.should raise_error(ArgumentError, 'incompatible encodings: UTF-16LE and UTF-16BE')
   end
 
   it "raises ArgumentError if the arguments include conflicting fixed encoding Regexps" do
     -> {
       Regexp.union(Regexp.new("a".encode("UTF-8"),    Regexp::FIXEDENCODING),
                    Regexp.new("b".encode("US-ASCII"), Regexp::FIXEDENCODING))
-    }.should raise_error(ArgumentError)
+    }.should raise_error(ArgumentError, 'incompatible encodings: UTF-8 and US-ASCII')
   end
 
   it "raises ArgumentError if the arguments include a fixed encoding Regexp and a String containing non-ASCII-compatible characters in a different encoding" do
     -> {
       Regexp.union(Regexp.new("a".encode("UTF-8"), Regexp::FIXEDENCODING),
                    "\u00A9".encode("ISO-8859-1"))
-    }.should raise_error(ArgumentError)
+    }.should raise_error(ArgumentError, 'incompatible encodings: UTF-8 and ISO-8859-1')
   end
 
   it "raises ArgumentError if the arguments include a String containing non-ASCII-compatible characters and a fixed encoding Regexp in a different encoding" do
     -> {
       Regexp.union("\u00A9".encode("ISO-8859-1"),
                    Regexp.new("a".encode("UTF-8"), Regexp::FIXEDENCODING))
-    }.should raise_error(ArgumentError)
+    }.should raise_error(ArgumentError, 'incompatible encodings: ISO-8859-1 and UTF-8')
   end
 
   it "raises ArgumentError if the arguments include an ASCII-incompatible String and an ASCII-only String" do
     -> {
       Regexp.union("a".encode("UTF-16LE"), "b".encode("UTF-8"))
-    }.should raise_error(ArgumentError)
+    }.should raise_error(ArgumentError, /ASCII incompatible encoding: UTF-16LE|incompatible encodings: UTF-16LE and US-ASCII/)
   end
 
   it "raises ArgumentError if the arguments include an ASCII-incompatible Regexp and an ASCII-only String" do
     -> {
       Regexp.union(Regexp.new("a".encode("UTF-16LE")), "b".encode("UTF-8"))
-    }.should raise_error(ArgumentError)
+    }.should raise_error(ArgumentError, /ASCII incompatible encoding: UTF-16LE|incompatible encodings: UTF-16LE and US-ASCII/)
   end
 
   it "raises ArgumentError if the arguments include an ASCII-incompatible String and an ASCII-only Regexp" do
     -> {
       Regexp.union("a".encode("UTF-16LE"), Regexp.new("b".encode("UTF-8")))
-    }.should raise_error(ArgumentError)
+    }.should raise_error(ArgumentError, /ASCII incompatible encoding: UTF-16LE|incompatible encodings: UTF-16LE and US-ASCII/)
   end
 
   it "raises ArgumentError if the arguments include an ASCII-incompatible Regexp and an ASCII-only Regexp" do
     -> {
       Regexp.union(Regexp.new("a".encode("UTF-16LE")), Regexp.new("b".encode("UTF-8")))
-    }.should raise_error(ArgumentError)
+    }.should raise_error(ArgumentError, /ASCII incompatible encoding: UTF-16LE|incompatible encodings: UTF-16LE and US-ASCII/)
   end
 
   it "raises ArgumentError if the arguments include an ASCII-incompatible String and a String containing non-ASCII-compatible characters in a different encoding" do
     -> {
       Regexp.union("a".encode("UTF-16LE"), "\u00A9".encode("ISO-8859-1"))
-    }.should raise_error(ArgumentError)
+    }.should raise_error(ArgumentError, 'incompatible encodings: UTF-16LE and ISO-8859-1')
   end
 
   it "raises ArgumentError if the arguments include an ASCII-incompatible Regexp and a String containing non-ASCII-compatible characters in a different encoding" do
     -> {
       Regexp.union(Regexp.new("a".encode("UTF-16LE")), "\u00A9".encode("ISO-8859-1"))
-    }.should raise_error(ArgumentError)
+    }.should raise_error(ArgumentError, 'incompatible encodings: UTF-16LE and ISO-8859-1')
   end
 
   it "raises ArgumentError if the arguments include an ASCII-incompatible String and a Regexp containing non-ASCII-compatible characters in a different encoding" do
     -> {
       Regexp.union("a".encode("UTF-16LE"), Regexp.new("\u00A9".encode("ISO-8859-1")))
-    }.should raise_error(ArgumentError)
+    }.should raise_error(ArgumentError, 'incompatible encodings: UTF-16LE and ISO-8859-1')
   end
 
   it "raises ArgumentError if the arguments include an ASCII-incompatible Regexp and a Regexp containing non-ASCII-compatible characters in a different encoding" do
     -> {
       Regexp.union(Regexp.new("a".encode("UTF-16LE")), Regexp.new("\u00A9".encode("ISO-8859-1")))
-    }.should raise_error(ArgumentError)
+    }.should raise_error(ArgumentError, 'incompatible encodings: UTF-16LE and ISO-8859-1')
   end
 
   it "uses to_str to convert arguments (if not Regexp)" do
@@ -154,6 +175,8 @@
     not_supported_on :opal do
       Regexp.union([/dogs/, /cats/i]).should == /(?-mix:dogs)|(?i-mx:cats)/
     end
-    ->{Regexp.union(["skiing", "sledding"], [/dogs/, /cats/i])}.should raise_error(TypeError)
+    -> {
+      Regexp.union(["skiing", "sledding"], [/dogs/, /cats/i])
+    }.should raise_error(TypeError, 'no implicit conversion of Array into String')
   end
 end
diff --git a/spec/ruby/core/set/add_spec.rb b/spec/ruby/core/set/add_spec.rb
new file mode 100644
index 00000000000000..0fe1a0926ce8e7
--- /dev/null
+++ b/spec/ruby/core/set/add_spec.rb
@@ -0,0 +1,34 @@
+require_relative '../../spec_helper'
+require_relative 'shared/add'
+
+describe "Set#add" do
+  it_behaves_like :set_add, :add
+end
+
+describe "Set#add?" do
+  before :each do
+    @set = Set.new
+  end
+
+  it "adds the passed Object to self" do
+    @set.add?("cat")
+    @set.should include("cat")
+  end
+
+  it "returns self when the Object has not yet been added to self" do
+    @set.add?("cat").should equal(@set)
+  end
+
+  it "returns nil when the Object has already been added to self" do
+    @set.add?("cat")
+    @set.add?("cat").should be_nil
+  end
+
+  it "raises RuntimeError when called during iteration" do
+    set = Set[:a, :b, :c, :d, :e, :f]
+    set.each do |_m|
+      -> { set << 1 }.should raise_error(RuntimeError, /iteration/)
+    end
+    set.should == Set[:a, :b, :c, :d, :e, :f]
+  end
+end
diff --git a/spec/ruby/core/set/append_spec.rb b/spec/ruby/core/set/append_spec.rb
new file mode 100644
index 00000000000000..82d34d9130ce8c
--- /dev/null
+++ b/spec/ruby/core/set/append_spec.rb
@@ -0,0 +1,6 @@
+require_relative '../../spec_helper'
+require_relative 'shared/add'
+
+describe "Set#<<" do
+  it_behaves_like :set_add, :<<
+end
diff --git a/spec/ruby/library/set/case_compare_spec.rb b/spec/ruby/core/set/case_compare_spec.rb
similarity index 94%
rename from spec/ruby/library/set/case_compare_spec.rb
rename to spec/ruby/core/set/case_compare_spec.rb
index 70d392a27dc5f6..3781b1b96349df 100644
--- a/spec/ruby/library/set/case_compare_spec.rb
+++ b/spec/ruby/core/set/case_compare_spec.rb
@@ -1,6 +1,5 @@
 require_relative '../../spec_helper'
 require_relative 'shared/include'
-require 'set'
 
 describe "Set#===" do
   it_behaves_like :set_include, :===
diff --git a/spec/ruby/library/set/case_equality_spec.rb b/spec/ruby/core/set/case_equality_spec.rb
similarity index 90%
rename from spec/ruby/library/set/case_equality_spec.rb
rename to spec/ruby/core/set/case_equality_spec.rb
index 10cbfd380a4db6..19c1fb6b9c51b0 100644
--- a/spec/ruby/library/set/case_equality_spec.rb
+++ b/spec/ruby/core/set/case_equality_spec.rb
@@ -1,6 +1,5 @@
 require_relative '../../spec_helper'
 require_relative 'shared/include'
-require 'set'
 
 describe "Set#===" do
   it_behaves_like :set_include, :===
diff --git a/spec/ruby/library/set/classify_spec.rb b/spec/ruby/core/set/classify_spec.rb
similarity index 98%
rename from spec/ruby/library/set/classify_spec.rb
rename to spec/ruby/core/set/classify_spec.rb
index ec600c91d64d00..d86ea2722d8cfc 100644
--- a/spec/ruby/library/set/classify_spec.rb
+++ b/spec/ruby/core/set/classify_spec.rb
@@ -1,5 +1,4 @@
 require_relative '../../spec_helper'
-require 'set'
 
 describe "Set#classify" do
   before :each do
diff --git a/spec/ruby/core/set/clear_spec.rb b/spec/ruby/core/set/clear_spec.rb
new file mode 100644
index 00000000000000..ebeac211d3f7e0
--- /dev/null
+++ b/spec/ruby/core/set/clear_spec.rb
@@ -0,0 +1,16 @@
+require_relative '../../spec_helper'
+
+describe "Set#clear" do
+  before :each do
+    @set = Set["one", "two", "three", "four"]
+  end
+
+  it "removes all elements from self" do
+    @set.clear
+    @set.should be_empty
+  end
+
+  it "returns self" do
+    @set.clear.should equal(@set)
+  end
+end
diff --git a/spec/ruby/library/set/collect_spec.rb b/spec/ruby/core/set/collect_spec.rb
similarity index 91%
rename from spec/ruby/library/set/collect_spec.rb
rename to spec/ruby/core/set/collect_spec.rb
index f8813a93313159..d186f1a0d97dc2 100644
--- a/spec/ruby/library/set/collect_spec.rb
+++ b/spec/ruby/core/set/collect_spec.rb
@@ -1,5 +1,4 @@
 require_relative '../../spec_helper'
-require 'set'
 require_relative 'shared/collect'
 
 describe "Set#collect!" do
diff --git a/spec/ruby/library/set/compare_by_identity_spec.rb b/spec/ruby/core/set/compare_by_identity_spec.rb
similarity index 87%
rename from spec/ruby/library/set/compare_by_identity_spec.rb
rename to spec/ruby/core/set/compare_by_identity_spec.rb
index 9ed16021897f2d..0dda6d79f09177 100644
--- a/spec/ruby/library/set/compare_by_identity_spec.rb
+++ b/spec/ruby/core/set/compare_by_identity_spec.rb
@@ -1,11 +1,10 @@
 require_relative '../../spec_helper'
-require 'set'
 
 describe "Set#compare_by_identity" do
   it "compares its members by identity" do
     a = "a"
     b1 = "b"
-    b2 = "b"
+    b2 = b1.dup
 
     set = Set.new
     set.compare_by_identity
@@ -91,11 +90,22 @@ def o.hash; 123; end
     set.to_a.sort.should == [a1, a2].sort
   end
 
-  it "raises a FrozenError on frozen sets" do
-    set = Set.new.freeze
-    -> {
-      set.compare_by_identity
-    }.should raise_error(FrozenError, /frozen Hash/)
+  ruby_version_is "3.5" do
+    it "raises a FrozenError on frozen sets" do
+      set = Set.new.freeze
+      -> {
+        set.compare_by_identity
+      }.should raise_error(FrozenError, /can't modify frozen Set: (#<)?Set(\[|: {)[\]}]>?/)
+    end
+  end
+
+  ruby_version_is ""..."3.5" do
+    it "raises a FrozenError on frozen sets" do
+      set = Set.new.freeze
+      -> {
+        set.compare_by_identity
+      }.should raise_error(FrozenError, /frozen Hash/)
+    end
   end
 
   it "persists over #dups" do
diff --git a/spec/ruby/library/set/comparison_spec.rb b/spec/ruby/core/set/comparison_spec.rb
similarity index 98%
rename from spec/ruby/library/set/comparison_spec.rb
rename to spec/ruby/core/set/comparison_spec.rb
index ddcfbae0af36cd..62059b70b3b470 100644
--- a/spec/ruby/library/set/comparison_spec.rb
+++ b/spec/ruby/core/set/comparison_spec.rb
@@ -1,5 +1,4 @@
 require_relative '../../spec_helper'
-require 'set'
 
 describe "Set#<=>" do
   it "returns 0 if the sets are equal" do
diff --git a/spec/ruby/library/set/constructor_spec.rb b/spec/ruby/core/set/constructor_spec.rb
similarity index 95%
rename from spec/ruby/library/set/constructor_spec.rb
rename to spec/ruby/core/set/constructor_spec.rb
index bb848615145009..365081ad39b06a 100644
--- a/spec/ruby/library/set/constructor_spec.rb
+++ b/spec/ruby/core/set/constructor_spec.rb
@@ -1,5 +1,4 @@
 require_relative '../../spec_helper'
-require 'set'
 
 describe "Set[]" do
   it "returns a new Set populated with the passed Objects" do
diff --git a/spec/ruby/library/set/delete_if_spec.rb b/spec/ruby/core/set/delete_if_spec.rb
similarity index 98%
rename from spec/ruby/library/set/delete_if_spec.rb
rename to spec/ruby/core/set/delete_if_spec.rb
index 33caeeaab7e526..beda73a5e5f5b9 100644
--- a/spec/ruby/library/set/delete_if_spec.rb
+++ b/spec/ruby/core/set/delete_if_spec.rb
@@ -1,5 +1,4 @@
 require_relative '../../spec_helper'
-require 'set'
 
 describe "Set#delete_if" do
   before :each do
diff --git a/spec/ruby/core/set/delete_spec.rb b/spec/ruby/core/set/delete_spec.rb
new file mode 100644
index 00000000000000..a2543ecbee7b7c
--- /dev/null
+++ b/spec/ruby/core/set/delete_spec.rb
@@ -0,0 +1,36 @@
+require_relative '../../spec_helper'
+
+describe "Set#delete" do
+  before :each do
+    @set = Set["a", "b", "c"]
+  end
+
+  it "deletes the passed Object from self" do
+    @set.delete("a")
+    @set.should_not include("a")
+  end
+
+  it "returns self" do
+    @set.delete("a").should equal(@set)
+    @set.delete("x").should equal(@set)
+  end
+end
+
+describe "Set#delete?" do
+  before :each do
+    @set = Set["a", "b", "c"]
+  end
+
+  it "deletes the passed Object from self" do
+    @set.delete?("a")
+    @set.should_not include("a")
+  end
+
+  it "returns self when the passed Object is in self" do
+    @set.delete?("a").should equal(@set)
+  end
+
+  it "returns nil when the passed Object is not in self" do
+    @set.delete?("x").should be_nil
+  end
+end
diff --git a/spec/ruby/library/set/difference_spec.rb b/spec/ruby/core/set/difference_spec.rb
similarity index 91%
rename from spec/ruby/library/set/difference_spec.rb
rename to spec/ruby/core/set/difference_spec.rb
index 422f2ed3c7406f..149f946592b46f 100644
--- a/spec/ruby/library/set/difference_spec.rb
+++ b/spec/ruby/core/set/difference_spec.rb
@@ -1,5 +1,4 @@
 require_relative '../../spec_helper'
-require 'set'
 require_relative 'shared/difference'
 
 describe "Set#difference" do
diff --git a/spec/ruby/library/set/disjoint_spec.rb b/spec/ruby/core/set/disjoint_spec.rb
similarity index 98%
rename from spec/ruby/library/set/disjoint_spec.rb
rename to spec/ruby/core/set/disjoint_spec.rb
index ea3b1414553eba..89a3c4b1577ebe 100644
--- a/spec/ruby/library/set/disjoint_spec.rb
+++ b/spec/ruby/core/set/disjoint_spec.rb
@@ -1,6 +1,5 @@
 require_relative '../../spec_helper'
 require_relative 'fixtures/set_like'
-require 'set'
 
 describe "Set#disjoint?" do
   it "returns false when two Sets have at least one element in common" do
diff --git a/spec/ruby/library/set/divide_spec.rb b/spec/ruby/core/set/divide_spec.rb
similarity index 82%
rename from spec/ruby/library/set/divide_spec.rb
rename to spec/ruby/core/set/divide_spec.rb
index 998a1b292c0fd3..cbe0042f16e6ae 100644
--- a/spec/ruby/library/set/divide_spec.rb
+++ b/spec/ruby/core/set/divide_spec.rb
@@ -1,5 +1,4 @@
 require_relative '../../spec_helper'
-require 'set'
 
 describe "Set#divide" do
   it "divides self into a set of subsets based on the blocks return values" do
@@ -26,10 +25,20 @@
     set.map{ |x| x.to_a.sort }.sort.should == [[1], [3, 4], [6], [9, 10, 11]]
   end
 
-  it "yields each two Object to the block" do
-    ret = []
-    Set[1, 2].divide { |x, y| ret << [x, y] }
-    ret.sort.should == [[1, 1], [1, 2], [2, 1], [2, 2]]
+  ruby_version_is "3.5" do
+    it "yields each two Object to the block" do
+      ret = []
+      Set[1, 2].divide { |x, y| ret << [x, y] }
+      ret.sort.should == [[1, 2], [2, 1]]
+    end
+  end
+
+  ruby_version_is ""..."3.5" do
+    it "yields each two Object to the block" do
+      ret = []
+      Set[1, 2].divide { |x, y| ret << [x, y] }
+      ret.sort.should == [[1, 1], [1, 2], [2, 1], [2, 2]]
+    end
   end
 
   it "returns an enumerator when not passed a block" do
diff --git a/spec/ruby/core/set/each_spec.rb b/spec/ruby/core/set/each_spec.rb
new file mode 100644
index 00000000000000..3d9cdc2d468e1e
--- /dev/null
+++ b/spec/ruby/core/set/each_spec.rb
@@ -0,0 +1,26 @@
+require_relative '../../spec_helper'
+
+describe "Set#each" do
+  before :each do
+    @set = Set[1, 2, 3]
+  end
+
+  it "yields each Object in self" do
+    ret = []
+    @set.each { |x| ret << x }
+    ret.sort.should == [1, 2, 3]
+  end
+
+  it "returns self" do
+    @set.each { |x| x }.should equal(@set)
+  end
+
+  it "returns an Enumerator when not passed a block" do
+    enum = @set.each
+    enum.should be_an_instance_of(Enumerator)
+
+    ret = []
+    enum.each { |x| ret << x }
+    ret.sort.should == [1, 2, 3]
+  end
+end
diff --git a/spec/ruby/library/set/empty_spec.rb b/spec/ruby/core/set/empty_spec.rb
similarity index 93%
rename from spec/ruby/library/set/empty_spec.rb
rename to spec/ruby/core/set/empty_spec.rb
index 1789a664c7c4e3..4b55658e20fa9c 100644
--- a/spec/ruby/library/set/empty_spec.rb
+++ b/spec/ruby/core/set/empty_spec.rb
@@ -1,5 +1,4 @@
 require_relative '../../spec_helper'
-require 'set'
 
 describe "Set#empty?" do
   it "returns true if self is empty" do
diff --git a/spec/ruby/core/set/enumerable/to_set_spec.rb b/spec/ruby/core/set/enumerable/to_set_spec.rb
new file mode 100644
index 00000000000000..f139e1c025e58d
--- /dev/null
+++ b/spec/ruby/core/set/enumerable/to_set_spec.rb
@@ -0,0 +1,12 @@
+require_relative '../../../spec_helper'
+
+describe "Enumerable#to_set" do
+  it "returns a new Set created from self" do
+    [1, 2, 3].to_set.should == Set[1, 2, 3]
+    {a: 1, b: 2}.to_set.should == Set[[:b, 2], [:a, 1]]
+  end
+
+  it "passes down passed blocks" do
+    [1, 2, 3].to_set { |x| x * x }.should == Set[1, 4, 9]
+  end
+end
diff --git a/spec/ruby/core/set/eql_spec.rb b/spec/ruby/core/set/eql_spec.rb
new file mode 100644
index 00000000000000..4ad5c3aa5a1459
--- /dev/null
+++ b/spec/ruby/core/set/eql_spec.rb
@@ -0,0 +1,14 @@
+require_relative '../../spec_helper'
+
+describe "Set#eql?" do
+  it "returns true when the passed argument is a Set and contains the same elements" do
+    Set[].should eql(Set[])
+    Set[1, 2, 3].should eql(Set[1, 2, 3])
+    Set[1, 2, 3].should eql(Set[3, 2, 1])
+    Set["a", :b, ?c].should eql(Set[?c, :b, "a"])
+
+    Set[1, 2, 3].should_not eql(Set[1.0, 2, 3])
+    Set[1, 2, 3].should_not eql(Set[2, 3])
+    Set[1, 2, 3].should_not eql(Set[])
+  end
+end
diff --git a/spec/ruby/core/set/equal_value_spec.rb b/spec/ruby/core/set/equal_value_spec.rb
new file mode 100644
index 00000000000000..e3514928c816d3
--- /dev/null
+++ b/spec/ruby/core/set/equal_value_spec.rb
@@ -0,0 +1,34 @@
+require_relative '../../spec_helper'
+require_relative 'fixtures/set_like'
+
+describe "Set#==" do
+  it "returns true when the passed Object is a Set and self and the Object contain the same elements" do
+    Set[].should == Set[]
+    Set[1, 2, 3].should == Set[1, 2, 3]
+    Set["1", "2", "3"].should == Set["1", "2", "3"]
+
+    Set[1, 2, 3].should_not == Set[1.0, 2, 3]
+    Set[1, 2, 3].should_not == [1, 2, 3]
+  end
+
+  it "does not depend on the order of the elements" do
+    Set[1, 2, 3].should == Set[3, 2, 1]
+    Set[:a, "b", ?c].should == Set[?c, "b", :a]
+  end
+
+  it "does not depend on the order of nested Sets" do
+    Set[Set[1], Set[2], Set[3]].should == Set[Set[3], Set[2], Set[1]]
+
+    set1 = Set[Set["a", "b"], Set["c", "d"], Set["e", "f"]]
+    set2 = Set[Set["c", "d"], Set["a", "b"], Set["e", "f"]]
+    set1.should == set2
+  end
+
+  ruby_version_is ""..."3.5" do
+    context "when comparing to a Set-like object" do
+      it "returns true when a Set and a Set-like object contain the same elements" do
+        Set[1, 2, 3].should == SetSpecs::SetLike.new([1, 2, 3])
+      end
+    end
+  end
+end
diff --git a/spec/ruby/library/set/exclusion_spec.rb b/spec/ruby/core/set/exclusion_spec.rb
similarity index 97%
rename from spec/ruby/library/set/exclusion_spec.rb
rename to spec/ruby/core/set/exclusion_spec.rb
index 5bc4b5a2bf127d..bbc29afa95e4c0 100644
--- a/spec/ruby/library/set/exclusion_spec.rb
+++ b/spec/ruby/core/set/exclusion_spec.rb
@@ -1,5 +1,4 @@
 require_relative '../../spec_helper'
-require 'set'
 
 describe "Set#^" do
   before :each do
diff --git a/spec/ruby/library/set/filter_spec.rb b/spec/ruby/core/set/filter_spec.rb
similarity index 100%
rename from spec/ruby/library/set/filter_spec.rb
rename to spec/ruby/core/set/filter_spec.rb
diff --git a/spec/ruby/library/set/fixtures/set_like.rb b/spec/ruby/core/set/fixtures/set_like.rb
similarity index 97%
rename from spec/ruby/library/set/fixtures/set_like.rb
rename to spec/ruby/core/set/fixtures/set_like.rb
index 46f61a451eefdd..86dec2ed52e743 100644
--- a/spec/ruby/library/set/fixtures/set_like.rb
+++ b/spec/ruby/core/set/fixtures/set_like.rb
@@ -1,4 +1,3 @@
-require 'set'
 
 module SetSpecs
   # This class is used to test the interaction of "Set-like" objects with real Sets
diff --git a/spec/ruby/core/set/flatten_merge_spec.rb b/spec/ruby/core/set/flatten_merge_spec.rb
new file mode 100644
index 00000000000000..d7c2b306579443
--- /dev/null
+++ b/spec/ruby/core/set/flatten_merge_spec.rb
@@ -0,0 +1,24 @@
+require_relative '../../spec_helper'
+
+describe "Set#flatten_merge" do
+  ruby_version_is ""..."3.5" do
+    it "is protected" do
+      Set.should have_protected_instance_method("flatten_merge")
+    end
+
+    it "flattens the passed Set and merges it into self" do
+      set1 = Set[1, 2]
+      set2 = Set[3, 4, Set[5, 6]]
+
+      set1.send(:flatten_merge, set2).should == Set[1, 2, 3, 4, 5, 6]
+    end
+
+    it "raises an ArgumentError when trying to flatten a recursive Set" do
+      set1 = Set[1, 2, 3]
+      set2 = Set[5, 6, 7]
+      set2 << set2
+
+      -> { set1.send(:flatten_merge, set2) }.should raise_error(ArgumentError)
+    end
+  end
+end
diff --git a/spec/ruby/core/set/flatten_spec.rb b/spec/ruby/core/set/flatten_spec.rb
new file mode 100644
index 00000000000000..870eccc2f10c99
--- /dev/null
+++ b/spec/ruby/core/set/flatten_spec.rb
@@ -0,0 +1,59 @@
+require_relative '../../spec_helper'
+require_relative 'fixtures/set_like'
+set_version = defined?(Set::VERSION) ? Set::VERSION : '1.0.0'
+
+describe "Set#flatten" do
+  it "returns a copy of self with each included Set flattened" do
+    set = Set[1, 2, Set[3, 4, Set[5, 6, Set[7, 8]]], 9, 10]
+    flattened_set = set.flatten
+
+    flattened_set.should_not equal(set)
+    flattened_set.should == Set[1, 2, 3, 4, 5, 6, 7, 8, 9, 10]
+  end
+
+  it "raises an ArgumentError when self is recursive" do
+    (set = Set[]) << set
+    -> { set.flatten }.should raise_error(ArgumentError)
+  end
+
+  ruby_version_is ""..."3.5" do
+    context "when Set contains a Set-like object" do
+      it "returns a copy of self with each included Set-like object flattened" do
+        Set[SetSpecs::SetLike.new([1])].flatten.should == Set[1]
+      end
+    end
+  end
+end
+
+describe "Set#flatten!" do
+  it "flattens self" do
+    set = Set[1, 2, Set[3, 4, Set[5, 6, Set[7, 8]]], 9, 10]
+    set.flatten!
+    set.should == Set[1, 2, 3, 4, 5, 6, 7, 8, 9, 10]
+  end
+
+  it "returns self when self was modified" do
+    set = Set[1, 2, Set[3, 4]]
+    set.flatten!.should equal(set)
+  end
+
+  it "returns nil when self was not modified" do
+    set = Set[1, 2, 3, 4]
+    set.flatten!.should be_nil
+  end
+
+  it "raises an ArgumentError when self is recursive" do
+    (set = Set[]) << set
+    -> { set.flatten! }.should raise_error(ArgumentError)
+  end
+
+  version_is(set_version, ""..."1.1.0") do #ruby_version_is ""..."3.3" do
+    ruby_version_is ""..."3.5" do
+      context "when Set contains a Set-like object" do
+        it "flattens self, including Set-like objects" do
+          Set[SetSpecs::SetLike.new([1])].flatten!.should == Set[1]
+        end
+      end
+    end
+  end
+end
diff --git a/spec/ruby/core/set/hash_spec.rb b/spec/ruby/core/set/hash_spec.rb
new file mode 100644
index 00000000000000..4b4696e34ccbf3
--- /dev/null
+++ b/spec/ruby/core/set/hash_spec.rb
@@ -0,0 +1,19 @@
+require_relative '../../spec_helper'
+
+describe "Set#hash" do
+  it "is static" do
+    Set[].hash.should == Set[].hash
+    Set[1, 2, 3].hash.should == Set[1, 2, 3].hash
+    Set[:a, "b", ?c].hash.should == Set[?c, "b", :a].hash
+
+    Set[].hash.should_not == Set[1, 2, 3].hash
+    Set[1, 2, 3].hash.should_not == Set[:a, "b", ?c].hash
+  end
+
+  ruby_version_is ""..."3.5" do
+    # see https://github.com/jruby/jruby/issues/8393
+    it "is equal to nil.hash for an uninitialized Set" do
+      Set.allocate.hash.should == nil.hash
+    end
+  end
+end
diff --git a/spec/ruby/library/set/include_spec.rb b/spec/ruby/core/set/include_spec.rb
similarity index 91%
rename from spec/ruby/library/set/include_spec.rb
rename to spec/ruby/core/set/include_spec.rb
index 68532d9a04acee..dd33bbc3bd5332 100644
--- a/spec/ruby/library/set/include_spec.rb
+++ b/spec/ruby/core/set/include_spec.rb
@@ -1,6 +1,5 @@
 require_relative '../../spec_helper'
 require_relative 'shared/include'
-require 'set'
 
 describe "Set#include?" do
   it_behaves_like :set_include, :include?
diff --git a/spec/ruby/library/set/initialize_clone_spec.rb b/spec/ruby/core/set/initialize_clone_spec.rb
similarity index 96%
rename from spec/ruby/library/set/initialize_clone_spec.rb
rename to spec/ruby/core/set/initialize_clone_spec.rb
index bda42cd6e8bf5e..13abb7ee4e8d27 100644
--- a/spec/ruby/library/set/initialize_clone_spec.rb
+++ b/spec/ruby/core/set/initialize_clone_spec.rb
@@ -1,5 +1,4 @@
 require_relative '../../spec_helper'
-require 'set'
 
 describe "Set#initialize_clone" do
   # See https://bugs.ruby-lang.org/issues/14266
diff --git a/spec/ruby/core/set/initialize_spec.rb b/spec/ruby/core/set/initialize_spec.rb
new file mode 100644
index 00000000000000..ad9e1bd8c9d4d6
--- /dev/null
+++ b/spec/ruby/core/set/initialize_spec.rb
@@ -0,0 +1,72 @@
+require_relative '../../spec_helper'
+
+describe "Set#initialize" do
+  it "is private" do
+    Set.should have_private_instance_method(:initialize)
+  end
+
+  it "adds all elements of the passed Enumerable to self" do
+    s = Set.new([1, 2, 3])
+    s.size.should eql(3)
+    s.should include(1)
+    s.should include(2)
+    s.should include(3)
+  end
+
+  it "uses #each_entry on the provided Enumerable" do
+    enumerable = MockObject.new('mock-enumerable')
+    enumerable.should_receive(:each_entry).and_yield(1).and_yield(2).and_yield(3)
+    s = Set.new(enumerable)
+    s.size.should eql(3)
+    s.should include(1)
+    s.should include(2)
+    s.should include(3)
+  end
+
+  it "uses #each on the provided Enumerable if it does not respond to #each_entry" do
+    enumerable = MockObject.new('mock-enumerable')
+    enumerable.should_receive(:each).and_yield(1).and_yield(2).and_yield(3)
+    s = Set.new(enumerable)
+    s.size.should eql(3)
+    s.should include(1)
+    s.should include(2)
+    s.should include(3)
+  end
+
+  it "raises if the provided Enumerable does not respond to #each_entry or #each" do
+    enumerable = MockObject.new('mock-enumerable')
+    -> { Set.new(enumerable) }.should raise_error(ArgumentError, "value must be enumerable")
+  end
+
+  it "should initialize with empty array and set" do
+    s = Set.new([])
+    s.size.should eql(0)
+
+    s = Set.new({})
+    s.size.should eql(0)
+  end
+
+  it "preprocesses all elements by a passed block before adding to self" do
+    s = Set.new([1, 2, 3]) { |x| x * x }
+    s.size.should eql(3)
+    s.should include(1)
+    s.should include(4)
+    s.should include(9)
+  end
+
+  it "should initialize with empty array and block" do
+    s = Set.new([]) { |x| x * x }
+    s.size.should eql(0)
+  end
+
+  it "should initialize with empty set and block" do
+    s = Set.new(Set.new) { |x| x * x }
+    s.size.should eql(0)
+  end
+
+  it "should initialize with just block" do
+    s = Set.new { |x| x * x }
+    s.size.should eql(0)
+    s.should eql(Set.new)
+  end
+end
diff --git a/spec/ruby/core/set/inspect_spec.rb b/spec/ruby/core/set/inspect_spec.rb
new file mode 100644
index 00000000000000..0dcce83eb63dfe
--- /dev/null
+++ b/spec/ruby/core/set/inspect_spec.rb
@@ -0,0 +1,6 @@
+require_relative '../../spec_helper'
+require_relative 'shared/inspect'
+
+describe "Set#inspect" do
+  it_behaves_like :set_inspect, :inspect
+end
diff --git a/spec/ruby/library/set/intersect_spec.rb b/spec/ruby/core/set/intersect_spec.rb
similarity index 98%
rename from spec/ruby/library/set/intersect_spec.rb
rename to spec/ruby/core/set/intersect_spec.rb
index e60f06db9465bd..0736dea5fd0580 100644
--- a/spec/ruby/library/set/intersect_spec.rb
+++ b/spec/ruby/core/set/intersect_spec.rb
@@ -1,6 +1,5 @@
 require_relative '../../spec_helper'
 require_relative 'fixtures/set_like'
-require 'set'
 
 describe "Set#intersect?" do
   it "returns true when two Sets have at least one element in common" do
diff --git a/spec/ruby/library/set/intersection_spec.rb b/spec/ruby/core/set/intersection_spec.rb
similarity index 94%
rename from spec/ruby/library/set/intersection_spec.rb
rename to spec/ruby/core/set/intersection_spec.rb
index 792c2d8f07934a..136b886775864b 100644
--- a/spec/ruby/library/set/intersection_spec.rb
+++ b/spec/ruby/core/set/intersection_spec.rb
@@ -1,6 +1,5 @@
 require_relative '../../spec_helper'
 require_relative 'shared/intersection'
-require 'set'
 
 describe "Set#intersection" do
   it_behaves_like :set_intersection, :intersection
diff --git a/spec/ruby/core/set/join_spec.rb b/spec/ruby/core/set/join_spec.rb
new file mode 100644
index 00000000000000..cdb593597d8641
--- /dev/null
+++ b/spec/ruby/core/set/join_spec.rb
@@ -0,0 +1,30 @@
+require_relative '../../spec_helper'
+
+describe "Set#join" do
+  it "returns an empty string if the Set is empty" do
+    Set[].join.should == ''
+  end
+
+  it "returns a new string formed by joining elements after conversion" do
+    set = Set[:a, :b, :c]
+    set.join.should == "abc"
+  end
+
+  it "does not separate elements when the passed separator is nil" do
+    set = Set[:a, :b, :c]
+    set.join(nil).should == "abc"
+  end
+
+  it "returns a string formed by concatenating each element separated by the separator" do
+    set = Set[:a, :b, :c]
+    set.join(' | ').should == "a | b | c"
+  end
+
+  ruby_version_is ""..."3.5" do
+    it "calls #to_a to convert the Set in to an Array" do
+      set = Set[:a, :b, :c]
+      set.should_receive(:to_a).and_return([:a, :b, :c])
+      set.join.should == "abc"
+    end
+  end
+end
diff --git a/spec/ruby/library/set/keep_if_spec.rb b/spec/ruby/core/set/keep_if_spec.rb
similarity index 98%
rename from spec/ruby/library/set/keep_if_spec.rb
rename to spec/ruby/core/set/keep_if_spec.rb
index 7edc80769f0c7a..d6abdd6adc6003 100644
--- a/spec/ruby/library/set/keep_if_spec.rb
+++ b/spec/ruby/core/set/keep_if_spec.rb
@@ -1,5 +1,4 @@
 require_relative '../../spec_helper'
-require 'set'
 
 describe "Set#keep_if" do
   before :each do
diff --git a/spec/ruby/core/set/length_spec.rb b/spec/ruby/core/set/length_spec.rb
new file mode 100644
index 00000000000000..6bb697b4caab9a
--- /dev/null
+++ b/spec/ruby/core/set/length_spec.rb
@@ -0,0 +1,6 @@
+require_relative '../../spec_helper'
+require_relative 'shared/length'
+
+describe "Set#length" do
+  it_behaves_like :set_length, :length
+end
diff --git a/spec/ruby/library/set/map_spec.rb b/spec/ruby/core/set/map_spec.rb
similarity index 91%
rename from spec/ruby/library/set/map_spec.rb
rename to spec/ruby/core/set/map_spec.rb
index e60e98b179f3c9..996191b0a8bc26 100644
--- a/spec/ruby/library/set/map_spec.rb
+++ b/spec/ruby/core/set/map_spec.rb
@@ -1,5 +1,4 @@
 require_relative '../../spec_helper'
-require 'set'
 require_relative 'shared/collect'
 
 describe "Set#map!" do
diff --git a/spec/ruby/library/set/member_spec.rb b/spec/ruby/core/set/member_spec.rb
similarity index 91%
rename from spec/ruby/library/set/member_spec.rb
rename to spec/ruby/core/set/member_spec.rb
index 5b56a38ab9dc45..5c82e8f826b553 100644
--- a/spec/ruby/library/set/member_spec.rb
+++ b/spec/ruby/core/set/member_spec.rb
@@ -1,6 +1,5 @@
 require_relative '../../spec_helper'
 require_relative 'shared/include'
-require 'set'
 
 describe "Set#member?" do
   it_behaves_like :set_include, :member?
diff --git a/spec/ruby/core/set/merge_spec.rb b/spec/ruby/core/set/merge_spec.rb
new file mode 100644
index 00000000000000..0c6ed276700e7d
--- /dev/null
+++ b/spec/ruby/core/set/merge_spec.rb
@@ -0,0 +1,37 @@
+require_relative '../../spec_helper'
+
+describe "Set#merge" do
+  it "adds the elements of the passed Enumerable to self" do
+    Set[:a, :b].merge(Set[:b, :c, :d]).should == Set[:a, :b, :c, :d]
+    Set[1, 2].merge([3, 4]).should == Set[1, 2, 3, 4]
+  end
+
+  it "returns self" do
+    set = Set[1, 2]
+    set.merge([3, 4]).should equal(set)
+  end
+
+  it "raises an ArgumentError when passed a non-Enumerable" do
+    -> { Set[1, 2].merge(1) }.should raise_error(ArgumentError)
+    -> { Set[1, 2].merge(Object.new) }.should raise_error(ArgumentError)
+  end
+
+  it "raises RuntimeError when called during iteration" do
+    set = Set[:a, :b]
+    set.each do |_m|
+      -> { set.merge([1, 2]) }.should raise_error(RuntimeError, /iteration/)
+    end
+  end
+
+  ruby_version_is ""..."3.3" do
+    it "accepts only a single argument" do
+      -> { Set[].merge([], []) }.should raise_error(ArgumentError, "wrong number of arguments (given 2, expected 1)")
+    end
+  end
+
+  ruby_version_is "3.3" do
+    it "accepts multiple arguments" do
+      Set[:a, :b].merge(Set[:b, :c], [:d]).should == Set[:a, :b, :c, :d]
+    end
+  end
+end
diff --git a/spec/ruby/library/set/minus_spec.rb b/spec/ruby/core/set/minus_spec.rb
similarity index 90%
rename from spec/ruby/library/set/minus_spec.rb
rename to spec/ruby/core/set/minus_spec.rb
index 3fe0b6a2cc020d..72f98f985ee3cd 100644
--- a/spec/ruby/library/set/minus_spec.rb
+++ b/spec/ruby/core/set/minus_spec.rb
@@ -1,5 +1,4 @@
 require_relative '../../spec_helper'
-require 'set'
 require_relative 'shared/difference'
 
 describe "Set#-" do
diff --git a/spec/ruby/library/set/plus_spec.rb b/spec/ruby/core/set/plus_spec.rb
similarity index 90%
rename from spec/ruby/library/set/plus_spec.rb
rename to spec/ruby/core/set/plus_spec.rb
index 3e70d3269d4b71..7e44ff0b7e19b6 100644
--- a/spec/ruby/library/set/plus_spec.rb
+++ b/spec/ruby/core/set/plus_spec.rb
@@ -1,6 +1,5 @@
 require_relative '../../spec_helper'
 require_relative 'shared/union'
-require 'set'
 
 describe "Set#+" do
   it_behaves_like :set_union, :+
diff --git a/spec/ruby/library/set/pretty_print_cycle_spec.rb b/spec/ruby/core/set/pretty_print_cycle_spec.rb
similarity index 95%
rename from spec/ruby/library/set/pretty_print_cycle_spec.rb
rename to spec/ruby/core/set/pretty_print_cycle_spec.rb
index 4f440353e50b64..c3b383fe808333 100644
--- a/spec/ruby/library/set/pretty_print_cycle_spec.rb
+++ b/spec/ruby/core/set/pretty_print_cycle_spec.rb
@@ -1,5 +1,4 @@
 require_relative '../../spec_helper'
-require 'set'
 
 describe "Set#pretty_print_cycle" do
   it "passes the 'pretty print' representation of a self-referencing Set to the pretty print writer" do
diff --git a/spec/ruby/core/set/proper_subset_spec.rb b/spec/ruby/core/set/proper_subset_spec.rb
new file mode 100644
index 00000000000000..a84c4197c23dd6
--- /dev/null
+++ b/spec/ruby/core/set/proper_subset_spec.rb
@@ -0,0 +1,45 @@
+require_relative '../../spec_helper'
+require_relative 'fixtures/set_like'
+set_version = defined?(Set::VERSION) ? Set::VERSION : '1.0.0'
+
+describe "Set#proper_subset?" do
+  before :each do
+    @set = Set[1, 2, 3, 4]
+  end
+
+  it "returns true if passed a Set that self is a proper subset of" do
+    Set[].proper_subset?(@set).should be_true
+    Set[].proper_subset?(Set[1, 2, 3]).should be_true
+    Set[].proper_subset?(Set["a", :b, ?c]).should be_true
+
+    Set[1, 2, 3].proper_subset?(@set).should be_true
+    Set[1, 3].proper_subset?(@set).should be_true
+    Set[1, 2].proper_subset?(@set).should be_true
+    Set[1].proper_subset?(@set).should be_true
+
+    Set[5].proper_subset?(@set).should be_false
+    Set[1, 5].proper_subset?(@set).should be_false
+    Set[nil].proper_subset?(@set).should be_false
+    Set["test"].proper_subset?(@set).should be_false
+
+    @set.proper_subset?(@set).should be_false
+    Set[].proper_subset?(Set[]).should be_false
+  end
+
+  it "raises an ArgumentError when passed a non-Set" do
+    -> { Set[].proper_subset?([]) }.should raise_error(ArgumentError)
+    -> { Set[].proper_subset?(1) }.should raise_error(ArgumentError)
+    -> { Set[].proper_subset?("test") }.should raise_error(ArgumentError)
+    -> { Set[].proper_subset?(Object.new) }.should raise_error(ArgumentError)
+  end
+
+  version_is(set_version, ""..."1.1.0") do #ruby_version_is ""..."3.3" do
+    ruby_version_is ""..."3.5" do
+      context "when comparing to a Set-like object" do
+        it "returns true if passed a Set-like object that self is a proper subset of" do
+          Set[1, 2, 3].proper_subset?(SetSpecs::SetLike.new([1, 2, 3, 4])).should be_true
+        end
+      end
+    end
+  end
+end
diff --git a/spec/ruby/library/set/proper_superset_spec.rb b/spec/ruby/core/set/proper_superset_spec.rb
similarity index 82%
rename from spec/ruby/library/set/proper_superset_spec.rb
rename to spec/ruby/core/set/proper_superset_spec.rb
index a386c8c09749d7..653411f6b23452 100644
--- a/spec/ruby/library/set/proper_superset_spec.rb
+++ b/spec/ruby/core/set/proper_superset_spec.rb
@@ -1,6 +1,5 @@
 require_relative '../../spec_helper'
 require_relative 'fixtures/set_like'
-require 'set'
 
 describe "Set#proper_superset?" do
   before :each do
@@ -33,9 +32,11 @@
     -> { Set[].proper_superset?(Object.new) }.should raise_error(ArgumentError)
   end
 
-  context "when comparing to a Set-like object" do
-    it "returns true if passed a Set-like object that self is a proper superset of" do
-      Set[1, 2, 3, 4].proper_superset?(SetSpecs::SetLike.new([1, 2, 3])).should be_true
+  ruby_version_is ""..."3.5" do
+    context "when comparing to a Set-like object" do
+      it "returns true if passed a Set-like object that self is a proper superset of" do
+        Set[1, 2, 3, 4].proper_superset?(SetSpecs::SetLike.new([1, 2, 3])).should be_true
+      end
     end
   end
 end
diff --git a/spec/ruby/library/set/reject_spec.rb b/spec/ruby/core/set/reject_spec.rb
similarity index 98%
rename from spec/ruby/library/set/reject_spec.rb
rename to spec/ruby/core/set/reject_spec.rb
index 9131f960ad43d5..91d02934158288 100644
--- a/spec/ruby/library/set/reject_spec.rb
+++ b/spec/ruby/core/set/reject_spec.rb
@@ -1,5 +1,4 @@
 require_relative '../../spec_helper'
-require 'set'
 
 describe "Set#reject!" do
   before :each do
diff --git a/spec/ruby/core/set/replace_spec.rb b/spec/ruby/core/set/replace_spec.rb
new file mode 100644
index 00000000000000..c66a2d0ec3686a
--- /dev/null
+++ b/spec/ruby/core/set/replace_spec.rb
@@ -0,0 +1,24 @@
+require_relative '../../spec_helper'
+
+describe "Set#replace" do
+  before :each do
+    @set = Set[:a, :b, :c]
+  end
+
+  it "replaces the contents with other and returns self" do
+    @set.replace(Set[1, 2, 3]).should == @set
+    @set.should == Set[1, 2, 3]
+  end
+
+  it "raises RuntimeError when called during iteration" do
+    set = Set[:a, :b, :c, :d, :e, :f]
+    set.each do |_m|
+      -> { set.replace(Set[1, 2, 3]) }.should raise_error(RuntimeError, /iteration/)
+    end
+    set.should == Set[:a, :b, :c, :d, :e, :f]
+  end
+
+  it "accepts any enumerable as other" do
+    @set.replace([1, 2, 3]).should == Set[1, 2, 3]
+  end
+end
diff --git a/spec/ruby/library/set/select_spec.rb b/spec/ruby/core/set/select_spec.rb
similarity index 100%
rename from spec/ruby/library/set/select_spec.rb
rename to spec/ruby/core/set/select_spec.rb
diff --git a/spec/ruby/core/set/set_spec.rb b/spec/ruby/core/set/set_spec.rb
new file mode 100644
index 00000000000000..fd1d2072e31608
--- /dev/null
+++ b/spec/ruby/core/set/set_spec.rb
@@ -0,0 +1,10 @@
+require_relative '../../spec_helper'
+
+describe 'Set' do
+  it 'is available without explicit requiring' do
+    output = ruby_exe(<<~RUBY, options: '--disable-gems', args: '2>&1')
+      puts Set.new([1, 2, 3]).to_a.inspect
+    RUBY
+    output.chomp.should == "[1, 2, 3]"
+  end
+end
diff --git a/spec/ruby/library/set/shared/add.rb b/spec/ruby/core/set/shared/add.rb
similarity index 100%
rename from spec/ruby/library/set/shared/add.rb
rename to spec/ruby/core/set/shared/add.rb
diff --git a/spec/ruby/library/set/shared/collect.rb b/spec/ruby/core/set/shared/collect.rb
similarity index 100%
rename from spec/ruby/library/set/shared/collect.rb
rename to spec/ruby/core/set/shared/collect.rb
diff --git a/spec/ruby/library/set/shared/difference.rb b/spec/ruby/core/set/shared/difference.rb
similarity index 100%
rename from spec/ruby/library/set/shared/difference.rb
rename to spec/ruby/core/set/shared/difference.rb
diff --git a/spec/ruby/library/set/shared/include.rb b/spec/ruby/core/set/shared/include.rb
similarity index 100%
rename from spec/ruby/library/set/shared/include.rb
rename to spec/ruby/core/set/shared/include.rb
diff --git a/spec/ruby/core/set/shared/inspect.rb b/spec/ruby/core/set/shared/inspect.rb
new file mode 100644
index 00000000000000..fbc7486acd61d4
--- /dev/null
+++ b/spec/ruby/core/set/shared/inspect.rb
@@ -0,0 +1,45 @@
+describe :set_inspect, shared: true do
+  it "returns a String representation of self" do
+    Set[].send(@method).should be_kind_of(String)
+    Set[nil, false, true].send(@method).should be_kind_of(String)
+    Set[1, 2, 3].send(@method).should be_kind_of(String)
+    Set["1", "2", "3"].send(@method).should be_kind_of(String)
+    Set[:a, "b", Set[?c]].send(@method).should be_kind_of(String)
+  end
+
+  ruby_version_is "3.5" do
+    it "does include the elements of the set" do
+      Set["1"].send(@method).should == 'Set["1"]'
+    end
+  end
+
+  ruby_version_is ""..."3.5" do
+    it "does include the elements of the set" do
+      Set["1"].send(@method).should == '#<Set: {"1"}>'
+    end
+  end
+
+  it "puts spaces between the elements" do
+    Set["1", "2"].send(@method).should include('", "')
+  end
+
+  ruby_version_is "3.5" do
+    it "correctly handles cyclic-references" do
+      set1 = Set[]
+      set2 = Set[set1]
+      set1 << set2
+      set1.send(@method).should be_kind_of(String)
+      set1.send(@method).should include("Set[...]")
+    end
+  end
+
+  ruby_version_is ""..."3.5" do
+    it "correctly handles cyclic-references" do
+      set1 = Set[]
+      set2 = Set[set1]
+      set1 << set2
+      set1.send(@method).should be_kind_of(String)
+      set1.send(@method).should include("#<Set: {...}>")
+    end
+  end
+end
diff --git a/spec/ruby/library/set/shared/intersection.rb b/spec/ruby/core/set/shared/intersection.rb
similarity index 100%
rename from spec/ruby/library/set/shared/intersection.rb
rename to spec/ruby/core/set/shared/intersection.rb
diff --git a/spec/ruby/library/set/shared/length.rb b/spec/ruby/core/set/shared/length.rb
similarity index 100%
rename from spec/ruby/library/set/shared/length.rb
rename to spec/ruby/core/set/shared/length.rb
diff --git a/spec/ruby/library/set/shared/select.rb b/spec/ruby/core/set/shared/select.rb
similarity index 98%
rename from spec/ruby/library/set/shared/select.rb
rename to spec/ruby/core/set/shared/select.rb
index 2108d398b4e6fe..467b236ed39e94 100644
--- a/spec/ruby/library/set/shared/select.rb
+++ b/spec/ruby/core/set/shared/select.rb
@@ -1,5 +1,4 @@
 require_relative '../../../spec_helper'
-require 'set'
 
 describe :set_select_bang, shared: true do
   before :each do
diff --git a/spec/ruby/library/set/shared/union.rb b/spec/ruby/core/set/shared/union.rb
similarity index 100%
rename from spec/ruby/library/set/shared/union.rb
rename to spec/ruby/core/set/shared/union.rb
diff --git a/spec/ruby/core/set/size_spec.rb b/spec/ruby/core/set/size_spec.rb
new file mode 100644
index 00000000000000..4ae22c5f0a0991
--- /dev/null
+++ b/spec/ruby/core/set/size_spec.rb
@@ -0,0 +1,6 @@
+require_relative '../../spec_helper'
+require_relative 'shared/length'
+
+describe "Set#size" do
+  it_behaves_like :set_length, :size
+end
diff --git a/spec/ruby/core/set/sortedset/sortedset_spec.rb b/spec/ruby/core/set/sortedset/sortedset_spec.rb
new file mode 100644
index 00000000000000..41f010e011c8de
--- /dev/null
+++ b/spec/ruby/core/set/sortedset/sortedset_spec.rb
@@ -0,0 +1,13 @@
+require_relative '../../../spec_helper'
+
+describe "SortedSet" do
+  ruby_version_is ""..."3.5" do
+    it "raises error including message that it has been extracted from the set stdlib" do
+      -> {
+        SortedSet
+      }.should raise_error(RuntimeError) { |e|
+        e.message.should.include?("The `SortedSet` class has been extracted from the `set` library")
+      }
+    end
+  end
+end
diff --git a/spec/ruby/core/set/subset_spec.rb b/spec/ruby/core/set/subset_spec.rb
new file mode 100644
index 00000000000000..cde61d7cd7745f
--- /dev/null
+++ b/spec/ruby/core/set/subset_spec.rb
@@ -0,0 +1,45 @@
+require_relative '../../spec_helper'
+require_relative 'fixtures/set_like'
+set_version = defined?(Set::VERSION) ? Set::VERSION : '1.0.0'
+
+describe "Set#subset?" do
+  before :each do
+    @set = Set[1, 2, 3, 4]
+  end
+
+  it "returns true if passed a Set that is equal to self or self is a subset of" do
+    @set.subset?(@set).should be_true
+    Set[].subset?(Set[]).should be_true
+
+    Set[].subset?(@set).should be_true
+    Set[].subset?(Set[1, 2, 3]).should be_true
+    Set[].subset?(Set["a", :b, ?c]).should be_true
+
+    Set[1, 2, 3].subset?(@set).should be_true
+    Set[1, 3].subset?(@set).should be_true
+    Set[1, 2].subset?(@set).should be_true
+    Set[1].subset?(@set).should be_true
+
+    Set[5].subset?(@set).should be_false
+    Set[1, 5].subset?(@set).should be_false
+    Set[nil].subset?(@set).should be_false
+    Set["test"].subset?(@set).should be_false
+  end
+
+  it "raises an ArgumentError when passed a non-Set" do
+    -> { Set[].subset?([]) }.should raise_error(ArgumentError)
+    -> { Set[].subset?(1) }.should raise_error(ArgumentError)
+    -> { Set[].subset?("test") }.should raise_error(ArgumentError)
+    -> { Set[].subset?(Object.new) }.should raise_error(ArgumentError)
+  end
+
+  version_is(set_version, ""..."1.1.0") do #ruby_version_is ""..."3.3" do
+    ruby_version_is ""..."3.5" do
+      context "when comparing to a Set-like object" do
+        it "returns true if passed a Set-like object that self is a subset of" do
+          Set[1, 2, 3].subset?(SetSpecs::SetLike.new([1, 2, 3, 4])).should be_true
+        end
+      end
+    end
+  end
+end
diff --git a/spec/ruby/library/set/subtract_spec.rb b/spec/ruby/core/set/subtract_spec.rb
similarity index 96%
rename from spec/ruby/library/set/subtract_spec.rb
rename to spec/ruby/core/set/subtract_spec.rb
index 56713de8b3f303..ae4bc73d414ce7 100644
--- a/spec/ruby/library/set/subtract_spec.rb
+++ b/spec/ruby/core/set/subtract_spec.rb
@@ -1,5 +1,4 @@
 require_relative '../../spec_helper'
-require 'set'
 
 describe "Set#subtract" do
   before :each do
diff --git a/spec/ruby/library/set/superset_spec.rb b/spec/ruby/core/set/superset_spec.rb
similarity index 82%
rename from spec/ruby/library/set/superset_spec.rb
rename to spec/ruby/core/set/superset_spec.rb
index bd9d2f3eee6817..9d7bab964a235c 100644
--- a/spec/ruby/library/set/superset_spec.rb
+++ b/spec/ruby/core/set/superset_spec.rb
@@ -1,6 +1,5 @@
 require_relative '../../spec_helper'
 require_relative 'fixtures/set_like'
-require 'set'
 
 describe "Set#superset?" do
   before :each do
@@ -33,9 +32,11 @@
     -> { Set[].superset?(Object.new) }.should raise_error(ArgumentError)
   end
 
-  context "when comparing to a Set-like object" do
-    it "returns true if passed a Set-like object that self is a superset of" do
-      Set[1, 2, 3, 4].superset?(SetSpecs::SetLike.new([1, 2, 3])).should be_true
+  ruby_version_is ""..."3.5" do
+    context "when comparing to a Set-like object" do
+      it "returns true if passed a Set-like object that self is a superset of" do
+        Set[1, 2, 3, 4].superset?(SetSpecs::SetLike.new([1, 2, 3])).should be_true
+      end
     end
   end
 end
diff --git a/spec/ruby/library/set/to_a_spec.rb b/spec/ruby/core/set/to_a_spec.rb
similarity index 92%
rename from spec/ruby/library/set/to_a_spec.rb
rename to spec/ruby/core/set/to_a_spec.rb
index 689e44f38a3efc..1e9800167ad384 100644
--- a/spec/ruby/library/set/to_a_spec.rb
+++ b/spec/ruby/core/set/to_a_spec.rb
@@ -1,5 +1,4 @@
 require_relative '../../spec_helper'
-require 'set'
 
 describe "Set#to_a" do
   it "returns an array containing elements of self" do
diff --git a/spec/ruby/core/set/to_s_spec.rb b/spec/ruby/core/set/to_s_spec.rb
new file mode 100644
index 00000000000000..55b8bfd9b20c6e
--- /dev/null
+++ b/spec/ruby/core/set/to_s_spec.rb
@@ -0,0 +1,11 @@
+require_relative "../../spec_helper"
+require_relative 'shared/inspect'
+
+describe "Set#to_s" do
+  it_behaves_like :set_inspect, :to_s
+
+  it "is an alias of inspect" do
+    set = Set.new
+    set.method(:to_s).should == set.method(:inspect)
+  end
+end
diff --git a/spec/ruby/library/set/union_spec.rb b/spec/ruby/core/set/union_spec.rb
similarity index 93%
rename from spec/ruby/library/set/union_spec.rb
rename to spec/ruby/core/set/union_spec.rb
index 20fe0ddca39c3a..3e77022d4b79cf 100644
--- a/spec/ruby/library/set/union_spec.rb
+++ b/spec/ruby/core/set/union_spec.rb
@@ -1,6 +1,5 @@
 require_relative '../../spec_helper'
 require_relative 'shared/union'
-require 'set'
 
 describe "Set#union" do
   it_behaves_like :set_union, :union
diff --git a/spec/ruby/core/signal/signame_spec.rb b/spec/ruby/core/signal/signame_spec.rb
index b66de9fc851a83..adfe895d97fbbd 100644
--- a/spec/ruby/core/signal/signame_spec.rb
+++ b/spec/ruby/core/signal/signame_spec.rb
@@ -9,10 +9,22 @@
     Signal.signame(-1).should == nil
   end
 
+  it "calls #to_int on an object to convert to an Integer" do
+    obj = mock('signal')
+    obj.should_receive(:to_int).and_return(0)
+    Signal.signame(obj).should == "EXIT"
+  end
+
   it "raises a TypeError when the passed argument can't be coerced to Integer" do
     -> { Signal.signame("hello") }.should raise_error(TypeError)
   end
 
+  it "raises a TypeError when the passed argument responds to #to_int but does not return an Integer" do
+    obj = mock('signal')
+    obj.should_receive(:to_int).and_return('not an int')
+    -> { Signal.signame(obj) }.should raise_error(TypeError)
+  end
+
   platform_is_not :windows do
     it "the original should take precedence over alias when looked up by number" do
       Signal.signame(Signal.list["ABRT"]).should == "ABRT"
diff --git a/spec/ruby/core/signal/trap_spec.rb b/spec/ruby/core/signal/trap_spec.rb
index 10e122e072140a..6d654a99be6d2c 100644
--- a/spec/ruby/core/signal/trap_spec.rb
+++ b/spec/ruby/core/signal/trap_spec.rb
@@ -221,10 +221,29 @@
       Signal.trap(:HUP, @saved_trap).should equal(@proc)
     end
 
+    it "calls #to_str on an object to convert to a String" do
+      obj = mock("signal")
+      obj.should_receive(:to_str).exactly(2).times.and_return("HUP")
+      Signal.trap obj, @proc
+      Signal.trap(obj, @saved_trap).should equal(@proc)
+    end
+
+    it "accepts Integer values" do
+      hup = Signal.list["HUP"]
+      Signal.trap hup, @proc
+      Signal.trap(hup, @saved_trap).should equal(@proc)
+    end
+
+    it "does not call #to_int on an object to convert to an Integer" do
+      obj = mock("signal")
+      obj.should_not_receive(:to_int)
+      -> { Signal.trap obj, @proc }.should raise_error(ArgumentError, /bad signal type/)
+    end
+
     it "raises ArgumentError when passed unknown signal" do
       -> { Signal.trap(300) { } }.should raise_error(ArgumentError, "invalid signal number (300)")
-      -> { Signal.trap("USR10") { } }.should raise_error(ArgumentError, "unsupported signal `SIGUSR10'")
-      -> { Signal.trap("SIGUSR10") { } }.should raise_error(ArgumentError, "unsupported signal `SIGUSR10'")
+      -> { Signal.trap("USR10") { } }.should raise_error(ArgumentError, /\Aunsupported signal [`']SIGUSR10'\z/)
+      -> { Signal.trap("SIGUSR10") { } }.should raise_error(ArgumentError, /\Aunsupported signal [`']SIGUSR10'\z/)
     end
 
     it "raises ArgumentError when passed signal is not Integer, String or Symbol" do
@@ -245,6 +264,14 @@
       end
     end
 
+    %w[SEGV BUS ILL FPE VTALRM].each do |signal|
+      it "raises ArgumentError for SIG#{signal} which is reserved by Ruby" do
+        -> {
+          Signal.trap(signal, -> {})
+        }.should raise_error(ArgumentError, "can't trap reserved signal: SIG#{signal}")
+      end
+    end
+
     it "allows to register a handler for all known signals, except reserved signals for which it raises ArgumentError" do
       out = ruby_exe(fixture(__FILE__, "trap_all.rb"), args: "2>&1")
       out.should == "OK\n"
diff --git a/spec/ruby/core/sizedqueue/append_spec.rb b/spec/ruby/core/sizedqueue/append_spec.rb
index 6fffe2f2726446..c52baa3802a3d2 100644
--- a/spec/ruby/core/sizedqueue/append_spec.rb
+++ b/spec/ruby/core/sizedqueue/append_spec.rb
@@ -12,7 +12,5 @@
 end
 
 describe "SizedQueue operations with timeout" do
-  ruby_version_is "3.2" do
-    it_behaves_like :rb_num2dbl_fails, nil, -> v { q = SizedQueue.new(1); q.send(:<<, 1, timeout: v) }
-  end
+  it_behaves_like :rb_num2dbl_fails, nil, -> v { q = SizedQueue.new(1); q.send(:<<, 1, timeout: v) }
 end
diff --git a/spec/ruby/core/sizedqueue/deq_spec.rb b/spec/ruby/core/sizedqueue/deq_spec.rb
index 985d654bb3ea9d..2aeb52f8a64b62 100644
--- a/spec/ruby/core/sizedqueue/deq_spec.rb
+++ b/spec/ruby/core/sizedqueue/deq_spec.rb
@@ -7,7 +7,5 @@
 end
 
 describe "SizedQueue operations with timeout" do
-  ruby_version_is "3.2" do
-    it_behaves_like :rb_num2dbl_fails, nil, -> v { q = SizedQueue.new(10); q.push(1); q.deq(timeout: v) }
-  end
+  it_behaves_like :rb_num2dbl_fails, nil, -> v { q = SizedQueue.new(10); q.push(1); q.deq(timeout: v) }
 end
diff --git a/spec/ruby/core/sizedqueue/enq_spec.rb b/spec/ruby/core/sizedqueue/enq_spec.rb
index 619373e46bef0c..b955909475b4ff 100644
--- a/spec/ruby/core/sizedqueue/enq_spec.rb
+++ b/spec/ruby/core/sizedqueue/enq_spec.rb
@@ -12,7 +12,5 @@
 end
 
 describe "SizedQueue operations with timeout" do
-  ruby_version_is "3.2" do
-    it_behaves_like :rb_num2dbl_fails, nil, -> v { q = SizedQueue.new(1); q.enq(1, timeout: v) }
-  end
+  it_behaves_like :rb_num2dbl_fails, nil, -> v { q = SizedQueue.new(1); q.enq(1, timeout: v) }
 end
diff --git a/spec/ruby/core/sizedqueue/freeze_spec.rb b/spec/ruby/core/sizedqueue/freeze_spec.rb
new file mode 100644
index 00000000000000..98f01cae2f878c
--- /dev/null
+++ b/spec/ruby/core/sizedqueue/freeze_spec.rb
@@ -0,0 +1,6 @@
+require_relative '../../spec_helper'
+require_relative '../../shared/queue/freeze'
+
+describe "SizedQueue#freeze" do
+  it_behaves_like :queue_freeze, :freeze, -> { SizedQueue.new(1) }
+end
diff --git a/spec/ruby/core/sizedqueue/pop_spec.rb b/spec/ruby/core/sizedqueue/pop_spec.rb
index 5e7cfea8fb209a..6338ddbaa09550 100644
--- a/spec/ruby/core/sizedqueue/pop_spec.rb
+++ b/spec/ruby/core/sizedqueue/pop_spec.rb
@@ -7,7 +7,5 @@
 end
 
 describe "SizedQueue operations with timeout" do
-  ruby_version_is "3.2" do
-    it_behaves_like :rb_num2dbl_fails, nil, -> v { q = SizedQueue.new(10); q.push(1); q.pop(timeout: v) }
-  end
+  it_behaves_like :rb_num2dbl_fails, nil, -> v { q = SizedQueue.new(10); q.push(1); q.pop(timeout: v) }
 end
diff --git a/spec/ruby/core/sizedqueue/push_spec.rb b/spec/ruby/core/sizedqueue/push_spec.rb
index ce61e89b53f0c3..9eaa6beca089ba 100644
--- a/spec/ruby/core/sizedqueue/push_spec.rb
+++ b/spec/ruby/core/sizedqueue/push_spec.rb
@@ -12,7 +12,5 @@
 end
 
 describe "SizedQueue operations with timeout" do
-  ruby_version_is "3.2" do
-    it_behaves_like :rb_num2dbl_fails, nil, -> v { q = SizedQueue.new(1); q.push(1, timeout: v) }
-  end
+  it_behaves_like :rb_num2dbl_fails, nil, -> v { q = SizedQueue.new(1); q.push(1, timeout: v) }
 end
diff --git a/spec/ruby/core/sizedqueue/shift_spec.rb b/spec/ruby/core/sizedqueue/shift_spec.rb
index 3220801f3a9999..52974c1d995379 100644
--- a/spec/ruby/core/sizedqueue/shift_spec.rb
+++ b/spec/ruby/core/sizedqueue/shift_spec.rb
@@ -7,7 +7,5 @@
 end
 
 describe "SizedQueue operations with timeout" do
-  ruby_version_is "3.2" do
-    it_behaves_like :rb_num2dbl_fails, nil, -> v { q = SizedQueue.new(10); q.push(1); q.shift(timeout: v) }
-  end
+  it_behaves_like :rb_num2dbl_fails, nil, -> v { q = SizedQueue.new(10); q.push(1); q.shift(timeout: v) }
 end
diff --git a/spec/ruby/core/string/append_as_bytes_spec.rb b/spec/ruby/core/string/append_as_bytes_spec.rb
new file mode 100644
index 00000000000000..b1703e5f89baf9
--- /dev/null
+++ b/spec/ruby/core/string/append_as_bytes_spec.rb
@@ -0,0 +1,58 @@
+require_relative '../../spec_helper'
+
+describe "String#append_bytes" do
+  ruby_version_is "3.4" do
+    it "doesn't allow to mutate frozen strings" do
+      str = "hello".freeze
+      -> { str.append_as_bytes("\xE2\x82") }.should raise_error(FrozenError)
+    end
+
+    it "allows creating broken strings" do
+      str = +"hello"
+      str.append_as_bytes("\xE2\x82")
+      str.valid_encoding?.should == false
+
+      str.append_as_bytes("\xAC")
+      str.valid_encoding?.should == true
+
+      str = "abc".encode(Encoding::UTF_32LE)
+      str.append_as_bytes("def")
+      str.encoding.should == Encoding::UTF_32LE
+      str.valid_encoding?.should == false
+    end
+
+    it "never changes the receiver encoding" do
+      str = "".b
+      str.append_as_bytes("€")
+      str.encoding.should == Encoding::BINARY
+    end
+
+    it "accepts variadic String or Integer arguments" do
+      str = "hello".b
+      str.append_as_bytes("\xE2\x82", 12, 43, "\xAC")
+      str.encoding.should == Encoding::BINARY
+      str.should == "hello\xE2\x82\f+\xAC".b
+    end
+
+    it "truncates integers to the least significant byte" do
+      str = +""
+      str.append_as_bytes(0x131, 0x232, 0x333, bignum_value, bignum_value(1))
+      str.bytes.should == [0x31, 0x32, 0x33, 0, 1]
+    end
+
+    it "wraps negative integers" do
+      str = "".b
+      str.append_as_bytes(-1, -bignum_value, -bignum_value(1))
+      str.bytes.should == [0xFF, 0, 0xFF]
+    end
+
+    it "only accepts strings or integers, and doesn't attempt to cast with #to_str or #to_int" do
+      to_str = mock("to_str")
+      to_str.should_not_receive(:to_str)
+      to_str.should_not_receive(:to_int)
+
+      str = +"hello"
+      -> { str.append_as_bytes(to_str) }.should raise_error(TypeError, "wrong argument type MockObject (expected String or Integer)")
+    end
+  end
+end
diff --git a/spec/ruby/core/string/ascii_only_spec.rb b/spec/ruby/core/string/ascii_only_spec.rb
index c7e02fd8743b8b..88a0559cfda1c2 100644
--- a/spec/ruby/core/string/ascii_only_spec.rb
+++ b/spec/ruby/core/string/ascii_only_spec.rb
@@ -7,12 +7,12 @@
     it "returns true if the encoding is UTF-8" do
       [ ["hello",                         true],
         ["hello".encode('UTF-8'),         true],
-        ["hello".force_encoding('UTF-8'), true],
+        ["hello".dup.force_encoding('UTF-8'), true],
       ].should be_computed_by(:ascii_only?)
     end
 
     it "returns true if the encoding is US-ASCII" do
-      "hello".force_encoding(Encoding::US_ASCII).ascii_only?.should be_true
+      "hello".dup.force_encoding(Encoding::US_ASCII).ascii_only?.should be_true
       "hello".encode(Encoding::US_ASCII).ascii_only?.should be_true
     end
 
@@ -34,13 +34,13 @@
       [ ["\u{6666}",                          false],
         ["hello, \u{6666}",                   false],
         ["\u{6666}".encode('UTF-8'),          false],
-        ["\u{6666}".force_encoding('UTF-8'),  false],
+        ["\u{6666}".dup.force_encoding('UTF-8'),  false],
       ].should be_computed_by(:ascii_only?)
     end
 
     it "returns false if the encoding is US-ASCII" do
-      [ ["\u{6666}".force_encoding(Encoding::US_ASCII),         false],
-        ["hello, \u{6666}".force_encoding(Encoding::US_ASCII),  false],
+      [ ["\u{6666}".dup.force_encoding(Encoding::US_ASCII),         false],
+        ["hello, \u{6666}".dup.force_encoding(Encoding::US_ASCII),  false],
       ].should be_computed_by(:ascii_only?)
     end
   end
@@ -51,17 +51,16 @@
   end
 
   it "returns false for the empty String with a non-ASCII-compatible encoding" do
-    "".force_encoding('UTF-16LE').ascii_only?.should be_false
+    "".dup.force_encoding('UTF-16LE').ascii_only?.should be_false
     "".encode('UTF-16BE').ascii_only?.should be_false
   end
 
   it "returns false for a non-empty String with non-ASCII-compatible encoding" do
-    "\x78\x00".force_encoding("UTF-16LE").ascii_only?.should be_false
+    "\x78\x00".dup.force_encoding("UTF-16LE").ascii_only?.should be_false
   end
 
   it "returns false when interpolating non ascii strings" do
-    base = "EU currency is"
-    base.force_encoding(Encoding::US_ASCII)
+    base = "EU currency is".dup.force_encoding(Encoding::US_ASCII)
     euro = "\u20AC"
     interp = "#{base} #{euro}"
     euro.ascii_only?.should be_false
@@ -70,14 +69,14 @@
   end
 
   it "returns false after appending non ASCII characters to an empty String" do
-    ("" << "λ").ascii_only?.should be_false
+    ("".dup << "λ").ascii_only?.should be_false
   end
 
   it "returns false when concatenating an ASCII and non-ASCII String" do
-    "".concat("λ").ascii_only?.should be_false
+    "".dup.concat("λ").ascii_only?.should be_false
   end
 
   it "returns false when replacing an ASCII String with a non-ASCII String" do
-    "".replace("λ").ascii_only?.should be_false
+    "".dup.replace("λ").ascii_only?.should be_false
   end
 end
diff --git a/spec/ruby/core/string/b_spec.rb b/spec/ruby/core/string/b_spec.rb
index 37c7994700a07e..4b1fafff117806 100644
--- a/spec/ruby/core/string/b_spec.rb
+++ b/spec/ruby/core/string/b_spec.rb
@@ -1,4 +1,5 @@
 # -*- encoding: utf-8 -*-
+# frozen_string_literal: false
 require_relative '../../spec_helper'
 
 describe "String#b" do
diff --git a/spec/ruby/core/string/byteindex_spec.rb b/spec/ruby/core/string/byteindex_spec.rb
index 7be0c7ec1ef9c1..d420f3f6830c91 100644
--- a/spec/ruby/core/string/byteindex_spec.rb
+++ b/spec/ruby/core/string/byteindex_spec.rb
@@ -4,301 +4,295 @@
 require_relative 'shared/byte_index_common.rb'
 
 describe "String#byteindex" do
-  ruby_version_is "3.2" do
-    it "calls #to_str to convert the first argument" do
-      char = mock("string index char")
-      char.should_receive(:to_str).and_return("b")
-      "abc".byteindex(char).should == 1
-    end
-
-    it "calls #to_int to convert the second argument" do
-      offset = mock("string index offset")
-      offset.should_receive(:to_int).and_return(1)
-      "abc".byteindex("c", offset).should == 2
-    end
+  it "calls #to_str to convert the first argument" do
+    char = mock("string index char")
+    char.should_receive(:to_str).and_return("b")
+    "abc".byteindex(char).should == 1
+  end
 
-    it "does not raise IndexError when byte offset is correct or on string boundary" do
-      "わ".byteindex("").should == 0
-      "わ".byteindex("", 0).should == 0
-      "わ".byteindex("", 3).should == 3
-    end
+  it "calls #to_int to convert the second argument" do
+    offset = mock("string index offset")
+    offset.should_receive(:to_int).and_return(1)
+    "abc".byteindex("c", offset).should == 2
+  end
 
-    it_behaves_like :byte_index_common, :byteindex
+  it "does not raise IndexError when byte offset is correct or on string boundary" do
+    "わ".byteindex("").should == 0
+    "わ".byteindex("", 0).should == 0
+    "わ".byteindex("", 3).should == 3
   end
+
+  it_behaves_like :byte_index_common, :byteindex
 end
 
 describe "String#byteindex with String" do
-  ruby_version_is "3.2" do
-    it "behaves the same as String#byteindex(char) for one-character strings" do
-      "blablabla hello cruel world...!".split("").uniq.each do |str|
-        chr = str[0]
-        str.byteindex(str).should == str.byteindex(chr)
+  it "behaves the same as String#byteindex(char) for one-character strings" do
+    "blablabla hello cruel world...!".split("").uniq.each do |str|
+      chr = str[0]
+      str.byteindex(str).should == str.byteindex(chr)
 
-        0.upto(str.size + 1) do |start|
-          str.byteindex(str, start).should == str.byteindex(chr, start)
-        end
+      0.upto(str.size + 1) do |start|
+        str.byteindex(str, start).should == str.byteindex(chr, start)
+      end
 
-        (-str.size - 1).upto(-1) do |start|
-          str.byteindex(str, start).should == str.byteindex(chr, start)
-        end
+      (-str.size - 1).upto(-1) do |start|
+        str.byteindex(str, start).should == str.byteindex(chr, start)
       end
     end
+  end
 
-    it "returns the byteindex of the first occurrence of the given substring" do
-      "blablabla".byteindex("").should == 0
-      "blablabla".byteindex("b").should == 0
-      "blablabla".byteindex("bla").should == 0
-      "blablabla".byteindex("blabla").should == 0
-      "blablabla".byteindex("blablabla").should == 0
-
-      "blablabla".byteindex("l").should == 1
-      "blablabla".byteindex("la").should == 1
-      "blablabla".byteindex("labla").should == 1
-      "blablabla".byteindex("lablabla").should == 1
-
-      "blablabla".byteindex("a").should == 2
-      "blablabla".byteindex("abla").should == 2
-      "blablabla".byteindex("ablabla").should == 2
-    end
+  it "returns the byteindex of the first occurrence of the given substring" do
+    "blablabla".byteindex("").should == 0
+    "blablabla".byteindex("b").should == 0
+    "blablabla".byteindex("bla").should == 0
+    "blablabla".byteindex("blabla").should == 0
+    "blablabla".byteindex("blablabla").should == 0
+
+    "blablabla".byteindex("l").should == 1
+    "blablabla".byteindex("la").should == 1
+    "blablabla".byteindex("labla").should == 1
+    "blablabla".byteindex("lablabla").should == 1
+
+    "blablabla".byteindex("a").should == 2
+    "blablabla".byteindex("abla").should == 2
+    "blablabla".byteindex("ablabla").should == 2
+  end
 
-    it "treats the offset as a byteindex" do
-      "aaaaa".byteindex("a", 0).should == 0
-      "aaaaa".byteindex("a", 2).should == 2
-      "aaaaa".byteindex("a", 4).should == 4
-    end
+  it "treats the offset as a byteindex" do
+    "aaaaa".byteindex("a", 0).should == 0
+    "aaaaa".byteindex("a", 2).should == 2
+    "aaaaa".byteindex("a", 4).should == 4
+  end
 
-    it "ignores string subclasses" do
-      "blablabla".byteindex(StringSpecs::MyString.new("bla")).should == 0
-      StringSpecs::MyString.new("blablabla").byteindex("bla").should == 0
-      StringSpecs::MyString.new("blablabla").byteindex(StringSpecs::MyString.new("bla")).should == 0
-    end
+  it "ignores string subclasses" do
+    "blablabla".byteindex(StringSpecs::MyString.new("bla")).should == 0
+    StringSpecs::MyString.new("blablabla").byteindex("bla").should == 0
+    StringSpecs::MyString.new("blablabla").byteindex(StringSpecs::MyString.new("bla")).should == 0
+  end
 
-    it "starts the search at the given offset" do
-      "blablabla".byteindex("bl", 0).should == 0
-      "blablabla".byteindex("bl", 1).should == 3
-      "blablabla".byteindex("bl", 2).should == 3
-      "blablabla".byteindex("bl", 3).should == 3
-
-      "blablabla".byteindex("bla", 0).should == 0
-      "blablabla".byteindex("bla", 1).should == 3
-      "blablabla".byteindex("bla", 2).should == 3
-      "blablabla".byteindex("bla", 3).should == 3
-
-      "blablabla".byteindex("blab", 0).should == 0
-      "blablabla".byteindex("blab", 1).should == 3
-      "blablabla".byteindex("blab", 2).should == 3
-      "blablabla".byteindex("blab", 3).should == 3
-
-      "blablabla".byteindex("la", 1).should == 1
-      "blablabla".byteindex("la", 2).should == 4
-      "blablabla".byteindex("la", 3).should == 4
-      "blablabla".byteindex("la", 4).should == 4
-
-      "blablabla".byteindex("lab", 1).should == 1
-      "blablabla".byteindex("lab", 2).should == 4
-      "blablabla".byteindex("lab", 3).should == 4
-      "blablabla".byteindex("lab", 4).should == 4
-
-      "blablabla".byteindex("ab", 2).should == 2
-      "blablabla".byteindex("ab", 3).should == 5
-      "blablabla".byteindex("ab", 4).should == 5
-      "blablabla".byteindex("ab", 5).should == 5
-
-      "blablabla".byteindex("", 0).should == 0
-      "blablabla".byteindex("", 1).should == 1
-      "blablabla".byteindex("", 2).should == 2
-      "blablabla".byteindex("", 7).should == 7
-      "blablabla".byteindex("", 8).should == 8
-      "blablabla".byteindex("", 9).should == 9
-    end
+  it "starts the search at the given offset" do
+    "blablabla".byteindex("bl", 0).should == 0
+    "blablabla".byteindex("bl", 1).should == 3
+    "blablabla".byteindex("bl", 2).should == 3
+    "blablabla".byteindex("bl", 3).should == 3
+
+    "blablabla".byteindex("bla", 0).should == 0
+    "blablabla".byteindex("bla", 1).should == 3
+    "blablabla".byteindex("bla", 2).should == 3
+    "blablabla".byteindex("bla", 3).should == 3
+
+    "blablabla".byteindex("blab", 0).should == 0
+    "blablabla".byteindex("blab", 1).should == 3
+    "blablabla".byteindex("blab", 2).should == 3
+    "blablabla".byteindex("blab", 3).should == 3
+
+    "blablabla".byteindex("la", 1).should == 1
+    "blablabla".byteindex("la", 2).should == 4
+    "blablabla".byteindex("la", 3).should == 4
+    "blablabla".byteindex("la", 4).should == 4
+
+    "blablabla".byteindex("lab", 1).should == 1
+    "blablabla".byteindex("lab", 2).should == 4
+    "blablabla".byteindex("lab", 3).should == 4
+    "blablabla".byteindex("lab", 4).should == 4
+
+    "blablabla".byteindex("ab", 2).should == 2
+    "blablabla".byteindex("ab", 3).should == 5
+    "blablabla".byteindex("ab", 4).should == 5
+    "blablabla".byteindex("ab", 5).should == 5
+
+    "blablabla".byteindex("", 0).should == 0
+    "blablabla".byteindex("", 1).should == 1
+    "blablabla".byteindex("", 2).should == 2
+    "blablabla".byteindex("", 7).should == 7
+    "blablabla".byteindex("", 8).should == 8
+    "blablabla".byteindex("", 9).should == 9
+  end
 
-    it "starts the search at offset + self.length if offset is negative" do
-      str = "blablabla"
+  it "starts the search at offset + self.length if offset is negative" do
+    str = "blablabla"
 
-      ["bl", "bla", "blab", "la", "lab", "ab", ""].each do |needle|
-        (-str.length .. -1).each do |offset|
-          str.byteindex(needle, offset).should ==
-          str.byteindex(needle, offset + str.length)
-        end
+    ["bl", "bla", "blab", "la", "lab", "ab", ""].each do |needle|
+      (-str.length .. -1).each do |offset|
+        str.byteindex(needle, offset).should ==
+        str.byteindex(needle, offset + str.length)
       end
     end
+  end
 
-    it "returns nil if the substring isn't found" do
-      "blablabla".byteindex("B").should == nil
-      "blablabla".byteindex("z").should == nil
-      "blablabla".byteindex("BLA").should == nil
-      "blablabla".byteindex("blablablabla").should == nil
-      "blablabla".byteindex("", 10).should == nil
+  it "returns nil if the substring isn't found" do
+    "blablabla".byteindex("B").should == nil
+    "blablabla".byteindex("z").should == nil
+    "blablabla".byteindex("BLA").should == nil
+    "blablabla".byteindex("blablablabla").should == nil
+    "blablabla".byteindex("", 10).should == nil
 
-      "hello".byteindex("he", 1).should == nil
-      "hello".byteindex("he", 2).should == nil
-      "I’ve got a multibyte character.\n".byteindex("\n\n").should == nil
-    end
+    "hello".byteindex("he", 1).should == nil
+    "hello".byteindex("he", 2).should == nil
+    "I’ve got a multibyte character.\n".byteindex("\n\n").should == nil
+  end
 
-    it "returns the character byteindex of a multibyte character" do
-      "ありがとう".byteindex("が").should == 6
-    end
+  it "returns the character byteindex of a multibyte character" do
+    "ありがとう".byteindex("が").should == 6
+  end
 
-    it "returns the character byteindex after offset" do
-      "われわれ".byteindex("わ", 3).should == 6
-      "ありがとうありがとう".byteindex("が", 9).should == 21
-    end
+  it "returns the character byteindex after offset" do
+    "われわれ".byteindex("わ", 3).should == 6
+    "ありがとうありがとう".byteindex("が", 9).should == 21
+  end
 
-    it "returns the character byteindex after a partial first match" do
-      "</</h".byteindex("</h").should == 2
-    end
+  it "returns the character byteindex after a partial first match" do
+    "</</h".byteindex("</h").should == 2
+  end
 
-    it "raises an Encoding::CompatibilityError if the encodings are incompatible" do
-      char = "れ".encode Encoding::EUC_JP
-      -> do
-        "あれ".byteindex(char)
-      end.should raise_error(Encoding::CompatibilityError)
-    end
+  it "raises an Encoding::CompatibilityError if the encodings are incompatible" do
+    char = "れ".encode Encoding::EUC_JP
+    -> do
+      "あれ".byteindex(char)
+    end.should raise_error(Encoding::CompatibilityError)
+  end
 
-    it "handles a substring in a superset encoding" do
-      'abc'.force_encoding(Encoding::US_ASCII).byteindex('é').should == nil
-    end
+  it "handles a substring in a superset encoding" do
+    'abc'.dup.force_encoding(Encoding::US_ASCII).byteindex('é').should == nil
+  end
 
-    it "handles a substring in a subset encoding" do
-      'été'.byteindex('t'.force_encoding(Encoding::US_ASCII)).should == 2
-    end
+  it "handles a substring in a subset encoding" do
+    'été'.byteindex('t'.dup.force_encoding(Encoding::US_ASCII)).should == 2
   end
 end
 
 describe "String#byteindex with Regexp" do
-  ruby_version_is "3.2" do
-    it "behaves the same as String#byteindex(string) for escaped string regexps" do
-      ["blablabla", "hello cruel world...!"].each do |str|
-        ["", "b", "bla", "lab", "o c", "d."].each do |needle|
-          regexp = Regexp.new(Regexp.escape(needle))
-          str.byteindex(regexp).should == str.byteindex(needle)
-
-          0.upto(str.size + 1) do |start|
-            str.byteindex(regexp, start).should == str.byteindex(needle, start)
-          end
-
-          (-str.size - 1).upto(-1) do |start|
-            str.byteindex(regexp, start).should == str.byteindex(needle, start)
-          end
+  it "behaves the same as String#byteindex(string) for escaped string regexps" do
+    ["blablabla", "hello cruel world...!"].each do |str|
+      ["", "b", "bla", "lab", "o c", "d."].each do |needle|
+        regexp = Regexp.new(Regexp.escape(needle))
+        str.byteindex(regexp).should == str.byteindex(needle)
+
+        0.upto(str.size + 1) do |start|
+          str.byteindex(regexp, start).should == str.byteindex(needle, start)
+        end
+
+        (-str.size - 1).upto(-1) do |start|
+          str.byteindex(regexp, start).should == str.byteindex(needle, start)
         end
       end
     end
+  end
 
-    it "returns the byteindex of the first match of regexp" do
-      "blablabla".byteindex(/bla/).should == 0
-      "blablabla".byteindex(/BLA/i).should == 0
+  it "returns the byteindex of the first match of regexp" do
+    "blablabla".byteindex(/bla/).should == 0
+    "blablabla".byteindex(/BLA/i).should == 0
 
-      "blablabla".byteindex(/.{0}/).should == 0
-      "blablabla".byteindex(/.{6}/).should == 0
-      "blablabla".byteindex(/.{9}/).should == 0
+    "blablabla".byteindex(/.{0}/).should == 0
+    "blablabla".byteindex(/.{6}/).should == 0
+    "blablabla".byteindex(/.{9}/).should == 0
 
-      "blablabla".byteindex(/.*/).should == 0
-      "blablabla".byteindex(/.+/).should == 0
+    "blablabla".byteindex(/.*/).should == 0
+    "blablabla".byteindex(/.+/).should == 0
 
-      "blablabla".byteindex(/lab|b/).should == 0
+    "blablabla".byteindex(/lab|b/).should == 0
 
-      not_supported_on :opal do
-        "blablabla".byteindex(/\A/).should == 0
-        "blablabla".byteindex(/\Z/).should == 9
-        "blablabla".byteindex(/\z/).should == 9
-        "blablabla\n".byteindex(/\Z/).should == 9
-        "blablabla\n".byteindex(/\z/).should == 10
-      end
+    not_supported_on :opal do
+      "blablabla".byteindex(/\A/).should == 0
+      "blablabla".byteindex(/\Z/).should == 9
+      "blablabla".byteindex(/\z/).should == 9
+      "blablabla\n".byteindex(/\Z/).should == 9
+      "blablabla\n".byteindex(/\z/).should == 10
+    end
 
-      "blablabla".byteindex(/^/).should == 0
-      "\nblablabla".byteindex(/^/).should == 0
-      "b\nablabla".byteindex(/$/).should == 1
-      "bl\nablabla".byteindex(/$/).should == 2
+    "blablabla".byteindex(/^/).should == 0
+    "\nblablabla".byteindex(/^/).should == 0
+    "b\nablabla".byteindex(/$/).should == 1
+    "bl\nablabla".byteindex(/$/).should == 2
 
-      "blablabla".byteindex(/.l./).should == 0
-    end
+    "blablabla".byteindex(/.l./).should == 0
+  end
 
-    it "starts the search at the given offset" do
-      "blablabla".byteindex(/.{0}/, 5).should == 5
-      "blablabla".byteindex(/.{1}/, 5).should == 5
-      "blablabla".byteindex(/.{2}/, 5).should == 5
-      "blablabla".byteindex(/.{3}/, 5).should == 5
-      "blablabla".byteindex(/.{4}/, 5).should == 5
-
-      "blablabla".byteindex(/.{0}/, 3).should == 3
-      "blablabla".byteindex(/.{1}/, 3).should == 3
-      "blablabla".byteindex(/.{2}/, 3).should == 3
-      "blablabla".byteindex(/.{5}/, 3).should == 3
-      "blablabla".byteindex(/.{6}/, 3).should == 3
-
-      "blablabla".byteindex(/.l./, 0).should == 0
-      "blablabla".byteindex(/.l./, 1).should == 3
-      "blablabla".byteindex(/.l./, 2).should == 3
-      "blablabla".byteindex(/.l./, 3).should == 3
-
-      "xblaxbla".byteindex(/x./, 0).should == 0
-      "xblaxbla".byteindex(/x./, 1).should == 4
-      "xblaxbla".byteindex(/x./, 2).should == 4
-
-      not_supported_on :opal do
-        "blablabla\n".byteindex(/\Z/, 9).should == 9
-      end
+  it "starts the search at the given offset" do
+    "blablabla".byteindex(/.{0}/, 5).should == 5
+    "blablabla".byteindex(/.{1}/, 5).should == 5
+    "blablabla".byteindex(/.{2}/, 5).should == 5
+    "blablabla".byteindex(/.{3}/, 5).should == 5
+    "blablabla".byteindex(/.{4}/, 5).should == 5
+
+    "blablabla".byteindex(/.{0}/, 3).should == 3
+    "blablabla".byteindex(/.{1}/, 3).should == 3
+    "blablabla".byteindex(/.{2}/, 3).should == 3
+    "blablabla".byteindex(/.{5}/, 3).should == 3
+    "blablabla".byteindex(/.{6}/, 3).should == 3
+
+    "blablabla".byteindex(/.l./, 0).should == 0
+    "blablabla".byteindex(/.l./, 1).should == 3
+    "blablabla".byteindex(/.l./, 2).should == 3
+    "blablabla".byteindex(/.l./, 3).should == 3
+
+    "xblaxbla".byteindex(/x./, 0).should == 0
+    "xblaxbla".byteindex(/x./, 1).should == 4
+    "xblaxbla".byteindex(/x./, 2).should == 4
+
+    not_supported_on :opal do
+      "blablabla\n".byteindex(/\Z/, 9).should == 9
     end
+  end
 
-    it "starts the search at offset + self.length if offset is negative" do
-      str = "blablabla"
+  it "starts the search at offset + self.length if offset is negative" do
+    str = "blablabla"
 
-      ["bl", "bla", "blab", "la", "lab", "ab", ""].each do |needle|
-        (-str.length .. -1).each do |offset|
-          str.byteindex(needle, offset).should ==
-          str.byteindex(needle, offset + str.length)
-        end
+    ["bl", "bla", "blab", "la", "lab", "ab", ""].each do |needle|
+      (-str.length .. -1).each do |offset|
+        str.byteindex(needle, offset).should ==
+        str.byteindex(needle, offset + str.length)
       end
     end
+  end
 
-    it "returns nil if the substring isn't found" do
-      "blablabla".byteindex(/BLA/).should == nil
+  it "returns nil if the substring isn't found" do
+    "blablabla".byteindex(/BLA/).should == nil
 
-      "blablabla".byteindex(/.{10}/).should == nil
-      "blaxbla".byteindex(/.x/, 3).should == nil
-      "blaxbla".byteindex(/..x/, 2).should == nil
-    end
+    "blablabla".byteindex(/.{10}/).should == nil
+    "blaxbla".byteindex(/.x/, 3).should == nil
+    "blaxbla".byteindex(/..x/, 2).should == nil
+  end
 
-    it "returns nil if the Regexp matches the empty string and the offset is out of range" do
-      "ruby".byteindex(//, 12).should be_nil
-    end
+  it "returns nil if the Regexp matches the empty string and the offset is out of range" do
+    "ruby".byteindex(//, 12).should be_nil
+  end
 
-    it "supports \\G which matches at the given start offset" do
-      "helloYOU.".byteindex(/\GYOU/, 5).should == 5
-      "helloYOU.".byteindex(/\GYOU/).should == nil
+  it "supports \\G which matches at the given start offset" do
+    "helloYOU.".byteindex(/\GYOU/, 5).should == 5
+    "helloYOU.".byteindex(/\GYOU/).should == nil
 
-      re = /\G.+YOU/
-      # The # marks where \G will match.
-      [
-        ["#hi!YOUall.", 0],
-        ["h#i!YOUall.", 1],
-        ["hi#!YOUall.", 2],
-        ["hi!#YOUall.", nil]
-      ].each do |spec|
+    re = /\G.+YOU/
+    # The # marks where \G will match.
+    [
+      ["#hi!YOUall.", 0],
+      ["h#i!YOUall.", 1],
+      ["hi#!YOUall.", 2],
+      ["hi!#YOUall.", nil]
+    ].each do |spec|
 
-        start = spec[0].byteindex("#")
-        str = spec[0].delete("#")
+      start = spec[0].byteindex("#")
+      str = spec[0].delete("#")
 
-        str.byteindex(re, start).should == spec[1]
-      end
+      str.byteindex(re, start).should == spec[1]
     end
+  end
 
-    it "converts start_offset to an integer via to_int" do
-      obj = mock('1')
-      obj.should_receive(:to_int).and_return(1)
-      "RWOARW".byteindex(/R./, obj).should == 4
-    end
+  it "converts start_offset to an integer via to_int" do
+    obj = mock('1')
+    obj.should_receive(:to_int).and_return(1)
+    "RWOARW".byteindex(/R./, obj).should == 4
+  end
 
-    it "returns the character byteindex of a multibyte character" do
-      "ありがとう".byteindex(/が/).should == 6
-    end
+  it "returns the character byteindex of a multibyte character" do
+    "ありがとう".byteindex(/が/).should == 6
+  end
 
-    it "returns the character byteindex after offset" do
-      "われわれ".byteindex(/わ/, 3).should == 6
-    end
+  it "returns the character byteindex after offset" do
+    "われわれ".byteindex(/わ/, 3).should == 6
+  end
 
-    it "treats the offset as a byteindex" do
-      "われわわれ".byteindex(/わ/, 6).should == 6
-    end
+  it "treats the offset as a byteindex" do
+    "われわわれ".byteindex(/わ/, 6).should == 6
   end
 end
diff --git a/spec/ruby/core/string/byterindex_spec.rb b/spec/ruby/core/string/byterindex_spec.rb
index 717708c97d364b..983222e35de630 100644
--- a/spec/ruby/core/string/byterindex_spec.rb
+++ b/spec/ruby/core/string/byterindex_spec.rb
@@ -4,356 +4,350 @@
 require_relative 'shared/byte_index_common.rb'
 
 describe "String#byterindex with object" do
-  ruby_version_is "3.2" do
-    it "tries to convert obj to a string via to_str" do
-      obj = mock('lo')
-      def obj.to_str() "lo" end
-      "hello".byterindex(obj).should == "hello".byterindex("lo")
-
-      obj = mock('o')
-      def obj.respond_to?(arg, *) true end
-      def obj.method_missing(*args) "o" end
-      "hello".byterindex(obj).should == "hello".byterindex("o")
-    end
-
-    it "calls #to_int to convert the second argument" do
-      offset = mock("string index offset")
-      offset.should_receive(:to_int).and_return(3)
-      "abc".byterindex("c", offset).should == 2
-    end
+  it "tries to convert obj to a string via to_str" do
+    obj = mock('lo')
+    def obj.to_str() "lo" end
+    "hello".byterindex(obj).should == "hello".byterindex("lo")
+
+    obj = mock('o')
+    def obj.respond_to?(arg, *) true end
+    def obj.method_missing(*args) "o" end
+    "hello".byterindex(obj).should == "hello".byterindex("o")
+  end
 
-    it "does not raise IndexError when byte offset is correct or on string boundary" do
-      "わ".byterindex("", 0).should == 0
-      "わ".byterindex("", 3).should == 3
-      "わ".byterindex("").should == 3
-    end
+  it "calls #to_int to convert the second argument" do
+    offset = mock("string index offset")
+    offset.should_receive(:to_int).and_return(3)
+    "abc".byterindex("c", offset).should == 2
+  end
 
-    it_behaves_like :byte_index_common, :byterindex
+  it "does not raise IndexError when byte offset is correct or on string boundary" do
+    "わ".byterindex("", 0).should == 0
+    "わ".byterindex("", 3).should == 3
+    "わ".byterindex("").should == 3
   end
+
+  it_behaves_like :byte_index_common, :byterindex
 end
 
 describe "String#byterindex with String" do
-  ruby_version_is "3.2" do
-    it "behaves the same as String#byterindex(char) for one-character strings" do
-      "blablabla hello cruel world...!".split("").uniq.each do |str|
-        chr = str[0]
-        str.byterindex(str).should == str.byterindex(chr)
+  it "behaves the same as String#byterindex(char) for one-character strings" do
+    "blablabla hello cruel world...!".split("").uniq.each do |str|
+      chr = str[0]
+      str.byterindex(str).should == str.byterindex(chr)
 
-        0.upto(str.size + 1) do |start|
-          str.byterindex(str, start).should == str.byterindex(chr, start)
-        end
+      0.upto(str.size + 1) do |start|
+        str.byterindex(str, start).should == str.byterindex(chr, start)
+      end
 
-        (-str.size - 1).upto(-1) do |start|
-          str.byterindex(str, start).should == str.byterindex(chr, start)
-        end
+      (-str.size - 1).upto(-1) do |start|
+        str.byterindex(str, start).should == str.byterindex(chr, start)
       end
     end
+  end
 
-    it "behaves the same as String#byterindex(?char) for one-character strings" do
-      "blablabla hello cruel world...!".split("").uniq.each do |str|
-        chr = str[0] =~ / / ? str[0] : eval("?#{str[0]}")
-        str.byterindex(str).should == str.byterindex(chr)
+  it "behaves the same as String#byterindex(?char) for one-character strings" do
+    "blablabla hello cruel world...!".split("").uniq.each do |str|
+      chr = str[0] =~ / / ? str[0] : eval("?#{str[0]}")
+      str.byterindex(str).should == str.byterindex(chr)
 
-        0.upto(str.size + 1) do |start|
-          str.byterindex(str, start).should == str.byterindex(chr, start)
-        end
+      0.upto(str.size + 1) do |start|
+        str.byterindex(str, start).should == str.byterindex(chr, start)
+      end
 
-        (-str.size - 1).upto(-1) do |start|
-          str.byterindex(str, start).should == str.byterindex(chr, start)
-        end
+      (-str.size - 1).upto(-1) do |start|
+        str.byterindex(str, start).should == str.byterindex(chr, start)
       end
     end
+  end
 
-    it "returns the index of the last occurrence of the given substring" do
-      "blablabla".byterindex("").should == 9
-      "blablabla".byterindex("a").should == 8
-      "blablabla".byterindex("la").should == 7
-      "blablabla".byterindex("bla").should == 6
-      "blablabla".byterindex("abla").should == 5
-      "blablabla".byterindex("labla").should == 4
-      "blablabla".byterindex("blabla").should == 3
-      "blablabla".byterindex("ablabla").should == 2
-      "blablabla".byterindex("lablabla").should == 1
-      "blablabla".byterindex("blablabla").should == 0
-
-      "blablabla".byterindex("l").should == 7
-      "blablabla".byterindex("bl").should == 6
-      "blablabla".byterindex("abl").should == 5
-      "blablabla".byterindex("labl").should == 4
-      "blablabla".byterindex("blabl").should == 3
-      "blablabla".byterindex("ablabl").should == 2
-      "blablabla".byterindex("lablabl").should == 1
-      "blablabla".byterindex("blablabl").should == 0
-
-      "blablabla".byterindex("b").should == 6
-      "blablabla".byterindex("ab").should == 5
-      "blablabla".byterindex("lab").should == 4
-      "blablabla".byterindex("blab").should == 3
-      "blablabla".byterindex("ablab").should == 2
-      "blablabla".byterindex("lablab").should == 1
-      "blablabla".byterindex("blablab").should == 0
-    end
+  it "returns the index of the last occurrence of the given substring" do
+    "blablabla".byterindex("").should == 9
+    "blablabla".byterindex("a").should == 8
+    "blablabla".byterindex("la").should == 7
+    "blablabla".byterindex("bla").should == 6
+    "blablabla".byterindex("abla").should == 5
+    "blablabla".byterindex("labla").should == 4
+    "blablabla".byterindex("blabla").should == 3
+    "blablabla".byterindex("ablabla").should == 2
+    "blablabla".byterindex("lablabla").should == 1
+    "blablabla".byterindex("blablabla").should == 0
+
+    "blablabla".byterindex("l").should == 7
+    "blablabla".byterindex("bl").should == 6
+    "blablabla".byterindex("abl").should == 5
+    "blablabla".byterindex("labl").should == 4
+    "blablabla".byterindex("blabl").should == 3
+    "blablabla".byterindex("ablabl").should == 2
+    "blablabla".byterindex("lablabl").should == 1
+    "blablabla".byterindex("blablabl").should == 0
+
+    "blablabla".byterindex("b").should == 6
+    "blablabla".byterindex("ab").should == 5
+    "blablabla".byterindex("lab").should == 4
+    "blablabla".byterindex("blab").should == 3
+    "blablabla".byterindex("ablab").should == 2
+    "blablabla".byterindex("lablab").should == 1
+    "blablabla".byterindex("blablab").should == 0
+  end
 
-    it "ignores string subclasses" do
-      "blablabla".byterindex(StringSpecs::MyString.new("bla")).should == 6
-      StringSpecs::MyString.new("blablabla").byterindex("bla").should == 6
-      StringSpecs::MyString.new("blablabla").byterindex(StringSpecs::MyString.new("bla")).should == 6
-    end
+  it "ignores string subclasses" do
+    "blablabla".byterindex(StringSpecs::MyString.new("bla")).should == 6
+    StringSpecs::MyString.new("blablabla").byterindex("bla").should == 6
+    StringSpecs::MyString.new("blablabla").byterindex(StringSpecs::MyString.new("bla")).should == 6
+  end
 
-    it "starts the search at the given offset" do
-      "blablabla".byterindex("bl", 0).should == 0
-      "blablabla".byterindex("bl", 1).should == 0
-      "blablabla".byterindex("bl", 2).should == 0
-      "blablabla".byterindex("bl", 3).should == 3
-
-      "blablabla".byterindex("bla", 0).should == 0
-      "blablabla".byterindex("bla", 1).should == 0
-      "blablabla".byterindex("bla", 2).should == 0
-      "blablabla".byterindex("bla", 3).should == 3
-
-      "blablabla".byterindex("blab", 0).should == 0
-      "blablabla".byterindex("blab", 1).should == 0
-      "blablabla".byterindex("blab", 2).should == 0
-      "blablabla".byterindex("blab", 3).should == 3
-      "blablabla".byterindex("blab", 6).should == 3
-      "blablablax".byterindex("blab", 6).should == 3
-
-      "blablabla".byterindex("la", 1).should == 1
-      "blablabla".byterindex("la", 2).should == 1
-      "blablabla".byterindex("la", 3).should == 1
-      "blablabla".byterindex("la", 4).should == 4
-
-      "blablabla".byterindex("lab", 1).should == 1
-      "blablabla".byterindex("lab", 2).should == 1
-      "blablabla".byterindex("lab", 3).should == 1
-      "blablabla".byterindex("lab", 4).should == 4
-
-      "blablabla".byterindex("ab", 2).should == 2
-      "blablabla".byterindex("ab", 3).should == 2
-      "blablabla".byterindex("ab", 4).should == 2
-      "blablabla".byterindex("ab", 5).should == 5
-
-      "blablabla".byterindex("", 0).should == 0
-      "blablabla".byterindex("", 1).should == 1
-      "blablabla".byterindex("", 2).should == 2
-      "blablabla".byterindex("", 7).should == 7
-      "blablabla".byterindex("", 8).should == 8
-      "blablabla".byterindex("", 9).should == 9
-      "blablabla".byterindex("", 10).should == 9
-    end
+  it "starts the search at the given offset" do
+    "blablabla".byterindex("bl", 0).should == 0
+    "blablabla".byterindex("bl", 1).should == 0
+    "blablabla".byterindex("bl", 2).should == 0
+    "blablabla".byterindex("bl", 3).should == 3
+
+    "blablabla".byterindex("bla", 0).should == 0
+    "blablabla".byterindex("bla", 1).should == 0
+    "blablabla".byterindex("bla", 2).should == 0
+    "blablabla".byterindex("bla", 3).should == 3
+
+    "blablabla".byterindex("blab", 0).should == 0
+    "blablabla".byterindex("blab", 1).should == 0
+    "blablabla".byterindex("blab", 2).should == 0
+    "blablabla".byterindex("blab", 3).should == 3
+    "blablabla".byterindex("blab", 6).should == 3
+    "blablablax".byterindex("blab", 6).should == 3
+
+    "blablabla".byterindex("la", 1).should == 1
+    "blablabla".byterindex("la", 2).should == 1
+    "blablabla".byterindex("la", 3).should == 1
+    "blablabla".byterindex("la", 4).should == 4
+
+    "blablabla".byterindex("lab", 1).should == 1
+    "blablabla".byterindex("lab", 2).should == 1
+    "blablabla".byterindex("lab", 3).should == 1
+    "blablabla".byterindex("lab", 4).should == 4
+
+    "blablabla".byterindex("ab", 2).should == 2
+    "blablabla".byterindex("ab", 3).should == 2
+    "blablabla".byterindex("ab", 4).should == 2
+    "blablabla".byterindex("ab", 5).should == 5
+
+    "blablabla".byterindex("", 0).should == 0
+    "blablabla".byterindex("", 1).should == 1
+    "blablabla".byterindex("", 2).should == 2
+    "blablabla".byterindex("", 7).should == 7
+    "blablabla".byterindex("", 8).should == 8
+    "blablabla".byterindex("", 9).should == 9
+    "blablabla".byterindex("", 10).should == 9
+  end
 
-    it "starts the search at offset + self.length if offset is negative" do
-      str = "blablabla"
+  it "starts the search at offset + self.length if offset is negative" do
+    str = "blablabla"
 
-      ["bl", "bla", "blab", "la", "lab", "ab", ""].each do |needle|
-        (-str.length .. -1).each do |offset|
-          str.byterindex(needle, offset).should ==
-          str.byterindex(needle, offset + str.length)
-        end
+    ["bl", "bla", "blab", "la", "lab", "ab", ""].each do |needle|
+      (-str.length .. -1).each do |offset|
+        str.byterindex(needle, offset).should ==
+        str.byterindex(needle, offset + str.length)
       end
     end
+  end
 
-    it "returns nil if the substring isn't found" do
-      "blablabla".byterindex("B").should == nil
-      "blablabla".byterindex("z").should == nil
-      "blablabla".byterindex("BLA").should == nil
-      "blablabla".byterindex("blablablabla").should == nil
+  it "returns nil if the substring isn't found" do
+    "blablabla".byterindex("B").should == nil
+    "blablabla".byterindex("z").should == nil
+    "blablabla".byterindex("BLA").should == nil
+    "blablabla".byterindex("blablablabla").should == nil
 
-      "hello".byterindex("lo", 0).should == nil
-      "hello".byterindex("lo", 1).should == nil
-      "hello".byterindex("lo", 2).should == nil
+    "hello".byterindex("lo", 0).should == nil
+    "hello".byterindex("lo", 1).should == nil
+    "hello".byterindex("lo", 2).should == nil
 
-      "hello".byterindex("llo", 0).should == nil
-      "hello".byterindex("llo", 1).should == nil
+    "hello".byterindex("llo", 0).should == nil
+    "hello".byterindex("llo", 1).should == nil
 
-      "hello".byterindex("el", 0).should == nil
-      "hello".byterindex("ello", 0).should == nil
+    "hello".byterindex("el", 0).should == nil
+    "hello".byterindex("ello", 0).should == nil
 
-      "hello".byterindex("", -6).should == nil
-      "hello".byterindex("", -7).should == nil
+    "hello".byterindex("", -6).should == nil
+    "hello".byterindex("", -7).should == nil
 
-      "hello".byterindex("h", -6).should == nil
-    end
+    "hello".byterindex("h", -6).should == nil
+  end
 
-    it "tries to convert start_offset to an integer via to_int" do
-      obj = mock('5')
-      def obj.to_int() 5 end
-      "str".byterindex("st", obj).should == 0
+  it "tries to convert start_offset to an integer via to_int" do
+    obj = mock('5')
+    def obj.to_int() 5 end
+    "str".byterindex("st", obj).should == 0
 
-      obj = mock('5')
-      def obj.respond_to?(arg, *) true end
-      def obj.method_missing(*args) 5 end
-      "str".byterindex("st", obj).should == 0
-    end
+    obj = mock('5')
+    def obj.respond_to?(arg, *) true end
+    def obj.method_missing(*args) 5 end
+    "str".byterindex("st", obj).should == 0
+  end
 
-    it "raises a TypeError when given offset is nil" do
-      -> { "str".byterindex("st", nil) }.should raise_error(TypeError)
-    end
+  it "raises a TypeError when given offset is nil" do
+    -> { "str".byterindex("st", nil) }.should raise_error(TypeError)
+  end
 
-    it "handles a substring in a superset encoding" do
-      'abc'.force_encoding(Encoding::US_ASCII).byterindex('é').should == nil
-    end
+  it "handles a substring in a superset encoding" do
+    'abc'.dup.force_encoding(Encoding::US_ASCII).byterindex('é').should == nil
+  end
 
-    it "handles a substring in a subset encoding" do
-      'été'.byterindex('t'.force_encoding(Encoding::US_ASCII)).should == 2
-    end
+  it "handles a substring in a subset encoding" do
+    'été'.byterindex('t'.dup.force_encoding(Encoding::US_ASCII)).should == 2
   end
 end
 
 describe "String#byterindex with Regexp" do
-  ruby_version_is "3.2" do
-    it "behaves the same as String#byterindex(string) for escaped string regexps" do
-      ["blablabla", "hello cruel world...!"].each do |str|
-        ["", "b", "bla", "lab", "o c", "d."].each do |needle|
-          regexp = Regexp.new(Regexp.escape(needle))
-          str.byterindex(regexp).should == str.byterindex(needle)
-
-          0.upto(str.size + 1) do |start|
-            str.byterindex(regexp, start).should == str.byterindex(needle, start)
-          end
-
-          (-str.size - 1).upto(-1) do |start|
-            str.byterindex(regexp, start).should == str.byterindex(needle, start)
-          end
+  it "behaves the same as String#byterindex(string) for escaped string regexps" do
+    ["blablabla", "hello cruel world...!"].each do |str|
+      ["", "b", "bla", "lab", "o c", "d."].each do |needle|
+        regexp = Regexp.new(Regexp.escape(needle))
+        str.byterindex(regexp).should == str.byterindex(needle)
+
+        0.upto(str.size + 1) do |start|
+          str.byterindex(regexp, start).should == str.byterindex(needle, start)
+        end
+
+        (-str.size - 1).upto(-1) do |start|
+          str.byterindex(regexp, start).should == str.byterindex(needle, start)
         end
       end
     end
+  end
 
-    it "returns the index of the first match from the end of string of regexp" do
-      "blablabla".byterindex(/bla/).should == 6
-      "blablabla".byterindex(/BLA/i).should == 6
-
-      "blablabla".byterindex(/.{0}/).should == 9
-      "blablabla".byterindex(/.{1}/).should == 8
-      "blablabla".byterindex(/.{2}/).should == 7
-      "blablabla".byterindex(/.{6}/).should == 3
-      "blablabla".byterindex(/.{9}/).should == 0
+  it "returns the index of the first match from the end of string of regexp" do
+    "blablabla".byterindex(/bla/).should == 6
+    "blablabla".byterindex(/BLA/i).should == 6
 
-      "blablabla".byterindex(/.*/).should == 9
-      "blablabla".byterindex(/.+/).should == 8
+    "blablabla".byterindex(/.{0}/).should == 9
+    "blablabla".byterindex(/.{1}/).should == 8
+    "blablabla".byterindex(/.{2}/).should == 7
+    "blablabla".byterindex(/.{6}/).should == 3
+    "blablabla".byterindex(/.{9}/).should == 0
 
-      "blablabla".byterindex(/bla|a/).should == 8
+    "blablabla".byterindex(/.*/).should == 9
+    "blablabla".byterindex(/.+/).should == 8
 
-      not_supported_on :opal do
-        "blablabla".byterindex(/\A/).should == 0
-        "blablabla".byterindex(/\Z/).should == 9
-        "blablabla".byterindex(/\z/).should == 9
-        "blablabla\n".byterindex(/\Z/).should == 10
-        "blablabla\n".byterindex(/\z/).should == 10
-      end
+    "blablabla".byterindex(/bla|a/).should == 8
 
-      "blablabla".byterindex(/^/).should == 0
-      not_supported_on :opal do
-        "\nblablabla".byterindex(/^/).should == 1
-        "b\nlablabla".byterindex(/^/).should == 2
-      end
-      "blablabla".byterindex(/$/).should == 9
-
-      "blablabla".byterindex(/.l./).should == 6
+    not_supported_on :opal do
+      "blablabla".byterindex(/\A/).should == 0
+      "blablabla".byterindex(/\Z/).should == 9
+      "blablabla".byterindex(/\z/).should == 9
+      "blablabla\n".byterindex(/\Z/).should == 10
+      "blablabla\n".byterindex(/\z/).should == 10
     end
 
-    it "starts the search at the given offset" do
-      "blablabla".byterindex(/.{0}/, 5).should == 5
-      "blablabla".byterindex(/.{1}/, 5).should == 5
-      "blablabla".byterindex(/.{2}/, 5).should == 5
-      "blablabla".byterindex(/.{3}/, 5).should == 5
-      "blablabla".byterindex(/.{4}/, 5).should == 5
-
-      "blablabla".byterindex(/.{0}/, 3).should == 3
-      "blablabla".byterindex(/.{1}/, 3).should == 3
-      "blablabla".byterindex(/.{2}/, 3).should == 3
-      "blablabla".byterindex(/.{5}/, 3).should == 3
-      "blablabla".byterindex(/.{6}/, 3).should == 3
-
-      "blablabla".byterindex(/.l./, 0).should == 0
-      "blablabla".byterindex(/.l./, 1).should == 0
-      "blablabla".byterindex(/.l./, 2).should == 0
-      "blablabla".byterindex(/.l./, 3).should == 3
-
-      "blablablax".byterindex(/.x/, 10).should == 8
-      "blablablax".byterindex(/.x/, 9).should == 8
-      "blablablax".byterindex(/.x/, 8).should == 8
-
-      "blablablax".byterindex(/..x/, 10).should == 7
-      "blablablax".byterindex(/..x/, 9).should == 7
-      "blablablax".byterindex(/..x/, 8).should == 7
-      "blablablax".byterindex(/..x/, 7).should == 7
-
-      not_supported_on :opal do
-        "blablabla\n".byterindex(/\Z/, 9).should == 9
-      end
+    "blablabla".byterindex(/^/).should == 0
+    not_supported_on :opal do
+      "\nblablabla".byterindex(/^/).should == 1
+      "b\nlablabla".byterindex(/^/).should == 2
     end
+    "blablabla".byterindex(/$/).should == 9
 
-    it "starts the search at offset + self.length if offset is negative" do
-      str = "blablabla"
+    "blablabla".byterindex(/.l./).should == 6
+  end
 
-      ["bl", "bla", "blab", "la", "lab", "ab", ""].each do |needle|
-        (-str.length .. -1).each do |offset|
-          str.byterindex(needle, offset).should ==
-          str.byterindex(needle, offset + str.length)
-        end
-      end
+  it "starts the search at the given offset" do
+    "blablabla".byterindex(/.{0}/, 5).should == 5
+    "blablabla".byterindex(/.{1}/, 5).should == 5
+    "blablabla".byterindex(/.{2}/, 5).should == 5
+    "blablabla".byterindex(/.{3}/, 5).should == 5
+    "blablabla".byterindex(/.{4}/, 5).should == 5
+
+    "blablabla".byterindex(/.{0}/, 3).should == 3
+    "blablabla".byterindex(/.{1}/, 3).should == 3
+    "blablabla".byterindex(/.{2}/, 3).should == 3
+    "blablabla".byterindex(/.{5}/, 3).should == 3
+    "blablabla".byterindex(/.{6}/, 3).should == 3
+
+    "blablabla".byterindex(/.l./, 0).should == 0
+    "blablabla".byterindex(/.l./, 1).should == 0
+    "blablabla".byterindex(/.l./, 2).should == 0
+    "blablabla".byterindex(/.l./, 3).should == 3
+
+    "blablablax".byterindex(/.x/, 10).should == 8
+    "blablablax".byterindex(/.x/, 9).should == 8
+    "blablablax".byterindex(/.x/, 8).should == 8
+
+    "blablablax".byterindex(/..x/, 10).should == 7
+    "blablablax".byterindex(/..x/, 9).should == 7
+    "blablablax".byterindex(/..x/, 8).should == 7
+    "blablablax".byterindex(/..x/, 7).should == 7
+
+    not_supported_on :opal do
+      "blablabla\n".byterindex(/\Z/, 9).should == 9
     end
+  end
 
-    it "returns nil if the substring isn't found" do
-      "blablabla".byterindex(/BLA/).should == nil
-      "blablabla".byterindex(/.{10}/).should == nil
-      "blablablax".byterindex(/.x/, 7).should == nil
-      "blablablax".byterindex(/..x/, 6).should == nil
+  it "starts the search at offset + self.length if offset is negative" do
+    str = "blablabla"
 
-      not_supported_on :opal do
-        "blablabla".byterindex(/\Z/, 5).should == nil
-        "blablabla".byterindex(/\z/, 5).should == nil
-        "blablabla\n".byterindex(/\z/, 9).should == nil
+    ["bl", "bla", "blab", "la", "lab", "ab", ""].each do |needle|
+      (-str.length .. -1).each do |offset|
+        str.byterindex(needle, offset).should ==
+        str.byterindex(needle, offset + str.length)
       end
     end
+  end
+
+  it "returns nil if the substring isn't found" do
+    "blablabla".byterindex(/BLA/).should == nil
+    "blablabla".byterindex(/.{10}/).should == nil
+    "blablablax".byterindex(/.x/, 7).should == nil
+    "blablablax".byterindex(/..x/, 6).should == nil
 
     not_supported_on :opal do
-      it "supports \\G which matches at the given start offset" do
-        "helloYOU.".byterindex(/YOU\G/, 8).should == 5
-        "helloYOU.".byterindex(/YOU\G/).should == nil
-
-        idx = "helloYOUall!".index("YOU")
-        re = /YOU.+\G.+/
-        # The # marks where \G will match.
-        [
-          ["helloYOU#all.", nil],
-          ["helloYOUa#ll.", idx],
-          ["helloYOUal#l.", idx],
-          ["helloYOUall#.", idx],
-          ["helloYOUall.#", nil]
-        ].each do |i|
-          start = i[0].index("#")
-          str = i[0].delete("#")
-
-          str.byterindex(re, start).should == i[1]
-        end
+      "blablabla".byterindex(/\Z/, 5).should == nil
+      "blablabla".byterindex(/\z/, 5).should == nil
+      "blablabla\n".byterindex(/\z/, 9).should == nil
+    end
+  end
+
+  not_supported_on :opal do
+    it "supports \\G which matches at the given start offset" do
+      "helloYOU.".byterindex(/YOU\G/, 8).should == 5
+      "helloYOU.".byterindex(/YOU\G/).should == nil
+
+      idx = "helloYOUall!".index("YOU")
+      re = /YOU.+\G.+/
+      # The # marks where \G will match.
+      [
+        ["helloYOU#all.", nil],
+        ["helloYOUa#ll.", idx],
+        ["helloYOUal#l.", idx],
+        ["helloYOUall#.", idx],
+        ["helloYOUall.#", nil]
+      ].each do |i|
+        start = i[0].index("#")
+        str = i[0].delete("#")
+
+        str.byterindex(re, start).should == i[1]
       end
     end
+  end
 
-    it "tries to convert start_offset to an integer" do
-      obj = mock('5')
-      def obj.to_int() 5 end
-      "str".byterindex(/../, obj).should == 1
+  it "tries to convert start_offset to an integer" do
+    obj = mock('5')
+    def obj.to_int() 5 end
+    "str".byterindex(/../, obj).should == 1
 
-      obj = mock('5')
-      def obj.respond_to?(arg, *) true end
-      def obj.method_missing(*args); 5; end
-      "str".byterindex(/../, obj).should == 1
-    end
+    obj = mock('5')
+    def obj.respond_to?(arg, *) true end
+    def obj.method_missing(*args); 5; end
+    "str".byterindex(/../, obj).should == 1
+  end
 
-    it "raises a TypeError when given offset is nil" do
-      -> { "str".byterindex(/../, nil) }.should raise_error(TypeError)
-    end
+  it "raises a TypeError when given offset is nil" do
+    -> { "str".byterindex(/../, nil) }.should raise_error(TypeError)
+  end
 
-    it "returns the reverse byte index of a multibyte character" do
-      "ありがりがとう".byterindex("が").should == 12
-      "ありがりがとう".byterindex(/が/).should == 12
-    end
+  it "returns the reverse byte index of a multibyte character" do
+    "ありがりがとう".byterindex("が").should == 12
+    "ありがりがとう".byterindex(/が/).should == 12
+  end
 
-    it "returns the character index before the finish" do
-       "ありがりがとう".byterindex("が", 9).should == 6
-       "ありがりがとう".byterindex(/が/, 9).should == 6
-    end
+  it "returns the character index before the finish" do
+    "ありがりがとう".byterindex("が", 9).should == 6
+    "ありがりがとう".byterindex(/が/, 9).should == 6
   end
 end
diff --git a/spec/ruby/core/string/bytes_spec.rb b/spec/ruby/core/string/bytes_spec.rb
index 859b3465506d81..02151eebbcc678 100644
--- a/spec/ruby/core/string/bytes_spec.rb
+++ b/spec/ruby/core/string/bytes_spec.rb
@@ -50,6 +50,6 @@
   end
 
   it "is unaffected by #force_encoding" do
-    @utf8.force_encoding('ASCII').bytes.to_a.should == @utf8.bytes.to_a
+    @utf8.dup.force_encoding('ASCII').bytes.to_a.should == @utf8.bytes.to_a
   end
 end
diff --git a/spec/ruby/core/string/bytesize_spec.rb b/spec/ruby/core/string/bytesize_spec.rb
index a31f3ae67165aa..2bbefc08207b2a 100644
--- a/spec/ruby/core/string/bytesize_spec.rb
+++ b/spec/ruby/core/string/bytesize_spec.rb
@@ -13,21 +13,21 @@
   end
 
   it "works with pseudo-ASCII strings containing single UTF-8 characters" do
-    "\u{6666}".force_encoding('ASCII').bytesize.should == 3
+    "\u{6666}".dup.force_encoding('ASCII').bytesize.should == 3
   end
 
   it "works with strings containing UTF-8 characters" do
-    "c \u{6666}".force_encoding('UTF-8').bytesize.should == 5
+    "c \u{6666}".dup.force_encoding('UTF-8').bytesize.should == 5
     "c \u{6666}".bytesize.should == 5
   end
 
   it "works with pseudo-ASCII strings containing UTF-8 characters" do
-    "c \u{6666}".force_encoding('ASCII').bytesize.should == 5
+    "c \u{6666}".dup.force_encoding('ASCII').bytesize.should == 5
   end
 
   it "returns 0 for the empty string" do
     "".bytesize.should == 0
-    "".force_encoding('ASCII').bytesize.should == 0
-    "".force_encoding('UTF-8').bytesize.should == 0
+    "".dup.force_encoding('ASCII').bytesize.should == 0
+    "".dup.force_encoding('UTF-8').bytesize.should == 0
   end
 end
diff --git a/spec/ruby/core/string/byteslice_spec.rb b/spec/ruby/core/string/byteslice_spec.rb
index 312229523de6f8..4ad9e8d8f191a4 100644
--- a/spec/ruby/core/string/byteslice_spec.rb
+++ b/spec/ruby/core/string/byteslice_spec.rb
@@ -1,4 +1,4 @@
-# -*- encoding: binary -*-
+# encoding: binary
 require_relative '../../spec_helper'
 require_relative 'fixtures/classes'
 require_relative 'shared/slice'
@@ -17,12 +17,12 @@
   it_behaves_like :string_slice_range, :byteslice
 end
 
-describe "String#byteslice on on non ASCII strings" do
+describe "String#byteslice on non ASCII strings" do
   it "returns byteslice of unicode strings" do
-    "\u3042".byteslice(1).should == "\x81".force_encoding("UTF-8")
-    "\u3042".byteslice(1, 2).should == "\x81\x82".force_encoding("UTF-8")
-    "\u3042".byteslice(1..2).should == "\x81\x82".force_encoding("UTF-8")
-    "\u3042".byteslice(-1).should == "\x82".force_encoding("UTF-8")
+    "\u3042".byteslice(1).should == "\x81".dup.force_encoding("UTF-8")
+    "\u3042".byteslice(1, 2).should == "\x81\x82".dup.force_encoding("UTF-8")
+    "\u3042".byteslice(1..2).should == "\x81\x82".dup.force_encoding("UTF-8")
+    "\u3042".byteslice(-1).should == "\x82".dup.force_encoding("UTF-8")
   end
 
   it "returns a String in the same encoding as self" do
diff --git a/spec/ruby/core/string/bytesplice_spec.rb b/spec/ruby/core/string/bytesplice_spec.rb
index f13024a79b45b9..2c770e340aad27 100644
--- a/spec/ruby/core/string/bytesplice_spec.rb
+++ b/spec/ruby/core/string/bytesplice_spec.rb
@@ -1,132 +1,293 @@
 # -*- encoding: utf-8 -*-
+# frozen_string_literal: false
 require_relative '../../spec_helper'
 
 describe "String#bytesplice" do
-  ruby_version_is "3.2" do
-    it "raises IndexError when index is less than -bytesize" do
-      -> { "hello".bytesplice(-6, 0, "xxx") }.should raise_error(IndexError, "index -6 out of string")
+  it "raises IndexError when index is less than -bytesize" do
+    -> { "hello".bytesplice(-6, 0, "xxx") }.should raise_error(IndexError, "index -6 out of string")
+  end
+
+  it "raises IndexError when index is greater than bytesize" do
+    -> { "hello".bytesplice(6, 0, "xxx") }.should raise_error(IndexError, "index 6 out of string")
+  end
+
+  it "raises IndexError for negative length" do
+    -> { "abc".bytesplice(0, -2, "") }.should raise_error(IndexError, "negative length -2")
+  end
+
+  it "replaces with integer indices" do
+    "hello".bytesplice(-5, 0, "xxx").should == "xxxhello"
+    "hello".bytesplice(0, 0, "xxx").should == "xxxhello"
+    "hello".bytesplice(0, 1, "xxx").should == "xxxello"
+    "hello".bytesplice(0, 5, "xxx").should == "xxx"
+    "hello".bytesplice(0, 6, "xxx").should == "xxx"
+  end
+
+  it "raises RangeError when range left boundary is less than -bytesize" do
+    -> { "hello".bytesplice(-6...-6, "xxx") }.should raise_error(RangeError, "-6...-6 out of range")
+  end
+
+  it "replaces with ranges" do
+    "hello".bytesplice(-5...-5, "xxx").should == "xxxhello"
+    "hello".bytesplice(0...0, "xxx").should == "xxxhello"
+    "hello".bytesplice(0..0, "xxx").should == "xxxello"
+    "hello".bytesplice(0...1, "xxx").should == "xxxello"
+    "hello".bytesplice(0..1, "xxx").should == "xxxllo"
+    "hello".bytesplice(0..-1, "xxx").should == "xxx"
+    "hello".bytesplice(0...5, "xxx").should == "xxx"
+    "hello".bytesplice(0...6, "xxx").should == "xxx"
+  end
+
+  it "raises TypeError when integer index is provided without length argument" do
+    -> { "hello".bytesplice(0, "xxx") }.should raise_error(TypeError, "wrong argument type Integer (expected Range)")
+  end
+
+  it "replaces on an empty string" do
+    "".bytesplice(0, 0, "").should == ""
+    "".bytesplice(0, 0, "xxx").should == "xxx"
+  end
+
+  it "mutates self" do
+    s = "hello"
+    s.bytesplice(2, 1, "xxx").should.equal?(s)
+  end
+
+  it "raises when string is frozen" do
+    s = "hello".freeze
+    -> { s.bytesplice(2, 1, "xxx") }.should raise_error(FrozenError, "can't modify frozen String: \"hello\"")
+  end
+
+  ruby_version_is "3.3" do
+    it "raises IndexError when str_index is less than -bytesize" do
+      -> { "hello".bytesplice(2, 1, "HELLO", -6, 0) }.should raise_error(IndexError, "index -6 out of string")
     end
 
-    it "raises IndexError when index is greater than bytesize" do
-      -> { "hello".bytesplice(6, 0, "xxx") }.should raise_error(IndexError, "index 6 out of string")
+    it "raises IndexError when str_index is greater than bytesize" do
+      -> { "hello".bytesplice(2, 1, "HELLO", 6, 0) }.should raise_error(IndexError, "index 6 out of string")
     end
 
-    it "raises IndexError for negative length" do
-      -> { "abc".bytesplice(0, -2, "") }.should raise_error(IndexError, "negative length -2")
+    it "raises IndexError for negative str length" do
+      -> { "abc".bytesplice(0, 1, "", 0, -2) }.should raise_error(IndexError, "negative length -2")
     end
 
-    it "replaces with integer indices" do
-      "hello".bytesplice(-5, 0, "xxx").should == "xxxhello"
-      "hello".bytesplice(0, 0, "xxx").should == "xxxhello"
-      "hello".bytesplice(0, 1, "xxx").should == "xxxello"
-      "hello".bytesplice(0, 5, "xxx").should == "xxx"
-      "hello".bytesplice(0, 6, "xxx").should == "xxx"
+    it "replaces with integer str indices" do
+      "hello".bytesplice(1, 2, "HELLO", -5, 0).should == "hlo"
+      "hello".bytesplice(1, 2, "HELLO", 0, 0).should == "hlo"
+      "hello".bytesplice(1, 2, "HELLO", 0, 1).should == "hHlo"
+      "hello".bytesplice(1, 2, "HELLO", 0, 5).should == "hHELLOlo"
+      "hello".bytesplice(1, 2, "HELLO", 0, 6).should == "hHELLOlo"
     end
 
-    it "raises RangeError when range left boundary is less than -bytesize" do
-      -> { "hello".bytesplice(-6...-6, "xxx") }.should raise_error(RangeError, "-6...-6 out of range")
+    it "raises RangeError when str range left boundary is less than -bytesize" do
+      -> { "hello".bytesplice(0..1, "HELLO", -6...-6) }.should raise_error(RangeError, "-6...-6 out of range")
     end
 
-    it "replaces with ranges" do
-      "hello".bytesplice(-5...-5, "xxx").should == "xxxhello"
-      "hello".bytesplice(0...0, "xxx").should == "xxxhello"
-      "hello".bytesplice(0..0, "xxx").should == "xxxello"
-      "hello".bytesplice(0...1, "xxx").should == "xxxello"
-      "hello".bytesplice(0..1, "xxx").should == "xxxllo"
-      "hello".bytesplice(0..-1, "xxx").should == "xxx"
-      "hello".bytesplice(0...5, "xxx").should == "xxx"
-      "hello".bytesplice(0...6, "xxx").should == "xxx"
+    it "replaces with str ranges" do
+      "hello".bytesplice(1..2, "HELLO", -5...-5).should == "hlo"
+      "hello".bytesplice(1..2, "HELLO", 0...0).should == "hlo"
+      "hello".bytesplice(1..2, "HELLO", 0..0).should == "hHlo"
+      "hello".bytesplice(1..2, "HELLO", 0...1).should == "hHlo"
+      "hello".bytesplice(1..2, "HELLO", 0..1).should == "hHElo"
+      "hello".bytesplice(1..2, "HELLO", 0..-1).should == "hHELLOlo"
+      "hello".bytesplice(1..2, "HELLO", 0...5).should == "hHELLOlo"
+      "hello".bytesplice(1..2, "HELLO", 0...6).should == "hHELLOlo"
     end
 
-    it "raises TypeError when integer index is provided without length argument" do
-      -> { "hello".bytesplice(0, "xxx") }.should raise_error(TypeError, "wrong argument type Integer (expected Range)")
+    it "raises ArgumentError when integer str index is provided without str length argument" do
+      -> { "hello".bytesplice(0, 1, "xxx", 0) }.should raise_error(ArgumentError, "wrong number of arguments (given 4, expected 2, 3, or 5)")
     end
 
-    it "replaces on an empty string" do
-      "".bytesplice(0, 0, "").should == ""
-      "".bytesplice(0, 0, "xxx").should == "xxx"
+    it "replaces on an empty string with str index/length" do
+      "".bytesplice(0, 0, "", 0, 0).should == ""
+      "".bytesplice(0, 0, "xxx", 0, 1).should == "x"
     end
 
-    it "mutates self" do
+    it "mutates self with substring and str index/length" do
       s = "hello"
-      s.bytesplice(2, 1, "xxx").should.equal?(s)
+      s.bytesplice(2, 1, "xxx", 1, 2).should.equal?(s)
+      s.should.eql?("hexxlo")
     end
 
-    it "raises when string is frozen" do
+    it "raises when string is frozen and str index/length" do
       s = "hello".freeze
-      -> { s.bytesplice(2, 1, "xxx") }.should raise_error(FrozenError, "can't modify frozen String: \"hello\"")
+      -> { s.bytesplice(2, 1, "xxx", 0, 1) }.should raise_error(FrozenError, "can't modify frozen String: \"hello\"")
+    end
+
+    it "replaces on an empty string with str range" do
+      "".bytesplice(0..0, "", 0..0).should == ""
+      "".bytesplice(0..0, "xyz", 0..1).should == "xy"
+    end
+
+    it "mutates self with substring and str range" do
+      s = "hello"
+      s.bytesplice(2..2, "xyz", 1..2).should.equal?(s)
+      s.should.eql?("heyzlo")
+    end
+
+    it "raises when string is frozen and str range" do
+      s = "hello".freeze
+      -> { s.bytesplice(2..2, "yzx", 0..1) }.should raise_error(FrozenError, "can't modify frozen String: \"hello\"")
     end
   end
 end
 
 describe "String#bytesplice with multibyte characters" do
-  ruby_version_is "3.2" do
-    it "raises IndexError when index is out of byte size boundary" do
-      -> { "こんにちは".bytesplice(-16, 0, "xxx") }.should raise_error(IndexError, "index -16 out of string")
+  it "raises IndexError when index is out of byte size boundary" do
+    -> { "こんにちは".bytesplice(-16, 0, "xxx") }.should raise_error(IndexError, "index -16 out of string")
+  end
+
+  it "raises IndexError when index is not on a codepoint boundary" do
+    -> { "こんにちは".bytesplice(1, 0, "xxx") }.should raise_error(IndexError, "offset 1 does not land on character boundary")
+  end
+
+  it "raises IndexError when length is not matching the codepoint boundary" do
+    -> { "こんにちは".bytesplice(0, 1, "xxx") }.should raise_error(IndexError, "offset 1 does not land on character boundary")
+    -> { "こんにちは".bytesplice(0, 2, "xxx") }.should raise_error(IndexError, "offset 2 does not land on character boundary")
+  end
+
+  it "replaces with integer indices" do
+    "こんにちは".bytesplice(-15, 0, "xxx").should == "xxxこんにちは"
+    "こんにちは".bytesplice(0, 0, "xxx").should == "xxxこんにちは"
+    "こんにちは".bytesplice(0, 3, "xxx").should == "xxxんにちは"
+    "こんにちは".bytesplice(3, 3, "はは").should == "こははにちは"
+    "こんにちは".bytesplice(15, 0, "xxx").should == "こんにちはxxx"
+  end
+
+  it "replaces with range" do
+    "こんにちは".bytesplice(-15...-16, "xxx").should == "xxxこんにちは"
+    "こんにちは".bytesplice(0...0, "xxx").should == "xxxこんにちは"
+    "こんにちは".bytesplice(0..2, "xxx").should == "xxxんにちは"
+    "こんにちは".bytesplice(0...3, "xxx").should == "xxxんにちは"
+    "こんにちは".bytesplice(0..5, "xxx").should == "xxxにちは"
+    "こんにちは".bytesplice(0..-1, "xxx").should == "xxx"
+    "こんにちは".bytesplice(0...15, "xxx").should == "xxx"
+    "こんにちは".bytesplice(0...18, "xxx").should == "xxx"
+  end
+
+  it "treats negative length for range as 0" do
+    "こんにちは".bytesplice(0...-100, "xxx").should == "xxxこんにちは"
+    "こんにちは".bytesplice(3...-100, "xxx").should == "こxxxんにちは"
+    "こんにちは".bytesplice(-15...-100, "xxx").should == "xxxこんにちは"
+  end
+
+  it "raises when ranges not match codepoint boundaries" do
+    -> { "こんにちは".bytesplice(0..0, "x") }.should raise_error(IndexError, "offset 1 does not land on character boundary")
+    -> { "こんにちは".bytesplice(0..1, "x") }.should raise_error(IndexError, "offset 2 does not land on character boundary")
+    # Begin is incorrect
+    -> { "こんにちは".bytesplice(-4..-1, "x") }.should raise_error(IndexError, "offset 11 does not land on character boundary")
+    -> { "こんにちは".bytesplice(-5..-1, "x") }.should raise_error(IndexError, "offset 10 does not land on character boundary")
+    # End is incorrect
+    -> { "こんにちは".bytesplice(-3..-2, "x") }.should raise_error(IndexError, "offset 14 does not land on character boundary")
+    -> { "こんにちは".bytesplice(-3..-3, "x") }.should raise_error(IndexError, "offset 13 does not land on character boundary")
+  end
+
+  it "deals with a different encoded argument" do
+    s = "こんにちは"
+    s.encoding.should == Encoding::UTF_8
+    sub = "xxxxxx"
+    sub.force_encoding(Encoding::US_ASCII)
+
+    result = s.bytesplice(0, 3, sub)
+    result.should == "xxxxxxんにちは"
+    result.encoding.should == Encoding::UTF_8
+
+    s = "xxxxxx"
+    s.force_encoding(Encoding::US_ASCII)
+    sub = "こんにちは"
+    sub.encoding.should == Encoding::UTF_8
+
+    result = s.bytesplice(0, 3, sub)
+    result.should == "こんにちはxxx"
+    result.encoding.should == Encoding::UTF_8
+  end
+
+  ruby_version_is "3.3" do
+    it "raises IndexError when str_index is out of byte size boundary" do
+      -> { "こんにちは".bytesplice(3, 3, "こんにちは", -16, 0) }.should raise_error(IndexError, "index -16 out of string")
     end
 
-    it "raises IndexError when index is not on a codepoint boundary" do
-      -> { "こんにちは".bytesplice(1, 0, "xxx") }.should raise_error(IndexError, "offset 1 does not land on character boundary")
+    it "raises IndexError when str_index is not on a codepoint boundary" do
+      -> { "こんにちは".bytesplice(3, 3, "こんにちは", 1, 0) }.should raise_error(IndexError, "offset 1 does not land on character boundary")
     end
 
-    it "raises IndexError when length is not matching the codepoint boundary" do
-      -> { "こんにちは".bytesplice(0, 1, "xxx") }.should raise_error(IndexError, "offset 1 does not land on character boundary")
-      -> { "こんにちは".bytesplice(0, 2, "xxx") }.should raise_error(IndexError, "offset 2 does not land on character boundary")
+    it "raises IndexError when str_length is not matching the codepoint boundary" do
+      -> { "こんにちは".bytesplice(3, 3, "こんにちは", 0, 1) }.should raise_error(IndexError, "offset 1 does not land on character boundary")
+      -> { "こんにちは".bytesplice(3, 3, "こんにちは", 0, 2) }.should raise_error(IndexError, "offset 2 does not land on character boundary")
     end
 
-    it "replaces with integer indices" do
-      "こんにちは".bytesplice(-15, 0, "xxx").should == "xxxこんにちは"
-      "こんにちは".bytesplice(0, 0, "xxx").should == "xxxこんにちは"
-      "こんにちは".bytesplice(0, 3, "xxx").should == "xxxんにちは"
-      "こんにちは".bytesplice(3, 3, "はは").should == "こははにちは"
-      "こんにちは".bytesplice(15, 0, "xxx").should == "こんにちはxxx"
+    it "replaces with integer str indices" do
+      "こんにちは".bytesplice(3, 3, "こんにちは", -15, 0).should == "こにちは"
+      "こんにちは".bytesplice(3, 3, "こんにちは", 0, 0).should == "こにちは"
+      "こんにちは".bytesplice(3, 3, "こんにちは", 0, 3).should == "ここにちは"
+      "こんにちは".bytesplice(3, 3, "はは", 3, 3).should == "こはにちは"
+      "こんにちは".bytesplice(3, 3, "こんにちは", 15, 0).should == "こにちは"
     end
 
-    it "replaces with range" do
-      "こんにちは".bytesplice(-15...-16, "xxx").should == "xxxこんにちは"
-      "こんにちは".bytesplice(0...0, "xxx").should == "xxxこんにちは"
-      "こんにちは".bytesplice(0..2, "xxx").should == "xxxんにちは"
-      "こんにちは".bytesplice(0...3, "xxx").should == "xxxんにちは"
-      "こんにちは".bytesplice(0..5, "xxx").should == "xxxにちは"
-      "こんにちは".bytesplice(0..-1, "xxx").should == "xxx"
-      "こんにちは".bytesplice(0...15, "xxx").should == "xxx"
-      "こんにちは".bytesplice(0...18, "xxx").should == "xxx"
+    it "replaces with str range" do
+      "こんにちは".bytesplice(0..2, "こんにちは", -15...-16).should == "んにちは"
+      "こんにちは".bytesplice(0..2, "こんにちは", 0...0).should == "んにちは"
+      "こんにちは".bytesplice(0..2, "こんにちは", 3..5).should == "んんにちは"
+      "こんにちは".bytesplice(0..2, "こんにちは", 3...6).should == "んんにちは"
+      "こんにちは".bytesplice(0..2, "こんにちは", 3..8).should == "んにんにちは"
+      "こんにちは".bytesplice(0..2, "こんにちは", 0..-1).should == "こんにちはんにちは"
+      "こんにちは".bytesplice(0..2, "こんにちは", 0...15).should == "こんにちはんにちは"
+      "こんにちは".bytesplice(0..2, "こんにちは", 0...18).should == "こんにちはんにちは"
     end
 
-    it "treats negative length for range as 0" do
-      "こんにちは".bytesplice(0...-100, "xxx").should == "xxxこんにちは"
-      "こんにちは".bytesplice(3...-100, "xxx").should == "こxxxんにちは"
-      "こんにちは".bytesplice(-15...-100, "xxx").should == "xxxこんにちは"
+    it "treats negative length for str range as 0" do
+      "こんにちは".bytesplice(0..2, "こんにちは", 0...-100).should == "んにちは"
+      "こんにちは".bytesplice(0..2, "こんにちは", 3...-100).should == "んにちは"
+      "こんにちは".bytesplice(0..2, "こんにちは", -15...-100).should == "んにちは"
     end
 
-    it "raises when ranges not match codepoint boundaries" do
-      -> { "こんにちは".bytesplice(0..0, "x") }.should raise_error(IndexError, "offset 1 does not land on character boundary")
-      -> { "こんにちは".bytesplice(0..1, "x") }.should raise_error(IndexError, "offset 2 does not land on character boundary")
+    it "raises when ranges not match codepoint boundaries in str" do
+      -> { "こんにちは".bytesplice(3...3, "こ", 0..0) }.should raise_error(IndexError, "offset 1 does not land on character boundary")
+      -> { "こんにちは".bytesplice(3...3, "こ", 0..1) }.should raise_error(IndexError, "offset 2 does not land on character boundary")
       # Begin is incorrect
-      -> { "こんにちは".bytesplice(-4..-1, "x") }.should raise_error(IndexError, "offset 11 does not land on character boundary")
-      -> { "こんにちは".bytesplice(-5..-1, "x") }.should raise_error(IndexError, "offset 10 does not land on character boundary")
+      -> { "こんにちは".bytesplice(3...3, "こんにちは", -4..-1) }.should raise_error(IndexError, "offset 11 does not land on character boundary")
+      -> { "こんにちは".bytesplice(3...3, "こんにちは", -5..-1) }.should raise_error(IndexError, "offset 10 does not land on character boundary")
       # End is incorrect
-      -> { "こんにちは".bytesplice(-3..-2, "x") }.should raise_error(IndexError, "offset 14 does not land on character boundary")
-      -> { "こんにちは".bytesplice(-3..-3, "x") }.should raise_error(IndexError, "offset 13 does not land on character boundary")
+      -> { "こんにちは".bytesplice(3...3, "こんにちは", -3..-2) }.should raise_error(IndexError, "offset 14 does not land on character boundary")
+      -> { "こんにちは".bytesplice(3...3, "こんにちは", -3..-3) }.should raise_error(IndexError, "offset 13 does not land on character boundary")
     end
 
-    it "deals with a different encoded argument" do
+    it "deals with a different encoded argument with str index/length" do
       s = "こんにちは"
       s.encoding.should == Encoding::UTF_8
-      sub = "xxxxxx"
+      sub = "goodbye"
       sub.force_encoding(Encoding::US_ASCII)
 
-      result = s.bytesplice(0, 3, sub)
-      result.should == "xxxxxxんにちは"
+      result = s.bytesplice(3, 3, sub, 0, 3)
+      result.should == "こgooにちは"
       result.encoding.should == Encoding::UTF_8
 
-      s = "xxxxxx"
+      s = "hello"
+      s.force_encoding(Encoding::US_ASCII)
+      sub = "こんにちは"
+      sub.encoding.should == Encoding::UTF_8
+
+      result = s.bytesplice(1, 2, sub, 3, 3)
+      result.should == "hんlo"
+      result.encoding.should == Encoding::UTF_8
+    end
+
+    it "deals with a different encoded argument with str range" do
+      s = "こんにちは"
+      s.encoding.should == Encoding::UTF_8
+      sub = "goodbye"
+      sub.force_encoding(Encoding::US_ASCII)
+
+      result = s.bytesplice(3..5, sub, 0..2)
+      result.should == "こgooにちは"
+      result.encoding.should == Encoding::UTF_8
+
+      s = "hello"
       s.force_encoding(Encoding::US_ASCII)
       sub = "こんにちは"
       sub.encoding.should == Encoding::UTF_8
 
-      result = s.bytesplice(0, 3, sub)
-      result.should == "こんにちはxxx"
+      result = s.bytesplice(1..2, sub, 3..5)
+      result.should == "hんlo"
       result.encoding.should == Encoding::UTF_8
     end
   end
diff --git a/spec/ruby/core/string/capitalize_spec.rb b/spec/ruby/core/string/capitalize_spec.rb
index b79e9cfdbd7781..5e59b656c52d56 100644
--- a/spec/ruby/core/string/capitalize_spec.rb
+++ b/spec/ruby/core/string/capitalize_spec.rb
@@ -90,7 +90,7 @@
 
 describe "String#capitalize!" do
   it "capitalizes self in place" do
-    a = "hello"
+    a = +"hello"
     a.capitalize!.should equal(a)
     a.should == "Hello"
   end
@@ -103,13 +103,13 @@
 
   describe "full Unicode case mapping" do
     it "modifies self in place for all of Unicode with no option" do
-      a = "äöÜ"
+      a = +"äöÜ"
       a.capitalize!
       a.should == "Äöü"
     end
 
     it "only capitalizes the first resulting character when upcasing a character produces a multi-character sequence" do
-      a = "ß"
+      a = +"ß"
       a.capitalize!
       a.should == "Ss"
     end
@@ -121,7 +121,7 @@
     end
 
     it "updates string metadata" do
-      capitalized = "ßeT"
+      capitalized = +"ßeT"
       capitalized.capitalize!
 
       capitalized.should == "Sset"
@@ -133,7 +133,7 @@
 
   describe "modifies self in place for ASCII-only case mapping" do
     it "does not capitalize non-ASCII characters" do
-      a = "ßet"
+      a = +"ßet"
       a.capitalize!(:ascii)
       a.should == "ßet"
     end
@@ -147,13 +147,13 @@
 
   describe "modifies self in place for full Unicode case mapping adapted for Turkic languages" do
     it "capitalizes ASCII characters according to Turkic semantics" do
-      a = "iSa"
+      a = +"iSa"
       a.capitalize!(:turkic)
       a.should == "İsa"
     end
 
     it "allows Lithuanian as an extra option" do
-      a = "iSa"
+      a = +"iSa"
       a.capitalize!(:turkic, :lithuanian)
       a.should == "İsa"
     end
@@ -165,13 +165,13 @@
 
   describe "modifies self in place for full Unicode case mapping adapted for Lithuanian" do
     it "currently works the same as full Unicode case mapping" do
-      a = "iß"
+      a = +"iß"
       a.capitalize!(:lithuanian)
       a.should == "Iß"
     end
 
     it "allows Turkic as an extra option (and applies Turkic semantics)" do
-      a = "iß"
+      a = +"iß"
       a.capitalize!(:lithuanian, :turkic)
       a.should == "İß"
     end
@@ -190,12 +190,12 @@
   end
 
   it "returns nil when no changes are made" do
-    a = "Hello"
+    a = +"Hello"
     a.capitalize!.should == nil
     a.should == "Hello"
 
-    "".capitalize!.should == nil
-    "H".capitalize!.should == nil
+    (+"").capitalize!.should == nil
+    (+"H").capitalize!.should == nil
   end
 
   it "raises a FrozenError when self is frozen" do
diff --git a/spec/ruby/core/string/center_spec.rb b/spec/ruby/core/string/center_spec.rb
index a59dd2a91bc088..1667b59327d104 100644
--- a/spec/ruby/core/string/center_spec.rb
+++ b/spec/ruby/core/string/center_spec.rb
@@ -92,7 +92,7 @@
 
   describe "with width" do
     it "returns a String in the same encoding as the original" do
-      str = "abc".force_encoding Encoding::IBM437
+      str = "abc".dup.force_encoding Encoding::IBM437
       result = str.center 6
       result.should == " abc  "
       result.encoding.should equal(Encoding::IBM437)
@@ -101,7 +101,7 @@
 
   describe "with width, pattern" do
     it "returns a String in the compatible encoding" do
-      str = "abc".force_encoding Encoding::IBM437
+      str = "abc".dup.force_encoding Encoding::IBM437
       result = str.center 6, "あ"
       result.should == "あabcああ"
       result.encoding.should equal(Encoding::UTF_8)
diff --git a/spec/ruby/core/string/chilled_string_spec.rb b/spec/ruby/core/string/chilled_string_spec.rb
new file mode 100644
index 00000000000000..968e4ec1f0dfae
--- /dev/null
+++ b/spec/ruby/core/string/chilled_string_spec.rb
@@ -0,0 +1,143 @@
+require_relative '../../spec_helper'
+
+describe "chilled String" do
+  guard -> { ruby_version_is "3.4" and !"test".equal?("test") } do
+    describe "chilled string literals" do
+
+      describe "#frozen?" do
+        it "returns false" do
+          "chilled".frozen?.should == false
+        end
+      end
+
+      describe "#-@" do
+        it "returns a different instance" do
+          input = "chilled"
+          interned = (-input)
+          interned.frozen?.should == true
+          interned.object_id.should_not == input.object_id
+        end
+      end
+
+      describe "#+@" do
+        it "returns a different instance" do
+          input = "chilled"
+          duped = (+input)
+          duped.frozen?.should == false
+          duped.object_id.should_not == input.object_id
+        end
+      end
+
+      describe "#clone" do
+        it "preserves chilled status" do
+          input = "chilled".clone
+          -> {
+            input << "-mutated"
+          }.should complain(/literal string will be frozen in the future/)
+          input.should == "chilled-mutated"
+        end
+      end
+
+      describe "mutation" do
+        it "emits a warning" do
+          input = "chilled"
+          -> {
+            input << "-mutated"
+          }.should complain(/literal string will be frozen in the future/)
+          input.should == "chilled-mutated"
+        end
+
+        it "emits a warning on singleton_class creation" do
+          -> {
+            "chilled".singleton_class
+          }.should complain(/literal string will be frozen in the future/)
+        end
+
+        it "emits a warning on instance variable assignment" do
+          -> {
+            "chilled".instance_variable_set(:@ivar, 42)
+          }.should complain(/literal string will be frozen in the future/)
+        end
+
+        it "raises FrozenError after the string was explicitly frozen" do
+          input = "chilled"
+          input.freeze
+          -> {
+            -> {
+              input << "mutated"
+            }.should raise_error(FrozenError)
+          }.should_not complain(/literal string will be frozen in the future/)
+        end
+      end
+    end
+
+    describe "chilled strings returned by Symbol#to_s" do
+
+      describe "#frozen?" do
+        it "returns false" do
+          :chilled.to_s.frozen?.should == false
+        end
+      end
+
+      describe "#-@" do
+        it "returns a different instance" do
+          input = :chilled.to_s
+          interned = (-input)
+          interned.frozen?.should == true
+          interned.object_id.should_not == input.object_id
+        end
+      end
+
+      describe "#+@" do
+        it "returns a different instance" do
+          input = :chilled.to_s
+          duped = (+input)
+          duped.frozen?.should == false
+          duped.object_id.should_not == input.object_id
+        end
+      end
+
+      describe "#clone" do
+        it "preserves chilled status" do
+          input = :chilled.to_s.clone
+          -> {
+            input << "-mutated"
+          }.should complain(/string returned by :chilled\.to_s will be frozen in the future/)
+          input.should == "chilled-mutated"
+        end
+      end
+
+      describe "mutation" do
+        it "emits a warning" do
+          input = :chilled.to_s
+          -> {
+            input << "-mutated"
+          }.should complain(/string returned by :chilled\.to_s will be frozen in the future/)
+          input.should == "chilled-mutated"
+        end
+
+        it "emits a warning on singleton_class creation" do
+          -> {
+            :chilled.to_s.singleton_class
+          }.should complain(/string returned by :chilled\.to_s will be frozen in the future/)
+        end
+
+        it "emits a warning on instance variable assignment" do
+          -> {
+            :chilled.to_s.instance_variable_set(:@ivar, 42)
+          }.should complain(/string returned by :chilled\.to_s will be frozen in the future/)
+        end
+
+        it "raises FrozenError after the string was explicitly frozen" do
+          input = :chilled.to_s
+          input.freeze
+          -> {
+            -> {
+              input << "mutated"
+            }.should raise_error(FrozenError)
+          }.should_not complain(/string returned by :chilled\.to_s will be frozen in the future/)
+        end
+      end
+    end
+  end
+end
diff --git a/spec/ruby/core/string/chomp_spec.rb b/spec/ruby/core/string/chomp_spec.rb
index ec0490220bd903..d27c84c6f6a33f 100644
--- a/spec/ruby/core/string/chomp_spec.rb
+++ b/spec/ruby/core/string/chomp_spec.rb
@@ -1,4 +1,5 @@
 # -*- encoding: utf-8 -*-
+# frozen_string_literal: false
 require_relative '../../spec_helper'
 require_relative 'fixtures/classes'
 
diff --git a/spec/ruby/core/string/chop_spec.rb b/spec/ruby/core/string/chop_spec.rb
index 75f25b39cd507e..99c2c821909ec0 100644
--- a/spec/ruby/core/string/chop_spec.rb
+++ b/spec/ruby/core/string/chop_spec.rb
@@ -1,4 +1,5 @@
 # -*- encoding: utf-8 -*-
+# frozen_string_literal: false
 require_relative '../../spec_helper'
 require_relative 'fixtures/classes'
 
diff --git a/spec/ruby/core/string/clear_spec.rb b/spec/ruby/core/string/clear_spec.rb
index e1d68e03bd2268..152986fd0fee9c 100644
--- a/spec/ruby/core/string/clear_spec.rb
+++ b/spec/ruby/core/string/clear_spec.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: false
 require_relative '../../spec_helper'
 
 describe "String#clear" do
diff --git a/spec/ruby/core/string/codepoints_spec.rb b/spec/ruby/core/string/codepoints_spec.rb
index 0b6cde82f7385d..12a5bf5892bed9 100644
--- a/spec/ruby/core/string/codepoints_spec.rb
+++ b/spec/ruby/core/string/codepoints_spec.rb
@@ -1,4 +1,4 @@
-# -*- encoding: binary -*-
+# encoding: binary
 require_relative '../../spec_helper'
 require_relative 'shared/codepoints'
 require_relative 'shared/each_codepoint_without_block'
@@ -11,7 +11,7 @@
   end
 
   it "raises an ArgumentError when no block is given if self has an invalid encoding" do
-    s = "\xDF".force_encoding(Encoding::UTF_8)
+    s = "\xDF".dup.force_encoding(Encoding::UTF_8)
     s.valid_encoding?.should be_false
     -> { s.codepoints }.should raise_error(ArgumentError)
   end
diff --git a/spec/ruby/core/string/comparison_spec.rb b/spec/ruby/core/string/comparison_spec.rb
index 91cfdca25a10c8..9db0cff5ee2277 100644
--- a/spec/ruby/core/string/comparison_spec.rb
+++ b/spec/ruby/core/string/comparison_spec.rb
@@ -61,12 +61,12 @@
   end
 
   it "ignores encoding difference" do
-    ("ÄÖÛ".force_encoding("utf-8") <=> "ÄÖÜ".force_encoding("iso-8859-1")).should == -1
-    ("ÄÖÜ".force_encoding("utf-8") <=> "ÄÖÛ".force_encoding("iso-8859-1")).should == 1
+    ("ÄÖÛ".dup.force_encoding("utf-8") <=> "ÄÖÜ".dup.force_encoding("iso-8859-1")).should == -1
+    ("ÄÖÜ".dup.force_encoding("utf-8") <=> "ÄÖÛ".dup.force_encoding("iso-8859-1")).should == 1
   end
 
   it "returns 0 with identical ASCII-compatible bytes of different encodings" do
-    ("abc".force_encoding("utf-8") <=> "abc".force_encoding("iso-8859-1")).should == 0
+    ("abc".dup.force_encoding("utf-8") <=> "abc".dup.force_encoding("iso-8859-1")).should == 0
   end
 
   it "compares the indices of the encodings when the strings have identical non-ASCII-compatible bytes" do
@@ -77,7 +77,7 @@
   end
 
   it "returns 0 when comparing 2 empty strings but one is not ASCII-compatible" do
-    ("" <=> "".force_encoding('iso-2022-jp')).should == 0
+    ("" <=> "".dup.force_encoding('iso-2022-jp')).should == 0
   end
 end
 
diff --git a/spec/ruby/core/string/concat_spec.rb b/spec/ruby/core/string/concat_spec.rb
index 6f487eaa3ad0ba..cbd7df54e2bd0a 100644
--- a/spec/ruby/core/string/concat_spec.rb
+++ b/spec/ruby/core/string/concat_spec.rb
@@ -8,19 +8,19 @@
   it_behaves_like :string_concat_type_coercion, :concat
 
   it "takes multiple arguments" do
-    str = "hello "
+    str = +"hello "
     str.concat "wo", "", "rld"
     str.should == "hello world"
   end
 
   it "concatenates the initial value when given arguments contain 2 self" do
-    str = "hello"
+    str = +"hello"
     str.concat str, str
     str.should == "hellohellohello"
   end
 
   it "returns self when given no arguments" do
-    str = "hello"
+    str = +"hello"
     str.concat.should equal(str)
     str.should == "hello"
   end
diff --git a/spec/ruby/core/string/count_spec.rb b/spec/ruby/core/string/count_spec.rb
index 06ba5a4f0eef04..e614e901ddbfb0 100644
--- a/spec/ruby/core/string/count_spec.rb
+++ b/spec/ruby/core/string/count_spec.rb
@@ -1,4 +1,4 @@
-# -*- encoding: binary -*-
+# encoding: binary
 require_relative '../../spec_helper'
 require_relative 'fixtures/classes'
 
diff --git a/spec/ruby/core/string/dedup_spec.rb b/spec/ruby/core/string/dedup_spec.rb
index 57d2be2cfda487..2b31d80708276e 100644
--- a/spec/ruby/core/string/dedup_spec.rb
+++ b/spec/ruby/core/string/dedup_spec.rb
@@ -2,7 +2,5 @@
 require_relative 'shared/dedup'
 
 describe 'String#dedup' do
-  ruby_version_is '3.2' do
-    it_behaves_like :string_dedup, :dedup
-  end
+  it_behaves_like :string_dedup, :dedup
 end
diff --git a/spec/ruby/core/string/delete_prefix_spec.rb b/spec/ruby/core/string/delete_prefix_spec.rb
index 4214fdecce2937..ee7f04490579cc 100644
--- a/spec/ruby/core/string/delete_prefix_spec.rb
+++ b/spec/ruby/core/string/delete_prefix_spec.rb
@@ -1,4 +1,5 @@
 # -*- encoding: utf-8 -*-
+# frozen_string_literal: false
 require_relative '../../spec_helper'
 require_relative 'fixtures/classes'
 
diff --git a/spec/ruby/core/string/delete_spec.rb b/spec/ruby/core/string/delete_spec.rb
index 3b9aa4fb75bd48..6d359776e45f71 100644
--- a/spec/ruby/core/string/delete_spec.rb
+++ b/spec/ruby/core/string/delete_spec.rb
@@ -1,4 +1,5 @@
 # -*- encoding: utf-8 -*-
+# frozen_string_literal: false
 require_relative '../../spec_helper'
 require_relative 'fixtures/classes'
 
diff --git a/spec/ruby/core/string/delete_suffix_spec.rb b/spec/ruby/core/string/delete_suffix_spec.rb
index 9381f4cee7ce28..1842d75aa5e1d9 100644
--- a/spec/ruby/core/string/delete_suffix_spec.rb
+++ b/spec/ruby/core/string/delete_suffix_spec.rb
@@ -1,4 +1,5 @@
 # -*- encoding: utf-8 -*-
+# frozen_string_literal: false
 require_relative '../../spec_helper'
 require_relative 'fixtures/classes'
 
diff --git a/spec/ruby/core/string/downcase_spec.rb b/spec/ruby/core/string/downcase_spec.rb
index 7ee9d6df1d9078..2d260f23f181e4 100644
--- a/spec/ruby/core/string/downcase_spec.rb
+++ b/spec/ruby/core/string/downcase_spec.rb
@@ -1,4 +1,5 @@
 # -*- encoding: utf-8 -*-
+# frozen_string_literal: false
 require_relative '../../spec_helper'
 require_relative 'fixtures/classes'
 
diff --git a/spec/ruby/core/string/dup_spec.rb b/spec/ruby/core/string/dup_spec.rb
index 73f71b8ffcc4e5..073802d84b48ba 100644
--- a/spec/ruby/core/string/dup_spec.rb
+++ b/spec/ruby/core/string/dup_spec.rb
@@ -51,7 +51,7 @@ class << @obj
   end
 
   it "does not modify the original setbyte-mutated string when changing dupped string" do
-    orig = "a"
+    orig = +"a"
     orig.setbyte 0, "b".ord
     copy = orig.dup
     orig.setbyte 0, "c".ord
diff --git a/spec/ruby/core/string/each_byte_spec.rb b/spec/ruby/core/string/each_byte_spec.rb
index e04dca807faa95..7b3db265ac2f97 100644
--- a/spec/ruby/core/string/each_byte_spec.rb
+++ b/spec/ruby/core/string/each_byte_spec.rb
@@ -9,26 +9,26 @@
   end
 
   it "keeps iterating from the old position (to new string end) when self changes" do
-    r = ""
-    s = "hello world"
+    r = +""
+    s = +"hello world"
     s.each_byte do |c|
       r << c
       s.insert(0, "<>") if r.size < 3
     end
     r.should == "h><>hello world"
 
-    r = ""
-    s = "hello world"
+    r = +""
+    s = +"hello world"
     s.each_byte { |c| s.slice!(-1); r << c }
     r.should == "hello "
 
-    r = ""
-    s = "hello world"
+    r = +""
+    s = +"hello world"
     s.each_byte { |c| s.slice!(0); r << c }
     r.should == "hlowrd"
 
-    r = ""
-    s = "hello world"
+    r = +""
+    s = +"hello world"
     s.each_byte { |c| s.slice!(0..-1); r << c }
     r.should == "h"
   end
diff --git a/spec/ruby/core/string/element_set_spec.rb b/spec/ruby/core/string/element_set_spec.rb
index fa041fa31da2f9..e7599f832c0558 100644
--- a/spec/ruby/core/string/element_set_spec.rb
+++ b/spec/ruby/core/string/element_set_spec.rb
@@ -1,4 +1,5 @@
 # -*- encoding: utf-8 -*-
+# frozen_string_literal: false
 require_relative '../../spec_helper'
 require_relative 'fixtures/classes'
 
diff --git a/spec/ruby/core/string/encode_spec.rb b/spec/ruby/core/string/encode_spec.rb
index 35ed27bb40d3bc..cd449498a35209 100644
--- a/spec/ruby/core/string/encode_spec.rb
+++ b/spec/ruby/core/string/encode_spec.rb
@@ -34,8 +34,8 @@
 
     it "encodes an ascii substring of a binary string to UTF-8" do
       x82 = [0x82].pack('C')
-      str =  "#{x82}foo".force_encoding("binary")[1..-1].encode("utf-8")
-      str.should == "foo".force_encoding("utf-8")
+      str =  "#{x82}foo".dup.force_encoding("binary")[1..-1].encode("utf-8")
+      str.should == "foo".dup.force_encoding("utf-8")
       str.encoding.should equal(Encoding::UTF_8)
     end
   end
@@ -49,7 +49,7 @@
     end
 
     it "round trips a String" do
-      str = "abc def".force_encoding Encoding::US_ASCII
+      str = "abc def".dup.force_encoding Encoding::US_ASCII
       str.encode("utf-32be").encode("ascii").should == "abc def"
     end
   end
@@ -61,10 +61,22 @@
       str.encode(invalid: :replace).should_not equal(str)
     end
 
-    it "normalizes newlines" do
-      "\r\nfoo".encode(universal_newline: true).should == "\nfoo"
+    it "normalizes newlines with cr_newline option" do
+      "\r\nfoo".encode(cr_newline: true).should == "\r\rfoo"
+      "\rfoo".encode(cr_newline: true).should == "\rfoo"
+      "\nfoo".encode(cr_newline: true).should == "\rfoo"
+    end
+
+    it "normalizes newlines with crlf_newline option" do
+      "\r\nfoo".encode(crlf_newline: true).should == "\r\r\nfoo"
+      "\rfoo".encode(crlf_newline: true).should == "\rfoo"
+      "\nfoo".encode(crlf_newline: true).should == "\r\nfoo"
+    end
 
+    it "normalizes newlines with universal_newline option" do
+      "\r\nfoo".encode(universal_newline: true).should == "\nfoo"
       "\rfoo".encode(universal_newline: true).should == "\nfoo"
+      "\nfoo".encode(universal_newline: true).should == "\nfoo"
     end
 
     it "replaces invalid encoding in source with default replacement" do
@@ -122,8 +134,7 @@
 
   describe "when passed to, from" do
     it "returns a copy in the destination encoding when both encodings are the same" do
-      str = "あ"
-      str.force_encoding("binary")
+      str = "あ".dup.force_encoding("binary")
       encoded = str.encode("utf-8", "utf-8")
 
       encoded.should_not equal(str)
@@ -155,8 +166,7 @@
     end
 
     it "returns a copy in the destination encoding when both encodings are the same" do
-      str = "あ"
-      str.force_encoding("binary")
+      str = "あ".dup.force_encoding("binary")
       encoded = str.encode("utf-8", "utf-8", invalid: :replace)
 
       encoded.should_not equal(str)
@@ -191,13 +201,13 @@
   describe "when passed no options" do
     it "returns self when Encoding.default_internal is nil" do
       Encoding.default_internal = nil
-      str = "あ"
+      str = +"あ"
       str.encode!.should equal(str)
     end
 
     it "returns self for a ASCII-only String when Encoding.default_internal is nil" do
       Encoding.default_internal = nil
-      str = "abc"
+      str = +"abc"
       str.encode!.should equal(str)
     end
   end
@@ -205,14 +215,14 @@
   describe "when passed options" do
     it "returns self for ASCII-only String when Encoding.default_internal is nil" do
       Encoding.default_internal = nil
-      str = "abc"
+      str = +"abc"
       str.encode!(invalid: :replace).should equal(str)
     end
   end
 
   describe "when passed to encoding" do
     it "returns self" do
-      str = "abc"
+      str = +"abc"
       result = str.encode!(Encoding::BINARY)
       result.encoding.should equal(Encoding::BINARY)
       result.should equal(str)
@@ -221,7 +231,7 @@
 
   describe "when passed to, from" do
     it "returns self" do
-      str = "ああ"
+      str = +"ああ"
       result = str.encode!("euc-jp", "utf-8")
       result.encoding.should equal(Encoding::EUC_JP)
       result.should equal(str)
diff --git a/spec/ruby/core/string/encoding_spec.rb b/spec/ruby/core/string/encoding_spec.rb
index 574a1e2f9287df..f6e8fd34702116 100644
--- a/spec/ruby/core/string/encoding_spec.rb
+++ b/spec/ruby/core/string/encoding_spec.rb
@@ -14,11 +14,11 @@
   end
 
   it "returns the given encoding if #force_encoding has been called" do
-    "a".force_encoding(Encoding::SHIFT_JIS).encoding.should == Encoding::SHIFT_JIS
+    "a".dup.force_encoding(Encoding::SHIFT_JIS).encoding.should == Encoding::SHIFT_JIS
   end
 
   it "returns the given encoding if #encode!has been called" do
-    "a".encode!(Encoding::SHIFT_JIS).encoding.should == Encoding::SHIFT_JIS
+    "a".dup.encode!(Encoding::SHIFT_JIS).encoding.should == Encoding::SHIFT_JIS
   end
 end
 
@@ -108,13 +108,13 @@
   end
 
   it "returns the given encoding if #force_encoding has been called" do
-    "\u{20}".force_encoding(Encoding::SHIFT_JIS).encoding.should == Encoding::SHIFT_JIS
-    "\u{2020}".force_encoding(Encoding::SHIFT_JIS).encoding.should == Encoding::SHIFT_JIS
+    "\u{20}".dup.force_encoding(Encoding::SHIFT_JIS).encoding.should == Encoding::SHIFT_JIS
+    "\u{2020}".dup.force_encoding(Encoding::SHIFT_JIS).encoding.should == Encoding::SHIFT_JIS
   end
 
   it "returns the given encoding if #encode!has been called" do
-    "\u{20}".encode!(Encoding::SHIFT_JIS).encoding.should == Encoding::SHIFT_JIS
-    "\u{2020}".encode!(Encoding::SHIFT_JIS).encoding.should == Encoding::SHIFT_JIS
+    "\u{20}".dup.encode!(Encoding::SHIFT_JIS).encoding.should == Encoding::SHIFT_JIS
+    "\u{2020}".dup.encode!(Encoding::SHIFT_JIS).encoding.should == Encoding::SHIFT_JIS
   end
 end
 
@@ -173,16 +173,12 @@
   end
 
   it "returns the given encoding if #force_encoding has been called" do
-    x50 = "\x50"
-    x50.force_encoding(Encoding::SHIFT_JIS).encoding.should == Encoding::SHIFT_JIS
-    xD4 = [212].pack('C')
-    xD4.force_encoding(Encoding::ISO_8859_9).encoding.should == Encoding::ISO_8859_9
+    "\x50".dup.force_encoding(Encoding::SHIFT_JIS).encoding.should == Encoding::SHIFT_JIS
+    [212].pack('C').force_encoding(Encoding::ISO_8859_9).encoding.should == Encoding::ISO_8859_9
   end
 
   it "returns the given encoding if #encode!has been called" do
-    x50 = "\x50"
-    x50.encode!(Encoding::SHIFT_JIS).encoding.should == Encoding::SHIFT_JIS
-    x00 = "x\00"
-    x00.encode!(Encoding::UTF_8).encoding.should == Encoding::UTF_8
+    "\x50".dup.encode!(Encoding::SHIFT_JIS).encoding.should == Encoding::SHIFT_JIS
+    "x\00".dup.encode!(Encoding::UTF_8).encoding.should == Encoding::UTF_8
   end
 end
diff --git a/spec/ruby/core/string/fixtures/utf-8-encoding.rb b/spec/ruby/core/string/fixtures/utf-8-encoding.rb
deleted file mode 100644
index fd243ec52243c3..00000000000000
--- a/spec/ruby/core/string/fixtures/utf-8-encoding.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-# -*- encoding: utf-8 -*-
-module StringSpecs
-  class UTF8Encoding
-    def self.source_encoding; __ENCODING__; end
-    def self.egrave; "é"; end
-  end
-end
diff --git a/spec/ruby/core/string/force_encoding_spec.rb b/spec/ruby/core/string/force_encoding_spec.rb
index f37aaf9eb4319b..2259dcf3cf8650 100644
--- a/spec/ruby/core/string/force_encoding_spec.rb
+++ b/spec/ruby/core/string/force_encoding_spec.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: false
 require_relative '../../spec_helper'
 
 describe "String#force_encoding" do
diff --git a/spec/ruby/core/string/freeze_spec.rb b/spec/ruby/core/string/freeze_spec.rb
index 04d1e9513c39ab..2e8e70386dcaad 100644
--- a/spec/ruby/core/string/freeze_spec.rb
+++ b/spec/ruby/core/string/freeze_spec.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: false
 require_relative '../../spec_helper'
 
 describe "String#freeze" do
diff --git a/spec/ruby/core/string/gsub_spec.rb b/spec/ruby/core/string/gsub_spec.rb
index 9e3b50322c6729..0d9f32eca2e11d 100644
--- a/spec/ruby/core/string/gsub_spec.rb
+++ b/spec/ruby/core/string/gsub_spec.rb
@@ -1,4 +1,5 @@
 # -*- encoding: utf-8 -*-
+# frozen_string_literal: false
 require_relative '../../spec_helper'
 require_relative 'fixtures/classes'
 
diff --git a/spec/ruby/core/string/include_spec.rb b/spec/ruby/core/string/include_spec.rb
index 23e1e134ec73f3..9781140a55ea1e 100644
--- a/spec/ruby/core/string/include_spec.rb
+++ b/spec/ruby/core/string/include_spec.rb
@@ -15,16 +15,16 @@
 
   it "returns true if both strings are empty" do
     "".should.include?("")
-    "".force_encoding("EUC-JP").should.include?("")
-    "".should.include?("".force_encoding("EUC-JP"))
-    "".force_encoding("EUC-JP").should.include?("".force_encoding("EUC-JP"))
+    "".dup.force_encoding("EUC-JP").should.include?("")
+    "".should.include?("".dup.force_encoding("EUC-JP"))
+    "".dup.force_encoding("EUC-JP").should.include?("".dup.force_encoding("EUC-JP"))
   end
 
   it "returns true if the RHS is empty" do
     "a".should.include?("")
-    "a".force_encoding("EUC-JP").should.include?("")
-    "a".should.include?("".force_encoding("EUC-JP"))
-    "a".force_encoding("EUC-JP").should.include?("".force_encoding("EUC-JP"))
+    "a".dup.force_encoding("EUC-JP").should.include?("")
+    "a".should.include?("".dup.force_encoding("EUC-JP"))
+    "a".dup.force_encoding("EUC-JP").should.include?("".dup.force_encoding("EUC-JP"))
   end
 
   it "tries to convert other to string using to_str" do
diff --git a/spec/ruby/core/string/index_spec.rb b/spec/ruby/core/string/index_spec.rb
index b500cf6ca77d77..835263a2cd58c2 100644
--- a/spec/ruby/core/string/index_spec.rb
+++ b/spec/ruby/core/string/index_spec.rb
@@ -161,16 +161,16 @@
   end
 
   it "handles a substring in a superset encoding" do
-    'abc'.force_encoding(Encoding::US_ASCII).index('é').should == nil
+    'abc'.dup.force_encoding(Encoding::US_ASCII).index('é').should == nil
   end
 
   it "handles a substring in a subset encoding" do
-    'été'.index('t'.force_encoding(Encoding::US_ASCII)).should == 1
+    'été'.index('t'.dup.force_encoding(Encoding::US_ASCII)).should == 1
   end
 
   it "raises an Encoding::CompatibilityError if the encodings are incompatible" do
-    str = 'abc'.force_encoding("ISO-2022-JP")
-    pattern = 'b'.force_encoding("EUC-JP")
+    str = 'abc'.dup.force_encoding("ISO-2022-JP")
+    pattern = 'b'.dup.force_encoding("EUC-JP")
 
     -> { str.index(pattern) }.should raise_error(Encoding::CompatibilityError, "incompatible character encodings: ISO-2022-JP and EUC-JP")
   end
@@ -231,6 +231,17 @@
     $~.should == nil
   end
 
+  ruby_bug "#20421", ""..."3.3" do
+    it "always clear $~" do
+      "a".index(/a/)
+      $~.should_not == nil
+
+      string = "blablabla"
+      string.index(/bla/, string.length + 1)
+      $~.should == nil
+    end
+  end
+
   it "starts the search at the given offset" do
     "blablabla".index(/.{0}/, 5).should == 5
     "blablabla".index(/.{1}/, 5).should == 5
diff --git a/spec/ruby/core/string/insert_spec.rb b/spec/ruby/core/string/insert_spec.rb
index 0c87df3a9551b6..483f3c9367b16e 100644
--- a/spec/ruby/core/string/insert_spec.rb
+++ b/spec/ruby/core/string/insert_spec.rb
@@ -1,5 +1,5 @@
 # -*- encoding: utf-8 -*-
-
+# frozen_string_literal: false
 require_relative '../../spec_helper'
 require_relative 'fixtures/classes'
 
diff --git a/spec/ruby/core/string/inspect_spec.rb b/spec/ruby/core/string/inspect_spec.rb
index 8bf3d3161fba7c..15db06c7f5f7e0 100644
--- a/spec/ruby/core/string/inspect_spec.rb
+++ b/spec/ruby/core/string/inspect_spec.rb
@@ -327,7 +327,7 @@
   end
 
   it "works for broken US-ASCII strings" do
-    s = "©".force_encoding("US-ASCII")
+    s = "©".dup.force_encoding("US-ASCII")
     s.inspect.should == '"\xC2\xA9"'
   end
 
diff --git a/spec/ruby/core/string/ljust_spec.rb b/spec/ruby/core/string/ljust_spec.rb
index 9208ec58977c09..47324c59d2f4de 100644
--- a/spec/ruby/core/string/ljust_spec.rb
+++ b/spec/ruby/core/string/ljust_spec.rb
@@ -75,7 +75,7 @@
 
   describe "with width" do
     it "returns a String in the same encoding as the original" do
-      str = "abc".force_encoding Encoding::IBM437
+      str = "abc".dup.force_encoding Encoding::IBM437
       result = str.ljust 5
       result.should == "abc  "
       result.encoding.should equal(Encoding::IBM437)
@@ -84,7 +84,7 @@
 
   describe "with width, pattern" do
     it "returns a String in the compatible encoding" do
-      str = "abc".force_encoding Encoding::IBM437
+      str = "abc".dup.force_encoding Encoding::IBM437
       result = str.ljust 5, "あ"
       result.should == "abcああ"
       result.encoding.should equal(Encoding::UTF_8)
diff --git a/spec/ruby/core/string/lstrip_spec.rb b/spec/ruby/core/string/lstrip_spec.rb
index 85685deb0ac0a2..c83650207e23a8 100644
--- a/spec/ruby/core/string/lstrip_spec.rb
+++ b/spec/ruby/core/string/lstrip_spec.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: false
 require_relative '../../spec_helper'
 require_relative 'fixtures/classes'
 require_relative 'shared/strip'
@@ -6,11 +7,11 @@
   it_behaves_like :string_strip, :lstrip
 
   it "returns a copy of self with leading whitespace removed" do
-   "  hello  ".lstrip.should == "hello  "
-   "  hello world  ".lstrip.should == "hello world  "
-   "\n\r\t\n\v\r hello world  ".lstrip.should == "hello world  "
-   "hello".lstrip.should == "hello"
-   " こにちわ".lstrip.should == "こにちわ"
+    "  hello  ".lstrip.should == "hello  "
+    "  hello world  ".lstrip.should == "hello world  "
+    "\n\r\t\n\v\r hello world  ".lstrip.should == "hello world  "
+    "hello".lstrip.should == "hello"
+    " こにちわ".lstrip.should == "こにちわ"
   end
 
   it "works with lazy substrings" do
@@ -21,8 +22,8 @@
   end
 
   it "strips leading \\0" do
-   "\x00hello".lstrip.should == "hello"
-   "\000 \000hello\000 \000".lstrip.should == "hello\000 \000"
+    "\x00hello".lstrip.should == "hello"
+    "\000 \000hello\000 \000".lstrip.should == "hello\000 \000"
   end
 end
 
diff --git a/spec/ruby/core/string/modulo_spec.rb b/spec/ruby/core/string/modulo_spec.rb
index bf96a8287462dc..46e0aa0f3616c8 100644
--- a/spec/ruby/core/string/modulo_spec.rb
+++ b/spec/ruby/core/string/modulo_spec.rb
@@ -55,33 +55,48 @@
     -> { ("foo%" % [])}.should raise_error(ArgumentError)
   end
 
-  it "formats single % character before a newline as literal %" do
-    ("%\n" % []).should == "%\n"
-    ("foo%\n" % []).should == "foo%\n"
-    ("%\n.3f" % 1.2).should == "%\n.3f"
-  end
+  ruby_version_is ""..."3.4" do
+    it "formats single % character before a newline as literal %" do
+      ("%\n" % []).should == "%\n"
+      ("foo%\n" % []).should == "foo%\n"
+      ("%\n.3f" % 1.2).should == "%\n.3f"
+    end
 
-  it "formats single % character before a NUL as literal %" do
-    ("%\0" % []).should == "%\0"
-    ("foo%\0" % []).should == "foo%\0"
-    ("%\0.3f" % 1.2).should == "%\0.3f"
-  end
+    it "formats single % character before a NUL as literal %" do
+      ("%\0" % []).should == "%\0"
+      ("foo%\0" % []).should == "foo%\0"
+      ("%\0.3f" % 1.2).should == "%\0.3f"
+    end
 
-  it "raises an error if single % appears anywhere else" do
-    -> { (" % " % []) }.should raise_error(ArgumentError)
-    -> { ("foo%quux" % []) }.should raise_error(ArgumentError)
-  end
+    it "raises an error if single % appears anywhere else" do
+      -> { (" % " % []) }.should raise_error(ArgumentError)
+      -> { ("foo%quux" % []) }.should raise_error(ArgumentError)
+    end
 
-  it "raises an error if NULL or \\n appear anywhere else in the format string" do
-    begin
-      old_debug, $DEBUG = $DEBUG, false
+    it "raises an error if NULL or \\n appear anywhere else in the format string" do
+      begin
+        old_debug, $DEBUG = $DEBUG, false
+
+        -> { "%.\n3f" % 1.2 }.should raise_error(ArgumentError)
+        -> { "%.3\nf" % 1.2 }.should raise_error(ArgumentError)
+        -> { "%.\03f" % 1.2 }.should raise_error(ArgumentError)
+        -> { "%.3\0f" % 1.2 }.should raise_error(ArgumentError)
+      ensure
+        $DEBUG = old_debug
+      end
+    end
+  end
 
+  ruby_version_is "3.4" do
+    it "raises an ArgumentError if % is not followed by a conversion specifier" do
+      -> { "%" % [] }.should raise_error(ArgumentError)
+      -> { "%\n" % [] }.should raise_error(ArgumentError)
+      -> { "%\0" % [] }.should raise_error(ArgumentError)
+      -> { " % " % [] }.should raise_error(ArgumentError)
       -> { "%.\n3f" % 1.2 }.should raise_error(ArgumentError)
       -> { "%.3\nf" % 1.2 }.should raise_error(ArgumentError)
       -> { "%.\03f" % 1.2 }.should raise_error(ArgumentError)
       -> { "%.3\0f" % 1.2 }.should raise_error(ArgumentError)
-    ensure
-      $DEBUG = old_debug
     end
   end
 
@@ -125,8 +140,16 @@
     end
   end
 
-  it "replaces trailing absolute argument specifier without type with percent sign" do
-    ("hello %1$" % "foo").should == "hello %"
+  ruby_version_is ""..."3.4" do
+    it "replaces trailing absolute argument specifier without type with percent sign" do
+      ("hello %1$" % "foo").should == "hello %"
+    end
+  end
+
+  ruby_version_is "3.4" do
+    it "raises an ArgumentError if absolute argument specifier is followed by a conversion specifier" do
+      -> { "hello %1$" % "foo" }.should raise_error(ArgumentError)
+    end
   end
 
   it "raises an ArgumentError when given invalid argument specifiers" do
@@ -368,16 +391,8 @@ def universal.to_f() 0.0 end
     ("%c" % 'A').should == "A"
   end
 
-  ruby_version_is ""..."3.2" do
-    it "raises an exception for multiple character strings as argument for %c" do
-      -> { "%c" % 'AA' }.should raise_error(ArgumentError)
-    end
-  end
-
-  ruby_version_is "3.2" do
-    it "supports only the first character as argument for %c" do
-      ("%c" % 'AA').should == "A"
-    end
+  it "supports only the first character as argument for %c" do
+    ("%c" % 'AA').should == "A"
   end
 
   it "calls to_str on argument for %c formats" do
@@ -547,7 +562,7 @@ def universal.to_f() 0.0 end
     ("%1$p" % [10, 5]).should == "10"
     ("%-22p" % 10).should == "10                    "
     ("%*p" % [10, 10]).should == "        10"
-    ("%p" % {capture: 1}).should == "{:capture=>1}"
+    ("%p" % {capture: 1}).should == {capture: 1}.inspect
     ("%p" % "str").should == "\"str\""
   end
 
@@ -726,6 +741,11 @@ def obj.to_s() "obj" end
       (format % "-10.4e-20").should == (format % -10.4e-20)
       (format % ".5").should == (format % 0.5)
       (format % "-.5").should == (format % -0.5)
+
+      ruby_version_is "3.4" do
+        (format % "10.").should == (format % 10)
+      end
+
       # Something's strange with this spec:
       # it works just fine in individual mode, but not when run as part of a group
       (format % "10_1_0.5_5_5").should == (format % 1010.555)
@@ -735,7 +755,6 @@ def obj.to_s() "obj" end
       -> { format % "" }.should raise_error(ArgumentError)
       -> { format % "x" }.should raise_error(ArgumentError)
       -> { format % "." }.should raise_error(ArgumentError)
-      -> { format % "10." }.should raise_error(ArgumentError)
       -> { format % "5x" }.should raise_error(ArgumentError)
       -> { format % "0b1" }.should raise_error(ArgumentError)
       -> { format % "10e10.5" }.should raise_error(ArgumentError)
diff --git a/spec/ruby/core/string/ord_spec.rb b/spec/ruby/core/string/ord_spec.rb
index 4cf26990fedec8..35af3b5458eb28 100644
--- a/spec/ruby/core/string/ord_spec.rb
+++ b/spec/ruby/core/string/ord_spec.rb
@@ -27,7 +27,7 @@
   end
 
   it "raises ArgumentError if the character is broken" do
-    s = "©".force_encoding("US-ASCII")
+    s = "©".dup.force_encoding("US-ASCII")
     -> { s.ord }.should raise_error(ArgumentError, "invalid byte sequence in US-ASCII")
   end
 end
diff --git a/spec/ruby/core/string/partition_spec.rb b/spec/ruby/core/string/partition_spec.rb
index 9cb3672881ff02..d5370dcc7352d3 100644
--- a/spec/ruby/core/string/partition_spec.rb
+++ b/spec/ruby/core/string/partition_spec.rb
@@ -40,7 +40,7 @@
   end
 
   it "handles a pattern in a superset encoding" do
-    string = "hello".force_encoding(Encoding::US_ASCII)
+    string = "hello".dup.force_encoding(Encoding::US_ASCII)
 
     result = string.partition("é")
 
@@ -51,7 +51,7 @@
   end
 
   it "handles a pattern in a subset encoding" do
-    pattern = "o".force_encoding(Encoding::US_ASCII)
+    pattern = "o".dup.force_encoding(Encoding::US_ASCII)
 
     result = "héllo world".partition(pattern)
 
diff --git a/spec/ruby/core/string/prepend_spec.rb b/spec/ruby/core/string/prepend_spec.rb
index a0393d47607678..5248ea8056b53f 100644
--- a/spec/ruby/core/string/prepend_spec.rb
+++ b/spec/ruby/core/string/prepend_spec.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: false
 require_relative '../../spec_helper'
 require_relative 'fixtures/classes'
 
diff --git a/spec/ruby/core/string/reverse_spec.rb b/spec/ruby/core/string/reverse_spec.rb
index e67122c05c2e55..aa6abe6036e466 100644
--- a/spec/ruby/core/string/reverse_spec.rb
+++ b/spec/ruby/core/string/reverse_spec.rb
@@ -1,4 +1,5 @@
 # encoding: utf-8
+# frozen_string_literal: false
 
 require_relative '../../spec_helper'
 require_relative 'fixtures/classes'
diff --git a/spec/ruby/core/string/rindex_spec.rb b/spec/ruby/core/string/rindex_spec.rb
index 45ff13a0060ebd..0863a9c3bed98b 100644
--- a/spec/ruby/core/string/rindex_spec.rb
+++ b/spec/ruby/core/string/rindex_spec.rb
@@ -1,7 +1,6 @@
 # -*- encoding: utf-8 -*-
 require_relative '../../spec_helper'
 require_relative 'fixtures/classes'
-require_relative 'fixtures/utf-8-encoding'
 
 describe "String#rindex with object" do
   it "raises a TypeError if obj isn't a String or Regexp" do
@@ -198,16 +197,16 @@ def obj.method_missing(*args) 5 end
   end
 
   it "handles a substring in a superset encoding" do
-    'abc'.force_encoding(Encoding::US_ASCII).rindex('é').should == nil
+    'abc'.dup.force_encoding(Encoding::US_ASCII).rindex('é').should == nil
   end
 
   it "handles a substring in a subset encoding" do
-    'été'.rindex('t'.force_encoding(Encoding::US_ASCII)).should == 1
+    'été'.rindex('t'.dup.force_encoding(Encoding::US_ASCII)).should == 1
   end
 
   it "raises an Encoding::CompatibilityError if the encodings are incompatible" do
-    str = 'abc'.force_encoding("ISO-2022-JP")
-    pattern = 'b'.force_encoding("EUC-JP")
+    str = 'abc'.dup.force_encoding("ISO-2022-JP")
+    pattern = 'b'.dup.force_encoding("EUC-JP")
 
     -> { str.rindex(pattern) }.should raise_error(Encoding::CompatibilityError, "incompatible character encodings: ISO-2022-JP and EUC-JP")
   end
@@ -372,8 +371,8 @@ def obj.method_missing(*args); 5; end
   end
 
   it "returns the character index before the finish" do
-     "ありがりがとう".rindex("が", 3).should == 2
-     "ありがりがとう".rindex(/が/, 3).should == 2
+    "ありがりがとう".rindex("が", 3).should == 2
+    "ありがりがとう".rindex(/が/, 3).should == 2
   end
 
   it "raises an Encoding::CompatibilityError if the encodings are incompatible" do
diff --git a/spec/ruby/core/string/rjust_spec.rb b/spec/ruby/core/string/rjust_spec.rb
index fcbaf3b938d7fe..4ad3e54aea2cf5 100644
--- a/spec/ruby/core/string/rjust_spec.rb
+++ b/spec/ruby/core/string/rjust_spec.rb
@@ -75,7 +75,7 @@
 
   describe "with width" do
     it "returns a String in the same encoding as the original" do
-      str = "abc".force_encoding Encoding::IBM437
+      str = "abc".dup.force_encoding Encoding::IBM437
       result = str.rjust 5
       result.should == "  abc"
       result.encoding.should equal(Encoding::IBM437)
@@ -84,7 +84,7 @@
 
   describe "with width, pattern" do
     it "returns a String in the compatible encoding" do
-      str = "abc".force_encoding Encoding::IBM437
+      str = "abc".dup.force_encoding Encoding::IBM437
       result = str.rjust 5, "あ"
       result.should == "ああabc"
       result.encoding.should equal(Encoding::UTF_8)
diff --git a/spec/ruby/core/string/rpartition_spec.rb b/spec/ruby/core/string/rpartition_spec.rb
index 21e87f530a8013..cef0384c7396c2 100644
--- a/spec/ruby/core/string/rpartition_spec.rb
+++ b/spec/ruby/core/string/rpartition_spec.rb
@@ -48,7 +48,7 @@
   end
 
   it "handles a pattern in a superset encoding" do
-    string = "hello".force_encoding(Encoding::US_ASCII)
+    string = "hello".dup.force_encoding(Encoding::US_ASCII)
 
     result = string.rpartition("é")
 
@@ -59,7 +59,7 @@
   end
 
   it "handles a pattern in a subset encoding" do
-    pattern = "o".force_encoding(Encoding::US_ASCII)
+    pattern = "o".dup.force_encoding(Encoding::US_ASCII)
 
     result = "héllo world".rpartition(pattern)
 
diff --git a/spec/ruby/core/string/rstrip_spec.rb b/spec/ruby/core/string/rstrip_spec.rb
index e4cf93315ebf6c..55773f52380640 100644
--- a/spec/ruby/core/string/rstrip_spec.rb
+++ b/spec/ruby/core/string/rstrip_spec.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: false
 require_relative '../../spec_helper'
 require_relative 'fixtures/classes'
 require_relative 'shared/strip'
@@ -67,27 +68,13 @@
     -> { "".freeze.rstrip!      }.should raise_error(FrozenError)
   end
 
-  ruby_version_is "3.2" do
-    it "raises an Encoding::CompatibilityError if the last non-space codepoint is invalid" do
-      s = "abc\xDF".force_encoding(Encoding::UTF_8)
-      s.valid_encoding?.should be_false
-      -> { s.rstrip! }.should raise_error(Encoding::CompatibilityError)
+  it "raises an Encoding::CompatibilityError if the last non-space codepoint is invalid" do
+    s = "abc\xDF".force_encoding(Encoding::UTF_8)
+    s.valid_encoding?.should be_false
+    -> { s.rstrip! }.should raise_error(Encoding::CompatibilityError)
 
-      s = "abc\xDF   ".force_encoding(Encoding::UTF_8)
-      s.valid_encoding?.should be_false
-      -> { s.rstrip! }.should raise_error(Encoding::CompatibilityError)
-    end
-  end
-
-  ruby_version_is ""..."3.2" do
-    it "raises an ArgumentError if the last non-space codepoint is invalid" do
-      s = "abc\xDF".force_encoding(Encoding::UTF_8)
-      s.valid_encoding?.should be_false
-      -> { s.rstrip! }.should raise_error(ArgumentError)
-
-      s = "abc\xDF   ".force_encoding(Encoding::UTF_8)
-      s.valid_encoding?.should be_false
-      -> { s.rstrip! }.should raise_error(ArgumentError)
-    end
+    s = "abc\xDF   ".force_encoding(Encoding::UTF_8)
+    s.valid_encoding?.should be_false
+    -> { s.rstrip! }.should raise_error(Encoding::CompatibilityError)
   end
 end
diff --git a/spec/ruby/core/string/scan_spec.rb b/spec/ruby/core/string/scan_spec.rb
index 70c3b7fb7be810..bbe843b591dbce 100644
--- a/spec/ruby/core/string/scan_spec.rb
+++ b/spec/ruby/core/string/scan_spec.rb
@@ -103,11 +103,11 @@
     offsets = []
 
     str.scan(/([aeiou])/) do
-       md = $~
-       md.string.should == str
-       matches << md.to_a
-       offsets << md.offset(0)
-       str
+      md = $~
+      md.string.should == str
+      matches << md.to_a
+      offsets << md.offset(0)
+      str
     end
 
     matches.should == [["e", "e"], ["o", "o"]]
@@ -117,11 +117,11 @@
     offsets = []
 
     str.scan("l") do
-       md = $~
-       md.string.should == str
-       matches << md.to_a
-       offsets << md.offset(0)
-       str
+      md = $~
+      md.string.should == str
+      matches << md.to_a
+      offsets << md.offset(0)
+      str
     end
 
     matches.should == [["l"], ["l"]]
diff --git a/spec/ruby/core/string/scrub_spec.rb b/spec/ruby/core/string/scrub_spec.rb
index bcee4db4630727..b9ef0f1a16e8c0 100644
--- a/spec/ruby/core/string/scrub_spec.rb
+++ b/spec/ruby/core/string/scrub_spec.rb
@@ -1,4 +1,5 @@
 # -*- encoding: utf-8 -*-
+# frozen_string_literal: false
 require_relative '../../spec_helper'
 require_relative 'fixtures/classes'
 
diff --git a/spec/ruby/core/string/setbyte_spec.rb b/spec/ruby/core/string/setbyte_spec.rb
index 77bff6403850f6..85403ca62c6cc7 100644
--- a/spec/ruby/core/string/setbyte_spec.rb
+++ b/spec/ruby/core/string/setbyte_spec.rb
@@ -1,4 +1,5 @@
 # -*- encoding: utf-8 -*-
+# frozen_string_literal: false
 require_relative '../../spec_helper'
 
 describe "String#setbyte" do
diff --git a/spec/ruby/core/string/shared/chars.rb b/spec/ruby/core/string/shared/chars.rb
index e9fdf89fd6208c..c730643cf49874 100644
--- a/spec/ruby/core/string/shared/chars.rb
+++ b/spec/ruby/core/string/shared/chars.rb
@@ -21,12 +21,12 @@
   end
 
   it "returns characters in the same encoding as self" do
-    "&%".force_encoding('Shift_JIS').send(@method).to_a.all? {|c| c.encoding.name.should == 'Shift_JIS'}
+    "&%".dup.force_encoding('Shift_JIS').send(@method).to_a.all? {|c| c.encoding.name.should == 'Shift_JIS'}
     "&%".encode('BINARY').send(@method).to_a.all? {|c| c.encoding.should == Encoding::BINARY }
   end
 
   it "works with multibyte characters" do
-    s = "\u{8987}".force_encoding("UTF-8")
+    s = "\u{8987}".dup.force_encoding("UTF-8")
     s.bytesize.should == 3
     s.send(@method).to_a.should == [s]
   end
@@ -39,14 +39,14 @@
   end
 
   it "returns a different character if the String is transcoded" do
-    s = "\u{20AC}".force_encoding('UTF-8')
-    s.encode('UTF-8').send(@method).to_a.should == ["\u{20AC}".force_encoding('UTF-8')]
+    s = "\u{20AC}".dup.force_encoding('UTF-8')
+    s.encode('UTF-8').send(@method).to_a.should == ["\u{20AC}".dup.force_encoding('UTF-8')]
     s.encode('iso-8859-15').send(@method).to_a.should == [[0xA4].pack('C').force_encoding('iso-8859-15')]
-    s.encode('iso-8859-15').encode('UTF-8').send(@method).to_a.should == ["\u{20AC}".force_encoding('UTF-8')]
+    s.encode('iso-8859-15').encode('UTF-8').send(@method).to_a.should == ["\u{20AC}".dup.force_encoding('UTF-8')]
   end
 
   it "uses the String's encoding to determine what characters it contains" do
-    s = "\u{24B62}"
+    s = +"\u{24B62}"
 
     s.force_encoding('UTF-8').send(@method).to_a.should == [
       s.force_encoding('UTF-8')
diff --git a/spec/ruby/core/string/shared/codepoints.rb b/spec/ruby/core/string/shared/codepoints.rb
index 0b2e078e0a47a7..1c28ba3d5e22ff 100644
--- a/spec/ruby/core/string/shared/codepoints.rb
+++ b/spec/ruby/core/string/shared/codepoints.rb
@@ -1,4 +1,4 @@
-# -*- encoding: binary -*-
+# encoding: binary
 describe :string_codepoints, shared: true do
   it "returns self" do
     s = "foo"
@@ -7,7 +7,7 @@
   end
 
   it "raises an ArgumentError when self has an invalid encoding and a method is called on the returned Enumerator" do
-    s = "\xDF".force_encoding(Encoding::UTF_8)
+    s = "\xDF".dup.force_encoding(Encoding::UTF_8)
     s.valid_encoding?.should be_false
     -> { s.send(@method).to_a }.should raise_error(ArgumentError)
   end
@@ -21,7 +21,7 @@
   end
 
   it "raises an ArgumentError if self's encoding is invalid and a block is given" do
-    s = "\xDF".force_encoding(Encoding::UTF_8)
+    s = "\xDF".dup.force_encoding(Encoding::UTF_8)
     s.valid_encoding?.should be_false
     -> { s.send(@method) { } }.should raise_error(ArgumentError)
   end
@@ -49,7 +49,7 @@
 
   it "round-trips to the original String using Integer#chr" do
     s = "\u{13}\u{7711}\u{1010}"
-    s2 = ""
+    s2 = +""
     s.send(@method) {|n| s2 << n.chr(Encoding::UTF_8)}
     s.should == s2
   end
diff --git a/spec/ruby/core/string/shared/concat.rb b/spec/ruby/core/string/shared/concat.rb
index ee5ef2a98fdf2e..dded9a69e73e35 100644
--- a/spec/ruby/core/string/shared/concat.rb
+++ b/spec/ruby/core/string/shared/concat.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: false
 describe :string_concat, shared: true do
   it "concatenates the given argument to self and returns self" do
     str = 'hello '
diff --git a/spec/ruby/core/string/shared/dedup.rb b/spec/ruby/core/string/shared/dedup.rb
index 893fd1e360ea36..1ffd6aa0fd0ef1 100644
--- a/spec/ruby/core/string/shared/dedup.rb
+++ b/spec/ruby/core/string/shared/dedup.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: false
 describe :string_dedup, shared: true do
   it 'returns self if the String is frozen' do
     input  = 'foo'.freeze
@@ -47,9 +48,4 @@
     dynamic.send(@method).should_not equal("this string is frozen".send(@method).freeze)
     dynamic.send(@method).should equal(dynamic)
   end
-
-  it "interns the provided string if it is frozen" do
-    dynamic = "this string is unique and frozen #{rand}".freeze
-    dynamic.send(@method).should equal(dynamic)
-  end
 end
diff --git a/spec/ruby/core/string/shared/each_codepoint_without_block.rb b/spec/ruby/core/string/shared/each_codepoint_without_block.rb
index 92b7f76032e7d8..c88e5c54c75993 100644
--- a/spec/ruby/core/string/shared/each_codepoint_without_block.rb
+++ b/spec/ruby/core/string/shared/each_codepoint_without_block.rb
@@ -1,4 +1,4 @@
-# -*- encoding: binary -*-
+# encoding: binary
 describe :string_each_codepoint_without_block, shared: true do
   describe "when no block is given" do
     it "returns an Enumerator" do
@@ -6,7 +6,7 @@
     end
 
     it "returns an Enumerator even when self has an invalid encoding" do
-      s = "\xDF".force_encoding(Encoding::UTF_8)
+      s = "\xDF".dup.force_encoding(Encoding::UTF_8)
       s.valid_encoding?.should be_false
       s.send(@method).should be_an_instance_of(Enumerator)
     end
@@ -23,7 +23,7 @@
         end
 
         it "should return the size of the string even when the string has an invalid encoding" do
-          s = "\xDF".force_encoding(Encoding::UTF_8)
+          s = "\xDF".dup.force_encoding(Encoding::UTF_8)
           s.valid_encoding?.should be_false
           s.send(@method).size.should == 1
         end
diff --git a/spec/ruby/core/string/shared/each_line.rb b/spec/ruby/core/string/shared/each_line.rb
index a14b4d7779eba9..231a6d9d4ff3a2 100644
--- a/spec/ruby/core/string/shared/each_line.rb
+++ b/spec/ruby/core/string/shared/each_line.rb
@@ -106,7 +106,7 @@
   end
 
   it "does not care if the string is modified while substituting" do
-    str = "hello\nworld."
+    str = +"hello\nworld."
     out = []
     str.send(@method){|x| out << x; str[-1] = '!' }.should == "hello\nworld!"
     out.should == ["hello\n", "world."]
diff --git a/spec/ruby/core/string/shared/encode.rb b/spec/ruby/core/string/shared/encode.rb
index a73de5b9434be4..9466308886ee9d 100644
--- a/spec/ruby/core/string/shared/encode.rb
+++ b/spec/ruby/core/string/shared/encode.rb
@@ -1,4 +1,5 @@
 # -*- encoding: utf-8 -*-
+# frozen_string_literal: false
 describe :string_encode, shared: true do
   describe "when passed no options" do
     it "transcodes to Encoding.default_internal when set" do
@@ -193,6 +194,190 @@
     end
   end
 
+  describe "given the fallback option" do
+    context "given a hash" do
+      it "looks up the replacement value from the hash" do
+        encoded = "B\ufffd".encode(Encoding::US_ASCII, fallback: { "\ufffd" => "bar" })
+        encoded.should == "Bbar"
+      end
+
+      it "calls to_str on the returned value" do
+        obj = Object.new
+        obj.should_receive(:to_str).and_return("bar")
+        encoded = "B\ufffd".encode(Encoding::US_ASCII, fallback: { "\ufffd" => obj })
+        encoded.should == "Bbar"
+      end
+
+      it "does not call to_s on the returned value" do
+        obj = Object.new
+        obj.should_not_receive(:to_s)
+        -> {
+          "B\ufffd".encode(Encoding::US_ASCII, fallback: { "\ufffd" => obj })
+        }.should raise_error(TypeError, "no implicit conversion of Object into String")
+      end
+
+      it "raises an error if the key is not present in the hash" do
+        -> {
+          "B\ufffd".encode(Encoding::US_ASCII, fallback: { "foo" => "bar" })
+        }.should raise_error(Encoding::UndefinedConversionError, "U+FFFD from UTF-8 to US-ASCII")
+      end
+
+      it "raises an error if the value is itself invalid" do
+        -> {
+          "B\ufffd".encode(Encoding::US_ASCII, fallback: { "\ufffd" => "\uffee" })
+        }.should raise_error(ArgumentError, "too big fallback string")
+      end
+
+      it "uses the hash's default value if set" do
+        hash = {}
+        hash.default = "bar"
+        encoded = "B\ufffd".encode(Encoding::US_ASCII, fallback: hash)
+        encoded.should == "Bbar"
+      end
+
+      it "uses the result of calling default_proc if set" do
+        hash = {}
+        hash.default_proc = -> _, _ { "bar" }
+        encoded = "B\ufffd".encode(Encoding::US_ASCII, fallback: hash)
+        encoded.should == "Bbar"
+      end
+    end
+
+    context "given an object inheriting from Hash" do
+      before do
+        klass = Class.new(Hash)
+        @hash_like = klass.new
+        @hash_like["\ufffd"] = "bar"
+      end
+
+      it "looks up the replacement value from the object" do
+        encoded = "B\ufffd".encode(Encoding::US_ASCII, fallback: @hash_like)
+        encoded.should == "Bbar"
+      end
+    end
+
+    context "given an object responding to []" do
+      before do
+        klass = Class.new do
+          def [](c) = c.bytes.inspect
+        end
+        @hash_like = klass.new
+      end
+
+      it "calls [] on the object, passing the invalid character" do
+        encoded = "B\ufffd".encode(Encoding::US_ASCII, fallback: @hash_like)
+        encoded.should == "B[239, 191, 189]"
+      end
+    end
+
+    context "given an object not responding to []" do
+      before do
+        @non_hash_like = Object.new
+      end
+
+      it "raises an error" do
+        -> {
+          "B\ufffd".encode(Encoding::US_ASCII, fallback: @non_hash_like)
+        }.should raise_error(Encoding::UndefinedConversionError, "U+FFFD from UTF-8 to US-ASCII")
+      end
+    end
+
+    context "given a proc" do
+      it "calls the proc to get the replacement value, passing in the invalid character" do
+        encoded = "B\ufffd".encode(Encoding::US_ASCII, fallback: proc { |c| c.bytes.inspect })
+        encoded.should == "B[239, 191, 189]"
+      end
+
+      it "calls to_str on the returned value" do
+        obj = Object.new
+        obj.should_receive(:to_str).and_return("bar")
+        encoded = "B\ufffd".encode(Encoding::US_ASCII, fallback: proc { |c| obj })
+        encoded.should == "Bbar"
+      end
+
+      it "does not call to_s on the returned value" do
+        obj = Object.new
+        obj.should_not_receive(:to_s)
+        -> {
+          "B\ufffd".encode(Encoding::US_ASCII, fallback: proc { |c| obj })
+        }.should raise_error(TypeError, "no implicit conversion of Object into String")
+      end
+
+      it "raises an error if the returned value is itself invalid" do
+        -> {
+          "B\ufffd".encode(Encoding::US_ASCII, fallback: -> c { "\uffee" })
+        }.should raise_error(ArgumentError, "too big fallback string")
+      end
+    end
+
+    context "given a lambda" do
+      it "calls the lambda to get the replacement value, passing in the invalid character" do
+        encoded = "B\ufffd".encode(Encoding::US_ASCII, fallback: -> c { c.bytes.inspect })
+        encoded.should == "B[239, 191, 189]"
+      end
+
+      it "calls to_str on the returned value" do
+        obj = Object.new
+        obj.should_receive(:to_str).and_return("bar")
+        encoded = "B\ufffd".encode(Encoding::US_ASCII, fallback: -> c { obj })
+        encoded.should == "Bbar"
+      end
+
+      it "does not call to_s on the returned value" do
+        obj = Object.new
+        obj.should_not_receive(:to_s)
+        -> {
+          "B\ufffd".encode(Encoding::US_ASCII, fallback: -> c { obj })
+        }.should raise_error(TypeError, "no implicit conversion of Object into String")
+      end
+
+      it "raises an error if the returned value is itself invalid" do
+        -> {
+          "B\ufffd".encode(Encoding::US_ASCII, fallback: -> c { "\uffee" })
+        }.should raise_error(ArgumentError, "too big fallback string")
+      end
+    end
+
+    context "given a method" do
+      def replace(c) = c.bytes.inspect
+      def replace_bad(c) = "\uffee"
+
+      def replace_to_str(c)
+        obj = Object.new
+        obj.should_receive(:to_str).and_return("bar")
+        obj
+      end
+
+      def replace_to_s(c)
+        obj = Object.new
+        obj.should_not_receive(:to_s)
+        obj
+      end
+
+      it "calls the method to get the replacement value, passing in the invalid character" do
+        encoded = "B\ufffd".encode(Encoding::US_ASCII, fallback: method(:replace))
+        encoded.should == "B[239, 191, 189]"
+      end
+
+      it "calls to_str on the returned value" do
+        encoded = "B\ufffd".encode(Encoding::US_ASCII, fallback: method(:replace_to_str))
+        encoded.should == "Bbar"
+      end
+
+      it "does not call to_s on the returned value" do
+        -> {
+          "B\ufffd".encode(Encoding::US_ASCII, fallback: method(:replace_to_s))
+        }.should raise_error(TypeError, "no implicit conversion of Object into String")
+      end
+
+      it "raises an error if the returned value is itself invalid" do
+        -> {
+          "B\ufffd".encode(Encoding::US_ASCII, fallback: method(:replace_bad))
+        }.should raise_error(ArgumentError, "too big fallback string")
+      end
+    end
+  end
+
   describe "given the xml: :text option" do
     it "replaces all instances of '&' with '&amp;'" do
       '& and &'.send(@method, "UTF-8", xml: :text).should == '&amp; and &amp;'
diff --git a/spec/ruby/core/string/shared/eql.rb b/spec/ruby/core/string/shared/eql.rb
index 6f268c929cd378..d5af337d53c117 100644
--- a/spec/ruby/core/string/shared/eql.rb
+++ b/spec/ruby/core/string/shared/eql.rb
@@ -1,4 +1,4 @@
-# -*- encoding: binary -*-
+# encoding: binary
 require_relative '../../../spec_helper'
 require_relative '../fixtures/classes'
 
@@ -13,15 +13,15 @@
   end
 
   it "ignores encoding difference of compatible string" do
-    "hello".force_encoding("utf-8").send(@method, "hello".force_encoding("iso-8859-1")).should be_true
+    "hello".dup.force_encoding("utf-8").send(@method, "hello".dup.force_encoding("iso-8859-1")).should be_true
   end
 
   it "considers encoding difference of incompatible string" do
-    "\xff".force_encoding("utf-8").send(@method, "\xff".force_encoding("iso-8859-1")).should be_false
+    "\xff".dup.force_encoding("utf-8").send(@method, "\xff".dup.force_encoding("iso-8859-1")).should be_false
   end
 
   it "considers encoding compatibility" do
-    "abcd".force_encoding("utf-8").send(@method, "abcd".force_encoding("utf-32le")).should be_false
+    "abcd".dup.force_encoding("utf-8").send(@method, "abcd".dup.force_encoding("utf-32le")).should be_false
   end
 
   it "ignores subclass differences" do
@@ -33,6 +33,6 @@
   end
 
   it "returns true when comparing 2 empty strings but one is not ASCII-compatible" do
-    "".send(@method, "".force_encoding('iso-2022-jp')).should == true
+    "".send(@method, "".dup.force_encoding('iso-2022-jp')).should == true
   end
 end
diff --git a/spec/ruby/core/string/shared/length.rb b/spec/ruby/core/string/shared/length.rb
index 94e5ec135b07da..ae572ba75562ee 100644
--- a/spec/ruby/core/string/shared/length.rb
+++ b/spec/ruby/core/string/shared/length.rb
@@ -18,7 +18,7 @@
   end
 
   it "returns the length of the new self after encoding is changed" do
-    str = 'こにちわ'
+    str = +'こにちわ'
     str.send(@method)
 
     str.force_encoding('BINARY').send(@method).should == 12
@@ -44,12 +44,12 @@
   end
 
   it "adds 1 (and not 2) for a incomplete surrogate in UTF-16" do
-    "\x00\xd8".force_encoding("UTF-16LE").send(@method).should == 1
-    "\xd8\x00".force_encoding("UTF-16BE").send(@method).should == 1
+    "\x00\xd8".dup.force_encoding("UTF-16LE").send(@method).should == 1
+    "\xd8\x00".dup.force_encoding("UTF-16BE").send(@method).should == 1
   end
 
   it "adds 1 for a broken sequence in UTF-32" do
-    "\x04\x03\x02\x01".force_encoding("UTF-32LE").send(@method).should == 1
-    "\x01\x02\x03\x04".force_encoding("UTF-32BE").send(@method).should == 1
+    "\x04\x03\x02\x01".dup.force_encoding("UTF-32LE").send(@method).should == 1
+    "\x01\x02\x03\x04".dup.force_encoding("UTF-32BE").send(@method).should == 1
   end
 end
diff --git a/spec/ruby/core/string/shared/replace.rb b/spec/ruby/core/string/shared/replace.rb
index a5108d9e7cc167..24dac0eb270873 100644
--- a/spec/ruby/core/string/shared/replace.rb
+++ b/spec/ruby/core/string/shared/replace.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: false
 describe :string_replace, shared: true do
   it "returns self" do
     a = "a"
diff --git a/spec/ruby/core/string/shared/slice.rb b/spec/ruby/core/string/shared/slice.rb
index 3ef4bc50d7e0a2..7b9b9f6a14cc5f 100644
--- a/spec/ruby/core/string/shared/slice.rb
+++ b/spec/ruby/core/string/shared/slice.rb
@@ -84,8 +84,8 @@
     s = "hello there"
     s.send(@method, 1, 9).encoding.should == s.encoding
 
-    a = "hello".force_encoding("binary")
-    b = " there".force_encoding("ISO-8859-1")
+    a = "hello".dup.force_encoding("binary")
+    b = " there".dup.force_encoding("ISO-8859-1")
     c = (a + b).force_encoding(Encoding::US_ASCII)
 
     c.send(@method, 0, 5).encoding.should == Encoding::US_ASCII
@@ -119,6 +119,18 @@
     "hello there".send(@method, -4,-3).should == nil
   end
 
+  platform_is pointer_size: 64 do
+    it "returns nil if the length is negative big value" do
+      "hello there".send(@method, 4, -(1 << 31)).should == nil
+
+      # by some reason length < -(1 << 31) on CI on Windows leads to
+      # 'RangeError: bignum too big to convert into `long'' error
+      platform_is_not :windows do
+        "hello there".send(@method, 4, -(1 << 63)).should == nil
+      end
+    end
+  end
+
   it "calls to_int on the given index and the given length" do
     "hello".send(@method, 0.5, 1).should == "h"
     "hello".send(@method, 0.5, 2.5).should == "he"
@@ -152,6 +164,11 @@
     -> { "hello".send(@method, 0, bignum_value) }.should raise_error(RangeError)
   end
 
+  it "raises a RangeError if the index or length is too small" do
+    -> { "hello".send(@method, -bignum_value, 1) }.should raise_error(RangeError)
+    -> { "hello".send(@method, 0, -bignum_value) }.should raise_error(RangeError)
+  end
+
   it "returns String instances" do
     s = StringSpecs::MyString.new("hello")
     s.send(@method, 0,0).should be_an_instance_of(String)
diff --git a/spec/ruby/core/string/shared/succ.rb b/spec/ruby/core/string/shared/succ.rb
index 24a729ce26e578..7c68345f109de1 100644
--- a/spec/ruby/core/string/shared/succ.rb
+++ b/spec/ruby/core/string/shared/succ.rb
@@ -1,4 +1,4 @@
-# -*- encoding: binary -*-
+# encoding: binary
 describe :string_succ, shared: true do
   it "returns an empty string for empty strings" do
     "".send(@method).should == ""
@@ -73,6 +73,7 @@
 describe :string_succ_bang, shared: true do
   it "is equivalent to succ, but modifies self in place (still returns self)" do
     ["", "abcd", "THX1138"].each do |s|
+      s = +s
       r = s.dup.send(@method)
       s.send(@method).should equal(s)
       s.should == r
diff --git a/spec/ruby/core/string/shared/to_sym.rb b/spec/ruby/core/string/shared/to_sym.rb
index 52d8314211ad10..833eae100e4e6a 100644
--- a/spec/ruby/core/string/shared/to_sym.rb
+++ b/spec/ruby/core/string/shared/to_sym.rb
@@ -56,9 +56,9 @@
   it "ignores existing symbols with different encoding" do
     source = "fée"
 
-    iso_symbol = source.force_encoding(Encoding::ISO_8859_1).send(@method)
+    iso_symbol = source.dup.force_encoding(Encoding::ISO_8859_1).send(@method)
     iso_symbol.encoding.should == Encoding::ISO_8859_1
-    binary_symbol = source.force_encoding(Encoding::BINARY).send(@method)
+    binary_symbol = source.dup.force_encoding(Encoding::BINARY).send(@method)
     binary_symbol.encoding.should == Encoding::BINARY
   end
 
diff --git a/spec/ruby/core/string/slice_spec.rb b/spec/ruby/core/string/slice_spec.rb
index 87c5a7ac37ced2..5aba2d3be069e1 100644
--- a/spec/ruby/core/string/slice_spec.rb
+++ b/spec/ruby/core/string/slice_spec.rb
@@ -1,5 +1,5 @@
 # -*- encoding: utf-8 -*-
-
+# frozen_string_literal: false
 require_relative '../../spec_helper'
 require_relative 'fixtures/classes'
 require_relative 'shared/slice'
diff --git a/spec/ruby/core/string/split_spec.rb b/spec/ruby/core/string/split_spec.rb
index c5cca651c2ad03..3c6d1864d1797e 100644
--- a/spec/ruby/core/string/split_spec.rb
+++ b/spec/ruby/core/string/split_spec.rb
@@ -4,7 +4,7 @@
 
 describe "String#split with String" do
   it "throws an ArgumentError if the string  is not a valid" do
-    s = "\xDF".force_encoding(Encoding::UTF_8)
+    s = "\xDF".dup.force_encoding(Encoding::UTF_8)
 
     -> { s.split }.should raise_error(ArgumentError)
     -> { s.split(':') }.should raise_error(ArgumentError)
@@ -12,7 +12,7 @@
 
   it "throws an ArgumentError if the pattern is not a valid string" do
     str = 'проверка'
-    broken_str = "\xDF".force_encoding(Encoding::UTF_8)
+    broken_str = "\xDF".dup.force_encoding(Encoding::UTF_8)
 
     -> { str.split(broken_str) }.should raise_error(ArgumentError)
   end
@@ -229,7 +229,7 @@
 
 describe "String#split with Regexp" do
   it "throws an ArgumentError if the string  is not a valid" do
-    s = "\xDF".force_encoding(Encoding::UTF_8)
+    s = "\xDF".dup.force_encoding(Encoding::UTF_8)
 
     -> { s.split(/./) }.should raise_error(ArgumentError)
   end
@@ -409,7 +409,7 @@
   end
 
   it "returns an ArgumentError if an invalid UTF-8 string is supplied" do
-    broken_str = 'проверка' # in russian, means "test"
+    broken_str = +'проверка' # in russian, means "test"
     broken_str.force_encoding('binary')
     broken_str.chop!
     broken_str.force_encoding('utf-8')
diff --git a/spec/ruby/core/string/squeeze_spec.rb b/spec/ruby/core/string/squeeze_spec.rb
index 4796a170f28898..981d480684c3cc 100644
--- a/spec/ruby/core/string/squeeze_spec.rb
+++ b/spec/ruby/core/string/squeeze_spec.rb
@@ -1,4 +1,5 @@
-# -*- encoding: binary -*-
+# encoding: binary
+# frozen_string_literal: false
 require_relative '../../spec_helper'
 require_relative 'fixtures/classes'
 
diff --git a/spec/ruby/core/string/start_with_spec.rb b/spec/ruby/core/string/start_with_spec.rb
index 81eed47f96e800..35e33b46a668ee 100644
--- a/spec/ruby/core/string/start_with_spec.rb
+++ b/spec/ruby/core/string/start_with_spec.rb
@@ -11,7 +11,14 @@
     "\xA9".should.start_with?("\xA9") # A9 is not a character head for UTF-8
   end
 
-  ruby_bug "#19784", ""..."3.3" do
+  ruby_version_is ""..."3.3" do
+    it "does not check we are matching only part of a character" do
+      "\xe3\x81\x82".size.should == 1
+      "\xe3\x81\x82".should.start_with?("\xe3")
+    end
+  end
+
+  ruby_version_is "3.3" do # #19784
     it "checks we are matching only part of a character" do
       "\xe3\x81\x82".size.should == 1
       "\xe3\x81\x82".should_not.start_with?("\xe3")
diff --git a/spec/ruby/core/string/strip_spec.rb b/spec/ruby/core/string/strip_spec.rb
index 5e90fe35d02033..edb6ea3b444edc 100644
--- a/spec/ruby/core/string/strip_spec.rb
+++ b/spec/ruby/core/string/strip_spec.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: false
 require_relative '../../spec_helper'
 require_relative 'fixtures/classes'
 require_relative 'shared/strip'
diff --git a/spec/ruby/core/string/sub_spec.rb b/spec/ruby/core/string/sub_spec.rb
index 51920486f53e15..6ff28ec851eb63 100644
--- a/spec/ruby/core/string/sub_spec.rb
+++ b/spec/ruby/core/string/sub_spec.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: false
 require_relative '../../spec_helper'
 require_relative 'fixtures/classes'
 
@@ -231,10 +232,10 @@
     offsets = []
 
     str.sub(/([aeiou])/) do
-       md = $~
-       md.string.should == str
-       offsets << md.offset(0)
-       str
+      md = $~
+      md.string.should == str
+      offsets << md.offset(0)
+      str
     end.should == "hhellollo"
 
     offsets.should == [[1, 2]]
@@ -338,10 +339,10 @@
     offsets = []
 
     str.dup.sub!(/([aeiou])/) do
-       md = $~
-       md.string.should == str
-       offsets << md.offset(0)
-       str
+      md = $~
+      md.string.should == str
+      offsets << md.offset(0)
+      str
     end.should == "hhellollo"
 
     offsets.should == [[1, 2]]
diff --git a/spec/ruby/core/string/swapcase_spec.rb b/spec/ruby/core/string/swapcase_spec.rb
index d740fb86c6d427..011a2135016e65 100644
--- a/spec/ruby/core/string/swapcase_spec.rb
+++ b/spec/ruby/core/string/swapcase_spec.rb
@@ -1,12 +1,13 @@
 # -*- encoding: utf-8 -*-
+# frozen_string_literal: false
 require_relative '../../spec_helper'
 require_relative 'fixtures/classes'
 
 describe "String#swapcase" do
   it "returns a new string with all uppercase chars from self converted to lowercase and vice versa" do
-   "Hello".swapcase.should == "hELLO"
-   "cYbEr_PuNk11".swapcase.should == "CyBeR_pUnK11"
-   "+++---111222???".swapcase.should == "+++---111222???"
+    "Hello".swapcase.should == "hELLO"
+    "cYbEr_PuNk11".swapcase.should == "CyBeR_pUnK11"
+    "+++---111222???".swapcase.should == "+++---111222???"
   end
 
   it "returns a String in the same encoding as self" do
diff --git a/spec/ruby/core/string/to_c_spec.rb b/spec/ruby/core/string/to_c_spec.rb
index 9d24f1f56c90d1..1813890e722067 100644
--- a/spec/ruby/core/string/to_c_spec.rb
+++ b/spec/ruby/core/string/to_c_spec.rb
@@ -13,18 +13,20 @@
 
   it "ignores trailing garbage" do
     '79+4iruby'.to_c.should == Complex(79, 4)
-    ruby_bug "[Bug #19087]", ""..."3.2" do
-      '7__9+4__0i'.to_c.should == Complex(7, 0)
-    end
+    '7__9+4__0i'.to_c.should == Complex(7, 0)
   end
 
-  it "understands Float::INFINITY" do
-    'Infinity'.to_c.should == Complex(0, 1)
-    '-Infinity'.to_c.should == Complex(0, -1)
-  end
+  context "it treats special float value strings as characters" do
+    it "parses any string that starts with 'I' as 1i" do
+      'Infinity'.to_c.should == Complex(0, 1)
+      '-Infinity'.to_c.should == Complex(0, -1)
+      'Insecure'.to_c.should == Complex(0, 1)
+      '-Insecure'.to_c.should == Complex(0, -1)
+    end
 
-  it "understands Float::NAN" do
-    'NaN'.to_c.should == Complex(0, 0)
+    it "does not parse any numeric information in 'NaN'" do
+      'NaN'.to_c.should == Complex(0, 0)
+    end
   end
 
   it "allows null-byte" do
@@ -39,15 +41,13 @@
     }.should raise_error(Encoding::CompatibilityError, "ASCII incompatible encoding: UTF-16")
   end
 
-  ruby_version_is "3.2" do
-    it "treats a sequence of underscores as an end of Complex string" do
-      "5+3_1i".to_c.should == Complex(5, 31)
-      "5+3__1i".to_c.should == Complex(5)
-      "5+3___1i".to_c.should == Complex(5)
+  it "treats a sequence of underscores as an end of Complex string" do
+    "5+3_1i".to_c.should == Complex(5, 31)
+    "5+3__1i".to_c.should == Complex(5)
+    "5+3___1i".to_c.should == Complex(5)
 
-      "12_3".to_c.should == Complex(123)
-      "12__3".to_c.should == Complex(12)
-      "12___3".to_c.should == Complex(12)
-    end
+    "12_3".to_c.should == Complex(123)
+    "12__3".to_c.should == Complex(12)
+    "12___3".to_c.should == Complex(12)
   end
 end
diff --git a/spec/ruby/core/string/to_f_spec.rb b/spec/ruby/core/string/to_f_spec.rb
index cf64ecfc5dcb32..a91ccc168ecfee 100644
--- a/spec/ruby/core/string/to_f_spec.rb
+++ b/spec/ruby/core/string/to_f_spec.rb
@@ -5,16 +5,15 @@
 
 describe "String#to_f" do
   it "treats leading characters of self as a floating point number" do
-   "123.45e1".to_f.should == 1234.5
-   "45.67 degrees".to_f.should == 45.67
-   "0".to_f.should == 0.0
-   "123.45e1".to_f.should == 1234.5
+    "123.45e1".to_f.should == 1234.5
+    "45.67 degrees".to_f.should == 45.67
+    "0".to_f.should == 0.0
 
-   ".5".to_f.should == 0.5
-   ".5e1".to_f.should == 5.0
-   "5.".to_f.should == 5.0
-   "5e".to_f.should == 5.0
-   "5E".to_f.should == 5.0
+    ".5".to_f.should == 0.5
+    ".5e1".to_f.should == 5.0
+    "5.".to_f.should == 5.0
+    "5e".to_f.should == 5.0
+    "5E".to_f.should == 5.0
   end
 
   it "treats special float value strings as characters" do
@@ -43,18 +42,39 @@
     "1_234_567.890_1".to_f.should == 1_234_567.890_1
   end
 
-  it "returns 0 for strings with any non-digit in them" do
-    "blah".to_f.should == 0
-    "0b5".to_f.should == 0
-    "0d5".to_f.should == 0
-    "0o5".to_f.should == 0
-    "0xx5".to_f.should == 0
-  end
-
   it "returns 0 for strings with leading underscores" do
     "_9".to_f.should == 0
   end
 
+  it "stops if the underscore is not followed or preceded by a number" do
+    "1__2".to_f.should == 1.0
+    "1_.2".to_f.should == 1.0
+    "1._2".to_f.should == 1.0
+    "1.2_e2".to_f.should == 1.2
+    "1.2e_2".to_f.should == 1.2
+    "1_x2".to_f.should == 1.0
+    "1x_2".to_f.should == 1.0
+    "+_1".to_f.should == 0.0
+    "-_1".to_f.should == 0.0
+  end
+
+  it "does not allow prefixes to autodetect the base" do
+    "0b10".to_f.should == 0
+    "010".to_f.should == 10
+    "0o10".to_f.should == 0
+    "0d10".to_f.should == 0
+    "0x10".to_f.should == 0
+  end
+
+  it "treats any non-numeric character other than '.', 'e' and '_' as terminals" do
+    "blah".to_f.should == 0
+    "1b5".to_f.should == 1
+    "1d5".to_f.should == 1
+    "1o5".to_f.should == 1
+    "1xx5".to_f.should == 1
+    "x5".to_f.should == 0
+  end
+
   it "takes an optional sign" do
     "-45.67 degrees".to_f.should == -45.67
     "+45.67 degrees".to_f.should == 45.67
@@ -63,8 +83,48 @@
     (1.0 / "-0".to_f).to_s.should == "-Infinity"
   end
 
+  it "treats a second 'e' as terminal" do
+    "1.234e1e2".to_f.should == 1.234e1
+  end
+
+  it "treats a second '.' as terminal" do
+    "1.2.3".to_f.should == 1.2
+  end
+
+  it "treats a '.' after an 'e' as terminal" do
+    "1.234e1.9".to_f.should == 1.234e1
+  end
+
   it "returns 0.0 if the conversion fails" do
     "bad".to_f.should == 0.0
     "thx1138".to_f.should == 0.0
   end
+
+  it "ignores leading and trailing whitespace" do
+    "  1.2".to_f.should == 1.2
+    "1.2  ".to_f.should == 1.2
+    " 1.2 ".to_f.should == 1.2
+    "\t1.2".to_f.should == 1.2
+    "\n1.2".to_f.should == 1.2
+    "\v1.2".to_f.should == 1.2
+    "\f1.2".to_f.should == 1.2
+    "\r1.2".to_f.should == 1.2
+  end
+
+  it "treats non-printable ASCII characters as terminals" do
+    "\0001.2".to_f.should == 0
+    "\0011.2".to_f.should == 0
+    "\0371.2".to_f.should == 0
+    "\1771.2".to_f.should == 0
+    "\2001.2".b.to_f.should == 0
+    "\3771.2".b.to_f.should == 0
+  end
+
+  ruby_version_is "3.2.3" do
+    it "raises Encoding::CompatibilityError if String is in not ASCII-compatible encoding" do
+      -> {
+        '1.2'.encode("UTF-16").to_f
+      }.should raise_error(Encoding::CompatibilityError, "ASCII incompatible encoding: UTF-16")
+    end
+  end
 end
diff --git a/spec/ruby/core/string/to_i_spec.rb b/spec/ruby/core/string/to_i_spec.rb
index e4fa89aab3e268..39f69acda3107b 100644
--- a/spec/ruby/core/string/to_i_spec.rb
+++ b/spec/ruby/core/string/to_i_spec.rb
@@ -10,6 +10,18 @@
     "1_2_3asdf".to_i.should == 123
   end
 
+  it "ignores multiple non-consecutive underscores when the first digit is 0" do
+    (2..16).each do |base|
+      "0_0_010".to_i(base).should == base;
+    end
+  end
+
+  it "bails out at the first double underscore if the first digit is 0" do
+    (2..16).each do |base|
+      "010__1".to_i(base).should == base;
+    end
+  end
+
   it "ignores leading whitespaces" do
     [ " 123", "     123", "\r\n\r\n123", "\t\t123",
       "\r\n\t\n123", " \t\n\r\t 123"].each do |str|
diff --git a/spec/ruby/core/string/to_r_spec.rb b/spec/ruby/core/string/to_r_spec.rb
index 7e1d635d3b084e..4ffbb10d9878e5 100644
--- a/spec/ruby/core/string/to_r_spec.rb
+++ b/spec/ruby/core/string/to_r_spec.rb
@@ -33,6 +33,10 @@
     "-20".to_r.should == Rational(-20, 1)
   end
 
+  it "accepts leading plus signs" do
+    "+20".to_r.should == Rational(20, 1)
+  end
+
   it "does not treat a leading period without a numeric prefix as a decimal point" do
     ".9".to_r.should_not == Rational(8106479329266893, 9007199254740992)
   end
diff --git a/spec/ruby/core/string/tr_s_spec.rb b/spec/ruby/core/string/tr_s_spec.rb
index 3c3147304478e3..dd72da440c93d5 100644
--- a/spec/ruby/core/string/tr_s_spec.rb
+++ b/spec/ruby/core/string/tr_s_spec.rb
@@ -1,4 +1,5 @@
 # -*- encoding: utf-8 -*-
+# frozen_string_literal: false
 require_relative '../../spec_helper'
 require_relative 'fixtures/classes'
 
diff --git a/spec/ruby/core/string/tr_spec.rb b/spec/ruby/core/string/tr_spec.rb
index d60480dc7e4bdb..75841a974fcc53 100644
--- a/spec/ruby/core/string/tr_spec.rb
+++ b/spec/ruby/core/string/tr_spec.rb
@@ -1,4 +1,5 @@
 # -*- encoding: utf-8 -*-
+# frozen_string_literal: false
 require_relative '../../spec_helper'
 require_relative 'fixtures/classes'
 
diff --git a/spec/ruby/core/string/unicode_normalize_spec.rb b/spec/ruby/core/string/unicode_normalize_spec.rb
index 6de7533fc7aebe..2e7d22394a28a2 100644
--- a/spec/ruby/core/string/unicode_normalize_spec.rb
+++ b/spec/ruby/core/string/unicode_normalize_spec.rb
@@ -1,4 +1,5 @@
 # -*- encoding: utf-8 -*-
+# frozen_string_literal: false
 require_relative '../../spec_helper'
 
 # Examples taken from http://www.unicode.org/reports/tr15/#Norm_Forms
diff --git a/spec/ruby/core/string/unicode_normalized_spec.rb b/spec/ruby/core/string/unicode_normalized_spec.rb
index 87f3740459bb0b..91cf2086b25972 100644
--- a/spec/ruby/core/string/unicode_normalized_spec.rb
+++ b/spec/ruby/core/string/unicode_normalized_spec.rb
@@ -1,4 +1,5 @@
 # -*- encoding: utf-8 -*-
+# frozen_string_literal: false
 require_relative '../../spec_helper'
 
 describe "String#unicode_normalized?" do
diff --git a/spec/ruby/core/string/unpack/a_spec.rb b/spec/ruby/core/string/unpack/a_spec.rb
index 2d83b4c8240a7a..a68e842e15200e 100644
--- a/spec/ruby/core/string/unpack/a_spec.rb
+++ b/spec/ruby/core/string/unpack/a_spec.rb
@@ -1,4 +1,4 @@
-# -*- encoding: binary -*-
+# encoding: binary
 require_relative '../../../spec_helper'
 require_relative '../fixtures/classes'
 require_relative 'shared/basic'
@@ -31,7 +31,7 @@
   end
 
   it "decodes into raw (ascii) string values" do
-    str = "str".force_encoding('UTF-8').unpack("A*")[0]
+    str = "str".dup.force_encoding('UTF-8').unpack("A*")[0]
     str.encoding.should == Encoding::BINARY
   end
 
diff --git a/spec/ruby/core/string/unpack/at_spec.rb b/spec/ruby/core/string/unpack/at_spec.rb
index 70b2389d6974f1..d4133c23ee5576 100644
--- a/spec/ruby/core/string/unpack/at_spec.rb
+++ b/spec/ruby/core/string/unpack/at_spec.rb
@@ -1,4 +1,4 @@
-# -*- encoding: binary -*-
+# encoding: binary
 require_relative '../../../spec_helper'
 require_relative '../fixtures/classes'
 require_relative 'shared/basic'
diff --git a/spec/ruby/core/string/unpack/b_spec.rb b/spec/ruby/core/string/unpack/b_spec.rb
index 5c53eff7213b99..b088f901fc026c 100644
--- a/spec/ruby/core/string/unpack/b_spec.rb
+++ b/spec/ruby/core/string/unpack/b_spec.rb
@@ -1,4 +1,4 @@
-# -*- encoding: binary -*-
+# encoding: binary
 require_relative '../../../spec_helper'
 require_relative '../fixtures/classes'
 require_relative 'shared/basic'
@@ -107,7 +107,7 @@
   end
 
   it "decodes into US-ASCII string values" do
-    str = "s".force_encoding('UTF-8').unpack("B*")[0]
+    str = "s".dup.force_encoding('UTF-8').unpack("B*")[0]
     str.encoding.name.should == 'US-ASCII'
   end
 end
@@ -215,7 +215,7 @@
   end
 
   it "decodes into US-ASCII string values" do
-    str = "s".force_encoding('UTF-8').unpack("b*")[0]
+    str = "s".dup.force_encoding('UTF-8').unpack("b*")[0]
     str.encoding.name.should == 'US-ASCII'
   end
 end
diff --git a/spec/ruby/core/string/unpack/c_spec.rb b/spec/ruby/core/string/unpack/c_spec.rb
index c2bf813954352f..1e9548fb82411a 100644
--- a/spec/ruby/core/string/unpack/c_spec.rb
+++ b/spec/ruby/core/string/unpack/c_spec.rb
@@ -1,4 +1,4 @@
-# -*- encoding: binary -*-
+# encoding: binary
 require_relative '../../../spec_helper'
 require_relative '../fixtures/classes'
 require_relative 'shared/basic'
diff --git a/spec/ruby/core/string/unpack/comment_spec.rb b/spec/ruby/core/string/unpack/comment_spec.rb
index e18a53df3c468d..050d2b7fc0bed6 100644
--- a/spec/ruby/core/string/unpack/comment_spec.rb
+++ b/spec/ruby/core/string/unpack/comment_spec.rb
@@ -1,4 +1,4 @@
-# -*- encoding: binary -*-
+# encoding: binary
 require_relative '../../../spec_helper'
 require_relative '../fixtures/classes'
 
diff --git a/spec/ruby/core/string/unpack/h_spec.rb b/spec/ruby/core/string/unpack/h_spec.rb
index 19c4d636641da1..535836087d0f56 100644
--- a/spec/ruby/core/string/unpack/h_spec.rb
+++ b/spec/ruby/core/string/unpack/h_spec.rb
@@ -1,4 +1,4 @@
-# -*- encoding: binary -*-
+# encoding: binary
 require_relative '../../../spec_helper'
 require_relative '../fixtures/classes'
 require_relative 'shared/basic'
diff --git a/spec/ruby/core/string/unpack/l_spec.rb b/spec/ruby/core/string/unpack/l_spec.rb
index 18bb68b8d06a9e..0adb567eca65a7 100644
--- a/spec/ruby/core/string/unpack/l_spec.rb
+++ b/spec/ruby/core/string/unpack/l_spec.rb
@@ -14,7 +14,7 @@
     it_behaves_like :string_unpack_32bit_be_unsigned, 'L>'
   end
 
-  platform_is wordsize: 32 do
+  platform_is c_long_size: 32 do
     describe "with modifier '<' and '_'" do
       it_behaves_like :string_unpack_32bit_le, 'L<_'
       it_behaves_like :string_unpack_32bit_le, 'L_<'
@@ -44,7 +44,7 @@
     end
   end
 
-  platform_is wordsize: 64 do
+  platform_is c_long_size: 64 do
     describe "with modifier '<' and '_'" do
       it_behaves_like :string_unpack_64bit_le, 'L<_'
       it_behaves_like :string_unpack_64bit_le, 'L_<'
@@ -86,7 +86,7 @@
     it_behaves_like :string_unpack_32bit_be_signed, 'l>'
   end
 
-  platform_is wordsize: 32 do
+  platform_is c_long_size: 32 do
     describe "with modifier '<' and '_'" do
       it_behaves_like :string_unpack_32bit_le, 'l<_'
       it_behaves_like :string_unpack_32bit_le, 'l_<'
@@ -116,7 +116,7 @@
     end
   end
 
-  platform_is wordsize: 64 do
+  platform_is c_long_size: 64 do
     describe "with modifier '<' and '_'" do
       it_behaves_like :string_unpack_64bit_le, 'l<_'
       it_behaves_like :string_unpack_64bit_le, 'l_<'
@@ -160,7 +160,7 @@
     it_behaves_like :string_unpack_32bit_le_signed, 'l'
   end
 
-  platform_is wordsize: 32 do
+  platform_is c_long_size: 32 do
     describe "String#unpack with format 'L' with modifier '_'" do
       it_behaves_like :string_unpack_32bit_le, 'L_'
       it_behaves_like :string_unpack_32bit_le_unsigned, 'L_'
@@ -182,7 +182,7 @@
     end
   end
 
-  platform_is wordsize: 64 do
+  platform_is c_long_size: 64 do
     describe "String#unpack with format 'L' with modifier '_'" do
       it_behaves_like :string_unpack_64bit_le, 'L_'
       it_behaves_like :string_unpack_64bit_le_unsigned, 'L_'
@@ -218,7 +218,7 @@
     it_behaves_like :string_unpack_32bit_be_signed, 'l'
   end
 
-  platform_is wordsize: 32 do
+  platform_is c_long_size: 32 do
     describe "String#unpack with format 'L' with modifier '_'" do
       it_behaves_like :string_unpack_32bit_be, 'L_'
       it_behaves_like :string_unpack_32bit_be_unsigned, 'L_'
@@ -240,7 +240,7 @@
     end
   end
 
-  platform_is wordsize: 64 do
+  platform_is c_long_size: 64 do
     describe "String#unpack with format 'L' with modifier '_'" do
       it_behaves_like :string_unpack_64bit_be, 'L_'
       it_behaves_like :string_unpack_64bit_be_unsigned, 'L_'
diff --git a/spec/ruby/core/string/unpack/m_spec.rb b/spec/ruby/core/string/unpack/m_spec.rb
index c551c755d16ee9..357987a053def1 100644
--- a/spec/ruby/core/string/unpack/m_spec.rb
+++ b/spec/ruby/core/string/unpack/m_spec.rb
@@ -1,4 +1,4 @@
-# -*- encoding: binary -*-
+# encoding: binary
 require_relative '../../../spec_helper'
 require_relative '../fixtures/classes'
 require_relative 'shared/basic'
diff --git a/spec/ruby/core/string/unpack/shared/basic.rb b/spec/ruby/core/string/unpack/shared/basic.rb
index bb5302edc5323b..b37a447683a95c 100644
--- a/spec/ruby/core/string/unpack/shared/basic.rb
+++ b/spec/ruby/core/string/unpack/shared/basic.rb
@@ -8,6 +8,15 @@
     d.should_receive(:to_str).and_return("a"+unpack_format)
     "abc".unpack(d).should be_an_instance_of(Array)
   end
+
+  ruby_version_is "3.3" do
+    # https://bugs.ruby-lang.org/issues/19150
+    it 'raise ArgumentError when a directive is unknown' do
+      -> { "abcdefgh".unpack("a R" + unpack_format) }.should raise_error(ArgumentError, /unknown unpack directive 'R'/)
+      -> { "abcdefgh".unpack("a 0" + unpack_format) }.should raise_error(ArgumentError, /unknown unpack directive '0'/)
+      -> { "abcdefgh".unpack("a :" + unpack_format) }.should raise_error(ArgumentError, /unknown unpack directive ':'/)
+    end
+  end
 end
 
 describe :string_unpack_no_platform, shared: true do
diff --git a/spec/ruby/core/string/unpack/shared/float.rb b/spec/ruby/core/string/unpack/shared/float.rb
index 93282bf4c9b434..b31c2c8bdc406a 100644
--- a/spec/ruby/core/string/unpack/shared/float.rb
+++ b/spec/ruby/core/string/unpack/shared/float.rb
@@ -1,4 +1,4 @@
-# -*- encoding: binary -*-
+# encoding: binary
 
 describe :string_unpack_float_le, shared: true do
   it "decodes one float for a single format character" do
diff --git a/spec/ruby/core/string/unpack/shared/integer.rb b/spec/ruby/core/string/unpack/shared/integer.rb
index d71a2cf00dd213..d3934753ba3ef8 100644
--- a/spec/ruby/core/string/unpack/shared/integer.rb
+++ b/spec/ruby/core/string/unpack/shared/integer.rb
@@ -1,4 +1,4 @@
-# -*- encoding: binary -*-
+# encoding: binary
 
 describe :string_unpack_16bit_le, shared: true do
   it "decodes one short for a single format character" do
diff --git a/spec/ruby/core/string/unpack/u_spec.rb b/spec/ruby/core/string/unpack/u_spec.rb
index 7845e6d5f238ec..68c8f6f11c1775 100644
--- a/spec/ruby/core/string/unpack/u_spec.rb
+++ b/spec/ruby/core/string/unpack/u_spec.rb
@@ -1,4 +1,4 @@
-# -*- encoding: binary -*-
+# encoding: binary
 require_relative '../../../spec_helper'
 require_relative '../fixtures/classes'
 require_relative 'shared/basic'
@@ -33,7 +33,7 @@
     str = "".unpack("u")[0]
     str.encoding.should == Encoding::BINARY
 
-    str = "1".force_encoding('UTF-8').unpack("u")[0]
+    str = "1".dup.force_encoding('UTF-8').unpack("u")[0]
     str.encoding.should == Encoding::BINARY
   end
 
diff --git a/spec/ruby/core/string/unpack/w_spec.rb b/spec/ruby/core/string/unpack/w_spec.rb
index 6a1cff19653b4a..7d3533ccae109e 100644
--- a/spec/ruby/core/string/unpack/w_spec.rb
+++ b/spec/ruby/core/string/unpack/w_spec.rb
@@ -1,4 +1,4 @@
-# -*- encoding: binary -*-
+# encoding: binary
 require_relative '../../../spec_helper'
 require_relative '../fixtures/classes'
 require_relative 'shared/basic'
diff --git a/spec/ruby/core/string/unpack/x_spec.rb b/spec/ruby/core/string/unpack/x_spec.rb
index 5e248de77eebd2..2926ebbe0f3a95 100644
--- a/spec/ruby/core/string/unpack/x_spec.rb
+++ b/spec/ruby/core/string/unpack/x_spec.rb
@@ -1,4 +1,4 @@
-# -*- encoding: binary -*-
+# encoding: binary
 require_relative '../../../spec_helper'
 require_relative '../fixtures/classes'
 require_relative 'shared/basic'
diff --git a/spec/ruby/core/string/unpack/z_spec.rb b/spec/ruby/core/string/unpack/z_spec.rb
index ce8da4b29eef30..10303905508704 100644
--- a/spec/ruby/core/string/unpack/z_spec.rb
+++ b/spec/ruby/core/string/unpack/z_spec.rb
@@ -1,4 +1,4 @@
-# -*- encoding: binary -*-
+# encoding: binary
 require_relative '../../../spec_helper'
 require_relative '../fixtures/classes'
 require_relative 'shared/basic'
diff --git a/spec/ruby/core/string/unpack1_spec.rb b/spec/ruby/core/string/unpack1_spec.rb
index df830916a335b7..3b3b879f75f946 100644
--- a/spec/ruby/core/string/unpack1_spec.rb
+++ b/spec/ruby/core/string/unpack1_spec.rb
@@ -8,29 +8,27 @@
     "A".unpack1("B*").should == "01000001"
   end
 
-  ruby_version_is "3.1" do
-    it "starts unpacking from the given offset" do
-      "ZZABCD".unpack1('x3C', offset: 2).should == "ABCD".unpack('x3C')[0]
-      "ZZZZaG9nZWZ1Z2E=".unpack1("m", offset: 4).should == "hogefuga"
-      "ZA".unpack1("B*", offset: 1).should == "01000001"
-    end
+  it "starts unpacking from the given offset" do
+    "ZZABCD".unpack1('x3C', offset: 2).should == "ABCD".unpack('x3C')[0]
+    "ZZZZaG9nZWZ1Z2E=".unpack1("m", offset: 4).should == "hogefuga"
+    "ZA".unpack1("B*", offset: 1).should == "01000001"
+  end
 
-    it "traits offset as a bytes offset" do
-      "؈".unpack("CC").should == [216, 136]
-      "؈".unpack1("C").should == 216
-      "؈".unpack1("C", offset: 1).should == 136
-    end
+  it "traits offset as a bytes offset" do
+    "؈".unpack("CC").should == [216, 136]
+    "؈".unpack1("C").should == 216
+    "؈".unpack1("C", offset: 1).should == 136
+  end
 
-    it "raises an ArgumentError when the offset is negative" do
-      -> { "a".unpack1("C", offset: -1) }.should raise_error(ArgumentError, "offset can't be negative")
-    end
+  it "raises an ArgumentError when the offset is negative" do
+    -> { "a".unpack1("C", offset: -1) }.should raise_error(ArgumentError, "offset can't be negative")
+  end
 
-    it "returns nil if the offset is at the end of the string" do
-      "a".unpack1("C", offset: 1).should == nil
-    end
+  it "returns nil if the offset is at the end of the string" do
+    "a".unpack1("C", offset: 1).should == nil
+  end
 
-    it "raises an ArgumentError when the offset is larger than the string bytesize" do
-      -> { "a".unpack1("C", offset: 2) }.should raise_error(ArgumentError, "offset outside of string")
-    end
+  it "raises an ArgumentError when the offset is larger than the string bytesize" do
+    -> { "a".unpack1("C", offset: 2) }.should raise_error(ArgumentError, "offset outside of string")
   end
 end
diff --git a/spec/ruby/core/string/unpack_spec.rb b/spec/ruby/core/string/unpack_spec.rb
index 52b4af3a95f419..a0abf8fa994788 100644
--- a/spec/ruby/core/string/unpack_spec.rb
+++ b/spec/ruby/core/string/unpack_spec.rb
@@ -9,26 +9,24 @@
     -> { "abc".unpack(1) }.should raise_error(TypeError)
   end
 
-  ruby_version_is "3.1" do
-    it "starts unpacking from the given offset" do
-      "abc".unpack("CC", offset: 1).should == [98, 99]
-    end
+  it "starts unpacking from the given offset" do
+    "abc".unpack("CC", offset: 1).should == [98, 99]
+  end
 
-    it "traits offset as a bytes offset" do
-      "؈".unpack("CC").should == [216, 136]
-      "؈".unpack("CC", offset: 1).should == [136, nil]
-    end
+  it "traits offset as a bytes offset" do
+    "؈".unpack("CC").should == [216, 136]
+    "؈".unpack("CC", offset: 1).should == [136, nil]
+  end
 
-    it "raises an ArgumentError when the offset is negative" do
-      -> { "a".unpack("C", offset: -1) }.should raise_error(ArgumentError, "offset can't be negative")
-    end
+  it "raises an ArgumentError when the offset is negative" do
+    -> { "a".unpack("C", offset: -1) }.should raise_error(ArgumentError, "offset can't be negative")
+  end
 
-    it "returns nil if the offset is at the end of the string" do
-      "a".unpack("C", offset: 1).should == [nil]
-    end
+  it "returns nil if the offset is at the end of the string" do
+    "a".unpack("C", offset: 1).should == [nil]
+  end
 
-    it "raises an ArgumentError when the offset is larget than the string" do
-      -> { "a".unpack("C", offset: 2) }.should raise_error(ArgumentError, "offset outside of string")
-    end
+  it "raises an ArgumentError when the offset is larger than the string" do
+    -> { "a".unpack("C", offset: 2) }.should raise_error(ArgumentError, "offset outside of string")
   end
 end
diff --git a/spec/ruby/core/string/upcase_spec.rb b/spec/ruby/core/string/upcase_spec.rb
index a2e34f5f406827..652de5c2ef0c26 100644
--- a/spec/ruby/core/string/upcase_spec.rb
+++ b/spec/ruby/core/string/upcase_spec.rb
@@ -1,4 +1,5 @@
 # -*- encoding: utf-8 -*-
+# frozen_string_literal: false
 require_relative '../../spec_helper'
 require_relative 'fixtures/classes'
 
diff --git a/spec/ruby/core/string/uplus_spec.rb b/spec/ruby/core/string/uplus_spec.rb
index 038b283c90eff0..c0b0c49edeef22 100644
--- a/spec/ruby/core/string/uplus_spec.rb
+++ b/spec/ruby/core/string/uplus_spec.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: false
 require_relative '../../spec_helper'
 
 describe 'String#+@' do
@@ -7,6 +8,9 @@
 
     output.should_not.frozen?
     output.should == 'foo'
+
+    output << 'bar'
+    output.should == 'foobar'
   end
 
   it 'returns self if the String is not frozen' do
diff --git a/spec/ruby/core/string/upto_spec.rb b/spec/ruby/core/string/upto_spec.rb
index 3799e338e08f31..8bc847d5ac1358 100644
--- a/spec/ruby/core/string/upto_spec.rb
+++ b/spec/ruby/core/string/upto_spec.rb
@@ -81,8 +81,8 @@ def other.to_str() "abd" end
   end
 
   it "raises Encoding::CompatibilityError when incompatible characters are given" do
-    char1 = 'a'.force_encoding("EUC-JP")
-    char2 = 'b'.force_encoding("ISO-2022-JP")
+    char1 = 'a'.dup.force_encoding("EUC-JP")
+    char2 = 'b'.dup.force_encoding("ISO-2022-JP")
     -> { char1.upto(char2) {} }.should raise_error(Encoding::CompatibilityError, "incompatible character encodings: EUC-JP and ISO-2022-JP")
   end
 
diff --git a/spec/ruby/core/string/valid_encoding_spec.rb b/spec/ruby/core/string/valid_encoding_spec.rb
index bb26062c0f6633..375035cd9496a9 100644
--- a/spec/ruby/core/string/valid_encoding_spec.rb
+++ b/spec/ruby/core/string/valid_encoding_spec.rb
@@ -7,13 +7,13 @@
   end
 
   it "returns true if self is valid in the current encoding and other encodings" do
-    str = "\x77"
+    str = +"\x77"
     str.force_encoding('utf-8').valid_encoding?.should be_true
     str.force_encoding('binary').valid_encoding?.should be_true
   end
 
   it "returns true for all encodings self is valid in" do
-    str = "\xE6\x9D\x94"
+    str = +"\xE6\x9D\x94"
     str.force_encoding('BINARY').valid_encoding?.should be_true
     str.force_encoding('UTF-8').valid_encoding?.should be_true
     str.force_encoding('US-ASCII').valid_encoding?.should be_false
@@ -43,10 +43,10 @@
     str.force_encoding('KOI8-R').valid_encoding?.should be_true
     str.force_encoding('KOI8-U').valid_encoding?.should be_true
     str.force_encoding('Shift_JIS').valid_encoding?.should be_false
-    "\xD8\x00".force_encoding('UTF-16BE').valid_encoding?.should be_false
-    "\x00\xD8".force_encoding('UTF-16LE').valid_encoding?.should be_false
-    "\x04\x03\x02\x01".force_encoding('UTF-32BE').valid_encoding?.should be_false
-    "\x01\x02\x03\x04".force_encoding('UTF-32LE').valid_encoding?.should be_false
+    "\xD8\x00".dup.force_encoding('UTF-16BE').valid_encoding?.should be_false
+    "\x00\xD8".dup.force_encoding('UTF-16LE').valid_encoding?.should be_false
+    "\x04\x03\x02\x01".dup.force_encoding('UTF-32BE').valid_encoding?.should be_false
+    "\x01\x02\x03\x04".dup.force_encoding('UTF-32LE').valid_encoding?.should be_false
     str.force_encoding('Windows-1251').valid_encoding?.should be_true
     str.force_encoding('IBM437').valid_encoding?.should be_true
     str.force_encoding('IBM737').valid_encoding?.should be_true
@@ -101,24 +101,24 @@
   end
 
   it "returns true for IBM720 encoding self is valid in" do
-    str = "\xE6\x9D\x94"
+    str = +"\xE6\x9D\x94"
     str.force_encoding('IBM720').valid_encoding?.should be_true
     str.force_encoding('CP720').valid_encoding?.should be_true
   end
 
   it "returns false if self is valid in one encoding, but invalid in the one it's tagged with" do
-    str = "\u{8765}"
+    str = +"\u{8765}"
     str.valid_encoding?.should be_true
-    str = str.force_encoding('ascii')
+    str.force_encoding('ascii')
     str.valid_encoding?.should be_false
   end
 
   it "returns false if self contains a character invalid in the associated encoding" do
-    "abc#{[0x80].pack('C')}".force_encoding('ascii').valid_encoding?.should be_false
+    "abc#{[0x80].pack('C')}".dup.force_encoding('ascii').valid_encoding?.should be_false
   end
 
   it "returns false if a valid String had an invalid character appended to it" do
-    str = "a"
+    str = +"a"
     str.valid_encoding?.should be_true
     str << [0xDD].pack('C').force_encoding('utf-8')
     str.valid_encoding?.should be_false
diff --git a/spec/ruby/core/struct/constants_spec.rb b/spec/ruby/core/struct/constants_spec.rb
index fa61a4b9120896..7e8af1a21192d1 100644
--- a/spec/ruby/core/struct/constants_spec.rb
+++ b/spec/ruby/core/struct/constants_spec.rb
@@ -1,15 +1,13 @@
 require_relative '../../spec_helper'
 
-ruby_version_is "3.2" do
-  describe "Struct::Group" do
-    it "is no longer defined" do
-      Struct.should_not.const_defined?(:Group)
-    end
+describe "Struct::Group" do
+  it "is no longer defined" do
+    Struct.should_not.const_defined?(:Group)
   end
+end
 
-  describe "Struct::Passwd" do
-    it "is no longer defined" do
-      Struct.should_not.const_defined?(:Passwd)
-    end
+describe "Struct::Passwd" do
+  it "is no longer defined" do
+    Struct.should_not.const_defined?(:Passwd)
   end
 end
diff --git a/spec/ruby/core/struct/deconstruct_keys_spec.rb b/spec/ruby/core/struct/deconstruct_keys_spec.rb
index b4c84c49dfa3d8..e16b50f930c921 100644
--- a/spec/ruby/core/struct/deconstruct_keys_spec.rb
+++ b/spec/ruby/core/struct/deconstruct_keys_spec.rb
@@ -40,6 +40,21 @@
     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}
+    s.deconstruct_keys([-1]     ).should == {-1 => 30}
+  end
+
+  it "ignores incorrect position numbers" do
+    struct = Struct.new(:x, :y, :z)
+    s = struct.new(10, 20, 30)
+
+    s.deconstruct_keys([0, 3]).should == {0 => 10}
+  end
+
+  it "support mixing attribute names and argument position numbers" do
+    struct = Struct.new(:x, :y)
+    s = struct.new(1, 2)
+
+    s.deconstruct_keys([0, :x]).should == {0 => 1, :x => 1}
   end
 
   it "returns an empty hash when there are more keys than attributes" do
@@ -57,6 +72,14 @@
     s.deconstruct_keys([:x, :a]).should == {x: 1}
   end
 
+  it "returns at first not existing argument position number" do
+    struct = Struct.new(:x, :y)
+    s = struct.new(1, 2)
+
+    s.deconstruct_keys([3, 0]).should == {}
+    s.deconstruct_keys([0, 3]).should == {0 => 1}
+  end
+
   it "accepts nil argument and return all the attributes" do
     struct = Struct.new(:x, :y)
     obj = struct.new(1, 2)
@@ -64,6 +87,37 @@
     obj.deconstruct_keys(nil).should == {x: 1, y: 2}
   end
 
+  it "tries to convert a key with #to_int if index is not a String nor a Symbol, but responds to #to_int" do
+    struct = Struct.new(:x, :y)
+    s = struct.new(1, 2)
+
+    key = mock("to_int")
+    key.should_receive(:to_int).and_return(1)
+
+    s.deconstruct_keys([key]).should == { key => 2 }
+  end
+
+  it "raises a TypeError if the conversion with #to_int does not return an Integer" do
+    struct = Struct.new(:x, :y)
+    s = struct.new(1, 2)
+
+    key = mock("to_int")
+    key.should_receive(:to_int).and_return("not an Integer")
+
+    -> {
+      s.deconstruct_keys([key])
+    }.should raise_error(TypeError, /can't convert MockObject to Integer/)
+  end
+
+  it "raises TypeError if index is not a String, a Symbol and not convertible to Integer" do
+    struct = Struct.new(:x, :y)
+    s = struct.new(1, 2)
+
+    -> {
+      s.deconstruct_keys([0, []])
+    }.should raise_error(TypeError, "no implicit conversion of Array into Integer")
+  end
+
   it "raise TypeError if passed anything except nil or array" do
     struct = Struct.new(:x, :y)
     s = struct.new(1, 2)
diff --git a/spec/ruby/core/struct/element_set_spec.rb b/spec/ruby/core/struct/element_set_spec.rb
index 6ba7b081a92da8..0a0e34a5eee1c2 100644
--- a/spec/ruby/core/struct/element_set_spec.rb
+++ b/spec/ruby/core/struct/element_set_spec.rb
@@ -26,4 +26,11 @@
     -> { car[-4] = true         }.should raise_error(IndexError)
     -> { car[Object.new] = true }.should raise_error(TypeError)
   end
+
+  it "raises a FrozenError on a frozen struct" do
+    car = StructClasses::Car.new('Ford', 'Ranger')
+    car.freeze
+
+    -> { car[:model] = 'Escape' }.should raise_error(FrozenError)
+  end
 end
diff --git a/spec/ruby/core/struct/fixtures/classes.rb b/spec/ruby/core/struct/fixtures/classes.rb
index bf838d05dfd121..7b80b814efc909 100644
--- a/spec/ruby/core/struct/fixtures/classes.rb
+++ b/spec/ruby/core/struct/fixtures/classes.rb
@@ -29,4 +29,6 @@ def initialize(*)
       super
     end
   end
+
+  class StructSubclass < Struct; end
 end
diff --git a/spec/ruby/core/struct/initialize_spec.rb b/spec/ruby/core/struct/initialize_spec.rb
index a5ebe9551c62c9..06055594d5b18d 100644
--- a/spec/ruby/core/struct/initialize_spec.rb
+++ b/spec/ruby/core/struct/initialize_spec.rb
@@ -41,21 +41,11 @@
     StructClasses::SubclassX.new(:y).new.key.should == :value
   end
 
-  ruby_version_is "3.1"..."3.2" do
-    it "warns about passing only keyword arguments" do
-      -> {
-        StructClasses::Ruby.new(version: "3.1", platform: "OS")
-      }.should complain(/warning: Passing only keyword arguments/)
-    end
-  end
+  it "can be initialized with keyword arguments" do
+    positional_args = StructClasses::Ruby.new("3.2", "OS")
+    keyword_args = StructClasses::Ruby.new(version: "3.2", platform: "OS")
 
-  ruby_version_is "3.2" do
-    it "can be initialized with keyword arguments" do
-      positional_args = StructClasses::Ruby.new("3.2", "OS")
-      keyword_args = StructClasses::Ruby.new(version: "3.2", platform: "OS")
-
-      positional_args.version.should == keyword_args.version
-      positional_args.platform.should == keyword_args.platform
-    end
+    positional_args.version.should == keyword_args.version
+    positional_args.platform.should == keyword_args.platform
   end
 end
diff --git a/spec/ruby/core/struct/keyword_init_spec.rb b/spec/ruby/core/struct/keyword_init_spec.rb
index 8de4c14351868e..536b82041ae321 100644
--- a/spec/ruby/core/struct/keyword_init_spec.rb
+++ b/spec/ruby/core/struct/keyword_init_spec.rb
@@ -1,40 +1,45 @@
 require_relative '../../spec_helper'
+require_relative 'fixtures/classes'
 
-ruby_version_is "3.1" do
-  # See https://bugs.ruby-lang.org/issues/18008
-  describe "StructClass#keyword_init?" do
-    it "returns true for a struct that accepts keyword arguments to initialize" do
-      struct = Struct.new(:arg, keyword_init: true)
-      struct.keyword_init?.should be_true
-    end
+# See https://bugs.ruby-lang.org/issues/18008
+describe "StructClass#keyword_init?" do
+  it "returns true for a struct that accepts keyword arguments to initialize" do
+    struct = Struct.new(:arg, keyword_init: true)
+    struct.keyword_init?.should be_true
+  end
 
-    it "returns false for a struct that does not accept keyword arguments to initialize" do
-      struct = Struct.new(:arg, keyword_init: false)
-      struct.keyword_init?.should be_false
-    end
+  it "returns false for a struct that does not accept keyword arguments to initialize" do
+    struct = Struct.new(:arg, keyword_init: false)
+    struct.keyword_init?.should be_false
+  end
 
-    it "returns nil for a struct that did not explicitly specify keyword_init" do
-      struct = Struct.new(:arg)
-      struct.keyword_init?.should be_nil
-    end
+  it "returns nil for a struct that did not explicitly specify keyword_init" do
+    struct = Struct.new(:arg)
+    struct.keyword_init?.should be_nil
+  end
 
-    it "returns nil for a struct that does specify keyword_init to be nil" do
-      struct = Struct.new(:arg, keyword_init: nil)
-      struct.keyword_init?.should be_nil
-    end
+  it "returns nil for a struct that does specify keyword_init to be nil" do
+    struct = Struct.new(:arg, keyword_init: nil)
+    struct.keyword_init?.should be_nil
+  end
 
-    it "returns true for any truthy value, not just for true" do
-      struct = Struct.new(:arg, keyword_init: 1)
-      struct.keyword_init?.should be_true
+  it "returns true for any truthy value, not just for true" do
+    struct = Struct.new(:arg, keyword_init: 1)
+    struct.keyword_init?.should be_true
 
-      struct = Struct.new(:arg, keyword_init: "")
-      struct.keyword_init?.should be_true
+    struct = Struct.new(:arg, keyword_init: "")
+    struct.keyword_init?.should be_true
 
-      struct = Struct.new(:arg, keyword_init: [])
-      struct.keyword_init?.should be_true
+    struct = Struct.new(:arg, keyword_init: [])
+    struct.keyword_init?.should be_true
+
+    struct = Struct.new(:arg, keyword_init: {})
+    struct.keyword_init?.should be_true
+  end
 
-      struct = Struct.new(:arg, keyword_init: {})
-      struct.keyword_init?.should be_true
+  context "class inheriting Struct" do
+    it "isn't available in a subclass" do
+      StructClasses::StructSubclass.should_not.respond_to?(:keyword_init?)
     end
   end
 end
diff --git a/spec/ruby/core/struct/members_spec.rb b/spec/ruby/core/struct/members_spec.rb
index 1f2ff950d9edbe..1ff7b9387ad0ad 100644
--- a/spec/ruby/core/struct/members_spec.rb
+++ b/spec/ruby/core/struct/members_spec.rb
@@ -11,3 +11,15 @@
 
   it_behaves_like :struct_accessor, :members
 end
+
+describe "StructClass#members" do
+  it "returns an array of attribute names" do
+    StructClasses::Car.members.should == [:make, :model, :year]
+  end
+
+  context "class inheriting Struct" do
+    it "isn't available in a subclass" do
+      StructClasses::StructSubclass.should_not.respond_to?(:members)
+    end
+  end
+end
diff --git a/spec/ruby/core/struct/new_spec.rb b/spec/ruby/core/struct/new_spec.rb
index 8758051a819cfe..1d35de7b871230 100644
--- a/spec/ruby/core/struct/new_spec.rb
+++ b/spec/ruby/core/struct/new_spec.rb
@@ -6,6 +6,8 @@
     struct = Struct.new('Animal', :name, :legs, :eyeballs)
     struct.should == Struct::Animal
     struct.name.should == "Struct::Animal"
+  ensure
+    Struct.send(:remove_const, :Animal)
   end
 
   it "overwrites previously defined constants with string as first argument" do
@@ -19,6 +21,8 @@
     second.should == Struct::Person
 
     first.members.should_not == second.members
+  ensure
+    Struct.send(:remove_const, :Person)
   end
 
   it "calls to_str on its first argument (constant name)" do
@@ -27,6 +31,8 @@ def obj.to_str() "Foo" end
     struct = Struct.new(obj)
     struct.should == Struct::Foo
     struct.name.should == "Struct::Foo"
+  ensure
+    Struct.send(:remove_const, :Foo)
   end
 
   it "creates a new anonymous class with nil first argument" do
@@ -48,7 +54,7 @@ def obj.to_str() "Foo" end
   end
 
   it "allows non-ASCII member name" do
-    name = "r\xe9sum\xe9".force_encoding(Encoding::ISO_8859_1).to_sym
+    name = "r\xe9sum\xe9".dup.force_encoding(Encoding::ISO_8859_1).to_sym
     struct = Struct.new(name)
     struct.new("foo").send(name).should == "foo"
   end
@@ -67,20 +73,8 @@ def obj.to_str() "Foo" end
     -> { Struct.new(:animal, ['chris', 'evan'])    }.should raise_error(TypeError)
   end
 
-  ruby_version_is ""..."3.2" do
-    it "raises a TypeError or ArgumentError if passed a Hash with an unknown key" do
-      # CRuby < 3.2 raises ArgumentError: unknown keyword: :name, but that seems a bug:
-      # https://bugs.ruby-lang.org/issues/18632
-      -> { Struct.new(:animal, { name: 'chris' }) }.should raise_error(StandardError) { |e|
-        [ArgumentError, TypeError].should.include?(e.class)
-      }
-    end
-  end
-
-  ruby_version_is "3.2" do
-    it "raises a TypeError if passed a Hash with an unknown key" do
-      -> { Struct.new(:animal, { name: 'chris' }) }.should raise_error(TypeError)
-    end
+  it "raises a TypeError if passed a Hash with an unknown key" do
+    -> { Struct.new(:animal, { name: 'chris' }) }.should raise_error(TypeError)
   end
 
   ruby_version_is ""..."3.3" do
@@ -138,6 +132,8 @@ def platform
     it "creates a constant in subclass' namespace" do
       struct = StructClasses::Apple.new('Computer', :size)
       struct.should == StructClasses::Apple::Computer
+    ensure
+      StructClasses::Apple.send(:remove_const, :Computer)
     end
 
     it "creates an instance" do
@@ -158,29 +154,43 @@ def platform
       -> { StructClasses::Ruby.new('2.0', 'i686', true) }.should raise_error(ArgumentError)
     end
 
-    ruby_version_is ''...'3.1' do
-      it "passes a hash as a normal argument" do
-        type = Struct.new(:args)
+    it "accepts keyword arguments to initialize" do
+      type = Struct.new(:args)
 
-        obj = suppress_warning {type.new(keyword: :arg)}
-        obj2 = type.new(*[{keyword: :arg}])
+      obj = type.new(args: 42)
+      obj2 = type.new(42)
 
-        obj.should == obj2
-        obj.args.should == {keyword: :arg}
-        obj2.args.should == {keyword: :arg}
-      end
+      obj.should == obj2
+      obj.args.should == 42
+      obj2.args.should == 42
     end
 
-    ruby_version_is '3.2' do
-      it "accepts keyword arguments to initialize" do
-        type = Struct.new(:args)
+    context "given positional and keyword arguments" do
+      it "treats keyword arguments as a positional parameter" do
+        type = Struct.new(:a, :b)
+        s = type.new("a", b: "b")
+        s.a.should == "a"
+        s.b.should == {b: "b"}
+
+        type = Struct.new(:a, :b, :c)
+        s = type.new("a", b: "b", c: "c")
+        s.a.should == "a"
+        s.b.should == {b: "b", c: "c"}
+        s.c.should == nil
+      end
+
+      it "ignores empty keyword arguments" do
+        type = Struct.new(:a, :b)
+        h = {}
+        s = type.new("a", **h)
 
-        obj = type.new(args: 42)
-        obj2 = type.new(42)
+        s.a.should == "a"
+        s.b.should == nil
+      end
 
-        obj.should == obj2
-        obj.args.should == 42
-        obj2.args.should == 42
+      it "raises ArgumentError when all struct attribute values are specified" do
+        type = Struct.new(:a, :b)
+        -> { type.new("a", "b", c: "c") }.should raise_error(ArgumentError, "struct size differs")
       end
     end
   end
diff --git a/spec/ruby/core/struct/struct_spec.rb b/spec/ruby/core/struct/struct_spec.rb
index 8817dc1a58c408..1b6a4488ce9b7a 100644
--- a/spec/ruby/core/struct/struct_spec.rb
+++ b/spec/ruby/core/struct/struct_spec.rb
@@ -33,6 +33,13 @@
     car['model'].should == 'F150'
     car[1].should == 'F150'
   end
+
+  it "writer methods raise a FrozenError on a frozen struct" do
+    car = StructClasses::Car.new('Ford', 'Ranger')
+    car.freeze
+
+    -> { car.model = 'Escape' }.should raise_error(FrozenError)
+  end
 end
 
 describe "Struct subclasses" do
diff --git a/spec/ruby/core/struct/to_h_spec.rb b/spec/ruby/core/struct/to_h_spec.rb
index bfb0af07baf84b..861ce3f49df401 100644
--- a/spec/ruby/core/struct/to_h_spec.rb
+++ b/spec/ruby/core/struct/to_h_spec.rb
@@ -21,6 +21,18 @@
       h.should == { "make" => "ford", "model" => "ranger", "year" => "" }
     end
 
+    it "passes to a block each pair's key and value as separate arguments" do
+      s = StructClasses::Ruby.new('3.2.4', 'macos')
+
+      ScratchPad.record []
+      s.to_h { |k, v| ScratchPad << [k, v]; [k, v] }
+      ScratchPad.recorded.sort.should == [[:platform, 'macos'], [:version, '3.2.4']]
+
+      ScratchPad.record []
+      s.to_h { |*args| ScratchPad << args; [args[0], args[1]] }
+      ScratchPad.recorded.sort.should == [[:platform, 'macos'], [:version, '3.2.4']]
+    end
+
     it "raises ArgumentError if block returns longer or shorter array" do
       -> do
         StructClasses::Car.new.to_h { |k, v| [k.to_s, "#{v}".downcase, 1] }
diff --git a/spec/ruby/core/symbol/shared/slice.rb b/spec/ruby/core/symbol/shared/slice.rb
index 0df87e183d1200..d3d4aad617c741 100644
--- a/spec/ruby/core/symbol/shared/slice.rb
+++ b/spec/ruby/core/symbol/shared/slice.rb
@@ -7,7 +7,7 @@
     end
 
     it "returns nil if the index starts from the end and is greater than the length" do
-        :symbol.send(@method, -10).should be_nil
+      :symbol.send(@method, -10).should be_nil
     end
 
     it "returns nil if the index is greater than the length" do
diff --git a/spec/ruby/core/symbol/to_proc_spec.rb b/spec/ruby/core/symbol/to_proc_spec.rb
index 2cd013696add16..def5d6d3444b95 100644
--- a/spec/ruby/core/symbol/to_proc_spec.rb
+++ b/spec/ruby/core/symbol/to_proc_spec.rb
@@ -27,31 +27,29 @@
     pr.parameters.should == [[:req], [:rest]]
   end
 
-  ruby_version_is "3.2" do
-    it "only calls public methods" do
-      body = proc do
-        public def pub; @a << :pub end
-        protected def pro; @a << :pro end
-        private def pri; @a << :pri end
-        attr_reader :a
-      end
+  it "only calls public methods" do
+    body = proc do
+      public def pub; @a << :pub end
+      protected def pro; @a << :pro end
+      private def pri; @a << :pri end
+      attr_reader :a
+    end
 
-      @a = []
-      singleton_class.class_eval(&body)
-      tap(&:pub)
-      proc{tap(&:pro)}.should raise_error(NoMethodError, /protected method `pro' called/)
-      proc{tap(&:pri)}.should raise_error(NoMethodError, /private method `pri' called/)
-      @a.should == [:pub]
+    @a = []
+    singleton_class.class_eval(&body)
+    tap(&:pub)
+    proc{tap(&:pro)}.should raise_error(NoMethodError, /protected method [`']pro' called/)
+    proc{tap(&:pri)}.should raise_error(NoMethodError, /private method [`']pri' called/)
+    @a.should == [:pub]
 
-      @a = []
-      c = Class.new(&body)
-      o = c.new
-      o.instance_variable_set(:@a, [])
-      o.tap(&:pub)
-      proc{tap(&:pro)}.should raise_error(NoMethodError, /protected method `pro' called/)
-      proc{o.tap(&:pri)}.should raise_error(NoMethodError, /private method `pri' called/)
-      o.a.should == [:pub]
-    end
+    @a = []
+    c = Class.new(&body)
+    o = c.new
+    o.instance_variable_set(:@a, [])
+    o.tap(&:pub)
+    proc{tap(&:pro)}.should raise_error(NoMethodError, /protected method [`']pro' called/)
+    proc{o.tap(&:pri)}.should raise_error(NoMethodError, /private method [`']pri' called/)
+    o.a.should == [:pub]
   end
 
   it "raises an ArgumentError when calling #call on the Proc without receiver" do
diff --git a/spec/ruby/core/thread/abort_on_exception_spec.rb b/spec/ruby/core/thread/abort_on_exception_spec.rb
index 34b648ca0f7d62..49be84ea9f147e 100644
--- a/spec/ruby/core/thread/abort_on_exception_spec.rb
+++ b/spec/ruby/core/thread/abort_on_exception_spec.rb
@@ -72,7 +72,7 @@
   end
 
   after do
-     Thread.abort_on_exception = @abort_on_exception
+    Thread.abort_on_exception = @abort_on_exception
   end
 
   it "is false by default" do
diff --git a/spec/ruby/core/thread/backtrace/limit_spec.rb b/spec/ruby/core/thread/backtrace/limit_spec.rb
index 26a87a806c174d..b55ca67ea076df 100644
--- a/spec/ruby/core/thread/backtrace/limit_spec.rb
+++ b/spec/ruby/core/thread/backtrace/limit_spec.rb
@@ -1,15 +1,13 @@
 require_relative '../../../spec_helper'
 
-ruby_version_is "3.1" do
-  describe "Thread::Backtrace.limit" do
-    it "returns maximum backtrace length set by --backtrace-limit command-line option" do
-      out = ruby_exe("print Thread::Backtrace.limit", options: "--backtrace-limit=2")
-      out.should == "2"
-    end
+describe "Thread::Backtrace.limit" do
+  it "returns maximum backtrace length set by --backtrace-limit command-line option" do
+    out = ruby_exe("print Thread::Backtrace.limit", options: "--backtrace-limit=2")
+    out.should == "2"
+  end
 
-    it "returns -1 when --backtrace-limit command-line option is not set" do
-      out = ruby_exe("print Thread::Backtrace.limit")
-      out.should == "-1"
-    end
+  it "returns -1 when --backtrace-limit command-line option is not set" do
+    out = ruby_exe("print Thread::Backtrace.limit")
+    out.should == "-1"
   end
 end
diff --git a/spec/ruby/core/thread/backtrace/location/absolute_path_spec.rb b/spec/ruby/core/thread/backtrace/location/absolute_path_spec.rb
index e35e1fc0b4d8e0..68a69049d93a21 100644
--- a/spec/ruby/core/thread/backtrace/location/absolute_path_spec.rb
+++ b/spec/ruby/core/thread/backtrace/location/absolute_path_spec.rb
@@ -27,20 +27,11 @@
   end
 
   context "when used in eval with a given filename" do
-    code = "caller_locations(0)[0].absolute_path"
+    it "returns nil with absolute_path" do
+      code = "caller_locations(0)[0].absolute_path"
 
-    ruby_version_is ""..."3.1" do
-      it "returns filename with absolute_path" do
-        eval(code, nil, "foo.rb").should == "foo.rb"
-        eval(code, nil, "foo/bar.rb").should == "foo/bar.rb"
-      end
-    end
-
-    ruby_version_is "3.1" do
-      it "returns nil with absolute_path" do
-        eval(code, nil, "foo.rb").should == nil
-        eval(code, nil, "foo/bar.rb").should == nil
-      end
+      eval(code, nil, "foo.rb").should == nil
+      eval(code, nil, "foo/bar.rb").should == nil
     end
   end
 
@@ -59,7 +50,7 @@
     it "returns nil" do
       location = nil
       tap { location = caller_locations(1, 1)[0] }
-      location.label.should == "tap"
+      location.label.should =~ /\A(?:Kernel#)?tap\z/
       if location.path.start_with?("<internal:")
         location.absolute_path.should == nil
       else
diff --git a/spec/ruby/core/thread/backtrace/location/label_spec.rb b/spec/ruby/core/thread/backtrace/location/label_spec.rb
index 7312d017e5b554..85ddccc8e3f831 100644
--- a/spec/ruby/core/thread/backtrace/location/label_spec.rb
+++ b/spec/ruby/core/thread/backtrace/location/label_spec.rb
@@ -7,11 +7,11 @@
   end
 
   it 'returns the method name for a method location' do
-    ThreadBacktraceLocationSpecs.method_location[0].label.should == "method_location"
+    ThreadBacktraceLocationSpecs.method_location[0].label.should =~ /\A(?:ThreadBacktraceLocationSpecs\.)?method_location\z/
   end
 
   it 'returns the block name for a block location' do
-    ThreadBacktraceLocationSpecs.block_location[0].label.should == "block in block_location"
+    ThreadBacktraceLocationSpecs.block_location[0].label.should =~ /\Ablock in (?:ThreadBacktraceLocationSpecs\.)?block_location\z/
   end
 
   it 'returns the module name for a module location' do
@@ -22,9 +22,9 @@
     first_level_location, second_level_location, third_level_location =
       ThreadBacktraceLocationSpecs.locations_inside_nested_blocks
 
-    first_level_location.label.should == 'block in locations_inside_nested_blocks'
-    second_level_location.label.should == 'block (2 levels) in locations_inside_nested_blocks'
-    third_level_location.label.should == 'block (3 levels) in locations_inside_nested_blocks'
+    first_level_location.label.should =~ /\Ablock in (?:ThreadBacktraceLocationSpecs\.)?locations_inside_nested_blocks\z/
+    second_level_location.label.should =~ /\Ablock \(2 levels\) in (?:ThreadBacktraceLocationSpecs\.)?locations_inside_nested_blocks\z/
+    third_level_location.label.should =~ /\Ablock \(3 levels\) in (?:ThreadBacktraceLocationSpecs\.)?locations_inside_nested_blocks\z/
   end
 
   it 'sets the location label for a top-level block differently depending on it being in the main file or a required file' do
diff --git a/spec/ruby/core/thread/backtrace/location/lineno_spec.rb b/spec/ruby/core/thread/backtrace/location/lineno_spec.rb
index d14cf17514e789..10457f80f031a5 100644
--- a/spec/ruby/core/thread/backtrace/location/lineno_spec.rb
+++ b/spec/ruby/core/thread/backtrace/location/lineno_spec.rb
@@ -7,7 +7,7 @@
     @line  = __LINE__ - 1
   end
 
-  it 'returns the absolute path of the call frame' do
+  it 'returns the line number of the call frame' do
     @frame.lineno.should == @line
   end
 
diff --git a/spec/ruby/core/thread/backtrace_locations_spec.rb b/spec/ruby/core/thread/backtrace_locations_spec.rb
index c970ae023b3bae..09fe622e0daf2b 100644
--- a/spec/ruby/core/thread/backtrace_locations_spec.rb
+++ b/spec/ruby/core/thread/backtrace_locations_spec.rb
@@ -70,7 +70,7 @@
   end
 
   it "the first location reports the call to #backtrace_locations" do
-    Thread.current.backtrace_locations(0..0)[0].to_s.should == "#{__FILE__ }:#{__LINE__ }:in `backtrace_locations'"
+    Thread.current.backtrace_locations(0..0)[0].to_s.should =~ /\A#{__FILE__ }:#{__LINE__ }:in [`'](?:Thread#)?backtrace_locations'\z/
   end
 
   it "[1..-1] is the same as #caller_locations(0..-1) for Thread.current" do
diff --git a/spec/ruby/core/thread/backtrace_spec.rb b/spec/ruby/core/thread/backtrace_spec.rb
index 9001b1b7eb2bb4..15bb29a349af10 100644
--- a/spec/ruby/core/thread/backtrace_spec.rb
+++ b/spec/ruby/core/thread/backtrace_spec.rb
@@ -13,7 +13,7 @@
 
     backtrace = t.backtrace
     backtrace.should be_kind_of(Array)
-    backtrace.first.should =~ /`sleep'/
+    backtrace.first.should =~ /[`'](?:Kernel#)?sleep'/
 
     t.raise 'finish the thread'
     t.join
diff --git a/spec/ruby/core/thread/each_caller_location_spec.rb b/spec/ruby/core/thread/each_caller_location_spec.rb
index dbece06cd8183e..aa7423675b5a62 100644
--- a/spec/ruby/core/thread/each_caller_location_spec.rb
+++ b/spec/ruby/core/thread/each_caller_location_spec.rb
@@ -1,49 +1,47 @@
 require_relative '../../spec_helper'
 
 describe "Thread.each_caller_location" do
-  ruby_version_is "3.2" do
-    it "iterates through the current execution stack and matches caller_locations content and type" do
-      ScratchPad.record []
-      Thread.each_caller_location { |l| ScratchPad << l; }
+  it "iterates through the current execution stack and matches caller_locations content and type" do
+    ScratchPad.record []
+    Thread.each_caller_location { |l| ScratchPad << l; }
 
-      ScratchPad.recorded.map(&:to_s).should == caller_locations.map(&:to_s)
-      ScratchPad.recorded[0].should be_kind_of(Thread::Backtrace::Location)
-    end
+    ScratchPad.recorded.map(&:to_s).should == caller_locations.map(&:to_s)
+    ScratchPad.recorded[0].should be_kind_of(Thread::Backtrace::Location)
+  end
 
-    it "returns subset of 'Thread.to_enum(:each_caller_location)' locations" do
-      ar = []
-      ecl = Thread.each_caller_location { |x| ar << x }
+  it "returns subset of 'Thread.to_enum(:each_caller_location)' locations" do
+    ar = []
+    ecl = Thread.each_caller_location { |x| ar << x }
 
-      (ar.map(&:to_s) - Thread.to_enum(:each_caller_location).to_a.map(&:to_s)).should.empty?
-    end
+    (ar.map(&:to_s) - Thread.to_enum(:each_caller_location).to_a.map(&:to_s)).should.empty?
+  end
 
-    it "stops the backtrace iteration if 'break' occurs" do
-      i = 0
-      ar = []
-      ecl = Thread.each_caller_location do |x|
-        ar << x
-        i += 1
-        break x if i == 2
-      end
-
-      ar.map(&:to_s).should == caller_locations(1, 2).map(&:to_s)
-      ecl.should be_kind_of(Thread::Backtrace::Location)
+  it "stops the backtrace iteration if 'break' occurs" do
+    i = 0
+    ar = []
+    ecl = Thread.each_caller_location do |x|
+      ar << x
+      i += 1
+      break x if i == 2
     end
 
-    it "returns nil" do
-      Thread.each_caller_location {}.should == nil
-    end
+    ar.map(&:to_s).should == caller_locations(1, 2).map(&:to_s)
+    ecl.should be_kind_of(Thread::Backtrace::Location)
+  end
 
-    it "raises LocalJumpError when called without a block" do
-      -> {
-        Thread.each_caller_location
-      }.should raise_error(LocalJumpError, "no block given")
-    end
+  it "returns nil" do
+    Thread.each_caller_location {}.should == nil
+  end
 
-    it "doesn't accept positional and keyword arguments" do
-      -> {
-        Thread.each_caller_location(12, foo: 10) {}
-      }.should raise_error(ArgumentError, "wrong number of arguments (given 2, expected 0)")
-    end
+  it "raises LocalJumpError when called without a block" do
+    -> {
+      Thread.each_caller_location
+    }.should raise_error(LocalJumpError, "no block given")
+  end
+
+  it "doesn't accept keyword arguments" do
+    -> {
+      Thread.each_caller_location(12, foo: 10) {}
+    }.should raise_error(ArgumentError);
   end
 end
diff --git a/spec/ruby/core/thread/element_reference_spec.rb b/spec/ruby/core/thread/element_reference_spec.rb
index 85280cb2871dbb..fde9d1f4401ff2 100644
--- a/spec/ruby/core/thread/element_reference_spec.rb
+++ b/spec/ruby/core/thread/element_reference_spec.rb
@@ -37,6 +37,17 @@
     t2["value"].should == 2
   end
 
+  it "converts a key that is neither String nor Symbol with #to_str" do
+    key = mock('value')
+    key.should_receive(:to_str).and_return('value')
+
+    th = Thread.new do
+      Thread.current[:value] = 1
+    end.join
+
+    th[key].should == 1
+  end
+
   it "raises exceptions on the wrong type of keys" do
     -> { Thread.current[nil] }.should raise_error(TypeError)
     -> { Thread.current[5] }.should raise_error(TypeError)
diff --git a/spec/ruby/core/thread/element_set_spec.rb b/spec/ruby/core/thread/element_set_spec.rb
index c7498f7ac9d4f5..f2051773041fba 100644
--- a/spec/ruby/core/thread/element_set_spec.rb
+++ b/spec/ruby/core/thread/element_set_spec.rb
@@ -12,10 +12,33 @@
       th.freeze
       -> {
         th[:foo] = "bar"
-      }.should raise_error(FrozenError, /frozen/)
+      }.should raise_error(FrozenError, "can't modify frozen thread locals")
     end.join
   end
 
+  it "accepts Strings and Symbols" do
+    t1 = Thread.new do
+      Thread.current[:value] = 1
+    end.join
+    t2 = Thread.new do
+      Thread.current["value"] = 2
+    end.join
+
+    t1[:value].should == 1
+    t2[:value].should == 2
+  end
+
+  it "converts a key that is neither String nor Symbol with #to_str" do
+    key = mock('value')
+    key.should_receive(:to_str).and_return('value')
+
+    th = Thread.new do
+      Thread.current[key] = 1
+    end.join
+
+    th[:value].should == 1
+  end
+
   it "raises exceptions on the wrong type of keys" do
     -> { Thread.current[nil] = true }.should raise_error(TypeError)
     -> { Thread.current[5] = true }.should raise_error(TypeError)
diff --git a/spec/ruby/core/thread/fetch_spec.rb b/spec/ruby/core/thread/fetch_spec.rb
index 6b37d4cfc53c7a..85ffb718748c9a 100644
--- a/spec/ruby/core/thread/fetch_spec.rb
+++ b/spec/ruby/core/thread/fetch_spec.rb
@@ -29,6 +29,36 @@
     end
   end
 
+  describe 'with a block' do
+    it 'returns the value of the fiber-local variable if value has been assigned' do
+      th = Thread.new { Thread.current[:cat] = 'meow' }
+      th.join
+      th.fetch(:cat) { true }.should == 'meow'
+    end
+
+    it "returns the block value if fiber-local variable hasn't been assigned" do
+      th = Thread.new {}
+      th.join
+      th.fetch(:cat) { true }.should == true
+    end
+
+    it "does not call the block if value has been assigned" do
+      th = Thread.new { Thread.current[:cat] = 'meow' }
+      th.join
+      var = :not_updated
+      th.fetch(:cat) { var = :updated }.should == 'meow'
+      var.should == :not_updated
+    end
+
+    it "uses the block if a default is given and warns about it" do
+      th = Thread.new {}
+      th.join
+      -> {
+        th.fetch(:cat, false) { true }.should == true
+      }.should complain(/warning: block supersedes default value argument/)
+    end
+  end
+
   it 'raises an ArgumentError when not passed one or two arguments' do
     -> { Thread.current.fetch() }.should raise_error(ArgumentError)
     -> { Thread.current.fetch(1, 2, 3) }.should raise_error(ArgumentError)
diff --git a/spec/ruby/core/thread/group_spec.rb b/spec/ruby/core/thread/group_spec.rb
index 59f5ac37c8bccd..d0d4704b66fe49 100644
--- a/spec/ruby/core/thread/group_spec.rb
+++ b/spec/ruby/core/thread/group_spec.rb
@@ -1,5 +1,16 @@
 require_relative '../../spec_helper'
-require_relative 'fixtures/classes'
+
 describe "Thread#group" do
-  it "needs to be reviewed for spec completeness"
+  it "returns the default thread group for the main thread" do
+    Thread.main.group.should == ThreadGroup::Default
+  end
+
+  it "returns the thread group explicitly set for this thread" do
+    thread = Thread.new { nil }
+    thread_group = ThreadGroup.new
+    thread_group.add(thread)
+    thread.group.should == thread_group
+  ensure
+    thread.join if thread
+  end
 end
diff --git a/spec/ruby/core/thread/key_spec.rb b/spec/ruby/core/thread/key_spec.rb
index 6940cf5f282c1a..339fa98f533a3c 100644
--- a/spec/ruby/core/thread/key_spec.rb
+++ b/spec/ruby/core/thread/key_spec.rb
@@ -16,6 +16,13 @@
     @th.key?(:stanley.to_s).should == false
   end
 
+  it "converts a key that is neither String nor Symbol with #to_str" do
+    key = mock('key')
+    key.should_receive(:to_str).and_return('oliver')
+
+    @th.key?(key).should == true
+  end
+
   it "raises exceptions on the wrong type of keys" do
     -> { Thread.current.key? nil }.should raise_error(TypeError)
     -> { Thread.current.key? 5 }.should raise_error(TypeError)
diff --git a/spec/ruby/core/thread/native_thread_id_spec.rb b/spec/ruby/core/thread/native_thread_id_spec.rb
index 8460a1db8cf19f..374cc592797a20 100644
--- a/spec/ruby/core/thread/native_thread_id_spec.rb
+++ b/spec/ruby/core/thread/native_thread_id_spec.rb
@@ -1,30 +1,35 @@
 require_relative '../../spec_helper'
 
-ruby_version_is "3.1" do
-  platform_is :linux, :darwin, :windows, :freebsd do
-    describe "Thread#native_thread_id" do
-      it "returns an integer when the thread is alive" do
-        Thread.current.native_thread_id.should be_kind_of(Integer)
-      end
+platform_is :linux, :darwin, :windows, :freebsd do
+  describe "Thread#native_thread_id" do
+    it "returns an integer when the thread is alive" do
+      Thread.current.native_thread_id.should be_kind_of(Integer)
+    end
 
-      it "returns nil when the thread is not running" do
-        t = Thread.new {}
-        t.join
-        t.native_thread_id.should == nil
-      end
+    it "returns nil when the thread is not running" do
+      t = Thread.new {}
+      t.join
+      t.native_thread_id.should == nil
+    end
 
-      it "each thread has different native thread id" do
-        t = Thread.new { sleep }
-        Thread.pass until t.stop?
-        main_thread_id = Thread.current.native_thread_id
-        t_thread_id = t.native_thread_id
+    it "each thread has different native thread id" do
+      t = Thread.new { sleep }
+      Thread.pass until t.stop?
+      main_thread_id = Thread.current.native_thread_id
+      t_thread_id = t.native_thread_id
 
+      if ruby_version_is "3.3"
+        # native_thread_id can be nil on a M:N scheduler
+        t_thread_id.should be_kind_of(Integer) if t_thread_id != nil
+      else
         t_thread_id.should be_kind_of(Integer)
-        main_thread_id.should_not == t_thread_id
-        t.run
-        t.join
-        t.native_thread_id.should == nil
       end
+
+      main_thread_id.should_not == t_thread_id
+
+      t.run
+      t.join
+      t.native_thread_id.should == nil
     end
   end
 end
diff --git a/spec/ruby/core/thread/report_on_exception_spec.rb b/spec/ruby/core/thread/report_on_exception_spec.rb
index ab0af0972ec1ef..d9daa041cd9c7a 100644
--- a/spec/ruby/core/thread/report_on_exception_spec.rb
+++ b/spec/ruby/core/thread/report_on_exception_spec.rb
@@ -78,11 +78,11 @@ def foo
       -> {
         go = true
         Thread.pass while t.alive?
-      }.should output("", <<ERR)
-#{t.inspect} terminated with exception (report_on_exception is true):
-#{__FILE__}:#{line_raise}:in `foo': Thread#report_on_exception specs backtrace order (RuntimeError)
-\tfrom #{__FILE__}:#{line_call_foo}:in `block (4 levels) in <top (required)>'
-ERR
+      }.should output("", /\A
+#{Regexp.quote(t.inspect)}\sterminated\swith\sexception\s\(report_on_exception\sis\strue\):\n
+#{Regexp.quote(__FILE__)}:#{line_raise}:in\s[`']foo':\sThread\#report_on_exception\sspecs\sbacktrace\sorder\s\(RuntimeError\)\n
+\tfrom\s#{Regexp.quote(__FILE__)}:#{line_call_foo}:in\s[`']block\s\(4\slevels\)\sin\s<top\s\(required\)>'\n
+\z/x)
 
       -> {
         t.join
diff --git a/spec/ruby/core/thread/thread_variable_get_spec.rb b/spec/ruby/core/thread/thread_variable_get_spec.rb
index 38f90d58300f5a..1ea34cf2b31917 100644
--- a/spec/ruby/core/thread/thread_variable_get_spec.rb
+++ b/spec/ruby/core/thread/thread_variable_get_spec.rb
@@ -13,13 +13,48 @@
     @t.thread_variable_get(:a).should be_nil
   end
 
-  it "returns the value previously set by #[]=" do
-    @t.thread_variable_set :a, 49
+  it "returns the value previously set by #thread_variable_set" do
+    @t.thread_variable_set(:a, 49)
     @t.thread_variable_get(:a).should == 49
   end
 
   it "returns a value private to self" do
-    @t.thread_variable_set :thread_variable_get_spec, 82
+    @t.thread_variable_set(:thread_variable_get_spec, 82)
     Thread.current.thread_variable_get(:thread_variable_get_spec).should be_nil
   end
+
+  it "accepts String and Symbol keys interchangeably" do
+    @t.thread_variable_set("a", 49)
+    @t.thread_variable_get("a").should == 49
+    @t.thread_variable_get(:a).should == 49
+  end
+
+  it "converts a key that is neither String nor Symbol with #to_str" do
+    key = mock('key')
+    key.should_receive(:to_str).and_return('a')
+    @t.thread_variable_set(:a, 49)
+    @t.thread_variable_get(key).should == 49
+  end
+
+  it "does not raise FrozenError if the thread is frozen" do
+    @t.freeze
+    @t.thread_variable_get(:a).should be_nil
+  end
+
+  it "raises a TypeError if the key is neither Symbol nor String when thread variables are already set" do
+    @t.thread_variable_set(:a, 49)
+    -> { @t.thread_variable_get(123) }.should raise_error(TypeError, /123 is not a symbol/)
+  end
+
+  ruby_version_is '3.4' do
+    it "raises a TypeError if the key is neither Symbol nor String when no thread variables are set" do
+      -> { @t.thread_variable_get(123) }.should raise_error(TypeError, /123 is not a symbol/)
+    end
+
+    it "raises a TypeError if the key is neither Symbol nor String without calling #to_sym" do
+      key = mock('key')
+      key.should_not_receive(:to_sym)
+      -> { @t.thread_variable_get(key) }.should raise_error(TypeError, /#{Regexp.escape(key.inspect)} is not a symbol/)
+    end
+  end
 end
diff --git a/spec/ruby/core/thread/thread_variable_set_spec.rb b/spec/ruby/core/thread/thread_variable_set_spec.rb
index 1338c306c77b3e..eadee76afba00d 100644
--- a/spec/ruby/core/thread/thread_variable_set_spec.rb
+++ b/spec/ruby/core/thread/thread_variable_set_spec.rb
@@ -10,17 +10,53 @@
   end
 
   it "returns the value set" do
-    (@t.thread_variable_set :a, 2).should == 2
+    @t.thread_variable_set(:a, 2).should == 2
   end
 
   it "sets a value that will be returned by #thread_variable_get" do
-    @t.thread_variable_set :a, 49
+    @t.thread_variable_set(:a, 49)
     @t.thread_variable_get(:a).should == 49
   end
 
   it "sets a value private to self" do
-    @t.thread_variable_set :thread_variable_get_spec, 82
+    @t.thread_variable_set(:thread_variable_get_spec, 82)
     @t.thread_variable_get(:thread_variable_get_spec).should == 82
     Thread.current.thread_variable_get(:thread_variable_get_spec).should be_nil
   end
+
+  it "accepts String and Symbol keys interchangeably" do
+    @t.thread_variable_set('a', 49)
+    @t.thread_variable_get('a').should == 49
+
+    @t.thread_variable_set(:a, 50)
+    @t.thread_variable_get('a').should == 50
+  end
+
+  it "converts a key that is neither String nor Symbol with #to_str" do
+    key = mock('key')
+    key.should_receive(:to_str).and_return('a')
+    @t.thread_variable_set(key, 49)
+    @t.thread_variable_get(:a).should == 49
+  end
+
+  it "removes a key if the value is nil" do
+    @t.thread_variable_set(:a, 52)
+    @t.thread_variable_set(:a, nil)
+    @t.thread_variable?(:a).should be_false
+  end
+
+  it "raises a FrozenError if the thread is frozen" do
+    @t.freeze
+    -> { @t.thread_variable_set(:a, 1) }.should raise_error(FrozenError, "can't modify frozen thread locals")
+  end
+
+  it "raises a TypeError if the key is neither Symbol nor String, nor responds to #to_str" do
+    -> { @t.thread_variable_set(123, 1) }.should raise_error(TypeError, /123 is not a symbol/)
+  end
+
+  it "does not try to convert the key with #to_sym" do
+    key = mock('key')
+    key.should_not_receive(:to_sym)
+    -> { @t.thread_variable_set(key, 42) }.should raise_error(TypeError, /#{Regexp.quote(key.inspect)} is not a symbol/)
+  end
 end
diff --git a/spec/ruby/core/thread/thread_variable_spec.rb b/spec/ruby/core/thread/thread_variable_spec.rb
index 6bd1950c04ce67..1b021e94044d52 100644
--- a/spec/ruby/core/thread/thread_variable_spec.rb
+++ b/spec/ruby/core/thread/thread_variable_spec.rb
@@ -10,12 +10,51 @@
   end
 
   it "returns false if the thread variables do not contain 'key'" do
-    @t.thread_variable_set :a, 2
+    @t.thread_variable_set(:a, 2)
     @t.thread_variable?(:b).should be_false
   end
 
   it "returns true if the thread variables contain 'key'" do
-    @t.thread_variable_set :a, 2
+    @t.thread_variable_set(:a, 2)
     @t.thread_variable?(:a).should be_true
   end
+
+  it "accepts String and Symbol keys interchangeably" do
+    @t.thread_variable?('a').should be_false
+    @t.thread_variable?(:a).should be_false
+
+    @t.thread_variable_set(:a, 49)
+
+    @t.thread_variable?('a').should be_true
+    @t.thread_variable?(:a).should be_true
+  end
+
+  it "converts a key that is neither String nor Symbol with #to_str" do
+    key = mock('key')
+    key.should_receive(:to_str).and_return('a')
+    @t.thread_variable_set(:a, 49)
+    @t.thread_variable?(key).should be_true
+  end
+
+  it "does not raise FrozenError if the thread is frozen" do
+    @t.freeze
+    @t.thread_variable?(:a).should be_false
+  end
+
+  it "raises a TypeError if the key is neither Symbol nor String when thread variables are already set" do
+    @t.thread_variable_set(:a, 49)
+    -> { @t.thread_variable?(123) }.should raise_error(TypeError, /123 is not a symbol/)
+  end
+
+  ruby_version_is '3.4' do
+    it "raises a TypeError if the key is neither Symbol nor String when no thread variables are set" do
+      -> { @t.thread_variable?(123) }.should raise_error(TypeError, /123 is not a symbol/)
+    end
+
+    it "raises a TypeError if the key is neither Symbol nor String without calling #to_sym" do
+      key = mock('key')
+      key.should_not_receive(:to_sym)
+      -> { @t.thread_variable?(key) }.should raise_error(TypeError, /#{Regexp.escape(key.inspect)} is not a symbol/)
+    end
+  end
 end
diff --git a/spec/ruby/core/thread/thread_variables_spec.rb b/spec/ruby/core/thread/thread_variables_spec.rb
index 1bd68b17f14ecd..51ceef3376ecbd 100644
--- a/spec/ruby/core/thread/thread_variables_spec.rb
+++ b/spec/ruby/core/thread/thread_variables_spec.rb
@@ -10,15 +10,15 @@
   end
 
   it "returns the keys of all the values set" do
-    @t.thread_variable_set :a, 2
-    @t.thread_variable_set :b, 4
-    @t.thread_variable_set :c, 6
+    @t.thread_variable_set(:a, 2)
+    @t.thread_variable_set(:b, 4)
+    @t.thread_variable_set(:c, 6)
     @t.thread_variables.sort.should == [:a, :b, :c]
   end
 
-  it "sets a value private to self" do
-    @t.thread_variable_set :a, 82
-    @t.thread_variable_set :b, 82
+  it "returns the keys private to self" do
+    @t.thread_variable_set(:a, 82)
+    @t.thread_variable_set(:b, 82)
     Thread.current.thread_variables.should_not include(:a, :b)
   end
 
@@ -26,4 +26,14 @@
     Thread.current.thread_variables.should == []
     @t.thread_variables.should == []
   end
+
+  it "returns keys as Symbols" do
+    key = mock('key')
+    key.should_receive(:to_str).and_return('a')
+
+    @t.thread_variable_set(key, 49)
+    @t.thread_variable_set('b', 50)
+    @t.thread_variable_set(:c, 51)
+    @t.thread_variables.sort.should == [:a, :b, :c]
+  end
 end
diff --git a/spec/ruby/core/time/_dump_spec.rb b/spec/ruby/core/time/_dump_spec.rb
index 4dc1c43cd2d941..852f9a07abfddd 100644
--- a/spec/ruby/core/time/_dump_spec.rb
+++ b/spec/ruby/core/time/_dump_spec.rb
@@ -1,4 +1,4 @@
-# -*- encoding: binary -*-
+# encoding: binary
 require_relative '../../spec_helper'
 
 describe "Time#_dump" do
diff --git a/spec/ruby/core/time/_load_spec.rb b/spec/ruby/core/time/_load_spec.rb
index 152934370fbb69..30899de262573d 100644
--- a/spec/ruby/core/time/_load_spec.rb
+++ b/spec/ruby/core/time/_load_spec.rb
@@ -1,4 +1,4 @@
-# -*- encoding: binary -*-
+# encoding: binary
 require_relative '../../spec_helper'
 
 describe "Time._load" do
@@ -44,8 +44,7 @@
   end
 
   it "treats the data as binary data" do
-    data = "\x04\bu:\tTime\r\fM\x1C\xC0\x00\x00\xD0\xBE"
-    data.force_encoding Encoding::UTF_8
+    data = "\x04\bu:\tTime\r\fM\x1C\xC0\x00\x00\xD0\xBE".dup.force_encoding Encoding::UTF_8
     t = Marshal.load(data)
     t.to_s.should == "2013-04-08 12:47:45 UTC"
   end
diff --git a/spec/ruby/core/time/at_spec.rb b/spec/ruby/core/time/at_spec.rb
index 0459589f0192a9..97906b8c8c2a7e 100644
--- a/spec/ruby/core/time/at_spec.rb
+++ b/spec/ruby/core/time/at_spec.rb
@@ -32,13 +32,6 @@
       t2.nsec.should == t.nsec
     end
 
-    describe "passed BigDecimal" do
-      it "doesn't round input value" do
-        require 'bigdecimal'
-        Time.at(BigDecimal('1.1')).to_f.should == 1.1
-      end
-    end
-
     describe "passed Rational" do
       it "returns Time with correct microseconds" do
         t = Time.at(Rational(1_486_570_508_539_759, 1_000_000))
@@ -109,8 +102,8 @@
 
       it "needs for the argument to respond to #to_int too" do
         o = mock('rational-but-no-to_int')
-        o.should_receive(:to_r).and_return(Rational(5, 2))
-        -> { Time.at(o) }.should raise_error(TypeError)
+        def o.to_r; Rational(5, 2) end
+        -> { Time.at(o) }.should raise_error(TypeError, "can't convert MockObject into an exact number")
       end
     end
   end
@@ -203,7 +196,7 @@
       end
 
       it "does not try to convert format to Symbol with #to_sym" do
-        format = "usec"
+        format = +"usec"
         format.should_not_receive(:to_sym)
         -> { Time.at(0, 123456, format) }.should raise_error(ArgumentError)
       end
@@ -235,6 +228,12 @@
       time.utc_offset.should == -9*60*60
       time.zone.should == nil
       time.to_i.should == @epoch_time
+
+      time = Time.at(@epoch_time, in: "-09:00:01")
+
+      time.utc_offset.should == -(9*60*60 + 1)
+      time.zone.should == nil
+      time.to_i.should == @epoch_time
     end
 
     it "could be UTC offset as a number of seconds" do
@@ -287,5 +286,31 @@
       -> { Time.at(@epoch_time, in: "+09:99") }.should raise_error(ArgumentError)
       -> { Time.at(@epoch_time, in: "ABC") }.should raise_error(ArgumentError)
     end
+
+    it "raises ArgumentError if hours greater than 23" do # TODO
+      -> { Time.at(@epoch_time, in: "+24:00") }.should raise_error(ArgumentError, "utc_offset out of range")
+      -> { Time.at(@epoch_time, in: "+2400") }.should raise_error(ArgumentError, "utc_offset out of range")
+
+      -> { Time.at(@epoch_time, in: "+99:00") }.should raise_error(ArgumentError, "utc_offset out of range")
+      -> { Time.at(@epoch_time, in: "+9900") }.should raise_error(ArgumentError, "utc_offset out of range")
+    end
+
+    it "raises ArgumentError if minutes greater than 59" do # TODO
+      -> { Time.at(@epoch_time, in: "+00:60") }.should raise_error(ArgumentError, '"+HH:MM", "-HH:MM", "UTC" or "A".."I","K".."Z" expected for utc_offset: +00:60')
+      -> { Time.at(@epoch_time, in: "+0060") }.should raise_error(ArgumentError, '"+HH:MM", "-HH:MM", "UTC" or "A".."I","K".."Z" expected for utc_offset: +0060')
+
+      -> { Time.at(@epoch_time, in: "+00:99") }.should raise_error(ArgumentError, '"+HH:MM", "-HH:MM", "UTC" or "A".."I","K".."Z" expected for utc_offset: +00:99')
+      -> { Time.at(@epoch_time, in: "+0099") }.should raise_error(ArgumentError, '"+HH:MM", "-HH:MM", "UTC" or "A".."I","K".."Z" expected for utc_offset: +0099')
+    end
+
+    ruby_bug '#20797', ''...'3.4' do
+      it "raises ArgumentError if seconds greater than 59" do
+        -> { Time.at(@epoch_time, in: "+00:00:60") }.should raise_error(ArgumentError, '"+HH:MM", "-HH:MM", "UTC" or "A".."I","K".."Z" expected for utc_offset: +00:00:60')
+        -> { Time.at(@epoch_time, in: "+000060") }.should raise_error(ArgumentError, '"+HH:MM", "-HH:MM", "UTC" or "A".."I","K".."Z" expected for utc_offset: +000060')
+
+        -> { Time.at(@epoch_time, in: "+00:00:99") }.should raise_error(ArgumentError, '"+HH:MM", "-HH:MM", "UTC" or "A".."I","K".."Z" expected for utc_offset: +00:00:99')
+        -> { Time.at(@epoch_time, in: "+000099") }.should raise_error(ArgumentError, '"+HH:MM", "-HH:MM", "UTC" or "A".."I","K".."Z" expected for utc_offset: +000099')
+      end
+    end
   end
 end
diff --git a/spec/ruby/core/time/comparison_spec.rb b/spec/ruby/core/time/comparison_spec.rb
index 5b53c9fb50dec0..866fbea72ef106 100644
--- a/spec/ruby/core/time/comparison_spec.rb
+++ b/spec/ruby/core/time/comparison_spec.rb
@@ -55,6 +55,32 @@
     }.should_not complain
   end
 
+  context "given different timezones" do
+    it "returns 0 if time is the same as other" do
+      # three timezones, all at the same timestamp
+      time_utc = Time.new(2000, 1, 1, 0, 0, 0, 0)
+      time_cet = Time.new(2000, 1, 1, 1, 0, 0, '+01:00')
+      time_brt = Time.new(1999, 12, 31, 21, 0, 0, '-03:00')
+      (time_utc <=> time_cet).should == 0
+      (time_utc <=> time_brt).should == 0
+      (time_cet <=> time_brt).should == 0
+    end
+
+    it "returns -1 if the first argument is before the second argument" do
+      # time_brt is later, even though the date is earlier
+      time_utc = Time.new(2000, 1, 1, 0, 0, 0, 0)
+      time_brt = Time.new(1999, 12, 31, 23, 0, 0, '-03:00')
+      (time_utc <=> time_brt).should == -1
+    end
+
+    it "returns 1 if the first argument is before the second argument" do
+      # time_brt is later, even though the date is earlier
+      time_utc = Time.new(2000, 1, 1, 0, 0, 0, 0)
+      time_brt = Time.new(1999, 12, 31, 23, 0, 0, '-03:00')
+      (time_brt <=> time_utc).should == 1
+    end
+  end
+
   describe "given a non-Time argument" do
     it "returns nil if argument <=> self returns nil" do
       t = Time.now
diff --git a/spec/ruby/core/time/deconstruct_keys_spec.rb b/spec/ruby/core/time/deconstruct_keys_spec.rb
index fbb0ec2164a085..b5cfdaa93f881e 100644
--- a/spec/ruby/core/time/deconstruct_keys_spec.rb
+++ b/spec/ruby/core/time/deconstruct_keys_spec.rb
@@ -1,44 +1,43 @@
 require_relative '../../spec_helper'
 
-ruby_version_is "3.2" do
-  describe "Time#deconstruct_keys" do
-    it "returns whole hash for nil as an argument" do
-      d = Time.utc(2022, 10, 5, 13, 30)
-      res = { year: 2022, month: 10, day: 5, yday: 278, wday: 3, hour: 13,
-              min: 30, sec: 0, subsec: 0, dst: false, zone: "UTC" }
-      d.deconstruct_keys(nil).should == res
-    end
-
-    it "returns only specified keys" do
-      d = Time.utc(2022, 10, 5, 13, 39)
-      d.deconstruct_keys([:zone, :subsec]).should == { zone: "UTC", subsec: 0 }
-    end
-
-    it "requires one argument" do
-      -> {
-        Time.new(2022, 10, 5, 13, 30).deconstruct_keys
-      }.should raise_error(ArgumentError)
-    end
-
-    it "it raises error when argument is neither nil nor array" do
-      d = Time.new(2022, 10, 5, 13, 30)
-
-      -> { d.deconstruct_keys(1) }.should raise_error(TypeError, "wrong argument type Integer (expected Array or nil)")
-      -> { d.deconstruct_keys("asd") }.should raise_error(TypeError, "wrong argument type String (expected Array or nil)")
-      -> { d.deconstruct_keys(:x) }.should raise_error(TypeError, "wrong argument type Symbol (expected Array or nil)")
-      -> { d.deconstruct_keys({}) }.should raise_error(TypeError, "wrong argument type Hash (expected Array or nil)")
-    end
-
-    it "returns {} when passed []" do
-      Time.new(2022, 10, 5, 13, 30).deconstruct_keys([]).should == {}
-    end
-
-    it "ignores non-Symbol keys" do
-      Time.new(2022, 10, 5, 13, 30).deconstruct_keys(['year', []]).should == {}
-    end
-
-    it "ignores not existing Symbol keys" do
-      Time.new(2022, 10, 5, 13, 30).deconstruct_keys([:year, :a]).should == { year: 2022 }
-    end
+describe "Time#deconstruct_keys" do
+  it "returns whole hash for nil as an argument" do
+    d = Time.utc(2022, 10, 5, 13, 30)
+    res = { year: 2022, month: 10, day: 5, yday: 278, wday: 3, hour: 13,
+            min: 30, sec: 0, subsec: 0, dst: false, zone: "UTC" }
+    d.deconstruct_keys(nil).should == res
+  end
+
+  it "returns only specified keys" do
+    d = Time.utc(2022, 10, 5, 13, 39)
+    d.deconstruct_keys([:zone, :subsec]).should == { zone: "UTC", subsec: 0 }
+  end
+
+  it "requires one argument" do
+    -> {
+      Time.new(2022, 10, 5, 13, 30).deconstruct_keys
+    }.should raise_error(ArgumentError)
+  end
+
+  it "it raises error when argument is neither nil nor array" do
+    d = Time.new(2022, 10, 5, 13, 30)
+
+    -> { d.deconstruct_keys(1) }.should raise_error(TypeError, "wrong argument type Integer (expected Array or nil)")
+    -> { d.deconstruct_keys("asd") }.should raise_error(TypeError, "wrong argument type String (expected Array or nil)")
+    -> { d.deconstruct_keys(:x) }.should raise_error(TypeError, "wrong argument type Symbol (expected Array or nil)")
+    -> { d.deconstruct_keys({}) }.should raise_error(TypeError, "wrong argument type Hash (expected Array or nil)")
+  end
+
+  it "returns {} when passed []" do
+    Time.new(2022, 10, 5, 13, 30).deconstruct_keys([]).should == {}
+  end
+
+  it "ignores non-Symbol keys" do
+    Time.new(2022, 10, 5, 13, 30).deconstruct_keys(['year', []]).should == {}
+  end
+
+  it "ignores not existing Symbol keys and processes keys after the first non-existing one" do
+    d = Time.utc(2022, 10, 5, 13, 30)
+    d.deconstruct_keys([:year, :a, :month, :b, :day]).should == { year: 2022, month: 10, day: 5 }
   end
 end
diff --git a/spec/ruby/core/time/fixtures/classes.rb b/spec/ruby/core/time/fixtures/classes.rb
index 1a9511b261c36f..21c4e1effb782b 100644
--- a/spec/ruby/core/time/fixtures/classes.rb
+++ b/spec/ruby/core/time/fixtures/classes.rb
@@ -59,7 +59,6 @@ def self.result
   Zone = Struct.new(:std, :dst, :dst_range)
   Zones = {
     "Asia/Colombo" => Zone[Z[5*3600+30*60, "MMT"], nil, nil],
-    "Europe/Kiev" => Zone[Z[2*3600, "EET"], Z[3*3600, "EEST"], 4..10],
     "PST" => Zone[Z[(-9*60*60), "PST"], nil, nil],
   }
 
diff --git a/spec/ruby/core/time/getlocal_spec.rb b/spec/ruby/core/time/getlocal_spec.rb
index 926a6dbf450412..398596f400494e 100644
--- a/spec/ruby/core/time/getlocal_spec.rb
+++ b/spec/ruby/core/time/getlocal_spec.rb
@@ -14,6 +14,7 @@
     t = Time.gm(2007, 1, 9, 12, 0, 0).getlocal(3630)
     t.should == Time.new(2007, 1, 9, 13, 0, 30, 3630)
     t.utc_offset.should == 3630
+    t.zone.should be_nil
   end
 
   platform_is_not :windows do
@@ -59,12 +60,24 @@
     t.utc_offset.should == 3600
   end
 
+  it "returns a Time with a UTC offset specified as +HH:MM:SS" do
+    t = Time.gm(2007, 1, 9, 12, 0, 0).getlocal("+01:00:01")
+    t.should == Time.new(2007, 1, 9, 13, 0, 1, 3601)
+    t.utc_offset.should == 3601
+  end
+
   it "returns a Time with a UTC offset specified as -HH:MM" do
     t = Time.gm(2007, 1, 9, 12, 0, 0).getlocal("-01:00")
     t.should == Time.new(2007, 1, 9, 11, 0, 0, -3600)
     t.utc_offset.should == -3600
   end
 
+  it "returns a Time with a UTC offset specified as -HH:MM:SS" do
+    t = Time.gm(2007, 1, 9, 12, 0, 0).getlocal("-01:00:01")
+    t.should == Time.new(2007, 1, 9, 10, 59, 59, -3601)
+    t.utc_offset.should == -3601
+  end
+
   describe "with an argument that responds to #to_str" do
     it "coerces using #to_str" do
       o = mock('string')
@@ -97,6 +110,32 @@
     -> { t.getlocal(86400) }.should raise_error(ArgumentError)
   end
 
+  it "raises ArgumentError if String argument and hours greater than 23" do
+    -> { Time.now.getlocal("+24:00") }.should raise_error(ArgumentError, "utc_offset out of range")
+    -> { Time.now.getlocal("+2400") }.should raise_error(ArgumentError, "utc_offset out of range")
+
+    -> { Time.now.getlocal("+99:00") }.should raise_error(ArgumentError, "utc_offset out of range")
+    -> { Time.now.getlocal("+9900") }.should raise_error(ArgumentError, "utc_offset out of range")
+  end
+
+  it "raises ArgumentError if String argument and minutes greater than 59" do
+    -> { Time.now.getlocal("+00:60") }.should raise_error(ArgumentError, '"+HH:MM", "-HH:MM", "UTC" or "A".."I","K".."Z" expected for utc_offset: +00:60')
+    -> { Time.now.getlocal("+0060") }.should raise_error(ArgumentError, '"+HH:MM", "-HH:MM", "UTC" or "A".."I","K".."Z" expected for utc_offset: +0060')
+
+    -> { Time.now.getlocal("+00:99") }.should raise_error(ArgumentError, '"+HH:MM", "-HH:MM", "UTC" or "A".."I","K".."Z" expected for utc_offset: +00:99')
+    -> { Time.now.getlocal("+0099") }.should raise_error(ArgumentError, '"+HH:MM", "-HH:MM", "UTC" or "A".."I","K".."Z" expected for utc_offset: +0099')
+  end
+
+  ruby_bug '#20797', ''...'3.4' do
+    it "raises ArgumentError if String argument and seconds greater than 59" do
+      -> { Time.now.getlocal("+00:00:60") }.should raise_error(ArgumentError, '"+HH:MM", "-HH:MM", "UTC" or "A".."I","K".."Z" expected for utc_offset: +00:00:60')
+      -> { Time.now.getlocal("+000060") }.should raise_error(ArgumentError, '"+HH:MM", "-HH:MM", "UTC" or "A".."I","K".."Z" expected for utc_offset: +000060')
+
+      -> { Time.now.getlocal("+00:00:99") }.should raise_error(ArgumentError, '"+HH:MM", "-HH:MM", "UTC" or "A".."I","K".."Z" expected for utc_offset: +00:00:99')
+      -> { Time.now.getlocal("+000099") }.should raise_error(ArgumentError, '"+HH:MM", "-HH:MM", "UTC" or "A".."I","K".."Z" expected for utc_offset: +000099')
+    end
+  end
+
   describe "with a timezone argument" do
     it "returns a Time in the timezone" do
       zone = TimeSpecs::Timezone.new(offset: (5*3600+30*60))
diff --git a/spec/ruby/core/time/iso8601_spec.rb b/spec/ruby/core/time/iso8601_spec.rb
new file mode 100644
index 00000000000000..ad60c3bb322100
--- /dev/null
+++ b/spec/ruby/core/time/iso8601_spec.rb
@@ -0,0 +1,6 @@
+require_relative '../../spec_helper'
+require_relative 'shared/xmlschema'
+
+describe "Time#iso8601" do
+  it_behaves_like :time_xmlschema, :iso8601
+end
diff --git a/spec/ruby/core/time/localtime_spec.rb b/spec/ruby/core/time/localtime_spec.rb
index 609b6532a16c5f..71c0dfebde7bad 100644
--- a/spec/ruby/core/time/localtime_spec.rb
+++ b/spec/ruby/core/time/localtime_spec.rb
@@ -72,6 +72,13 @@
     t.utc_offset.should == 3600
   end
 
+  it "returns a Time with a UTC offset specified as +HH:MM:SS" do
+    t = Time.gm(2007, 1, 9, 12, 0, 0)
+    t.localtime("+01:00:01")
+    t.should == Time.new(2007, 1, 9, 13, 0, 1, 3601)
+    t.utc_offset.should == 3601
+  end
+
   it "returns a Time with a UTC offset specified as -HH:MM" do
     t = Time.gm(2007, 1, 9, 12, 0, 0)
     t.localtime("-01:00")
@@ -79,6 +86,13 @@
     t.utc_offset.should == -3600
   end
 
+  it "returns a Time with a UTC offset specified as -HH:MM:SS" do
+    t = Time.gm(2007, 1, 9, 12, 0, 0)
+    t.localtime("-01:00:01")
+    t.should == Time.new(2007, 1, 9, 10, 59, 59, -3601)
+    t.utc_offset.should == -3601
+  end
+
   it "returns a Time with a UTC offset specified as UTC" do
     t = Time.new(2007, 1, 9, 12, 0, 0, 3600)
     t.localtime("UTC")
@@ -91,6 +105,32 @@
     t.utc_offset.should == 3600 * 2
   end
 
+  it "raises ArgumentError if String argument and hours greater than 23" do
+    -> { Time.now.localtime("+24:00") }.should raise_error(ArgumentError, "utc_offset out of range")
+    -> { Time.now.localtime("+2400") }.should raise_error(ArgumentError, "utc_offset out of range")
+
+    -> { Time.now.localtime("+99:00") }.should raise_error(ArgumentError, "utc_offset out of range")
+    -> { Time.now.localtime("+9900") }.should raise_error(ArgumentError, "utc_offset out of range")
+  end
+
+  it "raises ArgumentError if String argument and minutes greater than 59" do
+    -> { Time.now.localtime("+00:60") }.should raise_error(ArgumentError, '"+HH:MM", "-HH:MM", "UTC" or "A".."I","K".."Z" expected for utc_offset: +00:60')
+    -> { Time.now.localtime("+0060") }.should raise_error(ArgumentError, '"+HH:MM", "-HH:MM", "UTC" or "A".."I","K".."Z" expected for utc_offset: +0060')
+
+    -> { Time.now.localtime("+00:99") }.should raise_error(ArgumentError, '"+HH:MM", "-HH:MM", "UTC" or "A".."I","K".."Z" expected for utc_offset: +00:99')
+    -> { Time.now.localtime("+0099") }.should raise_error(ArgumentError, '"+HH:MM", "-HH:MM", "UTC" or "A".."I","K".."Z" expected for utc_offset: +0099')
+  end
+
+  ruby_bug '#20797', ''...'3.4' do
+    it "raises ArgumentError if String argument and seconds greater than 59" do
+      -> { Time.now.localtime("+00:00:60") }.should raise_error(ArgumentError, '"+HH:MM", "-HH:MM", "UTC" or "A".."I","K".."Z" expected for utc_offset: +00:00:60')
+      -> { Time.now.localtime("+000060") }.should raise_error(ArgumentError, '"+HH:MM", "-HH:MM", "UTC" or "A".."I","K".."Z" expected for utc_offset: +000060')
+
+      -> { Time.now.localtime("+00:00:99") }.should raise_error(ArgumentError, '"+HH:MM", "-HH:MM", "UTC" or "A".."I","K".."Z" expected for utc_offset: +00:00:99')
+      -> { Time.now.localtime("+000099") }.should raise_error(ArgumentError, '"+HH:MM", "-HH:MM", "UTC" or "A".."I","K".."Z" expected for utc_offset: +000099')
+    end
+  end
+
   platform_is_not :windows do
     it "changes the timezone according to the set one" do
       t = Time.new(2005, 2, 27, 22, 50, 0, -3600)
@@ -128,6 +168,17 @@
     end
   end
 
+  describe "with an argument that responds to #utc_to_local" do
+    it "coerces using #utc_to_local" do
+      o = mock('string')
+      o.should_receive(:utc_to_local).and_return(Time.new(2007, 1, 9, 13, 0, 0, 3600))
+      t = Time.gm(2007, 1, 9, 12, 0, 0)
+      t.localtime(o)
+      t.should == Time.new(2007, 1, 9, 13, 0, 0, 3600)
+      t.utc_offset.should == 3600
+    end
+  end
+
   it "raises ArgumentError if the String argument is not of the form (+|-)HH:MM" do
     t = Time.now
     -> { t.localtime("3600") }.should raise_error(ArgumentError)
diff --git a/spec/ruby/core/time/minus_spec.rb b/spec/ruby/core/time/minus_spec.rb
index 8449778465e882..9182d9965297f0 100644
--- a/spec/ruby/core/time/minus_spec.rb
+++ b/spec/ruby/core/time/minus_spec.rb
@@ -109,7 +109,7 @@
 
   it "does not return a subclass instance" do
     c = Class.new(Time)
-    x = c.now + 1
+    x = c.now - 1
     x.should be_an_instance_of(Time)
   end
 
diff --git a/spec/ruby/core/time/new_spec.rb b/spec/ruby/core/time/new_spec.rb
index 18d73962692b75..dc3ccbdc0052df 100644
--- a/spec/ruby/core/time/new_spec.rb
+++ b/spec/ruby/core/time/new_spec.rb
@@ -58,30 +58,28 @@
     Time.new(2000, 1, 1, 0, 0, 0, "-04:10:43").utc_offset.should == -15043
   end
 
-  ruby_bug '#13669', ''...'3.1' do
-    it "returns a Time with a UTC offset specified as +HH" do
-      Time.new(2000, 1, 1, 0, 0, 0, "+05").utc_offset.should == 3600 * 5
-    end
+  it "returns a Time with a UTC offset specified as +HH" do
+    Time.new(2000, 1, 1, 0, 0, 0, "+05").utc_offset.should == 3600 * 5
+  end
 
-    it "returns a Time with a UTC offset specified as -HH" do
-      Time.new(2000, 1, 1, 0, 0, 0, "-05").utc_offset.should == -3600 * 5
-    end
+  it "returns a Time with a UTC offset specified as -HH" do
+    Time.new(2000, 1, 1, 0, 0, 0, "-05").utc_offset.should == -3600 * 5
+  end
 
-    it "returns a Time with a UTC offset specified as +HHMM" do
-      Time.new(2000, 1, 1, 0, 0, 0, "+0530").utc_offset.should == 19800
-    end
+  it "returns a Time with a UTC offset specified as +HHMM" do
+    Time.new(2000, 1, 1, 0, 0, 0, "+0530").utc_offset.should == 19800
+  end
 
-    it "returns a Time with a UTC offset specified as -HHMM" do
-      Time.new(2000, 1, 1, 0, 0, 0, "-0530").utc_offset.should == -19800
-    end
+  it "returns a Time with a UTC offset specified as -HHMM" do
+    Time.new(2000, 1, 1, 0, 0, 0, "-0530").utc_offset.should == -19800
+  end
 
-    it "returns a Time with a UTC offset specified as +HHMMSS" do
-      Time.new(2000, 1, 1, 0, 0, 0, "+053037").utc_offset.should == 19837
-    end
+  it "returns a Time with a UTC offset specified as +HHMMSS" do
+    Time.new(2000, 1, 1, 0, 0, 0, "+053037").utc_offset.should == 19837
+  end
 
-    it "returns a Time with a UTC offset specified as -HHMMSS" do
-      Time.new(2000, 1, 1, 0, 0, 0, "-053037").utc_offset.should == -19837
-    end
+  it "returns a Time with a UTC offset specified as -HHMMSS" do
+    Time.new(2000, 1, 1, 0, 0, 0, "-053037").utc_offset.should == -19837
   end
 
   describe "with an argument that responds to #to_str" do
@@ -129,18 +127,9 @@
     end
   end
 
-  ruby_version_is ""..."3.1" do
-    it "raises ArgumentError if the string argument is J" do
-      message = '"+HH:MM", "-HH:MM", "UTC" or "A".."I","K".."Z" expected for utc_offset'
-      -> { Time.new(2000, 1, 1, 0, 0, 0, "J") }.should raise_error(ArgumentError, message)
-    end
-  end
-
-  ruby_version_is "3.1" do
-    it "raises ArgumentError if the string argument is J" do
-      message = '"+HH:MM", "-HH:MM", "UTC" or "A".."I","K".."Z" expected for utc_offset: J'
-      -> { Time.new(2000, 1, 1, 0, 0, 0, "J") }.should raise_error(ArgumentError, message)
-    end
+  it "raises ArgumentError if the string argument is J" do
+    message = '"+HH:MM", "-HH:MM", "UTC" or "A".."I","K".."Z" expected for utc_offset: J'
+    -> { Time.new(2000, 1, 1, 0, 0, 0, "J") }.should raise_error(ArgumentError, message)
   end
 
   it "returns a local Time if the argument is nil" do
@@ -193,6 +182,7 @@
   end
 end
 
+# The method #local_to_utc is tested only here because Time.new is the only method that calls #local_to_utc.
 describe "Time.new with a timezone argument" do
   it "returns a Time in the timezone" do
     zone = TimeSpecs::Timezone.new(offset: (5*3600+30*60))
@@ -213,9 +203,7 @@ def zone.local_to_utc(time)
       time
     end
 
-    -> {
-      Time.new(2000, 1, 1, 12, 0, 0, zone).should be_kind_of(Time)
-    }.should_not raise_error
+    Time.new(2000, 1, 1, 12, 0, 0, zone).should be_kind_of(Time)
   end
 
   it "raises TypeError if timezone does not implement #local_to_utc method" do
@@ -226,7 +214,7 @@ def zone.utc_to_local(time)
 
     -> {
       Time.new(2000, 1, 1, 12, 0, 0, zone)
-    }.should raise_error(TypeError, /can't convert \w+ into an exact number/)
+    }.should raise_error(TypeError, /can't convert Object into an exact number/)
   end
 
   it "does not raise exception if timezone does not implement #utc_to_local method" do
@@ -235,51 +223,48 @@ def zone.local_to_utc(time)
       time
     end
 
-    -> {
-      Time.new(2000, 1, 1, 12, 0, 0, zone).should be_kind_of(Time)
-    }.should_not raise_error
+    Time.new(2000, 1, 1, 12, 0, 0, zone).should be_kind_of(Time)
   end
 
   # The result also should be a Time or Time-like object (not necessary to be the same class)
-  # The zone of the result is just ignored
+  # or respond to #to_int method. The zone of the result is just ignored.
   describe "returned value by #utc_to_local and #local_to_utc methods" do
     it "could be Time instance" do
       zone = Object.new
       def zone.local_to_utc(t)
-        Time.utc(t.year, t.mon, t.day, t.hour - 1, t.min, t.sec)
+        time = Time.utc(t.year, t.mon, t.day, t.hour, t.min, t.sec)
+        time - 60 * 60 # - 1 hour
       end
 
-      -> {
-        Time.new(2000, 1, 1, 12, 0, 0, zone).should be_kind_of(Time)
-        Time.new(2000, 1, 1, 12, 0, 0, zone).utc_offset.should == 60*60
-      }.should_not raise_error
+      Time.new(2000, 1, 1, 12, 0, 0, zone).should be_kind_of(Time)
+      Time.new(2000, 1, 1, 12, 0, 0, zone).utc_offset.should == 60*60
     end
 
     it "could be Time subclass instance" do
       zone = Object.new
       def zone.local_to_utc(t)
-        Class.new(Time).utc(t.year, t.mon, t.day, t.hour - 1, t.min, t.sec)
+        time = Time.utc(t.year, t.mon, t.day, t.hour, t.min, t.sec)
+        time -= 60 * 60 # - 1 hour
+        Class.new(Time).utc(time.year, time.mon, time.day, time.hour, t.min, t.sec)
       end
 
-      -> {
-        Time.new(2000, 1, 1, 12, 0, 0, zone).should be_kind_of(Time)
-        Time.new(2000, 1, 1, 12, 0, 0, zone).utc_offset.should == 60*60
-      }.should_not raise_error
+      Time.new(2000, 1, 1, 12, 0, 0, zone).should be_kind_of(Time)
+      Time.new(2000, 1, 1, 12, 0, 0, zone).utc_offset.should == 60*60
     end
 
     it "could be any object with #to_i method" do
       zone = Object.new
       def zone.local_to_utc(time)
-        Struct.new(:to_i).new(time.to_i - 60*60)
+        obj = Object.new
+        obj.singleton_class.define_method(:to_i) { time.to_i - 60*60 }
+        obj
       end
 
-      -> {
-        Time.new(2000, 1, 1, 12, 0, 0, zone).should be_kind_of(Time)
-        Time.new(2000, 1, 1, 12, 0, 0, zone).utc_offset.should == 60*60
-      }.should_not raise_error
+      Time.new(2000, 1, 1, 12, 0, 0, zone).should be_kind_of(Time)
+      Time.new(2000, 1, 1, 12, 0, 0, zone).utc_offset.should == 60*60
     end
 
-    it "could have any #zone and #utc_offset because they are ignored" do
+    it "could have any #zone and #utc_offset because they are ignored if it isn't an instance of Time" do
       zone = Object.new
       def zone.local_to_utc(time)
         Struct.new(:to_i, :zone, :utc_offset).new(time.to_i, 'America/New_York', -5*60*60)
@@ -293,7 +278,15 @@ def zone.local_to_utc(time)
       Time.new(2000, 1, 1, 12, 0, 0, zone).utc_offset.should == 0
     end
 
-    it "leads to raising Argument error if difference between argument and result is too large" do
+    it "cannot have arbitrary #utc_offset if it is an instance of Time" do
+      zone = Object.new
+      def zone.local_to_utc(t)
+        Time.new(t.year, t.mon, t.mday, t.hour, t.min, t.sec, 9*60*60)
+      end
+      Time.new(2000, 1, 1, 12, 0, 0, zone).utc_offset.should == 9*60*60
+    end
+
+    it "raises ArgumentError if difference between argument and result is too large" do
       zone = Object.new
       def zone.local_to_utc(t)
         Time.utc(t.year, t.mon, t.day + 1, t.hour, t.min, t.sec)
@@ -318,12 +311,9 @@ def zone.local_to_utc(t)
     end
 
     it "implements subset of Time methods" do
+      # List only methods that are explicitly documented.
       [
-        :year, :mon, :month, :mday, :hour, :min, :sec,
-        :tv_sec, :tv_usec, :usec, :tv_nsec, :nsec, :subsec,
-        :to_i, :to_f, :to_r, :+, :-,
-        :isdst, :dst?, :zone, :gmtoff, :gmt_offset, :utc_offset, :utc?, :gmt?,
-        :to_s, :inspect, :to_a, :to_time,
+        :year, :mon, :mday, :hour, :min, :sec, :to_i, :isdst
       ].each do |name|
         @obj.respond_to?(name).should == true
       end
@@ -358,7 +348,7 @@ def zone.local_to_utc(t)
 
       -> {
         Marshal.dump(time)
-      }.should raise_error(NoMethodError, /undefined method `name' for/)
+      }.should raise_error(NoMethodError, /undefined method [`']name' for/)
     end
   end
 
@@ -403,243 +393,360 @@ def zone.local_to_utc(t)
     end
   end
 
-  ruby_version_is '3.1' do # https://bugs.ruby-lang.org/issues/17485
-    describe ":in keyword argument" do
-      it "could be UTC offset as a String in '+HH:MM or '-HH:MM' format" do
-        time = Time.new(2000, 1, 1, 12, 0, 0, in: "+05:00")
+  describe ":in keyword argument" do
+    it "could be UTC offset as a String in '+HH:MM or '-HH:MM' format" do
+      time = Time.new(2000, 1, 1, 12, 0, 0, in: "+05:00")
 
-        time.utc_offset.should == 5*60*60
-        time.zone.should == nil
+      time.utc_offset.should == 5*60*60
+      time.zone.should == nil
 
-        time = Time.new(2000, 1, 1, 12, 0, 0, in: "-09:00")
+      time = Time.new(2000, 1, 1, 12, 0, 0, in: "-09:00")
 
-        time.utc_offset.should == -9*60*60
-        time.zone.should == nil
-      end
+      time.utc_offset.should == -9*60*60
+      time.zone.should == nil
 
-      it "could be UTC offset as a number of seconds" do
-        time = Time.new(2000, 1, 1, 12, 0, 0, in: 5*60*60)
+      time = Time.new(2000, 1, 1, 12, 0, 0, in: "-09:00:01")
 
-        time.utc_offset.should == 5*60*60
-        time.zone.should == nil
+      time.utc_offset.should == -(9*60*60 + 1)
+      time.zone.should == nil
+    end
 
-        time = Time.new(2000, 1, 1, 12, 0, 0, in: -9*60*60)
+    it "could be UTC offset as a number of seconds" do
+      time = Time.new(2000, 1, 1, 12, 0, 0, in: 5*60*60)
 
-        time.utc_offset.should == -9*60*60
-        time.zone.should == nil
-      end
+      time.utc_offset.should == 5*60*60
+      time.zone.should == nil
 
-      it "returns a Time with UTC offset specified as a single letter military timezone" do
-        Time.new(2000, 1, 1, 0, 0, 0, in: "W").utc_offset.should == 3600 * -10
-      end
+      time = Time.new(2000, 1, 1, 12, 0, 0, in: -9*60*60)
 
-      it "could be a timezone object" do
-        zone = TimeSpecs::TimezoneWithName.new(name: "Asia/Colombo")
-        time = Time.new(2000, 1, 1, 12, 0, 0, in: zone)
+      time.utc_offset.should == -9*60*60
+      time.zone.should == nil
+    end
 
-        time.utc_offset.should == 5*3600+30*60
-        time.zone.should == zone
+    it "returns a Time with UTC offset specified as a single letter military timezone" do
+      Time.new(2000, 1, 1, 0, 0, 0, in: "W").utc_offset.should == 3600 * -10
+    end
 
-        zone = TimeSpecs::TimezoneWithName.new(name: "PST")
-        time = Time.new(2000, 1, 1, 12, 0, 0, in: zone)
+    it "could be a timezone object" do
+      zone = TimeSpecs::TimezoneWithName.new(name: "Asia/Colombo")
+      time = Time.new(2000, 1, 1, 12, 0, 0, in: zone)
 
-        time.utc_offset.should == -9*60*60
-        time.zone.should == zone
-      end
+      time.utc_offset.should == 5*3600+30*60
+      time.zone.should == zone
 
-      it "allows omitting minor arguments" do
-        Time.new(2000, 1, 1, 12, 1, 1, in: "+05:00").should == Time.new(2000, 1, 1, 12, 1, 1, "+05:00")
-        Time.new(2000, 1, 1, 12, 1, in: "+05:00").should == Time.new(2000, 1, 1, 12, 1, 0, "+05:00")
-        Time.new(2000, 1, 1, 12, in: "+05:00").should == Time.new(2000, 1, 1, 12, 0, 0, "+05:00")
-        Time.new(2000, 1, 1, in: "+05:00").should == Time.new(2000, 1, 1, 0, 0, 0, "+05:00")
-        Time.new(2000, 1, in: "+05:00").should == Time.new(2000, 1, 1, 0, 0, 0, "+05:00")
-        Time.new(2000, in: "+05:00").should == Time.new(2000, 1, 1, 0, 0, 0, "+05:00")
-        Time.new(in: "+05:00").should be_close(Time.now.getlocal("+05:00"), TIME_TOLERANCE)
-      end
+      zone = TimeSpecs::TimezoneWithName.new(name: "PST")
+      time = Time.new(2000, 1, 1, 12, 0, 0, in: zone)
 
-      it "converts to a provided timezone if all the positional arguments are omitted" do
-        Time.new(in: "+05:00").utc_offset.should == 5*3600
-      end
+      time.utc_offset.should == -9*60*60
+      time.zone.should == zone
+    end
 
-      it "raises ArgumentError if format is invalid" do
-        -> { Time.new(2000, 1, 1, 12, 0, 0, in: "+09:99") }.should raise_error(ArgumentError)
-        -> { Time.new(2000, 1, 1, 12, 0, 0, in: "ABC") }.should raise_error(ArgumentError)
-      end
+    it "allows omitting minor arguments" do
+      Time.new(2000, 1, 1, 12, 1, 1, in: "+05:00").should == Time.new(2000, 1, 1, 12, 1, 1, "+05:00")
+      Time.new(2000, 1, 1, 12, 1, in: "+05:00").should == Time.new(2000, 1, 1, 12, 1, 0, "+05:00")
+      Time.new(2000, 1, 1, 12, in: "+05:00").should == Time.new(2000, 1, 1, 12, 0, 0, "+05:00")
+      Time.new(2000, 1, 1, in: "+05:00").should == Time.new(2000, 1, 1, 0, 0, 0, "+05:00")
+      Time.new(2000, 1, in: "+05:00").should == Time.new(2000, 1, 1, 0, 0, 0, "+05:00")
+      Time.new(2000, in: "+05:00").should == Time.new(2000, 1, 1, 0, 0, 0, "+05:00")
+      Time.new(in: "+05:00").should be_close(Time.now.getlocal("+05:00"), TIME_TOLERANCE)
+    end
 
-      it "raises ArgumentError if two offset arguments are given" do
-        -> {
-          Time.new(2000, 1, 1, 12, 0, 0, "+05:00", in: "+05:00")
-        }.should raise_error(ArgumentError, "timezone argument given as positional and keyword arguments")
-      end
+    it "converts to a provided timezone if all the positional arguments are omitted" do
+      Time.new(in: "+05:00").utc_offset.should == 5*3600
+    end
+
+    it "raises ArgumentError if format is invalid" do
+      -> { Time.new(2000, 1, 1, 12, 0, 0, in: "+09:99") }.should raise_error(ArgumentError)
+      -> { Time.new(2000, 1, 1, 12, 0, 0, in: "ABC") }.should raise_error(ArgumentError)
+    end
+
+    it "raises ArgumentError if two offset arguments are given" do
+      -> {
+        Time.new(2000, 1, 1, 12, 0, 0, "+05:00", in: "+05:00")
+      }.should raise_error(ArgumentError, "timezone argument given as positional and keyword arguments")
     end
   end
 
-  ruby_version_is "3.2" do
-    describe "Time.new with a String argument" do
-      it "parses an ISO-8601 like format" do
-        t = Time.utc(2020, 12, 24, 15, 56, 17)
+  describe "Time.new with a String argument" do
+    it "parses an ISO-8601 like format" do
+      t = Time.utc(2020, 12, 24, 15, 56, 17)
 
-        Time.new("2020-12-24T15:56:17Z").should == t
-        Time.new("2020-12-25 00:56:17 +09:00").should == t
-        Time.new("2020-12-25 00:57:47 +09:01:30").should == t
-        Time.new("2020-12-25 00:56:17 +0900").should == t
-        Time.new("2020-12-25 00:57:47 +090130").should == t
-        Time.new("2020-12-25T00:56:17+09:00").should == t
-      end
+      Time.new("2020-12-24T15:56:17Z").should == t
+      Time.new("2020-12-25 00:56:17 +09:00").should == t
+      Time.new("2020-12-25 00:57:47 +09:01:30").should == t
+      Time.new("2020-12-25 00:56:17 +0900").should == t
+      Time.new("2020-12-25 00:57:47 +090130").should == t
+      Time.new("2020-12-25T00:56:17+09:00").should == t
 
-      it "accepts precision keyword argument and truncates specified digits of sub-second part" do
-        Time.new("2021-12-25 00:00:00.123456789876 +09:00").subsec.should == 0.123456789r
-        Time.new("2021-12-25 00:00:00.123456789876 +09:00", precision: nil).subsec.should == 0.123456789876r
-        Time.new("2021-12-25 00:00:00 +09:00", precision: 0).subsec.should == 0
-        Time.new("2021-12-25 00:00:00.123456789876 +09:00", precision: -1).subsec.should == 0.123456789876r
-      end
+      Time.new("2020-12-25T00:56:17.123456+09:00").should == Time.utc(2020, 12, 24, 15, 56, 17, 123456)
+    end
 
-      it "returns Time in local timezone if not provided in the String argument" do
-        Time.new("2021-12-25 00:00:00").zone.should == Time.new(2021, 12, 25).zone
-        Time.new("2021-12-25 00:00:00").utc_offset.should == Time.new(2021, 12, 25).utc_offset
-      end
+    it "accepts precision keyword argument and truncates specified digits of sub-second part" do
+      Time.new("2021-12-25 00:00:00.123456789876 +09:00").subsec.should == 0.123456789r
+      Time.new("2021-12-25 00:00:00.123456789876 +09:00", precision: nil).subsec.should == 0.123456789876r
+      Time.new("2021-12-25 00:00:00 +09:00", precision: 0).subsec.should == 0
+      Time.new("2021-12-25 00:00:00.123456789876 +09:00", precision: -1).subsec.should == 0.123456789876r
+    end
 
-      it "returns Time in timezone specified in the String argument" do
-        Time.new("2021-12-25 00:00:00 +05:00").to_s.should == "2021-12-25 00:00:00 +0500"
-      end
+    it "returns Time in local timezone if not provided in the String argument" do
+      Time.new("2021-12-25 00:00:00").zone.should == Time.new(2021, 12, 25).zone
+      Time.new("2021-12-25 00:00:00").utc_offset.should == Time.new(2021, 12, 25).utc_offset
+    end
 
-      it "returns Time in timezone specified in the String argument even if the in keyword argument provided" do
-        Time.new("2021-12-25 00:00:00 +09:00", in: "-01:00").to_s.should == "2021-12-25 00:00:00 +0900"
-      end
+    it "returns Time in timezone specified in the String argument" do
+      Time.new("2021-12-25 00:00:00 +05:00").to_s.should == "2021-12-25 00:00:00 +0500"
+    end
 
-      it "returns Time in timezone specified with in keyword argument if timezone isn't provided in the String argument" do
-        Time.new("2021-12-25 00:00:00", in: "-01:00").to_s.should == "2021-12-25 00:00:00 -0100"
-      end
+    it "returns Time in timezone specified in the String argument even if the in keyword argument provided" do
+      Time.new("2021-12-25 00:00:00 +09:00", in: "-01:00").to_s.should == "2021-12-25 00:00:00 +0900"
+    end
 
-      it "converts precision keyword argument into Integer if is not nil" do
-        obj = Object.new
-        def obj.to_int; 3; end
+    it "returns Time in timezone specified with in keyword argument if timezone isn't provided in the String argument" do
+      Time.new("2021-12-25 00:00:00", in: "-01:00").to_s.should == "2021-12-25 00:00:00 -0100"
+    end
 
-        Time.new("2021-12-25 00:00:00.123456789876 +09:00", precision: 1.2).subsec.should == 0.1r
-        Time.new("2021-12-25 00:00:00.123456789876 +09:00", precision: obj).subsec.should == 0.123r
-        Time.new("2021-12-25 00:00:00.123456789876 +09:00", precision: 3r).subsec.should == 0.123r
-      end
+    it "returns Time of Jan 1 for string with just year" do
+      Time.new("2021").should == Time.new(2021, 1, 1)
+      Time.new("2021").zone.should == Time.new(2021, 1, 1).zone
+      Time.new("2021").utc_offset.should == Time.new(2021, 1, 1).utc_offset
+    end
 
-      ruby_version_is ""..."3.3" do
-        it "raise TypeError is can't convert precision keyword argument into Integer" do
-          -> {
-            Time.new("2021-12-25 00:00:00.123456789876 +09:00", precision: "")
-          }.should raise_error(TypeError, "no implicit conversion from string")
-        end
-      end
+    it "returns Time of Jan 1 for string with just year in timezone specified with in keyword argument" do
+      Time.new("2021", in: "+17:00").to_s.should == "2021-01-01 00:00:00 +1700"
+    end
 
-      ruby_version_is "3.3" do
-        it "raise TypeError is can't convert precision keyword argument into Integer" do
-          -> {
-            Time.new("2021-12-25 00:00:00.123456789876 +09:00", precision: "")
-          }.should raise_error(TypeError, "no implicit conversion of String into Integer")
-        end
-      end
+    it "converts precision keyword argument into Integer if is not nil" do
+      obj = Object.new
+      def obj.to_int; 3; end
 
-      it "raises ArgumentError if part of time string is missing" do
-        -> {
-          Time.new("2020-12-25 00:56 +09:00")
-        }.should raise_error(ArgumentError, "missing sec part: 00:56 ")
+      Time.new("2021-12-25 00:00:00.123456789876 +09:00", precision: 1.2).subsec.should == 0.1r
+      Time.new("2021-12-25 00:00:00.123456789876 +09:00", precision: obj).subsec.should == 0.123r
+      Time.new("2021-12-25 00:00:00.123456789876 +09:00", precision: 3r).subsec.should == 0.123r
+    end
+
+    it "returns Time with correct subseconds when given seconds fraction is shorted than 6 digits" do
+      Time.new("2020-12-25T00:56:17.123 +09:00").nsec.should == 123000000
+      Time.new("2020-12-25T00:56:17.123 +09:00").usec.should == 123000
+      Time.new("2020-12-25T00:56:17.123 +09:00").subsec.should == 0.123
+    end
+
+    it "returns Time with correct subseconds when given seconds fraction is milliseconds" do
+      Time.new("2020-12-25T00:56:17.123456 +09:00").nsec.should == 123456000
+      Time.new("2020-12-25T00:56:17.123456 +09:00").usec.should == 123456
+      Time.new("2020-12-25T00:56:17.123456 +09:00").subsec.should == 0.123456
+    end
+
+    it "returns Time with correct subseconds when given seconds fraction is longer that 6 digits but shorted than 9 digits" do
+      Time.new("2020-12-25T00:56:17.12345678 +09:00").nsec.should == 123456780
+      Time.new("2020-12-25T00:56:17.12345678 +09:00").usec.should == 123456
+      Time.new("2020-12-25T00:56:17.12345678 +09:00").subsec.should == 0.12345678
+    end
 
+    it "returns Time with correct subseconds when given seconds fraction is nanoseconds" do
+      Time.new("2020-12-25T00:56:17.123456789 +09:00").nsec.should == 123456789
+      Time.new("2020-12-25T00:56:17.123456789 +09:00").usec.should == 123456
+      Time.new("2020-12-25T00:56:17.123456789 +09:00").subsec.should == 0.123456789
+    end
+
+    it "returns Time with correct subseconds when given seconds fraction is longer than 9 digits" do
+      Time.new("2020-12-25T00:56:17.123456789876 +09:00").nsec.should == 123456789
+      Time.new("2020-12-25T00:56:17.123456789876 +09:00").usec.should == 123456
+      Time.new("2020-12-25T00:56:17.123456789876 +09:00").subsec.should == 0.123456789
+    end
+
+    ruby_version_is ""..."3.3" do
+      it "raise TypeError is can't convert precision keyword argument into Integer" do
         -> {
-          Time.new("2020-12-25 00 +09:00")
-        }.should raise_error(ArgumentError, "missing min part: 00 ")
+          Time.new("2021-12-25 00:00:00.123456789876 +09:00", precision: "")
+        }.should raise_error(TypeError, "no implicit conversion from string")
       end
+    end
 
-      it "raises ArgumentError if subsecond is missing after dot" do
+    ruby_version_is "3.3" do
+      it "raise TypeError is can't convert precision keyword argument into Integer" do
         -> {
-          Time.new("2020-12-25 00:56:17. +0900")
-        }.should raise_error(ArgumentError, "subsecond expected after dot: 00:56:17. ")
+          Time.new("2021-12-25 00:00:00.123456789876 +09:00", precision: "")
+        }.should raise_error(TypeError, "no implicit conversion of String into Integer")
       end
+    end
 
-      it "raises ArgumentError if String argument is not in the supported format" do
-        -> {
-          Time.new("021-12-25 00:00:00.123456 +09:00")
-        }.should raise_error(ArgumentError, "year must be 4 or more digits: 021")
+    it "raises ArgumentError if part of time string is missing" do
+      -> {
+        Time.new("2020-12-25 00:56 +09:00")
+      }.should raise_error(ArgumentError, /missing sec part: 00:56 |can't parse:/)
 
-        -> {
-          Time.new("2020-012-25 00:56:17 +0900")
-        }.should raise_error(ArgumentError, "two digits mon is expected after `-': -012-25 00:")
+      -> {
+        Time.new("2020-12-25 00 +09:00")
+      }.should raise_error(ArgumentError, /missing min part: 00 |can't parse:/)
+    end
 
+    ruby_version_is "3.2.3" do
+      it "raises ArgumentError if the time part is missing" do
         -> {
-          Time.new("2020-2-25 00:56:17 +0900")
-        }.should raise_error(ArgumentError, "two digits mon is expected after `-': -2-25 00:56")
+          Time.new("2020-12-25")
+        }.should raise_error(ArgumentError, /no time information|can't parse:/)
+      end
 
+      it "raises ArgumentError if day is missing" do
         -> {
-          Time.new("2020-12-215 00:56:17 +0900")
-        }.should raise_error(ArgumentError, "two digits mday is expected after `-': -215 00:56:")
+          Time.new("2020-12")
+        }.should raise_error(ArgumentError, /no time information|can't parse:/)
+      end
+    end
 
-        -> {
-          Time.new("2020-12-25 000:56:17 +0900")
-        }.should raise_error(ArgumentError, "two digits hour is expected:  000:56:17 ")
+    it "raises ArgumentError if subsecond is missing after dot" do
+      -> {
+        Time.new("2020-12-25 00:56:17. +0900")
+      }.should raise_error(ArgumentError, /subsecond expected after dot: 00:56:17. |can't parse:/)
+    end
 
-        -> {
-          Time.new("2020-12-25 0:56:17 +0900")
-        }.should raise_error(ArgumentError, "two digits hour is expected:  0:56:17 +0")
+    it "raises ArgumentError if String argument is not in the supported format" do
+      -> {
+        Time.new("021-12-25 00:00:00.123456 +09:00")
+      }.should raise_error(ArgumentError, /year must be 4 or more digits: 021|can't parse:/)
 
-        -> {
-          Time.new("2020-12-25 00:516:17 +0900")
-        }.should raise_error(ArgumentError, "two digits min is expected after `:': :516:17 +09")
+      -> {
+        Time.new("2020-012-25 00:56:17 +0900")
+      }.should raise_error(ArgumentError, /\Atwo digits mon is expected after [`']-': -012-25 00:\z|can't parse:/)
 
-        -> {
-          Time.new("2020-12-25 00:6:17 +0900")
-        }.should raise_error(ArgumentError, "two digits min is expected after `:': :6:17 +0900")
+      -> {
+        Time.new("2020-2-25 00:56:17 +0900")
+      }.should raise_error(ArgumentError, /\Atwo digits mon is expected after [`']-': -2-25 00:56\z|can't parse:/)
 
-        -> {
-          Time.new("2020-12-25 00:56:137 +0900")
-        }.should raise_error(ArgumentError, "two digits sec is expected after `:': :137 +0900")
+      -> {
+        Time.new("2020-12-215 00:56:17 +0900")
+      }.should raise_error(ArgumentError, /\Atwo digits mday is expected after [`']-': -215 00:56:\z|can't parse:/)
 
-        -> {
-          Time.new("2020-12-25 00:56:7 +0900")
-        }.should raise_error(ArgumentError, "two digits sec is expected after `:': :7 +0900")
+      -> {
+        Time.new("2020-12-25 000:56:17 +0900")
+      }.should raise_error(ArgumentError, /two digits hour is expected:  000:56:17 |can't parse:/)
 
-        -> {
-          Time.new("2020-12-25 00:56. +0900")
-        }.should raise_error(ArgumentError, "fraction min is not supported: 00:56.")
+      -> {
+        Time.new("2020-12-25 0:56:17 +0900")
+      }.should raise_error(ArgumentError, /two digits hour is expected:  0:56:17 \+0|can't parse:/)
+
+      -> {
+        Time.new("2020-12-25 00:516:17 +0900")
+      }.should raise_error(ArgumentError, /\Atwo digits min is expected after [`']:': :516:17 \+09\z|can't parse:/)
+
+      -> {
+        Time.new("2020-12-25 00:6:17 +0900")
+      }.should raise_error(ArgumentError, /\Atwo digits min is expected after [`']:': :6:17 \+0900\z|can't parse:/)
+
+      -> {
+        Time.new("2020-12-25 00:56:137 +0900")
+      }.should raise_error(ArgumentError, /\Atwo digits sec is expected after [`']:': :137 \+0900\z|can't parse:/)
+
+      -> {
+        Time.new("2020-12-25 00:56:7 +0900")
+      }.should raise_error(ArgumentError, /\Atwo digits sec is expected after [`']:': :7 \+0900\z|can't parse:/)
+
+      -> {
+        Time.new("2020-12-25 00:56. +0900")
+      }.should raise_error(ArgumentError, /fraction min is not supported: 00:56\.|can't parse:/)
+
+      -> {
+        Time.new("2020-12-25 00. +0900")
+      }.should raise_error(ArgumentError, /fraction hour is not supported: 00\.|can't parse:/)
+    end
+
+    it "raises ArgumentError if date/time parts values are not valid" do
+      -> {
+        Time.new("2020-13-25 00:56:17 +09:00")
+      }.should raise_error(ArgumentError, /(mon|argument) out of range/)
+
+      -> {
+        Time.new("2020-12-32 00:56:17 +09:00")
+      }.should raise_error(ArgumentError, /(mday|argument) out of range/)
+
+      -> {
+        Time.new("2020-12-25 25:56:17 +09:00")
+      }.should raise_error(ArgumentError, /(hour|argument) out of range/)
+
+      -> {
+        Time.new("2020-12-25 00:61:17 +09:00")
+      }.should raise_error(ArgumentError, /(min|argument) out of range/)
+
+      -> {
+        Time.new("2020-12-25 00:56:61 +09:00")
+      }.should raise_error(ArgumentError, /(sec|argument) out of range/)
+
+      -> {
+        Time.new("2020-12-25 00:56:17 +23:59:60")
+      }.should raise_error(ArgumentError, /utc_offset|argument out of range/)
+
+      -> {
+        Time.new("2020-12-25 00:56:17 +24:00")
+      }.should raise_error(ArgumentError, /(utc_offset|argument) out of range/)
+
+      -> {
+        Time.new("2020-12-25 00:56:17 +23:61")
+      }.should raise_error(ArgumentError, /utc_offset/)
 
+      ruby_bug '#20797', ''...'3.4' do
         -> {
-          Time.new("2020-12-25 00. +0900")
-        }.should raise_error(ArgumentError, "fraction hour is not supported: 00.")
+          Time.new("2020-12-25 00:56:17 +00:23:61")
+        }.should raise_error(ArgumentError, /utc_offset/)
       end
+    end
 
-      it "raises ArgumentError if date/time parts values are not valid" do
-        -> {
-          Time.new("2020-13-25 00:56:17 +09:00")
-        }.should raise_error(ArgumentError, "mon out of range")
+    it "raises ArgumentError if utc offset parts are not valid" do
+      -> { Time.new("2020-12-25 00:56:17 +24:00") }.should raise_error(ArgumentError, "utc_offset out of range")
+      -> { Time.new("2020-12-25 00:56:17 +2400") }.should raise_error(ArgumentError, "utc_offset out of range")
 
-        -> {
-          Time.new("2020-12-32 00:56:17 +09:00")
-        }.should raise_error(ArgumentError, "mday out of range")
+      -> { Time.new("2020-12-25 00:56:17 +99:00") }.should raise_error(ArgumentError, "utc_offset out of range")
+      -> { Time.new("2020-12-25 00:56:17 +9900") }.should raise_error(ArgumentError, "utc_offset out of range")
 
-        -> {
-          Time.new("2020-12-25 25:56:17 +09:00")
-        }.should raise_error(ArgumentError, "hour out of range")
+      -> { Time.new("2020-12-25 00:56:17 +00:60") }.should raise_error(ArgumentError, '"+HH:MM", "-HH:MM", "UTC" or "A".."I","K".."Z" expected for utc_offset: +00:60')
+      -> { Time.new("2020-12-25 00:56:17 +0060") }.should raise_error(ArgumentError, '"+HH:MM", "-HH:MM", "UTC" or "A".."I","K".."Z" expected for utc_offset: +0060')
 
-        -> {
-          Time.new("2020-12-25 00:61:17 +09:00")
-        }.should raise_error(ArgumentError, "min out of range")
+      -> { Time.new("2020-12-25 00:56:17 +00:99") }.should raise_error(ArgumentError, '"+HH:MM", "-HH:MM", "UTC" or "A".."I","K".."Z" expected for utc_offset: +00:99')
+      -> { Time.new("2020-12-25 00:56:17 +0099") }.should raise_error(ArgumentError, '"+HH:MM", "-HH:MM", "UTC" or "A".."I","K".."Z" expected for utc_offset: +0099')
 
-        -> {
-          Time.new("2020-12-25 00:56:61 +09:00")
-        }.should raise_error(ArgumentError, "sec out of range")
+      ruby_bug '#20797', ''...'3.4' do
+        -> { Time.new("2020-12-25 00:56:17 +00:00:60") }.should raise_error(ArgumentError, '"+HH:MM", "-HH:MM", "UTC" or "A".."I","K".."Z" expected for utc_offset: +00:00:60')
+        -> { Time.new("2020-12-25 00:56:17 +000060") }.should raise_error(ArgumentError, '"+HH:MM", "-HH:MM", "UTC" or "A".."I","K".."Z" expected for utc_offset: +000060')
 
-        -> {
-          Time.new("2020-12-25 00:56:17 +23:59:60")
-        }.should raise_error(ArgumentError, "utc_offset out of range")
+        -> { Time.new("2020-12-25 00:56:17 +00:00:99") }.should raise_error(ArgumentError, '"+HH:MM", "-HH:MM", "UTC" or "A".."I","K".."Z" expected for utc_offset: +00:00:99')
+        -> { Time.new("2020-12-25 00:56:17 +000099") }.should raise_error(ArgumentError, '"+HH:MM", "-HH:MM", "UTC" or "A".."I","K".."Z" expected for utc_offset: +000099')
+      end
+    end
 
-        -> {
-          Time.new("2020-12-25 00:56:17 +24:00")
-        }.should raise_error(ArgumentError, "utc_offset out of range")
+    it "raises ArgumentError if string has not ascii-compatible encoding" do
+      -> {
+        Time.new("2021-11-31 00:00:60 +09:00".encode("utf-32le"))
+      }.should raise_error(ArgumentError, "time string should have ASCII compatible encoding")
+    end
 
-        -> {
-          Time.new("2020-12-25 00:56:17 +23:61")
-        }.should raise_error(ArgumentError, '"+HH:MM", "-HH:MM", "UTC" or "A".."I","K".."Z" expected for utc_offset: +23:61')
+    it "raises ArgumentError if string doesn't start with year" do
+      -> {
+        Time.new("a\nb")
+      }.should raise_error(ArgumentError, "can't parse: \"a\\nb\"")
+    end
+
+    it "raises ArgumentError if string has extra characters after offset" do
+      -> {
+        Time.new("2021-11-31 00:00:59 +09:00 abc")
+      }.should raise_error(ArgumentError, /can't parse.+ abc/)
+    end
+
+    ruby_version_is "3.2.3" do
+      it "raises ArgumentError when there are leading space characters" do
+        -> { Time.new(" 2020-12-02 00:00:00") }.should raise_error(ArgumentError, /can't parse/)
+        -> { Time.new("\t2020-12-02 00:00:00") }.should raise_error(ArgumentError, /can't parse/)
+        -> { Time.new("\n2020-12-02 00:00:00") }.should raise_error(ArgumentError, /can't parse/)
+        -> { Time.new("\v2020-12-02 00:00:00") }.should raise_error(ArgumentError, /can't parse/)
+        -> { Time.new("\f2020-12-02 00:00:00") }.should raise_error(ArgumentError, /can't parse/)
+        -> { Time.new("\r2020-12-02 00:00:00") }.should raise_error(ArgumentError, /can't parse/)
       end
 
-      it "raises ArgumentError if string has not ascii-compatible encoding" do
-        -> {
-          Time.new("2021-11-31 00:00:60 +09:00".encode("utf-32le"))
-        }.should raise_error(ArgumentError, "time string should have ASCII compatible encoding")
+      it "raises ArgumentError when there are trailing whitespaces" do
+        -> { Time.new("2020-12-02 00:00:00 ") }.should raise_error(ArgumentError, /can't parse/)
+        -> { Time.new("2020-12-02 00:00:00\t") }.should raise_error(ArgumentError, /can't parse/)
+        -> { Time.new("2020-12-02 00:00:00\n") }.should raise_error(ArgumentError, /can't parse/)
+        -> { Time.new("2020-12-02 00:00:00\v") }.should raise_error(ArgumentError, /can't parse/)
+        -> { Time.new("2020-12-02 00:00:00\f") }.should raise_error(ArgumentError, /can't parse/)
+        -> { Time.new("2020-12-02 00:00:00\r") }.should raise_error(ArgumentError, /can't parse/)
       end
     end
   end
diff --git a/spec/ruby/core/time/now_spec.rb b/spec/ruby/core/time/now_spec.rb
index d47f00723ed825..e3fe6edad667ed 100644
--- a/spec/ruby/core/time/now_spec.rb
+++ b/spec/ruby/core/time/now_spec.rb
@@ -4,53 +4,177 @@
 describe "Time.now" do
   it_behaves_like :time_now, :now
 
-  ruby_version_is '3.1' do # https://bugs.ruby-lang.org/issues/17485
-    describe ":in keyword argument" do
-      it "could be UTC offset as a String in '+HH:MM or '-HH:MM' format" do
-        time = Time.now(in: "+05:00")
+  describe ":in keyword argument" do
+    it "could be UTC offset as a String in '+HH:MM or '-HH:MM' format" do
+      time = Time.now(in: "+05:00")
 
-        time.utc_offset.should == 5*60*60
-        time.zone.should == nil
+      time.utc_offset.should == 5*60*60
+      time.zone.should == nil
 
-        time = Time.now(in: "-09:00")
+      time = Time.now(in: "-09:00")
 
-        time.utc_offset.should == -9*60*60
-        time.zone.should == nil
+      time.utc_offset.should == -9*60*60
+      time.zone.should == nil
+
+      time = Time.now(in: "-09:00:01")
+
+      time.utc_offset.should == -(9*60*60 + 1)
+      time.zone.should == nil
+    end
+
+    it "could be UTC offset as a number of seconds" do
+      time = Time.now(in: 5*60*60)
+
+      time.utc_offset.should == 5*60*60
+      time.zone.should == nil
+
+      time = Time.now(in: -9*60*60)
+
+      time.utc_offset.should == -9*60*60
+      time.zone.should == nil
+    end
+
+    it "returns a Time with UTC offset specified as a single letter military timezone" do
+      Time.now(in: "W").utc_offset.should == 3600 * -10
+    end
+
+    it "could be a timezone object" do
+      zone = TimeSpecs::TimezoneWithName.new(name: "Asia/Colombo")
+      time = Time.now(in: zone)
+
+      time.utc_offset.should == 5*3600+30*60
+      time.zone.should == zone
+
+      zone = TimeSpecs::TimezoneWithName.new(name: "PST")
+      time = Time.now(in: zone)
+
+      time.utc_offset.should == -9*60*60
+      time.zone.should == zone
+    end
+
+    it "raises ArgumentError if format is invalid" do
+      -> { Time.now(in: "+09:99") }.should raise_error(ArgumentError)
+      -> { Time.now(in: "ABC") }.should raise_error(ArgumentError)
+    end
+
+    it "raises ArgumentError if String argument and hours greater than 23" do
+      -> { Time.now(in: "+24:00") }.should raise_error(ArgumentError, "utc_offset out of range")
+      -> { Time.now(in: "+2400") }.should raise_error(ArgumentError, "utc_offset out of range")
+
+      -> { Time.now(in: "+99:00") }.should raise_error(ArgumentError, "utc_offset out of range")
+      -> { Time.now(in: "+9900") }.should raise_error(ArgumentError, "utc_offset out of range")
+    end
+
+    it "raises ArgumentError if String argument and minutes greater than 59" do
+      -> { Time.now(in: "+00:60") }.should raise_error(ArgumentError, '"+HH:MM", "-HH:MM", "UTC" or "A".."I","K".."Z" expected for utc_offset: +00:60')
+      -> { Time.now(in: "+0060") }.should raise_error(ArgumentError, '"+HH:MM", "-HH:MM", "UTC" or "A".."I","K".."Z" expected for utc_offset: +0060')
+
+      -> { Time.now(in: "+00:99") }.should raise_error(ArgumentError, '"+HH:MM", "-HH:MM", "UTC" or "A".."I","K".."Z" expected for utc_offset: +00:99')
+      -> { Time.now(in: "+0099") }.should raise_error(ArgumentError, '"+HH:MM", "-HH:MM", "UTC" or "A".."I","K".."Z" expected for utc_offset: +0099')
+    end
+
+    ruby_bug '#20797', ''...'3.4' do
+      it "raises ArgumentError if String argument and seconds greater than 59" do
+        -> { Time.now(in: "+00:00:60") }.should raise_error(ArgumentError, '"+HH:MM", "-HH:MM", "UTC" or "A".."I","K".."Z" expected for utc_offset: +00:00:60')
+        -> { Time.now(in: "+000060") }.should raise_error(ArgumentError, '"+HH:MM", "-HH:MM", "UTC" or "A".."I","K".."Z" expected for utc_offset: +000060')
+
+        -> { Time.now(in: "+00:00:99") }.should raise_error(ArgumentError, '"+HH:MM", "-HH:MM", "UTC" or "A".."I","K".."Z" expected for utc_offset: +00:00:99')
+        -> { Time.now(in: "+000099") }.should raise_error(ArgumentError, '"+HH:MM", "-HH:MM", "UTC" or "A".."I","K".."Z" expected for utc_offset: +000099')
       end
+    end
+  end
 
-      it "could be UTC offset as a number of seconds" do
-        time = Time.now(in: 5*60*60)
+  describe "Timezone object" do # https://bugs.ruby-lang.org/issues/17485
+    it "raises TypeError if timezone does not implement #utc_to_local method" do
+      zone = Object.new
+      def zone.local_to_utc(time)
+        time
+      end
 
-        time.utc_offset.should == 5*60*60
-        time.zone.should == nil
+      -> {
+        Time.now(in: zone)
+      }.should raise_error(TypeError, /can't convert Object into an exact number/)
+    end
 
-        time = Time.now(in: -9*60*60)
+    it "does not raise exception if timezone does not implement #local_to_utc method" do
+      zone = Object.new
+      def zone.utc_to_local(time)
+        time
+      end
+
+      Time.now(in: zone).should be_kind_of(Time)
+    end
 
-        time.utc_offset.should == -9*60*60
-        time.zone.should == nil
+    # The result also should be a Time or Time-like object (not necessary to be the same class)
+    # or Integer. The zone of the result is just ignored.
+    describe "returned value by #utc_to_local and #local_to_utc methods" do
+      it "could be Time instance" do
+        zone = Object.new
+        def zone.utc_to_local(t)
+          time = Time.new(t.year, t.mon, t.day, t.hour, t.min, t.sec, t.utc_offset)
+          time + 60 * 60 # + 1 hour
+        end
+
+        Time.now(in: zone).should be_kind_of(Time)
+        Time.now(in: zone).utc_offset.should == 3600
       end
 
-      it "returns a Time with UTC offset specified as a single letter military timezone" do
-        Time.now(in: "W").utc_offset.should == 3600 * -10
+      it "could be Time subclass instance" do
+        zone = Object.new
+        def zone.utc_to_local(t)
+          time = Time.new(t.year, t.mon, t.day, t.hour, t.min, t.sec, t.utc_offset)
+          time += 60 * 60 # + 1 hour
+
+          Class.new(Time).new(time.year, time.mon, time.day, time.hour, time.min, time.sec, time.utc_offset)
+        end
+
+        Time.now(in: zone).should be_kind_of(Time)
+        Time.now(in: zone).utc_offset.should == 3600
       end
 
-      it "could be a timezone object" do
-        zone = TimeSpecs::TimezoneWithName.new(name: "Asia/Colombo")
-        time = Time.now(in: zone)
+      it "could be Integer" do
+        zone = Object.new
+        def zone.utc_to_local(time)
+          time.to_i + 60*60
+        end
+
+        Time.now(in: zone).should be_kind_of(Time)
+        Time.now(in: zone).utc_offset.should == 60*60
+      end
 
-        time.utc_offset.should == 5*3600+30*60
-        time.zone.should == zone
+      it "could have any #zone and #utc_offset because they are ignored" do
+        zone = Object.new
+        def zone.utc_to_local(t)
+          Struct.new(:year, :mon, :mday, :hour, :min, :sec, :isdst, :to_i, :zone, :utc_offset) # rubocop:disable Lint/StructNewOverride
+                .new(t.year, t.mon, t.mday, t.hour, t.min, t.sec, t.isdst, t.to_i, 'America/New_York', -5*60*60)
+        end
+        Time.now(in: zone).utc_offset.should == 0
 
-        zone = TimeSpecs::TimezoneWithName.new(name: "PST")
-        time = Time.now(in: zone)
+        zone = Object.new
+        def zone.utc_to_local(t)
+          Struct.new(:year, :mon, :mday, :hour, :min, :sec, :isdst, :to_i, :zone, :utc_offset) # rubocop:disable Lint/StructNewOverride
+                .new(t.year, t.mon, t.mday, t.hour, t.min, t.sec, t.isdst, t.to_i, 'Asia/Tokyo', 9*60*60)
+        end
+        Time.now(in: zone).utc_offset.should == 0
 
-        time.utc_offset.should == -9*60*60
-        time.zone.should == zone
+        zone = Object.new
+        def zone.utc_to_local(t)
+          Time.new(t.year, t.mon, t.mday, t.hour, t.min, t.sec, 9*60*60)
+        end
+        Time.now(in: zone).utc_offset.should == 0
       end
 
-      it "raises ArgumentError if format is invalid" do
-        -> { Time.now(in: "+09:99") }.should raise_error(ArgumentError)
-        -> { Time.now(in: "ABC") }.should raise_error(ArgumentError)
+      it "raises ArgumentError if difference between argument and result is too large" do
+        zone = Object.new
+        def zone.utc_to_local(t)
+          time = Time.utc(t.year, t.mon, t.day, t.hour, t.min, t.sec, t.utc_offset)
+          time -= 24 * 60 * 60 # - 1 day
+          Time.utc(time.year, time.mon, time.day, time.hour, time.min, time.sec, time.utc_offset)
+        end
+
+        -> {
+          Time.now(in: zone)
+        }.should raise_error(ArgumentError, "utc_offset out of range")
       end
     end
   end
diff --git a/spec/ruby/core/time/shared/gmtime.rb b/spec/ruby/core/time/shared/gmtime.rb
index bae19da4624daa..7b4f65f0b796cf 100644
--- a/spec/ruby/core/time/shared/gmtime.rb
+++ b/spec/ruby/core/time/shared/gmtime.rb
@@ -4,7 +4,14 @@
     with_timezone("CST", -6) do
       t = Time.local(2007, 1, 9, 6, 0, 0)
       t.send(@method)
-      t.should == Time.gm(2007, 1, 9, 12, 0, 0)
+      # Time#== compensates for time zones, so check all parts separately
+      t.year.should == 2007
+      t.month.should == 1
+      t.mday.should == 9
+      t.hour.should == 12
+      t.min.should == 0
+      t.sec.should == 0
+      t.zone.should == "UTC"
     end
   end
 
diff --git a/spec/ruby/core/time/shared/time_params.rb b/spec/ruby/core/time/shared/time_params.rb
index b6a6c88c8e1f0b..9832fd17fe1846 100644
--- a/spec/ruby/core/time/shared/time_params.rb
+++ b/spec/ruby/core/time/shared/time_params.rb
@@ -179,6 +179,10 @@
     }.should raise_error(ArgumentError, "argument out of range")
   end
 
+  it "raises ArgumentError when given 8 arguments" do
+    -> { Time.send(@method, *[0]*8) }.should raise_error(ArgumentError)
+  end
+
   it "raises ArgumentError when given 9 arguments" do
     -> { Time.send(@method, *[0]*9) }.should raise_error(ArgumentError)
   end
diff --git a/spec/ruby/core/time/shared/xmlschema.rb b/spec/ruby/core/time/shared/xmlschema.rb
new file mode 100644
index 00000000000000..d68c18df364b86
--- /dev/null
+++ b/spec/ruby/core/time/shared/xmlschema.rb
@@ -0,0 +1,31 @@
+describe :time_xmlschema, shared: true do
+  ruby_version_is "3.4" do
+    it "generates ISO-8601 strings in Z for UTC times" do
+      t = Time.utc(1985, 4, 12, 23, 20, 50, 521245)
+      t.send(@method).should == "1985-04-12T23:20:50Z"
+      t.send(@method, 2).should == "1985-04-12T23:20:50.52Z"
+      t.send(@method, 9).should == "1985-04-12T23:20:50.521245000Z"
+    end
+
+    it "generates ISO-8601 string with timeone offset for non-UTC times" do
+      t = Time.new(1985, 4, 12, 23, 20, 50, "+02:00")
+      t.send(@method).should == "1985-04-12T23:20:50+02:00"
+      t.send(@method, 2).should == "1985-04-12T23:20:50.00+02:00"
+    end
+
+    it "year is always at least 4 digits" do
+      t = Time.utc(12, 4, 12)
+      t.send(@method).should ==  "0012-04-12T00:00:00Z"
+    end
+
+    it "year can be more than 4 digits" do
+      t = Time.utc(40_000, 4, 12)
+      t.send(@method).should ==  "40000-04-12T00:00:00Z"
+    end
+
+    it "year can be negative" do
+      t = Time.utc(-2000, 4, 12)
+      t.send(@method).should ==  "-2000-04-12T00:00:00Z"
+    end
+  end
+end
diff --git a/spec/ruby/core/time/strftime_spec.rb b/spec/ruby/core/time/strftime_spec.rb
index 4cb300c916189a..fd233f3577bf45 100644
--- a/spec/ruby/core/time/strftime_spec.rb
+++ b/spec/ruby/core/time/strftime_spec.rb
@@ -50,44 +50,42 @@
     time.strftime("%::z").should == "+01:01:05"
   end
 
-  ruby_version_is "3.1" do
-    it "supports RFC 3339 UTC for unknown offset local time, -0000, as %-z" do
-      time = Time.gm(2022)
-
-      time.strftime("%z").should == "+0000"
-      time.strftime("%-z").should == "-0000"
-      time.strftime("%-:z").should == "-00:00"
-      time.strftime("%-::z").should == "-00:00:00"
-    end
+  it "supports RFC 3339 UTC for unknown offset local time, -0000, as %-z" do
+    time = Time.gm(2022)
 
-    it "applies '-' flag to UTC time" do
-      time = Time.utc(2022)
-      time.strftime("%-z").should == "-0000"
+    time.strftime("%z").should == "+0000"
+    time.strftime("%-z").should == "-0000"
+    time.strftime("%-:z").should == "-00:00"
+    time.strftime("%-::z").should == "-00:00:00"
+  end
 
-      time = Time.gm(2022)
-      time.strftime("%-z").should == "-0000"
+  it "applies '-' flag to UTC time" do
+    time = Time.utc(2022)
+    time.strftime("%-z").should == "-0000"
 
-      time = Time.new(2022, 1, 1, 0, 0, 0, "Z")
-      time.strftime("%-z").should == "-0000"
+    time = Time.gm(2022)
+    time.strftime("%-z").should == "-0000"
 
-      time = Time.new(2022, 1, 1, 0, 0, 0, "-00:00")
-      time.strftime("%-z").should == "-0000"
+    time = Time.new(2022, 1, 1, 0, 0, 0, "Z")
+    time.strftime("%-z").should == "-0000"
 
-      time = Time.new(2022, 1, 1, 0, 0, 0, "+03:00").utc
-      time.strftime("%-z").should == "-0000"
-    end
+    time = Time.new(2022, 1, 1, 0, 0, 0, "-00:00")
+    time.strftime("%-z").should == "-0000"
 
-    it "ignores '-' flag for non-UTC time" do
-      time = Time.new(2022, 1, 1, 0, 0, 0, "+03:00")
-      time.strftime("%-z").should == "+0300"
-    end
+    time = Time.new(2022, 1, 1, 0, 0, 0, "+03:00").utc
+    time.strftime("%-z").should == "-0000"
+  end
 
-    it "works correctly with width, _ and 0 flags, and :" do
-      Time.now.utc.strftime("%-_10z").should == "      -000"
-      Time.now.utc.strftime("%-10z").should == "-000000000"
-      Time.now.utc.strftime("%-010:z").should == "-000000:00"
-      Time.now.utc.strftime("%-_10:z").should == "     -0:00"
-      Time.now.utc.strftime("%-_10::z").should == "  -0:00:00"
-    end
+  it "ignores '-' flag for non-UTC time" do
+    time = Time.new(2022, 1, 1, 0, 0, 0, "+03:00")
+    time.strftime("%-z").should == "+0300"
+  end
+
+  it "works correctly with width, _ and 0 flags, and :" do
+    Time.now.utc.strftime("%-_10z").should == "      -000"
+    Time.now.utc.strftime("%-10z").should == "-000000000"
+    Time.now.utc.strftime("%-010:z").should == "-000000:00"
+    Time.now.utc.strftime("%-_10:z").should == "     -0:00"
+    Time.now.utc.strftime("%-_10::z").should == "  -0:00:00"
   end
 end
diff --git a/spec/ruby/core/time/utc_spec.rb b/spec/ruby/core/time/utc_spec.rb
index 566509fd33b693..3d36e13ccfecdb 100644
--- a/spec/ruby/core/time/utc_spec.rb
+++ b/spec/ruby/core/time/utc_spec.rb
@@ -22,10 +22,8 @@
     Time.now.localtime("UTC").utc?.should == true
     Time.at(Time.now, in: 'UTC').utc?.should == true
 
-    ruby_version_is "3.1" do
-      Time.new(2022, 1, 1, 0, 0, 0, in: "UTC").utc?.should == true
-      Time.now(in: "UTC").utc?.should == true
-    end
+    Time.new(2022, 1, 1, 0, 0, 0, in: "UTC").utc?.should == true
+    Time.now(in: "UTC").utc?.should == true
   end
 
   it "does treat time with Z offset as UTC" do
@@ -33,18 +31,14 @@
     Time.now.localtime("Z").utc?.should == true
     Time.at(Time.now, in: 'Z').utc?.should == true
 
-    ruby_version_is "3.1" do
-      Time.new(2022, 1, 1, 0, 0, 0, in: "Z").utc?.should == true
-      Time.now(in: "Z").utc?.should == true
-    end
+    Time.new(2022, 1, 1, 0, 0, 0, in: "Z").utc?.should == true
+    Time.now(in: "Z").utc?.should == true
   end
 
-  ruby_version_is "3.1" do
-    it "does treat time with -00:00 offset as UTC" do
-      Time.new(2022, 1, 1, 0, 0, 0, "-00:00").utc?.should == true
-      Time.now.localtime("-00:00").utc?.should == true
-      Time.at(Time.now, in: '-00:00').utc?.should == true
-    end
+  it "does treat time with -00:00 offset as UTC" do
+    Time.new(2022, 1, 1, 0, 0, 0, "-00:00").utc?.should == true
+    Time.now.localtime("-00:00").utc?.should == true
+    Time.at(Time.now, in: '-00:00').utc?.should == true
   end
 
   it "does not treat time with +00:00 offset as UTC" do
diff --git a/spec/ruby/core/time/xmlschema_spec.rb b/spec/ruby/core/time/xmlschema_spec.rb
new file mode 100644
index 00000000000000..bdf1dc7923eeaf
--- /dev/null
+++ b/spec/ruby/core/time/xmlschema_spec.rb
@@ -0,0 +1,6 @@
+require_relative '../../spec_helper'
+require_relative 'shared/xmlschema'
+
+describe "Time#xmlschema" do
+  it_behaves_like :time_xmlschema, :xmlschema
+end
diff --git a/spec/ruby/core/time/yday_spec.rb b/spec/ruby/core/time/yday_spec.rb
index 6ea5ff8f1bd5f6..e920c2e28decc1 100644
--- a/spec/ruby/core/time/yday_spec.rb
+++ b/spec/ruby/core/time/yday_spec.rb
@@ -1,4 +1,5 @@
 require_relative '../../spec_helper'
+require_relative '../../shared/time/yday'
 
 describe "Time#yday" do
   it "returns an integer representing the day of the year, 1..366" do
@@ -7,15 +8,5 @@
     end
   end
 
-  it 'returns the correct value for each day of each month' do
-    mdays = [31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31]
-
-    yday = 1
-    mdays.each_with_index do |days, month|
-      days.times do |day|
-        Time.new(2014, month+1, day+1).yday.should == yday
-        yday += 1
-      end
-    end
-  end
+  it_behaves_like :time_yday, -> year, month, day { Time.new(year, month, day).yday }
 end
diff --git a/spec/ruby/core/time/zone_spec.rb b/spec/ruby/core/time/zone_spec.rb
index 63c92602d1e248..9a15bd569b4544 100644
--- a/spec/ruby/core/time/zone_spec.rb
+++ b/spec/ruby/core/time/zone_spec.rb
@@ -69,22 +69,18 @@
     Time.at(Time.now, in: 'UTC').zone.should == "UTC"
     Time.at(Time.now, in: 'Z').zone.should == "UTC"
 
-    ruby_version_is "3.1" do
-      Time.new(2022, 1, 1, 0, 0, 0, "-00:00").zone.should == "UTC"
-      Time.now.localtime("-00:00").zone.should == "UTC"
-      Time.at(Time.now, in: '-00:00').zone.should == "UTC"
-    end
+    Time.new(2022, 1, 1, 0, 0, 0, "-00:00").zone.should == "UTC"
+    Time.now.localtime("-00:00").zone.should == "UTC"
+    Time.at(Time.now, in: '-00:00').zone.should == "UTC"
 
-    ruby_version_is "3.1" do
-      Time.new(2022, 1, 1, 0, 0, 0, in: "UTC").zone.should == "UTC"
-      Time.new(2022, 1, 1, 0, 0, 0, in: "Z").zone.should == "UTC"
+    Time.new(2022, 1, 1, 0, 0, 0, in: "UTC").zone.should == "UTC"
+    Time.new(2022, 1, 1, 0, 0, 0, in: "Z").zone.should == "UTC"
 
-      Time.now(in: 'UTC').zone.should == "UTC"
-      Time.now(in: 'Z').zone.should == "UTC"
+    Time.now(in: 'UTC').zone.should == "UTC"
+    Time.now(in: 'Z').zone.should == "UTC"
 
-      Time.at(Time.now, in: 'UTC').zone.should == "UTC"
-      Time.at(Time.now, in: 'Z').zone.should == "UTC"
-    end
+    Time.at(Time.now, in: 'UTC').zone.should == "UTC"
+    Time.at(Time.now, in: 'Z').zone.should == "UTC"
   end
 
   platform_is_not :aix, :windows do
diff --git a/spec/ruby/core/tracepoint/allow_reentry_spec.rb b/spec/ruby/core/tracepoint/allow_reentry_spec.rb
index 6bff1bed7649ff..75e9e859a913d4 100644
--- a/spec/ruby/core/tracepoint/allow_reentry_spec.rb
+++ b/spec/ruby/core/tracepoint/allow_reentry_spec.rb
@@ -1,32 +1,30 @@
 require_relative '../../spec_helper'
 require_relative 'fixtures/classes'
 
-ruby_version_is "3.1" do
-  describe 'TracePoint.allow_reentry' do
-    it 'allows the reentrance in a given block' do
-      event_lines = []
-      l1 = l2 = l3 = l4 = nil
-      TracePoint.new(:line) do |tp|
-        next unless TracePointSpec.target_thread?
+describe 'TracePoint.allow_reentry' do
+  it 'allows the reentrance in a given block' do
+    event_lines = []
+    l1 = l2 = l3 = l4 = nil
+    TracePoint.new(:line) do |tp|
+      next unless TracePointSpec.target_thread?
 
-        event_lines << tp.lineno
-        next if (__LINE__ + 2 .. __LINE__ + 4).cover?(tp.lineno)
-        TracePoint.allow_reentry do
-          a = 1; l3 = __LINE__
-          b = 2; l4 = __LINE__
-        end
-      end.enable do
-        c = 3; l1 = __LINE__
-        d = 4; l2 = __LINE__
+      event_lines << tp.lineno
+      next if (__LINE__ + 2 .. __LINE__ + 4).cover?(tp.lineno)
+      TracePoint.allow_reentry do
+        a = 1; l3 = __LINE__
+        b = 2; l4 = __LINE__
       end
-
-      event_lines.should == [l1, l3, l4, l2, l3, l4]
+    end.enable do
+      c = 3; l1 = __LINE__
+      d = 4; l2 = __LINE__
     end
 
-    it 'raises RuntimeError when not called inside a TracePoint' do
-      -> {
-        TracePoint.allow_reentry{}
-      }.should raise_error(RuntimeError)
-    end
+    event_lines.should == [l1, l3, l4, l2, l3, l4]
+  end
+
+  it 'raises RuntimeError when not called inside a TracePoint' do
+    -> {
+      TracePoint.allow_reentry{}
+    }.should raise_error(RuntimeError)
   end
 end
diff --git a/spec/ruby/core/tracepoint/enable_spec.rb b/spec/ruby/core/tracepoint/enable_spec.rb
index 6cc8bb38973b36..93a6b281e3583b 100644
--- a/spec/ruby/core/tracepoint/enable_spec.rb
+++ b/spec/ruby/core/tracepoint/enable_spec.rb
@@ -57,50 +57,25 @@
       end.enable { event_name.should equal(:line) }
     end
 
-    ruby_version_is '3.2' do
-      it 'enables the trace object only for the current thread' do
-        threads = []
-        trace = TracePoint.new(:line) do |tp|
-          # Runs on purpose on any Thread
-          threads << Thread.current
-        end
-
-        thread = nil
-        trace.enable do
-          line_event = true
-          thread = Thread.new do
-            event_in_other_thread = true
-          end
-          thread.join
-        end
-
-        threads = threads.uniq
-        threads.should.include?(Thread.current)
-        threads.should_not.include?(thread)
+    it 'enables the trace object only for the current thread' do
+      threads = []
+      trace = TracePoint.new(:line) do |tp|
+        # Runs on purpose on any Thread
+        threads << Thread.current
       end
-    end
 
-    ruby_version_is ''...'3.2' do
-      it 'enables the trace object for any thread' do
-        threads = []
-        trace = TracePoint.new(:line) do |tp|
-          # Runs on purpose on any Thread
-          threads << Thread.current
-        end
-
-        thread = nil
-        trace.enable do
-          line_event = true
-          thread = Thread.new do
-            event_in_other_thread = true
-          end
-          thread.join
+      thread = nil
+      trace.enable do
+        line_event = true
+        thread = Thread.new do
+          event_in_other_thread = true
         end
-
-        threads = threads.uniq
-        threads.should.include?(Thread.current)
-        threads.should.include?(thread)
+        thread.join
       end
+
+      threads = threads.uniq
+      threads.should.include?(Thread.current)
+      threads.should_not.include?(thread)
     end
 
     it 'can accept arguments within a block but it should not yield arguments' do
diff --git a/spec/ruby/core/tracepoint/inspect_spec.rb b/spec/ruby/core/tracepoint/inspect_spec.rb
index 21d62e9e267c77..6cc2ebe2434280 100644
--- a/spec/ruby/core/tracepoint/inspect_spec.rb
+++ b/spec/ruby/core/tracepoint/inspect_spec.rb
@@ -24,6 +24,8 @@
     line = nil
     TracePoint.new(:line) { |tp|
       next unless TracePointSpec.target_thread?
+      next unless tp.path == __FILE__
+
       inspect ||= tp.inspect
     }.enable do
       line = __LINE__
@@ -37,6 +39,8 @@
     line = nil
     TracePoint.new(:call) { |tp|
       next unless TracePointSpec.target_thread?
+      next unless tp.path == __FILE__
+
       inspect ||= tp.inspect
     }.enable do
       line = __LINE__ + 1
@@ -44,7 +48,7 @@ def trace_point_spec_test_call; end
       trace_point_spec_test_call
     end
 
-    inspect.should == "#<TracePoint:call `trace_point_spec_test_call'#{@path_prefix}#{__FILE__}:#{line}>"
+    inspect.should =~ /\A#<TracePoint:call [`']trace_point_spec_test_call'#{@path_prefix}#{__FILE__}:#{line}>\z/
   end
 
   it 'returns a String showing the event, method, path and line for a :return event' do
@@ -52,6 +56,8 @@ def trace_point_spec_test_call; end
     line = nil
     TracePoint.new(:return) { |tp|
       next unless TracePointSpec.target_thread?
+      next unless tp.path == __FILE__
+
       inspect ||= tp.inspect
     }.enable do
       line = __LINE__ + 4
@@ -61,14 +67,17 @@ def trace_point_spec_test_return
       end
       trace_point_spec_test_return
     end
+    ruby_version_is("3.4") { line -= 1 }
 
-    inspect.should == "#<TracePoint:return `trace_point_spec_test_return'#{@path_prefix}#{__FILE__}:#{line}>"
+    inspect.should =~ /\A#<TracePoint:return [`']trace_point_spec_test_return'#{@path_prefix}#{__FILE__}:#{line}>\z/
   end
 
   it 'returns a String showing the event, method, path and line for a :c_call event' do
     inspect = nil
     tracepoint = TracePoint.new(:c_call) { |tp|
       next unless TracePointSpec.target_thread?
+      next unless tp.path == __FILE__
+
       inspect ||= tp.inspect
     }
     line = __LINE__ + 2
@@ -76,7 +85,7 @@ def trace_point_spec_test_return
       [0, 1].max
     end
 
-    inspect.should == "#<TracePoint:c_call `max'#{@path_prefix}#{__FILE__}:#{line}>"
+    inspect.should =~ /\A#<TracePoint:c_call [`']max'#{@path_prefix}#{__FILE__}:#{line}>\z/
   end
 
   it 'returns a String showing the event, path and line for a :class event' do
@@ -84,6 +93,8 @@ def trace_point_spec_test_return
     line = nil
     TracePoint.new(:class) { |tp|
       next unless TracePointSpec.target_thread?
+      next unless tp.path == __FILE__
+
       inspect ||= tp.inspect
     }.enable do
       line = __LINE__ + 1
@@ -100,6 +111,7 @@ class TracePointSpec::C
     thread_inspection = nil
     TracePoint.new(:thread_begin) { |tp|
       next unless Thread.current == thread
+
       inspect ||= tp.inspect
     }.enable(target_thread: nil) do
       thread = Thread.new {}
@@ -116,6 +128,7 @@ class TracePointSpec::C
     thread_inspection = nil
     TracePoint.new(:thread_end) { |tp|
       next unless Thread.current == thread
+
       inspect ||= tp.inspect
     }.enable(target_thread: nil) do
       thread = Thread.new {}
diff --git a/spec/ruby/core/tracepoint/raised_exception_spec.rb b/spec/ruby/core/tracepoint/raised_exception_spec.rb
index ca2f50abb36f20..5ac85318404964 100644
--- a/spec/ruby/core/tracepoint/raised_exception_spec.rb
+++ b/spec/ruby/core/tracepoint/raised_exception_spec.rb
@@ -17,4 +17,22 @@
       raised_exception.should equal(error_result)
     end
   end
+
+  ruby_version_is "3.3" do
+    it 'returns value from exception rescued on the :rescue event' do
+      raised_exception, error_result = nil
+      trace = TracePoint.new(:rescue) { |tp|
+        next unless TracePointSpec.target_thread?
+        raised_exception = tp.raised_exception
+      }
+      trace.enable do
+        begin
+          raise StandardError
+        rescue => e
+          error_result = e
+        end
+        raised_exception.should equal(error_result)
+      end
+    end
+  end
 end
diff --git a/spec/ruby/core/unboundmethod/clone_spec.rb b/spec/ruby/core/unboundmethod/clone_spec.rb
index 098ee61476bc0a..1e7fb18744e8fc 100644
--- a/spec/ruby/core/unboundmethod/clone_spec.rb
+++ b/spec/ruby/core/unboundmethod/clone_spec.rb
@@ -1,12 +1,13 @@
 require_relative '../../spec_helper'
-require_relative 'fixtures/classes'
+require_relative 'shared/dup'
 
 describe "UnboundMethod#clone" do
-  it "returns a copy of the UnboundMethod" do
-    um1 = UnboundMethodSpecs::Methods.instance_method(:foo)
-    um2 = um1.clone
+  it_behaves_like :unboundmethod_dup, :clone
 
-    (um1 == um2).should == true
-    um1.bind(UnboundMethodSpecs::Methods.new).call.should == um2.bind(UnboundMethodSpecs::Methods.new).call
+  it "preserves frozen status" do
+    method = Class.instance_method(:instance_method)
+    method.freeze
+    method.frozen?.should == true
+    method.clone.frozen?.should == true
   end
 end
diff --git a/spec/ruby/core/unboundmethod/dup_spec.rb b/spec/ruby/core/unboundmethod/dup_spec.rb
new file mode 100644
index 00000000000000..5a78dd8e3694ac
--- /dev/null
+++ b/spec/ruby/core/unboundmethod/dup_spec.rb
@@ -0,0 +1,15 @@
+require_relative '../../spec_helper'
+require_relative 'shared/dup'
+
+describe "UnboundMethod#dup" do
+  ruby_version_is "3.4" do
+    it_behaves_like :unboundmethod_dup, :dup
+
+    it "resets frozen status" do
+      method = Class.instance_method(:instance_method)
+      method.freeze
+      method.frozen?.should == true
+      method.dup.frozen?.should == false
+    end
+  end
+end
diff --git a/spec/ruby/core/unboundmethod/equal_value_spec.rb b/spec/ruby/core/unboundmethod/equal_value_spec.rb
index 036c6b7f8c714f..4d4fc66504c7a2 100644
--- a/spec/ruby/core/unboundmethod/equal_value_spec.rb
+++ b/spec/ruby/core/unboundmethod/equal_value_spec.rb
@@ -76,38 +76,19 @@
     (@identical_body == @original_body).should == false
   end
 
-  ruby_version_is ""..."3.2" do
-    it "returns false if same method but one extracted from a subclass" do
-      (@parent == @child1).should == false
-      (@child1 == @parent).should == false
-    end
-
-    it "returns false if same method but extracted from two different subclasses" do
-      (@child2 == @child1).should == false
-      (@child1 == @child2).should == false
-    end
-
-    it "returns false if methods are the same but added from an included Module" do
-      (@includee == @includer).should == false
-      (@includer == @includee).should == false
-    end
+  it "returns true if same method but one extracted from a subclass" do
+    (@parent == @child1).should == true
+    (@child1 == @parent).should == true
   end
 
-  ruby_version_is "3.2" do
-    it "returns true if same method but one extracted from a subclass" do
-      (@parent == @child1).should == true
-      (@child1 == @parent).should == true
-    end
-
-    it "returns false if same method but extracted from two different subclasses" do
-      (@child2 == @child1).should == true
-      (@child1 == @child2).should == true
-    end
+  it "returns false if same method but extracted from two different subclasses" do
+    (@child2 == @child1).should == true
+    (@child1 == @child2).should == true
+  end
 
-    it "returns true if methods are the same but added from an included Module" do
-      (@includee == @includer).should == true
-      (@includer == @includee).should == true
-    end
+  it "returns true if methods are the same but added from an included Module" do
+    (@includee == @includer).should == true
+    (@includer == @includee).should == true
   end
 
   it "returns false if both have same Module, same name, identical body but not the same" do
diff --git a/spec/ruby/core/unboundmethod/owner_spec.rb b/spec/ruby/core/unboundmethod/owner_spec.rb
index e8a734dac41574..b099c56de1718f 100644
--- a/spec/ruby/core/unboundmethod/owner_spec.rb
+++ b/spec/ruby/core/unboundmethod/owner_spec.rb
@@ -25,9 +25,7 @@
     child_singleton_class.instance_method(:another_class_method).owner.should == child_singleton_class
   end
 
-  ruby_version_is "3.2" do
-    it "returns the class on which public was called for a private method in ancestor" do
-      MethodSpecs::InheritedMethods::C.instance_method(:derp).owner.should == MethodSpecs::InheritedMethods::C
-    end
+  it "returns the class on which public was called for a private method in ancestor" do
+    MethodSpecs::InheritedMethods::C.instance_method(:derp).owner.should == MethodSpecs::InheritedMethods::C
   end
 end
diff --git a/spec/ruby/core/unboundmethod/private_spec.rb b/spec/ruby/core/unboundmethod/private_spec.rb
index 8ea50bb5d425f4..5a563939d1126a 100644
--- a/spec/ruby/core/unboundmethod/private_spec.rb
+++ b/spec/ruby/core/unboundmethod/private_spec.rb
@@ -2,27 +2,8 @@
 require_relative 'fixtures/classes'
 
 describe "UnboundMethod#private?" do
-  ruby_version_is "3.1"..."3.2" do
-    it "returns false when the method is public" do
-      obj = UnboundMethodSpecs::Methods.new
-      obj.method(:my_public_method).unbind.private?.should == false
-    end
-
-    it "returns false when the method is protected" do
-      obj = UnboundMethodSpecs::Methods.new
-      obj.method(:my_protected_method).unbind.private?.should == false
-    end
-
-    it "returns true when the method is private" do
-      obj = UnboundMethodSpecs::Methods.new
-      obj.method(:my_private_method).unbind.private?.should == true
-    end
-  end
-
-  ruby_version_is "3.2" do
-    it "has been removed" do
-      obj = UnboundMethodSpecs::Methods.new
-      obj.method(:my_private_method).unbind.should_not.respond_to?(:private?)
-    end
+  it "has been removed" do
+    obj = UnboundMethodSpecs::Methods.new
+    obj.method(:my_private_method).unbind.should_not.respond_to?(:private?)
   end
 end
diff --git a/spec/ruby/core/unboundmethod/protected_spec.rb b/spec/ruby/core/unboundmethod/protected_spec.rb
index 0c215d86385153..70622d658dda4f 100644
--- a/spec/ruby/core/unboundmethod/protected_spec.rb
+++ b/spec/ruby/core/unboundmethod/protected_spec.rb
@@ -2,27 +2,8 @@
 require_relative 'fixtures/classes'
 
 describe "UnboundMethod#protected?" do
-  ruby_version_is "3.1"..."3.2" do
-    it "returns false when the method is public" do
-      obj = UnboundMethodSpecs::Methods.new
-      obj.method(:my_public_method).unbind.protected?.should == false
-    end
-
-    it "returns true when the method is protected" do
-      obj = UnboundMethodSpecs::Methods.new
-      obj.method(:my_protected_method).unbind.protected?.should == true
-    end
-
-    it "returns false when the method is private" do
-      obj = UnboundMethodSpecs::Methods.new
-      obj.method(:my_private_method).unbind.protected?.should == false
-    end
-  end
-
-  ruby_version_is "3.2" do
-    it "has been removed" do
-      obj = UnboundMethodSpecs::Methods.new
-      obj.method(:my_protected_method).unbind.should_not.respond_to?(:protected?)
-    end
+  it "has been removed" do
+    obj = UnboundMethodSpecs::Methods.new
+    obj.method(:my_protected_method).unbind.should_not.respond_to?(:protected?)
   end
 end
diff --git a/spec/ruby/core/unboundmethod/public_spec.rb b/spec/ruby/core/unboundmethod/public_spec.rb
index 552bbf6eab3283..ae75e2601c67f7 100644
--- a/spec/ruby/core/unboundmethod/public_spec.rb
+++ b/spec/ruby/core/unboundmethod/public_spec.rb
@@ -2,27 +2,8 @@
 require_relative 'fixtures/classes'
 
 describe "UnboundMethod#public?" do
-  ruby_version_is "3.1"..."3.2" do
-    it "returns true when the method is public" do
-      obj = UnboundMethodSpecs::Methods.new
-      obj.method(:my_public_method).unbind.public?.should == true
-    end
-
-    it "returns false when the method is protected" do
-      obj = UnboundMethodSpecs::Methods.new
-      obj.method(:my_protected_method).unbind.public?.should == false
-    end
-
-    it "returns false when the method is private" do
-      obj = UnboundMethodSpecs::Methods.new
-      obj.method(:my_private_method).unbind.public?.should == false
-    end
-  end
-
-  ruby_version_is "3.2" do
-    it "has been removed" do
-      obj = UnboundMethodSpecs::Methods.new
-      obj.method(:my_public_method).unbind.should_not.respond_to?(:public?)
-    end
+  it "has been removed" do
+    obj = UnboundMethodSpecs::Methods.new
+    obj.method(:my_public_method).unbind.should_not.respond_to?(:public?)
   end
 end
diff --git a/spec/ruby/core/unboundmethod/shared/dup.rb b/spec/ruby/core/unboundmethod/shared/dup.rb
new file mode 100644
index 00000000000000..194e2cc1a1841a
--- /dev/null
+++ b/spec/ruby/core/unboundmethod/shared/dup.rb
@@ -0,0 +1,32 @@
+describe :unboundmethod_dup, shared: true do
+  it "returns a copy of self" do
+    a = Class.instance_method(:instance_method)
+    b = a.send(@method)
+
+    a.should == b
+    a.should_not equal(b)
+  end
+
+  ruby_version_is "3.4" do
+    it "copies instance variables" do
+      method = Class.instance_method(:instance_method)
+      method.instance_variable_set(:@ivar, 1)
+      cl = method.send(@method)
+      cl.instance_variables.should == [:@ivar]
+    end
+
+    it "copies the finalizer" do
+      code = <<-'RUBY'
+        obj = Class.instance_method(:instance_method)
+
+        ObjectSpace.define_finalizer(obj, Proc.new { STDOUT.write "finalized\n" })
+
+        obj.clone
+
+        exit 0
+      RUBY
+
+      ruby_exe(code).lines.sort.should == ["finalized\n", "finalized\n"]
+    end
+  end
+end
diff --git a/spec/ruby/core/unboundmethod/shared/to_s.rb b/spec/ruby/core/unboundmethod/shared/to_s.rb
index b92bb0b207dccd..6b2c9c3e793915 100644
--- a/spec/ruby/core/unboundmethod/shared/to_s.rb
+++ b/spec/ruby/core/unboundmethod/shared/to_s.rb
@@ -20,22 +20,11 @@
   it "the String shows the method name, Module defined in and Module extracted from" do
     @from_module.send(@method).should =~ /\bfrom_mod\b/
     @from_module.send(@method).should =~ /\bUnboundMethodSpecs::Mod\b/
-
-    ruby_version_is ""..."3.2" do
-      @from_method.send(@method).should =~ /\bUnboundMethodSpecs::Methods\b/
-    end
   end
 
   it "returns a String including all details" do
-    ruby_version_is ""..."3.2" do
-      @from_module.send(@method).should.start_with? "#<UnboundMethod: UnboundMethodSpecs::Methods(UnboundMethodSpecs::Mod)#from_mod"
-      @from_method.send(@method).should.start_with? "#<UnboundMethod: UnboundMethodSpecs::Methods(UnboundMethodSpecs::Mod)#from_mod"
-    end
-
-    ruby_version_is "3.2" do
-      @from_module.send(@method).should.start_with? "#<UnboundMethod: UnboundMethodSpecs::Mod#from_mod"
-      @from_method.send(@method).should.start_with? "#<UnboundMethod: UnboundMethodSpecs::Mod#from_mod"
-    end
+    @from_module.send(@method).should.start_with? "#<UnboundMethod: UnboundMethodSpecs::Mod#from_mod"
+    @from_method.send(@method).should.start_with? "#<UnboundMethod: UnboundMethodSpecs::Mod#from_mod"
   end
 
   it "does not show the defining module if it is the same as the origin" do
diff --git a/spec/ruby/core/unboundmethod/source_location_spec.rb b/spec/ruby/core/unboundmethod/source_location_spec.rb
index 5c2f14362c40b4..2391d07d9958ef 100644
--- a/spec/ruby/core/unboundmethod/source_location_spec.rb
+++ b/spec/ruby/core/unboundmethod/source_location_spec.rb
@@ -7,23 +7,23 @@
   end
 
   it "sets the first value to the path of the file in which the method was defined" do
-    file = @method.source_location.first
+    file = @method.source_location[0]
     file.should be_an_instance_of(String)
     file.should == File.realpath('fixtures/classes.rb', __dir__)
   end
 
-  it "sets the last value to an Integer representing the line on which the method was defined" do
-    line = @method.source_location.last
+  it "sets the second value to an Integer representing the line on which the method was defined" do
+    line = @method.source_location[1]
     line.should be_an_instance_of(Integer)
     line.should == 5
   end
 
   it "returns the last place the method was defined" do
-    UnboundMethodSpecs::SourceLocation.method(:redefined).unbind.source_location.last.should == 13
+    UnboundMethodSpecs::SourceLocation.method(:redefined).unbind.source_location[1].should == 13
   end
 
   it "returns the location of the original method even if it was aliased" do
-    UnboundMethodSpecs::SourceLocation.instance_method(:aka).source_location.last.should == 17
+    UnboundMethodSpecs::SourceLocation.instance_method(:aka).source_location[1].should == 17
   end
 
   it "works for define_method methods" do
@@ -54,6 +54,12 @@
     c = Class.new do
       eval('def m; end', nil, "foo", 100)
     end
-    c.instance_method(:m).source_location.should == ["foo", 100]
+    location = c.instance_method(:m).source_location
+    ruby_version_is(""..."3.5") do
+      location.should == ["foo", 100]
+    end
+    ruby_version_is("3.5") do
+      location.should == ["foo", 100, 0, 100, 10]
+    end
   end
 end
diff --git a/spec/ruby/core/unboundmethod/super_method_spec.rb b/spec/ruby/core/unboundmethod/super_method_spec.rb
index 101c83b8b333eb..aa7c1293772782 100644
--- a/spec/ruby/core/unboundmethod/super_method_spec.rb
+++ b/spec/ruby/core/unboundmethod/super_method_spec.rb
@@ -40,12 +40,10 @@
     end
   end
 
-  ruby_version_is "2.7.3" do
-    context "after aliasing an inherited method" do
-      it "returns the expected super_method" do
-        method = MethodSpecs::InheritedMethods::C.instance_method(:meow)
-        method.super_method.owner.should == MethodSpecs::InheritedMethods::A
-      end
+  context "after aliasing an inherited method" do
+    it "returns the expected super_method" do
+      method = MethodSpecs::InheritedMethods::C.instance_method(:meow)
+      method.super_method.owner.should == MethodSpecs::InheritedMethods::A
     end
   end
 end
diff --git a/spec/ruby/core/warning/element_reference_spec.rb b/spec/ruby/core/warning/element_reference_spec.rb
index bd024d19b49cb6..c0ed37ef139d05 100644
--- a/spec/ruby/core/warning/element_reference_spec.rb
+++ b/spec/ruby/core/warning/element_reference_spec.rb
@@ -1,11 +1,13 @@
 require_relative '../../spec_helper'
 
 describe "Warning.[]" do
-  ruby_version_is '2.7.2' do
-    it "returns default values for categories :deprecated and :experimental" do
-      ruby_exe('p [Warning[:deprecated], Warning[:experimental]]').chomp.should == "[false, true]"
-      ruby_exe('p [Warning[:deprecated], Warning[:experimental]]', options: "-w").chomp.should == "[true, true]"
-    end
+  it "returns default values for categories :deprecated and :experimental" do
+    # If any warning options were set on the Ruby that will be executed, then
+    # it's possible this test will fail. In this case we will skip this test.
+    skip if ruby_exe.any? { |opt| opt.start_with?("-W") }
+
+    ruby_exe('p [Warning[:deprecated], Warning[:experimental]]').chomp.should == "[false, true]"
+    ruby_exe('p [Warning[:deprecated], Warning[:experimental]]', options: "-w").chomp.should == "[true, true]"
   end
 
   ruby_version_is '3.3' do
diff --git a/spec/ruby/core/warning/performance_warning_spec.rb b/spec/ruby/core/warning/performance_warning_spec.rb
new file mode 100644
index 00000000000000..ab0badcd3d7f33
--- /dev/null
+++ b/spec/ruby/core/warning/performance_warning_spec.rb
@@ -0,0 +1,28 @@
+require_relative '../../spec_helper'
+
+
+describe "Performance warnings" do
+  guard -> { ruby_version_is("3.4") || RUBY_ENGINE == "truffleruby" } do
+    # Optimising Integer, Float or Symbol methods is kind of implementation detail
+    # but multiple implementations do so. So it seems reasonable to have a test case
+    # for at least one such common method.
+    # See https://bugs.ruby-lang.org/issues/20429
+    context "when redefined optimised methods" do
+      it "emits performance warning for redefining Integer#+" do
+        code = <<~CODE
+          Warning[:performance] = true
+
+          class Integer
+            ORIG_METHOD = instance_method(:+)
+
+            def +(...)
+              ORIG_METHOD.bind(self).call(...)
+            end
+          end
+        CODE
+
+        ruby_exe(code, args: "2>&1").should.include?("warning: Redefining 'Integer#+' disables interpreter and JIT optimizations")
+      end
+    end
+  end
+end
diff --git a/spec/ruby/core/warning/warn_spec.rb b/spec/ruby/core/warning/warn_spec.rb
index 8f96fe9287cc8b..572885c2b4ee6d 100644
--- a/spec/ruby/core/warning/warn_spec.rb
+++ b/spec/ruby/core/warning/warn_spec.rb
@@ -121,6 +121,30 @@ def Warning.warn(msg)
     end
   end
 
+  ruby_bug '#20573', ''...'3.4' do
+    it "isn't called by Kernel.warn when category is :deprecated but Warning[:deprecated] is false" do
+      warn_deprecated = Warning[:deprecated]
+      begin
+        Warning[:deprecated] = false
+        Warning.should_not_receive(:warn)
+        Kernel.warn("foo", category: :deprecated)
+      ensure
+        Warning[:deprecated] = warn_deprecated
+      end
+    end
+
+    it "isn't called by Kernel.warn when category is :experimental but Warning[:experimental] is false" do
+      warn_experimental = Warning[:experimental]
+      begin
+        Warning[:experimental] = false
+        Warning.should_not_receive(:warn)
+        Kernel.warn("foo", category: :experimental)
+      ensure
+        Warning[:experimental] = warn_experimental
+      end
+    end
+  end
+
   it "prints the message when VERBOSE is false" do
     -> { Warning.warn("foo") }.should complain("foo")
   end
diff --git a/spec/ruby/default.mspec b/spec/ruby/default.mspec
index a0dc69c03d30e4..1e8f8893aa1f9c 100644
--- a/spec/ruby/default.mspec
+++ b/spec/ruby/default.mspec
@@ -1,3 +1,4 @@
+# -*- ruby -*-
 # Configuration file for Ruby >= 2.0 implementations.
 
 class MSpecScript
diff --git a/spec/ruby/fixtures/code/d/load_fixture.rb.rb b/spec/ruby/fixtures/code/d/load_fixture.rb.rb
new file mode 100644
index 00000000000000..7e9217729a3ede
--- /dev/null
+++ b/spec/ruby/fixtures/code/d/load_fixture.rb.rb
@@ -0,0 +1 @@
+ScratchPad << :rbrb
diff --git a/spec/ruby/fixtures/constants.rb b/spec/ruby/fixtures/constants.rb
index ffe45fb1f67010..7f0b88daab7c5b 100644
--- a/spec/ruby/fixtures/constants.rb
+++ b/spec/ruby/fixtures/constants.rb
@@ -10,7 +10,7 @@
 # variety in class and module configurations, including hierarchy,
 # containment, inclusion, singletons and toplevel.
 #
-# Constants are numbered for for uniqueness. The CS_ prefix is uniformly used
+# Constants are numbered for uniqueness. The CS_ prefix is uniformly used
 # and is to minimize clashes with other toplevel constants (see e.g. ModuleA
 # which is included in Object). Constant values are symbols. A numbered suffix
 # is used to distinguish constants with the same name defined in different
diff --git a/spec/ruby/fixtures/io.rb b/spec/ruby/fixtures/io.rb
new file mode 100644
index 00000000000000..87ebbbb2bd4b92
--- /dev/null
+++ b/spec/ruby/fixtures/io.rb
@@ -0,0 +1,12 @@
+module IOSpec
+  def self.exhaust_write_buffer(io)
+    written = 0
+    buf = " " * 4096
+
+    while true
+      written += io.write_nonblock(buf)
+    end
+  rescue Errno::EAGAIN, Errno::EWOULDBLOCK
+    written
+  end
+end
diff --git a/spec/ruby/language/alias_spec.rb b/spec/ruby/language/alias_spec.rb
index ee928cbfaae2b2..61fddb0184962b 100644
--- a/spec/ruby/language/alias_spec.rb
+++ b/spec/ruby/language/alias_spec.rb
@@ -252,7 +252,7 @@ def test_with_check(*args)
 
   it "on top level defines the alias on Object" do
     # because it defines on the default definee / current module
-    ruby_exe("def foo; end; alias bla foo; print method(:bla).owner", escape: true).should == "Object"
+    ruby_exe("def foo; end; alias bla foo; print method(:bla).owner").should == "Object"
   end
 
   it "raises a NameError when passed a missing name" do
diff --git a/spec/ruby/language/assignments_spec.rb b/spec/ruby/language/assignments_spec.rb
new file mode 100644
index 00000000000000..4ad9f4167bbad0
--- /dev/null
+++ b/spec/ruby/language/assignments_spec.rb
@@ -0,0 +1,522 @@
+require_relative '../spec_helper'
+
+# Should be synchronized with spec/ruby/language/optional_assignments_spec.rb
+# Some specs for assignments are located in language/variables_spec.rb
+describe 'Assignments' do
+  describe 'using =' do
+    describe 'evaluation order' do
+      it 'evaluates expressions left to right when assignment with an accessor' do
+        object = Object.new
+        def object.a=(value) end
+        ScratchPad.record []
+
+        (ScratchPad << :receiver; object).a = (ScratchPad << :rhs; :value)
+        ScratchPad.recorded.should == [:receiver, :rhs]
+      end
+
+      it 'evaluates expressions left to right when assignment with a #[]=' do
+        object = Object.new
+        def object.[]=(_, _) end
+        ScratchPad.record []
+
+        (ScratchPad << :receiver; object)[(ScratchPad << :argument; :a)] = (ScratchPad << :rhs; :value)
+        ScratchPad.recorded.should == [:receiver, :argument, :rhs]
+      end
+
+      it 'evaluates expressions left to right when assignment with compounded constant' do
+        m = Module.new
+        ScratchPad.record []
+
+        (ScratchPad << :module; m)::A = (ScratchPad << :rhs; :value)
+        ScratchPad.recorded.should == [:module, :rhs]
+      end
+
+      it 'raises TypeError after evaluation of right-hand-side when compounded constant module is not a module' do
+        ScratchPad.record []
+
+        -> {
+          (:not_a_module)::A = (ScratchPad << :rhs; :value)
+        }.should raise_error(TypeError)
+
+        ScratchPad.recorded.should == [:rhs]
+      end
+    end
+
+    context "given block argument" do
+      before do
+        @klass = Class.new do
+          def initialize(h) @h = h end
+          def [](k, &block) @h[k]; end
+          def []=(k, v, &block) @h[k] = v; end
+        end
+      end
+
+      ruby_version_is ""..."3.4" do
+        it "accepts block argument" do
+          obj = @klass.new(a: 1)
+          block = proc {}
+
+          eval "obj[:a, &block] = 2"
+          eval("obj[:a, &block]").should == 2
+        end
+      end
+
+      ruby_version_is "3.4" do
+        it "raises SyntaxError" do
+          obj = @klass.new(a: 1)
+          block = proc {}
+
+          -> {
+            eval "obj[:a, &block] = 2"
+          }.should raise_error(SyntaxError, /unexpected block arg given in index assignment|block arg given in index assignment/)
+        end
+      end
+    end
+  end
+
+  describe 'using +=' do
+    describe 'using an accessor' do
+      before do
+        klass = Class.new { attr_accessor :b }
+        @a    = klass.new
+      end
+
+      it 'does evaluate receiver only once when assigns' do
+        ScratchPad.record []
+        @a.b = 1
+
+        (ScratchPad << :evaluated; @a).b += 2
+
+        ScratchPad.recorded.should == [:evaluated]
+        @a.b.should == 3
+      end
+
+      it 'ignores method visibility when receiver is self' do
+        klass_with_private_methods = Class.new do
+          def initialize(n) @a = n end
+          def public_method(n); self.a += n end
+          private
+          def a; @a end
+          def a=(n) @a = n; 42 end
+        end
+
+        a = klass_with_private_methods.new(0)
+        a.public_method(2).should == 2
+      end
+    end
+
+    describe 'using a #[]' do
+      before do
+        klass = Class.new do
+          def [](k)
+            @hash ||= {}
+            @hash[k]
+          end
+
+          def []=(k, v)
+            @hash ||= {}
+            @hash[k] = v
+            7
+          end
+        end
+        @b = klass.new
+      end
+
+      it 'evaluates receiver only once when assigns' do
+        ScratchPad.record []
+        a = {k: 1}
+
+        (ScratchPad << :evaluated; a)[:k] += 2
+
+        ScratchPad.recorded.should == [:evaluated]
+        a[:k].should == 3
+      end
+
+      it 'ignores method visibility when receiver is self' do
+        klass_with_private_methods = Class.new do
+          def initialize(h) @a = h end
+          def public_method(k, n); self[k] += n end
+          private
+          def [](k) @a[k] end
+          def []=(k, v) @a[k] = v; 42 end
+        end
+
+        a = klass_with_private_methods.new(k: 0)
+        a.public_method(:k, 2).should == 2
+      end
+
+      context "given block argument" do
+        before do
+          @klass = Class.new do
+            def initialize(h) @h = h end
+            def [](k, &block) @h[k]; end
+            def []=(k, v, &block) @h[k] = v; end
+          end
+        end
+
+        ruby_version_is ""..."3.4" do
+          it "accepts block argument" do
+            obj = @klass.new(a: 1)
+            block = proc {}
+
+            eval "obj[:a, &block] += 2"
+            eval("obj[:a, &block]").should == 3
+          end
+        end
+
+        ruby_version_is "3.4" do
+          it "raises SyntaxError" do
+            obj = @klass.new(a: 1)
+            block = proc {}
+
+            -> {
+              eval "obj[:a, &block] += 2"
+            }.should raise_error(SyntaxError, /unexpected block arg given in index assignment|block arg given in index assignment/)
+          end
+        end
+      end
+
+      context 'splatted argument' do
+        it 'correctly handles it' do
+          @b[:m] = 10
+          (@b[*[:m]] += 10).should == 20
+          @b[:m].should == 20
+
+          @b[:n] = 10
+          (@b[*(1; [:n])] += 10).should == 20
+          @b[:n].should == 20
+
+          @b[:k] = 10
+          (@b[*begin 1; [:k] end] += 10).should == 20
+          @b[:k].should == 20
+        end
+
+        it 'calls #to_a only once' do
+          k = Object.new
+          def k.to_a
+            ScratchPad << :to_a
+            [:k]
+          end
+
+          ScratchPad.record []
+          @b[:k] = 10
+          (@b[*k] += 10).should == 20
+          @b[:k].should == 20
+          ScratchPad.recorded.should == [:to_a]
+        end
+
+        it 'correctly handles a nested splatted argument' do
+          @b[:k] = 10
+          (@b[*[*[:k]]] += 10).should == 20
+          @b[:k].should == 20
+        end
+
+        it 'correctly handles multiple nested splatted arguments' do
+          klass_with_multiple_parameters = Class.new do
+            def [](k1, k2, k3)
+              @hash ||= {}
+              @hash[:"#{k1}#{k2}#{k3}"]
+            end
+
+            def []=(k1, k2, k3, v)
+              @hash ||= {}
+              @hash[:"#{k1}#{k2}#{k3}"] = v
+              7
+            end
+          end
+          a = klass_with_multiple_parameters.new
+
+          a[:a, :b, :c] = 10
+          (a[*[:a], *[:b], *[:c]] += 10).should == 20
+          a[:a, :b, :c].should == 20
+        end
+      end
+    end
+
+    describe 'using compounded constants' do
+      it 'causes side-effects of the module part to be applied only once (when assigns)' do
+        module ConstantSpecs
+          OpAssignTrue = 1
+        end
+
+        suppress_warning do # already initialized constant
+          x = 0
+          (x += 1; ConstantSpecs)::OpAssignTrue += 2
+          x.should == 1
+          ConstantSpecs::OpAssignTrue.should == 3
+        end
+
+        ConstantSpecs.send :remove_const, :OpAssignTrue
+      end
+    end
+  end
+end
+
+# generic cases
+describe 'Multiple assignments' do
+  it 'assigns multiple targets when assignment with an accessor' do
+    object = Object.new
+    class << object
+      attr_accessor :a, :b
+    end
+
+    object.a, object.b = :a, :b
+
+    object.a.should == :a
+    object.b.should == :b
+  end
+
+  it 'assigns multiple targets when assignment with a nested accessor' do
+    object = Object.new
+    class << object
+      attr_accessor :a, :b
+    end
+
+    (object.a, object.b), c = [:a, :b], nil
+
+    object.a.should == :a
+    object.b.should == :b
+  end
+
+  it 'assigns multiple targets when assignment with a #[]=' do
+    object = Object.new
+    class << object
+      def []=(k, v) (@h ||= {})[k] = v; end
+      def [](k) (@h ||= {})[k]; end
+    end
+
+    object[:a], object[:b] = :a, :b
+
+    object[:a].should == :a
+    object[:b].should == :b
+  end
+
+  it 'assigns multiple targets when assignment with a nested #[]=' do
+    object = Object.new
+    class << object
+      def []=(k, v) (@h ||= {})[k] = v; end
+      def [](k) (@h ||= {})[k]; end
+    end
+
+    (object[:a], object[:b]), c = [:v1, :v2], nil
+
+    object[:a].should == :v1
+    object[:b].should == :v2
+  end
+
+  it 'assigns multiple targets when assignment with compounded constant' do
+    m = Module.new
+
+    m::A, m::B = :a, :b
+
+    m::A.should == :a
+    m::B.should == :b
+  end
+
+  it 'assigns multiple targets when assignment with a nested compounded constant' do
+    m = Module.new
+
+    (m::A, m::B), c = [:a, :b], nil
+
+    m::A.should == :a
+    m::B.should == :b
+  end
+end
+
+describe 'Multiple assignments' do
+  describe 'evaluation order' do
+    it 'evaluates expressions left to right when assignment with an accessor' do
+      object = Object.new
+      def object.a=(value) end
+      ScratchPad.record []
+
+      (ScratchPad << :a; object).a, (ScratchPad << :b; object).a = (ScratchPad << :c; :c), (ScratchPad << :d; :d)
+      ScratchPad.recorded.should == [:a, :b, :c, :d]
+    end
+
+    it 'evaluates expressions left to right when assignment with a nested accessor' do
+      object = Object.new
+      def object.a=(value) end
+      ScratchPad.record []
+
+      ((ScratchPad << :a; object).a, foo), bar = [(ScratchPad << :b; :b)]
+      ScratchPad.recorded.should == [:a, :b]
+    end
+
+    it 'evaluates expressions left to right when assignment with a deeply nested accessor' do
+      o = Object.new
+      def o.a=(value) end
+      def o.b=(value) end
+      def o.c=(value) end
+      def o.d=(value) end
+      def o.e=(value) end
+      def o.f=(value) end
+      ScratchPad.record []
+
+      (ScratchPad << :a; o).a,
+        ((ScratchPad << :b; o).b,
+        ((ScratchPad << :c; o).c, (ScratchPad << :d; o).d),
+        (ScratchPad << :e; o).e),
+      (ScratchPad << :f; o).f = (ScratchPad << :value; :value)
+
+      ScratchPad.recorded.should == [:a, :b, :c, :d, :e, :f, :value]
+    end
+
+    it 'evaluates expressions left to right when assignment with a #[]=' do
+      object = Object.new
+      def object.[]=(_, _) end
+      ScratchPad.record []
+
+      (ScratchPad << :a; object)[(ScratchPad << :b; :b)], (ScratchPad << :c; object)[(ScratchPad << :d; :d)] = (ScratchPad << :e; :e), (ScratchPad << :f; :f)
+      ScratchPad.recorded.should == [:a, :b, :c, :d, :e, :f]
+    end
+
+    it 'evaluates expressions left to right when assignment with a nested #[]=' do
+      object = Object.new
+      def object.[]=(_, _) end
+      ScratchPad.record []
+
+      ((ScratchPad << :a; object)[(ScratchPad << :b; :b)], foo), bar = [(ScratchPad << :c; :c)]
+      ScratchPad.recorded.should == [:a, :b, :c]
+    end
+
+    it 'evaluates expressions left to right when assignment with a deeply nested #[]=' do
+      o = Object.new
+      def o.[]=(_, _) end
+      ScratchPad.record []
+
+      (ScratchPad << :ra; o)[(ScratchPad << :aa; :aa)],
+        ((ScratchPad << :rb; o)[(ScratchPad << :ab; :ab)],
+        ((ScratchPad << :rc; o)[(ScratchPad << :ac; :ac)], (ScratchPad << :rd; o)[(ScratchPad << :ad; :ad)]),
+        (ScratchPad << :re; o)[(ScratchPad << :ae; :ae)]),
+      (ScratchPad << :rf; o)[(ScratchPad << :af; :af)] = (ScratchPad << :value; :value)
+
+      ScratchPad.recorded.should == [:ra, :aa, :rb, :ab, :rc, :ac, :rd, :ad, :re, :ae, :rf, :af, :value]
+    end
+
+    it 'evaluates expressions left to right when assignment with compounded constant' do
+      m = Module.new
+      ScratchPad.record []
+
+      (ScratchPad << :a; m)::A, (ScratchPad << :b; m)::B = (ScratchPad << :c; :c), (ScratchPad << :d; :d)
+      ScratchPad.recorded.should == [:a, :b, :c, :d]
+    end
+
+    it 'evaluates expressions left to right when assignment with a nested compounded constant' do
+      m = Module.new
+      ScratchPad.record []
+
+      ((ScratchPad << :a; m)::A, foo), bar = [(ScratchPad << :b; :b)]
+      ScratchPad.recorded.should == [:a, :b]
+    end
+
+    it 'evaluates expressions left to right when assignment with deeply nested compounded constants' do
+      m = Module.new
+      ScratchPad.record []
+
+      (ScratchPad << :a; m)::A,
+        ((ScratchPad << :b; m)::B,
+        ((ScratchPad << :c; m)::C, (ScratchPad << :d; m)::D),
+        (ScratchPad << :e; m)::E),
+      (ScratchPad << :f; m)::F = (ScratchPad << :value; :value)
+
+      ScratchPad.recorded.should == [:a, :b, :c, :d, :e, :f, :value]
+    end
+  end
+
+  context 'when assignment with method call and receiver is self' do
+    it 'assigns values correctly when assignment with accessor' do
+      object = Object.new
+      class << object
+        attr_accessor :a, :b
+
+        def assign(v1, v2)
+          self.a, self.b = v1, v2
+        end
+      end
+
+      object.assign :v1, :v2
+      object.a.should == :v1
+      object.b.should == :v2
+    end
+
+    it 'evaluates expressions right to left when assignment with a nested accessor' do
+      object = Object.new
+      class << object
+        attr_accessor :a, :b
+
+        def assign(v1, v2)
+          (self.a, self.b), c = [v1, v2], nil
+        end
+      end
+
+      object.assign :v1, :v2
+      object.a.should == :v1
+      object.b.should == :v2
+    end
+
+    it 'assigns values correctly when assignment with a #[]=' do
+      object = Object.new
+      class << object
+        def []=(key, v)
+          @h ||= {}
+          @h[key] = v
+        end
+
+        def [](key)
+          (@h || {})[key]
+        end
+
+        def assign(k1, v1, k2, v2)
+          self[k1], self[k2] = v1, v2
+        end
+      end
+
+      object.assign :k1, :v1, :k2, :v2
+      object[:k1].should == :v1
+      object[:k2].should == :v2
+    end
+
+    it 'assigns values correctly when assignment with a nested #[]=' do
+      object = Object.new
+      class << object
+        def []=(key, v)
+          @h ||= {}
+          @h[key] = v
+        end
+
+        def [](key)
+          (@h || {})[key]
+        end
+
+        def assign(k1, v1, k2, v2)
+          (self[k1], self[k2]), c = [v1, v2], nil
+        end
+      end
+
+      object.assign :k1, :v1, :k2, :v2
+      object[:k1].should == :v1
+      object[:k2].should == :v2
+    end
+
+    it 'assigns values correctly when assignment with compounded constant' do
+      m = Module.new
+      m.module_exec do
+        self::A, self::B = :v1, :v2
+      end
+
+      m::A.should == :v1
+      m::B.should == :v2
+    end
+
+    it 'assigns values correctly when assignment with a nested compounded constant' do
+      m = Module.new
+      m.module_exec do
+        (self::A, self::B), c = [:v1, :v2], nil
+      end
+
+      m::A.should == :v1
+      m::B.should == :v2
+    end
+  end
+end
diff --git a/spec/ruby/language/block_spec.rb b/spec/ruby/language/block_spec.rb
index 90329e2f6f515e..e1e4a363c82b74 100644
--- a/spec/ruby/language/block_spec.rb
+++ b/spec/ruby/language/block_spec.rb
@@ -40,17 +40,40 @@ def m(a) yield a end
       m([1, 2]) { |a=5, b, c, d| [a, b, c, d] }.should == [5, 1, 2, nil]
     end
 
-    ruby_version_is "3.2" do
-      it "does not autosplat single argument to required arguments when a keyword rest argument is present" do
-        m([1, 2]) { |a, **k| [a, k] }.should == [[1, 2], {}]
-      end
+    it "assigns elements to pre arguments" do
+      m([1, 2]) { |a, b, c, d=5| [a, b, c, d] }.should == [1, 2, nil, 5]
     end
 
-    ruby_version_is ''..."3.2" do
-      # https://bugs.ruby-lang.org/issues/18633
-      it "autosplats single argument to required arguments when a keyword rest argument is present" do
-        m([1, 2]) { |a, **k| [a, k] }.should == [1, {}]
-      end
+    it "assigns elements to pre and post arguments" do
+      m([1               ]) { |a, b=5, c=6, d, e| [a, b, c, d, e] }.should == [1, 5, 6, nil, nil]
+      m([1, 2            ]) { |a, b=5, c=6, d, e| [a, b, c, d, e] }.should == [1, 5, 6, 2, nil]
+      m([1, 2, 3         ]) { |a, b=5, c=6, d, e| [a, b, c, d, e] }.should == [1, 5, 6, 2, 3]
+      m([1, 2, 3, 4      ]) { |a, b=5, c=6, d, e| [a, b, c, d, e] }.should == [1, 2, 6, 3, 4]
+      m([1, 2, 3, 4, 5   ]) { |a, b=5, c=6, d, e| [a, b, c, d, e] }.should == [1, 2, 3, 4, 5]
+      m([1, 2, 3, 4, 5, 6]) { |a, b=5, c=6, d, e| [a, b, c, d, e] }.should == [1, 2, 3, 4, 5]
+    end
+
+    it "assigns elements to pre and post arguments when *rest is present" do
+      m([1               ]) { |a, b=5, c=6, *d, e, f| [a, b, c, d, e, f] }.should == [1, 5, 6, [], nil, nil]
+      m([1, 2            ]) { |a, b=5, c=6, *d, e, f| [a, b, c, d, e, f] }.should == [1, 5, 6, [], 2, nil]
+      m([1, 2, 3         ]) { |a, b=5, c=6, *d, e, f| [a, b, c, d, e, f] }.should == [1, 5, 6, [], 2, 3]
+      m([1, 2, 3, 4      ]) { |a, b=5, c=6, *d, e, f| [a, b, c, d, e, f] }.should == [1, 2, 6, [], 3, 4]
+      m([1, 2, 3, 4, 5   ]) { |a, b=5, c=6, *d, e, f| [a, b, c, d, e, f] }.should == [1, 2, 3, [], 4, 5]
+      m([1, 2, 3, 4, 5, 6]) { |a, b=5, c=6, *d, e, f| [a, b, c, d, e, f] }.should == [1, 2, 3, [4], 5, 6]
+    end
+
+    it "does not autosplat single argument to required arguments when a keyword rest argument is present" do
+      m([1, 2]) { |a, **k| [a, k] }.should == [[1, 2], {}]
+    end
+
+    it "does not autosplat single argument to required arguments when keyword arguments are present" do
+      m([1, 2]) { |a, b: :b, c: :c| [a, b, c] }.should == [[1, 2], :b, :c]
+    end
+
+    it "raises error when required keyword arguments are present" do
+      -> {
+        m([1, 2]) { |a, b:, c:| [a, b, c] }
+      }.should raise_error(ArgumentError, "missing keywords: :b, :c")
     end
 
     it "assigns elements to mixed argument types" do
@@ -252,7 +275,7 @@ def obj.to_ary; raise "Exception raised in #to_ary" end
     end
 
     it "may include a rescue clause" do
-      eval("@y.z do raise ArgumentError; rescue ArgumentError; 7; end").should == 7
+      @y.z do raise ArgumentError; rescue ArgumentError; 7; end.should == 7
     end
   end
 
@@ -266,7 +289,7 @@ def obj.to_ary; raise "Exception raised in #to_ary" end
     end
 
     it "may include a rescue clause" do
-      eval('@y.z do || raise ArgumentError; rescue ArgumentError; 7; end').should == 7
+      @y.z do || raise ArgumentError; rescue ArgumentError; 7; end.should == 7
     end
   end
 
@@ -295,7 +318,7 @@ def obj.to_ary; raise "Exception raised in #to_ary" end
     end
 
     it "may include a rescue clause" do
-      eval('@y.s(1) do |x| raise ArgumentError; rescue ArgumentError; 7; end').should == 7
+      @y.s(1) do |x| raise ArgumentError; rescue ArgumentError; 7; end.should == 7
     end
   end
 
@@ -368,7 +391,6 @@ def obj.to_ary; raise "Exception raised in #to_ary" end
 
       -> { @y.s(obj) { |a, b| } }.should raise_error(ZeroDivisionError)
     end
-
   end
 
   describe "taking |a, *b| arguments" do
@@ -696,9 +718,45 @@ def obj.to_ary; raise "Exception raised in #to_ary" end
     end
 
     it "accepts unnamed arguments" do
-      eval("lambda { |_,_| }").should be_an_instance_of(Proc)
-      eval("->(_,_) {}").should be_an_instance_of(Proc)
-      eval("Proc.new { |_,_| }").should be_an_instance_of(Proc)
+      lambda { |_,_| }.should be_an_instance_of(Proc) # rubocop:disable Style/Lambda
+      -> _,_ {}.should be_an_instance_of(Proc)
+      Proc.new { |_,_| }.should be_an_instance_of(Proc)
+    end
+  end
+
+  describe 'pre and post parameters' do
+    it "assigns nil to unassigned required arguments" do
+      proc { |a, *b, c, d| [a, b, c, d] }.call(1, 2).should == [1, [], 2, nil]
+    end
+
+    it "assigns elements to optional arguments" do
+      proc { |a=5, b=4, c=3| [a, b, c] }.call(1, 2).should == [1, 2, 3]
+    end
+
+    it "assigns elements to post arguments" do
+      proc { |a=5, b, c, d| [a, b, c, d] }.call(1, 2).should == [5, 1, 2, nil]
+    end
+
+    it "assigns elements to pre arguments" do
+      proc { |a, b, c, d=5| [a, b, c, d] }.call(1, 2).should == [1, 2, nil, 5]
+    end
+
+    it "assigns elements to pre and post arguments" do
+      proc { |a, b=5, c=6, d, e| [a, b, c, d, e] }.call(1               ).should == [1, 5, 6, nil, nil]
+      proc { |a, b=5, c=6, d, e| [a, b, c, d, e] }.call(1, 2            ).should == [1, 5, 6, 2, nil]
+      proc { |a, b=5, c=6, d, e| [a, b, c, d, e] }.call(1, 2, 3         ).should == [1, 5, 6, 2, 3]
+      proc { |a, b=5, c=6, d, e| [a, b, c, d, e] }.call(1, 2, 3, 4      ).should == [1, 2, 6, 3, 4]
+      proc { |a, b=5, c=6, d, e| [a, b, c, d, e] }.call(1, 2, 3, 4, 5   ).should == [1, 2, 3, 4, 5]
+      proc { |a, b=5, c=6, d, e| [a, b, c, d, e] }.call(1, 2, 3, 4, 5, 6).should == [1, 2, 3, 4, 5]
+    end
+
+    it "assigns elements to pre and post arguments when *rest is present" do
+      proc { |a, b=5, c=6, *d, e, f| [a, b, c, d, e, f] }.call(1               ).should == [1, 5, 6, [], nil, nil]
+      proc { |a, b=5, c=6, *d, e, f| [a, b, c, d, e, f] }.call(1, 2            ).should == [1, 5, 6, [], 2, nil]
+      proc { |a, b=5, c=6, *d, e, f| [a, b, c, d, e, f] }.call(1, 2, 3         ).should == [1, 5, 6, [], 2, 3]
+      proc { |a, b=5, c=6, *d, e, f| [a, b, c, d, e, f] }.call(1, 2, 3, 4      ).should == [1, 2, 6, [], 3, 4]
+      proc { |a, b=5, c=6, *d, e, f| [a, b, c, d, e, f] }.call(1, 2, 3, 4, 5   ).should == [1, 2, 3, [], 4, 5]
+      proc { |a, b=5, c=6, *d, e, f| [a, b, c, d, e, f] }.call(1, 2, 3, 4, 5, 6).should == [1, 2, 3, [4], 5, 6]
     end
   end
 end
@@ -883,24 +941,27 @@ def obj.to_ary; raise "Exception raised in #to_ary" end
     end
 
     describe "with a circular argument reference" do
-      it "raises a SyntaxError if using an existing local with the same name as the argument" do
-        a = 1
-        -> {
-          @proc = eval "proc { |a=a| a }"
-        }.should raise_error(SyntaxError)
+      ruby_version_is ""..."3.4" do
+        it "raises a SyntaxError if using the argument in its default value" do
+          a = 1
+          -> {
+            eval "proc { |a=a| a }"
+          }.should raise_error(SyntaxError)
+        end
       end
 
-      it "raises a SyntaxError if there is an existing method with the same name as the argument" do
-        def a; 1; end
-        -> {
-          @proc = eval "proc { |a=a| a }"
-        }.should raise_error(SyntaxError)
+      ruby_version_is "3.4" do
+        it "is nil if using the argument in its default value" do
+          -> {
+            eval "proc { |a=a| a }.call"
+          }.call.should == nil
+        end
       end
+    end
 
-      it "calls an existing method with the same name as the argument if explicitly using ()" do
-        def a; 1; end
-        proc { |a=a()| a }.call.should == 1
-      end
+    it "calls an existing method with the same name as the argument if explicitly using ()" do
+      def a; 1; end
+      proc { |a=a()| a }.call.should == 1
     end
   end
 
@@ -919,76 +980,99 @@ def a; 1; end
   end
 end
 
+# tested more thoroughly in language/delegation_spec.rb
 describe "Anonymous block forwarding" do
-  ruby_version_is "3.1" do
-    it "forwards blocks to other functions that formally declare anonymous blocks" do
-      eval <<-EOF
-          def b(&); c(&) end
-          def c(&); yield :non_null end
-      EOF
+  it "forwards blocks to other method that formally declares anonymous block" do
+    def b(&); c(&) end
+    def c(&); yield :non_null end
 
-      b { |c| c }.should == :non_null
-    end
+    b { |c| c }.should == :non_null
+  end
 
-    it "requires the anonymous block parameter to be declared if directly passing a block" do
-      -> { eval "def a; b(&); end; def b; end" }.should raise_error(SyntaxError)
-    end
+  it "requires the anonymous block parameter to be declared if directly passing a block" do
+    -> { eval "def a; b(&); end; def b; end" }.should raise_error(SyntaxError)
+  end
 
-    it "works when it's the only declared parameter" do
-      eval <<-EOF
-          def inner; yield end
-          def block_only(&); inner(&) end
-      EOF
+  it "works when it's the only declared parameter" do
+    def inner; yield end
+    def block_only(&); inner(&) end
 
-      block_only { 1 }.should == 1
-    end
+    block_only { 1 }.should == 1
+  end
 
-    it "works alongside positional parameters" do
-      eval <<-EOF
-          def inner; yield end
-          def pos(arg1, &); inner(&) end
-      EOF
+  it "works alongside positional parameters" do
+    def inner; yield end
+    def pos(arg1, &); inner(&) end
 
-      pos(:a) { 1 }.should == 1
-    end
+    pos(:a) { 1 }.should == 1
+  end
 
-    it "works alongside positional arguments and splatted keyword arguments" do
-      eval <<-EOF
-          def inner; yield end
-          def pos_kwrest(arg1, **kw, &); inner(&) end
-      EOF
+  it "works alongside positional arguments and splatted keyword arguments" do
+    def inner; yield end
+    def pos_kwrest(arg1, **kw, &); inner(&) end
 
-      pos_kwrest(:a, arg: 3) { 1 }.should == 1
-    end
+    pos_kwrest(:a, arg: 3) { 1 }.should == 1
+  end
 
-    it "works alongside positional arguments and disallowed keyword arguments" do
-      eval <<-EOF
-          def inner; yield end
-          def no_kw(arg1, **nil, &); inner(&) end
-      EOF
+  it "works alongside positional arguments and disallowed keyword arguments" do
+    def inner; yield end
+    def no_kw(arg1, **nil, &); inner(&) end
 
-      no_kw(:a) { 1 }.should == 1
-    end
+    no_kw(:a) { 1 }.should == 1
   end
 
-  ruby_version_is "3.2" do
-    it "works alongside explicit keyword arguments" do
-      eval <<-EOF
-          def inner; yield end
-          def rest_kw(*a, kwarg: 1, &); inner(&) end
-          def kw(kwarg: 1, &); inner(&) end
-          def pos_kw_kwrest(arg1, kwarg: 1, **kw, &); inner(&) end
-          def pos_rkw(arg1, kwarg1:, &); inner(&) end
-          def all(arg1, arg2, *rest, post1, post2, kw1: 1, kw2: 2, okw1:, okw2:, &); inner(&) end
-          def all_kwrest(arg1, arg2, *rest, post1, post2, kw1: 1, kw2: 2, okw1:, okw2:, **kw, &); inner(&) end
-      EOF
+  it "works alongside explicit keyword arguments" do
+    eval <<-EOF
+        def inner; yield end
+        def rest_kw(*a, kwarg: 1, &); inner(&) end
+        def kw(kwarg: 1, &); inner(&) end
+        def pos_kw_kwrest(arg1, kwarg: 1, **kw, &); inner(&) end
+        def pos_rkw(arg1, kwarg1:, &); inner(&) end
+        def all(arg1, arg2, *rest, post1, post2, kw1: 1, kw2: 2, okw1:, okw2:, &); inner(&) end
+        def all_kwrest(arg1, arg2, *rest, post1, post2, kw1: 1, kw2: 2, okw1:, okw2:, **kw, &); inner(&) end
+    EOF
+
+    rest_kw { 1 }.should == 1
+    kw { 1 }.should == 1
+    pos_kw_kwrest(:a) { 1 }.should == 1
+    pos_rkw(:a, kwarg1: 3) { 1 }.should == 1
+    all(:a, :b, :c, :d, :e, okw1: 'x', okw2: 'y') { 1 }.should == 1
+    all_kwrest(:a, :b, :c, :d, :e, okw1: 'x', okw2: 'y') { 1 }.should == 1
+  end
+end
 
-      rest_kw { 1 }.should == 1
-      kw { 1 }.should == 1
-      pos_kw_kwrest(:a) { 1 }.should == 1
-      pos_rkw(:a, kwarg1: 3) { 1 }.should == 1
-      all(:a, :b, :c, :d, :e, okw1: 'x', okw2: 'y') { 1 }.should == 1
-      all_kwrest(:a, :b, :c, :d, :e, okw1: 'x', okw2: 'y') { 1 }.should == 1
+describe "`it` calls without arguments in a block with no ordinary parameters" do
+  ruby_version_is "3.3"..."3.4" do
+    it "emits a deprecation warning" do
+      -> {
+        eval "proc { it }"
+      }.should complain(/warning: `it` calls without arguments will refer to the first block param in Ruby 3.4; use it\(\) or self.it/)
     end
+
+    it "does not emit a deprecation warning when a block has parameters" do
+      -> { eval "proc { |a, b| it }" }.should_not complain
+      -> { eval "proc { |*rest| it }" }.should_not complain
+      -> { eval "proc { |*| it }" }.should_not complain
+      -> { eval "proc { |a:, b:| it }" }.should_not complain
+      -> { eval "proc { |**kw| it }" }.should_not complain
+      -> { eval "proc { |**| it }" }.should_not complain
+      -> { eval "proc { |&block| it }" }.should_not complain
+      -> { eval "proc { |&| it }" }.should_not complain
+    end
+
+    it "does not emit a deprecation warning when `it` calls with arguments" do
+      -> { eval "proc { it(42) }" }.should_not complain
+    end
+
+    it "does not emit a deprecation warning when `it` calls with explicit empty arguments list" do
+      -> { eval "proc { it() }" }.should_not complain
+    end
+  end
+end
+
+describe "if `it` is defined outside of a block" do
+  it "treats `it` as a captured variable" do
+    it = 5
+    proc { it }.call(0).should == 5
   end
 end
diff --git a/spec/ruby/language/break_spec.rb b/spec/ruby/language/break_spec.rb
index 627cb4a071fca4..7e5b6fb32859c2 100644
--- a/spec/ruby/language/break_spec.rb
+++ b/spec/ruby/language/break_spec.rb
@@ -252,6 +252,25 @@ def mid(&b)
   end
 end
 
+describe "The break statement in a method" do
+  it "is invalid and raises a SyntaxError" do
+    -> {
+      eval("def m; break; end")
+    }.should raise_error(SyntaxError)
+  end
+end
+
+describe "The break statement in a module literal" do
+  it "is invalid and raises a SyntaxError" do
+    code = <<~RUBY
+      module BreakSpecs:ModuleWithBreak
+        break
+      end
+    RUBY
+
+    -> { eval(code) }.should raise_error(SyntaxError)
+  end
+end
 
 # TODO: Rewrite all the specs from here to the end of the file in the style
 # above.
@@ -372,7 +391,7 @@ def three
     end.should_not raise_error
   end
 
-  it "raises LocalJumpError when converted into a proc during a a super call" do
+  it "raises LocalJumpError when converted into a proc during a super call" do
     cls1 = Class.new { def foo(&b); b; end }
     cls2 = Class.new(cls1) { def foo; super { break 1 }.call; end }
 
diff --git a/spec/ruby/language/case_spec.rb b/spec/ruby/language/case_spec.rb
index 58e1aaed9679c9..464d06e46a4b25 100644
--- a/spec/ruby/language/case_spec.rb
+++ b/spec/ruby/language/case_spec.rb
@@ -329,49 +329,6 @@ def bar; @calls << :bar; end
       100
     end.should == 100
   end
-end
-
-describe "The 'case'-construct with no target expression" do
-  it "evaluates the body of the first clause when at least one of its condition expressions is true" do
-    case
-    when true, false; 'foo'
-    end.should == 'foo'
-  end
-
-  it "evaluates the body of the first when clause that is not false/nil" do
-    case
-    when false; 'foo'
-    when 2; 'bar'
-    when 1 == 1; 'baz'
-    end.should == 'bar'
-
-    case
-    when false; 'foo'
-    when nil; 'foo'
-    when 1 == 1; 'bar'
-    end.should == 'bar'
-  end
-
-  it "evaluates the body of the else clause if all when clauses are false/nil" do
-    case
-    when false; 'foo'
-    when nil; 'foo'
-    when 1 == 2; 'bar'
-    else 'baz'
-    end.should == 'baz'
-  end
-
-  it "evaluates multiple conditional expressions as a boolean disjunction" do
-    case
-    when true, false; 'foo'
-    else 'bar'
-    end.should == 'foo'
-
-    case
-    when false, true; 'foo'
-    else 'bar'
-    end.should == 'foo'
-  end
 
   it "evaluates true as only 'true' when true is the first clause" do
     case 1
@@ -443,6 +400,95 @@ def ===(o)
     end.should == :called
   end
 
+  it "supports declaring variables in the case target expression" do
+    def test(v)
+      case new_variable_in_expression = v
+      when true
+        # This extra block is a test that `new_variable_in_expression` is declared outside of it and not inside
+        self.then { new_variable_in_expression }
+      else
+        # Same
+        self.then { new_variable_in_expression.casecmp?("foo") }
+      end
+    end
+
+    self.test("bar").should == false
+    self.test(true).should == true
+  end
+
+  ruby_version_is ""..."3.4" do
+    it "warns if there are identical when clauses" do
+      -> {
+        eval <<~RUBY
+          case 1
+          when 2
+            :foo
+          when 2
+            :bar
+          end
+        RUBY
+      }.should complain(/warning: (duplicated .when' clause with line \d+ is ignored|'when' clause on line \d+ duplicates 'when' clause on line \d+ and is ignored)/, verbose: true)
+    end
+  end
+
+  ruby_version_is "3.4" do
+    it "warns if there are identical when clauses" do
+      -> {
+        eval <<~RUBY
+          case 1
+          when 2
+            :foo
+          when 2
+            :bar
+          end
+        RUBY
+      }.should complain(/warning: 'when' clause on line \d+ duplicates 'when' clause on line \d+ and is ignored/, verbose: true)
+    end
+  end
+end
+
+describe "The 'case'-construct with no target expression" do
+  it "evaluates the body of the first clause when at least one of its condition expressions is true" do
+    case
+    when true, false; 'foo'
+    end.should == 'foo'
+  end
+
+  it "evaluates the body of the first when clause that is not false/nil" do
+    case
+    when false; 'foo'
+    when 2; 'bar'
+    when 1 == 1; 'baz'
+    end.should == 'bar'
+
+    case
+    when false; 'foo'
+    when nil; 'foo'
+    when 1 == 1; 'bar'
+    end.should == 'bar'
+  end
+
+  it "evaluates the body of the else clause if all when clauses are false/nil" do
+    case
+    when false; 'foo'
+    when nil; 'foo'
+    when 1 == 2; 'bar'
+    else 'baz'
+    end.should == 'baz'
+  end
+
+  it "evaluates multiple conditional expressions as a boolean disjunction" do
+    case
+    when true, false; 'foo'
+    else 'bar'
+    end.should == 'foo'
+
+    case
+    when false, true; 'foo'
+    else 'bar'
+    end.should == 'foo'
+  end
+
   # Homogeneous cases are often optimized to avoid === using a jump table, and should be tested separately.
   # See https://github.com/jruby/jruby/issues/6440
   it "handles homogeneous cases" do
@@ -451,4 +497,13 @@ def ===(o)
     when 2; 'bar'
     end.should == 'foo'
   end
+
+  it "expands arrays to lists of values" do
+    case
+    when *[false]
+      "foo"
+    when *[true]
+      "bar"
+    end.should == "bar"
+  end
 end
diff --git a/spec/ruby/language/class_spec.rb b/spec/ruby/language/class_spec.rb
index eab3cd0651fe57..0b770d69b58ea7 100644
--- a/spec/ruby/language/class_spec.rb
+++ b/spec/ruby/language/class_spec.rb
@@ -271,6 +271,8 @@ def self.get_class_name
 
       AnonWithConstant.name.should == 'AnonWithConstant'
       klass.get_class_name.should == 'AnonWithConstant'
+    ensure
+      Object.send(:remove_const, :AnonWithConstant)
     end
   end
 end
diff --git a/spec/ruby/language/constants_spec.rb b/spec/ruby/language/constants_spec.rb
index 08c534487ec39b..063c52c4226d57 100644
--- a/spec/ruby/language/constants_spec.rb
+++ b/spec/ruby/language/constants_spec.rb
@@ -72,39 +72,60 @@ module ConstantSpecs::SpecAdded1
 
       ConstantSpecs::ModuleA::CS_CONST101 = :const101_5
       ConstantSpecs::ModuleA::CS_CONST101.should == :const101_5
+    ensure
+      ConstantSpecs::ClassB.send(:remove_const, :CS_CONST101)
+      ConstantSpecs::ParentB.send(:remove_const, :CS_CONST101)
+      ConstantSpecs::ContainerB.send(:remove_const, :CS_CONST101)
+      ConstantSpecs::ContainerB::ChildB.send(:remove_const, :CS_CONST101)
+      ConstantSpecs::ModuleA.send(:remove_const, :CS_CONST101)
     end
 
     it "searches a module included in the immediate class before the superclass" do
       ConstantSpecs::ParentB::CS_CONST102 = :const102_1
       ConstantSpecs::ModuleF::CS_CONST102 = :const102_2
       ConstantSpecs::ContainerB::ChildB::CS_CONST102.should == :const102_2
+    ensure
+      ConstantSpecs::ParentB.send(:remove_const, :CS_CONST102)
+      ConstantSpecs::ModuleF.send(:remove_const, :CS_CONST102)
     end
 
     it "searches the superclass before a module included in the superclass" do
       ConstantSpecs::ModuleE::CS_CONST103 = :const103_1
       ConstantSpecs::ParentB::CS_CONST103 = :const103_2
       ConstantSpecs::ContainerB::ChildB::CS_CONST103.should == :const103_2
+    ensure
+      ConstantSpecs::ModuleE.send(:remove_const, :CS_CONST103)
+      ConstantSpecs::ParentB.send(:remove_const, :CS_CONST103)
     end
 
     it "searches a module included in the superclass" do
       ConstantSpecs::ModuleA::CS_CONST104 = :const104_1
       ConstantSpecs::ModuleE::CS_CONST104 = :const104_2
       ConstantSpecs::ContainerB::ChildB::CS_CONST104.should == :const104_2
+    ensure
+      ConstantSpecs::ModuleA.send(:remove_const, :CS_CONST104)
+      ConstantSpecs::ModuleE.send(:remove_const, :CS_CONST104)
     end
 
     it "searches the superclass chain" do
       ConstantSpecs::ModuleA::CS_CONST105 = :const105
       ConstantSpecs::ContainerB::ChildB::CS_CONST105.should == :const105
+    ensure
+      ConstantSpecs::ModuleA.send(:remove_const, :CS_CONST105)
     end
 
     it "searches Object if no class or module qualifier is given" do
       CS_CONST106 = :const106
       CS_CONST106.should == :const106
+    ensure
+      Object.send(:remove_const, :CS_CONST106)
     end
 
     it "searches Object if a toplevel qualifier (::X) is given" do
       ::CS_CONST107 = :const107
       ::CS_CONST107.should == :const107
+    ensure
+      Object.send(:remove_const, :CS_CONST107)
     end
 
     it "does not search the singleton class of the class or module" do
@@ -123,6 +144,9 @@ class << self
       end
 
       -> { ConstantSpecs::CS_CONST108 }.should raise_error(NameError)
+    ensure
+      ConstantSpecs::ContainerB::ChildB.singleton_class.send(:remove_const, :CS_CONST108)
+      ConstantSpecs.singleton_class.send(:remove_const, :CS_CONST108)
     end
 
     it "returns the updated value when a constant is reassigned" do
@@ -133,36 +157,20 @@ class << self
         ConstantSpecs::ClassB::CS_CONST109 = :const109_2
       }.should complain(/already initialized constant/)
       ConstantSpecs::ClassB::CS_CONST109.should == :const109_2
+    ensure
+      ConstantSpecs::ClassB.send(:remove_const, :CS_CONST109)
     end
 
-    ruby_version_is "3.2" do
-      it "evaluates left-to-right" do
-        mod = Module.new
+    it "evaluates left-to-right" do
+      mod = Module.new
 
-        mod.module_eval <<-EOC
-          order = []
-          ConstantSpecsRHS = Module.new
-          (order << :lhs; ConstantSpecsRHS)::B = (order << :rhs)
-        EOC
+      mod.module_eval <<-EOC
+        order = []
+        ConstantSpecsRHS = Module.new
+        (order << :lhs; ConstantSpecsRHS)::B = (order << :rhs)
+      EOC
 
-        mod::ConstantSpecsRHS::B.should == [:lhs, :rhs]
-      end
-    end
-
-    ruby_version_is ""..."3.2" do
-      it "evaluates the right hand side before evaluating a constant path" do
-        mod = Module.new
-
-        mod.module_eval <<-EOC
-          ConstantSpecsRHS::B = begin
-            module ConstantSpecsRHS; end
-
-            "hello"
-          end
-        EOC
-
-        mod::ConstantSpecsRHS::B.should == 'hello'
-      end
+      mod::ConstantSpecsRHS::B.should == [:lhs, :rhs]
     end
   end
 
@@ -292,6 +300,12 @@ class ConstantSpecs::ClassB; CS_CONST201 = :const201_2; end
       ConstantSpecs::ClassB.new.const201.should == :const201_2
       ConstantSpecs::ParentB.new.const201.should == :const201_3
       ConstantSpecs::ContainerB::ChildB.new.const201.should == :const201_5
+    ensure
+      ConstantSpecs::ModuleA.send(:remove_const, :CS_CONST201)
+      ConstantSpecs::ClassB.send(:remove_const, :CS_CONST201)
+      ConstantSpecs::ParentB.send(:remove_const, :CS_CONST201)
+      ConstantSpecs::ContainerB.send(:remove_const, :CS_CONST201)
+      ConstantSpecs::ContainerB::ChildB.send(:remove_const, :CS_CONST201)
     end
 
     it "searches a module included in the immediate class before the superclass" do
@@ -300,6 +314,9 @@ class ConstantSpecs::ClassB; CS_CONST201 = :const201_2; end
 
       ConstantSpecs::ContainerB::ChildB.const202.should == :const202_1
       ConstantSpecs::ContainerB::ChildB.new.const202.should == :const202_1
+    ensure
+      ConstantSpecs::ParentB.send(:remove_const, :CS_CONST202)
+      ConstantSpecs::ContainerB::ChildB.send(:remove_const, :CS_CONST202)
     end
 
     it "searches the superclass before a module included in the superclass" do
@@ -308,6 +325,9 @@ class ConstantSpecs::ClassB; CS_CONST201 = :const201_2; end
 
       ConstantSpecs::ContainerB::ChildB.const203.should == :const203_1
       ConstantSpecs::ContainerB::ChildB.new.const203.should == :const203_1
+    ensure
+      ConstantSpecs::ParentB.send(:remove_const, :CS_CONST203)
+      ConstantSpecs::ModuleE.send(:remove_const, :CS_CONST203)
     end
 
     it "searches a module included in the superclass" do
@@ -316,6 +336,9 @@ class ConstantSpecs::ClassB; CS_CONST201 = :const201_2; end
 
       ConstantSpecs::ContainerB::ChildB.const204.should == :const204_1
       ConstantSpecs::ContainerB::ChildB.new.const204.should == :const204_1
+    ensure
+      ConstantSpecs::ModuleA.send(:remove_const, :CS_CONST204)
+      ConstantSpecs::ModuleE.send(:remove_const, :CS_CONST204)
     end
 
     it "searches the superclass chain" do
@@ -323,6 +346,8 @@ class ConstantSpecs::ClassB; CS_CONST201 = :const201_2; end
 
       ConstantSpecs::ContainerB::ChildB.const205.should == :const205
       ConstantSpecs::ContainerB::ChildB.new.const205.should == :const205
+    ensure
+      ConstantSpecs::ModuleA.send(:remove_const, :CS_CONST205)
     end
 
     it "searches the lexical scope of the method not the receiver's immediate class" do
@@ -334,6 +359,9 @@ class << self
       end
 
       ConstantSpecs::ContainerB::ChildB.const206.should == :const206_1
+    ensure
+      ConstantSpecs::ContainerB::ChildB.send(:remove_const, :CS_CONST206)
+      ConstantSpecs::ContainerB::ChildB.singleton_class.send(:remove_const, :CS_CONST206)
     end
 
     it "searches the lexical scope of a singleton method" do
@@ -341,12 +369,17 @@ class << self
       ConstantSpecs::ClassB::CS_CONST207 = :const207_2
 
       ConstantSpecs::CS_CONST208.const207.should == :const207_1
+    ensure
+      ConstantSpecs.send(:remove_const, :CS_CONST207)
+      ConstantSpecs::ClassB.send(:remove_const, :CS_CONST207)
     end
 
     it "does not search the lexical scope of the caller" do
       ConstantSpecs::ClassB::CS_CONST209 = :const209
 
       -> { ConstantSpecs::ClassB.const209 }.should raise_error(NameError)
+    ensure
+      ConstantSpecs::ClassB.send(:remove_const, :CS_CONST209)
     end
 
     it "searches the lexical scope of a block" do
@@ -354,6 +387,9 @@ class << self
       ConstantSpecs::ParentB::CS_CONST210 = :const210_2
 
       ConstantSpecs::ClassB.const210.should == :const210_1
+    ensure
+      ConstantSpecs::ClassB.send(:remove_const, :CS_CONST210)
+      ConstantSpecs::ParentB.send(:remove_const, :CS_CONST210)
     end
 
     it "searches Object as a lexical scope only if Object is explicitly opened" do
@@ -364,6 +400,11 @@ class << self
       Object::CS_CONST212 = :const212_2
       ConstantSpecs::ParentB::CS_CONST212 = :const212_1
       ConstantSpecs::ContainerB::ChildB.const212.should == :const212_1
+    ensure
+      Object.send(:remove_const, :CS_CONST211)
+      ConstantSpecs::ParentB.send(:remove_const, :CS_CONST211)
+      Object.send(:remove_const, :CS_CONST212)
+      ConstantSpecs::ParentB.send(:remove_const, :CS_CONST212)
     end
 
     it "returns the updated value when a constant is reassigned" do
@@ -376,6 +417,8 @@ class << self
       }.should complain(/already initialized constant/)
       ConstantSpecs::ContainerB::ChildB.const213.should == :const213_2
       ConstantSpecs::ContainerB::ChildB.new.const213.should == :const213_2
+    ensure
+      ConstantSpecs::ParentB.send(:remove_const, :CS_CONST213)
     end
 
     it "does not search the lexical scope of qualifying modules" do
@@ -384,6 +427,8 @@ class << self
       -> do
         ConstantSpecs::ContainerB::ChildB.const214
       end.should raise_error(NameError)
+    ensure
+      ConstantSpecs::ContainerB.send(:remove_const, :CS_CONST214)
     end
   end
 
@@ -484,6 +529,10 @@ module PrivateModule
 
         PrivateModule::X.should == 1
       end
+    ensure
+      module ::ConstantVisibility::ModuleContainer
+        PrivateModule.send(:remove_const, :X)
+      end
     end
 
     it "can be reopened as a class where constant is not private" do
@@ -494,6 +543,10 @@ class PrivateClass
 
         PrivateClass::X.should == 1
       end
+    ensure
+      module ::ConstantVisibility::ModuleContainer
+        PrivateClass.send(:remove_const, :X)
+      end
     end
 
     it "is not defined? with A::B form" do
@@ -565,6 +618,10 @@ module PrivateModule
 
         PrivateModule::X.should == 1
       end
+    ensure
+      class ::ConstantVisibility::ClassContainer
+        PrivateModule.send(:remove_const, :X)
+      end
     end
 
     it "can be reopened as a class where constant is not private" do
@@ -575,6 +632,10 @@ class PrivateClass
 
         PrivateClass::X.should == 1
       end
+    ensure
+      class ::ConstantVisibility::ClassContainer
+        PrivateClass.send(:remove_const, :X)
+      end
     end
 
     it "is not defined? with A::B form" do
diff --git a/spec/ruby/language/def_spec.rb b/spec/ruby/language/def_spec.rb
index c8531343c06dcc..296d4787d01c45 100644
--- a/spec/ruby/language/def_spec.rb
+++ b/spec/ruby/language/def_spec.rb
@@ -97,7 +97,7 @@ def foo(a); end
         def foo; end
       end
     }.should raise_error(FrozenError) { |e|
-      e.message.should.start_with? "can't modify frozen module"
+      e.message.should == "can't modify frozen module: #{e.receiver}"
     }
 
     -> {
@@ -106,7 +106,7 @@ def foo; end
         def foo; end
       end
     }.should raise_error(FrozenError){ |e|
-      e.message.should.start_with? "can't modify frozen class"
+      e.message.should == "can't modify frozen class: #{e.receiver}"
     }
   end
 end
@@ -197,15 +197,25 @@ def foo(a, b = 2, *args)
     foo(2,3,3).should == [2,3,[3]]
   end
 
-  it "raises a SyntaxError when there is an existing method with the same name as the local variable" do
-    def bar
-      1
+  ruby_version_is ""..."3.4" do
+    it "raises a SyntaxError if using the argument in its default value" do
+      -> {
+        eval "def foo(bar = bar)
+          bar
+        end"
+      }.should raise_error(SyntaxError)
+    end
+  end
+
+  ruby_version_is "3.4" do
+    it "is nil if using the argument in its default value" do
+      -> {
+        eval "def foo(bar = bar)
+          bar
+        end
+        foo"
+      }.call.should == nil
     end
-    -> {
-      eval "def foo(bar = bar)
-        bar
-      end"
-    }.should raise_error(SyntaxError)
   end
 
   it "calls a method with the same name as the local when explicitly using ()" do
@@ -238,7 +248,7 @@ def @a.foo
   end
 
   it "can be declared for a global variable" do
-    $__a__ = "hi"
+    $__a__ = +"hi"
     def $__a__.foo
       7
     end
@@ -273,20 +283,20 @@ def obj.==(other)
   it "raises FrozenError with the correct class name" do
     obj = Object.new
     obj.freeze
-    -> { def obj.foo; end }.should raise_error(FrozenError){ |e|
-      e.message.should.start_with? "can't modify frozen object"
-    }
+    -> { def obj.foo; end }.should raise_error(FrozenError, "can't modify frozen object: #{obj}")
 
+    obj = Object.new
     c = obj.singleton_class
-    -> { def c.foo; end }.should raise_error(FrozenError){ |e|
-      e.message.should.start_with? "can't modify frozen Class"
-    }
+    c.singleton_class.freeze
+    -> { def c.foo; end }.should raise_error(FrozenError, "can't modify frozen Class: #{c}")
+
+    c = Class.new
+    c.freeze
+    -> { def c.foo; end }.should raise_error(FrozenError, "can't modify frozen Class: #{c}")
 
     m = Module.new
     m.freeze
-    -> { def m.foo; end }.should raise_error(FrozenError){ |e|
-      e.message.should.start_with? "can't modify frozen Module"
-    }
+    -> { def m.foo; end }.should raise_error(FrozenError, "can't modify frozen Module: #{m}")
   end
 end
 
@@ -514,6 +524,8 @@ def inherited_method;self;end
 
     obj = DefSpecNested.new
     obj.inherited_method.should == obj
+  ensure
+    DefSpecNested.send(:remove_const, :TARGET)
   end
 
   # See http://yugui.jp/articles/846#label-3
@@ -535,6 +547,8 @@ def body_method; end
 
     DefSpecNested.should_not have_instance_method :arg_method
     DefSpecNested.should_not have_instance_method :body_method
+  ensure
+    DefSpecNested.send(:remove_const, :OBJ)
   end
 
   it "creates an instance method inside Class.new" do
diff --git a/spec/ruby/language/defined_spec.rb b/spec/ruby/language/defined_spec.rb
index b84fe9394ad20d..80ad1818b11652 100644
--- a/spec/ruby/language/defined_spec.rb
+++ b/spec/ruby/language/defined_spec.rb
@@ -116,6 +116,11 @@
       defined?(obj.a_defined_method).should == "method"
     end
 
+    it "returns 'method' for []=" do
+      a = []
+      defined?(a[0] = 1).should == "method"
+    end
+
     it "returns nil if the method is not defined" do
       obj = DefinedSpecs::Basic.new
       defined?(obj.an_undefined_method).should be_nil
@@ -231,6 +236,14 @@
     defined?(@@defined_specs_x = 2).should == "assignment"
   end
 
+  it "returns 'assignment' for assigning a constant" do
+    defined?(A = 2).should == "assignment"
+  end
+
+  it "returns 'assignment' for assigning a fully qualified constant" do
+    defined?(Object::A = 2).should == "assignment"
+  end
+
   it "returns 'assignment' for assigning multiple variables" do
     defined?((a, b = 1, 2)).should == "assignment"
   end
@@ -248,7 +261,27 @@
   end
 
   it "returns 'assignment' for an expression with '+='" do
-    defined?(x += 2).should == "assignment"
+    defined?(a += 1).should == "assignment"
+    defined?(@a += 1).should == "assignment"
+    defined?(@@a += 1).should == "assignment"
+    defined?($a += 1).should == "assignment"
+    defined?(A += 1).should == "assignment"
+    # fully qualified constant check is moved out into a separate test case
+    defined?(a.b += 1).should == "assignment"
+    defined?(a[:b] += 1).should == "assignment"
+  end
+
+  # https://bugs.ruby-lang.org/issues/20111
+  ruby_version_is ""..."3.4" do
+    it "returns 'expression' for an assigning a fully qualified constant with '+='" do
+      defined?(Object::A += 1).should == "expression"
+    end
+  end
+
+  ruby_version_is "3.4" do
+    it "returns 'assignment' for an assigning a fully qualified constant with '+='" do
+      defined?(Object::A += 1).should == "assignment"
+    end
   end
 
   it "returns 'assignment' for an expression with '*='" do
@@ -279,12 +312,90 @@
     defined?(x >>= 2).should == "assignment"
   end
 
-  it "returns 'assignment' for an expression with '||='" do
-    defined?(x ||= 2).should == "assignment"
+  context "||=" do
+    it "returns 'assignment' for assigning a local variable with '||='" do
+      defined?(a ||= true).should == "assignment"
+    end
+
+    it "returns 'assignment' for assigning an instance variable with '||='" do
+      defined?(@a ||= true).should == "assignment"
+    end
+
+    it "returns 'assignment' for assigning a class variable with '||='" do
+      defined?(@@a ||= true).should == "assignment"
+    end
+
+    it "returns 'assignment' for assigning a global variable with '||='" do
+      defined?($a ||= true).should == "assignment"
+    end
+
+    it "returns 'assignment' for assigning a constant with '||='" do
+      defined?(A ||= true).should == "assignment"
+    end
+
+    # https://bugs.ruby-lang.org/issues/20111
+    ruby_version_is ""..."3.4" do
+      it "returns 'expression' for assigning a fully qualified constant with '||='" do
+        defined?(Object::A ||= true).should == "expression"
+      end
+    end
+
+    ruby_version_is "3.4" do
+      it "returns 'assignment' for assigning a fully qualified constant with '||='" do
+        defined?(Object::A ||= true).should == "assignment"
+      end
+    end
+
+    it "returns 'assignment' for assigning an attribute with '||='" do
+      defined?(a.b ||= true).should == "assignment"
+    end
+
+    it "returns 'assignment' for assigning a referenced element with '||='" do
+      defined?(a[:b] ||= true).should == "assignment"
+    end
   end
 
-  it "returns 'assignment' for an expression with '&&='" do
-    defined?(x &&= 2).should == "assignment"
+  context "&&=" do
+    it "returns 'assignment' for assigning a local variable with '&&='" do
+      defined?(a &&= true).should == "assignment"
+    end
+
+    it "returns 'assignment' for assigning an instance variable with '&&='" do
+      defined?(@a &&= true).should == "assignment"
+    end
+
+    it "returns 'assignment' for assigning a class variable with '&&='" do
+      defined?(@@a &&= true).should == "assignment"
+    end
+
+    it "returns 'assignment' for assigning a global variable with '&&='" do
+      defined?($a &&= true).should == "assignment"
+    end
+
+    it "returns 'assignment' for assigning a constant with '&&='" do
+      defined?(A &&= true).should == "assignment"
+    end
+
+    # https://bugs.ruby-lang.org/issues/20111
+    ruby_version_is ""..."3.4" do
+      it "returns 'expression' for assigning a fully qualified constant with '&&='" do
+        defined?(Object::A &&= true).should == "expression"
+      end
+    end
+
+    ruby_version_is "3.4" do
+      it "returns 'assignment' for assigning a fully qualified constant with '&&='" do
+        defined?(Object::A &&= true).should == "assignment"
+      end
+    end
+
+    it "returns 'assignment' for assigning an attribute with '&&='" do
+      defined?(a.b &&= true).should == "assignment"
+    end
+
+    it "returns 'assignment' for assigning a referenced element with '&&='" do
+      defined?(a[:b] &&= true).should == "assignment"
+    end
   end
 
   it "returns 'assignment' for an expression with '**='" do
@@ -789,6 +900,10 @@
     defined?(DefinedSpecs::Undefined).should be_nil
   end
 
+  it "returns nil when the constant is not defined and the outer module implements .const_missing" do
+    defined?(DefinedSpecs::ModuleWithConstMissing::Undefined).should be_nil
+  end
+
   it "does not call .const_missing if the constant is not defined" do
     DefinedSpecs.should_not_receive(:const_missing)
     defined?(DefinedSpecs::UnknownChild).should be_nil
diff --git a/spec/ruby/language/delegation_spec.rb b/spec/ruby/language/delegation_spec.rb
index 3f24a79d5cb0a4..c711a536c22d71 100644
--- a/spec/ruby/language/delegation_spec.rb
+++ b/spec/ruby/language/delegation_spec.rb
@@ -1,6 +1,7 @@
 require_relative '../spec_helper'
 require_relative 'fixtures/delegation'
 
+# Forwarding anonymous parameters
 describe "delegation with def(...)" do
   it "delegates rest and kwargs" do
     a = Class.new(DelegationSpecs::Target)
@@ -10,10 +11,10 @@ def delegate(...)
       end
     RUBY
 
-    a.new.delegate(1, b: 2).should == [[1], {b: 2}]
+    a.new.delegate(1, b: 2).should == [[1], {b: 2}, nil]
   end
 
-  it "delegates block" do
+  it "delegates a block literal" do
     a = Class.new(DelegationSpecs::Target)
     a.class_eval(<<-RUBY)
       def delegate_block(...)
@@ -24,6 +25,18 @@ def delegate_block(...)
     a.new.delegate_block(1, b: 2) { |x| x }.should == [{b: 2}, [1]]
   end
 
+  it "delegates a block argument" do
+    a = Class.new(DelegationSpecs::Target)
+    a.class_eval(<<-RUBY)
+      def delegate(...)
+        target(...)
+      end
+    RUBY
+
+    block = proc {}
+    a.new.delegate(1, b: 2, &block).should == [[1], {b: 2}, block]
+  end
+
   it "parses as open endless Range when brackets are omitted" do
     a = Class.new(DelegationSpecs::Target)
     suppress_warning do
@@ -31,35 +44,115 @@ def delegate_block(...)
         def delegate(...)
           target ...
         end
-       RUBY
-     end
+      RUBY
+    end
 
-     a.new.delegate(1, b: 2).should == Range.new([[], {}], nil, true)
+    a.new.delegate(1, b: 2).should == Range.new([[], {}, nil], nil, true)
   end
 end
 
-ruby_version_is "2.7.3" do
-  describe "delegation with def(x, ...)" do
-    it "delegates rest and kwargs" do
-      a = Class.new(DelegationSpecs::Target)
-      a.class_eval(<<-RUBY)
-        def delegate(x, ...)
-          target(...)
-        end
-      RUBY
+describe "delegation with def(x, ...)" do
+  it "delegates rest and kwargs" do
+    a = Class.new(DelegationSpecs::Target)
+    a.class_eval(<<-RUBY)
+      def delegate(x, ...)
+        target(...)
+      end
+    RUBY
+
+    a.new.delegate(0, 1, b: 2).should == [[1], {b: 2}, nil]
+  end
+
+  it "delegates a block literal" do
+    a = Class.new(DelegationSpecs::Target)
+    a.class_eval(<<-RUBY)
+      def delegate_block(x, ...)
+        target_block(...)
+      end
+    RUBY
+
+    a.new.delegate_block(0, 1, b: 2) { |x| x }.should == [{b: 2}, [1]]
+  end
+
+  it "delegates a block argument" do
+    a = Class.new(DelegationSpecs::Target)
+    a.class_eval(<<-RUBY)
+      def delegate(...)
+        target(...)
+      end
+    RUBY
 
-      a.new.delegate(0, 1, b: 2).should == [[1], {b: 2}]
+    block = proc {}
+    a.new.delegate(1, b: 2, &block).should == [[1], {b: 2}, block]
+  end
+end
+
+describe "delegation with def(*)" do
+  it "delegates rest" do
+    a = Class.new(DelegationSpecs::Target)
+    a.class_eval(<<-RUBY)
+    def delegate(*)
+      target(*)
     end
+    RUBY
 
-    it "delegates block" do
-      a = Class.new(DelegationSpecs::Target)
-      a.class_eval(<<-RUBY)
-        def delegate_block(x, ...)
-          target_block(...)
-        end
-      RUBY
+    a.new.delegate(0, 1).should == [[0, 1], {}, nil]
+  end
+
+  ruby_version_is "3.3" do
+    context "within a block that accepts anonymous rest within a method that accepts anonymous rest" do
+      it "does not allow delegating rest" do
+        -> {
+          eval "def m(*); proc { |*| n(*) } end"
+        }.should raise_error(SyntaxError, /anonymous rest parameter is also used within block/)
+      end
+    end
+  end
+end
+
+describe "delegation with def(**)" do
+  it "delegates kwargs" do
+    a = Class.new(DelegationSpecs::Target)
+    a.class_eval(<<-RUBY)
+    def delegate(**)
+      target(**)
+    end
+    RUBY
+
+    a.new.delegate(a: 1) { |x| x }.should == [[], {a: 1}, nil]
+  end
+
+  ruby_version_is "3.3" do
+    context "within a block that accepts anonymous kwargs within a method that accepts anonymous kwargs" do
+      it "does not allow delegating kwargs" do
+        -> {
+          eval "def m(**); proc { |**| n(**) } end"
+        }.should raise_error(SyntaxError, /anonymous keyword rest parameter is also used within block/)
+      end
+    end
+  end
+end
 
-      a.new.delegate_block(0, 1, b: 2) { |x| x }.should == [{b: 2}, [1]]
+describe "delegation with def(&)" do
+  it "delegates an anonymous block parameter" do
+    a = Class.new(DelegationSpecs::Target)
+    a.class_eval(<<-RUBY)
+    def delegate(&)
+      target(&)
+    end
+    RUBY
+
+    block = proc {}
+    a.new.delegate(&block).should == [[], {}, block]
+  end
+
+  ruby_version_is "3.3" do
+    context "within a block that accepts anonymous block within a method that accepts anonymous block" do
+      it "does not allow delegating a block" do
+        -> {
+          eval "def m(&); proc { |&| n(&) } end"
+        }.should raise_error(SyntaxError, /anonymous block parameter is also used within block/)
+      end
     end
   end
 end
diff --git a/spec/ruby/language/encoding_spec.rb b/spec/ruby/language/encoding_spec.rb
index 5430c9cb98cffd..e761a53cb69371 100644
--- a/spec/ruby/language/encoding_spec.rb
+++ b/spec/ruby/language/encoding_spec.rb
@@ -13,15 +13,15 @@
   end
 
   it "is the evaluated strings's one inside an eval" do
-    eval("__ENCODING__".force_encoding("US-ASCII")).should == Encoding::US_ASCII
-    eval("__ENCODING__".force_encoding("BINARY")).should == Encoding::BINARY
+    eval("__ENCODING__".dup.force_encoding("US-ASCII")).should == Encoding::US_ASCII
+    eval("__ENCODING__".dup.force_encoding("BINARY")).should == Encoding::BINARY
   end
 
   it "is the encoding specified by a magic comment inside an eval" do
-    code = "# encoding: BINARY\n__ENCODING__".force_encoding("US-ASCII")
+    code = "# encoding: BINARY\n__ENCODING__".dup.force_encoding("US-ASCII")
     eval(code).should == Encoding::BINARY
 
-    code = "# encoding: us-ascii\n__ENCODING__".force_encoding("BINARY")
+    code = "# encoding: us-ascii\n__ENCODING__".dup.force_encoding("BINARY")
     eval(code).should == Encoding::US_ASCII
   end
 
diff --git a/spec/ruby/language/ensure_spec.rb b/spec/ruby/language/ensure_spec.rb
index e893904bcb16d5..b76292c0075aeb 100644
--- a/spec/ruby/language/ensure_spec.rb
+++ b/spec/ruby/language/ensure_spec.rb
@@ -328,4 +328,19 @@ class EnsureInClassExample
 
     result.should == :begin
   end
+
+  ruby_version_is "3.4" do
+    it "does not introduce extra backtrace entries" do
+      def foo
+        begin
+          raise "oops"
+        ensure
+          return caller(0, 2) # rubocop:disable Lint/EnsureReturn
+        end
+      end
+      line = __LINE__
+      foo[0].should =~ /#{__FILE__}:#{line-3}:in 'foo'/
+      foo[1].should =~ /#{__FILE__}:#{line+2}:in 'block/
+    end
+  end
 end
diff --git a/spec/ruby/language/execution_spec.rb b/spec/ruby/language/execution_spec.rb
index 4e0310946dc3c5..51bcde62e8c745 100644
--- a/spec/ruby/language/execution_spec.rb
+++ b/spec/ruby/language/execution_spec.rb
@@ -5,6 +5,45 @@
     ip = 'world'
     `echo disc #{ip}`.should == "disc world\n"
   end
+
+  it "can be redefined and receive a frozen string as argument" do
+    called = false
+    runner = Object.new
+
+    runner.singleton_class.define_method(:`) do |str|
+      called = true
+
+      str.should == "test command"
+      str.frozen?.should == true
+    end
+
+    runner.instance_exec do
+      `test command`
+    end
+
+    called.should == true
+  end
+
+  it "the argument isn't frozen if it contains interpolation" do
+    called = false
+    runner = Object.new
+
+    runner.singleton_class.define_method(:`) do |str|
+      called = true
+
+      str.should == "test command"
+      str.frozen?.should == false
+      str << "mutated"
+    end
+
+    2.times do
+      runner.instance_exec do
+        `test #{:command}` # rubocop:disable Lint/LiteralInInterpolation
+      end
+    end
+
+    called.should == true
+  end
 end
 
 describe "%x" do
@@ -12,4 +51,43 @@
     ip = 'world'
     %x(echo disc #{ip}).should == "disc world\n"
   end
+
+  it "can be redefined and receive a frozen string as argument" do
+    called = false
+    runner = Object.new
+
+    runner.singleton_class.define_method(:`) do |str|
+      called = true
+
+      str.should == "test command"
+      str.frozen?.should == true
+    end
+
+    runner.instance_exec do
+      %x{test command}
+    end
+
+    called.should == true
+  end
+
+  it "the argument isn't frozen if it contains interpolation" do
+    called = false
+    runner = Object.new
+
+    runner.singleton_class.define_method(:`) do |str|
+      called = true
+
+      str.should == "test command"
+      str.frozen?.should == false
+      str << "mutated"
+    end
+
+    2.times do
+      runner.instance_exec do
+        %x{test #{:command}} # rubocop:disable Lint/LiteralInInterpolation
+      end
+    end
+
+    called.should == true
+  end
 end
diff --git a/spec/ruby/language/fixtures/class_with_class_variable.rb b/spec/ruby/language/fixtures/class_with_class_variable.rb
new file mode 100644
index 00000000000000..0b07f16d3027a1
--- /dev/null
+++ b/spec/ruby/language/fixtures/class_with_class_variable.rb
@@ -0,0 +1,9 @@
+module StringSpecs
+  class ClassWithClassVariable
+    @@a = "xxx"
+
+    def foo
+      "#@@a"
+    end
+  end
+end
diff --git a/spec/ruby/language/fixtures/defined.rb b/spec/ruby/language/fixtures/defined.rb
index a9552619bf2aeb..3761cfa5bd4087 100644
--- a/spec/ruby/language/fixtures/defined.rb
+++ b/spec/ruby/language/fixtures/defined.rb
@@ -285,6 +285,12 @@ def method_no_args
     end
   end
 
+  module ModuleWithConstMissing
+    def self.const_missing(const)
+      const
+    end
+  end
+
   class SuperWithIntermediateModules
     include IntermediateModule1
     include IntermediateModule2
diff --git a/spec/ruby/language/fixtures/delegation.rb b/spec/ruby/language/fixtures/delegation.rb
index 527d9283902723..da2b0247919759 100644
--- a/spec/ruby/language/fixtures/delegation.rb
+++ b/spec/ruby/language/fixtures/delegation.rb
@@ -1,7 +1,7 @@
 module DelegationSpecs
   class Target
-    def target(*args, **kwargs)
-      [args, kwargs]
+    def target(*args, **kwargs, &block)
+      [args, kwargs, block]
     end
 
     def target_block(*args, **kwargs)
diff --git a/spec/ruby/language/fixtures/private.rb b/spec/ruby/language/fixtures/private.rb
index 96f73cea3fd681..da3e0a97f9e1d3 100644
--- a/spec/ruby/language/fixtures/private.rb
+++ b/spec/ruby/language/fixtures/private.rb
@@ -43,17 +43,17 @@ def foo
     end
   end
 
-   class E
-     include D
-   end
-
-   class G
-     def foo
-       "foo"
-     end
-   end
-
-   class H < A
-     private :foo
-   end
+  class E
+    include D
+  end
+
+  class G
+    def foo
+      "foo"
+    end
+  end
+
+  class H < A
+    private :foo
+  end
 end
diff --git a/spec/ruby/language/fixtures/rescue/top_level.rb b/spec/ruby/language/fixtures/rescue/top_level.rb
new file mode 100644
index 00000000000000..59e78ef1d60eb2
--- /dev/null
+++ b/spec/ruby/language/fixtures/rescue/top_level.rb
@@ -0,0 +1,7 @@
+# capturing in local variable at top-level
+
+begin
+  raise "message"
+rescue => e
+  ScratchPad << e.message
+end
diff --git a/spec/ruby/language/fixtures/send.rb b/spec/ruby/language/fixtures/send.rb
index 918241e171137e..5d1d9da21439d2 100644
--- a/spec/ruby/language/fixtures/send.rb
+++ b/spec/ruby/language/fixtures/send.rb
@@ -43,9 +43,9 @@ class PrivateSetter
     attr_writer :foo
     private :foo=
 
-      def call_self_foo_equals(value)
-        self.foo = value
-      end
+    def call_self_foo_equals(value)
+      self.foo = value
+    end
 
     def call_self_foo_equals_masgn(value)
       a, self.foo = 1, value
diff --git a/spec/ruby/language/fixtures/super.rb b/spec/ruby/language/fixtures/super.rb
index 94a2a91be0df33..c5bdcf0e402780 100644
--- a/spec/ruby/language/fixtures/super.rb
+++ b/spec/ruby/language/fixtures/super.rb
@@ -539,6 +539,30 @@ def m(*args)
         args
       end
 
+      def m3(*args)
+        args
+      end
+
+      def m4(*args)
+        args
+      end
+
+      def m_default(*args)
+        args
+      end
+
+      def m_rest(*args)
+        args
+      end
+
+      def m_pre_default_rest_post(*args)
+        args
+      end
+
+      def m_kwrest(**kw)
+        kw
+      end
+
       def m_modified(*args)
         args
       end
@@ -549,6 +573,30 @@ def m(_, _)
         super
       end
 
+      def m3(_, _, _)
+        super
+      end
+
+      def m4(_, _, _, _)
+        super
+      end
+
+      def m_default(_ = 0)
+        super
+      end
+
+      def m_rest(*_)
+        super
+      end
+
+      def m_pre_default_rest_post(_, _, _=:a, _=:b, *_, _, _)
+        super
+      end
+
+      def m_kwrest(**_)
+        super
+      end
+
       def m_modified(_, _)
         _ = 14
         super
diff --git a/spec/ruby/language/for_spec.rb b/spec/ruby/language/for_spec.rb
index 0ad5ea88af98c9..b8ddfe5f0ddfb0 100644
--- a/spec/ruby/language/for_spec.rb
+++ b/spec/ruby/language/for_spec.rb
@@ -19,6 +19,27 @@
     end
   end
 
+  it "iterates over a list of arrays and destructures with an empty splat" do
+    for i, * in [[1,2]]
+      i.should == 1
+    end
+  end
+
+  it "iterates over a list of arrays and destructures with a splat" do
+    for i, *j in [[1,2]]
+      i.should == 1
+      j.should == [2]
+    end
+  end
+
+  it "iterates over a list of arrays and destructures with a splat and additional targets" do
+    for i, *j, k in [[1,2,3,4]]
+      i.should == 1
+      j.should == [2,3]
+      k.should == 4
+    end
+  end
+
   it "iterates over an Hash passing each key-value pair to the block" do
     k = 0
     l = 0
@@ -81,6 +102,88 @@ class OFor
     end
   end
 
+  it "allows a global variable as an iterator name" do
+    old_global_var = $var
+    m = [1,2,3]
+    n = 0
+    for $var in m
+      n += 1
+    end
+    $var.should == 3
+    n.should == 3
+    $var = old_global_var
+  end
+
+  it "allows an attribute as an iterator name" do
+    class OFor
+      attr_accessor :target
+    end
+
+    ofor = OFor.new
+    m = [1,2,3]
+    n = 0
+    for ofor.target in m
+      n += 1
+    end
+    ofor.target.should == 3
+    n.should == 3
+  end
+
+  # Segfault in MRI 3.3 and lower: https://bugs.ruby-lang.org/issues/20468
+  ruby_bug "#20468", ""..."3.4" do
+    it "allows an attribute with safe navigation as an iterator name" do
+      class OFor
+        attr_accessor :target
+      end
+
+      ofor = OFor.new
+      m = [1,2,3]
+      n = 0
+      eval <<~RUBY
+        for ofor&.target in m
+          n += 1
+        end
+      RUBY
+      ofor.target.should == 3
+      n.should == 3
+    end
+
+    it "allows an attribute with safe navigation on a nil base as an iterator name" do
+      ofor = nil
+      m = [1,2,3]
+      n = 0
+      eval <<~RUBY
+        for ofor&.target in m
+          n += 1
+        end
+      RUBY
+      ofor.should be_nil
+      n.should == 3
+    end
+  end
+
+  it "allows an array index writer as an iterator name" do
+    arr = [:a, :b, :c]
+    m = [1,2,3]
+    n = 0
+    for arr[1] in m
+      n += 1
+    end
+    arr.should == [:a, 3, :c]
+    n.should == 3
+  end
+
+  it "allows a hash index writer as an iterator name" do
+    hash = { a: 10, b: 20, c: 30 }
+    m = [1,2,3]
+    n = 0
+    for hash[:b] in m
+      n += 1
+    end
+    hash.should == { a: 10, b: 3, c: 30 }
+    n.should == 3
+  end
+
   # 1.9 behaviour verified by nobu in
   # http://redmine.ruby-lang.org/issues/show/2053
   it "yields only as many values as there are arguments" do
diff --git a/spec/ruby/language/hash_spec.rb b/spec/ruby/language/hash_spec.rb
index 9e2b9bd4c56ecd..668716e2e325da 100644
--- a/spec/ruby/language/hash_spec.rb
+++ b/spec/ruby/language/hash_spec.rb
@@ -33,7 +33,7 @@
   end
 
   it "freezes string keys on initialization" do
-    key = "foo"
+    key = +"foo"
     h = {key => "bar"}
     key.reverse!
     h["foo"].should == "bar"
@@ -60,14 +60,12 @@
     @h.should == {1000 => :foo}
   end
 
-  ruby_version_is "3.1" do
-    it "checks duplicated float keys on initialization" do
-      -> {
-        @h = eval "{1.0 => :bar, 1.0 => :foo}"
-      }.should complain(/key 1.0 is duplicated|duplicated key/)
-      @h.keys.size.should == 1
-      @h.should == {1.0 => :foo}
-    end
+  it "checks duplicated float keys on initialization" do
+    -> {
+      @h = eval "{1.0 => :bar, 1.0 => :foo}"
+    }.should complain(/key 1.0 is duplicated|duplicated key/)
+    @h.keys.size.should == 1
+    @h.should == {1.0 => :foo}
   end
 
   it "accepts a hanging comma" do
@@ -77,15 +75,39 @@
   end
 
   it "recognizes '=' at the end of the key" do
-    eval("{:a==>1}").should == {:"a=" => 1}
-    eval("{:a= =>1}").should == {:"a=" => 1}
-    eval("{:a= => 1}").should == {:"a=" => 1}
+    {:a==>1}.should == {:"a=" => 1}
+    {:a= =>1}.should == {:"a=" => 1}
+    {:a= => 1}.should == {:"a=" => 1}
   end
 
   it "with '==>' in the middle raises SyntaxError" do
     -> { eval("{:a ==> 1}") }.should raise_error(SyntaxError)
   end
 
+  it "recognizes '!' at the end of the key" do
+    {:a! =>1}.should == {:"a!" => 1}
+    {:a! => 1}.should == {:"a!" => 1}
+
+    {a!:1}.should == {:"a!" => 1}
+    {a!: 1}.should == {:"a!" => 1}
+  end
+
+  it "raises a SyntaxError if there is no space between `!` and `=>`" do
+    -> { eval("{:a!=> 1}") }.should raise_error(SyntaxError)
+  end
+
+  it "recognizes '?' at the end of the key" do
+    {:a? =>1}.should == {:"a?" => 1}
+    {:a? => 1}.should == {:"a?" => 1}
+
+    {a?:1}.should == {:"a?" => 1}
+    {a?: 1}.should == {:"a?" => 1}
+  end
+
+  it "raises a SyntaxError if there is no space between `?` and `=>`" do
+    -> { eval("{:a?=> 1}") }.should raise_error(SyntaxError)
+  end
+
   it "constructs a new hash with the given elements" do
     {foo: 123}.should == {foo: 123}
     h = {rbx: :cool, specs: 'fail_sometimes'}
@@ -105,7 +127,7 @@
 
   it "accepts mixed 'key: value', 'key => value' and '\"key\"': value' syntax" do
     h = {:a => 1, :b => 2, "c" => 3, :d => 4}
-    eval('{a: 1, :b => 2, "c" => 3, "d": 4}').should == h
+    {a: 1, :b => 2, "c" => 3, "d": 4}.should == h
   end
 
   it "expands an '**{}' element into the containing Hash literal initialization" do
@@ -127,6 +149,26 @@ def h.to_hash; {:b => 2, :c => 3}; end
     {a: 1, **h, c: 4}.should == {a: 1, b: 2, c: 4}
   end
 
+  ruby_version_is ""..."3.4" do
+    it "does not expand nil using ** into {} and raises TypeError" do
+      h = nil
+      -> { {a: 1, **h} }.should raise_error(TypeError, "no implicit conversion of nil into Hash")
+
+      -> { {a: 1, **nil} }.should raise_error(TypeError, "no implicit conversion of nil into Hash")
+    end
+  end
+
+  ruby_version_is "3.4" do
+    it "expands nil using ** into {}" do
+      h = nil
+      {**h}.should == {}
+      {a: 1, **h}.should == {a: 1}
+
+      {**nil}.should == {}
+      {a: 1, **nil}.should == {a: 1}
+    end
+  end
+
   it "expands an '**{}' or '**obj' element with the last key/value pair taking precedence" do
     -> {
       @h = eval "{a: 1, **{a: 2, b: 3, c: 1}, c: 3}"
@@ -191,20 +233,22 @@ def h.to_hash; {:b => 2, :c => 3}; end
     usascii_hash.keys.first.encoding.should == Encoding::US_ASCII
   end
 
-  it "raises an EncodingError at parse time when Symbol key with invalid bytes" do
-    ScratchPad.record []
-    -> {
-      eval 'ScratchPad << 1; {:"\xC3" => 1}'
-    }.should raise_error(EncodingError, 'invalid symbol in encoding UTF-8 :"\xC3"')
-    ScratchPad.recorded.should == []
-  end
+  ruby_bug "#20280", ""..."3.4" do
+    it "raises a SyntaxError at parse time when Symbol key with invalid bytes" do
+      ScratchPad.record []
+      -> {
+        eval 'ScratchPad << 1; {:"\xC3" => 1}'
+      }.should raise_error(SyntaxError, /invalid symbol/)
+      ScratchPad.recorded.should == []
+    end
 
-  it "raises an EncodingError at parse time when Symbol key with invalid bytes and 'key: value' syntax used" do
-    ScratchPad.record []
-    -> {
-      eval 'ScratchPad << 1; {"\xC3": 1}'
-    }.should raise_error(EncodingError, 'invalid symbol in encoding UTF-8 :"\xC3"')
-    ScratchPad.recorded.should == []
+    it "raises a SyntaxError at parse time when Symbol key with invalid bytes and 'key: value' syntax used" do
+      ScratchPad.record []
+      -> {
+        eval 'ScratchPad << 1; {"\xC3": 1}'
+      }.should raise_error(SyntaxError, /invalid symbol/)
+      ScratchPad.recorded.should == []
+    end
   end
 end
 
@@ -220,53 +264,61 @@ def m(**h)
     h.should == { one: 1, two: 2 }
   end
 
-  it "does not copy when calling a method taking a positional Hash" do
-    def m(h)
-      h.delete(:one); h
+  ruby_bug "#20012", ""..."3.3" do
+    it "makes a copy when calling a method taking a positional Hash" do
+      def m(h)
+        h.delete(:one); h
+      end
+
+      h = { one: 1, two: 2 }
+      m(**h).should == { two: 2 }
+      m(**h).should_not.equal?(h)
+      h.should == { one: 1, two: 2 }
     end
+  end
 
-    h = { one: 1, two: 2 }
-    m(**h).should == { two: 2 }
-    m(**h).should.equal?(h)
-    h.should == { two: 2 }
-  end
-
-  ruby_version_is "3.1" do
-    describe "hash with omitted value" do
-      it "accepts short notation 'key' for 'key: value' syntax" do
-        a, b, c = 1, 2, 3
-        h = eval('{a:}')
-        {a: 1}.should == h
-        h = eval('{a:, b:, c:}')
-        {a: 1, b: 2, c: 3}.should == h
-      end
+  describe "hash with omitted value" do
+    it "accepts short notation 'key' for 'key: value' syntax" do
+      a, b, c = 1, 2, 3
+      h = {a:}
+      {a: 1}.should == h
+      h = {a:, b:, c:}
+      {a: 1, b: 2, c: 3}.should == h
+    end
 
-      it "ignores hanging comma on short notation" do
-        a, b, c = 1, 2, 3
-        h = eval('{a:, b:, c:,}')
-        {a: 1, b: 2, c: 3}.should == h
-      end
+    it "ignores hanging comma on short notation" do
+      a, b, c = 1, 2, 3
+      h = {a:, b:, c:,}
+      {a: 1, b: 2, c: 3}.should == h
+    end
 
-      it "accepts mixed syntax" do
-        a, e = 1, 5
-        h = eval('{a:, b: 2, "c" => 3, :d => 4, e:}')
-        eval('{a: 1, :b => 2, "c" => 3, "d": 4, e: 5}').should == h
-      end
+    it "accepts mixed syntax" do
+      a, e = 1, 5
+      h = {a:, b: 2, "c" => 3, :d => 4, e:}
+      {a: 1, :b => 2, "c" => 3, "d": 4, e: 5}.should == h
+    end
 
-      it "works with methods and local vars" do
-        a = Class.new
-        a.class_eval(<<-RUBY)
-          def bar
-            "baz"
-          end
+    it "works with methods and local vars" do
+      a = Class.new
+      a.class_eval(<<-RUBY)
+        def bar
+          "baz"
+        end
 
-          def foo(val)
-            {bar:, val:}
-          end
-        RUBY
+        def foo(val)
+          {bar:, val:}
+        end
+      RUBY
 
-        a.new.foo(1).should == {bar: "baz", val: 1}
-      end
+      a.new.foo(1).should == {bar: "baz", val: 1}
+    end
+
+    it "raises a SyntaxError when the hash key ends with `!`" do
+      -> { eval("{a!:}") }.should raise_error(SyntaxError, /identifier a! is not valid to get/)
+    end
+
+    it "raises a SyntaxError when the hash key ends with `?`" do
+      -> { eval("{a?:}") }.should raise_error(SyntaxError, /identifier a\? is not valid to get/)
     end
   end
 end
diff --git a/spec/ruby/language/heredoc_spec.rb b/spec/ruby/language/heredoc_spec.rb
index b3b160fd11102d..47ee9c2c519086 100644
--- a/spec/ruby/language/heredoc_spec.rb
+++ b/spec/ruby/language/heredoc_spec.rb
@@ -106,4 +106,14 @@
     SquigglyHeredocSpecs.least_indented_on_the_first_line_single.should == "a\n  b\n    c\n"
     SquigglyHeredocSpecs.least_indented_on_the_last_line_single.should == "    a\n  b\nc\n"
   end
+
+  it "reports line numbers inside HEREDOC with method call" do
+    -> {
+      <<-HERE.chomp
+        a
+        b
+        #{c}
+      HERE
+    }.should raise_error(NameError) { |e| e.backtrace[0].should.start_with?("#{__FILE__}:#{__LINE__ - 2}") }
+  end
 end
diff --git a/spec/ruby/language/if_spec.rb b/spec/ruby/language/if_spec.rb
index a5da69600049c4..2d1a89f081f60a 100644
--- a/spec/ruby/language/if_spec.rb
+++ b/spec/ruby/language/if_spec.rb
@@ -305,6 +305,16 @@
       6.times(&b)
       ScratchPad.recorded.should == [4, 5, 4, 5]
     end
+
+    it "warns when Integer literals are used instead of predicates" do
+      -> {
+        eval <<~RUBY
+          $. = 0
+          10.times { |i| ScratchPad << i if 4..5 }
+        RUBY
+      }.should complain(/warning: integer literal in flip-flop/, verbose: true)
+      ScratchPad.recorded.should == []
+    end
   end
 
   describe "when a branch syntactically does not return a value" do
diff --git a/spec/ruby/language/keyword_arguments_spec.rb b/spec/ruby/language/keyword_arguments_spec.rb
index e2c816f62224af..4f6370d419e03b 100644
--- a/spec/ruby/language/keyword_arguments_spec.rb
+++ b/spec/ruby/language/keyword_arguments_spec.rb
@@ -87,13 +87,16 @@ def m(*a)
   end
 
   context "**" do
-    it "does not copy a non-empty Hash for a method taking (*args)" do
-      def m(*args)
-        args[0]
-      end
+    ruby_version_is "3.3" do
+      it "copies a non-empty Hash for a method taking (*args)" do
+        def m(*args)
+          args[0]
+        end
 
-      h = {a: 1}
-      m(**h).should.equal?(h)
+        h = {a: 1}
+        m(**h).should_not.equal?(h)
+        h.should == {a: 1}
+      end
     end
 
     it "copies the given Hash for a method taking (**kwargs)" do
@@ -320,76 +323,64 @@ def m(*args)
       m({a: 1}).should == [[{a: 1}], {}]
     end
 
-    ruby_version_is "3.1" do
-      describe "omitted values" do
-        it "accepts short notation 'key' for 'key: value' syntax" do
-          def m(a:, b:)
-            [a, b]
-          end
+    describe "omitted values" do
+      it "accepts short notation 'key' for 'key: value' syntax" do
+        def m(a:, b:)
+          [a, b]
+        end
 
-          a = 1
-          b = 2
+        a = 1
+        b = 2
 
-          eval('m(a:, b:).should == [1, 2]')
-        end
+        m(a:, b:).should == [1, 2]
       end
     end
 
-    ruby_version_is "3.2" do
-      it "does not work with call(*ruby2_keyword_args) with missing ruby2_keywords in between" do
-        class << self
-          def n(*args) # Note the missing ruby2_keywords here
-            target(*args)
-          end
+    it "does not work with call(*ruby2_keyword_args) with missing ruby2_keywords in between" do
+      class << self
+        def n(*args) # Note the missing ruby2_keywords here
+          target(*args)
+        end
 
-          ruby2_keywords def m(*args)
-            n(*args)
-          end
+        ruby2_keywords def m(*args)
+          n(*args)
         end
+      end
 
-        empty = {}
-        m(**empty).should == [[], {}]
-        m(empty).should == [[{}], {}]
+      empty = {}
+      m(**empty).should == [[], {}]
+      m(empty).should == [[{}], {}]
 
-        m(a: 1).should == [[{a: 1}], {}]
-        m({a: 1}).should == [[{a: 1}], {}]
-      end
+      m(a: 1).should == [[{a: 1}], {}]
+      m({a: 1}).should == [[{a: 1}], {}]
     end
+  end
 
-    ruby_version_is ""..."3.2" do
-      # https://bugs.ruby-lang.org/issues/18625
-      it "works with call(*ruby2_keyword_args) with missing ruby2_keywords in between due to CRuby bug #18625" do
-        class << self
-          def n(*args) # Note the missing ruby2_keywords here
-            target(*args)
-          end
-
-          ruby2_keywords def m(*args)
-            n(*args)
-          end
+  context "in define_method(name, &proc)" do
+    # This tests that a free-standing proc used in define_method and converted to ruby2_keywords adopts that logic.
+    # See jruby/jruby#8119 for a case where aggressive JIT optimization broke later ruby2_keywords changes.
+    it "works with ruby2_keywords" do
+      m = Class.new do
+        def bar(a, foo: nil)
+          [a, foo]
         end
 
-        empty = {}
-        m(**empty).should == [[], {}]
-        Hash.ruby2_keywords_hash?(empty).should == false
-        m(empty).should == [[{}], {}]
-        Hash.ruby2_keywords_hash?(empty).should == false
-
-        m(a: 1).should == [[], {a: 1}]
-        m({a: 1}).should == [[{a: 1}], {}]
+        # define_method and ruby2_keywords using send to avoid peephole optimizations
+        def self.setup
+          pr = make_proc
+          send :define_method, :foo, &pr
+          send :ruby2_keywords, :foo
+        end
 
-        kw = {a: 1}
+        # create proc in isolated method to force jit compilation on some implementations
+        def self.make_proc
+          proc { |a, *args| bar(a, *args) }
+        end
+      end
 
-        m(**kw).should == [[], {a: 1}]
-        m(**kw)[1].should == kw
-        m(**kw)[1].should_not.equal?(kw)
-        Hash.ruby2_keywords_hash?(kw).should == false
-        Hash.ruby2_keywords_hash?(m(**kw)[1]).should == false
+      m.setup
 
-        m(kw).should == [[{a: 1}], {}]
-        m(kw)[0][0].should.equal?(kw)
-        Hash.ruby2_keywords_hash?(kw).should == false
-      end
+      m.new.foo(1, foo:2).should == [1, 2]
     end
   end
 end
diff --git a/spec/ruby/language/lambda_spec.rb b/spec/ruby/language/lambda_spec.rb
index 3ab3569ebeb2ee..ed5a1c69e84b98 100644
--- a/spec/ruby/language/lambda_spec.rb
+++ b/spec/ruby/language/lambda_spec.rb
@@ -263,18 +263,21 @@ def create_lambda
     end
 
     describe "with circular optional argument reference" do
-      it "raises a SyntaxError if using an existing local with the same name as the argument" do
-        a = 1
-        -> {
-          @proc = eval "-> (a=a) { a }"
-        }.should raise_error(SyntaxError)
+      ruby_version_is ""..."3.4" do
+        it "raises a SyntaxError if using the argument in its default value" do
+          a = 1
+          -> {
+            eval "-> (a=a) { a }"
+          }.should raise_error(SyntaxError)
+        end
       end
 
-      it "raises a SyntaxError if there is an existing method with the same name as the argument" do
-        def a; 1; end
-        -> {
-          @proc = eval "-> (a=a) { a }"
-        }.should raise_error(SyntaxError)
+      ruby_version_is "3.4" do
+        it "is nil if using the argument in its default value" do
+          -> {
+            eval "-> (a=a) { a }.call"
+          }.call.should == nil
+        end
       end
 
       it "calls an existing method with the same name as the argument if explicitly using ()" do
diff --git a/spec/ruby/language/method_spec.rb b/spec/ruby/language/method_spec.rb
index 5f42c523413f57..1d412a133edc30 100644
--- a/spec/ruby/language/method_spec.rb
+++ b/spec/ruby/language/method_spec.rb
@@ -1175,6 +1175,31 @@ def m(a = nil, b = {}, v: false)
   end
 end
 
+context "when passing **nil into a method that accepts keyword arguments" do
+  ruby_version_is ""..."3.4" do
+    it "raises TypeError" do
+      def m(**kw) kw; end
+
+      h = nil
+      -> { m(a: 1, **h) }.should raise_error(TypeError, "no implicit conversion of nil into Hash")
+      -> { m(a: 1, **nil) }.should raise_error(TypeError, "no implicit conversion of nil into Hash")
+    end
+  end
+
+  ruby_version_is "3.4" do
+    it "expands nil using ** into {}" do
+      def m(**kw) kw; end
+
+      h = nil
+      m(**h).should == {}
+      m(a: 1, **h).should == {a: 1}
+
+      m(**nil).should == {}
+      m(a: 1, **nil).should == {a: 1}
+    end
+  end
+end
+
 describe "A method call with a space between method name and parentheses" do
   before(:each) do
     def m(*args)
@@ -1335,6 +1360,7 @@ def m(n) =
     end
   end
 
+  # tested more thoroughly in language/delegation_spec.rb
   context "with args forwarding" do
     evaluate <<-ruby do
         def mm(word, num:)
@@ -1415,53 +1441,49 @@ def foo(a, b, c, key: 1)
   end
 end
 
-ruby_version_is "3.1" do
-  describe "kwarg with omitted value in a method call" do
-    context "accepts short notation 'kwarg' in method call" do
-      evaluate <<-ruby do
-          def call(*args, **kwargs) = [args, kwargs]
-        ruby
+describe "kwarg with omitted value in a method call" do
+  context "accepts short notation 'kwarg' in method call" do
+    evaluate <<-ruby do
+        def call(*args, **kwargs) = [args, kwargs]
+      ruby
 
-        a, b, c = 1, 2, 3
-        arr, h = eval('call a:')
-        h.should == {a: 1}
-        arr.should == []
+      a, b, c = 1, 2, 3
+      arr, h = call(a:)
+      h.should == {a: 1}
+      arr.should == []
 
-        arr, h = eval('call(a:, b:, c:)')
-        h.should == {a: 1, b: 2, c: 3}
-        arr.should == []
+      arr, h = call(a:, b:, c:)
+      h.should == {a: 1, b: 2, c: 3}
+      arr.should == []
 
-        arr, h = eval('call(a:, b: 10, c:)')
-        h.should == {a: 1, b: 10, c: 3}
-        arr.should == []
-      end
+      arr, h = call(a:, b: 10, c:)
+      h.should == {a: 1, b: 10, c: 3}
+      arr.should == []
     end
+  end
 
-    context "with methods and local variables" do
-      evaluate <<-ruby do
-          def call(*args, **kwargs) = [args, kwargs]
+  context "with methods and local variables" do
+    evaluate <<-ruby do
+        def call(*args, **kwargs) = [args, kwargs]
 
-          def bar
-            "baz"
-          end
+        def bar
+          "baz"
+        end
 
-          def foo(val)
-            call bar:, val:
-          end
-        ruby
+        def foo(val)
+          call bar:, val:
+        end
+      ruby
 
-        foo(1).should == [[], {bar: "baz", val: 1}]
-      end
+      foo(1).should == [[], {bar: "baz", val: 1}]
     end
   end
+end
 
-  describe "Inside 'endless' method definitions" do
-    it "allows method calls without parenthesis" do
-      eval <<-ruby
-        def greet(person) = "Hi, ".concat person
-      ruby
+describe "Inside 'endless' method definitions" do
+  it "allows method calls without parenthesis" do
+    def greet(person) = "Hi, ".dup.concat person
 
-      greet("Homer").should == "Hi, Homer"
-    end
+    greet("Homer").should == "Hi, Homer"
   end
 end
diff --git a/spec/ruby/language/module_spec.rb b/spec/ruby/language/module_spec.rb
index fffcf9c90db9ac..4db00bd7fb9e66 100644
--- a/spec/ruby/language/module_spec.rb
+++ b/spec/ruby/language/module_spec.rb
@@ -26,20 +26,15 @@ module m::N; end
   it "reopens an existing module" do
     module ModuleSpecs; Reopened = true; end
     ModuleSpecs::Reopened.should be_true
+  ensure
+    ModuleSpecs.send(:remove_const, :Reopened)
   end
 
-  ruby_version_is '3.2' do
-    it "does not reopen a module included in Object" do
-      module IncludedModuleSpecs; Reopened = true; end
-      ModuleSpecs::IncludedInObject::IncludedModuleSpecs.should_not == Object::IncludedModuleSpecs
-    end
-  end
-
-  ruby_version_is ''...'3.2' do
-    it "reopens a module included in Object" do
-      module IncludedModuleSpecs; Reopened = true; end
-      ModuleSpecs::IncludedInObject::IncludedModuleSpecs::Reopened.should be_true
-    end
+  it "does not reopen a module included in Object" do
+    module IncludedModuleSpecs; Reopened = true; end
+    ModuleSpecs::IncludedInObject::IncludedModuleSpecs.should_not == Object::IncludedModuleSpecs
+  ensure
+    IncludedModuleSpecs.send(:remove_const, :Reopened)
   end
 
   it "raises a TypeError if the constant is a Class" do
@@ -76,6 +71,8 @@ module ModuleSpecs::Modules::Klass; end
 
     ::ModuleSpecs_CS1 = mod
     mod.name.should == "ModuleSpecs_CS1"
+  ensure
+    Object.send(:remove_const, :ModuleSpecs_CS1)
   end
 
   it "sets the name of a module scoped by an anonymous module" do
@@ -96,5 +93,7 @@ module ModuleSpecs::Modules::Klass; end
     b.name.should == "ModuleSpecs_CS2::B"
     c.name.should == "ModuleSpecs_CS2::B::C"
     d.name.should == "ModuleSpecs_CS2::D"
+  ensure
+    Object.send(:remove_const, :ModuleSpecs_CS2)
   end
 end
diff --git a/spec/ruby/language/numbered_parameters_spec.rb b/spec/ruby/language/numbered_parameters_spec.rb
index 9d2bd7ff92467b..39ddd6fee83e19 100644
--- a/spec/ruby/language/numbered_parameters_spec.rb
+++ b/spec/ruby/language/numbered_parameters_spec.rb
@@ -22,7 +22,7 @@
   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'/)
+    }.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
@@ -82,6 +82,28 @@
     lambda { _9 }.arity.should == 9
   end
 
+  it "affects block parameters" do
+    -> { _1 }.parameters.should == [[:req, :_1]]
+    -> { _2 }.parameters.should == [[:req, :_1], [:req, :_2]]
+
+    proc { _1 }.parameters.should == [[:opt, :_1]]
+    proc { _2 }.parameters.should == [[:opt, :_1], [:opt, :_2]]
+  end
+
+  ruby_version_is ""..."3.5" do
+    it "affects binding local variables" do
+      -> { _1; binding.local_variables }.call("a").should == [:_1]
+      -> { _2; binding.local_variables }.call("a", "b").should == [:_1, :_2]
+    end
+  end
+
+  ruby_version_is "3.5" do
+    it "does not affect binding local variables" do
+      -> { _1; binding.local_variables }.call("a").should == []
+      -> { _2; binding.local_variables }.call("a", "b").should == []
+    end
+  end
+
   it "does not work in methods" do
     obj = Object.new
     def obj.foo; _1 end
diff --git a/spec/ruby/language/optional_assignments_spec.rb b/spec/ruby/language/optional_assignments_spec.rb
index 02461655d6fba5..5fe3e3671b4c32 100644
--- a/spec/ruby/language/optional_assignments_spec.rb
+++ b/spec/ruby/language/optional_assignments_spec.rb
@@ -57,7 +57,7 @@
       end
     end
 
-    describe 'using a accessor' do
+    describe 'using an accessor' do
       before do
         klass = Class.new { attr_accessor :b }
         @a    = klass.new
@@ -103,6 +103,16 @@
         @a.b.should == 10
       end
 
+      it 'does evaluate receiver only once when assigns' do
+        ScratchPad.record []
+        @a.b = nil
+
+        (ScratchPad << :evaluated; @a).b ||= 10
+
+        ScratchPad.recorded.should == [:evaluated]
+        @a.b.should == 10
+      end
+
       it 'returns the new value if set to false' do
         def @a.b=(x)
           :v
@@ -122,29 +132,148 @@ def @a.b=(x)
         (@a.b ||= 20).should == 10
       end
 
-      it 'works when writer is private' do
+      it 'ignores method visibility when receiver is self' do
+        klass_with_private_methods = Class.new do
+          def initialize(v) @a = v end
+          def public_method(v); self.a ||= v end
+          private
+          def a; @a end
+          def a=(v) @a = v; 42 end
+        end
+
+        a = klass_with_private_methods.new(false)
+        a.public_method(10).should == 10
+      end
+    end
+
+    describe 'using a #[]' do
+      before do
+        @a = {}
         klass = Class.new do
-          def t
-            self.b = false
-            (self.b ||= 10).should == 10
-            (self.b ||= 20).should == 10
+          def [](k)
+            @hash ||= {}
+            @hash[k]
+          end
+
+          def []=(k, v)
+            @hash ||= {}
+            @hash[k] = v
+            7
           end
+        end
+        @b = klass.new
+      end
+
+      it 'returns the assigned value, not the result of the []= method with ||=' do
+        (@b[:k] ||= 12).should == 12
+      end
+
+      it "evaluates the index precisely once" do
+        ary = [:x, :y]
+        @a[:x] = 15
+        @a[ary.pop] ||= 25
+        ary.should == [:x]
+        @a.should == { x: 15, y: 25 }
+      end
 
-          def b
-            @b
+      it "evaluates the index arguments in the correct order" do
+        ary = Class.new(Array) do
+          def [](x, y)
+            super(x + 3 * y)
           end
 
-          def b=(x)
-            @b = x
-            :v
+          def []=(x, y, value)
+            super(x + 3 * y, value)
           end
+        end.new
+        ary[0, 0] = 1
+        ary[1, 0] = 1
+        ary[2, 0] = nil
+        ary[3, 0] = 1
+        ary[4, 0] = 1
+        ary[5, 0] = 1
+        ary[6, 0] = nil
+
+        foo = [0, 2]
+
+        ary[foo.pop, foo.pop] ||= 2 # expected `ary[2, 0] ||= 2`
+
+        ary[2, 0].should == 2
+        ary[6, 0].should == nil # returns the same element as `ary[0, 2]`
+      end
+
+      it 'evaluates receiver only once when assigns' do
+        ScratchPad.record []
+        @a[:k] = nil
 
-          private :b=
+        (ScratchPad << :evaluated; @a)[:k] ||= 2
+
+        ScratchPad.recorded.should == [:evaluated]
+        @a[:k].should == 2
+      end
+
+      it 'ignores method visibility when receiver is self' do
+        klass_with_private_methods = Class.new do
+          def initialize(h) @a = h end
+          def public_method(k, v); self[k] ||= v end
+          private
+          def [](k) @a[k] end
+          def []=(k, v) @a[k] = v; 42 end
         end
 
-        klass.new.t
+        a = klass_with_private_methods.new(k: false)
+        a.public_method(:k, 10).should == 10
       end
 
+      context 'splatted argument' do
+        it 'correctly handles it' do
+          (@b[*[:m]] ||= 10).should == 10
+          @b[:m].should == 10
+
+          (@b[*(1; [:n])] ||= 10).should == 10
+          @b[:n].should == 10
+
+          (@b[*begin 1; [:k] end] ||= 10).should == 10
+          @b[:k].should == 10
+        end
+
+        it 'calls #to_a only once' do
+          k = Object.new
+          def k.to_a
+            ScratchPad << :to_a
+            [:k]
+          end
+
+          ScratchPad.record []
+          (@b[*k] ||= 20).should == 20
+          @b[:k].should == 20
+          ScratchPad.recorded.should == [:to_a]
+        end
+
+        it 'correctly handles a nested splatted argument' do
+          (@b[*[*[:k]]] ||= 20).should == 20
+          @b[:k].should == 20
+        end
+
+        it 'correctly handles multiple nested splatted arguments' do
+          klass_with_multiple_parameters = Class.new do
+            def [](k1, k2, k3)
+              @hash ||= {}
+              @hash[:"#{k1}#{k2}#{k3}"]
+            end
+
+            def []=(k1, k2, k3, v)
+              @hash ||= {}
+              @hash[:"#{k1}#{k2}#{k3}"] = v
+              7
+            end
+          end
+          a = klass_with_multiple_parameters.new
+
+          (a[*[:a], *[:b], *[:c]] ||= 20).should == 20
+          a[:a, :b, :c].should == 20
+        end
+      end
     end
   end
 
@@ -191,7 +320,7 @@ def b=(x)
       end
     end
 
-    describe 'using a single variable' do
+    describe 'using an accessor' do
       before do
         klass = Class.new { attr_accessor :b }
         @a    = klass.new
@@ -236,6 +365,29 @@ def b=(x)
 
         @a.b.should == 20
       end
+
+      it 'does evaluate receiver only once when assigns' do
+        ScratchPad.record []
+        @a.b = 10
+
+        (ScratchPad << :evaluated; @a).b &&= 20
+
+        ScratchPad.recorded.should == [:evaluated]
+        @a.b.should == 20
+      end
+
+      it 'ignores method visibility when receiver is self' do
+        klass_with_private_methods = Class.new do
+          def initialize(v) @a = v end
+          def public_method(v); self.a &&= v end
+          private
+          def a; @a end
+          def a=(v) @a = v; 42 end
+        end
+
+        a = klass_with_private_methods.new(true)
+        a.public_method(10).should == 10
+      end
     end
 
     describe 'using a #[]' do
@@ -297,17 +449,15 @@ def []=(k, v)
       end
 
       it 'returns the assigned value, not the result of the []= method with ||=' do
-        (@b[:k] ||= 12).should == 12
-      end
-
-      it 'correctly handles a splatted argument for the index' do
-        (@b[*[:k]] ||= 12).should == 12
+        @b[:k] = 10
+        (@b[:k] &&= 12).should == 12
       end
 
       it "evaluates the index precisely once" do
         ary = [:x, :y]
         @a[:x] = 15
-        @a[ary.pop] ||= 25
+        @a[:y] = 20
+        @a[ary.pop] &&= 25
         ary.should == [:x]
         @a.should == { x: 15, y: 25 }
       end
@@ -324,24 +474,103 @@ def []=(x, y, value)
         end.new
         ary[0, 0] = 1
         ary[1, 0] = 1
-        ary[2, 0] = nil
+        ary[2, 0] = 1
         ary[3, 0] = 1
         ary[4, 0] = 1
         ary[5, 0] = 1
-        ary[6, 0] = nil
+        ary[6, 0] = 1
 
         foo = [0, 2]
 
-        ary[foo.pop, foo.pop] ||= 2
+        ary[foo.pop, foo.pop] &&= 2 # expected `ary[2, 0] &&= 2`
 
         ary[2, 0].should == 2
-        ary[6, 0].should == nil
+        ary[6, 0].should == 1 # returns the same element as `ary[0, 2]`
+      end
+
+      it 'evaluates receiver only once when assigns' do
+        ScratchPad.record []
+        @a[:k] = 1
+
+        (ScratchPad << :evaluated; @a)[:k] &&= 2
+
+        ScratchPad.recorded.should == [:evaluated]
+        @a[:k].should == 2
       end
 
       it 'returns the assigned value, not the result of the []= method with +=' do
         @b[:k] = 17
         (@b[:k] += 12).should == 29
       end
+
+      it 'ignores method visibility when receiver is self' do
+        klass_with_private_methods = Class.new do
+          def initialize(h) @a = h end
+          def public_method(k, v); self[k] &&= v end
+          private
+          def [](k) @a[k] end
+          def []=(k, v) @a[k] = v; 42 end
+        end
+
+        a = klass_with_private_methods.new(k: true)
+        a.public_method(:k, 10).should == 10
+      end
+
+      context 'splatted argument' do
+        it 'correctly handles it' do
+          @b[:m] = 0
+          (@b[*[:m]] &&= 10).should == 10
+          @b[:m].should == 10
+
+          @b[:n] = 0
+          (@b[*(1; [:n])] &&= 10).should == 10
+          @b[:n].should == 10
+
+          @b[:k] = 0
+          (@b[*begin 1; [:k] end] &&= 10).should == 10
+          @b[:k].should == 10
+        end
+
+        it 'calls #to_a only once' do
+          k = Object.new
+          def k.to_a
+            ScratchPad << :to_a
+            [:k]
+          end
+
+          ScratchPad.record []
+          @b[:k] = 10
+          (@b[*k] &&= 20).should == 20
+          @b[:k].should == 20
+          ScratchPad.recorded.should == [:to_a]
+        end
+
+        it 'correctly handles a nested splatted argument' do
+          @b[:k] = 10
+          (@b[*[*[:k]]] &&= 20).should == 20
+          @b[:k].should == 20
+        end
+
+        it 'correctly handles multiple nested splatted arguments' do
+          klass_with_multiple_parameters = Class.new do
+            def [](k1, k2, k3)
+              @hash ||= {}
+              @hash[:"#{k1}#{k2}#{k3}"]
+            end
+
+            def []=(k1, k2, k3, v)
+              @hash ||= {}
+              @hash[:"#{k1}#{k2}#{k3}"] = v
+              7
+            end
+          end
+          a = klass_with_multiple_parameters.new
+
+          a[:a, :b, :c] = 10
+          (a[*[:a], *[:b], *[:c]] &&= 20).should == 20
+          a[:a, :b, :c].should == 20
+        end
+      end
     end
   end
 
@@ -434,7 +663,7 @@ module ConstantSpecs
       ConstantSpecs::ClassA::OR_ASSIGNED_CONSTANT2.should == :assigned
     end
 
-    it 'causes side-effects of the module part to be applied (for nil constant)' do
+    it 'causes side-effects of the module part to be applied only once (for nil constant)' do
       suppress_warning do # already initialized constant
       ConstantSpecs::ClassA::NIL_OR_ASSIGNED_CONSTANT2 = nil
       x = 0
@@ -469,6 +698,8 @@ module ConstantSpecs
       x.should == 1
       y.should == 0
       ConstantSpecs::ClassA::NIL_OR_ASSIGNED_CONSTANT3.should == nil
+    ensure
+      ConstantSpecs::ClassA.send(:remove_const, :NIL_OR_ASSIGNED_CONSTANT3)
     end
   end
 
@@ -492,5 +723,20 @@ module ConstantSpecs
       ConstantSpecs::OpAssignFalse.should == false
       ConstantSpecs.send :remove_const, :OpAssignFalse
     end
+
+    it 'causes side-effects of the module part to be applied only once (when assigns)' do
+      module ConstantSpecs
+        OpAssignTrue = true
+      end
+
+      suppress_warning do # already initialized constant
+        x = 0
+        (x += 1; ConstantSpecs)::OpAssignTrue &&= :assigned
+        x.should == 1
+        ConstantSpecs::OpAssignTrue.should == :assigned
+      end
+
+      ConstantSpecs.send :remove_const, :OpAssignTrue
+    end
   end
 end
diff --git a/spec/ruby/language/pattern_matching_spec.rb b/spec/ruby/language/pattern_matching_spec.rb
index 050a8a052d2e53..cb4f5864d78672 100644
--- a/spec/ruby/language/pattern_matching_spec.rb
+++ b/spec/ruby/language/pattern_matching_spec.rb
@@ -1,155 +1,143 @@
 require_relative '../spec_helper'
 
 describe "Pattern matching" do
-  # TODO: Remove excessive eval calls when Ruby 3 is the minimum version.
-  # It is best to keep the eval's longer if other Ruby impls cannot parse pattern matching yet.
-
   before :each do
     ScratchPad.record []
   end
 
-  describe "can be standalone assoc operator that" do
+  describe "Rightward assignment (`=>`) that can be standalone assoc operator that" do
     it "deconstructs value" do
       suppress_warning do
-        eval(<<-RUBY).should == [0, 1]
-          [0, 1] => [a, b]
-          [a, b]
-        RUBY
+        [0, 1] => [a, b]
+        [a, b].should == [0, 1]
       end
     end
 
     it "deconstructs value and properly scopes variables" do
       suppress_warning do
-        eval(<<-RUBY).should == [0, nil]
-          a = nil
-          eval(<<-PATTERN)
-            [0, 1] => [a, b]
-          PATTERN
-          [a, defined?(b)]
-        RUBY
+        a = nil
+        1.times {
+          [0, 1] => [a, b]
+        }
+        [a, defined?(b)].should == [0, nil]
       end
     end
+
+    it "can work with keywords" do
+      { a: 0, b: 1 } => { a:, b: }
+      [a, b].should == [0, 1]
+    end
+  end
+
+  describe "One-line pattern matching" do
+    it "can be used to check if a pattern matches for Array-like entities" do
+      ([0, 1] in [a, b]).should == true
+      ([0, 1] in [a, b, c]).should == false
+    end
+
+    it "can be used to check if a pattern matches for Hash-like entities" do
+      ({ a: 0, b: 1 } in { a:, b: }).should == true
+      ({ a: 0, b: 1 } in { a:, b:, c: }).should == false
+    end
   end
 
   describe "find pattern" do
     it "captures preceding elements to the pattern" do
-      eval(<<~RUBY).should == [0, 1]
-        case [0, 1, 2, 3]
-        in [*pre, 2, 3]
-          pre
-        else
-          false
-        end
-      RUBY
+      case [0, 1, 2, 3]
+      in [*pre, 2, 3]
+        pre
+      else
+        false
+      end.should == [0, 1]
     end
 
     it "captures following elements to the pattern" do
-      eval(<<~RUBY).should == [2, 3]
-        case [0, 1, 2, 3]
-        in [0, 1, *post]
-          post
-        else
-          false
-        end
-      RUBY
+      case [0, 1, 2, 3]
+      in [0, 1, *post]
+        post
+      else
+        false
+      end.should == [2, 3]
     end
 
     it "captures both preceding and following elements to the pattern" do
-      eval(<<~RUBY).should == [[0, 1], [3, 4]]
-        case [0, 1, 2, 3, 4]
-        in [*pre, 2, *post]
-          [pre, post]
-        else
-          false
-        end
-      RUBY
+      case [0, 1, 2, 3, 4]
+      in [*pre, 2, *post]
+        [pre, post]
+      else
+        false
+      end.should == [[0, 1], [3, 4]]
     end
 
     it "can capture the entirety of the pattern" do
-      eval(<<~RUBY).should == [0, 1, 2, 3, 4]
-        case [0, 1, 2, 3, 4]
-        in [*everything]
-          everything
-        else
-          false
-        end
-      RUBY
+      case [0, 1, 2, 3, 4]
+      in [*everything]
+        everything
+      else
+        false
+      end.should == [0, 1, 2, 3, 4]
     end
 
     it "will match an empty Array-like structure" do
-      eval(<<~RUBY).should == []
-        case []
-        in [*everything]
-          everything
-        else
-          false
-        end
-      RUBY
+      case []
+      in [*everything]
+        everything
+      else
+        false
+      end.should == []
     end
 
     it "can be nested" do
-      eval(<<~RUBY).should == [[0, [2, 4, 6]], [[4, 16, 64]], 27]
-        case [0, [2, 4, 6], [3, 9, 27], [4, 16, 64]]
-        in [*pre, [*, 9, a], *post]
-          [pre, post, a]
-        else
-          false
-        end
-      RUBY
+      case [0, [2, 4, 6], [3, 9, 27], [4, 16, 64]]
+      in [*pre, [*, 9, a], *post]
+        [pre, post, a]
+      else
+        false
+      end.should == [[0, [2, 4, 6]], [[4, 16, 64]], 27]
     end
 
     it "can be nested with an array pattern" do
-      eval(<<~RUBY).should == [[4, 16, 64]]
-        case [0, [2, 4, 6], [3, 9, 27], [4, 16, 64]]
-        in [_, _, [*, 9, *], *post]
-          post
-        else
-          false
-        end
-      RUBY
+      case [0, [2, 4, 6], [3, 9, 27], [4, 16, 64]]
+      in [_, _, [*, 9, *], *post]
+        post
+      else
+        false
+      end.should == [[4, 16, 64]]
     end
 
     it "can be nested within a hash pattern" do
-      eval(<<~RUBY).should == [27]
-        case {a: [3, 9, 27]}
-        in {a: [*, 9, *post]}
-          post
-        else
-          false
-        end
-      RUBY
+      case {a: [3, 9, 27]}
+      in {a: [*, 9, *post]}
+        post
+      else
+        false
+      end.should == [27]
     end
 
     it "can nest hash and array patterns" do
-      eval(<<~RUBY).should == [42, 2]
-        case [0, {a: 42, b: [0, 1]}, {a: 42, b: [1, 2]}]
-        in [*, {a:, b: [1, c]}, *]
-          [a, c]
-        else
-          false
-        end
-      RUBY
+      case [0, {a: 42, b: [0, 1]}, {a: 42, b: [1, 2]}]
+      in [*, {a:, b: [1, c]}, *]
+        [a, c]
+      else
+        false
+      end.should == [42, 2]
     end
   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
+    case [0, 1]
+    in [0]
+      :foo
+    in [0, 1]
+      :bar
+    end.should == :bar
   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
+    case [0, 1]
+    in [0] then :foo
+    in [0, 1] then :bar
+    end.should == :bar
   end
 
   describe "warning" do
@@ -176,27 +164,17 @@
         @src = '[0, 1] => [a, b]'
       end
 
-      ruby_version_is ""..."3.1" do
-        it "warns about pattern matching is experimental feature" do
-          -> { eval @src }.should complain(/pattern matching is experimental, and the behavior may change in future versions of Ruby!/i)
-        end
-      end
-
-      ruby_version_is "3.1" do
-        it "does not warn about pattern matching is experimental feature" do
-          -> { eval @src }.should_not complain
-        end
+      it "does not warn about pattern matching is experimental feature" do
+        -> { eval @src }.should_not complain
       end
     end
   end
 
   it "binds variables" do
-    eval(<<~RUBY).should == 1
-      case [0, 1]
-      in [0, a]
-        a
-      end
-    RUBY
+    case [0, 1]
+    in [0, a]
+      a
+    end.should == 1
   end
 
   it "cannot mix in and when operators" do
@@ -207,7 +185,7 @@
         in []
         end
       RUBY
-    }.should raise_error(SyntaxError, /syntax error, unexpected `in'|\(eval\):3: syntax error, unexpected keyword_in/)
+    }.should raise_error(SyntaxError, /syntax error, unexpected `in'|\(eval\):3: syntax error, unexpected keyword_in|unexpected 'in'/)
 
     -> {
       eval <<~RUBY
@@ -216,51 +194,50 @@
         when 1 == 1
         end
       RUBY
-    }.should raise_error(SyntaxError, /syntax error, unexpected `when'|\(eval\):3: syntax error, unexpected keyword_when/)
+    }.should raise_error(SyntaxError, /syntax error, unexpected `when'|\(eval\):3: syntax error, unexpected keyword_when|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
+    case [0, 1]
+    in [0]
+      :foo
+    in [0, 1]
+      :bar
+    in [0, 1]
+      :baz
+    end.should == :bar
   end
 
   it "executes else clause if no pattern matches" do
-    eval(<<~RUBY).should == false
-      case [0, 1]
-      in [0]
-        true
-      else
-        false
-      end
-    RUBY
+    case [0, 1]
+    in [0]
+      true
+    else
+      false
+    end.should == false
   end
 
   it "raises NoMatchingPatternError if no pattern matches and no else clause" do
     -> {
-      eval <<~RUBY
-        case [0, 1]
-        in [0]
-        end
-      RUBY
+      case [0, 1]
+      in [0]
+      end
     }.should raise_error(NoMatchingPatternError, /\[0, 1\]/)
+
+    error_pattern = ruby_version_is("3.4") ? /\{a: 0, b: 1\}/ : /\{:a=>0, :b=>1\}/
+    -> {
+      case {a: 0, b: 1}
+      in a: 1, b: 1
+      end
+    }.should raise_error(NoMatchingPatternError, error_pattern)
   end
 
   it "raises NoMatchingPatternError if no pattern matches and evaluates the expression only once" do
     evals = 0
     -> {
-      eval <<~RUBY
-        case (evals += 1; [0, 1])
-        in [0]
-        end
-      RUBY
+      case (evals += 1; [0, 1])
+      in [0]
+      end
     }.should raise_error(NoMatchingPatternError, /\[0, 1\]/)
     evals.should == 1
   end
@@ -273,230 +250,185 @@
           true
         end
       RUBY
-    }.should raise_error(SyntaxError, /unexpected/)
+    }.should raise_error(SyntaxError, /unexpected|expected a delimiter after the patterns of an `in` clause/)
   end
 
   it "evaluates the case expression once for multiple patterns, caching the result" do
-    eval(<<~RUBY).should == true
-      case (ScratchPad << :foo; 1)
-      in 0
-        false
-      in 1
-        true
-      end
-    RUBY
+    case (ScratchPad << :foo; 1)
+    in 0
+      false
+    in 1
+      true
+    end.should == true
 
     ScratchPad.recorded.should == [:foo]
   end
 
   describe "guards" do
     it "supports if guard" do
-      eval(<<~RUBY).should == false
-        case 0
-        in 0 if false
-          true
-        else
-          false
-        end
-      RUBY
+      case 0
+      in 0 if false
+        true
+      else
+        false
+      end.should == false
 
-      eval(<<~RUBY).should == true
-        case 0
-        in 0 if true
-          true
-        else
-          false
-        end
-      RUBY
+      case 0
+      in 0 if true
+        true
+      else
+        false
+      end.should == true
     end
 
     it "supports unless guard" do
-      eval(<<~RUBY).should == false
-        case 0
-        in 0 unless true
-          true
-        else
-          false
-        end
-      RUBY
+      case 0
+      in 0 unless true
+        true
+      else
+        false
+      end.should == false
 
-      eval(<<~RUBY).should == true
-        case 0
-        in 0 unless false
-          true
-        else
-          false
-        end
-      RUBY
+      case 0
+      in 0 unless false
+        true
+      else
+        false
+      end.should == true
     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
+      case [0, 1]
+      in [a, 1] if a >= 0
+        true
+      end.should == true
     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
+      case 0
+      in 1 if (ScratchPad << :foo) || true
+      else
+      end
 
       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
+      case 0
+      in 0 if false
+        :foo
+      in 0 if true
+        :bar
+      end.should == :bar
     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
+      case 0
+      in 0 if false
+        true
+      else
+        false
+      end.should == false
     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
+        case [0, 1]
+        in [0, 1] if false
+        end
       }.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
+      case 0
+      in 0
+        true
+      end.should == true
 
-      eval(<<~RUBY).should == true
-        case 0
-        in (-1..1)
-          true
-        end
-      RUBY
+      case 0
+      in (
+        -1..1)
+        true
+      end.should == true
 
-      eval(<<~RUBY).should == true
-        case 0
-        in Integer
-          true
-        end
-      RUBY
+      case 0
+      in Integer
+        true
+      end.should == true
 
-      eval(<<~RUBY).should == true
-        case "0"
-        in /0/
-          true
-        end
-      RUBY
+      case "0"
+      in /0/
+        true
+      end.should == true
 
-      eval(<<~RUBY).should == true
-        case "0"
-        in ->(s) { s == "0" }
-          true
-        end
-      RUBY
+      case "0"
+      in -> s { s == "0" }
+        true
+      end.should == true
     end
 
     it "allows string literal with interpolation" do
       x = "x"
 
-      eval(<<~RUBY).should == true
-        case "x"
-        in "#{x + ""}"
-          true
-        end
-      RUBY
+      case "x"
+      in "#{x + ""}"
+        true
+      end.should == true
     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
+      case 0
+      in a
+        a
+      end.should == 0
     end
 
     it "makes bounded variable visible outside a case statement scope" do
-      eval(<<~RUBY).should == 0
-        case 0
-        in a
-        end
+      case 0
+      in a
+      end
 
-        a
-      RUBY
+      a.should == 0
     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
+      case 0
+      in a
+      in b
+      in c
+      end
 
-        [a, b, c]
-      RUBY
+      [a, b, c].should == [0, nil, nil]
     end
 
     it "allow using _ name to drop values" do
-      eval(<<~RUBY).should == 0
-        case [0, 1]
-        in [a, _]
-          a
-        end
-      RUBY
+      case [0, 1]
+      in [a, _]
+        a
+      end.should == 0
     end
 
     it "supports using _ in a pattern several times" do
-      eval(<<~RUBY).should == true
-        case [0, 1, 2]
-        in [0, _, _]
-          true
-        end
-      RUBY
+      case [0, 1, 2]
+      in [0, _, _]
+        true
+      end.should == true
     end
 
     it "supports using any name with _ at the beginning in a pattern several times" do
-      eval(<<~RUBY).should == true
-        case [0, 1, 2]
-        in [0, _x, _x]
-          true
-        end
-      RUBY
+      case [0, 1, 2]
+      in [0, _x, _x]
+        true
+      end.should == true
 
-      eval(<<~RUBY).should == true
-        case {a: 0, b: 1, c: 2}
-        in {a: 0, b: _x, c: _x}
-          true
-        end
-      RUBY
+      case {a: 0, b: 1, c: 2}
+      in {a: 0, b: _x, c: _x}
+        true
+      end.should == true
     end
 
     it "does not support using variable name (except _) several times" do
@@ -512,30 +444,24 @@
     it "supports existing variables in a pattern specified with ^ operator" do
       a = 0
 
-      eval(<<~RUBY).should == true
-        case 0
-        in ^a
-          true
-        end
-      RUBY
+      case 0
+      in ^a
+        true
+      end.should == true
     end
 
     it "allows applying ^ operator to bound variables" do
-      eval(<<~RUBY).should == 1
-        case [1, 1]
-        in [n, ^n]
-          n
-        end
-      RUBY
+      case [1, 1]
+      in [n, ^n]
+        n
+      end.should == 1
 
-      eval(<<~RUBY).should == false
-        case [1, 2]
-        in [n, ^n]
-          true
-        else
-          false
-        end
-      RUBY
+      case [1, 2]
+      in [n, ^n]
+        true
+      else
+        false
+      end.should == false
     end
 
     it "requires bound variable to be specified in a pattern before ^ operator when it relies on a bound variable" do
@@ -554,12 +480,10 @@
 
   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
+      case 0
+      in 0 | 1 | 2
+        true
+      end.should == true
     end
 
     it "does not support variable binding" do
@@ -573,120 +497,99 @@
     end
 
     it "support underscore prefixed variables in alternation" do
-      eval(<<~RUBY).should == true
-        case [0, 1]
-        in [1, _]
-          false
-        in [0, 0] | [0, _a]
-          true
-        end
-      RUBY
+      case [0, 1]
+      in [1, _]
+        false
+      in [0, 0] | [0, _a]
+        true
+      end.should == true
     end
 
     it "can be used as a nested pattern" do
-      eval(<<~RUBY).should == true
-        case [[1], ["2"]]
-          in [[0] | nil, _]
-            false
-          in [[1], [1]]
-            false
-          in [[1], [2 | "2"]]
-            true
-        end
-      RUBY
+      case [[1], ["2"]]
+      in [[0] | nil, _]
+        false
+      in [[1], [1]]
+        false
+      in [[1], [2 | "2"]]
+        true
+      end.should == true
 
-      eval(<<~RUBY).should == true
-        case [1, 2]
-          in [0, _] | {a: 0}
-            false
-          in {a: 1, b: 2} | [1, 2]
-            true
-        end
-      RUBY
+      case [1, 2]
+      in [0, _] | {a: 0}
+        false
+      in {a: 1, b: 2} | [1, 2]
+        true
+      end.should == true
     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
+      case 0
+      in Integer => n
+        n
+      end.should == 0
     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
+      case [1, [2, 3]]
+      in [1, Array => ary]
+        ary
+      end.should == [2, 3]
     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
+      case [0, 1, 2]
+      in Array(0, 1, 2)
+        true
+      end.should == true
     end
 
     it "supports form Constant[pat, pat, ...]" do
-      eval(<<~RUBY).should == true
-        case [0, 1, 2]
-        in Array[0, 1, 2]
-          true
-        end
-      RUBY
+      case [0, 1, 2]
+      in Array[0, 1, 2]
+        true
+      end.should == true
     end
 
     it "supports form [pat, pat, ...]" do
-      eval(<<~RUBY).should == true
-        case [0, 1, 2]
-        in [0, 1, 2]
-          true
-        end
-      RUBY
+      case [0, 1, 2]
+      in [0, 1, 2]
+        true
+      end.should == true
     end
 
     it "supports form pat, pat, ..." do
-      eval(<<~RUBY).should == true
-        case [0, 1, 2]
-        in 0, 1, 2
-          true
-        end
-      RUBY
+      case [0, 1, 2]
+      in 0, 1, 2
+        true
+      end.should == true
 
-      eval(<<~RUBY).should == 1
-        case [0, 1, 2]
-        in 0, a, 2
-          a
-        end
-      RUBY
+      case [0, 1, 2]
+      in 0, a, 2
+        a
+      end.should == 1
 
-      eval(<<~RUBY).should == [1, 2]
-        case [0, 1, 2]
-        in 0, *rest
-          rest
-        end
-      RUBY
+      case [0, 1, 2]
+      in 0, *rest
+        rest
+      end.should == [1, 2]
     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
+      def obj.deconstruct
+        [0, 1]
+      end
+
+      case obj
+      in [Integer, Integer]
+        true
+      end.should == true
     end
 
     it "calls #deconstruct once for multiple patterns, caching the result" do
@@ -697,304 +600,267 @@ def obj.deconstruct
         [0, 1]
       end
 
-      eval(<<~RUBY).should == true
-        case obj
-        in [1, 2]
-          false
-        in [0, 1]
-          true
-        end
-      RUBY
+      case obj
+      in [1, 2]
+        false
+      in [0, 1]
+        true
+      end.should == true
 
       ScratchPad.recorded.should == [:deconstruct]
     end
 
     it "calls #deconstruct even on objects that are already an array" do
       obj = [1, 2]
+
       def obj.deconstruct
         ScratchPad << :deconstruct
         [3, 4]
       end
 
-      eval(<<~RUBY).should == true
-        case obj
-        in [3, 4]
-          true
-        else
-          false
-        end
-      RUBY
+      case obj
+      in [3, 4]
+        true
+      else
+        false
+      end.should == true
 
       ScratchPad.recorded.should == [:deconstruct]
     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
+      case [0, 1, 2]
+      in String[0, 1, 2]
+        true
+      else
+        false
+      end.should == false
+    end
+
+    it "checks Constant === object before calling #deconstruct" do
+      c1 = Class.new
+      obj = c1.new
+      obj.should_not_receive(:deconstruct)
+
+      case obj
+      in String[1]
+        true
+      else
+        false
+      end.should == false
     end
 
     it "does not match object without #deconstruct method" do
       obj = Object.new
       obj.should_receive(:respond_to?).with(:deconstruct)
 
-      eval(<<~RUBY).should == false
-        case obj
-        in Object[]
-          true
-        else
-          false
-        end
-      RUBY
+      case obj
+      in Object[]
+        true
+      else
+        false
+      end.should == false
     end
 
     it "raises TypeError if #deconstruct method does not return array" do
       obj = Object.new
-      def obj.deconstruct; "" end
+
+      def obj.deconstruct
+        ""
+      end
 
       -> {
-        eval <<~RUBY
-          case obj
-          in Object[]
-          else
-          end
-        RUBY
+        case obj
+        in Object[]
+        else
+        end
       }.should raise_error(TypeError, /deconstruct must return Array/)
     end
 
     it "accepts a subclass of Array from #deconstruct" do
       obj = Object.new
+
       def obj.deconstruct
-        subarray = Class.new(Array).new(2)
-        def subarray.[](n)
-          n
-        end
-        subarray
+        Class.new(Array).new([0, 1])
       end
 
-      eval(<<~RUBY).should == true
-        case obj
-        in [1, 2]
-          false
-        in [0, 1]
-          true
-        end
-      RUBY
+      case obj
+      in [1, 2]
+        false
+      in [0, 1]
+        true
+      end.should == true
     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
+      def obj.deconstruct
+        [1]
+      end
+
+      case obj
+      in Object[0]
+        true
+      else
+        false
+      end.should == false
     end
 
     it "binds variables" do
-      eval(<<~RUBY).should == [0, 1, 2]
-        case [0, 1, 2]
-        in [a, b, c]
-          [a, b, c]
-        end
-      RUBY
+      case [0, 1, 2]
+      in [a, b, c]
+        [a, b, c]
+      end.should == [0, 1, 2]
     end
 
     it "supports splat operator *rest" do
-      eval(<<~RUBY).should == [1, 2]
-        case [0, 1, 2]
-        in [0, *rest]
-          rest
-        end
-      RUBY
+      case [0, 1, 2]
+      in [0, *rest]
+        rest
+      end.should == [1, 2]
     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
+      case [0, 1, 2, 3]
+      in [1, 2]
+        true
+      else
+        false
+      end.should == false
     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
+      case [0, 1, 2, 3]
+      in [0, 1, ]
+        true
+      end.should == true
 
-    it "matches [] with []" do
-      eval(<<~RUBY).should == true
-        case []
-        in []
-          true
-        end
-      RUBY
+      case [0, 1, 2, 3]
+      in 0, 1,;
+        true
+      end.should == true
+    end
+
+    it "matches [] with []" do
+      case []
+      in []
+        true
+      end.should == true
     end
 
     it "matches anything with *" do
-      eval(<<~RUBY).should == true
-        case [0, 1]
-        in *;
-          true
-        end
-      RUBY
+      case [0, 1]
+      in *;
+        true
+      end.should == true
     end
 
     it "can be used as a nested pattern" do
-      eval(<<~RUBY).should == true
-        case [[1], ["2"]]
-          in [[0] | nil, _]
-            false
-          in [[1], [1]]
-            false
-          in [[1], [2 | "2"]]
-            true
-        end
-      RUBY
+      case [[1], ["2"]]
+      in [[0] | nil, _]
+        false
+      in [[1], [1]]
+        false
+      in [[1], [2 | "2"]]
+        true
+      end.should == true
 
-      eval(<<~RUBY).should == true
-        case [1, 2]
-          in [0, _] | {a: 0}
-            false
-          in {a: 1, b: 2} | [1, 2]
-            true
-        end
-      RUBY
+      case [1, 2]
+      in [0, _] | {a: 0}
+        false
+      in {a: 1, b: 2} | [1, 2]
+        true
+      end.should == true
     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
+      case {a: 0, b: 1}
+      in Hash(a: 0, b: 1)
+        true
+      end.should == true
     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
+      case {a: 0, b: 1}
+      in Hash[a: 0, b: 1]
+        true
+      end.should == true
     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
+      case {a: 0, b: 1}
+      in {a: 0, b: 1}
+        true
+      end.should == true
     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
+      case {a: 0, b: 1}
+      in a: 0, b: 1
+        true
+      end.should == true
 
-      eval(<<~RUBY).should == [0, 1]
-        case {a: 0, b: 1}
-        in a: a, b: b
-          [a, b]
-        end
-      RUBY
+      case {a: 0, b: 1}
+      in a: a, b: b
+        [a, b]
+      end.should == [0, 1]
 
-      eval(<<~RUBY).should == { b: 1, c: 2 }
-        case {a: 0, b: 1, c: 2}
-        in a: 0, **rest
-          rest
-        end
-      RUBY
+      case {a: 0, b: 1, c: 2}
+      in a: 0, **rest
+        rest
+      end.should == {b: 1, c: 2}
     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
+      case {a: 0, b: 1}
+      in Hash(a:, b:)
+        [a, b]
+      end.should == [0, 1]
 
       a = b = nil
-      eval(<<~RUBY).should == [0, 1]
-        case {a: 0, b: 1}
-        in Hash[a:, b:]
-          [a, b]
-        end
-      RUBY
+
+      case {a: 0, b: 1}
+      in Hash[a:, b:]
+        [a, b]
+      end.should == [0, 1]
 
       a = b = nil
-      eval(<<~RUBY).should == [0, 1]
-        case {a: 0, b: 1}
-        in {a:, b:}
-          [a, b]
-        end
-      RUBY
+
+      case {a: 0, b: 1}
+      in {a:, b:}
+        [a, b]
+      end.should == [0, 1]
 
       a = nil
-      eval(<<~RUBY).should == [0, {b: 1, c: 2}]
-        case {a: 0, b: 1, c: 2}
-        in {a:, **rest}
-          [a, rest]
-        end
-      RUBY
+
+      case {a: 0, b: 1, c: 2}
+      in {a:, **rest}
+        [a, rest]
+      end.should == [0, {b: 1, c: 2}]
 
       a = b = nil
-      eval(<<~RUBY).should == [0, 1]
-        case {a: 0, b: 1}
-        in a:, b:
-          [a, b]
-        end
-      RUBY
+
+      case {a: 0, b: 1}
+      in a:, b:
+        [a, b]
+      end.should == [0, 1]
     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
+      case {a: 0, b: 1}
+      in Hash(a:, b: x)
+        [a, x]
+      end.should == [0, 1]
     end
 
     it "supports 'string': key literal" do
-      eval(<<~RUBY).should == true
-        case {a: 0}
-        in {"a": 0}
-          true
-        end
-      RUBY
+      case {a: 0}
+      in {"a": 0}
+        true
+      end.should == true
     end
 
     it "does not support non-symbol keys" do
@@ -1004,19 +870,17 @@ def obj.deconstruct; [1] end
           in {"a" => 1}
           end
         RUBY
-      }.should raise_error(SyntaxError, /unexpected/)
+      }.should raise_error(SyntaxError, /unexpected|expected a label as the key in the hash pattern/)
     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/)
+      }.should raise_error(SyntaxError, /symbol literal with interpolation is not allowed|expected a label as the key in the hash pattern/)
     end
 
     it "raise SyntaxError when keys duplicate in pattern" do
@@ -1031,14 +895,15 @@ def obj.deconstruct; [1] 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
+      def obj.deconstruct_keys(*)
+        {a: 1}
+      end
+
+      case obj
+      in {a: 1}
+        true
+      end.should == true
     end
 
     it "calls #deconstruct_keys per pattern" do
@@ -1049,82 +914,92 @@ def obj.deconstruct_keys(*)
         {a: 1}
       end
 
-      eval(<<~RUBY).should == true
-        case obj
-        in {b: 1}
-          false
-        in {a: 1}
-          true
-        end
-      RUBY
+      case obj
+      in {b: 1}
+        false
+      in {a: 1}
+        true
+      end.should == true
 
       ScratchPad.recorded.should == [:deconstruct_keys, :deconstruct_keys]
     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
+      case {a: 1}
+      in String[a: 1]
+        true
+      else
+        false
+      end.should == false
+    end
+
+    it "checks Constant === object before calling #deconstruct_keys" do
+      c1 = Class.new
+      obj = c1.new
+      obj.should_not_receive(:deconstruct_keys)
+
+      case obj
+      in String(a: 1)
+        true
+      else
+        false
+      end.should == false
     end
 
     it "does not match object without #deconstruct_keys method" do
       obj = Object.new
       obj.should_receive(:respond_to?).with(:deconstruct_keys)
 
-      eval(<<~RUBY).should == false
-        case obj
-        in Object[a: 1]
-          true
-        else
-          false
-        end
-      RUBY
+      case obj
+      in Object[a: 1]
+        true
+      else
+        false
+      end.should == false
     end
 
     it "does not match object if #deconstruct_keys method does not return Hash" do
       obj = Object.new
-      def obj.deconstruct_keys(*); "" end
+
+      def obj.deconstruct_keys(*)
+        ""
+      end
 
       -> {
-        eval <<~RUBY
-          case obj
-          in Object[a: 1]
-          end
-        RUBY
+        case obj
+        in Object[a: 1]
+        end
       }.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
+      def obj.deconstruct_keys(*)
+        {"a" => 1}
+      end
+
+      case obj
+      in Object[a: 1]
+        true
+      else
+        false
+      end.should == false
     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
+      def obj.deconstruct_keys(*)
+        {a: 1}
+      end
+
+      case obj
+      in Object[a: 2]
+        true
+      else
+        false
+      end.should == false
     end
 
     it "passes keys specified in pattern as arguments to #deconstruct_keys method" do
@@ -1135,11 +1010,9 @@ def obj.deconstruct_keys(*args)
         {a: 1, b: 2, c: 3}
       end
 
-      eval <<~RUBY
-        case obj
-        in Object[a: 1, b: 2, c: 3]
-        end
-      RUBY
+      case obj
+      in Object[a: 1, b: 2, c: 3]
+      end
 
       ScratchPad.recorded.sort.should == [[[:a, :b, :c]]]
     end
@@ -1152,11 +1025,9 @@ def obj.deconstruct_keys(*args)
         {a: 1, b: 2, c: 3}
       end
 
-      eval <<~RUBY
-        case obj
-        in Object[a: 1, b: 2, **]
-        end
-      RUBY
+      case obj
+      in Object[a: 1, b: 2, **]
+      end
 
       ScratchPad.recorded.sort.should == [[[:a, :b]]]
     end
@@ -1169,100 +1040,105 @@ def obj.deconstruct_keys(*args)
         {a: 1, b: 2}
       end
 
-      eval <<~RUBY
-        case obj
-        in Object[a: 1, **rest]
-        end
-      RUBY
+      case obj
+      in Object[a: 1, **rest]
+      end
 
       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
+      case {a: 0, b: 1, c: 2}
+      in {a: x, b: y, c: z}
+        [x, y, z]
+      end.should == [0, 1, 2]
     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
+      case {a: 0, b: 1, c: 2}
+      in {a: 0, **rest}
+        rest
+      end.should == {b: 1, c: 2}
     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
+      case {a: 1, b: 2}
+      in {a: 1, b: 2, **nil}
+        true
+      end.should == true
 
-      eval(<<~RUBY).should == false
-        case {a: 1, b: 2}
-        in {a: 1, **nil}
-          true
-        else
-          false
-        end
-      RUBY
+      case {a: 1, b: 2}
+      in {a: 1, **nil}
+        true
+      else
+        false
+      end.should == false
     end
 
     it "can match partially" do
-      eval(<<~RUBY).should == true
-        case {a: 1, b: 2}
-        in {a: 1}
-          true
-        end
-      RUBY
+      case {a: 1, b: 2}
+      in {a: 1}
+        true
+      end.should == true
     end
 
     it "matches {} with {}" do
-      eval(<<~RUBY).should == true
-        case {}
-        in {}
-          true
-        end
-      RUBY
+      case {}
+      in {}
+        true
+      end.should == true
+    end
+
+    it "in {} only matches empty hashes" do
+      case {a: 1}
+      in {}
+        true
+      else
+        false
+      end.should == false
+    end
+
+    it "in {**nil} only matches empty hashes" do
+      case {}
+      in {**nil}
+        true
+      else
+        false
+      end.should == true
+
+      case {a: 1}
+      in {**nil}
+        true
+      else
+        false
+      end.should == false
     end
 
     it "matches anything with **" do
-      eval(<<~RUBY).should == true
-        case {a: 1}
-        in **;
-          true
-        end
-      RUBY
+      case {a: 1}
+      in **;
+        true
+      end.should == true
     end
 
     it "can be used as a nested pattern" do
-      eval(<<~RUBY).should == true
-        case {a: {a: 1, b: 1}, b: {a: 1, b: 2}}
-          in {a: {a: 0}}
-            false
-          in {a: {a: 1}, b: {b: 1}}
-            false
-          in {a: {a: 1}, b: {b: 2}}
-            true
-        end
-      RUBY
+      case {a: {a: 1, b: 1}, b: {a: 1, b: 2}}
+      in {a: {a: 0}}
+        false
+      in {a: {a: 1}, b: {b: 1}}
+        false
+      in {a: {a: 1}, b: {b: 2} }
+        true
+      end.should == true
 
-      eval(<<~RUBY).should == true
-        case [{a: 1, b: [1]}, {a: 1, c: ["2"]}]
-          in [{a:, c:},]
-            false
-          in [{a: 1, b:}, {a: 1, c: [Integer]}]
-            false
-          in [_, {a: 1, c: [String]}]
-            true
-        end
-      RUBY
+      case [{a: 1, b: [1]}, {a: 1, c: ["2"]}]
+      in [{a:, c:}, ]
+        false
+      in [{a: 1, b:}, {a: 1, c: [Integer]}]
+        false
+      in [_, {a: 1, c: [String]}]
+        true
+      end.should == true
     end
   end
 
@@ -1280,12 +1156,11 @@ def deconstruct
       Module.new do
         using refinery
 
-        result = eval(<<~RUBY)
+        result =
           case []
           in [0]
             true
           end
-        RUBY
       end
 
       result.should == true
@@ -1304,12 +1179,11 @@ def deconstruct_keys(_)
       Module.new do
         using refinery
 
-        result = eval(<<~RUBY)
+        result =
           case {}
           in a: 0
             true
           end
-        RUBY
       end
 
       result.should == true
@@ -1328,44 +1202,38 @@ def ===(obj)
       Module.new do
         using refinery
 
-        result = eval(<<~RUBY)
+        result =
           case {}
           in Array
             true
           end
-        RUBY
       end
 
       result.should == true
     end
   end
 
-  ruby_version_is "3.1" do
+  describe "Ruby 3.1 improvements" do
     it "can omit parentheses in one line pattern matching" do
-      eval(<<~RUBY).should == [1, 2]
-        [1, 2] => a, b
-        [a, b]
-      RUBY
+      [1, 2] => a, b
+      [a, b].should == [1, 2]
 
-      eval(<<~RUBY).should == 1
-        {a: 1} => a:
-        a
-      RUBY
+      {a: 1} => a:
+      a.should == 1
     end
 
     it "supports pinning instance variables" do
-      eval(<<~RUBY).should == true
-        @a = /a/
-        case 'abc'
-        in ^@a
-          true
-        end
-      RUBY
+      @a = /a/
+      case 'abc'
+      in ^@a
+        true
+      end.should == true
     end
 
     it "supports pinning class variables" do
       result = nil
       Module.new do
+        # avoid "class variable access from toplevel" runtime error with #module_eval
         result = module_eval(<<~RUBY)
           @@a = 0..10
 
@@ -1380,36 +1248,63 @@ def ===(obj)
     end
 
     it "supports pinning global variables" do
-      eval(<<~RUBY).should == true
-        $a = /a/
-        case 'abc'
-        in ^$a
-          true
-        end
-      RUBY
+      $a = /a/
+      case 'abc'
+      in ^$a
+        true
+      end.should == true
     end
 
     it "supports pinning expressions" do
-      eval(<<~RUBY).should == true
-        case 'abc'
-          in ^(/a/)
-          true
-        end
-      RUBY
+      case 'abc'
+      in ^(/a/)
+        true
+      end.should == true
 
-      eval(<<~RUBY).should == true
-        case {name: '2.6', released_at: Time.new(2018, 12, 25)}
-          in {released_at: ^(Time.new(2010)..Time.new(2020))}
-          true
-        end
-      RUBY
+      case 0
+      in ^(0 + 0)
+        true
+      end.should == true
+    end
 
-      eval(<<~RUBY).should == true
-        case 0
-        in ^(0+0)
-          true
-        end
-      RUBY
+    it "supports pinning expressions in array pattern" do
+      case [3]
+      in [^(1 + 2)]
+        true
+      end.should == true
+    end
+
+    it "supports pinning expressions in hash pattern" do
+      case {name: '2.6', released_at: Time.new(2018, 12, 25)}
+      in {released_at: ^(Time.new(2010)..Time.new(2020))}
+        true
+      end.should == true
+    end
+  end
+
+  describe "value in pattern" do
+    it "returns true if the pattern matches" do
+      (1 in 1).should == true
+
+      (1 in Integer).should == true
+
+      e = nil
+      ([1, 2] in [1, e]).should == true
+      e.should == 2
+
+      k = nil
+      ({k: 1} in {k:}).should == true
+      k.should == 1
+    end
+
+    it "returns false if the pattern does not match" do
+      (1 in 2).should == false
+
+      (1 in Float).should == false
+
+      ([1, 2] in [2, e]).should == false
+
+      ({k: 1} in {k: 2}).should == false
     end
   end
 end
diff --git a/spec/ruby/language/precedence_spec.rb b/spec/ruby/language/precedence_spec.rb
index c5adcca2c04632..5e606c16d86af3 100644
--- a/spec/ruby/language/precedence_spec.rb
+++ b/spec/ruby/language/precedence_spec.rb
@@ -294,14 +294,14 @@ class FalseClass; undef_method :=~; end
     -> { eval("1...2...3")  }.should raise_error(SyntaxError)
   end
 
- it ".. ... have higher precedence than ? :" do
-   # Use variables to avoid warnings
-   from = 1
-   to = 2
-   # These are flip-flop, not Range instances
-   (from..to ? 3 : 4).should == 3
-   (from...to ? 3 : 4).should == 3
- end
+  it ".. ... have higher precedence than ? :" do
+    # Use variables to avoid warnings
+    from = 1
+    to = 2
+    # These are flip-flop, not Range instances
+    (from..to ? 3 : 4).should == 3
+    (from...to ? 3 : 4).should == 3
+  end
 
   it "? : is right-associative" do
     (true ? 2 : 3 ? 4 : 5).should == 2
diff --git a/spec/ruby/language/predefined_spec.rb b/spec/ruby/language/predefined_spec.rb
index fe865cc3252f17..d90e19858ae5e9 100644
--- a/spec/ruby/language/predefined_spec.rb
+++ b/spec/ruby/language/predefined_spec.rb
@@ -1,4 +1,5 @@
 require_relative '../spec_helper'
+require_relative '../core/exception/shared/set_backtrace'
 require 'stringio'
 
 # The following tables are excerpted from Programming Ruby: The Pragmatic Programmer's Guide'
@@ -71,7 +72,7 @@ def obj.foo2(&proc); proc.call; end
     match2.should_not == nil
     $~.should == match2
 
-    eval 'match3 = /baz/.match("baz")'
+    match3 = /baz/.match("baz")
 
     match3.should_not == nil
     $~.should == match3
@@ -88,8 +89,8 @@ def obj.foo2(&proc); proc.call; end
     $~ = /foo/.match("foo")
     $~.should be_an_instance_of(MatchData)
 
-    -> { $~ = Object.new }.should raise_error(TypeError)
-    -> { $~ = 1 }.should raise_error(TypeError)
+    -> { $~ = Object.new }.should raise_error(TypeError, 'wrong argument type Object (expected MatchData)')
+    -> { $~ = 1 }.should raise_error(TypeError, 'wrong argument type Integer (expected MatchData)')
   end
 
   it "changes the value of derived capture globals when assigned" do
@@ -133,9 +134,22 @@ def obj.foo2(&proc); proc.call; end
   end
 
   it "sets the encoding to the encoding of the source String" do
-    "abc".force_encoding(Encoding::EUC_JP) =~ /b/
+    "abc".dup.force_encoding(Encoding::EUC_JP) =~ /b/
     $&.encoding.should equal(Encoding::EUC_JP)
   end
+
+  it "is read-only" do
+    -> {
+      eval %q{$& = ""}
+    }.should raise_error(SyntaxError, /Can't set variable \$&/)
+  end
+
+  it "is read-only when aliased" do
+    alias $predefined_spec_ampersand $&
+    -> {
+      $predefined_spec_ampersand = ""
+    }.should raise_error(NameError, '$predefined_spec_ampersand is a read-only variable')
+  end
 end
 
 describe "Predefined global $`" do
@@ -146,14 +160,27 @@ def obj.foo2(&proc); proc.call; end
   end
 
   it "sets the encoding to the encoding of the source String" do
-    "abc".force_encoding(Encoding::EUC_JP) =~ /b/
+    "abc".dup.force_encoding(Encoding::EUC_JP) =~ /b/
     $`.encoding.should equal(Encoding::EUC_JP)
   end
 
   it "sets an empty result to the encoding of the source String" do
-    "abc".force_encoding(Encoding::ISO_8859_1) =~ /a/
+    "abc".dup.force_encoding(Encoding::ISO_8859_1) =~ /a/
     $`.encoding.should equal(Encoding::ISO_8859_1)
   end
+
+  it "is read-only" do
+    -> {
+      eval %q{$` = ""}
+    }.should raise_error(SyntaxError, /Can't set variable \$`/)
+  end
+
+  it "is read-only when aliased" do
+    alias $predefined_spec_backquote $`
+    -> {
+      $predefined_spec_backquote = ""
+    }.should raise_error(NameError, '$predefined_spec_backquote is a read-only variable')
+  end
 end
 
 describe "Predefined global $'" do
@@ -164,14 +191,27 @@ def obj.foo2(&proc); proc.call; end
   end
 
   it "sets the encoding to the encoding of the source String" do
-    "abc".force_encoding(Encoding::EUC_JP) =~ /b/
+    "abc".dup.force_encoding(Encoding::EUC_JP) =~ /b/
     $'.encoding.should equal(Encoding::EUC_JP)
   end
 
   it "sets an empty result to the encoding of the source String" do
-    "abc".force_encoding(Encoding::ISO_8859_1) =~ /c/
+    "abc".dup.force_encoding(Encoding::ISO_8859_1) =~ /c/
     $'.encoding.should equal(Encoding::ISO_8859_1)
   end
+
+  it "is read-only" do
+    -> {
+      eval %q{$' = ""}
+    }.should raise_error(SyntaxError, /Can't set variable \$'/)
+  end
+
+  it "is read-only when aliased" do
+    alias $predefined_spec_single_quote $'
+    -> {
+      $predefined_spec_single_quote = ""
+    }.should raise_error(NameError, '$predefined_spec_single_quote is a read-only variable')
+  end
 end
 
 describe "Predefined global $+" do
@@ -187,9 +227,22 @@ def obj.foo2(&proc); proc.call; end
   end
 
   it "sets the encoding to the encoding of the source String" do
-    "abc".force_encoding(Encoding::EUC_JP) =~ /(b)/
+    "abc".dup.force_encoding(Encoding::EUC_JP) =~ /(b)/
     $+.encoding.should equal(Encoding::EUC_JP)
   end
+
+  it "is read-only" do
+    -> {
+      eval %q{$+ = ""}
+    }.should raise_error(SyntaxError, /Can't set variable \$\+/)
+  end
+
+  it "is read-only when aliased" do
+    alias $predefined_spec_plus $+
+    -> {
+      $predefined_spec_plus = ""
+    }.should raise_error(NameError, '$predefined_spec_plus is a read-only variable')
+  end
 end
 
 describe "Predefined globals $1..N" do
@@ -214,7 +267,7 @@ def test(arg)
   end
 
   it "sets the encoding to the encoding of the source String" do
-    "abc".force_encoding(Encoding::EUC_JP) =~ /(b)/
+    "abc".dup.force_encoding(Encoding::EUC_JP) =~ /(b)/
     $1.encoding.should equal(Encoding::EUC_JP)
   end
 end
@@ -229,7 +282,7 @@ def test(arg)
   end
 
   it "raises TypeError error if assigned to nil" do
-    -> { $stdout = nil }.should raise_error(TypeError)
+    -> { $stdout = nil }.should raise_error(TypeError, '$stdout must have write method, NilClass given')
   end
 
   it "raises TypeError error if assigned to object that doesn't respond to #write" do
@@ -243,6 +296,22 @@ def test(arg)
 end
 
 describe "Predefined global $!" do
+  it "is Fiber-local" do
+    Fiber.new do
+      raise "hi"
+    rescue
+      Fiber.yield
+    end.resume
+
+    $!.should == nil
+  end
+
+  it "is read-only" do
+    -> {
+      $! = []
+    }.should raise_error(NameError, '$! is a read-only variable')
+  end
+
   # See http://jira.codehaus.org/browse/JRUBY-5550
   it "remains nil after a failed core class \"checked\" coercion against a class that defines method_missing" do
     $!.should == nil
@@ -502,6 +571,75 @@ def foo
   end
 end
 
+describe "Predefined global $@" do
+  it "is Fiber-local" do
+    Fiber.new do
+      raise "hi"
+    rescue
+      Fiber.yield
+    end.resume
+
+    $@.should == nil
+  end
+
+  it "is set to a backtrace of a rescued exception" do
+    begin
+      raise
+    rescue
+      $@.should be_an_instance_of(Array)
+      $@.should == $!.backtrace
+    end
+  end
+
+  it "is cleared when an exception is rescued" do
+    begin
+      raise
+    rescue
+    end
+
+    $@.should == nil
+  end
+
+  it "is not set when there is no current exception" do
+    $@.should == nil
+  end
+
+  it "is set to a backtrace of a rescued exception" do
+    begin
+      raise
+    rescue
+      $@.should be_an_instance_of(Array)
+      $@.should == $!.backtrace
+    end
+  end
+
+  it "is not read-only" do
+    begin
+      raise
+    rescue
+      $@ = []
+      $@.should == []
+    end
+  end
+
+  it_behaves_like :exception_set_backtrace, -> backtrace {
+    exception = nil
+    begin
+      raise
+    rescue
+      $@ = backtrace
+      exception = $!
+    end
+    exception
+  }
+
+  it "cannot be assigned when there is no a rescued exception" do
+    -> {
+      $@ = []
+    }.should raise_error(ArgumentError, '$! not set')
+  end
+end
+
 # Input/Output Variables
 # ---------------------------------------------------------------------------------------------------
 #
@@ -549,12 +687,39 @@ def foo
     $VERBOSE = @verbose
   end
 
-  it "can be assigned a String" do
-    str = "abc"
-    $/ = str
-    $/.should equal(str)
+  ruby_version_is ""..."3.5" do
+    it "can be assigned a String" do
+      str = +"abc"
+      $/ = str
+      $/.should equal(str)
+    end
   end
 
+  ruby_version_is "3.5" do
+    it "makes a new frozen String from the assigned String" do
+      string_subclass = Class.new(String)
+      str = string_subclass.new("abc")
+      str.instance_variable_set(:@ivar, 1)
+      $/ = str
+      $/.should.frozen?
+      $/.should be_an_instance_of(String)
+      $/.should_not.instance_variable_defined?(:@ivar)
+      $/.should == str
+    end
+
+    it "makes a new frozen String if it's not frozen" do
+      str = +"abc"
+      $/ = str
+      $/.should.frozen?
+      $/.should == str
+    end
+
+    it "assigns the given String if it's frozen and has no instance variables" do
+      str = "abc".freeze
+      $/ = str
+      $/.should equal(str)
+    end
+  end
   it "can be assigned nil" do
     $/ = nil
     $/.should be_nil
@@ -573,15 +738,15 @@ def foo
     obj = mock("$/ value")
     obj.should_not_receive(:to_str)
 
-    -> { $/ = obj }.should raise_error(TypeError)
+    -> { $/ = obj }.should raise_error(TypeError, 'value of $/ must be String')
   end
 
   it "raises a TypeError if assigned an Integer" do
-    -> { $/ = 1 }.should raise_error(TypeError)
+    -> { $/ = 1 }.should raise_error(TypeError, 'value of $/ must be String')
   end
 
   it "raises a TypeError if assigned a boolean" do
-    -> { $/ = true }.should raise_error(TypeError)
+    -> { $/ = true }.should raise_error(TypeError, 'value of $/ must be String')
   end
 end
 
@@ -598,10 +763,38 @@ def foo
     $VERBOSE = @verbose
   end
 
-  it "can be assigned a String" do
-    str = "abc"
-    $-0 = str
-    $-0.should equal(str)
+  ruby_version_is ""..."3.5" do
+    it "can be assigned a String" do
+      str = +"abc"
+      $-0 = str
+      $-0.should equal(str)
+    end
+  end
+
+  ruby_version_is "3.5" do
+    it "makes a new frozen String from the assigned String" do
+      string_subclass = Class.new(String)
+      str = string_subclass.new("abc")
+      str.instance_variable_set(:@ivar, 1)
+      $-0 = str
+      $-0.should.frozen?
+      $-0.should be_an_instance_of(String)
+      $-0.should_not.instance_variable_defined?(:@ivar)
+      $-0.should == str
+    end
+
+    it "makes a new frozen String if it's not frozen" do
+      str = +"abc"
+      $-0 = str
+      $-0.should.frozen?
+      $-0.should == str
+    end
+
+    it "assigns the given String if it's frozen and has no instance variables" do
+      str = "abc".freeze
+      $-0 = str
+      $-0.should equal(str)
+    end
   end
 
   it "can be assigned nil" do
@@ -622,15 +815,15 @@ def foo
     obj = mock("$-0 value")
     obj.should_not_receive(:to_str)
 
-    -> { $-0 = obj }.should raise_error(TypeError)
+    -> { $-0 = obj }.should raise_error(TypeError, 'value of $-0 must be String')
   end
 
   it "raises a TypeError if assigned an Integer" do
-    -> { $-0 = 1 }.should raise_error(TypeError)
+    -> { $-0 = 1 }.should raise_error(TypeError, 'value of $-0 must be String')
   end
 
   it "raises a TypeError if assigned a boolean" do
-    -> { $-0 = true }.should raise_error(TypeError)
+    -> { $-0 = true }.should raise_error(TypeError, 'value of $-0 must be String')
   end
 end
 
@@ -664,12 +857,12 @@ def foo
     obj = mock("$\\ value")
     obj.should_not_receive(:to_str)
 
-    -> { $\ = obj }.should raise_error(TypeError)
+    -> { $\ = obj }.should raise_error(TypeError, 'value of $\ must be String')
   end
 
   it "raises a TypeError if assigned not String" do
-    -> { $\ = 1 }.should raise_error(TypeError)
-    -> { $\ = true }.should raise_error(TypeError)
+    -> { $\ = 1 }.should raise_error(TypeError, 'value of $\ must be String')
+    -> { $\ = true }.should raise_error(TypeError, 'value of $\ must be String')
   end
 end
 
@@ -683,11 +876,11 @@ def foo
   end
 
   it "raises TypeError if assigned a non-String" do
-    -> { $, = Object.new }.should raise_error(TypeError)
+    -> { $, = Object.new }.should raise_error(TypeError, 'value of $, must be String')
   end
 
   it "warns if assigned non-nil" do
-    -> { $, = "_" }.should complain(/warning: `\$,' is deprecated/)
+    -> { $, = "_" }.should complain(/warning: [`']\$,' is deprecated/)
   end
 end
 
@@ -724,7 +917,7 @@ def foo
   end
 
   it "warns if assigned non-nil" do
-    -> { $; = "_" }.should complain(/warning: `\$;' is deprecated/)
+    -> { $; = "_" }.should complain(/warning: [`']\$;' is deprecated/)
   end
 end
 
@@ -758,7 +951,7 @@ def obj.foo2; yield; end
     match.should == "bar\n"
     $_.should == match
 
-    eval 'match = stdin.gets'
+    match = stdin.gets
 
     match.should == "baz\n"
     $_.should == match
@@ -868,22 +1061,28 @@ def obj.foo2; yield; end
   it "is read-only" do
     -> {
       $: = []
-    }.should raise_error(NameError)
+    }.should raise_error(NameError, '$: is a read-only variable')
 
     -> {
       $LOAD_PATH = []
-    }.should raise_error(NameError)
+    }.should raise_error(NameError, '$LOAD_PATH is a read-only variable')
 
     -> {
       $-I = []
-    }.should raise_error(NameError)
+    }.should raise_error(NameError, '$-I is a read-only variable')
   end
 
   it "default $LOAD_PATH entries until sitelibdir included have @gem_prelude_index set" do
     skip "no sense in ruby itself" if MSpecScript.instance_variable_defined?(:@testing_ruby)
 
-    $:.should.include?(RbConfig::CONFIG['sitelibdir'])
-    idx = $:.index(RbConfig::CONFIG['sitelibdir'])
+    if platform_is :windows
+      # See https://github.com/ruby/setup-ruby/pull/762#issuecomment-2917460440
+      $:.should.find { |e| File.realdirpath(e) == RbConfig::CONFIG['sitelibdir'] }
+      idx = $:.index { |e| File.realdirpath(e) == RbConfig::CONFIG['sitelibdir'] }
+    else
+      $:.should.include?(RbConfig::CONFIG['sitelibdir'])
+      idx = $:.index(RbConfig::CONFIG['sitelibdir'])
+    end
 
     $:[idx..-1].all? { |p| p.instance_variable_defined?(:@gem_prelude_index) }.should be_true
     $:[0...idx].all? { |p| !p.instance_variable_defined?(:@gem_prelude_index) }.should be_true
@@ -898,11 +1097,11 @@ def obj.foo2; yield; end
   it "is read-only" do
     -> {
       $" = []
-    }.should raise_error(NameError)
+    }.should raise_error(NameError, '$" is a read-only variable')
 
     -> {
       $LOADED_FEATURES = []
-    }.should raise_error(NameError)
+    }.should raise_error(NameError, '$LOADED_FEATURES is a read-only variable')
   end
 end
 
@@ -910,7 +1109,7 @@ def obj.foo2; yield; end
   it "is read-only" do
     -> {
       $< = nil
-    }.should raise_error(NameError)
+    }.should raise_error(NameError, '$< is a read-only variable')
   end
 end
 
@@ -918,7 +1117,7 @@ def obj.foo2; yield; end
   it "is read-only" do
     -> {
       $FILENAME = "-"
-    }.should raise_error(NameError)
+    }.should raise_error(NameError, '$FILENAME is a read-only variable')
   end
 end
 
@@ -926,7 +1125,7 @@ def obj.foo2; yield; end
   it "is read-only" do
     -> {
       $? = nil
-    }.should raise_error(NameError)
+    }.should raise_error(NameError, '$? is a read-only variable')
   end
 
   it "is thread-local" do
@@ -937,19 +1136,19 @@ def obj.foo2; yield; end
 
 describe "Global variable $-a" do
   it "is read-only" do
-    -> { $-a = true }.should raise_error(NameError)
+    -> { $-a = true }.should raise_error(NameError, '$-a is a read-only variable')
   end
 end
 
 describe "Global variable $-l" do
   it "is read-only" do
-    -> { $-l = true }.should raise_error(NameError)
+    -> { $-l = true }.should raise_error(NameError, '$-l is a read-only variable')
   end
 end
 
 describe "Global variable $-p" do
   it "is read-only" do
-    -> { $-p = true }.should raise_error(NameError)
+    -> { $-p = true }.should raise_error(NameError, '$-p is a read-only variable')
   end
 end
 
@@ -1100,7 +1299,7 @@ def obj.foo2; yield; end
   end
 
   it "raises a SyntaxError if assigned to" do
-    -> { eval("nil = true") }.should raise_error(SyntaxError)
+    -> { eval("nil = true") }.should raise_error(SyntaxError, /Can't assign to nil/)
   end
 end
 
@@ -1110,7 +1309,7 @@ def obj.foo2; yield; end
   end
 
   it "raises a SyntaxError if assigned to" do
-    -> { eval("true = false") }.should raise_error(SyntaxError)
+    -> { eval("true = false") }.should raise_error(SyntaxError, /Can't assign to true/)
   end
 end
 
@@ -1120,13 +1319,13 @@ def obj.foo2; yield; end
   end
 
   it "raises a SyntaxError if assigned to" do
-    -> { eval("false = nil") }.should raise_error(SyntaxError)
+    -> { eval("false = nil") }.should raise_error(SyntaxError, /Can't assign to false/)
   end
 end
 
 describe "The self pseudo-variable" do
   it "raises a SyntaxError if assigned to" do
-    -> { eval("self = 1") }.should raise_error(SyntaxError)
+    -> { eval("self = 1") }.should raise_error(SyntaxError, /Can't change the value of self/)
   end
 end
 
@@ -1317,9 +1516,9 @@ def obj.foo2; yield; end
 
 describe "$LOAD_PATH.resolve_feature_path" do
   it "returns what will be loaded without actual loading, .rb file" do
-    extension, path = $LOAD_PATH.resolve_feature_path('set')
+    extension, path = $LOAD_PATH.resolve_feature_path('pp')
     extension.should == :rb
-    path.should.end_with?('/set.rb')
+    path.should.end_with?('/pp.rb')
   end
 
   it "returns what will be loaded without actual loading, .so file" do
@@ -1331,16 +1530,8 @@ def obj.foo2; yield; end
     path.should.end_with?("/etc.#{RbConfig::CONFIG['DLEXT']}")
   end
 
-  ruby_version_is ""..."3.1" do
-    it "raises LoadError if feature cannot be found" do
-      -> { $LOAD_PATH.resolve_feature_path('noop') }.should raise_error(LoadError)
-    end
-  end
-
-  ruby_version_is "3.1" do
-    it "return nil if feature cannot be found" do
-      $LOAD_PATH.resolve_feature_path('noop').should be_nil
-    end
+  it "return nil if feature cannot be found" do
+    $LOAD_PATH.resolve_feature_path('noop').should be_nil
   end
 end
 
diff --git a/spec/ruby/language/private_spec.rb b/spec/ruby/language/private_spec.rb
index ddf185e6d2efd5..b04aa25c9e57fe 100644
--- a/spec/ruby/language/private_spec.rb
+++ b/spec/ruby/language/private_spec.rb
@@ -34,7 +34,7 @@
   it "changes visibility of previously called method" do
     klass = Class.new do
       def foo
-       "foo"
+        "foo"
       end
     end
     f = klass.new
diff --git a/spec/ruby/language/proc_spec.rb b/spec/ruby/language/proc_spec.rb
index cc69b7799c5364..ca9a13aa615e2e 100644
--- a/spec/ruby/language/proc_spec.rb
+++ b/spec/ruby/language/proc_spec.rb
@@ -104,7 +104,7 @@
     end
 
     it "assigns all passed values after the first to the rest argument" do
-        @l.call(1, 2, 3).should == [1, [2, 3]]
+      @l.call(1, 2, 3).should == [1, [2, 3]]
     end
 
     it "does not call #to_ary to convert a single passed object to an Array" do
diff --git a/spec/ruby/language/regexp/anchors_spec.rb b/spec/ruby/language/regexp/anchors_spec.rb
index 0129e255da9dad..cdc06c0b4d3223 100644
--- a/spec/ruby/language/regexp/anchors_spec.rb
+++ b/spec/ruby/language/regexp/anchors_spec.rb
@@ -124,10 +124,10 @@
     /foo\b/.match("foo").to_a.should == ["foo"]
     /foo\b/.match("foo\n").to_a.should == ["foo"]
     LanguageSpecs.white_spaces.scan(/./).each do |c|
-    /foo\b/.match("foo" + c).to_a.should == ["foo"]
+      /foo\b/.match("foo" + c).to_a.should == ["foo"]
     end
     LanguageSpecs.non_alphanum_non_space.scan(/./).each do |c|
-    /foo\b/.match("foo" + c).to_a.should == ["foo"]
+      /foo\b/.match("foo" + c).to_a.should == ["foo"]
     end
     /foo\b/.match("foo\0").to_a.should == ["foo"]
     # Basic non-matching
@@ -145,10 +145,10 @@
     /foo\B/.match("foo").should be_nil
     /foo\B/.match("foo\n").should be_nil
     LanguageSpecs.white_spaces.scan(/./).each do |c|
-    /foo\B/.match("foo" + c).should be_nil
+      /foo\B/.match("foo" + c).should be_nil
     end
     LanguageSpecs.non_alphanum_non_space.scan(/./).each do |c|
-    /foo\B/.match("foo" + c).should be_nil
+      /foo\B/.match("foo" + c).should be_nil
     end
     /foo\B/.match("foo\0").should be_nil
   end
diff --git a/spec/ruby/language/regexp/back-references_spec.rb b/spec/ruby/language/regexp/back-references_spec.rb
index 26750c20c59a86..627c8daacefa42 100644
--- a/spec/ruby/language/regexp/back-references_spec.rb
+++ b/spec/ruby/language/regexp/back-references_spec.rb
@@ -22,6 +22,15 @@
     $10.should == "0"
   end
 
+  it "returns nil for numbered variable with too large index" do
+    -> {
+      eval(<<~CODE).should == nil
+        "a" =~ /(.)/
+        eval('$4294967296')
+      CODE
+    }.should complain(/warning: ('|`)\$4294967296' is too big for a number variable, always nil/)
+  end
+
   it "will not clobber capture variables across threads" do
     cap1, cap2, cap3 = nil
     "foo" =~ /(o+)/
diff --git a/spec/ruby/language/regexp/character_classes_spec.rb b/spec/ruby/language/regexp/character_classes_spec.rb
index 98d431a817401d..80cf88c7bdb1a9 100644
--- a/spec/ruby/language/regexp/character_classes_spec.rb
+++ b/spec/ruby/language/regexp/character_classes_spec.rb
@@ -113,7 +113,7 @@
   end
 
   it "doesn't matches Unicode marks with [[:alnum:]]" do
-    "\u{36F}".match(/[[:alnum:]]/).should be_nil
+    "\u{3099}".match(/[[:alnum:]]/).should be_nil
   end
 
   it "doesn't match Unicode control characters with [[:alnum:]]" do
@@ -133,7 +133,7 @@
   end
 
   it "doesn't matches Unicode marks with [[:alpha:]]" do
-    "\u{36F}".match(/[[:alpha:]]/).should be_nil
+    "\u{3099}".match(/[[:alpha:]]/).should be_nil
   end
 
   it "doesn't match Unicode control characters with [[:alpha:]]" do
@@ -226,7 +226,7 @@
   end
 
   it "matches Unicode letter characters with [[:graph:]]" do
-      "à".match(/[[:graph:]]/).to_a.should == ["à"]
+    "à".match(/[[:graph:]]/).to_a.should == ["à"]
   end
 
   it "matches Unicode digits with [[:graph:]]" do
@@ -562,6 +562,13 @@
     "\u{16EE}".match(/[[:word:]]/).to_a.should == ["\u{16EE}"]
   end
 
+  ruby_bug "#19417", ""..."3.5" do
+    it "matches Unicode join control characters with [[:word:]]" do
+      "\u{200C}".match(/[[:word:]]/).to_a.should == ["\u{200C}"]
+      "\u{200D}".match(/[[:word:]]/).to_a.should == ["\u{200D}"]
+    end
+  end
+
   it "doesn't match Unicode No characters with [[:word:]]" do
     "\u{17F0}".match(/[[:word:]]/).should be_nil
   end
diff --git a/spec/ruby/language/regexp/encoding_spec.rb b/spec/ruby/language/regexp/encoding_spec.rb
index febc3fdb3726f9..898b6d4ff7a846 100644
--- a/spec/ruby/language/regexp/encoding_spec.rb
+++ b/spec/ruby/language/regexp/encoding_spec.rb
@@ -1,21 +1,21 @@
-# -*- encoding: binary -*-
+# encoding: binary
 require_relative '../../spec_helper'
 require_relative '../fixtures/classes'
 
 describe "Regexps with encoding modifiers" do
   it "supports /e (EUC encoding)" do
-    match = /./e.match("\303\251".force_encoding(Encoding::EUC_JP))
-    match.to_a.should == ["\303\251".force_encoding(Encoding::EUC_JP)]
+    match = /./e.match("\303\251".dup.force_encoding(Encoding::EUC_JP))
+    match.to_a.should == ["\303\251".dup.force_encoding(Encoding::EUC_JP)]
   end
 
   it "supports /e (EUC encoding) with interpolation" do
-    match = /#{/./}/e.match("\303\251".force_encoding(Encoding::EUC_JP))
-    match.to_a.should == ["\303\251".force_encoding(Encoding::EUC_JP)]
+    match = /#{/./}/e.match("\303\251".dup.force_encoding(Encoding::EUC_JP))
+    match.to_a.should == ["\303\251".dup.force_encoding(Encoding::EUC_JP)]
   end
 
   it "supports /e (EUC encoding) with interpolation /o" do
-    match = /#{/./}/e.match("\303\251".force_encoding(Encoding::EUC_JP))
-    match.to_a.should == ["\303\251".force_encoding(Encoding::EUC_JP)]
+    match = /#{/./}/e.match("\303\251".dup.force_encoding(Encoding::EUC_JP))
+    match.to_a.should == ["\303\251".dup.force_encoding(Encoding::EUC_JP)]
   end
 
   it 'uses EUC-JP as /e encoding' do
@@ -39,7 +39,7 @@
   end
 
   it "warns when using /n with a match string with non-ASCII characters and an encoding other than ASCII-8BIT" do
-    -> { /./n.match("\303\251".force_encoding('utf-8')) }.should complain(%r{historical binary regexp match /.../n against UTF-8 string})
+    -> { /./n.match("\303\251".dup.force_encoding('utf-8')) }.should complain(%r{historical binary regexp match /.../n against UTF-8 string})
   end
 
   it 'uses US-ASCII as /n encoding if all chars are 7-bit' do
@@ -63,18 +63,18 @@
   end
 
   it "supports /s (Windows_31J encoding)" do
-    match = /./s.match("\303\251".force_encoding(Encoding::Windows_31J))
-    match.to_a.should == ["\303".force_encoding(Encoding::Windows_31J)]
+    match = /./s.match("\303\251".dup.force_encoding(Encoding::Windows_31J))
+    match.to_a.should == ["\303".dup.force_encoding(Encoding::Windows_31J)]
   end
 
   it "supports /s (Windows_31J encoding) with interpolation" do
-    match = /#{/./}/s.match("\303\251".force_encoding(Encoding::Windows_31J))
-    match.to_a.should == ["\303".force_encoding(Encoding::Windows_31J)]
+    match = /#{/./}/s.match("\303\251".dup.force_encoding(Encoding::Windows_31J))
+    match.to_a.should == ["\303".dup.force_encoding(Encoding::Windows_31J)]
   end
 
   it "supports /s (Windows_31J encoding) with interpolation and /o" do
-    match = /#{/./}/s.match("\303\251".force_encoding(Encoding::Windows_31J))
-    match.to_a.should == ["\303".force_encoding(Encoding::Windows_31J)]
+    match = /#{/./}/s.match("\303\251".dup.force_encoding(Encoding::Windows_31J))
+    match.to_a.should == ["\303".dup.force_encoding(Encoding::Windows_31J)]
   end
 
   it 'uses Windows-31J as /s encoding' do
@@ -86,15 +86,15 @@
   end
 
   it "supports /u (UTF8 encoding)" do
-    /./u.match("\303\251".force_encoding('utf-8')).to_a.should == ["\u{e9}"]
+    /./u.match("\303\251".dup.force_encoding('utf-8')).to_a.should == ["\u{e9}"]
   end
 
   it "supports /u (UTF8 encoding) with interpolation" do
-    /#{/./}/u.match("\303\251".force_encoding('utf-8')).to_a.should == ["\u{e9}"]
+    /#{/./}/u.match("\303\251".dup.force_encoding('utf-8')).to_a.should == ["\u{e9}"]
   end
 
   it "supports /u (UTF8 encoding) with interpolation and /o" do
-    /#{/./}/u.match("\303\251".force_encoding('utf-8')).to_a.should == ["\u{e9}"]
+    /#{/./}/u.match("\303\251".dup.force_encoding('utf-8')).to_a.should == ["\u{e9}"]
   end
 
   it 'uses UTF-8 as /u encoding' do
@@ -122,26 +122,26 @@
   end
 
   it "raises Encoding::CompatibilityError when the regexp has a fixed, non-ASCII-compatible encoding" do
-    -> { Regexp.new("".force_encoding("UTF-16LE"), Regexp::FIXEDENCODING) =~ " ".encode("UTF-8") }.should raise_error(Encoding::CompatibilityError)
+    -> { Regexp.new("".dup.force_encoding("UTF-16LE"), Regexp::FIXEDENCODING) =~ " ".encode("UTF-8") }.should raise_error(Encoding::CompatibilityError)
   end
 
   it "raises Encoding::CompatibilityError when the regexp has a fixed encoding and the match string has non-ASCII characters" do
-    -> { Regexp.new("".force_encoding("US-ASCII"), Regexp::FIXEDENCODING) =~ "\303\251".force_encoding('UTF-8') }.should raise_error(Encoding::CompatibilityError)
+    -> { Regexp.new("".dup.force_encoding("US-ASCII"), Regexp::FIXEDENCODING) =~ "\303\251".dup.force_encoding('UTF-8') }.should raise_error(Encoding::CompatibilityError)
   end
 
   it "raises ArgumentError when trying to match a broken String" do
-    s = "\x80".force_encoding('UTF-8')
+    s = "\x80".dup.force_encoding('UTF-8')
     -> { s =~ /./ }.should raise_error(ArgumentError, "invalid byte sequence in UTF-8")
   end
 
   it "computes the Regexp Encoding for each interpolated Regexp instance" do
     make_regexp = -> str { /#{str}/ }
 
-    r = make_regexp.call("été".force_encoding(Encoding::UTF_8))
+    r = make_regexp.call("été".dup.force_encoding(Encoding::UTF_8))
     r.should.fixed_encoding?
     r.encoding.should == Encoding::UTF_8
 
-    r = make_regexp.call("abc".force_encoding(Encoding::UTF_8))
+    r = make_regexp.call("abc".dup.force_encoding(Encoding::UTF_8))
     r.should_not.fixed_encoding?
     r.encoding.should == Encoding::US_ASCII
   end
diff --git a/spec/ruby/language/regexp/escapes_spec.rb b/spec/ruby/language/regexp/escapes_spec.rb
index 16a4d8c23b2bf6..541998b9373179 100644
--- a/spec/ruby/language/regexp/escapes_spec.rb
+++ b/spec/ruby/language/regexp/escapes_spec.rb
@@ -1,4 +1,4 @@
-# -*- encoding: binary -*-
+# encoding: binary
 require_relative '../../spec_helper'
 require_relative '../fixtures/classes'
 
diff --git a/spec/ruby/language/regexp/grouping_spec.rb b/spec/ruby/language/regexp/grouping_spec.rb
index 2f04a04018b6c8..313858f7141987 100644
--- a/spec/ruby/language/regexp/grouping_spec.rb
+++ b/spec/ruby/language/regexp/grouping_spec.rb
@@ -12,7 +12,7 @@
   end
 
   it "raises a SyntaxError when parentheses aren't balanced" do
-   -> { eval "/(hay(st)ack/" }.should raise_error(SyntaxError)
+    -> { eval "/(hay(st)ack/" }.should raise_error(SyntaxError)
   end
 
   it "supports (?: ) (non-capturing group)" do
diff --git a/spec/ruby/language/regexp_spec.rb b/spec/ruby/language/regexp_spec.rb
index cdafd29f49c7f8..0cd9584549b801 100644
--- a/spec/ruby/language/regexp_spec.rb
+++ b/spec/ruby/language/regexp_spec.rb
@@ -62,7 +62,7 @@
     end
   end
 
-  it "supports non-paired delimiters delimiters with %r" do
+  it "supports non-paired delimiters with %r" do
     LanguageSpecs.non_paired_delimiters.each do |c|
       eval("%r#{c} foo #{c}").should == / foo /
     end
@@ -112,7 +112,7 @@
     /foo.(?<=\d)/.match("fooA foo1").to_a.should == ["foo1"]
   end
 
-  ruby_bug "#13671", ""..."3.4" do # https://bugs.ruby-lang.org/issues/13671
+  ruby_bug "#13671", ""..."3.6" do # https://bugs.ruby-lang.org/issues/13671
     it "handles a lookbehind with ss characters" do
       r =  Regexp.new("(?<!dss)", Regexp::IGNORECASE)
       r.should =~ "✨"
diff --git a/spec/ruby/language/rescue_spec.rb b/spec/ruby/language/rescue_spec.rb
index b91b52fa0f0a23..79571d689f35e1 100644
--- a/spec/ruby/language/rescue_spec.rb
+++ b/spec/ruby/language/rescue_spec.rb
@@ -52,6 +52,16 @@ class ArbitraryException < StandardError
       RescueSpecs::SafeNavigationSetterCaptor.should_capture_exception
     end
 
+    it 'using a safely navigated setter method on a nil target' do
+      target = nil
+      begin
+        raise SpecificExampleException, "Raising this to be handled below"
+      rescue SpecificExampleException => target&.captured_error
+        :caught
+      end.should == :caught
+      target.should be_nil
+    end
+
     it 'using a setter method' do
       RescueSpecs::SetterCaptor.should_capture_exception
     end
@@ -61,6 +71,78 @@ class ArbitraryException < StandardError
     end
   end
 
+  describe 'capturing in a local variable (that defines it)' do
+    it 'captures successfully in a method' do
+      ScratchPad.record []
+
+      def a
+        raise "message"
+      rescue => e
+        ScratchPad << e.message
+      end
+
+      a
+      ScratchPad.recorded.should == ["message"]
+    end
+
+    it 'captures successfully in a block' do
+      ScratchPad.record []
+
+      p = proc do
+        raise "message"
+      rescue => e
+        ScratchPad << e.message
+      end
+
+      p.call
+      ScratchPad.recorded.should == ["message"]
+    end
+
+    it 'captures successfully in a class' do
+      ScratchPad.record []
+
+      class RescueSpecs::C
+        raise "message"
+      rescue => e
+        ScratchPad << e.message
+      end
+
+      ScratchPad.recorded.should == ["message"]
+    end
+
+    it 'captures successfully in a module' do
+      ScratchPad.record []
+
+      module RescueSpecs::M
+        raise "message"
+      rescue => e
+        ScratchPad << e.message
+      end
+
+      ScratchPad.recorded.should == ["message"]
+    end
+
+    it 'captures sucpcessfully in a singleton class' do
+      ScratchPad.record []
+
+      class << Object.new
+        raise "message"
+      rescue => e
+        ScratchPad << e.message
+      end
+
+      ScratchPad.recorded.should == ["message"]
+    end
+
+    it 'captures successfully at the top-level' do
+      ScratchPad.record []
+
+      require_relative 'fixtures/rescue/top_level'
+
+      ScratchPad.recorded.should == ["message"]
+    end
+  end
+
   it "returns value from `rescue` if an exception was raised" do
     begin
       raise
@@ -191,7 +273,7 @@ class ArbitraryException < StandardError
       rescue ArgumentError
       end
     rescue StandardError => e
-      e.backtrace.first.should include ":in `raise_standard_error'"
+      e.backtrace.first.should =~ /:in [`'](?:RescueSpecs\.)?raise_standard_error'/
     else
       fail("exception wasn't handled by the correct rescue block")
     end
@@ -481,6 +563,21 @@ class RescueInClassExample
     eval('1.+((1 rescue 1))').should == 2
   end
 
+  ruby_version_is "3.4" do
+    it "does not introduce extra backtrace entries" do
+      def foo
+        begin
+          raise "oops"
+        rescue
+          return caller(0, 2)
+        end
+      end
+      line = __LINE__
+      foo[0].should =~ /#{__FILE__}:#{line-3}:in 'foo'/
+      foo[1].should =~ /#{__FILE__}:#{line+2}:in 'block/
+    end
+  end
+
   describe "inline form" do
     it "can be inlined" do
       a = 1/0 rescue 1
diff --git a/spec/ruby/language/retry_spec.rb b/spec/ruby/language/retry_spec.rb
index ee5377946f7ef9..669d5f0ff51904 100644
--- a/spec/ruby/language/retry_spec.rb
+++ b/spec/ruby/language/retry_spec.rb
@@ -31,8 +31,11 @@
     results.should == [1, 2, 3, 1, 2, 4, 5, 6, 4, 5]
   end
 
-  it "raises a SyntaxError when used outside of a begin statement" do
+  it "raises a SyntaxError when used outside of a rescue statement" do
     -> { eval 'retry' }.should raise_error(SyntaxError)
+    -> { eval 'begin; retry; end' }.should raise_error(SyntaxError)
+    -> { eval 'def m; retry; end' }.should raise_error(SyntaxError)
+    -> { eval 'module RetrySpecs; retry; end' }.should raise_error(SyntaxError)
   end
 end
 
diff --git a/spec/ruby/language/safe_navigator_spec.rb b/spec/ruby/language/safe_navigator_spec.rb
index c3aecff2dd0f12..b1e28c3963f176 100644
--- a/spec/ruby/language/safe_navigator_spec.rb
+++ b/spec/ruby/language/safe_navigator_spec.rb
@@ -7,43 +7,43 @@
 
   context "when context is nil" do
     it "always returns nil" do
-      eval("nil&.unknown").should == nil
-      eval("[][10]&.unknown").should == nil
+      nil&.unknown.should == nil
+      [][10]&.unknown.should == nil
     end
 
     it "can be chained" do
-      eval("nil&.one&.two&.three").should == nil
+      nil&.one&.two&.three.should == nil
     end
 
     it "doesn't evaluate arguments" do
       obj = Object.new
       obj.should_not_receive(:m)
-      eval("nil&.unknown(obj.m) { obj.m }")
+      nil&.unknown(obj.m) { obj.m }
     end
   end
 
   context "when context is false" do
     it "calls the method" do
-      eval("false&.to_s").should == "false"
+      false&.to_s.should == "false"
 
-      -> { eval("false&.unknown") }.should raise_error(NoMethodError)
+      -> { false&.unknown }.should raise_error(NoMethodError)
     end
   end
 
   context "when context is truthy" do
     it "calls the method" do
-      eval("1&.to_s").should == "1"
+      1&.to_s.should == "1"
 
-      -> { eval("1&.unknown") }.should raise_error(NoMethodError)
+      -> { 1&.unknown }.should raise_error(NoMethodError)
     end
   end
 
   it "takes a list of arguments" do
-    eval("[1,2,3]&.first(2)").should == [1,2]
+    [1,2,3]&.first(2).should == [1,2]
   end
 
   it "takes a block" do
-    eval("[1,2]&.map { |i| i * 2 }").should == [2, 4]
+    [1,2]&.map { |i| i * 2 }.should == [2, 4]
   end
 
   it "allows assignment methods" do
@@ -56,29 +56,77 @@ def foo=(val)
     end
     obj = klass.new
 
-    eval("obj&.foo = 3").should == 3
+    (obj&.foo = 3).should == 3
     obj.foo.should == 3
 
     obj = nil
-    eval("obj&.foo = 3").should == nil
+    (obj&.foo = 3).should == nil
   end
 
   it "allows assignment operators" do
     klass = Class.new do
-      attr_accessor :m
+      attr_reader :m
 
       def initialize
         @m = 0
       end
+
+      def m=(v)
+        @m = v
+        42
+      end
     end
 
     obj = klass.new
 
-    eval("obj&.m += 3")
+    obj&.m += 3
     obj.m.should == 3
 
     obj = nil
-    eval("obj&.m += 3").should == nil
+    (obj&.m += 3).should == nil
+  end
+
+  it "allows ||= operator" do
+    klass = Class.new do
+      attr_reader :m
+
+      def initialize
+        @m = false
+      end
+
+      def m=(v)
+        @m = v
+        42
+      end
+    end
+
+    obj = klass.new
+
+    (obj&.m ||= true).should == true
+    obj.m.should == true
+
+    obj = nil
+    (obj&.m ||= true).should == nil
+    obj.should == nil
+  end
+
+  it "allows &&= operator" do
+    klass = Class.new do
+      attr_accessor :m
+
+      def initialize
+        @m = true
+      end
+    end
+
+    obj = klass.new
+
+    (obj&.m &&= false).should == false
+    obj.m.should == false
+
+    obj = nil
+    (obj&.m &&= false).should == nil
+    obj.should == nil
   end
 
   it "does not call the operator method lazily with an assignment operator" do
@@ -91,7 +139,7 @@ def foo
     obj = klass.new
 
     -> {
-      eval("obj&.foo += 3")
+      obj&.foo += 3
     }.should raise_error(NoMethodError) { |e|
       e.name.should == :+
     }
diff --git a/spec/ruby/language/send_spec.rb b/spec/ruby/language/send_spec.rb
index a1656559fe99c5..aaccdf0998b135 100644
--- a/spec/ruby/language/send_spec.rb
+++ b/spec/ruby/language/send_spec.rb
@@ -43,7 +43,7 @@
   end
 
   describe "with optional arguments" do
-    it "uses the optional argument if none is is passed" do
+    it "uses the optional argument if none is passed" do
       specs.fooM0O1.should == [1]
     end
 
diff --git a/spec/ruby/language/singleton_class_spec.rb b/spec/ruby/language/singleton_class_spec.rb
index 7512f0eb398ffa..45e1f7f3ad5936 100644
--- a/spec/ruby/language/singleton_class_spec.rb
+++ b/spec/ruby/language/singleton_class_spec.rb
@@ -70,7 +70,7 @@
   end
 
   it "has class String as the superclass of a String instance" do
-    "blah".singleton_class.superclass.should == String
+    "blah".dup.singleton_class.superclass.should == String
   end
 
   it "doesn't have singleton class" do
@@ -307,4 +307,11 @@ def singleton_method; 1 end
     o.freeze
     klass.frozen?.should == true
   end
+
+  it "will be unfrozen if the frozen object is cloned with freeze set to false" do
+    o = Object.new
+    o.freeze
+    o2 = o.clone(freeze: false)
+    o2.singleton_class.frozen?.should == false
+  end
 end
diff --git a/spec/ruby/language/string_spec.rb b/spec/ruby/language/string_spec.rb
index 418dc2ca7d9622..f287731bed518e 100644
--- a/spec/ruby/language/string_spec.rb
+++ b/spec/ruby/language/string_spec.rb
@@ -1,6 +1,7 @@
-# -*- encoding: binary -*-
+# encoding: binary
 
 require_relative '../spec_helper'
+require_relative 'fixtures/class_with_class_variable'
 
 # TODO: rewrite these horrid specs. it "are..." seriously?!
 
@@ -27,6 +28,11 @@
     "#$ip".should == 'xxx'
   end
 
+  it "interpolate class variables just with the # character" do
+    object = StringSpecs::ClassWithClassVariable.new
+    object.foo.should == 'xxx'
+  end
+
   it "allows underscore as part of a variable name in a simple interpolation" do
     @my_ip = 'xxx'
     "#@my_ip".should == 'xxx'
@@ -231,8 +237,16 @@ def long_string_literals
       ruby_exe(fixture(__FILE__, "freeze_magic_comment_across_files.rb")).chomp.should == "true"
     end
 
-    it "produce different objects for literals with the same content in different files if the other file doesn't have the comment" do
-      ruby_exe(fixture(__FILE__, "freeze_magic_comment_across_files_no_comment.rb")).chomp.should == "true"
+    guard -> { !(eval("'test'").frozen? && "test".equal?("test")) } do
+      it "produces different objects for literals with the same content in different files if the other file doesn't have the comment and String literals aren't frozen by default" do
+        ruby_exe(fixture(__FILE__, "freeze_magic_comment_across_files_no_comment.rb")).chomp.should == "true"
+      end
+    end
+
+    guard -> { eval("'test'").frozen? && "test".equal?("test") } do
+      it "produces the same objects for literals with the same content in different files if the other file doesn't have the comment and String literals are frozen by default" do
+        ruby_exe(fixture(__FILE__, "freeze_magic_comment_across_files_no_comment.rb")).chomp.should == "false"
+      end
     end
 
     it "produce different objects for literals with the same content in different files if they have different encodings" do
@@ -251,12 +265,12 @@ def long_string_literals
 
   it "returns a string with the source encoding by default" do
     "a#{"b"}c".encoding.should == Encoding::BINARY
-    eval('"a#{"b"}c"'.force_encoding("us-ascii")).encoding.should == Encoding::US_ASCII
+    eval('"a#{"b"}c"'.dup.force_encoding("us-ascii")).encoding.should == Encoding::US_ASCII
     eval("# coding: US-ASCII \n 'a#{"b"}c'").encoding.should == Encoding::US_ASCII
   end
 
   it "returns a string with the source encoding, even if the components have another encoding" do
-    a = "abc".force_encoding("euc-jp")
+    a = "abc".dup.force_encoding("euc-jp")
     "#{a}".encoding.should == Encoding::BINARY
 
     b = "abc".encode("utf-8")
@@ -265,22 +279,22 @@ def long_string_literals
 
   it "raises an Encoding::CompatibilityError if the Encodings are not compatible" do
     a = "\u3042"
-    b = "\xff".force_encoding "binary"
+    b = "\xff".dup.force_encoding "binary"
 
     -> { "#{a} #{b}" }.should raise_error(Encoding::CompatibilityError)
   end
 
   it "creates a non-frozen String" do
     code = <<~'RUBY'
-    "a#{6*7}c"
+      "a#{6*7}c"
     RUBY
     eval(code).should_not.frozen?
   end
 
   it "creates a non-frozen String when # frozen-string-literal: true is used" do
     code = <<~'RUBY'
-    # frozen-string-literal: true
-    "a#{6*7}c"
+      # frozen-string-literal: true
+      "a#{6*7}c"
     RUBY
     eval(code).should_not.frozen?
   end
diff --git a/spec/ruby/language/super_spec.rb b/spec/ruby/language/super_spec.rb
index d22c603605679a..7d9e896d8b1199 100644
--- a/spec/ruby/language/super_spec.rb
+++ b/spec/ruby/language/super_spec.rb
@@ -70,7 +70,7 @@
     SuperSpecs::S4::B.new.foo([],"test").should == ["B#foo(a,test)", "A#foo"]
   end
 
-  it "raises an error error when super method does not exist" do
+  it "raises an error when super method does not exist" do
     sup = Class.new
     sub_normal = Class.new(sup) do
       def foo
@@ -335,6 +335,13 @@ def obj.foobar(array)
 
   it "without explicit arguments that are '_'" do
     SuperSpecs::ZSuperWithUnderscores::B.new.m(1, 2).should == [1, 2]
+    SuperSpecs::ZSuperWithUnderscores::B.new.m3(1, 2, 3).should == [1, 2, 3]
+    SuperSpecs::ZSuperWithUnderscores::B.new.m4(1, 2, 3, 4).should == [1, 2, 3, 4]
+    SuperSpecs::ZSuperWithUnderscores::B.new.m_default(1).should == [1]
+    SuperSpecs::ZSuperWithUnderscores::B.new.m_default.should == [0]
+    SuperSpecs::ZSuperWithUnderscores::B.new.m_pre_default_rest_post(1, 2, 3, 4, 5, 6, 7).should == [1, 2, 3, 4, 5, 6, 7]
+    SuperSpecs::ZSuperWithUnderscores::B.new.m_rest(1, 2).should == [1, 2]
+    SuperSpecs::ZSuperWithUnderscores::B.new.m_kwrest(a: 1).should == {a: 1}
   end
 
   it "without explicit arguments that are '_' including any modifications" do
diff --git a/spec/ruby/language/symbol_spec.rb b/spec/ruby/language/symbol_spec.rb
index 7c1898efc25f5c..0801d3223ece0d 100644
--- a/spec/ruby/language/symbol_spec.rb
+++ b/spec/ruby/language/symbol_spec.rb
@@ -96,11 +96,13 @@
     %I{a b #{"c"}}.should == [:a, :b, :c]
   end
 
-  it "raises an EncodingError at parse time when Symbol with invalid bytes" do
-    ScratchPad.record []
-    -> {
-      eval 'ScratchPad << 1; :"\xC3"'
-    }.should raise_error(EncodingError, 'invalid symbol in encoding UTF-8 :"\xC3"')
-    ScratchPad.recorded.should == []
+  ruby_bug "#20280", ""..."3.4" do
+    it "raises an SyntaxError at parse time when Symbol with invalid bytes" do
+      ScratchPad.record []
+      -> {
+        eval 'ScratchPad << 1; :"\xC3"'
+      }.should raise_error(SyntaxError, /invalid symbol/)
+      ScratchPad.recorded.should == []
+    end
   end
 end
diff --git a/spec/ruby/language/undef_spec.rb b/spec/ruby/language/undef_spec.rb
index 29dba4afb4da7a..268c0b84c3965e 100644
--- a/spec/ruby/language/undef_spec.rb
+++ b/spec/ruby/language/undef_spec.rb
@@ -69,7 +69,7 @@ def method2; :nope; end
   it "raises a NameError when passed a missing name" do
     Class.new do
       -> {
-         undef not_exist
+        undef not_exist
       }.should raise_error(NameError) { |e|
         # a NameError and not a NoMethodError
         e.class.should == NameError
diff --git a/spec/ruby/language/variables_spec.rb b/spec/ruby/language/variables_spec.rb
index 23c2cdb5574f78..eb080eea559a5a 100644
--- a/spec/ruby/language/variables_spec.rb
+++ b/spec/ruby/language/variables_spec.rb
@@ -14,69 +14,34 @@
   end
 
   context "with multiple assignment" do
-    ruby_version_is ""..."3.1" do
-      it "does not evaluate from left to right" do
-        obj = VariablesSpecs::EvalOrder.new
-
-        obj.instance_eval do
-          foo[0], bar.baz = a, b
-        end
-
-        obj.order.should == ["a", "b", "foo", "foo[]=", "bar", "bar.baz="]
+    it "evaluates from left to right, receivers first then methods" do
+      obj = VariablesSpecs::EvalOrder.new
+      obj.instance_eval do
+        foo[0], bar.baz = a, b
       end
 
-      it "cannot be used to swap variables with nested method calls" do
-        node = VariablesSpecs::EvalOrder.new.node
-
-        original_node = node
-        original_node_left = node.left
-        original_node_left_right = node.left.right
-
-        node.left, node.left.right, node = node.left.right, node, node.left
-        # Should evaluate in the order of:
-        # RHS: node.left.right, node, node.left
-        # LHS:
-        # * node(original_node), original_node.left = original_node_left_right
-        # * node(original_node), node.left(changed in the previous assignment to original_node_left_right),
-        #   original_node_left_right.right = original_node
-        # * node = original_node_left
-
-        node.should == original_node_left
-        node.right.should_not == original_node
-        node.right.left.should_not == original_node_left_right
-      end
+      obj.order.should == ["foo", "bar", "a", "b", "foo[]=", "bar.baz="]
     end
 
-    ruby_version_is "3.1" do
-      it "evaluates from left to right, receivers first then methods" do
-        obj = VariablesSpecs::EvalOrder.new
-        obj.instance_eval do
-          foo[0], bar.baz = a, b
-        end
+    it "can be used to swap variables with nested method calls" do
+      node = VariablesSpecs::EvalOrder.new.node
 
-        obj.order.should == ["foo", "bar", "a", "b", "foo[]=", "bar.baz="]
-      end
+      original_node = node
+      original_node_left = node.left
+      original_node_left_right = node.left.right
 
-      it "can be used to swap variables with nested method calls" do
-        node = VariablesSpecs::EvalOrder.new.node
-
-        original_node = node
-        original_node_left = node.left
-        original_node_left_right = node.left.right
-
-        node.left, node.left.right, node = node.left.right, node, node.left
-        # Should evaluate in the order of:
-        # LHS: node, node.left(original_node_left)
-        # RHS: original_node_left_right, original_node, original_node_left
-        # Ops:
-        # * node(original_node), original_node.left = original_node_left_right
-        # * original_node_left.right = original_node
-        # * node = original_node_left
-
-        node.should == original_node_left
-        node.right.should == original_node
-        node.right.left.should == original_node_left_right
-      end
+      node.left, node.left.right, node = node.left.right, node, node.left
+      # Should evaluate in the order of:
+      # LHS: node, node.left(original_node_left)
+      # RHS: original_node_left_right, original_node, original_node_left
+      # Ops:
+      # * node(original_node), original_node.left = original_node_left_right
+      # * original_node_left.right = original_node
+      # * node = original_node_left
+
+      node.should == original_node_left
+      node.right.should == original_node
+      node.right.left.should == original_node_left_right
     end
   end
 end
@@ -367,8 +332,13 @@ def x(a) a end
 
     it "assigns indexed elements" do
       a = []
-      a[1], a[2] = 1
-      a.should == [nil, 1, nil]
+      a[1], a[2] = 1, 2
+      a.should == [nil, 1, 2]
+
+      # with splatted argument
+      a = []
+      a[*[1]], a[*[2]] = 1, 2
+      a.should == [nil, 1, 2]
     end
 
     it "assigns constants" do
@@ -376,6 +346,9 @@ module VariableSpecs
         SINGLE_RHS_1, SINGLE_RHS_2 = 1
         [SINGLE_RHS_1, SINGLE_RHS_2].should == [1, nil]
       end
+    ensure
+      VariableSpecs.send(:remove_const, :SINGLE_RHS_1)
+      VariableSpecs.send(:remove_const, :SINGLE_RHS_2)
     end
   end
 
@@ -390,11 +363,22 @@ module VariableSpecs
       a.should == []
     end
 
-    it "calls #to_a to convert nil to an empty Array" do
-      nil.should_receive(:to_a).and_return([])
+    ruby_version_is "3.5" do
+      it "converts nil to empty array without calling a method" do
+        nil.should_not_receive(:to_a)
 
-      (*a = *nil).should == []
-      a.should == []
+        (*a = *nil).should == []
+        a.should == []
+      end
+    end
+
+    ruby_version_is ""..."3.5"  do
+      it "calls #to_a to convert nil to an empty Array" do
+        nil.should_receive(:to_a).and_return([])
+
+        (*a = *nil).should == []
+        a.should == []
+      end
     end
 
     it "does not call #to_a on an Array" do
@@ -614,6 +598,8 @@ module VariableSpecs
         (*SINGLE_SPLATTED_RHS) = *1
         SINGLE_SPLATTED_RHS.should == [1]
       end
+    ensure
+      VariableSpecs.send(:remove_const, :SINGLE_SPLATTED_RHS)
     end
   end
 
@@ -813,6 +799,9 @@ module VariableSpecs
         MRHS_VALUES_1.should == 1
         MRHS_VALUES_2.should == 2
       end
+    ensure
+      VariableSpecs.send(:remove_const, :MRHS_VALUES_1)
+      VariableSpecs.send(:remove_const, :MRHS_VALUES_2)
     end
 
     it "assigns all RHS values as an array to a single LHS constant" do
@@ -820,6 +809,8 @@ module VariableSpecs
         MRHS_VALUES = 1, 2, 3
         MRHS_VALUES.should == [1, 2, 3]
       end
+    ensure
+      VariableSpecs.send(:remove_const, :MRHS_VALUES)
     end
   end
 
@@ -925,7 +916,7 @@ def obj.foobar; @a ||= 42; end
         obj = Object.new
         def obj.foobar; a = $specs_uninitialized_global_variable; end
 
-        -> { obj.foobar }.should complain(/warning: global variable `\$specs_uninitialized_global_variable' not initialized/, verbose: true)
+        -> { obj.foobar }.should complain(/warning: global variable [`']\$specs_uninitialized_global_variable' not initialized/, verbose: true)
       end
 
       it "doesn't warn at lazy initialization" do
diff --git a/spec/ruby/language/yield_spec.rb b/spec/ruby/language/yield_spec.rb
index 5283517636d202..e125cf8e738bea 100644
--- a/spec/ruby/language/yield_spec.rb
+++ b/spec/ruby/language/yield_spec.rb
@@ -206,3 +206,15 @@ class << Object.new
     -> { eval(code) }.should raise_error(SyntaxError, /Invalid yield/)
   end
 end
+
+describe "Using yield in a module literal" do
+  it 'raises a SyntaxError' do
+    code = <<~RUBY
+      module YieldSpecs::ModuleWithYield
+        yield
+      end
+    RUBY
+
+    -> { eval(code) }.should raise_error(SyntaxError, /Invalid yield/)
+  end
+end
diff --git a/spec/ruby/library/English/English_spec.rb b/spec/ruby/library/English/English_spec.rb
index 480602d5e5937c..4d615d1e2506ef 100644
--- a/spec/ruby/library/English/English_spec.rb
+++ b/spec/ruby/library/English/English_spec.rb
@@ -130,13 +130,15 @@
     $LAST_MATCH_INFO.should == $~
   end
 
-  it "aliases $IGNORECASE to $=" do
-    $VERBOSE, verbose = nil, $VERBOSE
-    begin
-      $IGNORECASE.should_not be_nil
-      $IGNORECASE.should == $=
-    ensure
-      $VERBOSE = verbose
+  ruby_version_is ""..."3.3" do
+    it "aliases $IGNORECASE to $=" do
+      $VERBOSE, verbose = nil, $VERBOSE
+      begin
+        $IGNORECASE.should_not be_nil
+        $IGNORECASE.should == $=
+      ensure
+        $VERBOSE = verbose
+      end
     end
   end
 
diff --git a/spec/ruby/library/bigdecimal/BigDecimal_spec.rb b/spec/ruby/library/bigdecimal/BigDecimal_spec.rb
index 43a779b420ea35..45f5ebffc702f6 100644
--- a/spec/ruby/library/bigdecimal/BigDecimal_spec.rb
+++ b/spec/ruby/library/bigdecimal/BigDecimal_spec.rb
@@ -98,7 +98,11 @@
       BigDecimal("invalid", exception: false).should be_nil
       BigDecimal("0invalid", exception: false).should be_nil
       BigDecimal("invalid0", exception: false).should be_nil
-      BigDecimal("0.", exception: false).should be_nil
+      if BigDecimal::VERSION >= "3.1.9"
+        BigDecimal("0.", exception: false).to_i.should == 0
+      else
+        BigDecimal("0.", exception: false).should be_nil
+      end
     end
   end
 
diff --git a/spec/ruby/library/bigdecimal/core_spec.rb b/spec/ruby/library/bigdecimal/core_spec.rb
new file mode 100644
index 00000000000000..acee4dcf564ea6
--- /dev/null
+++ b/spec/ruby/library/bigdecimal/core_spec.rb
@@ -0,0 +1,59 @@
+require_relative '../../spec_helper'
+require 'bigdecimal'
+
+describe "Core extension by bigdecimal" do
+  context "Integer#coerce" do
+    it "produces Floats" do
+      x, y = 3.coerce(BigDecimal("3.4"))
+      x.class.should == Float
+      x.should == 3.4
+      y.class.should == Float
+      y.should == 3.0
+    end
+  end
+
+  describe "Time.at passed BigDecimal" do
+    it "doesn't round input value" do
+      Time.at(BigDecimal('1.1')).to_f.should == 1.1
+    end
+  end
+
+  describe "BigDecimal#log" do
+    it "handles high-precision Rational arguments" do
+      result = BigDecimal('0.22314354220170971436137296411949880462556361100856391620766259404746040597133837784E0')
+      r = Rational(1_234_567_890, 987_654_321)
+      BigMath.log(r, 50).should == result
+    end
+  end
+
+  describe "Rational#coerce" do
+    it "returns the passed argument, self as Float, when given a Float" do
+      result = Rational(3, 4).coerce(1.0)
+      result.should == [1.0, 0.75]
+      result.first.is_a?(Float).should be_true
+      result.last.is_a?(Float).should be_true
+    end
+
+    it "returns the passed argument, self as Rational, when given an Integer" do
+      result = Rational(3, 4).coerce(10)
+      result.should == [Rational(10, 1), Rational(3, 4)]
+      result.first.is_a?(Rational).should be_true
+      result.last.is_a?(Rational).should be_true
+    end
+
+    it "coerces to Rational, when given a Complex" do
+      Rational(3, 4).coerce(Complex(5)).should == [Rational(5, 1), Rational(3, 4)]
+      Rational(12, 4).coerce(Complex(5, 1)).should == [Complex(5, 1), Complex(3)]
+    end
+
+    it "returns [argument, self] when given a Rational" do
+      Rational(3, 7).coerce(Rational(9, 2)).should == [Rational(9, 2), Rational(3, 7)]
+    end
+
+    it "raises an error when passed a BigDecimal" do
+      -> {
+        Rational(500, 3).coerce(BigDecimal('166.666666666'))
+      }.should raise_error(TypeError, /BigDecimal can't be coerced into Rational/)
+    end
+  end
+end
diff --git a/spec/ruby/library/bigdecimal/fix_spec.rb b/spec/ruby/library/bigdecimal/fix_spec.rb
index 231c9a587e3cae..2c6276899ed98c 100644
--- a/spec/ruby/library/bigdecimal/fix_spec.rb
+++ b/spec/ruby/library/bigdecimal/fix_spec.rb
@@ -2,20 +2,20 @@
 require 'bigdecimal'
 
 describe "BigDecimal#fix" do
-    before :each do
-      @zero = BigDecimal("0")
-      @mixed = BigDecimal("1.23456789")
-      @pos_int = BigDecimal("2E5555")
-      @neg_int = BigDecimal("-2E5555")
-      @pos_frac = BigDecimal("2E-9999")
-      @neg_frac = BigDecimal("-2E-9999")
-
-      @infinity = BigDecimal("Infinity")
-      @infinity_neg = BigDecimal("-Infinity")
-      @nan = BigDecimal("NaN")
-      @zero_pos = BigDecimal("+0")
-      @zero_neg = BigDecimal("-0")
-    end
+  before :each do
+    @zero = BigDecimal("0")
+    @mixed = BigDecimal("1.23456789")
+    @pos_int = BigDecimal("2E5555")
+    @neg_int = BigDecimal("-2E5555")
+    @pos_frac = BigDecimal("2E-9999")
+    @neg_frac = BigDecimal("-2E-9999")
+
+    @infinity = BigDecimal("Infinity")
+    @infinity_neg = BigDecimal("-Infinity")
+    @nan = BigDecimal("NaN")
+    @zero_pos = BigDecimal("+0")
+    @zero_neg = BigDecimal("-0")
+  end
 
   it "returns a BigDecimal" do
     BigDecimal("2E100000000").fix.kind_of?(BigDecimal).should == true
diff --git a/spec/ruby/library/bigdecimal/round_spec.rb b/spec/ruby/library/bigdecimal/round_spec.rb
index fba52df65d3b51..6a4d220417c135 100644
--- a/spec/ruby/library/bigdecimal/round_spec.rb
+++ b/spec/ruby/library/bigdecimal/round_spec.rb
@@ -228,15 +228,7 @@
     -> { BigDecimal('-Infinity').round(2) }.should_not raise_error(FloatDomainError)
   end
 
-  version_is BigDecimal::VERSION, ''...'3.1.3' do #ruby_version_is ''...'3.2' do
-    it 'raise for a non-existent round mode' do
-      -> { @p1_50.round(0, :nonsense) }.should raise_error(ArgumentError, "invalid rounding mode")
-    end
-  end
-
-  version_is BigDecimal::VERSION, '3.1.3' do #ruby_version_is '3.2' do
-    it 'raise for a non-existent round mode' do
-      -> { @p1_50.round(0, :nonsense) }.should raise_error(ArgumentError, "invalid rounding mode (nonsense)")
-    end
+  it 'raise for a non-existent round mode' do
+    -> { @p1_50.round(0, :nonsense) }.should raise_error(ArgumentError, "invalid rounding mode (nonsense)")
   end
 end
diff --git a/spec/ruby/library/bigdecimal/shared/quo.rb b/spec/ruby/library/bigdecimal/shared/quo.rb
index 46e6d62bf4bffd..18ff2fe9a5a6ea 100644
--- a/spec/ruby/library/bigdecimal/shared/quo.rb
+++ b/spec/ruby/library/bigdecimal/shared/quo.rb
@@ -31,6 +31,7 @@
 
   describe "with Object" do
     it "tries to coerce the other operand to self" do
+      skip if @method == :div
       object = mock("Object")
       object.should_receive(:coerce).with(@one).and_return([@one, @two])
       @one.send(@method, object, *@object).should == BigDecimal("0.5")
diff --git a/spec/ruby/library/bigdecimal/split_spec.rb b/spec/ruby/library/bigdecimal/split_spec.rb
index f9b4bab5f7455b..53b1f649d94401 100644
--- a/spec/ruby/library/bigdecimal/split_spec.rb
+++ b/spec/ruby/library/bigdecimal/split_spec.rb
@@ -58,16 +58,16 @@
   end
 
   it "third value: the base (currently always ten)" do
-   @arr[2].should == 10
-   @arr_neg[2].should == 10
-   @arr_big[2].should == 10
-   @arr_big_neg[2].should == 10
-   @huge[2].should == 10
-   @infinity.split[2].should == 10
-   @nan.split[2].should == 10
-   @infinity_neg.split[2].should == 10
-   @zero.split[2].should == 10
-   @zero_neg.split[2].should == 10
+    @arr[2].should == 10
+    @arr_neg[2].should == 10
+    @arr_big[2].should == 10
+    @arr_big_neg[2].should == 10
+    @huge[2].should == 10
+    @infinity.split[2].should == 10
+    @nan.split[2].should == 10
+    @infinity_neg.split[2].should == 10
+    @zero.split[2].should == 10
+    @zero_neg.split[2].should == 10
   end
 
   it "fourth value: the exponent" do
diff --git a/spec/ruby/library/bigdecimal/sqrt_spec.rb b/spec/ruby/library/bigdecimal/sqrt_spec.rb
index d149003b9f5a96..42cf4545cb3e26 100644
--- a/spec/ruby/library/bigdecimal/sqrt_spec.rb
+++ b/spec/ruby/library/bigdecimal/sqrt_spec.rb
@@ -36,8 +36,10 @@
     BigDecimal('121').sqrt(5).should be_close(11, 0.00001)
   end
 
-  it "returns square root of 0.9E-99999 with desired precision" do
-    @frac_2.sqrt(1).to_s.should =~ /\A0\.3E-49999\z/i
+  platform_is_not c_long_size: 32 do # fails on i686
+    it "returns square root of 0.9E-99999 with desired precision" do
+      @frac_2.sqrt(1).to_s.should =~ /\A0\.3E-49999\z/i
+    end
   end
 
   it "raises ArgumentError when no argument is given" do
diff --git a/spec/ruby/library/bigdecimal/to_i_spec.rb b/spec/ruby/library/bigdecimal/to_i_spec.rb
index 09481fce154915..e5e65c562e3618 100644
--- a/spec/ruby/library/bigdecimal/to_i_spec.rb
+++ b/spec/ruby/library/bigdecimal/to_i_spec.rb
@@ -3,5 +3,5 @@
 require 'bigdecimal'
 
 describe "BigDecimal#to_i" do
-    it_behaves_like :bigdecimal_to_int, :to_i
+  it_behaves_like :bigdecimal_to_int, :to_i
 end
diff --git a/spec/ruby/library/bigdecimal/to_s_spec.rb b/spec/ruby/library/bigdecimal/to_s_spec.rb
index 63dfaf5e7c357c..ba9f960eb32450 100644
--- a/spec/ruby/library/bigdecimal/to_s_spec.rb
+++ b/spec/ruby/library/bigdecimal/to_s_spec.rb
@@ -39,19 +39,17 @@
     @bigneg.to_s("+").should_not =~ /^\+.*/
   end
 
-  ruby_version_is ""..."3.3" do
-    it "inserts a space every n chars to fraction part, if integer n is supplied" do
-      re =\
-        /\A0\.314 159 265 358 979 323 846 264 338 327 950 288 419 716 939 937E1\z/i
-      @bigdec.to_s(3).should =~ re
-
-      str1 = '-123.45678 90123 45678 9'
-      BigDecimal("-123.45678901234567890").to_s('5F').should ==  str1
-      # trailing zeroes removed
-      BigDecimal("1.00000000000").to_s('1F').should == "1.0"
-      # 0 is treated as no spaces
-      BigDecimal("1.2345").to_s('0F').should == "1.2345"
-    end
+  it "inserts a space every n chars to fraction part, if integer n is supplied" do
+    re =\
+    /\A0\.314 159 265 358 979 323 846 264 338 327 950 288 419 716 939 937E1\z/i
+    @bigdec.to_s(3).should =~ re
+
+    str1 = '-123.45678 90123 45678 9'
+    BigDecimal("-123.45678901234567890").to_s('5F').should ==  str1
+    # trailing zeroes removed
+    BigDecimal("1.00000000000").to_s('1F').should == "1.0"
+    # 0 is treated as no spaces
+    BigDecimal("1.2345").to_s('0F').should == "1.2345"
   end
 
   version_is BigDecimal::VERSION, "3.1.5" do #ruby_version_is '3.3' do
diff --git a/spec/ruby/library/bigdecimal/truncate_spec.rb b/spec/ruby/library/bigdecimal/truncate_spec.rb
index 4ad9eb92d1e760..0ae0421b30fbda 100644
--- a/spec/ruby/library/bigdecimal/truncate_spec.rb
+++ b/spec/ruby/library/bigdecimal/truncate_spec.rb
@@ -4,11 +4,11 @@
 describe "BigDecimal#truncate" do
 
   before :each do
-      @arr = ['3.14159', '8.7', "0.314159265358979323846264338327950288419716939937510582097494459230781640628620899862803482534211706798214808651328230664709384460955058223172535940812848111745028410270193852110555964462294895493038196442881097566593014782083152134043E1"]
-      @big = BigDecimal("123456.789")
-      @nan = BigDecimal('NaN')
-      @infinity = BigDecimal('Infinity')
-      @infinity_negative = BigDecimal('-Infinity')
+    @arr = ['3.14159', '8.7', "0.314159265358979323846264338327950288419716939937510582097494459230781640628620899862803482534211706798214808651328230664709384460955058223172535940812848111745028410270193852110555964462294895493038196442881097566593014782083152134043E1"]
+    @big = BigDecimal("123456.789")
+    @nan = BigDecimal('NaN')
+    @infinity = BigDecimal('Infinity')
+    @infinity_negative = BigDecimal('-Infinity')
   end
 
   it "returns value of type Integer." do
diff --git a/spec/ruby/library/bigmath/log_spec.rb b/spec/ruby/library/bigmath/log_spec.rb
deleted file mode 100644
index 2ffbf8b6b9cbdf..00000000000000
--- a/spec/ruby/library/bigmath/log_spec.rb
+++ /dev/null
@@ -1,10 +0,0 @@
-require_relative '../../spec_helper'
-require 'bigdecimal'
-
-describe "BigDecimal#log" do
-  it "handles high-precision Rational arguments" do
-    result = BigDecimal('0.22314354220170971436137296411949880462556361100856391620766259404746040597133837784E0')
-    r = Rational(1_234_567_890, 987_654_321)
-    BigMath.log(r, 50).should == result
-  end
-end
diff --git a/spec/ruby/library/cgi/cookie/domain_spec.rb b/spec/ruby/library/cgi/cookie/domain_spec.rb
index 962609ebaffcd8..622549039fe3e5 100644
--- a/spec/ruby/library/cgi/cookie/domain_spec.rb
+++ b/spec/ruby/library/cgi/cookie/domain_spec.rb
@@ -1,23 +1,26 @@
 require_relative '../../../spec_helper'
-require 'cgi'
 
-describe "CGI::Cookie#domain" do
-  it "returns self's domain" do
-    cookie = CGI::Cookie.new("test-cookie")
-    cookie.domain.should be_nil
+ruby_version_is ""..."3.5" do
+  require 'cgi'
 
-    cookie = CGI::Cookie.new("name" => "test-cookie", "domain" => "example.com")
-    cookie.domain.should == "example.com"
+  describe "CGI::Cookie#domain" do
+    it "returns self's domain" do
+      cookie = CGI::Cookie.new("test-cookie")
+      cookie.domain.should be_nil
+
+      cookie = CGI::Cookie.new("name" => "test-cookie", "domain" => "example.com")
+      cookie.domain.should == "example.com"
+    end
   end
-end
 
-describe "CGI::Cookie#domain=" do
-  it "sets self's domain" do
-    cookie = CGI::Cookie.new("test-cookie")
-    cookie.domain = "test.com"
-    cookie.domain.should == "test.com"
+  describe "CGI::Cookie#domain=" do
+    it "sets self's domain" do
+      cookie = CGI::Cookie.new("test-cookie")
+      cookie.domain = "test.com"
+      cookie.domain.should == "test.com"
 
-    cookie.domain = "example.com"
-    cookie.domain.should == "example.com"
+      cookie.domain = "example.com"
+      cookie.domain.should == "example.com"
+    end
   end
 end
diff --git a/spec/ruby/library/cgi/cookie/expires_spec.rb b/spec/ruby/library/cgi/cookie/expires_spec.rb
index c8f26d01cdf7ce..df52a6f41e2474 100644
--- a/spec/ruby/library/cgi/cookie/expires_spec.rb
+++ b/spec/ruby/library/cgi/cookie/expires_spec.rb
@@ -1,23 +1,26 @@
 require_relative '../../../spec_helper'
-require 'cgi'
 
-describe "CGI::Cookie#expires" do
-  it "returns self's expiration date" do
-    cookie = CGI::Cookie.new("test-cookie")
-    cookie.expires.should be_nil
+ruby_version_is ""..."3.5" do
+  require 'cgi'
 
-    cookie = CGI::Cookie.new("name" => "test-cookie", "expires" => Time.at(1196524602))
-    cookie.expires.should == Time.at(1196524602)
+  describe "CGI::Cookie#expires" do
+    it "returns self's expiration date" do
+      cookie = CGI::Cookie.new("test-cookie")
+      cookie.expires.should be_nil
+
+      cookie = CGI::Cookie.new("name" => "test-cookie", "expires" => Time.at(1196524602))
+      cookie.expires.should == Time.at(1196524602)
+    end
   end
-end
 
-describe "CGI::Cookie#expires=" do
-  it "sets self's expiration date" do
-    cookie = CGI::Cookie.new("test-cookie")
-    cookie.expires = Time.at(1196524602)
-    cookie.expires.should == Time.at(1196524602)
+  describe "CGI::Cookie#expires=" do
+    it "sets self's expiration date" do
+      cookie = CGI::Cookie.new("test-cookie")
+      cookie.expires = Time.at(1196524602)
+      cookie.expires.should == Time.at(1196524602)
 
-    cookie.expires = Time.at(1196525000)
-    cookie.expires.should == Time.at(1196525000)
+      cookie.expires = Time.at(1196525000)
+      cookie.expires.should == Time.at(1196525000)
+    end
   end
 end
diff --git a/spec/ruby/library/cgi/cookie/initialize_spec.rb b/spec/ruby/library/cgi/cookie/initialize_spec.rb
index 4b6e104b10cdba..ac99d5e4fda6be 100644
--- a/spec/ruby/library/cgi/cookie/initialize_spec.rb
+++ b/spec/ruby/library/cgi/cookie/initialize_spec.rb
@@ -1,147 +1,150 @@
 require_relative '../../../spec_helper'
-require 'cgi'
 
-describe "CGI::Cookie#initialize when passed String" do
-  before :each do
-    @cookie = CGI::Cookie.allocate
-  end
-
-  it "sets the self's name to the passed String" do
-    @cookie.send(:initialize, "test-cookie")
-    @cookie.name.should == "test-cookie"
-  end
+ruby_version_is ""..."3.5" do
+  require 'cgi'
 
-  it "sets the self's value to an empty Array" do
-    @cookie.send(:initialize, "test-cookie")
-    @cookie.value.should == []
-  end
-
-  it "sets self to a non-secure cookie" do
-    @cookie.send(:initialize, "test")
-    @cookie.secure.should be_false
-  end
-
-  it "does set self's path to an empty String when ENV[\"SCRIPT_NAME\"] is not set" do
-    @cookie.send(:initialize, "test-cookie")
-    @cookie.path.should == ""
-  end
-
-  it "does set self's path based on ENV[\"SCRIPT_NAME\"] when ENV[\"SCRIPT_NAME\"] is set" do
-    old_script_name = ENV["SCRIPT_NAME"]
+  describe "CGI::Cookie#initialize when passed String" do
+    before :each do
+      @cookie = CGI::Cookie.allocate
+    end
 
-    begin
-      ENV["SCRIPT_NAME"] = "some/path/script.rb"
+    it "sets the self's name to the passed String" do
       @cookie.send(:initialize, "test-cookie")
-      @cookie.path.should == "some/path/"
+      @cookie.name.should == "test-cookie"
+    end
 
-      ENV["SCRIPT_NAME"] = "script.rb"
+    it "sets the self's value to an empty Array" do
       @cookie.send(:initialize, "test-cookie")
-      @cookie.path.should == ""
+      @cookie.value.should == []
+    end
 
-      ENV["SCRIPT_NAME"] = nil
+    it "sets self to a non-secure cookie" do
+      @cookie.send(:initialize, "test")
+      @cookie.secure.should be_false
+    end
+
+    it "does set self's path to an empty String when ENV[\"SCRIPT_NAME\"] is not set" do
       @cookie.send(:initialize, "test-cookie")
       @cookie.path.should == ""
-    ensure
-      ENV["SCRIPT_NAME"] = old_script_name
     end
-  end
 
-  it "does not set self's expiration date" do
-    @cookie.expires.should be_nil
-  end
+    it "does set self's path based on ENV[\"SCRIPT_NAME\"] when ENV[\"SCRIPT_NAME\"] is set" do
+      old_script_name = ENV["SCRIPT_NAME"]
 
-  it "does not set self's domain" do
-    @cookie.domain.should be_nil
-  end
-end
+      begin
+        ENV["SCRIPT_NAME"] = "some/path/script.rb"
+        @cookie.send(:initialize, "test-cookie")
+        @cookie.path.should == "some/path/"
 
-describe "CGI::Cookie#initialize when passed Hash" do
-  before :each do
-    @cookie = CGI::Cookie.allocate
-  end
+        ENV["SCRIPT_NAME"] = "script.rb"
+        @cookie.send(:initialize, "test-cookie")
+        @cookie.path.should == ""
+
+        ENV["SCRIPT_NAME"] = nil
+        @cookie.send(:initialize, "test-cookie")
+        @cookie.path.should == ""
+      ensure
+        ENV["SCRIPT_NAME"] = old_script_name
+      end
+    end
+
+    it "does not set self's expiration date" do
+      @cookie.expires.should be_nil
+    end
 
-  it "sets self's contents based on the passed Hash" do
-    @cookie.send(:initialize,
-      'name'    => 'test-cookie',
-      'value'   => ["one", "two", "three"],
-      'path'    => 'some/path/',
-      'domain'  => 'example.com',
-      'expires' => Time.at(1196524602),
-      'secure'  => true)
-
-    @cookie.name.should == "test-cookie"
-    @cookie.value.should == ["one", "two", "three"]
-    @cookie.path.should == "some/path/"
-    @cookie.domain.should == "example.com"
-    @cookie.expires.should == Time.at(1196524602)
-    @cookie.secure.should be_true
+    it "does not set self's domain" do
+      @cookie.domain.should be_nil
+    end
   end
 
-  it "does set self's path based on ENV[\"SCRIPT_NAME\"] when the Hash has no 'path' entry" do
-    old_script_name = ENV["SCRIPT_NAME"]
+  describe "CGI::Cookie#initialize when passed Hash" do
+    before :each do
+      @cookie = CGI::Cookie.allocate
+    end
 
-    begin
-      ENV["SCRIPT_NAME"] = "some/path/script.rb"
-      @cookie.send(:initialize, 'name' => 'test-cookie')
+    it "sets self's contents based on the passed Hash" do
+      @cookie.send(:initialize,
+        'name'    => 'test-cookie',
+        'value'   => ["one", "two", "three"],
+        'path'    => 'some/path/',
+        'domain'  => 'example.com',
+        'expires' => Time.at(1196524602),
+        'secure'  => true)
+
+      @cookie.name.should == "test-cookie"
+      @cookie.value.should == ["one", "two", "three"]
       @cookie.path.should == "some/path/"
+      @cookie.domain.should == "example.com"
+      @cookie.expires.should == Time.at(1196524602)
+      @cookie.secure.should be_true
+    end
 
-      ENV["SCRIPT_NAME"] = "script.rb"
-      @cookie.send(:initialize, 'name' => 'test-cookie')
-      @cookie.path.should == ""
+    it "does set self's path based on ENV[\"SCRIPT_NAME\"] when the Hash has no 'path' entry" do
+      old_script_name = ENV["SCRIPT_NAME"]
 
-      ENV["SCRIPT_NAME"] = nil
-      @cookie.send(:initialize, 'name' => 'test-cookie')
-      @cookie.path.should == ""
-    ensure
-      ENV["SCRIPT_NAME"] = old_script_name
+      begin
+        ENV["SCRIPT_NAME"] = "some/path/script.rb"
+        @cookie.send(:initialize, 'name' => 'test-cookie')
+        @cookie.path.should == "some/path/"
+
+        ENV["SCRIPT_NAME"] = "script.rb"
+        @cookie.send(:initialize, 'name' => 'test-cookie')
+        @cookie.path.should == ""
+
+        ENV["SCRIPT_NAME"] = nil
+        @cookie.send(:initialize, 'name' => 'test-cookie')
+        @cookie.path.should == ""
+      ensure
+        ENV["SCRIPT_NAME"] = old_script_name
+      end
     end
-  end
 
-  it "tries to convert the Hash's 'value' to an Array using #Array" do
-    obj = mock("Converted To Array")
-    obj.should_receive(:to_ary).and_return(["1", "2", "3"])
-    @cookie.send(:initialize,
-      'name'  => 'test-cookie',
-      'value' => obj)
-    @cookie.value.should == [ "1", "2", "3" ]
-
-    obj = mock("Converted To Array")
-    obj.should_receive(:to_a).and_return(["one", "two", "three"])
-    @cookie.send(:initialize,
-      'name'  => 'test-cookie',
-      'value' => obj)
-    @cookie.value.should == [ "one", "two", "three" ]
-
-    obj = mock("Put into an Array")
-    @cookie.send(:initialize,
-      'name'  => 'test-cookie',
-      'value' => obj)
-    @cookie.value.should == [ obj ]
-  end
+    it "tries to convert the Hash's 'value' to an Array using #Array" do
+      obj = mock("Converted To Array")
+      obj.should_receive(:to_ary).and_return(["1", "2", "3"])
+      @cookie.send(:initialize,
+        'name'  => 'test-cookie',
+        'value' => obj)
+      @cookie.value.should == [ "1", "2", "3" ]
+
+      obj = mock("Converted To Array")
+      obj.should_receive(:to_a).and_return(["one", "two", "three"])
+      @cookie.send(:initialize,
+        'name'  => 'test-cookie',
+        'value' => obj)
+      @cookie.value.should == [ "one", "two", "three" ]
+
+      obj = mock("Put into an Array")
+      @cookie.send(:initialize,
+        'name'  => 'test-cookie',
+        'value' => obj)
+      @cookie.value.should == [ obj ]
+    end
 
-  it "raises a ArgumentError when the passed Hash has no 'name' entry" do
-    -> { @cookie.send(:initialize, {}) }.should raise_error(ArgumentError)
-    -> { @cookie.send(:initialize, "value" => "test") }.should raise_error(ArgumentError)
+    it "raises a ArgumentError when the passed Hash has no 'name' entry" do
+      -> { @cookie.send(:initialize, {}) }.should raise_error(ArgumentError)
+      -> { @cookie.send(:initialize, "value" => "test") }.should raise_error(ArgumentError)
+    end
   end
-end
 
-describe "CGI::Cookie#initialize when passed String, values ..." do
-  before :each do
-    @cookie = CGI::Cookie.allocate
-  end
+  describe "CGI::Cookie#initialize when passed String, values ..." do
+    before :each do
+      @cookie = CGI::Cookie.allocate
+    end
 
-  it "sets the self's name to the passed String" do
-    @cookie.send(:initialize, "test-cookie", "one", "two", "three")
-    @cookie.name.should == "test-cookie"
-  end
+    it "sets the self's name to the passed String" do
+      @cookie.send(:initialize, "test-cookie", "one", "two", "three")
+      @cookie.name.should == "test-cookie"
+    end
 
-  it "sets the self's value to an Array containing all passed values" do
-    @cookie.send(:initialize, "test-cookie", "one", "two", "three")
-    @cookie.value.should == ["one", "two", "three"]
-  end
+    it "sets the self's value to an Array containing all passed values" do
+      @cookie.send(:initialize, "test-cookie", "one", "two", "three")
+      @cookie.value.should == ["one", "two", "three"]
+    end
 
-  it "sets self to a non-secure cookie" do
-    @cookie.send(:initialize, "test", "one", "two", "three")
-    @cookie.secure.should be_false
+    it "sets self to a non-secure cookie" do
+      @cookie.send(:initialize, "test", "one", "two", "three")
+      @cookie.secure.should be_false
+    end
   end
 end
diff --git a/spec/ruby/library/cgi/cookie/name_spec.rb b/spec/ruby/library/cgi/cookie/name_spec.rb
index 326a43ade3187e..712628180b3538 100644
--- a/spec/ruby/library/cgi/cookie/name_spec.rb
+++ b/spec/ruby/library/cgi/cookie/name_spec.rb
@@ -1,23 +1,26 @@
 require_relative '../../../spec_helper'
-require 'cgi'
 
-describe "CGI::Cookie#name" do
-  it "returns self's name" do
-    cookie = CGI::Cookie.new("test-cookie")
-    cookie.name.should == "test-cookie"
+ruby_version_is ""..."3.5" do
+  require 'cgi'
 
-    cookie = CGI::Cookie.new("name" => "another-cookie")
-    cookie.name.should == "another-cookie"
+  describe "CGI::Cookie#name" do
+    it "returns self's name" do
+      cookie = CGI::Cookie.new("test-cookie")
+      cookie.name.should == "test-cookie"
+
+      cookie = CGI::Cookie.new("name" => "another-cookie")
+      cookie.name.should == "another-cookie"
+    end
   end
-end
 
-describe "CGI::Cookie#name=" do
-  it "sets self's expiration date" do
-    cookie = CGI::Cookie.new("test-cookie")
-    cookie.name = "another-name"
-    cookie.name.should == "another-name"
+  describe "CGI::Cookie#name=" do
+    it "sets self's expiration date" do
+      cookie = CGI::Cookie.new("test-cookie")
+      cookie.name = "another-name"
+      cookie.name.should == "another-name"
 
-    cookie.name = "and-one-more"
-    cookie.name.should == "and-one-more"
+      cookie.name = "and-one-more"
+      cookie.name.should == "and-one-more"
+    end
   end
 end
diff --git a/spec/ruby/library/cgi/cookie/parse_spec.rb b/spec/ruby/library/cgi/cookie/parse_spec.rb
index d484c7bad952e8..ecc78d77dcc253 100644
--- a/spec/ruby/library/cgi/cookie/parse_spec.rb
+++ b/spec/ruby/library/cgi/cookie/parse_spec.rb
@@ -1,26 +1,29 @@
 require_relative '../../../spec_helper'
-require 'cgi'
 
-describe "CGI::Cookie.parse" do
-  it "parses a raw cookie string into a hash of Cookies" do
-    expected = { "test-cookie" => ["one", "two", "three"] }
-    CGI::Cookie.parse("test-cookie=one&two&three").should == expected
+ruby_version_is ""..."3.5" do
+  require 'cgi'
 
-    expected = { "second-cookie" => ["three", "four"], "first-cookie" => ["one", "two"] }
-    CGI::Cookie.parse("first-cookie=one&two;second-cookie=three&four").should == expected
-  end
+  describe "CGI::Cookie.parse" do
+    it "parses a raw cookie string into a hash of Cookies" do
+      expected = { "test-cookie" => ["one", "two", "three"] }
+      CGI::Cookie.parse("test-cookie=one&two&three").should == expected
 
-  it "does not use , for cookie separators" do
-    expected = {
-      "first-cookie" => ["one", "two"],
-      "second-cookie" => ["three", "four,third_cookie=five", "six"]
-    }
-    CGI::Cookie.parse("first-cookie=one&two;second-cookie=three&four,third_cookie=five&six").should == expected
-  end
+      expected = { "second-cookie" => ["three", "four"], "first-cookie" => ["one", "two"] }
+      CGI::Cookie.parse("first-cookie=one&two;second-cookie=three&four").should == expected
+    end
+
+    it "does not use , for cookie separators" do
+      expected = {
+        "first-cookie" => ["one", "two"],
+        "second-cookie" => ["three", "four,third_cookie=five", "six"]
+      }
+      CGI::Cookie.parse("first-cookie=one&two;second-cookie=three&four,third_cookie=five&six").should == expected
+    end
 
-  it "unescapes the Cookie values" do
-    cookie = "test-cookie=+%21%22%23%24%25%26%27%28%29%2A%2B%2C-.%2F0123456789%3A%3B%3C%3D%3E%3F%40ABCDEFGHIJKLMNOPQRSTUVWXYZ%5B%5C%5D%5E_%60abcdefghijklmnopqrstuvwxyz%7B%7C%7D%7E"
-    expected = { "test-cookie" => [ " !\"\#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~" ] }
-    CGI::Cookie.parse(cookie).should == expected
+    it "unescapes the Cookie values" do
+      cookie = "test-cookie=+%21%22%23%24%25%26%27%28%29%2A%2B%2C-.%2F0123456789%3A%3B%3C%3D%3E%3F%40ABCDEFGHIJKLMNOPQRSTUVWXYZ%5B%5C%5D%5E_%60abcdefghijklmnopqrstuvwxyz%7B%7C%7D%7E"
+      expected = { "test-cookie" => [ " !\"\#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~" ] }
+      CGI::Cookie.parse(cookie).should == expected
+    end
   end
 end
diff --git a/spec/ruby/library/cgi/cookie/path_spec.rb b/spec/ruby/library/cgi/cookie/path_spec.rb
index 8a2f05aa50e4f6..010e87a6b83edb 100644
--- a/spec/ruby/library/cgi/cookie/path_spec.rb
+++ b/spec/ruby/library/cgi/cookie/path_spec.rb
@@ -1,23 +1,26 @@
 require_relative '../../../spec_helper'
-require 'cgi'
 
-describe "CGI::Cookie#path" do
-  it "returns self's path" do
-    cookie = CGI::Cookie.new("test-cookie")
-    cookie.path.should == ""
+ruby_version_is ""..."3.5" do
+  require 'cgi'
 
-    cookie = CGI::Cookie.new("name" => "test-cookie", "path" => "/some/path/")
-    cookie.path.should == "/some/path/"
+  describe "CGI::Cookie#path" do
+    it "returns self's path" do
+      cookie = CGI::Cookie.new("test-cookie")
+      cookie.path.should == ""
+
+      cookie = CGI::Cookie.new("name" => "test-cookie", "path" => "/some/path/")
+      cookie.path.should == "/some/path/"
+    end
   end
-end
 
-describe "CGI::Cookie#path=" do
-  it "sets self's path" do
-    cookie = CGI::Cookie.new("test-cookie")
-    cookie.path = "/some/path/"
-    cookie.path.should == "/some/path/"
+  describe "CGI::Cookie#path=" do
+    it "sets self's path" do
+      cookie = CGI::Cookie.new("test-cookie")
+      cookie.path = "/some/path/"
+      cookie.path.should == "/some/path/"
 
-    cookie.path = "/another/path/"
-    cookie.path.should == "/another/path/"
+      cookie.path = "/another/path/"
+      cookie.path.should == "/another/path/"
+    end
   end
 end
diff --git a/spec/ruby/library/cgi/cookie/secure_spec.rb b/spec/ruby/library/cgi/cookie/secure_spec.rb
index 694bc2eeedef25..b526897250738e 100644
--- a/spec/ruby/library/cgi/cookie/secure_spec.rb
+++ b/spec/ruby/library/cgi/cookie/secure_spec.rb
@@ -1,70 +1,73 @@
 require_relative '../../../spec_helper'
-require 'cgi'
 
-describe "CGI::Cookie#secure" do
-  before :each do
-    @cookie = CGI::Cookie.new("test-cookie")
-  end
+ruby_version_is ""..."3.5" do
+  require 'cgi'
 
-  it "returns whether self is a secure cookie or not" do
-    @cookie.secure = true
-    @cookie.secure.should be_true
+  describe "CGI::Cookie#secure" do
+    before :each do
+      @cookie = CGI::Cookie.new("test-cookie")
+    end
 
-    @cookie.secure = false
-    @cookie.secure.should be_false
-  end
-end
+    it "returns whether self is a secure cookie or not" do
+      @cookie.secure = true
+      @cookie.secure.should be_true
 
-describe "CGI::Cookie#secure= when passed true" do
-  before :each do
-    @cookie = CGI::Cookie.new("test-cookie")
+      @cookie.secure = false
+      @cookie.secure.should be_false
+    end
   end
 
-  it "returns true" do
-    (@cookie.secure = true).should be_true
-  end
+  describe "CGI::Cookie#secure= when passed true" do
+    before :each do
+      @cookie = CGI::Cookie.new("test-cookie")
+    end
 
-  it "sets self to a secure cookie" do
-    @cookie.secure = true
-    @cookie.secure.should be_true
-  end
-end
+    it "returns true" do
+      (@cookie.secure = true).should be_true
+    end
 
-describe "CGI::Cookie#secure= when passed false" do
-  before :each do
-    @cookie = CGI::Cookie.new("test-cookie")
+    it "sets self to a secure cookie" do
+      @cookie.secure = true
+      @cookie.secure.should be_true
+    end
   end
 
-  it "returns false" do
-    (@cookie.secure = false).should be_false
-  end
+  describe "CGI::Cookie#secure= when passed false" do
+    before :each do
+      @cookie = CGI::Cookie.new("test-cookie")
+    end
 
-  it "sets self to a non-secure cookie" do
-    @cookie.secure = false
-    @cookie.secure.should be_false
-  end
-end
+    it "returns false" do
+      (@cookie.secure = false).should be_false
+    end
 
-describe "CGI::Cookie#secure= when passed Object" do
-  before :each do
-    @cookie = CGI::Cookie.new("test-cookie")
+    it "sets self to a non-secure cookie" do
+      @cookie.secure = false
+      @cookie.secure.should be_false
+    end
   end
 
-  it "does not change self's secure value" do
-    @cookie.secure = false
+  describe "CGI::Cookie#secure= when passed Object" do
+    before :each do
+      @cookie = CGI::Cookie.new("test-cookie")
+    end
+
+    it "does not change self's secure value" do
+      @cookie.secure = false
 
-    @cookie.secure = Object.new
-    @cookie.secure.should be_false
+      @cookie.secure = Object.new
+      @cookie.secure.should be_false
 
-    @cookie.secure = "Test"
-    @cookie.secure.should be_false
+      @cookie.secure = "Test"
+      @cookie.secure.should be_false
 
-    @cookie.secure = true
+      @cookie.secure = true
 
-    @cookie.secure = Object.new
-    @cookie.secure.should be_true
+      @cookie.secure = Object.new
+      @cookie.secure.should be_true
 
-    @cookie.secure = "Test"
-    @cookie.secure.should be_true
+      @cookie.secure = "Test"
+      @cookie.secure.should be_true
+    end
   end
 end
diff --git a/spec/ruby/library/cgi/cookie/to_s_spec.rb b/spec/ruby/library/cgi/cookie/to_s_spec.rb
index da15e6ed2a9413..34326f672b6f61 100644
--- a/spec/ruby/library/cgi/cookie/to_s_spec.rb
+++ b/spec/ruby/library/cgi/cookie/to_s_spec.rb
@@ -1,33 +1,36 @@
 require_relative '../../../spec_helper'
-require 'cgi'
 
-describe "CGI::Cookie#to_s" do
-  it "returns a String representation of self" do
-    cookie = CGI::Cookie.new("test-cookie")
-    cookie.to_s.should == "test-cookie=; path="
+ruby_version_is ""..."3.5" do
+  require 'cgi'
 
-    cookie = CGI::Cookie.new("test-cookie", "value")
-    cookie.to_s.should == "test-cookie=value; path="
+  describe "CGI::Cookie#to_s" do
+    it "returns a String representation of self" do
+      cookie = CGI::Cookie.new("test-cookie")
+      cookie.to_s.should == "test-cookie=; path="
 
-    cookie = CGI::Cookie.new("test-cookie", "one", "two", "three")
-    cookie.to_s.should == "test-cookie=one&two&three; path="
+      cookie = CGI::Cookie.new("test-cookie", "value")
+      cookie.to_s.should == "test-cookie=value; path="
 
-    cookie = CGI::Cookie.new(
-      'name'    => 'test-cookie',
-      'value'   => ["one", "two", "three"],
-      'path'    => 'some/path/',
-      'domain'  => 'example.com',
-      'expires' => Time.at(1196524602),
-      'secure'  => true)
-    cookie.to_s.should == "test-cookie=one&two&three; domain=example.com; path=some/path/; expires=Sat, 01 Dec 2007 15:56:42 GMT; secure"
-  end
+      cookie = CGI::Cookie.new("test-cookie", "one", "two", "three")
+      cookie.to_s.should == "test-cookie=one&two&three; path="
 
-  it "escapes the self's values" do
-    cookie = CGI::Cookie.new("test-cookie", " !\"\#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}")
-    cookie.to_s.should == "test-cookie=+%21%22%23%24%25%26%27%28%29%2A%2B%2C-.%2F0123456789%3A%3B%3C%3D%3E%3F%40ABCDEFGHIJKLMNOPQRSTUVWXYZ%5B%5C%5D%5E_%60abcdefghijklmnopqrstuvwxyz%7B%7C%7D; path="
-  end
+      cookie = CGI::Cookie.new(
+        'name'    => 'test-cookie',
+        'value'   => ["one", "two", "three"],
+        'path'    => 'some/path/',
+        'domain'  => 'example.com',
+        'expires' => Time.at(1196524602),
+        'secure'  => true)
+      cookie.to_s.should == "test-cookie=one&two&three; domain=example.com; path=some/path/; expires=Sat, 01 Dec 2007 15:56:42 GMT; secure"
+    end
+
+    it "escapes the self's values" do
+      cookie = CGI::Cookie.new("test-cookie", " !\"\#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}")
+      cookie.to_s.should == "test-cookie=+%21%22%23%24%25%26%27%28%29%2A%2B%2C-.%2F0123456789%3A%3B%3C%3D%3E%3F%40ABCDEFGHIJKLMNOPQRSTUVWXYZ%5B%5C%5D%5E_%60abcdefghijklmnopqrstuvwxyz%7B%7C%7D; path="
+    end
 
-  it "does not escape tilde" do
-    cookie = CGI::Cookie.new("test-cookie", "~").to_s.should == "test-cookie=~; path="
+    it "does not escape tilde" do
+      cookie = CGI::Cookie.new("test-cookie", "~").to_s.should == "test-cookie=~; path="
+    end
   end
 end
diff --git a/spec/ruby/library/cgi/cookie/value_spec.rb b/spec/ruby/library/cgi/cookie/value_spec.rb
index 1d5da3a3acd31d..e7c91b55b965f9 100644
--- a/spec/ruby/library/cgi/cookie/value_spec.rb
+++ b/spec/ruby/library/cgi/cookie/value_spec.rb
@@ -1,76 +1,79 @@
 require_relative '../../../spec_helper'
-require 'cgi'
 
-describe "CGI::Cookie#value" do
-  it "returns self's value" do
-    cookie = CGI::Cookie.new("test-cookie")
-    cookie.value.should == []
+ruby_version_is ""..."3.5" do
+  require 'cgi'
 
-    cookie = CGI::Cookie.new("test-cookie", "one")
-    cookie.value.should == ["one"]
+  describe "CGI::Cookie#value" do
+    it "returns self's value" do
+      cookie = CGI::Cookie.new("test-cookie")
+      cookie.value.should == []
 
-    cookie = CGI::Cookie.new("test-cookie", "one", "two", "three")
-    cookie.value.should == ["one", "two", "three"]
+      cookie = CGI::Cookie.new("test-cookie", "one")
+      cookie.value.should == ["one"]
 
-    cookie = CGI::Cookie.new("name" => "test-cookie", "value" => ["one", "two", "three"])
-    cookie.value.should == ["one", "two", "three"]
-  end
+      cookie = CGI::Cookie.new("test-cookie", "one", "two", "three")
+      cookie.value.should == ["one", "two", "three"]
 
-  it "is in synch with self" do
-    fail = []
-    [
-      :pop,
-      :shift,
-      [:<<, "Hello"],
-      [:push, "Hello"],
-      [:unshift, "World"],
-      [:replace, ["A", "B"]],
-      [:[]=, 1, "Set"],
-      [:delete, "first"],
-      [:delete_at, 0],
-    ].each do |method, *args|
-      cookie1 = CGI::Cookie.new("test-cookie", "first", "second")
-      cookie2 = CGI::Cookie.new("test-cookie", "first", "second")
-      cookie1.send(method, *args)
-      cookie2.value.send(method, *args)
-      fail << method unless cookie1.value == cookie2.value
+      cookie = CGI::Cookie.new("name" => "test-cookie", "value" => ["one", "two", "three"])
+      cookie.value.should == ["one", "two", "three"]
     end
-    fail.should be_empty
-  end
-end
 
-describe "CGI::Cookie#value=" do
-  before :each do
-    @cookie = CGI::Cookie.new("test-cookie")
+    it "is in synch with self" do
+      fail = []
+      [
+        :pop,
+        :shift,
+        [:<<, "Hello"],
+        [:push, "Hello"],
+        [:unshift, "World"],
+        [:replace, ["A", "B"]],
+        [:[]=, 1, "Set"],
+        [:delete, "first"],
+        [:delete_at, 0],
+      ].each do |method, *args|
+        cookie1 = CGI::Cookie.new("test-cookie", "first", "second")
+        cookie2 = CGI::Cookie.new("test-cookie", "first", "second")
+        cookie1.send(method, *args)
+        cookie2.value.send(method, *args)
+        fail << method unless cookie1.value == cookie2.value
+      end
+      fail.should be_empty
+    end
   end
 
-  it "sets self's value" do
-    @cookie.value = ["one"]
-    @cookie.value.should == ["one"]
+  describe "CGI::Cookie#value=" do
+    before :each do
+      @cookie = CGI::Cookie.new("test-cookie")
+    end
 
-    @cookie.value = ["one", "two", "three"]
-    @cookie.value.should == ["one", "two", "three"]
-  end
+    it "sets self's value" do
+      @cookie.value = ["one"]
+      @cookie.value.should == ["one"]
 
-  it "automatically converts the passed Object to an Array using #Array" do
-    @cookie.value = "test"
-    @cookie.value.should == ["test"]
+      @cookie.value = ["one", "two", "three"]
+      @cookie.value.should == ["one", "two", "three"]
+    end
 
-    obj = mock("to_a")
-    obj.should_receive(:to_a).and_return(["1", "2"])
-    @cookie.value = obj
-    @cookie.value.should == ["1", "2"]
+    it "automatically converts the passed Object to an Array using #Array" do
+      @cookie.value = "test"
+      @cookie.value.should == ["test"]
 
-    obj = mock("to_ary")
-    obj.should_receive(:to_ary).and_return(["1", "2"])
-    @cookie.value = obj
-    @cookie.value.should == ["1", "2"]
-  end
+      obj = mock("to_a")
+      obj.should_receive(:to_a).and_return(["1", "2"])
+      @cookie.value = obj
+      @cookie.value.should == ["1", "2"]
 
-  it "does keep self and the values in sync" do
-    @cookie.value = ["one", "two", "three"]
-    @cookie[0].should == "one"
-    @cookie[1].should == "two"
-    @cookie[2].should == "three"
+      obj = mock("to_ary")
+      obj.should_receive(:to_ary).and_return(["1", "2"])
+      @cookie.value = obj
+      @cookie.value.should == ["1", "2"]
+    end
+
+    it "does keep self and the values in sync" do
+      @cookie.value = ["one", "two", "three"]
+      @cookie[0].should == "one"
+      @cookie[1].should == "two"
+      @cookie[2].should == "three"
+    end
   end
 end
diff --git a/spec/ruby/library/cgi/escapeElement_spec.rb b/spec/ruby/library/cgi/escapeElement_spec.rb
index 148926c4531d98..7bfa3f4feb5912 100644
--- a/spec/ruby/library/cgi/escapeElement_spec.rb
+++ b/spec/ruby/library/cgi/escapeElement_spec.rb
@@ -1,5 +1,11 @@
 require_relative '../../spec_helper'
-require 'cgi'
+
+ruby_version_is ""..."3.5" do
+  require 'cgi'
+end
+ruby_version_is "3.5" do
+  require 'cgi/escape'
+end
 
 describe "CGI.escapeElement when passed String, elements, ..." do
   it "escapes only the tags of the passed elements in the passed String" do
diff --git a/spec/ruby/library/cgi/escapeHTML_spec.rb b/spec/ruby/library/cgi/escapeHTML_spec.rb
index 421aac5d4ab329..6e70e87ed7488b 100644
--- a/spec/ruby/library/cgi/escapeHTML_spec.rb
+++ b/spec/ruby/library/cgi/escapeHTML_spec.rb
@@ -1,5 +1,9 @@
 require_relative '../../spec_helper'
-require 'cgi'
+begin
+  require 'cgi/escape'
+rescue LoadError
+  require 'cgi'
+end
 
 describe "CGI.escapeHTML" do
   it "escapes special HTML characters (&\"<>') in the passed argument" do
diff --git a/spec/ruby/library/cgi/escapeURIComponent_spec.rb b/spec/ruby/library/cgi/escapeURIComponent_spec.rb
new file mode 100644
index 00000000000000..02921ab8bf43a8
--- /dev/null
+++ b/spec/ruby/library/cgi/escapeURIComponent_spec.rb
@@ -0,0 +1,59 @@
+require_relative '../../spec_helper'
+begin
+  require 'cgi/escape'
+rescue LoadError
+  require 'cgi'
+end
+
+describe "CGI.escapeURIComponent" do
+  it "escapes whitespace" do
+    string = "&<>\" \xE3\x82\x86\xE3\x82\x93\xE3\x82\x86\xE3\x82\x93"
+    CGI.escapeURIComponent(string).should == '%26%3C%3E%22%20%E3%82%86%E3%82%93%E3%82%86%E3%82%93'
+  end
+
+  it "does not escape with unreserved characters" do
+    string = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-._~"
+    CGI.escapeURIComponent(string).should == "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-._~"
+  end
+
+  it "supports String with invalid encoding" do
+    string = "\xC0\<\<".dup.force_encoding("UTF-8")
+    CGI.escapeURIComponent(string).should == "%C0%3C%3C"
+  end
+
+  it "processes String bytes one by one, not characters" do
+    CGI.escapeURIComponent("β").should == "%CE%B2" # "β" bytes representation is CE B2
+  end
+
+  it "raises a TypeError with nil" do
+    -> {
+      CGI.escapeURIComponent(nil)
+    }.should raise_error(TypeError, 'no implicit conversion of nil into String')
+  end
+
+  it "encodes empty string" do
+    CGI.escapeURIComponent("").should == ""
+  end
+
+  it "encodes single whitespace" do
+    CGI.escapeURIComponent(" ").should == "%20"
+  end
+
+  it "encodes double whitespace" do
+    CGI.escapeURIComponent("  ").should == "%20%20"
+  end
+
+  it "preserves encoding" do
+    string = "whatever".encode("ASCII-8BIT")
+    CGI.escapeURIComponent(string).encoding.should == Encoding::ASCII_8BIT
+  end
+
+  it "uses implicit type conversion to String" do
+    object = Object.new
+    def object.to_str
+      "a b"
+    end
+
+    CGI.escapeURIComponent(object).should == "a%20b"
+  end
+end
diff --git a/spec/ruby/library/cgi/escape_spec.rb b/spec/ruby/library/cgi/escape_spec.rb
index c599a73cf0679e..55eb0b66c284fc 100644
--- a/spec/ruby/library/cgi/escape_spec.rb
+++ b/spec/ruby/library/cgi/escape_spec.rb
@@ -1,5 +1,9 @@
 require_relative '../../spec_helper'
-require 'cgi'
+begin
+  require 'cgi/escape'
+rescue LoadError
+  require 'cgi'
+end
 
 describe "CGI.escape" do
   it "url-encodes the passed argument" do
diff --git a/spec/ruby/library/cgi/htmlextension/a_spec.rb b/spec/ruby/library/cgi/htmlextension/a_spec.rb
index 05b4c2d14c996b..16a0552bacb5d6 100644
--- a/spec/ruby/library/cgi/htmlextension/a_spec.rb
+++ b/spec/ruby/library/cgi/htmlextension/a_spec.rb
@@ -1,49 +1,52 @@
 require_relative '../../../spec_helper'
-require 'cgi'
-require_relative 'fixtures/common'
 
-describe "CGI::HtmlExtension#a" do
-  before :each do
-    @html = CGISpecs.cgi_new
-  end
+ruby_version_is ""..."3.5" do
+  require 'cgi'
+  require_relative 'fixtures/common'
 
-  describe "when passed a String" do
-    it "returns an 'a'-element, using the passed String as the 'href'-attribute" do
-      output = @html.a("http://www.example.com")
-      output.should equal_element("A", "HREF" => "http://www.example.com")
+  describe "CGI::HtmlExtension#a" do
+    before :each do
+      @html = CGISpecs.cgi_new
     end
 
-    it "includes the passed block's return value when passed a block" do
-      output = @html.a("http://www.example.com") { "Example" }
-      output.should equal_element("A", { "HREF" => "http://www.example.com" }, "Example")
-    end
-  end
+    describe "when passed a String" do
+      it "returns an 'a'-element, using the passed String as the 'href'-attribute" do
+        output = @html.a("http://www.example.com")
+        output.should equal_element("A", "HREF" => "http://www.example.com")
+      end
 
-  describe "when passed a Hash" do
-    it "returns an 'a'-element, using the passed Hash for attributes" do
-      attributes = {"HREF" => "http://www.example.com", "TARGET" => "_top"}
-      @html.a(attributes).should equal_element("A", attributes)
+      it "includes the passed block's return value when passed a block" do
+        output = @html.a("http://www.example.com") { "Example" }
+        output.should equal_element("A", { "HREF" => "http://www.example.com" }, "Example")
+      end
     end
 
-    it "includes the passed block's return value when passed a block" do
-      attributes = {"HREF" => "http://www.example.com", "TARGET" => "_top"}
-      @html.a(attributes) { "Example" }.should equal_element("A", attributes, "Example")
-    end
-  end
+    describe "when passed a Hash" do
+      it "returns an 'a'-element, using the passed Hash for attributes" do
+        attributes = {"HREF" => "http://www.example.com", "TARGET" => "_top"}
+        @html.a(attributes).should equal_element("A", attributes)
+      end
 
-  describe "when each HTML generation" do
-    it "returns the doctype declaration for HTML3" do
-      CGISpecs.cgi_new("html3").a.should == %(<A HREF=""></A>)
-      CGISpecs.cgi_new("html3").a { "link text" }.should == %(<A HREF="">link text</A>)
+      it "includes the passed block's return value when passed a block" do
+        attributes = {"HREF" => "http://www.example.com", "TARGET" => "_top"}
+        @html.a(attributes) { "Example" }.should equal_element("A", attributes, "Example")
+      end
     end
 
-    it "returns the doctype declaration for HTML4" do
-      CGISpecs.cgi_new("html4").a.should == %(<A HREF=""></A>)
-      CGISpecs.cgi_new("html4").a { "link text" }.should == %(<A HREF="">link text</A>)
-    end
-    it "returns the doctype declaration for the Transitional version of HTML4" do
-      CGISpecs.cgi_new("html4Tr").a.should == %(<A HREF=""></A>)
-      CGISpecs.cgi_new("html4Tr").a { "link text" }.should == %(<A HREF="">link text</A>)
+    describe "when each HTML generation" do
+      it "returns the doctype declaration for HTML3" do
+        CGISpecs.cgi_new("html3").a.should == %(<A HREF=""></A>)
+        CGISpecs.cgi_new("html3").a { "link text" }.should == %(<A HREF="">link text</A>)
+      end
+
+      it "returns the doctype declaration for HTML4" do
+        CGISpecs.cgi_new("html4").a.should == %(<A HREF=""></A>)
+        CGISpecs.cgi_new("html4").a { "link text" }.should == %(<A HREF="">link text</A>)
+      end
+      it "returns the doctype declaration for the Transitional version of HTML4" do
+        CGISpecs.cgi_new("html4Tr").a.should == %(<A HREF=""></A>)
+        CGISpecs.cgi_new("html4Tr").a { "link text" }.should == %(<A HREF="">link text</A>)
+      end
     end
   end
 end
diff --git a/spec/ruby/library/cgi/htmlextension/base_spec.rb b/spec/ruby/library/cgi/htmlextension/base_spec.rb
index 877ac321cd3357..a4c4a61614828f 100644
--- a/spec/ruby/library/cgi/htmlextension/base_spec.rb
+++ b/spec/ruby/library/cgi/htmlextension/base_spec.rb
@@ -1,33 +1,36 @@
 require_relative '../../../spec_helper'
-require 'cgi'
-require_relative 'fixtures/common'
 
-describe "CGI::HtmlExtension#base" do
-  before :each do
-    @html = CGISpecs.cgi_new
-  end
+ruby_version_is ""..."3.5" do
+  require 'cgi'
+  require_relative 'fixtures/common'
 
-  describe "when bassed a String" do
-    it "returns a 'base'-element, using the passed String as the 'href'-attribute" do
-      output = @html.base("http://www.example.com")
-      output.should equal_element("BASE", {"HREF" => "http://www.example.com"}, nil, not_closed: true)
+  describe "CGI::HtmlExtension#base" do
+    before :each do
+      @html = CGISpecs.cgi_new
     end
 
-    it "ignores a passed block" do
-      output = @html.base("http://www.example.com") { "Example" }
-      output.should equal_element("BASE", {"HREF" => "http://www.example.com"}, nil, not_closed: true)
-    end
-  end
+    describe "when bassed a String" do
+      it "returns a 'base'-element, using the passed String as the 'href'-attribute" do
+        output = @html.base("http://www.example.com")
+        output.should equal_element("BASE", {"HREF" => "http://www.example.com"}, nil, not_closed: true)
+      end
 
-  describe "when passed a Hash" do
-    it "returns a 'base'-element, using the passed Hash for attributes" do
-      output = @html.base("HREF" => "http://www.example.com", "ID" => "test")
-      output.should equal_element("BASE", {"HREF" => "http://www.example.com", "ID" => "test"}, nil, not_closed: true)
+      it "ignores a passed block" do
+        output = @html.base("http://www.example.com") { "Example" }
+        output.should equal_element("BASE", {"HREF" => "http://www.example.com"}, nil, not_closed: true)
+      end
     end
 
-    it "ignores a passed block" do
-      output = @html.base("HREF" => "http://www.example.com", "ID" => "test") { "Example" }
-      output.should equal_element("BASE", {"HREF" => "http://www.example.com", "ID" => "test"}, nil, not_closed: true)
+    describe "when passed a Hash" do
+      it "returns a 'base'-element, using the passed Hash for attributes" do
+        output = @html.base("HREF" => "http://www.example.com", "ID" => "test")
+        output.should equal_element("BASE", {"HREF" => "http://www.example.com", "ID" => "test"}, nil, not_closed: true)
+      end
+
+      it "ignores a passed block" do
+        output = @html.base("HREF" => "http://www.example.com", "ID" => "test") { "Example" }
+        output.should equal_element("BASE", {"HREF" => "http://www.example.com", "ID" => "test"}, nil, not_closed: true)
+      end
     end
   end
 end
diff --git a/spec/ruby/library/cgi/htmlextension/blockquote_spec.rb b/spec/ruby/library/cgi/htmlextension/blockquote_spec.rb
index a7b833b1c53d8e..f8d4ca310e56b6 100644
--- a/spec/ruby/library/cgi/htmlextension/blockquote_spec.rb
+++ b/spec/ruby/library/cgi/htmlextension/blockquote_spec.rb
@@ -1,33 +1,36 @@
 require_relative '../../../spec_helper'
-require 'cgi'
-require_relative 'fixtures/common'
 
-describe "CGI::HtmlExtension#blockquote" do
-  before :each do
-    @html = CGISpecs.cgi_new
-  end
+ruby_version_is ""..."3.5" do
+  require 'cgi'
+  require_relative 'fixtures/common'
 
-  describe "when passed a String" do
-    it "returns a 'blockquote'-element, using the passed String for the 'cite'-attribute" do
-      output = @html.blockquote("http://www.example.com/quotes/foo.html")
-      output.should equal_element("BLOCKQUOTE", "CITE" => "http://www.example.com/quotes/foo.html")
+  describe "CGI::HtmlExtension#blockquote" do
+    before :each do
+      @html = CGISpecs.cgi_new
     end
 
-    it "includes the passed block's return value when passed a block" do
-      output = @html.blockquote("http://www.example.com/quotes/foo.html") { "Foo!" }
-      output.should equal_element("BLOCKQUOTE", { "CITE" => "http://www.example.com/quotes/foo.html" }, "Foo!")
-    end
-  end
+    describe "when passed a String" do
+      it "returns a 'blockquote'-element, using the passed String for the 'cite'-attribute" do
+        output = @html.blockquote("http://www.example.com/quotes/foo.html")
+        output.should equal_element("BLOCKQUOTE", "CITE" => "http://www.example.com/quotes/foo.html")
+      end
 
-  describe "when passed a Hash" do
-    it "returns a 'blockquote'-element, using the passed Hash for attributes" do
-      output = @html.blockquote("CITE" => "http://www.example.com/quotes/foo.html", "ID" => "test")
-      output.should equal_element("BLOCKQUOTE", "CITE" => "http://www.example.com/quotes/foo.html", "ID" => "test")
+      it "includes the passed block's return value when passed a block" do
+        output = @html.blockquote("http://www.example.com/quotes/foo.html") { "Foo!" }
+        output.should equal_element("BLOCKQUOTE", { "CITE" => "http://www.example.com/quotes/foo.html" }, "Foo!")
+      end
     end
 
-    it "includes the passed block's return value when passed a block" do
-      output = @html.blockquote("CITE" => "http://www.example.com/quotes/foo.html", "ID" => "test") { "Foo!" }
-      output.should equal_element("BLOCKQUOTE", {"CITE" => "http://www.example.com/quotes/foo.html", "ID" => "test"}, "Foo!")
+    describe "when passed a Hash" do
+      it "returns a 'blockquote'-element, using the passed Hash for attributes" do
+        output = @html.blockquote("CITE" => "http://www.example.com/quotes/foo.html", "ID" => "test")
+        output.should equal_element("BLOCKQUOTE", "CITE" => "http://www.example.com/quotes/foo.html", "ID" => "test")
+      end
+
+      it "includes the passed block's return value when passed a block" do
+        output = @html.blockquote("CITE" => "http://www.example.com/quotes/foo.html", "ID" => "test") { "Foo!" }
+        output.should equal_element("BLOCKQUOTE", {"CITE" => "http://www.example.com/quotes/foo.html", "ID" => "test"}, "Foo!")
+      end
     end
   end
 end
diff --git a/spec/ruby/library/cgi/htmlextension/br_spec.rb b/spec/ruby/library/cgi/htmlextension/br_spec.rb
index dfca1218845b11..45909a2db7aebd 100644
--- a/spec/ruby/library/cgi/htmlextension/br_spec.rb
+++ b/spec/ruby/library/cgi/htmlextension/br_spec.rb
@@ -1,22 +1,25 @@
 require_relative '../../../spec_helper'
-require 'cgi'
-require_relative 'fixtures/common'
 
-describe "CGI::HtmlExtension#br" do
-  before :each do
-    @html = CGISpecs.cgi_new
-  end
+ruby_version_is ""..."3.5" do
+  require 'cgi'
+  require_relative 'fixtures/common'
 
-  describe "when each HTML generation" do
-    it "returns the doctype declaration for HTML3" do
-      CGISpecs.cgi_new("html3").br.should == "<BR>"
+  describe "CGI::HtmlExtension#br" do
+    before :each do
+      @html = CGISpecs.cgi_new
     end
 
-    it "returns the doctype declaration for HTML4" do
-      CGISpecs.cgi_new("html4").br.should == "<BR>"
-    end
-    it "returns the doctype declaration for the Transitional version of HTML4" do
-      CGISpecs.cgi_new("html4Tr").br.should == "<BR>"
+    describe "when each HTML generation" do
+      it "returns the doctype declaration for HTML3" do
+        CGISpecs.cgi_new("html3").br.should == "<BR>"
+      end
+
+      it "returns the doctype declaration for HTML4" do
+        CGISpecs.cgi_new("html4").br.should == "<BR>"
+      end
+      it "returns the doctype declaration for the Transitional version of HTML4" do
+        CGISpecs.cgi_new("html4Tr").br.should == "<BR>"
+      end
     end
   end
 end
diff --git a/spec/ruby/library/cgi/htmlextension/caption_spec.rb b/spec/ruby/library/cgi/htmlextension/caption_spec.rb
index 16615028b81165..74f0a098f43e1f 100644
--- a/spec/ruby/library/cgi/htmlextension/caption_spec.rb
+++ b/spec/ruby/library/cgi/htmlextension/caption_spec.rb
@@ -1,33 +1,36 @@
 require_relative '../../../spec_helper'
-require 'cgi'
-require_relative 'fixtures/common'
 
-describe "CGI::HtmlExtension#caption" do
-  before :each do
-    @html = CGISpecs.cgi_new
-  end
+ruby_version_is ""..."3.5" do
+  require 'cgi'
+  require_relative 'fixtures/common'
 
-  describe "when passed a String" do
-    it "returns a 'caption'-element, using the passed String for the 'align'-attribute" do
-      output = @html.caption("left")
-      output.should equal_element("CAPTION", "ALIGN" => "left")
+  describe "CGI::HtmlExtension#caption" do
+    before :each do
+      @html = CGISpecs.cgi_new
     end
 
-    it "includes the passed block's return value when passed a block" do
-      output = @html.caption("left") { "Capital Cities" }
-      output.should equal_element("CAPTION", {"ALIGN" => "left"}, "Capital Cities")
-    end
-  end
+    describe "when passed a String" do
+      it "returns a 'caption'-element, using the passed String for the 'align'-attribute" do
+        output = @html.caption("left")
+        output.should equal_element("CAPTION", "ALIGN" => "left")
+      end
 
-  describe "when passed a Hash" do
-    it "returns a 'caption'-element, using the passed Hash for attributes" do
-      output = @html.caption("ALIGN" => "left", "ID" => "test")
-      output.should equal_element("CAPTION", "ALIGN" => "left", "ID" => "test")
+      it "includes the passed block's return value when passed a block" do
+        output = @html.caption("left") { "Capital Cities" }
+        output.should equal_element("CAPTION", {"ALIGN" => "left"}, "Capital Cities")
+      end
     end
 
-    it "includes the passed block's return value when passed a block" do
-      output = @html.caption("ALIGN" => "left", "ID" => "test") { "Capital Cities" }
-      output.should equal_element("CAPTION", {"ALIGN" => "left", "ID" => "test"}, "Capital Cities")
+    describe "when passed a Hash" do
+      it "returns a 'caption'-element, using the passed Hash for attributes" do
+        output = @html.caption("ALIGN" => "left", "ID" => "test")
+        output.should equal_element("CAPTION", "ALIGN" => "left", "ID" => "test")
+      end
+
+      it "includes the passed block's return value when passed a block" do
+        output = @html.caption("ALIGN" => "left", "ID" => "test") { "Capital Cities" }
+        output.should equal_element("CAPTION", {"ALIGN" => "left", "ID" => "test"}, "Capital Cities")
+      end
     end
   end
 end
diff --git a/spec/ruby/library/cgi/htmlextension/checkbox_group_spec.rb b/spec/ruby/library/cgi/htmlextension/checkbox_group_spec.rb
index 64f852cc52f71f..1acfe62fdadcd4 100644
--- a/spec/ruby/library/cgi/htmlextension/checkbox_group_spec.rb
+++ b/spec/ruby/library/cgi/htmlextension/checkbox_group_spec.rb
@@ -1,76 +1,79 @@
 require_relative '../../../spec_helper'
-require 'cgi'
-require_relative 'fixtures/common'
 
-describe "CGI::HtmlExtension#checkbox_group" do
-  before :each do
-    @html = CGISpecs.cgi_new
-  end
+ruby_version_is ""..."3.5" do
+  require 'cgi'
+  require_relative 'fixtures/common'
 
-  describe "when passed name, values ..." do
-    it "returns a sequence of 'checkbox'-elements with the passed name and the passed values" do
-      output = CGISpecs.split(@html.checkbox_group("test", "foo", "bar", "baz"))
-      output[0].should equal_element("INPUT", {"NAME" => "test", "TYPE" => "checkbox", "VALUE" => "foo"}, "foo", not_closed: true)
-      output[1].should equal_element("INPUT", {"NAME" => "test", "TYPE" => "checkbox", "VALUE" => "bar"}, "bar", not_closed: true)
-      output[2].should equal_element("INPUT", {"NAME" => "test", "TYPE" => "checkbox", "VALUE" => "baz"}, "baz", not_closed: true)
+  describe "CGI::HtmlExtension#checkbox_group" do
+    before :each do
+      @html = CGISpecs.cgi_new
     end
 
-    it "allows passing a value inside an Array" do
-      output = CGISpecs.split(@html.checkbox_group("test", ["foo"], "bar", ["baz"]))
-      output[0].should equal_element("INPUT", {"NAME" => "test", "TYPE" => "checkbox", "VALUE" => "foo"}, "foo", not_closed: true)
-      output[1].should equal_element("INPUT", {"NAME" => "test", "TYPE" => "checkbox", "VALUE" => "bar"}, "bar", not_closed: true)
-      output[2].should equal_element("INPUT", {"NAME" => "test", "TYPE" => "checkbox", "VALUE" => "baz"}, "baz", not_closed: true)
-    end
+    describe "when passed name, values ..." do
+      it "returns a sequence of 'checkbox'-elements with the passed name and the passed values" do
+        output = CGISpecs.split(@html.checkbox_group("test", "foo", "bar", "baz"))
+        output[0].should equal_element("INPUT", {"NAME" => "test", "TYPE" => "checkbox", "VALUE" => "foo"}, "foo", not_closed: true)
+        output[1].should equal_element("INPUT", {"NAME" => "test", "TYPE" => "checkbox", "VALUE" => "bar"}, "bar", not_closed: true)
+        output[2].should equal_element("INPUT", {"NAME" => "test", "TYPE" => "checkbox", "VALUE" => "baz"}, "baz", not_closed: true)
+      end
 
-    it "allows passing a value as an Array containing the value and the checked state or a label" do
-      output = CGISpecs.split(@html.checkbox_group("test", ["foo"], ["bar", true], ["baz", "label for baz"]))
-      output[0].should equal_element("INPUT", {"NAME" => "test", "TYPE" => "checkbox", "VALUE" => "foo"}, "foo", not_closed: true)
-      output[1].should equal_element("INPUT", {"CHECKED" => true, "NAME" => "test", "TYPE" => "checkbox", "VALUE" => "bar"}, "bar", not_closed: true)
-      output[2].should equal_element("INPUT", {"NAME" => "test", "TYPE" => "checkbox", "VALUE" => "baz"}, "label for baz", not_closed: true)
-    end
+      it "allows passing a value inside an Array" do
+        output = CGISpecs.split(@html.checkbox_group("test", ["foo"], "bar", ["baz"]))
+        output[0].should equal_element("INPUT", {"NAME" => "test", "TYPE" => "checkbox", "VALUE" => "foo"}, "foo", not_closed: true)
+        output[1].should equal_element("INPUT", {"NAME" => "test", "TYPE" => "checkbox", "VALUE" => "bar"}, "bar", not_closed: true)
+        output[2].should equal_element("INPUT", {"NAME" => "test", "TYPE" => "checkbox", "VALUE" => "baz"}, "baz", not_closed: true)
+      end
 
-    it "allows passing a value as an Array containing the value, a label and the checked state" do
-      output = CGISpecs.split(@html.checkbox_group("test", ["foo", "label for foo", true], ["bar", "label for bar", false], ["baz", "label for baz", true]))
-      output[0].should equal_element("INPUT", {"CHECKED" => true, "NAME" => "test", "TYPE" => "checkbox", "VALUE" => "foo"}, "label for foo", not_closed: true)
-      output[1].should equal_element("INPUT", {"NAME" => "test", "TYPE" => "checkbox", "VALUE" => "bar"}, "label for bar", not_closed: true)
-      output[2].should equal_element("INPUT", {"CHECKED" => true, "NAME" => "test", "TYPE" => "checkbox", "VALUE" => "baz"}, "label for baz", not_closed: true)
-    end
+      it "allows passing a value as an Array containing the value and the checked state or a label" do
+        output = CGISpecs.split(@html.checkbox_group("test", ["foo"], ["bar", true], ["baz", "label for baz"]))
+        output[0].should equal_element("INPUT", {"NAME" => "test", "TYPE" => "checkbox", "VALUE" => "foo"}, "foo", not_closed: true)
+        output[1].should equal_element("INPUT", {"CHECKED" => true, "NAME" => "test", "TYPE" => "checkbox", "VALUE" => "bar"}, "bar", not_closed: true)
+        output[2].should equal_element("INPUT", {"NAME" => "test", "TYPE" => "checkbox", "VALUE" => "baz"}, "label for baz", not_closed: true)
+      end
 
-    it "returns an empty String when passed no values" do
-      @html.checkbox_group("test").should == ""
-    end
+      it "allows passing a value as an Array containing the value, a label and the checked state" do
+        output = CGISpecs.split(@html.checkbox_group("test", ["foo", "label for foo", true], ["bar", "label for bar", false], ["baz", "label for baz", true]))
+        output[0].should equal_element("INPUT", {"CHECKED" => true, "NAME" => "test", "TYPE" => "checkbox", "VALUE" => "foo"}, "label for foo", not_closed: true)
+        output[1].should equal_element("INPUT", {"NAME" => "test", "TYPE" => "checkbox", "VALUE" => "bar"}, "label for bar", not_closed: true)
+        output[2].should equal_element("INPUT", {"CHECKED" => true, "NAME" => "test", "TYPE" => "checkbox", "VALUE" => "baz"}, "label for baz", not_closed: true)
+      end
+
+      it "returns an empty String when passed no values" do
+        @html.checkbox_group("test").should == ""
+      end
 
-    it "ignores a passed block" do
-      output = CGISpecs.split(@html.checkbox_group("test", "foo", "bar", "baz") { "test" })
-      output[0].should equal_element("INPUT", {"NAME" => "test", "TYPE" => "checkbox", "VALUE" => "foo"}, "foo", not_closed: true)
-      output[1].should equal_element("INPUT", {"NAME" => "test", "TYPE" => "checkbox", "VALUE" => "bar"}, "bar", not_closed: true)
-      output[2].should equal_element("INPUT", {"NAME" => "test", "TYPE" => "checkbox", "VALUE" => "baz"}, "baz", not_closed: true)
+      it "ignores a passed block" do
+        output = CGISpecs.split(@html.checkbox_group("test", "foo", "bar", "baz") { "test" })
+        output[0].should equal_element("INPUT", {"NAME" => "test", "TYPE" => "checkbox", "VALUE" => "foo"}, "foo", not_closed: true)
+        output[1].should equal_element("INPUT", {"NAME" => "test", "TYPE" => "checkbox", "VALUE" => "bar"}, "bar", not_closed: true)
+        output[2].should equal_element("INPUT", {"NAME" => "test", "TYPE" => "checkbox", "VALUE" => "baz"}, "baz", not_closed: true)
+      end
     end
-  end
 
-  describe "when passed Hash" do
-    it "uses the passed Hash to generate the checkbox sequence" do
-      output = CGISpecs.split(@html.checkbox_group("NAME" => "name", "VALUES" => ["foo", "bar", "baz"]))
-      output[0].should equal_element("INPUT", {"NAME" => "name", "TYPE" => "checkbox", "VALUE" => "foo"}, "foo", not_closed: true)
-      output[1].should equal_element("INPUT", {"NAME" => "name", "TYPE" => "checkbox", "VALUE" => "bar"}, "bar", not_closed: true)
-      output[2].should equal_element("INPUT", {"NAME" => "name", "TYPE" => "checkbox", "VALUE" => "baz"}, "baz", not_closed: true)
+    describe "when passed Hash" do
+      it "uses the passed Hash to generate the checkbox sequence" do
+        output = CGISpecs.split(@html.checkbox_group("NAME" => "name", "VALUES" => ["foo", "bar", "baz"]))
+        output[0].should equal_element("INPUT", {"NAME" => "name", "TYPE" => "checkbox", "VALUE" => "foo"}, "foo", not_closed: true)
+        output[1].should equal_element("INPUT", {"NAME" => "name", "TYPE" => "checkbox", "VALUE" => "bar"}, "bar", not_closed: true)
+        output[2].should equal_element("INPUT", {"NAME" => "name", "TYPE" => "checkbox", "VALUE" => "baz"}, "baz", not_closed: true)
 
-      output = CGISpecs.split(@html.checkbox_group("NAME" => "name", "VALUES" => [["foo"], ["bar", true], "baz"]))
-      output[0].should equal_element("INPUT", {"NAME" => "name", "TYPE" => "checkbox", "VALUE" => "foo"}, "foo", not_closed: true)
-      output[1].should equal_element("INPUT", {"CHECKED" => true, "NAME" => "name", "TYPE" => "checkbox", "VALUE" => "bar"}, "bar", not_closed: true)
-      output[2].should equal_element("INPUT", {"NAME" => "name", "TYPE" => "checkbox", "VALUE" => "baz"}, "baz", not_closed: true)
+        output = CGISpecs.split(@html.checkbox_group("NAME" => "name", "VALUES" => [["foo"], ["bar", true], "baz"]))
+        output[0].should equal_element("INPUT", {"NAME" => "name", "TYPE" => "checkbox", "VALUE" => "foo"}, "foo", not_closed: true)
+        output[1].should equal_element("INPUT", {"CHECKED" => true, "NAME" => "name", "TYPE" => "checkbox", "VALUE" => "bar"}, "bar", not_closed: true)
+        output[2].should equal_element("INPUT", {"NAME" => "name", "TYPE" => "checkbox", "VALUE" => "baz"}, "baz", not_closed: true)
 
-      output = CGISpecs.split(@html.checkbox_group("NAME" => "name", "VALUES" => [["1", "Foo"], ["2", "Bar", true], "Baz"]))
-      output[0].should equal_element("INPUT", {"NAME" => "name", "TYPE" => "checkbox", "VALUE" => "1"}, "Foo", not_closed: true)
-      output[1].should equal_element("INPUT", {"CHECKED" => true, "NAME" => "name", "TYPE" => "checkbox", "VALUE" => "2"}, "Bar", not_closed: true)
-      output[2].should equal_element("INPUT", {"NAME" => "name", "TYPE" => "checkbox", "VALUE" => "Baz"}, "Baz", not_closed: true)
-    end
+        output = CGISpecs.split(@html.checkbox_group("NAME" => "name", "VALUES" => [["1", "Foo"], ["2", "Bar", true], "Baz"]))
+        output[0].should equal_element("INPUT", {"NAME" => "name", "TYPE" => "checkbox", "VALUE" => "1"}, "Foo", not_closed: true)
+        output[1].should equal_element("INPUT", {"CHECKED" => true, "NAME" => "name", "TYPE" => "checkbox", "VALUE" => "2"}, "Bar", not_closed: true)
+        output[2].should equal_element("INPUT", {"NAME" => "name", "TYPE" => "checkbox", "VALUE" => "Baz"}, "Baz", not_closed: true)
+      end
 
-    it "ignores a passed block" do
-      output = CGISpecs.split(@html.checkbox_group("NAME" => "name", "VALUES" => ["foo", "bar", "baz"]) { "test" })
-      output[0].should equal_element("INPUT", {"NAME" => "name", "TYPE" => "checkbox", "VALUE" => "foo"}, "foo", not_closed: true)
-      output[1].should equal_element("INPUT", {"NAME" => "name", "TYPE" => "checkbox", "VALUE" => "bar"}, "bar", not_closed: true)
-      output[2].should equal_element("INPUT", {"NAME" => "name", "TYPE" => "checkbox", "VALUE" => "baz"}, "baz", not_closed: true)
+      it "ignores a passed block" do
+        output = CGISpecs.split(@html.checkbox_group("NAME" => "name", "VALUES" => ["foo", "bar", "baz"]) { "test" })
+        output[0].should equal_element("INPUT", {"NAME" => "name", "TYPE" => "checkbox", "VALUE" => "foo"}, "foo", not_closed: true)
+        output[1].should equal_element("INPUT", {"NAME" => "name", "TYPE" => "checkbox", "VALUE" => "bar"}, "bar", not_closed: true)
+        output[2].should equal_element("INPUT", {"NAME" => "name", "TYPE" => "checkbox", "VALUE" => "baz"}, "baz", not_closed: true)
+      end
     end
   end
 end
diff --git a/spec/ruby/library/cgi/htmlextension/checkbox_spec.rb b/spec/ruby/library/cgi/htmlextension/checkbox_spec.rb
index af76fa1da95544..ba410f31de00d9 100644
--- a/spec/ruby/library/cgi/htmlextension/checkbox_spec.rb
+++ b/spec/ruby/library/cgi/htmlextension/checkbox_spec.rb
@@ -1,77 +1,80 @@
 require_relative '../../../spec_helper'
-require 'cgi'
-require_relative 'fixtures/common'
 
-describe "CGI::HtmlExtension#checkbox" do
-  before :each do
-    @html = CGISpecs.cgi_new
-  end
+ruby_version_is ""..."3.5" do
+  require 'cgi'
+  require_relative 'fixtures/common'
 
-  describe "when passed no arguments" do
-    it "returns a checkbox-'input'-element without a name" do
-      output = @html.checkbox
-      output.should equal_element("INPUT", {"NAME" => "", "TYPE" => "checkbox"}, "", not_closed: true)
+  describe "CGI::HtmlExtension#checkbox" do
+    before :each do
+      @html = CGISpecs.cgi_new
     end
 
-    it "ignores a passed block" do
-      output = @html.checkbox { "test" }
-      output.should equal_element("INPUT", {"NAME" => "", "TYPE" => "checkbox"}, "", not_closed: true)
-    end
-  end
+    describe "when passed no arguments" do
+      it "returns a checkbox-'input'-element without a name" do
+        output = @html.checkbox
+        output.should equal_element("INPUT", {"NAME" => "", "TYPE" => "checkbox"}, "", not_closed: true)
+      end
 
-  describe "when passed name" do
-    it "returns a checkbox-'input'-element with the passed name" do
-      output = @html.checkbox("test")
-      output.should equal_element("INPUT", {"NAME" => "test", "TYPE" => "checkbox"}, "", not_closed: true)
+      it "ignores a passed block" do
+        output = @html.checkbox { "test" }
+        output.should equal_element("INPUT", {"NAME" => "", "TYPE" => "checkbox"}, "", not_closed: true)
+      end
     end
 
-    it "ignores a passed block" do
-      output = @html.checkbox("test") { "test" }
-      output.should equal_element("INPUT", {"NAME" => "test", "TYPE" => "checkbox"}, "", not_closed: true)
-    end
-  end
+    describe "when passed name" do
+      it "returns a checkbox-'input'-element with the passed name" do
+        output = @html.checkbox("test")
+        output.should equal_element("INPUT", {"NAME" => "test", "TYPE" => "checkbox"}, "", not_closed: true)
+      end
 
-  describe "CGI::HtmlExtension#checkbox when passed name, value" do
-    it "returns a checkbox-'input'-element with the passed name and value" do
-      output = @html.checkbox("test", "test-value")
-      output.should equal_element("INPUT", {"NAME" => "test", "TYPE" => "checkbox", "VALUE" => "test-value"}, "", not_closed: true)
+      it "ignores a passed block" do
+        output = @html.checkbox("test") { "test" }
+        output.should equal_element("INPUT", {"NAME" => "test", "TYPE" => "checkbox"}, "", not_closed: true)
+      end
     end
 
-    it "ignores a passed block" do
-      output = @html.checkbox("test", "test-value") { "test" }
-      output.should equal_element("INPUT", {"NAME" => "test", "TYPE" => "checkbox", "VALUE" => "test-value"}, "", not_closed: true)
+    describe "CGI::HtmlExtension#checkbox when passed name, value" do
+      it "returns a checkbox-'input'-element with the passed name and value" do
+        output = @html.checkbox("test", "test-value")
+        output.should equal_element("INPUT", {"NAME" => "test", "TYPE" => "checkbox", "VALUE" => "test-value"}, "", not_closed: true)
+      end
+
+      it "ignores a passed block" do
+        output = @html.checkbox("test", "test-value") { "test" }
+        output.should equal_element("INPUT", {"NAME" => "test", "TYPE" => "checkbox", "VALUE" => "test-value"}, "", not_closed: true)
+      end
     end
-  end
 
-  describe "when passed name, value, checked" do
-    it "returns a checked checkbox-'input'-element with the passed name and value when checked is true" do
-      output = @html.checkbox("test", "test-value", true)
-      output.should equal_element("INPUT", {"CHECKED" => true, "NAME" => "test", "TYPE" => "checkbox", "VALUE" => "test-value"}, "", not_closed: true)
+    describe "when passed name, value, checked" do
+      it "returns a checked checkbox-'input'-element with the passed name and value when checked is true" do
+        output = @html.checkbox("test", "test-value", true)
+        output.should equal_element("INPUT", {"CHECKED" => true, "NAME" => "test", "TYPE" => "checkbox", "VALUE" => "test-value"}, "", not_closed: true)
 
-      output = @html.checkbox("test", "test-value", false)
-      output.should equal_element("INPUT", {"NAME" => "test", "TYPE" => "checkbox", "VALUE" => "test-value"}, "", not_closed: true)
+        output = @html.checkbox("test", "test-value", false)
+        output.should equal_element("INPUT", {"NAME" => "test", "TYPE" => "checkbox", "VALUE" => "test-value"}, "", not_closed: true)
 
-      output = @html.checkbox("test", "test-value", nil)
-      output.should equal_element("INPUT", {"NAME" => "test", "TYPE" => "checkbox", "VALUE" => "test-value"}, "", not_closed: true)
-    end
+        output = @html.checkbox("test", "test-value", nil)
+        output.should equal_element("INPUT", {"NAME" => "test", "TYPE" => "checkbox", "VALUE" => "test-value"}, "", not_closed: true)
+      end
 
-    it "ignores a passed block" do
-      output = @html.checkbox("test", "test-value", nil) { "test" }
-      output.should equal_element("INPUT", {"NAME" => "test", "TYPE" => "checkbox", "VALUE" => "test-value"}, "", not_closed: true)
+      it "ignores a passed block" do
+        output = @html.checkbox("test", "test-value", nil) { "test" }
+        output.should equal_element("INPUT", {"NAME" => "test", "TYPE" => "checkbox", "VALUE" => "test-value"}, "", not_closed: true)
+      end
     end
-  end
 
-  describe "when passed Hash" do
-    it "returns a checkbox-'input'-element using the passed Hash for attributes" do
-      attributes = {"NAME" => "test", "VALUE" => "test-value", "CHECKED" => true}
-      output = @html.checkbox(attributes)
-      output.should equal_element("INPUT", attributes, "", not_closed: true)
-    end
+    describe "when passed Hash" do
+      it "returns a checkbox-'input'-element using the passed Hash for attributes" do
+        attributes = {"NAME" => "test", "VALUE" => "test-value", "CHECKED" => true}
+        output = @html.checkbox(attributes)
+        output.should equal_element("INPUT", attributes, "", not_closed: true)
+      end
 
-    it "ignores a passed block" do
-      attributes = {"NAME" => "test", "VALUE" => "test-value", "CHECKED" => true}
-      output = @html.checkbox(attributes) { "test" }
-      output.should equal_element("INPUT", attributes, "", not_closed: true)
+      it "ignores a passed block" do
+        attributes = {"NAME" => "test", "VALUE" => "test-value", "CHECKED" => true}
+        output = @html.checkbox(attributes) { "test" }
+        output.should equal_element("INPUT", attributes, "", not_closed: true)
+      end
     end
   end
 end
diff --git a/spec/ruby/library/cgi/htmlextension/doctype_spec.rb b/spec/ruby/library/cgi/htmlextension/doctype_spec.rb
index 9a28a8883b7790..49501ac8f75235 100644
--- a/spec/ruby/library/cgi/htmlextension/doctype_spec.rb
+++ b/spec/ruby/library/cgi/htmlextension/doctype_spec.rb
@@ -1,27 +1,30 @@
 require_relative '../../../spec_helper'
-require 'cgi'
-require_relative 'fixtures/common'
 
-describe "CGI::HtmlExtension#doctype" do
-  describe "when each HTML generation" do
-    it "returns the doctype declaration for HTML3" do
-      expect = '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">'
-      CGISpecs.cgi_new("html3").doctype.should == expect
-    end
+ruby_version_is ""..."3.5" do
+  require 'cgi'
+  require_relative 'fixtures/common'
 
-    it "returns the doctype declaration for HTML4" do
-      expect = '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">'
-      CGISpecs.cgi_new("html4").doctype.should == expect
-    end
+  describe "CGI::HtmlExtension#doctype" do
+    describe "when each HTML generation" do
+      it "returns the doctype declaration for HTML3" do
+        expect = '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">'
+        CGISpecs.cgi_new("html3").doctype.should == expect
+      end
 
-    it "returns the doctype declaration for the Frameset version of HTML4" do
-      expect = '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Frameset//EN" "http://www.w3.org/TR/html4/frameset.dtd">'
-      CGISpecs.cgi_new("html4Fr").doctype.should == expect
-    end
+      it "returns the doctype declaration for HTML4" do
+        expect = '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">'
+        CGISpecs.cgi_new("html4").doctype.should == expect
+      end
+
+      it "returns the doctype declaration for the Frameset version of HTML4" do
+        expect = '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Frameset//EN" "http://www.w3.org/TR/html4/frameset.dtd">'
+        CGISpecs.cgi_new("html4Fr").doctype.should == expect
+      end
 
-    it "returns the doctype declaration for the Transitional version of HTML4" do
-      expect = '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">'
-      CGISpecs.cgi_new("html4Tr").doctype.should == expect
+      it "returns the doctype declaration for the Transitional version of HTML4" do
+        expect = '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">'
+        CGISpecs.cgi_new("html4Tr").doctype.should == expect
+      end
     end
   end
 end
diff --git a/spec/ruby/library/cgi/htmlextension/file_field_spec.rb b/spec/ruby/library/cgi/htmlextension/file_field_spec.rb
index 2a0632fd587bdb..b8ef0b2045deeb 100644
--- a/spec/ruby/library/cgi/htmlextension/file_field_spec.rb
+++ b/spec/ruby/library/cgi/htmlextension/file_field_spec.rb
@@ -1,72 +1,75 @@
 require_relative '../../../spec_helper'
-require 'cgi'
-require_relative 'fixtures/common'
 
-describe "CGI::HtmlExtension#file_field" do
-  before :each do
-    @html = CGISpecs.cgi_new
-  end
+ruby_version_is ""..."3.5" do
+  require 'cgi'
+  require_relative 'fixtures/common'
 
-  describe "when passed no arguments" do
-    it "returns a file-'input'-element without a name and a size of 20" do
-      output = @html.file_field
-      output.should equal_element("INPUT", {"SIZE" => 20, "NAME" => "", "TYPE" => "file"}, "", not_closed: true)
+  describe "CGI::HtmlExtension#file_field" do
+    before :each do
+      @html = CGISpecs.cgi_new
     end
 
-    it "ignores a passed block" do
-      output = @html.file_field { "test" }
-      output.should equal_element("INPUT", {"SIZE" => 20, "NAME" => "", "TYPE" => "file"}, "", not_closed: true)
-    end
-  end
+    describe "when passed no arguments" do
+      it "returns a file-'input'-element without a name and a size of 20" do
+        output = @html.file_field
+        output.should equal_element("INPUT", {"SIZE" => 20, "NAME" => "", "TYPE" => "file"}, "", not_closed: true)
+      end
 
-  describe "when passed name" do
-    it "returns a checkbox-'input'-element with the passed name" do
-      output = @html.file_field("Example")
-      output.should equal_element("INPUT", {"SIZE" => 20, "NAME" => "Example", "TYPE" => "file"}, "", not_closed: true)
+      it "ignores a passed block" do
+        output = @html.file_field { "test" }
+        output.should equal_element("INPUT", {"SIZE" => 20, "NAME" => "", "TYPE" => "file"}, "", not_closed: true)
+      end
     end
 
-    it "ignores a passed block" do
-      output = @html.file_field("Example") { "test" }
-      output.should equal_element("INPUT", {"SIZE" => 20, "NAME" => "Example", "TYPE" => "file"}, "", not_closed: true)
-    end
-  end
+    describe "when passed name" do
+      it "returns a checkbox-'input'-element with the passed name" do
+        output = @html.file_field("Example")
+        output.should equal_element("INPUT", {"SIZE" => 20, "NAME" => "Example", "TYPE" => "file"}, "", not_closed: true)
+      end
 
-  describe "when passed name, size" do
-    it "returns a checkbox-'input'-element with the passed name and size" do
-      output = @html.file_field("Example", 40)
-      output.should equal_element("INPUT", {"SIZE" => 40, "NAME" => "Example", "TYPE" => "file"}, "", not_closed: true)
+      it "ignores a passed block" do
+        output = @html.file_field("Example") { "test" }
+        output.should equal_element("INPUT", {"SIZE" => 20, "NAME" => "Example", "TYPE" => "file"}, "", not_closed: true)
+      end
     end
 
-    it "ignores a passed block" do
-      output = @html.file_field("Example", 40) { "test" }
-      output.should equal_element("INPUT", {"SIZE" => 40, "NAME" => "Example", "TYPE" => "file"}, "", not_closed: true)
-    end
-  end
+    describe "when passed name, size" do
+      it "returns a checkbox-'input'-element with the passed name and size" do
+        output = @html.file_field("Example", 40)
+        output.should equal_element("INPUT", {"SIZE" => 40, "NAME" => "Example", "TYPE" => "file"}, "", not_closed: true)
+      end
 
-  describe "when passed name, size, maxlength" do
-    it "returns a checkbox-'input'-element with the passed name, size and maxlength" do
-      output = @html.file_field("Example", 40, 100)
-      output.should equal_element("INPUT", {"SIZE" => 40, "NAME" => "Example", "TYPE" => "file", "MAXLENGTH" => 100}, "", not_closed: true)
+      it "ignores a passed block" do
+        output = @html.file_field("Example", 40) { "test" }
+        output.should equal_element("INPUT", {"SIZE" => 40, "NAME" => "Example", "TYPE" => "file"}, "", not_closed: true)
+      end
     end
 
-    it "ignores a passed block" do
-      output = @html.file_field("Example", 40, 100) { "test" }
-      output.should equal_element("INPUT", {"SIZE" => 40, "NAME" => "Example", "TYPE" => "file", "MAXLENGTH" => 100}, "", not_closed: true)
+    describe "when passed name, size, maxlength" do
+      it "returns a checkbox-'input'-element with the passed name, size and maxlength" do
+        output = @html.file_field("Example", 40, 100)
+        output.should equal_element("INPUT", {"SIZE" => 40, "NAME" => "Example", "TYPE" => "file", "MAXLENGTH" => 100}, "", not_closed: true)
+      end
+
+      it "ignores a passed block" do
+        output = @html.file_field("Example", 40, 100) { "test" }
+        output.should equal_element("INPUT", {"SIZE" => 40, "NAME" => "Example", "TYPE" => "file", "MAXLENGTH" => 100}, "", not_closed: true)
+      end
     end
-  end
 
-  describe "when passed a Hash" do
-    it "returns a file-'input'-element using the passed Hash for attributes" do
-      output = @html.file_field("NAME" => "test", "SIZE" => 40)
-      output.should equal_element("INPUT", {"NAME" => "test", "SIZE" => 40}, "", not_closed: true)
+    describe "when passed a Hash" do
+      it "returns a file-'input'-element using the passed Hash for attributes" do
+        output = @html.file_field("NAME" => "test", "SIZE" => 40)
+        output.should equal_element("INPUT", {"NAME" => "test", "SIZE" => 40}, "", not_closed: true)
 
-      output = @html.file_field("NAME" => "test", "MAXLENGTH" => 100)
-      output.should equal_element("INPUT", {"NAME" => "test", "MAXLENGTH" => 100}, "", not_closed: true)
-    end
+        output = @html.file_field("NAME" => "test", "MAXLENGTH" => 100)
+        output.should equal_element("INPUT", {"NAME" => "test", "MAXLENGTH" => 100}, "", not_closed: true)
+      end
 
-    it "ignores a passed block" do
-      output = @html.file_field("NAME" => "test", "SIZE" => 40) { "test" }
-      output.should equal_element("INPUT", {"NAME" => "test", "SIZE" => 40}, "", not_closed: true)
+      it "ignores a passed block" do
+        output = @html.file_field("NAME" => "test", "SIZE" => 40) { "test" }
+        output.should equal_element("INPUT", {"NAME" => "test", "SIZE" => 40}, "", not_closed: true)
+      end
     end
   end
 end
diff --git a/spec/ruby/library/cgi/htmlextension/form_spec.rb b/spec/ruby/library/cgi/htmlextension/form_spec.rb
index 8c0ac97735fcee..510ce27b777c54 100644
--- a/spec/ruby/library/cgi/htmlextension/form_spec.rb
+++ b/spec/ruby/library/cgi/htmlextension/form_spec.rb
@@ -1,58 +1,61 @@
 require_relative '../../../spec_helper'
-require 'cgi'
-require_relative 'fixtures/common'
 
-describe "CGI::HtmlExtension#form" do
-  before :each do
-    @html = CGISpecs.cgi_new
-    @html.stub!(:script_name).and_return("/path/to/some/script")
-  end
+ruby_version_is ""..."3.5" do
+  require 'cgi'
+  require_relative 'fixtures/common'
 
-  describe "when passed no arguments" do
-    it "returns a 'form'-element" do
-      output = @html.form
-      output.should equal_element("FORM", {"ENCTYPE" => "application/x-www-form-urlencoded", "METHOD" => "post", "ACTION" => "/path/to/some/script"}, "")
+  describe "CGI::HtmlExtension#form" do
+    before :each do
+      @html = CGISpecs.cgi_new
+      @html.stub!(:script_name).and_return("/path/to/some/script")
     end
 
-    it "includes the return value of the passed block when passed a block" do
-      output = @html.form { "test" }
-      output.should equal_element("FORM", {"ENCTYPE" => "application/x-www-form-urlencoded", "METHOD" => "post", "ACTION" => "/path/to/some/script"}, "test")
-    end
-  end
+    describe "when passed no arguments" do
+      it "returns a 'form'-element" do
+        output = @html.form
+        output.should equal_element("FORM", {"ENCTYPE" => "application/x-www-form-urlencoded", "METHOD" => "post", "ACTION" => "/path/to/some/script"}, "")
+      end
 
-  describe "when passed method" do
-    it "returns a 'form'-element with the passed method" do
-      output = @html.form("get")
-      output.should equal_element("FORM", {"ENCTYPE" => "application/x-www-form-urlencoded", "METHOD" => "get", "ACTION" => "/path/to/some/script"}, "")
+      it "includes the return value of the passed block when passed a block" do
+        output = @html.form { "test" }
+        output.should equal_element("FORM", {"ENCTYPE" => "application/x-www-form-urlencoded", "METHOD" => "post", "ACTION" => "/path/to/some/script"}, "test")
+      end
     end
 
-    it "includes the return value of the passed block when passed a block" do
-      output = @html.form("get") { "test" }
-      output.should equal_element("FORM", {"ENCTYPE" => "application/x-www-form-urlencoded", "METHOD" => "get", "ACTION" => "/path/to/some/script"}, "test")
-    end
-  end
+    describe "when passed method" do
+      it "returns a 'form'-element with the passed method" do
+        output = @html.form("get")
+        output.should equal_element("FORM", {"ENCTYPE" => "application/x-www-form-urlencoded", "METHOD" => "get", "ACTION" => "/path/to/some/script"}, "")
+      end
 
-  describe "when passed method, action" do
-    it "returns a 'form'-element with the passed method and the passed action" do
-      output = @html.form("get", "/some/other/script")
-      output.should equal_element("FORM", {"ENCTYPE" => "application/x-www-form-urlencoded", "METHOD" => "get", "ACTION" => "/some/other/script"}, "")
+      it "includes the return value of the passed block when passed a block" do
+        output = @html.form("get") { "test" }
+        output.should equal_element("FORM", {"ENCTYPE" => "application/x-www-form-urlencoded", "METHOD" => "get", "ACTION" => "/path/to/some/script"}, "test")
+      end
     end
 
-    it "includes the return value of the passed block when passed a block" do
-      output = @html.form("get", "/some/other/script") { "test" }
-      output.should equal_element("FORM", {"ENCTYPE" => "application/x-www-form-urlencoded", "METHOD" => "get", "ACTION" => "/some/other/script"}, "test")
-    end
-  end
+    describe "when passed method, action" do
+      it "returns a 'form'-element with the passed method and the passed action" do
+        output = @html.form("get", "/some/other/script")
+        output.should equal_element("FORM", {"ENCTYPE" => "application/x-www-form-urlencoded", "METHOD" => "get", "ACTION" => "/some/other/script"}, "")
+      end
 
-  describe "when passed method, action, enctype" do
-    it "returns a 'form'-element with the passed method, action and enctype" do
-      output = @html.form("get", "/some/other/script", "multipart/form-data")
-      output.should equal_element("FORM", {"ENCTYPE" => "multipart/form-data", "METHOD" => "get", "ACTION" => "/some/other/script"}, "")
+      it "includes the return value of the passed block when passed a block" do
+        output = @html.form("get", "/some/other/script") { "test" }
+        output.should equal_element("FORM", {"ENCTYPE" => "application/x-www-form-urlencoded", "METHOD" => "get", "ACTION" => "/some/other/script"}, "test")
+      end
     end
 
-    it "includes the return value of the passed block when passed a block" do
-      output = @html.form("get", "/some/other/script", "multipart/form-data") { "test" }
-      output.should equal_element("FORM", {"ENCTYPE" => "multipart/form-data", "METHOD" => "get", "ACTION" => "/some/other/script"}, "test")
+    describe "when passed method, action, enctype" do
+      it "returns a 'form'-element with the passed method, action and enctype" do
+        output = @html.form("get", "/some/other/script", "multipart/form-data")
+        output.should equal_element("FORM", {"ENCTYPE" => "multipart/form-data", "METHOD" => "get", "ACTION" => "/some/other/script"}, "")
+      end
+
+      it "includes the return value of the passed block when passed a block" do
+        output = @html.form("get", "/some/other/script", "multipart/form-data") { "test" }
+        output.should equal_element("FORM", {"ENCTYPE" => "multipart/form-data", "METHOD" => "get", "ACTION" => "/some/other/script"}, "test")
+      end
     end
   end
 end
diff --git a/spec/ruby/library/cgi/htmlextension/frame_spec.rb b/spec/ruby/library/cgi/htmlextension/frame_spec.rb
index 2ddd4e1ef019aa..0dc30e94f78b57 100644
--- a/spec/ruby/library/cgi/htmlextension/frame_spec.rb
+++ b/spec/ruby/library/cgi/htmlextension/frame_spec.rb
@@ -1,14 +1,17 @@
 require_relative '../../../spec_helper'
-require_relative 'fixtures/common'
-require 'cgi'
 
-describe "CGI::HtmlExtension#frame" do
-  before :each do
-    @html = CGISpecs.cgi_new("html4Fr")
-  end
+ruby_version_is ""..."3.5" do
+  require_relative 'fixtures/common'
+  require 'cgi'
+
+  describe "CGI::HtmlExtension#frame" do
+    before :each do
+      @html = CGISpecs.cgi_new("html4Fr")
+    end
 
-  it "initializes the HTML Generation methods for the Frameset version of HTML4" do
-    @html.frameset.should == "<FRAMESET></FRAMESET>"
-    @html.frameset { "link text" }.should == "<FRAMESET>link text</FRAMESET>"
+    it "initializes the HTML Generation methods for the Frameset version of HTML4" do
+      @html.frameset.should == "<FRAMESET></FRAMESET>"
+      @html.frameset { "link text" }.should == "<FRAMESET>link text</FRAMESET>"
+    end
   end
 end
diff --git a/spec/ruby/library/cgi/htmlextension/frameset_spec.rb b/spec/ruby/library/cgi/htmlextension/frameset_spec.rb
index baeb4465936bce..a37b5f537da1fb 100644
--- a/spec/ruby/library/cgi/htmlextension/frameset_spec.rb
+++ b/spec/ruby/library/cgi/htmlextension/frameset_spec.rb
@@ -1,14 +1,17 @@
 require_relative '../../../spec_helper'
-require_relative 'fixtures/common'
-require 'cgi'
 
-describe "CGI::HtmlExtension#frameset" do
-  before :each do
-    @html = CGISpecs.cgi_new("html4Fr")
-  end
+ruby_version_is ""..."3.5" do
+  require_relative 'fixtures/common'
+  require 'cgi'
+
+  describe "CGI::HtmlExtension#frameset" do
+    before :each do
+      @html = CGISpecs.cgi_new("html4Fr")
+    end
 
-  it "initializes the HTML Generation methods for the Frameset version of HTML4" do
-    @html.frameset.should == "<FRAMESET></FRAMESET>"
-    @html.frameset { "link text" }.should == "<FRAMESET>link text</FRAMESET>"
+    it "initializes the HTML Generation methods for the Frameset version of HTML4" do
+      @html.frameset.should == "<FRAMESET></FRAMESET>"
+      @html.frameset { "link text" }.should == "<FRAMESET>link text</FRAMESET>"
+    end
   end
 end
diff --git a/spec/ruby/library/cgi/htmlextension/hidden_spec.rb b/spec/ruby/library/cgi/htmlextension/hidden_spec.rb
index 52ebd8c261c8d4..5771058fa31899 100644
--- a/spec/ruby/library/cgi/htmlextension/hidden_spec.rb
+++ b/spec/ruby/library/cgi/htmlextension/hidden_spec.rb
@@ -1,59 +1,62 @@
 require_relative '../../../spec_helper'
-require 'cgi'
-require_relative 'fixtures/common'
 
-describe "CGI::HtmlExtension#hidden" do
-  before :each do
-    @html = CGISpecs.cgi_new
-  end
+ruby_version_is ""..."3.5" do
+  require 'cgi'
+  require_relative 'fixtures/common'
 
-  describe "when passed no arguments" do
-    it "returns an hidden-'input'-element without a name" do
-      output = @html.hidden
-      output.should equal_element("INPUT", {"NAME" => "", "TYPE" => "hidden"}, "", not_closed: true)
+  describe "CGI::HtmlExtension#hidden" do
+    before :each do
+      @html = CGISpecs.cgi_new
     end
 
-    it "ignores a passed block" do
-      output = @html.hidden { "test" }
-      output.should equal_element("INPUT", {"NAME" => "", "TYPE" => "hidden"}, "", not_closed: true)
-    end
-  end
+    describe "when passed no arguments" do
+      it "returns an hidden-'input'-element without a name" do
+        output = @html.hidden
+        output.should equal_element("INPUT", {"NAME" => "", "TYPE" => "hidden"}, "", not_closed: true)
+      end
 
-  describe "when passed name" do
-    it "returns an hidden-'input'-element with the passed name" do
-      output = @html.hidden("test")
-      output.should equal_element("INPUT", {"NAME" => "test", "TYPE" => "hidden"}, "", not_closed: true)
+      it "ignores a passed block" do
+        output = @html.hidden { "test" }
+        output.should equal_element("INPUT", {"NAME" => "", "TYPE" => "hidden"}, "", not_closed: true)
+      end
     end
 
-    it "ignores a passed block" do
-      output = @html.hidden("test") { "test" }
-      output.should equal_element("INPUT", {"NAME" => "test", "TYPE" => "hidden"}, "", not_closed: true)
-    end
-  end
+    describe "when passed name" do
+      it "returns an hidden-'input'-element with the passed name" do
+        output = @html.hidden("test")
+        output.should equal_element("INPUT", {"NAME" => "test", "TYPE" => "hidden"}, "", not_closed: true)
+      end
 
-  describe "when passed name, value" do
-    it "returns an hidden-'input'-element with the passed name and value" do
-      output = @html.hidden("test", "some value")
-      output.should equal_element("INPUT", {"NAME" => "test", "TYPE" => "hidden", "VALUE" => "some value"}, "", not_closed: true)
+      it "ignores a passed block" do
+        output = @html.hidden("test") { "test" }
+        output.should equal_element("INPUT", {"NAME" => "test", "TYPE" => "hidden"}, "", not_closed: true)
+      end
     end
 
-    it "ignores a passed block" do
-      output = @html.hidden("test", "some value") { "test" }
-      output.should equal_element("INPUT", {"NAME" => "test", "TYPE" => "hidden", "VALUE" => "some value"}, "", not_closed: true)
-    end
-  end
+    describe "when passed name, value" do
+      it "returns an hidden-'input'-element with the passed name and value" do
+        output = @html.hidden("test", "some value")
+        output.should equal_element("INPUT", {"NAME" => "test", "TYPE" => "hidden", "VALUE" => "some value"}, "", not_closed: true)
+      end
 
-  describe "when passed Hash" do
-    it "returns a checkbox-'input'-element using the passed Hash for attributes" do
-      attributes = { "NAME" => "test", "VALUE" => "some value" }
-      output = @html.hidden("test", "some value")
-      output.should equal_element("INPUT", attributes, "", not_closed: true)
+      it "ignores a passed block" do
+        output = @html.hidden("test", "some value") { "test" }
+        output.should equal_element("INPUT", {"NAME" => "test", "TYPE" => "hidden", "VALUE" => "some value"}, "", not_closed: true)
+      end
     end
 
-    it "ignores a passed block" do
-      attributes = { "NAME" => "test", "VALUE" => "some value" }
-      output = @html.hidden("test", "some value") { "test" }
-      output.should equal_element("INPUT", attributes, "", not_closed: true)
+    describe "when passed Hash" do
+      it "returns a checkbox-'input'-element using the passed Hash for attributes" do
+        attributes = { "NAME" => "test", "VALUE" => "some value" }
+        output = @html.hidden("test", "some value")
+        output.should equal_element("INPUT", attributes, "", not_closed: true)
+      end
+
+      it "ignores a passed block" do
+        attributes = { "NAME" => "test", "VALUE" => "some value" }
+        output = @html.hidden("test", "some value") { "test" }
+        output.should equal_element("INPUT", attributes, "", not_closed: true)
+      end
     end
   end
 end
diff --git a/spec/ruby/library/cgi/htmlextension/html_spec.rb b/spec/ruby/library/cgi/htmlextension/html_spec.rb
index 5d89c8208625b5..0e4052dcc4a2c8 100644
--- a/spec/ruby/library/cgi/htmlextension/html_spec.rb
+++ b/spec/ruby/library/cgi/htmlextension/html_spec.rb
@@ -1,66 +1,69 @@
 require_relative '../../../spec_helper'
-require 'cgi'
-require_relative 'fixtures/common'
 
-describe "CGI::HtmlExtension#html" do
-  before :each do
-    @html = CGISpecs.cgi_new
-    @html.stub!(:doctype).and_return("<!DOCTYPE SUPA-FUNKAY-RUBYSPEC-DOCTYPE>")
-  end
+ruby_version_is ""..."3.5" do
+  require 'cgi'
+  require_relative 'fixtures/common'
 
-  describe "when passed no arguments" do
-    it "returns a self's doctype and an 'html'-element" do
-      expected = '<!DOCTYPE SUPA-FUNKAY-RUBYSPEC-DOCTYPE><HTML>'
-      @html.html.should == expected
+  describe "CGI::HtmlExtension#html" do
+    before :each do
+      @html = CGISpecs.cgi_new
+      @html.stub!(:doctype).and_return("<!DOCTYPE SUPA-FUNKAY-RUBYSPEC-DOCTYPE>")
     end
 
-    it "includes the passed block when passed a block" do
-      expected = '<!DOCTYPE SUPA-FUNKAY-RUBYSPEC-DOCTYPE><HTML>test</HTML>'
-      @html.html { "test" }.should == expected
-    end
-  end
+    describe "when passed no arguments" do
+      it "returns a self's doctype and an 'html'-element" do
+        expected = '<!DOCTYPE SUPA-FUNKAY-RUBYSPEC-DOCTYPE><HTML>'
+        @html.html.should == expected
+      end
 
-  describe "when passed 'PRETTY'" do
-    it "returns pretty output when the passed String is 'PRETTY" do
-      expected = "<!DOCTYPE SUPA-FUNKAY-RUBYSPEC-DOCTYPE>\n<HTML>\n"
-      @html.html("PRETTY").should == expected
+      it "includes the passed block when passed a block" do
+        expected = '<!DOCTYPE SUPA-FUNKAY-RUBYSPEC-DOCTYPE><HTML>test</HTML>'
+        @html.html { "test" }.should == expected
+      end
     end
 
-    it "includes the passed block when passed a block" do
-      expected = "<!DOCTYPE SUPA-FUNKAY-RUBYSPEC-DOCTYPE>\n<HTML>\n  test\n</HTML>\n"
-      @html.html("PRETTY") { "test" }.should == expected
-    end
-  end
+    describe "when passed 'PRETTY'" do
+      it "returns pretty output when the passed String is 'PRETTY" do
+        expected = "<!DOCTYPE SUPA-FUNKAY-RUBYSPEC-DOCTYPE>\n<HTML>\n"
+        @html.html("PRETTY").should == expected
+      end
 
-  describe "when passed a Hash" do
-    it "returns an 'html'-element using the passed Hash for attributes" do
-      expected = '<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN"><HTML BLA="TEST">'
-      @html.html("DOCTYPE" => '<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">', "BLA" => "TEST").should == expected
+      it "includes the passed block when passed a block" do
+        expected = "<!DOCTYPE SUPA-FUNKAY-RUBYSPEC-DOCTYPE>\n<HTML>\n  test\n</HTML>\n"
+        @html.html("PRETTY") { "test" }.should == expected
+      end
     end
 
-    it "omits the doctype when the Hash contains a 'DOCTYPE' entry that's false or nil" do
-      @html.html("DOCTYPE" => false).should == "<HTML>"
-      @html.html("DOCTYPE" => nil).should == "<HTML>"
-    end
-  end
+    describe "when passed a Hash" do
+      it "returns an 'html'-element using the passed Hash for attributes" do
+        expected = '<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN"><HTML BLA="TEST">'
+        @html.html("DOCTYPE" => '<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">', "BLA" => "TEST").should == expected
+      end
 
-  describe "when each HTML generation" do
-    it "returns the doctype declaration for HTML3" do
-      expect = '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">'
-      CGISpecs.cgi_new("html3").html.should == expect + "<HTML>"
-      CGISpecs.cgi_new("html3").html { "html body" }.should == expect + "<HTML>html body</HTML>"
+      it "omits the doctype when the Hash contains a 'DOCTYPE' entry that's false or nil" do
+        @html.html("DOCTYPE" => false).should == "<HTML>"
+        @html.html("DOCTYPE" => nil).should == "<HTML>"
+      end
     end
 
-    it "returns the doctype declaration for HTML4" do
-      expect = '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">'
-      CGISpecs.cgi_new("html4").html.should == expect + "<HTML>"
-      CGISpecs.cgi_new("html4").html { "html body" }.should == expect + "<HTML>html body</HTML>"
-    end
+    describe "when each HTML generation" do
+      it "returns the doctype declaration for HTML3" do
+        expect = '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">'
+        CGISpecs.cgi_new("html3").html.should == expect + "<HTML>"
+        CGISpecs.cgi_new("html3").html { "html body" }.should == expect + "<HTML>html body</HTML>"
+      end
+
+      it "returns the doctype declaration for HTML4" do
+        expect = '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">'
+        CGISpecs.cgi_new("html4").html.should == expect + "<HTML>"
+        CGISpecs.cgi_new("html4").html { "html body" }.should == expect + "<HTML>html body</HTML>"
+      end
 
-    it "returns the doctype declaration for the Transitional version of HTML4" do
-      expect = '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">'
-      CGISpecs.cgi_new("html4Tr").html.should == expect + "<HTML>"
-      CGISpecs.cgi_new("html4Tr").html { "html body" }.should == expect + "<HTML>html body</HTML>"
+      it "returns the doctype declaration for the Transitional version of HTML4" do
+        expect = '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">'
+        CGISpecs.cgi_new("html4Tr").html.should == expect + "<HTML>"
+        CGISpecs.cgi_new("html4Tr").html { "html body" }.should == expect + "<HTML>html body</HTML>"
+      end
     end
   end
 end
diff --git a/spec/ruby/library/cgi/htmlextension/image_button_spec.rb b/spec/ruby/library/cgi/htmlextension/image_button_spec.rb
index d14bec9ca34e8a..cd7f1ae4f775f1 100644
--- a/spec/ruby/library/cgi/htmlextension/image_button_spec.rb
+++ b/spec/ruby/library/cgi/htmlextension/image_button_spec.rb
@@ -1,69 +1,72 @@
 require_relative '../../../spec_helper'
-require 'cgi'
-require_relative 'fixtures/common'
 
-describe "CGI::HtmlExtension#image_button" do
-  before :each do
-    @html = CGISpecs.cgi_new
-  end
+ruby_version_is ""..."3.5" do
+  require 'cgi'
+  require_relative 'fixtures/common'
 
-  describe "when passed no arguments" do
-    it "returns an image-'input'-element without a source image" do
-      output = @html.image_button
-      output.should equal_element("INPUT", {"SRC" => "", "TYPE" => "image"}, "", not_closed: true)
+  describe "CGI::HtmlExtension#image_button" do
+    before :each do
+      @html = CGISpecs.cgi_new
     end
 
-    it "ignores a passed block" do
-      output = @html.image_button { "test" }
-      output.should equal_element("INPUT", {"SRC" => "", "TYPE" => "image"}, "", not_closed: true)
-    end
-  end
+    describe "when passed no arguments" do
+      it "returns an image-'input'-element without a source image" do
+        output = @html.image_button
+        output.should equal_element("INPUT", {"SRC" => "", "TYPE" => "image"}, "", not_closed: true)
+      end
 
-  describe "when passed src" do
-    it "returns an image-'input'-element with the passed src" do
-      output = @html.image_button("/path/to/image.png")
-      output.should equal_element("INPUT", {"SRC" => "/path/to/image.png", "TYPE" => "image"}, "", not_closed: true)
+      it "ignores a passed block" do
+        output = @html.image_button { "test" }
+        output.should equal_element("INPUT", {"SRC" => "", "TYPE" => "image"}, "", not_closed: true)
+      end
     end
 
-    it "ignores a passed block" do
-      output = @html.image_button("/path/to/image.png") { "test" }
-      output.should equal_element("INPUT", {"SRC" => "/path/to/image.png", "TYPE" => "image"}, "", not_closed: true)
-    end
-  end
+    describe "when passed src" do
+      it "returns an image-'input'-element with the passed src" do
+        output = @html.image_button("/path/to/image.png")
+        output.should equal_element("INPUT", {"SRC" => "/path/to/image.png", "TYPE" => "image"}, "", not_closed: true)
+      end
 
-  describe "when passed src, name" do
-    it "returns an image-'input'-element with the passed src and name" do
-      output = @html.image_button("/path/to/image.png", "test")
-      output.should equal_element("INPUT", {"SRC" => "/path/to/image.png", "TYPE" => "image", "NAME" => "test"}, "", not_closed: true)
+      it "ignores a passed block" do
+        output = @html.image_button("/path/to/image.png") { "test" }
+        output.should equal_element("INPUT", {"SRC" => "/path/to/image.png", "TYPE" => "image"}, "", not_closed: true)
+      end
     end
 
-    it "ignores a passed block" do
-      output = @html.image_button("/path/to/image.png", "test") { "test" }
-      output.should equal_element("INPUT", {"SRC" => "/path/to/image.png", "TYPE" => "image", "NAME" => "test"}, "", not_closed: true)
-    end
-  end
+    describe "when passed src, name" do
+      it "returns an image-'input'-element with the passed src and name" do
+        output = @html.image_button("/path/to/image.png", "test")
+        output.should equal_element("INPUT", {"SRC" => "/path/to/image.png", "TYPE" => "image", "NAME" => "test"}, "", not_closed: true)
+      end
 
-  describe "when passed src, name, alt" do
-    it "returns an image-'input'-element with the passed src, name and alt" do
-      output = @html.image_button("/path/to/image.png", "test", "alternative")
-      output.should equal_element("INPUT", {"SRC" => "/path/to/image.png", "TYPE" => "image", "NAME" => "test", "ALT" => "alternative"}, "", not_closed: true)
+      it "ignores a passed block" do
+        output = @html.image_button("/path/to/image.png", "test") { "test" }
+        output.should equal_element("INPUT", {"SRC" => "/path/to/image.png", "TYPE" => "image", "NAME" => "test"}, "", not_closed: true)
+      end
     end
 
-    it "ignores a passed block" do
-      output = @html.image_button("/path/to/image.png", "test", "alternative") { "test" }
-      output.should equal_element("INPUT", {"SRC" => "/path/to/image.png", "TYPE" => "image", "NAME" => "test", "ALT" => "alternative"}, "", not_closed: true)
-    end
-  end
+    describe "when passed src, name, alt" do
+      it "returns an image-'input'-element with the passed src, name and alt" do
+        output = @html.image_button("/path/to/image.png", "test", "alternative")
+        output.should equal_element("INPUT", {"SRC" => "/path/to/image.png", "TYPE" => "image", "NAME" => "test", "ALT" => "alternative"}, "", not_closed: true)
+      end
 
-  describe "when passed Hash" do
-    it "returns a image-'input'-element using the passed Hash for attributes" do
-      output = @html.image_button("NAME" => "test", "VALUE" => "test-value")
-      output.should equal_element("INPUT", {"SRC" => "", "TYPE" => "image", "NAME" => "test", "VALUE" => "test-value"}, "", not_closed: true)
+      it "ignores a passed block" do
+        output = @html.image_button("/path/to/image.png", "test", "alternative") { "test" }
+        output.should equal_element("INPUT", {"SRC" => "/path/to/image.png", "TYPE" => "image", "NAME" => "test", "ALT" => "alternative"}, "", not_closed: true)
+      end
     end
 
-    it "ignores a passed block" do
-      output = @html.image_button("NAME" => "test", "VALUE" => "test-value") { "test" }
-      output.should equal_element("INPUT", {"SRC" => "", "TYPE" => "image", "NAME" => "test", "VALUE" => "test-value"}, "", not_closed: true)
+    describe "when passed Hash" do
+      it "returns a image-'input'-element using the passed Hash for attributes" do
+        output = @html.image_button("NAME" => "test", "VALUE" => "test-value")
+        output.should equal_element("INPUT", {"SRC" => "", "TYPE" => "image", "NAME" => "test", "VALUE" => "test-value"}, "", not_closed: true)
+      end
+
+      it "ignores a passed block" do
+        output = @html.image_button("NAME" => "test", "VALUE" => "test-value") { "test" }
+        output.should equal_element("INPUT", {"SRC" => "", "TYPE" => "image", "NAME" => "test", "VALUE" => "test-value"}, "", not_closed: true)
+      end
     end
   end
 end
diff --git a/spec/ruby/library/cgi/htmlextension/img_spec.rb b/spec/ruby/library/cgi/htmlextension/img_spec.rb
index 994ae7fedfc7ec..193d3dca2624b3 100644
--- a/spec/ruby/library/cgi/htmlextension/img_spec.rb
+++ b/spec/ruby/library/cgi/htmlextension/img_spec.rb
@@ -1,83 +1,86 @@
 require_relative '../../../spec_helper'
-require 'cgi'
-require_relative 'fixtures/common'
 
-describe "CGI::HtmlExtension#img" do
-  before :each do
-    @html = CGISpecs.cgi_new
-  end
+ruby_version_is ""..."3.5" do
+  require 'cgi'
+  require_relative 'fixtures/common'
 
-  describe "when passed no arguments" do
-    it "returns an 'img'-element without an src-url or alt-text" do
-      output = @html.img
-      output.should equal_element("IMG", { "SRC" => "", "ALT" => "" }, "", not_closed: true)
+  describe "CGI::HtmlExtension#img" do
+    before :each do
+      @html = CGISpecs.cgi_new
     end
 
-    it "ignores a passed block" do
-      output = @html.img { "test" }
-      output.should equal_element("IMG", { "SRC" => "", "ALT" => "" }, "", not_closed: true)
-    end
-  end
+    describe "when passed no arguments" do
+      it "returns an 'img'-element without an src-url or alt-text" do
+        output = @html.img
+        output.should equal_element("IMG", { "SRC" => "", "ALT" => "" }, "", not_closed: true)
+      end
 
-  describe "when passed src" do
-    it "returns an 'img'-element with the passed src-url" do
-      output = @html.img("/path/to/some/image.png")
-      output.should equal_element("IMG", { "SRC" => "/path/to/some/image.png", "ALT" => "" }, "", not_closed: true)
+      it "ignores a passed block" do
+        output = @html.img { "test" }
+        output.should equal_element("IMG", { "SRC" => "", "ALT" => "" }, "", not_closed: true)
+      end
     end
 
-    it "ignores a passed block" do
-      output = @html.img("/path/to/some/image.png")
-      output.should equal_element("IMG", { "SRC" => "/path/to/some/image.png", "ALT" => "" }, "", not_closed: true)
-    end
-  end
+    describe "when passed src" do
+      it "returns an 'img'-element with the passed src-url" do
+        output = @html.img("/path/to/some/image.png")
+        output.should equal_element("IMG", { "SRC" => "/path/to/some/image.png", "ALT" => "" }, "", not_closed: true)
+      end
 
-  describe "when passed src, alt" do
-    it "returns an 'img'-element with the passed src-url and the passed alt-text" do
-      output = @html.img("/path/to/some/image.png", "Alternative")
-      output.should equal_element("IMG", { "SRC" => "/path/to/some/image.png", "ALT" => "Alternative" }, "", not_closed: true)
+      it "ignores a passed block" do
+        output = @html.img("/path/to/some/image.png")
+        output.should equal_element("IMG", { "SRC" => "/path/to/some/image.png", "ALT" => "" }, "", not_closed: true)
+      end
     end
 
-    it "ignores a passed block" do
-      output = @html.img("/path/to/some/image.png", "Alternative") { "test" }
-      output.should equal_element("IMG", { "SRC" => "/path/to/some/image.png", "ALT" => "Alternative" }, "", not_closed: true)
-    end
-  end
+    describe "when passed src, alt" do
+      it "returns an 'img'-element with the passed src-url and the passed alt-text" do
+        output = @html.img("/path/to/some/image.png", "Alternative")
+        output.should equal_element("IMG", { "SRC" => "/path/to/some/image.png", "ALT" => "Alternative" }, "", not_closed: true)
+      end
 
-  describe "when passed src, alt, width" do
-    it "returns an 'img'-element with the passed src-url, the passed alt-text and the passed width" do
-      output = @html.img("/path/to/some/image.png", "Alternative", 40)
-      output.should equal_element("IMG", { "SRC" => "/path/to/some/image.png", "ALT" => "Alternative", "WIDTH" => "40" }, "", not_closed: true)
+      it "ignores a passed block" do
+        output = @html.img("/path/to/some/image.png", "Alternative") { "test" }
+        output.should equal_element("IMG", { "SRC" => "/path/to/some/image.png", "ALT" => "Alternative" }, "", not_closed: true)
+      end
     end
 
-    it "ignores a passed block" do
-      output = @html.img("/path/to/some/image.png", "Alternative", 40) { "test" }
-      output.should equal_element("IMG", { "SRC" => "/path/to/some/image.png", "ALT" => "Alternative", "WIDTH" => "40" }, "", not_closed: true)
-    end
-  end
+    describe "when passed src, alt, width" do
+      it "returns an 'img'-element with the passed src-url, the passed alt-text and the passed width" do
+        output = @html.img("/path/to/some/image.png", "Alternative", 40)
+        output.should equal_element("IMG", { "SRC" => "/path/to/some/image.png", "ALT" => "Alternative", "WIDTH" => "40" }, "", not_closed: true)
+      end
 
-  describe "when passed src, alt, width, height" do
-    it "returns an 'img'-element with the passed src-url, the passed alt-text, the passed width and the passed height" do
-      output = @html.img("/path/to/some/image.png", "Alternative", 40, 60)
-      output.should equal_element("IMG", { "SRC" => "/path/to/some/image.png", "ALT" => "Alternative", "WIDTH" => "40", "HEIGHT" => "60" }, "", not_closed: true)
+      it "ignores a passed block" do
+        output = @html.img("/path/to/some/image.png", "Alternative", 40) { "test" }
+        output.should equal_element("IMG", { "SRC" => "/path/to/some/image.png", "ALT" => "Alternative", "WIDTH" => "40" }, "", not_closed: true)
+      end
     end
 
-    it "ignores a passed block" do
-      output = @html.img { "test" }
-      output.should equal_element("IMG", { "SRC" => "", "ALT" => "" }, "", not_closed: true)
-    end
-  end
+    describe "when passed src, alt, width, height" do
+      it "returns an 'img'-element with the passed src-url, the passed alt-text, the passed width and the passed height" do
+        output = @html.img("/path/to/some/image.png", "Alternative", 40, 60)
+        output.should equal_element("IMG", { "SRC" => "/path/to/some/image.png", "ALT" => "Alternative", "WIDTH" => "40", "HEIGHT" => "60" }, "", not_closed: true)
+      end
 
-  describe "when passed Hash" do
-    it "returns an 'img'-element with the passed Hash as attributes" do
-      attributes = { "SRC" => "src", "ALT" => "alt", "WIDTH" => 100, "HEIGHT" => 50 }
-      output = @html.img(attributes)
-      output.should equal_element("IMG", attributes, "", not_closed: true)
+      it "ignores a passed block" do
+        output = @html.img { "test" }
+        output.should equal_element("IMG", { "SRC" => "", "ALT" => "" }, "", not_closed: true)
+      end
     end
 
-    it "ignores a passed block" do
-      attributes = { "SRC" => "src", "ALT" => "alt", "WIDTH" => 100, "HEIGHT" => 50 }
-      output = @html.img(attributes) { "test" }
-      output.should equal_element("IMG", attributes, "", not_closed: true)
+    describe "when passed Hash" do
+      it "returns an 'img'-element with the passed Hash as attributes" do
+        attributes = { "SRC" => "src", "ALT" => "alt", "WIDTH" => 100, "HEIGHT" => 50 }
+        output = @html.img(attributes)
+        output.should equal_element("IMG", attributes, "", not_closed: true)
+      end
+
+      it "ignores a passed block" do
+        attributes = { "SRC" => "src", "ALT" => "alt", "WIDTH" => 100, "HEIGHT" => 50 }
+        output = @html.img(attributes) { "test" }
+        output.should equal_element("IMG", attributes, "", not_closed: true)
+      end
     end
   end
 end
diff --git a/spec/ruby/library/cgi/htmlextension/multipart_form_spec.rb b/spec/ruby/library/cgi/htmlextension/multipart_form_spec.rb
index 0bf2042a33d2e5..e5c16f2475b6f4 100644
--- a/spec/ruby/library/cgi/htmlextension/multipart_form_spec.rb
+++ b/spec/ruby/library/cgi/htmlextension/multipart_form_spec.rb
@@ -1,64 +1,67 @@
 require_relative '../../../spec_helper'
-require 'cgi'
-require_relative 'fixtures/common'
 
-describe "CGI::HtmlExtension#multipart_form" do
-  before :each do
-    @html = CGISpecs.cgi_new
-    @html.stub!(:script_name).and_return("/path/to/some/script.rb")
-  end
+ruby_version_is ""..."3.5" do
+  require 'cgi'
+  require_relative 'fixtures/common'
 
-  describe "when passed no arguments" do
-    it "returns a 'form'-element with it's enctype set to multipart" do
-      output = @html.multipart_form
-      output.should equal_element("FORM", { "ENCTYPE" => "multipart/form-data", "METHOD" => "post" }, "")
+  describe "CGI::HtmlExtension#multipart_form" do
+    before :each do
+      @html = CGISpecs.cgi_new
+      @html.stub!(:script_name).and_return("/path/to/some/script.rb")
     end
 
-    it "includes the return value of the passed block when passed a block" do
-      output = @html.multipart_form { "test" }
-      output.should equal_element("FORM", { "ENCTYPE" => "multipart/form-data", "METHOD" => "post" }, "test")
-    end
-  end
+    describe "when passed no arguments" do
+      it "returns a 'form'-element with it's enctype set to multipart" do
+        output = @html.multipart_form
+        output.should equal_element("FORM", { "ENCTYPE" => "multipart/form-data", "METHOD" => "post" }, "")
+      end
 
-  describe "when passed action" do
-    it "returns a 'form'-element with the passed action" do
-      output = @html.multipart_form("/some/other/script.rb")
-      output.should equal_element("FORM", { "ENCTYPE" => "multipart/form-data", "METHOD" => "post", "ACTION" => "/some/other/script.rb" }, "")
+      it "includes the return value of the passed block when passed a block" do
+        output = @html.multipart_form { "test" }
+        output.should equal_element("FORM", { "ENCTYPE" => "multipart/form-data", "METHOD" => "post" }, "test")
+      end
     end
 
-    it "includes the return value of the passed block when passed a block" do
-      output = @html.multipart_form("/some/other/script.rb") { "test" }
-      output.should equal_element("FORM", { "ENCTYPE" => "multipart/form-data", "METHOD" => "post", "ACTION" => "/some/other/script.rb" }, "test")
-    end
-  end
+    describe "when passed action" do
+      it "returns a 'form'-element with the passed action" do
+        output = @html.multipart_form("/some/other/script.rb")
+        output.should equal_element("FORM", { "ENCTYPE" => "multipart/form-data", "METHOD" => "post", "ACTION" => "/some/other/script.rb" }, "")
+      end
 
-  describe "when passed action, enctype" do
-    it "returns a 'form'-element with the passed action and enctype" do
-      output = @html.multipart_form("/some/other/script.rb", "application/x-www-form-urlencoded")
-      output.should equal_element("FORM", { "ENCTYPE" => "application/x-www-form-urlencoded", "METHOD" => "post", "ACTION" => "/some/other/script.rb" }, "")
+      it "includes the return value of the passed block when passed a block" do
+        output = @html.multipart_form("/some/other/script.rb") { "test" }
+        output.should equal_element("FORM", { "ENCTYPE" => "multipart/form-data", "METHOD" => "post", "ACTION" => "/some/other/script.rb" }, "test")
+      end
     end
 
-    it "includes the return value of the passed block when passed a block" do
-      output = @html.multipart_form("/some/other/script.rb", "application/x-www-form-urlencoded") { "test" }
-      output.should equal_element("FORM", { "ENCTYPE" => "application/x-www-form-urlencoded", "METHOD" => "post", "ACTION" => "/some/other/script.rb" }, "test")
+    describe "when passed action, enctype" do
+      it "returns a 'form'-element with the passed action and enctype" do
+        output = @html.multipart_form("/some/other/script.rb", "application/x-www-form-urlencoded")
+        output.should equal_element("FORM", { "ENCTYPE" => "application/x-www-form-urlencoded", "METHOD" => "post", "ACTION" => "/some/other/script.rb" }, "")
+      end
+
+      it "includes the return value of the passed block when passed a block" do
+        output = @html.multipart_form("/some/other/script.rb", "application/x-www-form-urlencoded") { "test" }
+        output.should equal_element("FORM", { "ENCTYPE" => "application/x-www-form-urlencoded", "METHOD" => "post", "ACTION" => "/some/other/script.rb" }, "test")
+      end
     end
-  end
 
-  describe "when passed Hash" do
-    it "returns a 'form'-element with the passed Hash as attributes" do
-      output = @html.multipart_form("ID" => "test")
-      output.should equal_element("FORM", { "ENCTYPE" => "multipart/form-data", "METHOD" => "post", "ID" => "test" }, "")
+    describe "when passed Hash" do
+      it "returns a 'form'-element with the passed Hash as attributes" do
+        output = @html.multipart_form("ID" => "test")
+        output.should equal_element("FORM", { "ENCTYPE" => "multipart/form-data", "METHOD" => "post", "ID" => "test" }, "")
 
-      output = @html.multipart_form("ID" => "test", "ENCTYPE" => "application/x-www-form-urlencoded", "METHOD" => "get")
-      output.should equal_element("FORM", { "ENCTYPE" => "application/x-www-form-urlencoded", "METHOD" => "get", "ID" => "test" }, "")
-    end
+        output = @html.multipart_form("ID" => "test", "ENCTYPE" => "application/x-www-form-urlencoded", "METHOD" => "get")
+        output.should equal_element("FORM", { "ENCTYPE" => "application/x-www-form-urlencoded", "METHOD" => "get", "ID" => "test" }, "")
+      end
 
-    it "includes the return value of the passed block when passed a block" do
-      output = @html.multipart_form("ID" => "test") { "test" }
-      output.should equal_element("FORM", { "ENCTYPE" => "multipart/form-data", "METHOD" => "post", "ID" => "test" }, "test")
+      it "includes the return value of the passed block when passed a block" do
+        output = @html.multipart_form("ID" => "test") { "test" }
+        output.should equal_element("FORM", { "ENCTYPE" => "multipart/form-data", "METHOD" => "post", "ID" => "test" }, "test")
 
-      output = @html.multipart_form("ID" => "test", "ENCTYPE" => "application/x-www-form-urlencoded", "METHOD" => "get") { "test" }
-      output.should equal_element("FORM", { "ENCTYPE" => "application/x-www-form-urlencoded", "METHOD" => "get", "ID" => "test" }, "test")
+        output = @html.multipart_form("ID" => "test", "ENCTYPE" => "application/x-www-form-urlencoded", "METHOD" => "get") { "test" }
+        output.should equal_element("FORM", { "ENCTYPE" => "application/x-www-form-urlencoded", "METHOD" => "get", "ID" => "test" }, "test")
+      end
     end
   end
 end
diff --git a/spec/ruby/library/cgi/htmlextension/password_field_spec.rb b/spec/ruby/library/cgi/htmlextension/password_field_spec.rb
index 683bc428baa568..a462bea01553fb 100644
--- a/spec/ruby/library/cgi/htmlextension/password_field_spec.rb
+++ b/spec/ruby/library/cgi/htmlextension/password_field_spec.rb
@@ -1,84 +1,87 @@
 require_relative '../../../spec_helper'
-require 'cgi'
-require_relative 'fixtures/common'
 
-describe "CGI::HtmlExtension#password_field" do
-  before :each do
-    @html = CGISpecs.cgi_new
-  end
+ruby_version_is ""..."3.5" do
+  require 'cgi'
+  require_relative 'fixtures/common'
 
-  describe "when passed no arguments" do
-    it "returns an password-'input'-element without a name" do
-      output = @html.password_field
-      output.should equal_element("INPUT", {"NAME" => "", "TYPE" => "password", "SIZE" => "40"}, "", not_closed: true)
+  describe "CGI::HtmlExtension#password_field" do
+    before :each do
+      @html = CGISpecs.cgi_new
     end
 
-    it "ignores a passed block" do
-      output = @html.password_field { "test" }
-      output.should equal_element("INPUT", {"NAME" => "", "TYPE" => "password", "SIZE" => "40"}, "", not_closed: true)
-    end
-  end
+    describe "when passed no arguments" do
+      it "returns an password-'input'-element without a name" do
+        output = @html.password_field
+        output.should equal_element("INPUT", {"NAME" => "", "TYPE" => "password", "SIZE" => "40"}, "", not_closed: true)
+      end
 
-  describe "when passed name" do
-    it "returns an password-'input'-element with the passed name" do
-      output = @html.password_field("test")
-      output.should equal_element("INPUT", {"NAME" => "test", "TYPE" => "password", "SIZE" => "40"}, "", not_closed: true)
+      it "ignores a passed block" do
+        output = @html.password_field { "test" }
+        output.should equal_element("INPUT", {"NAME" => "", "TYPE" => "password", "SIZE" => "40"}, "", not_closed: true)
+      end
     end
 
-    it "ignores a passed block" do
-      output = @html.password_field("test") { "test" }
-      output.should equal_element("INPUT", {"NAME" => "test", "TYPE" => "password", "SIZE" => "40"}, "", not_closed: true)
-    end
-  end
+    describe "when passed name" do
+      it "returns an password-'input'-element with the passed name" do
+        output = @html.password_field("test")
+        output.should equal_element("INPUT", {"NAME" => "test", "TYPE" => "password", "SIZE" => "40"}, "", not_closed: true)
+      end
 
-  describe "when passed name, value" do
-    it "returns an password-'input'-element with the passed name and value" do
-      output = @html.password_field("test", "some value")
-      output.should equal_element("INPUT", {"NAME" => "test", "TYPE" => "password", "VALUE" => "some value", "SIZE" => "40"}, "", not_closed: true)
+      it "ignores a passed block" do
+        output = @html.password_field("test") { "test" }
+        output.should equal_element("INPUT", {"NAME" => "test", "TYPE" => "password", "SIZE" => "40"}, "", not_closed: true)
+      end
     end
 
-    it "ignores a passed block" do
-      output = @html.password_field("test", "some value") { "test" }
-      output.should equal_element("INPUT", {"NAME" => "test", "TYPE" => "password", "VALUE" => "some value", "SIZE" => "40"}, "", not_closed: true)
-    end
-  end
+    describe "when passed name, value" do
+      it "returns an password-'input'-element with the passed name and value" do
+        output = @html.password_field("test", "some value")
+        output.should equal_element("INPUT", {"NAME" => "test", "TYPE" => "password", "VALUE" => "some value", "SIZE" => "40"}, "", not_closed: true)
+      end
 
-  describe "when passed name, value, size" do
-    it "returns an password-'input'-element with the passed name, value and size" do
-      output = @html.password_field("test", "some value", 60)
-      output.should equal_element("INPUT", {"NAME" => "test", "TYPE" => "password", "VALUE" => "some value", "SIZE" => "60"}, "", not_closed: true)
+      it "ignores a passed block" do
+        output = @html.password_field("test", "some value") { "test" }
+        output.should equal_element("INPUT", {"NAME" => "test", "TYPE" => "password", "VALUE" => "some value", "SIZE" => "40"}, "", not_closed: true)
+      end
     end
 
-    it "ignores a passed block" do
-      output = @html.password_field("test", "some value", 60) { "test" }
-      output.should equal_element("INPUT", {"NAME" => "test", "TYPE" => "password", "VALUE" => "some value", "SIZE" => "60"}, "", not_closed: true)
-    end
-  end
+    describe "when passed name, value, size" do
+      it "returns an password-'input'-element with the passed name, value and size" do
+        output = @html.password_field("test", "some value", 60)
+        output.should equal_element("INPUT", {"NAME" => "test", "TYPE" => "password", "VALUE" => "some value", "SIZE" => "60"}, "", not_closed: true)
+      end
 
-  describe "when passed name, value, size, maxlength" do
-    it "returns an password-'input'-element with the passed name, value, size and maxlength" do
-      output = @html.password_field("test", "some value", 60, 12)
-      output.should equal_element("INPUT", {"NAME" => "test", "TYPE" => "password", "VALUE" => "some value", "SIZE" => "60", "MAXLENGTH" => 12}, "", not_closed: true)
+      it "ignores a passed block" do
+        output = @html.password_field("test", "some value", 60) { "test" }
+        output.should equal_element("INPUT", {"NAME" => "test", "TYPE" => "password", "VALUE" => "some value", "SIZE" => "60"}, "", not_closed: true)
+      end
     end
 
-    it "ignores a passed block" do
-      output = @html.password_field("test", "some value", 60, 12) { "test" }
-      output.should equal_element("INPUT", {"NAME" => "test", "TYPE" => "password", "VALUE" => "some value", "SIZE" => "60", "MAXLENGTH" => 12}, "", not_closed: true)
+    describe "when passed name, value, size, maxlength" do
+      it "returns an password-'input'-element with the passed name, value, size and maxlength" do
+        output = @html.password_field("test", "some value", 60, 12)
+        output.should equal_element("INPUT", {"NAME" => "test", "TYPE" => "password", "VALUE" => "some value", "SIZE" => "60", "MAXLENGTH" => 12}, "", not_closed: true)
+      end
+
+      it "ignores a passed block" do
+        output = @html.password_field("test", "some value", 60, 12) { "test" }
+        output.should equal_element("INPUT", {"NAME" => "test", "TYPE" => "password", "VALUE" => "some value", "SIZE" => "60", "MAXLENGTH" => 12}, "", not_closed: true)
+      end
     end
-  end
 
-  describe "when passed Hash" do
-    it "returns a checkbox-'input'-element using the passed Hash for attributes" do
-      output = @html.password_field("NAME" => "test", "VALUE" => "some value")
-      output.should equal_element("INPUT", { "NAME" => "test", "VALUE" => "some value", "TYPE" => "password" }, "", not_closed: true)
+    describe "when passed Hash" do
+      it "returns a checkbox-'input'-element using the passed Hash for attributes" do
+        output = @html.password_field("NAME" => "test", "VALUE" => "some value")
+        output.should equal_element("INPUT", { "NAME" => "test", "VALUE" => "some value", "TYPE" => "password" }, "", not_closed: true)
 
-      output = @html.password_field("TYPE" => "hidden")
-      output.should equal_element("INPUT", {"TYPE" => "password"}, "", not_closed: true)
-    end
+        output = @html.password_field("TYPE" => "hidden")
+        output.should equal_element("INPUT", {"TYPE" => "password"}, "", not_closed: true)
+      end
 
-    it "ignores a passed block" do
-      output = @html.password_field("NAME" => "test", "VALUE" => "some value") { "test" }
-      output.should equal_element("INPUT", { "NAME" => "test", "VALUE" => "some value", "TYPE" => "password" }, "", not_closed: true)
+      it "ignores a passed block" do
+        output = @html.password_field("NAME" => "test", "VALUE" => "some value") { "test" }
+        output.should equal_element("INPUT", { "NAME" => "test", "VALUE" => "some value", "TYPE" => "password" }, "", not_closed: true)
+      end
     end
   end
 end
diff --git a/spec/ruby/library/cgi/htmlextension/popup_menu_spec.rb b/spec/ruby/library/cgi/htmlextension/popup_menu_spec.rb
index 3462be09b04f29..0ec85e96dfd73a 100644
--- a/spec/ruby/library/cgi/htmlextension/popup_menu_spec.rb
+++ b/spec/ruby/library/cgi/htmlextension/popup_menu_spec.rb
@@ -1,8 +1,11 @@
 require_relative '../../../spec_helper'
-require 'cgi'
-require_relative 'fixtures/common'
-require_relative 'shared/popup_menu'
 
-describe "CGI::HtmlExtension#popup_menu" do
-  it_behaves_like :cgi_htmlextension_popup_menu, :popup_menu
+ruby_version_is ""..."3.5" do
+  require 'cgi'
+  require_relative 'fixtures/common'
+  require_relative 'shared/popup_menu'
+
+  describe "CGI::HtmlExtension#popup_menu" do
+    it_behaves_like :cgi_htmlextension_popup_menu, :popup_menu
+  end
 end
diff --git a/spec/ruby/library/cgi/htmlextension/radio_button_spec.rb b/spec/ruby/library/cgi/htmlextension/radio_button_spec.rb
index 3dc3c879b59453..865c16d23228f7 100644
--- a/spec/ruby/library/cgi/htmlextension/radio_button_spec.rb
+++ b/spec/ruby/library/cgi/htmlextension/radio_button_spec.rb
@@ -1,77 +1,80 @@
 require_relative '../../../spec_helper'
-require 'cgi'
-require_relative 'fixtures/common'
 
-describe "CGI::HtmlExtension#radio_button" do
-  before :each do
-    @html = CGISpecs.cgi_new
-  end
+ruby_version_is ""..."3.5" do
+  require 'cgi'
+  require_relative 'fixtures/common'
 
-  describe "when passed no arguments" do
-    it "returns a radio-'input'-element without a name" do
-      output = @html.radio_button
-      output.should equal_element("INPUT", {"NAME" => "", "TYPE" => "radio"}, "", not_closed: true)
+  describe "CGI::HtmlExtension#radio_button" do
+    before :each do
+      @html = CGISpecs.cgi_new
     end
 
-    it "ignores a passed block" do
-      output = @html.radio_button { "test" }
-      output.should equal_element("INPUT", {"NAME" => "", "TYPE" => "radio"}, "", not_closed: true)
-    end
-  end
+    describe "when passed no arguments" do
+      it "returns a radio-'input'-element without a name" do
+        output = @html.radio_button
+        output.should equal_element("INPUT", {"NAME" => "", "TYPE" => "radio"}, "", not_closed: true)
+      end
 
-  describe "when passed name" do
-    it "returns a radio-'input'-element with the passed name" do
-      output = @html.radio_button("test")
-      output.should equal_element("INPUT", {"NAME" => "test", "TYPE" => "radio"}, "", not_closed: true)
+      it "ignores a passed block" do
+        output = @html.radio_button { "test" }
+        output.should equal_element("INPUT", {"NAME" => "", "TYPE" => "radio"}, "", not_closed: true)
+      end
     end
 
-    it "ignores a passed block" do
-      output = @html.radio_button("test") { "test" }
-      output.should equal_element("INPUT", {"NAME" => "test", "TYPE" => "radio"}, "", not_closed: true)
-    end
-  end
+    describe "when passed name" do
+      it "returns a radio-'input'-element with the passed name" do
+        output = @html.radio_button("test")
+        output.should equal_element("INPUT", {"NAME" => "test", "TYPE" => "radio"}, "", not_closed: true)
+      end
 
-  describe "CGI::HtmlExtension#checkbox when passed name, value" do
-    it "returns a radio-'input'-element with the passed name and value" do
-      output = @html.radio_button("test", "test-value")
-      output.should equal_element("INPUT", {"NAME" => "test", "TYPE" => "radio", "VALUE" => "test-value"}, "", not_closed: true)
+      it "ignores a passed block" do
+        output = @html.radio_button("test") { "test" }
+        output.should equal_element("INPUT", {"NAME" => "test", "TYPE" => "radio"}, "", not_closed: true)
+      end
     end
 
-    it "ignores a passed block" do
-      output = @html.radio_button("test", "test-value") { "test" }
-      output.should equal_element("INPUT", {"NAME" => "test", "TYPE" => "radio", "VALUE" => "test-value"}, "", not_closed: true)
+    describe "CGI::HtmlExtension#checkbox when passed name, value" do
+      it "returns a radio-'input'-element with the passed name and value" do
+        output = @html.radio_button("test", "test-value")
+        output.should equal_element("INPUT", {"NAME" => "test", "TYPE" => "radio", "VALUE" => "test-value"}, "", not_closed: true)
+      end
+
+      it "ignores a passed block" do
+        output = @html.radio_button("test", "test-value") { "test" }
+        output.should equal_element("INPUT", {"NAME" => "test", "TYPE" => "radio", "VALUE" => "test-value"}, "", not_closed: true)
+      end
     end
-  end
 
-  describe "when passed name, value, checked" do
-    it "returns a checked radio-'input'-element with the passed name and value when checked is true" do
-      output = @html.radio_button("test", "test-value", true)
-      output.should equal_element("INPUT", {"CHECKED" => true, "NAME" => "test", "TYPE" => "radio", "VALUE" => "test-value"}, "", not_closed: true)
+    describe "when passed name, value, checked" do
+      it "returns a checked radio-'input'-element with the passed name and value when checked is true" do
+        output = @html.radio_button("test", "test-value", true)
+        output.should equal_element("INPUT", {"CHECKED" => true, "NAME" => "test", "TYPE" => "radio", "VALUE" => "test-value"}, "", not_closed: true)
 
-      output = @html.radio_button("test", "test-value", false)
-      output.should equal_element("INPUT", {"NAME" => "test", "TYPE" => "radio", "VALUE" => "test-value"}, "", not_closed: true)
+        output = @html.radio_button("test", "test-value", false)
+        output.should equal_element("INPUT", {"NAME" => "test", "TYPE" => "radio", "VALUE" => "test-value"}, "", not_closed: true)
 
-      output = @html.radio_button("test", "test-value", nil)
-      output.should equal_element("INPUT", {"NAME" => "test", "TYPE" => "radio", "VALUE" => "test-value"}, "", not_closed: true)
-    end
+        output = @html.radio_button("test", "test-value", nil)
+        output.should equal_element("INPUT", {"NAME" => "test", "TYPE" => "radio", "VALUE" => "test-value"}, "", not_closed: true)
+      end
 
-    it "ignores a passed block" do
-      output = @html.radio_button("test", "test-value", nil) { "test" }
-      output.should equal_element("INPUT", {"NAME" => "test", "TYPE" => "radio", "VALUE" => "test-value"}, "", not_closed: true)
+      it "ignores a passed block" do
+        output = @html.radio_button("test", "test-value", nil) { "test" }
+        output.should equal_element("INPUT", {"NAME" => "test", "TYPE" => "radio", "VALUE" => "test-value"}, "", not_closed: true)
+      end
     end
-  end
 
-  describe "when passed Hash" do
-    it "returns a radio-'input'-element using the passed Hash for attributes" do
-      attributes = {"NAME" => "test", "VALUE" => "test-value", "CHECKED" => true}
-      output = @html.radio_button(attributes)
-      output.should equal_element("INPUT", attributes, "", not_closed: true)
-    end
+    describe "when passed Hash" do
+      it "returns a radio-'input'-element using the passed Hash for attributes" do
+        attributes = {"NAME" => "test", "VALUE" => "test-value", "CHECKED" => true}
+        output = @html.radio_button(attributes)
+        output.should equal_element("INPUT", attributes, "", not_closed: true)
+      end
 
-    it "ignores a passed block" do
-      attributes = {"NAME" => "test", "VALUE" => "test-value", "CHECKED" => true}
-      output = @html.radio_button(attributes) { "test" }
-      output.should equal_element("INPUT", attributes, "", not_closed: true)
+      it "ignores a passed block" do
+        attributes = {"NAME" => "test", "VALUE" => "test-value", "CHECKED" => true}
+        output = @html.radio_button(attributes) { "test" }
+        output.should equal_element("INPUT", attributes, "", not_closed: true)
+      end
     end
   end
 end
diff --git a/spec/ruby/library/cgi/htmlextension/radio_group_spec.rb b/spec/ruby/library/cgi/htmlextension/radio_group_spec.rb
index 1bfd43449d70c9..7381e7183b7fc2 100644
--- a/spec/ruby/library/cgi/htmlextension/radio_group_spec.rb
+++ b/spec/ruby/library/cgi/htmlextension/radio_group_spec.rb
@@ -1,77 +1,80 @@
 require_relative '../../../spec_helper'
-require 'cgi'
-require_relative 'fixtures/common'
 
-describe "CGI::HtmlExtension#radio_group" do
-  before :each do
-    @html = CGISpecs.cgi_new
-  end
+ruby_version_is ""..."3.5" do
+  require 'cgi'
+  require_relative 'fixtures/common'
 
-  describe "when passed name, values ..." do
-    it "returns a sequence of 'radio'-elements with the passed name and the passed values" do
-      output = CGISpecs.split(@html.radio_group("test", "foo", "bar", "baz"))
-      output[0].should equal_element("INPUT", {"NAME" => "test", "TYPE" => "radio", "VALUE" => "foo"}, "foo", not_closed: true)
-      output[1].should equal_element("INPUT", {"NAME" => "test", "TYPE" => "radio", "VALUE" => "bar"}, "bar", not_closed: true)
-      output[2].should equal_element("INPUT", {"NAME" => "test", "TYPE" => "radio", "VALUE" => "baz"}, "baz", not_closed: true)
+  describe "CGI::HtmlExtension#radio_group" do
+    before :each do
+      @html = CGISpecs.cgi_new
     end
 
-    it "allows passing a value inside an Array" do
-      output = CGISpecs.split(@html.radio_group("test", ["foo"], "bar", ["baz"]))
-      output[0].should equal_element("INPUT", {"NAME" => "test", "TYPE" => "radio", "VALUE" => "foo"}, "foo", not_closed: true)
-      output[1].should equal_element("INPUT", {"NAME" => "test", "TYPE" => "radio", "VALUE" => "bar"}, "bar", not_closed: true)
-      output[2].should equal_element("INPUT", {"NAME" => "test", "TYPE" => "radio", "VALUE" => "baz"}, "baz", not_closed: true)
-    end
+    describe "when passed name, values ..." do
+      it "returns a sequence of 'radio'-elements with the passed name and the passed values" do
+        output = CGISpecs.split(@html.radio_group("test", "foo", "bar", "baz"))
+        output[0].should equal_element("INPUT", {"NAME" => "test", "TYPE" => "radio", "VALUE" => "foo"}, "foo", not_closed: true)
+        output[1].should equal_element("INPUT", {"NAME" => "test", "TYPE" => "radio", "VALUE" => "bar"}, "bar", not_closed: true)
+        output[2].should equal_element("INPUT", {"NAME" => "test", "TYPE" => "radio", "VALUE" => "baz"}, "baz", not_closed: true)
+      end
 
-    it "allows passing a value as an Array containing the value and the checked state or a label" do
-      output = CGISpecs.split(@html.radio_group("test", ["foo"], ["bar", true], ["baz", "label for baz"]))
-      output[0].should equal_element("INPUT", {"NAME" => "test", "TYPE" => "radio", "VALUE" => "foo"}, "foo", not_closed: true)
-      output[1].should equal_element("INPUT", {"CHECKED" => true, "NAME" => "test", "TYPE" => "radio", "VALUE" => "bar"}, "bar", not_closed: true)
-      output[2].should equal_element("INPUT", {"NAME" => "test", "TYPE" => "radio", "VALUE" => "baz"}, "label for baz", not_closed: true)
-    end
+      it "allows passing a value inside an Array" do
+        output = CGISpecs.split(@html.radio_group("test", ["foo"], "bar", ["baz"]))
+        output[0].should equal_element("INPUT", {"NAME" => "test", "TYPE" => "radio", "VALUE" => "foo"}, "foo", not_closed: true)
+        output[1].should equal_element("INPUT", {"NAME" => "test", "TYPE" => "radio", "VALUE" => "bar"}, "bar", not_closed: true)
+        output[2].should equal_element("INPUT", {"NAME" => "test", "TYPE" => "radio", "VALUE" => "baz"}, "baz", not_closed: true)
+      end
 
-    # TODO: CGI does not like passing false instead of true.
-    it "allows passing a value as an Array containing the value, a label and the checked state" do
-      output = CGISpecs.split(@html.radio_group("test", ["foo", "label for foo", true], ["bar", "label for bar", false], ["baz", "label for baz", true]))
-      output[0].should equal_element("INPUT", {"CHECKED" => true, "NAME" => "test", "TYPE" => "radio", "VALUE" => "foo"}, "label for foo", not_closed: true)
-      output[1].should equal_element("INPUT", {"NAME" => "test", "TYPE" => "radio", "VALUE" => "bar"}, "label for bar", not_closed: true)
-      output[2].should equal_element("INPUT", {"CHECKED" => true, "NAME" => "test", "TYPE" => "radio", "VALUE" => "baz"}, "label for baz", not_closed: true)
-    end
+      it "allows passing a value as an Array containing the value and the checked state or a label" do
+        output = CGISpecs.split(@html.radio_group("test", ["foo"], ["bar", true], ["baz", "label for baz"]))
+        output[0].should equal_element("INPUT", {"NAME" => "test", "TYPE" => "radio", "VALUE" => "foo"}, "foo", not_closed: true)
+        output[1].should equal_element("INPUT", {"CHECKED" => true, "NAME" => "test", "TYPE" => "radio", "VALUE" => "bar"}, "bar", not_closed: true)
+        output[2].should equal_element("INPUT", {"NAME" => "test", "TYPE" => "radio", "VALUE" => "baz"}, "label for baz", not_closed: true)
+      end
 
-    it "returns an empty String when passed no values" do
-      @html.radio_group("test").should == ""
-    end
+      # TODO: CGI does not like passing false instead of true.
+      it "allows passing a value as an Array containing the value, a label and the checked state" do
+        output = CGISpecs.split(@html.radio_group("test", ["foo", "label for foo", true], ["bar", "label for bar", false], ["baz", "label for baz", true]))
+        output[0].should equal_element("INPUT", {"CHECKED" => true, "NAME" => "test", "TYPE" => "radio", "VALUE" => "foo"}, "label for foo", not_closed: true)
+        output[1].should equal_element("INPUT", {"NAME" => "test", "TYPE" => "radio", "VALUE" => "bar"}, "label for bar", not_closed: true)
+        output[2].should equal_element("INPUT", {"CHECKED" => true, "NAME" => "test", "TYPE" => "radio", "VALUE" => "baz"}, "label for baz", not_closed: true)
+      end
+
+      it "returns an empty String when passed no values" do
+        @html.radio_group("test").should == ""
+      end
 
-    it "ignores a passed block" do
-      output = CGISpecs.split(@html.radio_group("test", "foo", "bar", "baz") { "test" })
-      output[0].should equal_element("INPUT", {"NAME" => "test", "TYPE" => "radio", "VALUE" => "foo"}, "foo", not_closed: true)
-      output[1].should equal_element("INPUT", {"NAME" => "test", "TYPE" => "radio", "VALUE" => "bar"}, "bar", not_closed: true)
-      output[2].should equal_element("INPUT", {"NAME" => "test", "TYPE" => "radio", "VALUE" => "baz"}, "baz", not_closed: true)
+      it "ignores a passed block" do
+        output = CGISpecs.split(@html.radio_group("test", "foo", "bar", "baz") { "test" })
+        output[0].should equal_element("INPUT", {"NAME" => "test", "TYPE" => "radio", "VALUE" => "foo"}, "foo", not_closed: true)
+        output[1].should equal_element("INPUT", {"NAME" => "test", "TYPE" => "radio", "VALUE" => "bar"}, "bar", not_closed: true)
+        output[2].should equal_element("INPUT", {"NAME" => "test", "TYPE" => "radio", "VALUE" => "baz"}, "baz", not_closed: true)
+      end
     end
-  end
 
-  describe "when passed Hash" do
-    it "uses the passed Hash to generate the radio sequence" do
-      output = CGISpecs.split(@html.radio_group("NAME" => "name", "VALUES" => ["foo", "bar", "baz"]))
-      output[0].should equal_element("INPUT", {"NAME" => "name", "TYPE" => "radio", "VALUE" => "foo"}, "foo", not_closed: true)
-      output[1].should equal_element("INPUT", {"NAME" => "name", "TYPE" => "radio", "VALUE" => "bar"}, "bar", not_closed: true)
-      output[2].should equal_element("INPUT", {"NAME" => "name", "TYPE" => "radio", "VALUE" => "baz"}, "baz", not_closed: true)
+    describe "when passed Hash" do
+      it "uses the passed Hash to generate the radio sequence" do
+        output = CGISpecs.split(@html.radio_group("NAME" => "name", "VALUES" => ["foo", "bar", "baz"]))
+        output[0].should equal_element("INPUT", {"NAME" => "name", "TYPE" => "radio", "VALUE" => "foo"}, "foo", not_closed: true)
+        output[1].should equal_element("INPUT", {"NAME" => "name", "TYPE" => "radio", "VALUE" => "bar"}, "bar", not_closed: true)
+        output[2].should equal_element("INPUT", {"NAME" => "name", "TYPE" => "radio", "VALUE" => "baz"}, "baz", not_closed: true)
 
-      output = CGISpecs.split(@html.radio_group("NAME" => "name", "VALUES" => [["foo"], ["bar", true], "baz"]))
-      output[0].should equal_element("INPUT", {"NAME" => "name", "TYPE" => "radio", "VALUE" => "foo"}, "foo", not_closed: true)
-      output[1].should equal_element("INPUT", {"CHECKED" => true, "NAME" => "name", "TYPE" => "radio", "VALUE" => "bar"}, "bar", not_closed: true)
-      output[2].should equal_element("INPUT", {"NAME" => "name", "TYPE" => "radio", "VALUE" => "baz"}, "baz", not_closed: true)
+        output = CGISpecs.split(@html.radio_group("NAME" => "name", "VALUES" => [["foo"], ["bar", true], "baz"]))
+        output[0].should equal_element("INPUT", {"NAME" => "name", "TYPE" => "radio", "VALUE" => "foo"}, "foo", not_closed: true)
+        output[1].should equal_element("INPUT", {"CHECKED" => true, "NAME" => "name", "TYPE" => "radio", "VALUE" => "bar"}, "bar", not_closed: true)
+        output[2].should equal_element("INPUT", {"NAME" => "name", "TYPE" => "radio", "VALUE" => "baz"}, "baz", not_closed: true)
 
-      output = CGISpecs.split(@html.radio_group("NAME" => "name", "VALUES" => [["1", "Foo"], ["2", "Bar", true], "Baz"]))
-      output[0].should equal_element("INPUT", {"NAME" => "name", "TYPE" => "radio", "VALUE" => "1"}, "Foo", not_closed: true)
-      output[1].should equal_element("INPUT", {"CHECKED" => true, "NAME" => "name", "TYPE" => "radio", "VALUE" => "2"}, "Bar", not_closed: true)
-      output[2].should equal_element("INPUT", {"NAME" => "name", "TYPE" => "radio", "VALUE" => "Baz"}, "Baz", not_closed: true)
-    end
+        output = CGISpecs.split(@html.radio_group("NAME" => "name", "VALUES" => [["1", "Foo"], ["2", "Bar", true], "Baz"]))
+        output[0].should equal_element("INPUT", {"NAME" => "name", "TYPE" => "radio", "VALUE" => "1"}, "Foo", not_closed: true)
+        output[1].should equal_element("INPUT", {"CHECKED" => true, "NAME" => "name", "TYPE" => "radio", "VALUE" => "2"}, "Bar", not_closed: true)
+        output[2].should equal_element("INPUT", {"NAME" => "name", "TYPE" => "radio", "VALUE" => "Baz"}, "Baz", not_closed: true)
+      end
 
-    it "ignores a passed block" do
-      output = CGISpecs.split(@html.radio_group("NAME" => "name", "VALUES" => ["foo", "bar", "baz"]) { "test" })
-      output[0].should equal_element("INPUT", {"NAME" => "name", "TYPE" => "radio", "VALUE" => "foo"}, "foo", not_closed: true)
-      output[1].should equal_element("INPUT", {"NAME" => "name", "TYPE" => "radio", "VALUE" => "bar"}, "bar", not_closed: true)
-      output[2].should equal_element("INPUT", {"NAME" => "name", "TYPE" => "radio", "VALUE" => "baz"}, "baz", not_closed: true)
+      it "ignores a passed block" do
+        output = CGISpecs.split(@html.radio_group("NAME" => "name", "VALUES" => ["foo", "bar", "baz"]) { "test" })
+        output[0].should equal_element("INPUT", {"NAME" => "name", "TYPE" => "radio", "VALUE" => "foo"}, "foo", not_closed: true)
+        output[1].should equal_element("INPUT", {"NAME" => "name", "TYPE" => "radio", "VALUE" => "bar"}, "bar", not_closed: true)
+        output[2].should equal_element("INPUT", {"NAME" => "name", "TYPE" => "radio", "VALUE" => "baz"}, "baz", not_closed: true)
+      end
     end
   end
 end
diff --git a/spec/ruby/library/cgi/htmlextension/reset_spec.rb b/spec/ruby/library/cgi/htmlextension/reset_spec.rb
index 86fa25fc8afbf2..d3a5c801fa1beb 100644
--- a/spec/ruby/library/cgi/htmlextension/reset_spec.rb
+++ b/spec/ruby/library/cgi/htmlextension/reset_spec.rb
@@ -1,57 +1,60 @@
 require_relative '../../../spec_helper'
-require 'cgi'
-require_relative 'fixtures/common'
 
-describe "CGI::HtmlExtension#reset" do
-  before :each do
-    @html = CGISpecs.cgi_new
-  end
+ruby_version_is ""..."3.5" do
+  require 'cgi'
+  require_relative 'fixtures/common'
 
-  describe "when passed no arguments" do
-    it "returns a reset-'input'-element" do
-      output = @html.reset
-      output.should equal_element("INPUT", {"TYPE" => "reset"}, "", not_closed: true)
+  describe "CGI::HtmlExtension#reset" do
+    before :each do
+      @html = CGISpecs.cgi_new
     end
 
-    it "ignores a passed block" do
-      output = @html.reset { "test" }
-      output.should equal_element("INPUT", {"TYPE" => "reset"}, "", not_closed: true)
-    end
-  end
+    describe "when passed no arguments" do
+      it "returns a reset-'input'-element" do
+        output = @html.reset
+        output.should equal_element("INPUT", {"TYPE" => "reset"}, "", not_closed: true)
+      end
 
-  describe "when passed value" do
-    it "returns a reset-'input'-element with the passed value" do
-      output = @html.reset("Example")
-      output.should equal_element("INPUT", {"TYPE" => "reset", "VALUE" => "Example"}, "", not_closed: true)
+      it "ignores a passed block" do
+        output = @html.reset { "test" }
+        output.should equal_element("INPUT", {"TYPE" => "reset"}, "", not_closed: true)
+      end
     end
 
-    it "ignores a passed block" do
-      output = @html.reset("Example") { "test" }
-      output.should equal_element("INPUT", {"TYPE" => "reset", "VALUE" => "Example"}, "", not_closed: true)
-    end
-  end
+    describe "when passed value" do
+      it "returns a reset-'input'-element with the passed value" do
+        output = @html.reset("Example")
+        output.should equal_element("INPUT", {"TYPE" => "reset", "VALUE" => "Example"}, "", not_closed: true)
+      end
 
-  describe "when passed value, name" do
-    it "returns a reset-'input'-element with the passed value and the passed name" do
-      output = @html.reset("Example", "test-name")
-      output.should equal_element("INPUT", {"TYPE" => "reset", "VALUE" => "Example", "NAME" => "test-name"}, "", not_closed: true)
+      it "ignores a passed block" do
+        output = @html.reset("Example") { "test" }
+        output.should equal_element("INPUT", {"TYPE" => "reset", "VALUE" => "Example"}, "", not_closed: true)
+      end
     end
 
-    it "ignores a passed block" do
-      output = @html.reset("Example", "test-name") { "test" }
-      output.should equal_element("INPUT", {"TYPE" => "reset", "VALUE" => "Example", "NAME" => "test-name"}, "", not_closed: true)
-    end
-  end
+    describe "when passed value, name" do
+      it "returns a reset-'input'-element with the passed value and the passed name" do
+        output = @html.reset("Example", "test-name")
+        output.should equal_element("INPUT", {"TYPE" => "reset", "VALUE" => "Example", "NAME" => "test-name"}, "", not_closed: true)
+      end
 
-  describe "when passed Hash" do
-    it "returns a reset-'input'-element with the passed value" do
-      output = @html.reset("Example")
-      output.should equal_element("INPUT", {"TYPE" => "reset", "VALUE" => "Example"}, "", not_closed: true)
+      it "ignores a passed block" do
+        output = @html.reset("Example", "test-name") { "test" }
+        output.should equal_element("INPUT", {"TYPE" => "reset", "VALUE" => "Example", "NAME" => "test-name"}, "", not_closed: true)
+      end
     end
 
-    it "ignores a passed block" do
-      output = @html.reset("Example") { "test" }
-      output.should equal_element("INPUT", {"TYPE" => "reset", "VALUE" => "Example"}, "", not_closed: true)
+    describe "when passed Hash" do
+      it "returns a reset-'input'-element with the passed value" do
+        output = @html.reset("Example")
+        output.should equal_element("INPUT", {"TYPE" => "reset", "VALUE" => "Example"}, "", not_closed: true)
+      end
+
+      it "ignores a passed block" do
+        output = @html.reset("Example") { "test" }
+        output.should equal_element("INPUT", {"TYPE" => "reset", "VALUE" => "Example"}, "", not_closed: true)
+      end
     end
   end
 end
diff --git a/spec/ruby/library/cgi/htmlextension/scrolling_list_spec.rb b/spec/ruby/library/cgi/htmlextension/scrolling_list_spec.rb
index 4eb0c86c1a5f1c..aab52d74097b4d 100644
--- a/spec/ruby/library/cgi/htmlextension/scrolling_list_spec.rb
+++ b/spec/ruby/library/cgi/htmlextension/scrolling_list_spec.rb
@@ -1,8 +1,11 @@
 require_relative '../../../spec_helper'
-require_relative 'fixtures/common'
-require 'cgi'
-require_relative 'shared/popup_menu'
 
-describe "CGI::HtmlExtension#scrolling_list" do
-  it_behaves_like :cgi_htmlextension_popup_menu, :scrolling_list
+ruby_version_is ""..."3.5" do
+  require_relative 'fixtures/common'
+  require 'cgi'
+  require_relative 'shared/popup_menu'
+
+  describe "CGI::HtmlExtension#scrolling_list" do
+    it_behaves_like :cgi_htmlextension_popup_menu, :scrolling_list
+  end
 end
diff --git a/spec/ruby/library/cgi/htmlextension/submit_spec.rb b/spec/ruby/library/cgi/htmlextension/submit_spec.rb
index 063891b95999e4..3401b10356977c 100644
--- a/spec/ruby/library/cgi/htmlextension/submit_spec.rb
+++ b/spec/ruby/library/cgi/htmlextension/submit_spec.rb
@@ -1,57 +1,60 @@
 require_relative '../../../spec_helper'
-require 'cgi'
-require_relative 'fixtures/common'
 
-describe "CGI::HtmlExtension#submit" do
-  before :each do
-    @html = CGISpecs.cgi_new
-  end
+ruby_version_is ""..."3.5" do
+  require 'cgi'
+  require_relative 'fixtures/common'
 
-  describe "when passed no arguments" do
-    it "returns a submit-'input'-element" do
-      output = @html.submit
-      output.should equal_element("INPUT", {"TYPE" => "submit"}, "", not_closed: true)
+  describe "CGI::HtmlExtension#submit" do
+    before :each do
+      @html = CGISpecs.cgi_new
     end
 
-    it "ignores a passed block" do
-      output = @html.submit { "test" }
-      output.should equal_element("INPUT", {"TYPE" => "submit"}, "", not_closed: true)
-    end
-  end
+    describe "when passed no arguments" do
+      it "returns a submit-'input'-element" do
+        output = @html.submit
+        output.should equal_element("INPUT", {"TYPE" => "submit"}, "", not_closed: true)
+      end
 
-  describe "when passed value" do
-    it "returns a submit-'input'-element with the passed value" do
-      output = @html.submit("Example")
-      output.should equal_element("INPUT", {"TYPE" => "submit", "VALUE" => "Example"}, "", not_closed: true)
+      it "ignores a passed block" do
+        output = @html.submit { "test" }
+        output.should equal_element("INPUT", {"TYPE" => "submit"}, "", not_closed: true)
+      end
     end
 
-    it "ignores a passed block" do
-      output = @html.submit("Example") { "test" }
-      output.should equal_element("INPUT", {"TYPE" => "submit", "VALUE" => "Example"}, "", not_closed: true)
-    end
-  end
+    describe "when passed value" do
+      it "returns a submit-'input'-element with the passed value" do
+        output = @html.submit("Example")
+        output.should equal_element("INPUT", {"TYPE" => "submit", "VALUE" => "Example"}, "", not_closed: true)
+      end
 
-  describe "when passed value, name" do
-    it "returns a submit-'input'-element with the passed value and the passed name" do
-      output = @html.submit("Example", "test-name")
-      output.should equal_element("INPUT", {"TYPE" => "submit", "VALUE" => "Example", "NAME" => "test-name"}, "", not_closed: true)
+      it "ignores a passed block" do
+        output = @html.submit("Example") { "test" }
+        output.should equal_element("INPUT", {"TYPE" => "submit", "VALUE" => "Example"}, "", not_closed: true)
+      end
     end
 
-    it "ignores a passed block" do
-      output = @html.submit("Example", "test-name") { "test" }
-      output.should equal_element("INPUT", {"TYPE" => "submit", "VALUE" => "Example", "NAME" => "test-name"}, "", not_closed: true)
-    end
-  end
+    describe "when passed value, name" do
+      it "returns a submit-'input'-element with the passed value and the passed name" do
+        output = @html.submit("Example", "test-name")
+        output.should equal_element("INPUT", {"TYPE" => "submit", "VALUE" => "Example", "NAME" => "test-name"}, "", not_closed: true)
+      end
 
-  describe "when passed Hash" do
-    it "returns a submit-'input'-element with the passed value" do
-      output = @html.submit("Example")
-      output.should equal_element("INPUT", {"TYPE" => "submit", "VALUE" => "Example"}, "", not_closed: true)
+      it "ignores a passed block" do
+        output = @html.submit("Example", "test-name") { "test" }
+        output.should equal_element("INPUT", {"TYPE" => "submit", "VALUE" => "Example", "NAME" => "test-name"}, "", not_closed: true)
+      end
     end
 
-    it "ignores a passed block" do
-      output = @html.submit("Example") { "test" }
-      output.should equal_element("INPUT", {"TYPE" => "submit", "VALUE" => "Example"}, "", not_closed: true)
+    describe "when passed Hash" do
+      it "returns a submit-'input'-element with the passed value" do
+        output = @html.submit("Example")
+        output.should equal_element("INPUT", {"TYPE" => "submit", "VALUE" => "Example"}, "", not_closed: true)
+      end
+
+      it "ignores a passed block" do
+        output = @html.submit("Example") { "test" }
+        output.should equal_element("INPUT", {"TYPE" => "submit", "VALUE" => "Example"}, "", not_closed: true)
+      end
     end
   end
 end
diff --git a/spec/ruby/library/cgi/htmlextension/text_field_spec.rb b/spec/ruby/library/cgi/htmlextension/text_field_spec.rb
index 44b5a5e69f3966..4f63dbce599f02 100644
--- a/spec/ruby/library/cgi/htmlextension/text_field_spec.rb
+++ b/spec/ruby/library/cgi/htmlextension/text_field_spec.rb
@@ -1,84 +1,87 @@
 require_relative '../../../spec_helper'
-require 'cgi'
-require_relative 'fixtures/common'
 
-describe "CGI::HtmlExtension#text_field" do
-  before :each do
-    @html = CGISpecs.cgi_new
-  end
+ruby_version_is ""..."3.5" do
+  require 'cgi'
+  require_relative 'fixtures/common'
 
-  describe "when passed no arguments" do
-    it "returns an text-'input'-element without a name" do
-      output = @html.text_field
-      output.should equal_element("INPUT", {"NAME" => "", "TYPE" => "text", "SIZE" => "40"}, "", not_closed: true)
+  describe "CGI::HtmlExtension#text_field" do
+    before :each do
+      @html = CGISpecs.cgi_new
     end
 
-    it "ignores a passed block" do
-      output = @html.text_field { "test" }
-      output.should equal_element("INPUT", {"NAME" => "", "TYPE" => "text", "SIZE" => "40"}, "", not_closed: true)
-    end
-  end
+    describe "when passed no arguments" do
+      it "returns an text-'input'-element without a name" do
+        output = @html.text_field
+        output.should equal_element("INPUT", {"NAME" => "", "TYPE" => "text", "SIZE" => "40"}, "", not_closed: true)
+      end
 
-  describe "when passed name" do
-    it "returns an text-'input'-element with the passed name" do
-      output = @html.text_field("test")
-      output.should equal_element("INPUT", {"NAME" => "test", "TYPE" => "text", "SIZE" => "40"}, "", not_closed: true)
+      it "ignores a passed block" do
+        output = @html.text_field { "test" }
+        output.should equal_element("INPUT", {"NAME" => "", "TYPE" => "text", "SIZE" => "40"}, "", not_closed: true)
+      end
     end
 
-    it "ignores a passed block" do
-      output = @html.text_field("test") { "test" }
-      output.should equal_element("INPUT", {"NAME" => "test", "TYPE" => "text", "SIZE" => "40"}, "", not_closed: true)
-    end
-  end
+    describe "when passed name" do
+      it "returns an text-'input'-element with the passed name" do
+        output = @html.text_field("test")
+        output.should equal_element("INPUT", {"NAME" => "test", "TYPE" => "text", "SIZE" => "40"}, "", not_closed: true)
+      end
 
-  describe "when passed name, value" do
-    it "returns an text-'input'-element with the passed name and value" do
-      output = @html.text_field("test", "some value")
-      output.should equal_element("INPUT", {"NAME" => "test", "TYPE" => "text", "VALUE" => "some value", "SIZE" => "40"}, "", not_closed: true)
+      it "ignores a passed block" do
+        output = @html.text_field("test") { "test" }
+        output.should equal_element("INPUT", {"NAME" => "test", "TYPE" => "text", "SIZE" => "40"}, "", not_closed: true)
+      end
     end
 
-    it "ignores a passed block" do
-      output = @html.text_field("test", "some value") { "test" }
-      output.should equal_element("INPUT", {"NAME" => "test", "TYPE" => "text", "VALUE" => "some value", "SIZE" => "40"}, "", not_closed: true)
-    end
-  end
+    describe "when passed name, value" do
+      it "returns an text-'input'-element with the passed name and value" do
+        output = @html.text_field("test", "some value")
+        output.should equal_element("INPUT", {"NAME" => "test", "TYPE" => "text", "VALUE" => "some value", "SIZE" => "40"}, "", not_closed: true)
+      end
 
-  describe "when passed name, value, size" do
-    it "returns an text-'input'-element with the passed name, value and size" do
-      output = @html.text_field("test", "some value", 60)
-      output.should equal_element("INPUT", {"NAME" => "test", "TYPE" => "text", "VALUE" => "some value", "SIZE" => "60"}, "", not_closed: true)
+      it "ignores a passed block" do
+        output = @html.text_field("test", "some value") { "test" }
+        output.should equal_element("INPUT", {"NAME" => "test", "TYPE" => "text", "VALUE" => "some value", "SIZE" => "40"}, "", not_closed: true)
+      end
     end
 
-    it "ignores a passed block" do
-      output = @html.text_field("test", "some value", 60) { "test" }
-      output.should equal_element("INPUT", {"NAME" => "test", "TYPE" => "text", "VALUE" => "some value", "SIZE" => "60"}, "", not_closed: true)
-    end
-  end
+    describe "when passed name, value, size" do
+      it "returns an text-'input'-element with the passed name, value and size" do
+        output = @html.text_field("test", "some value", 60)
+        output.should equal_element("INPUT", {"NAME" => "test", "TYPE" => "text", "VALUE" => "some value", "SIZE" => "60"}, "", not_closed: true)
+      end
 
-  describe "when passed name, value, size, maxlength" do
-    it "returns an text-'input'-element with the passed name, value, size and maxlength" do
-      output = @html.text_field("test", "some value", 60, 12)
-      output.should equal_element("INPUT", {"NAME" => "test", "TYPE" => "text", "VALUE" => "some value", "SIZE" => "60", "MAXLENGTH" => 12}, "", not_closed: true)
+      it "ignores a passed block" do
+        output = @html.text_field("test", "some value", 60) { "test" }
+        output.should equal_element("INPUT", {"NAME" => "test", "TYPE" => "text", "VALUE" => "some value", "SIZE" => "60"}, "", not_closed: true)
+      end
     end
 
-    it "ignores a passed block" do
-      output = @html.text_field("test", "some value", 60, 12) { "test" }
-      output.should equal_element("INPUT", {"NAME" => "test", "TYPE" => "text", "VALUE" => "some value", "SIZE" => "60", "MAXLENGTH" => 12}, "", not_closed: true)
+    describe "when passed name, value, size, maxlength" do
+      it "returns an text-'input'-element with the passed name, value, size and maxlength" do
+        output = @html.text_field("test", "some value", 60, 12)
+        output.should equal_element("INPUT", {"NAME" => "test", "TYPE" => "text", "VALUE" => "some value", "SIZE" => "60", "MAXLENGTH" => 12}, "", not_closed: true)
+      end
+
+      it "ignores a passed block" do
+        output = @html.text_field("test", "some value", 60, 12) { "test" }
+        output.should equal_element("INPUT", {"NAME" => "test", "TYPE" => "text", "VALUE" => "some value", "SIZE" => "60", "MAXLENGTH" => 12}, "", not_closed: true)
+      end
     end
-  end
 
-  describe "when passed Hash" do
-    it "returns a checkbox-'input'-element using the passed Hash for attributes" do
-      output = @html.text_field("NAME" => "test", "VALUE" => "some value")
-      output.should equal_element("INPUT", { "NAME" => "test", "VALUE" => "some value", "TYPE" => "text" }, "", not_closed: true)
+    describe "when passed Hash" do
+      it "returns a checkbox-'input'-element using the passed Hash for attributes" do
+        output = @html.text_field("NAME" => "test", "VALUE" => "some value")
+        output.should equal_element("INPUT", { "NAME" => "test", "VALUE" => "some value", "TYPE" => "text" }, "", not_closed: true)
 
-      output = @html.text_field("TYPE" => "hidden")
-      output.should equal_element("INPUT", {"TYPE" => "text"}, "", not_closed: true)
-    end
+        output = @html.text_field("TYPE" => "hidden")
+        output.should equal_element("INPUT", {"TYPE" => "text"}, "", not_closed: true)
+      end
 
-    it "ignores a passed block" do
-      output = @html.text_field("NAME" => "test", "VALUE" => "some value") { "test" }
-      output.should equal_element("INPUT", { "NAME" => "test", "VALUE" => "some value", "TYPE" => "text" }, "", not_closed: true)
+      it "ignores a passed block" do
+        output = @html.text_field("NAME" => "test", "VALUE" => "some value") { "test" }
+        output.should equal_element("INPUT", { "NAME" => "test", "VALUE" => "some value", "TYPE" => "text" }, "", not_closed: true)
+      end
     end
   end
 end
diff --git a/spec/ruby/library/cgi/htmlextension/textarea_spec.rb b/spec/ruby/library/cgi/htmlextension/textarea_spec.rb
index db84a973d29e83..a3881796fd303a 100644
--- a/spec/ruby/library/cgi/htmlextension/textarea_spec.rb
+++ b/spec/ruby/library/cgi/htmlextension/textarea_spec.rb
@@ -1,73 +1,76 @@
 require_relative '../../../spec_helper'
-require 'cgi'
-require_relative 'fixtures/common'
 
-describe "CGI::HtmlExtension#textarea" do
-  before :each do
-    @html = CGISpecs.cgi_new
-  end
+ruby_version_is ""..."3.5" do
+  require 'cgi'
+  require_relative 'fixtures/common'
 
-  describe "when passed no arguments" do
-    it "returns an 'textarea'-element without a name" do
-      output = @html.textarea
-      output.should equal_element("TEXTAREA", {"NAME" => "", "COLS" => "70", "ROWS" => "10"}, "")
+  describe "CGI::HtmlExtension#textarea" do
+    before :each do
+      @html = CGISpecs.cgi_new
     end
 
-    it "includes the return value of the passed block when passed a block" do
-      output = @html.textarea { "Example" }
-      output.should equal_element("TEXTAREA", {"NAME" => "", "COLS" => "70", "ROWS" => "10"}, "Example")
-    end
-  end
+    describe "when passed no arguments" do
+      it "returns an 'textarea'-element without a name" do
+        output = @html.textarea
+        output.should equal_element("TEXTAREA", {"NAME" => "", "COLS" => "70", "ROWS" => "10"}, "")
+      end
 
-  describe "when passed name" do
-    it "returns an 'textarea'-element with the passed name" do
-      output = @html.textarea("test")
-      output.should equal_element("TEXTAREA", {"NAME" => "test", "COLS" => "70", "ROWS" => "10"}, "")
+      it "includes the return value of the passed block when passed a block" do
+        output = @html.textarea { "Example" }
+        output.should equal_element("TEXTAREA", {"NAME" => "", "COLS" => "70", "ROWS" => "10"}, "Example")
+      end
     end
 
-    it "includes the return value of the passed block when passed a block" do
-      output = @html.textarea("test") { "Example" }
-      output.should equal_element("TEXTAREA", {"NAME" => "test", "COLS" => "70", "ROWS" => "10"}, "Example")
-    end
-  end
+    describe "when passed name" do
+      it "returns an 'textarea'-element with the passed name" do
+        output = @html.textarea("test")
+        output.should equal_element("TEXTAREA", {"NAME" => "test", "COLS" => "70", "ROWS" => "10"}, "")
+      end
 
-  describe "when passed name, cols" do
-    it "returns an 'textarea'-element with the passed name and the passed amount of columns" do
-      output = @html.textarea("test", 40)
-      output.should equal_element("TEXTAREA", {"NAME" => "test", "COLS" => "40", "ROWS" => "10"}, "")
+      it "includes the return value of the passed block when passed a block" do
+        output = @html.textarea("test") { "Example" }
+        output.should equal_element("TEXTAREA", {"NAME" => "test", "COLS" => "70", "ROWS" => "10"}, "Example")
+      end
     end
 
-    it "includes the return value of the passed block when passed a block" do
-      output = @html.textarea("test", 40) { "Example" }
-      output.should equal_element("TEXTAREA", {"NAME" => "test", "COLS" => "40", "ROWS" => "10"}, "Example")
-    end
-  end
+    describe "when passed name, cols" do
+      it "returns an 'textarea'-element with the passed name and the passed amount of columns" do
+        output = @html.textarea("test", 40)
+        output.should equal_element("TEXTAREA", {"NAME" => "test", "COLS" => "40", "ROWS" => "10"}, "")
+      end
 
-  describe "when passed name, cols, rows" do
-    it "returns an 'textarea'-element with the passed name, the passed amount of columns and the passed number of rows" do
-      output = @html.textarea("test", 40, 5)
-      output.should equal_element("TEXTAREA", {"NAME" => "test", "COLS" => "40", "ROWS" => "5"}, "")
+      it "includes the return value of the passed block when passed a block" do
+        output = @html.textarea("test", 40) { "Example" }
+        output.should equal_element("TEXTAREA", {"NAME" => "test", "COLS" => "40", "ROWS" => "10"}, "Example")
+      end
     end
 
-    it "includes the return value of the passed block when passed a block" do
-      output = @html.textarea("test", 40, 5) { "Example" }
-      output.should equal_element("TEXTAREA", {"NAME" => "test", "COLS" => "40", "ROWS" => "5"}, "Example")
+    describe "when passed name, cols, rows" do
+      it "returns an 'textarea'-element with the passed name, the passed amount of columns and the passed number of rows" do
+        output = @html.textarea("test", 40, 5)
+        output.should equal_element("TEXTAREA", {"NAME" => "test", "COLS" => "40", "ROWS" => "5"}, "")
+      end
+
+      it "includes the return value of the passed block when passed a block" do
+        output = @html.textarea("test", 40, 5) { "Example" }
+        output.should equal_element("TEXTAREA", {"NAME" => "test", "COLS" => "40", "ROWS" => "5"}, "Example")
+      end
     end
-  end
 
-  describe "when passed Hash" do
-    it "uses the passed Hash as attributes" do
-      @html.textarea("ID" => "test").should == '<TEXTAREA ID="test"></TEXTAREA>'
+    describe "when passed Hash" do
+      it "uses the passed Hash as attributes" do
+        @html.textarea("ID" => "test").should == '<TEXTAREA ID="test"></TEXTAREA>'
 
-      attributes = {"ID" => "test-id", "NAME" => "test-name"}
-      output = @html.textarea(attributes)
-      output.should equal_element("TEXTAREA", attributes, "")
-    end
+        attributes = {"ID" => "test-id", "NAME" => "test-name"}
+        output = @html.textarea(attributes)
+        output.should equal_element("TEXTAREA", attributes, "")
+      end
 
-    it "includes the return value of the passed block when passed a block" do
-      attributes = {"ID" => "test-id", "NAME" => "test-name"}
-      output = @html.textarea(attributes) { "test" }
-      output.should equal_element("TEXTAREA", attributes, "test")
+      it "includes the return value of the passed block when passed a block" do
+        attributes = {"ID" => "test-id", "NAME" => "test-name"}
+        output = @html.textarea(attributes) { "test" }
+        output.should equal_element("TEXTAREA", attributes, "test")
+      end
     end
   end
 end
diff --git a/spec/ruby/library/cgi/http_header_spec.rb b/spec/ruby/library/cgi/http_header_spec.rb
index 4094bebed35877..173055718b36d1 100644
--- a/spec/ruby/library/cgi/http_header_spec.rb
+++ b/spec/ruby/library/cgi/http_header_spec.rb
@@ -1,8 +1,11 @@
 require_relative '../../spec_helper'
-require 'cgi'
 
-require_relative 'shared/http_header'
+ruby_version_is ""..."3.5" do
+  require 'cgi'
 
-describe "CGI#http_header" do
-  it_behaves_like :cgi_http_header, :http_header
+  require_relative 'shared/http_header'
+
+  describe "CGI#http_header" do
+    it_behaves_like :cgi_http_header, :http_header
+  end
 end
diff --git a/spec/ruby/library/cgi/initialize_spec.rb b/spec/ruby/library/cgi/initialize_spec.rb
index f794f157f0871a..d46b5a35640585 100644
--- a/spec/ruby/library/cgi/initialize_spec.rb
+++ b/spec/ruby/library/cgi/initialize_spec.rb
@@ -1,133 +1,136 @@
 require_relative '../../spec_helper'
-require 'cgi'
 
-describe "CGI#initialize" do
-  it "is private" do
-    CGI.should have_private_instance_method(:initialize)
-  end
-end
+ruby_version_is ""..."3.5" do
+  require 'cgi'
 
-describe "CGI#initialize when passed no arguments" do
-  before :each do
-    ENV['REQUEST_METHOD'], @old_request_method = "GET", ENV['REQUEST_METHOD']
-    @cgi = CGI.allocate
-  end
-
-  after :each do
-    ENV['REQUEST_METHOD'] = @old_request_method
-  end
-
-  it "extends self with CGI::QueryExtension" do
-    @cgi.send(:initialize)
-    @cgi.should be_kind_of(CGI::QueryExtension)
+  describe "CGI#initialize" do
+    it "is private" do
+      CGI.should have_private_instance_method(:initialize)
+    end
   end
 
-  it "does not extend self with CGI::HtmlExtension" do
-    @cgi.send(:initialize)
-    @cgi.should_not be_kind_of(CGI::HtmlExtension)
-  end
+  describe "CGI#initialize when passed no arguments" do
+    before :each do
+      ENV['REQUEST_METHOD'], @old_request_method = "GET", ENV['REQUEST_METHOD']
+      @cgi = CGI.allocate
+    end
 
-  it "does not extend self with any of the other HTML modules" do
-    @cgi.send(:initialize)
-    @cgi.should_not be_kind_of(CGI::Html3)
-    @cgi.should_not be_kind_of(CGI::HtmlExtension)
-    @cgi.should_not be_kind_of(CGI::Html4)
-    @cgi.should_not be_kind_of(CGI::Html4Tr)
-    @cgi.should_not be_kind_of(CGI::Html4Fr)
-  end
+    after :each do
+      ENV['REQUEST_METHOD'] = @old_request_method
+    end
 
-  it "sets #cookies based on ENV['HTTP_COOKIE']" do
-    begin
-      old_env, ENV["HTTP_COOKIE"] = ENV["HTTP_COOKIE"], "test=test yay"
+    it "extends self with CGI::QueryExtension" do
       @cgi.send(:initialize)
-      @cgi.cookies.should == { "test"=>[ "test yay" ] }
-    ensure
-      ENV["HTTP_COOKIE"] = old_env
+      @cgi.should be_kind_of(CGI::QueryExtension)
     end
-  end
 
-  it "sets #params based on ENV['QUERY_STRING'] when ENV['REQUEST_METHOD'] is GET" do
-    begin
-      old_env_query, ENV["QUERY_STRING"] = ENV["QUERY_STRING"], "?test=a&test2=b"
-      old_env_method, ENV["REQUEST_METHOD"] = ENV["REQUEST_METHOD"], "GET"
+    it "does not extend self with CGI::HtmlExtension" do
       @cgi.send(:initialize)
-      @cgi.params.should == { "test2" => ["b"], "?test" => ["a"] }
-    ensure
-      ENV["QUERY_STRING"] = old_env_query
-      ENV["REQUEST_METHOD"] = old_env_method
+      @cgi.should_not be_kind_of(CGI::HtmlExtension)
     end
-  end
 
-  it "sets #params based on ENV['QUERY_STRING'] when ENV['REQUEST_METHOD'] is HEAD" do
-    begin
-      old_env_query, ENV["QUERY_STRING"] = ENV["QUERY_STRING"], "?test=a&test2=b"
-      old_env_method, ENV["REQUEST_METHOD"] = ENV["REQUEST_METHOD"], "HEAD"
+    it "does not extend self with any of the other HTML modules" do
       @cgi.send(:initialize)
-      @cgi.params.should == { "test2" => ["b"], "?test" => ["a"] }
-    ensure
-      ENV["QUERY_STRING"] = old_env_query
-      ENV["REQUEST_METHOD"] = old_env_method
+      @cgi.should_not be_kind_of(CGI::HtmlExtension)
+      @cgi.should_not be_kind_of(CGI::Html3)
+      @cgi.should_not be_kind_of(CGI::Html4)
+      @cgi.should_not be_kind_of(CGI::Html4Tr)
+      @cgi.should_not be_kind_of(CGI::Html4Fr)
     end
-  end
-end
 
-describe "CGI#initialize when passed type" do
-  before :each do
-    ENV['REQUEST_METHOD'], @old_request_method = "GET", ENV['REQUEST_METHOD']
-    @cgi = CGI.allocate
-  end
+    it "sets #cookies based on ENV['HTTP_COOKIE']" do
+      begin
+        old_env, ENV["HTTP_COOKIE"] = ENV["HTTP_COOKIE"], "test=test yay"
+        @cgi.send(:initialize)
+        @cgi.cookies.should == { "test"=>[ "test yay" ] }
+      ensure
+        ENV["HTTP_COOKIE"] = old_env
+      end
+    end
 
-  after :each do
-    ENV['REQUEST_METHOD'] = @old_request_method
+    it "sets #params based on ENV['QUERY_STRING'] when ENV['REQUEST_METHOD'] is GET" do
+      begin
+        old_env_query, ENV["QUERY_STRING"] = ENV["QUERY_STRING"], "?test=a&test2=b"
+        old_env_method, ENV["REQUEST_METHOD"] = ENV["REQUEST_METHOD"], "GET"
+        @cgi.send(:initialize)
+        @cgi.params.should == { "test2" => ["b"], "?test" => ["a"] }
+      ensure
+        ENV["QUERY_STRING"] = old_env_query
+        ENV["REQUEST_METHOD"] = old_env_method
+      end
+    end
+
+    it "sets #params based on ENV['QUERY_STRING'] when ENV['REQUEST_METHOD'] is HEAD" do
+      begin
+        old_env_query, ENV["QUERY_STRING"] = ENV["QUERY_STRING"], "?test=a&test2=b"
+        old_env_method, ENV["REQUEST_METHOD"] = ENV["REQUEST_METHOD"], "HEAD"
+        @cgi.send(:initialize)
+        @cgi.params.should == { "test2" => ["b"], "?test" => ["a"] }
+      ensure
+        ENV["QUERY_STRING"] = old_env_query
+        ENV["REQUEST_METHOD"] = old_env_method
+      end
+    end
   end
 
+  describe "CGI#initialize when passed type" do
+    before :each do
+      ENV['REQUEST_METHOD'], @old_request_method = "GET", ENV['REQUEST_METHOD']
+      @cgi = CGI.allocate
+    end
 
-  it "extends self with CGI::QueryExtension" do
-    @cgi.send(:initialize, "test")
-    @cgi.should be_kind_of(CGI::QueryExtension)
-  end
+    after :each do
+      ENV['REQUEST_METHOD'] = @old_request_method
+    end
 
-  it "extends self with CGI::QueryExtension, CGI::Html3 and CGI::HtmlExtension when the passed type is 'html3'" do
-    @cgi.send(:initialize, "html3")
-    @cgi.should be_kind_of(CGI::Html3)
-    @cgi.should be_kind_of(CGI::HtmlExtension)
-    @cgi.should be_kind_of(CGI::QueryExtension)
 
-    @cgi.should_not be_kind_of(CGI::Html4)
-    @cgi.should_not be_kind_of(CGI::Html4Tr)
-    @cgi.should_not be_kind_of(CGI::Html4Fr)
-  end
+    it "extends self with CGI::QueryExtension" do
+      @cgi.send(:initialize, "test")
+      @cgi.should be_kind_of(CGI::QueryExtension)
+    end
 
-  it "extends self with CGI::QueryExtension, CGI::Html4 and CGI::HtmlExtension when the passed type is 'html4'" do
-    @cgi.send(:initialize, "html4")
-    @cgi.should be_kind_of(CGI::Html4)
-    @cgi.should be_kind_of(CGI::HtmlExtension)
-    @cgi.should be_kind_of(CGI::QueryExtension)
+    it "extends self with CGI::QueryExtension, CGI::Html3 and CGI::HtmlExtension when the passed type is 'html3'" do
+      @cgi.send(:initialize, "html3")
+      @cgi.should be_kind_of(CGI::Html3)
+      @cgi.should be_kind_of(CGI::HtmlExtension)
+      @cgi.should be_kind_of(CGI::QueryExtension)
 
-    @cgi.should_not be_kind_of(CGI::Html3)
-    @cgi.should_not be_kind_of(CGI::Html4Tr)
-    @cgi.should_not be_kind_of(CGI::Html4Fr)
-  end
+      @cgi.should_not be_kind_of(CGI::Html4)
+      @cgi.should_not be_kind_of(CGI::Html4Tr)
+      @cgi.should_not be_kind_of(CGI::Html4Fr)
+    end
 
-  it "extends self with CGI::QueryExtension, CGI::Html4Tr and CGI::HtmlExtension when the passed type is 'html4Tr'" do
-    @cgi.send(:initialize, "html4Tr")
-    @cgi.should be_kind_of(CGI::Html4Tr)
-    @cgi.should be_kind_of(CGI::HtmlExtension)
-    @cgi.should be_kind_of(CGI::QueryExtension)
+    it "extends self with CGI::QueryExtension, CGI::Html4 and CGI::HtmlExtension when the passed type is 'html4'" do
+      @cgi.send(:initialize, "html4")
+      @cgi.should be_kind_of(CGI::Html4)
+      @cgi.should be_kind_of(CGI::HtmlExtension)
+      @cgi.should be_kind_of(CGI::QueryExtension)
 
-    @cgi.should_not be_kind_of(CGI::Html3)
-    @cgi.should_not be_kind_of(CGI::Html4)
-    @cgi.should_not be_kind_of(CGI::Html4Fr)
-  end
+      @cgi.should_not be_kind_of(CGI::Html3)
+      @cgi.should_not be_kind_of(CGI::Html4Tr)
+      @cgi.should_not be_kind_of(CGI::Html4Fr)
+    end
 
-  it "extends self with CGI::QueryExtension, CGI::Html4Tr, CGI::Html4Fr and CGI::HtmlExtension when the passed type is 'html4Fr'" do
-    @cgi.send(:initialize, "html4Fr")
-    @cgi.should be_kind_of(CGI::Html4Tr)
-    @cgi.should be_kind_of(CGI::Html4Fr)
-    @cgi.should be_kind_of(CGI::HtmlExtension)
-    @cgi.should be_kind_of(CGI::QueryExtension)
+    it "extends self with CGI::QueryExtension, CGI::Html4Tr and CGI::HtmlExtension when the passed type is 'html4Tr'" do
+      @cgi.send(:initialize, "html4Tr")
+      @cgi.should be_kind_of(CGI::Html4Tr)
+      @cgi.should be_kind_of(CGI::HtmlExtension)
+      @cgi.should be_kind_of(CGI::QueryExtension)
 
-    @cgi.should_not be_kind_of(CGI::Html3)
-    @cgi.should_not be_kind_of(CGI::Html4)
+      @cgi.should_not be_kind_of(CGI::Html3)
+      @cgi.should_not be_kind_of(CGI::Html4)
+      @cgi.should_not be_kind_of(CGI::Html4Fr)
+    end
+
+    it "extends self with CGI::QueryExtension, CGI::Html4Tr, CGI::Html4Fr and CGI::HtmlExtension when the passed type is 'html4Fr'" do
+      @cgi.send(:initialize, "html4Fr")
+      @cgi.should be_kind_of(CGI::Html4Tr)
+      @cgi.should be_kind_of(CGI::Html4Fr)
+      @cgi.should be_kind_of(CGI::HtmlExtension)
+      @cgi.should be_kind_of(CGI::QueryExtension)
+
+      @cgi.should_not be_kind_of(CGI::Html3)
+      @cgi.should_not be_kind_of(CGI::Html4)
+    end
   end
 end
diff --git a/spec/ruby/library/cgi/out_spec.rb b/spec/ruby/library/cgi/out_spec.rb
index bc09f5bcbb59e2..c79d0002841af7 100644
--- a/spec/ruby/library/cgi/out_spec.rb
+++ b/spec/ruby/library/cgi/out_spec.rb
@@ -1,51 +1,54 @@
 require_relative '../../spec_helper'
-require 'cgi'
 
-describe "CGI#out" do
-  before :each do
-    ENV['REQUEST_METHOD'], @old_request_method = "GET", ENV['REQUEST_METHOD']
-    @cgi = CGI.new
-    $stdout, @old_stdout = IOStub.new, $stdout
-  end
-
-  after :each do
-    $stdout = @old_stdout
-    ENV['REQUEST_METHOD'] = @old_request_method
-  end
-
-  it "it writes a HTMl header based on the passed argument to $stdout" do
-    @cgi.out { "" }
-    $stdout.should == "Content-Type: text/html\r\nContent-Length: 0\r\n\r\n"
-  end
-
-  it "appends the block's return value to the HTML header" do
-    @cgi.out { "test!" }
-    $stdout.should == "Content-Type: text/html\r\nContent-Length: 5\r\n\r\ntest!"
-  end
-
-  it "automatically sets the Content-Length Header based on the block's return value" do
-    @cgi.out { "0123456789" }
-    $stdout.should == "Content-Type: text/html\r\nContent-Length: 10\r\n\r\n0123456789"
-  end
-
-  it "includes Cookies in the @output_cookies field" do
-    @cgi.instance_variable_set(:@output_cookies, ["multiple", "cookies"])
-    @cgi.out { "" }
-    $stdout.should == "Content-Type: text/html\r\nContent-Length: 0\r\nSet-Cookie: multiple\r\nSet-Cookie: cookies\r\n\r\n"
-  end
-end
-
-describe "CGI#out when passed no block" do
-  before :each do
-    ENV['REQUEST_METHOD'], @old_request_method = "GET", ENV['REQUEST_METHOD']
-    @cgi = CGI.new
-  end
-
-  after :each do
-    ENV['REQUEST_METHOD'] = @old_request_method
-  end
-
-  it "raises a LocalJumpError" do
-    -> { @cgi.out }.should raise_error(LocalJumpError)
+ruby_version_is ""..."3.5" do
+  require 'cgi'
+
+  describe "CGI#out" do
+    before :each do
+      ENV['REQUEST_METHOD'], @old_request_method = "GET", ENV['REQUEST_METHOD']
+      @cgi = CGI.new
+      $stdout, @old_stdout = IOStub.new, $stdout
+    end
+
+    after :each do
+      $stdout = @old_stdout
+      ENV['REQUEST_METHOD'] = @old_request_method
+    end
+
+    it "it writes a HTMl header based on the passed argument to $stdout" do
+      @cgi.out { "" }
+      $stdout.should == "Content-Type: text/html\r\nContent-Length: 0\r\n\r\n"
+    end
+
+    it "appends the block's return value to the HTML header" do
+      @cgi.out { "test!" }
+      $stdout.should == "Content-Type: text/html\r\nContent-Length: 5\r\n\r\ntest!"
+    end
+
+    it "automatically sets the Content-Length Header based on the block's return value" do
+      @cgi.out { "0123456789" }
+      $stdout.should == "Content-Type: text/html\r\nContent-Length: 10\r\n\r\n0123456789"
+    end
+
+    it "includes Cookies in the @output_cookies field" do
+      @cgi.instance_variable_set(:@output_cookies, ["multiple", "cookies"])
+      @cgi.out { "" }
+      $stdout.should == "Content-Type: text/html\r\nContent-Length: 0\r\nSet-Cookie: multiple\r\nSet-Cookie: cookies\r\n\r\n"
+    end
+  end
+
+  describe "CGI#out when passed no block" do
+    before :each do
+      ENV['REQUEST_METHOD'], @old_request_method = "GET", ENV['REQUEST_METHOD']
+      @cgi = CGI.new
+    end
+
+    after :each do
+      ENV['REQUEST_METHOD'] = @old_request_method
+    end
+
+    it "raises a LocalJumpError" do
+      -> { @cgi.out }.should raise_error(LocalJumpError)
+    end
   end
 end
diff --git a/spec/ruby/library/cgi/parse_spec.rb b/spec/ruby/library/cgi/parse_spec.rb
index 04539b1226573c..d35d0d33650ee6 100644
--- a/spec/ruby/library/cgi/parse_spec.rb
+++ b/spec/ruby/library/cgi/parse_spec.rb
@@ -1,24 +1,27 @@
 require_relative '../../spec_helper'
-require 'cgi'
 
-describe "CGI.parse when passed String" do
-  it "parses a HTTP Query String into a Hash" do
-    CGI.parse("test=test&a=b").should == { "a" => ["b"], "test" => ["test"] }
-    CGI.parse("test=1,2,3").should == { "test" => ["1,2,3"] }
-    CGI.parse("test=a&a=&b=").should == { "test" => ["a"], "a" => [""], "b" => [""] }
-  end
+ruby_version_is ""..."3.5" do
+  require 'cgi'
 
-  it "parses query strings with semicolons in place of ampersands" do
-    CGI.parse("test=test;a=b").should == { "a" => ["b"], "test" => ["test"] }
-    CGI.parse("test=a;a=;b=").should == { "test" => ["a"], "a" => [""], "b" => [""] }
-  end
+  describe "CGI.parse when passed String" do
+    it "parses a HTTP Query String into a Hash" do
+      CGI.parse("test=test&a=b").should == { "a" => ["b"], "test" => ["test"] }
+      CGI.parse("test=1,2,3").should == { "test" => ["1,2,3"] }
+      CGI.parse("test=a&a=&b=").should == { "test" => ["a"], "a" => [""], "b" => [""] }
+    end
 
-  it "allows passing multiple values for one key" do
-    CGI.parse("test=1&test=2&test=3").should == { "test" => ["1", "2", "3"] }
-    CGI.parse("test[]=1&test[]=2&test[]=3").should == { "test[]" => [ "1", "2", "3" ] }
-  end
+    it "parses query strings with semicolons in place of ampersands" do
+      CGI.parse("test=test;a=b").should == { "a" => ["b"], "test" => ["test"] }
+      CGI.parse("test=a;a=;b=").should == { "test" => ["a"], "a" => [""], "b" => [""] }
+    end
+
+    it "allows passing multiple values for one key" do
+      CGI.parse("test=1&test=2&test=3").should == { "test" => ["1", "2", "3"] }
+      CGI.parse("test[]=1&test[]=2&test[]=3").should == { "test[]" => [ "1", "2", "3" ] }
+    end
 
-  it "unescapes keys and values" do
-    CGI.parse("hello%3F=hello%21").should == { "hello?" => ["hello!"] }
+    it "unescapes keys and values" do
+      CGI.parse("hello%3F=hello%21").should == { "hello?" => ["hello!"] }
+    end
   end
 end
diff --git a/spec/ruby/library/cgi/pretty_spec.rb b/spec/ruby/library/cgi/pretty_spec.rb
index a7b7505c1534b5..1fed3bbd2ecf41 100644
--- a/spec/ruby/library/cgi/pretty_spec.rb
+++ b/spec/ruby/library/cgi/pretty_spec.rb
@@ -1,24 +1,27 @@
 require_relative '../../spec_helper'
-require 'cgi'
 
-describe "CGI.pretty when passed html" do
-  it "indents the passed html String with two spaces" do
-    CGI.pretty("<HTML><BODY></BODY></HTML>").should == <<-EOS
+ruby_version_is ""..."3.5" do
+  require 'cgi'
+
+  describe "CGI.pretty when passed html" do
+    it "indents the passed html String with two spaces" do
+      CGI.pretty("<HTML><BODY></BODY></HTML>").should == <<-EOS
 <HTML>
   <BODY>
   </BODY>
 </HTML>
 EOS
+    end
   end
-end
 
-describe "CGI.pretty when passed html, indentation_unit" do
-  it "indents the passed html String with the passed indentation_unit" do
-    CGI.pretty("<HTML><BODY></BODY></HTML>", "\t").should == <<-EOS
+  describe "CGI.pretty when passed html, indentation_unit" do
+    it "indents the passed html String with the passed indentation_unit" do
+      CGI.pretty("<HTML><BODY></BODY></HTML>", "\t").should == <<-EOS
 <HTML>
 \t<BODY>
 \t</BODY>
 </HTML>
 EOS
+    end
   end
 end
diff --git a/spec/ruby/library/cgi/print_spec.rb b/spec/ruby/library/cgi/print_spec.rb
index 18ab8d673b12ea..5057c280a0c28d 100644
--- a/spec/ruby/library/cgi/print_spec.rb
+++ b/spec/ruby/library/cgi/print_spec.rb
@@ -1,26 +1,29 @@
 require_relative '../../spec_helper'
-require 'cgi'
 
-describe "CGI#print" do
-  before :each do
-    ENV['REQUEST_METHOD'], @old_request_method = "GET", ENV['REQUEST_METHOD']
-    @cgi = CGI.new
-  end
+ruby_version_is ""..."3.5" do
+  require 'cgi'
 
-  after :each do
-    ENV['REQUEST_METHOD'] = @old_request_method
-  end
+  describe "CGI#print" do
+    before :each do
+      ENV['REQUEST_METHOD'], @old_request_method = "GET", ENV['REQUEST_METHOD']
+      @cgi = CGI.new
+    end
 
-  it "passes all arguments to $stdout.print" do
-    $stdout.should_receive(:print).with("test")
-    @cgi.print("test")
+    after :each do
+      ENV['REQUEST_METHOD'] = @old_request_method
+    end
 
-    $stdout.should_receive(:print).with("one", "two", "three", ["four", "five"])
-    @cgi.print("one", "two", "three", ["four", "five"])
-  end
+    it "passes all arguments to $stdout.print" do
+      $stdout.should_receive(:print).with("test")
+      @cgi.print("test")
+
+      $stdout.should_receive(:print).with("one", "two", "three", ["four", "five"])
+      @cgi.print("one", "two", "three", ["four", "five"])
+    end
 
-  it "returns the result of calling $stdout.print" do
-    $stdout.should_receive(:print).with("test").and_return(:expected)
-    @cgi.print("test").should == :expected
+    it "returns the result of calling $stdout.print" do
+      $stdout.should_receive(:print).with("test").and_return(:expected)
+      @cgi.print("test").should == :expected
+    end
   end
 end
diff --git a/spec/ruby/library/cgi/queryextension/accept_charset_spec.rb b/spec/ruby/library/cgi/queryextension/accept_charset_spec.rb
index 0487569b9c0879..9bfc833a3bba8d 100644
--- a/spec/ruby/library/cgi/queryextension/accept_charset_spec.rb
+++ b/spec/ruby/library/cgi/queryextension/accept_charset_spec.rb
@@ -1,22 +1,25 @@
 require_relative '../../../spec_helper'
-require 'cgi'
 
-describe "CGI::QueryExtension#accept_charset" do
-  before :each do
-    ENV['REQUEST_METHOD'], @old_request_method = "GET", ENV['REQUEST_METHOD']
-    @cgi = CGI.new
-  end
+ruby_version_is ""..."3.5" do
+  require 'cgi'
 
-  after :each do
-    ENV['REQUEST_METHOD'] = @old_request_method
-  end
+  describe "CGI::QueryExtension#accept_charset" do
+    before :each do
+      ENV['REQUEST_METHOD'], @old_request_method = "GET", ENV['REQUEST_METHOD']
+      @cgi = CGI.new
+    end
+
+    after :each do
+      ENV['REQUEST_METHOD'] = @old_request_method
+    end
 
-  it "returns ENV['HTTP_ACCEPT_CHARSET']" do
-    old_value, ENV['HTTP_ACCEPT_CHARSET'] = ENV['HTTP_ACCEPT_CHARSET'], "ISO-8859-1,utf-8;q=0.7,*;q=0.7"
-    begin
-      @cgi.accept_charset.should == "ISO-8859-1,utf-8;q=0.7,*;q=0.7"
-    ensure
-      ENV['HTTP_ACCEPT_CHARSET'] = old_value
+    it "returns ENV['HTTP_ACCEPT_CHARSET']" do
+      old_value, ENV['HTTP_ACCEPT_CHARSET'] = ENV['HTTP_ACCEPT_CHARSET'], "ISO-8859-1,utf-8;q=0.7,*;q=0.7"
+      begin
+        @cgi.accept_charset.should == "ISO-8859-1,utf-8;q=0.7,*;q=0.7"
+      ensure
+        ENV['HTTP_ACCEPT_CHARSET'] = old_value
+      end
     end
   end
 end
diff --git a/spec/ruby/library/cgi/queryextension/accept_encoding_spec.rb b/spec/ruby/library/cgi/queryextension/accept_encoding_spec.rb
index 35ff3c2b30e606..f0d7f2058a14f9 100644
--- a/spec/ruby/library/cgi/queryextension/accept_encoding_spec.rb
+++ b/spec/ruby/library/cgi/queryextension/accept_encoding_spec.rb
@@ -1,22 +1,25 @@
 require_relative '../../../spec_helper'
-require 'cgi'
 
-describe "CGI::QueryExtension#accept_encoding" do
-  before :each do
-    ENV['REQUEST_METHOD'], @old_request_method = "GET", ENV['REQUEST_METHOD']
-    @cgi = CGI.new
-  end
+ruby_version_is ""..."3.5" do
+  require 'cgi'
 
-  after :each do
-    ENV['REQUEST_METHOD'] = @old_request_method
-  end
+  describe "CGI::QueryExtension#accept_encoding" do
+    before :each do
+      ENV['REQUEST_METHOD'], @old_request_method = "GET", ENV['REQUEST_METHOD']
+      @cgi = CGI.new
+    end
+
+    after :each do
+      ENV['REQUEST_METHOD'] = @old_request_method
+    end
 
-  it "returns ENV['HTTP_ACCEPT_ENCODING']" do
-    old_value, ENV['HTTP_ACCEPT_ENCODING'] = ENV['HTTP_ACCEPT_ENCODING'], "gzip,deflate"
-    begin
-      @cgi.accept_encoding.should == "gzip,deflate"
-    ensure
-      ENV['HTTP_ACCEPT_ENCODING'] = old_value
+    it "returns ENV['HTTP_ACCEPT_ENCODING']" do
+      old_value, ENV['HTTP_ACCEPT_ENCODING'] = ENV['HTTP_ACCEPT_ENCODING'], "gzip,deflate"
+      begin
+        @cgi.accept_encoding.should == "gzip,deflate"
+      ensure
+        ENV['HTTP_ACCEPT_ENCODING'] = old_value
+      end
     end
   end
 end
diff --git a/spec/ruby/library/cgi/queryextension/accept_language_spec.rb b/spec/ruby/library/cgi/queryextension/accept_language_spec.rb
index 4a15d58914e9ea..e3dfcd03241aa1 100644
--- a/spec/ruby/library/cgi/queryextension/accept_language_spec.rb
+++ b/spec/ruby/library/cgi/queryextension/accept_language_spec.rb
@@ -1,22 +1,25 @@
 require_relative '../../../spec_helper'
-require 'cgi'
 
-describe "CGI::QueryExtension#accept_language" do
-  before :each do
-    ENV['REQUEST_METHOD'], @old_request_method = "GET", ENV['REQUEST_METHOD']
-    @cgi = CGI.new
-  end
+ruby_version_is ""..."3.5" do
+  require 'cgi'
 
-  after :each do
-    ENV['REQUEST_METHOD'] = @old_request_method
-  end
+  describe "CGI::QueryExtension#accept_language" do
+    before :each do
+      ENV['REQUEST_METHOD'], @old_request_method = "GET", ENV['REQUEST_METHOD']
+      @cgi = CGI.new
+    end
+
+    after :each do
+      ENV['REQUEST_METHOD'] = @old_request_method
+    end
 
-  it "returns ENV['HTTP_ACCEPT_LANGUAGE']" do
-    old_value, ENV['HTTP_ACCEPT_LANGUAGE'] = ENV['HTTP_ACCEPT_LANGUAGE'], "en-us,en;q=0.5"
-    begin
-      @cgi.accept_language.should == "en-us,en;q=0.5"
-    ensure
-      ENV['HTTP_ACCEPT_LANGUAGE'] = old_value
+    it "returns ENV['HTTP_ACCEPT_LANGUAGE']" do
+      old_value, ENV['HTTP_ACCEPT_LANGUAGE'] = ENV['HTTP_ACCEPT_LANGUAGE'], "en-us,en;q=0.5"
+      begin
+        @cgi.accept_language.should == "en-us,en;q=0.5"
+      ensure
+        ENV['HTTP_ACCEPT_LANGUAGE'] = old_value
+      end
     end
   end
 end
diff --git a/spec/ruby/library/cgi/queryextension/accept_spec.rb b/spec/ruby/library/cgi/queryextension/accept_spec.rb
index af5209ffbe9339..9370a885a4be74 100644
--- a/spec/ruby/library/cgi/queryextension/accept_spec.rb
+++ b/spec/ruby/library/cgi/queryextension/accept_spec.rb
@@ -1,22 +1,25 @@
 require_relative '../../../spec_helper'
-require 'cgi'
 
-describe "CGI::QueryExtension#accept" do
-  before :each do
-    ENV['REQUEST_METHOD'], @old_request_method = "GET", ENV['REQUEST_METHOD']
-    @cgi = CGI.new
-  end
+ruby_version_is ""..."3.5" do
+  require 'cgi'
 
-  after :each do
-    ENV['REQUEST_METHOD'] = @old_request_method
-  end
+  describe "CGI::QueryExtension#accept" do
+    before :each do
+      ENV['REQUEST_METHOD'], @old_request_method = "GET", ENV['REQUEST_METHOD']
+      @cgi = CGI.new
+    end
+
+    after :each do
+      ENV['REQUEST_METHOD'] = @old_request_method
+    end
 
-  it "returns ENV['HTTP_ACCEPT']" do
-    old_value, ENV['HTTP_ACCEPT'] = ENV['HTTP_ACCEPT'], "text/xml,application/xml,application/xhtml+xml,text/html;q=0.9,text/plain;q=0.8,image/png,*/*;q=0.5"
-    begin
-      @cgi.accept.should == "text/xml,application/xml,application/xhtml+xml,text/html;q=0.9,text/plain;q=0.8,image/png,*/*;q=0.5"
-    ensure
-      ENV['HTTP_ACCEPT'] = old_value
+    it "returns ENV['HTTP_ACCEPT']" do
+      old_value, ENV['HTTP_ACCEPT'] = ENV['HTTP_ACCEPT'], "text/xml,application/xml,application/xhtml+xml,text/html;q=0.9,text/plain;q=0.8,image/png,*/*;q=0.5"
+      begin
+        @cgi.accept.should == "text/xml,application/xml,application/xhtml+xml,text/html;q=0.9,text/plain;q=0.8,image/png,*/*;q=0.5"
+      ensure
+        ENV['HTTP_ACCEPT'] = old_value
+      end
     end
   end
 end
diff --git a/spec/ruby/library/cgi/queryextension/auth_type_spec.rb b/spec/ruby/library/cgi/queryextension/auth_type_spec.rb
index 25318269b12fe6..c85843603772ed 100644
--- a/spec/ruby/library/cgi/queryextension/auth_type_spec.rb
+++ b/spec/ruby/library/cgi/queryextension/auth_type_spec.rb
@@ -1,22 +1,25 @@
 require_relative '../../../spec_helper'
-require 'cgi'
 
-describe "CGI::QueryExtension#auth_type" do
-  before :each do
-    ENV['REQUEST_METHOD'], @old_request_method = "GET", ENV['REQUEST_METHOD']
-    @cgi = CGI.new
-  end
+ruby_version_is ""..."3.5" do
+  require 'cgi'
 
-  after :each do
-    ENV['REQUEST_METHOD'] = @old_request_method
-  end
+  describe "CGI::QueryExtension#auth_type" do
+    before :each do
+      ENV['REQUEST_METHOD'], @old_request_method = "GET", ENV['REQUEST_METHOD']
+      @cgi = CGI.new
+    end
+
+    after :each do
+      ENV['REQUEST_METHOD'] = @old_request_method
+    end
 
-  it "returns ENV['AUTH_TYPE']" do
-    old_value, ENV['AUTH_TYPE'] = ENV['AUTH_TYPE'], "Basic"
-    begin
-      @cgi.auth_type.should == "Basic"
-    ensure
-      ENV['AUTH_TYPE'] = old_value
+    it "returns ENV['AUTH_TYPE']" do
+      old_value, ENV['AUTH_TYPE'] = ENV['AUTH_TYPE'], "Basic"
+      begin
+        @cgi.auth_type.should == "Basic"
+      ensure
+        ENV['AUTH_TYPE'] = old_value
+      end
     end
   end
 end
diff --git a/spec/ruby/library/cgi/queryextension/cache_control_spec.rb b/spec/ruby/library/cgi/queryextension/cache_control_spec.rb
index 0471307c227fc0..d42421126c5398 100644
--- a/spec/ruby/library/cgi/queryextension/cache_control_spec.rb
+++ b/spec/ruby/library/cgi/queryextension/cache_control_spec.rb
@@ -1,22 +1,25 @@
 require_relative '../../../spec_helper'
-require 'cgi'
 
-describe "CGI::QueryExtension#cache_control" do
-  before :each do
-    ENV['REQUEST_METHOD'], @old_request_method = "GET", ENV['REQUEST_METHOD']
-    @cgi = CGI.new
-  end
+ruby_version_is ""..."3.5" do
+  require 'cgi'
 
-  after :each do
-    ENV['REQUEST_METHOD'] = @old_request_method
-  end
+  describe "CGI::QueryExtension#cache_control" do
+    before :each do
+      ENV['REQUEST_METHOD'], @old_request_method = "GET", ENV['REQUEST_METHOD']
+      @cgi = CGI.new
+    end
+
+    after :each do
+      ENV['REQUEST_METHOD'] = @old_request_method
+    end
 
-  it "returns ENV['HTTP_CACHE_CONTROL']" do
-    old_value, ENV['HTTP_CACHE_CONTROL'] = ENV['HTTP_CACHE_CONTROL'], "no-cache"
-    begin
-      @cgi.cache_control.should == "no-cache"
-    ensure
-      ENV['HTTP_CACHE_CONTROL'] = old_value
+    it "returns ENV['HTTP_CACHE_CONTROL']" do
+      old_value, ENV['HTTP_CACHE_CONTROL'] = ENV['HTTP_CACHE_CONTROL'], "no-cache"
+      begin
+        @cgi.cache_control.should == "no-cache"
+      ensure
+        ENV['HTTP_CACHE_CONTROL'] = old_value
+      end
     end
   end
 end
diff --git a/spec/ruby/library/cgi/queryextension/content_length_spec.rb b/spec/ruby/library/cgi/queryextension/content_length_spec.rb
index de823f7119e33e..2e3dca6f587b5a 100644
--- a/spec/ruby/library/cgi/queryextension/content_length_spec.rb
+++ b/spec/ruby/library/cgi/queryextension/content_length_spec.rb
@@ -1,26 +1,29 @@
 require_relative '../../../spec_helper'
-require 'cgi'
 
-describe "CGI::QueryExtension#content_length" do
-  before :each do
-    ENV['REQUEST_METHOD'], @old_request_method = "GET", ENV['REQUEST_METHOD']
-    @cgi = CGI.new
-  end
+ruby_version_is ""..."3.5" do
+  require 'cgi'
 
-  after :each do
-    ENV['REQUEST_METHOD'] = @old_request_method
-  end
+  describe "CGI::QueryExtension#content_length" do
+    before :each do
+      ENV['REQUEST_METHOD'], @old_request_method = "GET", ENV['REQUEST_METHOD']
+      @cgi = CGI.new
+    end
+
+    after :each do
+      ENV['REQUEST_METHOD'] = @old_request_method
+    end
 
-  it "returns ENV['CONTENT_LENGTH'] as Integer" do
-    old_value = ENV['CONTENT_LENGTH']
-    begin
-      ENV['CONTENT_LENGTH'] = nil
-      @cgi.content_length.should be_nil
+    it "returns ENV['CONTENT_LENGTH'] as Integer" do
+      old_value = ENV['CONTENT_LENGTH']
+      begin
+        ENV['CONTENT_LENGTH'] = nil
+        @cgi.content_length.should be_nil
 
-      ENV['CONTENT_LENGTH'] = "100"
-      @cgi.content_length.should eql(100)
-    ensure
-      ENV['CONTENT_LENGTH'] = old_value
+        ENV['CONTENT_LENGTH'] = "100"
+        @cgi.content_length.should eql(100)
+      ensure
+        ENV['CONTENT_LENGTH'] = old_value
+      end
     end
   end
 end
diff --git a/spec/ruby/library/cgi/queryextension/content_type_spec.rb b/spec/ruby/library/cgi/queryextension/content_type_spec.rb
index 49b8389c8741d3..ce1be28571c83b 100644
--- a/spec/ruby/library/cgi/queryextension/content_type_spec.rb
+++ b/spec/ruby/library/cgi/queryextension/content_type_spec.rb
@@ -1,22 +1,25 @@
 require_relative '../../../spec_helper'
-require 'cgi'
 
-describe "CGI::QueryExtension#content_type" do
-  before :each do
-    ENV['REQUEST_METHOD'], @old_request_method = "GET", ENV['REQUEST_METHOD']
-    @cgi = CGI.new
-  end
+ruby_version_is ""..."3.5" do
+  require 'cgi'
 
-  after :each do
-    ENV['REQUEST_METHOD'] = @old_request_method
-  end
+  describe "CGI::QueryExtension#content_type" do
+    before :each do
+      ENV['REQUEST_METHOD'], @old_request_method = "GET", ENV['REQUEST_METHOD']
+      @cgi = CGI.new
+    end
+
+    after :each do
+      ENV['REQUEST_METHOD'] = @old_request_method
+    end
 
-  it "returns ENV['CONTENT_TYPE']" do
-    old_value, ENV['CONTENT_TYPE'] = ENV['CONTENT_TYPE'], "text/html"
-    begin
-      @cgi.content_type.should == "text/html"
-    ensure
-      ENV['CONTENT_TYPE'] = old_value
+    it "returns ENV['CONTENT_TYPE']" do
+      old_value, ENV['CONTENT_TYPE'] = ENV['CONTENT_TYPE'], "text/html"
+      begin
+        @cgi.content_type.should == "text/html"
+      ensure
+        ENV['CONTENT_TYPE'] = old_value
+      end
     end
   end
 end
diff --git a/spec/ruby/library/cgi/queryextension/cookies_spec.rb b/spec/ruby/library/cgi/queryextension/cookies_spec.rb
index 4befd61ab79225..029ad5991a1bca 100644
--- a/spec/ruby/library/cgi/queryextension/cookies_spec.rb
+++ b/spec/ruby/library/cgi/queryextension/cookies_spec.rb
@@ -1,10 +1,13 @@
 require_relative '../../../spec_helper'
-require 'cgi'
 
-describe "CGI::QueryExtension#cookies" do
-  it "needs to be reviewed for spec completeness"
-end
+ruby_version_is ""..."3.5" do
+  require 'cgi'
+
+  describe "CGI::QueryExtension#cookies" do
+    it "needs to be reviewed for spec completeness"
+  end
 
-describe "CGI::QueryExtension#cookies=" do
-  it "needs to be reviewed for spec completeness"
+  describe "CGI::QueryExtension#cookies=" do
+    it "needs to be reviewed for spec completeness"
+  end
 end
diff --git a/spec/ruby/library/cgi/queryextension/element_reference_spec.rb b/spec/ruby/library/cgi/queryextension/element_reference_spec.rb
index 6ac5b4640730ad..df1c372ab7f4f6 100644
--- a/spec/ruby/library/cgi/queryextension/element_reference_spec.rb
+++ b/spec/ruby/library/cgi/queryextension/element_reference_spec.rb
@@ -1,27 +1,30 @@
 require_relative '../../../spec_helper'
-require 'cgi'
 
-describe "CGI::QueryExtension#[]" do
-  before :each do
-    ENV['REQUEST_METHOD'], @old_request_method = "GET", ENV['REQUEST_METHOD']
-    ENV['QUERY_STRING'], @old_query_string = "one=a&two=b&two=c", ENV['QUERY_STRING']
-    @cgi = CGI.new
-  end
+ruby_version_is ""..."3.5" do
+  require 'cgi'
 
-  after :each do
-    ENV['REQUEST_METHOD'] = @old_request_method
-    ENV['QUERY_STRING']   = @old_query_string
-  end
+  describe "CGI::QueryExtension#[]" do
+    before :each do
+      ENV['REQUEST_METHOD'], @old_request_method = "GET", ENV['REQUEST_METHOD']
+      ENV['QUERY_STRING'], @old_query_string = "one=a&two=b&two=c", ENV['QUERY_STRING']
+      @cgi = CGI.new
+    end
 
-  it "it returns the value for the parameter with the given key" do
-    @cgi["one"].should == "a"
-  end
+    after :each do
+      ENV['REQUEST_METHOD'] = @old_request_method
+      ENV['QUERY_STRING']   = @old_query_string
+    end
 
-  it "only returns the first value for parameters with multiple values" do
-    @cgi["two"].should == "b"
-  end
+    it "it returns the value for the parameter with the given key" do
+      @cgi["one"].should == "a"
+    end
+
+    it "only returns the first value for parameters with multiple values" do
+      @cgi["two"].should == "b"
+    end
 
-  it "returns a String" do
-    @cgi["one"].should be_kind_of(String)
+    it "returns a String" do
+      @cgi["one"].should be_kind_of(String)
+    end
   end
 end
diff --git a/spec/ruby/library/cgi/queryextension/from_spec.rb b/spec/ruby/library/cgi/queryextension/from_spec.rb
index 04a992cfc7cb55..8d278f5318629c 100644
--- a/spec/ruby/library/cgi/queryextension/from_spec.rb
+++ b/spec/ruby/library/cgi/queryextension/from_spec.rb
@@ -1,22 +1,25 @@
 require_relative '../../../spec_helper'
-require 'cgi'
 
-describe "CGI::QueryExtension#from" do
-  before :each do
-    ENV['REQUEST_METHOD'], @old_request_method = "GET", ENV['REQUEST_METHOD']
-    @cgi = CGI.new
-  end
+ruby_version_is ""..."3.5" do
+  require 'cgi'
 
-  after :each do
-    ENV['REQUEST_METHOD'] = @old_request_method
-  end
+  describe "CGI::QueryExtension#from" do
+    before :each do
+      ENV['REQUEST_METHOD'], @old_request_method = "GET", ENV['REQUEST_METHOD']
+      @cgi = CGI.new
+    end
+
+    after :each do
+      ENV['REQUEST_METHOD'] = @old_request_method
+    end
 
-  it "returns ENV['HTTP_FROM']" do
-    old_value, ENV['HTTP_FROM'] = ENV['HTTP_FROM'], "googlebot(at)googlebot.com"
-    begin
-      @cgi.from.should == "googlebot(at)googlebot.com"
-    ensure
-      ENV['HTTP_FROM'] = old_value
+    it "returns ENV['HTTP_FROM']" do
+      old_value, ENV['HTTP_FROM'] = ENV['HTTP_FROM'], "googlebot(at)googlebot.com"
+      begin
+        @cgi.from.should == "googlebot(at)googlebot.com"
+      ensure
+        ENV['HTTP_FROM'] = old_value
+      end
     end
   end
 end
diff --git a/spec/ruby/library/cgi/queryextension/gateway_interface_spec.rb b/spec/ruby/library/cgi/queryextension/gateway_interface_spec.rb
index 3ead5bd8bf6e59..d519b80e329333 100644
--- a/spec/ruby/library/cgi/queryextension/gateway_interface_spec.rb
+++ b/spec/ruby/library/cgi/queryextension/gateway_interface_spec.rb
@@ -1,22 +1,25 @@
 require_relative '../../../spec_helper'
-require 'cgi'
 
-describe "CGI::QueryExtension#gateway_interface" do
-  before :each do
-    ENV['REQUEST_METHOD'], @old_request_method = "GET", ENV['REQUEST_METHOD']
-    @cgi = CGI.new
-  end
+ruby_version_is ""..."3.5" do
+  require 'cgi'
 
-  after :each do
-    ENV['REQUEST_METHOD'] = @old_request_method
-  end
+  describe "CGI::QueryExtension#gateway_interface" do
+    before :each do
+      ENV['REQUEST_METHOD'], @old_request_method = "GET", ENV['REQUEST_METHOD']
+      @cgi = CGI.new
+    end
+
+    after :each do
+      ENV['REQUEST_METHOD'] = @old_request_method
+    end
 
-  it "returns ENV['GATEWAY_INTERFACE']" do
-    old_value, ENV['GATEWAY_INTERFACE'] = ENV['GATEWAY_INTERFACE'], "CGI/1.1"
-    begin
-      @cgi.gateway_interface.should == "CGI/1.1"
-    ensure
-      ENV['GATEWAY_INTERFACE'] = old_value
+    it "returns ENV['GATEWAY_INTERFACE']" do
+      old_value, ENV['GATEWAY_INTERFACE'] = ENV['GATEWAY_INTERFACE'], "CGI/1.1"
+      begin
+        @cgi.gateway_interface.should == "CGI/1.1"
+      ensure
+        ENV['GATEWAY_INTERFACE'] = old_value
+      end
     end
   end
 end
diff --git a/spec/ruby/library/cgi/queryextension/has_key_spec.rb b/spec/ruby/library/cgi/queryextension/has_key_spec.rb
index 525b45b50729c0..5892ecaf775833 100644
--- a/spec/ruby/library/cgi/queryextension/has_key_spec.rb
+++ b/spec/ruby/library/cgi/queryextension/has_key_spec.rb
@@ -1,7 +1,10 @@
 require_relative '../../../spec_helper'
-require 'cgi'
-require_relative 'shared/has_key'
 
-describe "CGI::QueryExtension#has_key?" do
-  it_behaves_like :cgi_query_extension_has_key_p, :has_key?
+ruby_version_is ""..."3.5" do
+  require 'cgi'
+  require_relative 'shared/has_key'
+
+  describe "CGI::QueryExtension#has_key?" do
+    it_behaves_like :cgi_query_extension_has_key_p, :has_key?
+  end
 end
diff --git a/spec/ruby/library/cgi/queryextension/host_spec.rb b/spec/ruby/library/cgi/queryextension/host_spec.rb
index e820e0afc3736a..2eaf1330c053a4 100644
--- a/spec/ruby/library/cgi/queryextension/host_spec.rb
+++ b/spec/ruby/library/cgi/queryextension/host_spec.rb
@@ -1,22 +1,25 @@
 require_relative '../../../spec_helper'
-require 'cgi'
 
-describe "CGI::QueryExtension#host" do
-  before :each do
-    ENV['REQUEST_METHOD'], @old_request_method = "GET", ENV['REQUEST_METHOD']
-    @cgi = CGI.new
-  end
+ruby_version_is ""..."3.5" do
+  require 'cgi'
 
-  after :each do
-    ENV['REQUEST_METHOD'] = @old_request_method
-  end
+  describe "CGI::QueryExtension#host" do
+    before :each do
+      ENV['REQUEST_METHOD'], @old_request_method = "GET", ENV['REQUEST_METHOD']
+      @cgi = CGI.new
+    end
+
+    after :each do
+      ENV['REQUEST_METHOD'] = @old_request_method
+    end
 
-  it "returns ENV['HTTP_HOST']" do
-    old_value, ENV['HTTP_HOST'] = ENV['HTTP_HOST'], "localhost"
-    begin
-      @cgi.host.should == "localhost"
-    ensure
-      ENV['HTTP_HOST'] = old_value
+    it "returns ENV['HTTP_HOST']" do
+      old_value, ENV['HTTP_HOST'] = ENV['HTTP_HOST'], "localhost"
+      begin
+        @cgi.host.should == "localhost"
+      ensure
+        ENV['HTTP_HOST'] = old_value
+      end
     end
   end
 end
diff --git a/spec/ruby/library/cgi/queryextension/include_spec.rb b/spec/ruby/library/cgi/queryextension/include_spec.rb
index 12365ea2847b4d..18520c4aafb654 100644
--- a/spec/ruby/library/cgi/queryextension/include_spec.rb
+++ b/spec/ruby/library/cgi/queryextension/include_spec.rb
@@ -1,7 +1,10 @@
 require_relative '../../../spec_helper'
-require 'cgi'
-require_relative 'shared/has_key'
 
-describe "CGI::QueryExtension#include?" do
-  it_behaves_like :cgi_query_extension_has_key_p, :include?
+ruby_version_is ""..."3.5" do
+  require 'cgi'
+  require_relative 'shared/has_key'
+
+  describe "CGI::QueryExtension#include?" do
+    it_behaves_like :cgi_query_extension_has_key_p, :include?
+  end
 end
diff --git a/spec/ruby/library/cgi/queryextension/key_spec.rb b/spec/ruby/library/cgi/queryextension/key_spec.rb
index d0f1e4cee2e442..c8c5870eba8486 100644
--- a/spec/ruby/library/cgi/queryextension/key_spec.rb
+++ b/spec/ruby/library/cgi/queryextension/key_spec.rb
@@ -1,7 +1,10 @@
 require_relative '../../../spec_helper'
-require 'cgi'
-require_relative 'shared/has_key'
 
-describe "CGI::QueryExtension#key?" do
-  it_behaves_like :cgi_query_extension_has_key_p, :key?
+ruby_version_is ""..."3.5" do
+  require 'cgi'
+  require_relative 'shared/has_key'
+
+  describe "CGI::QueryExtension#key?" do
+    it_behaves_like :cgi_query_extension_has_key_p, :key?
+  end
 end
diff --git a/spec/ruby/library/cgi/queryextension/keys_spec.rb b/spec/ruby/library/cgi/queryextension/keys_spec.rb
index 14d77180faba5e..0c35404103c841 100644
--- a/spec/ruby/library/cgi/queryextension/keys_spec.rb
+++ b/spec/ruby/library/cgi/queryextension/keys_spec.rb
@@ -1,20 +1,23 @@
 require_relative '../../../spec_helper'
-require 'cgi'
 
-describe "CGI::QueryExtension#keys" do
-  before :each do
-    ENV['REQUEST_METHOD'], @old_request_method = "GET", ENV['REQUEST_METHOD']
-    ENV['QUERY_STRING'], @old_query_string = "one=a&two=b", ENV['QUERY_STRING']
+ruby_version_is ""..."3.5" do
+  require 'cgi'
 
-    @cgi = CGI.new
-  end
+  describe "CGI::QueryExtension#keys" do
+    before :each do
+      ENV['REQUEST_METHOD'], @old_request_method = "GET", ENV['REQUEST_METHOD']
+      ENV['QUERY_STRING'], @old_query_string = "one=a&two=b", ENV['QUERY_STRING']
 
-  after :each do
-    ENV['REQUEST_METHOD'] = @old_request_method
-    ENV['QUERY_STRING']   = @old_query_string
-  end
+      @cgi = CGI.new
+    end
+
+    after :each do
+      ENV['REQUEST_METHOD'] = @old_request_method
+      ENV['QUERY_STRING']   = @old_query_string
+    end
 
-  it "returns all parameter keys as an Array" do
-    @cgi.keys.sort.should == ["one", "two"]
+    it "returns all parameter keys as an Array" do
+      @cgi.keys.sort.should == ["one", "two"]
+    end
   end
 end
diff --git a/spec/ruby/library/cgi/queryextension/multipart_spec.rb b/spec/ruby/library/cgi/queryextension/multipart_spec.rb
index ced4cb05a184b7..72c8073a5a4842 100644
--- a/spec/ruby/library/cgi/queryextension/multipart_spec.rb
+++ b/spec/ruby/library/cgi/queryextension/multipart_spec.rb
@@ -1,20 +1,22 @@
 require_relative '../../../spec_helper'
-require 'cgi'
-require "stringio"
 
-describe "CGI::QueryExtension#multipart?" do
-  before :each do
-    @old_stdin = $stdin
+ruby_version_is ""..."3.5" do
+  require 'cgi'
+  require "stringio"
 
-    @old_request_method = ENV['REQUEST_METHOD']
-    @old_content_type = ENV['CONTENT_TYPE']
-    @old_content_length = ENV['CONTENT_LENGTH']
+  describe "CGI::QueryExtension#multipart?" do
+    before :each do
+      @old_stdin = $stdin
 
-    ENV['REQUEST_METHOD'] = "POST"
-    ENV["CONTENT_TYPE"] = "multipart/form-data; boundary=---------------------------1137522503144128232716531729"
-    ENV["CONTENT_LENGTH"] = "222"
+      @old_request_method = ENV['REQUEST_METHOD']
+      @old_content_type = ENV['CONTENT_TYPE']
+      @old_content_length = ENV['CONTENT_LENGTH']
 
-    $stdin = StringIO.new <<-EOS
+      ENV['REQUEST_METHOD'] = "POST"
+      ENV["CONTENT_TYPE"] = "multipart/form-data; boundary=---------------------------1137522503144128232716531729"
+      ENV["CONTENT_LENGTH"] = "222"
+
+      $stdin = StringIO.new <<-EOS
 -----------------------------1137522503144128232716531729\r
 Content-Disposition: form-data; name="file"; filename=""\r
 Content-Type: application/octet-stream\r
@@ -23,18 +25,19 @@
 -----------------------------1137522503144128232716531729--\r
 EOS
 
-    @cgi = CGI.new
-  end
+      @cgi = CGI.new
+    end
 
-  after :each do
-    $stdin = @old_stdin
+    after :each do
+      $stdin = @old_stdin
 
-    ENV['REQUEST_METHOD'] = @old_request_method
-    ENV['CONTENT_TYPE'] = @old_content_type
-    ENV['CONTENT_LENGTH'] = @old_content_length
-  end
+      ENV['REQUEST_METHOD'] = @old_request_method
+      ENV['CONTENT_TYPE'] = @old_content_type
+      ENV['CONTENT_LENGTH'] = @old_content_length
+    end
 
-  it "returns true if the current Request is a multipart request" do
-    @cgi.multipart?.should be_true
+    it "returns true if the current Request is a multipart request" do
+      @cgi.multipart?.should be_true
+    end
   end
 end
diff --git a/spec/ruby/library/cgi/queryextension/negotiate_spec.rb b/spec/ruby/library/cgi/queryextension/negotiate_spec.rb
index b6fe0360420b5e..c159c6cfe23ad9 100644
--- a/spec/ruby/library/cgi/queryextension/negotiate_spec.rb
+++ b/spec/ruby/library/cgi/queryextension/negotiate_spec.rb
@@ -1,22 +1,25 @@
 require_relative '../../../spec_helper'
-require 'cgi'
 
-describe "CGI::QueryExtension#negotiate" do
-  before :each do
-    ENV['REQUEST_METHOD'], @old_request_method = "GET", ENV['REQUEST_METHOD']
-    @cgi = CGI.new
-  end
+ruby_version_is ""..."3.5" do
+  require 'cgi'
 
-  after :each do
-    ENV['REQUEST_METHOD'] = @old_request_method
-  end
+  describe "CGI::QueryExtension#negotiate" do
+    before :each do
+      ENV['REQUEST_METHOD'], @old_request_method = "GET", ENV['REQUEST_METHOD']
+      @cgi = CGI.new
+    end
+
+    after :each do
+      ENV['REQUEST_METHOD'] = @old_request_method
+    end
 
-  it "returns ENV['HTTP_NEGOTIATE']" do
-    old_value, ENV['HTTP_NEGOTIATE'] = ENV['HTTP_NEGOTIATE'], "trans"
-    begin
-      @cgi.negotiate.should == "trans"
-    ensure
-      ENV['HTTP_NEGOTIATE'] = old_value
+    it "returns ENV['HTTP_NEGOTIATE']" do
+      old_value, ENV['HTTP_NEGOTIATE'] = ENV['HTTP_NEGOTIATE'], "trans"
+      begin
+        @cgi.negotiate.should == "trans"
+      ensure
+        ENV['HTTP_NEGOTIATE'] = old_value
+      end
     end
   end
 end
diff --git a/spec/ruby/library/cgi/queryextension/params_spec.rb b/spec/ruby/library/cgi/queryextension/params_spec.rb
index f4449e3c8ab263..e8b447f2272208 100644
--- a/spec/ruby/library/cgi/queryextension/params_spec.rb
+++ b/spec/ruby/library/cgi/queryextension/params_spec.rb
@@ -1,37 +1,40 @@
 require_relative '../../../spec_helper'
-require 'cgi'
 
-describe "CGI::QueryExtension#params" do
-  before :each do
-    ENV['REQUEST_METHOD'], @old_request_method = "GET", ENV['REQUEST_METHOD']
-    ENV['QUERY_STRING'], @old_query_string = "one=a&two=b&two=c&three", ENV['QUERY_STRING']
-    @cgi = CGI.new
-  end
+ruby_version_is ""..."3.5" do
+  require 'cgi'
 
-  after :each do
-    ENV['QUERY_STRING'] = @old_query_string
-    ENV['REQUEST_METHOD'] = @old_request_method
-  end
+  describe "CGI::QueryExtension#params" do
+    before :each do
+      ENV['REQUEST_METHOD'], @old_request_method = "GET", ENV['REQUEST_METHOD']
+      ENV['QUERY_STRING'], @old_query_string = "one=a&two=b&two=c&three", ENV['QUERY_STRING']
+      @cgi = CGI.new
+    end
 
-  it "returns the parsed HTTP Query Params" do
-    @cgi.params.should == {"three"=>[], "two"=>["b", "c"], "one"=>["a"]}
-  end
-end
+    after :each do
+      ENV['QUERY_STRING'] = @old_query_string
+      ENV['REQUEST_METHOD'] = @old_request_method
+    end
 
-describe "CGI::QueryExtension#params=" do
-  before :each do
-    ENV['REQUEST_METHOD'], @old_request_method = "GET", ENV['REQUEST_METHOD']
-    @cgi = CGI.new
+    it "returns the parsed HTTP Query Params" do
+      @cgi.params.should == {"three"=>[], "two"=>["b", "c"], "one"=>["a"]}
+    end
   end
 
-  after :each do
-    ENV['REQUEST_METHOD'] = @old_request_method
-  end
+  describe "CGI::QueryExtension#params=" do
+    before :each do
+      ENV['REQUEST_METHOD'], @old_request_method = "GET", ENV['REQUEST_METHOD']
+      @cgi = CGI.new
+    end
+
+    after :each do
+      ENV['REQUEST_METHOD'] = @old_request_method
+    end
 
-  it "sets the HTTP Query Params to the passed argument" do
-    @cgi.params.should == {}
+    it "sets the HTTP Query Params to the passed argument" do
+      @cgi.params.should == {}
 
-    @cgi.params = {"one"=>["a"], "two"=>["b", "c"]}
-    @cgi.params.should == {"one"=>["a"], "two"=>["b", "c"]}
+      @cgi.params = {"one"=>["a"], "two"=>["b", "c"]}
+      @cgi.params.should == {"one"=>["a"], "two"=>["b", "c"]}
+    end
   end
 end
diff --git a/spec/ruby/library/cgi/queryextension/path_info_spec.rb b/spec/ruby/library/cgi/queryextension/path_info_spec.rb
index 9785df85f122b9..9054f1cfd363f8 100644
--- a/spec/ruby/library/cgi/queryextension/path_info_spec.rb
+++ b/spec/ruby/library/cgi/queryextension/path_info_spec.rb
@@ -1,22 +1,25 @@
 require_relative '../../../spec_helper'
-require 'cgi'
 
-describe "CGI::QueryExtension#path_info" do
-  before :each do
-    ENV['REQUEST_METHOD'], @old_request_method = "GET", ENV['REQUEST_METHOD']
-    @cgi = CGI.new
-  end
+ruby_version_is ""..."3.5" do
+  require 'cgi'
 
-  after :each do
-    ENV['REQUEST_METHOD'] = @old_request_method
-  end
+  describe "CGI::QueryExtension#path_info" do
+    before :each do
+      ENV['REQUEST_METHOD'], @old_request_method = "GET", ENV['REQUEST_METHOD']
+      @cgi = CGI.new
+    end
+
+    after :each do
+      ENV['REQUEST_METHOD'] = @old_request_method
+    end
 
-  it "returns ENV['PATH_INFO']" do
-    old_value, ENV['PATH_INFO'] = ENV['PATH_INFO'], "/test/path"
-    begin
-      @cgi.path_info.should == "/test/path"
-    ensure
-      ENV['PATH_INFO'] = old_value
+    it "returns ENV['PATH_INFO']" do
+      old_value, ENV['PATH_INFO'] = ENV['PATH_INFO'], "/test/path"
+      begin
+        @cgi.path_info.should == "/test/path"
+      ensure
+        ENV['PATH_INFO'] = old_value
+      end
     end
   end
 end
diff --git a/spec/ruby/library/cgi/queryextension/path_translated_spec.rb b/spec/ruby/library/cgi/queryextension/path_translated_spec.rb
index 417a749341d6a5..4b17f6c01beec8 100644
--- a/spec/ruby/library/cgi/queryextension/path_translated_spec.rb
+++ b/spec/ruby/library/cgi/queryextension/path_translated_spec.rb
@@ -1,22 +1,25 @@
 require_relative '../../../spec_helper'
-require 'cgi'
 
-describe "CGI::QueryExtension#path_translated" do
-  before :each do
-    ENV['REQUEST_METHOD'], @old_request_method = "GET", ENV['REQUEST_METHOD']
-    @cgi = CGI.new
-  end
+ruby_version_is ""..."3.5" do
+  require 'cgi'
 
-  after :each do
-    ENV['REQUEST_METHOD'] = @old_request_method
-  end
+  describe "CGI::QueryExtension#path_translated" do
+    before :each do
+      ENV['REQUEST_METHOD'], @old_request_method = "GET", ENV['REQUEST_METHOD']
+      @cgi = CGI.new
+    end
+
+    after :each do
+      ENV['REQUEST_METHOD'] = @old_request_method
+    end
 
-  it "returns ENV['PATH_TRANSLATED']" do
-    old_value, ENV['PATH_TRANSLATED'] = ENV['PATH_TRANSLATED'], "/full/path/to/dir"
-    begin
-      @cgi.path_translated.should == "/full/path/to/dir"
-    ensure
-      ENV['PATH_TRANSLATED'] = old_value
+    it "returns ENV['PATH_TRANSLATED']" do
+      old_value, ENV['PATH_TRANSLATED'] = ENV['PATH_TRANSLATED'], "/full/path/to/dir"
+      begin
+        @cgi.path_translated.should == "/full/path/to/dir"
+      ensure
+        ENV['PATH_TRANSLATED'] = old_value
+      end
     end
   end
 end
diff --git a/spec/ruby/library/cgi/queryextension/pragma_spec.rb b/spec/ruby/library/cgi/queryextension/pragma_spec.rb
index 02d5c912213345..c6a9c5b9736d64 100644
--- a/spec/ruby/library/cgi/queryextension/pragma_spec.rb
+++ b/spec/ruby/library/cgi/queryextension/pragma_spec.rb
@@ -1,22 +1,25 @@
 require_relative '../../../spec_helper'
-require 'cgi'
 
-describe "CGI::QueryExtension#pragma" do
-  before :each do
-    ENV['REQUEST_METHOD'], @old_request_method = "GET", ENV['REQUEST_METHOD']
-    @cgi = CGI.new
-  end
+ruby_version_is ""..."3.5" do
+  require 'cgi'
 
-  after :each do
-    ENV['REQUEST_METHOD'] = @old_request_method
-  end
+  describe "CGI::QueryExtension#pragma" do
+    before :each do
+      ENV['REQUEST_METHOD'], @old_request_method = "GET", ENV['REQUEST_METHOD']
+      @cgi = CGI.new
+    end
+
+    after :each do
+      ENV['REQUEST_METHOD'] = @old_request_method
+    end
 
-  it "returns ENV['HTTP_PRAGMA']" do
-    old_value, ENV['HTTP_PRAGMA'] = ENV['HTTP_PRAGMA'], "no-cache"
-    begin
-      @cgi.pragma.should == "no-cache"
-    ensure
-      ENV['HTTP_PRAGMA'] = old_value
+    it "returns ENV['HTTP_PRAGMA']" do
+      old_value, ENV['HTTP_PRAGMA'] = ENV['HTTP_PRAGMA'], "no-cache"
+      begin
+        @cgi.pragma.should == "no-cache"
+      ensure
+        ENV['HTTP_PRAGMA'] = old_value
+      end
     end
   end
 end
diff --git a/spec/ruby/library/cgi/queryextension/query_string_spec.rb b/spec/ruby/library/cgi/queryextension/query_string_spec.rb
index a6b454a7eb4fd5..ef3cb9c8fb1b00 100644
--- a/spec/ruby/library/cgi/queryextension/query_string_spec.rb
+++ b/spec/ruby/library/cgi/queryextension/query_string_spec.rb
@@ -1,22 +1,25 @@
 require_relative '../../../spec_helper'
-require 'cgi'
 
-describe "CGI::QueryExtension#query_string" do
-  before :each do
-    ENV['REQUEST_METHOD'], @old_request_method = "GET", ENV['REQUEST_METHOD']
-    @cgi = CGI.new
-  end
+ruby_version_is ""..."3.5" do
+  require 'cgi'
 
-  after :each do
-    ENV['REQUEST_METHOD'] = @old_request_method
-  end
+  describe "CGI::QueryExtension#query_string" do
+    before :each do
+      ENV['REQUEST_METHOD'], @old_request_method = "GET", ENV['REQUEST_METHOD']
+      @cgi = CGI.new
+    end
+
+    after :each do
+      ENV['REQUEST_METHOD'] = @old_request_method
+    end
 
-  it "returns ENV['QUERY_STRING']" do
-    old_value, ENV['QUERY_STRING'] = ENV['QUERY_STRING'], "one=a&two=b"
-    begin
-      @cgi.query_string.should == "one=a&two=b"
-    ensure
-      ENV['QUERY_STRING'] = old_value
+    it "returns ENV['QUERY_STRING']" do
+      old_value, ENV['QUERY_STRING'] = ENV['QUERY_STRING'], "one=a&two=b"
+      begin
+        @cgi.query_string.should == "one=a&two=b"
+      ensure
+        ENV['QUERY_STRING'] = old_value
+      end
     end
   end
 end
diff --git a/spec/ruby/library/cgi/queryextension/raw_cookie2_spec.rb b/spec/ruby/library/cgi/queryextension/raw_cookie2_spec.rb
index 3d7072e346fe2c..07ef00e8c5ceeb 100644
--- a/spec/ruby/library/cgi/queryextension/raw_cookie2_spec.rb
+++ b/spec/ruby/library/cgi/queryextension/raw_cookie2_spec.rb
@@ -1,22 +1,25 @@
 require_relative '../../../spec_helper'
-require 'cgi'
 
-describe "CGI::QueryExtension#raw_cookie2" do
-  before :each do
-    ENV['REQUEST_METHOD'], @old_request_method = "GET", ENV['REQUEST_METHOD']
-    @cgi = CGI.new
-  end
+ruby_version_is ""..."3.5" do
+  require 'cgi'
 
-  after :each do
-    ENV['REQUEST_METHOD'] = @old_request_method
-  end
+  describe "CGI::QueryExtension#raw_cookie2" do
+    before :each do
+      ENV['REQUEST_METHOD'], @old_request_method = "GET", ENV['REQUEST_METHOD']
+      @cgi = CGI.new
+    end
+
+    after :each do
+      ENV['REQUEST_METHOD'] = @old_request_method
+    end
 
-  it "returns ENV['HTTP_COOKIE2']" do
-    old_value, ENV['HTTP_COOKIE2'] = ENV['HTTP_COOKIE2'], "some_cookie=data"
-    begin
-      @cgi.raw_cookie2.should == "some_cookie=data"
-    ensure
-      ENV['HTTP_COOKIE2'] = old_value
+    it "returns ENV['HTTP_COOKIE2']" do
+      old_value, ENV['HTTP_COOKIE2'] = ENV['HTTP_COOKIE2'], "some_cookie=data"
+      begin
+        @cgi.raw_cookie2.should == "some_cookie=data"
+      ensure
+        ENV['HTTP_COOKIE2'] = old_value
+      end
     end
   end
 end
diff --git a/spec/ruby/library/cgi/queryextension/raw_cookie_spec.rb b/spec/ruby/library/cgi/queryextension/raw_cookie_spec.rb
index ede7b9ff87905a..f1ebb8ad82923f 100644
--- a/spec/ruby/library/cgi/queryextension/raw_cookie_spec.rb
+++ b/spec/ruby/library/cgi/queryextension/raw_cookie_spec.rb
@@ -1,22 +1,25 @@
 require_relative '../../../spec_helper'
-require 'cgi'
 
-describe "CGI::QueryExtension#raw_cookie" do
-  before :each do
-    ENV['REQUEST_METHOD'], @old_request_method = "GET", ENV['REQUEST_METHOD']
-    @cgi = CGI.new
-  end
+ruby_version_is ""..."3.5" do
+  require 'cgi'
 
-  after :each do
-    ENV['REQUEST_METHOD'] = @old_request_method
-  end
+  describe "CGI::QueryExtension#raw_cookie" do
+    before :each do
+      ENV['REQUEST_METHOD'], @old_request_method = "GET", ENV['REQUEST_METHOD']
+      @cgi = CGI.new
+    end
+
+    after :each do
+      ENV['REQUEST_METHOD'] = @old_request_method
+    end
 
-  it "returns ENV['HTTP_COOKIE']" do
-    old_value, ENV['HTTP_COOKIE'] = ENV['HTTP_COOKIE'], "some_cookie=data"
-    begin
-      @cgi.raw_cookie.should == "some_cookie=data"
-    ensure
-      ENV['HTTP_COOKIE'] = old_value
+    it "returns ENV['HTTP_COOKIE']" do
+      old_value, ENV['HTTP_COOKIE'] = ENV['HTTP_COOKIE'], "some_cookie=data"
+      begin
+        @cgi.raw_cookie.should == "some_cookie=data"
+      ensure
+        ENV['HTTP_COOKIE'] = old_value
+      end
     end
   end
 end
diff --git a/spec/ruby/library/cgi/queryextension/referer_spec.rb b/spec/ruby/library/cgi/queryextension/referer_spec.rb
index 6cd5dc96f8eed0..737253eac9c882 100644
--- a/spec/ruby/library/cgi/queryextension/referer_spec.rb
+++ b/spec/ruby/library/cgi/queryextension/referer_spec.rb
@@ -1,22 +1,25 @@
 require_relative '../../../spec_helper'
-require 'cgi'
 
-describe "CGI::QueryExtension#referer" do
-  before :each do
-    ENV['REQUEST_METHOD'], @old_request_method = "GET", ENV['REQUEST_METHOD']
-    @cgi = CGI.new
-  end
+ruby_version_is ""..."3.5" do
+  require 'cgi'
 
-  after :each do
-    ENV['REQUEST_METHOD'] = @old_request_method
-  end
+  describe "CGI::QueryExtension#referer" do
+    before :each do
+      ENV['REQUEST_METHOD'], @old_request_method = "GET", ENV['REQUEST_METHOD']
+      @cgi = CGI.new
+    end
+
+    after :each do
+      ENV['REQUEST_METHOD'] = @old_request_method
+    end
 
-  it "returns ENV['HTTP_REFERER']" do
-    old_value, ENV['HTTP_REFERER'] = ENV['HTTP_REFERER'], "example.com"
-    begin
-      @cgi.referer.should == "example.com"
-    ensure
-      ENV['HTTP_REFERER'] = old_value
+    it "returns ENV['HTTP_REFERER']" do
+      old_value, ENV['HTTP_REFERER'] = ENV['HTTP_REFERER'], "example.com"
+      begin
+        @cgi.referer.should == "example.com"
+      ensure
+        ENV['HTTP_REFERER'] = old_value
+      end
     end
   end
 end
diff --git a/spec/ruby/library/cgi/queryextension/remote_addr_spec.rb b/spec/ruby/library/cgi/queryextension/remote_addr_spec.rb
index 0259402b233b95..e2cc696ae20e63 100644
--- a/spec/ruby/library/cgi/queryextension/remote_addr_spec.rb
+++ b/spec/ruby/library/cgi/queryextension/remote_addr_spec.rb
@@ -1,22 +1,25 @@
 require_relative '../../../spec_helper'
-require 'cgi'
 
-describe "CGI::QueryExtension#remote_addr" do
-  before :each do
-    ENV['REQUEST_METHOD'], @old_request_method = "GET", ENV['REQUEST_METHOD']
-    @cgi = CGI.new
-  end
+ruby_version_is ""..."3.5" do
+  require 'cgi'
 
-  after :each do
-    ENV['REQUEST_METHOD'] = @old_request_method
-  end
+  describe "CGI::QueryExtension#remote_addr" do
+    before :each do
+      ENV['REQUEST_METHOD'], @old_request_method = "GET", ENV['REQUEST_METHOD']
+      @cgi = CGI.new
+    end
+
+    after :each do
+      ENV['REQUEST_METHOD'] = @old_request_method
+    end
 
-  it "returns ENV['REMOTE_ADDR']" do
-    old_value, ENV['REMOTE_ADDR'] = ENV['REMOTE_ADDR'], "127.0.0.1"
-    begin
-      @cgi.remote_addr.should == "127.0.0.1"
-    ensure
-      ENV['REMOTE_ADDR'] = old_value
+    it "returns ENV['REMOTE_ADDR']" do
+      old_value, ENV['REMOTE_ADDR'] = ENV['REMOTE_ADDR'], "127.0.0.1"
+      begin
+        @cgi.remote_addr.should == "127.0.0.1"
+      ensure
+        ENV['REMOTE_ADDR'] = old_value
+      end
     end
   end
 end
diff --git a/spec/ruby/library/cgi/queryextension/remote_host_spec.rb b/spec/ruby/library/cgi/queryextension/remote_host_spec.rb
index cf77e0031b93ee..c4db9e4ffe84d8 100644
--- a/spec/ruby/library/cgi/queryextension/remote_host_spec.rb
+++ b/spec/ruby/library/cgi/queryextension/remote_host_spec.rb
@@ -1,22 +1,25 @@
 require_relative '../../../spec_helper'
-require 'cgi'
 
-describe "CGI::QueryExtension#remote_host" do
-  before :each do
-    ENV['REQUEST_METHOD'], @old_request_method = "GET", ENV['REQUEST_METHOD']
-    @cgi = CGI.new
-  end
+ruby_version_is ""..."3.5" do
+  require 'cgi'
 
-  after :each do
-    ENV['REQUEST_METHOD'] = @old_request_method
-  end
+  describe "CGI::QueryExtension#remote_host" do
+    before :each do
+      ENV['REQUEST_METHOD'], @old_request_method = "GET", ENV['REQUEST_METHOD']
+      @cgi = CGI.new
+    end
+
+    after :each do
+      ENV['REQUEST_METHOD'] = @old_request_method
+    end
 
-  it "returns ENV['REMOTE_HOST']" do
-    old_value, ENV['REMOTE_HOST'] = ENV['REMOTE_HOST'], "test.host"
-    begin
-      @cgi.remote_host.should == "test.host"
-    ensure
-      ENV['REMOTE_HOST'] = old_value
+    it "returns ENV['REMOTE_HOST']" do
+      old_value, ENV['REMOTE_HOST'] = ENV['REMOTE_HOST'], "test.host"
+      begin
+        @cgi.remote_host.should == "test.host"
+      ensure
+        ENV['REMOTE_HOST'] = old_value
+      end
     end
   end
 end
diff --git a/spec/ruby/library/cgi/queryextension/remote_ident_spec.rb b/spec/ruby/library/cgi/queryextension/remote_ident_spec.rb
index 5b51d6b8ee6be6..d507b7d7be89bc 100644
--- a/spec/ruby/library/cgi/queryextension/remote_ident_spec.rb
+++ b/spec/ruby/library/cgi/queryextension/remote_ident_spec.rb
@@ -1,22 +1,25 @@
 require_relative '../../../spec_helper'
-require 'cgi'
 
-describe "CGI::QueryExtension#remote_ident" do
-  before :each do
-    ENV['REQUEST_METHOD'], @old_request_method = "GET", ENV['REQUEST_METHOD']
-    @cgi = CGI.new
-  end
+ruby_version_is ""..."3.5" do
+  require 'cgi'
 
-  after :each do
-    ENV['REQUEST_METHOD'] = @old_request_method
-  end
+  describe "CGI::QueryExtension#remote_ident" do
+    before :each do
+      ENV['REQUEST_METHOD'], @old_request_method = "GET", ENV['REQUEST_METHOD']
+      @cgi = CGI.new
+    end
+
+    after :each do
+      ENV['REQUEST_METHOD'] = @old_request_method
+    end
 
-  it "returns ENV['REMOTE_IDENT']" do
-    old_value, ENV['REMOTE_IDENT'] = ENV['REMOTE_IDENT'], "no-idea-what-this-is-for"
-    begin
-      @cgi.remote_ident.should == "no-idea-what-this-is-for"
-    ensure
-      ENV['REMOTE_IDENT'] = old_value
+    it "returns ENV['REMOTE_IDENT']" do
+      old_value, ENV['REMOTE_IDENT'] = ENV['REMOTE_IDENT'], "no-idea-what-this-is-for"
+      begin
+        @cgi.remote_ident.should == "no-idea-what-this-is-for"
+      ensure
+        ENV['REMOTE_IDENT'] = old_value
+      end
     end
   end
 end
diff --git a/spec/ruby/library/cgi/queryextension/remote_user_spec.rb b/spec/ruby/library/cgi/queryextension/remote_user_spec.rb
index 1a93bb6561996a..ceee4107973895 100644
--- a/spec/ruby/library/cgi/queryextension/remote_user_spec.rb
+++ b/spec/ruby/library/cgi/queryextension/remote_user_spec.rb
@@ -1,22 +1,25 @@
 require_relative '../../../spec_helper'
-require 'cgi'
 
-describe "CGI::QueryExtension#remote_user" do
-  before :each do
-    ENV['REQUEST_METHOD'], @old_request_method = "GET", ENV['REQUEST_METHOD']
-    @cgi = CGI.new
-  end
+ruby_version_is ""..."3.5" do
+  require 'cgi'
 
-  after :each do
-    ENV['REQUEST_METHOD'] = @old_request_method
-  end
+  describe "CGI::QueryExtension#remote_user" do
+    before :each do
+      ENV['REQUEST_METHOD'], @old_request_method = "GET", ENV['REQUEST_METHOD']
+      @cgi = CGI.new
+    end
+
+    after :each do
+      ENV['REQUEST_METHOD'] = @old_request_method
+    end
 
-  it "returns ENV['REMOTE_USER']" do
-    old_value, ENV['REMOTE_USER'] = ENV['REMOTE_USER'], "username"
-    begin
-      @cgi.remote_user.should == "username"
-    ensure
-      ENV['REMOTE_USER'] = old_value
+    it "returns ENV['REMOTE_USER']" do
+      old_value, ENV['REMOTE_USER'] = ENV['REMOTE_USER'], "username"
+      begin
+        @cgi.remote_user.should == "username"
+      ensure
+        ENV['REMOTE_USER'] = old_value
+      end
     end
   end
 end
diff --git a/spec/ruby/library/cgi/queryextension/request_method_spec.rb b/spec/ruby/library/cgi/queryextension/request_method_spec.rb
index eabdd6998bec9d..b540280261a745 100644
--- a/spec/ruby/library/cgi/queryextension/request_method_spec.rb
+++ b/spec/ruby/library/cgi/queryextension/request_method_spec.rb
@@ -1,22 +1,25 @@
 require_relative '../../../spec_helper'
-require 'cgi'
 
-describe "CGI::QueryExtension#request_method" do
-  before :each do
-    ENV['REQUEST_METHOD'], @old_request_method = "GET", ENV['REQUEST_METHOD']
-    @cgi = CGI.new
-  end
+ruby_version_is ""..."3.5" do
+  require 'cgi'
 
-  after :each do
-    ENV['REQUEST_METHOD'] = @old_request_method
-  end
+  describe "CGI::QueryExtension#request_method" do
+    before :each do
+      ENV['REQUEST_METHOD'], @old_request_method = "GET", ENV['REQUEST_METHOD']
+      @cgi = CGI.new
+    end
+
+    after :each do
+      ENV['REQUEST_METHOD'] = @old_request_method
+    end
 
-  it "returns ENV['REQUEST_METHOD']" do
-    old_value, ENV['REQUEST_METHOD'] = ENV['REQUEST_METHOD'], "GET"
-    begin
-      @cgi.request_method.should == "GET"
-    ensure
-      ENV['REQUEST_METHOD'] = old_value
+    it "returns ENV['REQUEST_METHOD']" do
+      old_value, ENV['REQUEST_METHOD'] = ENV['REQUEST_METHOD'], "GET"
+      begin
+        @cgi.request_method.should == "GET"
+      ensure
+        ENV['REQUEST_METHOD'] = old_value
+      end
     end
   end
 end
diff --git a/spec/ruby/library/cgi/queryextension/script_name_spec.rb b/spec/ruby/library/cgi/queryextension/script_name_spec.rb
index 341b7b6feadf3f..49a7847eff0825 100644
--- a/spec/ruby/library/cgi/queryextension/script_name_spec.rb
+++ b/spec/ruby/library/cgi/queryextension/script_name_spec.rb
@@ -1,22 +1,25 @@
 require_relative '../../../spec_helper'
-require 'cgi'
 
-describe "CGI::QueryExtension#script_name" do
-  before :each do
-    ENV['REQUEST_METHOD'], @old_request_method = "GET", ENV['REQUEST_METHOD']
-    @cgi = CGI.new
-  end
+ruby_version_is ""..."3.5" do
+  require 'cgi'
 
-  after :each do
-    ENV['REQUEST_METHOD'] = @old_request_method
-  end
+  describe "CGI::QueryExtension#script_name" do
+    before :each do
+      ENV['REQUEST_METHOD'], @old_request_method = "GET", ENV['REQUEST_METHOD']
+      @cgi = CGI.new
+    end
+
+    after :each do
+      ENV['REQUEST_METHOD'] = @old_request_method
+    end
 
-  it "returns ENV['SCRIPT_NAME']" do
-    old_value, ENV['SCRIPT_NAME'] = ENV['SCRIPT_NAME'], "/path/to/script.rb"
-    begin
-      @cgi.script_name.should == "/path/to/script.rb"
-    ensure
-      ENV['SCRIPT_NAME'] = old_value
+    it "returns ENV['SCRIPT_NAME']" do
+      old_value, ENV['SCRIPT_NAME'] = ENV['SCRIPT_NAME'], "/path/to/script.rb"
+      begin
+        @cgi.script_name.should == "/path/to/script.rb"
+      ensure
+        ENV['SCRIPT_NAME'] = old_value
+      end
     end
   end
 end
diff --git a/spec/ruby/library/cgi/queryextension/server_name_spec.rb b/spec/ruby/library/cgi/queryextension/server_name_spec.rb
index b12aaf8c5cbdc2..ee5d754ad36e03 100644
--- a/spec/ruby/library/cgi/queryextension/server_name_spec.rb
+++ b/spec/ruby/library/cgi/queryextension/server_name_spec.rb
@@ -1,22 +1,25 @@
 require_relative '../../../spec_helper'
-require 'cgi'
 
-describe "CGI::QueryExtension#server_name" do
-  before :each do
-    ENV['REQUEST_METHOD'], @old_request_method = "GET", ENV['REQUEST_METHOD']
-    @cgi = CGI.new
-  end
+ruby_version_is ""..."3.5" do
+  require 'cgi'
 
-  after :each do
-    ENV['REQUEST_METHOD'] = @old_request_method
-  end
+  describe "CGI::QueryExtension#server_name" do
+    before :each do
+      ENV['REQUEST_METHOD'], @old_request_method = "GET", ENV['REQUEST_METHOD']
+      @cgi = CGI.new
+    end
+
+    after :each do
+      ENV['REQUEST_METHOD'] = @old_request_method
+    end
 
-  it "returns ENV['SERVER_NAME']" do
-    old_value, ENV['SERVER_NAME'] = ENV['SERVER_NAME'], "localhost"
-    begin
-      @cgi.server_name.should == "localhost"
-    ensure
-      ENV['SERVER_NAME'] = old_value
+    it "returns ENV['SERVER_NAME']" do
+      old_value, ENV['SERVER_NAME'] = ENV['SERVER_NAME'], "localhost"
+      begin
+        @cgi.server_name.should == "localhost"
+      ensure
+        ENV['SERVER_NAME'] = old_value
+      end
     end
   end
 end
diff --git a/spec/ruby/library/cgi/queryextension/server_port_spec.rb b/spec/ruby/library/cgi/queryextension/server_port_spec.rb
index 0e688a99bf941f..c4f8df78cffb50 100644
--- a/spec/ruby/library/cgi/queryextension/server_port_spec.rb
+++ b/spec/ruby/library/cgi/queryextension/server_port_spec.rb
@@ -1,26 +1,29 @@
 require_relative '../../../spec_helper'
-require 'cgi'
 
-describe "CGI::QueryExtension#server_port" do
-  before :each do
-    ENV['REQUEST_METHOD'], @old_request_method = "GET", ENV['REQUEST_METHOD']
-    @cgi = CGI.new
-  end
+ruby_version_is ""..."3.5" do
+  require 'cgi'
 
-  after :each do
-    ENV['REQUEST_METHOD'] = @old_request_method
-  end
+  describe "CGI::QueryExtension#server_port" do
+    before :each do
+      ENV['REQUEST_METHOD'], @old_request_method = "GET", ENV['REQUEST_METHOD']
+      @cgi = CGI.new
+    end
+
+    after :each do
+      ENV['REQUEST_METHOD'] = @old_request_method
+    end
 
-  it "returns ENV['SERVER_PORT'] as Integer" do
-    old_value = ENV['SERVER_PORT']
-    begin
-      ENV['SERVER_PORT'] = nil
-      @cgi.server_port.should be_nil
+    it "returns ENV['SERVER_PORT'] as Integer" do
+      old_value = ENV['SERVER_PORT']
+      begin
+        ENV['SERVER_PORT'] = nil
+        @cgi.server_port.should be_nil
 
-      ENV['SERVER_PORT'] = "3000"
-      @cgi.server_port.should eql(3000)
-    ensure
-      ENV['SERVER_PORT'] = old_value
+        ENV['SERVER_PORT'] = "3000"
+        @cgi.server_port.should eql(3000)
+      ensure
+        ENV['SERVER_PORT'] = old_value
+      end
     end
   end
 end
diff --git a/spec/ruby/library/cgi/queryextension/server_protocol_spec.rb b/spec/ruby/library/cgi/queryextension/server_protocol_spec.rb
index f9dcf3c5b8e797..35d3b8add1e4e1 100644
--- a/spec/ruby/library/cgi/queryextension/server_protocol_spec.rb
+++ b/spec/ruby/library/cgi/queryextension/server_protocol_spec.rb
@@ -1,22 +1,25 @@
 require_relative '../../../spec_helper'
-require 'cgi'
 
-describe "CGI::QueryExtension#server_protocol" do
-  before :each do
-    ENV['REQUEST_METHOD'], @old_request_method = "GET", ENV['REQUEST_METHOD']
-    @cgi = CGI.new
-  end
+ruby_version_is ""..."3.5" do
+  require 'cgi'
 
-  after :each do
-    ENV['REQUEST_METHOD'] = @old_request_method
-  end
+  describe "CGI::QueryExtension#server_protocol" do
+    before :each do
+      ENV['REQUEST_METHOD'], @old_request_method = "GET", ENV['REQUEST_METHOD']
+      @cgi = CGI.new
+    end
+
+    after :each do
+      ENV['REQUEST_METHOD'] = @old_request_method
+    end
 
-  it "returns ENV['SERVER_PROTOCOL']" do
-    old_value, ENV['SERVER_PROTOCOL'] = ENV['SERVER_PROTOCOL'], "HTTP/1.1"
-    begin
-      @cgi.server_protocol.should == "HTTP/1.1"
-    ensure
-      ENV['SERVER_PROTOCOL'] = old_value
+    it "returns ENV['SERVER_PROTOCOL']" do
+      old_value, ENV['SERVER_PROTOCOL'] = ENV['SERVER_PROTOCOL'], "HTTP/1.1"
+      begin
+        @cgi.server_protocol.should == "HTTP/1.1"
+      ensure
+        ENV['SERVER_PROTOCOL'] = old_value
+      end
     end
   end
 end
diff --git a/spec/ruby/library/cgi/queryextension/server_software_spec.rb b/spec/ruby/library/cgi/queryextension/server_software_spec.rb
index df349cdf2e8742..d4fcceb3799a0a 100644
--- a/spec/ruby/library/cgi/queryextension/server_software_spec.rb
+++ b/spec/ruby/library/cgi/queryextension/server_software_spec.rb
@@ -1,22 +1,25 @@
 require_relative '../../../spec_helper'
-require 'cgi'
 
-describe "CGI::QueryExtension#server_software" do
-  before :each do
-    ENV['REQUEST_METHOD'], @old_request_method = "GET", ENV['REQUEST_METHOD']
-    @cgi = CGI.new
-  end
+ruby_version_is ""..."3.5" do
+  require 'cgi'
 
-  after :each do
-    ENV['REQUEST_METHOD'] = @old_request_method
-  end
+  describe "CGI::QueryExtension#server_software" do
+    before :each do
+      ENV['REQUEST_METHOD'], @old_request_method = "GET", ENV['REQUEST_METHOD']
+      @cgi = CGI.new
+    end
+
+    after :each do
+      ENV['REQUEST_METHOD'] = @old_request_method
+    end
 
-  it "returns ENV['SERVER_SOFTWARE']" do
-    old_value, ENV['SERVER_SOFTWARE'] = ENV['SERVER_SOFTWARE'], "Server/1.0.0"
-    begin
-      @cgi.server_software.should == "Server/1.0.0"
-    ensure
-      ENV['SERVER_SOFTWARE'] = old_value
+    it "returns ENV['SERVER_SOFTWARE']" do
+      old_value, ENV['SERVER_SOFTWARE'] = ENV['SERVER_SOFTWARE'], "Server/1.0.0"
+      begin
+        @cgi.server_software.should == "Server/1.0.0"
+      ensure
+        ENV['SERVER_SOFTWARE'] = old_value
+      end
     end
   end
 end
diff --git a/spec/ruby/library/cgi/queryextension/user_agent_spec.rb b/spec/ruby/library/cgi/queryextension/user_agent_spec.rb
index ec5ef187ddb88d..070a779123126e 100644
--- a/spec/ruby/library/cgi/queryextension/user_agent_spec.rb
+++ b/spec/ruby/library/cgi/queryextension/user_agent_spec.rb
@@ -1,22 +1,25 @@
 require_relative '../../../spec_helper'
-require 'cgi'
 
-describe "CGI::QueryExtension#user_agent" do
-  before :each do
-    ENV['REQUEST_METHOD'], @old_request_method = "GET", ENV['REQUEST_METHOD']
-    @cgi = CGI.new
-  end
+ruby_version_is ""..."3.5" do
+  require 'cgi'
 
-  after :each do
-    ENV['REQUEST_METHOD'] = @old_request_method
-  end
+  describe "CGI::QueryExtension#user_agent" do
+    before :each do
+      ENV['REQUEST_METHOD'], @old_request_method = "GET", ENV['REQUEST_METHOD']
+      @cgi = CGI.new
+    end
+
+    after :each do
+      ENV['REQUEST_METHOD'] = @old_request_method
+    end
 
-  it "returns ENV['HTTP_USER_AGENT']" do
-    old_value, ENV['HTTP_USER_AGENT'] = ENV['HTTP_USER_AGENT'], "Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10_5_2; de-de) AppleWebKit/527+ (KHTML, like Gecko) Version/3.1 Safari/525.13"
-    begin
-      @cgi.user_agent.should == "Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10_5_2; de-de) AppleWebKit/527+ (KHTML, like Gecko) Version/3.1 Safari/525.13"
-    ensure
-      ENV['HTTP_USER_AGENT'] = old_value
+    it "returns ENV['HTTP_USER_AGENT']" do
+      old_value, ENV['HTTP_USER_AGENT'] = ENV['HTTP_USER_AGENT'], "Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10_5_2; de-de) AppleWebKit/527+ (KHTML, like Gecko) Version/3.1 Safari/525.13"
+      begin
+        @cgi.user_agent.should == "Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10_5_2; de-de) AppleWebKit/527+ (KHTML, like Gecko) Version/3.1 Safari/525.13"
+      ensure
+        ENV['HTTP_USER_AGENT'] = old_value
+      end
     end
   end
 end
diff --git a/spec/ruby/library/cgi/rfc1123_date_spec.rb b/spec/ruby/library/cgi/rfc1123_date_spec.rb
index 6904eeabaa91aa..2641b40e945b6f 100644
--- a/spec/ruby/library/cgi/rfc1123_date_spec.rb
+++ b/spec/ruby/library/cgi/rfc1123_date_spec.rb
@@ -1,10 +1,13 @@
 require_relative '../../spec_helper'
-require 'cgi'
 
-describe "CGI.rfc1123_date when passed Time" do
-  it "returns the passed Time formatted in RFC1123 ('Sat, 01 Dec 2007 15:56:42 GMT')" do
-    input = Time.at(1196524602)
-    expected = 'Sat, 01 Dec 2007 15:56:42 GMT'
-    CGI.rfc1123_date(input).should == expected
+ruby_version_is ""..."3.5" do
+  require 'cgi'
+
+  describe "CGI.rfc1123_date when passed Time" do
+    it "returns the passed Time formatted in RFC1123 ('Sat, 01 Dec 2007 15:56:42 GMT')" do
+      input = Time.at(1196524602)
+      expected = 'Sat, 01 Dec 2007 15:56:42 GMT'
+      CGI.rfc1123_date(input).should == expected
+    end
   end
 end
diff --git a/spec/ruby/library/cgi/unescapeElement_spec.rb b/spec/ruby/library/cgi/unescapeElement_spec.rb
index ae4d50b076e35d..af2fa8a47da9fa 100644
--- a/spec/ruby/library/cgi/unescapeElement_spec.rb
+++ b/spec/ruby/library/cgi/unescapeElement_spec.rb
@@ -1,5 +1,11 @@
 require_relative '../../spec_helper'
-require 'cgi'
+
+ruby_version_is ""..."3.5" do
+  require 'cgi'
+end
+ruby_version_is "3.5" do
+  require 'cgi/escape'
+end
 
 describe "CGI.unescapeElement when passed String, elements, ..." do
   it "unescapes only the tags of the passed elements in the passed String" do
diff --git a/spec/ruby/library/cgi/unescapeHTML_spec.rb b/spec/ruby/library/cgi/unescapeHTML_spec.rb
index 84b30c6aa68d81..e43dcc83e5403e 100644
--- a/spec/ruby/library/cgi/unescapeHTML_spec.rb
+++ b/spec/ruby/library/cgi/unescapeHTML_spec.rb
@@ -1,5 +1,9 @@
 require_relative '../../spec_helper'
-require 'cgi'
+begin
+  require 'cgi/escape'
+rescue LoadError
+  require 'cgi'
+end
 
 describe "CGI.unescapeHTML" do
   it "unescapes '&amp; &lt; &gt; &quot;' to '& < > \"'" do
diff --git a/spec/ruby/library/cgi/unescape_spec.rb b/spec/ruby/library/cgi/unescape_spec.rb
index c593e24b4ac1b3..e750c729213e7c 100644
--- a/spec/ruby/library/cgi/unescape_spec.rb
+++ b/spec/ruby/library/cgi/unescape_spec.rb
@@ -1,6 +1,12 @@
 # -*- encoding: utf-8 -*-
 require_relative '../../spec_helper'
-require 'cgi'
+
+ruby_version_is ""..."3.5" do
+  require 'cgi'
+end
+ruby_version_is "3.5" do
+  require 'cgi/escape'
+end
 
 describe "CGI.unescape" do
   it "url-decodes the passed argument" do
diff --git a/spec/ruby/library/coverage/fixtures/code_with_begin.rb b/spec/ruby/library/coverage/fixtures/code_with_begin.rb
new file mode 100644
index 00000000000000..9a6384e337cf9b
--- /dev/null
+++ b/spec/ruby/library/coverage/fixtures/code_with_begin.rb
@@ -0,0 +1,3 @@
+begin
+  'coverage with begin'
+end
diff --git a/spec/ruby/library/coverage/result_spec.rb b/spec/ruby/library/coverage/result_spec.rb
index 4bcce00cd72ba8..0101eb6a643bce 100644
--- a/spec/ruby/library/coverage/result_spec.rb
+++ b/spec/ruby/library/coverage/result_spec.rb
@@ -6,12 +6,20 @@
     @class_file = fixture __FILE__, 'some_class.rb'
     @config_file = fixture __FILE__, 'start_coverage.rb'
     @eval_code_file = fixture __FILE__, 'eval_code.rb'
+    @with_begin_file = fixture __FILE__, 'code_with_begin.rb'
+  end
+
+  before :each do
+    Coverage.running?.should == false
   end
 
   after :each do
     $LOADED_FEATURES.delete(@class_file)
     $LOADED_FEATURES.delete(@config_file)
     $LOADED_FEATURES.delete(@eval_code_file)
+    $LOADED_FEATURES.delete(@with_begin_file)
+
+    Coverage.result if Coverage.running?
   end
 
   it 'gives the covered files as a hash with arrays of count or nil' do
@@ -26,6 +34,39 @@
     }
   end
 
+  it 'returns results for each mode separately when enabled :all modes' do
+    Coverage.start(:all)
+    require @class_file.chomp('.rb')
+    result = Coverage.result
+
+    result.should == {
+      @class_file => {
+        lines: [
+          nil, nil, 1, nil, nil, 1, nil, nil, 0, nil, nil, nil, nil, nil, nil, nil
+        ],
+        branches: {},
+        methods: {
+          [SomeClass, :some_method, 6, 2, 11, 5] => 0
+        }
+      }
+    }
+  end
+
+  it 'returns results for each mode separately when enabled any mode explicitly' do
+    Coverage.start(lines: true)
+    require @class_file.chomp('.rb')
+    result = Coverage.result
+
+    result.should == {
+      @class_file =>
+        {
+          lines: [
+            nil, nil, 1, nil, nil, 1, nil, nil, 0, nil, nil, nil, nil, nil, nil, nil
+          ]
+        }
+    }
+  end
+
   it 'no requires/loads should give empty hash' do
     Coverage.start
     result = Coverage.result
@@ -65,77 +106,238 @@
     result.should == {}
   end
 
-  ruby_version_is ''...'3.1' do
-    it 'second Coverage.start does nothing' do
-      Coverage.start
-      require @config_file.chomp('.rb')
-      result = Coverage.result
+  it 'does not include the file starting coverage since it is not tracked' do
+    require @config_file.chomp('.rb')
+    Coverage.result.should_not include(@config_file)
+  end
+
+  it 'returns the correct results when eval coverage is enabled' do
+    Coverage.supported?(:eval).should == true
+
+    Coverage.start(lines: true, eval: true)
+    require @eval_code_file.chomp('.rb')
+    result = Coverage.result
 
-      result.should == { @config_file => [1, 1, 1] }
-    end
+    result.should == {
+      @eval_code_file => {
+        lines: [1, nil, 1, nil, 1, 1, nil, nil, nil, nil, 1]
+      }
+    }
   end
 
-  ruby_version_is '3.1' do
-    it 'second Coverage.start give exception' do
-      Coverage.start
-      -> {
-        require @config_file.chomp('.rb')
-      }.should raise_error(RuntimeError, 'coverage measurement is already setup')
-    ensure
-      Coverage.result
-    end
+  it 'returns the correct results when eval coverage is disabled' do
+    Coverage.supported?(:eval).should == true
+
+    Coverage.start(lines: true, eval: false)
+    require @eval_code_file.chomp('.rb')
+    result = Coverage.result
+
+    result.should == {
+      @eval_code_file => {
+        lines: [1, nil, 1, nil, 1, nil, nil, nil, nil, nil, 1]
+      }
+    }
   end
 
-  it 'does not include the file starting coverage since it is not tracked' do
-    require @config_file.chomp('.rb')
-    Coverage.result.should_not include(@config_file)
+  it "disables coverage measurement when stop option is not specified" do
+    Coverage.start
+    require @class_file.chomp('.rb')
+
+    Coverage.result
+    Coverage.running?.should == false
   end
 
-  ruby_version_is '3.1'...'3.2' do
-    it 'returns the correct results when eval is used' do
-      Coverage.start
-      require @eval_code_file.chomp('.rb')
-      result = Coverage.result
+  it "disables coverage measurement when stop: true option is specified" do
+    Coverage.start
+    require @class_file.chomp('.rb')
 
-      result.should == {
-          @eval_code_file => [
-              1, nil, 1, nil, 1, nil, nil, nil, nil, nil, 1
-          ]
-      }
-    end
+    -> {
+      Coverage.result(stop: true)
+    }.should complain(/warning: stop implies clear/)
+
+    Coverage.running?.should == false
   end
 
-  ruby_version_is '3.2' do
-    it 'indicates support for different features' do
-      Coverage.supported?(:lines).should == true
-    end
+  it "does not disable coverage measurement when stop: false option is specified" do
+    Coverage.start
+    require @class_file.chomp('.rb')
 
-    it 'returns the correct results when eval coverage is enabled' do
-      Coverage.supported?(:eval).should == true
+    Coverage.result(stop: false)
+    Coverage.running?.should == true
+  end
 
-      Coverage.start(lines: true, eval: true)
-      require @eval_code_file.chomp('.rb')
-      result = Coverage.result
+  it "does not disable coverage measurement when stop option is not specified but clear: true specified" do
+    Coverage.start
+    require @class_file.chomp('.rb')
 
-      result.should == {
-          @eval_code_file => {
-              lines: [1, nil, 1, nil, 1, 1, nil, nil, nil, nil, 1]
-          }
-      }
-    end
+    Coverage.result(clear: true)
+    Coverage.running?.should == true
+  end
+
+  it "does not disable coverage measurement when stop option is not specified but clear: false specified" do
+    Coverage.start
+    require @class_file.chomp('.rb')
 
-    it 'returns the correct results when eval coverage is enabled' do
-      Coverage.supported?(:eval).should == true
+    Coverage.result(clear: false)
+    Coverage.running?.should == true
+  end
 
-      Coverage.start(lines: true, eval: false)
-      require @eval_code_file.chomp('.rb')
-      result = Coverage.result
+  it "disables coverage measurement when stop: true and clear: true specified" do
+    Coverage.start
+    require @class_file.chomp('.rb')
 
-      result.should == {
-          @eval_code_file => {
-              lines: [1, nil, 1, nil, 1, nil, nil, nil, nil, nil, 1]
-          }
-      }
-    end
+    Coverage.result(stop: true, clear: true)
+    Coverage.running?.should == false
+  end
+
+  it "disables coverage measurement when stop: true and clear: false specified" do
+    Coverage.start
+    require @class_file.chomp('.rb')
+
+    -> {
+      Coverage.result(stop: true, clear: false)
+    }.should complain(/warning: stop implies clear/)
+
+    Coverage.running?.should == false
+  end
+
+  it "does not disable coverage measurement when stop: false and clear: true specified" do
+    Coverage.start
+    require @class_file.chomp('.rb')
+
+    Coverage.result(stop: false, clear: true)
+    Coverage.running?.should == true
+  end
+
+  it "does not disable coverage measurement when stop: false and clear: false specified" do
+    Coverage.start
+    require @class_file.chomp('.rb')
+
+    Coverage.result(stop: false, clear: false)
+    Coverage.running?.should == true
+  end
+
+  it "resets counters (remove them) when stop: true specified but clear option is not specified" do
+    Coverage.start
+    require @class_file.chomp('.rb')
+
+    -> {
+      Coverage.result(stop: true) # clears counters
+    }.should complain(/warning: stop implies clear/)
+
+    Coverage.start
+    Coverage.peek_result.should == {}
+  end
+
+  it "resets counters (remove them) when stop: true and clear: true specified" do
+    Coverage.start
+    require @class_file.chomp('.rb')
+
+    Coverage.result(stop: true, clear: true) # clears counters
+
+    Coverage.start
+    Coverage.peek_result.should == {}
+  end
+
+  it "resets counters (remove them) when stop: true and clear: false specified" do
+    Coverage.start
+    require @class_file.chomp('.rb')
+
+    -> {
+      Coverage.result(stop: true, clear: false) # clears counters
+    }.should complain(/warning: stop implies clear/)
+
+    Coverage.start
+    Coverage.peek_result.should == {}
+  end
+
+  it "resets counters (remove them) when both stop and clear options are not specified" do
+    Coverage.start
+    require @class_file.chomp('.rb')
+
+    Coverage.result # clears counters
+
+    Coverage.start
+    Coverage.peek_result.should == {}
+  end
+
+  it "clears counters (sets 0 values) when stop is not specified but clear: true specified" do
+    Coverage.start
+    require @class_file.chomp('.rb')
+
+    Coverage.result(clear: true) # clears counters
+
+    Coverage.peek_result.should == {
+      @class_file => [
+        nil, nil, 0, nil, nil, 0, nil, nil, 0, nil, nil, nil, nil, nil, nil, nil
+      ]
+    }
+  end
+
+  it "does not clear counters when stop is not specified but clear: false specified" do
+    Coverage.start
+    require @class_file.chomp('.rb')
+
+    result = Coverage.result(clear: false) # doesn't clear counters
+    result.should == {
+      @class_file => [
+        nil, nil, 1, nil, nil, 1, nil, nil, 0, nil, nil, nil, nil, nil, nil, nil
+      ]
+    }
+
+    Coverage.peek_result.should == result
+  end
+
+  it "does not clear counters when stop: false and clear is not specified" do
+    Coverage.start
+    require @class_file.chomp('.rb')
+
+    result = Coverage.result(stop: false) # doesn't clear counters
+    result.should == {
+      @class_file => [
+        nil, nil, 1, nil, nil, 1, nil, nil, 0, nil, nil, nil, nil, nil, nil, nil
+      ]
+    }
+
+    Coverage.peek_result.should == result
+  end
+
+  it "clears counters (sets 0 values) when stop: false and clear: true specified" do
+    Coverage.start
+    require @class_file.chomp('.rb')
+
+    Coverage.result(stop: false, clear: true) # clears counters
+
+    Coverage.peek_result.should == {
+      @class_file => [
+        nil, nil, 0, nil, nil, 0, nil, nil, 0, nil, nil, nil, nil, nil, nil, nil
+      ]
+    }
+  end
+
+  it "does not clear counters when stop: false and clear: false specified" do
+    Coverage.start
+    require @class_file.chomp('.rb')
+
+    result = Coverage.result(stop: false, clear: false) # doesn't clear counters
+    result.should == {
+      @class_file => [
+        nil, nil, 1, nil, nil, 1, nil, nil, 0, nil, nil, nil, nil, nil, nil, nil
+      ]
+    }
+
+    Coverage.peek_result.should == result
+  end
+
+  it 'covers 100% lines with begin' do
+    Coverage.start
+    require @with_begin_file.chomp('.rb')
+    result = Coverage.result
+
+    result.should == {
+      @with_begin_file => [
+        nil, 1, nil
+      ]
+    }
   end
 end
diff --git a/spec/ruby/library/coverage/start_spec.rb b/spec/ruby/library/coverage/start_spec.rb
index a993abbf4ec732..c921b854018392 100644
--- a/spec/ruby/library/coverage/start_spec.rb
+++ b/spec/ruby/library/coverage/start_spec.rb
@@ -2,11 +2,86 @@
 require 'coverage'
 
 describe 'Coverage.start' do
-  ruby_version_is '3.2' do
-    it "can measure coverage within eval" do
-      Coverage.start(lines: true, eval: true)
-      eval("Object.new\n"*3, binding, "test.rb", 1)
-      Coverage.result["test.rb"].should == {lines: [1, 1, 1]}
-    end
+  before :each do
+    Coverage.should_not.running?
+  end
+
+  after :each do
+    Coverage.result(stop: true, clear: true) if Coverage.running?
+  end
+
+  it "enables the coverage measurement" do
+    Coverage.start
+    Coverage.should.running?
+  end
+
+  it "returns nil" do
+    Coverage.start.should == nil
+  end
+
+  it 'raises error when repeated Coverage.start call happens' do
+    Coverage.start
+
+    -> {
+      Coverage.start
+    }.should raise_error(RuntimeError, 'coverage measurement is already setup')
+  end
+
+  it "accepts :all optional argument" do
+    Coverage.start(:all)
+    Coverage.should.running?
+  end
+
+  it "accepts lines: optional keyword argument" do
+    Coverage.start(lines: true)
+    Coverage.should.running?
+  end
+
+  it "accepts branches: optional keyword argument" do
+    Coverage.start(branches: true)
+    Coverage.should.running?
+  end
+
+  it "accepts methods: optional keyword argument" do
+    Coverage.start(methods: true)
+    Coverage.should.running?
+  end
+
+  it "accepts eval: optional keyword argument" do
+    Coverage.start(eval: true)
+    Coverage.should.running?
+  end
+
+  it "accepts oneshot_lines: optional keyword argument" do
+    Coverage.start(oneshot_lines: true)
+    Coverage.should.running?
+  end
+
+  it "ignores unknown keyword arguments" do
+    Coverage.start(foo: true)
+    Coverage.should.running?
+  end
+
+  it "expects a Hash if not passed :all" do
+    -> {
+      Coverage.start(42)
+    }.should raise_error(TypeError, "no implicit conversion of Integer into Hash")
+  end
+
+  it "does not accept both lines: and oneshot_lines: keyword arguments" do
+    -> {
+      Coverage.start(lines: true, oneshot_lines: true)
+    }.should raise_error(RuntimeError, "cannot enable lines and oneshot_lines simultaneously")
+  end
+
+  it "enables the coverage measurement if passed options with `false` value" do
+    Coverage.start(lines: false, branches: false, methods: false, eval: false, oneshot_lines: false)
+    Coverage.should.running?
+  end
+
+  it "measures coverage within eval" do
+    Coverage.start(lines: true, eval: true)
+    eval("Object.new\n"*3, binding, "test.rb", 1)
+    Coverage.result["test.rb"].should == {lines: [1, 1, 1]}
   end
 end
diff --git a/spec/ruby/library/coverage/supported_spec.rb b/spec/ruby/library/coverage/supported_spec.rb
index 78b3784ee0a6ce..9226548c1f5597 100644
--- a/spec/ruby/library/coverage/supported_spec.rb
+++ b/spec/ruby/library/coverage/supported_spec.rb
@@ -2,31 +2,29 @@
 require 'coverage'
 
 describe "Coverage.supported?" do
-  ruby_version_is "3.2" do
-    it "returns true or false if coverage measurement is supported for the given mode" do
-      [true, false].should.include?(Coverage.supported?(:lines))
-      [true, false].should.include?(Coverage.supported?(:branches))
-      [true, false].should.include?(Coverage.supported?(:methods))
-      [true, false].should.include?(Coverage.supported?(:eval))
-    end
+  it "returns true or false if coverage measurement is supported for the given mode" do
+    [true, false].should.include?(Coverage.supported?(:lines))
+    [true, false].should.include?(Coverage.supported?(:branches))
+    [true, false].should.include?(Coverage.supported?(:methods))
+    [true, false].should.include?(Coverage.supported?(:eval))
+  end
 
-    it "returns false for not existing modes" do
-      Coverage.supported?(:foo).should == false
-      Coverage.supported?(:bar).should == false
-    end
+  it "returns false for not existing modes" do
+    Coverage.supported?(:foo).should == false
+    Coverage.supported?(:bar).should == false
+  end
 
-    it "raise TypeError if argument is not Symbol" do
-      -> {
-        Coverage.supported?("lines")
-      }.should raise_error(TypeError, "wrong argument type String (expected Symbol)")
+  it "raise TypeError if argument is not Symbol" do
+    -> {
+      Coverage.supported?("lines")
+    }.should raise_error(TypeError, "wrong argument type String (expected Symbol)")
 
-      -> {
-        Coverage.supported?([])
-      }.should raise_error(TypeError, "wrong argument type Array (expected Symbol)")
+    -> {
+      Coverage.supported?([])
+    }.should raise_error(TypeError, "wrong argument type Array (expected Symbol)")
 
-      -> {
-        Coverage.supported?(1)
-      }.should raise_error(TypeError, "wrong argument type Integer (expected Symbol)")
-    end
+    -> {
+      Coverage.supported?(1)
+    }.should raise_error(TypeError, "wrong argument type Integer (expected Symbol)")
   end
 end
diff --git a/spec/ruby/library/csv/generate_spec.rb b/spec/ruby/library/csv/generate_spec.rb
index 0a1e3d9604fa7b..b45e2eb95ba262 100644
--- a/spec/ruby/library/csv/generate_spec.rb
+++ b/spec/ruby/library/csv/generate_spec.rb
@@ -21,7 +21,7 @@
   end
 
   it "appends and returns the argument itself" do
-    str = ""
+    str = +""
     csv_str = CSV.generate(str) do |csv|
       csv.add_row [1, 2, 3]
       csv << [4, 5, 6]
diff --git a/spec/ruby/library/date/accessor_spec.rb b/spec/ruby/library/date/accessor_spec.rb
index 68a2d9f3decbb6..74ed0e9c217c28 100644
--- a/spec/ruby/library/date/accessor_spec.rb
+++ b/spec/ruby/library/date/accessor_spec.rb
@@ -38,7 +38,7 @@
 end
 
 describe "Date#yday" do
-  it "determines the year" do
+  it "determines the day of the year" do
     Date.civil(2007,  1, 17).yday.should == 17
     Date.civil(2008, 10, 28).yday.should == 302
   end
diff --git a/spec/ruby/library/date/deconstruct_keys_spec.rb b/spec/ruby/library/date/deconstruct_keys_spec.rb
index 92579e35c7c8e4..b9dd6b88162d1f 100644
--- a/spec/ruby/library/date/deconstruct_keys_spec.rb
+++ b/spec/ruby/library/date/deconstruct_keys_spec.rb
@@ -2,43 +2,41 @@
 require 'date'
 date_version = defined?(Date::VERSION) ? Date::VERSION : '3.1.0'
 
-version_is date_version, "3.3" do #ruby_version_is "3.2" do
-  describe "Date#deconstruct_keys" do
-    it "returns whole hash for nil as an argument" do
-      d = Date.new(2022, 10, 5)
-      d.deconstruct_keys(nil).should == { year: 2022, month: 10, day: 5, yday: 278, wday: 3 }
-    end
-
-    it "returns only specified keys" do
-      d = Date.new(2022, 10, 5)
-      d.deconstruct_keys([:year, :month]).should == { year: 2022, month: 10 }
-    end
-
-    it "requires one argument" do
-      -> {
-        Date.new(2022, 10, 5).deconstruct_keys
-      }.should raise_error(ArgumentError)
-    end
-
-    it "it raises error when argument is neither nil nor array" do
-      d = Date.new(2022, 10, 5)
-
-      -> { d.deconstruct_keys(1) }.should raise_error(TypeError, "wrong argument type Integer (expected Array or nil)")
-      -> { d.deconstruct_keys("asd") }.should raise_error(TypeError, "wrong argument type String (expected Array or nil)")
-      -> { d.deconstruct_keys(:x) }.should raise_error(TypeError, "wrong argument type Symbol (expected Array or nil)")
-      -> { d.deconstruct_keys({}) }.should raise_error(TypeError, "wrong argument type Hash (expected Array or nil)")
-    end
-
-    it "returns {} when passed []" do
-      Date.new(2022, 10, 5).deconstruct_keys([]).should == {}
-    end
-
-    it "ignores non-Symbol keys" do
-      Date.new(2022, 10, 5).deconstruct_keys(['year', []]).should == {}
-    end
-
-    it "ignores not existing Symbol keys" do
-      Date.new(2022, 10, 5).deconstruct_keys([:year, :a]).should == { year: 2022 }
-    end
+describe "Date#deconstruct_keys" do
+  it "returns whole hash for nil as an argument" do
+    d = Date.new(2022, 10, 5)
+    d.deconstruct_keys(nil).should == { year: 2022, month: 10, day: 5, yday: 278, wday: 3 }
+  end
+
+  it "returns only specified keys" do
+    d = Date.new(2022, 10, 5)
+    d.deconstruct_keys([:year, :month]).should == { year: 2022, month: 10 }
+  end
+
+  it "requires one argument" do
+    -> {
+      Date.new(2022, 10, 5).deconstruct_keys
+    }.should raise_error(ArgumentError)
+  end
+
+  it "it raises error when argument is neither nil nor array" do
+    d = Date.new(2022, 10, 5)
+
+    -> { d.deconstruct_keys(1) }.should raise_error(TypeError, "wrong argument type Integer (expected Array or nil)")
+    -> { d.deconstruct_keys("asd") }.should raise_error(TypeError, "wrong argument type String (expected Array or nil)")
+    -> { d.deconstruct_keys(:x) }.should raise_error(TypeError, "wrong argument type Symbol (expected Array or nil)")
+    -> { d.deconstruct_keys({}) }.should raise_error(TypeError, "wrong argument type Hash (expected Array or nil)")
+  end
+
+  it "returns {} when passed []" do
+    Date.new(2022, 10, 5).deconstruct_keys([]).should == {}
+  end
+
+  it "ignores non-Symbol keys" do
+    Date.new(2022, 10, 5).deconstruct_keys(['year', []]).should == {}
+  end
+
+  it "ignores not existing Symbol keys" do
+    Date.new(2022, 10, 5).deconstruct_keys([:year, :a]).should == { year: 2022 }
   end
 end
diff --git a/spec/ruby/library/date/iso8601_spec.rb b/spec/ruby/library/date/iso8601_spec.rb
index a29652014ec2d1..af66845a6b4f81 100644
--- a/spec/ruby/library/date/iso8601_spec.rb
+++ b/spec/ruby/library/date/iso8601_spec.rb
@@ -22,6 +22,18 @@
     d.should == Date.civil(-4712, 1, 1)
   end
 
+  it "raises a Date::Error if the argument is a invalid Date" do
+    -> {
+      Date.iso8601('invalid')
+    }.should raise_error(Date::Error, "invalid date")
+  end
+
+  it "raises a Date::Error when passed a nil" do
+    -> {
+      Date.iso8601(nil)
+    }.should raise_error(Date::Error, "invalid date")
+  end
+
   it "raises a TypeError when passed an Object" do
     -> { Date.iso8601(Object.new) }.should raise_error(TypeError)
   end
@@ -32,4 +44,13 @@
     h = Date._iso8601('invalid')
     h.should == {}
   end
+
+  it "returns an empty hash if the argument is nil" do
+    h = Date._iso8601(nil)
+    h.should == {}
+  end
+
+  it "raises a TypeError when passed an Object" do
+    -> { Date._iso8601(Object.new) }.should raise_error(TypeError)
+  end
 end
diff --git a/spec/ruby/library/date/mon_spec.rb b/spec/ruby/library/date/mon_spec.rb
index 724e7d6564eeda..616d72cf882492 100644
--- a/spec/ruby/library/date/mon_spec.rb
+++ b/spec/ruby/library/date/mon_spec.rb
@@ -1,6 +1,7 @@
 require_relative '../../spec_helper'
+require_relative 'shared/month'
 require 'date'
 
 describe "Date#mon" do
-  it "needs to be reviewed for spec completeness"
+  it_behaves_like :date_month, :mon
 end
diff --git a/spec/ruby/library/date/month_spec.rb b/spec/ruby/library/date/month_spec.rb
index e040f9a94c9fe0..f493ec81192fff 100644
--- a/spec/ruby/library/date/month_spec.rb
+++ b/spec/ruby/library/date/month_spec.rb
@@ -1,9 +1,7 @@
 require_relative '../../spec_helper'
+require_relative 'shared/month'
 require 'date'
 
 describe "Date#month" do
-  it "returns the month" do
-    m = Date.new(2000, 7, 1).month
-    m.should == 7
-  end
+  it_behaves_like :date_month, :month
 end
diff --git a/spec/ruby/library/date/shared/month.rb b/spec/ruby/library/date/shared/month.rb
new file mode 100644
index 00000000000000..5fcb2cbeb0cead
--- /dev/null
+++ b/spec/ruby/library/date/shared/month.rb
@@ -0,0 +1,6 @@
+describe :date_month, shared: true do
+  it "returns the month" do
+    m = Date.new(2000, 7, 1).send(@method)
+    m.should == 7
+  end
+end
diff --git a/spec/ruby/library/date/shared/parse.rb b/spec/ruby/library/date/shared/parse.rb
index 1015285e048c07..40af908386c930 100644
--- a/spec/ruby/library/date/shared/parse.rb
+++ b/spec/ruby/library/date/shared/parse.rb
@@ -13,7 +13,7 @@
     d.day.should == 23
   end
 
-  it "can parse a 'mmm DD YYYY' string into a Date object" do
+  it "can parse a 'DD mmm YYYY' string into a Date object" do
     d = Date.parse("23#{@sep}feb#{@sep}2008")
     d.year.should == 2008
     d.month.should == 2
@@ -42,7 +42,7 @@
     d.should == Date.civil(2005, 11, 5)
   end
 
-  it "can parse a year, day and month name into a Date object" do
+  it "can parse a day, month name and year into a Date object" do
     d = Date.parse("5th#{@sep}november#{@sep}2005")
     d.should == Date.civil(2005, 11, 5)
   end
diff --git a/spec/ruby/library/date/shared/parse_eu.rb b/spec/ruby/library/date/shared/parse_eu.rb
index ecb15e3c0e4f76..3819524a571ef4 100644
--- a/spec/ruby/library/date/shared/parse_eu.rb
+++ b/spec/ruby/library/date/shared/parse_eu.rb
@@ -7,28 +7,28 @@
     d.day.should == 1
   end
 
-  it "can parse a MM-DD-YYYY string into a Date object" do
+  it "can parse a DD-MM-YYYY string into a Date object" do
     d = Date.parse("10#{@sep}01#{@sep}2007")
     d.year.should == 2007
     d.month.should == 1
     d.day.should == 10
   end
 
-  it "can parse a MM-DD-YY string into a Date object" do
+  it "can parse a YY-MM-DD string into a Date object" do
     d = Date.parse("10#{@sep}01#{@sep}07")
     d.year.should == 2010
     d.month.should == 1
     d.day.should == 7
   end
 
-  it "can parse a MM-DD-YY string into a Date object NOT using the year digits as 20XX" do
+  it "can parse a YY-MM-DD string into a Date object NOT using the year digits as 20XX" do
     d = Date.parse("10#{@sep}01#{@sep}07", false)
     d.year.should == 10
     d.month.should == 1
     d.day.should == 7
   end
 
-  it "can parse a MM-DD-YY string into a Date object using the year digits as 20XX" do
+  it "can parse a YY-MM-DD string into a Date object using the year digits as 20XX" do
     d = Date.parse("10#{@sep}01#{@sep}07", true)
     d.year.should == 2010
     d.month.should == 1
diff --git a/spec/ruby/library/date/shared/parse_us.rb b/spec/ruby/library/date/shared/parse_us.rb
index 7be62b1af1fc2e..17e2fc96c18a65 100644
--- a/spec/ruby/library/date/shared/parse_us.rb
+++ b/spec/ruby/library/date/shared/parse_us.rb
@@ -6,28 +6,28 @@
     d.day.should == 1
   end
 
-  it "parses a MM#{@sep}DD#{@sep}YYYY string into a Date object" do
+  it "parses a DD#{@sep}MM#{@sep}YYYY string into a Date object" do
     d = Date.parse("10#{@sep}01#{@sep}2007")
     d.year.should == 2007
     d.month.should == 1
     d.day.should == 10
   end
 
-  it "parses a MM#{@sep}DD#{@sep}YY string into a Date object" do
+  it "parses a YY#{@sep}MM#{@sep}DD string into a Date object" do
     d = Date.parse("10#{@sep}01#{@sep}07")
     d.year.should == 2010
     d.month.should == 1
     d.day.should == 7
   end
 
-  it "parses a MM#{@sep}DD#{@sep}YY string into a Date object NOT using the year digits as 20XX" do
+  it "parses a YY#{@sep}MM#{@sep}DD string into a Date object NOT using the year digits as 20XX" do
     d = Date.parse("10#{@sep}01#{@sep}07", false)
     d.year.should == 10
     d.month.should == 1
     d.day.should == 7
   end
 
-  it "parses a MM#{@sep}DD#{@sep}YY string into a Date object using the year digits as 20XX" do
+  it "parses a YY#{@sep}MM#{@sep}DD string into a Date object using the year digits as 20XX" do
     d = Date.parse("10#{@sep}01#{@sep}07", true)
     d.year.should == 2010
     d.month.should == 1
diff --git a/spec/ruby/library/date/strftime_spec.rb b/spec/ruby/library/date/strftime_spec.rb
index b5232a2073fa6f..1b93a8d1b21688 100644
--- a/spec/ruby/library/date/strftime_spec.rb
+++ b/spec/ruby/library/date/strftime_spec.rb
@@ -23,19 +23,9 @@
     @date.strftime("%Z").should == "+00:00"
   end
 
-  # %v is %e-%b-%Y for Date/DateTime
-  version_is date_version, ""..."3.2" do #ruby_version_is ""..."3.1" do
-    it "should be able to show the commercial week" do
-      @date.strftime("%v").should == " 9-Apr-2000"
-      @date.strftime("%v").should == @date.strftime('%e-%b-%Y')
-    end
-  end
-
-  version_is date_version, "3.2" do #ruby_version_is "3.1" do
-    it "should be able to show the commercial week" do
-      @date.strftime("%v").should == " 9-APR-2000"
-      @date.strftime("%v").should != @date.strftime('%e-%b-%Y')
-    end
+  it "should be able to show the commercial week" do
+    @date.strftime("%v").should == " 9-APR-2000"
+    @date.strftime("%v").should != @date.strftime('%e-%b-%Y')
   end
 
   # additional conversion specifiers only in Date/DateTime
diff --git a/spec/ruby/library/time/to_date_spec.rb b/spec/ruby/library/date/time/to_date_spec.rb
similarity index 97%
rename from spec/ruby/library/time/to_date_spec.rb
rename to spec/ruby/library/date/time/to_date_spec.rb
index baeafe0847a7d2..f9132da2890e92 100644
--- a/spec/ruby/library/time/to_date_spec.rb
+++ b/spec/ruby/library/date/time/to_date_spec.rb
@@ -1,5 +1,5 @@
 
-require_relative '../../spec_helper'
+require_relative '../../../spec_helper'
 require 'time'
 
 describe "Time#to_date" do
diff --git a/spec/ruby/library/date/yday_spec.rb b/spec/ruby/library/date/yday_spec.rb
index cfb174a4c25fd6..7dd42e52a54f82 100644
--- a/spec/ruby/library/date/yday_spec.rb
+++ b/spec/ruby/library/date/yday_spec.rb
@@ -1,6 +1,7 @@
 require_relative '../../spec_helper'
+require_relative '../../shared/time/yday'
 require 'date'
 
 describe "Date#yday" do
-  it "needs to be reviewed for spec completeness"
+  it_behaves_like :time_yday, -> year, month, day { Date.new(year, month, day).yday }
 end
diff --git a/spec/ruby/library/datetime/deconstruct_keys_spec.rb b/spec/ruby/library/datetime/deconstruct_keys_spec.rb
index 77ceaa51c4b9bd..154c024a2397c6 100644
--- a/spec/ruby/library/datetime/deconstruct_keys_spec.rb
+++ b/spec/ruby/library/datetime/deconstruct_keys_spec.rb
@@ -2,45 +2,43 @@
 require 'date'
 date_version = defined?(Date::VERSION) ? Date::VERSION : '3.1.0'
 
-version_is date_version, "3.3" do #ruby_version_is "3.2" do
-  describe "DateTime#deconstruct_keys" do
-    it "returns whole hash for nil as an argument" do
-      d = DateTime.new(2022, 10, 5, 13, 30)
-      res = { year: 2022, month: 10, day: 5, yday: 278, wday: 3, hour: 13,
-              min: 30, sec: 0, sec_fraction: (0/1), zone: "+00:00" }
-      d.deconstruct_keys(nil).should == res
-    end
-
-    it "returns only specified keys" do
-      d = DateTime.new(2022, 10, 5, 13, 39)
-      d.deconstruct_keys([:zone, :hour]).should == { zone: "+00:00", hour: 13 }
-    end
-
-    it "requires one argument" do
-      -> {
-        DateTime.new(2022, 10, 5, 13, 30).deconstruct_keys
-      }.should raise_error(ArgumentError)
-    end
-
-    it "it raises error when argument is neither nil nor array" do
-      d = DateTime.new(2022, 10, 5, 13, 30)
-
-      -> { d.deconstruct_keys(1) }.should raise_error(TypeError, "wrong argument type Integer (expected Array or nil)")
-      -> { d.deconstruct_keys("asd") }.should raise_error(TypeError, "wrong argument type String (expected Array or nil)")
-      -> { d.deconstruct_keys(:x) }.should raise_error(TypeError, "wrong argument type Symbol (expected Array or nil)")
-      -> { d.deconstruct_keys({}) }.should raise_error(TypeError, "wrong argument type Hash (expected Array or nil)")
-    end
-
-    it "returns {} when passed []" do
-      DateTime.new(2022, 10, 5, 13, 30).deconstruct_keys([]).should == {}
-    end
-
-    it "ignores non-Symbol keys" do
-      DateTime.new(2022, 10, 5, 13, 30).deconstruct_keys(['year', []]).should == {}
-    end
-
-    it "ignores not existing Symbol keys" do
-      DateTime.new(2022, 10, 5, 13, 30).deconstruct_keys([:year, :a]).should == { year: 2022 }
-    end
+describe "DateTime#deconstruct_keys" do
+  it "returns whole hash for nil as an argument" do
+    d = DateTime.new(2022, 10, 5, 13, 30)
+    res = { year: 2022, month: 10, day: 5, yday: 278, wday: 3, hour: 13,
+            min: 30, sec: 0, sec_fraction: (0/1), zone: "+00:00" }
+    d.deconstruct_keys(nil).should == res
+  end
+
+  it "returns only specified keys" do
+    d = DateTime.new(2022, 10, 5, 13, 39)
+    d.deconstruct_keys([:zone, :hour]).should == { zone: "+00:00", hour: 13 }
+  end
+
+  it "requires one argument" do
+    -> {
+      DateTime.new(2022, 10, 5, 13, 30).deconstruct_keys
+    }.should raise_error(ArgumentError)
+  end
+
+  it "it raises error when argument is neither nil nor array" do
+    d = DateTime.new(2022, 10, 5, 13, 30)
+
+    -> { d.deconstruct_keys(1) }.should raise_error(TypeError, "wrong argument type Integer (expected Array or nil)")
+    -> { d.deconstruct_keys("asd") }.should raise_error(TypeError, "wrong argument type String (expected Array or nil)")
+    -> { d.deconstruct_keys(:x) }.should raise_error(TypeError, "wrong argument type Symbol (expected Array or nil)")
+    -> { d.deconstruct_keys({}) }.should raise_error(TypeError, "wrong argument type Hash (expected Array or nil)")
+  end
+
+  it "returns {} when passed []" do
+    DateTime.new(2022, 10, 5, 13, 30).deconstruct_keys([]).should == {}
+  end
+
+  it "ignores non-Symbol keys" do
+    DateTime.new(2022, 10, 5, 13, 30).deconstruct_keys(['year', []]).should == {}
+  end
+
+  it "ignores not existing Symbol keys" do
+    DateTime.new(2022, 10, 5, 13, 30).deconstruct_keys([:year, :a]).should == { year: 2022 }
   end
 end
diff --git a/spec/ruby/library/datetime/rfc2822_spec.rb b/spec/ruby/library/datetime/rfc2822_spec.rb
index 70bfca60b4b351..83f7fa8d5b19c1 100644
--- a/spec/ruby/library/datetime/rfc2822_spec.rb
+++ b/spec/ruby/library/datetime/rfc2822_spec.rb
@@ -3,4 +3,8 @@
 
 describe "DateTime.rfc2822" do
   it "needs to be reviewed for spec completeness"
+
+  it "raises DateError if passed nil" do
+    -> { DateTime.rfc2822(nil) }.should raise_error(Date::Error, "invalid date")
+  end
 end
diff --git a/spec/ruby/library/datetime/strftime_spec.rb b/spec/ruby/library/datetime/strftime_spec.rb
index abb0838e8e84d6..a07cc9c1aa1cfe 100644
--- a/spec/ruby/library/datetime/strftime_spec.rb
+++ b/spec/ruby/library/datetime/strftime_spec.rb
@@ -33,19 +33,9 @@
     @time.strftime("%Z").should == "+00:00"
   end
 
-  # %v is %e-%b-%Y for Date/DateTime
-  version_is date_version, ""..."3.2" do #ruby_version_is ""..."3.1" do
-    it "should be able to show the commercial week" do
-      @time.strftime("%v").should == " 3-Feb-2001"
-      @time.strftime("%v").should == @time.strftime('%e-%b-%Y')
-    end
-  end
-
-  version_is date_version, "3.2" do #ruby_version_is "3.1" do
-    it "should be able to show the commercial week" do
-      @time.strftime("%v").should == " 3-FEB-2001"
-      @time.strftime("%v").should != @time.strftime('%e-%b-%Y')
-    end
+  it "should be able to show the commercial week" do
+    @time.strftime("%v").should == " 3-FEB-2001"
+    @time.strftime("%v").should != @time.strftime('%e-%b-%Y')
   end
 
   # additional conversion specifiers only in Date/DateTime
diff --git a/spec/ruby/library/datetime/time/to_datetime_spec.rb b/spec/ruby/library/datetime/time/to_datetime_spec.rb
new file mode 100644
index 00000000000000..5589725238156a
--- /dev/null
+++ b/spec/ruby/library/datetime/time/to_datetime_spec.rb
@@ -0,0 +1,40 @@
+require_relative '../../../spec_helper'
+require 'time'
+require 'date'
+date_version = defined?(Date::VERSION) ? Date::VERSION : '3.1.0'
+
+describe "Time#to_datetime" do
+  it "returns a DateTime representing the same instant" do
+    time = Time.utc(2012, 12, 31, 23, 58, 59)
+    datetime = time.to_datetime
+    datetime.year.should == 2012
+    datetime.month.should == 12
+    datetime.day.should == 31
+    datetime.hour.should == 23
+    datetime.min.should == 58
+    datetime.sec.should == 59
+  end
+
+  it "returns a DateTime representing the same instant before Gregorian" do
+    time = Time.utc(1582, 10, 14, 23, 58, 59)
+    datetime = time.to_datetime
+    datetime.year.should == 1582
+    datetime.month.should == 10
+    datetime.day.should == 4
+    datetime.hour.should == 23
+    datetime.min.should == 58
+    datetime.sec.should == 59
+  end
+
+  it "roundtrips" do
+    time = Time.utc(3, 12, 31, 23, 58, 59)
+    datetime = time.to_datetime
+    datetime.to_time.utc.should == time
+  end
+
+  it "yields a DateTime with the default Calendar reform day" do
+    Time.utc(1582, 10,  4, 1, 2, 3).to_datetime.start.should == Date::ITALY
+    Time.utc(1582, 10, 14, 1, 2, 3).to_datetime.start.should == Date::ITALY
+    Time.utc(1582, 10, 15, 1, 2, 3).to_datetime.start.should == Date::ITALY
+  end
+end
diff --git a/spec/ruby/library/datetime/to_time_spec.rb b/spec/ruby/library/datetime/to_time_spec.rb
index 09e6192e7faab0..58bb363653ba56 100644
--- a/spec/ruby/library/datetime/to_time_spec.rb
+++ b/spec/ruby/library/datetime/to_time_spec.rb
@@ -19,17 +19,15 @@
     time.sec.should == 59
   end
 
-  version_is date_version, '3.2.3' do #ruby_version_is "3.2" do
-    it "returns a Time representing the same instant before Gregorian" do
-      datetime = DateTime.civil(1582, 10, 4, 23, 58, 59)
-      time = datetime.to_time.utc
-      time.year.should == 1582
-      time.month.should == 10
-      time.day.should == 14
-      time.hour.should == 23
-      time.min.should == 58
-      time.sec.should == 59
-    end
+  it "returns a Time representing the same instant before Gregorian" do
+    datetime = DateTime.civil(1582, 10, 4, 23, 58, 59)
+    time = datetime.to_time.utc
+    time.year.should == 1582
+    time.month.should == 10
+    time.day.should == 14
+    time.hour.should == 23
+    time.min.should == 58
+    time.sec.should == 59
   end
 
   it "preserves the same time regardless of local time or zone" do
diff --git a/spec/ruby/library/datetime/yday_spec.rb b/spec/ruby/library/datetime/yday_spec.rb
new file mode 100644
index 00000000000000..08a72c6480fef0
--- /dev/null
+++ b/spec/ruby/library/datetime/yday_spec.rb
@@ -0,0 +1,7 @@
+require_relative '../../spec_helper'
+require_relative '../../shared/time/yday'
+require 'date'
+
+describe "DateTime#yday" do
+  it_behaves_like :time_yday, -> year, month, day { DateTime.new(year, month, day).yday }
+end
diff --git a/spec/ruby/library/digest/instance/shared/update.rb b/spec/ruby/library/digest/instance/shared/update.rb
index dccc8f80dfd693..17779e54a48fe5 100644
--- a/spec/ruby/library/digest/instance/shared/update.rb
+++ b/spec/ruby/library/digest/instance/shared/update.rb
@@ -3,6 +3,6 @@
     c = Class.new do
       include Digest::Instance
     end
-    -> { c.new.update("test") }.should raise_error(RuntimeError)
+    -> { c.new.send(@method, "test") }.should raise_error(RuntimeError)
   end
 end
diff --git a/spec/ruby/library/digest/md5/append_spec.rb b/spec/ruby/library/digest/md5/append_spec.rb
index a7f841c8833772..0abdc074a14c03 100644
--- a/spec/ruby/library/digest/md5/append_spec.rb
+++ b/spec/ruby/library/digest/md5/append_spec.rb
@@ -3,5 +3,5 @@
 require_relative 'shared/update'
 
 describe "Digest::MD5#<<" do
- it_behaves_like :md5_update, :<<
+  it_behaves_like :md5_update, :<<
 end
diff --git a/spec/ruby/library/digest/md5/shared/constants.rb b/spec/ruby/library/digest/md5/shared/constants.rb
index e807b96f9fc449..664dd18e9c930c 100644
--- a/spec/ruby/library/digest/md5/shared/constants.rb
+++ b/spec/ruby/library/digest/md5/shared/constants.rb
@@ -1,4 +1,4 @@
-# -*- encoding: binary -*-
+# encoding: binary
 require 'digest/md5'
 
 module MD5Constants
diff --git a/spec/ruby/library/digest/sha1/shared/constants.rb b/spec/ruby/library/digest/sha1/shared/constants.rb
index 169438747f4642..d77c05a968186d 100644
--- a/spec/ruby/library/digest/sha1/shared/constants.rb
+++ b/spec/ruby/library/digest/sha1/shared/constants.rb
@@ -1,4 +1,4 @@
-# -*- encoding: binary -*-
+# encoding: binary
 
 require 'digest/sha1'
 
diff --git a/spec/ruby/library/digest/sha256/append_spec.rb b/spec/ruby/library/digest/sha256/append_spec.rb
index 9ca3496afce932..ab594c105f3b8c 100644
--- a/spec/ruby/library/digest/sha256/append_spec.rb
+++ b/spec/ruby/library/digest/sha256/append_spec.rb
@@ -3,5 +3,5 @@
 require_relative 'shared/update'
 
 describe "Digest::SHA256#<<" do
- it_behaves_like :sha256_update, :<<
+  it_behaves_like :sha256_update, :<<
 end
diff --git a/spec/ruby/library/digest/sha256/shared/constants.rb b/spec/ruby/library/digest/sha256/shared/constants.rb
index 351679f34402a1..afe8f11426a498 100644
--- a/spec/ruby/library/digest/sha256/shared/constants.rb
+++ b/spec/ruby/library/digest/sha256/shared/constants.rb
@@ -1,4 +1,4 @@
-# -*- encoding: binary -*-
+# encoding: binary
 
 require 'digest/sha2'
 
diff --git a/spec/ruby/library/digest/sha384/append_spec.rb b/spec/ruby/library/digest/sha384/append_spec.rb
index 2bc0c5b90b21fd..94c036cc3ffcb1 100644
--- a/spec/ruby/library/digest/sha384/append_spec.rb
+++ b/spec/ruby/library/digest/sha384/append_spec.rb
@@ -3,5 +3,5 @@
 require_relative 'shared/update'
 
 describe "Digest::SHA384#<<" do
- it_behaves_like :sha384_update, :<<
+  it_behaves_like :sha384_update, :<<
 end
diff --git a/spec/ruby/library/digest/sha384/shared/constants.rb b/spec/ruby/library/digest/sha384/shared/constants.rb
index 2050f03f2bc601..a78d571d26be7d 100644
--- a/spec/ruby/library/digest/sha384/shared/constants.rb
+++ b/spec/ruby/library/digest/sha384/shared/constants.rb
@@ -1,4 +1,4 @@
-# -*- encoding: binary -*-
+# encoding: binary
 
 require 'digest/sha2'
 
diff --git a/spec/ruby/library/digest/sha512/append_spec.rb b/spec/ruby/library/digest/sha512/append_spec.rb
index e5f84b56f454ab..9106e9685da3fc 100644
--- a/spec/ruby/library/digest/sha512/append_spec.rb
+++ b/spec/ruby/library/digest/sha512/append_spec.rb
@@ -3,5 +3,5 @@
 require_relative 'shared/update'
 
 describe "Digest::SHA512#<<" do
- it_behaves_like :sha512_update, :<<
+  it_behaves_like :sha512_update, :<<
 end
diff --git a/spec/ruby/library/digest/sha512/shared/constants.rb b/spec/ruby/library/digest/sha512/shared/constants.rb
index 2765a1ec16cb65..91787381ee801d 100644
--- a/spec/ruby/library/digest/sha512/shared/constants.rb
+++ b/spec/ruby/library/digest/sha512/shared/constants.rb
@@ -1,4 +1,4 @@
-# -*- encoding: binary -*-
+# encoding: binary
 
 require 'digest/sha2'
 
diff --git a/spec/ruby/library/drb/start_service_spec.rb b/spec/ruby/library/drb/start_service_spec.rb
index 016c8b2cffbb73..57a8cf6e15d5af 100644
--- a/spec/ruby/library/drb/start_service_spec.rb
+++ b/spec/ruby/library/drb/start_service_spec.rb
@@ -1,28 +1,33 @@
 require_relative '../../spec_helper'
-require_relative 'fixtures/test_server'
-require 'drb'
 
-describe "DRb.start_service" do
-  before :each do
-    @server = DRb.start_service("druby://localhost:0", TestServer.new)
-  end
+# This does not work yet when run in CRuby via make test-spec:
+# Gem::MissingSpecError: Could not find 'ruby2_keywords' (>= 0) among 28 total gem(s)
+guard_not -> { MSpecScript.instance_variable_defined?(:@testing_ruby) } do
+  require_relative 'fixtures/test_server'
+  require 'drb'
 
-  after :each do
-    DRb.stop_service if @server
-  end
+  describe "DRb.start_service" do
+    before :each do
+      @server = DRb.start_service("druby://localhost:0", TestServer.new)
+    end
 
-  it "runs a basic remote call" do
-    DRb.current_server.should == @server
-    obj = DRbObject.new(nil, @server.uri)
-    obj.add(1,2,3).should == 6
-  end
+    after :each do
+      DRb.stop_service if @server
+    end
+
+    it "runs a basic remote call" do
+      DRb.current_server.should == @server
+      obj = DRbObject.new(nil, @server.uri)
+      obj.add(1,2,3).should == 6
+    end
 
-  it "runs a basic remote call passing a block" do
-    DRb.current_server.should == @server
-    obj = DRbObject.new(nil, @server.uri)
-    obj.add_yield(2) do |i|
-      i.should == 2
-      i+1
-    end.should == 4
+    it "runs a basic remote call passing a block" do
+      DRb.current_server.should == @server
+      obj = DRbObject.new(nil, @server.uri)
+      obj.add_yield(2) do |i|
+        i.should == 2
+        i+1
+      end.should == 4
+    end
   end
 end
diff --git a/spec/ruby/library/erb/def_class_spec.rb b/spec/ruby/library/erb/def_class_spec.rb
index 88bd385f4c7743..fb687531e060fc 100644
--- a/spec/ruby/library/erb/def_class_spec.rb
+++ b/spec/ruby/library/erb/def_class_spec.rb
@@ -24,6 +24,8 @@ def initialize(arg1, arg2)
     MyClass1ForErb = erb.def_class(MyClass1ForErb_, 'render()')
     MyClass1ForErb.method_defined?(:render).should == true
     MyClass1ForErb.new('foo', 123).render().should == expected
+  ensure
+    Object.send(:remove_const, :MyClass1ForErb)
   end
 
 end
diff --git a/spec/ruby/library/erb/def_module_spec.rb b/spec/ruby/library/erb/def_module_spec.rb
index 806e564ef0c7b1..5f67aeb2b95eb5 100644
--- a/spec/ruby/library/erb/def_module_spec.rb
+++ b/spec/ruby/library/erb/def_module_spec.rb
@@ -22,6 +22,9 @@ class MyClass2ForErb
       include MyModule2ForErb
     end
     MyClass2ForErb.new.render('foo', 123).should == expected
+  ensure
+    Object.send(:remove_const, :MyClass2ForErb)
+    Object.send(:remove_const, :MyModule2ForErb)
   end
 
 end
diff --git a/spec/ruby/library/erb/defmethod/def_erb_method_spec.rb b/spec/ruby/library/erb/defmethod/def_erb_method_spec.rb
index dc1e044d9cf4a4..1cd758293619e8 100644
--- a/spec/ruby/library/erb/defmethod/def_erb_method_spec.rb
+++ b/spec/ruby/library/erb/defmethod/def_erb_method_spec.rb
@@ -58,6 +58,8 @@ def initialize(items)
       end
     end
     MyClass4ForErb.new([10,20,30]).render().should == expected
+  ensure
+    Object.send(:remove_const, :MY_INPUT4_FOR_ERB)
   end
 
 
diff --git a/spec/ruby/library/erb/new_spec.rb b/spec/ruby/library/erb/new_spec.rb
index a5aeeaeed10127..ec1be5c2342f04 100644
--- a/spec/ruby/library/erb/new_spec.rb
+++ b/spec/ruby/library/erb/new_spec.rb
@@ -130,7 +130,7 @@
 <b><%#= item %></b>
 <%# end %>
 END
-  ERBSpecs.new_erb(input).result.should == "\n<b></b>\n\n"
+    ERBSpecs.new_erb(input).result.should == "\n<b></b>\n\n"
     ERBSpecs.new_erb(input, trim_mode: '<>').result.should == "<b></b>\n"
   end
 
@@ -140,18 +140,16 @@
   end
 
   describe "warning about arguments" do
-    version_is ERB.version, "2.2.1" do #ruby_version_is "3.1" do
-      it "warns when passed safe_level and later arguments" do
-        -> {
-          ERB.new(@eruby_str, nil, '%')
-        }.should complain(/warning: Passing safe_level with the 2nd argument of ERB.new is deprecated. Do not use it, and specify other arguments as keyword arguments./)
-      end
-
-      it "does not warn when passed arguments as keyword argument" do
-        -> {
-          ERB.new(@eruby_str, trim_mode: '%')
-        }.should_not complain(/warning: Passing safe_level with the 2nd argument of ERB.new is deprecated. Do not use it, and specify other arguments as keyword arguments./)
-      end
+    it "warns when passed safe_level and later arguments" do
+      -> {
+        ERB.new(@eruby_str, nil, '%')
+      }.should complain(/warning: Passing safe_level with the 2nd argument of ERB.new is deprecated. Do not use it, and specify other arguments as keyword arguments./)
+    end
+
+    it "does not warn when passed arguments as keyword argument" do
+      -> {
+        ERB.new(@eruby_str, trim_mode: '%')
+      }.should_not complain(/warning: Passing safe_level with the 2nd argument of ERB.new is deprecated. Do not use it, and specify other arguments as keyword arguments./)
     end
   end
 end
diff --git a/spec/ruby/library/erb/run_spec.rb b/spec/ruby/library/erb/run_spec.rb
index 8c07442d8f41e6..602e53ab385855 100644
--- a/spec/ruby/library/erb/run_spec.rb
+++ b/spec/ruby/library/erb/run_spec.rb
@@ -6,7 +6,7 @@
   # lambda { ... }.should output
   def _steal_stdout
     orig = $stdout
-    s = ''
+    s = +''
     def s.write(arg); self << arg.to_s; end
     $stdout = s
     begin
diff --git a/spec/ruby/library/etc/uname_spec.rb b/spec/ruby/library/etc/uname_spec.rb
new file mode 100644
index 00000000000000..a42558f5932b9c
--- /dev/null
+++ b/spec/ruby/library/etc/uname_spec.rb
@@ -0,0 +1,14 @@
+require_relative '../../spec_helper'
+require 'etc'
+
+describe "Etc.uname" do
+  it "returns a Hash with the documented keys" do
+    uname = Etc.uname
+    uname.should be_kind_of(Hash)
+    uname.should.key?(:sysname)
+    uname.should.key?(:nodename)
+    uname.should.key?(:release)
+    uname.should.key?(:version)
+    uname.should.key?(:machine)
+  end
+end
diff --git a/spec/ruby/library/fiber/resume_spec.rb b/spec/ruby/library/fiber/resume_spec.rb
deleted file mode 100644
index fd69d3ba991fc2..00000000000000
--- a/spec/ruby/library/fiber/resume_spec.rb
+++ /dev/null
@@ -1,18 +0,0 @@
-require_relative '../../spec_helper'
-
-require 'fiber'
-
-describe "Fiber#resume" do
-  it "can work with Fiber#transfer" do
-    fiber1 = Fiber.new { true }
-    fiber2 = Fiber.new { fiber1.transfer; Fiber.yield 10 ; Fiber.yield 20; raise }
-    fiber2.resume.should == 10
-    fiber2.resume.should == 20
-  end
-
-  it "raises a FiberError if the Fiber attempts to resume a resuming fiber" do
-    root_fiber = Fiber.current
-    fiber1 = Fiber.new { root_fiber.resume }
-    -> { fiber1.resume }.should raise_error(FiberError, /attempt to resume a resuming fiber/)
-  end
-end
diff --git a/spec/ruby/library/find/fixtures/common.rb b/spec/ruby/library/find/fixtures/common.rb
index 14a7edb09aa639..99f3bbb45a0a17 100644
--- a/spec/ruby/library/find/fixtures/common.rb
+++ b/spec/ruby/library/find/fixtures/common.rb
@@ -71,13 +71,17 @@ def self.mock_dir_files
   end
 
   def self.create_mock_dirs
+    tmp('') # make sure there is an tmpdir
     umask = File.umask 0
-    mock_dir_files.each do |name|
-      file = File.join mock_dir, name
-      mkdir_p File.dirname(file)
-      touch file
+    begin
+      mock_dir_files.each do |name|
+        file = File.join mock_dir, name
+        mkdir_p File.dirname(file)
+        touch file
+      end
+    ensure
+      File.umask umask
     end
-    File.umask umask
   end
 
   def self.delete_mock_dirs
diff --git a/spec/ruby/library/io-wait/fixtures/classes.rb b/spec/ruby/library/io-wait/fixtures/classes.rb
deleted file mode 100644
index 837c7edd06bea4..00000000000000
--- a/spec/ruby/library/io-wait/fixtures/classes.rb
+++ /dev/null
@@ -1,12 +0,0 @@
-module IOWaitSpec
-  def self.exhaust_write_buffer(io)
-    written = 0
-    buf = " " * 4096
-
-    begin
-      written += io.write_nonblock(buf)
-    rescue Errno::EAGAIN, Errno::EWOULDBLOCK
-      return written
-    end while true
-  end
-end
diff --git a/spec/ruby/library/io-wait/wait_readable_spec.rb b/spec/ruby/library/io-wait/wait_readable_spec.rb
index 06ffbda5c88bc2..d7473f029f21f3 100644
--- a/spec/ruby/library/io-wait/wait_readable_spec.rb
+++ b/spec/ruby/library/io-wait/wait_readable_spec.rb
@@ -1,9 +1,5 @@
 require_relative '../../spec_helper'
 
-ruby_version_is ''...'3.2' do
-  require 'io/wait'
-end
-
 describe "IO#wait_readable" do
   before :each do
     @io = File.new(__FILE__ )
@@ -24,4 +20,23 @@
   it "waits for the IO to become readable with the given large timeout" do
     @io.wait_readable(365 * 24 * 60 * 60).should == @io
   end
+
+  it "can be interrupted" do
+    rd, wr = IO.pipe
+    start = Process.clock_gettime(Process::CLOCK_MONOTONIC)
+
+    t = Thread.new do
+      rd.wait_readable(10)
+    end
+
+    Thread.pass until t.stop?
+    t.kill
+    t.join
+
+    finish = Process.clock_gettime(Process::CLOCK_MONOTONIC)
+    (finish - start).should < 9
+  ensure
+    rd.close
+    wr.close
+  end
 end
diff --git a/spec/ruby/library/io-wait/wait_spec.rb b/spec/ruby/library/io-wait/wait_spec.rb
index 3861281277bc12..6a3890a401a7eb 100644
--- a/spec/ruby/library/io-wait/wait_spec.rb
+++ b/spec/ruby/library/io-wait/wait_spec.rb
@@ -1,9 +1,5 @@
 require_relative '../../spec_helper'
-require_relative 'fixtures/classes'
-
-ruby_version_is ''...'3.2' do
-  require 'io/wait'
-end
+require_relative '../../fixtures/io'
 
 describe "IO#wait" do
   before :each do
@@ -25,48 +21,28 @@
   end
 
   context "[events, timeout] passed" do
-    ruby_version_is ""..."3.2" do
-      it "returns self when the READABLE event is ready during the timeout" do
-        @w.write('data to read')
-        @r.wait(IO::READABLE, 2).should.equal?(@r)
-      end
-
-      it "returns self when the WRITABLE event is ready during the timeout" do
-        @w.wait(IO::WRITABLE, 0).should.equal?(@w)
-      end
+    it "returns events mask when the READABLE event is ready during the timeout" do
+      @w.write('data to read')
+      @r.wait(IO::READABLE, 2).should == IO::READABLE
     end
 
-    ruby_version_is "3.2" do
-      it "returns events mask when the READABLE event is ready during the timeout" do
-        @w.write('data to read')
-        @r.wait(IO::READABLE, 2).should == IO::READABLE
-      end
-
-      it "returns events mask when the WRITABLE event is ready during the timeout" do
-        @w.wait(IO::WRITABLE, 0).should == IO::WRITABLE
-      end
+    it "returns events mask when the WRITABLE event is ready during the timeout" do
+      @w.wait(IO::WRITABLE, 0).should == IO::WRITABLE
     end
 
     it "waits for the READABLE event to be ready" do
-      queue = Queue.new
-      thread = Thread.new { queue.pop; sleep 1; @w.write('data to read') };
-
-      queue.push('signal');
-      @r.wait(IO::READABLE, 2).should_not == nil
+      @r.wait(IO::READABLE, 0).should == nil
 
-      thread.join
+      @w.write('data to read')
+      @r.wait(IO::READABLE, 0).should_not == nil
     end
 
     it "waits for the WRITABLE event to be ready" do
-      written_bytes = IOWaitSpec.exhaust_write_buffer(@w)
-
-      queue = Queue.new
-      thread = Thread.new { queue.pop; sleep 1; @r.read(written_bytes) };
-
-      queue.push('signal');
-      @w.wait(IO::WRITABLE, 2).should_not == nil
+      written_bytes = IOSpec.exhaust_write_buffer(@w)
+      @w.wait(IO::WRITABLE, 0).should == nil
 
-      thread.join
+      @r.read(written_bytes)
+      @w.wait(IO::WRITABLE, 0).should_not == nil
     end
 
     it "returns nil when the READABLE event is not ready during the timeout" do
@@ -74,7 +50,7 @@
     end
 
     it "returns nil when the WRITABLE event is not ready during the timeout" do
-      IOWaitSpec.exhaust_write_buffer(@w)
+      IOSpec.exhaust_write_buffer(@w)
       @w.wait(IO::WRITABLE, 0).should == nil
     end
 
@@ -83,12 +59,62 @@
       -> { @io.wait(IO::READABLE, 0) }.should raise_error(IOError, "closed stream")
     end
 
-    ruby_version_is "3.2" do
-      it "raises ArgumentError when events is not positive" do
-        -> { @w.wait(0, 0) }.should raise_error(ArgumentError, "Events must be positive integer!")
-        -> { @w.wait(-1, 0) }.should raise_error(ArgumentError, "Events must be positive integer!")
+    it "raises ArgumentError when events is not positive" do
+      -> { @w.wait(0, 0) }.should raise_error(ArgumentError, "Events must be positive integer!")
+      -> { @w.wait(-1, 0) }.should raise_error(ArgumentError, "Events must be positive integer!")
+    end
+
+    it "changes thread status to 'sleep' when waits for READABLE event" do
+      t = Thread.new { @r.wait(IO::READABLE, 10) }
+      sleep 1
+      t.status.should == 'sleep'
+      t.kill
+      t.join # Thread#kill doesn't wait for the thread to end
+    end
+
+    # https://github.com/ruby/ruby/actions/runs/11948300522/job/33305664284?pr=12139
+    platform_is_not :windows do
+      it "changes thread status to 'sleep' when waits for WRITABLE event" do
+        IOSpec.exhaust_write_buffer(@w)
+
+        t = Thread.new { @w.wait(IO::WRITABLE, 10) }
+        sleep 1
+        t.status.should == 'sleep'
+        t.kill
+        t.join # Thread#kill doesn't wait for the thread to end
       end
     end
+
+    it "can be interrupted when waiting for READABLE event" do
+      start = Process.clock_gettime(Process::CLOCK_MONOTONIC)
+
+      t = Thread.new do
+        @r.wait(IO::READABLE, 10)
+      end
+
+      Thread.pass until t.stop?
+      t.kill
+      t.join # Thread#kill doesn't wait for the thread to end
+
+      finish = Process.clock_gettime(Process::CLOCK_MONOTONIC)
+      (finish - start).should < 9
+    end
+
+    it "can be interrupted when waiting for WRITABLE event" do
+      IOSpec.exhaust_write_buffer(@w)
+      start = Process.clock_gettime(Process::CLOCK_MONOTONIC)
+
+      t = Thread.new do
+        @w.wait(IO::WRITABLE, 10)
+      end
+
+      Thread.pass until t.stop?
+      t.kill
+      t.join # Thread#kill doesn't wait for the thread to end
+
+      finish = Process.clock_gettime(Process::CLOCK_MONOTONIC)
+      (finish - start).should < 9
+    end
   end
 
   context "[timeout, mode] passed" do
@@ -111,34 +137,26 @@
     end
 
     it "accepts a list of modes" do
-       @io.wait(0, :r, :w, :rw).should == @io
+      @io.wait(0, :r, :w, :rw).should == @io
     end
 
-    # It works at least since 2.7 but by some reason may fail on 3.1
-    ruby_version_is "3.2" do
-      it "accepts timeout and mode in any order" do
-        @io.wait(0, :r).should == @io
-        @io.wait(:r, 0).should == @io
-        @io.wait(:r, 0, :w).should == @io
-      end
+    it "accepts timeout and mode in any order" do
+      @io.wait(0, :r).should == @io
+      @io.wait(:r, 0).should == @io
+      @io.wait(:r, 0, :w).should == @io
     end
 
     it "raises ArgumentError when passed wrong Symbol value as mode argument" do
       -> { @io.wait(0, :wrong) }.should raise_error(ArgumentError, "unsupported mode: wrong")
     end
 
-    # It works since 3.0 but by some reason may fail on 3.1
-    ruby_version_is "3.2" do
-      it "raises ArgumentError when several Integer arguments passed" do
-        -> { @w.wait(0, 10, :r) }.should raise_error(ArgumentError, "timeout given more than once")
-      end
+    it "raises ArgumentError when several Integer arguments passed" do
+      -> { @w.wait(0, 10, :r) }.should raise_error(ArgumentError, "timeout given more than once")
     end
 
-    ruby_version_is "3.2" do
-      it "raises IOError when io is closed (closed stream (IOError))" do
-        @io.close
-        -> { @io.wait(0, :r) }.should raise_error(IOError, "closed stream")
-      end
+    it "raises IOError when io is closed (closed stream (IOError))" do
+      @io.close
+      -> { @io.wait(0, :r) }.should raise_error(IOError, "closed stream")
     end
   end
 end
diff --git a/spec/ruby/library/io-wait/wait_writable_spec.rb b/spec/ruby/library/io-wait/wait_writable_spec.rb
index 8c44780d399e34..2017817caacc1d 100644
--- a/spec/ruby/library/io-wait/wait_writable_spec.rb
+++ b/spec/ruby/library/io-wait/wait_writable_spec.rb
@@ -1,8 +1,5 @@
 require_relative '../../spec_helper'
-
-ruby_version_is ''...'3.2' do
-  require 'io/wait'
-end
+require_relative '../../fixtures/io'
 
 describe "IO#wait_writable" do
   it "waits for the IO to become writable with no timeout" do
@@ -17,4 +14,24 @@
     # Represents one year and is larger than a 32-bit int
     STDOUT.wait_writable(365 * 24 * 60 * 60).should == STDOUT
   end
+
+  it "can be interrupted" do
+    rd, wr = IO.pipe
+    IOSpec.exhaust_write_buffer(wr)
+    start = Process.clock_gettime(Process::CLOCK_MONOTONIC)
+
+    t = Thread.new do
+      wr.wait_writable(10)
+    end
+
+    Thread.pass until t.stop?
+    t.kill
+    t.join
+
+    finish = Process.clock_gettime(Process::CLOCK_MONOTONIC)
+    (finish - start).should < 9
+  ensure
+    rd.close unless rd.closed?
+    wr.close unless wr.closed?
+  end
 end
diff --git a/spec/ruby/library/ipaddr/new_spec.rb b/spec/ruby/library/ipaddr/new_spec.rb
index 714c1e2f1ad71a..2c0f44acf2e73c 100644
--- a/spec/ruby/library/ipaddr/new_spec.rb
+++ b/spec/ruby/library/ipaddr/new_spec.rb
@@ -77,40 +77,16 @@
     a.family.should == Socket::AF_INET6
   end
 
-  ipaddr_version = if defined?(IPAddr::VERSION) #ruby_version_is ""..."3.1" do
-    IPAddr::VERSION
-  else
-    "1.2.2"
-  end
-
-  version_is ipaddr_version, ""..."1.2.3" do #ruby_version_is ""..."3.1" do
-    it "raises on incorrect IPAddr strings" do
-      [
-        ["fe80::1%fxp0"],
-        ["::1/255.255.255.0"],
-        [IPAddr.new("::1").to_i],
-        ["::ffff:192.168.1.2/120", Socket::AF_INET],
-        ["[192.168.1.2]/120"],
-      ].each { |args|
-        ->{
-          IPAddr.new(*args)
-        }.should raise_error(ArgumentError)
-      }
-    end
-  end
-
-  version_is ipaddr_version, "1.2.3" do #ruby_version_is "3.1" do
-    it "raises on incorrect IPAddr strings" do
-      [
-        ["::1/255.255.255.0"],
-        [IPAddr.new("::1").to_i],
-        ["::ffff:192.168.1.2/120", Socket::AF_INET],
-        ["[192.168.1.2]/120"],
-      ].each { |args|
-        ->{
-          IPAddr.new(*args)
-        }.should raise_error(ArgumentError)
-      }
-    end
+  it "raises on incorrect IPAddr strings" do
+    [
+      ["::1/255.255.255.0"],
+      [IPAddr.new("::1").to_i],
+      ["::ffff:192.168.1.2/120", Socket::AF_INET],
+      ["[192.168.1.2]/120"],
+    ].each { |args|
+      ->{
+        IPAddr.new(*args)
+      }.should raise_error(ArgumentError)
+    }
   end
 end
diff --git a/spec/ruby/library/irb/fixtures/irb.rb b/spec/ruby/library/irb/fixtures/irb.rb
new file mode 100644
index 00000000000000..8d386dfda19400
--- /dev/null
+++ b/spec/ruby/library/irb/fixtures/irb.rb
@@ -0,0 +1,3 @@
+a = 10
+
+binding.irb # rubocop:disable Lint/Debugger
diff --git a/spec/ruby/library/irb/irb_spec.rb b/spec/ruby/library/irb/irb_spec.rb
new file mode 100644
index 00000000000000..2607c7ef33b54a
--- /dev/null
+++ b/spec/ruby/library/irb/irb_spec.rb
@@ -0,0 +1,19 @@
+require_relative '../../spec_helper'
+require 'tmpdir'
+
+describe "Binding#irb" do
+  it "creates an IRB session with the binding in scope" do
+    irb_fixture = fixture __FILE__, "irb.rb"
+    envs = %w[IRBRC HOME XDG_CONFIG_HOME].to_h {|e| [e, nil]}
+
+    out = Dir.mktmpdir do |dir|
+      IO.popen([envs, *ruby_exe, irb_fixture, chdir: dir], "r+") do |pipe|
+        pipe.puts "a ** 2"
+        pipe.puts "exit"
+        pipe.readlines.map(&:chomp).reject(&:empty?)
+      end
+    end
+
+    out.last(3).should == ["a ** 2", "100", "exit"]
+  end
+end
diff --git a/spec/ruby/library/logger/logger/new_spec.rb b/spec/ruby/library/logger/logger/new_spec.rb
index d3100ee2d1be27..3db20e743230b9 100644
--- a/spec/ruby/library/logger/logger/new_spec.rb
+++ b/spec/ruby/library/logger/logger/new_spec.rb
@@ -13,24 +13,24 @@
     rm_r @file_path
   end
 
-   it "creates a new logger object" do
-     l = Logger.new(STDERR)
-     -> { l.add(Logger::WARN, "Foo") }.should output_to_fd(/Foo/, STDERR)
-   end
+  it "creates a new logger object" do
+    l = Logger.new(STDERR)
+    -> { l.add(Logger::WARN, "Foo") }.should output_to_fd(/Foo/, STDERR)
+  end
 
-   it "receives a logging device as first argument" do
-     l = Logger.new(@log_file)
-     l.add(Logger::WARN, "Test message")
+  it "receives a logging device as first argument" do
+    l = Logger.new(@log_file)
+    l.add(Logger::WARN, "Test message")
 
-     @log_file.rewind
-     LoggerSpecs.strip_date(@log_file.readline).should == "WARN -- : Test message\n"
-     l.close
-   end
+    @log_file.rewind
+    LoggerSpecs.strip_date(@log_file.readline).should == "WARN -- : Test message\n"
+    l.close
+  end
 
   it "receives a frequency rotation as second argument" do
-     -> { Logger.new(@log_file, "daily") }.should_not raise_error
-     -> { Logger.new(@log_file, "weekly") }.should_not raise_error
-     -> { Logger.new(@log_file, "monthly") }.should_not raise_error
+    -> { Logger.new(@log_file, "daily") }.should_not raise_error
+    -> { Logger.new(@log_file, "weekly") }.should_not raise_error
+    -> { Logger.new(@log_file, "monthly") }.should_not raise_error
   end
 
   it "also receives a number of log files to keep as second argument" do
diff --git a/spec/ruby/library/matrix/I_spec.rb b/spec/ruby/library/matrix/I_spec.rb
index aa064ed54bcdf4..6eeffe8e98cc90 100644
--- a/spec/ruby/library/matrix/I_spec.rb
+++ b/spec/ruby/library/matrix/I_spec.rb
@@ -1,9 +1,6 @@
 require_relative '../../spec_helper'
+require_relative 'shared/identity'
 
-ruby_version_is ""..."3.1" do
-  require_relative 'shared/identity'
-
-  describe "Matrix.I" do
-    it_behaves_like :matrix_identity, :I
-  end
+describe "Matrix.I" do
+  it_behaves_like :matrix_identity, :I
 end
diff --git a/spec/ruby/library/matrix/antisymmetric_spec.rb b/spec/ruby/library/matrix/antisymmetric_spec.rb
index dcc3c30f3e0b82..200df703cb8a55 100644
--- a/spec/ruby/library/matrix/antisymmetric_spec.rb
+++ b/spec/ruby/library/matrix/antisymmetric_spec.rb
@@ -1,38 +1,36 @@
 require_relative '../../spec_helper'
 
-ruby_version_is ""..."3.1" do
-  require 'matrix'
+require 'matrix'
 
-  describe "Matrix#antisymmetric?" do
-    it "returns true for an antisymmetric Matrix" do
-      Matrix[[0, -2, Complex(1, 3)], [2, 0, 5], [-Complex(1, 3), -5, 0]].antisymmetric?.should be_true
-    end
+describe "Matrix#antisymmetric?" do
+  it "returns true for an antisymmetric Matrix" do
+    Matrix[[0, -2, Complex(1, 3)], [2, 0, 5], [-Complex(1, 3), -5, 0]].antisymmetric?.should be_true
+  end
 
-    it "returns true for a 0x0 empty matrix" do
-      Matrix.empty.antisymmetric?.should be_true
-    end
+  it "returns true for a 0x0 empty matrix" do
+    Matrix.empty.antisymmetric?.should be_true
+  end
 
-    it "returns false for non-antisymmetric matrices" do
-      [
-        Matrix[[1, 2, 3], [4, 5, 6], [7, 8, 9]],
-        Matrix[[1, -2, 3], [2, 0, 6], [-3, -6, 0]],  # wrong diagonal element
-        Matrix[[0, 2, -3], [2, 0, 6], [-3, 6, 0]]    # only signs wrong
-      ].each do |matrix|
-        matrix.antisymmetric?.should be_false
-      end
+  it "returns false for non-antisymmetric matrices" do
+    [
+      Matrix[[1, 2, 3], [4, 5, 6], [7, 8, 9]],
+      Matrix[[1, -2, 3], [2, 0, 6], [-3, -6, 0]],  # wrong diagonal element
+      Matrix[[0, 2, -3], [2, 0, 6], [-3, 6, 0]]    # only signs wrong
+    ].each do |matrix|
+      matrix.antisymmetric?.should be_false
     end
+  end
 
-    it "raises an error for rectangular matrices" do
-      [
-        Matrix[[0], [0]],
-        Matrix[[0, 0]],
-        Matrix.empty(0, 2),
-        Matrix.empty(2, 0),
-      ].each do |rectangular_matrix|
-        -> {
-          rectangular_matrix.antisymmetric?
-        }.should raise_error(Matrix::ErrDimensionMismatch)
-      end
+  it "raises an error for rectangular matrices" do
+    [
+      Matrix[[0], [0]],
+      Matrix[[0, 0]],
+      Matrix.empty(0, 2),
+      Matrix.empty(2, 0),
+    ].each do |rectangular_matrix|
+      -> {
+        rectangular_matrix.antisymmetric?
+      }.should raise_error(Matrix::ErrDimensionMismatch)
     end
   end
 end
diff --git a/spec/ruby/library/matrix/build_spec.rb b/spec/ruby/library/matrix/build_spec.rb
index d3055a1aa7b4ff..6d8017a3dfda7a 100644
--- a/spec/ruby/library/matrix/build_spec.rb
+++ b/spec/ruby/library/matrix/build_spec.rb
@@ -1,76 +1,73 @@
 require_relative '../../spec_helper'
+require_relative 'fixtures/classes'
+require 'matrix'
 
-ruby_version_is ""..."3.1" do
-  require_relative 'fixtures/classes'
-  require 'matrix'
+describe "Matrix.build" do
 
-  describe "Matrix.build" do
-
-    it "returns a Matrix object of the given size" do
-      m = Matrix.build(3, 4){1}
-      m.should be_an_instance_of(Matrix)
-      m.row_size.should == 3
-      m.column_size.should == 4
-    end
+  it "returns a Matrix object of the given size" do
+    m = Matrix.build(3, 4){1}
+    m.should be_an_instance_of(Matrix)
+    m.row_size.should == 3
+    m.column_size.should == 4
+  end
 
-    it "builds the Matrix using the given block" do
-      Matrix.build(2, 3){|col, row| 10*col - row}.should ==
-        Matrix[[0, -1, -2], [10, 9, 8]]
-    end
+  it "builds the Matrix using the given block" do
+    Matrix.build(2, 3){|col, row| 10*col - row}.should ==
+      Matrix[[0, -1, -2], [10, 9, 8]]
+  end
 
-    it "iterates through the first row, then the second, ..." do
-      acc = []
-      Matrix.build(2, 3){|*args| acc << args}
-      acc.should == [[0, 0], [0, 1], [0, 2], [1, 0], [1, 1], [1, 2]]
-    end
+  it "iterates through the first row, then the second, ..." do
+    acc = []
+    Matrix.build(2, 3){|*args| acc << args}
+    acc.should == [[0, 0], [0, 1], [0, 2], [1, 0], [1, 1], [1, 2]]
+  end
 
-    it "returns an Enumerator is no block is given" do
-      enum = Matrix.build(2, 1)
-      enum.should be_an_instance_of(Enumerator)
-      enum.each{1}.should == Matrix[[1], [1]]
-    end
+  it "returns an Enumerator is no block is given" do
+    enum = Matrix.build(2, 1)
+    enum.should be_an_instance_of(Enumerator)
+    enum.each{1}.should == Matrix[[1], [1]]
+  end
 
-    it "requires integers as parameters" do
-      -> { Matrix.build("1", "2"){1} }.should raise_error(TypeError)
-      -> { Matrix.build(nil, nil){1} }.should raise_error(TypeError)
-      -> { Matrix.build(1..2){1} }.should raise_error(TypeError)
-    end
+  it "requires integers as parameters" do
+    -> { Matrix.build("1", "2"){1} }.should raise_error(TypeError)
+    -> { Matrix.build(nil, nil){1} }.should raise_error(TypeError)
+    -> { Matrix.build(1..2){1} }.should raise_error(TypeError)
+  end
 
-    it "requires non-negative integers" do
-      -> { Matrix.build(-1, 1){1} }.should raise_error(ArgumentError)
-      -> { Matrix.build(+1,-1){1} }.should raise_error(ArgumentError)
-    end
+  it "requires non-negative integers" do
+    -> { Matrix.build(-1, 1){1} }.should raise_error(ArgumentError)
+    -> { Matrix.build(+1,-1){1} }.should raise_error(ArgumentError)
+  end
 
-    it "returns empty Matrix if one argument is zero" do
-      m = Matrix.build(0, 3){
-        raise "Should not yield"
-      }
-      m.should be_empty
-      m.column_size.should == 3
+  it "returns empty Matrix if one argument is zero" do
+    m = Matrix.build(0, 3){
+      raise "Should not yield"
+    }
+    m.should be_empty
+    m.column_size.should == 3
 
-      m = Matrix.build(3, 0){
-        raise "Should not yield"
-      }
-      m.should be_empty
-      m.row_size.should == 3
-    end
+    m = Matrix.build(3, 0){
+      raise "Should not yield"
+    }
+    m.should be_empty
+    m.row_size.should == 3
+  end
 
-    it "tries to calls :to_int on arguments" do
-      int = mock('int')
-      int.should_receive(:to_int).twice.and_return(2)
-      Matrix.build(int, int){ 1 }.should == Matrix[ [1,1], [1,1] ]
-    end
+  it "tries to calls :to_int on arguments" do
+    int = mock('int')
+    int.should_receive(:to_int).twice.and_return(2)
+    Matrix.build(int, int){ 1 }.should == Matrix[ [1,1], [1,1] ]
+  end
 
-    it "builds an nxn Matrix when given only one argument" do
-      m = Matrix.build(3){1}
-      m.row_size.should == 3
-      m.column_size.should == 3
-    end
+  it "builds an nxn Matrix when given only one argument" do
+    m = Matrix.build(3){1}
+    m.row_size.should == 3
+    m.column_size.should == 3
   end
+end
 
-  describe "for a subclass of Matrix" do
-    it "returns an instance of that subclass" do
-      MatrixSub.build(3){1}.should be_an_instance_of(MatrixSub)
-    end
+describe "for a subclass of Matrix" do
+  it "returns an instance of that subclass" do
+    MatrixSub.build(3){1}.should be_an_instance_of(MatrixSub)
   end
 end
diff --git a/spec/ruby/library/matrix/clone_spec.rb b/spec/ruby/library/matrix/clone_spec.rb
index bde119988f1b61..74e5bf157e7cf5 100644
--- a/spec/ruby/library/matrix/clone_spec.rb
+++ b/spec/ruby/library/matrix/clone_spec.rb
@@ -1,28 +1,25 @@
 require_relative '../../spec_helper'
+require_relative 'fixtures/classes'
+require 'matrix'
 
-ruby_version_is ""..."3.1" do
-  require_relative 'fixtures/classes'
-  require 'matrix'
-
-  describe "Matrix#clone" do
-    before :each do
-      @a = Matrix[[1, 2], [3, 4], [5, 6]]
-    end
+describe "Matrix#clone" do
+  before :each do
+    @a = Matrix[[1, 2], [3, 4], [5, 6]]
+  end
 
-    it "returns a shallow copy of the matrix" do
-      b = @a.clone
-      @a.should_not equal(b)
-      b.should be_kind_of(Matrix)
-      b.should == @a
-      0.upto(@a.row_size - 1) do |i|
-        @a.row(i).should_not equal(b.row(i))
-      end
+  it "returns a shallow copy of the matrix" do
+    b = @a.clone
+    @a.should_not equal(b)
+    b.should be_kind_of(Matrix)
+    b.should == @a
+    0.upto(@a.row_size - 1) do |i|
+      @a.row(i).should_not equal(b.row(i))
     end
+  end
 
-    describe "for a subclass of Matrix" do
-      it "returns an instance of that subclass" do
-        MatrixSub.ins.clone.should be_an_instance_of(MatrixSub)
-      end
+  describe "for a subclass of Matrix" do
+    it "returns an instance of that subclass" do
+      MatrixSub.ins.clone.should be_an_instance_of(MatrixSub)
     end
   end
 end
diff --git a/spec/ruby/library/matrix/coerce_spec.rb b/spec/ruby/library/matrix/coerce_spec.rb
index aa3a32765a109a..4022f00236a802 100644
--- a/spec/ruby/library/matrix/coerce_spec.rb
+++ b/spec/ruby/library/matrix/coerce_spec.rb
@@ -1,11 +1,8 @@
 require_relative '../../spec_helper'
+require 'matrix'
 
-ruby_version_is ""..."3.1" do
-  require 'matrix'
-
-  describe "Matrix#coerce" do
-    it "allows the division of integer by a Matrix " do
-      (1/Matrix[[0,1],[-1,0]]).should == Matrix[[0,-1],[1,0]]
-    end
+describe "Matrix#coerce" do
+  it "allows the division of integer by a Matrix " do
+    (1/Matrix[[0,1],[-1,0]]).should == Matrix[[0,-1],[1,0]]
   end
 end
diff --git a/spec/ruby/library/matrix/collect_spec.rb b/spec/ruby/library/matrix/collect_spec.rb
index 66ec3486c8138a..bba640213bd8d2 100644
--- a/spec/ruby/library/matrix/collect_spec.rb
+++ b/spec/ruby/library/matrix/collect_spec.rb
@@ -1,9 +1,6 @@
 require_relative '../../spec_helper'
+require_relative 'shared/collect'
 
-ruby_version_is ""..."3.1" do
-  require_relative 'shared/collect'
-
-  describe "Matrix#collect" do
-    it_behaves_like :collect, :collect
-  end
+describe "Matrix#collect" do
+  it_behaves_like :collect, :collect
 end
diff --git a/spec/ruby/library/matrix/column_size_spec.rb b/spec/ruby/library/matrix/column_size_spec.rb
index e7b42b101ee2df..041914e5b9ca3f 100644
--- a/spec/ruby/library/matrix/column_size_spec.rb
+++ b/spec/ruby/library/matrix/column_size_spec.rb
@@ -1,16 +1,13 @@
 require_relative '../../spec_helper'
+require 'matrix'
 
-ruby_version_is ""..."3.1" do
-  require 'matrix'
-
-  describe "Matrix#column_size" do
-    it "returns the number of columns" do
-      Matrix[ [1,2], [3,4] ].column_size.should == 2
-    end
+describe "Matrix#column_size" do
+  it "returns the number of columns" do
+    Matrix[ [1,2], [3,4] ].column_size.should == 2
+  end
 
-    it "returns 0 for empty matrices" do
-      Matrix[ [], [] ].column_size.should == 0
-      Matrix[ ].column_size.should == 0
-    end
+  it "returns 0 for empty matrices" do
+    Matrix[ [], [] ].column_size.should == 0
+    Matrix[ ].column_size.should == 0
   end
 end
diff --git a/spec/ruby/library/matrix/column_spec.rb b/spec/ruby/library/matrix/column_spec.rb
index 98a767ad08c498..1f3c80964a6ecc 100644
--- a/spec/ruby/library/matrix/column_spec.rb
+++ b/spec/ruby/library/matrix/column_spec.rb
@@ -1,38 +1,35 @@
 require_relative '../../spec_helper'
+require 'matrix'
 
-ruby_version_is ""..."3.1" do
-  require 'matrix'
-
-  describe "Matrix#column" do
-    before :all do
-      @m =  Matrix[[1,2,3], [2,3,4]]
-    end
+describe "Matrix#column" do
+  before :all do
+    @m =  Matrix[[1,2,3], [2,3,4]]
+  end
 
-    it "returns a Vector when called without a block" do
-      @m.column(1).should == Vector[2,3]
-    end
+  it "returns a Vector when called without a block" do
+    @m.column(1).should == Vector[2,3]
+  end
 
-    it "yields each element in the column to the block" do
-      a = []
-      @m.column(1) {|n| a << n }
-      a.should == [2,3]
-    end
+  it "yields each element in the column to the block" do
+    a = []
+    @m.column(1) {|n| a << n }
+    a.should == [2,3]
+  end
 
-    it "counts backwards for negative argument" do
-      @m.column(-1).should == Vector[3, 4]
-    end
+  it "counts backwards for negative argument" do
+    @m.column(-1).should == Vector[3, 4]
+  end
 
-    it "returns self when called with a block" do
-      @m.column(0) { |x| x }.should equal(@m)
-    end
+  it "returns self when called with a block" do
+    @m.column(0) { |x| x }.should equal(@m)
+  end
 
-    it "returns nil when out of bounds" do
-      @m.column(3).should == nil
-    end
+  it "returns nil when out of bounds" do
+    @m.column(3).should == nil
+  end
 
-    it "never yields when out of bounds" do
-      -> { @m.column(3){ raise } }.should_not raise_error
-      -> { @m.column(-4){ raise } }.should_not raise_error
-    end
+  it "never yields when out of bounds" do
+    -> { @m.column(3){ raise } }.should_not raise_error
+    -> { @m.column(-4){ raise } }.should_not raise_error
   end
 end
diff --git a/spec/ruby/library/matrix/column_vector_spec.rb b/spec/ruby/library/matrix/column_vector_spec.rb
index afdeaced4757ce..47e866a8d55a66 100644
--- a/spec/ruby/library/matrix/column_vector_spec.rb
+++ b/spec/ruby/library/matrix/column_vector_spec.rb
@@ -1,28 +1,25 @@
 require_relative '../../spec_helper'
+require_relative 'fixtures/classes'
+require 'matrix'
 
-ruby_version_is ""..."3.1" do
-  require_relative 'fixtures/classes'
-  require 'matrix'
+describe "Matrix.column_vector" do
 
-  describe "Matrix.column_vector" do
-
-    it "returns a single column Matrix when called with an Array" do
-      m = Matrix.column_vector([4,5,6])
-      m.should be_an_instance_of(Matrix)
-      m.should == Matrix[ [4],[5],[6] ]
-    end
+  it "returns a single column Matrix when called with an Array" do
+    m = Matrix.column_vector([4,5,6])
+    m.should be_an_instance_of(Matrix)
+    m.should == Matrix[ [4],[5],[6] ]
+  end
 
-    it "returns an empty Matrix when called with an empty Array" do
-      m = Matrix.column_vector([])
-      m.should be_an_instance_of(Matrix)
-      m.row_size.should == 0
-      m.column_size.should == 1
-    end
+  it "returns an empty Matrix when called with an empty Array" do
+    m = Matrix.column_vector([])
+    m.should be_an_instance_of(Matrix)
+    m.row_size.should == 0
+    m.column_size.should == 1
+  end
 
-    describe "for a subclass of Matrix" do
-      it "returns an instance of that subclass" do
-        MatrixSub.column_vector([4,5,6]).should be_an_instance_of(MatrixSub)
-      end
+  describe "for a subclass of Matrix" do
+    it "returns an instance of that subclass" do
+      MatrixSub.column_vector([4,5,6]).should be_an_instance_of(MatrixSub)
     end
   end
 end
diff --git a/spec/ruby/library/matrix/column_vectors_spec.rb b/spec/ruby/library/matrix/column_vectors_spec.rb
index 7bec095b9adef9..b0cb6f914cc284 100644
--- a/spec/ruby/library/matrix/column_vectors_spec.rb
+++ b/spec/ruby/library/matrix/column_vectors_spec.rb
@@ -1,29 +1,26 @@
 require_relative '../../spec_helper'
+require 'matrix'
 
-ruby_version_is ""..."3.1" do
-  require 'matrix'
+describe "Matrix#column_vectors" do
 
-  describe "Matrix#column_vectors" do
-
-    before :each do
-      @vectors = Matrix[ [1,2], [3,4] ].column_vectors
-    end
-
-    it "returns an Array" do
-      Matrix[ [1,2], [3,4] ].column_vectors.should be_an_instance_of(Array)
-    end
+  before :each do
+    @vectors = Matrix[ [1,2], [3,4] ].column_vectors
+  end
 
-    it "returns an Array of Vectors" do
-      @vectors.all? {|v| v.should be_an_instance_of(Vector)}
-    end
+  it "returns an Array" do
+    Matrix[ [1,2], [3,4] ].column_vectors.should be_an_instance_of(Array)
+  end
 
-    it "returns each column as a Vector" do
-      @vectors.should == [Vector[1,3], Vector[2,4]]
-    end
+  it "returns an Array of Vectors" do
+    @vectors.all? {|v| v.should be_an_instance_of(Vector)}
+  end
 
-    it "returns an empty Array for empty matrices" do
-      Matrix[ [] ].column_vectors.should == []
-    end
+  it "returns each column as a Vector" do
+    @vectors.should == [Vector[1,3], Vector[2,4]]
+  end
 
+  it "returns an empty Array for empty matrices" do
+    Matrix[ [] ].column_vectors.should == []
   end
+
 end
diff --git a/spec/ruby/library/matrix/columns_spec.rb b/spec/ruby/library/matrix/columns_spec.rb
index 757086c14b7eb8..3095fdd7afb0c7 100644
--- a/spec/ruby/library/matrix/columns_spec.rb
+++ b/spec/ruby/library/matrix/columns_spec.rb
@@ -1,45 +1,42 @@
 require_relative '../../spec_helper'
+require_relative 'fixtures/classes'
+require 'matrix'
 
-ruby_version_is ""..."3.1" do
-  require_relative 'fixtures/classes'
-  require 'matrix'
-
-  describe "Matrix.columns" do
-    before :each do
-      @a = [1, 2]
-      @b = [3, 4]
-      @m = Matrix.columns([@a, @b])
-    end
+describe "Matrix.columns" do
+  before :each do
+    @a = [1, 2]
+    @b = [3, 4]
+    @m = Matrix.columns([@a, @b])
+  end
 
-    it "creates a Matrix from argument columns" do
-      @m.should be_an_instance_of(Matrix)
-      @m.column(0).to_a.should == @a
-      @m.column(1).to_a.should == @b
-    end
+  it "creates a Matrix from argument columns" do
+    @m.should be_an_instance_of(Matrix)
+    @m.column(0).to_a.should == @a
+    @m.column(1).to_a.should == @b
+  end
 
-    it "accepts Vectors as argument columns" do
-      m = Matrix.columns([Vector[*@a], Vector[*@b]])
-      m.should == @m
-      m.column(0).to_a.should == @a
-      m.column(1).to_a.should == @b
-    end
+  it "accepts Vectors as argument columns" do
+    m = Matrix.columns([Vector[*@a], Vector[*@b]])
+    m.should == @m
+    m.column(0).to_a.should == @a
+    m.column(1).to_a.should == @b
+  end
 
-    it "handles empty matrices" do
-      e = Matrix.columns([])
-      e.row_size.should == 0
-      e.column_size.should == 0
-      e.should == Matrix[]
+  it "handles empty matrices" do
+    e = Matrix.columns([])
+    e.row_size.should == 0
+    e.column_size.should == 0
+    e.should == Matrix[]
 
-      v = Matrix.columns([[],[],[]])
-      v.row_size.should == 0
-      v.column_size.should == 3
-      v.should == Matrix[[], [], []].transpose
-    end
+    v = Matrix.columns([[],[],[]])
+    v.row_size.should == 0
+    v.column_size.should == 3
+    v.should == Matrix[[], [], []].transpose
+  end
 
-    describe "for a subclass of Matrix" do
-      it "returns an instance of that subclass" do
-        MatrixSub.columns([[1]]).should be_an_instance_of(MatrixSub)
-      end
+  describe "for a subclass of Matrix" do
+    it "returns an instance of that subclass" do
+      MatrixSub.columns([[1]]).should be_an_instance_of(MatrixSub)
     end
   end
 end
diff --git a/spec/ruby/library/matrix/conj_spec.rb b/spec/ruby/library/matrix/conj_spec.rb
index a9225803994971..ecee95c255b6bb 100644
--- a/spec/ruby/library/matrix/conj_spec.rb
+++ b/spec/ruby/library/matrix/conj_spec.rb
@@ -1,9 +1,6 @@
 require_relative '../../spec_helper'
+require_relative 'shared/conjugate'
 
-ruby_version_is ""..."3.1" do
-  require_relative 'shared/conjugate'
-
-  describe "Matrix#conj" do
-    it_behaves_like :matrix_conjugate, :conj
-  end
+describe "Matrix#conj" do
+  it_behaves_like :matrix_conjugate, :conj
 end
diff --git a/spec/ruby/library/matrix/conjugate_spec.rb b/spec/ruby/library/matrix/conjugate_spec.rb
index b99792a24b9606..682bd41d9445df 100644
--- a/spec/ruby/library/matrix/conjugate_spec.rb
+++ b/spec/ruby/library/matrix/conjugate_spec.rb
@@ -1,9 +1,6 @@
 require_relative '../../spec_helper'
+require_relative 'shared/conjugate'
 
-ruby_version_is ""..."3.1" do
-  require_relative 'shared/conjugate'
-
-  describe "Matrix#conjugate" do
-    it_behaves_like :matrix_conjugate, :conjugate
-  end
+describe "Matrix#conjugate" do
+  it_behaves_like :matrix_conjugate, :conjugate
 end
diff --git a/spec/ruby/library/matrix/constructor_spec.rb b/spec/ruby/library/matrix/constructor_spec.rb
index d8224b44300b5f..70d77babbb955d 100644
--- a/spec/ruby/library/matrix/constructor_spec.rb
+++ b/spec/ruby/library/matrix/constructor_spec.rb
@@ -1,68 +1,65 @@
 require_relative '../../spec_helper'
+require_relative 'fixtures/classes'
+require 'matrix'
 
-ruby_version_is ""..."3.1" do
-  require_relative 'fixtures/classes'
-  require 'matrix'
+describe "Matrix.[]" do
 
-  describe "Matrix.[]" do
-
-    it "requires arrays as parameters" do
-      -> { Matrix[5] }.should raise_error(TypeError)
-      -> { Matrix[nil] }.should raise_error(TypeError)
-      -> { Matrix[1..2] }.should raise_error(TypeError)
-      -> { Matrix[[1, 2], 3] }.should raise_error(TypeError)
-    end
+  it "requires arrays as parameters" do
+    -> { Matrix[5] }.should raise_error(TypeError)
+    -> { Matrix[nil] }.should raise_error(TypeError)
+    -> { Matrix[1..2] }.should raise_error(TypeError)
+    -> { Matrix[[1, 2], 3] }.should raise_error(TypeError)
+  end
 
-    it "creates an empty Matrix with no arguments" do
-      m = Matrix[]
-      m.column_size.should == 0
-      m.row_size.should == 0
-    end
+  it "creates an empty Matrix with no arguments" do
+    m = Matrix[]
+    m.column_size.should == 0
+    m.row_size.should == 0
+  end
 
-    it "raises for non-rectangular matrices" do
-      ->{ Matrix[ [0], [0,1] ] }.should \
-        raise_error(Matrix::ErrDimensionMismatch)
-      ->{ Matrix[ [0,1], [0,1,2], [0,1] ]}.should \
-        raise_error(Matrix::ErrDimensionMismatch)
-    end
+  it "raises for non-rectangular matrices" do
+    ->{ Matrix[ [0], [0,1] ] }.should \
+      raise_error(Matrix::ErrDimensionMismatch)
+    ->{ Matrix[ [0,1], [0,1,2], [0,1] ]}.should \
+      raise_error(Matrix::ErrDimensionMismatch)
+  end
 
-    it "accepts vector arguments" do
-      a = Matrix[Vector[1, 2], Vector[3, 4]]
-      a.should be_an_instance_of(Matrix)
-      a.should == Matrix[ [1, 2], [3, 4] ]
-    end
+  it "accepts vector arguments" do
+    a = Matrix[Vector[1, 2], Vector[3, 4]]
+    a.should be_an_instance_of(Matrix)
+    a.should == Matrix[ [1, 2], [3, 4] ]
+  end
 
-    it "tries to calls :to_ary on arguments" do
-      array = mock('ary')
-      array.should_receive(:to_ary).and_return([1,2])
-      Matrix[array, [3,4] ].should == Matrix[ [1,2], [3,4] ]
-    end
+  it "tries to calls :to_ary on arguments" do
+    array = mock('ary')
+    array.should_receive(:to_ary).and_return([1,2])
+    Matrix[array, [3,4] ].should == Matrix[ [1,2], [3,4] ]
+  end
 
 
-    it "returns a Matrix object" do
-      Matrix[ [1] ].should be_an_instance_of(Matrix)
-    end
+  it "returns a Matrix object" do
+    Matrix[ [1] ].should be_an_instance_of(Matrix)
+  end
 
-    it "can create an nxn Matrix" do
-      m = Matrix[ [20,30], [40.5, 9] ]
-      m.row_size.should == 2
-      m.column_size.should == 2
-      m.column(0).should == Vector[20, 40.5]
-      m.column(1).should == Vector[30, 9]
-      m.row(0).should == Vector[20, 30]
-      m.row(1).should == Vector[40.5, 9]
-    end
+  it "can create an nxn Matrix" do
+    m = Matrix[ [20,30], [40.5, 9] ]
+    m.row_size.should == 2
+    m.column_size.should == 2
+    m.column(0).should == Vector[20, 40.5]
+    m.column(1).should == Vector[30, 9]
+    m.row(0).should == Vector[20, 30]
+    m.row(1).should == Vector[40.5, 9]
+  end
 
-    it "can create a 0xn Matrix" do
-      m = Matrix[ [], [], [] ]
-      m.row_size.should == 3
-      m.column_size.should == 0
-    end
+  it "can create a 0xn Matrix" do
+    m = Matrix[ [], [], [] ]
+    m.row_size.should == 3
+    m.column_size.should == 0
+  end
 
-    describe "for a subclass of Matrix" do
-      it "returns an instance of that subclass" do
-        MatrixSub[ [20,30], [40.5, 9] ].should be_an_instance_of(MatrixSub)
-      end
+  describe "for a subclass of Matrix" do
+    it "returns an instance of that subclass" do
+      MatrixSub[ [20,30], [40.5, 9] ].should be_an_instance_of(MatrixSub)
     end
   end
 end
diff --git a/spec/ruby/library/matrix/det_spec.rb b/spec/ruby/library/matrix/det_spec.rb
index 7d3d5477357ec9..aa7086cacf2041 100644
--- a/spec/ruby/library/matrix/det_spec.rb
+++ b/spec/ruby/library/matrix/det_spec.rb
@@ -1,10 +1,7 @@
 require_relative '../../spec_helper'
+require_relative 'shared/determinant'
+require 'matrix'
 
-ruby_version_is ""..."3.1" do
-  require_relative 'shared/determinant'
-  require 'matrix'
-
-  describe "Matrix#det" do
-    it_behaves_like :determinant, :det
-  end
+describe "Matrix#det" do
+  it_behaves_like :determinant, :det
 end
diff --git a/spec/ruby/library/matrix/determinant_spec.rb b/spec/ruby/library/matrix/determinant_spec.rb
index bfd91fcf684181..825c9907b11b5a 100644
--- a/spec/ruby/library/matrix/determinant_spec.rb
+++ b/spec/ruby/library/matrix/determinant_spec.rb
@@ -1,10 +1,7 @@
 require_relative '../../spec_helper'
+require_relative 'shared/determinant'
+require 'matrix'
 
-ruby_version_is ""..."3.1" do
-  require_relative 'shared/determinant'
-  require 'matrix'
-
-  describe "Matrix#determinant" do
-    it_behaves_like :determinant, :determinant
-  end
+describe "Matrix#determinant" do
+  it_behaves_like :determinant, :determinant
 end
diff --git a/spec/ruby/library/matrix/diagonal_spec.rb b/spec/ruby/library/matrix/diagonal_spec.rb
index 8c82433fde9a59..ef9738e73e3fde 100644
--- a/spec/ruby/library/matrix/diagonal_spec.rb
+++ b/spec/ruby/library/matrix/diagonal_spec.rb
@@ -1,75 +1,72 @@
 require_relative '../../spec_helper'
+require_relative 'fixtures/classes'
+require 'matrix'
 
-ruby_version_is ""..."3.1" do
-  require_relative 'fixtures/classes'
-  require 'matrix'
-
-  describe "Matrix.diagonal" do
-    before :each do
-      @m = Matrix.diagonal(10, 11, 12, 13, 14)
-    end
+describe "Matrix.diagonal" do
+  before :each do
+    @m = Matrix.diagonal(10, 11, 12, 13, 14)
+  end
 
-    it "returns an object of type Matrix" do
-      @m.should be_kind_of(Matrix)
-    end
+  it "returns an object of type Matrix" do
+    @m.should be_kind_of(Matrix)
+  end
 
-    it "returns a square Matrix of the right size" do
-      @m.column_size.should == 5
-      @m.row_size.should == 5
-    end
+  it "returns a square Matrix of the right size" do
+    @m.column_size.should == 5
+    @m.row_size.should == 5
+  end
 
-    it "sets the diagonal to the arguments" do
-      (0..4).each do |i|
-        @m[i, i].should == i + 10
-      end
+  it "sets the diagonal to the arguments" do
+    (0..4).each do |i|
+      @m[i, i].should == i + 10
     end
+  end
 
-    it "fills all non-diagonal cells with 0" do
-      (0..4).each do |i|
-        (0..4).each do |j|
-          if i != j
-            @m[i, j].should == 0
-          end
+  it "fills all non-diagonal cells with 0" do
+    (0..4).each do |i|
+      (0..4).each do |j|
+        if i != j
+          @m[i, j].should == 0
         end
       end
     end
+  end
 
-    describe "for a subclass of Matrix" do
-      it "returns an instance of that subclass" do
-        MatrixSub.diagonal(1).should be_an_instance_of(MatrixSub)
-      end
+  describe "for a subclass of Matrix" do
+    it "returns an instance of that subclass" do
+      MatrixSub.diagonal(1).should be_an_instance_of(MatrixSub)
     end
   end
+end
 
-  describe "Matrix.diagonal?" do
-    it "returns true for a diagonal Matrix" do
-      Matrix.diagonal([1, 2, 3]).diagonal?.should be_true
-    end
+describe "Matrix.diagonal?" do
+  it "returns true for a diagonal Matrix" do
+    Matrix.diagonal([1, 2, 3]).diagonal?.should be_true
+  end
 
-    it "returns true for a zero square Matrix" do
-      Matrix.zero(3).diagonal?.should be_true
-    end
+  it "returns true for a zero square Matrix" do
+    Matrix.zero(3).diagonal?.should be_true
+  end
 
-    it "returns false for a non diagonal square Matrix" do
-      Matrix[[0, 1], [0, 0]].diagonal?.should be_false
-      Matrix[[1, 2, 3], [1, 2, 3], [1, 2, 3]].diagonal?.should be_false
-    end
+  it "returns false for a non diagonal square Matrix" do
+    Matrix[[0, 1], [0, 0]].diagonal?.should be_false
+    Matrix[[1, 2, 3], [1, 2, 3], [1, 2, 3]].diagonal?.should be_false
+  end
 
-    it "returns true for an empty 0x0 matrix" do
-      Matrix.empty(0,0).diagonal?.should be_true
-    end
+  it "returns true for an empty 0x0 matrix" do
+    Matrix.empty(0,0).diagonal?.should be_true
+  end
 
-    it "raises an error for rectangular matrices" do
-      [
-        Matrix[[0], [0]],
-        Matrix[[0, 0]],
-        Matrix.empty(0, 2),
-        Matrix.empty(2, 0),
-      ].each do |rectangular_matrix|
-        -> {
-          rectangular_matrix.diagonal?
-        }.should raise_error(Matrix::ErrDimensionMismatch)
-      end
+  it "raises an error for rectangular matrices" do
+    [
+      Matrix[[0], [0]],
+      Matrix[[0, 0]],
+      Matrix.empty(0, 2),
+      Matrix.empty(2, 0),
+    ].each do |rectangular_matrix|
+      -> {
+        rectangular_matrix.diagonal?
+      }.should raise_error(Matrix::ErrDimensionMismatch)
     end
   end
 end
diff --git a/spec/ruby/library/matrix/divide_spec.rb b/spec/ruby/library/matrix/divide_spec.rb
index 68e6f1fde50998..2e3bb85bf656b6 100644
--- a/spec/ruby/library/matrix/divide_spec.rb
+++ b/spec/ruby/library/matrix/divide_spec.rb
@@ -1,57 +1,54 @@
 require_relative '../../spec_helper'
+require_relative 'spec_helper'
+require_relative 'fixtures/classes'
+require 'matrix'
+
+describe "Matrix#/" do
+  before :each do
+    @a = Matrix[ [1, 2], [3, 4] ]
+    @b = Matrix[ [4, 5], [6, 7] ]
+    @c = Matrix[ [1.2, 2.4], [3.6, 4.8] ]
+  end
 
-ruby_version_is ""..."3.1" do
-  require_relative 'spec_helper'
-  require_relative 'fixtures/classes'
-  require 'matrix'
+  it "returns the result of dividing self by another Matrix" do
+    (@a / @b).should be_close_to_matrix([[2.5, -1.5], [1.5, -0.5]])
+  end
 
-  describe "Matrix#/" do
-    before :each do
-      @a = Matrix[ [1, 2], [3, 4] ]
-      @b = Matrix[ [4, 5], [6, 7] ]
-      @c = Matrix[ [1.2, 2.4], [3.6, 4.8] ]
+  # Guard against the Mathn library
+  guard -> { !defined?(Math.rsqrt) } do
+    it "returns the result of dividing self by a Fixnum" do
+      (@a / 2).should == Matrix[ [0, 1], [1, 2] ]
     end
 
-    it "returns the result of dividing self by another Matrix" do
-      (@a / @b).should be_close_to_matrix([[2.5, -1.5], [1.5, -0.5]])
-    end
-
-    # Guard against the Mathn library
-    guard -> { !defined?(Math.rsqrt) } do
-      it "returns the result of dividing self by a Fixnum" do
-        (@a / 2).should == Matrix[ [0, 1], [1, 2] ]
-      end
-
-      it "returns the result of dividing self by a Bignum" do
-        (@a / bignum_value).should == Matrix[ [0, 0], [0, 0] ]
-      end
+    it "returns the result of dividing self by a Bignum" do
+      (@a / bignum_value).should == Matrix[ [0, 0], [0, 0] ]
     end
+  end
 
-    it "returns the result of dividing self by a Float" do
-      (@c / 1.2).should == Matrix[ [1, 2], [3, 4] ]
-    end
+  it "returns the result of dividing self by a Float" do
+    (@c / 1.2).should == Matrix[ [1, 2], [3, 4] ]
+  end
 
-    it "raises a Matrix::ErrDimensionMismatch if the matrices are different sizes" do
-      -> { @a / Matrix[ [1] ] }.should raise_error(Matrix::ErrDimensionMismatch)
-    end
+  it "raises a Matrix::ErrDimensionMismatch if the matrices are different sizes" do
+    -> { @a / Matrix[ [1] ] }.should raise_error(Matrix::ErrDimensionMismatch)
+  end
 
-    it "returns an instance of Matrix" do
-      (@a / @b).should be_kind_of(Matrix)
-    end
+  it "returns an instance of Matrix" do
+    (@a / @b).should be_kind_of(Matrix)
+  end
 
-    describe "for a subclass of Matrix" do
-      it "returns an instance of that subclass" do
-        m = MatrixSub.ins
-        (m/m).should be_an_instance_of(MatrixSub)
-        (m/1).should be_an_instance_of(MatrixSub)
-      end
+  describe "for a subclass of Matrix" do
+    it "returns an instance of that subclass" do
+      m = MatrixSub.ins
+      (m/m).should be_an_instance_of(MatrixSub)
+      (m/1).should be_an_instance_of(MatrixSub)
     end
+  end
 
-    it "raises a TypeError if other is of wrong type" do
-      -> { @a / nil        }.should raise_error(TypeError)
-      -> { @a / "a"        }.should raise_error(TypeError)
-      -> { @a / [ [1, 2] ] }.should raise_error(TypeError)
-      -> { @a / Object.new }.should raise_error(TypeError)
-    end
+  it "raises a TypeError if other is of wrong type" do
+    -> { @a / nil        }.should raise_error(TypeError)
+    -> { @a / "a"        }.should raise_error(TypeError)
+    -> { @a / [ [1, 2] ] }.should raise_error(TypeError)
+    -> { @a / Object.new }.should raise_error(TypeError)
   end
 end
diff --git a/spec/ruby/library/matrix/each_spec.rb b/spec/ruby/library/matrix/each_spec.rb
index d2b13c80b60281..f3b0f018678c63 100644
--- a/spec/ruby/library/matrix/each_spec.rb
+++ b/spec/ruby/library/matrix/each_spec.rb
@@ -1,77 +1,74 @@
 require_relative '../../spec_helper'
+require 'matrix'
 
-ruby_version_is ""..."3.1" do
-  require 'matrix'
-
-  describe "Matrix#each" do
-    before :all do
-      @m = Matrix[ [1, 2, 3], [4, 5, 6] ]
-      @result = (1..6).to_a
-    end
+describe "Matrix#each" do
+  before :all do
+    @m = Matrix[ [1, 2, 3], [4, 5, 6] ]
+    @result = (1..6).to_a
+  end
 
-    it "returns an Enumerator when called without a block" do
-      enum = @m.each
-      enum.should be_an_instance_of(Enumerator)
-      enum.to_a.should == @result
-    end
+  it "returns an Enumerator when called without a block" do
+    enum = @m.each
+    enum.should be_an_instance_of(Enumerator)
+    enum.to_a.should == @result
+  end
 
-    it "returns self" do
-      @m.each{}.should equal(@m)
-    end
+  it "returns self" do
+    @m.each{}.should equal(@m)
+  end
 
-    it "yields the elements starting with the those of the first row" do
-      a = []
-      @m.each {|x| a << x}
-      a.should ==  @result
-    end
+  it "yields the elements starting with the those of the first row" do
+    a = []
+    @m.each {|x| a << x}
+    a.should ==  @result
   end
+end
 
-  describe "Matrix#each with an argument" do
-    before :all do
-      @m = Matrix[ [1, 2, 3, 4], [5, 6, 7, 8] ]
-      @t = Matrix[ [1, 2], [3, 4], [5, 6], [7, 8] ]
-    end
+describe "Matrix#each with an argument" do
+  before :all do
+    @m = Matrix[ [1, 2, 3, 4], [5, 6, 7, 8] ]
+    @t = Matrix[ [1, 2], [3, 4], [5, 6], [7, 8] ]
+  end
 
-    it "raises an ArgumentError for unrecognized argument" do
-      -> {
-        @m.each("all"){}
-      }.should raise_error(ArgumentError)
-      -> {
-        @m.each(nil){}
-      }.should raise_error(ArgumentError)
-      -> {
-        @m.each(:left){}
-      }.should raise_error(ArgumentError)
-    end
+  it "raises an ArgumentError for unrecognized argument" do
+    -> {
+      @m.each("all"){}
+    }.should raise_error(ArgumentError)
+    -> {
+      @m.each(nil){}
+    }.should raise_error(ArgumentError)
+    -> {
+      @m.each(:left){}
+    }.should raise_error(ArgumentError)
+  end
 
-    it "yields the rights elements when passed :diagonal" do
-      @m.each(:diagonal).to_a.should == [1, 6]
-      @t.each(:diagonal).to_a.should == [1, 4]
-    end
+  it "yields the rights elements when passed :diagonal" do
+    @m.each(:diagonal).to_a.should == [1, 6]
+    @t.each(:diagonal).to_a.should == [1, 4]
+  end
 
-    it "yields the rights elements when passed :off_diagonal" do
-      @m.each(:off_diagonal).to_a.should == [2, 3, 4, 5, 7, 8]
-      @t.each(:off_diagonal).to_a.should == [2, 3, 5, 6, 7, 8]
-    end
+  it "yields the rights elements when passed :off_diagonal" do
+    @m.each(:off_diagonal).to_a.should == [2, 3, 4, 5, 7, 8]
+    @t.each(:off_diagonal).to_a.should == [2, 3, 5, 6, 7, 8]
+  end
 
-    it "yields the rights elements when passed :lower" do
-      @m.each(:lower).to_a.should == [1, 5, 6]
-      @t.each(:lower).to_a.should == [1, 3, 4, 5, 6, 7, 8]
-    end
+  it "yields the rights elements when passed :lower" do
+    @m.each(:lower).to_a.should == [1, 5, 6]
+    @t.each(:lower).to_a.should == [1, 3, 4, 5, 6, 7, 8]
+  end
 
-    it "yields the rights elements when passed :strict_lower" do
-      @m.each(:strict_lower).to_a.should == [5]
-      @t.each(:strict_lower).to_a.should == [3, 5, 6, 7, 8]
-    end
+  it "yields the rights elements when passed :strict_lower" do
+    @m.each(:strict_lower).to_a.should == [5]
+    @t.each(:strict_lower).to_a.should == [3, 5, 6, 7, 8]
+  end
 
-    it "yields the rights elements when passed :strict_upper" do
-      @m.each(:strict_upper).to_a.should == [2, 3, 4, 7, 8]
-      @t.each(:strict_upper).to_a.should == [2]
-    end
+  it "yields the rights elements when passed :strict_upper" do
+    @m.each(:strict_upper).to_a.should == [2, 3, 4, 7, 8]
+    @t.each(:strict_upper).to_a.should == [2]
+  end
 
-    it "yields the rights elements when passed :upper" do
-      @m.each(:upper).to_a.should == [1, 2, 3, 4, 6, 7, 8]
-      @t.each(:upper).to_a.should == [1, 2, 4]
-    end
+  it "yields the rights elements when passed :upper" do
+    @m.each(:upper).to_a.should == [1, 2, 3, 4, 6, 7, 8]
+    @t.each(:upper).to_a.should == [1, 2, 4]
   end
 end
diff --git a/spec/ruby/library/matrix/each_with_index_spec.rb b/spec/ruby/library/matrix/each_with_index_spec.rb
index 59549f77b720f5..a005b886216761 100644
--- a/spec/ruby/library/matrix/each_with_index_spec.rb
+++ b/spec/ruby/library/matrix/each_with_index_spec.rb
@@ -1,84 +1,81 @@
 require_relative '../../spec_helper'
+require 'matrix'
 
-ruby_version_is ""..."3.1" do
-  require 'matrix'
-
-  describe "Matrix#each_with_index" do
-    before :all do
-      @m = Matrix[ [1, 2, 3], [4, 5, 6] ]
-      @result = [
-        [1, 0, 0],
-        [2, 0, 1],
-        [3, 0, 2],
-        [4, 1, 0],
-        [5, 1, 1],
-        [6, 1, 2]
-      ]
-    end
+describe "Matrix#each_with_index" do
+  before :all do
+    @m = Matrix[ [1, 2, 3], [4, 5, 6] ]
+    @result = [
+      [1, 0, 0],
+      [2, 0, 1],
+      [3, 0, 2],
+      [4, 1, 0],
+      [5, 1, 1],
+      [6, 1, 2]
+    ]
+  end
 
-    it "returns an Enumerator when called without a block" do
-      enum = @m.each_with_index
-      enum.should be_an_instance_of(Enumerator)
-      enum.to_a.should == @result
-    end
+  it "returns an Enumerator when called without a block" do
+    enum = @m.each_with_index
+    enum.should be_an_instance_of(Enumerator)
+    enum.to_a.should == @result
+  end
 
-    it "returns self" do
-      @m.each_with_index{}.should equal(@m)
-    end
+  it "returns self" do
+    @m.each_with_index{}.should equal(@m)
+  end
 
-    it "yields the elements starting with the those of the first row" do
-      a = []
-      @m.each_with_index {|x, r, c| a << [x, r, c]}
-      a.should == @result
-    end
+  it "yields the elements starting with the those of the first row" do
+    a = []
+    @m.each_with_index {|x, r, c| a << [x, r, c]}
+    a.should == @result
   end
+end
 
-  describe "Matrix#each_with_index with an argument" do
-    before :all do
-      @m = Matrix[ [1, 2, 3, 4], [5, 6, 7, 8] ]
-      @t = Matrix[ [1, 2], [3, 4], [5, 6], [7, 8] ]
-    end
+describe "Matrix#each_with_index with an argument" do
+  before :all do
+    @m = Matrix[ [1, 2, 3, 4], [5, 6, 7, 8] ]
+    @t = Matrix[ [1, 2], [3, 4], [5, 6], [7, 8] ]
+  end
 
-    it "raises an ArgumentError for unrecognized argument" do
-      -> {
-        @m.each_with_index("all"){}
-      }.should raise_error(ArgumentError)
-      -> {
-        @m.each_with_index(nil){}
-      }.should raise_error(ArgumentError)
-      -> {
-        @m.each_with_index(:left){}
-      }.should raise_error(ArgumentError)
-    end
+  it "raises an ArgumentError for unrecognized argument" do
+    -> {
+      @m.each_with_index("all"){}
+    }.should raise_error(ArgumentError)
+    -> {
+      @m.each_with_index(nil){}
+    }.should raise_error(ArgumentError)
+    -> {
+      @m.each_with_index(:left){}
+    }.should raise_error(ArgumentError)
+  end
 
-    it "yields the rights elements when passed :diagonal" do
-      @m.each_with_index(:diagonal).to_a.should == [[1, 0, 0], [6, 1, 1]]
-      @t.each_with_index(:diagonal).to_a.should == [[1, 0, 0], [4, 1, 1]]
-    end
+  it "yields the rights elements when passed :diagonal" do
+    @m.each_with_index(:diagonal).to_a.should == [[1, 0, 0], [6, 1, 1]]
+    @t.each_with_index(:diagonal).to_a.should == [[1, 0, 0], [4, 1, 1]]
+  end
 
-    it "yields the rights elements when passed :off_diagonal" do
-      @m.each_with_index(:off_diagonal).to_a.should == [[2, 0, 1], [3, 0, 2], [4, 0, 3], [5, 1, 0], [7, 1, 2], [8, 1, 3]]
-      @t.each_with_index(:off_diagonal).to_a.should == [[2, 0, 1], [3, 1, 0], [5, 2, 0], [6, 2, 1], [7, 3, 0], [8, 3, 1]]
-    end
+  it "yields the rights elements when passed :off_diagonal" do
+    @m.each_with_index(:off_diagonal).to_a.should == [[2, 0, 1], [3, 0, 2], [4, 0, 3], [5, 1, 0], [7, 1, 2], [8, 1, 3]]
+    @t.each_with_index(:off_diagonal).to_a.should == [[2, 0, 1], [3, 1, 0], [5, 2, 0], [6, 2, 1], [7, 3, 0], [8, 3, 1]]
+  end
 
-    it "yields the rights elements when passed :lower" do
-      @m.each_with_index(:lower).to_a.should == [[1, 0, 0], [5, 1, 0], [6, 1, 1]]
-      @t.each_with_index(:lower).to_a.should == [[1, 0, 0], [3, 1, 0], [4, 1, 1], [5, 2, 0], [6, 2, 1], [7, 3, 0], [8, 3, 1]]
-    end
+  it "yields the rights elements when passed :lower" do
+    @m.each_with_index(:lower).to_a.should == [[1, 0, 0], [5, 1, 0], [6, 1, 1]]
+    @t.each_with_index(:lower).to_a.should == [[1, 0, 0], [3, 1, 0], [4, 1, 1], [5, 2, 0], [6, 2, 1], [7, 3, 0], [8, 3, 1]]
+  end
 
-    it "yields the rights elements when passed :strict_lower" do
-      @m.each_with_index(:strict_lower).to_a.should == [[5, 1, 0]]
-      @t.each_with_index(:strict_lower).to_a.should == [[3, 1, 0], [5, 2, 0], [6, 2, 1], [7, 3, 0], [8, 3, 1]]
-    end
+  it "yields the rights elements when passed :strict_lower" do
+    @m.each_with_index(:strict_lower).to_a.should == [[5, 1, 0]]
+    @t.each_with_index(:strict_lower).to_a.should == [[3, 1, 0], [5, 2, 0], [6, 2, 1], [7, 3, 0], [8, 3, 1]]
+  end
 
-    it "yields the rights elements when passed :strict_upper" do
-      @m.each_with_index(:strict_upper).to_a.should == [[2, 0, 1], [3, 0, 2], [4, 0, 3], [7, 1, 2], [8, 1, 3]]
-      @t.each_with_index(:strict_upper).to_a.should == [[2, 0, 1]]
-    end
+  it "yields the rights elements when passed :strict_upper" do
+    @m.each_with_index(:strict_upper).to_a.should == [[2, 0, 1], [3, 0, 2], [4, 0, 3], [7, 1, 2], [8, 1, 3]]
+    @t.each_with_index(:strict_upper).to_a.should == [[2, 0, 1]]
+  end
 
-    it "yields the rights elements when passed :upper" do
-      @m.each_with_index(:upper).to_a.should == [[1, 0, 0], [2, 0, 1], [3, 0, 2], [4, 0, 3], [6, 1, 1], [7, 1, 2], [8, 1, 3]]
-      @t.each_with_index(:upper).to_a.should == [[1, 0, 0], [2, 0, 1], [4, 1, 1]]
-    end
+  it "yields the rights elements when passed :upper" do
+    @m.each_with_index(:upper).to_a.should == [[1, 0, 0], [2, 0, 1], [3, 0, 2], [4, 0, 3], [6, 1, 1], [7, 1, 2], [8, 1, 3]]
+    @t.each_with_index(:upper).to_a.should == [[1, 0, 0], [2, 0, 1], [4, 1, 1]]
   end
 end
diff --git a/spec/ruby/library/matrix/eigenvalue_decomposition/eigenvalue_matrix_spec.rb b/spec/ruby/library/matrix/eigenvalue_decomposition/eigenvalue_matrix_spec.rb
index f9ffca0123222c..67f9dd1c19abda 100644
--- a/spec/ruby/library/matrix/eigenvalue_decomposition/eigenvalue_matrix_spec.rb
+++ b/spec/ruby/library/matrix/eigenvalue_decomposition/eigenvalue_matrix_spec.rb
@@ -1,12 +1,9 @@
 require_relative '../../../spec_helper'
+require 'matrix'
 
-ruby_version_is ""..."3.1" do
-  require 'matrix'
-
-  describe "Matrix::EigenvalueDecomposition#eigenvalue_matrix" do
-    it "returns a diagonal matrix with the eigenvalues on the diagonal" do
-      Matrix[[14, 16], [-6, -6]].eigensystem.eigenvalue_matrix.should == Matrix[[6, 0],[0, 2]]
-      Matrix[[1, 1], [-1, 1]].eigensystem.eigenvalue_matrix.should == Matrix[[Complex(1,1), 0],[0, Complex(1,-1)]]
-    end
+describe "Matrix::EigenvalueDecomposition#eigenvalue_matrix" do
+  it "returns a diagonal matrix with the eigenvalues on the diagonal" do
+    Matrix[[14, 16], [-6, -6]].eigensystem.eigenvalue_matrix.should == Matrix[[6, 0],[0, 2]]
+    Matrix[[1, 1], [-1, 1]].eigensystem.eigenvalue_matrix.should == Matrix[[Complex(1,1), 0],[0, Complex(1,-1)]]
   end
 end
diff --git a/spec/ruby/library/matrix/eigenvalue_decomposition/eigenvalues_spec.rb b/spec/ruby/library/matrix/eigenvalue_decomposition/eigenvalues_spec.rb
index 650d43d90f2a69..7552b7616c5981 100644
--- a/spec/ruby/library/matrix/eigenvalue_decomposition/eigenvalues_spec.rb
+++ b/spec/ruby/library/matrix/eigenvalue_decomposition/eigenvalues_spec.rb
@@ -1,25 +1,22 @@
 require_relative '../../../spec_helper'
+require 'matrix'
 
-ruby_version_is ""..."3.1" do
-  require 'matrix'
-
-  describe "Matrix::EigenvalueDecomposition#eigenvalues" do
-    it "returns an array of complex eigenvalues for a rotation matrix" do
-      Matrix[[ 1, 1],
-             [-1, 1]].eigensystem.eigenvalues.sort_by{|v| v.imag}.should ==
-      [ Complex(1, -1), Complex(1, 1)]
-    end
+describe "Matrix::EigenvalueDecomposition#eigenvalues" do
+  it "returns an array of complex eigenvalues for a rotation matrix" do
+    Matrix[[ 1, 1],
+           [-1, 1]].eigensystem.eigenvalues.sort_by{|v| v.imag}.should ==
+    [ Complex(1, -1), Complex(1, 1)]
+  end
 
-    it "returns an array of real eigenvalues for a symmetric matrix" do
-      Matrix[[1, 2],
-             [2, 1]].eigensystem.eigenvalues.sort.map!{|x| x.round(10)}.should ==
-      [ -1, 3 ]
-    end
+  it "returns an array of real eigenvalues for a symmetric matrix" do
+    Matrix[[1, 2],
+           [2, 1]].eigensystem.eigenvalues.sort.map!{|x| x.round(10)}.should ==
+    [ -1, 3 ]
+  end
 
-    it "returns an array of real eigenvalues for a matrix" do
-      Matrix[[14, 16],
-             [-6, -6]].eigensystem.eigenvalues.sort.map!{|x| x.round(10)}.should ==
-      [ 2, 6 ]
-    end
+  it "returns an array of real eigenvalues for a matrix" do
+    Matrix[[14, 16],
+           [-6, -6]].eigensystem.eigenvalues.sort.map!{|x| x.round(10)}.should ==
+    [ 2, 6 ]
   end
 end
diff --git a/spec/ruby/library/matrix/eigenvalue_decomposition/eigenvector_matrix_spec.rb b/spec/ruby/library/matrix/eigenvalue_decomposition/eigenvector_matrix_spec.rb
index 57299ce69eab53..09f229ee15c690 100644
--- a/spec/ruby/library/matrix/eigenvalue_decomposition/eigenvector_matrix_spec.rb
+++ b/spec/ruby/library/matrix/eigenvalue_decomposition/eigenvector_matrix_spec.rb
@@ -1,23 +1,20 @@
 require_relative '../../../spec_helper'
+require 'matrix'
 
-ruby_version_is ""..."3.1" do
-  require 'matrix'
-
-  describe "Matrix::EigenvalueDecomposition#eigenvector_matrix" do
-    it "returns a complex eigenvector matrix given a rotation matrix" do
-      # Fix me: should test for linearity, not for equality
-      Matrix[[ 1, 1],
-             [-1, 1]].eigensystem.eigenvector_matrix.should ==
-      Matrix[[1, 1],
-             [Complex(0, 1), Complex(0, -1)]]
-    end
+describe "Matrix::EigenvalueDecomposition#eigenvector_matrix" do
+  it "returns a complex eigenvector matrix given a rotation matrix" do
+    # Fix me: should test for linearity, not for equality
+    Matrix[[ 1, 1],
+           [-1, 1]].eigensystem.eigenvector_matrix.should ==
+    Matrix[[1, 1],
+           [Complex(0, 1), Complex(0, -1)]]
+  end
 
-    it "returns an real eigenvector matrix for a symmetric matrix" do
-      # Fix me: should test for linearity, not for equality
-      Matrix[[1, 2],
-             [2, 1]].eigensystem.eigenvector_matrix.should ==
-      Matrix[[0.7071067811865475, 0.7071067811865475],
-             [-0.7071067811865475, 0.7071067811865475]]
-    end
+  it "returns an real eigenvector matrix for a symmetric matrix" do
+    # Fix me: should test for linearity, not for equality
+    Matrix[[1, 2],
+           [2, 1]].eigensystem.eigenvector_matrix.should ==
+    Matrix[[0.7071067811865475, 0.7071067811865475],
+           [-0.7071067811865475, 0.7071067811865475]]
   end
 end
diff --git a/spec/ruby/library/matrix/eigenvalue_decomposition/eigenvectors_spec.rb b/spec/ruby/library/matrix/eigenvalue_decomposition/eigenvectors_spec.rb
index 54e6857bf3221d..2b6ce74ea83c8e 100644
--- a/spec/ruby/library/matrix/eigenvalue_decomposition/eigenvectors_spec.rb
+++ b/spec/ruby/library/matrix/eigenvalue_decomposition/eigenvectors_spec.rb
@@ -1,25 +1,22 @@
 require_relative '../../../spec_helper'
+require 'matrix'
 
-ruby_version_is ""..."3.1" do
-  require 'matrix'
-
-  describe "Matrix::EigenvalueDecomposition#eigenvectors" do
-    it "returns an array of complex eigenvectors for a rotation matrix" do
-      # Fix me: should test for linearity, not for equality
-      Matrix[[ 1, 1],
-             [-1, 1]].eigensystem.eigenvectors.should ==
-      [ Vector[1, Complex(0, 1)],
-        Vector[1, Complex(0, -1)]
-      ]
-    end
+describe "Matrix::EigenvalueDecomposition#eigenvectors" do
+  it "returns an array of complex eigenvectors for a rotation matrix" do
+    # Fix me: should test for linearity, not for equality
+    Matrix[[ 1, 1],
+           [-1, 1]].eigensystem.eigenvectors.should ==
+    [ Vector[1, Complex(0, 1)],
+      Vector[1, Complex(0, -1)]
+    ]
+  end
 
-    it "returns an array of real eigenvectors for a symmetric matrix" do
-      # Fix me: should test for linearity, not for equality
-      Matrix[[1, 2],
-             [2, 1]].eigensystem.eigenvectors.should ==
-      [ Vector[0.7071067811865475, -0.7071067811865475],
-        Vector[0.7071067811865475, 0.7071067811865475]
-      ]
-    end
+  it "returns an array of real eigenvectors for a symmetric matrix" do
+    # Fix me: should test for linearity, not for equality
+    Matrix[[1, 2],
+           [2, 1]].eigensystem.eigenvectors.should ==
+    [ Vector[0.7071067811865475, -0.7071067811865475],
+      Vector[0.7071067811865475, 0.7071067811865475]
+    ]
   end
 end
diff --git a/spec/ruby/library/matrix/eigenvalue_decomposition/initialize_spec.rb b/spec/ruby/library/matrix/eigenvalue_decomposition/initialize_spec.rb
index 02aad65c4b04ee..8438f63133e318 100644
--- a/spec/ruby/library/matrix/eigenvalue_decomposition/initialize_spec.rb
+++ b/spec/ruby/library/matrix/eigenvalue_decomposition/initialize_spec.rb
@@ -1,27 +1,24 @@
 require_relative '../../../spec_helper'
+require 'matrix'
 
-ruby_version_is ""..."3.1" do
-  require 'matrix'
-
-  describe "Matrix::EigenvalueDecomposition#initialize" do
-    it "raises an error if argument is not a matrix" do
-      -> {
-        Matrix::EigenvalueDecomposition.new([[]])
-      }.should raise_error(TypeError)
-      -> {
-        Matrix::EigenvalueDecomposition.new(42)
-      }.should raise_error(TypeError)
-    end
+describe "Matrix::EigenvalueDecomposition#initialize" do
+  it "raises an error if argument is not a matrix" do
+    -> {
+      Matrix::EigenvalueDecomposition.new([[]])
+    }.should raise_error(TypeError)
+    -> {
+      Matrix::EigenvalueDecomposition.new(42)
+    }.should raise_error(TypeError)
+  end
 
-    it "raises an error if matrix is not square" do
-      -> {
-        Matrix::EigenvalueDecomposition.new(Matrix[[1, 2]])
-      }.should raise_error(Matrix::ErrDimensionMismatch)
-    end
+  it "raises an error if matrix is not square" do
+    -> {
+      Matrix::EigenvalueDecomposition.new(Matrix[[1, 2]])
+    }.should raise_error(Matrix::ErrDimensionMismatch)
+  end
 
-    it "never hangs" do
-      m = Matrix[ [0,0,0,0,0], [0,0,0,0,1], [0,0,0,1,0], [1,1,0,0,1], [1,0,1,0,1] ]
-      Matrix::EigenvalueDecomposition.new(m).should_not == "infinite loop"
-    end
+  it "never hangs" do
+    m = Matrix[ [0,0,0,0,0], [0,0,0,0,1], [0,0,0,1,0], [1,1,0,0,1], [1,0,1,0,1] ]
+    Matrix::EigenvalueDecomposition.new(m).should_not == "infinite loop"
   end
 end
diff --git a/spec/ruby/library/matrix/eigenvalue_decomposition/to_a_spec.rb b/spec/ruby/library/matrix/eigenvalue_decomposition/to_a_spec.rb
index 352ae274b48082..8be41a57206e83 100644
--- a/spec/ruby/library/matrix/eigenvalue_decomposition/to_a_spec.rb
+++ b/spec/ruby/library/matrix/eigenvalue_decomposition/to_a_spec.rb
@@ -1,21 +1,18 @@
 require_relative '../../../spec_helper'
+require 'matrix'
 
-ruby_version_is ""..."3.1" do
-  require 'matrix'
-
-  describe "Matrix::EigenvalueDecomposition#to_a" do
-    before :each do
-      @a = Matrix[[14, 16], [-6, -6]]
-      @e = Matrix::EigenvalueDecomposition.new(@a)
-    end
+describe "Matrix::EigenvalueDecomposition#to_a" do
+  before :each do
+    @a = Matrix[[14, 16], [-6, -6]]
+    @e = Matrix::EigenvalueDecomposition.new(@a)
+  end
 
-    it "returns an array of with [V, D, V.inv]" do
-      @e.to_a.should == [@e.v, @e.d, @e.v_inv]
-    end
+  it "returns an array of with [V, D, V.inv]" do
+    @e.to_a.should == [@e.v, @e.d, @e.v_inv]
+  end
 
-    it "returns a factorization" do
-      v, d, v_inv = @e.to_a
-      (v * d * v_inv).map{|e| e.round(10)}.should == @a
-    end
+  it "returns a factorization" do
+    v, d, v_inv = @e.to_a
+    (v * d * v_inv).map{|e| e.round(10)}.should == @a
   end
 end
diff --git a/spec/ruby/library/matrix/element_reference_spec.rb b/spec/ruby/library/matrix/element_reference_spec.rb
index 286ab851bd0629..b950d1c391f7b0 100644
--- a/spec/ruby/library/matrix/element_reference_spec.rb
+++ b/spec/ruby/library/matrix/element_reference_spec.rb
@@ -1,26 +1,23 @@
 require_relative '../../spec_helper'
+require 'matrix'
 
-ruby_version_is ""..."3.1" do
-  require 'matrix'
+describe "Matrix#[]" do
 
-  describe "Matrix#[]" do
-
-    before :all do
-      @m = Matrix[[0, 1, 2], [3, 4, 5], [6, 7, 8], [9, 10, 11]]
-    end
+  before :all do
+    @m = Matrix[[0, 1, 2], [3, 4, 5], [6, 7, 8], [9, 10, 11]]
+  end
 
-    it "returns element at (i, j)" do
-      (0..3).each do |i|
-        (0..2).each do |j|
-          @m[i, j].should == (i * 3) + j
-        end
+  it "returns element at (i, j)" do
+    (0..3).each do |i|
+      (0..2).each do |j|
+        @m[i, j].should == (i * 3) + j
       end
     end
+  end
 
-    it "returns nil for an invalid index pair" do
-      @m[8,1].should be_nil
-      @m[1,8].should be_nil
-    end
-
+  it "returns nil for an invalid index pair" do
+    @m[8,1].should be_nil
+    @m[1,8].should be_nil
   end
+
 end
diff --git a/spec/ruby/library/matrix/empty_spec.rb b/spec/ruby/library/matrix/empty_spec.rb
index 0b5d5ffe0f075e..5f294711db1847 100644
--- a/spec/ruby/library/matrix/empty_spec.rb
+++ b/spec/ruby/library/matrix/empty_spec.rb
@@ -1,71 +1,68 @@
 require_relative '../../spec_helper'
+require_relative 'fixtures/classes'
+require 'matrix'
 
-ruby_version_is ""..."3.1" do
-  require_relative 'fixtures/classes'
-  require 'matrix'
-
-  describe "Matrix#empty?" do
-    it "returns true when the Matrix is empty" do
-      Matrix[ ].empty?.should be_true
-      Matrix[ [], [], [] ].empty?.should be_true
-      Matrix[ [], [], [] ].transpose.empty?.should be_true
-    end
-
-    it "returns false when the Matrix has elements" do
-      Matrix[ [1, 2] ].empty?.should be_false
-      Matrix[ [1], [2] ].empty?.should be_false
-    end
+describe "Matrix#empty?" do
+  it "returns true when the Matrix is empty" do
+    Matrix[ ].empty?.should be_true
+    Matrix[ [], [], [] ].empty?.should be_true
+    Matrix[ [], [], [] ].transpose.empty?.should be_true
+  end
 
-    it "doesn't accept any parameter" do
-      ->{
-        Matrix[ [1, 2] ].empty?(42)
-      }.should raise_error(ArgumentError)
-    end
+  it "returns false when the Matrix has elements" do
+    Matrix[ [1, 2] ].empty?.should be_false
+    Matrix[ [1], [2] ].empty?.should be_false
   end
 
-  describe "Matrix.empty" do
-    it "returns an empty matrix of the requested size" do
-      m = Matrix.empty(3, 0)
-      m.row_size.should == 3
-      m.column_size.should == 0
+  it "doesn't accept any parameter" do
+    ->{
+      Matrix[ [1, 2] ].empty?(42)
+    }.should raise_error(ArgumentError)
+  end
+end
 
-      m = Matrix.empty(0, 3)
-      m.row_size.should == 0
-      m.column_size.should == 3
-    end
+describe "Matrix.empty" do
+  it "returns an empty matrix of the requested size" do
+    m = Matrix.empty(3, 0)
+    m.row_size.should == 3
+    m.column_size.should == 0
 
-    it "has arguments defaulting to 0" do
-      Matrix.empty.should == Matrix.empty(0, 0)
-      Matrix.empty(42).should == Matrix.empty(42, 0)
-    end
+    m = Matrix.empty(0, 3)
+    m.row_size.should == 0
+    m.column_size.should == 3
+  end
 
-    it "does not accept more than two parameters" do
-      ->{
-        Matrix.empty(1, 2, 3)
-      }.should raise_error(ArgumentError)
-    end
+  it "has arguments defaulting to 0" do
+    Matrix.empty.should == Matrix.empty(0, 0)
+    Matrix.empty(42).should == Matrix.empty(42, 0)
+  end
 
-    it "raises an error if both dimensions are > 0" do
-      ->{
-        Matrix.empty(1, 2)
-      }.should raise_error(ArgumentError)
-    end
+  it "does not accept more than two parameters" do
+    ->{
+      Matrix.empty(1, 2, 3)
+    }.should raise_error(ArgumentError)
+  end
 
-    it "raises an error if any dimension is < 0" do
-      ->{
-        Matrix.empty(-2, 0)
-      }.should raise_error(ArgumentError)
+  it "raises an error if both dimensions are > 0" do
+    ->{
+      Matrix.empty(1, 2)
+    }.should raise_error(ArgumentError)
+  end
 
-      ->{
-        Matrix.empty(0, -2)
-      }.should raise_error(ArgumentError)
-    end
+  it "raises an error if any dimension is < 0" do
+    ->{
+      Matrix.empty(-2, 0)
+    }.should raise_error(ArgumentError)
 
+    ->{
+      Matrix.empty(0, -2)
+    }.should raise_error(ArgumentError)
   end
 
-  describe "for a subclass of Matrix" do
-    it "returns an instance of that subclass" do
-      MatrixSub.empty(0, 1).should be_an_instance_of(MatrixSub)
-    end
+end
+
+describe "for a subclass of Matrix" do
+  it "returns an instance of that subclass" do
+    MatrixSub.empty(0, 1).should be_an_instance_of(MatrixSub)
   end
 end
diff --git a/spec/ruby/library/matrix/eql_spec.rb b/spec/ruby/library/matrix/eql_spec.rb
index d3f03dd6f3f6cb..ea26c3320d247c 100644
--- a/spec/ruby/library/matrix/eql_spec.rb
+++ b/spec/ruby/library/matrix/eql_spec.rb
@@ -1,14 +1,11 @@
 require_relative '../../spec_helper'
+require_relative 'shared/equal_value'
+require 'matrix'
 
-ruby_version_is ""..."3.1" do
-  require_relative 'shared/equal_value'
-  require 'matrix'
+describe "Matrix#eql?" do
+  it_behaves_like :equal, :eql?
 
-  describe "Matrix#eql?" do
-    it_behaves_like :equal, :eql?
-
-    it "returns false if some elements are == but not eql?" do
-      Matrix[[1, 2],[3, 4]].eql?(Matrix[[1, 2],[3, 4.0]]).should be_false
-    end
+  it "returns false if some elements are == but not eql?" do
+    Matrix[[1, 2],[3, 4]].eql?(Matrix[[1, 2],[3, 4.0]]).should be_false
   end
 end
diff --git a/spec/ruby/library/matrix/equal_value_spec.rb b/spec/ruby/library/matrix/equal_value_spec.rb
index 0408a8ef3ea322..10cf1e6c291c8c 100644
--- a/spec/ruby/library/matrix/equal_value_spec.rb
+++ b/spec/ruby/library/matrix/equal_value_spec.rb
@@ -1,14 +1,11 @@
 require_relative '../../spec_helper'
+require_relative 'shared/equal_value'
+require 'matrix'
 
-ruby_version_is ""..."3.1" do
-  require_relative 'shared/equal_value'
-  require 'matrix'
+describe "Matrix#==" do
+  it_behaves_like :equal, :==
 
-  describe "Matrix#==" do
-    it_behaves_like :equal, :==
-
-    it "returns true if some elements are == but not eql?" do
-      Matrix[[1, 2],[3, 4]].should == Matrix[[1, 2],[3, 4.0]]
-    end
+  it "returns true if some elements are == but not eql?" do
+    Matrix[[1, 2],[3, 4]].should == Matrix[[1, 2],[3, 4.0]]
   end
 end
diff --git a/spec/ruby/library/matrix/exponent_spec.rb b/spec/ruby/library/matrix/exponent_spec.rb
index 5262627fd54760..38cdfa927626ce 100644
--- a/spec/ruby/library/matrix/exponent_spec.rb
+++ b/spec/ruby/library/matrix/exponent_spec.rb
@@ -1,67 +1,62 @@
 require_relative '../../spec_helper'
+require_relative 'fixtures/classes'
+require 'matrix'
+
+describe "Matrix#**" do
+
+  describe "given an integer _n_" do
+    it "multiples the Matrix by itself _n_ times" do
+      m = Matrix[ [7,6], [3,9] ]
+      (m ** 1).should == m
+      (m ** 2).should == Matrix[ [67, 96], [48,99] ]
+      (m ** 2).should == m * m
+      (m ** 3).should == m * m * m
+      (m ** 4).should == m * m * m * m
+      (m ** 5).should == m * m * m * m * m
+    end
 
-ruby_version_is ""..."3.1" do
-  require_relative 'fixtures/classes'
-  require 'matrix'
-
-  describe "Matrix#**" do
+    it "raises a ErrDimensionMismatch for non square matrices" do
+      m = Matrix[ [1, 1], [1, 2], [2, 3]]
+      -> { m ** 3 }.should raise_error(Matrix::ErrDimensionMismatch)
+      -> { m ** 0 }.should raise_error(Matrix::ErrDimensionMismatch)
+    end
 
-    describe "given an integer _n_" do
-      it "multiples the Matrix by itself _n_ times" do
-        m = Matrix[ [7,6], [3,9] ]
-        (m ** 1).should == m
-        (m ** 2).should == Matrix[ [67, 96], [48,99] ]
-        (m ** 2).should == m * m
-        (m ** 3).should == m * m * m
-        (m ** 4).should == m * m * m * m
-        (m ** 5).should == m * m * m * m * m
+    describe "that is < 0" do
+      it "returns the inverse of **(-n)" do
+        m = Matrix[ [1, 1], [1, 2] ]
+        (m ** -2).should == Matrix[ [5, -3], [-3, 2]]
+        (m ** -4).should == (m.inverse ** 4)
       end
 
-      it "raises a ErrDimensionMismatch for non square matrices" do
-        m = Matrix[ [1, 1], [1, 2], [2, 3]]
-        -> { m ** 3 }.should raise_error(Matrix::ErrDimensionMismatch)
-        -> { m ** 0 }.should raise_error(Matrix::ErrDimensionMismatch)
+      it "raises a ErrNotRegular for irregular matrices" do
+        m = Matrix[ [1, 1], [1, 1] ]
+        -> { m ** -2 }.should raise_error(Matrix::ErrNotRegular)
       end
+    end
 
-      describe "that is < 0" do
-        it "returns the inverse of **(-n)" do
-          m = Matrix[ [1, 1], [1, 2] ]
-          (m ** -2).should == Matrix[ [5, -3], [-3, 2]]
-          (m ** -4).should == (m.inverse ** 4)
-        end
-
-        it "raises a ErrNotRegular for irregular matrices" do
-          m = Matrix[ [1, 1], [1, 1] ]
-          -> { m ** -2 }.should raise_error(Matrix::ErrNotRegular)
-        end
+    describe "that is 0" do
+      it "returns the identity for square matrices" do
+        m = Matrix[ [1, 1], [1, 1] ]
+        (m ** 0).should == Matrix.identity(2)
       end
 
-      ruby_version_is '3.1.0' do # https://bugs.ruby-lang.org/issues/17521
-        describe "that is 0" do
-          it "returns the identity for square matrices" do
-            m = Matrix[ [1, 1], [1, 1] ]
-            (m ** 0).should == Matrix.identity(2)
-          end
-
-          it "raises an ErrDimensionMismatch for non-square matrices" do
-            m = Matrix[ [1, 1] ]
-            -> { m ** 0 }.should raise_error(Matrix::ErrDimensionMismatch)
-          end
-        end
+      it "raises an ErrDimensionMismatch for non-square matrices" do
+        m = Matrix[ [1, 1] ]
+        -> { m ** 0 }.should raise_error(Matrix::ErrDimensionMismatch)
       end
     end
+  end
 
-    it "returns the power for non integer powers" do
-      a = Matrix[[5, 4], [4, 5]]
-      ((a ** 0.5) ** 2).round(8).should == a
-      a = Matrix[[7, 10], [15, 22]]
-      ((a ** 0.25) ** 4).round(8).should == a
-    end
+  it "returns the power for non integer powers" do
+    a = Matrix[[5, 4], [4, 5]]
+    ((a ** 0.5) ** 2).round(8).should == a
+    a = Matrix[[7, 10], [15, 22]]
+    ((a ** 0.25) ** 4).round(8).should == a
+  end
 
-    describe "for a subclass of Matrix" do
-      it "returns an instance of that subclass" do
-        (MatrixSub.ins ** 1).should be_an_instance_of(MatrixSub)
-      end
+  describe "for a subclass of Matrix" do
+    it "returns an instance of that subclass" do
+      (MatrixSub.ins ** 1).should be_an_instance_of(MatrixSub)
     end
   end
 end
diff --git a/spec/ruby/library/matrix/find_index_spec.rb b/spec/ruby/library/matrix/find_index_spec.rb
index a0e3679aef4090..c2bfa6d61ab529 100644
--- a/spec/ruby/library/matrix/find_index_spec.rb
+++ b/spec/ruby/library/matrix/find_index_spec.rb
@@ -1,149 +1,146 @@
 require_relative '../../spec_helper'
+require 'matrix'
 
-ruby_version_is ""..."3.1" do
-  require 'matrix'
-
-  describe "Matrix#find_index without any argument" do
-    before :all do
-      @m = Matrix[ [1, 2, 3, 4], [5, 6, 7, 8] ]
-    end
+describe "Matrix#find_index without any argument" do
+  before :all do
+    @m = Matrix[ [1, 2, 3, 4], [5, 6, 7, 8] ]
+  end
 
-    it "returns an Enumerator when called without a block" do
-      enum = @m.find_index
-      enum.should be_an_instance_of(Enumerator)
-      enum.to_a.should == [1, 2, 3, 4, 5, 6, 7, 8]
-    end
+  it "returns an Enumerator when called without a block" do
+    enum = @m.find_index
+    enum.should be_an_instance_of(Enumerator)
+    enum.to_a.should == [1, 2, 3, 4, 5, 6, 7, 8]
+  end
 
-    it "returns nil if the block is always false" do
-      @m.find_index{false}.should be_nil
-    end
+  it "returns nil if the block is always false" do
+    @m.find_index{false}.should be_nil
+  end
 
-    it "returns the first index for which the block is true" do
-      @m.find_index{|x| x >= 3}.should == [0, 2]
-    end
+  it "returns the first index for which the block is true" do
+    @m.find_index{|x| x >= 3}.should == [0, 2]
   end
+end
 
-  describe "Matrix#find_index with a subselection argument" do
-    before :all do
-      @tests = [
-      [  Matrix[ [1, 2, 3, 4], [5, 6, 7, 8] ], {
-          diagonal: [1, 6]               ,
-          off_diagonal: [2, 3, 4, 5, 7, 8],
-          lower: [1, 5, 6]               ,
-          strict_lower: [5]              ,
-          strict_upper: [2, 3, 4, 7, 8]  ,
-          upper: [1, 2, 3, 4, 6, 7, 8]   ,
-        }
-      ],
-      [  Matrix[ [1, 2], [3, 4], [5, 6], [7, 8] ], {
-          diagonal: [1, 4]               ,
-          off_diagonal: [2, 3, 5, 6, 7, 8],
-          lower: [1, 3, 4, 5, 6, 7, 8]   ,
-          strict_lower: [3, 5, 6, 7, 8]  ,
-          strict_upper: [2]              ,
-          upper: [1, 2, 4]               ,
-        }
-      ]]
-    end
+describe "Matrix#find_index with a subselection argument" do
+  before :all do
+    @tests = [
+    [  Matrix[ [1, 2, 3, 4], [5, 6, 7, 8] ], {
+        diagonal: [1, 6]               ,
+        off_diagonal: [2, 3, 4, 5, 7, 8],
+        lower: [1, 5, 6]               ,
+        strict_lower: [5]              ,
+        strict_upper: [2, 3, 4, 7, 8]  ,
+        upper: [1, 2, 3, 4, 6, 7, 8]   ,
+      }
+    ],
+    [  Matrix[ [1, 2], [3, 4], [5, 6], [7, 8] ], {
+        diagonal: [1, 4]               ,
+        off_diagonal: [2, 3, 5, 6, 7, 8],
+        lower: [1, 3, 4, 5, 6, 7, 8]   ,
+        strict_lower: [3, 5, 6, 7, 8]  ,
+        strict_upper: [2]              ,
+        upper: [1, 2, 4]               ,
+      }
+    ]]
+  end
 
-    describe "and no generic argument" do
-      it "returns an Enumerator when called without a block" do
-        @tests.each do |matrix, h|
-          h.each do |selector, result|
-            matrix.find_index(selector).should be_an_instance_of(Enumerator)
-          end
+  describe "and no generic argument" do
+    it "returns an Enumerator when called without a block" do
+      @tests.each do |matrix, h|
+        h.each do |selector, result|
+          matrix.find_index(selector).should be_an_instance_of(Enumerator)
         end
       end
+    end
 
-      it "yields the rights elements" do
-        @tests.each do |matrix, h|
-          h.each do |selector, result|
-            matrix.find_index(selector).to_a.should == result
-          end
+    it "yields the rights elements" do
+      @tests.each do |matrix, h|
+        h.each do |selector, result|
+          matrix.find_index(selector).to_a.should == result
         end
       end
+    end
 
-      it "returns the first index for which the block returns true" do
-        @tests.each do |matrix, h|
-          h.each do |selector, result|
-            cnt = result.size.div 2
-            which = result[cnt]
-            idx = matrix.find_index(selector){|x| cnt -= 1; x == which}
-            matrix[*idx].should == which
-            cnt.should == -1
-          end
+    it "returns the first index for which the block returns true" do
+      @tests.each do |matrix, h|
+        h.each do |selector, result|
+          cnt = result.size.div 2
+          which = result[cnt]
+          idx = matrix.find_index(selector){|x| cnt -= 1; x == which}
+          matrix[*idx].should == which
+          cnt.should == -1
         end
       end
+    end
 
-      it "returns nil if the block is always false" do
-        @tests.each do |matrix, h|
-          h.each do |selector, result|
-            matrix.find_index(selector){ nil }.should == nil
-          end
+    it "returns nil if the block is always false" do
+      @tests.each do |matrix, h|
+        h.each do |selector, result|
+          matrix.find_index(selector){ nil }.should == nil
         end
       end
-
     end
 
-    describe "and a generic argument" do
-      it "ignores a block" do
-        @m.find_index(42, :diagonal){raise "oups"}.should == nil
-      end
+  end
+
+  describe "and a generic argument" do
+    it "ignores a block" do
+      @m.find_index(42, :diagonal){raise "oups"}.should == nil
+    end
 
-      it "returns the index of the requested value" do
-        @tests.each do |matrix, h|
-          h.each do |selector, result|
-            cnt = result.size / 2
-            which = result[cnt]
-            idx = matrix.find_index(which, selector)
-            matrix[*idx].should == which
-          end
+    it "returns the index of the requested value" do
+      @tests.each do |matrix, h|
+        h.each do |selector, result|
+          cnt = result.size / 2
+          which = result[cnt]
+          idx = matrix.find_index(which, selector)
+          matrix[*idx].should == which
         end
       end
+    end
 
-      it "returns nil if the requested value is not found" do
-        @tests.each do |matrix, h|
-          h.each do |selector, result|
-            matrix.find_index(42, selector).should == nil
-          end
+    it "returns nil if the requested value is not found" do
+      @tests.each do |matrix, h|
+        h.each do |selector, result|
+          matrix.find_index(42, selector).should == nil
         end
       end
     end
-
   end
 
-  describe "Matrix#find_index with only a generic argument" do
-    before :all do
-      @m = Matrix[ [1, 2, 3, 4], [1, 2, 3, 4] ]
-    end
+end
 
-    it "returns nil if the value is not found" do
-      @m.find_index(42).should be_nil
-    end
+describe "Matrix#find_index with only a generic argument" do
+  before :all do
+    @m = Matrix[ [1, 2, 3, 4], [1, 2, 3, 4] ]
+  end
 
-    it "returns the first index for of the requested value" do
-      @m.find_index(3).should == [0, 2]
-    end
+  it "returns nil if the value is not found" do
+    @m.find_index(42).should be_nil
+  end
 
-    it "ignores a block" do
-      @m.find_index(4){raise "oups"}.should == [0, 3]
-    end
+  it "returns the first index for of the requested value" do
+    @m.find_index(3).should == [0, 2]
   end
 
-  describe "Matrix#find_index with two arguments" do
-    it "raises an ArgumentError for an unrecognized last argument" do
-      -> {
-        @m.find_index(1, "all"){}
-      }.should raise_error(ArgumentError)
-      -> {
-        @m.find_index(1, nil){}
-      }.should raise_error(ArgumentError)
-      -> {
-        @m.find_index(1, :left){}
-      }.should raise_error(ArgumentError)
-      -> {
-        @m.find_index(:diagonal, 1){}
-      }.should raise_error(ArgumentError)
-    end
+  it "ignores a block" do
+    @m.find_index(4){raise "oups"}.should == [0, 3]
+  end
+end
+
+describe "Matrix#find_index with two arguments" do
+  it "raises an ArgumentError for an unrecognized last argument" do
+    -> {
+      @m.find_index(1, "all"){}
+    }.should raise_error(ArgumentError)
+    -> {
+      @m.find_index(1, nil){}
+    }.should raise_error(ArgumentError)
+    -> {
+      @m.find_index(1, :left){}
+    }.should raise_error(ArgumentError)
+    -> {
+      @m.find_index(:diagonal, 1){}
+    }.should raise_error(ArgumentError)
   end
 end
diff --git a/spec/ruby/library/matrix/hash_spec.rb b/spec/ruby/library/matrix/hash_spec.rb
index 7c1970511bdb83..7dabcd3737cf3f 100644
--- a/spec/ruby/library/matrix/hash_spec.rb
+++ b/spec/ruby/library/matrix/hash_spec.rb
@@ -1,18 +1,15 @@
 require_relative '../../spec_helper'
+require 'matrix'
 
-ruby_version_is ""..."3.1" do
-  require 'matrix'
+describe "Matrix#hash" do
 
-  describe "Matrix#hash" do
-
-    it "returns an Integer" do
-      Matrix[ [1,2] ].hash.should be_an_instance_of(Integer)
-    end
-
-    it "returns the same value for the same matrix" do
-      data = [ [40,5], [2,7] ]
-      Matrix[ *data ].hash.should == Matrix[ *data ].hash
-    end
+  it "returns an Integer" do
+    Matrix[ [1,2] ].hash.should be_an_instance_of(Integer)
+  end
 
+  it "returns the same value for the same matrix" do
+    data = [ [40,5], [2,7] ]
+    Matrix[ *data ].hash.should == Matrix[ *data ].hash
   end
+
 end
diff --git a/spec/ruby/library/matrix/hermitian_spec.rb b/spec/ruby/library/matrix/hermitian_spec.rb
index 4038ee3fa9fbfd..177ca64d839c0b 100644
--- a/spec/ruby/library/matrix/hermitian_spec.rb
+++ b/spec/ruby/library/matrix/hermitian_spec.rb
@@ -1,37 +1,34 @@
 require_relative '../../spec_helper'
+require 'matrix'
 
-ruby_version_is ""..."3.1" do
-  require 'matrix'
-
-  describe "Matrix.hermitian?" do
-    it "returns true for a hermitian Matrix" do
-      Matrix[[1, 2, Complex(0, 3)], [2, 4, 5], [Complex(0, -3), 5, 6]].hermitian?.should be_true
-    end
+describe "Matrix.hermitian?" do
+  it "returns true for a hermitian Matrix" do
+    Matrix[[1, 2, Complex(0, 3)], [2, 4, 5], [Complex(0, -3), 5, 6]].hermitian?.should be_true
+  end
 
-    it "returns true for a 0x0 empty matrix" do
-      Matrix.empty.hermitian?.should be_true
-    end
+  it "returns true for a 0x0 empty matrix" do
+    Matrix.empty.hermitian?.should be_true
+  end
 
-    it "returns false for an asymmetric Matrix" do
-      Matrix[[1, 2],[-2, 1]].hermitian?.should be_false
-    end
+  it "returns false for an asymmetric Matrix" do
+    Matrix[[1, 2],[-2, 1]].hermitian?.should be_false
+  end
 
-    it "raises an error for rectangular matrices" do
-      [
-        Matrix[[0], [0]],
-        Matrix[[0, 0]],
-        Matrix.empty(0, 2),
-        Matrix.empty(2, 0),
-      ].each do |rectangular_matrix|
-        -> {
-          rectangular_matrix.hermitian?
-        }.should raise_error(Matrix::ErrDimensionMismatch)
-      end
+  it "raises an error for rectangular matrices" do
+    [
+      Matrix[[0], [0]],
+      Matrix[[0, 0]],
+      Matrix.empty(0, 2),
+      Matrix.empty(2, 0),
+    ].each do |rectangular_matrix|
+      -> {
+        rectangular_matrix.hermitian?
+      }.should raise_error(Matrix::ErrDimensionMismatch)
     end
+  end
 
-    it "returns false for a matrix with complex values on the diagonal" do
-      Matrix[[Complex(1,1)]].hermitian?.should be_false
-      Matrix[[Complex(1,0)]].hermitian?.should be_true
-    end
+  it "returns false for a matrix with complex values on the diagonal" do
+    Matrix[[Complex(1,1)]].hermitian?.should be_false
+    Matrix[[Complex(1,0)]].hermitian?.should be_true
   end
 end
diff --git a/spec/ruby/library/matrix/identity_spec.rb b/spec/ruby/library/matrix/identity_spec.rb
index 14f51c402e5d24..646462bc477c8d 100644
--- a/spec/ruby/library/matrix/identity_spec.rb
+++ b/spec/ruby/library/matrix/identity_spec.rb
@@ -1,9 +1,6 @@
 require_relative '../../spec_helper'
+require_relative 'shared/identity'
 
-ruby_version_is ""..."3.1" do
-  require_relative 'shared/identity'
-
-  describe "Matrix.identity" do
-    it_behaves_like :matrix_identity, :identity
-  end
+describe "Matrix.identity" do
+  it_behaves_like :matrix_identity, :identity
 end
diff --git a/spec/ruby/library/matrix/imag_spec.rb b/spec/ruby/library/matrix/imag_spec.rb
index a89186ec02962a..1c988753d87c06 100644
--- a/spec/ruby/library/matrix/imag_spec.rb
+++ b/spec/ruby/library/matrix/imag_spec.rb
@@ -1,9 +1,6 @@
 require_relative '../../spec_helper'
+require_relative 'shared/imaginary'
 
-ruby_version_is ""..."3.1" do
-  require_relative 'shared/imaginary'
-
-  describe "Matrix#imag" do
-    it_behaves_like :matrix_imaginary, :imag
-  end
+describe "Matrix#imag" do
+  it_behaves_like :matrix_imaginary, :imag
 end
diff --git a/spec/ruby/library/matrix/imaginary_spec.rb b/spec/ruby/library/matrix/imaginary_spec.rb
index e7f0e49d319251..ceae4bbe8d0895 100644
--- a/spec/ruby/library/matrix/imaginary_spec.rb
+++ b/spec/ruby/library/matrix/imaginary_spec.rb
@@ -1,9 +1,6 @@
 require_relative '../../spec_helper'
+require_relative 'shared/imaginary'
 
-ruby_version_is ""..."3.1" do
-  require_relative 'shared/imaginary'
-
-  describe "Matrix#imaginary" do
-    it_behaves_like :matrix_imaginary, :imaginary
-  end
+describe "Matrix#imaginary" do
+  it_behaves_like :matrix_imaginary, :imaginary
 end
diff --git a/spec/ruby/library/matrix/inspect_spec.rb b/spec/ruby/library/matrix/inspect_spec.rb
index d754c0fe7fc23b..508f478252a0cd 100644
--- a/spec/ruby/library/matrix/inspect_spec.rb
+++ b/spec/ruby/library/matrix/inspect_spec.rb
@@ -1,30 +1,27 @@
 require_relative '../../spec_helper'
+require_relative 'fixtures/classes'
+require 'matrix'
 
-ruby_version_is ""..."3.1" do
-  require_relative 'fixtures/classes'
-  require 'matrix'
+describe "Matrix#inspect" do
 
-  describe "Matrix#inspect" do
-
-    it "returns a stringified representation of the Matrix" do
-      Matrix[ [1,2], [2,1] ].inspect.should == "Matrix[[1, 2], [2, 1]]"
-    end
+  it "returns a stringified representation of the Matrix" do
+    Matrix[ [1,2], [2,1] ].inspect.should == "Matrix[[1, 2], [2, 1]]"
+  end
 
-    it "returns 'Matrix.empty(...)' for empty matrices" do
-      Matrix[ [], [], [] ].inspect.should == "Matrix.empty(3, 0)"
-      Matrix.columns([ [], [], [] ]).inspect.should == "Matrix.empty(0, 3)"
-    end
+  it "returns 'Matrix.empty(...)' for empty matrices" do
+    Matrix[ [], [], [] ].inspect.should == "Matrix.empty(3, 0)"
+    Matrix.columns([ [], [], [] ]).inspect.should == "Matrix.empty(0, 3)"
+  end
 
-    it "calls inspect on its contents" do
-      obj = mock("some_value")
-      obj.should_receive(:inspect).and_return("some_value")
-      Matrix[ [1, 2], [3, obj] ].inspect.should == "Matrix[[1, 2], [3, some_value]]"
-    end
+  it "calls inspect on its contents" do
+    obj = mock("some_value")
+    obj.should_receive(:inspect).and_return("some_value")
+    Matrix[ [1, 2], [3, obj] ].inspect.should == "Matrix[[1, 2], [3, some_value]]"
+  end
 
-    describe "for a subclass of Matrix" do
-      it "returns a string using the subclass' name" do
-        MatrixSub.ins.inspect.should == "MatrixSub[[1, 0], [0, 1]]"
-      end
+  describe "for a subclass of Matrix" do
+    it "returns a string using the subclass' name" do
+      MatrixSub.ins.inspect.should == "MatrixSub[[1, 0], [0, 1]]"
     end
   end
 end
diff --git a/spec/ruby/library/matrix/inv_spec.rb b/spec/ruby/library/matrix/inv_spec.rb
index 0ad817a2538569..82879a6d82d07b 100644
--- a/spec/ruby/library/matrix/inv_spec.rb
+++ b/spec/ruby/library/matrix/inv_spec.rb
@@ -1,10 +1,7 @@
 require_relative '../../spec_helper'
+require_relative 'spec_helper'
+require_relative 'shared/inverse'
 
-ruby_version_is ""..."3.1" do
-  require_relative 'spec_helper'
-  require_relative 'shared/inverse'
-
-  describe "Matrix#inv" do
-    it_behaves_like :inverse, :inv
-  end
+describe "Matrix#inv" do
+  it_behaves_like :inverse, :inv
 end
diff --git a/spec/ruby/library/matrix/inverse_from_spec.rb b/spec/ruby/library/matrix/inverse_from_spec.rb
index bca40542f63819..651d56a2440e1b 100644
--- a/spec/ruby/library/matrix/inverse_from_spec.rb
+++ b/spec/ruby/library/matrix/inverse_from_spec.rb
@@ -1,9 +1,6 @@
 require_relative '../../spec_helper'
+require 'matrix'
 
-ruby_version_is ""..."3.1" do
-  require 'matrix'
-
-  describe "Matrix#inverse_from" do
-    it "needs to be reviewed for spec completeness"
-  end
+describe "Matrix#inverse_from" do
+  it "needs to be reviewed for spec completeness"
 end
diff --git a/spec/ruby/library/matrix/inverse_spec.rb b/spec/ruby/library/matrix/inverse_spec.rb
index dd9099bec579cd..fa3fa7de8a7ee4 100644
--- a/spec/ruby/library/matrix/inverse_spec.rb
+++ b/spec/ruby/library/matrix/inverse_spec.rb
@@ -1,10 +1,7 @@
 require_relative '../../spec_helper'
+require_relative 'spec_helper'
+require_relative 'shared/inverse'
 
-ruby_version_is ""..."3.1" do
-  require_relative 'spec_helper'
-  require_relative 'shared/inverse'
-
-  describe "Matrix#inverse" do
-    it_behaves_like :inverse, :inverse
-  end
+describe "Matrix#inverse" do
+  it_behaves_like :inverse, :inverse
 end
diff --git a/spec/ruby/library/matrix/lower_triangular_spec.rb b/spec/ruby/library/matrix/lower_triangular_spec.rb
index 0223b8b6199386..f3aa4501f4f1b8 100644
--- a/spec/ruby/library/matrix/lower_triangular_spec.rb
+++ b/spec/ruby/library/matrix/lower_triangular_spec.rb
@@ -1,27 +1,24 @@
 require_relative '../../spec_helper'
+require 'matrix'
 
-ruby_version_is ""..."3.1" do
-  require 'matrix'
-
-  describe "Matrix.lower_triangular?" do
-    it "returns true for a square lower triangular Matrix" do
-      Matrix[[1, 0, 0], [1, 2, 0], [1, 2, 3]].lower_triangular?.should be_true
-      Matrix.diagonal([1, 2, 3]).lower_triangular?.should be_true
-      Matrix[[1, 0], [1, 2], [1, 2], [1, 2]].lower_triangular?.should be_true
-      Matrix[[1, 0, 0, 0], [1, 2, 0, 0]].lower_triangular?.should be_true
-    end
+describe "Matrix.lower_triangular?" do
+  it "returns true for a square lower triangular Matrix" do
+    Matrix[[1, 0, 0], [1, 2, 0], [1, 2, 3]].lower_triangular?.should be_true
+    Matrix.diagonal([1, 2, 3]).lower_triangular?.should be_true
+    Matrix[[1, 0], [1, 2], [1, 2], [1, 2]].lower_triangular?.should be_true
+    Matrix[[1, 0, 0, 0], [1, 2, 0, 0]].lower_triangular?.should be_true
+  end
 
-    it "returns true for an empty Matrix" do
-      Matrix.empty(3, 0).lower_triangular?.should be_true
-      Matrix.empty(0, 3).lower_triangular?.should be_true
-      Matrix.empty(0, 0).lower_triangular?.should be_true
-    end
+  it "returns true for an empty Matrix" do
+    Matrix.empty(3, 0).lower_triangular?.should be_true
+    Matrix.empty(0, 3).lower_triangular?.should be_true
+    Matrix.empty(0, 0).lower_triangular?.should be_true
+  end
 
-    it "returns false for a non lower triangular square Matrix" do
-      Matrix[[0, 1], [0, 0]].lower_triangular?.should be_false
-      Matrix[[1, 2, 3], [1, 2, 3], [1, 2, 3]].lower_triangular?.should be_false
-      Matrix[[0, 1], [0, 0], [0, 0], [0, 0]].lower_triangular?.should be_false
-      Matrix[[0, 0, 0, 1], [0, 0, 0, 0]].lower_triangular?.should be_false
-    end
+  it "returns false for a non lower triangular square Matrix" do
+    Matrix[[0, 1], [0, 0]].lower_triangular?.should be_false
+    Matrix[[1, 2, 3], [1, 2, 3], [1, 2, 3]].lower_triangular?.should be_false
+    Matrix[[0, 1], [0, 0], [0, 0], [0, 0]].lower_triangular?.should be_false
+    Matrix[[0, 0, 0, 1], [0, 0, 0, 0]].lower_triangular?.should be_false
   end
 end
diff --git a/spec/ruby/library/matrix/lup_decomposition/determinant_spec.rb b/spec/ruby/library/matrix/lup_decomposition/determinant_spec.rb
index 1ac4bc971e26c9..9d733066c17977 100644
--- a/spec/ruby/library/matrix/lup_decomposition/determinant_spec.rb
+++ b/spec/ruby/library/matrix/lup_decomposition/determinant_spec.rb
@@ -1,24 +1,21 @@
 require_relative '../../../spec_helper'
+require 'matrix'
 
-ruby_version_is ""..."3.1" do
-  require 'matrix'
-
-  describe "Matrix::LUPDecomposition#determinant" do
-    it "returns the determinant when the matrix is square" do
-      a = Matrix[[7, 8, 9], [14, 46, 51], [28, 82, 163]]
-      a.lup.determinant.should == 15120 # == a.determinant
-    end
+describe "Matrix::LUPDecomposition#determinant" do
+  it "returns the determinant when the matrix is square" do
+    a = Matrix[[7, 8, 9], [14, 46, 51], [28, 82, 163]]
+    a.lup.determinant.should == 15120 # == a.determinant
+  end
 
-    it "raises an error for rectangular matrices" do
-      [
-        Matrix[[7, 8, 9], [14, 46, 51]],
-        Matrix[[7, 8], [14, 46], [28, 82]],
-      ].each do |m|
-        lup = m.lup
-        -> {
-          lup.determinant
-        }.should raise_error(Matrix::ErrDimensionMismatch)
-      end
+  it "raises an error for rectangular matrices" do
+    [
+      Matrix[[7, 8, 9], [14, 46, 51]],
+      Matrix[[7, 8], [14, 46], [28, 82]],
+    ].each do |m|
+      lup = m.lup
+      -> {
+        lup.determinant
+      }.should raise_error(Matrix::ErrDimensionMismatch)
     end
   end
 end
diff --git a/spec/ruby/library/matrix/lup_decomposition/initialize_spec.rb b/spec/ruby/library/matrix/lup_decomposition/initialize_spec.rb
index 42f78c7540085a..36afb349e60f4f 100644
--- a/spec/ruby/library/matrix/lup_decomposition/initialize_spec.rb
+++ b/spec/ruby/library/matrix/lup_decomposition/initialize_spec.rb
@@ -1,16 +1,13 @@
 require_relative '../../../spec_helper'
+require 'matrix'
 
-ruby_version_is ""..."3.1" do
-  require 'matrix'
-
-  describe "Matrix::LUPDecomposition#initialize" do
-    it "raises an error if argument is not a matrix" do
-      -> {
-        Matrix::LUPDecomposition.new([[]])
-      }.should raise_error(TypeError)
-      -> {
-        Matrix::LUPDecomposition.new(42)
-      }.should raise_error(TypeError)
-    end
+describe "Matrix::LUPDecomposition#initialize" do
+  it "raises an error if argument is not a matrix" do
+    -> {
+      Matrix::LUPDecomposition.new([[]])
+    }.should raise_error(TypeError)
+    -> {
+      Matrix::LUPDecomposition.new(42)
+    }.should raise_error(TypeError)
   end
 end
diff --git a/spec/ruby/library/matrix/lup_decomposition/l_spec.rb b/spec/ruby/library/matrix/lup_decomposition/l_spec.rb
index 6c751f12b716af..9514ab5d063561 100644
--- a/spec/ruby/library/matrix/lup_decomposition/l_spec.rb
+++ b/spec/ruby/library/matrix/lup_decomposition/l_spec.rb
@@ -1,21 +1,18 @@
 require_relative '../../../spec_helper'
+require 'matrix'
 
-ruby_version_is ""..."3.1" do
-  require 'matrix'
-
-  describe "Matrix::LUPDecomposition#l" do
-    before :each do
-      @a = Matrix[[7, 8, 9], [14, 46, 51], [28, 82, 163]]
-      @lu = Matrix::LUPDecomposition.new(@a)
-      @l = @lu.l
-    end
+describe "Matrix::LUPDecomposition#l" do
+  before :each do
+    @a = Matrix[[7, 8, 9], [14, 46, 51], [28, 82, 163]]
+    @lu = Matrix::LUPDecomposition.new(@a)
+    @l = @lu.l
+  end
 
-    it "returns the first element of to_a" do
-      @l.should == @lu.to_a[0]
-    end
+  it "returns the first element of to_a" do
+    @l.should == @lu.to_a[0]
+  end
 
-    it "returns a lower triangular matrix" do
-      @l.lower_triangular?.should be_true
-    end
+  it "returns a lower triangular matrix" do
+    @l.lower_triangular?.should be_true
   end
 end
diff --git a/spec/ruby/library/matrix/lup_decomposition/p_spec.rb b/spec/ruby/library/matrix/lup_decomposition/p_spec.rb
index 481f8a17d55551..c7b5e9196e9808 100644
--- a/spec/ruby/library/matrix/lup_decomposition/p_spec.rb
+++ b/spec/ruby/library/matrix/lup_decomposition/p_spec.rb
@@ -1,21 +1,18 @@
 require_relative '../../../spec_helper'
+require 'matrix'
 
-ruby_version_is ""..."3.1" do
-  require 'matrix'
-
-  describe "Matrix::LUPDecomposition#p" do
-    before :each do
-      @a = Matrix[[7, 8, 9], [14, 46, 51], [28, 82, 163]]
-      @lu = Matrix::LUPDecomposition.new(@a)
-      @p = @lu.p
-    end
+describe "Matrix::LUPDecomposition#p" do
+  before :each do
+    @a = Matrix[[7, 8, 9], [14, 46, 51], [28, 82, 163]]
+    @lu = Matrix::LUPDecomposition.new(@a)
+    @p = @lu.p
+  end
 
-    it "returns the third element of to_a" do
-      @p.should == @lu.to_a[2]
-    end
+  it "returns the third element of to_a" do
+    @p.should == @lu.to_a[2]
+  end
 
-    it "returns a permutation matrix" do
-      @p.permutation?.should be_true
-    end
+  it "returns a permutation matrix" do
+    @p.permutation?.should be_true
   end
 end
diff --git a/spec/ruby/library/matrix/lup_decomposition/solve_spec.rb b/spec/ruby/library/matrix/lup_decomposition/solve_spec.rb
index 773fcb3e6525b9..66242627e9610c 100644
--- a/spec/ruby/library/matrix/lup_decomposition/solve_spec.rb
+++ b/spec/ruby/library/matrix/lup_decomposition/solve_spec.rb
@@ -1,55 +1,52 @@
 require_relative '../../../spec_helper'
+require 'matrix'
+
+describe "Matrix::LUPDecomposition#solve" do
+  describe "for rectangular matrices" do
+    it "raises an error for singular matrices" do
+      a = Matrix[[1, 2, 3], [1, 3, 5], [2, 5, 8]]
+      lu = Matrix::LUPDecomposition.new(a)
+      -> {
+        lu.solve(a)
+      }.should raise_error(Matrix::ErrNotRegular)
+    end
 
-ruby_version_is ""..."3.1" do
-  require 'matrix'
-
-  describe "Matrix::LUPDecomposition#solve" do
-    describe "for rectangular matrices" do
-      it "raises an error for singular matrices" do
-        a = Matrix[[1, 2, 3], [1, 3, 5], [2, 5, 8]]
-        lu = Matrix::LUPDecomposition.new(a)
-        -> {
-          lu.solve(a)
-        }.should raise_error(Matrix::ErrNotRegular)
+    describe "for non singular matrices" do
+      before :each do
+        @a = Matrix[[7, 8, 9], [14, 46, 51], [28, 82, 163]]
+        @lu = Matrix::LUPDecomposition.new(@a)
       end
 
-      describe "for non singular matrices" do
-        before :each do
-          @a = Matrix[[7, 8, 9], [14, 46, 51], [28, 82, 163]]
-          @lu = Matrix::LUPDecomposition.new(@a)
-        end
-
-        it "returns the appropriate empty matrix when given an empty matrix" do
-          @lu.solve(Matrix.empty(3,0)).should == Matrix.empty(3,0)
-          empty = Matrix::LUPDecomposition.new(Matrix.empty(0, 0))
-          empty.solve(Matrix.empty(0,3)).should == Matrix.empty(0,3)
-        end
+      it "returns the appropriate empty matrix when given an empty matrix" do
+        @lu.solve(Matrix.empty(3,0)).should == Matrix.empty(3,0)
+        empty = Matrix::LUPDecomposition.new(Matrix.empty(0, 0))
+        empty.solve(Matrix.empty(0,3)).should == Matrix.empty(0,3)
+      end
 
-        it "returns the right matrix when given a matrix of the appropriate size" do
-          solution = Matrix[[1, 2, 3, 4], [0, 1, 2, 3], [-1, -2, -3, -4]]
-          values = Matrix[[-2, 4, 10, 16], [-37, -28, -19, -10], [-135, -188, -241, -294]] # == @a * solution
-          @lu.solve(values).should == solution
-        end
+      it "returns the right matrix when given a matrix of the appropriate size" do
+        solution = Matrix[[1, 2, 3, 4], [0, 1, 2, 3], [-1, -2, -3, -4]]
+        values = Matrix[[-2, 4, 10, 16], [-37, -28, -19, -10], [-135, -188, -241, -294]] # == @a * solution
+        @lu.solve(values).should == solution
+      end
 
-        it "raises an error when given a matrix of the wrong size" do
-          values = Matrix[[1, 2, 3, 4], [0, 1, 2, 3]]
-          -> {
-            @lu.solve(values)
-          }.should raise_error(Matrix::ErrDimensionMismatch)
-        end
+      it "raises an error when given a matrix of the wrong size" do
+        values = Matrix[[1, 2, 3, 4], [0, 1, 2, 3]]
+        -> {
+          @lu.solve(values)
+        }.should raise_error(Matrix::ErrDimensionMismatch)
+      end
 
-        it "returns the right vector when given a vector of the appropriate size" do
-          solution = Vector[1, 2, -1]
-          values = Vector[14, 55, 29] # == @a * solution
-          @lu.solve(values).should == solution
-        end
+      it "returns the right vector when given a vector of the appropriate size" do
+        solution = Vector[1, 2, -1]
+        values = Vector[14, 55, 29] # == @a * solution
+        @lu.solve(values).should == solution
+      end
 
-        it "raises an error when given a vector of the wrong size" do
-          values = Vector[14, 55]
-          -> {
-            @lu.solve(values)
-          }.should raise_error(Matrix::ErrDimensionMismatch)
-        end
+      it "raises an error when given a vector of the wrong size" do
+        values = Vector[14, 55]
+        -> {
+          @lu.solve(values)
+        }.should raise_error(Matrix::ErrDimensionMismatch)
       end
     end
   end
diff --git a/spec/ruby/library/matrix/lup_decomposition/to_a_spec.rb b/spec/ruby/library/matrix/lup_decomposition/to_a_spec.rb
index 8702292865905f..9b1dccbbacee9e 100644
--- a/spec/ruby/library/matrix/lup_decomposition/to_a_spec.rb
+++ b/spec/ruby/library/matrix/lup_decomposition/to_a_spec.rb
@@ -1,36 +1,33 @@
 require_relative '../../../spec_helper'
+require 'matrix'
 
-ruby_version_is ""..."3.1" do
-  require 'matrix'
-
-  describe "Matrix::LUPDecomposition#to_a" do
-    before :each do
-      @a = Matrix[[7, 8, 9], [14, 46, 51], [28, 82, 163]]
-      @lu = Matrix::LUPDecomposition.new(@a)
-      @to_a = @lu.to_a
-      @l, @u, @p = @to_a
-    end
+describe "Matrix::LUPDecomposition#to_a" do
+  before :each do
+    @a = Matrix[[7, 8, 9], [14, 46, 51], [28, 82, 163]]
+    @lu = Matrix::LUPDecomposition.new(@a)
+    @to_a = @lu.to_a
+    @l, @u, @p = @to_a
+  end
 
-    it "returns an array of three matrices" do
-      @to_a.should be_kind_of(Array)
-      @to_a.length.should == 3
-      @to_a.each{|m| m.should be_kind_of(Matrix)}
-    end
+  it "returns an array of three matrices" do
+    @to_a.should be_kind_of(Array)
+    @to_a.length.should == 3
+    @to_a.each{|m| m.should be_kind_of(Matrix)}
+  end
 
-    it "returns [l, u, p] such that l*u == a*p" do
-      (@l * @u).should == (@p * @a)
-    end
+  it "returns [l, u, p] such that l*u == a*p" do
+    (@l * @u).should == (@p * @a)
+  end
 
-    it "returns the right values for rectangular matrices" do
-      [
-        Matrix[[7, 8, 9], [14, 46, 51]],
-        Matrix[[4, 11], [5, 8], [3, 4]],
-      ].each do |a|
-        l, u, p = Matrix::LUPDecomposition.new(a).to_a
-        (l * u).should == (p * a)
-      end
+  it "returns the right values for rectangular matrices" do
+    [
+      Matrix[[7, 8, 9], [14, 46, 51]],
+      Matrix[[4, 11], [5, 8], [3, 4]],
+    ].each do |a|
+      l, u, p = Matrix::LUPDecomposition.new(a).to_a
+      (l * u).should == (p * a)
     end
-
-    it "has other properties implied by the specs of #l, #u and #p"
   end
+
+  it "has other properties implied by the specs of #l, #u and #p"
 end
diff --git a/spec/ruby/library/matrix/lup_decomposition/u_spec.rb b/spec/ruby/library/matrix/lup_decomposition/u_spec.rb
index cd884b88ec267b..ca3dfc1f00e5d8 100644
--- a/spec/ruby/library/matrix/lup_decomposition/u_spec.rb
+++ b/spec/ruby/library/matrix/lup_decomposition/u_spec.rb
@@ -1,21 +1,18 @@
 require_relative '../../../spec_helper'
+require 'matrix'
 
-ruby_version_is ""..."3.1" do
-  require 'matrix'
-
-  describe "Matrix::LUPDecomposition#u" do
-    before :each do
-      @a = Matrix[[7, 8, 9], [14, 46, 51], [28, 82, 163]]
-      @lu = Matrix::LUPDecomposition.new(@a)
-      @u = @lu.u
-    end
+describe "Matrix::LUPDecomposition#u" do
+  before :each do
+    @a = Matrix[[7, 8, 9], [14, 46, 51], [28, 82, 163]]
+    @lu = Matrix::LUPDecomposition.new(@a)
+    @u = @lu.u
+  end
 
-    it "returns the second element of to_a" do
-      @u.should == @lu.to_a[1]
-    end
+  it "returns the second element of to_a" do
+    @u.should == @lu.to_a[1]
+  end
 
-    it "returns an upper triangular matrix" do
-      @u.upper_triangular?.should be_true
-    end
+  it "returns an upper triangular matrix" do
+    @u.upper_triangular?.should be_true
   end
 end
diff --git a/spec/ruby/library/matrix/map_spec.rb b/spec/ruby/library/matrix/map_spec.rb
index cde0df54411eb7..bc07c48cda9a98 100644
--- a/spec/ruby/library/matrix/map_spec.rb
+++ b/spec/ruby/library/matrix/map_spec.rb
@@ -1,9 +1,6 @@
 require_relative '../../spec_helper'
+require_relative 'shared/collect'
 
-ruby_version_is ""..."3.1" do
-  require_relative 'shared/collect'
-
-  describe "Matrix#map" do
-    it_behaves_like :collect, :map
-  end
+describe "Matrix#map" do
+  it_behaves_like :collect, :map
 end
diff --git a/spec/ruby/library/matrix/minor_spec.rb b/spec/ruby/library/matrix/minor_spec.rb
index 0a6b0823c89c5d..009826c3d660c1 100644
--- a/spec/ruby/library/matrix/minor_spec.rb
+++ b/spec/ruby/library/matrix/minor_spec.rb
@@ -1,88 +1,85 @@
 require_relative '../../spec_helper'
+require_relative 'fixtures/classes'
+require 'matrix'
 
-ruby_version_is ""..."3.1" do
-  require_relative 'fixtures/classes'
-  require 'matrix'
+describe "Matrix#minor" do
+  before :each do
+    @matrix = Matrix[ [1,2], [3,4], [5,6] ]
+  end
 
-  describe "Matrix#minor" do
-    before :each do
-      @matrix = Matrix[ [1,2], [3,4], [5,6] ]
+  describe "with start_row, nrows, start_col, ncols" do
+    it "returns the given portion of the Matrix" do
+      @matrix.minor(0,1,0,2).should == Matrix[ [1, 2] ]
+      @matrix.minor(1,2,1,1).should == Matrix[ [4], [6] ]
     end
 
-    describe "with start_row, nrows, start_col, ncols" do
-      it "returns the given portion of the Matrix" do
-        @matrix.minor(0,1,0,2).should == Matrix[ [1, 2] ]
-        @matrix.minor(1,2,1,1).should == Matrix[ [4], [6] ]
-      end
-
-      it "returns an empty Matrix if nrows or ncols is 0" do
-        @matrix.minor(0,0,0,0).should == Matrix[]
-        @matrix.minor(1,0,1,0).should == Matrix[]
-        @matrix.minor(1,0,1,1).should == Matrix.columns([[]])
-        @matrix.minor(1,1,1,0).should == Matrix[[]]
-      end
+    it "returns an empty Matrix if nrows or ncols is 0" do
+      @matrix.minor(0,0,0,0).should == Matrix[]
+      @matrix.minor(1,0,1,0).should == Matrix[]
+      @matrix.minor(1,0,1,1).should == Matrix.columns([[]])
+      @matrix.minor(1,1,1,0).should == Matrix[[]]
+    end
 
-      it "returns nil for out-of-bounds start_row/col" do
-        r = @matrix.row_size + 1
-        c = @matrix.column_size + 1
-        @matrix.minor(r,0,0,10).should == nil
-        @matrix.minor(0,10,c,9).should == nil
-        @matrix.minor(-r,0,0,10).should == nil
-        @matrix.minor(0,10,-c,9).should == nil
-      end
+    it "returns nil for out-of-bounds start_row/col" do
+      r = @matrix.row_size + 1
+      c = @matrix.column_size + 1
+      @matrix.minor(r,0,0,10).should == nil
+      @matrix.minor(0,10,c,9).should == nil
+      @matrix.minor(-r,0,0,10).should == nil
+      @matrix.minor(0,10,-c,9).should == nil
+    end
 
-      it "returns nil for negative nrows or ncols" do
-        @matrix.minor(0,1,0,-1).should == nil
-        @matrix.minor(0,-1,0,1).should == nil
-      end
+    it "returns nil for negative nrows or ncols" do
+      @matrix.minor(0,1,0,-1).should == nil
+      @matrix.minor(0,-1,0,1).should == nil
+    end
 
-      it "start counting backwards for start_row or start_col below zero" do
-        @matrix.minor(0, 1, -1, 1).should == @matrix.minor(0, 1, 1, 1)
-        @matrix.minor(-1, 1, 0, 1).should == @matrix.minor(2, 1, 0, 1)
-      end
+    it "start counting backwards for start_row or start_col below zero" do
+      @matrix.minor(0, 1, -1, 1).should == @matrix.minor(0, 1, 1, 1)
+      @matrix.minor(-1, 1, 0, 1).should == @matrix.minor(2, 1, 0, 1)
+    end
 
-      it "returns empty matrices for extreme start_row/col" do
-        @matrix.minor(3,10,1,10).should == Matrix.columns([[]])
-        @matrix.minor(1,10,2,10).should == Matrix[[], []]
-        @matrix.minor(3,0,0,10).should == Matrix.columns([[], []])
-      end
+    it "returns empty matrices for extreme start_row/col" do
+      @matrix.minor(3,10,1,10).should == Matrix.columns([[]])
+      @matrix.minor(1,10,2,10).should == Matrix[[], []]
+      @matrix.minor(3,0,0,10).should == Matrix.columns([[], []])
+    end
 
-      it "ignores big nrows or ncols" do
-        @matrix.minor(0,1,0,20).should == Matrix[ [1, 2] ]
-        @matrix.minor(1,20,1,1).should == Matrix[ [4], [6] ]
-      end
+    it "ignores big nrows or ncols" do
+      @matrix.minor(0,1,0,20).should == Matrix[ [1, 2] ]
+      @matrix.minor(1,20,1,1).should == Matrix[ [4], [6] ]
     end
+  end
 
-    describe "with col_range, row_range" do
-      it "returns the given portion of the Matrix" do
-        @matrix.minor(0..0, 0..1).should == Matrix[ [1, 2] ]
-        @matrix.minor(1..2, 1..2).should == Matrix[ [4], [6] ]
-        @matrix.minor(1...3, 1...3).should == Matrix[ [4], [6] ]
-      end
+  describe "with col_range, row_range" do
+    it "returns the given portion of the Matrix" do
+      @matrix.minor(0..0, 0..1).should == Matrix[ [1, 2] ]
+      @matrix.minor(1..2, 1..2).should == Matrix[ [4], [6] ]
+      @matrix.minor(1...3, 1...3).should == Matrix[ [4], [6] ]
+    end
 
-      it "returns nil if col_range or row_range is out of range" do
-        r = @matrix.row_size + 1
-        c = @matrix.column_size + 1
-        @matrix.minor(r..6, c..6).should == nil
-        @matrix.minor(0..1, c..6).should == nil
-        @matrix.minor(r..6, 0..1).should == nil
-        @matrix.minor(-r..6, -c..6).should == nil
-        @matrix.minor(0..1, -c..6).should == nil
-        @matrix.minor(-r..6, 0..1).should == nil
-      end
+    it "returns nil if col_range or row_range is out of range" do
+      r = @matrix.row_size + 1
+      c = @matrix.column_size + 1
+      @matrix.minor(r..6, c..6).should == nil
+      @matrix.minor(0..1, c..6).should == nil
+      @matrix.minor(r..6, 0..1).should == nil
+      @matrix.minor(-r..6, -c..6).should == nil
+      @matrix.minor(0..1, -c..6).should == nil
+      @matrix.minor(-r..6, 0..1).should == nil
+    end
 
-      it "start counting backwards for col_range or row_range below zero" do
-        @matrix.minor(0..1, -2..-1).should == @matrix.minor(0..1, 0..1)
-        @matrix.minor(0..1, -2..1).should == @matrix.minor(0..1, 0..1)
-        @matrix.minor(-2..-1, 0..1).should == @matrix.minor(1..2, 0..1)
-        @matrix.minor(-2..2, 0..1).should == @matrix.minor(1..2, 0..1)
-      end
+    it "start counting backwards for col_range or row_range below zero" do
+      @matrix.minor(0..1, -2..-1).should == @matrix.minor(0..1, 0..1)
+      @matrix.minor(0..1, -2..1).should == @matrix.minor(0..1, 0..1)
+      @matrix.minor(-2..-1, 0..1).should == @matrix.minor(1..2, 0..1)
+      @matrix.minor(-2..2, 0..1).should == @matrix.minor(1..2, 0..1)
     end
+  end
 
-    describe "for a subclass of Matrix" do
-      it "returns an instance of that subclass" do
-        MatrixSub.ins.minor(0, 1, 0, 1).should be_an_instance_of(MatrixSub)
-      end
+  describe "for a subclass of Matrix" do
+    it "returns an instance of that subclass" do
+      MatrixSub.ins.minor(0, 1, 0, 1).should be_an_instance_of(MatrixSub)
     end
   end
 end
diff --git a/spec/ruby/library/matrix/minus_spec.rb b/spec/ruby/library/matrix/minus_spec.rb
index 27dfbeaea55386..95cf4a6072279b 100644
--- a/spec/ruby/library/matrix/minus_spec.rb
+++ b/spec/ruby/library/matrix/minus_spec.rb
@@ -1,45 +1,42 @@
 require_relative '../../spec_helper'
+require_relative 'fixtures/classes'
+require 'matrix'
 
-ruby_version_is ""..."3.1" do
-  require_relative 'fixtures/classes'
-  require 'matrix'
-
-  describe "Matrix#-" do
-    before :each do
-      @a = Matrix[ [1, 2], [3, 4] ]
-      @b = Matrix[ [4, 5], [6, 7] ]
-    end
+describe "Matrix#-" do
+  before :each do
+    @a = Matrix[ [1, 2], [3, 4] ]
+    @b = Matrix[ [4, 5], [6, 7] ]
+  end
 
-    it "returns the result of subtracting the corresponding elements of other from self" do
-      (@a - @b).should == Matrix[ [-3,-3], [-3,-3] ]
-    end
+  it "returns the result of subtracting the corresponding elements of other from self" do
+    (@a - @b).should == Matrix[ [-3,-3], [-3,-3] ]
+  end
 
-    it "returns an instance of Matrix" do
-      (@a - @b).should be_kind_of(Matrix)
-    end
+  it "returns an instance of Matrix" do
+    (@a - @b).should be_kind_of(Matrix)
+  end
 
-    it "raises a Matrix::ErrDimensionMismatch if the matrices are different sizes" do
-      -> { @a - Matrix[ [1] ] }.should raise_error(Matrix::ErrDimensionMismatch)
-    end
+  it "raises a Matrix::ErrDimensionMismatch if the matrices are different sizes" do
+    -> { @a - Matrix[ [1] ] }.should raise_error(Matrix::ErrDimensionMismatch)
+  end
 
-    it "raises a ExceptionForMatrix::ErrOperationNotDefined if other is a Numeric Type" do
-      -> { @a - 2            }.should raise_error(Matrix::ErrOperationNotDefined)
-      -> { @a - 1.2          }.should raise_error(Matrix::ErrOperationNotDefined)
-      -> { @a - bignum_value }.should raise_error(Matrix::ErrOperationNotDefined)
-    end
+  it "raises a ExceptionForMatrix::ErrOperationNotDefined if other is a Numeric Type" do
+    -> { @a - 2            }.should raise_error(Matrix::ErrOperationNotDefined)
+    -> { @a - 1.2          }.should raise_error(Matrix::ErrOperationNotDefined)
+    -> { @a - bignum_value }.should raise_error(Matrix::ErrOperationNotDefined)
+  end
 
-    it "raises a TypeError if other is of wrong type" do
-      -> { @a - nil        }.should raise_error(TypeError)
-      -> { @a - "a"        }.should raise_error(TypeError)
-      -> { @a - [ [1, 2] ] }.should raise_error(TypeError)
-      -> { @a - Object.new }.should raise_error(TypeError)
-    end
+  it "raises a TypeError if other is of wrong type" do
+    -> { @a - nil        }.should raise_error(TypeError)
+    -> { @a - "a"        }.should raise_error(TypeError)
+    -> { @a - [ [1, 2] ] }.should raise_error(TypeError)
+    -> { @a - Object.new }.should raise_error(TypeError)
+  end
 
-    describe "for a subclass of Matrix" do
-      it "returns an instance of that subclass" do
-        m = MatrixSub.ins
-        (m-m).should be_an_instance_of(MatrixSub)
-      end
+  describe "for a subclass of Matrix" do
+    it "returns an instance of that subclass" do
+      m = MatrixSub.ins
+      (m-m).should be_an_instance_of(MatrixSub)
     end
   end
 end
diff --git a/spec/ruby/library/matrix/multiply_spec.rb b/spec/ruby/library/matrix/multiply_spec.rb
index a63fcf4020feae..206868af92970f 100644
--- a/spec/ruby/library/matrix/multiply_spec.rb
+++ b/spec/ruby/library/matrix/multiply_spec.rb
@@ -1,71 +1,69 @@
 require_relative '../../spec_helper'
 
-ruby_version_is ""..."3.1" do
-  require_relative 'fixtures/classes'
-  require 'matrix'
+require_relative 'fixtures/classes'
+require 'matrix'
 
-  describe "Matrix#*" do
-    before :each do
-      @a = Matrix[ [1, 2], [3, 4] ]
-      @b = Matrix[ [4, 5], [6, 7] ]
-    end
+describe "Matrix#*" do
+  before :each do
+    @a = Matrix[ [1, 2], [3, 4] ]
+    @b = Matrix[ [4, 5], [6, 7] ]
+  end
 
-    it "returns the result of multiplying the corresponding elements of self and a Matrix" do
-      (@a * @b).should == Matrix[ [16,19], [36,43] ]
-    end
+  it "returns the result of multiplying the corresponding elements of self and a Matrix" do
+    (@a * @b).should == Matrix[ [16,19], [36,43] ]
+  end
 
-    it "returns the result of multiplying the corresponding elements of self and a Vector" do
-      (@a * Vector[1,2]).should == Vector[5, 11]
-    end
+  it "returns the result of multiplying the corresponding elements of self and a Vector" do
+    (@a * Vector[1,2]).should == Vector[5, 11]
+  end
 
-    it "returns the result of multiplying the elements of self and a Fixnum" do
-      (@a * 2).should == Matrix[ [2, 4], [6, 8] ]
-    end
+  it "returns the result of multiplying the elements of self and a Fixnum" do
+    (@a * 2).should == Matrix[ [2, 4], [6, 8] ]
+  end
 
-    it "returns the result of multiplying the elements of self and a Bignum" do
-      (@a * bignum_value).should == Matrix[
-        [18446744073709551616, 36893488147419103232],
-        [55340232221128654848, 73786976294838206464]
-      ]
-    end
+  it "returns the result of multiplying the elements of self and a Bignum" do
+    (@a * bignum_value).should == Matrix[
+      [18446744073709551616, 36893488147419103232],
+      [55340232221128654848, 73786976294838206464]
+    ]
+  end
 
-    it "returns the result of multiplying the elements of self and a Float" do
-      (@a * 2.0).should == Matrix[ [2.0, 4.0], [6.0, 8.0] ]
-    end
+  it "returns the result of multiplying the elements of self and a Float" do
+    (@a * 2.0).should == Matrix[ [2.0, 4.0], [6.0, 8.0] ]
+  end
 
-    it "raises a Matrix::ErrDimensionMismatch if the matrices are different sizes" do
-      -> { @a * Matrix[ [1] ] }.should raise_error(Matrix::ErrDimensionMismatch)
-    end
+  it "raises a Matrix::ErrDimensionMismatch if the matrices are different sizes" do
+    -> { @a * Matrix[ [1] ] }.should raise_error(Matrix::ErrDimensionMismatch)
+  end
 
-    it "returns a zero matrix if (nx0) * (0xn)" do
-      (Matrix[[],[],[]] * Matrix.columns([[],[],[]])).should == Matrix.zero(3)
-    end
+  it "returns a zero matrix if (nx0) * (0xn)" do
+    (Matrix[[],[],[]] * Matrix.columns([[],[],[]])).should == Matrix.zero(3)
+  end
 
-    it "returns an empty matrix if (0xn) * (nx0)" do
-      (Matrix.columns([[],[],[]]) * Matrix[[],[],[]]).should == Matrix[]
-    end
+  it "returns an empty matrix if (0xn) * (nx0)" do
+    (Matrix.columns([[],[],[]]) * Matrix[[],[],[]]).should == Matrix[]
+  end
 
-    it "returns a mx0 matrix if (mxn) * (nx0)" do
-      (Matrix[[1,2],[3,4],[5,6]] * Matrix[[],[]]).should == Matrix[[],[],[]]
-    end
+  it "returns a mx0 matrix if (mxn) * (nx0)" do
+    (Matrix[[1,2],[3,4],[5,6]] * Matrix[[],[]]).should == Matrix[[],[],[]]
+  end
 
-    it "returns a 0xm matrix if (0xm) * (mxn)" do
-      (Matrix.columns([[], [], []]) * Matrix[[1,2],[3,4],[5,6]]).should == Matrix.columns([[],[]])
-    end
+  it "returns a 0xm matrix if (0xm) * (mxn)" do
+    (Matrix.columns([[], [], []]) * Matrix[[1,2],[3,4],[5,6]]).should == Matrix.columns([[],[]])
+  end
 
-    it "raises a TypeError if other is of wrong type" do
-      -> { @a * nil        }.should raise_error(TypeError)
-      -> { @a * "a"        }.should raise_error(TypeError)
-      -> { @a * [ [1, 2] ] }.should raise_error(TypeError)
-      -> { @a * Object.new }.should raise_error(TypeError)
-    end
+  it "raises a TypeError if other is of wrong type" do
+    -> { @a * nil        }.should raise_error(TypeError)
+    -> { @a * "a"        }.should raise_error(TypeError)
+    -> { @a * [ [1, 2] ] }.should raise_error(TypeError)
+    -> { @a * Object.new }.should raise_error(TypeError)
+  end
 
-    describe "for a subclass of Matrix" do
-      it "returns an instance of that subclass" do
-        m = MatrixSub.ins
-        (m*m).should be_an_instance_of(MatrixSub)
-        (m*1).should be_an_instance_of(MatrixSub)
-      end
+  describe "for a subclass of Matrix" do
+    it "returns an instance of that subclass" do
+      m = MatrixSub.ins
+      (m*m).should be_an_instance_of(MatrixSub)
+      (m*1).should be_an_instance_of(MatrixSub)
     end
   end
 end
diff --git a/spec/ruby/library/matrix/new_spec.rb b/spec/ruby/library/matrix/new_spec.rb
index 4be2e17116ee45..3005066846058d 100644
--- a/spec/ruby/library/matrix/new_spec.rb
+++ b/spec/ruby/library/matrix/new_spec.rb
@@ -1,11 +1,8 @@
 require_relative '../../spec_helper'
+require 'matrix'
 
-ruby_version_is ""..."3.1" do
-  require 'matrix'
-
-  describe "Matrix.new" do
-    it "is private" do
-      Matrix.should have_private_method(:new)
-    end
+describe "Matrix.new" do
+  it "is private" do
+    Matrix.should have_private_method(:new)
   end
 end
diff --git a/spec/ruby/library/matrix/normal_spec.rb b/spec/ruby/library/matrix/normal_spec.rb
index 2f2e138c1beb80..a9e6c645faf75e 100644
--- a/spec/ruby/library/matrix/normal_spec.rb
+++ b/spec/ruby/library/matrix/normal_spec.rb
@@ -1,29 +1,26 @@
 require_relative '../../spec_helper'
+require 'matrix'
 
-ruby_version_is ""..."3.1" do
-  require 'matrix'
+describe "Matrix.normal?" do
+  # it "returns false for non normal matrices" do
+  #   Matrix[[0, 1], [1, 2]].should_not.normal?
+  # end
 
-  describe "Matrix.normal?" do
-    # it "returns false for non normal matrices" do
-    #   Matrix[[0, 1], [1, 2]].should_not.normal?
-    # end
-
-    it "returns true for normal matrices" do
-      Matrix[[1, 1, 0], [0, 1, 1], [1, 0, 1]].should.normal?
-      Matrix[[0, Complex(0, 2)], [Complex(0, -2), 0]].should.normal?
-    end
+  it "returns true for normal matrices" do
+    Matrix[[1, 1, 0], [0, 1, 1], [1, 0, 1]].should.normal?
+    Matrix[[0, Complex(0, 2)], [Complex(0, -2), 0]].should.normal?
+  end
 
-    it "raises an error for rectangular matrices" do
-      [
-        Matrix[[0], [0]],
-        Matrix[[0, 0]],
-        Matrix.empty(0, 2),
-        Matrix.empty(2, 0),
-      ].each do |rectangular_matrix|
-        -> {
-          rectangular_matrix.normal?
-        }.should raise_error(Matrix::ErrDimensionMismatch)
-      end
+  it "raises an error for rectangular matrices" do
+    [
+      Matrix[[0], [0]],
+      Matrix[[0, 0]],
+      Matrix.empty(0, 2),
+      Matrix.empty(2, 0),
+    ].each do |rectangular_matrix|
+      -> {
+        rectangular_matrix.normal?
+      }.should raise_error(Matrix::ErrDimensionMismatch)
     end
   end
 end
diff --git a/spec/ruby/library/matrix/orthogonal_spec.rb b/spec/ruby/library/matrix/orthogonal_spec.rb
index eb06305040e21a..26afe89ff08e75 100644
--- a/spec/ruby/library/matrix/orthogonal_spec.rb
+++ b/spec/ruby/library/matrix/orthogonal_spec.rb
@@ -1,29 +1,26 @@
 require_relative '../../spec_helper'
+require 'matrix'
 
-ruby_version_is ""..."3.1" do
-  require 'matrix'
-
-  describe "Matrix.orthogonal?" do
-    it "returns false for non orthogonal matrices" do
-      Matrix[[0, 1], [1, 2]].should_not.orthogonal?
-      Matrix[[1, 1, 0], [0, 1, 1], [1, 0, 1]].should_not.orthogonal?
-    end
+describe "Matrix.orthogonal?" do
+  it "returns false for non orthogonal matrices" do
+    Matrix[[0, 1], [1, 2]].should_not.orthogonal?
+    Matrix[[1, 1, 0], [0, 1, 1], [1, 0, 1]].should_not.orthogonal?
+  end
 
-    it "returns true for orthogonal matrices" do
-      Matrix[[0, 1], [1, 0]].should.orthogonal?
-    end
+  it "returns true for orthogonal matrices" do
+    Matrix[[0, 1], [1, 0]].should.orthogonal?
+  end
 
-    it "raises an error for rectangular matrices" do
-      [
-        Matrix[[0], [0]],
-        Matrix[[0, 0]],
-        Matrix.empty(0, 2),
-        Matrix.empty(2, 0),
-      ].each do |rectangular_matrix|
-        -> {
-          rectangular_matrix.orthogonal?
-        }.should raise_error(Matrix::ErrDimensionMismatch)
-      end
+  it "raises an error for rectangular matrices" do
+    [
+      Matrix[[0], [0]],
+      Matrix[[0, 0]],
+      Matrix.empty(0, 2),
+      Matrix.empty(2, 0),
+    ].each do |rectangular_matrix|
+      -> {
+        rectangular_matrix.orthogonal?
+      }.should raise_error(Matrix::ErrDimensionMismatch)
     end
   end
 end
diff --git a/spec/ruby/library/matrix/permutation_spec.rb b/spec/ruby/library/matrix/permutation_spec.rb
index ed8edad7555684..825a9d982c5cf2 100644
--- a/spec/ruby/library/matrix/permutation_spec.rb
+++ b/spec/ruby/library/matrix/permutation_spec.rb
@@ -1,35 +1,32 @@
 require_relative '../../spec_helper'
+require 'matrix'
 
-ruby_version_is ""..."3.1" do
-  require 'matrix'
-
-  describe "Matrix#permutation?" do
-    it "returns true for a permutation Matrix" do
-      Matrix[[0, 1, 0], [0, 0, 1], [1, 0, 0]].permutation?.should be_true
-    end
+describe "Matrix#permutation?" do
+  it "returns true for a permutation Matrix" do
+    Matrix[[0, 1, 0], [0, 0, 1], [1, 0, 0]].permutation?.should be_true
+  end
 
-    it "returns false for a non permutation square Matrix" do
-      Matrix[[0, 1], [0, 0]].permutation?.should be_false
-      Matrix[[-1, 0], [0, -1]].permutation?.should be_false
-      Matrix[[1, 0], [1, 0]].permutation?.should be_false
-      Matrix[[1, 0], [1, 1]].permutation?.should be_false
-    end
+  it "returns false for a non permutation square Matrix" do
+    Matrix[[0, 1], [0, 0]].permutation?.should be_false
+    Matrix[[-1, 0], [0, -1]].permutation?.should be_false
+    Matrix[[1, 0], [1, 0]].permutation?.should be_false
+    Matrix[[1, 0], [1, 1]].permutation?.should be_false
+  end
 
-    it "returns true for an empty 0x0 matrix" do
-      Matrix.empty(0,0).permutation?.should be_true
-    end
+  it "returns true for an empty 0x0 matrix" do
+    Matrix.empty(0,0).permutation?.should be_true
+  end
 
-    it "raises an error for rectangular matrices" do
-      [
-        Matrix[[0], [0]],
-        Matrix[[0, 0]],
-        Matrix.empty(0, 2),
-        Matrix.empty(2, 0),
-      ].each do |rectangular_matrix|
-        -> {
-          rectangular_matrix.permutation?
-        }.should raise_error(Matrix::ErrDimensionMismatch)
-      end
+  it "raises an error for rectangular matrices" do
+    [
+      Matrix[[0], [0]],
+      Matrix[[0, 0]],
+      Matrix.empty(0, 2),
+      Matrix.empty(2, 0),
+    ].each do |rectangular_matrix|
+      -> {
+        rectangular_matrix.permutation?
+      }.should raise_error(Matrix::ErrDimensionMismatch)
     end
   end
 end
diff --git a/spec/ruby/library/matrix/plus_spec.rb b/spec/ruby/library/matrix/plus_spec.rb
index 99e6615778d452..2706bad060ea44 100644
--- a/spec/ruby/library/matrix/plus_spec.rb
+++ b/spec/ruby/library/matrix/plus_spec.rb
@@ -1,45 +1,42 @@
 require_relative '../../spec_helper'
+require_relative 'fixtures/classes'
+require 'matrix'
 
-ruby_version_is ""..."3.1" do
-  require_relative 'fixtures/classes'
-  require 'matrix'
-
-  describe "Matrix#+" do
-    before :each do
-      @a = Matrix[ [1,2], [3,4] ]
-      @b = Matrix[ [4,5], [6,7] ]
-    end
+describe "Matrix#+" do
+  before :each do
+    @a = Matrix[ [1,2], [3,4] ]
+    @b = Matrix[ [4,5], [6,7] ]
+  end
 
-    it "returns the result of adding the corresponding elements of self and other" do
-      (@a + @b).should == Matrix[ [5,7], [9,11] ]
-    end
+  it "returns the result of adding the corresponding elements of self and other" do
+    (@a + @b).should == Matrix[ [5,7], [9,11] ]
+  end
 
-    it "returns an instance of Matrix" do
-      (@a + @b).should be_kind_of(Matrix)
-    end
+  it "returns an instance of Matrix" do
+    (@a + @b).should be_kind_of(Matrix)
+  end
 
-    it "raises a Matrix::ErrDimensionMismatch if the matrices are different sizes" do
-      -> { @a + Matrix[ [1] ] }.should raise_error(Matrix::ErrDimensionMismatch)
-    end
+  it "raises a Matrix::ErrDimensionMismatch if the matrices are different sizes" do
+    -> { @a + Matrix[ [1] ] }.should raise_error(Matrix::ErrDimensionMismatch)
+  end
 
-    it "raises a ExceptionForMatrix::ErrOperationNotDefined if other is a Numeric Type" do
-      -> { @a + 2            }.should raise_error(ExceptionForMatrix::ErrOperationNotDefined)
-      -> { @a + 1.2          }.should raise_error(ExceptionForMatrix::ErrOperationNotDefined)
-      -> { @a + bignum_value }.should raise_error(ExceptionForMatrix::ErrOperationNotDefined)
-    end
+  it "raises a ExceptionForMatrix::ErrOperationNotDefined if other is a Numeric Type" do
+    -> { @a + 2            }.should raise_error(ExceptionForMatrix::ErrOperationNotDefined)
+    -> { @a + 1.2          }.should raise_error(ExceptionForMatrix::ErrOperationNotDefined)
+    -> { @a + bignum_value }.should raise_error(ExceptionForMatrix::ErrOperationNotDefined)
+  end
 
-    it "raises a TypeError if other is of wrong type" do
-      -> { @a + nil        }.should raise_error(TypeError)
-      -> { @a + "a"        }.should raise_error(TypeError)
-      -> { @a + [ [1, 2] ] }.should raise_error(TypeError)
-      -> { @a + Object.new }.should raise_error(TypeError)
-    end
+  it "raises a TypeError if other is of wrong type" do
+    -> { @a + nil        }.should raise_error(TypeError)
+    -> { @a + "a"        }.should raise_error(TypeError)
+    -> { @a + [ [1, 2] ] }.should raise_error(TypeError)
+    -> { @a + Object.new }.should raise_error(TypeError)
+  end
 
-    describe "for a subclass of Matrix" do
-      it "returns an instance of that subclass" do
-        m = MatrixSub.ins
-        (m+m).should be_an_instance_of(MatrixSub)
-      end
+  describe "for a subclass of Matrix" do
+    it "returns an instance of that subclass" do
+      m = MatrixSub.ins
+      (m+m).should be_an_instance_of(MatrixSub)
     end
   end
 end
diff --git a/spec/ruby/library/matrix/rank_spec.rb b/spec/ruby/library/matrix/rank_spec.rb
index fc795b58c16da7..d4403d23ed0c42 100644
--- a/spec/ruby/library/matrix/rank_spec.rb
+++ b/spec/ruby/library/matrix/rank_spec.rb
@@ -1,22 +1,19 @@
 require_relative '../../spec_helper'
+require 'matrix'
 
-ruby_version_is ""..."3.1" do
-  require 'matrix'
-
-  describe "Matrix#rank" do
-    it "returns the rank of the Matrix" do
-      Matrix[ [7,6], [3,9] ].rank.should == 2
-    end
+describe "Matrix#rank" do
+  it "returns the rank of the Matrix" do
+    Matrix[ [7,6], [3,9] ].rank.should == 2
+  end
 
-    it "doesn't loop forever" do
-      Matrix[ [1,2,3], [4,5,6], [7,8,9] ].rank.should == 2
-      Matrix[ [1, 2, 0, 3], [1, -2, 3, 0], [0, 0, 4, 8], [2, 4, 0, 6] ].rank.
-      should == 3
-    end
+  it "doesn't loop forever" do
+    Matrix[ [1,2,3], [4,5,6], [7,8,9] ].rank.should == 2
+    Matrix[ [1, 2, 0, 3], [1, -2, 3, 0], [0, 0, 4, 8], [2, 4, 0, 6] ].rank.
+    should == 3
+  end
 
-    it "works for some easy rectangular matrices" do
-      Matrix[[0,0],[0,0],[1,0]].rank.should == 1
-      Matrix[[0,1],[0,0],[1,0]].rank.should == 2
-    end
+  it "works for some easy rectangular matrices" do
+    Matrix[[0,0],[0,0],[1,0]].rank.should == 1
+    Matrix[[0,1],[0,0],[1,0]].rank.should == 2
   end
 end
diff --git a/spec/ruby/library/matrix/real_spec.rb b/spec/ruby/library/matrix/real_spec.rb
index 63a6bde923b9e2..38033c63c8f47d 100644
--- a/spec/ruby/library/matrix/real_spec.rb
+++ b/spec/ruby/library/matrix/real_spec.rb
@@ -1,46 +1,43 @@
 require_relative '../../spec_helper'
+require_relative 'fixtures/classes'
+require 'matrix'
 
-ruby_version_is ""..."3.1" do
-  require_relative 'fixtures/classes'
-  require 'matrix'
-
-  describe "Matrix#real?" do
-    it "returns true for matrices with all real entries" do
-      Matrix[ [1,   2], [3, 4] ].real?.should be_true
-      Matrix[ [1.9, 2], [3, 4] ].real?.should be_true
-    end
+describe "Matrix#real?" do
+  it "returns true for matrices with all real entries" do
+    Matrix[ [1,   2], [3, 4] ].real?.should be_true
+    Matrix[ [1.9, 2], [3, 4] ].real?.should be_true
+  end
 
-    it "returns true for empty matrices" do
-      Matrix.empty.real?.should be_true
-    end
+  it "returns true for empty matrices" do
+    Matrix.empty.real?.should be_true
+  end
 
-    it "returns false if one element is a Complex" do
-      Matrix[ [Complex(1,1), 2], [3, 4] ].real?.should be_false
-    end
+  it "returns false if one element is a Complex" do
+    Matrix[ [Complex(1,1), 2], [3, 4] ].real?.should be_false
+  end
 
-    # Guard against the Mathn library
-    guard -> { !defined?(Math.rsqrt) } do
-      it "returns false if one element is a Complex whose imaginary part is 0" do
-        Matrix[ [Complex(1,0), 2], [3, 4] ].real?.should be_false
-      end
+  # Guard against the Mathn library
+  guard -> { !defined?(Math.rsqrt) } do
+    it "returns false if one element is a Complex whose imaginary part is 0" do
+      Matrix[ [Complex(1,0), 2], [3, 4] ].real?.should be_false
     end
   end
+end
 
-  describe "Matrix#real" do
-    it "returns a matrix with the real part of the elements of the receiver" do
-      Matrix[ [1,   2], [3, 4] ].real.should == Matrix[ [1,   2], [3, 4] ]
-      Matrix[ [1.9, Complex(1,1)], [Complex(-0.42, 0), 4] ].real.should == Matrix[ [1.9, 1], [-0.42, 4] ]
-    end
+describe "Matrix#real" do
+  it "returns a matrix with the real part of the elements of the receiver" do
+    Matrix[ [1,   2], [3, 4] ].real.should == Matrix[ [1,   2], [3, 4] ]
+    Matrix[ [1.9, Complex(1,1)], [Complex(-0.42, 0), 4] ].real.should == Matrix[ [1.9, 1], [-0.42, 4] ]
+  end
 
-    it "returns empty matrices on the same size if empty" do
-      Matrix.empty(0, 3).real.should == Matrix.empty(0, 3)
-      Matrix.empty(3, 0).real.should == Matrix.empty(3, 0)
-    end
+  it "returns empty matrices on the same size if empty" do
+    Matrix.empty(0, 3).real.should == Matrix.empty(0, 3)
+    Matrix.empty(3, 0).real.should == Matrix.empty(3, 0)
+  end
 
-    describe "for a subclass of Matrix" do
-      it "returns an instance of that subclass" do
-        MatrixSub.ins.real.should be_an_instance_of(MatrixSub)
-      end
+  describe "for a subclass of Matrix" do
+    it "returns an instance of that subclass" do
+      MatrixSub.ins.real.should be_an_instance_of(MatrixSub)
     end
   end
 end
diff --git a/spec/ruby/library/matrix/rect_spec.rb b/spec/ruby/library/matrix/rect_spec.rb
index b3b7ac05c99640..83a0404e47d18d 100644
--- a/spec/ruby/library/matrix/rect_spec.rb
+++ b/spec/ruby/library/matrix/rect_spec.rb
@@ -1,9 +1,6 @@
 require_relative '../../spec_helper'
+require_relative 'shared/rectangular'
 
-ruby_version_is ""..."3.1" do
-  require_relative 'shared/rectangular'
-
-  describe "Matrix#rect" do
-    it_behaves_like :matrix_rectangular, :rect
-  end
+describe "Matrix#rect" do
+  it_behaves_like :matrix_rectangular, :rect
 end
diff --git a/spec/ruby/library/matrix/rectangular_spec.rb b/spec/ruby/library/matrix/rectangular_spec.rb
index 1fc2e0e60db37b..a235fac640c3fa 100644
--- a/spec/ruby/library/matrix/rectangular_spec.rb
+++ b/spec/ruby/library/matrix/rectangular_spec.rb
@@ -1,9 +1,6 @@
 require_relative '../../spec_helper'
+require_relative 'shared/rectangular'
 
-ruby_version_is ""..."3.1" do
-  require_relative 'shared/rectangular'
-
-  describe "Matrix#rectangular" do
-    it_behaves_like :matrix_rectangular, :rectangular
-  end
+describe "Matrix#rectangular" do
+  it_behaves_like :matrix_rectangular, :rectangular
 end
diff --git a/spec/ruby/library/matrix/regular_spec.rb b/spec/ruby/library/matrix/regular_spec.rb
index f6688bba3027c5..3699d0ef8bdc8e 100644
--- a/spec/ruby/library/matrix/regular_spec.rb
+++ b/spec/ruby/library/matrix/regular_spec.rb
@@ -1,34 +1,31 @@
 require_relative '../../spec_helper'
+require 'matrix'
 
-ruby_version_is ""..."3.1" do
-  require 'matrix'
+describe "Matrix#regular?" do
 
-  describe "Matrix#regular?" do
+  it "returns false for singular matrices" do
+    m = Matrix[ [1,2,3], [3,4,3], [0,0,0] ]
+    m.regular?.should be_false
 
-    it "returns false for singular matrices" do
-      m = Matrix[ [1,2,3], [3,4,3], [0,0,0] ]
-      m.regular?.should be_false
-
-      m = Matrix[ [1,2,9], [3,4,9], [1,2,9] ]
-      m.regular?.should be_false
-    end
+    m = Matrix[ [1,2,9], [3,4,9], [1,2,9] ]
+    m.regular?.should be_false
+  end
 
-    it "returns true if the Matrix is regular" do
-      Matrix[ [0,1], [1,0] ].regular?.should be_true
-    end
+  it "returns true if the Matrix is regular" do
+    Matrix[ [0,1], [1,0] ].regular?.should be_true
+  end
 
-    it "returns true for an empty 0x0 matrix" do
-      Matrix.empty(0,0).regular?.should be_true
-    end
+  it "returns true for an empty 0x0 matrix" do
+    Matrix.empty(0,0).regular?.should be_true
+  end
 
-    it "raises an error for rectangular matrices" do
-      -> {
-        Matrix[[1], [2], [3]].regular?
-      }.should raise_error(Matrix::ErrDimensionMismatch)
+  it "raises an error for rectangular matrices" do
+    -> {
+      Matrix[[1], [2], [3]].regular?
+    }.should raise_error(Matrix::ErrDimensionMismatch)
 
-      -> {
-        Matrix.empty(3,0).regular?
-      }.should raise_error(Matrix::ErrDimensionMismatch)
-    end
+    -> {
+      Matrix.empty(3,0).regular?
+    }.should raise_error(Matrix::ErrDimensionMismatch)
   end
 end
diff --git a/spec/ruby/library/matrix/round_spec.rb b/spec/ruby/library/matrix/round_spec.rb
index db33268414ad57..1dc29df890b01b 100644
--- a/spec/ruby/library/matrix/round_spec.rb
+++ b/spec/ruby/library/matrix/round_spec.rb
@@ -1,24 +1,21 @@
 require_relative '../../spec_helper'
+require_relative 'fixtures/classes'
+require 'matrix'
 
-ruby_version_is ""..."3.1" do
-  require_relative 'fixtures/classes'
-  require 'matrix'
-
-  describe "Matrix#round" do
-    it "returns a matrix with all entries rounded" do
-      Matrix[ [1,   2.34], [5.67, 8] ].round.should == Matrix[ [1, 2], [6, 8] ]
-      Matrix[ [1,   2.34], [5.67, 8] ].round(1).should == Matrix[ [1, 2.3], [5.7, 8] ]
-    end
+describe "Matrix#round" do
+  it "returns a matrix with all entries rounded" do
+    Matrix[ [1,   2.34], [5.67, 8] ].round.should == Matrix[ [1, 2], [6, 8] ]
+    Matrix[ [1,   2.34], [5.67, 8] ].round(1).should == Matrix[ [1, 2.3], [5.7, 8] ]
+  end
 
-    it "returns empty matrices on the same size if empty" do
-      Matrix.empty(0, 3).round.should == Matrix.empty(0, 3)
-      Matrix.empty(3, 0).round(42).should == Matrix.empty(3, 0)
-    end
+  it "returns empty matrices on the same size if empty" do
+    Matrix.empty(0, 3).round.should == Matrix.empty(0, 3)
+    Matrix.empty(3, 0).round(42).should == Matrix.empty(3, 0)
+  end
 
-    describe "for a subclass of Matrix" do
-      it "returns an instance of that subclass" do
-        MatrixSub.ins.round.should be_an_instance_of(MatrixSub)
-      end
+  describe "for a subclass of Matrix" do
+    it "returns an instance of that subclass" do
+      MatrixSub.ins.round.should be_an_instance_of(MatrixSub)
     end
   end
 end
diff --git a/spec/ruby/library/matrix/row_size_spec.rb b/spec/ruby/library/matrix/row_size_spec.rb
index fca5a846ab98df..eb3aef2e2fdf0b 100644
--- a/spec/ruby/library/matrix/row_size_spec.rb
+++ b/spec/ruby/library/matrix/row_size_spec.rb
@@ -1,16 +1,13 @@
 require_relative '../../spec_helper'
+require 'matrix'
 
-ruby_version_is ""..."3.1" do
-  require 'matrix'
-
-  describe "Matrix#row_size" do
-    it "returns the number rows" do
-      Matrix[ [1,2], [3, 4], [5, 6] ].row_size.should == 3
-    end
-
-    it "returns the number rows even for some empty matrices" do
-      Matrix[ [], [], [] ].row_size.should == 3
-    end
+describe "Matrix#row_size" do
+  it "returns the number rows" do
+    Matrix[ [1,2], [3, 4], [5, 6] ].row_size.should == 3
+  end
 
+  it "returns the number rows even for some empty matrices" do
+    Matrix[ [], [], [] ].row_size.should == 3
   end
+
 end
diff --git a/spec/ruby/library/matrix/row_spec.rb b/spec/ruby/library/matrix/row_spec.rb
index eb05cd92730cc3..00b1f02a8e0189 100644
--- a/spec/ruby/library/matrix/row_spec.rb
+++ b/spec/ruby/library/matrix/row_spec.rb
@@ -1,39 +1,36 @@
 require_relative '../../spec_helper'
+require 'matrix'
 
-ruby_version_is ""..."3.1" do
-  require 'matrix'
-
-  describe "Matrix#row" do
-    before :all do
-      @m = Matrix[ [1, 2], [2, 3], [3, 4] ]
-    end
+describe "Matrix#row" do
+  before :all do
+    @m = Matrix[ [1, 2], [2, 3], [3, 4] ]
+  end
 
-    it "returns a Vector when called without a block" do
-      @m.row(0).should == Vector[1,2]
-    end
+  it "returns a Vector when called without a block" do
+    @m.row(0).should == Vector[1,2]
+  end
 
-    it "yields the elements of the row when called with a block" do
-      a = []
-      @m.row(0) {|x| a << x}
-      a.should == [1,2]
-    end
+  it "yields the elements of the row when called with a block" do
+    a = []
+    @m.row(0) {|x| a << x}
+    a.should == [1,2]
+  end
 
-    it "counts backwards for negative argument" do
-      @m.row(-1).should == Vector[3, 4]
-    end
+  it "counts backwards for negative argument" do
+    @m.row(-1).should == Vector[3, 4]
+  end
 
-    it "returns self when called with a block" do
-      @m.row(0) { |x| x }.should equal(@m)
-    end
+  it "returns self when called with a block" do
+    @m.row(0) { |x| x }.should equal(@m)
+  end
 
-    it "returns nil when out of bounds" do
-      @m.row(3).should == nil
-      @m.row(-4).should == nil
-    end
+  it "returns nil when out of bounds" do
+    @m.row(3).should == nil
+    @m.row(-4).should == nil
+  end
 
-    it "never yields when out of bounds" do
-      -> { @m.row(3){ raise } }.should_not raise_error
-      -> { @m.row(-4){ raise } }.should_not raise_error
-    end
+  it "never yields when out of bounds" do
+    -> { @m.row(3){ raise } }.should_not raise_error
+    -> { @m.row(-4){ raise } }.should_not raise_error
   end
 end
diff --git a/spec/ruby/library/matrix/row_vector_spec.rb b/spec/ruby/library/matrix/row_vector_spec.rb
index 4c97d6013ad07d..341437ee05c0e3 100644
--- a/spec/ruby/library/matrix/row_vector_spec.rb
+++ b/spec/ruby/library/matrix/row_vector_spec.rb
@@ -1,27 +1,24 @@
 require_relative '../../spec_helper'
+require_relative 'fixtures/classes'
+require 'matrix'
 
-ruby_version_is ""..."3.1" do
-  require_relative 'fixtures/classes'
-  require 'matrix'
+describe "Matrix.row_vector" do
 
-  describe "Matrix.row_vector" do
-
-    it "returns a Matrix" do
-      Matrix.row_vector([]).should be_an_instance_of(Matrix)
-    end
+  it "returns a Matrix" do
+    Matrix.row_vector([]).should be_an_instance_of(Matrix)
+  end
 
-    it "returns a single-row Matrix with the specified values" do
-      Matrix.row_vector([1,2]).should == Matrix[ [1,2] ]
-    end
+  it "returns a single-row Matrix with the specified values" do
+    Matrix.row_vector([1,2]).should == Matrix[ [1,2] ]
+  end
 
-    it "returns a 1x0 matrix when called with an empty Array" do
-      Matrix.row_vector([]).should == Matrix[ [] ]
-    end
+  it "returns a 1x0 matrix when called with an empty Array" do
+    Matrix.row_vector([]).should == Matrix[ [] ]
+  end
 
-    describe "for a subclass of Matrix" do
-      it "returns an instance of that subclass" do
-        MatrixSub.row_vector([1]).should be_an_instance_of(MatrixSub)
-      end
+  describe "for a subclass of Matrix" do
+    it "returns an instance of that subclass" do
+      MatrixSub.row_vector([1]).should be_an_instance_of(MatrixSub)
     end
   end
 end
diff --git a/spec/ruby/library/matrix/row_vectors_spec.rb b/spec/ruby/library/matrix/row_vectors_spec.rb
index d01a4ca10dd15a..6f99c439a67bb0 100644
--- a/spec/ruby/library/matrix/row_vectors_spec.rb
+++ b/spec/ruby/library/matrix/row_vectors_spec.rb
@@ -1,29 +1,26 @@
 require_relative '../../spec_helper'
+require 'matrix'
 
-ruby_version_is ""..."3.1" do
-  require 'matrix'
+describe "Matrix#row_vectors" do
 
-  describe "Matrix#row_vectors" do
-
-    before :each do
-      @vectors = Matrix[ [1,2], [3,4] ].row_vectors
-    end
+  before :each do
+    @vectors = Matrix[ [1,2], [3,4] ].row_vectors
+  end
 
-    it "returns an Array" do
-      Matrix[ [1,2], [3,4] ].row_vectors.should be_an_instance_of(Array)
-    end
+  it "returns an Array" do
+    Matrix[ [1,2], [3,4] ].row_vectors.should be_an_instance_of(Array)
+  end
 
-    it "returns an Array of Vectors" do
-      @vectors.all? {|v| v.should be_an_instance_of(Vector)}
-    end
+  it "returns an Array of Vectors" do
+    @vectors.all? {|v| v.should be_an_instance_of(Vector)}
+  end
 
-    it "returns each row as a Vector" do
-      @vectors.should == [Vector[1,2], Vector[3,4]]
-    end
+  it "returns each row as a Vector" do
+    @vectors.should == [Vector[1,2], Vector[3,4]]
+  end
 
-    it "returns an empty Array for empty matrices" do
-      Matrix[].row_vectors.should == []
-      Matrix[ [] ].row_vectors.should == [ Vector[] ]
-    end
+  it "returns an empty Array for empty matrices" do
+    Matrix[].row_vectors.should == []
+    Matrix[ [] ].row_vectors.should == [ Vector[] ]
   end
 end
diff --git a/spec/ruby/library/matrix/rows_spec.rb b/spec/ruby/library/matrix/rows_spec.rb
index 5f0515a37bdecf..41ba635775779e 100644
--- a/spec/ruby/library/matrix/rows_spec.rb
+++ b/spec/ruby/library/matrix/rows_spec.rb
@@ -1,44 +1,41 @@
 require_relative '../../spec_helper'
+require_relative 'fixtures/classes'
+require 'matrix'
 
-ruby_version_is ""..."3.1" do
-  require_relative 'fixtures/classes'
-  require 'matrix'
-
-  describe "Matrix.rows" do
-    before :each do
-      @a = [1, 2]
-      @b = [3, 4]
-      @m = Matrix.rows([@a, @b])
-    end
+describe "Matrix.rows" do
+  before :each do
+    @a = [1, 2]
+    @b = [3, 4]
+    @m = Matrix.rows([@a, @b])
+  end
 
-    it "returns a Matrix" do
-      @m.should be_kind_of(Matrix)
-    end
+  it "returns a Matrix" do
+    @m.should be_kind_of(Matrix)
+  end
 
-    it "creates a matrix from argument rows" do
-      @m.row(0).to_a.should == @a
-      @m.row(1).to_a.should == @b
-    end
+  it "creates a matrix from argument rows" do
+    @m.row(0).to_a.should == @a
+    @m.row(1).to_a.should == @b
+  end
 
-    it "copies the original rows by default" do
-      @a << 3
-      @b << 6
-      @m.row(0).should_not equal(@a)
-      @m.row(1).should_not equal(@b)
-    end
+  it "copies the original rows by default" do
+    @a << 3
+    @b << 6
+    @m.row(0).should_not equal(@a)
+    @m.row(1).should_not equal(@b)
+  end
 
-    it "references the original rows if copy is false" do
-      @m_ref = Matrix.rows([@a, @b], false)
-      @a << 3
-      @b << 6
-      @m_ref.row(0).to_a.should == @a
-      @m_ref.row(1).to_a.should == @b
-    end
+  it "references the original rows if copy is false" do
+    @m_ref = Matrix.rows([@a, @b], false)
+    @a << 3
+    @b << 6
+    @m_ref.row(0).to_a.should == @a
+    @m_ref.row(1).to_a.should == @b
+  end
 
-    describe "for a subclass of Matrix" do
-      it "returns an instance of that subclass" do
-        MatrixSub.rows([[0, 1], [0, 1]]).should be_an_instance_of(MatrixSub)
-      end
+  describe "for a subclass of Matrix" do
+    it "returns an instance of that subclass" do
+      MatrixSub.rows([[0, 1], [0, 1]]).should be_an_instance_of(MatrixSub)
     end
   end
 end
diff --git a/spec/ruby/library/matrix/scalar/Fail_spec.rb b/spec/ruby/library/matrix/scalar/Fail_spec.rb
index 4f774eda285276..9d8f9bd5e87a7f 100644
--- a/spec/ruby/library/matrix/scalar/Fail_spec.rb
+++ b/spec/ruby/library/matrix/scalar/Fail_spec.rb
@@ -1,9 +1,6 @@
 require_relative '../../../spec_helper'
+require 'matrix'
 
-ruby_version_is ""..."3.1" do
-  require 'matrix'
-
-  describe "Matrix::Scalar#Fail" do
-    it "needs to be reviewed for spec completeness"
-  end
+describe "Matrix::Scalar#Fail" do
+  it "needs to be reviewed for spec completeness"
 end
diff --git a/spec/ruby/library/matrix/scalar/Raise_spec.rb b/spec/ruby/library/matrix/scalar/Raise_spec.rb
index b405b6d6c5568a..27e11c1f77b9d1 100644
--- a/spec/ruby/library/matrix/scalar/Raise_spec.rb
+++ b/spec/ruby/library/matrix/scalar/Raise_spec.rb
@@ -1,9 +1,6 @@
 require_relative '../../../spec_helper'
+require 'matrix'
 
-ruby_version_is ""..."3.1" do
-  require 'matrix'
-
-  describe "Matrix::Scalar#Raise" do
-    it "needs to be reviewed for spec completeness"
-  end
+describe "Matrix::Scalar#Raise" do
+  it "needs to be reviewed for spec completeness"
 end
diff --git a/spec/ruby/library/matrix/scalar/divide_spec.rb b/spec/ruby/library/matrix/scalar/divide_spec.rb
index 0ef2206bf6df12..5d726943fe43c5 100644
--- a/spec/ruby/library/matrix/scalar/divide_spec.rb
+++ b/spec/ruby/library/matrix/scalar/divide_spec.rb
@@ -1,9 +1,6 @@
 require_relative '../../../spec_helper'
+require 'matrix'
 
-ruby_version_is ""..."3.1" do
-  require 'matrix'
-
-  describe "Matrix::Scalar#/" do
-    it "needs to be reviewed for spec completeness"
-  end
+describe "Matrix::Scalar#/" do
+  it "needs to be reviewed for spec completeness"
 end
diff --git a/spec/ruby/library/matrix/scalar/exponent_spec.rb b/spec/ruby/library/matrix/scalar/exponent_spec.rb
index 87eea283d1667b..8e9ef52ff2ee14 100644
--- a/spec/ruby/library/matrix/scalar/exponent_spec.rb
+++ b/spec/ruby/library/matrix/scalar/exponent_spec.rb
@@ -1,9 +1,6 @@
 require_relative '../../../spec_helper'
+require 'matrix'
 
-ruby_version_is ""..."3.1" do
-  require 'matrix'
-
-  describe "Matrix::Scalar#**" do
-    it "needs to be reviewed for spec completeness"
-  end
+describe "Matrix::Scalar#**" do
+  it "needs to be reviewed for spec completeness"
 end
diff --git a/spec/ruby/library/matrix/scalar/included_spec.rb b/spec/ruby/library/matrix/scalar/included_spec.rb
index bab80e5120284b..cb3beb2ecd6767 100644
--- a/spec/ruby/library/matrix/scalar/included_spec.rb
+++ b/spec/ruby/library/matrix/scalar/included_spec.rb
@@ -1,9 +1,6 @@
 require_relative '../../../spec_helper'
+require 'matrix'
 
-ruby_version_is ""..."3.1" do
-  require 'matrix'
-
-  describe "Matrix::Scalar.included" do
-    it "needs to be reviewed for spec completeness"
-  end
+describe "Matrix::Scalar.included" do
+  it "needs to be reviewed for spec completeness"
 end
diff --git a/spec/ruby/library/matrix/scalar/initialize_spec.rb b/spec/ruby/library/matrix/scalar/initialize_spec.rb
index af51562b431de0..23145ad0de8f89 100644
--- a/spec/ruby/library/matrix/scalar/initialize_spec.rb
+++ b/spec/ruby/library/matrix/scalar/initialize_spec.rb
@@ -1,9 +1,6 @@
 require_relative '../../../spec_helper'
+require 'matrix'
 
-ruby_version_is ""..."3.1" do
-  require 'matrix'
-
-  describe "Matrix::Scalar#initialize" do
-    it "needs to be reviewed for spec completeness"
-  end
+describe "Matrix::Scalar#initialize" do
+  it "needs to be reviewed for spec completeness"
 end
diff --git a/spec/ruby/library/matrix/scalar/minus_spec.rb b/spec/ruby/library/matrix/scalar/minus_spec.rb
index 966db1d75b5b23..c727ea165951ab 100644
--- a/spec/ruby/library/matrix/scalar/minus_spec.rb
+++ b/spec/ruby/library/matrix/scalar/minus_spec.rb
@@ -1,9 +1,6 @@
 require_relative '../../../spec_helper'
+require 'matrix'
 
-ruby_version_is ""..."3.1" do
-  require 'matrix'
-
-  describe "Matrix::Scalar#-" do
-    it "needs to be reviewed for spec completeness"
-  end
+describe "Matrix::Scalar#-" do
+  it "needs to be reviewed for spec completeness"
 end
diff --git a/spec/ruby/library/matrix/scalar/multiply_spec.rb b/spec/ruby/library/matrix/scalar/multiply_spec.rb
index 21caac478b0150..1a2a83d83e69d6 100644
--- a/spec/ruby/library/matrix/scalar/multiply_spec.rb
+++ b/spec/ruby/library/matrix/scalar/multiply_spec.rb
@@ -1,9 +1,6 @@
 require_relative '../../../spec_helper'
+require 'matrix'
 
-ruby_version_is ""..."3.1" do
-  require 'matrix'
-
-  describe "Matrix::Scalar#*" do
-    it "needs to be reviewed for spec completeness"
-  end
+describe "Matrix::Scalar#*" do
+  it "needs to be reviewed for spec completeness"
 end
diff --git a/spec/ruby/library/matrix/scalar/plus_spec.rb b/spec/ruby/library/matrix/scalar/plus_spec.rb
index 78cdf9367f8932..c94689a70253b4 100644
--- a/spec/ruby/library/matrix/scalar/plus_spec.rb
+++ b/spec/ruby/library/matrix/scalar/plus_spec.rb
@@ -1,9 +1,6 @@
 require_relative '../../../spec_helper'
+require 'matrix'
 
-ruby_version_is ""..."3.1" do
-  require 'matrix'
-
-  describe "Matrix::Scalar#+" do
-    it "needs to be reviewed for spec completeness"
-  end
+describe "Matrix::Scalar#+" do
+  it "needs to be reviewed for spec completeness"
 end
diff --git a/spec/ruby/library/matrix/scalar_spec.rb b/spec/ruby/library/matrix/scalar_spec.rb
index 1ec64d2d782dd9..7fdd64c9d95026 100644
--- a/spec/ruby/library/matrix/scalar_spec.rb
+++ b/spec/ruby/library/matrix/scalar_spec.rb
@@ -1,68 +1,65 @@
 require_relative '../../spec_helper'
+require 'matrix'
 
-ruby_version_is ""..."3.1" do
-  require 'matrix'
+describe "Matrix.scalar" do
 
-  describe "Matrix.scalar" do
-
-    before :each do
-      @side = 3
-      @value = 8
-      @a = Matrix.scalar(@side, @value)
-    end
+  before :each do
+    @side = 3
+    @value = 8
+    @a = Matrix.scalar(@side, @value)
+  end
 
-    it "returns a Matrix" do
-      @a.should be_kind_of(Matrix)
-    end
+  it "returns a Matrix" do
+    @a.should be_kind_of(Matrix)
+  end
 
-    it "returns a n x n matrix" do
-      @a.row_size.should == @side
-      @a.column_size.should == @side
-    end
+  it "returns a n x n matrix" do
+    @a.row_size.should == @side
+    @a.column_size.should == @side
+  end
 
-    it "initializes diagonal to value" do
-      (0...@a.row_size).each do |i|
-        @a[i, i].should == @value
-      end
+  it "initializes diagonal to value" do
+    (0...@a.row_size).each do |i|
+      @a[i, i].should == @value
     end
+  end
 
-    it "initializes all non-diagonal values to 0" do
-      (0...@a.row_size).each do |i|
-        (0...@a.column_size).each do |j|
-          if i != j
-            @a[i, j].should == 0
-          end
+  it "initializes all non-diagonal values to 0" do
+    (0...@a.row_size).each do |i|
+      (0...@a.column_size).each do |j|
+        if i != j
+          @a[i, j].should == 0
         end
       end
     end
+  end
 
-    before :each do
-      @side = 3
-      @value = 8
-      @a = Matrix.scalar(@side, @value)
-    end
+  before :each do
+    @side = 3
+    @value = 8
+    @a = Matrix.scalar(@side, @value)
+  end
 
-    it "returns a Matrix" do
-      @a.should be_kind_of(Matrix)
-    end
+  it "returns a Matrix" do
+    @a.should be_kind_of(Matrix)
+  end
 
-    it "returns a square matrix, where the first argument specifies the side of the square" do
-      @a.row_size.should == @side
-      @a.column_size.should == @side
-    end
+  it "returns a square matrix, where the first argument specifies the side of the square" do
+    @a.row_size.should == @side
+    @a.column_size.should == @side
+  end
 
-    it "puts the second argument in all diagonal values" do
-      (0...@a.row_size).each do |i|
-        @a[i, i].should == @value
-      end
+  it "puts the second argument in all diagonal values" do
+    (0...@a.row_size).each do |i|
+      @a[i, i].should == @value
     end
+  end
 
-    it "fills all values not on the main diagonal with 0" do
-      (0...@a.row_size).each do |i|
-        (0...@a.column_size).each do |j|
-          if i != j
-            @a[i, j].should == 0
-          end
+  it "fills all values not on the main diagonal with 0" do
+    (0...@a.row_size).each do |i|
+      (0...@a.column_size).each do |j|
+        if i != j
+          @a[i, j].should == 0
         end
       end
     end
diff --git a/spec/ruby/library/matrix/singular_spec.rb b/spec/ruby/library/matrix/singular_spec.rb
index 341c2675a8103c..7bba36a54ac1fc 100644
--- a/spec/ruby/library/matrix/singular_spec.rb
+++ b/spec/ruby/library/matrix/singular_spec.rb
@@ -1,34 +1,31 @@
 require_relative '../../spec_helper'
+require 'matrix'
 
-ruby_version_is ""..."3.1" do
-  require 'matrix'
+describe "Matrix#singular?" do
+  it "returns true for singular matrices" do
+    m = Matrix[ [1,2,3], [3,4,3], [0,0,0] ]
+    m.singular?.should be_true
 
-  describe "Matrix#singular?" do
-    it "returns true for singular matrices" do
-      m = Matrix[ [1,2,3], [3,4,3], [0,0,0] ]
-      m.singular?.should be_true
-
-      m = Matrix[ [1,2,9], [3,4,9], [1,2,9] ]
-      m.singular?.should be_true
-    end
-
-    it "returns false if the Matrix is regular" do
-      Matrix[ [0,1], [1,0] ].singular?.should be_false
-    end
+    m = Matrix[ [1,2,9], [3,4,9], [1,2,9] ]
+    m.singular?.should be_true
+  end
 
-    it "returns false for an empty 0x0 matrix" do
-      Matrix.empty(0,0).singular?.should be_false
-    end
+  it "returns false if the Matrix is regular" do
+    Matrix[ [0,1], [1,0] ].singular?.should be_false
+  end
 
-    it "raises an error for rectangular matrices" do
-      -> {
-        Matrix[[1], [2], [3]].singular?
-      }.should raise_error(Matrix::ErrDimensionMismatch)
+  it "returns false for an empty 0x0 matrix" do
+    Matrix.empty(0,0).singular?.should be_false
+  end
 
-      -> {
-        Matrix.empty(3,0).singular?
-      }.should raise_error(Matrix::ErrDimensionMismatch)
-    end
+  it "raises an error for rectangular matrices" do
+    -> {
+      Matrix[[1], [2], [3]].singular?
+    }.should raise_error(Matrix::ErrDimensionMismatch)
 
+    -> {
+      Matrix.empty(3,0).singular?
+    }.should raise_error(Matrix::ErrDimensionMismatch)
   end
+
 end
diff --git a/spec/ruby/library/matrix/square_spec.rb b/spec/ruby/library/matrix/square_spec.rb
index e678f1c7021f3c..25d2d1ad9c25d9 100644
--- a/spec/ruby/library/matrix/square_spec.rb
+++ b/spec/ruby/library/matrix/square_spec.rb
@@ -1,31 +1,28 @@
 require_relative '../../spec_helper'
+require 'matrix'
 
-ruby_version_is ""..."3.1" do
-  require 'matrix'
+describe "Matrix#square?" do
 
-  describe "Matrix#square?" do
-
-    it "returns true when the Matrix is square" do
-      Matrix[ [1,2], [2,4] ].square?.should be_true
-      Matrix[ [100,3,5], [9.5, 4.9, 8], [2,0,77] ].square?.should be_true
-    end
+  it "returns true when the Matrix is square" do
+    Matrix[ [1,2], [2,4] ].square?.should be_true
+    Matrix[ [100,3,5], [9.5, 4.9, 8], [2,0,77] ].square?.should be_true
+  end
 
-    it "returns true when the Matrix has only one element" do
-      Matrix[ [9] ].square?.should be_true
-    end
+  it "returns true when the Matrix has only one element" do
+    Matrix[ [9] ].square?.should be_true
+  end
 
-    it "returns false when the Matrix is rectangular" do
-      Matrix[ [1, 2] ].square?.should be_false
-    end
+  it "returns false when the Matrix is rectangular" do
+    Matrix[ [1, 2] ].square?.should be_false
+  end
 
-    it "returns false when the Matrix is rectangular" do
-      Matrix[ [1], [2] ].square?.should be_false
-    end
+  it "returns false when the Matrix is rectangular" do
+    Matrix[ [1], [2] ].square?.should be_false
+  end
 
-    it "returns handles empty matrices" do
-      Matrix[].square?.should be_true
-      Matrix[[]].square?.should be_false
-      Matrix.columns([[]]).square?.should be_false
-    end
+  it "returns handles empty matrices" do
+    Matrix[].square?.should be_true
+    Matrix[[]].square?.should be_false
+    Matrix.columns([[]]).square?.should be_false
   end
 end
diff --git a/spec/ruby/library/matrix/symmetric_spec.rb b/spec/ruby/library/matrix/symmetric_spec.rb
index 9eed28ac0d35ee..6f2a99276ab31b 100644
--- a/spec/ruby/library/matrix/symmetric_spec.rb
+++ b/spec/ruby/library/matrix/symmetric_spec.rb
@@ -1,32 +1,29 @@
 require_relative '../../spec_helper'
+require 'matrix'
 
-ruby_version_is ""..."3.1" do
-  require 'matrix'
-
-  describe "Matrix.symmetric?" do
-    it "returns true for a symmetric Matrix" do
-      Matrix[[1, 2, Complex(0, 3)], [2, 4, 5], [Complex(0, 3), 5, 6]].symmetric?.should be_true
-    end
+describe "Matrix.symmetric?" do
+  it "returns true for a symmetric Matrix" do
+    Matrix[[1, 2, Complex(0, 3)], [2, 4, 5], [Complex(0, 3), 5, 6]].symmetric?.should be_true
+  end
 
-    it "returns true for a 0x0 empty matrix" do
-      Matrix.empty.symmetric?.should be_true
-    end
+  it "returns true for a 0x0 empty matrix" do
+    Matrix.empty.symmetric?.should be_true
+  end
 
-    it "returns false for an asymmetric Matrix" do
-      Matrix[[1, 2],[-2, 1]].symmetric?.should be_false
-    end
+  it "returns false for an asymmetric Matrix" do
+    Matrix[[1, 2],[-2, 1]].symmetric?.should be_false
+  end
 
-    it "raises an error for rectangular matrices" do
-      [
-        Matrix[[0], [0]],
-        Matrix[[0, 0]],
-        Matrix.empty(0, 2),
-        Matrix.empty(2, 0),
-      ].each do |rectangular_matrix|
-        -> {
-          rectangular_matrix.symmetric?
-        }.should raise_error(Matrix::ErrDimensionMismatch)
-      end
+  it "raises an error for rectangular matrices" do
+    [
+      Matrix[[0], [0]],
+      Matrix[[0, 0]],
+      Matrix.empty(0, 2),
+      Matrix.empty(2, 0),
+    ].each do |rectangular_matrix|
+      -> {
+        rectangular_matrix.symmetric?
+      }.should raise_error(Matrix::ErrDimensionMismatch)
     end
   end
 end
diff --git a/spec/ruby/library/matrix/t_spec.rb b/spec/ruby/library/matrix/t_spec.rb
index 6eb54371ee8680..6f1a5178e0a5a1 100644
--- a/spec/ruby/library/matrix/t_spec.rb
+++ b/spec/ruby/library/matrix/t_spec.rb
@@ -1,9 +1,6 @@
 require_relative '../../spec_helper'
+require_relative 'shared/transpose'
 
-ruby_version_is ""..."3.1" do
-  require_relative 'shared/transpose'
-
-  describe "Matrix#transpose" do
-    it_behaves_like :matrix_transpose, :t
-  end
+describe "Matrix#transpose" do
+  it_behaves_like :matrix_transpose, :t
 end
diff --git a/spec/ruby/library/matrix/to_a_spec.rb b/spec/ruby/library/matrix/to_a_spec.rb
index 0222a663ac2c04..b5d55c5d6759ac 100644
--- a/spec/ruby/library/matrix/to_a_spec.rb
+++ b/spec/ruby/library/matrix/to_a_spec.rb
@@ -1,14 +1,11 @@
 require_relative '../../spec_helper'
+require 'matrix'
 
-ruby_version_is ""..."3.1" do
-  require 'matrix'
-
-  describe "Matrix#to_a" do
-    it "returns the array of arrays that describe the rows of the matrix" do
-      Matrix[].to_a.should == []
-      Matrix[[]].to_a.should == [[]]
-      Matrix[[1]].to_a.should == [[1]]
-      Matrix[[1, 2], [3, 4]].to_a.should == [[1, 2],[3, 4]]
-    end
+describe "Matrix#to_a" do
+  it "returns the array of arrays that describe the rows of the matrix" do
+    Matrix[].to_a.should == []
+    Matrix[[]].to_a.should == [[]]
+    Matrix[[1]].to_a.should == [[1]]
+    Matrix[[1, 2], [3, 4]].to_a.should == [[1, 2],[3, 4]]
   end
 end
diff --git a/spec/ruby/library/matrix/to_s_spec.rb b/spec/ruby/library/matrix/to_s_spec.rb
index 7d38655e0dedda..f529fe3bcd3d1e 100644
--- a/spec/ruby/library/matrix/to_s_spec.rb
+++ b/spec/ruby/library/matrix/to_s_spec.rb
@@ -1,9 +1,6 @@
 require_relative '../../spec_helper'
+require 'matrix'
 
-ruby_version_is ""..."3.1" do
-  require 'matrix'
-
-  describe "Matrix#to_s" do
-    it "needs to be reviewed for spec completeness"
-  end
+describe "Matrix#to_s" do
+  it "needs to be reviewed for spec completeness"
 end
diff --git a/spec/ruby/library/matrix/tr_spec.rb b/spec/ruby/library/matrix/tr_spec.rb
index bbf274bb5ef954..e17bd790d7412a 100644
--- a/spec/ruby/library/matrix/tr_spec.rb
+++ b/spec/ruby/library/matrix/tr_spec.rb
@@ -1,10 +1,7 @@
 require_relative '../../spec_helper'
+require_relative 'shared/trace'
+require 'matrix'
 
-ruby_version_is ""..."3.1" do
-  require_relative 'shared/trace'
-  require 'matrix'
-
-  describe "Matrix#tr" do
-    it_behaves_like :trace, :tr
-  end
+describe "Matrix#tr" do
+  it_behaves_like :trace, :tr
 end
diff --git a/spec/ruby/library/matrix/trace_spec.rb b/spec/ruby/library/matrix/trace_spec.rb
index ac6ce7927d4891..290e7cb1f71d64 100644
--- a/spec/ruby/library/matrix/trace_spec.rb
+++ b/spec/ruby/library/matrix/trace_spec.rb
@@ -1,10 +1,7 @@
 require_relative '../../spec_helper'
+require_relative 'shared/trace'
+require 'matrix'
 
-ruby_version_is ""..."3.1" do
-  require_relative 'shared/trace'
-  require 'matrix'
-
-  describe "Matrix#trace" do
-    it_behaves_like :trace, :trace
-  end
+describe "Matrix#trace" do
+  it_behaves_like :trace, :trace
 end
diff --git a/spec/ruby/library/matrix/transpose_spec.rb b/spec/ruby/library/matrix/transpose_spec.rb
index d7f495b946f620..79600dd439ec10 100644
--- a/spec/ruby/library/matrix/transpose_spec.rb
+++ b/spec/ruby/library/matrix/transpose_spec.rb
@@ -1,9 +1,6 @@
 require_relative '../../spec_helper'
+require_relative 'shared/transpose'
 
-ruby_version_is ""..."3.1" do
-  require_relative 'shared/transpose'
-
-  describe "Matrix#transpose" do
-    it_behaves_like :matrix_transpose, :transpose
-  end
+describe "Matrix#transpose" do
+  it_behaves_like :matrix_transpose, :transpose
 end
diff --git a/spec/ruby/library/matrix/unit_spec.rb b/spec/ruby/library/matrix/unit_spec.rb
index 439e0d616bec77..6a41d729c72349 100644
--- a/spec/ruby/library/matrix/unit_spec.rb
+++ b/spec/ruby/library/matrix/unit_spec.rb
@@ -1,9 +1,6 @@
 require_relative '../../spec_helper'
+require_relative 'shared/identity'
 
-ruby_version_is ""..."3.1" do
-  require_relative 'shared/identity'
-
-  describe "Matrix.unit" do
-    it_behaves_like :matrix_identity, :unit
-  end
+describe "Matrix.unit" do
+  it_behaves_like :matrix_identity, :unit
 end
diff --git a/spec/ruby/library/matrix/unitary_spec.rb b/spec/ruby/library/matrix/unitary_spec.rb
index 04e6df8be09104..c214ee9b2f6562 100644
--- a/spec/ruby/library/matrix/unitary_spec.rb
+++ b/spec/ruby/library/matrix/unitary_spec.rb
@@ -1,34 +1,32 @@
 require_relative '../../spec_helper'
 
-ruby_version_is ""..."3.1" do
-  require 'matrix'
+require 'matrix'
 
-  describe "Matrix.unitary?" do
-    it "returns false for non unitary matrices" do
-      Matrix[[0, 1], [1, 2]].should_not.unitary?
-      Matrix[[0, Complex(0, 2)], [Complex(0, 2), 0]].should_not.unitary?
-      Matrix[[1, 1, 0], [0, 1, 1], [1, 0, 1]].should_not.unitary?
-    end
+describe "Matrix.unitary?" do
+  it "returns false for non unitary matrices" do
+    Matrix[[0, 1], [1, 2]].should_not.unitary?
+    Matrix[[0, Complex(0, 2)], [Complex(0, 2), 0]].should_not.unitary?
+    Matrix[[1, 1, 0], [0, 1, 1], [1, 0, 1]].should_not.unitary?
+  end
 
-    it "returns true for unitary matrices" do
-      Matrix[[0, Complex(0, 1)], [Complex(0, 1), 0]].should.unitary?
-    end
+  it "returns true for unitary matrices" do
+    Matrix[[0, Complex(0, 1)], [Complex(0, 1), 0]].should.unitary?
+  end
 
-    it "returns true for unitary matrices with a Complex and a negative #imag" do
-      Matrix[[0, Complex(0, 1)], [Complex(0, -1), 0]].should.unitary?
-    end
+  it "returns true for unitary matrices with a Complex and a negative #imag" do
+    Matrix[[0, Complex(0, 1)], [Complex(0, -1), 0]].should.unitary?
+  end
 
-    it "raises an error for rectangular matrices" do
-      [
-        Matrix[[0], [0]],
-        Matrix[[0, 0]],
-        Matrix.empty(0, 2),
-        Matrix.empty(2, 0),
-      ].each do |rectangular_matrix|
-        -> {
-          rectangular_matrix.unitary?
-        }.should raise_error(Matrix::ErrDimensionMismatch)
-      end
+  it "raises an error for rectangular matrices" do
+    [
+      Matrix[[0], [0]],
+      Matrix[[0, 0]],
+      Matrix.empty(0, 2),
+      Matrix.empty(2, 0),
+    ].each do |rectangular_matrix|
+      -> {
+        rectangular_matrix.unitary?
+      }.should raise_error(Matrix::ErrDimensionMismatch)
     end
   end
 end
diff --git a/spec/ruby/library/matrix/upper_triangular_spec.rb b/spec/ruby/library/matrix/upper_triangular_spec.rb
index cc2aeb723336e1..2514294a804c70 100644
--- a/spec/ruby/library/matrix/upper_triangular_spec.rb
+++ b/spec/ruby/library/matrix/upper_triangular_spec.rb
@@ -1,27 +1,24 @@
 require_relative '../../spec_helper'
+require 'matrix'
 
-ruby_version_is ""..."3.1" do
-  require 'matrix'
-
-  describe "Matrix.upper_triangular?" do
-    it "returns true for an upper triangular Matrix" do
-      Matrix[[1, 2, 3], [0, 2, 3], [0, 0, 3]].upper_triangular?.should be_true
-      Matrix.diagonal([1, 2, 3]).upper_triangular?.should be_true
-      Matrix[[1, 2], [0, 2], [0, 0], [0, 0]].upper_triangular?.should be_true
-      Matrix[[1, 2, 3, 4], [0, 2, 3, 4]].upper_triangular?.should be_true
-    end
+describe "Matrix.upper_triangular?" do
+  it "returns true for an upper triangular Matrix" do
+    Matrix[[1, 2, 3], [0, 2, 3], [0, 0, 3]].upper_triangular?.should be_true
+    Matrix.diagonal([1, 2, 3]).upper_triangular?.should be_true
+    Matrix[[1, 2], [0, 2], [0, 0], [0, 0]].upper_triangular?.should be_true
+    Matrix[[1, 2, 3, 4], [0, 2, 3, 4]].upper_triangular?.should be_true
+  end
 
-    it "returns false for a non upper triangular square Matrix" do
-      Matrix[[0, 0], [1, 0]].upper_triangular?.should be_false
-      Matrix[[1, 2, 3], [1, 2, 3], [1, 2, 3]].upper_triangular?.should be_false
-      Matrix[[0, 0], [0, 0], [0, 0], [0, 1]].upper_triangular?.should be_false
-      Matrix[[0, 0, 0, 0], [1, 0, 0, 0]].upper_triangular?.should be_false
-    end
+  it "returns false for a non upper triangular square Matrix" do
+    Matrix[[0, 0], [1, 0]].upper_triangular?.should be_false
+    Matrix[[1, 2, 3], [1, 2, 3], [1, 2, 3]].upper_triangular?.should be_false
+    Matrix[[0, 0], [0, 0], [0, 0], [0, 1]].upper_triangular?.should be_false
+    Matrix[[0, 0, 0, 0], [1, 0, 0, 0]].upper_triangular?.should be_false
+  end
 
-    it "returns true for an empty matrix" do
-      Matrix.empty(3,0).upper_triangular?.should be_true
-      Matrix.empty(0,3).upper_triangular?.should be_true
-      Matrix.empty(0,0).upper_triangular?.should be_true
-    end
+  it "returns true for an empty matrix" do
+    Matrix.empty(3,0).upper_triangular?.should be_true
+    Matrix.empty(0,3).upper_triangular?.should be_true
+    Matrix.empty(0,0).upper_triangular?.should be_true
   end
 end
diff --git a/spec/ruby/library/matrix/vector/cross_product_spec.rb b/spec/ruby/library/matrix/vector/cross_product_spec.rb
index 88523824cd965a..c2698ade4c7554 100644
--- a/spec/ruby/library/matrix/vector/cross_product_spec.rb
+++ b/spec/ruby/library/matrix/vector/cross_product_spec.rb
@@ -1,17 +1,14 @@
 require_relative '../../../spec_helper'
+require 'matrix'
 
-ruby_version_is ""..."3.1" do
-  require 'matrix'
-
-  describe "Vector#cross_product" do
-    it "returns the cross product of a vector" do
-      Vector[1, 2, 3].cross_product(Vector[0, -4, 5]).should == Vector[22, -5, -4]
-    end
+describe "Vector#cross_product" do
+  it "returns the cross product of a vector" do
+    Vector[1, 2, 3].cross_product(Vector[0, -4, 5]).should == Vector[22, -5, -4]
+  end
 
-    it "raises an error unless both vectors have dimension 3" do
-      -> {
-        Vector[1, 2, 3].cross_product(Vector[0, -4])
-      }.should raise_error(Vector::ErrDimensionMismatch)
-    end
+  it "raises an error unless both vectors have dimension 3" do
+    -> {
+      Vector[1, 2, 3].cross_product(Vector[0, -4])
+    }.should raise_error(Vector::ErrDimensionMismatch)
   end
 end
diff --git a/spec/ruby/library/matrix/vector/each2_spec.rb b/spec/ruby/library/matrix/vector/each2_spec.rb
index bdd6966472ef27..10d2fc404d4425 100644
--- a/spec/ruby/library/matrix/vector/each2_spec.rb
+++ b/spec/ruby/library/matrix/vector/each2_spec.rb
@@ -1,52 +1,49 @@
 require_relative '../../../spec_helper'
+require 'matrix'
 
-ruby_version_is ""..."3.1" do
-  require 'matrix'
+describe "Vector.each2" do
+  before :all do
+    @v = Vector[1, 2, 3]
+    @v2 = Vector[4, 5, 6]
+  end
+
+  it "requires one argument" do
+    -> { @v.each2(@v2, @v2){} }.should raise_error(ArgumentError)
+    -> { @v.each2(){} }.should raise_error(ArgumentError)
+  end
+
+  describe "given one argument" do
+    it "accepts an Array argument" do
+      a = []
+      @v.each2([7, 8, 9]){|x, y| a << x << y}
+      a.should == [1, 7, 2, 8, 3, 9]
+    end
+
+    it "raises a DimensionMismatch error if the Vector size is different" do
+      -> { @v.each2(Vector[1,2]){}     }.should raise_error(Vector::ErrDimensionMismatch)
+      -> { @v.each2(Vector[1,2,3,4]){} }.should raise_error(Vector::ErrDimensionMismatch)
+    end
+
+    it "yields arguments in sequence" do
+      a = []
+      @v.each2(@v2){|first, second| a << [first, second]}
+      a.should == [[1, 4], [2, 5], [3, 6]]
+    end
 
-  describe "Vector.each2" do
-    before :all do
-      @v = Vector[1, 2, 3]
-      @v2 = Vector[4, 5, 6]
+    it "yield arguments in pairs" do
+      a = []
+      @v.each2(@v2){|*pair| a << pair}
+      a.should == [[1, 4], [2, 5], [3, 6]]
     end
 
-    it "requires one argument" do
-      -> { @v.each2(@v2, @v2){} }.should raise_error(ArgumentError)
-      -> { @v.each2(){} }.should raise_error(ArgumentError)
+    it "returns self when given a block" do
+      @v.each2(@v2){}.should equal(@v)
     end
 
-    describe "given one argument" do
-      it "accepts an Array argument" do
-        a = []
-        @v.each2([7, 8, 9]){|x, y| a << x << y}
-        a.should == [1, 7, 2, 8, 3, 9]
-      end
-
-      it "raises a DimensionMismatch error if the Vector size is different" do
-        -> { @v.each2(Vector[1,2]){}     }.should raise_error(Vector::ErrDimensionMismatch)
-        -> { @v.each2(Vector[1,2,3,4]){} }.should raise_error(Vector::ErrDimensionMismatch)
-      end
-
-      it "yields arguments in sequence" do
-        a = []
-        @v.each2(@v2){|first, second| a << [first, second]}
-        a.should == [[1, 4], [2, 5], [3, 6]]
-      end
-
-      it "yield arguments in pairs" do
-        a = []
-        @v.each2(@v2){|*pair| a << pair}
-        a.should == [[1, 4], [2, 5], [3, 6]]
-      end
-
-      it "returns self when given a block" do
-        @v.each2(@v2){}.should equal(@v)
-      end
-
-      it "returns an enumerator if no block given" do
-        enum = @v.each2(@v2)
-        enum.should be_an_instance_of(Enumerator)
-        enum.to_a.should == [[1, 4], [2, 5], [3, 6]]
-      end
+    it "returns an enumerator if no block given" do
+      enum = @v.each2(@v2)
+      enum.should be_an_instance_of(Enumerator)
+      enum.to_a.should == [[1, 4], [2, 5], [3, 6]]
     end
   end
 end
diff --git a/spec/ruby/library/matrix/vector/eql_spec.rb b/spec/ruby/library/matrix/vector/eql_spec.rb
index fa086bd33af0fa..eb2451b550dd8b 100644
--- a/spec/ruby/library/matrix/vector/eql_spec.rb
+++ b/spec/ruby/library/matrix/vector/eql_spec.rb
@@ -1,19 +1,16 @@
 require_relative '../../../spec_helper'
+require 'matrix'
 
-ruby_version_is ""..."3.1" do
-  require 'matrix'
-
-  describe "Vector#eql?" do
-    before do
-      @vector = Vector[1, 2, 3, 4, 5]
-    end
+describe "Vector#eql?" do
+  before do
+    @vector = Vector[1, 2, 3, 4, 5]
+  end
 
-    it "returns true for self" do
-      @vector.eql?(@vector).should be_true
-    end
+  it "returns true for self" do
+    @vector.eql?(@vector).should be_true
+  end
 
-    it "returns false when there are a pair corresponding elements which are not equal in the sense of Kernel#eql?" do
-      @vector.eql?(Vector[1, 2, 3, 4, 5.0]).should be_false
-    end
+  it "returns false when there are a pair corresponding elements which are not equal in the sense of Kernel#eql?" do
+    @vector.eql?(Vector[1, 2, 3, 4, 5.0]).should be_false
   end
 end
diff --git a/spec/ruby/library/matrix/vector/inner_product_spec.rb b/spec/ruby/library/matrix/vector/inner_product_spec.rb
index 95dc4806b50305..1cf8771e0450b4 100644
--- a/spec/ruby/library/matrix/vector/inner_product_spec.rb
+++ b/spec/ruby/library/matrix/vector/inner_product_spec.rb
@@ -1,25 +1,22 @@
 require_relative '../../../spec_helper'
+require 'matrix'
 
-ruby_version_is ""..."3.1" do
-  require 'matrix'
-
-  describe "Vector#inner_product" do
-    it "returns the inner product of a vector" do
-      Vector[1, 2, 3].inner_product(Vector[0, -4, 5]).should == 7
-    end
+describe "Vector#inner_product" do
+  it "returns the inner product of a vector" do
+    Vector[1, 2, 3].inner_product(Vector[0, -4, 5]).should == 7
+  end
 
-    it "returns 0 for empty vectors" do
-      Vector[].inner_product(Vector[]).should == 0
-    end
+  it "returns 0 for empty vectors" do
+    Vector[].inner_product(Vector[]).should == 0
+  end
 
-    it "raises an error for mismatched vectors" do
-      -> {
-        Vector[1, 2, 3].inner_product(Vector[0, -4])
-      }.should raise_error(Vector::ErrDimensionMismatch)
-    end
+  it "raises an error for mismatched vectors" do
+    -> {
+      Vector[1, 2, 3].inner_product(Vector[0, -4])
+    }.should raise_error(Vector::ErrDimensionMismatch)
+  end
 
-    it "uses the conjugate of its argument" do
-      Vector[Complex(1,2)].inner_product(Vector[Complex(3,4)]).should == Complex(11, 2)
-    end
+  it "uses the conjugate of its argument" do
+    Vector[Complex(1,2)].inner_product(Vector[Complex(3,4)]).should == Complex(11, 2)
   end
 end
diff --git a/spec/ruby/library/matrix/vector/normalize_spec.rb b/spec/ruby/library/matrix/vector/normalize_spec.rb
index 7345e11fa49ac7..527c9260debf3f 100644
--- a/spec/ruby/library/matrix/vector/normalize_spec.rb
+++ b/spec/ruby/library/matrix/vector/normalize_spec.rb
@@ -1,21 +1,18 @@
 require_relative '../../../spec_helper'
+require 'matrix'
 
-ruby_version_is ""..."3.1" do
-  require 'matrix'
-
-  describe "Vector#normalize" do
-    it "returns a normalized copy of the vector" do
-      x = 0.2672612419124244
-      Vector[1, 2, 3].normalize.should == Vector[x, x * 2, x * 3]
-    end
+describe "Vector#normalize" do
+  it "returns a normalized copy of the vector" do
+    x = 0.2672612419124244
+    Vector[1, 2, 3].normalize.should == Vector[x, x * 2, x * 3]
+  end
 
-    it "raises an error for zero vectors" do
-      -> {
-        Vector[].normalize
-      }.should raise_error(Vector::ZeroVectorError)
-      -> {
-        Vector[0, 0, 0].normalize
-      }.should raise_error(Vector::ZeroVectorError)
-    end
+  it "raises an error for zero vectors" do
+    -> {
+      Vector[].normalize
+    }.should raise_error(Vector::ZeroVectorError)
+    -> {
+      Vector[0, 0, 0].normalize
+    }.should raise_error(Vector::ZeroVectorError)
   end
 end
diff --git a/spec/ruby/library/matrix/zero_spec.rb b/spec/ruby/library/matrix/zero_spec.rb
index 80162a03d0aefa..68e8567c260256 100644
--- a/spec/ruby/library/matrix/zero_spec.rb
+++ b/spec/ruby/library/matrix/zero_spec.rb
@@ -1,55 +1,52 @@
 require_relative '../../spec_helper'
+require_relative 'fixtures/classes'
+require 'matrix'
 
-ruby_version_is ""..."3.1" do
-  require_relative 'fixtures/classes'
-  require 'matrix'
-
-  describe "Matrix.zero" do
-    it "returns an object of type Matrix" do
-      Matrix.zero(3).should be_kind_of(Matrix)
-    end
+describe "Matrix.zero" do
+  it "returns an object of type Matrix" do
+    Matrix.zero(3).should be_kind_of(Matrix)
+  end
 
-    it "creates a n x n matrix" do
-      m3 = Matrix.zero(3)
-      m3.row_size.should == 3
-      m3.column_size.should == 3
+  it "creates a n x n matrix" do
+    m3 = Matrix.zero(3)
+    m3.row_size.should == 3
+    m3.column_size.should == 3
 
-      m8 = Matrix.zero(8)
-      m8.row_size.should == 8
-      m8.column_size.should == 8
-    end
+    m8 = Matrix.zero(8)
+    m8.row_size.should == 8
+    m8.column_size.should == 8
+  end
 
-    it "initializes all cells to 0" do
-      size = 10
-      m = Matrix.zero(size)
+  it "initializes all cells to 0" do
+    size = 10
+    m = Matrix.zero(size)
 
-      (0...size).each do |i|
-        (0...size).each do |j|
-          m[i, j].should == 0
-        end
+    (0...size).each do |i|
+      (0...size).each do |j|
+        m[i, j].should == 0
       end
     end
+  end
 
-    describe "for a subclass of Matrix" do
-      it "returns an instance of that subclass" do
-        MatrixSub.zero(3).should be_an_instance_of(MatrixSub)
-      end
+  describe "for a subclass of Matrix" do
+    it "returns an instance of that subclass" do
+      MatrixSub.zero(3).should be_an_instance_of(MatrixSub)
     end
   end
+end
 
-  describe "Matrix.zero?" do
-    it "returns true for empty matrices" do
-      Matrix.empty.should.zero?
-      Matrix.empty(3,0).should.zero?
-      Matrix.empty(0,3).should.zero?
-    end
+describe "Matrix.zero?" do
+  it "returns true for empty matrices" do
+    Matrix.empty.should.zero?
+    Matrix.empty(3,0).should.zero?
+    Matrix.empty(0,3).should.zero?
+  end
 
-    it "returns true for matrices with zero entries" do
-      Matrix.zero(2,3).should.zero?
-    end
+  it "returns true for matrices with zero entries" do
+    Matrix.zero(2,3).should.zero?
+  end
 
-    it "returns false for matrices with non zero entries" do
-      Matrix[[1]].should_not.zero?
-    end
+  it "returns false for matrices with non zero entries" do
+    Matrix[[1]].should_not.zero?
   end
 end
diff --git a/spec/ruby/library/net-ftp/FTPError_spec.rb b/spec/ruby/library/net-ftp/FTPError_spec.rb
new file mode 100644
index 00000000000000..0c31b65dcc437c
--- /dev/null
+++ b/spec/ruby/library/net-ftp/FTPError_spec.rb
@@ -0,0 +1,8 @@
+require_relative '../../spec_helper'
+require 'net/ftp'
+
+describe "Net::FTPError" do
+  it "is an Exception" do
+    Net::FTPError.should < Exception
+  end
+end
diff --git a/spec/ruby/library/net-ftp/FTPPermError_spec.rb b/spec/ruby/library/net-ftp/FTPPermError_spec.rb
new file mode 100644
index 00000000000000..b43e12c5035564
--- /dev/null
+++ b/spec/ruby/library/net-ftp/FTPPermError_spec.rb
@@ -0,0 +1,12 @@
+require_relative '../../spec_helper'
+require 'net/ftp'
+
+describe "Net::FTPPermError" do
+  it "is an Exception" do
+    Net::FTPPermError.should < Exception
+  end
+
+  it "is a subclass of Net::FTPError" do
+    Net::FTPPermError.should < Net::FTPError
+  end
+end
diff --git a/spec/ruby/library/net-ftp/FTPProtoError_spec.rb b/spec/ruby/library/net-ftp/FTPProtoError_spec.rb
new file mode 100644
index 00000000000000..e7abbc0dd81acf
--- /dev/null
+++ b/spec/ruby/library/net-ftp/FTPProtoError_spec.rb
@@ -0,0 +1,12 @@
+require_relative '../../spec_helper'
+require 'net/ftp'
+
+describe "Net::FTPProtoError" do
+  it "is an Exception" do
+    Net::FTPProtoError.should < Exception
+  end
+
+  it "is a subclass of Net::FTPError" do
+    Net::FTPPermError.should < Net::FTPError
+  end
+end
diff --git a/spec/ruby/library/net-ftp/FTPReplyError_spec.rb b/spec/ruby/library/net-ftp/FTPReplyError_spec.rb
new file mode 100644
index 00000000000000..fcc7501fc11f4c
--- /dev/null
+++ b/spec/ruby/library/net-ftp/FTPReplyError_spec.rb
@@ -0,0 +1,12 @@
+require_relative '../../spec_helper'
+require 'net/ftp'
+
+describe "Net::FTPReplyError" do
+  it "is an Exception" do
+    Net::FTPReplyError.should < Exception
+  end
+
+  it "is a subclass of Net::FTPError" do
+    Net::FTPPermError.should < Net::FTPError
+  end
+end
diff --git a/spec/ruby/library/net-ftp/FTPTempError_spec.rb b/spec/ruby/library/net-ftp/FTPTempError_spec.rb
new file mode 100644
index 00000000000000..f4b045dfb5ba1d
--- /dev/null
+++ b/spec/ruby/library/net-ftp/FTPTempError_spec.rb
@@ -0,0 +1,12 @@
+require_relative '../../spec_helper'
+require 'net/ftp'
+
+describe "Net::FTPTempError" do
+  it "is an Exception" do
+    Net::FTPTempError.should < Exception
+  end
+
+  it "is a subclass of Net::FTPError" do
+    Net::FTPPermError.should < Net::FTPError
+  end
+end
diff --git a/spec/ruby/library/net-ftp/abort_spec.rb b/spec/ruby/library/net-ftp/abort_spec.rb
new file mode 100644
index 00000000000000..335d056512a6c5
--- /dev/null
+++ b/spec/ruby/library/net-ftp/abort_spec.rb
@@ -0,0 +1,62 @@
+require_relative '../../spec_helper'
+require_relative 'spec_helper'
+require_relative 'fixtures/server'
+
+describe "Net::FTP#abort" do
+  before :each do
+    @server = NetFTPSpecs::DummyFTP.new
+    @server.serve_once
+
+    @ftp = Net::FTP.new
+    @ftp.connect(@server.hostname, @server.server_port)
+  end
+
+  after :each do
+    @ftp.quit rescue nil
+    @ftp.close
+    @server.stop
+  end
+
+  it "sends the ABOR command to the server" do
+    -> { @ftp.abort }.should_not raise_error
+  end
+
+  it "ignores the response" do
+    @ftp.abort
+    @ftp.last_response.should == "220 Dummy FTP Server ready!\n"
+  end
+
+  it "returns the full response" do
+    @ftp.abort.should == "226 Closing data connection. (ABOR)\n"
+  end
+
+  it "does not raise any error when the response code is 225" do
+    @server.should_receive(:abor).and_respond("225 Data connection open; no transfer in progress.")
+    -> { @ftp.abort }.should_not raise_error
+  end
+
+  it "does not raise any error when the response code is 226" do
+    @server.should_receive(:abor).and_respond("226 Closing data connection.")
+    -> { @ftp.abort }.should_not raise_error
+  end
+
+  it "raises a Net::FTPProtoError when the response code is 500" do
+    @server.should_receive(:abor).and_respond("500 Syntax error, command unrecognized.")
+    -> { @ftp.abort }.should raise_error(Net::FTPProtoError)
+  end
+
+  it "raises a Net::FTPProtoError when the response code is 501" do
+    @server.should_receive(:abor).and_respond("501 Syntax error in parameters or arguments.")
+    -> { @ftp.abort }.should raise_error(Net::FTPProtoError)
+  end
+
+  it "raises a Net::FTPProtoError when the response code is 502" do
+    @server.should_receive(:abor).and_respond("502 Command not implemented.")
+    -> { @ftp.abort }.should raise_error(Net::FTPProtoError)
+  end
+
+  it "raises a Net::FTPProtoError when the response code is 421" do
+    @server.should_receive(:abor).and_respond("421 Service not available, closing control connection.")
+    -> { @ftp.abort }.should raise_error(Net::FTPProtoError)
+  end
+end
diff --git a/spec/ruby/library/net-ftp/acct_spec.rb b/spec/ruby/library/net-ftp/acct_spec.rb
new file mode 100644
index 00000000000000..ab093448a26021
--- /dev/null
+++ b/spec/ruby/library/net-ftp/acct_spec.rb
@@ -0,0 +1,58 @@
+require_relative '../../spec_helper'
+require_relative 'spec_helper'
+require_relative 'fixtures/server'
+
+describe "Net::FTP#acct" do
+  before :each do
+    @server = NetFTPSpecs::DummyFTP.new
+    @server.serve_once
+
+    @ftp = Net::FTP.new
+    @ftp.connect(@server.hostname, @server.server_port)
+  end
+
+  after :each do
+    @ftp.quit rescue nil
+    @ftp.close
+    @server.stop
+  end
+
+  it "writes the ACCT command to the server" do
+    @ftp.acct("my_account")
+    @ftp.last_response.should == "230 User 'my_account' logged in, proceed. (ACCT)\n"
+  end
+
+  it "returns nil" do
+    @ftp.acct("my_account").should == nil
+  end
+
+  it "does not raise any error when the response code is 230" do
+    @server.should_receive(:acct).and_respond("230 User logged in, proceed.")
+    -> { @ftp.acct("my_account") }.should_not raise_error
+  end
+
+  it "raises a Net::FTPPermError when the response code is 530" do
+    @server.should_receive(:acct).and_respond("530 Not logged in.")
+    -> { @ftp.acct("my_account") }.should raise_error(Net::FTPPermError)
+  end
+
+  it "raises a Net::FTPPermError when the response code is 500" do
+    @server.should_receive(:acct).and_respond("500 Syntax error, command unrecognized.")
+    -> { @ftp.acct("my_account") }.should raise_error(Net::FTPPermError)
+  end
+
+  it "raises a Net::FTPPermError when the response code is 501" do
+    @server.should_receive(:acct).and_respond("501 Syntax error in parameters or arguments.")
+    -> { @ftp.acct("my_account") }.should raise_error(Net::FTPPermError)
+  end
+
+  it "raises a Net::FTPPermError when the response code is 503" do
+    @server.should_receive(:acct).and_respond("503 Bad sequence of commands.")
+    -> { @ftp.acct("my_account") }.should raise_error(Net::FTPPermError)
+  end
+
+  it "raises a Net::FTPTempError when the response code is 421" do
+    @server.should_receive(:acct).and_respond("421 Service not available, closing control connection.")
+    -> { @ftp.acct("my_account") }.should raise_error(Net::FTPTempError)
+  end
+end
diff --git a/spec/ruby/library/net-ftp/binary_spec.rb b/spec/ruby/library/net-ftp/binary_spec.rb
new file mode 100644
index 00000000000000..1e0585b7954264
--- /dev/null
+++ b/spec/ruby/library/net-ftp/binary_spec.rb
@@ -0,0 +1,24 @@
+require_relative '../../spec_helper'
+require_relative 'spec_helper'
+
+describe "Net::FTP#binary" do
+  it "returns true when self is in binary mode" do
+    ftp = Net::FTP.new
+    ftp.binary.should be_true
+
+    ftp.binary = false
+    ftp.binary.should be_false
+  end
+end
+
+describe "Net::FTP#binary=" do
+  it "sets self to binary mode when passed true" do
+    ftp = Net::FTP.new
+
+    ftp.binary = true
+    ftp.binary.should be_true
+
+    ftp.binary = false
+    ftp.binary.should be_false
+  end
+end
diff --git a/spec/ruby/library/net-ftp/chdir_spec.rb b/spec/ruby/library/net-ftp/chdir_spec.rb
new file mode 100644
index 00000000000000..cc129b5e42c391
--- /dev/null
+++ b/spec/ruby/library/net-ftp/chdir_spec.rb
@@ -0,0 +1,99 @@
+require_relative '../../spec_helper'
+require_relative 'spec_helper'
+require_relative 'fixtures/server'
+
+describe "Net::FTP#chdir" do
+  before :each do
+    @server = NetFTPSpecs::DummyFTP.new
+    @server.serve_once
+
+    @ftp = Net::FTP.new
+    @ftp.connect(@server.hostname, @server.server_port)
+  end
+
+  after :each do
+    @ftp.quit rescue nil
+    @ftp.close
+    @server.stop
+  end
+
+  describe "when switching to the parent directory" do
+    it "sends the 'CDUP' command to the server" do
+      @ftp.chdir("..")
+      @ftp.last_response.should == "200 Command okay. (CDUP)\n"
+    end
+
+    it "returns nil" do
+      @ftp.chdir("..").should be_nil
+    end
+
+    it "does not raise a Net::FTPPermError when the response code is 500" do
+      @server.should_receive(:cdup).and_respond("500 Syntax error, command unrecognized.")
+      -> { @ftp.chdir("..") }.should_not raise_error(Net::FTPPermError)
+    end
+
+    it "raises a Net::FTPPermError when the response code is 501" do
+      @server.should_receive(:cdup).and_respond("501 Syntax error in parameters or arguments.")
+      -> { @ftp.chdir("..") }.should raise_error(Net::FTPPermError)
+    end
+
+    it "raises a Net::FTPPermError when the response code is 502" do
+      @server.should_receive(:cdup).and_respond("502 Command not implemented.")
+      -> { @ftp.chdir("..") }.should raise_error(Net::FTPPermError)
+    end
+
+    it "raises a Net::FTPTempError when the response code is 421" do
+      @server.should_receive(:cdup).and_respond("421 Service not available, closing control connection.")
+      -> { @ftp.chdir("..") }.should raise_error(Net::FTPTempError)
+    end
+
+    it "raises a Net::FTPPermError when the response code is 530" do
+      @server.should_receive(:cdup).and_respond("530 Not logged in.")
+      -> { @ftp.chdir("..") }.should raise_error(Net::FTPPermError)
+    end
+
+    it "raises a Net::FTPPermError when the response code is 550" do
+      @server.should_receive(:cdup).and_respond("550 Requested action not taken.")
+      -> { @ftp.chdir("..") }.should raise_error(Net::FTPPermError)
+    end
+  end
+
+  it "writes the 'CWD' command with the passed directory to the socket" do
+    @ftp.chdir("test")
+    @ftp.last_response.should == "200 Command okay. (CWD test)\n"
+  end
+
+  it "returns nil" do
+    @ftp.chdir("test").should be_nil
+  end
+
+  it "raises a Net::FTPPermError when the response code is 500" do
+    @server.should_receive(:cwd).and_respond("500 Syntax error, command unrecognized.")
+    -> { @ftp.chdir("test") }.should raise_error(Net::FTPPermError)
+  end
+
+  it "raises a Net::FTPPermError when the response code is 501" do
+    @server.should_receive(:cwd).and_respond("501 Syntax error in parameters or arguments.")
+    -> { @ftp.chdir("test") }.should raise_error(Net::FTPPermError)
+  end
+
+  it "raises a Net::FTPPermError when the response code is 502" do
+    @server.should_receive(:cwd).and_respond("502 Command not implemented.")
+    -> { @ftp.chdir("test") }.should raise_error(Net::FTPPermError)
+  end
+
+  it "raises a Net::FTPTempError when the response code is 421" do
+    @server.should_receive(:cwd).and_respond("421 Service not available, closing control connection.")
+    -> { @ftp.chdir("test") }.should raise_error(Net::FTPTempError)
+  end
+
+  it "raises a Net::FTPPermError when the response code is 530" do
+    @server.should_receive(:cwd).and_respond("530 Not logged in.")
+    -> { @ftp.chdir("test") }.should raise_error(Net::FTPPermError)
+  end
+
+  it "raises a Net::FTPPermError when the response code is 550" do
+    @server.should_receive(:cwd).and_respond("550 Requested action not taken.")
+    -> { @ftp.chdir("test") }.should raise_error(Net::FTPPermError)
+  end
+end
diff --git a/spec/ruby/library/net-ftp/close_spec.rb b/spec/ruby/library/net-ftp/close_spec.rb
new file mode 100644
index 00000000000000..183f14a84b553a
--- /dev/null
+++ b/spec/ruby/library/net-ftp/close_spec.rb
@@ -0,0 +1,30 @@
+require_relative '../../spec_helper'
+require_relative 'spec_helper'
+
+describe "Net::FTP#close" do
+  before :each do
+    @socket = mock("Socket")
+    @socket.stub!(:closed?).and_return(false)
+    @socket.stub!(:read_timeout).and_return(60)
+    @socket.stub!(:read_timeout=).and_return(3)
+
+    @ftp = Net::FTP.new
+    @ftp.instance_variable_set(:@sock, @socket)
+  end
+
+  it "closes the socket" do
+    @socket.should_receive(:close)
+    @ftp.close.should be_nil
+  end
+
+  it "does not try to close the socket if it has already been closed" do
+    @socket.should_receive(:closed?).and_return(true)
+    @socket.should_not_receive(:close)
+    @ftp.close.should be_nil
+  end
+
+  it "does not try to close the socket if it is nil" do
+    @ftp.instance_variable_set(:@sock, nil)
+    @ftp.close.should be_nil
+  end
+end
diff --git a/spec/ruby/library/net-ftp/closed_spec.rb b/spec/ruby/library/net-ftp/closed_spec.rb
new file mode 100644
index 00000000000000..84001cdc0f585c
--- /dev/null
+++ b/spec/ruby/library/net-ftp/closed_spec.rb
@@ -0,0 +1,21 @@
+require_relative '../../spec_helper'
+require_relative 'spec_helper'
+
+describe "Net::FTP#closed?" do
+  before :each do
+    @socket = mock("Socket")
+
+    @ftp = Net::FTP.new
+    @ftp.instance_variable_set(:@sock, @socket)
+  end
+
+  it "returns true when the socket is closed" do
+    @socket.should_receive(:closed?).and_return(true)
+    @ftp.closed?.should be_true
+  end
+
+  it "returns true when the socket is nil" do
+    @ftp.instance_variable_set(:@sock, nil)
+    @ftp.closed?.should be_true
+  end
+end
diff --git a/spec/ruby/library/net-ftp/connect_spec.rb b/spec/ruby/library/net-ftp/connect_spec.rb
new file mode 100644
index 00000000000000..e606b11e2a3cc3
--- /dev/null
+++ b/spec/ruby/library/net-ftp/connect_spec.rb
@@ -0,0 +1,43 @@
+require_relative '../../spec_helper'
+require_relative 'spec_helper'
+require_relative 'fixtures/server'
+
+# TODO: Add specs for using the SOCKSSocket
+describe "Net::FTP#connect" do
+  before :each do
+    @server = NetFTPSpecs::DummyFTP.new
+    @server.serve_once
+
+    @ftp = Net::FTP.new
+  end
+
+  after :each do
+    @server.connect_message = nil
+    @ftp.quit rescue nil
+    @ftp.close
+    @server.stop
+  end
+
+  it "tries to connect to the FTP Server on the given host and port" do
+    -> { @ftp.connect(@server.hostname, @server.server_port) }.should_not raise_error
+  end
+
+  it "returns nil" do
+    @ftp.connect(@server.hostname, @server.server_port).should be_nil
+  end
+
+  it "does not raise any error when the response code is 220" do
+    @server.connect_message = "220 Dummy FTP Server ready!"
+    -> { @ftp.connect(@server.hostname, @server.server_port) }.should_not raise_error
+  end
+
+  it "raises a Net::FTPReplyError when the response code is 120" do
+    @server.connect_message = "120 Service ready in nnn minutes."
+    -> { @ftp.connect(@server.hostname, @server.server_port) }.should raise_error(Net::FTPReplyError)
+  end
+
+  it "raises a Net::FTPTempError when the response code is 421" do
+    @server.connect_message = "421 Service not available, closing control connection."
+    -> { @ftp.connect(@server.hostname, @server.server_port) }.should raise_error(Net::FTPTempError)
+  end
+end
diff --git a/spec/ruby/library/net-ftp/debug_mode_spec.rb b/spec/ruby/library/net-ftp/debug_mode_spec.rb
new file mode 100644
index 00000000000000..f2ef53c089670a
--- /dev/null
+++ b/spec/ruby/library/net-ftp/debug_mode_spec.rb
@@ -0,0 +1,23 @@
+require_relative '../../spec_helper'
+require_relative 'spec_helper'
+
+describe "Net::FTP#debug_mode" do
+  it "returns true when self is in debug mode" do
+    ftp = Net::FTP.new
+    ftp.debug_mode.should be_false
+
+    ftp.debug_mode = true
+    ftp.debug_mode.should be_true
+  end
+end
+
+describe "Net::FTP#debug_mode=" do
+  it "sets self into debug mode when passed true" do
+    ftp = Net::FTP.new
+    ftp.debug_mode = true
+    ftp.debug_mode.should be_true
+
+    ftp.debug_mode = false
+    ftp.debug_mode.should be_false
+  end
+end
diff --git a/spec/ruby/library/net-ftp/default_passive_spec.rb b/spec/ruby/library/net-ftp/default_passive_spec.rb
new file mode 100644
index 00000000000000..3f14f6187e6c7f
--- /dev/null
+++ b/spec/ruby/library/net-ftp/default_passive_spec.rb
@@ -0,0 +1,8 @@
+require_relative '../../spec_helper'
+require_relative 'spec_helper'
+
+describe "Net::FTP#default_passive" do
+  it "is true by default" do
+    ruby_exe(fixture(__FILE__, "default_passive.rb")).should == "true\ntrue\n"
+  end
+end
diff --git a/spec/ruby/library/net-ftp/delete_spec.rb b/spec/ruby/library/net-ftp/delete_spec.rb
new file mode 100644
index 00000000000000..bfb7da1ffefc86
--- /dev/null
+++ b/spec/ruby/library/net-ftp/delete_spec.rb
@@ -0,0 +1,59 @@
+require_relative '../../spec_helper'
+require_relative 'spec_helper'
+require_relative 'fixtures/server'
+
+describe "Net::FTP#delete" do
+  before :each do
+    @server = NetFTPSpecs::DummyFTP.new
+    @server.serve_once
+
+    @ftp = Net::FTP.new
+    @ftp.connect(@server.hostname, @server.server_port)
+  end
+
+  after :each do
+    @ftp.quit rescue nil
+    @ftp.close
+    @server.stop
+  end
+
+  it "sends the DELE command with the passed filename to the server" do
+    @ftp.delete("test.file")
+    @ftp.last_response.should == "250 Requested file action okay, completed. (DELE test.file)\n"
+  end
+
+  it "raises a Net::FTPTempError when the response code is 450" do
+    @server.should_receive(:dele).and_respond("450 Requested file action not taken.")
+    -> { @ftp.delete("test.file") }.should raise_error(Net::FTPTempError)
+  end
+
+  it "raises a Net::FTPPermError when the response code is 550" do
+    @server.should_receive(:dele).and_respond("550 Requested action not taken.")
+    -> { @ftp.delete("test.file") }.should raise_error(Net::FTPPermError)
+  end
+
+  it "raises a Net::FTPPermError when the response code is 500" do
+    @server.should_receive(:dele).and_respond("500 Syntax error, command unrecognized.")
+    -> { @ftp.delete("test.file") }.should raise_error(Net::FTPPermError)
+  end
+
+  it "raises a Net::FTPPermError when the response code is 501" do
+    @server.should_receive(:dele).and_respond("501 Syntax error in parameters or arguments.")
+    -> { @ftp.delete("test.file") }.should raise_error(Net::FTPPermError)
+  end
+
+  it "raises a Net::FTPPermError when the response code is 502" do
+    @server.should_receive(:dele).and_respond("502 Command not implemented.")
+    -> { @ftp.delete("test.file") }.should raise_error(Net::FTPPermError)
+  end
+
+  it "raises a Net::FTPTempError when the response code is 421" do
+    @server.should_receive(:dele).and_respond("421 Service not available, closing control connection.")
+    -> { @ftp.delete("test.file") }.should raise_error(Net::FTPTempError)
+  end
+
+  it "raises a Net::FTPPermError when the response code is 530" do
+    @server.should_receive(:dele).and_respond("530 Not logged in.")
+    -> { @ftp.delete("test.file") }.should raise_error(Net::FTPPermError)
+  end
+end
diff --git a/spec/ruby/library/net-ftp/dir_spec.rb b/spec/ruby/library/net-ftp/dir_spec.rb
new file mode 100644
index 00000000000000..894f03dd7b87b8
--- /dev/null
+++ b/spec/ruby/library/net-ftp/dir_spec.rb
@@ -0,0 +1,8 @@
+require_relative '../../spec_helper'
+require_relative 'spec_helper'
+require_relative 'fixtures/server'
+require_relative 'shared/list'
+
+describe "Net::FTP#dir" do
+  it_behaves_like :net_ftp_list, :dir
+end
diff --git a/spec/ruby/library/net/ftp/fixtures/default_passive.rb b/spec/ruby/library/net-ftp/fixtures/default_passive.rb
similarity index 100%
rename from spec/ruby/library/net/ftp/fixtures/default_passive.rb
rename to spec/ruby/library/net-ftp/fixtures/default_passive.rb
diff --git a/spec/ruby/library/net/ftp/fixtures/passive.rb b/spec/ruby/library/net-ftp/fixtures/passive.rb
similarity index 100%
rename from spec/ruby/library/net/ftp/fixtures/passive.rb
rename to spec/ruby/library/net-ftp/fixtures/passive.rb
diff --git a/spec/ruby/library/net/ftp/fixtures/putbinaryfile b/spec/ruby/library/net-ftp/fixtures/putbinaryfile
similarity index 100%
rename from spec/ruby/library/net/ftp/fixtures/putbinaryfile
rename to spec/ruby/library/net-ftp/fixtures/putbinaryfile
diff --git a/spec/ruby/library/net/ftp/fixtures/puttextfile b/spec/ruby/library/net-ftp/fixtures/puttextfile
similarity index 100%
rename from spec/ruby/library/net/ftp/fixtures/puttextfile
rename to spec/ruby/library/net-ftp/fixtures/puttextfile
diff --git a/spec/ruby/library/net-ftp/fixtures/server.rb b/spec/ruby/library/net-ftp/fixtures/server.rb
new file mode 100644
index 00000000000000..8b34d3f8bd384d
--- /dev/null
+++ b/spec/ruby/library/net-ftp/fixtures/server.rb
@@ -0,0 +1,277 @@
+module NetFTPSpecs
+  class DummyFTP
+    attr_accessor :connect_message
+    attr_reader :login_user, :login_pass, :login_acct
+
+    # hostname or IP address
+    attr_reader :hostname
+    # port number
+    attr_reader :server_port
+
+    def initialize
+      @hostname = "127.0.0.1"
+      @server = TCPServer.new(@hostname, 0)
+      @server_port = @server.addr[1]
+
+      @handlers = {}
+      @commands = []
+      @connect_message = nil
+    end
+
+    def serve_once
+      @thread = Thread.new do
+        @socket = @server.accept
+        @socket.setsockopt(Socket::SOL_SOCKET, Socket::SO_OOBINLINE, 1)
+        begin
+          handle_request
+        ensure
+          @socket.close
+        end
+      end
+    end
+
+    def handle_request
+      # Send out the welcome message.
+      response @connect_message || "220 Dummy FTP Server ready!"
+
+      begin
+        while command = @socket.gets
+          command, argument = command.chomp.split(" ", 2)
+
+          if command == "QUIT"
+            self.response("221 OK, bye")
+            break
+          elsif proc_handler = @handlers[command.downcase.to_sym]
+            if argument.nil?
+              proc_handler.call(self)
+            else
+              proc_handler.call(self, argument)
+            end
+          else
+            if argument.nil?
+              self.send(command.downcase.to_sym)
+            else
+              self.send(command.downcase.to_sym, argument)
+            end
+          end
+        end
+      rescue => e
+        self.error_response("Exception: #{e} #{e.backtrace.inspect}")
+      end
+    end
+
+    def error_response(text)
+      self.response("451 #{text}")
+    end
+
+    def response(text)
+      @socket.puts(text) unless @socket.closed?
+    end
+
+    def stop
+      @datasocket.close unless @datasocket.nil? || @datasocket.closed?
+      @server.close
+      @thread.join
+    end
+
+
+    ##
+    def handle(sym, &block)
+      @handlers[sym] = block
+    end
+
+    def should_receive(method)
+      @handler_for = method
+      self
+    end
+
+    def and_respond(text)
+      @handlers[@handler_for] = -> s, *args { s.response(text) }
+    end
+
+    ##
+    # FTP methods
+    ##
+
+    def abor
+      self.response("226 Closing data connection. (ABOR)")
+    end
+
+    def acct(account)
+      @login_acct = account
+      self.response("230 User '#{account}' logged in, proceed. (ACCT)")
+    end
+
+    def cdup
+      self.response("200 Command okay. (CDUP)")
+    end
+
+    def cwd(dir)
+      self.response("200 Command okay. (CWD #{dir})")
+    end
+
+    def dele(file)
+      self.response("250 Requested file action okay, completed. (DELE #{file})")
+    end
+
+    def eprt(arg)
+      _, _, host, port = arg.split("|")
+
+      @datasocket = TCPSocket.new(host, port)
+      self.response("200 port opened")
+    end
+
+    def help(param = :default)
+      if param == :default
+        self.response("211 System status, or system help reply. (HELP)")
+      else
+        self.response("211 System status, or system help reply. (HELP #{param})")
+      end
+    end
+
+    def list(folder)
+      self.response("150 opening ASCII connection for file list")
+      @datasocket.puts("-rw-r--r--  1 spec  staff  507 17 Jul 18:41 last_response_code.rb")
+      @datasocket.puts("-rw-r--r--  1 spec  staff   50 17 Jul 18:41 list.rb")
+      @datasocket.puts("-rw-r--r--  1 spec  staff   48 17 Jul 18:41 pwd.rb")
+      @datasocket.close()
+      self.response("226 transfer complete (LIST #{folder})")
+    end
+
+    def mdtm(filename)
+      self.response("213 19980705132316")
+    end
+
+    def mkd(foldername)
+      self.response(%Q{257 "#{foldername.gsub('"', '""')}" created.})
+    end
+
+    def nlst(folder = nil)
+      self.response("150 opening ASCII connection for file list")
+      @datasocket.puts("last_response_code.rb")
+      @datasocket.puts("list.rb")
+      @datasocket.puts("pwd.rb")
+      @datasocket.close()
+      self.response("226 transfer complete (NLST#{folder ? " #{folder}" : ""})")
+    end
+
+    def noop
+      self.response("200 Command okay. (NOOP)")
+    end
+
+    def pass(password)
+      @login_pass = password
+      self.response("230 User logged in, proceed. (PASS #{password})")
+    end
+
+    def port(arg)
+      nums = arg.split(",")
+
+      if nums[0] == "::1"
+        # IPv6
+        port = nums[1].to_i * 256 + nums[2].to_i
+        host = nums[0]
+      else
+        # IPv4
+        port = nums[4].to_i * 256 + nums[5].to_i
+        host = nums[0..3].join(".")
+      end
+
+      @datasocket = TCPSocket.new(host, port)
+      self.response("200 port opened")
+    end
+
+    def pwd
+      self.response('257 "/some/dir/" - current directory')
+    end
+
+    def retr(file)
+      self.response("125 Data transfer starting")
+      if @restart_at && @restart_at == 20
+        @datasocket.puts("of the file named '#{file}'.")
+        @restart_at = nil
+      else
+        @datasocket.puts("This is the content")
+        @datasocket.puts("of the file named '#{file}'.")
+      end
+      @datasocket.close()
+      self.response("226 Closing data connection. (RETR #{file})")
+    end
+
+    def rest(at_bytes)
+      @restart_at = at_bytes.to_i
+      self.response("350 Requested file action pending further information. (REST)")
+    end
+
+    def rmd(folder)
+      self.response("250 Requested file action okay, completed. (RMD #{folder})")
+    end
+
+    def rnfr(from)
+      @rename_from = from
+      self.response("350 Requested file action pending further information.")
+    end
+
+    def rnto(to)
+      self.response("250 Requested file action okay, completed. (Renamed #{@rename_from} to #{to})")
+      @rename_from = nil
+    end
+
+    def site(param)
+      self.response("200 Command okay. (SITE #{param})")
+    end
+
+    def size(filename)
+      if filename == "binary"
+        self.response("213 24")
+      else
+        self.response("213 1024")
+      end
+    end
+
+    def stat(param = :default)
+      if param == :default
+        self.response("211 System status, or system help reply. (STAT)")
+      else
+        self.response("211 System status, or system help reply. (STAT #{param})")
+      end
+    end
+
+    def stor(file)
+      tmp_file = tmp("#{file}file", false)
+
+      self.response("125 Data transfer starting.")
+
+      mode = @restart_at ? "a" : "w"
+
+      File.open(tmp_file, mode + "b") do |f|
+        loop do
+          data = @datasocket.recv(1024)
+          break if !data || data.empty?
+          f << data
+        end
+      end
+
+      @datasocket.close()
+      self.response("200 OK, Data received. (STOR #{file})")
+    end
+
+    def appe(file)
+      @restart_at = true
+      stor(file)
+    end
+
+    def syst
+      self.response("215 FTP Dummy Server (SYST)")
+    end
+
+    def type(type)
+      self.response("200 TYPE switched to #{type}")
+    end
+
+    def user(name)
+      @login_user = name
+      self.response("230 User logged in, proceed. (USER #{name})")
+    end
+  end
+end
diff --git a/spec/ruby/library/net-ftp/get_spec.rb b/spec/ruby/library/net-ftp/get_spec.rb
new file mode 100644
index 00000000000000..1bc1bd744bb851
--- /dev/null
+++ b/spec/ruby/library/net-ftp/get_spec.rb
@@ -0,0 +1,21 @@
+require_relative '../../spec_helper'
+require_relative 'spec_helper'
+require_relative 'fixtures/server'
+require_relative 'shared/gettextfile'
+require_relative 'shared/getbinaryfile'
+
+describe "Net::FTP#get (binary mode)" do
+  before :each do
+    @binary_mode = true
+  end
+
+  it_behaves_like :net_ftp_getbinaryfile, :get
+end
+
+describe "Net::FTP#get (text mode)" do
+  before :each do
+    @binary_mode = false
+  end
+
+  it_behaves_like :net_ftp_gettextfile, :get
+end
diff --git a/spec/ruby/library/net-ftp/getbinaryfile_spec.rb b/spec/ruby/library/net-ftp/getbinaryfile_spec.rb
new file mode 100644
index 00000000000000..e9898fccc7cb10
--- /dev/null
+++ b/spec/ruby/library/net-ftp/getbinaryfile_spec.rb
@@ -0,0 +1,8 @@
+require_relative '../../spec_helper'
+require_relative 'spec_helper'
+require_relative 'fixtures/server'
+require_relative 'shared/getbinaryfile'
+
+describe "Net::FTP#getbinaryfile" do
+  it_behaves_like :net_ftp_getbinaryfile, :getbinaryfile
+end
diff --git a/spec/ruby/library/net-ftp/getdir_spec.rb b/spec/ruby/library/net-ftp/getdir_spec.rb
new file mode 100644
index 00000000000000..756d6a23af0806
--- /dev/null
+++ b/spec/ruby/library/net-ftp/getdir_spec.rb
@@ -0,0 +1,7 @@
+require_relative '../../spec_helper'
+require_relative 'spec_helper'
+require_relative 'shared/pwd'
+
+describe "Net::FTP#getdir" do
+  it_behaves_like :net_ftp_pwd, :getdir
+end
diff --git a/spec/ruby/library/net-ftp/gettextfile_spec.rb b/spec/ruby/library/net-ftp/gettextfile_spec.rb
new file mode 100644
index 00000000000000..cdd1b4c797b943
--- /dev/null
+++ b/spec/ruby/library/net-ftp/gettextfile_spec.rb
@@ -0,0 +1,8 @@
+require_relative '../../spec_helper'
+require_relative 'spec_helper'
+require_relative 'fixtures/server'
+require_relative 'shared/gettextfile'
+
+describe "Net::FTP#gettextfile" do
+  it_behaves_like :net_ftp_gettextfile, :gettextfile
+end
diff --git a/spec/ruby/library/net-ftp/help_spec.rb b/spec/ruby/library/net-ftp/help_spec.rb
new file mode 100644
index 00000000000000..c562be50b2b8bb
--- /dev/null
+++ b/spec/ruby/library/net-ftp/help_spec.rb
@@ -0,0 +1,66 @@
+require_relative '../../spec_helper'
+require_relative 'spec_helper'
+require_relative 'fixtures/server'
+
+describe "Net::FTP#help" do
+  def with_connection
+    yield
+  end
+
+  before :each do
+    @server = NetFTPSpecs::DummyFTP.new
+    @server.serve_once
+
+    @ftp = Net::FTP.new
+    @ftp.connect(@server.hostname, @server.server_port)
+  end
+
+  after :each do
+    @ftp.quit rescue nil
+    @ftp.close
+    @server.stop
+  end
+
+  it "writes the HELP command to the server" do
+    @ftp.help
+    @ftp.last_response.should == "211 System status, or system help reply. (HELP)\n"
+  end
+
+  it "returns the server's response" do
+    @ftp.help.should == "211 System status, or system help reply. (HELP)\n"
+  end
+
+  it "writes the HELP command with an optional parameter to the socket" do
+    @ftp.help("some parameter").should == "211 System status, or system help reply. (HELP some parameter)\n"
+  end
+
+  it "does not raise any error when the response code is 211" do
+    @server.should_receive(:help).and_respond("211 System status, or system help reply.")
+    -> { @ftp.help }.should_not raise_error
+  end
+
+  it "does not raise any error when the response code is 214" do
+    @server.should_receive(:help).and_respond("214 Help message.")
+    -> { @ftp.help }.should_not raise_error
+  end
+
+  it "raises a Net::FTPPermError when the response code is 500" do
+    @server.should_receive(:help).and_respond("500 Syntax error, command unrecognized.")
+    -> { @ftp.help }.should raise_error(Net::FTPPermError)
+  end
+
+  it "raises a Net::FTPPermError when the response code is 501" do
+    @server.should_receive(:help).and_respond("501 Syntax error in parameters or arguments.")
+    -> { @ftp.help }.should raise_error(Net::FTPPermError)
+  end
+
+  it "raises a Net::FTPPermError when the response code is 502" do
+    @server.should_receive(:help).and_respond("502 Command not implemented.")
+    -> { @ftp.help }.should raise_error(Net::FTPPermError)
+  end
+
+  it "raises a Net::FTPTempError when the response code is 421" do
+    @server.should_receive(:help).and_respond("421 Service not available, closing control connection.")
+    -> { @ftp.help }.should raise_error(Net::FTPTempError)
+  end
+end
diff --git a/spec/ruby/library/net-ftp/initialize_spec.rb b/spec/ruby/library/net-ftp/initialize_spec.rb
new file mode 100644
index 00000000000000..4d775e8dc12cc6
--- /dev/null
+++ b/spec/ruby/library/net-ftp/initialize_spec.rb
@@ -0,0 +1,405 @@
+require_relative '../../spec_helper'
+require_relative 'spec_helper'
+
+describe "Net::FTP#initialize" do
+  before :each do
+    @ftp = Net::FTP.allocate
+    @ftp.stub!(:connect)
+    @port_args = []
+    @port_args << 21
+  end
+
+  it "is private" do
+    Net::FTP.should have_private_instance_method(:initialize)
+  end
+
+  it "sets self into binary mode" do
+    @ftp.binary.should be_nil
+    @ftp.send(:initialize)
+    @ftp.binary.should be_true
+  end
+
+  it "sets self into active mode" do
+    @ftp.passive.should be_nil
+    @ftp.send(:initialize)
+    @ftp.passive.should be_false
+  end
+
+  it "sets self into non-debug mode" do
+    @ftp.debug_mode.should be_nil
+    @ftp.send(:initialize)
+    @ftp.debug_mode.should be_false
+  end
+
+  it "sets self to not resume file uploads/downloads" do
+    @ftp.resume.should be_nil
+    @ftp.send(:initialize)
+    @ftp.resume.should be_false
+  end
+
+  describe "when passed no arguments" do
+    it "does not try to connect" do
+      @ftp.should_not_receive(:connect)
+      @ftp.send(:initialize)
+    end
+  end
+
+  describe "when passed host" do
+    it "tries to connect to the passed host" do
+      @ftp.should_receive(:connect).with("localhost", *@port_args)
+      @ftp.send(:initialize, "localhost")
+    end
+  end
+
+  describe "when passed host, user" do
+    it "tries to connect to the passed host" do
+      @ftp.should_receive(:connect).with("localhost", *@port_args)
+      @ftp.send(:initialize, "localhost")
+    end
+
+    it "tries to login with the passed username" do
+      @ftp.should_receive(:login).with("rubyspec", nil, nil)
+      @ftp.send(:initialize, "localhost", "rubyspec")
+    end
+  end
+
+  describe "when passed host, user, password" do
+    it "tries to connect to the passed host" do
+      @ftp.should_receive(:connect).with("localhost", *@port_args)
+      @ftp.send(:initialize, "localhost")
+    end
+
+    it "tries to login with the passed username and password" do
+      @ftp.should_receive(:login).with("rubyspec", "rocks", nil)
+      @ftp.send(:initialize, "localhost", "rubyspec", "rocks")
+    end
+  end
+
+  describe "when passed host, user" do
+    it "tries to connect to the passed host" do
+      @ftp.should_receive(:connect).with("localhost", *@port_args)
+      @ftp.send(:initialize, "localhost")
+    end
+
+    it "tries to login with the passed username, password and account" do
+      @ftp.should_receive(:login).with("rubyspec", "rocks", "account")
+      @ftp.send(:initialize, "localhost", "rubyspec", "rocks", "account")
+    end
+  end
+
+  before :each do
+    @ftp.stub!(:login)
+  end
+
+  describe 'when the host' do
+    describe 'is set' do
+      describe 'and port option' do
+        describe 'is set' do
+          it 'tries to connect to the host on the specified port' do
+            options = mock('ftp initialize options')
+            options.should_receive(:to_hash).and_return({ port: 8080 })
+            @ftp.should_receive(:connect).with('localhost', 8080)
+
+            @ftp.send(:initialize, 'localhost', options)
+          end
+        end
+
+        describe 'is not set' do
+          it 'tries to connect to the host without a port' do
+            @ftp.should_receive(:connect).with("localhost", *@port_args)
+
+            @ftp.send(:initialize, 'localhost')
+          end
+        end
+      end
+
+      describe 'when the username option' do
+        describe 'is set' do
+          describe 'and the password option' do
+            describe 'is set' do
+              describe 'and the account option' do
+                describe 'is set' do
+                  it 'tries to log in with the supplied parameters' do
+                    options = mock('ftp initialize options')
+                    options.should_receive(:to_hash).and_return({ username: 'a', password: 'topsecret', account: 'b' })
+                    @ftp.should_receive(:login).with('a', 'topsecret', 'b')
+
+                    @ftp.send(:initialize, 'localhost', options)
+                  end
+                end
+
+                describe 'is unset' do
+                  it 'tries to log in with the supplied parameters' do
+                    options = mock('ftp initialize options')
+                    options.should_receive(:to_hash).and_return({ username: 'a', password: 'topsecret' })
+                    @ftp.should_receive(:login).with('a', 'topsecret', nil)
+
+                    @ftp.send(:initialize, 'localhost', options)
+                  end
+                end
+              end
+            end
+
+            describe 'is unset' do
+              describe 'and the account option' do
+                describe 'is set' do
+                  it 'tries to log in with the supplied parameters' do
+                    options = mock('ftp initialize options')
+                    options.should_receive(:to_hash).and_return({ username: 'a', account: 'b' })
+                    @ftp.should_receive(:login).with('a', nil, 'b')
+
+                    @ftp.send(:initialize, 'localhost', options)
+                  end
+                end
+
+                describe 'is unset' do
+                  it 'tries to log in with the supplied parameters' do
+                    options = mock('ftp initialize options')
+                    options.should_receive(:to_hash).and_return({ username: 'a'})
+                    @ftp.should_receive(:login).with('a', nil, nil)
+
+                    @ftp.send(:initialize, 'localhost', options)
+                  end
+                end
+              end
+            end
+          end
+        end
+
+        describe 'is not set' do
+          it 'does not try to log in' do
+            options = mock('ftp initialize options')
+            options.should_receive(:to_hash).and_return({})
+            @ftp.should_not_receive(:login)
+
+            @ftp.send(:initialize, 'localhost', options)
+          end
+        end
+      end
+    end
+
+    describe 'is unset' do
+      it 'does not try to connect' do
+        @ftp.should_not_receive(:connect)
+
+        @ftp.send(:initialize)
+      end
+
+      it 'does not try to log in' do
+        @ftp.should_not_receive(:login)
+
+        @ftp.send(:initialize)
+      end
+    end
+  end
+
+  describe 'when the passive option' do
+    describe 'is set' do
+      describe 'to true' do
+        it 'sets passive to true' do
+          options = mock('ftp initialize options')
+          options.should_receive(:to_hash).and_return({ passive: true })
+
+          @ftp.send(:initialize, nil, options)
+          @ftp.passive.should == true
+        end
+      end
+
+      describe 'to false' do
+        it 'sets passive to false' do
+          options = mock('ftp initialize options')
+          options.should_receive(:to_hash).and_return({ passive: false })
+
+          @ftp.send(:initialize, nil, options)
+          @ftp.passive.should == false
+        end
+      end
+    end
+
+    describe 'is unset' do
+      it 'sets passive to false' do
+        @ftp.send(:initialize)
+        @ftp.passive.should == false
+      end
+    end
+  end
+
+  describe 'when the debug_mode option' do
+    describe 'is set' do
+      describe 'to true' do
+        it 'sets debug_mode to true' do
+          options = mock('ftp initialize options')
+          options.should_receive(:to_hash).and_return({ debug_mode: true })
+
+          @ftp.send(:initialize, nil, options)
+          @ftp.debug_mode.should == true
+        end
+      end
+
+      describe 'to false' do
+        it 'sets debug_mode to false' do
+          options = mock('ftp initialize options')
+          options.should_receive(:to_hash).and_return({ debug_mode: false })
+
+          @ftp.send(:initialize, nil, options)
+          @ftp.debug_mode.should == false
+        end
+      end
+    end
+
+    describe 'is unset' do
+      it 'sets debug_mode to false' do
+        @ftp.send(:initialize)
+        @ftp.debug_mode.should == false
+      end
+    end
+  end
+
+  describe 'when the open_timeout option' do
+    describe 'is set' do
+      it 'sets open_timeout to the specified value' do
+        options = mock('ftp initialize options')
+        options.should_receive(:to_hash).and_return({ open_timeout: 42 })
+
+        @ftp.send(:initialize, nil, options)
+        @ftp.open_timeout.should == 42
+      end
+    end
+
+    describe 'is not set' do
+      it 'sets open_timeout to nil' do
+        @ftp.send(:initialize)
+        @ftp.open_timeout.should == nil
+      end
+    end
+  end
+
+  describe 'when the read_timeout option' do
+    describe 'is set' do
+      it 'sets read_timeout to the specified value' do
+        options = mock('ftp initialize options')
+        options.should_receive(:to_hash).and_return({ read_timeout: 100 })
+
+        @ftp.send(:initialize, nil, options)
+        @ftp.read_timeout.should == 100
+      end
+    end
+
+    describe 'is not set' do
+      it 'sets read_timeout to the default value' do
+        @ftp.send(:initialize)
+        @ftp.read_timeout.should == 60
+      end
+    end
+  end
+
+  describe 'when the ssl_handshake_timeout option' do
+    describe 'is set' do
+      it 'sets ssl_handshake_timeout to the specified value' do
+        options = mock('ftp initialize options')
+        options.should_receive(:to_hash).and_return({ ssl_handshake_timeout: 23 })
+
+        @ftp.send(:initialize, nil, options)
+        @ftp.ssl_handshake_timeout.should == 23
+      end
+    end
+
+    describe 'is not set' do
+      it 'sets ssl_handshake_timeout to nil' do
+        @ftp.send(:initialize)
+        @ftp.ssl_handshake_timeout.should == nil
+      end
+    end
+  end
+
+  describe 'when the ssl option' do
+    describe 'is set' do
+      describe "and the ssl option's value is true" do
+        it 'initializes ssl_context to a blank SSLContext object' do
+          options = mock('ftp initialize options')
+          options.should_receive(:to_hash).and_return({ ssl: true })
+
+          ssl_context = OpenSSL::SSL::SSLContext.allocate
+          ssl_context.stub!(:set_params)
+
+          OpenSSL::SSL::SSLContext.should_receive(:new).and_return(ssl_context)
+          ssl_context.should_receive(:set_params).with({})
+
+          @ftp.send(:initialize, nil, options)
+          @ftp.instance_variable_get(:@ssl_context).should == ssl_context
+        end
+      end
+
+      describe "and the ssl option's value is a hash" do
+        it 'initializes ssl_context to a configured SSLContext object' do
+          options = mock('ftp initialize options')
+          options.should_receive(:to_hash).and_return({ ssl: {key: 'value'} })
+
+          ssl_context = OpenSSL::SSL::SSLContext.allocate
+          ssl_context.stub!(:set_params)
+
+          OpenSSL::SSL::SSLContext.should_receive(:new).and_return(ssl_context)
+          ssl_context.should_receive(:set_params).with({key: 'value'})
+
+          @ftp.send(:initialize, nil, options)
+          @ftp.instance_variable_get(:@ssl_context).should == ssl_context
+        end
+      end
+
+      describe 'and private_data_connection' do
+        describe 'is set' do
+          it 'sets private_data_connection to that value' do
+            options = mock('ftp initialize options')
+            options.should_receive(:to_hash).and_return({ ssl: true, private_data_connection: 'true' })
+
+            @ftp.send(:initialize, nil, options)
+            @ftp.instance_variable_get(:@private_data_connection).should == 'true'
+          end
+        end
+
+        describe 'is not set' do
+          it 'sets private_data_connection to nil' do
+            options = mock('ftp initialize options')
+            options.should_receive(:to_hash).and_return({ ssl: true })
+
+            @ftp.send(:initialize, nil, options)
+            @ftp.instance_variable_get(:@private_data_connection).should == true
+          end
+        end
+      end
+    end
+
+    describe 'is not set' do
+      it 'sets ssl_context to nil' do
+        options = mock('ftp initialize options')
+        options.should_receive(:to_hash).and_return({})
+
+        @ftp.send(:initialize, nil, options)
+        @ftp.instance_variable_get(:@ssl_context).should == nil
+      end
+
+      describe 'private_data_connection' do
+        describe 'is set' do
+          it 'raises an ArgumentError' do
+            options = mock('ftp initialize options')
+            options.should_receive(:to_hash).and_return({ private_data_connection: true })
+
+            -> {
+              @ftp.send(:initialize, nil, options)
+            }.should raise_error(ArgumentError, /private_data_connection can be set to true only when ssl is enabled/)
+          end
+        end
+
+        describe 'is not set' do
+          it 'sets private_data_connection to false' do
+            options = mock('ftp initialize options')
+            options.should_receive(:to_hash).and_return({})
+
+            @ftp.send(:initialize, nil, options)
+            @ftp.instance_variable_get(:@private_data_connection).should == false
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/spec/ruby/library/net-ftp/last_response_code_spec.rb b/spec/ruby/library/net-ftp/last_response_code_spec.rb
new file mode 100644
index 00000000000000..c17c28f0f8d637
--- /dev/null
+++ b/spec/ruby/library/net-ftp/last_response_code_spec.rb
@@ -0,0 +1,8 @@
+require_relative '../../spec_helper'
+require_relative 'spec_helper'
+require_relative 'shared/last_response_code'
+require_relative 'fixtures/server'
+
+describe "Net::FTP#last_response_code" do
+  it_behaves_like :net_ftp_last_response_code, :last_response_code
+end
diff --git a/spec/ruby/library/net-ftp/last_response_spec.rb b/spec/ruby/library/net-ftp/last_response_spec.rb
new file mode 100644
index 00000000000000..c9d9d70f35a732
--- /dev/null
+++ b/spec/ruby/library/net-ftp/last_response_spec.rb
@@ -0,0 +1,25 @@
+require_relative '../../spec_helper'
+require_relative 'spec_helper'
+require_relative 'fixtures/server'
+
+describe "Net::FTP#last_response" do
+  before :each do
+    @server = NetFTPSpecs::DummyFTP.new
+    @server.serve_once
+
+    @ftp = Net::FTP.new
+    @ftp.connect(@server.hostname, @server.server_port)
+  end
+
+  after :each do
+    @ftp.quit rescue nil
+    @ftp.close
+    @server.stop
+  end
+
+  it "returns the last response" do
+    @ftp.last_response.should == "220 Dummy FTP Server ready!\n"
+    @ftp.help
+    @ftp.last_response.should == "211 System status, or system help reply. (HELP)\n"
+  end
+end
diff --git a/spec/ruby/library/net-ftp/lastresp_spec.rb b/spec/ruby/library/net-ftp/lastresp_spec.rb
new file mode 100644
index 00000000000000..e0c1b862a052b2
--- /dev/null
+++ b/spec/ruby/library/net-ftp/lastresp_spec.rb
@@ -0,0 +1,8 @@
+require_relative '../../spec_helper'
+require_relative 'spec_helper'
+require_relative 'shared/last_response_code'
+require_relative 'fixtures/server'
+
+describe "Net::FTP#lastresp" do
+  it_behaves_like :net_ftp_last_response_code, :lastresp
+end
diff --git a/spec/ruby/library/net-ftp/list_spec.rb b/spec/ruby/library/net-ftp/list_spec.rb
new file mode 100644
index 00000000000000..6cb1bbc4b8e4e9
--- /dev/null
+++ b/spec/ruby/library/net-ftp/list_spec.rb
@@ -0,0 +1,8 @@
+require_relative '../../spec_helper'
+require_relative 'spec_helper'
+require_relative 'fixtures/server'
+require_relative 'shared/list'
+
+describe "Net::FTP#list" do
+  it_behaves_like :net_ftp_list, :list
+end
diff --git a/spec/ruby/library/net-ftp/login_spec.rb b/spec/ruby/library/net-ftp/login_spec.rb
new file mode 100644
index 00000000000000..0de2f5cc630bf8
--- /dev/null
+++ b/spec/ruby/library/net-ftp/login_spec.rb
@@ -0,0 +1,195 @@
+require_relative '../../spec_helper'
+require_relative 'spec_helper'
+require_relative 'fixtures/server'
+
+describe "Net::FTP#login" do
+  before :each do
+    @server = NetFTPSpecs::DummyFTP.new
+    @server.serve_once
+
+    @ftp = Net::FTP.new
+    @ftp.connect(@server.hostname, @server.server_port)
+  end
+
+  after :each do
+    @ftp.quit rescue nil
+    @ftp.close
+    @server.stop
+  end
+
+  describe "when passed no arguments" do
+    it "sends the USER command with 'anonymous' as name to the server" do
+      @ftp.login
+      @server.login_user.should == "anonymous"
+    end
+
+    it "sends 'anonymous@' as a password when required" do
+      @server.should_receive(:user).and_respond("331 User name okay, need password.")
+      @ftp.login
+      @server.login_pass.should == "anonymous@"
+    end
+
+    it "raises a Net::FTPReplyError when the server requests an account" do
+      @server.should_receive(:user).and_respond("331 User name okay, need password.")
+      @server.should_receive(:pass).and_respond("332 Need account for login.")
+      -> { @ftp.login }.should raise_error(Net::FTPReplyError)
+    end
+  end
+
+  describe "when passed name" do
+    it "sends the USER command with the passed name to the server" do
+      @ftp.login("rubyspec")
+      @server.login_user.should == "rubyspec"
+    end
+
+    it "raises a Net::FTPReplyError when the server requests a password, but none was given" do
+      @server.should_receive(:user).and_respond("331 User name okay, need password.")
+      -> { @ftp.login("rubyspec") }.should raise_error(Net::FTPReplyError)
+    end
+
+    it "raises a Net::FTPReplyError when the server requests an account, but none was given" do
+      @server.should_receive(:user).and_respond("331 User name okay, need password.")
+      @server.should_receive(:pass).and_respond("332 Need account for login.")
+      -> { @ftp.login("rubyspec") }.should raise_error(Net::FTPReplyError)
+    end
+  end
+
+  describe "when passed name, password" do
+    it "sends the USER command with the passed name to the server" do
+      @ftp.login("rubyspec", "rocks")
+      @server.login_user.should == "rubyspec"
+    end
+
+    it "sends the passed password when required" do
+      @server.should_receive(:user).and_respond("331 User name okay, need password.")
+      @ftp.login("rubyspec", "rocks")
+      @server.login_pass.should == "rocks"
+    end
+
+    it "raises a Net::FTPReplyError when the server requests an account" do
+      @server.should_receive(:user).and_respond("331 User name okay, need password.")
+      @server.should_receive(:pass).and_respond("332 Need account for login.")
+      -> { @ftp.login("rubyspec", "rocks") }.should raise_error(Net::FTPReplyError)
+    end
+  end
+
+  describe "when passed name, password, account" do
+    it "sends the USER command with the passed name to the server" do
+      @ftp.login("rubyspec", "rocks", "account")
+      @server.login_user.should == "rubyspec"
+    end
+
+    it "sends the passed password when required" do
+      @server.should_receive(:user).and_respond("331 User name okay, need password.")
+      @ftp.login("rubyspec", "rocks", "account")
+      @server.login_pass.should == "rocks"
+    end
+
+    it "sends the passed account when required" do
+      @server.should_receive(:user).and_respond("331 User name okay, need password.")
+      @server.should_receive(:pass).and_respond("332 Need account for login.")
+      @ftp.login("rubyspec", "rocks", "account")
+      @server.login_acct.should == "account"
+    end
+  end
+
+  describe "when the USER command fails" do
+    it "raises a Net::FTPPermError when the response code is 500" do
+      @server.should_receive(:user).and_respond("500 Syntax error, command unrecognized.")
+      -> { @ftp.login("rubyspec", "rocks", "account") }.should raise_error(Net::FTPPermError)
+    end
+
+    it "raises a Net::FTPPermError when the response code is 501" do
+      @server.should_receive(:user).and_respond("501 Syntax error in parameters or arguments.")
+      -> { @ftp.login("rubyspec", "rocks", "account") }.should raise_error(Net::FTPPermError)
+    end
+
+    it "raises a Net::FTPPermError when the response code is 502" do
+      @server.should_receive(:user).and_respond("502 Command not implemented.")
+      -> { @ftp.login("rubyspec", "rocks", "account") }.should raise_error(Net::FTPPermError)
+    end
+
+    it "raises a Net::FTPTempError when the response code is 421" do
+      @server.should_receive(:user).and_respond("421 Service not available, closing control connection.")
+      -> { @ftp.login("rubyspec", "rocks", "account") }.should raise_error(Net::FTPTempError)
+    end
+
+    it "raises a Net::FTPPermError when the response code is 530" do
+      @server.should_receive(:user).and_respond("530 Not logged in.")
+      -> { @ftp.login("rubyspec", "rocks", "account") }.should raise_error(Net::FTPPermError)
+    end
+  end
+
+  describe "when the PASS command fails" do
+    before :each do
+      @server.should_receive(:user).and_respond("331 User name okay, need password.")
+    end
+
+    it "does not raise an Error when the response code is 202" do
+      @server.should_receive(:pass).and_respond("202 Command not implemented, superfluous at this site.")
+      -> { @ftp.login("rubyspec", "rocks", "account") }.should_not raise_error
+    end
+
+    it "raises a Net::FTPPermError when the response code is 500" do
+      @server.should_receive(:pass).and_respond("500 Syntax error, command unrecognized.")
+      -> { @ftp.login("rubyspec", "rocks", "account") }.should raise_error(Net::FTPPermError)
+    end
+
+    it "raises a Net::FTPPermError when the response code is 501" do
+      @server.should_receive(:pass).and_respond("501 Syntax error in parameters or arguments.")
+      -> { @ftp.login("rubyspec", "rocks", "account") }.should raise_error(Net::FTPPermError)
+    end
+
+    it "raises a Net::FTPPermError when the response code is 502" do
+      @server.should_receive(:pass).and_respond("502 Command not implemented.")
+      -> { @ftp.login("rubyspec", "rocks", "account") }.should raise_error(Net::FTPPermError)
+    end
+
+    it "raises a Net::FTPTempError when the response code is 421" do
+      @server.should_receive(:pass).and_respond("421 Service not available, closing control connection.")
+      -> { @ftp.login("rubyspec", "rocks", "account") }.should raise_error(Net::FTPTempError)
+    end
+
+    it "raises a Net::FTPPermError when the response code is 530" do
+      @server.should_receive(:pass).and_respond("530 Not logged in.")
+      -> { @ftp.login("rubyspec", "rocks", "account") }.should raise_error(Net::FTPPermError)
+    end
+  end
+
+  describe "when the ACCT command fails" do
+    before :each do
+      @server.should_receive(:user).and_respond("331 User name okay, need password.")
+      @server.should_receive(:pass).and_respond("332 Need account for login.")
+    end
+
+    it "does not raise an Error when the response code is 202" do
+      @server.should_receive(:acct).and_respond("202 Command not implemented, superfluous at this site.")
+      -> { @ftp.login("rubyspec", "rocks", "account") }.should_not raise_error
+    end
+
+    it "raises a Net::FTPPermError when the response code is 500" do
+      @server.should_receive(:acct).and_respond("500 Syntax error, command unrecognized.")
+      -> { @ftp.login("rubyspec", "rocks", "account") }.should raise_error(Net::FTPPermError)
+    end
+
+    it "raises a Net::FTPPermError when the response code is 501" do
+      @server.should_receive(:acct).and_respond("501 Syntax error in parameters or arguments.")
+      -> { @ftp.login("rubyspec", "rocks", "account") }.should raise_error(Net::FTPPermError)
+    end
+
+    it "raises a Net::FTPPermError when the response code is 502" do
+      @server.should_receive(:acct).and_respond("502 Command not implemented.")
+      -> { @ftp.login("rubyspec", "rocks", "account") }.should raise_error(Net::FTPPermError)
+    end
+
+    it "raises a Net::FTPTempError when the response code is 421" do
+      @server.should_receive(:acct).and_respond("421 Service not available, closing control connection.")
+      -> { @ftp.login("rubyspec", "rocks", "account") }.should raise_error(Net::FTPTempError)
+    end
+
+    it "raises a Net::FTPPermError when the response code is 530" do
+      @server.should_receive(:acct).and_respond("530 Not logged in.")
+      -> { @ftp.login("rubyspec", "rocks", "account") }.should raise_error(Net::FTPPermError)
+    end
+  end
+end
diff --git a/spec/ruby/library/net-ftp/ls_spec.rb b/spec/ruby/library/net-ftp/ls_spec.rb
new file mode 100644
index 00000000000000..acd7e9e52363f6
--- /dev/null
+++ b/spec/ruby/library/net-ftp/ls_spec.rb
@@ -0,0 +1,8 @@
+require_relative '../../spec_helper'
+require_relative 'spec_helper'
+require_relative 'fixtures/server'
+require_relative 'shared/list'
+
+describe "Net::FTP#ls" do
+  it_behaves_like :net_ftp_list, :ls
+end
diff --git a/spec/ruby/library/net-ftp/mdtm_spec.rb b/spec/ruby/library/net-ftp/mdtm_spec.rb
new file mode 100644
index 00000000000000..a504507c84ea57
--- /dev/null
+++ b/spec/ruby/library/net-ftp/mdtm_spec.rb
@@ -0,0 +1,38 @@
+require_relative '../../spec_helper'
+require_relative 'spec_helper'
+require_relative 'fixtures/server'
+
+describe "Net::FTP#mdtm" do
+  before :each do
+    @server = NetFTPSpecs::DummyFTP.new
+    @server.serve_once
+
+    @ftp = Net::FTP.new
+    @ftp.connect(@server.hostname, @server.server_port)
+  end
+
+  after :each do
+    @ftp.quit rescue nil
+    @ftp.close
+    @server.stop
+  end
+
+  it "sends the MDTM with the passed filename command to the server" do
+    @ftp.mdtm("test.file")
+    @ftp.last_response.should == "213 19980705132316\n"
+  end
+
+  it "returns the last modification time of the passed file" do
+    @ftp.mdtm("test.file").should == "19980705132316"
+  end
+
+  it "raises a Net::FTPPermError when the response code is 550" do
+    @server.should_receive(:mdtm).and_respond("550 Requested action not taken.")
+    -> { @ftp.mdtm("test.file") }.should raise_error(Net::FTPPermError)
+  end
+
+  it "raises a Net::FTPTempError when the response code is 421" do
+    @server.should_receive(:mdtm).and_respond("421 Service not available, closing control connection.")
+    -> { @ftp.mdtm("test.file") }.should raise_error(Net::FTPTempError)
+  end
+end
diff --git a/spec/ruby/library/net-ftp/mkdir_spec.rb b/spec/ruby/library/net-ftp/mkdir_spec.rb
new file mode 100644
index 00000000000000..8cc6ae785e6f7b
--- /dev/null
+++ b/spec/ruby/library/net-ftp/mkdir_spec.rb
@@ -0,0 +1,61 @@
+require_relative '../../spec_helper'
+require_relative 'spec_helper'
+require_relative 'fixtures/server'
+
+describe "Net::FTP#mkdir" do
+  before :each do
+    @server = NetFTPSpecs::DummyFTP.new
+    @server.serve_once
+
+    @ftp = Net::FTP.new
+    @ftp.connect(@server.hostname, @server.server_port)
+  end
+
+  after :each do
+    @ftp.quit rescue nil
+    @ftp.close
+    @server.stop
+  end
+
+  it "sends the MKD command with the passed pathname to the server" do
+    @ftp.mkdir("test.folder")
+    @ftp.last_response.should == %{257 "test.folder" created.\n}
+  end
+
+  it "returns the path to the newly created directory" do
+    @ftp.mkdir("test.folder").should == "test.folder"
+    @ftp.mkdir("/absolute/path/to/test.folder").should == "/absolute/path/to/test.folder"
+    @ftp.mkdir("relative/path/to/test.folder").should == "relative/path/to/test.folder"
+    @ftp.mkdir('/usr/dm/foo"bar').should == '/usr/dm/foo"bar'
+  end
+
+  it "raises a Net::FTPPermError when the response code is 500" do
+    @server.should_receive(:mkd).and_respond("500 Syntax error, command unrecognized.")
+    -> { @ftp.mkdir("test.folder") }.should raise_error(Net::FTPPermError)
+  end
+
+  it "raises a Net::FTPPermError when the response code is 501" do
+    @server.should_receive(:mkd).and_respond("501 Syntax error in parameters or arguments.")
+    -> { @ftp.mkdir("test.folder") }.should raise_error(Net::FTPPermError)
+  end
+
+  it "raises a Net::FTPPermError when the response code is 502" do
+    @server.should_receive(:mkd).and_respond("502 Command not implemented.")
+    -> { @ftp.mkdir("test.folder") }.should raise_error(Net::FTPPermError)
+  end
+
+  it "raises a Net::FTPTempError when the response code is 421" do
+    @server.should_receive(:mkd).and_respond("421 Service not available, closing control connection.")
+    -> { @ftp.mkdir("test.folder") }.should raise_error(Net::FTPTempError)
+  end
+
+  it "raises a Net::FTPPermError when the response code is 530" do
+    @server.should_receive(:mkd).and_respond("530 Not logged in.")
+    -> { @ftp.mkdir("test.folder") }.should raise_error(Net::FTPPermError)
+  end
+
+  it "raises a Net::FTPPermError when the response code is 550" do
+    @server.should_receive(:mkd).and_respond("550 Requested action not taken.")
+    -> { @ftp.mkdir("test.folder") }.should raise_error(Net::FTPPermError)
+  end
+end
diff --git a/spec/ruby/library/net-ftp/mtime_spec.rb b/spec/ruby/library/net-ftp/mtime_spec.rb
new file mode 100644
index 00000000000000..9dde1278a84812
--- /dev/null
+++ b/spec/ruby/library/net-ftp/mtime_spec.rb
@@ -0,0 +1,50 @@
+require_relative '../../spec_helper'
+require_relative 'spec_helper'
+require_relative 'fixtures/server'
+
+describe "Net::FTP#mtime" do
+  before :each do
+    @server = NetFTPSpecs::DummyFTP.new
+    @server.serve_once
+
+    @ftp = Net::FTP.new
+    @ftp.connect(@server.hostname, @server.server_port)
+  end
+
+  after :each do
+    @ftp.quit rescue nil
+    @ftp.close
+    @server.stop
+  end
+
+  it "sends the MDTM with the passed filename command to the server" do
+    @ftp.mtime("test.file")
+    @ftp.last_response.should == "213 19980705132316\n"
+  end
+
+  describe "when passed filename" do
+    it "returns the last modification time of the passed file as a Time object in the local time" do
+      @ftp.mtime("test.file").should == Time.gm("1998", "07", "05", "13", "23", "16")
+    end
+  end
+
+  describe "when passed filename, local_time" do
+    it "returns the last modification time as a Time object in UTC when local_time is true" do
+      @ftp.mtime("test.file", true).should == Time.local("1998", "07", "05", "13", "23", "16")
+    end
+
+    it "returns the last modification time as a Time object in the local time when local_time is false" do
+      @ftp.mtime("test.file", false).should == Time.gm("1998", "07", "05", "13", "23", "16")
+    end
+  end
+
+  it "raises a Net::FTPPermError when the response code is 550" do
+    @server.should_receive(:mdtm).and_respond("550 Requested action not taken.")
+    -> { @ftp.mtime("test.file") }.should raise_error(Net::FTPPermError)
+  end
+
+  it "raises a Net::FTPTempError when the response code is 421" do
+    @server.should_receive(:mdtm).and_respond("421 Service not available, closing control connection.")
+    -> { @ftp.mtime("test.file") }.should raise_error(Net::FTPTempError)
+  end
+end
diff --git a/spec/ruby/library/net-ftp/nlst_spec.rb b/spec/ruby/library/net-ftp/nlst_spec.rb
new file mode 100644
index 00000000000000..2f22543af61f68
--- /dev/null
+++ b/spec/ruby/library/net-ftp/nlst_spec.rb
@@ -0,0 +1,92 @@
+require_relative '../../spec_helper'
+require_relative 'spec_helper'
+require_relative 'fixtures/server'
+
+describe "Net::FTP#nlst" do
+  before :each do
+    @server = NetFTPSpecs::DummyFTP.new
+    @server.serve_once
+
+    @ftp = Net::FTP.new
+    @ftp.passive = false
+    @ftp.connect(@server.hostname, @server.server_port)
+  end
+
+  after :each do
+    @ftp.quit rescue nil
+    @ftp.close
+    @server.stop
+  end
+
+  describe "when passed no arguments" do
+    it "returns an Array containing a list of files in the current dir" do
+      @ftp.nlst.should == ["last_response_code.rb", "list.rb", "pwd.rb"]
+      @ftp.last_response.should == "226 transfer complete (NLST)\n"
+    end
+  end
+
+  describe "when passed dir" do
+    it "returns an Array containing a list of files in the passed dir" do
+      @ftp.nlst("test.folder").should == ["last_response_code.rb", "list.rb", "pwd.rb"]
+      @ftp.last_response.should == "226 transfer complete (NLST test.folder)\n"
+    end
+  end
+
+  describe "when the NLST command fails" do
+    it "raises a Net::FTPTempError when the response code is 450" do
+      @server.should_receive(:nlst).and_respond("450 Requested file action not taken..")
+      -> { @ftp.nlst }.should raise_error(Net::FTPTempError)
+    end
+
+    it "raises a Net::FTPPermError when the response code is 500" do
+      @server.should_receive(:nlst).and_respond("500 Syntax error, command unrecognized.")
+      -> { @ftp.nlst }.should raise_error(Net::FTPPermError)
+    end
+
+    it "raises a Net::FTPPermError when the response code is 501" do
+      @server.should_receive(:nlst).and_respond("501 Syntax error, command unrecognized.")
+      -> { @ftp.nlst }.should raise_error(Net::FTPPermError)
+    end
+
+    it "raises a Net::FTPPermError when the response code is 502" do
+      @server.should_receive(:nlst).and_respond("502 Command not implemented.")
+      -> { @ftp.nlst }.should raise_error(Net::FTPPermError)
+    end
+
+    it "raises a Net::FTPTempError when the response code is 421" do
+      @server.should_receive(:nlst).and_respond("421 Service not available, closing control connection.")
+      -> { @ftp.nlst }.should raise_error(Net::FTPTempError)
+    end
+
+    it "raises a Net::FTPPermError when the response code is 530" do
+      @server.should_receive(:nlst).and_respond("530 Not logged in.")
+      -> { @ftp.nlst }.should raise_error(Net::FTPPermError)
+    end
+  end
+
+  describe "when opening the data port fails" do
+    it "raises a Net::FTPPermError when the response code is 500" do
+      @server.should_receive(:eprt).and_respond("500 Syntax error, command unrecognized.")
+      @server.should_receive(:port).and_respond("500 Syntax error, command unrecognized.")
+      -> { @ftp.nlst }.should raise_error(Net::FTPPermError)
+    end
+
+    it "raises a Net::FTPPermError when the response code is 501" do
+      @server.should_receive(:eprt).and_respond("501 Syntax error in parameters or arguments.")
+      @server.should_receive(:port).and_respond("501 Syntax error in parameters or arguments.")
+      -> { @ftp.nlst }.should raise_error(Net::FTPPermError)
+    end
+
+    it "raises a Net::FTPTempError when the response code is 421" do
+      @server.should_receive(:eprt).and_respond("421 Service not available, closing control connection.")
+      @server.should_receive(:port).and_respond("421 Service not available, closing control connection.")
+      -> { @ftp.nlst }.should raise_error(Net::FTPTempError)
+    end
+
+    it "raises a Net::FTPPermError when the response code is 530" do
+      @server.should_receive(:eprt).and_respond("530 Not logged in.")
+      @server.should_receive(:port).and_respond("530 Not logged in.")
+      -> { @ftp.nlst }.should raise_error(Net::FTPPermError)
+    end
+  end
+end
diff --git a/spec/ruby/library/net-ftp/noop_spec.rb b/spec/ruby/library/net-ftp/noop_spec.rb
new file mode 100644
index 00000000000000..4743a39ef68f7a
--- /dev/null
+++ b/spec/ruby/library/net-ftp/noop_spec.rb
@@ -0,0 +1,38 @@
+require_relative '../../spec_helper'
+require_relative 'spec_helper'
+require_relative 'fixtures/server'
+
+describe "Net::FTP#noop" do
+  before :each do
+    @server = NetFTPSpecs::DummyFTP.new
+    @server.serve_once
+
+    @ftp = Net::FTP.new
+    @ftp.connect(@server.hostname, @server.server_port)
+  end
+
+  after :each do
+    @ftp.quit rescue nil
+    @ftp.close
+    @server.stop
+  end
+
+  it "sends the NOOP command to the server" do
+    @ftp.noop
+    @ftp.last_response.should == "200 Command okay. (NOOP)\n"
+  end
+
+  it "returns nil" do
+    @ftp.noop.should be_nil
+  end
+
+  it "raises a Net::FTPPermError when the response code is 500" do
+    @server.should_receive(:noop).and_respond("500 Syntax error, command unrecognized.")
+    -> { @ftp.noop }.should raise_error(Net::FTPPermError)
+  end
+
+  it "raises a Net::FTPTempError when the response code is 421" do
+    @server.should_receive(:noop).and_respond("421 Service not available, closing control connection.")
+    -> { @ftp.noop }.should raise_error(Net::FTPTempError)
+  end
+end
diff --git a/spec/ruby/library/net-ftp/open_spec.rb b/spec/ruby/library/net-ftp/open_spec.rb
new file mode 100644
index 00000000000000..e59496dc3cf35e
--- /dev/null
+++ b/spec/ruby/library/net-ftp/open_spec.rb
@@ -0,0 +1,55 @@
+require_relative '../../spec_helper'
+require_relative 'spec_helper'
+
+describe "Net::FTP.open" do
+  before :each do
+    @ftp = mock("Net::FTP instance")
+    Net::FTP.stub!(:new).and_return(@ftp)
+  end
+
+  describe "when passed no block" do
+    it "returns a new Net::FTP instance" do
+      Net::FTP.open("localhost").should equal(@ftp)
+    end
+
+    it "passes the passed arguments down to Net::FTP.new" do
+      Net::FTP.should_receive(:new).with("localhost", "user", "password", "account")
+      Net::FTP.open("localhost", "user", "password", "account")
+    end
+  end
+
+  describe "when passed a block" do
+    before :each do
+      @ftp.stub!(:close)
+    end
+
+    it "yields a new Net::FTP instance to the passed block" do
+      yielded = false
+      Net::FTP.open("localhost") do |ftp|
+        yielded = true
+        ftp.should equal(@ftp)
+      end
+      yielded.should be_true
+    end
+
+    it "closes the Net::FTP instance after yielding" do
+      Net::FTP.open("localhost") do |ftp|
+        ftp.should_receive(:close)
+      end
+    end
+
+    it "closes the Net::FTP instance even if an exception is raised while yielding" do
+      begin
+        Net::FTP.open("localhost") do |ftp|
+          ftp.should_receive(:close)
+          raise ArgumentError, "some exception"
+        end
+      rescue ArgumentError
+      end
+    end
+
+    it "returns the block's return value" do
+      Net::FTP.open("localhost") { :test }.should == :test
+    end
+  end
+end
diff --git a/spec/ruby/library/net-ftp/passive_spec.rb b/spec/ruby/library/net-ftp/passive_spec.rb
new file mode 100644
index 00000000000000..97659f1b685b26
--- /dev/null
+++ b/spec/ruby/library/net-ftp/passive_spec.rb
@@ -0,0 +1,28 @@
+require_relative '../../spec_helper'
+require_relative 'spec_helper'
+
+describe "Net::FTP#passive" do
+  it "returns true when self is in passive mode" do
+    ftp = Net::FTP.new
+    ftp.passive.should be_false
+
+    ftp.passive = true
+    ftp.passive.should be_true
+  end
+
+  it "is the value of Net::FTP.default_value by default" do
+    ruby_exe(fixture(__FILE__, "passive.rb")).should == "true"
+  end
+end
+
+describe "Net::FTP#passive=" do
+  it "sets self to passive mode when passed true" do
+    ftp = Net::FTP.new
+
+    ftp.passive = true
+    ftp.passive.should be_true
+
+    ftp.passive = false
+    ftp.passive.should be_false
+  end
+end
diff --git a/spec/ruby/library/net-ftp/put_spec.rb b/spec/ruby/library/net-ftp/put_spec.rb
new file mode 100644
index 00000000000000..6d40d3d5b99ace
--- /dev/null
+++ b/spec/ruby/library/net-ftp/put_spec.rb
@@ -0,0 +1,21 @@
+require_relative '../../spec_helper'
+require_relative 'spec_helper'
+require_relative 'fixtures/server'
+require_relative 'shared/puttextfile'
+require_relative 'shared/putbinaryfile'
+
+describe "Net::FTP#put (binary mode)" do
+  before :each do
+    @binary_mode = true
+  end
+
+  it_behaves_like :net_ftp_putbinaryfile, :put
+end
+
+describe "Net::FTP#put (text mode)" do
+  before :each do
+    @binary_mode = false
+  end
+
+  it_behaves_like :net_ftp_puttextfile, :put
+end
diff --git a/spec/ruby/library/net-ftp/putbinaryfile_spec.rb b/spec/ruby/library/net-ftp/putbinaryfile_spec.rb
new file mode 100644
index 00000000000000..d0398229e56ab8
--- /dev/null
+++ b/spec/ruby/library/net-ftp/putbinaryfile_spec.rb
@@ -0,0 +1,8 @@
+require_relative '../../spec_helper'
+require_relative 'spec_helper'
+require_relative 'fixtures/server'
+require_relative 'shared/putbinaryfile'
+
+describe "Net::FTP#putbinaryfile" do
+  it_behaves_like :net_ftp_putbinaryfile, :putbinaryfile
+end
diff --git a/spec/ruby/library/net-ftp/puttextfile_spec.rb b/spec/ruby/library/net-ftp/puttextfile_spec.rb
new file mode 100644
index 00000000000000..b8bcac33df61ca
--- /dev/null
+++ b/spec/ruby/library/net-ftp/puttextfile_spec.rb
@@ -0,0 +1,8 @@
+require_relative '../../spec_helper'
+require_relative 'spec_helper'
+require_relative 'fixtures/server'
+require_relative 'shared/puttextfile'
+
+describe "Net::FTP#puttextfile" do
+  it_behaves_like :net_ftp_puttextfile, :puttextfile
+end
diff --git a/spec/ruby/library/net-ftp/pwd_spec.rb b/spec/ruby/library/net-ftp/pwd_spec.rb
new file mode 100644
index 00000000000000..992e2c4ed24845
--- /dev/null
+++ b/spec/ruby/library/net-ftp/pwd_spec.rb
@@ -0,0 +1,53 @@
+require_relative '../../spec_helper'
+require_relative 'spec_helper'
+require_relative 'fixtures/server'
+
+describe "Net::FTP#pwd" do
+  before :each do
+    @server = NetFTPSpecs::DummyFTP.new
+    @server.serve_once
+
+    @ftp = Net::FTP.new
+    @ftp.connect(@server.hostname, @server.server_port)
+  end
+
+  after :each do
+    @ftp.quit rescue nil
+    @ftp.close
+    @server.stop
+  end
+
+  it "sends the PWD command to the server" do
+    @ftp.pwd
+    @ftp.last_response.should == "257 \"/some/dir/\" - current directory\n"
+  end
+
+  it "returns the current directory" do
+    @ftp.pwd.should == "/some/dir/"
+  end
+
+  it "raises a Net::FTPPermError when the response code is 500" do
+    @server.should_receive(:pwd).and_respond("500 Syntax error, command unrecognized.")
+    -> { @ftp.pwd }.should raise_error(Net::FTPPermError)
+  end
+
+  it "raises a Net::FTPPermError when the response code is 501" do
+    @server.should_receive(:pwd).and_respond("501 Syntax error in parameters or arguments.")
+    -> { @ftp.pwd }.should raise_error(Net::FTPPermError)
+  end
+
+  it "raises a Net::FTPPermError when the response code is 502" do
+    @server.should_receive(:pwd).and_respond("502 Command not implemented.")
+    -> { @ftp.pwd }.should raise_error(Net::FTPPermError)
+  end
+
+  it "raises a Net::FTPTempError when the response code is 421" do
+    @server.should_receive(:pwd).and_respond("421 Service not available, closing control connection.")
+    -> { @ftp.pwd }.should raise_error(Net::FTPTempError)
+  end
+
+  it "raises a Net::FTPPermError when the response code is 550" do
+    @server.should_receive(:pwd).and_respond("550 Requested action not taken.")
+    -> { @ftp.pwd }.should raise_error(Net::FTPPermError)
+  end
+end
diff --git a/spec/ruby/library/net-ftp/quit_spec.rb b/spec/ruby/library/net-ftp/quit_spec.rb
new file mode 100644
index 00000000000000..c5352ceadabe27
--- /dev/null
+++ b/spec/ruby/library/net-ftp/quit_spec.rb
@@ -0,0 +1,33 @@
+require_relative '../../spec_helper'
+require_relative 'spec_helper'
+require_relative 'fixtures/server'
+
+describe "Net::FTP#quit" do
+  before :each do
+    @server = NetFTPSpecs::DummyFTP.new
+    @server.serve_once
+
+    @ftp = Net::FTP.new
+    @ftp.connect(@server.hostname, @server.server_port)
+  end
+
+  after :each do
+    @ftp.quit rescue nil
+    @ftp.close
+    @server.stop
+  end
+
+  it "sends the QUIT command to the server" do
+    @ftp.quit
+    @ftp.last_response.should == "221 OK, bye\n"
+  end
+
+  it "does not close the socket automatically" do
+    @ftp.quit
+    @ftp.closed?.should be_false
+  end
+
+  it "returns nil" do
+    @ftp.quit.should be_nil
+  end
+end
diff --git a/spec/ruby/library/net-ftp/rename_spec.rb b/spec/ruby/library/net-ftp/rename_spec.rb
new file mode 100644
index 00000000000000..48f81b7debfc02
--- /dev/null
+++ b/spec/ruby/library/net-ftp/rename_spec.rb
@@ -0,0 +1,94 @@
+require_relative '../../spec_helper'
+require_relative 'spec_helper'
+require_relative 'fixtures/server'
+
+describe "Net::FTP#rename" do
+  before :each do
+    @server = NetFTPSpecs::DummyFTP.new
+    @server.serve_once
+
+    @ftp = Net::FTP.new
+    @ftp.connect(@server.hostname, @server.server_port)
+  end
+
+  after :each do
+    @ftp.quit rescue nil
+    @ftp.close
+    @server.stop
+  end
+
+  describe "when passed from_name, to_name" do
+    it "sends the RNFR command with the passed from_name and the RNTO command with the passed to_name to the server" do
+      @ftp.rename("from.file", "to.file")
+      @ftp.last_response.should == "250 Requested file action okay, completed. (Renamed from.file to to.file)\n"
+    end
+
+    it "returns something" do
+      @ftp.rename("from.file", "to.file").should be_nil
+    end
+  end
+
+  describe "when the RNFR command fails" do
+    it "raises a Net::FTPTempError when the response code is 450" do
+      @server.should_receive(:rnfr).and_respond("450 Requested file action not taken.")
+      -> { @ftp.rename("from.file", "to.file") }.should raise_error(Net::FTPTempError)
+    end
+
+    it "raises a Net::FTPPermError when the response code is 550" do
+      @server.should_receive(:rnfr).and_respond("550 Requested action not taken.")
+      -> { @ftp.rename("from.file", "to.file") }.should raise_error(Net::FTPPermError)
+    end
+
+    it "raises a Net::FTPPermError when the response code is 501" do
+      @server.should_receive(:rnfr).and_respond("501 Syntax error in parameters or arguments.")
+      -> { @ftp.rename("from.file", "to.file") }.should raise_error(Net::FTPPermError)
+    end
+
+    it "raises a Net::FTPPermError when the response code is 502" do
+      @server.should_receive(:rnfr).and_respond("502 Command not implemented.")
+      -> { @ftp.rename("from.file", "to.file") }.should raise_error(Net::FTPPermError)
+    end
+
+    it "raises a Net::FTPTempError when the response code is 421" do
+      @server.should_receive(:rnfr).and_respond("421 Service not available, closing control connection.")
+      -> { @ftp.rename("from.file", "to.file") }.should raise_error(Net::FTPTempError)
+    end
+
+    it "raises a Net::FTPPermError when the response code is 530" do
+      @server.should_receive(:rnfr).and_respond("530 Not logged in.")
+      -> { @ftp.rename("from.file", "to.file") }.should raise_error(Net::FTPPermError)
+    end
+  end
+
+  describe "when the RNTO command fails" do
+    it "raises a Net::FTPPermError when the response code is 532" do
+      @server.should_receive(:rnfr).and_respond("532 Need account for storing files.")
+      -> { @ftp.rename("from.file", "to.file") }.should raise_error(Net::FTPPermError)
+    end
+
+    it "raises a Net::FTPPermError when the response code is 553" do
+      @server.should_receive(:rnto).and_respond("553 Requested action not taken.")
+      -> { @ftp.rename("from.file", "to.file") }.should raise_error(Net::FTPPermError)
+    end
+
+    it "raises a Net::FTPPermError when the response code is 501" do
+      @server.should_receive(:rnto).and_respond("501 Syntax error in parameters or arguments.")
+      -> { @ftp.rename("from.file", "to.file") }.should raise_error(Net::FTPPermError)
+    end
+
+    it "raises a Net::FTPPermError when the response code is 502" do
+      @server.should_receive(:rnto).and_respond("502 Command not implemented.")
+      -> { @ftp.rename("from.file", "to.file") }.should raise_error(Net::FTPPermError)
+    end
+
+    it "raises a Net::FTPTempError when the response code is 421" do
+      @server.should_receive(:rnto).and_respond("421 Service not available, closing control connection.")
+      -> { @ftp.rename("from.file", "to.file") }.should raise_error(Net::FTPTempError)
+    end
+
+    it "raises a Net::FTPPermError when the response code is 530" do
+      @server.should_receive(:rnto).and_respond("530 Not logged in.")
+      -> { @ftp.rename("from.file", "to.file") }.should raise_error(Net::FTPPermError)
+    end
+  end
+end
diff --git a/spec/ruby/library/net-ftp/resume_spec.rb b/spec/ruby/library/net-ftp/resume_spec.rb
new file mode 100644
index 00000000000000..6592fc5bb03dda
--- /dev/null
+++ b/spec/ruby/library/net-ftp/resume_spec.rb
@@ -0,0 +1,23 @@
+require_relative '../../spec_helper'
+require_relative 'spec_helper'
+
+describe "Net::FTP#resume" do
+  it "returns true when self is set to resume uploads/downloads" do
+    ftp = Net::FTP.new
+    ftp.resume.should be_false
+
+    ftp.resume = true
+    ftp.resume.should be_true
+  end
+end
+
+describe "Net::FTP#resume=" do
+  it "sets self to resume uploads/downloads when set to true" do
+    ftp = Net::FTP.new
+    ftp.resume = true
+    ftp.resume.should be_true
+
+    ftp.resume = false
+    ftp.resume.should be_false
+  end
+end
diff --git a/spec/ruby/library/net-ftp/retrbinary_spec.rb b/spec/ruby/library/net-ftp/retrbinary_spec.rb
new file mode 100644
index 00000000000000..de024208aa42be
--- /dev/null
+++ b/spec/ruby/library/net-ftp/retrbinary_spec.rb
@@ -0,0 +1,30 @@
+require_relative '../../spec_helper'
+require_relative 'spec_helper'
+require_relative 'fixtures/server'
+
+describe "Net::FTP#retrbinary" do
+  before :each do
+    @server = NetFTPSpecs::DummyFTP.new
+    @server.serve_once
+
+    @ftp = Net::FTP.new
+    @ftp.connect(@server.hostname, @server.server_port)
+  end
+
+  after :each do
+    @ftp.quit rescue nil
+    @ftp.close
+    @server.stop
+  end
+
+  it "sends the passed command to the server" do
+    @ftp.retrbinary("RETR test", 4096) {}
+    @ftp.last_response.should == "226 Closing data connection. (RETR test)\n"
+  end
+
+  it "yields the received content as binary blocks of the passed size" do
+    res = []
+    @ftp.retrbinary("RETR test", 10) { |bin| res << bin }
+    res.should == [ "This is th", "e content\n", "of the fil", "e named 't", "est'.\n" ]
+  end
+end
diff --git a/spec/ruby/library/net-ftp/retrlines_spec.rb b/spec/ruby/library/net-ftp/retrlines_spec.rb
new file mode 100644
index 00000000000000..866ecb5f409e9e
--- /dev/null
+++ b/spec/ruby/library/net-ftp/retrlines_spec.rb
@@ -0,0 +1,34 @@
+require_relative '../../spec_helper'
+require_relative 'spec_helper'
+require_relative 'fixtures/server'
+
+describe "Net::FTP#retrlines" do
+  before :each do
+    @server = NetFTPSpecs::DummyFTP.new
+    @server.serve_once
+
+    @ftp = Net::FTP.new
+    @ftp.connect(@server.hostname, @server.server_port)
+  end
+
+  after :each do
+    @ftp.quit rescue nil
+    @ftp.close
+    @server.stop
+  end
+
+  it "sends the passed command over the socket" do
+    @ftp.retrlines("LIST test.dir") {}
+    @ftp.last_response.should == "226 transfer complete (LIST test.dir)\n"
+  end
+
+  it "yields each received line to the passed block" do
+    res = []
+    @ftp.retrlines("LIST test.dir") { |x| res << x }
+    res.should == [
+      "-rw-r--r--  1 spec  staff  507 17 Jul 18:41 last_response_code.rb",
+      "-rw-r--r--  1 spec  staff   50 17 Jul 18:41 list.rb",
+      "-rw-r--r--  1 spec  staff   48 17 Jul 18:41 pwd.rb"
+    ]
+  end
+end
diff --git a/spec/ruby/library/net-ftp/return_code_spec.rb b/spec/ruby/library/net-ftp/return_code_spec.rb
new file mode 100644
index 00000000000000..35a6232f7ee3b5
--- /dev/null
+++ b/spec/ruby/library/net-ftp/return_code_spec.rb
@@ -0,0 +1,24 @@
+require_relative '../../spec_helper'
+require_relative 'spec_helper'
+
+describe "Net::FTP#return_code" do
+  before :each do
+    @ftp = Net::FTP.new
+  end
+
+  it "outputs a warning and returns a newline" do
+    -> do
+      @ftp.return_code.should == "\n"
+    end.should complain(/warning: Net::FTP#return_code is obsolete and do nothing/)
+  end
+end
+
+describe "Net::FTP#return_code=" do
+  before :each do
+    @ftp = Net::FTP.new
+  end
+
+  it "outputs a warning" do
+    -> { @ftp.return_code = 123 }.should complain(/warning: Net::FTP#return_code= is obsolete and do nothing/)
+  end
+end
diff --git a/spec/ruby/library/net-ftp/rmdir_spec.rb b/spec/ruby/library/net-ftp/rmdir_spec.rb
new file mode 100644
index 00000000000000..400874d60db825
--- /dev/null
+++ b/spec/ruby/library/net-ftp/rmdir_spec.rb
@@ -0,0 +1,58 @@
+require_relative '../../spec_helper'
+require_relative 'spec_helper'
+require_relative 'fixtures/server'
+
+describe "Net::FTP#rmdir" do
+  before :each do
+    @server = NetFTPSpecs::DummyFTP.new
+    @server.serve_once
+
+    @ftp = Net::FTP.new
+    @ftp.connect(@server.hostname, @server.server_port)
+  end
+
+  after :each do
+    @ftp.quit rescue nil
+    @ftp.close
+    @server.stop
+  end
+
+  it "sends the RMD command with the passed pathname to the server" do
+    @ftp.rmdir("test.folder")
+    @ftp.last_response.should == "250 Requested file action okay, completed. (RMD test.folder)\n"
+  end
+
+  it "returns nil" do
+    @ftp.rmdir("test.folder").should be_nil
+  end
+
+  it "raises a Net::FTPPermError when the response code is 500" do
+    @server.should_receive(:rmd).and_respond("500 Syntax error, command unrecognized.")
+    -> { @ftp.rmdir("test.folder") }.should raise_error(Net::FTPPermError)
+  end
+
+  it "raises a Net::FTPPermError when the response code is 501" do
+    @server.should_receive(:rmd).and_respond("501 Syntax error in parameters or arguments.")
+    -> { @ftp.rmdir("test.folder") }.should raise_error(Net::FTPPermError)
+  end
+
+  it "raises a Net::FTPPermError when the response code is 502" do
+    @server.should_receive(:rmd).and_respond("502 Command not implemented.")
+    -> { @ftp.rmdir("test.folder") }.should raise_error(Net::FTPPermError)
+  end
+
+  it "raises a Net::FTPTempError when the response code is 421" do
+    @server.should_receive(:rmd).and_respond("421 Service not available, closing control connection.")
+    -> { @ftp.rmdir("test.folder") }.should raise_error(Net::FTPTempError)
+  end
+
+  it "raises a Net::FTPPermError when the response code is 530" do
+    @server.should_receive(:rmd).and_respond("530 Not logged in.")
+    -> { @ftp.rmdir("test.folder") }.should raise_error(Net::FTPPermError)
+  end
+
+  it "raises a Net::FTPPermError when the response code is 550" do
+    @server.should_receive(:rmd).and_respond("550 Requested action not taken.")
+    -> { @ftp.rmdir("test.folder") }.should raise_error(Net::FTPPermError)
+  end
+end
diff --git a/spec/ruby/library/net-ftp/sendcmd_spec.rb b/spec/ruby/library/net-ftp/sendcmd_spec.rb
new file mode 100644
index 00000000000000..c50b373869dfe3
--- /dev/null
+++ b/spec/ruby/library/net-ftp/sendcmd_spec.rb
@@ -0,0 +1,54 @@
+require_relative '../../spec_helper'
+require_relative 'spec_helper'
+require_relative 'fixtures/server'
+
+describe "Net::FTP#sendcmd" do
+  before :each do
+    @server = NetFTPSpecs::DummyFTP.new
+    @server.serve_once
+
+    @ftp = Net::FTP.new
+    @ftp.connect(@server.hostname, @server.server_port)
+  end
+
+  after :each do
+    @ftp.quit rescue nil
+    @ftp.close
+    @server.stop
+  end
+
+  it "sends the passed command to the server" do
+    @ftp.sendcmd("HELP")
+    @ftp.last_response.should == "211 System status, or system help reply. (HELP)\n"
+  end
+
+  it "returns the server's response" do
+    @ftp.sendcmd("HELP").should == "211 System status, or system help reply. (HELP)\n"
+  end
+
+  it "raises no error when the response code is 1xx, 2xx or 3xx" do
+    @server.should_receive(:help).and_respond("120 Service ready in nnn minutes.")
+    -> { @ftp.sendcmd("HELP") }.should_not raise_error
+
+    @server.should_receive(:help).and_respond("200 Command okay.")
+    -> { @ftp.sendcmd("HELP") }.should_not raise_error
+
+    @server.should_receive(:help).and_respond("350 Requested file action pending further information.")
+    -> { @ftp.sendcmd("HELP") }.should_not raise_error
+  end
+
+  it "raises a Net::FTPTempError when the response code is 4xx" do
+    @server.should_receive(:help).and_respond("421 Service not available, closing control connection.")
+    -> { @ftp.sendcmd("HELP") }.should raise_error(Net::FTPTempError)
+  end
+
+  it "raises a Net::FTPPermError when the response code is 5xx" do
+    @server.should_receive(:help).and_respond("500 Syntax error, command unrecognized.")
+    -> { @ftp.sendcmd("HELP") }.should raise_error(Net::FTPPermError)
+  end
+
+  it "raises a Net::FTPProtoError when the response code is not between 1xx-5xx" do
+    @server.should_receive(:help).and_respond("999 Invalid response.")
+    -> { @ftp.sendcmd("HELP") }.should raise_error(Net::FTPProtoError)
+  end
+end
diff --git a/spec/ruby/library/net-ftp/set_socket_spec.rb b/spec/ruby/library/net-ftp/set_socket_spec.rb
new file mode 100644
index 00000000000000..8182dd8b338fec
--- /dev/null
+++ b/spec/ruby/library/net-ftp/set_socket_spec.rb
@@ -0,0 +1,8 @@
+require_relative '../../spec_helper'
+require_relative 'spec_helper'
+
+describe "Net::FTP#set_socket" do
+  # TODO: I won't spec this method, as it is not used
+  #       anywhere and it should be private anyway.
+  it "needs to be reviewed for spec completeness"
+end
diff --git a/spec/ruby/library/net/ftp/shared/getbinaryfile.rb b/spec/ruby/library/net-ftp/shared/getbinaryfile.rb
similarity index 100%
rename from spec/ruby/library/net/ftp/shared/getbinaryfile.rb
rename to spec/ruby/library/net-ftp/shared/getbinaryfile.rb
diff --git a/spec/ruby/library/net/ftp/shared/gettextfile.rb b/spec/ruby/library/net-ftp/shared/gettextfile.rb
similarity index 100%
rename from spec/ruby/library/net/ftp/shared/gettextfile.rb
rename to spec/ruby/library/net-ftp/shared/gettextfile.rb
diff --git a/spec/ruby/library/net/ftp/shared/last_response_code.rb b/spec/ruby/library/net-ftp/shared/last_response_code.rb
similarity index 100%
rename from spec/ruby/library/net/ftp/shared/last_response_code.rb
rename to spec/ruby/library/net-ftp/shared/last_response_code.rb
diff --git a/spec/ruby/library/net/ftp/shared/list.rb b/spec/ruby/library/net-ftp/shared/list.rb
similarity index 100%
rename from spec/ruby/library/net/ftp/shared/list.rb
rename to spec/ruby/library/net-ftp/shared/list.rb
diff --git a/spec/ruby/library/net/ftp/shared/putbinaryfile.rb b/spec/ruby/library/net-ftp/shared/putbinaryfile.rb
similarity index 100%
rename from spec/ruby/library/net/ftp/shared/putbinaryfile.rb
rename to spec/ruby/library/net-ftp/shared/putbinaryfile.rb
diff --git a/spec/ruby/library/net/ftp/shared/puttextfile.rb b/spec/ruby/library/net-ftp/shared/puttextfile.rb
similarity index 91%
rename from spec/ruby/library/net/ftp/shared/puttextfile.rb
rename to spec/ruby/library/net-ftp/shared/puttextfile.rb
index 3836e954b8072f..e2c045335246d4 100644
--- a/spec/ruby/library/net/ftp/shared/puttextfile.rb
+++ b/spec/ruby/library/net-ftp/shared/puttextfile.rb
@@ -27,15 +27,23 @@
   it "sends the contents of the passed local_file, using \\r\\n as the newline separator" do
     @ftp.send(@method, @local_fixture_file, "text")
 
-    remote_lines = open(@remote_tmp_file,    "rb") {|f| f.read }
-    local_lines  = open(@local_fixture_file, "rb") {|f| f.read }
+    remote_lines = File.binread(@remote_tmp_file)
+    local_lines  = File.binread(@local_fixture_file)
 
     remote_lines.should_not == local_lines
     remote_lines.should == local_lines.gsub("\n", "\r\n")
   end
 
-  it "returns nil" do
-    @ftp.send(@method, @local_fixture_file, "text").should be_nil
+  guard -> { Net::FTP::VERSION < '0.3.6' } do
+    it "returns nil" do
+      @ftp.send(@method, @local_fixture_file, "text").should be_nil
+    end
+  end
+
+  guard -> { Net::FTP::VERSION >= '0.3.6' } do
+    it "returns the response" do
+      @ftp.send(@method, @local_fixture_file, "text").should == @ftp.last_response
+    end
   end
 
   describe "when passed a block" do
diff --git a/spec/ruby/library/net/ftp/shared/pwd.rb b/spec/ruby/library/net-ftp/shared/pwd.rb
similarity index 100%
rename from spec/ruby/library/net/ftp/shared/pwd.rb
rename to spec/ruby/library/net-ftp/shared/pwd.rb
diff --git a/spec/ruby/library/net-ftp/site_spec.rb b/spec/ruby/library/net-ftp/site_spec.rb
new file mode 100644
index 00000000000000..c3e589a9204595
--- /dev/null
+++ b/spec/ruby/library/net-ftp/site_spec.rb
@@ -0,0 +1,53 @@
+require_relative '../../spec_helper'
+require_relative 'spec_helper'
+require_relative 'fixtures/server'
+
+describe "Net::FTP#site" do
+  before :each do
+    @server = NetFTPSpecs::DummyFTP.new
+    @server.serve_once
+
+    @ftp = Net::FTP.new
+    @ftp.connect(@server.hostname, @server.server_port)
+  end
+
+  after :each do
+    @ftp.quit rescue nil
+    @ftp.close
+    @server.stop
+  end
+
+  it "sends the SITE command with the passed argument to the server" do
+    @ftp.site("param")
+    @ftp.last_response.should == "200 Command okay. (SITE param)\n"
+  end
+
+  it "returns nil" do
+    @ftp.site("param").should be_nil
+  end
+
+  it "does not raise an error when the response code is 202" do
+    @server.should_receive(:site).and_respond("202 Command not implemented, superfluous at this site.")
+    -> { @ftp.site("param") }.should_not raise_error
+  end
+
+  it "raises a Net::FTPPermError when the response code is 500" do
+    @server.should_receive(:site).and_respond("500 Syntax error, command unrecognized.")
+    -> { @ftp.site("param") }.should raise_error(Net::FTPPermError)
+  end
+
+  it "raises a Net::FTPPermError when the response code is 501" do
+    @server.should_receive(:site).and_respond("501 Syntax error in parameters or arguments.")
+    -> { @ftp.site("param") }.should raise_error(Net::FTPPermError)
+  end
+
+  it "raises a Net::FTPTempError when the response code is 421" do
+    @server.should_receive(:site).and_respond("421 Service not available, closing control connection.")
+    -> { @ftp.site("param") }.should raise_error(Net::FTPTempError)
+  end
+
+  it "raises a Net::FTPPermError when the response code is 530" do
+    @server.should_receive(:site).and_respond("530 Requested action not taken.")
+    -> { @ftp.site("param") }.should raise_error(Net::FTPPermError)
+  end
+end
diff --git a/spec/ruby/library/net-ftp/size_spec.rb b/spec/ruby/library/net-ftp/size_spec.rb
new file mode 100644
index 00000000000000..0cf2e244773ce2
--- /dev/null
+++ b/spec/ruby/library/net-ftp/size_spec.rb
@@ -0,0 +1,48 @@
+require_relative '../../spec_helper'
+require_relative 'spec_helper'
+require_relative 'fixtures/server'
+
+describe "Net::FTP#size" do
+  before :each do
+    @server = NetFTPSpecs::DummyFTP.new
+    @server.serve_once
+
+    @ftp = Net::FTP.new
+    @ftp.connect(@server.hostname, @server.server_port)
+  end
+
+  after :each do
+    @ftp.quit rescue nil
+    @ftp.close
+    @server.stop
+  end
+
+  it "sends the SIZE command to the server" do
+    @ftp.size("test.file")
+    @ftp.last_response.should == "213 1024\n"
+  end
+
+  it "returns the size of the passed file as Integer" do
+    @ftp.size("test.file").should eql(1024)
+  end
+
+  it "raises a Net::FTPPermError when the response code is 500" do
+    @server.should_receive(:size).and_respond("500 Syntax error, command unrecognized.")
+    -> { @ftp.size("test.file") }.should raise_error(Net::FTPPermError)
+  end
+
+  it "raises a Net::FTPPermError when the response code is 501" do
+    @server.should_receive(:size).and_respond("501 Syntax error in parameters or arguments.")
+    -> { @ftp.size("test.file") }.should raise_error(Net::FTPPermError)
+  end
+
+  it "raises a Net::FTPTempError when the response code is 421" do
+    @server.should_receive(:size).and_respond("421 Service not available, closing control connection.")
+    -> { @ftp.size("test.file") }.should raise_error(Net::FTPTempError)
+  end
+
+  it "raises a Net::FTPPermError when the response code is 550" do
+    @server.should_receive(:size).and_respond("550 Requested action not taken.")
+    -> { @ftp.size("test.file") }.should raise_error(Net::FTPPermError)
+  end
+end
diff --git a/spec/ruby/library/net/ftp/spec_helper.rb b/spec/ruby/library/net-ftp/spec_helper.rb
similarity index 100%
rename from spec/ruby/library/net/ftp/spec_helper.rb
rename to spec/ruby/library/net-ftp/spec_helper.rb
diff --git a/spec/ruby/library/net-ftp/status_spec.rb b/spec/ruby/library/net-ftp/status_spec.rb
new file mode 100644
index 00000000000000..9d9f86c3816dd3
--- /dev/null
+++ b/spec/ruby/library/net-ftp/status_spec.rb
@@ -0,0 +1,67 @@
+require_relative '../../spec_helper'
+require_relative 'spec_helper'
+require_relative 'fixtures/server'
+
+describe "Net::FTP#status" do
+  before :each do
+    @server = NetFTPSpecs::DummyFTP.new
+    @server.serve_once
+
+    @ftp = Net::FTP.new
+    @ftp.connect(@server.hostname, @server.server_port)
+  end
+
+  after :each do
+    @ftp.quit rescue nil
+    @ftp.close
+    @server.stop
+  end
+
+  it "sends the STAT command to the server" do
+    @ftp.status
+    @ftp.last_response.should == "211 System status, or system help reply. (STAT)\n"
+  end
+
+  it "sends the STAT command with an optional parameter to the server" do
+    @ftp.status("/pub").should == "211 System status, or system help reply. (STAT /pub)\n"
+  end
+
+  it "returns the received information" do
+    @ftp.status.should == "211 System status, or system help reply. (STAT)\n"
+  end
+
+  it "does not raise an error when the response code is 212" do
+    @server.should_receive(:stat).and_respond("212 Directory status.")
+    -> { @ftp.status }.should_not raise_error
+  end
+
+  it "does not raise an error when the response code is 213" do
+    @server.should_receive(:stat).and_respond("213 File status.")
+    -> { @ftp.status }.should_not raise_error
+  end
+
+  it "raises a Net::FTPPermError when the response code is 500" do
+    @server.should_receive(:stat).and_respond("500 Syntax error, command unrecognized.")
+    -> { @ftp.status }.should raise_error(Net::FTPPermError)
+  end
+
+  it "raises a Net::FTPPermError when the response code is 501" do
+    @server.should_receive(:stat).and_respond("501 Syntax error in parameters or arguments.")
+    -> { @ftp.status }.should raise_error(Net::FTPPermError)
+  end
+
+  it "raises a Net::FTPPermError when the response code is 502" do
+    @server.should_receive(:stat).and_respond("502 Command not implemented.")
+    -> { @ftp.status }.should raise_error(Net::FTPPermError)
+  end
+
+  it "raises a Net::FTPTempError when the response code is 421" do
+    @server.should_receive(:stat).and_respond("421 Service not available, closing control connection.")
+    -> { @ftp.status }.should raise_error(Net::FTPTempError)
+  end
+
+  it "raises a Net::FTPPermError when the response code is 530" do
+    @server.should_receive(:stat).and_respond("530 Requested action not taken.")
+    -> { @ftp.status }.should raise_error(Net::FTPPermError)
+  end
+end
diff --git a/spec/ruby/library/net-ftp/storbinary_spec.rb b/spec/ruby/library/net-ftp/storbinary_spec.rb
new file mode 100644
index 00000000000000..aa4c51f2e81ff2
--- /dev/null
+++ b/spec/ruby/library/net-ftp/storbinary_spec.rb
@@ -0,0 +1,49 @@
+require_relative '../../spec_helper'
+
+require_relative 'spec_helper'
+require_relative 'fixtures/server'
+
+describe "Net::FTP#storbinary" do
+  before :each do
+    @server = NetFTPSpecs::DummyFTP.new
+    @server.serve_once
+
+    @local_fixture_file  = __dir__ + "/fixtures/putbinaryfile"
+    @tmp_file = tmp("binaryfile", false)
+
+    @ftp = Net::FTP.new
+    @ftp.connect(@server.hostname, @server.server_port)
+  end
+
+  after :each do
+    @ftp.quit rescue nil
+    @ftp.close
+    @server.stop
+
+    rm_r @tmp_file
+  end
+
+  it "sends the passed command and the passed File object's content to the server" do
+    File.open(@local_fixture_file) do |f|
+      f.binmode
+
+      @ftp.storbinary("STOR binary", f, 4096) {}
+      @ftp.last_response.should == "200 OK, Data received. (STOR binary)\n"
+    end
+  end
+
+  it "yields the transmitted content as binary blocks of the passed size" do
+    File.open(@local_fixture_file) do |f|
+      f.binmode
+
+      res = []
+      @ftp.storbinary("STOR binary", f, 10) { |x| res << x }
+      res.should == [
+        "This is an", " example f",
+        "ile\nwhich ", "is going t",
+        "o be trans", "mitted\nusi",
+        "ng #putbin", "aryfile.\n"
+      ]
+    end
+  end
+end
diff --git a/spec/ruby/library/net-ftp/storlines_spec.rb b/spec/ruby/library/net-ftp/storlines_spec.rb
new file mode 100644
index 00000000000000..dc6830da7bd0bc
--- /dev/null
+++ b/spec/ruby/library/net-ftp/storlines_spec.rb
@@ -0,0 +1,44 @@
+require_relative '../../spec_helper'
+
+require_relative 'spec_helper'
+require_relative 'fixtures/server'
+
+describe "Net::FTP#storlines" do
+  before :each do
+    @server = NetFTPSpecs::DummyFTP.new
+    @server.serve_once
+
+    @local_fixture_file  = __dir__ + "/fixtures/puttextfile"
+    @tmp_file = tmp("textfile", false)
+
+    @ftp = Net::FTP.new
+    @ftp.connect(@server.hostname, @server.server_port)
+  end
+
+  after :each do
+    @ftp.quit rescue nil
+    @ftp.close
+    @server.stop
+
+    rm_r @tmp_file
+  end
+
+  it "sends the passed command and the passed File object's content to the server" do
+    File.open(@local_fixture_file) do |f|
+      @ftp.storlines("STOR text", f) {}
+      @ftp.last_response.should == "200 OK, Data received. (STOR text)\n"
+    end
+  end
+
+  it "yields each line of the transmitted content" do
+    File.open(@local_fixture_file) do |f|
+      res = []
+      @ftp.storlines("STOR text", f) { |x| res << x }
+      res.should == [
+        "This is an example file\r\n",
+        "which is going to be transmitted\r\n",
+        "using #puttextfile.\r\n"
+      ]
+    end
+  end
+end
diff --git a/spec/ruby/library/net-ftp/system_spec.rb b/spec/ruby/library/net-ftp/system_spec.rb
new file mode 100644
index 00000000000000..2b7f0d2560bce1
--- /dev/null
+++ b/spec/ruby/library/net-ftp/system_spec.rb
@@ -0,0 +1,48 @@
+require_relative '../../spec_helper'
+require_relative 'spec_helper'
+require_relative 'fixtures/server'
+
+describe "Net::FTP#system" do
+  before :each do
+    @server = NetFTPSpecs::DummyFTP.new
+    @server.serve_once
+
+    @ftp = Net::FTP.new
+    @ftp.connect(@server.hostname, @server.server_port)
+  end
+
+  after :each do
+    @ftp.quit rescue nil
+    @ftp.close
+    @server.stop
+  end
+
+  it "sends the SYST command to the server" do
+    @ftp.system
+    @ftp.last_response.should =~ /\A215 FTP Dummy Server \(SYST\)\Z/
+  end
+
+  it "returns the received information" do
+    @ftp.system.should =~ /\AFTP Dummy Server \(SYST\)\Z/
+  end
+
+  it "raises a Net::FTPPermError when the response code is 500" do
+    @server.should_receive(:syst).and_respond("500 Syntax error, command unrecognized.")
+    -> { @ftp.system }.should raise_error(Net::FTPPermError)
+  end
+
+  it "raises a Net::FTPPermError when the response code is 501" do
+    @server.should_receive(:syst).and_respond("501 Syntax error in parameters or arguments.")
+    -> { @ftp.system }.should raise_error(Net::FTPPermError)
+  end
+
+  it "raises a Net::FTPPermError when the response code is 502" do
+    @server.should_receive(:syst).and_respond("502 Command not implemented.")
+    -> { @ftp.system }.should raise_error(Net::FTPPermError)
+  end
+
+  it "raises a Net::FTPTempError when the response code is 421" do
+    @server.should_receive(:syst).and_respond("421 Service not available, closing control connection.")
+    -> { @ftp.system }.should raise_error(Net::FTPTempError)
+  end
+end
diff --git a/spec/ruby/library/net-ftp/voidcmd_spec.rb b/spec/ruby/library/net-ftp/voidcmd_spec.rb
new file mode 100644
index 00000000000000..f2536fe697bef5
--- /dev/null
+++ b/spec/ruby/library/net-ftp/voidcmd_spec.rb
@@ -0,0 +1,54 @@
+require_relative '../../spec_helper'
+require_relative 'spec_helper'
+require_relative 'fixtures/server'
+
+describe "Net::FTP#voidcmd" do
+  before :each do
+    @server = NetFTPSpecs::DummyFTP.new
+    @server.serve_once
+
+    @ftp = Net::FTP.new
+    @ftp.connect(@server.hostname, @server.server_port)
+  end
+
+  after :each do
+    @ftp.quit rescue nil
+    @ftp.close
+    @server.stop
+  end
+
+  it "sends the passed command to the server" do
+    @server.should_receive(:help).and_respond("2xx Does not raise.")
+    -> { @ftp.voidcmd("HELP") }.should_not raise_error
+  end
+
+  it "returns nil" do
+    @server.should_receive(:help).and_respond("2xx Does not raise.")
+    @ftp.voidcmd("HELP").should be_nil
+  end
+
+  it "raises a Net::FTPReplyError when the response code is 1xx" do
+    @server.should_receive(:help).and_respond("1xx Does raise a Net::FTPReplyError.")
+    -> { @ftp.voidcmd("HELP")  }.should raise_error(Net::FTPReplyError)
+  end
+
+  it "raises a Net::FTPReplyError when the response code is 3xx" do
+    @server.should_receive(:help).and_respond("3xx Does raise a Net::FTPReplyError.")
+    -> { @ftp.voidcmd("HELP") }.should raise_error(Net::FTPReplyError)
+  end
+
+  it "raises a Net::FTPTempError when the response code is 4xx" do
+    @server.should_receive(:help).and_respond("4xx Does raise a Net::FTPTempError.")
+    -> { @ftp.voidcmd("HELP") }.should raise_error(Net::FTPTempError)
+  end
+
+  it "raises a Net::FTPPermError when the response code is 5xx" do
+    @server.should_receive(:help).and_respond("5xx Does raise a Net::FTPPermError.")
+    -> { @ftp.voidcmd("HELP") }.should raise_error(Net::FTPPermError)
+  end
+
+  it "raises a Net::FTPProtoError when the response code is not valid" do
+    @server.should_receive(:help).and_respond("999 Does raise a Net::FTPProtoError.")
+    -> { @ftp.voidcmd("HELP") }.should raise_error(Net::FTPProtoError)
+  end
+end
diff --git a/spec/ruby/library/net-ftp/welcome_spec.rb b/spec/ruby/library/net-ftp/welcome_spec.rb
new file mode 100644
index 00000000000000..4279127ce34242
--- /dev/null
+++ b/spec/ruby/library/net-ftp/welcome_spec.rb
@@ -0,0 +1,25 @@
+require_relative '../../spec_helper'
+require_relative 'spec_helper'
+require_relative 'fixtures/server'
+
+describe "Net::FTP#welcome" do
+  before :each do
+    @server = NetFTPSpecs::DummyFTP.new
+    @server.serve_once
+
+    @ftp = Net::FTP.new
+    @ftp.connect(@server.hostname, @server.server_port)
+  end
+
+  after :each do
+    @ftp.quit rescue nil
+    @ftp.close
+    @server.stop
+  end
+
+  it "returns the server's welcome message" do
+    @ftp.welcome.should be_nil
+    @ftp.login
+    @ftp.welcome.should == "230 User logged in, proceed. (USER anonymous)\n"
+  end
+end
diff --git a/spec/ruby/library/net/http/HTTPBadResponse_spec.rb b/spec/ruby/library/net-http/HTTPBadResponse_spec.rb
similarity index 79%
rename from spec/ruby/library/net/http/HTTPBadResponse_spec.rb
rename to spec/ruby/library/net-http/HTTPBadResponse_spec.rb
index be644968f56876..8f2e8ccfafc812 100644
--- a/spec/ruby/library/net/http/HTTPBadResponse_spec.rb
+++ b/spec/ruby/library/net-http/HTTPBadResponse_spec.rb
@@ -1,4 +1,4 @@
-require_relative '../../../spec_helper'
+require_relative '../../spec_helper'
 require 'net/http'
 
 describe "Net::HTTPBadResponse" do
diff --git a/spec/ruby/library/net/http/HTTPClientExcepton_spec.rb b/spec/ruby/library/net-http/HTTPClientExcepton_spec.rb
similarity index 87%
rename from spec/ruby/library/net/http/HTTPClientExcepton_spec.rb
rename to spec/ruby/library/net-http/HTTPClientExcepton_spec.rb
index d576349a571e62..2992e6596fca05 100644
--- a/spec/ruby/library/net/http/HTTPClientExcepton_spec.rb
+++ b/spec/ruby/library/net-http/HTTPClientExcepton_spec.rb
@@ -1,4 +1,4 @@
-require_relative '../../../spec_helper'
+require_relative '../../spec_helper'
 require 'net/http'
 
 describe "Net::HTTPClientException" do
diff --git a/spec/ruby/library/net/http/HTTPError_spec.rb b/spec/ruby/library/net-http/HTTPError_spec.rb
similarity index 86%
rename from spec/ruby/library/net/http/HTTPError_spec.rb
rename to spec/ruby/library/net-http/HTTPError_spec.rb
index ab5f491bb7fc45..7f79eef8cf7129 100644
--- a/spec/ruby/library/net/http/HTTPError_spec.rb
+++ b/spec/ruby/library/net-http/HTTPError_spec.rb
@@ -1,4 +1,4 @@
-require_relative '../../../spec_helper'
+require_relative '../../spec_helper'
 require 'net/http'
 
 describe "Net::HTTPError" do
diff --git a/spec/ruby/library/net/http/HTTPFatalError_spec.rb b/spec/ruby/library/net-http/HTTPFatalError_spec.rb
similarity index 87%
rename from spec/ruby/library/net/http/HTTPFatalError_spec.rb
rename to spec/ruby/library/net-http/HTTPFatalError_spec.rb
index 6ab36bff6c46d5..0113b9da2de19c 100644
--- a/spec/ruby/library/net/http/HTTPFatalError_spec.rb
+++ b/spec/ruby/library/net-http/HTTPFatalError_spec.rb
@@ -1,4 +1,4 @@
-require_relative '../../../spec_helper'
+require_relative '../../spec_helper'
 require 'net/http'
 
 describe "Net::HTTPFatalError" do
diff --git a/spec/ruby/library/net/http/HTTPHeaderSyntaxError_spec.rb b/spec/ruby/library/net-http/HTTPHeaderSyntaxError_spec.rb
similarity index 80%
rename from spec/ruby/library/net/http/HTTPHeaderSyntaxError_spec.rb
rename to spec/ruby/library/net-http/HTTPHeaderSyntaxError_spec.rb
index 38e9454f990afe..b3b73ff46f0b09 100644
--- a/spec/ruby/library/net/http/HTTPHeaderSyntaxError_spec.rb
+++ b/spec/ruby/library/net-http/HTTPHeaderSyntaxError_spec.rb
@@ -1,4 +1,4 @@
-require_relative '../../../spec_helper'
+require_relative '../../spec_helper'
 require 'net/http'
 
 describe "Net::HTTPHeaderSyntaxError" do
diff --git a/spec/ruby/library/net/http/HTTPRetriableError_spec.rb b/spec/ruby/library/net-http/HTTPRetriableError_spec.rb
similarity index 88%
rename from spec/ruby/library/net/http/HTTPRetriableError_spec.rb
rename to spec/ruby/library/net-http/HTTPRetriableError_spec.rb
index 3a4bb9146c96ff..677731fb683380 100644
--- a/spec/ruby/library/net/http/HTTPRetriableError_spec.rb
+++ b/spec/ruby/library/net-http/HTTPRetriableError_spec.rb
@@ -1,4 +1,4 @@
-require_relative '../../../spec_helper'
+require_relative '../../spec_helper'
 require 'net/http'
 
 describe "Net::HTTPRetriableError" do
diff --git a/spec/ruby/library/net/http/HTTPServerException_spec.rb b/spec/ruby/library/net-http/HTTPServerException_spec.rb
similarity index 92%
rename from spec/ruby/library/net/http/HTTPServerException_spec.rb
rename to spec/ruby/library/net-http/HTTPServerException_spec.rb
index 23b06573649062..5e0a833feebe7b 100644
--- a/spec/ruby/library/net/http/HTTPServerException_spec.rb
+++ b/spec/ruby/library/net-http/HTTPServerException_spec.rb
@@ -1,4 +1,4 @@
-require_relative '../../../spec_helper'
+require_relative '../../spec_helper'
 require 'net/http'
 
 describe "Net::HTTPServerException" do
diff --git a/spec/ruby/library/net/http/http/Proxy_spec.rb b/spec/ruby/library/net-http/http/Proxy_spec.rb
similarity index 96%
rename from spec/ruby/library/net/http/http/Proxy_spec.rb
rename to spec/ruby/library/net-http/http/Proxy_spec.rb
index f85ccc0ee9a100..a1a04fa00ba7a7 100644
--- a/spec/ruby/library/net/http/http/Proxy_spec.rb
+++ b/spec/ruby/library/net-http/http/Proxy_spec.rb
@@ -1,4 +1,4 @@
-require_relative '../../../../spec_helper'
+require_relative '../../../spec_helper'
 require 'net/http'
 
 describe "Net::HTTP.Proxy" do
diff --git a/spec/ruby/library/net/http/http/active_spec.rb b/spec/ruby/library/net-http/http/active_spec.rb
similarity index 80%
rename from spec/ruby/library/net/http/http/active_spec.rb
rename to spec/ruby/library/net-http/http/active_spec.rb
index ef657243baefec..c2602745949ce8 100644
--- a/spec/ruby/library/net/http/http/active_spec.rb
+++ b/spec/ruby/library/net-http/http/active_spec.rb
@@ -1,4 +1,4 @@
-require_relative '../../../../spec_helper'
+require_relative '../../../spec_helper'
 require 'net/http'
 require_relative 'fixtures/http_server'
 require_relative 'shared/started'
diff --git a/spec/ruby/library/net/http/http/address_spec.rb b/spec/ruby/library/net-http/http/address_spec.rb
similarity index 80%
rename from spec/ruby/library/net/http/http/address_spec.rb
rename to spec/ruby/library/net-http/http/address_spec.rb
index 5fce76d767385a..7c5b82a8f96a37 100644
--- a/spec/ruby/library/net/http/http/address_spec.rb
+++ b/spec/ruby/library/net-http/http/address_spec.rb
@@ -1,4 +1,4 @@
-require_relative '../../../../spec_helper'
+require_relative '../../../spec_helper'
 require 'net/http'
 
 describe "Net::HTTP#address" do
diff --git a/spec/ruby/library/net/http/http/close_on_empty_response_spec.rb b/spec/ruby/library/net-http/http/close_on_empty_response_spec.rb
similarity index 84%
rename from spec/ruby/library/net/http/http/close_on_empty_response_spec.rb
rename to spec/ruby/library/net-http/http/close_on_empty_response_spec.rb
index a97b7b6c434dd2..9cc756befbe13e 100644
--- a/spec/ruby/library/net/http/http/close_on_empty_response_spec.rb
+++ b/spec/ruby/library/net-http/http/close_on_empty_response_spec.rb
@@ -1,4 +1,4 @@
-require_relative '../../../../spec_helper'
+require_relative '../../../spec_helper'
 require 'net/http'
 
 describe "Net::HTTP#close_on_empty_response" do
diff --git a/spec/ruby/library/net/http/http/copy_spec.rb b/spec/ruby/library/net-http/http/copy_spec.rb
similarity index 92%
rename from spec/ruby/library/net/http/http/copy_spec.rb
rename to spec/ruby/library/net-http/http/copy_spec.rb
index 5ebfdc334e8caa..fba96c0f11c4b5 100644
--- a/spec/ruby/library/net/http/http/copy_spec.rb
+++ b/spec/ruby/library/net-http/http/copy_spec.rb
@@ -1,4 +1,4 @@
-require_relative '../../../../spec_helper'
+require_relative '../../../spec_helper'
 require 'net/http'
 require_relative 'fixtures/http_server'
 
diff --git a/spec/ruby/library/net/http/http/default_port_spec.rb b/spec/ruby/library/net-http/http/default_port_spec.rb
similarity index 75%
rename from spec/ruby/library/net/http/http/default_port_spec.rb
rename to spec/ruby/library/net-http/http/default_port_spec.rb
index 30db18efaee18d..95b7316a0cf77b 100644
--- a/spec/ruby/library/net/http/http/default_port_spec.rb
+++ b/spec/ruby/library/net-http/http/default_port_spec.rb
@@ -1,4 +1,4 @@
-require_relative '../../../../spec_helper'
+require_relative '../../../spec_helper'
 require 'net/http'
 
 describe "Net::HTTP.default_port" do
diff --git a/spec/ruby/library/net-http/http/delete_spec.rb b/spec/ruby/library/net-http/http/delete_spec.rb
new file mode 100644
index 00000000000000..d73aa5b375ac82
--- /dev/null
+++ b/spec/ruby/library/net-http/http/delete_spec.rb
@@ -0,0 +1,21 @@
+require_relative '../../../spec_helper'
+require 'net/http'
+require_relative 'fixtures/http_server'
+
+describe "Net::HTTP#delete" do
+  before :each do
+    NetHTTPSpecs.start_server
+    @http = Net::HTTP.start("localhost", NetHTTPSpecs.port)
+  end
+
+  after :each do
+    @http.finish if @http.started?
+    NetHTTPSpecs.stop_server
+  end
+
+  it "sends a DELETE request to the passed path and returns the response" do
+    response = @http.delete("/request")
+    response.should be_kind_of(Net::HTTPResponse)
+    response.body.should == "Request type: DELETE"
+  end
+end
diff --git a/spec/ruby/library/net/http/http/finish_spec.rb b/spec/ruby/library/net-http/http/finish_spec.rb
similarity index 93%
rename from spec/ruby/library/net/http/http/finish_spec.rb
rename to spec/ruby/library/net-http/http/finish_spec.rb
index f98bc7be138c24..d4aa00dffe1e28 100644
--- a/spec/ruby/library/net/http/http/finish_spec.rb
+++ b/spec/ruby/library/net-http/http/finish_spec.rb
@@ -1,4 +1,4 @@
-require_relative '../../../../spec_helper'
+require_relative '../../../spec_helper'
 require 'net/http'
 require_relative 'fixtures/http_server'
 
diff --git a/spec/ruby/library/net/http/http/fixtures/http_server.rb b/spec/ruby/library/net-http/http/fixtures/http_server.rb
similarity index 100%
rename from spec/ruby/library/net/http/http/fixtures/http_server.rb
rename to spec/ruby/library/net-http/http/fixtures/http_server.rb
diff --git a/spec/ruby/library/net/http/http/get2_spec.rb b/spec/ruby/library/net-http/http/get2_spec.rb
similarity index 80%
rename from spec/ruby/library/net/http/http/get2_spec.rb
rename to spec/ruby/library/net-http/http/get2_spec.rb
index 519e4c2599b494..57c05ec64b818c 100644
--- a/spec/ruby/library/net/http/http/get2_spec.rb
+++ b/spec/ruby/library/net-http/http/get2_spec.rb
@@ -1,4 +1,4 @@
-require_relative '../../../../spec_helper'
+require_relative '../../../spec_helper'
 require 'net/http'
 require_relative 'fixtures/http_server'
 require_relative 'shared/request_get'
diff --git a/spec/ruby/library/net/http/http/get_print_spec.rb b/spec/ruby/library/net-http/http/get_print_spec.rb
similarity index 94%
rename from spec/ruby/library/net/http/http/get_print_spec.rb
rename to spec/ruby/library/net-http/http/get_print_spec.rb
index f59dd68c818f48..3c24ce44ea5681 100644
--- a/spec/ruby/library/net/http/http/get_print_spec.rb
+++ b/spec/ruby/library/net-http/http/get_print_spec.rb
@@ -1,4 +1,4 @@
-require_relative '../../../../spec_helper'
+require_relative '../../../spec_helper'
 require 'net/http'
 require_relative 'fixtures/http_server'
 
diff --git a/spec/ruby/library/net/http/http/get_response_spec.rb b/spec/ruby/library/net-http/http/get_response_spec.rb
similarity index 94%
rename from spec/ruby/library/net/http/http/get_response_spec.rb
rename to spec/ruby/library/net-http/http/get_response_spec.rb
index 941b35e773bbf7..7133ef810141f3 100644
--- a/spec/ruby/library/net/http/http/get_response_spec.rb
+++ b/spec/ruby/library/net-http/http/get_response_spec.rb
@@ -1,4 +1,4 @@
-require_relative '../../../../spec_helper'
+require_relative '../../../spec_helper'
 require 'net/http'
 require_relative 'fixtures/http_server'
 
diff --git a/spec/ruby/library/net-http/http/get_spec.rb b/spec/ruby/library/net-http/http/get_spec.rb
new file mode 100644
index 00000000000000..e64a61c52cfcea
--- /dev/null
+++ b/spec/ruby/library/net-http/http/get_spec.rb
@@ -0,0 +1,94 @@
+require_relative '../../../spec_helper'
+require 'net/http'
+require_relative 'fixtures/http_server'
+
+describe "Net::HTTP.get" do
+  before :each do
+    NetHTTPSpecs.start_server
+    @port = NetHTTPSpecs.port
+  end
+
+  after :each do
+    NetHTTPSpecs.stop_server
+  end
+
+  describe "when passed URI" do
+    it "returns the body of the specified uri" do
+      Net::HTTP.get(URI.parse("http://localhost:#{@port}/")).should == "This is the index page."
+    end
+  end
+
+  describe "when passed host, path, port" do
+    it "returns the body of the specified host-path-combination" do
+      Net::HTTP.get('localhost', "/", @port).should == "This is the index page."
+    end
+  end
+end
+
+quarantine! do # These specs fail frequently with CHECK_LEAKS=true
+describe "Net::HTTP.get" do
+  describe "when reading gzipped contents" do
+    def start_threads
+      require 'zlib'
+      require 'stringio'
+
+      server = nil
+      server_thread = Thread.new do
+        server = TCPServer.new("127.0.0.1", 0)
+        begin
+          c = server.accept
+        ensure
+          server.close
+        end
+        c.print "HTTP/1.1 200\r\n"
+        c.print "Content-Type: text/plain\r\n"
+        c.print "Content-Encoding: gzip\r\n"
+        s = StringIO.new
+        z = Zlib::GzipWriter.new(s)
+        begin
+          z.write 'Hello World!'
+        ensure
+          z.close
+        end
+        c.print "Content-Length: #{s.length}\r\n\r\n"
+        # Write partial gzip content
+        c.write s.string.byteslice(0..-2)
+        c.flush
+        c
+      end
+      Thread.pass until server && server_thread.stop?
+
+      client_thread = Thread.new do
+        Thread.current.report_on_exception = false
+        Net::HTTP.get("127.0.0.1", '/', server.connect_address.ip_port)
+      end
+
+      socket = server_thread.value
+      Thread.pass until client_thread.stop?
+
+      [socket, client_thread]
+    end
+
+    it "propagates exceptions interrupting the thread and does not replace it with Zlib::BufError" do
+      my_exception = Class.new(RuntimeError)
+      socket, client_thread = start_threads
+      begin
+        client_thread.raise my_exception, "my exception"
+        -> { client_thread.value }.should raise_error(my_exception)
+      ensure
+        socket.close
+      end
+    end
+
+    it "lets the kill Thread exception goes through and does not replace it with Zlib::BufError" do
+      socket, client_thread = start_threads
+      begin
+        client_thread.kill
+        client_thread.value.should == nil
+      ensure
+        socket.close
+      end
+    end
+  end
+end
+end
diff --git a/spec/ruby/library/net/http/http/head2_spec.rb b/spec/ruby/library/net-http/http/head2_spec.rb
similarity index 80%
rename from spec/ruby/library/net/http/http/head2_spec.rb
rename to spec/ruby/library/net-http/http/head2_spec.rb
index 6958204ee1c2b6..84cfff33d7cdad 100644
--- a/spec/ruby/library/net/http/http/head2_spec.rb
+++ b/spec/ruby/library/net-http/http/head2_spec.rb
@@ -1,4 +1,4 @@
-require_relative '../../../../spec_helper'
+require_relative '../../../spec_helper'
 require 'net/http'
 require_relative 'fixtures/http_server'
 require_relative 'shared/request_head'
diff --git a/spec/ruby/library/net/http/http/head_spec.rb b/spec/ruby/library/net-http/http/head_spec.rb
similarity index 93%
rename from spec/ruby/library/net/http/http/head_spec.rb
rename to spec/ruby/library/net-http/http/head_spec.rb
index 925a8e60436049..64621fa87b5eed 100644
--- a/spec/ruby/library/net/http/http/head_spec.rb
+++ b/spec/ruby/library/net-http/http/head_spec.rb
@@ -1,4 +1,4 @@
-require_relative '../../../../spec_helper'
+require_relative '../../../spec_helper'
 require 'net/http'
 require_relative 'fixtures/http_server'
 
diff --git a/spec/ruby/library/net/http/http/http_default_port_spec.rb b/spec/ruby/library/net-http/http/http_default_port_spec.rb
similarity index 76%
rename from spec/ruby/library/net/http/http/http_default_port_spec.rb
rename to spec/ruby/library/net-http/http/http_default_port_spec.rb
index cf7f73e630bf2a..3b17bcd0a5ccdb 100644
--- a/spec/ruby/library/net/http/http/http_default_port_spec.rb
+++ b/spec/ruby/library/net-http/http/http_default_port_spec.rb
@@ -1,4 +1,4 @@
-require_relative '../../../../spec_helper'
+require_relative '../../../spec_helper'
 require 'net/http'
 
 describe "Net::HTTP.http_default_port" do
diff --git a/spec/ruby/library/net/http/http/https_default_port_spec.rb b/spec/ruby/library/net-http/http/https_default_port_spec.rb
similarity index 77%
rename from spec/ruby/library/net/http/http/https_default_port_spec.rb
rename to spec/ruby/library/net-http/http/https_default_port_spec.rb
index fbf0bd1abc51d3..8c24e1d97cdeec 100644
--- a/spec/ruby/library/net/http/http/https_default_port_spec.rb
+++ b/spec/ruby/library/net-http/http/https_default_port_spec.rb
@@ -1,4 +1,4 @@
-require_relative '../../../../spec_helper'
+require_relative '../../../spec_helper'
 require 'net/http'
 
 describe "Net::HTTP.https_default_port" do
diff --git a/spec/ruby/library/net-http/http/initialize_spec.rb b/spec/ruby/library/net-http/http/initialize_spec.rb
new file mode 100644
index 00000000000000..78aa01e1aaecb3
--- /dev/null
+++ b/spec/ruby/library/net-http/http/initialize_spec.rb
@@ -0,0 +1,46 @@
+require_relative '../../../spec_helper'
+require 'net/http'
+
+describe "Net::HTTP#initialize" do
+  it "is private" do
+    Net::HTTP.should have_private_instance_method(:initialize)
+  end
+
+  describe "when passed address" do
+    before :each do
+      @net = Net::HTTP.allocate
+      @net.send(:initialize, "localhost")
+    end
+
+    it "sets the new Net::HTTP instance's address to the passed address" do
+      @net.address.should == "localhost"
+    end
+
+    it "sets the new Net::HTTP instance's port to the default HTTP port" do
+      @net.port.should eql(Net::HTTP.default_port)
+    end
+
+    it "does not start the new Net::HTTP instance" do
+      @net.started?.should be_false
+    end
+  end
+
+  describe "when passed address, port" do
+    before :each do
+      @net = Net::HTTP.allocate
+      @net.send(:initialize, "localhost", 3333)
+    end
+
+    it "sets the new Net::HTTP instance's address to the passed address" do
+      @net.address.should == "localhost"
+    end
+
+    it "sets the new Net::HTTP instance's port to the passed port" do
+      @net.port.should eql(3333)
+    end
+
+    it "does not start the new Net::HTTP instance" do
+      @net.started?.should be_false
+    end
+  end
+end
diff --git a/spec/ruby/library/net-http/http/inspect_spec.rb b/spec/ruby/library/net-http/http/inspect_spec.rb
new file mode 100644
index 00000000000000..b8f650809e3f18
--- /dev/null
+++ b/spec/ruby/library/net-http/http/inspect_spec.rb
@@ -0,0 +1,24 @@
+require_relative '../../../spec_helper'
+require 'net/http'
+require_relative 'fixtures/http_server'
+
+describe "Net::HTTP#inspect" do
+  before :each do
+    NetHTTPSpecs.start_server
+    @port = NetHTTPSpecs.port
+    @http = Net::HTTP.new("localhost", @port)
+  end
+
+  after :each do
+    @http.finish if @http.started?
+    NetHTTPSpecs.stop_server
+  end
+
+  it "returns a String representation of self" do
+    @http.inspect.should be_kind_of(String)
+    @http.inspect.should == "#<Net::HTTP localhost:#{@port} open=false>"
+
+    @http.start
+    @http.inspect.should == "#<Net::HTTP localhost:#{@port} open=true>"
+  end
+end
diff --git a/spec/ruby/library/net/http/http/is_version_1_1_spec.rb b/spec/ruby/library/net-http/http/is_version_1_1_spec.rb
similarity index 79%
rename from spec/ruby/library/net/http/http/is_version_1_1_spec.rb
rename to spec/ruby/library/net-http/http/is_version_1_1_spec.rb
index f37695b777e854..bdb343f9e0e2a9 100644
--- a/spec/ruby/library/net/http/http/is_version_1_1_spec.rb
+++ b/spec/ruby/library/net-http/http/is_version_1_1_spec.rb
@@ -1,4 +1,4 @@
-require_relative '../../../../spec_helper'
+require_relative '../../../spec_helper'
 require 'net/http'
 require_relative 'shared/version_1_1'
 
diff --git a/spec/ruby/library/net/http/http/is_version_1_2_spec.rb b/spec/ruby/library/net-http/http/is_version_1_2_spec.rb
similarity index 79%
rename from spec/ruby/library/net/http/http/is_version_1_2_spec.rb
rename to spec/ruby/library/net-http/http/is_version_1_2_spec.rb
index 82dbdc87aa5876..555bb205dd8379 100644
--- a/spec/ruby/library/net/http/http/is_version_1_2_spec.rb
+++ b/spec/ruby/library/net-http/http/is_version_1_2_spec.rb
@@ -1,4 +1,4 @@
-require_relative '../../../../spec_helper'
+require_relative '../../../spec_helper'
 require 'net/http'
 require_relative 'shared/version_1_2'
 
diff --git a/spec/ruby/library/net/http/http/lock_spec.rb b/spec/ruby/library/net-http/http/lock_spec.rb
similarity index 92%
rename from spec/ruby/library/net/http/http/lock_spec.rb
rename to spec/ruby/library/net-http/http/lock_spec.rb
index bb76607a8b2f0e..aa1f944196e917 100644
--- a/spec/ruby/library/net/http/http/lock_spec.rb
+++ b/spec/ruby/library/net-http/http/lock_spec.rb
@@ -1,4 +1,4 @@
-require_relative '../../../../spec_helper'
+require_relative '../../../spec_helper'
 require 'net/http'
 require_relative 'fixtures/http_server'
 
diff --git a/spec/ruby/library/net/http/http/mkcol_spec.rb b/spec/ruby/library/net-http/http/mkcol_spec.rb
similarity index 92%
rename from spec/ruby/library/net/http/http/mkcol_spec.rb
rename to spec/ruby/library/net-http/http/mkcol_spec.rb
index 33017625e29b62..f8009f90592a6d 100644
--- a/spec/ruby/library/net/http/http/mkcol_spec.rb
+++ b/spec/ruby/library/net-http/http/mkcol_spec.rb
@@ -1,4 +1,4 @@
-require_relative '../../../../spec_helper'
+require_relative '../../../spec_helper'
 require 'net/http'
 require_relative 'fixtures/http_server'
 
diff --git a/spec/ruby/library/net/http/http/move_spec.rb b/spec/ruby/library/net-http/http/move_spec.rb
similarity index 93%
rename from spec/ruby/library/net/http/http/move_spec.rb
rename to spec/ruby/library/net-http/http/move_spec.rb
index 4d6b8281506d44..ae43016a2cb7a9 100644
--- a/spec/ruby/library/net/http/http/move_spec.rb
+++ b/spec/ruby/library/net-http/http/move_spec.rb
@@ -1,4 +1,4 @@
-require_relative '../../../../spec_helper'
+require_relative '../../../spec_helper'
 require 'net/http'
 require_relative 'fixtures/http_server'
 
diff --git a/spec/ruby/library/net/http/http/new_spec.rb b/spec/ruby/library/net-http/http/new_spec.rb
similarity index 98%
rename from spec/ruby/library/net/http/http/new_spec.rb
rename to spec/ruby/library/net-http/http/new_spec.rb
index 491d1d01fdbabc..1ec6bbd0c043d7 100644
--- a/spec/ruby/library/net/http/http/new_spec.rb
+++ b/spec/ruby/library/net-http/http/new_spec.rb
@@ -1,4 +1,4 @@
-require_relative '../../../../spec_helper'
+require_relative '../../../spec_helper'
 require 'net/http'
 
 describe "Net::HTTP.new" do
diff --git a/spec/ruby/library/net/http/http/newobj_spec.rb b/spec/ruby/library/net-http/http/newobj_spec.rb
similarity index 96%
rename from spec/ruby/library/net/http/http/newobj_spec.rb
rename to spec/ruby/library/net-http/http/newobj_spec.rb
index b261dcc5db9566..e19b30fca9becb 100644
--- a/spec/ruby/library/net/http/http/newobj_spec.rb
+++ b/spec/ruby/library/net-http/http/newobj_spec.rb
@@ -1,4 +1,4 @@
-require_relative '../../../../spec_helper'
+require_relative '../../../spec_helper'
 require 'net/http'
 
 describe "Net::HTTP.newobj" do
diff --git a/spec/ruby/library/net/http/http/open_timeout_spec.rb b/spec/ruby/library/net-http/http/open_timeout_spec.rb
similarity index 93%
rename from spec/ruby/library/net/http/http/open_timeout_spec.rb
rename to spec/ruby/library/net-http/http/open_timeout_spec.rb
index 44b33615e6c3b0..0d93752271898f 100644
--- a/spec/ruby/library/net/http/http/open_timeout_spec.rb
+++ b/spec/ruby/library/net-http/http/open_timeout_spec.rb
@@ -1,4 +1,4 @@
-require_relative '../../../../spec_helper'
+require_relative '../../../spec_helper'
 require 'net/http'
 
 describe "Net::HTTP#open_timeout" do
diff --git a/spec/ruby/library/net/http/http/options_spec.rb b/spec/ruby/library/net-http/http/options_spec.rb
similarity index 93%
rename from spec/ruby/library/net/http/http/options_spec.rb
rename to spec/ruby/library/net-http/http/options_spec.rb
index d798e6919757d3..3d9887a557b447 100644
--- a/spec/ruby/library/net/http/http/options_spec.rb
+++ b/spec/ruby/library/net-http/http/options_spec.rb
@@ -1,4 +1,4 @@
-require_relative '../../../../spec_helper'
+require_relative '../../../spec_helper'
 require 'net/http'
 require_relative 'fixtures/http_server'
 
diff --git a/spec/ruby/library/net/http/http/port_spec.rb b/spec/ruby/library/net-http/http/port_spec.rb
similarity index 80%
rename from spec/ruby/library/net/http/http/port_spec.rb
rename to spec/ruby/library/net-http/http/port_spec.rb
index 7de295ca75777f..0984d5e6ce8c46 100644
--- a/spec/ruby/library/net/http/http/port_spec.rb
+++ b/spec/ruby/library/net-http/http/port_spec.rb
@@ -1,4 +1,4 @@
-require_relative '../../../../spec_helper'
+require_relative '../../../spec_helper'
 require 'net/http'
 
 describe "Net::HTTP#port" do
diff --git a/spec/ruby/library/net/http/http/post2_spec.rb b/spec/ruby/library/net-http/http/post2_spec.rb
similarity index 80%
rename from spec/ruby/library/net/http/http/post2_spec.rb
rename to spec/ruby/library/net-http/http/post2_spec.rb
index ccc95068fba525..abc998709fe0c4 100644
--- a/spec/ruby/library/net/http/http/post2_spec.rb
+++ b/spec/ruby/library/net-http/http/post2_spec.rb
@@ -1,4 +1,4 @@
-require_relative '../../../../spec_helper'
+require_relative '../../../spec_helper'
 require 'net/http'
 require_relative 'fixtures/http_server'
 require_relative 'shared/request_post'
diff --git a/spec/ruby/library/net/http/http/post_form_spec.rb b/spec/ruby/library/net-http/http/post_form_spec.rb
similarity index 91%
rename from spec/ruby/library/net/http/http/post_form_spec.rb
rename to spec/ruby/library/net-http/http/post_form_spec.rb
index 891e05e7af4e6c..de64a25bae7dd2 100644
--- a/spec/ruby/library/net/http/http/post_form_spec.rb
+++ b/spec/ruby/library/net-http/http/post_form_spec.rb
@@ -1,4 +1,4 @@
-require_relative '../../../../spec_helper'
+require_relative '../../../spec_helper'
 require 'net/http'
 require_relative 'fixtures/http_server'
 
diff --git a/spec/ruby/library/net/http/http/post_spec.rb b/spec/ruby/library/net-http/http/post_spec.rb
similarity index 82%
rename from spec/ruby/library/net/http/http/post_spec.rb
rename to spec/ruby/library/net-http/http/post_spec.rb
index 891e20aaca30f6..cebbee4ff303ba 100644
--- a/spec/ruby/library/net/http/http/post_spec.rb
+++ b/spec/ruby/library/net-http/http/post_spec.rb
@@ -1,4 +1,4 @@
-require_relative '../../../../spec_helper'
+require_relative '../../../spec_helper'
 require 'net/http'
 require 'uri'
 require_relative 'fixtures/http_server'
@@ -25,9 +25,11 @@
     response.should be_kind_of(Net::HTTPResponse)
   end
 
-  it "sends Content-Type: application/x-www-form-urlencoded by default" do
-    response = Net::HTTP.post(URI("http://localhost:#{NetHTTPSpecs.port}/request/header"), "test=test")
-    response.body.should include('"Content-Type"=>"application/x-www-form-urlencoded"')
+  ruby_version_is ""..."3.5" do
+    it "sends Content-Type: application/x-www-form-urlencoded by default" do
+      response = Net::HTTP.post(URI("http://localhost:#{NetHTTPSpecs.port}/request/header"), "test=test")
+      response.body.should include({ "Content-Type" => "application/x-www-form-urlencoded" }.inspect.delete("{}"))
+    end
   end
 
   it "does not support HTTP Basic Auth" do
@@ -60,7 +62,7 @@
 
   describe "when passed a block" do
     it "yields fragments of the response body to the passed block" do
-      str = ""
+      str = +""
       @http.post("/request", "test=test") do |res|
         str << res
       end
diff --git a/spec/ruby/library/net/http/http/propfind_spec.rb b/spec/ruby/library/net-http/http/propfind_spec.rb
similarity index 93%
rename from spec/ruby/library/net/http/http/propfind_spec.rb
rename to spec/ruby/library/net-http/http/propfind_spec.rb
index 524017161805b5..f3742d1b1ae9db 100644
--- a/spec/ruby/library/net/http/http/propfind_spec.rb
+++ b/spec/ruby/library/net-http/http/propfind_spec.rb
@@ -1,4 +1,4 @@
-require_relative '../../../../spec_helper'
+require_relative '../../../spec_helper'
 require 'net/http'
 require_relative 'fixtures/http_server'
 
diff --git a/spec/ruby/library/net/http/http/proppatch_spec.rb b/spec/ruby/library/net-http/http/proppatch_spec.rb
similarity index 93%
rename from spec/ruby/library/net/http/http/proppatch_spec.rb
rename to spec/ruby/library/net-http/http/proppatch_spec.rb
index 7a761a9f234711..0163d24d46a2d3 100644
--- a/spec/ruby/library/net/http/http/proppatch_spec.rb
+++ b/spec/ruby/library/net-http/http/proppatch_spec.rb
@@ -1,4 +1,4 @@
-require_relative '../../../../spec_helper'
+require_relative '../../../spec_helper'
 require 'net/http'
 require_relative 'fixtures/http_server'
 
diff --git a/spec/ruby/library/net/http/http/proxy_address_spec.rb b/spec/ruby/library/net-http/http/proxy_address_spec.rb
similarity index 95%
rename from spec/ruby/library/net/http/http/proxy_address_spec.rb
rename to spec/ruby/library/net-http/http/proxy_address_spec.rb
index 8d152b8d448b11..5b5efb7ac00bb3 100644
--- a/spec/ruby/library/net/http/http/proxy_address_spec.rb
+++ b/spec/ruby/library/net-http/http/proxy_address_spec.rb
@@ -1,4 +1,4 @@
-require_relative '../../../../spec_helper'
+require_relative '../../../spec_helper'
 require 'net/http'
 
 describe "Net::HTTP.proxy_address" do
diff --git a/spec/ruby/library/net/http/http/proxy_class_spec.rb b/spec/ruby/library/net-http/http/proxy_class_spec.rb
similarity index 84%
rename from spec/ruby/library/net/http/http/proxy_class_spec.rb
rename to spec/ruby/library/net-http/http/proxy_class_spec.rb
index 2d32a39f013d15..00975aef4ecfaa 100644
--- a/spec/ruby/library/net/http/http/proxy_class_spec.rb
+++ b/spec/ruby/library/net-http/http/proxy_class_spec.rb
@@ -1,4 +1,4 @@
-require_relative '../../../../spec_helper'
+require_relative '../../../spec_helper'
 require 'net/http'
 
 describe "Net::HTTP.proxy_class?" do
diff --git a/spec/ruby/library/net/http/http/proxy_pass_spec.rb b/spec/ruby/library/net-http/http/proxy_pass_spec.rb
similarity index 96%
rename from spec/ruby/library/net/http/http/proxy_pass_spec.rb
rename to spec/ruby/library/net-http/http/proxy_pass_spec.rb
index 94a003454455bf..4e393a53ff8530 100644
--- a/spec/ruby/library/net/http/http/proxy_pass_spec.rb
+++ b/spec/ruby/library/net-http/http/proxy_pass_spec.rb
@@ -1,4 +1,4 @@
-require_relative '../../../../spec_helper'
+require_relative '../../../spec_helper'
 require 'net/http'
 
 describe "Net::HTTP.proxy_pass" do
diff --git a/spec/ruby/library/net/http/http/proxy_port_spec.rb b/spec/ruby/library/net-http/http/proxy_port_spec.rb
similarity index 96%
rename from spec/ruby/library/net/http/http/proxy_port_spec.rb
rename to spec/ruby/library/net-http/http/proxy_port_spec.rb
index 339f7ee850a347..d7d37f39273543 100644
--- a/spec/ruby/library/net/http/http/proxy_port_spec.rb
+++ b/spec/ruby/library/net-http/http/proxy_port_spec.rb
@@ -1,4 +1,4 @@
-require_relative '../../../../spec_helper'
+require_relative '../../../spec_helper'
 require 'net/http'
 
 describe "Net::HTTP.proxy_port" do
diff --git a/spec/ruby/library/net/http/http/proxy_user_spec.rb b/spec/ruby/library/net-http/http/proxy_user_spec.rb
similarity index 96%
rename from spec/ruby/library/net/http/http/proxy_user_spec.rb
rename to spec/ruby/library/net-http/http/proxy_user_spec.rb
index 01fda400e9e197..ef7654425de2e7 100644
--- a/spec/ruby/library/net/http/http/proxy_user_spec.rb
+++ b/spec/ruby/library/net-http/http/proxy_user_spec.rb
@@ -1,4 +1,4 @@
-require_relative '../../../../spec_helper'
+require_relative '../../../spec_helper'
 require 'net/http'
 
 describe "Net::HTTP.proxy_user" do
diff --git a/spec/ruby/library/net/http/http/put2_spec.rb b/spec/ruby/library/net-http/http/put2_spec.rb
similarity index 80%
rename from spec/ruby/library/net/http/http/put2_spec.rb
rename to spec/ruby/library/net-http/http/put2_spec.rb
index 99329a5fd96320..7b03a39d0b828d 100644
--- a/spec/ruby/library/net/http/http/put2_spec.rb
+++ b/spec/ruby/library/net-http/http/put2_spec.rb
@@ -1,4 +1,4 @@
-require_relative '../../../../spec_helper'
+require_relative '../../../spec_helper'
 require 'net/http'
 require_relative 'fixtures/http_server'
 require_relative 'shared/request_put'
diff --git a/spec/ruby/library/net-http/http/put_spec.rb b/spec/ruby/library/net-http/http/put_spec.rb
new file mode 100644
index 00000000000000..75f3c243d4aa09
--- /dev/null
+++ b/spec/ruby/library/net-http/http/put_spec.rb
@@ -0,0 +1,24 @@
+require_relative '../../../spec_helper'
+require 'net/http'
+require_relative 'fixtures/http_server'
+
+describe "Net::HTTP#put" do
+  before :each do
+    NetHTTPSpecs.start_server
+    @http = Net::HTTP.start("localhost", NetHTTPSpecs.port)
+  end
+
+  after :each do
+    @http.finish if @http.started?
+    NetHTTPSpecs.stop_server
+  end
+
+  it "sends an put request to the passed path and returns the response" do
+    response = @http.put("/request", "test=test")
+    response.body.should == "Request type: PUT"
+  end
+
+  it "returns a Net::HTTPResponse" do
+    @http.put("/request", "test=test").should be_kind_of(Net::HTTPResponse)
+  end
+end
diff --git a/spec/ruby/library/net/http/http/read_timeout_spec.rb b/spec/ruby/library/net-http/http/read_timeout_spec.rb
similarity index 93%
rename from spec/ruby/library/net/http/http/read_timeout_spec.rb
rename to spec/ruby/library/net-http/http/read_timeout_spec.rb
index e23ee76025921d..7a0d2f1d72adc0 100644
--- a/spec/ruby/library/net/http/http/read_timeout_spec.rb
+++ b/spec/ruby/library/net-http/http/read_timeout_spec.rb
@@ -1,4 +1,4 @@
-require_relative '../../../../spec_helper'
+require_relative '../../../spec_helper'
 require 'net/http'
 
 describe "Net::HTTP#read_timeout" do
diff --git a/spec/ruby/library/net/http/http/request_get_spec.rb b/spec/ruby/library/net-http/http/request_get_spec.rb
similarity index 81%
rename from spec/ruby/library/net/http/http/request_get_spec.rb
rename to spec/ruby/library/net-http/http/request_get_spec.rb
index 9932ef0beb036b..98025a14a18a7f 100644
--- a/spec/ruby/library/net/http/http/request_get_spec.rb
+++ b/spec/ruby/library/net-http/http/request_get_spec.rb
@@ -1,4 +1,4 @@
-require_relative '../../../../spec_helper'
+require_relative '../../../spec_helper'
 require 'net/http'
 require_relative 'fixtures/http_server'
 require_relative 'shared/request_get'
diff --git a/spec/ruby/library/net/http/http/request_head_spec.rb b/spec/ruby/library/net-http/http/request_head_spec.rb
similarity index 82%
rename from spec/ruby/library/net/http/http/request_head_spec.rb
rename to spec/ruby/library/net-http/http/request_head_spec.rb
index 788101c951000b..8f514d4eeeaa29 100644
--- a/spec/ruby/library/net/http/http/request_head_spec.rb
+++ b/spec/ruby/library/net-http/http/request_head_spec.rb
@@ -1,4 +1,4 @@
-require_relative '../../../../spec_helper'
+require_relative '../../../spec_helper'
 require 'net/http'
 require_relative 'fixtures/http_server'
 require_relative 'shared/request_head'
diff --git a/spec/ruby/library/net/http/http/request_post_spec.rb b/spec/ruby/library/net-http/http/request_post_spec.rb
similarity index 82%
rename from spec/ruby/library/net/http/http/request_post_spec.rb
rename to spec/ruby/library/net-http/http/request_post_spec.rb
index 7ac67cf95d438b..719bd5a7eeca29 100644
--- a/spec/ruby/library/net/http/http/request_post_spec.rb
+++ b/spec/ruby/library/net-http/http/request_post_spec.rb
@@ -1,4 +1,4 @@
-require_relative '../../../../spec_helper'
+require_relative '../../../spec_helper'
 require 'net/http'
 require_relative 'fixtures/http_server'
 require_relative 'shared/request_post'
diff --git a/spec/ruby/library/net/http/http/request_put_spec.rb b/spec/ruby/library/net-http/http/request_put_spec.rb
similarity index 81%
rename from spec/ruby/library/net/http/http/request_put_spec.rb
rename to spec/ruby/library/net-http/http/request_put_spec.rb
index 110ac43ca629d2..9fcf3a98d68a9c 100644
--- a/spec/ruby/library/net/http/http/request_put_spec.rb
+++ b/spec/ruby/library/net-http/http/request_put_spec.rb
@@ -1,4 +1,4 @@
-require_relative '../../../../spec_helper'
+require_relative '../../../spec_helper'
 require 'net/http'
 require_relative 'fixtures/http_server'
 require_relative 'shared/request_put'
diff --git a/spec/ruby/library/net/http/http/request_spec.rb b/spec/ruby/library/net-http/http/request_spec.rb
similarity index 98%
rename from spec/ruby/library/net/http/http/request_spec.rb
rename to spec/ruby/library/net-http/http/request_spec.rb
index e63dde9c8d727c..356e605b3b2017 100644
--- a/spec/ruby/library/net/http/http/request_spec.rb
+++ b/spec/ruby/library/net-http/http/request_spec.rb
@@ -1,4 +1,4 @@
-require_relative '../../../../spec_helper'
+require_relative '../../../spec_helper'
 require 'net/http'
 require_relative 'fixtures/http_server'
 
diff --git a/spec/ruby/library/net/http/http/request_types_spec.rb b/spec/ruby/library/net-http/http/request_types_spec.rb
similarity index 99%
rename from spec/ruby/library/net/http/http/request_types_spec.rb
rename to spec/ruby/library/net-http/http/request_types_spec.rb
index 99d754d3d10a1a..53aef1ee58567a 100644
--- a/spec/ruby/library/net/http/http/request_types_spec.rb
+++ b/spec/ruby/library/net-http/http/request_types_spec.rb
@@ -1,4 +1,4 @@
-require_relative '../../../../spec_helper'
+require_relative '../../../spec_helper'
 require 'net/http'
 
 describe "Net::HTTP::Get" do
diff --git a/spec/ruby/library/net/http/http/send_request_spec.rb b/spec/ruby/library/net-http/http/send_request_spec.rb
similarity index 93%
rename from spec/ruby/library/net/http/http/send_request_spec.rb
rename to spec/ruby/library/net-http/http/send_request_spec.rb
index 83e9448b8b1d85..af35c068ceaeaf 100644
--- a/spec/ruby/library/net/http/http/send_request_spec.rb
+++ b/spec/ruby/library/net-http/http/send_request_spec.rb
@@ -1,4 +1,4 @@
-require_relative '../../../../spec_helper'
+require_relative '../../../spec_helper'
 require 'net/http'
 require_relative 'fixtures/http_server'
 
@@ -54,7 +54,7 @@
 
       @methods.each do |method|
         response = @http.send_request(method, "/request/header", "test=test", "referer" => referer)
-        response.body.should include('"Referer"=>"' + referer + '"')
+        response.body.should include({ "Referer" => referer }.inspect.delete("{}"))
       end
     end
   end
diff --git a/spec/ruby/library/net/http/http/set_debug_output_spec.rb b/spec/ruby/library/net-http/http/set_debug_output_spec.rb
similarity index 94%
rename from spec/ruby/library/net/http/http/set_debug_output_spec.rb
rename to spec/ruby/library/net-http/http/set_debug_output_spec.rb
index 94b6f4499d7e84..5ceecb39fb9435 100644
--- a/spec/ruby/library/net/http/http/set_debug_output_spec.rb
+++ b/spec/ruby/library/net-http/http/set_debug_output_spec.rb
@@ -1,4 +1,4 @@
-require_relative '../../../../spec_helper'
+require_relative '../../../spec_helper'
 require 'net/http'
 require "stringio"
 require_relative 'fixtures/http_server'
diff --git a/spec/ruby/library/net/http/http/shared/request_get.rb b/spec/ruby/library/net-http/http/shared/request_get.rb
similarity index 100%
rename from spec/ruby/library/net/http/http/shared/request_get.rb
rename to spec/ruby/library/net-http/http/shared/request_get.rb
diff --git a/spec/ruby/library/net/http/http/shared/request_head.rb b/spec/ruby/library/net-http/http/shared/request_head.rb
similarity index 100%
rename from spec/ruby/library/net/http/http/shared/request_head.rb
rename to spec/ruby/library/net-http/http/shared/request_head.rb
diff --git a/spec/ruby/library/net/http/http/shared/request_post.rb b/spec/ruby/library/net-http/http/shared/request_post.rb
similarity index 100%
rename from spec/ruby/library/net/http/http/shared/request_post.rb
rename to spec/ruby/library/net-http/http/shared/request_post.rb
diff --git a/spec/ruby/library/net/http/http/shared/request_put.rb b/spec/ruby/library/net-http/http/shared/request_put.rb
similarity index 100%
rename from spec/ruby/library/net/http/http/shared/request_put.rb
rename to spec/ruby/library/net-http/http/shared/request_put.rb
diff --git a/spec/ruby/library/net/http/http/shared/started.rb b/spec/ruby/library/net-http/http/shared/started.rb
similarity index 100%
rename from spec/ruby/library/net/http/http/shared/started.rb
rename to spec/ruby/library/net-http/http/shared/started.rb
diff --git a/spec/ruby/library/net/http/http/shared/version_1_1.rb b/spec/ruby/library/net-http/http/shared/version_1_1.rb
similarity index 100%
rename from spec/ruby/library/net/http/http/shared/version_1_1.rb
rename to spec/ruby/library/net-http/http/shared/version_1_1.rb
diff --git a/spec/ruby/library/net/http/http/shared/version_1_2.rb b/spec/ruby/library/net-http/http/shared/version_1_2.rb
similarity index 100%
rename from spec/ruby/library/net/http/http/shared/version_1_2.rb
rename to spec/ruby/library/net-http/http/shared/version_1_2.rb
diff --git a/spec/ruby/library/net/http/http/socket_type_spec.rb b/spec/ruby/library/net-http/http/socket_type_spec.rb
similarity index 77%
rename from spec/ruby/library/net/http/http/socket_type_spec.rb
rename to spec/ruby/library/net-http/http/socket_type_spec.rb
index 5c844ddf94c99f..f6826777b081b7 100644
--- a/spec/ruby/library/net/http/http/socket_type_spec.rb
+++ b/spec/ruby/library/net-http/http/socket_type_spec.rb
@@ -1,4 +1,4 @@
-require_relative '../../../../spec_helper'
+require_relative '../../../spec_helper'
 require 'net/http'
 
 describe "Net::HTTP.socket_type" do
diff --git a/spec/ruby/library/net/http/http/start_spec.rb b/spec/ruby/library/net-http/http/start_spec.rb
similarity index 98%
rename from spec/ruby/library/net/http/http/start_spec.rb
rename to spec/ruby/library/net-http/http/start_spec.rb
index a2768eed180809..0ce3e792690441 100644
--- a/spec/ruby/library/net/http/http/start_spec.rb
+++ b/spec/ruby/library/net-http/http/start_spec.rb
@@ -1,4 +1,4 @@
-require_relative '../../../../spec_helper'
+require_relative '../../../spec_helper'
 require 'net/http'
 require_relative 'fixtures/http_server'
 
diff --git a/spec/ruby/library/net/http/http/started_spec.rb b/spec/ruby/library/net-http/http/started_spec.rb
similarity index 80%
rename from spec/ruby/library/net/http/http/started_spec.rb
rename to spec/ruby/library/net-http/http/started_spec.rb
index ea441ed16addec..cbb82ceefa8687 100644
--- a/spec/ruby/library/net/http/http/started_spec.rb
+++ b/spec/ruby/library/net-http/http/started_spec.rb
@@ -1,4 +1,4 @@
-require_relative '../../../../spec_helper'
+require_relative '../../../spec_helper'
 require 'net/http'
 require_relative 'fixtures/http_server'
 require_relative 'shared/started'
diff --git a/spec/ruby/library/net/http/http/trace_spec.rb b/spec/ruby/library/net-http/http/trace_spec.rb
similarity index 93%
rename from spec/ruby/library/net/http/http/trace_spec.rb
rename to spec/ruby/library/net-http/http/trace_spec.rb
index 94a1bf66556fd4..9809d537c5e579 100644
--- a/spec/ruby/library/net/http/http/trace_spec.rb
+++ b/spec/ruby/library/net-http/http/trace_spec.rb
@@ -1,4 +1,4 @@
-require_relative '../../../../spec_helper'
+require_relative '../../../spec_helper'
 require 'net/http'
 require_relative 'fixtures/http_server'
 
diff --git a/spec/ruby/library/net/http/http/unlock_spec.rb b/spec/ruby/library/net-http/http/unlock_spec.rb
similarity index 93%
rename from spec/ruby/library/net/http/http/unlock_spec.rb
rename to spec/ruby/library/net-http/http/unlock_spec.rb
index a4f1b7a1d16a37..adf0b49f6521aa 100644
--- a/spec/ruby/library/net/http/http/unlock_spec.rb
+++ b/spec/ruby/library/net-http/http/unlock_spec.rb
@@ -1,4 +1,4 @@
-require_relative '../../../../spec_helper'
+require_relative '../../../spec_helper'
 require 'net/http'
 require_relative 'fixtures/http_server'
 
diff --git a/spec/ruby/library/net/http/http/use_ssl_spec.rb b/spec/ruby/library/net-http/http/use_ssl_spec.rb
similarity index 78%
rename from spec/ruby/library/net/http/http/use_ssl_spec.rb
rename to spec/ruby/library/net-http/http/use_ssl_spec.rb
index be1ec7fa257c5b..912a62a8ba61d4 100644
--- a/spec/ruby/library/net/http/http/use_ssl_spec.rb
+++ b/spec/ruby/library/net-http/http/use_ssl_spec.rb
@@ -1,4 +1,4 @@
-require_relative '../../../../spec_helper'
+require_relative '../../../spec_helper'
 require 'net/http'
 
 describe "Net::HTTP#use_ssl?" do
diff --git a/spec/ruby/library/net/http/http/version_1_1_spec.rb b/spec/ruby/library/net-http/http/version_1_1_spec.rb
similarity index 78%
rename from spec/ruby/library/net/http/http/version_1_1_spec.rb
rename to spec/ruby/library/net-http/http/version_1_1_spec.rb
index 1c069e9ea6259b..34a4ac8a6bb4f6 100644
--- a/spec/ruby/library/net/http/http/version_1_1_spec.rb
+++ b/spec/ruby/library/net-http/http/version_1_1_spec.rb
@@ -1,4 +1,4 @@
-require_relative '../../../../spec_helper'
+require_relative '../../../spec_helper'
 require 'net/http'
 require_relative 'shared/version_1_1'
 
diff --git a/spec/ruby/library/net/http/http/version_1_2_spec.rb b/spec/ruby/library/net-http/http/version_1_2_spec.rb
similarity index 90%
rename from spec/ruby/library/net/http/http/version_1_2_spec.rb
rename to spec/ruby/library/net-http/http/version_1_2_spec.rb
index 4e601462c91f9a..e994511aea1ae3 100644
--- a/spec/ruby/library/net/http/http/version_1_2_spec.rb
+++ b/spec/ruby/library/net-http/http/version_1_2_spec.rb
@@ -1,4 +1,4 @@
-require_relative '../../../../spec_helper'
+require_relative '../../../spec_helper'
 require 'net/http'
 require_relative 'shared/version_1_2'
 
diff --git a/spec/ruby/library/net/http/httpexceptions/fixtures/classes.rb b/spec/ruby/library/net-http/httpexceptions/fixtures/classes.rb
similarity index 100%
rename from spec/ruby/library/net/http/httpexceptions/fixtures/classes.rb
rename to spec/ruby/library/net-http/httpexceptions/fixtures/classes.rb
diff --git a/spec/ruby/library/net-http/httpexceptions/initialize_spec.rb b/spec/ruby/library/net-http/httpexceptions/initialize_spec.rb
new file mode 100644
index 00000000000000..5316cca69dde0c
--- /dev/null
+++ b/spec/ruby/library/net-http/httpexceptions/initialize_spec.rb
@@ -0,0 +1,17 @@
+require_relative '../../../spec_helper'
+require 'net/http'
+require_relative 'fixtures/classes'
+
+describe "Net::HTTPExceptions#initialize when passed message, response" do
+  before :each do
+    @exception = NetHTTPExceptionsSpecs::Simple.new("error message", "a http response")
+  end
+
+  it "calls super with the passed message" do
+    @exception.message.should == "error message"
+  end
+
+  it "sets self's response to the passed response" do
+    @exception.response.should == "a http response"
+  end
+end
diff --git a/spec/ruby/library/net-http/httpexceptions/response_spec.rb b/spec/ruby/library/net-http/httpexceptions/response_spec.rb
new file mode 100644
index 00000000000000..d718b1ae214c85
--- /dev/null
+++ b/spec/ruby/library/net-http/httpexceptions/response_spec.rb
@@ -0,0 +1,10 @@
+require_relative '../../../spec_helper'
+require 'net/http'
+require_relative 'fixtures/classes'
+
+describe "Net::HTTPExceptions#response" do
+  it "returns self's response" do
+    exception = NetHTTPExceptionsSpecs::Simple.new("error message", "a http response")
+    exception.response.should == "a http response"
+  end
+end
diff --git a/spec/ruby/library/net/http/httpgenericrequest/body_exist_spec.rb b/spec/ruby/library/net-http/httpgenericrequest/body_exist_spec.rb
similarity index 93%
rename from spec/ruby/library/net/http/httpgenericrequest/body_exist_spec.rb
rename to spec/ruby/library/net-http/httpgenericrequest/body_exist_spec.rb
index 7d081939b873e3..6c886499ca7ff8 100644
--- a/spec/ruby/library/net/http/httpgenericrequest/body_exist_spec.rb
+++ b/spec/ruby/library/net-http/httpgenericrequest/body_exist_spec.rb
@@ -1,4 +1,4 @@
-require_relative '../../../../spec_helper'
+require_relative '../../../spec_helper'
 require 'net/http'
 
 describe "Net::HTTPGenericRequest#body_exist?" do
diff --git a/spec/ruby/library/net-http/httpgenericrequest/body_spec.rb b/spec/ruby/library/net-http/httpgenericrequest/body_spec.rb
new file mode 100644
index 00000000000000..5f7315f303b892
--- /dev/null
+++ b/spec/ruby/library/net-http/httpgenericrequest/body_spec.rb
@@ -0,0 +1,30 @@
+require_relative '../../../spec_helper'
+require 'net/http'
+require "stringio"
+
+describe "Net::HTTPGenericRequest#body" do
+  it "returns self's request body" do
+    request = Net::HTTPGenericRequest.new("POST", true, true, "/some/path")
+    request.body.should be_nil
+
+    request.body = "Some Content"
+    request.body.should == "Some Content"
+  end
+end
+
+describe "Net::HTTPGenericRequest#body=" do
+  before :each do
+    @request = Net::HTTPGenericRequest.new("POST", true, true, "/some/path")
+  end
+
+  it "sets self's body content to the passed String" do
+    @request.body = "Some Content"
+    @request.body.should == "Some Content"
+  end
+
+  it "sets self's body stream to nil" do
+    @request.body_stream = StringIO.new("")
+    @request.body = "Some Content"
+    @request.body_stream.should be_nil
+  end
+end
diff --git a/spec/ruby/library/net/http/httpgenericrequest/body_stream_spec.rb b/spec/ruby/library/net-http/httpgenericrequest/body_stream_spec.rb
similarity index 95%
rename from spec/ruby/library/net/http/httpgenericrequest/body_stream_spec.rb
rename to spec/ruby/library/net-http/httpgenericrequest/body_stream_spec.rb
index c2a60e6836dd91..dea1c8c8834dfc 100644
--- a/spec/ruby/library/net/http/httpgenericrequest/body_stream_spec.rb
+++ b/spec/ruby/library/net-http/httpgenericrequest/body_stream_spec.rb
@@ -1,4 +1,4 @@
-require_relative '../../../../spec_helper'
+require_relative '../../../spec_helper'
 require 'net/http'
 require "stringio"
 
diff --git a/spec/ruby/library/net-http/httpgenericrequest/exec_spec.rb b/spec/ruby/library/net-http/httpgenericrequest/exec_spec.rb
new file mode 100644
index 00000000000000..0912e5a71f0e71
--- /dev/null
+++ b/spec/ruby/library/net-http/httpgenericrequest/exec_spec.rb
@@ -0,0 +1,135 @@
+require_relative '../../../spec_helper'
+require 'net/http'
+require "stringio"
+
+describe "Net::HTTPGenericRequest#exec when passed socket, version, path" do
+  before :each do
+    @socket = StringIO.new(+"")
+    @buffered_socket = Net::BufferedIO.new(@socket)
+  end
+
+  it "executes the request over the socket to the path using the HTTP version" do
+    request = Net::HTTPGenericRequest.new("POST", true, true, "/some/path")
+
+    request.exec(@buffered_socket, "1.1", "/some/path")
+    str = @socket.string
+
+    str.should =~ %r[POST /some/path HTTP/1.1\r\n]
+    str.should =~ %r[Accept: \*/\*\r\n]
+    str[-4..-1].should == "\r\n\r\n"
+
+    request = Net::HTTPGenericRequest.new("GET", true, true, "/some/path",
+                                          "Content-Type" => "text/html")
+
+    request.exec(@buffered_socket, "1.0", "/some/other/path")
+    str = @socket.string
+
+    str.should =~ %r[GET /some/other/path HTTP/1.0\r\n]
+    str.should =~ %r[Accept: \*/\*\r\n]
+    str.should =~ %r[Content-Type: text/html\r\n]
+    str[-4..-1].should == "\r\n\r\n"
+  end
+
+  describe "when a request body is set" do
+    ruby_version_is ""..."3.5" do
+      it "sets the 'Content-Type' header to 'application/x-www-form-urlencoded' unless the 'Content-Type' header is supplied" do
+        request = Net::HTTPGenericRequest.new("POST", true, true, "/some/path")
+        request.body = "Some Content"
+
+        request.exec(@buffered_socket, "1.1", "/some/other/path")
+        str = @socket.string
+
+        str.should =~ %r[POST /some/other/path HTTP/1.1\r\n]
+        str.should =~ %r[Accept: \*/\*\r\n]
+        str.should =~ %r[Content-Type: application/x-www-form-urlencoded\r\n]
+        str.should =~ %r[Content-Length: 12\r\n]
+        str[-16..-1].should == "\r\n\r\nSome Content"
+      end
+    end
+
+    it "correctly sets the 'Content-Length' header and includes the body" do
+      request = Net::HTTPGenericRequest.new("POST", true, true, "/some/path",
+                                            "Content-Type" => "text/html")
+      request.body = "Some Content"
+
+      request.exec(@buffered_socket, "1.1", "/some/other/path")
+      str = @socket.string
+
+      str.should =~ %r[POST /some/other/path HTTP/1.1\r\n]
+      str.should =~ %r[Accept: \*/\*\r\n]
+      str.should =~ %r[Content-Type: text/html\r\n]
+      str.should =~ %r[Content-Length: 12\r\n]
+      str[-16..-1].should == "\r\n\r\nSome Content"
+    end
+  end
+
+  describe "when a body stream is set" do
+    ruby_version_is ""..."3.5" do
+      it "sets the 'Content-Type' header to 'application/x-www-form-urlencoded' unless the 'Content-Type' header is supplied" do
+        request = Net::HTTPGenericRequest.new("POST", true, true, "/some/path",
+                                              "Content-Length" => "10")
+        request.body_stream = StringIO.new("a" * 20)
+
+        request.exec(@buffered_socket, "1.1", "/some/other/path")
+        str = @socket.string
+
+        str.should =~ %r[POST /some/other/path HTTP/1.1\r\n]
+        str.should =~ %r[Accept: \*/\*\r\n]
+        str.should =~ %r[Content-Type: application/x-www-form-urlencoded\r\n]
+        str.should =~ %r[Content-Length: 10\r\n]
+        str[-24..-1].should == "\r\n\r\naaaaaaaaaaaaaaaaaaaa"
+      end
+    end
+
+    it "sends the whole stream, regardless of the 'Content-Length' header" do
+      request = Net::HTTPGenericRequest.new("POST", true, true,"/some/path",
+                                            "Content-Type" => "text/html",
+                                            "Content-Length" => "10")
+      request.body_stream = StringIO.new("a" * 20)
+
+      request.exec(@buffered_socket, "1.1", "/some/other/path")
+      str = @socket.string
+
+      str.should =~ %r[POST /some/other/path HTTP/1.1\r\n]
+      str.should =~ %r[Accept: \*/\*\r\n]
+      str.should =~ %r[Content-Type: text/html\r\n]
+      str.should =~ %r[Content-Length: 10\r\n]
+      str[-24..-1].should == "\r\n\r\naaaaaaaaaaaaaaaaaaaa"
+    end
+
+    it "sends the request in chunks when 'Transfer-Encoding' is set to 'chunked'" do
+      request = Net::HTTPGenericRequest.new("POST", true, true, "/some/path",
+                                            "Content-Type" => "text/html",
+                                            "Transfer-Encoding" => "chunked")
+      datasize = 1024 * 10
+      request.body_stream = StringIO.new("a" * datasize)
+
+      request.exec(@buffered_socket, "1.1", "/some/other/path")
+      str = @socket.string
+
+      str.should =~ %r[POST /some/other/path HTTP/1.1\r\n]
+      str.should =~ %r[Accept: \*/\*\r\n]
+      str.should =~ %r[Content-Type: text/html\r\n]
+      str.should =~ %r[Transfer-Encoding: chunked\r\n]
+      str =~ %r[\r\n\r\n]
+      str = $'
+      while datasize > 0
+        chunk_size_line, str = str.split(/\r\n/, 2)
+        chunk_size = chunk_size_line[/\A[0-9A-Fa-f]+/].to_i(16)
+        str.slice!(0, chunk_size).should == 'a' * chunk_size
+        datasize -= chunk_size
+        str.slice!(0, 2).should == "\r\n"
+      end
+      datasize.should == 0
+      str.should == %"0\r\n\r\n"
+    end
+
+    it "raises an ArgumentError when the 'Content-Length' is not set or 'Transfer-Encoding' is not set to 'chunked'" do
+      request = Net::HTTPGenericRequest.new("POST", true, true, "/some/path",
+                                            "Content-Type" => "text/html")
+      request.body_stream = StringIO.new("Some Content")
+
+      -> { request.exec(@buffered_socket, "1.1", "/some/other/path") }.should raise_error(ArgumentError)
+    end
+  end
+end
diff --git a/spec/ruby/library/net-http/httpgenericrequest/inspect_spec.rb b/spec/ruby/library/net-http/httpgenericrequest/inspect_spec.rb
new file mode 100644
index 00000000000000..d03b6e6953910b
--- /dev/null
+++ b/spec/ruby/library/net-http/httpgenericrequest/inspect_spec.rb
@@ -0,0 +1,25 @@
+require_relative '../../../spec_helper'
+require 'net/http'
+
+describe "Net::HTTPGenericRequest#inspect" do
+  it "returns a String representation of self" do
+    request = Net::HTTPGenericRequest.new("POST", true, true, "/some/path")
+    request.inspect.should == "#<Net::HTTPGenericRequest POST>"
+
+    request = Net::HTTPGenericRequest.new("GET", false, true, "/some/path")
+    request.inspect.should == "#<Net::HTTPGenericRequest GET>"
+
+    request = Net::HTTPGenericRequest.new("BLA", true, true, "/some/path")
+    request.inspect.should == "#<Net::HTTPGenericRequest BLA>"
+
+    # Subclasses
+    request = Net::HTTP::Get.new("/some/path")
+    request.inspect.should == "#<Net::HTTP::Get GET>"
+
+    request = Net::HTTP::Post.new("/some/path")
+    request.inspect.should == "#<Net::HTTP::Post POST>"
+
+    request = Net::HTTP::Trace.new("/some/path")
+    request.inspect.should == "#<Net::HTTP::Trace TRACE>"
+  end
+end
diff --git a/spec/ruby/library/net/http/httpgenericrequest/method_spec.rb b/spec/ruby/library/net-http/httpgenericrequest/method_spec.rb
similarity index 91%
rename from spec/ruby/library/net/http/httpgenericrequest/method_spec.rb
rename to spec/ruby/library/net-http/httpgenericrequest/method_spec.rb
index 3f7c2cbf2bb353..794bd328cddd3c 100644
--- a/spec/ruby/library/net/http/httpgenericrequest/method_spec.rb
+++ b/spec/ruby/library/net-http/httpgenericrequest/method_spec.rb
@@ -1,4 +1,4 @@
-require_relative '../../../../spec_helper'
+require_relative '../../../spec_helper'
 require 'net/http'
 
 describe "Net::HTTPGenericRequest#method" do
diff --git a/spec/ruby/library/net/http/httpgenericrequest/path_spec.rb b/spec/ruby/library/net-http/httpgenericrequest/path_spec.rb
similarity index 89%
rename from spec/ruby/library/net/http/httpgenericrequest/path_spec.rb
rename to spec/ruby/library/net-http/httpgenericrequest/path_spec.rb
index fc4cf9af5392f7..a9fac3f67ef57b 100644
--- a/spec/ruby/library/net/http/httpgenericrequest/path_spec.rb
+++ b/spec/ruby/library/net-http/httpgenericrequest/path_spec.rb
@@ -1,4 +1,4 @@
-require_relative '../../../../spec_helper'
+require_relative '../../../spec_helper'
 require 'net/http'
 
 describe "Net::HTTPGenericRequest#path" do
diff --git a/spec/ruby/library/net/http/httpgenericrequest/request_body_permitted_spec.rb b/spec/ruby/library/net-http/httpgenericrequest/request_body_permitted_spec.rb
similarity index 90%
rename from spec/ruby/library/net/http/httpgenericrequest/request_body_permitted_spec.rb
rename to spec/ruby/library/net-http/httpgenericrequest/request_body_permitted_spec.rb
index 50cd1ff637b5fa..1713b59baf5c46 100644
--- a/spec/ruby/library/net/http/httpgenericrequest/request_body_permitted_spec.rb
+++ b/spec/ruby/library/net-http/httpgenericrequest/request_body_permitted_spec.rb
@@ -1,4 +1,4 @@
-require_relative '../../../../spec_helper'
+require_relative '../../../spec_helper'
 require 'net/http'
 
 describe "Net::HTTPGenericRequest#request_body_permitted?" do
diff --git a/spec/ruby/library/net/http/httpgenericrequest/response_body_permitted_spec.rb b/spec/ruby/library/net-http/httpgenericrequest/response_body_permitted_spec.rb
similarity index 90%
rename from spec/ruby/library/net/http/httpgenericrequest/response_body_permitted_spec.rb
rename to spec/ruby/library/net-http/httpgenericrequest/response_body_permitted_spec.rb
index 0c4165d0ab32bc..2f0751c344efa2 100644
--- a/spec/ruby/library/net/http/httpgenericrequest/response_body_permitted_spec.rb
+++ b/spec/ruby/library/net-http/httpgenericrequest/response_body_permitted_spec.rb
@@ -1,4 +1,4 @@
-require_relative '../../../../spec_helper'
+require_relative '../../../spec_helper'
 require 'net/http'
 
 describe "Net::HTTPGenericRequest#response_body_permitted?" do
diff --git a/spec/ruby/library/net/http/httpgenericrequest/set_body_internal_spec.rb b/spec/ruby/library/net-http/httpgenericrequest/set_body_internal_spec.rb
similarity index 94%
rename from spec/ruby/library/net/http/httpgenericrequest/set_body_internal_spec.rb
rename to spec/ruby/library/net-http/httpgenericrequest/set_body_internal_spec.rb
index 7494c69173d79e..358aa6cde34877 100644
--- a/spec/ruby/library/net/http/httpgenericrequest/set_body_internal_spec.rb
+++ b/spec/ruby/library/net-http/httpgenericrequest/set_body_internal_spec.rb
@@ -1,4 +1,4 @@
-require_relative '../../../../spec_helper'
+require_relative '../../../spec_helper'
 require 'net/http'
 
 describe "Net::HTTPGenericRequest#set_body_internal when passed string" do
diff --git a/spec/ruby/library/net/http/httpheader/add_field_spec.rb b/spec/ruby/library/net-http/httpheader/add_field_spec.rb
similarity index 95%
rename from spec/ruby/library/net/http/httpheader/add_field_spec.rb
rename to spec/ruby/library/net-http/httpheader/add_field_spec.rb
index 882d5ac5bbc0fc..8cd3d33517f0bf 100644
--- a/spec/ruby/library/net/http/httpheader/add_field_spec.rb
+++ b/spec/ruby/library/net-http/httpheader/add_field_spec.rb
@@ -1,4 +1,4 @@
-require_relative '../../../../spec_helper'
+require_relative '../../../spec_helper'
 require 'net/http'
 require_relative 'fixtures/classes'
 
diff --git a/spec/ruby/library/net/http/httpheader/basic_auth_spec.rb b/spec/ruby/library/net-http/httpheader/basic_auth_spec.rb
similarity index 90%
rename from spec/ruby/library/net/http/httpheader/basic_auth_spec.rb
rename to spec/ruby/library/net-http/httpheader/basic_auth_spec.rb
index fa2a710fe16917..db7ca84d137bf4 100644
--- a/spec/ruby/library/net/http/httpheader/basic_auth_spec.rb
+++ b/spec/ruby/library/net-http/httpheader/basic_auth_spec.rb
@@ -1,4 +1,4 @@
-require_relative '../../../../spec_helper'
+require_relative '../../../spec_helper'
 require 'net/http'
 require_relative 'fixtures/classes'
 
diff --git a/spec/ruby/library/net/http/httpheader/canonical_each_spec.rb b/spec/ruby/library/net-http/httpheader/canonical_each_spec.rb
similarity index 83%
rename from spec/ruby/library/net/http/httpheader/canonical_each_spec.rb
rename to spec/ruby/library/net-http/httpheader/canonical_each_spec.rb
index 0dddd3049b5cd5..64a5cae89e2dc0 100644
--- a/spec/ruby/library/net/http/httpheader/canonical_each_spec.rb
+++ b/spec/ruby/library/net-http/httpheader/canonical_each_spec.rb
@@ -1,4 +1,4 @@
-require_relative '../../../../spec_helper'
+require_relative '../../../spec_helper'
 require 'net/http'
 require_relative 'fixtures/classes'
 require_relative 'shared/each_capitalized'
diff --git a/spec/ruby/library/net/http/httpheader/chunked_spec.rb b/spec/ruby/library/net-http/httpheader/chunked_spec.rb
similarity index 92%
rename from spec/ruby/library/net/http/httpheader/chunked_spec.rb
rename to spec/ruby/library/net-http/httpheader/chunked_spec.rb
index 96b758981b55b9..b32a0aab3882dc 100644
--- a/spec/ruby/library/net/http/httpheader/chunked_spec.rb
+++ b/spec/ruby/library/net-http/httpheader/chunked_spec.rb
@@ -1,4 +1,4 @@
-require_relative '../../../../spec_helper'
+require_relative '../../../spec_helper'
 require 'net/http'
 require_relative 'fixtures/classes'
 
diff --git a/spec/ruby/library/net/http/httpheader/content_length_spec.rb b/spec/ruby/library/net-http/httpheader/content_length_spec.rb
similarity index 97%
rename from spec/ruby/library/net/http/httpheader/content_length_spec.rb
rename to spec/ruby/library/net-http/httpheader/content_length_spec.rb
index e344817e823795..f05c5f8d8b3f0e 100644
--- a/spec/ruby/library/net/http/httpheader/content_length_spec.rb
+++ b/spec/ruby/library/net-http/httpheader/content_length_spec.rb
@@ -1,4 +1,4 @@
-require_relative '../../../../spec_helper'
+require_relative '../../../spec_helper'
 require 'net/http'
 require_relative 'fixtures/classes'
 
diff --git a/spec/ruby/library/net/http/httpheader/content_range_spec.rb b/spec/ruby/library/net-http/httpheader/content_range_spec.rb
similarity index 96%
rename from spec/ruby/library/net/http/httpheader/content_range_spec.rb
rename to spec/ruby/library/net-http/httpheader/content_range_spec.rb
index ba75f9a9a1394b..09737141a5c4e4 100644
--- a/spec/ruby/library/net/http/httpheader/content_range_spec.rb
+++ b/spec/ruby/library/net-http/httpheader/content_range_spec.rb
@@ -1,4 +1,4 @@
-require_relative '../../../../spec_helper'
+require_relative '../../../spec_helper'
 require 'net/http'
 require_relative 'fixtures/classes'
 
diff --git a/spec/ruby/library/net/http/httpheader/content_type_spec.rb b/spec/ruby/library/net-http/httpheader/content_type_spec.rb
similarity index 94%
rename from spec/ruby/library/net/http/httpheader/content_type_spec.rb
rename to spec/ruby/library/net-http/httpheader/content_type_spec.rb
index 1f8b4ba326665d..a6e1ae1093a7d2 100644
--- a/spec/ruby/library/net/http/httpheader/content_type_spec.rb
+++ b/spec/ruby/library/net-http/httpheader/content_type_spec.rb
@@ -1,4 +1,4 @@
-require_relative '../../../../spec_helper'
+require_relative '../../../spec_helper'
 require 'net/http'
 require_relative 'fixtures/classes'
 require_relative 'shared/set_content_type'
diff --git a/spec/ruby/library/net-http/httpheader/delete_spec.rb b/spec/ruby/library/net-http/httpheader/delete_spec.rb
new file mode 100644
index 00000000000000..8d929dbd862cf1
--- /dev/null
+++ b/spec/ruby/library/net-http/httpheader/delete_spec.rb
@@ -0,0 +1,30 @@
+require_relative '../../../spec_helper'
+require 'net/http'
+require_relative 'fixtures/classes'
+
+describe "Net::HTTPHeader#delete when passed key" do
+  before :each do
+    @headers = NetHTTPHeaderSpecs::Example.new
+  end
+
+  it "removes the header entry with the passed key" do
+    @headers["My-Header"] = "test"
+    @headers.delete("My-Header")
+
+    @headers["My-Header"].should be_nil
+    @headers.size.should eql(0)
+  end
+
+  it "returns the removed values" do
+    @headers["My-Header"] = "test"
+    @headers.delete("My-Header").should == ["test"]
+  end
+
+  it "is case-insensitive" do
+    @headers["My-Header"] = "test"
+    @headers.delete("my-header")
+
+    @headers["My-Header"].should be_nil
+    @headers.size.should eql(0)
+  end
+end
diff --git a/spec/ruby/library/net/http/httpheader/each_capitalized_name_spec.rb b/spec/ruby/library/net-http/httpheader/each_capitalized_name_spec.rb
similarity index 95%
rename from spec/ruby/library/net/http/httpheader/each_capitalized_name_spec.rb
rename to spec/ruby/library/net-http/httpheader/each_capitalized_name_spec.rb
index 1af2c6939cf0d6..27713577f97729 100644
--- a/spec/ruby/library/net/http/httpheader/each_capitalized_name_spec.rb
+++ b/spec/ruby/library/net-http/httpheader/each_capitalized_name_spec.rb
@@ -1,4 +1,4 @@
-require_relative '../../../../spec_helper'
+require_relative '../../../spec_helper'
 require 'net/http'
 require_relative 'fixtures/classes'
 
diff --git a/spec/ruby/library/net/http/httpheader/each_capitalized_spec.rb b/spec/ruby/library/net-http/httpheader/each_capitalized_spec.rb
similarity index 83%
rename from spec/ruby/library/net/http/httpheader/each_capitalized_spec.rb
rename to spec/ruby/library/net-http/httpheader/each_capitalized_spec.rb
index 961a2d051f2d6f..1e853995ea660a 100644
--- a/spec/ruby/library/net/http/httpheader/each_capitalized_spec.rb
+++ b/spec/ruby/library/net-http/httpheader/each_capitalized_spec.rb
@@ -1,4 +1,4 @@
-require_relative '../../../../spec_helper'
+require_relative '../../../spec_helper'
 require 'net/http'
 require_relative 'fixtures/classes'
 require_relative 'shared/each_capitalized'
diff --git a/spec/ruby/library/net/http/httpheader/each_header_spec.rb b/spec/ruby/library/net-http/httpheader/each_header_spec.rb
similarity index 82%
rename from spec/ruby/library/net/http/httpheader/each_header_spec.rb
rename to spec/ruby/library/net-http/httpheader/each_header_spec.rb
index 19634a001b3629..869feebacfe9e9 100644
--- a/spec/ruby/library/net/http/httpheader/each_header_spec.rb
+++ b/spec/ruby/library/net-http/httpheader/each_header_spec.rb
@@ -1,4 +1,4 @@
-require_relative '../../../../spec_helper'
+require_relative '../../../spec_helper'
 require 'net/http'
 require_relative 'fixtures/classes'
 require_relative 'shared/each_header'
diff --git a/spec/ruby/library/net/http/httpheader/each_key_spec.rb b/spec/ruby/library/net-http/httpheader/each_key_spec.rb
similarity index 81%
rename from spec/ruby/library/net/http/httpheader/each_key_spec.rb
rename to spec/ruby/library/net-http/httpheader/each_key_spec.rb
index ebb17d2eac47f2..1ad145629fd0e2 100644
--- a/spec/ruby/library/net/http/httpheader/each_key_spec.rb
+++ b/spec/ruby/library/net-http/httpheader/each_key_spec.rb
@@ -1,4 +1,4 @@
-require_relative '../../../../spec_helper'
+require_relative '../../../spec_helper'
 require 'net/http'
 require_relative 'fixtures/classes'
 require_relative 'shared/each_name'
diff --git a/spec/ruby/library/net/http/httpheader/each_name_spec.rb b/spec/ruby/library/net-http/httpheader/each_name_spec.rb
similarity index 81%
rename from spec/ruby/library/net/http/httpheader/each_name_spec.rb
rename to spec/ruby/library/net-http/httpheader/each_name_spec.rb
index f4533ebcfb4de9..f819bd989d43b7 100644
--- a/spec/ruby/library/net/http/httpheader/each_name_spec.rb
+++ b/spec/ruby/library/net-http/httpheader/each_name_spec.rb
@@ -1,4 +1,4 @@
-require_relative '../../../../spec_helper'
+require_relative '../../../spec_helper'
 require 'net/http'
 require_relative 'fixtures/classes'
 require_relative 'shared/each_name'
diff --git a/spec/ruby/library/net-http/httpheader/each_spec.rb b/spec/ruby/library/net-http/httpheader/each_spec.rb
new file mode 100644
index 00000000000000..ff37249d0ac66f
--- /dev/null
+++ b/spec/ruby/library/net-http/httpheader/each_spec.rb
@@ -0,0 +1,8 @@
+require_relative '../../../spec_helper'
+require 'net/http'
+require_relative 'fixtures/classes'
+require_relative 'shared/each_header'
+
+describe "Net::HTTPHeader#each" do
+  it_behaves_like :net_httpheader_each_header, :each
+end
diff --git a/spec/ruby/library/net/http/httpheader/each_value_spec.rb b/spec/ruby/library/net-http/httpheader/each_value_spec.rb
similarity index 95%
rename from spec/ruby/library/net/http/httpheader/each_value_spec.rb
rename to spec/ruby/library/net-http/httpheader/each_value_spec.rb
index 3224de77036d36..b71df58c658ccd 100644
--- a/spec/ruby/library/net/http/httpheader/each_value_spec.rb
+++ b/spec/ruby/library/net-http/httpheader/each_value_spec.rb
@@ -1,4 +1,4 @@
-require_relative '../../../../spec_helper'
+require_relative '../../../spec_helper'
 require 'net/http'
 require_relative 'fixtures/classes'
 
diff --git a/spec/ruby/library/net/http/httpheader/element_reference_spec.rb b/spec/ruby/library/net-http/httpheader/element_reference_spec.rb
similarity index 96%
rename from spec/ruby/library/net/http/httpheader/element_reference_spec.rb
rename to spec/ruby/library/net-http/httpheader/element_reference_spec.rb
index 4a35e20d2080b9..1003c41af93acb 100644
--- a/spec/ruby/library/net/http/httpheader/element_reference_spec.rb
+++ b/spec/ruby/library/net-http/httpheader/element_reference_spec.rb
@@ -1,4 +1,4 @@
-require_relative '../../../../spec_helper'
+require_relative '../../../spec_helper'
 require 'net/http'
 require_relative 'fixtures/classes'
 
diff --git a/spec/ruby/library/net/http/httpheader/element_set_spec.rb b/spec/ruby/library/net-http/httpheader/element_set_spec.rb
similarity index 96%
rename from spec/ruby/library/net/http/httpheader/element_set_spec.rb
rename to spec/ruby/library/net-http/httpheader/element_set_spec.rb
index e9ad64fafcbeb6..376df2f977dc86 100644
--- a/spec/ruby/library/net/http/httpheader/element_set_spec.rb
+++ b/spec/ruby/library/net-http/httpheader/element_set_spec.rb
@@ -1,4 +1,4 @@
-require_relative '../../../../spec_helper'
+require_relative '../../../spec_helper'
 require 'net/http'
 require_relative 'fixtures/classes'
 
diff --git a/spec/ruby/library/net/http/httpheader/fetch_spec.rb b/spec/ruby/library/net-http/httpheader/fetch_spec.rb
similarity index 98%
rename from spec/ruby/library/net/http/httpheader/fetch_spec.rb
rename to spec/ruby/library/net-http/httpheader/fetch_spec.rb
index ea15679acb0aaa..58c69c037736fd 100644
--- a/spec/ruby/library/net/http/httpheader/fetch_spec.rb
+++ b/spec/ruby/library/net-http/httpheader/fetch_spec.rb
@@ -1,4 +1,4 @@
-require_relative '../../../../spec_helper'
+require_relative '../../../spec_helper'
 require 'net/http'
 require_relative 'fixtures/classes'
 
diff --git a/spec/ruby/library/net/http/httpheader/fixtures/classes.rb b/spec/ruby/library/net-http/httpheader/fixtures/classes.rb
similarity index 100%
rename from spec/ruby/library/net/http/httpheader/fixtures/classes.rb
rename to spec/ruby/library/net-http/httpheader/fixtures/classes.rb
diff --git a/spec/ruby/library/net/http/httpheader/form_data_spec.rb b/spec/ruby/library/net-http/httpheader/form_data_spec.rb
similarity index 82%
rename from spec/ruby/library/net/http/httpheader/form_data_spec.rb
rename to spec/ruby/library/net-http/httpheader/form_data_spec.rb
index 9b29a03159f61b..acd913f53a97a5 100644
--- a/spec/ruby/library/net/http/httpheader/form_data_spec.rb
+++ b/spec/ruby/library/net-http/httpheader/form_data_spec.rb
@@ -1,4 +1,4 @@
-require_relative '../../../../spec_helper'
+require_relative '../../../spec_helper'
 require 'net/http'
 require_relative 'fixtures/classes'
 require_relative 'shared/set_form_data'
diff --git a/spec/ruby/library/net/http/httpheader/get_fields_spec.rb b/spec/ruby/library/net-http/httpheader/get_fields_spec.rb
similarity index 96%
rename from spec/ruby/library/net/http/httpheader/get_fields_spec.rb
rename to spec/ruby/library/net-http/httpheader/get_fields_spec.rb
index 1b623bf2a35e56..0278bcede21721 100644
--- a/spec/ruby/library/net/http/httpheader/get_fields_spec.rb
+++ b/spec/ruby/library/net-http/httpheader/get_fields_spec.rb
@@ -1,4 +1,4 @@
-require_relative '../../../../spec_helper'
+require_relative '../../../spec_helper'
 require 'net/http'
 require_relative 'fixtures/classes'
 
diff --git a/spec/ruby/library/net/http/httpheader/initialize_http_header_spec.rb b/spec/ruby/library/net-http/httpheader/initialize_http_header_spec.rb
similarity index 94%
rename from spec/ruby/library/net/http/httpheader/initialize_http_header_spec.rb
rename to spec/ruby/library/net-http/httpheader/initialize_http_header_spec.rb
index efc5e7d0b2c6b0..f9e6d208e5f689 100644
--- a/spec/ruby/library/net/http/httpheader/initialize_http_header_spec.rb
+++ b/spec/ruby/library/net-http/httpheader/initialize_http_header_spec.rb
@@ -1,4 +1,4 @@
-require_relative '../../../../spec_helper'
+require_relative '../../../spec_helper'
 require 'net/http'
 require_relative 'fixtures/classes'
 
diff --git a/spec/ruby/library/net/http/httpheader/key_spec.rb b/spec/ruby/library/net-http/httpheader/key_spec.rb
similarity index 92%
rename from spec/ruby/library/net/http/httpheader/key_spec.rb
rename to spec/ruby/library/net-http/httpheader/key_spec.rb
index 90990242293e34..2b7aeb9c2adc60 100644
--- a/spec/ruby/library/net/http/httpheader/key_spec.rb
+++ b/spec/ruby/library/net-http/httpheader/key_spec.rb
@@ -1,4 +1,4 @@
-require_relative '../../../../spec_helper'
+require_relative '../../../spec_helper'
 require 'net/http'
 require_relative 'fixtures/classes'
 
diff --git a/spec/ruby/library/net-http/httpheader/length_spec.rb b/spec/ruby/library/net-http/httpheader/length_spec.rb
new file mode 100644
index 00000000000000..57e32742e478e0
--- /dev/null
+++ b/spec/ruby/library/net-http/httpheader/length_spec.rb
@@ -0,0 +1,8 @@
+require_relative '../../../spec_helper'
+require 'net/http'
+require_relative 'fixtures/classes'
+require_relative 'shared/size'
+
+describe "Net::HTTPHeader#length" do
+  it_behaves_like :net_httpheader_size, :length
+end
diff --git a/spec/ruby/library/net/http/httpheader/main_type_spec.rb b/spec/ruby/library/net-http/httpheader/main_type_spec.rb
similarity index 93%
rename from spec/ruby/library/net/http/httpheader/main_type_spec.rb
rename to spec/ruby/library/net-http/httpheader/main_type_spec.rb
index 3e18de6b5bf993..4dd551d8f4fc86 100644
--- a/spec/ruby/library/net/http/httpheader/main_type_spec.rb
+++ b/spec/ruby/library/net-http/httpheader/main_type_spec.rb
@@ -1,4 +1,4 @@
-require_relative '../../../../spec_helper'
+require_relative '../../../spec_helper'
 require 'net/http'
 require_relative 'fixtures/classes'
 
diff --git a/spec/ruby/library/net/http/httpheader/proxy_basic_auth_spec.rb b/spec/ruby/library/net-http/httpheader/proxy_basic_auth_spec.rb
similarity index 90%
rename from spec/ruby/library/net/http/httpheader/proxy_basic_auth_spec.rb
rename to spec/ruby/library/net-http/httpheader/proxy_basic_auth_spec.rb
index 8b576ee164e9a2..d9f6afc5a73014 100644
--- a/spec/ruby/library/net/http/httpheader/proxy_basic_auth_spec.rb
+++ b/spec/ruby/library/net-http/httpheader/proxy_basic_auth_spec.rb
@@ -1,4 +1,4 @@
-require_relative '../../../../spec_helper'
+require_relative '../../../spec_helper'
 require 'net/http'
 require_relative 'fixtures/classes'
 
diff --git a/spec/ruby/library/net/http/httpheader/range_length_spec.rb b/spec/ruby/library/net-http/httpheader/range_length_spec.rb
similarity index 96%
rename from spec/ruby/library/net/http/httpheader/range_length_spec.rb
rename to spec/ruby/library/net-http/httpheader/range_length_spec.rb
index b8fce4f690b40b..77323ac8726f42 100644
--- a/spec/ruby/library/net/http/httpheader/range_length_spec.rb
+++ b/spec/ruby/library/net-http/httpheader/range_length_spec.rb
@@ -1,4 +1,4 @@
-require_relative '../../../../spec_helper'
+require_relative '../../../spec_helper'
 require 'net/http'
 require_relative 'fixtures/classes'
 
diff --git a/spec/ruby/library/net/http/httpheader/range_spec.rb b/spec/ruby/library/net-http/httpheader/range_spec.rb
similarity index 97%
rename from spec/ruby/library/net/http/httpheader/range_spec.rb
rename to spec/ruby/library/net-http/httpheader/range_spec.rb
index 005177f6be3444..2de80a825e7fd3 100644
--- a/spec/ruby/library/net/http/httpheader/range_spec.rb
+++ b/spec/ruby/library/net-http/httpheader/range_spec.rb
@@ -1,4 +1,4 @@
-require_relative '../../../../spec_helper'
+require_relative '../../../spec_helper'
 require 'net/http'
 require_relative 'fixtures/classes'
 require_relative 'shared/set_range'
diff --git a/spec/ruby/library/net/http/httpheader/set_content_type_spec.rb b/spec/ruby/library/net-http/httpheader/set_content_type_spec.rb
similarity index 83%
rename from spec/ruby/library/net/http/httpheader/set_content_type_spec.rb
rename to spec/ruby/library/net-http/httpheader/set_content_type_spec.rb
index 125f7a7e0dd99b..7ec4f90b8e5274 100644
--- a/spec/ruby/library/net/http/httpheader/set_content_type_spec.rb
+++ b/spec/ruby/library/net-http/httpheader/set_content_type_spec.rb
@@ -1,4 +1,4 @@
-require_relative '../../../../spec_helper'
+require_relative '../../../spec_helper'
 require 'net/http'
 require_relative 'fixtures/classes'
 require_relative 'shared/set_content_type'
diff --git a/spec/ruby/library/net/http/httpheader/set_form_data_spec.rb b/spec/ruby/library/net-http/httpheader/set_form_data_spec.rb
similarity index 82%
rename from spec/ruby/library/net/http/httpheader/set_form_data_spec.rb
rename to spec/ruby/library/net-http/httpheader/set_form_data_spec.rb
index 14c66ae01c54ac..7aac19f04510e7 100644
--- a/spec/ruby/library/net/http/httpheader/set_form_data_spec.rb
+++ b/spec/ruby/library/net-http/httpheader/set_form_data_spec.rb
@@ -1,4 +1,4 @@
-require_relative '../../../../spec_helper'
+require_relative '../../../spec_helper'
 require 'net/http'
 require_relative 'fixtures/classes'
 require_relative 'shared/set_form_data'
diff --git a/spec/ruby/library/net/http/httpheader/set_range_spec.rb b/spec/ruby/library/net-http/httpheader/set_range_spec.rb
similarity index 81%
rename from spec/ruby/library/net/http/httpheader/set_range_spec.rb
rename to spec/ruby/library/net-http/httpheader/set_range_spec.rb
index 85b9c50422bb40..0f98de55e62d86 100644
--- a/spec/ruby/library/net/http/httpheader/set_range_spec.rb
+++ b/spec/ruby/library/net-http/httpheader/set_range_spec.rb
@@ -1,4 +1,4 @@
-require_relative '../../../../spec_helper'
+require_relative '../../../spec_helper'
 require 'net/http'
 require_relative 'fixtures/classes'
 require_relative 'shared/set_range'
diff --git a/spec/ruby/library/net/http/httpheader/shared/each_capitalized.rb b/spec/ruby/library/net-http/httpheader/shared/each_capitalized.rb
similarity index 100%
rename from spec/ruby/library/net/http/httpheader/shared/each_capitalized.rb
rename to spec/ruby/library/net-http/httpheader/shared/each_capitalized.rb
diff --git a/spec/ruby/library/net/http/httpheader/shared/each_header.rb b/spec/ruby/library/net-http/httpheader/shared/each_header.rb
similarity index 100%
rename from spec/ruby/library/net/http/httpheader/shared/each_header.rb
rename to spec/ruby/library/net-http/httpheader/shared/each_header.rb
diff --git a/spec/ruby/library/net/http/httpheader/shared/each_name.rb b/spec/ruby/library/net-http/httpheader/shared/each_name.rb
similarity index 100%
rename from spec/ruby/library/net/http/httpheader/shared/each_name.rb
rename to spec/ruby/library/net-http/httpheader/shared/each_name.rb
diff --git a/spec/ruby/library/net/http/httpheader/shared/set_content_type.rb b/spec/ruby/library/net-http/httpheader/shared/set_content_type.rb
similarity index 100%
rename from spec/ruby/library/net/http/httpheader/shared/set_content_type.rb
rename to spec/ruby/library/net-http/httpheader/shared/set_content_type.rb
diff --git a/spec/ruby/library/net/http/httpheader/shared/set_form_data.rb b/spec/ruby/library/net-http/httpheader/shared/set_form_data.rb
similarity index 100%
rename from spec/ruby/library/net/http/httpheader/shared/set_form_data.rb
rename to spec/ruby/library/net-http/httpheader/shared/set_form_data.rb
diff --git a/spec/ruby/library/net/http/httpheader/shared/set_range.rb b/spec/ruby/library/net-http/httpheader/shared/set_range.rb
similarity index 100%
rename from spec/ruby/library/net/http/httpheader/shared/set_range.rb
rename to spec/ruby/library/net-http/httpheader/shared/set_range.rb
diff --git a/spec/ruby/library/net/http/httpheader/shared/size.rb b/spec/ruby/library/net-http/httpheader/shared/size.rb
similarity index 100%
rename from spec/ruby/library/net/http/httpheader/shared/size.rb
rename to spec/ruby/library/net-http/httpheader/shared/size.rb
diff --git a/spec/ruby/library/net-http/httpheader/size_spec.rb b/spec/ruby/library/net-http/httpheader/size_spec.rb
new file mode 100644
index 00000000000000..210060ce210fa5
--- /dev/null
+++ b/spec/ruby/library/net-http/httpheader/size_spec.rb
@@ -0,0 +1,8 @@
+require_relative '../../../spec_helper'
+require 'net/http'
+require_relative 'fixtures/classes'
+require_relative 'shared/size'
+
+describe "Net::HTTPHeader#size" do
+  it_behaves_like :net_httpheader_size, :size
+end
diff --git a/spec/ruby/library/net/http/httpheader/sub_type_spec.rb b/spec/ruby/library/net-http/httpheader/sub_type_spec.rb
similarity index 95%
rename from spec/ruby/library/net/http/httpheader/sub_type_spec.rb
rename to spec/ruby/library/net-http/httpheader/sub_type_spec.rb
index 3c73ca00272c1f..b39b57fe8d430d 100644
--- a/spec/ruby/library/net/http/httpheader/sub_type_spec.rb
+++ b/spec/ruby/library/net-http/httpheader/sub_type_spec.rb
@@ -1,4 +1,4 @@
-require_relative '../../../../spec_helper'
+require_relative '../../../spec_helper'
 require 'net/http'
 require_relative 'fixtures/classes'
 
diff --git a/spec/ruby/library/net/http/httpheader/to_hash_spec.rb b/spec/ruby/library/net-http/httpheader/to_hash_spec.rb
similarity index 94%
rename from spec/ruby/library/net/http/httpheader/to_hash_spec.rb
rename to spec/ruby/library/net-http/httpheader/to_hash_spec.rb
index 8c1d36c30af2de..3cebc519a6c835 100644
--- a/spec/ruby/library/net/http/httpheader/to_hash_spec.rb
+++ b/spec/ruby/library/net-http/httpheader/to_hash_spec.rb
@@ -1,4 +1,4 @@
-require_relative '../../../../spec_helper'
+require_relative '../../../spec_helper'
 require 'net/http'
 require_relative 'fixtures/classes'
 
diff --git a/spec/ruby/library/net/http/httpheader/type_params_spec.rb b/spec/ruby/library/net-http/httpheader/type_params_spec.rb
similarity index 94%
rename from spec/ruby/library/net/http/httpheader/type_params_spec.rb
rename to spec/ruby/library/net-http/httpheader/type_params_spec.rb
index e77be7ea85f332..ac97e2b48c1335 100644
--- a/spec/ruby/library/net/http/httpheader/type_params_spec.rb
+++ b/spec/ruby/library/net-http/httpheader/type_params_spec.rb
@@ -1,4 +1,4 @@
-require_relative '../../../../spec_helper'
+require_relative '../../../spec_helper'
 require 'net/http'
 require_relative 'fixtures/classes'
 
diff --git a/spec/ruby/library/net-http/httprequest/initialize_spec.rb b/spec/ruby/library/net-http/httprequest/initialize_spec.rb
new file mode 100644
index 00000000000000..d009a00ed2eba2
--- /dev/null
+++ b/spec/ruby/library/net-http/httprequest/initialize_spec.rb
@@ -0,0 +1,45 @@
+require_relative '../../../spec_helper'
+require 'net/http'
+
+module NetHTTPRequestSpecs
+  class TestRequest < Net::HTTPRequest
+    METHOD = "TEST"
+    REQUEST_HAS_BODY  = false
+    RESPONSE_HAS_BODY = true
+  end
+end
+
+describe "Net::HTTPRequest#initialize" do
+  before :each do
+    @req = NetHTTPRequestSpecs::TestRequest.allocate
+  end
+
+  it "uses the METHOD constants to set the request method" do
+    @req.send(:initialize, "/some/path")
+    @req.method.should == "TEST"
+  end
+
+  it "uses the REQUEST_HAS_BODY to set whether the Request has a body or not" do
+    @req.send(:initialize, "/some/path")
+    @req.request_body_permitted?.should be_false
+  end
+
+  it "uses the RESPONSE_HAS_BODY to set whether the Response can have a body or not" do
+    @req.send(:initialize, "/some/path")
+    @req.response_body_permitted?.should be_true
+  end
+
+  describe "when passed path" do
+    it "sets self's path to the passed path" do
+      @req.send(:initialize, "/some/path")
+      @req.path.should == "/some/path"
+    end
+  end
+
+  describe "when passed path, headers" do
+    it "uses the passed headers Hash to initialize self's header entries" do
+      @req.send(:initialize, "/some/path", "Content-Type" => "text/html")
+      @req["Content-Type"].should == "text/html"
+    end
+  end
+end
diff --git a/spec/ruby/library/net/http/httpresponse/body_permitted_spec.rb b/spec/ruby/library/net-http/httpresponse/body_permitted_spec.rb
similarity index 91%
rename from spec/ruby/library/net/http/httpresponse/body_permitted_spec.rb
rename to spec/ruby/library/net-http/httpresponse/body_permitted_spec.rb
index 8ade46689fa9b1..68965de4a1868b 100644
--- a/spec/ruby/library/net/http/httpresponse/body_permitted_spec.rb
+++ b/spec/ruby/library/net-http/httpresponse/body_permitted_spec.rb
@@ -1,4 +1,4 @@
-require_relative '../../../../spec_helper'
+require_relative '../../../spec_helper'
 require 'net/http'
 
 describe "Net::HTTPResponse.body_permitted?" do
diff --git a/spec/ruby/library/net-http/httpresponse/body_spec.rb b/spec/ruby/library/net-http/httpresponse/body_spec.rb
new file mode 100644
index 00000000000000..ddfcd834c49de2
--- /dev/null
+++ b/spec/ruby/library/net-http/httpresponse/body_spec.rb
@@ -0,0 +1,7 @@
+require_relative '../../../spec_helper'
+require 'net/http'
+require_relative 'shared/body'
+
+describe "Net::HTTPResponse#body" do
+  it_behaves_like :net_httpresponse_body, :body
+end
diff --git a/spec/ruby/library/net/http/httpresponse/code_spec.rb b/spec/ruby/library/net-http/httpresponse/code_spec.rb
similarity index 94%
rename from spec/ruby/library/net/http/httpresponse/code_spec.rb
rename to spec/ruby/library/net-http/httpresponse/code_spec.rb
index 114277cb431c30..699062ad97327c 100644
--- a/spec/ruby/library/net/http/httpresponse/code_spec.rb
+++ b/spec/ruby/library/net-http/httpresponse/code_spec.rb
@@ -1,4 +1,4 @@
-require_relative '../../../../spec_helper'
+require_relative '../../../spec_helper'
 require 'net/http'
 
 describe "Net::HTTPResponse#code" do
diff --git a/spec/ruby/library/net/http/httpresponse/code_type_spec.rb b/spec/ruby/library/net-http/httpresponse/code_type_spec.rb
similarity index 94%
rename from spec/ruby/library/net/http/httpresponse/code_type_spec.rb
rename to spec/ruby/library/net-http/httpresponse/code_type_spec.rb
index fa2d572e9ac2f9..beb661cbbe5256 100644
--- a/spec/ruby/library/net/http/httpresponse/code_type_spec.rb
+++ b/spec/ruby/library/net-http/httpresponse/code_type_spec.rb
@@ -1,4 +1,4 @@
-require_relative '../../../../spec_helper'
+require_relative '../../../spec_helper'
 require 'net/http'
 
 describe "Net::HTTPResponse#code_type" do
diff --git a/spec/ruby/library/net/http/httpresponse/entity_spec.rb b/spec/ruby/library/net-http/httpresponse/entity_spec.rb
similarity index 77%
rename from spec/ruby/library/net/http/httpresponse/entity_spec.rb
rename to spec/ruby/library/net-http/httpresponse/entity_spec.rb
index f1639042c19b87..ca8c4b29c09cfd 100644
--- a/spec/ruby/library/net/http/httpresponse/entity_spec.rb
+++ b/spec/ruby/library/net-http/httpresponse/entity_spec.rb
@@ -1,4 +1,4 @@
-require_relative '../../../../spec_helper'
+require_relative '../../../spec_helper'
 require 'net/http'
 require_relative 'shared/body'
 
diff --git a/spec/ruby/library/net/http/httpresponse/error_spec.rb b/spec/ruby/library/net-http/httpresponse/error_spec.rb
similarity index 95%
rename from spec/ruby/library/net/http/httpresponse/error_spec.rb
rename to spec/ruby/library/net-http/httpresponse/error_spec.rb
index 89f4a47f60154e..6ced90fa2347c7 100644
--- a/spec/ruby/library/net/http/httpresponse/error_spec.rb
+++ b/spec/ruby/library/net-http/httpresponse/error_spec.rb
@@ -1,4 +1,4 @@
-require_relative '../../../../spec_helper'
+require_relative '../../../spec_helper'
 require 'net/http'
 
 describe "Net::HTTPResponse#error!" do
diff --git a/spec/ruby/library/net/http/httpresponse/error_type_spec.rb b/spec/ruby/library/net-http/httpresponse/error_type_spec.rb
similarity index 95%
rename from spec/ruby/library/net/http/httpresponse/error_type_spec.rb
rename to spec/ruby/library/net-http/httpresponse/error_type_spec.rb
index 8885b7706bd8d2..3969621a5ea675 100644
--- a/spec/ruby/library/net/http/httpresponse/error_type_spec.rb
+++ b/spec/ruby/library/net-http/httpresponse/error_type_spec.rb
@@ -1,4 +1,4 @@
-require_relative '../../../../spec_helper'
+require_relative '../../../spec_helper'
 require 'net/http'
 
 describe "Net::HTTPResponse#error_type" do
diff --git a/spec/ruby/library/net/http/httpresponse/exception_type_spec.rb b/spec/ruby/library/net-http/httpresponse/exception_type_spec.rb
similarity index 92%
rename from spec/ruby/library/net/http/httpresponse/exception_type_spec.rb
rename to spec/ruby/library/net-http/httpresponse/exception_type_spec.rb
index 0c9c11291f291e..dd2761a744cd7a 100644
--- a/spec/ruby/library/net/http/httpresponse/exception_type_spec.rb
+++ b/spec/ruby/library/net-http/httpresponse/exception_type_spec.rb
@@ -1,4 +1,4 @@
-require_relative '../../../../spec_helper'
+require_relative '../../../spec_helper'
 require 'net/http'
 
 describe "Net::HTTPResponse.exception_type" do
diff --git a/spec/ruby/library/net/http/httpresponse/header_spec.rb b/spec/ruby/library/net-http/httpresponse/header_spec.rb
similarity index 82%
rename from spec/ruby/library/net/http/httpresponse/header_spec.rb
rename to spec/ruby/library/net-http/httpresponse/header_spec.rb
index a9615feda83fb5..a403dbd2c33191 100644
--- a/spec/ruby/library/net/http/httpresponse/header_spec.rb
+++ b/spec/ruby/library/net-http/httpresponse/header_spec.rb
@@ -1,4 +1,4 @@
-require_relative '../../../../spec_helper'
+require_relative '../../../spec_helper'
 require 'net/http'
 
 describe "Net::HTTPResponse#header" do
diff --git a/spec/ruby/library/net/http/httpresponse/http_version_spec.rb b/spec/ruby/library/net-http/httpresponse/http_version_spec.rb
similarity index 88%
rename from spec/ruby/library/net/http/httpresponse/http_version_spec.rb
rename to spec/ruby/library/net-http/httpresponse/http_version_spec.rb
index db85696d77d008..a3e413a360f5c7 100644
--- a/spec/ruby/library/net/http/httpresponse/http_version_spec.rb
+++ b/spec/ruby/library/net-http/httpresponse/http_version_spec.rb
@@ -1,4 +1,4 @@
-require_relative '../../../../spec_helper'
+require_relative '../../../spec_helper'
 require 'net/http'
 
 describe "Net::HTTPResponse#http_version" do
diff --git a/spec/ruby/library/net-http/httpresponse/initialize_spec.rb b/spec/ruby/library/net-http/httpresponse/initialize_spec.rb
new file mode 100644
index 00000000000000..673c11a24599de
--- /dev/null
+++ b/spec/ruby/library/net-http/httpresponse/initialize_spec.rb
@@ -0,0 +1,11 @@
+require_relative '../../../spec_helper'
+require 'net/http'
+
+describe "Net::HTTPResponse#initialize when passed http_version, response_code, response_message" do
+  it "sets self http_version, response_code and response_message to the passed values" do
+    res = Net::HTTPUnknownResponse.new("1.0", "???", "test response")
+    res.http_version.should == "1.0"
+    res.code.should == "???"
+    res.message.should == "test response"
+  end
+end
diff --git a/spec/ruby/library/net-http/httpresponse/inspect_spec.rb b/spec/ruby/library/net-http/httpresponse/inspect_spec.rb
new file mode 100644
index 00000000000000..43071ec8cdfb8c
--- /dev/null
+++ b/spec/ruby/library/net-http/httpresponse/inspect_spec.rb
@@ -0,0 +1,15 @@
+require_relative '../../../spec_helper'
+require 'net/http'
+require "stringio"
+
+describe "Net::HTTPResponse#inspect" do
+  it "returns a String representation of self" do
+    res = Net::HTTPUnknownResponse.new("1.0", "???", "test response")
+    res.inspect.should == "#<Net::HTTPUnknownResponse ??? test response readbody=false>"
+
+    res = Net::HTTPUnknownResponse.new("1.0", "???", "test response")
+    socket = Net::BufferedIO.new(StringIO.new("test body"))
+    res.reading_body(socket, true) {}
+    res.inspect.should == "#<Net::HTTPUnknownResponse ??? test response readbody=true>"
+  end
+end
diff --git a/spec/ruby/library/net/http/httpresponse/message_spec.rb b/spec/ruby/library/net-http/httpresponse/message_spec.rb
similarity index 83%
rename from spec/ruby/library/net/http/httpresponse/message_spec.rb
rename to spec/ruby/library/net-http/httpresponse/message_spec.rb
index ae8e3678a13b40..5ba73bb449fc07 100644
--- a/spec/ruby/library/net/http/httpresponse/message_spec.rb
+++ b/spec/ruby/library/net-http/httpresponse/message_spec.rb
@@ -1,4 +1,4 @@
-require_relative '../../../../spec_helper'
+require_relative '../../../spec_helper'
 require 'net/http'
 
 describe "Net::HTTPResponse#message" do
diff --git a/spec/ruby/library/net/http/httpresponse/msg_spec.rb b/spec/ruby/library/net-http/httpresponse/msg_spec.rb
similarity index 83%
rename from spec/ruby/library/net/http/httpresponse/msg_spec.rb
rename to spec/ruby/library/net-http/httpresponse/msg_spec.rb
index 0e5e7eb4aa93f7..04f5836d7ab64d 100644
--- a/spec/ruby/library/net/http/httpresponse/msg_spec.rb
+++ b/spec/ruby/library/net-http/httpresponse/msg_spec.rb
@@ -1,4 +1,4 @@
-require_relative '../../../../spec_helper'
+require_relative '../../../spec_helper'
 require 'net/http'
 
 describe "Net::HTTPResponse#msg" do
diff --git a/spec/ruby/library/net/http/httpresponse/read_body_spec.rb b/spec/ruby/library/net-http/httpresponse/read_body_spec.rb
similarity index 88%
rename from spec/ruby/library/net/http/httpresponse/read_body_spec.rb
rename to spec/ruby/library/net-http/httpresponse/read_body_spec.rb
index ec9b42f9195635..4530a26bfc264b 100644
--- a/spec/ruby/library/net/http/httpresponse/read_body_spec.rb
+++ b/spec/ruby/library/net-http/httpresponse/read_body_spec.rb
@@ -1,4 +1,4 @@
-require_relative '../../../../spec_helper'
+require_relative '../../../spec_helper'
 require 'net/http'
 require 'stringio'
 
@@ -25,7 +25,7 @@
   describe "when passed a buffer" do
     it "reads the body to the passed buffer" do
       @res.reading_body(@socket, true) do
-        buffer = ""
+        buffer = +""
         @res.read_body(buffer)
         buffer.should == "test body"
       end
@@ -33,15 +33,15 @@
 
     it "returns the passed buffer" do
       @res.reading_body(@socket, true) do
-        buffer = ""
+        buffer = +""
         @res.read_body(buffer).should equal(buffer)
       end
     end
 
     it "raises an IOError if called a second time" do
       @res.reading_body(@socket, true) do
-        @res.read_body("")
-        -> { @res.read_body("") }.should raise_error(IOError)
+        @res.read_body(+"")
+        -> { @res.read_body(+"") }.should raise_error(IOError)
       end
     end
   end
@@ -51,7 +51,7 @@
       @res.reading_body(@socket, true) do
         yielded = false
 
-        buffer = ""
+        buffer = +""
         @res.read_body do |body|
           yielded = true
           buffer << body
@@ -79,7 +79,7 @@
   describe "when passed buffer and block" do
     it "raises an ArgumentError" do
       @res.reading_body(@socket, true) do
-        -> { @res.read_body("") {} }.should raise_error(ArgumentError)
+        -> { @res.read_body(+"") {} }.should raise_error(ArgumentError)
       end
     end
   end
diff --git a/spec/ruby/library/net/http/httpresponse/read_header_spec.rb b/spec/ruby/library/net-http/httpresponse/read_header_spec.rb
similarity index 82%
rename from spec/ruby/library/net/http/httpresponse/read_header_spec.rb
rename to spec/ruby/library/net-http/httpresponse/read_header_spec.rb
index 6af8c6bd6a2803..3ea4ee834b4d3d 100644
--- a/spec/ruby/library/net/http/httpresponse/read_header_spec.rb
+++ b/spec/ruby/library/net-http/httpresponse/read_header_spec.rb
@@ -1,4 +1,4 @@
-require_relative '../../../../spec_helper'
+require_relative '../../../spec_helper'
 require 'net/http'
 
 describe "Net::HTTPResponse#read_header" do
diff --git a/spec/ruby/library/net/http/httpresponse/read_new_spec.rb b/spec/ruby/library/net-http/httpresponse/read_new_spec.rb
similarity index 93%
rename from spec/ruby/library/net/http/httpresponse/read_new_spec.rb
rename to spec/ruby/library/net-http/httpresponse/read_new_spec.rb
index dc2cdc962104c1..82f7a47ce8d020 100644
--- a/spec/ruby/library/net/http/httpresponse/read_new_spec.rb
+++ b/spec/ruby/library/net-http/httpresponse/read_new_spec.rb
@@ -1,4 +1,4 @@
-require_relative '../../../../spec_helper'
+require_relative '../../../spec_helper'
 require 'net/http'
 require 'stringio'
 
diff --git a/spec/ruby/library/net/http/httpresponse/reading_body_spec.rb b/spec/ruby/library/net-http/httpresponse/reading_body_spec.rb
similarity index 97%
rename from spec/ruby/library/net/http/httpresponse/reading_body_spec.rb
rename to spec/ruby/library/net-http/httpresponse/reading_body_spec.rb
index ebdab891e1b041..637a2806f89fa0 100644
--- a/spec/ruby/library/net/http/httpresponse/reading_body_spec.rb
+++ b/spec/ruby/library/net-http/httpresponse/reading_body_spec.rb
@@ -1,4 +1,4 @@
-require_relative '../../../../spec_helper'
+require_relative '../../../spec_helper'
 require 'net/http'
 require "stringio"
 
diff --git a/spec/ruby/library/net-http/httpresponse/response_spec.rb b/spec/ruby/library/net-http/httpresponse/response_spec.rb
new file mode 100644
index 00000000000000..caa0ca2d190be3
--- /dev/null
+++ b/spec/ruby/library/net-http/httpresponse/response_spec.rb
@@ -0,0 +1,9 @@
+require_relative '../../../spec_helper'
+require 'net/http'
+
+describe "Net::HTTPResponse#response" do
+  it "returns self" do
+    res = Net::HTTPUnknownResponse.new("1.0", "???", "test response")
+    res.response.should equal(res)
+  end
+end
diff --git a/spec/ruby/library/net/http/httpresponse/shared/body.rb b/spec/ruby/library/net-http/httpresponse/shared/body.rb
similarity index 100%
rename from spec/ruby/library/net/http/httpresponse/shared/body.rb
rename to spec/ruby/library/net-http/httpresponse/shared/body.rb
diff --git a/spec/ruby/library/net/http/httpresponse/value_spec.rb b/spec/ruby/library/net-http/httpresponse/value_spec.rb
similarity index 95%
rename from spec/ruby/library/net/http/httpresponse/value_spec.rb
rename to spec/ruby/library/net-http/httpresponse/value_spec.rb
index 5cd58316ef2b97..2df8beaa10d9f8 100644
--- a/spec/ruby/library/net/http/httpresponse/value_spec.rb
+++ b/spec/ruby/library/net-http/httpresponse/value_spec.rb
@@ -1,4 +1,4 @@
-require_relative '../../../../spec_helper'
+require_relative '../../../spec_helper'
 require 'net/http'
 
 describe "Net::HTTPResponse#value" do
diff --git a/spec/ruby/library/net/FTPError_spec.rb b/spec/ruby/library/net/FTPError_spec.rb
deleted file mode 100644
index 84128511db22f0..00000000000000
--- a/spec/ruby/library/net/FTPError_spec.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-require_relative '../../spec_helper'
-
-ruby_version_is ""..."3.1" do
-  require 'net/ftp'
-
-  describe "Net::FTPError" do
-    it "is an Exception" do
-      Net::FTPError.should < Exception
-    end
-  end
-end
diff --git a/spec/ruby/library/net/FTPPermError_spec.rb b/spec/ruby/library/net/FTPPermError_spec.rb
deleted file mode 100644
index 0da35e7d82cd80..00000000000000
--- a/spec/ruby/library/net/FTPPermError_spec.rb
+++ /dev/null
@@ -1,15 +0,0 @@
-require_relative '../../spec_helper'
-
-ruby_version_is ""..."3.1" do
-  require 'net/ftp'
-
-  describe "Net::FTPPermError" do
-    it "is an Exception" do
-      Net::FTPPermError.should < Exception
-    end
-
-    it "is a subclass of Net::FTPError" do
-      Net::FTPPermError.should < Net::FTPError
-    end
-  end
-end
diff --git a/spec/ruby/library/net/FTPProtoError_spec.rb b/spec/ruby/library/net/FTPProtoError_spec.rb
deleted file mode 100644
index 20e30dd2dd39e4..00000000000000
--- a/spec/ruby/library/net/FTPProtoError_spec.rb
+++ /dev/null
@@ -1,15 +0,0 @@
-require_relative '../../spec_helper'
-
-ruby_version_is ""..."3.1" do
-  require 'net/ftp'
-
-  describe "Net::FTPProtoError" do
-    it "is an Exception" do
-      Net::FTPProtoError.should < Exception
-    end
-
-    it "is a subclass of Net::FTPError" do
-      Net::FTPPermError.should < Net::FTPError
-    end
-  end
-end
diff --git a/spec/ruby/library/net/FTPReplyError_spec.rb b/spec/ruby/library/net/FTPReplyError_spec.rb
deleted file mode 100644
index cc774aabe5baf5..00000000000000
--- a/spec/ruby/library/net/FTPReplyError_spec.rb
+++ /dev/null
@@ -1,15 +0,0 @@
-require_relative '../../spec_helper'
-
-ruby_version_is ""..."3.1" do
-  require 'net/ftp'
-
-  describe "Net::FTPReplyError" do
-    it "is an Exception" do
-      Net::FTPReplyError.should < Exception
-    end
-
-    it "is a subclass of Net::FTPError" do
-      Net::FTPPermError.should < Net::FTPError
-    end
-  end
-end
diff --git a/spec/ruby/library/net/FTPTempError_spec.rb b/spec/ruby/library/net/FTPTempError_spec.rb
deleted file mode 100644
index e2fbdfd842e08f..00000000000000
--- a/spec/ruby/library/net/FTPTempError_spec.rb
+++ /dev/null
@@ -1,15 +0,0 @@
-require_relative '../../spec_helper'
-
-ruby_version_is ""..."3.1" do
-  require 'net/ftp'
-
-  describe "Net::FTPTempError" do
-    it "is an Exception" do
-      Net::FTPTempError.should < Exception
-    end
-
-    it "is a subclass of Net::FTPError" do
-      Net::FTPPermError.should < Net::FTPError
-    end
-  end
-end
diff --git a/spec/ruby/library/net/ftp/abort_spec.rb b/spec/ruby/library/net/ftp/abort_spec.rb
deleted file mode 100644
index ebdfed4b160685..00000000000000
--- a/spec/ruby/library/net/ftp/abort_spec.rb
+++ /dev/null
@@ -1,65 +0,0 @@
-require_relative '../../../spec_helper'
-
-ruby_version_is ""..."3.1" do
-  require_relative 'spec_helper'
-  require_relative 'fixtures/server'
-
-  describe "Net::FTP#abort" do
-    before :each do
-      @server = NetFTPSpecs::DummyFTP.new
-      @server.serve_once
-
-      @ftp = Net::FTP.new
-      @ftp.connect(@server.hostname, @server.server_port)
-    end
-
-    after :each do
-      @ftp.quit rescue nil
-      @ftp.close
-      @server.stop
-    end
-
-    it "sends the ABOR command to the server" do
-      -> { @ftp.abort }.should_not raise_error
-    end
-
-    it "ignores the response" do
-      @ftp.abort
-      @ftp.last_response.should == "220 Dummy FTP Server ready!\n"
-    end
-
-    it "returns the full response" do
-      @ftp.abort.should == "226 Closing data connection. (ABOR)\n"
-    end
-
-    it "does not raise any error when the response code is 225" do
-      @server.should_receive(:abor).and_respond("225 Data connection open; no transfer in progress.")
-      -> { @ftp.abort }.should_not raise_error
-    end
-
-    it "does not raise any error when the response code is 226" do
-      @server.should_receive(:abor).and_respond("226 Closing data connection.")
-      -> { @ftp.abort }.should_not raise_error
-    end
-
-    it "raises a Net::FTPProtoError when the response code is 500" do
-      @server.should_receive(:abor).and_respond("500 Syntax error, command unrecognized.")
-      -> { @ftp.abort }.should raise_error(Net::FTPProtoError)
-    end
-
-    it "raises a Net::FTPProtoError when the response code is 501" do
-      @server.should_receive(:abor).and_respond("501 Syntax error in parameters or arguments.")
-      -> { @ftp.abort }.should raise_error(Net::FTPProtoError)
-    end
-
-    it "raises a Net::FTPProtoError when the response code is 502" do
-      @server.should_receive(:abor).and_respond("502 Command not implemented.")
-      -> { @ftp.abort }.should raise_error(Net::FTPProtoError)
-    end
-
-    it "raises a Net::FTPProtoError when the response code is 421" do
-      @server.should_receive(:abor).and_respond("421 Service not available, closing control connection.")
-      -> { @ftp.abort }.should raise_error(Net::FTPProtoError)
-    end
-  end
-end
diff --git a/spec/ruby/library/net/ftp/acct_spec.rb b/spec/ruby/library/net/ftp/acct_spec.rb
deleted file mode 100644
index a960ae20a4372c..00000000000000
--- a/spec/ruby/library/net/ftp/acct_spec.rb
+++ /dev/null
@@ -1,61 +0,0 @@
-require_relative '../../../spec_helper'
-
-ruby_version_is ""..."3.1" do
-  require_relative 'spec_helper'
-  require_relative 'fixtures/server'
-
-  describe "Net::FTP#acct" do
-    before :each do
-      @server = NetFTPSpecs::DummyFTP.new
-      @server.serve_once
-
-      @ftp = Net::FTP.new
-      @ftp.connect(@server.hostname, @server.server_port)
-    end
-
-    after :each do
-      @ftp.quit rescue nil
-      @ftp.close
-      @server.stop
-    end
-
-    it "writes the ACCT command to the server" do
-      @ftp.acct("my_account")
-      @ftp.last_response.should == "230 User 'my_account' logged in, proceed. (ACCT)\n"
-    end
-
-    it "returns nil" do
-      @ftp.acct("my_account").should == nil
-    end
-
-    it "does not raise any error when the response code is 230" do
-      @server.should_receive(:acct).and_respond("230 User logged in, proceed.")
-      -> { @ftp.acct("my_account") }.should_not raise_error
-    end
-
-    it "raises a Net::FTPPermError when the response code is 530" do
-      @server.should_receive(:acct).and_respond("530 Not logged in.")
-      -> { @ftp.acct("my_account") }.should raise_error(Net::FTPPermError)
-    end
-
-    it "raises a Net::FTPPermError when the response code is 500" do
-      @server.should_receive(:acct).and_respond("500 Syntax error, command unrecognized.")
-      -> { @ftp.acct("my_account") }.should raise_error(Net::FTPPermError)
-    end
-
-    it "raises a Net::FTPPermError when the response code is 501" do
-      @server.should_receive(:acct).and_respond("501 Syntax error in parameters or arguments.")
-      -> { @ftp.acct("my_account") }.should raise_error(Net::FTPPermError)
-    end
-
-    it "raises a Net::FTPPermError when the response code is 503" do
-      @server.should_receive(:acct).and_respond("503 Bad sequence of commands.")
-      -> { @ftp.acct("my_account") }.should raise_error(Net::FTPPermError)
-    end
-
-    it "raises a Net::FTPTempError when the response code is 421" do
-      @server.should_receive(:acct).and_respond("421 Service not available, closing control connection.")
-      -> { @ftp.acct("my_account") }.should raise_error(Net::FTPTempError)
-    end
-  end
-end
diff --git a/spec/ruby/library/net/ftp/binary_spec.rb b/spec/ruby/library/net/ftp/binary_spec.rb
deleted file mode 100644
index da7e2d6c14669c..00000000000000
--- a/spec/ruby/library/net/ftp/binary_spec.rb
+++ /dev/null
@@ -1,27 +0,0 @@
-require_relative '../../../spec_helper'
-
-ruby_version_is ""..."3.1" do
-  require_relative 'spec_helper'
-
-  describe "Net::FTP#binary" do
-    it "returns true when self is in binary mode" do
-      ftp = Net::FTP.new
-      ftp.binary.should be_true
-
-      ftp.binary = false
-      ftp.binary.should be_false
-    end
-  end
-
-  describe "Net::FTP#binary=" do
-    it "sets self to binary mode when passed true" do
-      ftp = Net::FTP.new
-
-      ftp.binary = true
-      ftp.binary.should be_true
-
-      ftp.binary = false
-      ftp.binary.should be_false
-    end
-  end
-end
diff --git a/spec/ruby/library/net/ftp/chdir_spec.rb b/spec/ruby/library/net/ftp/chdir_spec.rb
deleted file mode 100644
index 741c3c845ed8cf..00000000000000
--- a/spec/ruby/library/net/ftp/chdir_spec.rb
+++ /dev/null
@@ -1,102 +0,0 @@
-require_relative '../../../spec_helper'
-
-ruby_version_is ""..."3.1" do
-  require_relative 'spec_helper'
-  require_relative 'fixtures/server'
-
-  describe "Net::FTP#chdir" do
-    before :each do
-      @server = NetFTPSpecs::DummyFTP.new
-      @server.serve_once
-
-      @ftp = Net::FTP.new
-      @ftp.connect(@server.hostname, @server.server_port)
-    end
-
-    after :each do
-      @ftp.quit rescue nil
-      @ftp.close
-      @server.stop
-    end
-
-    describe "when switching to the parent directory" do
-      it "sends the 'CDUP' command to the server" do
-        @ftp.chdir("..")
-        @ftp.last_response.should == "200 Command okay. (CDUP)\n"
-      end
-
-      it "returns nil" do
-        @ftp.chdir("..").should be_nil
-      end
-
-      it "does not raise a Net::FTPPermError when the response code is 500" do
-        @server.should_receive(:cdup).and_respond("500 Syntax error, command unrecognized.")
-        -> { @ftp.chdir("..") }.should_not raise_error(Net::FTPPermError)
-      end
-
-      it "raises a Net::FTPPermError when the response code is 501" do
-        @server.should_receive(:cdup).and_respond("501 Syntax error in parameters or arguments.")
-        -> { @ftp.chdir("..") }.should raise_error(Net::FTPPermError)
-      end
-
-      it "raises a Net::FTPPermError when the response code is 502" do
-        @server.should_receive(:cdup).and_respond("502 Command not implemented.")
-        -> { @ftp.chdir("..") }.should raise_error(Net::FTPPermError)
-      end
-
-      it "raises a Net::FTPTempError when the response code is 421" do
-        @server.should_receive(:cdup).and_respond("421 Service not available, closing control connection.")
-        -> { @ftp.chdir("..") }.should raise_error(Net::FTPTempError)
-      end
-
-      it "raises a Net::FTPPermError when the response code is 530" do
-        @server.should_receive(:cdup).and_respond("530 Not logged in.")
-        -> { @ftp.chdir("..") }.should raise_error(Net::FTPPermError)
-      end
-
-      it "raises a Net::FTPPermError when the response code is 550" do
-        @server.should_receive(:cdup).and_respond("550 Requested action not taken.")
-        -> { @ftp.chdir("..") }.should raise_error(Net::FTPPermError)
-      end
-    end
-
-    it "writes the 'CWD' command with the passed directory to the socket" do
-      @ftp.chdir("test")
-      @ftp.last_response.should == "200 Command okay. (CWD test)\n"
-    end
-
-    it "returns nil" do
-      @ftp.chdir("test").should be_nil
-    end
-
-    it "raises a Net::FTPPermError when the response code is 500" do
-      @server.should_receive(:cwd).and_respond("500 Syntax error, command unrecognized.")
-      -> { @ftp.chdir("test") }.should raise_error(Net::FTPPermError)
-    end
-
-    it "raises a Net::FTPPermError when the response code is 501" do
-      @server.should_receive(:cwd).and_respond("501 Syntax error in parameters or arguments.")
-      -> { @ftp.chdir("test") }.should raise_error(Net::FTPPermError)
-    end
-
-    it "raises a Net::FTPPermError when the response code is 502" do
-      @server.should_receive(:cwd).and_respond("502 Command not implemented.")
-      -> { @ftp.chdir("test") }.should raise_error(Net::FTPPermError)
-    end
-
-    it "raises a Net::FTPTempError when the response code is 421" do
-      @server.should_receive(:cwd).and_respond("421 Service not available, closing control connection.")
-      -> { @ftp.chdir("test") }.should raise_error(Net::FTPTempError)
-    end
-
-    it "raises a Net::FTPPermError when the response code is 530" do
-      @server.should_receive(:cwd).and_respond("530 Not logged in.")
-      -> { @ftp.chdir("test") }.should raise_error(Net::FTPPermError)
-    end
-
-    it "raises a Net::FTPPermError when the response code is 550" do
-      @server.should_receive(:cwd).and_respond("550 Requested action not taken.")
-      -> { @ftp.chdir("test") }.should raise_error(Net::FTPPermError)
-    end
-  end
-end
diff --git a/spec/ruby/library/net/ftp/close_spec.rb b/spec/ruby/library/net/ftp/close_spec.rb
deleted file mode 100644
index 49cdf4dea70257..00000000000000
--- a/spec/ruby/library/net/ftp/close_spec.rb
+++ /dev/null
@@ -1,33 +0,0 @@
-require_relative '../../../spec_helper'
-
-ruby_version_is ""..."3.1" do
-  require_relative 'spec_helper'
-
-  describe "Net::FTP#close" do
-    before :each do
-      @socket = mock("Socket")
-      @socket.stub!(:closed?).and_return(false)
-      @socket.stub!(:read_timeout).and_return(60)
-      @socket.stub!(:read_timeout=).and_return(3)
-
-      @ftp = Net::FTP.new
-      @ftp.instance_variable_set(:@sock, @socket)
-    end
-
-    it "closes the socket" do
-      @socket.should_receive(:close)
-      @ftp.close.should be_nil
-    end
-
-    it "does not try to close the socket if it has already been closed" do
-      @socket.should_receive(:closed?).and_return(true)
-      @socket.should_not_receive(:close)
-      @ftp.close.should be_nil
-    end
-
-    it "does not try to close the socket if it is nil" do
-      @ftp.instance_variable_set(:@sock, nil)
-      @ftp.close.should be_nil
-    end
-  end
-end
diff --git a/spec/ruby/library/net/ftp/closed_spec.rb b/spec/ruby/library/net/ftp/closed_spec.rb
deleted file mode 100644
index a81917090a9c35..00000000000000
--- a/spec/ruby/library/net/ftp/closed_spec.rb
+++ /dev/null
@@ -1,24 +0,0 @@
-require_relative '../../../spec_helper'
-
-ruby_version_is ""..."3.1" do
-  require_relative 'spec_helper'
-
-  describe "Net::FTP#closed?" do
-    before :each do
-      @socket = mock("Socket")
-
-      @ftp = Net::FTP.new
-      @ftp.instance_variable_set(:@sock, @socket)
-    end
-
-    it "returns true when the socket is closed" do
-      @socket.should_receive(:closed?).and_return(true)
-      @ftp.closed?.should be_true
-    end
-
-    it "returns true when the socket is nil" do
-      @ftp.instance_variable_set(:@sock, nil)
-      @ftp.closed?.should be_true
-    end
-  end
-end
diff --git a/spec/ruby/library/net/ftp/connect_spec.rb b/spec/ruby/library/net/ftp/connect_spec.rb
deleted file mode 100644
index b45e46c5303414..00000000000000
--- a/spec/ruby/library/net/ftp/connect_spec.rb
+++ /dev/null
@@ -1,52 +0,0 @@
-require_relative '../../../spec_helper'
-
-ruby_version_is ""..."3.1" do
-  require_relative 'spec_helper'
-  require_relative 'fixtures/server'
-
-  # TODO: Add specs for using the SOCKSSocket
-  describe "Net::FTP#connect" do
-    before :each do
-      @server = NetFTPSpecs::DummyFTP.new
-      @server.serve_once
-
-      @ftp = Net::FTP.new
-    end
-
-    after :each do
-      @server.connect_message = nil
-      @ftp.quit rescue nil
-      @ftp.close
-      @server.stop
-    end
-
-    it "tries to connect to the FTP Server on the given host and port" do
-      -> { @ftp.connect(@server.hostname, @server.server_port) }.should_not raise_error
-    end
-
-    it "returns nil" do
-      @ftp.connect(@server.hostname, @server.server_port).should be_nil
-    end
-
-    it "prints a small debug line when in debug mode" do
-      @ftp.debug_mode = true
-      -> { @ftp.connect(@server.hostname, @server.server_port) }.should output(/#{"connect: "}#{@server.hostname}#{", "}#{@server.server_port}#{"\\nget: 220 Dummy FTP Server ready!"}/)
-      @ftp.debug_mode = false
-    end
-
-    it "does not raise any error when the response code is 220" do
-      @server.connect_message = "220 Dummy FTP Server ready!"
-      -> { @ftp.connect(@server.hostname, @server.server_port) }.should_not raise_error
-    end
-
-    it "raises a Net::FTPReplyError when the response code is 120" do
-      @server.connect_message = "120 Service ready in nnn minutes."
-      -> { @ftp.connect(@server.hostname, @server.server_port) }.should raise_error(Net::FTPReplyError)
-    end
-
-    it "raises a Net::FTPTempError when the response code is 421" do
-      @server.connect_message = "421 Service not available, closing control connection."
-      -> { @ftp.connect(@server.hostname, @server.server_port) }.should raise_error(Net::FTPTempError)
-    end
-  end
-end
diff --git a/spec/ruby/library/net/ftp/debug_mode_spec.rb b/spec/ruby/library/net/ftp/debug_mode_spec.rb
deleted file mode 100644
index 46d207bbea5fed..00000000000000
--- a/spec/ruby/library/net/ftp/debug_mode_spec.rb
+++ /dev/null
@@ -1,26 +0,0 @@
-require_relative '../../../spec_helper'
-
-ruby_version_is ""..."3.1" do
-  require_relative 'spec_helper'
-
-  describe "Net::FTP#debug_mode" do
-    it "returns true when self is in debug mode" do
-      ftp = Net::FTP.new
-      ftp.debug_mode.should be_false
-
-      ftp.debug_mode = true
-      ftp.debug_mode.should be_true
-    end
-  end
-
-  describe "Net::FTP#debug_mode=" do
-    it "sets self into debug mode when passed true" do
-      ftp = Net::FTP.new
-      ftp.debug_mode = true
-      ftp.debug_mode.should be_true
-
-      ftp.debug_mode = false
-      ftp.debug_mode.should be_false
-    end
-  end
-end
diff --git a/spec/ruby/library/net/ftp/default_passive_spec.rb b/spec/ruby/library/net/ftp/default_passive_spec.rb
deleted file mode 100644
index 9348d3294d9e0a..00000000000000
--- a/spec/ruby/library/net/ftp/default_passive_spec.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-require_relative '../../../spec_helper'
-
-ruby_version_is ""..."3.1" do
-  require_relative 'spec_helper'
-
-  describe "Net::FTP#default_passive" do
-    it "is true by default" do
-      ruby_exe(fixture(__FILE__, "default_passive.rb")).should == "true\ntrue\n"
-    end
-  end
-end
diff --git a/spec/ruby/library/net/ftp/delete_spec.rb b/spec/ruby/library/net/ftp/delete_spec.rb
deleted file mode 100644
index 43bfcc15415853..00000000000000
--- a/spec/ruby/library/net/ftp/delete_spec.rb
+++ /dev/null
@@ -1,62 +0,0 @@
-require_relative '../../../spec_helper'
-
-ruby_version_is ""..."3.1" do
-  require_relative 'spec_helper'
-  require_relative 'fixtures/server'
-
-  describe "Net::FTP#delete" do
-    before :each do
-      @server = NetFTPSpecs::DummyFTP.new
-      @server.serve_once
-
-      @ftp = Net::FTP.new
-      @ftp.connect(@server.hostname, @server.server_port)
-    end
-
-    after :each do
-      @ftp.quit rescue nil
-      @ftp.close
-      @server.stop
-    end
-
-    it "sends the DELE command with the passed filename to the server" do
-      @ftp.delete("test.file")
-      @ftp.last_response.should == "250 Requested file action okay, completed. (DELE test.file)\n"
-    end
-
-    it "raises a Net::FTPTempError when the response code is 450" do
-      @server.should_receive(:dele).and_respond("450 Requested file action not taken.")
-      -> { @ftp.delete("test.file") }.should raise_error(Net::FTPTempError)
-    end
-
-    it "raises a Net::FTPPermError when the response code is 550" do
-      @server.should_receive(:dele).and_respond("550 Requested action not taken.")
-      -> { @ftp.delete("test.file") }.should raise_error(Net::FTPPermError)
-    end
-
-    it "raises a Net::FTPPermError when the response code is 500" do
-      @server.should_receive(:dele).and_respond("500 Syntax error, command unrecognized.")
-      -> { @ftp.delete("test.file") }.should raise_error(Net::FTPPermError)
-    end
-
-    it "raises a Net::FTPPermError when the response code is 501" do
-      @server.should_receive(:dele).and_respond("501 Syntax error in parameters or arguments.")
-      -> { @ftp.delete("test.file") }.should raise_error(Net::FTPPermError)
-    end
-
-    it "raises a Net::FTPPermError when the response code is 502" do
-      @server.should_receive(:dele).and_respond("502 Command not implemented.")
-      -> { @ftp.delete("test.file") }.should raise_error(Net::FTPPermError)
-    end
-
-    it "raises a Net::FTPTempError when the response code is 421" do
-      @server.should_receive(:dele).and_respond("421 Service not available, closing control connection.")
-      -> { @ftp.delete("test.file") }.should raise_error(Net::FTPTempError)
-    end
-
-    it "raises a Net::FTPPermError when the response code is 530" do
-      @server.should_receive(:dele).and_respond("530 Not logged in.")
-      -> { @ftp.delete("test.file") }.should raise_error(Net::FTPPermError)
-    end
-  end
-end
diff --git a/spec/ruby/library/net/ftp/dir_spec.rb b/spec/ruby/library/net/ftp/dir_spec.rb
deleted file mode 100644
index dce50a5ac55830..00000000000000
--- a/spec/ruby/library/net/ftp/dir_spec.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-require_relative '../../../spec_helper'
-
-ruby_version_is ""..."3.1" do
-  require_relative 'spec_helper'
-  require_relative 'fixtures/server'
-  require_relative 'shared/list'
-
-  describe "Net::FTP#dir" do
-    it_behaves_like :net_ftp_list, :dir
-  end
-end
diff --git a/spec/ruby/library/net/ftp/fixtures/server.rb b/spec/ruby/library/net/ftp/fixtures/server.rb
deleted file mode 100644
index ecbed591d589e0..00000000000000
--- a/spec/ruby/library/net/ftp/fixtures/server.rb
+++ /dev/null
@@ -1,277 +0,0 @@
-module NetFTPSpecs
-  class DummyFTP
-    attr_accessor :connect_message
-    attr_reader :login_user, :login_pass, :login_acct
-
-    # hostname or IP address
-    attr_reader :hostname
-    # port number
-    attr_reader :server_port
-
-    def initialize
-      @hostname = "localhost"
-      @server = TCPServer.new(@hostname, 0)
-      @server_port = @server.addr[1]
-
-      @handlers = {}
-      @commands = []
-      @connect_message = nil
-    end
-
-    def serve_once
-      @thread = Thread.new do
-        @socket = @server.accept
-        @socket.setsockopt(Socket::SOL_SOCKET, Socket::SO_OOBINLINE, 1)
-        begin
-          handle_request
-        ensure
-          @socket.close
-        end
-      end
-    end
-
-    def handle_request
-      # Send out the welcome message.
-      response @connect_message || "220 Dummy FTP Server ready!"
-
-      begin
-        while command = @socket.gets
-          command, argument = command.chomp.split(" ", 2)
-
-          if command == "QUIT"
-            self.response("221 OK, bye")
-            break
-          elsif proc_handler = @handlers[command.downcase.to_sym]
-            if argument.nil?
-              proc_handler.call(self)
-            else
-              proc_handler.call(self, argument)
-            end
-          else
-            if argument.nil?
-              self.send(command.downcase.to_sym)
-            else
-              self.send(command.downcase.to_sym, argument)
-            end
-          end
-        end
-      rescue => e
-        self.error_response("Exception: #{e} #{e.backtrace.inspect}")
-      end
-    end
-
-    def error_response(text)
-      self.response("451 #{text}")
-    end
-
-    def response(text)
-      @socket.puts(text) unless @socket.closed?
-    end
-
-    def stop
-      @datasocket.close unless @datasocket.nil? || @datasocket.closed?
-      @server.close
-      @thread.join
-    end
-
-
-    ##
-    def handle(sym, &block)
-      @handlers[sym] = block
-    end
-
-    def should_receive(method)
-      @handler_for = method
-      self
-    end
-
-    def and_respond(text)
-      @handlers[@handler_for] = -> s, *args { s.response(text) }
-    end
-
-    ##
-    # FTP methods
-    ##
-
-    def abor
-      self.response("226 Closing data connection. (ABOR)")
-    end
-
-    def acct(account)
-      @login_acct = account
-      self.response("230 User '#{account}' logged in, proceed. (ACCT)")
-    end
-
-    def cdup
-      self.response("200 Command okay. (CDUP)")
-    end
-
-    def cwd(dir)
-      self.response("200 Command okay. (CWD #{dir})")
-    end
-
-    def dele(file)
-      self.response("250 Requested file action okay, completed. (DELE #{file})")
-    end
-
-    def eprt(arg)
-      _, _, host, port = arg.split("|")
-
-      @datasocket = TCPSocket.new(host, port)
-      self.response("200 port opened")
-    end
-
-    def help(param = :default)
-      if param == :default
-        self.response("211 System status, or system help reply. (HELP)")
-      else
-        self.response("211 System status, or system help reply. (HELP #{param})")
-      end
-    end
-
-    def list(folder)
-      self.response("150 opening ASCII connection for file list")
-      @datasocket.puts("-rw-r--r--  1 spec  staff  507 17 Jul 18:41 last_response_code.rb")
-      @datasocket.puts("-rw-r--r--  1 spec  staff   50 17 Jul 18:41 list.rb")
-      @datasocket.puts("-rw-r--r--  1 spec  staff   48 17 Jul 18:41 pwd.rb")
-      @datasocket.close()
-      self.response("226 transfer complete (LIST #{folder})")
-    end
-
-    def mdtm(filename)
-      self.response("213 19980705132316")
-    end
-
-    def mkd(foldername)
-      self.response(%Q{257 "#{foldername.gsub('"', '""')}" created.})
-    end
-
-    def nlst(folder = nil)
-      self.response("150 opening ASCII connection for file list")
-      @datasocket.puts("last_response_code.rb")
-      @datasocket.puts("list.rb")
-      @datasocket.puts("pwd.rb")
-      @datasocket.close()
-      self.response("226 transfer complete (NLST#{folder ? " #{folder}" : ""})")
-    end
-
-    def noop
-      self.response("200 Command okay. (NOOP)")
-    end
-
-    def pass(password)
-      @login_pass = password
-      self.response("230 User logged in, proceed. (PASS #{password})")
-    end
-
-    def port(arg)
-      nums = arg.split(",")
-
-      if nums[0] == "::1"
-        # IPv6
-        port = nums[1].to_i * 256 + nums[2].to_i
-        host = nums[0]
-      else
-        # IPv4
-        port = nums[4].to_i * 256 + nums[5].to_i
-        host = nums[0..3].join(".")
-      end
-
-      @datasocket = TCPSocket.new(host, port)
-      self.response("200 port opened")
-    end
-
-    def pwd
-      self.response('257 "/some/dir/" - current directory')
-    end
-
-    def retr(file)
-      self.response("125 Data transfer starting")
-      if @restart_at && @restart_at == 20
-        @datasocket.puts("of the file named '#{file}'.")
-        @restart_at = nil
-      else
-        @datasocket.puts("This is the content")
-        @datasocket.puts("of the file named '#{file}'.")
-      end
-      @datasocket.close()
-      self.response("226 Closing data connection. (RETR #{file})")
-    end
-
-    def rest(at_bytes)
-      @restart_at = at_bytes.to_i
-      self.response("350 Requested file action pending further information. (REST)")
-    end
-
-    def rmd(folder)
-      self.response("250 Requested file action okay, completed. (RMD #{folder})")
-    end
-
-    def rnfr(from)
-      @rename_from = from
-      self.response("350 Requested file action pending further information.")
-    end
-
-    def rnto(to)
-      self.response("250 Requested file action okay, completed. (Renamed #{@rename_from} to #{to})")
-      @rename_from = nil
-    end
-
-    def site(param)
-      self.response("200 Command okay. (SITE #{param})")
-    end
-
-    def size(filename)
-      if filename == "binary"
-        self.response("213 24")
-      else
-        self.response("213 1024")
-      end
-    end
-
-    def stat(param = :default)
-      if param == :default
-        self.response("211 System status, or system help reply. (STAT)")
-      else
-        self.response("211 System status, or system help reply. (STAT #{param})")
-      end
-    end
-
-    def stor(file)
-      tmp_file = tmp("#{file}file", false)
-
-      self.response("125 Data transfer starting.")
-
-      mode = @restart_at ? "a" : "w"
-
-      File.open(tmp_file, mode + "b") do |f|
-        loop do
-          data = @datasocket.recv(1024)
-          break if !data || data.empty?
-          f << data
-        end
-      end
-
-      @datasocket.close()
-      self.response("200 OK, Data received. (STOR #{file})")
-    end
-
-    def appe(file)
-      @restart_at = true
-      stor(file)
-    end
-
-    def syst
-      self.response("215 FTP Dummy Server (SYST)")
-    end
-
-    def type(type)
-      self.response("200 TYPE switched to #{type}")
-    end
-
-    def user(name)
-      @login_user = name
-      self.response("230 User logged in, proceed. (USER #{name})")
-    end
-  end
-end
diff --git a/spec/ruby/library/net/ftp/get_spec.rb b/spec/ruby/library/net/ftp/get_spec.rb
deleted file mode 100644
index 892b30061c227d..00000000000000
--- a/spec/ruby/library/net/ftp/get_spec.rb
+++ /dev/null
@@ -1,24 +0,0 @@
-require_relative '../../../spec_helper'
-
-ruby_version_is ""..."3.1" do
-  require_relative 'spec_helper'
-  require_relative 'fixtures/server'
-  require_relative 'shared/gettextfile'
-  require_relative 'shared/getbinaryfile'
-
-  describe "Net::FTP#get (binary mode)" do
-    before :each do
-      @binary_mode = true
-    end
-
-    it_behaves_like :net_ftp_getbinaryfile, :get
-  end
-
-  describe "Net::FTP#get (text mode)" do
-    before :each do
-      @binary_mode = false
-    end
-
-    it_behaves_like :net_ftp_gettextfile, :get
-  end
-end
diff --git a/spec/ruby/library/net/ftp/getbinaryfile_spec.rb b/spec/ruby/library/net/ftp/getbinaryfile_spec.rb
deleted file mode 100644
index c5abdd67e747f7..00000000000000
--- a/spec/ruby/library/net/ftp/getbinaryfile_spec.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-require_relative '../../../spec_helper'
-
-ruby_version_is ""..."3.1" do
-  require_relative 'spec_helper'
-  require_relative 'fixtures/server'
-  require_relative 'shared/getbinaryfile'
-
-  describe "Net::FTP#getbinaryfile" do
-    it_behaves_like :net_ftp_getbinaryfile, :getbinaryfile
-  end
-end
diff --git a/spec/ruby/library/net/ftp/getdir_spec.rb b/spec/ruby/library/net/ftp/getdir_spec.rb
deleted file mode 100644
index 8f6fca5bfb50a9..00000000000000
--- a/spec/ruby/library/net/ftp/getdir_spec.rb
+++ /dev/null
@@ -1,10 +0,0 @@
-require_relative '../../../spec_helper'
-
-ruby_version_is ""..."3.1" do
-  require_relative 'spec_helper'
-  require_relative 'shared/pwd'
-
-  describe "Net::FTP#getdir" do
-    it_behaves_like :net_ftp_pwd, :getdir
-  end
-end
diff --git a/spec/ruby/library/net/ftp/gettextfile_spec.rb b/spec/ruby/library/net/ftp/gettextfile_spec.rb
deleted file mode 100644
index e272ae73b10e54..00000000000000
--- a/spec/ruby/library/net/ftp/gettextfile_spec.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-require_relative '../../../spec_helper'
-
-ruby_version_is ""..."3.1" do
-  require_relative 'spec_helper'
-  require_relative 'fixtures/server'
-  require_relative 'shared/gettextfile'
-
-  describe "Net::FTP#gettextfile" do
-    it_behaves_like :net_ftp_gettextfile, :gettextfile
-  end
-end
diff --git a/spec/ruby/library/net/ftp/help_spec.rb b/spec/ruby/library/net/ftp/help_spec.rb
deleted file mode 100644
index 9b15f42ede6619..00000000000000
--- a/spec/ruby/library/net/ftp/help_spec.rb
+++ /dev/null
@@ -1,69 +0,0 @@
-require_relative '../../../spec_helper'
-
-ruby_version_is ""..."3.1" do
-  require_relative 'spec_helper'
-  require_relative 'fixtures/server'
-
-  describe "Net::FTP#help" do
-    def with_connection
-      yield
-    end
-
-    before :each do
-      @server = NetFTPSpecs::DummyFTP.new
-      @server.serve_once
-
-      @ftp = Net::FTP.new
-      @ftp.connect(@server.hostname, @server.server_port)
-    end
-
-    after :each do
-      @ftp.quit rescue nil
-      @ftp.close
-      @server.stop
-    end
-
-    it "writes the HELP command to the server" do
-      @ftp.help
-      @ftp.last_response.should == "211 System status, or system help reply. (HELP)\n"
-    end
-
-    it "returns the server's response" do
-      @ftp.help.should == "211 System status, or system help reply. (HELP)\n"
-    end
-
-    it "writes the HELP command with an optional parameter to the socket" do
-      @ftp.help("some parameter").should == "211 System status, or system help reply. (HELP some parameter)\n"
-    end
-
-    it "does not raise any error when the response code is 211" do
-      @server.should_receive(:help).and_respond("211 System status, or system help reply.")
-      -> { @ftp.help }.should_not raise_error
-    end
-
-    it "does not raise any error when the response code is 214" do
-      @server.should_receive(:help).and_respond("214 Help message.")
-      -> { @ftp.help }.should_not raise_error
-    end
-
-    it "raises a Net::FTPPermError when the response code is 500" do
-      @server.should_receive(:help).and_respond("500 Syntax error, command unrecognized.")
-      -> { @ftp.help }.should raise_error(Net::FTPPermError)
-    end
-
-    it "raises a Net::FTPPermError when the response code is 501" do
-      @server.should_receive(:help).and_respond("501 Syntax error in parameters or arguments.")
-      -> { @ftp.help }.should raise_error(Net::FTPPermError)
-    end
-
-    it "raises a Net::FTPPermError when the response code is 502" do
-      @server.should_receive(:help).and_respond("502 Command not implemented.")
-      -> { @ftp.help }.should raise_error(Net::FTPPermError)
-    end
-
-    it "raises a Net::FTPTempError when the response code is 421" do
-      @server.should_receive(:help).and_respond("421 Service not available, closing control connection.")
-      -> { @ftp.help }.should raise_error(Net::FTPTempError)
-    end
-  end
-end
diff --git a/spec/ruby/library/net/ftp/initialize_spec.rb b/spec/ruby/library/net/ftp/initialize_spec.rb
deleted file mode 100644
index 80f71a916180d8..00000000000000
--- a/spec/ruby/library/net/ftp/initialize_spec.rb
+++ /dev/null
@@ -1,408 +0,0 @@
-require_relative '../../../spec_helper'
-
-ruby_version_is ""..."3.1" do
-  require_relative 'spec_helper'
-
-  describe "Net::FTP#initialize" do
-    before :each do
-      @ftp = Net::FTP.allocate
-      @ftp.stub!(:connect)
-      @port_args = []
-      @port_args << 21
-    end
-
-    it "is private" do
-      Net::FTP.should have_private_instance_method(:initialize)
-    end
-
-    it "sets self into binary mode" do
-      @ftp.binary.should be_nil
-      @ftp.send(:initialize)
-      @ftp.binary.should be_true
-    end
-
-    it "sets self into active mode" do
-      @ftp.passive.should be_nil
-      @ftp.send(:initialize)
-      @ftp.passive.should be_false
-    end
-
-    it "sets self into non-debug mode" do
-      @ftp.debug_mode.should be_nil
-      @ftp.send(:initialize)
-      @ftp.debug_mode.should be_false
-    end
-
-    it "sets self to not resume file uploads/downloads" do
-      @ftp.resume.should be_nil
-      @ftp.send(:initialize)
-      @ftp.resume.should be_false
-    end
-
-    describe "when passed no arguments" do
-      it "does not try to connect" do
-        @ftp.should_not_receive(:connect)
-        @ftp.send(:initialize)
-      end
-    end
-
-    describe "when passed host" do
-      it "tries to connect to the passed host" do
-        @ftp.should_receive(:connect).with("localhost", *@port_args)
-        @ftp.send(:initialize, "localhost")
-      end
-    end
-
-    describe "when passed host, user" do
-      it "tries to connect to the passed host" do
-        @ftp.should_receive(:connect).with("localhost", *@port_args)
-        @ftp.send(:initialize, "localhost")
-      end
-
-      it "tries to login with the passed username" do
-        @ftp.should_receive(:login).with("rubyspec", nil, nil)
-        @ftp.send(:initialize, "localhost", "rubyspec")
-      end
-    end
-
-    describe "when passed host, user, password" do
-      it "tries to connect to the passed host" do
-        @ftp.should_receive(:connect).with("localhost", *@port_args)
-        @ftp.send(:initialize, "localhost")
-      end
-
-      it "tries to login with the passed username and password" do
-        @ftp.should_receive(:login).with("rubyspec", "rocks", nil)
-        @ftp.send(:initialize, "localhost", "rubyspec", "rocks")
-      end
-    end
-
-    describe "when passed host, user" do
-      it "tries to connect to the passed host" do
-        @ftp.should_receive(:connect).with("localhost", *@port_args)
-        @ftp.send(:initialize, "localhost")
-      end
-
-      it "tries to login with the passed username, password and account" do
-        @ftp.should_receive(:login).with("rubyspec", "rocks", "account")
-        @ftp.send(:initialize, "localhost", "rubyspec", "rocks", "account")
-      end
-    end
-
-    before :each do
-      @ftp.stub!(:login)
-    end
-
-    describe 'when the host' do
-      describe 'is set' do
-        describe 'and port option' do
-          describe 'is set' do
-            it 'tries to connect to the host on the specified port' do
-              options = mock('ftp initialize options')
-              options.should_receive(:to_hash).and_return({ port: 8080 })
-              @ftp.should_receive(:connect).with('localhost', 8080)
-
-              @ftp.send(:initialize, 'localhost', options)
-            end
-          end
-
-          describe 'is not set' do
-            it 'tries to connect to the host without a port' do
-              @ftp.should_receive(:connect).with("localhost", *@port_args)
-
-              @ftp.send(:initialize, 'localhost')
-            end
-          end
-        end
-
-        describe 'when the username option' do
-          describe 'is set' do
-            describe 'and the password option' do
-              describe 'is set' do
-                describe 'and the account option' do
-                  describe 'is set' do
-                    it 'tries to log in with the supplied parameters' do
-                      options = mock('ftp initialize options')
-                      options.should_receive(:to_hash).and_return({ username: 'a', password: 'topsecret', account: 'b' })
-                      @ftp.should_receive(:login).with('a', 'topsecret', 'b')
-
-                      @ftp.send(:initialize, 'localhost', options)
-                    end
-                  end
-
-                  describe 'is unset' do
-                    it 'tries to log in with the supplied parameters' do
-                      options = mock('ftp initialize options')
-                      options.should_receive(:to_hash).and_return({ username: 'a', password: 'topsecret' })
-                      @ftp.should_receive(:login).with('a', 'topsecret', nil)
-
-                      @ftp.send(:initialize, 'localhost', options)
-                    end
-                  end
-                end
-              end
-
-              describe 'is unset' do
-                describe 'and the account option' do
-                  describe 'is set' do
-                    it 'tries to log in with the supplied parameters' do
-                      options = mock('ftp initialize options')
-                      options.should_receive(:to_hash).and_return({ username: 'a', account: 'b' })
-                      @ftp.should_receive(:login).with('a', nil, 'b')
-
-                      @ftp.send(:initialize, 'localhost', options)
-                    end
-                  end
-
-                  describe 'is unset' do
-                    it 'tries to log in with the supplied parameters' do
-                      options = mock('ftp initialize options')
-                      options.should_receive(:to_hash).and_return({ username: 'a'})
-                      @ftp.should_receive(:login).with('a', nil, nil)
-
-                      @ftp.send(:initialize, 'localhost', options)
-                    end
-                  end
-                end
-              end
-            end
-          end
-
-          describe 'is not set' do
-            it 'does not try to log in' do
-              options = mock('ftp initialize options')
-              options.should_receive(:to_hash).and_return({})
-              @ftp.should_not_receive(:login)
-
-              @ftp.send(:initialize, 'localhost', options)
-            end
-          end
-        end
-      end
-
-      describe 'is unset' do
-        it 'does not try to connect' do
-          @ftp.should_not_receive(:connect)
-
-          @ftp.send(:initialize)
-        end
-
-        it 'does not try to log in' do
-          @ftp.should_not_receive(:login)
-
-          @ftp.send(:initialize)
-        end
-      end
-    end
-
-    describe 'when the passive option' do
-      describe 'is set' do
-        describe 'to true' do
-          it 'sets passive to true' do
-            options = mock('ftp initialize options')
-            options.should_receive(:to_hash).and_return({ passive: true })
-
-            @ftp.send(:initialize, nil, options)
-            @ftp.passive.should == true
-          end
-        end
-
-        describe 'to false' do
-          it 'sets passive to false' do
-            options = mock('ftp initialize options')
-            options.should_receive(:to_hash).and_return({ passive: false })
-
-            @ftp.send(:initialize, nil, options)
-            @ftp.passive.should == false
-          end
-        end
-      end
-
-      describe 'is unset' do
-        it 'sets passive to false' do
-          @ftp.send(:initialize)
-          @ftp.passive.should == false
-        end
-      end
-    end
-
-    describe 'when the debug_mode option' do
-      describe 'is set' do
-        describe 'to true' do
-          it 'sets debug_mode to true' do
-            options = mock('ftp initialize options')
-            options.should_receive(:to_hash).and_return({ debug_mode: true })
-
-            @ftp.send(:initialize, nil, options)
-            @ftp.debug_mode.should == true
-          end
-        end
-
-        describe 'to false' do
-          it 'sets debug_mode to false' do
-            options = mock('ftp initialize options')
-            options.should_receive(:to_hash).and_return({ debug_mode: false })
-
-            @ftp.send(:initialize, nil, options)
-            @ftp.debug_mode.should == false
-          end
-        end
-      end
-
-      describe 'is unset' do
-        it 'sets debug_mode to false' do
-          @ftp.send(:initialize)
-          @ftp.debug_mode.should == false
-        end
-      end
-    end
-
-    describe 'when the open_timeout option' do
-      describe 'is set' do
-        it 'sets open_timeout to the specified value' do
-          options = mock('ftp initialize options')
-          options.should_receive(:to_hash).and_return({ open_timeout: 42 })
-
-          @ftp.send(:initialize, nil, options)
-          @ftp.open_timeout.should == 42
-        end
-      end
-
-      describe 'is not set' do
-        it 'sets open_timeout to nil' do
-          @ftp.send(:initialize)
-          @ftp.open_timeout.should == nil
-        end
-      end
-    end
-
-    describe 'when the read_timeout option' do
-      describe 'is set' do
-        it 'sets read_timeout to the specified value' do
-          options = mock('ftp initialize options')
-          options.should_receive(:to_hash).and_return({ read_timeout: 100 })
-
-          @ftp.send(:initialize, nil, options)
-          @ftp.read_timeout.should == 100
-        end
-      end
-
-      describe 'is not set' do
-        it 'sets read_timeout to the default value' do
-          @ftp.send(:initialize)
-          @ftp.read_timeout.should == 60
-        end
-      end
-    end
-
-    describe 'when the ssl_handshake_timeout option' do
-      describe 'is set' do
-        it 'sets ssl_handshake_timeout to the specified value' do
-          options = mock('ftp initialize options')
-          options.should_receive(:to_hash).and_return({ ssl_handshake_timeout: 23 })
-
-          @ftp.send(:initialize, nil, options)
-          @ftp.ssl_handshake_timeout.should == 23
-        end
-      end
-
-      describe 'is not set' do
-        it 'sets ssl_handshake_timeout to nil' do
-          @ftp.send(:initialize)
-          @ftp.ssl_handshake_timeout.should == nil
-        end
-      end
-    end
-
-    describe 'when the ssl option' do
-      describe 'is set' do
-        describe "and the ssl option's value is true" do
-          it 'initializes ssl_context to a blank SSLContext object' do
-            options = mock('ftp initialize options')
-            options.should_receive(:to_hash).and_return({ ssl: true })
-
-            ssl_context = OpenSSL::SSL::SSLContext.allocate
-            ssl_context.stub!(:set_params)
-
-            OpenSSL::SSL::SSLContext.should_receive(:new).and_return(ssl_context)
-            ssl_context.should_receive(:set_params).with({})
-
-            @ftp.send(:initialize, nil, options)
-            @ftp.instance_variable_get(:@ssl_context).should == ssl_context
-          end
-        end
-
-        describe "and the ssl option's value is a hash" do
-          it 'initializes ssl_context to a configured SSLContext object' do
-            options = mock('ftp initialize options')
-            options.should_receive(:to_hash).and_return({ ssl: {key: 'value'} })
-
-            ssl_context = OpenSSL::SSL::SSLContext.allocate
-            ssl_context.stub!(:set_params)
-
-            OpenSSL::SSL::SSLContext.should_receive(:new).and_return(ssl_context)
-            ssl_context.should_receive(:set_params).with({key: 'value'})
-
-            @ftp.send(:initialize, nil, options)
-            @ftp.instance_variable_get(:@ssl_context).should == ssl_context
-          end
-        end
-
-        describe 'and private_data_connection' do
-          describe 'is set' do
-            it 'sets private_data_connection to that value' do
-              options = mock('ftp initialize options')
-              options.should_receive(:to_hash).and_return({ ssl: true, private_data_connection: 'true' })
-
-              @ftp.send(:initialize, nil, options)
-              @ftp.instance_variable_get(:@private_data_connection).should == 'true'
-            end
-          end
-
-          describe 'is not set' do
-            it 'sets private_data_connection to nil' do
-              options = mock('ftp initialize options')
-              options.should_receive(:to_hash).and_return({ ssl: true })
-
-              @ftp.send(:initialize, nil, options)
-              @ftp.instance_variable_get(:@private_data_connection).should == true
-            end
-          end
-        end
-      end
-
-      describe 'is not set' do
-        it 'sets ssl_context to nil' do
-          options = mock('ftp initialize options')
-          options.should_receive(:to_hash).and_return({})
-
-          @ftp.send(:initialize, nil, options)
-          @ftp.instance_variable_get(:@ssl_context).should == nil
-        end
-
-        describe 'private_data_connection' do
-          describe 'is set' do
-            it 'raises an ArgumentError' do
-              options = mock('ftp initialize options')
-              options.should_receive(:to_hash).and_return({ private_data_connection: true })
-
-              -> {
-                @ftp.send(:initialize, nil, options)
-              }.should raise_error(ArgumentError, /private_data_connection can be set to true only when ssl is enabled/)
-            end
-          end
-
-          describe 'is not set' do
-            it 'sets private_data_connection to false' do
-              options = mock('ftp initialize options')
-              options.should_receive(:to_hash).and_return({})
-
-              @ftp.send(:initialize, nil, options)
-              @ftp.instance_variable_get(:@private_data_connection).should == false
-            end
-          end
-        end
-      end
-    end
-  end
-end
diff --git a/spec/ruby/library/net/ftp/last_response_code_spec.rb b/spec/ruby/library/net/ftp/last_response_code_spec.rb
deleted file mode 100644
index 86f2b9a6950129..00000000000000
--- a/spec/ruby/library/net/ftp/last_response_code_spec.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-require_relative '../../../spec_helper'
-
-ruby_version_is ""..."3.1" do
-  require_relative 'spec_helper'
-  require_relative 'shared/last_response_code'
-  require_relative 'fixtures/server'
-
-  describe "Net::FTP#last_response_code" do
-    it_behaves_like :net_ftp_last_response_code, :last_response_code
-  end
-end
diff --git a/spec/ruby/library/net/ftp/last_response_spec.rb b/spec/ruby/library/net/ftp/last_response_spec.rb
deleted file mode 100644
index 1d29b9b73fb48d..00000000000000
--- a/spec/ruby/library/net/ftp/last_response_spec.rb
+++ /dev/null
@@ -1,28 +0,0 @@
-require_relative '../../../spec_helper'
-
-ruby_version_is ""..."3.1" do
-  require_relative 'spec_helper'
-  require_relative 'fixtures/server'
-
-  describe "Net::FTP#last_response" do
-    before :each do
-      @server = NetFTPSpecs::DummyFTP.new
-      @server.serve_once
-
-      @ftp = Net::FTP.new
-      @ftp.connect(@server.hostname, @server.server_port)
-    end
-
-    after :each do
-      @ftp.quit rescue nil
-      @ftp.close
-      @server.stop
-    end
-
-    it "returns the last response" do
-      @ftp.last_response.should == "220 Dummy FTP Server ready!\n"
-      @ftp.help
-      @ftp.last_response.should == "211 System status, or system help reply. (HELP)\n"
-    end
-  end
-end
diff --git a/spec/ruby/library/net/ftp/lastresp_spec.rb b/spec/ruby/library/net/ftp/lastresp_spec.rb
deleted file mode 100644
index 9d26efb8f8fb25..00000000000000
--- a/spec/ruby/library/net/ftp/lastresp_spec.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-require_relative '../../../spec_helper'
-
-ruby_version_is ""..."3.1" do
-  require_relative 'spec_helper'
-  require_relative 'shared/last_response_code'
-  require_relative 'fixtures/server'
-
-  describe "Net::FTP#lastresp" do
-    it_behaves_like :net_ftp_last_response_code, :lastresp
-  end
-end
diff --git a/spec/ruby/library/net/ftp/list_spec.rb b/spec/ruby/library/net/ftp/list_spec.rb
deleted file mode 100644
index 6cffafeb4f68c7..00000000000000
--- a/spec/ruby/library/net/ftp/list_spec.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-require_relative '../../../spec_helper'
-
-ruby_version_is ""..."3.1" do
-  require_relative 'spec_helper'
-  require_relative 'fixtures/server'
-  require_relative 'shared/list'
-
-  describe "Net::FTP#list" do
-    it_behaves_like :net_ftp_list, :list
-  end
-end
diff --git a/spec/ruby/library/net/ftp/login_spec.rb b/spec/ruby/library/net/ftp/login_spec.rb
deleted file mode 100644
index 981b43908219ee..00000000000000
--- a/spec/ruby/library/net/ftp/login_spec.rb
+++ /dev/null
@@ -1,198 +0,0 @@
-require_relative '../../../spec_helper'
-
-ruby_version_is ""..."3.1" do
-  require_relative 'spec_helper'
-  require_relative 'fixtures/server'
-
-  describe "Net::FTP#login" do
-    before :each do
-      @server = NetFTPSpecs::DummyFTP.new
-      @server.serve_once
-
-      @ftp = Net::FTP.new
-      @ftp.connect(@server.hostname, @server.server_port)
-    end
-
-    after :each do
-      @ftp.quit rescue nil
-      @ftp.close
-      @server.stop
-    end
-
-    describe "when passed no arguments" do
-      it "sends the USER command with 'anonymous' as name to the server" do
-        @ftp.login
-        @server.login_user.should == "anonymous"
-      end
-
-      it "sends 'anonymous@' as a password when required" do
-        @server.should_receive(:user).and_respond("331 User name okay, need password.")
-        @ftp.login
-        @server.login_pass.should == "anonymous@"
-      end
-
-      it "raises a Net::FTPReplyError when the server requests an account" do
-        @server.should_receive(:user).and_respond("331 User name okay, need password.")
-        @server.should_receive(:pass).and_respond("332 Need account for login.")
-        -> { @ftp.login }.should raise_error(Net::FTPReplyError)
-      end
-    end
-
-    describe "when passed name" do
-      it "sends the USER command with the passed name to the server" do
-        @ftp.login("rubyspec")
-        @server.login_user.should == "rubyspec"
-      end
-
-      it "raises a Net::FTPReplyError when the server requests a password, but none was given" do
-        @server.should_receive(:user).and_respond("331 User name okay, need password.")
-        -> { @ftp.login("rubyspec") }.should raise_error(Net::FTPReplyError)
-      end
-
-      it "raises a Net::FTPReplyError when the server requests an account, but none was given" do
-        @server.should_receive(:user).and_respond("331 User name okay, need password.")
-        @server.should_receive(:pass).and_respond("332 Need account for login.")
-        -> { @ftp.login("rubyspec") }.should raise_error(Net::FTPReplyError)
-      end
-    end
-
-    describe "when passed name, password" do
-      it "sends the USER command with the passed name to the server" do
-        @ftp.login("rubyspec", "rocks")
-        @server.login_user.should == "rubyspec"
-      end
-
-      it "sends the passed password when required" do
-        @server.should_receive(:user).and_respond("331 User name okay, need password.")
-        @ftp.login("rubyspec", "rocks")
-        @server.login_pass.should == "rocks"
-      end
-
-      it "raises a Net::FTPReplyError when the server requests an account" do
-        @server.should_receive(:user).and_respond("331 User name okay, need password.")
-        @server.should_receive(:pass).and_respond("332 Need account for login.")
-        -> { @ftp.login("rubyspec", "rocks") }.should raise_error(Net::FTPReplyError)
-      end
-    end
-
-    describe "when passed name, password, account" do
-      it "sends the USER command with the passed name to the server" do
-        @ftp.login("rubyspec", "rocks", "account")
-        @server.login_user.should == "rubyspec"
-      end
-
-      it "sends the passed password when required" do
-        @server.should_receive(:user).and_respond("331 User name okay, need password.")
-        @ftp.login("rubyspec", "rocks", "account")
-        @server.login_pass.should == "rocks"
-      end
-
-      it "sends the passed account when required" do
-        @server.should_receive(:user).and_respond("331 User name okay, need password.")
-        @server.should_receive(:pass).and_respond("332 Need account for login.")
-        @ftp.login("rubyspec", "rocks", "account")
-        @server.login_acct.should == "account"
-      end
-    end
-
-    describe "when the USER command fails" do
-      it "raises a Net::FTPPermError when the response code is 500" do
-        @server.should_receive(:user).and_respond("500 Syntax error, command unrecognized.")
-        -> { @ftp.login("rubyspec", "rocks", "account") }.should raise_error(Net::FTPPermError)
-      end
-
-      it "raises a Net::FTPPermError when the response code is 501" do
-        @server.should_receive(:user).and_respond("501 Syntax error in parameters or arguments.")
-        -> { @ftp.login("rubyspec", "rocks", "account") }.should raise_error(Net::FTPPermError)
-      end
-
-      it "raises a Net::FTPPermError when the response code is 502" do
-        @server.should_receive(:user).and_respond("502 Command not implemented.")
-        -> { @ftp.login("rubyspec", "rocks", "account") }.should raise_error(Net::FTPPermError)
-      end
-
-      it "raises a Net::FTPTempError when the response code is 421" do
-        @server.should_receive(:user).and_respond("421 Service not available, closing control connection.")
-        -> { @ftp.login("rubyspec", "rocks", "account") }.should raise_error(Net::FTPTempError)
-      end
-
-      it "raises a Net::FTPPermError when the response code is 530" do
-        @server.should_receive(:user).and_respond("530 Not logged in.")
-        -> { @ftp.login("rubyspec", "rocks", "account") }.should raise_error(Net::FTPPermError)
-      end
-    end
-
-    describe "when the PASS command fails" do
-      before :each do
-        @server.should_receive(:user).and_respond("331 User name okay, need password.")
-      end
-
-      it "does not raise an Error when the response code is 202" do
-        @server.should_receive(:pass).and_respond("202 Command not implemented, superfluous at this site.")
-        -> { @ftp.login("rubyspec", "rocks", "account") }.should_not raise_error
-      end
-
-      it "raises a Net::FTPPermError when the response code is 500" do
-        @server.should_receive(:pass).and_respond("500 Syntax error, command unrecognized.")
-        -> { @ftp.login("rubyspec", "rocks", "account") }.should raise_error(Net::FTPPermError)
-      end
-
-      it "raises a Net::FTPPermError when the response code is 501" do
-        @server.should_receive(:pass).and_respond("501 Syntax error in parameters or arguments.")
-        -> { @ftp.login("rubyspec", "rocks", "account") }.should raise_error(Net::FTPPermError)
-      end
-
-      it "raises a Net::FTPPermError when the response code is 502" do
-        @server.should_receive(:pass).and_respond("502 Command not implemented.")
-        -> { @ftp.login("rubyspec", "rocks", "account") }.should raise_error(Net::FTPPermError)
-      end
-
-      it "raises a Net::FTPTempError when the response code is 421" do
-        @server.should_receive(:pass).and_respond("421 Service not available, closing control connection.")
-        -> { @ftp.login("rubyspec", "rocks", "account") }.should raise_error(Net::FTPTempError)
-      end
-
-      it "raises a Net::FTPPermError when the response code is 530" do
-        @server.should_receive(:pass).and_respond("530 Not logged in.")
-        -> { @ftp.login("rubyspec", "rocks", "account") }.should raise_error(Net::FTPPermError)
-      end
-    end
-
-    describe "when the ACCT command fails" do
-      before :each do
-        @server.should_receive(:user).and_respond("331 User name okay, need password.")
-        @server.should_receive(:pass).and_respond("332 Need account for login.")
-      end
-
-      it "does not raise an Error when the response code is 202" do
-        @server.should_receive(:acct).and_respond("202 Command not implemented, superfluous at this site.")
-        -> { @ftp.login("rubyspec", "rocks", "account") }.should_not raise_error
-      end
-
-      it "raises a Net::FTPPermError when the response code is 500" do
-        @server.should_receive(:acct).and_respond("500 Syntax error, command unrecognized.")
-        -> { @ftp.login("rubyspec", "rocks", "account") }.should raise_error(Net::FTPPermError)
-      end
-
-      it "raises a Net::FTPPermError when the response code is 501" do
-        @server.should_receive(:acct).and_respond("501 Syntax error in parameters or arguments.")
-        -> { @ftp.login("rubyspec", "rocks", "account") }.should raise_error(Net::FTPPermError)
-      end
-
-      it "raises a Net::FTPPermError when the response code is 502" do
-        @server.should_receive(:acct).and_respond("502 Command not implemented.")
-        -> { @ftp.login("rubyspec", "rocks", "account") }.should raise_error(Net::FTPPermError)
-      end
-
-      it "raises a Net::FTPTempError when the response code is 421" do
-        @server.should_receive(:acct).and_respond("421 Service not available, closing control connection.")
-        -> { @ftp.login("rubyspec", "rocks", "account") }.should raise_error(Net::FTPTempError)
-      end
-
-      it "raises a Net::FTPPermError when the response code is 530" do
-        @server.should_receive(:acct).and_respond("530 Not logged in.")
-        -> { @ftp.login("rubyspec", "rocks", "account") }.should raise_error(Net::FTPPermError)
-      end
-    end
-  end
-end
diff --git a/spec/ruby/library/net/ftp/ls_spec.rb b/spec/ruby/library/net/ftp/ls_spec.rb
deleted file mode 100644
index f2625158652ab7..00000000000000
--- a/spec/ruby/library/net/ftp/ls_spec.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-require_relative '../../../spec_helper'
-
-ruby_version_is ""..."3.1" do
-  require_relative 'spec_helper'
-  require_relative 'fixtures/server'
-  require_relative 'shared/list'
-
-  describe "Net::FTP#ls" do
-    it_behaves_like :net_ftp_list, :ls
-  end
-end
diff --git a/spec/ruby/library/net/ftp/mdtm_spec.rb b/spec/ruby/library/net/ftp/mdtm_spec.rb
deleted file mode 100644
index ea55533c4361fe..00000000000000
--- a/spec/ruby/library/net/ftp/mdtm_spec.rb
+++ /dev/null
@@ -1,41 +0,0 @@
-require_relative '../../../spec_helper'
-
-ruby_version_is ""..."3.1" do
-  require_relative 'spec_helper'
-  require_relative 'fixtures/server'
-
-  describe "Net::FTP#mdtm" do
-    before :each do
-      @server = NetFTPSpecs::DummyFTP.new
-      @server.serve_once
-
-      @ftp = Net::FTP.new
-      @ftp.connect(@server.hostname, @server.server_port)
-    end
-
-    after :each do
-      @ftp.quit rescue nil
-      @ftp.close
-      @server.stop
-    end
-
-    it "sends the MDTM with the passed filename command to the server" do
-      @ftp.mdtm("test.file")
-      @ftp.last_response.should == "213 19980705132316\n"
-    end
-
-    it "returns the last modification time of the passed file" do
-      @ftp.mdtm("test.file").should == "19980705132316"
-    end
-
-    it "raises a Net::FTPPermError when the response code is 550" do
-      @server.should_receive(:mdtm).and_respond("550 Requested action not taken.")
-      -> { @ftp.mdtm("test.file") }.should raise_error(Net::FTPPermError)
-    end
-
-    it "raises a Net::FTPTempError when the response code is 421" do
-      @server.should_receive(:mdtm).and_respond("421 Service not available, closing control connection.")
-      -> { @ftp.mdtm("test.file") }.should raise_error(Net::FTPTempError)
-    end
-  end
-end
diff --git a/spec/ruby/library/net/ftp/mkdir_spec.rb b/spec/ruby/library/net/ftp/mkdir_spec.rb
deleted file mode 100644
index 2cb437a0768436..00000000000000
--- a/spec/ruby/library/net/ftp/mkdir_spec.rb
+++ /dev/null
@@ -1,64 +0,0 @@
-require_relative '../../../spec_helper'
-
-ruby_version_is ""..."3.1" do
-  require_relative 'spec_helper'
-  require_relative 'fixtures/server'
-
-  describe "Net::FTP#mkdir" do
-    before :each do
-      @server = NetFTPSpecs::DummyFTP.new
-      @server.serve_once
-
-      @ftp = Net::FTP.new
-      @ftp.connect(@server.hostname, @server.server_port)
-    end
-
-    after :each do
-      @ftp.quit rescue nil
-      @ftp.close
-      @server.stop
-    end
-
-    it "sends the MKD command with the passed pathname to the server" do
-      @ftp.mkdir("test.folder")
-      @ftp.last_response.should == %{257 "test.folder" created.\n}
-    end
-
-    it "returns the path to the newly created directory" do
-      @ftp.mkdir("test.folder").should == "test.folder"
-      @ftp.mkdir("/absolute/path/to/test.folder").should == "/absolute/path/to/test.folder"
-      @ftp.mkdir("relative/path/to/test.folder").should == "relative/path/to/test.folder"
-      @ftp.mkdir('/usr/dm/foo"bar').should == '/usr/dm/foo"bar'
-    end
-
-    it "raises a Net::FTPPermError when the response code is 500" do
-      @server.should_receive(:mkd).and_respond("500 Syntax error, command unrecognized.")
-      -> { @ftp.mkdir("test.folder") }.should raise_error(Net::FTPPermError)
-    end
-
-    it "raises a Net::FTPPermError when the response code is 501" do
-      @server.should_receive(:mkd).and_respond("501 Syntax error in parameters or arguments.")
-      -> { @ftp.mkdir("test.folder") }.should raise_error(Net::FTPPermError)
-    end
-
-    it "raises a Net::FTPPermError when the response code is 502" do
-      @server.should_receive(:mkd).and_respond("502 Command not implemented.")
-      -> { @ftp.mkdir("test.folder") }.should raise_error(Net::FTPPermError)
-    end
-
-    it "raises a Net::FTPTempError when the response code is 421" do
-      @server.should_receive(:mkd).and_respond("421 Service not available, closing control connection.")
-      -> { @ftp.mkdir("test.folder") }.should raise_error(Net::FTPTempError)
-    end
-
-    it "raises a Net::FTPPermError when the response code is 530" do
-      @server.should_receive(:mkd).and_respond("530 Not logged in.")
-      -> { @ftp.mkdir("test.folder") }.should raise_error(Net::FTPPermError)
-    end
-
-    it "raises a Net::FTPPermError when the response code is 550" do
-      @server.should_receive(:mkd).and_respond("550 Requested action not taken.")
-      -> { @ftp.mkdir("test.folder") }.should raise_error(Net::FTPPermError)
-    end
-  end
-end
diff --git a/spec/ruby/library/net/ftp/mtime_spec.rb b/spec/ruby/library/net/ftp/mtime_spec.rb
deleted file mode 100644
index 7265667a522b15..00000000000000
--- a/spec/ruby/library/net/ftp/mtime_spec.rb
+++ /dev/null
@@ -1,53 +0,0 @@
-require_relative '../../../spec_helper'
-
-ruby_version_is ""..."3.1" do
-  require_relative 'spec_helper'
-  require_relative 'fixtures/server'
-
-  describe "Net::FTP#mtime" do
-    before :each do
-      @server = NetFTPSpecs::DummyFTP.new
-      @server.serve_once
-
-      @ftp = Net::FTP.new
-      @ftp.connect(@server.hostname, @server.server_port)
-    end
-
-    after :each do
-      @ftp.quit rescue nil
-      @ftp.close
-      @server.stop
-    end
-
-    it "sends the MDTM with the passed filename command to the server" do
-      @ftp.mtime("test.file")
-      @ftp.last_response.should == "213 19980705132316\n"
-    end
-
-    describe "when passed filename" do
-      it "returns the last modification time of the passed file as a Time object in the local time" do
-        @ftp.mtime("test.file").should == Time.gm("1998", "07", "05", "13", "23", "16")
-      end
-    end
-
-    describe "when passed filename, local_time" do
-      it "returns the last modification time as a Time object in UTC when local_time is true" do
-        @ftp.mtime("test.file", true).should == Time.local("1998", "07", "05", "13", "23", "16")
-      end
-
-      it "returns the last modification time as a Time object in the local time when local_time is false" do
-        @ftp.mtime("test.file", false).should == Time.gm("1998", "07", "05", "13", "23", "16")
-      end
-    end
-
-    it "raises a Net::FTPPermError when the response code is 550" do
-      @server.should_receive(:mdtm).and_respond("550 Requested action not taken.")
-      -> { @ftp.mtime("test.file") }.should raise_error(Net::FTPPermError)
-    end
-
-    it "raises a Net::FTPTempError when the response code is 421" do
-      @server.should_receive(:mdtm).and_respond("421 Service not available, closing control connection.")
-      -> { @ftp.mtime("test.file") }.should raise_error(Net::FTPTempError)
-    end
-  end
-end
diff --git a/spec/ruby/library/net/ftp/nlst_spec.rb b/spec/ruby/library/net/ftp/nlst_spec.rb
deleted file mode 100644
index 0de84b3a766055..00000000000000
--- a/spec/ruby/library/net/ftp/nlst_spec.rb
+++ /dev/null
@@ -1,95 +0,0 @@
-require_relative '../../../spec_helper'
-
-ruby_version_is ""..."3.1" do
-  require_relative 'spec_helper'
-  require_relative 'fixtures/server'
-
-  describe "Net::FTP#nlst" do
-    before :each do
-      @server = NetFTPSpecs::DummyFTP.new
-      @server.serve_once
-
-      @ftp = Net::FTP.new
-      @ftp.passive = false
-      @ftp.connect(@server.hostname, @server.server_port)
-    end
-
-    after :each do
-      @ftp.quit rescue nil
-      @ftp.close
-      @server.stop
-    end
-
-    describe "when passed no arguments" do
-      it "returns an Array containing a list of files in the current dir" do
-        @ftp.nlst.should == ["last_response_code.rb", "list.rb", "pwd.rb"]
-        @ftp.last_response.should == "226 transfer complete (NLST)\n"
-      end
-    end
-
-    describe "when passed dir" do
-      it "returns an Array containing a list of files in the passed dir" do
-        @ftp.nlst("test.folder").should == ["last_response_code.rb", "list.rb", "pwd.rb"]
-        @ftp.last_response.should == "226 transfer complete (NLST test.folder)\n"
-      end
-    end
-
-    describe "when the NLST command fails" do
-      it "raises a Net::FTPTempError when the response code is 450" do
-        @server.should_receive(:nlst).and_respond("450 Requested file action not taken..")
-        -> { @ftp.nlst }.should raise_error(Net::FTPTempError)
-      end
-
-      it "raises a Net::FTPPermError when the response code is 500" do
-        @server.should_receive(:nlst).and_respond("500 Syntax error, command unrecognized.")
-        -> { @ftp.nlst }.should raise_error(Net::FTPPermError)
-      end
-
-      it "raises a Net::FTPPermError when the response code is 501" do
-        @server.should_receive(:nlst).and_respond("501 Syntax error, command unrecognized.")
-        -> { @ftp.nlst }.should raise_error(Net::FTPPermError)
-      end
-
-      it "raises a Net::FTPPermError when the response code is 502" do
-        @server.should_receive(:nlst).and_respond("502 Command not implemented.")
-        -> { @ftp.nlst }.should raise_error(Net::FTPPermError)
-      end
-
-      it "raises a Net::FTPTempError when the response code is 421" do
-        @server.should_receive(:nlst).and_respond("421 Service not available, closing control connection.")
-        -> { @ftp.nlst }.should raise_error(Net::FTPTempError)
-      end
-
-      it "raises a Net::FTPPermError when the response code is 530" do
-        @server.should_receive(:nlst).and_respond("530 Not logged in.")
-        -> { @ftp.nlst }.should raise_error(Net::FTPPermError)
-      end
-    end
-
-    describe "when opening the data port fails" do
-      it "raises a Net::FTPPermError when the response code is 500" do
-        @server.should_receive(:eprt).and_respond("500 Syntax error, command unrecognized.")
-        @server.should_receive(:port).and_respond("500 Syntax error, command unrecognized.")
-        -> { @ftp.nlst }.should raise_error(Net::FTPPermError)
-      end
-
-      it "raises a Net::FTPPermError when the response code is 501" do
-        @server.should_receive(:eprt).and_respond("501 Syntax error in parameters or arguments.")
-        @server.should_receive(:port).and_respond("501 Syntax error in parameters or arguments.")
-        -> { @ftp.nlst }.should raise_error(Net::FTPPermError)
-      end
-
-      it "raises a Net::FTPTempError when the response code is 421" do
-        @server.should_receive(:eprt).and_respond("421 Service not available, closing control connection.")
-        @server.should_receive(:port).and_respond("421 Service not available, closing control connection.")
-        -> { @ftp.nlst }.should raise_error(Net::FTPTempError)
-      end
-
-      it "raises a Net::FTPPermError when the response code is 530" do
-        @server.should_receive(:eprt).and_respond("530 Not logged in.")
-        @server.should_receive(:port).and_respond("530 Not logged in.")
-        -> { @ftp.nlst }.should raise_error(Net::FTPPermError)
-      end
-    end
-  end
-end
diff --git a/spec/ruby/library/net/ftp/noop_spec.rb b/spec/ruby/library/net/ftp/noop_spec.rb
deleted file mode 100644
index 71011d4af7e63c..00000000000000
--- a/spec/ruby/library/net/ftp/noop_spec.rb
+++ /dev/null
@@ -1,41 +0,0 @@
-require_relative '../../../spec_helper'
-
-ruby_version_is ""..."3.1" do
-  require_relative 'spec_helper'
-  require_relative 'fixtures/server'
-
-  describe "Net::FTP#noop" do
-    before :each do
-      @server = NetFTPSpecs::DummyFTP.new
-      @server.serve_once
-
-      @ftp = Net::FTP.new
-      @ftp.connect(@server.hostname, @server.server_port)
-    end
-
-    after :each do
-      @ftp.quit rescue nil
-      @ftp.close
-      @server.stop
-    end
-
-    it "sends the NOOP command to the server" do
-      @ftp.noop
-      @ftp.last_response.should == "200 Command okay. (NOOP)\n"
-    end
-
-    it "returns nil" do
-      @ftp.noop.should be_nil
-    end
-
-    it "raises a Net::FTPPermError when the response code is 500" do
-      @server.should_receive(:noop).and_respond("500 Syntax error, command unrecognized.")
-      -> { @ftp.noop }.should raise_error(Net::FTPPermError)
-    end
-
-    it "raises a Net::FTPTempError when the response code is 421" do
-      @server.should_receive(:noop).and_respond("421 Service not available, closing control connection.")
-      -> { @ftp.noop }.should raise_error(Net::FTPTempError)
-    end
-  end
-end
diff --git a/spec/ruby/library/net/ftp/open_spec.rb b/spec/ruby/library/net/ftp/open_spec.rb
deleted file mode 100644
index 89187b98020dd9..00000000000000
--- a/spec/ruby/library/net/ftp/open_spec.rb
+++ /dev/null
@@ -1,58 +0,0 @@
-require_relative '../../../spec_helper'
-
-ruby_version_is ""..."3.1" do
-  require_relative 'spec_helper'
-
-  describe "Net::FTP.open" do
-    before :each do
-      @ftp = mock("Net::FTP instance")
-      Net::FTP.stub!(:new).and_return(@ftp)
-    end
-
-    describe "when passed no block" do
-      it "returns a new Net::FTP instance" do
-        Net::FTP.open("localhost").should equal(@ftp)
-      end
-
-      it "passes the passed arguments down to Net::FTP.new" do
-        Net::FTP.should_receive(:new).with("localhost", "user", "password", "account")
-        Net::FTP.open("localhost", "user", "password", "account")
-      end
-    end
-
-    describe "when passed a block" do
-      before :each do
-        @ftp.stub!(:close)
-      end
-
-      it "yields a new Net::FTP instance to the passed block" do
-        yielded = false
-        Net::FTP.open("localhost") do |ftp|
-          yielded = true
-          ftp.should equal(@ftp)
-        end
-        yielded.should be_true
-      end
-
-      it "closes the Net::FTP instance after yielding" do
-        Net::FTP.open("localhost") do |ftp|
-          ftp.should_receive(:close)
-        end
-      end
-
-      it "closes the Net::FTP instance even if an exception is raised while yielding" do
-        begin
-          Net::FTP.open("localhost") do |ftp|
-            ftp.should_receive(:close)
-            raise ArgumentError, "some exception"
-          end
-        rescue ArgumentError
-        end
-      end
-
-      it "returns the block's return value" do
-        Net::FTP.open("localhost") { :test }.should == :test
-      end
-    end
-  end
-end
diff --git a/spec/ruby/library/net/ftp/passive_spec.rb b/spec/ruby/library/net/ftp/passive_spec.rb
deleted file mode 100644
index f9c34efb7d9308..00000000000000
--- a/spec/ruby/library/net/ftp/passive_spec.rb
+++ /dev/null
@@ -1,31 +0,0 @@
-require_relative '../../../spec_helper'
-
-ruby_version_is ""..."3.1" do
-  require_relative 'spec_helper'
-
-  describe "Net::FTP#passive" do
-    it "returns true when self is in passive mode" do
-      ftp = Net::FTP.new
-      ftp.passive.should be_false
-
-      ftp.passive = true
-      ftp.passive.should be_true
-    end
-
-    it "is the value of Net::FTP.default_value by default" do
-      ruby_exe(fixture(__FILE__, "passive.rb")).should == "true"
-    end
-  end
-
-  describe "Net::FTP#passive=" do
-    it "sets self to passive mode when passed true" do
-      ftp = Net::FTP.new
-
-      ftp.passive = true
-      ftp.passive.should be_true
-
-      ftp.passive = false
-      ftp.passive.should be_false
-    end
-  end
-end
diff --git a/spec/ruby/library/net/ftp/put_spec.rb b/spec/ruby/library/net/ftp/put_spec.rb
deleted file mode 100644
index 36ba6c19637404..00000000000000
--- a/spec/ruby/library/net/ftp/put_spec.rb
+++ /dev/null
@@ -1,24 +0,0 @@
-require_relative '../../../spec_helper'
-
-ruby_version_is ""..."3.1" do
-  require_relative 'spec_helper'
-  require_relative 'fixtures/server'
-  require_relative 'shared/puttextfile'
-  require_relative 'shared/putbinaryfile'
-
-  describe "Net::FTP#put (binary mode)" do
-    before :each do
-      @binary_mode = true
-    end
-
-    it_behaves_like :net_ftp_putbinaryfile, :put
-  end
-
-  describe "Net::FTP#put (text mode)" do
-    before :each do
-      @binary_mode = false
-    end
-
-    it_behaves_like :net_ftp_puttextfile, :put
-  end
-end
diff --git a/spec/ruby/library/net/ftp/putbinaryfile_spec.rb b/spec/ruby/library/net/ftp/putbinaryfile_spec.rb
deleted file mode 100644
index 6ced5246fe15fb..00000000000000
--- a/spec/ruby/library/net/ftp/putbinaryfile_spec.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-require_relative '../../../spec_helper'
-
-ruby_version_is ""..."3.1" do
-  require_relative 'spec_helper'
-  require_relative 'fixtures/server'
-  require_relative 'shared/putbinaryfile'
-
-  describe "Net::FTP#putbinaryfile" do
-    it_behaves_like :net_ftp_putbinaryfile, :putbinaryfile
-  end
-end
diff --git a/spec/ruby/library/net/ftp/puttextfile_spec.rb b/spec/ruby/library/net/ftp/puttextfile_spec.rb
deleted file mode 100644
index 0cab6bd3c3245c..00000000000000
--- a/spec/ruby/library/net/ftp/puttextfile_spec.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-require_relative '../../../spec_helper'
-
-ruby_version_is ""..."3.1" do
-  require_relative 'spec_helper'
-  require_relative 'fixtures/server'
-  require_relative 'shared/puttextfile'
-
-  describe "Net::FTP#puttextfile" do
-    it_behaves_like :net_ftp_puttextfile, :puttextfile
-  end
-end
diff --git a/spec/ruby/library/net/ftp/pwd_spec.rb b/spec/ruby/library/net/ftp/pwd_spec.rb
deleted file mode 100644
index 856ff5ff9b0706..00000000000000
--- a/spec/ruby/library/net/ftp/pwd_spec.rb
+++ /dev/null
@@ -1,56 +0,0 @@
-require_relative '../../../spec_helper'
-
-ruby_version_is ""..."3.1" do
-  require_relative 'spec_helper'
-  require_relative 'fixtures/server'
-
-  describe "Net::FTP#pwd" do
-    before :each do
-      @server = NetFTPSpecs::DummyFTP.new
-      @server.serve_once
-
-      @ftp = Net::FTP.new
-      @ftp.connect(@server.hostname, @server.server_port)
-    end
-
-    after :each do
-      @ftp.quit rescue nil
-      @ftp.close
-      @server.stop
-    end
-
-    it "sends the PWD command to the server" do
-      @ftp.pwd
-      @ftp.last_response.should == "257 \"/some/dir/\" - current directory\n"
-    end
-
-    it "returns the current directory" do
-      @ftp.pwd.should == "/some/dir/"
-    end
-
-    it "raises a Net::FTPPermError when the response code is 500" do
-      @server.should_receive(:pwd).and_respond("500 Syntax error, command unrecognized.")
-      -> { @ftp.pwd }.should raise_error(Net::FTPPermError)
-    end
-
-    it "raises a Net::FTPPermError when the response code is 501" do
-      @server.should_receive(:pwd).and_respond("501 Syntax error in parameters or arguments.")
-      -> { @ftp.pwd }.should raise_error(Net::FTPPermError)
-    end
-
-    it "raises a Net::FTPPermError when the response code is 502" do
-      @server.should_receive(:pwd).and_respond("502 Command not implemented.")
-      -> { @ftp.pwd }.should raise_error(Net::FTPPermError)
-    end
-
-    it "raises a Net::FTPTempError when the response code is 421" do
-      @server.should_receive(:pwd).and_respond("421 Service not available, closing control connection.")
-      -> { @ftp.pwd }.should raise_error(Net::FTPTempError)
-    end
-
-    it "raises a Net::FTPPermError when the response code is 550" do
-      @server.should_receive(:pwd).and_respond("550 Requested action not taken.")
-      -> { @ftp.pwd }.should raise_error(Net::FTPPermError)
-    end
-  end
-end
diff --git a/spec/ruby/library/net/ftp/quit_spec.rb b/spec/ruby/library/net/ftp/quit_spec.rb
deleted file mode 100644
index 12b9fd3ceef44b..00000000000000
--- a/spec/ruby/library/net/ftp/quit_spec.rb
+++ /dev/null
@@ -1,36 +0,0 @@
-require_relative '../../../spec_helper'
-
-ruby_version_is ""..."3.1" do
-  require_relative 'spec_helper'
-  require_relative 'fixtures/server'
-
-  describe "Net::FTP#quit" do
-    before :each do
-      @server = NetFTPSpecs::DummyFTP.new
-      @server.serve_once
-
-      @ftp = Net::FTP.new
-      @ftp.connect(@server.hostname, @server.server_port)
-    end
-
-    after :each do
-      @ftp.quit rescue nil
-      @ftp.close
-      @server.stop
-    end
-
-    it "sends the QUIT command to the server" do
-      @ftp.quit
-      @ftp.last_response.should == "221 OK, bye\n"
-    end
-
-    it "does not close the socket automatically" do
-      @ftp.quit
-      @ftp.closed?.should be_false
-    end
-
-    it "returns nil" do
-      @ftp.quit.should be_nil
-    end
-  end
-end
diff --git a/spec/ruby/library/net/ftp/rename_spec.rb b/spec/ruby/library/net/ftp/rename_spec.rb
deleted file mode 100644
index aa7c1360b536f8..00000000000000
--- a/spec/ruby/library/net/ftp/rename_spec.rb
+++ /dev/null
@@ -1,97 +0,0 @@
-require_relative '../../../spec_helper'
-
-ruby_version_is ""..."3.1" do
-  require_relative 'spec_helper'
-  require_relative 'fixtures/server'
-
-  describe "Net::FTP#rename" do
-    before :each do
-      @server = NetFTPSpecs::DummyFTP.new
-      @server.serve_once
-
-      @ftp = Net::FTP.new
-      @ftp.connect(@server.hostname, @server.server_port)
-    end
-
-    after :each do
-      @ftp.quit rescue nil
-      @ftp.close
-      @server.stop
-    end
-
-    describe "when passed from_name, to_name" do
-      it "sends the RNFR command with the passed from_name and the RNTO command with the passed to_name to the server" do
-        @ftp.rename("from.file", "to.file")
-        @ftp.last_response.should == "250 Requested file action okay, completed. (Renamed from.file to to.file)\n"
-      end
-
-      it "returns something" do
-        @ftp.rename("from.file", "to.file").should be_nil
-      end
-    end
-
-    describe "when the RNFR command fails" do
-      it "raises a Net::FTPTempError when the response code is 450" do
-        @server.should_receive(:rnfr).and_respond("450 Requested file action not taken.")
-        -> { @ftp.rename("from.file", "to.file") }.should raise_error(Net::FTPTempError)
-      end
-
-      it "raises a Net::FTPPermError when the response code is 550" do
-        @server.should_receive(:rnfr).and_respond("550 Requested action not taken.")
-        -> { @ftp.rename("from.file", "to.file") }.should raise_error(Net::FTPPermError)
-      end
-
-      it "raises a Net::FTPPermError when the response code is 501" do
-        @server.should_receive(:rnfr).and_respond("501 Syntax error in parameters or arguments.")
-        -> { @ftp.rename("from.file", "to.file") }.should raise_error(Net::FTPPermError)
-      end
-
-      it "raises a Net::FTPPermError when the response code is 502" do
-        @server.should_receive(:rnfr).and_respond("502 Command not implemented.")
-        -> { @ftp.rename("from.file", "to.file") }.should raise_error(Net::FTPPermError)
-      end
-
-      it "raises a Net::FTPTempError when the response code is 421" do
-        @server.should_receive(:rnfr).and_respond("421 Service not available, closing control connection.")
-        -> { @ftp.rename("from.file", "to.file") }.should raise_error(Net::FTPTempError)
-      end
-
-      it "raises a Net::FTPPermError when the response code is 530" do
-        @server.should_receive(:rnfr).and_respond("530 Not logged in.")
-        -> { @ftp.rename("from.file", "to.file") }.should raise_error(Net::FTPPermError)
-      end
-    end
-
-    describe "when the RNTO command fails" do
-      it "raises a Net::FTPPermError when the response code is 532" do
-        @server.should_receive(:rnfr).and_respond("532 Need account for storing files.")
-        -> { @ftp.rename("from.file", "to.file") }.should raise_error(Net::FTPPermError)
-      end
-
-      it "raises a Net::FTPPermError when the response code is 553" do
-        @server.should_receive(:rnto).and_respond("553 Requested action not taken.")
-        -> { @ftp.rename("from.file", "to.file") }.should raise_error(Net::FTPPermError)
-      end
-
-      it "raises a Net::FTPPermError when the response code is 501" do
-        @server.should_receive(:rnto).and_respond("501 Syntax error in parameters or arguments.")
-        -> { @ftp.rename("from.file", "to.file") }.should raise_error(Net::FTPPermError)
-      end
-
-      it "raises a Net::FTPPermError when the response code is 502" do
-        @server.should_receive(:rnto).and_respond("502 Command not implemented.")
-        -> { @ftp.rename("from.file", "to.file") }.should raise_error(Net::FTPPermError)
-      end
-
-      it "raises a Net::FTPTempError when the response code is 421" do
-        @server.should_receive(:rnto).and_respond("421 Service not available, closing control connection.")
-        -> { @ftp.rename("from.file", "to.file") }.should raise_error(Net::FTPTempError)
-      end
-
-      it "raises a Net::FTPPermError when the response code is 530" do
-        @server.should_receive(:rnto).and_respond("530 Not logged in.")
-        -> { @ftp.rename("from.file", "to.file") }.should raise_error(Net::FTPPermError)
-      end
-    end
-  end
-end
diff --git a/spec/ruby/library/net/ftp/resume_spec.rb b/spec/ruby/library/net/ftp/resume_spec.rb
deleted file mode 100644
index 1b575c29f16be7..00000000000000
--- a/spec/ruby/library/net/ftp/resume_spec.rb
+++ /dev/null
@@ -1,26 +0,0 @@
-require_relative '../../../spec_helper'
-
-ruby_version_is ""..."3.1" do
-  require_relative 'spec_helper'
-
-  describe "Net::FTP#resume" do
-    it "returns true when self is set to resume uploads/downloads" do
-      ftp = Net::FTP.new
-      ftp.resume.should be_false
-
-      ftp.resume = true
-      ftp.resume.should be_true
-    end
-  end
-
-  describe "Net::FTP#resume=" do
-    it "sets self to resume uploads/downloads when set to true" do
-      ftp = Net::FTP.new
-      ftp.resume = true
-      ftp.resume.should be_true
-
-      ftp.resume = false
-      ftp.resume.should be_false
-    end
-  end
-end
diff --git a/spec/ruby/library/net/ftp/retrbinary_spec.rb b/spec/ruby/library/net/ftp/retrbinary_spec.rb
deleted file mode 100644
index 1f89f0d454df07..00000000000000
--- a/spec/ruby/library/net/ftp/retrbinary_spec.rb
+++ /dev/null
@@ -1,33 +0,0 @@
-require_relative '../../../spec_helper'
-
-ruby_version_is ""..."3.1" do
-  require_relative 'spec_helper'
-  require_relative 'fixtures/server'
-
-  describe "Net::FTP#retrbinary" do
-    before :each do
-      @server = NetFTPSpecs::DummyFTP.new
-      @server.serve_once
-
-      @ftp = Net::FTP.new
-      @ftp.connect(@server.hostname, @server.server_port)
-    end
-
-    after :each do
-      @ftp.quit rescue nil
-      @ftp.close
-      @server.stop
-    end
-
-    it "sends the passed command to the server" do
-      @ftp.retrbinary("RETR test", 4096) {}
-      @ftp.last_response.should == "226 Closing data connection. (RETR test)\n"
-    end
-
-    it "yields the received content as binary blocks of the passed size" do
-      res = []
-      @ftp.retrbinary("RETR test", 10) { |bin| res << bin }
-      res.should == [ "This is th", "e content\n", "of the fil", "e named 't", "est'.\n" ]
-    end
-  end
-end
diff --git a/spec/ruby/library/net/ftp/retrlines_spec.rb b/spec/ruby/library/net/ftp/retrlines_spec.rb
deleted file mode 100644
index f26b0086803f2f..00000000000000
--- a/spec/ruby/library/net/ftp/retrlines_spec.rb
+++ /dev/null
@@ -1,37 +0,0 @@
-require_relative '../../../spec_helper'
-
-ruby_version_is ""..."3.1" do
-  require_relative 'spec_helper'
-  require_relative 'fixtures/server'
-
-  describe "Net::FTP#retrlines" do
-    before :each do
-      @server = NetFTPSpecs::DummyFTP.new
-      @server.serve_once
-
-      @ftp = Net::FTP.new
-      @ftp.connect(@server.hostname, @server.server_port)
-    end
-
-    after :each do
-      @ftp.quit rescue nil
-      @ftp.close
-      @server.stop
-    end
-
-    it "sends the passed command over the socket" do
-      @ftp.retrlines("LIST test.dir") {}
-      @ftp.last_response.should == "226 transfer complete (LIST test.dir)\n"
-    end
-
-    it "yields each received line to the passed block" do
-      res = []
-      @ftp.retrlines("LIST test.dir") { |x| res << x }
-      res.should == [
-        "-rw-r--r--  1 spec  staff  507 17 Jul 18:41 last_response_code.rb",
-        "-rw-r--r--  1 spec  staff   50 17 Jul 18:41 list.rb",
-        "-rw-r--r--  1 spec  staff   48 17 Jul 18:41 pwd.rb"
-      ]
-    end
-  end
-end
diff --git a/spec/ruby/library/net/ftp/return_code_spec.rb b/spec/ruby/library/net/ftp/return_code_spec.rb
deleted file mode 100644
index 67fc9d3b19f72d..00000000000000
--- a/spec/ruby/library/net/ftp/return_code_spec.rb
+++ /dev/null
@@ -1,27 +0,0 @@
-require_relative '../../../spec_helper'
-
-ruby_version_is ""..."3.1" do
-  require_relative 'spec_helper'
-
-  describe "Net::FTP#return_code" do
-    before :each do
-      @ftp = Net::FTP.new
-    end
-
-    it "outputs a warning and returns a newline" do
-      -> do
-        @ftp.return_code.should == "\n"
-      end.should complain(/warning: Net::FTP#return_code is obsolete and do nothing/)
-    end
-  end
-
-  describe "Net::FTP#return_code=" do
-    before :each do
-      @ftp = Net::FTP.new
-    end
-
-    it "outputs a warning" do
-      -> { @ftp.return_code = 123 }.should complain(/warning: Net::FTP#return_code= is obsolete and do nothing/)
-    end
-  end
-end
diff --git a/spec/ruby/library/net/ftp/rmdir_spec.rb b/spec/ruby/library/net/ftp/rmdir_spec.rb
deleted file mode 100644
index 5b9586c6f067fd..00000000000000
--- a/spec/ruby/library/net/ftp/rmdir_spec.rb
+++ /dev/null
@@ -1,61 +0,0 @@
-require_relative '../../../spec_helper'
-
-ruby_version_is ""..."3.1" do
-  require_relative 'spec_helper'
-  require_relative 'fixtures/server'
-
-  describe "Net::FTP#rmdir" do
-    before :each do
-      @server = NetFTPSpecs::DummyFTP.new
-      @server.serve_once
-
-      @ftp = Net::FTP.new
-      @ftp.connect(@server.hostname, @server.server_port)
-    end
-
-    after :each do
-      @ftp.quit rescue nil
-      @ftp.close
-      @server.stop
-    end
-
-    it "sends the RMD command with the passed pathname to the server" do
-      @ftp.rmdir("test.folder")
-      @ftp.last_response.should == "250 Requested file action okay, completed. (RMD test.folder)\n"
-    end
-
-    it "returns nil" do
-      @ftp.rmdir("test.folder").should be_nil
-    end
-
-    it "raises a Net::FTPPermError when the response code is 500" do
-      @server.should_receive(:rmd).and_respond("500 Syntax error, command unrecognized.")
-      -> { @ftp.rmdir("test.folder") }.should raise_error(Net::FTPPermError)
-    end
-
-    it "raises a Net::FTPPermError when the response code is 501" do
-      @server.should_receive(:rmd).and_respond("501 Syntax error in parameters or arguments.")
-      -> { @ftp.rmdir("test.folder") }.should raise_error(Net::FTPPermError)
-    end
-
-    it "raises a Net::FTPPermError when the response code is 502" do
-      @server.should_receive(:rmd).and_respond("502 Command not implemented.")
-      -> { @ftp.rmdir("test.folder") }.should raise_error(Net::FTPPermError)
-    end
-
-    it "raises a Net::FTPTempError when the response code is 421" do
-      @server.should_receive(:rmd).and_respond("421 Service not available, closing control connection.")
-      -> { @ftp.rmdir("test.folder") }.should raise_error(Net::FTPTempError)
-    end
-
-    it "raises a Net::FTPPermError when the response code is 530" do
-      @server.should_receive(:rmd).and_respond("530 Not logged in.")
-      -> { @ftp.rmdir("test.folder") }.should raise_error(Net::FTPPermError)
-    end
-
-    it "raises a Net::FTPPermError when the response code is 550" do
-      @server.should_receive(:rmd).and_respond("550 Requested action not taken.")
-      -> { @ftp.rmdir("test.folder") }.should raise_error(Net::FTPPermError)
-    end
-  end
-end
diff --git a/spec/ruby/library/net/ftp/sendcmd_spec.rb b/spec/ruby/library/net/ftp/sendcmd_spec.rb
deleted file mode 100644
index fefb89ae0b167e..00000000000000
--- a/spec/ruby/library/net/ftp/sendcmd_spec.rb
+++ /dev/null
@@ -1,57 +0,0 @@
-require_relative '../../../spec_helper'
-
-ruby_version_is ""..."3.1" do
-  require_relative 'spec_helper'
-  require_relative 'fixtures/server'
-
-  describe "Net::FTP#sendcmd" do
-    before :each do
-      @server = NetFTPSpecs::DummyFTP.new
-      @server.serve_once
-
-      @ftp = Net::FTP.new
-      @ftp.connect(@server.hostname, @server.server_port)
-    end
-
-    after :each do
-      @ftp.quit rescue nil
-      @ftp.close
-      @server.stop
-    end
-
-    it "sends the passed command to the server" do
-      @ftp.sendcmd("HELP")
-      @ftp.last_response.should == "211 System status, or system help reply. (HELP)\n"
-    end
-
-    it "returns the server's response" do
-      @ftp.sendcmd("HELP").should == "211 System status, or system help reply. (HELP)\n"
-    end
-
-    it "raises no error when the response code is 1xx, 2xx or 3xx" do
-      @server.should_receive(:help).and_respond("120 Service ready in nnn minutes.")
-      -> { @ftp.sendcmd("HELP") }.should_not raise_error
-
-      @server.should_receive(:help).and_respond("200 Command okay.")
-      -> { @ftp.sendcmd("HELP") }.should_not raise_error
-
-      @server.should_receive(:help).and_respond("350 Requested file action pending further information.")
-      -> { @ftp.sendcmd("HELP") }.should_not raise_error
-    end
-
-    it "raises a Net::FTPTempError when the response code is 4xx" do
-      @server.should_receive(:help).and_respond("421 Service not available, closing control connection.")
-      -> { @ftp.sendcmd("HELP") }.should raise_error(Net::FTPTempError)
-    end
-
-    it "raises a Net::FTPPermError when the response code is 5xx" do
-      @server.should_receive(:help).and_respond("500 Syntax error, command unrecognized.")
-      -> { @ftp.sendcmd("HELP") }.should raise_error(Net::FTPPermError)
-    end
-
-    it "raises a Net::FTPProtoError when the response code is not between 1xx-5xx" do
-      @server.should_receive(:help).and_respond("999 Invalid response.")
-      -> { @ftp.sendcmd("HELP") }.should raise_error(Net::FTPProtoError)
-    end
-  end
-end
diff --git a/spec/ruby/library/net/ftp/set_socket_spec.rb b/spec/ruby/library/net/ftp/set_socket_spec.rb
deleted file mode 100644
index 6c8b58fb790a32..00000000000000
--- a/spec/ruby/library/net/ftp/set_socket_spec.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-require_relative '../../../spec_helper'
-
-ruby_version_is ""..."3.1" do
-  require_relative 'spec_helper'
-
-  describe "Net::FTP#set_socket" do
-    # TODO: I won't spec this method, as it is not used
-    #       anywhere and it should be private anyway.
-    it "needs to be reviewed for spec completeness"
-  end
-end
diff --git a/spec/ruby/library/net/ftp/site_spec.rb b/spec/ruby/library/net/ftp/site_spec.rb
deleted file mode 100644
index ca4f4991124425..00000000000000
--- a/spec/ruby/library/net/ftp/site_spec.rb
+++ /dev/null
@@ -1,56 +0,0 @@
-require_relative '../../../spec_helper'
-
-ruby_version_is ""..."3.1" do
-  require_relative 'spec_helper'
-  require_relative 'fixtures/server'
-
-  describe "Net::FTP#site" do
-    before :each do
-      @server = NetFTPSpecs::DummyFTP.new
-      @server.serve_once
-
-      @ftp = Net::FTP.new
-      @ftp.connect(@server.hostname, @server.server_port)
-    end
-
-    after :each do
-      @ftp.quit rescue nil
-      @ftp.close
-      @server.stop
-    end
-
-    it "sends the SITE command with the passed argument to the server" do
-      @ftp.site("param")
-      @ftp.last_response.should == "200 Command okay. (SITE param)\n"
-    end
-
-    it "returns nil" do
-      @ftp.site("param").should be_nil
-    end
-
-    it "does not raise an error when the response code is 202" do
-      @server.should_receive(:site).and_respond("202 Command not implemented, superfluous at this site.")
-      -> { @ftp.site("param") }.should_not raise_error
-    end
-
-    it "raises a Net::FTPPermError when the response code is 500" do
-      @server.should_receive(:site).and_respond("500 Syntax error, command unrecognized.")
-      -> { @ftp.site("param") }.should raise_error(Net::FTPPermError)
-    end
-
-    it "raises a Net::FTPPermError when the response code is 501" do
-      @server.should_receive(:site).and_respond("501 Syntax error in parameters or arguments.")
-      -> { @ftp.site("param") }.should raise_error(Net::FTPPermError)
-    end
-
-    it "raises a Net::FTPTempError when the response code is 421" do
-      @server.should_receive(:site).and_respond("421 Service not available, closing control connection.")
-      -> { @ftp.site("param") }.should raise_error(Net::FTPTempError)
-    end
-
-    it "raises a Net::FTPPermError when the response code is 530" do
-      @server.should_receive(:site).and_respond("530 Requested action not taken.")
-      -> { @ftp.site("param") }.should raise_error(Net::FTPPermError)
-    end
-  end
-end
diff --git a/spec/ruby/library/net/ftp/size_spec.rb b/spec/ruby/library/net/ftp/size_spec.rb
deleted file mode 100644
index 0c20b105493115..00000000000000
--- a/spec/ruby/library/net/ftp/size_spec.rb
+++ /dev/null
@@ -1,51 +0,0 @@
-require_relative '../../../spec_helper'
-
-ruby_version_is ""..."3.1" do
-  require_relative 'spec_helper'
-  require_relative 'fixtures/server'
-
-  describe "Net::FTP#size" do
-    before :each do
-      @server = NetFTPSpecs::DummyFTP.new
-      @server.serve_once
-
-      @ftp = Net::FTP.new
-      @ftp.connect(@server.hostname, @server.server_port)
-    end
-
-    after :each do
-      @ftp.quit rescue nil
-      @ftp.close
-      @server.stop
-    end
-
-    it "sends the SIZE command to the server" do
-      @ftp.size("test.file")
-      @ftp.last_response.should == "213 1024\n"
-    end
-
-    it "returns the size of the passed file as Integer" do
-      @ftp.size("test.file").should eql(1024)
-    end
-
-    it "raises a Net::FTPPermError when the response code is 500" do
-      @server.should_receive(:size).and_respond("500 Syntax error, command unrecognized.")
-      -> { @ftp.size("test.file") }.should raise_error(Net::FTPPermError)
-    end
-
-    it "raises a Net::FTPPermError when the response code is 501" do
-      @server.should_receive(:size).and_respond("501 Syntax error in parameters or arguments.")
-      -> { @ftp.size("test.file") }.should raise_error(Net::FTPPermError)
-    end
-
-    it "raises a Net::FTPTempError when the response code is 421" do
-      @server.should_receive(:size).and_respond("421 Service not available, closing control connection.")
-      -> { @ftp.size("test.file") }.should raise_error(Net::FTPTempError)
-    end
-
-    it "raises a Net::FTPPermError when the response code is 550" do
-      @server.should_receive(:size).and_respond("550 Requested action not taken.")
-      -> { @ftp.size("test.file") }.should raise_error(Net::FTPPermError)
-    end
-  end
-end
diff --git a/spec/ruby/library/net/ftp/status_spec.rb b/spec/ruby/library/net/ftp/status_spec.rb
deleted file mode 100644
index 03bc5d6e05d6da..00000000000000
--- a/spec/ruby/library/net/ftp/status_spec.rb
+++ /dev/null
@@ -1,70 +0,0 @@
-require_relative '../../../spec_helper'
-
-ruby_version_is ""..."3.1" do
-  require_relative 'spec_helper'
-  require_relative 'fixtures/server'
-
-  describe "Net::FTP#status" do
-    before :each do
-      @server = NetFTPSpecs::DummyFTP.new
-      @server.serve_once
-
-      @ftp = Net::FTP.new
-      @ftp.connect(@server.hostname, @server.server_port)
-    end
-
-    after :each do
-      @ftp.quit rescue nil
-      @ftp.close
-      @server.stop
-    end
-
-    it "sends the STAT command to the server" do
-      @ftp.status
-      @ftp.last_response.should == "211 System status, or system help reply. (STAT)\n"
-    end
-
-    it "sends the STAT command with an optional parameter to the server" do
-      @ftp.status("/pub").should == "211 System status, or system help reply. (STAT /pub)\n"
-    end
-
-    it "returns the received information" do
-      @ftp.status.should == "211 System status, or system help reply. (STAT)\n"
-    end
-
-    it "does not raise an error when the response code is 212" do
-      @server.should_receive(:stat).and_respond("212 Directory status.")
-      -> { @ftp.status }.should_not raise_error
-    end
-
-    it "does not raise an error when the response code is 213" do
-      @server.should_receive(:stat).and_respond("213 File status.")
-      -> { @ftp.status }.should_not raise_error
-    end
-
-    it "raises a Net::FTPPermError when the response code is 500" do
-      @server.should_receive(:stat).and_respond("500 Syntax error, command unrecognized.")
-      -> { @ftp.status }.should raise_error(Net::FTPPermError)
-    end
-
-    it "raises a Net::FTPPermError when the response code is 501" do
-      @server.should_receive(:stat).and_respond("501 Syntax error in parameters or arguments.")
-      -> { @ftp.status }.should raise_error(Net::FTPPermError)
-    end
-
-    it "raises a Net::FTPPermError when the response code is 502" do
-      @server.should_receive(:stat).and_respond("502 Command not implemented.")
-      -> { @ftp.status }.should raise_error(Net::FTPPermError)
-    end
-
-    it "raises a Net::FTPTempError when the response code is 421" do
-      @server.should_receive(:stat).and_respond("421 Service not available, closing control connection.")
-      -> { @ftp.status }.should raise_error(Net::FTPTempError)
-    end
-
-    it "raises a Net::FTPPermError when the response code is 530" do
-      @server.should_receive(:stat).and_respond("530 Requested action not taken.")
-      -> { @ftp.status }.should raise_error(Net::FTPPermError)
-    end
-  end
-end
diff --git a/spec/ruby/library/net/ftp/storbinary_spec.rb b/spec/ruby/library/net/ftp/storbinary_spec.rb
deleted file mode 100644
index 6f7334461201c1..00000000000000
--- a/spec/ruby/library/net/ftp/storbinary_spec.rb
+++ /dev/null
@@ -1,51 +0,0 @@
-require_relative '../../../spec_helper'
-
-ruby_version_is ""..."3.1" do
-  require_relative 'spec_helper'
-  require_relative 'fixtures/server'
-
-  describe "Net::FTP#storbinary" do
-    before :each do
-      @server = NetFTPSpecs::DummyFTP.new
-      @server.serve_once
-
-      @local_fixture_file  = __dir__ + "/fixtures/putbinaryfile"
-      @tmp_file = tmp("binaryfile", false)
-
-      @ftp = Net::FTP.new
-      @ftp.connect(@server.hostname, @server.server_port)
-    end
-
-    after :each do
-      @ftp.quit rescue nil
-      @ftp.close
-      @server.stop
-
-      rm_r @tmp_file
-    end
-
-    it "sends the passed command and the passed File object's content to the server" do
-      File.open(@local_fixture_file) do |f|
-        f.binmode
-
-        @ftp.storbinary("STOR binary", f, 4096) {}
-        @ftp.last_response.should == "200 OK, Data received. (STOR binary)\n"
-      end
-    end
-
-    it "yields the transmitted content as binary blocks of the passed size" do
-      File.open(@local_fixture_file) do |f|
-        f.binmode
-
-        res = []
-        @ftp.storbinary("STOR binary", f, 10) { |x| res << x }
-        res.should == [
-          "This is an", " example f",
-          "ile\nwhich ", "is going t",
-          "o be trans", "mitted\nusi",
-          "ng #putbin", "aryfile.\n"
-        ]
-      end
-    end
-  end
-end
diff --git a/spec/ruby/library/net/ftp/storlines_spec.rb b/spec/ruby/library/net/ftp/storlines_spec.rb
deleted file mode 100644
index 32b9448732b4b0..00000000000000
--- a/spec/ruby/library/net/ftp/storlines_spec.rb
+++ /dev/null
@@ -1,46 +0,0 @@
-require_relative '../../../spec_helper'
-
-ruby_version_is ""..."3.1" do
-  require_relative 'spec_helper'
-  require_relative 'fixtures/server'
-
-  describe "Net::FTP#storlines" do
-    before :each do
-      @server = NetFTPSpecs::DummyFTP.new
-      @server.serve_once
-
-      @local_fixture_file  = __dir__ + "/fixtures/puttextfile"
-      @tmp_file = tmp("textfile", false)
-
-      @ftp = Net::FTP.new
-      @ftp.connect(@server.hostname, @server.server_port)
-    end
-
-    after :each do
-      @ftp.quit rescue nil
-      @ftp.close
-      @server.stop
-
-      rm_r @tmp_file
-    end
-
-    it "sends the passed command and the passed File object's content to the server" do
-      File.open(@local_fixture_file) do |f|
-        @ftp.storlines("STOR text", f) {}
-        @ftp.last_response.should == "200 OK, Data received. (STOR text)\n"
-      end
-    end
-
-    it "yields each line of the transmitted content" do
-      File.open(@local_fixture_file) do |f|
-        res = []
-        @ftp.storlines("STOR text", f) { |x| res << x }
-        res.should == [
-          "This is an example file\r\n",
-          "which is going to be transmitted\r\n",
-          "using #puttextfile.\r\n"
-        ]
-      end
-    end
-  end
-end
diff --git a/spec/ruby/library/net/ftp/system_spec.rb b/spec/ruby/library/net/ftp/system_spec.rb
deleted file mode 100644
index 0630bbe1f612dd..00000000000000
--- a/spec/ruby/library/net/ftp/system_spec.rb
+++ /dev/null
@@ -1,51 +0,0 @@
-require_relative '../../../spec_helper'
-
-ruby_version_is ""..."3.1" do
-  require_relative 'spec_helper'
-  require_relative 'fixtures/server'
-
-  describe "Net::FTP#system" do
-    before :each do
-      @server = NetFTPSpecs::DummyFTP.new
-      @server.serve_once
-
-      @ftp = Net::FTP.new
-      @ftp.connect(@server.hostname, @server.server_port)
-    end
-
-    after :each do
-      @ftp.quit rescue nil
-      @ftp.close
-      @server.stop
-    end
-
-    it "sends the SYST command to the server" do
-      @ftp.system
-      @ftp.last_response.should =~ /\A215 FTP Dummy Server \(SYST\)\Z/
-    end
-
-    it "returns the received information" do
-      @ftp.system.should =~ /\AFTP Dummy Server \(SYST\)\Z/
-    end
-
-    it "raises a Net::FTPPermError when the response code is 500" do
-      @server.should_receive(:syst).and_respond("500 Syntax error, command unrecognized.")
-      -> { @ftp.system }.should raise_error(Net::FTPPermError)
-    end
-
-    it "raises a Net::FTPPermError when the response code is 501" do
-      @server.should_receive(:syst).and_respond("501 Syntax error in parameters or arguments.")
-      -> { @ftp.system }.should raise_error(Net::FTPPermError)
-    end
-
-    it "raises a Net::FTPPermError when the response code is 502" do
-      @server.should_receive(:syst).and_respond("502 Command not implemented.")
-      -> { @ftp.system }.should raise_error(Net::FTPPermError)
-    end
-
-    it "raises a Net::FTPTempError when the response code is 421" do
-      @server.should_receive(:syst).and_respond("421 Service not available, closing control connection.")
-      -> { @ftp.system }.should raise_error(Net::FTPTempError)
-    end
-  end
-end
diff --git a/spec/ruby/library/net/ftp/voidcmd_spec.rb b/spec/ruby/library/net/ftp/voidcmd_spec.rb
deleted file mode 100644
index ee74455d63a0df..00000000000000
--- a/spec/ruby/library/net/ftp/voidcmd_spec.rb
+++ /dev/null
@@ -1,57 +0,0 @@
-require_relative '../../../spec_helper'
-
-ruby_version_is ""..."3.1" do
-  require_relative 'spec_helper'
-  require_relative 'fixtures/server'
-
-  describe "Net::FTP#voidcmd" do
-    before :each do
-      @server = NetFTPSpecs::DummyFTP.new
-      @server.serve_once
-
-      @ftp = Net::FTP.new
-      @ftp.connect(@server.hostname, @server.server_port)
-    end
-
-    after :each do
-      @ftp.quit rescue nil
-      @ftp.close
-      @server.stop
-    end
-
-    it "sends the passed command to the server" do
-      @server.should_receive(:help).and_respond("2xx Does not raise.")
-      -> { @ftp.voidcmd("HELP") }.should_not raise_error
-    end
-
-    it "returns nil" do
-      @server.should_receive(:help).and_respond("2xx Does not raise.")
-      @ftp.voidcmd("HELP").should be_nil
-    end
-
-    it "raises a Net::FTPReplyError when the response code is 1xx" do
-      @server.should_receive(:help).and_respond("1xx Does raise a Net::FTPReplyError.")
-      -> { @ftp.voidcmd("HELP")  }.should raise_error(Net::FTPReplyError)
-    end
-
-    it "raises a Net::FTPReplyError when the response code is 3xx" do
-      @server.should_receive(:help).and_respond("3xx Does raise a Net::FTPReplyError.")
-      -> { @ftp.voidcmd("HELP") }.should raise_error(Net::FTPReplyError)
-    end
-
-    it "raises a Net::FTPTempError when the response code is 4xx" do
-      @server.should_receive(:help).and_respond("4xx Does raise a Net::FTPTempError.")
-      -> { @ftp.voidcmd("HELP") }.should raise_error(Net::FTPTempError)
-    end
-
-    it "raises a Net::FTPPermError when the response code is 5xx" do
-      @server.should_receive(:help).and_respond("5xx Does raise a Net::FTPPermError.")
-      -> { @ftp.voidcmd("HELP") }.should raise_error(Net::FTPPermError)
-    end
-
-    it "raises a Net::FTPProtoError when the response code is not valid" do
-      @server.should_receive(:help).and_respond("999 Does raise a Net::FTPProtoError.")
-      -> { @ftp.voidcmd("HELP") }.should raise_error(Net::FTPProtoError)
-    end
-  end
-end
diff --git a/spec/ruby/library/net/ftp/welcome_spec.rb b/spec/ruby/library/net/ftp/welcome_spec.rb
deleted file mode 100644
index e5414ef60757c7..00000000000000
--- a/spec/ruby/library/net/ftp/welcome_spec.rb
+++ /dev/null
@@ -1,28 +0,0 @@
-require_relative '../../../spec_helper'
-
-ruby_version_is ""..."3.1" do
-  require_relative 'spec_helper'
-  require_relative 'fixtures/server'
-
-  describe "Net::FTP#welcome" do
-    before :each do
-      @server = NetFTPSpecs::DummyFTP.new
-      @server.serve_once
-
-      @ftp = Net::FTP.new
-      @ftp.connect(@server.hostname, @server.server_port)
-    end
-
-    after :each do
-      @ftp.quit rescue nil
-      @ftp.close
-      @server.stop
-    end
-
-    it "returns the server's welcome message" do
-      @ftp.welcome.should be_nil
-      @ftp.login
-      @ftp.welcome.should == "230 User logged in, proceed. (USER anonymous)\n"
-    end
-  end
-end
diff --git a/spec/ruby/library/net/http/http/delete_spec.rb b/spec/ruby/library/net/http/http/delete_spec.rb
deleted file mode 100644
index 160c65311580f5..00000000000000
--- a/spec/ruby/library/net/http/http/delete_spec.rb
+++ /dev/null
@@ -1,21 +0,0 @@
-require_relative '../../../../spec_helper'
-require 'net/http'
-require_relative 'fixtures/http_server'
-
-describe "Net::HTTP#delete" do
-  before :each do
-    NetHTTPSpecs.start_server
-    @http = Net::HTTP.start("localhost", NetHTTPSpecs.port)
-  end
-
-  after :each do
-    @http.finish if @http.started?
-    NetHTTPSpecs.stop_server
-  end
-
-  it "sends a DELETE request to the passed path and returns the response" do
-    response = @http.delete("/request")
-    response.should be_kind_of(Net::HTTPResponse)
-    response.body.should == "Request type: DELETE"
-  end
-end
diff --git a/spec/ruby/library/net/http/http/get_spec.rb b/spec/ruby/library/net/http/http/get_spec.rb
deleted file mode 100644
index a3b62e37541b99..00000000000000
--- a/spec/ruby/library/net/http/http/get_spec.rb
+++ /dev/null
@@ -1,94 +0,0 @@
-require_relative '../../../../spec_helper'
-require 'net/http'
-require_relative 'fixtures/http_server'
-
-describe "Net::HTTP.get" do
-  before :each do
-    NetHTTPSpecs.start_server
-    @port = NetHTTPSpecs.port
-  end
-
-  after :each do
-    NetHTTPSpecs.stop_server
-  end
-
-  describe "when passed URI" do
-    it "returns the body of the specified uri" do
-      Net::HTTP.get(URI.parse("http://localhost:#{@port}/")).should == "This is the index page."
-    end
-  end
-
-  describe "when passed host, path, port" do
-    it "returns the body of the specified host-path-combination" do
-      Net::HTTP.get('localhost', "/", @port).should == "This is the index page."
-    end
-  end
-end
-
-quarantine! do # These specs fail frequently with CHECK_LEAKS=true
-describe "Net::HTTP.get" do
-  describe "when reading gzipped contents" do
-    def start_threads
-      require 'zlib'
-      require 'stringio'
-
-      server = nil
-      server_thread = Thread.new do
-        server = TCPServer.new("127.0.0.1", 0)
-        begin
-          c = server.accept
-        ensure
-          server.close
-        end
-        c.print "HTTP/1.1 200\r\n"
-        c.print "Content-Type: text/plain\r\n"
-        c.print "Content-Encoding: gzip\r\n"
-        s = StringIO.new
-        z = Zlib::GzipWriter.new(s)
-        begin
-          z.write 'Hello World!'
-        ensure
-          z.close
-        end
-        c.print "Content-Length: #{s.length}\r\n\r\n"
-        # Write partial gzip content
-        c.write s.string.byteslice(0..-2)
-        c.flush
-        c
-      end
-      Thread.pass until server && server_thread.stop?
-
-      client_thread = Thread.new do
-        Thread.current.report_on_exception = false
-        Net::HTTP.get("127.0.0.1", '/', server.connect_address.ip_port)
-      end
-
-      socket = server_thread.value
-      Thread.pass until client_thread.stop?
-
-      [socket, client_thread]
-    end
-
-    it "propagates exceptions interrupting the thread and does not replace it with Zlib::BufError" do
-      my_exception = Class.new(RuntimeError)
-      socket, client_thread = start_threads
-      begin
-        client_thread.raise my_exception, "my exception"
-        -> { client_thread.value }.should raise_error(my_exception)
-      ensure
-        socket.close
-      end
-    end
-
-    it "lets the kill Thread exception goes through and does not replace it with Zlib::BufError" do
-      socket, client_thread = start_threads
-      begin
-        client_thread.kill
-        client_thread.value.should == nil
-      ensure
-        socket.close
-      end
-    end
-  end
-end
-end
diff --git a/spec/ruby/library/net/http/http/initialize_spec.rb b/spec/ruby/library/net/http/http/initialize_spec.rb
deleted file mode 100644
index 7683713a0ed598..00000000000000
--- a/spec/ruby/library/net/http/http/initialize_spec.rb
+++ /dev/null
@@ -1,46 +0,0 @@
-require_relative '../../../../spec_helper'
-require 'net/http'
-
-describe "Net::HTTP#initialize" do
-  it "is private" do
-    Net::HTTP.should have_private_instance_method(:initialize)
-  end
-
-  describe "when passed address" do
-    before :each do
-      @net = Net::HTTP.allocate
-      @net.send(:initialize, "localhost")
-    end
-
-    it "sets the new Net::HTTP instance's address to the passed address" do
-      @net.address.should == "localhost"
-    end
-
-    it "sets the new Net::HTTP instance's port to the default HTTP port" do
-      @net.port.should eql(Net::HTTP.default_port)
-    end
-
-    it "does not start the new Net::HTTP instance" do
-      @net.started?.should be_false
-    end
-  end
-
-  describe "when passed address, port" do
-    before :each do
-      @net = Net::HTTP.allocate
-      @net.send(:initialize, "localhost", 3333)
-    end
-
-    it "sets the new Net::HTTP instance's address to the passed address" do
-      @net.address.should == "localhost"
-    end
-
-    it "sets the new Net::HTTP instance's port to the passed port" do
-      @net.port.should eql(3333)
-    end
-
-    it "does not start the new Net::HTTP instance" do
-      @net.started?.should be_false
-    end
-  end
-end
diff --git a/spec/ruby/library/net/http/http/inspect_spec.rb b/spec/ruby/library/net/http/http/inspect_spec.rb
deleted file mode 100644
index b1e799ca345d99..00000000000000
--- a/spec/ruby/library/net/http/http/inspect_spec.rb
+++ /dev/null
@@ -1,24 +0,0 @@
-require_relative '../../../../spec_helper'
-require 'net/http'
-require_relative 'fixtures/http_server'
-
-describe "Net::HTTP#inspect" do
-  before :each do
-    NetHTTPSpecs.start_server
-    @port = NetHTTPSpecs.port
-    @http = Net::HTTP.new("localhost", @port)
-  end
-
-  after :each do
-    @http.finish if @http.started?
-    NetHTTPSpecs.stop_server
-  end
-
-  it "returns a String representation of self" do
-    @http.inspect.should be_kind_of(String)
-    @http.inspect.should == "#<Net::HTTP localhost:#{@port} open=false>"
-
-    @http.start
-    @http.inspect.should == "#<Net::HTTP localhost:#{@port} open=true>"
-  end
-end
diff --git a/spec/ruby/library/net/http/http/put_spec.rb b/spec/ruby/library/net/http/http/put_spec.rb
deleted file mode 100644
index 3ca0d0963ed15c..00000000000000
--- a/spec/ruby/library/net/http/http/put_spec.rb
+++ /dev/null
@@ -1,24 +0,0 @@
-require_relative '../../../../spec_helper'
-require 'net/http'
-require_relative 'fixtures/http_server'
-
-describe "Net::HTTP#put" do
-  before :each do
-    NetHTTPSpecs.start_server
-    @http = Net::HTTP.start("localhost", NetHTTPSpecs.port)
-  end
-
-  after :each do
-    @http.finish if @http.started?
-    NetHTTPSpecs.stop_server
-  end
-
-  it "sends an put request to the passed path and returns the response" do
-    response = @http.put("/request", "test=test")
-    response.body.should == "Request type: PUT"
-  end
-
-  it "returns a Net::HTTPResponse" do
-    @http.put("/request", "test=test").should be_kind_of(Net::HTTPResponse)
-  end
-end
diff --git a/spec/ruby/library/net/http/httpexceptions/initialize_spec.rb b/spec/ruby/library/net/http/httpexceptions/initialize_spec.rb
deleted file mode 100644
index 8e3fd8cc020287..00000000000000
--- a/spec/ruby/library/net/http/httpexceptions/initialize_spec.rb
+++ /dev/null
@@ -1,17 +0,0 @@
-require_relative '../../../../spec_helper'
-require 'net/http'
-require_relative 'fixtures/classes'
-
-describe "Net::HTTPExceptions#initialize when passed message, response" do
-  before :each do
-    @exception = NetHTTPExceptionsSpecs::Simple.new("error message", "a http response")
-  end
-
-  it "calls super with the passed message" do
-    @exception.message.should == "error message"
-  end
-
-  it "sets self's response to the passed response" do
-    @exception.response.should == "a http response"
-  end
-end
diff --git a/spec/ruby/library/net/http/httpexceptions/response_spec.rb b/spec/ruby/library/net/http/httpexceptions/response_spec.rb
deleted file mode 100644
index 205b2bc21282d8..00000000000000
--- a/spec/ruby/library/net/http/httpexceptions/response_spec.rb
+++ /dev/null
@@ -1,10 +0,0 @@
-require_relative '../../../../spec_helper'
-require 'net/http'
-require_relative 'fixtures/classes'
-
-describe "Net::HTTPExceptions#response" do
-  it "returns self's response" do
-    exception = NetHTTPExceptionsSpecs::Simple.new("error message", "a http response")
-    exception.response.should == "a http response"
-  end
-end
diff --git a/spec/ruby/library/net/http/httpgenericrequest/body_spec.rb b/spec/ruby/library/net/http/httpgenericrequest/body_spec.rb
deleted file mode 100644
index a215895b5755e6..00000000000000
--- a/spec/ruby/library/net/http/httpgenericrequest/body_spec.rb
+++ /dev/null
@@ -1,30 +0,0 @@
-require_relative '../../../../spec_helper'
-require 'net/http'
-require "stringio"
-
-describe "Net::HTTPGenericRequest#body" do
-  it "returns self's request body" do
-    request = Net::HTTPGenericRequest.new("POST", true, true, "/some/path")
-    request.body.should be_nil
-
-    request.body = "Some Content"
-    request.body.should == "Some Content"
-  end
-end
-
-describe "Net::HTTPGenericRequest#body=" do
-  before :each do
-    @request = Net::HTTPGenericRequest.new("POST", true, true, "/some/path")
-  end
-
-  it "sets self's body content to the passed String" do
-    @request.body = "Some Content"
-    @request.body.should == "Some Content"
-  end
-
-  it "sets self's body stream to nil" do
-    @request.body_stream = StringIO.new("")
-    @request.body = "Some Content"
-    @request.body_stream.should be_nil
-  end
-end
diff --git a/spec/ruby/library/net/http/httpgenericrequest/exec_spec.rb b/spec/ruby/library/net/http/httpgenericrequest/exec_spec.rb
deleted file mode 100644
index da5b1a63be86c9..00000000000000
--- a/spec/ruby/library/net/http/httpgenericrequest/exec_spec.rb
+++ /dev/null
@@ -1,131 +0,0 @@
-require_relative '../../../../spec_helper'
-require 'net/http'
-require "stringio"
-
-describe "Net::HTTPGenericRequest#exec when passed socket, version, path" do
-  before :each do
-    @socket = StringIO.new("")
-    @buffered_socket = Net::BufferedIO.new(@socket)
-  end
-
-  it "executes the request over the socket to the path using the HTTP version" do
-    request = Net::HTTPGenericRequest.new("POST", true, true, "/some/path")
-
-    request.exec(@buffered_socket, "1.1", "/some/path")
-    str = @socket.string
-
-    str.should =~ %r[POST /some/path HTTP/1.1\r\n]
-    str.should =~ %r[Accept: \*/\*\r\n]
-    str[-4..-1].should == "\r\n\r\n"
-
-    request = Net::HTTPGenericRequest.new("GET", true, true, "/some/path",
-                                          "Content-Type" => "text/html")
-
-    request.exec(@buffered_socket, "1.0", "/some/other/path")
-    str = @socket.string
-
-    str.should =~ %r[GET /some/other/path HTTP/1.0\r\n]
-    str.should =~ %r[Accept: \*/\*\r\n]
-    str.should =~ %r[Content-Type: text/html\r\n]
-    str[-4..-1].should == "\r\n\r\n"
-  end
-
-  describe "when a request body is set" do
-    it "sets the 'Content-Type' header to 'application/x-www-form-urlencoded' unless the 'Content-Type' header is supplied" do
-      request = Net::HTTPGenericRequest.new("POST", true, true, "/some/path")
-      request.body = "Some Content"
-
-      request.exec(@buffered_socket, "1.1", "/some/other/path")
-      str = @socket.string
-
-      str.should =~ %r[POST /some/other/path HTTP/1.1\r\n]
-      str.should =~ %r[Accept: \*/\*\r\n]
-      str.should =~ %r[Content-Type: application/x-www-form-urlencoded\r\n]
-      str.should =~ %r[Content-Length: 12\r\n]
-      str[-16..-1].should == "\r\n\r\nSome Content"
-    end
-
-    it "correctly sets the 'Content-Length' header and includes the body" do
-      request = Net::HTTPGenericRequest.new("POST", true, true, "/some/path",
-                                            "Content-Type" => "text/html")
-      request.body = "Some Content"
-
-      request.exec(@buffered_socket, "1.1", "/some/other/path")
-      str = @socket.string
-
-      str.should =~ %r[POST /some/other/path HTTP/1.1\r\n]
-      str.should =~ %r[Accept: \*/\*\r\n]
-      str.should =~ %r[Content-Type: text/html\r\n]
-      str.should =~ %r[Content-Length: 12\r\n]
-      str[-16..-1].should == "\r\n\r\nSome Content"
-    end
-  end
-
-  describe "when a body stream is set" do
-    it "sets the 'Content-Type' header to 'application/x-www-form-urlencoded' unless the 'Content-Type' header is supplied" do
-      request = Net::HTTPGenericRequest.new("POST", true, true, "/some/path",
-                                            "Content-Length" => "10")
-      request.body_stream = StringIO.new("a" * 20)
-
-      request.exec(@buffered_socket, "1.1", "/some/other/path")
-      str = @socket.string
-
-      str.should =~ %r[POST /some/other/path HTTP/1.1\r\n]
-      str.should =~ %r[Accept: \*/\*\r\n]
-      str.should =~ %r[Content-Type: application/x-www-form-urlencoded\r\n]
-      str.should =~ %r[Content-Length: 10\r\n]
-      str[-24..-1].should == "\r\n\r\naaaaaaaaaaaaaaaaaaaa"
-    end
-
-    it "sends the whole stream, regardless of the 'Content-Length' header" do
-      request = Net::HTTPGenericRequest.new("POST", true, true,"/some/path",
-                                            "Content-Type" => "text/html",
-                                            "Content-Length" => "10")
-      request.body_stream = StringIO.new("a" * 20)
-
-      request.exec(@buffered_socket, "1.1", "/some/other/path")
-      str = @socket.string
-
-      str.should =~ %r[POST /some/other/path HTTP/1.1\r\n]
-      str.should =~ %r[Accept: \*/\*\r\n]
-      str.should =~ %r[Content-Type: text/html\r\n]
-      str.should =~ %r[Content-Length: 10\r\n]
-      str[-24..-1].should == "\r\n\r\naaaaaaaaaaaaaaaaaaaa"
-    end
-
-    it "sends the request in chunks when 'Transfer-Encoding' is set to 'chunked'" do
-      request = Net::HTTPGenericRequest.new("POST", true, true, "/some/path",
-                                            "Content-Type" => "text/html",
-                                            "Transfer-Encoding" => "chunked")
-      datasize = 1024 * 10
-      request.body_stream = StringIO.new("a" * datasize)
-
-      request.exec(@buffered_socket, "1.1", "/some/other/path")
-      str = @socket.string
-
-      str.should =~ %r[POST /some/other/path HTTP/1.1\r\n]
-      str.should =~ %r[Accept: \*/\*\r\n]
-      str.should =~ %r[Content-Type: text/html\r\n]
-      str.should =~ %r[Transfer-Encoding: chunked\r\n]
-      str =~ %r[\r\n\r\n]
-      str = $'
-      while datasize > 0
-        chunk_size_line, str = str.split(/\r\n/, 2)
-        chunk_size = chunk_size_line[/\A[0-9A-Fa-f]+/].to_i(16)
-        str.slice!(0, chunk_size).should == 'a' * chunk_size
-        datasize -= chunk_size
-        str.slice!(0, 2).should == "\r\n"
-      end
-      datasize.should == 0
-      str.should == %"0\r\n\r\n"
-    end
-
-    it "raises an ArgumentError when the 'Content-Length' is not set or 'Transfer-Encoding' is not set to 'chunked'" do
-      request = Net::HTTPGenericRequest.new("POST", true, true, "/some/path",
-                                            "Content-Type" => "text/html")
-      request.body_stream = StringIO.new("Some Content")
-
-      -> { request.exec(@buffered_socket, "1.1", "/some/other/path") }.should raise_error(ArgumentError)
-    end
-  end
-end
diff --git a/spec/ruby/library/net/http/httpgenericrequest/inspect_spec.rb b/spec/ruby/library/net/http/httpgenericrequest/inspect_spec.rb
deleted file mode 100644
index 36240949c3e0f8..00000000000000
--- a/spec/ruby/library/net/http/httpgenericrequest/inspect_spec.rb
+++ /dev/null
@@ -1,25 +0,0 @@
-require_relative '../../../../spec_helper'
-require 'net/http'
-
-describe "Net::HTTPGenericRequest#inspect" do
-  it "returns a String representation of self" do
-    request = Net::HTTPGenericRequest.new("POST", true, true, "/some/path")
-    request.inspect.should == "#<Net::HTTPGenericRequest POST>"
-
-    request = Net::HTTPGenericRequest.new("GET", false, true, "/some/path")
-    request.inspect.should == "#<Net::HTTPGenericRequest GET>"
-
-    request = Net::HTTPGenericRequest.new("BLA", true, true, "/some/path")
-    request.inspect.should == "#<Net::HTTPGenericRequest BLA>"
-
-    # Subclasses
-    request = Net::HTTP::Get.new("/some/path")
-    request.inspect.should == "#<Net::HTTP::Get GET>"
-
-    request = Net::HTTP::Post.new("/some/path")
-    request.inspect.should == "#<Net::HTTP::Post POST>"
-
-    request = Net::HTTP::Trace.new("/some/path")
-    request.inspect.should == "#<Net::HTTP::Trace TRACE>"
-  end
-end
diff --git a/spec/ruby/library/net/http/httpheader/delete_spec.rb b/spec/ruby/library/net/http/httpheader/delete_spec.rb
deleted file mode 100644
index 603ae198dedb9c..00000000000000
--- a/spec/ruby/library/net/http/httpheader/delete_spec.rb
+++ /dev/null
@@ -1,30 +0,0 @@
-require_relative '../../../../spec_helper'
-require 'net/http'
-require_relative 'fixtures/classes'
-
-describe "Net::HTTPHeader#delete when passed key" do
-  before :each do
-    @headers = NetHTTPHeaderSpecs::Example.new
-  end
-
-  it "removes the header entry with the passed key" do
-    @headers["My-Header"] = "test"
-    @headers.delete("My-Header")
-
-    @headers["My-Header"].should be_nil
-    @headers.size.should eql(0)
-  end
-
-  it "returns the removed values" do
-    @headers["My-Header"] = "test"
-    @headers.delete("My-Header").should == ["test"]
-  end
-
-  it "is case-insensitive" do
-    @headers["My-Header"] = "test"
-    @headers.delete("my-header")
-
-    @headers["My-Header"].should be_nil
-    @headers.size.should eql(0)
-  end
-end
diff --git a/spec/ruby/library/net/http/httpheader/each_spec.rb b/spec/ruby/library/net/http/httpheader/each_spec.rb
deleted file mode 100644
index 7ba8434f7515e3..00000000000000
--- a/spec/ruby/library/net/http/httpheader/each_spec.rb
+++ /dev/null
@@ -1,8 +0,0 @@
-require_relative '../../../../spec_helper'
-require 'net/http'
-require_relative 'fixtures/classes'
-require_relative 'shared/each_header'
-
-describe "Net::HTTPHeader#each" do
-  it_behaves_like :net_httpheader_each_header, :each
-end
diff --git a/spec/ruby/library/net/http/httpheader/length_spec.rb b/spec/ruby/library/net/http/httpheader/length_spec.rb
deleted file mode 100644
index 0d1da149f4441d..00000000000000
--- a/spec/ruby/library/net/http/httpheader/length_spec.rb
+++ /dev/null
@@ -1,8 +0,0 @@
-require_relative '../../../../spec_helper'
-require 'net/http'
-require_relative 'fixtures/classes'
-require_relative 'shared/size'
-
-describe "Net::HTTPHeader#length" do
-  it_behaves_like :net_httpheader_size, :length
-end
diff --git a/spec/ruby/library/net/http/httpheader/size_spec.rb b/spec/ruby/library/net/http/httpheader/size_spec.rb
deleted file mode 100644
index a7d78f96e09297..00000000000000
--- a/spec/ruby/library/net/http/httpheader/size_spec.rb
+++ /dev/null
@@ -1,8 +0,0 @@
-require_relative '../../../../spec_helper'
-require 'net/http'
-require_relative 'fixtures/classes'
-require_relative 'shared/size'
-
-describe "Net::HTTPHeader#size" do
-  it_behaves_like :net_httpheader_size, :size
-end
diff --git a/spec/ruby/library/net/http/httprequest/initialize_spec.rb b/spec/ruby/library/net/http/httprequest/initialize_spec.rb
deleted file mode 100644
index 88e9fb1c77dda6..00000000000000
--- a/spec/ruby/library/net/http/httprequest/initialize_spec.rb
+++ /dev/null
@@ -1,45 +0,0 @@
-require_relative '../../../../spec_helper'
-require 'net/http'
-
-module NetHTTPRequestSpecs
-  class TestRequest < Net::HTTPRequest
-    METHOD = "TEST"
-    REQUEST_HAS_BODY  = false
-    RESPONSE_HAS_BODY = true
-  end
-end
-
-describe "Net::HTTPRequest#initialize" do
-  before :each do
-    @req = NetHTTPRequestSpecs::TestRequest.allocate
-  end
-
-  it "uses the METHOD constants to set the request method" do
-    @req.send(:initialize, "/some/path")
-    @req.method.should == "TEST"
-  end
-
-  it "uses the REQUEST_HAS_BODY to set whether the Request has a body or not" do
-    @req.send(:initialize, "/some/path")
-    @req.request_body_permitted?.should be_false
-  end
-
-  it "uses the RESPONSE_HAS_BODY to set whether the Response can have a body or not" do
-    @req.send(:initialize, "/some/path")
-    @req.response_body_permitted?.should be_true
-  end
-
-  describe "when passed path" do
-    it "sets self's path to the passed path" do
-      @req.send(:initialize, "/some/path")
-      @req.path.should == "/some/path"
-    end
-  end
-
-  describe "when passed path, headers" do
-    it "uses the passed headers Hash to initialize self's header entries" do
-      @req.send(:initialize, "/some/path", "Content-Type" => "text/html")
-      @req["Content-Type"].should == "text/html"
-    end
-  end
-end
diff --git a/spec/ruby/library/net/http/httpresponse/body_spec.rb b/spec/ruby/library/net/http/httpresponse/body_spec.rb
deleted file mode 100644
index 79569441f10d51..00000000000000
--- a/spec/ruby/library/net/http/httpresponse/body_spec.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-require_relative '../../../../spec_helper'
-require 'net/http'
-require_relative 'shared/body'
-
-describe "Net::HTTPResponse#body" do
-  it_behaves_like :net_httpresponse_body, :body
-end
diff --git a/spec/ruby/library/net/http/httpresponse/initialize_spec.rb b/spec/ruby/library/net/http/httpresponse/initialize_spec.rb
deleted file mode 100644
index eb77e2e27744a8..00000000000000
--- a/spec/ruby/library/net/http/httpresponse/initialize_spec.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-require_relative '../../../../spec_helper'
-require 'net/http'
-
-describe "Net::HTTPResponse#initialize when passed http_version, response_code, response_message" do
-  it "sets self http_version, response_code and response_message to the passed values" do
-    res = Net::HTTPUnknownResponse.new("1.0", "???", "test response")
-    res.http_version.should == "1.0"
-    res.code.should == "???"
-    res.message.should == "test response"
-  end
-end
diff --git a/spec/ruby/library/net/http/httpresponse/inspect_spec.rb b/spec/ruby/library/net/http/httpresponse/inspect_spec.rb
deleted file mode 100644
index 1e1a2c7cc75b45..00000000000000
--- a/spec/ruby/library/net/http/httpresponse/inspect_spec.rb
+++ /dev/null
@@ -1,15 +0,0 @@
-require_relative '../../../../spec_helper'
-require 'net/http'
-require "stringio"
-
-describe "Net::HTTPResponse#inspect" do
-  it "returns a String representation of self" do
-    res = Net::HTTPUnknownResponse.new("1.0", "???", "test response")
-    res.inspect.should == "#<Net::HTTPUnknownResponse ??? test response readbody=false>"
-
-    res = Net::HTTPUnknownResponse.new("1.0", "???", "test response")
-    socket = Net::BufferedIO.new(StringIO.new("test body"))
-    res.reading_body(socket, true) {}
-    res.inspect.should == "#<Net::HTTPUnknownResponse ??? test response readbody=true>"
-  end
-end
diff --git a/spec/ruby/library/net/http/httpresponse/response_spec.rb b/spec/ruby/library/net/http/httpresponse/response_spec.rb
deleted file mode 100644
index f6035f36955bcd..00000000000000
--- a/spec/ruby/library/net/http/httpresponse/response_spec.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-require_relative '../../../../spec_helper'
-require 'net/http'
-
-describe "Net::HTTPResponse#response" do
-  it "returns self" do
-    res = Net::HTTPUnknownResponse.new("1.0", "???", "test response")
-    res.response.should equal(res)
-  end
-end
diff --git a/spec/ruby/library/objectspace/fixtures/trace.rb b/spec/ruby/library/objectspace/fixtures/trace.rb
index fd4524b0ba5124..e53a7a0cac8d5b 100644
--- a/spec/ruby/library/objectspace/fixtures/trace.rb
+++ b/spec/ruby/library/objectspace/fixtures/trace.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: false
 require "objspace/trace"
 a = "foo"
 b = "b" + "a" + "r"
diff --git a/spec/ruby/library/objectspace/memsize_of_spec.rb b/spec/ruby/library/objectspace/memsize_of_spec.rb
index eefafbb334df42..cbb5a07d54f9f5 100644
--- a/spec/ruby/library/objectspace/memsize_of_spec.rb
+++ b/spec/ruby/library/objectspace/memsize_of_spec.rb
@@ -13,7 +13,7 @@
   end
 
   it "returns 0 for literal Symbols" do
-    ObjectSpace.memsize_of(:abc).should == 0
+    ObjectSpace.memsize_of(:object_space_memsize_spec_static_sym).should == 0
   end
 
   it "returns a positive Integer for an Object" do
diff --git a/spec/ruby/library/objectspace/reachable_objects_from_spec.rb b/spec/ruby/library/objectspace/reachable_objects_from_spec.rb
index 7e70bc85691989..dee5961663374d 100644
--- a/spec/ruby/library/objectspace/reachable_objects_from_spec.rb
+++ b/spec/ruby/library/objectspace/reachable_objects_from_spec.rb
@@ -38,7 +38,6 @@
   end
 
   it "finds an object stored in a Queue" do
-    require 'thread'
     o = Object.new
     q = Queue.new
     q << o
@@ -49,7 +48,6 @@
   end
 
   it "finds an object stored in a SizedQueue" do
-    require 'thread'
     o = Object.new
     q = SizedQueue.new(3)
     q << o
diff --git a/spec/ruby/library/objectspace/trace_object_allocations_spec.rb b/spec/ruby/library/objectspace/trace_object_allocations_spec.rb
index 612430e067d63e..0f1e2aa8b93abf 100644
--- a/spec/ruby/library/objectspace/trace_object_allocations_spec.rb
+++ b/spec/ruby/library/objectspace/trace_object_allocations_spec.rb
@@ -2,6 +2,20 @@
 require 'objspace'
 
 describe "ObjectSpace.trace_object_allocations" do
+  def has_class_frame?
+    Class.new {
+      attr_reader :c
+
+      def initialize
+        @c = caller_locations.first.label =~ /new/
+      end
+    }.new.c
+  end
+
+  def obj_class_path
+    has_class_frame? ? "Class" : nil
+  end
+
   it "runs a block" do
     ScratchPad.clear
     ObjectSpace.trace_object_allocations do
@@ -13,7 +27,7 @@
   it "records info for allocation_class_path" do
     ObjectSpace.trace_object_allocations do
       o = Object.new
-      ObjectSpace.allocation_class_path(o).should == "Class"
+      ObjectSpace.allocation_class_path(o).should == obj_class_path
       a = [1, 2, 3]
       ObjectSpace.allocation_class_path(a).should == nil
     end
@@ -31,7 +45,7 @@
   it "records info for allocation_method_id" do
     ObjectSpace.trace_object_allocations do
       o = Object.new
-      ObjectSpace.allocation_method_id(o).should == :new
+      ObjectSpace.allocation_method_id(o).should == (has_class_frame? ? :new : nil)
       a = [1, 2, 3]
       ObjectSpace.allocation_method_id(a).should == nil
     end
@@ -58,7 +72,7 @@
   it "can be cleared using trace_object_allocations_clear" do
     ObjectSpace.trace_object_allocations do
       o = Object.new
-      ObjectSpace.allocation_class_path(o).should == "Class"
+      ObjectSpace.allocation_class_path(o).should == obj_class_path
       ObjectSpace.trace_object_allocations_clear
       ObjectSpace.allocation_class_path(o).should be_nil
     end
@@ -69,14 +83,14 @@
     ObjectSpace.trace_object_allocations do
       o = Object.new
     end
-    ObjectSpace.allocation_class_path(o).should == "Class"
+    ObjectSpace.allocation_class_path(o).should == obj_class_path
   end
 
   it "can be used without a block using trace_object_allocations_start and _stop" do
     ObjectSpace.trace_object_allocations_start
     begin
       o = Object.new
-      ObjectSpace.allocation_class_path(o).should == "Class"
+      ObjectSpace.allocation_class_path(o).should == obj_class_path
       a = [1, 2, 3]
       ObjectSpace.allocation_class_path(a).should == nil
     ensure
@@ -91,14 +105,14 @@
     ensure
       ObjectSpace.trace_object_allocations_stop
     end
-    ObjectSpace.allocation_class_path(o).should == "Class"
+    ObjectSpace.allocation_class_path(o).should == obj_class_path
   end
 
   it "can be nested" do
     ObjectSpace.trace_object_allocations do
       ObjectSpace.trace_object_allocations do
         o = Object.new
-        ObjectSpace.allocation_class_path(o).should == "Class"
+        ObjectSpace.allocation_class_path(o).should == obj_class_path
       end
     end
   end
@@ -109,7 +123,7 @@
       ObjectSpace.trace_object_allocations_start
       begin
         o = Object.new
-        ObjectSpace.allocation_class_path(o).should == "Class"
+        ObjectSpace.allocation_class_path(o).should == obj_class_path
       ensure
         ObjectSpace.trace_object_allocations_stop
       end
@@ -122,7 +136,7 @@
     ObjectSpace.trace_object_allocations_start
     begin
       o = Object.new
-      ObjectSpace.allocation_class_path(o).should == "Class"
+      ObjectSpace.allocation_class_path(o).should == obj_class_path
       ObjectSpace.trace_object_allocations_stop
     ensure
       ObjectSpace.trace_object_allocations_stop
diff --git a/spec/ruby/library/objectspace/trace_spec.rb b/spec/ruby/library/objectspace/trace_spec.rb
index 59952a006c32b3..3957dc930d8e9f 100644
--- a/spec/ruby/library/objectspace/trace_spec.rb
+++ b/spec/ruby/library/objectspace/trace_spec.rb
@@ -1,15 +1,13 @@
 require_relative '../../spec_helper'
 
-ruby_version_is "3.1" do
-  describe 'require "objspace/trace"' do
-    it "shows object allocation sites" do
-      file = fixture(__FILE__ , "trace.rb")
-      ruby_exe(file, args: "2>&1").lines(chomp: true).should == [
-        "objspace/trace is enabled",
-        "\"foo\" @ #{file}:2",
-        "\"bar\" @ #{file}:3",
-        "42"
-      ]
-    end
+describe 'require "objspace/trace"' do
+  it "shows object allocation sites" do
+    file = fixture(__FILE__ , "trace.rb")
+    ruby_exe(file, args: "2>&1").lines(chomp: true).should == [
+      "objspace/trace is enabled",
+      "\"foo\" @ #{file}:3",
+      "\"bar\" @ #{file}:4",
+      "42"
+    ]
   end
 end
diff --git a/spec/ruby/library/openssl/digest/append_spec.rb b/spec/ruby/library/openssl/digest/append_spec.rb
new file mode 100644
index 00000000000000..08802b72534023
--- /dev/null
+++ b/spec/ruby/library/openssl/digest/append_spec.rb
@@ -0,0 +1,6 @@
+require_relative '../../../spec_helper'
+require_relative 'shared/update'
+
+describe "OpenSSL::Digest#<<" do
+  it_behaves_like :openssl_digest_update, :<<
+end
diff --git a/spec/ruby/library/openssl/digest/block_length_spec.rb b/spec/ruby/library/openssl/digest/block_length_spec.rb
new file mode 100644
index 00000000000000..444ed9d20d8f92
--- /dev/null
+++ b/spec/ruby/library/openssl/digest/block_length_spec.rb
@@ -0,0 +1,44 @@
+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#block_length" do
+  context "when the digest object is created via a name argument" do
+    it "returns a SHA1 block length" do
+      OpenSSL::Digest.new('sha1').block_length.should == SHA1Constants::BlockLength
+    end
+
+    it "returns a SHA256 block length" do
+      OpenSSL::Digest.new('sha256').block_length.should == SHA256Constants::BlockLength
+    end
+
+    it "returns a SHA384 block length" do
+      OpenSSL::Digest.new('sha384').block_length.should == SHA384Constants::BlockLength
+    end
+
+    it "returns a SHA512 block length" do
+      OpenSSL::Digest.new('sha512').block_length.should == SHA512Constants::BlockLength
+    end
+  end
+
+  context "when the digest object is created via a subclass" do
+    it "returns a SHA1 block length" do
+      OpenSSL::Digest::SHA1.new.block_length.should == SHA1Constants::BlockLength
+    end
+
+    it "returns a SHA256 block length" do
+      OpenSSL::Digest::SHA256.new.block_length.should == SHA256Constants::BlockLength
+    end
+
+    it "returns a SHA384 block length" do
+      OpenSSL::Digest::SHA384.new.block_length.should == SHA384Constants::BlockLength
+    end
+
+    it "returns a SHA512 block length" do
+      OpenSSL::Digest::SHA512.new.block_length.should == SHA512Constants::BlockLength
+    end
+  end
+end
diff --git a/spec/ruby/library/openssl/digest/digest_length_spec.rb b/spec/ruby/library/openssl/digest/digest_length_spec.rb
new file mode 100644
index 00000000000000..37d1cba9a7b78b
--- /dev/null
+++ b/spec/ruby/library/openssl/digest/digest_length_spec.rb
@@ -0,0 +1,44 @@
+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#digest_length" do
+  context "when the digest object is created via a name argument" do
+    it "returns a SHA1 digest length" do
+      OpenSSL::Digest.new('sha1').digest_length.should == SHA1Constants::DigestLength
+    end
+
+    it "returns a SHA256 digest length" do
+      OpenSSL::Digest.new('sha256').digest_length.should == SHA256Constants::DigestLength
+    end
+
+    it "returns a SHA384 digest length" do
+      OpenSSL::Digest.new('sha384').digest_length.should == SHA384Constants::DigestLength
+    end
+
+    it "returns a SHA512 digest length" do
+      OpenSSL::Digest.new('sha512').digest_length.should == SHA512Constants::DigestLength
+    end
+  end
+
+  context "when the digest object is created via a subclass" do
+    it "returns a SHA1 digest length" do
+      OpenSSL::Digest::SHA1.new.digest_length.should == SHA1Constants::DigestLength
+    end
+
+    it "returns a SHA256 digest length" do
+      OpenSSL::Digest::SHA256.new.digest_length.should == SHA256Constants::DigestLength
+    end
+
+    it "returns a SHA384 digest length" do
+      OpenSSL::Digest::SHA384.new.digest_length.should == SHA384Constants::DigestLength
+    end
+
+    it "returns a SHA512 digest length" do
+      OpenSSL::Digest::SHA512.new.digest_length.should == SHA512Constants::DigestLength
+    end
+  end
+end
diff --git a/spec/ruby/library/openssl/digest/digest_spec.rb b/spec/ruby/library/openssl/digest/digest_spec.rb
new file mode 100644
index 00000000000000..cf27d01b6d9dd5
--- /dev/null
+++ b/spec/ruby/library/openssl/digest/digest_spec.rb
@@ -0,0 +1,62 @@
+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 class methods" 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/openssl/digest/initialize_spec.rb b/spec/ruby/library/openssl/digest/initialize_spec.rb
new file mode 100644
index 00000000000000..1cd0409c4d838c
--- /dev/null
+++ b/spec/ruby/library/openssl/digest/initialize_spec.rb
@@ -0,0 +1,141 @@
+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#initialize" do
+  describe "can be called with a digest name" do
+    it "returns a SHA1 object" do
+      OpenSSL::Digest.new("sha1").name.should == "SHA1"
+    end
+
+    it "returns a SHA256 object" do
+      OpenSSL::Digest.new("sha256").name.should == "SHA256"
+    end
+
+    it "returns a SHA384 object" do
+      OpenSSL::Digest.new("sha384").name.should == "SHA384"
+    end
+
+    it "returns a SHA512 object" do
+      OpenSSL::Digest.new("sha512").name.should ==  "SHA512"
+    end
+
+    it "throws an error when called with an unknown digest" do
+      -> { OpenSSL::Digest.new("wd40") }.should raise_error(RuntimeError, /Unsupported digest algorithm \(wd40\)/)
+    end
+
+    it "cannot be called with a symbol" do
+      -> { OpenSSL::Digest.new(:SHA1) }.should raise_error(TypeError, /wrong argument type Symbol/)
+    end
+
+    it "does not call #to_str on the argument" do
+      name = mock("digest name")
+      name.should_not_receive(:to_str)
+      -> { OpenSSL::Digest.new(name) }.should raise_error(TypeError, /wrong argument type/)
+    end
+  end
+
+  describe "can be called with a digest object" do
+    it "returns a SHA1 object" do
+      OpenSSL::Digest.new(OpenSSL::Digest::SHA1.new).name.should == "SHA1"
+    end
+
+    it "returns a SHA256 object" do
+      OpenSSL::Digest.new(OpenSSL::Digest::SHA256.new).name.should == "SHA256"
+    end
+
+    it "returns a SHA384 object" do
+      OpenSSL::Digest.new(OpenSSL::Digest::SHA384.new).name.should == "SHA384"
+    end
+
+    it "returns a SHA512 object" do
+      OpenSSL::Digest.new(OpenSSL::Digest::SHA512.new).name.should ==  "SHA512"
+    end
+
+    it "ignores the state of the digest object" do
+      sha1 = OpenSSL::Digest.new('sha1', SHA1Constants::Contents)
+      OpenSSL::Digest.new(sha1).digest.should == SHA1Constants::BlankDigest
+    end
+  end
+
+  it "cannot be called with a digest class" do
+    -> { OpenSSL::Digest.new(OpenSSL::Digest::SHA1) }.should raise_error(TypeError, /wrong argument type Class/)
+  end
+
+  context "when called without an initial String argument" do
+    it "returns a SHA1 digest" do
+      OpenSSL::Digest.new("sha1").digest.should == SHA1Constants::BlankDigest
+    end
+
+    it "returns a SHA256 digest" do
+      OpenSSL::Digest.new("sha256").digest.should == SHA256Constants::BlankDigest
+    end
+
+    it "returns a SHA384 digest" do
+      OpenSSL::Digest.new("sha384").digest.should == SHA384Constants::BlankDigest
+    end
+
+    it "returns a SHA512 digest" do
+      OpenSSL::Digest.new("sha512").digest.should == SHA512Constants::BlankDigest
+    end
+  end
+
+  context "when called with an initial String argument" do
+    it "returns a SHA1 digest of that argument" do
+      OpenSSL::Digest.new("sha1", SHA1Constants::Contents).digest.should == SHA1Constants::Digest
+    end
+
+    it "returns a SHA256 digest of that argument" do
+      OpenSSL::Digest.new("sha256", SHA256Constants::Contents).digest.should == SHA256Constants::Digest
+    end
+
+    it "returns a SHA384 digest of that argument" do
+      OpenSSL::Digest.new("sha384", SHA384Constants::Contents).digest.should == SHA384Constants::Digest
+    end
+
+    it "returns a SHA512 digest of that argument" do
+      OpenSSL::Digest.new("sha512", SHA512Constants::Contents).digest.should == SHA512Constants::Digest
+    end
+  end
+
+  context "can be called on subclasses" do
+    describe "can be called without an initial String argument on subclasses" do
+      it "returns a SHA1 digest" do
+        OpenSSL::Digest::SHA1.new.digest.should == SHA1Constants::BlankDigest
+      end
+
+      it "returns a SHA256 digest" do
+        OpenSSL::Digest::SHA256.new.digest.should == SHA256Constants::BlankDigest
+      end
+
+      it "returns a SHA384 digest" do
+        OpenSSL::Digest::SHA384.new.digest.should == SHA384Constants::BlankDigest
+      end
+
+      it "returns a SHA512 digest" do
+        OpenSSL::Digest::SHA512.new.digest.should == SHA512Constants::BlankDigest
+      end
+    end
+
+    describe "can be called with an initial String argument on subclasses" do
+      it "returns a SHA1 digest" do
+        OpenSSL::Digest::SHA1.new(SHA1Constants::Contents).digest.should == SHA1Constants::Digest
+      end
+
+      it "returns a SHA256 digest" do
+        OpenSSL::Digest::SHA256.new(SHA256Constants::Contents).digest.should == SHA256Constants::Digest
+      end
+
+      it "returns a SHA384 digest" do
+        OpenSSL::Digest::SHA384.new(SHA384Constants::Contents).digest.should == SHA384Constants::Digest
+      end
+
+      it "returns a SHA512 digest" do
+        OpenSSL::Digest::SHA512.new(SHA512Constants::Contents).digest.should == SHA512Constants::Digest
+      end
+    end
+  end
+end
diff --git a/spec/ruby/library/openssl/digest/name_spec.rb b/spec/ruby/library/openssl/digest/name_spec.rb
new file mode 100644
index 00000000000000..b379f35c1c162a
--- /dev/null
+++ b/spec/ruby/library/openssl/digest/name_spec.rb
@@ -0,0 +1,16 @@
+require_relative '../../../spec_helper'
+require 'openssl'
+
+describe "OpenSSL::Digest#name" do
+  it "returns the name of digest" do
+    OpenSSL::Digest.new('SHA1').name.should == 'SHA1'
+  end
+
+  it "converts the name to the internal representation of OpenSSL" do
+    OpenSSL::Digest.new('sha1').name.should == 'SHA1'
+  end
+
+  it "works on subclasses too" do
+    OpenSSL::Digest::SHA1.new.name.should == 'SHA1'
+  end
+end
diff --git a/spec/ruby/library/openssl/digest/reset_spec.rb b/spec/ruby/library/openssl/digest/reset_spec.rb
new file mode 100644
index 00000000000000..c19bf466330ec2
--- /dev/null
+++ b/spec/ruby/library/openssl/digest/reset_spec.rb
@@ -0,0 +1,36 @@
+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#reset" do
+  it "works for a SHA1 digest" do
+    digest = OpenSSL::Digest.new('sha1', SHA1Constants::Contents)
+    digest.reset
+    digest.update(SHA1Constants::Contents)
+    digest.digest.should == SHA1Constants::Digest
+  end
+
+  it "works for a SHA256 digest" do
+    digest = OpenSSL::Digest.new('sha256', SHA256Constants::Contents)
+    digest.reset
+    digest.update(SHA256Constants::Contents)
+    digest.digest.should == SHA256Constants::Digest
+  end
+
+  it "works for a SHA384 digest" do
+    digest = OpenSSL::Digest.new('sha384', SHA384Constants::Contents)
+    digest.reset
+    digest.update(SHA384Constants::Contents)
+    digest.digest.should == SHA384Constants::Digest
+  end
+
+  it "works for a SHA512 digest" do
+    digest = OpenSSL::Digest.new('sha512', SHA512Constants::Contents)
+    digest.reset
+    digest.update(SHA512Constants::Contents)
+    digest.digest.should == SHA512Constants::Digest
+  end
+end
diff --git a/spec/ruby/library/openssl/digest/shared/update.rb b/spec/ruby/library/openssl/digest/shared/update.rb
new file mode 100644
index 00000000000000..e5ff9dcb16f6e3
--- /dev/null
+++ b/spec/ruby/library/openssl/digest/shared/update.rb
@@ -0,0 +1,123 @@
+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_update, shared: true do
+  context "when given input as a single string" do
+    it "returns a SHA1 digest" do
+      digest = OpenSSL::Digest.new('sha1')
+      digest.send(@method, SHA1Constants::Contents)
+      digest.digest.should == SHA1Constants::Digest
+    end
+
+    it "returns a SHA256 digest" do
+      digest = OpenSSL::Digest.new('sha256')
+      digest.send(@method, SHA256Constants::Contents)
+      digest.digest.should == SHA256Constants::Digest
+    end
+
+    it "returns a SHA384 digest" do
+      digest = OpenSSL::Digest.new('sha384')
+      digest.send(@method, SHA384Constants::Contents)
+      digest.digest.should == SHA384Constants::Digest
+    end
+
+    it "returns a SHA512 digest" do
+      digest = OpenSSL::Digest.new('sha512')
+      digest.send(@method, SHA512Constants::Contents)
+      digest.digest.should == SHA512Constants::Digest
+    end
+  end
+
+  context "when given input as multiple smaller substrings" do
+    it "returns a SHA1 digest" do
+      digest = OpenSSL::Digest.new('sha1')
+      SHA1Constants::Contents.each_char { |b| digest.send(@method, b) }
+      digest.digest.should == SHA1Constants::Digest
+    end
+
+    it "returns a SHA256 digest" do
+      digest = OpenSSL::Digest.new('sha256')
+      SHA256Constants::Contents.each_char { |b| digest.send(@method, b) }
+      digest.digest.should == SHA256Constants::Digest
+    end
+
+    it "returns a SHA384 digest" do
+      digest = OpenSSL::Digest.new('sha384')
+      SHA384Constants::Contents.each_char { |b| digest.send(@method, b) }
+      digest.digest.should == SHA384Constants::Digest
+    end
+
+    it "returns a SHA512 digest" do
+      digest = OpenSSL::Digest.new('sha512')
+      SHA512Constants::Contents.each_char { |b| digest.send(@method, b) }
+      digest.digest.should == SHA512Constants::Digest
+    end
+  end
+
+  context "when input is not a String and responds to #to_str" do
+    it "returns a SHA1 digest" do
+      str = mock('str')
+      str.should_receive(:to_str).and_return(SHA1Constants::Contents)
+      digest = OpenSSL::Digest.new('sha1')
+      digest.send(@method, str)
+      digest.digest.should == SHA1Constants::Digest
+    end
+
+    it "returns a SHA256 digest" do
+      str = mock('str')
+      str.should_receive(:to_str).and_return(SHA256Constants::Contents)
+      digest = OpenSSL::Digest.new('sha256')
+      digest.send(@method, str)
+      digest.digest.should == SHA256Constants::Digest
+    end
+
+    it "returns a SHA384 digest" do
+      str = mock('str')
+      str.should_receive(:to_str).and_return(SHA384Constants::Contents)
+      digest = OpenSSL::Digest.new('sha384')
+      digest.send(@method, str)
+      digest.digest.should == SHA384Constants::Digest
+    end
+
+    it "returns a SHA512 digest" do
+      str = mock('str')
+      str.should_receive(:to_str).and_return(SHA512Constants::Contents)
+      digest = OpenSSL::Digest.new('sha512')
+      digest.send(@method, str)
+      digest.digest.should == SHA512Constants::Digest
+    end
+  end
+
+  context "when input is not a String and does not respond to #to_str" do
+    it "raises a TypeError with SHA1" do
+      digest = OpenSSL::Digest.new('sha1')
+      -> {
+        digest.send(@method, Object.new)
+      }.should raise_error(TypeError, 'no implicit conversion of Object into String')
+    end
+
+    it "raises a TypeError with SHA256" do
+      digest = OpenSSL::Digest.new('sha256')
+      -> {
+        digest.send(@method, Object.new)
+      }.should raise_error(TypeError, 'no implicit conversion of Object into String')
+    end
+
+    it "raises a TypeError with SHA384" do
+      digest = OpenSSL::Digest.new('sha384')
+      -> {
+        digest.send(@method, Object.new)
+      }.should raise_error(TypeError, 'no implicit conversion of Object into String')
+    end
+
+    it "raises a TypeError with SHA512" do
+      digest = OpenSSL::Digest.new('sha512')
+      -> {
+        digest.send(@method, Object.new)
+      }.should raise_error(TypeError, 'no implicit conversion of Object into String')
+    end
+  end
+end
diff --git a/spec/ruby/library/openssl/digest/update_spec.rb b/spec/ruby/library/openssl/digest/update_spec.rb
new file mode 100644
index 00000000000000..3a90b06c6b1251
--- /dev/null
+++ b/spec/ruby/library/openssl/digest/update_spec.rb
@@ -0,0 +1,6 @@
+require_relative '../../../spec_helper'
+require_relative 'shared/update'
+
+describe "OpenSSL::Digest#update" do
+  it_behaves_like :openssl_digest_update, :update
+end
diff --git a/spec/ruby/library/openssl/digest_spec.rb b/spec/ruby/library/openssl/digest_spec.rb
deleted file mode 100644
index b8e82d073f25b2..00000000000000
--- a/spec/ruby/library/openssl/digest_spec.rb
+++ /dev/null
@@ -1,63 +0,0 @@
-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/openssl/fixed_length_secure_compare_spec.rb b/spec/ruby/library/openssl/fixed_length_secure_compare_spec.rb
new file mode 100644
index 00000000000000..5a2ca168b5367d
--- /dev/null
+++ b/spec/ruby/library/openssl/fixed_length_secure_compare_spec.rb
@@ -0,0 +1,42 @@
+require_relative '../../spec_helper'
+require 'openssl'
+
+describe "OpenSSL.fixed_length_secure_compare" do
+  it "returns true for two strings with the same content" do
+    input1 = "the quick brown fox jumps over the lazy dog"
+    input2 = "the quick brown fox jumps over the lazy dog"
+    OpenSSL.fixed_length_secure_compare(input1, input2).should be_true
+  end
+
+  it "returns false for two strings of equal size with different content" do
+    input1 = "the quick brown fox jumps over the lazy dog"
+    input2 = "the lazy dog jumps over the quick brown fox"
+    OpenSSL.fixed_length_secure_compare(input1, input2).should be_false
+  end
+
+  it "converts both arguments to strings using #to_str" do
+    input1 = mock("input1")
+    input1.should_receive(:to_str).and_return("the quick brown fox jumps over the lazy dog")
+    input2 = mock("input2")
+    input2.should_receive(:to_str).and_return("the quick brown fox jumps over the lazy dog")
+    OpenSSL.fixed_length_secure_compare(input1, input2).should be_true
+  end
+
+  it "does not accept arguments that are not string and cannot be coerced into strings" do
+    -> {
+      OpenSSL.fixed_length_secure_compare("input1", :input2)
+    }.should raise_error(TypeError, 'no implicit conversion of Symbol into String')
+
+    -> {
+      OpenSSL.fixed_length_secure_compare(Object.new, "input2")
+    }.should raise_error(TypeError, 'no implicit conversion of Object into String')
+  end
+
+  it "raises an ArgumentError for two strings of different size" do
+    input1 = "the quick brown fox jumps over the lazy dog"
+    input2 = "the quick brown fox"
+    -> {
+      OpenSSL.fixed_length_secure_compare(input1, input2)
+    }.should raise_error(ArgumentError, 'inputs must be of equal length')
+  end
+end
diff --git a/spec/ruby/library/openssl/kdf/pbkdf2_hmac_spec.rb b/spec/ruby/library/openssl/kdf/pbkdf2_hmac_spec.rb
new file mode 100644
index 00000000000000..40f85972759a5a
--- /dev/null
+++ b/spec/ruby/library/openssl/kdf/pbkdf2_hmac_spec.rb
@@ -0,0 +1,168 @@
+require_relative '../../../spec_helper'
+require 'openssl'
+
+describe "OpenSSL::KDF.pbkdf2_hmac" do
+  before :each do
+    @defaults = {
+      salt: "\x00".b * 16,
+      iterations: 20_000,
+      length: 16,
+      hash: "sha1"
+    }
+  end
+
+  it "creates the same value with the same input" do
+    key = OpenSSL::KDF.pbkdf2_hmac("secret", **@defaults)
+    key.should == "!\x99+\xF0^\xD0\x8BM\x158\xC4\xAC\x9C\xF1\xF0\xE0".b
+  end
+
+  it "supports nullbytes embedded in the password" do
+    key = OpenSSL::KDF.pbkdf2_hmac("sec\x00ret".b, **@defaults)
+    key.should == "\xB9\x7F\xB0\xC2\th\xC8<\x86\xF3\x94Ij7\xEF\xF1".b
+  end
+
+  it "coerces the password into a String using #to_str" do
+    pass = mock("pass")
+    pass.should_receive(:to_str).and_return("secret")
+    key = OpenSSL::KDF.pbkdf2_hmac(pass, **@defaults)
+    key.should == "!\x99+\xF0^\xD0\x8BM\x158\xC4\xAC\x9C\xF1\xF0\xE0".b
+  end
+
+  it "coerces the salt into a String using #to_str" do
+    salt = mock("salt")
+    salt.should_receive(:to_str).and_return("\x00".b * 16)
+    key = OpenSSL::KDF.pbkdf2_hmac("secret", **@defaults, salt: salt)
+    key.should == "!\x99+\xF0^\xD0\x8BM\x158\xC4\xAC\x9C\xF1\xF0\xE0".b
+  end
+
+  it "coerces the iterations into an Integer using #to_int" do
+    iterations = mock("iterations")
+    iterations.should_receive(:to_int).and_return(20_000)
+    key = OpenSSL::KDF.pbkdf2_hmac("secret", **@defaults, iterations: iterations)
+    key.should == "!\x99+\xF0^\xD0\x8BM\x158\xC4\xAC\x9C\xF1\xF0\xE0".b
+  end
+
+  it "coerces the length into an Integer using #to_int" do
+    length = mock("length")
+    length.should_receive(:to_int).and_return(16)
+    key = OpenSSL::KDF.pbkdf2_hmac("secret", **@defaults, length: length)
+    key.should == "!\x99+\xF0^\xD0\x8BM\x158\xC4\xAC\x9C\xF1\xF0\xE0".b
+  end
+
+  it "accepts a OpenSSL::Digest object as hash" do
+    hash = OpenSSL::Digest.new("sha1")
+    key = OpenSSL::KDF.pbkdf2_hmac("secret", **@defaults, hash: hash)
+    key.should == "!\x99+\xF0^\xD0\x8BM\x158\xC4\xAC\x9C\xF1\xF0\xE0".b
+  end
+
+  it "accepts an empty password" do
+    key = OpenSSL::KDF.pbkdf2_hmac("", **@defaults)
+    key.should == "k\x9F-\xB1\xF7\x9A\v\xA1(C\xF9\x85!P\xEF\x8C".b
+  end
+
+  it "accepts an empty salt" do
+    key = OpenSSL::KDF.pbkdf2_hmac("secret", **@defaults, salt: "")
+    key.should == "\xD5f\xE5\xEA\xF91\x1D\xD3evD\xED\xDB\xE80\x80".b
+  end
+
+  it "accepts an empty length" do
+    key = OpenSSL::KDF.pbkdf2_hmac("secret", **@defaults, length: 0)
+    key.should.empty?
+  end
+
+  it "accepts an arbitrary length" do
+    key = OpenSSL::KDF.pbkdf2_hmac("secret", **@defaults, length: 19)
+    key.should == "!\x99+\xF0^\xD0\x8BM\x158\xC4\xAC\x9C\xF1\xF0\xE0\xCF\xBB\x7F".b
+  end
+
+  it "accepts any hash function known to OpenSSL" do
+    key = OpenSSL::KDF.pbkdf2_hmac("secret", **@defaults, hash: "sha512")
+    key.should == "N\x12}D\xCE\x99\xDBC\x8E\xEC\xAAr\xEA1\xDF\xFF".b
+  end
+
+  it "raises a TypeError when password is not a String and does not respond to #to_str" do
+    -> {
+      OpenSSL::KDF.pbkdf2_hmac(Object.new, **@defaults)
+    }.should raise_error(TypeError, "no implicit conversion of Object into String")
+  end
+
+  it "raises a TypeError when salt is not a String and does not respond to #to_str" do
+    -> {
+      OpenSSL::KDF.pbkdf2_hmac("secret", **@defaults, salt: Object.new)
+    }.should raise_error(TypeError, "no implicit conversion of Object into String")
+  end
+
+  it "raises a TypeError when iterations is not an Integer and does not respond to #to_int" do
+    -> {
+      OpenSSL::KDF.pbkdf2_hmac("secret", **@defaults, iterations: Object.new)
+    }.should raise_error(TypeError, "no implicit conversion of Object into Integer")
+  end
+
+  it "raises a TypeError when length is not an Integer and does not respond to #to_int" do
+    -> {
+      OpenSSL::KDF.pbkdf2_hmac("secret", **@defaults, length: Object.new)
+    }.should raise_error(TypeError, "no implicit conversion of Object into Integer")
+  end
+
+  it "raises a TypeError when hash is neither a String nor an OpenSSL::Digest" do
+    -> {
+      OpenSSL::KDF.pbkdf2_hmac("secret", **@defaults, hash: Object.new)
+    }.should raise_error(TypeError, "wrong argument type Object (expected OpenSSL/Digest)")
+  end
+
+  it "raises a TypeError when hash is neither a String nor an OpenSSL::Digest, it does not try to call #to_str" do
+    hash = mock("hash")
+    hash.should_not_receive(:to_str)
+    -> {
+      OpenSSL::KDF.pbkdf2_hmac("secret", **@defaults, hash: hash)
+    }.should raise_error(TypeError, "wrong argument type MockObject (expected OpenSSL/Digest)")
+  end
+
+  it "raises a RuntimeError for unknown digest algorithms" do
+    -> {
+      OpenSSL::KDF.pbkdf2_hmac("secret", **@defaults, hash: "wd40")
+    }.should raise_error(RuntimeError, /Unsupported digest algorithm \(wd40\)/)
+  end
+
+  it "treats salt as a required keyword" do
+    -> {
+      OpenSSL::KDF.pbkdf2_hmac("secret", **@defaults.except(:salt))
+    }.should raise_error(ArgumentError, 'missing keyword: :salt')
+  end
+
+  it "treats iterations as a required keyword" do
+    -> {
+      OpenSSL::KDF.pbkdf2_hmac("secret", **@defaults.except(:iterations))
+    }.should raise_error(ArgumentError, 'missing keyword: :iterations')
+  end
+
+  it "treats length as a required keyword" do
+    -> {
+      OpenSSL::KDF.pbkdf2_hmac("secret", **@defaults.except(:length))
+    }.should raise_error(ArgumentError, 'missing keyword: :length')
+  end
+
+  it "treats hash as a required keyword" do
+    -> {
+      OpenSSL::KDF.pbkdf2_hmac("secret", **@defaults.except(:hash))
+    }.should raise_error(ArgumentError, 'missing keyword: :hash')
+  end
+
+  it "treats all keywords as required" do
+    -> {
+      OpenSSL::KDF.pbkdf2_hmac("secret")
+    }.should raise_error(ArgumentError, 'missing keywords: :salt, :iterations, :length, :hash')
+  end
+
+  guard -> { OpenSSL::OPENSSL_VERSION_NUMBER >= 0x30000000 } do
+    it "raises an OpenSSL::KDF::KDFError for 0 or less iterations" do
+      -> {
+        OpenSSL::KDF.pbkdf2_hmac("secret", **@defaults, iterations: 0)
+      }.should raise_error(OpenSSL::KDF::KDFError, "PKCS5_PBKDF2_HMAC: invalid iteration count")
+
+      -> {
+        OpenSSL::KDF.pbkdf2_hmac("secret", **@defaults, iterations: -1)
+      }.should raise_error(OpenSSL::KDF::KDFError, /PKCS5_PBKDF2_HMAC/)
+    end
+  end
+end
diff --git a/spec/ruby/library/openssl/kdf/scrypt_spec.rb b/spec/ruby/library/openssl/kdf/scrypt_spec.rb
new file mode 100644
index 00000000000000..e01b8bca8a3f21
--- /dev/null
+++ b/spec/ruby/library/openssl/kdf/scrypt_spec.rb
@@ -0,0 +1,210 @@
+require_relative '../../../spec_helper'
+require 'openssl'
+
+# LibreSSL seems not to support scrypt
+guard -> { OpenSSL::OPENSSL_VERSION.start_with?('OpenSSL') and OpenSSL::OPENSSL_VERSION_NUMBER >= 0x10100000 } do
+  describe "OpenSSL::KDF.scrypt" do
+    before :each do
+      @defaults = {
+        salt: "\x00".b * 16,
+        N: 2**14,
+        r: 8,
+        p: 1,
+        length: 32
+      }
+    end
+
+    it "creates the same value with the same input" do
+      key = OpenSSL::KDF.scrypt("secret", **@defaults)
+      key.should == "h\xB2k\xDF]\xDA\xE1.-(\xCF\xAC\x91D\x8F\xC2a\x9C\x9D\x17}\xF2\x84T\xD4)\xC2>\xFE\x93\xE3\xF4".b
+    end
+
+    it "supports nullbytes embedded into the password" do
+      key = OpenSSL::KDF.scrypt("sec\x00ret".b, **@defaults)
+      key.should == "\xF9\xA4\xA0\xF1p\xF4\xF0\xCAT\xB4v\xEB\r7\x88N\xF7\x15]Ns\xFCwt4a\xC9\xC6\xA7\x13\x81&".b
+    end
+
+    it "coerces the password into a String using #to_str" do
+      pass = mock("pass")
+      pass.should_receive(:to_str).and_return("secret")
+      key = OpenSSL::KDF.scrypt(pass, **@defaults)
+      key.should == "h\xB2k\xDF]\xDA\xE1.-(\xCF\xAC\x91D\x8F\xC2a\x9C\x9D\x17}\xF2\x84T\xD4)\xC2>\xFE\x93\xE3\xF4".b
+    end
+
+    it "coerces the salt into a String using #to_str" do
+      salt = mock("salt")
+      salt.should_receive(:to_str).and_return("\x00".b * 16)
+      key = OpenSSL::KDF.scrypt("secret", **@defaults, salt: salt)
+      key.should == "h\xB2k\xDF]\xDA\xE1.-(\xCF\xAC\x91D\x8F\xC2a\x9C\x9D\x17}\xF2\x84T\xD4)\xC2>\xFE\x93\xE3\xF4".b
+    end
+
+    it "coerces the N into an Integer using #to_int" do
+      n = mock("N")
+      n.should_receive(:to_int).and_return(2**14)
+      key = OpenSSL::KDF.scrypt("secret", **@defaults, N: n)
+      key.should == "h\xB2k\xDF]\xDA\xE1.-(\xCF\xAC\x91D\x8F\xC2a\x9C\x9D\x17}\xF2\x84T\xD4)\xC2>\xFE\x93\xE3\xF4".b
+    end
+
+    it "coerces the r into an Integer using #to_int" do
+      r = mock("r")
+      r.should_receive(:to_int).and_return(8)
+      key = OpenSSL::KDF.scrypt("secret", **@defaults, r: r)
+      key.should == "h\xB2k\xDF]\xDA\xE1.-(\xCF\xAC\x91D\x8F\xC2a\x9C\x9D\x17}\xF2\x84T\xD4)\xC2>\xFE\x93\xE3\xF4".b
+    end
+
+    it "coerces the p into an Integer using #to_int" do
+      p = mock("p")
+      p.should_receive(:to_int).and_return(1)
+      key = OpenSSL::KDF.scrypt("secret", **@defaults, p: p)
+      key.should == "h\xB2k\xDF]\xDA\xE1.-(\xCF\xAC\x91D\x8F\xC2a\x9C\x9D\x17}\xF2\x84T\xD4)\xC2>\xFE\x93\xE3\xF4".b
+    end
+
+    it "coerces the length into an Integer using #to_int" do
+      length = mock("length")
+      length.should_receive(:to_int).and_return(32)
+      key = OpenSSL::KDF.scrypt("secret", **@defaults, length: length)
+      key.should == "h\xB2k\xDF]\xDA\xE1.-(\xCF\xAC\x91D\x8F\xC2a\x9C\x9D\x17}\xF2\x84T\xD4)\xC2>\xFE\x93\xE3\xF4".b
+    end
+
+    it "accepts an empty password" do
+      key = OpenSSL::KDF.scrypt("", **@defaults)
+      key.should == "\xAA\xFC\xF5^E\x94v\xFFk\xE6\xF0vR\xE7\x13\xA7\xF5\x15'\x9A\xE4C\x9Dn\x18F_E\xD2\v\e\xB3".b
+    end
+
+    it "accepts an empty salt" do
+      key = OpenSSL::KDF.scrypt("secret", **@defaults, salt: "")
+      key.should == "\x96\xACDl\xCB3/aN\xB0F\x8A#\xD7\x92\xD2O\x1E\v\xBB\xCE\xC0\xAA\xB9\x0F]\xB09\xEA8\xDD\e".b
+    end
+
+    it "accepts a zero length" do
+      key = OpenSSL::KDF.scrypt("secret", **@defaults, length: 0)
+      key.should.empty?
+    end
+
+    it "accepts an arbitrary length" do
+      key = OpenSSL::KDF.scrypt("secret", **@defaults, length: 19)
+      key.should == "h\xB2k\xDF]\xDA\xE1.-(\xCF\xAC\x91D\x8F\xC2a\x9C\x9D".b
+    end
+
+    it "raises a TypeError when password is not a String and does not respond to #to_str" do
+      -> {
+        OpenSSL::KDF.scrypt(Object.new, **@defaults)
+      }.should raise_error(TypeError, "no implicit conversion of Object into String")
+    end
+
+    it "raises a TypeError when salt is not a String and does not respond to #to_str" do
+      -> {
+        OpenSSL::KDF.scrypt("secret", **@defaults, salt: Object.new)
+      }.should raise_error(TypeError, "no implicit conversion of Object into String")
+    end
+
+    it "raises a TypeError when N is not an Integer and does not respond to #to_int" do
+      -> {
+        OpenSSL::KDF.scrypt("secret", **@defaults, N: Object.new)
+      }.should raise_error(TypeError, "no implicit conversion of Object into Integer")
+    end
+
+    it "raises a TypeError when r is not an Integer and does not respond to #to_int" do
+      -> {
+        OpenSSL::KDF.scrypt("secret", **@defaults, r: Object.new)
+      }.should raise_error(TypeError, "no implicit conversion of Object into Integer")
+    end
+
+    it "raises a TypeError when p is not an Integer and does not respond to #to_int" do
+      -> {
+        OpenSSL::KDF.scrypt("secret", **@defaults, p: Object.new)
+      }.should raise_error(TypeError, "no implicit conversion of Object into Integer")
+    end
+
+    it "raises a TypeError when length is not an Integer and does not respond to #to_int" do
+      -> {
+        OpenSSL::KDF.scrypt("secret", **@defaults, length: Object.new)
+      }.should raise_error(TypeError, "no implicit conversion of Object into Integer")
+    end
+
+    it "treats salt as a required keyword" do
+      -> {
+        OpenSSL::KDF.scrypt("secret", **@defaults.except(:salt))
+      }.should raise_error(ArgumentError, 'missing keyword: :salt')
+    end
+
+    it "treats N as a required keyword" do
+      -> {
+        OpenSSL::KDF.scrypt("secret", **@defaults.except(:N))
+      }.should raise_error(ArgumentError, 'missing keyword: :N')
+    end
+
+    it "treats r as a required keyword" do
+      -> {
+        OpenSSL::KDF.scrypt("secret", **@defaults.except(:r))
+      }.should raise_error(ArgumentError, 'missing keyword: :r')
+    end
+
+    it "treats p as a required keyword" do
+      -> {
+        OpenSSL::KDF.scrypt("secret", **@defaults.except(:p))
+      }.should raise_error(ArgumentError, 'missing keyword: :p')
+    end
+
+    it "treats length as a required keyword" do
+      -> {
+        OpenSSL::KDF.scrypt("secret", **@defaults.except(:length))
+      }.should raise_error(ArgumentError, 'missing keyword: :length')
+    end
+
+    it "treats all keywords as required" do
+      -> {
+        OpenSSL::KDF.scrypt("secret")
+      }.should raise_error(ArgumentError, 'missing keywords: :salt, :N, :r, :p, :length')
+    end
+
+    it "requires N to be a power of 2" do
+      -> {
+        OpenSSL::KDF.scrypt("secret", **@defaults, N: 2**14 - 1)
+      }.should raise_error(OpenSSL::KDF::KDFError, /EVP_PBE_scrypt/)
+    end
+
+    it "requires N to be at least 2" do
+      key = OpenSSL::KDF.scrypt("secret", **@defaults, N: 2)
+      key.should == "\x06A$a\xA9!\xBE\x01\x85\xA7\x18\xBCEa\x82\xC5\xFEl\x93\xAB\xBD\xF7\x8B\x84\v\xFC\eN\xEBQ\xE6\xD2".b
+
+      -> {
+        OpenSSL::KDF.scrypt("secret", **@defaults, N: 1)
+      }.should raise_error(OpenSSL::KDF::KDFError, /EVP_PBE_scrypt/)
+
+      -> {
+        OpenSSL::KDF.scrypt("secret", **@defaults, N: 0)
+      }.should raise_error(OpenSSL::KDF::KDFError, /EVP_PBE_scrypt/)
+
+      -> {
+        OpenSSL::KDF.scrypt("secret", **@defaults, N: -1)
+      }.should raise_error(OpenSSL::KDF::KDFError, /EVP_PBE_scrypt/)
+    end
+
+    it "requires r to be positive" do
+      -> {
+        OpenSSL::KDF.scrypt("secret", **@defaults, r: 0)
+      }.should raise_error(OpenSSL::KDF::KDFError, /EVP_PBE_scrypt/)
+
+      -> {
+        OpenSSL::KDF.scrypt("secret", **@defaults, r: -1)
+      }.should raise_error(OpenSSL::KDF::KDFError, /EVP_PBE_scrypt/)
+    end
+
+    it "requires p to be positive" do
+      -> {
+        OpenSSL::KDF.scrypt("secret", **@defaults, p: 0)
+      }.should raise_error(OpenSSL::KDF::KDFError, /EVP_PBE_scrypt/)
+
+      -> {
+        OpenSSL::KDF.scrypt("secret", **@defaults, p: -1)
+      }.should raise_error(OpenSSL::KDF::KDFError, /EVP_PBE_scrypt/)
+    end
+
+    it "requires length to be not negative" do
+      -> {
+        OpenSSL::KDF.scrypt("secret", **@defaults, length: -1)
+      }.should raise_error(ArgumentError, "negative string size (or size too big)")
+    end
+  end
+end
diff --git a/spec/ruby/library/openssl/secure_compare_spec.rb b/spec/ruby/library/openssl/secure_compare_spec.rb
new file mode 100644
index 00000000000000..cec48e01e7b7a8
--- /dev/null
+++ b/spec/ruby/library/openssl/secure_compare_spec.rb
@@ -0,0 +1,38 @@
+require_relative '../../spec_helper'
+require 'openssl'
+
+describe "OpenSSL.secure_compare" do
+  it "returns true for two strings with the same content" do
+    input1 = "the quick brown fox jumps over the lazy dog"
+    input2 = "the quick brown fox jumps over the lazy dog"
+    OpenSSL.secure_compare(input1, input2).should be_true
+  end
+
+  it "returns false for two strings with different content" do
+    input1 = "the quick brown fox jumps over the lazy dog"
+    input2 = "the lazy dog jumps over the quick brown fox"
+    OpenSSL.secure_compare(input1, input2).should be_false
+  end
+
+  it "converts both arguments to strings using #to_str, but adds equality check for the original objects" do
+    input1 = mock("input1")
+    input1.should_receive(:to_str).and_return("the quick brown fox jumps over the lazy dog")
+    input2 = mock("input2")
+    input2.should_receive(:to_str).and_return("the quick brown fox jumps over the lazy dog")
+    OpenSSL.secure_compare(input1, input2).should be_false
+
+    input = mock("input")
+    input.should_receive(:to_str).twice.and_return("the quick brown fox jumps over the lazy dog")
+    OpenSSL.secure_compare(input, input).should be_true
+  end
+
+  it "does not accept arguments that are not string and cannot be coerced into strings" do
+    -> {
+      OpenSSL.secure_compare("input1", :input2)
+    }.should raise_error(TypeError, 'no implicit conversion of Symbol into String')
+
+    -> {
+      OpenSSL.secure_compare(Object.new, "input2")
+    }.should raise_error(TypeError, 'no implicit conversion of Object into String')
+  end
+end
diff --git a/spec/ruby/library/openssl/shared/constants.rb b/spec/ruby/library/openssl/shared/constants.rb
index 0bed4156a18c1d..836f75011b3ebc 100644
--- a/spec/ruby/library/openssl/shared/constants.rb
+++ b/spec/ruby/library/openssl/shared/constants.rb
@@ -1,4 +1,4 @@
-# -*- encoding: binary -*-
+# encoding: binary
 module HMACConstants
 
   Contents = "Ipsum is simply dummy text of the printing and typesetting industry. \nLorem Ipsum has been the industrys standard dummy text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book. \nIt has survived not only five centuries, but also the leap into electronic typesetting, remaining essentially unchanged. \nIt was popularised in the 1960s with the release of Letraset sheets containing Lorem Ipsum passages, and more recently with desktop publishing software like Aldus PageMaker including versions of Lorem Ipsum."
diff --git a/spec/ruby/library/openssl/x509/name/verify_spec.rb b/spec/ruby/library/openssl/x509/store/verify_spec.rb
similarity index 98%
rename from spec/ruby/library/openssl/x509/name/verify_spec.rb
rename to spec/ruby/library/openssl/x509/store/verify_spec.rb
index 6dcfc994663a58..6a6a53d992b104 100644
--- a/spec/ruby/library/openssl/x509/name/verify_spec.rb
+++ b/spec/ruby/library/openssl/x509/store/verify_spec.rb
@@ -1,7 +1,7 @@
 require_relative '../../../../spec_helper'
 require 'openssl'
 
-describe "OpenSSL::X509::Name.verify" do
+describe "OpenSSL::X509::Store#verify" do
   it "returns true for valid certificate" do
     key = OpenSSL::PKey::RSA.new 2048
     cert = OpenSSL::X509::Certificate.new
diff --git a/spec/ruby/library/pathname/glob_spec.rb b/spec/ruby/library/pathname/glob_spec.rb
index ced810fa907edf..de322bab476341 100644
--- a/spec/ruby/library/pathname/glob_spec.rb
+++ b/spec/ruby/library/pathname/glob_spec.rb
@@ -21,6 +21,10 @@
     Pathname.glob(@dir + 'lib/*.js').should == []
   end
 
+  it 'returns [] when the pathname does not exist' do
+    Pathname.glob('i_dont_exist/lib/*.js').should == []
+  end
+
   it 'returns matching file paths' do
     Pathname.glob(@dir + 'lib/*i*.rb').sort.should == [Pathname.new(@file_1), Pathname.new(@file_2)].sort
   end
@@ -67,6 +71,10 @@
     Pathname.new(@dir).glob('lib/*.js').should == []
   end
 
+  it 'returns [] when the pathname does not exist' do
+    Pathname.new('./i_dont_exist').glob('lib/*.js').should == []
+  end
+
   it 'returns matching file paths' do
     Pathname.new(@dir).glob('lib/*i*.rb').sort.should == [Pathname.new(@file_1), Pathname.new(@file_2)].sort
   end
diff --git a/spec/ruby/library/pp/pp_spec.rb b/spec/ruby/library/pp/pp_spec.rb
index 243478efd967c7..e45a6bb94f67a3 100644
--- a/spec/ruby/library/pp/pp_spec.rb
+++ b/spec/ruby/library/pp/pp_spec.rb
@@ -25,6 +25,6 @@
     hash = { 'key' => 42 }
     -> {
       PP.pp hash
-    }.should output('{"key"=>42}' + "\n")
+    }.should output("#{hash.inspect}\n")
   end
 end
diff --git a/spec/ruby/library/prime/each_spec.rb b/spec/ruby/library/prime/each_spec.rb
index c89e871582512a..b99cf7cf0e0211 100644
--- a/spec/ruby/library/prime/each_spec.rb
+++ b/spec/ruby/library/prime/each_spec.rb
@@ -1,170 +1,167 @@
 require_relative '../../spec_helper'
+require 'prime'
 
-ruby_version_is ""..."3.1" do
-  require 'prime'
-
-  describe :prime_each, shared: true do
-    before :each do
-      ScratchPad.record []
-    end
+describe :prime_each, shared: true do
+  before :each do
+    ScratchPad.record []
+  end
 
-    it "enumerates primes" do
-      primes = Prime.instance
-      result = []
+  it "enumerates primes" do
+    primes = Prime.instance
+    result = []
 
-      primes.each { |p|
-        result << p
-        break if p > 10
-      }
+    primes.each { |p|
+      result << p
+      break if p > 10
+    }
 
-      result.should == [2, 3, 5, 7, 11]
-    end
+    result.should == [2, 3, 5, 7, 11]
+  end
 
-    it "yields ascending primes to the block" do
-      previous = 1
-      @object.each do |prime|
-        break if prime > 1000
-        ScratchPad << prime
-        prime.should > previous
-        previous = prime
-      end
-
-      all_prime = true
-      ScratchPad.recorded.all? do |prime|
-        all_prime &&= (2..Math.sqrt(prime)).all? { |d| prime % d != 0 }
-      end
-
-      all_prime.should be_true
+  it "yields ascending primes to the block" do
+    previous = 1
+    @object.each do |prime|
+      break if prime > 1000
+      ScratchPad << prime
+      prime.should > previous
+      previous = prime
     end
 
-    it "returns the last evaluated expression in the passed block" do
-      @object.each { break :value }.should equal(:value)
+    all_prime = true
+    ScratchPad.recorded.all? do |prime|
+      all_prime &&= (2..Math.sqrt(prime)).all? { |d| prime % d != 0 }
     end
 
-    describe "when not passed a block" do
-      before :each do
-        @prime_enum = @object.each
-      end
-
-      it "returns an object that is Enumerable" do
-        @prime_enum.each.should be_kind_of(Enumerable)
-      end
-
-      it "returns an object that responds to #with_index" do
-        @prime_enum.should respond_to(:with_index)
-      end
+    all_prime.should be_true
+  end
 
-      it "returns an object that responds to #with_object" do
-        @prime_enum.should respond_to(:with_object)
-      end
+  it "returns the last evaluated expression in the passed block" do
+    @object.each { break :value }.should equal(:value)
+  end
 
-      it "returns an object that responds to #next" do
-        @prime_enum.should respond_to(:next)
-      end
+  describe "when not passed a block" do
+    before :each do
+      @prime_enum = @object.each
+    end
 
-      it "returns an object that responds to #rewind" do
-        @prime_enum.should respond_to(:rewind)
-      end
+    it "returns an object that is Enumerable" do
+      @prime_enum.each.should be_kind_of(Enumerable)
+    end
 
-      it "yields primes starting at 2 independent of prior enumerators" do
-        @prime_enum.next.should == 2
-        @prime_enum.next.should == 3
+    it "returns an object that responds to #with_index" do
+      @prime_enum.should respond_to(:with_index)
+    end
 
-        @object.each { |prime| break prime }.should == 2
-      end
+    it "returns an object that responds to #with_object" do
+      @prime_enum.should respond_to(:with_object)
+    end
 
-      it "returns an enumerator that yields previous primes when #rewind is called" do
-        @prime_enum.next.should == 2
-        @prime_enum.next.should == 3
-        @prime_enum.rewind
-        @prime_enum.next.should == 2
-      end
+    it "returns an object that responds to #next" do
+      @prime_enum.should respond_to(:next)
+    end
 
-      it "returns independent enumerators" do
-        enum = @object.each
-        enum.next.should == 2
-        enum.next.should == 3
+    it "returns an object that responds to #rewind" do
+      @prime_enum.should respond_to(:rewind)
+    end
 
-        @prime_enum.next.should == 2
+    it "yields primes starting at 2 independent of prior enumerators" do
+      @prime_enum.next.should == 2
+      @prime_enum.next.should == 3
 
-        enum.next.should == 5
-      end
+      @object.each { |prime| break prime }.should == 2
     end
-  end
 
-  describe :prime_each_with_arguments, shared: true do
-    before :each do
-      ScratchPad.record []
+    it "returns an enumerator that yields previous primes when #rewind is called" do
+      @prime_enum.next.should == 2
+      @prime_enum.next.should == 3
+      @prime_enum.rewind
+      @prime_enum.next.should == 2
     end
 
-    it "yields ascending primes less than or equal to the argument" do
-      bound = 1000
-      previous = 1
-      @object.each(bound) do |prime|
-        ScratchPad << prime
-        prime.should > previous
-        previous = prime
-      end
+    it "returns independent enumerators" do
+      enum = @object.each
+      enum.next.should == 2
+      enum.next.should == 3
 
-      ScratchPad.recorded.all? do |prime|
-        (2..Math.sqrt(prime)).all? { |d| prime % d != 0 }
-      end.should be_true
+      @prime_enum.next.should == 2
 
-      ScratchPad.recorded.all? { |prime| prime <= bound }.should be_true
+      enum.next.should == 5
     end
+  end
+end
 
-    it "returns nil when no prime is generated" do
-      @object.each(1) { :value }.should be_nil
-    end
+describe :prime_each_with_arguments, shared: true do
+  before :each do
+    ScratchPad.record []
+  end
 
-    it "yields primes starting at 2 independent of prior enumeration" do
-      @object.each(10) { |prime| prime }.should == 7
-      @object.each(10) { |prime| break prime }.should == 2
+  it "yields ascending primes less than or equal to the argument" do
+    bound = 1000
+    previous = 1
+    @object.each(bound) do |prime|
+      ScratchPad << prime
+      prime.should > previous
+      previous = prime
     end
 
-    it "accepts a pseudo-prime generator as the second argument" do
-      generator = mock('very bad pseudo-prime generator')
-      generator.should_receive(:upper_bound=).with(100)
-      generator.should_receive(:each).and_yield(2).and_yield(3).and_yield(4)
-
-      @object.each(100, generator) { |prime| ScratchPad << prime }
-      ScratchPad.recorded.should == [2, 3, 4]
-    end
+    ScratchPad.recorded.all? do |prime|
+      (2..Math.sqrt(prime)).all? { |d| prime % d != 0 }
+    end.should be_true
 
-    describe "when not passed a block" do
-      it "returns an object that returns primes less than or equal to the bound" do
-        bound = 100
-        @object.each(bound).all? { |prime| prime <= bound }.should be_true
-      end
-    end
+    ScratchPad.recorded.all? { |prime| prime <= bound }.should be_true
   end
 
-  describe "Prime.each" do
-    it_behaves_like :prime_each, :each, Prime
+  it "returns nil when no prime is generated" do
+    @object.each(1) { :value }.should be_nil
   end
 
-  describe "Prime.each" do
-    it_behaves_like :prime_each_with_arguments, :each, Prime
+  it "yields primes starting at 2 independent of prior enumeration" do
+    @object.each(10) { |prime| prime }.should == 7
+    @object.each(10) { |prime| break prime }.should == 2
   end
 
-  describe "Prime#each with Prime.instance" do
-    it_behaves_like :prime_each, :each, Prime.instance
-  end
+  it "accepts a pseudo-prime generator as the second argument" do
+    generator = mock('very bad pseudo-prime generator')
+    generator.should_receive(:upper_bound=).with(100)
+    generator.should_receive(:each).and_yield(2).and_yield(3).and_yield(4)
 
-  describe "Prime#each with Prime.instance" do
-    it_behaves_like :prime_each_with_arguments, :each, Prime.instance
+    @object.each(100, generator) { |prime| ScratchPad << prime }
+    ScratchPad.recorded.should == [2, 3, 4]
   end
 
-  describe "Prime#each with Prime.instance" do
-    before :each do
-      @object = Prime.instance
+  describe "when not passed a block" do
+    it "returns an object that returns primes less than or equal to the bound" do
+      bound = 100
+      @object.each(bound).all? { |prime| prime <= bound }.should be_true
     end
+  end
+end
 
-    it_behaves_like :prime_each, :each
+describe "Prime.each" do
+  it_behaves_like :prime_each, :each, Prime
+end
 
-    it "resets the enumerator with each call" do
-      @object.each { |prime| break if prime > 10 }
-      @object.each { |prime| break prime }.should == 2
-    end
+describe "Prime.each" do
+  it_behaves_like :prime_each_with_arguments, :each, Prime
+end
+
+describe "Prime#each with Prime.instance" do
+  it_behaves_like :prime_each, :each, Prime.instance
+end
+
+describe "Prime#each with Prime.instance" do
+  it_behaves_like :prime_each_with_arguments, :each, Prime.instance
+end
+
+describe "Prime#each with Prime.instance" do
+  before :each do
+    @object = Prime.instance
+  end
+
+  it_behaves_like :prime_each, :each
+
+  it "resets the enumerator with each call" do
+    @object.each { |prime| break if prime > 10 }
+    @object.each { |prime| break prime }.should == 2
   end
 end
diff --git a/spec/ruby/library/prime/instance_spec.rb b/spec/ruby/library/prime/instance_spec.rb
index 82f21913b79f1c..5183f36901847e 100644
--- a/spec/ruby/library/prime/instance_spec.rb
+++ b/spec/ruby/library/prime/instance_spec.rb
@@ -1,24 +1,21 @@
 require_relative '../../spec_helper'
+require 'prime'
 
-ruby_version_is ""..."3.1" do
-  require 'prime'
-
-  describe "Prime.instance" do
-    it "returns a object representing the set of prime numbers" do
-      Prime.instance.should be_kind_of(Prime)
-    end
+describe "Prime.instance" do
+  it "returns a object representing the set of prime numbers" do
+    Prime.instance.should be_kind_of(Prime)
+  end
 
-    it "returns a object with no obsolete features" do
-      Prime.instance.should_not respond_to(:succ)
-      Prime.instance.should_not respond_to(:next)
-    end
+  it "returns a object with no obsolete features" do
+    Prime.instance.should_not respond_to(:succ)
+    Prime.instance.should_not respond_to(:next)
+  end
 
-    it "does not complain anything" do
-      -> { Prime.instance }.should_not complain
-    end
+  it "does not complain anything" do
+    -> { Prime.instance }.should_not complain
+  end
 
-    it "raises a ArgumentError when is called with some arguments" do
-      -> { Prime.instance(1) }.should raise_error(ArgumentError)
-    end
+  it "raises a ArgumentError when is called with some arguments" do
+    -> { Prime.instance(1) }.should raise_error(ArgumentError)
   end
 end
diff --git a/spec/ruby/library/prime/int_from_prime_division_spec.rb b/spec/ruby/library/prime/int_from_prime_division_spec.rb
index 5c881aefa14118..5abb7221df3cdd 100644
--- a/spec/ruby/library/prime/int_from_prime_division_spec.rb
+++ b/spec/ruby/library/prime/int_from_prime_division_spec.rb
@@ -1,16 +1,13 @@
 require_relative '../../spec_helper'
+require 'prime'
 
-ruby_version_is ""..."3.1" do
-  require 'prime'
-
-  describe "Prime.int_from_prime_division" do
-    it "returns the product of the given factorization" do
-      Prime.int_from_prime_division([[2,3], [3,3], [5,3], [7,3], [11,3], [13,3], [17,3]]).
-        should == 2**3 * 3**3 * 5**3 * 7**3 * 11**3 * 13**3 * 17**3
-    end
+describe "Prime.int_from_prime_division" do
+  it "returns the product of the given factorization" do
+    Prime.int_from_prime_division([[2,3], [3,3], [5,3], [7,3], [11,3], [13,3], [17,3]]).
+      should == 2**3 * 3**3 * 5**3 * 7**3 * 11**3 * 13**3 * 17**3
+  end
 
-    it "returns 1 for an empty factorization" do
-      Prime.int_from_prime_division([]).should == 1
-    end
+  it "returns 1 for an empty factorization" do
+    Prime.int_from_prime_division([]).should == 1
   end
 end
diff --git a/spec/ruby/library/prime/integer/each_prime_spec.rb b/spec/ruby/library/prime/integer/each_prime_spec.rb
index 6034802e730375..a71296b0df37fa 100644
--- a/spec/ruby/library/prime/integer/each_prime_spec.rb
+++ b/spec/ruby/library/prime/integer/each_prime_spec.rb
@@ -1,16 +1,13 @@
 require_relative '../../../spec_helper'
+require 'prime'
 
-ruby_version_is ""..."3.1" do
-  require 'prime'
-
-  describe "Integer.each_prime" do
-    it "is transferred to Prime.each" do
-      Prime.should_receive(:each).with(100).and_yield(2).and_yield(3).and_yield(5)
-      yielded = []
-      Integer.each_prime(100) do |prime|
-        yielded << prime
-      end
-      yielded.should == [2,3,5]
+describe "Integer.each_prime" do
+  it "is transferred to Prime.each" do
+    Prime.should_receive(:each).with(100).and_yield(2).and_yield(3).and_yield(5)
+    yielded = []
+    Integer.each_prime(100) do |prime|
+      yielded << prime
     end
+    yielded.should == [2,3,5]
   end
 end
diff --git a/spec/ruby/library/prime/integer/from_prime_division_spec.rb b/spec/ruby/library/prime/integer/from_prime_division_spec.rb
index 5422bc651ced5b..e0e74fb3369cb2 100644
--- a/spec/ruby/library/prime/integer/from_prime_division_spec.rb
+++ b/spec/ruby/library/prime/integer/from_prime_division_spec.rb
@@ -1,16 +1,13 @@
 require_relative '../../../spec_helper'
+require 'prime'
 
-ruby_version_is ""..."3.1" do
-  require 'prime'
-
-  describe "Integer.from_prime_division" do
-    it "returns the product of the given factorization" do
-      Integer.from_prime_division([[2,3], [3,3], [5,3], [7,3], [11,3], [13,3], [17,3]]).
-        should == 2**3 * 3**3 * 5**3 * 7**3 * 11**3 * 13**3 * 17**3
-    end
+describe "Integer.from_prime_division" do
+  it "returns the product of the given factorization" do
+    Integer.from_prime_division([[2,3], [3,3], [5,3], [7,3], [11,3], [13,3], [17,3]]).
+      should == 2**3 * 3**3 * 5**3 * 7**3 * 11**3 * 13**3 * 17**3
+  end
 
-    it "returns 1 for an empty factorization" do
-      Integer.from_prime_division([]).should == 1
-    end
+  it "returns 1 for an empty factorization" do
+    Integer.from_prime_division([]).should == 1
   end
 end
diff --git a/spec/ruby/library/prime/integer/prime_division_spec.rb b/spec/ruby/library/prime/integer/prime_division_spec.rb
index 03be0be27b7583..be03438a6f8afb 100644
--- a/spec/ruby/library/prime/integer/prime_division_spec.rb
+++ b/spec/ruby/library/prime/integer/prime_division_spec.rb
@@ -1,22 +1,19 @@
 require_relative '../../../spec_helper'
+require 'prime'
 
-ruby_version_is ""..."3.1" do
-  require 'prime'
-
-  describe "Integer#prime_division" do
-    it "returns an array of a prime factor and a corresponding exponent" do
-      (2*3*5*7*11*13*17).prime_division.should ==
-        [[2,1], [3,1], [5,1], [7,1], [11,1], [13,1], [17,1]]
-    end
+describe "Integer#prime_division" do
+  it "returns an array of a prime factor and a corresponding exponent" do
+    (2*3*5*7*11*13*17).prime_division.should ==
+      [[2,1], [3,1], [5,1], [7,1], [11,1], [13,1], [17,1]]
+  end
 
-    it "returns an empty array for 1" do
-      1.prime_division.should == []
-    end
-    it "returns an empty array for -1" do
-      -1.prime_division.should == [[-1, 1]]
-    end
-    it "raises ZeroDivisionError for 0" do
-      -> { 0.prime_division }.should raise_error(ZeroDivisionError)
-    end
+  it "returns an empty array for 1" do
+    1.prime_division.should == []
+  end
+  it "returns an empty array for -1" do
+    -1.prime_division.should == [[-1, 1]]
+  end
+  it "raises ZeroDivisionError for 0" do
+    -> { 0.prime_division }.should raise_error(ZeroDivisionError)
   end
 end
diff --git a/spec/ruby/library/prime/integer/prime_spec.rb b/spec/ruby/library/prime/integer/prime_spec.rb
index 65b779e3191918..53de76d5ab337d 100644
--- a/spec/ruby/library/prime/integer/prime_spec.rb
+++ b/spec/ruby/library/prime/integer/prime_spec.rb
@@ -1,20 +1,17 @@
 require_relative '../../../spec_helper'
+require 'prime'
 
-ruby_version_is ""..."3.1" do
-  require 'prime'
-
-  describe "Integer#prime?" do
-    it "returns a true value for prime numbers" do
-      2.prime?.should be_true
-      3.prime?.should be_true
-      (2**31-1).prime?.should be_true  # 8th Mersenne prime (M8)
-    end
+describe "Integer#prime?" do
+  it "returns a true value for prime numbers" do
+    2.prime?.should be_true
+    3.prime?.should be_true
+    (2**31-1).prime?.should be_true  # 8th Mersenne prime (M8)
+  end
 
-    it "returns a false value for composite numbers" do
-      4.prime?.should be_false
-      15.prime?.should be_false
-      (2**32-1).prime?.should be_false
-      ( (2**17-1)*(2**19-1) ).prime?.should be_false  # M6*M7
-    end
+  it "returns a false value for composite numbers" do
+    4.prime?.should be_false
+    15.prime?.should be_false
+    (2**32-1).prime?.should be_false
+    ( (2**17-1)*(2**19-1) ).prime?.should be_false  # M6*M7
   end
 end
diff --git a/spec/ruby/library/prime/next_spec.rb b/spec/ruby/library/prime/next_spec.rb
index 8e805ed0440e0a..39c4ae16ae8565 100644
--- a/spec/ruby/library/prime/next_spec.rb
+++ b/spec/ruby/library/prime/next_spec.rb
@@ -1,10 +1,7 @@
 require_relative '../../spec_helper'
+require_relative 'shared/next'
+require 'prime'
 
-ruby_version_is ""..."3.1" do
-  require_relative 'shared/next'
-  require 'prime'
-
-  describe "Prime#next" do
-    it_behaves_like :prime_next, :next
-  end
+describe "Prime#next" do
+  it_behaves_like :prime_next, :next
 end
diff --git a/spec/ruby/library/prime/prime_division_spec.rb b/spec/ruby/library/prime/prime_division_spec.rb
index 4c93d5936a9c7e..6293478f592cea 100644
--- a/spec/ruby/library/prime/prime_division_spec.rb
+++ b/spec/ruby/library/prime/prime_division_spec.rb
@@ -1,28 +1,25 @@
 require_relative '../../spec_helper'
+require 'prime'
 
-ruby_version_is ""..."3.1" do
-  require 'prime'
-
-  describe "Prime.prime_division" do
-    it "returns an array of a prime factor and a corresponding exponent" do
-      Prime.prime_division(2*3*5*7*11*13*17).should ==
-        [[2,1], [3,1], [5,1], [7,1], [11,1], [13,1], [17,1]]
-    end
+describe "Prime.prime_division" do
+  it "returns an array of a prime factor and a corresponding exponent" do
+    Prime.prime_division(2*3*5*7*11*13*17).should ==
+      [[2,1], [3,1], [5,1], [7,1], [11,1], [13,1], [17,1]]
+  end
 
-    it "returns an empty array for 1" do
-      Prime.prime_division(1).should == []
-    end
+  it "returns an empty array for 1" do
+    Prime.prime_division(1).should == []
+  end
 
-    it "returns [[-1, 1]] for -1" do
-      Prime.prime_division(-1).should == [[-1, 1]]
-    end
+  it "returns [[-1, 1]] for -1" do
+    Prime.prime_division(-1).should == [[-1, 1]]
+  end
 
-    it "includes [[-1, 1]] in the divisors of a negative number" do
-      Prime.prime_division(-10).should include([-1, 1])
-    end
+  it "includes [[-1, 1]] in the divisors of a negative number" do
+    Prime.prime_division(-10).should include([-1, 1])
+  end
 
-    it "raises ZeroDivisionError for 0" do
-      -> { Prime.prime_division(0) }.should raise_error(ZeroDivisionError)
-    end
+  it "raises ZeroDivisionError for 0" do
+    -> { Prime.prime_division(0) }.should raise_error(ZeroDivisionError)
   end
 end
diff --git a/spec/ruby/library/prime/prime_spec.rb b/spec/ruby/library/prime/prime_spec.rb
index e2afddd5b287fd..0896c7f0f39a6a 100644
--- a/spec/ruby/library/prime/prime_spec.rb
+++ b/spec/ruby/library/prime/prime_spec.rb
@@ -1,20 +1,17 @@
 require_relative '../../spec_helper'
+require 'prime'
 
-ruby_version_is ""..."3.1" do
-  require 'prime'
-
-  describe "Prime#prime?" do
-    it "returns a true value for prime numbers" do
-      Prime.prime?(2).should be_true
-      Prime.prime?(3).should be_true
-      Prime.prime?(2**31-1).should be_true  # 8th Mersenne prime (M8)
-    end
+describe "Prime#prime?" do
+  it "returns a true value for prime numbers" do
+    Prime.prime?(2).should be_true
+    Prime.prime?(3).should be_true
+    Prime.prime?(2**31-1).should be_true  # 8th Mersenne prime (M8)
+  end
 
-    it "returns a false value for composite numbers" do
-      Prime.prime?(4).should be_false
-      Prime.prime?(15).should be_false
-      Prime.prime?(2**32-1).should be_false
-      Prime.prime?( (2**17-1)*(2**19-1) ).should be_false  # M6*M7
-    end
+  it "returns a false value for composite numbers" do
+    Prime.prime?(4).should be_false
+    Prime.prime?(15).should be_false
+    Prime.prime?(2**32-1).should be_false
+    Prime.prime?( (2**17-1)*(2**19-1) ).should be_false  # M6*M7
   end
 end
diff --git a/spec/ruby/library/prime/succ_spec.rb b/spec/ruby/library/prime/succ_spec.rb
index 9843dae25dc520..34c18d2ba0645b 100644
--- a/spec/ruby/library/prime/succ_spec.rb
+++ b/spec/ruby/library/prime/succ_spec.rb
@@ -1,10 +1,7 @@
 require_relative '../../spec_helper'
+require_relative 'shared/next'
+require 'prime'
 
-ruby_version_is ""..."3.1" do
-  require_relative 'shared/next'
-  require 'prime'
-
-  describe "Prime#succ" do
-    it_behaves_like :prime_next, :succ
-  end
+describe "Prime#succ" do
+  it_behaves_like :prime_next, :succ
 end
diff --git a/spec/ruby/library/random/formatter/alphanumeric_spec.rb b/spec/ruby/library/random/formatter/alphanumeric_spec.rb
new file mode 100644
index 00000000000000..9bd325e1d0a6ab
--- /dev/null
+++ b/spec/ruby/library/random/formatter/alphanumeric_spec.rb
@@ -0,0 +1,56 @@
+require_relative '../../../spec_helper'
+
+require 'random/formatter'
+
+describe "Random::Formatter#alphanumeric" do
+  before :each do
+    @object = Object.new
+    @object.extend(Random::Formatter)
+    @object.define_singleton_method(:bytes) do |n|
+      "\x00".b * n
+    end
+  end
+
+  it "generates a random alphanumeric string" do
+    @object.alphanumeric.should =~ /\A[A-Za-z0-9]+\z/
+  end
+
+  it "has a default size of 16 characters" do
+    @object.alphanumeric.size.should == 16
+  end
+
+  it "accepts a 'size' argument" do
+    @object.alphanumeric(10).size.should == 10
+  end
+
+  it "uses the default size if 'nil' is given as size argument" do
+    @object.alphanumeric(nil).size.should == 16
+  end
+
+  it "raises an ArgumentError if the size is not numeric" do
+    -> {
+      @object.alphanumeric("10")
+    }.should raise_error(ArgumentError)
+  end
+
+  it "does not coerce the size argument with #to_int" do
+    size = mock("size")
+    size.should_not_receive(:to_int)
+    -> {
+      @object.alphanumeric(size)
+    }.should raise_error(ArgumentError)
+  end
+
+  ruby_version_is "3.3" do
+    it "accepts a 'chars' argument with the output alphabet" do
+      @object.alphanumeric(chars: ['a', 'b']).should =~ /\A[ab]+\z/
+    end
+
+    it "converts the elements of chars using #to_s" do
+      to_s = mock("to_s")
+      to_s.should_receive(:to_s).and_return("[mock to_s]")
+      # Using 1 value in chars results in an infinite loop
+      @object.alphanumeric(1, chars: [to_s, to_s]).should == "[mock to_s]"
+    end
+  end
+end
diff --git a/spec/ruby/library/rbconfig/rbconfig_spec.rb b/spec/ruby/library/rbconfig/rbconfig_spec.rb
index b90cc90970db76..b9a4588bf0b627 100644
--- a/spec/ruby/library/rbconfig/rbconfig_spec.rb
+++ b/spec/ruby/library/rbconfig/rbconfig_spec.rb
@@ -9,6 +9,13 @@
     end
   end
 
+  it 'has MAJOR, MINOR, TEENY, and PATCHLEVEL matching RUBY_VERSION and RUBY_PATCHLEVEL' do
+    major, minor, teeny = RUBY_VERSION.split('.')
+    RbConfig::CONFIG.values_at("MAJOR", "MINOR", "TEENY", "PATCHLEVEL").should == [
+      major, minor, teeny, RUBY_PATCHLEVEL.to_s
+    ]
+  end
+
   # These directories have no meanings before the installation.
   guard -> { RbConfig::TOPDIR } do
     it "['rubylibdir'] returns the directory containing Ruby standard libraries" do
@@ -88,6 +95,30 @@
       end
     end
   end
+
+  guard -> { %w[aarch64 arm64].include? RbConfig::CONFIG['host_cpu'] } do
+    it "['host_cpu'] returns CPU architecture properly for AArch64" do
+      platform_is :darwin do
+        RbConfig::CONFIG['host_cpu'].should == 'arm64'
+      end
+
+      platform_is_not :darwin do
+        RbConfig::CONFIG['host_cpu'].should == 'aarch64'
+      end
+    end
+  end
+
+  guard -> { platform_is(:linux) || platform_is(:darwin) } do
+    it "['host_os'] returns a proper OS name or platform" do
+      platform_is :darwin do
+        RbConfig::CONFIG['host_os'].should.match?(/darwin/)
+      end
+
+      platform_is :linux do
+        RbConfig::CONFIG['host_os'].should.match?(/linux/)
+      end
+    end
+  end
 end
 
 describe "RbConfig::TOPDIR" do
@@ -99,3 +130,34 @@
     end
   end
 end
+
+describe "RUBY_PLATFORM" do
+  it "RUBY_PLATFORM contains a proper CPU architecture" do
+    RUBY_PLATFORM.should.include? RbConfig::CONFIG['host_cpu']
+  end
+
+  guard -> { platform_is(:linux) || platform_is(:darwin) } do
+    it "RUBY_PLATFORM contains OS name" do
+      # don't use RbConfig::CONFIG['host_os'] as far as it could be slightly different, e.g. linux-gnu
+      platform_is(:linux) do
+        RUBY_PLATFORM.should.include? 'linux'
+      end
+
+      platform_is(:darwin) do
+        RUBY_PLATFORM.should.include? 'darwin'
+      end
+    end
+  end
+end
+
+describe "RUBY_DESCRIPTION" do
+  guard_not -> { RUBY_ENGINE == "ruby" && !RbConfig::TOPDIR } do
+    it "contains version" do
+      RUBY_DESCRIPTION.should.include? RUBY_VERSION
+    end
+
+    it "contains RUBY_PLATFORM" do
+      RUBY_DESCRIPTION.should.include? RUBY_PLATFORM
+    end
+  end
+end
diff --git a/spec/ruby/library/rbconfig/unicode_emoji_version_spec.rb b/spec/ruby/library/rbconfig/unicode_emoji_version_spec.rb
index 3dc9900127c47f..2c6d1f4e93adc3 100644
--- a/spec/ruby/library/rbconfig/unicode_emoji_version_spec.rb
+++ b/spec/ruby/library/rbconfig/unicode_emoji_version_spec.rb
@@ -2,22 +2,16 @@
 require 'rbconfig'
 
 describe "RbConfig::CONFIG['UNICODE_EMOJI_VERSION']" do
-  ruby_version_is ""..."3.1" do
-    it "is 12.1" do
-      RbConfig::CONFIG['UNICODE_EMOJI_VERSION'].should == "12.1"
-    end
-  end
-
-  ruby_version_is "3.1"..."3.2" do
-    it "is 13.1" do
-      RbConfig::CONFIG['UNICODE_EMOJI_VERSION'].should == "13.1"
+  ruby_version_is ""..."3.4" do
+    it "is 15.0" do
+      RbConfig::CONFIG['UNICODE_EMOJI_VERSION'].should == "15.0"
     end
   end
 
   # Caution: ruby_version_is means is_or_later
-  ruby_version_is "3.2" do
-    it "is 15.0" do
-      RbConfig::CONFIG['UNICODE_EMOJI_VERSION'].should == "15.0"
+  ruby_version_is "3.5" do
+    it "is 16.0" do
+      RbConfig::CONFIG['UNICODE_EMOJI_VERSION'].should == "16.0"
     end
   end
 end
diff --git a/spec/ruby/library/rbconfig/unicode_version_spec.rb b/spec/ruby/library/rbconfig/unicode_version_spec.rb
index 458f13bf038f82..961bb989a50349 100644
--- a/spec/ruby/library/rbconfig/unicode_version_spec.rb
+++ b/spec/ruby/library/rbconfig/unicode_version_spec.rb
@@ -2,22 +2,16 @@
 require 'rbconfig'
 
 describe "RbConfig::CONFIG['UNICODE_VERSION']" do
-  ruby_version_is ""..."3.1" do
-    it "is 12.1.0" do
-      RbConfig::CONFIG['UNICODE_VERSION'].should == "12.1.0"
-    end
-  end
-
-  ruby_version_is "3.1"..."3.2" do
-    it "is 13.0.0" do
-      RbConfig::CONFIG['UNICODE_VERSION'].should == "13.0.0"
+  ruby_version_is ""..."3.4" do
+    it "is 15.0.0" do
+      RbConfig::CONFIG['UNICODE_VERSION'].should == "15.0.0"
     end
   end
 
   # Caution: ruby_version_is means is_or_later
-  ruby_version_is "3.2" do
-    it "is 15.0.0" do
-      RbConfig::CONFIG['UNICODE_VERSION'].should == "15.0.0"
+  ruby_version_is "3.5" do
+    it "is 16.0.0" do
+      RbConfig::CONFIG['UNICODE_VERSION'].should == "16.0.0"
     end
   end
 end
diff --git a/spec/ruby/library/rubygems/gem/bin_path_spec.rb b/spec/ruby/library/rubygems/gem/bin_path_spec.rb
index 67b3e042c23d71..0b8c4db08bb17c 100644
--- a/spec/ruby/library/rubygems/gem/bin_path_spec.rb
+++ b/spec/ruby/library/rubygems/gem/bin_path_spec.rb
@@ -22,6 +22,7 @@
       end
 
       skip "Could not find the default gemspecs" unless Dir.exist?(default_specifications_dir)
+      skip "default_specifications_dir mismatch with GEM_HOME" if ENV["GEM_HOME"] && !default_specifications_dir.start_with?(ENV['GEM_HOME'])
 
       Gem::Specification.each_spec([default_specifications_dir]) do |spec|
         spec.executables.each do |exe|
diff --git a/spec/ruby/library/securerandom/random_number_spec.rb b/spec/ruby/library/securerandom/random_number_spec.rb
index 03781f49019c1f..bb25bc496ed901 100644
--- a/spec/ruby/library/securerandom/random_number_spec.rb
+++ b/spec/ruby/library/securerandom/random_number_spec.rb
@@ -11,8 +11,8 @@
     (1..64).each do |idx|
       num = SecureRandom.random_number(idx)
       num.should be_kind_of(Integer)
-      (0 <= num).should == true
-      (num < idx).should == true
+      0.should <= num
+      num.should < idx
     end
   end
 
@@ -21,8 +21,8 @@
     11.times do
       num = SecureRandom.random_number max
       num.should be_kind_of(Integer)
-      (0 <= num).should == true
-      (num < max).should == true
+      0.should <= num
+      num.should < max
     end
   end
 
@@ -30,8 +30,8 @@
     64.times do
       num = SecureRandom.random_number
       num.should be_kind_of(Float)
-      (0.0 <= num).should == true
-      (num < 1.0).should == true
+      0.0.should <= num
+      num.should < 1.0
     end
   end
 
@@ -39,8 +39,8 @@
     64.times do
       num = SecureRandom.random_number 11...13
       num.should be_kind_of(Integer)
-      (11 <= num).should == true
-      (num < 13).should == true
+      11.should <= num
+      num.should < 13
     end
   end
 
@@ -50,8 +50,8 @@
     32.times do
       num = SecureRandom.random_number lower..upper
       num.should be_kind_of(Integer)
-      (lower <= num).should == true
-      (num <= upper).should == true
+      lower.should <= num
+      num.should <= upper
     end
   end
 
@@ -59,23 +59,23 @@
     64.times do
       num = SecureRandom.random_number 0.6..0.9
       num.should be_kind_of(Float)
-      (0.6 <= num).should == true
-      (num <= 0.9).should == true
+      0.6.should <= num
+      num.should <= 0.9
     end
   end
 
   it "generates a random float number between 0.0 and 1.0 if argument is negative" do
     num = SecureRandom.random_number(-10)
     num.should be_kind_of(Float)
-    (0.0 <= num).should == true
-    (num < 1.0).should == true
+    0.0.should <= num
+    num.should < 1.0
   end
 
   it "generates a random float number between 0.0 and 1.0 if argument is negative float" do
     num = SecureRandom.random_number(-11.1)
     num.should be_kind_of(Float)
-    (0.0 <= num).should == true
-    (num < 1.0).should == true
+    0.0.should <= num
+    num.should < 1.0
   end
 
   it "generates different float numbers with subsequent invocations" do
@@ -84,7 +84,7 @@
     256.times do
       val = SecureRandom.random_number
       # make sure the random values are not repeating
-      values.include?(val).should == false
+      values.should_not include(val)
       values << val
     end
   end
diff --git a/spec/ruby/library/set/add_spec.rb b/spec/ruby/library/set/add_spec.rb
deleted file mode 100644
index 68356cc111cc5e..00000000000000
--- a/spec/ruby/library/set/add_spec.rb
+++ /dev/null
@@ -1,27 +0,0 @@
-require_relative '../../spec_helper'
-require 'set'
-require_relative 'shared/add'
-
-describe "Set#add" do
-  it_behaves_like :set_add, :add
-end
-
-describe "Set#add?" do
-  before :each do
-    @set = Set.new
-  end
-
-  it "adds the passed Object to self" do
-    @set.add?("cat")
-    @set.should include("cat")
-  end
-
-  it "returns self when the Object has not yet been added to self" do
-    @set.add?("cat").should equal(@set)
-  end
-
-  it "returns nil when the Object has already been added to self" do
-    @set.add?("cat")
-    @set.add?("cat").should be_nil
-  end
-end
diff --git a/spec/ruby/library/set/append_spec.rb b/spec/ruby/library/set/append_spec.rb
deleted file mode 100644
index 8b3498b779db07..00000000000000
--- a/spec/ruby/library/set/append_spec.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-require_relative '../../spec_helper'
-require 'set'
-require_relative 'shared/add'
-
-describe "Set#<<" do
-  it_behaves_like :set_add, :<<
-end
diff --git a/spec/ruby/library/set/clear_spec.rb b/spec/ruby/library/set/clear_spec.rb
deleted file mode 100644
index 2b1c9c5b5ac048..00000000000000
--- a/spec/ruby/library/set/clear_spec.rb
+++ /dev/null
@@ -1,17 +0,0 @@
-require_relative '../../spec_helper'
-require 'set'
-
-describe "Set#clear" do
-  before :each do
-    @set = Set["one", "two", "three", "four"]
-  end
-
-  it "removes all elements from self" do
-    @set.clear
-    @set.should be_empty
-  end
-
-  it "returns self" do
-    @set.clear.should equal(@set)
-  end
-end
diff --git a/spec/ruby/library/set/delete_spec.rb b/spec/ruby/library/set/delete_spec.rb
deleted file mode 100644
index b12524384ab23a..00000000000000
--- a/spec/ruby/library/set/delete_spec.rb
+++ /dev/null
@@ -1,37 +0,0 @@
-require_relative '../../spec_helper'
-require 'set'
-
-describe "Set#delete" do
-  before :each do
-    @set = Set["a", "b", "c"]
-  end
-
-  it "deletes the passed Object from self" do
-    @set.delete("a")
-    @set.should_not include("a")
-  end
-
-  it "returns self" do
-    @set.delete("a").should equal(@set)
-    @set.delete("x").should equal(@set)
-  end
-end
-
-describe "Set#delete?" do
-  before :each do
-    @set = Set["a", "b", "c"]
-  end
-
-  it "deletes the passed Object from self" do
-    @set.delete?("a")
-    @set.should_not include("a")
-  end
-
-  it "returns self when the passed Object is in self" do
-    @set.delete?("a").should equal(@set)
-  end
-
-  it "returns nil when the passed Object is not in self" do
-    @set.delete?("x").should be_nil
-  end
-end
diff --git a/spec/ruby/library/set/each_spec.rb b/spec/ruby/library/set/each_spec.rb
deleted file mode 100644
index 44e185a4da9003..00000000000000
--- a/spec/ruby/library/set/each_spec.rb
+++ /dev/null
@@ -1,27 +0,0 @@
-require_relative '../../spec_helper'
-require 'set'
-
-describe "Set#each" do
-  before :each do
-    @set = Set[1, 2, 3]
-  end
-
-  it "yields each Object in self" do
-    ret = []
-    @set.each { |x| ret << x }
-    ret.sort.should == [1, 2, 3]
-  end
-
-  it "returns self" do
-    @set.each { |x| x }.should equal(@set)
-  end
-
-  it "returns an Enumerator when not passed a block" do
-    enum = @set.each
-    enum.should be_an_instance_of(Enumerator)
-
-    ret = []
-    enum.each { |x| ret << x }
-    ret.sort.should == [1, 2, 3]
-  end
-end
diff --git a/spec/ruby/library/set/enumerable/to_set_spec.rb b/spec/ruby/library/set/enumerable/to_set_spec.rb
deleted file mode 100644
index b2d850515b665a..00000000000000
--- a/spec/ruby/library/set/enumerable/to_set_spec.rb
+++ /dev/null
@@ -1,13 +0,0 @@
-require_relative '../../../spec_helper'
-require 'set'
-
-describe "Enumerable#to_set" do
-  it "returns a new Set created from self" do
-    [1, 2, 3].to_set.should == Set[1, 2, 3]
-    {a: 1, b: 2}.to_set.should == Set[[:b, 2], [:a, 1]]
-  end
-
-  it "passes down passed blocks" do
-    [1, 2, 3].to_set { |x| x * x }.should == Set[1, 4, 9]
-  end
-end
diff --git a/spec/ruby/library/set/eql_spec.rb b/spec/ruby/library/set/eql_spec.rb
deleted file mode 100644
index dd8e633775a830..00000000000000
--- a/spec/ruby/library/set/eql_spec.rb
+++ /dev/null
@@ -1,15 +0,0 @@
-require_relative '../../spec_helper'
-require 'set'
-
-describe "Set#eql?" do
-  it "returns true when the passed argument is a Set and contains the same elements" do
-    Set[].should eql(Set[])
-    Set[1, 2, 3].should eql(Set[1, 2, 3])
-    Set[1, 2, 3].should eql(Set[3, 2, 1])
-    Set["a", :b, ?c].should eql(Set[?c, :b, "a"])
-
-    Set[1, 2, 3].should_not eql(Set[1.0, 2, 3])
-    Set[1, 2, 3].should_not eql(Set[2, 3])
-    Set[1, 2, 3].should_not eql(Set[])
-  end
-end
diff --git a/spec/ruby/library/set/equal_value_spec.rb b/spec/ruby/library/set/equal_value_spec.rb
deleted file mode 100644
index f5b5f790c0543b..00000000000000
--- a/spec/ruby/library/set/equal_value_spec.rb
+++ /dev/null
@@ -1,33 +0,0 @@
-require_relative '../../spec_helper'
-require_relative 'fixtures/set_like'
-require 'set'
-
-describe "Set#==" do
-  it "returns true when the passed Object is a Set and self and the Object contain the same elements" do
-    Set[].should == Set[]
-    Set[1, 2, 3].should == Set[1, 2, 3]
-    Set["1", "2", "3"].should == Set["1", "2", "3"]
-
-    Set[1, 2, 3].should_not == Set[1.0, 2, 3]
-    Set[1, 2, 3].should_not == [1, 2, 3]
-  end
-
-  it "does not depend on the order of the elements" do
-    Set[1, 2, 3].should == Set[3, 2, 1]
-    Set[:a, "b", ?c].should == Set[?c, "b", :a]
-  end
-
-  it "does not depend on the order of nested Sets" do
-    Set[Set[1], Set[2], Set[3]].should == Set[Set[3], Set[2], Set[1]]
-
-    set1 = Set[Set["a", "b"], Set["c", "d"], Set["e", "f"]]
-    set2 = Set[Set["c", "d"], Set["a", "b"], Set["e", "f"]]
-    set1.should == set2
-  end
-
-  context "when comparing to a Set-like object" do
-    it "returns true when a Set and a Set-like object contain the same elements" do
-      Set[1, 2, 3].should == SetSpecs::SetLike.new([1, 2, 3])
-    end
-  end
-end
diff --git a/spec/ruby/library/set/flatten_merge_spec.rb b/spec/ruby/library/set/flatten_merge_spec.rb
deleted file mode 100644
index f2c99a94813528..00000000000000
--- a/spec/ruby/library/set/flatten_merge_spec.rb
+++ /dev/null
@@ -1,23 +0,0 @@
-require_relative '../../spec_helper'
-require 'set'
-
-describe "Set#flatten_merge" do
-  it "is protected" do
-    Set.should have_protected_instance_method("flatten_merge")
-  end
-
-  it "flattens the passed Set and merges it into self" do
-    set1 = Set[1, 2]
-    set2 = Set[3, 4, Set[5, 6]]
-
-    set1.send(:flatten_merge, set2).should == Set[1, 2, 3, 4, 5, 6]
-  end
-
-  it "raises an ArgumentError when trying to flatten a recursive Set" do
-    set1 = Set[1, 2, 3]
-    set2 = Set[5, 6, 7]
-    set2 << set2
-
-    -> { set1.send(:flatten_merge, set2) }.should raise_error(ArgumentError)
-  end
-end
diff --git a/spec/ruby/library/set/flatten_spec.rb b/spec/ruby/library/set/flatten_spec.rb
deleted file mode 100644
index 4ac83ea82572be..00000000000000
--- a/spec/ruby/library/set/flatten_spec.rb
+++ /dev/null
@@ -1,53 +0,0 @@
-require_relative '../../spec_helper'
-require_relative 'fixtures/set_like'
-require 'set'
-
-describe "Set#flatten" do
-  it "returns a copy of self with each included Set flattened" do
-    set = Set[1, 2, Set[3, 4, Set[5, 6, Set[7, 8]]], 9, 10]
-    flattened_set = set.flatten
-
-    flattened_set.should_not equal(set)
-    flattened_set.should == Set[1, 2, 3, 4, 5, 6, 7, 8, 9, 10]
-  end
-
-  it "raises an ArgumentError when self is recursive" do
-    (set = Set[]) << set
-    -> { set.flatten }.should raise_error(ArgumentError)
-  end
-
-  context "when Set contains a Set-like object" do
-    it "returns a copy of self with each included Set-like object flattened" do
-      Set[SetSpecs::SetLike.new([1])].flatten.should == Set[1]
-    end
-  end
-end
-
-describe "Set#flatten!" do
-  it "flattens self" do
-    set = Set[1, 2, Set[3, 4, Set[5, 6, Set[7, 8]]], 9, 10]
-    set.flatten!
-    set.should == Set[1, 2, 3, 4, 5, 6, 7, 8, 9, 10]
-  end
-
-  it "returns self when self was modified" do
-    set = Set[1, 2, Set[3, 4]]
-    set.flatten!.should equal(set)
-  end
-
-  it "returns nil when self was not modified" do
-    set = Set[1, 2, 3, 4]
-    set.flatten!.should be_nil
-  end
-
-  it "raises an ArgumentError when self is recursive" do
-    (set = Set[]) << set
-    -> { set.flatten! }.should raise_error(ArgumentError)
-  end
-
-  context "when Set contains a Set-like object" do
-    it "flattens self, including Set-like objects" do
-      Set[SetSpecs::SetLike.new([1])].flatten!.should == Set[1]
-    end
-  end
-end
diff --git a/spec/ruby/library/set/hash_spec.rb b/spec/ruby/library/set/hash_spec.rb
deleted file mode 100644
index 47c43c05f16afb..00000000000000
--- a/spec/ruby/library/set/hash_spec.rb
+++ /dev/null
@@ -1,13 +0,0 @@
-require_relative '../../spec_helper'
-require 'set'
-
-describe "Set#hash" do
-  it "is static" do
-    Set[].hash.should == Set[].hash
-    Set[1, 2, 3].hash.should == Set[1, 2, 3].hash
-    Set[:a, "b", ?c].hash.should == Set[?c, "b", :a].hash
-
-    Set[].hash.should_not == Set[1, 2, 3].hash
-    Set[1, 2, 3].hash.should_not == Set[:a, "b", ?c].hash
-  end
-end
diff --git a/spec/ruby/library/set/initialize_spec.rb b/spec/ruby/library/set/initialize_spec.rb
deleted file mode 100644
index 76ebc0a20aa25c..00000000000000
--- a/spec/ruby/library/set/initialize_spec.rb
+++ /dev/null
@@ -1,73 +0,0 @@
-require_relative '../../spec_helper'
-require 'set'
-
-describe "Set#initialize" do
-  it "is private" do
-    Set.should have_private_instance_method(:initialize)
-  end
-
-  it "adds all elements of the passed Enumerable to self" do
-    s = Set.new([1, 2, 3])
-    s.size.should eql(3)
-    s.should include(1)
-    s.should include(2)
-    s.should include(3)
-  end
-
-  it "uses #each_entry on the provided Enumerable" do
-    enumerable = MockObject.new('mock-enumerable')
-    enumerable.should_receive(:each_entry).and_yield(1).and_yield(2).and_yield(3)
-    s = Set.new(enumerable)
-    s.size.should eql(3)
-    s.should include(1)
-    s.should include(2)
-    s.should include(3)
-  end
-
-  it "uses #each on the provided Enumerable if it does not respond to #each_entry" do
-    enumerable = MockObject.new('mock-enumerable')
-    enumerable.should_receive(:each).and_yield(1).and_yield(2).and_yield(3)
-    s = Set.new(enumerable)
-    s.size.should eql(3)
-    s.should include(1)
-    s.should include(2)
-    s.should include(3)
-  end
-
-  it "raises if the provided Enumerable does not respond to #each_entry or #each" do
-    enumerable = MockObject.new('mock-enumerable')
-    -> { Set.new(enumerable) }.should raise_error(ArgumentError, "value must be enumerable")
-  end
-
-  it "should initialize with empty array and set" do
-    s = Set.new([])
-    s.size.should eql(0)
-
-    s = Set.new({})
-    s.size.should eql(0)
-  end
-
-  it "preprocesses all elements by a passed block before adding to self" do
-    s = Set.new([1, 2, 3]) { |x| x * x }
-    s.size.should eql(3)
-    s.should include(1)
-    s.should include(4)
-    s.should include(9)
-  end
-
-  it "should initialize with empty array and block" do
-    s = Set.new([]) { |x| x * x }
-    s.size.should eql(0)
-  end
-
-  it "should initialize with empty set and block" do
-    s = Set.new(Set.new) { |x| x * x }
-    s.size.should eql(0)
-  end
-
-  it "should initialize with just block" do
-    s = Set.new { |x| x * x }
-    s.size.should eql(0)
-    s.should eql(Set.new)
-  end
-end
diff --git a/spec/ruby/library/set/inspect_spec.rb b/spec/ruby/library/set/inspect_spec.rb
deleted file mode 100644
index 4060c63b954e99..00000000000000
--- a/spec/ruby/library/set/inspect_spec.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-require_relative '../../spec_helper'
-require_relative 'shared/inspect'
-require 'set'
-
-describe "Set#inspect" do
-  it_behaves_like :set_inspect, :inspect
-end
diff --git a/spec/ruby/library/set/join_spec.rb b/spec/ruby/library/set/join_spec.rb
deleted file mode 100644
index 3f511a84e4118e..00000000000000
--- a/spec/ruby/library/set/join_spec.rb
+++ /dev/null
@@ -1,29 +0,0 @@
-require_relative '../../spec_helper'
-require 'set'
-
-describe "Set#join" do
-  it "returns an empty string if the Set is empty" do
-    Set[].join.should == ''
-  end
-
-  it "returns a new string formed by joining elements after conversion" do
-    set = Set[:a, :b, :c]
-    set.join.should == "abc"
-  end
-
-  it "does not separate elements when the passed separator is nil" do
-    set = Set[:a, :b, :c]
-    set.join(nil).should == "abc"
-  end
-
-  it "returns a string formed by concatenating each element separated by the separator" do
-    set = Set[:a, :b, :c]
-    set.join(' | ').should == "a | b | c"
-  end
-
-  it "calls #to_a to convert the Set in to an Array" do
-    set = Set[:a, :b, :c]
-    set.should_receive(:to_a).and_return([:a, :b, :c])
-    set.join.should == "abc"
-  end
-end
diff --git a/spec/ruby/library/set/length_spec.rb b/spec/ruby/library/set/length_spec.rb
deleted file mode 100644
index fef63d25a7f4cf..00000000000000
--- a/spec/ruby/library/set/length_spec.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-require_relative '../../spec_helper'
-require_relative 'shared/length'
-require 'set'
-
-describe "Set#length" do
-  it_behaves_like :set_length, :length
-end
diff --git a/spec/ruby/library/set/merge_spec.rb b/spec/ruby/library/set/merge_spec.rb
deleted file mode 100644
index a8e3ffc8709045..00000000000000
--- a/spec/ruby/library/set/merge_spec.rb
+++ /dev/null
@@ -1,19 +0,0 @@
-require_relative '../../spec_helper'
-require 'set'
-
-describe "Set#merge" do
-  it "adds the elements of the passed Enumerable to self" do
-    Set[:a, :b].merge(Set[:b, :c, :d]).should == Set[:a, :b, :c, :d]
-    Set[1, 2].merge([3, 4]).should == Set[1, 2, 3, 4]
-  end
-
-  it "returns self" do
-    set = Set[1, 2]
-    set.merge([3, 4]).should equal(set)
-  end
-
-  it "raises an ArgumentError when passed a non-Enumerable" do
-    -> { Set[1, 2].merge(1) }.should raise_error(ArgumentError)
-    -> { Set[1, 2].merge(Object.new) }.should raise_error(ArgumentError)
-  end
-end
diff --git a/spec/ruby/library/set/pretty_print_spec.rb b/spec/ruby/library/set/pretty_print_spec.rb
deleted file mode 100644
index ea9ead0df86ad8..00000000000000
--- a/spec/ruby/library/set/pretty_print_spec.rb
+++ /dev/null
@@ -1,19 +0,0 @@
-require_relative '../../spec_helper'
-require 'set'
-
-ruby_version_is ""..."3.1" do
-  describe "Set#pretty_print" do
-    it "passes the 'pretty print' representation of self to the pretty print writer" do
-      pp = mock("PrettyPrint")
-      set = Set[1, 2, 3]
-
-      pp.should_receive(:text).with("#<Set: {")
-      pp.should_receive(:text).with("}>")
-
-      pp.should_receive(:nest).with(1).and_yield
-      pp.should_receive(:seplist).with(set)
-
-      set.pretty_print(pp)
-    end
-  end
-end
diff --git a/spec/ruby/library/set/proper_subset_spec.rb b/spec/ruby/library/set/proper_subset_spec.rb
deleted file mode 100644
index 1f496a6199ff88..00000000000000
--- a/spec/ruby/library/set/proper_subset_spec.rb
+++ /dev/null
@@ -1,41 +0,0 @@
-require_relative '../../spec_helper'
-require_relative 'fixtures/set_like'
-require 'set'
-
-describe "Set#proper_subset?" do
-  before :each do
-    @set = Set[1, 2, 3, 4]
-  end
-
-  it "returns true if passed a Set that self is a proper subset of" do
-    Set[].proper_subset?(@set).should be_true
-    Set[].proper_subset?(Set[1, 2, 3]).should be_true
-    Set[].proper_subset?(Set["a", :b, ?c]).should be_true
-
-    Set[1, 2, 3].proper_subset?(@set).should be_true
-    Set[1, 3].proper_subset?(@set).should be_true
-    Set[1, 2].proper_subset?(@set).should be_true
-    Set[1].proper_subset?(@set).should be_true
-
-    Set[5].proper_subset?(@set).should be_false
-    Set[1, 5].proper_subset?(@set).should be_false
-    Set[nil].proper_subset?(@set).should be_false
-    Set["test"].proper_subset?(@set).should be_false
-
-    @set.proper_subset?(@set).should be_false
-    Set[].proper_subset?(Set[]).should be_false
-  end
-
-  it "raises an ArgumentError when passed a non-Set" do
-    -> { Set[].proper_subset?([]) }.should raise_error(ArgumentError)
-    -> { Set[].proper_subset?(1) }.should raise_error(ArgumentError)
-    -> { Set[].proper_subset?("test") }.should raise_error(ArgumentError)
-    -> { Set[].proper_subset?(Object.new) }.should raise_error(ArgumentError)
-  end
-
-  context "when comparing to a Set-like object" do
-    it "returns true if passed a Set-like object that self is a proper subset of" do
-      Set[1, 2, 3].proper_subset?(SetSpecs::SetLike.new([1, 2, 3, 4])).should be_true
-    end
-  end
-end
diff --git a/spec/ruby/library/set/replace_spec.rb b/spec/ruby/library/set/replace_spec.rb
deleted file mode 100644
index 7511066c9cdde3..00000000000000
--- a/spec/ruby/library/set/replace_spec.rb
+++ /dev/null
@@ -1,17 +0,0 @@
-require_relative '../../spec_helper'
-require 'set'
-
-describe "Set#replace" do
-  before :each do
-    @set = Set[:a, :b, :c]
-  end
-
-  it "replaces the contents with other and returns self" do
-    @set.replace(Set[1, 2, 3]).should == @set
-    @set.should == Set[1, 2, 3]
-  end
-
-  it "accepts any enumerable as other" do
-    @set.replace([1, 2, 3]).should == Set[1, 2, 3]
-  end
-end
diff --git a/spec/ruby/library/set/shared/inspect.rb b/spec/ruby/library/set/shared/inspect.rb
deleted file mode 100644
index adb6ddb4c9f2c1..00000000000000
--- a/spec/ruby/library/set/shared/inspect.rb
+++ /dev/null
@@ -1,25 +0,0 @@
-describe :set_inspect, shared: true do
-  it "returns a String representation of self" do
-    Set[].send(@method).should be_kind_of(String)
-    Set[nil, false, true].send(@method).should be_kind_of(String)
-    Set[1, 2, 3].send(@method).should be_kind_of(String)
-    Set["1", "2", "3"].send(@method).should be_kind_of(String)
-    Set[:a, "b", Set[?c]].send(@method).should be_kind_of(String)
-  end
-
-  it "does include the elements of the set" do
-    Set["1"].send(@method).should == '#<Set: {"1"}>'
-  end
-
-  it "puts spaces between the elements" do
-    Set["1", "2"].send(@method).should include('", "')
-  end
-
-  it "correctly handles cyclic-references" do
-    set1 = Set[]
-    set2 = Set[set1]
-    set1 << set2
-    set1.send(@method).should be_kind_of(String)
-    set1.send(@method).should include("#<Set: {...}>")
-  end
-end
diff --git a/spec/ruby/library/set/size_spec.rb b/spec/ruby/library/set/size_spec.rb
deleted file mode 100644
index 3c8cb385174877..00000000000000
--- a/spec/ruby/library/set/size_spec.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-require_relative '../../spec_helper'
-require_relative 'shared/length'
-require 'set'
-
-describe "Set#size" do
-  it_behaves_like :set_length, :size
-end
diff --git a/spec/ruby/library/set/sortedset/sortedset_spec.rb b/spec/ruby/library/set/sortedset/sortedset_spec.rb
deleted file mode 100644
index 67993dee2956f7..00000000000000
--- a/spec/ruby/library/set/sortedset/sortedset_spec.rb
+++ /dev/null
@@ -1,12 +0,0 @@
-require_relative '../../../spec_helper'
-require 'set'
-
-describe "SortedSet" do
-  it "raises error including message that it has been extracted from the set stdlib" do
-    -> {
-      SortedSet
-    }.should raise_error(RuntimeError) { |e|
-      e.message.should.include?("The `SortedSet` class has been extracted from the `set` library")
-    }
-  end
-end
diff --git a/spec/ruby/library/set/subset_spec.rb b/spec/ruby/library/set/subset_spec.rb
deleted file mode 100644
index f375efa6dfa685..00000000000000
--- a/spec/ruby/library/set/subset_spec.rb
+++ /dev/null
@@ -1,41 +0,0 @@
-require_relative '../../spec_helper'
-require_relative 'fixtures/set_like'
-require 'set'
-
-describe "Set#subset?" do
-  before :each do
-    @set = Set[1, 2, 3, 4]
-  end
-
-  it "returns true if passed a Set that is equal to self or self is a subset of" do
-    @set.subset?(@set).should be_true
-    Set[].subset?(Set[]).should be_true
-
-    Set[].subset?(@set).should be_true
-    Set[].subset?(Set[1, 2, 3]).should be_true
-    Set[].subset?(Set["a", :b, ?c]).should be_true
-
-    Set[1, 2, 3].subset?(@set).should be_true
-    Set[1, 3].subset?(@set).should be_true
-    Set[1, 2].subset?(@set).should be_true
-    Set[1].subset?(@set).should be_true
-
-    Set[5].subset?(@set).should be_false
-    Set[1, 5].subset?(@set).should be_false
-    Set[nil].subset?(@set).should be_false
-    Set["test"].subset?(@set).should be_false
-  end
-
-  it "raises an ArgumentError when passed a non-Set" do
-    -> { Set[].subset?([]) }.should raise_error(ArgumentError)
-    -> { Set[].subset?(1) }.should raise_error(ArgumentError)
-    -> { Set[].subset?("test") }.should raise_error(ArgumentError)
-    -> { Set[].subset?(Object.new) }.should raise_error(ArgumentError)
-  end
-
-  context "when comparing to a Set-like object" do
-    it "returns true if passed a Set-like object that self is a subset of" do
-      Set[1, 2, 3].subset?(SetSpecs::SetLike.new([1, 2, 3, 4])).should be_true
-    end
-  end
-end
diff --git a/spec/ruby/library/set/to_s_spec.rb b/spec/ruby/library/set/to_s_spec.rb
deleted file mode 100644
index 3c26ae9346a7b5..00000000000000
--- a/spec/ruby/library/set/to_s_spec.rb
+++ /dev/null
@@ -1,12 +0,0 @@
-require_relative "../../spec_helper"
-require_relative 'shared/inspect'
-require 'set'
-
-describe "Set#to_s" do
-  it_behaves_like :set_inspect, :to_s
-
-  it "is an alias of inspect" do
-    set = Set.new
-    set.method(:to_s).should == set.method(:inspect)
-  end
-end
diff --git a/spec/ruby/library/shellwords/shellwords_spec.rb b/spec/ruby/library/shellwords/shellwords_spec.rb
index 2975fd99742740..fe86b6faab0db8 100644
--- a/spec/ruby/library/shellwords/shellwords_spec.rb
+++ b/spec/ruby/library/shellwords/shellwords_spec.rb
@@ -1,34 +1,33 @@
 require_relative '../../spec_helper'
 require 'shellwords'
-include Shellwords
 
 describe "Shellwords#shellwords" do
   it "honors quoted strings" do
-    shellwords('a "b b" a').should == ['a', 'b b', 'a']
+    Shellwords.shellwords('a "b b" a').should == ['a', 'b b', 'a']
   end
 
   it "honors escaped double quotes" do
-    shellwords('a "\"b\" c" d').should == ['a', '"b" c', 'd']
+    Shellwords.shellwords('a "\"b\" c" d').should == ['a', '"b" c', 'd']
   end
 
   it "honors escaped single quotes" do
-    shellwords("a \"'b' c\" d").should == ['a', "'b' c", 'd']
+    Shellwords.shellwords("a \"'b' c\" d").should == ['a', "'b' c", 'd']
   end
 
   it "honors escaped spaces" do
-    shellwords('a b\ c d').should == ['a', 'b c', 'd']
+    Shellwords.shellwords('a b\ c d').should == ['a', 'b c', 'd']
   end
 
   it "raises ArgumentError when double quoted strings are misquoted" do
-    -> { shellwords('a "b c d e') }.should raise_error(ArgumentError)
+    -> { Shellwords.shellwords('a "b c d e') }.should raise_error(ArgumentError)
   end
 
   it "raises ArgumentError when single quoted strings are misquoted" do
-    -> { shellwords("a 'b c d e") }.should raise_error(ArgumentError)
+    -> { Shellwords.shellwords("a 'b c d e") }.should raise_error(ArgumentError)
   end
 
   # https://bugs.ruby-lang.org/issues/10055
   it "matches POSIX sh behavior for backslashes within double quoted strings" do
-    shellsplit('printf "%s\n"').should == ['printf', '%s\n']
+    Shellwords.shellsplit('printf "%s\n"').should == ['printf', '%s\n']
   end
 end
diff --git a/spec/ruby/library/socket/addrinfo/getaddrinfo_spec.rb b/spec/ruby/library/socket/addrinfo/getaddrinfo_spec.rb
index 67fad73815e572..e05fe9967ad5f4 100644
--- a/spec/ruby/library/socket/addrinfo/getaddrinfo_spec.rb
+++ b/spec/ruby/library/socket/addrinfo/getaddrinfo_spec.rb
@@ -73,19 +73,15 @@
     end
   end
 
-  platform_is_not :'solaris2.10' do # i386-solaris
-    it 'sets a custom socket protocol of the Addrinfo instances' do
-      array = Addrinfo.getaddrinfo('127.0.0.1', 80, nil, nil, Socket::IPPROTO_UDP)
+  it 'sets a custom socket protocol of the Addrinfo instances' do
+    array = Addrinfo.getaddrinfo('127.0.0.1', 80, nil, nil, Socket::IPPROTO_UDP)
 
-      array[0].protocol.should == Socket::IPPROTO_UDP
-    end
+    array[0].protocol.should == Socket::IPPROTO_UDP
   end
 
-  platform_is_not :solaris do
-    it 'sets the canonical name when AI_CANONNAME is given as a flag' do
-      array = Addrinfo.getaddrinfo('localhost', 80, nil, nil, nil, Socket::AI_CANONNAME)
+  it 'sets the canonical name when AI_CANONNAME is given as a flag' do
+    array = Addrinfo.getaddrinfo('localhost', 80, nil, nil, nil, Socket::AI_CANONNAME)
 
-      array[0].canonname.should be_an_instance_of(String)
-    end
+    array[0].canonname.should be_an_instance_of(String)
   end
 end
diff --git a/spec/ruby/library/socket/addrinfo/initialize_spec.rb b/spec/ruby/library/socket/addrinfo/initialize_spec.rb
index 83b204b5757444..b7477efc7959f7 100644
--- a/spec/ruby/library/socket/addrinfo/initialize_spec.rb
+++ b/spec/ruby/library/socket/addrinfo/initialize_spec.rb
@@ -335,7 +335,7 @@
         @sockaddr = ['AF_INET6', 80, 'hostname', '127.0.0.1']
       end
 
-      it "raises SocketError when using any Socket constant except except AF_INET(6)/PF_INET(6)" do
+      it "raises SocketError when using any Socket constant except AF_INET(6)/PF_INET(6)" do
         Socket.constants.grep(/(^AF_|^PF_)(?!INET)/).each do |constant|
           value = Socket.const_get(constant)
           -> {
@@ -362,7 +362,7 @@
           end
         end
 
-        platform_is_not :windows, :aix, :solaris do
+        platform_is_not :windows, :aix do
           (Socket.constants.grep(/^IPPROTO/) - valid).each do |type|
             it "raises SocketError when using #{type}" do
               value = Socket.const_get(type)
@@ -390,7 +390,7 @@
           end
         end
 
-        platform_is_not :windows, :aix, :solaris do
+        platform_is_not :windows, :aix do
           (Socket.constants.grep(/^IPPROTO/) - valid).each do |type|
             it "raises SocketError when using #{type}" do
               value = Socket.const_get(type)
@@ -495,7 +495,7 @@
           end
         end
 
-        platform_is_not :windows, :aix, :solaris do
+        platform_is_not :windows, :aix do
           (Socket.constants.grep(/^IPPROTO/) - valid).each do |type|
             it "raises SocketError when using #{type}" do
               value = Socket.const_get(type)
diff --git a/spec/ruby/library/socket/addrinfo/marshal_dump_spec.rb b/spec/ruby/library/socket/addrinfo/marshal_dump_spec.rb
index c4220a6f3e6957..2d69a33b53b73f 100644
--- a/spec/ruby/library/socket/addrinfo/marshal_dump_spec.rb
+++ b/spec/ruby/library/socket/addrinfo/marshal_dump_spec.rb
@@ -32,10 +32,8 @@
         @array[3].should == 'SOCK_STREAM'
       end
 
-      platform_is_not :'solaris2.10' do # i386-solaris
-        it 'includes the protocol as the 5th value' do
-          @array[4].should == 'IPPROTO_TCP'
-        end
+      it 'includes the protocol as the 5th value' do
+        @array[4].should == 'IPPROTO_TCP'
       end
 
       it 'includes the canonical name as the 6th value' do
diff --git a/spec/ruby/library/socket/addrinfo/udp_spec.rb b/spec/ruby/library/socket/addrinfo/udp_spec.rb
index b05cbf9b0bc693..ac02e76ef58f28 100644
--- a/spec/ruby/library/socket/addrinfo/udp_spec.rb
+++ b/spec/ruby/library/socket/addrinfo/udp_spec.rb
@@ -27,10 +27,8 @@
       Addrinfo.udp(ip_address, 80).socktype.should == Socket::SOCK_DGRAM
     end
 
-    platform_is_not :solaris do
-      it 'sets the socket protocol' do
-        Addrinfo.udp(ip_address, 80).protocol.should == Socket::IPPROTO_UDP
-      end
+    it 'sets the socket protocol' do
+      Addrinfo.udp(ip_address, 80).protocol.should == Socket::IPPROTO_UDP
     end
   end
 end
diff --git a/spec/ruby/library/socket/ancillarydata/initialize_spec.rb b/spec/ruby/library/socket/ancillarydata/initialize_spec.rb
index 344d1485c5c3ee..eca45599d777a8 100644
--- a/spec/ruby/library/socket/ancillarydata/initialize_spec.rb
+++ b/spec/ruby/library/socket/ancillarydata/initialize_spec.rb
@@ -106,7 +106,7 @@
         Socket::AncillaryData.new(:INET, :SOCKET, :RIGHTS, '').type.should == Socket::SCM_RIGHTS
       end
 
-      platform_is_not :"solaris2.10", :aix do
+      platform_is_not :aix do
         it 'sets the type to SCM_TIMESTAMP when using :TIMESTAMP as the type argument' do
           Socket::AncillaryData.new(:INET, :SOCKET, :TIMESTAMP, '').type.should == Socket::SCM_TIMESTAMP
         end
diff --git a/spec/ruby/library/socket/ancillarydata/unix_rights_spec.rb b/spec/ruby/library/socket/ancillarydata/unix_rights_spec.rb
index 65ffcb01af3763..95052fd91c2d32 100644
--- a/spec/ruby/library/socket/ancillarydata/unix_rights_spec.rb
+++ b/spec/ruby/library/socket/ancillarydata/unix_rights_spec.rb
@@ -50,7 +50,7 @@
       -> { data.unix_rights }.should raise_error(TypeError)
     end
 
-    platform_is_not :"solaris2.10", :aix do
+    platform_is_not :aix do
       it 'raises TypeError when the type is not SCM_RIGHTS' do
         data = Socket::AncillaryData.new(:INET, :SOCKET, :TIMESTAMP, '')
 
diff --git a/spec/ruby/library/socket/basicsocket/read_nonblock_spec.rb b/spec/ruby/library/socket/basicsocket/read_nonblock_spec.rb
index df44a50afa9b77..ea5e65da5c93f7 100644
--- a/spec/ruby/library/socket/basicsocket/read_nonblock_spec.rb
+++ b/spec/ruby/library/socket/basicsocket/read_nonblock_spec.rb
@@ -18,7 +18,37 @@
 
     it "receives data after it's ready" do
       IO.select([@r], nil, nil, 2)
-      @r.recv_nonblock(5).should == "aaa"
+      @r.read_nonblock(5).should == "aaa"
+    end
+
+    platform_is_not :windows do
+      it 'returned data is binary encoded regardless of the external encoding' do
+        IO.select([@r], nil, nil, 2)
+        @r.read_nonblock(1).encoding.should == Encoding::BINARY
+
+        @w.send("bbb", 0, @r.getsockname)
+        @r.set_encoding(Encoding::ISO_8859_1)
+        IO.select([@r], nil, nil, 2)
+        buffer = @r.read_nonblock(3)
+        buffer.should == "bbb"
+        buffer.encoding.should == Encoding::BINARY
+      end
+    end
+
+    it 'replaces the content of the provided buffer without changing its encoding' do
+      buffer = "initial data".dup.force_encoding(Encoding::UTF_8)
+
+      IO.select([@r], nil, nil, 2)
+      @r.read_nonblock(3, buffer)
+      buffer.should == "aaa"
+      buffer.encoding.should == Encoding::UTF_8
+
+      @w.send("bbb", 0, @r.getsockname)
+      @r.set_encoding(Encoding::ISO_8859_1)
+      IO.select([@r], nil, nil, 2)
+      @r.read_nonblock(3, buffer)
+      buffer.should == "bbb"
+      buffer.encoding.should == Encoding::UTF_8
     end
 
     platform_is :linux do
diff --git a/spec/ruby/library/socket/basicsocket/read_spec.rb b/spec/ruby/library/socket/basicsocket/read_spec.rb
new file mode 100644
index 00000000000000..ba9de7d5cf81ba
--- /dev/null
+++ b/spec/ruby/library/socket/basicsocket/read_spec.rb
@@ -0,0 +1,47 @@
+require_relative '../spec_helper'
+require_relative '../fixtures/classes'
+
+describe "BasicSocket#read" do
+  SocketSpecs.each_ip_protocol do |family, ip_address|
+    before :each do
+      @r = Socket.new(family, :DGRAM)
+      @w = Socket.new(family, :DGRAM)
+
+      @r.bind(Socket.pack_sockaddr_in(0, ip_address))
+      @w.send("aaa", 0, @r.getsockname)
+    end
+
+    after :each do
+      @r.close unless @r.closed?
+      @w.close unless @w.closed?
+    end
+
+    it "receives data after it's ready" do
+      @r.read(3).should == "aaa"
+    end
+
+    it 'returned data is binary encoded regardless of the external encoding' do
+      @r.read(3).encoding.should == Encoding::BINARY
+
+      @w.send("bbb", 0, @r.getsockname)
+      @r.set_encoding(Encoding::UTF_8)
+      buffer = @r.read(3)
+      buffer.should == "bbb"
+      buffer.encoding.should == Encoding::BINARY
+    end
+
+    it 'replaces the content of the provided buffer without changing its encoding' do
+      buffer = "initial data".dup.force_encoding(Encoding::UTF_8)
+
+      @r.read(3, buffer)
+      buffer.should == "aaa"
+      buffer.encoding.should == Encoding::UTF_8
+
+      @w.send("bbb", 0, @r.getsockname)
+      @r.set_encoding(Encoding::ISO_8859_1)
+      @r.read(3, buffer)
+      buffer.should == "bbb"
+      buffer.encoding.should == Encoding::UTF_8
+    end
+  end
+end
diff --git a/spec/ruby/library/socket/basicsocket/recv_nonblock_spec.rb b/spec/ruby/library/socket/basicsocket/recv_nonblock_spec.rb
index b6ab8a9cea6c2c..f2a6682f12b8ea 100644
--- a/spec/ruby/library/socket/basicsocket/recv_nonblock_spec.rb
+++ b/spec/ruby/library/socket/basicsocket/recv_nonblock_spec.rb
@@ -52,9 +52,19 @@
       @s2.send("data", 0, @s1.getsockname)
       IO.select([@s1], nil, nil, 2)
 
-      buf = "foo"
-      @s1.recv_nonblock(5, 0, buf)
-      buf.should == "data"
+      buffer = +"foo"
+      @s1.recv_nonblock(5, 0, buffer).should.equal?(buffer)
+      buffer.should == "data"
+    end
+
+    it "preserves the encoding of the given buffer" do
+      @s1.bind(Socket.pack_sockaddr_in(0, ip_address))
+      @s2.send("data", 0, @s1.getsockname)
+      IO.select([@s1], nil, nil, 2)
+
+      buffer = ''.encode(Encoding::ISO_8859_1)
+      @s1.recv_nonblock(5, 0, buffer)
+      buffer.encoding.should == Encoding::ISO_8859_1
     end
 
     it "does not block if there's no data available" do
@@ -89,3 +99,74 @@
     end
   end
 end
+
+describe "Socket::BasicSocket#recv_nonblock" do
+  context "when recvfrom(2) returns 0 (if no messages are available to be received and the peer has performed an orderly shutdown)" do
+    describe "stream socket" do
+      before :each do
+        @server = TCPServer.new('127.0.0.1', 0)
+        @port = @server.addr[1]
+      end
+
+      after :each do
+        @server.close unless @server.closed?
+      end
+
+      ruby_version_is ""..."3.3" do
+        it "returns an empty String on a closed stream socket" do
+          ready = false
+
+          t = Thread.new do
+            client = @server.accept
+
+            Thread.pass while !ready
+            begin
+              client.recv_nonblock(10)
+            rescue IO::EAGAINWaitReadable
+              retry
+            end
+          ensure
+            client.close if client
+          end
+
+          Thread.pass while t.status and t.status != "sleep"
+          t.status.should_not be_nil
+
+          socket = TCPSocket.new('127.0.0.1', @port)
+          socket.close
+          ready = true
+
+          t.value.should == ""
+        end
+      end
+
+      ruby_version_is "3.3" do
+        it "returns nil on a closed stream socket" do
+          ready = false
+
+          t = Thread.new do
+            client = @server.accept
+
+            Thread.pass while !ready
+            begin
+              client.recv_nonblock(10)
+            rescue IO::EAGAINWaitReadable
+              retry
+            end
+          ensure
+            client.close if client
+          end
+
+          Thread.pass while t.status and t.status != "sleep"
+          t.status.should_not be_nil
+
+          socket = TCPSocket.new('127.0.0.1', @port)
+          socket.close
+          ready = true
+
+          t.value.should be_nil
+        end
+      end
+    end
+  end
+end
diff --git a/spec/ruby/library/socket/basicsocket/recv_spec.rb b/spec/ruby/library/socket/basicsocket/recv_spec.rb
index a56114f4ab57d6..a51920f52a092a 100644
--- a/spec/ruby/library/socket/basicsocket/recv_spec.rb
+++ b/spec/ruby/library/socket/basicsocket/recv_spec.rb
@@ -1,4 +1,4 @@
-# -*- encoding: binary -*-
+# encoding: binary
 require_relative '../spec_helper'
 require_relative '../fixtures/classes'
 
@@ -32,47 +32,26 @@
     ScratchPad.recorded.should == 'hello'
   end
 
-  ruby_version_is "3.3" do
-    it "returns nil on a closed stream socket" do
-      t = Thread.new do
-        client = @server.accept
-        packet = client.recv(10)
-        client.close
-        packet
-      end
-
-      Thread.pass while t.status and t.status != "sleep"
-      t.status.should_not be_nil
+  it "accepts flags to specify unusual receiving behaviour" do
+    t = Thread.new do
+      client = @server.accept
 
-      socket = TCPSocket.new('127.0.0.1', @port)
-      socket.close
+      # in-band data (TCP), doesn't receive the flag.
+      ScratchPad.record client.recv(10)
 
-      t.value.should be_nil
+      # this recv is important (TODO: explain)
+      client.recv(10)
+      client.close
     end
-  end
-
-  platform_is_not :solaris do
-    it "accepts flags to specify unusual receiving behaviour" do
-      t = Thread.new do
-        client = @server.accept
-
-        # in-band data (TCP), doesn't receive the flag.
-        ScratchPad.record client.recv(10)
+    Thread.pass while t.status and t.status != "sleep"
+    t.status.should_not be_nil
 
-        # this recv is important (TODO: explain)
-        client.recv(10)
-        client.close
-      end
-      Thread.pass while t.status and t.status != "sleep"
-      t.status.should_not be_nil
-
-      socket = TCPSocket.new('127.0.0.1', @port)
-      socket.send('helloU', Socket::MSG_OOB)
-      socket.shutdown(1)
-      t.join
-      socket.close
-      ScratchPad.recorded.should == 'hello'
-    end
+    socket = TCPSocket.new('127.0.0.1', @port)
+    socket.send('helloU', Socket::MSG_OOB)
+    socket.shutdown(1)
+    t.join
+    socket.close
+    ScratchPad.recorded.should == 'hello'
   end
 
   it "gets lines delimited with a custom separator"  do
@@ -100,13 +79,29 @@
     socket.write("data")
 
     client = @server.accept
-    buf = "foo"
+    buffer = +"foo"
     begin
-      client.recv(4, 0, buf)
+      client.recv(4, 0, buffer).should.equal?(buffer)
     ensure
       client.close
     end
-    buf.should == "data"
+    buffer.should == "data"
+
+    socket.close
+  end
+
+  it "preserves the encoding of the given buffer" do
+    socket = TCPSocket.new('127.0.0.1', @port)
+    socket.write("data")
+
+    client = @server.accept
+    buffer = ''.encode(Encoding::ISO_8859_1)
+    begin
+      client.recv(4, 0, buffer)
+    ensure
+      client.close
+    end
+    buffer.encoding.should == Encoding::ISO_8859_1
 
     socket.close
   end
@@ -176,3 +171,80 @@
     end
   end
 end
+
+describe "BasicSocket#recv" do
+  context "when recvfrom(2) returns 0 (if no messages are available to be received and the peer has performed an orderly shutdown)" do
+    describe "stream socket" do
+      before :each do
+        @server = TCPServer.new('127.0.0.1', 0)
+        @port = @server.addr[1]
+      end
+
+      after :each do
+        @server.close unless @server.closed?
+      end
+
+      ruby_version_is ""..."3.3" do
+        it "returns an empty String on a closed stream socket" do
+          t = Thread.new do
+            client = @server.accept
+            client.recv(10)
+          ensure
+            client.close if client
+          end
+
+          Thread.pass while t.status and t.status != "sleep"
+          t.status.should_not be_nil
+
+          socket = TCPSocket.new('127.0.0.1', @port)
+          socket.close
+
+          t.value.should == ""
+        end
+      end
+
+      ruby_version_is "3.3" do
+        it "returns nil on a closed stream socket" do
+          t = Thread.new do
+            client = @server.accept
+            client.recv(10)
+          ensure
+            client.close if client
+          end
+
+          Thread.pass while t.status and t.status != "sleep"
+          t.status.should_not be_nil
+
+          socket = TCPSocket.new('127.0.0.1', @port)
+          socket.close
+
+          t.value.should be_nil
+        end
+      end
+    end
+
+    describe "datagram socket" do
+      SocketSpecs.each_ip_protocol do |family, ip_address|
+        before :each do
+          @server = UDPSocket.new(family)
+          @client = UDPSocket.new(family)
+        end
+
+        after :each do
+          @server.close unless @server.closed?
+          @client.close unless @client.closed?
+        end
+
+        it "returns empty String" do
+          @server.bind(ip_address, 0)
+          addr = @server.connect_address
+          @client.connect(addr.ip_address, addr.ip_port)
+
+          @client.send('', 0)
+
+          @server.recv(1).should == ""
+        end
+      end
+    end
+  end
+end
diff --git a/spec/ruby/library/socket/basicsocket/recvmsg_nonblock_spec.rb b/spec/ruby/library/socket/basicsocket/recvmsg_nonblock_spec.rb
index cc4275c417ac11..b5fdd7c93bee8d 100644
--- a/spec/ruby/library/socket/basicsocket/recvmsg_nonblock_spec.rb
+++ b/spec/ruby/library/socket/basicsocket/recvmsg_nonblock_spec.rb
@@ -222,3 +222,79 @@
     end
   end
 end
+
+describe 'BasicSocket#recvmsg_nonblock' do
+  context "when recvfrom(2) returns 0 (if no messages are available to be received and the peer has performed an orderly shutdown)" do
+    describe "stream socket" do
+      before :each do
+        @server = TCPServer.new('127.0.0.1', 0)
+        @port = @server.addr[1]
+      end
+
+      after :each do
+        @server.close unless @server.closed?
+      end
+
+      ruby_version_is ""..."3.3" do
+        platform_is_not :windows do # #recvmsg_nonblock() raises 'Errno::EINVAL: Invalid argument - recvmsg(2)'
+          it "returns an empty String as received data on a closed stream socket" do
+            ready = false
+
+            t = Thread.new do
+              client = @server.accept
+
+              Thread.pass while !ready
+              begin
+                client.recvmsg_nonblock(10)
+              rescue IO::EAGAINWaitReadable
+                retry
+              end
+            ensure
+              client.close if client
+            end
+
+            Thread.pass while t.status and t.status != "sleep"
+            t.status.should_not be_nil
+
+            socket = TCPSocket.new('127.0.0.1', @port)
+            socket.close
+            ready = true
+
+            t.value.should.is_a? Array
+            t.value[0].should == ""
+          end
+        end
+      end
+
+      ruby_version_is "3.3" do
+        platform_is_not :windows do
+          it "returns nil on a closed stream socket" do
+            ready = false
+
+            t = Thread.new do
+              client = @server.accept
+
+              Thread.pass while !ready
+              begin
+                client.recvmsg_nonblock(10)
+              rescue IO::EAGAINWaitReadable
+                retry
+              end
+            ensure
+              client.close if client
+            end
+
+            Thread.pass while t.status and t.status != "sleep"
+            t.status.should_not be_nil
+
+            socket = TCPSocket.new('127.0.0.1', @port)
+            socket.close
+            ready = true
+
+            t.value.should be_nil
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/spec/ruby/library/socket/basicsocket/recvmsg_spec.rb b/spec/ruby/library/socket/basicsocket/recvmsg_spec.rb
index 8063723701a0fe..04ba1d74c768c1 100644
--- a/spec/ruby/library/socket/basicsocket/recvmsg_spec.rb
+++ b/spec/ruby/library/socket/basicsocket/recvmsg_spec.rb
@@ -195,3 +195,87 @@
     end
   end
 end
+
+describe 'BasicSocket#recvmsg' do
+  context "when recvfrom(2) returns 0 (if no messages are available to be received and the peer has performed an orderly shutdown)" do
+    describe "stream socket" do
+      before :each do
+        @server = TCPServer.new('127.0.0.1', 0)
+        @port = @server.addr[1]
+      end
+
+      after :each do
+        @server.close unless @server.closed?
+      end
+
+      ruby_version_is ""..."3.3" do
+        platform_is_not :windows do
+          it "returns an empty String as received data on a closed stream socket" do
+            t = Thread.new do
+              client = @server.accept
+              client.recvmsg(10)
+            ensure
+              client.close if client
+            end
+
+            Thread.pass while t.status and t.status != "sleep"
+            t.status.should_not be_nil
+
+            socket = TCPSocket.new('127.0.0.1', @port)
+            socket.close
+
+            t.value.should.is_a? Array
+            t.value[0].should == ""
+          end
+        end
+      end
+
+      ruby_version_is "3.3" do
+        platform_is_not :windows do
+          it "returns nil on a closed stream socket" do
+            t = Thread.new do
+              client = @server.accept
+              client.recvmsg(10)
+            ensure
+              client.close if client
+            end
+
+            Thread.pass while t.status and t.status != "sleep"
+            t.status.should_not be_nil
+
+            socket = TCPSocket.new('127.0.0.1', @port)
+            socket.close
+
+            t.value.should be_nil
+          end
+        end
+      end
+    end
+
+    describe "datagram socket" do
+      SocketSpecs.each_ip_protocol do |family, ip_address|
+        before :each do
+          @server = UDPSocket.new(family)
+          @client = UDPSocket.new(family)
+        end
+
+        after :each do
+          @server.close unless @server.closed?
+          @client.close unless @client.closed?
+        end
+
+        it "returns an empty String as received data" do
+          @server.bind(ip_address, 0)
+          addr = @server.connect_address
+          @client.connect(addr.ip_address, addr.ip_port)
+
+          @client.send('', 0)
+          message = @server.recvmsg(1)
+
+          message.should.is_a? Array
+          message[0].should == ""
+        end
+      end
+    end
+  end
+end
diff --git a/spec/ruby/library/socket/basicsocket/send_spec.rb b/spec/ruby/library/socket/basicsocket/send_spec.rb
index 041ce03d72c7ee..25ba3f5655da7f 100644
--- a/spec/ruby/library/socket/basicsocket/send_spec.rb
+++ b/spec/ruby/library/socket/basicsocket/send_spec.rb
@@ -16,29 +16,29 @@
     @socket.close
   end
 
-   it "sends a message to another socket and returns the number of bytes sent" do
-     data = ""
-     t = Thread.new do
-       client = @server.accept
-       loop do
-         got = client.recv(5)
-         break if got.nil? || got.empty?
-         data << got
-       end
-       client.close
-     end
-     Thread.pass while t.status and t.status != "sleep"
-     t.status.should_not be_nil
-
-     @socket.send('hello', 0).should == 5
-     @socket.shutdown(1) # indicate, that we are done sending
-     @socket.recv(10)
-
-     t.join
-     data.should == 'hello'
-   end
-
-  platform_is_not :solaris, :windows do
+  it "sends a message to another socket and returns the number of bytes sent" do
+    data = +""
+    t = Thread.new do
+      client = @server.accept
+      loop do
+        got = client.recv(5)
+        break if got.nil? || got.empty?
+        data << got
+      end
+      client.close
+    end
+    Thread.pass while t.status and t.status != "sleep"
+    t.status.should_not be_nil
+
+    @socket.send('hello', 0).should == 5
+    @socket.shutdown(1) # indicate, that we are done sending
+    @socket.recv(10)
+
+    t.join
+    data.should == 'hello'
+  end
+
+  platform_is_not :windows do
     it "accepts flags to specify unusual sending behaviour" do
       data = nil
       peek_data = nil
@@ -62,25 +62,25 @@
   end
 
   it "accepts a sockaddr as recipient address" do
-     data = ""
-     t = Thread.new do
-       client = @server.accept
-       loop do
-         got = client.recv(5)
-         break if got.nil? || got.empty?
-         data << got
-       end
-       client.close
-     end
-     Thread.pass while t.status and t.status != "sleep"
-     t.status.should_not be_nil
-
-     sockaddr = Socket.pack_sockaddr_in(@port, "127.0.0.1")
-     @socket.send('hello', 0, sockaddr).should == 5
-     @socket.shutdown # indicate, that we are done sending
-
-     t.join
-     data.should == 'hello'
+    data = +""
+    t = Thread.new do
+      client = @server.accept
+      loop do
+        got = client.recv(5)
+        break if got.nil? || got.empty?
+        data << got
+      end
+      client.close
+    end
+    Thread.pass while t.status and t.status != "sleep"
+    t.status.should_not be_nil
+
+    sockaddr = Socket.pack_sockaddr_in(@port, "127.0.0.1")
+    @socket.send('hello', 0, sockaddr).should == 5
+    @socket.shutdown # indicate, that we are done sending
+
+    t.join
+    data.should == 'hello'
   end
 end
 
diff --git a/spec/ruby/library/socket/constants/constants_spec.rb b/spec/ruby/library/socket/constants/constants_spec.rb
index 637bc6740af719..b9a9d427253ff1 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, :android do
+  platform_is_not :windows, :aix, :android do
     it "defines multicast options" do
       consts = ["IP_MAX_MEMBERSHIPS"]
       consts.each do |c|
diff --git a/spec/ruby/library/socket/ipsocket/getaddress_spec.rb b/spec/ruby/library/socket/ipsocket/getaddress_spec.rb
index 746d2ab86bf175..329f8267d3293d 100644
--- a/spec/ruby/library/socket/ipsocket/getaddress_spec.rb
+++ b/spec/ruby/library/socket/ipsocket/getaddress_spec.rb
@@ -2,7 +2,6 @@
 require_relative '../fixtures/classes'
 
 describe "Socket::IPSocket#getaddress" do
-
   it "returns the IP address of hostname" do
     addr_local = IPSocket.getaddress(SocketSpecs.hostname)
     ["127.0.0.1", "::1"].include?(addr_local).should == true
@@ -14,12 +13,16 @@
     IPSocket.getaddress('::1').should == '::1'
   end
 
+  it 'returns IPv4 compatible IPv6 addresses' do
+    IPSocket.getaddress('::ffff:192.168.1.1').should == '::ffff:192.168.1.1'
+  end
+
   # There is no way to make this fail-proof on all machines, because
   # DNS servers like opendns return A records for ANY host, including
   # traditionally invalidly named ones.
   it "raises an error on unknown hostnames" do
     -> {
-      IPSocket.getaddress("rubyspecdoesntexist.fallingsnow.net")
+      IPSocket.getaddress("rubyspecdoesntexist.ruby-lang.org")
     }.should raise_error(SocketError)
   end
 end
diff --git a/spec/ruby/library/socket/ipsocket/recvfrom_spec.rb b/spec/ruby/library/socket/ipsocket/recvfrom_spec.rb
index 2af86ea70d92fd..b58903df237b9d 100644
--- a/spec/ruby/library/socket/ipsocket/recvfrom_spec.rb
+++ b/spec/ruby/library/socket/ipsocket/recvfrom_spec.rb
@@ -69,6 +69,88 @@
   end
 end
 
+describe "Socket::IPSocket#recvfrom" do
+  context "when recvfrom(2) returns 0 (if no messages are available to be received and the peer has performed an orderly shutdown)" do
+    describe "stream socket" do
+      before :each do
+        @server = TCPServer.new("127.0.0.1", 0)
+        port = @server.addr[1]
+        @client = TCPSocket.new("127.0.0.1", port)
+      end
+
+      after :each do
+        @server.close unless @server.closed?
+        @client.close unless @client.closed?
+      end
+
+      ruby_version_is ""..."3.3" do
+        it "returns an empty String as received data on a closed stream socket" do
+          t = Thread.new do
+            client = @server.accept
+            message = client.recvfrom(10)
+            message
+          ensure
+            client.close if client
+          end
+
+          Thread.pass while t.status and t.status != "sleep"
+          t.status.should_not be_nil
+
+          @client.close
+
+          t.value.should.is_a? Array
+          t.value[0].should == ""
+        end
+      end
+
+      ruby_version_is "3.3" do
+        it "returns nil on a closed stream socket" do
+          t = Thread.new do
+            client = @server.accept
+            message = client.recvfrom(10)
+            message
+          ensure
+            client.close if client
+          end
+
+          Thread.pass while t.status and t.status != "sleep"
+          t.status.should_not be_nil
+
+          @client.close
+
+          t.value.should be_nil
+        end
+      end
+    end
+
+    describe "datagram socket" do
+      SocketSpecs.each_ip_protocol do |family, ip_address|
+        before :each do
+          @server = UDPSocket.new(family)
+          @client = UDPSocket.new(family)
+        end
+
+        after :each do
+          @server.close unless @server.closed?
+          @client.close unless @client.closed?
+        end
+
+        it "returns an empty String as received data" do
+          @server.bind(ip_address, 0)
+          addr = @server.connect_address
+          @client.connect(addr.ip_address, addr.ip_port)
+
+          @client.send('', 0)
+          message = @server.recvfrom(1)
+
+          message.should.is_a? Array
+          message[0].should == ""
+        end
+      end
+    end
+  end
+end
+
 describe 'Socket::IPSocket#recvfrom' do
   SocketSpecs.each_ip_protocol do |family, ip_address, family_name|
     before do
diff --git a/spec/ruby/library/socket/shared/pack_sockaddr.rb b/spec/ruby/library/socket/shared/pack_sockaddr.rb
index 9f6238e7bc7ea9..f309aa02c7ad03 100644
--- a/spec/ruby/library/socket/shared/pack_sockaddr.rb
+++ b/spec/ruby/library/socket/shared/pack_sockaddr.rb
@@ -17,13 +17,14 @@
 
     sockaddr_in = Socket.public_send(@method, nil, '127.0.0.1')
     Socket.unpack_sockaddr_in(sockaddr_in).should == [0, '127.0.0.1']
+
+    sockaddr_in = Socket.public_send(@method, 80, Socket::INADDR_ANY)
+    Socket.unpack_sockaddr_in(sockaddr_in).should == [80, '0.0.0.0']
   end
 
-  platform_is_not :solaris do
-    it 'resolves the service name to a port' do
-      sockaddr_in = Socket.public_send(@method, 'http', '127.0.0.1')
-      Socket.unpack_sockaddr_in(sockaddr_in).should == [80, '127.0.0.1']
-    end
+  it 'resolves the service name to a port' do
+    sockaddr_in = Socket.public_send(@method, 'http', '127.0.0.1')
+    Socket.unpack_sockaddr_in(sockaddr_in).should == [80, '127.0.0.1']
   end
 
   describe 'using an IPv4 address' do
@@ -35,25 +36,12 @@
     end
   end
 
-  platform_is_not :solaris do
-    describe 'using an IPv6 address' do
-      it 'returns a String of 28 bytes' do
-        str = Socket.public_send(@method, 80, '::1')
-
-        str.should be_an_instance_of(String)
-        str.bytesize.should == 28
-      end
-    end
-  end
-
-  platform_is :solaris do
-    describe 'using an IPv6 address' do
-      it 'returns a String of 32 bytes' do
-        str = Socket.public_send(@method, 80, '::1')
+  describe 'using an IPv6 address' do
+    it 'returns a String of 28 bytes' do
+      str = Socket.public_send(@method, 80, '::1')
 
-        str.should be_an_instance_of(String)
-        str.bytesize.should == 32
-      end
+      str.should be_an_instance_of(String)
+      str.bytesize.should == 28
     end
   end
 end
diff --git a/spec/ruby/library/socket/socket/bind_spec.rb b/spec/ruby/library/socket/socket/bind_spec.rb
index 4465a3dafacb5b..e76336eafac36d 100644
--- a/spec/ruby/library/socket/socket/bind_spec.rb
+++ b/spec/ruby/library/socket/socket/bind_spec.rb
@@ -122,7 +122,7 @@
 
             -> { @socket.bind(sockaddr1) }.should raise_error(Errno::EACCES)
           end
-       end
+        end
       end
     end
 
diff --git a/spec/ruby/library/socket/socket/connect_nonblock_spec.rb b/spec/ruby/library/socket/socket/connect_nonblock_spec.rb
index 3cf667fc4a1377..359b8719fb06af 100644
--- a/spec/ruby/library/socket/socket/connect_nonblock_spec.rb
+++ b/spec/ruby/library/socket/socket/connect_nonblock_spec.rb
@@ -16,42 +16,40 @@
     @thread.join if @thread
   end
 
-  platform_is_not :solaris do
-    it "connects the socket to the remote side" do
-      port = nil
-      accept = false
-      @thread = Thread.new do
-        server = TCPServer.new(@hostname, 0)
-        port = server.addr[1]
-        Thread.pass until accept
-        conn = server.accept
-        conn << "hello!"
-        conn.close
-        server.close
-      end
-
-      Thread.pass until port
+  it "connects the socket to the remote side" do
+    port = nil
+    accept = false
+    @thread = Thread.new do
+      server = TCPServer.new(@hostname, 0)
+      port = server.addr[1]
+      Thread.pass until accept
+      conn = server.accept
+      conn << "hello!"
+      conn.close
+      server.close
+    end
 
-      addr = Socket.sockaddr_in(port, @hostname)
-      begin
-        @socket.connect_nonblock(addr)
-      rescue Errno::EINPROGRESS
-      end
+    Thread.pass until port
 
-      accept = true
-      IO.select nil, [@socket]
+    addr = Socket.sockaddr_in(port, @hostname)
+    begin
+      @socket.connect_nonblock(addr)
+    rescue Errno::EINPROGRESS
+    end
 
-      begin
-        @socket.connect_nonblock(addr)
-      rescue Errno::EISCONN
-        # Not all OS's use this errno, so we trap and ignore it
-      end
+    accept = true
+    IO.select nil, [@socket]
 
-      @socket.read(6).should == "hello!"
+    begin
+      @socket.connect_nonblock(addr)
+    rescue Errno::EISCONN
+      # Not all OS's use this errno, so we trap and ignore it
     end
+
+    @socket.read(6).should == "hello!"
   end
 
-  platform_is_not :freebsd, :solaris, :aix do
+  platform_is_not :freebsd, :aix do
     it "raises Errno::EINPROGRESS when the connect would block" do
       -> do
         @socket.connect_nonblock(@addr)
@@ -135,7 +133,7 @@
         end
       end
 
-      platform_is_not :freebsd, :solaris do
+      platform_is_not :freebsd do
         it 'raises IO:EINPROGRESSWaitWritable when the connection would block' do
           @server.bind(@sockaddr)
 
diff --git a/spec/ruby/library/socket/socket/connect_spec.rb b/spec/ruby/library/socket/socket/connect_spec.rb
index 8653fba552bdcd..130379ce2b5ebf 100644
--- a/spec/ruby/library/socket/socket/connect_spec.rb
+++ b/spec/ruby/library/socket/socket/connect_spec.rb
@@ -53,4 +53,26 @@
       end
     end
   end
+
+  ruby_version_is "3.4" do
+    it "fails with timeout" do
+      # TEST-NET-1 IP address are reserved for documentation and example purposes.
+      address = Socket.pack_sockaddr_in(1, "192.0.2.1")
+
+      client = Socket.new(Socket::AF_INET, Socket::SOCK_STREAM)
+      client.timeout = 0
+
+      -> {
+        begin
+          client.connect(address)
+        rescue Errno::ECONNREFUSED
+          skip "Outgoing packets may be filtered"
+        rescue Errno::ENETUNREACH
+          skip "Off line"
+        end
+      }.should raise_error(IO::TimeoutError)
+    ensure
+      client.close
+    end
+  end
 end
diff --git a/spec/ruby/library/socket/socket/getaddrinfo_spec.rb b/spec/ruby/library/socket/socket/getaddrinfo_spec.rb
index e0eff3cef435a2..9f049597d0d2b4 100644
--- a/spec/ruby/library/socket/socket/getaddrinfo_spec.rb
+++ b/spec/ruby/library/socket/socket/getaddrinfo_spec.rb
@@ -11,7 +11,7 @@
     BasicSocket.do_not_reverse_lookup = @do_not_reverse_lookup
   end
 
-  platform_is_not :solaris, :windows do
+  platform_is_not :windows do
     it "gets the address information" do
       expected = []
       # The check for AP_INET6's class is needed because ipaddr.rb adds
diff --git a/spec/ruby/library/socket/socket/gethostbyaddr_spec.rb b/spec/ruby/library/socket/socket/gethostbyaddr_spec.rb
index a4c83555208f57..5d936046f5cb1a 100644
--- a/spec/ruby/library/socket/socket/gethostbyaddr_spec.rb
+++ b/spec/ruby/library/socket/socket/gethostbyaddr_spec.rb
@@ -18,11 +18,8 @@
           @array = suppress_warning { Socket.gethostbyaddr(@addr) }
         end
 
-        # RubyCI Solaris 11x defines 127.0.0.1 as unstable11x
-        platform_is_not :"solaris2.11" do
-          it 'includes the hostname as the first value' do
-            @array[0].should == SocketSpecs.hostname_reverse_lookup
-          end
+        it 'includes the hostname as the first value' do
+          @array[0].should == SocketSpecs.hostname_reverse_lookup
         end
 
         it 'includes the aliases as the 2nd value' do
diff --git a/spec/ruby/library/socket/socket/gethostbyname_spec.rb b/spec/ruby/library/socket/socket/gethostbyname_spec.rb
index 0858e255e4ccbe..618ef853877911 100644
--- a/spec/ruby/library/socket/socket/gethostbyname_spec.rb
+++ b/spec/ruby/library/socket/socket/gethostbyname_spec.rb
@@ -1,4 +1,4 @@
-# -*- encoding: binary -*-
+# encoding: binary
 require_relative '../spec_helper'
 require_relative '../fixtures/classes'
 
diff --git a/spec/ruby/library/socket/socket/gethostname_spec.rb b/spec/ruby/library/socket/socket/gethostname_spec.rb
index 4b79747b2721e5..dfca7cf5cde45d 100644
--- a/spec/ruby/library/socket/socket/gethostname_spec.rb
+++ b/spec/ruby/library/socket/socket/gethostname_spec.rb
@@ -2,7 +2,17 @@
 require_relative '../fixtures/classes'
 
 describe "Socket.gethostname" do
+  def system_hostname
+    if platform_is_not :windows
+      # `uname -n` is the most portable way to get the hostname, as it is a POSIX standard:
+      `uname -n`.strip
+    else
+      # Windows does not have uname, so we use hostname instead:
+      `hostname`.strip
+    end
+  end
+
   it "returns the host name" do
-    Socket.gethostname.should == `hostname`.strip
+    Socket.gethostname.should == system_hostname
   end
 end
diff --git a/spec/ruby/library/socket/socket/getifaddrs_spec.rb b/spec/ruby/library/socket/socket/getifaddrs_spec.rb
index 7df542abe6e695..839854ea2711fc 100644
--- a/spec/ruby/library/socket/socket/getifaddrs_spec.rb
+++ b/spec/ruby/library/socket/socket/getifaddrs_spec.rb
@@ -1,6 +1,6 @@
 require_relative '../spec_helper'
 
-platform_is_not :aix, :"solaris2.10" do
+platform_is_not :aix do
 describe 'Socket.getifaddrs' do
   before do
     @ifaddrs = Socket.getifaddrs
diff --git a/spec/ruby/library/socket/socket/getnameinfo_spec.rb b/spec/ruby/library/socket/socket/getnameinfo_spec.rb
index b406348aa8aa27..4f13bf484df93e 100644
--- a/spec/ruby/library/socket/socket/getnameinfo_spec.rb
+++ b/spec/ruby/library/socket/socket/getnameinfo_spec.rb
@@ -70,7 +70,7 @@ def should_be_valid_dns_name(name)
 
     it 'raises SocketError or TypeError when using an invalid String' do
       -> { Socket.getnameinfo('cats') }.should raise_error(Exception) { |e|
-        [SocketError, TypeError].should include(e.class)
+        (e.is_a?(SocketError) || e.is_a?(TypeError)).should == true
       }
     end
 
diff --git a/spec/ruby/library/socket/socket/pack_sockaddr_in_spec.rb b/spec/ruby/library/socket/socket/pack_sockaddr_in_spec.rb
index 63d47244530945..ef2a2d4ba92212 100644
--- a/spec/ruby/library/socket/socket/pack_sockaddr_in_spec.rb
+++ b/spec/ruby/library/socket/socket/pack_sockaddr_in_spec.rb
@@ -2,6 +2,6 @@
 require_relative '../fixtures/classes'
 require_relative '../shared/pack_sockaddr'
 
-describe "Socket#pack_sockaddr_in" do
+describe "Socket.pack_sockaddr_in" do
   it_behaves_like :socket_pack_sockaddr_in, :pack_sockaddr_in
 end
diff --git a/spec/ruby/library/socket/socket/pair_spec.rb b/spec/ruby/library/socket/socket/pair_spec.rb
index 292eacd38da385..8dd470a95e2daf 100644
--- a/spec/ruby/library/socket/socket/pair_spec.rb
+++ b/spec/ruby/library/socket/socket/pair_spec.rb
@@ -2,6 +2,6 @@
 require_relative '../fixtures/classes'
 require_relative '../shared/socketpair'
 
-describe "Socket#pair" do
+describe "Socket.pair" do
   it_behaves_like :socket_socketpair, :pair
 end
diff --git a/spec/ruby/library/socket/socket/recvfrom_nonblock_spec.rb b/spec/ruby/library/socket/socket/recvfrom_nonblock_spec.rb
index 94f58ac49f4ac6..01b42bcc52b4fa 100644
--- a/spec/ruby/library/socket/socket/recvfrom_nonblock_spec.rb
+++ b/spec/ruby/library/socket/socket/recvfrom_nonblock_spec.rb
@@ -52,6 +52,27 @@
           end
         end
 
+        it "allows an output buffer as third argument" do
+          @client.write('hello')
+
+          IO.select([@server])
+          buffer = +''
+          message, = @server.recvfrom_nonblock(5, 0, buffer)
+
+          message.should.equal?(buffer)
+          buffer.should == 'hello'
+        end
+
+        it "preserves the encoding of the given buffer" do
+          @client.write('hello')
+
+          IO.select([@server])
+          buffer = ''.encode(Encoding::ISO_8859_1)
+          @server.recvfrom_nonblock(5, 0, buffer)
+
+          buffer.encoding.should == Encoding::ISO_8859_1
+        end
+
         describe 'the returned data' do
           it 'is the same as the sent data' do
             5.times do
@@ -116,3 +137,83 @@
     end
   end
 end
+
+describe 'Socket#recvfrom_nonblock' do
+  context "when recvfrom(2) returns 0 (if no messages are available to be received and the peer has performed an orderly shutdown)" do
+    describe "stream socket" do
+      before :each do
+        @server = Socket.new Socket::AF_INET, :STREAM, 0
+        @sockaddr = Socket.sockaddr_in(0, "127.0.0.1")
+        @server.bind(@sockaddr)
+        @server.listen(1)
+
+        server_ip    = @server.local_address.ip_port
+        @server_addr = Socket.sockaddr_in(server_ip, "127.0.0.1")
+
+        @client = Socket.new(Socket::AF_INET, :STREAM, 0)
+      end
+
+      after :each do
+        @server.close unless @server.closed?
+        @client.close unless @client.closed?
+      end
+
+      ruby_version_is ""..."3.3" do
+        it "returns an empty String as received data on a closed stream socket" do
+          ready = false
+
+          t = Thread.new do
+            client, _ = @server.accept
+
+            Thread.pass while !ready
+            begin
+              client.recvfrom_nonblock(10)
+            rescue IO::EAGAINWaitReadable
+              retry
+            end
+          ensure
+            client.close if client
+          end
+
+          Thread.pass while t.status and t.status != "sleep"
+          t.status.should_not be_nil
+
+          @client.connect(@server_addr)
+          @client.close
+          ready = true
+
+          t.value.should.is_a? Array
+          t.value[0].should == ""
+        end
+      end
+
+      ruby_version_is "3.3" do
+        it "returns nil on a closed stream socket" do
+          ready = false
+
+          t = Thread.new do
+            client, _ = @server.accept
+
+            Thread.pass while !ready
+            begin
+              client.recvfrom_nonblock(10)
+            rescue IO::EAGAINWaitReadable
+              retry
+            end
+          ensure
+            client.close if client
+          end
+
+          Thread.pass while t.status and t.status != "sleep"
+          t.status.should_not be_nil
+
+          @client.connect(@server_addr)
+          @client.close
+          ready = true
+
+          t.value.should be_nil
+        end
+      end
+    end
+  end
+end
diff --git a/spec/ruby/library/socket/socket/recvfrom_spec.rb b/spec/ruby/library/socket/socket/recvfrom_spec.rb
index faf161e4a55e11..6ba39ffcaf534c 100644
--- a/spec/ruby/library/socket/socket/recvfrom_spec.rb
+++ b/spec/ruby/library/socket/socket/recvfrom_spec.rb
@@ -90,3 +90,90 @@
     end
   end
 end
+
+describe 'Socket#recvfrom' do
+  context "when recvfrom(2) returns 0 (if no messages are available to be received and the peer has performed an orderly shutdown)" do
+    describe "stream socket" do
+      before :each do
+        @server = Socket.new Socket::AF_INET, :STREAM, 0
+        sockaddr = Socket.sockaddr_in(0, "127.0.0.1")
+        @server.bind(sockaddr)
+        @server.listen(1)
+
+        server_ip    = @server.local_address.ip_port
+        @server_addr = Socket.sockaddr_in(server_ip, "127.0.0.1")
+
+        @client = Socket.new(Socket::AF_INET, :STREAM, 0)
+      end
+
+      after :each do
+        @server.close unless @server.closed?
+        @client.close unless @client.closed?
+      end
+
+      ruby_version_is ""..."3.3" do
+        it "returns an empty String as received data on a closed stream socket" do
+          t = Thread.new do
+            client, _ = @server.accept
+            client.recvfrom(10)
+          ensure
+            client.close if client
+          end
+
+          Thread.pass while t.status and t.status != "sleep"
+          t.status.should_not be_nil
+
+          @client.connect(@server_addr)
+          @client.close
+
+          t.value.should.is_a? Array
+          t.value[0].should == ""
+        end
+      end
+
+      ruby_version_is "3.3" do
+        it "returns nil on a closed stream socket" do
+          t = Thread.new do
+            client, _ = @server.accept
+            client.recvfrom(10)
+          ensure
+            client.close if client
+          end
+
+          Thread.pass while t.status and t.status != "sleep"
+          t.status.should_not be_nil
+
+          @client.connect(@server_addr)
+          @client.close
+
+          t.value.should be_nil
+        end
+      end
+    end
+
+    describe "datagram socket" do
+      SocketSpecs.each_ip_protocol do |family, ip_address|
+        before :each do
+          @server = Socket.new(family, :DGRAM)
+          @client = Socket.new(family, :DGRAM)
+        end
+
+        after :each do
+          @server.close unless @server.closed?
+          @client.close unless @client.closed?
+        end
+
+        it "returns an empty String as received data" do
+          @server.bind(Socket.sockaddr_in(0, ip_address))
+          @client.connect(@server.getsockname)
+
+          @client.send('', 0)
+          message = @server.recvfrom(1)
+
+          message.should.is_a? Array
+          message[0].should == ""
+        end
+      end
+    end
+  end
+end
diff --git a/spec/ruby/library/socket/socket/socketpair_spec.rb b/spec/ruby/library/socket/socket/socketpair_spec.rb
index 5b8311124ed049..551c376d49fab6 100644
--- a/spec/ruby/library/socket/socket/socketpair_spec.rb
+++ b/spec/ruby/library/socket/socket/socketpair_spec.rb
@@ -2,6 +2,6 @@
 require_relative '../fixtures/classes'
 require_relative '../shared/socketpair'
 
-describe "Socket#socketpair" do
+describe "Socket.socketpair" do
   it_behaves_like :socket_socketpair, :socketpair
 end
diff --git a/spec/ruby/library/socket/socket/udp_server_loop_spec.rb b/spec/ruby/library/socket/socket/udp_server_loop_spec.rb
index fc030e75b9f1fc..cd22ea56cffe8b 100644
--- a/spec/ruby/library/socket/socket/udp_server_loop_spec.rb
+++ b/spec/ruby/library/socket/socket/udp_server_loop_spec.rb
@@ -50,10 +50,10 @@
         end
       end
 
+      thread.join
+
       msg.should == 'hello'
       src.should be_an_instance_of(Socket::UDPSource)
-
-      thread.join
     end
   end
 end
diff --git a/spec/ruby/library/socket/tcpserver/accept_spec.rb b/spec/ruby/library/socket/tcpserver/accept_spec.rb
index d38d95e0e19acc..d8892cd5f061d3 100644
--- a/spec/ruby/library/socket/tcpserver/accept_spec.rb
+++ b/spec/ruby/library/socket/tcpserver/accept_spec.rb
@@ -69,7 +69,7 @@
     Thread.pass while t.status and t.status != "sleep"
     # Thread#backtrace uses SIGVTALRM on TruffleRuby and potentially other implementations.
     # Sending a signal to a thread is not possible with Ruby APIs.
-    t.backtrace.join("\n").should.include?("in `accept'")
+    t.backtrace.join("\n").should =~ /in [`'](?:TCPServer#)?accept'/
 
     socket = TCPSocket.new('127.0.0.1', @port)
     socket.write("OK")
@@ -114,6 +114,19 @@
         @socket = @server.accept
         @socket.should be_an_instance_of(TCPSocket)
       end
+
+      platform_is_not :windows do
+        it "returns a TCPSocket which is set to nonblocking" do
+          require 'io/nonblock'
+          @socket = @server.accept
+          @socket.should.nonblock?
+        end
+      end
+
+      it "returns a TCPSocket which is set to close on exec" do
+        @socket = @server.accept
+        @socket.should.close_on_exec?
+      end
     end
   end
 end
diff --git a/spec/ruby/library/socket/tcpserver/new_spec.rb b/spec/ruby/library/socket/tcpserver/new_spec.rb
index 8d9696c9d86b70..dd1ba676bd9e95 100644
--- a/spec/ruby/library/socket/tcpserver/new_spec.rb
+++ b/spec/ruby/library/socket/tcpserver/new_spec.rb
@@ -97,6 +97,12 @@
     addr[1].should be_kind_of(Integer)
   end
 
+  it "does not use the given block and warns to use TCPServer::open" do
+    -> {
+      @server = TCPServer.new(0) { raise }
+    }.should complain(/warning: TCPServer::new\(\) does not take block; use TCPServer::open\(\) instead/)
+  end
+
   it "raises Errno::EADDRNOTAVAIL when the address is unknown" do
     -> { TCPServer.new("1.2.3.4", 0) }.should raise_error(Errno::EADDRNOTAVAIL)
   end
diff --git a/spec/ruby/library/socket/tcpsocket/gethostbyname_spec.rb b/spec/ruby/library/socket/tcpsocket/gethostbyname_spec.rb
index f0e98778f5044d..5a2c704f352091 100644
--- a/spec/ruby/library/socket/tcpsocket/gethostbyname_spec.rb
+++ b/spec/ruby/library/socket/tcpsocket/gethostbyname_spec.rb
@@ -2,7 +2,7 @@
 require_relative '../fixtures/classes'
 
 # TODO: verify these for windows
-describe "TCPSocket#gethostbyname" do
+describe "TCPSocket.gethostbyname" do
   before :each do
     suppress_warning do
       @host_info = TCPSocket.gethostbyname(SocketSpecs.hostname)
@@ -52,7 +52,7 @@
   end
 end
 
-describe 'TCPSocket#gethostbyname' do
+describe 'TCPSocket.gethostbyname' do
   it 'returns an Array' do
     suppress_warning do
       TCPSocket.gethostbyname('127.0.0.1').should be_an_instance_of(Array)
diff --git a/spec/ruby/library/socket/tcpsocket/initialize_spec.rb b/spec/ruby/library/socket/tcpsocket/initialize_spec.rb
index 065c8f4190af2c..d7feb9751bb95f 100644
--- a/spec/ruby/library/socket/tcpsocket/initialize_spec.rb
+++ b/spec/ruby/library/socket/tcpsocket/initialize_spec.rb
@@ -4,6 +4,27 @@
 
 describe 'TCPSocket#initialize' do
   it_behaves_like :tcpsocket_new, :new
+
+  describe "with a running server" do
+    before :each do
+      @server = SocketSpecs::SpecTCPServer.new
+      @hostname = @server.hostname
+    end
+
+    after :each do
+      if @socket
+        @socket.write "QUIT"
+        @socket.close
+      end
+      @server.shutdown
+    end
+
+    it "does not use the given block and warns to use TCPSocket::open" do
+      -> {
+        @socket = TCPSocket.new(@hostname, @server.port, nil) { raise }
+      }.should complain(/warning: TCPSocket::new\(\) does not take block; use TCPSocket::open\(\) instead/)
+    end
+  end
 end
 
 describe 'TCPSocket#initialize' do
@@ -51,6 +72,19 @@
         @client.remote_address.ip_port.should    == @server.local_address.ip_port
       end
 
+      platform_is_not :windows do
+        it "creates a socket which is set to nonblocking" do
+          require 'io/nonblock'
+          @client = TCPSocket.new(ip_address, @port)
+          @client.should.nonblock?
+        end
+      end
+
+      it "creates a socket which is set to close on exec" do
+        @client = TCPSocket.new(ip_address, @port)
+        @client.should.close_on_exec?
+      end
+
       describe 'using a local address and service' do
         it 'binds the client socket to the local address and service' do
           @client = TCPSocket.new(ip_address, @port, ip_address, 0)
diff --git a/spec/ruby/library/socket/tcpsocket/shared/new.rb b/spec/ruby/library/socket/tcpsocket/shared/new.rb
index d60260a01b0727..5280eb790080f8 100644
--- a/spec/ruby/library/socket/tcpsocket/shared/new.rb
+++ b/spec/ruby/library/socket/tcpsocket/shared/new.rb
@@ -14,20 +14,13 @@
     }
   end
 
-  ruby_version_is ""..."3.2" do
-    it 'raises Errno::ETIMEDOUT with :connect_timeout when no server is listening on the given address' do
-      -> {
-        TCPSocket.send(@method, "192.0.2.1", 80, connect_timeout: 0)
-      }.should raise_error(Errno::ETIMEDOUT)
-    end
-  end
-
-  ruby_version_is "3.2" do
-    it 'raises IO::TimeoutError with :connect_timeout when no server is listening on the given address' do
-      -> {
-        TCPSocket.send(@method, "192.0.2.1", 80, connect_timeout: 0)
-      }.should raise_error(IO::TimeoutError)
-    end
+  it 'raises IO::TimeoutError with :connect_timeout when no server is listening on the given address' do
+    -> {
+      TCPSocket.send(@method, "192.0.2.1", 80, connect_timeout: 0)
+    }.should raise_error(IO::TimeoutError)
+  rescue Errno::ENETUNREACH
+    # In the case all network interfaces down.
+    # raise_error cannot deal with multiple expected exceptions
   end
 
   describe "with a running server" do
diff --git a/spec/ruby/library/socket/udpsocket/initialize_spec.rb b/spec/ruby/library/socket/udpsocket/initialize_spec.rb
index 1d635149f7c40d..ecf0043c10a29c 100644
--- a/spec/ruby/library/socket/udpsocket/initialize_spec.rb
+++ b/spec/ruby/library/socket/udpsocket/initialize_spec.rb
@@ -30,6 +30,19 @@
     @socket.binmode?.should be_true
   end
 
+  platform_is_not :windows do
+    it 'sets the socket to nonblock' do
+      require 'io/nonblock'
+      @socket = UDPSocket.new(:INET)
+      @socket.should.nonblock?
+    end
+  end
+
+  it 'sets the socket to close on exec' do
+    @socket = UDPSocket.new(:INET)
+    @socket.should.close_on_exec?
+  end
+
   it 'raises Errno::EAFNOSUPPORT or Errno::EPROTONOSUPPORT when given an invalid address family' do
     -> {
       UDPSocket.new(666)
diff --git a/spec/ruby/library/socket/udpsocket/new_spec.rb b/spec/ruby/library/socket/udpsocket/new_spec.rb
index 6cc0cadbcb48f6..79bfcb624d2b69 100644
--- a/spec/ruby/library/socket/udpsocket/new_spec.rb
+++ b/spec/ruby/library/socket/udpsocket/new_spec.rb
@@ -26,6 +26,12 @@
     @socket.should be_an_instance_of(UDPSocket)
   end
 
+  it "does not use the given block and warns to use UDPSocket::open" do
+    -> {
+      @socket = UDPSocket.new { raise }
+    }.should complain(/warning: UDPSocket::new\(\) does not take block; use UDPSocket::open\(\) instead/)
+  end
+
   it 'raises Errno::EAFNOSUPPORT or Errno::EPROTONOSUPPORT if unsupported family passed' do
     -> { UDPSocket.new(-1) }.should raise_error(SystemCallError) { |e|
       [Errno::EAFNOSUPPORT, Errno::EPROTONOSUPPORT].should include(e.class)
diff --git a/spec/ruby/library/socket/udpsocket/recvfrom_nonblock_spec.rb b/spec/ruby/library/socket/udpsocket/recvfrom_nonblock_spec.rb
index 650a061221b8c1..b8040995897c34 100644
--- a/spec/ruby/library/socket/udpsocket/recvfrom_nonblock_spec.rb
+++ b/spec/ruby/library/socket/udpsocket/recvfrom_nonblock_spec.rb
@@ -58,6 +58,15 @@
             buffer.should == 'h'
           end
 
+          it "preserves the encoding of the given buffer" do
+            buffer = ''.encode(Encoding::ISO_8859_1)
+            IO.select([@server])
+            message, = @server.recvfrom_nonblock(1, 0, buffer)
+
+            message.should.equal?(buffer)
+            buffer.encoding.should == Encoding::ISO_8859_1
+          end
+
           describe 'the returned Array' do
             before do
               IO.select([@server])
diff --git a/spec/ruby/library/socket/udpsocket/send_spec.rb b/spec/ruby/library/socket/udpsocket/send_spec.rb
index 5d5de684afb8c3..6dd5f67bea1fa0 100644
--- a/spec/ruby/library/socket/udpsocket/send_spec.rb
+++ b/spec/ruby/library/socket/udpsocket/send_spec.rb
@@ -63,7 +63,7 @@
     @msg[1][3].should == "127.0.0.1"
   end
 
-  it "raises EMSGSIZE if data is too too big" do
+  it "raises EMSGSIZE if data is too big" do
     @socket = UDPSocket.open
     begin
       -> do
diff --git a/spec/ruby/library/socket/unixserver/accept_nonblock_spec.rb b/spec/ruby/library/socket/unixserver/accept_nonblock_spec.rb
index 30688b46b6d6ad..dba3de7359d258 100644
--- a/spec/ruby/library/socket/unixserver/accept_nonblock_spec.rb
+++ b/spec/ruby/library/socket/unixserver/accept_nonblock_spec.rb
@@ -1,9 +1,8 @@
 require_relative '../spec_helper'
 require_relative '../fixtures/classes'
 
-describe "UNIXServer#accept_nonblock" do
-
-  platform_is_not :windows do
+with_feature :unix_socket do
+  describe "UNIXServer#accept_nonblock" do
     before :each do
       @path = SocketSpecs.socket_path
       @server = UNIXServer.open(@path)
@@ -33,9 +32,7 @@
       @server.accept_nonblock(exception: false).should == :wait_readable
     end
   end
-end
 
-with_feature :unix_socket do
   describe 'UNIXServer#accept_nonblock' do
     before do
       @path   = SocketSpecs.socket_path
diff --git a/spec/ruby/library/socket/unixserver/accept_spec.rb b/spec/ruby/library/socket/unixserver/accept_spec.rb
index c05fbe7f226392..1305bc6220d380 100644
--- a/spec/ruby/library/socket/unixserver/accept_spec.rb
+++ b/spec/ruby/library/socket/unixserver/accept_spec.rb
@@ -1,7 +1,7 @@
 require_relative '../spec_helper'
 require_relative '../fixtures/classes'
 
-platform_is_not :windows do
+with_feature :unix_socket do
   describe "UNIXServer#accept" do
     before :each do
       @path = SocketSpecs.socket_path
@@ -110,6 +110,17 @@
             @socket = @server.accept
             @socket.recv(5).should == 'hello'
           end
+
+          it "is set to nonblocking" do
+            require 'io/nonblock'
+            @socket = @server.accept
+            @socket.should.nonblock?
+          end
+
+          it "is set to close on exec" do
+            @socket = @server.accept
+            @socket.should.close_on_exec?
+          end
         end
       end
     end
diff --git a/spec/ruby/library/socket/unixserver/for_fd_spec.rb b/spec/ruby/library/socket/unixserver/for_fd_spec.rb
index 4f3816ad37b0e0..8cc55ef391cc98 100644
--- a/spec/ruby/library/socket/unixserver/for_fd_spec.rb
+++ b/spec/ruby/library/socket/unixserver/for_fd_spec.rb
@@ -1,8 +1,8 @@
 require_relative '../spec_helper'
 require_relative '../fixtures/classes'
 
-platform_is_not :windows do
-  describe "UNIXServer#for_fd" do
+with_feature :unix_socket do
+  describe "UNIXServer.for_fd" do
     before :each do
       @unix_path = SocketSpecs.socket_path
       @unix = UNIXServer.new(@unix_path)
diff --git a/spec/ruby/library/socket/unixserver/new_spec.rb b/spec/ruby/library/socket/unixserver/new_spec.rb
index f831f40bc6b4e5..a160e3ce5c8050 100644
--- a/spec/ruby/library/socket/unixserver/new_spec.rb
+++ b/spec/ruby/library/socket/unixserver/new_spec.rb
@@ -1,6 +1,14 @@
 require_relative '../spec_helper'
 require_relative 'shared/new'
 
-describe "UNIXServer.new" do
-  it_behaves_like :unixserver_new, :new
+with_feature :unix_socket do
+  describe "UNIXServer.new" do
+    it_behaves_like :unixserver_new, :new
+
+    it "does not use the given block and warns to use UNIXServer::open" do
+      -> {
+        @server = UNIXServer.new(@path) { raise }
+      }.should complain(/warning: UNIXServer::new\(\) does not take block; use UNIXServer::open\(\) instead/)
+    end
+  end
 end
diff --git a/spec/ruby/library/socket/unixserver/open_spec.rb b/spec/ruby/library/socket/unixserver/open_spec.rb
index f2506d9f6f0d13..16453dd3bd877f 100644
--- a/spec/ruby/library/socket/unixserver/open_spec.rb
+++ b/spec/ruby/library/socket/unixserver/open_spec.rb
@@ -2,10 +2,10 @@
 require_relative '../fixtures/classes'
 require_relative 'shared/new'
 
-describe "UNIXServer.open" do
-  it_behaves_like :unixserver_new, :open
+with_feature :unix_socket do
+  describe "UNIXServer.open" do
+    it_behaves_like :unixserver_new, :open
 
-  platform_is_not :windows do
     before :each do
       @path = SocketSpecs.socket_path
     end
diff --git a/spec/ruby/library/socket/unixserver/shared/new.rb b/spec/ruby/library/socket/unixserver/shared/new.rb
index 35395826c9cc17..b537f2a871349a 100644
--- a/spec/ruby/library/socket/unixserver/shared/new.rb
+++ b/spec/ruby/library/socket/unixserver/shared/new.rb
@@ -2,21 +2,19 @@
 require_relative '../../fixtures/classes'
 
 describe :unixserver_new, shared: true do
-  platform_is_not :windows do
-    before :each do
-      @path = SocketSpecs.socket_path
-    end
+  before :each do
+    @path = SocketSpecs.socket_path
+  end
 
-    after :each do
-      @server.close if @server
-      @server = nil
-      SocketSpecs.rm_socket @path
-    end
+  after :each do
+    @server.close if @server
+    @server = nil
+    SocketSpecs.rm_socket @path
+  end
 
-    it "creates a new UNIXServer" do
-      @server = UNIXServer.send(@method, @path)
-      @server.path.should == @path
-      @server.addr.should == ["AF_UNIX", @path]
-    end
+  it "creates a new UNIXServer" do
+    @server = UNIXServer.send(@method, @path)
+    @server.path.should == @path
+    @server.addr.should == ["AF_UNIX", @path]
   end
 end
diff --git a/spec/ruby/library/socket/unixsocket/addr_spec.rb b/spec/ruby/library/socket/unixsocket/addr_spec.rb
index e8431bea169c67..d93e06131236ea 100644
--- a/spec/ruby/library/socket/unixsocket/addr_spec.rb
+++ b/spec/ruby/library/socket/unixsocket/addr_spec.rb
@@ -1,9 +1,8 @@
 require_relative '../spec_helper'
 require_relative '../fixtures/classes'
 
-describe "UNIXSocket#addr" do
-
-  platform_is_not :windows do
+with_feature :unix_socket do
+  describe "UNIXSocket#addr" do
     before :each do
       @path = SocketSpecs.socket_path
       @server = UNIXServer.open(@path)
diff --git a/spec/ruby/library/socket/unixsocket/initialize_spec.rb b/spec/ruby/library/socket/unixsocket/initialize_spec.rb
index 13b6972f03130d..bf7896ab0eb590 100644
--- a/spec/ruby/library/socket/unixsocket/initialize_spec.rb
+++ b/spec/ruby/library/socket/unixsocket/initialize_spec.rb
@@ -33,6 +33,16 @@
       it 'sets the socket to binmode' do
         @socket.binmode?.should be_true
       end
+
+      it 'sets the socket to nonblock' do
+        require 'io/nonblock'
+        @socket.should.nonblock?
+      end
+
+      it 'sets the socket to close on exec' do
+        @socket.should.close_on_exec?
+      end
+
     end
   end
 end
diff --git a/spec/ruby/library/socket/unixsocket/inspect_spec.rb b/spec/ruby/library/socket/unixsocket/inspect_spec.rb
index d2e3cabbd36adf..a542ba6db540f1 100644
--- a/spec/ruby/library/socket/unixsocket/inspect_spec.rb
+++ b/spec/ruby/library/socket/unixsocket/inspect_spec.rb
@@ -1,8 +1,8 @@
 require_relative '../spec_helper'
 require_relative '../fixtures/classes'
 
-describe "UNIXSocket#inspect" do
-  platform_is_not :windows do
+with_feature :unix_socket do
+  describe "UNIXSocket#inspect" do
     it "returns sockets fd for unnamed sockets" do
       begin
         s1, s2 = UNIXSocket.socketpair
diff --git a/spec/ruby/library/socket/unixsocket/local_address_spec.rb b/spec/ruby/library/socket/unixsocket/local_address_spec.rb
index cbf315f9f41573..734253e7f5ccbd 100644
--- a/spec/ruby/library/socket/unixsocket/local_address_spec.rb
+++ b/spec/ruby/library/socket/unixsocket/local_address_spec.rb
@@ -46,9 +46,7 @@
       end
     end
   end
-end
 
-with_feature :unix_socket do
   describe 'UNIXSocket#local_address with a UNIX socket pair' do
     before :each do
       @sock, @sock2 = Socket.pair(Socket::AF_UNIX, Socket::SOCK_STREAM)
diff --git a/spec/ruby/library/socket/unixsocket/new_spec.rb b/spec/ruby/library/socket/unixsocket/new_spec.rb
index 05a6b3eda2e772..6d8ea6dcfe6c3a 100644
--- a/spec/ruby/library/socket/unixsocket/new_spec.rb
+++ b/spec/ruby/library/socket/unixsocket/new_spec.rb
@@ -1,6 +1,14 @@
 require_relative '../spec_helper'
 require_relative 'shared/new'
 
-describe "UNIXSocket.new" do
-  it_behaves_like :unixsocket_new, :new
+with_feature :unix_socket do
+  describe "UNIXSocket.new" do
+    it_behaves_like :unixsocket_new, :new
+
+    it "does not use the given block and warns to use UNIXSocket::open" do
+      -> {
+        @client = UNIXSocket.new(@path) { raise }
+      }.should complain(/warning: UNIXSocket::new\(\) does not take block; use UNIXSocket::open\(\) instead/)
+    end
+  end
 end
diff --git a/spec/ruby/library/socket/unixsocket/open_spec.rb b/spec/ruby/library/socket/unixsocket/open_spec.rb
index 99ad151bb83072..61def30abbb7ad 100644
--- a/spec/ruby/library/socket/unixsocket/open_spec.rb
+++ b/spec/ruby/library/socket/unixsocket/open_spec.rb
@@ -2,12 +2,12 @@
 require_relative '../fixtures/classes'
 require_relative 'shared/new'
 
-describe "UNIXSocket.open" do
-  it_behaves_like :unixsocket_new, :open
-end
+with_feature :unix_socket do
+  describe "UNIXSocket.open" do
+    it_behaves_like :unixsocket_new, :open
+  end
 
-describe "UNIXSocket.open" do
-  platform_is_not :windows do
+  describe "UNIXSocket.open" do
     before :each do
       @path = SocketSpecs.socket_path
       @server = UNIXServer.open(@path)
diff --git a/spec/ruby/library/socket/unixsocket/pair_spec.rb b/spec/ruby/library/socket/unixsocket/pair_spec.rb
index 0cdc55f998955a..b0a3b2af99da64 100644
--- a/spec/ruby/library/socket/unixsocket/pair_spec.rb
+++ b/spec/ruby/library/socket/unixsocket/pair_spec.rb
@@ -1,10 +1,11 @@
 require_relative '../spec_helper'
 require_relative '../fixtures/classes'
 require_relative '../shared/partially_closable_sockets'
+require_relative 'shared/pair'
 
-describe "UNIXSocket#pair" do
-  platform_is_not :windows do
-
+with_feature :unix_socket do
+  describe "UNIXSocket.pair" do
+    it_should_behave_like :unixsocket_pair
     it_should_behave_like :partially_closable_sockets
 
     before :each do
@@ -15,25 +16,5 @@
       @s1.close
       @s2.close
     end
-
-    it "returns a pair of connected sockets" do
-      @s1.puts "foo"
-      @s2.gets.should == "foo\n"
-    end
-
-    it "returns sockets with no name" do
-      @s1.path.should == @s2.path
-      @s1.path.should == ""
-    end
-
-    it "returns sockets with no address" do
-      @s1.addr.should == ["AF_UNIX", ""]
-      @s2.addr.should == ["AF_UNIX", ""]
-    end
-
-    it "returns sockets with no peeraddr" do
-      @s1.peeraddr.should == ["AF_UNIX", ""]
-      @s2.peeraddr.should == ["AF_UNIX", ""]
-    end
   end
 end
diff --git a/spec/ruby/library/socket/unixsocket/partially_closable_spec.rb b/spec/ruby/library/socket/unixsocket/partially_closable_spec.rb
index 4f6ef8abd92fa8..ef7d0f0b2aad5e 100644
--- a/spec/ruby/library/socket/unixsocket/partially_closable_spec.rb
+++ b/spec/ruby/library/socket/unixsocket/partially_closable_spec.rb
@@ -2,9 +2,8 @@
 require_relative '../fixtures/classes'
 require_relative '../shared/partially_closable_sockets'
 
-platform_is_not :windows do
+with_feature :unix_socket do
   describe "UNIXSocket partial closability" do
-
     before :each do
       @path = SocketSpecs.socket_path
       @server = UNIXServer.open(@path)
@@ -20,6 +19,5 @@
     end
 
     it_should_behave_like :partially_closable_sockets
-
   end
 end
diff --git a/spec/ruby/library/socket/unixsocket/path_spec.rb b/spec/ruby/library/socket/unixsocket/path_spec.rb
index 317ffc0975154f..a608378e4f97a6 100644
--- a/spec/ruby/library/socket/unixsocket/path_spec.rb
+++ b/spec/ruby/library/socket/unixsocket/path_spec.rb
@@ -1,9 +1,8 @@
 require_relative '../spec_helper'
 require_relative '../fixtures/classes'
 
-describe "UNIXSocket#path" do
-
-  platform_is_not :windows do
+with_feature :unix_socket do
+  describe "UNIXSocket#path" do
     before :each do
       @path = SocketSpecs.socket_path
       @server = UNIXServer.open(@path)
@@ -24,5 +23,4 @@
       @client.path.should == ""
     end
   end
-
 end
diff --git a/spec/ruby/library/socket/unixsocket/peeraddr_spec.rb b/spec/ruby/library/socket/unixsocket/peeraddr_spec.rb
index 0b6b1ccf045546..72bc96b1fe978f 100644
--- a/spec/ruby/library/socket/unixsocket/peeraddr_spec.rb
+++ b/spec/ruby/library/socket/unixsocket/peeraddr_spec.rb
@@ -1,9 +1,8 @@
 require_relative '../spec_helper'
 require_relative '../fixtures/classes'
 
-describe "UNIXSocket#peeraddr" do
-
-  platform_is_not :windows do
+with_feature :unix_socket do
+  describe "UNIXSocket#peeraddr" do
     before :each do
       @path = SocketSpecs.socket_path
       @server = UNIXServer.open(@path)
@@ -26,5 +25,4 @@
       }.should raise_error(Errno::ENOTCONN)
     end
   end
-
 end
diff --git a/spec/ruby/library/socket/unixsocket/recv_io_spec.rb b/spec/ruby/library/socket/unixsocket/recv_io_spec.rb
index 533f02a0fac6fd..1dbc4538e379e6 100644
--- a/spec/ruby/library/socket/unixsocket/recv_io_spec.rb
+++ b/spec/ruby/library/socket/unixsocket/recv_io_spec.rb
@@ -1,9 +1,8 @@
 require_relative '../spec_helper'
 require_relative '../fixtures/classes'
 
-describe "UNIXSocket#recv_io" do
-
-  platform_is_not :windows do
+with_feature :unix_socket do
+  describe "UNIXSocket#recv_io" do
     before :each do
       @path = SocketSpecs.socket_path
       @server = UNIXServer.open(@path)
@@ -41,9 +40,7 @@
       @io.should be_an_instance_of(File)
     end
   end
-end
 
-with_feature :unix_socket do
   describe 'UNIXSocket#recv_io' do
     before do
       @file = File.open('/dev/null', 'w')
diff --git a/spec/ruby/library/socket/unixsocket/recvfrom_spec.rb b/spec/ruby/library/socket/unixsocket/recvfrom_spec.rb
index c0e1cf670b66f9..d849fdc302646b 100644
--- a/spec/ruby/library/socket/unixsocket/recvfrom_spec.rb
+++ b/spec/ruby/library/socket/unixsocket/recvfrom_spec.rb
@@ -1,8 +1,8 @@
 require_relative '../spec_helper'
 require_relative '../fixtures/classes'
 
-describe "UNIXSocket#recvfrom" do
-  platform_is_not :windows do
+with_feature :unix_socket do
+  describe "UNIXSocket#recvfrom" do
     before :each do
       @path = SocketSpecs.socket_path
       @server = UNIXServer.open(@path)
@@ -31,6 +31,29 @@
       sock.close
     end
 
+    it "allows an output buffer as third argument" do
+      buffer = +''
+
+      @client.send("foobar", 0)
+      sock = @server.accept
+      message, = sock.recvfrom(6, 0, buffer)
+      sock.close
+
+      message.should.equal?(buffer)
+      buffer.should == "foobar"
+    end
+
+    it "preserves the encoding of the given buffer" do
+      buffer = ''.encode(Encoding::ISO_8859_1)
+
+      @client.send("foobar", 0)
+      sock = @server.accept
+      sock.recvfrom(6, 0, buffer)
+      sock.close
+
+      buffer.encoding.should == Encoding::ISO_8859_1
+    end
+
     it "uses different message options" do
       @client.send("foobar", Socket::MSG_PEEK)
       sock = @server.accept
@@ -42,10 +65,7 @@
       sock.close
     end
   end
-end
 
-
-with_feature :unix_socket do
   describe 'UNIXSocket#recvfrom' do
     describe 'using a socket pair' do
       before do
diff --git a/spec/ruby/library/socket/unixsocket/send_io_spec.rb b/spec/ruby/library/socket/unixsocket/send_io_spec.rb
index a2a7d265398ea1..80f3550c6d323e 100644
--- a/spec/ruby/library/socket/unixsocket/send_io_spec.rb
+++ b/spec/ruby/library/socket/unixsocket/send_io_spec.rb
@@ -1,9 +1,8 @@
 require_relative '../spec_helper'
 require_relative '../fixtures/classes'
 
-describe "UNIXSocket#send_io" do
-
-  platform_is_not :windows do
+with_feature :unix_socket do
+  describe "UNIXSocket#send_io" do
     before :each do
       @path = SocketSpecs.socket_path
       @server = UNIXServer.open(@path)
@@ -32,9 +31,7 @@
       @io.read.should == File.read(@send_io_path)
     end
   end
-end
 
-with_feature :unix_socket do
   describe 'UNIXSocket#send_io' do
     before do
       @file = File.open('/dev/null', 'w')
diff --git a/spec/ruby/library/socket/unixsocket/shared/new.rb b/spec/ruby/library/socket/unixsocket/shared/new.rb
index bfb7ed3886f5f6..f075b03c5e2d94 100644
--- a/spec/ruby/library/socket/unixsocket/shared/new.rb
+++ b/spec/ruby/library/socket/unixsocket/shared/new.rb
@@ -2,23 +2,21 @@
 require_relative '../../fixtures/classes'
 
 describe :unixsocket_new, shared: true do
-  platform_is_not :windows do
-    before :each do
-      @path = SocketSpecs.socket_path
-      @server = UNIXServer.open(@path)
-    end
+  before :each do
+    @path = SocketSpecs.socket_path
+    @server = UNIXServer.open(@path)
+  end
 
-    after :each do
-      @client.close if @client
-      @server.close
-      SocketSpecs.rm_socket @path
-    end
+  after :each do
+    @client.close if @client
+    @server.close
+    SocketSpecs.rm_socket @path
+  end
 
-    it "opens a unix socket on the specified file" do
-      @client = UNIXSocket.send(@method, @path)
+  it "opens a unix socket on the specified file" do
+    @client = UNIXSocket.send(@method, @path)
 
-      @client.addr[0].should == "AF_UNIX"
-      @client.should_not.closed?
-    end
+    @client.addr[0].should == "AF_UNIX"
+    @client.should_not.closed?
   end
 end
diff --git a/spec/ruby/library/socket/unixsocket/shared/pair.rb b/spec/ruby/library/socket/unixsocket/shared/pair.rb
new file mode 100644
index 00000000000000..ade7fc9852388d
--- /dev/null
+++ b/spec/ruby/library/socket/unixsocket/shared/pair.rb
@@ -0,0 +1,29 @@
+require_relative '../../spec_helper'
+require_relative '../../fixtures/classes'
+
+describe :unixsocket_pair, shared: true do
+  it "returns two UNIXSockets" do
+    @s1.should be_an_instance_of(UNIXSocket)
+    @s2.should be_an_instance_of(UNIXSocket)
+  end
+
+  it "returns a pair of connected sockets" do
+    @s1.puts "foo"
+    @s2.gets.should == "foo\n"
+  end
+
+  it "sets the socket paths to empty Strings" do
+    @s1.path.should == ""
+    @s2.path.should == ""
+  end
+
+  it "sets the socket addresses to empty Strings" do
+    @s1.addr.should == ["AF_UNIX", ""]
+    @s2.addr.should == ["AF_UNIX", ""]
+  end
+
+  it "sets the socket peer addresses to empty Strings" do
+    @s1.peeraddr.should == ["AF_UNIX", ""]
+    @s2.peeraddr.should == ["AF_UNIX", ""]
+  end
+end
diff --git a/spec/ruby/library/socket/unixsocket/socketpair_spec.rb b/spec/ruby/library/socket/unixsocket/socketpair_spec.rb
index 3e9646f76ba1e9..5f34008df3e942 100644
--- a/spec/ruby/library/socket/unixsocket/socketpair_spec.rb
+++ b/spec/ruby/library/socket/unixsocket/socketpair_spec.rb
@@ -1,40 +1,20 @@
 require_relative '../spec_helper'
+require_relative '../fixtures/classes'
+require_relative '../shared/partially_closable_sockets'
+require_relative 'shared/pair'
 
 with_feature :unix_socket do
-  describe 'UNIXSocket.socketpair' do
-    before do
+  describe "UNIXSocket.socketpair" do
+    it_should_behave_like :unixsocket_pair
+    it_should_behave_like :partially_closable_sockets
+
+    before :each do
       @s1, @s2 = UNIXSocket.socketpair
     end
 
-    after do
+    after :each do
       @s1.close
       @s2.close
     end
-
-    it 'returns two UNIXSockets' do
-      @s1.should be_an_instance_of(UNIXSocket)
-      @s2.should be_an_instance_of(UNIXSocket)
-    end
-
-    it 'connects the sockets to each other' do
-      @s1.write('hello')
-
-      @s2.recv(5).should == 'hello'
-    end
-
-    it 'sets the socket paths to empty Strings' do
-      @s1.path.should == ''
-      @s2.path.should == ''
-    end
-
-    it 'sets the socket addresses to empty Strings' do
-      @s1.addr.should == ['AF_UNIX', '']
-      @s2.addr.should == ['AF_UNIX', '']
-    end
-
-    it 'sets the socket peer addresses to empty Strings' do
-      @s1.peeraddr.should == ['AF_UNIX', '']
-      @s2.peeraddr.should == ['AF_UNIX', '']
-    end
   end
 end
diff --git a/spec/ruby/library/stringio/append_spec.rb b/spec/ruby/library/stringio/append_spec.rb
index 5383e3e795035b..cb50d73d1bf1b7 100644
--- a/spec/ruby/library/stringio/append_spec.rb
+++ b/spec/ruby/library/stringio/append_spec.rb
@@ -3,7 +3,7 @@
 
 describe "StringIO#<< when passed [Object]" do
   before :each do
-    @io = StringIO.new("example")
+    @io = StringIO.new(+"example")
   end
 
   it "returns self" do
@@ -44,10 +44,10 @@
 
 describe "StringIO#<< when self is not writable" do
   it "raises an IOError" do
-    io = StringIO.new("test", "r")
+    io = StringIO.new(+"test", "r")
     -> { io << "test" }.should raise_error(IOError)
 
-    io = StringIO.new("test")
+    io = StringIO.new(+"test")
     io.close_write
     -> { io << "test" }.should raise_error(IOError)
   end
@@ -55,7 +55,7 @@
 
 describe "StringIO#<< when in append mode" do
   before :each do
-    @io = StringIO.new("example", "a")
+    @io = StringIO.new(+"example", "a")
   end
 
   it "appends the passed argument to the end of self, ignoring current position" do
diff --git a/spec/ruby/library/stringio/binmode_spec.rb b/spec/ruby/library/stringio/binmode_spec.rb
index 853d9c9bd66542..9e92c63814e84a 100644
--- a/spec/ruby/library/stringio/binmode_spec.rb
+++ b/spec/ruby/library/stringio/binmode_spec.rb
@@ -3,7 +3,7 @@
 
 describe "StringIO#binmode" do
   it "returns self" do
-    io = StringIO.new("example")
+    io = StringIO.new(+"example")
     io.binmode.should equal(io)
   end
 
diff --git a/spec/ruby/library/stringio/close_read_spec.rb b/spec/ruby/library/stringio/close_read_spec.rb
index 80bd547e853a6f..0f08e1ff2e5958 100644
--- a/spec/ruby/library/stringio/close_read_spec.rb
+++ b/spec/ruby/library/stringio/close_read_spec.rb
@@ -3,7 +3,7 @@
 
 describe "StringIO#close_read" do
   before :each do
-    @io = StringIO.new("example")
+    @io = StringIO.new(+"example")
   end
 
   it "returns nil" do
@@ -21,7 +21,7 @@
   end
 
   it "raises an IOError when in write-only mode" do
-    io = StringIO.new("example", "w")
+    io = StringIO.new(+"example", "w")
     -> { io.close_read }.should raise_error(IOError)
 
     io = StringIO.new("example")
diff --git a/spec/ruby/library/stringio/close_write_spec.rb b/spec/ruby/library/stringio/close_write_spec.rb
index 1a4cfa113e0d85..c86c3f982622ed 100644
--- a/spec/ruby/library/stringio/close_write_spec.rb
+++ b/spec/ruby/library/stringio/close_write_spec.rb
@@ -3,7 +3,7 @@
 
 describe "StringIO#close_write" do
   before :each do
-    @io = StringIO.new("example")
+    @io = StringIO.new(+"example")
   end
 
   it "returns nil" do
@@ -21,10 +21,10 @@
   end
 
   it "raises an IOError when in read-only mode" do
-    io = StringIO.new("example", "r")
+    io = StringIO.new(+"example", "r")
     -> { io.close_write }.should raise_error(IOError)
 
-    io = StringIO.new("example")
+    io = StringIO.new(+"example")
     io.close_write
     io.close_write.should == nil
   end
diff --git a/spec/ruby/library/stringio/closed_read_spec.rb b/spec/ruby/library/stringio/closed_read_spec.rb
index cb4267ac9873c9..b4dcadc3a43e10 100644
--- a/spec/ruby/library/stringio/closed_read_spec.rb
+++ b/spec/ruby/library/stringio/closed_read_spec.rb
@@ -3,7 +3,7 @@
 
 describe "StringIO#closed_read?" do
   it "returns true if self is not readable" do
-    io = StringIO.new("example", "r+")
+    io = StringIO.new(+"example", "r+")
     io.close_write
     io.closed_read?.should be_false
     io.close_read
diff --git a/spec/ruby/library/stringio/closed_spec.rb b/spec/ruby/library/stringio/closed_spec.rb
index ca8a2232a89307..bf7ba63184e7cb 100644
--- a/spec/ruby/library/stringio/closed_spec.rb
+++ b/spec/ruby/library/stringio/closed_spec.rb
@@ -3,13 +3,13 @@
 
 describe "StringIO#closed?" do
   it "returns true if self is completely closed" do
-    io = StringIO.new("example", "r+")
+    io = StringIO.new(+"example", "r+")
     io.close_read
     io.closed?.should be_false
     io.close_write
     io.closed?.should be_true
 
-    io = StringIO.new("example", "r+")
+    io = StringIO.new(+"example", "r+")
     io.close
     io.closed?.should be_true
   end
diff --git a/spec/ruby/library/stringio/closed_write_spec.rb b/spec/ruby/library/stringio/closed_write_spec.rb
index 5c111affd85828..2bd3e6fa8b6a11 100644
--- a/spec/ruby/library/stringio/closed_write_spec.rb
+++ b/spec/ruby/library/stringio/closed_write_spec.rb
@@ -3,7 +3,7 @@
 
 describe "StringIO#closed_write?" do
   it "returns true if self is not writable" do
-    io = StringIO.new("example", "r+")
+    io = StringIO.new(+"example", "r+")
     io.close_read
     io.closed_write?.should be_false
     io.close_write
diff --git a/spec/ruby/library/stringio/each_line_spec.rb b/spec/ruby/library/stringio/each_line_spec.rb
index c68f7dae82898e..4ac0db7c45908f 100644
--- a/spec/ruby/library/stringio/each_line_spec.rb
+++ b/spec/ruby/library/stringio/each_line_spec.rb
@@ -21,3 +21,7 @@
 describe "StringIO#each_line when passed limit" do
   it_behaves_like :stringio_each_limit, :each_line
 end
+
+describe "StringIO#each when passed separator and limit" do
+  it_behaves_like :stringio_each_separator_and_limit, :each_line
+end
diff --git a/spec/ruby/library/stringio/each_spec.rb b/spec/ruby/library/stringio/each_spec.rb
index 2c30ed5cda38e3..7eb322f3ffd9c3 100644
--- a/spec/ruby/library/stringio/each_spec.rb
+++ b/spec/ruby/library/stringio/each_spec.rb
@@ -25,3 +25,7 @@
 describe "StringIO#each when passed limit" do
   it_behaves_like :stringio_each_limit, :each
 end
+
+describe "StringIO#each when passed separator and limit" do
+  it_behaves_like :stringio_each_separator_and_limit, :each
+end
diff --git a/spec/ruby/library/stringio/fileno_spec.rb b/spec/ruby/library/stringio/fileno_spec.rb
index eea03a5af3c40a..5a9f440a0fc6f8 100644
--- a/spec/ruby/library/stringio/fileno_spec.rb
+++ b/spec/ruby/library/stringio/fileno_spec.rb
@@ -1,6 +1,5 @@
 require_relative '../../spec_helper'
-require_relative 'fixtures/classes'
-require_relative 'shared/each'
+require 'stringio'
 
 describe "StringIO#fileno" do
   it "returns nil" do
diff --git a/spec/ruby/library/stringio/fixtures/classes.rb b/spec/ruby/library/stringio/fixtures/classes.rb
index bb8dc354cc44a4..832c5457d77178 100644
--- a/spec/ruby/library/stringio/fixtures/classes.rb
+++ b/spec/ruby/library/stringio/fixtures/classes.rb
@@ -4,12 +4,12 @@ class StringSubclass < String; end
 
 module StringIOSpecs
   def self.build
-  str = <<-EOS
+    str = <<-EOS
     each
     peach
     pear
     plum
-  EOS
+    EOS
     StringIO.new(str)
   end
 end
diff --git a/spec/ruby/library/stringio/flush_spec.rb b/spec/ruby/library/stringio/flush_spec.rb
index 17a16dfdd540aa..4dc58b1d486128 100644
--- a/spec/ruby/library/stringio/flush_spec.rb
+++ b/spec/ruby/library/stringio/flush_spec.rb
@@ -3,7 +3,7 @@
 
 describe "StringIO#flush" do
   it "returns self" do
-    io = StringIO.new("flush")
+    io = StringIO.new(+"flush")
     io.flush.should equal(io)
   end
 end
diff --git a/spec/ruby/library/stringio/fsync_spec.rb b/spec/ruby/library/stringio/fsync_spec.rb
index 8fb2b59a246831..85053cb2e5335a 100644
--- a/spec/ruby/library/stringio/fsync_spec.rb
+++ b/spec/ruby/library/stringio/fsync_spec.rb
@@ -3,7 +3,7 @@
 
 describe "StringIO#fsync" do
   it "returns zero" do
-    io = StringIO.new("fsync")
+    io = StringIO.new(+"fsync")
     io.fsync.should eql(0)
   end
 end
diff --git a/spec/ruby/library/stringio/gets_spec.rb b/spec/ruby/library/stringio/gets_spec.rb
index d597ec0e45ed83..ac876f0b4f3521 100644
--- a/spec/ruby/library/stringio/gets_spec.rb
+++ b/spec/ruby/library/stringio/gets_spec.rb
@@ -1,250 +1,61 @@
 require_relative '../../spec_helper'
 require "stringio"
+require_relative "shared/gets"
 
-describe "StringIO#gets when passed [separator]" do
-  before :each do
-    @io = StringIO.new("this>is>an>example")
-  end
-
-  it "returns the data read till the next occurrence of the passed separator" do
-    @io.gets(">").should == "this>"
-    @io.gets(">").should == "is>"
-    @io.gets(">").should == "an>"
-    @io.gets(">").should == "example"
-  end
-
-  it "sets $_ to the read content" do
-    @io.gets(">")
-    $_.should == "this>"
-    @io.gets(">")
-    $_.should == "is>"
-    @io.gets(">")
-    $_.should == "an>"
-    @io.gets(">")
-    $_.should == "example"
-    @io.gets(">")
-    $_.should be_nil
-  end
-
-  it "accepts string as separator" do
-    @io.gets("is>")
-    $_.should == "this>"
-    @io.gets("an>")
-    $_.should == "is>an>"
-    @io.gets("example")
-    $_.should == "example"
-    @io.gets("ple")
-    $_.should be_nil
-  end
-
-  it "updates self's lineno by one" do
-    @io.gets(">")
-    @io.lineno.should eql(1)
-
-    @io.gets(">")
-    @io.lineno.should eql(2)
-
-    @io.gets(">")
-    @io.lineno.should eql(3)
-  end
-
-  it "returns the next paragraph when the passed separator is an empty String" do
-    io = StringIO.new("this is\n\nan example")
-    io.gets("").should == "this is\n\n"
-    io.gets("").should == "an example"
-  end
-
-  it "returns the remaining content starting at the current position when passed nil" do
-    io = StringIO.new("this is\n\nan example")
-    io.pos = 5
-    io.gets(nil).should == "is\n\nan example"
-  end
+describe "StringIO#gets" do
+  describe "when passed [separator]" do
+    it_behaves_like :stringio_gets_separator, :gets
 
-  it "tries to convert the passed separator to a String using #to_str" do
-    obj = mock('to_str')
-    obj.should_receive(:to_str).and_return(">")
-    @io.gets(obj).should == "this>"
-  end
-end
-
-describe "StringIO#gets when passed no argument" do
-  before :each do
-    @io = StringIO.new("this is\nan example\nfor StringIO#gets")
-  end
+    it "returns nil if self is at the end" do
+      @io = StringIO.new("this>is>an>example")
 
-  it "returns the data read till the next occurrence of $/ or till eof" do
-    @io.gets.should == "this is\n"
-
-    begin
-      old_sep = $/
-      suppress_warning {$/ = " "}
-      @io.gets.should == "an "
-      @io.gets.should == "example\nfor "
-      @io.gets.should == "StringIO#gets"
-    ensure
-      suppress_warning {$/ = old_sep}
+      @io.pos = 36
+      @io.gets(">").should be_nil
+      @io.gets(">").should be_nil
     end
   end
 
-  it "sets $_ to the read content" do
-    @io.gets
-    $_.should == "this is\n"
-    @io.gets
-    $_.should == "an example\n"
-    @io.gets
-    $_.should == "for StringIO#gets"
-    @io.gets
-    $_.should be_nil
-  end
-
-  it "updates self's position" do
-    @io.gets
-    @io.pos.should eql(8)
-
-    @io.gets
-    @io.pos.should eql(19)
-
-    @io.gets
-    @io.pos.should eql(36)
-  end
-
-  it "updates self's lineno" do
-    @io.gets
-    @io.lineno.should eql(1)
-
-    @io.gets
-    @io.lineno.should eql(2)
-
-    @io.gets
-    @io.lineno.should eql(3)
-  end
-
-  it "returns nil if self is at the end" do
-    @io.pos = 36
-    @io.gets.should be_nil
-    @io.gets.should be_nil
-  end
-end
-
-describe "StringIO#gets when passed [limit]" do
-  before :each do
-    @io = StringIO.new("this>is>an>example")
-  end
-
-  it "returns the data read until the limit is met" do
-    @io.gets(4).should == "this"
-    @io.gets(3).should == ">is"
-    @io.gets(5).should == ">an>e"
-    @io.gets(6).should == "xample"
-  end
-
-  it "sets $_ to the read content" do
-    @io.gets(4)
-    $_.should == "this"
-    @io.gets(3)
-    $_.should == ">is"
-    @io.gets(5)
-    $_.should == ">an>e"
-    @io.gets(6)
-    $_.should == "xample"
-    @io.gets(3)
-    $_.should be_nil
-  end
-
-  it "updates self's lineno by one" do
-    @io.gets(3)
-    @io.lineno.should eql(1)
-
-    @io.gets(3)
-    @io.lineno.should eql(2)
-
-    @io.gets(3)
-    @io.lineno.should eql(3)
-  end
-
-  it "tries to convert the passed limit to an Integer using #to_int" do
-    obj = mock('to_int')
-    obj.should_receive(:to_int).and_return(4)
-    @io.gets(obj).should == "this"
-  end
-
-  it "returns a blank string when passed a limit of 0" do
-    @io.gets(0).should == ""
-  end
-
-  it "ignores it when passed a negative limit" do
-    @io.gets(-4).should == "this>is>an>example"
-  end
-end
+  describe "when passed [limit]" do
+    it_behaves_like :stringio_gets_limit, :gets
 
-describe "StringIO#gets when passed [separator] and [limit]" do
-  before :each do
-    @io = StringIO.new("this>is>an>example")
-  end
-
-  it "returns the data read until the limit is consumed or the separator is met" do
-    @io.gets('>', 8).should == "this>"
-    @io.gets('>', 2).should == "is"
-    @io.gets('>', 10).should == ">"
-    @io.gets('>', 6).should == "an>"
-    @io.gets('>', 5).should == "examp"
-  end
+    it "returns nil if self is at the end" do
+      @io = StringIO.new("this>is>an>example")
 
-  it "sets $_ to the read content" do
-    @io.gets('>', 8)
-    $_.should == "this>"
-    @io.gets('>', 2)
-    $_.should == "is"
-    @io.gets('>', 10)
-    $_.should == ">"
-    @io.gets('>', 6)
-    $_.should == "an>"
-    @io.gets('>', 5)
-    $_.should == "examp"
+      @io.pos = 36
+      @io.gets(3).should be_nil
+      @io.gets(3).should be_nil
+    end
   end
 
-  it "updates self's lineno by one" do
-    @io.gets('>', 3)
-    @io.lineno.should eql(1)
+  describe "when passed [separator] and [limit]" do
+    it_behaves_like :stringio_gets_separator_and_limit, :gets
 
-    @io.gets('>', 3)
-    @io.lineno.should eql(2)
+    it "returns nil if self is at the end" do
+      @io = StringIO.new("this>is>an>example")
 
-    @io.gets('>', 3)
-    @io.lineno.should eql(3)
+      @io.pos = 36
+      @io.gets(">", 3).should be_nil
+      @io.gets(">", 3).should be_nil
+    end
   end
 
-  it "tries to convert the passed separator to a String using #to_str" do
-    obj = mock('to_str')
-    obj.should_receive(:to_str).and_return('>')
-    @io.gets(obj, 5).should == "this>"
-  end
+  describe "when passed no argument" do
+    it_behaves_like :stringio_gets_no_argument, :gets
 
-  it "does not raise TypeError if passed separator is nil" do
-    @io.gets(nil, 5).should == "this>"
-  end
+    it "returns nil if self is at the end" do
+      @io = StringIO.new("this>is>an>example")
 
-  it "tries to convert the passed limit to an Integer using #to_int" do
-    obj = mock('to_int')
-    obj.should_receive(:to_int).and_return(5)
-    @io.gets('>', obj).should == "this>"
+      @io.pos = 36
+      @io.gets.should be_nil
+      @io.gets.should be_nil
+    end
   end
-end
-
-describe "StringIO#gets when in write-only mode" do
-  it "raises an IOError" do
-    io = StringIO.new("xyz", "w")
-    -> { io.gets }.should raise_error(IOError)
 
-    io = StringIO.new("xyz")
-    io.close_read
-    -> { io.gets }.should raise_error(IOError)
+  describe "when passed [chomp]" do
+    it_behaves_like :stringio_gets_chomp, :gets
   end
-end
 
-describe "StringIO#gets when passed [chomp]" do
-  it "returns the data read without a trailing newline character" do
-    io = StringIO.new("this>is>an>example\n")
-    io.gets(chomp: true).should == "this>is>an>example"
+  describe "when in write-only mode" do
+    it_behaves_like :stringio_gets_write_only, :gets
   end
 end
diff --git a/spec/ruby/library/stringio/initialize_spec.rb b/spec/ruby/library/stringio/initialize_spec.rb
index 158c08488b215f..6f4d2e456c2f70 100644
--- a/spec/ruby/library/stringio/initialize_spec.rb
+++ b/spec/ruby/library/stringio/initialize_spec.rb
@@ -13,99 +13,99 @@
 
   it "sets the mode based on the passed mode" do
     io = StringIO.allocate
-    io.send(:initialize, "example", "r")
+    io.send(:initialize, +"example", "r")
     io.closed_read?.should be_false
     io.closed_write?.should be_true
 
     io = StringIO.allocate
-    io.send(:initialize, "example", "rb")
+    io.send(:initialize, +"example", "rb")
     io.closed_read?.should be_false
     io.closed_write?.should be_true
 
     io = StringIO.allocate
-    io.send(:initialize, "example", "r+")
+    io.send(:initialize, +"example", "r+")
     io.closed_read?.should be_false
     io.closed_write?.should be_false
 
     io = StringIO.allocate
-    io.send(:initialize, "example", "rb+")
+    io.send(:initialize, +"example", "rb+")
     io.closed_read?.should be_false
     io.closed_write?.should be_false
 
     io = StringIO.allocate
-    io.send(:initialize, "example", "w")
+    io.send(:initialize, +"example", "w")
     io.closed_read?.should be_true
     io.closed_write?.should be_false
 
     io = StringIO.allocate
-    io.send(:initialize, "example", "wb")
+    io.send(:initialize, +"example", "wb")
     io.closed_read?.should be_true
     io.closed_write?.should be_false
 
     io = StringIO.allocate
-    io.send(:initialize, "example", "w+")
+    io.send(:initialize, +"example", "w+")
     io.closed_read?.should be_false
     io.closed_write?.should be_false
 
     io = StringIO.allocate
-    io.send(:initialize, "example", "wb+")
+    io.send(:initialize, +"example", "wb+")
     io.closed_read?.should be_false
     io.closed_write?.should be_false
 
     io = StringIO.allocate
-    io.send(:initialize, "example", "a")
+    io.send(:initialize, +"example", "a")
     io.closed_read?.should be_true
     io.closed_write?.should be_false
 
     io = StringIO.allocate
-    io.send(:initialize, "example", "ab")
+    io.send(:initialize, +"example", "ab")
     io.closed_read?.should be_true
     io.closed_write?.should be_false
 
     io = StringIO.allocate
-    io.send(:initialize, "example", "a+")
+    io.send(:initialize, +"example", "a+")
     io.closed_read?.should be_false
     io.closed_write?.should be_false
 
     io = StringIO.allocate
-    io.send(:initialize, "example", "ab+")
+    io.send(:initialize, +"example", "ab+")
     io.closed_read?.should be_false
     io.closed_write?.should be_false
   end
 
   it "allows passing the mode as an Integer" do
     io = StringIO.allocate
-    io.send(:initialize, "example", IO::RDONLY)
+    io.send(:initialize, +"example", IO::RDONLY)
     io.closed_read?.should be_false
     io.closed_write?.should be_true
 
     io = StringIO.allocate
-    io.send(:initialize, "example", IO::RDWR)
+    io.send(:initialize, +"example", IO::RDWR)
     io.closed_read?.should be_false
     io.closed_write?.should be_false
 
     io = StringIO.allocate
-    io.send(:initialize, "example", IO::WRONLY)
+    io.send(:initialize, +"example", IO::WRONLY)
     io.closed_read?.should be_true
     io.closed_write?.should be_false
 
     io = StringIO.allocate
-    io.send(:initialize, "example", IO::WRONLY | IO::TRUNC)
+    io.send(:initialize, +"example", IO::WRONLY | IO::TRUNC)
     io.closed_read?.should be_true
     io.closed_write?.should be_false
 
     io = StringIO.allocate
-    io.send(:initialize, "example", IO::RDWR | IO::TRUNC)
+    io.send(:initialize, +"example", IO::RDWR | IO::TRUNC)
     io.closed_read?.should be_false
     io.closed_write?.should be_false
 
     io = StringIO.allocate
-    io.send(:initialize, "example", IO::WRONLY | IO::APPEND)
+    io.send(:initialize, +"example", IO::WRONLY | IO::APPEND)
     io.closed_read?.should be_true
     io.closed_write?.should be_false
 
     io = StringIO.allocate
-    io.send(:initialize, "example", IO::RDWR | IO::APPEND)
+    io.send(:initialize, +"example", IO::RDWR | IO::APPEND)
     io.closed_read?.should be_false
     io.closed_write?.should be_false
   end
@@ -118,7 +118,7 @@
   it "tries to convert the passed mode to a String using #to_str" do
     obj = mock('to_str')
     obj.should_receive(:to_str).and_return("r")
-    @io.send(:initialize, "example", obj)
+    @io.send(:initialize, +"example", obj)
 
     @io.closed_read?.should be_false
     @io.closed_write?.should be_true
@@ -130,6 +130,26 @@
     -> { @io.send(:initialize, str, "w") }.should raise_error(Errno::EACCES)
     -> { @io.send(:initialize, str, "a") }.should raise_error(Errno::EACCES)
   end
+
+  it "truncates all the content if passed w mode" do
+    io = StringIO.allocate
+    source = +"example".encode(Encoding::ISO_8859_1);
+
+    io.send(:initialize, source, "w")
+
+    io.string.should.empty?
+    io.string.encoding.should == Encoding::ISO_8859_1
+  end
+
+  it "truncates all the content if passed IO::TRUNC mode" do
+    io = StringIO.allocate
+    source = +"example".encode(Encoding::ISO_8859_1);
+
+    io.send(:initialize, source, IO::TRUNC)
+
+    io.string.should.empty?
+    io.string.encoding.should == Encoding::ISO_8859_1
+  end
 end
 
 describe "StringIO#initialize when passed [Object]" do
@@ -142,12 +162,18 @@
     @io.string.should equal(str)
   end
 
-  it "sets the mode to read-write" do
-    @io.send(:initialize, "example")
+  it "sets the mode to read-write if the string is mutable" do
+    @io.send(:initialize, +"example")
     @io.closed_read?.should be_false
     @io.closed_write?.should be_false
   end
 
+  it "sets the mode to read if the string is frozen" do
+    @io.send(:initialize, -"example")
+    @io.closed_read?.should be_false
+    @io.closed_write?.should be_true
+  end
+
   it "tries to convert the passed Object to a String using #to_str" do
     obj = mock('to_str')
     obj.should_receive(:to_str).and_return("example")
@@ -166,28 +192,28 @@
 # NOTE: Synchronise with core/io/new_spec.rb (core/io/shared/new.rb)
 describe "StringIO#initialize when passed keyword arguments" do
   it "sets the mode based on the passed :mode option" do
-    io = StringIO.new("example", "r")
+    io = StringIO.new("example", mode: "r")
     io.closed_read?.should be_false
     io.closed_write?.should be_true
   end
 
   it "accepts a mode argument set to nil with a valid :mode option" do
-    @io = StringIO.new('', nil, mode: "w")
+    @io = StringIO.new(+'', nil, mode: "w")
     @io.write("foo").should == 3
   end
 
   it "accepts a mode argument with a :mode option set to nil" do
-    @io = StringIO.new('', "w", mode: nil)
+    @io = StringIO.new(+'', "w", mode: nil)
     @io.write("foo").should == 3
   end
 
   it "sets binmode from :binmode option" do
-    @io = StringIO.new('', 'w', binmode: true)
+    @io = StringIO.new(+'', 'w', binmode: true)
     @io.external_encoding.to_s.should == "ASCII-8BIT" # #binmode? isn't implemented in StringIO
   end
 
   it "does not set binmode from false :binmode" do
-    @io = StringIO.new('', 'w', binmode: false)
+    @io = StringIO.new(+'', 'w', binmode: false)
     @io.external_encoding.to_s.should == "UTF-8" # #binmode? isn't implemented in StringIO
   end
 end
@@ -196,54 +222,54 @@
 describe "StringIO#initialize when passed keyword arguments and error happens" do
   it "raises an error if passed encodings two ways" do
     -> {
-      @io = StringIO.new('', 'w:ISO-8859-1', encoding: 'ISO-8859-1')
+      @io = StringIO.new(+'', 'w:ISO-8859-1', encoding: 'ISO-8859-1')
     }.should raise_error(ArgumentError)
     -> {
-      @io = StringIO.new('', 'w:ISO-8859-1', external_encoding: 'ISO-8859-1')
+      @io = StringIO.new(+'', 'w:ISO-8859-1', external_encoding: 'ISO-8859-1')
     }.should raise_error(ArgumentError)
     -> {
-      @io = StringIO.new('', 'w:ISO-8859-1:UTF-8', internal_encoding: 'ISO-8859-1')
+      @io = StringIO.new(+'', 'w:ISO-8859-1:UTF-8', internal_encoding: 'ISO-8859-1')
     }.should raise_error(ArgumentError)
   end
 
   it "raises an error if passed matching binary/text mode two ways" do
     -> {
-      @io = StringIO.new('', "wb", binmode: true)
+      @io = StringIO.new(+'', "wb", binmode: true)
     }.should raise_error(ArgumentError)
     -> {
-      @io = StringIO.new('', "wt", textmode: true)
+      @io = StringIO.new(+'', "wt", textmode: true)
     }.should raise_error(ArgumentError)
 
     -> {
-      @io = StringIO.new('', "wb", textmode: false)
+      @io = StringIO.new(+'', "wb", textmode: false)
     }.should raise_error(ArgumentError)
     -> {
-      @io = StringIO.new('', "wt", binmode: false)
+      @io = StringIO.new(+'', "wt", binmode: false)
     }.should raise_error(ArgumentError)
   end
 
   it "raises an error if passed conflicting binary/text mode two ways" do
     -> {
-      @io = StringIO.new('', "wb", binmode: false)
+      @io = StringIO.new(+'', "wb", binmode: false)
     }.should raise_error(ArgumentError)
     -> {
-      @io = StringIO.new('', "wt", textmode: false)
+      @io = StringIO.new(+'', "wt", textmode: false)
     }.should raise_error(ArgumentError)
 
     -> {
-      @io = StringIO.new('', "wb", textmode: true)
+      @io = StringIO.new(+'', "wb", textmode: true)
     }.should raise_error(ArgumentError)
     -> {
-      @io = StringIO.new('', "wt", binmode: true)
+      @io = StringIO.new(+'', "wt", binmode: true)
     }.should raise_error(ArgumentError)
   end
 
   it "raises an error when trying to set both binmode and textmode" do
     -> {
-      @io = StringIO.new('', "w", textmode: true, binmode: true)
+      @io = StringIO.new(+'', "w", textmode: true, binmode: true)
     }.should raise_error(ArgumentError)
     -> {
-      @io = StringIO.new('', File::Constants::WRONLY, textmode: true, binmode: true)
+      @io = StringIO.new(+'', File::Constants::WRONLY, textmode: true, binmode: true)
     }.should raise_error(ArgumentError)
   end
 end
@@ -258,7 +284,7 @@
   end
 
   it "sets the mode to read-write" do
-    @io.send(:initialize, "example")
+    @io.send(:initialize)
     @io.closed_read?.should be_false
     @io.closed_write?.should be_false
   end
@@ -289,13 +315,13 @@
   end
 
   it "the encoding to the encoding of the String when passed a String" do
-    s = ''.force_encoding(Encoding::EUC_JP)
+    s = ''.dup.force_encoding(Encoding::EUC_JP)
     io = StringIO.new(s)
     io.string.encoding.should == Encoding::EUC_JP
   end
 
   it "the #external_encoding to the encoding of the String when passed a String" do
-    s = ''.force_encoding(Encoding::EUC_JP)
+    s = ''.dup.force_encoding(Encoding::EUC_JP)
     io = StringIO.new(s)
     io.external_encoding.should == Encoding::EUC_JP
   end
diff --git a/spec/ruby/library/stringio/new_spec.rb b/spec/ruby/library/stringio/new_spec.rb
index 328455134eb308..ec4b32aa11264b 100644
--- a/spec/ruby/library/stringio/new_spec.rb
+++ b/spec/ruby/library/stringio/new_spec.rb
@@ -2,7 +2,9 @@
 require 'stringio'
 
 describe "StringIO.new" do
-  it "warns when called with a block" do
-    -> { eval("StringIO.new {}") }.should complain(/StringIO::new\(\) does not take block; use StringIO::open\(\) instead/)
+  it "does not use the given block and warns to use StringIO::open" do
+    -> {
+      StringIO.new { raise }
+    }.should complain(/warning: StringIO::new\(\) does not take block; use StringIO::open\(\) instead/)
   end
 end
diff --git a/spec/ruby/library/stringio/open_spec.rb b/spec/ruby/library/stringio/open_spec.rb
index 3068e19435903a..b7c90661f992a3 100644
--- a/spec/ruby/library/stringio/open_spec.rb
+++ b/spec/ruby/library/stringio/open_spec.rb
@@ -8,26 +8,26 @@
   end
 
   it "returns the blocks return value when yielding" do
-    ret = StringIO.open("example", "r") { :test }
+    ret = StringIO.open(+"example", "r") { :test }
     ret.should equal(:test)
   end
 
   it "yields self to the passed block" do
     io = nil
-    StringIO.open("example", "r") { |strio| io = strio }
+    StringIO.open(+"example", "r") { |strio| io = strio }
     io.should be_kind_of(StringIO)
   end
 
   it "closes self after yielding" do
     io = nil
-    StringIO.open("example", "r") { |strio| io = strio }
+    StringIO.open(+"example", "r") { |strio| io = strio }
     io.closed?.should be_true
   end
 
   it "even closes self when an exception is raised while yielding" do
     io = nil
     begin
-      StringIO.open("example", "r") do |strio|
+      StringIO.open(+"example", "r") do |strio|
         io = strio
         raise "Error"
       end
@@ -38,14 +38,14 @@
 
   it "sets self's string to nil after yielding" do
     io = nil
-    StringIO.open("example", "r") { |strio| io = strio }
+    StringIO.open(+"example", "r") { |strio| io = strio }
     io.string.should be_nil
   end
 
   it "even sets self's string to nil when an exception is raised while yielding" do
     io = nil
     begin
-      StringIO.open("example", "r") do |strio|
+      StringIO.open(+"example", "r") do |strio|
         io = strio
         raise "Error"
       end
@@ -55,81 +55,81 @@
   end
 
   it "sets the mode based on the passed mode" do
-    io = StringIO.open("example", "r")
+    io = StringIO.open(+"example", "r")
     io.closed_read?.should be_false
     io.closed_write?.should be_true
 
-    io = StringIO.open("example", "rb")
+    io = StringIO.open(+"example", "rb")
     io.closed_read?.should be_false
     io.closed_write?.should be_true
 
-    io = StringIO.open("example", "r+")
+    io = StringIO.open(+"example", "r+")
     io.closed_read?.should be_false
     io.closed_write?.should be_false
 
-    io = StringIO.open("example", "rb+")
+    io = StringIO.open(+"example", "rb+")
     io.closed_read?.should be_false
     io.closed_write?.should be_false
 
-    io = StringIO.open("example", "w")
+    io = StringIO.open(+"example", "w")
     io.closed_read?.should be_true
     io.closed_write?.should be_false
 
-    io = StringIO.open("example", "wb")
+    io = StringIO.open(+"example", "wb")
     io.closed_read?.should be_true
     io.closed_write?.should be_false
 
-    io = StringIO.open("example", "w+")
+    io = StringIO.open(+"example", "w+")
     io.closed_read?.should be_false
     io.closed_write?.should be_false
 
-    io = StringIO.open("example", "wb+")
+    io = StringIO.open(+"example", "wb+")
     io.closed_read?.should be_false
     io.closed_write?.should be_false
 
-    io = StringIO.open("example", "a")
+    io = StringIO.open(+"example", "a")
     io.closed_read?.should be_true
     io.closed_write?.should be_false
 
-    io = StringIO.open("example", "ab")
+    io = StringIO.open(+"example", "ab")
     io.closed_read?.should be_true
     io.closed_write?.should be_false
 
-    io = StringIO.open("example", "a+")
+    io = StringIO.open(+"example", "a+")
     io.closed_read?.should be_false
     io.closed_write?.should be_false
 
-    io = StringIO.open("example", "ab+")
+    io = StringIO.open(+"example", "ab+")
     io.closed_read?.should be_false
     io.closed_write?.should be_false
   end
 
   it "allows passing the mode as an Integer" do
-    io = StringIO.open("example", IO::RDONLY)
+    io = StringIO.open(+"example", IO::RDONLY)
     io.closed_read?.should be_false
     io.closed_write?.should be_true
 
-    io = StringIO.open("example", IO::RDWR)
+    io = StringIO.open(+"example", IO::RDWR)
     io.closed_read?.should be_false
     io.closed_write?.should be_false
 
-    io = StringIO.open("example", IO::WRONLY)
+    io = StringIO.open(+"example", IO::WRONLY)
     io.closed_read?.should be_true
     io.closed_write?.should be_false
 
-    io = StringIO.open("example", IO::WRONLY | IO::TRUNC)
+    io = StringIO.open(+"example", IO::WRONLY | IO::TRUNC)
     io.closed_read?.should be_true
     io.closed_write?.should be_false
 
-    io = StringIO.open("example", IO::RDWR | IO::TRUNC)
+    io = StringIO.open(+"example", IO::RDWR | IO::TRUNC)
     io.closed_read?.should be_false
     io.closed_write?.should be_false
 
-    io = StringIO.open("example", IO::WRONLY | IO::APPEND)
+    io = StringIO.open(+"example", IO::WRONLY | IO::APPEND)
     io.closed_read?.should be_true
     io.closed_write?.should be_false
 
-    io = StringIO.open("example", IO::RDWR | IO::APPEND)
+    io = StringIO.open(+"example", IO::RDWR | IO::APPEND)
     io.closed_read?.should be_false
     io.closed_write?.should be_false
   end
@@ -141,7 +141,7 @@
   it "tries to convert the passed mode to a String using #to_str" do
     obj = mock('to_str')
     obj.should_receive(:to_str).and_return("r")
-    io = StringIO.open("example", obj)
+    io = StringIO.open(+"example", obj)
 
     io.closed_read?.should be_false
     io.closed_write?.should be_true
@@ -163,16 +163,16 @@
 
   it "yields self to the passed block" do
     io = nil
-    ret = StringIO.open("example") { |strio| io = strio }
+    ret = StringIO.open(+"example") { |strio| io = strio }
     io.should equal(ret)
   end
 
   it "sets the mode to read-write (r+)" do
-    io = StringIO.open("example")
+    io = StringIO.open(+"example")
     io.closed_read?.should be_false
     io.closed_write?.should be_false
 
-    io = StringIO.new("example")
+    io = StringIO.new(+"example")
     io.printf("%d", 123)
     io.string.should == "123mple"
   end
@@ -204,7 +204,7 @@
     io.closed_read?.should be_false
     io.closed_write?.should be_false
 
-    io = StringIO.new("example")
+    io = StringIO.new(+"example")
     io.printf("%d", 123)
     io.string.should == "123mple"
   end
diff --git a/spec/ruby/library/stringio/print_spec.rb b/spec/ruby/library/stringio/print_spec.rb
index 6ac64309002902..00c33367dc695e 100644
--- a/spec/ruby/library/stringio/print_spec.rb
+++ b/spec/ruby/library/stringio/print_spec.rb
@@ -3,7 +3,7 @@
 
 describe "StringIO#print" do
   before :each do
-    @io = StringIO.new('example')
+    @io = StringIO.new(+'example')
   end
 
   it "prints $_ when passed no arguments" do
@@ -73,7 +73,7 @@
 
 describe "StringIO#print when in append mode" do
   before :each do
-    @io = StringIO.new("example", "a")
+    @io = StringIO.new(+"example", "a")
   end
 
   it "appends the passed argument to the end of self" do
@@ -92,10 +92,10 @@
 
 describe "StringIO#print when self is not writable" do
   it "raises an IOError" do
-    io = StringIO.new("test", "r")
+    io = StringIO.new(+"test", "r")
     -> { io.print("test") }.should raise_error(IOError)
 
-    io = StringIO.new("test")
+    io = StringIO.new(+"test")
     io.close_write
     -> { io.print("test") }.should raise_error(IOError)
   end
diff --git a/spec/ruby/library/stringio/printf_spec.rb b/spec/ruby/library/stringio/printf_spec.rb
index f3f669a1855266..ca82e847575e1d 100644
--- a/spec/ruby/library/stringio/printf_spec.rb
+++ b/spec/ruby/library/stringio/printf_spec.rb
@@ -41,7 +41,7 @@
 
 describe "StringIO#printf when in read-write mode" do
   before :each do
-    @io = StringIO.new("example", "r+")
+    @io = StringIO.new(+"example", "r+")
   end
 
   it "starts from the beginning" do
@@ -62,7 +62,7 @@
 
 describe "StringIO#printf when in append mode" do
   before :each do
-    @io = StringIO.new("example", "a")
+    @io = StringIO.new(+"example", "a")
   end
 
   it "appends the passed argument to the end of self" do
@@ -81,10 +81,10 @@
 
 describe "StringIO#printf when self is not writable" do
   it "raises an IOError" do
-    io = StringIO.new("test", "r")
+    io = StringIO.new(+"test", "r")
     -> { io.printf("test") }.should raise_error(IOError)
 
-    io = StringIO.new("test")
+    io = StringIO.new(+"test")
     io.close_write
     -> { io.printf("test") }.should raise_error(IOError)
   end
diff --git a/spec/ruby/library/stringio/putc_spec.rb b/spec/ruby/library/stringio/putc_spec.rb
index 1ce53b7ef20ed4..9f1ac8ffb2b50e 100644
--- a/spec/ruby/library/stringio/putc_spec.rb
+++ b/spec/ruby/library/stringio/putc_spec.rb
@@ -3,7 +3,7 @@
 
 describe "StringIO#putc when passed [String]" do
   before :each do
-    @io = StringIO.new('example')
+    @io = StringIO.new(+'example')
   end
 
   it "overwrites the character at the current position" do
@@ -54,7 +54,7 @@
 
 describe "StringIO#putc when passed [Object]" do
   before :each do
-    @io = StringIO.new('example')
+    @io = StringIO.new(+'example')
   end
 
   it "it writes the passed Integer % 256 to self" do
@@ -85,7 +85,7 @@
 
 describe "StringIO#putc when in append mode" do
   it "appends to the end of self" do
-    io = StringIO.new("test", "a")
+    io = StringIO.new(+"test", "a")
     io.putc(?t)
     io.string.should == "testt"
   end
@@ -93,10 +93,10 @@
 
 describe "StringIO#putc when self is not writable" do
   it "raises an IOError" do
-    io = StringIO.new("test", "r")
+    io = StringIO.new(+"test", "r")
     -> { io.putc(?a) }.should raise_error(IOError)
 
-    io = StringIO.new("test")
+    io = StringIO.new(+"test")
     io.close_write
     -> { io.putc("t") }.should raise_error(IOError)
   end
diff --git a/spec/ruby/library/stringio/puts_spec.rb b/spec/ruby/library/stringio/puts_spec.rb
index 9c890262dd996f..054ec8227f5563 100644
--- a/spec/ruby/library/stringio/puts_spec.rb
+++ b/spec/ruby/library/stringio/puts_spec.rb
@@ -145,7 +145,7 @@
 
 describe "StringIO#puts when in append mode" do
   before :each do
-    @io = StringIO.new("example", "a")
+    @io = StringIO.new(+"example", "a")
   end
 
   it "appends the passed argument to the end of self" do
@@ -164,10 +164,10 @@
 
 describe "StringIO#puts when self is not writable" do
   it "raises an IOError" do
-    io = StringIO.new("test", "r")
+    io = StringIO.new(+"test", "r")
     -> { io.puts }.should raise_error(IOError)
 
-    io = StringIO.new("test")
+    io = StringIO.new(+"test")
     io.close_write
     -> { io.puts }.should raise_error(IOError)
   end
@@ -175,7 +175,7 @@
 
 describe "StringIO#puts when passed an encoded string" do
   it "stores the bytes unmodified" do
-    io = StringIO.new("")
+    io = StringIO.new(+"")
     io.puts "\x00\x01\x02"
     io.puts "æåø"
 
diff --git a/spec/ruby/library/stringio/read_nonblock_spec.rb b/spec/ruby/library/stringio/read_nonblock_spec.rb
index d4ec56d9aadafa..74736f7792dc86 100644
--- a/spec/ruby/library/stringio/read_nonblock_spec.rb
+++ b/spec/ruby/library/stringio/read_nonblock_spec.rb
@@ -8,7 +8,7 @@
 
   it "accepts :exception option" do
     io = StringIO.new("example")
-    io.read_nonblock(3, buffer = "", exception: true)
+    io.read_nonblock(3, buffer = +"", exception: true)
     buffer.should == "exa"
   end
 end
@@ -40,7 +40,7 @@
   context "when exception option is set to false" do
     context "when the end is reached" do
       it "returns nil" do
-        stringio = StringIO.new('')
+        stringio = StringIO.new(+'')
         stringio << "hello"
         stringio.rewind
 
diff --git a/spec/ruby/library/stringio/read_spec.rb b/spec/ruby/library/stringio/read_spec.rb
index 52ab3dcf470f5e..e49f26212719f2 100644
--- a/spec/ruby/library/stringio/read_spec.rb
+++ b/spec/ruby/library/stringio/read_spec.rb
@@ -53,7 +53,7 @@
   end
 
   it "reads [length] characters into the buffer" do
-    buf = "foo"
+    buf = +"foo"
     result = @io.read(10, buf)
 
     buf.should == "abcdefghij"
diff --git a/spec/ruby/library/stringio/readline_spec.rb b/spec/ruby/library/stringio/readline_spec.rb
index b794e5fade5f57..085360707f8634 100644
--- a/spec/ruby/library/stringio/readline_spec.rb
+++ b/spec/ruby/library/stringio/readline_spec.rb
@@ -1,150 +1,58 @@
 require_relative '../../spec_helper'
+require "stringio"
 require_relative 'fixtures/classes'
+require_relative "shared/gets"
 
+describe "StringIO#readline" do
+  describe "when passed [separator]" do
+    it_behaves_like :stringio_gets_separator, :readline
 
-describe "StringIO#readline when passed [separator]" do
-  before :each do
-    @io = StringIO.new("this>is>an>example")
-  end
-
-  it "returns the data read till the next occurrence of the passed separator" do
-    @io.readline(">").should == "this>"
-    @io.readline(">").should == "is>"
-    @io.readline(">").should == "an>"
-    @io.readline(">").should == "example"
-  end
-
-  it "sets $_ to the read content" do
-    @io.readline(">")
-    $_.should == "this>"
-    @io.readline(">")
-    $_.should == "is>"
-    @io.readline(">")
-    $_.should == "an>"
-    @io.readline(">")
-    $_.should == "example"
-  end
-
-  it "updates self's lineno by one" do
-    @io.readline(">")
-    @io.lineno.should eql(1)
-
-    @io.readline(">")
-    @io.lineno.should eql(2)
-
-    @io.readline(">")
-    @io.lineno.should eql(3)
-  end
-
-  it "returns the next paragraph when the passed separator is an empty String" do
-    io = StringIO.new("this is\n\nan example")
-    io.readline("").should == "this is\n\n"
-    io.readline("").should == "an example"
-  end
-
-  it "returns the remaining content starting at the current position when passed nil" do
-    io = StringIO.new("this is\n\nan example")
-    io.pos = 5
-    io.readline(nil).should == "is\n\nan example"
-  end
-
-  it "tries to convert the passed separator to a String using #to_str" do
-    obj = mock('to_str')
-    obj.should_receive(:to_str).and_return(">")
-    @io.readline(obj).should == "this>"
-  end
-end
-
-describe "StringIO#readline when passed no argument" do
-  before :each do
-    @io = StringIO.new("this is\nan example\nfor StringIO#readline")
-  end
-
-  it "returns the data read till the next occurrence of $/ or till eof" do
-    @io.readline.should == "this is\n"
+    it "raises an IOError if self is at the end" do
+      @io = StringIO.new("this>is>an>example")
 
-    begin
-      old_sep = $/
-      suppress_warning {$/ = " "}
-      @io.readline.should == "an "
-      @io.readline.should == "example\nfor "
-      @io.readline.should == "StringIO#readline"
-    ensure
-      suppress_warning {$/ = old_sep}
+      @io.pos = 36
+      -> { @io.readline(">") }.should raise_error(IOError)
     end
   end
 
-  it "sets $_ to the read content" do
-    @io.readline
-    $_.should == "this is\n"
-    @io.readline
-    $_.should == "an example\n"
-    @io.readline
-    $_.should == "for StringIO#readline"
-  end
+  describe "when passed [limit]" do
+    it_behaves_like :stringio_gets_limit, :readline
 
-  it "updates self's position" do
-    @io.readline
-    @io.pos.should eql(8)
+    it "raises an IOError if self is at the end" do
+      @io = StringIO.new("this>is>an>example")
 
-    @io.readline
-    @io.pos.should eql(19)
-
-    @io.readline
-    @io.pos.should eql(40)
+      @io.pos = 36
+      -> { @io.readline(3) }.should raise_error(IOError)
+    end
   end
 
-  it "updates self's lineno" do
-    @io.readline
-    @io.lineno.should eql(1)
+  describe "when passed [separator] and [limit]" do
+    it_behaves_like :stringio_gets_separator_and_limit, :readline
 
-    @io.readline
-    @io.lineno.should eql(2)
+    it "raises an IOError if self is at the end" do
+      @io = StringIO.new("this>is>an>example")
 
-    @io.readline
-    @io.lineno.should eql(3)
-  end
-
-  it "raises an IOError if self is at the end" do
-    @io.pos = 40
-    -> { @io.readline }.should raise_error(IOError)
-  end
-end
-
-describe "StringIO#readline when in write-only mode" do
-  it "raises an IOError" do
-    io = StringIO.new("xyz", "w")
-    -> { io.readline }.should raise_error(IOError)
-
-    io = StringIO.new("xyz")
-    io.close_read
-    -> { io.readline }.should raise_error(IOError)
+      @io.pos = 36
+      -> { @io.readline(">", 3) }.should raise_error(IOError)
+    end
   end
-end
 
-describe "StringIO#readline when passed [chomp]" do
-  it "returns the data read without a trailing newline character" do
-    io = StringIO.new("this>is>an>example\n")
-    io.readline(chomp: true).should == "this>is>an>example"
-  end
-end
+  describe "when passed no argument" do
+    it_behaves_like :stringio_gets_no_argument, :readline
 
-describe "StringIO#readline when passed [limit]" do
-  before :each do
-    @io = StringIO.new("this>is>an>example")
-  end
+    it "raises an IOError if self is at the end" do
+      @io = StringIO.new("this>is>an>example")
 
-  it "returns the data read until the limit is met" do
-    io = StringIO.new("this>is>an>example\n")
-    io.readline(3).should == "thi"
+      @io.pos = 36
+      -> { @io.readline }.should raise_error(IOError)
+    end
   end
 
-  it "returns a blank string when passed a limit of 0" do
-    @io.readline(0).should == ""
+  describe "when passed [chomp]" do
+    it_behaves_like :stringio_gets_chomp, :readline
   end
 
-  it "ignores it when the limit is negative" do
-    seen = []
-    @io.readline(-4).should == "this>is>an>example"
+  describe "when in write-only mode" do
+    it_behaves_like :stringio_gets_write_only, :readline
   end
 end
diff --git a/spec/ruby/library/stringio/readlines_spec.rb b/spec/ruby/library/stringio/readlines_spec.rb
index c471d0fd737407..ed7cc22b3d7ca4 100644
--- a/spec/ruby/library/stringio/readlines_spec.rb
+++ b/spec/ruby/library/stringio/readlines_spec.rb
@@ -83,7 +83,7 @@
 
 describe "StringIO#readlines when in write-only mode" do
   it "raises an IOError" do
-    io = StringIO.new("xyz", "w")
+    io = StringIO.new(+"xyz", "w")
     -> { io.readlines }.should raise_error(IOError)
 
     io = StringIO.new("xyz")
diff --git a/spec/ruby/library/stringio/readpartial_spec.rb b/spec/ruby/library/stringio/readpartial_spec.rb
index 2601fe8c427092..f25cef40148137 100644
--- a/spec/ruby/library/stringio/readpartial_spec.rb
+++ b/spec/ruby/library/stringio/readpartial_spec.rb
@@ -3,7 +3,7 @@
 
 describe "StringIO#readpartial" do
   before :each do
-    @string = StringIO.new('Stop, look, listen')
+    @string = StringIO.new(+'Stop, look, listen')
   end
 
   after :each do
@@ -48,7 +48,7 @@
   end
 
   it "discards the existing buffer content upon successful read" do
-    buffer = "existing"
+    buffer = +"existing"
     @string.readpartial(11, buffer)
     buffer.should == "Stop, look,"
   end
@@ -59,7 +59,7 @@
   end
 
   it "discards the existing buffer content upon error" do
-    buffer = 'hello'
+    buffer = +'hello'
     @string.readpartial(100)
     -> { @string.readpartial(1, buffer) }.should raise_error(EOFError)
     buffer.should be_empty
diff --git a/spec/ruby/library/stringio/reopen_spec.rb b/spec/ruby/library/stringio/reopen_spec.rb
index 9851c5b7069718..7021ff17e5cd9d 100644
--- a/spec/ruby/library/stringio/reopen_spec.rb
+++ b/spec/ruby/library/stringio/reopen_spec.rb
@@ -12,12 +12,12 @@
     @io.closed_write?.should be_true
     @io.string.should == "reopened"
 
-    @io.reopen("reopened, twice", IO::WRONLY)
+    @io.reopen(+"reopened, twice", IO::WRONLY)
     @io.closed_read?.should be_true
     @io.closed_write?.should be_false
     @io.string.should == "reopened, twice"
 
-    @io.reopen("reopened, another time", IO::RDWR)
+    @io.reopen(+"reopened, another time", IO::RDWR)
     @io.closed_read?.should be_false
     @io.closed_write?.should be_false
     @io.string.should == "reopened, another time"
@@ -25,7 +25,7 @@
 
   it "tries to convert the passed Object to a String using #to_str" do
     obj = mock("to_str")
-    obj.should_receive(:to_str).and_return("to_str")
+    obj.should_receive(:to_str).and_return(+"to_str")
     @io.reopen(obj, IO::RDWR)
     @io.string.should == "to_str"
   end
@@ -60,24 +60,24 @@
     @io.closed_write?.should be_true
     @io.string.should == "reopened"
 
-    @io.reopen("reopened, twice", "r+")
+    @io.reopen(+"reopened, twice", "r+")
     @io.closed_read?.should be_false
     @io.closed_write?.should be_false
     @io.string.should == "reopened, twice"
 
-    @io.reopen("reopened, another", "w+")
+    @io.reopen(+"reopened, another", "w+")
     @io.closed_read?.should be_false
     @io.closed_write?.should be_false
     @io.string.should == ""
 
-    @io.reopen("reopened, another time", "r+")
+    @io.reopen(+"reopened, another time", "r+")
     @io.closed_read?.should be_false
     @io.closed_write?.should be_false
     @io.string.should == "reopened, another time"
   end
 
   it "truncates the passed String when opened in truncate mode" do
-    @io.reopen(str = "reopened", "w")
+    @io.reopen(str = +"reopened", "w")
     str.should == ""
   end
 
@@ -94,13 +94,13 @@
 
   it "resets self's position to 0" do
     @io.read(5)
-    @io.reopen("reopened")
+    @io.reopen(+"reopened")
     @io.pos.should eql(0)
   end
 
   it "resets self's line number to 0" do
     @io.gets
-    @io.reopen("reopened")
+    @io.reopen(+"reopened")
     @io.lineno.should eql(0)
   end
 
@@ -134,7 +134,7 @@
   it "reopens self with the passed String in read-write mode" do
     @io.close
 
-    @io.reopen("reopened")
+    @io.reopen(+"reopened")
 
     @io.closed_write?.should be_false
     @io.closed_read?.should be_false
@@ -144,13 +144,13 @@
 
   it "resets self's position to 0" do
     @io.read(5)
-    @io.reopen("reopened")
+    @io.reopen(+"reopened")
     @io.pos.should eql(0)
   end
 
   it "resets self's line number to 0" do
     @io.gets
-    @io.reopen("reopened")
+    @io.reopen(+"reopened")
     @io.lineno.should eql(0)
   end
 end
@@ -172,7 +172,7 @@
 
   it "tries to convert the passed Object to a StringIO using #to_strio" do
     obj = mock("to_strio")
-    obj.should_receive(:to_strio).and_return(StringIO.new("to_strio"))
+    obj.should_receive(:to_strio).and_return(StringIO.new(+"to_strio"))
     @io.reopen(obj)
     @io.string.should == "to_strio"
   end
@@ -208,40 +208,40 @@
 # for details.
 describe "StringIO#reopen" do
   before :each do
-    @io = StringIO.new('hello','a')
+    @io = StringIO.new(+'hello', 'a')
   end
 
   # TODO: find out if this is really a bug
   it "reopens a stream when given a String argument" do
-    @io.reopen('goodbye').should == @io
+    @io.reopen(+'goodbye').should == @io
     @io.string.should == 'goodbye'
     @io << 'x'
     @io.string.should == 'xoodbye'
   end
 
   it "reopens a stream in append mode when flagged as such" do
-    @io.reopen('goodbye', 'a').should == @io
+    @io.reopen(+'goodbye', 'a').should == @io
     @io.string.should == 'goodbye'
     @io << 'x'
     @io.string.should == 'goodbyex'
   end
 
   it "reopens and truncate when reopened in write mode" do
-    @io.reopen('goodbye', 'wb').should == @io
+    @io.reopen(+'goodbye', 'wb').should == @io
     @io.string.should == ''
     @io << 'x'
     @io.string.should == 'x'
   end
 
   it "truncates the given string, not a copy" do
-    str = 'goodbye'
+    str = +'goodbye'
     @io.reopen(str, 'w')
     @io.string.should == ''
     str.should == ''
   end
 
   it "does not truncate the content even when the StringIO argument is in the truncate mode" do
-    orig_io = StringIO.new("Original StringIO", IO::RDWR|IO::TRUNC)
+    orig_io = StringIO.new(+"Original StringIO", IO::RDWR|IO::TRUNC)
     orig_io.write("BLAH") # make sure the content is not empty
 
     @io.reopen(orig_io)
diff --git a/spec/ruby/library/stringio/set_encoding_by_bom_spec.rb b/spec/ruby/library/stringio/set_encoding_by_bom_spec.rb
new file mode 100644
index 00000000000000..1030aad042c419
--- /dev/null
+++ b/spec/ruby/library/stringio/set_encoding_by_bom_spec.rb
@@ -0,0 +1,237 @@
+require 'stringio'
+require_relative '../../spec_helper'
+
+# Should be synced with specs for IO#set_encoding_by_bom
+describe "StringIO#set_encoding_by_bom" do
+  it "returns nil if not readable" do
+    io = StringIO.new("".b, "wb")
+
+    io.set_encoding_by_bom.should be_nil
+    io.external_encoding.should == Encoding::ASCII_8BIT
+  end
+
+  it "returns the result encoding if found BOM UTF-8 sequence" do
+    io = StringIO.new("\u{FEFF}".b, "rb")
+
+    io.set_encoding_by_bom.should == Encoding::UTF_8
+    io.external_encoding.should == Encoding::UTF_8
+    io.read.b.should == "".b
+
+    io = StringIO.new("\u{FEFF}abc".b, "rb")
+
+    io.set_encoding_by_bom.should == Encoding::UTF_8
+    io.external_encoding.should == Encoding::UTF_8
+    io.read.b.should == "abc".b
+  end
+
+  it "returns the result encoding if found BOM UTF_16LE sequence" do
+    io = StringIO.new("\xFF\xFE".b, "rb")
+
+    io.set_encoding_by_bom.should == Encoding::UTF_16LE
+    io.external_encoding.should == Encoding::UTF_16LE
+    io.read.b.should == "".b
+
+    io = StringIO.new("\xFF\xFEabc".b, "rb")
+
+    io.set_encoding_by_bom.should == Encoding::UTF_16LE
+    io.external_encoding.should == Encoding::UTF_16LE
+    io.read.b.should == "abc".b
+  end
+
+  it "returns the result encoding if found BOM UTF_16BE sequence" do
+    io = StringIO.new("\xFE\xFF".b, "rb")
+
+    io.set_encoding_by_bom.should == Encoding::UTF_16BE
+    io.external_encoding.should == Encoding::UTF_16BE
+    io.read.b.should == "".b
+
+    io = StringIO.new("\xFE\xFFabc".b, "rb")
+
+    io.set_encoding_by_bom.should == Encoding::UTF_16BE
+    io.external_encoding.should == Encoding::UTF_16BE
+    io.read.b.should == "abc".b
+  end
+
+  it "returns the result encoding if found BOM UTF_32LE sequence" do
+    io = StringIO.new("\xFF\xFE\x00\x00".b, "rb")
+
+    io.set_encoding_by_bom.should == Encoding::UTF_32LE
+    io.external_encoding.should == Encoding::UTF_32LE
+    io.read.b.should == "".b
+
+    io = StringIO.new("\xFF\xFE\x00\x00abc".b, "rb")
+
+    io.set_encoding_by_bom.should == Encoding::UTF_32LE
+    io.external_encoding.should == Encoding::UTF_32LE
+    io.read.b.should == "abc".b
+  end
+
+  it "returns the result encoding if found BOM UTF_32BE sequence" do
+    io = StringIO.new("\x00\x00\xFE\xFF".b, "rb")
+
+    io.set_encoding_by_bom.should == Encoding::UTF_32BE
+    io.external_encoding.should == Encoding::UTF_32BE
+    io.read.b.should == "".b
+
+    io = StringIO.new("\x00\x00\xFE\xFFabc".b, "rb")
+
+    io.set_encoding_by_bom.should == Encoding::UTF_32BE
+    io.external_encoding.should == Encoding::UTF_32BE
+    io.read.b.should == "abc".b
+  end
+
+  it "returns nil if io is empty" do
+    io = StringIO.new("".b, "rb")
+    io.set_encoding_by_bom.should be_nil
+    io.external_encoding.should == Encoding::ASCII_8BIT
+  end
+
+  it "returns nil if UTF-8 BOM sequence is incomplete" do
+    io = StringIO.new("\xEF".b, "rb")
+
+    io.set_encoding_by_bom.should == nil
+    io.external_encoding.should == Encoding::ASCII_8BIT
+    io.read.b.should == "\xEF".b
+
+    io = StringIO.new("\xEFa".b, "rb")
+
+    io.set_encoding_by_bom.should == nil
+    io.external_encoding.should == Encoding::ASCII_8BIT
+    io.read.b.should == "\xEFa".b
+
+    io = StringIO.new("\xEF\xBB".b, "rb")
+
+    io.set_encoding_by_bom.should == nil
+    io.external_encoding.should == Encoding::ASCII_8BIT
+    io.read.b.should == "\xEF\xBB".b
+
+    io = StringIO.new("\xEF\xBBa".b, "rb")
+
+    io.set_encoding_by_bom.should == nil
+    io.external_encoding.should == Encoding::ASCII_8BIT
+    io.read.b.should == "\xEF\xBBa".b
+  end
+
+  it "returns nil if UTF-16BE BOM sequence is incomplete" do
+    io = StringIO.new("\xFE".b, "rb")
+
+    io.set_encoding_by_bom.should == nil
+    io.external_encoding.should == Encoding::ASCII_8BIT
+    io.read.b.should == "\xFE".b
+
+    io = StringIO.new("\xFEa".b, "rb")
+
+    io.set_encoding_by_bom.should == nil
+    io.external_encoding.should == Encoding::ASCII_8BIT
+    io.read.b.should == "\xFEa".b
+  end
+
+  it "returns nil if UTF-16LE/UTF-32LE BOM sequence is incomplete" do
+    io = StringIO.new("\xFF".b, "rb")
+
+    io.set_encoding_by_bom.should == nil
+    io.external_encoding.should == Encoding::ASCII_8BIT
+    io.read.b.should == "\xFF".b
+
+    io = StringIO.new("\xFFa".b, "rb")
+
+    io.set_encoding_by_bom.should == nil
+    io.external_encoding.should == Encoding::ASCII_8BIT
+    io.read.b.should == "\xFFa".b
+  end
+
+  it "returns UTF-16LE if UTF-32LE BOM sequence is incomplete" do
+    io = StringIO.new("\xFF\xFE".b, "rb")
+
+    io.set_encoding_by_bom.should == Encoding::UTF_16LE
+    io.external_encoding.should == Encoding::UTF_16LE
+    io.read.b.should == "".b
+
+    io = StringIO.new("\xFF\xFE\x00".b, "rb")
+
+    io.set_encoding_by_bom.should == Encoding::UTF_16LE
+    io.external_encoding.should == Encoding::UTF_16LE
+    io.read.b.should == "\x00".b
+
+    io = StringIO.new("\xFF\xFE\x00a".b, "rb")
+
+    io.set_encoding_by_bom.should == Encoding::UTF_16LE
+    io.external_encoding.should == Encoding::UTF_16LE
+    io.read.b.should == "\x00a".b
+  end
+
+  it "returns nil if UTF-32BE BOM sequence is incomplete" do
+    io = StringIO.new("\x00".b, "rb")
+
+    io.set_encoding_by_bom.should == nil
+    io.external_encoding.should == Encoding::ASCII_8BIT
+    io.read.b.should == "\x00".b
+
+    io = StringIO.new("\x00a".b, "rb")
+
+    io.set_encoding_by_bom.should == nil
+    io.external_encoding.should == Encoding::ASCII_8BIT
+    io.read.b.should == "\x00a".b
+
+    io = StringIO.new("\x00\x00".b, "rb")
+
+    io.set_encoding_by_bom.should == nil
+    io.external_encoding.should == Encoding::ASCII_8BIT
+    io.read.b.should == "\x00\x00".b
+
+    io = StringIO.new("\x00\x00a".b, "rb")
+
+    io.set_encoding_by_bom.should == nil
+    io.external_encoding.should == Encoding::ASCII_8BIT
+    io.read.b.should == "\x00\x00a".b
+
+    io = StringIO.new("\x00\x00\xFE".b, "rb")
+
+    io.set_encoding_by_bom.should == nil
+    io.external_encoding.should == Encoding::ASCII_8BIT
+    io.read.b.should == "\x00\x00\xFE".b
+
+    io = StringIO.new("\x00\x00\xFEa".b, "rb")
+
+    io.set_encoding_by_bom.should == nil
+    io.external_encoding.should == Encoding::ASCII_8BIT
+    io.read.b.should == "\x00\x00\xFEa".b
+  end
+
+  it "returns nil if found BOM sequence not provided" do
+    io = StringIO.new("abc".b, "rb")
+
+    io.set_encoding_by_bom.should == nil
+    io.external_encoding.should == Encoding::ASCII_8BIT
+    io.read(3).should == "abc".b
+  end
+
+  it "does not raise exception if io not in binary mode" do
+    io = StringIO.new("", 'r')
+    io.set_encoding_by_bom.should == nil
+  end
+
+  it "does not raise exception if encoding already set" do
+    io = StringIO.new("".b, "rb")
+    io.set_encoding("utf-8")
+    io.set_encoding_by_bom.should == nil
+  end
+
+  it "does not raise exception if encoding conversion is already set" do
+    io = StringIO.new("".b, "rb")
+    io.set_encoding(Encoding::UTF_8, Encoding::UTF_16BE)
+
+    io.set_encoding_by_bom.should == nil
+  end
+
+  it "raises FrozenError when io is frozen" do
+    io = StringIO.new()
+    io.freeze
+    -> { io.set_encoding_by_bom }.should raise_error(FrozenError)
+  end
+
+  it "does not raise FrozenError when initial string is frozen" do
+    io = StringIO.new("".freeze)
+    io.set_encoding_by_bom.should == nil
+  end
+end
diff --git a/spec/ruby/library/stringio/shared/codepoints.rb b/spec/ruby/library/stringio/shared/codepoints.rb
index 9d84aa491987f4..25333bb0fd2f52 100644
--- a/spec/ruby/library/stringio/shared/codepoints.rb
+++ b/spec/ruby/library/stringio/shared/codepoints.rb
@@ -27,7 +27,7 @@
     @io.close_read
     -> { @enum.to_a }.should raise_error(IOError)
 
-    io = StringIO.new("xyz", "w")
+    io = StringIO.new(+"xyz", "w")
     -> { io.send(@method).to_a }.should raise_error(IOError)
   end
 
diff --git a/spec/ruby/library/stringio/shared/each.rb b/spec/ruby/library/stringio/shared/each.rb
index acd8d22c141a69..626b41a4d36318 100644
--- a/spec/ruby/library/stringio/shared/each.rb
+++ b/spec/ruby/library/stringio/shared/each.rb
@@ -36,22 +36,11 @@
     seen.should == ["2 1 2 1 2"]
   end
 
-  version_is StringIO::VERSION, ""..."3.0.4" do #ruby_version_is ""..."3.2" do
-    it "yields each paragraph with two separation characters when passed an empty String as separator" do
-      seen = []
-      io = StringIO.new("para1\n\npara2\n\n\npara3")
-      io.send(@method, "") {|s| seen << s}
-      seen.should == ["para1\n\n", "para2\n\n", "para3"]
-    end
-  end
-
-  version_is StringIO::VERSION, "3.0.4" do #ruby_version_is "3.2" do
-    it "yields each paragraph with all separation characters when passed an empty String as separator" do
-      seen = []
-      io = StringIO.new("para1\n\npara2\n\n\npara3")
-      io.send(@method, "") {|s| seen << s}
-      seen.should == ["para1\n\n", "para2\n\n\n", "para3"]
-    end
+  it "yields each paragraph with all separation characters when passed an empty String as separator" do
+    seen = []
+    io = StringIO.new("para1\n\npara2\n\n\npara3")
+    io.send(@method, "") {|s| seen << s}
+    seen.should == ["para1\n\n", "para2\n\n\n", "para3"]
   end
 end
 
@@ -107,7 +96,7 @@
 
 describe :stringio_each_not_readable, shared: true do
   it "raises an IOError" do
-    io = StringIO.new("a b c d e", "w")
+    io = StringIO.new(+"a b c d e", "w")
     -> { io.send(@method) { |b| b } }.should raise_error(IOError)
 
     io = StringIO.new("a b c d e")
@@ -161,3 +150,60 @@
     seen.should == ["a b ", "c d ", "e\n", "1 2 ", "3 4 ", "5"]
   end
 end
+
+describe :stringio_each_separator_and_limit, shared: true do
+  before :each do
+    @io = StringIO.new("this>is>an>example")
+  end
+
+  it "returns the data read until the limit is consumed or the separator is met" do
+    @io.send(@method, '>', 8) { |s| break s }.should == "this>"
+    @io.send(@method, '>', 2) { |s| break s }.should == "is"
+    @io.send(@method, '>', 10) { |s| break s }.should == ">"
+    @io.send(@method, '>', 6) { |s| break s }.should == "an>"
+    @io.send(@method, '>', 5) { |s| break s }.should == "examp"
+  end
+
+  it "truncates the multi-character separator at the end to meet the limit" do
+    @io.send(@method, "is>an", 7) { |s| break s }.should == "this>is"
+  end
+
+  it "does not change $_" do
+    $_ = "test"
+    @io.send(@method, '>', 8) { |s| s }
+    $_.should == "test"
+  end
+
+  it "updates self's lineno by one" do
+    @io.send(@method, '>', 3) { |s| break s }
+    @io.lineno.should eql(1)
+
+    @io.send(@method, '>', 3) { |s| break s }
+    @io.lineno.should eql(2)
+
+    @io.send(@method, '>', 3) { |s| break s }
+    @io.lineno.should eql(3)
+  end
+
+  it "tries to convert the passed separator to a String using #to_str" do # TODO
+    obj = mock('to_str')
+    obj.should_receive(:to_str).and_return('>')
+
+    seen = []
+    @io.send(@method, obj, 5) { |s| seen << s }
+    seen.should == ["this>", "is>", "an>", "examp", "le"]
+  end
+
+  it "does not raise TypeError if passed separator is nil" do
+    @io.send(@method, nil, 5) { |s| break s }.should == "this>"
+  end
+
+  it "tries to convert the passed limit to an Integer using #to_int" do # TODO
+    obj = mock('to_int')
+    obj.should_receive(:to_int).and_return(5)
+
+    seen = []
+    @io.send(@method, '>', obj) { |s| seen << s }
+    seen.should == ["this>", "is>", "an>", "examp", "le"]
+  end
+end
diff --git a/spec/ruby/library/stringio/shared/each_byte.rb b/spec/ruby/library/stringio/shared/each_byte.rb
index 56734ff99d899d..b51fa38f2f5295 100644
--- a/spec/ruby/library/stringio/shared/each_byte.rb
+++ b/spec/ruby/library/stringio/shared/each_byte.rb
@@ -38,7 +38,7 @@
 
 describe :stringio_each_byte_not_readable, shared: true do
   it "raises an IOError" do
-    io = StringIO.new("xyz", "w")
+    io = StringIO.new(+"xyz", "w")
     -> { io.send(@method) { |b| b } }.should raise_error(IOError)
 
     io = StringIO.new("xyz")
diff --git a/spec/ruby/library/stringio/shared/each_char.rb b/spec/ruby/library/stringio/shared/each_char.rb
index bcdac53282cd35..197237c1c85094 100644
--- a/spec/ruby/library/stringio/shared/each_char.rb
+++ b/spec/ruby/library/stringio/shared/each_char.rb
@@ -26,7 +26,7 @@
 
 describe :stringio_each_char_not_readable, shared: true do
   it "raises an IOError" do
-    io = StringIO.new("xyz", "w")
+    io = StringIO.new(+"xyz", "w")
     -> { io.send(@method) { |b| b } }.should raise_error(IOError)
 
     io = StringIO.new("xyz")
diff --git a/spec/ruby/library/stringio/shared/getc.rb b/spec/ruby/library/stringio/shared/getc.rb
index 6318bcc30f3e3e..ba65040bce0798 100644
--- a/spec/ruby/library/stringio/shared/getc.rb
+++ b/spec/ruby/library/stringio/shared/getc.rb
@@ -33,7 +33,7 @@
 
 describe :stringio_getc_not_readable, shared: true do
   it "raises an IOError" do
-    io = StringIO.new("xyz", "w")
+    io = StringIO.new(+"xyz", "w")
     -> { io.send(@method) }.should raise_error(IOError)
 
     io = StringIO.new("xyz")
diff --git a/spec/ruby/library/stringio/shared/gets.rb b/spec/ruby/library/stringio/shared/gets.rb
new file mode 100644
index 00000000000000..8396b161f1d03a
--- /dev/null
+++ b/spec/ruby/library/stringio/shared/gets.rb
@@ -0,0 +1,249 @@
+describe :stringio_gets_separator, shared: true do
+  describe "when passed [separator]" do
+    before :each do
+      @io = StringIO.new("this>is>an>example")
+    end
+
+    it "returns the data read till the next occurrence of the passed separator" do
+      @io.send(@method, ">").should == "this>"
+      @io.send(@method, ">").should == "is>"
+      @io.send(@method, ">").should == "an>"
+      @io.send(@method, ">").should == "example"
+    end
+
+    it "sets $_ to the read content" do
+      @io.send(@method, ">")
+      $_.should == "this>"
+      @io.send(@method, ">")
+      $_.should == "is>"
+      @io.send(@method, ">")
+      $_.should == "an>"
+      @io.send(@method, ">")
+      $_.should == "example"
+    end
+
+    it "accepts string as separator" do
+      @io.send(@method, "is>")
+      $_.should == "this>"
+      @io.send(@method, "an>")
+      $_.should == "is>an>"
+      @io.send(@method, "example")
+      $_.should == "example"
+    end
+
+    it "updates self's lineno by one" do
+      @io.send(@method, ">")
+      @io.lineno.should eql(1)
+
+      @io.send(@method, ">")
+      @io.lineno.should eql(2)
+
+      @io.send(@method, ">")
+      @io.lineno.should eql(3)
+    end
+
+    it "returns the next paragraph when the passed separator is an empty String" do
+      io = StringIO.new("this is\n\nan example")
+      io.send(@method, "").should == "this is\n\n"
+      io.send(@method, "").should == "an example"
+    end
+
+    it "returns the remaining content starting at the current position when passed nil" do
+      io = StringIO.new("this is\n\nan example")
+      io.pos = 5
+      io.send(@method, nil).should == "is\n\nan example"
+    end
+
+    it "tries to convert the passed separator to a String using #to_str" do
+      obj = mock('to_str')
+      obj.should_receive(:to_str).and_return(">")
+      @io.send(@method, obj).should == "this>"
+    end
+  end
+end
+
+describe :stringio_gets_limit, shared: true do
+  describe "when passed [limit]" do
+    before :each do
+      @io = StringIO.new("this>is>an>example")
+    end
+
+    it "returns the data read until the limit is met" do
+      @io.send(@method, 4).should == "this"
+      @io.send(@method, 3).should == ">is"
+      @io.send(@method, 5).should == ">an>e"
+      @io.send(@method, 6).should == "xample"
+    end
+
+    it "sets $_ to the read content" do
+      @io.send(@method, 4)
+      $_.should == "this"
+      @io.send(@method, 3)
+      $_.should == ">is"
+      @io.send(@method, 5)
+      $_.should == ">an>e"
+      @io.send(@method, 6)
+      $_.should == "xample"
+    end
+
+    it "updates self's lineno by one" do
+      @io.send(@method, 3)
+      @io.lineno.should eql(1)
+
+      @io.send(@method, 3)
+      @io.lineno.should eql(2)
+
+      @io.send(@method, 3)
+      @io.lineno.should eql(3)
+    end
+
+    it "tries to convert the passed limit to an Integer using #to_int" do
+      obj = mock('to_int')
+      obj.should_receive(:to_int).and_return(4)
+      @io.send(@method, obj).should == "this"
+    end
+
+    it "returns a blank string when passed a limit of 0" do
+      @io.send(@method, 0).should == ""
+    end
+
+    it "ignores it when passed a negative limit" do
+      @io.send(@method, -4).should == "this>is>an>example"
+    end
+  end
+end
+
+describe :stringio_gets_separator_and_limit, shared: true do
+  describe "when passed [separator] and [limit]" do
+    before :each do
+      @io = StringIO.new("this>is>an>example")
+    end
+
+    it "returns the data read until the limit is consumed or the separator is met" do
+      @io.send(@method, '>', 8).should == "this>"
+      @io.send(@method, '>', 2).should == "is"
+      @io.send(@method, '>', 10).should == ">"
+      @io.send(@method, '>', 6).should == "an>"
+      @io.send(@method, '>', 5).should == "examp"
+    end
+
+    it "truncates the multi-character separator at the end to meet the limit" do
+      @io.send(@method, "is>an", 7).should == "this>is"
+    end
+
+    it "sets $_ to the read content" do
+      @io.send(@method, '>', 8)
+      $_.should == "this>"
+      @io.send(@method, '>', 2)
+      $_.should == "is"
+      @io.send(@method, '>', 10)
+      $_.should == ">"
+      @io.send(@method, '>', 6)
+      $_.should == "an>"
+      @io.send(@method, '>', 5)
+      $_.should == "examp"
+    end
+
+    it "updates self's lineno by one" do
+      @io.send(@method, '>', 3)
+      @io.lineno.should eql(1)
+
+      @io.send(@method, '>', 3)
+      @io.lineno.should eql(2)
+
+      @io.send(@method, '>', 3)
+      @io.lineno.should eql(3)
+    end
+
+    it "tries to convert the passed separator to a String using #to_str" do
+      obj = mock('to_str')
+      obj.should_receive(:to_str).and_return('>')
+      @io.send(@method, obj, 5).should == "this>"
+    end
+
+    it "does not raise TypeError if passed separator is nil" do
+      @io.send(@method, nil, 5).should == "this>"
+    end
+
+    it "tries to convert the passed limit to an Integer using #to_int" do
+      obj = mock('to_int')
+      obj.should_receive(:to_int).and_return(5)
+      @io.send(@method, '>', obj).should == "this>"
+    end
+  end
+end
+
+describe :stringio_gets_no_argument, shared: true do
+  describe "when passed no argument" do
+    before :each do
+      @io = StringIO.new("this is\nan example\nfor StringIO#gets")
+    end
+
+    it "returns the data read till the next occurrence of $/ or till eof" do
+      @io.send(@method).should == "this is\n"
+
+      begin
+        old_sep = $/
+        suppress_warning {$/ = " "}
+        @io.send(@method).should == "an "
+        @io.send(@method).should == "example\nfor "
+        @io.send(@method).should == "StringIO#gets"
+      ensure
+        suppress_warning {$/ = old_sep}
+      end
+    end
+
+    it "sets $_ to the read content" do
+      @io.send(@method)
+      $_.should == "this is\n"
+      @io.send(@method)
+      $_.should == "an example\n"
+      @io.send(@method)
+      $_.should == "for StringIO#gets"
+    end
+
+    it "updates self's position" do
+      @io.send(@method)
+      @io.pos.should eql(8)
+
+      @io.send(@method)
+      @io.pos.should eql(19)
+
+      @io.send(@method)
+      @io.pos.should eql(36)
+    end
+
+    it "updates self's lineno" do
+      @io.send(@method)
+      @io.lineno.should eql(1)
+
+      @io.send(@method)
+      @io.lineno.should eql(2)
+
+      @io.send(@method)
+      @io.lineno.should eql(3)
+    end
+  end
+end
+
+describe :stringio_gets_chomp, shared: true do
+  describe "when passed [chomp]" do
+    it "returns the data read without a trailing newline character" do
+      io = StringIO.new("this>is>an>example\n")
+      io.send(@method, chomp: true).should == "this>is>an>example"
+    end
+  end
+end
+
+describe :stringio_gets_write_only, shared: true do
+  describe "when in write-only mode" do
+    it "raises an IOError" do
+      io = StringIO.new(+"xyz", "w")
+      -> { io.send(@method) }.should raise_error(IOError)
+
+      io = StringIO.new("xyz")
+      io.close_read
+      -> { io.send(@method) }.should raise_error(IOError)
+    end
+  end
+end
diff --git a/spec/ruby/library/stringio/shared/isatty.rb b/spec/ruby/library/stringio/shared/isatty.rb
index 3da59999537fc0..c9e7ee73214cc7 100644
--- a/spec/ruby/library/stringio/shared/isatty.rb
+++ b/spec/ruby/library/stringio/shared/isatty.rb
@@ -1,5 +1,5 @@
 describe :stringio_isatty, shared: true do
   it "returns false" do
-    StringIO.new('tty').send(@method).should be_false
+    StringIO.new("tty").send(@method).should be_false
   end
 end
diff --git a/spec/ruby/library/stringio/shared/read.rb b/spec/ruby/library/stringio/shared/read.rb
index 252a85d89d9042..22f76b0fb01bbe 100644
--- a/spec/ruby/library/stringio/shared/read.rb
+++ b/spec/ruby/library/stringio/shared/read.rb
@@ -5,19 +5,37 @@
 
   it "returns the passed buffer String" do
     # Note: Rubinius bug:
-    # @io.send(@method, 7, buffer = "").should equal(buffer)
-    ret = @io.send(@method, 7, buffer = "")
+    # @io.send(@method, 7, buffer = +"").should equal(buffer)
+    ret = @io.send(@method, 7, buffer = +"")
     ret.should equal(buffer)
   end
 
   it "reads length bytes and writes them to the buffer String" do
-    @io.send(@method, 7, buffer = "")
+    @io.send(@method, 7, buffer = +"").should.equal?(buffer)
     buffer.should == "example"
   end
 
+  guard -> { StringIO::VERSION < "3.1.2" } do
+    it "does not preserve the encoding of the given buffer" do
+      buffer = ''.encode(Encoding::ISO_8859_1)
+      @io.send(@method, 7, buffer)
+
+      buffer.encoding.should_not == Encoding::ISO_8859_1
+    end
+  end
+
+  guard -> { StringIO::VERSION >= "3.1.2" } do
+    it "preserves the encoding of the given buffer" do
+      buffer = ''.encode(Encoding::ISO_8859_1)
+      @io.send(@method, 7, buffer)
+
+      buffer.encoding.should == Encoding::ISO_8859_1
+    end
+  end
+
   it "tries to convert the passed buffer Object to a String using #to_str" do
     obj = mock("to_str")
-    obj.should_receive(:to_str).and_return(buffer = "")
+    obj.should_receive(:to_str).and_return(buffer = +"")
 
     @io.send(@method, 7, obj)
     buffer.should == "example"
@@ -75,7 +93,7 @@
 
 describe :stringio_read_no_arguments, shared: true do
   before :each do
-    @io = StringIO.new("example")
+    @io = StringIO.new(+"example")
   end
 
   it "reads the whole content starting from the current position" do
@@ -117,7 +135,7 @@
 
 describe :stringio_read_not_readable, shared: true do
   it "raises an IOError" do
-    io = StringIO.new("test", "w")
+    io = StringIO.new(+"test", "w")
     -> { io.send(@method) }.should raise_error(IOError)
 
     io = StringIO.new("test")
diff --git a/spec/ruby/library/stringio/shared/readchar.rb b/spec/ruby/library/stringio/shared/readchar.rb
index 4248e754200fab..72d7446c362d15 100644
--- a/spec/ruby/library/stringio/shared/readchar.rb
+++ b/spec/ruby/library/stringio/shared/readchar.rb
@@ -19,7 +19,7 @@
 
 describe :stringio_readchar_not_readable, shared: true do
   it "raises an IOError" do
-    io = StringIO.new("a b c d e", "w")
+    io = StringIO.new(+"a b c d e", "w")
     -> { io.send(@method) }.should raise_error(IOError)
 
     io = StringIO.new("a b c d e")
diff --git a/spec/ruby/library/stringio/shared/sysread.rb b/spec/ruby/library/stringio/shared/sysread.rb
index 937bac705cb6cd..3e23fbc2335129 100644
--- a/spec/ruby/library/stringio/shared/sysread.rb
+++ b/spec/ruby/library/stringio/shared/sysread.rb
@@ -10,6 +10,6 @@
 
   it "raises an EOFError when passed length > 0 and no data remains" do
     @io.read.should == "example"
-    -> { @io.sysread(1) }.should raise_error(EOFError)
+    -> { @io.send(@method, 1) }.should raise_error(EOFError)
   end
 end
diff --git a/spec/ruby/library/stringio/shared/write.rb b/spec/ruby/library/stringio/shared/write.rb
index aa67bb73c721f4..4661658bafaee3 100644
--- a/spec/ruby/library/stringio/shared/write.rb
+++ b/spec/ruby/library/stringio/shared/write.rb
@@ -1,6 +1,6 @@
 describe :stringio_write, shared: true do
   before :each do
-    @io = StringIO.new('12345')
+    @io = StringIO.new(+'12345')
   end
 
   it "tries to convert the passed Object to a String using #to_s" do
@@ -13,7 +13,7 @@
 
 describe :stringio_write_string, shared: true do
   before :each do
-    @io = StringIO.new('12345')
+    @io = StringIO.new(+'12345')
   end
 
   # TODO: RDoc says that #write appends at the current position.
@@ -94,7 +94,7 @@
   end
 
   it "does not transcode the given string when the external encoding is set and the string encoding is BINARY" do
-    str = "été".b
+    str = "été_".b
     io = StringIO.new.set_encoding(Encoding::UTF_16BE)
     io.external_encoding.should == Encoding::UTF_16BE
 
@@ -106,10 +106,10 @@
 
 describe :stringio_write_not_writable, shared: true do
   it "raises an IOError" do
-    io = StringIO.new("test", "r")
+    io = StringIO.new(+"test", "r")
     -> { io.send(@method, "test") }.should raise_error(IOError)
 
-    io = StringIO.new("test")
+    io = StringIO.new(+"test")
     io.close_write
     -> { io.send(@method, "test") }.should raise_error(IOError)
   end
@@ -117,7 +117,7 @@
 
 describe :stringio_write_append, shared: true do
   before :each do
-    @io = StringIO.new("example", "a")
+    @io = StringIO.new(+"example", "a")
   end
 
   it "appends the passed argument to the end of self" do
diff --git a/spec/ruby/library/stringio/sysread_spec.rb b/spec/ruby/library/stringio/sysread_spec.rb
index 8f78073f428b34..fabb06dd9a66b3 100644
--- a/spec/ruby/library/stringio/sysread_spec.rb
+++ b/spec/ruby/library/stringio/sysread_spec.rb
@@ -1,6 +1,7 @@
 require_relative '../../spec_helper'
 require "stringio"
 require_relative 'shared/read'
+require_relative 'shared/sysread'
 
 describe "StringIO#sysread when passed length, buffer" do
   it_behaves_like :stringio_read, :sysread
@@ -32,6 +33,10 @@
   end
 end
 
+describe "StringIO#sysread when passed length" do
+  it_behaves_like :stringio_sysread_length, :sysread
+end
+
 describe "StringIO#sysread when passed [length]" do
   before :each do
     @io = StringIO.new("example")
diff --git a/spec/ruby/library/stringio/truncate_spec.rb b/spec/ruby/library/stringio/truncate_spec.rb
index e8d7f1a15de984..592ca5a6e1854d 100644
--- a/spec/ruby/library/stringio/truncate_spec.rb
+++ b/spec/ruby/library/stringio/truncate_spec.rb
@@ -3,7 +3,7 @@
 
 describe "StringIO#truncate when passed [length]" do
   before :each do
-    @io = StringIO.new('123456789')
+    @io = StringIO.new(+'123456789')
   end
 
   it "returns an Integer" do
@@ -16,7 +16,7 @@
   end
 
   it "does not create a copy of the underlying string" do
-    io = StringIO.new(str = "123456789")
+    io = StringIO.new(str = +"123456789")
     io.truncate(4)
     io.string.should equal(str)
   end
@@ -52,10 +52,10 @@
 
 describe "StringIO#truncate when self is not writable" do
   it "raises an IOError" do
-    io = StringIO.new("test", "r")
+    io = StringIO.new(+"test", "r")
     -> { io.truncate(2) }.should raise_error(IOError)
 
-    io = StringIO.new("test")
+    io = StringIO.new(+"test")
     io.close_write
     -> { io.truncate(2) }.should raise_error(IOError)
   end
diff --git a/spec/ruby/library/stringio/ungetc_spec.rb b/spec/ruby/library/stringio/ungetc_spec.rb
index 91ef2100a12db0..bceafa79ffa007 100644
--- a/spec/ruby/library/stringio/ungetc_spec.rb
+++ b/spec/ruby/library/stringio/ungetc_spec.rb
@@ -3,7 +3,7 @@
 
 describe "StringIO#ungetc when passed [char]" do
   before :each do
-    @io = StringIO.new('1234')
+    @io = StringIO.new(+'1234')
   end
 
   it "writes the passed char before the current position" do
@@ -45,11 +45,11 @@
 
 describe "StringIO#ungetc when self is not readable" do
   it "raises an IOError" do
-    io = StringIO.new("test", "w")
+    io = StringIO.new(+"test", "w")
     io.pos = 1
     -> { io.ungetc(?A) }.should raise_error(IOError)
 
-    io = StringIO.new("test")
+    io = StringIO.new(+"test")
     io.pos = 1
     io.close_read
     -> { io.ungetc(?A) }.should raise_error(IOError)
@@ -60,11 +60,11 @@
 #
 # describe "StringIO#ungetc when self is not writable" do
 #   it "raises an IOError" do
-#     io = StringIO.new("test", "r")
+#     io = StringIO.new(+"test", "r")
 #     io.pos = 1
 #     lambda { io.ungetc(?A) }.should raise_error(IOError)
 #
-#     io = StringIO.new("test")
+#     io = StringIO.new(+"test")
 #     io.pos = 1
 #     io.close_write
 #     lambda { io.ungetc(?A) }.should raise_error(IOError)
diff --git a/spec/ruby/library/stringio/write_nonblock_spec.rb b/spec/ruby/library/stringio/write_nonblock_spec.rb
index a457b976679ee6..b48ef6698aa82e 100644
--- a/spec/ruby/library/stringio/write_nonblock_spec.rb
+++ b/spec/ruby/library/stringio/write_nonblock_spec.rb
@@ -10,7 +10,7 @@
   it_behaves_like :stringio_write_string, :write_nonblock
 
   it "accepts :exception option" do
-    io = StringIO.new("12345", "a")
+    io = StringIO.new(+"12345", "a")
     io.write_nonblock("67890", exception: true)
     io.string.should == "1234567890"
   end
diff --git a/spec/ruby/library/stringscanner/captures_spec.rb b/spec/ruby/library/stringscanner/captures_spec.rb
new file mode 100644
index 00000000000000..bdfb0e0cc5c192
--- /dev/null
+++ b/spec/ruby/library/stringscanner/captures_spec.rb
@@ -0,0 +1,36 @@
+require_relative '../../spec_helper'
+require 'strscan'
+
+describe "StringScanner#captures" do
+  before do
+    @s = StringScanner.new('Fri Dec 12 1975 14:39')
+  end
+
+  it "returns the array of captured values of the most recent matching" do
+    @s.exist?(/(?<wday>\w+) (?<month>\w+) (?<day>\d+)/)
+    @s.captures.should == ["Fri", "Dec", "12"]
+  end
+
+  it "returns nil if the last match fails" do
+    @s.scan(/nope/)
+    @s.captures.should == nil
+  end
+
+  it "returns nil if there is no any match done" do
+    @s.captures.should == nil
+  end
+
+  version_is StringScanner::Version, ""..."3.0.8" do # ruby_version_is ""..."3.3.3"
+    it "returns '' for an optional capturing group if it doesn't match" do
+      @s.exist?(/(?<wday>\w+) (?<month>\w+) (?<day>\s+)?/)
+      @s.captures.should == ["Fri", "Dec", ""]
+    end
+  end
+
+  version_is StringScanner::Version, "3.0.8" do # ruby_version_is "3.3.3"
+    it "returns nil for an optional capturing group if it doesn't match" do
+      @s.exist?(/(?<wday>\w+) (?<month>\w+) (?<day>\s+)?/)
+      @s.captures.should == ["Fri", "Dec", nil]
+    end
+  end
+end
diff --git a/spec/ruby/library/stringscanner/charpos_spec.rb b/spec/ruby/library/stringscanner/charpos_spec.rb
new file mode 100644
index 00000000000000..9aa5b00dd98e81
--- /dev/null
+++ b/spec/ruby/library/stringscanner/charpos_spec.rb
@@ -0,0 +1,18 @@
+require_relative '../../spec_helper'
+require 'strscan'
+
+describe "StringScanner#charpos" do
+  it "returns character index corresponding to the current position" do
+    s = StringScanner.new("abc")
+
+    s.scan_until(/b/)
+    s.charpos.should == 2
+  end
+
+  it "is multi-byte character sensitive" do
+    s = StringScanner.new("abcädeföghi")
+
+    s.scan_until(/ö/)
+    s.charpos.should == 8
+  end
+end
diff --git a/spec/ruby/library/stringscanner/check_spec.rb b/spec/ruby/library/stringscanner/check_spec.rb
index a97c26af83fc3a..235f2f22e954fd 100644
--- a/spec/ruby/library/stringscanner/check_spec.rb
+++ b/spec/ruby/library/stringscanner/check_spec.rb
@@ -22,4 +22,76 @@
     @s.matched.should == nil
   end
 
+  describe "#[] successive call with a capture group name" do
+    context "when #check was called with a Regexp pattern" do
+      it "returns matched substring when matching succeeded" do
+        @s.check(/(?<a>This)/)
+        @s.should.matched?
+        @s[:a].should == "This"
+      end
+
+      it "returns nil when matching failed" do
+        @s.check(/(?<a>2008)/)
+        @s.should_not.matched?
+        @s[:a].should be_nil
+      end
+    end
+
+    context "when #check was called with a String pattern" do
+      # https://github.com/ruby/strscan/issues/139
+      ruby_version_is ""..."3.5" do # Don't run on 3.5.0dev that already contains not released fixes
+      version_is StringScanner::Version, "3.1.1"..."3.1.3" do # ruby_version_is "3.4.0"..."3.4.3"
+        it "returns nil when matching succeeded" do
+          @s.check("This")
+          @s.should.matched?
+          @s[:a].should be_nil
+        end
+      end
+      end
+      version_is StringScanner::Version, "3.1.3" do # ruby_version_is "3.4"
+        it "raises IndexError when matching succeeded" do
+          @s.check("This")
+          @s.should.matched?
+          -> { @s[:a] }.should raise_error(IndexError)
+        end
+      end
+
+      it "returns nil when matching failed" do
+        @s.check("2008")
+        @s.should_not.matched?
+        @s[:a].should be_nil
+      end
+
+      it "returns a matching substring when given Integer index" do
+        @s.check("This")
+        @s[0].should == "This"
+      end
+
+      # https://github.com/ruby/strscan/issues/135
+      ruby_version_is ""..."3.5" do # Don't run on 3.5.0dev that already contains not released fixes
+      version_is StringScanner::Version, "3.1.1"..."3.1.3" do # ruby_version_is "3.4.0"..."3.4.3"
+        it "ignores the previous matching with Regexp" do
+          @s.exist?(/(?<a>This)/)
+          @s.should.matched?
+          @s[:a].should == "This"
+
+          @s.check("This")
+          @s.should.matched?
+          @s[:a].should be_nil
+        end
+      end
+      end
+      version_is StringScanner::Version, "3.1.3" do # ruby_version_is "3.4.0"..."3.4.3"
+        it "ignores the previous matching with Regexp" do
+          @s.exist?(/(?<a>This)/)
+          @s.should.matched?
+          @s[:a].should == "This"
+
+          @s.check("This")
+          @s.should.matched?
+          -> { @s[:a] }.should raise_error(IndexError)
+        end
+      end
+    end
+  end
 end
diff --git a/spec/ruby/library/stringscanner/check_until_spec.rb b/spec/ruby/library/stringscanner/check_until_spec.rb
index ad222fd76b3e9d..701a703ebe8352 100644
--- a/spec/ruby/library/stringscanner/check_until_spec.rb
+++ b/spec/ruby/library/stringscanner/check_until_spec.rb
@@ -2,20 +2,134 @@
 require 'strscan'
 
 describe "StringScanner#check_until" do
-  before :each do
+  before do
     @s = StringScanner.new("This is a test")
   end
 
-  it "returns the same value of scan_until, but don't advances the scan pointer" do
+  it "returns the same value of #scan_until, but don't advances the scan pointer" do
     @s.check_until(/a/).should == "This is a"
     @s.pos.should == 0
-    @s.matched.should == "a"
     @s.check_until(/test/).should == "This is a test"
   end
 
-  it "raises TypeError if given a String" do
-    -> {
-      @s.check_until('T')
-    }.should raise_error(TypeError, 'wrong argument type String (expected Regexp)')
+  it "sets the last match result" do
+    @s.check_until(/a/)
+
+    @s.pre_match.should == "This is "
+    @s.matched.should == "a"
+    @s.post_match.should == " test"
+  end
+
+  version_is StringScanner::Version, ""..."3.1.1" do # ruby_version_is ""..."3.4"
+    it "raises TypeError if given a String" do
+      -> {
+        @s.check_until('T')
+      }.should raise_error(TypeError, 'wrong argument type String (expected Regexp)')
+    end
+  end
+
+  version_is StringScanner::Version, "3.1.1" do # ruby_version_is "3.4"
+    it "searches a substring in the rest part of a string if given a String" do
+      @s.check_until("a").should == "This is a"
+      @s.pos.should == 0
+    end
+
+    # https://github.com/ruby/strscan/issues/131
+    ruby_version_is ""..."3.5" do # Don't run on 3.5.0dev that already contains not released fixes
+    version_is StringScanner::Version, "3.1.1"..."3.1.3" do # ruby_version_is "3.4.1"
+      it "sets the last match result if given a String" do
+        @s.check_until("a")
+
+        @s.pre_match.should == ""
+        @s.matched.should == "This is a"
+        @s.post_match.should == " test"
+      end
+    end
+    end
+
+    version_is StringScanner::Version, "3.1.3" do # ruby_version_is "3.4"
+      it "sets the last match result if given a String" do
+        @s.check_until("a")
+
+        @s.pre_match.should == "This is "
+        @s.matched.should == "a"
+        @s.post_match.should == " test"
+      end
+    end
+  end
+
+  describe "#[] successive call with a capture group name" do
+    context "when #check_until was called with a Regexp pattern" do
+      it "returns matched substring when matching succeeded" do
+        @s.check_until(/(?<a>This)/)
+        @s.should.matched?
+        @s[:a].should == "This"
+      end
+
+      it "returns nil when matching failed" do
+        @s.check_until(/(?<a>2008)/)
+        @s.should_not.matched?
+        @s[:a].should be_nil
+      end
+    end
+
+    version_is StringScanner::Version, "3.1.1" do # ruby_version_is "3.4"
+      context "when #check_until was called with a String pattern" do
+        # https://github.com/ruby/strscan/issues/139
+        ruby_version_is ""..."3.5" do # Don't run on 3.5.0dev that already contains not released fixes
+        version_is StringScanner::Version, "3.1.1"..."3.1.3" do # ruby_version_is "3.4.0"..."3.4.3"
+          it "returns nil when matching succeeded" do
+            @s.check_until("This")
+            @s.should.matched?
+            @s[:a].should be_nil
+          end
+        end
+        end
+        version_is StringScanner::Version, "3.1.3" do # ruby_version_is "3.4.3"
+          it "raises IndexError when matching succeeded" do
+            @s.check_until("This")
+            @s.should.matched?
+            -> { @s[:a] }.should raise_error(IndexError)
+          end
+        end
+
+        it "returns nil when matching failed" do
+          @s.check_until("2008")
+          @s.should_not.matched?
+          @s[:a].should be_nil
+        end
+
+        it "returns a matching substring when given Integer index" do
+          @s.check_until("This")
+          @s[0].should == "This"
+        end
+
+        # https://github.com/ruby/strscan/issues/135
+        ruby_version_is ""..."3.5" do # Don't run on 3.5.0dev that already contains not released fixes
+        version_is StringScanner::Version, "3.1.1"..."3.1.3" do # ruby_version_is "3.4.0"..."3.4.3"
+          it "ignores the previous matching with Regexp" do
+            @s.exist?(/(?<a>This)/)
+            @s.should.matched?
+            @s[:a].should == "This"
+
+            @s.check_until("This")
+            @s.should.matched?
+            @s[:a].should be_nil
+          end
+        end
+        end
+        version_is StringScanner::Version, "3.1.3" do # ruby_version_is "3.4.0"..."3.4.3"
+          it "ignores the previous matching with Regexp" do
+            @s.exist?(/(?<a>This)/)
+            @s.should.matched?
+            @s[:a].should == "This"
+
+            @s.check_until("This")
+            @s.should.matched?
+            -> { @s[:a] }.should raise_error(IndexError)
+          end
+        end
+      end
+    end
   end
 end
diff --git a/spec/ruby/library/stringscanner/element_reference_spec.rb b/spec/ruby/library/stringscanner/element_reference_spec.rb
index 60fe15d80791c7..91b6d86dc75155 100644
--- a/spec/ruby/library/stringscanner/element_reference_spec.rb
+++ b/spec/ruby/library/stringscanner/element_reference_spec.rb
@@ -8,6 +8,7 @@
 
   it "returns nil if there is no current match" do
     @s[0].should be_nil
+    @s[:wday].should be_nil
   end
 
   it "returns the n-th subgroup in the most recent match" do
@@ -42,12 +43,18 @@
     -> { @s[0..2]}.should raise_error(TypeError)
   end
 
-  it "raises a IndexError when there's no named capture" do
+  it "raises a IndexError when there's no any named capture group in the regexp" do
     @s.scan(/(\w+) (\w+) (\d+) /)
     -> { @s["wday"]}.should raise_error(IndexError)
     -> { @s[:wday]}.should raise_error(IndexError)
   end
 
+  it "raises a IndexError when given a not existing capture group name" do
+    @s.scan(/(?<a>\w+) (?<b>\w+) (?<c>\d+) /)
+    -> { @s["wday"]}.should raise_error(IndexError)
+    -> { @s[:wday]}.should raise_error(IndexError)
+  end
+
   it "returns named capture" do
     @s.scan(/(?<wday>\w+) (?<month>\w+) (?<day>\d+) /)
     @s["wday"].should == "Fri"
diff --git a/spec/ruby/library/stringscanner/exist_spec.rb b/spec/ruby/library/stringscanner/exist_spec.rb
index ff860a0d3e35dc..3f40c7a5a5a763 100644
--- a/spec/ruby/library/stringscanner/exist_spec.rb
+++ b/spec/ruby/library/stringscanner/exist_spec.rb
@@ -2,11 +2,11 @@
 require 'strscan'
 
 describe "StringScanner#exist?" do
-  before :each do
+  before do
     @s = StringScanner.new("This is a test")
   end
 
-  it "returns the index of the first occurrence of the given pattern" do
+  it "returns distance in bytes between the current position and the end of the matched substring" do
     @s.exist?(/s/).should == 4
     @s.scan(/This is/)
     @s.exist?(/s/).should == 6
@@ -22,9 +22,102 @@
     @s.exist?(/i/).should == nil
   end
 
-  it "raises TypeError if given a String" do
-    -> {
-      @s.exist?('T')
-    }.should raise_error(TypeError, 'wrong argument type String (expected Regexp)')
+  it "does not modify the current position" do
+    @s.pos.should == 0
+    @s.exist?(/s/).should == 4
+    @s.pos.should == 0
+  end
+
+  version_is StringScanner::Version, ""..."3.1.1" do # ruby_version_is ""..."3.4"
+    it "raises TypeError if given a String" do
+      -> {
+        @s.exist?('T')
+      }.should raise_error(TypeError, 'wrong argument type String (expected Regexp)')
+    end
+  end
+
+  version_is StringScanner::Version, "3.1.1" do # ruby_version_is "3.4"
+    it "searches a substring in the rest part of a string if given a String" do
+      @s.exist?('a').should == 9
+    end
+
+    it "returns nil if the pattern isn't found in the string" do
+      @s.exist?("S").should == nil
+    end
+  end
+
+  describe "#[] successive call with a capture group name" do
+    context "when #exist? was called with a Regexp pattern" do
+      it "returns matched substring when matching succeeded" do
+        @s.exist?(/(?<a>This)/)
+        @s.should.matched?
+        @s[:a].should == "This"
+      end
+
+      it "returns nil when matching failed" do
+        @s.exist?(/(?<a>2008)/)
+        @s.should_not.matched?
+        @s[:a].should be_nil
+      end
+    end
+
+    version_is StringScanner::Version, "3.1.1" do # ruby_version_is "3.4"
+      context "when #exist? was called with a String pattern" do
+        # https://github.com/ruby/strscan/issues/139
+        ruby_version_is ""..."3.5" do # Don't run on 3.5.0dev that already contains not released fixes
+        version_is StringScanner::Version, "3.1.1"..."3.1.3" do # ruby_version_is "3.4.0"..."3.4.3"
+          it "returns nil when matching succeeded" do
+            @s.exist?("This")
+            @s.should.matched?
+            @s[:a].should be_nil
+          end
+        end
+        end
+        version_is StringScanner::Version, "3.1.3" do # ruby_version_is "3.4.3"
+          it "raises IndexError when matching succeeded" do
+            @s.exist?("This")
+            @s.should.matched?
+            -> { @s[:a] }.should raise_error(IndexError)
+          end
+        end
+
+        it "returns nil when matching failed" do
+          @s.exist?("2008")
+          @s.should_not.matched?
+          @s[:a].should be_nil
+        end
+
+        it "returns a matching substring when given Integer index" do
+          @s.exist?("This")
+          @s[0].should == "This"
+        end
+
+        # https://github.com/ruby/strscan/issues/135
+        ruby_version_is ""..."3.5" do # Don't run on 3.5.0dev that already contains not released fixes
+        version_is StringScanner::Version, "3.1.1"..."3.1.3" do # ruby_version_is "3.4.0"..."3.4.3"
+          it "ignores the previous matching with Regexp" do
+            @s.exist?(/(?<a>This)/)
+            @s.should.matched?
+            @s[:a].should == "This"
+
+            @s.exist?("This")
+            @s.should.matched?
+            @s[:a].should be_nil
+          end
+        end
+        end
+        version_is StringScanner::Version, "3.1.3" do # ruby_version_is "3.4.0"..."3.4.3"
+          it "ignores the previous matching with Regexp" do
+            @s.exist?(/(?<a>This)/)
+            @s.should.matched?
+            @s[:a].should == "This"
+
+            @s.exist?("This")
+            @s.should.matched?
+            -> { @s[:a] }.should raise_error(IndexError)
+          end
+        end
+      end
+    end
   end
 end
diff --git a/spec/ruby/library/stringscanner/fixed_anchor_spec.rb b/spec/ruby/library/stringscanner/fixed_anchor_spec.rb
new file mode 100644
index 00000000000000..ce0b714fa89370
--- /dev/null
+++ b/spec/ruby/library/stringscanner/fixed_anchor_spec.rb
@@ -0,0 +1,17 @@
+require_relative '../../spec_helper'
+require 'strscan'
+
+describe "StringScanner#fixed_anchor?" do
+  it "returns whether the fixed-anchor property is set" do
+    s = StringScanner.new("foo", fixed_anchor: true)
+    s.should.fixed_anchor?
+
+    s = StringScanner.new("foo", fixed_anchor: false)
+    s.should_not.fixed_anchor?
+  end
+
+  it "is set to false by default" do
+    s = StringScanner.new("foo")
+    s.should_not.fixed_anchor?
+  end
+end
diff --git a/spec/ruby/library/stringscanner/getch_spec.rb b/spec/ruby/library/stringscanner/getch_spec.rb
index a6be0d4221c833..c9c3eb6fd3ecce 100644
--- a/spec/ruby/library/stringscanner/getch_spec.rb
+++ b/spec/ruby/library/stringscanner/getch_spec.rb
@@ -1,4 +1,4 @@
-# -*- encoding: binary -*-
+# encoding: binary
 require_relative '../../spec_helper'
 require_relative 'shared/extract_range'
 require 'strscan'
@@ -13,7 +13,7 @@
 
   it "is multi-byte character sensitive" do
     # Japanese hiragana "A" in EUC-JP
-    src = "\244\242".force_encoding("euc-jp")
+    src = "\244\242".dup.force_encoding("euc-jp")
 
     s = StringScanner.new(src)
     s.getch.should == src
@@ -31,5 +31,63 @@
     s.getch.should == nil
   end
 
+  describe "#[] successive call with a capture group name" do
+    # https://github.com/ruby/strscan/issues/139
+    ruby_version_is ""..."3.5" do # Don't run on 3.5.0dev that already contains not released fixes
+    version_is StringScanner::Version, "3.1.1"..."3.1.3" do # ruby_version_is "3.4.0"..."3.4.3"
+      it "returns nil" do
+        s = StringScanner.new("This is a test")
+        s.getch
+        s.should.matched?
+        s[:a].should be_nil
+      end
+    end
+    end
+    version_is StringScanner::Version, "3.1.3" do # ruby_version_is "3.4.3"
+      it "raises IndexError" do
+        s = StringScanner.new("This is a test")
+        s.getch
+        s.should.matched?
+        -> { s[:a] }.should raise_error(IndexError)
+      end
+    end
+
+    it "returns a matching character when given Integer index" do
+      s = StringScanner.new("This is a test")
+      s.getch
+      s[0].should == "T"
+    end
+
+    # https://github.com/ruby/strscan/issues/135
+    ruby_version_is ""..."3.5" do # Don't run on 3.5.0dev that already contains not released fixes
+    version_is StringScanner::Version, "3.1.1"..."3.1.3" do # ruby_version_is "3.4.0"..."3.4.3"
+      it "ignores the previous matching with Regexp" do
+        s = StringScanner.new("This is a test")
+
+        s.exist?(/(?<a>This)/)
+        s.should.matched?
+        s[:a].should == "This"
+
+        s.getch
+        s.should.matched?
+        s[:a].should be_nil
+      end
+    end
+    end
+    version_is StringScanner::Version, "3.1.3" do # ruby_version_is "3.4.0"..."3.4.3"
+      it "ignores the previous matching with Regexp" do
+        s = StringScanner.new("This is a test")
+
+        s.exist?(/(?<a>This)/)
+        s.should.matched?
+        s[:a].should == "This"
+
+        s.getch
+        s.should.matched?
+        -> { s[:a] }.should raise_error(IndexError)
+      end
+    end
+  end
+
   it_behaves_like :extract_range, :getch
 end
diff --git a/spec/ruby/library/stringscanner/initialize_spec.rb b/spec/ruby/library/stringscanner/initialize_spec.rb
index 047d9d058b7d53..77f6084c1b7768 100644
--- a/spec/ruby/library/stringscanner/initialize_spec.rb
+++ b/spec/ruby/library/stringscanner/initialize_spec.rb
@@ -24,4 +24,9 @@
     scan = StringScanner.new(m)
     scan.string.should == s
   end
+
+  it "accepts a fixed_anchor keyword argument" do
+    s = StringScanner.new("foo", fixed_anchor: true)
+    s.should.fixed_anchor?
+  end
 end
diff --git a/spec/ruby/library/stringscanner/match_spec.rb b/spec/ruby/library/stringscanner/match_spec.rb
index ec59680914ba46..a27bb51d72c9c2 100644
--- a/spec/ruby/library/stringscanner/match_spec.rb
+++ b/spec/ruby/library/stringscanner/match_spec.rb
@@ -17,6 +17,15 @@
     @s.match?(/\s+/).should == nil
   end
 
+  it "sets the last match result" do
+    @s.pos = 8
+    @s.match?(/a/)
+
+    @s.pre_match.should == "This is "
+    @s.matched.should == "a"
+    @s.post_match.should == " test"
+  end
+
   it "effects pre_match" do
     @s.scan(/\w+/)
     @s.scan(/\s/)
@@ -25,4 +34,18 @@
     @s.match?(/\w+/)
     @s.pre_match.should == "This "
   end
+
+  describe "#[] successive call with a capture group name" do
+    it "returns matched substring when matching succeeded" do
+      @s.match?(/(?<a>This)/)
+      @s.should.matched?
+      @s[:a].should == "This"
+    end
+
+    it "returns nil when matching failed" do
+      @s.match?(/(?<a>2008)/)
+      @s.should_not.matched?
+      @s[:a].should be_nil
+    end
+  end
 end
diff --git a/spec/ruby/library/stringscanner/must_C_version_spec.rb b/spec/ruby/library/stringscanner/must_C_version_spec.rb
index fcc5b596f6c901..9d6edfe7b63d97 100644
--- a/spec/ruby/library/stringscanner/must_C_version_spec.rb
+++ b/spec/ruby/library/stringscanner/must_C_version_spec.rb
@@ -3,6 +3,6 @@
 
 describe "StringScanner.must_C_version" do
   it "returns self" do
-     StringScanner.must_C_version.should == StringScanner
+    StringScanner.must_C_version.should == StringScanner
   end
 end
diff --git a/spec/ruby/library/stringscanner/named_captures_spec.rb b/spec/ruby/library/stringscanner/named_captures_spec.rb
new file mode 100644
index 00000000000000..a68d66c216a82e
--- /dev/null
+++ b/spec/ruby/library/stringscanner/named_captures_spec.rb
@@ -0,0 +1,30 @@
+require_relative '../../spec_helper'
+require 'strscan'
+
+describe "StringScanner#named_captures" do
+  before do
+    @s = StringScanner.new('Fri Dec 12 1975 14:39')
+  end
+
+  it "returns a hash of names and matched substrings for named capturing groups in a regular expression of the most recent matching" do
+    @s.exist?(/(?<wday>\w+) (?<month>\w+) (?<day>\d+)/)
+    @s.named_captures.should == {"wday" => "Fri", "month" => "Dec", "day" => "12"}
+  end
+
+  it "returns {} if there are no named capturing groups" do
+    @s.exist?(/(\w+) (\w+) (\d+)/)
+    @s.named_captures.should == {}
+  end
+
+  # https://github.com/ruby/strscan/issues/132
+  ruby_bug "", ""..."3.3" do # fixed in strscan v3.0.7
+    it "returns {} if there is no any matching done" do
+      @s.named_captures.should == {}
+    end
+  end
+
+  it "returns nil for an optional named capturing group if it doesn't match" do
+    @s.exist?(/(?<wday>\w+) (?<month>\w+) (?<day>\s+)?/)
+    @s.named_captures.should == {"wday" => "Fri", "month" => "Dec", "day" => nil}
+  end
+end
diff --git a/spec/ruby/library/stringscanner/peek_byte_spec.rb b/spec/ruby/library/stringscanner/peek_byte_spec.rb
new file mode 100644
index 00000000000000..88ef4a2b7c1bda
--- /dev/null
+++ b/spec/ruby/library/stringscanner/peek_byte_spec.rb
@@ -0,0 +1,35 @@
+require_relative '../../spec_helper'
+require 'strscan'
+
+version_is StringScanner::Version, "3.1.1" do # ruby_version_is "3.4"
+  describe "StringScanner#peek_byte" do
+    it "returns a byte at the current position as an Integer" do
+      s = StringScanner.new('This is a test')
+      s.peek_byte.should == 84
+    end
+
+    it "returns nil at the end of the string" do
+      s = StringScanner.new('a')
+      s.getch # skip one
+      s.pos.should == 1
+      s.peek_byte.should == nil
+    end
+
+    it "is not multi-byte character sensitive" do
+      s = StringScanner.new("∂") # "∂".bytes => [226, 136, 130]
+      s.peek_byte.should == 226
+      s.pos = 1
+      s.peek_byte.should == 136
+      s.pos = 2
+      s.peek_byte.should == 130
+    end
+
+    it "doesn't change current position" do
+      s = StringScanner.new('This is a test')
+
+      s.pos.should == 0
+      s.peek_byte.should == 84
+      s.pos.should == 0
+    end
+  end
+end
diff --git a/spec/ruby/library/stringscanner/scan_byte_spec.rb b/spec/ruby/library/stringscanner/scan_byte_spec.rb
new file mode 100644
index 00000000000000..c60e22be4f508c
--- /dev/null
+++ b/spec/ruby/library/stringscanner/scan_byte_spec.rb
@@ -0,0 +1,102 @@
+require_relative '../../spec_helper'
+require 'strscan'
+
+version_is StringScanner::Version, "3.1.1" do # ruby_version_is "3.4"
+  describe "StringScanner#scan_byte" do
+    it "scans one byte and returns it as on Integer" do
+      s = StringScanner.new('abc') # "abc".bytes => [97, 98, 99]
+      s.scan_byte.should == 97
+      s.scan_byte.should == 98
+      s.scan_byte.should == 99
+    end
+
+    it "is not multi-byte character sensitive" do
+      s = StringScanner.new("あ") # "あ".bytes => [227, 129, 130]
+      s.scan_byte.should == 227
+      s.scan_byte.should == 129
+      s.scan_byte.should == 130
+    end
+
+    it "returns nil at the end of the string" do
+      s = StringScanner.new('a')
+      s.scan_byte # skip one
+      s.scan_byte.should == nil
+      s.pos.should == 1
+    end
+
+    it "changes current position" do
+      s = StringScanner.new('abc')
+      s.pos.should == 0
+      s.scan_byte
+      s.pos.should == 1
+    end
+
+    it "sets the last match result" do
+      s = StringScanner.new('abc')
+      s.pos = 1
+      s.scan_byte
+
+      s.pre_match.should == "a"
+      s.matched.should == "b"
+      s.post_match.should == "c"
+    end
+
+    describe "#[] successive call with a capture group name" do
+      # https://github.com/ruby/strscan/issues/139
+      ruby_version_is ""..."3.5" do # Don't run on 3.5.0dev that already contains not released fixes
+      version_is StringScanner::Version, "3.1.1"..."3.1.3" do # ruby_version_is "3.4.0"..."3.4.3"
+        it "returns nil" do
+          s = StringScanner.new("abc")
+          s.scan_byte
+          s.should.matched?
+          s[:a].should be_nil
+        end
+      end
+      end
+      version_is StringScanner::Version, "3.1.3" do # ruby_version_is "3.4.3"
+        it "raises IndexError" do
+          s = StringScanner.new("abc")
+          s.scan_byte
+          s.should.matched?
+          -> { s[:a] }.should raise_error(IndexError)
+        end
+      end
+
+      it "returns a matching character when given Integer index" do
+        s = StringScanner.new("This is a test")
+        s.scan_byte
+        s[0].should == "T"
+      end
+
+      # https://github.com/ruby/strscan/issues/135
+      ruby_version_is ""..."3.5" do # Don't run on 3.5.0dev that already contains not released fixes
+      version_is StringScanner::Version, "3.1.1"..."3.1.3" do # ruby_version_is "3.4.0"..."3.4.3"
+        it "ignores the previous matching with Regexp" do
+          s = StringScanner.new("abc")
+
+          s.exist?(/(?<a>a)/)
+          s.should.matched?
+          s[:a].should == "a"
+
+          s.scan_byte
+          s.should.matched?
+          s[:a].should == nil
+        end
+      end
+      end
+      version_is StringScanner::Version, "3.1.3" do # ruby_version_is "3.4.0"..."3.4.3"
+        it "ignores the previous matching with Regexp" do
+          s = StringScanner.new("abc")
+
+          s.exist?(/(?<a>a)/)
+          s.should.matched?
+          s[:a].should == "a"
+
+          s.scan_byte
+          s.should.matched?
+          -> { s[:a] }.should raise_error(IndexError)
+        end
+      end
+    end
+  end
+end
diff --git a/spec/ruby/library/stringscanner/scan_full_spec.rb b/spec/ruby/library/stringscanner/scan_full_spec.rb
index ed34d7d3f615c8..967313f5ca8a6c 100644
--- a/spec/ruby/library/stringscanner/scan_full_spec.rb
+++ b/spec/ruby/library/stringscanner/scan_full_spec.rb
@@ -27,4 +27,18 @@
     @s.scan_full(/This/, true, true).should == "This"
     @s.pos.should == 4
   end
+
+  describe "#[] successive call with a capture group name" do
+    it "returns matched substring when matching succeeded" do
+      @s.scan_full(/(?<a>This)/, false, false)
+      @s.should.matched?
+      @s[:a].should == "This"
+    end
+
+    it "returns nil when matching failed" do
+      @s.scan_full(/(?<a>2008)/, false, false)
+      @s.should_not.matched?
+      @s[:a].should be_nil
+    end
+  end
 end
diff --git a/spec/ruby/library/stringscanner/scan_integer_spec.rb b/spec/ruby/library/stringscanner/scan_integer_spec.rb
new file mode 100644
index 00000000000000..a0b3685bae1086
--- /dev/null
+++ b/spec/ruby/library/stringscanner/scan_integer_spec.rb
@@ -0,0 +1,163 @@
+require_relative '../../spec_helper'
+require 'strscan'
+
+version_is StringScanner::Version, "3.1.1" do # ruby_version_is "3.4"
+  describe "StringScanner#scan_integer" do
+    it "returns the matched Integer literal starting from the current position" do
+      s = StringScanner.new("42")
+      s.scan_integer.should == 42
+    end
+
+    it "returns nil when no Integer literal matched starting from the current position" do
+      s = StringScanner.new("a42")
+      s.scan_integer.should == nil
+    end
+
+    it "supports a sign +/-" do
+      StringScanner.new("+42").scan_integer.should == 42
+      StringScanner.new("-42").scan_integer.should == -42
+    end
+
+    it "changes the current position" do
+      s = StringScanner.new("42abc")
+      s.scan_integer
+      s.pos.should == 2
+    end
+
+    # https://github.com/ruby/strscan/issues/130
+    ruby_bug "", "3.4"..."3.5" do # introduced in strscan v3.1.1
+      it "sets the last match result" do
+        s = StringScanner.new("42abc")
+        s.scan_integer
+
+        s.should.matched?
+        s.matched.should == "42"
+        s.pre_match.should == ""
+        s.post_match.should == "abc"
+        s.matched_size.should == 2
+      end
+    end
+
+    it "raises Encoding::CompatibilityError when a scanned string not is ASCII-compatible encoding" do
+      string = "42".encode(Encoding::UTF_16BE)
+      s = StringScanner.new(string)
+
+      -> {
+        s.scan_integer
+      }.should raise_error(Encoding::CompatibilityError, 'ASCII incompatible encoding: UTF-16BE')
+    end
+
+    context "given base" do
+      it "supports base: 10" do
+        s = StringScanner.new("42")
+        s.scan_integer(base: 10).should == 42
+      end
+
+      it "supports base: 16" do
+        StringScanner.new("0xff").scan_integer(base: 16).should == 0xff
+        StringScanner.new("-0xff").scan_integer(base: 16).should == -0xff
+        StringScanner.new("0xFF").scan_integer(base: 16).should == 0xff
+        StringScanner.new("-0xFF").scan_integer(base: 16).should == -0xff
+        StringScanner.new("ff").scan_integer(base: 16).should == 0xff
+        StringScanner.new("-ff").scan_integer(base: 16).should == -0xff
+      end
+
+      it "raises ArgumentError when passed not supported base" do
+        -> {
+          StringScanner.new("42").scan_integer(base: 5)
+        }.should raise_error(ArgumentError, "Unsupported integer base: 5, expected 10 or 16")
+      end
+
+      ruby_version_is ""..."3.5" do # Don't run on 3.5.0dev that already contains not released fixes
+      version_is StringScanner::Version, "3.1.1"..."3.1.3" do # ruby_version_is "3.4.0"..."3.4.3"
+        it "does not match '0x' prefix on its own" do
+          StringScanner.new("0x").scan_integer(base: 16).should == nil
+          StringScanner.new("-0x").scan_integer(base: 16).should == nil
+          StringScanner.new("+0x").scan_integer(base: 16).should == nil
+        end
+      end
+      end
+
+      version_is StringScanner::Version, "3.1.3" do # ruby_version_is "3.4.3"
+        it "matches '0' in a '0x' that is followed by non-hex characters" do
+          StringScanner.new("0x!@#").scan_integer(base: 16).should == 0
+          StringScanner.new("-0x!@#").scan_integer(base: 16).should == 0
+          StringScanner.new("+0x!@#").scan_integer(base: 16).should == 0
+        end
+
+        it "matches '0' in a '0x' located in the end of a string" do
+          StringScanner.new("0x").scan_integer(base: 16).should == 0
+          StringScanner.new("-0x").scan_integer(base: 16).should == 0
+          StringScanner.new("+0x").scan_integer(base: 16).should == 0
+        end
+      end
+    end
+  end
+
+  describe "#[] successive call with a capture group name" do
+    # https://github.com/ruby/strscan/issues/139
+    ruby_version_is ""..."3.5" do # Don't run on 3.5.0dev that already contains not released fixes
+    version_is StringScanner::Version, "3.1.1"..."3.1.3" do # ruby_version_is "3.4.0"..."3.4.3"
+      it "returns nil substring when matching succeeded" do
+        s = StringScanner.new("42")
+        s.scan_integer
+        s.should.matched?
+        s[:a].should == nil
+      end
+    end
+    end
+    version_is StringScanner::Version, "3.1.3" do # ruby_version_is "3.4.3"
+      it "raises IndexError when matching succeeded" do
+        s = StringScanner.new("42")
+        s.scan_integer
+        s.should.matched?
+        -> { s[:a] }.should raise_error(IndexError)
+      end
+    end
+
+    it "returns nil when matching failed" do
+      s = StringScanner.new("a42")
+      s.scan_integer
+      s.should_not.matched?
+      s[:a].should be_nil
+    end
+
+    version_is StringScanner::Version, "3.1.3" do # ruby_version_is "3.4"
+      it "returns a matching substring when given Integer index" do
+        s = StringScanner.new("42")
+        s.scan_integer
+        s[0].should == "42"
+      end
+    end
+
+    # https://github.com/ruby/strscan/issues/135
+    ruby_version_is ""..."3.5" do # Don't run on 3.5.0dev that already contains not released fixes
+    version_is StringScanner::Version, "3.1.1"..."3.1.3" do # ruby_version_is "3.4.0"..."3.4.3"
+      it "does not ignore the previous matching with Regexp" do
+        s = StringScanner.new("42")
+
+        s.exist?(/(?<a>42)/)
+        s.should.matched?
+        s[:a].should == "42"
+
+        s.scan_integer
+        s.should.matched?
+        s[:a].should == "42"
+      end
+    end
+    end
+    version_is StringScanner::Version, "3.1.3" do # ruby_version_is "3.4"
+      it "ignores the previous matching with Regexp" do
+        s = StringScanner.new("42")
+
+        s.exist?(/(?<a>42)/)
+        s.should.matched?
+        s[:a].should == "42"
+
+        s.scan_integer
+        s.should.matched?
+        -> { s[:a] }.should raise_error(IndexError)
+      end
+    end
+  end
+end
diff --git a/spec/ruby/library/stringscanner/scan_spec.rb b/spec/ruby/library/stringscanner/scan_spec.rb
index ea711767b97992..088c3419fbce39 100644
--- a/spec/ruby/library/stringscanner/scan_spec.rb
+++ b/spec/ruby/library/stringscanner/scan_spec.rb
@@ -60,6 +60,20 @@
     -> { @s.scan(:test)     }.should raise_error(TypeError)
     -> { @s.scan(mock('x')) }.should raise_error(TypeError)
   end
+
+  describe "#[] successive call with a capture group name" do
+    it "returns matched substring when matching succeeded" do
+      @s.scan(/(?<a>This)/)
+      @s.should.matched?
+      @s[:a].should == "This"
+    end
+
+    it "returns nil when matching failed" do
+      @s.scan(/(?<a>2008)/)
+      @s.should_not.matched?
+      @s[:a].should be_nil
+    end
+  end
 end
 
 describe "StringScanner#scan with fixed_anchor: true" do
diff --git a/spec/ruby/library/stringscanner/scan_until_spec.rb b/spec/ruby/library/stringscanner/scan_until_spec.rb
index 6b7782572d381f..737d83a14ca32d 100644
--- a/spec/ruby/library/stringscanner/scan_until_spec.rb
+++ b/spec/ruby/library/stringscanner/scan_until_spec.rb
@@ -2,14 +2,20 @@
 require 'strscan'
 
 describe "StringScanner#scan_until" do
-  before :each do
+  before do
     @s = StringScanner.new("This is a test")
   end
 
   it "returns the substring up to and including the end of the match" do
-   @s.scan_until(/a/).should == "This is a"
-   @s.pre_match.should == "This is "
-   @s.post_match.should == " test"
+    @s.scan_until(/a/).should == "This is a"
+  end
+
+  it "sets the last match result" do
+    @s.scan_until(/a/)
+
+    @s.pre_match.should == "This is "
+    @s.matched.should == "a"
+    @s.post_match.should == " test"
   end
 
   it "returns nil if there's no match" do
@@ -21,9 +27,115 @@
     @s.scan_until(/^h/).should == "h"
   end
 
-  it "raises TypeError if given a String" do
-    -> {
-      @s.scan_until('T')
-    }.should raise_error(TypeError, 'wrong argument type String (expected Regexp)')
+  version_is StringScanner::Version, ""..."3.1.1" do # ruby_version_is ""..."3.4"
+    it "raises TypeError if given a String" do
+      -> {
+        @s.scan_until('T')
+      }.should raise_error(TypeError, 'wrong argument type String (expected Regexp)')
+    end
+  end
+
+  version_is StringScanner::Version, "3.1.1" do # ruby_version_is "3.4"
+    it "searches a substring in the rest part of a string if given a String" do
+      @s.scan_until("a").should == "This is a"
+    end
+
+    # https://github.com/ruby/strscan/issues/131
+    ruby_version_is ""..."3.5" do # Don't run on 3.5.0dev that already contains not released fixes
+    version_is StringScanner::Version, "3.1.1"..."3.1.3" do # ruby_version_is "3.4.1"
+      it "sets the last match result if given a String" do
+        @s.scan_until("a")
+
+        @s.pre_match.should == ""
+        @s.matched.should == "This is a"
+        @s.post_match.should == " test"
+      end
+    end
+    end
+
+    version_is StringScanner::Version, "3.1.3" do # ruby_version_is "3.4"
+      it "sets the last match result if given a String" do
+        @s.scan_until("a")
+
+        @s.pre_match.should == "This is "
+        @s.matched.should == "a"
+        @s.post_match.should == " test"
+      end
+    end
+  end
+
+  describe "#[] successive call with a capture group name" do
+    context "when #scan_until was called with a Regexp pattern" do
+      it "returns matched substring when matching succeeded" do
+        @s.scan_until(/(?<a>This)/)
+        @s.should.matched?
+        @s[:a].should == "This"
+      end
+
+      it "returns nil when matching failed" do
+        @s.scan_until(/(?<a>2008)/)
+        @s.should_not.matched?
+        @s[:a].should be_nil
+      end
+    end
+
+    version_is StringScanner::Version, "3.1.1" do # ruby_version_is "3.4"
+      context "when #scan_until was called with a String pattern" do
+        # https://github.com/ruby/strscan/issues/139
+        ruby_version_is ""..."3.5" do # Don't run on 3.5.0dev that already contains not released fixes
+        version_is StringScanner::Version, "3.1.1"..."3.1.3" do # ruby_version_is "3.4.0"..."3.4.3"
+          it "returns nil when matching succeeded" do
+            @s.scan_until("This")
+            @s.should.matched?
+            @s[:a].should be_nil
+          end
+        end
+        end
+        version_is StringScanner::Version, "3.1.3" do # ruby_version_is "3.4.3"
+          it "raises IndexError when matching succeeded" do
+            @s.scan_until("This")
+            @s.should.matched?
+            -> { @s[:a] }.should raise_error(IndexError)
+          end
+        end
+
+        it "returns nil when matching failed" do
+          @s.scan_until("2008")
+          @s.should_not.matched?
+          @s[:a].should be_nil
+        end
+
+        it "returns a matching substring when given Integer index" do
+          @s.scan_until("This")
+          @s[0].should == "This"
+        end
+
+        # https://github.com/ruby/strscan/issues/135
+        ruby_version_is ""..."3.5" do # Don't run on 3.5.0dev that already contains not released fixes
+        version_is StringScanner::Version, "3.1.1"..."3.1.3" do # ruby_version_is "3.4.0"..."3.4.3"
+          it "ignores the previous matching with Regexp" do
+            @s.exist?(/(?<a>This)/)
+            @s.should.matched?
+            @s[:a].should == "This"
+
+            @s.scan_until("This")
+            @s.should.matched?
+            @s[:a].should be_nil
+          end
+        end
+        end
+        version_is StringScanner::Version, "3.1.3" do # ruby_version_is "3.4"
+          it "ignores the previous matching with Regexp" do
+            @s.exist?(/(?<a>This)/)
+            @s.should.matched?
+            @s[:a].should == "This"
+
+            @s.scan_until("This")
+            @s.should.matched?
+            -> { @s[:a] }.should raise_error(IndexError)
+          end
+        end
+      end
+    end
   end
 end
diff --git a/spec/ruby/library/stringscanner/search_full_spec.rb b/spec/ruby/library/stringscanner/search_full_spec.rb
index 7d2a714fa56799..a089da2043b1ea 100644
--- a/spec/ruby/library/stringscanner/search_full_spec.rb
+++ b/spec/ruby/library/stringscanner/search_full_spec.rb
@@ -2,7 +2,7 @@
 require 'strscan'
 
 describe "StringScanner#search_full" do
-  before :each do
+  before do
     @s = StringScanner.new("This is a test")
   end
 
@@ -28,9 +28,110 @@
     @s.pos.should == 4
   end
 
-  it "raises TypeError if given a String" do
-    -> {
-      @s.search_full('T', true, true)
-    }.should raise_error(TypeError, 'wrong argument type String (expected Regexp)')
+  it "sets the last match result" do
+    @s.search_full(/is a/, false, false)
+
+    @s.pre_match.should == "This "
+    @s.matched.should == "is a"
+    @s.post_match.should == " test"
+  end
+
+  version_is StringScanner::Version, ""..."3.1.1" do # ruby_version_is ""..."3.4"
+    it "raises TypeError if given a String" do
+      -> {
+        @s.search_full('T', true, true)
+      }.should raise_error(TypeError, 'wrong argument type String (expected Regexp)')
+    end
+  end
+
+  version_is StringScanner::Version, "3.1.1" do # ruby_version_is "3.4"
+    it "searches a substring in the rest part of a string if given a String" do
+      @s.search_full("is a", false, false).should == 9
+    end
+
+    # https://github.com/ruby/strscan/issues/131
+    ruby_version_is ""..."3.5" do # Don't run on 3.5.0dev that already contains not released fixes
+    version_is StringScanner::Version, "3.1.1"..."3.1.3" do # ruby_version_is "3.4.1"
+      it "sets the last match result if given a String" do
+        @s.search_full("is a", false, false)
+
+        @s.pre_match.should == ""
+        @s.matched.should == "This is a"
+        @s.post_match.should == " test"
+      end
+    end
+    end
+
+    version_is StringScanner::Version, "3.1.3" do # ruby_version_is "3.4"
+      it "sets the last match result if given a String" do
+        @s.search_full("is a", false, false)
+
+        @s.pre_match.should == "This "
+        @s.matched.should == "is a"
+        @s.post_match.should == " test"
+      end
+    end
+  end
+
+  describe "#[] successive call with a capture group name" do
+    context "when #search_full was called with a Regexp pattern" do
+      it "returns matched substring when matching succeeded" do
+        @s.search_full(/(?<a>This)/, false, false)
+        @s.should.matched?
+        @s[:a].should == "This"
+      end
+
+      it "returns nil when matching failed" do
+        @s.search_full(/(?<a>2008)/, false, false)
+        @s.should_not.matched?
+        @s[:a].should be_nil
+      end
+    end
+
+    version_is StringScanner::Version, "3.1.1" do # ruby_version_is "3.4"
+      context "when #search_full was called with a String pattern" do
+        # https://github.com/ruby/strscan/issues/139
+        ruby_version_is ""..."3.5" do # Don't run on 3.5.0dev that already contains not released fixes
+        version_is StringScanner::Version, "3.1.1"..."3.1.3" do # ruby_version_is "3.4.0"..."3.4.3"
+          it "returns nil when matching succeeded" do
+            @s.search_full("This", false, false)
+            @s.should.matched?
+            @s[:a].should be_nil
+          end
+        end
+        end
+        version_is StringScanner::Version, "3.1.3" do # ruby_version_is "3.4.3"
+          it "raises IndexError when matching succeeded" do
+            @s.search_full("This", false, false)
+            @s.should.matched?
+            -> { @s[:a] }.should raise_error(IndexError)
+          end
+        end
+
+        it "returns nil when matching failed" do
+          @s.search_full("2008", false, false)
+          @s.should_not.matched?
+          @s[:a].should be_nil
+        end
+
+        it "returns a matching substring when given Integer index" do
+          @s.search_full("This", false, false)
+          @s[0].should == "This"
+        end
+
+        # https://github.com/ruby/strscan/issues/135
+        version_is StringScanner::Version, "3.1.3" do # ruby_version_is "3.4"
+          it "ignores the previous matching with Regexp" do
+            @s.exist?(/(?<a>This)/)
+            @s.should.matched?
+            @s[:a].should == "This"
+
+            @s.search_full("This", false, false)
+            @s.should.matched?
+            -> { @s[:a] }.should raise_error(IndexError)
+          end
+        end
+      end
+    end
   end
 end
diff --git a/spec/ruby/library/stringscanner/shared/concat.rb b/spec/ruby/library/stringscanner/shared/concat.rb
index cb884a5c01a6ca..1dbae11f7cc799 100644
--- a/spec/ruby/library/stringscanner/shared/concat.rb
+++ b/spec/ruby/library/stringscanner/shared/concat.rb
@@ -1,6 +1,6 @@
 describe :strscan_concat, shared: true do
   it "concatenates the given argument to self and returns self" do
-    s = StringScanner.new("hello ")
+    s = StringScanner.new(+"hello ")
     s.send(@method, 'world').should == s
     s.string.should == "hello world"
     s.eos?.should be_false
diff --git a/spec/ruby/library/stringscanner/shared/get_byte.rb b/spec/ruby/library/stringscanner/shared/get_byte.rb
index 763ab6f4a465f1..1f7378d5c6e72a 100644
--- a/spec/ruby/library/stringscanner/shared/get_byte.rb
+++ b/spec/ruby/library/stringscanner/shared/get_byte.rb
@@ -1,4 +1,6 @@
-# -*- encoding: binary -*-
+# encoding: binary
+require 'strscan'
+
 describe :strscan_get_byte, shared: true do
   it "scans one byte and returns it" do
     s = StringScanner.new('abc5.')
@@ -26,4 +28,60 @@
     s.send(@method) # skip one
     s.send(@method).should == nil
   end
+
+  describe "#[] successive call with a capture group name" do
+    # https://github.com/ruby/strscan/issues/139
+    ruby_version_is ""..."3.5" do # Don't run on 3.5.0dev that already contains not released fixes
+    version_is StringScanner::Version, "3.1.1"..."3.1.3" do # ruby_version_is "3.4.0"..."3.4.3"
+      it "returns nil" do
+        s = StringScanner.new("This is a test")
+        s.send(@method)
+        s.should.matched?
+        s[:a].should be_nil
+      end
+    end
+    end
+    version_is StringScanner::Version, "3.1.3" do # ruby_version_is "3.4.3"
+      it "raises IndexError" do
+        s = StringScanner.new("This is a test")
+        s.send(@method)
+        s.should.matched?
+        -> { s[:a] }.should raise_error(IndexError)
+      end
+    end
+
+    it "returns a matching character when given Integer index" do
+      s = StringScanner.new("This is a test")
+      s.send(@method)
+      s[0].should == "T"
+    end
+
+    # https://github.com/ruby/strscan/issues/135
+    ruby_version_is ""..."3.5" do # Don't run on 3.5.0dev that already contains not released fixes
+    version_is StringScanner::Version, "3.1.1"..."3.1.3" do # ruby_version_is "3.4.0"..."3.4.3"
+      it "ignores the previous matching with Regexp" do
+        s = StringScanner.new("This is a test")
+        s.exist?(/(?<a>This)/)
+        s.should.matched?
+        s[:a].should == "This"
+
+        s.send(@method)
+        s.should.matched?
+        s[:a].should be_nil
+      end
+    end
+    end
+    version_is StringScanner::Version, "3.1.3" do # ruby_version_is "3.4.3"
+      it "ignores the previous matching with Regexp" do
+        s = StringScanner.new("This is a test")
+        s.exist?(/(?<a>This)/)
+        s.should.matched?
+        s[:a].should == "This"
+
+        s.send(@method)
+        s.should.matched?
+        -> { s[:a] }.should raise_error(IndexError)
+      end
+    end
+  end
 end
diff --git a/spec/ruby/library/stringscanner/shared/pos.rb b/spec/ruby/library/stringscanner/shared/pos.rb
index 6d540881f2cd82..eea7ead6b5e2e8 100644
--- a/spec/ruby/library/stringscanner/shared/pos.rb
+++ b/spec/ruby/library/stringscanner/shared/pos.rb
@@ -22,6 +22,13 @@
     @s.terminate
     @s.send(@method).should == @s.string.length
   end
+
+  it "is not multi-byte character sensitive" do
+    s = StringScanner.new("abcädeföghi")
+
+    s.scan_until(/ö/)
+    s.pos.should == 10
+  end
 end
 
 describe :strscan_pos_set, shared: true do
diff --git a/spec/ruby/library/stringscanner/skip_spec.rb b/spec/ruby/library/stringscanner/skip_spec.rb
index 473361782c1664..12f5b7781c824f 100644
--- a/spec/ruby/library/stringscanner/skip_spec.rb
+++ b/spec/ruby/library/stringscanner/skip_spec.rb
@@ -15,4 +15,18 @@
     @s.skip(/\s+/).should == nil
     @s.skip(/\d+/).should == nil
   end
+
+  describe "#[] successive call with a capture group name" do
+    it "returns matched substring when matching succeeded" do
+      @s.skip(/(?<a>This)/)
+      @s.should.matched?
+      @s[:a].should == "This"
+    end
+
+    it "returns nil when matching failed" do
+      @s.skip(/(?<a>2008)/)
+      @s.should_not.matched?
+      @s[:a].should be_nil
+    end
+  end
 end
diff --git a/spec/ruby/library/stringscanner/skip_until_spec.rb b/spec/ruby/library/stringscanner/skip_until_spec.rb
index 7b56f13e4f6ebc..f5be4b5ceb0a15 100644
--- a/spec/ruby/library/stringscanner/skip_until_spec.rb
+++ b/spec/ruby/library/stringscanner/skip_until_spec.rb
@@ -2,23 +2,137 @@
 require 'strscan'
 
 describe "StringScanner#skip_until" do
-  before :each do
+  before do
     @s = StringScanner.new("This is a test")
   end
 
   it "returns the number of bytes advanced and advances the scan pointer until pattern is matched and consumed" do
     @s.skip_until(/a/).should == 9
     @s.pos.should == 9
+  end
+
+  it "sets the last match result" do
+    @s.skip_until(/a/)
+
+    @s.pre_match.should == "This is "
     @s.matched.should == "a"
+    @s.post_match.should == " test"
   end
 
   it "returns nil if no match was found" do
     @s.skip_until(/d+/).should == nil
   end
 
-  it "raises TypeError if given a String" do
-    -> {
-      @s.skip_until('T')
-    }.should raise_error(TypeError, 'wrong argument type String (expected Regexp)')
+  version_is StringScanner::Version, ""..."3.1.1" do # ruby_version_is ""..."3.4"
+    it "raises TypeError if given a String" do
+      -> {
+        @s.skip_until('T')
+      }.should raise_error(TypeError, 'wrong argument type String (expected Regexp)')
+    end
+  end
+
+  version_is StringScanner::Version, "3.1.1" do # ruby_version_is "3.4"
+    it "searches a substring in the rest part of a string if given a String" do
+      @s.skip_until("a").should == 9
+      @s.pos.should == 9
+    end
+
+    # https://github.com/ruby/strscan/issues/131
+    ruby_version_is ""..."3.5" do # Don't run on 3.5.0dev that already contains not released fixes
+    version_is StringScanner::Version, "3.1.1"..."3.1.3" do # ruby_version_is "3.4.1"
+      it "sets the last match result if given a String" do
+        @s.skip_until("a")
+
+        @s.pre_match.should == ""
+        @s.matched.should == "This is a"
+        @s.post_match.should == " test"
+      end
+    end
+    end
+
+    version_is StringScanner::Version, "3.1.3" do # ruby_version_is "3.4"
+      it "sets the last match result if given a String" do
+        @s.skip_until("a")
+
+        @s.pre_match.should == "This is "
+        @s.matched.should == "a"
+        @s.post_match.should == " test"
+      end
+    end
+  end
+
+  describe "#[] successive call with a capture group name" do
+    context "when #scan_until was called with a Regexp pattern" do
+      it "returns matched substring when matching succeeded" do
+        @s.skip_until(/(?<a>This)/)
+        @s.should.matched?
+        @s[:a].should == "This"
+      end
+
+      it "returns nil when matching failed" do
+        @s.skip_until(/(?<a>2008)/)
+        @s.should_not.matched?
+        @s[:a].should be_nil
+      end
+    end
+
+    version_is StringScanner::Version, "3.1.1" do # ruby_version_is "3.4"
+      context "when #skip_until was called with a String pattern" do
+        # https://github.com/ruby/strscan/issues/139
+        ruby_version_is ""..."3.5" do # Don't run on 3.5.0dev that already contains not released fixes
+        version_is StringScanner::Version, "3.1.1"..."3.1.3" do # ruby_version_is "3.4.0"..."3.4.3"
+          it "returns nil when matching succeeded" do
+            @s.skip_until("This")
+            @s.should.matched?
+            @s[:a].should be_nil
+          end
+        end
+        end
+        version_is StringScanner::Version, "3.1.3" do # ruby_version_is "3.4.3"
+          it "raises IndexError when matching succeeded" do
+            @s.skip_until("This")
+            @s.should.matched?
+            -> { @s[:a] }.should raise_error(IndexError)
+          end
+        end
+
+        it "returns nil when matching failed" do
+          @s.skip_until("2008")
+          @s.should_not.matched?
+          @s[:a].should be_nil
+        end
+
+        it "returns a matching substring when given Integer index" do
+          @s.skip_until("This")
+          @s[0].should == "This"
+        end
+
+        # https://github.com/ruby/strscan/issues/135
+        ruby_version_is ""..."3.5" do # Don't run on 3.5.0dev that already contains not released fixes
+        version_is StringScanner::Version, "3.1.1"..."3.1.3" do # ruby_version_is "3.4.0"..."3.4.3"
+          it "ignores the previous matching with Regexp" do
+            @s.exist?(/(?<a>This)/)
+            @s.should.matched?
+            @s[:a].should == "This"
+
+            @s.skip_until("This")
+            @s.should.matched?
+            @s[:a].should be_nil
+          end
+        end
+        end
+        version_is StringScanner::Version, "3.1.3" do # ruby_version_is "3.4"
+          it "ignores the previous matching with Regexp" do
+            @s.exist?(/(?<a>This)/)
+            @s.should.matched?
+            @s[:a].should == "This"
+
+            @s.skip_until("This")
+            @s.should.matched?
+            -> { @s[:a] }.should raise_error(IndexError)
+          end
+        end
+      end
+    end
   end
 end
diff --git a/spec/ruby/library/stringscanner/string_spec.rb b/spec/ruby/library/stringscanner/string_spec.rb
index 28e2f0ed373a6e..cba6bd51dd6cc8 100644
--- a/spec/ruby/library/stringscanner/string_spec.rb
+++ b/spec/ruby/library/stringscanner/string_spec.rb
@@ -3,7 +3,7 @@
 
 describe "StringScanner#string" do
   before :each do
-    @string = "This is a test"
+    @string = +"This is a test"
     @s = StringScanner.new(@string)
   end
 
diff --git a/spec/ruby/library/stringscanner/terminate_spec.rb b/spec/ruby/library/stringscanner/terminate_spec.rb
index 249023f1ab9ae4..7943efe0f916df 100644
--- a/spec/ruby/library/stringscanner/terminate_spec.rb
+++ b/spec/ruby/library/stringscanner/terminate_spec.rb
@@ -3,5 +3,5 @@
 require 'strscan'
 
 describe "StringScanner#terminate" do
-    it_behaves_like :strscan_terminate, :terminate
+  it_behaves_like :strscan_terminate, :terminate
 end
diff --git a/spec/ruby/library/stringscanner/values_at_spec.rb b/spec/ruby/library/stringscanner/values_at_spec.rb
new file mode 100644
index 00000000000000..14d4a5f6a7a0c3
--- /dev/null
+++ b/spec/ruby/library/stringscanner/values_at_spec.rb
@@ -0,0 +1,68 @@
+require_relative '../../spec_helper'
+require 'strscan'
+
+describe "StringScanner#captures" do
+  before do
+    @s = StringScanner.new('Fri Dec 12 1975 14:39')
+  end
+
+  context "when passed a list of Integers" do
+    it "returns an array containing each value given by one of integers" do
+      @s.exist?(/(?<wday>\w+) (?<month>\w+) (?<day>\d+)/)
+      @s.values_at(0, 1, 2, 3).should == ["Fri Dec 12", "Fri", "Dec", "12"]
+    end
+
+    it "returns nil value for any integer that is out of range" do
+      @s.exist?(/(?<wday>\w+) (?<month>\w+) (?<day>\d+)/)
+      @s.values_at(4).should == [nil]
+      @s.values_at(-5).should == [nil]
+    end
+  end
+
+  context "when passed names" do
+    it 'slices captures with the given names' do
+      @s.exist?(/(?<wday>\w+) (?<month>\w+) (?<day>\d+)/)
+      @s.values_at(:wday, :month, :day).should == ["Fri", "Dec", "12"]
+    end
+
+    it 'slices captures with the given String names' do
+      @s.exist?(/(?<wday>\w+) (?<month>\w+) (?<day>\d+)/)
+      @s.values_at("wday", "month", "day").should == ["Fri", "Dec", "12"]
+    end
+
+    it "raises IndexError when given unknown name" do
+      @s.exist?(/(?<wday>\w+) (?<month>\w+) (?<day>\d+)/)
+
+      -> {
+        @s.values_at("foo")
+      }.should raise_error(IndexError, "undefined group name reference: foo")
+    end
+  end
+
+  it 'supports mixing of names and indices' do
+    @s.exist?(/(?<wday>\w+) (?<month>\w+) (?<day>\d+)/)
+    @s.values_at(1, "wday", 2, "month", 3, "day").should == ["Fri", "Fri", "Dec", "Dec", "12", "12"]
+  end
+
+  it "returns a new empty Array if no arguments given" do
+    @s.exist?(/(?<wday>\w+) (?<month>\w+) (?<day>\d+)/)
+    @s.values_at().should == []
+  end
+
+  it "fails when passed arguments of unsupported types" do
+    @s.exist?(/(?<wday>\w+) (?<month>\w+) (?<day>\d+)/)
+
+    -> {
+      @s.values_at([])
+    }.should raise_error(TypeError, "no implicit conversion of Array into Integer")
+  end
+
+  it "returns nil if the most recent matching fails" do
+    @s.exist?(/(?<wday>\w+) (?<month>\w+) (?<day>\s+)/)
+    @s.values_at(1, 2, 3).should == nil
+  end
+
+  it "returns nil if there is no any matching done" do
+    @s.values_at(1, 2, 3).should == nil
+  end
+end
diff --git a/spec/ruby/library/syslog/constants_spec.rb b/spec/ruby/library/syslog/constants_spec.rb
index 2b9524c53d847d..fc9db47dd81956 100644
--- a/spec/ruby/library/syslog/constants_spec.rb
+++ b/spec/ruby/library/syslog/constants_spec.rb
@@ -4,7 +4,7 @@
   require 'syslog'
 
   describe "Syslog::Constants" do
-    platform_is_not :windows, :solaris, :aix do
+    platform_is_not :windows, :aix do
       before :all do
         @constants = %w(LOG_AUTHPRIV LOG_USER LOG_LOCAL2 LOG_NOTICE LOG_NDELAY
                       LOG_SYSLOG LOG_ALERT LOG_FTP LOG_LOCAL5 LOG_ERR LOG_AUTH
diff --git a/spec/ruby/library/syslog/log_spec.rb b/spec/ruby/library/syslog/log_spec.rb
index 8589fb1f7332ce..0c855b8257ea45 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, :android do
+    platform_is_not :windows, :darwin, :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 12e4ea8366a2e3..9f9302b214407c 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, :android do
+  platform_is_not :windows, :darwin, :aix, :android do
     before :each do
       Syslog.opened?.should be_false
     end
diff --git a/spec/ruby/library/time/iso8601_spec.rb b/spec/ruby/library/time/iso8601_spec.rb
index 4a9eb45613867e..ab35ab25d65356 100644
--- a/spec/ruby/library/time/iso8601_spec.rb
+++ b/spec/ruby/library/time/iso8601_spec.rb
@@ -2,6 +2,6 @@
 require_relative 'shared/xmlschema'
 require 'time'
 
-describe "Time.xmlschema" do
-  it_behaves_like :time_xmlschema, :iso8601
+describe "Time.iso8601" do
+  it_behaves_like :time_library_xmlschema, :iso8601
 end
diff --git a/spec/ruby/library/time/shared/rfc2822.rb b/spec/ruby/library/time/shared/rfc2822.rb
index d99f1f76decf0f..e460d655a68dd0 100644
--- a/spec/ruby/library/time/shared/rfc2822.rb
+++ b/spec/ruby/library/time/shared/rfc2822.rb
@@ -1,33 +1,33 @@
 describe :time_rfc2822, shared: true do
   it "parses RFC-822 strings" do
     t1 = (Time.utc(1976, 8, 26, 14, 30) + 4 * 3600)
-    t2 = Time.rfc2822("26 Aug 76 14:30 EDT")
+    t2 = Time.send(@method, "26 Aug 76 14:30 EDT")
     t1.should == t2
 
     t3 = Time.utc(1976, 8, 27, 9, 32) + 7 * 3600
-    t4 = Time.rfc2822("27 Aug 76 09:32 PDT")
+    t4 = Time.send(@method, "27 Aug 76 09:32 PDT")
     t3.should == t4
   end
 
   it "parses RFC-2822 strings" do
     t1 = Time.utc(1997, 11, 21, 9, 55, 6) + 6 * 3600
-    t2 = Time.rfc2822("Fri, 21 Nov 1997 09:55:06 -0600")
+    t2 = Time.send(@method, "Fri, 21 Nov 1997 09:55:06 -0600")
     t1.should == t2
 
     t3 = Time.utc(2003, 7, 1, 10, 52, 37) - 2 * 3600
-    t4 = Time.rfc2822("Tue, 1 Jul 2003 10:52:37 +0200")
+    t4 = Time.send(@method, "Tue, 1 Jul 2003 10:52:37 +0200")
     t3.should == t4
 
     t5 = Time.utc(1997, 11, 21, 10, 1, 10) + 6 * 3600
-    t6 = Time.rfc2822("Fri, 21 Nov 1997 10:01:10 -0600")
+    t6 = Time.send(@method, "Fri, 21 Nov 1997 10:01:10 -0600")
     t5.should == t6
 
     t7 = Time.utc(1997, 11, 21, 11, 0, 0) + 6 * 3600
-    t8 = Time.rfc2822("Fri, 21 Nov 1997 11:00:00 -0600")
+    t8 = Time.send(@method, "Fri, 21 Nov 1997 11:00:00 -0600")
     t7.should == t8
 
     t9 = Time.utc(1997, 11, 24, 14, 22, 1) + 8 * 3600
-    t10 = Time.rfc2822("Mon, 24 Nov 1997 14:22:01 -0800")
+    t10 = Time.send(@method, "Mon, 24 Nov 1997 14:22:01 -0800")
     t9.should == t10
 
     begin
@@ -36,11 +36,11 @@
       # ignore
     else
       t11 = Time.utc(1969, 2, 13, 23, 32, 54) + 3 * 3600 + 30 * 60
-      t12 = Time.rfc2822("Thu, 13 Feb 1969 23:32:54 -0330")
+      t12 = Time.send(@method, "Thu, 13 Feb 1969 23:32:54 -0330")
       t11.should == t12
 
       t13 = Time.utc(1969, 2, 13, 23, 32, 0) + 3 * 3600 + 30 * 60
-      t14 = Time.rfc2822(" Thu,
+      t14 = Time.send(@method, " Thu,
       13
         Feb
           1969
@@ -50,16 +50,16 @@
     end
 
     t15 = Time.utc(1997, 11, 21, 9, 55, 6)
-    t16 = Time.rfc2822("21 Nov 97 09:55:06 GMT")
+    t16 = Time.send(@method, "21 Nov 97 09:55:06 GMT")
     t15.should == t16
 
     t17 = Time.utc(1997, 11, 21, 9, 55, 6) + 6 * 3600
-    t18 = Time.rfc2822("Fri, 21 Nov 1997 09 :   55  :  06 -0600")
+    t18 = Time.send(@method, "Fri, 21 Nov 1997 09 :   55  :  06 -0600")
     t17.should == t18
 
     -> {
       # inner comment is not supported.
-      Time.rfc2822("Fri, 21 Nov 1997 09(comment):   55  :  06 -0600")
+      Time.send(@method, "Fri, 21 Nov 1997 09(comment):   55  :  06 -0600")
     }.should raise_error(ArgumentError)
   end
 end
diff --git a/spec/ruby/library/time/shared/xmlschema.rb b/spec/ruby/library/time/shared/xmlschema.rb
index 44d33cda7e386a..0002886ca5b24f 100644
--- a/spec/ruby/library/time/shared/xmlschema.rb
+++ b/spec/ruby/library/time/shared/xmlschema.rb
@@ -1,24 +1,24 @@
-describe :time_xmlschema, shared: true do
+describe :time_library_xmlschema, shared: true do
   it "parses ISO-8601 strings" do
     t = Time.utc(1985, 4, 12, 23, 20, 50, 520000)
     s = "1985-04-12T23:20:50.52Z"
-    t.should == Time.xmlschema(s)
-    #s.should == t.xmlschema(2)
+    t.should == Time.send(@method, s)
+    #s.should == t.send(@method, 2)
 
     t = Time.utc(1996, 12, 20, 0, 39, 57)
     s = "1996-12-19T16:39:57-08:00"
-    t.should == Time.xmlschema(s)
+    t.should == Time.send(@method, s)
     # There is no way to generate time string with arbitrary timezone.
     s = "1996-12-20T00:39:57Z"
-    t.should == Time.xmlschema(s)
-    #assert_equal(s, t.xmlschema)
+    t.should == Time.send(@method, s)
+    #assert_equal(s, t.send(@method))
 
     t = Time.utc(1990, 12, 31, 23, 59, 60)
     s = "1990-12-31T23:59:60Z"
-    t.should == Time.xmlschema(s)
+    t.should == Time.send(@method, s)
     # leap second is representable only if timezone file has it.
     s = "1990-12-31T15:59:60-08:00"
-    t.should == Time.xmlschema(s)
+    t.should == Time.send(@method, s)
 
     begin
       Time.at(-1)
@@ -27,27 +27,27 @@
     else
       t = Time.utc(1937, 1, 1, 11, 40, 27, 870000)
       s = "1937-01-01T12:00:27.87+00:20"
-      t.should == Time.xmlschema(s)
+      t.should == Time.send(@method, s)
     end
 
     # more
 
-    # (Time.utc(1999, 5, 31, 13, 20, 0) + 5 * 3600).should == Time.xmlschema("1999-05-31T13:20:00-05:00")
-    # (Time.local(2000, 1, 20, 12, 0, 0)).should == Time.xmlschema("2000-01-20T12:00:00")
-    # (Time.utc(2000, 1, 20, 12, 0, 0)).should == Time.xmlschema("2000-01-20T12:00:00Z")
-    # (Time.utc(2000, 1, 20, 12, 0, 0) - 12 * 3600).should == Time.xmlschema("2000-01-20T12:00:00+12:00")
-    # (Time.utc(2000, 1, 20, 12, 0, 0) + 13 * 3600).should == Time.xmlschema("2000-01-20T12:00:00-13:00")
-    # (Time.utc(2000, 3, 4, 23, 0, 0) - 3 * 3600).should == Time.xmlschema("2000-03-04T23:00:00+03:00")
-    # (Time.utc(2000, 3, 4, 20, 0, 0)).should == Time.xmlschema("2000-03-04T20:00:00Z")
-    # (Time.local(2000, 1, 15, 0, 0, 0)).should == Time.xmlschema("2000-01-15T00:00:00")
-    # (Time.local(2000, 2, 15, 0, 0, 0)).should == Time.xmlschema("2000-02-15T00:00:00")
-    # (Time.local(2000, 1, 15, 12, 0, 0)).should == Time.xmlschema("2000-01-15T12:00:00")
-    # (Time.utc(2000, 1, 16, 12, 0, 0)).should == Time.xmlschema("2000-01-16T12:00:00Z")
-    # (Time.local(2000, 1, 1, 12, 0, 0)).should == Time.xmlschema("2000-01-01T12:00:00")
-    # (Time.utc(1999, 12, 31, 23, 0, 0)).should == Time.xmlschema("1999-12-31T23:00:00Z")
-    # (Time.local(2000, 1, 16, 12, 0, 0)).should == Time.xmlschema("2000-01-16T12:00:00")
-    # (Time.local(2000, 1, 16, 0, 0, 0)).should == Time.xmlschema("2000-01-16T00:00:00")
-    # (Time.utc(2000, 1, 12, 12, 13, 14)).should == Time.xmlschema("2000-01-12T12:13:14Z")
-    # (Time.utc(2001, 4, 17, 19, 23, 17, 300000)).should == Time.xmlschema("2001-04-17T19:23:17.3Z")
+    # (Time.utc(1999, 5, 31, 13, 20, 0) + 5 * 3600).should == Time.send(@method, "1999-05-31T13:20:00-05:00")
+    # (Time.local(2000, 1, 20, 12, 0, 0)).should == Time.send(@method, "2000-01-20T12:00:00")
+    # (Time.utc(2000, 1, 20, 12, 0, 0)).should == Time.send(@method, "2000-01-20T12:00:00Z")
+    # (Time.utc(2000, 1, 20, 12, 0, 0) - 12 * 3600).should == Time.send(@method, "2000-01-20T12:00:00+12:00")
+    # (Time.utc(2000, 1, 20, 12, 0, 0) + 13 * 3600).should == Time.send(@method, "2000-01-20T12:00:00-13:00")
+    # (Time.utc(2000, 3, 4, 23, 0, 0) - 3 * 3600).should == Time.send(@method, "2000-03-04T23:00:00+03:00")
+    # (Time.utc(2000, 3, 4, 20, 0, 0)).should == Time.send(@method, "2000-03-04T20:00:00Z")
+    # (Time.local(2000, 1, 15, 0, 0, 0)).should == Time.send(@method, "2000-01-15T00:00:00")
+    # (Time.local(2000, 2, 15, 0, 0, 0)).should == Time.send(@method, "2000-02-15T00:00:00")
+    # (Time.local(2000, 1, 15, 12, 0, 0)).should == Time.send(@method, "2000-01-15T12:00:00")
+    # (Time.utc(2000, 1, 16, 12, 0, 0)).should == Time.send(@method, "2000-01-16T12:00:00Z")
+    # (Time.local(2000, 1, 1, 12, 0, 0)).should == Time.send(@method, "2000-01-01T12:00:00")
+    # (Time.utc(1999, 12, 31, 23, 0, 0)).should == Time.send(@method, "1999-12-31T23:00:00Z")
+    # (Time.local(2000, 1, 16, 12, 0, 0)).should == Time.send(@method, "2000-01-16T12:00:00")
+    # (Time.local(2000, 1, 16, 0, 0, 0)).should == Time.send(@method, "2000-01-16T00:00:00")
+    # (Time.utc(2000, 1, 12, 12, 13, 14)).should == Time.send(@method, "2000-01-12T12:13:14Z")
+    # (Time.utc(2001, 4, 17, 19, 23, 17, 300000)).should == Time.send(@method, "2001-04-17T19:23:17.3Z")
   end
 end
diff --git a/spec/ruby/library/time/to_datetime_spec.rb b/spec/ruby/library/time/to_datetime_spec.rb
deleted file mode 100644
index 9c44f38e5c2ff1..00000000000000
--- a/spec/ruby/library/time/to_datetime_spec.rb
+++ /dev/null
@@ -1,42 +0,0 @@
-require_relative '../../spec_helper'
-require 'time'
-require 'date'
-date_version = defined?(Date::VERSION) ? Date::VERSION : '3.1.0'
-
-describe "Time#to_datetime" do
-  it "returns a DateTime representing the same instant" do
-    time = Time.utc(2012, 12, 31, 23, 58, 59)
-    datetime = time.to_datetime
-    datetime.year.should == 2012
-    datetime.month.should == 12
-    datetime.day.should == 31
-    datetime.hour.should == 23
-    datetime.min.should == 58
-    datetime.sec.should == 59
-  end
-
-  version_is date_version, '3.2.3' do #ruby_version_is '3.2' do
-    it "returns a DateTime representing the same instant before Gregorian" do
-      time = Time.utc(1582, 10, 14, 23, 58, 59)
-      datetime = time.to_datetime
-      datetime.year.should == 1582
-      datetime.month.should == 10
-      datetime.day.should == 4
-      datetime.hour.should == 23
-      datetime.min.should == 58
-      datetime.sec.should == 59
-    end
-  end
-
-  it "roundtrips" do
-    time = Time.utc(3, 12, 31, 23, 58, 59)
-    datetime = time.to_datetime
-    datetime.to_time.utc.should == time
-  end
-
-  it "yields a DateTime with the default Calendar reform day" do
-    Time.utc(1582, 10,  4, 1, 2, 3).to_datetime.start.should == Date::ITALY
-    Time.utc(1582, 10, 14, 1, 2, 3).to_datetime.start.should == Date::ITALY
-    Time.utc(1582, 10, 15, 1, 2, 3).to_datetime.start.should == Date::ITALY
-  end
-end
diff --git a/spec/ruby/library/time/xmlschema_spec.rb b/spec/ruby/library/time/xmlschema_spec.rb
index 427931119971fe..ff3c864a02e85b 100644
--- a/spec/ruby/library/time/xmlschema_spec.rb
+++ b/spec/ruby/library/time/xmlschema_spec.rb
@@ -3,5 +3,5 @@
 require 'time'
 
 describe "Time.xmlschema" do
-  it_behaves_like :time_xmlschema, :xmlschema
+  it_behaves_like :time_library_xmlschema, :xmlschema
 end
diff --git a/spec/ruby/library/timeout/timeout_spec.rb b/spec/ruby/library/timeout/timeout_spec.rb
index 584b38d8ec8138..e16bcaea6ab298 100644
--- a/spec/ruby/library/timeout/timeout_spec.rb
+++ b/spec/ruby/library/timeout/timeout_spec.rb
@@ -39,4 +39,12 @@
       42
     end.should == 42
   end
+
+  ruby_version_is "3.4" do
+    it "raises an ArgumentError when provided with a negative duration" do
+      -> {
+        Timeout.timeout(-1)
+      }.should raise_error(ArgumentError, "Timeout sec must be a non-negative number")
+    end
+  end
 end
diff --git a/spec/ruby/library/uri/generic/host_spec.rb b/spec/ruby/library/uri/generic/host_spec.rb
index 210124ef6612de..4a5a162512da68 100644
--- a/spec/ruby/library/uri/generic/host_spec.rb
+++ b/spec/ruby/library/uri/generic/host_spec.rb
@@ -2,11 +2,9 @@
 require 'uri'
 
 describe "URI::Generic#host" do
-  version_is URI::VERSION, "0.12" do #ruby_version_is "3.2" do
-    # https://hackerone.com/reports/156615
-    it "returns empty string when host is empty" do
-      URI.parse('http:////foo.com').host.should == ''
-    end
+  # https://hackerone.com/reports/156615
+  it "returns empty string when host is empty" do
+    URI.parse('http:////foo.com').host.should == ''
   end
 end
 
diff --git a/spec/ruby/library/uri/generic/to_s_spec.rb b/spec/ruby/library/uri/generic/to_s_spec.rb
index 8cebd374a14146..c436ee3c038d41 100644
--- a/spec/ruby/library/uri/generic/to_s_spec.rb
+++ b/spec/ruby/library/uri/generic/to_s_spec.rb
@@ -2,10 +2,8 @@
 require 'uri'
 
 describe "URI::Generic#to_s" do
-  version_is URI::VERSION, "0.12" do #ruby_version_is "3.2" do
-    # https://hackerone.com/reports/156615
-    it "preserves / characters when host is empty" do
-      URI('http:///foo.com').to_s.should == 'http:///foo.com'
-    end
+  # https://hackerone.com/reports/156615
+  it "preserves / characters when host is empty" do
+    URI('http:///foo.com').to_s.should == 'http:///foo.com'
   end
 end
diff --git a/spec/ruby/library/uri/shared/parse.rb b/spec/ruby/library/uri/shared/parse.rb
index 87e1ee933ea52c..c5057b6c4bbb22 100644
--- a/spec/ruby/library/uri/shared/parse.rb
+++ b/spec/ruby/library/uri/shared/parse.rb
@@ -192,8 +192,15 @@
     file.should be_kind_of(URI::Generic)
   end
 
-  it "raises errors on malformed URIs" do
-    -> { @object.parse('http://a_b:80/') }.should raise_error(URI::InvalidURIError)
-    -> { @object.parse('http://a_b/') }.should raise_error(URI::InvalidURIError)
+  if URI::DEFAULT_PARSER == URI::RFC2396_Parser
+    it "raises errors on malformed URIs" do
+      -> { @object.parse('http://a_b:80/') }.should raise_error(URI::InvalidURIError)
+      -> { @object.parse('http://a_b/') }.should raise_error(URI::InvalidURIError)
+    end
+  elsif URI::DEFAULT_PARSER == URI::RFC3986_Parser
+    it "does not raise errors on URIs contained underscore" do
+      -> { @object.parse('http://a_b:80/') }.should_not raise_error(URI::InvalidURIError)
+      -> { @object.parse('http://a_b/') }.should_not raise_error(URI::InvalidURIError)
+    end
   end
 end
diff --git a/spec/ruby/library/win32ole/fixtures/classes.rb b/spec/ruby/library/win32ole/fixtures/classes.rb
index f61cf6ba697fc0..5a16fcca4563b2 100644
--- a/spec/ruby/library/win32ole/fixtures/classes.rb
+++ b/spec/ruby/library/win32ole/fixtures/classes.rb
@@ -1,14 +1,25 @@
 require 'win32ole'
 
+# win32ole deprecated constants like WIN32OLE_TYPELIB in Ruby 3.4
+# but only added the replacements like WIN32OLE::TypeLib in Ruby 3.4.
+# So we use the new-style constants in specs to avoid deprecation warnings
+# and we define the new-style constants as the old ones if they don't exist yet.
+WIN32OLE::TypeLib ||= WIN32OLE_TYPELIB
+WIN32OLE::RuntimeError ||= WIN32OLERuntimeError
+WIN32OLE::Method ||= WIN32OLE_METHOD
+WIN32OLE::Type ||= WIN32OLE_TYPE
+WIN32OLE::Event ||= WIN32OLE_EVENT
+WIN32OLE::Param ||= WIN32OLE_PARAM
+
 module WIN32OLESpecs
-  MSXML_AVAILABLE = WIN32OLE_TYPELIB.typelibs.any? { |t| t.name.start_with?('Microsoft XML') }
-  SYSTEM_MONITOR_CONTROL_AVAILABLE = WIN32OLE_TYPELIB.typelibs.any? { |t| t.name.start_with?('System Monitor Control') }
+  MSXML_AVAILABLE = WIN32OLE::TypeLib.typelibs.any? { |t| t.name.start_with?('Microsoft XML') }
+  SYSTEM_MONITOR_CONTROL_AVAILABLE = WIN32OLE::TypeLib.typelibs.any? { |t| t.name.start_with?('System Monitor Control') }
 
   def self.new_ole(name)
     tries = 0
     begin
       WIN32OLE.new(name)
-    rescue WIN32OLERuntimeError => e
+    rescue WIN32OLE::RuntimeError => e
       if tries < 3
         tries += 1
         $stderr.puts "WIN32OLESpecs#new_ole retry (#{tries}): #{e.class}: #{e.message}"
diff --git a/spec/ruby/library/win32ole/win32ole/locale_spec.rb b/spec/ruby/library/win32ole/win32ole/locale_spec.rb
index 78ede4375a2b94..89e84d8038520c 100644
--- a/spec/ruby/library/win32ole/win32ole/locale_spec.rb
+++ b/spec/ruby/library/win32ole/win32ole/locale_spec.rb
@@ -13,14 +13,14 @@
       begin
         begin
           WIN32OLE.locale = 1041
-        rescue WIN32OLERuntimeError
+        rescue WIN32OLE::RuntimeError
           STDERR.puts("\n#{__FILE__}:#{__LINE__}:#{self.class.name}.test_s_locale_set is skipped(Japanese locale is not installed)")
           return
         end
 
         WIN32OLE.locale.should == 1041
         WIN32OLE.locale = WIN32OLE::LOCALE_SYSTEM_DEFAULT
-        -> { WIN32OLE.locale = 111 }.should raise_error WIN32OLERuntimeError
+        -> { WIN32OLE.locale = 111 }.should raise_error WIN32OLE::RuntimeError
         WIN32OLE.locale.should == WIN32OLE::LOCALE_SYSTEM_DEFAULT
       ensure
         WIN32OLE.locale.should == WIN32OLE::LOCALE_SYSTEM_DEFAULT
diff --git a/spec/ruby/library/win32ole/win32ole/new_spec.rb b/spec/ruby/library/win32ole/win32ole/new_spec.rb
index 7e91c2d3ea0aa9..b2a0a5da18549d 100644
--- a/spec/ruby/library/win32ole/win32ole/new_spec.rb
+++ b/spec/ruby/library/win32ole/win32ole/new_spec.rb
@@ -17,8 +17,8 @@
       -> { WIN32OLESpecs.new_ole(42) }.should raise_error( TypeError )
     end
 
-    it "raises WIN32OLERuntimeError if invalid string is given" do
-      -> { WIN32OLE.new('foo') }.should raise_error( WIN32OLERuntimeError )
+    it "raises WIN32OLE::RuntimeError if invalid string is given" do
+      -> { WIN32OLE.new('foo') }.should raise_error( WIN32OLE::RuntimeError )
     end
 
   end
diff --git a/spec/ruby/library/win32ole/win32ole/ole_func_methods_spec.rb b/spec/ruby/library/win32ole/win32ole/ole_func_methods_spec.rb
index 2bbe8c27d4a1c3..b846685518f1a9 100644
--- a/spec/ruby/library/win32ole/win32ole/ole_func_methods_spec.rb
+++ b/spec/ruby/library/win32ole/win32ole/ole_func_methods_spec.rb
@@ -11,8 +11,8 @@
       -> { @dict.ole_func_methods(1) }.should raise_error ArgumentError
     end
 
-    it "returns an array of WIN32OLE_METHODs" do
-      @dict.ole_func_methods.all? { |m| m.kind_of? WIN32OLE_METHOD }.should be_true
+    it "returns an array of WIN32OLE::Methods" do
+      @dict.ole_func_methods.all? { |m| m.kind_of? WIN32OLE::Method }.should be_true
     end
 
     it "contains a 'AddRef' method for Scripting Dictionary" do
diff --git a/spec/ruby/library/win32ole/win32ole/ole_get_methods_spec.rb b/spec/ruby/library/win32ole/win32ole/ole_get_methods_spec.rb
index c1d1970214e6b1..b6e7f960bbb7f9 100644
--- a/spec/ruby/library/win32ole/win32ole/ole_get_methods_spec.rb
+++ b/spec/ruby/library/win32ole/win32ole/ole_get_methods_spec.rb
@@ -8,8 +8,8 @@
       @win32ole = WIN32OLESpecs.new_ole('Shell.Application')
     end
 
-    it "returns an array of WIN32OLE_METHOD objects" do
-      @win32ole.ole_get_methods.all? {|m| m.kind_of? WIN32OLE_METHOD}.should be_true
+    it "returns an array of WIN32OLE::Method objects" do
+      @win32ole.ole_get_methods.all? {|m| m.kind_of? WIN32OLE::Method}.should be_true
     end
 
   end
diff --git a/spec/ruby/library/win32ole/win32ole/ole_methods_spec.rb b/spec/ruby/library/win32ole/win32ole/ole_methods_spec.rb
index fe161ce9f080ef..92c4363f78c1b7 100644
--- a/spec/ruby/library/win32ole/win32ole/ole_methods_spec.rb
+++ b/spec/ruby/library/win32ole/win32ole/ole_methods_spec.rb
@@ -11,8 +11,8 @@
       -> { @dict.ole_methods(1) }.should raise_error ArgumentError
     end
 
-    it "returns an array of WIN32OLE_METHODs" do
-      @dict.ole_methods.all? { |m| m.kind_of? WIN32OLE_METHOD }.should be_true
+    it "returns an array of WIN32OLE::Methods" do
+      @dict.ole_methods.all? { |m| m.kind_of? WIN32OLE::Method }.should be_true
     end
 
     it "contains a 'AddRef' method for Scripting Dictionary" do
diff --git a/spec/ruby/library/win32ole/win32ole/ole_obj_help_spec.rb b/spec/ruby/library/win32ole/win32ole/ole_obj_help_spec.rb
index afcf16a0518eb1..f298f19dba1aff 100644
--- a/spec/ruby/library/win32ole/win32ole/ole_obj_help_spec.rb
+++ b/spec/ruby/library/win32ole/win32ole/ole_obj_help_spec.rb
@@ -12,8 +12,8 @@
       -> { @dict.ole_obj_help(1) }.should raise_error ArgumentError
     end
 
-    it "returns an instance of WIN32OLE_TYPE" do
-      @dict.ole_obj_help.kind_of?(WIN32OLE_TYPE).should be_true
+    it "returns an instance of WIN32OLE::Type" do
+      @dict.ole_obj_help.kind_of?(WIN32OLE::Type).should be_true
     end
   end
 end
diff --git a/spec/ruby/library/win32ole/win32ole/ole_put_methods_spec.rb b/spec/ruby/library/win32ole/win32ole/ole_put_methods_spec.rb
index c091c83c953dc3..2b46ae47ded6b2 100644
--- a/spec/ruby/library/win32ole/win32ole/ole_put_methods_spec.rb
+++ b/spec/ruby/library/win32ole/win32ole/ole_put_methods_spec.rb
@@ -11,8 +11,8 @@
       -> { @dict.ole_put_methods(1) }.should raise_error ArgumentError
     end
 
-    it "returns an array of WIN32OLE_METHODs" do
-      @dict.ole_put_methods.all? { |m| m.kind_of? WIN32OLE_METHOD }.should be_true
+    it "returns an array of WIN32OLE::Methods" do
+      @dict.ole_put_methods.all? { |m| m.kind_of? WIN32OLE::Method }.should be_true
     end
 
     it "contains a 'Key' method for Scripting Dictionary" do
diff --git a/spec/ruby/library/win32ole/win32ole/shared/ole_method.rb b/spec/ruby/library/win32ole/win32ole/shared/ole_method.rb
index f1fd8713a46f34..bae424a604e5b8 100644
--- a/spec/ruby/library/win32ole/win32ole/shared/ole_method.rb
+++ b/spec/ruby/library/win32ole/win32ole/shared/ole_method.rb
@@ -10,9 +10,9 @@
       -> { @dict.send(@method) }.should raise_error ArgumentError
     end
 
-    it "returns the WIN32OLE_METHOD 'Add' if given 'Add'" do
+    it "returns the WIN32OLE::Method 'Add' if given 'Add'" do
       result = @dict.send(@method, "Add")
-      result.kind_of?(WIN32OLE_METHOD).should be_true
+      result.kind_of?(WIN32OLE::Method).should be_true
       result.name.should == 'Add'
     end
   end
diff --git a/spec/ruby/library/win32ole/win32ole_event/new_spec.rb b/spec/ruby/library/win32ole/win32ole_event/new_spec.rb
index 94fabb1e3b19a5..4efd4c3e0fa9ae 100644
--- a/spec/ruby/library/win32ole/win32ole_event/new_spec.rb
+++ b/spec/ruby/library/win32ole/win32ole_event/new_spec.rb
@@ -3,7 +3,7 @@
   require_relative '../fixtures/classes'
 
   guard -> { WIN32OLESpecs::MSXML_AVAILABLE } do
-    describe "WIN32OLE_EVENT.new" do
+    describe "WIN32OLE::Event.new" do
       before :all do
         @xml_dom = WIN32OLESpecs.new_ole('MSXML.DOMDocument')
       end
@@ -13,21 +13,21 @@
       end
 
       it "raises TypeError given invalid argument" do
-        -> { WIN32OLE_EVENT.new "A" }.should raise_error TypeError
+        -> { WIN32OLE::Event.new "A" }.should raise_error TypeError
       end
 
       it "raises RuntimeError if event does not exist" do
-        -> { WIN32OLE_EVENT.new(@xml_dom, 'A') }.should raise_error RuntimeError
+        -> { WIN32OLE::Event.new(@xml_dom, 'A') }.should raise_error RuntimeError
       end
 
       it "raises RuntimeError if OLE object has no events" do
         dict = WIN32OLESpecs.new_ole('Scripting.Dictionary')
-        -> { WIN32OLE_EVENT.new(dict) }.should raise_error RuntimeError
+        -> { WIN32OLE::Event.new(dict) }.should raise_error RuntimeError
       end
 
-      it "creates WIN32OLE_EVENT object" do
-        ev = WIN32OLE_EVENT.new(@xml_dom)
-        ev.should be_kind_of WIN32OLE_EVENT
+      it "creates WIN32OLE::Event object" do
+        ev = WIN32OLE::Event.new(@xml_dom)
+        ev.should be_kind_of WIN32OLE::Event
       end
     end
   end
diff --git a/spec/ruby/library/win32ole/win32ole_event/on_event_spec.rb b/spec/ruby/library/win32ole/win32ole_event/on_event_spec.rb
index 0957bdd2d476f0..acc7d2d6b63425 100644
--- a/spec/ruby/library/win32ole/win32ole_event/on_event_spec.rb
+++ b/spec/ruby/library/win32ole/win32ole_event/on_event_spec.rb
@@ -15,7 +15,7 @@ def handler_spec_alt(*args)
       @event_spec_alt = "spec_alt"
     end
 
-    describe "WIN32OLE_EVENT#on_event" do
+    describe "WIN32OLE::Event#on_event" do
       before :all do
         @fn_xml = File.absolute_path "../fixtures/event.xml", __dir__
       end
@@ -23,7 +23,7 @@ def handler_spec_alt(*args)
       before :each do
         @xml_dom = WIN32OLESpecs.new_ole 'MSXML.DOMDocument'
         @xml_dom.async = true
-        @ev = WIN32OLE_EVENT.new @xml_dom
+        @ev = WIN32OLE::Event.new @xml_dom
         @event_global   = ''
         @event_specific = ''
         @event_spec_alt = ''
@@ -37,21 +37,21 @@ def handler_spec_alt(*args)
       it "sets global event handler properly, and the handler is invoked by event loop" do
         @ev.on_event { |*args| handler_global(*args) }
         @xml_dom.loadXML "<program><name>Ruby</name><version>trunk</version></program>"
-        WIN32OLE_EVENT.message_loop
+        WIN32OLE::Event.message_loop
         @event_global.should =~ /onreadystatechange/
       end
 
       it "accepts a String argument and the handler is invoked by event loop" do
         @ev.on_event("onreadystatechange") { |*args| @event = 'foo' }
         @xml_dom.loadXML "<program><name>Ruby</name><version>trunk</version></program>"
-        WIN32OLE_EVENT.message_loop
+        WIN32OLE::Event.message_loop
         @event.should =~ /foo/
       end
 
       it "accepts a Symbol argument and the handler is invoked by event loop" do
         @ev.on_event(:onreadystatechange) { |*args| @event = 'bar' }
         @xml_dom.loadXML "<program><name>Ruby</name><version>trunk</version></program>"
-        WIN32OLE_EVENT.message_loop
+        WIN32OLE::Event.message_loop
         @event.should =~ /bar/
       end
 
@@ -60,7 +60,7 @@ def handler_spec_alt(*args)
         @ev.on_event("onreadystatechange") { |*args| handler_specific(*args) }
         @ev.on_event("onreadystatechange") { |*args| handler_spec_alt(*args) }
         @xml_dom.load @fn_xml
-        WIN32OLE_EVENT.message_loop
+        WIN32OLE::Event.message_loop
         @event_global.should == 'ondataavailable'
         @event_global.should_not =~ /onreadystatechange/
         @event_specific.should == ''
diff --git a/spec/ruby/library/win32ole/win32ole_method/dispid_spec.rb b/spec/ruby/library/win32ole/win32ole_method/dispid_spec.rb
index ece71df0d4c586..e5f55f2d38f8c0 100644
--- a/spec/ruby/library/win32ole/win32ole_method/dispid_spec.rb
+++ b/spec/ruby/library/win32ole/win32ole_method/dispid_spec.rb
@@ -2,10 +2,10 @@
 platform_is :windows do
   require 'win32ole'
 
-  describe "WIN32OLE_METHOD#dispid" do
+  describe "WIN32OLE::Method#dispid" do
     before :each do
-      ole_type = WIN32OLE_TYPE.new("Microsoft Shell Controls And Automation", "Shell")
-      @m = WIN32OLE_METHOD.new(ole_type, "namespace")
+      ole_type = WIN32OLE::Type.new("Microsoft Shell Controls And Automation", "Shell")
+      @m = WIN32OLE::Method.new(ole_type, "namespace")
     end
 
     it "raises ArgumentError if argument is given" do
diff --git a/spec/ruby/library/win32ole/win32ole_method/event_interface_spec.rb b/spec/ruby/library/win32ole/win32ole_method/event_interface_spec.rb
index 78634d2fdefab6..bea47348eee6fc 100644
--- a/spec/ruby/library/win32ole/win32ole_method/event_interface_spec.rb
+++ b/spec/ruby/library/win32ole/win32ole_method/event_interface_spec.rb
@@ -3,12 +3,12 @@
   require_relative '../fixtures/classes'
   guard -> { WIN32OLESpecs::SYSTEM_MONITOR_CONTROL_AVAILABLE } do
 
-    describe "WIN32OLE_METHOD#event_interface" do
+    describe "WIN32OLE::Method#event_interface" do
       before :each do
-        ole_type = WIN32OLE_TYPE.new("System Monitor Control", "SystemMonitor")
-        @on_dbl_click_method = WIN32OLE_METHOD.new(ole_type, "OnDblClick")
-        ole_type = WIN32OLE_TYPE.new("Microsoft Shell Controls And Automation", "Shell")
-        @namespace_method = WIN32OLE_METHOD.new(ole_type, "namespace")
+        ole_type = WIN32OLE::Type.new("System Monitor Control", "SystemMonitor")
+        @on_dbl_click_method = WIN32OLE::Method.new(ole_type, "OnDblClick")
+        ole_type = WIN32OLE::Type.new("Microsoft Shell Controls And Automation", "Shell")
+        @namespace_method = WIN32OLE::Method.new(ole_type, "namespace")
       end
 
       it "raises ArgumentError if argument is given" do
diff --git a/spec/ruby/library/win32ole/win32ole_method/event_spec.rb b/spec/ruby/library/win32ole/win32ole_method/event_spec.rb
index 9b642a010c7e34..5a94cf5ce6e07e 100644
--- a/spec/ruby/library/win32ole/win32ole_method/event_spec.rb
+++ b/spec/ruby/library/win32ole/win32ole_method/event_spec.rb
@@ -3,10 +3,10 @@
   require_relative '../fixtures/classes'
   guard -> { WIN32OLESpecs::SYSTEM_MONITOR_CONTROL_AVAILABLE } do
 
-    describe "WIN32OLE_METHOD#event?" do
+    describe "WIN32OLE::Method#event?" do
       before :each do
-        ole_type = WIN32OLE_TYPE.new("System Monitor Control", "SystemMonitor")
-        @on_dbl_click_method = WIN32OLE_METHOD.new(ole_type, "OnDblClick")
+        ole_type = WIN32OLE::Type.new("System Monitor Control", "SystemMonitor")
+        @on_dbl_click_method = WIN32OLE::Method.new(ole_type, "OnDblClick")
       end
 
       it "raises ArgumentError if argument is given" do
diff --git a/spec/ruby/library/win32ole/win32ole_method/helpcontext_spec.rb b/spec/ruby/library/win32ole/win32ole_method/helpcontext_spec.rb
index d1c5ee3be25e7a..83f34b9c109088 100644
--- a/spec/ruby/library/win32ole/win32ole_method/helpcontext_spec.rb
+++ b/spec/ruby/library/win32ole/win32ole_method/helpcontext_spec.rb
@@ -2,12 +2,12 @@
 platform_is :windows do
   require 'win32ole'
 
-  describe "WIN32OLE_METHOD#helpcontext" do
+  describe "WIN32OLE::Method#helpcontext" do
     before :each do
-      ole_type = WIN32OLE_TYPE.new("Microsoft Scripting Runtime", "FileSystemObject")
-      @get_file_version = WIN32OLE_METHOD.new(ole_type, "GetFileVersion")
-      ole_type = WIN32OLE_TYPE.new("Microsoft Scripting Runtime", "File")
-      @m_file_name = WIN32OLE_METHOD.new(ole_type, "name")
+      ole_type = WIN32OLE::Type.new("Microsoft Scripting Runtime", "FileSystemObject")
+      @get_file_version = WIN32OLE::Method.new(ole_type, "GetFileVersion")
+      ole_type = WIN32OLE::Type.new("Microsoft Scripting Runtime", "File")
+      @m_file_name = WIN32OLE::Method.new(ole_type, "name")
     end
 
     it "raises ArgumentError if argument is given" do
diff --git a/spec/ruby/library/win32ole/win32ole_method/helpfile_spec.rb b/spec/ruby/library/win32ole/win32ole_method/helpfile_spec.rb
index 59dad9244c15e3..9cf9d63d3b406e 100644
--- a/spec/ruby/library/win32ole/win32ole_method/helpfile_spec.rb
+++ b/spec/ruby/library/win32ole/win32ole_method/helpfile_spec.rb
@@ -2,10 +2,10 @@
 platform_is :windows do
   require 'win32ole'
 
-  describe "WIN32OLE_METHOD#helpfile" do
+  describe "WIN32OLE::Method#helpfile" do
     before :each do
-      ole_type = WIN32OLE_TYPE.new("Microsoft Scripting Runtime", "File")
-      @m_file_name = WIN32OLE_METHOD.new(ole_type, "name")
+      ole_type = WIN32OLE::Type.new("Microsoft Scripting Runtime", "File")
+      @m_file_name = WIN32OLE::Method.new(ole_type, "name")
     end
 
     it "raises ArgumentError if argument is given" do
diff --git a/spec/ruby/library/win32ole/win32ole_method/helpstring_spec.rb b/spec/ruby/library/win32ole/win32ole_method/helpstring_spec.rb
index b2f24ba151cc8c..5ae4a5e0909322 100644
--- a/spec/ruby/library/win32ole/win32ole_method/helpstring_spec.rb
+++ b/spec/ruby/library/win32ole/win32ole_method/helpstring_spec.rb
@@ -2,10 +2,10 @@
 platform_is :windows do
   require 'win32ole'
 
-  describe "WIN32OLE_METHOD#helpstring" do
+  describe "WIN32OLE::Method#helpstring" do
     before :each do
-      ole_type = WIN32OLE_TYPE.new("Microsoft Scripting Runtime", "File")
-      @m_file_name = WIN32OLE_METHOD.new(ole_type, "name")
+      ole_type = WIN32OLE::Type.new("Microsoft Scripting Runtime", "File")
+      @m_file_name = WIN32OLE::Method.new(ole_type, "name")
     end
 
     it "raises ArgumentError if argument is given" do
diff --git a/spec/ruby/library/win32ole/win32ole_method/invkind_spec.rb b/spec/ruby/library/win32ole/win32ole_method/invkind_spec.rb
index d7fedf0d36456c..06acbb58a54ae4 100644
--- a/spec/ruby/library/win32ole/win32ole_method/invkind_spec.rb
+++ b/spec/ruby/library/win32ole/win32ole_method/invkind_spec.rb
@@ -2,10 +2,10 @@
 platform_is :windows do
   require 'win32ole'
 
-  describe "WIN32OLE_METHOD#invkind" do
+  describe "WIN32OLE::Method#invkind" do
     before :each do
-      ole_type = WIN32OLE_TYPE.new("Microsoft Scripting Runtime", "File")
-      @m_file_name = WIN32OLE_METHOD.new(ole_type, "name")
+      ole_type = WIN32OLE::Type.new("Microsoft Scripting Runtime", "File")
+      @m_file_name = WIN32OLE::Method.new(ole_type, "name")
     end
 
     it "raises ArgumentError if argument is given" do
diff --git a/spec/ruby/library/win32ole/win32ole_method/invoke_kind_spec.rb b/spec/ruby/library/win32ole/win32ole_method/invoke_kind_spec.rb
index d5536fd17b990a..0e97ec3305af6c 100644
--- a/spec/ruby/library/win32ole/win32ole_method/invoke_kind_spec.rb
+++ b/spec/ruby/library/win32ole/win32ole_method/invoke_kind_spec.rb
@@ -2,10 +2,10 @@
 platform_is :windows do
   require 'win32ole'
 
-  describe "WIN32OLE_METHOD#invoke_kind" do
+  describe "WIN32OLE::Method#invoke_kind" do
     before :each do
-      ole_type = WIN32OLE_TYPE.new("Microsoft Scripting Runtime", "File")
-      @m_file_name = WIN32OLE_METHOD.new(ole_type, "name")
+      ole_type = WIN32OLE::Type.new("Microsoft Scripting Runtime", "File")
+      @m_file_name = WIN32OLE::Method.new(ole_type, "name")
     end
 
     it "raises ArgumentError if argument is given" do
diff --git a/spec/ruby/library/win32ole/win32ole_method/name_spec.rb b/spec/ruby/library/win32ole/win32ole_method/name_spec.rb
index 477b820f4d809c..6e2e233a625b70 100644
--- a/spec/ruby/library/win32ole/win32ole_method/name_spec.rb
+++ b/spec/ruby/library/win32ole/win32ole_method/name_spec.rb
@@ -4,7 +4,7 @@
 platform_is :windows do
   require 'win32ole'
 
-  describe "WIN32OLE_METHOD#name" do
+  describe "WIN32OLE::Method#name" do
     it_behaves_like :win32ole_method_name, :name
 
   end
diff --git a/spec/ruby/library/win32ole/win32ole_method/new_spec.rb b/spec/ruby/library/win32ole/win32ole_method/new_spec.rb
index 4e427421b90de0..46186ae566fe3a 100644
--- a/spec/ruby/library/win32ole/win32ole_method/new_spec.rb
+++ b/spec/ruby/library/win32ole/win32ole_method/new_spec.rb
@@ -2,31 +2,31 @@
 platform_is :windows do
   require 'win32ole'
 
-  describe "WIN32OLE_METHOD.new" do
+  describe "WIN32OLE::Method.new" do
     before :each do
-      @ole_type = WIN32OLE_TYPE.new("Microsoft Shell Controls And Automation", "Shell")
+      @ole_type = WIN32OLE::Type.new("Microsoft Shell Controls And Automation", "Shell")
     end
 
     it "raises TypeError when given non-strings" do
-      -> { WIN32OLE_METHOD.new(1, 2) }.should raise_error TypeError
+      -> { WIN32OLE::Method.new(1, 2) }.should raise_error TypeError
     end
 
     it "raises ArgumentError if only 1 argument is given" do
-      -> { WIN32OLE_METHOD.new("hello") }.should raise_error ArgumentError
-      -> { WIN32OLE_METHOD.new(@ole_type) }.should raise_error ArgumentError
+      -> { WIN32OLE::Method.new("hello") }.should raise_error ArgumentError
+      -> { WIN32OLE::Method.new(@ole_type) }.should raise_error ArgumentError
     end
 
-    it "returns a valid WIN32OLE_METHOD object" do
-      WIN32OLE_METHOD.new(@ole_type, "Open").should be_kind_of WIN32OLE_METHOD
-      WIN32OLE_METHOD.new(@ole_type, "open").should be_kind_of WIN32OLE_METHOD
+    it "returns a valid WIN32OLE::Method object" do
+      WIN32OLE::Method.new(@ole_type, "Open").should be_kind_of WIN32OLE::Method
+      WIN32OLE::Method.new(@ole_type, "open").should be_kind_of WIN32OLE::Method
     end
 
-    it "raises WIN32OLERuntimeError if the method does not exist" do
-      -> { WIN32OLE_METHOD.new(@ole_type, "NonexistentMethod") }.should raise_error WIN32OLERuntimeError
+    it "raises WIN32OLE::RuntimeError if the method does not exist" do
+      -> { WIN32OLE::Method.new(@ole_type, "NonexistentMethod") }.should raise_error WIN32OLE::RuntimeError
     end
 
     it "raises TypeError if second argument is not a String" do
-      -> { WIN32OLE_METHOD.new(@ole_type, 5) }.should raise_error TypeError
+      -> { WIN32OLE::Method.new(@ole_type, 5) }.should raise_error TypeError
     end
 
   end
diff --git a/spec/ruby/library/win32ole/win32ole_method/offset_vtbl_spec.rb b/spec/ruby/library/win32ole/win32ole_method/offset_vtbl_spec.rb
index b3da9a8303c28f..3c80cb3c2ae9cf 100644
--- a/spec/ruby/library/win32ole/win32ole_method/offset_vtbl_spec.rb
+++ b/spec/ruby/library/win32ole/win32ole_method/offset_vtbl_spec.rb
@@ -2,10 +2,10 @@
 platform_is :windows do
   require 'win32ole'
 
-  describe "WIN32OLE_METHOD#offset_vtbl" do
+  describe "WIN32OLE::Method#offset_vtbl" do
     before :each do
-      ole_type = WIN32OLE_TYPE.new("Microsoft Scripting Runtime", "File")
-      @m_file_name = WIN32OLE_METHOD.new(ole_type, "name")
+      ole_type = WIN32OLE::Type.new("Microsoft Scripting Runtime", "File")
+      @m_file_name = WIN32OLE::Method.new(ole_type, "name")
     end
 
     it "raises ArgumentError if argument is given" do
diff --git a/spec/ruby/library/win32ole/win32ole_method/params_spec.rb b/spec/ruby/library/win32ole/win32ole_method/params_spec.rb
index 09fb0eb5ac3484..0b1b4595a313a2 100644
--- a/spec/ruby/library/win32ole/win32ole_method/params_spec.rb
+++ b/spec/ruby/library/win32ole/win32ole_method/params_spec.rb
@@ -2,12 +2,12 @@
 platform_is :windows do
   require 'win32ole'
 
-  describe "WIN32OLE_METHOD#params" do
+  describe "WIN32OLE::Method#params" do
     before :each do
-      ole_type = WIN32OLE_TYPE.new("Microsoft Scripting Runtime", "File")
-      @m_file_name = WIN32OLE_METHOD.new(ole_type, "name")
-      ole_type = WIN32OLE_TYPE.new("Microsoft Shell Controls And Automation", "Shell")
-      @m_browse_for_folder = WIN32OLE_METHOD.new(ole_type, "BrowseForFolder")
+      ole_type = WIN32OLE::Type.new("Microsoft Scripting Runtime", "File")
+      @m_file_name = WIN32OLE::Method.new(ole_type, "name")
+      ole_type = WIN32OLE::Type.new("Microsoft Shell Controls And Automation", "Shell")
+      @m_browse_for_folder = WIN32OLE::Method.new(ole_type, "BrowseForFolder")
     end
 
     it "raises ArgumentError if argument is given" do
@@ -19,8 +19,8 @@
       @m_file_name.params.should be_empty
     end
 
-    it "returns 4-element array of WIN32OLE_PARAM for Shell's 'BrowseForFolder' method" do
-      @m_browse_for_folder.params.all? { |p| p.kind_of? WIN32OLE_PARAM }.should be_true
+    it "returns 4-element array of WIN32OLE::Param for Shell's 'BrowseForFolder' method" do
+      @m_browse_for_folder.params.all? { |p| p.kind_of? WIN32OLE::Param }.should be_true
       @m_browse_for_folder.params.size == 4
     end
 
diff --git a/spec/ruby/library/win32ole/win32ole_method/return_type_detail_spec.rb b/spec/ruby/library/win32ole/win32ole_method/return_type_detail_spec.rb
index 582a5951d5f4bf..c3725bfef20d07 100644
--- a/spec/ruby/library/win32ole/win32ole_method/return_type_detail_spec.rb
+++ b/spec/ruby/library/win32ole/win32ole_method/return_type_detail_spec.rb
@@ -2,10 +2,10 @@
 platform_is :windows do
   require 'win32ole'
 
-  describe "WIN32OLE_METHOD#return_type_detail" do
+  describe "WIN32OLE::Method#return_type_detail" do
     before :each do
-      ole_type = WIN32OLE_TYPE.new("Microsoft Shell Controls And Automation", "Shell")
-      @m_browse_for_folder = WIN32OLE_METHOD.new(ole_type, "BrowseForFolder")
+      ole_type = WIN32OLE::Type.new("Microsoft Shell Controls And Automation", "Shell")
+      @m_browse_for_folder = WIN32OLE::Method.new(ole_type, "BrowseForFolder")
     end
 
     it "raises ArgumentError if argument is given" do
diff --git a/spec/ruby/library/win32ole/win32ole_method/return_type_spec.rb b/spec/ruby/library/win32ole/win32ole_method/return_type_spec.rb
index dd8add402d7d1e..9e5a1eb1dfc3ec 100644
--- a/spec/ruby/library/win32ole/win32ole_method/return_type_spec.rb
+++ b/spec/ruby/library/win32ole/win32ole_method/return_type_spec.rb
@@ -2,10 +2,10 @@
 platform_is :windows do
   require 'win32ole'
 
-  describe "WIN32OLE_METHOD#return_type" do
+  describe "WIN32OLE::Method#return_type" do
     before :each do
-      ole_type = WIN32OLE_TYPE.new("Microsoft Scripting Runtime", "File")
-      @m_file_name = WIN32OLE_METHOD.new(ole_type, "name")
+      ole_type = WIN32OLE::Type.new("Microsoft Scripting Runtime", "File")
+      @m_file_name = WIN32OLE::Method.new(ole_type, "name")
     end
 
     it "raises ArgumentError if argument is given" do
diff --git a/spec/ruby/library/win32ole/win32ole_method/return_vtype_spec.rb b/spec/ruby/library/win32ole/win32ole_method/return_vtype_spec.rb
index 3fca3d54ed8a0e..34fd135b8cc599 100644
--- a/spec/ruby/library/win32ole/win32ole_method/return_vtype_spec.rb
+++ b/spec/ruby/library/win32ole/win32ole_method/return_vtype_spec.rb
@@ -2,10 +2,10 @@
 platform_is :windows do
   require 'win32ole'
 
-  describe "WIN32OLE_METHOD#return_vtype" do
+  describe "WIN32OLE::Method#return_vtype" do
     before :each do
-      ole_type = WIN32OLE_TYPE.new("Microsoft Shell Controls And Automation", "Shell")
-      @m_browse_for_folder = WIN32OLE_METHOD.new(ole_type, "BrowseForFolder")
+      ole_type = WIN32OLE::Type.new("Microsoft Shell Controls And Automation", "Shell")
+      @m_browse_for_folder = WIN32OLE::Method.new(ole_type, "BrowseForFolder")
     end
 
     it "raises ArgumentError if argument is given" do
diff --git a/spec/ruby/library/win32ole/win32ole_method/shared/name.rb b/spec/ruby/library/win32ole/win32ole_method/shared/name.rb
index ddaff4011bfa07..7e2197ca5a2d5d 100644
--- a/spec/ruby/library/win32ole/win32ole_method/shared/name.rb
+++ b/spec/ruby/library/win32ole/win32ole_method/shared/name.rb
@@ -3,8 +3,8 @@
 
   describe :win32ole_method_name, shared: true do
     before :each do
-      ole_type = WIN32OLE_TYPE.new("Microsoft Scripting Runtime", "File")
-      @m_file_name = WIN32OLE_METHOD.new(ole_type, "name")
+      ole_type = WIN32OLE::Type.new("Microsoft Scripting Runtime", "File")
+      @m_file_name = WIN32OLE::Method.new(ole_type, "name")
     end
 
     it "raises ArgumentError if argument is given" do
diff --git a/spec/ruby/library/win32ole/win32ole_method/size_opt_params_spec.rb b/spec/ruby/library/win32ole/win32ole_method/size_opt_params_spec.rb
index fe9facb53a85e0..38cb21ccef9ac6 100644
--- a/spec/ruby/library/win32ole/win32ole_method/size_opt_params_spec.rb
+++ b/spec/ruby/library/win32ole/win32ole_method/size_opt_params_spec.rb
@@ -2,10 +2,10 @@
 platform_is :windows do
   require 'win32ole'
 
-  describe "WIN32OLE_METHOD#size_opt_params" do
+  describe "WIN32OLE::Method#size_opt_params" do
     before :each do
-      ole_type = WIN32OLE_TYPE.new("Microsoft Shell Controls And Automation", "Shell")
-      @m_browse_for_folder = WIN32OLE_METHOD.new(ole_type, "BrowseForFolder")
+      ole_type = WIN32OLE::Type.new("Microsoft Shell Controls And Automation", "Shell")
+      @m_browse_for_folder = WIN32OLE::Method.new(ole_type, "BrowseForFolder")
     end
 
     it "raises ArgumentError if argument is given" do
diff --git a/spec/ruby/library/win32ole/win32ole_method/size_params_spec.rb b/spec/ruby/library/win32ole/win32ole_method/size_params_spec.rb
index 8ea6e61e7ddd3c..5d0a35a0ef559b 100644
--- a/spec/ruby/library/win32ole/win32ole_method/size_params_spec.rb
+++ b/spec/ruby/library/win32ole/win32ole_method/size_params_spec.rb
@@ -2,10 +2,10 @@
 platform_is :windows do
   require 'win32ole'
 
-  describe "WIN32OLE_METHOD#size_params" do
+  describe "WIN32OLE::Method#size_params" do
     before :each do
-      ole_type = WIN32OLE_TYPE.new("Microsoft Shell Controls And Automation", "Shell")
-      @m_browse_for_folder = WIN32OLE_METHOD.new(ole_type, "BrowseForFolder")
+      ole_type = WIN32OLE::Type.new("Microsoft Shell Controls And Automation", "Shell")
+      @m_browse_for_folder = WIN32OLE::Method.new(ole_type, "BrowseForFolder")
     end
 
     it "raises ArgumentError if argument is given" do
diff --git a/spec/ruby/library/win32ole/win32ole_method/to_s_spec.rb b/spec/ruby/library/win32ole/win32ole_method/to_s_spec.rb
index 11107a77fc46a7..cdcc4525b16d62 100644
--- a/spec/ruby/library/win32ole/win32ole_method/to_s_spec.rb
+++ b/spec/ruby/library/win32ole/win32ole_method/to_s_spec.rb
@@ -4,7 +4,7 @@
 platform_is :windows do
   require 'win32ole'
 
-  describe "WIN32OLE_METHOD#name" do
+  describe "WIN32OLE::Method#name" do
     it_behaves_like :win32ole_method_name, :to_s
 
   end
diff --git a/spec/ruby/library/win32ole/win32ole_method/visible_spec.rb b/spec/ruby/library/win32ole/win32ole_method/visible_spec.rb
index d1a50523fc2324..2f02c15c8b9719 100644
--- a/spec/ruby/library/win32ole/win32ole_method/visible_spec.rb
+++ b/spec/ruby/library/win32ole/win32ole_method/visible_spec.rb
@@ -2,10 +2,10 @@
 platform_is :windows do
   require 'win32ole'
 
-  describe "WIN32OLE_METHOD#visible?" do
+  describe "WIN32OLE::Method#visible?" do
     before :each do
-      ole_type = WIN32OLE_TYPE.new("Microsoft Shell Controls And Automation", "Shell")
-      @m_browse_for_folder = WIN32OLE_METHOD.new(ole_type, "BrowseForFolder")
+      ole_type = WIN32OLE::Type.new("Microsoft Shell Controls And Automation", "Shell")
+      @m_browse_for_folder = WIN32OLE::Method.new(ole_type, "BrowseForFolder")
     end
 
     it "raises ArgumentError if argument is given" do
diff --git a/spec/ruby/library/win32ole/win32ole_param/default_spec.rb b/spec/ruby/library/win32ole/win32ole_param/default_spec.rb
index 44bd3d7fd3ff49..a37b03866d79ec 100644
--- a/spec/ruby/library/win32ole/win32ole_param/default_spec.rb
+++ b/spec/ruby/library/win32ole/win32ole_param/default_spec.rb
@@ -2,14 +2,14 @@
 platform_is :windows do
   require 'win32ole'
 
-  describe "WIN32OLE_PARAM#default" do
+  describe "WIN32OLE::Param#default" do
     before :each do
-      ole_type = WIN32OLE_TYPE.new("Microsoft Shell Controls And Automation", "Shell")
-      m_browse_for_folder = WIN32OLE_METHOD.new(ole_type, "BrowseForFolder")
+      ole_type = WIN32OLE::Type.new("Microsoft Shell Controls And Automation", "Shell")
+      m_browse_for_folder = WIN32OLE::Method.new(ole_type, "BrowseForFolder")
       @params = m_browse_for_folder.params
 
-      ole_type = WIN32OLE_TYPE.new("Microsoft Scripting Runtime", "FileSystemObject")
-      m_copyfile = WIN32OLE_METHOD.new(ole_type, "CopyFile")
+      ole_type = WIN32OLE::Type.new("Microsoft Scripting Runtime", "FileSystemObject")
+      m_copyfile = WIN32OLE::Method.new(ole_type, "CopyFile")
       @param_overwritefiles = m_copyfile.params[2]
     end
 
@@ -17,7 +17,7 @@
       -> { @params[0].default(1) }.should raise_error ArgumentError
     end
 
-    it "returns nil for each of WIN32OLE_PARAM for Shell's 'BrowseForFolder' method" do
+    it "returns nil for each of WIN32OLE::Param for Shell's 'BrowseForFolder' method" do
       @params.each do |p|
         p.default.should be_nil
       end
diff --git a/spec/ruby/library/win32ole/win32ole_param/input_spec.rb b/spec/ruby/library/win32ole/win32ole_param/input_spec.rb
index e9134b1df820c5..d7e27d7739000b 100644
--- a/spec/ruby/library/win32ole/win32ole_param/input_spec.rb
+++ b/spec/ruby/library/win32ole/win32ole_param/input_spec.rb
@@ -2,10 +2,10 @@
 platform_is :windows do
   require 'win32ole'
 
-  describe "WIN32OLE_PARAM#input?" do
+  describe "WIN32OLE::Param#input?" do
     before :each do
-      ole_type = WIN32OLE_TYPE.new("Microsoft Scripting Runtime", "FileSystemObject")
-      m_copyfile = WIN32OLE_METHOD.new(ole_type, "CopyFile")
+      ole_type = WIN32OLE::Type.new("Microsoft Scripting Runtime", "FileSystemObject")
+      m_copyfile = WIN32OLE::Method.new(ole_type, "CopyFile")
       @param_overwritefiles = m_copyfile.params[2]
     end
 
diff --git a/spec/ruby/library/win32ole/win32ole_param/name_spec.rb b/spec/ruby/library/win32ole/win32ole_param/name_spec.rb
index 67a8955ba4009e..2c3474ffb33523 100644
--- a/spec/ruby/library/win32ole/win32ole_param/name_spec.rb
+++ b/spec/ruby/library/win32ole/win32ole_param/name_spec.rb
@@ -4,7 +4,7 @@
 platform_is :windows do
   require 'win32ole'
 
-  describe "WIN32OLE_PARAM#name" do
+  describe "WIN32OLE::Param#name" do
     it_behaves_like :win32ole_param_name, :name
 
   end
diff --git a/spec/ruby/library/win32ole/win32ole_param/ole_type_detail_spec.rb b/spec/ruby/library/win32ole/win32ole_param/ole_type_detail_spec.rb
index f05455e3f17e09..e3379dbf3e3f39 100644
--- a/spec/ruby/library/win32ole/win32ole_param/ole_type_detail_spec.rb
+++ b/spec/ruby/library/win32ole/win32ole_param/ole_type_detail_spec.rb
@@ -2,10 +2,10 @@
 platform_is :windows do
   require 'win32ole'
 
-  describe "WIN32OLE_PARAM#ole_type_detail" do
+  describe "WIN32OLE::Param#ole_type_detail" do
     before :each do
-      ole_type_detail = WIN32OLE_TYPE.new("Microsoft Scripting Runtime", "FileSystemObject")
-      m_copyfile = WIN32OLE_METHOD.new(ole_type_detail, "CopyFile")
+      ole_type_detail = WIN32OLE::Type.new("Microsoft Scripting Runtime", "FileSystemObject")
+      m_copyfile = WIN32OLE::Method.new(ole_type_detail, "CopyFile")
       @param_overwritefiles = m_copyfile.params[2]
     end
 
diff --git a/spec/ruby/library/win32ole/win32ole_param/ole_type_spec.rb b/spec/ruby/library/win32ole/win32ole_param/ole_type_spec.rb
index 1467130e03a54f..a7b66668077552 100644
--- a/spec/ruby/library/win32ole/win32ole_param/ole_type_spec.rb
+++ b/spec/ruby/library/win32ole/win32ole_param/ole_type_spec.rb
@@ -2,10 +2,10 @@
 platform_is :windows do
   require 'win32ole'
 
-  describe "WIN32OLE_PARAM#ole_type" do
+  describe "WIN32OLE::Param#ole_type" do
     before :each do
-      ole_type = WIN32OLE_TYPE.new("Microsoft Scripting Runtime", "FileSystemObject")
-      m_copyfile = WIN32OLE_METHOD.new(ole_type, "CopyFile")
+      ole_type = WIN32OLE::Type.new("Microsoft Scripting Runtime", "FileSystemObject")
+      m_copyfile = WIN32OLE::Method.new(ole_type, "CopyFile")
       @param_overwritefiles = m_copyfile.params[2]
     end
 
diff --git a/spec/ruby/library/win32ole/win32ole_param/optional_spec.rb b/spec/ruby/library/win32ole/win32ole_param/optional_spec.rb
index b39ee41179b067..50e95fc77fa170 100644
--- a/spec/ruby/library/win32ole/win32ole_param/optional_spec.rb
+++ b/spec/ruby/library/win32ole/win32ole_param/optional_spec.rb
@@ -2,10 +2,10 @@
 platform_is :windows do
   require 'win32ole'
 
-  describe "WIN32OLE_PARAM#optional?" do
+  describe "WIN32OLE::Param#optional?" do
     before :each do
-      ole_type_detail = WIN32OLE_TYPE.new("Microsoft Scripting Runtime", "FileSystemObject")
-      m_copyfile = WIN32OLE_METHOD.new(ole_type_detail, "CopyFile")
+      ole_type_detail = WIN32OLE::Type.new("Microsoft Scripting Runtime", "FileSystemObject")
+      m_copyfile = WIN32OLE::Method.new(ole_type_detail, "CopyFile")
       @param_overwritefiles = m_copyfile.params[2]
     end
 
diff --git a/spec/ruby/library/win32ole/win32ole_param/retval_spec.rb b/spec/ruby/library/win32ole/win32ole_param/retval_spec.rb
index dd613dd29ac903..fa4a09ea0c3de8 100644
--- a/spec/ruby/library/win32ole/win32ole_param/retval_spec.rb
+++ b/spec/ruby/library/win32ole/win32ole_param/retval_spec.rb
@@ -2,10 +2,10 @@
 platform_is :windows do
   require 'win32ole'
 
-  describe "WIN32OLE_PARAM#retval?" do
+  describe "WIN32OLE::Param#retval?" do
     before :each do
-      ole_type_detail = WIN32OLE_TYPE.new("Microsoft Scripting Runtime", "FileSystemObject")
-      m_copyfile = WIN32OLE_METHOD.new(ole_type_detail, "CopyFile")
+      ole_type_detail = WIN32OLE::Type.new("Microsoft Scripting Runtime", "FileSystemObject")
+      m_copyfile = WIN32OLE::Method.new(ole_type_detail, "CopyFile")
       @param_overwritefiles = m_copyfile.params[2]
     end
 
diff --git a/spec/ruby/library/win32ole/win32ole_param/shared/name.rb b/spec/ruby/library/win32ole/win32ole_param/shared/name.rb
index 043bc32856535a..56ff24ddc83c96 100644
--- a/spec/ruby/library/win32ole/win32ole_param/shared/name.rb
+++ b/spec/ruby/library/win32ole/win32ole_param/shared/name.rb
@@ -3,8 +3,8 @@
 
   describe :win32ole_param_name, shared: true do
     before :each do
-      ole_type_detail = WIN32OLE_TYPE.new("Microsoft Scripting Runtime", "FileSystemObject")
-      m_copyfile = WIN32OLE_METHOD.new(ole_type_detail, "CopyFile")
+      ole_type_detail = WIN32OLE::Type.new("Microsoft Scripting Runtime", "FileSystemObject")
+      m_copyfile = WIN32OLE::Method.new(ole_type_detail, "CopyFile")
       @param_overwritefiles = m_copyfile.params[2]
     end
 
diff --git a/spec/ruby/library/win32ole/win32ole_param/to_s_spec.rb b/spec/ruby/library/win32ole/win32ole_param/to_s_spec.rb
index e9153a2eb2a313..c59f4266925c9c 100644
--- a/spec/ruby/library/win32ole/win32ole_param/to_s_spec.rb
+++ b/spec/ruby/library/win32ole/win32ole_param/to_s_spec.rb
@@ -4,7 +4,7 @@
 platform_is :windows do
   require 'win32ole'
 
-  describe "WIN32OLE_PARAM#to_s" do
+  describe "WIN32OLE::Param#to_s" do
     it_behaves_like :win32ole_param_name, :to_s
 
   end
diff --git a/spec/ruby/library/win32ole/win32ole_type/guid_spec.rb b/spec/ruby/library/win32ole/win32ole_type/guid_spec.rb
index abdf8d34b9dd90..e574a945ad93d9 100644
--- a/spec/ruby/library/win32ole/win32ole_type/guid_spec.rb
+++ b/spec/ruby/library/win32ole/win32ole_type/guid_spec.rb
@@ -2,9 +2,9 @@
 platform_is :windows do
   require 'win32ole'
 
-  describe "WIN32OLE_TYPE#guid for Shell Controls" do
+  describe "WIN32OLE::Type#guid for Shell Controls" do
     before :each do
-      @ole_type = WIN32OLE_TYPE.new("Microsoft Shell Controls And Automation", "Shell")
+      @ole_type = WIN32OLE::Type.new("Microsoft Shell Controls And Automation", "Shell")
     end
 
     after :each do
diff --git a/spec/ruby/library/win32ole/win32ole_type/helpcontext_spec.rb b/spec/ruby/library/win32ole/win32ole_type/helpcontext_spec.rb
index eee23abc56f597..35911fec52c1bd 100644
--- a/spec/ruby/library/win32ole/win32ole_type/helpcontext_spec.rb
+++ b/spec/ruby/library/win32ole/win32ole_type/helpcontext_spec.rb
@@ -2,9 +2,9 @@
 platform_is :windows do
   require 'win32ole'
 
-  describe "WIN32OLE_TYPE#helpcontext for Shell Controls" do
+  describe "WIN32OLE::Type#helpcontext for Shell Controls" do
     before :each do
-      @ole_type = WIN32OLE_TYPE.new("Microsoft Shell Controls And Automation", "Shell")
+      @ole_type = WIN32OLE::Type.new("Microsoft Shell Controls And Automation", "Shell")
     end
 
     after :each do
diff --git a/spec/ruby/library/win32ole/win32ole_type/helpfile_spec.rb b/spec/ruby/library/win32ole/win32ole_type/helpfile_spec.rb
index 3a0a9ead940d17..7bd61a1c401984 100644
--- a/spec/ruby/library/win32ole/win32ole_type/helpfile_spec.rb
+++ b/spec/ruby/library/win32ole/win32ole_type/helpfile_spec.rb
@@ -2,9 +2,9 @@
 platform_is :windows do
   require 'win32ole'
 
-  describe "WIN32OLE_TYPE#helpfile for Shell Controls" do
+  describe "WIN32OLE::Type#helpfile for Shell Controls" do
     before :each do
-      @ole_type = WIN32OLE_TYPE.new("Microsoft Shell Controls And Automation", "Shell")
+      @ole_type = WIN32OLE::Type.new("Microsoft Shell Controls And Automation", "Shell")
     end
 
     after :each do
diff --git a/spec/ruby/library/win32ole/win32ole_type/helpstring_spec.rb b/spec/ruby/library/win32ole/win32ole_type/helpstring_spec.rb
index 9ab00046683be0..940475b25e5053 100644
--- a/spec/ruby/library/win32ole/win32ole_type/helpstring_spec.rb
+++ b/spec/ruby/library/win32ole/win32ole_type/helpstring_spec.rb
@@ -2,9 +2,9 @@
 platform_is :windows do
   require 'win32ole'
 
-  describe "WIN32OLE_TYPE#helpstring for Shell Controls" do
+  describe "WIN32OLE::Type#helpstring for Shell Controls" do
     before :each do
-      @ole_type = WIN32OLE_TYPE.new("Microsoft Shell Controls And Automation", "Shell")
+      @ole_type = WIN32OLE::Type.new("Microsoft Shell Controls And Automation", "Shell")
     end
 
     after :each do
diff --git a/spec/ruby/library/win32ole/win32ole_type/major_version_spec.rb b/spec/ruby/library/win32ole/win32ole_type/major_version_spec.rb
index 7d2731f7786146..598e5bcef8a7b4 100644
--- a/spec/ruby/library/win32ole/win32ole_type/major_version_spec.rb
+++ b/spec/ruby/library/win32ole/win32ole_type/major_version_spec.rb
@@ -2,9 +2,9 @@
 platform_is :windows do
   require 'win32ole'
 
-  describe "WIN32OLE_TYPE#major_version for Shell Controls" do
+  describe "WIN32OLE::Type#major_version for Shell Controls" do
     before :each do
-      @ole_type = WIN32OLE_TYPE.new("Microsoft Shell Controls And Automation", "Shell")
+      @ole_type = WIN32OLE::Type.new("Microsoft Shell Controls And Automation", "Shell")
     end
 
     after :each do
diff --git a/spec/ruby/library/win32ole/win32ole_type/minor_version_spec.rb b/spec/ruby/library/win32ole/win32ole_type/minor_version_spec.rb
index 3904e78d42eab4..59cfb940126aee 100644
--- a/spec/ruby/library/win32ole/win32ole_type/minor_version_spec.rb
+++ b/spec/ruby/library/win32ole/win32ole_type/minor_version_spec.rb
@@ -2,9 +2,9 @@
 platform_is :windows do
   require 'win32ole'
 
-  describe "WIN32OLE_TYPE#minor_version for Shell Controls" do
+  describe "WIN32OLE::Type#minor_version for Shell Controls" do
     before :each do
-      @ole_type = WIN32OLE_TYPE.new("Microsoft Shell Controls And Automation", "Shell")
+      @ole_type = WIN32OLE::Type.new("Microsoft Shell Controls And Automation", "Shell")
     end
 
     after :each do
diff --git a/spec/ruby/library/win32ole/win32ole_type/name_spec.rb b/spec/ruby/library/win32ole/win32ole_type/name_spec.rb
index d76998d7dc3153..4cc34268729725 100644
--- a/spec/ruby/library/win32ole/win32ole_type/name_spec.rb
+++ b/spec/ruby/library/win32ole/win32ole_type/name_spec.rb
@@ -4,7 +4,7 @@
 platform_is :windows do
   require 'win32ole'
 
-  describe "WIN32OLE_TYPE#name" do
+  describe "WIN32OLE::Type#name" do
     it_behaves_like :win32ole_type_name, :name
 
   end
diff --git a/spec/ruby/library/win32ole/win32ole_type/new_spec.rb b/spec/ruby/library/win32ole/win32ole_type/new_spec.rb
index cc691ffa677d94..185a23594053eb 100644
--- a/spec/ruby/library/win32ole/win32ole_type/new_spec.rb
+++ b/spec/ruby/library/win32ole/win32ole_type/new_spec.rb
@@ -2,39 +2,39 @@
 platform_is :windows do
   require 'win32ole'
 
-  describe "WIN32OLE_TYPE.new" do
+  describe "WIN32OLE::Type.new" do
     it "raises ArgumentError with no argument" do
-      -> { WIN32OLE_TYPE.new }.should raise_error ArgumentError
+      -> { WIN32OLE::Type.new }.should raise_error ArgumentError
     end
 
     it "raises ArgumentError with invalid string" do
-      -> { WIN32OLE_TYPE.new("foo") }.should raise_error ArgumentError
+      -> { WIN32OLE::Type.new("foo") }.should raise_error ArgumentError
     end
 
     it "raises TypeError if second argument is not a String" do
-      -> { WIN32OLE_TYPE.new(1,2) }.should raise_error TypeError
+      -> { WIN32OLE::Type.new(1,2) }.should raise_error TypeError
       -> {
-        WIN32OLE_TYPE.new('Microsoft Shell Controls And Automation',2)
+        WIN32OLE::Type.new('Microsoft Shell Controls And Automation',2)
       }.should raise_error TypeError
     end
 
-    it "raise WIN32OLERuntimeError if OLE object specified is not found" do
+    it "raise WIN32OLE::RuntimeError if OLE object specified is not found" do
       -> {
-        WIN32OLE_TYPE.new('Microsoft Shell Controls And Automation','foo')
-      }.should raise_error WIN32OLERuntimeError
+        WIN32OLE::Type.new('Microsoft Shell Controls And Automation','foo')
+      }.should raise_error WIN32OLE::RuntimeError
       -> {
-        WIN32OLE_TYPE.new('Microsoft Shell Controls And Automation','Application')
-      }.should raise_error WIN32OLERuntimeError
+        WIN32OLE::Type.new('Microsoft Shell Controls And Automation','Application')
+      }.should raise_error WIN32OLE::RuntimeError
     end
 
-    it "creates WIN32OLE_TYPE object from name and valid type" do
-      ole_type = WIN32OLE_TYPE.new("Microsoft Shell Controls And Automation", "Shell")
-      ole_type.should be_kind_of WIN32OLE_TYPE
+    it "creates WIN32OLE::Type object from name and valid type" do
+      ole_type = WIN32OLE::Type.new("Microsoft Shell Controls And Automation", "Shell")
+      ole_type.should be_kind_of WIN32OLE::Type
     end
 
-    it "creates WIN32OLE_TYPE object from CLSID and valid type" do
-      ole_type2 = WIN32OLE_TYPE.new("{13709620-C279-11CE-A49E-444553540000}", "Shell")
-      ole_type2.should be_kind_of WIN32OLE_TYPE
+    it "creates WIN32OLE::Type object from CLSID and valid type" do
+      ole_type2 = WIN32OLE::Type.new("{13709620-C279-11CE-A49E-444553540000}", "Shell")
+      ole_type2.should be_kind_of WIN32OLE::Type
     end
 
   end
diff --git a/spec/ruby/library/win32ole/win32ole_type/ole_classes_spec.rb b/spec/ruby/library/win32ole/win32ole_type/ole_classes_spec.rb
index a3a1d4ac58da52..ed14e37a958f1a 100644
--- a/spec/ruby/library/win32ole/win32ole_type/ole_classes_spec.rb
+++ b/spec/ruby/library/win32ole/win32ole_type/ole_classes_spec.rb
@@ -2,9 +2,9 @@
 platform_is :windows do
   require 'win32ole'
 
-  describe "WIN32OLE_TYPE.ole_classes for Shell Controls" do
+  describe "WIN32OLE::Type.ole_classes for Shell Controls" do
     before :each do
-      @ole_type = WIN32OLE_TYPE.new("Microsoft Shell Controls And Automation", "Shell")
+      @ole_type = WIN32OLE::Type.new("Microsoft Shell Controls And Automation", "Shell")
     end
 
     after :each do
@@ -12,7 +12,7 @@
     end
 
     it "returns array of WIN32OLE_TYPEs" do
-      WIN32OLE_TYPE.ole_classes("Microsoft Shell Controls And Automation").all? {|e| e.kind_of? WIN32OLE_TYPE }.should be_true
+      WIN32OLE::Type.ole_classes("Microsoft Shell Controls And Automation").all? {|e| e.kind_of? WIN32OLE::Type }.should be_true
     end
 
   end
diff --git a/spec/ruby/library/win32ole/win32ole_type/ole_methods_spec.rb b/spec/ruby/library/win32ole/win32ole_type/ole_methods_spec.rb
index 3b99b97a6124d1..0c031abaa6ea60 100644
--- a/spec/ruby/library/win32ole/win32ole_type/ole_methods_spec.rb
+++ b/spec/ruby/library/win32ole/win32ole_type/ole_methods_spec.rb
@@ -2,9 +2,9 @@
 platform_is :windows do
   require 'win32ole'
 
-  describe "WIN32OLE_TYPE#ole_methods for Shell Controls" do
+  describe "WIN32OLE::Type#ole_methods for Shell Controls" do
     before :each do
-      @ole_type = WIN32OLE_TYPE.new("Microsoft Shell Controls And Automation", "Shell")
+      @ole_type = WIN32OLE::Type.new("Microsoft Shell Controls And Automation", "Shell")
     end
 
     after :each do
@@ -12,7 +12,7 @@
     end
 
     it "returns an Integer" do
-      @ole_type.ole_methods.all? { |m| m.kind_of? WIN32OLE_METHOD }.should be_true
+      @ole_type.ole_methods.all? { |m| m.kind_of? WIN32OLE::Method }.should be_true
     end
 
   end
diff --git a/spec/ruby/library/win32ole/win32ole_type/ole_type_spec.rb b/spec/ruby/library/win32ole/win32ole_type/ole_type_spec.rb
index 24292b1c4f9372..49c1902f8ce284 100644
--- a/spec/ruby/library/win32ole/win32ole_type/ole_type_spec.rb
+++ b/spec/ruby/library/win32ole/win32ole_type/ole_type_spec.rb
@@ -2,9 +2,9 @@
 platform_is :windows do
   require 'win32ole'
 
-  describe "WIN32OLE_TYPE#ole_type for Shell Controls" do
+  describe "WIN32OLE::Type#ole_type for Shell Controls" do
     before :each do
-      @ole_type = WIN32OLE_TYPE.new("Microsoft Shell Controls And Automation", "Shell")
+      @ole_type = WIN32OLE::Type.new("Microsoft Shell Controls And Automation", "Shell")
     end
 
     after :each do
diff --git a/spec/ruby/library/win32ole/win32ole_type/progid_spec.rb b/spec/ruby/library/win32ole/win32ole_type/progid_spec.rb
index 340fdb34e83e08..9a700426d9808a 100644
--- a/spec/ruby/library/win32ole/win32ole_type/progid_spec.rb
+++ b/spec/ruby/library/win32ole/win32ole_type/progid_spec.rb
@@ -2,9 +2,9 @@
 platform_is :windows do
   require 'win32ole'
 
-  describe "WIN32OLE_TYPE#progid for Shell Controls" do
+  describe "WIN32OLE::Type#progid for Shell Controls" do
     before :each do
-      @ole_type = WIN32OLE_TYPE.new("Microsoft Shell Controls And Automation", "Shell")
+      @ole_type = WIN32OLE::Type.new("Microsoft Shell Controls And Automation", "Shell")
     end
 
     after :each do
diff --git a/spec/ruby/library/win32ole/win32ole_type/progids_spec.rb b/spec/ruby/library/win32ole/win32ole_type/progids_spec.rb
index 793535b48dbd71..b1b57960cd6202 100644
--- a/spec/ruby/library/win32ole/win32ole_type/progids_spec.rb
+++ b/spec/ruby/library/win32ole/win32ole_type/progids_spec.rb
@@ -2,13 +2,13 @@
 platform_is :windows do
   require 'win32ole'
 
-  describe "WIN32OLE_TYPE.progids" do
+  describe "WIN32OLE::Type.progids" do
     it "raises ArgumentError if an argument is given" do
-      -> { WIN32OLE_TYPE.progids(1) }.should raise_error ArgumentError
+      -> { WIN32OLE::Type.progids(1) }.should raise_error ArgumentError
     end
 
     it "returns an array containing 'Shell.Explorer'" do
-      WIN32OLE_TYPE.progids().include?('Shell.Explorer').should be_true
+      WIN32OLE::Type.progids().include?('Shell.Explorer').should be_true
     end
 
   end
diff --git a/spec/ruby/library/win32ole/win32ole_type/shared/name.rb b/spec/ruby/library/win32ole/win32ole_type/shared/name.rb
index 6f37446b23c7cb..efae7aeec16224 100644
--- a/spec/ruby/library/win32ole/win32ole_type/shared/name.rb
+++ b/spec/ruby/library/win32ole/win32ole_type/shared/name.rb
@@ -3,7 +3,7 @@
 
   describe :win32ole_type_name, shared: true do
     before :each do
-      @ole_type = WIN32OLE_TYPE.new("Microsoft Shell Controls And Automation", "ShellSpecialFolderConstants")
+      @ole_type = WIN32OLE::Type.new("Microsoft Shell Controls And Automation", "ShellSpecialFolderConstants")
     end
 
     it "raises ArgumentError if argument is given" do
diff --git a/spec/ruby/library/win32ole/win32ole_type/src_type_spec.rb b/spec/ruby/library/win32ole/win32ole_type/src_type_spec.rb
index 3f89fe702a3671..3c7651cc1fd250 100644
--- a/spec/ruby/library/win32ole/win32ole_type/src_type_spec.rb
+++ b/spec/ruby/library/win32ole/win32ole_type/src_type_spec.rb
@@ -2,9 +2,9 @@
 platform_is :windows do
   require 'win32ole'
 
-  describe "WIN32OLE_TYPE#src_type for Shell Controls" do
+  describe "WIN32OLE::Type#src_type for Shell Controls" do
     before :each do
-      @ole_type = WIN32OLE_TYPE.new("Microsoft Shell Controls And Automation", "Shell")
+      @ole_type = WIN32OLE::Type.new("Microsoft Shell Controls And Automation", "Shell")
     end
 
     after :each do
diff --git a/spec/ruby/library/win32ole/win32ole_type/to_s_spec.rb b/spec/ruby/library/win32ole/win32ole_type/to_s_spec.rb
index 9f086a5a357128..03a0344fdbf115 100644
--- a/spec/ruby/library/win32ole/win32ole_type/to_s_spec.rb
+++ b/spec/ruby/library/win32ole/win32ole_type/to_s_spec.rb
@@ -4,7 +4,7 @@
 platform_is :windows do
   require 'win32ole'
 
-  describe "WIN32OLE_TYPE#to_s" do
+  describe "WIN32OLE::Type#to_s" do
     it_behaves_like :win32ole_type_name, :to_s
 
   end
diff --git a/spec/ruby/library/win32ole/win32ole_type/typekind_spec.rb b/spec/ruby/library/win32ole/win32ole_type/typekind_spec.rb
index 391d505e01fc68..8b62f3e2ebb5c9 100644
--- a/spec/ruby/library/win32ole/win32ole_type/typekind_spec.rb
+++ b/spec/ruby/library/win32ole/win32ole_type/typekind_spec.rb
@@ -2,9 +2,9 @@
 platform_is :windows do
   require 'win32ole'
 
-  describe "WIN32OLE_TYPE#typekind for Shell Controls" do
+  describe "WIN32OLE::Type#typekind for Shell Controls" do
     before :each do
-      @ole_type = WIN32OLE_TYPE.new("Microsoft Shell Controls And Automation", "Shell")
+      @ole_type = WIN32OLE::Type.new("Microsoft Shell Controls And Automation", "Shell")
     end
 
     after :each do
diff --git a/spec/ruby/library/win32ole/win32ole_type/typelibs_spec.rb b/spec/ruby/library/win32ole/win32ole_type/typelibs_spec.rb
index a487208caaf2eb..71d7cf00f76a3e 100644
--- a/spec/ruby/library/win32ole/win32ole_type/typelibs_spec.rb
+++ b/spec/ruby/library/win32ole/win32ole_type/typelibs_spec.rb
@@ -2,9 +2,9 @@
 platform_is :windows do
   require 'win32ole'
 
-  describe "WIN32OLE_TYPE.typelibs for Shell Controls" do
+  describe "WIN32OLE::Type.typelibs for Shell Controls" do
     before :each do
-      @ole_type = WIN32OLE_TYPE.new("Microsoft Shell Controls And Automation", "Shell")
+      @ole_type = WIN32OLE::Type.new("Microsoft Shell Controls And Automation", "Shell")
     end
 
     after :each do
@@ -12,11 +12,11 @@
     end
 
     it "raises ArgumentError if any argument is give" do
-      -> { WIN32OLE_TYPE.typelibs(1) }.should raise_error ArgumentError
+      -> { WIN32OLE::Type.typelibs(1) }.should raise_error ArgumentError
     end
 
     it "returns array of type libraries" do
-      WIN32OLE_TYPE.typelibs().include?("Microsoft Shell Controls And Automation").should be_true
+      WIN32OLE::Type.typelibs().include?("Microsoft Shell Controls And Automation").should be_true
     end
 
   end
diff --git a/spec/ruby/library/win32ole/win32ole_type/variables_spec.rb b/spec/ruby/library/win32ole/win32ole_type/variables_spec.rb
index 7f61b8af956419..b1a407523c8531 100644
--- a/spec/ruby/library/win32ole/win32ole_type/variables_spec.rb
+++ b/spec/ruby/library/win32ole/win32ole_type/variables_spec.rb
@@ -2,9 +2,9 @@
 platform_is :windows do
   require 'win32ole'
 
-  describe "WIN32OLE_TYPE#variables for Shell Controls" do
+  describe "WIN32OLE::Type#variables for Shell Controls" do
     before :each do
-      @ole_type = WIN32OLE_TYPE.new("Microsoft Shell Controls And Automation", "Shell")
+      @ole_type = WIN32OLE::Type.new("Microsoft Shell Controls And Automation", "Shell")
     end
 
     after :each do
diff --git a/spec/ruby/library/win32ole/win32ole_type/visible_spec.rb b/spec/ruby/library/win32ole/win32ole_type/visible_spec.rb
index 99e34edcdda8fd..05c54c8838a560 100644
--- a/spec/ruby/library/win32ole/win32ole_type/visible_spec.rb
+++ b/spec/ruby/library/win32ole/win32ole_type/visible_spec.rb
@@ -2,9 +2,9 @@
 platform_is :windows do
   require 'win32ole'
 
-  describe "WIN32OLE_TYPE#visible? for Shell Controls" do
+  describe "WIN32OLE::Type#visible? for Shell Controls" do
     before :each do
-      @ole_type = WIN32OLE_TYPE.new("Microsoft Shell Controls And Automation", "Shell")
+      @ole_type = WIN32OLE::Type.new("Microsoft Shell Controls And Automation", "Shell")
     end
 
     after :each do
diff --git a/spec/ruby/library/win32ole/win32ole_variable/ole_type_detail_spec.rb b/spec/ruby/library/win32ole/win32ole_variable/ole_type_detail_spec.rb
index 7a9c79149493e5..89576ceedc69e2 100644
--- a/spec/ruby/library/win32ole/win32ole_variable/ole_type_detail_spec.rb
+++ b/spec/ruby/library/win32ole/win32ole_variable/ole_type_detail_spec.rb
@@ -6,7 +6,7 @@
     # not sure how WIN32OLE_VARIABLE objects are supposed to be generated
     # WIN32OLE_VARIABLE.new even seg faults in some cases
     before :each do
-      ole_type = WIN32OLE_TYPE.new("Microsoft Shell Controls And Automation", "ShellSpecialFolderConstants")
+      ole_type = WIN32OLE::Type.new("Microsoft Shell Controls And Automation", "ShellSpecialFolderConstants")
       @var = ole_type.variables[0]
     end
 
diff --git a/spec/ruby/library/win32ole/win32ole_variable/ole_type_spec.rb b/spec/ruby/library/win32ole/win32ole_variable/ole_type_spec.rb
index 03a9aa4c74db6e..441011f1e7feff 100644
--- a/spec/ruby/library/win32ole/win32ole_variable/ole_type_spec.rb
+++ b/spec/ruby/library/win32ole/win32ole_variable/ole_type_spec.rb
@@ -6,7 +6,7 @@
     # not sure how WIN32OLE_VARIABLE objects are supposed to be generated
     # WIN32OLE_VARIABLE.new even seg faults in some cases
     before :each do
-      ole_type = WIN32OLE_TYPE.new("Microsoft Shell Controls And Automation", "ShellSpecialFolderConstants")
+      ole_type = WIN32OLE::Type.new("Microsoft Shell Controls And Automation", "ShellSpecialFolderConstants")
       @var = ole_type.variables[0]
     end
 
diff --git a/spec/ruby/library/win32ole/win32ole_variable/shared/name.rb b/spec/ruby/library/win32ole/win32ole_variable/shared/name.rb
index 033e830fac31c3..d02942ce0a89ad 100644
--- a/spec/ruby/library/win32ole/win32ole_variable/shared/name.rb
+++ b/spec/ruby/library/win32ole/win32ole_variable/shared/name.rb
@@ -5,7 +5,7 @@
     # not sure how WIN32OLE_VARIABLE objects are supposed to be generated
     # WIN32OLE_VARIABLE.new even seg faults in some cases
     before :each do
-      ole_type = WIN32OLE_TYPE.new("Microsoft Shell Controls And Automation", "ShellSpecialFolderConstants")
+      ole_type = WIN32OLE::Type.new("Microsoft Shell Controls And Automation", "ShellSpecialFolderConstants")
       @var = ole_type.variables[0]
     end
 
diff --git a/spec/ruby/library/win32ole/win32ole_variable/value_spec.rb b/spec/ruby/library/win32ole/win32ole_variable/value_spec.rb
index b7849793c52374..d26273ebeda6ee 100644
--- a/spec/ruby/library/win32ole/win32ole_variable/value_spec.rb
+++ b/spec/ruby/library/win32ole/win32ole_variable/value_spec.rb
@@ -6,7 +6,7 @@
     # not sure how WIN32OLE_VARIABLE objects are supposed to be generated
     # WIN32OLE_VARIABLE.new even seg faults in some cases
     before :each do
-      ole_type = WIN32OLE_TYPE.new("Microsoft Shell Controls And Automation", "ShellSpecialFolderConstants")
+      ole_type = WIN32OLE::Type.new("Microsoft Shell Controls And Automation", "ShellSpecialFolderConstants")
       @var = ole_type.variables[0]
     end
 
diff --git a/spec/ruby/library/win32ole/win32ole_variable/variable_kind_spec.rb b/spec/ruby/library/win32ole/win32ole_variable/variable_kind_spec.rb
index 7a79d32ddcb2e7..17bc47160affb9 100644
--- a/spec/ruby/library/win32ole/win32ole_variable/variable_kind_spec.rb
+++ b/spec/ruby/library/win32ole/win32ole_variable/variable_kind_spec.rb
@@ -6,7 +6,7 @@
     # not sure how WIN32OLE_VARIABLE objects are supposed to be generated
     # WIN32OLE_VARIABLE.new even seg faults in some cases
     before :each do
-      ole_type = WIN32OLE_TYPE.new("Microsoft Shell Controls And Automation", "ShellSpecialFolderConstants")
+      ole_type = WIN32OLE::Type.new("Microsoft Shell Controls And Automation", "ShellSpecialFolderConstants")
       @var = ole_type.variables[0]
     end
 
diff --git a/spec/ruby/library/win32ole/win32ole_variable/varkind_spec.rb b/spec/ruby/library/win32ole/win32ole_variable/varkind_spec.rb
index 9d7b8238c88f90..c5f81645099287 100644
--- a/spec/ruby/library/win32ole/win32ole_variable/varkind_spec.rb
+++ b/spec/ruby/library/win32ole/win32ole_variable/varkind_spec.rb
@@ -7,7 +7,7 @@
     # not sure how WIN32OLE_VARIABLE objects are supposed to be generated
     # WIN32OLE_VARIABLE.new even seg faults in some cases
     before :each do
-      ole_type = WIN32OLE_TYPE.new("Microsoft Shell Controls And Automation", "ShellSpecialFolderConstants")
+      ole_type = WIN32OLE::Type.new("Microsoft Shell Controls And Automation", "ShellSpecialFolderConstants")
       @var = ole_type.variables[0]
     end
 
diff --git a/spec/ruby/library/win32ole/win32ole_variable/visible_spec.rb b/spec/ruby/library/win32ole/win32ole_variable/visible_spec.rb
index 60252e81397edc..ba53a81de0bfc1 100644
--- a/spec/ruby/library/win32ole/win32ole_variable/visible_spec.rb
+++ b/spec/ruby/library/win32ole/win32ole_variable/visible_spec.rb
@@ -6,7 +6,7 @@
     # not sure how WIN32OLE_VARIABLE objects are supposed to be generated
     # WIN32OLE_VARIABLE.new even seg faults in some cases
     before :each do
-      ole_type = WIN32OLE_TYPE.new("Microsoft Shell Controls And Automation", "ShellSpecialFolderConstants")
+      ole_type = WIN32OLE::Type.new("Microsoft Shell Controls And Automation", "ShellSpecialFolderConstants")
       @var = ole_type.variables[0]
     end
 
diff --git a/spec/ruby/library/yaml/dump_spec.rb b/spec/ruby/library/yaml/dump_spec.rb
index 3107a8f51d32cb..97b665d6a59655 100644
--- a/spec/ruby/library/yaml/dump_spec.rb
+++ b/spec/ruby/library/yaml/dump_spec.rb
@@ -1,17 +1,21 @@
 require_relative '../../spec_helper'
-require_relative 'fixtures/common'
 
-# TODO: WTF is this using a global?
+require 'yaml'
+
 describe "YAML.dump" do
+  before :each do
+    @test_file = tmp("yaml_test_file")
+  end
+
   after :each do
-    rm_r $test_file
+    rm_r @test_file
   end
 
   it "converts an object to YAML and write result to io when io provided" do
-    File.open($test_file, 'w' ) do |io|
+    File.open(@test_file, 'w' ) do |io|
       YAML.dump( ['badger', 'elephant', 'tiger'], io )
     end
-    YAML.load_file($test_file).should == ['badger', 'elephant', 'tiger']
+    YAML.load_file(@test_file).should == ['badger', 'elephant', 'tiger']
   end
 
   it "returns a string containing dumped YAML when no io provided" do
@@ -35,7 +39,11 @@
   end
 
   it "dumps an OpenStruct" do
-    require "ostruct"
+    begin
+      require "ostruct"
+    rescue LoadError
+      skip "OpenStruct is not available"
+    end
     os = OpenStruct.new("age" => 20, "name" => "John")
     yaml_dump = YAML.dump(os)
 
diff --git a/spec/ruby/library/yaml/dump_stream_spec.rb b/spec/ruby/library/yaml/dump_stream_spec.rb
index 9d30fef819e505..f0578fa800e87e 100644
--- a/spec/ruby/library/yaml/dump_stream_spec.rb
+++ b/spec/ruby/library/yaml/dump_stream_spec.rb
@@ -1,5 +1,6 @@
 require_relative '../../spec_helper'
-require_relative 'fixtures/common'
+
+require 'yaml'
 
 describe "YAML.dump_stream" do
   it "returns a YAML stream containing the objects passed" do
diff --git a/spec/ruby/library/yaml/fixtures/common.rb b/spec/ruby/library/yaml/fixtures/common.rb
deleted file mode 100644
index 895213b844f087..00000000000000
--- a/spec/ruby/library/yaml/fixtures/common.rb
+++ /dev/null
@@ -1,4 +0,0 @@
-require 'yaml'
-
-$test_file = tmp("yaml_test_file")
-$test_parse_file = __dir__ + "/test_yaml.yml"
diff --git a/spec/ruby/library/yaml/fixtures/strings.rb b/spec/ruby/library/yaml/fixtures/strings.rb
index 6f66dc3659f24a..f478f898237df7 100644
--- a/spec/ruby/library/yaml/fixtures/strings.rb
+++ b/spec/ruby/library/yaml/fixtures/strings.rb
@@ -1,36 +1,26 @@
-$complex_key_1 = <<EOY
-    ? # PLAY SCHEDULE
-      - Detroit Tigers
-      - Chicago Cubs
-    :
-      - 2001-07-23
+module YAMLSpecs
+  COMPLEX_KEY_1 = <<~EOY
+      ? # PLAY SCHEDULE
+        - Detroit Tigers
+        - Chicago Cubs
+      :
+        - 2001-07-23
 
-    ? [ New York Yankees,
-        Atlanta Braves ]
-    : [ 2001-07-02, 2001-08-12,
-       2001-08-14 ]
-EOY
+      ? [ New York Yankees,
+          Atlanta Braves ]
+      : [ 2001-07-02, 2001-08-12,
+         2001-08-14 ]
+  EOY
 
-$to_yaml_hash =
-<<EOY
--
-  avg: 0.278
-  hr: 65
-  name: Mark McGwire
--
-  avg: 0.288
-  hr: 63
-  name: Sammy Sosa
-EOY
+  MULTIDOCUMENT = <<~EOY
+  ---
+  - Mark McGwire
+  - Sammy Sosa
+  - Ken Griffey
 
-$multidocument = <<EOY
----
-- Mark McGwire
-- Sammy Sosa
-- Ken Griffey
-
-# Team ranking
----
-- Chicago Cubs
-- St Louis Cardinals
-EOY
+  # Team ranking
+  ---
+  - Chicago Cubs
+  - St Louis Cardinals
+  EOY
+end
diff --git a/spec/ruby/library/yaml/load_file_spec.rb b/spec/ruby/library/yaml/load_file_spec.rb
index 2363c081208628..4941d0485b3c19 100644
--- a/spec/ruby/library/yaml/load_file_spec.rb
+++ b/spec/ruby/library/yaml/load_file_spec.rb
@@ -1,13 +1,18 @@
 require_relative '../../spec_helper'
-require_relative 'fixtures/common'
+
+require 'yaml'
 
 describe "YAML.load_file" do
+  before :each do
+    @test_file = tmp("yaml_test_file")
+  end
+
   after :each do
-    rm_r $test_file
+    rm_r @test_file
   end
 
   it "returns a hash" do
-    File.open($test_file,'w' ){|io| YAML.dump( {"bar"=>2, "car"=>1}, io ) }
-    YAML.load_file($test_file).should == {"bar"=>2, "car"=>1}
+    File.open(@test_file,'w' ){|io| YAML.dump( {"bar"=>2, "car"=>1}, io ) }
+    YAML.load_file(@test_file).should == {"bar"=>2, "car"=>1}
   end
 end
diff --git a/spec/ruby/library/yaml/load_stream_spec.rb b/spec/ruby/library/yaml/load_stream_spec.rb
index 689653c8cd64ac..31bc862f5e7479 100644
--- a/spec/ruby/library/yaml/load_stream_spec.rb
+++ b/spec/ruby/library/yaml/load_stream_spec.rb
@@ -1,8 +1,9 @@
 require_relative '../../spec_helper'
-require_relative 'fixtures/common'
 require_relative 'fixtures/strings'
 require_relative 'shared/each_document'
 
+require 'yaml'
+
 describe "YAML.load_stream" do
   it_behaves_like :yaml_each_document, :load_stream
 end
diff --git a/spec/ruby/library/yaml/parse_file_spec.rb b/spec/ruby/library/yaml/parse_file_spec.rb
index 8c59a2d7ef8b4a..7bffcdc62f9bf7 100644
--- a/spec/ruby/library/yaml/parse_file_spec.rb
+++ b/spec/ruby/library/yaml/parse_file_spec.rb
@@ -1,8 +1,10 @@
 require_relative '../../spec_helper'
-require_relative 'fixtures/common'
 
-describe "YAML#parse_file" do
+require 'yaml'
+
+describe "YAML.parse_file" do
   it "returns a YAML::Syck::Map object after parsing a YAML file" do
-    YAML.parse_file($test_parse_file).should be_kind_of(Psych::Nodes::Document)
+    test_parse_file = fixture __FILE__, "test_yaml.yml"
+    YAML.parse_file(test_parse_file).should be_kind_of(Psych::Nodes::Document)
   end
 end
diff --git a/spec/ruby/library/yaml/parse_spec.rb b/spec/ruby/library/yaml/parse_spec.rb
index d5dbfdcee25e57..37e2b7fa0a5420 100644
--- a/spec/ruby/library/yaml/parse_spec.rb
+++ b/spec/ruby/library/yaml/parse_spec.rb
@@ -1,13 +1,14 @@
 require_relative '../../spec_helper'
-require_relative 'fixtures/common'
 
-describe "YAML#parse with an empty string" do
+require 'yaml'
+
+describe "YAML.parse with an empty string" do
   it "returns false" do
     YAML.parse('').should be_false
   end
 end
 
-describe "YAML#parse" do
+describe "YAML.parse" do
   before :each do
     @string_yaml = "foo".to_yaml
   end
diff --git a/spec/ruby/library/yaml/shared/each_document.rb b/spec/ruby/library/yaml/shared/each_document.rb
index 999123dc2a4d15..6f00aee297e6c9 100644
--- a/spec/ruby/library/yaml/shared/each_document.rb
+++ b/spec/ruby/library/yaml/shared/each_document.rb
@@ -1,7 +1,7 @@
 describe :yaml_each_document, shared: true do
   it "calls the block on each successive document" do
     documents = []
-    YAML.send(@method, $multidocument) do |doc|
+    YAML.send(@method, YAMLSpecs::MULTIDOCUMENT) do |doc|
       documents << doc
     end
     documents.should == [["Mark McGwire", "Sammy Sosa", "Ken Griffey"],
@@ -9,7 +9,8 @@
   end
 
   it "works on files" do
-    File.open($test_parse_file, "r") do |file|
+    test_parse_file = fixture __FILE__, "test_yaml.yml"
+    File.open(test_parse_file, "r") do |file|
       YAML.send(@method, file) do |doc|
         doc.should == {"project"=>{"name"=>"RubySpec"}}
       end
diff --git a/spec/ruby/library/yaml/shared/load.rb b/spec/ruby/library/yaml/shared/load.rb
index 185a5a60cd9ddc..b8bb605b0a02fd 100644
--- a/spec/ruby/library/yaml/shared/load.rb
+++ b/spec/ruby/library/yaml/shared/load.rb
@@ -1,14 +1,16 @@
-require_relative '../fixtures/common'
 require_relative '../fixtures/strings'
 
+require 'yaml'
+
 describe :yaml_load_safe, shared: true do
   it "returns a document from current io stream when io provided" do
-    File.open($test_file, 'w') do |io|
+    @test_file = tmp("yaml_test_file")
+    File.open(@test_file, 'w') do |io|
       YAML.dump( ['badger', 'elephant', 'tiger'], io )
     end
-    File.open($test_file) { |yf| YAML.send(@method,  yf ) }.should == ['badger', 'elephant', 'tiger']
+    File.open(@test_file) { |yf| YAML.send(@method,  yf ) }.should == ['badger', 'elephant', 'tiger']
   ensure
-    rm_r $test_file
+    rm_r @test_file
   end
 
   it "loads strings" do
@@ -104,7 +106,7 @@
                                                     Date.new( 2001, 8, 12 ),
                                                     Date.new( 2001, 8, 14 ) ]
     }
-    YAML.send(@method, $complex_key_1).should == expected
+    YAML.send(@method, YAMLSpecs::COMPLEX_KEY_1).should == expected
   end
 
   describe "with iso8601 timestamp" do
@@ -121,7 +123,11 @@
   end
 
   it "loads an OpenStruct" do
-    require "ostruct"
+    begin
+      require "ostruct"
+    rescue LoadError
+      skip "OpenStruct is not available"
+    end
     os = OpenStruct.new("age" => 20, "name" => "John")
     loaded = YAML.send(@method, "--- !ruby/object:OpenStruct\ntable:\n  :age: 20\n  :name: John\n")
     loaded.should == os
diff --git a/spec/ruby/library/yaml/to_yaml_spec.rb b/spec/ruby/library/yaml/to_yaml_spec.rb
index 8e80b02cb453ed..08c545141629ee 100644
--- a/spec/ruby/library/yaml/to_yaml_spec.rb
+++ b/spec/ruby/library/yaml/to_yaml_spec.rb
@@ -1,7 +1,8 @@
 require_relative '../../spec_helper'
-require_relative 'fixtures/common'
 require_relative 'fixtures/example_class'
 
+require 'yaml'
+
 describe "Object#to_yaml" do
 
   it "returns the YAML representation of an Array object" do
@@ -12,13 +13,21 @@
     { "a" => "b"}.to_yaml.should match_yaml("--- \na: b\n")
   end
 
-  it "returns the YAML representation of a Class object" do
+  it "returns the YAML representation of an object" do
     YAMLSpecs::Example.new("baz").to_yaml.should match_yaml("--- !ruby/object:YAMLSpecs::Example\nname: baz\n")
   end
 
+  it "returns the YAML representation of a Class object" do
+    YAMLSpecs::Example.to_yaml.should match_yaml("--- !ruby/class 'YAMLSpecs::Example'\n")
+  end
+
+  it "returns the YAML representation of a Module object" do
+    Enumerable.to_yaml.should match_yaml("--- !ruby/module 'Enumerable'\n")
+  end
+
   it "returns the YAML representation of a Date object" do
     require 'date'
-    Date.parse('1997/12/30').to_yaml.should match_yaml("--- 1997-12-30\n")
+    Date.new(1997, 12, 30).to_yaml.should match_yaml("--- 1997-12-30\n")
   end
 
   it "returns the YAML representation of a FalseClass" do
@@ -56,6 +65,13 @@
   it "returns the YAML representation of a Struct object" do
     Person = Struct.new(:name, :gender)
     Person.new("Jane", "female").to_yaml.should match_yaml("--- !ruby/struct:Person\nname: Jane\ngender: female\n")
+  ensure
+    Object.send(:remove_const, :Person)
+  end
+
+  it "returns the YAML representation of an unnamed Struct object" do
+    person = Struct.new(:name, :gender)
+    person.new("Jane", "female").to_yaml.should match_yaml("--- !ruby/struct\nname: Jane\ngender: female\n")
   end
 
   it "returns the YAML representation of a Symbol object" do
diff --git a/spec/ruby/library/zlib/deflate/deflate_spec.rb b/spec/ruby/library/zlib/deflate/deflate_spec.rb
index 50a563ef6f4bb8..e16e6ad0ef186b 100644
--- a/spec/ruby/library/zlib/deflate/deflate_spec.rb
+++ b/spec/ruby/library/zlib/deflate/deflate_spec.rb
@@ -23,7 +23,7 @@
 
   it "deflates chunked data" do
     random_generator = Random.new(0)
-    deflated         = ''
+    deflated         = +''
 
     Zlib::Deflate.deflate(random_generator.bytes(20000)) do |chunk|
       deflated << chunk
@@ -70,7 +70,7 @@
   before :each do
     @deflator         = Zlib::Deflate.new
     @random_generator = Random.new(0)
-    @original         = ''
+    @original         = +''
     @chunks           = []
   end
 
diff --git a/spec/ruby/library/zlib/deflate/params_spec.rb b/spec/ruby/library/zlib/deflate/params_spec.rb
index 0b1cca8c8a1f71..0242653528b746 100644
--- a/spec/ruby/library/zlib/deflate/params_spec.rb
+++ b/spec/ruby/library/zlib/deflate/params_spec.rb
@@ -3,7 +3,7 @@
 
 describe "Zlib::Deflate#params" do
   it "changes the deflate parameters" do
-    data = 'abcdefghijklm'
+    data = +'abcdefghijklm'
 
     d = Zlib::Deflate.new Zlib::NO_COMPRESSION, Zlib::MAX_WBITS,
     Zlib::DEF_MEM_LEVEL, Zlib::DEFAULT_STRATEGY
diff --git a/spec/ruby/library/zlib/gzipreader/each_char_spec.rb b/spec/ruby/library/zlib/gzipreader/each_char_spec.rb
new file mode 100644
index 00000000000000..de6396da7ee63b
--- /dev/null
+++ b/spec/ruby/library/zlib/gzipreader/each_char_spec.rb
@@ -0,0 +1,51 @@
+require_relative '../../../spec_helper'
+require 'stringio'
+require 'zlib'
+
+describe "Zlib::GzipReader#each_char" do
+
+  before :each do
+    @data = '12345abcde'
+    @zip = [31, 139, 8, 0, 44, 220, 209, 71, 0, 3, 51, 52, 50, 54, 49, 77,
+            76, 74, 78, 73, 5, 0, 157, 5, 0, 36, 10, 0, 0, 0].pack('C*')
+
+    @io = StringIO.new @zip
+    ScratchPad.clear
+  end
+
+  it "calls the given block for each char in the stream, passing the char as an argument" do
+    gz = Zlib::GzipReader.new @io
+
+    ScratchPad.record []
+    gz.each_char { |b| ScratchPad << b }
+
+    ScratchPad.recorded.should == ["1", "2", "3", "4", "5", "a", "b", "c", "d", "e"]
+  end
+
+  it "returns an enumerator, which yields each char in the stream, when no block is passed" do
+    gz = Zlib::GzipReader.new @io
+    enum = gz.each_char
+
+    ScratchPad.record []
+    while true
+      begin
+        ScratchPad << enum.next
+      rescue StopIteration
+        break
+      end
+    end
+
+    ScratchPad.recorded.should == ["1", "2", "3", "4", "5", "a", "b", "c", "d", "e"]
+  end
+
+  it "increments position before calling the block" do
+    gz = Zlib::GzipReader.new @io
+
+    i = 1
+    gz.each_char do |ignore|
+      gz.pos.should == i
+      i += 1
+    end
+  end
+
+end
diff --git a/spec/ruby/library/zlib/inflate/inflate_spec.rb b/spec/ruby/library/zlib/inflate/inflate_spec.rb
index 79b72bf91c821f..b308a4ba67b8ce 100644
--- a/spec/ruby/library/zlib/inflate/inflate_spec.rb
+++ b/spec/ruby/library/zlib/inflate/inflate_spec.rb
@@ -72,7 +72,7 @@
     data = [120, 156, 75, 203, 207, 7, 0, 2, 130, 1, 69].pack('C*')
     z = Zlib::Inflate.new
     # add bytes, one by one
-    result = ""
+    result = +""
     data.each_byte { |d| result << z.inflate(d.chr)}
     result << z.finish
     result.should == "foo"
@@ -82,7 +82,7 @@
     data = [120, 156, 75, 203, 207, 7, 0, 2, 130, 1, 69].pack('C*')[0,5]
     z = Zlib::Inflate.new
     # add bytes, one by one, but not all
-    result = ""
+    result = +""
     data.each_byte { |d| result << z.inflate(d.chr)}
     -> { result << z.finish }.should raise_error(Zlib::BufError)
   end
@@ -90,7 +90,7 @@
   it "properly handles excessive data, byte-by-byte" do
     main_data = [120, 156, 75, 203, 207, 7, 0, 2, 130, 1, 69].pack('C*')
     data =  main_data * 2
-    result = ""
+    result = +""
 
     z = Zlib::Inflate.new
     # add bytes, one by one
@@ -105,7 +105,7 @@
   it "properly handles excessive data, in one go" do
     main_data = [120, 156, 75, 203, 207, 7, 0, 2, 130, 1, 69].pack('C*')
     data =  main_data * 2
-    result = ""
+    result = +""
 
     z = Zlib::Inflate.new
     result << z.inflate(data)
diff --git a/spec/ruby/library/zlib/inflate/set_dictionary_spec.rb b/spec/ruby/library/zlib/inflate/set_dictionary_spec.rb
index 251cec44bb4b75..375ee3c765eba4 100644
--- a/spec/ruby/library/zlib/inflate/set_dictionary_spec.rb
+++ b/spec/ruby/library/zlib/inflate/set_dictionary_spec.rb
@@ -1,4 +1,4 @@
-# -*- encoding: binary -*-
+# encoding: binary
 require_relative '../../../spec_helper'
 require 'zlib'
 
diff --git a/spec/ruby/optional/capi/array_spec.rb b/spec/ruby/optional/capi/array_spec.rb
index 8e90980c6a5551..9c35017e211ed6 100644
--- a/spec/ruby/optional/capi/array_spec.rb
+++ b/spec/ruby/optional/capi/array_spec.rb
@@ -343,6 +343,40 @@
     end
   end
 
+  describe "rb_iterate" do
+    it "calls an callback function as a block passed to an method" do
+      s = [1,2,3,4]
+      s2 = @s.rb_iterate(s)
+
+      s2.should == s
+
+      # Make sure they're different objects
+      s2.equal?(s).should be_false
+    end
+
+    it "calls a function with the other function available as a block" do
+      h = {a: 1, b: 2}
+
+      @s.rb_iterate_each_pair(h).sort.should == [1,2]
+    end
+
+    it "calls a function which can yield into the original block" do
+      s2 = []
+
+      o = Object.new
+      def o.each
+        yield 1
+        yield 2
+        yield 3
+        yield 4
+      end
+
+      @s.rb_iterate_then_yield(o) { |x| s2 << x }
+
+      s2.should == [1,2,3,4]
+    end
+  end
+
   describe "rb_block_call" do
     it "calls an callback function as a block passed to an method" do
       s = [1,2,3,4]
diff --git a/spec/ruby/optional/capi/bignum_spec.rb b/spec/ruby/optional/capi/bignum_spec.rb
index cde929af28d507..179f053eec4b48 100644
--- a/spec/ruby/optional/capi/bignum_spec.rb
+++ b/spec/ruby/optional/capi/bignum_spec.rb
@@ -7,21 +7,23 @@ def ensure_bignum(n)
   n
 end
 
-full_range_longs = (fixnum_max == 2**(0.size * 8 - 1) - 1)
+full_range_longs = (fixnum_max == max_long)
+max_ulong = begin
+  require 'rbconfig/sizeof'
+  RbConfig::LIMITS['ULONG_MAX']
+rescue LoadError
+  nil
+end
+# If the system doesn't offer ULONG_MAX, assume 2's complement and derive it
+# from LONG_MAX.
+max_ulong ||= 2 * (max_long + 1) - 1
 
 describe "CApiBignumSpecs" do
   before :each do
     @s = CApiBignumSpecs.new
-
-    if full_range_longs
-      @max_long = 2**(0.size * 8 - 1) - 1
-      @min_long = -@max_long - 1
-      @max_ulong = ensure_bignum(2**(0.size * 8) - 1)
-    else
-      @max_long = ensure_bignum(2**(0.size * 8 - 1) - 1)
-      @min_long = ensure_bignum(-@max_long - 1)
-      @max_ulong = ensure_bignum(2**(0.size * 8) - 1)
-    end
+    @max_long = max_long
+    @min_long = min_long
+    @max_ulong = ensure_bignum(max_ulong)
   end
 
   describe "rb_big2long" do
@@ -123,7 +125,7 @@ def ensure_bignum(n)
       val.should == @max_ulong
     end
 
-    platform_is wordsize: 64 do
+    platform_is c_long_size: 64 do
       it "packs max_ulong into 2 ulongs to allow sign bit" do
         val = @s.rb_big_pack_length(@max_ulong)
         val.should == 2
diff --git a/spec/ruby/optional/capi/binding_spec.rb b/spec/ruby/optional/capi/binding_spec.rb
index 216570545783e8..5d0ef2efb87dba 100644
--- a/spec/ruby/optional/capi/binding_spec.rb
+++ b/spec/ruby/optional/capi/binding_spec.rb
@@ -8,21 +8,9 @@
   end
 
   describe "Kernel#binding" do
-    ruby_version_is '3.2' do
-      it "raises when called from C" do
-        foo = 14
-        -> { @b.get_binding }.should raise_error(RuntimeError)
-      end
-    end
-
-    ruby_version_is ''...'3.2' do
-      it "gives the top-most Ruby binding when called from C" do
-        foo = 14
-        b = @b.get_binding
-        b.local_variable_get(:foo).should == 14
-        b.local_variable_set :foo, 12
-        foo.should == 12
-      end
+    it "raises when called from C" do
+      foo = 14
+      -> { @b.get_binding }.should raise_error(RuntimeError)
     end
   end
 end
diff --git a/spec/ruby/optional/capi/class_spec.rb b/spec/ruby/optional/capi/class_spec.rb
index d0a9913570ddb2..7abb5d4ed95888 100644
--- a/spec/ruby/optional/capi/class_spec.rb
+++ b/spec/ruby/optional/capi/class_spec.rb
@@ -365,6 +365,8 @@
                                         "ClassUnder6",
                                         Class.new)
       }.should raise_error(TypeError)
+    ensure
+      CApiClassSpecs.send(:remove_const, :ClassUnder6)
     end
 
     it "defines a class for an existing Autoload" do
@@ -487,4 +489,16 @@ def obj.some_method() end
       @s.rb_class_real(0).should == 0
     end
   end
+
+  describe "rb_class_get_superclass" do
+    it "returns parent class for a provided class" do
+      a = Class.new
+      @s.rb_class_get_superclass(Class.new(a)).should == a
+    end
+
+    it "returns false when there is no parent class" do
+      @s.rb_class_get_superclass(BasicObject).should == false
+      @s.rb_class_get_superclass(Module.new).should == false
+    end
+  end
 end
diff --git a/spec/ruby/optional/capi/data_spec.rb b/spec/ruby/optional/capi/data_spec.rb
index 18c769332e02bd..d000eba6e31cd3 100644
--- a/spec/ruby/optional/capi/data_spec.rb
+++ b/spec/ruby/optional/capi/data_spec.rb
@@ -1,52 +1,53 @@
 require_relative 'spec_helper'
+ruby_version_is ""..."3.4" do
+  load_extension("data")
 
-load_extension("data")
-
-describe "CApiAllocSpecs (a class with an alloc func defined)" do
-  it "calls the alloc func" do
-    @s = CApiAllocSpecs.new
-    @s.wrapped_data.should == 42 # not defined in initialize
-  end
-end
-
-describe "CApiWrappedStruct" do
-  before :each do
-    @s = CApiWrappedStructSpecs.new
-  end
-
-  it "wraps with Data_Wrap_Struct and Data_Get_Struct returns data" do
-    a = @s.wrap_struct(1024)
-    @s.get_struct(a).should == 1024
+  describe "CApiAllocSpecs (a class with an alloc func defined)" do
+    it "calls the alloc func" do
+      @s = CApiAllocSpecs.new
+      @s.wrapped_data.should == 42 # not defined in initialize
+    end
   end
 
-  describe "RDATA()" do
-    it "returns the struct data" do
-      a = @s.wrap_struct(1024)
-      @s.get_struct_rdata(a).should == 1024
+  describe "CApiWrappedStruct" do
+    before :each do
+      @s = CApiWrappedStructSpecs.new
     end
 
-    it "allows changing the wrapped struct" do
+    it "wraps with Data_Wrap_Struct and Data_Get_Struct returns data" do
       a = @s.wrap_struct(1024)
-      @s.change_struct(a, 100)
-      @s.get_struct(a).should == 100
+      @s.get_struct(a).should == 1024
     end
 
-    it "raises a TypeError if the object does not wrap a struct" do
-      -> { @s.get_struct(Object.new) }.should raise_error(TypeError)
+    describe "RDATA()" do
+      it "returns the struct data" do
+        a = @s.wrap_struct(1024)
+        @s.get_struct_rdata(a).should == 1024
+      end
+
+      it "allows changing the wrapped struct" do
+        a = @s.wrap_struct(1024)
+        @s.change_struct(a, 100)
+        @s.get_struct(a).should == 100
+      end
+
+      it "raises a TypeError if the object does not wrap a struct" do
+        -> { @s.get_struct(Object.new) }.should raise_error(TypeError)
+      end
     end
-  end
 
-  describe "rb_check_type" do
-    it "does not raise an exception when checking data objects" do
-      a = @s.wrap_struct(1024)
-      @s.rb_check_type(a, a).should == true
+    describe "rb_check_type" do
+      it "does not raise an exception when checking data objects" do
+        a = @s.wrap_struct(1024)
+        @s.rb_check_type(a, a).should == true
+      end
     end
-  end
 
-  describe "DATA_PTR" do
-    it "returns the struct data" do
-      a = @s.wrap_struct(1024)
-      @s.get_struct_data_ptr(a).should == 1024
+    describe "DATA_PTR" do
+      it "returns the struct data" do
+        a = @s.wrap_struct(1024)
+        @s.get_struct_data_ptr(a).should == 1024
+      end
     end
   end
 end
diff --git a/spec/ruby/optional/capi/debug_spec.rb b/spec/ruby/optional/capi/debug_spec.rb
index c8c91417d1477a..14ba25609c555b 100644
--- a/spec/ruby/optional/capi/debug_spec.rb
+++ b/spec/ruby/optional/capi/debug_spec.rb
@@ -17,6 +17,7 @@
   describe "rb_debug_inspector_frame_self_get" do
     it "returns self" do
       @o.rb_debug_inspector_frame_self_get(0).should == @o
+      @o.rb_debug_inspector_frame_self_get(1).should == self
     end
   end
 
@@ -35,10 +36,17 @@
     end
 
     it "matches the locations in rb_debug_inspector_backtrace_locations" do
-      frames = @o.rb_debug_inspector_open(42);
-      frames.each do |_s, _klass, binding, _iseq, backtrace_location|
+      frames = @o.rb_debug_inspector_open(42)
+      frames.each do |_s, klass, binding, iseq, backtrace_location|
         if binding
-          "#{backtrace_location.path}:#{backtrace_location.lineno}".should == "#{binding.source_location[0]}:#{binding.source_location[1]}"
+          # YJIT modifies Array#each backtraces but leaves its source_location as is
+          unless defined?(RubyVM::YJIT) && klass == Array && iseq.label == "each"
+            binding.source_location.should == [backtrace_location.path, backtrace_location.lineno]
+          end
+          method_name = binding.eval('__method__')
+          if method_name
+            method_name.should == backtrace_location.base_label.to_sym
+          end
         end
       end
     end
diff --git a/spec/ruby/optional/capi/digest_spec.rb b/spec/ruby/optional/capi/digest_spec.rb
new file mode 100644
index 00000000000000..65c5ecebb124c9
--- /dev/null
+++ b/spec/ruby/optional/capi/digest_spec.rb
@@ -0,0 +1,103 @@
+require_relative 'spec_helper'
+
+begin
+  require 'fiddle'
+rescue LoadError
+  return
+end
+
+load_extension('digest')
+
+describe "C-API Digest functions" do
+  before :each do
+    @s = CApiDigestSpecs.new
+  end
+
+  describe "rb_digest_make_metadata" do
+    before :each do
+      @metadata = @s.rb_digest_make_metadata
+    end
+
+    it "should store the block length" do
+      @s.block_length(@metadata).should == 40
+    end
+
+    it "should store the digest length" do
+      @s.digest_length(@metadata).should == 20
+    end
+
+    it "should store the context size" do
+      @s.context_size(@metadata).should == 129
+    end
+  end
+
+  describe "digest plugin" do
+    before :each do
+      @s = CApiDigestSpecs.new
+      @digest = Digest::TestDigest.new
+
+      # A pointer to the CTX type defined in the extension for this spec. Digest does not make the context directly
+      # accessible as part of its API. However, to ensure we are properly loading the plugin, it's useful to have
+      # direct access to the context pointer to verify its contents.
+      @context = Fiddle::Pointer.new(@s.context(@digest))
+    end
+
+    it "should report the block length" do
+      @digest.block_length.should == 40
+    end
+
+    it "should report the digest length" do
+      @digest.digest_length.should == 20
+    end
+
+    it "should initialize the context" do
+      # Our test plugin always writes the string "Initialized\n" when its init function is called.
+      verify_context("Initialized\n")
+    end
+
+    it "should update the digest" do
+      @digest.update("hello world")
+
+      # Our test plugin always writes the string "Updated: <data>\n" when its update function is called.
+      current = "Initialized\nUpdated: hello world"
+      verify_context(current)
+
+      @digest << "blah"
+
+      current = "Initialized\nUpdated: hello worldUpdated: blah"
+      verify_context(current)
+    end
+
+    it "should finalize the digest" do
+      @digest.update("")
+
+      finish_string = @digest.instance_eval { finish }
+
+      # We expect the plugin to write out the last `@digest.digest_length` bytes, followed by the string "Finished\n".
+      #
+      finish_string.should == "d\nUpdated: Finished\n"
+      finish_string.encoding.should == Encoding::ASCII_8BIT
+    end
+
+    it "should reset the context" do
+      @digest.update("foo")
+      verify_context("Initialized\nUpdated: foo")
+
+      @digest.reset
+
+      # The context will be recreated as a result of the `reset` so we must fetch the latest context pointer.
+      @context = Fiddle::Pointer.new(@s.context(@digest))
+
+      verify_context("Initialized\n")
+    end
+
+    def verify_context(current_body)
+      # In the CTX type, the length of the current context contents is stored in the first byte.
+      byte_count = @context[0]
+      byte_count.should == current_body.bytesize
+
+      # After the size byte follows a string.
+      @context[1, byte_count].should == current_body
+    end
+  end
+end
diff --git a/spec/ruby/optional/capi/encoding_spec.rb b/spec/ruby/optional/capi/encoding_spec.rb
index aa632b963b8086..0c3c98a5c0a832 100644
--- a/spec/ruby/optional/capi/encoding_spec.rb
+++ b/spec/ruby/optional/capi/encoding_spec.rb
@@ -1,8 +1,9 @@
 # -*- encoding: utf-8 -*-
+# frozen_string_literal: false
 require_relative 'spec_helper'
 require_relative 'fixtures/encoding'
 
-load_extension('encoding')
+extension_path = load_extension('encoding')
 
 describe :rb_enc_get_index, shared: true do
   it "returns the index of the encoding of a String" do
@@ -170,7 +171,7 @@
 
   describe "rb_enc_mbc_to_codepoint" do
     it "returns the correct codepoint for the given character and size" do
-       @s.rb_enc_mbc_to_codepoint("é").should == 0xE9
+      @s.rb_enc_mbc_to_codepoint("é").should == 0xE9
     end
 
     it "returns 0 if p == e" do
@@ -559,19 +560,19 @@
 
   describe "rb_ascii8bit_encindex" do
     it "returns an index for the ASCII-8BIT encoding" do
-      @s.rb_ascii8bit_encindex().should >= 0
+      @s.rb_ascii8bit_encindex().should == 0
     end
   end
 
   describe "rb_utf8_encindex" do
     it "returns an index for the UTF-8 encoding" do
-      @s.rb_utf8_encindex().should >= 0
+      @s.rb_utf8_encindex().should == 1
     end
   end
 
   describe "rb_usascii_encindex" do
     it "returns an index for the US-ASCII encoding" do
-      @s.rb_usascii_encindex().should >= 0
+      @s.rb_usascii_encindex().should == 2
     end
   end
 
@@ -657,6 +658,20 @@
     end
   end
 
+  describe "rb_enc_raise" do
+    it "forces exception message encoding to the specified one" do
+      utf_8_incompatible_string = "\x81".b
+
+      -> {
+        @s.rb_enc_raise(Encoding::UTF_8, RuntimeError, utf_8_incompatible_string)
+      }.should raise_error { |e|
+        e.message.encoding.should == Encoding::UTF_8
+        e.message.valid_encoding?.should == false
+        e.message.bytes.should == utf_8_incompatible_string.bytes
+      }
+    end
+  end
+
   describe "rb_uv_to_utf8" do
     it 'converts a Unicode codepoint to a UTF-8 C string' do
       str = ' ' * 6
@@ -674,6 +689,22 @@
     end
   end
 
+  describe "rb_enc_left_char_head" do
+    it 'returns the head position of a character' do
+      @s.rb_enc_left_char_head("é", 1).should == 0
+      @s.rb_enc_left_char_head("éééé", 7).should == 6
+
+      @s.rb_enc_left_char_head("a", 0).should == 0
+
+      # unclear if this is intended to work
+      @s.rb_enc_left_char_head("a", 1).should == 1
+
+      # Works because for single-byte encodings rb_enc_left_char_head() just returns the pointer
+      @s.rb_enc_left_char_head("a".force_encoding(Encoding::US_ASCII), 88).should == 88
+      @s.rb_enc_left_char_head("a".b, 88).should == 88
+    end
+  end
+
   describe "ONIGENC_MBC_CASE_FOLD" do
     it "returns the correct case fold for the given string" do
       @s.ONIGENC_MBC_CASE_FOLD("lower").should == ["l", 1]
@@ -691,4 +722,25 @@
       str.bytes.should == [0, 0x24]
     end
   end
+
+  describe "rb_define_dummy_encoding" do
+    it "defines the dummy encoding" do
+      @s.rb_define_dummy_encoding("FOO")
+      enc = Encoding.find("FOO")
+      enc.should.dummy?
+    end
+
+    it "returns the index of the dummy encoding" do
+      index = @s.rb_define_dummy_encoding("BAR")
+      index.should == Encoding.list.size - 1
+    end
+
+    it "raises EncodingError if too many encodings" do
+      code = <<-RUBY
+        require #{extension_path.dump}
+        1_000.times {|i| CApiEncodingSpecs.new.rb_define_dummy_encoding("R_\#{i}") }
+      RUBY
+      ruby_exe(code, args: "2>&1", exit_status: 1).should.include?('too many encoding (> 256) (EncodingError)')
+    end
+  end
 end
diff --git a/spec/ruby/optional/capi/exception_spec.rb b/spec/ruby/optional/capi/exception_spec.rb
index 5bb60608b224e9..5bc8e26c6241e8 100644
--- a/spec/ruby/optional/capi/exception_spec.rb
+++ b/spec/ruby/optional/capi/exception_spec.rb
@@ -100,6 +100,26 @@
     end
   end
 
+  describe "rb_error_frozen_object" do
+    it "raises a FrozenError regardless of the object's frozen state" do
+      # The type of the argument we supply doesn't matter. The choice here is arbitrary and we only change the type
+      # of the argument to ensure the exception messages are set correctly.
+      -> { @s.rb_error_frozen_object(Array.new) }.should raise_error(FrozenError, "can't modify frozen Array: []")
+      -> { @s.rb_error_frozen_object(Array.new.freeze) }.should raise_error(FrozenError, "can't modify frozen Array: []")
+    end
+
+    it "properly handles recursive rb_error_frozen_object calls" do
+      klass = Class.new(Object)
+      object = klass.new
+      s = @s
+      klass.define_method :inspect do
+        s.rb_error_frozen_object(object)
+      end
+
+      -> { @s.rb_error_frozen_object(object) }.should raise_error(FrozenError, "can't modify frozen #{klass}:  ...")
+    end
+  end
+
   describe "rb_syserr_new" do
     it "returns system error with default message when passed message is NULL" do
       exception = @s.rb_syserr_new(Errno::ENOENT::Errno, nil)
diff --git a/spec/ruby/optional/capi/ext/array_spec.c b/spec/ruby/optional/capi/ext/array_spec.c
index 9386239813ea3f..2347798bb47c64 100644
--- a/spec/ruby/optional/capi/ext/array_spec.c
+++ b/spec/ruby/optional/capi/ext/array_spec.c
@@ -196,6 +196,14 @@ static VALUE copy_ary(RB_BLOCK_CALL_FUNC_ARGLIST(el, new_ary)) {
   return rb_ary_push(new_ary, el);
 }
 
+static VALUE array_spec_rb_iterate(VALUE self, VALUE ary) {
+  VALUE new_ary = rb_ary_new();
+
+  rb_iterate(rb_each, ary, copy_ary, new_ary);
+
+  return new_ary;
+}
+
 static VALUE array_spec_rb_block_call(VALUE self, VALUE ary) {
   VALUE new_ary = rb_ary_new();
 
@@ -208,6 +216,18 @@ static VALUE sub_pair(RB_BLOCK_CALL_FUNC_ARGLIST(el, holder)) {
   return rb_ary_push(holder, rb_ary_entry(el, 1));
 }
 
+static VALUE each_pair(VALUE obj) {
+  return rb_funcall(obj, rb_intern("each_pair"), 0);
+}
+
+static VALUE array_spec_rb_iterate_each_pair(VALUE self, VALUE obj) {
+  VALUE new_ary = rb_ary_new();
+
+  rb_iterate(each_pair, obj, sub_pair, new_ary);
+
+  return new_ary;
+}
+
 static VALUE array_spec_rb_block_call_each_pair(VALUE self, VALUE obj) {
   VALUE new_ary = rb_ary_new();
 
@@ -221,6 +241,11 @@ static VALUE iter_yield(RB_BLOCK_CALL_FUNC_ARGLIST(el, ary)) {
   return Qnil;
 }
 
+static VALUE array_spec_rb_iterate_then_yield(VALUE self, VALUE obj) {
+  rb_iterate(rb_each, obj, iter_yield, obj);
+  return Qnil;
+}
+
 static VALUE array_spec_rb_block_call_then_yield(VALUE self, VALUE obj) {
   rb_block_call(obj, rb_intern("each"), 0, 0, iter_yield, obj);
   return Qnil;
@@ -283,6 +308,9 @@ void Init_array_spec(void) {
   rb_define_method(cls, "rb_ary_plus", array_spec_rb_ary_plus, 2);
   rb_define_method(cls, "rb_ary_unshift", array_spec_rb_ary_unshift, 2);
   rb_define_method(cls, "rb_assoc_new", array_spec_rb_assoc_new, 2);
+  rb_define_method(cls, "rb_iterate", array_spec_rb_iterate, 1);
+  rb_define_method(cls, "rb_iterate_each_pair", array_spec_rb_iterate_each_pair, 1);
+  rb_define_method(cls, "rb_iterate_then_yield", array_spec_rb_iterate_then_yield, 1);
   rb_define_method(cls, "rb_block_call", array_spec_rb_block_call, 1);
   rb_define_method(cls, "rb_block_call_each_pair", array_spec_rb_block_call_each_pair, 1);
   rb_define_method(cls, "rb_block_call_then_yield", array_spec_rb_block_call_then_yield, 1);
diff --git a/spec/ruby/optional/capi/ext/class_spec.c b/spec/ruby/optional/capi/ext/class_spec.c
index f376534924cf1c..8ac0e7a93f5a45 100644
--- a/spec/ruby/optional/capi/ext/class_spec.c
+++ b/spec/ruby/optional/capi/ext/class_spec.c
@@ -65,11 +65,9 @@ static VALUE class_spec_rb_class_new_instance(VALUE self, VALUE args, VALUE klas
   return rb_class_new_instance(RARRAY_LENINT(args), RARRAY_PTR(args), klass);
 }
 
-#ifdef RUBY_VERSION_IS_3_0
 static VALUE class_spec_rb_class_new_instance_kw(VALUE self, VALUE args, VALUE klass) {
   return rb_class_new_instance_kw(RARRAY_LENINT(args), RARRAY_PTR(args), klass, RB_PASS_KEYWORDS);
 }
-#endif
 
 static VALUE class_spec_rb_class_real(VALUE self, VALUE object) {
   if (rb_type_p(object, T_FIXNUM)) {
@@ -79,6 +77,10 @@ static VALUE class_spec_rb_class_real(VALUE self, VALUE object) {
   }
 }
 
+static VALUE class_spec_rb_class_get_superclass(VALUE self, VALUE klass) {
+  return rb_class_get_superclass(klass);
+}
+
 static VALUE class_spec_rb_class_superclass(VALUE self, VALUE klass) {
   return rb_class_superclass(klass);
 }
@@ -156,10 +158,9 @@ void Init_class_spec(void) {
   rb_define_method(cls, "rb_class_private_instance_methods", class_spec_rb_class_private_instance_methods, -1);
   rb_define_method(cls, "rb_class_new", class_spec_rb_class_new, 1);
   rb_define_method(cls, "rb_class_new_instance", class_spec_rb_class_new_instance, 2);
-#ifdef RUBY_VERSION_IS_3_0
   rb_define_method(cls, "rb_class_new_instance_kw", class_spec_rb_class_new_instance_kw, 2);
-#endif
   rb_define_method(cls, "rb_class_real", class_spec_rb_class_real, 1);
+  rb_define_method(cls, "rb_class_get_superclass", class_spec_rb_class_get_superclass, 1);
   rb_define_method(cls, "rb_class_superclass", class_spec_rb_class_superclass, 1);
   rb_define_method(cls, "rb_cvar_defined", class_spec_cvar_defined, 2);
   rb_define_method(cls, "rb_cvar_get", class_spec_cvar_get, 2);
diff --git a/spec/ruby/optional/capi/ext/constants_spec.c b/spec/ruby/optional/capi/ext/constants_spec.c
index 9aee8db37fb6a0..05819ea47667ba 100644
--- a/spec/ruby/optional/capi/ext/constants_spec.c
+++ b/spec/ruby/optional/capi/ext/constants_spec.c
@@ -14,9 +14,6 @@ defconstfunc(rb_cBinding)
 defconstfunc(rb_cClass)
 defconstfunc(rb_cComplex)
 defconstfunc(rb_mComparable)
-#ifndef RUBY_VERSION_IS_3_0
-defconstfunc(rb_cData)
-#endif
 defconstfunc(rb_cDir)
 defconstfunc(rb_cEncoding)
 defconstfunc(rb_mEnumerable)
@@ -97,9 +94,6 @@ void Init_constants_spec(void) {
   rb_define_method(cls, "rb_cClass", constants_spec_rb_cClass, 0);
   rb_define_method(cls, "rb_cComplex", constants_spec_rb_cComplex, 0);
   rb_define_method(cls, "rb_mComparable", constants_spec_rb_mComparable, 0);
-  #ifndef RUBY_VERSION_IS_3_0
-  rb_define_method(cls, "rb_cData", constants_spec_rb_cData, 0);
-  #endif
   rb_define_method(cls, "rb_cDir", constants_spec_rb_cDir, 0);
   rb_define_method(cls, "rb_cEncoding", constants_spec_rb_cEncoding, 0);
   rb_define_method(cls, "rb_mEnumerable", constants_spec_rb_mEnumerable, 0);
diff --git a/spec/ruby/optional/capi/ext/data_spec.c b/spec/ruby/optional/capi/ext/data_spec.c
index ef069ef0ba8a9b..efefe37c3afbde 100644
--- a/spec/ruby/optional/capi/ext/data_spec.c
+++ b/spec/ruby/optional/capi/ext/data_spec.c
@@ -3,6 +3,7 @@
 
 #include <string.h>
 
+#ifndef RUBY_VERSION_IS_3_4
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -70,8 +71,10 @@ VALUE sws_rb_check_type(VALUE self, VALUE obj, VALUE other) {
   rb_check_type(obj, TYPE(other));
   return Qtrue;
 }
+#endif
 
 void Init_data_spec(void) {
+#ifndef RUBY_VERSION_IS_3_4
   VALUE cls = rb_define_class("CApiAllocSpecs", rb_cObject);
   rb_define_alloc_func(cls, sdaf_alloc_func);
   rb_define_method(cls, "wrapped_data", sdaf_get_struct, 0);
@@ -82,6 +85,7 @@ void Init_data_spec(void) {
   rb_define_method(cls, "get_struct_data_ptr", sws_get_struct_data_ptr, 1);
   rb_define_method(cls, "change_struct", sws_change_struct, 2);
   rb_define_method(cls, "rb_check_type", sws_rb_check_type, 2);
+#endif
 }
 
 #ifdef __cplusplus
diff --git a/spec/ruby/optional/capi/ext/digest_spec.c b/spec/ruby/optional/capi/ext/digest_spec.c
new file mode 100644
index 00000000000000..9993238cf227d3
--- /dev/null
+++ b/spec/ruby/optional/capi/ext/digest_spec.c
@@ -0,0 +1,166 @@
+#include "ruby.h"
+#include "rubyspec.h"
+
+#include "ruby/digest.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#define DIGEST_LENGTH 20
+#define BLOCK_LENGTH 40
+
+const char *init_string = "Initialized\n";
+const char *update_string = "Updated: ";
+const char *finish_string = "Finished\n";
+
+#define PAYLOAD_SIZE 128
+
+typedef struct CTX {
+  uint8_t pos;
+  char payload[PAYLOAD_SIZE];
+} CTX;
+
+void* context = NULL;
+
+int digest_spec_plugin_init(void *raw_ctx) {
+    // Make the context accessible to tests. This isn't safe, but there's no way to access the context otherwise.
+    context = raw_ctx;
+
+    struct CTX *ctx = (struct CTX *)raw_ctx;
+    size_t len = strlen(init_string);
+
+    // Clear the payload since this init function will be invoked as part of the `reset` operation.
+    memset(ctx->payload, 0, PAYLOAD_SIZE);
+
+    // Write a simple value we can verify in tests.
+    // This is not what a real digest would do, but we're using a dummy digest plugin to test interactions.
+    memcpy(ctx->payload, init_string, len);
+    ctx->pos = (uint8_t) len;
+
+    return 1;
+}
+
+void digest_spec_plugin_update(void *raw_ctx, unsigned char *ptr, size_t size) {
+    struct CTX *ctx = (struct CTX *)raw_ctx;
+    size_t update_str_len = strlen(update_string);
+
+    if (ctx->pos + update_str_len + size >= PAYLOAD_SIZE) {
+        rb_raise(rb_eRuntimeError, "update size too large; reset the digest and write fewer updates");
+    }
+
+    // Write the supplied value to the payload so it can be easily verified in test.
+    // This is not what a real digest would do, but we're using a dummy digest plugin to test interactions.
+    memcpy(ctx->payload + ctx->pos, update_string, update_str_len);
+    ctx->pos += update_str_len;
+
+    memcpy(ctx->payload + ctx->pos, ptr, size);
+    ctx->pos += size;
+
+    return;
+}
+
+int digest_spec_plugin_finish(void *raw_ctx, unsigned char *ptr) {
+    struct CTX *ctx = (struct CTX *)raw_ctx;
+    size_t finish_string_len = strlen(finish_string);
+
+    // We're always going to write DIGEST_LENGTH bytes. In a real plugin, this would be the digest value. Here we
+    // write out a text string in order to make validation in tests easier.
+    //
+    // In order to delineate the output more clearly from an `Digest#update` call, we always write out the
+    // `finish_string` message. That leaves `DIGEST_LENGTH - finish_string_len` bytes to read out of the context.
+    size_t context_bytes = DIGEST_LENGTH - finish_string_len;
+
+    memcpy(ptr, ctx->payload + (ctx->pos - context_bytes), context_bytes);
+    memcpy(ptr + context_bytes, finish_string, finish_string_len);
+
+    return 1;
+}
+
+static const rb_digest_metadata_t metadata = {
+    // The RUBY_DIGEST_API_VERSION value comes from ruby/digest.h and may vary based on the Ruby being tested. Since
+    // it isn't publicly exposed in the digest gem, we ignore for these tests. Either the test hard-codes an expected
+    // value and is subject to breaking depending on the Ruby being run or we publicly expose `RUBY_DIGEST_API_VERSION`,
+    // in which case the test would pass trivially.
+    RUBY_DIGEST_API_VERSION,
+    DIGEST_LENGTH,
+    BLOCK_LENGTH,
+    sizeof(CTX),
+    (rb_digest_hash_init_func_t) digest_spec_plugin_init,
+    (rb_digest_hash_update_func_t) digest_spec_plugin_update,
+    (rb_digest_hash_finish_func_t) digest_spec_plugin_finish,
+};
+
+// The `get_metadata_ptr` function is not publicly available in the digest gem. However, we need to use
+// to extract the `rb_digest_metadata_t*` value set up by the plugin so we reproduce and adjust the
+// definition here.
+//
+// Taken and adapted from https://github.com/ruby/digest/blob/v3.2.0/ext/digest/digest.c#L558-L568
+static rb_digest_metadata_t * get_metadata_ptr(VALUE obj) {
+    rb_digest_metadata_t *algo;
+
+#ifdef DIGEST_USE_RB_EXT_RESOLVE_SYMBOL
+    // In the digest gem there is an additional data type check performed before reading the value out.
+    // Since the type definition isn't public, we can't use it as part of a type check here so we omit it.
+    // This is safe to do because this code is intended to only load digest plugins written as part of this test suite.
+    algo = (rb_digest_metadata_t *) RTYPEDDATA_DATA(obj);
+#else
+# undef RUBY_UNTYPED_DATA_WARNING
+# define RUBY_UNTYPED_DATA_WARNING 0
+    Data_Get_Struct(obj, rb_digest_metadata_t, algo);
+#endif
+
+    return algo;
+}
+
+VALUE digest_spec_rb_digest_make_metadata(VALUE self) {
+    return rb_digest_make_metadata(&metadata);
+}
+
+VALUE digest_spec_block_length(VALUE self, VALUE meta) {
+    rb_digest_metadata_t* algo = get_metadata_ptr(meta);
+
+    return SIZET2NUM(algo->block_len);
+}
+
+VALUE digest_spec_digest_length(VALUE self, VALUE meta) {
+    rb_digest_metadata_t* algo = get_metadata_ptr(meta);
+
+    return SIZET2NUM(algo->digest_len);
+}
+
+VALUE digest_spec_context_size(VALUE self, VALUE meta) {
+    rb_digest_metadata_t* algo = get_metadata_ptr(meta);
+
+    return SIZET2NUM(algo->ctx_size);
+}
+
+#define PTR2NUM(x) (rb_int2inum((intptr_t)(void *)(x)))
+
+VALUE digest_spec_context(VALUE self, VALUE digest) {
+    return PTR2NUM(context);
+}
+
+void Init_digest_spec(void) {
+    VALUE cls;
+
+    cls = rb_define_class("CApiDigestSpecs", rb_cObject);
+    rb_define_method(cls, "rb_digest_make_metadata", digest_spec_rb_digest_make_metadata, 0);
+    rb_define_method(cls, "block_length", digest_spec_block_length, 1);
+    rb_define_method(cls, "digest_length", digest_spec_digest_length, 1);
+    rb_define_method(cls, "context_size", digest_spec_context_size, 1);
+    rb_define_method(cls, "context", digest_spec_context, 1);
+
+    VALUE mDigest, cDigest_Base, cDigest;
+
+    mDigest = rb_define_module("Digest");
+    mDigest = rb_digest_namespace();
+    cDigest_Base = rb_const_get(mDigest, rb_intern_const("Base"));
+
+    cDigest = rb_define_class_under(mDigest, "TestDigest", cDigest_Base);
+    rb_iv_set(cDigest, "metadata", rb_digest_make_metadata(&metadata));
+}
+
+#ifdef __cplusplus
+}
+#endif
diff --git a/spec/ruby/optional/capi/ext/encoding_spec.c b/spec/ruby/optional/capi/ext/encoding_spec.c
index a454ae8395f4f6..aa8662cfbd6426 100644
--- a/spec/ruby/optional/capi/ext/encoding_spec.c
+++ b/spec/ruby/optional/capi/ext/encoding_spec.c
@@ -271,6 +271,13 @@ static VALUE encoding_spec_rb_enc_str_asciionly_p(VALUE self, VALUE str) {
   }
 }
 
+static VALUE encoding_spec_rb_enc_raise(VALUE self, VALUE encoding, VALUE exception_class, VALUE format) {
+  rb_encoding *e = rb_to_encoding(encoding);
+  const char *f = RSTRING_PTR(format);
+
+  rb_enc_raise(e, exception_class, "%s", f);
+}
+
 static VALUE encoding_spec_rb_uv_to_utf8(VALUE self, VALUE buf, VALUE num) {
   int len = rb_uv_to_utf8(RSTRING_PTR(buf), NUM2INT(num));
   RB_ENC_CODERANGE_CLEAR(buf);
@@ -307,6 +314,16 @@ static VALUE encoding_spec_rb_enc_strlen(VALUE self, VALUE str, VALUE length, VA
   return LONG2FIX(rb_enc_strlen(p, e, rb_to_encoding(encoding)));
 }
 
+static VALUE encoding_spec_rb_enc_left_char_head(VALUE self, VALUE str, VALUE offset) {
+  char *ptr = RSTRING_PTR(str);
+  char *result = rb_enc_left_char_head(ptr, ptr + NUM2INT(offset), RSTRING_END(str), rb_enc_get(str));
+  return LONG2NUM(result - ptr);
+}
+
+static VALUE encoding_spec_rb_define_dummy_encoding(VALUE self, VALUE name) {
+  return INT2NUM(rb_define_dummy_encoding(RSTRING_PTR(name)));
+}
+
 void Init_encoding_spec(void) {
   VALUE cls;
   native_rb_encoding_pointer = (rb_encoding**) malloc(sizeof(rb_encoding*));
@@ -362,8 +379,11 @@ void Init_encoding_spec(void) {
   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);
+  rb_define_method(cls, "rb_enc_raise", encoding_spec_rb_enc_raise, 3);
   rb_define_method(cls, "rb_uv_to_utf8", encoding_spec_rb_uv_to_utf8, 2);
   rb_define_method(cls, "ONIGENC_MBC_CASE_FOLD", encoding_spec_ONIGENC_MBC_CASE_FOLD, 1);
+  rb_define_method(cls, "rb_enc_left_char_head", encoding_spec_rb_enc_left_char_head, 2);
+  rb_define_method(cls, "rb_define_dummy_encoding", encoding_spec_rb_define_dummy_encoding, 1);
 }
 
 #ifdef __cplusplus
diff --git a/spec/ruby/optional/capi/ext/exception_spec.c b/spec/ruby/optional/capi/ext/exception_spec.c
index 0e8347ab0d68ba..c3b94d7bcd1104 100644
--- a/spec/ruby/optional/capi/ext/exception_spec.c
+++ b/spec/ruby/optional/capi/ext/exception_spec.c
@@ -36,6 +36,13 @@ VALUE exception_spec_rb_set_errinfo(VALUE self, VALUE exc) {
   return Qnil;
 }
 
+NORETURN(VALUE exception_spec_rb_error_frozen_object(VALUE self, VALUE object));
+
+VALUE exception_spec_rb_error_frozen_object(VALUE self, VALUE object) {
+  rb_error_frozen_object(object);
+  UNREACHABLE_RETURN(Qnil);
+}
+
 VALUE exception_spec_rb_syserr_new(VALUE self, VALUE num, VALUE msg) {
   int n = NUM2INT(num);
   char *cstr = NULL;
@@ -66,6 +73,7 @@ void Init_exception_spec(void) {
   rb_define_method(cls, "rb_exc_new3", exception_spec_rb_exc_new3, 1);
   rb_define_method(cls, "rb_exc_raise", exception_spec_rb_exc_raise, 1);
   rb_define_method(cls, "rb_set_errinfo", exception_spec_rb_set_errinfo, 1);
+  rb_define_method(cls, "rb_error_frozen_object", exception_spec_rb_error_frozen_object, 1);
   rb_define_method(cls, "rb_syserr_new", exception_spec_rb_syserr_new, 2);
   rb_define_method(cls, "rb_syserr_new_str", exception_spec_rb_syserr_new_str, 2);
   rb_define_method(cls, "rb_make_exception", exception_spec_rb_make_exception, 1);
diff --git a/spec/ruby/optional/capi/ext/fiber_spec.c b/spec/ruby/optional/capi/ext/fiber_spec.c
index f06a54494ea044..db54f7ad8c6c92 100644
--- a/spec/ruby/optional/capi/ext/fiber_spec.c
+++ b/spec/ruby/optional/capi/ext/fiber_spec.c
@@ -44,12 +44,10 @@ VALUE fiber_spec_rb_fiber_new(VALUE self) {
   return rb_fiber_new(fiber_spec_rb_fiber_new_function, Qnil);
 }
 
-#ifdef RUBY_VERSION_IS_3_1
 VALUE fiber_spec_rb_fiber_raise(int argc, VALUE *argv, VALUE self) {
   VALUE fiber = argv[0];
   return rb_fiber_raise(fiber, argc-1, argv+1);
 }
-#endif
 
 void Init_fiber_spec(void) {
   VALUE cls = rb_define_class("CApiFiberSpecs", rb_cObject);
@@ -58,10 +56,7 @@ void Init_fiber_spec(void) {
   rb_define_method(cls, "rb_fiber_resume", fiber_spec_rb_fiber_resume, 2);
   rb_define_method(cls, "rb_fiber_yield", fiber_spec_rb_fiber_yield, 1);
   rb_define_method(cls, "rb_fiber_new", fiber_spec_rb_fiber_new, 0);
-
-#ifdef RUBY_VERSION_IS_3_1
   rb_define_method(cls, "rb_fiber_raise", fiber_spec_rb_fiber_raise, -1);
-#endif
 }
 
 #ifdef __cplusplus
diff --git a/spec/ruby/optional/capi/ext/finalizer_spec.c b/spec/ruby/optional/capi/ext/finalizer_spec.c
new file mode 100644
index 00000000000000..83347da9124930
--- /dev/null
+++ b/spec/ruby/optional/capi/ext/finalizer_spec.c
@@ -0,0 +1,25 @@
+#include "ruby.h"
+#include "rubyspec.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+static VALUE define_finalizer(VALUE self, VALUE obj, VALUE finalizer) {
+  return rb_define_finalizer(obj, finalizer);
+}
+
+static VALUE undefine_finalizer(VALUE self, VALUE obj) {
+  return rb_undefine_finalizer(obj);
+}
+
+void Init_finalizer_spec(void) {
+  VALUE cls = rb_define_class("CApiFinalizerSpecs", rb_cObject);
+
+  rb_define_method(cls, "rb_define_finalizer", define_finalizer, 2);
+  rb_define_method(cls, "rb_undefine_finalizer", undefine_finalizer, 1);
+}
+
+#ifdef __cplusplus
+}
+#endif
diff --git a/spec/ruby/optional/capi/ext/gc_spec.c b/spec/ruby/optional/capi/ext/gc_spec.c
index 7dd0b876550ec4..2637ad27ac570a 100644
--- a/spec/ruby/optional/capi/ext/gc_spec.c
+++ b/spec/ruby/optional/capi/ext/gc_spec.c
@@ -8,9 +8,16 @@ extern "C" {
 VALUE registered_tagged_value;
 VALUE registered_reference_value;
 VALUE registered_before_rb_gc_register_address;
-VALUE registered_before_rb_global_variable;
+VALUE registered_before_rb_global_variable_string;
+VALUE registered_before_rb_global_variable_bignum;
+VALUE registered_before_rb_global_variable_float;
+VALUE registered_after_rb_global_variable_string;
+VALUE registered_after_rb_global_variable_bignum;
+VALUE registered_after_rb_global_variable_float;
 VALUE rb_gc_register_address_outside_init;
 
+VALUE rb_gc_register_mark_object_not_referenced_float;
+
 static VALUE registered_tagged_address(VALUE self) {
   return registered_tagged_value;
 }
@@ -23,8 +30,28 @@ static VALUE get_registered_before_rb_gc_register_address(VALUE self) {
   return registered_before_rb_gc_register_address;
 }
 
-static VALUE get_registered_before_rb_global_variable(VALUE self) {
-  return registered_before_rb_global_variable;
+static VALUE get_registered_before_rb_global_variable_string(VALUE self) {
+  return registered_before_rb_global_variable_string;
+}
+
+static VALUE get_registered_before_rb_global_variable_bignum(VALUE self) {
+  return registered_before_rb_global_variable_bignum;
+}
+
+static VALUE get_registered_before_rb_global_variable_float(VALUE self) {
+  return registered_before_rb_global_variable_float;
+}
+
+static VALUE get_registered_after_rb_global_variable_string(VALUE self) {
+  return registered_after_rb_global_variable_string;
+}
+
+static VALUE get_registered_after_rb_global_variable_bignum(VALUE self) {
+  return registered_after_rb_global_variable_bignum;
+}
+
+static VALUE get_registered_after_rb_global_variable_float(VALUE self) {
+  return registered_after_rb_global_variable_float;
 }
 
 static VALUE gc_spec_rb_gc_register_address(VALUE self) {
@@ -65,23 +92,47 @@ static VALUE gc_spec_rb_gc_register_mark_object(VALUE self, VALUE obj) {
   return Qnil;
 }
 
+static VALUE gc_spec_rb_gc_register_mark_object_not_referenced_float(VALUE self) {
+  return rb_gc_register_mark_object_not_referenced_float;
+}
+
 void Init_gc_spec(void) {
   VALUE cls = rb_define_class("CApiGCSpecs", rb_cObject);
 
   rb_gc_register_address(&registered_tagged_value);
   rb_gc_register_address(&registered_reference_value);
   rb_gc_register_address(&registered_before_rb_gc_register_address);
-  rb_global_variable(&registered_before_rb_global_variable);
+  rb_global_variable(&registered_before_rb_global_variable_string);
+  rb_global_variable(&registered_before_rb_global_variable_bignum);
+  rb_global_variable(&registered_before_rb_global_variable_float);
 
   registered_tagged_value    = INT2NUM(10);
   registered_reference_value = rb_str_new2("Globally registered data");
   registered_before_rb_gc_register_address = rb_str_new_cstr("registered before rb_gc_register_address()");
-  registered_before_rb_global_variable = rb_str_new_cstr("registered before rb_global_variable()");
+
+  registered_before_rb_global_variable_string = rb_str_new_cstr("registered before rb_global_variable()");
+  registered_before_rb_global_variable_bignum = LL2NUM(INT64_MAX);
+  registered_before_rb_global_variable_float = DBL2NUM(3.14);
+
+  registered_after_rb_global_variable_string = rb_str_new_cstr("registered after rb_global_variable()");
+  rb_global_variable(&registered_after_rb_global_variable_string);
+  registered_after_rb_global_variable_bignum = LL2NUM(INT64_MAX);
+  rb_global_variable(&registered_after_rb_global_variable_bignum);
+  registered_after_rb_global_variable_float = DBL2NUM(6.28);
+  rb_global_variable(&registered_after_rb_global_variable_float);
+
+  rb_gc_register_mark_object_not_referenced_float = DBL2NUM(1.61);
+  rb_gc_register_mark_object(rb_gc_register_mark_object_not_referenced_float);
 
   rb_define_method(cls, "registered_tagged_address", registered_tagged_address, 0);
   rb_define_method(cls, "registered_reference_address", registered_reference_address, 0);
   rb_define_method(cls, "registered_before_rb_gc_register_address", get_registered_before_rb_gc_register_address, 0);
-  rb_define_method(cls, "registered_before_rb_global_variable", get_registered_before_rb_global_variable, 0);
+  rb_define_method(cls, "registered_before_rb_global_variable_string", get_registered_before_rb_global_variable_string, 0);
+  rb_define_method(cls, "registered_before_rb_global_variable_bignum", get_registered_before_rb_global_variable_bignum, 0);
+  rb_define_method(cls, "registered_before_rb_global_variable_float", get_registered_before_rb_global_variable_float, 0);
+  rb_define_method(cls, "registered_after_rb_global_variable_string", get_registered_after_rb_global_variable_string, 0);
+  rb_define_method(cls, "registered_after_rb_global_variable_bignum", get_registered_after_rb_global_variable_bignum, 0);
+  rb_define_method(cls, "registered_after_rb_global_variable_float", get_registered_after_rb_global_variable_float, 0);
   rb_define_method(cls, "rb_gc_register_address", gc_spec_rb_gc_register_address, 0);
   rb_define_method(cls, "rb_gc_unregister_address", gc_spec_rb_gc_unregister_address, 0);
   rb_define_method(cls, "rb_gc_enable", gc_spec_rb_gc_enable, 0);
@@ -89,6 +140,7 @@ void Init_gc_spec(void) {
   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);
+  rb_define_method(cls, "rb_gc_register_mark_object_not_referenced_float", gc_spec_rb_gc_register_mark_object_not_referenced_float, 0);
   rb_define_method(cls, "rb_gc_latest_gc_info", gc_spec_rb_gc_latest_gc_info, 1);
 }
 
diff --git a/spec/ruby/optional/capi/ext/hash_spec.c b/spec/ruby/optional/capi/ext/hash_spec.c
index 69ef02d5da6e24..653917f2c4f6f7 100644
--- a/spec/ruby/optional/capi/ext/hash_spec.c
+++ b/spec/ruby/optional/capi/ext/hash_spec.c
@@ -105,11 +105,9 @@ VALUE hash_spec_rb_hash_new(VALUE self) {
   return rb_hash_new();
 }
 
-#ifdef RUBY_VERSION_IS_3_2
 VALUE hash_spec_rb_hash_new_capa(VALUE self, VALUE capacity) {
   return rb_hash_new_capa(NUM2LONG(capacity));
 }
-#endif
 
 VALUE rb_ident_hash_new(void); /* internal.h, used in ripper */
 
@@ -134,6 +132,20 @@ VALUE hash_spec_compute_a_hash_code(VALUE self, VALUE seed) {
   return ULONG2NUM(h);
 }
 
+VALUE hash_spec_rb_hash_bulk_insert(VALUE self, VALUE array_len, VALUE array, VALUE hash) {
+  VALUE* ptr;
+
+  if (array == Qnil) {
+    ptr = NULL;
+  } else {
+    ptr = RARRAY_PTR(array);
+  }
+
+  long len = FIX2LONG(array_len);
+  rb_hash_bulk_insert(len, ptr, hash);
+  return Qnil;
+}
+
 void Init_hash_spec(void) {
   VALUE cls = rb_define_class("CApiHashSpecs", rb_cObject);
   rb_define_method(cls, "rb_hash", hash_spec_rb_hash, 1);
@@ -155,13 +167,12 @@ void Init_hash_spec(void) {
   rb_define_method(cls, "rb_hash_lookup2", hash_spec_rb_hash_lookup2, 3);
   rb_define_method(cls, "rb_hash_lookup2_default_undef", hash_spec_rb_hash_lookup2_default_undef, 2);
   rb_define_method(cls, "rb_hash_new", hash_spec_rb_hash_new, 0);
-#ifdef RUBY_VERSION_IS_3_2
   rb_define_method(cls, "rb_hash_new_capa", hash_spec_rb_hash_new_capa, 1);
-#endif
   rb_define_method(cls, "rb_ident_hash_new", hash_spec_rb_ident_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);
+  rb_define_method(cls, "rb_hash_bulk_insert", hash_spec_rb_hash_bulk_insert, 3);
 }
 
 #ifdef __cplusplus
diff --git a/spec/ruby/optional/capi/ext/io_spec.c b/spec/ruby/optional/capi/ext/io_spec.c
index ab3aef4c923eb9..f3ede15729bde2 100644
--- a/spec/ruby/optional/capi/ext/io_spec.c
+++ b/spec/ruby/optional/capi/ext/io_spec.c
@@ -28,13 +28,7 @@ static int set_non_blocking(int fd) {
 }
 
 static int io_spec_get_fd(VALUE io) {
-#ifdef RUBY_VERSION_IS_3_1
   return rb_io_descriptor(io);
-#else
-  rb_io_t* fp;
-  GetOpenFile(io, fp);
-  return fp->fd;
-#endif
 }
 
 VALUE io_spec_GetOpenFile_fd(VALUE self, VALUE io) {
@@ -143,7 +137,7 @@ VALUE io_spec_rb_io_wait_readable(VALUE self, VALUE io, VALUE read_p) {
     errno = saved_errno;
   }
 
-  ret = rb_io_wait_readable(fd);
+  ret = rb_io_maybe_wait_readable(errno, io, Qnil);
 
   if (RTEST(read_p)) {
     ssize_t r = read(fd, buf, RB_IO_WAIT_READABLE_BUF);
@@ -157,23 +151,24 @@ VALUE io_spec_rb_io_wait_readable(VALUE self, VALUE io, VALUE read_p) {
 
   return ret ? Qtrue : Qfalse;
 #else
-  UNREACHABLE;
+  UNREACHABLE_RETURN(Qnil);
 #endif
 }
 
 VALUE io_spec_rb_io_wait_writable(VALUE self, VALUE io) {
-  int ret = rb_io_wait_writable(io_spec_get_fd(io));
+  int ret = rb_io_maybe_wait_writable(errno, io, Qnil);
   return ret ? Qtrue : Qfalse;
 }
 
-#ifdef RUBY_VERSION_IS_3_1
 VALUE io_spec_rb_io_maybe_wait_writable(VALUE self, VALUE error, VALUE io, VALUE timeout) {
   int ret = rb_io_maybe_wait_writable(NUM2INT(error), io, timeout);
   return INT2NUM(ret);
 }
+
+#ifdef SET_NON_BLOCKING_FAILS_ALWAYS
+NORETURN(VALUE io_spec_rb_io_maybe_wait_readable(VALUE self, VALUE error, VALUE io, VALUE timeout, VALUE read_p));
 #endif
 
-#ifdef RUBY_VERSION_IS_3_1
 VALUE io_spec_rb_io_maybe_wait_readable(VALUE self, VALUE error, VALUE io, VALUE timeout, VALUE read_p) {
   int fd = io_spec_get_fd(io);
 #ifndef SET_NON_BLOCKING_FAILS_ALWAYS
@@ -209,16 +204,13 @@ VALUE io_spec_rb_io_maybe_wait_readable(VALUE self, VALUE error, VALUE io, VALUE
 
   return INT2NUM(ret);
 #else
-  UNREACHABLE;
+  UNREACHABLE_RETURN(Qnil);
 #endif
 }
-#endif
 
-#ifdef RUBY_VERSION_IS_3_1
 VALUE io_spec_rb_io_maybe_wait(VALUE self, VALUE error, VALUE io, VALUE events, VALUE timeout) {
   return rb_io_maybe_wait(NUM2INT(error), io, events, timeout);
 }
-#endif
 
 VALUE io_spec_rb_thread_wait_fd(VALUE self, VALUE io) {
   rb_thread_wait_fd(io_spec_get_fd(io));
@@ -226,13 +218,13 @@ VALUE io_spec_rb_thread_wait_fd(VALUE self, VALUE io) {
 }
 
 VALUE io_spec_rb_wait_for_single_fd(VALUE self, VALUE io, VALUE events, VALUE secs, VALUE usecs) {
-  int fd = io_spec_get_fd(io);
-  struct timeval tv;
+  VALUE timeout = Qnil;
   if (!NIL_P(secs)) {
-    tv.tv_sec = FIX2INT(secs);
-    tv.tv_usec = FIX2INT(usecs);
+      timeout = rb_float_new((double)FIX2INT(secs) + (0.000001 * FIX2INT(usecs)));
   }
-  return INT2FIX(rb_wait_for_single_fd(fd, FIX2INT(events), NIL_P(secs) ? NULL : &tv));
+  VALUE result = rb_io_wait(io, events, timeout);
+  if (result == Qfalse) return INT2FIX(0);
+  else return result;
 }
 
 VALUE io_spec_rb_thread_fd_writable(VALUE self, VALUE io) {
@@ -326,19 +318,50 @@ static VALUE io_spec_errno_set(VALUE self, VALUE val) {
 }
 
 VALUE io_spec_mode_sync_flag(VALUE self, VALUE io) {
+  int mode;
 #ifdef RUBY_VERSION_IS_3_3
-  if (rb_io_mode(io) & FMODE_SYNC) {
+  mode = rb_io_mode(io);
 #else
   rb_io_t *fp;
   GetOpenFile(io, fp);
-  if (fp->mode & FMODE_SYNC) {
+  mode = fp->mode;
 #endif
+  if (mode & FMODE_SYNC) {
     return Qtrue;
   } else {
     return Qfalse;
   }
 }
 
+#if defined(RUBY_VERSION_IS_3_3) || defined(TRUFFLERUBY)
+static VALUE io_spec_rb_io_mode(VALUE self, VALUE io) {
+  return INT2FIX(rb_io_mode(io));
+}
+
+static VALUE io_spec_rb_io_path(VALUE self, VALUE io) {
+  return rb_io_path(io);
+}
+
+static VALUE io_spec_rb_io_closed_p(VALUE self, VALUE io) {
+  return rb_io_closed_p(io);
+}
+
+static VALUE io_spec_rb_io_open_descriptor(VALUE self, VALUE klass, VALUE descriptor, VALUE mode, VALUE path, VALUE timeout, VALUE internal_encoding, VALUE external_encoding, VALUE ecflags, VALUE ecopts) {
+  struct rb_io_encoding io_encoding;
+
+  io_encoding.enc = rb_to_encoding(internal_encoding);
+  io_encoding.enc2 = rb_to_encoding(external_encoding);
+  io_encoding.ecflags = FIX2INT(ecflags);
+  io_encoding.ecopts = ecopts;
+
+  return rb_io_open_descriptor(klass, FIX2INT(descriptor), FIX2INT(mode), path, timeout, &io_encoding);
+}
+
+static VALUE io_spec_rb_io_open_descriptor_without_encoding(VALUE self, VALUE klass, VALUE descriptor, VALUE mode, VALUE path, VALUE timeout) {
+  return rb_io_open_descriptor(klass, FIX2INT(descriptor), FIX2INT(mode), path, timeout, NULL);
+}
+#endif
+
 void Init_io_spec(void) {
   VALUE cls = rb_define_class("CApiIOSpecs", rb_cObject);
   rb_define_method(cls, "GetOpenFile_fd", io_spec_GetOpenFile_fd, 1);
@@ -356,11 +379,9 @@ void Init_io_spec(void) {
   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);
-#ifdef RUBY_VERSION_IS_3_1
   rb_define_method(cls, "rb_io_maybe_wait_writable", io_spec_rb_io_maybe_wait_writable, 3);
   rb_define_method(cls, "rb_io_maybe_wait_readable", io_spec_rb_io_maybe_wait_readable, 4);
   rb_define_method(cls, "rb_io_maybe_wait", io_spec_rb_io_maybe_wait, 4);
-#endif
   rb_define_method(cls, "rb_thread_wait_fd", io_spec_rb_thread_wait_fd, 1);
   rb_define_method(cls, "rb_thread_fd_writable", io_spec_rb_thread_fd_writable, 1);
   rb_define_method(cls, "rb_thread_fd_select_read", io_spec_rb_thread_fd_select_read, 1);
@@ -372,6 +393,18 @@ void Init_io_spec(void) {
   rb_define_method(cls, "rb_cloexec_open", io_spec_rb_cloexec_open, 3);
   rb_define_method(cls, "errno=", io_spec_errno_set, 1);
   rb_define_method(cls, "rb_io_mode_sync_flag", io_spec_mode_sync_flag, 1);
+#if defined(RUBY_VERSION_IS_3_3) || defined(TRUFFLERUBY)
+  rb_define_method(cls, "rb_io_mode", io_spec_rb_io_mode, 1);
+  rb_define_method(cls, "rb_io_path", io_spec_rb_io_path, 1);
+  rb_define_method(cls, "rb_io_closed_p", io_spec_rb_io_closed_p, 1);
+  rb_define_method(cls, "rb_io_open_descriptor", io_spec_rb_io_open_descriptor, 9);
+  rb_define_method(cls, "rb_io_open_descriptor_without_encoding", io_spec_rb_io_open_descriptor_without_encoding, 5);
+  rb_define_const(cls, "FMODE_READABLE", INT2FIX(FMODE_READABLE));
+  rb_define_const(cls, "FMODE_WRITABLE", INT2FIX(FMODE_WRITABLE));
+  rb_define_const(cls, "FMODE_BINMODE", INT2FIX(FMODE_BINMODE));
+  rb_define_const(cls, "FMODE_TEXTMODE", INT2FIX(FMODE_TEXTMODE));
+  rb_define_const(cls, "ECONV_UNIVERSAL_NEWLINE_DECORATOR", INT2FIX(ECONV_UNIVERSAL_NEWLINE_DECORATOR));
+#endif
 }
 
 #ifdef __cplusplus
diff --git a/spec/ruby/optional/capi/ext/kernel_spec.c b/spec/ruby/optional/capi/ext/kernel_spec.c
index a921eb13e048e3..ff71a7e5892219 100644
--- a/spec/ruby/optional/capi/ext/kernel_spec.c
+++ b/spec/ruby/optional/capi/ext/kernel_spec.c
@@ -7,16 +7,12 @@
 extern "C" {
 #endif
 
-VALUE kernel_spec_call_proc(VALUE arg_array) {
+static VALUE kernel_spec_call_proc(VALUE arg_array) {
   VALUE arg = rb_ary_pop(arg_array);
   VALUE proc = rb_ary_pop(arg_array);
   return rb_funcall(proc, rb_intern("call"), 1, arg);
 }
 
-VALUE kernel_spec_call_proc_raise(VALUE arg_array, VALUE raised_exc) {
-  return kernel_spec_call_proc(arg_array);
-}
-
 static VALUE kernel_spec_rb_block_given_p(VALUE self) {
   return rb_block_given_p() ? Qtrue : Qfalse;
 }
@@ -71,11 +67,20 @@ VALUE kernel_spec_rb_block_call_no_func(VALUE self, VALUE ary) {
   return rb_block_call(ary, rb_intern("map"), 0, NULL, (rb_block_call_func_t)NULL, Qnil);
 }
 
-
 VALUE kernel_spec_rb_frame_this_func(VALUE self) {
   return ID2SYM(rb_frame_this_func());
 }
 
+VALUE kernel_spec_rb_category_warn_deprecated(VALUE self) {
+  rb_category_warn(RB_WARN_CATEGORY_DEPRECATED, "foo");
+  return Qnil;
+}
+
+VALUE kernel_spec_rb_category_warn_deprecated_with_integer_extra_value(VALUE self, VALUE value) {
+  rb_category_warn(RB_WARN_CATEGORY_DEPRECATED, "foo %d", FIX2INT(value));
+  return Qnil;
+}
+
 VALUE kernel_spec_rb_ensure(VALUE self, VALUE main_proc, VALUE arg,
                             VALUE ensure_proc, VALUE arg2) {
   VALUE main_array, ensure_array;
@@ -134,7 +139,16 @@ VALUE kernel_spec_rb_throw_obj(VALUE self, VALUE obj, VALUE result) {
   return ID2SYM(rb_intern("rb_throw_failed"));
 }
 
-VALUE kernel_spec_call_proc_with_raised_exc(VALUE arg_array, VALUE raised_exc) {
+VALUE kernel_spec_rb_errinfo(VALUE self) {
+  return rb_errinfo();
+}
+
+VALUE kernel_spec_rb_set_errinfo(VALUE self, VALUE exc) {
+  rb_set_errinfo(exc);
+  return Qnil;
+}
+
+static VALUE kernel_spec_call_proc_with_raised_exc(VALUE arg_array, VALUE raised_exc) {
   VALUE argv[2];
   int argc;
 
@@ -181,7 +195,7 @@ VALUE kernel_spec_rb_rescue2(int argc, VALUE *args, VALUE self) {
   rb_ary_push(raise_array, args[3]);
 
   return rb_rescue2(kernel_spec_call_proc, main_array,
-      kernel_spec_call_proc_raise, raise_array, args[4], args[5], (VALUE)0);
+      kernel_spec_call_proc_with_raised_exc, raise_array, args[4], args[5], (VALUE)0);
 }
 
 static VALUE kernel_spec_rb_protect_yield(VALUE self, VALUE obj, VALUE ary) {
@@ -195,7 +209,7 @@ static VALUE kernel_spec_rb_protect_yield(VALUE self, VALUE obj, VALUE ary) {
   return res;
 }
 
-static VALUE kernel_spec_rb_protect_errinfo(VALUE self, VALUE obj, VALUE ary) {
+static VALUE kernel_spec_rb_protect_ignore_status(VALUE self, VALUE obj, VALUE ary) {
   int status = 0;
   VALUE res = rb_protect(rb_yield, obj, &status);
   rb_ary_store(ary, 0, INT2NUM(23));
@@ -221,7 +235,7 @@ static VALUE kernel_spec_rb_eval_string_protect(VALUE self, VALUE str, VALUE ary
 VALUE kernel_spec_rb_sys_fail(VALUE self, VALUE msg) {
   errno = 1;
   if (msg == Qnil) {
-    rb_sys_fail(0);
+    rb_sys_fail(NULL);
   } else if (self != Qundef) {
     rb_sys_fail(StringValuePtr(msg));
   }
@@ -237,6 +251,13 @@ VALUE kernel_spec_rb_syserr_fail(VALUE self, VALUE err, VALUE msg) {
   return Qnil;
 }
 
+VALUE kernel_spec_rb_syserr_fail_str(VALUE self, VALUE err, VALUE msg) {
+  if (self != Qundef) {
+    rb_syserr_fail_str(NUM2INT(err), msg);
+  }
+  return Qnil;
+}
+
 VALUE kernel_spec_rb_warn(VALUE self, VALUE msg) {
   rb_warn("%s", StringValuePtr(msg));
   return Qnil;
@@ -318,6 +339,10 @@ static VALUE kernel_spec_rb_f_sprintf(VALUE self, VALUE ary) {
   return rb_f_sprintf((int)RARRAY_LEN(ary), RARRAY_PTR(ary));
 }
 
+static VALUE kernel_spec_rb_str_format(VALUE self, VALUE count, VALUE ary, VALUE format) {
+  return rb_str_format(FIX2INT(count), RARRAY_PTR(ary), format);
+}
+
 static VALUE kernel_spec_rb_make_backtrace(VALUE self) {
   return rb_make_backtrace();
 }
@@ -326,7 +351,6 @@ static VALUE kernel_spec_rb_funcallv(VALUE self, VALUE obj, VALUE method, VALUE
   return rb_funcallv(obj, SYM2ID(method), RARRAY_LENINT(args), RARRAY_PTR(args));
 }
 
-#ifdef RUBY_VERSION_IS_3_0
 static VALUE kernel_spec_rb_funcallv_kw(VALUE self, VALUE obj, VALUE method, VALUE args) {
   return rb_funcallv_kw(obj, SYM2ID(method), RARRAY_LENINT(args), RARRAY_PTR(args), RB_PASS_KEYWORDS);
 }
@@ -334,7 +358,6 @@ static VALUE kernel_spec_rb_funcallv_kw(VALUE self, VALUE obj, VALUE method, VAL
 static VALUE kernel_spec_rb_keyword_given_p(int argc, VALUE *args, VALUE self) {
   return rb_keyword_given_p() ? Qtrue : Qfalse;
 }
-#endif
 
 static VALUE kernel_spec_rb_funcallv_public(VALUE self, VALUE obj, VALUE method) {
   return rb_funcallv_public(obj, SYM2ID(method), 0, NULL);
@@ -355,6 +378,15 @@ static VALUE kernel_spec_rb_funcall_many_args(VALUE self, VALUE obj, VALUE metho
                     INT2FIX(5), INT2FIX(4), INT2FIX(3), INT2FIX(2), INT2FIX(1));
 }
 
+static VALUE kernel_spec_rb_check_funcall(VALUE self, VALUE receiver, VALUE method, VALUE args) {
+  VALUE ret = rb_check_funcall(receiver, SYM2ID(method), RARRAY_LENINT(args), RARRAY_PTR(args));
+  if (ret == Qundef) {
+    return ID2SYM(rb_intern("Qundef"));
+  } else {
+    return ret;
+  }
+}
+
 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);
@@ -367,22 +399,28 @@ void Init_kernel_spec(void) {
   rb_define_method(cls, "rb_block_lambda", kernel_spec_rb_block_lambda, 0);
   rb_define_method(cls, "rb_frame_this_func_test", kernel_spec_rb_frame_this_func, 0);
   rb_define_method(cls, "rb_frame_this_func_test_again", kernel_spec_rb_frame_this_func, 0);
+  rb_define_method(cls, "rb_category_warn_deprecated", kernel_spec_rb_category_warn_deprecated, 0);
+  rb_define_method(cls, "rb_category_warn_deprecated_with_integer_extra_value", kernel_spec_rb_category_warn_deprecated_with_integer_extra_value, 1);
   rb_define_method(cls, "rb_ensure", kernel_spec_rb_ensure, 4);
   rb_define_method(cls, "rb_eval_string", kernel_spec_rb_eval_string, 1);
   rb_define_method(cls, "rb_eval_cmd_kw", kernel_spec_rb_eval_cmd_kw, 3);
   rb_define_method(cls, "rb_raise", kernel_spec_rb_raise, 1);
   rb_define_method(cls, "rb_throw", kernel_spec_rb_throw, 1);
   rb_define_method(cls, "rb_throw_obj", kernel_spec_rb_throw_obj, 2);
+  rb_define_method(cls, "rb_errinfo", kernel_spec_rb_errinfo, 0);
+  rb_define_method(cls, "rb_set_errinfo", kernel_spec_rb_set_errinfo, 1);
+  rb_define_method(cls, "rb_rescue", kernel_spec_rb_rescue, 4);
   rb_define_method(cls, "rb_rescue", kernel_spec_rb_rescue, 4);
   rb_define_method(cls, "rb_rescue2", kernel_spec_rb_rescue2, -1);
   rb_define_method(cls, "rb_protect_yield", kernel_spec_rb_protect_yield, 2);
-  rb_define_method(cls, "rb_protect_errinfo", kernel_spec_rb_protect_errinfo, 2);
+  rb_define_method(cls, "rb_protect_ignore_status", kernel_spec_rb_protect_ignore_status, 2);
   rb_define_method(cls, "rb_protect_null_status", kernel_spec_rb_protect_null_status, 1);
   rb_define_method(cls, "rb_eval_string_protect", kernel_spec_rb_eval_string_protect, 2);
   rb_define_method(cls, "rb_catch", kernel_spec_rb_catch, 2);
   rb_define_method(cls, "rb_catch_obj", kernel_spec_rb_catch_obj, 2);
   rb_define_method(cls, "rb_sys_fail", kernel_spec_rb_sys_fail, 1);
   rb_define_method(cls, "rb_syserr_fail", kernel_spec_rb_syserr_fail, 2);
+  rb_define_method(cls, "rb_syserr_fail_str", kernel_spec_rb_syserr_fail_str, 2);
   rb_define_method(cls, "rb_warn", kernel_spec_rb_warn, 1);
   rb_define_method(cls, "rb_yield", kernel_spec_rb_yield, 1);
   rb_define_method(cls, "rb_yield_indirected", kernel_spec_rb_yield_indirected, 1);
@@ -393,16 +431,16 @@ void Init_kernel_spec(void) {
   rb_define_method(cls, "rb_exec_recursive", kernel_spec_rb_exec_recursive, 1);
   rb_define_method(cls, "rb_set_end_proc", kernel_spec_rb_set_end_proc, 1);
   rb_define_method(cls, "rb_f_sprintf", kernel_spec_rb_f_sprintf, 1);
+  rb_define_method(cls, "rb_str_format", kernel_spec_rb_str_format, 3);
   rb_define_method(cls, "rb_make_backtrace", kernel_spec_rb_make_backtrace, 0);
   rb_define_method(cls, "rb_funcallv", kernel_spec_rb_funcallv, 3);
-#ifdef RUBY_VERSION_IS_3_0
   rb_define_method(cls, "rb_funcallv_kw", kernel_spec_rb_funcallv_kw, 3);
   rb_define_method(cls, "rb_keyword_given_p", kernel_spec_rb_keyword_given_p, -1);
-#endif
   rb_define_method(cls, "rb_funcallv_public", kernel_spec_rb_funcallv_public, 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, 4);
   rb_define_method(cls, "rb_funcall_with_block_kw", kernel_spec_rb_funcall_with_block_kw, 4);
+  rb_define_method(cls, "rb_check_funcall", kernel_spec_rb_check_funcall, 3);
 }
 
 #ifdef __cplusplus
diff --git a/spec/ruby/optional/capi/ext/mutex_spec.c b/spec/ruby/optional/capi/ext/mutex_spec.c
index c2fdf917ac0dab..d2c8f98e8935d2 100644
--- a/spec/ruby/optional/capi/ext/mutex_spec.c
+++ b/spec/ruby/optional/capi/ext/mutex_spec.c
@@ -29,15 +29,34 @@ VALUE mutex_spec_rb_mutex_sleep(VALUE self, VALUE mutex, VALUE timeout) {
   return rb_mutex_sleep(mutex, timeout);
 }
 
-
 VALUE mutex_spec_rb_mutex_callback(VALUE arg) {
   return rb_funcall(arg, rb_intern("call"), 0);
 }
 
+VALUE mutex_spec_rb_mutex_naughty_callback(VALUE arg) {
+  int *result = (int *) arg;
+  return (VALUE) result;
+}
+
+VALUE mutex_spec_rb_mutex_callback_basic(VALUE arg) {
+  return arg;
+}
+
 VALUE mutex_spec_rb_mutex_synchronize(VALUE self, VALUE mutex, VALUE value) {
   return rb_mutex_synchronize(mutex, mutex_spec_rb_mutex_callback, value);
 }
 
+VALUE mutex_spec_rb_mutex_synchronize_with_naughty_callback(VALUE self, VALUE mutex) {
+  // a naughty callback accepts or returns not a Ruby object but arbitrary value
+  int arg = 42;
+  VALUE result = rb_mutex_synchronize(mutex, mutex_spec_rb_mutex_naughty_callback, (VALUE) &arg);
+  return INT2NUM(*((int *) result));
+}
+
+VALUE mutex_spec_rb_mutex_synchronize_with_native_callback(VALUE self, VALUE mutex, VALUE value) {
+  return rb_mutex_synchronize(mutex, mutex_spec_rb_mutex_callback_basic, value);
+}
+
 void Init_mutex_spec(void) {
   VALUE cls = rb_define_class("CApiMutexSpecs", rb_cObject);
   rb_define_method(cls, "rb_mutex_new", mutex_spec_rb_mutex_new, 0);
@@ -47,6 +66,8 @@ void Init_mutex_spec(void) {
   rb_define_method(cls, "rb_mutex_unlock", mutex_spec_rb_mutex_unlock, 1);
   rb_define_method(cls, "rb_mutex_sleep", mutex_spec_rb_mutex_sleep, 2);
   rb_define_method(cls, "rb_mutex_synchronize", mutex_spec_rb_mutex_synchronize, 2);
+  rb_define_method(cls, "rb_mutex_synchronize_with_naughty_callback", mutex_spec_rb_mutex_synchronize_with_naughty_callback, 1);
+  rb_define_method(cls, "rb_mutex_synchronize_with_native_callback", mutex_spec_rb_mutex_synchronize_with_native_callback, 2);
 }
 
 #ifdef __cplusplus
diff --git a/spec/ruby/optional/capi/ext/object_spec.c b/spec/ruby/optional/capi/ext/object_spec.c
index fbcf6d99626b48..995bc38fcf8d21 100644
--- a/spec/ruby/optional/capi/ext/object_spec.c
+++ b/spec/ruby/optional/capi/ext/object_spec.c
@@ -15,11 +15,6 @@ static VALUE object_spec_FL_ABLE(VALUE self, VALUE obj) {
 
 static int object_spec_FL_TEST_flag(VALUE flag_string) {
   char *flag_cstr = StringValueCStr(flag_string);
-#ifndef RUBY_VERSION_IS_3_1
-  if (strcmp(flag_cstr, "FL_TAINT") == 0) {
-    return FL_TAINT;
-  }
-#endif
   if (strcmp(flag_cstr, "FL_FREEZE") == 0) {
     return FL_FREEZE;
   }
@@ -30,22 +25,6 @@ static VALUE object_spec_FL_TEST(VALUE self, VALUE obj, VALUE flag) {
   return INT2FIX(FL_TEST(obj, object_spec_FL_TEST_flag(flag)));
 }
 
-#ifndef RUBY_VERSION_IS_3_1
-static VALUE object_spec_OBJ_TAINT(VALUE self, VALUE obj) {
-  OBJ_TAINT(obj);
-  return Qnil;
-}
-
-static VALUE object_spec_OBJ_TAINTED(VALUE self, VALUE obj) {
-  return OBJ_TAINTED(obj) ? Qtrue : Qfalse;
-}
-
-static VALUE object_spec_OBJ_INFECT(VALUE self, VALUE host, VALUE source) {
-  OBJ_INFECT(host, source);
-  return Qnil;
-}
-#endif
-
 static VALUE object_spec_rb_any_to_s(VALUE self, VALUE obj) {
   return rb_any_to_s(obj);
 }
@@ -154,30 +133,6 @@ static VALUE object_specs_rb_obj_method(VALUE self, VALUE obj, VALUE method) {
   return rb_obj_method(obj, method);
 }
 
-#if defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6))
-# pragma GCC diagnostic push
-# pragma GCC diagnostic ignored "-Wdeprecated-declarations"
-#elif defined(__clang__) && defined(__has_warning)
-# if __has_warning("-Wdeprecated-declarations")
-#  pragma clang diagnostic push
-#  pragma clang diagnostic ignored "-Wdeprecated-declarations"
-# endif
-#endif
-
-#ifndef RUBY_VERSION_IS_3_2
-static VALUE object_spec_rb_obj_taint(VALUE self, VALUE obj) {
-  return rb_obj_taint(obj);
-}
-#endif
-
-#if defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6))
-# pragma GCC diagnostic pop
-#elif defined(__clang__) && defined(__has_warning)
-# if __has_warning("-Wdeprecated-declarations")
-#  pragma clang diagnostic pop
-# endif
-#endif
-
 static VALUE so_require(VALUE self) {
   rb_require("fixtures/foo");
   return Qnil;
@@ -197,11 +152,7 @@ static VALUE object_spec_rb_method_boundp(VALUE self, VALUE obj, VALUE method, V
 }
 
 static VALUE object_spec_rb_special_const_p(VALUE self, VALUE value) {
-  if (rb_special_const_p(value)) {
-    return Qtrue;
-  } else {
-    return Qfalse;
-  }
+  return rb_special_const_p(value);
 }
 
 static VALUE so_to_id(VALUE self, VALUE obj) {
@@ -406,49 +357,46 @@ static VALUE object_spec_rb_ivar_foreach(VALUE self, VALUE obj) {
 }
 
 static VALUE speced_allocator(VALUE klass) {
-  VALUE flags = 0;
-  VALUE instance;
-  if (RTEST(rb_class_inherited_p(klass, rb_cString))) {
-    flags = T_STRING;
-  } else if (RTEST(rb_class_inherited_p(klass, rb_cArray))) {
-    flags = T_ARRAY;
-  } else {
-    flags = T_OBJECT;
-  }
-  instance = rb_newobj_of(klass, flags);
+  VALUE super = rb_class_get_superclass(klass);
+  VALUE instance = rb_get_alloc_func(super)(klass);
   rb_iv_set(instance, "@from_custom_allocator", Qtrue);
   return instance;
 }
 
-static VALUE define_alloc_func(VALUE self, VALUE klass) {
+static VALUE object_spec_rb_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) {
+static VALUE object_spec_rb_undef_alloc_func(VALUE self, VALUE klass) {
   rb_undef_alloc_func(klass);
   return Qnil;
 }
 
-static VALUE speced_allocator_p(VALUE self, VALUE klass) {
+static VALUE object_spec_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) {
+static VALUE object_spec_custom_alloc_func_p(VALUE self, VALUE klass) {
   rb_alloc_func_t allocator = rb_get_alloc_func(klass);
   return allocator ? Qtrue : Qfalse;
 }
 
+static VALUE object_spec_redefine_frozen(VALUE self) {
+    // The purpose of this spec is to verify that `frozen?`
+    // and `RB_OBJ_FROZEN` do not mutually recurse infinitely.
+    if (RB_OBJ_FROZEN(self)) {
+        return Qtrue;
+    }
+
+    return Qfalse;
+}
+
 void Init_object_spec(void) {
   VALUE cls = rb_define_class("CApiObjectSpecs", rb_cObject);
   rb_define_method(cls, "FL_ABLE", object_spec_FL_ABLE, 1);
   rb_define_method(cls, "FL_TEST", object_spec_FL_TEST, 2);
-#ifndef RUBY_VERSION_IS_3_1
-  rb_define_method(cls, "OBJ_TAINT", object_spec_OBJ_TAINT, 1);
-  rb_define_method(cls, "OBJ_TAINTED", object_spec_OBJ_TAINTED, 1);
-  rb_define_method(cls, "OBJ_INFECT", object_spec_OBJ_INFECT, 2);
-#endif
   rb_define_method(cls, "rb_any_to_s", object_spec_rb_any_to_s, 1);
   rb_define_method(cls, "rb_attr_get", so_attr_get, 2);
   rb_define_method(cls, "rb_obj_instance_variables", object_spec_rb_obj_instance_variables, 1);
@@ -473,15 +421,11 @@ void Init_object_spec(void) {
   rb_define_method(cls, "rb_obj_is_kind_of", so_kind_of, 2);
   rb_define_method(cls, "rb_obj_method_arity", object_specs_rb_obj_method_arity, 2);
   rb_define_method(cls, "rb_obj_method", object_specs_rb_obj_method, 2);
-#ifndef RUBY_VERSION_IS_3_2
-  rb_define_method(cls, "rb_obj_taint", object_spec_rb_obj_taint, 1);
-#endif
   rb_define_method(cls, "rb_require", so_require, 0);
   rb_define_method(cls, "rb_respond_to", so_respond_to, 2);
   rb_define_method(cls, "rb_method_boundp", object_spec_rb_method_boundp, 3);
   rb_define_method(cls, "rb_obj_respond_to", so_obj_respond_to, 3);
   rb_define_method(cls, "rb_special_const_p", object_spec_rb_special_const_p, 1);
-
   rb_define_method(cls, "rb_to_id", so_to_id, 1);
   rb_define_method(cls, "RTEST", object_spec_RTEST, 1);
   rb_define_method(cls, "rb_check_type", so_check_type, 2);
@@ -515,12 +459,15 @@ 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);
+  rb_define_method(cls, "rb_define_alloc_func", object_spec_rb_define_alloc_func, 1);
+  rb_define_method(cls, "rb_undef_alloc_func", object_spec_rb_undef_alloc_func, 1);
+  rb_define_method(cls, "speced_allocator?", object_spec_speced_allocator_p, 1);
+  rb_define_method(cls, "custom_alloc_func?", object_spec_custom_alloc_func_p, 1);
   rb_define_method(cls, "not_implemented_method", rb_f_notimplement, -1);
   rb_define_method(cls, "rb_ivar_foreach", object_spec_rb_ivar_foreach, 1);
+
+  cls = rb_define_class("CApiObjectRedefinitionSpecs", rb_cObject);
+  rb_define_method(cls, "frozen?", object_spec_redefine_frozen, 0);
 }
 
 #ifdef __cplusplus
diff --git a/spec/ruby/optional/capi/ext/range_spec.c b/spec/ruby/optional/capi/ext/range_spec.c
index b0cf1a86626442..9faed3e5eef78c 100644
--- a/spec/ruby/optional/capi/ext/range_spec.c
+++ b/spec/ruby/optional/capi/ext/range_spec.c
@@ -25,9 +25,9 @@ VALUE range_spec_rb_range_values(VALUE self, VALUE range) {
   return ary;
 }
 
-VALUE range_spec_rb_range_beg_len(VALUE self, VALUE range, VALUE begpv, VALUE lenpv, VALUE lenv, VALUE errv) {
-  long begp = FIX2LONG(begpv);
-  long lenp = FIX2LONG(lenpv);
+VALUE range_spec_rb_range_beg_len(VALUE self, VALUE range, VALUE lenv, VALUE errv) {
+  long begp = 0;
+  long lenp = 0;
   long len = FIX2LONG(lenv);
   int err = FIX2INT(errv);
   VALUE ary = rb_ary_new();
@@ -38,11 +38,51 @@ VALUE range_spec_rb_range_beg_len(VALUE self, VALUE range, VALUE begpv, VALUE le
   return ary;
 }
 
+VALUE range_spec_rb_arithmetic_sequence_extract(VALUE self, VALUE object) {
+  VALUE ary = rb_ary_new();
+  rb_arithmetic_sequence_components_t components;
+
+  int status = rb_arithmetic_sequence_extract(object, &components);
+
+  if (!status) {
+      rb_ary_store(ary, 0, LONG2FIX(status));
+      return ary;
+  }
+
+  rb_ary_store(ary, 0, LONG2FIX(status));
+  rb_ary_store(ary, 1, components.begin);
+  rb_ary_store(ary, 2, components.end);
+  rb_ary_store(ary, 3, components.step);
+  rb_ary_store(ary, 4, components.exclude_end ? Qtrue : Qfalse);
+  return ary;
+}
+
+VALUE range_spec_rb_arithmetic_sequence_beg_len_step(VALUE self, VALUE aseq, VALUE lenv, VALUE errv) {
+  long begp = 0;
+  long lenp = 0;
+  long stepp = 0;
+
+  long len = FIX2LONG(lenv);
+  int err = FIX2INT(errv);
+
+  VALUE success = rb_arithmetic_sequence_beg_len_step(aseq, &begp, &lenp, &stepp, len, err);
+
+  VALUE ary = rb_ary_new();
+  rb_ary_store(ary, 0, success);
+  rb_ary_store(ary, 1, LONG2FIX(begp));
+  rb_ary_store(ary, 2, LONG2FIX(lenp));
+  rb_ary_store(ary, 3, LONG2FIX(stepp));
+
+  return ary;
+}
+
 void Init_range_spec(void) {
   VALUE cls = rb_define_class("CApiRangeSpecs", rb_cObject);
   rb_define_method(cls, "rb_range_new", range_spec_rb_range_new, -1);
   rb_define_method(cls, "rb_range_values", range_spec_rb_range_values, 1);
-  rb_define_method(cls, "rb_range_beg_len", range_spec_rb_range_beg_len, 5);
+  rb_define_method(cls, "rb_range_beg_len", range_spec_rb_range_beg_len, 3);
+  rb_define_method(cls, "rb_arithmetic_sequence_extract", range_spec_rb_arithmetic_sequence_extract, 1);
+  rb_define_method(cls, "rb_arithmetic_sequence_beg_len_step", range_spec_rb_arithmetic_sequence_beg_len_step, 3);
 }
 
 #ifdef __cplusplus
diff --git a/spec/ruby/optional/capi/ext/rbasic_spec.c b/spec/ruby/optional/capi/ext/rbasic_spec.c
index 9178e5f6390089..5a95b92804dc2d 100644
--- a/spec/ruby/optional/capi/ext/rbasic_spec.c
+++ b/spec/ruby/optional/capi/ext/rbasic_spec.c
@@ -5,6 +5,14 @@
 extern "C" {
 #endif
 
+#ifndef RBASIC_FLAGS
+#define RBASIC_FLAGS(obj) (RBASIC(obj)->flags)
+#endif
+
+#ifndef RBASIC_SET_FLAGS
+#define RBASIC_SET_FLAGS(obj, flags_to_set) (RBASIC(obj)->flags = flags_to_set)
+#endif
+
 #ifndef FL_SHAREABLE
 static const VALUE VISIBLE_BITS = FL_TAINT | FL_FREEZE;
 static const VALUE DATA_VISIBLE_BITS = FL_TAINT | FL_FREEZE | ~(FL_USER0 - 1);
@@ -23,65 +31,61 @@ static const VALUE DATA_VISIBLE_BITS = FL_FREEZE | ~(FL_USER0 - 1);
 #error "unsupported"
 #endif
 
-
-#ifndef RUBY_VERSION_IS_3_1
-VALUE rbasic_spec_taint_flag(VALUE self) {
-  return VALUE2NUM(RUBY_FL_TAINT);
-}
-#endif
-
 VALUE rbasic_spec_freeze_flag(VALUE self) {
   return VALUE2NUM(RUBY_FL_FREEZE);
 }
 
-    static VALUE spec_get_flags(const struct RBasic *b, VALUE visible_bits) {
-  VALUE flags = b->flags & visible_bits;
+static VALUE spec_get_flags(VALUE obj, VALUE visible_bits) {
+  VALUE flags = RB_FL_TEST(obj, visible_bits);
   return VALUE2NUM(flags);
 }
 
-static VALUE spec_set_flags(struct RBasic *b, VALUE flags, VALUE visible_bits) {
+static VALUE spec_set_flags(VALUE obj, VALUE flags, VALUE visible_bits) {
   flags &= visible_bits;
-  b->flags = (b->flags & ~visible_bits) | flags;
+
+  // Could also be done like:
+  // RB_FL_UNSET(obj, visible_bits);
+  // RB_FL_SET(obj, flags);
+  // But that seems rather indirect
+  RBASIC_SET_FLAGS(obj, (RBASIC_FLAGS(obj) & ~visible_bits) | flags);
+
   return VALUE2NUM(flags);
 }
 
-VALUE rbasic_spec_get_flags(VALUE self, VALUE val) {
-  return spec_get_flags(RBASIC(val), VISIBLE_BITS);
+static VALUE rbasic_spec_get_flags(VALUE self, VALUE obj) {
+  return spec_get_flags(obj, VISIBLE_BITS);
 }
 
-VALUE rbasic_spec_set_flags(VALUE self, VALUE val, VALUE flags) {
-  return spec_set_flags(RBASIC(val), NUM2VALUE(flags), VISIBLE_BITS);
+static VALUE rbasic_spec_set_flags(VALUE self, VALUE obj, VALUE flags) {
+  return spec_set_flags(obj, NUM2VALUE(flags), VISIBLE_BITS);
 }
 
-VALUE rbasic_spec_copy_flags(VALUE self, VALUE to, VALUE from) {
-  return spec_set_flags(RBASIC(to), RBASIC(from)->flags, VISIBLE_BITS);
+static VALUE rbasic_spec_copy_flags(VALUE self, VALUE to, VALUE from) {
+  return spec_set_flags(to, RBASIC_FLAGS(from), VISIBLE_BITS);
 }
 
-VALUE rbasic_spec_get_klass(VALUE self, VALUE val) {
-  return RBASIC(val)->klass;
+static VALUE rbasic_spec_get_klass(VALUE self, VALUE obj) {
+  return RBASIC_CLASS(obj);
 }
 
-VALUE rbasic_rdata_spec_get_flags(VALUE self, VALUE structure) {
-  return spec_get_flags(&RDATA(structure)->basic, DATA_VISIBLE_BITS);
+static VALUE rbasic_rdata_spec_get_flags(VALUE self, VALUE structure) {
+  return spec_get_flags(structure, DATA_VISIBLE_BITS);
 }
 
-VALUE rbasic_rdata_spec_set_flags(VALUE self, VALUE structure, VALUE flags) {
-  return spec_set_flags(&RDATA(structure)->basic, NUM2VALUE(flags), DATA_VISIBLE_BITS);
+static VALUE rbasic_rdata_spec_set_flags(VALUE self, VALUE structure, VALUE flags) {
+  return spec_set_flags(structure, NUM2VALUE(flags), DATA_VISIBLE_BITS);
 }
 
-VALUE rbasic_rdata_spec_copy_flags(VALUE self, VALUE to, VALUE from) {
-  return spec_set_flags(&RDATA(to)->basic, RDATA(from)->basic.flags, DATA_VISIBLE_BITS);
+static VALUE rbasic_rdata_spec_copy_flags(VALUE self, VALUE to, VALUE from) {
+  return spec_set_flags(to, RBASIC_FLAGS(from), DATA_VISIBLE_BITS);
 }
 
-VALUE rbasic_rdata_spec_get_klass(VALUE self, VALUE structure) {
-  return RDATA(structure)->basic.klass;
+static VALUE rbasic_rdata_spec_get_klass(VALUE self, VALUE structure) {
+  return RBASIC_CLASS(structure);
 }
 
 void Init_rbasic_spec(void) {
   VALUE cls = rb_define_class("CApiRBasicSpecs", rb_cObject);
-#ifndef RUBY_VERSION_IS_3_1
-  rb_define_method(cls, "taint_flag", rbasic_spec_taint_flag, 0);
-#endif
   rb_define_method(cls, "freeze_flag", rbasic_spec_freeze_flag, 0);
   rb_define_method(cls, "get_flags", rbasic_spec_get_flags, 1);
   rb_define_method(cls, "set_flags", rbasic_spec_set_flags, 2);
diff --git a/spec/ruby/optional/capi/ext/rubyspec.h b/spec/ruby/optional/capi/ext/rubyspec.h
index 80deca24c6f129..8aaec36f465818 100644
--- a/spec/ruby/optional/capi/ext/rubyspec.h
+++ b/spec/ruby/optional/capi/ext/rubyspec.h
@@ -5,38 +5,46 @@
  * guards to assist with version incompatibilities. */
 
 #include <ruby.h>
-#ifdef HAVE_RUBY_VERSION_H
-# include <ruby/version.h>
-#else
-# include <version.h>
-#endif
+#include <ruby/version.h>
 
-#ifndef RUBY_VERSION_MAJOR
-#define RUBY_VERSION_MAJOR RUBY_API_VERSION_MAJOR
-#define RUBY_VERSION_MINOR RUBY_API_VERSION_MINOR
-#define RUBY_VERSION_TEENY RUBY_API_VERSION_TEENY
-#endif
+/* copied from ext/-test-/cxxanyargs/cxxanyargs.cpp */
+#if 0 /* Ignore deprecation warnings */
 
-#define RUBY_VERSION_BEFORE(major,minor,teeny) \
-  ((RUBY_VERSION_MAJOR < (major)) || \
-   (RUBY_VERSION_MAJOR == (major) && RUBY_VERSION_MINOR < (minor)) || \
-   (RUBY_VERSION_MAJOR == (major) && RUBY_VERSION_MINOR == (minor) && RUBY_VERSION_TEENY < (teeny)))
-#define RUBY_VERSION_SINCE(major,minor,teeny) (!RUBY_VERSION_BEFORE(major, minor, teeny))
+#elif defined(_MSC_VER)
+#pragma warning(disable : 4996)
+
+#elif defined(__INTEL_COMPILER)
+#pragma warning(disable : 1786)
+
+#elif defined(__clang__)
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
+
+#elif defined(__GNUC__)
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+
+#elif defined(__SUNPRO_CC)
+#pragma error_messages (off,symdeprecated)
+
+#else
+// :FIXME: improve here for your compiler.
 
-#if RUBY_VERSION_SINCE(3, 3, 0)
-#define RUBY_VERSION_IS_3_3
 #endif
 
-#if RUBY_VERSION_SINCE(3, 2, 0)
-#define RUBY_VERSION_IS_3_2
+#define RUBY_VERSION_BEFORE(major,minor) \
+  ((RUBY_API_VERSION_MAJOR < (major)) || \
+   (RUBY_API_VERSION_MAJOR == (major) && RUBY_API_VERSION_MINOR < (minor)))
+#define RUBY_VERSION_SINCE(major,minor) (!RUBY_VERSION_BEFORE(major, minor))
+
+#if RUBY_VERSION_SINCE(3, 5)
+#define RUBY_VERSION_IS_3_5
 #endif
 
-#if RUBY_VERSION_SINCE(3, 1, 0)
-#define RUBY_VERSION_IS_3_1
+#if RUBY_VERSION_SINCE(3, 4)
+#define RUBY_VERSION_IS_3_4
 #endif
 
-#if RUBY_VERSION_SINCE(3, 0, 0)
-#define RUBY_VERSION_IS_3_0
+#if RUBY_VERSION_SINCE(3, 3)
+#define RUBY_VERSION_IS_3_3
 #endif
 
 #endif
diff --git a/spec/ruby/optional/capi/ext/set_spec.c b/spec/ruby/optional/capi/ext/set_spec.c
new file mode 100644
index 00000000000000..6535a11be322df
--- /dev/null
+++ b/spec/ruby/optional/capi/ext/set_spec.c
@@ -0,0 +1,62 @@
+#include "ruby.h"
+#include "rubyspec.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#define RBOOL(x) ((x) ? Qtrue : Qfalse)
+
+int yield_element_and_arg(VALUE element, VALUE arg) {
+  return RTEST(rb_yield_values(2, element, arg)) ? ST_CONTINUE : ST_STOP;
+}
+
+VALUE set_spec_rb_set_foreach(VALUE self, VALUE set, VALUE arg) {
+  rb_set_foreach(set, yield_element_and_arg, arg);
+  return Qnil;
+}
+
+VALUE set_spec_rb_set_new(VALUE self) {
+  return rb_set_new();
+}
+
+VALUE set_spec_rb_set_new_capa(VALUE self, VALUE capa) {
+  return rb_set_new_capa(NUM2INT(capa));
+}
+
+VALUE set_spec_rb_set_lookup(VALUE self, VALUE set, VALUE element) {
+  return RBOOL(rb_set_lookup(set, element));
+}
+
+VALUE set_spec_rb_set_add(VALUE self, VALUE set, VALUE element) {
+  return RBOOL(rb_set_add(set, element));
+}
+
+VALUE set_spec_rb_set_clear(VALUE self, VALUE set) {
+  return rb_set_clear(set);
+}
+
+VALUE set_spec_rb_set_delete(VALUE self, VALUE set, VALUE element) {
+  return RBOOL(rb_set_delete(set, element));
+}
+
+VALUE set_spec_rb_set_size(VALUE self, VALUE set) {
+  return SIZET2NUM(rb_set_size(set));
+}
+
+void Init_set_spec(void) {
+  VALUE cls = rb_define_class("CApiSetSpecs", rb_cObject);
+  rb_define_method(cls, "rb_set_foreach", set_spec_rb_set_foreach, 2);
+  rb_define_method(cls, "rb_set_new", set_spec_rb_set_new, 0);
+  rb_define_method(cls, "rb_set_new_capa", set_spec_rb_set_new_capa, 1);
+  rb_define_method(cls, "rb_set_lookup", set_spec_rb_set_lookup, 2);
+  rb_define_method(cls, "rb_set_add", set_spec_rb_set_add, 2);
+  rb_define_method(cls, "rb_set_clear", set_spec_rb_set_clear, 1);
+  rb_define_method(cls, "rb_set_delete", set_spec_rb_set_delete, 2);
+  rb_define_method(cls, "rb_set_size", set_spec_rb_set_size, 1);
+}
+
+#ifdef __cplusplus
+}
+#endif
+
diff --git a/spec/ruby/optional/capi/ext/string_spec.c b/spec/ruby/optional/capi/ext/string_spec.c
index 24a9b4e4ca0b2c..094013e049cbf6 100644
--- a/spec/ruby/optional/capi/ext/string_spec.c
+++ b/spec/ruby/optional/capi/ext/string_spec.c
@@ -51,12 +51,6 @@ VALUE string_spec_rb_str_set_len_RSTRING_LEN(VALUE self, VALUE str, VALUE len) {
   return INT2FIX(RSTRING_LEN(str));
 }
 
-VALUE rb_fstring(VALUE str); /* internal.h, used in ripper */
-
-VALUE string_spec_rb_str_fstring(VALUE self, VALUE str) {
-  return rb_fstring(str);
-}
-
 VALUE string_spec_rb_str_buf_new(VALUE self, VALUE len, VALUE str) {
   VALUE buf;
 
@@ -123,6 +117,10 @@ VALUE string_spec_rb_str_cmp(VALUE self, VALUE str1, VALUE str2) {
   return INT2NUM(rb_str_cmp(str1, str2));
 }
 
+VALUE string_spec_rb_str_strlen(VALUE self, VALUE str) {
+  return LONG2NUM(rb_str_strlen(str));
+}
+
 VALUE string_spec_rb_str_conv_enc(VALUE self, VALUE str, VALUE from, VALUE to) {
   rb_encoding* from_enc;
   rb_encoding* to_enc;
@@ -254,34 +252,6 @@ VALUE string_spec_rb_str_new5(VALUE self, VALUE str, VALUE ptr, VALUE len) {
   return rb_str_new5(str, RSTRING_PTR(ptr), FIX2INT(len));
 }
 
-#if defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6))
-# pragma GCC diagnostic push
-# pragma GCC diagnostic ignored "-Wdeprecated-declarations"
-#elif defined(__clang__) && defined(__has_warning)
-# if __has_warning("-Wdeprecated-declarations")
-#  pragma clang diagnostic push
-#  pragma clang diagnostic ignored "-Wdeprecated-declarations"
-# endif
-#endif
-
-#ifndef RUBY_VERSION_IS_3_2
-VALUE string_spec_rb_tainted_str_new(VALUE self, VALUE str, VALUE len) {
-  return rb_tainted_str_new(RSTRING_PTR(str), FIX2INT(len));
-}
-
-VALUE string_spec_rb_tainted_str_new2(VALUE self, VALUE str) {
-  return rb_tainted_str_new2(RSTRING_PTR(str));
-}
-#endif
-
-#if defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6))
-# pragma GCC diagnostic pop
-#elif defined(__clang__) && defined(__has_warning)
-# if __has_warning("-Wdeprecated-declarations")
-#  pragma clang diagnostic pop
-# endif
-#endif
-
 VALUE string_spec_rb_str_plus(VALUE self, VALUE str1, VALUE str2) {
   return rb_str_plus(str1, str2);
 }
@@ -470,6 +440,7 @@ static VALUE string_spec_rb_str_free(VALUE self, VALUE str) {
 static VALUE string_spec_rb_sprintf1(VALUE self, VALUE str, VALUE repl) {
   return rb_sprintf(RSTRING_PTR(str), RSTRING_PTR(repl));
 }
+
 static VALUE string_spec_rb_sprintf2(VALUE self, VALUE str, VALUE repl1, VALUE repl2) {
   return rb_sprintf(RSTRING_PTR(str), RSTRING_PTR(repl1), RSTRING_PTR(repl2));
 }
@@ -596,11 +567,24 @@ static VALUE string_spec_rb_str_unlocktmp(VALUE self, VALUE str) {
   return rb_str_unlocktmp(str);
 }
 
+static VALUE string_spec_rb_enc_interned_str_cstr(VALUE self, VALUE str, VALUE enc) {
+  rb_encoding *e = NIL_P(enc) ? 0 : rb_to_encoding(enc);
+  return rb_enc_interned_str_cstr(RSTRING_PTR(str), e);
+}
+
+static VALUE string_spec_rb_enc_interned_str(VALUE self, VALUE str, VALUE len, VALUE enc) {
+  rb_encoding *e = NIL_P(enc) ? 0 : rb_to_encoding(enc);
+  return rb_enc_interned_str(RSTRING_PTR(str), FIX2LONG(len), e);
+}
+
+static VALUE string_spec_rb_str_to_interned_str(VALUE self, VALUE str) {
+  return rb_str_to_interned_str(str);
+}
+
 void Init_string_spec(void) {
   VALUE cls = rb_define_class("CApiStringSpecs", rb_cObject);
   rb_define_method(cls, "rb_cstr2inum", string_spec_rb_cstr2inum, 2);
   rb_define_method(cls, "rb_cstr_to_inum", string_spec_rb_cstr_to_inum, 3);
-  rb_define_method(cls, "rb_fstring", string_spec_rb_str_fstring, 1);
   rb_define_method(cls, "rb_str2inum", string_spec_rb_str2inum, 2);
   rb_define_method(cls, "rb_str_append", string_spec_rb_str_append, 2);
   rb_define_method(cls, "rb_str_buf_new", string_spec_rb_str_buf_new, 2);
@@ -616,6 +600,7 @@ void Init_string_spec(void) {
   rb_define_method(cls, "rb_str_cat_cstr", string_spec_rb_str_cat_cstr, 2);
   rb_define_method(cls, "rb_str_cat_cstr_constant", string_spec_rb_str_cat_cstr_constant, 1);
   rb_define_method(cls, "rb_str_cmp", string_spec_rb_str_cmp, 2);
+  rb_define_method(cls, "rb_str_strlen", string_spec_rb_str_strlen, 1);
   rb_define_method(cls, "rb_str_conv_enc", string_spec_rb_str_conv_enc, 3);
   rb_define_method(cls, "rb_str_conv_enc_opts", string_spec_rb_str_conv_enc_opts, 5);
   rb_define_method(cls, "rb_str_drop_bytes", string_spec_rb_str_drop_bytes, 2);
@@ -641,10 +626,6 @@ void Init_string_spec(void) {
   rb_define_method(cls, "rb_str_new3", string_spec_rb_str_new3, 1);
   rb_define_method(cls, "rb_str_new4", string_spec_rb_str_new4, 1);
   rb_define_method(cls, "rb_str_new5", string_spec_rb_str_new5, 3);
-#ifndef RUBY_VERSION_IS_3_2
-  rb_define_method(cls, "rb_tainted_str_new", string_spec_rb_tainted_str_new, 2);
-  rb_define_method(cls, "rb_tainted_str_new2", string_spec_rb_tainted_str_new2, 1);
-#endif
   rb_define_method(cls, "rb_str_plus", string_spec_rb_str_plus, 2);
   rb_define_method(cls, "rb_str_times", string_spec_rb_str_times, 2);
   rb_define_method(cls, "rb_str_modify_expand", string_spec_rb_str_modify_expand, 2);
@@ -697,6 +678,9 @@ void Init_string_spec(void) {
   rb_define_method(cls, "rb_str_catf", string_spec_rb_str_catf, 1);
   rb_define_method(cls, "rb_str_locktmp", string_spec_rb_str_locktmp, 1);
   rb_define_method(cls, "rb_str_unlocktmp", string_spec_rb_str_unlocktmp, 1);
+  rb_define_method(cls, "rb_enc_interned_str_cstr", string_spec_rb_enc_interned_str_cstr, 2);
+  rb_define_method(cls, "rb_enc_interned_str", string_spec_rb_enc_interned_str, 3);
+  rb_define_method(cls, "rb_str_to_interned_str", string_spec_rb_str_to_interned_str, 1);
 }
 
 #ifdef __cplusplus
diff --git a/spec/ruby/optional/capi/ext/struct_spec.c b/spec/ruby/optional/capi/ext/struct_spec.c
index 9c45bd56724fb5..413249e828f6c6 100644
--- a/spec/ruby/optional/capi/ext/struct_spec.c
+++ b/spec/ruby/optional/capi/ext/struct_spec.c
@@ -28,7 +28,7 @@ static VALUE struct_spec_rb_struct_aset(VALUE self, VALUE st, VALUE key, VALUE v
 }
 
 /* Only allow setting three attributes, should be sufficient for testing. */
-static VALUE struct_spec_struct_define(VALUE self, VALUE name,
+static VALUE struct_spec_rb_struct_define(VALUE self, VALUE name,
   VALUE attr1, VALUE attr2, VALUE attr3) {
 
   const char *a1 = StringValuePtr(attr1);
@@ -42,7 +42,7 @@ static VALUE struct_spec_struct_define(VALUE self, VALUE name,
 }
 
 /* Only allow setting three attributes, should be sufficient for testing. */
-static VALUE struct_spec_struct_define_under(VALUE self, VALUE outer,
+static VALUE struct_spec_rb_struct_define_under(VALUE self, VALUE outer,
   VALUE name, VALUE attr1, VALUE attr2, VALUE attr3) {
 
   const char *nm = StringValuePtr(name);
@@ -62,6 +62,23 @@ static VALUE struct_spec_rb_struct_size(VALUE self, VALUE st) {
   return rb_struct_size(st);
 }
 
+#if defined(RUBY_VERSION_IS_3_3)
+/* Only allow setting three attributes, should be sufficient for testing. */
+static VALUE struct_spec_rb_data_define(VALUE self, VALUE superclass,
+  VALUE attr1, VALUE attr2, VALUE attr3) {
+
+  const char *a1 = StringValuePtr(attr1);
+  const char *a2 = StringValuePtr(attr2);
+  const char *a3 = StringValuePtr(attr3);
+
+  if (superclass == Qnil) {
+    superclass = 0;
+  }
+
+  return rb_data_define(superclass, a1, a2, a3, NULL);
+}
+#endif
+
 void Init_struct_spec(void) {
   VALUE cls = rb_define_class("CApiStructSpecs", rb_cObject);
   rb_define_method(cls, "rb_struct_aref", struct_spec_rb_struct_aref, 2);
@@ -69,10 +86,13 @@ void Init_struct_spec(void) {
   rb_define_method(cls, "rb_struct_s_members", struct_spec_rb_struct_s_members, 1);
   rb_define_method(cls, "rb_struct_members", struct_spec_rb_struct_members, 1);
   rb_define_method(cls, "rb_struct_aset", struct_spec_rb_struct_aset, 3);
-  rb_define_method(cls, "rb_struct_define", struct_spec_struct_define, 4);
-  rb_define_method(cls, "rb_struct_define_under", struct_spec_struct_define_under, 5);
+  rb_define_method(cls, "rb_struct_define", struct_spec_rb_struct_define, 4);
+  rb_define_method(cls, "rb_struct_define_under", struct_spec_rb_struct_define_under, 5);
   rb_define_method(cls, "rb_struct_new", struct_spec_rb_struct_new, 4);
   rb_define_method(cls, "rb_struct_size", struct_spec_rb_struct_size, 1);
+#if defined(RUBY_VERSION_IS_3_3)
+  rb_define_method(cls, "rb_data_define", struct_spec_rb_data_define, 4);
+#endif
 }
 
 #ifdef __cplusplus
diff --git a/spec/ruby/optional/capi/ext/thread_spec.c b/spec/ruby/optional/capi/ext/thread_spec.c
index 6307e5cc99e1a9..6ee111b7b7ea72 100644
--- a/spec/ruby/optional/capi/ext/thread_spec.c
+++ b/spec/ruby/optional/capi/ext/thread_spec.c
@@ -26,10 +26,6 @@ static VALUE thread_spec_rb_thread_alone(VALUE self) {
   return rb_thread_alone() ? Qtrue : Qfalse;
 }
 
-#if defined(__GNUC__)
-#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
-#endif
-
 /* This is unblocked by unblock_func(). */
 static void* blocking_gvl_func(void* data) {
   int rfd = *(int *)data;
@@ -71,7 +67,7 @@ static VALUE thread_spec_rb_thread_call_without_gvl(VALUE self) {
 }
 
 /* This is unblocked by a signal. */
-static void* blocking_gvl_func_for_udf_io(void *data) {
+static void* blocking_gvl_func_for_ubf_io(void *data) {
   int rfd = (int)(size_t)data;
   char dummy;
 
@@ -91,7 +87,7 @@ static VALUE thread_spec_rb_thread_call_without_gvl_with_ubf_io(VALUE self) {
     rb_raise(rb_eRuntimeError, "could not create pipe");
   }
 
-  ret = rb_thread_call_without_gvl(blocking_gvl_func_for_udf_io,
+  ret = rb_thread_call_without_gvl(blocking_gvl_func_for_ubf_io,
                                   (void*)(size_t)fds[0], RUBY_UBF_IO, 0);
   close(fds[0]);
   close(fds[1]);
@@ -122,7 +118,6 @@ static VALUE thread_spec_rb_thread_wait_for(VALUE self, VALUE s, VALUE ms) {
   return Qnil;
 }
 
-
 VALUE thread_spec_call_proc(void *arg_ptr) {
   VALUE arg_array = (VALUE)arg_ptr;
   VALUE arg = rb_ary_pop(arg_array);
@@ -171,6 +166,12 @@ static VALUE thread_spec_ruby_native_thread_p_new_thread(VALUE self) {
 #endif
 }
 
+#ifdef RUBY_VERSION_IS_3_5
+static VALUE thread_spec_ruby_thread_has_gvl_p(VALUE self) {
+  return ruby_thread_has_gvl_p() ? Qtrue : Qfalse;
+}
+#endif
+
 void Init_thread_spec(void) {
   VALUE cls = rb_define_class("CApiThreadSpecs", rb_cObject);
   rb_define_method(cls, "rb_thread_alone", thread_spec_rb_thread_alone, 0);
@@ -184,6 +185,9 @@ void Init_thread_spec(void) {
   rb_define_method(cls,  "rb_thread_create", thread_spec_rb_thread_create, 2);
   rb_define_method(cls,  "ruby_native_thread_p", thread_spec_ruby_native_thread_p, 0);
   rb_define_method(cls,  "ruby_native_thread_p_new_thread", thread_spec_ruby_native_thread_p_new_thread, 0);
+#ifdef RUBY_VERSION_IS_3_5
+  rb_define_method(cls,  "ruby_thread_has_gvl_p", thread_spec_ruby_thread_has_gvl_p, 0);
+#endif
 }
 
 #ifdef __cplusplus
diff --git a/spec/ruby/optional/capi/ext/typed_data_spec.c b/spec/ruby/optional/capi/ext/typed_data_spec.c
index eca2b667cc227d..221f1c8ac490b3 100644
--- a/spec/ruby/optional/capi/ext/typed_data_spec.c
+++ b/spec/ruby/optional/capi/ext/typed_data_spec.c
@@ -106,6 +106,14 @@ VALUE sws_typed_wrap_struct(VALUE self, VALUE val) {
   return TypedData_Wrap_Struct(rb_cObject, &sample_typed_wrapped_struct_data_type, bar);
 }
 
+#undef RUBY_UNTYPED_DATA_WARNING
+#define RUBY_UNTYPED_DATA_WARNING 0
+VALUE sws_untyped_wrap_struct(VALUE self, VALUE val) {
+  int* data = (int*) malloc(sizeof(int));
+  *data = FIX2INT(val);
+  return Data_Wrap_Struct(rb_cObject, NULL, free, data);
+}
+
 VALUE sws_typed_get_struct(VALUE self, VALUE obj) {
   struct sample_typed_wrapped_struct* bar;
   TypedData_Get_Struct(obj, struct sample_typed_wrapped_struct, &sample_typed_wrapped_struct_data_type, bar);
@@ -165,12 +173,17 @@ VALUE sws_typed_rb_check_typeddata_different_type(VALUE self, VALUE obj) {
   return rb_check_typeddata(obj, &sample_typed_wrapped_struct_other_data_type) == DATA_PTR(obj) ? Qtrue : Qfalse;
 }
 
+VALUE sws_typed_RTYPEDDATA_P(VALUE self, VALUE obj) {
+  return RTYPEDDATA_P(obj) ? Qtrue : Qfalse;
+}
+
 void Init_typed_data_spec(void) {
   VALUE cls = rb_define_class("CApiAllocTypedSpecs", rb_cObject);
   rb_define_alloc_func(cls, sdaf_alloc_typed_func);
   rb_define_method(cls, "typed_wrapped_data", sdaf_typed_get_struct, 0);
   cls = rb_define_class("CApiWrappedTypedStructSpecs", rb_cObject);
   rb_define_method(cls, "typed_wrap_struct", sws_typed_wrap_struct, 1);
+  rb_define_method(cls, "untyped_wrap_struct", sws_untyped_wrap_struct, 1);
   rb_define_method(cls, "typed_get_struct", sws_typed_get_struct, 1);
   rb_define_method(cls, "typed_get_struct_other", sws_typed_get_struct_different_type, 1);
   rb_define_method(cls, "typed_get_struct_parent", sws_typed_get_struct_parent_type, 1);
@@ -181,6 +194,7 @@ void Init_typed_data_spec(void) {
   rb_define_method(cls, "rb_check_typeddata_same_type", sws_typed_rb_check_typeddata_same_type, 1);
   rb_define_method(cls, "rb_check_typeddata_same_type_parent", sws_typed_rb_check_typeddata_same_type_parent, 1);
   rb_define_method(cls, "rb_check_typeddata_different_type", sws_typed_rb_check_typeddata_different_type, 1);
+  rb_define_method(cls, "RTYPEDDATA_P", sws_typed_RTYPEDDATA_P, 1);
 }
 
 #ifdef __cplusplus
diff --git a/spec/ruby/optional/capi/ext/util_spec.c b/spec/ruby/optional/capi/ext/util_spec.c
index 95ba71ea9dc11f..b5bde420d212dc 100644
--- a/spec/ruby/optional/capi/ext/util_spec.c
+++ b/spec/ruby/optional/capi/ext/util_spec.c
@@ -62,22 +62,17 @@ static VALUE util_spec_rb_get_kwargs(VALUE self, VALUE keyword_hash, VALUE keys,
   int len = RARRAY_LENINT(keys);
 
   int values_len = req + (opt < 0 ? -1 - opt : opt);
-  int i = 0;
 
-  ID *ids = (ID*) malloc(sizeof(VALUE) * len);
-  VALUE *results = (VALUE*) malloc(sizeof(VALUE) * values_len);
-  int extracted = 0;
-  VALUE ary = Qundef;
+  ID *ids = (ID *)alloca(sizeof(VALUE) * len);
+  VALUE *results = (VALUE *)alloca(sizeof(VALUE) * values_len);
 
-  for (i = 0; i < len; i++) {
+  for (int i = 0; i < len; i++) {
     ids[i] = SYM2ID(rb_ary_entry(keys, i));
   }
 
-  extracted = rb_get_kwargs(keyword_hash, ids, req, opt, results);
-  ary = rb_ary_new_from_values(extracted, results);
-  free(results);
-  free(ids);
-  return ary;
+  int extracted = rb_get_kwargs(keyword_hash, ids, req, opt, results);
+
+  return rb_ary_new_from_values(extracted, results);
 }
 
 static VALUE util_spec_rb_long2int(VALUE self, VALUE n) {
diff --git a/spec/ruby/optional/capi/fiber_spec.rb b/spec/ruby/optional/capi/fiber_spec.rb
index 357033f860993d..05d867498ce3a3 100644
--- a/spec/ruby/optional/capi/fiber_spec.rb
+++ b/spec/ruby/optional/capi/fiber_spec.rb
@@ -1,5 +1,4 @@
 require_relative 'spec_helper'
-require 'fiber'
 
 load_extension('fiber')
 
@@ -49,41 +48,39 @@
     end
   end
 
-  ruby_version_is '3.1' do
-    describe "rb_fiber_raise" do
-      it "raises an exception on the resumed fiber" do
-        fiber = Fiber.new do
-          begin
-            Fiber.yield
-          rescue => error
-            error
-          end
+  describe "rb_fiber_raise" do
+    it "raises an exception on the resumed fiber" do
+      fiber = Fiber.new do
+        begin
+          Fiber.yield
+        rescue => error
+          error
         end
+      end
 
-        fiber.resume
+      fiber.resume
 
-        result = @s.rb_fiber_raise(fiber, "Boom!")
-        result.should be_an_instance_of(RuntimeError)
-        result.message.should == "Boom!"
-      end
+      result = @s.rb_fiber_raise(fiber, "Boom!")
+      result.should be_an_instance_of(RuntimeError)
+      result.message.should == "Boom!"
+    end
 
-      it "raises an exception on the transferred fiber" do
-        main = Fiber.current
+    it "raises an exception on the transferred fiber" do
+      main = Fiber.current
 
-        fiber = Fiber.new do
-          begin
-            main.transfer
-          rescue => error
-            error
-          end
+      fiber = Fiber.new do
+        begin
+          main.transfer
+        rescue => error
+          error
         end
+      end
 
-        fiber.transfer
+      fiber.transfer
 
-        result = @s.rb_fiber_raise(fiber, "Boom!")
-        result.should be_an_instance_of(RuntimeError)
-        result.message.should == "Boom!"
-      end
+      result = @s.rb_fiber_raise(fiber, "Boom!")
+      result.should be_an_instance_of(RuntimeError)
+      result.message.should == "Boom!"
     end
   end
 end
diff --git a/spec/ruby/optional/capi/file_spec.rb b/spec/ruby/optional/capi/file_spec.rb
index 96d731e4fa24f0..12449b4e34d7d9 100644
--- a/spec/ruby/optional/capi/file_spec.rb
+++ b/spec/ruby/optional/capi/file_spec.rb
@@ -69,7 +69,7 @@
     end
 
     it "does not call #to_str on a String" do
-      obj = "path"
+      obj = +"path"
       obj.should_not_receive(:to_str)
       @s.FilePathValue(obj).should eql(obj)
     end
diff --git a/spec/ruby/optional/capi/finalizer_spec.rb b/spec/ruby/optional/capi/finalizer_spec.rb
new file mode 100644
index 00000000000000..162e8ea693bc59
--- /dev/null
+++ b/spec/ruby/optional/capi/finalizer_spec.rb
@@ -0,0 +1,40 @@
+require_relative "spec_helper"
+
+extension_path = load_extension("finalizer")
+
+describe "CApiFinalizerSpecs" do
+  before :each do
+    @s = CApiFinalizerSpecs.new
+  end
+
+  describe "rb_define_finalizer" do
+    it "defines a finalizer on the object" do
+      code = <<~RUBY
+        require #{extension_path.dump}
+
+        obj = Object.new
+        finalizer = Proc.new { puts "finalizer run" }
+        CApiFinalizerSpecs.new.rb_define_finalizer(obj, finalizer)
+      RUBY
+
+      ruby_exe(code).should == "finalizer run\n"
+    end
+  end
+
+  describe "rb_undefine_finalizer" do
+    ruby_bug "#20981", "3.4.0"..."3.4.2" do
+      it "removes finalizers from the object" do
+        code = <<~RUBY
+          require #{extension_path.dump}
+
+          obj = Object.new
+          finalizer = Proc.new { puts "finalizer run" }
+          ObjectSpace.define_finalizer(obj, finalizer)
+          CApiFinalizerSpecs.new.rb_undefine_finalizer(obj)
+        RUBY
+
+        ruby_exe(code).should.empty?
+      end
+    end
+  end
+end
diff --git a/spec/ruby/optional/capi/fixnum_spec.rb b/spec/ruby/optional/capi/fixnum_spec.rb
index aa02a0543b7a9d..e691aa389365ad 100644
--- a/spec/ruby/optional/capi/fixnum_spec.rb
+++ b/spec/ruby/optional/capi/fixnum_spec.rb
@@ -25,7 +25,7 @@
       end
     end
 
-    platform_is wordsize: 64 do # sizeof(long) > sizeof(int)
+    platform_is c_long_size: 64 do # sizeof(long) > sizeof(int)
       it "raises a TypeError if passed nil" do
         -> { @s.FIX2INT(nil) }.should raise_error(TypeError)
       end
@@ -74,7 +74,7 @@
       end
     end
 
-    platform_is wordsize: 64 do # sizeof(long) > sizeof(int)
+    platform_is c_long_size: 64 do # sizeof(long) > sizeof(int)
       it "raises a TypeError if passed nil" do
         -> { @s.FIX2UINT(nil) }.should raise_error(TypeError)
       end
diff --git a/spec/ruby/optional/capi/fixtures/kernel.rb b/spec/ruby/optional/capi/fixtures/kernel.rb
index f5b95e0fead1dc..d3fc7c57e8479c 100644
--- a/spec/ruby/optional/capi/fixtures/kernel.rb
+++ b/spec/ruby/optional/capi/fixtures/kernel.rb
@@ -1,19 +1,19 @@
 class CApiKernelSpecs
   class ClassWithPublicMethod
     def public_method(*, **)
-      0
+      :public
     end
   end
 
   class ClassWithPrivateMethod
     private def private_method(*, **)
-      0
+      :private
     end
   end
 
   class ClassWithProtectedMethod
     protected def protected_method(*, **)
-      0
+      :protected
     end
   end
 end
diff --git a/spec/ruby/optional/capi/gc_spec.rb b/spec/ruby/optional/capi/gc_spec.rb
index d76ea7394f304e..d9661328ab39a0 100644
--- a/spec/ruby/optional/capi/gc_spec.rb
+++ b/spec/ruby/optional/capi/gc_spec.rb
@@ -27,9 +27,36 @@
   end
 
   describe "rb_global_variable" do
-    it "keeps the value alive even if the value is assigned after rb_global_variable() is called" do
+    before :all do
       GC.start
-      @f.registered_before_rb_global_variable.should == "registered before rb_global_variable()"
+    end
+
+    describe "keeps the value alive even if the value is assigned after rb_global_variable() is called" do
+      it "for a string" do
+        @f.registered_before_rb_global_variable_string.should == "registered before rb_global_variable()"
+      end
+
+      it "for a bignum" do
+        @f.registered_before_rb_global_variable_bignum.should == 2**63 - 1
+      end
+
+      it "for a Float" do
+        @f.registered_before_rb_global_variable_float.should == 3.14
+      end
+    end
+
+    describe "keeps the value alive when the value is assigned before rb_global_variable() is called" do
+      it "for a string" do
+        @f.registered_after_rb_global_variable_string.should == "registered after rb_global_variable()"
+      end
+
+      it "for a bignum" do
+        @f.registered_after_rb_global_variable_bignum.should == 2**63 - 1
+      end
+
+      it "for a Float" do
+        @f.registered_after_rb_global_variable_float.should == 6.28
+      end
     end
   end
 
@@ -81,6 +108,10 @@
     it "can be called with an object" do
       @f.rb_gc_register_mark_object(Object.new).should be_nil
     end
+
+    it "keeps the value alive even if the value is not referenced by any Ruby object" do
+      @f.rb_gc_register_mark_object_not_referenced_float.should == 1.61
+    end
   end
 
   describe "rb_gc_latest_gc_info" do
diff --git a/spec/ruby/optional/capi/hash_spec.rb b/spec/ruby/optional/capi/hash_spec.rb
index a0e49ffc4cc090..3a27de3bfa2984 100644
--- a/spec/ruby/optional/capi/hash_spec.rb
+++ b/spec/ruby/optional/capi/hash_spec.rb
@@ -50,19 +50,17 @@
     end
   end
 
-  ruby_version_is '3.2' do
-    describe "rb_hash_new_capa" do
-      it "returns a new hash" do
-        @s.rb_hash_new_capa(3).should == {}
-      end
+  describe "rb_hash_new_capa" do
+    it "returns a new hash" do
+      @s.rb_hash_new_capa(3).should == {}
+    end
 
-      it "creates a hash with no default proc" do
-        @s.rb_hash_new_capa(3) {}.default_proc.should be_nil
-      end
+    it "creates a hash with no default proc" do
+      @s.rb_hash_new_capa(3) {}.default_proc.should be_nil
+    end
 
-      it "raises RuntimeError when negative index is provided" do
-        -> { @s.rb_hash_new_capa(-1) }.should raise_error(RuntimeError, "st_table too big")
-      end
+    it "raises RuntimeError when negative index is provided" do
+      -> { @s.rb_hash_new_capa(-1) }.should raise_error(RuntimeError, "st_table too big")
     end
   end
 
@@ -194,6 +192,61 @@
     end
   end
 
+  describe "rb_hash_bulk_insert" do
+    it 'inserts key-value pairs into the hash' do
+      arr = [:a, 1, :b, 2, :c, 3]
+      hash = {}
+
+      @s.rb_hash_bulk_insert(arr.length, arr, hash)
+
+      hash.should == {a: 1, b: 2, c: 3}
+    end
+
+    it 'overwrites existing keys' do
+      arr = [:a, 4, :b, 5, :c, 6]
+      hash = {a: 1, b: 2}
+
+      @s.rb_hash_bulk_insert(arr.length, arr, hash)
+
+      hash.should == {a: 4, b: 5, c: 6}
+    end
+
+    it 'uses the last key in the array if it appears multiple times' do
+      arr = [:a, 1, :b, 2, :a, 3]
+      hash = {}
+
+      @s.rb_hash_bulk_insert(arr.length, arr, hash)
+
+      hash.should == {a: 3, b: 2}
+    end
+
+    it 'allows the array to be NULL if the length is zero' do
+      hash = {}
+
+      @s.rb_hash_bulk_insert(0, nil, hash)
+
+      hash.should == {}
+    end
+
+    it 'does not include any keys after the given length' do
+      arr = [:a, 1, :b, 2, :c, 3, :d, 4]
+      hash = {}
+
+      @s.rb_hash_bulk_insert(arr.length - 2, arr, hash)
+
+      hash.should == {a: 1, b: 2, c: 3}
+    end
+
+    it 'does not modify the hash if the length is zero' do
+      arr = []
+      hash = {a: 1, b: 2}
+
+      @s.rb_hash_bulk_insert(arr.length, arr, hash)
+
+      hash.should == {a: 1, b: 2}
+    end
+  end
+
   describe "rb_hash_size" do
     it "returns the size of the hash" do
       hsh = {fast: 'car', good: 'music'}
diff --git a/spec/ruby/optional/capi/integer_spec.rb b/spec/ruby/optional/capi/integer_spec.rb
index e26735824e8ff4..f17737456959d8 100644
--- a/spec/ruby/optional/capi/integer_spec.rb
+++ b/spec/ruby/optional/capi/integer_spec.rb
@@ -1,4 +1,4 @@
-# -*- encoding: binary -*-
+# encoding: binary
 require_relative 'spec_helper'
 
 load_extension("integer")
@@ -140,6 +140,23 @@
               result.should == -1
               @words.should == "\x11\x32\x54\x76\x98\xBA\xDC\xFE"
             end
+
+            it "converts numbers near the fixnum limit successfully" do
+              result = @s.rb_integer_pack(0x7123_4567_89ab_cdef, @words, 1, 8, 0,
+                CApiIntegerSpecs::NATIVE|CApiIntegerSpecs::PACK_2COMP)
+              result.should == 1
+              @words.should == "\xEF\xCD\xAB\x89\x67\x45\x23\x71"
+
+              result = @s.rb_integer_pack(2**62-1, @words, 1, 8, 0,
+                CApiIntegerSpecs::NATIVE|CApiIntegerSpecs::PACK_2COMP)
+              result.should == 1
+              @words.should == "\xFF\xFF\xFF\xFF\xFF\xFF\xFF\x3F"
+
+              result = @s.rb_integer_pack(2**63-1, @words, 1, 8, 0,
+                CApiIntegerSpecs::NATIVE|CApiIntegerSpecs::PACK_2COMP)
+              result.should == 1
+              @words.should == "\xFF\xFF\xFF\xFF\xFF\xFF\xFF\x7F"
+            end
           end
         end
       end
diff --git a/spec/ruby/optional/capi/io_spec.rb b/spec/ruby/optional/capi/io_spec.rb
index e5fb86a8373daf..ab7a7fc8f6f661 100644
--- a/spec/ruby/optional/capi/io_spec.rb
+++ b/spec/ruby/optional/capi/io_spec.rb
@@ -1,4 +1,5 @@
 require_relative 'spec_helper'
+require_relative '../../fixtures/io'
 
 load_extension('io')
 
@@ -261,24 +262,38 @@
     end
   end
 
-  ruby_version_is "3.1" do
-    describe "rb_io_maybe_wait_writable" do
-      it "returns mask for events if operation was interrupted" do
-        @o.rb_io_maybe_wait_writable(Errno::EINTR::Errno, @w_io, nil).should == IO::WRITABLE
-      end
+  describe "rb_io_maybe_wait_writable" do
+    it "returns mask for events if operation was interrupted" do
+      @o.rb_io_maybe_wait_writable(Errno::EINTR::Errno, @w_io, nil).should == IO::WRITABLE
+    end
 
-      it "returns 0 if there is no error condition" do
-        @o.rb_io_maybe_wait_writable(0, @w_io, nil).should == 0
-      end
+    it "returns 0 if there is no error condition" do
+      @o.rb_io_maybe_wait_writable(0, @w_io, nil).should == 0
+    end
 
-      it "raises an IOError if the IO is closed" do
-        @w_io.close
-        -> { @o.rb_io_maybe_wait_writable(0, @w_io, nil) }.should raise_error(IOError, "closed stream")
-      end
+    it "raises an IOError if the IO is closed" do
+      @w_io.close
+      -> { @o.rb_io_maybe_wait_writable(0, @w_io, nil) }.should raise_error(IOError, "closed stream")
+    end
 
-      it "raises an IOError if the IO is not initialized" do
-        -> { @o.rb_io_maybe_wait_writable(0, IO.allocate, nil) }.should raise_error(IOError, "uninitialized stream")
+    it "raises an IOError if the IO is not initialized" do
+      -> { @o.rb_io_maybe_wait_writable(0, IO.allocate, nil) }.should raise_error(IOError, "uninitialized stream")
+    end
+
+    it "can be interrupted" do
+      IOSpec.exhaust_write_buffer(@w_io)
+      start = Process.clock_gettime(Process::CLOCK_MONOTONIC)
+
+      t = Thread.new do
+        @o.rb_io_maybe_wait_writable(0, @w_io, 10)
       end
+
+      Thread.pass until t.stop?
+      t.kill
+      t.join
+
+      finish = Process.clock_gettime(Process::CLOCK_MONOTONIC)
+      (finish - start).should < 9
     end
   end
 
@@ -332,37 +347,50 @@
       end
     end
 
-    ruby_version_is "3.1" do
-      describe "rb_io_maybe_wait_readable" do
-        it "returns mask for events if operation was interrupted" do
-          @o.rb_io_maybe_wait_readable(Errno::EINTR::Errno, @r_io, nil, false).should == IO::READABLE
-        end
+    describe "rb_io_maybe_wait_readable" do
+      it "returns mask for events if operation was interrupted" do
+        @o.rb_io_maybe_wait_readable(Errno::EINTR::Errno, @r_io, nil, false).should == IO::READABLE
+      end
+
+      it "returns 0 if there is no error condition" do
+        @o.rb_io_maybe_wait_readable(0, @r_io, nil, false).should == 0
+      end
 
-        it "returns 0 if there is no error condition" do
-          @o.rb_io_maybe_wait_readable(0, @r_io, nil, false).should == 0
+      it "blocks until the io is readable and returns events that actually occurred" do
+        @o.instance_variable_set :@write_data, false
+        thr = Thread.new do
+          Thread.pass until @o.instance_variable_get(:@write_data)
+          @w_io.write "rb_io_wait_readable"
         end
 
-        it "blocks until the io is readable and returns events that actually occurred" do
-          @o.instance_variable_set :@write_data, false
-          thr = Thread.new do
-            Thread.pass until @o.instance_variable_get(:@write_data)
-            @w_io.write "rb_io_wait_readable"
-          end
+        @o.rb_io_maybe_wait_readable(Errno::EAGAIN::Errno, @r_io, IO::READABLE, true).should == IO::READABLE
+        @o.instance_variable_get(:@read_data).should == "rb_io_wait_re"
+
+        thr.join
+      end
 
-          @o.rb_io_maybe_wait_readable(Errno::EAGAIN::Errno, @r_io, IO::READABLE, true).should == IO::READABLE
-          @o.instance_variable_get(:@read_data).should == "rb_io_wait_re"
+      it "can be interrupted" do
+        start = Process.clock_gettime(Process::CLOCK_MONOTONIC)
 
-          thr.join
+        t = Thread.new do
+          @o.rb_io_maybe_wait_readable(0, @r_io, 10, false)
         end
 
-        it "raises an IOError if the IO is closed" do
-          @r_io.close
-          -> { @o.rb_io_maybe_wait_readable(0, @r_io, nil, false) }.should raise_error(IOError, "closed stream")
-        end
+        Thread.pass until t.stop?
+        t.kill
+        t.join
 
-        it "raises an IOError if the IO is not initialized" do
-          -> { @o.rb_io_maybe_wait_readable(0, IO.allocate, nil, false) }.should raise_error(IOError, "uninitialized stream")
-        end
+        finish = Process.clock_gettime(Process::CLOCK_MONOTONIC)
+        (finish - start).should < 9
+      end
+
+      it "raises an IOError if the IO is closed" do
+        @r_io.close
+        -> { @o.rb_io_maybe_wait_readable(0, @r_io, nil, false) }.should raise_error(IOError, "closed stream")
+      end
+
+      it "raises an IOError if the IO is not initialized" do
+        -> { @o.rb_io_maybe_wait_readable(0, IO.allocate, nil, false) }.should raise_error(IOError, "uninitialized stream")
       end
     end
   end
@@ -405,45 +433,241 @@
     end
   end
 
-  ruby_version_is "3.1" do
-    describe "rb_io_maybe_wait" do
-      it "waits til an fd is ready for reading" do
-        start = false
-        thr = Thread.new do
-          start = true
-          sleep 0.05
-          @w_io.write "rb_io_maybe_wait"
-        end
+  describe "rb_io_maybe_wait" do
+    it "waits til an fd is ready for reading" do
+      start = false
+      thr = Thread.new do
+        start = true
+        sleep 0.05
+        @w_io.write "rb_io_maybe_wait"
+      end
 
-        Thread.pass until start
+      Thread.pass until start
 
-        @o.rb_io_maybe_wait(Errno::EAGAIN::Errno, @r_io, IO::READABLE, nil).should == IO::READABLE
+      @o.rb_io_maybe_wait(Errno::EAGAIN::Errno, @r_io, IO::READABLE, nil).should == IO::READABLE
 
-        thr.join
+      thr.join
+    end
+
+    it "returns mask for events if operation was interrupted" do
+      @o.rb_io_maybe_wait(Errno::EINTR::Errno, @w_io, IO::WRITABLE, nil).should == IO::WRITABLE
+    end
+
+    it "raises an IOError if the IO is closed" do
+      @w_io.close
+      -> { @o.rb_io_maybe_wait(0, @w_io, IO::WRITABLE, nil) }.should raise_error(IOError, "closed stream")
+    end
+
+    it "raises an IOError if the IO is not initialized" do
+      -> { @o.rb_io_maybe_wait(0, IO.allocate, IO::WRITABLE, nil) }.should raise_error(IOError, "uninitialized stream")
+    end
+
+    it "can be interrupted when waiting for READABLE event" do
+      start = Process.clock_gettime(Process::CLOCK_MONOTONIC)
+
+      t = Thread.new do
+        @o.rb_io_maybe_wait(0, @r_io, IO::READABLE, 10)
       end
 
-      it "returns mask for events if operation was interrupted" do
-        @o.rb_io_maybe_wait(Errno::EINTR::Errno, @w_io, IO::WRITABLE, nil).should == IO::WRITABLE
+      Thread.pass until t.stop?
+      t.kill
+      t.join
+
+      finish = Process.clock_gettime(Process::CLOCK_MONOTONIC)
+      (finish - start).should < 9
+    end
+
+    it "can be interrupted when waiting for WRITABLE event" do
+      IOSpec.exhaust_write_buffer(@w_io)
+      start = Process.clock_gettime(Process::CLOCK_MONOTONIC)
+
+      t = Thread.new do
+        @o.rb_io_maybe_wait(0, @w_io, IO::WRITABLE, 10)
       end
 
-      it "returns false if there is no error condition" do
-        @o.rb_io_maybe_wait(0, @w_io, IO::WRITABLE, nil).should == false
+      Thread.pass until t.stop?
+      t.kill
+      t.join
+
+      finish = Process.clock_gettime(Process::CLOCK_MONOTONIC)
+      (finish - start).should < 9
+    end
+  end
+
+  ruby_version_is "3.3" do
+    describe "rb_io_mode" do
+      it "returns the mode" do
+        (@o.rb_io_mode(@r_io) & 0b11).should == 0b01
+        (@o.rb_io_mode(@w_io) & 0b11).should == 0b10
+        (@o.rb_io_mode(@rw_io) & 0b11).should == 0b11
       end
+    end
 
-      it "raises an IOError if the IO is closed" do
-        @w_io.close
-        -> { @o.rb_io_maybe_wait(0, @w_io, IO::WRITABLE, nil) }.should raise_error(IOError, "closed stream")
+    describe "rb_io_path" do
+      it "returns the IO#path" do
+        @o.rb_io_path(@r_io).should == @r_io.path
+        @o.rb_io_path(@rw_io).should == @rw_io.path
+        @o.rb_io_path(@rw_io).should == @name
       end
+    end
 
-      it "raises an IOError if the IO is not initialized" do
-        -> { @o.rb_io_maybe_wait(0, IO.allocate, IO::WRITABLE, nil) }.should raise_error(IOError, "uninitialized stream")
+    describe "rb_io_closed_p" do
+      it "returns false when io is not closed" do
+        @o.rb_io_closed_p(@r_io).should == false
+        @r_io.closed?.should == false
+      end
+
+      it "returns true when io is closed" do
+        @r_io.close
+
+        @o.rb_io_closed_p(@r_io).should == true
+        @r_io.closed?.should == true
+      end
+    end
+
+    quarantine! do # "Errno::EBADF: Bad file descriptor" at closing @r_io, @rw_io etc in the after :each hook
+      describe "rb_io_open_descriptor" do
+        it "creates a new IO instance" do
+          io = @o.rb_io_open_descriptor(File, @r_io.fileno, 0, "a.txt", 60, "US-ASCII", "UTF-8", 0, {})
+          io.should.is_a?(IO)
+        end
+
+        it "return an instance of the specified class" do
+          io = @o.rb_io_open_descriptor(File, @r_io.fileno, 0, "a.txt", 60, "US-ASCII", "UTF-8", 0, {})
+          io.class.should == File
+
+          io = @o.rb_io_open_descriptor(IO, @r_io.fileno, 0, "a.txt", 60, "US-ASCII", "UTF-8", 0, {})
+          io.class.should == IO
+        end
+
+        it "sets the specified file descriptor" do
+          io = @o.rb_io_open_descriptor(File, @r_io.fileno, 0, "a.txt", 60, "US-ASCII", "UTF-8", 0, {})
+          io.fileno.should == @r_io.fileno
+        end
+
+        it "sets the specified path" do
+          io = @o.rb_io_open_descriptor(File, @r_io.fileno, 0, "a.txt", 60, "US-ASCII", "UTF-8", 0, {})
+          io.path.should == "a.txt"
+        end
+
+        it "sets the specified mode" do
+          io = @o.rb_io_open_descriptor(File, @r_io.fileno, CApiIOSpecs::FMODE_BINMODE, "a.txt", 60, "US-ASCII", "UTF-8", 0, {})
+          io.should.binmode?
+
+          io = @o.rb_io_open_descriptor(File, @r_io.fileno, CApiIOSpecs::FMODE_TEXTMODE, "a.txt", 60, "US-ASCII", "UTF-8", 0, {})
+          io.should_not.binmode?
+        end
+
+        it "sets the specified timeout" do
+          io = @o.rb_io_open_descriptor(File, @r_io.fileno, 0, "a.txt", 60, "US-ASCII", "UTF-8", 0, {})
+          io.timeout.should == 60
+        end
+
+        it "sets the specified internal encoding" do
+          io = @o.rb_io_open_descriptor(File, @r_io.fileno, 0, "a.txt", 60, "US-ASCII", "UTF-8", 0, {})
+          io.internal_encoding.should == Encoding::US_ASCII
+        end
+
+        it "sets the specified external encoding" do
+          io = @o.rb_io_open_descriptor(File, @r_io.fileno, 0, "a.txt", 60, "US-ASCII", "UTF-8", 0, {})
+          io.external_encoding.should == Encoding::UTF_8
+        end
+
+        it "does not apply the specified encoding flags" do
+          name = tmp("rb_io_open_descriptor_specs")
+          File.write(name, "123\r\n456\n89")
+          file = File.open(name, "r")
+
+          io = @o.rb_io_open_descriptor(File, file.fileno, CApiIOSpecs::FMODE_READABLE, "a.txt", 60, "US-ASCII", "UTF-8", CApiIOSpecs::ECONV_UNIVERSAL_NEWLINE_DECORATOR, {})
+          io.read_nonblock(20).should == "123\r\n456\n89"
+        ensure
+          file.close
+          rm_r name
+        end
+
+        it "ignores the IO open options" do
+          io = @o.rb_io_open_descriptor(File, @r_io.fileno, 0, "a.txt", 60, "US-ASCII", "UTF-8", 0, {external_encoding: "windows-1251"})
+          io.external_encoding.should == Encoding::UTF_8
+
+          io = @o.rb_io_open_descriptor(File, @r_io.fileno, 0, "a.txt", 60, "US-ASCII", "UTF-8", 0, {internal_encoding: "windows-1251"})
+          io.internal_encoding.should == Encoding::US_ASCII
+
+          io = @o.rb_io_open_descriptor(File, @r_io.fileno, 0, "a.txt", 60, "US-ASCII", "UTF-8", 0, {encoding: "windows-1251:binary"})
+          io.external_encoding.should == Encoding::UTF_8
+          io.internal_encoding.should == Encoding::US_ASCII
+
+          io = @o.rb_io_open_descriptor(File, @r_io.fileno, 0, "a.txt", 60, "US-ASCII", "UTF-8", 0, {textmode: false})
+          io.should_not.binmode?
+
+          io = @o.rb_io_open_descriptor(File, @r_io.fileno, 0, "a.txt", 60, "US-ASCII", "UTF-8", 0, {binmode: true})
+          io.should_not.binmode?
+
+          io = @o.rb_io_open_descriptor(File, @r_io.fileno, 0, "a.txt", 60, "US-ASCII", "UTF-8", 0, {autoclose: false})
+          io.should.autoclose?
+
+          io = @o.rb_io_open_descriptor(File, @r_io.fileno, 0, "a.txt", 60, "US-ASCII", "UTF-8", 0, {path: "a.txt"})
+          io.path.should == "a.txt"
+        end
+
+        it "ignores the IO encoding options" do
+          io = @o.rb_io_open_descriptor(File, @w_io.fileno, CApiIOSpecs::FMODE_WRITABLE, "a.txt", 60, "US-ASCII", "UTF-8", 0, {crlf_newline: true})
+
+          io.write("123\r\n456\n89")
+          io.flush
+
+          @r_io.read_nonblock(20).should == "123\r\n456\n89"
+        end
+
+        it "allows wrong mode" do
+          io = @o.rb_io_open_descriptor(File, @w_io.fileno, CApiIOSpecs::FMODE_READABLE, "a.txt", 60, "US-ASCII", "UTF-8", 0, {})
+          io.should.is_a?(File)
+
+          platform_is_not :windows do
+            -> { io.read_nonblock(1) }.should raise_error(Errno::EBADF)
+          end
+
+          platform_is :windows do
+            -> { io.read_nonblock(1) }.should raise_error(IO::EWOULDBLOCKWaitReadable)
+          end
+        end
+
+        it "tolerates NULL as rb_io_encoding *encoding parameter" do
+          io = @o.rb_io_open_descriptor_without_encoding(File, @r_io.fileno, 0, "a.txt", 60)
+          io.should.is_a?(File)
+        end
+
+        it "deduplicates path String" do
+          path = "a.txt".dup
+          io = @o.rb_io_open_descriptor(File, @r_io.fileno, 0, path, 60, "US-ASCII", "UTF-8", 0, {})
+          io.path.should_not equal(path)
+
+          path = "a.txt".freeze
+          io = @o.rb_io_open_descriptor(File, @r_io.fileno, 0, path, 60, "US-ASCII", "UTF-8", 0, {})
+          io.path.should_not equal(path)
+        end
+
+        it "calls #to_str to convert a path to a String" do
+          path = Object.new
+          def path.to_str; "a.txt"; end
+
+          io = @o.rb_io_open_descriptor(File, @r_io.fileno, 0, path, 60, "US-ASCII", "UTF-8", 0, {})
+
+          io.path.should == "a.txt"
+        end
+      end
+    end
+  end
+
+  ruby_version_is "3.4" do
+    describe "rb_io_maybe_wait" do
+      it "returns nil if there is no error condition" do
+        @o.rb_io_maybe_wait(0, @w_io, IO::WRITABLE, nil).should == nil
       end
     end
   end
 end
 
 describe "rb_fd_fix_cloexec" do
-
   before :each do
     @o = CApiIOSpecs.new
 
diff --git a/spec/ruby/optional/capi/kernel_spec.rb b/spec/ruby/optional/capi/kernel_spec.rb
index 17c49b21555eac..d915a72c22af75 100644
--- a/spec/ruby/optional/capi/kernel_spec.rb
+++ b/spec/ruby/optional/capi/kernel_spec.rb
@@ -3,11 +3,19 @@
 
 kernel_path = load_extension("kernel")
 
+class CApiKernelSpecs::Exc < StandardError
+end
+exception_class = CApiKernelSpecs::Exc
+
 describe "C-API Kernel function" do
   before :each do
     @s = CApiKernelSpecs.new
   end
 
+  after :each do
+    @s.rb_errinfo.should == nil
+  end
+
   describe "rb_block_given_p" do
     it "returns false if no block is passed" do
       @s.should_not.rb_block_given_p
@@ -78,6 +86,22 @@
       -> { @s.rb_raise(h) }.should raise_error(TypeError)
       h[:stage].should == :before
     end
+
+    it "re-raises a rescued exception" do
+      -> do
+        begin
+          raise StandardError, "aaa"
+        rescue Exception
+          begin
+            @s.rb_raise({})
+          rescue TypeError
+          end
+
+          # should raise StandardError "aaa"
+          raise
+        end
+      end.should raise_error(StandardError, "aaa")
+    end
   end
 
   describe "rb_throw" do
@@ -132,26 +156,16 @@
   end
 
   describe "rb_warn" do
-    before :each do
-      @stderr, $stderr = $stderr, IOStub.new
-      @verbose = $VERBOSE
-    end
-
-    after :each do
-      $stderr = @stderr
-      $VERBOSE = @verbose
-    end
-
     it "prints a message to $stderr if $VERBOSE evaluates to true" do
-      $VERBOSE = true
-      @s.rb_warn("This is a warning")
-      $stderr.should =~ /This is a warning/
+      -> {
+        @s.rb_warn("This is a warning")
+      }.should complain(/warning: This is a warning/, verbose: true)
     end
 
     it "prints a message to $stderr if $VERBOSE evaluates to false" do
-      $VERBOSE = false
-      @s.rb_warn("This is a warning")
-      $stderr.should =~ /This is a warning/
+      -> {
+        @s.rb_warn("This is a warning")
+      }.should complain(/warning: This is a warning/, verbose: false)
     end
   end
 
@@ -173,13 +187,35 @@
     it "raises an exception from the given error" do
       -> do
         @s.rb_syserr_fail(Errno::EINVAL::Errno, "additional info")
-      end.should raise_error(Errno::EINVAL, /additional info/)
+      end.should raise_error(Errno::EINVAL, "Invalid argument - additional info")
     end
 
     it "can take a NULL message" do
       -> do
         @s.rb_syserr_fail(Errno::EINVAL::Errno, nil)
-      end.should raise_error(Errno::EINVAL)
+      end.should raise_error(Errno::EINVAL, "Invalid argument")
+    end
+
+    it "uses some kind of string as message when errno is unknown" do
+      -> { @s.rb_syserr_fail(-10, nil) }.should raise_error(SystemCallError, /[[:graph:]]+/)
+    end
+  end
+
+  describe "rb_syserr_fail_str" do
+    it "raises an exception from the given error" do
+      -> do
+        @s.rb_syserr_fail_str(Errno::EINVAL::Errno, "additional info")
+      end.should raise_error(Errno::EINVAL, "Invalid argument - additional info")
+    end
+
+    it "can take nil as a message" do
+      -> do
+        @s.rb_syserr_fail_str(Errno::EINVAL::Errno, nil)
+      end.should raise_error(Errno::EINVAL, "Invalid argument")
+    end
+
+    it "uses some kind of string as message when errno is unknown" do
+      -> { @s.rb_syserr_fail_str(-10, nil) }.should raise_error(SystemCallError, /[[:graph:]]+/)
     end
   end
 
@@ -206,10 +242,8 @@
       @s.rb_yield(1) { break 73 }.should == 73
     end
 
-    platform_is_not :"solaris2.10" do # NOTE: i386-pc-solaris2.10
-      it "rb_yield through a callback to a block that breaks with a value returns the value" do
-        @s.rb_yield_indirected(1) { break 73 }.should == 73
-      end
+    it "rb_yield through a callback to a block that breaks with a value returns the value" do
+      @s.rb_yield_indirected(1) { break 73 }.should == 73
     end
 
     it "rb_yield to block passed to enumerator" do
@@ -295,7 +329,7 @@
     it "will allow cleanup code to run after a raise" do
       proof = [] # Hold proof of work performed after the yield.
       -> do
-        @s.rb_protect_yield(77, proof) { |x| raise NameError}
+        @s.rb_protect_yield(77, proof) { |x| raise NameError }
       end.should raise_error(NameError)
       proof[0].should == 23
     end
@@ -303,7 +337,7 @@
     it "will return nil if an error was raised" do
       proof = [] # Hold proof of work performed after the yield.
       -> do
-        @s.rb_protect_yield(77, proof) { |x| raise NameError}
+        @s.rb_protect_yield(77, proof) { |x| raise NameError }
       end.should raise_error(NameError)
       proof[0].should == 23
       proof[1].should == nil
@@ -311,14 +345,21 @@
 
     it "accepts NULL as status and returns nil if it failed" do
       @s.rb_protect_null_status(42) { |x| x + 1 }.should == 43
-      @s.rb_protect_null_status(42) { |x| raise }.should == nil
+      @s.rb_protect_null_status(42) { |x| raise NameError }.should == nil
+      @s.rb_errinfo().should.is_a? NameError
+    ensure
+      @s.rb_set_errinfo(nil)
     end
 
-    it "populates errinfo with the captured exception" do
+    it "populates rb_errinfo() with the captured exception" do
       proof = []
-      @s.rb_protect_errinfo(77, proof) { |x| raise NameError }.class.should == NameError
+      @s.rb_protect_ignore_status(77, proof) { |x| raise NameError }
+      @s.rb_errinfo().should.is_a? NameError
+      # Note: on CRuby $! is the NameError here, but not clear if that is desirable or bug
       proof[0].should == 23
       proof[1].should == nil
+    ensure
+      @s.rb_set_errinfo(nil)
     end
 
   end
@@ -382,9 +423,21 @@
       -> { @s.rb_rescue(@std_error_proc, nil, @std_error_proc, nil) }.should raise_error(StandardError)
     end
 
-    it "makes $! available only during the 'rescue function' execution" do
-      @s.rb_rescue(@std_error_proc, nil, -> *_ { $! }, nil).class.should == StandardError
+    it "sets $! and rb_errinfo() during the 'rescue function' execution" do
+      @s.rb_rescue(-> *_ { raise exception_class, '' }, nil, -> _, exc {
+        exc.should.is_a?(exception_class)
+        $!.should.equal?(exc)
+        @s.rb_errinfo.should.equal?(exc)
+      }, nil)
+
+      @s.rb_rescue(-> _ { @s.rb_raise({}) }, nil, -> _, exc {
+        exc.should.is_a?(TypeError)
+        $!.should.equal?(exc)
+        @s.rb_errinfo.should.equal?(exc)
+      }, nil)
+
       $!.should == nil
+      @s.rb_errinfo.should == nil
     end
 
     it "returns the break value if the passed function yields to a block with a break" do
@@ -402,7 +455,7 @@ def proc_caller
 
   describe "rb_rescue2" do
     it "only rescues if one of the passed exceptions is raised" do
-      proc = -> x { x }
+      proc = -> x, _exc { x }
       arg_error_proc = -> *_ { raise ArgumentError, '' }
       run_error_proc = -> *_ { raise RuntimeError, '' }
       type_error_proc = -> *_ { raise Exception, 'custom error' }
@@ -418,6 +471,23 @@ def proc_caller
         @s.rb_rescue2(-> *_ { raise RuntimeError, "foo" }, :no_exc, -> x { x }, :exc, Object.new, 42)
       }.should raise_error(TypeError, /class or module required/)
     end
+
+    it "sets $! and rb_errinfo() during the 'rescue function' execution" do
+      @s.rb_rescue2(-> *_ { raise exception_class, '' }, :no_exc, -> _, exc {
+        exc.should.is_a?(exception_class)
+        $!.should.equal?(exc)
+        @s.rb_errinfo.should.equal?(exc)
+      }, :exc, exception_class, ScriptError)
+
+      @s.rb_rescue2(-> *_ { @s.rb_raise({}) }, :no_exc, -> _, exc {
+        exc.should.is_a?(TypeError)
+        $!.should.equal?(exc)
+        @s.rb_errinfo.should.equal?(exc)
+      }, :exc, TypeError, ArgumentError)
+
+      $!.should == nil
+      @s.rb_errinfo.should == nil
+    end
   end
 
   describe "rb_catch" do
@@ -470,6 +540,40 @@ def proc_caller
     end
   end
 
+  describe "rb_category_warn" do
+    it "emits a warning into stderr" do
+      Warning[:deprecated] = true
+
+      -> {
+        @s.rb_category_warn_deprecated
+      }.should complain(/warning: foo/, verbose: true)
+    end
+
+    it "supports printf format modifiers" do
+      Warning[:deprecated] = true
+
+      -> {
+        @s.rb_category_warn_deprecated_with_integer_extra_value(42)
+      }.should complain(/warning: foo 42/, verbose: true)
+    end
+
+    it "does not emits a warning when a category is disabled" do
+      Warning[:deprecated] = false
+
+      -> {
+        @s.rb_category_warn_deprecated
+      }.should_not complain(verbose: true)
+    end
+
+    it "does not emits a warning when $VERBOSE is nil" do
+      Warning[:deprecated] = true
+
+      -> {
+        @s.rb_category_warn_deprecated
+      }.should_not complain(verbose: nil)
+    end
+  end
+
   describe "rb_ensure" do
     it "executes passed function and returns its value" do
       proc = -> x { x }
@@ -486,12 +590,33 @@ def proc_caller
 
     it "executes passed 'ensure function' when an exception is raised" do
       foo = nil
-      raise_proc = -> { raise '' }
+      raise_proc = -> _ { raise exception_class }
       ensure_proc = -> x { foo = x }
-      @s.rb_ensure(raise_proc, nil, ensure_proc, :foo) rescue nil
+      -> {
+        @s.rb_ensure(raise_proc, nil, ensure_proc, :foo)
+      }.should raise_error(exception_class)
       foo.should == :foo
     end
 
+    it "sets $! and rb_errinfo() during the 'ensure function' execution" do
+      -> {
+        @s.rb_ensure(-> _ { raise exception_class }, nil, -> _ {
+          $!.should.is_a?(exception_class)
+          @s.rb_errinfo.should.is_a?(exception_class)
+        }, nil)
+      }.should raise_error(exception_class)
+
+      -> {
+        @s.rb_ensure(-> _ { @s.rb_raise({}) }, nil, -> _ {
+          $!.should.is_a?(TypeError)
+          @s.rb_errinfo.should.is_a?(TypeError)
+        }, nil)
+      }.should raise_error(TypeError)
+
+      $!.should == nil
+      @s.rb_errinfo.should == nil
+    end
+
     it "raises the same exception raised inside passed function" do
       raise_proc = -> *_ { raise RuntimeError, 'foo' }
       proc = -> *_ { }
@@ -606,12 +731,12 @@ def sum(a, b)
 
     it "calls a private method" do
       object = CApiKernelSpecs::ClassWithPrivateMethod.new
-      @s.rb_funcallv(object, :private_method, []).should == 0
+      @s.rb_funcallv(object, :private_method, []).should == :private
     end
 
     it "calls a protected method" do
       object = CApiKernelSpecs::ClassWithProtectedMethod.new
-      @s.rb_funcallv(object, :protected_method, []).should == 0
+      @s.rb_funcallv(object, :protected_method, []).should == :protected
     end
   end
 
@@ -629,12 +754,12 @@ def m(*args, **kwargs)
 
     it "calls a private method" do
       object = CApiKernelSpecs::ClassWithPrivateMethod.new
-      @s.rb_funcallv_kw(object, :private_method, [{}]).should == 0
+      @s.rb_funcallv_kw(object, :private_method, [{}]).should == :private
     end
 
     it "calls a protected method" do
       object = CApiKernelSpecs::ClassWithProtectedMethod.new
-      @s.rb_funcallv_kw(object, :protected_method, [{}]).should == 0
+      @s.rb_funcallv_kw(object, :protected_method, [{}]).should == :protected
     end
 
     it "raises TypeError if the last argument is not a Hash" do
@@ -752,4 +877,45 @@ def method_public(*args, **kw, &block); [args, kw, block.call] end
       }.should raise_error(NoMethodError, /protected/)
     end
   end
+
+  describe "rb_check_funcall" do
+    it "calls a method" do
+      @s.rb_check_funcall(1, :+, [2]).should == 3
+    end
+
+    it "returns Qundef if the method is not defined" do
+      obj = Object.new
+      @s.rb_check_funcall(obj, :foo, []).should == :Qundef
+    end
+
+    it "uses #respond_to? to check if the method is defined" do
+      ScratchPad.record []
+      obj = Object.new
+      def obj.respond_to?(name, priv)
+        ScratchPad << name
+        name == :foo || super
+      end
+      def obj.method_missing(name, *args)
+        name == :foo ? [name, 42] : super
+      end
+      @s.rb_check_funcall(obj, :foo, []).should == [:foo, 42]
+      ScratchPad.recorded.should == [:foo]
+    end
+
+    it "calls a private method" do
+      object = CApiKernelSpecs::ClassWithPrivateMethod.new
+      @s.rb_check_funcall(object, :private_method, []).should == :private
+    end
+
+    it "calls a protected method" do
+      object = CApiKernelSpecs::ClassWithProtectedMethod.new
+      @s.rb_check_funcall(object, :protected_method, []).should == :protected
+    end
+  end
+
+  describe "rb_str_format" do
+    it "returns a string according to format and arguments" do
+      @s.rb_str_format(3, [10, 2.5, "test"], "%d %f %s").should == "10 2.500000 test"
+    end
+  end
 end
diff --git a/spec/ruby/optional/capi/module_spec.rb b/spec/ruby/optional/capi/module_spec.rb
index d7c0ab9c528091..b7684e566becdd 100644
--- a/spec/ruby/optional/capi/module_spec.rb
+++ b/spec/ruby/optional/capi/module_spec.rb
@@ -22,6 +22,8 @@
     it "sets a new constant on a module" do
       @m.rb_const_set(CApiModuleSpecs::C, :W, 7)
       CApiModuleSpecs::C::W.should == 7
+    ensure
+      CApiModuleSpecs::C.send(:remove_const, :W)
     end
 
     it "sets an existing constant's value" do
@@ -93,6 +95,8 @@
     it "defines a new constant on a module" do
       @m.rb_define_const(CApiModuleSpecs::C, "V", 7)
       CApiModuleSpecs::C::V.should == 7
+    ensure
+      CApiModuleSpecs::C.send(:remove_const, :V)
     end
 
     it "sets an existing constant's value" do
diff --git a/spec/ruby/optional/capi/mutex_spec.rb b/spec/ruby/optional/capi/mutex_spec.rb
index 34659974f5853e..71a2212e36c3ad 100644
--- a/spec/ruby/optional/capi/mutex_spec.rb
+++ b/spec/ruby/optional/capi/mutex_spec.rb
@@ -85,5 +85,18 @@
       callback = -> { @m.locked?.should be_true }
       @s.rb_mutex_synchronize(@m, callback)
     end
+
+    it "returns a value returned from a callback" do
+      callback = -> { :foo }
+      @s.rb_mutex_synchronize(@m, callback).should == :foo
+    end
+
+    it "calls a C-function that accepts and returns non-VALUE values" do
+      @s.rb_mutex_synchronize_with_naughty_callback(@m).should == 42
+    end
+
+    it "calls a native function" do
+      @s.rb_mutex_synchronize_with_native_callback(@m, 42).should == 42
+    end
   end
 end
diff --git a/spec/ruby/optional/capi/numeric_spec.rb b/spec/ruby/optional/capi/numeric_spec.rb
index 95213d3f2b9925..e9667da5ba1b9b 100644
--- a/spec/ruby/optional/capi/numeric_spec.rb
+++ b/spec/ruby/optional/capi/numeric_spec.rb
@@ -106,7 +106,7 @@
       @s.NUM2LONG(5).should == 5
     end
 
-    platform_is wordsize: 32 do
+    platform_is c_long_size: 32 do
       it "converts -1 to an signed number" do
         @s.NUM2LONG(-1).should == -1
       end
@@ -120,7 +120,7 @@
       end
     end
 
-    platform_is wordsize: 64 do
+    platform_is c_long_size: 64 do
       it "converts -1 to an signed number" do
         @s.NUM2LONG(-1).should == -1
       end
@@ -210,7 +210,7 @@
       @s.NUM2ULONG(5).should == 5
     end
 
-    platform_is wordsize: 32 do
+    platform_is c_long_size: 32 do
       it "converts -1 to an unsigned number" do
         @s.NUM2ULONG(-1).should == 4294967295
       end
@@ -231,7 +231,7 @@
       end
     end
 
-    platform_is wordsize: 64 do
+    platform_is c_long_size: 64 do
       it "converts -1 to an unsigned number" do
         @s.NUM2ULONG(-1).should == 18446744073709551615
       end
diff --git a/spec/ruby/optional/capi/object_spec.rb b/spec/ruby/optional/capi/object_spec.rb
index 6ee6d65680f52e..8b4d8a9bba0e58 100644
--- a/spec/ruby/optional/capi/object_spec.rb
+++ b/spec/ruby/optional/capi/object_spec.rb
@@ -686,11 +686,21 @@ def reach
     end
 
     it "returns false if object passed to it is not frozen" do
-      obj = ""
+      obj = +""
       @o.rb_obj_frozen_p(obj).should == false
     end
   end
 
+  describe "redefining frozen? works" do
+    it "allows an object to override frozen?" do
+      obj = CApiObjectRedefinitionSpecs.new
+
+      obj.frozen?.should == false
+      obj.freeze
+      obj.frozen?.should == true
+    end
+  end
+
   describe "rb_obj_taint" do
   end
 
@@ -700,7 +710,7 @@ def reach
     end
 
     it "does nothing when object isn't frozen" do
-      obj = ""
+      obj = +""
       -> { @o.rb_check_frozen(obj) }.should_not raise_error(TypeError)
     end
   end
@@ -888,15 +898,15 @@ def reach
       end
     end
 
-    # The `generic_iv_tbl` table and `*_generic_ivar` functions are for mutable
+    # The `generic_fields_tbl` table and `*_generic_ivar` functions are for mutable
     # objects which do not store ivars directly in MRI such as RString, because
     # there is no member iv_index_tbl (ivar table) such as in RObject and RClass.
 
     describe "rb_copy_generic_ivar for objects which do not store ivars directly" do
       it "copies the instance variables from one object to another" do
-        original = "abc"
+        original = +"abc"
         original.instance_variable_set(:@foo, :bar)
-        clone = "def"
+        clone = +"def"
         @o.rb_copy_generic_ivar(clone, original)
         clone.instance_variable_get(:@foo).should == :bar
       end
@@ -904,7 +914,7 @@ def reach
 
     describe "rb_free_generic_ivar for objects which do not store ivars directly" do
       it "removes the instance variables from an object" do
-        o = "abc"
+        o = +"abc"
         o.instance_variable_set(:@baz, :flibble)
         @o.rb_free_generic_ivar(o)
         o.instance_variables.should == []
diff --git a/spec/ruby/optional/capi/range_spec.rb b/spec/ruby/optional/capi/range_spec.rb
index 7a52dc7ff83fee..80c052e79a3f8f 100644
--- a/spec/ruby/optional/capi/range_spec.rb
+++ b/spec/ruby/optional/capi/range_spec.rb
@@ -69,7 +69,7 @@ def range_like.exclude_end?
   describe "rb_range_beg_len" do
     it "returns correct begin, length and result" do
       r = 2..5
-      begp, lenp, result = @s.rb_range_beg_len(r, 0, 0, 10, 0)
+      begp, lenp, result = @s.rb_range_beg_len(r, 10, 0)
       result.should be_true
       begp.should == 2
       lenp.should == 4
@@ -77,19 +77,155 @@ def range_like.exclude_end?
 
     it "returns nil when not in range" do
       r = 2..5
-      begp, lenp, result = @s.rb_range_beg_len(r, 0, 0, 1, 0)
+      begp, lenp, result = @s.rb_range_beg_len(r, 1, 0)
       result.should be_nil
     end
 
     it "raises a RangeError when not in range and err is 1" do
       r = -5..-1
-      -> { @s.rb_range_beg_len(r, 0, 0, 1, 1) }.should raise_error(RangeError)
+      -> { @s.rb_range_beg_len(r, 1, 1) }.should raise_error(RangeError)
     end
 
     it "returns nil when not in range and err is 0" do
       r = -5..-1
-      begp, lenp, result =  @s.rb_range_beg_len(r, 0, 0, 1, 0)
+      begp, lenp, result =  @s.rb_range_beg_len(r, 1, 0)
       result.should be_nil
     end
   end
+
+  describe "rb_arithmetic_sequence_extract" do
+    it "returns begin, end, step, exclude end of an instance of an Enumerator::ArithmeticSequence" do
+      enum = (10..20).step(5)
+      enum.should.kind_of?(Enumerator::ArithmeticSequence)
+
+      @s.rb_arithmetic_sequence_extract(enum).should == [1, 10, 20, 5, false]
+    end
+
+    it "returns begin, end, step, exclude end of an instance of a Range" do
+      range = (10..20)
+      @s.rb_arithmetic_sequence_extract(range).should == [1, 10, 20, 1, false]
+    end
+
+    it "returns begin, end, step, exclude end of a non-Range object with Range properties" do
+      object = Object.new
+      def object.begin
+        10
+      end
+      def object.end
+        20
+      end
+      def object.exclude_end?
+        false
+      end
+
+      @s.rb_arithmetic_sequence_extract(object).should == [1, 10, 20, 1, false]
+    end
+
+    it "returns failed status if given object is not Enumerator::ArithmeticSequence or Range or Range-like object" do
+      object = Object.new
+      @s.rb_arithmetic_sequence_extract(object).should == [0]
+    end
+  end
+
+  describe "rb_arithmetic_sequence_beg_len_step" do
+    it "returns correct begin, length, step and result" do
+      as = (2..5).step(5)
+      error_code = 0
+
+      success, beg, len, step = @s.rb_arithmetic_sequence_beg_len_step(as, 6, error_code)
+      success.should be_true
+
+      beg.should == 2
+      len.should == 4
+      step.should == 5
+    end
+
+    it "takes into account excluded end boundary" do
+      as = (2...5).step(1)
+      error_code = 0
+
+      success, _, len, _ = @s.rb_arithmetic_sequence_beg_len_step(as, 6, error_code)
+      success.should be_true
+      len.should == 3
+    end
+
+    it "adds length to negative begin boundary" do
+      as = (-2..5).step(1)
+      error_code = 0
+
+      success, beg, len, _ = @s.rb_arithmetic_sequence_beg_len_step(as, 6, error_code)
+      success.should be_true
+
+      beg.should == 4
+      len.should == 2
+    end
+
+    it "adds length to negative end boundary" do
+      as = (2..-1).step(1)
+      error_code = 0
+
+      success, beg, len, _ = @s.rb_arithmetic_sequence_beg_len_step(as, 6, error_code)
+      success.should be_true
+
+      beg.should == 2
+      len.should == 4
+    end
+
+    it "truncates arithmetic sequence length if end boundary greater than specified length value" do
+      as = (2..10).step(1)
+      error_code = 0
+
+      success, _, len, _ = @s.rb_arithmetic_sequence_beg_len_step(as, 6, error_code)
+      success.should be_true
+      len.should == 4
+    end
+
+    it "returns inverted begin and end boundaries when step is negative" do
+      as = (2..5).step(-2)
+      error_code = 0
+
+      success, beg, len, step = @s.rb_arithmetic_sequence_beg_len_step(as, 6, error_code)
+      success.should be_true
+
+      beg.should == 5
+      len.should == 0
+      step.should == -2
+    end
+
+    it "returns nil when not in range and error code = 0" do
+      as = (2..5).step(1)
+      error_code = 0
+
+      success, = @s.rb_arithmetic_sequence_beg_len_step(as, 1, error_code)
+      success.should be_nil
+    end
+
+    it "returns nil when not in range, negative boundaries and error code = 0" do
+      as = (-5..-1).step(1)
+      error_code = 0
+
+      success, = @s.rb_arithmetic_sequence_beg_len_step(as, 1, 0)
+      success.should be_nil
+    end
+
+    it "returns begin, length and step and doesn't raise a RangeError when not in range and error code = 1" do
+      as = (2..5).step(1)
+      error_code = 1
+
+      success, beg, len, step = @s.rb_arithmetic_sequence_beg_len_step(as, 1, error_code)
+      success.should be_true
+
+      beg.should == 2
+      len.should == 4
+      step.should == 1
+    end
+
+    it "returns nil and doesn't raise a RangeError when not in range, negative boundaries and error code = 1" do
+      as = (-5..-1).step(1)
+      error_code = 1
+
+      success, = @s.rb_arithmetic_sequence_beg_len_step(as, 1, error_code)
+      success.should be_nil
+    end
+  end
 end
diff --git a/spec/ruby/optional/capi/rbasic_spec.rb b/spec/ruby/optional/capi/rbasic_spec.rb
index 577f2060dade53..7b5b5b2fedd940 100644
--- a/spec/ruby/optional/capi/rbasic_spec.rb
+++ b/spec/ruby/optional/capi/rbasic_spec.rb
@@ -1,7 +1,9 @@
 require_relative 'spec_helper'
 require_relative 'shared/rbasic'
 load_extension("rbasic")
-load_extension("data")
+ruby_version_is ""..."3.4" do
+  load_extension("data")
+end
 load_extension("array")
 
 describe "RBasic support for regular objects" do
@@ -12,31 +14,35 @@
   it_should_behave_like :rbasic
 end
 
-describe "RBasic support for RData" do
-  before :all do
-    @specs = CApiRBasicRDataSpecs.new
-    @wrapping = CApiWrappedStructSpecs.new
-    @data = -> { [@wrapping.wrap_struct(1024), @wrapping.wrap_struct(1025)] }
-  end
-  it_should_behave_like :rbasic
+ruby_version_is ""..."3.4" do
+  describe "RBasic support for RData" do
+    before :all do
+      @specs = CApiRBasicRDataSpecs.new
+      @wrapping = CApiWrappedStructSpecs.new
+      @data = -> { [@wrapping.wrap_struct(1024), @wrapping.wrap_struct(1025)] }
+    end
+    it_should_behave_like :rbasic
 
-  it "supports user flags" do
-    obj, _ = @data.call
-    initial = @specs.get_flags(obj)
-    @specs.set_flags(obj, 1 << 14 | 1 << 16 | initial).should == 1 << 14 | 1 << 16 | initial
-    @specs.get_flags(obj).should == 1 << 14 | 1 << 16 | initial
-    @specs.set_flags(obj, initial).should == initial
-  end
+    it "supports user flags" do
+      obj, _ = @data.call
+      initial = @specs.get_flags(obj)
+      @specs.set_flags(obj, 1 << 14 | 1 << 16 | initial).should == 1 << 14 | 1 << 16 | initial
+      @specs.get_flags(obj).should == 1 << 14 | 1 << 16 | initial
+      @specs.set_flags(obj, initial).should == initial
+    end
+
+    it "supports copying the flags from one object over to the other" do
+      obj1, obj2 = @data.call
+      initial = @specs.get_flags(obj1)
+      @specs.get_flags(obj2).should == initial
+      @specs.set_flags(obj1, 1 << 14 | 1 << 16 | initial)
+      @specs.get_flags(obj1).should == 1 << 14 | 1 << 16 | initial
 
-  it "supports copying the flags from one object over to the other" do
-    obj1, obj2 = @data.call
-    initial = @specs.get_flags(obj1)
-    @specs.get_flags(obj2).should == initial
-    @specs.set_flags(obj1, 1 << 14 | 1 << 16 | initial)
-    @specs.copy_flags(obj2, obj1)
-    @specs.get_flags(obj2).should == 1 << 14 | 1 << 16 | initial
-    @specs.set_flags(obj1, initial)
-    @specs.copy_flags(obj2, obj1)
-    @specs.get_flags(obj2).should == initial
+      @specs.copy_flags(obj2, obj1)
+      @specs.get_flags(obj2).should == 1 << 14 | 1 << 16 | initial
+      @specs.set_flags(obj1, initial)
+      @specs.copy_flags(obj2, obj1)
+      @specs.get_flags(obj2).should == initial
+    end
   end
 end
diff --git a/spec/ruby/optional/capi/regexp_spec.rb b/spec/ruby/optional/capi/regexp_spec.rb
index af366e17a2678c..4b130ff66a067c 100644
--- a/spec/ruby/optional/capi/regexp_spec.rb
+++ b/spec/ruby/optional/capi/regexp_spec.rb
@@ -77,7 +77,7 @@
     end
 
     it "returns MatchData when used with rb_reg_match" do
-       @p.rb_reg_match_backref_get(/a/, 'ab')[0].should == 'a'
+      @p.rb_reg_match_backref_get(/a/, 'ab')[0].should == 'a'
     end
   end
 
diff --git a/spec/ruby/optional/capi/set_spec.rb b/spec/ruby/optional/capi/set_spec.rb
new file mode 100644
index 00000000000000..3433014ccd46e8
--- /dev/null
+++ b/spec/ruby/optional/capi/set_spec.rb
@@ -0,0 +1,96 @@
+require_relative 'spec_helper'
+
+load_extension("set")
+
+describe "C-API Set function" do
+  before :each do
+    @s = CApiSetSpecs.new
+  end
+
+  ruby_version_is "3.5" do
+    describe "rb_set_foreach" do
+      it "calls function with each element and arg" do
+        a = []
+        @s.rb_set_foreach(Set[1, 2], 3) {|*args| a.concat(args) }
+        a.should == [1, 3, 2, 3]
+      end
+
+      it "respects function return value" do
+        a = []
+        @s.rb_set_foreach(Set[1, 2], 3) do |*args|
+          a.concat(args)
+          false
+        end
+        a.should == [1, 3]
+      end
+    end
+
+    describe "rb_set_new" do
+      it "returns a new set" do
+        @s.rb_set_new.should == Set[]
+      end
+    end
+
+    describe "rb_set_new_capa" do
+      it "returns a new set" do
+        @s.rb_set_new_capa(3).should == Set[]
+      end
+    end
+
+    describe "rb_set_lookup" do
+      it "returns whether the element is in the set" do
+        set = Set[1]
+        @s.rb_set_lookup(set, 1).should == true
+        @s.rb_set_lookup(set, 2).should == false
+      end
+    end
+
+    describe "rb_set_add" do
+      it "adds element to set" do
+        set = Set[]
+        @s.rb_set_add(set, 1).should == true
+        set.should == Set[1]
+        @s.rb_set_add(set, 2).should == true
+        set.should == Set[1, 2]
+      end
+
+      it "returns false if element is already in set" do
+        set = Set[1]
+        @s.rb_set_add(set, 1).should == false
+        set.should == Set[1]
+      end
+    end
+
+    describe "rb_set_clear" do
+      it "empties and returns self" do
+        set = Set[1]
+        @s.rb_set_clear(set).should equal(set)
+        set.should == Set[]
+      end
+    end
+
+    describe "rb_set_delete" do
+      it "removes element from set" do
+        set = Set[1, 2]
+        @s.rb_set_delete(set, 1).should == true
+        set.should == Set[2]
+        @s.rb_set_delete(set, 2).should == true
+        set.should == Set[]
+      end
+
+      it "returns false if element is not already in set" do
+        set = Set[2]
+        @s.rb_set_delete(set, 1).should == false
+        set.should == Set[2]
+      end
+    end
+
+    describe "rb_set_size" do
+      it "returns number of elements in set" do
+        @s.rb_set_size(Set[]).should == 0
+        @s.rb_set_size(Set[1]).should == 1
+        @s.rb_set_size(Set[1,2]).should == 2
+      end
+    end
+  end
+end
diff --git a/spec/ruby/optional/capi/shared/rbasic.rb b/spec/ruby/optional/capi/shared/rbasic.rb
index 95c313714364a6..e3485d4b7b5346 100644
--- a/spec/ruby/optional/capi/shared/rbasic.rb
+++ b/spec/ruby/optional/capi/shared/rbasic.rb
@@ -1,8 +1,6 @@
 describe :rbasic, shared: true do
-
   before :all do
     specs = CApiRBasicSpecs.new
-    @taint = ruby_version_is(''...'3.1') ? specs.taint_flag : 0
     @freeze = specs.freeze_flag
   end
 
diff --git a/spec/ruby/optional/capi/spec_helper.rb b/spec/ruby/optional/capi/spec_helper.rb
index 2691aa1332200a..1076b206ecbdb6 100644
--- a/spec/ruby/optional/capi/spec_helper.rb
+++ b/spec/ruby/optional/capi/spec_helper.rb
@@ -74,12 +74,19 @@ def compile_extension(name)
         init_mkmf unless required
         create_makefile(ext, tmpdir)
       else
+        # Workaround for digest C-API specs to find the ruby/digest.h header
+        # when run in the CRuby repository via make test-spec
+        if MSpecScript.instance_variable_defined?(:@testing_ruby)
+          ruby_repository_extra_include_dir = "-I#{RbConfig::CONFIG.fetch("prefix")}/#{RbConfig::CONFIG.fetch("EXTOUT")}/include"
+        end
+
         File.write("extconf.rb", <<-RUBY)
           require 'mkmf'
           $ruby = ENV.values_at('RUBY_EXE', 'RUBY_FLAGS').join(' ')
           # MRI magic to consider building non-bundled extensions
           $extout = nil
           append_cflags '-Wno-declaration-after-statement'
+          #{"append_cflags #{ruby_repository_extra_include_dir.inspect}" if ruby_repository_extra_include_dir}
           create_makefile(#{ext.inspect})
         RUBY
         output = ruby_exe("extconf.rb")
diff --git a/spec/ruby/optional/capi/string_spec.rb b/spec/ruby/optional/capi/string_spec.rb
index 3a47fa9762fddc..be9cb9015f0d34 100644
--- a/spec/ruby/optional/capi/string_spec.rb
+++ b/spec/ruby/optional/capi/string_spec.rb
@@ -1,4 +1,5 @@
 # encoding: utf-8
+# frozen_string_literal: false
 require_relative 'spec_helper'
 require_relative '../../shared/string/times'
 
@@ -47,7 +48,7 @@ def inspect
   [Encoding::BINARY, Encoding::UTF_8].each do |enc|
     describe "rb_str_set_len on a #{enc.name} String" do
       before :each do
-        @str = "abcdefghij".force_encoding(enc)
+        @str = "abcdefghij".dup.force_encoding(enc)
         # Make sure to unshare the string
         @s.rb_str_modify(@str)
       end
@@ -99,7 +100,7 @@ def inspect
 
   describe "rb_str_set_len on a UTF-16 String" do
     before :each do
-      @str = "abcdefghij".force_encoding(Encoding::UTF_16BE)
+      @str = "abcdefghij".dup.force_encoding(Encoding::UTF_16BE)
       # Make sure to unshare the string
       @s.rb_str_modify(@str)
     end
@@ -112,7 +113,7 @@ def inspect
 
   describe "rb_str_set_len on a UTF-32 String" do
     before :each do
-      @str = "abcdefghijkl".force_encoding(Encoding::UTF_32BE)
+      @str = "abcdefghijkl".dup.force_encoding(Encoding::UTF_32BE)
       # Make sure to unshare the string
       @s.rb_str_modify(@str)
     end
@@ -231,7 +232,7 @@ def inspect
 
   describe "rb_usascii_str_new" do
     it "creates a new String with US-ASCII Encoding from a char buffer of len characters" do
-      str = "abc".force_encoding("us-ascii")
+      str = "abc".dup.force_encoding("us-ascii")
       result = @s.rb_usascii_str_new("abcdef", 3)
       result.should == str
       result.encoding.should == Encoding::US_ASCII
@@ -247,14 +248,14 @@ def inspect
 
     it "returns US-ASCII string for non-US-ASCII string literal" do
       str = @s.rb_usascii_str_new_lit_non_ascii
-      str.should == "r\xC3\xA9sum\xC3\xA9".force_encoding(Encoding::US_ASCII)
+      str.should == "r\xC3\xA9sum\xC3\xA9".dup.force_encoding(Encoding::US_ASCII)
       str.encoding.should == Encoding::US_ASCII
     end
   end
 
   describe "rb_usascii_str_new_cstr" do
     it "creates a new String with US-ASCII Encoding" do
-      str = "abc".force_encoding("us-ascii")
+      str = "abc".dup.force_encoding("us-ascii")
       result = @s.rb_usascii_str_new_cstr("abc")
       result.should == str
       result.encoding.should == Encoding::US_ASCII
@@ -418,7 +419,7 @@ def inspect
 
   describe "rb_enc_str_buf_cat" do
     it "concatenates a C string literal to a ruby string with the given encoding" do
-      input = "hello ".force_encoding(Encoding::US_ASCII)
+      input = "hello ".dup.force_encoding(Encoding::US_ASCII)
       result = @s.rb_enc_str_buf_cat(input, "résumé", Encoding::UTF_8)
       result.should == "hello résumé"
       result.encoding.should == Encoding::UTF_8
@@ -448,6 +449,20 @@ def inspect
     end
   end
 
+  describe "rb_str_strlen" do
+    it 'returns 0 as the length of an empty string' do
+      @s.rb_str_strlen('').should == 0
+    end
+
+    it 'returns the number of characters in a string' do
+      @s.rb_str_strlen('hello').should == 5
+    end
+
+    it 'returns the number of characters in a string with multi-byte characters' do
+      @s.rb_str_strlen('こんにちは').should == 5
+    end
+  end
+
   describe "rb_str_split" do
     it "splits strings over a splitter" do
       @s.rb_str_split("Hello,Goodbye").should == ["Hello", "Goodbye"]
@@ -498,29 +513,10 @@ def inspect
     end
   end
 
-  describe "rb_fstring" do
-    it 'returns self if the String is frozen' do
-      input  = 'foo'.freeze
-      output = @s.rb_fstring(input)
-
-      output.should equal(input)
-      output.should.frozen?
-    end
-
-    it 'returns a frozen copy if the String is not frozen' do
-      input  = 'foo'
-      output = @s.rb_fstring(input)
-
-      output.should.frozen?
-      output.should_not equal(input)
-      output.should == 'foo'
-    end
-  end
-
   describe "rb_str_subseq" do
     it "returns a byte-indexed substring" do
-      str = "\x00\x01\x02\x03\x04".force_encoding("binary")
-      @s.rb_str_subseq(str, 1, 2).should == "\x01\x02".force_encoding("binary")
+      str = "\x00\x01\x02\x03\x04".dup.force_encoding("binary")
+      @s.rb_str_subseq(str, 1, 2).should == "\x01\x02".dup.force_encoding("binary")
     end
   end
 
@@ -731,7 +727,7 @@ def inspect
     end
 
     it "increases the size of the string" do
-      expected = "test".force_encoding("US-ASCII")
+      expected = "test".dup.force_encoding("US-ASCII")
       str = @s.rb_str_resize(expected.dup, 12)
       str.size.should == 12
       str.bytesize.should == 12
@@ -862,11 +858,11 @@ def inspect
 #     it "transcodes a String to Encoding.default_internal if it is set" do
 #       Encoding.default_internal = Encoding::EUC_JP
 #
-#  -      a = "\xE3\x81\x82\xe3\x82\x8c".force_encoding("utf-8")
+#  -      a = "\xE3\x81\x82\xe3\x82\x8c".dup.force_encoding("utf-8")
 #  +      a = [0xE3, 0x81, 0x82, 0xe3, 0x82, 0x8c].pack('C6').force_encoding("utf-8")
 #         s = @s.rb_external_str_new_with_enc(a, a.bytesize, Encoding::UTF_8)
 #  -
-#  -      s.should == "\xA4\xA2\xA4\xEC".force_encoding("euc-jp")
+#  -      s.should == "\xA4\xA2\xA4\xEC".dup.force_encoding("euc-jp")
 #  +      x = [0xA4, 0xA2, 0xA4, 0xEC].pack('C4')#.force_encoding('binary')
 #  +      s.should == x
 #         s.encoding.should equal(Encoding::EUC_JP)
@@ -886,7 +882,7 @@ def inspect
   describe "rb_locale_str_new" do
     it "returns a String with 'locale' encoding" do
       s = @s.rb_locale_str_new("abc", 3)
-      s.should == "abc".force_encoding(Encoding.find("locale"))
+      s.should == "abc".dup.force_encoding(Encoding.find("locale"))
       s.encoding.should equal(Encoding.find("locale"))
     end
   end
@@ -894,33 +890,37 @@ def inspect
   describe "rb_locale_str_new_cstr" do
     it "returns a String with 'locale' encoding" do
       s = @s.rb_locale_str_new_cstr("abc")
-      s.should == "abc".force_encoding(Encoding.find("locale"))
+      s.should == "abc".dup.force_encoding(Encoding.find("locale"))
       s.encoding.should equal(Encoding.find("locale"))
     end
   end
 
   describe "rb_str_conv_enc" do
     it "returns the original String when to encoding is not specified" do
-      a = "abc".force_encoding("us-ascii")
+      a = "abc".dup.force_encoding("us-ascii")
       @s.rb_str_conv_enc(a, Encoding::US_ASCII, nil).should equal(a)
     end
 
     it "returns the original String if a transcoding error occurs" do
-      a = [0xEE].pack('C').force_encoding("utf-8")
-      @s.rb_str_conv_enc(a, Encoding::UTF_8, Encoding::EUC_JP).should equal(a)
+      a = [0xEE].pack('C').force_encoding(Encoding::UTF_8)
+      @s.rb_str_conv_enc(a, Encoding::UTF_8, Encoding::EUC_JP).should.equal?(a)
+      a.encoding.should == Encoding::UTF_8
+
+      a = "\x80".b
+      @s.rb_str_conv_enc(a, Encoding::BINARY, Encoding::UTF_8).should.equal?(a)
+      a.encoding.should == Encoding::BINARY
     end
 
     it "returns a transcoded String" do
-      a = "\xE3\x81\x82\xE3\x82\x8C".force_encoding("utf-8")
+      a = "\xE3\x81\x82\xE3\x82\x8C".dup.force_encoding(Encoding::UTF_8)
       result = @s.rb_str_conv_enc(a, Encoding::UTF_8, Encoding::EUC_JP)
-      x = [0xA4, 0xA2, 0xA4, 0xEC].pack('C4').force_encoding('utf-8')
-      result.should == x.force_encoding("euc-jp")
-      result.encoding.should equal(Encoding::EUC_JP)
+      result.should == [0xA4, 0xA2, 0xA4, 0xEC].pack('C4').force_encoding(Encoding::EUC_JP)
+      result.encoding.should == Encoding::EUC_JP
     end
 
     describe "when the String encoding is equal to the destination encoding" do
       it "returns the original String" do
-        a = "abc".force_encoding("us-ascii")
+        a = "abc".dup.force_encoding("us-ascii")
         @s.rb_str_conv_enc(a, Encoding::US_ASCII, Encoding::US_ASCII).should equal(a)
       end
 
@@ -930,7 +930,7 @@ def inspect
       end
 
       it "returns the origin String if the destination encoding is BINARY" do
-        a = "abc".force_encoding("binary")
+        a = "abc".dup.force_encoding("binary")
         @s.rb_str_conv_enc(a, Encoding::US_ASCII, Encoding::BINARY).should equal(a)
       end
     end
@@ -938,7 +938,7 @@ def inspect
 
   describe "rb_str_conv_enc_opts" do
     it "returns the original String when to encoding is not specified" do
-      a = "abc".force_encoding("us-ascii")
+      a = "abc".dup.force_encoding("us-ascii")
       @s.rb_str_conv_enc_opts(a, Encoding::US_ASCII, nil, 0, nil).should equal(a)
     end
 
@@ -949,7 +949,7 @@ def inspect
     end
 
     it "returns a transcoded String" do
-      a = "\xE3\x81\x82\xE3\x82\x8C".force_encoding("utf-8")
+      a = "\xE3\x81\x82\xE3\x82\x8C".dup.force_encoding("utf-8")
       result = @s.rb_str_conv_enc_opts(a, Encoding::UTF_8, Encoding::EUC_JP, 0, nil)
       x = [0xA4, 0xA2, 0xA4, 0xEC].pack('C4').force_encoding('utf-8')
       result.should == x.force_encoding("euc-jp")
@@ -958,7 +958,7 @@ def inspect
 
     describe "when the String encoding is equal to the destination encoding" do
       it "returns the original String" do
-        a = "abc".force_encoding("us-ascii")
+        a = "abc".dup.force_encoding("us-ascii")
         @s.rb_str_conv_enc_opts(a, Encoding::US_ASCII,
                                 Encoding::US_ASCII, 0, nil).should equal(a)
       end
@@ -970,7 +970,7 @@ def inspect
       end
 
       it "returns the origin String if the destination encoding is BINARY" do
-        a = "abc".force_encoding("binary")
+        a = "abc".dup.force_encoding("binary")
         @s.rb_str_conv_enc_opts(a, Encoding::US_ASCII,
                                 Encoding::BINARY, 0, nil).should equal(a)
       end
@@ -988,7 +988,7 @@ def inspect
   describe "rb_str_export_locale" do
     it "returns the original String with the locale encoding" do
       s = @s.rb_str_export_locale("abc")
-      s.should == "abc".force_encoding(Encoding.find("locale"))
+      s.should == "abc".dup.force_encoding(Encoding.find("locale"))
       s.encoding.should equal(Encoding.find("locale"))
     end
   end
@@ -1012,7 +1012,7 @@ def inspect
       result = @s.rb_str_export_to_enc(source, Encoding::UTF_8)
       source.bytes.should == [0, 255]
     end
-end
+  end
 
   describe "rb_sprintf" do
     it "replaces the parts like sprintf" do
@@ -1040,11 +1040,19 @@ def inspect
       @s.rb_sprintf3(true.class).should == s
     end
 
-    ruby_bug "#19167", ""..."3.2" do
-      it "formats a TrueClass VALUE as 'true' if sign specified in format" do
-        s = 'Result: TrueClass.'
-        @s.rb_sprintf4(true.class).should == s
-      end
+    it "formats a TrueClass VALUE as 'true' if sign specified in format" do
+      s = 'Result: TrueClass.'
+      @s.rb_sprintf4(true.class).should == s
+    end
+
+    it "formats nil using to_s if sign not specified in format" do
+      s = 'Result: .'
+      @s.rb_sprintf3(nil).should == s
+    end
+
+    it "formats nil using inspect if sign specified in format" do
+      s = 'Result: nil.'
+      @s.rb_sprintf4(nil).should == s
     end
 
     it "truncates a string to a supplied precision if that is shorter than the string" do
@@ -1114,7 +1122,7 @@ def inspect
     end
 
     it "tries to convert the passed argument to a string by calling #to_s" do
-      @s.rb_String({"bar" => "foo"}).should == '{"bar"=>"foo"}'
+      @s.rb_String({"bar" => "foo"}).should == {"bar" => "foo"}.to_s
     end
   end
 
@@ -1203,28 +1211,158 @@ def inspect
 
   describe "rb_str_locktmp" do
     it "raises an error when trying to lock an already locked string" do
-      str = "test"
+      str = +"test"
       @s.rb_str_locktmp(str).should == str
       -> { @s.rb_str_locktmp(str) }.should raise_error(RuntimeError, 'temporal locking already locked string')
     end
 
     it "locks a string so that modifications would raise an error" do
-      str = "test"
+      str = +"test"
       @s.rb_str_locktmp(str).should == str
       -> { str.upcase! }.should raise_error(RuntimeError, 'can\'t modify string; temporarily locked')
     end
+
+    ruby_version_is "3.5" do
+      it "raises FrozenError if string is frozen" do
+        str = -"rb_str_locktmp"
+        -> { @s.rb_str_locktmp(str) }.should raise_error(FrozenError)
+
+        str = +"rb_str_locktmp"
+        str.freeze
+        -> { @s.rb_str_locktmp(str) }.should raise_error(FrozenError)
+      end
+    end
   end
 
   describe "rb_str_unlocktmp" do
     it "unlocks a locked string" do
-      str = "test"
+      str = +"test"
       @s.rb_str_locktmp(str)
       @s.rb_str_unlocktmp(str).should == str
       str.upcase!.should == "TEST"
     end
 
     it "raises an error when trying to unlock an already unlocked string" do
-      -> { @s.rb_str_unlocktmp("test") }.should raise_error(RuntimeError, 'temporal unlocking already unlocked string')
+      -> { @s.rb_str_unlocktmp(+"test") }.should raise_error(RuntimeError, 'temporal unlocking already unlocked string')
+    end
+
+    ruby_version_is "3.5" do
+      it "raises FrozenError if string is frozen" do
+        str = -"rb_str_locktmp"
+        -> { @s.rb_str_unlocktmp(str) }.should raise_error(FrozenError)
+
+        str = +"rb_str_locktmp"
+        str.freeze
+        -> { @s.rb_str_unlocktmp(str) }.should raise_error(FrozenError)
+      end
+    end
+  end
+
+  describe "rb_enc_interned_str_cstr" do
+    it "returns a frozen string" do
+      str = "hello"
+      val = @s.rb_enc_interned_str_cstr(str, Encoding::US_ASCII)
+
+      val.should.is_a?(String)
+      val.encoding.should == Encoding::US_ASCII
+      val.should.frozen?
+    end
+
+    it "returns the same frozen string" do
+      str = "hello"
+      result1 = @s.rb_enc_interned_str_cstr(str, Encoding::US_ASCII)
+      result2 = @s.rb_enc_interned_str_cstr(str, Encoding::US_ASCII)
+      result1.should.equal?(result2)
+    end
+
+    it "returns different frozen strings for different encodings" do
+      str = "hello"
+      result1 = @s.rb_enc_interned_str_cstr(str, Encoding::US_ASCII)
+      result2 = @s.rb_enc_interned_str_cstr(str, Encoding::UTF_8)
+      result1.should_not.equal?(result2)
+    end
+
+    it "returns the same string as String#-@" do
+      @s.rb_enc_interned_str_cstr("hello", Encoding::UTF_8).should.equal?(-"hello")
+    end
+
+    ruby_bug "#20322", ""..."3.4" do
+      it "uses the default encoding if encoding is null" do
+        str = "hello"
+        val = @s.rb_enc_interned_str_cstr(str, nil)
+        val.encoding.should == Encoding::ASCII_8BIT
+      end
+    end
+  end
+
+  describe "rb_enc_interned_str" do
+    it "returns a frozen string" do
+      str = "hello"
+      val = @s.rb_enc_interned_str(str, str.bytesize, Encoding::US_ASCII)
+
+      val.should.is_a?(String)
+      val.encoding.should == Encoding::US_ASCII
+      val.should.frozen?
+    end
+
+    it "returns the same frozen string" do
+      str = "hello"
+      result1 = @s.rb_enc_interned_str(str, str.bytesize, Encoding::US_ASCII)
+      result2 = @s.rb_enc_interned_str(str, str.bytesize, Encoding::US_ASCII)
+      result1.should.equal?(result2)
+    end
+
+    it "returns different frozen strings for different encodings" do
+      str = "hello"
+      result1 = @s.rb_enc_interned_str(str, str.bytesize, Encoding::US_ASCII)
+      result2 = @s.rb_enc_interned_str(str, str.bytesize, Encoding::UTF_8)
+      result1.should_not.equal?(result2)
+    end
+
+    it 'returns the same string when using non-ascii characters' do
+      str = 'こんにちは'
+      result1 = @s.rb_enc_interned_str(str, str.bytesize, Encoding::UTF_8)
+      result2 = @s.rb_enc_interned_str(str, str.bytesize, Encoding::UTF_8)
+      result1.should.equal?(result2)
+    end
+
+    it "returns the same string as String#-@" do
+      str = "hello"
+      @s.rb_enc_interned_str(str, str.bytesize, Encoding::UTF_8).should.equal?(-str)
+    end
+
+    ruby_bug "#20322", ""..."3.4" do
+      it "uses the default encoding if encoding is null" do
+        str = "hello"
+        val = @s.rb_enc_interned_str(str, str.bytesize, nil)
+        val.encoding.should == Encoding::ASCII_8BIT
+      end
+    end
+  end
+
+  describe "rb_str_to_interned_str" do
+    it "returns a frozen string" do
+      str = "hello"
+      result = @s.rb_str_to_interned_str(str)
+      result.should.is_a?(String)
+      result.should.frozen?
+    end
+
+    it "returns the same frozen string" do
+      str = "hello"
+      result1 = @s.rb_str_to_interned_str(str)
+      result2 = @s.rb_str_to_interned_str(str)
+      result1.should.equal?(result2)
+    end
+
+    it "returns different frozen strings for different encodings" do
+      result1 = @s.rb_str_to_interned_str("hello".dup.force_encoding(Encoding::US_ASCII))
+      result2 = @s.rb_str_to_interned_str("hello".dup.force_encoding(Encoding::UTF_8))
+      result1.should_not.equal?(result2)
+    end
+
+    it "returns the same string as String#-@" do
+      @s.rb_str_to_interned_str("hello").should.equal?(-"hello")
     end
   end
 end
diff --git a/spec/ruby/optional/capi/struct_spec.rb b/spec/ruby/optional/capi/struct_spec.rb
index 0e9e366908051d..474c39795690ca 100644
--- a/spec/ruby/optional/capi/struct_spec.rb
+++ b/spec/ruby/optional/capi/struct_spec.rb
@@ -209,3 +209,52 @@
     end
   end
 end
+
+ruby_version_is "3.3" do
+  describe "C-API Data function" do
+    before :each do
+      @s = CApiStructSpecs.new
+    end
+
+    describe "rb_data_define" do
+      it "returns a subclass of Data class when passed nil as the first argument" do
+        klass = @s.rb_data_define(nil, "a", "b", "c")
+
+        klass.should.is_a? Class
+        klass.superclass.should == Data
+      end
+
+      it "returns a subclass of a class when passed as the first argument" do
+        superclass = Class.new(Data)
+        klass = @s.rb_data_define(superclass, "a", "b", "c")
+
+        klass.should.is_a? Class
+        klass.superclass.should == superclass
+      end
+
+      it "creates readers for the members" do
+        klass = @s.rb_data_define(nil, "a", "b", "c")
+        obj = klass.new(1, 2, 3)
+
+        obj.a.should == 1
+        obj.b.should == 2
+        obj.c.should == 3
+      end
+
+      it "returns the member names as Symbols" do
+        klass = @s.rb_data_define(nil, "a", "b", "c")
+        obj = klass.new(0, 0, 0)
+
+        obj.members.should == [:a, :b, :c]
+      end
+
+      it "raises an ArgumentError if arguments contain duplicate member name" do
+        -> { @s.rb_data_define(nil, "a", "b", "a") }.should raise_error(ArgumentError)
+      end
+
+      it "raises when first argument is not a class" do
+        -> { @s.rb_data_define([], "a", "b", "c") }.should raise_error(TypeError, "wrong argument type Array (expected Class)")
+      end
+    end
+  end
+end
diff --git a/spec/ruby/optional/capi/thread_spec.rb b/spec/ruby/optional/capi/thread_spec.rb
index af641f0564e951..cd9ae8ff1923bb 100644
--- a/spec/ruby/optional/capi/thread_spec.rb
+++ b/spec/ruby/optional/capi/thread_spec.rb
@@ -184,4 +184,12 @@ def call_capi_rb_thread_wakeup
       thr.value.should be_true
     end
   end
+
+  ruby_version_is "3.5" do
+    describe "ruby_thread_has_gvl_p" do
+      it "returns true if the current thread has the GVL" do
+        @t.ruby_thread_has_gvl_p.should be_true
+      end
+    end
+  end
 end
diff --git a/spec/ruby/optional/capi/typed_data_spec.rb b/spec/ruby/optional/capi/typed_data_spec.rb
index 23b7c157efb3e0..6d1398a1a0b9ab 100644
--- a/spec/ruby/optional/capi/typed_data_spec.rb
+++ b/spec/ruby/optional/capi/typed_data_spec.rb
@@ -85,4 +85,16 @@
       -> { @s.rb_check_typeddata_different_type(a) }.should raise_error(TypeError)
     end
   end
+
+  describe "RTYPEDDATA_P" do
+    it "returns true for a typed data" do
+      a = @s.typed_wrap_struct(1024)
+      @s.RTYPEDDATA_P(a).should == true
+    end
+
+    it "returns false for an untyped data object" do
+      a = @s.untyped_wrap_struct(1024)
+      @s.RTYPEDDATA_P(a).should == false
+    end
+  end
 end
diff --git a/spec/ruby/optional/capi/util_spec.rb b/spec/ruby/optional/capi/util_spec.rb
index 320527521bbe19..6cf064bf973b36 100644
--- a/spec/ruby/optional/capi/util_spec.rb
+++ b/spec/ruby/optional/capi/util_spec.rb
@@ -48,7 +48,7 @@
       ScratchPad.recorded.should == [1, 2, [3, 4]]
     end
 
-    it "assigns the required and optional arguments and and empty Array when there are no arguments to splat" do
+    it "assigns the required and optional arguments and empty Array when there are no arguments to splat" do
       @o.rb_scan_args([1, 2], "11*", 3, @acc).should == 2
       ScratchPad.recorded.should == [1, 2, []]
     end
@@ -127,6 +127,19 @@
       ScratchPad.recorded.should == [1, 7, 4]
     end
 
+    it "assigns optional arguments with no hash argument given" do
+      @o.rb_scan_args([1, 7], "02:", 3, @acc).should == 2
+      ScratchPad.recorded.should == [1, 7, nil]
+    end
+
+    it "assigns optional arguments with no hash argument given and rejects the use of optional nil argument as a hash" do
+      -> {
+        @o.rb_scan_args([1, nil], "02:", 3, @acc).should == 2
+      }.should_not complain
+
+      ScratchPad.recorded.should == [1, nil, nil]
+    end
+
     it "assigns required, optional, splat, post-splat, Hash and block arguments" do
       h = {a: 1, b: 2}
       @o.rb_scan_args([1, 2, 3, 4, 5, h], "k11*1:&", 6, @acc, &@prc).should == 5
@@ -196,7 +209,7 @@
     end
   end
 
-  platform_is wordsize: 64 do
+  platform_is c_long_size: 64 do
     describe "rb_long2int" do
       it "raises a RangeError if the value is outside the range of a C int" do
         -> { @o.rb_long2int(0xffff_ffff_ffff) }.should raise_error(RangeError)
diff --git a/spec/ruby/security/cve_2010_1330_spec.rb b/spec/ruby/security/cve_2010_1330_spec.rb
index 33e88d652ee6e8..25944395500adb 100644
--- a/spec/ruby/security/cve_2010_1330_spec.rb
+++ b/spec/ruby/security/cve_2010_1330_spec.rb
@@ -8,7 +8,7 @@
     # #gsub on a string in the UTF-8 encoding but with invalid an UTF-8 byte
     # sequence.
 
-    str = "\xF6<script>"
+    str = +"\xF6<script>"
     str.force_encoding Encoding::BINARY
     str.gsub(/</, "&lt;").should == "\xF6&lt;script>".b
     str.force_encoding Encoding::UTF_8
diff --git a/spec/ruby/security/cve_2019_8323_spec.rb b/spec/ruby/security/cve_2019_8323_spec.rb
index d4606de054f549..49a31a6682ccfe 100644
--- a/spec/ruby/security/cve_2019_8323_spec.rb
+++ b/spec/ruby/security/cve_2019_8323_spec.rb
@@ -11,7 +11,12 @@
       cutter = Class.new {
         include Gem::GemcutterUtilities
       }.new
-      response = Net::HTTPSuccess.new(nil, nil, nil)
+      klass = if defined?(Gem::Net::HTTPSuccess)
+                Gem::Net::HTTPSuccess
+              else
+                Net::HTTPSuccess
+              end
+      response = klass.new(nil, nil, nil)
       def response.body
         "\e]2;nyan\a"
       end
@@ -25,7 +30,12 @@ def response.body
       }.new
       def cutter.terminate_interaction(n)
       end
-      response = Net::HTTPNotFound.new(nil, nil, nil)
+      klass = if defined?(Gem::Net::HTTPNotFound)
+                Gem::Net::HTTPNotFound
+              else
+                Net::HTTPNotFound
+              end
+      response = klass.new(nil, nil, nil)
       def response.body
         "\e]2;nyan\a"
       end
diff --git a/spec/ruby/security/cve_2020_10663_spec.rb b/spec/ruby/security/cve_2020_10663_spec.rb
index cce1beb0128c6e..80e860348b10ad 100644
--- a/spec/ruby/security/cve_2020_10663_spec.rb
+++ b/spec/ruby/security/cve_2020_10663_spec.rb
@@ -1,39 +1,49 @@
 require_relative '../spec_helper'
-require 'json'
 
-module JSONSpecs
-  class MyClass
-    def initialize(foo)
-      @foo = foo
-    end
+ruby_version_is ""..."3.5" do
+  require 'json'
 
-    def self.json_create(hash)
-      new(*hash['args'])
-    end
+  module JSONSpecs
+    class MyClass
+      def initialize(foo)
+        @foo = foo
+      end
 
-    def to_json(*args)
-      { 'json_class' => self.class.name, 'args' => [ @foo ] }.to_json(*args)
+      def self.json_create(hash)
+        new(*hash['args'])
+      end
+
+      def to_json(*args)
+        { 'json_class' => self.class.name, 'args' => [ @foo ] }.to_json(*args)
+      end
     end
   end
-end
 
-guard -> {
-  JSON.const_defined?(:Pure) or
-  version_is(JSON::VERSION, '2.3.0')
-} do
-  describe "CVE-2020-10663 is resisted by" do
-    it "only creating custom objects if passed create_additions: true or using JSON.load" do
-      obj = JSONSpecs::MyClass.new("bar")
-      JSONSpecs::MyClass.should.json_creatable?
-      json = JSON.dump(obj)
+  guard -> {
+    JSON.const_defined?(:Pure) or
+    version_is(JSON::VERSION, '2.3.0')
+  } do
+    describe "CVE-2020-10663 is resisted by" do
+      it "only creating custom objects if passed create_additions: true or using JSON.load" do
+        obj = JSONSpecs::MyClass.new("bar")
+        JSONSpecs::MyClass.should.json_creatable?
+        json = JSON.dump(obj)
 
-      JSON.parse(json, create_additions: true).class.should == JSONSpecs::MyClass
-      JSON(json, create_additions: true).class.should == JSONSpecs::MyClass
-      JSON.load(json).class.should == JSONSpecs::MyClass
+        JSON.parse(json, create_additions: true).class.should == JSONSpecs::MyClass
+        JSON(json, create_additions: true).class.should == JSONSpecs::MyClass
+        if version_is(JSON::VERSION, '2.8.0')
+          warning = /\Wcreate_additions:\s*true\W\s+is\s+deprecated/
+        else
+          warning = ''
+        end
+        -> {
+          JSON.load(json).class.should == JSONSpecs::MyClass
+        }.should output_to_fd(warning, STDERR)
 
-      JSON.parse(json).class.should == Hash
-      JSON.parse(json, nil).class.should == Hash
-      JSON(json).class.should == Hash
+        JSON.parse(json).class.should == Hash
+        JSON.parse(json, nil).class.should == Hash
+        JSON(json).class.should == Hash
+      end
     end
   end
 end
diff --git a/spec/ruby/security/cve_2024_49761_spec.rb b/spec/ruby/security/cve_2024_49761_spec.rb
new file mode 100644
index 00000000000000..c66b438eef6025
--- /dev/null
+++ b/spec/ruby/security/cve_2024_49761_spec.rb
@@ -0,0 +1,7 @@
+require_relative '../spec_helper'
+
+describe "CVE-2024-49761 is resisted by" do
+  it "the Regexp implementation handling that regular expression in linear time" do
+    Regexp.linear_time?(/&#0*((?:\d+)|(?:x[a-fA-F0-9]+));/).should == true
+  end
+end
diff --git a/spec/ruby/shared/file/size.rb b/spec/ruby/shared/file/size.rb
index 880dfbb6123084..cba99fe6a5803c 100644
--- a/spec/ruby/shared/file/size.rb
+++ b/spec/ruby/shared/file/size.rb
@@ -72,7 +72,7 @@
   end
 
   it "returns nil if file_name doesn't exist or has 0 size" do
-     @object.send(@method, @missing).should == nil
+    @object.send(@method, @missing).should == nil
   end
 end
 
diff --git a/spec/ruby/shared/file/sticky.rb b/spec/ruby/shared/file/sticky.rb
index 38bb6ed26b9704..e07fa22fd7d1a3 100644
--- a/spec/ruby/shared/file/sticky.rb
+++ b/spec/ruby/shared/file/sticky.rb
@@ -8,7 +8,7 @@
     Dir.rmdir(@dir) if File.exist?(@dir)
   end
 
-  platform_is_not :windows, :darwin, :freebsd, :netbsd, :openbsd, :solaris, :aix do
+  platform_is_not :windows, :darwin, :freebsd, :netbsd, :openbsd, :aix do
     it "returns true if the named file has the sticky bit, otherwise false" do
       Dir.mkdir @dir, 01755
 
diff --git a/spec/ruby/shared/io/putc.rb b/spec/ruby/shared/io/putc.rb
index e6012c0098baa8..cdf18ac9fd6313 100644
--- a/spec/ruby/shared/io/putc.rb
+++ b/spec/ruby/shared/io/putc.rb
@@ -1,4 +1,4 @@
-# -*- encoding: binary -*-
+# encoding: binary
 describe :io_putc, shared: true do
   after :each do
     @io.close if @io && !@io.closed?
diff --git a/spec/ruby/shared/kernel/at_exit.rb b/spec/ruby/shared/kernel/at_exit.rb
index 26ad361a5b838a..29db79bb391428 100644
--- a/spec/ruby/shared/kernel/at_exit.rb
+++ b/spec/ruby/shared/kernel/at_exit.rb
@@ -30,6 +30,12 @@
     result.lines.should.include?("The exception matches: true (message=foo)\n")
   end
 
+  it "gives access to an exception raised in a previous handler" do
+    code = "#{@method} { print '$!.message = ' + $!.message }; #{@method} { raise 'foo' }"
+    result = ruby_exe(code, args: "2>&1", exit_status: 1)
+    result.lines.should.include?("$!.message = foo")
+  end
+
   it "both exceptions in a handler and in the main script are printed" do
     code = "#{@method} { raise 'at_exit_error' }; raise 'main_script_error'"
     result = ruby_exe(code, args: "2>&1", exit_status: 1)
@@ -54,7 +60,10 @@
     result = ruby_exe('{', options: "-r#{script}", args: "2>&1", exit_status: 1)
     $?.should_not.success?
     result.should.include?("handler ran\n")
-    result.should.include?("syntax error")
+
+    # it's tempting not to rely on error message and rely only on exception class name,
+    # but CRuby before 3.2 doesn't print class name for syntax error
+    result.should include_any_of("syntax error", "SyntaxError")
   end
 
   it "calls the nested handler right after the outer one if a handler is nested into another handler" do
diff --git a/spec/ruby/shared/kernel/object_id.rb b/spec/ruby/shared/kernel/object_id.rb
index 7acdb27554f6cf..099df8ff94c4d2 100644
--- a/spec/ruby/shared/kernel/object_id.rb
+++ b/spec/ruby/shared/kernel/object_id.rb
@@ -52,10 +52,30 @@
     o1.send(@method).should_not == o2.send(@method)
   end
 
-  it "returns a different value for two String literals" do
-    o1 = "hello"
-    o2 = "hello"
-    o1.send(@method).should_not == o2.send(@method)
+  guard -> { "test".frozen? && "test".equal?("test") } do # --enable-frozen-string-literal in $RUBYOPT
+    it "returns the same value for two identical String literals" do
+      o1 = "hello"
+      o2 = "hello"
+      o1.send(@method).should == o2.send(@method)
+    end
+  end
+
+  guard -> { "test".frozen? && !"test".equal?("test") } do # chilled string literals
+    it "returns a different frozen value for two String literals" do
+      o1 = "hello"
+      o2 = "hello"
+      o1.send(@method).should_not == o2.send(@method)
+      o1.frozen?.should == true
+      o2.frozen?.should == true
+    end
+  end
+
+  guard -> { !"test".frozen? } do
+    it "returns a different value for two String literals" do
+      o1 = "hello"
+      o2 = "hello"
+      o1.send(@method).should_not == o2.send(@method)
+    end
   end
 
   it "returns a different value for an object and its dup" do
diff --git a/spec/ruby/shared/kernel/raise.rb b/spec/ruby/shared/kernel/raise.rb
index 82fb0333c8933b..3d1c4a10f5807b 100644
--- a/spec/ruby/shared/kernel/raise.rb
+++ b/spec/ruby/shared/kernel/raise.rb
@@ -49,21 +49,6 @@ def initialize(data)
     end
   end
 
-  it "does not allow message and extra keyword arguments" do
-    data_error = Class.new(StandardError) do
-      attr_reader :data
-      def initialize(data)
-        @data = data
-      end
-    end
-
-    -> { @object.raise(data_error, {a: 1}, b: 2) }.should raise_error(StandardError) do |e|
-      [TypeError, ArgumentError].should.include?(e.class)
-    end
-
-    -> { @object.raise(data_error, {a: 1}, [], b: 2) }.should raise_error(ArgumentError)
-  end
-
   it "raises RuntimeError if no exception class is given" do
     -> { @object.raise }.should raise_error(RuntimeError, "")
   end
@@ -74,7 +59,7 @@ def initialize(data)
   end
 
   it "raises a RuntimeError if string given" do
-    -> { @object.raise("a bad thing") }.should raise_error(RuntimeError)
+    -> { @object.raise("a bad thing") }.should raise_error(RuntimeError, "a bad thing")
   end
 
   it "passes no arguments to the constructor when given only an exception class" do
@@ -86,19 +71,36 @@ def initialize
   end
 
   it "raises a TypeError when passed a non-Exception object" do
-    -> { @object.raise(Object.new) }.should raise_error(TypeError)
+    -> { @object.raise(Object.new) }.should raise_error(TypeError, "exception class/object expected")
+    -> { @object.raise(Object.new, "message") }.should raise_error(TypeError, "exception class/object expected")
+    -> { @object.raise(Object.new, "message", []) }.should raise_error(TypeError, "exception class/object expected")
   end
 
   it "raises a TypeError when passed true" do
-    -> { @object.raise(true) }.should raise_error(TypeError)
+    -> { @object.raise(true) }.should raise_error(TypeError, "exception class/object expected")
   end
 
   it "raises a TypeError when passed false" do
-    -> { @object.raise(false) }.should raise_error(TypeError)
+    -> { @object.raise(false) }.should raise_error(TypeError, "exception class/object expected")
   end
 
   it "raises a TypeError when passed nil" do
-    -> { @object.raise(nil) }.should raise_error(TypeError)
+    -> { @object.raise(nil) }.should raise_error(TypeError, "exception class/object expected")
+  end
+
+  it "raises a TypeError when passed a message and an extra argument" do
+    -> { @object.raise("message", {cause: RuntimeError.new()}) }.should raise_error(TypeError, "exception class/object expected")
+  end
+
+  it "raises TypeError when passed a non-Exception object but it responds to #exception method that doesn't return an instance of Exception class" do
+    e = Object.new
+    def e.exception
+      Array
+    end
+
+    -> {
+      @object.raise e
+    }.should raise_error(TypeError, "exception object expected")
   end
 
   it "re-raises a previously rescued exception without overwriting the backtrace" do
@@ -146,4 +148,15 @@ def initialize
       @object.raise(ArgumentError, "message", caller)
     end.should raise_error(ArgumentError, "message")
   end
+
+  ruby_version_is "3.4" do
+    locations = caller_locations(1, 2)
+    it "allows Exception, message, and backtrace_locations parameters" do
+      -> do
+        @object.raise(ArgumentError, "message", locations)
+      end.should raise_error(ArgumentError, "message") { |error|
+        error.backtrace_locations.map(&:to_s).should == locations.map(&:to_s)
+      }
+    end
+  end
 end
diff --git a/spec/ruby/shared/process/fork.rb b/spec/ruby/shared/process/fork.rb
index 11e18d7b1cef5a..8dbb3d0da43db6 100644
--- a/spec/ruby/shared/process/fork.rb
+++ b/spec/ruby/shared/process/fork.rb
@@ -23,31 +23,31 @@
     end
 
     it "returns status zero" do
-      pid = Process.fork { exit! 0 }
+      pid = @object.fork { exit! 0 }
       _, result = Process.wait2(pid)
       result.exitstatus.should == 0
     end
 
     it "returns status zero" do
-      pid = Process.fork { exit 0 }
+      pid = @object.fork { exit 0 }
       _, result = Process.wait2(pid)
       result.exitstatus.should == 0
     end
 
     it "returns status zero" do
-      pid = Process.fork {}
+      pid = @object.fork {}
       _, result = Process.wait2(pid)
       result.exitstatus.should == 0
     end
 
     it "returns status non-zero" do
-      pid = Process.fork { exit! 42 }
+      pid = @object.fork { exit! 42 }
       _, result = Process.wait2(pid)
       result.exitstatus.should == 42
     end
 
     it "returns status non-zero" do
-      pid = Process.fork { exit 42 }
+      pid = @object.fork { exit 42 }
       _, result = Process.wait2(pid)
       result.exitstatus.should == 42
     end
diff --git a/spec/ruby/shared/queue/deque.rb b/spec/ruby/shared/queue/deque.rb
index 9e6b45009d29b3..a154da62747360 100644
--- a/spec/ruby/shared/queue/deque.rb
+++ b/spec/ruby/shared/queue/deque.rb
@@ -65,70 +65,64 @@
   end
 
   describe "with a timeout" do
-    ruby_version_is "3.2" do
-      it "returns an item if one is available in time" do
-        q = @object.call
-
-        t = Thread.new {
-          q.send(@method, timeout: 1).should == 1
-        }
-        Thread.pass until t.status == "sleep" && q.num_waiting == 1
-        q << 1
-        t.join
-      end
-
-      it "returns nil if no item is available in time" do
-        q = @object.call
-
-        t = Thread.new {
-          q.send(@method, timeout: 0.1).should == nil
-        }
-        t.join
-      end
-
-      it "does nothing if the timeout is nil" do
-        q = @object.call
-        t = Thread.new {
-          q.send(@method, timeout: nil).should == 1
-        }
-        t.join(0.2).should == nil
-        q << 1
-        t.join
-      end
-
-      it "immediately returns nil if no item is available and the timeout is 0" do
-        q = @object.call
-        q << 1
-        q.send(@method, timeout: 0).should == 1
-        q.send(@method, timeout: 0).should == nil
-      end
-
-      it "raise TypeError if timeout is not a valid numeric" do
-        q = @object.call
-        -> { q.send(@method, timeout: "1") }.should raise_error(
-          TypeError,
-          "no implicit conversion to float from string",
-        )
-
-        -> { q.send(@method, timeout: false) }.should raise_error(
-          TypeError,
-          "no implicit conversion to float from false",
-        )
-      end
-
-      it "raise ArgumentError if non_block = true is passed too" do
-        q = @object.call
-        -> { q.send(@method, true, timeout: 1) }.should raise_error(
-          ArgumentError,
-          "can't set a timeout if non_block is enabled",
-        )
-      end
-
-      it "returns nil for a closed empty queue" do
-        q = @object.call
-        q.close
-        q.send(@method, timeout: 0).should == nil
-      end
+    it "returns an item if one is available in time" do
+      q = @object.call
+
+      t = Thread.new {
+        q.send(@method, timeout: TIME_TOLERANCE).should == 1
+      }
+      Thread.pass until t.status == "sleep" && q.num_waiting == 1
+      q << 1
+      t.join
+    end
+
+    it "returns nil if no item is available in time" do
+      q = @object.call
+
+      Thread.new {
+        q.send(@method, timeout: 0.001).should == nil
+      }.join
+    end
+
+    it "does nothing if the timeout is nil" do
+      q = @object.call
+      t = Thread.new {
+        q.send(@method, timeout: nil).should == 1
+      }
+      Thread.pass until t.status == "sleep" && q.num_waiting == 1
+      q << 1
+      t.join
+    end
+
+    it "immediately returns nil if no item is available and the timeout is 0" do
+      q = @object.call
+      q << 1
+      q.send(@method, timeout: 0).should == 1
+      q.send(@method, timeout: 0).should == nil
+    end
+
+    it "raise TypeError if timeout is not a valid numeric" do
+      q = @object.call
+      -> {
+        q.send(@method, timeout: "1")
+      }.should raise_error(TypeError, "no implicit conversion to float from string")
+
+      -> {
+        q.send(@method, timeout: false)
+      }.should raise_error(TypeError, "no implicit conversion to float from false")
+    end
+
+    it "raise ArgumentError if non_block = true is passed too" do
+      q = @object.call
+      -> {
+        q.send(@method, true, timeout: 1)
+      }.should raise_error(ArgumentError, "can't set a timeout if non_block is enabled")
+    end
+
+    it "returns nil for a closed empty queue" do
+      q = @object.call
+      q.close
+      q.send(@method, timeout: 0).should == nil
     end
   end
 
diff --git a/spec/ruby/shared/queue/freeze.rb b/spec/ruby/shared/queue/freeze.rb
new file mode 100644
index 00000000000000..4c506a42355f62
--- /dev/null
+++ b/spec/ruby/shared/queue/freeze.rb
@@ -0,0 +1,18 @@
+describe :queue_freeze, shared: true do
+  ruby_version_is ""..."3.3" do
+    it "can be frozen" do
+      queue = @object.call
+      queue.freeze
+      queue.should.frozen?
+    end
+  end
+
+  ruby_version_is "3.3" do
+    it "raises an exception when freezing" do
+      queue = @object.call
+      -> {
+        queue.freeze
+      }.should raise_error(TypeError, "cannot freeze #{queue}")
+    end
+  end
+end
diff --git a/spec/ruby/shared/rational/Rational.rb b/spec/ruby/shared/rational/Rational.rb
deleted file mode 100644
index 500f7ed271e87f..00000000000000
--- a/spec/ruby/shared/rational/Rational.rb
+++ /dev/null
@@ -1,150 +0,0 @@
-require_relative '../../spec_helper'
-require_relative '../../fixtures/rational'
-
-describe :kernel_Rational, shared: true do
-  describe "passed Integer" do
-    # Guard against the Mathn library
-    guard -> { !defined?(Math.rsqrt) } do
-      it "returns a new Rational number with 1 as the denominator" do
-        Rational(1).should eql(Rational(1, 1))
-        Rational(-3).should eql(Rational(-3, 1))
-        Rational(bignum_value).should eql(Rational(bignum_value, 1))
-      end
-    end
-  end
-
-  describe "passed two integers" do
-    it "returns a new Rational number" do
-      rat = Rational(1, 2)
-      rat.numerator.should == 1
-      rat.denominator.should == 2
-      rat.should be_an_instance_of(Rational)
-
-      rat = Rational(-3, -5)
-      rat.numerator.should == 3
-      rat.denominator.should == 5
-      rat.should be_an_instance_of(Rational)
-
-      rat = Rational(bignum_value, 3)
-      rat.numerator.should == bignum_value
-      rat.denominator.should == 3
-      rat.should be_an_instance_of(Rational)
-    end
-
-    it "reduces the Rational" do
-      rat = Rational(2, 4)
-      rat.numerator.should == 1
-      rat.denominator.should == 2
-
-      rat = Rational(3, 9)
-      rat.numerator.should == 1
-      rat.denominator.should == 3
-    end
-  end
-
-  describe "when passed a String" do
-    it "converts the String to a Rational using the same method as String#to_r" do
-      r = Rational(13, 25)
-      s_r = ".52".to_r
-      r_s = Rational(".52")
-
-      r_s.should == r
-      r_s.should == s_r
-    end
-
-    it "scales the Rational value of the first argument by the Rational value of the second" do
-      Rational(".52", ".6").should == Rational(13, 15)
-      Rational(".52", "1.6").should == Rational(13, 40)
-    end
-
-    it "does not use the same method as Float#to_r" do
-      r = Rational(3, 5)
-      f_r = 0.6.to_r
-      r_s = Rational("0.6")
-
-      r_s.should == r
-      r_s.should_not == f_r
-    end
-  end
-
-  describe "when passed a Numeric" do
-    it "calls #to_r to convert the first argument to a Rational" do
-      num = RationalSpecs::SubNumeric.new(2)
-
-      Rational(num).should == Rational(2)
-    end
-  end
-
-  describe "when passed a Complex" do
-    it "returns a Rational from the real part if the imaginary part is 0" do
-      Rational(Complex(1, 0)).should == Rational(1)
-    end
-
-    it "raises a RangeError if the imaginary part is not 0" do
-      -> { Rational(Complex(1, 2)) }.should raise_error(RangeError)
-    end
-  end
-
-  it "raises a ZeroDivisionError if the second argument is 0" do
-    -> { Rational(1, 0) }.should raise_error(ZeroDivisionError, "divided by 0")
-    -> { Rational(1, 0.0) }.should raise_error(ZeroDivisionError, "divided by 0")
-  end
-
-  it "raises a TypeError if the first argument is nil" do
-    -> { Rational(nil) }.should raise_error(TypeError)
-  end
-
-  it "raises a TypeError if the second argument is nil" do
-    -> { Rational(1, nil) }.should raise_error(TypeError)
-  end
-
-  it "raises a TypeError if the first argument is a Symbol" do
-    -> { Rational(:sym) }.should raise_error(TypeError)
-  end
-
-  it "raises a TypeError if the second argument is a Symbol" do
-    -> { Rational(1, :sym) }.should raise_error(TypeError)
-  end
-
-  describe "when passed exception: false" do
-    describe "and [non-Numeric]" do
-      it "swallows an error" do
-        Rational(:sym, exception: false).should == nil
-        Rational("abc", exception: false).should == nil
-      end
-    end
-
-    describe "and [non-Numeric, Numeric]" do
-      it "swallows an error" do
-        Rational(:sym, 1, exception: false).should == nil
-        Rational("abc", 1, exception: false).should == nil
-      end
-    end
-
-    describe "and [anything, non-Numeric]" do
-      it "swallows an error" do
-        Rational(:sym, :sym, exception: false).should == nil
-        Rational("abc", :sym, exception: false).should == nil
-      end
-    end
-
-    describe "and non-Numeric String arguments" do
-      it "swallows an error" do
-        Rational("a", "b", exception: false).should == nil
-        Rational("a", 0, exception: false).should == nil
-        Rational(0, "b", exception: false).should == nil
-      end
-    end
-
-    describe "and nil arguments" do
-      it "swallows an error" do
-        Rational(nil, exception: false).should == nil
-        Rational(nil, nil, exception: false).should == nil
-      end
-    end
-  end
-
-  it "freezes its result" do
-    Rational(1).frozen?.should == true
-  end
-end
diff --git a/spec/ruby/shared/rational/ceil.rb b/spec/ruby/shared/rational/ceil.rb
deleted file mode 100644
index f1cf60d2be4f72..00000000000000
--- a/spec/ruby/shared/rational/ceil.rb
+++ /dev/null
@@ -1,45 +0,0 @@
-require_relative '../../spec_helper'
-
-describe :rational_ceil, shared: true do
-  before do
-    @rational = Rational(2200, 7)
-  end
-
-  describe "with no arguments (precision = 0)" do
-    it "returns an Integer" do
-      @rational.ceil.should be_kind_of(Integer)
-    end
-
-    it "returns the truncated value toward positive infinity" do
-      @rational.ceil.should == 315
-      Rational(1, 2).ceil.should == 1
-      Rational(-1, 2).ceil.should == 0
-    end
-  end
-
-  describe "with a precision < 0" do
-    it "returns an Integer" do
-      @rational.ceil(-2).should be_kind_of(Integer)
-      @rational.ceil(-1).should be_kind_of(Integer)
-    end
-
-    it "moves the truncation point n decimal places left" do
-      @rational.ceil(-3).should == 1000
-      @rational.ceil(-2).should == 400
-      @rational.ceil(-1).should == 320
-    end
-  end
-
-  describe "with precision > 0" do
-    it "returns a Rational" do
-      @rational.ceil(1).should be_kind_of(Rational)
-      @rational.ceil(2).should be_kind_of(Rational)
-    end
-
-    it "moves the truncation point n decimal places right" do
-      @rational.ceil(1).should == Rational(3143, 10)
-      @rational.ceil(2).should == Rational(31429, 100)
-      @rational.ceil(3).should == Rational(157143, 500)
-    end
-  end
-end
diff --git a/spec/ruby/shared/rational/coerce.rb b/spec/ruby/shared/rational/coerce.rb
deleted file mode 100644
index ccc8901ba0a76c..00000000000000
--- a/spec/ruby/shared/rational/coerce.rb
+++ /dev/null
@@ -1,34 +0,0 @@
-require_relative '../../spec_helper'
-
-require 'bigdecimal'
-
-describe :rational_coerce, shared: true do
-  it "returns the passed argument, self as Float, when given a Float" do
-    result = Rational(3, 4).coerce(1.0)
-    result.should == [1.0, 0.75]
-    result.first.is_a?(Float).should be_true
-    result.last.is_a?(Float).should be_true
-  end
-
-  it "returns the passed argument, self as Rational, when given an Integer" do
-    result = Rational(3, 4).coerce(10)
-    result.should == [Rational(10, 1), Rational(3, 4)]
-    result.first.is_a?(Rational).should be_true
-    result.last.is_a?(Rational).should be_true
-  end
-
-  it "coerces to Rational, when given a Complex" do
-    Rational(3, 4).coerce(Complex(5)).should == [Rational(5, 1), Rational(3, 4)]
-    Rational(12, 4).coerce(Complex(5, 1)).should == [Complex(5, 1), Complex(3)]
-  end
-
-  it "returns [argument, self] when given a Rational" do
-    Rational(3, 7).coerce(Rational(9, 2)).should == [Rational(9, 2), Rational(3, 7)]
-  end
-
-  it "raises an error when passed a BigDecimal" do
-    -> {
-      Rational(500, 3).coerce(BigDecimal('166.666666666'))
-    }.should raise_error(TypeError, /BigDecimal can't be coerced into Rational/)
-  end
-end
diff --git a/spec/ruby/shared/rational/comparison.rb b/spec/ruby/shared/rational/comparison.rb
deleted file mode 100644
index 860462f5797d3c..00000000000000
--- a/spec/ruby/shared/rational/comparison.rb
+++ /dev/null
@@ -1,95 +0,0 @@
-require_relative '../../spec_helper'
-require_relative '../../fixtures/rational'
-
-describe :rational_cmp_rat, shared: true do
-  it "returns 1 when self is greater than the passed argument" do
-    (Rational(4, 4) <=> Rational(3, 4)).should equal(1)
-    (Rational(-3, 4) <=> Rational(-4, 4)).should equal(1)
-  end
-
-  it "returns 0 when self is equal to the passed argument" do
-    (Rational(4, 4) <=> Rational(4, 4)).should equal(0)
-    (Rational(-3, 4) <=> Rational(-3, 4)).should equal(0)
-  end
-
-  it "returns -1 when self is less than the passed argument" do
-    (Rational(3, 4) <=> Rational(4, 4)).should equal(-1)
-    (Rational(-4, 4) <=> Rational(-3, 4)).should equal(-1)
-  end
-end
-
-describe :rational_cmp_int, shared: true do
-  it "returns 1 when self is greater than the passed argument" do
-    (Rational(4, 4) <=> 0).should equal(1)
-    (Rational(4, 4) <=> -10).should equal(1)
-    (Rational(-3, 4) <=> -1).should equal(1)
-  end
-
-  it "returns 0 when self is equal to the passed argument" do
-    (Rational(4, 4) <=> 1).should equal(0)
-    (Rational(-8, 4) <=> -2).should equal(0)
-  end
-
-  it "returns -1 when self is less than the passed argument" do
-    (Rational(3, 4) <=> 1).should equal(-1)
-    (Rational(-4, 4) <=> 0).should equal(-1)
-  end
-end
-
-describe :rational_cmp_float, shared: true do
-  it "returns 1 when self is greater than the passed argument" do
-    (Rational(4, 4) <=> 0.5).should equal(1)
-    (Rational(4, 4) <=> -1.5).should equal(1)
-    (Rational(-3, 4) <=> -0.8).should equal(1)
-  end
-
-  it "returns 0 when self is equal to the passed argument" do
-    (Rational(4, 4) <=> 1.0).should equal(0)
-    (Rational(-6, 4) <=> -1.5).should equal(0)
-  end
-
-  it "returns -1 when self is less than the passed argument" do
-    (Rational(3, 4) <=> 1.2).should equal(-1)
-    (Rational(-4, 4) <=> 0.5).should equal(-1)
-  end
-end
-
-describe :rational_cmp_coerce, shared: true do
-  it "calls #coerce on the passed argument with self" do
-    rational = Rational(3, 4)
-
-    obj = mock("Object")
-    obj.should_receive(:coerce).with(rational).and_return([1, 2])
-
-    rational <=> obj
-  end
-
-  it "calls #<=> on the coerced Rational with the coerced Object" do
-    rational = Rational(3, 4)
-
-    coerced_rational = mock("Coerced Rational")
-    coerced_rational.should_receive(:<=>).and_return(:result)
-
-    coerced_obj = mock("Coerced Object")
-
-    obj = mock("Object")
-    obj.should_receive(:coerce).and_return([coerced_rational, coerced_obj])
-
-    (rational <=> obj).should == :result
-  end
-end
-
-describe :rational_cmp_coerce_exception, shared: true do
-  it "does not rescue exception raised in other#coerce" do
-    b = mock("numeric with failed #coerce")
-    b.should_receive(:coerce).and_raise(RationalSpecs::CoerceError)
-
-    -> { Rational(3, 4) <=> b }.should raise_error(RationalSpecs::CoerceError)
-  end
-end
-
-describe :rational_cmp_other, shared: true do
-  it "returns nil" do
-    (Rational <=> mock("Object")).should be_nil
-  end
-end
diff --git a/spec/ruby/shared/rational/denominator.rb b/spec/ruby/shared/rational/denominator.rb
deleted file mode 100644
index 10d46aacb39332..00000000000000
--- a/spec/ruby/shared/rational/denominator.rb
+++ /dev/null
@@ -1,14 +0,0 @@
-require_relative '../../spec_helper'
-
-describe :rational_denominator, shared: true do
-  it "returns the denominator" do
-    Rational(3, 4).denominator.should equal(4)
-    Rational(3, -4).denominator.should equal(4)
-
-    Rational(1, bignum_value).denominator.should == bignum_value
-  end
-
-  it "returns 1 if no denominator was given" do
-    Rational(80).denominator.should == 1
-  end
-end
diff --git a/spec/ruby/shared/rational/div.rb b/spec/ruby/shared/rational/div.rb
deleted file mode 100644
index d5bd9e664482d2..00000000000000
--- a/spec/ruby/shared/rational/div.rb
+++ /dev/null
@@ -1,54 +0,0 @@
-require_relative '../../spec_helper'
-
-describe :rational_div_rat, shared: true do
-  it "performs integer division and returns the result" do
-    Rational(2, 3).div(Rational(2, 3)).should == 1
-    Rational(-2, 9).div(Rational(-9, 2)).should == 0
-  end
-
-  it "raises a ZeroDivisionError when the argument has a numerator of 0" do
-    -> { Rational(3, 4).div(Rational(0, 3)) }.should raise_error(ZeroDivisionError)
-  end
-
-  it "raises a ZeroDivisionError when the argument has a numerator of 0.0" do
-    -> { Rational(3, 4).div(Rational(0.0, 3)) }.should raise_error(ZeroDivisionError)
-  end
-end
-
-describe :rational_div_float, shared: true do
-  it "performs integer division and returns the result" do
-    Rational(2, 3).div(30.333).should == 0
-    Rational(2, 9).div(Rational(-8.6)).should == -1
-    Rational(3.12).div(0.5).should == 6
-  end
-
-  it "raises a ZeroDivisionError when the argument is 0.0" do
-    -> { Rational(3, 4).div(0.0) }.should raise_error(ZeroDivisionError)
-  end
-end
-
-describe :rational_div_int, shared: true do
-  it "performs integer division and returns the result" do
-    Rational(2, 1).div(1).should == 2
-    Rational(25, 5).div(-50).should == -1
-  end
-
-  it "raises a ZeroDivisionError when the argument is 0" do
-    -> { Rational(3, 4).div(0) }.should raise_error(ZeroDivisionError)
-  end
-end
-
-describe :rational_div, shared: true do
-  it "returns an Integer" do
-    Rational(229, 21).div(82).should be_kind_of(Integer)
-  end
-
-  it "raises an ArgumentError if passed more than one argument" do
-    -> { Rational(3, 4).div(2,3) }.should raise_error(ArgumentError)
-  end
-
-  # See http://redmine.ruby-lang.org/issues/show/1648
-  it "raises a TypeError if passed a non-numeric argument" do
-    -> { Rational(3, 4).div([]) }.should raise_error(TypeError)
-  end
-end
diff --git a/spec/ruby/shared/rational/divide.rb b/spec/ruby/shared/rational/divide.rb
deleted file mode 100644
index 7d6d66390f7e2c..00000000000000
--- a/spec/ruby/shared/rational/divide.rb
+++ /dev/null
@@ -1,71 +0,0 @@
-require_relative '../../spec_helper'
-
-describe :rational_divide_rat, shared: true do
-  it "returns self divided by other as a Rational" do
-    Rational(3, 4).send(@method, Rational(3, 4)).should eql(Rational(1, 1))
-    Rational(2, 4).send(@method, Rational(1, 4)).should eql(Rational(2, 1))
-
-    Rational(2, 4).send(@method, 2).should == Rational(1, 4)
-    Rational(6, 7).send(@method, -2).should == Rational(-3, 7)
-  end
-
-  it "raises a ZeroDivisionError when passed a Rational with a numerator of 0" do
-    -> { Rational(3, 4).send(@method, Rational(0, 1)) }.should raise_error(ZeroDivisionError)
-  end
-end
-
-describe :rational_divide_int, shared: true do
-  it "returns self divided by other as a Rational" do
-    Rational(3, 4).send(@method, 2).should eql(Rational(3, 8))
-    Rational(2, 4).send(@method, 2).should eql(Rational(1, 4))
-    Rational(6, 7).send(@method, -2).should eql(Rational(-3, 7))
-  end
-
-  it "raises a ZeroDivisionError when passed 0" do
-    -> { Rational(3, 4).send(@method, 0) }.should raise_error(ZeroDivisionError)
-  end
-end
-
-describe :rational_divide_float, shared: true do
-  it "returns self divided by other as a Float" do
-    Rational(3, 4).send(@method, 0.75).should eql(1.0)
-    Rational(3, 4).send(@method, 0.25).should eql(3.0)
-    Rational(3, 4).send(@method, 0.3).should eql(2.5)
-
-    Rational(-3, 4).send(@method, 0.3).should eql(-2.5)
-    Rational(3, -4).send(@method, 0.3).should eql(-2.5)
-    Rational(3, 4).send(@method, -0.3).should eql(-2.5)
-  end
-
-  it "returns infinity when passed 0" do
-    Rational(3, 4).send(@method, 0.0).infinite?.should eql(1)
-    Rational(-3, -4).send(@method, 0.0).infinite?.should eql(1)
-
-    Rational(-3, 4).send(@method, 0.0).infinite?.should eql(-1)
-    Rational(3, -4).send(@method, 0.0).infinite?.should eql(-1)
-  end
-end
-
-describe :rational_divide, shared: true do
-  it "calls #coerce on the passed argument with self" do
-    rational = Rational(3, 4)
-    obj = mock("Object")
-    obj.should_receive(:coerce).with(rational).and_return([1, 2])
-
-    rational.send(@method, obj)
-  end
-
-  it "calls #/ on the coerced Rational with the coerced Object" do
-    rational = Rational(3, 4)
-
-    coerced_rational = mock("Coerced Rational")
-    coerced_rational.should_receive(:/).and_return(:result)
-
-    coerced_obj = mock("Coerced Object")
-
-    obj = mock("Object")
-    obj.should_receive(:coerce).and_return([coerced_rational, coerced_obj])
-
-    rational.send(@method, obj).should == :result
-  end
-end
diff --git a/spec/ruby/shared/rational/divmod.rb b/spec/ruby/shared/rational/divmod.rb
deleted file mode 100644
index 9e23a181864117..00000000000000
--- a/spec/ruby/shared/rational/divmod.rb
+++ /dev/null
@@ -1,42 +0,0 @@
-require_relative '../../spec_helper'
-
-describe :rational_divmod_rat, shared: true do
-  it "returns the quotient as Integer and the remainder as Rational" do
-    Rational(7, 4).divmod(Rational(1, 2)).should eql([3, Rational(1, 4)])
-    Rational(7, 4).divmod(Rational(-1, 2)).should eql([-4, Rational(-1, 4)])
-    Rational(0, 4).divmod(Rational(4, 3)).should eql([0, Rational(0, 1)])
-
-    Rational(bignum_value, 4).divmod(Rational(4, 3)).should eql([3458764513820540928, Rational(0, 1)])
-  end
-
-  it "raises a ZeroDivisionError when passed a Rational with a numerator of 0" do
-    -> { Rational(7, 4).divmod(Rational(0, 3)) }.should raise_error(ZeroDivisionError)
-  end
-end
-
-describe :rational_divmod_int, shared: true do
-  it "returns the quotient as Integer and the remainder as Rational" do
-    Rational(7, 4).divmod(2).should eql([0, Rational(7, 4)])
-    Rational(7, 4).divmod(-2).should eql([-1, Rational(-1, 4)])
-
-    Rational(bignum_value, 4).divmod(3).should eql([1537228672809129301, Rational(1, 1)])
-  end
-
-  it "raises a ZeroDivisionError when passed 0" do
-    -> { Rational(7, 4).divmod(0) }.should raise_error(ZeroDivisionError)
-  end
-end
-
-describe :rational_divmod_float, shared: true do
-  it "returns the quotient as Integer and the remainder as Float" do
-    Rational(7, 4).divmod(0.5).should eql([3, 0.25])
-  end
-
-  it "returns the quotient as Integer and the remainder as Float" do
-    Rational(7, 4).divmod(-0.5).should eql([-4, -0.25])
-  end
-
-  it "raises a ZeroDivisionError when passed 0" do
-    -> { Rational(7, 4).divmod(0.0) }.should raise_error(ZeroDivisionError)
-  end
-end
diff --git a/spec/ruby/shared/rational/equal_value.rb b/spec/ruby/shared/rational/equal_value.rb
deleted file mode 100644
index b2e7e094155175..00000000000000
--- a/spec/ruby/shared/rational/equal_value.rb
+++ /dev/null
@@ -1,39 +0,0 @@
-require_relative '../../spec_helper'
-
-describe :rational_equal_value_rat, shared: true do
-  it "returns true if self has the same numerator and denominator as the passed argument" do
-    (Rational(3, 4) == Rational(3, 4)).should be_true
-    (Rational(-3, -4) == Rational(3, 4)).should be_true
-    (Rational(-4, 5) == Rational(4, -5)).should be_true
-
-    (Rational(bignum_value, 3) == Rational(bignum_value, 3)).should be_true
-    (Rational(-bignum_value, 3) == Rational(bignum_value, -3)).should be_true
-  end
-end
-
-describe :rational_equal_value_int, shared: true do
-  it "returns true if self has the passed argument as numerator and a denominator of 1" do
-    # Rational(x, y) reduces x and y automatically
-    (Rational(4, 2) == 2).should be_true
-    (Rational(-4, 2) == -2).should be_true
-    (Rational(4, -2) == -2).should be_true
-  end
-end
-
-describe :rational_equal_value_float, shared: true do
-  it "converts self to a Float and compares it with the passed argument" do
-    (Rational(3, 4) == 0.75).should be_true
-    (Rational(4, 2) == 2.0).should be_true
-    (Rational(-4, 2) == -2.0).should be_true
-    (Rational(4, -2) == -2.0).should be_true
-  end
-end
-
-describe :rational_equal_value, shared: true do
-  it "returns the result of calling #== with self on the passed argument" do
-    obj = mock("Object")
-    obj.should_receive(:==).and_return(:result)
-
-    (Rational(3, 4) == obj).should_not be_false
-  end
-end
diff --git a/spec/ruby/shared/rational/exponent.rb b/spec/ruby/shared/rational/exponent.rb
deleted file mode 100644
index b0e9b2357416e5..00000000000000
--- a/spec/ruby/shared/rational/exponent.rb
+++ /dev/null
@@ -1,196 +0,0 @@
-require_relative '../../spec_helper'
-
-describe :rational_exponent, shared: true do
-  describe "when passed Rational" do
-    # Guard against the Mathn library
-    guard -> { !defined?(Math.rsqrt) } do
-      it "returns Rational(1) if the exponent is Rational(0)" do
-        (Rational(0) ** Rational(0)).should eql(Rational(1))
-        (Rational(1) ** Rational(0)).should eql(Rational(1))
-        (Rational(3, 4) ** Rational(0)).should eql(Rational(1))
-        (Rational(-1) ** Rational(0)).should eql(Rational(1))
-        (Rational(-3, 4) ** Rational(0)).should eql(Rational(1))
-        (Rational(bignum_value) ** Rational(0)).should eql(Rational(1))
-        (Rational(-bignum_value) ** Rational(0)).should eql(Rational(1))
-      end
-
-      it "returns self raised to the argument as a Rational if the exponent's denominator is 1" do
-        (Rational(3, 4) ** Rational(1, 1)).should eql(Rational(3, 4))
-        (Rational(3, 4) ** Rational(2, 1)).should eql(Rational(9, 16))
-        (Rational(3, 4) ** Rational(-1, 1)).should eql(Rational(4, 3))
-        (Rational(3, 4) ** Rational(-2, 1)).should eql(Rational(16, 9))
-      end
-
-      it "returns self raised to the argument as a Float if the exponent's denominator is not 1" do
-        (Rational(3, 4) ** Rational(4, 3)).should be_close(0.681420222312052, TOLERANCE)
-        (Rational(3, 4) ** Rational(-4, 3)).should be_close(1.46752322173095, TOLERANCE)
-        (Rational(3, 4) ** Rational(4, -3)).should be_close(1.46752322173095, TOLERANCE)
-      end
-
-      it "returns a complex number when self is negative and the passed argument is not 0" do
-        (Rational(-3, 4) ** Rational(-4, 3)).should be_close(Complex(-0.7337616108654732, 1.2709123906625817), TOLERANCE)
-      end
-    end
-  end
-
-  describe "when passed Integer" do
-    it "returns the Rational value of self raised to the passed argument" do
-      (Rational(3, 4) ** 4).should == Rational(81, 256)
-      (Rational(3, 4) ** -4).should == Rational(256, 81)
-      (Rational(-3, 4) ** -4).should == Rational(256, 81)
-      (Rational(3, -4) ** -4).should == Rational(256, 81)
-
-      (Rational(bignum_value, 4) ** 4).should == Rational(452312848583266388373324160190187140051835877600158453279131187530910662656, 1)
-      (Rational(3, bignum_value) ** -4).should == Rational(115792089237316195423570985008687907853269984665640564039457584007913129639936, 81)
-      (Rational(-bignum_value, 4) ** -4).should == Rational(1, 452312848583266388373324160190187140051835877600158453279131187530910662656)
-      (Rational(3, -bignum_value) ** -4).should == Rational(115792089237316195423570985008687907853269984665640564039457584007913129639936, 81)
-    end
-
-    # Guard against the Mathn library
-    guard -> { !defined?(Math.rsqrt) } do
-      it "returns Rational(1, 1) when the passed argument is 0" do
-        (Rational(3, 4) ** 0).should eql(Rational(1, 1))
-        (Rational(-3, 4) ** 0).should eql(Rational(1, 1))
-        (Rational(3, -4) ** 0).should eql(Rational(1, 1))
-
-        (Rational(bignum_value, 4) ** 0).should eql(Rational(1, 1))
-        (Rational(3, -bignum_value) ** 0).should eql(Rational(1, 1))
-      end
-    end
-  end
-
-  describe "when passed Bignum" do
-    # #5713
-    it "returns Rational(0) when self is Rational(0) and the exponent is positive" do
-      (Rational(0) ** bignum_value).should eql(Rational(0))
-    end
-
-    it "raises ZeroDivisionError when self is Rational(0) and the exponent is negative" do
-      -> { Rational(0) ** -bignum_value }.should raise_error(ZeroDivisionError)
-    end
-
-    it "returns Rational(1) when self is Rational(1)" do
-      (Rational(1) **  bignum_value).should eql(Rational(1))
-      (Rational(1) ** -bignum_value).should eql(Rational(1))
-    end
-
-    it "returns Rational(1) when self is Rational(-1) and the exponent is positive and even" do
-      (Rational(-1) ** bignum_value(0)).should eql(Rational(1))
-      (Rational(-1) ** bignum_value(2)).should eql(Rational(1))
-    end
-
-    it "returns Rational(-1) when self is Rational(-1) and the exponent is positive and odd" do
-      (Rational(-1) ** bignum_value(1)).should eql(Rational(-1))
-      (Rational(-1) ** bignum_value(3)).should eql(Rational(-1))
-    end
-
-    it "returns positive Infinity when self is > 1" do
-      -> {
-        (Rational(2) ** bignum_value).infinite?.should == 1
-      }.should complain(/warning: in a\*\*b, b may be too big/)
-      -> {
-        (Rational(fixnum_max) ** bignum_value).infinite?.should == 1
-      }.should complain(/warning: in a\*\*b, b may be too big/)
-    end
-
-    it "returns 0.0 when self is > 1 and the exponent is negative" do
-      -> {
-        (Rational(2) ** -bignum_value).should eql(0.0)
-      }.should complain(/warning: in a\*\*b, b may be too big/)
-      -> {
-        (Rational(fixnum_max) ** -bignum_value).should eql(0.0)
-      }.should complain(/warning: in a\*\*b, b may be too big/)
-    end
-
-    # Fails on linux due to pow() bugs in glibc: http://sources.redhat.com/bugzilla/show_bug.cgi?id=3866
-    platform_is_not :linux do
-      it "returns positive Infinity when self < -1" do
-        -> {
-          (Rational(-2) ** bignum_value).infinite?.should == 1
-        }.should complain(/warning: in a\*\*b, b may be too big/)
-        -> {
-          (Rational(-2) ** (bignum_value + 1)).infinite?.should == 1
-        }.should complain(/warning: in a\*\*b, b may be too big/)
-        -> {
-          (Rational(fixnum_min) ** bignum_value).infinite?.should == 1
-        }.should complain(/warning: in a\*\*b, b may be too big/)
-      end
-
-      it "returns 0.0 when self is < -1 and the exponent is negative" do
-        -> {
-          (Rational(-2) ** -bignum_value).should eql(0.0)
-        }.should complain(/warning: in a\*\*b, b may be too big/)
-        -> {
-          (Rational(fixnum_min) ** -bignum_value).should eql(0.0)
-        }.should complain(/warning: in a\*\*b, b may be too big/)
-      end
-    end
-  end
-
-  describe "when passed Float" do
-    it "returns self converted to Float and raised to the passed argument" do
-      (Rational(3, 1) ** 3.0).should eql(27.0)
-      (Rational(3, 1) ** 1.5).should be_close(5.19615242270663, TOLERANCE)
-      (Rational(3, 1) ** -1.5).should be_close(0.192450089729875, TOLERANCE)
-    end
-
-    it "returns a complex number if self is negative and the passed argument is not 0" do
-      (Rational(-3, 2) ** 1.5).should be_close(Complex(0.0, -1.8371173070873836), TOLERANCE)
-      (Rational(3, -2) ** 1.5).should be_close(Complex(0.0, -1.8371173070873836), TOLERANCE)
-      (Rational(3, -2) ** -1.5).should be_close(Complex(0.0, 0.5443310539518174), TOLERANCE)
-    end
-
-    it "returns Complex(1.0) when the passed argument is 0.0" do
-      (Rational(3, 4) ** 0.0).should == Complex(1.0)
-      (Rational(-3, 4) ** 0.0).should == Complex(1.0)
-      (Rational(-3, 4) ** 0.0).should == Complex(1.0)
-    end
-  end
-
-  it "calls #coerce on the passed argument with self" do
-    rational = Rational(3, 4)
-    obj      = mock("Object")
-    obj.should_receive(:coerce).with(rational).and_return([1, 2])
-
-    rational ** obj
-  end
-
-  it "calls #** on the coerced Rational with the coerced Object" do
-    rational = Rational(3, 4)
-
-    coerced_rational = mock("Coerced Rational")
-    coerced_rational.should_receive(:**).and_return(:result)
-
-    coerced_obj = mock("Coerced Object")
-
-    obj = mock("Object")
-    obj.should_receive(:coerce).and_return([coerced_rational, coerced_obj])
-
-    (rational ** obj).should == :result
-  end
-
-  it "raises ZeroDivisionError for Rational(0, 1) passed a negative Integer" do
-    [-1, -4, -9999].each do |exponent|
-      -> { Rational(0, 1) ** exponent }.should raise_error(ZeroDivisionError, "divided by 0")
-    end
-  end
-
-  it "raises ZeroDivisionError for Rational(0, 1) passed a negative Rational with denominator 1" do
-    [Rational(-1, 1), Rational(-3, 1)].each do |exponent|
-      -> { Rational(0, 1) ** exponent }.should raise_error(ZeroDivisionError, "divided by 0")
-    end
-  end
-
-  # #7513
-  it "raises ZeroDivisionError for Rational(0, 1) passed a negative Rational" do
-    -> { Rational(0, 1) ** Rational(-3, 2) }.should raise_error(ZeroDivisionError, "divided by 0")
-  end
-
-  platform_is_not :solaris do # See https://github.com/ruby/spec/issues/134
-    it "returns Infinity for Rational(0, 1) passed a negative Float" do
-      [-1.0, -3.0, -3.14].each do |exponent|
-        (Rational(0, 1) ** exponent).infinite?.should == 1
-      end
-    end
-  end
-end
diff --git a/spec/ruby/shared/rational/fdiv.rb b/spec/ruby/shared/rational/fdiv.rb
deleted file mode 100644
index 6911ade8ac64e5..00000000000000
--- a/spec/ruby/shared/rational/fdiv.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-require_relative '../../spec_helper'
-
-describe :rational_fdiv, shared: true do
-  it "needs to be reviewed for spec completeness"
-end
diff --git a/spec/ruby/shared/rational/floor.rb b/spec/ruby/shared/rational/floor.rb
deleted file mode 100644
index ddf7fdbd173432..00000000000000
--- a/spec/ruby/shared/rational/floor.rb
+++ /dev/null
@@ -1,45 +0,0 @@
-require_relative '../../spec_helper'
-
-describe :rational_floor, shared: true do
-  before do
-    @rational = Rational(2200, 7)
-  end
-
-  describe "with no arguments (precision = 0)" do
-    it "returns an integer" do
-      @rational.floor.should be_kind_of(Integer)
-    end
-
-    it "returns the truncated value toward negative infinity" do
-      @rational.floor.should == 314
-      Rational(1, 2).floor.should == 0
-      Rational(-1, 2).floor.should == -1
-    end
-  end
-
-  describe "with a precision < 0" do
-    it "returns an integer" do
-      @rational.floor(-2).should be_kind_of(Integer)
-      @rational.floor(-1).should be_kind_of(Integer)
-    end
-
-    it "moves the truncation point n decimal places left" do
-      @rational.floor(-3).should == 0
-      @rational.floor(-2).should == 300
-      @rational.floor(-1).should == 310
-    end
-  end
-
-  describe "with a precision > 0" do
-    it "returns a Rational" do
-      @rational.floor(1).should be_kind_of(Rational)
-      @rational.floor(2).should be_kind_of(Rational)
-    end
-
-    it "moves the truncation point n decimal places right" do
-      @rational.floor(1).should == Rational(1571, 5)
-      @rational.floor(2).should == Rational(7857, 25)
-      @rational.floor(3).should == Rational(62857, 200)
-    end
-  end
-end
diff --git a/spec/ruby/shared/rational/hash.rb b/spec/ruby/shared/rational/hash.rb
deleted file mode 100644
index 50f21cec20aa81..00000000000000
--- a/spec/ruby/shared/rational/hash.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-require_relative '../../spec_helper'
-
-describe :rational_hash, shared: true do
-  # BUG: Rational(2, 3).hash == Rational(3, 2).hash
-  it "is static" do
-    Rational(2, 3).hash.should == Rational(2, 3).hash
-    Rational(2, 4).hash.should_not == Rational(2, 3).hash
-  end
-end
diff --git a/spec/ruby/shared/rational/inspect.rb b/spec/ruby/shared/rational/inspect.rb
deleted file mode 100644
index 19691a2f255fed..00000000000000
--- a/spec/ruby/shared/rational/inspect.rb
+++ /dev/null
@@ -1,14 +0,0 @@
-require_relative '../../spec_helper'
-
-describe :rational_inspect, shared: true do
-  it "returns a string representation of self" do
-    Rational(3, 4).inspect.should == "(3/4)"
-    Rational(-5, 8).inspect.should == "(-5/8)"
-    Rational(-1, -2).inspect.should == "(1/2)"
-
-    # Guard against the Mathn library
-    guard -> { !defined?(Math.rsqrt) } do
-      Rational(bignum_value, 1).inspect.should == "(#{bignum_value}/1)"
-    end
-  end
-end
diff --git a/spec/ruby/shared/rational/modulo.rb b/spec/ruby/shared/rational/modulo.rb
deleted file mode 100644
index 9e4b0c49e6ce70..00000000000000
--- a/spec/ruby/shared/rational/modulo.rb
+++ /dev/null
@@ -1,43 +0,0 @@
-require_relative '../../spec_helper'
-
-describe :rational_modulo, shared: true do
-  it "returns the remainder when this value is divided by other" do
-    Rational(2, 3).send(@method, Rational(2, 3)).should == Rational(0, 1)
-    Rational(4, 3).send(@method, Rational(2, 3)).should == Rational(0, 1)
-    Rational(2, -3).send(@method, Rational(-2, 3)).should == Rational(0, 1)
-    Rational(0, -1).send(@method, -1).should == Rational(0, 1)
-
-    Rational(7, 4).send(@method, Rational(1, 2)).should == Rational(1, 4)
-    Rational(7, 4).send(@method, 1).should == Rational(3, 4)
-    Rational(7, 4).send(@method, Rational(1, 7)).should == Rational(1, 28)
-
-    Rational(3, 4).send(@method, -1).should == Rational(-1, 4)
-    Rational(1, -5).send(@method, -1).should == Rational(-1, 5)
-  end
-
-  it "returns a Float value when the argument is Float" do
-    Rational(7, 4).send(@method, 1.0).should be_kind_of(Float)
-    Rational(7, 4).send(@method, 1.0).should == 0.75
-    Rational(7, 4).send(@method, 0.26).should be_close(0.19, 0.0001)
-  end
-
-  it "raises ZeroDivisionError on zero denominator" do
-    -> {
-      Rational(3, 5).send(@method, Rational(0, 1))
-    }.should raise_error(ZeroDivisionError)
-
-    -> {
-      Rational(0, 1).send(@method, Rational(0, 1))
-    }.should raise_error(ZeroDivisionError)
-
-    -> {
-      Rational(3, 5).send(@method, 0)
-    }.should raise_error(ZeroDivisionError)
-  end
-
-  it "raises a ZeroDivisionError when the argument is 0.0" do
-    -> {
-      Rational(3, 5).send(@method, 0.0)
-    }.should raise_error(ZeroDivisionError)
-  end
-end
diff --git a/spec/ruby/shared/rational/multiply.rb b/spec/ruby/shared/rational/multiply.rb
deleted file mode 100644
index 9c861cf79d3afb..00000000000000
--- a/spec/ruby/shared/rational/multiply.rb
+++ /dev/null
@@ -1,62 +0,0 @@
-require_relative '../../spec_helper'
-
-describe :rational_multiply_rat, shared: true do
-  it "returns self divided by other as a Rational" do
-    (Rational(3, 4) * Rational(3, 4)).should eql(Rational(9, 16))
-    (Rational(2, 4) * Rational(1, 4)).should eql(Rational(1, 8))
-
-    (Rational(3, 4) * Rational(0, 1)).should eql(Rational(0, 4))
-  end
-end
-
-describe :rational_multiply_int, shared: true do
-  it "returns self divided by other as a Rational" do
-    (Rational(3, 4) * 2).should eql(Rational(3, 2))
-    (Rational(2, 4) * 2).should eql(Rational(1, 1))
-    (Rational(6, 7) * -2).should eql(Rational(-12, 7))
-
-    (Rational(3, 4) * 0).should eql(Rational(0, 4))
-  end
-end
-
-describe :rational_multiply_float, shared: true do
-  it "returns self divided by other as a Float" do
-    (Rational(3, 4) * 0.75).should eql(0.5625)
-    (Rational(3, 4) * 0.25).should eql(0.1875)
-    (Rational(3, 4) * 0.3).should be_close(0.225, TOLERANCE)
-
-    (Rational(-3, 4) * 0.3).should be_close(-0.225, TOLERANCE)
-    (Rational(3, -4) * 0.3).should be_close(-0.225, TOLERANCE)
-    (Rational(3, 4) * -0.3).should be_close(-0.225, TOLERANCE)
-
-    (Rational(3, 4) * 0.0).should eql(0.0)
-    (Rational(-3, -4) * 0.0).should eql(0.0)
-
-    (Rational(-3, 4) * 0.0).should eql(0.0)
-    (Rational(3, -4) * 0.0).should eql(0.0)
-  end
-end
-
-describe :rational_multiply, shared: true do
-  it "calls #coerce on the passed argument with self" do
-    rational = Rational(3, 4)
-    obj = mock("Object")
-    obj.should_receive(:coerce).with(rational).and_return([1, 2])
-
-    rational * obj
-  end
-
-  it "calls #* on the coerced Rational with the coerced Object" do
-    rational = Rational(3, 4)
-
-    coerced_rational = mock("Coerced Rational")
-    coerced_rational.should_receive(:*).and_return(:result)
-
-    coerced_obj = mock("Coerced Object")
-
-    obj = mock("Object")
-    obj.should_receive(:coerce).and_return([coerced_rational, coerced_obj])
-
-    (rational * obj).should == :result
-  end
-end
diff --git a/spec/ruby/shared/rational/numerator.rb b/spec/ruby/shared/rational/numerator.rb
deleted file mode 100644
index 50d768168c1907..00000000000000
--- a/spec/ruby/shared/rational/numerator.rb
+++ /dev/null
@@ -1,10 +0,0 @@
-require_relative '../../spec_helper'
-
-describe :rational_numerator, shared: true do
-  it "returns the numerator" do
-    Rational(3, 4).numerator.should equal(3)
-    Rational(3, -4).numerator.should equal(-3)
-
-    Rational(bignum_value, 1).numerator.should == bignum_value
-  end
-end
diff --git a/spec/ruby/shared/rational/plus.rb b/spec/ruby/shared/rational/plus.rb
deleted file mode 100644
index b126360ee4962e..00000000000000
--- a/spec/ruby/shared/rational/plus.rb
+++ /dev/null
@@ -1,48 +0,0 @@
-require_relative '../../spec_helper'
-
-describe :rational_plus_rat, shared: true do
-  it "returns the result of subtracting other from self as a Rational" do
-    (Rational(3, 4) + Rational(0, 1)).should eql(Rational(3, 4))
-    (Rational(3, 4) + Rational(1, 4)).should eql(Rational(1, 1))
-
-    (Rational(3, 4) + Rational(2, 1)).should eql(Rational(11, 4))
-  end
-end
-
-describe :rational_plus_int, shared: true do
-  it "returns the result of subtracting other from self as a Rational" do
-    (Rational(3, 4) + 1).should eql(Rational(7, 4))
-    (Rational(3, 4) + 2).should eql(Rational(11, 4))
-  end
-end
-
-describe :rational_plus_float, shared: true do
-  it "returns the result of subtracting other from self as a Float" do
-    (Rational(3, 4) + 0.2).should eql(0.95)
-    (Rational(3, 4) + 2.5).should eql(3.25)
-  end
-end
-
-describe :rational_plus, shared: true do
-  it "calls #coerce on the passed argument with self" do
-    rational = Rational(3, 4)
-    obj = mock("Object")
-    obj.should_receive(:coerce).with(rational).and_return([1, 2])
-
-    rational + obj
-  end
-
-  it "calls #+ on the coerced Rational with the coerced Object" do
-    rational = Rational(3, 4)
-
-    coerced_rational = mock("Coerced Rational")
-    coerced_rational.should_receive(:+).and_return(:result)
-
-    coerced_obj = mock("Coerced Object")
-
-    obj = mock("Object")
-    obj.should_receive(:coerce).and_return([coerced_rational, coerced_obj])
-
-    (rational + obj).should == :result
-  end
-end
diff --git a/spec/ruby/shared/rational/remainder.rb b/spec/ruby/shared/rational/remainder.rb
deleted file mode 100644
index dd907608db209c..00000000000000
--- a/spec/ruby/shared/rational/remainder.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-require_relative '../../spec_helper'
-
-describe :rational_remainder, shared: true do
-  it "needs to be reviewed for spec completeness"
-end
diff --git a/spec/ruby/shared/rational/round.rb b/spec/ruby/shared/rational/round.rb
deleted file mode 100644
index 5b159ee3e6c691..00000000000000
--- a/spec/ruby/shared/rational/round.rb
+++ /dev/null
@@ -1,106 +0,0 @@
-require_relative '../../spec_helper'
-
-describe :rational_round, shared: true do
-  before do
-    @rational = Rational(2200, 7)
-  end
-
-  describe "with no arguments (precision = 0)" do
-    it "returns an integer" do
-      @rational.round.should be_kind_of(Integer)
-      Rational(0, 1).round(0).should be_kind_of(Integer)
-      Rational(124, 1).round(0).should be_kind_of(Integer)
-    end
-
-    it "returns the truncated value toward the nearest integer" do
-      @rational.round.should == 314
-      Rational(0, 1).round(0).should == 0
-      Rational(2, 1).round(0).should == 2
-    end
-
-    it "returns the rounded value toward the nearest integer" do
-      Rational(1, 2).round.should == 1
-      Rational(-1, 2).round.should == -1
-      Rational(3, 2).round.should == 2
-      Rational(-3, 2).round.should == -2
-      Rational(5, 2).round.should == 3
-      Rational(-5, 2).round.should == -3
-    end
-  end
-
-  describe "with a precision < 0" do
-    it "returns an integer" do
-      @rational.round(-2).should be_kind_of(Integer)
-      @rational.round(-1).should be_kind_of(Integer)
-      Rational(0, 1).round(-1).should be_kind_of(Integer)
-      Rational(2, 1).round(-1).should be_kind_of(Integer)
-    end
-
-    it "moves the truncation point n decimal places left" do
-      @rational.round(-3).should == 0
-      @rational.round(-2).should == 300
-      @rational.round(-1).should == 310
-    end
-  end
-
-  describe "with a precision > 0" do
-    it "returns a Rational" do
-      @rational.round(1).should be_kind_of(Rational)
-      @rational.round(2).should be_kind_of(Rational)
-      # Guard against the Mathn library
-      guard -> { !defined?(Math.rsqrt) } do
-        Rational(0, 1).round(1).should be_kind_of(Rational)
-        Rational(2, 1).round(1).should be_kind_of(Rational)
-      end
-    end
-
-    it "moves the truncation point n decimal places right" do
-      @rational.round(1).should == Rational(3143, 10)
-      @rational.round(2).should == Rational(31429, 100)
-      @rational.round(3).should == Rational(157143, 500)
-      Rational(0, 1).round(1).should == Rational(0, 1)
-      Rational(2, 1).round(1).should == Rational(2, 1)
-    end
-
-    it "doesn't alter the value if the precision is too great" do
-      Rational(3, 2).round(10).should == Rational(3, 2).round(20)
-    end
-
-    # #6605
-    it "doesn't fail when rounding to an absurdly large positive precision" do
-      Rational(3, 2).round(2_097_171).should == Rational(3, 2)
-    end
-  end
-
-  describe "with half option" do
-    it "returns an Integer when precision is not passed" do
-      Rational(10, 4).round(half: nil).should == 3
-      Rational(10, 4).round(half: :up).should == 3
-      Rational(10, 4).round(half: :down).should == 2
-      Rational(10, 4).round(half: :even).should == 2
-      Rational(-10, 4).round(half: nil).should == -3
-      Rational(-10, 4).round(half: :up).should == -3
-      Rational(-10, 4).round(half: :down).should == -2
-      Rational(-10, 4).round(half: :even).should == -2
-    end
-
-    it "returns a Rational when the precision is greater than 0" do
-      Rational(25, 100).round(1, half: nil).should == Rational(3, 10)
-      Rational(25, 100).round(1, half: :up).should == Rational(3, 10)
-      Rational(25, 100).round(1, half: :down).should == Rational(1, 5)
-      Rational(25, 100).round(1, half: :even).should == Rational(1, 5)
-      Rational(35, 100).round(1, half: nil).should == Rational(2, 5)
-      Rational(35, 100).round(1, half: :up).should == Rational(2, 5)
-      Rational(35, 100).round(1, half: :down).should == Rational(3, 10)
-      Rational(35, 100).round(1, half: :even).should == Rational(2, 5)
-      Rational(-25, 100).round(1, half: nil).should == Rational(-3, 10)
-      Rational(-25, 100).round(1, half: :up).should == Rational(-3, 10)
-      Rational(-25, 100).round(1, half: :down).should == Rational(-1, 5)
-      Rational(-25, 100).round(1, half: :even).should == Rational(-1, 5)
-    end
-
-    it "raise for a non-existent round mode" do
-      -> { Rational(10, 4).round(half: :nonsense) }.should raise_error(ArgumentError, "invalid rounding mode: nonsense")
-    end
-  end
-end
diff --git a/spec/ruby/shared/rational/to_f.rb b/spec/ruby/shared/rational/to_f.rb
deleted file mode 100644
index 472a585daad04a..00000000000000
--- a/spec/ruby/shared/rational/to_f.rb
+++ /dev/null
@@ -1,16 +0,0 @@
-require_relative '../../spec_helper'
-
-describe :rational_to_f, shared: true do
-  it "returns self converted to a Float" do
-    Rational(3, 4).to_f.should eql(0.75)
-    Rational(3, -4).to_f.should eql(-0.75)
-    Rational(-1, 4).to_f.should eql(-0.25)
-    Rational(-1, -4).to_f.should eql(0.25)
-  end
-
-  it "converts to a Float for large numerator and denominator" do
-    num = 1000000000000000000000000000000000048148248609680896326399448564623182963452541226153892315137780403285956264146010000000000000000000000000000000000048148248609680896326399448564623182963452541226153892315137780403285956264146010000000000000000000000000000000000048148248609680896326399448564623182963452541226153892315137780403285956264146009
-    den = 2000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-    Rational(num, den).to_f.should == 500.0
-  end
-end
diff --git a/spec/ruby/shared/rational/to_i.rb b/spec/ruby/shared/rational/to_i.rb
deleted file mode 100644
index 9be1183aa41b7f..00000000000000
--- a/spec/ruby/shared/rational/to_i.rb
+++ /dev/null
@@ -1,12 +0,0 @@
-require_relative '../../spec_helper'
-
-describe :rational_to_i, shared: true do
-  it "converts self to an Integer by truncation" do
-    Rational(7, 4).to_i.should eql(1)
-    Rational(11, 4).to_i.should eql(2)
-  end
-
-  it "converts self to an Integer by truncation" do
-    Rational(-7, 4).to_i.should eql(-1)
-  end
-end
diff --git a/spec/ruby/shared/rational/to_r.rb b/spec/ruby/shared/rational/to_r.rb
deleted file mode 100644
index 372c0868505c70..00000000000000
--- a/spec/ruby/shared/rational/to_r.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-require_relative '../../spec_helper'
-
-describe :rational_to_r, shared: true do
-  it "returns self" do
-    a = Rational(3, 4)
-    a.to_r.should equal(a)
-
-    a = Rational(bignum_value, 4)
-    a.to_r.should equal(a)
-  end
-end
diff --git a/spec/ruby/shared/rational/to_s.rb b/spec/ruby/shared/rational/to_s.rb
deleted file mode 100644
index e90c6e5e392119..00000000000000
--- a/spec/ruby/shared/rational/to_s.rb
+++ /dev/null
@@ -1,14 +0,0 @@
-require_relative '../../spec_helper'
-
-describe :rational_to_s, shared: true do
-  it "returns a string representation of self" do
-    # Guard against the Mathn library
-    guard -> { !defined?(Math.rsqrt) } do
-      Rational(1, 1).to_s.should == "1/1"
-      Rational(2, 1).to_s.should == "2/1"
-    end
-    Rational(1, 2).to_s.should == "1/2"
-    Rational(-1, 3).to_s.should == "-1/3"
-    Rational(1, -3).to_s.should == "-1/3"
-  end
-end
diff --git a/spec/ruby/shared/rational/truncate.rb b/spec/ruby/shared/rational/truncate.rb
deleted file mode 100644
index df5198ca02dc0f..00000000000000
--- a/spec/ruby/shared/rational/truncate.rb
+++ /dev/null
@@ -1,71 +0,0 @@
-require_relative '../../spec_helper'
-
-describe :rational_truncate, shared: true do
-  before do
-    @rational = Rational(2200, 7)
-  end
-
-  describe "with no arguments (precision = 0)" do
-    it "returns an integer" do
-      @rational.truncate.should be_kind_of(Integer)
-    end
-
-    it "returns the truncated value toward 0" do
-      @rational.truncate.should == 314
-      Rational(1, 2).truncate.should == 0
-      Rational(-1, 2).truncate.should == 0
-    end
-  end
-
-  describe "with an explicit precision = 0" do
-    it "returns an integer" do
-      @rational.truncate(0).should be_kind_of(Integer)
-    end
-
-    it "returns the truncated value toward 0" do
-      @rational.truncate(0).should == 314
-      Rational(1, 2).truncate(0).should == 0
-      Rational(-1, 2).truncate(0).should == 0
-    end
-  end
-
-  describe "with a precision < 0" do
-    it "returns an integer" do
-      @rational.truncate(-2).should be_kind_of(Integer)
-      @rational.truncate(-1).should be_kind_of(Integer)
-    end
-
-    it "moves the truncation point n decimal places left" do
-      @rational.truncate(-3).should == 0
-      @rational.truncate(-2).should == 300
-      @rational.truncate(-1).should == 310
-    end
-  end
-
-  describe "with a precision > 0" do
-    it "returns a Rational" do
-      @rational.truncate(1).should be_kind_of(Rational)
-      @rational.truncate(2).should be_kind_of(Rational)
-    end
-
-    it "moves the truncation point n decimal places right" do
-      @rational.truncate(1).should == Rational(1571, 5)
-      @rational.truncate(2).should == Rational(7857, 25)
-      @rational.truncate(3).should == Rational(62857, 200)
-    end
-  end
-
-  describe "with an invalid value for precision" do
-    it "raises a TypeError" do
-      -> { @rational.truncate(nil) }.should raise_error(TypeError, "not an integer")
-      -> { @rational.truncate(1.0) }.should raise_error(TypeError, "not an integer")
-      -> { @rational.truncate('') }.should raise_error(TypeError, "not an integer")
-    end
-
-    it "does not call to_int on the argument" do
-      object = Object.new
-      object.should_not_receive(:to_int)
-      -> { @rational.truncate(object) }.should raise_error(TypeError, "not an integer")
-    end
-  end
-end
diff --git a/spec/ruby/shared/sizedqueue/enque.rb b/spec/ruby/shared/sizedqueue/enque.rb
index 3bc8008fa4e982..6804af3fb33292 100644
--- a/spec/ruby/shared/sizedqueue/enque.rb
+++ b/spec/ruby/shared/sizedqueue/enque.rb
@@ -49,87 +49,81 @@
   end
 
   describe "with a timeout" do
-    ruby_version_is "3.2" do
-      it "returns self if the item was pushed in time" do
-        q = @object.call(1)
-        q << 1
-
-        t = Thread.new {
-          q.send(@method, 2, timeout: 1).should == q
-        }
-        Thread.pass until t.status == "sleep" && q.num_waiting == 1
-        q.pop
-        t.join
-      end
-
-      it "does nothing if the timeout is nil" do
-        q = @object.call(1)
-        q << 1
-        t = Thread.new {
-          q.send(@method, 2, timeout: nil).should == q
-        }
-        t.join(0.2).should == nil
-        q.pop
-        t.join
-      end
-
-      it "returns nil if no space is avialable and timeout is 0" do
-        q = @object.call(1)
-        q.send(@method, 1, timeout: 0).should == q
-        q.send(@method, 2, timeout: 0).should == nil
-      end
-
-      it "returns nil if no space is available in time" do
-        q = @object.call(1)
-        q << 1
-        t = Thread.new {
-          q.send(@method, 2, timeout: 0.1).should == nil
-        }
-        t.join
-      end
-
-      it "raise TypeError if timeout is not a valid numeric" do
-        q = @object.call(1)
-        -> { q.send(@method, 2, timeout: "1") }.should raise_error(
-          TypeError,
-          "no implicit conversion to float from string",
-        )
-
-        -> { q.send(@method, 2, timeout: false) }.should raise_error(
-          TypeError,
-          "no implicit conversion to float from false",
-        )
-      end
-
-      it "raise ArgumentError if non_block = true is passed too" do
-        q = @object.call(1)
-        -> { q.send(@method, 2, true, timeout: 1) }.should raise_error(
-          ArgumentError,
-          "can't set a timeout if non_block is enabled",
-        )
-      end
-
-      it "raise ClosedQueueError when closed before enqueued" do
-        q = @object.call(1)
-        q.close
-        -> { q.send(@method, 2, timeout: 1) }.should raise_error(ClosedQueueError, "queue closed")
-      end
-
-      it "interrupts enqueuing threads with ClosedQueueError when the queue is closed" do
-        q = @object.call(1)
-        q << 1
-
-        t = Thread.new {
-          -> { q.send(@method, 1, timeout: 0.1) }.should raise_error(ClosedQueueError, "queue closed")
-        }
-
-        Thread.pass until q.num_waiting == 1
-
-        q.close
-
-        t.join
-        q.pop.should == 1
-      end
+    it "returns self if the item was pushed in time" do
+      q = @object.call(1)
+      q << 1
+
+      t = Thread.new {
+        q.send(@method, 2, timeout: TIME_TOLERANCE).should == q
+      }
+      Thread.pass until t.status == "sleep" && q.num_waiting == 1
+      q.pop
+      t.join
+    end
+
+    it "does nothing if the timeout is nil" do
+      q = @object.call(1)
+      q << 1
+      t = Thread.new {
+        q.send(@method, 2, timeout: nil).should == q
+      }
+      t.join(0.2).should == nil
+      q.pop
+      t.join
+    end
+
+    it "returns nil if no space is available and timeout is 0" do
+      q = @object.call(1)
+      q.send(@method, 1, timeout: 0).should == q
+      q.send(@method, 2, timeout: 0).should == nil
+    end
+
+    it "returns nil if no space is available in time" do
+      q = @object.call(1)
+      q << 1
+      Thread.new {
+        q.send(@method, 2, timeout: 0.001).should == nil
+      }.join
+    end
+
+    it "raise TypeError if timeout is not a valid numeric" do
+      q = @object.call(1)
+      -> {
+        q.send(@method, 2, timeout: "1")
+      }.should raise_error(TypeError, "no implicit conversion to float from string")
+
+      -> {
+        q.send(@method, 2, timeout: false)
+      }.should raise_error(TypeError, "no implicit conversion to float from false")
+    end
+
+    it "raise ArgumentError if non_block = true is passed too" do
+      q = @object.call(1)
+      -> {
+        q.send(@method, 2, true, timeout: 1)
+      }.should raise_error(ArgumentError, "can't set a timeout if non_block is enabled")
+    end
+
+    it "raise ClosedQueueError when closed before enqueued" do
+      q = @object.call(1)
+      q.close
+      -> { q.send(@method, 2, timeout: 1) }.should raise_error(ClosedQueueError, "queue closed")
+    end
+
+    it "interrupts enqueuing threads with ClosedQueueError when the queue is closed" do
+      q = @object.call(1)
+      q << 1
+
+      t = Thread.new {
+        -> { q.send(@method, 1, timeout: TIME_TOLERANCE) }.should raise_error(ClosedQueueError, "queue closed")
+      }
+
+      Thread.pass until q.num_waiting == 1
+
+      q.close
+
+      t.join
+      q.pop.should == 1
     end
   end
 end
diff --git a/spec/ruby/shared/string/end_with.rb b/spec/ruby/shared/string/end_with.rb
index 0e4c1386e8e7eb..08f43c1bce7071 100644
--- a/spec/ruby/shared/string/end_with.rb
+++ b/spec/ruby/shared/string/end_with.rb
@@ -55,7 +55,7 @@
   it "checks that we are starting to match at the head of a character" do
     "\xC3\xA9".send(@method).should_not.end_with?("\xA9")
     "\xe3\x81\x82".send(@method).should_not.end_with?("\x82")
-    "ab".force_encoding("UTF-16BE").send(@method).should_not.end_with?(
-        "b".force_encoding("UTF-16BE"))
+    "\xd8\x00\xdc\x00".dup.force_encoding("UTF-16BE").send(@method).should_not.end_with?(
+        "\xdc\x00".dup.force_encoding("UTF-16BE"))
   end
 end
diff --git a/spec/ruby/shared/string/start_with.rb b/spec/ruby/shared/string/start_with.rb
index 91fc50c4cdd3e3..4b947a3bbf0ea8 100644
--- a/spec/ruby/shared/string/start_with.rb
+++ b/spec/ruby/shared/string/start_with.rb
@@ -70,7 +70,13 @@
     $1.should be_nil
   end
 
-  ruby_bug "#19784", ""..."3.3" do
+  ruby_version_is ""..."3.3" do
+    it "does not check that we are not matching part of a character" do
+      "\xC3\xA9".send(@method).should.start_with?("\xC3")
+    end
+  end
+
+  ruby_version_is "3.3" do # #19784
     it "checks that we are not matching part of a character" do
       "\xC3\xA9".send(@method).should_not.start_with?("\xC3")
     end
diff --git a/spec/ruby/shared/string/times.rb b/spec/ruby/shared/string/times.rb
index be3b622f73bff7..4814f894cf0217 100644
--- a/spec/ruby/shared/string/times.rb
+++ b/spec/ruby/shared/string/times.rb
@@ -39,18 +39,18 @@ class MyString < String; end
   end
 
   it "returns a String in the same encoding as self" do
-    str = "\xE3\x81\x82".force_encoding Encoding::UTF_8
+    str = "\xE3\x81\x82".dup.force_encoding Encoding::UTF_8
     result = @object.call(str, 2)
     result.encoding.should equal(Encoding::UTF_8)
   end
 
-  platform_is wordsize: 32 do
+  platform_is c_long_size: 32 do
     it "raises an ArgumentError if the length of the resulting string doesn't fit into a long" do
       -> { @object.call("abc", (2 ** 31) - 1) }.should raise_error(ArgumentError)
     end
   end
 
-  platform_is wordsize: 64 do
+  platform_is c_long_size: 64 do
     it "raises an ArgumentError if the length of the resulting string doesn't fit into a long" do
       -> { @object.call("abc", (2 ** 63) - 1) }.should raise_error(ArgumentError)
     end
diff --git a/spec/ruby/shared/time/yday.rb b/spec/ruby/shared/time/yday.rb
new file mode 100644
index 00000000000000..f81c45261cf9c7
--- /dev/null
+++ b/spec/ruby/shared/time/yday.rb
@@ -0,0 +1,18 @@
+describe :time_yday, shared: true do
+  it 'returns the correct value for each day of each month' do
+    mdays = [31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31]
+
+    yday = 1
+    mdays.each_with_index do |days, month|
+      days.times do |day|
+        @method.call(2014, month+1, day+1).should == yday
+        yday += 1
+      end
+    end
+  end
+
+  it 'supports leap years' do
+    @method.call(2016, 2, 29).should == 31 + 29
+    @method.call(2016, 3, 1).should == 31 + 29 + 1
+  end
+end
diff --git a/spec/syntax_suggest/integration/ruby_command_line_spec.rb b/spec/syntax_suggest/integration/ruby_command_line_spec.rb
index d3cc4ca9d9e708..c1ec4be54e2c2f 100644
--- a/spec/syntax_suggest/integration/ruby_command_line_spec.rb
+++ b/spec/syntax_suggest/integration/ruby_command_line_spec.rb
@@ -9,7 +9,7 @@ module SyntaxSuggest
       Dir.mktmpdir do |dir|
         tmpdir = Pathname(dir)
         script = tmpdir.join("script.rb")
-        script.write <<~'EOM'
+        script.write <<~EOM
           puts Kernel.private_methods
         EOM
 
@@ -159,7 +159,7 @@ class Dog
       Dir.mktmpdir do |dir|
         tmpdir = Pathname(dir)
         script = tmpdir.join("script.rb")
-        script.write <<~'EOM'
+        script.write <<~EOM
           $stderr = STDOUT
           eval("def lol")
         EOM
@@ -178,7 +178,7 @@ class Dog
       Dir.mktmpdir do |dir|
         tmpdir = Pathname(dir)
         script = tmpdir.join("script.rb")
-        script.write <<~'EOM'
+        script.write <<~EOM
           break
         EOM
 
diff --git a/spec/syntax_suggest/integration/syntax_suggest_spec.rb b/spec/syntax_suggest/integration/syntax_suggest_spec.rb
index 64dafabcddee0e..015d088c92229d 100644
--- a/spec/syntax_suggest/integration/syntax_suggest_spec.rb
+++ b/spec/syntax_suggest/integration/syntax_suggest_spec.rb
@@ -4,6 +4,10 @@
 
 module SyntaxSuggest
   RSpec.describe "Integration tests that don't spawn a process (like using the cli)" do
+    before(:each) do
+      skip "Benchmark is not available" unless defined?(::Benchmark)
+    end
+
     it "does not timeout on massive files" do
       next unless ENV["SYNTAX_SUGGEST_TIMEOUT"]
 
@@ -26,7 +30,7 @@ module SyntaxSuggest
       debug_display(io.string)
       debug_display(benchmark)
 
-      expect(io.string).to include(<<~'EOM')
+      expect(io.string).to include(<<~EOM)
              6  class SyntaxTree < Ripper
            170    def self.parse(source)
            174    end
@@ -54,7 +58,7 @@ module SyntaxSuggest
       end
 
       expect(io.string).to_not include("def ruby_install_binstub_path")
-      expect(io.string).to include(<<~'EOM')
+      expect(io.string).to include(<<~EOM)
         > 1067    def add_yarn_binary
         > 1068      return [] if yarn_preinstalled?
         > 1069  |
@@ -72,7 +76,7 @@ module SyntaxSuggest
       )
       debug_display(io.string)
 
-      expect(io.string).to include(<<~'EOM')
+      expect(io.string).to include(<<~EOM)
            1  Rails.application.routes.draw do
         > 113    namespace :admin do
         > 116    match "/foobar(*path)", via: :all, to: redirect { |_params, req|
@@ -91,7 +95,7 @@ module SyntaxSuggest
       )
       debug_display(io.string)
 
-      expect(io.string).to include(<<~'EOM')
+      expect(io.string).to include(<<~EOM)
            1  describe "webmock tests" do
           22    it "body" do
           27      query = Cutlass::FunctionQuery.new(
@@ -113,7 +117,7 @@ module SyntaxSuggest
       )
       debug_display(io.string)
 
-      expect(io.string).to include(<<~'EOM')
+      expect(io.string).to include(<<~EOM)
            5  module DerailedBenchmarks
            6    class RequireTree
         > 13      def initialize(name)
@@ -166,7 +170,7 @@ module SyntaxSuggest
     end
 
     it "ambiguous end" do
-      source = <<~'EOM'
+      source = <<~EOM
         def call          # 0
             print "lol"   # 1
           end # one       # 2
@@ -186,7 +190,7 @@ def call          # 0
     end
 
     it "simple regression" do
-      source = <<~'EOM'
+      source = <<~EOM
         class Dog
           def bark
             puts "woof"
@@ -206,7 +210,7 @@ def bark
     end
 
     it "empty else" do
-      source = <<~'EOM'
+      source = <<~EOM
         class Foo
           def foo
             if cond?
diff --git a/spec/syntax_suggest/spec_helper.rb b/spec/syntax_suggest/spec_helper.rb
index 89bc9f4ab1e638..b5d2924e698615 100644
--- a/spec/syntax_suggest/spec_helper.rb
+++ b/spec/syntax_suggest/spec_helper.rb
@@ -3,7 +3,10 @@
 require "bundler/setup"
 require "syntax_suggest/api"
 
-require "benchmark"
+begin
+  require "benchmark"
+rescue LoadError
+end
 require "tempfile"
 
 RSpec.configure do |config|
diff --git a/spec/syntax_suggest/unit/api_spec.rb b/spec/syntax_suggest/unit/api_spec.rb
index 079a91e46d0209..e900b9e10b8ef4 100644
--- a/spec/syntax_suggest/unit/api_spec.rb
+++ b/spec/syntax_suggest/unit/api_spec.rb
@@ -8,6 +8,12 @@
 
 module SyntaxSuggest
   RSpec.describe "Top level SyntaxSuggest api" do
+    it "doesn't load prism if env var is set" do
+      skip("SYNTAX_SUGGEST_DISABLE_PRISM not set") unless ENV["SYNTAX_SUGGEST_DISABLE_PRISM"]
+
+      expect(SyntaxSuggest.use_prism_parser?).to be_falsey
+    end
+
     it "has a `handle_error` interface" do
       fake_error = Object.new
       def fake_error.message
diff --git a/spec/syntax_suggest/unit/around_block_scan_spec.rb b/spec/syntax_suggest/unit/around_block_scan_spec.rb
index d6756448bdd7cf..6c940a5919b6d6 100644
--- a/spec/syntax_suggest/unit/around_block_scan_spec.rb
+++ b/spec/syntax_suggest/unit/around_block_scan_spec.rb
@@ -5,7 +5,7 @@
 module SyntaxSuggest
   RSpec.describe AroundBlockScan do
     it "continues scan from last location even if scan is false" do
-      source = <<~'EOM'
+      source = <<~EOM
         print 'omg'
         print 'lol'
         print 'haha'
diff --git a/spec/syntax_suggest/unit/block_expand_spec.rb b/spec/syntax_suggest/unit/block_expand_spec.rb
index 5cff73621d2caa..fde03607750ee9 100644
--- a/spec/syntax_suggest/unit/block_expand_spec.rb
+++ b/spec/syntax_suggest/unit/block_expand_spec.rb
@@ -146,7 +146,7 @@ def foo
       EOM
     end
 
-    it "expand until next boundry (indentation)" do
+    it "expand until next boundary (indentation)" do
       source_string = <<~EOM
         describe "what" do
           Foo.call
@@ -188,7 +188,7 @@ def foo
       EOM
     end
 
-    it "expand until next boundry (empty lines)" do
+    it "expand until next boundary (empty lines)" do
       source_string = <<~EOM
         describe "what" do
         end
diff --git a/spec/syntax_suggest/unit/capture/before_after_keyword_ends_spec.rb b/spec/syntax_suggest/unit/capture/before_after_keyword_ends_spec.rb
index 02d9be4387952e..09f8d90d335e4c 100644
--- a/spec/syntax_suggest/unit/capture/before_after_keyword_ends_spec.rb
+++ b/spec/syntax_suggest/unit/capture/before_after_keyword_ends_spec.rb
@@ -5,7 +5,7 @@
 module SyntaxSuggest
   RSpec.describe Capture::BeforeAfterKeywordEnds do
     it "before after keyword ends" do
-      source = <<~'EOM'
+      source = <<~EOM
         def nope
           print 'not me'
         end
@@ -36,7 +36,7 @@ def nada
       ).call
       lines.sort!
 
-      expect(lines.join).to include(<<~'EOM')
+      expect(lines.join).to include(<<~EOM)
         def lol
         end
         def yolo
diff --git a/spec/syntax_suggest/unit/capture/falling_indent_lines_spec.rb b/spec/syntax_suggest/unit/capture/falling_indent_lines_spec.rb
index 61d1642d97e51d..ed2265539aeb2e 100644
--- a/spec/syntax_suggest/unit/capture/falling_indent_lines_spec.rb
+++ b/spec/syntax_suggest/unit/capture/falling_indent_lines_spec.rb
@@ -5,7 +5,7 @@
 module SyntaxSuggest
   RSpec.describe Capture::FallingIndentLines do
     it "on_falling_indent" do
-      source = <<~'EOM'
+      source = <<~EOM
         class OH
           def lol
             print 'lol
@@ -33,7 +33,7 @@ def yolo
       end
       lines.sort!
 
-      expect(lines.join).to eq(<<~'EOM')
+      expect(lines.join).to eq(<<~EOM)
         class OH
           def hello
           end
diff --git a/spec/syntax_suggest/unit/capture_code_context_spec.rb b/spec/syntax_suggest/unit/capture_code_context_spec.rb
index 46f13e8961bf3d..d9379d0ce7a2b9 100644
--- a/spec/syntax_suggest/unit/capture_code_context_spec.rb
+++ b/spec/syntax_suggest/unit/capture_code_context_spec.rb
@@ -5,7 +5,7 @@
 module SyntaxSuggest
   RSpec.describe CaptureCodeContext do
     it "capture_before_after_kws two" do
-      source = <<~'EOM'
+      source = <<~EOM
         class OH
 
           def hello
@@ -23,7 +23,7 @@ def hai
         code_lines: code_lines
       )
       display.capture_before_after_kws(block)
-      expect(display.sorted_lines.join).to eq(<<~'EOM'.indent(2))
+      expect(display.sorted_lines.join).to eq(<<~EOM.indent(2))
         def hello
         def hai
         end
@@ -31,7 +31,7 @@ def hai
     end
 
     it "capture_before_after_kws" do
-      source = <<~'EOM'
+      source = <<~EOM
         def sit
         end
 
@@ -50,7 +50,7 @@ def eat
       )
 
       lines = display.capture_before_after_kws(block).sort
-      expect(lines.join).to eq(<<~'EOM')
+      expect(lines.join).to eq(<<~EOM)
         def sit
         end
         def bark
@@ -60,7 +60,7 @@ def eat
     end
 
     it "handles ambiguous end" do
-      source = <<~'EOM'
+      source = <<~EOM
         def call          # 0
             print "lol"   # 1
           end # one       # 2
@@ -79,7 +79,7 @@ def call          # 0
 
       lines = lines.sort.map(&:original)
 
-      expect(lines.join).to eq(<<~'EOM')
+      expect(lines.join).to eq(<<~EOM)
         def call          # 0
           end # one       # 2
         end # two         # 3
@@ -94,7 +94,7 @@ def call          # 0
       code_lines = CleanDocument.new(source: source).call.lines
 
       code_lines[0..75].each(&:mark_invisible)
-      code_lines[77..-1].each(&:mark_invisible)
+      code_lines[77..].each(&:mark_invisible)
       expect(code_lines.join.strip).to eq("class Lookups")
 
       block = CodeBlock.new(lines: code_lines[76..149])
@@ -106,7 +106,7 @@ def call          # 0
       lines = display.call
 
       lines = lines.sort.map(&:original)
-      expect(lines.join).to include(<<~'EOM'.indent(2))
+      expect(lines.join).to include(<<~EOM.indent(2))
         class Lookups
           def format_requires
         end
@@ -114,7 +114,7 @@ def format_requires
     end
 
     it "shows ends of captured block" do
-      source = <<~'EOM'
+      source = <<~EOM
         class Dog
           def bark
             puts "woof"
@@ -123,7 +123,7 @@ def bark
 
       code_lines = CleanDocument.new(source: source).call.lines
       block = CodeBlock.new(lines: code_lines)
-      code_lines[1..-1].each(&:mark_invisible)
+      code_lines[1..].each(&:mark_invisible)
 
       expect(block.to_s.strip).to eq("class Dog")
 
@@ -132,7 +132,7 @@ def bark
         code_lines: code_lines
       )
       lines = display.call.sort.map(&:original)
-      expect(lines.join).to eq(<<~'EOM')
+      expect(lines.join).to eq(<<~EOM)
         class Dog
           def bark
         end
@@ -140,7 +140,7 @@ def bark
     end
 
     it "captures surrounding context on falling indent" do
-      source = <<~'EOM'
+      source = <<~EOM
         class Blerg
         end
 
@@ -164,7 +164,7 @@ class Zerg
         code_lines: code_lines
       )
       lines = display.call.sort.map(&:original)
-      expect(lines.join).to eq(<<~'EOM')
+      expect(lines.join).to eq(<<~EOM)
         class OH
           def hello
             it "foo" do
@@ -174,7 +174,7 @@ def hello
     end
 
     it "captures surrounding context on same indent" do
-      source = <<~'EOM'
+      source = <<~EOM
         class Blerg
         end
         class OH
@@ -200,7 +200,7 @@ class Zerg
 
       code_lines = CleanDocument.new(source: source).call.lines
       block = CodeBlock.new(lines: code_lines[7..10])
-      expect(block.to_s).to eq(<<~'EOM'.indent(2))
+      expect(block.to_s).to eq(<<~EOM.indent(2))
         def lol
         end
 
@@ -217,7 +217,7 @@ def lol
         lines: lines
       ).call
 
-      expect(out).to eq(<<~'EOM'.indent(2))
+      expect(out).to eq(<<~EOM.indent(2))
          3  class OH
          8    def lol
          9    end
diff --git a/spec/syntax_suggest/unit/clean_document_spec.rb b/spec/syntax_suggest/unit/clean_document_spec.rb
index 25a62e4454d56d..5b5ca04cfdcf89 100644
--- a/spec/syntax_suggest/unit/clean_document_spec.rb
+++ b/spec/syntax_suggest/unit/clean_document_spec.rb
@@ -8,7 +8,7 @@ module SyntaxSuggest
       source = fixtures_dir.join("this_project_extra_def.rb.txt").read
       code_lines = CleanDocument.new(source: source).call.lines
 
-      expect(code_lines[18 - 1].to_s).to eq(<<-'EOL')
+      expect(code_lines[18 - 1].to_s).to eq(<<-EOL)
       @io.puts <<~EOM
 
         SyntaxSuggest: A syntax error was detected
@@ -54,7 +54,7 @@ module SyntaxSuggest
         DisplayCodeWithLineNumbers.new(
           lines: lines
         ).call
-      ).to eq(<<~'EOM'.indent(2))
+      ).to eq(<<~EOM.indent(2))
         1  User
         2    .where(name: 'schneems')
         3    .first
@@ -65,7 +65,7 @@ module SyntaxSuggest
           lines: lines,
           highlight_lines: lines[0]
         ).call
-      ).to eq(<<~'EOM')
+      ).to eq(<<~EOM)
         > 1  User
         > 2    .where(name: 'schneems')
         > 3    .first
@@ -85,7 +85,7 @@ module SyntaxSuggest
       code_lines = doc.lines
 
       expect(code_lines[0].to_s.count($/)).to eq(5)
-      code_lines[1..-1].each do |line|
+      code_lines[1..].each do |line|
         expect(line.to_s.strip.length).to eq(0)
       end
     end
@@ -139,7 +139,7 @@ module SyntaxSuggest
       source = <<~'EOM'
         context "timezones workaround" do
           it "should receive a time in UTC format and return the time with the"\
-            "office's UTC offset substracted from it" do
+            "office's UTC offset subtracted from it" do
             travel_to DateTime.new(2020, 10, 1, 10, 0, 0) do
               office = build(:office)
             end
@@ -155,7 +155,7 @@ module SyntaxSuggest
       ).to eq(<<~'EOM'.indent(2))
         1  context "timezones workaround" do
         2    it "should receive a time in UTC format and return the time with the"\
-        3      "office's UTC offset substracted from it" do
+        3      "office's UTC offset subtracted from it" do
         4      travel_to DateTime.new(2020, 10, 1, 10, 0, 0) do
         5        office = build(:office)
         6      end
@@ -171,7 +171,7 @@ module SyntaxSuggest
       ).to eq(<<~'EOM')
           1  context "timezones workaround" do
         > 2    it "should receive a time in UTC format and return the time with the"\
-        > 3      "office's UTC offset substracted from it" do
+        > 3      "office's UTC offset subtracted from it" do
           4      travel_to DateTime.new(2020, 10, 1, 10, 0, 0) do
           5        office = build(:office)
           6      end
diff --git a/spec/syntax_suggest/unit/code_line_spec.rb b/spec/syntax_suggest/unit/code_line_spec.rb
index d5b568fd19e917..5b62cc2757be8a 100644
--- a/spec/syntax_suggest/unit/code_line_spec.rb
+++ b/spec/syntax_suggest/unit/code_line_spec.rb
@@ -5,7 +5,7 @@
 module SyntaxSuggest
   RSpec.describe CodeLine do
     it "bug in keyword detection" do
-      lines = CodeLine.from_source(<<~'EOM')
+      lines = CodeLine.from_source(<<~EOM)
         def to_json(*opts)
           {
             type: :module,
@@ -19,7 +19,7 @@ def to_json(*opts)
     it "supports endless method definitions" do
       skip("Unsupported ruby version") unless Gem::Version.new(RUBY_VERSION) >= Gem::Version.new("3")
 
-      line = CodeLine.from_source(<<~'EOM').first
+      line = CodeLine.from_source(<<~EOM).first
         def square(x) = x * x
       EOM
 
@@ -28,7 +28,7 @@ def square(x) = x * x
     end
 
     it "retains original line value, after being marked invisible" do
-      line = CodeLine.from_source(<<~'EOM').first
+      line = CodeLine.from_source(<<~EOM).first
         puts "lol"
       EOM
       expect(line.line).to match('puts "lol"')
@@ -38,7 +38,7 @@ def square(x) = x * x
     end
 
     it "knows which lines can be joined" do
-      code_lines = CodeLine.from_source(<<~'EOM')
+      code_lines = CodeLine.from_source(<<~EOM)
         user = User.
           where(name: 'schneems').
           first
@@ -50,7 +50,7 @@ def square(x) = x * x
     end
 
     it "trailing if" do
-      code_lines = CodeLine.from_source(<<~'EOM')
+      code_lines = CodeLine.from_source(<<~EOM)
         puts "lol" if foo
         if foo
         end
@@ -60,7 +60,7 @@ def square(x) = x * x
     end
 
     it "trailing unless" do
-      code_lines = CodeLine.from_source(<<~'EOM')
+      code_lines = CodeLine.from_source(<<~EOM)
         puts "lol" unless foo
         unless foo
         end
diff --git a/spec/syntax_suggest/unit/code_search_spec.rb b/spec/syntax_suggest/unit/code_search_spec.rb
index f836ba36f3797b..502de14d7f3547 100644
--- a/spec/syntax_suggest/unit/code_search_spec.rb
+++ b/spec/syntax_suggest/unit/code_search_spec.rb
@@ -12,13 +12,13 @@ module SyntaxSuggest
       search = CodeSearch.new(source)
       search.call
 
-      expect(search.invalid_blocks.join.strip).to eq(<<~'EOM'.strip)
+      expect(search.invalid_blocks.join.strip).to eq(<<~EOM.strip)
         class Lookups
       EOM
     end
 
     it "squished do regression" do
-      source = <<~'EOM'
+      source = <<~EOM
         def call
           trydo
 
@@ -47,14 +47,14 @@ def call
       search = CodeSearch.new(source)
       search.call
 
-      expect(search.invalid_blocks.join).to eq(<<~'EOM'.indent(2))
+      expect(search.invalid_blocks.join).to eq(<<~EOM.indent(2))
         trydo
         end # one
       EOM
     end
 
     it "regression test ambiguous end" do
-      source = <<~'EOM'
+      source = <<~EOM
         def call          # 0
             print "lol"   # 1
           end # one       # 2
@@ -64,13 +64,13 @@ def call          # 0
       search = CodeSearch.new(source)
       search.call
 
-      expect(search.invalid_blocks.join).to eq(<<~'EOM')
+      expect(search.invalid_blocks.join).to eq(<<~EOM)
         end # two         # 3
       EOM
     end
 
     it "regression dog test" do
-      source = <<~'EOM'
+      source = <<~EOM
         class Dog
           def bark
             puts "woof"
@@ -79,7 +79,7 @@ def bark
       search = CodeSearch.new(source)
       search.call
 
-      expect(search.invalid_blocks.join).to eq(<<~'EOM')
+      expect(search.invalid_blocks.join).to eq(<<~EOM)
         class Dog
       EOM
       expect(search.invalid_blocks.first.lines.length).to eq(4)
@@ -99,7 +99,7 @@ class Foo
       search = CodeSearch.new(source)
       search.call
 
-      expect(search.invalid_blocks.join).to eq(<<~'EOM'.indent(2))
+      expect(search.invalid_blocks.join).to eq(<<~EOM.indent(2))
         Foo.call do |a
         end # one
       EOM
@@ -118,7 +118,7 @@ class Foo
       search = CodeSearch.new(source)
       search.call
 
-      expect(search.invalid_blocks.join).to eq(<<~'EOM'.indent(2))
+      expect(search.invalid_blocks.join).to eq(<<~EOM.indent(2))
         Foo.call do {
       EOM
     end
@@ -152,7 +152,7 @@ class Foo
     end
 
     it "handles no spaces between blocks" do
-      source = <<~'EOM'
+      source = <<~EOM
         context "foo bar" do
           it "bars the foo" do
             travel_to DateTime.new(2020, 10, 1, 10, 0, 0) do
@@ -172,7 +172,7 @@ class Foo
     it "records debugging steps to a directory" do
       Dir.mktmpdir do |dir|
         dir = Pathname(dir)
-        search = CodeSearch.new(<<~'EOM', record_dir: dir)
+        search = CodeSearch.new(<<~EOM, record_dir: dir)
           class OH
             def hello
             def hai
@@ -193,7 +193,7 @@ def hai
     end
 
     it "def with missing end" do
-      search = CodeSearch.new(<<~'EOM')
+      search = CodeSearch.new(<<~EOM)
         class OH
           def hello
 
@@ -206,7 +206,7 @@ def hai
 
       expect(search.invalid_blocks.join.strip).to eq("def hello")
 
-      search = CodeSearch.new(<<~'EOM')
+      search = CodeSearch.new(<<~EOM)
         class OH
           def hello
 
@@ -218,7 +218,7 @@ def hai
 
       expect(search.invalid_blocks.join.strip).to eq("def hello")
 
-      search = CodeSearch.new(<<~'EOM')
+      search = CodeSearch.new(<<~EOM)
         class OH
           def hello
           def hai
@@ -227,7 +227,7 @@ def hai
       EOM
       search.call
 
-      expect(search.invalid_blocks.join).to eq(<<~'EOM'.indent(2))
+      expect(search.invalid_blocks.join).to eq(<<~EOM.indent(2))
         def hello
       EOM
     end
@@ -244,13 +244,13 @@ def hello
           highlight_lines: search.invalid_blocks.flat_map(&:lines)
         ).call
 
-        expect(document).to include(<<~'EOM')
+        expect(document).to include(<<~EOM)
           > 36      def filename
         EOM
       end
 
       it "Format Code blocks real world example" do
-        search = CodeSearch.new(<<~'EOM')
+        search = CodeSearch.new(<<~EOM)
           require 'rails_helper'
 
           RSpec.describe AclassNameHere, type: :worker do
@@ -291,7 +291,7 @@ def hello
           highlight_lines: search.invalid_blocks.flat_map(&:lines)
         ).call
 
-        expect(document).to include(<<~'EOM')
+        expect(document).to include(<<~EOM)
              1  require 'rails_helper'
              2
              3  RSpec.describe AclassNameHere, type: :worker do
@@ -308,7 +308,7 @@ def hello
     describe "needs improvement" do
       describe "mis-matched-indentation" do
         it "extra space before end" do
-          search = CodeSearch.new(<<~'EOM')
+          search = CodeSearch.new(<<~EOM)
             Foo.call
               def foo
                 puts "lol"
@@ -318,14 +318,14 @@ def foo
           EOM
           search.call
 
-          expect(search.invalid_blocks.join).to eq(<<~'EOM')
+          expect(search.invalid_blocks.join).to eq(<<~EOM)
             Foo.call
             end # two
           EOM
         end
 
         it "stacked ends 2" do
-          search = CodeSearch.new(<<~'EOM')
+          search = CodeSearch.new(<<~EOM)
             def cat
               blerg
             end
@@ -339,7 +339,7 @@ def dog
           EOM
           search.call
 
-          expect(search.invalid_blocks.join).to eq(<<~'EOM')
+          expect(search.invalid_blocks.join).to eq(<<~EOM)
             Foo.call do
             end # one
             end # two
@@ -348,7 +348,7 @@ def dog
         end
 
         it "stacked ends " do
-          search = CodeSearch.new(<<~'EOM')
+          search = CodeSearch.new(<<~EOM)
             Foo.call
               def foo
                 puts "lol"
@@ -358,14 +358,14 @@ def foo
           EOM
           search.call
 
-          expect(search.invalid_blocks.join).to eq(<<~'EOM')
+          expect(search.invalid_blocks.join).to eq(<<~EOM)
             Foo.call
             end
           EOM
         end
 
         it "missing space before end" do
-          search = CodeSearch.new(<<~'EOM')
+          search = CodeSearch.new(<<~EOM)
             Foo.call
 
               def foo
@@ -377,7 +377,7 @@ def foo
           search.call
 
           # expand-1 and expand-2 seem to be broken?
-          expect(search.invalid_blocks.join).to eq(<<~'EOM')
+          expect(search.invalid_blocks.join).to eq(<<~EOM)
             Foo.call
             end
           EOM
@@ -386,7 +386,7 @@ def foo
     end
 
     it "returns syntax error in outer block without inner block" do
-      search = CodeSearch.new(<<~'EOM')
+      search = CodeSearch.new(<<~EOM)
         Foo.call
           def foo
             puts "lol"
@@ -396,27 +396,27 @@ def foo
       EOM
       search.call
 
-      expect(search.invalid_blocks.join).to eq(<<~'EOM')
+      expect(search.invalid_blocks.join).to eq(<<~EOM)
         Foo.call
         end # two
       EOM
     end
 
     it "doesn't just return an empty `end`" do
-      search = CodeSearch.new(<<~'EOM')
+      search = CodeSearch.new(<<~EOM)
         Foo.call
         end
       EOM
       search.call
 
-      expect(search.invalid_blocks.join).to eq(<<~'EOM')
+      expect(search.invalid_blocks.join).to eq(<<~EOM)
         Foo.call
         end
       EOM
     end
 
     it "finds multiple syntax errors" do
-      search = CodeSearch.new(<<~'EOM')
+      search = CodeSearch.new(<<~EOM)
         describe "hi" do
           Foo.call
           end
@@ -429,7 +429,7 @@ def foo
       EOM
       search.call
 
-      expect(search.invalid_blocks.join).to eq(<<~'EOM'.indent(2))
+      expect(search.invalid_blocks.join).to eq(<<~EOM.indent(2))
         Foo.call
         end
         Bar.call
@@ -438,47 +438,47 @@ def foo
     end
 
     it "finds a typo def" do
-      search = CodeSearch.new(<<~'EOM')
+      search = CodeSearch.new(<<~EOM)
         defzfoo
           puts "lol"
         end
       EOM
       search.call
 
-      expect(search.invalid_blocks.join).to eq(<<~'EOM')
+      expect(search.invalid_blocks.join).to eq(<<~EOM)
         defzfoo
         end
       EOM
     end
 
     it "finds a mis-matched def" do
-      search = CodeSearch.new(<<~'EOM')
+      search = CodeSearch.new(<<~EOM)
         def foo
           def blerg
         end
       EOM
       search.call
 
-      expect(search.invalid_blocks.join).to eq(<<~'EOM'.indent(2))
+      expect(search.invalid_blocks.join).to eq(<<~EOM.indent(2))
         def blerg
       EOM
     end
 
     it "finds a naked end" do
-      search = CodeSearch.new(<<~'EOM')
+      search = CodeSearch.new(<<~EOM)
         def foo
           end # one
         end # two
       EOM
       search.call
 
-      expect(search.invalid_blocks.join).to eq(<<~'EOM'.indent(2))
+      expect(search.invalid_blocks.join).to eq(<<~EOM.indent(2))
         end # one
       EOM
     end
 
     it "returns when no invalid blocks are found" do
-      search = CodeSearch.new(<<~'EOM')
+      search = CodeSearch.new(<<~EOM)
         def foo
           puts 'lol'
         end
@@ -489,14 +489,14 @@ def foo
     end
 
     it "expands frontier by eliminating valid lines" do
-      search = CodeSearch.new(<<~'EOM')
+      search = CodeSearch.new(<<~EOM)
         def foo
           puts 'lol'
         end
       EOM
       search.create_blocks_from_untracked_lines
 
-      expect(search.code_lines.join).to eq(<<~'EOM')
+      expect(search.code_lines.join).to eq(<<~EOM)
         def foo
         end
       EOM
diff --git a/spec/syntax_suggest/unit/core_ext_spec.rb b/spec/syntax_suggest/unit/core_ext_spec.rb
index 802d03ecc030d3..499c38a240b49a 100644
--- a/spec/syntax_suggest/unit/core_ext_spec.rb
+++ b/spec/syntax_suggest/unit/core_ext_spec.rb
@@ -8,7 +8,7 @@ module SyntaxSuggest
       Dir.mktmpdir do |dir|
         tmpdir = Pathname(dir)
         file = tmpdir.join("file.rb")
-        file.write(<<~'EOM'.strip)
+        file.write(<<~EOM.strip)
           print 'no newline
         EOM
 
diff --git a/spec/syntax_suggest/unit/explain_syntax_spec.rb b/spec/syntax_suggest/unit/explain_syntax_spec.rb
index 394981dcf662cd..c62a42b925ed6b 100644
--- a/spec/syntax_suggest/unit/explain_syntax_spec.rb
+++ b/spec/syntax_suggest/unit/explain_syntax_spec.rb
@@ -14,7 +14,7 @@ module SyntaxSuggest
       ).call
 
       expect(explain.missing).to eq([])
-      expect(explain.errors.join).to include("unterminated string")
+      expect(explain.errors.join.strip).to_not be_empty
     end
 
     it "handles %w[]" do
@@ -191,7 +191,7 @@ def meow
       ).call
 
       expect(explain.missing).to eq([])
-      expect(explain.errors).to eq(RipperErrors.new(source).call.errors)
+      expect(explain.errors).to eq(GetParseErrors.errors(source))
     end
 
     it "handles an unexpected rescue" do
diff --git a/spec/syntax_suggest/unit/lex_all_spec.rb b/spec/syntax_suggest/unit/lex_all_spec.rb
index 0c0df7cfaa297e..9621c9ecec9968 100644
--- a/spec/syntax_suggest/unit/lex_all_spec.rb
+++ b/spec/syntax_suggest/unit/lex_all_spec.rb
@@ -17,9 +17,6 @@ module SyntaxSuggest
         end            # 9
       EOM
 
-      # raw_lex = Ripper.lex(source)
-      # expect(raw_lex.to_s).to_not include("dog")
-
       lex = LexAll.new(source: source)
       expect(lex.map(&:token).to_s).to include("dog")
       expect(lex.first.line).to eq(1)
diff --git a/spec/syntax_suggest/unit/mini_stringio_spec.rb b/spec/syntax_suggest/unit/mini_stringio_spec.rb
new file mode 100644
index 00000000000000..75d94deae12cd2
--- /dev/null
+++ b/spec/syntax_suggest/unit/mini_stringio_spec.rb
@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+require_relative "../spec_helper"
+
+module SyntaxSuggest
+  RSpec.describe "MiniStringIO" do
+    it "#puts with no inputs" do
+      io = MiniStringIO.new
+      io.puts
+      expect(io.string).to eq($/)
+    end
+
+    it "#puts with an input" do
+      io = MiniStringIO.new
+      io.puts "Hello"
+      expect(io.string).to eq(["Hello", $/].join)
+    end
+
+    it "#puts with an input with a newline" do
+      io = MiniStringIO.new
+      io.puts "Hello\n"
+      expect(io.string).to eq(["Hello\n", $/].join)
+    end
+  end
+end
diff --git a/spec/syntax_suggest/unit/scan_history_spec.rb b/spec/syntax_suggest/unit/scan_history_spec.rb
index 0e75ac66ce1521..d8b0a54ba6d2e8 100644
--- a/spec/syntax_suggest/unit/scan_history_spec.rb
+++ b/spec/syntax_suggest/unit/scan_history_spec.rb
@@ -5,7 +5,7 @@
 module SyntaxSuggest
   RSpec.describe ScanHistory do
     it "retains commits" do
-      source = <<~'EOM'
+      source = <<~EOM
         class OH         #  0
           def lol        #  1
             print 'lol   #  2
@@ -42,7 +42,7 @@ def yolo       #  8
     end
 
     it "is stashable" do
-      source = <<~'EOM'
+      source = <<~EOM
         class OH         #  0
           def lol        #  1
             print 'lol   #  2
@@ -79,7 +79,7 @@ def yolo       #  8
     end
 
     it "doesnt change if you dont't change it" do
-      source = <<~'EOM'
+      source = <<~EOM
         class OH         #  0
           def lol        #  1
             print 'lol   #  2
diff --git a/sprintf.c b/sprintf.c
index b2d89617aaf64b..cb266a98416e33 100644
--- a/sprintf.c
+++ b/sprintf.c
@@ -67,7 +67,8 @@ sign_bits(int base, const char *p)
 
 #define CHECK(l) do {\
     int cr = ENC_CODERANGE(result);\
-    while ((l) >= bsiz - blen) {\
+    RUBY_ASSERT(bsiz >= blen); \
+    while ((l) > bsiz - blen) {\
         bsiz*=2;\
         if (bsiz<0) rb_raise(rb_eArgError, "too big specifier");\
     }\
@@ -247,8 +248,7 @@ rb_str_format(int argc, const VALUE *argv, VALUE fmt)
     }
 
 #define update_coderange(partial) do { \
-        if (coderange != ENC_CODERANGE_BROKEN && scanned < blen \
-            && rb_enc_to_index(enc) /* != ENCINDEX_ASCII_8BIT */) { \
+        if (coderange != ENC_CODERANGE_BROKEN && scanned < blen) { \
             int cr = coderange; \
             scanned += rb_str_coderange_scan_restartable(buf+scanned, buf+blen, enc, &cr); \
             ENC_CODERANGE_SET(result, \
@@ -429,10 +429,6 @@ rb_str_format(int argc, const VALUE *argv, VALUE fmt)
             GETNUM(prec, precision);
             goto retry;
 
-          case '\n':
-          case '\0':
-            p--;
-            /* fall through */
           case '%':
             if (flags != FNONE) {
                 rb_raise(rb_eArgError, "invalid format character - %%");
@@ -812,7 +808,7 @@ rb_str_format(int argc, const VALUE *argv, VALUE fmt)
                 if (FIXNUM_P(num)) {
                     if ((SIGNED_VALUE)num < 0) {
                         long n = -FIX2LONG(num);
-                        num = LONG2FIX(n);
+                        num = LONG2NUM(n);
                         sign = -1;
                     }
                 }
@@ -941,7 +937,7 @@ rb_str_format(int argc, const VALUE *argv, VALUE fmt)
     rb_str_tmp_frozen_release(orig, fmt);
     /* XXX - We cannot validate the number of arguments if (digit)$ style used.
      */
-    if (posarg >= 0 && nextarg < argc) {
+    if (posarg >= 0 && nextarg < argc && !(argc == 2 && RB_TYPE_P(argv[1], T_HASH))) {
         const char *mesg = "too many arguments for format string";
         if (RTEST(ruby_debug)) rb_raise(rb_eArgError, "%s", mesg);
         if (RTEST(ruby_verbose)) rb_warn("%s", mesg);
@@ -1169,7 +1165,9 @@ ruby_vsprintf0(VALUE result, char *p, const char *fmt, va_list ap)
     RBASIC_SET_CLASS_RAW(result, klass);
     p = RSTRING_PTR(result);
     long blen = (char *)f._p - p;
-    if (scanned < blen) {
+
+    coderange = ENC_CODERANGE(result);
+    if (coderange != ENC_CODERANGE_UNKNOWN && scanned < blen) {
         rb_str_coderange_scan_restartable(p + scanned, p + blen, rb_enc_get(result), &coderange);
         ENC_CODERANGE_SET(result, coderange);
     }
diff --git a/st.c b/st.c
index 755e230c9a4ddc..195a16b8ad73e7 100644
--- a/st.c
+++ b/st.c
@@ -103,11 +103,15 @@
 #ifdef NOT_RUBY
 #include "regint.h"
 #include "st.h"
+#include <assert.h>
 #elif defined RUBY_EXPORT
 #include "internal.h"
 #include "internal/bits.h"
 #include "internal/hash.h"
 #include "internal/sanitizers.h"
+#include "internal/set_table.h"
+#include "internal/st.h"
+#include "ruby_assert.h"
 #endif
 
 #include <stdio.h>
@@ -115,7 +119,6 @@
 #include <stdlib.h>
 #endif
 #include <string.h>
-#include <assert.h>
 
 #ifdef __GNUC__
 #define PREFETCH(addr, write_p) __builtin_prefetch(addr, write_p)
@@ -313,17 +316,22 @@ static const struct st_features features[] = {
 #define RESERVED_HASH_VAL (~(st_hash_t) 0)
 #define RESERVED_HASH_SUBSTITUTION_VAL ((st_hash_t) 0)
 
-/* Return hash value of KEY for table TAB.  */
 static inline st_hash_t
-do_hash(st_data_t key, st_table *tab)
+normalize_hash_value(st_hash_t hash)
 {
-    st_hash_t hash = (st_hash_t)(tab->type->hash)(key);
-
     /* RESERVED_HASH_VAL is used for a deleted entry.  Map it into
        another value.  Such mapping should be extremely rare.  */
     return hash == RESERVED_HASH_VAL ? RESERVED_HASH_SUBSTITUTION_VAL : hash;
 }
 
+/* Return hash value of KEY for table TAB.  */
+static inline st_hash_t
+do_hash(st_data_t key, st_table *tab)
+{
+    st_hash_t hash = (st_hash_t)(tab->type->hash)(key);
+    return normalize_hash_value(hash);
+}
+
 /* Power of 2 defining the minimal number of allocated entries.  */
 #define MINIMAL_POWER2 2
 
@@ -717,6 +725,10 @@ count_collision(const struct st_hash_type *type)
 #error "REBUILD_THRESHOLD should be >= 2"
 #endif
 
+static void rebuild_table_with(st_table *const new_tab, st_table *const tab);
+static void rebuild_move_table(st_table *const new_tab, st_table *const tab);
+static void rebuild_cleanup(st_table *const tab);
+
 /* Rebuild table TAB.  Rebuilding removes all deleted bins and entries
    and can change size of the table entries and bins arrays.
    Rebuilding is implemented by creation of a new table or by
@@ -724,14 +736,6 @@ count_collision(const struct st_hash_type *type)
 static void
 rebuild_table(st_table *tab)
 {
-    st_index_t i, ni;
-    unsigned int size_ind;
-    st_table *new_tab;
-    st_table_entry *new_entries;
-    st_table_entry *curr_entry_ptr;
-    st_index_t *bins;
-    st_index_t bin_ind;
-
     if ((2 * tab->num_entries <= get_allocated_entries(tab)
          && REBUILD_THRESHOLD * tab->num_entries > get_allocated_entries(tab))
         || tab->num_entries < (1 << MINIMAL_POWER2)) {
@@ -739,17 +743,32 @@ rebuild_table(st_table *tab)
         tab->num_entries = 0;
         if (tab->bins != NULL)
             initialize_bins(tab);
-        new_tab = tab;
-        new_entries = tab->entries;
+        rebuild_table_with(tab, tab);
     }
     else {
+        st_table *new_tab;
         /* This allocation could trigger GC and compaction. If tab is the
-         * gen_iv_tbl, then tab could have changed in size due to objects being
+         * gen_fields_tbl, then tab could have changed in size due to objects being
          * freed and/or moved. Do not store attributes of tab before this line. */
         new_tab = st_init_table_with_size(tab->type,
                                           2 * tab->num_entries - 1);
-        new_entries = new_tab->entries;
+        rebuild_table_with(new_tab, tab);
+        rebuild_move_table(new_tab, tab);
     }
+    rebuild_cleanup(tab);
+}
+
+static void
+rebuild_table_with(st_table *const new_tab, st_table *const tab)
+{
+    st_index_t i, ni;
+    unsigned int size_ind;
+    st_table_entry *new_entries;
+    st_table_entry *curr_entry_ptr;
+    st_index_t *bins;
+    st_index_t bin_ind;
+
+    new_entries = new_tab->entries;
 
     ni = 0;
     bins = new_tab->bins;
@@ -772,16 +791,26 @@ rebuild_table(st_table *tab)
         new_tab->num_entries++;
         ni++;
     }
-    if (new_tab != tab) {
-        tab->entry_power = new_tab->entry_power;
-        tab->bin_power = new_tab->bin_power;
-        tab->size_ind = new_tab->size_ind;
-        free(tab->bins);
-        tab->bins = new_tab->bins;
-        free(tab->entries);
-        tab->entries = new_tab->entries;
-        free(new_tab);
-    }
+
+    assert(new_tab->num_entries == tab->num_entries);
+}
+
+static void
+rebuild_move_table(st_table *const new_tab, st_table *const tab)
+{
+    tab->entry_power = new_tab->entry_power;
+    tab->bin_power = new_tab->bin_power;
+    tab->size_ind = new_tab->size_ind;
+    free(tab->bins);
+    tab->bins = new_tab->bins;
+    free(tab->entries);
+    tab->entries = new_tab->entries;
+    free(new_tab);
+}
+
+static void
+rebuild_cleanup(st_table *const tab)
+{
     tab->entries_start = 0;
     tab->entries_bound = tab->num_entries;
     tab->rebuilds_num++;
@@ -1153,6 +1182,8 @@ st_add_direct_with_hash(st_table *tab,
     st_index_t ind;
     st_index_t bin_ind;
 
+    assert(hash != RESERVED_HASH_VAL);
+
     rebuild_table_if_necessary(tab);
     ind = tab->entries_bound++;
     entry = &tab->entries[ind];
@@ -1166,6 +1197,13 @@ st_add_direct_with_hash(st_table *tab,
     }
 }
 
+void
+rb_st_add_direct_with_hash(st_table *tab,
+                           st_data_t key, st_data_t value, st_hash_t hash)
+{
+    st_add_direct_with_hash(tab, key, value, normalize_hash_value(hash));
+}
+
 /* Insert (KEY, VALUE) into table TAB.  The table should not have
    entry with KEY before the insertion.  */
 void
@@ -1457,7 +1495,16 @@ st_update(st_table *tab, st_data_t key,
         value = entry->record;
     }
     old_key = key;
+
+    unsigned int rebuilds_num = tab->rebuilds_num;
+
     retval = (*func)(&key, &value, arg, existing);
+
+    // We need to make sure that the callback didn't cause a table rebuild
+    // Ideally we would make sure no operations happened
+    assert(rebuilds_num == tab->rebuilds_num);
+    (void)rebuilds_num;
+
     switch (retval) {
       case ST_CONTINUE:
         if (! existing) {
@@ -2282,17 +2329,880 @@ rb_hash_bulk_insert_into_st_table(long argc, const VALUE *argv, VALUE hash)
         st_insert_generic(tab, argc, argv, hash);
 }
 
-// to iterate iv_index_tbl
-st_data_t
-rb_st_nth_key(st_table *tab, st_index_t index)
+void
+rb_st_compact_table(st_table *tab)
+{
+    st_index_t num = tab->num_entries;
+    if (REBUILD_THRESHOLD * num <= get_allocated_entries(tab)) {
+        /* Compaction: */
+        st_table *new_tab = st_init_table_with_size(tab->type, 2 * num);
+        rebuild_table_with(new_tab, tab);
+        rebuild_move_table(new_tab, tab);
+        rebuild_cleanup(tab);
+    }
+}
+
+/*
+ * set_table related code
+ */
+
+struct set_table_entry {
+    st_hash_t hash;
+    st_data_t key;
+};
+
+/* Return hash value of KEY for table TAB.  */
+static inline st_hash_t
+set_do_hash(st_data_t key, set_table *tab)
+{
+    st_hash_t hash = (st_hash_t)(tab->type->hash)(key);
+    return normalize_hash_value(hash);
+}
+
+/* Return bin size index of table TAB.  */
+static inline unsigned int
+set_get_size_ind(const set_table *tab)
+{
+    return tab->size_ind;
+}
+
+/* Return the number of allocated bins of table TAB.  */
+static inline st_index_t
+set_get_bins_num(const set_table *tab)
+{
+    return ((st_index_t) 1)<<tab->bin_power;
+}
+
+/* Return mask for a bin index in table TAB.  */
+static inline st_index_t
+set_bins_mask(const set_table *tab)
+{
+    return set_get_bins_num(tab) - 1;
+}
+
+/* Return the index of table TAB bin corresponding to
+   HASH_VALUE.  */
+static inline st_index_t
+set_hash_bin(st_hash_t hash_value, set_table *tab)
+{
+    return hash_value & set_bins_mask(tab);
+}
+
+/* Return the number of allocated entries of table TAB.  */
+static inline st_index_t
+set_get_allocated_entries(const set_table *tab)
+{
+    return ((st_index_t) 1)<<tab->entry_power;
+}
+
+/* Return size of the allocated bins of table TAB.  */
+static inline st_index_t
+set_bins_size(const set_table *tab)
+{
+    return features[tab->entry_power].bins_words * sizeof (st_index_t);
+}
+
+/* Mark all bins of table TAB as empty.  */
+static void
+set_initialize_bins(set_table *tab)
+{
+    memset(tab->bins, 0, set_bins_size(tab));
+}
+
+/* Make table TAB empty.  */
+static void
+set_make_tab_empty(set_table *tab)
+{
+    tab->num_entries = 0;
+    tab->entries_start = tab->entries_bound = 0;
+    if (tab->bins != NULL)
+        set_initialize_bins(tab);
+}
+
+static set_table *
+set_init_existing_table_with_size(set_table *tab, const struct st_hash_type *type, st_index_t size)
+{
+    int n;
+
+#ifdef HASH_LOG
+#if HASH_LOG+0 < 0
+    {
+        const char *e = getenv("ST_HASH_LOG");
+        if (!e || !*e) init_st = 1;
+    }
+#endif
+    if (init_st == 0) {
+        init_st = 1;
+        atexit(stat_col);
+    }
+#endif
+
+    n = get_power2(size);
+
+    tab->type = type;
+    tab->entry_power = n;
+    tab->bin_power = features[n].bin_power;
+    tab->size_ind = features[n].size_ind;
+    if (n <= MAX_POWER2_FOR_TABLES_WITHOUT_BINS)
+        tab->bins = NULL;
+    else {
+        tab->bins = (st_index_t *) malloc(set_bins_size(tab));
+    }
+    tab->entries = (set_table_entry *) malloc(set_get_allocated_entries(tab)
+                                             * sizeof(set_table_entry));
+    set_make_tab_empty(tab);
+    tab->rebuilds_num = 0;
+    return tab;
+}
+
+/* Create and return table with TYPE which can hold at least SIZE
+   entries.  The real number of entries which the table can hold is
+   the nearest power of two for SIZE.  */
+set_table *
+set_init_table_with_size(set_table *tab, const struct st_hash_type *type, st_index_t size)
+{
+    if (tab == NULL) tab = malloc(sizeof(set_table));
+
+    set_init_existing_table_with_size(tab, type, size);
+
+    return tab;
+}
+
+set_table *
+set_init_numtable(void)
+{
+    return set_init_table_with_size(NULL, &type_numhash, 0);
+}
+
+set_table *
+set_init_numtable_with_size(st_index_t size)
+{
+    return set_init_table_with_size(NULL, &type_numhash, size);
+}
+
+size_t
+set_table_size(const struct set_table *tbl)
+{
+    return tbl->num_entries;
+}
+
+/* Make table TAB empty.  */
+void
+set_table_clear(set_table *tab)
+{
+    set_make_tab_empty(tab);
+    tab->rebuilds_num++;
+}
+
+/* Free table TAB space. This should only be used if you passed NULL to
+   set_init_table_with_size/set_copy when creating the table. */
+void
+set_free_table(set_table *tab)
+{
+    free(tab->bins);
+    free(tab->entries);
+    free(tab);
+}
+
+/* Return byte size of memory allocated for table TAB.  */
+size_t
+set_memsize(const set_table *tab)
+{
+    return(sizeof(set_table)
+           + (tab->bins == NULL ? 0 : set_bins_size(tab))
+           + set_get_allocated_entries(tab) * sizeof(set_table_entry));
+}
+
+static st_index_t
+set_find_table_entry_ind(set_table *tab, st_hash_t hash_value, st_data_t key);
+
+static st_index_t
+set_find_table_bin_ind(set_table *tab, st_hash_t hash_value, st_data_t key);
+
+static st_index_t
+set_find_table_bin_ind_direct(set_table *table, st_hash_t hash_value, st_data_t key);
+
+static st_index_t
+set_find_table_bin_ptr_and_reserve(set_table *tab, st_hash_t *hash_value,
+                               st_data_t key, st_index_t *bin_ind);
+
+static void set_rebuild_table_with(set_table *const new_tab, set_table *const tab);
+static void set_rebuild_move_table(set_table *const new_tab, set_table *const tab);
+static void set_rebuild_cleanup(set_table *const tab);
+
+/* Rebuild table TAB.  Rebuilding removes all deleted bins and entries
+   and can change size of the table entries and bins arrays.
+   Rebuilding is implemented by creation of a new table or by
+   compaction of the existing one.  */
+static void
+set_rebuild_table(set_table *tab)
 {
-    if (LIKELY(tab->entries_start == 0 &&
-               tab->num_entries == tab->entries_bound &&
-               index < tab->num_entries)) {
-        return tab->entries[index].key;
+    if ((2 * tab->num_entries <= set_get_allocated_entries(tab)
+         && REBUILD_THRESHOLD * tab->num_entries > set_get_allocated_entries(tab))
+        || tab->num_entries < (1 << MINIMAL_POWER2)) {
+        /* Compaction: */
+        tab->num_entries = 0;
+        if (tab->bins != NULL)
+            set_initialize_bins(tab);
+        set_rebuild_table_with(tab, tab);
     }
     else {
-        rb_bug("unreachable");
+        set_table *new_tab;
+        /* This allocation could trigger GC and compaction. If tab is the
+         * gen_fields_tbl, then tab could have changed in size due to objects being
+         * freed and/or moved. Do not store attributes of tab before this line. */
+        new_tab = set_init_table_with_size(NULL, tab->type,
+                                          2 * tab->num_entries - 1);
+        set_rebuild_table_with(new_tab, tab);
+        set_rebuild_move_table(new_tab, tab);
+    }
+    set_rebuild_cleanup(tab);
+}
+
+static void
+set_rebuild_table_with(set_table *const new_tab, set_table *const tab)
+{
+    st_index_t i, ni;
+    unsigned int size_ind;
+    set_table_entry *new_entries;
+    set_table_entry *curr_entry_ptr;
+    st_index_t *bins;
+    st_index_t bin_ind;
+
+    new_entries = new_tab->entries;
+
+    ni = 0;
+    bins = new_tab->bins;
+    size_ind = set_get_size_ind(new_tab);
+    st_index_t bound = tab->entries_bound;
+    set_table_entry *entries = tab->entries;
+
+    for (i = tab->entries_start; i < bound; i++) {
+        curr_entry_ptr = &entries[i];
+        PREFETCH(entries + i + 1, 0);
+        if (EXPECT(DELETED_ENTRY_P(curr_entry_ptr), 0))
+            continue;
+        if (&new_entries[ni] != curr_entry_ptr)
+            new_entries[ni] = *curr_entry_ptr;
+        if (EXPECT(bins != NULL, 1)) {
+            bin_ind = set_find_table_bin_ind_direct(new_tab, curr_entry_ptr->hash,
+                                                curr_entry_ptr->key);
+            set_bin(bins, size_ind, bin_ind, ni + ENTRY_BASE);
+        }
+        new_tab->num_entries++;
+        ni++;
+    }
+
+    assert(new_tab->num_entries == tab->num_entries);
+}
+
+static void
+set_rebuild_move_table(set_table *const new_tab, set_table *const tab)
+{
+    tab->entry_power = new_tab->entry_power;
+    tab->bin_power = new_tab->bin_power;
+    tab->size_ind = new_tab->size_ind;
+    free(tab->bins);
+    tab->bins = new_tab->bins;
+    free(tab->entries);
+    tab->entries = new_tab->entries;
+    free(new_tab);
+}
+
+static void
+set_rebuild_cleanup(set_table *const tab)
+{
+    tab->entries_start = 0;
+    tab->entries_bound = tab->num_entries;
+    tab->rebuilds_num++;
+}
+
+/* Return the next secondary hash index for table TAB using previous
+   index IND and PERTURB.  Finally modulo of the function becomes a
+   full *cycle linear congruential generator*, in other words it
+   guarantees traversing all table bins in extreme case.
+
+   According the Hull-Dobell theorem a generator
+   "Xnext = (a*Xprev + c) mod m" is a full cycle generator if and only if
+     o m and c are relatively prime
+     o a-1 is divisible by all prime factors of m
+     o a-1 is divisible by 4 if m is divisible by 4.
+
+   For our case a is 5, c is 1, and m is a power of two.  */
+static inline st_index_t
+set_secondary_hash(st_index_t ind, set_table *tab, st_index_t *perturb)
+{
+    *perturb >>= 11;
+    ind = (ind << 2) + ind + *perturb + 1;
+    return set_hash_bin(ind, tab);
+}
+
+/* Find an entry with HASH_VALUE and KEY in TABLE using a linear
+   search.  Return the index of the found entry in array `entries`.
+   If it is not found, return UNDEFINED_ENTRY_IND.  If the table was
+   rebuilt during the search, return REBUILT_TABLE_ENTRY_IND.  */
+static inline st_index_t
+set_find_entry(set_table *tab, st_hash_t hash_value, st_data_t key)
+{
+    int eq_p, rebuilt_p;
+    st_index_t i, bound;
+    set_table_entry *entries;
+
+    bound = tab->entries_bound;
+    entries = tab->entries;
+    for (i = tab->entries_start; i < bound; i++) {
+        DO_PTR_EQUAL_CHECK(tab, &entries[i], hash_value, key, eq_p, rebuilt_p);
+        if (EXPECT(rebuilt_p, 0))
+            return REBUILT_TABLE_ENTRY_IND;
+        if (eq_p)
+            return i;
+    }
+    return UNDEFINED_ENTRY_IND;
+}
+
+/* Use the quadratic probing.  The method has a better data locality
+   but more collisions than the current approach.  In average it
+   results in a bit slower search.  */
+/*#define QUADRATIC_PROBE*/
+
+/* Return index of entry with HASH_VALUE and KEY in table TAB.  If
+   there is no such entry, return UNDEFINED_ENTRY_IND.  If the table
+   was rebuilt during the search, return REBUILT_TABLE_ENTRY_IND.  */
+static st_index_t
+set_find_table_entry_ind(set_table *tab, st_hash_t hash_value, st_data_t key)
+{
+    int eq_p, rebuilt_p;
+    st_index_t ind;
+#ifdef QUADRATIC_PROBE
+    st_index_t d;
+#else
+    st_index_t perturb;
+#endif
+    st_index_t bin;
+    set_table_entry *entries = tab->entries;
+
+    ind = set_hash_bin(hash_value, tab);
+#ifdef QUADRATIC_PROBE
+    d = 1;
+#else
+    perturb = hash_value;
+#endif
+    for (;;) {
+        bin = get_bin(tab->bins, set_get_size_ind(tab), ind);
+        if (! EMPTY_OR_DELETED_BIN_P(bin)) {
+            DO_PTR_EQUAL_CHECK(tab, &entries[bin - ENTRY_BASE], hash_value, key, eq_p, rebuilt_p);
+            if (EXPECT(rebuilt_p, 0))
+                return REBUILT_TABLE_ENTRY_IND;
+            if (eq_p)
+                break;
+        }
+        else if (EMPTY_BIN_P(bin))
+            return UNDEFINED_ENTRY_IND;
+#ifdef QUADRATIC_PROBE
+        ind = set_hash_bin(ind + d, tab);
+        d++;
+#else
+        ind = set_secondary_hash(ind, tab, &perturb);
+#endif
+    }
+    return bin;
+}
+
+/* Find and return index of table TAB bin corresponding to an entry
+   with HASH_VALUE and KEY.  If there is no such bin, return
+   UNDEFINED_BIN_IND.  If the table was rebuilt during the search,
+   return REBUILT_TABLE_BIN_IND.  */
+static st_index_t
+set_find_table_bin_ind(set_table *tab, st_hash_t hash_value, st_data_t key)
+{
+    int eq_p, rebuilt_p;
+    st_index_t ind;
+#ifdef QUADRATIC_PROBE
+    st_index_t d;
+#else
+    st_index_t perturb;
+#endif
+    st_index_t bin;
+    set_table_entry *entries = tab->entries;
+
+    ind = set_hash_bin(hash_value, tab);
+#ifdef QUADRATIC_PROBE
+    d = 1;
+#else
+    perturb = hash_value;
+#endif
+    for (;;) {
+        bin = get_bin(tab->bins, set_get_size_ind(tab), ind);
+        if (! EMPTY_OR_DELETED_BIN_P(bin)) {
+            DO_PTR_EQUAL_CHECK(tab, &entries[bin - ENTRY_BASE], hash_value, key, eq_p, rebuilt_p);
+            if (EXPECT(rebuilt_p, 0))
+                return REBUILT_TABLE_BIN_IND;
+            if (eq_p)
+                break;
+        }
+        else if (EMPTY_BIN_P(bin))
+            return UNDEFINED_BIN_IND;
+#ifdef QUADRATIC_PROBE
+        ind = set_hash_bin(ind + d, tab);
+        d++;
+#else
+        ind = set_secondary_hash(ind, tab, &perturb);
+#endif
+    }
+    return ind;
+}
+
+/* Find and return index of table TAB bin corresponding to an entry
+   with HASH_VALUE and KEY.  The entry should be in the table
+   already.  */
+static st_index_t
+set_find_table_bin_ind_direct(set_table *tab, st_hash_t hash_value, st_data_t key)
+{
+    st_index_t ind;
+#ifdef QUADRATIC_PROBE
+    st_index_t d;
+#else
+    st_index_t perturb;
+#endif
+    st_index_t bin;
+
+    ind = set_hash_bin(hash_value, tab);
+#ifdef QUADRATIC_PROBE
+    d = 1;
+#else
+    perturb = hash_value;
+#endif
+    for (;;) {
+        bin = get_bin(tab->bins, set_get_size_ind(tab), ind);
+        if (EMPTY_OR_DELETED_BIN_P(bin))
+            return ind;
+#ifdef QUADRATIC_PROBE
+        ind = set_hash_bin(ind + d, tab);
+        d++;
+#else
+        ind = set_secondary_hash(ind, tab, &perturb);
+#endif
+    }
+}
+
+/* Mark I-th bin of table TAB as empty, in other words not
+   corresponding to any entry.  */
+#define MARK_SET_BIN_EMPTY(tab, i) (set_bin((tab)->bins, set_get_size_ind(tab), i, EMPTY_BIN))
+
+/* Return index of table TAB bin for HASH_VALUE and KEY through
+   BIN_IND and the pointed value as the function result.  Reserve the
+   bin for inclusion of the corresponding entry into the table if it
+   is not there yet.  We always find such bin as bins array length is
+   bigger entries array.  Although we can reuse a deleted bin, the
+   result bin value is always empty if the table has no entry with
+   KEY.  Return the entries array index of the found entry or
+   UNDEFINED_ENTRY_IND if it is not found.  If the table was rebuilt
+   during the search, return REBUILT_TABLE_ENTRY_IND.  */
+static st_index_t
+set_find_table_bin_ptr_and_reserve(set_table *tab, st_hash_t *hash_value,
+                               st_data_t key, st_index_t *bin_ind)
+{
+    int eq_p, rebuilt_p;
+    st_index_t ind;
+    st_hash_t curr_hash_value = *hash_value;
+#ifdef QUADRATIC_PROBE
+    st_index_t d;
+#else
+    st_index_t perturb;
+#endif
+    st_index_t entry_index;
+    st_index_t firset_deleted_bin_ind;
+    set_table_entry *entries;
+
+    ind = set_hash_bin(curr_hash_value, tab);
+#ifdef QUADRATIC_PROBE
+    d = 1;
+#else
+    perturb = curr_hash_value;
+#endif
+    firset_deleted_bin_ind = UNDEFINED_BIN_IND;
+    entries = tab->entries;
+    for (;;) {
+        entry_index = get_bin(tab->bins, set_get_size_ind(tab), ind);
+        if (EMPTY_BIN_P(entry_index)) {
+            tab->num_entries++;
+            entry_index = UNDEFINED_ENTRY_IND;
+            if (firset_deleted_bin_ind != UNDEFINED_BIN_IND) {
+                /* We can reuse bin of a deleted entry.  */
+                ind = firset_deleted_bin_ind;
+                MARK_SET_BIN_EMPTY(tab, ind);
+            }
+            break;
+        }
+        else if (! DELETED_BIN_P(entry_index)) {
+            DO_PTR_EQUAL_CHECK(tab, &entries[entry_index - ENTRY_BASE], curr_hash_value, key, eq_p, rebuilt_p);
+            if (EXPECT(rebuilt_p, 0))
+                return REBUILT_TABLE_ENTRY_IND;
+            if (eq_p)
+                break;
+        }
+        else if (firset_deleted_bin_ind == UNDEFINED_BIN_IND)
+            firset_deleted_bin_ind = ind;
+#ifdef QUADRATIC_PROBE
+        ind = set_hash_bin(ind + d, tab);
+        d++;
+#else
+        ind = set_secondary_hash(ind, tab, &perturb);
+#endif
+    }
+    *bin_ind = ind;
+    return entry_index;
+}
+
+/* Find an entry with KEY in table TAB.  Return non-zero if we found
+   it.  */
+int
+set_table_lookup(set_table *tab, st_data_t key)
+{
+    st_index_t bin;
+    st_hash_t hash = set_do_hash(key, tab);
+
+ retry:
+    if (tab->bins == NULL) {
+        bin = set_find_entry(tab, hash, key);
+        if (EXPECT(bin == REBUILT_TABLE_ENTRY_IND, 0))
+            goto retry;
+        if (bin == UNDEFINED_ENTRY_IND)
+            return 0;
+    }
+    else {
+        bin = set_find_table_entry_ind(tab, hash, key);
+        if (EXPECT(bin == REBUILT_TABLE_ENTRY_IND, 0))
+            goto retry;
+        if (bin == UNDEFINED_ENTRY_IND)
+            return 0;
+        bin -= ENTRY_BASE;
+    }
+    return 1;
+}
+
+/* Check the table and rebuild it if it is necessary.  */
+static inline void
+set_rebuild_table_if_necessary (set_table *tab)
+{
+    st_index_t bound = tab->entries_bound;
+
+    if (bound == set_get_allocated_entries(tab))
+        set_rebuild_table(tab);
+}
+
+/* Insert KEY into table TAB and return zero.  If there is
+   already entry with KEY in the table, return nonzero and update
+   the value of the found entry.  */
+int
+set_insert(set_table *tab, st_data_t key)
+{
+    set_table_entry *entry;
+    st_index_t bin;
+    st_index_t ind;
+    st_hash_t hash_value;
+    st_index_t bin_ind;
+    int new_p;
+
+    hash_value = set_do_hash(key, tab);
+ retry:
+    set_rebuild_table_if_necessary(tab);
+    if (tab->bins == NULL) {
+        bin = set_find_entry(tab, hash_value, key);
+        if (EXPECT(bin == REBUILT_TABLE_ENTRY_IND, 0))
+            goto retry;
+        new_p = bin == UNDEFINED_ENTRY_IND;
+        if (new_p)
+            tab->num_entries++;
+        bin_ind = UNDEFINED_BIN_IND;
+    }
+    else {
+        bin = set_find_table_bin_ptr_and_reserve(tab, &hash_value,
+                                             key, &bin_ind);
+        if (EXPECT(bin == REBUILT_TABLE_ENTRY_IND, 0))
+            goto retry;
+        new_p = bin == UNDEFINED_ENTRY_IND;
+        bin -= ENTRY_BASE;
+    }
+    if (new_p) {
+        ind = tab->entries_bound++;
+        entry = &tab->entries[ind];
+        entry->hash = hash_value;
+        entry->key = key;
+        if (bin_ind != UNDEFINED_BIN_IND)
+            set_bin(tab->bins, set_get_size_ind(tab), bin_ind, ind + ENTRY_BASE);
+        return 0;
+    }
+    return 1;
+}
+
+/* Create a copy of old_tab into new_tab. */
+static set_table *
+set_replace(set_table *new_tab, set_table *old_tab)
+{
+    *new_tab = *old_tab;
+    if (old_tab->bins == NULL)
+        new_tab->bins = NULL;
+    else {
+        new_tab->bins = (st_index_t *) malloc(set_bins_size(old_tab));
+    }
+    new_tab->entries = (set_table_entry *) malloc(set_get_allocated_entries(old_tab)
+                                                 * sizeof(set_table_entry));
+    MEMCPY(new_tab->entries, old_tab->entries, set_table_entry,
+           set_get_allocated_entries(old_tab));
+    if (old_tab->bins != NULL)
+        MEMCPY(new_tab->bins, old_tab->bins, char, set_bins_size(old_tab));
+
+    return new_tab;
+}
+
+/* Create and return a copy of table OLD_TAB.  */
+set_table *
+set_copy(set_table *new_tab, set_table *old_tab)
+{
+    if (new_tab == NULL) new_tab = (set_table *) malloc(sizeof(set_table));
+
+    if (set_replace(new_tab, old_tab) == NULL) {
+        set_free_table(new_tab);
+        return NULL;
+    }
+
+    return new_tab;
+}
+
+/* Update the entries start of table TAB after removing an entry
+   with index N in the array entries.  */
+static inline void
+set_update_range_for_deleted(set_table *tab, st_index_t n)
+{
+    /* Do not update entries_bound here.  Otherwise, we can fill all
+       bins by deleted entry value before rebuilding the table.  */
+    if (tab->entries_start == n) {
+        st_index_t start = n + 1;
+        st_index_t bound = tab->entries_bound;
+        set_table_entry *entries = tab->entries;
+        while (start < bound && DELETED_ENTRY_P(&entries[start])) start++;
+        tab->entries_start = start;
+    }
+}
+
+/* Mark I-th bin of table TAB as corresponding to a deleted table
+   entry.  Update number of entries in the table and number of bins
+   corresponding to deleted entries. */
+#define MARK_SET_BIN_DELETED(tab, i)				\
+    do {                                                        \
+        set_bin((tab)->bins, set_get_size_ind(tab), i, DELETED_BIN); \
+    } while (0)
+
+/* Delete entry with KEY from table TAB, and return non-zero.  If
+   there is no entry with KEY in the table, return zero.  */
+int
+set_table_delete(set_table *tab, st_data_t *key)
+{
+    set_table_entry *entry;
+    st_index_t bin;
+    st_index_t bin_ind;
+    st_hash_t hash;
+
+    hash = set_do_hash(*key, tab);
+ retry:
+    if (tab->bins == NULL) {
+        bin = set_find_entry(tab, hash, *key);
+        if (EXPECT(bin == REBUILT_TABLE_ENTRY_IND, 0))
+            goto retry;
+        if (bin == UNDEFINED_ENTRY_IND) {
+            return 0;
+        }
+    }
+    else {
+        bin_ind = set_find_table_bin_ind(tab, hash, *key);
+        if (EXPECT(bin_ind == REBUILT_TABLE_BIN_IND, 0))
+            goto retry;
+        if (bin_ind == UNDEFINED_BIN_IND) {
+            return 0;
+        }
+        bin = get_bin(tab->bins, set_get_size_ind(tab), bin_ind) - ENTRY_BASE;
+        MARK_SET_BIN_DELETED(tab, bin_ind);
+    }
+    entry = &tab->entries[bin];
+    *key = entry->key;
+    MARK_ENTRY_DELETED(entry);
+    tab->num_entries--;
+    set_update_range_for_deleted(tab, bin);
+    return 1;
+}
+
+/* Traverse all entries in table TAB calling FUNC with current entry
+   key and zero.  If the call returns ST_STOP, stop
+   traversing.  If the call returns ST_DELETE, delete the current
+   entry from the table.  In case of ST_CHECK or ST_CONTINUE, continue
+   traversing.  The function returns zero unless an error is found.
+   CHECK_P is flag of set_foreach_check call.  The behavior is a bit
+   different for ST_CHECK and when the current element is removed
+   during traversing.  */
+static inline int
+set_general_foreach(set_table *tab, set_foreach_check_callback_func *func,
+                    set_update_callback_func *replace, st_data_t arg,
+                    int check_p)
+{
+    st_index_t bin;
+    st_index_t bin_ind;
+    set_table_entry *entries, *curr_entry_ptr;
+    enum st_retval retval;
+    st_index_t i, rebuilds_num;
+    st_hash_t hash;
+    st_data_t key;
+    int error_p, packed_p = tab->bins == NULL;
+
+    entries = tab->entries;
+    /* The bound can change inside the loop even without rebuilding
+       the table, e.g. by an entry insertion.  */
+    for (i = tab->entries_start; i < tab->entries_bound; i++) {
+        curr_entry_ptr = &entries[i];
+        if (EXPECT(DELETED_ENTRY_P(curr_entry_ptr), 0))
+            continue;
+        key = curr_entry_ptr->key;
+        rebuilds_num = tab->rebuilds_num;
+        hash = curr_entry_ptr->hash;
+        retval = (*func)(key, arg, 0);
+
+         if (retval == ST_REPLACE && replace) {
+            retval = (*replace)(&key, arg, TRUE);
+            curr_entry_ptr->key = key;
+        }
+
+        if (rebuilds_num != tab->rebuilds_num) {
+        retry:
+            entries = tab->entries;
+            packed_p = tab->bins == NULL;
+            if (packed_p) {
+                i = set_find_entry(tab, hash, key);
+                if (EXPECT(i == REBUILT_TABLE_ENTRY_IND, 0))
+                    goto retry;
+                error_p = i == UNDEFINED_ENTRY_IND;
+            }
+            else {
+                i = set_find_table_entry_ind(tab, hash, key);
+                if (EXPECT(i == REBUILT_TABLE_ENTRY_IND, 0))
+                    goto retry;
+                error_p = i == UNDEFINED_ENTRY_IND;
+                i -= ENTRY_BASE;
+            }
+            if (error_p && check_p) {
+                /* call func with error notice */
+                retval = (*func)(0, arg, 1);
+                return 1;
+            }
+            curr_entry_ptr = &entries[i];
+        }
+        switch (retval) {
+          case ST_REPLACE:
+            break;
+          case ST_CONTINUE:
+            break;
+          case ST_CHECK:
+            if (check_p)
+                break;
+          case ST_STOP:
+            return 0;
+          case ST_DELETE: {
+            st_data_t key = curr_entry_ptr->key;
+
+              again:
+            if (packed_p) {
+                bin = set_find_entry(tab, hash, key);
+                if (EXPECT(bin == REBUILT_TABLE_ENTRY_IND, 0))
+                    goto again;
+                if (bin == UNDEFINED_ENTRY_IND)
+                    break;
+            }
+            else {
+                bin_ind = set_find_table_bin_ind(tab, hash, key);
+                if (EXPECT(bin_ind == REBUILT_TABLE_BIN_IND, 0))
+                    goto again;
+                if (bin_ind == UNDEFINED_BIN_IND)
+                    break;
+                bin = get_bin(tab->bins, set_get_size_ind(tab), bin_ind) - ENTRY_BASE;
+                MARK_SET_BIN_DELETED(tab, bin_ind);
+            }
+            curr_entry_ptr = &entries[bin];
+            MARK_ENTRY_DELETED(curr_entry_ptr);
+            tab->num_entries--;
+            set_update_range_for_deleted(tab, bin);
+            break;
+          }
+        }
+    }
+    return 0;
+}
+
+int
+set_foreach_with_replace(set_table *tab, set_foreach_check_callback_func *func, set_update_callback_func *replace, st_data_t arg)
+{
+    return set_general_foreach(tab, func, replace, arg, TRUE);
+}
+
+struct set_functor {
+    set_foreach_callback_func *func;
+    st_data_t arg;
+};
+
+static int
+set_apply_functor(st_data_t k, st_data_t d, int _)
+{
+    const struct set_functor *f = (void *)d;
+    return f->func(k, f->arg);
+}
+
+int
+set_table_foreach(set_table *tab, set_foreach_callback_func *func, st_data_t arg)
+{
+    const struct set_functor f = { func, arg };
+    return set_general_foreach(tab, set_apply_functor, NULL, (st_data_t)&f, FALSE);
+}
+
+/* See comments for function set_delete_safe.  */
+int
+set_foreach_check(set_table *tab, set_foreach_check_callback_func *func, st_data_t arg,
+                 st_data_t never ATTRIBUTE_UNUSED)
+{
+    return set_general_foreach(tab, func, NULL, arg, TRUE);
+}
+
+/* Set up array KEYS by at most SIZE keys of head table TAB entries.
+   Return the number of keys set up in array KEYS.  */
+inline st_index_t
+set_keys(set_table *tab, st_data_t *keys, st_index_t size)
+{
+    st_index_t i, bound;
+    st_data_t key, *keys_start, *keys_end;
+    set_table_entry *curr_entry_ptr, *entries = tab->entries;
+
+    bound = tab->entries_bound;
+    keys_start = keys;
+    keys_end = keys + size;
+    for (i = tab->entries_start; i < bound; i++) {
+        if (keys == keys_end)
+            break;
+        curr_entry_ptr = &entries[i];
+        key = curr_entry_ptr->key;
+        if (! DELETED_ENTRY_P(curr_entry_ptr))
+            *keys++ = key;
+    }
+
+    return keys - keys_start;
+}
+
+void
+set_compact_table(set_table *tab)
+{
+    st_index_t num = tab->num_entries;
+    if (REBUILD_THRESHOLD * num <= set_get_allocated_entries(tab)) {
+        /* Compaction: */
+        set_table *new_tab = set_init_table_with_size(NULL, tab->type, 2 * num);
+        set_rebuild_table_with(new_tab, tab);
+        set_rebuild_move_table(new_tab, tab);
+        set_rebuild_cleanup(tab);
     }
 }
 
diff --git a/strftime.c b/strftime.c
index 33e7d3fdb8c519..9be4bb9d07ac20 100644
--- a/strftime.c
+++ b/strftime.c
@@ -171,7 +171,9 @@ resize_buffer(VALUE ftime, char *s, const char **start, const char **endp,
 	      ptrdiff_t n, size_t maxsize)
 {
 	size_t len = s - *start;
-	size_t nlen = len + n * 2;
+	size_t need = len + n * 2;
+	size_t nlen = rb_str_capacity(ftime);
+	while (nlen < need) nlen <<= 1;
 
 	if (nlen < len || nlen > maxsize) {
 		return 0;
@@ -930,6 +932,7 @@ rb_strftime(const char *format, size_t format_len, rb_encoding *enc,
 	    VALUE time, const struct vtm *vtm, VALUE timev, int gmt)
 {
 	VALUE result = rb_enc_str_new(0, 0, enc);
+	ENC_CODERANGE_CLEAR(result);
 	return rb_strftime_with_timespec(result, format, format_len, enc,
 					 time, vtm, timev, NULL, gmt,
 					 strftime_size_limit(format_len));
@@ -940,6 +943,7 @@ rb_strftime_timespec(const char *format, size_t format_len, rb_encoding *enc,
 		     VALUE time, const struct vtm *vtm, struct timespec *ts, int gmt)
 {
 	VALUE result = rb_enc_str_new(0, 0, enc);
+	ENC_CODERANGE_CLEAR(result);
 	return rb_strftime_with_timespec(result, format, format_len, enc,
 					 time, vtm, Qnil, ts, gmt,
 					 strftime_size_limit(format_len));
@@ -983,10 +987,10 @@ vtm2tm_noyear(const struct vtm *vtm, struct tm *result)
     tm.tm_yday = vtm->yday-1;
     tm.tm_isdst = vtm->isdst;
 #if defined(HAVE_STRUCT_TM_TM_GMTOFF)
-    tm.tm_gmtoff = NUM2LONG(vtm->utc_offset);
+    tm.tm_gmtoff = 0;
 #endif
 #if defined(HAVE_TM_ZONE)
-    tm.tm_zone = (char *)vtm->zone;
+    tm.tm_zone = NULL;
 #endif
     *result = tm;
 }
diff --git a/string.c b/string.c
index deeed4a12a48ea..c425eb56f08a68 100644
--- a/string.c
+++ b/string.c
@@ -31,9 +31,11 @@
 #include "internal/encoding.h"
 #include "internal/error.h"
 #include "internal/gc.h"
+#include "internal/hash.h"
 #include "internal/numeric.h"
 #include "internal/object.h"
 #include "internal/proc.h"
+#include "internal/concurrent_set.h"
 #include "internal/re.h"
 #include "internal/sanitizers.h"
 #include "internal/string.h"
@@ -41,9 +43,12 @@
 #include "probes.h"
 #include "ruby/encoding.h"
 #include "ruby/re.h"
+#include "ruby/thread.h"
 #include "ruby/util.h"
 #include "ruby_assert.h"
+#include "shape.h"
 #include "vm_sync.h"
+#include "ruby/internal/attr/nonstring.h"
 
 #if defined HAVE_CRYPT_R
 # if defined HAVE_CRYPT_H
@@ -78,27 +83,52 @@
 VALUE rb_cString;
 VALUE rb_cSymbol;
 
-/* FLAGS of RString
+/* Flags of RString
  *
+ * 0:     STR_SHARED (equal to ELTS_SHARED)
+ *            The string is shared. The buffer this string points to is owned by
+ *            another string (the shared root).
  * 1:     RSTRING_NOEMBED
- * 2:     STR_SHARED (== ELTS_SHARED)
- * 5:     STR_SHARED_ROOT (RSTRING_NOEMBED==1 && STR_SHARED == 0, there may be
- *                         other strings that rely on this string's buffer)
- * 6:     STR_BORROWED (when RSTRING_NOEMBED==1 && klass==0, unsafe to recycle
- *                      early, specific to rb_str_tmp_frozen_{acquire,release})
- * 7:     STR_TMPLOCK (set when a pointer to the buffer is passed to syscall
- *                     such as read(2). Any modification and realloc is prohibited)
- *
- * 8-9:   ENC_CODERANGE (2 bits)
- * 10-16: ENCODING (7 bits == 128)
+ *            The string is not embedded. When a string is embedded, the contents
+ *            follow the header. When a string is not embedded, the contents is
+ *            on a separately allocated buffer.
+ * 2:     STR_CHILLED_LITERAL (will be frozen in a future version)
+ *            The string was allocated as a literal in a file without an explicit `frozen_string_literal` comment.
+ *            It emits a deprecation warning when mutated for the first time.
+ * 3:     STR_CHILLED_SYMBOL_TO_S (will be frozen in a future version)
+ *            The string was allocated by the `Symbol#to_s` method.
+ *            It emits a deprecation warning when mutated for the first time.
+ * 4:     STR_PRECOMPUTED_HASH
+ *            The string is embedded and has its precomputed hashcode stored
+ *            after the terminator.
+ * 5:     STR_SHARED_ROOT
+ *            Other strings may point to the contents of this string. When this
+ *            flag is set, STR_SHARED must not be set.
+ * 6:     STR_BORROWED
+ *            When RSTRING_NOEMBED is set and klass is 0, this string is unsafe
+ *            to be unshared by rb_str_tmp_frozen_release.
+ * 7:     STR_TMPLOCK
+ *            The pointer to the buffer is passed to a system call such as
+ *            read(2). Any modification and realloc is prohibited.
+ * 8-9:   ENC_CODERANGE
+ *            Stores the coderange of the string.
+ * 10-16: ENCODING
+ *            Stores the encoding of the string.
  * 17:    RSTRING_FSTR
- * 18:    STR_NOFREE (do not free this string's buffer when a String is freed.
- *                    used for a string object based on C string literal)
- * 19:    STR_FAKESTR (when RVALUE is not managed by GC. Typically, the string
- *                     object header is temporarily allocated on C stack)
+ *            The string is a fstring. The string is deduplicated in the fstring
+ *            table.
+ * 18:    STR_NOFREE
+ *            Do not free this string's buffer when the string is reclaimed
+ *            by the garbage collector. Used for when the string buffer is a C
+ *            string literal.
+ * 19:    STR_FAKESTR
+ *            The string is not allocated or managed by the garbage collector.
+ *            Typically, the string object header (struct RString) is temporarily
+ *            allocated on C stack.
  */
 
 #define RUBY_MAX_CHAR_LEN 16
+#define STR_PRECOMPUTED_HASH FL_USER4
 #define STR_SHARED_ROOT FL_USER5
 #define STR_BORROWED FL_USER6
 #define STR_TMPLOCK FL_USER7
@@ -109,17 +139,17 @@ VALUE rb_cSymbol;
     FL_SET((str), STR_NOEMBED);\
     FL_UNSET((str), STR_SHARED | STR_SHARED_ROOT | STR_BORROWED);\
 } while (0)
-#define STR_SET_EMBED(str) FL_UNSET((str), (STR_NOEMBED|STR_NOFREE))
+#define STR_SET_EMBED(str) FL_UNSET((str), STR_NOEMBED | STR_SHARED | STR_NOFREE)
 
 #define STR_SET_LEN(str, n) do { \
     RSTRING(str)->len = (n); \
 } while (0)
 
 static inline bool
-str_enc_fastpath(VALUE str)
+str_encindex_fastpath(int encindex)
 {
     // The overwhelming majority of strings are in one of these 3 encodings.
-    switch (ENCODING_GET_INLINED(str)) {
+    switch (encindex) {
       case ENCINDEX_ASCII_8BIT:
       case ENCINDEX_UTF_8:
       case ENCINDEX_US_ASCII:
@@ -129,6 +159,12 @@ str_enc_fastpath(VALUE str)
     }
 }
 
+static inline bool
+str_enc_fastpath(VALUE str)
+{
+    return str_encindex_fastpath(ENCODING_GET_INLINED(str));
+}
+
 #define TERM_LEN(str) (str_enc_fastpath(str) ? 1 : rb_enc_mbminlen(rb_enc_from_index(ENCODING_GET(str))))
 #define TERM_FILL(ptr, termlen) do {\
     char *const term_fill_ptr = (ptr);\
@@ -155,7 +191,7 @@ str_enc_fastpath(VALUE str)
         }\
     }\
     else {\
-        assert(!FL_TEST((str), STR_SHARED)); \
+        RUBY_ASSERT(!FL_TEST((str), STR_SHARED)); \
         SIZED_REALLOC_N(RSTRING(str)->as.heap.ptr, char, \
                         (size_t)(capacity) + (termlen), STR_HEAP_SIZE(str)); \
         RSTRING(str)->as.heap.aux.capa = (capacity);\
@@ -164,8 +200,8 @@ str_enc_fastpath(VALUE str)
 
 #define STR_SET_SHARED(str, shared_str) do { \
     if (!FL_TEST(str, STR_FAKESTR)) { \
-        assert(RSTRING_PTR(shared_str) <= RSTRING_PTR(str)); \
-        assert(RSTRING_PTR(str) <= RSTRING_PTR(shared_str) + RSTRING_LEN(shared_str)); \
+        RUBY_ASSERT(RSTRING_PTR(shared_str) <= RSTRING_PTR(str)); \
+        RUBY_ASSERT(RSTRING_PTR(str) <= RSTRING_PTR(shared_str) + RSTRING_LEN(shared_str)); \
         RB_OBJ_WRITE((str), &RSTRING(str)->as.heap.aux.shared, (shared_str)); \
         FL_SET((str), STR_SHARED); \
         FL_SET((shared_str), STR_SHARED_ROOT); \
@@ -223,6 +259,11 @@ rb_str_size_as_embedded(VALUE str)
     else {
         real_size = sizeof(struct RString);
     }
+
+    if (FL_TEST_RAW(str, STR_PRECOMPUTED_HASH)) {
+        real_size += sizeof(st_index_t);
+    }
+
     return real_size;
 }
 
@@ -240,6 +281,7 @@ static VALUE str_new(VALUE klass, const char *ptr, long len);
 static void str_make_independent_expand(VALUE str, long len, long expand, const int termlen);
 static inline void str_modifiable(VALUE str);
 static VALUE rb_str_downcase(int argc, VALUE *argv, VALUE str);
+static inline VALUE str_alloc_embed(VALUE klass, size_t capa);
 
 static inline void
 str_make_independent(VALUE str)
@@ -279,26 +321,6 @@ rb_str_make_embedded(VALUE str)
     TERM_FILL(RSTRING(str)->as.embed.ary + len, TERM_LEN(str));
 }
 
-void
-rb_str_update_shared_ary(VALUE str, VALUE old_root, VALUE new_root)
-{
-    // if the root location hasn't changed, we don't need to update
-    if (new_root == old_root) {
-        return;
-    }
-
-    // if the root string isn't embedded, we don't need to touch the pointer.
-    // it already points to the shame shared buffer
-    if (!STR_EMBED_P(new_root)) {
-        return;
-    }
-
-    size_t offset = (size_t)((uintptr_t)RSTRING(str)->as.heap.ptr - (uintptr_t)RSTRING(old_root)->as.embed.ary);
-
-    RUBY_ASSERT(RSTRING(str)->as.heap.ptr >= RSTRING(old_root)->as.embed.ary);
-    RSTRING(str)->as.heap.ptr = RSTRING(new_root)->as.embed.ary + offset;
-}
-
 void
 rb_debug_rstring_null_ptr(const char *func)
 {
@@ -335,75 +357,49 @@ mustnot_wchar(VALUE str)
     }
 }
 
-static int fstring_cmp(VALUE a, VALUE b);
+static VALUE register_fstring(VALUE str, bool copy, bool force_precompute_hash);
 
-static VALUE register_fstring(VALUE str, bool copy);
-
-const struct st_hash_type rb_fstring_hash_type = {
-    fstring_cmp,
-    rb_str_hash,
-};
-
-#define BARE_STRING_P(str) (!FL_ANY_RAW(str, FL_EXIVAR) && RBASIC_CLASS(str) == rb_cString)
+#if SIZEOF_LONG == SIZEOF_VOIDP
+#define PRECOMPUTED_FAKESTR_HASH 1
+#else
+#endif
 
-struct fstr_update_arg {
-    VALUE fstr;
-    bool copy;
-};
+static inline bool
+BARE_STRING_P(VALUE str)
+{
+    return RBASIC_CLASS(str) == rb_cString && !rb_shape_obj_has_ivars(str);
+}
 
-static int
-fstr_update_callback(st_data_t *key, st_data_t *value, st_data_t data, int existing)
+static inline st_index_t
+str_do_hash(VALUE str)
 {
+    st_index_t h = rb_memhash((const void *)RSTRING_PTR(str), RSTRING_LEN(str));
+    int e = RSTRING_LEN(str) ? ENCODING_GET(str) : 0;
+    if (e && !is_ascii_string(str)) {
+        h = rb_hash_end(rb_hash_uint32(h, (uint32_t)e));
+    }
+    return h;
+}
 
-    struct fstr_update_arg *arg = (struct fstr_update_arg *)data;
-    VALUE str = (VALUE)*key;
+static VALUE
+str_store_precomputed_hash(VALUE str, st_index_t hash)
+{
+    RUBY_ASSERT(!FL_TEST_RAW(str, STR_PRECOMPUTED_HASH));
+    RUBY_ASSERT(STR_EMBED_P(str));
 
-    if (existing) {
-        /* because of lazy sweep, str may be unmarked already and swept
-         * at next time */
+#if RUBY_DEBUG
+    size_t used_bytes = (RSTRING_LEN(str) + TERM_LEN(str));
+    size_t free_bytes = str_embed_capa(str) - used_bytes;
+    RUBY_ASSERT(free_bytes >= sizeof(st_index_t));
+#endif
 
-        if (rb_objspace_garbage_object_p(str)) {
-            arg->fstr = Qundef;
-            return ST_DELETE;
-        }
+    memcpy(RSTRING_END(str) + TERM_LEN(str), &hash, sizeof(hash));
 
-        arg->fstr = str;
-        return ST_STOP;
-    }
-    else {
-        if (FL_TEST_RAW(str, STR_FAKESTR)) {
-            if (arg->copy) {
-                VALUE new_str = str_new(rb_cString, RSTRING(str)->as.heap.ptr, RSTRING(str)->len);
-                rb_enc_copy(new_str, str);
-                str = new_str;
-            }
-            else {
-                str = str_new_static(rb_cString, RSTRING(str)->as.heap.ptr,
-                                     RSTRING(str)->len,
-                                     ENCODING_GET(str));
-            }
-            OBJ_FREEZE_RAW(str);
-        }
-        else {
-            if (!OBJ_FROZEN(str))
-                str = str_new_frozen(rb_cString, str);
-            if (STR_SHARED_P(str)) { /* str should not be shared */
-                /* shared substring  */
-                str_make_independent(str);
-                assert(OBJ_FROZEN(str));
-            }
-            if (!BARE_STRING_P(str)) {
-                str = str_new_frozen(rb_cString, str);
-            }
-        }
-        RBASIC(str)->flags |= RSTRING_FSTR;
+    FL_SET(str, STR_PRECOMPUTED_HASH);
 
-        *key = *value = arg->fstr = str;
-        return ST_CONTINUE;
-    }
+    return str;
 }
 
-RUBY_FUNC_EXPORTED
 VALUE
 rb_fstring(VALUE str)
 {
@@ -418,57 +414,214 @@ rb_fstring(VALUE str)
     bare = BARE_STRING_P(str);
     if (!bare) {
         if (STR_EMBED_P(str)) {
-            OBJ_FREEZE_RAW(str);
+            OBJ_FREEZE(str);
             return str;
         }
 
         if (FL_TEST_RAW(str, STR_SHARED_ROOT | STR_SHARED) == STR_SHARED_ROOT) {
-            assert(OBJ_FROZEN(str));
+            RUBY_ASSERT(OBJ_FROZEN(str));
             return str;
         }
     }
 
-    if (!OBJ_FROZEN(str))
+    if (!FL_TEST_RAW(str, FL_FREEZE | STR_NOFREE | STR_CHILLED))
         rb_str_resize(str, RSTRING_LEN(str));
 
-    fstr = register_fstring(str, FALSE);
+    fstr = register_fstring(str, false, false);
 
     if (!bare) {
         str_replace_shared_without_enc(str, fstr);
-        OBJ_FREEZE_RAW(str);
+        OBJ_FREEZE(str);
         return str;
     }
     return fstr;
 }
 
+static VALUE fstring_table_obj;
+
 static VALUE
-register_fstring(VALUE str, bool copy)
+fstring_concurrent_set_hash(VALUE str)
 {
-    struct fstr_update_arg args;
-    args.copy = copy;
+#ifdef PRECOMPUTED_FAKESTR_HASH
+    st_index_t h;
+    if (FL_TEST_RAW(str, STR_FAKESTR)) {
+        // register_fstring precomputes the hash and stores it in capa for fake strings
+        h = (st_index_t)RSTRING(str)->as.heap.aux.capa;
+    }
+    else {
+        h = rb_str_hash(str);
+    }
+    // rb_str_hash doesn't include the encoding for ascii only strings, so
+    // we add it to avoid common collisions between `:sym.name` (ASCII) and `"sym"` (UTF-8)
+    return (VALUE)rb_hash_end(rb_hash_uint32(h, (uint32_t)ENCODING_GET_INLINED(str)));
+#else
+    return (VALUE)rb_str_hash(str);
+#endif
+}
 
-    RB_VM_LOCK_ENTER();
-    {
-        st_table *frozen_strings = rb_vm_fstring_table();
-        do {
-            args.fstr = str;
-            st_update(frozen_strings, (st_data_t)str, fstr_update_callback, (st_data_t)&args);
-        } while (UNDEF_P(args.fstr));
+static bool
+fstring_concurrent_set_cmp(VALUE a, VALUE b)
+{
+    long alen, blen;
+    const char *aptr, *bptr;
+
+    RUBY_ASSERT(RB_TYPE_P(a, T_STRING));
+    RUBY_ASSERT(RB_TYPE_P(b, T_STRING));
+
+    RSTRING_GETMEM(a, aptr, alen);
+    RSTRING_GETMEM(b, bptr, blen);
+    return (alen == blen &&
+            ENCODING_GET(a) == ENCODING_GET(b) &&
+            memcmp(aptr, bptr, alen) == 0);
+}
+
+struct fstr_create_arg {
+    bool copy;
+    bool force_precompute_hash;
+};
+
+static VALUE
+fstring_concurrent_set_create(VALUE str, void *data)
+{
+    struct fstr_create_arg *arg = data;
+
+    // Unless the string is empty or binary, its coderange has been precomputed.
+    int coderange = ENC_CODERANGE(str);
+
+    if (FL_TEST_RAW(str, STR_FAKESTR)) {
+        if (arg->copy) {
+            VALUE new_str;
+            long len = RSTRING_LEN(str);
+            long capa = len + sizeof(st_index_t);
+            int term_len = TERM_LEN(str);
+
+            if (arg->force_precompute_hash && STR_EMBEDDABLE_P(capa, term_len)) {
+                new_str = str_alloc_embed(rb_cString, capa + term_len);
+                memcpy(RSTRING_PTR(new_str), RSTRING_PTR(str), len);
+                STR_SET_LEN(new_str, RSTRING_LEN(str));
+                TERM_FILL(RSTRING_END(new_str), TERM_LEN(str));
+                rb_enc_copy(new_str, str);
+                str_store_precomputed_hash(new_str, str_do_hash(str));
+            }
+            else {
+                new_str = str_new(rb_cString, RSTRING(str)->as.heap.ptr, RSTRING(str)->len);
+                rb_enc_copy(new_str, str);
+#ifdef PRECOMPUTED_FAKESTR_HASH
+                if (rb_str_capacity(new_str) >= RSTRING_LEN(str) + term_len + sizeof(st_index_t)) {
+                    str_store_precomputed_hash(new_str, (st_index_t)RSTRING(str)->as.heap.aux.capa);
+                }
+#endif
+            }
+            str = new_str;
+        }
+        else {
+            str = str_new_static(rb_cString, RSTRING(str)->as.heap.ptr,
+                    RSTRING(str)->len,
+                    ENCODING_GET(str));
+        }
+        OBJ_FREEZE(str);
     }
-    RB_VM_LOCK_LEAVE();
+    else {
+        if (!OBJ_FROZEN(str) || CHILLED_STRING_P(str)) {
+            str = str_new_frozen(rb_cString, str);
+        }
+        if (STR_SHARED_P(str)) { /* str should not be shared */
+            /* shared substring  */
+            str_make_independent(str);
+            RUBY_ASSERT(OBJ_FROZEN(str));
+        }
+        if (!BARE_STRING_P(str)) {
+            str = str_new_frozen(rb_cString, str);
+        }
+    }
+
+    ENC_CODERANGE_SET(str, coderange);
+    RBASIC(str)->flags |= RSTRING_FSTR;
 
-    assert(OBJ_FROZEN(args.fstr));
-    assert(!FL_TEST_RAW(args.fstr, STR_FAKESTR));
-    assert(!FL_TEST_RAW(args.fstr, FL_EXIVAR));
-    assert(RBASIC_CLASS(args.fstr) == rb_cString);
-    return args.fstr;
+    RUBY_ASSERT(RB_TYPE_P(str, T_STRING));
+    RUBY_ASSERT(OBJ_FROZEN(str));
+    RUBY_ASSERT(!FL_TEST_RAW(str, STR_FAKESTR));
+    RUBY_ASSERT(!rb_obj_exivar_p(str));
+    RUBY_ASSERT(RBASIC_CLASS(str) == rb_cString);
+    RUBY_ASSERT(!rb_objspace_garbage_object_p(str));
+
+    return str;
+}
+
+static struct rb_concurrent_set_funcs fstring_concurrent_set_funcs = {
+    .hash = fstring_concurrent_set_hash,
+    .cmp = fstring_concurrent_set_cmp,
+    .create = fstring_concurrent_set_create,
+};
+
+void
+Init_fstring_table(void)
+{
+    fstring_table_obj = rb_concurrent_set_new(&fstring_concurrent_set_funcs, 8192);
+    rb_gc_register_address(&fstring_table_obj);
+}
+
+static VALUE
+register_fstring(VALUE str, bool copy, bool force_precompute_hash)
+{
+    struct fstr_create_arg args = {
+        .copy = copy,
+        .force_precompute_hash = force_precompute_hash
+    };
+
+#if SIZEOF_VOIDP == SIZEOF_LONG
+    if (FL_TEST_RAW(str, STR_FAKESTR)) {
+        // if the string hasn't been interned, we'll need the hash twice, so we
+        // compute it once and store it in capa
+        RSTRING(str)->as.heap.aux.capa = (long)str_do_hash(str);
+    }
+#endif
+
+    VALUE result = rb_concurrent_set_find_or_insert(&fstring_table_obj, str, &args);
+
+    RUBY_ASSERT(!rb_objspace_garbage_object_p(result));
+    RUBY_ASSERT(RB_TYPE_P(result, T_STRING));
+    RUBY_ASSERT(OBJ_FROZEN(result));
+    RUBY_ASSERT(!FL_TEST_RAW(result, STR_FAKESTR));
+    RUBY_ASSERT(RBASIC_CLASS(result) == rb_cString);
+
+    return result;
+}
+
+bool
+rb_obj_is_fstring_table(VALUE obj)
+{
+    ASSERT_vm_locking();
+
+    return obj == fstring_table_obj;
+}
+
+void
+rb_gc_free_fstring(VALUE obj)
+{
+    // Assume locking and barrier (which there is no assert for)
+    ASSERT_vm_locking();
+
+    rb_concurrent_set_delete_by_identity(fstring_table_obj, obj);
+
+    RB_DEBUG_COUNTER_INC(obj_str_fstr);
+
+    FL_UNSET(obj, RSTRING_FSTR);
+}
+
+void
+rb_fstring_foreach_with_replace(int (*callback)(VALUE *str, void *data), void *data)
+{
+    if (fstring_table_obj) {
+        rb_concurrent_set_foreach_with_replace(fstring_table_obj, callback, data);
+    }
 }
 
 static VALUE
 setup_fake_str(struct RString *fake_str, const char *name, long len, int encidx)
 {
     fake_str->basic.flags = T_STRING|RSTRING_NOEMBED|STR_NOFREE|STR_FAKESTR;
-    /* SHARED to be allocated by the callback */
+    RBASIC_SET_SHAPE_ID((VALUE)fake_str, ROOT_SHAPE_ID);
 
     if (!name) {
         RUBY_ASSERT_ALWAYS(len == 0);
@@ -502,14 +655,14 @@ VALUE
 rb_fstring_new(const char *ptr, long len)
 {
     struct RString fake_str;
-    return register_fstring(setup_fake_str(&fake_str, ptr, len, ENCINDEX_US_ASCII), FALSE);
+    return register_fstring(setup_fake_str(&fake_str, ptr, len, ENCINDEX_US_ASCII), false, false);
 }
 
 VALUE
 rb_fstring_enc_new(const char *ptr, long len, rb_encoding *enc)
 {
     struct RString fake_str;
-    return register_fstring(rb_setup_fake_str(&fake_str, ptr, len, enc), FALSE);
+    return register_fstring(rb_setup_fake_str(&fake_str, ptr, len, enc), false, false);
 }
 
 VALUE
@@ -518,41 +671,30 @@ rb_fstring_cstr(const char *ptr)
     return rb_fstring_new(ptr, strlen(ptr));
 }
 
-static int
-fstring_set_class_i(st_data_t key, st_data_t val, st_data_t arg)
-{
-    RBASIC_SET_CLASS((VALUE)key, (VALUE)arg);
-    return ST_CONTINUE;
-}
-
-static int
-fstring_cmp(VALUE a, VALUE b)
-{
-    long alen, blen;
-    const char *aptr, *bptr;
-    RSTRING_GETMEM(a, aptr, alen);
-    RSTRING_GETMEM(b, bptr, blen);
-    return (alen != blen ||
-            ENCODING_GET(a) != ENCODING_GET(b) ||
-            memcmp(aptr, bptr, alen) != 0);
-}
-
-static inline int
+static inline bool
 single_byte_optimizable(VALUE str)
 {
-    rb_encoding *enc;
-
+    int encindex = ENCODING_GET(str);
+    switch (encindex) {
+      case ENCINDEX_ASCII_8BIT:
+      case ENCINDEX_US_ASCII:
+        return true;
+      case ENCINDEX_UTF_8:
+        // For UTF-8 it's worth scanning the string coderange when unknown.
+        return rb_enc_str_coderange(str) == ENC_CODERANGE_7BIT;
+    }
     /* Conservative.  It may be ENC_CODERANGE_UNKNOWN. */
-    if (ENC_CODERANGE(str) == ENC_CODERANGE_7BIT)
-        return 1;
+    if (ENC_CODERANGE(str) == ENC_CODERANGE_7BIT) {
+        return true;
+    }
 
-    enc = STR_ENC_GET(str);
-    if (rb_enc_mbmaxlen(enc) == 1)
-        return 1;
+    if (rb_enc_mbmaxlen(rb_enc_from_index(encindex)) == 1) {
+        return true;
+    }
 
     /* Conservative.  Possibly single byte.
      * "\xa1" in Shift_JIS for example. */
-    return 0;
+    return false;
 }
 
 VALUE rb_fs;
@@ -797,16 +939,24 @@ rb_enc_str_coderange(VALUE str)
     return cr;
 }
 
+static inline bool
+rb_enc_str_asciicompat(VALUE str)
+{
+    int encindex = ENCODING_GET_INLINED(str);
+    return str_encindex_fastpath(encindex) || rb_enc_asciicompat(rb_enc_get_from_index(encindex));
+}
+
 int
 rb_enc_str_asciionly_p(VALUE str)
 {
-    rb_encoding *enc = STR_ENC_GET(str);
-
-    if (!rb_enc_asciicompat(enc))
-        return FALSE;
-    else if (is_ascii_string(str))
-        return TRUE;
-    return FALSE;
+    switch(ENC_CODERANGE(str)) {
+      case ENC_CODERANGE_UNKNOWN:
+        return rb_enc_str_asciicompat(str) && is_ascii_string(str);
+      case ENC_CODERANGE_7BIT:
+        return true;
+      default:
+        return false;
+    }
 }
 
 static inline void
@@ -823,7 +973,7 @@ str_capacity(VALUE str, const int termlen)
     if (STR_EMBED_P(str)) {
         return str_embed_capa(str) - termlen;
     }
-    else if (FL_TEST(str, STR_SHARED|STR_NOFREE)) {
+    else if (FL_ANY_RAW(str, STR_SHARED|STR_NOFREE)) {
         return RSTRING(str)->len;
     }
     else {
@@ -849,8 +999,8 @@ static inline VALUE
 str_alloc_embed(VALUE klass, size_t capa)
 {
     size_t size = rb_str_embed_size(capa);
-    assert(size > 0);
-    assert(rb_gc_size_allocatable_p(size));
+    RUBY_ASSERT(size > 0);
+    RUBY_ASSERT(rb_gc_size_allocatable_p(size));
 
     NEWOBJ_OF(str, struct RString, klass,
             T_STRING | (RGENGC_WB_PROTECTED_STRING ? FL_WB_PROTECTED : 0), size, 0);
@@ -873,11 +1023,12 @@ empty_str_alloc(VALUE klass)
     RUBY_DTRACE_CREATE_HOOK(STRING, 0);
     VALUE str = str_alloc_embed(klass, 0);
     memset(RSTRING(str)->as.embed.ary, 0, str_embed_capa(str));
+    ENC_CODERANGE_SET(str, ENC_CODERANGE_7BIT);
     return str;
 }
 
 static VALUE
-str_new0(VALUE klass, const char *ptr, long len, int termlen)
+str_enc_new(VALUE klass, const char *ptr, long len, rb_encoding *enc)
 {
     VALUE str;
 
@@ -885,12 +1036,18 @@ str_new0(VALUE klass, const char *ptr, long len, int termlen)
         rb_raise(rb_eArgError, "negative string size (or size too big)");
     }
 
+    if (enc == NULL) {
+        enc = rb_ascii8bit_encoding();
+    }
+
     RUBY_DTRACE_CREATE_HOOK(STRING, len);
 
+    int termlen = rb_enc_mbminlen(enc);
+
     if (STR_EMBEDDABLE_P(len, termlen)) {
         str = str_alloc_embed(klass, len + termlen);
         if (len == 0) {
-            ENC_CODERANGE_SET(str, ENC_CODERANGE_7BIT);
+            ENC_CODERANGE_SET(str, rb_enc_asciicompat(enc) ? ENC_CODERANGE_7BIT : ENC_CODERANGE_VALID);
         }
     }
     else {
@@ -902,9 +1059,13 @@ str_new0(VALUE klass, const char *ptr, long len, int termlen)
         RSTRING(str)->as.heap.ptr =
             rb_xmalloc_mul_add_mul(sizeof(char), len, sizeof(char), termlen);
     }
+
+    rb_enc_raw_set(str, enc);
+
     if (ptr) {
         memcpy(RSTRING_PTR(str), ptr, len);
     }
+
     STR_SET_LEN(str, len);
     TERM_FILL(RSTRING_PTR(str) + len, termlen);
     return str;
@@ -913,7 +1074,7 @@ str_new0(VALUE klass, const char *ptr, long len, int termlen)
 static VALUE
 str_new(VALUE klass, const char *ptr, long len)
 {
-    return str_new0(klass, ptr, len, 1);
+    return str_enc_new(klass, ptr, len, rb_ascii8bit_encoding());
 }
 
 VALUE
@@ -925,29 +1086,19 @@ rb_str_new(const char *ptr, long len)
 VALUE
 rb_usascii_str_new(const char *ptr, long len)
 {
-    VALUE str = rb_str_new(ptr, len);
-    ENCODING_CODERANGE_SET(str, rb_usascii_encindex(), ENC_CODERANGE_7BIT);
-    return str;
+    return str_enc_new(rb_cString, ptr, len, rb_usascii_encoding());
 }
 
 VALUE
 rb_utf8_str_new(const char *ptr, long len)
 {
-    VALUE str = str_new(rb_cString, ptr, len);
-    rb_enc_associate_index(str, rb_utf8_encindex());
-    return str;
+    return str_enc_new(rb_cString, ptr, len, rb_utf8_encoding());
 }
 
 VALUE
 rb_enc_str_new(const char *ptr, long len, rb_encoding *enc)
 {
-    VALUE str;
-
-    if (!enc) return rb_str_new(ptr, len);
-
-    str = str_new0(rb_cString, ptr, len, rb_enc_mbminlen(enc));
-    rb_enc_associate(str, enc);
-    return str;
+    return str_enc_new(rb_cString, ptr, len, enc);
 }
 
 VALUE
@@ -965,17 +1116,13 @@ rb_str_new_cstr(const char *ptr)
 VALUE
 rb_usascii_str_new_cstr(const char *ptr)
 {
-    VALUE str = rb_str_new_cstr(ptr);
-    ENCODING_CODERANGE_SET(str, rb_usascii_encindex(), ENC_CODERANGE_7BIT);
-    return str;
+    return rb_enc_str_new_cstr(ptr, rb_usascii_encoding());
 }
 
 VALUE
 rb_utf8_str_new_cstr(const char *ptr)
 {
-    VALUE str = rb_str_new_cstr(ptr);
-    rb_enc_associate_index(str, rb_utf8_encindex());
-    return str;
+    return rb_enc_str_new_cstr(ptr, rb_utf8_encoding());
 }
 
 VALUE
@@ -998,8 +1145,7 @@ str_new_static(VALUE klass, const char *ptr, long len, int encindex)
     }
 
     if (!ptr) {
-        rb_encoding *enc = rb_enc_get_from_index(encindex);
-        str = str_new0(klass, ptr, len, rb_enc_mbminlen(enc));
+        str = str_enc_new(klass, ptr, len, rb_enc_from_index(encindex));
     }
     else {
         RUBY_DTRACE_CREATE_HOOK(STRING, len);
@@ -1008,8 +1154,8 @@ str_new_static(VALUE klass, const char *ptr, long len, int encindex)
         RSTRING(str)->as.heap.ptr = (char *)ptr;
         RSTRING(str)->as.heap.aux.capa = len;
         RBASIC(str)->flags |= STR_NOFREE;
+        rb_enc_associate_index(str, encindex);
     }
-    rb_enc_associate_index(str, encindex);
     return str;
 }
 
@@ -1152,6 +1298,7 @@ str_cat_conv_enc_opts(VALUE newstr, long ofs, const char *ptr, long len,
         rb_str_resize(newstr, olen);
     }
     DATA_PTR(econv_wrapper) = 0;
+    RB_GC_GUARD(econv_wrapper);
     rb_econv_close(ec);
     switch (ret) {
       case econv_finished:
@@ -1300,7 +1447,8 @@ str_replace_shared_without_enc(VALUE str2, VALUE str)
             root = rb_str_new_frozen(str);
             RSTRING_GETMEM(root, ptr, len);
         }
-        assert(OBJ_FROZEN(root));
+        RUBY_ASSERT(OBJ_FROZEN(root));
+
         if (!STR_EMBED_P(str2) && !FL_TEST_RAW(str2, STR_SHARED|STR_NOFREE)) {
             if (FL_TEST_RAW(str2, STR_SHARED_ROOT)) {
                 rb_fatal("about to free a possible shared root");
@@ -1343,7 +1491,7 @@ rb_str_new_shared(VALUE str)
 VALUE
 rb_str_new_frozen(VALUE orig)
 {
-    if (OBJ_FROZEN(orig)) return orig;
+    if (RB_FL_TEST_RAW(orig, FL_FREEZE | STR_CHILLED) == FL_FREEZE) return orig;
     return str_new_frozen(rb_obj_class(orig), orig);
 }
 
@@ -1354,6 +1502,14 @@ rb_str_new_frozen_String(VALUE orig)
     return str_new_frozen(rb_cString, orig);
 }
 
+
+VALUE
+rb_str_frozen_bare_string(VALUE orig)
+{
+    if (RB_LIKELY(BARE_STRING_P(orig) && OBJ_FROZEN_RAW(orig))) return orig;
+    return str_new_frozen(rb_cString, orig);
+}
+
 VALUE
 rb_str_tmp_frozen_acquire(VALUE orig)
 {
@@ -1361,6 +1517,42 @@ rb_str_tmp_frozen_acquire(VALUE orig)
     return str_new_frozen_buffer(0, orig, FALSE);
 }
 
+VALUE
+rb_str_tmp_frozen_no_embed_acquire(VALUE orig)
+{
+    if (OBJ_FROZEN_RAW(orig) && !STR_EMBED_P(orig) && !rb_str_reembeddable_p(orig)) return orig;
+    if (STR_SHARED_P(orig) && !STR_EMBED_P(RSTRING(orig)->as.heap.aux.shared)) return rb_str_tmp_frozen_acquire(orig);
+
+    VALUE str = str_alloc_heap(0);
+    OBJ_FREEZE(str);
+    /* Always set the STR_SHARED_ROOT to ensure it does not get re-embedded. */
+    FL_SET(str, STR_SHARED_ROOT);
+
+    size_t capa = str_capacity(orig, TERM_LEN(orig));
+
+    /* If the string is embedded then we want to create a copy that is heap
+     * allocated. If the string is shared then the shared root must be
+     * embedded, so we want to create a copy. If the string is a shared root
+     * then it must be embedded, so we want to create a copy. */
+    if (STR_EMBED_P(orig) || FL_TEST_RAW(orig, STR_SHARED | STR_SHARED_ROOT)) {
+        RSTRING(str)->as.heap.ptr = rb_xmalloc_mul_add_mul(sizeof(char), capa, sizeof(char), TERM_LEN(orig));
+        memcpy(RSTRING(str)->as.heap.ptr, RSTRING_PTR(orig), capa);
+    }
+    else {
+        /* orig must be heap allocated and not shared, so we can safely transfer
+         * the pointer to str. */
+        RSTRING(str)->as.heap.ptr = RSTRING(orig)->as.heap.ptr;
+        RBASIC(str)->flags |= RBASIC(orig)->flags & STR_NOFREE;
+        RBASIC(orig)->flags &= ~STR_NOFREE;
+        STR_SET_SHARED(orig, str);
+    }
+
+    RSTRING(str)->len = RSTRING(orig)->len;
+    RSTRING(str)->as.heap.aux.capa = capa;
+
+    return str;
+}
+
 void
 rb_str_tmp_frozen_release(VALUE orig, VALUE tmp)
 {
@@ -1368,21 +1560,21 @@ rb_str_tmp_frozen_release(VALUE orig, VALUE tmp)
         return;
 
     if (STR_EMBED_P(tmp)) {
-        assert(OBJ_FROZEN_RAW(tmp));
+        RUBY_ASSERT(OBJ_FROZEN_RAW(tmp));
     }
-    else if (FL_TEST_RAW(orig, STR_SHARED) &&
-            !FL_TEST_RAW(orig, STR_TMPLOCK|RUBY_FL_FREEZE)) {
+    else if (FL_TEST_RAW(orig, STR_SHARED | STR_TMPLOCK) == STR_TMPLOCK &&
+            !OBJ_FROZEN_RAW(orig)) {
         VALUE shared = RSTRING(orig)->as.heap.aux.shared;
 
         if (shared == tmp && !FL_TEST_RAW(tmp, STR_BORROWED)) {
-            assert(RSTRING(orig)->as.heap.ptr == RSTRING(tmp)->as.heap.ptr);
-            assert(RSTRING_LEN(orig) == RSTRING_LEN(tmp));
+            RUBY_ASSERT(RSTRING(orig)->as.heap.ptr == RSTRING(tmp)->as.heap.ptr);
+            RUBY_ASSERT(RSTRING_LEN(orig) == RSTRING_LEN(tmp));
 
             /* Unshare orig since the root (tmp) only has this one child. */
             FL_UNSET_RAW(orig, STR_SHARED);
             RSTRING(orig)->as.heap.aux.capa = RSTRING(tmp)->as.heap.aux.capa;
             RBASIC(orig)->flags |= RBASIC(tmp)->flags & STR_NOFREE;
-            assert(OBJ_FROZEN_RAW(tmp));
+            RUBY_ASSERT(OBJ_FROZEN_RAW(tmp));
 
             /* Make tmp embedded and empty so it is safe for sweeping. */
             STR_SET_EMBED(tmp);
@@ -1400,8 +1592,8 @@ str_new_frozen(VALUE klass, VALUE orig)
 static VALUE
 heap_str_make_shared(VALUE klass, VALUE orig)
 {
-    assert(!STR_EMBED_P(orig));
-    assert(!STR_SHARED_P(orig));
+    RUBY_ASSERT(!STR_EMBED_P(orig));
+    RUBY_ASSERT(!STR_SHARED_P(orig));
 
     VALUE str = str_alloc_heap(klass);
     STR_SET_LEN(str, RSTRING_LEN(orig));
@@ -1421,27 +1613,28 @@ str_new_frozen_buffer(VALUE klass, VALUE orig, int copy_encoding)
     VALUE str;
 
     long len = RSTRING_LEN(orig);
+    rb_encoding *enc = copy_encoding ? STR_ENC_GET(orig) : rb_ascii8bit_encoding();
     int termlen = copy_encoding ? TERM_LEN(orig) : 1;
 
     if (STR_EMBED_P(orig) || STR_EMBEDDABLE_P(len, termlen)) {
-        str = str_new0(klass, RSTRING_PTR(orig), len, termlen);
-        assert(STR_EMBED_P(str));
+        str = str_enc_new(klass, RSTRING_PTR(orig), len, enc);
+        RUBY_ASSERT(STR_EMBED_P(str));
     }
     else {
         if (FL_TEST_RAW(orig, STR_SHARED)) {
             VALUE shared = RSTRING(orig)->as.heap.aux.shared;
             long ofs = RSTRING(orig)->as.heap.ptr - RSTRING_PTR(shared);
             long rest = RSTRING_LEN(shared) - ofs - RSTRING_LEN(orig);
-            assert(ofs >= 0);
-            assert(rest >= 0);
-            assert(ofs + rest <= RSTRING_LEN(shared));
-            assert(OBJ_FROZEN(shared));
+            RUBY_ASSERT(ofs >= 0);
+            RUBY_ASSERT(rest >= 0);
+            RUBY_ASSERT(ofs + rest <= RSTRING_LEN(shared));
+            RUBY_ASSERT(OBJ_FROZEN(shared));
 
             if ((ofs > 0) || (rest > 0) ||
                 (klass != RBASIC(shared)->klass) ||
                 ENCODING_GET(shared) != ENCODING_GET(orig)) {
                 str = str_new_shared(klass, shared);
-                assert(!STR_EMBED_P(str));
+                RUBY_ASSERT(!STR_EMBED_P(str));
                 RSTRING(str)->as.heap.ptr += ofs;
                 STR_SET_LEN(str, RSTRING_LEN(str) - (ofs + rest));
             }
@@ -1456,6 +1649,7 @@ str_new_frozen_buffer(VALUE klass, VALUE orig, int copy_encoding)
             STR_SET_EMBED(str);
             memcpy(RSTRING_PTR(str), RSTRING_PTR(orig), RSTRING_LEN(orig));
             STR_SET_LEN(str, RSTRING_LEN(orig));
+            ENC_CODERANGE_SET(str, ENC_CODERANGE(orig));
             TERM_FILL(RSTRING_END(str), TERM_LEN(orig));
         }
         else {
@@ -1471,7 +1665,7 @@ str_new_frozen_buffer(VALUE klass, VALUE orig, int copy_encoding)
 VALUE
 rb_str_new_with_class(VALUE obj, const char *ptr, long len)
 {
-    return str_new0(rb_obj_class(obj), ptr, len, TERM_LEN(obj));
+    return str_enc_new(rb_obj_class(obj), ptr, len, STR_ENC_GET(obj));
 }
 
 static VALUE
@@ -1521,17 +1715,6 @@ rb_str_tmp_new(long len)
 void
 rb_str_free(VALUE str)
 {
-    if (FL_TEST(str, RSTRING_FSTR)) {
-        st_data_t fstr = (st_data_t)str;
-
-        RB_VM_LOCK_ENTER();
-        {
-            st_delete(rb_vm_fstring_table(), &fstr, NULL);
-            RB_DEBUG_COUNTER_INC(obj_str_fstr);
-        }
-        RB_VM_LOCK_LEAVE();
-    }
-
     if (STR_EMBED_P(str)) {
         RB_DEBUG_COUNTER_INC(obj_str_embed);
     }
@@ -1545,7 +1728,7 @@ rb_str_free(VALUE str)
     }
 }
 
-RUBY_FUNC_EXPORTED size_t
+size_t
 rb_str_memsize(VALUE str)
 {
     if (FL_TEST(str, STR_NOEMBED|STR_SHARED|STR_NOFREE) == STR_NOEMBED) {
@@ -1594,9 +1777,9 @@ str_shared_replace(VALUE str, VALUE str2)
     }
     else {
         if (STR_EMBED_P(str2)) {
-            assert(!FL_TEST(str2, STR_SHARED));
+            RUBY_ASSERT(!FL_TEST(str2, STR_SHARED));
             long len = RSTRING_LEN(str2);
-            assert(len + termlen <= str_embed_capa(str2));
+            RUBY_ASSERT(len + termlen <= str_embed_capa(str2));
 
             char *new_ptr = ALLOC_N(char, len + termlen);
             memcpy(new_ptr, RSTRING(str2)->as.embed.ary, len + termlen);
@@ -1655,7 +1838,7 @@ str_replace(VALUE str, VALUE str2)
     len = RSTRING_LEN(str2);
     if (STR_SHARED_P(str2)) {
         VALUE shared = RSTRING(str2)->as.heap.aux.shared;
-        assert(OBJ_FROZEN(shared));
+        RUBY_ASSERT(OBJ_FROZEN(shared));
         STR_SET_NOEMBED(str);
         STR_SET_LEN(str, len);
         RSTRING(str)->as.heap.ptr = RSTRING_PTR(str2);
@@ -1673,8 +1856,8 @@ static inline VALUE
 ec_str_alloc_embed(struct rb_execution_context_struct *ec, VALUE klass, size_t capa)
 {
     size_t size = rb_str_embed_size(capa);
-    assert(size > 0);
-    assert(rb_gc_size_allocatable_p(size));
+    RUBY_ASSERT(size > 0);
+    RUBY_ASSERT(rb_gc_size_allocatable_p(size));
 
     NEWOBJ_OF(str, struct RString, klass,
             T_STRING | (RGENGC_WB_PROTECTED_STRING ? FL_WB_PROTECTED : 0), size, ec);
@@ -1692,41 +1875,9 @@ ec_str_alloc_heap(struct rb_execution_context_struct *ec, VALUE klass)
 }
 
 static inline VALUE
-str_duplicate_setup(VALUE klass, VALUE str, VALUE dup)
+str_duplicate_setup_encoding(VALUE str, VALUE dup, VALUE flags)
 {
-    const VALUE flag_mask =
-        ENC_CODERANGE_MASK | ENCODING_MASK |
-        FL_FREEZE
-        ;
-    VALUE flags = FL_TEST_RAW(str, flag_mask);
     int encidx = 0;
-    if (STR_EMBED_P(str)) {
-        long len = RSTRING_LEN(str);
-
-        assert(STR_EMBED_P(dup));
-        assert(str_embed_capa(dup) >= len + 1);
-        MEMCPY(RSTRING(dup)->as.embed.ary, RSTRING(str)->as.embed.ary, char, len + 1);
-    }
-    else {
-        VALUE root = str;
-        if (FL_TEST_RAW(str, STR_SHARED)) {
-            root = RSTRING(str)->as.heap.aux.shared;
-        }
-        else if (UNLIKELY(!(flags & FL_FREEZE))) {
-            root = str = str_new_frozen(klass, str);
-            flags = FL_TEST_RAW(str, flag_mask);
-        }
-        assert(!STR_SHARED_P(root));
-        assert(RB_OBJ_FROZEN_RAW(root));
-
-        RSTRING(dup)->as.heap.ptr = RSTRING_PTR(str);
-        FL_SET(root, STR_SHARED_ROOT);
-        RB_OBJ_WRITE(dup, &RSTRING(dup)->as.heap.aux.shared, root);
-        flags |= RSTRING_NOEMBED | STR_SHARED;
-    }
-
-    STR_SET_LEN(dup, RSTRING_LEN(str));
-
     if ((flags & ENCODING_MASK) == (ENCODING_INLINE_MAX<<ENCODING_SHIFT)) {
         encidx = rb_enc_get_index(str);
         flags &= ~ENCODING_MASK;
@@ -1736,18 +1887,54 @@ str_duplicate_setup(VALUE klass, VALUE str, VALUE dup)
     return dup;
 }
 
+static const VALUE flag_mask = ENC_CODERANGE_MASK | ENCODING_MASK | FL_FREEZE;
+
 static inline VALUE
-ec_str_duplicate(struct rb_execution_context_struct *ec, VALUE klass, VALUE str)
+str_duplicate_setup_embed(VALUE klass, VALUE str, VALUE dup)
+{
+    VALUE flags = FL_TEST_RAW(str, flag_mask);
+    long len = RSTRING_LEN(str);
+
+    RUBY_ASSERT(STR_EMBED_P(dup));
+    RUBY_ASSERT(str_embed_capa(dup) >= len + 1);
+    MEMCPY(RSTRING(dup)->as.embed.ary, RSTRING(str)->as.embed.ary, char, len + 1);
+    STR_SET_LEN(dup, RSTRING_LEN(str));
+    return str_duplicate_setup_encoding(str, dup, flags);
+}
+
+static inline VALUE
+str_duplicate_setup_heap(VALUE klass, VALUE str, VALUE dup)
+{
+    VALUE flags = FL_TEST_RAW(str, flag_mask);
+    VALUE root = str;
+    if (FL_TEST_RAW(str, STR_SHARED)) {
+        root = RSTRING(str)->as.heap.aux.shared;
+    }
+    else if (UNLIKELY(!OBJ_FROZEN_RAW(str))) {
+        root = str = str_new_frozen(klass, str);
+        flags = FL_TEST_RAW(str, flag_mask);
+    }
+    RUBY_ASSERT(!STR_SHARED_P(root));
+    RUBY_ASSERT(RB_OBJ_FROZEN_RAW(root));
+
+    RSTRING(dup)->as.heap.ptr = RSTRING_PTR(str);
+    FL_SET(root, STR_SHARED_ROOT);
+    RB_OBJ_WRITE(dup, &RSTRING(dup)->as.heap.aux.shared, root);
+    flags |= RSTRING_NOEMBED | STR_SHARED;
+
+    STR_SET_LEN(dup, RSTRING_LEN(str));
+    return str_duplicate_setup_encoding(str, dup, flags);
+}
+
+static inline VALUE
+str_duplicate_setup(VALUE klass, VALUE str, VALUE dup)
 {
-    VALUE dup;
     if (STR_EMBED_P(str)) {
-        dup = ec_str_alloc_embed(ec, klass, RSTRING_LEN(str) + TERM_LEN(str));
+        return str_duplicate_setup_embed(klass, str, dup);
     }
     else {
-        dup = ec_str_alloc_heap(ec, klass);
+        return str_duplicate_setup_heap(klass, str, dup);
     }
-
-    return str_duplicate_setup(klass, str, dup);
 }
 
 static inline VALUE
@@ -1770,6 +1957,18 @@ rb_str_dup(VALUE str)
     return str_duplicate(rb_obj_class(str), str);
 }
 
+/* :nodoc: */
+VALUE
+rb_str_dup_m(VALUE str)
+{
+    if (LIKELY(BARE_STRING_P(str))) {
+        return str_duplicate(rb_cString, str);
+    }
+    else {
+        return rb_obj_dup(str);
+    }
+}
+
 VALUE
 rb_str_resurrect(VALUE str)
 {
@@ -1778,16 +1977,44 @@ rb_str_resurrect(VALUE str)
 }
 
 VALUE
-rb_ec_str_resurrect(struct rb_execution_context_struct *ec, VALUE str)
+rb_ec_str_resurrect(struct rb_execution_context_struct *ec, VALUE str, bool chilled)
 {
     RUBY_DTRACE_CREATE_HOOK(STRING, RSTRING_LEN(str));
-    return ec_str_duplicate(ec, rb_cString, str);
+    VALUE new_str, klass = rb_cString;
+
+    if (!(chilled && RTEST(rb_ivar_defined(str, id_debug_created_info))) && STR_EMBED_P(str)) {
+        new_str = ec_str_alloc_embed(ec, klass, RSTRING_LEN(str) + TERM_LEN(str));
+        str_duplicate_setup_embed(klass, str, new_str);
+    }
+    else {
+        new_str = ec_str_alloc_heap(ec, klass);
+        str_duplicate_setup_heap(klass, str, new_str);
+    }
+    if (chilled) {
+        FL_SET_RAW(new_str, STR_CHILLED_LITERAL);
+    }
+    return new_str;
+}
+
+VALUE
+rb_str_with_debug_created_info(VALUE str, VALUE path, int line)
+{
+    VALUE debug_info = rb_ary_new_from_args(2, path, INT2FIX(line));
+    if (OBJ_FROZEN_RAW(str)) str = rb_str_dup(str);
+    rb_ivar_set(str, id_debug_created_info, rb_ary_freeze(debug_info));
+    FL_SET_RAW(str, STR_CHILLED_LITERAL);
+    return rb_str_freeze(str);
 }
 
+/*
+ * The documentation block below uses an include (instead of inline text)
+ * because the included text has non-ASCII characters (which are not allowed in a C file).
+ */
+
 /*
  *
  *  call-seq:
- *    String.new(string = '', **opts) -> new_string
+ *    String.new(string = ''.encode(Encoding::ASCII_8BIT) , **options) -> new_string
  *
  *  :include: doc/string/new.rdoc
  *
@@ -1832,17 +2059,13 @@ rb_str_init(int argc, VALUE *argv, VALUE str)
                 if (orig == str) n = 0;
             }
             str_modifiable(str);
-            if (STR_EMBED_P(str)) { /* make noembed always */
-                char *new_ptr = ALLOC_N(char, (size_t)capa + termlen);
-                assert(RSTRING_LEN(str) + 1 <= str_embed_capa(str));
-                memcpy(new_ptr, RSTRING(str)->as.embed.ary, RSTRING_LEN(str) + 1);
-                RSTRING(str)->as.heap.ptr = new_ptr;
-            }
-            else if (FL_TEST(str, STR_SHARED|STR_NOFREE)) {
+            if (STR_EMBED_P(str) || FL_TEST(str, STR_SHARED|STR_NOFREE)) {
+                /* make noembed always */
                 const size_t size = (size_t)capa + termlen;
                 const char *const old_ptr = RSTRING_PTR(str);
                 const size_t osize = RSTRING_LEN(str) + TERM_LEN(str);
-                char *new_ptr = ALLOC_N(char, (size_t)capa + termlen);
+                char *new_ptr = ALLOC_N(char, size);
+                if (STR_EMBED_P(str)) RUBY_ASSERT((long)osize <= str_embed_capa(str));
                 memcpy(new_ptr, old_ptr, osize < size ? osize : size);
                 FL_UNSET_RAW(str, STR_SHARED|STR_NOFREE);
                 RSTRING(str)->as.heap.ptr = new_ptr;
@@ -1874,6 +2097,86 @@ rb_str_init(int argc, VALUE *argv, VALUE str)
     return str;
 }
 
+/* :nodoc: */
+static VALUE
+rb_str_s_new(int argc, VALUE *argv, VALUE klass)
+{
+    if (klass != rb_cString) {
+        return rb_class_new_instance_pass_kw(argc, argv, klass);
+    }
+
+    static ID keyword_ids[2];
+    VALUE orig, opt, encoding = Qnil, capacity = Qnil;
+    VALUE kwargs[2];
+    rb_encoding *enc = NULL;
+
+    int n = rb_scan_args(argc, argv, "01:", &orig, &opt);
+    if (NIL_P(opt)) {
+        return rb_class_new_instance_pass_kw(argc, argv, klass);
+    }
+
+    keyword_ids[0] = rb_id_encoding();
+    CONST_ID(keyword_ids[1], "capacity");
+    rb_get_kwargs(opt, keyword_ids, 0, 2, kwargs);
+    encoding = kwargs[0];
+    capacity = kwargs[1];
+
+    if (n == 1) {
+        orig = StringValue(orig);
+    }
+    else {
+        orig = Qnil;
+    }
+
+    if (UNDEF_P(encoding)) {
+        if (!NIL_P(orig)) {
+            encoding = rb_obj_encoding(orig);
+        }
+    }
+
+    if (!UNDEF_P(encoding)) {
+        enc = rb_to_encoding(encoding);
+    }
+
+    // If capacity is nil, we're basically just duping `orig`.
+    if (UNDEF_P(capacity)) {
+        if (NIL_P(orig)) {
+            VALUE empty_str = str_new(klass, "", 0);
+            if (enc) {
+                rb_enc_associate(empty_str, enc);
+            }
+            return empty_str;
+        }
+        VALUE copy = str_duplicate(klass, orig);
+        rb_enc_associate(copy, enc);
+        ENC_CODERANGE_CLEAR(copy);
+        return copy;
+    }
+
+    long capa = 0;
+    capa = NUM2LONG(capacity);
+    if (capa < 0) {
+        capa = 0;
+    }
+
+    if (!NIL_P(orig)) {
+        long orig_capa = rb_str_capacity(orig);
+        if (orig_capa > capa) {
+            capa = orig_capa;
+        }
+    }
+
+    VALUE str = str_enc_new(klass, NULL, capa, enc);
+    STR_SET_LEN(str, 0);
+    TERM_FILL(RSTRING_PTR(str), enc ? rb_enc_mbmaxlen(enc) : 1);
+
+    if (!NIL_P(orig)) {
+        rb_str_buf_append(str, orig);
+    }
+
+    return str;
+}
+
 #ifdef NONASCII_MASK
 #define is_utf8_lead_byte(c) (((c)&0xC0) != 0x80)
 
@@ -2129,12 +2432,13 @@ rb_str_empty(VALUE str)
 
 /*
  *  call-seq:
- *    string + other_string -> new_string
+ *    self + other_string -> new_string
  *
- *  Returns a new \String containing +other_string+ concatenated to +self+:
+ *  Returns a new string containing +other_string+ concatenated to +self+:
  *
- *    "Hello from " + self.to_s # => "Hello from main"
+ *    'Hello from ' + self.to_s # => "Hello from main"
  *
+ *  Related: see {Converting to New String}[rdoc-ref:String@Converting+to+New+String].
  */
 
 VALUE
@@ -2154,7 +2458,7 @@ rb_str_plus(VALUE str1, VALUE str2)
     if (len1 > LONG_MAX - len2) {
         rb_raise(rb_eArgError, "string size too big");
     }
-    str3 = str_new0(rb_cString, 0, len1+len2, termlen);
+    str3 = str_enc_new(rb_cString, 0, len1+len2, enc);
     ptr3 = RSTRING_PTR(str3);
     memcpy(ptr3, ptr1, len1);
     memcpy(ptr3+len1, ptr2, len2);
@@ -2171,8 +2475,8 @@ rb_str_plus(VALUE str1, VALUE str2)
 VALUE
 rb_str_opt_plus(VALUE str1, VALUE str2)
 {
-    assert(RBASIC_CLASS(str1) == rb_cString);
-    assert(RBASIC_CLASS(str2) == rb_cString);
+    RUBY_ASSERT(RBASIC_CLASS(str1) == rb_cString);
+    RUBY_ASSERT(RBASIC_CLASS(str2) == rb_cString);
     long len1, len2;
     MAYBE_UNUSED(char) *ptr1, *ptr2;
     RSTRING_GETMEM(str1, ptr1, len1);
@@ -2200,13 +2504,14 @@ rb_str_opt_plus(VALUE str1, VALUE str2)
 
 /*
  *  call-seq:
- *    string * integer -> new_string
+ *    self * n -> new_string
  *
- *  Returns a new \String containing +integer+ copies of +self+:
+ *  Returns a new string containing +n+ copies of +self+:
  *
- *    "Ho! " * 3 # => "Ho! Ho! Ho! "
- *    "Ho! " * 0 # => ""
+ *    'Ho!' * 3 # => "Ho!Ho!Ho!"
+ *    'No!' * 0 # => ""
  *
+ *  Related: see {Converting to New String}[rdoc-ref:String@Converting+to+New+String].
  */
 
 VALUE
@@ -2249,7 +2554,7 @@ rb_str_times(VALUE str, VALUE times)
 
     len *= RSTRING_LEN(str);
     termlen = TERM_LEN(str);
-    str2 = str_new0(rb_cString, 0, len, termlen);
+    str2 = str_enc_new(rb_cString, 0, len, STR_ENC_GET(str));
     ptr2 = RSTRING_PTR(str2);
     if (len) {
         n = RSTRING_LEN(str);
@@ -2269,20 +2574,22 @@ rb_str_times(VALUE str, VALUE times)
 
 /*
  *  call-seq:
- *    string % object -> new_string
+ *    self % object -> new_string
  *
- *  Returns the result of formatting +object+ into the format specification +self+
- *  (see Kernel#sprintf for formatting details):
+ *  Returns the result of formatting +object+ into the format specifications
+ *  contained in +self+
+ *  (see {Format Specifications}[rdoc-ref:format_specifications.rdoc]):
  *
- *    "%05d" % 123 # => "00123"
+ *    '%05d' % 123 # => "00123"
  *
- *  If +self+ contains multiple substitutions, +object+ must be
- *  an Array or Hash containing the values to be substituted:
+ *  If +self+ contains multiple format specifications,
+ *  +object+ must be an array or hash containing the objects to be formatted:
  *
- *    "%-5s: %016x" % [ "ID", self.object_id ] # => "ID   : 00002b054ec93168"
- *    "foo = %{foo}" % {foo: 'bar'} # => "foo = bar"
- *    "foo = %{foo}, baz = %{baz}" % {foo: 'bar', baz: 'bat'} # => "foo = bar, baz = bat"
+ *    '%-5s: %016x' % [ 'ID', self.object_id ]                # => "ID   : 00002b054ec93168"
+ *    'foo = %{foo}' % {foo: 'bar'}                           # => "foo = bar"
+ *    'foo = %{foo}, baz = %{baz}' % {foo: 'bar', baz: 'bat'} # => "foo = bar, baz = bat"
  *
+ *  Related: see {Converting to New String}[rdoc-ref:String@Converting+to+New+String].
  */
 
 static VALUE
@@ -2304,34 +2611,54 @@ rb_check_lockedtmp(VALUE str)
     }
 }
 
+// If none of these flags are set, we know we have an modifiable string.
+// If any is set, we need to do more detailed checks.
+#define STR_UNMODIFIABLE_MASK (FL_FREEZE | STR_TMPLOCK | STR_CHILLED)
 static inline void
 str_modifiable(VALUE str)
 {
-    rb_check_lockedtmp(str);
-    rb_check_frozen(str);
+    RUBY_ASSERT(ruby_thread_has_gvl_p());
+
+    if (RB_UNLIKELY(FL_ANY_RAW(str, STR_UNMODIFIABLE_MASK))) {
+        if (CHILLED_STRING_P(str)) {
+            CHILLED_STRING_MUTATED(str);
+        }
+        rb_check_lockedtmp(str);
+        rb_check_frozen(str);
+    }
 }
 
 static inline int
 str_dependent_p(VALUE str)
 {
     if (STR_EMBED_P(str) || !FL_TEST(str, STR_SHARED|STR_NOFREE)) {
-        return 0;
+        return FALSE;
     }
     else {
-        return 1;
+        return TRUE;
     }
 }
 
+// If none of these flags are set, we know we have an independent string.
+// If any is set, we need to do more detailed checks.
+#define STR_DEPENDANT_MASK (STR_UNMODIFIABLE_MASK | STR_SHARED | STR_NOFREE)
 static inline int
 str_independent(VALUE str)
 {
-    str_modifiable(str);
-    return !str_dependent_p(str);
+    RUBY_ASSERT(ruby_thread_has_gvl_p());
+
+    if (RB_UNLIKELY(FL_ANY_RAW(str, STR_DEPENDANT_MASK))) {
+        str_modifiable(str);
+        return !str_dependent_p(str);
+    }
+    return TRUE;
 }
 
 static void
 str_make_independent_expand(VALUE str, long len, long expand, const int termlen)
 {
+    RUBY_ASSERT(ruby_thread_has_gvl_p());
+
     char *ptr;
     char *oldptr;
     long capa = len + expand;
@@ -2374,6 +2701,8 @@ rb_str_modify(VALUE str)
 void
 rb_str_modify_expand(VALUE str, long expand)
 {
+    RUBY_ASSERT(ruby_thread_has_gvl_p());
+
     int termlen = TERM_LEN(str);
     long len = RSTRING_LEN(str);
 
@@ -2418,10 +2747,17 @@ str_discard(VALUE str)
 void
 rb_must_asciicompat(VALUE str)
 {
-    rb_encoding *enc = rb_enc_get(str);
-    if (!enc) {
+    int encindex = rb_enc_get_index(str);
+
+    if (RB_UNLIKELY(encindex == -1)) {
         rb_raise(rb_eTypeError, "not encoding capable object");
     }
+
+    if (RB_LIKELY(str_encindex_fastpath(encindex))) {
+        return;
+    }
+
+    rb_encoding *enc = rb_enc_from_index(encindex);
     if (!rb_enc_asciicompat(enc)) {
         rb_raise(rb_eEncCompatError, "ASCII incompatible encoding: %s", rb_enc_name(enc));
     }
@@ -2430,6 +2766,8 @@ rb_must_asciicompat(VALUE str)
 VALUE
 rb_string_value(volatile VALUE *ptr)
 {
+    RUBY_ASSERT(ruby_thread_has_gvl_p());
+
     VALUE s = *ptr;
     if (!RB_TYPE_P(s, T_STRING)) {
         s = rb_str_to_str(s);
@@ -2488,7 +2826,7 @@ rb_str_change_terminator_length(VALUE str, const int oldtermlen, const int terml
     long capa = str_capacity(str, oldtermlen) + oldtermlen;
     long len = RSTRING_LEN(str);
 
-    assert(capa >= len);
+    RUBY_ASSERT(capa >= len);
     if (capa - len < termlen) {
         rb_check_lockedtmp(str);
         str_make_independent_expand(str, len, 0L, termlen);
@@ -2500,7 +2838,7 @@ rb_str_change_terminator_length(VALUE str, const int oldtermlen, const int terml
     else {
         if (!STR_EMBED_P(str)) {
             /* modify capa instead of realloc */
-            assert(!FL_TEST((str), STR_SHARED));
+            RUBY_ASSERT(!FL_TEST((str), STR_SHARED));
             RSTRING(str)->as.heap.aux.capa = capa - termlen;
         }
         if (termlen > oldtermlen) {
@@ -2577,14 +2915,16 @@ rb_check_string_type(VALUE str)
  *  call-seq:
  *    String.try_convert(object) -> object, new_string, or nil
  *
- *  If +object+ is a \String object, returns +object+.
+ *  Attempts to convert the given +object+ to a string.
+ *
+ *  If +object+ is already a string, returns +object+, unmodified.
  *
  *  Otherwise if +object+ responds to <tt>:to_str</tt>,
  *  calls <tt>object.to_str</tt> and returns the result.
  *
  *  Returns +nil+ if +object+ does not respond to <tt>:to_str</tt>.
  *
- *  Raises an exception unless <tt>object.to_str</tt> returns a \String object.
+ *  Raises an exception unless <tt>object.to_str</tt> returns a string.
  */
 static VALUE
 rb_str_s_try_convert(VALUE dummy, VALUE str)
@@ -2733,9 +3073,9 @@ str_subseq(VALUE str, long beg, long len)
 {
     VALUE str2;
 
-    assert(beg >= 0);
-    assert(len >= 0);
-    assert(beg+len <= RSTRING_LEN(str));
+    RUBY_ASSERT(beg >= 0);
+    RUBY_ASSERT(len >= 0);
+    RUBY_ASSERT(beg+len <= RSTRING_LEN(str));
 
     const int termlen = TERM_LEN(str);
     if (!SHARABLE_SUBSTRING_P(beg, len, RSTRING_LEN(str))) {
@@ -2756,7 +3096,7 @@ str_subseq(VALUE str, long beg, long len)
     }
     else {
         str_replace_shared(str2, str);
-        assert(!STR_EMBED_P(str2));
+        RUBY_ASSERT(!STR_EMBED_P(str2));
         ENC_CODERANGE_CLEAR(str2);
         RSTRING(str2)->as.heap.ptr += beg;
         if (RSTRING_LEN(str2) > len) {
@@ -2780,11 +3120,12 @@ rb_str_subpos(VALUE str, long beg, long *lenp)
 {
     long len = *lenp;
     long slen = -1L;
-    long blen = RSTRING_LEN(str);
+    const long blen = RSTRING_LEN(str);
     rb_encoding *enc = STR_ENC_GET(str);
     char *p, *s = RSTRING_PTR(str), *e = s + blen;
 
     if (len < 0) return 0;
+    if (beg < 0 && -beg < 0) return 0;
     if (!blen) {
         len = 0;
     }
@@ -2802,7 +3143,8 @@ rb_str_subpos(VALUE str, long beg, long *lenp)
     }
     if (beg < 0) {
         if (len > -beg) len = -beg;
-        if (-beg * rb_enc_mbmaxlen(enc) < RSTRING_LEN(str) / 8) {
+        if ((ENC_CODERANGE(str) == ENC_CODERANGE_VALID) &&
+            (-beg * rb_enc_mbmaxlen(enc) < blen / 8)) {
             beg = -beg;
             while (beg-- > len && (e = rb_enc_prev_char(s, e, e, enc)) != 0);
             p = e;
@@ -2820,7 +3162,7 @@ rb_str_subpos(VALUE str, long beg, long *lenp)
             if (len == 0) goto end;
         }
     }
-    else if (beg > 0 && beg > RSTRING_LEN(str)) {
+    else if (beg > 0 && beg > blen) {
         return 0;
     }
     if (len == 0) {
@@ -2868,6 +3210,12 @@ rb_str_substr(VALUE str, long beg, long len)
     return str_substr(str, beg, len, TRUE);
 }
 
+VALUE
+rb_str_substr_two_fixnums(VALUE str, VALUE beg, VALUE len, int empty)
+{
+    return str_substr(str, NUM2LONG(beg), NUM2LONG(len), empty);
+}
+
 static VALUE
 str_substr(VALUE str, long beg, long len, int empty)
 {
@@ -2887,24 +3235,30 @@ str_substr(VALUE str, long beg, long len, int empty)
 VALUE
 rb_str_freeze(VALUE str)
 {
+    if (CHILLED_STRING_P(str)) {
+        FL_UNSET_RAW(str, STR_CHILLED);
+    }
+
     if (OBJ_FROZEN(str)) return str;
     rb_str_resize(str, RSTRING_LEN(str));
     return rb_obj_freeze(str);
 }
 
-
 /*
  * call-seq:
  *   +string -> new_string or self
  *
- * Returns +self+ if +self+ is not frozen.
+ * Returns +self+ if +self+ is not frozen and can be mutated
+ * without warning issuance.
  *
  * Otherwise returns <tt>self.dup</tt>, which is not frozen.
+ *
+ * Related: see {Freezing/Unfreezing}[rdoc-ref:String@Freezing-2FUnfreezing].
  */
 static VALUE
 str_uplus(VALUE str)
 {
-    if (OBJ_FROZEN(str)) {
+    if (OBJ_FROZEN(str) || CHILLED_STRING_P(str)) {
         return rb_str_dup(str);
     }
     else {
@@ -2914,24 +3268,37 @@ str_uplus(VALUE str)
 
 /*
  * call-seq:
- *   -string -> frozen_string
- *   dedup -> frozen_string
+ *   -self -> frozen_string
+ *
+ * Returns a frozen string equal to +self+.
+ *
+ * The returned string is +self+ if and only if all of the following are true:
  *
- * Returns a frozen, possibly pre-existing copy of the string.
+ * - +self+ is already frozen.
+ * - +self+ is an instance of \String (rather than of a subclass of \String)
+ * - +self+ has no instance variables set on it.
  *
- * The returned \String will be deduplicated as long as it does not have
- * any instance variables set on it and is not a String subclass.
+ * Otherwise, the returned string is a frozen copy of +self+.
  *
- * Note that <tt>-string</tt> variant is more convenient for defining
- * constants:
+ * Returning +self+, when possible, saves duplicating +self+;
+ * see {Data deduplication}[https://en.wikipedia.org/wiki/Data_deduplication].
  *
- *    FILENAME = -'config/database.yml'
+ * It may also save duplicating other, already-existing, strings:
  *
- * while +dedup+ is better suitable for using the method in chains
- * of calculations:
+ *   s0 = 'foo'
+ *   s1 = 'foo'
+ *   s0.object_id == s1.object_id       # => false
+ *   (-s0).object_id == (-s1).object_id # => true
  *
- *    @url_list.concat(urls.map(&:dedup))
+ * Note that method #-@ is convenient for defining a constant:
  *
+ *    FileName = -'config/database.yml'
+ *
+ * While its alias #dedup is better suited for chaining:
+ *
+ *   'foo'.dedup.gsub!('o')
+ *
+ * Related: see {Freezing/Unfreezing}[rdoc-ref:String@Freezing-2FUnfreezing].
  */
 static VALUE
 str_uminus(VALUE str)
@@ -2948,6 +3315,7 @@ RUBY_ALIAS_FUNCTION(rb_str_dup_frozen(VALUE str), rb_str_new_frozen, (str))
 VALUE
 rb_str_locktmp(VALUE str)
 {
+    rb_check_frozen(str);
     if (FL_TEST(str, STR_TMPLOCK)) {
         rb_raise(rb_eRuntimeError, "temporal locking already locked string");
     }
@@ -2958,6 +3326,7 @@ rb_str_locktmp(VALUE str)
 VALUE
 rb_str_unlocktmp(VALUE str)
 {
+    rb_check_frozen(str);
     if (!FL_TEST(str, STR_TMPLOCK)) {
         rb_raise(rb_eRuntimeError, "temporal unlocking already unlocked string");
     }
@@ -2965,7 +3334,7 @@ rb_str_unlocktmp(VALUE str)
     return str;
 }
 
-RUBY_FUNC_EXPORTED VALUE
+VALUE
 rb_str_locktmp_ensure(VALUE str, VALUE (*func)(VALUE), VALUE arg)
 {
     rb_str_locktmp(str);
@@ -2975,6 +3344,8 @@ rb_str_locktmp_ensure(VALUE str, VALUE (*func)(VALUE), VALUE arg)
 void
 rb_str_set_len(VALUE str, long len)
 {
+    RUBY_ASSERT(ruby_thread_has_gvl_p());
+
     long capa;
     const int termlen = TERM_LEN(str);
 
@@ -2985,6 +3356,37 @@ rb_str_set_len(VALUE str, long len)
     if (len > (capa = (long)str_capacity(str, termlen)) || len < 0) {
         rb_bug("probable buffer overflow: %ld for %ld", len, capa);
     }
+
+    int cr = ENC_CODERANGE(str);
+    if (len == 0) {
+        /* Empty string does not contain non-ASCII */
+        ENC_CODERANGE_SET(str, ENC_CODERANGE_7BIT);
+    }
+    else if (cr == ENC_CODERANGE_UNKNOWN) {
+        /* Leave unknown. */
+    }
+    else if (len > RSTRING_LEN(str)) {
+        if (ENC_CODERANGE_CLEAN_P(cr)) {
+            /* Update the coderange regarding the extended part. */
+            const char *const prev_end = RSTRING_END(str);
+            const char *const new_end = RSTRING_PTR(str) + len;
+            rb_encoding *enc = rb_enc_get(str);
+            rb_str_coderange_scan_restartable(prev_end, new_end, enc, &cr);
+            ENC_CODERANGE_SET(str, cr);
+        }
+        else if (cr == ENC_CODERANGE_BROKEN) {
+            /* May be valid now, by appended part. */
+            ENC_CODERANGE_SET(str, ENC_CODERANGE_UNKNOWN);
+        }
+    }
+    else if (len < RSTRING_LEN(str)) {
+        if (cr != ENC_CODERANGE_7BIT) {
+            /* ASCII-only string is keeping after truncated.  Valid
+             * and broken may be invalid or valid, leave unknown. */
+            ENC_CODERANGE_SET(str, ENC_CODERANGE_UNKNOWN);
+        }
+    }
+
     STR_SET_LEN(str, len);
     TERM_FILL(&RSTRING_PTR(str)[len], termlen);
 }
@@ -2998,14 +3400,14 @@ rb_str_resize(VALUE str, long len)
 
     int independent = str_independent(str);
     long slen = RSTRING_LEN(str);
+    const int termlen = TERM_LEN(str);
 
-    if (slen > len && ENC_CODERANGE(str) != ENC_CODERANGE_7BIT) {
+    if (slen > len || (termlen != 1 && slen < len)) {
         ENC_CODERANGE_CLEAR(str);
     }
 
     {
         long capa;
-        const int termlen = TERM_LEN(str);
         if (STR_EMBED_P(str)) {
             if (len == slen) return str;
             if (str_embed_capa(str) >= len + termlen) {
@@ -3042,6 +3444,32 @@ rb_str_resize(VALUE str, long len)
     return str;
 }
 
+static void
+str_ensure_available_capa(VALUE str, long len)
+{
+    str_modify_keep_cr(str);
+
+    const int termlen = TERM_LEN(str);
+    long olen = RSTRING_LEN(str);
+
+    if (RB_UNLIKELY(olen > LONG_MAX - len)) {
+        rb_raise(rb_eArgError, "string sizes too big");
+    }
+
+    long total = olen + len;
+    long capa = str_capacity(str, termlen);
+
+    if (capa < total) {
+        if (total >= LONG_MAX / 2) {
+            capa = total;
+        }
+        while (total > capa) {
+            capa = 2 * capa + termlen; /* == 2*(capa+termlen)-termlen */
+        }
+        RESIZE_CAPA_TERM(str, capa, termlen);
+    }
+}
+
 static VALUE
 str_buf_cat4(VALUE str, const char *ptr, long len, bool keep_cr)
 {
@@ -3108,6 +3536,62 @@ rb_str_cat_cstr(VALUE str, const char *ptr)
     return rb_str_buf_cat(str, ptr, strlen(ptr));
 }
 
+static void
+rb_str_buf_cat_byte(VALUE str, unsigned char byte)
+{
+    RUBY_ASSERT(RB_ENCODING_GET_INLINED(str) == ENCINDEX_ASCII_8BIT || RB_ENCODING_GET_INLINED(str) == ENCINDEX_US_ASCII);
+
+    // We can't write directly to shared strings without impacting others, so we must make the string independent.
+    if (UNLIKELY(!str_independent(str))) {
+        str_make_independent(str);
+    }
+
+    long string_length = -1;
+    const int null_terminator_length = 1;
+    char *sptr;
+    RSTRING_GETMEM(str, sptr, string_length);
+
+    // Ensure the resulting string wouldn't be too long.
+    if (UNLIKELY(string_length > LONG_MAX - 1)) {
+        rb_raise(rb_eArgError, "string sizes too big");
+    }
+
+    long string_capacity = str_capacity(str, null_terminator_length);
+
+    // Get the code range before any modifications since those might clear the code range.
+    int cr = ENC_CODERANGE(str);
+
+    // Check if the string has spare string_capacity to write the new byte.
+    if (LIKELY(string_capacity >= string_length + 1)) {
+        // In fast path we can write the new byte and note the string's new length.
+        sptr[string_length] = byte;
+        STR_SET_LEN(str, string_length + 1);
+        TERM_FILL(sptr + string_length + 1, null_terminator_length);
+    }
+    else {
+        // If there's not enough string_capacity, make a call into the general string concatenation function.
+        str_buf_cat(str, (char *)&byte, 1);
+    }
+
+    // If the code range is already known, we can derive the resulting code range cheaply by looking at the byte we
+    // just appended. If the code range is unknown, but the string was empty, then we can also derive the code range
+    // by looking at the byte we just appended. Otherwise, we'd have to scan the bytes to determine the code range so
+    // we leave it as unknown. It cannot be broken for binary strings so we don't need to handle that option.
+    if (cr == ENC_CODERANGE_7BIT || string_length == 0) {
+        if (ISASCII(byte)) {
+            ENC_CODERANGE_SET(str, ENC_CODERANGE_7BIT);
+        }
+        else {
+            ENC_CODERANGE_SET(str, ENC_CODERANGE_VALID);
+
+            // Promote a US-ASCII string to ASCII-8BIT when a non-ASCII byte is appended.
+            if (UNLIKELY(RB_ENCODING_GET_INLINED(str) == ENCINDEX_US_ASCII)) {
+                rb_enc_associate_index(str, ENCINDEX_ASCII_8BIT);
+            }
+        }
+    }
+}
+
 RUBY_ALIAS_FUNCTION(rb_str_buf_cat(VALUE str, const char *ptr, long len), rb_str_cat, (str, ptr, len))
 RUBY_ALIAS_FUNCTION(rb_str_buf_cat2(VALUE str, const char *ptr), rb_str_cat_cstr, (str, ptr))
 RUBY_ALIAS_FUNCTION(rb_str_cat2(VALUE str, const char *ptr), rb_str_cat_cstr, (str, ptr))
@@ -3198,7 +3682,7 @@ rb_enc_cr_str_buf_cat(VALUE str, const char *ptr, long len,
 
   incompatible:
     rb_raise(rb_eEncCompatError, "incompatible character encodings: %s and %s",
-             rb_enc_name(str_enc), rb_enc_name(ptr_enc));
+             rb_enc_inspect_name(str_enc), rb_enc_inspect_name(ptr_enc));
     UNREACHABLE_RETURN(Qundef);
 }
 
@@ -3305,19 +3789,7 @@ rb_str_concat_literals(size_t num, const VALUE *strary)
  *  call-seq:
  *     concat(*objects) -> string
  *
- *  Concatenates each object in +objects+ to +self+ and returns +self+:
- *
- *    s = 'foo'
- *    s.concat('bar', 'baz') # => "foobarbaz"
- *    s                      # => "foobarbaz"
- *
- *  For each given object +object+ that is an Integer,
- *  the value is considered a codepoint and converted to a character before concatenation:
- *
- *    s = 'foo'
- *    s.concat(32, 'bar', 32, 'baz') # => "foo bar baz"
- *
- *  Related: String#<<, which takes a single argument.
+ *  :include: doc/string/concat.rdoc
  */
 static VALUE
 rb_str_concat_multi(int argc, VALUE *argv, VALUE str)
@@ -3342,21 +3814,179 @@ rb_str_concat_multi(int argc, VALUE *argv, VALUE str)
 
 /*
  *  call-seq:
- *    string << object -> string
+ *    append_as_bytes(*objects) -> self
+ *
+ *  Concatenates each object in +objects+ into +self+; returns +self+;
+ *  performs no encoding validation or conversion:
+ *
+ *    s = 'foo'
+ *    s.append_as_bytes(" \xE2\x82") # => "foo \xE2\x82"
+ *    s.valid_encoding?              # => false
+ *    s.append_as_bytes("\xAC 12")
+ *    s.valid_encoding?              # => true
+ *
+ *  When a given object is an integer,
+ *  the value is considered an 8-bit byte;
+ *  if the integer occupies more than one byte (i.e,. is greater than 255),
+ *  appends only the low-order byte (similar to String#setbyte):
+ *
+ *    s = ""
+ *    s.append_as_bytes(0, 257) # => "\u0000\u0001"
+ *    s.bytesize                # => 2
+ *
+ *  Related: see {Modifying}[rdoc-ref:String@Modifying].
+ */
+
+VALUE
+rb_str_append_as_bytes(int argc, VALUE *argv, VALUE str)
+{
+    long needed_capacity = 0;
+    volatile VALUE t0;
+    enum ruby_value_type *types = ALLOCV_N(enum ruby_value_type, t0, argc);
+
+    for (int index = 0; index < argc; index++) {
+        VALUE obj = argv[index];
+        enum ruby_value_type type = types[index] = rb_type(obj);
+        switch (type) {
+          case T_FIXNUM:
+          case T_BIGNUM:
+            needed_capacity++;
+            break;
+          case T_STRING:
+            needed_capacity += RSTRING_LEN(obj);
+            break;
+          default:
+            rb_raise(
+                rb_eTypeError,
+                "wrong argument type %"PRIsVALUE" (expected String or Integer)",
+                rb_obj_class(obj)
+            );
+            break;
+        }
+    }
+
+    str_ensure_available_capa(str, needed_capacity);
+    char *sptr = RSTRING_END(str);
+
+    for (int index = 0; index < argc; index++) {
+        VALUE obj = argv[index];
+        enum ruby_value_type type = types[index];
+        switch (type) {
+          case T_FIXNUM:
+          case T_BIGNUM: {
+            argv[index] = obj = rb_int_and(obj, INT2FIX(0xff));
+            char byte = (char)(NUM2INT(obj) & 0xFF);
+            *sptr = byte;
+            sptr++;
+            break;
+          }
+          case T_STRING: {
+            const char *ptr;
+            long len;
+            RSTRING_GETMEM(obj, ptr, len);
+            memcpy(sptr, ptr, len);
+            sptr += len;
+            break;
+          }
+          default:
+            rb_bug("append_as_bytes arguments should have been validated");
+        }
+    }
+
+    STR_SET_LEN(str, RSTRING_LEN(str) + needed_capacity);
+    TERM_FILL(sptr, TERM_LEN(str)); /* sentinel */
+
+    int cr = ENC_CODERANGE(str);
+    switch (cr) {
+      case ENC_CODERANGE_7BIT: {
+        for (int index = 0; index < argc; index++) {
+            VALUE obj = argv[index];
+            enum ruby_value_type type = types[index];
+            switch (type) {
+              case T_FIXNUM:
+              case T_BIGNUM: {
+                if (!ISASCII(NUM2INT(obj))) {
+                    goto clear_cr;
+                }
+                break;
+              }
+              case T_STRING: {
+                if (ENC_CODERANGE(obj) != ENC_CODERANGE_7BIT) {
+                    goto clear_cr;
+                }
+                break;
+              }
+              default:
+                rb_bug("append_as_bytes arguments should have been validated");
+            }
+        }
+        break;
+      }
+      case ENC_CODERANGE_VALID:
+        if (ENCODING_GET_INLINED(str) == ENCINDEX_ASCII_8BIT) {
+            goto keep_cr;
+        }
+        else {
+            goto clear_cr;
+        }
+        break;
+      default:
+        goto clear_cr;
+        break;
+    }
+
+    RB_GC_GUARD(t0);
+
+  clear_cr:
+    // If no fast path was hit, we clear the coderange.
+    // append_as_bytes is predominently meant to be used in
+    // buffering situation, hence it's likely the coderange
+    // will never be scanned, so it's not worth spending time
+    // precomputing the coderange except for simple and common
+    // situations.
+    ENC_CODERANGE_CLEAR(str);
+  keep_cr:
+    return str;
+}
+
+/*
+ *  call-seq:
+ *    self << object -> self
+ *
+ *  Appends a string representation of +object+ to +self+;
+ *  returns +self+.
  *
- *  Concatenates +object+ to +self+ and returns +self+:
+ *  If +object+ is a string, appends it to +self+:
  *
  *    s = 'foo'
  *    s << 'bar' # => "foobar"
  *    s          # => "foobar"
  *
- *  If +object+ is an Integer,
- *  the value is considered a codepoint and converted to a character before concatenation:
+ *  If +object+ is an integer,
+ *  its value is considered a codepoint;
+ *  converts the value to a character before concatenating:
  *
  *    s = 'foo'
  *    s << 33 # => "foo!"
  *
- *  Related: String#concat, which takes multiple arguments.
+ *  Additionally, if the codepoint is in range <tt>0..0xff</tt>
+ *  and the encoding of +self+ is Encoding::US_ASCII,
+ *  changes the encoding to Encoding::ASCII_8BIT:
+ *
+ *    s = 'foo'.encode(Encoding::US_ASCII)
+ *    s.encoding # => #<Encoding:US-ASCII>
+ *    s << 0xff  # => "foo\xFF"
+ *    s.encoding # => #<Encoding:BINARY (ASCII-8BIT)>
+ *
+ *  Raises RangeError if that codepoint is not representable in the encoding of +self+:
+ *
+ *    s = 'foo'
+ *    s.encoding              # => <Encoding:UTF-8>
+ *    s << 0x00110000         # 1114112 out of char range (RangeError)
+ *    s = 'foo'.encode(Encoding::EUC_JP)
+ *    s << 0x00800080         # invalid codepoint 0x800080 in EUC-JP (RangeError)
+ *
+ *  Related: see {Modifying}[rdoc-ref:String@Modifying].
  */
 VALUE
 rb_str_concat(VALUE str1, VALUE str2)
@@ -3380,14 +4010,9 @@ rb_str_concat(VALUE str1, VALUE str2)
     }
 
     encidx = rb_ascii8bit_appendable_encoding_index(enc, code);
+
     if (encidx >= 0) {
-        char buf[1];
-        buf[0] = (char)code;
-        rb_str_cat(str1, buf, 1);
-        if (encidx != rb_enc_to_index(enc)) {
-            rb_enc_associate_index(str1, encidx);
-            ENC_CODERANGE_SET(str1, ENC_CODERANGE_VALID);
-        }
+        rb_str_buf_cat_byte(str1, (unsigned char)code);
     }
     else {
         long pos = RSTRING_LEN(str1);
@@ -3411,8 +4036,12 @@ rb_str_concat(VALUE str1, VALUE str2)
         }
         rb_str_resize(str1, pos+len);
         memcpy(RSTRING_PTR(str1) + pos, buf, len);
-        if (cr == ENC_CODERANGE_7BIT && code > 127)
+        if (cr == ENC_CODERANGE_7BIT && code > 127) {
             cr = ENC_CODERANGE_VALID;
+        }
+        else if (cr == ENC_CODERANGE_BROKEN) {
+            cr = ENC_CODERANGE_UNKNOWN;
+        }
         ENC_CODERANGE_SET(str1, cr);
     }
     return str1;
@@ -3475,11 +4104,15 @@ rb_str_prepend_multi(int argc, VALUE *argv, VALUE str)
 st_index_t
 rb_str_hash(VALUE str)
 {
-    int e = ENCODING_GET(str);
-    if (e && is_ascii_string(str)) {
-        e = 0;
+    if (FL_TEST_RAW(str, STR_PRECOMPUTED_HASH)) {
+        st_index_t precomputed_hash;
+        memcpy(&precomputed_hash, RSTRING_END(str) + TERM_LEN(str), sizeof(precomputed_hash));
+
+        RUBY_ASSERT(precomputed_hash == str_do_hash(str));
+        return precomputed_hash;
     }
-    return rb_memhash((const void *)RSTRING_PTR(str), RSTRING_LEN(str)) ^ e;
+
+    return str_do_hash(str);
 }
 
 int
@@ -3566,22 +4199,29 @@ rb_str_cmp(VALUE str1, VALUE str2)
 
 /*
  *  call-seq:
- *    string == object -> true or false
- *    string === object -> true or false
+ *    self == object -> true or false
  *
- *  Returns +true+ if +object+ has the same length and content;
- *  as +self+; +false+ otherwise:
+ *  Returns whether +object+ is equal to +self+.
+ *
+ *  When +object+ is a string, returns whether +object+ has the same length and content as +self+:
  *
  *    s = 'foo'
- *    s == 'foo' # => true
+ *    s == 'foo'  # => true
  *    s == 'food' # => false
- *    s == 'FOO' # => false
+ *    s == 'FOO'  # => false
  *
  *  Returns +false+ if the two strings' encodings are not compatible:
- *    "\u{e4 f6 fc}".encode("ISO-8859-1") == ("\u{c4 d6 dc}") # => false
  *
- *  If +object+ is not an instance of \String but responds to +to_str+, then the
- *  two strings are compared using <code>object.==</code>.
+ *    "\u{e4 f6 fc}".encode(Encoding::ISO_8859_1) == ("\u{c4 d6 dc}") # => false
+ *
+ *  When +object+ is not a string:
+ *
+ *  - If +object+ responds to method <tt>to_str</tt>,
+ *    <tt>object == self</tt> is called and its return value is returned.
+ *  - If +object+ does not respond to <tt>to_str</tt>,
+ *    +false+ is returned.
+ *
+ *  Related: {Comparing}[rdoc-ref:String@Comparing].
  */
 
 VALUE
@@ -3611,7 +4251,7 @@ rb_str_equal(VALUE str1, VALUE str2)
  *
  *  Returns +false+ if the two strings' encodings are not compatible:
  *
- *    "\u{e4 f6 fc}".encode("ISO-8859-1").eql?("\u{c4 d6 dc}") # => false
+ *    "\u{e4 f6 fc}".encode(Encoding::ISO_8859_1).eql?("\u{c4 d6 dc}") # => false
  *
  */
 
@@ -3625,7 +4265,7 @@ rb_str_eql(VALUE str1, VALUE str2)
 
 /*
  *  call-seq:
- *    string <=> other_string -> -1, 0, 1, or nil
+ *    self <=> other_string -> -1, 0, 1, or nil
  *
  *  Compares +self+ and +other_string+, returning:
  *
@@ -3636,13 +4276,14 @@ rb_str_eql(VALUE str1, VALUE str2)
  *
  *  Examples:
  *
- *    'foo' <=> 'foo' # => 0
+ *    'foo' <=> 'foo'  # => 0
  *    'foo' <=> 'food' # => -1
  *    'food' <=> 'foo' # => 1
- *    'FOO' <=> 'foo' # => -1
- *    'foo' <=> 'FOO' # => 1
- *    'foo' <=> 1 # => nil
+ *    'FOO' <=> 'foo'  # => -1
+ *    'foo' <=> 'FOO'  # => 1
+ *    'foo' <=> 1      # => nil
  *
+ *  Related: see {Comparing}[rdoc-ref:String@Comparing].
  */
 
 static VALUE
@@ -3664,26 +4305,26 @@ static VALUE str_casecmp_p(VALUE str1, VALUE str2);
  *  call-seq:
  *    casecmp(other_string) -> -1, 0, 1, or nil
  *
- *  Compares <tt>self.downcase</tt> and <tt>other_string.downcase</tt>; returns:
+ *  Ignoring case, compares +self+ and +other_string+; returns:
  *
- *  - -1 if <tt>other_string.downcase</tt> is larger.
+ *  - -1 if <tt>self.downcase</tt> is smaller than <tt>other_string.downcase</tt>.
  *  - 0 if the two are equal.
- *  - 1 if <tt>other_string.downcase</tt> is smaller.
+ *  - 1 if <tt>self.downcase</tt> is larger than <tt>other_string.downcase</tt>.
  *  - +nil+ if the two are incomparable.
  *
+ *  See {Case Mapping}[rdoc-ref:case_mapping.rdoc].
+ *
  *  Examples:
  *
- *    'foo'.casecmp('foo') # => 0
+ *    'foo'.casecmp('goo')  # => -1
+ *    'goo'.casecmp('foo')  # => 1
  *    'foo'.casecmp('food') # => -1
- *    'food'.casecmp('foo') # => 1
- *    'FOO'.casecmp('foo') # => 0
- *    'foo'.casecmp('FOO') # => 0
- *    'foo'.casecmp(1) # => nil
- *
- *  See {Case Mapping}[rdoc-ref:case_mapping.rdoc].
- *
- *  Related: String#casecmp?.
+ *    'food'.casecmp('foo') # => 1
+ *    'FOO'.casecmp('foo')  # => 0
+ *    'foo'.casecmp('FOO')  # => 0
+ *    'foo'.casecmp(1)      # => nil
  *
+ *  Related: see {Comparing}[rdoc-ref:String@Comparing].
  */
 
 static VALUE
@@ -3758,22 +4399,21 @@ str_casecmp(VALUE str1, VALUE str2)
  *    casecmp?(other_string) -> true, false, or nil
  *
  *  Returns +true+ if +self+ and +other_string+ are equal after
- *  Unicode case folding, otherwise +false+:
- *
- *    'foo'.casecmp?('foo') # => true
- *    'foo'.casecmp?('food') # => false
- *    'food'.casecmp?('foo') # => false
- *    'FOO'.casecmp?('foo') # => true
- *    'foo'.casecmp?('FOO') # => true
- *
- *  Returns +nil+ if the two values are incomparable:
- *
- *    'foo'.casecmp?(1) # => nil
+ *  Unicode case folding, +false+ if unequal, +nil+ if incomparable.
  *
  *  See {Case Mapping}[rdoc-ref:case_mapping.rdoc].
  *
- *  Related: String#casecmp.
+ *  Examples:
+ *
+ *    'foo'.casecmp?('goo')  # => false
+ *    'goo'.casecmp?('foo')  # => false
+ *    'foo'.casecmp?('food') # => false
+ *    'food'.casecmp?('foo') # => false
+ *    'FOO'.casecmp?('foo')  # => true
+ *    'foo'.casecmp?('FOO')  # => true
+ *    'foo'.casecmp?(1)      # => nil
  *
+ *  Related: see {Comparing}[rdoc-ref:String@Comparing].
  */
 
 static VALUE
@@ -3927,54 +4567,82 @@ rb_str_index_m(int argc, VALUE *argv, VALUE str)
 static void
 str_ensure_byte_pos(VALUE str, long pos)
 {
-    const char *s = RSTRING_PTR(str);
-    const char *e = RSTRING_END(str);
-    const char *p = s + pos;
-    if (!at_char_boundary(s, p, e, rb_enc_get(str))) {
-        rb_raise(rb_eIndexError,
-                 "offset %ld does not land on character boundary", pos);
+    if (!single_byte_optimizable(str)) {
+        const char *s = RSTRING_PTR(str);
+        const char *e = RSTRING_END(str);
+        const char *p = s + pos;
+        if (!at_char_boundary(s, p, e, rb_enc_get(str))) {
+            rb_raise(rb_eIndexError,
+                     "offset %ld does not land on character boundary", pos);
+        }
     }
 }
 
 /*
  *  call-seq:
- *    byteindex(substring, offset = 0) -> integer or nil
- *    byteindex(regexp, offset = 0) -> integer or nil
+ *    byteindex(object, offset = 0) -> integer or nil
  *
- *  Returns the Integer byte-based index of the first occurrence of the given +substring+,
- *  or +nil+ if none found:
+ *  Returns the 0-based integer index of a substring of +self+
+ *  specified by +object+ (a string or Regexp) and +offset+,
+ *  or +nil+ if there is no such substring;
+ *  the returned index is the count of _bytes_ (not characters).
  *
- *    'foo'.byteindex('f') # => 0
- *    'foo'.byteindex('o') # => 1
- *    'foo'.byteindex('oo') # => 1
- *    'foo'.byteindex('ooo') # => nil
+ *  When +object+ is a string,
+ *  returns the index of the first found substring equal to +object+:
  *
- *  Returns the Integer byte-based index of the first match for the given Regexp +regexp+,
- *  or +nil+ if none found:
+ *    s = 'foo'          # => "foo"
+ *    s.size             # => 3 # Three 1-byte characters.
+ *    s.bytesize         # => 3 # Three bytes.
+ *    s.byteindex('f')   # => 0
+ *    s.byteindex('o')   # => 1
+ *    s.byteindex('oo')  # => 1
+ *    s.byteindex('ooo') # => nil
+ *
+ *  When +object+ is a Regexp,
+ *  returns the index of the first found substring matching +object+;
+ *  updates {Regexp-related global variables}[rdoc-ref:Regexp@Global+Variables]:
+ *
+ *    s = 'foo'
+ *    s.byteindex(/f/)   # => 0
+ *    $~                 # => #<MatchData "f">
+ *    s.byteindex(/o/)   # => 1
+ *    s.byteindex(/oo/)  # => 1
+ *    s.byteindex(/ooo/) # => nil
+ *    $~                 # => nil
+ *
+ *  \Integer argument +offset+, if given, specifies the 0-based index
+ *  of the byte where searching is to begin.
  *
- *    'foo'.byteindex(/f/) # => 0
- *    'foo'.byteindex(/o/) # => 1
- *    'foo'.byteindex(/oo/) # => 1
- *    'foo'.byteindex(/ooo/) # => nil
+ *  When +offset+ is non-negative,
+ *  searching begins at byte position +offset+:
  *
- *  Integer argument +offset+, if given, specifies the byte-based position in the
- *  string to begin the search:
+ *    s = 'foo'
+ *    s.byteindex('o', 1) # => 1
+ *    s.byteindex('o', 2) # => 2
+ *    s.byteindex('o', 3) # => nil
  *
- *    'foo'.byteindex('o', 1) # => 1
- *    'foo'.byteindex('o', 2) # => 2
- *    'foo'.byteindex('o', 3) # => nil
+ *  When +offset+ is negative, counts backward from the end of +self+:
  *
- *  If +offset+ is negative, counts backward from the end of +self+:
+ *    s = 'foo'
+ *    s.byteindex('o', -1) # => 2
+ *    s.byteindex('o', -2) # => 1
+ *    s.byteindex('o', -3) # => 1
+ *    s.byteindex('o', -4) # => nil
  *
- *    'foo'.byteindex('o', -1) # => 2
- *    'foo'.byteindex('o', -2) # => 1
- *    'foo'.byteindex('o', -3) # => 1
- *    'foo'.byteindex('o', -4) # => nil
+ *  Raises IndexError if the byte at +offset+ is not the first byte of a character:
  *
- *  If +offset+ does not land on character (codepoint) boundary, +IndexError+ is
- *  raised.
+ *    s = "\uFFFF\uFFFF"       # => "\uFFFF\uFFFF"
+ *    s.size                   # => 2 # Two 3-byte characters.
+ *    s.bytesize               # => 6 # Six bytes.
+ *    s.byteindex("\uFFFF")    # => 0
+ *    s.byteindex("\uFFFF", 1) # Raises IndexError
+ *    s.byteindex("\uFFFF", 2) # Raises IndexError
+ *    s.byteindex("\uFFFF", 3) # => 3
+ *    s.byteindex("\uFFFF", 4) # Raises IndexError
+ *    s.byteindex("\uFFFF", 5) # Raises IndexError
+ *    s.byteindex("\uFFFF", 6) # => nil
  *
- *  Related: String#index, String#byterindex.
+ *  Related: see {Querying}[rdoc-ref:String@Querying].
  */
 
 static VALUE
@@ -4016,7 +4684,19 @@ rb_str_byteindex_m(int argc, VALUE *argv, VALUE str)
     return Qnil;
 }
 
-#ifdef HAVE_MEMRCHR
+#ifndef HAVE_MEMRCHR
+static void*
+memrchr(const char *search_str, int chr, long search_len)
+{
+    const char *ptr = search_str + search_len;
+    while (ptr > search_str) {
+        if ((unsigned char)*(--ptr) == chr) return (void *)ptr;
+    }
+
+    return ((void *)0);
+}
+#endif
+
 static long
 str_rindex(VALUE str, VALUE sub, const char *s, rb_encoding *enc)
 {
@@ -4033,6 +4713,10 @@ str_rindex(VALUE str, VALUE sub, const char *s, rb_encoding *enc)
     c = *t & 0xff;
     searchlen = s - sbeg + 1;
 
+    if (memcmp(s, t, slen) == 0) {
+        return s - sbeg;
+    }
+
     do {
         hit = memrchr(sbeg, c, searchlen);
         if (!hit) break;
@@ -4048,29 +4732,6 @@ str_rindex(VALUE str, VALUE sub, const char *s, rb_encoding *enc)
 
     return -1;
 }
-#else
-static long
-str_rindex(VALUE str, VALUE sub, const char *s, rb_encoding *enc)
-{
-    long slen;
-    char *sbeg, *e, *t;
-
-    sbeg = RSTRING_PTR(str);
-    e = RSTRING_END(str);
-    t = RSTRING_PTR(sub);
-    slen = RSTRING_LEN(sub);
-
-    while (s) {
-        if (memcmp(s, t, slen) == 0) {
-            return s - sbeg;
-        }
-        if (s <= sbeg) break;
-        s = rb_enc_prev_char(sbeg, s, e, enc);
-    }
-
-    return -1;
-}
-#endif
 
 /* found index in byte */
 static long
@@ -4144,7 +4805,7 @@ rb_str_rindex(VALUE str, VALUE sub, long pos)
  *    $~ #=> #<MatchData "oo">
  *
  *  Integer argument +offset+, if given and non-negative, specifies the maximum starting position in the
- *   string to _end_ the search:
+ *  string to _end_ the search:
  *
  *    'foo'.rindex('o', 0) # => nil
  *    'foo'.rindex('o', 1) # => 1
@@ -4237,65 +4898,90 @@ rb_str_byterindex(VALUE str, VALUE sub, long pos)
     return str_rindex(str, sub, s, enc);
 }
 
-
 /*
  *  call-seq:
- *    byterindex(substring, offset = self.bytesize) -> integer or nil
- *    byterindex(regexp, offset = self.bytesize) -> integer or nil
+ *    byterindex(object, offset = self.bytesize) -> integer or nil
  *
- *  Returns the Integer byte-based index of the _last_ occurrence of the given +substring+,
- *  or +nil+ if none found:
+ *  Returns the 0-based integer index of a substring of +self+
+ *  that is the _last_ match for the given +object+ (a string or Regexp) and +offset+,
+ *  or +nil+ if there is no such substring;
+ *  the returned index is the count of _bytes_ (not characters).
  *
- *    'foo'.byterindex('f') # => 0
- *    'foo'.byterindex('o') # => 2
- *    'foo'.byterindex('oo') # => 1
- *    'foo'.byterindex('ooo') # => nil
+ *  When +object+ is a string,
+ *  returns the index of the _last_ found substring equal to +object+:
  *
- *  Returns the Integer byte-based index of the _last_ match for the given Regexp +regexp+,
- *  or +nil+ if none found:
+ *    s = 'foo'           # => "foo"
+ *    s.size              # => 3 # Three 1-byte characters.
+ *    s.bytesize          # => 3 # Three bytes.
+ *    s.byterindex('f')   # => 0
+      s.byterindex('o')   # => 2
+      s.byterindex('oo')  # => 1
+      s.byterindex('ooo') # => nil
  *
- *    'foo'.byterindex(/f/) # => 0
- *    'foo'.byterindex(/o/) # => 2
- *    'foo'.byterindex(/oo/) # => 1
- *    'foo'.byterindex(/ooo/) # => nil
+ *  When +object+ is a Regexp,
+ *  returns the index of the last found substring matching +object+;
+ *  updates {Regexp-related global variables}[rdoc-ref:Regexp@Global+Variables]:
  *
- *  The _last_ match means starting at the possible last position, not
- *  the last of longest matches.
+ *    s = 'foo'
+ *    s.byterindex(/f/)   # => 0
+ *    $~                  # => #<MatchData "f">
+ *    s.byterindex(/o/)   # => 2
+ *    s.byterindex(/oo/)  # => 1
+ *    s.byterindex(/ooo/) # => nil
+ *    $~                  # => nil
  *
- *    'foo'.byterindex(/o+/) # => 2
- *    $~ #=> #<MatchData "o">
+ *  The last match means starting at the possible last position,
+ *  not the last of the longest matches:
  *
- *  To get the last longest match, needs to combine with negative
- *  lookbehind.
+ *    s = 'foo'
+ *    s.byterindex(/o+/) # => 2
+ *    $~                 #=> #<MatchData "o">
  *
- *    'foo'.byterindex(/(?<!o)o+/) # => 1
- *    $~ #=> #<MatchData "oo">
+ *  To get the last longest match, use a negative lookbehind:
+ *
+ *    s = 'foo'
+ *    s.byterindex(/(?<!o)o+/) # => 1
+ *    $~                       # => #<MatchData "oo">
  *
- *  Or String#byteindex with negative lookforward.
+ *  Or use method #byteindex with negative lookahead:
  *
- *    'foo'.byteindex(/o+(?!.*o)/) # => 1
- *    $~ #=> #<MatchData "oo">
+ *    s = 'foo'
+ *    s.byteindex(/o+(?!.*o)/) # => 1
+ *    $~                       #=> #<MatchData "oo">
  *
- *  Integer argument +offset+, if given and non-negative, specifies the maximum starting byte-based position in the
- *   string to _end_ the search:
+ *  \Integer argument +offset+, if given, specifies the 0-based index
+ *  of the byte where searching is to end.
  *
- *    'foo'.byterindex('o', 0) # => nil
- *    'foo'.byterindex('o', 1) # => 1
- *    'foo'.byterindex('o', 2) # => 2
- *    'foo'.byterindex('o', 3) # => 2
+ *  When +offset+ is non-negative,
+ *  searching ends at byte position +offset+:
  *
- *  If +offset+ is a negative Integer, the maximum starting position in the
- *  string to _end_ the search is the sum of the string's length and +offset+:
+ *    s = 'foo'
+ *    s.byterindex('o', 0) # => nil
+ *    s.byterindex('o', 1) # => 1
+ *    s.byterindex('o', 2) # => 2
+ *    s.byterindex('o', 3) # => 2
  *
- *    'foo'.byterindex('o', -1) # => 2
- *    'foo'.byterindex('o', -2) # => 1
- *    'foo'.byterindex('o', -3) # => nil
- *    'foo'.byterindex('o', -4) # => nil
+ *  When +offset+ is negative, counts backward from the end of +self+:
  *
- *  If +offset+ does not land on character (codepoint) boundary, +IndexError+ is
- *  raised.
+ *    s = 'foo'
+ *    s.byterindex('o', -1) # => 2
+ *    s.byterindex('o', -2) # => 1
+ *    s.byterindex('o', -3) # => nil
+ *
+ *  Raises IndexError if the byte at +offset+ is not the first byte of a character:
  *
- *  Related: String#byteindex.
+ *    s = "\uFFFF\uFFFF"        # => "\uFFFF\uFFFF"
+ *    s.size                    # => 2 # Two 3-byte characters.
+ *    s.bytesize                # => 6 # Six bytes.
+ *    s.byterindex("\uFFFF")    # => 3
+ *    s.byterindex("\uFFFF", 1) # Raises IndexError
+ *    s.byterindex("\uFFFF", 2) # Raises IndexError
+ *    s.byterindex("\uFFFF", 3) # => 3
+ *    s.byterindex("\uFFFF", 4) # Raises IndexError
+ *    s.byterindex("\uFFFF", 5) # Raises IndexError
+ *    s.byterindex("\uFFFF", 6) # => nil
+ *
+ *  Related: see {Querying}[rdoc-ref:String@Querying].
  */
 
 static VALUE
@@ -4339,30 +5025,33 @@ rb_str_byterindex_m(int argc, VALUE *argv, VALUE str)
 
 /*
  *  call-seq:
- *    string =~ regexp -> integer or nil
- *    string =~ object -> integer or nil
+ *    self =~ object -> integer or nil
  *
- *  Returns the Integer index of the first substring that matches
- *  the given +regexp+, or +nil+ if no match found:
+ *  When +object+ is a Regexp, returns the index of the first substring in +self+
+ *  matched by +object+,
+ *  or +nil+ if no match is found;
+ *  updates {Regexp-related global variables}[rdoc-ref:Regexp@Global+Variables]:
  *
  *    'foo' =~ /f/ # => 0
+ *    $~           # => #<MatchData "f">
  *    'foo' =~ /o/ # => 1
+ *    $~           # => #<MatchData "o">
  *    'foo' =~ /x/ # => nil
- *
- *  Note: also updates Regexp@Global+Variables.
- *
- *  If the given +object+ is not a Regexp, returns the value
- *  returned by <tt>object =~ self</tt>.
+ *    $~           # => nil
  *
  *  Note that <tt>string =~ regexp</tt> is different from <tt>regexp =~ string</tt>
  *  (see Regexp#=~):
  *
- *    number= nil
- *    "no. 9" =~ /(?<number>\d+)/
- *    number # => nil (not assigned)
- *    /(?<number>\d+)/ =~ "no. 9"
- *    number #=> "9"
+ *    number = nil
+ *    'no. 9' =~ /(?<number>\d+)/ # => 4
+ *    number                      # => nil # Not assigned.
+ *    /(?<number>\d+)/ =~ 'no. 9' # => 4
+ *    number                      # => "9" # Assigned.
+ *
+ *  If +object+ is not a Regexp, returns the value
+ *  returned by <tt>object =~ self</tt>.
  *
+ *  Related: see {Querying}[rdoc-ref:String@Querying].
  */
 
 static VALUE
@@ -4397,7 +5086,7 @@ static VALUE get_pat(VALUE);
  *      regexp = Regexp.new(pattern)
  *  - Computes +matchdata+, which will be either a MatchData object or +nil+
  *    (see Regexp#match):
- *      matchdata = <tt>regexp.match(self)
+ *      matchdata = regexp.match(self)
  *
  *  With no block given, returns the computed +matchdata+:
  *
@@ -4704,7 +5393,7 @@ static VALUE str_succ(VALUE str);
  *    s = '99zz99zz'
  *    s.succ # => "100aa00aa"
  *
- *  The successor to an empty \String is a new empty \String:
+ *  The successor to an empty +String+ is a new empty +String+:
  *
  *    ''.succ # => ""
  *
@@ -4844,7 +5533,7 @@ str_upto_i(VALUE str, VALUE arg)
  *    upto(other_string, exclusive = false) {|string| ... } -> self
  *    upto(other_string, exclusive = false) -> new_enumerator
  *
- *  With a block given, calls the block with each \String value
+ *  With a block given, calls the block with each +String+ value
  *  returned by successive calls to String#succ;
  *  the first value is +self+, the next is <tt>self.succ</tt>, and so on;
  *  the sequence terminates when value +other_string+ is reached;
@@ -4903,7 +5592,9 @@ rb_str_upto_each(VALUE beg, VALUE end, int excl, int (*each)(VALUE, VALUE), VALU
 
         if (c > e || (excl && c == e)) return beg;
         for (;;) {
-            if ((*each)(rb_enc_str_new(&c, 1, enc), arg)) break;
+            VALUE str = rb_enc_str_new(&c, 1, enc);
+            ENC_CODERANGE_SET(str, RUBY_ENC_CODERANGE_7BIT);
+            if ((*each)(str, arg)) break;
             if (!excl && c == e) break;
             c++;
             if (excl && c == e) break;
@@ -5109,16 +5800,16 @@ rb_str_aref(VALUE str, VALUE indx)
 
 /*
  *  call-seq:
- *    string[index] -> new_string or nil
- *    string[start, length] -> new_string or nil
- *    string[range] -> new_string or nil
- *    string[regexp, capture = 0] -> new_string or nil
- *    string[substring] -> new_string or nil
+ *    self[index] -> new_string or nil
+ *    self[start, length] -> new_string or nil
+ *    self[range] -> new_string or nil
+ *    self[regexp, capture = 0] -> new_string or nil
+ *    self[substring] -> new_string or nil
  *
  *  Returns the substring of +self+ specified by the arguments.
  *  See examples at {String Slices}[rdoc-ref:String@String+Slices].
  *
- *
+ *  Related: see {Converting to New String}[rdoc-ref:String@Converting+to+New+String].
  */
 
 static VALUE
@@ -5129,9 +5820,7 @@ rb_str_aref_m(int argc, VALUE *argv, VALUE str)
             return rb_str_subpat(str, argv[0], argv[1]);
         }
         else {
-            long beg = NUM2LONG(argv[0]);
-            long len = NUM2LONG(argv[1]);
-            return rb_str_substr(str, beg, len);
+            return rb_str_substr_two_fixnums(str, argv[0], argv[1], TRUE);
         }
     }
     rb_check_arity(argc, 1, 2);
@@ -5241,8 +5930,9 @@ rb_str_update(VALUE str, long beg, long len, VALUE val)
     if (beg < 0) {
         beg += slen;
     }
-    assert(beg >= 0);
-    assert(beg <= slen);
+    RUBY_ASSERT(beg >= 0);
+    RUBY_ASSERT(beg <= slen);
+
     if (len > slen - beg) {
         len = slen - beg;
     }
@@ -5333,11 +6023,11 @@ rb_str_aset(VALUE str, VALUE indx, VALUE val)
 
 /*
  *  call-seq:
- *    string[index] = new_string
- *    string[start, length] = new_string
- *    string[range] = new_string
- *    string[regexp, capture = 0] = new_string
- *    string[substring] = new_string
+ *    self[index] = new_string
+ *    self[start, length] = new_string
+ *    self[range] = new_string
+ *    self[regexp, capture = 0] = new_string
+ *    self[substring] = new_string
  *
  *  Replaces all, some, or none of the contents of +self+; returns +new_string+.
  *  See {String Slices}[rdoc-ref:String@String+Slices].
@@ -5356,6 +6046,7 @@ rb_str_aset(VALUE str, VALUE indx, VALUE val)
  *    s['lly'] = 'ncial' # => "ncial"
  *    s                  # => "financial"
  *
+ *  Related: see {Modifying}[rdoc-ref:String@Modifying].
  */
 
 static VALUE
@@ -5566,14 +6257,17 @@ get_pat_quoted(VALUE pat, int check)
 }
 
 static long
-rb_pat_search(VALUE pat, VALUE str, long pos, int set_backref_str)
+rb_pat_search0(VALUE pat, VALUE str, long pos, int set_backref_str, VALUE *match)
 {
     if (BUILTIN_TYPE(pat) == T_STRING) {
         pos = rb_str_byteindex(str, pat, pos);
         if (set_backref_str) {
             if (pos >= 0) {
                 str = rb_str_new_frozen_String(str);
-                rb_backref_set_string(str, pos, RSTRING_LEN(pat));
+                VALUE match_data = rb_backref_set_string(str, pos, RSTRING_LEN(pat));
+                if (match) {
+                    *match = match_data;
+                }
             }
             else {
                 rb_backref_set(Qnil);
@@ -5582,18 +6276,24 @@ rb_pat_search(VALUE pat, VALUE str, long pos, int set_backref_str)
         return pos;
     }
     else {
-        return rb_reg_search0(pat, str, pos, 0, set_backref_str);
+        return rb_reg_search0(pat, str, pos, 0, set_backref_str, match);
     }
 }
 
+static long
+rb_pat_search(VALUE pat, VALUE str, long pos, int set_backref_str)
+{
+    return rb_pat_search0(pat, str, pos, set_backref_str, NULL);
+}
+
 
 /*
  *  call-seq:
  *    sub!(pattern, replacement)   -> self or nil
  *    sub!(pattern) {|match| ... } -> self or nil
  *
- *  Returns +self+ with only the first occurrence
- *  (not all occurrences) of the given +pattern+ replaced.
+ *  Replaces the first occurrence (not all occurrences) of the given +pattern+
+ *  on +self+; returns +self+ if a replacement occurred, +nil+ otherwise.
  *
  *  See {Substitution Methods}[rdoc-ref:String@Substitution+Methods].
  *
@@ -5672,8 +6372,8 @@ rb_str_sub_bang(int argc, VALUE *argv, VALUE str)
             if (coderange_scan(p, beg0, str_enc) != ENC_CODERANGE_7BIT ||
                 coderange_scan(p+end0, len-end0, str_enc) != ENC_CODERANGE_7BIT) {
                 rb_raise(rb_eEncCompatError, "incompatible character encodings: %s and %s",
-                         rb_enc_name(str_enc),
-                         rb_enc_name(STR_ENC_GET(repl)));
+                         rb_enc_inspect_name(str_enc),
+                         rb_enc_inspect_name(STR_ENC_GET(repl)));
             }
             enc = STR_ENC_GET(repl);
         }
@@ -5704,6 +6404,8 @@ rb_str_sub_bang(int argc, VALUE *argv, VALUE str)
         TERM_FILL(&RSTRING_PTR(str)[len], TERM_LEN(str));
         ENC_CODERANGE_SET(str, cr);
 
+        RB_GC_GUARD(match);
+
         return str;
     }
     return Qnil;
@@ -5735,13 +6437,12 @@ rb_str_sub(int argc, VALUE *argv, VALUE str)
 static VALUE
 str_gsub(int argc, VALUE *argv, VALUE str, int bang)
 {
-    VALUE pat, val = Qnil, repl, match, match0 = Qnil, dest, hash = Qnil;
-    struct re_registers *regs;
+    VALUE pat, val = Qnil, repl, match0 = Qnil, dest, hash = Qnil, match = Qnil;
     long beg, beg0, end0;
     long offset, blen, slen, len, last;
-    enum {STR, ITER, MAP} mode = STR;
+    enum {STR, ITER, FAST_MAP, MAP} mode = STR;
     char *sp, *cp;
-    int need_backref = -1;
+    int need_backref_str = -1;
     rb_encoding *str_enc;
 
     switch (argc) {
@@ -5755,6 +6456,9 @@ str_gsub(int argc, VALUE *argv, VALUE str, int bang)
         if (NIL_P(hash)) {
             StringValue(repl);
         }
+        else if (rb_hash_default_unredefined(hash) && !FL_TEST_RAW(hash, RHASH_PROC_DEFAULT)) {
+            mode = FAST_MAP;
+        }
         else {
             mode = MAP;
         }
@@ -5764,7 +6468,8 @@ str_gsub(int argc, VALUE *argv, VALUE str, int bang)
     }
 
     pat = get_pat_quoted(argv[0], 1);
-    beg = rb_pat_search(pat, str, 0, need_backref);
+    beg = rb_pat_search0(pat, str, 0, need_backref_str, &match);
+
     if (beg < 0) {
         if (bang) return Qnil;	/* no match, no substitution */
         return str_duplicate(rb_cString, str);
@@ -5781,8 +6486,7 @@ str_gsub(int argc, VALUE *argv, VALUE str, int bang)
     ENC_CODERANGE_SET(dest, rb_enc_asciicompat(str_enc) ? ENC_CODERANGE_7BIT : ENC_CODERANGE_VALID);
 
     do {
-        match = rb_backref_get();
-        regs = RMATCH_REGS(match);
+        struct re_registers *regs = RMATCH_REGS(match);
         if (RB_TYPE_P(pat, T_STRING)) {
             beg0 = beg;
             end0 = beg0 + RSTRING_LEN(pat);
@@ -5794,12 +6498,23 @@ str_gsub(int argc, VALUE *argv, VALUE str, int bang)
             if (mode == ITER) match0 = rb_reg_nth_match(0, match);
         }
 
-        if (mode) {
+        if (mode != STR) {
             if (mode == ITER) {
                 val = rb_obj_as_string(rb_yield(match0));
             }
             else {
-                val = rb_hash_aref(hash, rb_str_subseq(str, beg0, end0 - beg0));
+                struct RString fake_str;
+                VALUE key;
+                if (mode == FAST_MAP) {
+                    // It is safe to use a fake_str here because we established that it won't escape,
+                    // as it's only used for `rb_hash_aref` and we checked the hash doesn't have a
+                    // default proc.
+                    key = setup_fake_str(&fake_str, sp + beg0, end0 - beg0, ENCODING_GET_INLINED(str));
+                }
+                else {
+                    key = rb_str_subseq(str, beg0, end0 - beg0);
+                }
+                val = rb_hash_aref(hash, key);
                 val = rb_obj_as_string(val);
             }
             str_mod_check(str, sp, slen);
@@ -5807,10 +6522,10 @@ str_gsub(int argc, VALUE *argv, VALUE str, int bang)
                 rb_raise(rb_eRuntimeError, "block should not cheat");
             }
         }
-        else if (need_backref) {
+        else if (need_backref_str) {
             val = rb_reg_regsub(repl, str, regs, RB_TYPE_P(pat, T_STRING) ? Qnil : pat);
-            if (need_backref < 0) {
-                need_backref = val != repl;
+            if (need_backref_str < 0) {
+                need_backref_str = val != repl;
             }
         }
         else {
@@ -5838,12 +6553,20 @@ str_gsub(int argc, VALUE *argv, VALUE str, int bang)
         }
         cp = RSTRING_PTR(str) + offset;
         if (offset > RSTRING_LEN(str)) break;
-        beg = rb_pat_search(pat, str, offset, need_backref);
+
+        // In FAST_MAP and STR mode the backref can't escape so we can re-use the MatchData safely.
+        if (mode != FAST_MAP && mode != STR) {
+            match = Qnil;
+        }
+        beg = rb_pat_search0(pat, str, offset, need_backref_str, &match);
+
+        RB_GC_GUARD(match);
     } while (beg >= 0);
+
     if (RSTRING_LEN(str) > offset) {
         rb_enc_str_buf_cat(dest, cp, RSTRING_LEN(str) - offset, str_enc);
     }
-    rb_pat_search(pat, str, last, 1);
+    rb_pat_search0(pat, str, last, 1, &match);
     if (bang) {
         str_shared_replace(str, dest);
     }
@@ -5931,9 +6654,11 @@ rb_str_replace(VALUE str, VALUE str2)
  *
  *  Removes the contents of +self+:
  *
- *    s = 'foo' # => "foo"
- *    s.clear   # => ""
+ *    s = 'foo'
+ *    s.clear # => ""
+ *    s       # => ""
  *
+ *  Related: see {Modifying}[rdoc-ref:String@Modifying].
  */
 
 static VALUE
@@ -5954,10 +6679,7 @@ rb_str_clear(VALUE str)
  *  call-seq:
  *    chr -> string
  *
- *  Returns a string containing the first character of +self+:
- *
- *    s = 'foo' # => "foo"
- *    s.chr     # => "f"
+ *  :include: doc/string/chr.rdoc
  *
  */
 
@@ -6005,7 +6727,7 @@ rb_str_getbyte(VALUE str, VALUE index)
  *
  *  Related: String#getbyte.
  */
-static VALUE
+VALUE
 rb_str_setbyte(VALUE str, VALUE index, VALUE value)
 {
     long pos = NUM2LONG(index);
@@ -6101,6 +6823,12 @@ str_byte_substr(VALUE str, long beg, long len, int empty)
     return str2;
 }
 
+VALUE
+rb_str_byte_substr(VALUE str, VALUE beg, VALUE len)
+{
+    return str_byte_substr(str, NUM2LONG(beg), NUM2LONG(len), TRUE);
+}
+
 static VALUE
 str_byte_aref(VALUE str, VALUE indx)
 {
@@ -6128,45 +6856,10 @@ str_byte_aref(VALUE str, VALUE indx)
 
 /*
  *  call-seq:
- *    byteslice(index, length = 1) -> string or nil
- *    byteslice(range)             -> string or nil
- *
- *  Returns a substring of +self+, or +nil+ if the substring cannot be constructed.
- *
- *  With integer arguments +index+ and +length+ given,
- *  returns the substring beginning at the given +index+
- *  of the given +length+ (if possible),
- *  or +nil+ if +length+ is negative or +index+ falls outside of +self+:
- *
- *    s = '0123456789' # => "0123456789"
- *    s.byteslice(2)   # => "2"
- *    s.byteslice(200) # => nil
- *    s.byteslice(4, 3)  # => "456"
- *    s.byteslice(4, 30) # => "456789"
- *    s.byteslice(4, -1) # => nil
- *    s.byteslice(40, 2) # => nil
- *
- *  In either case above, counts backwards from the end of +self+
- *  if +index+ is negative:
- *
- *    s = '0123456789'   # => "0123456789"
- *    s.byteslice(-4)    # => "6"
- *    s.byteslice(-4, 3) # => "678"
- *
- *  With Range argument +range+ given, returns
- *  <tt>byteslice(range.begin, range.size)</tt>:
- *
- *    s = '0123456789'    # => "0123456789"
- *    s.byteslice(4..6)   # => "456"
- *    s.byteslice(-6..-4) # => "456"
- *    s.byteslice(5..2)   # => "" # range.size is zero.
- *    s.byteslice(40..42) # => nil
- *
- *  In all cases, a returned string has the same encoding as +self+:
- *
- *    s.encoding              # => #<Encoding:UTF-8>
- *    s.byteslice(4).encoding # => #<Encoding:UTF-8>
+ *    byteslice(offset, length = 1) -> string or nil
+ *    byteslice(range) -> string or nil
  *
+ *  :include: doc/string/byteslice.rdoc
  */
 
 static VALUE
@@ -6193,8 +6886,9 @@ str_check_beg_len(VALUE str, long *beg, long *len)
     if (*beg < 0) {
         *beg += slen;
     }
-    assert(*beg >= 0);
-    assert(*beg <= slen);
+    RUBY_ASSERT(*beg >= 0);
+    RUBY_ASSERT(*beg <= slen);
+
     if (*len > slen - *beg) {
         *len = slen - *beg;
     }
@@ -6205,23 +6899,12 @@ str_check_beg_len(VALUE str, long *beg, long *len)
 
 /*
  *  call-seq:
- *    bytesplice(index, length, str) -> string
- *    bytesplice(index, length, str, str_index, str_length) -> string
- *    bytesplice(range, str) -> string
- *    bytesplice(range, str, str_range) -> string
+ *    bytesplice(offset, length, str) -> self
+ *    bytesplice(offset, length, str, str_offset, str_length) -> self
+ *    bytesplice(range, str) -> self
+ *    bytesplice(range, str, str_range) -> self
  *
- *  Replaces some or all of the content of +self+ with +str+, and returns +self+.
- *  The portion of the string affected is determined using
- *  the same criteria as String#byteslice, except that +length+ cannot be omitted.
- *  If the replacement string is not the same length as the text it is replacing,
- *  the string will be adjusted accordingly.
- *
- *  If +str_index+ and +str_length+, or +str_range+ are given, the content of +self+ is replaced by str.byteslice(str_index, str_length) or str.byteslice(str_range); however the substring of +str+ is not allocated as a new string.
- *
- *  The form that take an Integer will raise an IndexError if the value is out
- *  of range; the Range form will raise a RangeError.
- *  If the beginning or ending offset does not land on character (codepoint)
- *  boundary, an IndexError will be raised.
+ *  :include: doc/string/bytesplice.rdoc
  */
 
 static VALUE
@@ -6229,7 +6912,6 @@ rb_str_bytesplice(int argc, VALUE *argv, VALUE str)
 {
     long beg, len, vbeg, vlen;
     VALUE val;
-    rb_encoding *enc;
     int cr;
 
     rb_check_arity(argc, 2, 5);
@@ -6274,10 +6956,13 @@ rb_str_bytesplice(int argc, VALUE *argv, VALUE str)
     }
     str_check_beg_len(str, &beg, &len);
     str_check_beg_len(val, &vbeg, &vlen);
-    enc = rb_enc_check(str, val);
     str_modify_keep_cr(str);
+
+    if (RB_UNLIKELY(ENCODING_GET_INLINED(str) != ENCODING_GET_INLINED(val))) {
+        rb_enc_associate(str, rb_enc_check(str, val));
+    }
+
     rb_str_update_1(str, beg, len, val, vbeg, vlen);
-    rb_enc_associate(str, enc);
     cr = ENC_CODERANGE_AND(ENC_CODERANGE(str), ENC_CODERANGE(val));
     if (cr != ENC_CODERANGE_BROKEN)
         ENC_CODERANGE_SET(str, cr);
@@ -6386,7 +7071,7 @@ rb_str_reverse_bang(VALUE str)
 
 /*
  *  call-seq:
- *    include? other_string -> true or false
+ *    include?(other_string) -> true or false
  *
  *  Returns +true+ if +self+ contains +other_string+, +false+ otherwise:
  *
@@ -6460,7 +7145,7 @@ rb_str_to_i(int argc, VALUE *argv, VALUE str)
  *  Returns the result of interpreting leading characters in +self+ as a Float:
  *
  *    '3.14159'.to_f  # => 3.14159
-      '1.234e-2'.to_f # => 0.01234
+ *    '1.234e-2'.to_f # => 0.01234
  *
  *  Characters past a leading valid number (in the given +base+) are ignored:
  *
@@ -6483,8 +7168,8 @@ rb_str_to_f(VALUE str)
  *  call-seq:
  *    to_s -> self or string
  *
- *  Returns +self+ if +self+ is a \String,
- *  or +self+ converted to a \String if +self+ is a subclass of \String.
+ *  Returns +self+ if +self+ is a +String+,
+ *  or +self+ converted to a +String+ if +self+ is a subclass of +String+.
  */
 
 static VALUE
@@ -7119,6 +7804,8 @@ str_undump(VALUE str)
         }
     }
 
+    RB_GC_GUARD(str);
+
     return undumped;
 invalid_format:
     rb_raise(rb_eRuntimeError, "invalid dumped string; not wrapped with '\"' nor '\"...\".force_encoding(\"...\")' form");
@@ -7355,7 +8042,7 @@ upcase_single(VALUE str)
 
 /*
  *  call-seq:
- *    upcase!(*options) -> self or nil
+ *    upcase!(mapping) -> self or nil
  *
  *  Upcases the characters in +self+;
  *  returns +self+ if any changes were made, +nil+ otherwise:
@@ -7365,7 +8052,7 @@ upcase_single(VALUE str)
  *    s                  # => "HELLO WORLD!"
  *    s.upcase!          # => nil
  *
- *  The casing may be affected by the given +options+;
+ *  The casing may be affected by the given +mapping+;
  *  see {Case Mapping}[rdoc-ref:case_mapping.rdoc].
  *
  *  Related: String#upcase, String#downcase, String#downcase!.
@@ -7397,14 +8084,14 @@ rb_str_upcase_bang(int argc, VALUE *argv, VALUE str)
 
 /*
  *  call-seq:
- *    upcase(*options) -> string
+ *    upcase(mapping) -> string
  *
  *  Returns a string containing the upcased characters in +self+:
  *
  *     s = 'Hello World!' # => "Hello World!"
  *     s.upcase           # => "HELLO WORLD!"
  *
- *  The casing may be affected by the given +options+;
+ *  The casing may be affected by the given +mapping+;
  *  see {Case Mapping}[rdoc-ref:case_mapping.rdoc].
  *
  *  Related: String#upcase!, String#downcase, String#downcase!.
@@ -7457,7 +8144,7 @@ downcase_single(VALUE str)
 
 /*
  *  call-seq:
- *    downcase!(*options) -> self or nil
+ *    downcase!(mapping) -> self or nil
  *
  *  Downcases the characters in +self+;
  *  returns +self+ if any changes were made, +nil+ otherwise:
@@ -7467,7 +8154,7 @@ downcase_single(VALUE str)
  *    s                  # => "hello world!"
  *    s.downcase!        # => nil
  *
- *  The casing may be affected by the given +options+;
+ *  The casing may be affected by the given +mapping+;
  *  see {Case Mapping}[rdoc-ref:case_mapping.rdoc].
  *
  *  Related: String#downcase, String#upcase, String#upcase!.
@@ -7499,14 +8186,14 @@ rb_str_downcase_bang(int argc, VALUE *argv, VALUE str)
 
 /*
  *  call-seq:
- *    downcase(*options) -> string
+ *    downcase(mapping) -> string
  *
  *  Returns a string containing the downcased characters in +self+:
  *
  *     s = 'Hello World!' # => "Hello World!"
  *     s.downcase         # => "hello world!"
  *
- *  The casing may be affected by the given +options+;
+ *  The casing may be affected by the given +mapping+;
  *  see {Case Mapping}[rdoc-ref:case_mapping.rdoc].
  *
  *  Related: String#downcase!, String#upcase, String#upcase!.
@@ -7541,22 +8228,14 @@ rb_str_downcase(int argc, VALUE *argv, VALUE str)
 
 /*
  *  call-seq:
- *    capitalize!(*options) -> self or nil
- *
- *  Upcases the first character in +self+;
- *  downcases the remaining characters;
- *  returns +self+ if any changes were made, +nil+ otherwise:
+ *    capitalize!(mapping = :ascii) -> self or nil
  *
- *    s = 'hello World!' # => "hello World!"
- *    s.capitalize!      # => "Hello world!"
- *    s                  # => "Hello world!"
- *    s.capitalize!      # => nil
+ *  Like String#capitalize, except that:
  *
- *  The casing may be affected by the given +options+;
- *  see {Case Mapping}[rdoc-ref:case_mapping.rdoc].
- *
- *  Related: String#capitalize.
+ *  - Changes character casings in +self+ (not in a copy of +self+).
+ *  - Returns +self+ if any changes are made, +nil+ otherwise.
  *
+ *  Related: See {Modifying}[rdoc-ref:String@Modifying].
  */
 
 static VALUE
@@ -7581,20 +8260,29 @@ rb_str_capitalize_bang(int argc, VALUE *argv, VALUE str)
 
 /*
  *  call-seq:
- *    capitalize(*options) -> string
+ *    capitalize(mapping = :ascii) -> string
  *
- *  Returns a string containing the characters in +self+;
- *  the first character is upcased;
- *  the remaining characters are downcased:
+ *  Returns a string containing the characters in +self+,
+ *  each with possibly changed case:
  *
- *     s = 'hello World!' # => "hello World!"
- *     s.capitalize       # => "Hello world!"
+ *  - The first character is upcased.
+ *  - All other characters are downcased.
  *
- *  The casing may be affected by the given +options+;
- *  see {Case Mapping}[rdoc-ref:case_mapping.rdoc].
+ *  Examples:
  *
- *  Related: String#capitalize!.
+ *    'hello world'.capitalize # => "Hello world"
+ *    'HELLO WORLD'.capitalize # => "Hello world"
  *
+ *  Some characters do not have upcase and downcase, and so are not changed;
+ *  see {Case Mapping}[rdoc-ref:case_mapping.rdoc]:
+ *
+ *    '1, 2, 3, ...'.capitalize # => "1, 2, 3, ..."
+ *
+ *  The casing is affected by the given +mapping+,
+ *  which may be +:ascii+, +:fold+, or +:turkic+;
+ *  see {Case Mappings}[rdoc-ref:case_mapping.rdoc@Case+Mappings].
+ *
+ *  Related: see {Converting to New String}[rdoc-ref:String@Converting+to+New+String].
  */
 
 static VALUE
@@ -7620,7 +8308,7 @@ rb_str_capitalize(int argc, VALUE *argv, VALUE str)
 
 /*
  *  call-seq:
- *    swapcase!(*options) -> self or nil
+ *    swapcase!(mapping) -> self or nil
  *
  *  Upcases each lowercase character in +self+;
  *  downcases uppercase character;
@@ -7631,7 +8319,7 @@ rb_str_capitalize(int argc, VALUE *argv, VALUE str)
  *    s                  # => "hELLO wORLD!"
  *    ''.swapcase!       # => nil
  *
- *  The casing may be affected by the given +options+;
+ *  The casing may be affected by the given +mapping+;
  *  see {Case Mapping}[rdoc-ref:case_mapping.rdoc].
  *
  *  Related: String#swapcase.
@@ -7659,7 +8347,7 @@ rb_str_swapcase_bang(int argc, VALUE *argv, VALUE str)
 
 /*
  *  call-seq:
- *    swapcase(*options) -> string
+ *    swapcase(mapping) -> string
  *
  *  Returns a string containing the characters in +self+, with cases reversed;
  *  each uppercase character is downcased;
@@ -7668,7 +8356,7 @@ rb_str_swapcase_bang(int argc, VALUE *argv, VALUE str)
  *     s = 'Hello World!' # => "Hello World!"
  *     s.swapcase         # => "hELLO wORLD!"
  *
- *  The casing may be affected by the given +options+;
+ *  The casing may be affected by the given +mapping+;
  *  see {Case Mapping}[rdoc-ref:case_mapping.rdoc].
  *
  *  Related: String#swapcase!.
@@ -7866,7 +8554,14 @@ tr_trans(VALUE str, VALUE src, VALUE repl, int sflag)
         while (s < send) {
             int may_modify = 0;
 
-            c0 = c = rb_enc_codepoint_len((char *)s, (char *)send, &clen, e1);
+            int r = rb_enc_precise_mbclen((char *)s, (char *)send, e1);
+            if (!MBCLEN_CHARFOUND_P(r)) {
+                xfree(buf);
+                rb_raise(rb_eArgError, "invalid byte sequence in %s", rb_enc_name(e1));
+            }
+            clen = MBCLEN_CHARFOUND_LEN(r);
+            c0 = c = rb_enc_mbc_to_codepoint((char *)s, (char *)send, e1);
+
             tlen = enc == e1 ? clen : rb_enc_codelen(c, enc);
 
             s += clen;
@@ -7946,7 +8641,15 @@ tr_trans(VALUE str, VALUE src, VALUE repl, int sflag)
 
         while (s < send) {
             int may_modify = 0;
-            c0 = c = rb_enc_codepoint_len((char *)s, (char *)send, &clen, e1);
+
+            int r = rb_enc_precise_mbclen((char *)s, (char *)send, e1);
+            if (!MBCLEN_CHARFOUND_P(r)) {
+                xfree(buf);
+                rb_raise(rb_eArgError, "invalid byte sequence in %s", rb_enc_name(e1));
+            }
+            clen = MBCLEN_CHARFOUND_LEN(r);
+            c0 = c = rb_enc_mbc_to_codepoint((char *)s, (char *)send, e1);
+
             tlen = enc == e1 ? clen : rb_enc_codelen(c, enc);
 
             if (c < 256) {
@@ -8163,9 +8866,10 @@ tr_find(unsigned int c, const char table[TR_TABLE_SIZE], VALUE del, VALUE nodel)
  *  call-seq:
  *    delete!(*selectors) -> self or nil
  *
- *  Like String#delete, but modifies +self+ in place.
- *  Returns +self+ if any changes were made, +nil+ otherwise.
+ *  Like String#delete, but modifies +self+ in place;
+ *  returns +self+ if any characters were deleted, +nil+ otherwise.
  *
+ *  Related: see {Modifying}[rdoc-ref:String@Modifying].
  */
 
 static VALUE
@@ -8234,13 +8938,7 @@ rb_str_delete_bang(int argc, VALUE *argv, VALUE str)
  *  call-seq:
  *    delete(*selectors) -> new_string
  *
- *  Returns a copy of +self+ with characters specified by +selectors+ removed
- *  (see {Multiple Character Selectors}[rdoc-ref:character_selectors.rdoc@Multiple+Character+Selectors]):
- *
- *     "hello".delete "l","lo"        #=> "heo"
- *     "hello".delete "lo"            #=> "he"
- *     "hello".delete "aeiou", "^e"   #=> "hell"
- *     "hello".delete "ej-m"          #=> "ho"
+ *  :include: doc/string/delete.rdoc
  *
  */
 
@@ -8408,23 +9106,7 @@ rb_str_tr_s(VALUE str, VALUE src, VALUE repl)
  *  call-seq:
  *    count(*selectors) -> integer
  *
- *  Returns the total number of characters in +self+
- *  that are specified by the given +selectors+
- *  (see {Multiple Character Selectors}[rdoc-ref:character_selectors.rdoc@Multiple+Character+Selectors]):
- *
- *     a = "hello world"
- *     a.count "lo"                   #=> 5
- *     a.count "lo", "o"              #=> 2
- *     a.count "hello", "^l"          #=> 4
- *     a.count "ej-m"                 #=> 4
- *
- *     "hello^world".count "\\^aeiou" #=> 4
- *     "hello-world".count "a\\-eo"   #=> 4
- *
- *     c = "hello world\\r\\n"
- *     c.count "\\"                   #=> 2
- *     c.count "\\A"                  #=> 0
- *     c.count "X-\\w"                #=> 3
+ *  :include: doc/string/count.rdoc
  */
 
 static VALUE
@@ -8587,8 +9269,8 @@ literal_split_pattern(VALUE spat, split_type_t default_type)
 
 /*
  *  call-seq:
- *    split(field_sep = $;, limit = nil) -> array
- *    split(field_sep = $;, limit = nil) {|substring| ... } -> self
+ *    split(field_sep = $;, limit = 0) -> array
+ *    split(field_sep = $;, limit = 0) {|substring| ... } -> self
  *
  *  :include: doc/string/split.rdoc
  *
@@ -8659,11 +9341,15 @@ rb_str_split_m(int argc, VALUE *argv, VALUE str)
         }
     }
 
-#define SPLIT_STR(beg, len) (empty_count = split_string(result, str, beg, len, empty_count))
+#define SPLIT_STR(beg, len) ( \
+        empty_count = split_string(result, str, beg, len, empty_count), \
+        str_mod_check(str, str_start, str_len))
 
     beg = 0;
     char *ptr = RSTRING_PTR(str);
-    char *eptr = RSTRING_END(str);
+    char *const str_start = ptr;
+    const long str_len = RSTRING_LEN(str);
+    char *const eptr = str_start + str_len;
     if (split_type == SPLIT_TYPE_AWK) {
         char *bptr = ptr;
         int skip = 1;
@@ -8724,7 +9410,6 @@ rb_str_split_m(int argc, VALUE *argv, VALUE str)
         }
     }
     else if (split_type == SPLIT_TYPE_STRING) {
-        char *str_start = ptr;
         char *substr_start = ptr;
         char *sptr = RSTRING_PTR(spat);
         long slen = RSTRING_LEN(spat);
@@ -8741,6 +9426,7 @@ rb_str_split_m(int argc, VALUE *argv, VALUE str)
                 continue;
             }
             SPLIT_STR(substr_start - str_start, (ptr+end) - substr_start);
+            str_mod_check(spat, sptr, slen);
             ptr += end + slen;
             substr_start = ptr;
             if (!NIL_P(limit) && lim <= ++i) break;
@@ -8748,7 +9434,6 @@ rb_str_split_m(int argc, VALUE *argv, VALUE str)
         beg = ptr - str_start;
     }
     else if (split_type == SPLIT_TYPE_CHARS) {
-        char *str_start = ptr;
         int n;
 
         if (result) result = rb_ary_new_capa(RSTRING_LEN(str));
@@ -9227,56 +9912,65 @@ static regex_t *
 get_reg_grapheme_cluster(rb_encoding *enc)
 {
     int encidx = rb_enc_to_index(enc);
-    regex_t *reg_grapheme_cluster = NULL;
-    static regex_t *reg_grapheme_cluster_utf8 = NULL;
 
-    /* synchronize */
-    if (encidx == rb_utf8_encindex() && reg_grapheme_cluster_utf8) {
-        reg_grapheme_cluster = reg_grapheme_cluster_utf8;
-    }
-    if (!reg_grapheme_cluster) {
-        const OnigUChar source_ascii[] = "\\X";
-        OnigErrorInfo einfo;
-        const OnigUChar *source = source_ascii;
-        size_t source_len = sizeof(source_ascii) - 1;
-        switch (encidx) {
+    const OnigUChar source_ascii[] = "\\X";
+    const OnigUChar *source = source_ascii;
+    size_t source_len = sizeof(source_ascii) - 1;
+
+    switch (encidx) {
 #define CHARS_16BE(x) (OnigUChar)((x)>>8), (OnigUChar)(x)
 #define CHARS_16LE(x) (OnigUChar)(x), (OnigUChar)((x)>>8)
 #define CHARS_32BE(x) CHARS_16BE((x)>>16), CHARS_16BE(x)
 #define CHARS_32LE(x) CHARS_16LE(x), CHARS_16LE((x)>>16)
 #define CASE_UTF(e) \
-          case ENCINDEX_UTF_##e: { \
-            static const OnigUChar source_UTF_##e[] = {CHARS_##e('\\'), CHARS_##e('X')}; \
-            source = source_UTF_##e; \
-            source_len = sizeof(source_UTF_##e); \
-            break; \
-          }
-            CASE_UTF(16BE); CASE_UTF(16LE); CASE_UTF(32BE); CASE_UTF(32LE);
+      case ENCINDEX_UTF_##e: { \
+        static const OnigUChar source_UTF_##e[] = {CHARS_##e('\\'), CHARS_##e('X')}; \
+        source = source_UTF_##e; \
+        source_len = sizeof(source_UTF_##e); \
+        break; \
+      }
+        CASE_UTF(16BE); CASE_UTF(16LE); CASE_UTF(32BE); CASE_UTF(32LE);
 #undef CASE_UTF
 #undef CHARS_16BE
 #undef CHARS_16LE
 #undef CHARS_32BE
 #undef CHARS_32LE
-        }
-        int r = onig_new(&reg_grapheme_cluster, source, source + source_len,
-                         ONIG_OPTION_DEFAULT, enc, OnigDefaultSyntax, &einfo);
-        if (r) {
-            UChar message[ONIG_MAX_ERROR_MESSAGE_LEN];
-            onig_error_code_to_str(message, r, &einfo);
-            rb_fatal("cannot compile grapheme cluster regexp: %s", (char *)message);
-        }
-        if (encidx == rb_utf8_encindex()) {
-            reg_grapheme_cluster_utf8 = reg_grapheme_cluster;
-        }
     }
+
+    regex_t *reg_grapheme_cluster;
+    OnigErrorInfo einfo;
+    int r = onig_new(&reg_grapheme_cluster, source, source + source_len,
+                        ONIG_OPTION_DEFAULT, enc, OnigDefaultSyntax, &einfo);
+    if (r) {
+        UChar message[ONIG_MAX_ERROR_MESSAGE_LEN];
+        onig_error_code_to_str(message, r, &einfo);
+        rb_fatal("cannot compile grapheme cluster regexp: %s", (char *)message);
+    }
+
     return reg_grapheme_cluster;
 }
 
+static regex_t *
+get_cached_reg_grapheme_cluster(rb_encoding *enc)
+{
+    int encidx = rb_enc_to_index(enc);
+    static regex_t *reg_grapheme_cluster_utf8 = NULL;
+
+    if (encidx == rb_utf8_encindex()) {
+        if (!reg_grapheme_cluster_utf8) {
+            reg_grapheme_cluster_utf8 = get_reg_grapheme_cluster(enc);
+        }
+
+        return reg_grapheme_cluster_utf8;
+    }
+
+    return NULL;
+}
+
 static VALUE
 rb_str_each_grapheme_cluster_size(VALUE str, VALUE args, VALUE eobj)
 {
     size_t grapheme_cluster_count = 0;
-    regex_t *reg_grapheme_cluster = NULL;
     rb_encoding *enc = get_encoding(str);
     const char *ptr, *end;
 
@@ -9284,7 +9978,13 @@ rb_str_each_grapheme_cluster_size(VALUE str, VALUE args, VALUE eobj)
         return rb_str_length(str);
     }
 
-    reg_grapheme_cluster = get_reg_grapheme_cluster(enc);
+    bool cached_reg_grapheme_cluster = true;
+    regex_t *reg_grapheme_cluster = get_cached_reg_grapheme_cluster(enc);
+    if (!reg_grapheme_cluster) {
+        reg_grapheme_cluster = get_reg_grapheme_cluster(enc);
+        cached_reg_grapheme_cluster = false;
+    }
+
     ptr = RSTRING_PTR(str);
     end = RSTRING_END(str);
 
@@ -9297,6 +9997,10 @@ rb_str_each_grapheme_cluster_size(VALUE str, VALUE args, VALUE eobj)
         ptr += len;
     }
 
+    if (!cached_reg_grapheme_cluster) {
+        onig_free(reg_grapheme_cluster);
+    }
+
     return SIZET2NUM(grapheme_cluster_count);
 }
 
@@ -9304,7 +10008,6 @@ static VALUE
 rb_str_enumerate_grapheme_clusters(VALUE str, VALUE ary)
 {
     VALUE orig = str;
-    regex_t *reg_grapheme_cluster = NULL;
     rb_encoding *enc = get_encoding(str);
     const char *ptr0, *ptr, *end;
 
@@ -9313,7 +10016,14 @@ rb_str_enumerate_grapheme_clusters(VALUE str, VALUE ary)
     }
 
     if (!ary) str = rb_str_new_frozen(str);
-    reg_grapheme_cluster = get_reg_grapheme_cluster(enc);
+
+    bool cached_reg_grapheme_cluster = true;
+    regex_t *reg_grapheme_cluster = get_cached_reg_grapheme_cluster(enc);
+    if (!reg_grapheme_cluster) {
+        reg_grapheme_cluster = get_reg_grapheme_cluster(enc);
+        cached_reg_grapheme_cluster = false;
+    }
+
     ptr0 = ptr = RSTRING_PTR(str);
     end = RSTRING_END(str);
 
@@ -9325,6 +10035,11 @@ rb_str_enumerate_grapheme_clusters(VALUE str, VALUE ary)
         ENUM_ELEM(ary, rb_str_subseq(str, ptr-ptr0, len));
         ptr += len;
     }
+
+    if (!cached_reg_grapheme_cluster) {
+        onig_free(reg_grapheme_cluster);
+    }
+
     RB_GC_GUARD(str);
     if (ary)
         return ary;
@@ -9385,10 +10100,12 @@ chopped_length(VALUE str)
  *  call-seq:
  *    chop! -> self or nil
  *
- *  Like String#chop, but modifies +self+ in place;
- *  returns +nil+ if +self+ is empty, +self+ otherwise.
+ *  Like String#chop, except that:
  *
- *  Related: String#chomp!.
+ *  - Removes trailing characters from +self+ (not from a copy of +self+).
+ *  - Returns +self+ if any characters are removed, +nil+ otherwise.
+ *
+ *  Related: see {Modifying}[rdoc-ref:String@Modifying].
  */
 
 static VALUE
@@ -9565,9 +10282,12 @@ rb_str_chomp_string(VALUE str, VALUE rs)
  *  call-seq:
  *    chomp!(line_sep = $/) -> self or nil
  *
- *  Like String#chomp, but modifies +self+ in place;
- *  returns +nil+ if no modification made, +self+ otherwise.
+ *  Like String#chomp, except that:
+ *
+ *  - Removes trailing characters from +self+ (not from a copy of +self+).
+ *  - Returns +self+ if any characters are removed, +nil+ otherwise.
  *
+ *  Related: see {Modifying}[rdoc-ref:String@Modifying].
  */
 
 static VALUE
@@ -9575,7 +10295,7 @@ rb_str_chomp_bang(int argc, VALUE *argv, VALUE str)
 {
     VALUE rs;
     str_modifiable(str);
-    if (RSTRING_LEN(str) == 0) return Qnil;
+    if (RSTRING_LEN(str) == 0 && argc < 2) return Qnil;
     rs = chomp_rs(argc, argv);
     if (NIL_P(rs)) return Qnil;
     return rb_str_chomp_string(str, rs);
@@ -9842,11 +10562,11 @@ rb_str_strip(VALUE str)
 static VALUE
 scan_once(VALUE str, VALUE pat, long *start, int set_backref_str)
 {
-    VALUE result, match;
-    struct re_registers *regs;
-    int i;
+    VALUE result = Qnil;
     long end, pos = rb_pat_search(pat, str, *start, set_backref_str);
     if (pos >= 0) {
+        VALUE match;
+        struct re_registers *regs;
         if (BUILTIN_TYPE(pat) == T_STRING) {
             regs = NULL;
             end = pos + RSTRING_LEN(pat);
@@ -9857,6 +10577,7 @@ scan_once(VALUE str, VALUE pat, long *start, int set_backref_str)
             pos = BEG(0);
             end = END(0);
         }
+
         if (pos == end) {
             rb_encoding *enc = STR_ENC_GET(str);
             /*
@@ -9871,22 +10592,27 @@ scan_once(VALUE str, VALUE pat, long *start, int set_backref_str)
         else {
             *start = end;
         }
+
         if (!regs || regs->num_regs == 1) {
             result = rb_str_subseq(str, pos, end - pos);
             return result;
         }
-        result = rb_ary_new2(regs->num_regs);
-        for (i=1; i < regs->num_regs; i++) {
-            VALUE s = Qnil;
-            if (BEG(i) >= 0) {
-                s = rb_str_subseq(str, BEG(i), END(i)-BEG(i));
+        else {
+            result = rb_ary_new2(regs->num_regs);
+            for (int i = 1; i < regs->num_regs; i++) {
+                VALUE s = Qnil;
+                if (BEG(i) >= 0) {
+                    s = rb_str_subseq(str, BEG(i), END(i)-BEG(i));
+                }
+
+                rb_ary_push(result, s);
             }
-            rb_ary_push(result, s);
         }
 
-        return result;
+        RB_GC_GUARD(match);
     }
-    return Qnil;
+
+    return result;
 }
 
 
@@ -10021,11 +10747,6 @@ rb_str_oct(VALUE str)
 static struct {
     rb_nativethread_lock_t lock;
 } crypt_mutex = {PTHREAD_MUTEX_INITIALIZER};
-
-static void
-crypt_mutex_initialize(void)
-{
-}
 #endif
 
 /*
@@ -10096,6 +10817,7 @@ rb_str_crypt(VALUE str, VALUE salt)
     struct crypt_data *data;
 #   define CRYPT_END() ALLOCV_END(databuf)
 #else
+    char *tmp_buf;
     extern char *crypt(const char *, const char *);
 #   define CRYPT_END() rb_nativethread_lock_unlock(&crypt_mutex.lock)
 #endif
@@ -10130,7 +10852,6 @@ rb_str_crypt(VALUE str, VALUE salt)
 # endif
     res = crypt_r(s, saltp, data);
 #else
-    crypt_mutex_initialize();
     rb_nativethread_lock_lock(&crypt_mutex.lock);
     res = crypt(s, saltp);
 #endif
@@ -10139,8 +10860,21 @@ rb_str_crypt(VALUE str, VALUE salt)
         CRYPT_END();
         rb_syserr_fail(err, "crypt");
     }
+#ifdef HAVE_CRYPT_R
     result = rb_str_new_cstr(res);
     CRYPT_END();
+#else
+    // We need to copy this buffer because it's static and we need to unlock the mutex
+    // before allocating a new object (the string to be returned). If we allocate while
+    // holding the lock, we could run GC which fires the VM barrier and causes a deadlock
+    // if other ractors are waiting on this lock.
+    size_t res_size = strlen(res)+1;
+    tmp_buf = ALLOCA_N(char, res_size); // should be small enough to alloca
+    memcpy(tmp_buf, res, res_size);
+    res = tmp_buf;
+    CRYPT_END();
+    result = rb_str_new_cstr(res);
+#endif
     return result;
 }
 
@@ -10268,7 +11002,7 @@ rb_str_justify(int argc, VALUE *argv, VALUE str, char jflag)
        rb_raise(rb_eArgError, "argument too big");
     }
     len += size;
-    res = str_new0(rb_cString, 0, len, termlen);
+    res = str_enc_new(rb_cString, 0, len, enc);
     p = RSTRING_PTR(res);
     if (flen <= 1) {
        memset(p, *f, llen);
@@ -10304,7 +11038,7 @@ rb_str_justify(int argc, VALUE *argv, VALUE str, char jflag)
     }
     TERM_FILL(p, termlen);
     STR_SET_LEN(res, p-RSTRING_PTR(res));
-    rb_enc_associate(res, enc);
+
     if (argc == 2)
         cr = ENC_CODERANGE_AND(cr, ENC_CODERANGE(pad));
     if (cr != ENC_CODERANGE_BROKEN)
@@ -10354,8 +11088,6 @@ rb_str_rjust(int argc, VALUE *argv, VALUE str)
  *
  *  :include: doc/string/center.rdoc
  *
- *  Related: String#ljust, String#rjust.
- *
  */
 
 static VALUE
@@ -10568,9 +11300,10 @@ deleted_prefix_length(VALUE str, VALUE prefix)
  *  call-seq:
  *    delete_prefix!(prefix) -> self or nil
  *
- *  Like String#delete_prefix, except that +self+ is modified in place.
- *  Returns +self+ if the prefix is removed, +nil+ otherwise.
+ *  Like String#delete_prefix, except that +self+ is modified in place;
+ *  returns +self+ if the prefix is removed, +nil+ otherwise.
  *
+ *  Related: see {Modifying}[rdoc-ref:String@Modifying].
  */
 
 static VALUE
@@ -10643,9 +11376,10 @@ deleted_suffix_length(VALUE str, VALUE suffix)
  *  call-seq:
  *    delete_suffix!(suffix) -> self or nil
  *
- *  Like String#delete_suffix, except that +self+ is modified in place.
- *  Returns +self+ if the suffix is removed, +nil+ otherwise.
+ *  Like String#delete_suffix, except that +self+ is modified in place;
+ *  returns +self+ if the suffix is removed, +nil+ otherwise.
  *
+ *  Related: see {Modifying}[rdoc-ref:String@Modifying].
  */
 
 static VALUE
@@ -10706,7 +11440,7 @@ rb_fs_setter(VALUE val, ID id, VALUE *var)
                  rb_id2str(id));
     }
     if (!NIL_P(val)) {
-        rb_warn_deprecated("`$;'", NULL);
+        rb_warn_deprecated("'$;'", NULL);
     }
     *var = val;
 }
@@ -10724,14 +11458,30 @@ static VALUE
 rb_str_force_encoding(VALUE str, VALUE enc)
 {
     str_modifiable(str);
-    rb_enc_associate(str, rb_to_encoding(enc));
+
+    rb_encoding *encoding = rb_to_encoding(enc);
+    int idx = rb_enc_to_index(encoding);
+
+    // If the encoding is unchanged, we do nothing.
+    if (ENCODING_GET(str) == idx) {
+        return str;
+    }
+
+    rb_enc_associate_index(str, idx);
+
+    // If the coderange was 7bit and the new encoding is ASCII-compatible
+    // we can keep the coderange.
+    if (ENC_CODERANGE(str) == ENC_CODERANGE_7BIT && encoding && rb_enc_asciicompat(encoding)) {
+        return str;
+    }
+
     ENC_CODERANGE_CLEAR(str);
     return str;
 }
 
 /*
  *  call-seq:
- *    b -> string
+ *    b -> new_string
  *
  *  :include: doc/string/b.rdoc
  *
@@ -10776,9 +11526,9 @@ rb_str_b(VALUE str)
  *
  *  Returns +true+ if +self+ is encoded correctly, +false+ otherwise:
  *
- *    "\xc2\xa1".force_encoding("UTF-8").valid_encoding? # => true
- *    "\xc2".force_encoding("UTF-8").valid_encoding?     # => false
- *    "\x80".force_encoding("UTF-8").valid_encoding?     # => false
+ *    "\xc2\xa1".force_encoding(Encoding::UTF_8).valid_encoding? # => true
+ *    "\xc2".force_encoding(Encoding::UTF_8).valid_encoding?     # => false
+ *    "\x80".force_encoding(Encoding::UTF_8).valid_encoding?     # => false
  */
 
 static VALUE
@@ -10793,12 +11543,12 @@ rb_str_valid_encoding_p(VALUE str)
  *  call-seq:
  *    ascii_only? -> true or false
  *
- *  Returns +true+ if +self+ contains only ASCII characters,
- *  +false+ otherwise:
+ *  Returns whether +self+ contains only ASCII characters:
  *
  *    'abc'.ascii_only?         # => true
  *    "abc\u{6666}".ascii_only? # => false
  *
+ *  Related: see {Querying}[rdoc-ref:String@Querying].
  */
 
 static VALUE
@@ -10859,7 +11609,7 @@ str_compat_and_valid(VALUE str, rb_encoding *enc)
         rb_encoding *e = STR_ENC_GET(str);
         if (cr == ENC_CODERANGE_7BIT ? rb_enc_mbminlen(enc) != 1 : enc != e) {
             rb_raise(rb_eEncCompatError, "incompatible character encodings: %s and %s",
-                     rb_enc_name(enc), rb_enc_name(e));
+                     rb_enc_inspect_name(enc), rb_enc_inspect_name(e));
         }
     }
     return str;
@@ -10914,7 +11664,7 @@ enc_str_scrub(rb_encoding *enc, VALUE str, VALUE repl, int cr)
     encidx = rb_enc_to_index(enc);
 
 #define DEFAULT_REPLACE_CHAR(str) do { \
-        static const char replace[sizeof(str)-1] = str; \
+        RBIMPL_ATTR_NONSTRING() static const char replace[sizeof(str)-1] = str; \
         rep = replace; replen = (int)sizeof(replace); \
     } while (0)
 
@@ -11253,7 +12003,7 @@ rb_str_unicode_normalize_bang(int argc, VALUE *argv, VALUE str)
  *
  *  Raises an exception if +self+ is not in a Unicode encoding:
  *
- *    s = "\xE0".force_encoding('ISO-8859-1')
+ *    s = "\xE0".force_encoding(Encoding::ISO_8859_1)
  *    s.unicode_normalized? # Raises Encoding::CompatibilityError.
  *
  *  Related: String#unicode_normalize, String#unicode_normalize!.
@@ -11268,17 +12018,17 @@ rb_str_unicode_normalized_p(int argc, VALUE *argv, VALUE str)
 /**********************************************************************
  * Document-class: Symbol
  *
- * \Symbol objects represent named identifiers inside the Ruby interpreter.
+ * A +Symbol+ object represents a named identifier inside the Ruby interpreter.
  *
- * You can create a \Symbol object explicitly with:
+ * You can create a +Symbol+ object explicitly with:
  *
  * - A {symbol literal}[rdoc-ref:syntax/literals.rdoc@Symbol+Literals].
  *
- * The same \Symbol object will be
+ * The same +Symbol+ object will be
  * created for a given name or string for the duration of a program's
  * execution, regardless of the context or meaning of that name. Thus
  * if <code>Fred</code> is a constant in one context, a method in
- * another, and a class in a third, the \Symbol <code>:Fred</code>
+ * another, and a class in a third, the +Symbol+ <code>:Fred</code>
  * will be the same object in all three contexts.
  *
  *     module One
@@ -11321,18 +12071,18 @@ rb_str_unicode_normalized_p(int argc, VALUE *argv, VALUE str)
  *     local_variables
  *     # => [:seven]
  *
- * \Symbol objects are different from String objects in that
- * \Symbol objects represent identifiers, while String objects
- * represent text or data.
+ * A +Symbol+ object differs from a String object in that
+ * a +Symbol+ object represents an identifier, while a String object
+ * represents text or data.
  *
  * == What's Here
  *
- * First, what's elsewhere. \Class \Symbol:
+ * First, what's elsewhere. Class +Symbol+:
  *
  * - Inherits from {class Object}[rdoc-ref:Object@What-27s+Here].
  * - Includes {module Comparable}[rdoc-ref:Comparable@What-27s+Here].
  *
- * Here, class \Symbol provides methods that are useful for:
+ * Here, class +Symbol+ provides methods that are useful for:
  *
  * - {Querying}[rdoc-ref:Symbol@Methods+for+Querying]
  * - {Comparing}[rdoc-ref:Symbol@Methods+for+Comparing]
@@ -11491,30 +12241,31 @@ sym_inspect(VALUE sym)
     }
     else {
         rb_encoding *enc = STR_ENC_GET(str);
-        RSTRING_GETMEM(str, ptr, len);
+        VALUE orig_str = str;
+
+        len = RSTRING_LEN(orig_str);
         str = rb_enc_str_new(0, len + 1, enc);
+
+        // Get data pointer after allocation
+        ptr = RSTRING_PTR(orig_str);
         dest = RSTRING_PTR(str);
         memcpy(dest + 1, ptr, len);
+
+        RB_GC_GUARD(orig_str);
     }
     dest[0] = ':';
+
+    RUBY_ASSERT_BUILTIN_TYPE(str, T_STRING);
+
     return str;
 }
 
-/*
- *  call-seq:
- *    to_s -> string
- *
- *  Returns a string representation of +self+ (not including the leading colon):
- *
- *    :foo.to_s # => "foo"
- *
- *  Related: Symbol#inspect, Symbol#name.
- */
-
 VALUE
 rb_sym_to_s(VALUE sym)
 {
-    return str_new_shared(rb_cString, rb_sym2str(sym));
+    VALUE str = str_new_shared(rb_cString, rb_sym2str(sym));
+    FL_SET_RAW(str, STR_CHILLED_SYMBOL_TO_S);
+    return str;
 }
 
 VALUE
@@ -11702,7 +12453,7 @@ sym_empty(VALUE sym)
 
 /*
  *  call-seq:
- *    upcase(*options) -> symbol
+ *    upcase(mapping) -> symbol
  *
  *  Equivalent to <tt>sym.to_s.upcase.to_sym</tt>.
  *
@@ -11718,7 +12469,7 @@ sym_upcase(int argc, VALUE *argv, VALUE sym)
 
 /*
  *  call-seq:
- *    downcase(*options) -> symbol
+ *    downcase(mapping) -> symbol
  *
  *  Equivalent to <tt>sym.to_s.downcase.to_sym</tt>.
  *
@@ -11736,7 +12487,7 @@ sym_downcase(int argc, VALUE *argv, VALUE sym)
 
 /*
  *  call-seq:
- *    capitalize(*options) -> symbol
+ *    capitalize(mapping) -> symbol
  *
  *  Equivalent to <tt>sym.to_s.capitalize.to_sym</tt>.
  *
@@ -11752,7 +12503,7 @@ sym_capitalize(int argc, VALUE *argv, VALUE sym)
 
 /*
  *  call-seq:
- *    swapcase(*options) -> symbol
+ *    swapcase(mapping) -> symbol
  *
  *  Equivalent to <tt>sym.to_s.swapcase.to_sym</tt>.
  *
@@ -11815,7 +12566,7 @@ string_for_symbol(VALUE name)
     if (!RB_TYPE_P(name, T_STRING)) {
         VALUE tmp = rb_check_string_type(name);
         if (NIL_P(tmp)) {
-            rb_raise(rb_eTypeError, "%+"PRIsVALUE" is not a symbol",
+            rb_raise(rb_eTypeError, "%+"PRIsVALUE" is not a symbol nor a string",
                      name);
         }
         name = tmp;
@@ -11870,7 +12621,7 @@ VALUE
 rb_interned_str(const char *ptr, long len)
 {
     struct RString fake_str;
-    return register_fstring(setup_fake_str(&fake_str, ptr, len, ENCINDEX_US_ASCII), TRUE);
+    return register_fstring(setup_fake_str(&fake_str, ptr, len, ENCINDEX_US_ASCII), true, false);
 }
 
 VALUE
@@ -11882,12 +12633,23 @@ rb_interned_str_cstr(const char *ptr)
 VALUE
 rb_enc_interned_str(const char *ptr, long len, rb_encoding *enc)
 {
-    if (UNLIKELY(rb_enc_autoload_p(enc))) {
+    if (enc != NULL && UNLIKELY(rb_enc_autoload_p(enc))) {
+        rb_enc_autoload(enc);
+    }
+
+    struct RString fake_str;
+    return register_fstring(rb_setup_fake_str(&fake_str, ptr, len, enc), true, false);
+}
+
+VALUE
+rb_enc_literal_str(const char *ptr, long len, rb_encoding *enc)
+{
+    if (enc != NULL && UNLIKELY(rb_enc_autoload_p(enc))) {
         rb_enc_autoload(enc);
     }
 
     struct RString fake_str;
-    return register_fstring(rb_setup_fake_str(&fake_str, ptr, len, enc), TRUE);
+    return register_fstring(rb_setup_fake_str(&fake_str, ptr, len, enc), true, true);
 }
 
 VALUE
@@ -11896,14 +12658,41 @@ rb_enc_interned_str_cstr(const char *ptr, rb_encoding *enc)
     return rb_enc_interned_str(ptr, strlen(ptr), enc);
 }
 
+#if USE_YJIT
+void
+rb_yjit_str_concat_codepoint(VALUE str, VALUE codepoint)
+{
+    if (RB_LIKELY(ENCODING_GET_INLINED(str) == rb_ascii8bit_encindex())) {
+        ssize_t code = RB_NUM2SSIZE(codepoint);
+
+        if (RB_LIKELY(code >= 0 && code < 0xff)) {
+            rb_str_buf_cat_byte(str, (char) code);
+            return;
+        }
+    }
+
+    rb_str_concat(str, codepoint);
+}
+#endif
+
+static int
+fstring_set_class_i(VALUE *str, void *data)
+{
+    RBASIC_SET_CLASS(*str, rb_cString);
+
+    return ST_CONTINUE;
+}
+
 void
 Init_String(void)
 {
     rb_cString  = rb_define_class("String", rb_cObject);
-    assert(rb_vm_fstring_table());
-    st_foreach(rb_vm_fstring_table(), fstring_set_class_i, rb_cString);
+
+    rb_concurrent_set_foreach_with_replace(fstring_table_obj, fstring_set_class_i, NULL);
+
     rb_include_module(rb_cString, rb_mComparable);
     rb_define_alloc_func(rb_cString, empty_str_alloc);
+    rb_define_singleton_method(rb_cString, "new", rb_str_s_new, -1);
     rb_define_singleton_method(rb_cString, "try_convert", rb_str_s_try_convert, 1);
     rb_define_method(rb_cString, "initialize", rb_str_init, -1);
     rb_define_method(rb_cString, "initialize_copy", rb_str_replace, 1);
@@ -11948,6 +12737,7 @@ Init_String(void)
     rb_define_method(rb_cString, "freeze", rb_str_freeze, 0);
     rb_define_method(rb_cString, "+@", str_uplus, 0);
     rb_define_method(rb_cString, "-@", str_uminus, 0);
+    rb_define_method(rb_cString, "dup", rb_str_dup_m, 0);
     rb_define_alias(rb_cString, "dedup", "-@");
 
     rb_define_method(rb_cString, "to_i", rb_str_to_i, -1);
@@ -11984,6 +12774,7 @@ Init_String(void)
     rb_define_method(rb_cString, "reverse", rb_str_reverse, 0);
     rb_define_method(rb_cString, "reverse!", rb_str_reverse_bang, 0);
     rb_define_method(rb_cString, "concat", rb_str_concat_multi, -1);
+    rb_define_method(rb_cString, "append_as_bytes", rb_str_append_as_bytes, -1);
     rb_define_method(rb_cString, "<<", rb_str_concat, 1);
     rb_define_method(rb_cString, "prepend", rb_str_prepend_multi, -1);
     rb_define_method(rb_cString, "crypt", rb_str_crypt, 1);
@@ -12075,9 +12866,6 @@ Init_String(void)
     rb_define_method(rb_cSymbol, "==", sym_equal, 1);
     rb_define_method(rb_cSymbol, "===", sym_equal, 1);
     rb_define_method(rb_cSymbol, "inspect", sym_inspect, 0);
-    rb_define_method(rb_cSymbol, "to_s", rb_sym_to_s, 0);
-    rb_define_method(rb_cSymbol, "id2name", rb_sym_to_s, 0);
-    rb_define_method(rb_cSymbol, "name", rb_sym2str, 0); /* in symbol.c */
     rb_define_method(rb_cSymbol, "to_proc", rb_sym_to_proc, 0); /* in proc.c */
     rb_define_method(rb_cSymbol, "succ", sym_succ, 0);
     rb_define_method(rb_cSymbol, "next", sym_succ, 0);
@@ -12105,3 +12893,4 @@ Init_String(void)
 
     rb_define_method(rb_cSymbol, "encoding", sym_encoding, 0);
 }
+
diff --git a/string.rb b/string.rb
deleted file mode 100644
index e4de709dc59e6c..00000000000000
--- a/string.rb
+++ /dev/null
@@ -1,552 +0,0 @@
-#  A \String object has an arbitrary sequence of bytes,
-#  typically representing text or binary data.
-#  A \String object may be created using String::new or as literals.
-#
-#  String objects differ from Symbol objects in that Symbol objects are
-#  designed to be used as identifiers, instead of text or data.
-#
-#  You can create a \String object explicitly with:
-#
-#  - A {string literal}[rdoc-ref:syntax/literals.rdoc@String+Literals].
-#  - A {heredoc literal}[rdoc-ref:syntax/literals.rdoc@Here+Document+Literals].
-#
-#  You can convert certain objects to Strings with:
-#
-#  - \Method #String.
-#
-#  Some \String methods modify +self+.
-#  Typically, a method whose name ends with <tt>!</tt> modifies +self+
-#  and returns +self+;
-#  often a similarly named method (without the <tt>!</tt>)
-#  returns a new string.
-#
-#  In general, if there exist both bang and non-bang version of method,
-#  the bang! mutates and the non-bang! does not.
-#  However, a method without a bang can also mutate, such as String#replace.
-#
-#  == Substitution Methods
-#
-#  These methods perform substitutions:
-#
-#  - String#sub: One substitution (or none); returns a new string.
-#  - String#sub!: One substitution (or none); returns +self+.
-#  - String#gsub: Zero or more substitutions; returns a new string.
-#  - String#gsub!: Zero or more substitutions; returns +self+.
-#
-#  Each of these methods takes:
-#
-#  - A first argument, +pattern+ (string or regexp),
-#    that specifies the substring(s) to be replaced.
-#
-#  - Either of these:
-#
-#    - A second argument, +replacement+ (string or hash),
-#      that determines the replacing string.
-#    - A block that will determine the replacing string.
-#
-#  The examples in this section mostly use methods String#sub and String#gsub;
-#  the principles illustrated apply to all four substitution methods.
-#
-#  <b>Argument +pattern+</b>
-#
-#  Argument +pattern+ is commonly a regular expression:
-#
-#    s = 'hello'
-#    s.sub(/[aeiou]/, '*')# => "h*llo"
-#    s.gsub(/[aeiou]/, '*') # => "h*ll*"
-#    s.gsub(/[aeiou]/, '')# => "hll"
-#    s.sub(/ell/, 'al')   # => "halo"
-#    s.gsub(/xyzzy/, '*') # => "hello"
-#    'THX1138'.gsub(/\d+/, '00') # => "THX00"
-#
-#  When +pattern+ is a string, all its characters are treated
-#  as ordinary characters (not as regexp special characters):
-#
-#    'THX1138'.gsub('\d+', '00') # => "THX1138"
-#
-#  <b>\String +replacement+</b>
-#
-#  If +replacement+ is a string, that string will determine
-#  the replacing string that is to be substituted for the matched text.
-#
-#  Each of the examples above uses a simple string as the replacing string.
-#
-#  \String +replacement+ may contain back-references to the pattern's captures:
-#
-#  - <tt>\n</tt> (_n_ a non-negative integer) refers to <tt>$n</tt>.
-#  - <tt>\k<name></tt> refers to the named capture +name+.
-#
-#  See rdoc-ref:regexp.rdoc for details.
-#
-#  Note that within the string +replacement+, a character combination
-#  such as <tt>$&</tt> is treated as ordinary text, and not as
-#  a special match variable.
-#  However, you may refer to some special match variables using these
-#  combinations:
-#
-#  - <tt>\&</tt> and <tt>\0</tt> correspond to <tt>$&</tt>,
-#    which contains the complete matched text.
-#  - <tt>\'</tt> corresponds to <tt>$'</tt>,
-#    which contains string after match.
-#  - <tt>\`</tt> corresponds to <tt>$`</tt>,
-#    which contains string before match.
-#  - <tt>\\+</tt> corresponds to <tt>$+</tt>,
-#    which contains last capture group.
-#
-#  See rdoc-ref:regexp.rdoc for details.
-#
-#  Note that <tt>\\\\</tt> is interpreted as an escape, i.e., a single backslash.
-#
-#  Note also that a string literal consumes backslashes.
-#  See {String Literals}[rdoc-ref:syntax/literals.rdoc@String+Literals] for details about string literals.
-#
-#  A back-reference is typically preceded by an additional backslash.
-#  For example, if you want to write a back-reference <tt>\&</tt> in
-#  +replacement+ with a double-quoted string literal, you need to write
-#  <tt>"..\\\\&.."</tt>.
-#
-#  If you want to write a non-back-reference string <tt>\&</tt> in
-#  +replacement+, you need first to escape the backslash to prevent
-#  this method from interpreting it as a back-reference, and then you
-#  need to escape the backslashes again to prevent a string literal from
-#  consuming them: <tt>"..\\\\\\\\&.."</tt>.
-#
-#  You may want to use the block form to avoid a lot of backslashes.
-#
-#  <b>\Hash +replacement+</b>
-#
-#  If argument +replacement+ is a hash, and +pattern+ matches one of its keys,
-#  the replacing string is the value for that key:
-#
-#    h = {'foo' => 'bar', 'baz' => 'bat'}
-#    'food'.sub('foo', h) # => "bard"
-#
-#  Note that a symbol key does not match:
-#
-#    h = {foo: 'bar', baz: 'bat'}
-#    'food'.sub('foo', h) # => "d"
-#
-#  <b>Block</b>
-#
-#  In the block form, the current match string is passed to the block;
-#  the block's return value becomes the replacing string:
-#
-#    s = '@'
-#   '1234'.gsub(/\d/) {|match| s.succ! } # => "ABCD"
-#
-#  Special match variables such as <tt>$1</tt>, <tt>$2</tt>, <tt>$`</tt>,
-#  <tt>$&</tt>, and <tt>$'</tt> are set appropriately.
-#
-#  == Whitespace in Strings
-#
-#  In class \String, _whitespace_ is defined as a contiguous sequence of characters
-#  consisting of any mixture of the following:
-#
-#  - NL (null): <tt>"\x00"</tt>, <tt>"\u0000"</tt>.
-#  - HT (horizontal tab): <tt>"\x09"</tt>, <tt>"\t"</tt>.
-#  - LF (line feed): <tt>"\x0a"</tt>, <tt>"\n"</tt>.
-#  - VT (vertical tab): <tt>"\x0b"</tt>, <tt>"\v"</tt>.
-#  - FF (form feed): <tt>"\x0c"</tt>, <tt>"\f"</tt>.
-#  - CR (carriage return): <tt>"\x0d"</tt>, <tt>"\r"</tt>.
-#  - SP (space): <tt>"\x20"</tt>, <tt>" "</tt>.
-#
-#
-#  Whitespace is relevant for these methods:
-#
-#  - #lstrip, #lstrip!: strip leading whitespace.
-#  - #rstrip, #rstrip!: strip trailing whitespace.
-#  - #strip, #strip!: strip leading and trailing whitespace.
-#
-#  == \String Slices
-#
-#  A _slice_ of a string is a substring that is selected by certain criteria.
-#
-#  These instance methods make use of slicing:
-#
-#  - String#[] (also aliased as String#slice) returns a slice copied from +self+.
-#  - String#[]= returns a copy of +self+ with a slice replaced.
-#  - String#slice! returns +self+ with a slice removed.
-#
-#  Each of the above methods takes arguments that determine the slice
-#  to be copied or replaced.
-#
-#  The arguments have several forms.
-#  For string +string+,  the forms are:
-#
-#  - <tt>string[index]</tt>.
-#  - <tt>string[start, length]</tt>.
-#  - <tt>string[range]</tt>.
-#  - <tt>string[regexp, capture = 0]</tt>.
-#  - <tt>string[substring]</tt>.
-#
-#  <b><tt>string[index]</tt></b>
-#
-#  When non-negative integer argument +index+ is given,
-#  the slice is the 1-character substring found in +self+ at character offset +index+:
-#
-#    'bar'[0]       # => "b"
-#    'bar'[2]       # => "r"
-#    'bar'[20]      # => nil
-#    'тест'[2]      # => "с"
-#    'こんにちは'[4]  # => "は"
-#
-#  When negative integer +index+ is given,
-#  the slice begins at the offset given by counting backward from the end of +self+:
-#
-#    'bar'[-3]         # => "b"
-#    'bar'[-1]         # => "r"
-#    'bar'[-20]        # => nil
-#
-#  <b><tt>string[start, length]</tt></b>
-#
-#  When non-negative integer arguments +start+ and +length+ are given,
-#  the slice begins at character offset +start+, if it exists,
-#  and continues for +length+ characters, if available:
-#
-#    'foo'[0, 2]       # => "fo"
-#    'тест'[1, 2]      # => "ес"
-#    'こんにちは'[2, 2]  # => "にち"
-#    # Zero length.
-#    'foo'[2, 0]       # => ""
-#    # Length not entirely available.
-#    'foo'[1, 200]     # => "oo"
-#    # Start out of range.
-#    'foo'[4, 2]      # => nil
-#
-#  Special case: if +start+ is equal to the length of +self+,
-#  the slice is a new empty string:
-#
-#    'foo'[3, 2]   # => ""
-#    'foo'[3, 200] # => ""
-#
-#  When negative +start+ and non-negative +length+ are given,
-#  the slice beginning is determined by counting backward from the end of +self+,
-#  and the slice continues for +length+ characters, if available:
-#
-#    'foo'[-2, 2]    # => "oo"
-#    'foo'[-2, 200]  # => "oo"
-#    # Start out of range.
-#    'foo'[-4, 2]     # => nil
-#
-#  When negative +length+ is given, there is no slice:
-#
-#    'foo'[1, -1]  # => nil
-#    'foo'[-2, -1] # => nil
-#
-#  <b><tt>string[range]</tt></b>
-#
-#  When Range argument +range+ is given,
-#  creates a substring of +string+ using the indices in +range+.
-#  The slice is then determined as above:
-#
-#    'foo'[0..1]    # => "fo"
-#    'foo'[0, 2]    # => "fo"
-#
-#    'foo'[2...2]   # => ""
-#    'foo'[2, 0]    # => ""
-#
-#    'foo'[1..200]  # => "oo"
-#    'foo'[1, 200]  # => "oo"
-#
-#    'foo'[4..5]    # => nil
-#    'foo'[4, 2]    # => nil
-#
-#    'foo'[-4..-3]  # => nil
-#    'foo'[-4, 2]   # => nil
-#
-#    'foo'[3..4]    # => ""
-#    'foo'[3, 2]    # => ""
-#
-#    'foo'[-2..-1]  # => "oo"
-#    'foo'[-2, 2]   # => "oo"
-#
-#    'foo'[-2..197] # => "oo"
-#    'foo'[-2, 200] # => "oo"
-#
-#  <b><tt>string[regexp, capture = 0]</tt></b>
-#
-#  When the Regexp argument +regexp+ is given,
-#  and the +capture+ argument is <tt>0</tt>,
-#  the slice is the first matching substring found in +self+:
-#
-#    'foo'[/o/] # => "o"
-#    'foo'[/x/] # => nil
-#    s = 'hello there'
-#    s[/[aeiou](.)\1/] # => "ell"
-#    s[/[aeiou](.)\1/, 0] # => "ell"
-#
-#  If argument +capture+ is given and not <tt>0</tt>,
-#  it should be either an capture group index (integer)
-#  or a capture group name (string or symbol);
-#  the slice is the specified capture (see Regexp@Groups+and+Captures):
-#
-#    s = 'hello there'
-#    s[/[aeiou](.)\1/, 1] # => "l"
-#    s[/(?<vowel>[aeiou])(?<non_vowel>[^aeiou])/, "non_vowel"] # => "l"
-#    s[/(?<vowel>[aeiou])(?<non_vowel>[^aeiou])/, :vowel] # => "e"
-#
-#  If an invalid capture group index is given, there is no slice.
-#  If an invalid capture group name is given, +IndexError+ is raised.
-#
-#  <b><tt>string[substring]</tt></b>
-#
-#  When the single \String argument +substring+ is given,
-#  returns the substring from +self+ if found, otherwise +nil+:
-#
-#    'foo'['oo'] # => "oo"
-#    'foo'['xx'] # => nil
-#
-#  == What's Here
-#
-#  First, what's elsewhere. \Class \String:
-#
-#  - Inherits from {class Object}[rdoc-ref:Object@What-27s+Here].
-#  - Includes {module Comparable}[rdoc-ref:Comparable@What-27s+Here].
-#
-#  Here, class \String provides methods that are useful for:
-#
-#  - {Creating a String}[rdoc-ref:String@Methods+for+Creating+a+String]
-#  - {Frozen/Unfrozen Strings}[rdoc-ref:String@Methods+for+a+Frozen-2FUnfrozen+String]
-#  - {Querying}[rdoc-ref:String@Methods+for+Querying]
-#  - {Comparing}[rdoc-ref:String@Methods+for+Comparing]
-#  - {Modifying a String}[rdoc-ref:String@Methods+for+Modifying+a+String]
-#  - {Converting to New String}[rdoc-ref:String@Methods+for+Converting+to+New+String]
-#  - {Converting to Non-String}[rdoc-ref:String@Methods+for+Converting+to+Non--5CString]
-#  - {Iterating}[rdoc-ref:String@Methods+for+Iterating]
-#
-#  === Methods for Creating a \String
-#
-#  - ::new: Returns a new string.
-#  - ::try_convert: Returns a new string created from a given object.
-#
-#  === Methods for a Frozen/Unfrozen String
-#
-#  - #+@: Returns a string that is not frozen: +self+, if not frozen;
-#    +self.dup+ otherwise.
-#  - #-@: Returns a string that is frozen: +self+, if already frozen;
-#    +self.freeze+ otherwise.
-#  - #freeze: Freezes +self+, if not already frozen; returns +self+.
-#
-#  === Methods for Querying
-#
-#  _Counts_
-#
-#  - #length, #size: Returns the count of characters (not bytes).
-#  - #empty?: Returns +true+ if +self.length+ is zero; +false+ otherwise.
-#  - #bytesize: Returns the count of bytes.
-#  - #count: Returns the count of substrings matching given strings.
-#
-#  _Substrings_
-#
-#  - #=~: Returns the index of the first substring that matches a given
-#    Regexp or other object; returns +nil+ if no match is found.
-#  - #index: Returns the index of the _first_ occurrence of a given substring;
-#    returns +nil+ if none found.
-#  - #rindex: Returns the index of the _last_ occurrence of a given substring;
-#    returns +nil+ if none found.
-#  - #include?: Returns +true+ if the string contains a given substring; +false+ otherwise.
-#  - #match: Returns a MatchData object if the string matches a given Regexp; +nil+ otherwise.
-#  - #match?: Returns +true+ if the string matches a given Regexp; +false+ otherwise.
-#  - #start_with?: Returns +true+ if the string begins with any of the given substrings.
-#  - #end_with?: Returns +true+ if the string ends with any of the given substrings.
-#
-#  _Encodings_
-#
-#  - #encoding\: Returns the Encoding object that represents the encoding of the string.
-#  - #unicode_normalized?: Returns +true+ if the string is in Unicode normalized form; +false+ otherwise.
-#  - #valid_encoding?: Returns +true+ if the string contains only characters that are valid
-#    for its encoding.
-#  - #ascii_only?: Returns +true+ if the string has only ASCII characters; +false+ otherwise.
-#
-#  _Other_
-#
-#  - #sum: Returns a basic checksum for the string: the sum of each byte.
-#  - #hash: Returns the integer hash code.
-#
-#  === Methods for Comparing
-#
-#  - #==, #===: Returns +true+ if a given other string has the same content as +self+.
-#  - #eql?: Returns +true+ if the content is the same as the given other string.
-#  - #<=>: Returns -1, 0, or 1 as a given other string is smaller than,
-#    equal to, or larger than +self+.
-#  - #casecmp: Ignoring case, returns -1, 0, or 1 as a given
-#    other string is smaller than, equal to, or larger than +self+.
-#  - #casecmp?: Returns +true+ if the string is equal to a given string after Unicode case folding;
-#    +false+ otherwise.
-#
-#  === Methods for Modifying a \String
-#
-#  Each of these methods modifies +self+.
-#
-#  _Insertion_
-#
-#  - #insert: Returns +self+ with a given string inserted at a given offset.
-#  - #<<: Returns +self+ concatenated with a given string or integer.
-#
-#  _Substitution_
-#
-#  - #sub!: Replaces the first substring that matches a given pattern with a given replacement string;
-#    returns +self+ if any changes, +nil+ otherwise.
-#  - #gsub!: Replaces each substring that matches a given pattern with a given replacement string;
-#    returns +self+ if any changes, +nil+ otherwise.
-#  - #succ!, #next!: Returns +self+ modified to become its own successor.
-#  - #replace: Returns +self+ with its entire content replaced by a given string.
-#  - #reverse!: Returns +self+ with its characters in reverse order.
-#  - #setbyte: Sets the byte at a given integer offset to a given value; returns the argument.
-#  - #tr!: Replaces specified characters in +self+ with specified replacement characters;
-#    returns +self+ if any changes, +nil+ otherwise.
-#  - #tr_s!: Replaces specified characters in +self+ with specified replacement characters,
-#    removing duplicates from the substrings that were modified;
-#    returns +self+ if any changes, +nil+ otherwise.
-#
-#  _Casing_
-#
-#  - #capitalize!: Upcases the initial character and downcases all others;
-#    returns +self+ if any changes, +nil+ otherwise.
-#  - #downcase!: Downcases all characters; returns +self+ if any changes, +nil+ otherwise.
-#  - #upcase!: Upcases all characters; returns +self+ if any changes, +nil+ otherwise.
-#  - #swapcase!: Upcases each downcase character and downcases each upcase character;
-#    returns +self+ if any changes, +nil+ otherwise.
-#
-#  _Encoding_
-#
-#  - #encode!: Returns +self+ with all characters transcoded from one given encoding into another.
-#  - #unicode_normalize!: Unicode-normalizes +self+; returns +self+.
-#  - #scrub!: Replaces each invalid byte with a given character; returns +self+.
-#  - #force_encoding: Changes the encoding to a given encoding; returns +self+.
-#
-#  _Deletion_
-#
-#  - #clear: Removes all content, so that +self+ is empty; returns +self+.
-#  - #slice!, #[]=: Removes a substring determined by a given index, start/length, range, regexp, or substring.
-#  - #squeeze!: Removes contiguous duplicate characters; returns +self+.
-#  - #delete!: Removes characters as determined by the intersection of substring arguments.
-#  - #lstrip!: Removes leading whitespace; returns +self+ if any changes, +nil+ otherwise.
-#  - #rstrip!: Removes trailing whitespace; returns +self+ if any changes, +nil+ otherwise.
-#  - #strip!: Removes leading and trailing whitespace; returns +self+ if any changes, +nil+ otherwise.
-#  - #chomp!: Removes trailing record separator, if found; returns +self+ if any changes, +nil+ otherwise.
-#  - #chop!: Removes trailing newline characters if found; otherwise removes the last character;
-#    returns +self+ if any changes, +nil+ otherwise.
-#
-#  === Methods for Converting to New \String
-#
-#  Each of these methods returns a new \String based on +self+,
-#  often just a modified copy of +self+.
-#
-#  _Extension_
-#
-#  - #*: Returns the concatenation of multiple copies of +self+,
-#  - #+: Returns the concatenation of +self+ and a given other string.
-#  - #center: Returns a copy of +self+ centered between pad substring.
-#  - #concat: Returns the concatenation of +self+ with given other strings.
-#  - #prepend: Returns the concatenation of a given other string with +self+.
-#  - #ljust: Returns a copy of +self+ of a given length, right-padded with a given other string.
-#  - #rjust: Returns a copy of +self+ of a given length, left-padded with a given other string.
-#
-#  _Encoding_
-#
-#  - #b: Returns a copy of +self+ with ASCII-8BIT encoding.
-#  - #scrub: Returns a copy of +self+ with each invalid byte replaced with a given character.
-#  - #unicode_normalize: Returns a copy of +self+ with each character Unicode-normalized.
-#  - #encode: Returns a copy of +self+ with all characters transcoded from one given encoding into another.
-#
-#  _Substitution_
-#
-#  - #dump: Returns a copy of +self+ with all non-printing characters replaced by \xHH notation
-#    and all special characters escaped.
-#  - #undump: Returns a copy of +self+ with all <tt>\xNN</tt> notation replace by <tt>\uNNNN</tt> notation
-#    and all escaped characters unescaped.
-#  - #sub: Returns a copy of +self+ with the first substring matching a given pattern
-#    replaced with a given replacement string;.
-#  - #gsub: Returns a copy of +self+ with each substring that matches a given pattern
-#    replaced with a given replacement string.
-#  - #succ, #next: Returns the string that is the successor to +self+.
-#  - #reverse: Returns a copy of +self+ with its characters in reverse order.
-#  - #tr: Returns a copy of +self+ with specified characters replaced with specified      replacement characters.
-#  - #tr_s: Returns a copy of +self+ with specified characters replaced with
-#    specified replacement characters,
-#    removing duplicates from the substrings that were modified.
-#  - #%: Returns the string resulting from formatting a given object into +self+
-#
-#  _Casing_
-#
-#  - #capitalize: Returns a copy of +self+ with the first character upcased
-#    and all other characters downcased.
-#  - #downcase: Returns a copy of +self+ with all characters downcased.
-#  - #upcase: Returns a copy of +self+ with all characters upcased.
-#  - #swapcase: Returns a copy of +self+ with all upcase characters downcased
-#    and all downcase characters upcased.
-#
-#  _Deletion_
-#
-#  - #delete: Returns a copy of +self+ with characters removed
-#  - #delete_prefix: Returns a copy of +self+ with a given prefix removed.
-#  - #delete_suffix: Returns a copy of +self+ with a given suffix removed.
-#  - #lstrip: Returns a copy of +self+ with leading whitespace removed.
-#  - #rstrip: Returns a copy of +self+ with trailing whitespace removed.
-#  - #strip: Returns a copy of +self+ with leading and trailing whitespace removed.
-#  - #chomp: Returns a copy of +self+ with a trailing record separator removed, if found.
-#  - #chop: Returns a copy of +self+ with trailing newline characters or the last character removed.
-#  - #squeeze: Returns a copy of +self+ with contiguous duplicate characters removed.
-#  - #[], #slice: Returns a substring determined by a given index, start/length, or range, or string.
-#  - #byteslice: Returns a substring determined by a given index, start/length, or range.
-#  - #chr: Returns the first character.
-#
-#  _Duplication_
-#
-#  - #to_s, $to_str: If +self+ is a subclass of \String, returns +self+ copied into a \String;
-#    otherwise, returns +self+.
-#
-#  === Methods for Converting to Non-\String
-#
-#  Each of these methods converts the contents of +self+ to a non-\String.
-#
-#  <em>Characters, Bytes, and Clusters</em>
-#
-#  - #bytes: Returns an array of the bytes in +self+.
-#  - #chars: Returns an array of the characters in +self+.
-#  - #codepoints: Returns an array of the integer ordinals in +self+.
-#  - #getbyte: Returns an integer byte as determined by a given index.
-#  - #grapheme_clusters: Returns an array of the grapheme clusters in +self+.
-#
-#  _Splitting_
-#
-#  - #lines: Returns an array of the lines in +self+, as determined by a given record separator.
-#  - #partition: Returns a 3-element array determined by the first substring that matches
-#    a given substring or regexp,
-#  - #rpartition: Returns a 3-element array determined by the last substring that matches
-#    a given substring or regexp,
-#  - #split: Returns an array of substrings determined by a given delimiter -- regexp or string --
-#    or, if a block given, passes those substrings to the block.
-#
-#  _Matching_
-#
-#  - #scan: Returns an array of substrings matching a given regexp or string, or,
-#    if a block given, passes each matching substring to the  block.
-#  - #unpack: Returns an array of substrings extracted from +self+ according to a given format.
-#  - #unpack1: Returns the first substring extracted from +self+ according to a given format.
-#
-#  _Numerics_
-#
-#  - #hex: Returns the integer value of the leading characters, interpreted as hexadecimal digits.
-#  - #oct: Returns the integer value of the leading characters, interpreted as octal digits.
-#  - #ord: Returns the integer ordinal of the first character in +self+.
-#  - #to_i: Returns the integer value of leading characters, interpreted as an integer.
-#  - #to_f: Returns the floating-point value of leading characters, interpreted as a floating-point number.
-#
-#  <em>Strings and Symbols</em>
-#
-#  - #inspect: Returns copy of +self+, enclosed in double-quotes, with special characters escaped.
-#  - #to_sym, #intern: Returns the symbol corresponding to +self+.
-#
-#  === Methods for Iterating
-#
-#  - #each_byte: Calls the given block with each successive byte in +self+.
-#  - #each_char: Calls the given block with each successive character in +self+.
-#  - #each_codepoint: Calls the given block with each successive integer codepoint in +self+.
-#  - #each_grapheme_cluster: Calls the given block with each successive grapheme cluster in +self+.
-#  - #each_line: Calls the given block with each successive line in +self+,
-#    as determined by a given record separator.
-#  - #upto: Calls the given block with each string value returned by successive calls to #succ.
-
-class String; end
diff --git a/struct.c b/struct.c
index b46fd88264e1c1..74ca9369a61c82 100644
--- a/struct.c
+++ b/struct.c
@@ -52,7 +52,8 @@ struct_ivar_get(VALUE c, ID id)
         RUBY_ASSERT(RB_TYPE_P(c, T_CLASS));
         ivar = rb_attr_get(c, id);
         if (!NIL_P(ivar)) {
-            return rb_ivar_set(orig, id, ivar);
+            if (!OBJ_FROZEN(orig)) rb_ivar_set(orig, id, ivar);
+            return ivar;
         }
     }
 }
@@ -136,7 +137,7 @@ struct_set_members(VALUE klass, VALUE /* frozen hidden array */ members)
                 j = struct_member_pos_probe(j, mask);
             }
         }
-        OBJ_FREEZE_RAW(back);
+        OBJ_FREEZE(back);
     }
     rb_ivar_set(klass, id_members, members);
     rb_ivar_set(klass, id_back_members, back);
@@ -236,7 +237,7 @@ rb_struct_getmember(VALUE obj, ID id)
     if (i != -1) {
         return RSTRUCT_GET(obj, i);
     }
-    rb_name_err_raise("`%1$s' is not a struct member", obj, ID2SYM(id));
+    rb_name_err_raise("'%1$s' is not a struct member", obj, ID2SYM(id));
 
     UNREACHABLE_RETURN(Qnil);
 }
@@ -273,7 +274,7 @@ new_struct(VALUE name, VALUE super)
         rb_warn("redefining constant %"PRIsVALUE"::%"PRIsVALUE, super, name);
         rb_mod_remove_const(super, ID2SYM(id));
     }
-    return rb_define_class_id_under(super, id, super);
+    return rb_define_class_id_under_no_pin(super, id, super);
 }
 
 NORETURN(static void invalid_struct_pos(VALUE s, VALUE idx));
@@ -422,7 +423,7 @@ struct_make_members_list(va_list ar)
     }
     ary = rb_hash_keys(list);
     RBASIC_CLEAR_CLASS(ary);
-    OBJ_FREEZE_RAW(ary);
+    OBJ_FREEZE(ary);
     return ary;
 }
 
@@ -491,8 +492,13 @@ rb_struct_define(const char *name, ...)
     ary = struct_make_members_list(ar);
     va_end(ar);
 
-    if (!name) st = anonymous_struct(rb_cStruct);
-    else st = new_struct(rb_str_new2(name), rb_cStruct);
+    if (!name) {
+        st = anonymous_struct(rb_cStruct);
+    }
+    else {
+        st = new_struct(rb_str_new2(name), rb_cStruct);
+        rb_vm_register_global_object(st);
+    }
     return setup_struct(st, ary);
 }
 
@@ -506,7 +512,7 @@ rb_struct_define_under(VALUE outer, const char *name, ...)
     ary = struct_make_members_list(ar);
     va_end(ar);
 
-    return setup_struct(rb_define_class_under(outer, name, rb_cStruct), ary);
+    return setup_struct(rb_define_class_id_under(outer, rb_intern(name), rb_cStruct), ary);
 }
 
 /*
@@ -527,7 +533,7 @@ rb_struct_define_under(VALUE outer, const char *name, ...)
  *    Foo = Struct.new('Foo', :foo, :bar) # => Struct::Foo
  *    f = Foo.new(0, 1)                   # => #<struct Struct::Foo foo=0, bar=1>
  *
- *  <b>\Class Name</b>
+ *  <b>Class Name</b>
  *
  *  With string argument +class_name+,
  *  returns a new subclass of +Struct+ named <tt>Struct::<em>class_name</em></tt>:
@@ -582,7 +588,7 @@ rb_struct_define_under(VALUE outer, const char *name, ...)
  *
  *  A subclass returned by Struct.new has these singleton methods:
  *
- *  - \Method <tt>::new </tt> creates an instance of the subclass:
+ *  - Method <tt>::new </tt> creates an instance of the subclass:
  *
  *      Foo.new          # => #<struct Struct::Foo foo=nil, bar=nil>
  *      Foo.new(0)       # => #<struct Struct::Foo foo=0, bar=nil>
@@ -595,12 +601,12 @@ rb_struct_define_under(VALUE outer, const char *name, ...)
  *      Foo.new(foo: 0, bar: 1, baz: 2)
  *      # Raises ArgumentError: unknown keywords: baz
  *
- *  - \Method <tt>:inspect</tt> returns a string representation of the subclass:
+ *  - Method <tt>:inspect</tt> returns a string representation of the subclass:
  *
  *      Foo.inspect
  *      # => "Struct::Foo"
  *
- *  - \Method <tt>::members</tt> returns an array of the member names:
+ *  - Method <tt>::members</tt> returns an array of the member names:
  *
  *      Foo.members # => [:foo, :bar]
  *
@@ -677,7 +683,7 @@ rb_struct_s_def(int argc, VALUE *argv, VALUE klass)
     }
     rest = rb_hash_keys(rest);
     RBASIC_CLEAR_CLASS(rest);
-    OBJ_FREEZE_RAW(rest);
+    OBJ_FREEZE(rest);
     if (NIL_P(name)) {
         st = anonymous_struct(klass);
     }
@@ -789,7 +795,7 @@ VALUE
 rb_struct_initialize(VALUE self, VALUE values)
 {
     rb_struct_initialize_m(RARRAY_LENINT(values), RARRAY_CONST_PTR(values), self);
-    if (rb_obj_is_kind_of(self, rb_cData)) OBJ_FREEZE_RAW(self);
+    if (rb_obj_is_kind_of(self, rb_cData)) OBJ_FREEZE(self);
     RB_GC_GUARD(values);
     return Qnil;
 }
@@ -1547,7 +1553,7 @@ rb_struct_dig(int argc, VALUE *argv, VALUE self)
 /*
  *  Document-class: Data
  *
- *  \Class \Data provides a convenient way to define simple classes
+ *  Class \Data provides a convenient way to define simple classes
  *  for value-alike objects.
  *
  *  The simplest example of usage:
@@ -1635,7 +1641,7 @@ rb_struct_dig(int argc, VALUE *argv, VALUE self)
  *
  *
  *  Note that member-less \Data is acceptable and might be a useful technique
- *  for defining several homogenous data classes, like
+ *  for defining several homogeneous data classes, like
  *
  *     class HTTPFetcher
  *       Response = Data.define(:body)
@@ -1680,7 +1686,7 @@ rb_data_s_def(int argc, VALUE *argv, VALUE klass)
     }
     rest = rb_hash_keys(rest);
     RBASIC_CLEAR_CLASS(rest);
-    OBJ_FREEZE_RAW(rest);
+    OBJ_FREEZE(rest);
     data_class = anonymous_struct(klass);
     setup_data(data_class, rest);
     if (rb_block_given_p()) {
@@ -1699,7 +1705,9 @@ rb_data_define(VALUE super, ...)
     ary = struct_make_members_list(ar);
     va_end(ar);
     if (!super) super = rb_cData;
-    return setup_data(anonymous_struct(super), ary);
+    VALUE klass = setup_data(anonymous_struct(super), ary);
+    rb_vm_register_global_object(klass);
+    return klass;
 }
 
 /*
@@ -1752,7 +1760,8 @@ rb_data_define(VALUE super, ...)
  *  important for redefining initialize in order to convert arguments or provide
  *  defaults:
  *
- *     Measure = Data.define(:amount, :unit) do
+ *     Measure = Data.define(:amount, :unit)
+ *     class Measure
  *       NONE = Data.define
  *
  *       def initialize(amount:, unit: NONE.new)
@@ -1761,7 +1770,7 @@ rb_data_define(VALUE super, ...)
  *     end
  *
  *     Measure.new('10', 'km') # => #<data Measure amount=10.0, unit="km">
- *     Measure.new(10_000)     # => #<data Measure amount=10000.0, unit=#<data NONE>>
+ *     Measure.new(10_000)     # => #<data Measure amount=10000.0, unit=#<data Measure::NONE>>
  *
  */
 
@@ -1795,7 +1804,7 @@ rb_data_initialize_m(int argc, const VALUE *argv, VALUE self)
     rb_hash_foreach(argv[0], struct_hash_set_i, (VALUE)&arg);
     // Freeze early before potentially raising, so that we don't leave an
     // unfrozen copy on the heap, which could get exposed via ObjectSpace.
-    OBJ_FREEZE_RAW(self);
+    OBJ_FREEZE(self);
     if (arg.unknown_keywords != Qnil) {
         rb_exc_raise(rb_keyword_error_new("unknown", arg.unknown_keywords));
     }
@@ -1807,7 +1816,7 @@ static VALUE
 rb_data_init_copy(VALUE copy, VALUE s)
 {
     copy = rb_struct_init_copy(copy, s);
-    RB_OBJ_FREEZE_RAW(copy);
+    RB_OBJ_FREEZE(copy);
     return copy;
 }
 
@@ -2058,7 +2067,7 @@ rb_data_inspect(VALUE s)
 /*
  *  Document-class: Struct
  *
- *  \Class \Struct provides a convenient way to create a simple class
+ *  Class \Struct provides a convenient way to create a simple class
  *  that can store and fetch values.
  *
  *  This example creates a subclass of +Struct+, <tt>Struct::Customer</tt>;
@@ -2098,7 +2107,7 @@ rb_data_inspect(VALUE s)
  *
  *  == What's Here
  *
- *  First, what's elsewhere. \Class \Struct:
+ *  First, what's elsewhere. Class \Struct:
  *
  *  - Inherits from {class Object}[rdoc-ref:Object@What-27s+Here].
  *  - Includes {module Enumerable}[rdoc-ref:Enumerable@What-27s+Here],
@@ -2124,7 +2133,7 @@ rb_data_inspect(VALUE s)
  *  === Methods for Querying
  *
  *  - #hash: Returns the integer hash code.
- *  - #length, #size: Returns the number of members.
+ *  - #size (aliased as #length): Returns the number of members.
  *
  *  === Methods for Comparing
  *
@@ -2136,13 +2145,13 @@ rb_data_inspect(VALUE s)
  *  === Methods for Fetching
  *
  *  - #[]: Returns the value associated with a given member name.
- *  - #to_a, #values, #deconstruct: Returns the member values in +self+ as an array.
+ *  - #to_a (aliased as #values, #deconstruct): Returns the member values in +self+ as an array.
  *  - #deconstruct_keys: Returns a hash of the name/value pairs
  *    for given member names.
  *  - #dig: Returns the object in nested objects that is specified
  *    by a given member name and additional arguments.
  *  - #members: Returns an array of the member names.
- *  - #select, #filter: Returns an array of member values from +self+,
+ *  - #select (aliased as #filter): Returns an array of member values from +self+,
  *    as selected by the given block.
  *  - #values_at: Returns an array containing values for given member names.
  *
@@ -2157,7 +2166,7 @@ rb_data_inspect(VALUE s)
  *
  *  === Methods for Converting
  *
- *  - #inspect, #to_s: Returns a string representation of +self+.
+ *  - #inspect (aliased as #to_s): Returns a string representation of +self+.
  *  - #to_h: Returns a hash of the member name/value pairs in +self+.
  *
  */
diff --git a/symbol.c b/symbol.c
index 2447b1ec105cfc..e4f18197c92614 100644
--- a/symbol.c
+++ b/symbol.c
@@ -22,6 +22,7 @@
 #include "symbol.h"
 #include "vm_sync.h"
 #include "builtin.h"
+#include "ruby/internal/attr/nonstring.h"
 
 #if defined(USE_SYMBOL_GC) && !(USE_SYMBOL_GC+0)
 # undef USE_SYMBOL_GC
@@ -95,17 +96,33 @@ Init_sym(void)
 
     VALUE dsym_fstrs = rb_ident_hash_new();
     symbols->dsymbol_fstr_hash = dsym_fstrs;
-    rb_gc_register_mark_object(dsym_fstrs);
     rb_obj_hide(dsym_fstrs);
 
     symbols->str_sym = st_init_table_with_size(&symhash, 1000);
     symbols->ids = rb_ary_hidden_new(0);
-    rb_gc_register_mark_object(symbols->ids);
 
     Init_op_tbl();
     Init_id();
 }
 
+void
+rb_sym_global_symbols_mark(void)
+{
+    rb_symbols_t *symbols = &ruby_global_symbols;
+
+    rb_gc_mark_movable(symbols->ids);
+    rb_gc_mark_movable(symbols->dsymbol_fstr_hash);
+}
+
+void
+rb_sym_global_symbols_update_references(void)
+{
+    rb_symbols_t *symbols = &ruby_global_symbols;
+
+    symbols->ids = rb_gc_location(symbols->ids);
+    symbols->dsymbol_fstr_hash = rb_gc_location(symbols->dsymbol_fstr_hash);
+}
+
 WARN_UNUSED_RESULT(static VALUE dsymbol_alloc(rb_symbols_t *symbols, const VALUE klass, const VALUE str, rb_encoding *const enc, const ID type));
 WARN_UNUSED_RESULT(static VALUE dsymbol_check(rb_symbols_t *symbols, const VALUE sym));
 WARN_UNUSED_RESULT(static ID lookup_str_id(VALUE str));
@@ -114,8 +131,11 @@ WARN_UNUSED_RESULT(static VALUE lookup_str_sym(const VALUE str));
 WARN_UNUSED_RESULT(static VALUE lookup_id_str(ID id));
 WARN_UNUSED_RESULT(static ID intern_str(VALUE str, int mutable));
 
-#define GLOBAL_SYMBOLS_ENTER(symbols) rb_symbols_t *symbols = &ruby_global_symbols; RB_VM_LOCK_ENTER()
-#define GLOBAL_SYMBOLS_LEAVE()        RB_VM_LOCK_LEAVE()
+#define GLOBAL_SYMBOLS_LOCKING(symbols) \
+    for (rb_symbols_t *symbols = &ruby_global_symbols, **locking = &symbols; \
+         locking; \
+         locking = NULL) \
+        RB_VM_LOCKING()
 
 ID
 rb_id_attrset(ID id)
@@ -153,9 +173,22 @@ rb_id_attrset(ID id)
         }
     }
 
-    /* make new symbol and ID */
-    if (!(str = lookup_id_str(id))) {
-        static const char id_types[][8] = {
+    bool error = false;
+    GLOBAL_SYMBOLS_LOCKING(symbols) {
+        /* make new symbol and ID */
+        if ((str = lookup_id_str(id))) {
+            str = rb_str_dup(str);
+            rb_str_cat(str, "=", 1);
+            sym = lookup_str_sym(str);
+            id = sym ? rb_sym2id(sym) : intern_str(str, 1);
+        }
+        else {
+            error = true;
+        }
+    }
+
+    if (error) {
+        RBIMPL_ATTR_NONSTRING_ARRAY() static const char id_types[][8] = {
             "local",
             "instance",
             "invalid",
@@ -168,10 +201,7 @@ rb_id_attrset(ID id)
         rb_name_error(id, "cannot make anonymous %.*s ID %"PRIxVALUE" attrset",
                       (int)sizeof(id_types[0]), id_types[scope], (VALUE)id);
     }
-    str = rb_str_dup(str);
-    rb_str_cat(str, "=", 1);
-    sym = lookup_str_sym(str);
-    id = sym ? rb_sym2id(sym) : intern_str(str, 1);
+
     return id;
 }
 
@@ -225,10 +255,10 @@ rb_sym_constant_char_p(const char *name, long nlen, rb_encoding *enc)
     if (!MBCLEN_CHARFOUND_P(c)) return FALSE;
     len = MBCLEN_CHARFOUND_LEN(c);
     c = rb_enc_mbc_to_codepoint(name, end, enc);
+    if (rb_enc_isupper(c, enc)) return TRUE;
+    if (rb_enc_islower(c, enc)) return FALSE;
     if (ONIGENC_IS_UNICODE(enc)) {
         static int ctype_titlecase = 0;
-        if (rb_enc_isupper(c, enc)) return TRUE;
-        if (rb_enc_islower(c, enc)) return FALSE;
         if (!ctype_titlecase) {
             static const UChar cname[] = "titlecaseletter";
             static const UChar *const end = cname + sizeof(cname) - 1;
@@ -430,6 +460,9 @@ static void
 set_id_entry(rb_symbols_t *symbols, rb_id_serial_t num, VALUE str, VALUE sym)
 {
     ASSERT_vm_locking();
+    RUBY_ASSERT_BUILTIN_TYPE(str, T_STRING);
+    RUBY_ASSERT_BUILTIN_TYPE(sym, T_SYMBOL);
+
     size_t idx = num / ID_ENTRY_UNIT;
 
     VALUE ary, ids = symbols->ids;
@@ -447,8 +480,7 @@ get_id_serial_entry(rb_id_serial_t num, ID id, const enum id_entry_type t)
 {
     VALUE result = 0;
 
-    GLOBAL_SYMBOLS_ENTER(symbols);
-    {
+    GLOBAL_SYMBOLS_LOCKING(symbols) {
         if (num && num <= symbols->last_id) {
             size_t idx = num / ID_ENTRY_UNIT;
             VALUE ids = symbols->ids;
@@ -476,7 +508,19 @@ get_id_serial_entry(rb_id_serial_t num, ID id, const enum id_entry_type t)
             }
         }
     }
-    GLOBAL_SYMBOLS_LEAVE();
+
+    if (result) {
+        switch (t) {
+          case ID_ENTRY_STR:
+            RUBY_ASSERT_BUILTIN_TYPE(result, T_STRING);
+            break;
+          case ID_ENTRY_SYM:
+            RUBY_ASSERT_BUILTIN_TYPE(result, T_SYMBOL);
+            break;
+          default:
+            break;
+        }
+    }
 
     return result;
 }
@@ -531,6 +575,14 @@ register_sym(rb_symbols_t *symbols, VALUE str, VALUE sym)
     }
 }
 
+void
+rb_free_static_symid_str(void)
+{
+    GLOBAL_SYMBOLS_LOCKING(symbols) {
+        st_free_table(symbols->str_sym);
+    }
+}
+
 static void
 unregister_sym(rb_symbols_t *symbols, VALUE str, VALUE sym)
 {
@@ -560,22 +612,23 @@ register_static_symid_str(ID id, VALUE str)
 
     RUBY_DTRACE_CREATE_HOOK(SYMBOL, RSTRING_PTR(str));
 
-    GLOBAL_SYMBOLS_ENTER(symbols)
-    {
+    GLOBAL_SYMBOLS_LOCKING(symbols) {
         register_sym(symbols, str, sym);
         set_id_entry(symbols, num, str, sym);
     }
-    GLOBAL_SYMBOLS_LEAVE();
 
     return id;
 }
 
 static int
-sym_check_asciionly(VALUE str)
+sym_check_asciionly(VALUE str, bool fake_str)
 {
     if (!rb_enc_asciicompat(rb_enc_get(str))) return FALSE;
     switch (rb_enc_str_coderange(str)) {
       case ENC_CODERANGE_BROKEN:
+        if (fake_str) {
+            str = rb_enc_str_new(RSTRING_PTR(str), RSTRING_LEN(str), rb_enc_get(str));
+        }
         rb_raise(rb_eEncodingError, "invalid symbol in encoding %s :%+"PRIsVALUE,
                  rb_enc_name(rb_enc_get(str)), str);
       case ENC_CODERANGE_7BIT:
@@ -617,22 +670,23 @@ dsymbol_alloc(rb_symbols_t *symbols, const VALUE klass, const VALUE str, rb_enco
 {
     ASSERT_vm_locking();
 
-    const VALUE dsym = rb_newobj_of(klass, T_SYMBOL | FL_WB_PROTECTED);
+    NEWOBJ_OF(obj, struct RSymbol, klass, T_SYMBOL | FL_WB_PROTECTED, sizeof(struct RSymbol), 0);
+
     long hashval;
 
-    rb_enc_set_index(dsym, rb_enc_to_index(enc));
-    OBJ_FREEZE(dsym);
-    RB_OBJ_WRITE(dsym, &RSYMBOL(dsym)->fstr, str);
-    RSYMBOL(dsym)->id = type;
+    rb_enc_set_index((VALUE)obj, rb_enc_to_index(enc));
+    OBJ_FREEZE((VALUE)obj);
+    RB_OBJ_WRITE((VALUE)obj, &obj->fstr, str);
+    obj->id = type;
 
     /* we want hashval to be in Fixnum range [ruby-core:15713] r15672 */
     hashval = (long)rb_str_hash(str);
-    RSYMBOL(dsym)->hashval = RSHIFT((long)hashval, 1);
-    register_sym(symbols, str, dsym);
+    obj->hashval = RSHIFT((long)hashval, 1);
+    register_sym(symbols, str, (VALUE)obj);
     rb_hash_aset(symbols->dsymbol_fstr_hash, str, Qtrue);
-    RUBY_DTRACE_CREATE_HOOK(SYMBOL, RSTRING_PTR(RSYMBOL(dsym)->fstr));
+    RUBY_DTRACE_CREATE_HOOK(SYMBOL, RSTRING_PTR(obj->fstr));
 
-    return dsym;
+    return (VALUE)obj;
 }
 
 static inline VALUE
@@ -658,11 +712,9 @@ lookup_str_id(VALUE str)
     st_data_t sym_data;
     int found;
 
-    GLOBAL_SYMBOLS_ENTER(symbols);
-    {
+    GLOBAL_SYMBOLS_LOCKING(symbols) {
         found = st_lookup(symbols->str_sym, (st_data_t)str, &sym_data);
     }
-    GLOBAL_SYMBOLS_LEAVE();
 
     if (found) {
         const VALUE sym = (VALUE)sym_data;
@@ -703,11 +755,9 @@ lookup_str_sym(const VALUE str)
 {
     VALUE sym;
 
-    GLOBAL_SYMBOLS_ENTER(symbols);
-    {
+    GLOBAL_SYMBOLS_LOCKING(symbols) {
         sym = lookup_str_sym_with_lock(symbols, str);
     }
-    GLOBAL_SYMBOLS_LEAVE();
 
     return sym;
 }
@@ -725,10 +775,20 @@ rb_intern3(const char *name, long len, rb_encoding *enc)
     struct RString fake_str;
     VALUE str = rb_setup_fake_str(&fake_str, name, len, enc);
     OBJ_FREEZE(str);
-    sym = lookup_str_sym(str);
-    if (sym) return rb_sym2id(sym);
-    str = rb_enc_str_new(name, len, enc); /* make true string */
-    return intern_str(str, 1);
+    ID id;
+
+    GLOBAL_SYMBOLS_LOCKING(symbols) {
+        sym = lookup_str_sym(str);
+        if (sym) {
+            id = rb_sym2id(sym);
+        }
+        else {
+            str = rb_enc_str_new(name, len, enc); /* make true string */
+            id = intern_str(str, 1);
+        }
+    }
+
+    return id;
 }
 
 static ID
@@ -752,23 +812,23 @@ static ID
 next_id_base(void)
 {
     ID id;
-    GLOBAL_SYMBOLS_ENTER(symbols);
-    {
+    GLOBAL_SYMBOLS_LOCKING(symbols) {
         id = next_id_base_with_lock(symbols);
     }
-    GLOBAL_SYMBOLS_LEAVE();
     return id;
 }
 
 static ID
 intern_str(VALUE str, int mutable)
 {
+    ASSERT_vm_locking();
+
     ID id;
     ID nid;
 
     id = rb_str_symname_type(str, IDSET_ATTRSET_FOR_INTERN);
     if (id == (ID)-1) id = ID_JUNK;
-    if (sym_check_asciionly(str)) {
+    if (sym_check_asciionly(str, false)) {
         if (!mutable) str = rb_str_dup(str);
         rb_enc_associate(str, rb_usascii_encoding());
     }
@@ -798,13 +858,18 @@ rb_intern(const char *name)
 ID
 rb_intern_str(VALUE str)
 {
-    VALUE sym = lookup_str_sym(str);
-
-    if (sym) {
-        return SYM2ID(sym);
+    ID id;
+    GLOBAL_SYMBOLS_LOCKING(symbols) {
+        VALUE sym = lookup_str_sym(str);
+        if (sym) {
+            id = SYM2ID(sym);
+        }
+        else {
+            id = intern_str(str, 0);
+        }
     }
 
-    return intern_str(str, 0);
+    return id;
 }
 
 void
@@ -815,12 +880,10 @@ rb_gc_free_dsymbol(VALUE sym)
     if (str) {
         RSYMBOL(sym)->fstr = 0;
 
-        GLOBAL_SYMBOLS_ENTER(symbols);
-        {
+        GLOBAL_SYMBOLS_LOCKING(symbols) {
             unregister_sym(symbols, str, sym);
             rb_hash_delete_entry(symbols->dsymbol_fstr_hash, str);
         }
-        GLOBAL_SYMBOLS_LEAVE();
     }
 }
 
@@ -829,7 +892,7 @@ rb_gc_free_dsymbol(VALUE sym)
  *     str.intern   -> symbol
  *     str.to_sym   -> symbol
  *
- *  Returns the Symbol corresponding to <i>str</i>, creating the
+ *  Returns the +Symbol+ corresponding to <i>str</i>, creating the
  *  symbol if it did not previously exist. See Symbol#id2name.
  *
  *     "Koala".intern         #=> :Koala
@@ -847,10 +910,9 @@ rb_gc_free_dsymbol(VALUE sym)
 VALUE
 rb_str_intern(VALUE str)
 {
-    VALUE sym;
+    VALUE sym = 0;
 
-    GLOBAL_SYMBOLS_ENTER(symbols);
-    {
+    GLOBAL_SYMBOLS_LOCKING(symbols) {
         sym = lookup_str_sym_with_lock(symbols, str);
 
         if (sym) {
@@ -859,7 +921,7 @@ rb_str_intern(VALUE str)
         else if (USE_SYMBOL_GC) {
             rb_encoding *enc = rb_enc_get(str);
             rb_encoding *ascii = rb_usascii_encoding();
-            if (enc != ascii && sym_check_asciionly(str)) {
+            if (enc != ascii && sym_check_asciionly(str, false)) {
                 str = rb_str_dup(str);
                 rb_enc_associate(str, ascii);
                 OBJ_FREEZE(str);
@@ -879,21 +941,19 @@ rb_str_intern(VALUE str)
             sym = ID2SYM(id);
         }
     }
-    GLOBAL_SYMBOLS_LEAVE();
     return sym;
 }
 
 ID
 rb_sym2id(VALUE sym)
 {
-    ID id;
+    ID id = 0;
     if (STATIC_SYM_P(sym)) {
         id = STATIC_SYM2ID(sym);
     }
     else if (DYNAMIC_SYM_P(sym)) {
-        GLOBAL_SYMBOLS_ENTER(symbols);
-        {
-            sym = dsymbol_check(symbols, sym);
+        GLOBAL_SYMBOLS_LOCKING(symbols) {
+            RUBY_ASSERT(!rb_objspace_garbage_object_p(sym));
             id = RSYMBOL(sym)->id;
 
             if (UNLIKELY(!(id & ~ID_SCOPE_MASK))) {
@@ -907,7 +967,6 @@ rb_sym2id(VALUE sym)
                 rb_hash_delete_entry(symbols->dsymbol_fstr_hash, fstr);
             }
         }
-        GLOBAL_SYMBOLS_LEAVE();
     }
     else {
         rb_raise(rb_eTypeError, "wrong argument type %s (expected Symbol)",
@@ -939,12 +998,17 @@ rb_id2sym(ID x)
 VALUE
 rb_sym2str(VALUE sym)
 {
+    VALUE str;
     if (DYNAMIC_SYM_P(sym)) {
-        return RSYMBOL(sym)->fstr;
+        str = RSYMBOL(sym)->fstr;
+        RUBY_ASSERT_BUILTIN_TYPE(str, T_STRING);
     }
     else {
-        return rb_id2str(STATIC_SYM2ID(sym));
+        str = rb_id2str(STATIC_SYM2ID(sym));
+        if (str) RUBY_ASSERT_BUILTIN_TYPE(str, T_STRING);
     }
+
+    return str;
 }
 
 VALUE
@@ -1008,12 +1072,10 @@ rb_sym_all_symbols(void)
 {
     VALUE ary;
 
-    GLOBAL_SYMBOLS_ENTER(symbols);
-    {
+    GLOBAL_SYMBOLS_LOCKING(symbols) {
         ary = rb_ary_new2(symbols->str_sym->num_entries);
         st_foreach(symbols->str_sym, symbols_i, ary);
     }
-    GLOBAL_SYMBOLS_LEAVE();
 
     return ary;
 }
@@ -1106,7 +1168,7 @@ rb_check_id(volatile VALUE *namep)
         *namep = name;
     }
 
-    sym_check_asciionly(name);
+    sym_check_asciionly(name, false);
 
     return lookup_str_id(name);
 }
@@ -1126,10 +1188,12 @@ rb_get_symbol_id(VALUE name)
             return 0;
         }
     }
-    else {
-        RUBY_ASSERT_ALWAYS(RB_TYPE_P(name, T_STRING));
+    else if (RB_TYPE_P(name, T_STRING)) {
         return lookup_str_id(name);
     }
+    else {
+        return 0;
+    }
 }
 
 
@@ -1144,15 +1208,7 @@ rb_check_symbol(volatile VALUE *namep)
         return name;
     }
     else if (DYNAMIC_SYM_P(name)) {
-        if (!SYMBOL_PINNED_P(name)) {
-            GLOBAL_SYMBOLS_ENTER(symbols);
-            {
-                name = dsymbol_check(symbols, name);
-            }
-            GLOBAL_SYMBOLS_LEAVE();
-
-            *namep = name;
-        }
+        RUBY_ASSERT(!rb_objspace_garbage_object_p(name));
         return name;
     }
     else if (!RB_TYPE_P(name, T_STRING)) {
@@ -1165,7 +1221,7 @@ rb_check_symbol(volatile VALUE *namep)
         *namep = name;
     }
 
-    sym_check_asciionly(name);
+    sym_check_asciionly(name, false);
 
     if ((sym = lookup_str_sym(name)) != 0) {
         return sym;
@@ -1180,7 +1236,7 @@ rb_check_id_cstr(const char *ptr, long len, rb_encoding *enc)
     struct RString fake_str;
     const VALUE name = rb_setup_fake_str(&fake_str, ptr, len, enc);
 
-    sym_check_asciionly(name);
+    sym_check_asciionly(name, true);
 
     return lookup_str_id(name);
 }
@@ -1192,7 +1248,7 @@ rb_check_symbol_cstr(const char *ptr, long len, rb_encoding *enc)
     struct RString fake_str;
     const VALUE name = rb_setup_fake_str(&fake_str, ptr, len, enc);
 
-    sym_check_asciionly(name);
+    sym_check_asciionly(name, true);
 
     if ((sym = lookup_str_sym(name)) != 0) {
         return sym;
diff --git a/symbol.h b/symbol.h
index a8256515d89dd6..6b51868961e7de 100644
--- a/symbol.h
+++ b/symbol.h
@@ -100,7 +100,12 @@ sym_type(VALUE sym)
 #define is_class_sym(sym) (sym_type(sym)==ID_CLASS)
 #define is_junk_sym(sym) (sym_type(sym)==ID_JUNK)
 
-RUBY_FUNC_EXPORTED const uint_least32_t ruby_global_name_punct_bits[(0x7e - 0x20 + 31) / 32];
+#ifndef RIPPER
+RUBY_FUNC_EXPORTED
+#else
+RUBY_EXTERN
+#endif
+const uint_least32_t ruby_global_name_punct_bits[(0x7e - 0x20 + 31) / 32];
 
 static inline int
 is_global_name_punct(const int c)
@@ -109,10 +114,9 @@ is_global_name_punct(const int c)
     return (ruby_global_name_punct_bits[(c - 0x20) / 32] >> (c % 32)) & 1;
 }
 
-int rb_enc_symname_type(const char *name, long len, rb_encoding *enc, unsigned int allowed_attrset);
-
 RUBY_SYMBOL_EXPORT_BEGIN
 
+int rb_enc_symname_type(const char *name, long len, rb_encoding *enc, unsigned int allowed_attrset);
 size_t rb_sym_immortal_count(void);
 
 RUBY_SYMBOL_EXPORT_END
diff --git a/symbol.rb b/symbol.rb
index f31bf0bee3ae49..458d02b177e8f3 100644
--- a/symbol.rb
+++ b/symbol.rb
@@ -1,4 +1,33 @@
 class Symbol
+  # call-seq:
+  #   to_s -> string
+  #
+  # Returns a string representation of +self+ (not including the leading colon):
+  #
+  #   :foo.to_s # => "foo"
+  #
+  # Related: Symbol#inspect, Symbol#name.
+  def to_s
+    Primitive.attr! :leaf
+    Primitive.cexpr! 'rb_sym_to_s(self)'
+  end
+
+  alias id2name to_s
+
+  # call-seq:
+  #   name -> string
+  #
+  # Returns a frozen string representation of +self+ (not including the leading colon):
+  #
+  #   :foo.name         # => "foo"
+  #   :foo.name.frozen? # => true
+  #
+  # Related: Symbol#to_s, Symbol#inspect.
+  def name
+    Primitive.attr! :leaf
+    Primitive.cexpr! 'rb_sym2str(self)'
+  end
+
   # call-seq:
   #   to_sym -> self
   #
diff --git a/template/Doxyfile.tmpl b/template/Doxyfile.tmpl
index c801e0e79bb4db..cea28d04c7d278 100644
--- a/template/Doxyfile.tmpl
+++ b/template/Doxyfile.tmpl
@@ -621,7 +621,7 @@ HIDE_FRIEND_COMPOUNDS  = NO
 HIDE_IN_BODY_DOCS      = YES
 
 # The INTERNAL_DOCS tag determines if documentation that is typed after a
-# \internal command is included. If the tag is set to NO then the documentation
+# @internal command is included. If the tag is set to NO then the documentation
 # will be excluded. Set it to YES to include the internal documentation.
 # The default value is: NO.
 
@@ -2359,10 +2359,6 @@ PREDEFINED            += DEPRECATED(_)=_
 PREDEFINED            += DEPRECATED_BY(__,_)=_
 PREDEFINED            += ENUM_OVER_INT=1
 PREDEFINED            += ERRORFUNC(__,_)=_
-PREDEFINED            += RJIT_FUNC_EXPORTED=
-PREDEFINED            += RJIT_STATIC=extern
-PREDEFINED            += RJIT_SYMBOL_EXPORT_BEGIN=
-PREDEFINED            += RJIT_SYMBOL_EXPORT_END=
 PREDEFINED            += NOINLINE(_)=_
 PREDEFINED            += NORETURN(_)=_
 PREDEFINED            += PACKED_STRUCT_UNALIGNED(_)=_
diff --git a/template/GNUmakefile.in b/template/GNUmakefile.in
index 0c7f4e9dd0da46..22ff1078dcbbb6 100644
--- a/template/GNUmakefile.in
+++ b/template/GNUmakefile.in
@@ -1,10 +1,14 @@
 gnumake = yes
 
+ifneq ($(filter notintermediate,$(.FEATURES)),)
+DOT_WAIT = .WAIT
+endif
+
 ifeq ($(filter Makefile,$(MAKEFILE_LIST)),)
 include Makefile
+endif
 
 GNUmakefile: $(srcdir)/template/GNUmakefile.in
-endif
 
 override silence := $(if $(findstring s,$(firstword $(MFLAGS))),yes,no)
 
@@ -14,10 +18,6 @@ endif
 
 override order_only := |
 
-ifneq ($(filter notintermediate,$(.FEATURES)),)
-DOT_WAIT = .WAIT
-endif
-
 # Needs the dependency when any Unicode tables data files exist.
 override UNICODE_TABLES_DEPENDENTS = \
 	$(if $(or \
@@ -29,5 +29,3 @@ override UNICODE_TABLES_DEPENDENTS = \
 
 -include uncommon.mk
 include $(srcdir)/defs/gmake.mk
-
-GNUmakefile: $(srcdir)/template/GNUmakefile.in
diff --git a/template/Makefile.in b/template/Makefile.in
index 893581c4571abd..96c8d8031bcea0 100644
--- a/template/Makefile.in
+++ b/template/Makefile.in
@@ -29,7 +29,7 @@ CPP = @CPP@
 LD = @LD@
 RUSTC = @RUSTC@
 CARGO = @CARGO@
-YACC = $(BASERUBY) $(tooldir)/lrama/exe/lrama
+LRAMA = $(BASERUBY) $(tooldir)/lrama/exe/lrama
 PURIFY =
 AUTOCONF = autoconf
 CONFIGURE = @CONFIGURE@
@@ -65,6 +65,10 @@ rubyarchhdrdir = @rubyarchhdrdir@
 ruby_version = @ruby_version@
 RUBY_VERSION_NAME = @RUBY_VERSION_NAME@
 UNIVERSAL_ARCHNAMES = @UNIVERSAL_ARCHNAMES@
+BUILTIN_BINARY = @X_BUILTIN_BINARY@
+
+BUILTIN_GC = default
+modular_gc_dir = @modular_gc_dir@
 
 TESTUI = console
 TESTS =
@@ -73,7 +77,8 @@ DOCTARGETS = @RDOCTARGET@ @CAPITARGET@
 
 EXTOUT = @EXTOUT@
 TIMESTAMPDIR  = $(EXTOUT)/.timestamp
-arch_hdrdir = $(EXTOUT)/include/$(arch)
+ext_hdrdir = $(EXTOUT)/include
+arch_hdrdir = $(ext_hdrdir)/$(arch)
 VPATH = $(arch_hdrdir)/ruby:$(hdrdir)/ruby:$(srcdir):$(srcdir)/missing
 
 empty =
@@ -88,21 +93,28 @@ cflags = @cflags@
 optflags = @optflags@
 debugflags = @debugflags@
 warnflags = @warnflags@ @strict_warnflags@
+hardenflags = @hardenflags@
 cppflags = @cppflags@
+incflags = @incflags@
 RUBY_DEVEL = @RUBY_DEVEL@ # "yes" or empty
 _RUBY_DEVEL_enabled = $(RUBY_DEVEL:no=)
-XCFLAGS = @XCFLAGS@ $(INCFLAGS) $(_RUBY_DEVEL_enabled:yes=-DRUBY_DEVEL=1)
+XCFLAGS = @XCFLAGS@ $(INCFLAGS) $(_RUBY_DEVEL_enabled:yes=-DRUBY_DEVEL=1) -Dmodular_gc_dir="$(modular_gc_dir)"
 USE_RUBYGEMS = @USE_RUBYGEMS@
 USE_RUBYGEMS_ = $(USE_RUBYGEMS:yes=)
 CPPFLAGS = @CPPFLAGS@ $(USE_RUBYGEMS_:no=-DDISABLE_RUBYGEMS=1)
-RJIT_SUPPORT = @RJIT_SUPPORT@
+TOP_BUILD_DIR=@abs_top_builddir@
+JIT_OBJ=@JIT_OBJ@
 YJIT_SUPPORT=@YJIT_SUPPORT@
 YJIT_LIBS=@YJIT_LIBS@
 YJIT_OBJ=@YJIT_OBJ@
-YJIT_LIBOBJ = $(YJIT_LIBS:.a=.@OBJEXT@)
-CARGO_TARGET_DIR=@abs_top_builddir@/yjit/target
-YARP_BUILD_DIR=@abs_top_builddir@/yarp
+ZJIT_SUPPORT=@ZJIT_SUPPORT@
+ZJIT_LIBS=@ZJIT_LIBS@
+ZJIT_OBJ=@ZJIT_OBJ@
+JIT_CARGO_SUPPORT=@JIT_CARGO_SUPPORT@
+CARGO_TARGET_DIR=@abs_top_builddir@/target
 CARGO_BUILD_ARGS=@CARGO_BUILD_ARGS@
+RUST_LIB=@RUST_LIB@
+RUST_LIBOBJ = $(RUST_LIB:.a=.@OBJEXT@)
 LDFLAGS = @STATIC@ $(CFLAGS) @LDFLAGS@
 EXE_LDFLAGS = $(LDFLAGS)
 EXTLDFLAGS = @EXTLDFLAGS@
@@ -127,6 +139,9 @@ BUILTIN_TRANSSRCS = @BUILTIN_TRANSSRCS@
 BUILTIN_TRANSOBJS = @BUILTIN_TRANSOBJS@
 POSTLINK = @POSTLINK@
 
+LIBPATHENV = @LIBPATHENV@
+PRELOADENV = @PRELOADENV@
+
 RUBY_BASE_NAME=@RUBY_BASE_NAME@
 RUBY_API_VERSION=@RUBY_API_VERSION@
 RUBY_INSTALL_NAME=@RUBY_INSTALL_NAME@
@@ -194,7 +209,8 @@ DTRACE_DEPENDENT_OBJS = array.$(OBJEXT) \
 			string.$(OBJEXT) \
 			symbol.$(OBJEXT) \
 			vm.$(OBJEXT) \
-			$(YJIT_OBJ)
+			$(YJIT_OBJ) \
+			$(ZJIT_OBJ)
 
 THREAD_MODEL  = @THREAD_MODEL@
 
@@ -220,7 +236,6 @@ AR            = @AR@
 ARFLAGS       = @ARFLAGS@$(empty)
 RANLIB        = @RANLIB@
 AS            = @AS@
-ASFLAGS       = @ASFLAGS@ $(ARCH_FLAG) $(INCFLAGS)
 IFCHANGE      = $(SHELL) $(tooldir)/ifchange
 OBJDUMP       = @OBJDUMP@
 OBJCOPY       = @OBJCOPY@
@@ -245,7 +260,6 @@ INSTALLED_LIST= .installed.list
 
 NEWLINE_C     = enc/trans/newline.c
 MINIPRELUDE_C = miniprelude.c
-GOLF_PRELUDE_C= golf_prelude.c
 RBCONFIG      = .rbconfig.time
 
 MAINSRC = $(MAINOBJ:.$(OBJEXT)=.c)
@@ -265,6 +279,8 @@ ACTIONS_ENDGROUP = @$(NULLCMD)
 
 DESTDIR       = @DESTDIR@
 
+cleanlibs = @cleanlibs@
+
 configure_args = @configure_args@
 #### End of variables
 
@@ -292,7 +308,7 @@ miniruby$(EXEEXT):
 $(PROGRAM):
 		@$(RM) $@
 		$(ECHO) linking $@
-		$(Q) $(PURIFY) $(CC) $(EXE_LDFLAGS) $(XLDFLAGS) $(MAINOBJ) $(EXTOBJS) $(LIBRUBYARG) $(EXTLIBS) $(OUTFLAG)$@
+		$(Q) $(PURIFY) $(CC) $(EXE_LDFLAGS) $(XLDFLAGS) $(MAINOBJ) $(EXTOBJS) $(LIBRUBYARG) $(MAINLIBS) $(EXTLIBS) $(OUTFLAG)$@
 		$(Q) $(POSTLINK)
 
 $(PROGRAM): @XRUBY_LIBPATHENV_WRAPPER@
@@ -302,8 +318,6 @@ PRE_LIBRUBY_UPDATE = [ -n "$(LIBRUBY_SO_UPDATE)" ] || $(gnumake:yes=exec) $(RM)
 # We must `rm' the library each time this rule is invoked because "updating" a
 # MAB library on Apple/NeXT (see --enable-fat-binary in configure) is not
 # supported.
-#
-# In YJIT builds, merge libyjit.a with libruby_static.a
 $(LIBRUBY_A):
 		@$(RM) $@
 		@-[ -z "$(EXTSTATIC)" ] || $(PRE_LIBRUBY_UPDATE)
@@ -340,6 +354,12 @@ $(ruby_pc): config.status Makefile
 	$(Q)pkg_config=${PKG_CONFIG} && PKG_CONFIG_PATH=. $${pkg_config:-:} --print-errors ruby.tmp
 	$(Q)$(MV) -f ruby.tmp.pc $(ruby_pc)
 
+modular-gc-precheck:
+	$(Q) if test -z $(modular_gc_dir); then \
+	    echo "You must configure with --with-modular-gc to use modular GC"; \
+	    exit 1; \
+	fi
+
 pre-install-local:: pkgconfig-data
 
 ruby-runner.h: template/ruby-runner.h.in config.status
@@ -352,7 +372,7 @@ install-cross: $(arch)-fake.rb $(RBCONFIG) rbconfig.rb $(arch_hdrdir)/ruby/confi
 	$(Q) sed '/^\$$:\.unshift/q' $(arch)-fake.rb > fake.rb
 	$(Q) $(BASERUBY) -p \
 	-e '~/^\s*CONFIG\["LDFLAGS"\]/ and' \
-	-e '$$_[/(?=\s*"$$)/] = %q[ #{(CONFIG["LIBPATHFLAG"]%File.dirname(__FILE__)).strip}]' \
+	-e '$$_[/(?=\s*"$$)/] = %q[ #{CONFIG["LIBPATHFLAG"]%File.dirname(__FILE__)}]' \
 	rbconfig.rb > fake-rbconfig.rb
 	$(INSTALL_SCRIPT) fake.rb $(XRUBY_RUBYLIBDIR)/$(arch)/fake.rb
 	$(INSTALL_SCRIPT) fake-rbconfig.rb $(XRUBY_RUBYLIBDIR)/$(arch)/rbconfig.rb
@@ -412,7 +432,7 @@ lex.c: defs/keywords
 	  $(CP) $(srcdir)/lex.c.blt $@; \
 	else \
 	  [ $(Q) ] && echo generating $@ || set -x; \
-	  gperf -C -P -p -j1 -i 1 -g -o -t -N rb_reserved_word -k1,3,$$ $? \
+	  gperf -C -L ANSI-C -P -p -j1 -i 1 -g -o -t -N rb_reserved_word -k1,3,$$ $? \
 	  | sed -f $(tooldir)/gperf.sed \
 	  > $@.tmp && \
 	  $(MV) $@.tmp $@ && \
@@ -420,7 +440,7 @@ lex.c: defs/keywords
 	  $(CP) $@ $(srcdir)/lex.c.blt; \
 	fi
 
-JIS_PROPS_OPTIONS = -k1,3 -7 -c -j1 -i1 -t -C -P -t --ignore-case -H onig_jis_property_hash -Q onig_jis_property_pool -N onig_jis_property
+JIS_PROPS_OPTIONS =  -L ANSI-C -k1,3 -7 -c -j1 -i1 -t -C -P -t --ignore-case -H onig_jis_property_hash -Q onig_jis_property_pool -N onig_jis_property
 
 $(srcdir)/enc/jis/props.h: enc/jis/props.kwd
 	$(MAKEDIRS) $(@D)
@@ -436,13 +456,19 @@ $(srcdir)/enc/jis/props.h: enc/jis/props.kwd
 	  $(CP) $@ $(?:.kwd=.h.blt); \
 	fi
 
+gc_impl.$(OBJEXT): gc/$(BUILTIN_GC).c probes.h
+	@$(ECHO) compiling $(srcdir)/gc/$(BUILTIN_GC).c
+	$(Q) $(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) $(COUTFLAG)$@ -c $(srcdir)/gc/$(BUILTIN_GC).c
+
 .c.$(OBJEXT):
 	@$(ECHO) compiling $<
 	$(Q) $(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) $(COUTFLAG)$@ -c $<
 
+PREFIXED_SYMBOL = name
+_PREFIXED_SYMBOL = TOKEN_PASTE($(SYMBOL_PREFIX),name)
 .$(ASMEXT).$(OBJEXT):
 	@$(ECHO) assembling $<
-	$(Q) $(CC) $(ASFLAGS) -DSYMBOL_PREFIX=$(SYMBOL_PREFIX) -o $@ -c $<
+	$(Q) $(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) $(COUTFLAG)$@ "-DPREFIXED_SYMBOL(name)=$($(SYMBOL_PREFIX)PREFIXED_SYMBOL)" -c $<
 
 .c.$(ASMEXT):
 	@$(ECHO) translating $<
@@ -454,7 +480,7 @@ $(srcdir)/enc/jis/props.h: enc/jis/props.kwd
 
 .d.h:
 	@$(ECHO) translating probes $<
-	$(Q) $(DTRACE) -o $@.tmp -h -C $(INCFLAGS) -s $<
+	$(Q) $(DTRACE) -o $@.tmp -h -C $(INCFLAGS) $(CPPFLAGS) -s $<
 	$(Q) sed -e 's/RUBY_/RUBY_DTRACE_/g' -e 's/PROBES_H_TMP/RUBY_PROBES_H/' -e 's/(char \*/(const char */g' -e 's/, char \*/, const char */g' $@.tmp > $@
 	$(Q) $(RM) $@.tmp
 
@@ -472,8 +498,9 @@ probes.stamp: $(DTRACE_REBUILD_OBJS)
 
 probes.$(OBJEXT): $(srcdir)/probes.d $(DTRACE_REBUILD:yes=probes.stamp)
 	@$(ECHO) processing probes in object files
-	$(Q) $(RM) $@
-	$(Q) $(DTRACE) -G -C $(INCFLAGS) -s $(srcdir)/probes.d -o $@ $(DTRACE_REBUILD_OBJS)
+	@# n.b. the dtrace script looks at the $CFLAGS environment variable to decide
+	@# how to assemble probes.o; so we need to actually _export_ $(CFLAGS)
+	$(Q) CC="$(CC)" CFLAGS="$(CFLAGS) $(XCFLAGS) $(CPPFLAGS)" $(DTRACE) -G -C $(INCFLAGS) -s $(srcdir)/probes.d -o $@ $(DTRACE_REBUILD_OBJS)
 
 # DTrace static library hacks described here:
 # https://marc.info/?l=opensolaris-dtrace-discuss&m=114761203110734&w=4
@@ -487,8 +514,8 @@ clean-local::
 	  enc/encinit.c enc/encinit.$(OBJEXT) $(pkgconfig_DATA) \
 	  ruby-runner.$(OBJEXT) ruby-runner.h \
 	|| $(NULLCMD)
-	$(Q)find . \( -name '*.bc' -o -name '*.[is]' \) -delete
-	-$(Q)$(RMALL) exe/ *.dSYM
+	$(Q)find . ! -type d \( -name '*.bc' -o -name '*.[is]' \) -exec rm -f {} + || true
+
 
 distclean-local::
 	$(Q)$(RM) \
@@ -511,9 +538,9 @@ ext/realclean:: ext/realclean.sub
 .bundle/distclean:: .bundle/distclean.sub
 .bundle/realclean:: .bundle/realclean.sub
 
-ext/clean.sub .bundle/clean.sub:: ext/clean.mk
-ext/distclean.sub .bundle/distclean.sub:: ext/distclean.mk
-ext/realclean.sub .bundle/realclean.sub:: ext/realclean.mk
+.bundle/clean.sub:: ext/clean.mk
+.bundle/distclean.sub:: ext/distclean.mk
+.bundle/realclean.sub:: ext/realclean.mk
 
 ext/clean.sub ext/distclean.sub ext/realclean.sub \
 .bundle/clean.sub .bundle/distclean.sub .bundle/realclean.sub::
@@ -539,6 +566,15 @@ ext/distclean ext/realclean .bundle/distclean .bundle/realclean::
 	find "$$@" -type d -empty -exec $(RMDIRS) {} + 2> /dev/null || true
 	$(Q) $(RMDIRS) $(@D) 2> /dev/null || true
 
+.bundle/realclean::
+	@$(RMALL) $(tooldir)/bunlder/*.lock $(srcdir)/.bundle
+
+gc/clean gc/distclean gc/realclean::
+	- $(CHDIR) gc 2> /dev/null && for gc in */; do ($(CHDIR) $$gc && exec $(MAKE) TARGET_SO_DIR=./ $(@F)); done || $(NULLCMD)
+
+gc/distclean gc/realclean::
+	- $(CHDIR) gc 2> /dev/null && for gc in */; do $(RMDIR) $$gc; done || $(NULLCMD)
+
 clean-enc distclean-enc realclean-enc:
 	@test -f "$(ENC_MK)" || exit 0; \
 	echo $(@:-enc=ing) encodings; \
@@ -571,7 +607,16 @@ update-benchmark-driver:
 		$(BENCHMARK_DRIVER_GIT_URL) benchmark-driver $(GIT_OPTS)
 
 update-known-errors:
-	errno --list | cut -d' ' -f1 | sort -u - $(srcdir)/defs/known_errors.def | \
+	errno --list | \
+	$(BASERUBY) -nl -e 'BEGIN {errs = {}}' \
+	-e '/^(E[A-Z_0-9]+)(?: +(?:\d+ +)?(.+))?/ =~ $$_ && errs[$$1] ||= $$2' \
+	-e 'END {' \
+	-e   'errs.delete("ELAST")' \
+	-e   'errs = errs.sort' \
+	-e   'errs << ["ELAST", "Largest errno"]' \
+	-e   'errs.each {|e,d| puts sprintf("%-15s %s", e, d).strip}' \
+	-e '}' \
+	$(srcdir)/defs/known_errors.def - | \
 	$(IFCHANGE) $(srcdir)/defs/known_errors.def -
 
 INSNS	= optinsn.inc optunifs.inc insns.inc insns_info.inc \
@@ -596,6 +641,7 @@ $(INSNS): $(srcdir)/insns.def vm_opts.h \
 	  $(tooldir)/ruby_vm/models/operands_unifications.rb \
 	  $(tooldir)/ruby_vm/models/trace_instructions.rb \
 	  $(tooldir)/ruby_vm/models/typemap.rb \
+	  $(tooldir)/ruby_vm/models/zjit_instructions.rb \
 	  $(tooldir)/ruby_vm/scripts/converter.rb \
 	  $(tooldir)/ruby_vm/scripts/insns2vm.rb \
 	  $(tooldir)/ruby_vm/views/_attributes.erb \
@@ -606,12 +652,12 @@ $(INSNS): $(srcdir)/insns.def vm_opts.h \
 	  $(tooldir)/ruby_vm/views/_insn_len_info.erb \
 	  $(tooldir)/ruby_vm/views/_insn_name_info.erb \
 	  $(tooldir)/ruby_vm/views/_insn_operand_info.erb \
-	  $(tooldir)/ruby_vm/views/_insn_sp_pc_dependency.erb \
 	  $(tooldir)/ruby_vm/views/_insn_type_chars.erb \
 	  $(tooldir)/ruby_vm/views/_leaf_helpers.erb \
 	  $(tooldir)/ruby_vm/views/_notice.erb \
 	  $(tooldir)/ruby_vm/views/_sp_inc_helpers.erb \
 	  $(tooldir)/ruby_vm/views/_trace_instruction.erb \
+	  $(tooldir)/ruby_vm/views/_zjit_instruction.erb \
 	  $(tooldir)/ruby_vm/views/insns.inc.erb \
 	  $(tooldir)/ruby_vm/views/insns_info.inc.erb \
 	  $(tooldir)/ruby_vm/views/optinsn.inc.erb \
@@ -639,6 +685,37 @@ yes-test-leaked-globals: yes-test-leaked-globals-precheck
 	$(ACTIONS_GROUP)
 	$(Q) $(XRUBY) $(tooldir)/leaked-globals \
 	  SOEXT=$(SOEXT) NM="$(NM) -Pgp" SYMBOL_PREFIX=$(SYMBOL_PREFIX) \
+	  SYMBOLS_IN_EMPTYLIB="@XSYMBOLS_IN_EMPTYLIB@" \
+	  EXTSTATIC="$(EXTSTATIC)" \
 	  PLATFORM=$(hdrdir)/ruby/$(PLATFORM_DIR).h $(srcdir)/configure.ac \
 	  $(COMMONOBJS) $(LIBRUBY_FOR_LEAKED_GLOBALS:yes=$(LIBRUBY_SO))
 	$(ACTIONS_ENDGROUP)
+
+test-syntax-suggest-precheck: $(TEST_RUNNABLE)-test-syntax-suggest-precheck
+no-test-syntax-suggest-precheck:
+yes-test-syntax-suggest-precheck: main
+
+test-syntax-suggest-prepare: $(TEST_RUNNABLE)-test-syntax-suggest-prepare
+no-test-syntax-suggest-prepare: no-test-syntax-suggest-precheck
+yes-test-syntax-suggest-prepare: yes-test-syntax-suggest-precheck
+	$(ACTIONS_GROUP)
+	$(XRUBY) -C "$(srcdir)" bin/gem install --no-document \
+		--install-dir .bundle --conservative "rspec:~> 3"
+	$(ACTIONS_ENDGROUP)
+
+RSPECOPTS =
+SYNTAX_SUGGEST_SPECS =
+PREPARE_SYNTAX_SUGGEST = $(TEST_RUNNABLE)-test-syntax-suggest-prepare
+test-syntax-suggest: $(TEST_RUNNABLE)-test-syntax-suggest
+yes-test-syntax-suggest: $(PREPARE_SYNTAX_SUGGEST)
+	$(ACTIONS_GROUP)
+	$(XRUBY) -C $(srcdir) -Ispec/syntax_suggest:spec/lib .bundle/bin/rspec \
+		--require rspec/expectations \
+		--require spec_helper --require formatter_overrides --require spec_coverage \
+		$(RSPECOPTS) spec/syntax_suggest/$(SYNTAX_SUGGEST_SPECS)
+	$(ACTIONS_ENDGROUP)
+no-test-syntax-suggest:
+
+yesterday:
+	$(GIT) -C $(srcdir) reset --hard \
+	    `$(GIT) -C $(srcdir) log -1 --before=00:00+0900 --format=%H`
diff --git a/template/builtin_binary.inc.tmpl b/template/builtin_binary.inc.tmpl
index 2c2f0717057531..1e3fc636801d17 100644
--- a/template/builtin_binary.inc.tmpl
+++ b/template/builtin_binary.inc.tmpl
@@ -5,19 +5,24 @@
 % unless ARGV.include?('--cross=yes')
 %   ary = RubyVM.enum_for(:each_builtin).to_a
 %   ary.each{|feature, iseq|
+%     bin = iseq.to_binary
 
-static const unsigned char <%= feature %>_bin[] = {
-%     iseq                   \
-%     . to_binary            \
+static const union {
+    unsigned char binary[<%= bin.bytesize %>];
+    uint32_t align_as_ibf_header;
+} <%= feature %>_builtin = {
+    .binary = {
+%     bin                    \
 %     . each_byte            \
 %     . each_slice(12) {|a|
-    <%= a.map{ '0x%02x,' % _1 }.join(' ') %>
+        <%= a.map{ '0x%02x,' % _1 }.join(' ') %>
 %     }
+    }
 };
 %   }
 
 #define BUILTIN_BIN(feature) \
-    { #feature, feature ## _bin, sizeof(feature ## _bin), }
+    { #feature, feature ## _builtin.binary, sizeof(feature ## _builtin.binary), }
 static const struct builtin_binary builtin_binary[] = {
 %   ary.each{|feature, |
     BUILTIN_BIN(<%= feature %>),
diff --git a/template/configure-ext.mk.tmpl b/template/configure-ext.mk.tmpl
index bc192a37cec741..cabdb652fdb49a 100644
--- a/template/configure-ext.mk.tmpl
+++ b/template/configure-ext.mk.tmpl
@@ -33,7 +33,9 @@ gems:
 
 % exts.each do |t, (o, dirs)|
 %   dirs.each do |d|
-%     next if Dir.glob("#{srcdir}/#{d}/**/extconf.rb").empty?
+%     extconf = Dir.glob("#{srcdir}/#{d}/**/extconf.rb")
+%     next if extconf.empty?
+%     next if extconf.any?{|f| f.include?(".bundle/gems") && f.include?("test") }
 <%=t%>: <%=d%>/exts.mk
 <%=d%>/exts.mk: FORCE
 	$(Q)$(MINIRUBY) $(srcdir)/ext/extmk.rb --make='$(MAKE)' \
diff --git a/template/encdb.h.tmpl b/template/encdb.h.tmpl
index 8e658f79852035..fe6af957478234 100644
--- a/template/encdb.h.tmpl
+++ b/template/encdb.h.tmpl
@@ -33,35 +33,27 @@ encdirs << 'enc' if encdirs.empty?
 files = {}
 encdirs.each do |encdir|
   next unless File.directory?(encdir)
-  Dir.open(encdir) {|d| d.grep(/.+\.[ch]\z/)}.sort_by {|e|
+  Dir.glob("*.[ch]", base: encdir).sort_by {|e|
     e.scan(/(\d+)|(\D+)/).map {|n,a| a||[n.size,n.to_i]}.flatten
   }.each do |fn|
     next if files[fn]
     files[fn] = true
-    open(File.join(encdir,fn)) do |f|
+    File.open(File.join(encdir, fn)) do |f|
       name = nil
-      skip_ifndef_ruby = false
-      encoding_def = false
       f.each_line do |line|
-        case line
-        when /^#ifndef RUBY/
-          skip_ifndef_ruby = true
-        when /^#endif/
-          skip_ifndef_ruby = false
-        end
-        next if skip_ifndef_ruby
-        encoding_def = true if /^OnigEncodingDefine/ =~ line
-        if encoding_def && /"(.*?)"/ =~ line
-          encoding_def = false
-          if name
-            lines << %[ENC_SET_BASE("#$1", "#{name}");]
-          else
-            name = $1
+        if (/^#ifndef RUBY/ =~ line)..(/^#endif/ =~ line)
+        elsif /^OnigEncodingDefine/.match?(line)
+          if (n = f.gets("\n\};")[/"(.*?)"/, 1]) # swallow the initializer block
+            if name
+              lines << %[ENC_SET_BASE("#{n}", "#{name}");]
+            else
+              name = n
+            end
+            check_duplication(defs, n, fn, f.lineno)
+            next if BUILTIN_ENCODINGS[name]
+            encodings << n
+            count += 1
           end
-          check_duplication(defs, $1, fn, f.lineno)
-          next if BUILTIN_ENCODINGS[name]
-          encodings << $1
-          count += 1
         else
           case line
           when /^\s*rb_enc_register\(\s*"([^"]+)"/
diff --git a/template/extinit.c.tmpl b/template/extinit.c.tmpl
index 7a9c910633bae3..e0b076b03c8c9b 100644
--- a/template/extinit.c.tmpl
+++ b/template/extinit.c.tmpl
@@ -1,5 +1,5 @@
 %# -*- C -*-
-% extinits = ARGV.map {|n| [n[%r[[^/.]+(?=\.[^/]*)?\z]], n]}
+% extinits = ARGV.map {|n| [n.tr('/', '_'), n]}
 #include "ruby/ruby.h"
 
 #define init(func, name) {	\
diff --git a/template/exts.mk.tmpl b/template/exts.mk.tmpl
index 29c29df37cdcd3..e482808f54fa56 100644
--- a/template/exts.mk.tmpl
+++ b/template/exts.mk.tmpl
@@ -22,14 +22,19 @@ end
 confexts &&= File.read(confexts).scan(/^(?:ext|gem)s: (.*\.mk)/).flatten rescue nil
 confexts ||= []
 macros["old_extensions"] = []
+distclean = []
 
 contpat = /(?>(?>[^\\\n]|\\.)*\\\n)*(?>[^\\\n]|\\.)*/
 Dir.glob("{ext,.bundle/gems}/*/exts.mk") do |e|
   gem = e.start_with?(".bundle/gems/")
+  dir = File.dirname(e)
   s = File.read(e)
   s.scan(/^(extensions|SUBMAKEOPTS|EXT[A-Z]+|MFLAGS|MESSAGE_(?:BEGIN|END)|NOTE_[A-Z]+)[ \t]*=[ \t]*(#{contpat})$/o) do |n, v|
     v.gsub!(/\\\n[ \t]*/, ' ')
-    next if v.empty?
+    if v.empty?
+      distclean << dir if n == "extensions"
+      next
+    end
     n = "old_extensions" if n == "extensions" and !confexts.include?(e)
     v = v.split
     m = macros[n] ||= []
@@ -69,6 +74,17 @@ Dir.glob("{ext,.bundle/gems}/*/exts.mk") do |e|
   end
 end
 deps.uniq!
+macros["cleandirs"] = distclean.map {|d| "#{d}/."}
+deps.map! {|d|
+  /\A(?:dist|real)?clean(?=:)/ =~ d ? d + " $(cleandirs:/.=/#{$&})" : d
+}
+
+# NOTE: Only if extensions are configured as static and dynamic heterogeneously
+# (e.g. --with-static-linked-ext=foo or ext/Setup can mix static and dynamic
+# extensions), EXTOBJS may contain both extinit.o and dmyext.o. In such case,
+# prefer extinit.o, which does actual Init_${ext} function calls for statically
+# linked extensions, and drop dmyext.o, which does nothing but just to make the
+# linker happy.
 if objs = macros["EXTOBJS"] and objs.any? {|e|e.start_with?("ext/extinit.")}
   objs.delete_if {|e|e.start_with?("dmyext.")}
 end
@@ -93,14 +109,15 @@ def self.column
   @erbout[/^.*\z/].scan(/\t|([^\t]+)/) {|s,| w += (s ? s.size : 8 - w % 8)}
   w
 end
-targets = %w[all static install install-so install-rb clean distclean realclean]
 objext = RbConfig::CONFIG["OBJEXT"]
+sep = RbConfig::CONFIG['BUILD_FILE_SEPARATOR']
+sep = nil if sep and sep.empty?
 if gnumake
   submake = "$(MAKE) -C $(@D)"
 else
-  submake = "cd $(@D) && "
-  exec = RbConfig::CONFIG["exec"] and !exec.empty? and submake << exec << " "
-  submake << "$(MAKE)"
+  submake = ["cd", (sep ? "$(@D:/=#{sep})" : "$(@D)"), "&&"]
+  exec = RbConfig::CONFIG["exec"] and !exec.empty? and submake << exec
+  submake = (submake << "$(MAKE)").join(" ")
   mflags = " $(MFLAGS)"
 end
 -%>
@@ -138,24 +155,27 @@ ext/extinit.<%=objext%>:
 
 % exts = (macros["extensions"] + macros["old_extensions"])
 % exts.map! {|e|e.chomp("/.")}.sort
-% targets.each do |tgt|
+% %w[all static install install-so install-rb].each do |tgt|
 %   exts.each do |d|
-%     t = "#{d}/#{tgt}"
-%     if /^(dist|real)?clean$/ =~ tgt
-%       deps = exts.select {|e|e.start_with?("#{d}/")}.map {|e|"#{e}/#{tgt}"}
-%       pd = ' ' + deps.join(' ') unless deps.empty?
-%     else
-%       pext = File.dirname(d)
-%       pd = " #{pext}/#{tgt}" if exts.include?(pext)
-%     end
-<%=t%>:<%=pd%>
-%     if /^(dist|real)clean$/ =~ tgt
+%     pext = File.dirname(d)
+<%=d%>/<%=tgt%>:<% if exts.include?(pext) %> <%=pext%>/<%=tgt%><% end %>
+	$(Q)<%= submake %><%=mflags%> V=$(V) $(@F)
+%   end
+% end
+% distclean = exts | distclean
+% %w[clean distclean realclean].each do |tgt|
+%   distclean.each do |d|
+%     deps = exts.select {|e|e.start_with?("#{d}/")}.map {|e|"#{e}/#{tgt}"}
+<%=d%>/<%=tgt%>:<% unless deps.empty? %> <%=deps.join(' ')%><% end %>
+%     unless tgt == "clean"
 	$(ECHO) $(@F)ing $(@D)
 %     end
+%     if exts.include?(d)
 	$(Q)<%= submake %><%=mflags%> V=$(V) $(@F)
-%     if /^(dist|real)clean$/ =~ tgt
-	$(Q)$(RM) <%=t[%r[\A(?:\.[^/]+/)?(?:[^/]+/){2}]]%>exts.mk
-	$(Q)$(RMDIRS) $(@D)
+%     end
+%     unless tgt == "clean"
+	$(Q)$(RM) <%=d[%r[\A(?:\.[^/]+/)?(?:[^/]+/)?[^/]+]]%>/exts.mk
+	-$(Q)$(RMDIRS) $(@D)
 %     end
 %   end
 % end
diff --git a/template/fake.rb.in b/template/fake.rb.in
index e7706a88ae79f3..b592fbd253a0e7 100644
--- a/template/fake.rb.in
+++ b/template/fake.rb.in
@@ -21,12 +21,11 @@ def src.value(name)
 end
 arg['versions'] = version = {}
 File.read(File.join(arg['srcdir'], 'version.c')).
-  scan(/rb_define_global_const\("(RUBY_\w+)",[^;]*?\bMK(?:INT|(STR))\(([^()]*)\)/m) do |n, s, v|
+  scan(/rb_define_(?:global_)?const\((mRuby, *)?"(?(1)|RUBY_)(\w+)",[^;]*?\bMK(?:INT|(STR))\(([^()]*)\)/m) do |_, n, s, v|
   version[n] = arg[v] || src.value(v) || (s ? v : 0)
 end
-arg['RUBY_DESCRIPTION_WITH_RJIT'] = src.value('description_with_rjit') || 'description_with_rjit'
-arg['RUBY_DESCRIPTION_WITH_YJIT'] = src.value('description_with_yjit') || 'description_with_yjit'
-%>baseruby="<%=arg['BASERUBY']%>"
+-%>
+baseruby="<%=arg['BASERUBY']%>"
 _\
 =begin
 _=
@@ -39,19 +38,26 @@ exec $ruby "$r" "$@"
 class Object
   remove_const :CROSS_COMPILING if defined?(CROSS_COMPILING)
   CROSS_COMPILING = RUBY_PLATFORM
+  options = remove_const(:RUBY_DESCRIPTION)[/( \+[^\[\]\+]+)*(?= \[\S+\]\z)/]
   constants.grep(/^RUBY_/) {|n| remove_const n}
 % arg['versions'].each {|n, v|
-  <%=n%> = <%if n=='RUBY_DESCRIPTION' %>case
-    when RubyVM.const_defined?(:RJIT) && RubyVM::RJIT.enabled?
-      <%=arg['RUBY_DESCRIPTION_WITH_RJIT'].inspect%>
-    when RubyVM.const_defined?(:YJIT) && RubyVM::YJIT.enabled?
-      <%=arg['RUBY_DESCRIPTION_WITH_YJIT'].inspect%>
-    else
-      <%=v.inspect%>
-    end<%else%><%=v.inspect%><%end%>
+  RUBY_<%=n%> = <%if n=='DESCRIPTION'
+    v1, v2 = v.split(/(?= \[\S+\]\z)/)
+    %><%=v1.dump.chomp('"')%>#{options}<%=
+    v2.dump[1..-1]%>.freeze<%
+  else%><%=v.inspect%><%end%>
+% }
+end
+module Ruby
+  constants.each {|n| remove_const n}
+% arg['versions'].each {|n, v|
+  <%=n%> = ::RUBY_<%=n%>
 % }
 end
 builddir = File.dirname(File.expand_path(__FILE__))
+libpathenv = libpathenv = "<%=arg['LIBPATHENV']%>"
+preloadenv = preloadenv = "<%=arg['PRELOADENV']%>"
+libruby_so = libruby_so = "<%=arg['LIBRUBY_SO']%>"
 srcdir = "<%=arg['srcdir']%>"
 top_srcdir = File.realpath(srcdir, builddir)
 fake = File.join(top_srcdir, "tool/fake.rb")
diff --git a/template/id.c.tmpl b/template/id.c.tmpl
index 5b9e8797303341..5aa8e47ce7372b 100644
--- a/template/id.c.tmpl
+++ b/template/id.c.tmpl
@@ -22,7 +22,8 @@ ops = ids[:token_op].uniq {|id, op, token| token && op}
 
 static const struct {
     unsigned short token;
-    const char name[3], term;
+    RBIMPL_ATTR_NONSTRING() const char name[3];
+    const char term;
 } op_tbl[] = {
 % ops.each do |_id, op, token|
 %   next unless token
diff --git a/template/known_errors.inc.tmpl b/template/known_errors.inc.tmpl
index c3aee7747718de..4d453395cafb70 100644
--- a/template/known_errors.inc.tmpl
+++ b/template/known_errors.inc.tmpl
@@ -4,8 +4,12 @@
  * template/known_errors.inc.tmpl and defs/known_errors.def.
  */
 
-% error_names = ARGF.read.split(/\s+/)
-% error_names.each do |name|
+% error_names = ARGF.readlines.map {|line| [$1, $2] if /\A([A-Z]\S+)(?:\s+(\S.*))?/ =~ line}.compact
+% error_names.each do |name, doc|
+#if 0
+        /* <% if doc %>"<%= doc %>"<% else %>\<%= name %><% end %> error */
+        rb_define_const(rb_mErrno, "<%=name%>", e<%=name%>);
+#endif
 #ifdef <%=name%>
         defined_error("<%=name%>", <%=name%>)
 #else
diff --git a/template/limits.c.tmpl b/template/limits.c.tmpl
index de35354829478f..f7867ded9a1950 100644
--- a/template/limits.c.tmpl
+++ b/template/limits.c.tmpl
@@ -51,11 +51,26 @@
 # include <float.h>
 #endif
 
+/*
+ * Document-const: LIMITS
+ *
+ * A Hash with the bounds of numeric types available to the \C compiler
+ * used to build Ruby. To access this constant, first run
+ * <code>require 'rbconfig/sizeof'</code>.
+ *
+ *    require 'rbconfig/sizeof'
+ *    RUBY_PLATFORM # => "x64-mingw-ucrt"
+ *    RbConfig::LIMITS.fetch_values('FIXNUM_MAX', 'LONG_MAX')
+ *    # => [1073741823, 2147483647]
+ *
+ */
+
 void
 Init_limits(void)
 {
     VALUE h = rb_hash_new();
-    rb_define_const(rb_define_module("RbConfig"), "LIMITS", h);
+    VALUE mRbConfig = rb_define_module("RbConfig");
+    rb_define_const(mRbConfig, "LIMITS", h);
 
 #ifdef HAVE_LONG_LONG
 #ifndef ULLONG_MAX
@@ -67,7 +82,7 @@ Init_limits(void)
 #define MAX2NUM(name) ULONG2NUM(name ## _MAX)
 #define MIN2NUM(name)  LONG2NUM(name ## _MIN)
 #endif
-#define DEFINE(k, v) rb_hash_aset(h, rb_str_new_cstr(#k), v)
+#define DEFINE(k, v) rb_hash_aset(h, rb_usascii_str_new_lit(#k), v)
 
 % limits.each do |type|
 #ifdef <%= type %>_MAX
diff --git a/template/prelude.c.tmpl b/template/prelude.c.tmpl
index 74f6c08da7973e..04f65ec5e37fe8 100644
--- a/template/prelude.c.tmpl
+++ b/template/prelude.c.tmpl
@@ -21,16 +21,11 @@ class Prelude
   def initialize(output, preludes, vpath)
     @output = output
     @vpath = vpath
-    @prelude_count = 0
     @builtin_count = 0
     @preludes = {}
     @mains = preludes.map do |filename|
-      if prelude = filename.end_with?("golf_prelude.rb")
-        @prelude_count += 1
-      else
-        @builtin_count += 1
-      end
-      translate(filename, (filename unless prelude))[0]
+      @builtin_count += 1
+      translate(filename, filename)[0]
     end
     @preludes.delete_if {|_, (_, _, lines, sub)| sub && lines.empty?}
   end
@@ -58,7 +53,7 @@ class Prelude
       if line.size > LINE_LIMIT
         raise "#{filename}:#{lines.size+1}: too long line"
       end
-      line.sub!(/require(_relative)?\s*\(?\s*(["'])(.*?)(?:\.rb)?\2\)?/) do
+      line.sub!(/require(_relative)?\s*\(?\s*([\"\'])(.*?)(?:\.rb)?\2\)?/) do
         orig, rel, path = $&, $2, $3
         if rel
           path = File.join(File.dirname(filename), path)
@@ -93,6 +88,7 @@ Prelude.new(output, ARGV, vpath).instance_eval do
 #include "internal/ruby_parser.h"
 #include "internal/warnings.h"
 #include "iseq.h"
+#include "ruby/internal/attr/nonstring.h"
 #include "ruby/ruby.h"
 #include "vm_core.h"
 
@@ -112,12 +108,12 @@ static const struct {
 %       size += line.size
 %       next
 %     end
-    char L<%=beg%><%=%>[<%=size%><%=%>]; /* <%=beg+1%>..<%=n%> */
+    RBIMPL_ATTR_NONSTRING() char L<%=beg%><%=%>[<%=size%><%=%>]; /* <%=beg+1%>..<%=n%> */
 %     size = line.size
 %     beg = n
 %   }
 %   if size > 0
-    char L<%=beg%><%=%>[<%=size%><%=%>]; /* <%=beg+1%>..<%=lines.size+1%> */
+    RBIMPL_ATTR_NONSTRING() char L<%=beg%><%=%>[<%=size%><%=%>]; /* <%=beg+1%>..<%=lines.size+1%> */
 %   end
 } prelude_code<%=i%><%=%> = {
 %   size = 0
@@ -137,89 +133,38 @@ static const struct {
 
 COMPILER_WARNING_POP
 
-% unless preludes.empty?
 #define PRELUDE_NAME(n) rb_usascii_str_new_static(prelude_name##n, sizeof(prelude_name##n)-1)
 #define PRELUDE_CODE(n) rb_utf8_str_new_static(prelude_code##n.L0, sizeof(prelude_code##n))
 
-static rb_ast_t *
-prelude_ast(VALUE name, VALUE code, int line)
-{
-    rb_ast_t *ast = rb_parser_compile_string_path(rb_parser_new(), name, code, line);
-    if (!ast || !ast->body.root) {
-        if (ast) rb_ast_dispose(ast);
-        rb_exc_raise(rb_errinfo());
-    }
-    return ast;
-}
-
 % end
 % if @builtin_count > 0
-#define PRELUDE_AST(n, name_str, start_line) \
+#define PRELUDE_MATCH(n) \
     (((sizeof(prelude_name<%='##'%><%=%>n) - prefix_len - 2) == namelen) && \
-     (strncmp(prelude_name<%='##'%><%=%>n + prefix_len, feature_name, namelen) == 0) ? \
-     prelude_ast((name_str) = PRELUDE_NAME(n), PRELUDE_CODE(n), start_line) : 0)
+     (strncmp(prelude_name<%='##'%><%=%>n + prefix_len, feature_name, namelen) == 0))
 
-rb_ast_t *
-rb_builtin_ast(const char *feature_name, VALUE *name_str)
+VALUE
+rb_builtin_find(const char *feature_name, VALUE *name_str, int *start_line)
 {
     const size_t prefix_len = rb_strlen_lit("<internal:");
     size_t namelen = strlen(feature_name);
-    rb_ast_t *ast = 0;
+
+#define PRELUDE_FOUND(n, l) \
+    (*name_str = PRELUDE_NAME(n), *start_line = (l), PRELUDE_CODE(n))
 
 %   @preludes.each_value do |i, prelude, lines, sub, start_line|
 %     if sub
-    if ((ast = PRELUDE_AST(<%=i%><%=%>, *name_str, <%=start_line%>)) != 0) return ast;
+    if (PRELUDE_MATCH(<%=i%>)) return PRELUDE_FOUND(<%=i%>, <%=start_line%>);
 %     end
 %   end
-    return ast;
-}
+#undef PRELUDE_FOUND
 
-% end
-% if @prelude_count > 0
-COMPILER_WARNING_PUSH
-#if GCC_VERSION_SINCE(4, 2, 0)
-COMPILER_WARNING_ERROR(-Wmissing-field-initializers)
-#endif
-static void
-prelude_eval(VALUE code, VALUE name, int line)
-{
-    static const rb_compile_option_t optimization = {
-        TRUE, /* unsigned int inline_const_cache; */
-        TRUE, /* unsigned int peephole_optimization; */
-        FALSE,/* unsigned int tailcall_optimization; */
-        TRUE, /* unsigned int specialized_instruction; */
-        TRUE, /* unsigned int operands_unification; */
-        TRUE, /* unsigned int instructions_unification; */
-        TRUE, /* unsigned int frozen_string_literal; */
-        FALSE, /* unsigned int debug_frozen_string_literal; */
-        FALSE, /* unsigned int coverage_enabled; */
-        0, /* int debug_level; */
-    };
-
-    rb_ast_t *ast = prelude_ast(name, code, line);
-    rb_iseq_eval(rb_iseq_new_with_opt(&ast->body, name, name, Qnil, line,
-                                      NULL, 0, ISEQ_TYPE_TOP, &optimization));
-    rb_ast_dispose(ast);
+    return Qnil;
 }
-COMPILER_WARNING_POP
 
-% end
 %end
 % init_name = @output && @output[/\w+(?=_prelude.c\b)/] || 'prelude'
 void
 Init_<%=init_name%><%=%>(void)
 {
-%unless @prelude_count.zero?
-% preludes.each do |i, prelude, lines, sub, start_line|
-%   next if sub
-    prelude_eval(PRELUDE_CODE(<%=i%><%=%>), PRELUDE_NAME(<%=i%><%=%>), <%=start_line%><%=%>);
-% end
-
-#if 0
-% preludes.length.times {|i|
-    printf("%.*s", (int)sizeof(prelude_code<%=i%><%=%>), prelude_code<%=i%><%=%>.L0);
-% }
-#endif
-%end
 }
 <%end -%>
diff --git a/template/ruby-runner.h.in b/template/ruby-runner.h.in
index fdfe88dcb9e225..b94086c5652c7a 100644
--- a/template/ruby-runner.h.in
+++ b/template/ruby-runner.h.in
@@ -1,9 +1,7 @@
 #define ABS_SRCDIR "@abs_srcdir@"
 #define BUILDDIR   "@abs_top_builddir@"
 #define LIBPATHENV "@LIBPATHENV@"
-#define PRELOADENV "@PRELOADENV@"
 #define PATH_SEPARATOR "@PATH_SEPARATOR@"
 #define PATH_SEP   '@PATH_SEPARATOR@'
 #define EXTOUT     "@EXTOUT@"
 #define ARCH       "@arch@"
-#define SOEXT      "@SOEXT@"
diff --git a/template/sizes.c.tmpl b/template/sizes.c.tmpl
index 31060f5fea676d..abc3b5c90879f0 100644
--- a/template/sizes.c.tmpl
+++ b/template/sizes.c.tmpl
@@ -25,15 +25,30 @@ conditions = {
 #endif
 
 % end
+
+/*
+ * Document-const: SIZEOF
+ *
+ * A Hash with the byte size of \C types available to the compiler
+ * used to build Ruby. To access this constant, first run
+ * <code>require 'rbconfig/sizeof'</code>.
+ *
+ *    require 'rbconfig/sizeof'
+ *    RUBY_PLATFORM                                  # => "x64-mingw-ucrt"
+ *    RbConfig::SIZEOF.fetch_values('long', 'void*') # => [4, 8]
+ *
+ */
+
 extern void Init_limits(void);
 void
 Init_sizeof(void)
 {
     VALUE s = rb_hash_new();
-    rb_define_const(rb_define_module("RbConfig"), "SIZEOF", s);
+    VALUE mRbConfig = rb_define_module("RbConfig");
+    rb_define_const(mRbConfig, "SIZEOF", s);
 
-#define DEFINE(type, size) rb_hash_aset(s, rb_str_new_cstr(#type), INT2FIX(SIZEOF_##size))
-#define DEFINE_SIZE(type) rb_hash_aset(s, rb_str_new_cstr(#type), INT2FIX(sizeof(type)))
+#define DEFINE(type, size) rb_hash_aset(s, rb_usascii_str_new_lit(#type), INT2FIX(SIZEOF_##size))
+#define DEFINE_SIZE(type) rb_hash_aset(s, rb_usascii_str_new_lit(#type), INT2FIX(sizeof(type)))
 
 % types.each do |type|
 %   if sizes[type]
diff --git a/template/transdb.h.tmpl b/template/transdb.h.tmpl
index 990a8639d0e017..22b5960cd88790 100644
--- a/template/transdb.h.tmpl
+++ b/template/transdb.h.tmpl
@@ -1,4 +1,4 @@
-<%
+<% #-*- mode: ruby -*-
 #
 # static const rb_transcoder
 # rb_from_US_ASCII = {
@@ -22,39 +22,34 @@ transdirs = transdirs.sort_by {|td|
 
 files = {}
 names_t = []
-converter_list = []
 transdirs.each do |transdir|
   names = Dir.entries(transdir)
-  names_t += names.map {|n| /(?!\A)\.trans\z/ =~ n ? $` : nil }.compact
-  names_c = names.map {|n| /(?!\A)\.c\z/ =~ n ? $` : nil }.compact
-  (names_t & names_c).map {|n|
-    "#{n}.c"
-  }.sort_by {|e|
+  names_t += names.map {|n| n[/.+(?=\.trans\z)/]}.compact
+  names_c = names.map {|n| n[/.+(?=\.c\z)/]}.compact
+  (names_t & names_c).sort_by {|e|
     e.scan(/(\d+)|(\D+)/).map {|n,a| a||[n.size,n.to_i]}.flatten
   }.each do |fn|
     next if files[fn]
     files[fn] = true
-    path = File.join(transdir,fn)
-    open(path) do |f|
-      transcoder_def = false
+    path = File.join(transdir, "#{fn}.c")
+    File.open(path) do |f|
       f.each_line do |line|
-        transcoder_def = true if /^static const rb_transcoder/ =~ line
-        if transcoder_def && /"(.*?)"\s*,\s*"(.*?)"/ =~ line
-          transcoder_def = false
-          from_to = "%s to %s" % [$1, $2]
-          if converters[from_to]
-            raise ArgumentError, '%s:%d: transcode "%s" is already registered at %s:%d' %
-            [path, f.lineno, from_to, *converters[from_to].values_at(3, 4)]
-          else
-            converters[from_to] = [$1, $2, fn[0..-3], path, f.lineno]
-            converter_list << from_to
+        if (/^static const rb_transcoder/ =~ line)
+          if (/"(.*?)"\s*,\s*"(.*?)"/ =~ f.gets("\n\};")) # swallow the initializer block
+            from_to = [$1.freeze, $2.freeze].freeze
+            if converters[from_to]
+              raise ArgumentError,
+                    '%s:%d: transcode "%s to %s" is already registered at %s:%d' %
+                    [path, f.lineno, *from_to, *converters[from_to].values_at(3, 4)]
+            else
+              converters[from_to] = [fn, path, f.lineno]
+            end
           end
         end
       end
     end
   end
 end
-converter_list.each do |from_to|
-  from, to, fn = *converters[from_to]
+converters.each do |(from, to), (fn)|
 %>rb_declare_transcoder("<%=from%>", "<%=to%>", "<%=fn%>");
 % end
diff --git a/template/unicode_norm_gen.tmpl b/template/unicode_norm_gen.tmpl
index a16712fbac17c0..17505f100e9f8e 100644
--- a/template/unicode_norm_gen.tmpl
+++ b/template/unicode_norm_gen.tmpl
@@ -112,6 +112,17 @@ accent_array = combining_class.keys + composition_table.keys.collect {|key| key.
 
 composition_starters = composition_table.keys.collect {|key| key.first}
 
+# Special treatment for Unicode 16.0.0
+# Add characters that can be decomposed (even indirectly) so that
+# the first character in the decomposition is a an accent to accents.
+# We do this here up to two levels deep.
+# In the future, there may be even deeper levels.
+starter_accents = composition_starters & accent_array
+decomposition_table.each do |k, v|
+  accent_array << k if starter_accents.include? v.first
+  accent_array << k if starter_accents.include? decomposition_table[v.first]&.first
+end
+
 hangul_no_trailing = []
 0xAC00.step(0xD7A3, 28) {|c| hangul_no_trailing << c}
 
@@ -155,6 +166,9 @@ end
 # frozen_string_literal: true
 %# >
 
+Encoding::UNICODE_VERSION == <%= unicode_version.dump %><%=%> or
+  raise "Unicode version mismatch: <%= unicode_version %> expected but #{Encoding::UNICODE_VERSION}"
+
 # automatically generated by template/unicode_norm_gen.tmpl
 
 module UnicodeNormalize  # :nodoc:
@@ -202,19 +216,19 @@ module UnicodeNormalize  # :nodoc:
 
   DECOMPOSITION_TABLE = {
 % decomposition_table.each do |key, value|
-    "<%=key.to_UTF8%>"=>"<%=value.to_UTF8%>"<%=%>,
+    "<%=key.to_UTF8%>"=>"<%=value.to_UTF8%>",
 % end
   }.freeze
 
   KOMPATIBLE_TABLE = {
 % kompatible_table.each do |key, value|
-    "<%=key.to_UTF8%>"=>"<%=value.to_UTF8%>"<%=%>,
+    "<%=key.to_UTF8%>"=>"<%=value.to_UTF8%>",
 % end
   }.freeze
 
   COMPOSITION_TABLE = {
 % composition_table.each do |key, value|
-    "<%=key.to_UTF8%>"=>"<%=value.to_UTF8%>"<%=%>,
+    "<%=key.to_UTF8%>"=>"<%=value.to_UTF8%>",
 % end
   }.freeze
 end
diff --git a/test/-ext-/bug_reporter/test_bug_reporter.rb b/test/-ext-/bug_reporter/test_bug_reporter.rb
index 1d3d253c04ca7f..d402ab13825315 100644
--- a/test/-ext-/bug_reporter/test_bug_reporter.rb
+++ b/test/-ext-/bug_reporter/test_bug_reporter.rb
@@ -2,15 +2,12 @@
 require 'test/unit'
 require 'tmpdir'
 require_relative '../../lib/jit_support'
+require_relative '../../lib/parser_support'
 
 class TestBugReporter < Test::Unit::TestCase
-  def yjit_enabled?
-    defined?(RubyVM::YJIT.enabled?) && RubyVM::YJIT.enabled?
-  end
-
   def test_bug_reporter_add
     description = RUBY_DESCRIPTION
-    description = description.sub(/\+RJIT /, '') unless JITSupport.rjit_force_enabled?
+    description = description.sub(/\+PRISM /, '') unless ParserSupport.prism_enabled_in_subprocess?
     expected_stderr = [
       :*,
       /\[BUG\]\sSegmentation\sfault.*\n/,
@@ -23,7 +20,7 @@ def test_bug_reporter_add
 
     no_core = "Process.setrlimit(Process::RLIMIT_CORE, 0); " if defined?(Process.setrlimit) && defined?(Process::RLIMIT_CORE)
     args = ["-r-test-/bug_reporter", "-C", tmpdir]
-    args.push("--yjit") if yjit_enabled? # We want the printed description to match this process's RUBY_DESCRIPTION
+    args.push("--yjit") if JITSupport.yjit_enabled? # We want the printed description to match this process's RUBY_DESCRIPTION
     args.unshift({"RUBY_ON_BUG" => nil})
     stdin = "#{no_core}register_sample_bug_reporter(12345); Process.kill :SEGV, $$"
     assert_in_out_err(args, stdin, [], expected_stderr, encoding: "ASCII-8BIT")
diff --git a/test/-ext-/debug/test_debug.rb b/test/-ext-/debug/test_debug.rb
index 8a351d74fad975..c9263d76fa6c7b 100644
--- a/test/-ext-/debug/test_debug.rb
+++ b/test/-ext-/debug/test_debug.rb
@@ -26,11 +26,14 @@ def binds_check(binds, msg = nil)
         count[:iseq] += 1
         assert_instance_of(RubyVM::InstructionSequence, iseq, msg)
 
-        # check same location
-        assert_equal(loc.path, iseq.path, msg)
-        assert_equal(loc.absolute_path, iseq.absolute_path, msg)
-        assert_equal(loc.label, iseq.label, msg)
-        assert_operator(loc.lineno, :>=, iseq.first_lineno, msg)
+        # Backtraces and source locations don't match for :c_trace methods
+        unless iseq.disasm.include?('C_TRACE')
+          # check same location
+          assert_equal(loc.path, iseq.path, msg)
+          assert_equal(loc.absolute_path, iseq.absolute_path, msg)
+          #assert_equal(loc.label, iseq.label, msg)
+          assert_operator(loc.lineno, :>=, iseq.first_lineno, msg)
+        end
       end
 
       assert_instance_of(Thread::Backtrace::Location, loc, msg)
@@ -73,3 +76,57 @@ def test_lazy_block
     assert_equal true, x, '[Bug #15105]'
   end
 end
+
+# This is a YJIT test, but we can't test this without a C extension that calls
+# rb_debug_inspector_open(), so we're testing it using "-test-/debug" here.
+class TestDebugWithYJIT < Test::Unit::TestCase
+  class LocalSetArray
+    def to_a
+      Bug::Debug.inspector.each do |_, binding,|
+        binding.local_variable_set(:local, :ok) if binding
+      end
+      [:ok]
+    end
+  end
+
+  class DebugArray
+    def to_a
+      Bug::Debug.inspector
+      [:ok]
+    end
+  end
+
+  def test_yjit_invalidates_getlocal_after_splatarray
+    val = getlocal_after_splatarray(LocalSetArray.new)
+    assert_equal [:ok, :ok], val
+  end
+
+  def test_yjit_invalidates_setlocal_after_splatarray
+    val = setlocal_after_splatarray(DebugArray.new)
+    assert_equal [:ok], val
+  end
+
+  def test_yjit_invalidates_setlocal_after_proc_call
+    val = setlocal_after_proc_call(proc { Bug::Debug.inspector; :ok })
+    assert_equal :ok, val
+  end
+
+  private
+
+  def getlocal_after_splatarray(array)
+    local = 1
+    [*array, local]
+  end
+
+  def setlocal_after_splatarray(array)
+    local = *array # setlocal followed by splatarray
+    itself # split a block using a C call
+    local # getlocal
+  end
+
+  def setlocal_after_proc_call(block)
+    local = block.call # setlocal followed by OPTIMIZED_METHOD_TYPE_CALL
+    itself # split a block using a C call
+    local # getlocal
+  end
+end if defined?(RubyVM::YJIT) && RubyVM::YJIT.enabled?
diff --git a/test/-ext-/debug/test_profile_frames.rb b/test/-ext-/debug/test_profile_frames.rb
index 870e4e1d3684a4..d79c94c468a47a 100644
--- a/test/-ext-/debug/test_profile_frames.rb
+++ b/test/-ext-/debug/test_profile_frames.rb
@@ -39,6 +39,20 @@ def foo(block)
   end
 end
 
+class SampleClassForTestProfileThreadFrames
+  def initialize(mutex)
+    @mutex = mutex
+  end
+
+  def foo(block)
+    bar(block)
+  end
+
+  def bar(block)
+    block.call
+  end
+end
+
 class TestProfileFrames < Test::Unit::TestCase
   def test_profile_frames
     obj, frames = Fiber.new{
@@ -139,21 +153,65 @@ def test_profile_frames
     }
   end
 
+  def test_profile_thread_frames
+    mutex = Mutex.new
+    th = Thread.new do
+      mutex.lock
+      Thread.stop
+      SampleClassForTestProfileThreadFrames.new(mutex).foo(lambda { mutex.unlock; loop { sleep(1) } } )
+    end
+
+    # ensure execution has reached SampleClassForTestProfileThreadFrames#bar before running profile_thread_frames
+    loop { break if th.status == "sleep"; sleep 0.1 }
+    th.run
+    mutex.lock # wait until SampleClassForTestProfileThreadFrames#bar has been called
+
+    frames = Bug::Debug.profile_thread_frames(th, 0, 10)
+
+    full_labels = [
+      "Kernel#sleep",
+      "TestProfileFrames#test_profile_thread_frames",
+      "Kernel#loop",
+      "TestProfileFrames#test_profile_thread_frames",
+      "SampleClassForTestProfileThreadFrames#bar",
+      "SampleClassForTestProfileThreadFrames#foo",
+      "TestProfileFrames#test_profile_thread_frames",
+    ]
+
+    frames.each.with_index do |frame, i|
+      assert_equal(full_labels[i], frame)
+    end
+
+  ensure
+    th.kill
+    th.join
+  end
+
+
   def test_matches_backtrace_locations_main_thread
     assert_equal(Thread.current, Thread.main)
 
     # Keep these in the same line, so the backtraces match exactly
     backtrace_locations, profile_frames = [Thread.current.backtrace_locations, Bug::Debug.profile_frames(0, 100)]
 
-    assert_equal(backtrace_locations.size, profile_frames.size)
+    errmsg  = "backtrace_locations:\n  " + backtrace_locations.map.with_index{|loc, i| "#{i} #{loc}"}.join("\n  ")
+    errmsg += "\n\nprofile_frames:\n  "      + profile_frames.map.with_index{|(path, absolute_path, _, base_label, _, _, _, _, _, full_label, lineno), i|
+      if lineno
+        "#{i} #{absolute_path}:#{lineno} // #{full_label}"
+      else
+        "#{i} #{absolute_path} #{full_label}"
+      end
+    }.join("\n  ")
+    assert_equal(backtrace_locations.size, profile_frames.size, errmsg)
 
     # The first entries are not going to match, since one is #backtrace_locations and the other #profile_frames
     backtrace_locations.shift
     profile_frames.shift
 
     # The rest of the stack is expected to look the same...
-    backtrace_locations.zip(profile_frames).each.with_index do |(location, (path, absolute_path, _, base_label, _, _, _, _, _, _, lineno)), i|
+    backtrace_locations.zip(profile_frames).each.with_index do |(location, (path, absolute_path, _, base_label, label, _, _, _, _, _, lineno)), i|
       next if absolute_path == "<cfunc>" # ...except for cfunc frames
+      next if label in "Array#each" | "Array#map" # ...except for :c_trace method frames
 
       err_msg = "#{i}th frame"
       assert_equal(location.absolute_path, absolute_path, err_msg)
@@ -179,4 +237,8 @@ def a
       a
     end;
   end
+
+  def test_start
+    assert_equal Bug::Debug.profile_frames(0, 10).tap(&:shift), Bug::Debug.profile_frames(1, 9)
+  end
 end
diff --git a/test/-ext-/gvl/test_last_thread.rb b/test/-ext-/gvl/test_last_thread.rb
index f1bebafeea942e..f63d98aab16f02 100644
--- a/test/-ext-/gvl/test_last_thread.rb
+++ b/test/-ext-/gvl/test_last_thread.rb
@@ -15,8 +15,7 @@ def test_last_thread
       t1 = Time.now
       t = t1 - t0
 
-      assert_in_delta(1.0, t, 0.16)
+      assert_in_delta(1.0, t, 0.18)
     end;
   end
 end
-
diff --git a/test/-ext-/integer/test_my_integer.rb b/test/-ext-/integer/test_my_integer.rb
index 1b6f8489f8437d..0dfa234921d327 100644
--- a/test/-ext-/integer/test_my_integer.rb
+++ b/test/-ext-/integer/test_my_integer.rb
@@ -8,19 +8,13 @@ def test_my_integer_to_f
       Bug::Integer::MyInteger.new.to_f
     end
 
-    begin
-      Bug::Integer::MyInteger.class_eval do
-        def to_f
-        end
+    int = Class.new(Bug::Integer::MyInteger) do
+      def to_f
       end
+    end
 
-      assert_nothing_raised do
-        Bug::Integer::MyInteger.new.to_f
-      end
-    ensure
-      Bug::Integer::MyInteger.class_eval do
-        remove_method :to_f
-      end
+    assert_nothing_raised do
+      int.new.to_f
     end
   end
 
@@ -29,20 +23,14 @@ def test_my_integer_cmp
       Bug::Integer::MyInteger.new <=> 0
     end
 
-    begin
-      Bug::Integer::MyInteger.class_eval do
-        def <=>(other)
-          0
-        end
+    int = Class.new(Bug::Integer::MyInteger) do
+      def <=>(other)
+        0
       end
+    end
 
-      assert_nothing_raised do
-        Bug::Integer::MyInteger.new <=> 0
-      end
-    ensure
-      Bug::Integer::MyInteger.class_eval do
-        remove_method :<=>
-      end
+    assert_nothing_raised do
+      int.new <=> 0
     end
   end
 end
diff --git a/test/-ext-/load/test_resolve_symbol.rb b/test/-ext-/load/test_resolve_symbol.rb
new file mode 100644
index 00000000000000..471d3acebdb40f
--- /dev/null
+++ b/test/-ext-/load/test_resolve_symbol.rb
@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+require 'test/unit'
+
+class Test_Load_ResolveSymbol < Test::Unit::TestCase
+  def test_load_resolve_symbol_resolver
+    assert_separately([], "#{<<~"begin;"}\n#{<<~'end;'}")
+    begin;
+      feature = "Feature #20005"
+      assert_raise(LoadError, "resolve_symbol_target is not loaded") {
+        require '-test-/load/resolve_symbol_resolver'
+      }
+      require '-test-/load/resolve_symbol_target'
+      assert_nothing_raised(LoadError, "#{feature} resolver can be loaded") {
+        require '-test-/load/resolve_symbol_resolver'
+      }
+      assert_not_nil ResolveSymbolResolver
+      assert_equal "from target", ResolveSymbolResolver.any_method
+
+      assert_raise(LoadError, "tries to resolve missing feature name, and it should raise LoadError") {
+        ResolveSymbolResolver.try_resolve_fname
+      }
+      assert_raise(LoadError, "tries to resolve missing symbol name, and it should raise LoadError") {
+        ResolveSymbolResolver.try_resolve_sname
+      }
+    end;
+  end
+end
diff --git a/test/-ext-/load/test_stringify_symbols.rb b/test/-ext-/load/test_stringify_symbols.rb
new file mode 100644
index 00000000000000..0d9736b5910f29
--- /dev/null
+++ b/test/-ext-/load/test_stringify_symbols.rb
@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+require 'test/unit'
+
+class Test_Load_stringify_symbols < Test::Unit::TestCase
+  def test_load_stringify_symbol_required_extensions
+    require '-test-/load/stringify_symbols'
+    require '-test-/load/stringify_target'
+    r1 = StringifySymbols.stringify_symbol("-test-/load/stringify_target", "stt_any_method")
+    assert_not_nil r1
+    r2 = StringifySymbols.stringify_symbol("-test-/load/stringify_target.so", "stt_any_method")
+    assert_equal r1, r2, "resolved symbols should be equal even with or without .so suffix"
+  end
+
+  def test_load_stringify_symbol_statically_linked
+    require '-test-/load/stringify_symbols'
+    # "complex.so" is actually not a statically linked extension.
+    # But it is registered in $LOADED_FEATURES, so it can be a target of this test.
+    r1 = StringifySymbols.stringify_symbol("complex", "rb_complex_minus")
+    assert_not_nil r1
+    r2 = StringifySymbols.stringify_symbol("complex.so", "rb_complex_minus")
+    assert_equal r1, r2
+  end
+
+  def test_load_stringify_symbol_missing_target
+    require '-test-/load/stringify_symbols'
+    r1 = assert_nothing_raised {
+      StringifySymbols.stringify_symbol("something_missing", "unknown_method")
+    }
+    assert_nil r1
+    r2 = assert_nothing_raised {
+      StringifySymbols.stringify_symbol("complex.so", "unknown_method")
+    }
+    assert_nil r2
+  end
+end
diff --git a/test/-ext-/marshal/test_internal_ivar.rb b/test/-ext-/marshal/test_internal_ivar.rb
index a32138f6e8f50d..8b4667fdf90aab 100644
--- a/test/-ext-/marshal/test_internal_ivar.rb
+++ b/test/-ext-/marshal/test_internal_ivar.rb
@@ -7,11 +7,16 @@ module Bug end
 module Bug::Marshal
   class TestInternalIVar < Test::Unit::TestCase
     def test_marshal
-      v = InternalIVar.new("hello", "world", "bye")
+      v = InternalIVar.new("hello", "world", "bye", "hi")
       assert_equal("hello", v.normal)
       assert_equal("world", v.internal)
       assert_equal("bye", v.encoding_short)
-      dump = assert_warn(/instance variable `E' on class \S+ is not dumped/) {
+      assert_equal("hi", v.encoding_long)
+      warnings = ->(s) {
+        w = s.scan(/instance variable '(.+?)' on class \S+ is not dumped/)
+        assert_equal(%w[E K encoding], w.flatten.sort)
+      }
+      dump = assert_warn(warnings) {
         ::Marshal.dump(v)
       }
       v = assert_nothing_raised {break ::Marshal.load(dump)}
@@ -19,6 +24,7 @@ def test_marshal
       assert_equal("hello", v.normal)
       assert_nil(v.internal)
       assert_nil(v.encoding_short)
+      assert_nil(v.encoding_long)
     end
   end
 end
diff --git a/test/-ext-/namespace/test_load_ext.rb b/test/-ext-/namespace/test_load_ext.rb
new file mode 100644
index 00000000000000..da7fe22a74f72c
--- /dev/null
+++ b/test/-ext-/namespace/test_load_ext.rb
@@ -0,0 +1,97 @@
+# frozen_string_literal: true
+require 'test/unit'
+
+class Test_Load_Extensions < Test::Unit::TestCase
+  ENV_ENABLE_NAMESPACE = {'RUBY_NAMESPACE' => '1'}
+
+  def test_load_extension
+    pend
+    assert_separately([], "#{<<~"begin;"}\n#{<<~'end;'}")
+    begin;
+      require '-test-/namespace/yay1'
+      assert_equal "1.0.0", Yay.version
+      assert_equal "yay", Yay.yay
+    end;
+  end
+
+  def test_extension_contamination_in_global
+    pend
+    assert_separately([], "#{<<~"begin;"}\n#{<<~'end;'}", ignore_stderr: true)
+    begin;
+      require '-test-/namespace/yay1'
+      yay1 = Yay
+      assert_equal "1.0.0", Yay.version
+      assert_equal "yay", Yay.yay
+
+      require '-test-/namespace/yay2'
+      assert_equal "2.0.0", Yay.version
+      v = Yay.yay
+      assert(v == "yay" || v == "yaaay") # "yay" on Linux, "yaaay" on macOS, Win32
+    end;
+  end
+
+  def test_load_extension_in_namespace
+    pend
+    assert_separately([ENV_ENABLE_NAMESPACE], "#{<<~"begin;"}\n#{<<~'end;'}")
+    begin;
+      ns = Namespace.new
+      ns.require '-test-/namespace/yay1'
+      assert_equal "1.0.0", ns::Yay.version
+      assert_raise(NameError) { Yay }
+    end;
+  end
+
+  def test_different_version_extensions
+    pend
+    assert_separately([ENV_ENABLE_NAMESPACE], "#{<<~"begin;"}\n#{<<~'end;'}")
+    begin;
+      ns1 = Namespace.new
+      ns2 = Namespace.new
+      ns1.require('-test-/namespace/yay1')
+      ns2.require('-test-/namespace/yay2')
+
+      assert_raise(NameError) { Yay }
+      assert_not_nil ns1::Yay
+      assert_not_nil ns2::Yay
+      assert_equal "1.0.0", ns1::Yay::VERSION
+      assert_equal "2.0.0", ns2::Yay::VERSION
+      assert_equal "1.0.0", ns1::Yay.version
+      assert_equal "2.0.0", ns2::Yay.version
+    end;
+  end
+
+  def test_loading_extensions_from_global_to_local
+    pend
+    assert_separately([ENV_ENABLE_NAMESPACE], "#{<<~"begin;"}\n#{<<~'end;'}")
+    begin;
+      require '-test-/namespace/yay1'
+      assert_equal "1.0.0", Yay.version
+      assert_equal "yay", Yay.yay
+
+      ns = Namespace.new
+      ns.require '-test-/namespace/yay2'
+      assert_equal "2.0.0", ns::Yay.version
+      assert_equal "yaaay", ns::Yay.yay
+
+      assert_equal "yay", Yay.yay
+    end;
+  end
+
+  def test_loading_extensions_from_local_to_global
+    pend
+    assert_separately([ENV_ENABLE_NAMESPACE], "#{<<~"begin;"}\n#{<<~'end;'}")
+    begin;
+      ns = Namespace.new
+      ns.require '-test-/namespace/yay1'
+      assert_equal "1.0.0", ns::Yay.version
+      assert_equal "yay", ns::Yay.yay
+
+
+      require '-test-/namespace/yay2'
+      assert_equal "2.0.0", Yay.version
+      assert_equal "yaaay", Yay.yay
+
+      assert_equal "yay", ns::Yay.yay
+    end;
+  end
+end
diff --git a/test/-ext-/postponed_job/test_postponed_job.rb b/test/-ext-/postponed_job/test_postponed_job.rb
index fee0172d114fbd..8c2b3e95d1cdad 100644
--- a/test/-ext-/postponed_job/test_postponed_job.rb
+++ b/test/-ext-/postponed_job/test_postponed_job.rb
@@ -2,34 +2,70 @@
 require 'test/unit'
 require '-test-/postponed_job'
 
-module Bug
-  def self.postponed_job_call_direct_wrapper(*args)
-    postponed_job_call_direct(*args)
+class TestPostponed_job < Test::Unit::TestCase
+  def test_preregister_and_trigger
+    assert_separately([], __FILE__, __LINE__, <<-'RUBY')
+      require '-test-/postponed_job'
+      Bug.postponed_job_preregister_and_call_without_sleep(counters = [])
+      # i.e. rb_postponed_job_trigger performs coalescing
+      assert_equal([3], counters)
+
+      # i.e. rb_postponed_job_trigger resets after interrupts are checked
+      Bug.postponed_job_preregister_and_call_with_sleep(counters = [])
+      assert_equal([1, 2, 3], counters)
+    RUBY
   end
 
-  def self.postponed_job_register_wrapper(*args)
-    postponed_job_register(*args)
+  def test_multiple_preregistration
+    assert_separately([], __FILE__, __LINE__, <<-'RUBY')
+      require '-test-/postponed_job'
+      handles = Bug.postponed_job_preregister_multiple_times
+      # i.e. rb_postponed_job_preregister returns the same handle if preregistered multiple times
+      assert_equal [handles[0]], handles.uniq
+    RUBY
   end
-end
 
-class TestPostponed_job < Test::Unit::TestCase
-  def test_register
-    direct, registered = [], []
+  def test_multiple_preregistration_with_new_data
+    assert_separately([], __FILE__, __LINE__, <<-'RUBY')
+      require '-test-/postponed_job'
+      values = Bug.postponed_job_preregister_calls_with_last_argument
+      # i.e. the callback is called with the last argument it was preregistered with
+      assert_equal [3, 4], values
+    RUBY
+  end
 
-    Bug.postponed_job_call_direct_wrapper(direct)
-    Bug.postponed_job_register_wrapper(registered)
+  def test_legacy_register
+    assert_separately([], __FILE__, __LINE__, <<-'RUBY')
+      require '-test-/postponed_job'
+      direct, registered = [], []
 
-    assert_equal([0], direct)
-    assert_equal([3], registered)
+      Bug.postponed_job_call_direct(direct)
+      Bug.postponed_job_register(registered)
 
-    Bug.postponed_job_register_one(ary = [])
-    assert_equal [1], ary
+      assert_equal([0], direct)
+      assert_equal([3], registered)
+
+      Bug.postponed_job_register_one(ary = [])
+      assert_equal [1], ary
+    RUBY
+  end
+
+  def test_legacy_register_one_same
+    assert_separately([], __FILE__, __LINE__, <<-'RUBY')
+      require '-test-/postponed_job'
+      # Registering the same job three times should result in three of the same handle
+      handles = Bug.postponed_job_register_one_same
+      assert_equal [handles[0]], handles.uniq
+    RUBY
   end
 
   if Bug.respond_to?(:postponed_job_register_in_c_thread)
-    def test_register_in_c_thread
-      assert Bug.postponed_job_register_in_c_thread(ary = [])
-      assert_equal [1], ary
+    def test_legacy_register_in_c_thread
+      assert_separately([], __FILE__, __LINE__, <<-'RUBY')
+        require '-test-/postponed_job'
+        assert Bug.postponed_job_register_in_c_thread(ary = [])
+        assert_equal [1], ary
+      RUBY
     end
   end
 end
diff --git a/test/-ext-/required.rb b/test/-ext-/required.rb
new file mode 100644
index 00000000000000..70514355ffecc9
--- /dev/null
+++ b/test/-ext-/required.rb
@@ -0,0 +1,10 @@
+require 'continuation'
+cont = nil
+a = [*1..10].reject do |i|
+  callcc {|c| cont = c} if !cont and i == 10
+  false
+end
+if a.size < 1000
+  a.unshift(:x)
+  cont.call
+end
diff --git a/test/-ext-/stack/test_stack_overflow.rb b/test/-ext-/stack/test_stack_overflow.rb
new file mode 100644
index 00000000000000..8eddec6ab5b089
--- /dev/null
+++ b/test/-ext-/stack/test_stack_overflow.rb
@@ -0,0 +1,55 @@
+# frozen_string_literal: true
+require 'test/unit'
+
+class Test_StackOverflow < Test::Unit::TestCase
+  def setup
+    omit "Stack overflow tests are not supported on this platform: #{RUBY_PLATFORM.inspect}" unless RUBY_PLATFORM =~ /x86_64-linux|darwin/
+
+    require '-test-/stack'
+
+    omit "Stack overflow tests are not supported with ASAN" if Thread.asan?
+  end
+
+  def test_overflow
+    assert_separately([], <<~RUBY)
+      # GC may try to scan the top of the stack and cause a SEGV.
+      GC.disable
+      require '-test-/stack'
+
+      assert_raise(SystemStackError) do
+        Thread.alloca_overflow
+      end
+    RUBY
+  end
+
+  def test_thread_stack_overflow
+    assert_separately([], <<~RUBY)
+      require '-test-/stack'
+      GC.disable
+
+      thread = Thread.new do
+        Thread.current.report_on_exception = false
+        Thread.alloca_overflow
+      end
+
+      assert_raise(SystemStackError) do
+        thread.join
+      end
+    RUBY
+  end
+
+  def test_fiber_stack_overflow
+    assert_separately([], <<~RUBY)
+      require '-test-/stack'
+      GC.disable
+
+      fiber = Fiber.new do
+        Thread.alloca_overflow
+      end
+
+      assert_raise(SystemStackError) do
+        fiber.resume
+      end
+    RUBY
+  end
+end
diff --git a/test/-ext-/string/test_capacity.rb b/test/-ext-/string/test_capacity.rb
index 71f91918e7fbcc..df000f7cdb8103 100644
--- a/test/-ext-/string/test_capacity.rb
+++ b/test/-ext-/string/test_capacity.rb
@@ -23,7 +23,7 @@ def test_capacity_normal
   def test_s_new_capacity
     assert_equal("", String.new(capacity: 1000))
     assert_equal(String, String.new(capacity: 1000).class)
-    assert_equal(10000, capa(String.new(capacity: 10000)))
+    assert_equal(10_000, capa(String.new(capacity: 10_000)))
 
     assert_equal("", String.new(capacity: -1000))
     assert_equal(capa(String.new(capacity: -10000)), capa(String.new(capacity: -1000)))
@@ -66,7 +66,7 @@ def capa(str)
   end
 
   def embed_header_size
-    3 * RbConfig::SIZEOF['void*']
+    GC::INTERNAL_CONSTANTS[:RBASIC_SIZE] + RbConfig::SIZEOF['void*']
   end
 
   def max_embed_len
diff --git a/test/-ext-/string/test_fstring.rb b/test/-ext-/string/test_fstring.rb
index 5a3456c5664c33..fcec6be5431b6e 100644
--- a/test/-ext-/string/test_fstring.rb
+++ b/test/-ext-/string/test_fstring.rb
@@ -15,19 +15,27 @@ def assert_fstring(str)
   def test_rb_enc_interned_str_autoloaded_encoding
     assert_separately([], <<~RUBY)
       require '-test-/string'
-      assert_include(Encoding::Windows_31J.inspect, 'autoload')
-      Bug::String.rb_enc_interned_str(Encoding::Windows_31J)
+      assert_include(Encoding::CESU_8.inspect, 'autoload')
+      Bug::String.rb_enc_interned_str(Encoding::CESU_8)
     RUBY
   end
 
+  def test_rb_enc_interned_str_null_encoding
+    assert_equal Encoding::ASCII_8BIT, Bug::String.rb_enc_interned_str(nil).encoding
+  end
+
   def test_rb_enc_str_new_autoloaded_encoding
     assert_separately([], <<~RUBY)
       require '-test-/string'
-      assert_include(Encoding::Windows_31J.inspect, 'autoload')
-      Bug::String.rb_enc_str_new(Encoding::Windows_31J)
+      assert_include(Encoding::CESU_8.inspect, 'autoload')
+      Bug::String.rb_enc_str_new(Encoding::CESU_8)
     RUBY
   end
 
+  def test_rb_enc_str_new_null_encoding
+    assert_equal Encoding::ASCII_8BIT, Bug::String.rb_enc_str_new(nil).encoding
+  end
+
   def test_instance_variable
     str = __method__.to_s * 3
     str.instance_variable_set(:@test, 42)
@@ -49,6 +57,10 @@ def test_singleton_class
     assert_raise(TypeError) {fstr.singleton_class}
   end
 
+  def test_fake_str
+    assert_equal([*"a".."z"].join(""), Bug::String.fstring_fake_str)
+  end
+
   class S < String
   end
 
diff --git a/test/-ext-/string/test_set_len.rb b/test/-ext-/string/test_set_len.rb
index 67ba961194ec4d..1531d76167c35c 100644
--- a/test/-ext-/string/test_set_len.rb
+++ b/test/-ext-/string/test_set_len.rb
@@ -34,4 +34,51 @@ def test_capacity_equals_to_new_size
     assert_equal 128, Bug::String.capacity(str)
     assert_equal 127, str.set_len(127).bytesize, bug12757
   end
+
+  def test_coderange_after_append
+    u = -"\u3042"
+    str = Bug::String.new(encoding: Encoding::UTF_8)
+    bsize = u.bytesize
+    str.append(u)
+    assert_equal 0, str.bytesize
+    str.set_len(bsize)
+    assert_equal bsize, str.bytesize
+    assert_predicate str, :valid_encoding?
+    assert_not_predicate str, :ascii_only?
+    assert_equal u, str
+  end
+
+  def test_coderange_after_trunc
+    u = -"\u3042"
+    bsize = u.bytesize
+    str = Bug::String.new(u)
+    str.set_len(bsize - 1)
+    assert_equal bsize - 1, str.bytesize
+    assert_not_predicate str, :valid_encoding?
+    assert_not_predicate str, :ascii_only?
+    str.append(u.byteslice(-1))
+    str.set_len(bsize)
+    assert_equal bsize, str.bytesize
+    assert_predicate str, :valid_encoding?
+    assert_not_predicate str, :ascii_only?
+    assert_equal u, str
+  end
+
+  def test_valid_encoding_after_resized
+    s = "\0\0".force_encoding(Encoding::UTF_16BE)
+    str = Bug::String.new(s)
+    assert_predicate str, :valid_encoding?
+    str.resize(1)
+    assert_not_predicate str, :valid_encoding?
+    str.resize(2)
+    assert_predicate str, :valid_encoding?
+    str.resize(3)
+    assert_not_predicate str, :valid_encoding?
+
+    s = "\xDB\x00\xDC\x00".force_encoding(Encoding::UTF_16BE)
+    str = Bug::String.new(s)
+    assert_predicate str, :valid_encoding?
+    str.resize(2)
+    assert_not_predicate str, :valid_encoding?
+  end
 end
diff --git a/test/-ext-/symbol/test_type.rb b/test/-ext-/symbol/test_type.rb
index fdee692fe411ee..2b0fbe5b798b93 100644
--- a/test/-ext-/symbol/test_type.rb
+++ b/test/-ext-/symbol/test_type.rb
@@ -134,5 +134,10 @@ def test_check_symbol_invalid_type
         Bug::Symbol.find(cx)
       }
     end
+
+    def test_const_name_type
+      sym = "\xb5".force_encoding(Encoding::Windows_1253)
+      assert_not_operator Bug::Symbol, :const?, sym, sym.encode(Encoding::UTF_8)
+    end
   end
 end
diff --git a/test/-ext-/test_abi.rb b/test/-ext-/test_abi.rb
index d3ea6bb9b105fe..307ad9f382542a 100644
--- a/test/-ext-/test_abi.rb
+++ b/test/-ext-/test_abi.rb
@@ -9,7 +9,11 @@ def test_require_lib_with_incorrect_abi_on_dev_ruby
     assert_separately [], <<~RUBY
       err = assert_raise(LoadError) { require "-test-/abi" }
       assert_match(/incompatible ABI version/, err.message)
-      assert_include err.message, "/-test-/abi."
+      if Namespace.enabled?
+        assert_include err.message, "_-test-+abi."
+      else
+        assert_include err.message, "/-test-/abi."
+      end
     RUBY
   end
 
@@ -27,7 +31,11 @@ def test_enable_abi_check_using_environment_variable
     assert_separately [{ "RUBY_ABI_CHECK" => "1" }], <<~RUBY
       err = assert_raise(LoadError) { require "-test-/abi" }
       assert_match(/incompatible ABI version/, err.message)
-      assert_include err.message, "/-test-/abi."
+      if Namespace.enabled?
+        assert_include err.message, "_-test-+abi."
+      else
+        assert_include err.message, "/-test-/abi."
+      end
     RUBY
   end
 
diff --git a/test/-ext-/test_bug-3571.rb b/test/-ext-/test_bug-3571.rb
index c75d2e85232b7d..5952ce2a33c0a1 100644
--- a/test/-ext-/test_bug-3571.rb
+++ b/test/-ext-/test_bug-3571.rb
@@ -13,8 +13,8 @@ def test_block_call_id
 SRC
     out = [
       "start() function is unimplemented on this machine",
-      "-:2:in `start'",
-      "-:2:in `<main>'",
+      "-:2:in 'Bug.start'",
+      "-:2:in '<main>'",
     ]
     assert_in_out_err(%w"-r-test-/bug_3571", src, [], out, bug3571)
   end
diff --git a/test/-ext-/test_ensure_and_callcc.rb b/test/-ext-/test_ensure_and_callcc.rb
new file mode 100644
index 00000000000000..9303a094eabbca
--- /dev/null
+++ b/test/-ext-/test_ensure_and_callcc.rb
@@ -0,0 +1,40 @@
+# -*- coding: us-ascii -*-
+# frozen_string_literal: false
+require 'test/unit'
+
+class TestEnsureAndCallcc < Test::Unit::TestCase
+  def test_bug20655_dir_chdir_using_rb_ensure
+    require 'tmpdir'
+    need_continuation
+    called = 0
+    tmp = nil
+    Dir.mktmpdir do |tmpdir|
+      Dir.chdir(tmpdir) do
+        tmp = Dir.pwd
+        cont = nil
+        callcc{|c| cont = c}
+        assert_equal(tmp, Dir.pwd, "BUG #20655: ensure called and pwd was changed unexpectedly")
+        called += 1
+        cont.call if called < 10
+      end
+    end
+  end
+
+  def test_bug20655_extension_using_rb_ensure
+    need_continuation
+    require '-test-/ensure_and_callcc'
+    EnsureAndCallcc.reset
+    assert_equal(0, EnsureAndCallcc.ensure_called)
+    EnsureAndCallcc.require_with_ensure(File.join(__dir__, 'required'))
+    assert_equal(1, EnsureAndCallcc.ensure_called,
+                 "BUG #20655: ensure called unexpectedly in the required script even without exceptions")
+  end
+
+  private
+  def need_continuation
+    unless respond_to?(:callcc, true)
+      EnvUtil.suppress_warning {require 'continuation'}
+    end
+    omit 'requires callcc support' unless respond_to?(:callcc, true)
+  end
+end
diff --git a/test/-ext-/thread/helper.rb b/test/-ext-/thread/helper.rb
new file mode 100644
index 00000000000000..3ea2057d15f946
--- /dev/null
+++ b/test/-ext-/thread/helper.rb
@@ -0,0 +1,51 @@
+module ThreadInstrumentation
+  module TestHelper
+    private
+
+    def record
+      Bug::ThreadInstrumentation.register_callback(!ENV["GVL_DEBUG"])
+      yield
+    ensure
+      timeline = Bug::ThreadInstrumentation.unregister_callback
+      if $!
+        raise
+      else
+        return timeline
+      end
+    end
+
+    def timeline_for(thread, timeline)
+      timeline.select { |t, _| t == thread }.map(&:last)
+    end
+
+    def assert_consistent_timeline(events)
+      refute_predicate events, :empty?
+
+      previous_event = nil
+      events.each do |event|
+        refute_equal :exited, previous_event, "`exited` must be the final event: #{events.inspect}"
+        case event
+        when :started
+          assert_nil previous_event, "`started` must be the first event: #{events.inspect}"
+        when :ready
+          unless previous_event.nil?
+            assert %i(started suspended).include?(previous_event), "`ready` must be preceded by `started` or `suspended`: #{events.inspect}"
+          end
+        when :resumed
+          unless previous_event.nil?
+            assert_equal :ready, previous_event, "`resumed` must be preceded by `ready`: #{events.inspect}"
+          end
+        when :suspended
+          unless previous_event.nil?
+            assert_equal :resumed, previous_event, "`suspended` must be preceded by `resumed`: #{events.inspect}"
+          end
+        when :exited
+          unless previous_event.nil?
+            assert %i(resumed suspended).include?(previous_event), "`exited` must be preceded by `resumed` or `suspended`: #{events.inspect}"
+          end
+        end
+        previous_event = event
+      end
+    end
+  end
+end
diff --git a/test/-ext-/thread/test_instrumentation_api.rb b/test/-ext-/thread/test_instrumentation_api.rb
index dd620e73803390..ba4106930485f1 100644
--- a/test/-ext-/thread/test_instrumentation_api.rb
+++ b/test/-ext-/thread/test_instrumentation_api.rb
@@ -1,91 +1,291 @@
 # frozen_string_literal: false
 require 'envutil'
+require_relative "helper"
 
 class TestThreadInstrumentation < Test::Unit::TestCase
+  include ThreadInstrumentation::TestHelper
+
   def setup
     pend("No windows support") if /mswin|mingw|bccwin/ =~ RUBY_PLATFORM
 
     require '-test-/thread/instrumentation'
 
-    Thread.list.each do |thread|
-      if thread != Thread.current
-        thread.kill
-        thread.join rescue nil
-      end
-    end
-    assert_equal [Thread.current], Thread.list
-
-    Bug::ThreadInstrumentation.reset_counters
-    Bug::ThreadInstrumentation::register_callback
+    cleanup_threads
   end
 
   def teardown
     return if /mswin|mingw|bccwin/ =~ RUBY_PLATFORM
-    Bug::ThreadInstrumentation::unregister_callback
+    Bug::ThreadInstrumentation.unregister_callback
+    cleanup_threads
   end
 
   THREADS_COUNT = 3
 
-  def test_thread_instrumentation
-    threads = threaded_cpu_work
-    assert_equal [false] * THREADS_COUNT, threads.map(&:status)
-    counters = Bug::ThreadInstrumentation.counters
-    assert_join_counters(counters)
-    assert_global_join_counters(counters)
+  def test_single_thread_timeline
+    thread = nil
+    full_timeline = record do
+      thread = Thread.new { 1 + 1 }
+      thread.join
+    end
+    assert_equal %i(started ready resumed suspended exited), timeline_for(thread, full_timeline)
+  ensure
+    thread&.kill
+  end
+
+  def test_thread_pass_single_thread
+    full_timeline = record do
+      Thread.pass
+    end
+    assert_equal [], timeline_for(Thread.current, full_timeline)
+  end
+
+  def test_thread_pass_multi_thread
+    thread = Thread.new do
+      cpu_bound_work(0.5)
+    end
+
+    full_timeline = record do
+      Thread.pass
+    end
+
+    assert_equal %i(suspended ready resumed), timeline_for(Thread.current, full_timeline)
+  ensure
+    thread&.kill
+    thread&.join
+  end
+
+  def test_multi_thread_timeline
+    threads = nil
+    full_timeline = record do
+      threads = threaded_cpu_bound_work(1.0)
+      results = threads.map(&:value)
+      results.each do |r|
+        refute_equal false, r
+      end
+      assert_equal [false] * THREADS_COUNT, threads.map(&:status)
+    end
+
+    threads.each do |thread|
+      timeline = timeline_for(thread, full_timeline)
+      assert_consistent_timeline(timeline)
+      assert_operator timeline.count(:suspended), :>=, 1, "Expected threads to yield suspended at least once: #{timeline.inspect}"
+    end
+
+    timeline = timeline_for(Thread.current, full_timeline)
+    assert_consistent_timeline(timeline)
+  ensure
+    threads&.each(&:kill)
+  end
+
+  def test_join_suspends # Bug #18900
+    thread = other_thread = nil
+    full_timeline = record do
+      other_thread = Thread.new { sleep 0.3 }
+      thread = Thread.new { other_thread.join }
+      thread.join
+    end
+
+    timeline = timeline_for(thread, full_timeline)
+    assert_consistent_timeline(timeline)
+    assert_equal %i(started ready resumed suspended ready resumed suspended exited), timeline
+  ensure
+    other_thread&.kill
+    thread&.kill
+  end
+
+  def test_io_release_gvl
+    r, w = IO.pipe
+    thread = nil
+    full_timeline = record do
+      thread = Thread.new do
+        w.write("Hello\n")
+      end
+      thread.join
+    end
+
+    timeline = timeline_for(thread, full_timeline)
+    assert_consistent_timeline(timeline)
+    assert_equal %i(started ready resumed suspended ready resumed suspended exited), timeline
+  ensure
+    r&.close
+    w&.close
+  end
+
+  def test_queue_releases_gvl
+    queue1 = Queue.new
+    queue2 = Queue.new
+
+    thread = nil
+
+    full_timeline = record do
+      thread = Thread.new do
+        queue1 << true
+        queue2.pop
+      end
+
+      queue1.pop
+      queue2 << true
+      thread.join
+    end
+
+    timeline = timeline_for(thread, full_timeline)
+    assert_consistent_timeline(timeline)
+    assert_equal %i(started ready resumed suspended ready resumed suspended exited), timeline
+  end
+
+  def test_blocking_on_ractor
+    assert_ractor(<<-"RUBY", require_relative: "helper", require: "-test-/thread/instrumentation")
+      include ThreadInstrumentation::TestHelper
+
+      ractor = Ractor.new {
+        Ractor.receive # wait until woke
+        Thread.current
+      }
+
+      # Wait for the main thread to block, then wake the ractor
+      Thread.new do
+        while Thread.main.status != "sleep"
+          Thread.pass
+        end
+        ractor.send true
+      end
+
+      full_timeline = record do
+        ractor.value
+      end
+
+      timeline = timeline_for(Thread.current, full_timeline)
+      assert_consistent_timeline(timeline)
+      assert_equal %i(suspended ready resumed), timeline
+    RUBY
+  end
+
+  def test_sleeping_inside_ractor
+    omit "This test is flaky and intermittently failing now on ModGC workflow" if ENV['GITHUB_WORKFLOW'] == 'ModGC'
+
+    assert_ractor(<<-"RUBY", require_relative: "helper", require: "-test-/thread/instrumentation")
+      include ThreadInstrumentation::TestHelper
+
+      thread = nil
+
+      full_timeline = record do
+        thread = Ractor.new{
+          sleep 0.1
+          Thread.current
+        }.value
+        sleep 0.1
+      end
+
+      timeline = timeline_for(thread, full_timeline)
+      assert_consistent_timeline(timeline)
+      assert_equal %i(started ready resumed suspended ready resumed suspended exited), timeline
+    RUBY
+  end
+
+  def test_thread_blocked_forever_on_mutex
+    mutex = Mutex.new
+    mutex.lock
+    thread = nil
+
+    full_timeline = record do
+      thread = Thread.new do
+        mutex.lock
+      end
+      10.times { Thread.pass }
+      sleep 0.1
+    end
+
+    mutex.unlock
+    thread.join
+
+    timeline = timeline_for(thread, full_timeline)
+    assert_consistent_timeline(timeline)
+    assert_equal %i(started ready resumed suspended), timeline
   end
 
-  def test_join_counters # Bug #18900
-    thr = Thread.new { fib(30) }
-    Bug::ThreadInstrumentation.reset_counters
-    thr.join
-    assert_join_counters(Bug::ThreadInstrumentation.local_counters)
+  def test_thread_blocked_temporarily_on_mutex
+    mutex = Mutex.new
+    mutex.lock
+    thread = nil
+
+    full_timeline = record do
+      thread = Thread.new do
+        mutex.lock
+      end
+      10.times { Thread.pass }
+      sleep 0.1
+      mutex.unlock
+      10.times { Thread.pass }
+      sleep 0.1
+    end
+
+    thread.join
+
+    timeline = timeline_for(thread, full_timeline)
+    assert_consistent_timeline(timeline)
+    assert_equal %i(started ready resumed suspended ready resumed suspended exited), timeline
   end
 
   def test_thread_instrumentation_fork_safe
     skip "No fork()" unless Process.respond_to?(:fork)
 
-    thread_statuses = counters = nil
+    thread_statuses = full_timeline = nil
     IO.popen("-") do |read_pipe|
       if read_pipe
         thread_statuses = Marshal.load(read_pipe)
-        counters = Marshal.load(read_pipe)
+        full_timeline = Marshal.load(read_pipe)
       else
-        Bug::ThreadInstrumentation.reset_counters
-        threads = threaded_cpu_work
+        threads = threaded_cpu_bound_work.each(&:join)
         Marshal.dump(threads.map(&:status), STDOUT)
-        Marshal.dump(Bug::ThreadInstrumentation.counters, STDOUT)
+        full_timeline = Bug::ThreadInstrumentation.unregister_callback.map { |t, e| [t.to_s, e ] }
+        Marshal.dump(full_timeline, STDOUT)
       end
     end
     assert_predicate $?, :success?
 
     assert_equal [false] * THREADS_COUNT, thread_statuses
-    assert_join_counters(counters)
-    assert_global_join_counters(counters)
+    thread_names = full_timeline.map(&:first).uniq
+    thread_names.each do |thread_name|
+      assert_consistent_timeline(timeline_for(thread_name, full_timeline))
+    end
   end
 
   def test_thread_instrumentation_unregister
-    Bug::ThreadInstrumentation::unregister_callback
     assert Bug::ThreadInstrumentation::register_and_unregister_callbacks
   end
 
   private
 
-  def fib(n = 20)
+  def fib(n = 30)
     return n if n <= 1
     fib(n-1) + fib(n-2)
   end
 
-  def threaded_cpu_work(size = 20)
-    THREADS_COUNT.times.map { Thread.new { fib(size) } }.each(&:join)
+  def cpu_bound_work(duration)
+    deadline = Process.clock_gettime(Process::CLOCK_MONOTONIC) + duration
+    i = 0
+    while deadline > Process.clock_gettime(Process::CLOCK_MONOTONIC)
+      fib(25)
+      i += 1
+    end
+    i > 0 ? i : false
   end
 
-  def assert_join_counters(counters)
-    counters.each_with_index do |c, i|
-      assert_operator c, :>, 0, "Call counters[#{i}]: #{counters.inspect}"
+  def threaded_cpu_bound_work(duration = 0.5)
+    THREADS_COUNT.times.map do
+      Thread.new do
+        cpu_bound_work(duration)
+      end
     end
   end
 
-  def assert_global_join_counters(counters)
-    assert_equal THREADS_COUNT, counters.first
+  def cleanup_threads
+    Thread.list.each do |thread|
+      if thread != Thread.current
+        thread.kill
+        thread.join rescue nil
+      end
+    end
+    assert_equal [Thread.current], Thread.list
   end
 end
diff --git a/test/-ext-/thread/test_lock_native_thread.rb b/test/-ext-/thread/test_lock_native_thread.rb
new file mode 100644
index 00000000000000..8a5ba78838d6bf
--- /dev/null
+++ b/test/-ext-/thread/test_lock_native_thread.rb
@@ -0,0 +1,50 @@
+# frozen_string_literal: false
+
+require 'envutil'
+
+mn_supported_p = -> do
+  out, *_ = EnvUtil.invoke_ruby([{'RUBY_MN_THREADS' => '1'}, '-v'], '', true)
+  return /\+MN/ =~ out
+end
+
+if mn_supported_p.call
+  # test only on MN threads
+else
+  return
+end
+
+class TestThreadLockNativeThread < Test::Unit::TestCase
+  def test_lock_native_thread
+    assert_separately([{'RUBY_MN_THREADS' => '1'}], <<-RUBY)
+      require '-test-/thread/lock_native_thread'
+
+      Thread.new{
+        assert_equal true, Thread.current.lock_native_thread
+      }.join
+
+      # main thread already has DNT
+      assert_equal false, Thread.current.lock_native_thread
+    RUBY
+  end
+
+  def test_lock_native_thread_tls
+    assert_separately([{'RUBY_MN_THREADS' => '1'}], <<-RUBY)
+      require '-test-/thread/lock_native_thread'
+      tn = 10
+      ln = 1_000
+
+      ts = tn.times.map{|i|
+        Thread.new(i){|i|
+          Thread.current.set_tls i
+          assert_equal true, Thread.current.lock_native_thread
+
+          ln.times{
+            assert_equal i, Thread.current.get_tls
+            Thread.pass
+          }
+        }
+      }
+      ts.each(&:join)
+    RUBY
+  end
+end
diff --git a/test/-ext-/thread_fd/test_thread_fd_close.rb b/test/-ext-/thread_fd/test_thread_fd_close.rb
deleted file mode 100644
index 1d2ef636357a68..00000000000000
--- a/test/-ext-/thread_fd/test_thread_fd_close.rb
+++ /dev/null
@@ -1,24 +0,0 @@
-# frozen_string_literal: true
-require 'test/unit'
-require '-test-/thread_fd'
-
-class TestThreadFdClose < Test::Unit::TestCase
-
-  def test_thread_fd_close
-    IO.pipe do |r, w|
-      th = Thread.new do
-        begin
-          assert_raise(IOError) {
-            r.read(4)
-          }
-        ensure
-          w.syswrite('done')
-        end
-      end
-      Thread.pass until th.stop?
-      IO.thread_fd_close(r.fileno)
-      assert_equal 'done', r.read(4)
-      th.join
-    end
-  end
-end
diff --git a/test/-ext-/tracepoint/test_tracepoint.rb b/test/-ext-/tracepoint/test_tracepoint.rb
index 9d1679602a556c..bf66d8f10514ff 100644
--- a/test/-ext-/tracepoint/test_tracepoint.rb
+++ b/test/-ext-/tracepoint/test_tracepoint.rb
@@ -11,6 +11,7 @@ def test_not_available_from_ruby
 
   def test_tracks_objspace_events
     result = EnvUtil.suppress_warning {eval(<<-EOS, nil, __FILE__, __LINE__+1)}
+    # frozen_string_literal: false
     Bug.tracepoint_track_objspace_events {
       99
       'abc'
@@ -65,15 +66,15 @@ def test_after_gc_start_hook_with_GC_stress
         count = 0
         hook = proc {count += 1}
         def run(hook)
-        stress, GC.stress = GC.stress, false
-        Bug.after_gc_start_hook = hook
-        begin
-          GC.stress = true
-          3.times {Object.new}
-        ensure
-          GC.stress = stress
-          Bug.after_gc_start_hook = nil
-        end
+          stress, GC.stress = GC.stress, false
+          Bug.after_gc_start_hook = hook
+          begin
+            GC.stress = true
+            3.times {Object.new}
+          ensure
+            GC.stress = stress
+            Bug.after_gc_start_hook = nil
+          end
         end
         run(hook)
         puts count
diff --git a/test/.excludes-mmtk/TestArgf.rb b/test/.excludes-mmtk/TestArgf.rb
new file mode 100644
index 00000000000000..cde96468e2d0f3
--- /dev/null
+++ b/test/.excludes-mmtk/TestArgf.rb
@@ -0,0 +1 @@
+exclude(:test_inplace_bug_17117, "times out in debug mode on Ubuntu")
diff --git a/test/.excludes-mmtk/TestEtc.rb b/test/.excludes-mmtk/TestEtc.rb
new file mode 100644
index 00000000000000..746f5ba321f36f
--- /dev/null
+++ b/test/.excludes-mmtk/TestEtc.rb
@@ -0,0 +1 @@
+exclude(:test_ractor_parallel, "glibc error: Mutex lock with MarkSweep debug")
diff --git a/test/.excludes-mmtk/TestGc.rb b/test/.excludes-mmtk/TestGc.rb
new file mode 100644
index 00000000000000..cbab458b90ad90
--- /dev/null
+++ b/test/.excludes-mmtk/TestGc.rb
@@ -0,0 +1,26 @@
+exclude(:test_expand_heap, "testing behaviour specific to default GC")
+exclude(:test_gc_config_disable_major, "testing behaviour specific to default GC")
+exclude(:test_gc_config_disable_major_gc_start_always_works, "testing behaviour specific to default GC")
+exclude(:test_gc_config_full_mark_by_default, "testing behaviour specific to default GC")
+exclude(:test_gc_config_invalid_args, "testing behaviour specific to default GC")
+exclude(:test_gc_config_setting_returns_updated_config_hash, "testing behaviour specific to default GC")
+exclude(:test_gc_internals, "testing behaviour specific to default GC")
+exclude(:test_gc_parameter, "testing behaviour specific to default GC")
+exclude(:test_gc_parameter_init_slots, "testing behaviour specific to default GC")
+exclude(:test_heaps_grow_independently, "testing behaviour specific to default GC")
+exclude(:test_latest_gc_info, "testing behaviour specific to default GC")
+exclude(:test_latest_gc_info_argument, "testing behaviour specific to default GC")
+exclude(:test_latest_gc_info_need_major_by, "testing behaviour specific to default GC")
+exclude(:test_latest_gc_info_weak_references_count, "testing behaviour specific to default GC")
+exclude(:test_old_to_young_reference, "testing behaviour specific to default GC")
+exclude(:test_profiler_enabled, "MMTk does not have GC::Profiler")
+exclude(:test_profiler_raw_data, "MMTk does not have GC::Profiler")
+exclude(:test_profiler_total_time, "MMTk does not have GC::Profiler")
+exclude(:test_start_full_mark, "testing behaviour specific to default GC")
+exclude(:test_start_immediate_sweep, "testing behaviour specific to default GC")
+exclude(:test_stat, "testing behaviour specific to default GC")
+exclude(:test_stat_constraints, "testing behaviour specific to default GC")
+exclude(:test_stat_heap, "testing behaviour specific to default GC")
+exclude(:test_stat_heap_all, "testing behaviour specific to default GC")
+exclude(:test_stat_heap_constraints, "testing behaviour specific to default GC")
+exclude(:test_thrashing_for_young_objects, "testing behaviour specific to default GC")
diff --git a/test/.excludes-mmtk/TestObjSpace.rb b/test/.excludes-mmtk/TestObjSpace.rb
new file mode 100644
index 00000000000000..05666e46f07fc8
--- /dev/null
+++ b/test/.excludes-mmtk/TestObjSpace.rb
@@ -0,0 +1,3 @@
+exclude(:test_dump_all_full, "testing behaviour specific to default GC")
+exclude(:test_dump_flag_age, "testing behaviour specific to default GC")
+exclude(:test_dump_flags, "testing behaviour specific to default GC")
diff --git a/test/.excludes-mmtk/TestObjectSpace.rb b/test/.excludes-mmtk/TestObjectSpace.rb
new file mode 100644
index 00000000000000..a92be8090cee7d
--- /dev/null
+++ b/test/.excludes-mmtk/TestObjectSpace.rb
@@ -0,0 +1 @@
+exclude(:test_finalizer, "times out in debug mode on Ubuntu")
diff --git a/test/.excludes-mmtk/TestProcess.rb b/test/.excludes-mmtk/TestProcess.rb
new file mode 100644
index 00000000000000..527bf4b9410bf9
--- /dev/null
+++ b/test/.excludes-mmtk/TestProcess.rb
@@ -0,0 +1,4 @@
+exclude(:test_daemon_no_threads, "MMTk spawns worker threads after fork")
+exclude(:test_warmup_frees_pages, "testing behaviour specific to default GC")
+exclude(:test_warmup_promote_all_objects_to_oldgen, "testing behaviour specific to default GC")
+exclude(:test_warmup_run_major_gc_and_compact, "testing behaviour specific to default GC")
diff --git a/test/.excludes-mmtk/TestTracepointObj.rb b/test/.excludes-mmtk/TestTracepointObj.rb
new file mode 100644
index 00000000000000..2e45e398a3ccf3
--- /dev/null
+++ b/test/.excludes-mmtk/TestTracepointObj.rb
@@ -0,0 +1 @@
+exclude(:test_tracks_objspace_count, "testing behaviour specific to default GC")
diff --git a/test/.excludes-parsey/TestDefined.rb b/test/.excludes-parsey/TestDefined.rb
new file mode 100644
index 00000000000000..ae2a2a62700eee
--- /dev/null
+++ b/test/.excludes-parsey/TestDefined.rb
@@ -0,0 +1 @@
+exclude(:test_defined_paren_void_stmts, "defined? (x;)")
diff --git a/test/.excludes/TestThread.rb b/test/.excludes/TestThread.rb
index cf7e88427ee363..f26ea420a60662 100644
--- a/test/.excludes/TestThread.rb
+++ b/test/.excludes/TestThread.rb
@@ -12,3 +12,7 @@
   #     /usr/home/chkbuild/chkbuild/tmp/build/20220216T143001Z/ruby/test/ruby/test_thread.rb:1390:in `test_signal_at_join'
   exclude(:test_signal_at_join, 'gets stuck somewhere')
 end
+if /mswin/ =~ RUBY_PLATFORM && ENV.key?('GITHUB_ACTIONS')
+  # to avoid "`failed to allocate memory (NoMemoryError)" error
+  exclude(:test_thread_interrupt_for_killed_thread, 'TODO')
+end
diff --git a/test/.excludes/_appveyor/TestArray.rb b/test/.excludes/_appveyor/TestArray.rb
deleted file mode 100644
index 7d03833f071769..00000000000000
--- a/test/.excludes/_appveyor/TestArray.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-# https://ci.appveyor.com/project/ruby/ruby/builds/20339189/job/ltdpffep976xtj85
-# `test_push_over_ary_max': failed to allocate memory (NoMemoryError)
-exclude(:test_push_over_ary_max, 'Sometimes AppVeyor has insufficient memory to run this test')
-# https://ci.appveyor.com/project/ruby/ruby/builds/20728419/job/o73q9fy1ojfibg5v
-exclude(:test_unshift_over_ary_max, 'Sometimes AppVeyor has insufficient memory to run this test')
-# https://ci.appveyor.com/project/ruby/ruby/builds/20427662/job/prq9i2lkfxv2j0uy
-exclude(:test_splice_over_ary_max, 'Sometimes AppVeyor has insufficient memory to run this test')
diff --git a/test/base64/test_base64.rb b/test/base64/test_base64.rb
deleted file mode 100644
index ce716043a8eadb..00000000000000
--- a/test/base64/test_base64.rb
+++ /dev/null
@@ -1,115 +0,0 @@
-# coding: US-ASCII
-# frozen_string_literal: true
-require "test/unit"
-require "base64"
-
-class TestBase64 < Test::Unit::TestCase
-  def test_sample
-    assert_equal("U2VuZCByZWluZm9yY2VtZW50cw==\n", Base64.encode64('Send reinforcements'))
-    assert_equal('Send reinforcements', Base64.decode64("U2VuZCByZWluZm9yY2VtZW50cw==\n"))
-    assert_equal(
-      "Tm93IGlzIHRoZSB0aW1lIGZvciBhbGwgZ29vZCBjb2RlcnMKdG8gbGVhcm4g\nUnVieQ==\n",
-      Base64.encode64("Now is the time for all good coders\nto learn Ruby"))
-    assert_equal(
-      "Now is the time for all good coders\nto learn Ruby",
-      Base64.decode64("Tm93IGlzIHRoZSB0aW1lIGZvciBhbGwgZ29vZCBjb2RlcnMKdG8gbGVhcm4g\nUnVieQ==\n"))
-    assert_equal(
-      "VGhpcyBpcyBsaW5lIG9uZQpUaGlzIGlzIGxpbmUgdHdvClRoaXMgaXMgbGlu\nZSB0aHJlZQpBbmQgc28gb24uLi4K\n",
-      Base64.encode64("This is line one\nThis is line two\nThis is line three\nAnd so on...\n"))
-    assert_equal(
-      "This is line one\nThis is line two\nThis is line three\nAnd so on...\n",
-      Base64.decode64("VGhpcyBpcyBsaW5lIG9uZQpUaGlzIGlzIGxpbmUgdHdvClRoaXMgaXMgbGluZSB0aHJlZQpBbmQgc28gb24uLi4K"))
-  end
-
-  def test_encode64
-    assert_equal("", Base64.encode64(""))
-    assert_equal("AA==\n", Base64.encode64("\0"))
-    assert_equal("AAA=\n", Base64.encode64("\0\0"))
-    assert_equal("AAAA\n", Base64.encode64("\0\0\0"))
-    assert_equal("/w==\n", Base64.encode64("\377"))
-    assert_equal("//8=\n", Base64.encode64("\377\377"))
-    assert_equal("////\n", Base64.encode64("\377\377\377"))
-    assert_equal("/+8=\n", Base64.encode64("\xff\xef"))
-  end
-
-  def test_decode64
-    assert_equal("", Base64.decode64(""))
-    assert_equal("\0", Base64.decode64("AA==\n"))
-    assert_equal("\0\0", Base64.decode64("AAA=\n"))
-    assert_equal("\0\0\0", Base64.decode64("AAAA\n"))
-    assert_equal("\377", Base64.decode64("/w==\n"))
-    assert_equal("\377\377", Base64.decode64("//8=\n"))
-    assert_equal("\377\377\377", Base64.decode64("////\n"))
-    assert_equal("\xff\xef", Base64.decode64("/+8=\n"))
-  end
-
-  def test_strict_encode64
-    assert_equal("", Base64.strict_encode64(""))
-    assert_equal("AA==", Base64.strict_encode64("\0"))
-    assert_equal("AAA=", Base64.strict_encode64("\0\0"))
-    assert_equal("AAAA", Base64.strict_encode64("\0\0\0"))
-    assert_equal("/w==", Base64.strict_encode64("\377"))
-    assert_equal("//8=", Base64.strict_encode64("\377\377"))
-    assert_equal("////", Base64.strict_encode64("\377\377\377"))
-    assert_equal("/+8=", Base64.strict_encode64("\xff\xef"))
-  end
-
-  def test_strict_decode64
-    assert_equal("", Base64.strict_decode64(""))
-    assert_equal("\0", Base64.strict_decode64("AA=="))
-    assert_equal("\0\0", Base64.strict_decode64("AAA="))
-    assert_equal("\0\0\0", Base64.strict_decode64("AAAA"))
-    assert_equal("\377", Base64.strict_decode64("/w=="))
-    assert_equal("\377\377", Base64.strict_decode64("//8="))
-    assert_equal("\377\377\377", Base64.strict_decode64("////"))
-    assert_equal("\xff\xef", Base64.strict_decode64("/+8="))
-
-    assert_raise(ArgumentError) { Base64.strict_decode64("^") }
-    assert_raise(ArgumentError) { Base64.strict_decode64("A") }
-    assert_raise(ArgumentError) { Base64.strict_decode64("A^") }
-    assert_raise(ArgumentError) { Base64.strict_decode64("AA") }
-    assert_raise(ArgumentError) { Base64.strict_decode64("AA=") }
-    assert_raise(ArgumentError) { Base64.strict_decode64("AA===") }
-    assert_raise(ArgumentError) { Base64.strict_decode64("AA=x") }
-    assert_raise(ArgumentError) { Base64.strict_decode64("AAA") }
-    assert_raise(ArgumentError) { Base64.strict_decode64("AAA^") }
-    assert_raise(ArgumentError) { Base64.strict_decode64("AB==") }
-    assert_raise(ArgumentError) { Base64.strict_decode64("AAB=") }
-  end
-
-  def test_urlsafe_encode64
-    assert_equal("", Base64.urlsafe_encode64(""))
-    assert_equal("AA==", Base64.urlsafe_encode64("\0"))
-    assert_equal("AAA=", Base64.urlsafe_encode64("\0\0"))
-    assert_equal("AAAA", Base64.urlsafe_encode64("\0\0\0"))
-    assert_equal("_w==", Base64.urlsafe_encode64("\377"))
-    assert_equal("__8=", Base64.urlsafe_encode64("\377\377"))
-    assert_equal("____", Base64.urlsafe_encode64("\377\377\377"))
-    assert_equal("_-8=", Base64.urlsafe_encode64("\xff\xef"))
-  end
-
-  def test_urlsafe_encode64_unpadded
-    assert_equal("", Base64.urlsafe_encode64("", padding: false))
-    assert_equal("AA", Base64.urlsafe_encode64("\0", padding: false))
-    assert_equal("AAA", Base64.urlsafe_encode64("\0\0", padding: false))
-    assert_equal("AAAA", Base64.urlsafe_encode64("\0\0\0", padding: false))
-  end
-
-  def test_urlsafe_decode64
-    assert_equal("", Base64.urlsafe_decode64(""))
-    assert_equal("\0", Base64.urlsafe_decode64("AA=="))
-    assert_equal("\0\0", Base64.urlsafe_decode64("AAA="))
-    assert_equal("\0\0\0", Base64.urlsafe_decode64("AAAA"))
-    assert_equal("\377", Base64.urlsafe_decode64("_w=="))
-    assert_equal("\377\377", Base64.urlsafe_decode64("__8="))
-    assert_equal("\377\377\377", Base64.urlsafe_decode64("____"))
-    assert_equal("\xff\xef", Base64.urlsafe_decode64("_+8="))
-  end
-
-  def test_urlsafe_decode64_unpadded
-    assert_equal("\0", Base64.urlsafe_decode64("AA"))
-    assert_equal("\0\0", Base64.urlsafe_decode64("AAA"))
-    assert_equal("\0\0\0", Base64.urlsafe_decode64("AAAA"))
-    assert_raise(ArgumentError) { Base64.urlsafe_decode64("AA=") }
-  end
-end
diff --git a/test/benchmark/test_benchmark.rb b/test/benchmark/test_benchmark.rb
deleted file mode 100644
index ddd4a591bb378a..00000000000000
--- a/test/benchmark/test_benchmark.rb
+++ /dev/null
@@ -1,167 +0,0 @@
-# frozen_string_literal: true
-require 'test/unit'
-require 'benchmark'
-
-class TestBenchmark < Test::Unit::TestCase
-  BENCH_FOR_TIMES_UPTO = lambda do |x|
-    n = 1000
-    tf = x.report("for:")   { for _ in 1..n; '1'; end }
-    tt = x.report("times:") { n.times do   ; '1'; end }
-    tu = x.report("upto:")  { 1.upto(n) do ; '1'; end }
-    [tf+tt+tu, (tf+tt+tu)/3]
-  end
-
-  BENCH_FOR_TIMES_UPTO_NO_LABEL = lambda do |x|
-    n = 1000
-    x.report { for _ in 1..n; '1'; end }
-    x.report { n.times do   ; '1'; end }
-    x.report { 1.upto(n) do ; '1'; end }
-  end
-
-  def labels
-    %w[first second third]
-  end
-
-  def bench(type = :bm, *args, &block)
-    if block
-      Benchmark.send(type, *args, &block)
-    else
-      Benchmark.send(type, *args) do |x|
-        labels.each { |label|
-          x.report(label) {}
-        }
-      end
-    end
-  end
-
-  def capture_bench_output(type, *args, &block)
-    capture_output { bench(type, *args, &block) }.first.gsub(/[ \-]\d\.\d{6}/, ' --time--')
-  end
-
-  def test_tms_outputs_nicely
-    assert_equal("  0.000000   0.000000   0.000000 (  0.000000)\n", Benchmark::Tms.new.to_s)
-    assert_equal("  1.000000   2.000000  10.000000 (  5.000000)\n", Benchmark::Tms.new(1,2,3,4,5).to_s)
-    assert_equal("1.000000 2.000000 3.000000 4.000000 10.000000 (5.000000) label",
-                 Benchmark::Tms.new(1,2,3,4,5,'label').format('%u %y %U %Y %t %r %n'))
-    assert_equal("1.000000 2.000", Benchmark::Tms.new(1).format('%u %.3f', 2))
-    assert_equal("100.000000 150.000000 250.000000 (200.000000)\n",
-                 Benchmark::Tms.new(100, 150, 0, 0, 200).to_s)
-  end
-
-  def test_tms_wont_modify_the_format_String_given
-    format = "format %u"
-    Benchmark::Tms.new.format(format)
-    assert_equal("format %u", format)
-  end
-
-  BENCHMARK_OUTPUT_WITH_TOTAL_AVG = <<BENCH
-              user     system      total        real
-for:      --time--   --time--   --time-- (  --time--)
-times:    --time--   --time--   --time-- (  --time--)
-upto:     --time--   --time--   --time-- (  --time--)
->total:   --time--   --time--   --time-- (  --time--)
->avg:     --time--   --time--   --time-- (  --time--)
-BENCH
-
-  def test_benchmark_does_not_print_any_space_if_the_given_caption_is_empty
-    assert_equal(<<-BENCH, capture_bench_output(:benchmark))
-first  --time--   --time--   --time-- (  --time--)
-second  --time--   --time--   --time-- (  --time--)
-third  --time--   --time--   --time-- (  --time--)
-BENCH
-  end
-
-  def test_benchmark_makes_extra_calculations_with_an_Array_at_the_end_of_the_benchmark_and_show_the_result
-    assert_equal(BENCHMARK_OUTPUT_WITH_TOTAL_AVG,
-      capture_bench_output(:benchmark,
-        Benchmark::CAPTION, 7,
-        Benchmark::FORMAT, ">total:", ">avg:",
-        &BENCH_FOR_TIMES_UPTO))
-  end
-
-  def test_bm_returns_an_Array_of_the_times_with_the_labels
-    [:bm, :bmbm].each do |meth|
-      capture_output do
-        results = bench(meth)
-        assert_instance_of(Array, results)
-        assert_equal(labels.size, results.size)
-        results.zip(labels).each { |tms, label|
-          assert_instance_of(Benchmark::Tms, tms)
-          assert_equal(label, tms.label)
-        }
-      end
-    end
-  end
-
-  def test_bm_correctly_output_when_the_label_width_is_given
-    assert_equal(<<-BENCH, capture_bench_output(:bm, 6))
-             user     system      total        real
-first    --time--   --time--   --time-- (  --time--)
-second   --time--   --time--   --time-- (  --time--)
-third    --time--   --time--   --time-- (  --time--)
-BENCH
-  end
-
-  def test_bm_correctly_output_when_no_label_is_given
-    assert_equal(<<-BENCH, capture_bench_output(:bm, &BENCH_FOR_TIMES_UPTO_NO_LABEL))
-       user     system      total        real
-   --time--   --time--   --time-- (  --time--)
-   --time--   --time--   --time-- (  --time--)
-   --time--   --time--   --time-- (  --time--)
-BENCH
-  end
-
-  def test_bm_can_make_extra_calcultations_with_an_array_at_the_end_of_the_benchmark
-    assert_equal(BENCHMARK_OUTPUT_WITH_TOTAL_AVG,
-      capture_bench_output(:bm, 7, ">total:", ">avg:",
-        &BENCH_FOR_TIMES_UPTO))
-  end
-
-  BMBM_OUTPUT = <<BENCH
-Rehearsal ------------------------------------------
-first    --time--   --time--   --time-- (  --time--)
-second   --time--   --time--   --time-- (  --time--)
-third    --time--   --time--   --time-- (  --time--)
---------------------------------- total: --time--sec
-
-             user     system      total        real
-first    --time--   --time--   --time-- (  --time--)
-second   --time--   --time--   --time-- (  --time--)
-third    --time--   --time--   --time-- (  --time--)
-BENCH
-
-  def test_bmbm_correctly_guess_the_label_width_even_when_not_given
-    assert_equal(BMBM_OUTPUT, capture_bench_output(:bmbm))
-  end
-
-  def test_bmbm_correctly_output_when_the_label_width_is_given__bmbm_ignore_it__but_it_is_a_frequent_mistake
-    assert_equal(BMBM_OUTPUT, capture_bench_output(:bmbm, 6))
-  end
-
-  def test_report_item_shows_the_title__even_if_not_a_string
-    assert_operator(capture_bench_output(:bm) { |x| x.report(:title) {} }, :include?, 'title')
-    assert_operator(capture_bench_output(:bmbm) { |x| x.report(:title) {} }, :include?, 'title')
-  end
-
-  def test_bugs_ruby_dev_40906_can_add_in_place_the_time_of_execution_of_the_block_given
-    t = Benchmark::Tms.new
-    assert_equal(0, t.real)
-    t.add! { sleep 0.1 }
-    assert_not_equal(0, t.real)
-  end
-
-  def test_realtime_output
-    sleeptime = 1.0
-    realtime = Benchmark.realtime { sleep sleeptime }
-    assert_operator sleeptime, :<, realtime
-  end
-
-  # Test that `to_h` returns a hash with the expected data.
-  def test_tms_to_h
-    tms = Benchmark::Tms.new(1.1, 2.2, 3.3, 4.4, 5.5, 'my label')
-    expected_hash = {
-      utime: 1.1, stime: 2.2, cutime: 3.3, cstime: 4.4, real: 5.5, label: 'my label'
-    }
-    assert_equal(expected_hash, tms.to_h)
-  end
-end
diff --git a/test/bigdecimal/helper.rb b/test/bigdecimal/helper.rb
deleted file mode 100644
index 46721fb9a817e7..00000000000000
--- a/test/bigdecimal/helper.rb
+++ /dev/null
@@ -1,39 +0,0 @@
-# frozen_string_literal: false
-require "test/unit"
-require "bigdecimal"
-require 'rbconfig/sizeof'
-
-module TestBigDecimalBase
-  if RbConfig::SIZEOF.key?("int64_t")
-    SIZEOF_DECDIG = RbConfig::SIZEOF["int32_t"]
-    BASE = 1_000_000_000
-    BASE_FIG = 9
-  else
-    SIZEOF_DECDIG = RbConfig::SIZEOF["int16_t"]
-    BASE = 1000
-    BASE_FIG = 4
-  end
-
-  def setup
-    @mode = BigDecimal.mode(BigDecimal::EXCEPTION_ALL)
-    BigDecimal.mode(BigDecimal::EXCEPTION_ALL, true)
-    BigDecimal.mode(BigDecimal::EXCEPTION_UNDERFLOW, true)
-    BigDecimal.mode(BigDecimal::EXCEPTION_OVERFLOW, true)
-    BigDecimal.mode(BigDecimal::ROUND_MODE, BigDecimal::ROUND_HALF_UP)
-    BigDecimal.limit(0)
-  end
-
-  def teardown
-    [BigDecimal::EXCEPTION_INFINITY, BigDecimal::EXCEPTION_NaN,
-     BigDecimal::EXCEPTION_UNDERFLOW, BigDecimal::EXCEPTION_OVERFLOW].each do |mode|
-      BigDecimal.mode(mode, !(@mode & mode).zero?)
-    end
-  end
-
-  def under_gc_stress
-    stress, GC.stress = GC.stress, true
-    yield
-  ensure
-    GC.stress = stress
-  end
-end
diff --git a/test/bigdecimal/test_bigdecimal.rb b/test/bigdecimal/test_bigdecimal.rb
deleted file mode 100644
index b28242b747be26..00000000000000
--- a/test/bigdecimal/test_bigdecimal.rb
+++ /dev/null
@@ -1,2310 +0,0 @@
-# frozen_string_literal: false
-require_relative "helper"
-require 'bigdecimal/math'
-
-class TestBigDecimal < Test::Unit::TestCase
-  include TestBigDecimalBase
-
-  if defined? RbConfig::LIMITS
-    LIMITS = RbConfig::LIMITS
-  else
-    require 'fiddle'
-    LONG_MAX = (1 << (Fiddle::SIZEOF_LONG*8 - 1)) - 1
-    LONG_MIN = [LONG_MAX + 1].pack("L!").unpack("l!")[0]
-    LLONG_MAX = (1 << (Fiddle::SIZEOF_LONG_LONG*8 - 1)) - 1
-    LLONG_MIN = [LLONG_MAX + 1].pack("Q!").unpack("q!")[0]
-    ULLONG_MAX = (1 << Fiddle::SIZEOF_LONG_LONG*8) - 1
-    LIMITS = {
-      "LLONG_MIN" => LLONG_MIN,
-      "ULLONG_MAX" => ULLONG_MAX,
-      "FIXNUM_MIN" => LONG_MIN / 2,
-      "FIXNUM_MAX" => LONG_MAX / 2,
-      "INT64_MIN"  => -9223372036854775808,
-      "INT64_MAX"  => 9223372036854775807,
-      "UINT64_MAX" => 18446744073709551615,
-    }.freeze
-  end
-
-  ROUNDING_MODE_MAP = [
-    [ BigDecimal::ROUND_UP,        :up],
-    [ BigDecimal::ROUND_DOWN,      :down],
-    [ BigDecimal::ROUND_DOWN,      :truncate],
-    [ BigDecimal::ROUND_HALF_UP,   :half_up],
-    [ BigDecimal::ROUND_HALF_UP,   :default],
-    [ BigDecimal::ROUND_HALF_DOWN, :half_down],
-    [ BigDecimal::ROUND_HALF_EVEN, :half_even],
-    [ BigDecimal::ROUND_HALF_EVEN, :banker],
-    [ BigDecimal::ROUND_CEILING,   :ceiling],
-    [ BigDecimal::ROUND_CEILING,   :ceil],
-    [ BigDecimal::ROUND_FLOOR,     :floor],
-  ]
-
-  def assert_nan(x)
-    assert(x.nan?, "Expected #{x.inspect} to be NaN")
-  end
-
-  def assert_positive_infinite(x)
-    assert(x.infinite?, "Expected #{x.inspect} to be positive infinite")
-    assert_operator(x, :>, 0)
-  end
-
-  def assert_negative_infinite(x)
-    assert(x.infinite?, "Expected #{x.inspect} to be negative infinite")
-    assert_operator(x, :<, 0)
-  end
-
-  def assert_positive_zero(x)
-    assert_equal(BigDecimal::SIGN_POSITIVE_ZERO, x.sign,
-                 "Expected #{x.inspect} to be positive zero")
-  end
-
-  def assert_negative_zero(x)
-    assert_equal(BigDecimal::SIGN_NEGATIVE_ZERO, x.sign,
-                 "Expected #{x.inspect} to be negative zero")
-  end
-
-  def test_not_equal
-    assert_not_equal BigDecimal("1"), BigDecimal("2")
-  end
-
-  def test_BigDecimal
-    assert_equal(1, BigDecimal("1"))
-    assert_equal(1, BigDecimal("1", 1))
-    assert_equal(1, BigDecimal(" 1 "))
-    assert_equal(111, BigDecimal("1_1_1_"))
-    assert_equal(10**(-1), BigDecimal("1E-1"), '#4825')
-    assert_equal(1234, BigDecimal(" \t\n\r \r1234 \t\n\r \r"))
-
-    assert_raise(ArgumentError) { BigDecimal("1", -1) }
-    assert_raise_with_message(ArgumentError, /"1__1_1"/) { BigDecimal("1__1_1") }
-    assert_raise_with_message(ArgumentError, /"_1_1_1"/) { BigDecimal("_1_1_1") }
-
-    BigDecimal.save_exception_mode do
-      BigDecimal.mode(BigDecimal::EXCEPTION_OVERFLOW, false)
-      BigDecimal.mode(BigDecimal::EXCEPTION_NaN, false)
-      assert_positive_infinite(BigDecimal("Infinity"))
-      assert_positive_infinite(BigDecimal("1E1111111111111111111"))
-      assert_positive_infinite(BigDecimal(" \t\n\r \rInfinity \t\n\r \r"))
-      assert_negative_infinite(BigDecimal("-Infinity"))
-      assert_negative_infinite(BigDecimal(" \t\n\r \r-Infinity \t\n\r \r"))
-      assert_nan(BigDecimal("NaN"))
-      assert_nan(BigDecimal(" \t\n\r \rNaN \t\n\r \r"))
-    end
-  end
-
-  def test_BigDecimal_bug7522
-    bd = BigDecimal("1.12", 1)
-    assert_same(bd, BigDecimal(bd))
-    assert_same(bd, BigDecimal(bd, exception: false))
-    assert_not_same(bd, BigDecimal(bd, 1))
-    assert_not_same(bd, BigDecimal(bd, 1, exception: false))
-  end
-
-  def test_BigDecimal_issue_192
-    # https://github.com/ruby/bigdecimal/issues/192
-    # https://github.com/rails/rails/pull/42125
-    if BASE_FIG == 9
-      int = 1_000_000_000_12345_0000
-      big = BigDecimal("0.100000000012345e19")
-    else  # BASE_FIG == 4
-      int = 1_0000_12_00
-      big = BigDecimal("0.1000012e9")
-    end
-    assert_equal(BigDecimal(int), big, "[ruby/bigdecimal#192]")
-  end
-
-  def test_BigDecimal_with_invalid_string
-    [
-      '', '.', 'e1', 'd1', '.e', '.d', '1.e', '1.d', '.1e', '.1d',
-      '2,30', '19,000.0', '-2,30', '-19,000.0', '+2,30', '+19,000.0',
-      '2.3,0', '19.000,0', '-2.3,0', '-19.000,0', '+2.3,0', '+19.000,0',
-      '2.3.0', '19.000.0', '-2.3.0', '-19.000.0', '+2.3.0', '+19.000.0',
-      'invlaid value', '123 xyz'
-    ].each do |invalid_string|
-      assert_raise_with_message(ArgumentError, %Q[invalid value for BigDecimal(): "#{invalid_string}"]) do
-        BigDecimal(invalid_string)
-      end
-    end
-
-    BigDecimal.save_exception_mode do
-      BigDecimal.mode(BigDecimal::EXCEPTION_OVERFLOW, false)
-      BigDecimal.mode(BigDecimal::EXCEPTION_NaN, false)
-      assert_raise_with_message(ArgumentError, /"Infinity_"/) { BigDecimal("Infinity_") }
-      assert_raise_with_message(ArgumentError, /"\+Infinity_"/) { BigDecimal("+Infinity_") }
-      assert_raise_with_message(ArgumentError, /"-Infinity_"/) { BigDecimal("-Infinity_") }
-      assert_raise_with_message(ArgumentError, /"NaN_"/) { BigDecimal("NaN_") }
-    end
-  end
-
-  def test_BigDecimal_with_integer
-    assert_equal(BigDecimal("0"), BigDecimal(0))
-    assert_equal(BigDecimal("1"), BigDecimal(1))
-    assert_equal(BigDecimal("-1"), BigDecimal(-1))
-    assert_equal(BigDecimal((2**100).to_s), BigDecimal(2**100))
-    assert_equal(BigDecimal((-2**100).to_s), BigDecimal(-2**100))
-
-    assert_equal(BigDecimal(LIMITS["FIXNUM_MIN"].to_s), BigDecimal(LIMITS["FIXNUM_MIN"]))
-
-    assert_equal(BigDecimal(LIMITS["FIXNUM_MAX"].to_s), BigDecimal(LIMITS["FIXNUM_MAX"]))
-
-    assert_equal(BigDecimal(LIMITS["INT64_MIN"].to_s), BigDecimal(LIMITS["INT64_MIN"]))
-
-    assert_equal(BigDecimal(LIMITS["INT64_MAX"].to_s), BigDecimal(LIMITS["INT64_MAX"]))
-
-    assert_equal(BigDecimal(LIMITS["UINT64_MAX"].to_s), BigDecimal(LIMITS["UINT64_MAX"]))
-  end
-
-  def test_BigDecimal_with_rational
-    assert_equal(BigDecimal("0.333333333333333333333"), BigDecimal(1.quo(3), 21))
-    assert_equal(BigDecimal("-0.333333333333333333333"), BigDecimal(-1.quo(3), 21))
-    assert_raise_with_message(ArgumentError, "can't omit precision for a Rational.") { BigDecimal(42.quo(7)) }
-  end
-
-  def test_BigDecimal_with_float
-    assert_equal(BigDecimal("0.1235"), BigDecimal(0.1234567, 4))
-    assert_equal(BigDecimal("-0.1235"), BigDecimal(-0.1234567, 4))
-    assert_equal(BigDecimal("0.01"), BigDecimal(0.01, Float::DIG + 1))
-    assert_raise_with_message(ArgumentError, "can't omit precision for a Float.") { BigDecimal(4.2) }
-    assert_raise(ArgumentError) { BigDecimal(0.1, Float::DIG + 2) }
-    assert_nothing_raised { BigDecimal(0.1, Float::DIG + 1) }
-
-    assert_same(BigDecimal(0.0), BigDecimal(0.0))
-    assert_same(BigDecimal(-0.0), BigDecimal(-0.0))
-
-    bug9214 = '[ruby-core:58858]'
-    assert_equal(BigDecimal(-0.0).sign, -1, bug9214)
-
-    BigDecimal.save_exception_mode do
-      BigDecimal.mode(BigDecimal::EXCEPTION_NaN, false)
-      assert_nan(BigDecimal(Float::NAN))
-      assert_same(BigDecimal(Float::NAN), BigDecimal(Float::NAN))
-    end
-    BigDecimal.save_exception_mode do
-      BigDecimal.mode(BigDecimal::EXCEPTION_INFINITY, false)
-      assert_positive_infinite(BigDecimal(Float::INFINITY))
-      assert_same(BigDecimal(Float::INFINITY), BigDecimal(Float::INFINITY))
-      assert_negative_infinite(BigDecimal(-Float::INFINITY))
-      assert_same(BigDecimal(-Float::INFINITY), BigDecimal(-Float::INFINITY))
-    end
-  end
-
-  def test_BigDecimal_with_complex
-    assert_equal(BigDecimal("1"), BigDecimal(Complex(1, 0)))
-    assert_equal(BigDecimal("0.333333333333333333333"), BigDecimal(Complex(1.quo(3), 0), 21))
-    assert_equal(BigDecimal("0.1235"), BigDecimal(Complex(0.1234567, 0), 4))
-
-    assert_raise_with_message(ArgumentError, "Unable to make a BigDecimal from non-zero imaginary number") { BigDecimal(Complex(1, 1)) }
-  end
-
-  def test_BigDecimal_with_big_decimal
-    assert_equal(BigDecimal(1), BigDecimal(BigDecimal(1)))
-    assert_equal(BigDecimal('+0'), BigDecimal(BigDecimal('+0')))
-    assert_equal(BigDecimal('-0'), BigDecimal(BigDecimal('-0')))
-    BigDecimal.save_exception_mode do
-      BigDecimal.mode(BigDecimal::EXCEPTION_OVERFLOW, false)
-      BigDecimal.mode(BigDecimal::EXCEPTION_NaN, false)
-      assert_positive_infinite(BigDecimal(BigDecimal('Infinity')))
-      assert_negative_infinite(BigDecimal(BigDecimal('-Infinity')))
-      assert_nan(BigDecimal(BigDecimal('NaN')))
-    end
-  end
-
-  if RUBY_VERSION < '2.7'
-    def test_BigDecimal_with_tainted_string
-      Thread.new {
-        $SAFE = 1
-        BigDecimal('1'.taint)
-      }.join
-    ensure
-      $SAFE = 0
-    end
-  end
-
-  def test_BigDecimal_with_exception_keyword
-    assert_raise(ArgumentError) {
-      BigDecimal('.', exception: true)
-    }
-    assert_nothing_raised(ArgumentError) {
-      assert_equal(nil, BigDecimal(".", exception: false))
-    }
-    assert_raise(ArgumentError) {
-      BigDecimal("1", -1, exception: true)
-    }
-    assert_nothing_raised(ArgumentError) {
-      assert_equal(nil, BigDecimal("1", -1, exception: false))
-    }
-    assert_raise(ArgumentError) {
-      BigDecimal(42.quo(7), exception: true)
-    }
-    assert_nothing_raised(ArgumentError) {
-      assert_equal(nil, BigDecimal(42.quo(7), exception: false))
-    }
-    assert_raise(ArgumentError) {
-      BigDecimal(4.2, exception: true)
-    }
-    assert_nothing_raised(ArgumentError) {
-      assert_equal(nil, BigDecimal(4.2, exception: false))
-    }
-    # TODO: support conversion from complex
-    # assert_raise(RangeError) {
-    #   BigDecimal(1i, exception: true)
-    # }
-    # assert_nothing_raised(RangeError) {
-    #   assert_equal(nil, BigDecimal(1i, exception: false))
-    # }
-    assert_raise_with_message(TypeError, "can't convert nil into BigDecimal") {
-      BigDecimal(nil, exception: true)
-    }
-    assert_raise_with_message(TypeError, "can't convert true into BigDecimal") {
-      BigDecimal(true, exception: true)
-    }
-    assert_raise_with_message(TypeError, "can't convert false into BigDecimal") {
-      BigDecimal(false, exception: true)
-    }
-    assert_raise_with_message(TypeError, "can't convert Object into BigDecimal") {
-      BigDecimal(Object.new, exception: true)
-    }
-    assert_nothing_raised(TypeError) {
-      assert_equal(nil, BigDecimal(nil, exception: false))
-    }
-    assert_nothing_raised(TypeError) {
-      assert_equal(nil, BigDecimal(:test, exception: false))
-    }
-    assert_nothing_raised(TypeError) {
-      assert_equal(nil, BigDecimal(Object.new, exception: false))
-    }
-    assert_nothing_raised(TypeError) {
-      assert_equal(nil, BigDecimal(Object.new, exception: false))
-    }
-    # TODO: support to_d
-    # assert_nothing_raised(TypeError) {
-    #   o = Object.new
-    #   def o.to_d; 3.14; end
-    #   assert_equal(3.14, BigDecimal(o, exception: false))
-    # }
-    # assert_nothing_raised(RuntimeError) {
-    #   o = Object.new
-    #   def o.to_d; raise; end
-    #   assert_equal(nil, BigDecimal(o, exception: false))
-    # }
-  end
-
-  def test_s_ver
-    assert_raise_with_message(NoMethodError, /undefined method `ver'/) { BigDecimal.ver }
-  end
-
-  def test_s_allocate
-    if RUBY_ENGINE == "truffleruby"
-      assert_raise_with_message(NoMethodError, /undefined.+allocate.+for BigDecimal/) { BigDecimal.allocate }
-    else
-      assert_raise_with_message(TypeError, /allocator undefined for BigDecimal/) { BigDecimal.allocate }
-    end
-  end
-
-  def test_s_new
-    assert_raise_with_message(NoMethodError, /undefined method `new'/) { BigDecimal.new("1") }
-  end
-
-  def test_s_interpret_loosely
-    assert_equal(BigDecimal('1'), BigDecimal.interpret_loosely("1__1_1"))
-    assert_equal(BigDecimal('2.5'), BigDecimal.interpret_loosely("2.5"))
-    assert_equal(BigDecimal('2.5'), BigDecimal.interpret_loosely("2.5 degrees"))
-    assert_equal(BigDecimal('2.5e1'), BigDecimal.interpret_loosely("2.5e1 degrees"))
-    assert_equal(BigDecimal('0'), BigDecimal.interpret_loosely("degrees 100.0"))
-    assert_equal(BigDecimal('0.125'), BigDecimal.interpret_loosely("0.1_2_5"))
-    assert_equal(BigDecimal('0.125'), BigDecimal.interpret_loosely("0.1_2_5__"))
-    assert_equal(BigDecimal('1'), BigDecimal.interpret_loosely("1_.125"))
-    assert_equal(BigDecimal('1'), BigDecimal.interpret_loosely("1._125"))
-    assert_equal(BigDecimal('0.1'), BigDecimal.interpret_loosely("0.1__2_5"))
-    assert_equal(BigDecimal('0.1'), BigDecimal.interpret_loosely("0.1_e10"))
-    assert_equal(BigDecimal('0.1'), BigDecimal.interpret_loosely("0.1e_10"))
-    assert_equal(BigDecimal('1'), BigDecimal.interpret_loosely("0.1e1__0"))
-    assert_equal(BigDecimal('1.2'), BigDecimal.interpret_loosely("1.2.3"))
-    assert_equal(BigDecimal('1'), BigDecimal.interpret_loosely("1."))
-    assert_equal(BigDecimal('1'), BigDecimal.interpret_loosely("1e"))
-
-    assert_equal(BigDecimal('0.0'), BigDecimal.interpret_loosely("invalid"))
-
-    assert(BigDecimal.interpret_loosely("2.5").frozen?)
-  end
-
-  def _test_mode(type)
-    BigDecimal.mode(type, true)
-    assert_raise(FloatDomainError) { yield }
-
-    BigDecimal.mode(type, false)
-    assert_nothing_raised { yield }
-  end
-
-  def test_mode
-    assert_raise(ArgumentError) { BigDecimal.mode(BigDecimal::EXCEPTION_ALL, 1) }
-    assert_raise(ArgumentError) { BigDecimal.mode(BigDecimal::ROUND_MODE, 256) }
-    assert_raise(ArgumentError) { BigDecimal.mode(BigDecimal::ROUND_MODE, :xyzzy) }
-    assert_raise(TypeError) { BigDecimal.mode(0xf000, true) }
-
-    begin
-      saved_mode = BigDecimal.mode(BigDecimal::ROUND_MODE)
-
-      [ BigDecimal::ROUND_UP,
-        BigDecimal::ROUND_DOWN,
-        BigDecimal::ROUND_HALF_UP,
-        BigDecimal::ROUND_HALF_DOWN,
-        BigDecimal::ROUND_CEILING,
-        BigDecimal::ROUND_FLOOR,
-        BigDecimal::ROUND_HALF_EVEN,
-      ].each do |mode|
-        BigDecimal.mode(BigDecimal::ROUND_MODE, mode)
-        assert_equal(mode, BigDecimal.mode(BigDecimal::ROUND_MODE))
-      end
-    ensure
-      BigDecimal.mode(BigDecimal::ROUND_MODE, saved_mode)
-    end
-
-    BigDecimal.save_rounding_mode do
-      ROUNDING_MODE_MAP.each do |const, sym|
-        BigDecimal.mode(BigDecimal::ROUND_MODE, sym)
-        assert_equal(const, BigDecimal.mode(BigDecimal::ROUND_MODE))
-      end
-    end
-  end
-
-  def test_thread_local_mode
-    begin
-      saved_mode = BigDecimal.mode(BigDecimal::ROUND_MODE)
-
-      BigDecimal.mode(BigDecimal::ROUND_MODE, BigDecimal::ROUND_UP)
-      Thread.start {
-        BigDecimal.mode(BigDecimal::ROUND_MODE, BigDecimal::ROUND_HALF_EVEN)
-        assert_equal(BigDecimal::ROUND_HALF_EVEN, BigDecimal.mode(BigDecimal::ROUND_MODE))
-      }.join
-      assert_equal(BigDecimal::ROUND_UP, BigDecimal.mode(BigDecimal::ROUND_MODE))
-    ensure
-      BigDecimal.mode(BigDecimal::ROUND_MODE, saved_mode)
-    end
-  end
-
-  def test_save_exception_mode
-    BigDecimal.mode(BigDecimal::EXCEPTION_OVERFLOW, false)
-    mode = BigDecimal.mode(BigDecimal::EXCEPTION_OVERFLOW)
-    BigDecimal.save_exception_mode do
-      BigDecimal.mode(BigDecimal::EXCEPTION_OVERFLOW, true)
-    end
-    assert_equal(mode, BigDecimal.mode(BigDecimal::EXCEPTION_OVERFLOW))
-
-    BigDecimal.mode(BigDecimal::ROUND_MODE, BigDecimal::ROUND_FLOOR)
-    BigDecimal.save_exception_mode do
-      BigDecimal.mode(BigDecimal::ROUND_MODE, BigDecimal::ROUND_HALF_EVEN)
-    end
-    assert_equal(BigDecimal::ROUND_HALF_EVEN, BigDecimal.mode(BigDecimal::ROUND_MODE))
-
-    assert_equal(42, BigDecimal.save_exception_mode { 42 })
-  end
-
-  def test_save_rounding_mode
-    saved_mode = BigDecimal.mode(BigDecimal::ROUND_MODE)
-
-    BigDecimal.mode(BigDecimal::ROUND_MODE, BigDecimal::ROUND_FLOOR)
-    BigDecimal.save_rounding_mode do
-      BigDecimal.mode(BigDecimal::ROUND_MODE, BigDecimal::ROUND_HALF_EVEN)
-    end
-    assert_equal(BigDecimal::ROUND_FLOOR, BigDecimal.mode(BigDecimal::ROUND_MODE))
-
-    assert_equal(42, BigDecimal.save_rounding_mode { 42 })
-  ensure
-    BigDecimal.mode(BigDecimal::ROUND_MODE, saved_mode)
-  end
-
-  def test_save_limit
-    begin
-      old = BigDecimal.limit
-      BigDecimal.limit(100)
-      BigDecimal.save_limit do
-        BigDecimal.limit(200)
-      end
-      assert_equal(100, BigDecimal.limit);
-    ensure
-      BigDecimal.limit(old)
-    end
-
-    assert_equal(42, BigDecimal.save_limit { 42 })
-  end
-
-  def test_exception_nan
-    _test_mode(BigDecimal::EXCEPTION_NaN) { BigDecimal("NaN") }
-  end
-
-  def test_exception_infinity
-    _test_mode(BigDecimal::EXCEPTION_INFINITY) { BigDecimal("Infinity") }
-  end
-
-  def test_exception_underflow
-    _test_mode(BigDecimal::EXCEPTION_UNDERFLOW) do
-      x = BigDecimal("0.1")
-      100.times do
-        x *= x
-      end
-    end
-  end
-
-  def test_exception_overflow
-    _test_mode(BigDecimal::EXCEPTION_OVERFLOW) do
-      x = BigDecimal("10")
-      100.times do
-        x *= x
-      end
-    end
-  end
-
-  def test_exception_zerodivide
-    BigDecimal.mode(BigDecimal::EXCEPTION_OVERFLOW, false)
-    _test_mode(BigDecimal::EXCEPTION_ZERODIVIDE) { 1 / BigDecimal("0") }
-    _test_mode(BigDecimal::EXCEPTION_ZERODIVIDE) { -1 / BigDecimal("0") }
-  end
-
-  def test_round_up
-    n4 = BigDecimal("4") # n4 / 9 = 0.44444...
-    n5 = BigDecimal("5") # n5 / 9 = 0.55555...
-    n6 = BigDecimal("6") # n6 / 9 = 0.66666...
-    m4, m5, m6 = -n4, -n5, -n6
-    n2h = BigDecimal("2.5")
-    n3h = BigDecimal("3.5")
-    m2h, m3h = -n2h, -n3h
-
-    BigDecimal.mode(BigDecimal::ROUND_MODE, BigDecimal::ROUND_UP)
-    assert_operator(n4, :<, n4 / 9 * 9)
-    assert_operator(n5, :<, n5 / 9 * 9)
-    assert_operator(n6, :<, n6 / 9 * 9)
-    assert_operator(m4, :>, m4 / 9 * 9)
-    assert_operator(m5, :>, m5 / 9 * 9)
-    assert_operator(m6, :>, m6 / 9 * 9)
-    assert_equal(3, n2h.round)
-    assert_equal(4, n3h.round)
-    assert_equal(-3, m2h.round)
-    assert_equal(-4, m3h.round)
-
-    BigDecimal.mode(BigDecimal::ROUND_MODE, BigDecimal::ROUND_DOWN)
-    assert_operator(n4, :>, n4 / 9 * 9)
-    assert_operator(n5, :>, n5 / 9 * 9)
-    assert_operator(n6, :>, n6 / 9 * 9)
-    assert_operator(m4, :<, m4 / 9 * 9)
-    assert_operator(m5, :<, m5 / 9 * 9)
-    assert_operator(m6, :<, m6 / 9 * 9)
-    assert_equal(2, n2h.round)
-    assert_equal(3, n3h.round)
-    assert_equal(-2, m2h.round)
-    assert_equal(-3, m3h.round)
-
-    BigDecimal.mode(BigDecimal::ROUND_MODE, BigDecimal::ROUND_HALF_UP)
-    assert_operator(n4, :>, n4 / 9 * 9)
-    assert_operator(n5, :<, n5 / 9 * 9)
-    assert_operator(n6, :<, n6 / 9 * 9)
-    assert_operator(m4, :<, m4 / 9 * 9)
-    assert_operator(m5, :>, m5 / 9 * 9)
-    assert_operator(m6, :>, m6 / 9 * 9)
-    assert_equal(3, n2h.round)
-    assert_equal(4, n3h.round)
-    assert_equal(-3, m2h.round)
-    assert_equal(-4, m3h.round)
-
-    BigDecimal.mode(BigDecimal::ROUND_MODE, BigDecimal::ROUND_HALF_DOWN)
-    assert_operator(n4, :>, n4 / 9 * 9)
-    assert_operator(n5, :>, n5 / 9 * 9)
-    assert_operator(n6, :<, n6 / 9 * 9)
-    assert_operator(m4, :<, m4 / 9 * 9)
-    assert_operator(m5, :<, m5 / 9 * 9)
-    assert_operator(m6, :>, m6 / 9 * 9)
-    assert_equal(2, n2h.round)
-    assert_equal(3, n3h.round)
-    assert_equal(-2, m2h.round)
-    assert_equal(-3, m3h.round)
-
-    BigDecimal.mode(BigDecimal::ROUND_MODE, BigDecimal::ROUND_HALF_EVEN)
-    assert_operator(n4, :>, n4 / 9 * 9)
-    assert_operator(n5, :<, n5 / 9 * 9)
-    assert_operator(n6, :<, n6 / 9 * 9)
-    assert_operator(m4, :<, m4 / 9 * 9)
-    assert_operator(m5, :>, m5 / 9 * 9)
-    assert_operator(m6, :>, m6 / 9 * 9)
-    assert_equal(2, n2h.round)
-    assert_equal(4, n3h.round)
-    assert_equal(-2, m2h.round)
-    assert_equal(-4, m3h.round)
-
-    BigDecimal.mode(BigDecimal::ROUND_MODE, BigDecimal::ROUND_CEILING)
-    assert_operator(n4, :<, n4 / 9 * 9)
-    assert_operator(n5, :<, n5 / 9 * 9)
-    assert_operator(n6, :<, n6 / 9 * 9)
-    assert_operator(m4, :<, m4 / 9 * 9)
-    assert_operator(m5, :<, m5 / 9 * 9)
-    assert_operator(m6, :<, m6 / 9 * 9)
-    assert_equal(3, n2h.round)
-    assert_equal(4, n3h.round)
-    assert_equal(-2, m2h.round)
-    assert_equal(-3, m3h.round)
-
-    BigDecimal.mode(BigDecimal::ROUND_MODE, BigDecimal::ROUND_FLOOR)
-    assert_operator(n4, :>, n4 / 9 * 9)
-    assert_operator(n5, :>, n5 / 9 * 9)
-    assert_operator(n6, :>, n6 / 9 * 9)
-    assert_operator(m4, :>, m4 / 9 * 9)
-    assert_operator(m5, :>, m5 / 9 * 9)
-    assert_operator(m6, :>, m6 / 9 * 9)
-    assert_equal(2, n2h.round)
-    assert_equal(3, n3h.round)
-    assert_equal(-3, m2h.round)
-    assert_equal(-4, m3h.round)
-  end
-
-  def test_zero_p
-    BigDecimal.mode(BigDecimal::EXCEPTION_INFINITY, false)
-    BigDecimal.mode(BigDecimal::EXCEPTION_NaN, false)
-
-    assert_equal(true, BigDecimal("0").zero?)
-    assert_equal(true, BigDecimal("-0").zero?)
-    assert_equal(false, BigDecimal("1").zero?)
-    assert_equal(true, BigDecimal("0E200000000000000").zero?)
-    assert_equal(false, BigDecimal("Infinity").zero?)
-    assert_equal(false, BigDecimal("-Infinity").zero?)
-    assert_equal(false, BigDecimal("NaN").zero?)
-  end
-
-  def test_nonzero_p
-    BigDecimal.mode(BigDecimal::EXCEPTION_INFINITY, false)
-    BigDecimal.mode(BigDecimal::EXCEPTION_NaN, false)
-
-    assert_equal(nil, BigDecimal("0").nonzero?)
-    assert_equal(nil, BigDecimal("-0").nonzero?)
-    assert_equal(BigDecimal("1"), BigDecimal("1").nonzero?)
-    assert_positive_infinite(BigDecimal("Infinity").nonzero?)
-    assert_negative_infinite(BigDecimal("-Infinity").nonzero?)
-    assert_nan(BigDecimal("NaN").nonzero?)
-  end
-
-  def test_double_fig
-    assert_kind_of(Integer, BigDecimal.double_fig)
-  end
-
-  def test_cmp
-    n1 = BigDecimal("1")
-    n2 = BigDecimal("2")
-    assert_equal( 0, n1 <=> n1)
-    assert_equal( 1, n2 <=> n1)
-    assert_equal(-1, n1 <=> n2)
-    assert_operator(n1, :==, n1)
-    assert_operator(n1, :!=, n2)
-    assert_operator(n1, :<, n2)
-    assert_operator(n1, :<=, n1)
-    assert_operator(n1, :<=, n2)
-    assert_operator(n2, :>, n1)
-    assert_operator(n2, :>=, n1)
-    assert_operator(n1, :>=, n1)
-
-    assert_operator(BigDecimal("-0"), :==, BigDecimal("0"))
-    assert_operator(BigDecimal("0"), :<, BigDecimal("1"))
-    assert_operator(BigDecimal("1"), :>, BigDecimal("0"))
-    assert_operator(BigDecimal("1"), :>, BigDecimal("-1"))
-    assert_operator(BigDecimal("-1"), :<, BigDecimal("1"))
-    assert_operator(BigDecimal((2**100).to_s), :>, BigDecimal("1"))
-    assert_operator(BigDecimal("1"), :<, BigDecimal((2**100).to_s))
-
-    BigDecimal.mode(BigDecimal::EXCEPTION_OVERFLOW, false)
-    inf = BigDecimal("Infinity")
-    assert_operator(inf, :>, 1)
-    assert_operator(1, :<, inf)
-
-    assert_operator(BigDecimal("1E-1"), :==, 10**(-1), '#4825')
-    assert_equal(0, BigDecimal("1E-1") <=> 10**(-1), '#4825')
-  end
-
-  def test_cmp_issue9192
-    bug9192 = '[ruby-core:58756] [#9192]'
-    operators = { :== => :==, :< => :>, :> => :<, :<= => :>=, :>= => :<= }
-    5.upto(8) do |i|
-      s = "706.0#{i}"
-      d = BigDecimal(s)
-      f = s.to_f
-      operators.each do |op, inv|
-        assert_equal(d.send(op, f), f.send(inv, d),
-                     "(BigDecimal(#{s.inspect}) #{op} #{s}) and (#{s} #{inv} BigDecimal(#{s.inspect})) is different #{bug9192}")
-      end
-    end
-  end
-
-  def test_cmp_nan
-    n1 = BigDecimal("1")
-    BigDecimal.mode(BigDecimal::EXCEPTION_NaN, false)
-    assert_equal(nil, BigDecimal("NaN") <=> n1)
-    assert_equal(false, BigDecimal("NaN") > n1)
-    assert_equal(nil, BigDecimal("NaN") <=> BigDecimal("NaN"))
-    assert_equal(false, BigDecimal("NaN") == BigDecimal("NaN"))
-  end
-
-  def test_cmp_failing_coercion
-    n1 = BigDecimal("1")
-    assert_equal(nil, n1 <=> nil)
-    assert_raise(ArgumentError){n1 > nil}
-  end
-
-  def test_cmp_coerce
-    n1 = BigDecimal("1")
-    n2 = BigDecimal("2")
-    o1 = Object.new; def o1.coerce(x); [x, BigDecimal("1")]; end
-    o2 = Object.new; def o2.coerce(x); [x, BigDecimal("2")]; end
-    assert_equal( 0, n1 <=> o1)
-    assert_equal( 1, n2 <=> o1)
-    assert_equal(-1, n1 <=> o2)
-    assert_operator(n1, :==, o1)
-    assert_operator(n1, :!=, o2)
-    assert_operator(n1, :<, o2)
-    assert_operator(n1, :<=, o1)
-    assert_operator(n1, :<=, o2)
-    assert_operator(n2, :>, o1)
-    assert_operator(n2, :>=, o1)
-    assert_operator(n1, :>=, 1)
-
-    bug10109 = '[ruby-core:64190]'
-    BigDecimal.mode(BigDecimal::EXCEPTION_INFINITY, false)
-    assert_operator(BigDecimal(0), :<, Float::INFINITY, bug10109)
-    assert_operator(Float::INFINITY, :>, BigDecimal(0), bug10109)
-  end
-
-  def test_cmp_bignum
-    assert_operator(BigDecimal((2**100).to_s), :==, 2**100)
-  end
-
-  def test_cmp_data
-    d = Time.now; def d.coerce(x); [x, x]; end
-    assert_operator(BigDecimal((2**100).to_s), :==, d)
-  end
-
-  def test_precs_deprecated
-    assert_warn(/BigDecimal#precs is deprecated and will be removed in the future/) do
-      Warning[:deprecated] = true if defined?(Warning.[])
-      BigDecimal("1").precs
-    end
-  end
-
-  def test_precs
-    assert_separately(["-rbigdecimal"], "#{<<~"begin;"}\n#{<<~'end;'}")
-    begin;
-      $VERBOSE = nil
-      a = BigDecimal("1").precs
-      assert_instance_of(Array, a)
-      assert_equal(2, a.size)
-      assert_kind_of(Integer, a[0])
-      assert_kind_of(Integer, a[1])
-    end;
-  end
-
-  def test_hash
-    a = []
-    b = BigDecimal("1")
-    10.times { a << b *= 10 }
-    h = {}
-    a.each_with_index {|x, i| h[x] = i }
-    a.each_with_index do |x, i|
-      assert_equal(i, h[x])
-    end
-  end
-
-  def test_marshal
-    s = Marshal.dump(BigDecimal("1", 1))
-    assert_equal(BigDecimal("1", 1), Marshal.load(s))
-
-    # corrupt data
-    s = s.gsub(/BigDecimal.*\z/m) {|x| x.gsub(/\d/m, "-") }
-    assert_raise(TypeError) { Marshal.load(s) }
-  end
-
-  def test_finite_infinite_nan
-    BigDecimal.mode(BigDecimal::EXCEPTION_OVERFLOW, false)
-    BigDecimal.mode(BigDecimal::EXCEPTION_ZERODIVIDE, false)
-
-    x = BigDecimal("0")
-    assert_equal(true, x.finite?)
-    assert_equal(nil, x.infinite?)
-    assert_equal(false, x.nan?)
-    y = 1 / x
-    assert_equal(false, y.finite?)
-    assert_equal(1, y.infinite?)
-    assert_equal(false, y.nan?)
-    y = -1 / x
-    assert_equal(false, y.finite?)
-    assert_equal(-1, y.infinite?)
-    assert_equal(false, y.nan?)
-
-    BigDecimal.mode(BigDecimal::EXCEPTION_NaN, false)
-    y = 0 / x
-    assert_equal(false, y.finite?)
-    assert_equal(nil, y.infinite?)
-    assert_equal(true, y.nan?)
-  end
-
-  def test_to_i
-    BigDecimal.mode(BigDecimal::EXCEPTION_OVERFLOW, false)
-    BigDecimal.mode(BigDecimal::EXCEPTION_NaN, false)
-
-    x = BigDecimal("0")
-    assert_kind_of(Integer, x.to_i)
-    assert_equal(0, x.to_i)
-    assert_raise(FloatDomainError){( 1 / x).to_i}
-    assert_raise(FloatDomainError){(-1 / x).to_i}
-    assert_raise(FloatDomainError) {( 0 / x).to_i}
-    x = BigDecimal("1")
-    assert_equal(1, x.to_i)
-    x = BigDecimal((2**100).to_s)
-    assert_equal(2**100, x.to_i)
-  end
-
-  def test_to_f
-    BigDecimal.mode(BigDecimal::EXCEPTION_OVERFLOW, false)
-    BigDecimal.mode(BigDecimal::EXCEPTION_NaN, false)
-    BigDecimal.mode(BigDecimal::EXCEPTION_ZERODIVIDE, false)
-
-    x = BigDecimal("0")
-    assert_instance_of(Float, x.to_f)
-    assert_equal(0.0, x.to_f)
-    assert_equal( 1.0 / 0.0, ( 1 / x).to_f)
-    assert_equal(-1.0 / 0.0, (-1 / x).to_f)
-    assert_nan(( 0 / x).to_f)
-    x = BigDecimal("1")
-    assert_equal(1.0, x.to_f)
-    x = BigDecimal((2**100).to_s)
-    assert_equal((2**100).to_f, x.to_f)
-    x = BigDecimal("1" + "0" * 10000)
-    assert_equal(0, BigDecimal("-0").to_f)
-
-    BigDecimal.mode(BigDecimal::EXCEPTION_OVERFLOW, true)
-    assert_raise(FloatDomainError) { x.to_f }
-    BigDecimal.mode(BigDecimal::EXCEPTION_OVERFLOW, false)
-    assert_kind_of(Float,   x .to_f)
-    assert_kind_of(Float, (-x).to_f)
-
-    bug6944 = '[ruby-core:47342]'
-
-    BigDecimal.mode(BigDecimal::EXCEPTION_UNDERFLOW, true)
-    x = "1e#{Float::MIN_10_EXP - 2*Float::DIG}"
-    assert_raise(FloatDomainError, x) {BigDecimal(x).to_f}
-    x = "-#{x}"
-    assert_raise(FloatDomainError, x) {BigDecimal(x).to_f}
-    x = "1e#{Float::MIN_10_EXP - Float::DIG}"
-    assert_nothing_raised(FloatDomainError, x) {
-      assert_in_delta(0.0, BigDecimal(x).to_f, 10**Float::MIN_10_EXP, bug6944)
-    }
-    x = "-#{x}"
-    assert_nothing_raised(FloatDomainError, x) {
-      assert_in_delta(0.0, BigDecimal(x).to_f, 10**Float::MIN_10_EXP, bug6944)
-    }
-
-    BigDecimal.mode(BigDecimal::EXCEPTION_UNDERFLOW, false)
-    x = "1e#{Float::MIN_10_EXP - 2*Float::DIG}"
-    assert_equal( 0.0, BigDecimal(x).to_f, x)
-    x = "-#{x}"
-    assert_equal(-0.0, BigDecimal(x).to_f, x)
-    x = "1e#{Float::MIN_10_EXP - Float::DIG}"
-    assert_nothing_raised(FloatDomainError, x) {
-      assert_in_delta(0.0, BigDecimal(x).to_f, 10**Float::MIN_10_EXP, bug6944)
-    }
-    x = "-#{x}"
-    assert_nothing_raised(FloatDomainError, x) {
-      assert_in_delta(0.0, BigDecimal(x).to_f, 10**Float::MIN_10_EXP, bug6944)
-    }
-
-    assert_equal( 0.0, BigDecimal(  '9e-325').to_f)
-    assert_equal( 0.0, BigDecimal( '10e-325').to_f)
-    assert_equal(-0.0, BigDecimal( '-9e-325').to_f)
-    assert_equal(-0.0, BigDecimal('-10e-325').to_f)
-  end
-
-  def test_to_r
-    BigDecimal.mode(BigDecimal::EXCEPTION_OVERFLOW, false)
-    BigDecimal.mode(BigDecimal::EXCEPTION_NaN, false)
-
-    x = BigDecimal("0")
-    assert_kind_of(Rational, x.to_r)
-    assert_equal(0, x.to_r)
-    assert_raise(FloatDomainError) {( 1 / x).to_r}
-    assert_raise(FloatDomainError) {(-1 / x).to_r}
-    assert_raise(FloatDomainError) {( 0 / x).to_r}
-
-    assert_equal(1, BigDecimal("1").to_r)
-    assert_equal(Rational(3, 2), BigDecimal("1.5").to_r)
-    assert_equal((2**100).to_r, BigDecimal((2**100).to_s).to_r)
-  end
-
-  def test_coerce
-    a, b = BigDecimal("1").coerce(1.0)
-    assert_instance_of(BigDecimal, a)
-    assert_instance_of(BigDecimal, b)
-    assert_equal(2, 1 + BigDecimal("1"), '[ruby-core:25697]')
-
-    a, b = BigDecimal("1").coerce(1.quo(10))
-    assert_equal(BigDecimal("0.1"), a, '[ruby-core:34318]')
-
-    a, b = BigDecimal("0.11111").coerce(1.quo(3))
-    assert_equal(BigDecimal("0." + "3"*a.precision), a)
-
-    assert_nothing_raised(TypeError, '#7176') do
-      BigDecimal('1') + Rational(1)
-    end
-  end
-
-  def test_uplus
-    x = BigDecimal("1")
-    assert_equal(x, x.send(:+@))
-  end
-
-  def test_neg
-    BigDecimal.mode(BigDecimal::EXCEPTION_INFINITY, false)
-    BigDecimal.mode(BigDecimal::EXCEPTION_NaN, false)
-
-    assert_equal(BigDecimal("-1"), BigDecimal("1").send(:-@))
-    assert_equal(BigDecimal("-0"), BigDecimal("0").send(:-@))
-    assert_equal(BigDecimal("0"), BigDecimal("-0").send(:-@))
-    assert_equal(BigDecimal("-Infinity"), BigDecimal("Infinity").send(:-@))
-    assert_equal(BigDecimal("Infinity"), BigDecimal("-Infinity").send(:-@))
-    assert_equal(true, BigDecimal("NaN").send(:-@).nan?)
-  end
-
-  def test_add
-    x = BigDecimal("1")
-    assert_equal(BigDecimal("2"), x + x)
-    assert_equal(1, BigDecimal("0") + 1)
-    assert_equal(1, x + 0)
-
-    assert_equal(BigDecimal::SIGN_POSITIVE_ZERO, (BigDecimal("0") + 0).sign)
-    assert_equal(BigDecimal::SIGN_POSITIVE_ZERO, (BigDecimal("-0") + 0).sign)
-    assert_equal(BigDecimal::SIGN_NEGATIVE_ZERO, (BigDecimal("-0") + BigDecimal("-0")).sign)
-
-    x = BigDecimal((2**100).to_s)
-    assert_equal(BigDecimal((2**100+1).to_s), x + 1)
-
-    BigDecimal.mode(BigDecimal::EXCEPTION_INFINITY, false)
-    inf    = BigDecimal("Infinity")
-    neginf = BigDecimal("-Infinity")
-
-    BigDecimal.mode(BigDecimal::EXCEPTION_INFINITY, true)
-    assert_raise_with_message(FloatDomainError, "Computation results to 'Infinity'") { inf + inf }
-    assert_raise_with_message(FloatDomainError, "Computation results to '-Infinity'") { neginf + neginf }
-  end
-
-  def test_sub
-    x = BigDecimal("1")
-    assert_equal(BigDecimal("0"), x - x)
-    assert_equal(-1, BigDecimal("0") - 1)
-    assert_equal(1, x - 0)
-
-    assert_equal(BigDecimal::SIGN_POSITIVE_ZERO, (BigDecimal("0") - 0).sign)
-    assert_equal(BigDecimal::SIGN_NEGATIVE_ZERO, (BigDecimal("-0") - 0).sign)
-    assert_equal(BigDecimal::SIGN_POSITIVE_ZERO, (BigDecimal("-0") - BigDecimal("-0")).sign)
-
-    x = BigDecimal((2**100).to_s)
-    assert_equal(BigDecimal((2**100-1).to_s), x - 1)
-
-    BigDecimal.mode(BigDecimal::EXCEPTION_INFINITY, false)
-    inf    = BigDecimal("Infinity")
-    neginf = BigDecimal("-Infinity")
-
-    BigDecimal.mode(BigDecimal::EXCEPTION_INFINITY, true)
-    assert_raise_with_message(FloatDomainError, "Computation results to 'Infinity'") { inf - neginf }
-    assert_raise_with_message(FloatDomainError, "Computation results to '-Infinity'") { neginf - inf }
-  end
-
-  def test_sub_with_float
-    assert_kind_of(BigDecimal, BigDecimal("3") - 1.0)
-  end
-
-  def test_sub_with_rational
-    assert_kind_of(BigDecimal, BigDecimal("3") - 1.quo(3))
-  end
-
-  def test_mult
-    x = BigDecimal((2**100).to_s)
-    assert_equal(BigDecimal((2**100 * 3).to_s), (x * 3).to_i)
-    assert_equal(x, (x * 1).to_i)
-    assert_equal(x, (BigDecimal("1") * x).to_i)
-    assert_equal(BigDecimal((2**200).to_s), (x * x).to_i)
-
-    BigDecimal.mode(BigDecimal::EXCEPTION_INFINITY, false)
-    inf    = BigDecimal("Infinity")
-    neginf = BigDecimal("-Infinity")
-
-    BigDecimal.mode(BigDecimal::EXCEPTION_INFINITY, true)
-    assert_raise_with_message(FloatDomainError, "Computation results to 'Infinity'") { inf * inf }
-    assert_raise_with_message(FloatDomainError, "Computation results to '-Infinity'") { neginf * inf }
-  end
-
-  def test_mult_with_float
-    assert_kind_of(BigDecimal, BigDecimal("3") * 1.5)
-    assert_equal(BigDecimal("64.4"), BigDecimal(1) * 64.4)
-  end
-
-  def test_mult_with_rational
-    assert_kind_of(BigDecimal, BigDecimal("3") * 1.quo(3))
-  end
-
-  def test_mult_with_nil
-    assert_raise(TypeError) {
-      BigDecimal('1.1') * nil
-    }
-  end
-
-  def test_div
-    x = BigDecimal((2**100).to_s)
-    assert_equal(BigDecimal((2**100 / 3).to_s), (x / 3).to_i)
-    assert_equal(BigDecimal::SIGN_POSITIVE_ZERO, (BigDecimal("0") / 1).sign)
-    assert_equal(BigDecimal::SIGN_NEGATIVE_ZERO, (BigDecimal("-0") / 1).sign)
-    assert_equal(2, BigDecimal("2") / 1)
-    assert_equal(-2, BigDecimal("2") / -1)
-
-    assert_equal(BigDecimal('1486.868686869'),
-                 (BigDecimal('1472.0') / BigDecimal('0.99')).round(9),
-                 '[ruby-core:59365] [#9316]')
-
-    assert_in_delta(4.124045235,
-                    (BigDecimal('0.9932') / (700 * BigDecimal('0.344045') / BigDecimal('1000.0'))).round(9, half: :up),
-                    10**Float::MIN_10_EXP, '[#9305]')
-
-    BigDecimal.mode(BigDecimal::EXCEPTION_INFINITY, false)
-    assert_positive_zero(BigDecimal("1.0")  / BigDecimal("Infinity"))
-    assert_negative_zero(BigDecimal("-1.0") / BigDecimal("Infinity"))
-    assert_negative_zero(BigDecimal("1.0")  / BigDecimal("-Infinity"))
-    assert_positive_zero(BigDecimal("-1.0") / BigDecimal("-Infinity"))
-
-    BigDecimal.mode(BigDecimal::EXCEPTION_INFINITY, true)
-    BigDecimal.mode(BigDecimal::EXCEPTION_ZERODIVIDE, false)
-    assert_raise_with_message(FloatDomainError, "Computation results in 'Infinity'") { BigDecimal("1") / 0 }
-    assert_raise_with_message(FloatDomainError, "Computation results in '-Infinity'") { BigDecimal("-1") / 0 }
-  end
-
-  def test_div_gh220
-    x = BigDecimal("1.0")
-    y = BigDecimal("3672577333.6608990499165058135986328125")
-    c = BigDecimal("0.272288343892592687909520102748926752911779209181321744700032723729015151607289998e-9")
-    assert_equal(c, x / y, "[GH-220]")
-  end
-
-  def test_div_precision
-    bug13754 = '[ruby-core:82107] [Bug #13754]'
-    a = BigDecimal('101')
-    b = BigDecimal('0.9163472602589686')
-    c = a/b
-    assert(c.precision > b.precision,
-           "(101/0.9163472602589686).precision >= (0.9163472602589686).precision #{bug13754}")
-  end
-
-  def test_div_with_float
-    assert_kind_of(BigDecimal, BigDecimal("3") / 1.5)
-    assert_equal(BigDecimal("0.5"), BigDecimal(1) / 2.0)
-  end
-
-  def test_div_with_rational
-    assert_kind_of(BigDecimal, BigDecimal("3") / 1.quo(3))
-  end
-
-  def test_div_with_complex
-    q = BigDecimal("3") / 1i
-    assert_kind_of(Complex, q)
-  end
-
-  def test_div_error
-    assert_raise(TypeError) { BigDecimal(20) / '2' }
-  end
-
-  def test_mod
-    x = BigDecimal((2**100).to_s)
-    assert_equal(1, x % 3)
-    assert_equal(2, (-x) % 3)
-    assert_equal(-2, x % -3)
-    assert_equal(-1, (-x) % -3)
-  end
-
-  def test_mod_with_float
-    assert_kind_of(BigDecimal, BigDecimal("3") % 1.5)
-  end
-
-  def test_mod_with_rational
-    assert_kind_of(BigDecimal, BigDecimal("3") % 1.quo(3))
-  end
-
-  def test_remainder
-    x = BigDecimal((2**100).to_s)
-    assert_equal(1, x.remainder(3))
-    assert_equal(-1, (-x).remainder(3))
-    assert_equal(1, x.remainder(-3))
-    assert_equal(-1, (-x).remainder(-3))
-  end
-
-  def test_remainder_with_float
-    assert_kind_of(BigDecimal, BigDecimal("3").remainder(1.5))
-  end
-
-  def test_remainder_with_rational
-    assert_kind_of(BigDecimal, BigDecimal("3").remainder(1.quo(3)))
-  end
-
-  def test_divmod
-    x = BigDecimal((2**100).to_s)
-    assert_equal([(x / 3).floor, 1], x.divmod(3))
-    assert_equal([(-x / 3).floor, 2], (-x).divmod(3))
-
-    assert_equal([0, 0], BigDecimal("0").divmod(2))
-
-    BigDecimal.mode(BigDecimal::EXCEPTION_NaN, false)
-    assert_raise(ZeroDivisionError){BigDecimal("0").divmod(0)}
-  end
-
-  def test_divmod_precision
-    a = BigDecimal('2e55')
-    b = BigDecimal('1.23456789e10')
-    q, r = a.divmod(b)
-    assert_equal((a/b).round(0, :down), q)
-    assert_equal((a - q*b), r)
-
-    b = BigDecimal('-1.23456789e10')
-    q, r = a.divmod(b)
-    assert_equal((a/b).round(0, :down) - 1, q)
-    assert_equal((a - q*b), r)
-  end
-
-  def test_divmod_error
-    assert_raise(TypeError) { BigDecimal(20).divmod('2') }
-  end
-
-  def test_add_bigdecimal
-    x = BigDecimal((2**100).to_s)
-    assert_equal(3000000000000000000000000000000, x.add(x, 1))
-    assert_equal(2500000000000000000000000000000, x.add(x, 2))
-    assert_equal(2540000000000000000000000000000, x.add(x, 3))
-  end
-
-  def test_sub_bigdecimal
-    x = BigDecimal((2**100).to_s)
-    assert_equal(1000000000000000000000000000000, x.sub(1, 1))
-    assert_equal(1300000000000000000000000000000, x.sub(1, 2))
-    assert_equal(1270000000000000000000000000000, x.sub(1, 3))
-  end
-
-  def test_mult_bigdecimal
-    x = BigDecimal((2**100).to_s)
-    assert_equal(4000000000000000000000000000000, x.mult(3, 1))
-    assert_equal(3800000000000000000000000000000, x.mult(3, 2))
-    assert_equal(3800000000000000000000000000000, x.mult(3, 3))
-  end
-
-  def test_div_bigdecimal
-    x = BigDecimal((2**100).to_s)
-    assert_equal(422550200076076467165567735125, x.div(3))
-    assert_equal(400000000000000000000000000000, x.div(3, 1))
-    assert_equal(420000000000000000000000000000, x.div(3, 2))
-    assert_equal(423000000000000000000000000000, x.div(3, 3))
-    BigDecimal.save_exception_mode do
-      BigDecimal.mode(BigDecimal::EXCEPTION_INFINITY, false)
-      assert_equal(0, BigDecimal("0").div(BigDecimal("Infinity")))
-    end
-  end
-
-  def test_div_bigdecimal_with_float_and_precision
-    x = BigDecimal(5)
-    y = 5.1
-    assert_equal(x.div(BigDecimal(y, 0), 8),
-                 x.div(y, 8))
-
-    assert_equal(x.div(BigDecimal(y, 0), 100),
-                 x.div(y, 100))
-  end
-
-  def test_quo_without_prec
-    x = BigDecimal(5)
-    y = BigDecimal(229)
-    assert_equal(BigDecimal("0.021834061135371179039301310043668122"), x.quo(y))
-  end
-
-  def test_quo_with_prec
-    begin
-      saved_mode = BigDecimal.mode(BigDecimal::ROUND_MODE)
-      BigDecimal.mode(BigDecimal::ROUND_MODE, :half_up)
-
-      x = BigDecimal(5)
-      y = BigDecimal(229)
-      assert_equal(BigDecimal("0.021834061135371179039301310043668122"), x.quo(y, 0))
-      assert_equal(BigDecimal("0.022"), x.quo(y, 2))
-      assert_equal(BigDecimal("0.0218"), x.quo(y, 3))
-      assert_equal(BigDecimal("0.0218341"), x.quo(y, 6))
-      assert_equal(BigDecimal("0.02183406114"), x.quo(y, 10))
-      assert_equal(BigDecimal("0.021834061135371179039301310043668122270742358078603"), x.quo(y, 50))
-    ensure
-      BigDecimal.mode(BigDecimal::ROUND_MODE, saved_mode)
-    end
-  end
-
-  def test_abs_bigdecimal
-    x = BigDecimal((2**100).to_s)
-    assert_equal(1267650600228229401496703205376, x.abs)
-    x = BigDecimal("-" + (2**100).to_s)
-    assert_equal(1267650600228229401496703205376, x.abs)
-    x = BigDecimal("0")
-    assert_equal(0, x.abs)
-    x = BigDecimal("-0")
-    assert_equal(0, x.abs)
-
-    BigDecimal.mode(BigDecimal::EXCEPTION_INFINITY, false)
-    x = BigDecimal("Infinity")
-    assert_equal(BigDecimal("Infinity"), x.abs)
-    x = BigDecimal("-Infinity")
-    assert_equal(BigDecimal("Infinity"), x.abs)
-
-    BigDecimal.mode(BigDecimal::EXCEPTION_NaN, false)
-    x = BigDecimal("NaN")
-    assert_nan(x.abs)
-  end
-
-  def test_sqrt_bigdecimal
-    x = BigDecimal("0.09")
-    assert_in_delta(0.3, x.sqrt(1), 0.001)
-    x = BigDecimal((2**100).to_s)
-    y = BigDecimal("1125899906842624")
-    e = y.exponent
-    assert_equal(true, (x.sqrt(100) - y).abs < BigDecimal("1E#{e-100}"))
-    assert_equal(true, (x.sqrt(200) - y).abs < BigDecimal("1E#{e-200}"))
-    assert_equal(true, (x.sqrt(300) - y).abs < BigDecimal("1E#{e-300}"))
-    x = BigDecimal("-" + (2**100).to_s)
-    assert_raise_with_message(FloatDomainError, "sqrt of negative value") { x.sqrt(1) }
-    x = BigDecimal((2**200).to_s)
-    assert_equal(2**100, x.sqrt(1))
-
-    BigDecimal.mode(BigDecimal::EXCEPTION_OVERFLOW, false)
-    BigDecimal.mode(BigDecimal::EXCEPTION_NaN, false)
-    assert_raise_with_message(FloatDomainError, "sqrt of 'NaN'(Not a Number)") { BigDecimal("NaN").sqrt(1) }
-    assert_raise_with_message(FloatDomainError, "sqrt of negative value") { BigDecimal("-Infinity").sqrt(1) }
-
-    assert_equal(0, BigDecimal("0").sqrt(1))
-    assert_equal(0, BigDecimal("-0").sqrt(1))
-    assert_equal(1, BigDecimal("1").sqrt(1))
-    assert_positive_infinite(BigDecimal("Infinity").sqrt(1))
-  end
-
-  def test_sqrt_5266
-    x = BigDecimal('2' + '0'*100)
-    assert_equal('0.14142135623730950488016887242096980785696718753769480731',
-                 x.sqrt(56).to_s(56).split(' ')[0])
-    assert_equal('0.1414213562373095048801688724209698078569671875376948073',
-                 x.sqrt(55).to_s(55).split(' ')[0])
-
-    x = BigDecimal('2' + '0'*200)
-    assert_equal('0.14142135623730950488016887242096980785696718753769480731766797379907324784621070388503875343276415727350138462',
-                 x.sqrt(110).to_s(110).split(' ')[0])
-    assert_equal('0.1414213562373095048801688724209698078569671875376948073176679737990732478462107038850387534327641572735013846',
-                 x.sqrt(109).to_s(109).split(' ')[0])
-  end
-
-  def test_fix
-    x = BigDecimal("1.1")
-    assert_equal(1, x.fix)
-    assert_kind_of(BigDecimal, x.fix)
-  end
-
-  def test_frac
-    x = BigDecimal("1.1")
-    assert_equal(0.1, x.frac)
-    assert_equal(0.1, BigDecimal("0.1").frac)
-    BigDecimal.mode(BigDecimal::EXCEPTION_NaN, false)
-    assert_nan(BigDecimal("NaN").frac)
-  end
-
-  def test_round
-    assert_equal(3, BigDecimal("3.14159").round)
-    assert_equal(9, BigDecimal("8.7").round)
-    assert_equal(3.142, BigDecimal("3.14159").round(3))
-    assert_equal(13300.0, BigDecimal("13345.234").round(-2))
-
-    x = BigDecimal("111.111")
-    assert_equal(111    , x.round)
-    assert_equal(111.1  , x.round(1))
-    assert_equal(111.11 , x.round(2))
-    assert_equal(111.111, x.round(3))
-    assert_equal(111.111, x.round(4))
-    assert_equal(110    , x.round(-1))
-    assert_equal(100    , x.round(-2))
-    assert_equal(  0    , x.round(-3))
-    assert_equal(  0    , x.round(-4))
-
-    x = BigDecimal("2.5")
-    assert_equal(3, x.round(0, BigDecimal::ROUND_UP))
-    assert_equal(2, x.round(0, BigDecimal::ROUND_DOWN))
-    assert_equal(3, x.round(0, BigDecimal::ROUND_HALF_UP))
-    assert_equal(2, x.round(0, BigDecimal::ROUND_HALF_DOWN))
-    assert_equal(2, x.round(0, BigDecimal::ROUND_HALF_EVEN))
-    assert_equal(3, x.round(0, BigDecimal::ROUND_CEILING))
-    assert_equal(2, x.round(0, BigDecimal::ROUND_FLOOR))
-    assert_raise(ArgumentError) { x.round(0, 256) }
-
-    x = BigDecimal("-2.5")
-    assert_equal(-3, x.round(0, BigDecimal::ROUND_UP))
-    assert_equal(-2, x.round(0, BigDecimal::ROUND_DOWN))
-    assert_equal(-3, x.round(0, BigDecimal::ROUND_HALF_UP))
-    assert_equal(-2, x.round(0, BigDecimal::ROUND_HALF_DOWN))
-    assert_equal(-2, x.round(0, BigDecimal::ROUND_HALF_EVEN))
-    assert_equal(-2, x.round(0, BigDecimal::ROUND_CEILING))
-    assert_equal(-3, x.round(0, BigDecimal::ROUND_FLOOR))
-
-    ROUNDING_MODE_MAP.each do |const, sym|
-      assert_equal(x.round(0, const), x.round(0, sym))
-    end
-
-    bug3803 = '[ruby-core:32136]'
-    15.times do |n|
-      x = BigDecimal("5#{'0'*n}1")
-      assert_equal(10**(n+2), x.round(-(n+2), BigDecimal::ROUND_HALF_DOWN), bug3803)
-      assert_equal(10**(n+2), x.round(-(n+2), BigDecimal::ROUND_HALF_EVEN), bug3803)
-      x = BigDecimal("0.5#{'0'*n}1")
-      assert_equal(1, x.round(0, BigDecimal::ROUND_HALF_DOWN), bug3803)
-      assert_equal(1, x.round(0, BigDecimal::ROUND_HALF_EVEN), bug3803)
-      x = BigDecimal("-0.5#{'0'*n}1")
-      assert_equal(-1, x.round(0, BigDecimal::ROUND_HALF_DOWN), bug3803)
-      assert_equal(-1, x.round(0, BigDecimal::ROUND_HALF_EVEN), bug3803)
-    end
-
-    assert_instance_of(Integer, x.round)
-    assert_instance_of(Integer, x.round(0))
-    assert_instance_of(Integer, x.round(-1))
-    assert_instance_of(BigDecimal, x.round(1))
-  end
-
-  def test_round_half_even
-    assert_equal(BigDecimal('12.0'), BigDecimal('12.5').round(half: :even))
-    assert_equal(BigDecimal('14.0'), BigDecimal('13.5').round(half: :even))
-
-    assert_equal(BigDecimal('2.2'), BigDecimal('2.15').round(1, half: :even))
-    assert_equal(BigDecimal('2.2'), BigDecimal('2.25').round(1, half: :even))
-    assert_equal(BigDecimal('2.4'), BigDecimal('2.35').round(1, half: :even))
-
-    assert_equal(BigDecimal('-2.2'), BigDecimal('-2.15').round(1, half: :even))
-    assert_equal(BigDecimal('-2.2'), BigDecimal('-2.25').round(1, half: :even))
-    assert_equal(BigDecimal('-2.4'), BigDecimal('-2.35').round(1, half: :even))
-
-    assert_equal(BigDecimal('7.1364'), BigDecimal('7.13645').round(4, half: :even))
-    assert_equal(BigDecimal('7.1365'), BigDecimal('7.1364501').round(4, half: :even))
-    assert_equal(BigDecimal('7.1364'), BigDecimal('7.1364499').round(4, half: :even))
-
-    assert_equal(BigDecimal('-7.1364'), BigDecimal('-7.13645').round(4, half: :even))
-    assert_equal(BigDecimal('-7.1365'), BigDecimal('-7.1364501').round(4, half: :even))
-    assert_equal(BigDecimal('-7.1364'), BigDecimal('-7.1364499').round(4, half: :even))
-  end
-
-  def test_round_half_up
-    assert_equal(BigDecimal('13.0'), BigDecimal('12.5').round(half: :up))
-    assert_equal(BigDecimal('14.0'), BigDecimal('13.5').round(half: :up))
-
-    assert_equal(BigDecimal('2.2'), BigDecimal('2.15').round(1, half: :up))
-    assert_equal(BigDecimal('2.3'), BigDecimal('2.25').round(1, half: :up))
-    assert_equal(BigDecimal('2.4'), BigDecimal('2.35').round(1, half: :up))
-
-    assert_equal(BigDecimal('-2.2'), BigDecimal('-2.15').round(1, half: :up))
-    assert_equal(BigDecimal('-2.3'), BigDecimal('-2.25').round(1, half: :up))
-    assert_equal(BigDecimal('-2.4'), BigDecimal('-2.35').round(1, half: :up))
-
-    assert_equal(BigDecimal('7.1365'), BigDecimal('7.13645').round(4, half: :up))
-    assert_equal(BigDecimal('7.1365'), BigDecimal('7.1364501').round(4, half: :up))
-    assert_equal(BigDecimal('7.1364'), BigDecimal('7.1364499').round(4, half: :up))
-
-    assert_equal(BigDecimal('-7.1365'), BigDecimal('-7.13645').round(4, half: :up))
-    assert_equal(BigDecimal('-7.1365'), BigDecimal('-7.1364501').round(4, half: :up))
-    assert_equal(BigDecimal('-7.1364'), BigDecimal('-7.1364499').round(4, half: :up))
-  end
-
-  def test_round_half_down
-    assert_equal(BigDecimal('12.0'), BigDecimal('12.5').round(half: :down))
-    assert_equal(BigDecimal('13.0'), BigDecimal('13.5').round(half: :down))
-
-    assert_equal(BigDecimal('2.1'), BigDecimal('2.15').round(1, half: :down))
-    assert_equal(BigDecimal('2.2'), BigDecimal('2.25').round(1, half: :down))
-    assert_equal(BigDecimal('2.3'), BigDecimal('2.35').round(1, half: :down))
-
-    assert_equal(BigDecimal('-2.1'), BigDecimal('-2.15').round(1, half: :down))
-    assert_equal(BigDecimal('-2.2'), BigDecimal('-2.25').round(1, half: :down))
-    assert_equal(BigDecimal('-2.3'), BigDecimal('-2.35').round(1, half: :down))
-
-    assert_equal(BigDecimal('7.1364'), BigDecimal('7.13645').round(4, half: :down))
-    assert_equal(BigDecimal('7.1365'), BigDecimal('7.1364501').round(4, half: :down))
-    assert_equal(BigDecimal('7.1364'), BigDecimal('7.1364499').round(4, half: :down))
-
-    assert_equal(BigDecimal('-7.1364'), BigDecimal('-7.13645').round(4, half: :down))
-    assert_equal(BigDecimal('-7.1365'), BigDecimal('-7.1364501').round(4, half: :down))
-    assert_equal(BigDecimal('-7.1364'), BigDecimal('-7.1364499').round(4, half: :down))
-  end
-
-  def test_round_half_nil
-    x = BigDecimal("2.5")
-
-    BigDecimal.save_rounding_mode do
-      BigDecimal.mode(BigDecimal::ROUND_MODE, BigDecimal::ROUND_UP)
-      assert_equal(3, x.round(0, half: nil))
-    end
-
-    BigDecimal.save_rounding_mode do
-      BigDecimal.mode(BigDecimal::ROUND_MODE, BigDecimal::ROUND_DOWN)
-      assert_equal(2, x.round(0, half: nil))
-    end
-
-    BigDecimal.save_rounding_mode do
-      BigDecimal.mode(BigDecimal::ROUND_MODE, BigDecimal::ROUND_HALF_UP)
-      assert_equal(3, x.round(0, half: nil))
-    end
-
-    BigDecimal.save_rounding_mode do
-      BigDecimal.mode(BigDecimal::ROUND_MODE, BigDecimal::ROUND_HALF_DOWN)
-      assert_equal(2, x.round(0, half: nil))
-    end
-
-    BigDecimal.save_rounding_mode do
-      BigDecimal.mode(BigDecimal::ROUND_MODE, BigDecimal::ROUND_HALF_EVEN)
-      assert_equal(2, x.round(0, half: nil))
-    end
-
-    BigDecimal.save_rounding_mode do
-      BigDecimal.mode(BigDecimal::ROUND_MODE, BigDecimal::ROUND_CEILING)
-      assert_equal(3, x.round(0, half: nil))
-    end
-
-    BigDecimal.save_rounding_mode do
-      BigDecimal.mode(BigDecimal::ROUND_MODE, BigDecimal::ROUND_FLOOR)
-      assert_equal(2, x.round(0, half: nil))
-    end
-  end
-
-  def test_round_half_invalid_option
-    assert_raise_with_message(ArgumentError, "invalid rounding mode (upp)") do
-      BigDecimal('12.5').round(half: :upp)
-    end
-    assert_raise_with_message(ArgumentError, "invalid rounding mode (evenn)") do
-      BigDecimal('2.15').round(1, half: :evenn)
-    end
-    assert_raise_with_message(ArgumentError, "invalid rounding mode (downn)") do
-      BigDecimal('2.15').round(1, half: :downn)
-    end
-    assert_raise_with_message(ArgumentError, "invalid rounding mode (42)") do
-      BigDecimal('2.15').round(1, half: 42)
-    end
-  end
-
-  def test_truncate
-    assert_equal(3, BigDecimal("3.14159").truncate)
-    assert_equal(8, BigDecimal("8.7").truncate)
-    assert_equal(3.141, BigDecimal("3.14159").truncate(3))
-    assert_equal(13300.0, BigDecimal("13345.234").truncate(-2))
-
-    assert_equal(-3, BigDecimal("-3.14159").truncate)
-    assert_equal(-8, BigDecimal("-8.7").truncate)
-    assert_equal(-3.141, BigDecimal("-3.14159").truncate(3))
-    assert_equal(-13300.0, BigDecimal("-13345.234").truncate(-2))
-  end
-
-  def test_floor
-    assert_equal(3, BigDecimal("3.14159").floor)
-    assert_equal(-10, BigDecimal("-9.1").floor)
-    assert_equal(3.141, BigDecimal("3.14159").floor(3))
-    assert_equal(13300.0, BigDecimal("13345.234").floor(-2))
-  end
-
-  def test_ceil
-    assert_equal(4, BigDecimal("3.14159").ceil)
-    assert_equal(-9, BigDecimal("-9.1").ceil)
-    assert_equal(3.142, BigDecimal("3.14159").ceil(3))
-    assert_equal(13400.0, BigDecimal("13345.234").ceil(-2))
-  end
-
-  def test_to_s
-    assert_equal('0.0', BigDecimal('0').to_s)
-    assert_equal('-123 45678 90123.45678 90123 45678 9', BigDecimal('-1234567890123.45678901234567890').to_s('5F'))
-    assert_equal('+12345 67890123.45678901 23456789', BigDecimal('1234567890123.45678901234567890').to_s('+8F'))
-    assert_equal(' 1234567890123.4567890123456789', BigDecimal('1234567890123.45678901234567890').to_s(' F'))
-    assert_equal('100 000 000 000.000 000 000 01', BigDecimal('100000000000.00000000001').to_s('3F'))
-    assert_equal('0.0 0 0 0 0 0 0 0 0 0 0 0 1', BigDecimal('0.0000000000001').to_s('1F'))
-    assert_equal('+1000000 0000000.0', BigDecimal('10000000000000').to_s('+7F'))
-    assert_equal('0.1234567890123456789e3', BigDecimal('123.45678901234567890').to_s)
-    assert_equal('0.12345 67890 12345 6789e3', BigDecimal('123.45678901234567890').to_s(5))
-  end
-
-  def test_split
-    x = BigDecimal('-123.45678901234567890')
-    assert_equal([-1, "1234567890123456789", 10, 3], x.split)
-    assert_equal([1, "0", 10, 0], BigDecimal("0").split)
-    assert_equal([-1, "0", 10, 0], BigDecimal("-0").split)
-
-    BigDecimal.mode(BigDecimal::EXCEPTION_OVERFLOW, false)
-    BigDecimal.mode(BigDecimal::EXCEPTION_NaN, false)
-    assert_equal([0, "NaN", 10, 0], BigDecimal("NaN").split)
-    assert_equal([1, "Infinity", 10, 0], BigDecimal("Infinity").split)
-    assert_equal([-1, "Infinity", 10, 0], BigDecimal("-Infinity").split)
-  end
-
-  def test_exponent
-    x = BigDecimal('-123.45678901234567890')
-    assert_equal(3, x.exponent)
-  end
-
-  def test_inspect
-    assert_equal("0.123456789012e0", BigDecimal("0.123456789012").inspect)
-    assert_equal("0.123456789012e4", BigDecimal("1234.56789012").inspect)
-    assert_equal("0.123456789012e-4", BigDecimal("0.0000123456789012").inspect)
-  end
-
-  def test_power
-    assert_nothing_raised(TypeError, '[ruby-core:47632]') do
-      1000.times { BigDecimal('1001.10')**0.75 }
-    end
-  end
-
-  def test_power_with_nil
-    assert_raise(TypeError) do
-      BigDecimal(3) ** nil
-    end
-  end
-
-  def test_power_of_nan
-    BigDecimal.save_exception_mode do
-      BigDecimal.mode(BigDecimal::EXCEPTION_NaN, false)
-      assert_nan(BigDecimal::NAN ** 0)
-      assert_nan(BigDecimal::NAN ** 1)
-      assert_nan(BigDecimal::NAN ** 42)
-      assert_nan(BigDecimal::NAN ** -42)
-      assert_nan(BigDecimal::NAN ** 42.0)
-      assert_nan(BigDecimal::NAN ** -42.0)
-      assert_nan(BigDecimal::NAN ** BigDecimal(42))
-      assert_nan(BigDecimal::NAN ** BigDecimal(-42))
-      assert_nan(BigDecimal::NAN ** BigDecimal::INFINITY)
-      BigDecimal.save_exception_mode do
-        BigDecimal.mode(BigDecimal::EXCEPTION_INFINITY, false)
-        assert_nan(BigDecimal::NAN ** (-BigDecimal::INFINITY))
-      end
-    end
-  end
-
-  def test_power_with_Bignum
-    BigDecimal.save_exception_mode do
-      BigDecimal.mode(BigDecimal::EXCEPTION_INFINITY, false)
-      assert_equal(0, BigDecimal(0) ** (2**100))
-
-      assert_positive_infinite(BigDecimal(0) ** -(2**100))
-      assert_positive_infinite((-BigDecimal(0)) ** -(2**100))
-      assert_negative_infinite((-BigDecimal(0)) ** -(2**100 + 1))
-
-      assert_equal(1, BigDecimal(1) ** (2**100))
-
-      assert_positive_infinite(BigDecimal(3) ** (2**100))
-      assert_positive_zero(BigDecimal(3) ** (-2**100))
-
-      assert_negative_infinite(BigDecimal(-3) ** (2**100))
-      assert_positive_infinite(BigDecimal(-3) ** (2**100 + 1))
-      assert_negative_zero(BigDecimal(-3) ** (-2**100))
-      assert_positive_zero(BigDecimal(-3) ** (-2**100 - 1))
-
-      assert_positive_zero(BigDecimal(0.5, Float::DIG) ** (2**100))
-      assert_positive_infinite(BigDecimal(0.5, Float::DIG) ** (-2**100))
-
-      assert_negative_zero(BigDecimal(-0.5, Float::DIG) ** (2**100))
-      assert_positive_zero(BigDecimal(-0.5, Float::DIG) ** (2**100 - 1))
-      assert_negative_infinite(BigDecimal(-0.5, Float::DIG) ** (-2**100))
-      assert_positive_infinite(BigDecimal(-0.5, Float::DIG) ** (-2**100 - 1))
-    end
-  end
-
-  def test_power_with_BigDecimal
-    assert_nothing_raised do
-      assert_in_delta(3 ** 3, BigDecimal(3) ** BigDecimal(3))
-    end
-  end
-
-  def test_power_of_finite_with_zero
-    x = BigDecimal(1)
-    assert_equal(1, x ** 0)
-    assert_equal(1, x ** 0.quo(1))
-    assert_equal(1, x ** 0.0)
-    assert_equal(1, x ** BigDecimal(0))
-
-    x = BigDecimal(42)
-    assert_equal(1, x ** 0)
-    assert_equal(1, x ** 0.quo(1))
-    assert_equal(1, x ** 0.0)
-    assert_equal(1, x ** BigDecimal(0))
-
-    x = BigDecimal(-42)
-    assert_equal(1, x ** 0)
-    assert_equal(1, x ** 0.quo(1))
-    assert_equal(1, x ** 0.0)
-    assert_equal(1, x ** BigDecimal(0))
-  end
-
-  def test_power_of_three
-    x = BigDecimal(3)
-    assert_equal(81, x ** 4)
-    assert_equal(1.quo(81), x ** -4)
-    assert_in_delta(1.0/81, x ** -4)
-  end
-
-  def test_power_of_zero
-    zero = BigDecimal(0)
-    assert_equal(0, zero ** 4)
-    assert_equal(0, zero ** 4.quo(1))
-    assert_equal(0, zero ** 4.0)
-    assert_equal(0, zero ** BigDecimal(4))
-    assert_equal(1, zero ** 0)
-    assert_equal(1, zero ** 0.quo(1))
-    assert_equal(1, zero ** 0.0)
-    assert_equal(1, zero ** BigDecimal(0))
-    BigDecimal.save_exception_mode do
-      BigDecimal.mode(BigDecimal::EXCEPTION_INFINITY, false)
-      BigDecimal.mode(BigDecimal::EXCEPTION_OVERFLOW, false)
-      assert_positive_infinite(zero ** -1)
-      assert_positive_infinite(zero ** -1.quo(1))
-      assert_positive_infinite(zero ** -1.0)
-      assert_positive_infinite(zero ** BigDecimal(-1))
-
-      m_zero = BigDecimal("-0")
-      assert_negative_infinite(m_zero ** -1)
-      assert_negative_infinite(m_zero ** -1.quo(1))
-      assert_negative_infinite(m_zero ** -1.0)
-      assert_negative_infinite(m_zero ** BigDecimal(-1))
-      assert_positive_infinite(m_zero ** -2)
-      assert_positive_infinite(m_zero ** -2.quo(1))
-      assert_positive_infinite(m_zero ** -2.0)
-      assert_positive_infinite(m_zero ** BigDecimal(-2))
-    end
-  end
-
-  def test_power_of_positive_infinity
-    BigDecimal.save_exception_mode do
-      BigDecimal.mode(BigDecimal::EXCEPTION_OVERFLOW, false)
-      assert_positive_infinite(BigDecimal::INFINITY ** 3)
-      assert_positive_infinite(BigDecimal::INFINITY ** 3.quo(1))
-      assert_positive_infinite(BigDecimal::INFINITY ** 3.0)
-      assert_positive_infinite(BigDecimal::INFINITY ** BigDecimal(3))
-      assert_positive_infinite(BigDecimal::INFINITY ** 2)
-      assert_positive_infinite(BigDecimal::INFINITY ** 2.quo(1))
-      assert_positive_infinite(BigDecimal::INFINITY ** 2.0)
-      assert_positive_infinite(BigDecimal::INFINITY ** BigDecimal(2))
-      assert_positive_infinite(BigDecimal::INFINITY ** 1)
-      assert_positive_infinite(BigDecimal::INFINITY ** 1.quo(1))
-      assert_positive_infinite(BigDecimal::INFINITY ** 1.0)
-      assert_positive_infinite(BigDecimal::INFINITY ** BigDecimal(1))
-      assert_equal(1, BigDecimal::INFINITY ** 0)
-      assert_equal(1, BigDecimal::INFINITY ** 0.quo(1))
-      assert_equal(1, BigDecimal::INFINITY ** 0.0)
-      assert_equal(1, BigDecimal::INFINITY ** BigDecimal(0))
-      assert_positive_zero(BigDecimal::INFINITY ** -1)
-      assert_positive_zero(BigDecimal::INFINITY ** -1.quo(1))
-      assert_positive_zero(BigDecimal::INFINITY ** -1.0)
-      assert_positive_zero(BigDecimal::INFINITY ** BigDecimal(-1))
-      assert_positive_zero(BigDecimal::INFINITY ** -2)
-      assert_positive_zero(BigDecimal::INFINITY ** -2.0)
-      assert_positive_zero(BigDecimal::INFINITY ** BigDecimal(-2))
-    end
-  end
-
-  def test_power_of_negative_infinity
-    BigDecimal.save_exception_mode do
-      BigDecimal.mode(BigDecimal::EXCEPTION_OVERFLOW, false)
-      assert_negative_infinite((-BigDecimal::INFINITY) ** 3)
-      assert_negative_infinite((-BigDecimal::INFINITY) ** 3.quo(1))
-      assert_negative_infinite((-BigDecimal::INFINITY) ** 3.0)
-      assert_negative_infinite((-BigDecimal::INFINITY) ** BigDecimal(3))
-      assert_positive_infinite((-BigDecimal::INFINITY) ** 2)
-      assert_positive_infinite((-BigDecimal::INFINITY) ** 2.quo(1))
-      assert_positive_infinite((-BigDecimal::INFINITY) ** 2.0)
-      assert_positive_infinite((-BigDecimal::INFINITY) ** BigDecimal(2))
-      assert_negative_infinite((-BigDecimal::INFINITY) ** 1)
-      assert_negative_infinite((-BigDecimal::INFINITY) ** 1.quo(1))
-      assert_negative_infinite((-BigDecimal::INFINITY) ** 1.0)
-      assert_negative_infinite((-BigDecimal::INFINITY) ** BigDecimal(1))
-      assert_equal(1, (-BigDecimal::INFINITY) ** 0)
-      assert_equal(1, (-BigDecimal::INFINITY) ** 0.quo(1))
-      assert_equal(1, (-BigDecimal::INFINITY) ** 0.0)
-      assert_equal(1, (-BigDecimal::INFINITY) ** BigDecimal(0))
-      assert_negative_zero((-BigDecimal::INFINITY) ** -1)
-      assert_negative_zero((-BigDecimal::INFINITY) ** -1.quo(1))
-      assert_negative_zero((-BigDecimal::INFINITY) ** -1.0)
-      assert_negative_zero((-BigDecimal::INFINITY) ** BigDecimal(-1))
-      assert_positive_zero((-BigDecimal::INFINITY) ** -2)
-      assert_positive_zero((-BigDecimal::INFINITY) ** -2.quo(1))
-      assert_positive_zero((-BigDecimal::INFINITY) ** -2.0)
-      assert_positive_zero((-BigDecimal::INFINITY) ** BigDecimal(-2))
-    end
-  end
-
-  def test_power_without_prec
-    pi  = BigDecimal("3.14159265358979323846264338327950288419716939937511")
-    e   = BigDecimal("2.71828182845904523536028747135266249775724709369996")
-    pow = BigDecimal("0.2245915771836104547342715220454373502758931513399678438732330680117143493477164265678321738086407229773690574073268002736527e2")
-    assert_equal(pow, pi.power(e))
-
-    n = BigDecimal("2222")
-    assert_equal(BigDecimal("0.5171353084572525892492416e12"), (n ** 3.5))
-    assert_equal(BigDecimal("0.517135308457252592e12"), (n ** 3.5r))
-    assert_equal(BigDecimal("0.517135308457252589249241582e12"), (n ** BigDecimal("3.5",15)))
-  end
-
-  def test_power_with_prec
-    pi  = BigDecimal("3.14159265358979323846264338327950288419716939937511")
-    e   = BigDecimal("2.71828182845904523536028747135266249775724709369996")
-    pow = BigDecimal("22.459157718361045473")
-    assert_equal(pow, pi.power(e, 20))
-
-    b = BigDecimal('1.034482758620689655172413793103448275862068965517241379310344827586206896551724')
-    assert_equal(BigDecimal('0.114523E1'), b.power(4, 5), '[Bug #8818] [ruby-core:56802]')
-  end
-
-  def test_limit
-    BigDecimal.save_limit do
-      BigDecimal.limit(1)
-      x = BigDecimal("3")
-      assert_equal(90, x ** 4) # OK? must it be 80?
-      # 3 * 3 * 3 * 3 = 10 * 3 * 3 = 30 * 3 = 90 ???
-      assert_raise(ArgumentError) { BigDecimal.limit(-1) }
-
-      bug7458 = '[ruby-core:50269] [#7458]'
-      one = BigDecimal('1')
-      epsilon = BigDecimal('0.7E-18')
-
-      BigDecimal.limit(0)
-      assert_equal(BigDecimal("1.0000000000000000007"), one + epsilon, "limit(0) #{bug7458}")
-
-      1.upto(18) do |lim|
-        BigDecimal.limit(lim)
-        assert_equal(BigDecimal("1.0"), one + epsilon, "limit(#{lim}) #{bug7458}")
-      end
-
-      BigDecimal.limit(19)
-      assert_equal(BigDecimal("1.000000000000000001"), one + epsilon, "limit(19) #{bug7458}")
-
-      BigDecimal.limit(20)
-      assert_equal(BigDecimal("1.0000000000000000007"), one + epsilon, "limit(20) #{bug7458}")
-    end
-  end
-
-  def test_sign
-    BigDecimal.mode(BigDecimal::EXCEPTION_OVERFLOW, false)
-    BigDecimal.mode(BigDecimal::EXCEPTION_NaN, false)
-    BigDecimal.mode(BigDecimal::EXCEPTION_ZERODIVIDE, false)
-
-    assert_equal(BigDecimal::SIGN_POSITIVE_ZERO, BigDecimal("0").sign)
-    assert_equal(BigDecimal::SIGN_NEGATIVE_ZERO, BigDecimal("-0").sign)
-    assert_equal(BigDecimal::SIGN_POSITIVE_FINITE, BigDecimal("1").sign)
-    assert_equal(BigDecimal::SIGN_NEGATIVE_FINITE, BigDecimal("-1").sign)
-    assert_equal(BigDecimal::SIGN_POSITIVE_INFINITE, (BigDecimal("1") / 0).sign)
-    assert_equal(BigDecimal::SIGN_NEGATIVE_INFINITE, (BigDecimal("-1") / 0).sign)
-    assert_equal(BigDecimal::SIGN_NaN, (BigDecimal("0") / 0).sign)
-  end
-
-  def test_inf
-    BigDecimal.mode(BigDecimal::EXCEPTION_OVERFLOW, false)
-    BigDecimal.mode(BigDecimal::EXCEPTION_NaN, false)
-    inf = BigDecimal("Infinity")
-
-    assert_equal(inf, inf + inf)
-    assert_nan((inf + (-inf)))
-    assert_nan((inf - inf))
-    assert_equal(inf, inf - (-inf))
-    assert_equal(inf, inf * inf)
-    assert_nan((inf / inf))
-
-    assert_equal(inf, inf + 1)
-    assert_equal(inf, inf - 1)
-    assert_equal(inf, inf * 1)
-    assert_nan((inf * 0))
-    assert_equal(inf, inf / 1)
-
-    assert_equal(inf, 1 + inf)
-    assert_equal(-inf, 1 - inf)
-    assert_equal(inf, 1 * inf)
-    assert_equal(-inf, -1 * inf)
-    assert_nan((0 * inf))
-    assert_equal(BigDecimal::SIGN_POSITIVE_ZERO, (1 / inf).sign)
-    assert_equal(BigDecimal::SIGN_NEGATIVE_ZERO, (-1 / inf).sign)
-  end
-
-  def assert_equal_us_ascii_string(a, b)
-    assert_equal(a, b)
-    assert_equal(Encoding::US_ASCII, b.encoding)
-  end
-
-  def test_to_special_string
-    BigDecimal.mode(BigDecimal::EXCEPTION_OVERFLOW, false)
-    BigDecimal.mode(BigDecimal::EXCEPTION_NaN, false)
-    nan = BigDecimal("NaN")
-    assert_equal_us_ascii_string("NaN", nan.to_s)
-    inf = BigDecimal("Infinity")
-    assert_equal_us_ascii_string("Infinity", inf.to_s)
-    assert_equal_us_ascii_string(" Infinity", inf.to_s(" "))
-    assert_equal_us_ascii_string("+Infinity", inf.to_s("+"))
-    assert_equal_us_ascii_string("-Infinity", (-inf).to_s)
-    pzero = BigDecimal("0")
-    assert_equal_us_ascii_string("0.0", pzero.to_s)
-    assert_equal_us_ascii_string(" 0.0", pzero.to_s(" "))
-    assert_equal_us_ascii_string("+0.0", pzero.to_s("+"))
-    assert_equal_us_ascii_string("-0.0", (-pzero).to_s)
-  end
-
-  def test_to_string
-    assert_equal_us_ascii_string("0.01", BigDecimal("0.01").to_s("F"))
-    s = "0." + "0" * 100 + "1"
-    assert_equal_us_ascii_string(s, BigDecimal(s).to_s("F"))
-    s = "1" + "0" * 100 + ".0"
-    assert_equal_us_ascii_string(s, BigDecimal(s).to_s("F"))
-  end
-
-  def test_ctov
-    assert_equal(0.1, BigDecimal("1E-1"))
-    assert_equal(10, BigDecimal("1E+1"))
-    assert_equal(1, BigDecimal("+1"))
-    BigDecimal.mode(BigDecimal::EXCEPTION_OVERFLOW, false)
-
-    assert_equal(BigDecimal::SIGN_POSITIVE_INFINITE, BigDecimal("1E1" + "0" * 10000).sign)
-    assert_equal(BigDecimal::SIGN_NEGATIVE_INFINITE, BigDecimal("-1E1" + "0" * 10000).sign)
-    assert_equal(BigDecimal::SIGN_POSITIVE_ZERO, BigDecimal("1E-1" + "0" * 10000).sign)
-    assert_equal(BigDecimal::SIGN_NEGATIVE_ZERO, BigDecimal("-1E-1" + "0" * 10000).sign)
-  end
-
-  def test_split_under_gc_stress
-    bug3258 = '[ruby-dev:41213]'
-    expect = 10.upto(20).map{|i|[1, "1", 10, i+1].inspect}
-    assert_in_out_err(%w[-rbigdecimal --disable-gems], <<-EOS, expect, [], bug3258)
-    GC.stress = true
-    10.upto(20) do |i|
-      p BigDecimal("1"+"0"*i).split
-    end
-    EOS
-  end
-
-  def test_coerce_under_gc_stress
-    assert_in_out_err(%w[-rbigdecimal --disable-gems], <<-EOS, [], [])
-      expect = ":too_long_to_embed_as_string can't be coerced into BigDecimal"
-      b = BigDecimal("1")
-      GC.stress = true
-      10.times do
-        begin
-          b.coerce(:too_long_to_embed_as_string)
-        rescue => e
-          raise unless e.is_a?(TypeError)
-          raise "'\#{expect}' is expected, but '\#{e.message}'" unless e.message == expect
-        end
-      end
-    EOS
-  end
-
-  def test_INFINITY
-    assert_positive_infinite(BigDecimal::INFINITY)
-  end
-
-  def test_NAN
-    assert_nan(BigDecimal::NAN)
-  end
-
-  def test_exp_with_zero_precision
-    assert_raise(ArgumentError) do
-      BigMath.exp(1, 0)
-    end
-  end
-
-  def test_exp_with_negative_precision
-    assert_raise(ArgumentError) do
-      BigMath.exp(1, -42)
-    end
-  end
-
-  def test_exp_with_complex
-    assert_raise(ArgumentError) do
-      BigMath.exp(Complex(1, 2), 20)
-    end
-  end
-
-  def test_exp_with_negative
-    x = BigDecimal(-1)
-    y = BigMath.exp(x, 20)
-    assert_equal(y, BigMath.exp(-1, 20))
-    assert_equal(BigDecimal(-1), x)
-  end
-
-  def test_exp_with_negative_infinite
-    BigDecimal.save_exception_mode do
-      BigDecimal.mode(BigDecimal::EXCEPTION_INFINITY, false)
-      assert_equal(0, BigMath.exp(-BigDecimal::INFINITY, 20))
-    end
-  end
-
-  def test_exp_with_positive_infinite
-    BigDecimal.save_exception_mode do
-      BigDecimal.mode(BigDecimal::EXCEPTION_INFINITY, false)
-      assert(BigMath.exp(BigDecimal::INFINITY, 20) > 0)
-      assert_positive_infinite(BigMath.exp(BigDecimal::INFINITY, 20))
-    end
-  end
-
-  def test_exp_with_nan
-    BigDecimal.save_exception_mode do
-      BigDecimal.mode(BigDecimal::EXCEPTION_NaN, false)
-      assert_nan(BigMath.exp(BigDecimal::NAN, 20))
-    end
-  end
-
-  def test_exp_with_1
-    assert_in_epsilon(Math::E, BigMath.exp(1, 20))
-  end
-
-  def test_BigMath_exp
-    prec = 20
-    assert_in_epsilon(Math.exp(20), BigMath.exp(BigDecimal("20"), prec))
-    assert_in_epsilon(Math.exp(40), BigMath.exp(BigDecimal("40"), prec))
-    assert_in_epsilon(Math.exp(-20), BigMath.exp(BigDecimal("-20"), prec))
-    assert_in_epsilon(Math.exp(-40), BigMath.exp(BigDecimal("-40"), prec))
-  end
-
-  def test_BigMath_exp_with_float
-    prec = 20
-    assert_in_epsilon(Math.exp(20), BigMath.exp(20.0, prec))
-    assert_in_epsilon(Math.exp(40), BigMath.exp(40.0, prec))
-    assert_in_epsilon(Math.exp(-20), BigMath.exp(-20.0, prec))
-    assert_in_epsilon(Math.exp(-40), BigMath.exp(-40.0, prec))
-  end
-
-  def test_BigMath_exp_with_fixnum
-    prec = 20
-    assert_in_epsilon(Math.exp(20), BigMath.exp(20, prec))
-    assert_in_epsilon(Math.exp(40), BigMath.exp(40, prec))
-    assert_in_epsilon(Math.exp(-20), BigMath.exp(-20, prec))
-    assert_in_epsilon(Math.exp(-40), BigMath.exp(-40, prec))
-  end
-
-  def test_BigMath_exp_with_rational
-    prec = 20
-    assert_in_epsilon(Math.exp(20), BigMath.exp(Rational(40,2), prec))
-    assert_in_epsilon(Math.exp(40), BigMath.exp(Rational(80,2), prec))
-    assert_in_epsilon(Math.exp(-20), BigMath.exp(Rational(-40,2), prec))
-    assert_in_epsilon(Math.exp(-40), BigMath.exp(Rational(-80,2), prec))
-  end
-
-  def test_BigMath_exp_under_gc_stress
-    assert_in_out_err(%w[-rbigdecimal --disable-gems], <<-EOS, [], [])
-      expect = ":too_long_to_embed_as_string can't be coerced into BigDecimal"
-      10.times do
-        begin
-          BigMath.exp(:too_long_to_embed_as_string, 6)
-        rescue => e
-          raise unless e.is_a?(ArgumentError)
-          raise "'\#{expect}' is expected, but '\#{e.message}'" unless e.message == expect
-        end
-      end
-    EOS
-  end
-
-  def test_BigMath_log_with_string
-    assert_raise(ArgumentError) do
-      BigMath.log("foo", 20)
-    end
-  end
-
-  def test_BigMath_log_with_nil
-    assert_raise(ArgumentError) do
-      BigMath.log(nil, 20)
-    end
-  end
-
-  def test_BigMath_log_with_non_integer_precision
-    assert_raise(ArgumentError) do
-      BigMath.log(1, 0.5)
-    end
-  end
-
-  def test_BigMath_log_with_nil_precision
-    assert_raise(ArgumentError) do
-      BigMath.log(1, nil)
-    end
-  end
-
-  def test_BigMath_log_with_complex
-    assert_raise(Math::DomainError) do
-      BigMath.log(Complex(1, 2), 20)
-    end
-  end
-
-  def test_BigMath_log_with_zero_arg
-    assert_raise(Math::DomainError) do
-      BigMath.log(0, 20)
-    end
-  end
-
-  def test_BigMath_log_with_negative_arg
-    assert_raise(Math::DomainError) do
-      BigMath.log(-1, 20)
-    end
-  end
-
-  def test_BigMath_log_with_zero_precision
-    assert_raise(ArgumentError) do
-      BigMath.log(1, 0)
-    end
-  end
-
-  def test_BigMath_log_with_negative_precision
-    assert_raise(ArgumentError) do
-      BigMath.log(1, -42)
-    end
-  end
-
-  def test_BigMath_log_with_negative_infinite
-    BigDecimal.save_exception_mode do
-      BigDecimal.mode(BigDecimal::EXCEPTION_INFINITY, false)
-      assert_raise(Math::DomainError) do
-        BigMath.log(-BigDecimal::INFINITY, 20)
-      end
-    end
-  end
-
-  def test_BigMath_log_with_positive_infinite
-    BigDecimal.save_exception_mode do
-      BigDecimal.mode(BigDecimal::EXCEPTION_INFINITY, false)
-      assert(BigMath.log(BigDecimal::INFINITY, 20) > 0)
-      assert_positive_infinite(BigMath.log(BigDecimal::INFINITY, 20))
-    end
-  end
-
-  def test_BigMath_log_with_nan
-    BigDecimal.save_exception_mode do
-      BigDecimal.mode(BigDecimal::EXCEPTION_NaN, false)
-      assert_nan(BigMath.log(BigDecimal::NAN, 20))
-    end
-  end
-
-  def test_BigMath_log_with_float_nan
-    BigDecimal.save_exception_mode do
-      BigDecimal.mode(BigDecimal::EXCEPTION_NaN, false)
-      assert_nan(BigMath.log(Float::NAN, 20))
-    end
-  end
-
-  def test_BigMath_log_with_1
-    assert_in_delta(0.0, BigMath.log(1, 20))
-    assert_in_delta(0.0, BigMath.log(1.0, 20))
-    assert_in_delta(0.0, BigMath.log(BigDecimal(1), 20))
-  end
-
-  def test_BigMath_log_with_exp_1
-    assert_in_delta(1.0, BigMath.log(BigMath.E(10), 10))
-  end
-
-  def test_BigMath_log_with_2
-    assert_in_delta(Math.log(2), BigMath.log(2, 20))
-    assert_in_delta(Math.log(2), BigMath.log(2.0, 20))
-    assert_in_delta(Math.log(2), BigMath.log(BigDecimal(2), 20))
-  end
-
-  def test_BigMath_log_with_square_of_E
-    assert_in_delta(2, BigMath.log(BigMath.E(20)**2, 20))
-  end
-
-  def test_BigMath_log_with_high_precision_case
-    e   = BigDecimal('2.71828182845904523536028747135266249775724709369996')
-    e_3 = e.mult(e, 50).mult(e, 50)
-    log_3 = BigMath.log(e_3, 50)
-    assert_in_delta(3, log_3, 0.0000000000_0000000000_0000000000_0000000000_0000000001)
-  end
-
-  def test_BigMath_log_with_42
-    assert_in_delta(Math.log(42), BigMath.log(42, 20))
-    assert_in_delta(Math.log(42), BigMath.log(42.0, 20))
-    assert_in_delta(Math.log(42), BigMath.log(BigDecimal(42), 20))
-  end
-
-  def test_BigMath_log_with_101
-    # this is mainly a performance test (should be very fast, not the 0.3 s)
-    assert_in_delta(Math.log(101), BigMath.log(101, 20), 1E-15)
-  end
-
-  def test_BigMath_log_with_reciprocal_of_42
-    assert_in_delta(Math.log(1e-42), BigMath.log(1e-42, 20))
-    assert_in_delta(Math.log(1e-42), BigMath.log(BigDecimal("1e-42"), 20))
-  end
-
-  def test_BigMath_log_under_gc_stress
-    assert_in_out_err(%w[-rbigdecimal --disable-gems], <<-EOS, [], [])
-      expect = ":too_long_to_embed_as_string can't be coerced into BigDecimal"
-      10.times do
-        begin
-          BigMath.log(:too_long_to_embed_as_string, 6)
-        rescue => e
-          raise unless e.is_a?(ArgumentError)
-          raise "'\#{expect}' is expected, but '\#{e.message}'" unless e.message == expect
-        end
-      end
-    EOS
-  end
-
-  def test_frozen_p
-    x = BigDecimal(1)
-    assert(x.frozen?)
-    assert((x + x).frozen?)
-  end
-
-  def test_clone
-    assert_warning(/^$/) do
-      x = BigDecimal(0)
-      assert_same(x, x.clone)
-    end
-  end
-
-  def test_dup
-    assert_warning(/^$/) do
-      [1, -1, 2**100, -2**100].each do |i|
-        x = BigDecimal(i)
-        assert_same(x, x.dup)
-      end
-    end
-  end
-
-  def test_new_subclass
-    c = Class.new(BigDecimal)
-    assert_raise_with_message(NoMethodError, /undefined method `new'/) { c.new(1) }
-  end
-
-  def test_to_d
-    bug6093 = '[ruby-core:42969]'
-    code = "exit(BigDecimal('10.0') == 10.0.to_d)"
-    assert_ruby_status(%w[-rbigdecimal -rbigdecimal/util -rmathn -], code, bug6093)
-  end if RUBY_VERSION < '2.5' # mathn was removed from Ruby 2.5
-
-  def test_bug6406
-    assert_in_out_err(%w[-rbigdecimal --disable-gems], <<-EOS, [], [])
-    Thread.current.keys.to_s
-    EOS
-  end
-
-  def test_precision_only_integer
-    assert_equal(0, BigDecimal(0).precision)
-    assert_equal(1, BigDecimal(1).precision)
-    assert_equal(1, BigDecimal(-1).precision)
-    assert_equal(2, BigDecimal(10).precision)
-    assert_equal(2, BigDecimal(-10).precision)
-    assert_equal(9, BigDecimal(100_000_000).precision)
-    assert_equal(9, BigDecimal(-100_000_000).precision)
-    assert_equal(12, BigDecimal(100_000_000_000).precision)
-    assert_equal(12, BigDecimal(-100_000_000_000).precision)
-    assert_equal(21, BigDecimal(100_000_000_000_000_000_000).precision)
-    assert_equal(21, BigDecimal(-100_000_000_000_000_000_000).precision)
-    assert_equal(103, BigDecimal("111e100").precision)
-    assert_equal(103, BigDecimal("-111e100").precision)
-  end
-
-  def test_precision_only_fraction
-    assert_equal(1, BigDecimal("0.1").precision)
-    assert_equal(1, BigDecimal("-0.1").precision)
-    assert_equal(2, BigDecimal("0.01").precision)
-    assert_equal(2, BigDecimal("-0.01").precision)
-    assert_equal(2, BigDecimal("0.11").precision)
-    assert_equal(2, BigDecimal("-0.11").precision)
-    assert_equal(9, BigDecimal("0.000_000_001").precision)
-    assert_equal(9, BigDecimal("-0.000_000_001").precision)
-    assert_equal(10, BigDecimal("0.000_000_000_1").precision)
-    assert_equal(10, BigDecimal("-0.000_000_000_1").precision)
-    assert_equal(21, BigDecimal("0.000_000_000_000_000_000_001").precision)
-    assert_equal(21, BigDecimal("-0.000_000_000_000_000_000_001").precision)
-    assert_equal(100, BigDecimal("111e-100").precision)
-    assert_equal(100, BigDecimal("-111e-100").precision)
-  end
-
-  def test_precision_full
-    assert_equal(5, BigDecimal("11111e-2").precision)
-    assert_equal(5, BigDecimal("-11111e-2").precision)
-    assert_equal(5, BigDecimal("11111e-2").precision)
-    assert_equal(5, BigDecimal("-11111e-2").precision)
-    assert_equal(21, BigDecimal("100.000_000_000_000_000_001").precision)
-    assert_equal(21, BigDecimal("-100.000_000_000_000_000_001").precision)
-  end
-
-  def test_precision_special
-    BigDecimal.save_exception_mode do
-      BigDecimal.mode(BigDecimal::EXCEPTION_OVERFLOW, false)
-      BigDecimal.mode(BigDecimal::EXCEPTION_NaN, false)
-
-      assert_equal(0, BigDecimal("Infinity").precision)
-      assert_equal(0, BigDecimal("-Infinity").precision)
-      assert_equal(0, BigDecimal("NaN").precision)
-    end
-  end
-
-  def test_scale_only_integer
-    assert_equal(0, BigDecimal(0).scale)
-    assert_equal(0, BigDecimal(1).scale)
-    assert_equal(0, BigDecimal(-1).scale)
-    assert_equal(0, BigDecimal(10).scale)
-    assert_equal(0, BigDecimal(-10).scale)
-    assert_equal(0, BigDecimal(100_000_000).scale)
-    assert_equal(0, BigDecimal(-100_000_000).scale)
-    assert_equal(0, BigDecimal(100_000_000_000).scale)
-    assert_equal(0, BigDecimal(-100_000_000_000).scale)
-    assert_equal(0, BigDecimal(100_000_000_000_000_000_000).scale)
-    assert_equal(0, BigDecimal(-100_000_000_000_000_000_000).scale)
-    assert_equal(0, BigDecimal("111e100").scale)
-    assert_equal(0, BigDecimal("-111e100").scale)
-  end
-
-  def test_scale_only_fraction
-    assert_equal(1, BigDecimal("0.1").scale)
-    assert_equal(1, BigDecimal("-0.1").scale)
-    assert_equal(2, BigDecimal("0.01").scale)
-    assert_equal(2, BigDecimal("-0.01").scale)
-    assert_equal(2, BigDecimal("0.11").scale)
-    assert_equal(2, BigDecimal("-0.11").scale)
-    assert_equal(21, BigDecimal("0.000_000_000_000_000_000_001").scale)
-    assert_equal(21, BigDecimal("-0.000_000_000_000_000_000_001").scale)
-    assert_equal(100, BigDecimal("111e-100").scale)
-    assert_equal(100, BigDecimal("-111e-100").scale)
-  end
-
-  def test_scale_full
-    assert_equal(1, BigDecimal("0.1").scale)
-    assert_equal(1, BigDecimal("-0.1").scale)
-    assert_equal(2, BigDecimal("0.01").scale)
-    assert_equal(2, BigDecimal("-0.01").scale)
-    assert_equal(2, BigDecimal("0.11").scale)
-    assert_equal(2, BigDecimal("-0.11").scale)
-    assert_equal(2, BigDecimal("11111e-2").scale)
-    assert_equal(2, BigDecimal("-11111e-2").scale)
-    assert_equal(18, BigDecimal("100.000_000_000_000_000_001").scale)
-    assert_equal(18, BigDecimal("-100.000_000_000_000_000_001").scale)
-  end
-
-  def test_scale_special
-    BigDecimal.save_exception_mode do
-      BigDecimal.mode(BigDecimal::EXCEPTION_OVERFLOW, false)
-      BigDecimal.mode(BigDecimal::EXCEPTION_NaN, false)
-
-      assert_equal(0, BigDecimal("Infinity").scale)
-      assert_equal(0, BigDecimal("-Infinity").scale)
-      assert_equal(0, BigDecimal("NaN").scale)
-    end
-  end
-
-  def test_precision_scale
-    assert_equal([2, 0], BigDecimal("11.0").precision_scale)
-    assert_equal([2, 1], BigDecimal("1.1").precision_scale)
-    assert_equal([2, 2], BigDecimal("0.11").precision_scale)
-
-    BigDecimal.save_exception_mode do
-      BigDecimal.mode(BigDecimal::EXCEPTION_OVERFLOW, false)
-      assert_equal([0, 0], BigDecimal("Infinity").precision_scale)
-    end
-  end
-
-  def test_n_significant_digits_only_integer
-    assert_equal(0, BigDecimal(0).n_significant_digits)
-    assert_equal(1, BigDecimal(1).n_significant_digits)
-    assert_equal(1, BigDecimal(-1).n_significant_digits)
-    assert_equal(1, BigDecimal(10).n_significant_digits)
-    assert_equal(1, BigDecimal(-10).n_significant_digits)
-    assert_equal(3, BigDecimal(101).n_significant_digits)
-    assert_equal(3, BigDecimal(-101).n_significant_digits)
-    assert_equal(1, BigDecimal(100_000_000_000_000_000_000).n_significant_digits)
-    assert_equal(1, BigDecimal(-100_000_000_000_000_000_000).n_significant_digits)
-    assert_equal(21, BigDecimal(100_000_000_000_000_000_001).n_significant_digits)
-    assert_equal(21, BigDecimal(-100_000_000_000_000_000_001).n_significant_digits)
-    assert_equal(3, BigDecimal("111e100").n_significant_digits)
-    assert_equal(3, BigDecimal("-111e100").n_significant_digits)
-  end
-
-  def test_n_significant_digits_only_fraction
-    assert_equal(1, BigDecimal("0.1").n_significant_digits)
-    assert_equal(1, BigDecimal("-0.1").n_significant_digits)
-    assert_equal(1, BigDecimal("0.01").n_significant_digits)
-    assert_equal(1, BigDecimal("-0.01").n_significant_digits)
-    assert_equal(2, BigDecimal("0.11").n_significant_digits)
-    assert_equal(2, BigDecimal("-0.11").n_significant_digits)
-    assert_equal(1, BigDecimal("0.000_000_000_000_000_000_001").n_significant_digits)
-    assert_equal(1, BigDecimal("-0.000_000_000_000_000_000_001").n_significant_digits)
-    assert_equal(3, BigDecimal("111e-100").n_significant_digits)
-    assert_equal(3, BigDecimal("-111e-100").n_significant_digits)
-  end
-
-  def test_n_significant_digits_full
-    assert_equal(2, BigDecimal("1.1").n_significant_digits)
-    assert_equal(2, BigDecimal("-1.1").n_significant_digits)
-    assert_equal(3, BigDecimal("1.01").n_significant_digits)
-    assert_equal(3, BigDecimal("-1.01").n_significant_digits)
-    assert_equal(5, BigDecimal("11111e-2").n_significant_digits)
-    assert_equal(5, BigDecimal("-11111e-2").n_significant_digits)
-    assert_equal(21, BigDecimal("100.000_000_000_000_000_001").n_significant_digits)
-    assert_equal(21, BigDecimal("-100.000_000_000_000_000_001").n_significant_digits)
-  end
-
-  def test_n_significant_digits_special
-    BigDecimal.save_exception_mode do
-      BigDecimal.mode(BigDecimal::EXCEPTION_OVERFLOW, false)
-      BigDecimal.mode(BigDecimal::EXCEPTION_NaN, false)
-
-      assert_equal(0, BigDecimal("Infinity").n_significant_digits)
-      assert_equal(0, BigDecimal("-Infinity").n_significant_digits)
-      assert_equal(0, BigDecimal("NaN").n_significant_digits)
-    end
-  end
-
-  def test_initialize_copy_dup_clone_frozen_error
-    bd = BigDecimal(1)
-    bd2 = BigDecimal(2)
-    err = RUBY_VERSION >= '2.5' ? FrozenError : TypeError
-    assert_raise(err) { bd.send(:initialize_copy, bd2) }
-    assert_raise(err) { bd.send(:initialize_clone, bd2) }
-    assert_raise(err) { bd.send(:initialize_dup, bd2) }
-  end
-
-  def test_llong_min_gh_200
-    # https://github.com/ruby/bigdecimal/issues/199
-    # Between LLONG_MIN and -ULLONG_MAX
-    assert_equal(BigDecimal(LIMITS["LLONG_MIN"].to_s), BigDecimal(LIMITS["LLONG_MIN"]), "[GH-200]")
-
-    minus_ullong_max = -LIMITS["ULLONG_MAX"]
-    assert_equal(BigDecimal(minus_ullong_max.to_s), BigDecimal(minus_ullong_max), "[GH-200]")
-  end
-
-  def test_reminder_infinity_gh_187
-    # https://github.com/ruby/bigdecimal/issues/187
-    BigDecimal.save_exception_mode do
-      BigDecimal.mode(BigDecimal::EXCEPTION_INFINITY, false)
-      BigDecimal.mode(BigDecimal::EXCEPTION_NaN, false)
-      bd = BigDecimal("4.2")
-      assert_equal(bd.remainder(BigDecimal("+Infinity")), bd)
-      assert_equal(bd.remainder(BigDecimal("-Infinity")), bd)
-    end
-  end
-
-  def test_bsearch_for_bigdecimal
-    assert_raise(TypeError) {
-      (BigDecimal('0.5')..BigDecimal('2.25')).bsearch
-    }
-  end
-
-  def assert_no_memory_leak(code, *rest, **opt)
-    code = "8.times {20_000.times {begin #{code}; rescue NoMemoryError; end}; GC.start}"
-    super(["-rbigdecimal"],
-          "b = BigDecimal('10'); b.nil?; " \
-          "GC.add_stress_to_class(BigDecimal); "\
-          "#{code}", code, *rest, rss: true, limit: 1.1, **opt)
-  end
-
-  if EnvUtil.gc_stress_to_class?
-    def test_no_memory_leak_allocate
-      assert_no_memory_leak("BigDecimal.allocate")
-    end
-
-    def test_no_memory_leak_initialize
-      assert_no_memory_leak("BigDecimal()")
-    end
-
-    def test_no_memory_leak_BigDecimal
-      assert_no_memory_leak("BigDecimal('10')")
-      assert_no_memory_leak("BigDecimal(b)")
-    end
-
-    def test_no_memory_leak_create
-      assert_no_memory_leak("b + 10")
-    end
-  end
-end
diff --git a/test/bigdecimal/test_bigdecimal_util.rb b/test/bigdecimal/test_bigdecimal_util.rb
deleted file mode 100644
index 2f27163ebfa702..00000000000000
--- a/test/bigdecimal/test_bigdecimal_util.rb
+++ /dev/null
@@ -1,141 +0,0 @@
-# frozen_string_literal: false
-require_relative "helper"
-require 'bigdecimal/util'
-
-class TestBigDecimalUtil < Test::Unit::TestCase
-  include TestBigDecimalBase
-
-  def test_BigDecimal_to_d
-    x = BigDecimal(1)
-    assert_same(x, x.to_d)
-  end
-
-  def test_Integer_to_d
-    assert_equal(BigDecimal(1), 1.to_d)
-    assert_equal(BigDecimal(2<<100), (2<<100).to_d)
-
-    assert(1.to_d.frozen?)
-  end
-
-  def test_Float_to_d_without_precision
-    delta = 1.0/10**(Float::DIG+1)
-    assert_in_delta(BigDecimal(0.5, 0), 0.5.to_d, delta)
-    assert_in_delta(BigDecimal(355.0/113.0, 0), (355.0/113.0).to_d, delta)
-
-    assert_equal(9.05, 9.05.to_d.to_f)
-    assert_equal("9.05", 9.05.to_d.to_s('F'))
-
-    assert_equal("65.6", 65.6.to_d.to_s("F"))
-
-    assert_equal(Math::PI, Math::PI.to_d.to_f)
-
-    bug9214 = '[ruby-core:58858]'
-    assert_equal((-0.0).to_d.sign, -1, bug9214)
-
-    assert_raise(TypeError) { 0.3.to_d(nil) }
-    assert_raise(TypeError) { 0.3.to_d(false) }
-
-    assert(1.1.to_d.frozen?)
-
-    assert_equal(BigDecimal("999_999.9999"), 999_999.9999.to_d)
-  end
-
-  def test_Float_to_d_with_precision
-    digits = 5
-    delta = 1.0/10**(digits)
-    assert_in_delta(BigDecimal(0.5, 5), 0.5.to_d(digits), delta)
-    assert_in_delta(BigDecimal(355.0/113.0, 5), (355.0/113.0).to_d(digits), delta)
-
-    bug9214 = '[ruby-core:58858]'
-    assert_equal((-0.0).to_d(digits).sign, -1, bug9214)
-
-    assert(1.1.to_d(digits).frozen?)
-  end
-
-  def test_Float_to_d_bug13331
-    assert_equal(64.4.to_d,
-                 1.to_d * 64.4,
-                 "[ruby-core:80234] [Bug #13331]")
-
-    assert_equal((2*Math::PI).to_d,
-                 2.to_d * Math::PI,
-                 "[ruby-core:80234] [Bug #13331]")
-  end
-
-  def test_Float_to_d_issue_192
-    # https://github.com/ruby/bigdecimal/issues/192
-    # https://github.com/rails/rails/pull/42125
-    if BASE_FIG == 9
-      flo = 1_000_000_000.12345
-      big = BigDecimal("0.100000000012345e10")
-    else  # BASE_FIG == 4
-      flo = 1_0000.12
-      big = BigDecimal("0.1000012e5")
-    end
-    assert_equal(flo.to_d, big, "[ruby/bigdecimal#192]")
-  end
-
-  def test_Rational_to_d
-    digits = 100
-    delta = 1.0/10**(digits)
-    assert_in_delta(BigDecimal(1.quo(2), digits), 1.quo(2).to_d(digits), delta)
-    assert_in_delta(BigDecimal(355.quo(113), digits), 355.quo(113).to_d(digits), delta)
-
-    assert(355.quo(113).to_d(digits).frozen?)
-  end
-
-  def test_Rational_to_d_with_zero_precision
-    assert_equal(BigDecimal(355.quo(113), 0), 355.quo(113).to_d(0))
-  end
-
-  def test_Rational_to_d_with_negative_precision
-    assert_raise(ArgumentError) { 355.quo(113).to_d(-42) }
-  end
-
-  def test_Complex_to_d
-    BigDecimal.save_rounding_mode do
-      BigDecimal.mode(BigDecimal::ROUND_MODE, BigDecimal::ROUND_HALF_EVEN)
-
-      assert_equal(BigDecimal("1"), Complex(1, 0).to_d)
-      assert_equal(BigDecimal("0.333333333333333333333"),
-                   Complex(1.quo(3), 0).to_d(21))
-      assert_equal(BigDecimal("0.1234567"), Complex(0.1234567, 0).to_d)
-      assert_equal(BigDecimal("0.1235"), Complex(0.1234567, 0).to_d(4))
-
-      assert_raise_with_message(ArgumentError, "can't omit precision for a Rational.") { Complex(1.quo(3), 0).to_d }
-
-      assert_raise_with_message(ArgumentError, "Unable to make a BigDecimal from non-zero imaginary number") { Complex(1, 1).to_d }
-    end
-  end
-
-  def test_String_to_d
-    assert_equal(BigDecimal('1'), "1__1_1".to_d)
-    assert_equal(BigDecimal('2.5'), "2.5".to_d)
-    assert_equal(BigDecimal('2.5'), "2.5 degrees".to_d)
-    assert_equal(BigDecimal('2.5e1'), "2.5e1 degrees".to_d)
-    assert_equal(BigDecimal('0'), "degrees 100.0".to_d)
-    assert_equal(BigDecimal('0.125'), "0.1_2_5".to_d)
-    assert_equal(BigDecimal('0.125'), "0.1_2_5__".to_d)
-    assert_equal(BigDecimal('1'), "1_.125".to_d)
-    assert_equal(BigDecimal('1'), "1._125".to_d)
-    assert_equal(BigDecimal('0.1'), "0.1__2_5".to_d)
-    assert_equal(BigDecimal('0.1'), "0.1_e10".to_d)
-    assert_equal(BigDecimal('0.1'), "0.1e_10".to_d)
-    assert_equal(BigDecimal('1'), "0.1e1__0".to_d)
-    assert_equal(BigDecimal('1.2'), "1.2.3".to_d)
-    assert_equal(BigDecimal('1'), "1.".to_d)
-    assert_equal(BigDecimal('1'), "1e".to_d)
-
-    assert("2.5".to_d.frozen?)
-  end
-
-  def test_invalid_String_to_d
-    assert_equal("invalid".to_d, BigDecimal('0.0'))
-  end
-
-  def test_Nil_to_d
-    assert_equal(nil.to_d, BigDecimal('0.0'))
-
-    assert(nil.to_d)
-  end
-end
diff --git a/test/bigdecimal/test_bigmath.rb b/test/bigdecimal/test_bigmath.rb
deleted file mode 100644
index 5bf1fbf318a795..00000000000000
--- a/test/bigdecimal/test_bigmath.rb
+++ /dev/null
@@ -1,81 +0,0 @@
-# frozen_string_literal: false
-require_relative "helper"
-require "bigdecimal/math"
-
-class TestBigMath < Test::Unit::TestCase
-  include TestBigDecimalBase
-  include BigMath
-  N = 20
-  PINF = BigDecimal("+Infinity")
-  MINF = BigDecimal("-Infinity")
-  NAN = BigDecimal("NaN")
-
-  def test_const
-    assert_in_delta(Math::PI, PI(N))
-    assert_in_delta(Math::E, E(N))
-  end
-
-  def test_sqrt
-    assert_in_delta(2**0.5, sqrt(BigDecimal("2"), N))
-    assert_equal(10, sqrt(BigDecimal("100"), N))
-    assert_equal(0.0, sqrt(BigDecimal("0"), N))
-    assert_equal(0.0, sqrt(BigDecimal("-0"), N))
-    assert_raise(FloatDomainError) {sqrt(BigDecimal("-1.0"), N)}
-    assert_raise(FloatDomainError) {sqrt(NAN, N)}
-    assert_raise(FloatDomainError) {sqrt(PINF, N)}
-  end
-
-  def test_sin
-    assert_in_delta(0.0, sin(BigDecimal("0.0"), N))
-    assert_in_delta(Math.sqrt(2.0) / 2, sin(PI(N) / 4, N))
-    assert_in_delta(1.0, sin(PI(N) / 2, N))
-    assert_in_delta(0.0, sin(PI(N) * 2, N))
-    assert_in_delta(0.0, sin(PI(N), N))
-    assert_in_delta(-1.0, sin(PI(N) / -2, N))
-    assert_in_delta(0.0, sin(PI(N) * -2, N))
-    assert_in_delta(0.0, sin(-PI(N), N))
-    assert_in_delta(0.0, sin(PI(N) * 21, N))
-    assert_in_delta(0.0, sin(PI(N) * 30, N))
-    assert_in_delta(-1.0, sin(PI(N) * BigDecimal("301.5"), N))
-  end
-
-  def test_cos
-    assert_in_delta(1.0, cos(BigDecimal("0.0"), N))
-    assert_in_delta(Math.sqrt(2.0) / 2, cos(PI(N) / 4, N))
-    assert_in_delta(0.0, cos(PI(N) / 2, N))
-    assert_in_delta(1.0, cos(PI(N) * 2, N))
-    assert_in_delta(-1.0, cos(PI(N), N))
-    assert_in_delta(0.0, cos(PI(N) / -2, N))
-    assert_in_delta(1.0, cos(PI(N) * -2, N))
-    assert_in_delta(-1.0, cos(-PI(N), N))
-    assert_in_delta(-1.0, cos(PI(N) * 21, N))
-    assert_in_delta(1.0, cos(PI(N) * 30, N))
-    assert_in_delta(0.0, cos(PI(N) * BigDecimal("301.5"), N))
-  end
-
-  def test_atan
-    assert_equal(0.0, atan(BigDecimal("0.0"), N))
-    assert_in_delta(Math::PI/4, atan(BigDecimal("1.0"), N))
-    assert_in_delta(Math::PI/6, atan(sqrt(BigDecimal("3.0"), N) / 3, N))
-    assert_in_delta(Math::PI/2, atan(PINF, N))
-    assert_equal(BigDecimal("0.823840753418636291769355073102514088959345624027952954058347023122539489"),
-                 atan(BigDecimal("1.08"), 72).round(72), '[ruby-dev:41257]')
-  end
-
-  def test_log
-    assert_equal(0, BigMath.log(BigDecimal("1.0"), 10))
-    assert_in_epsilon(Math.log(10)*1000, BigMath.log(BigDecimal("1e1000"), 10))
-    assert_raise(Math::DomainError) {BigMath.log(BigDecimal("0"), 10)}
-    assert_raise(Math::DomainError) {BigMath.log(BigDecimal("-1"), 10)}
-    assert_separately(%w[-rbigdecimal], <<-SRC)
-    begin
-      x = BigMath.log(BigDecimal("1E19999999999999"), 10)
-    rescue FloatDomainError
-    else
-      unless x.infinite?
-        assert_in_epsilon(Math.log(10)*19999999999999, x)
-      end
-    end
-    SRC
-  end
-end
diff --git a/test/bigdecimal/test_ractor.rb b/test/bigdecimal/test_ractor.rb
deleted file mode 100644
index 798cc494e18a9d..00000000000000
--- a/test/bigdecimal/test_ractor.rb
+++ /dev/null
@@ -1,23 +0,0 @@
-# frozen_string_literal: true
-require_relative "helper"
-
-class TestBigDecimalRactor < Test::Unit::TestCase
-  include TestBigDecimalBase
-
-  def setup
-    super
-    omit unless defined? Ractor
-  end
-
-  def test_ractor_shareable
-    assert_separately([], "#{<<~"begin;"}\n#{<<~'end;'}")
-    begin;
-      $VERBOSE = nil
-      require "bigdecimal"
-      r = Ractor.new BigDecimal(Math::PI, Float::DIG+1) do |pi|
-        BigDecimal('2.0')*pi
-      end
-      assert_equal(2*Math::PI, r.take)
-    end;
-  end
-end
diff --git a/test/cgi/test_cgi_cookie.rb b/test/cgi/test_cgi_cookie.rb
deleted file mode 100644
index eadae4531365f5..00000000000000
--- a/test/cgi/test_cgi_cookie.rb
+++ /dev/null
@@ -1,211 +0,0 @@
-# frozen_string_literal: true
-require 'test/unit'
-require 'cgi'
-require 'stringio'
-require_relative 'update_env'
-
-
-class CGICookieTest < Test::Unit::TestCase
-  include UpdateEnv
-
-
-  def setup
-    @environ = {}
-    update_env(
-      'REQUEST_METHOD' => 'GET',
-      'SCRIPT_NAME' => nil,
-    )
-    @str1="\xE3\x82\x86\xE3\x82\x93\xE3\x82\x86\xE3\x82\x93".dup
-    @str1.force_encoding("UTF-8") if defined?(::Encoding)
-  end
-
-  def teardown
-    ENV.update(@environ)
-  end
-
-
-  def test_cgi_cookie_new_simple
-    cookie = CGI::Cookie.new('name1', 'val1', '&<>"', @str1)
-    assert_equal('name1', cookie.name)
-    assert_equal(['val1', '&<>"', @str1], cookie.value)
-    assert_nil(cookie.domain)
-    assert_nil(cookie.expires)
-    assert_equal('', cookie.path)
-    assert_equal(false, cookie.secure)
-    assert_equal(false, cookie.httponly)
-    assert_equal("name1=val1&%26%3C%3E%22&%E3%82%86%E3%82%93%E3%82%86%E3%82%93; path=", cookie.to_s)
-  end
-
-
-  def test_cgi_cookie_new_complex
-    t = Time.gm(2030, 12, 31, 23, 59, 59)
-    value = ['val1', '&<>"', "\xA5\xE0\xA5\xB9\xA5\xAB".dup]
-    value[2].force_encoding("EUC-JP") if defined?(::Encoding)
-    cookie = CGI::Cookie.new('name'=>'name1',
-                             'value'=>value,
-                             'path'=>'/cgi-bin/myapp/',
-                             'domain'=>'www.example.com',
-                             'expires'=>t,
-                             'secure'=>true,
-                             'httponly'=>true
-                             )
-    assert_equal('name1', cookie.name)
-    assert_equal(value, cookie.value)
-    assert_equal('www.example.com', cookie.domain)
-    assert_equal(t, cookie.expires)
-    assert_equal('/cgi-bin/myapp/', cookie.path)
-    assert_equal(true, cookie.secure)
-    assert_equal(true, cookie.httponly)
-    assert_equal('name1=val1&%26%3C%3E%22&%A5%E0%A5%B9%A5%AB; domain=www.example.com; path=/cgi-bin/myapp/; expires=Tue, 31 Dec 2030 23:59:59 GMT; secure; HttpOnly', cookie.to_s)
-  end
-
-
-  def test_cgi_cookie_new_with_domain
-    h = {'name'=>'name1', 'value'=>'value1'}
-    cookie = CGI::Cookie.new(h.merge('domain'=>'a.example.com'))
-    assert_equal('a.example.com', cookie.domain)
-
-    cookie = CGI::Cookie.new(h.merge('domain'=>'.example.com'))
-    assert_equal('.example.com', cookie.domain)
-
-    cookie = CGI::Cookie.new(h.merge('domain'=>'1.example.com'))
-    assert_equal('1.example.com', cookie.domain, 'enhanced by RFC 1123')
-
-    assert_raise(ArgumentError) {
-      CGI::Cookie.new(h.merge('domain'=>'-a.example.com'))
-    }
-
-    assert_raise(ArgumentError) {
-      CGI::Cookie.new(h.merge('domain'=>'a-.example.com'))
-    }
-  end
-
-
-  def test_cgi_cookie_scriptname
-    cookie = CGI::Cookie.new('name1', 'value1')
-    assert_equal('', cookie.path)
-    cookie = CGI::Cookie.new('name'=>'name1', 'value'=>'value1')
-    assert_equal('', cookie.path)
-    ## when ENV['SCRIPT_NAME'] is set, cookie.path is set automatically
-    ENV['SCRIPT_NAME'] = '/cgi-bin/app/example.cgi'
-    cookie = CGI::Cookie.new('name1', 'value1')
-    assert_equal('/cgi-bin/app/', cookie.path)
-    cookie = CGI::Cookie.new('name'=>'name1', 'value'=>'value1')
-    assert_equal('/cgi-bin/app/', cookie.path)
-  end
-
-
-  def test_cgi_cookie_parse
-    ## ';' separator
-    cookie_str = 'name1=val1&val2; name2=val2&%26%3C%3E%22&%E3%82%86%E3%82%93%E3%82%86%E3%82%93;_session_id=12345'
-    cookies = CGI::Cookie.parse(cookie_str)
-    list = [
-      ['name1', ['val1', 'val2']],
-      ['name2', ['val2', '&<>"',@str1]],
-      ['_session_id', ['12345']],
-    ]
-    list.each do |name, value|
-      cookie = cookies[name]
-      assert_equal(name, cookie.name)
-      assert_equal(value, cookie.value)
-    end
-    ## don't allow ',' separator
-    cookie_str = 'name1=val1&val2, name2=val2'
-    cookies = CGI::Cookie.parse(cookie_str)
-    list = [
-      ['name1', ['val1', 'val2, name2=val2']],
-    ]
-    list.each do |name, value|
-      cookie = cookies[name]
-      assert_equal(name, cookie.name)
-      assert_equal(value, cookie.value)
-    end
-  end
-
-  def test_cgi_cookie_parse_not_decode_name
-    cookie_str = "%66oo=baz;foo=bar"
-    cookies = CGI::Cookie.parse(cookie_str)
-    assert_equal({"%66oo" => ["baz"], "foo" => ["bar"]}, cookies)
-  end
-
-  def test_cgi_cookie_arrayinterface
-    cookie = CGI::Cookie.new('name1', 'a', 'b', 'c')
-    assert_equal('a', cookie[0])
-    assert_equal('c', cookie[2])
-    assert_nil(cookie[3])
-    assert_equal('a', cookie.first)
-    assert_equal('c', cookie.last)
-    assert_equal(['A', 'B', 'C'], cookie.collect{|e| e.upcase})
-  end
-
-
-  def test_cgi_cookie_domain_injection_into_name
-    name = "a=b; domain=example.com;"
-    path = "/"
-    domain = "example.jp"
-    assert_raise(ArgumentError) do
-      CGI::Cookie.new('name' => name,
-                      'value' => "value",
-                      'domain' => domain,
-                      'path' => path)
-    end
-  end
-
-
-  def test_cgi_cookie_newline_injection_into_name
-    name = "a=b;\r\nLocation: http://example.com#"
-    path = "/"
-    domain = "example.jp"
-    assert_raise(ArgumentError) do
-      CGI::Cookie.new('name' => name,
-                      'value' => "value",
-                      'domain' => domain,
-                      'path' => path)
-    end
-  end
-
-
-  def test_cgi_cookie_multibyte_injection_into_name
-    name = "a=b;\u3042"
-    path = "/"
-    domain = "example.jp"
-    assert_raise(ArgumentError) do
-      CGI::Cookie.new('name' => name,
-                      'value' => "value",
-                      'domain' => domain,
-                      'path' => path)
-    end
-  end
-
-
-  def test_cgi_cookie_injection_into_path
-    name = "name"
-    path = "/; samesite=none"
-    domain = "example.jp"
-    assert_raise(ArgumentError) do
-      CGI::Cookie.new('name' => name,
-                      'value' => "value",
-                      'domain' => domain,
-                      'path' => path)
-    end
-  end
-
-
-  def test_cgi_cookie_injection_into_domain
-    name = "name"
-    path = "/"
-    domain = "example.jp; samesite=none"
-    assert_raise(ArgumentError) do
-      CGI::Cookie.new('name' => name,
-                      'value' => "value",
-                      'domain' => domain,
-                      'path' => path)
-    end
-  end
-
-
-  instance_methods.each do |method|
-    private method if method =~ /^test_(.*)/ && $1 != ENV['TEST']
-  end if ENV['TEST']
-
-end
diff --git a/test/cgi/test_cgi_core.rb b/test/cgi/test_cgi_core.rb
deleted file mode 100644
index f7adb7e99f16f3..00000000000000
--- a/test/cgi/test_cgi_core.rb
+++ /dev/null
@@ -1,307 +0,0 @@
-# frozen_string_literal: true
-require 'test/unit'
-require 'cgi'
-require 'stringio'
-require_relative 'update_env'
-
-
-class CGICoreTest < Test::Unit::TestCase
-  include UpdateEnv
-
-  def setup
-    @environ = {}
-    #@environ = {
-    #  'SERVER_PROTOCOL' => 'HTTP/1.1',
-    #  'REQUEST_METHOD'  => 'GET',
-    #  'SERVER_SOFTWARE' => 'Apache 2.2.0',
-    #}
-    #ENV.update(@environ)
-  end
-
-  def teardown
-    ENV.update(@environ)
-    $stdout = STDOUT
-  end
-
-  def test_cgi_parse_illegal_query
-    update_env(
-      'REQUEST_METHOD'  => 'GET',
-      'QUERY_STRING'    => 'a=111&&b=222&c&d=',
-      'HTTP_COOKIE'     => '_session_id=12345; name1=val1&val2;',
-      'SERVER_SOFTWARE' => 'Apache 2.2.0',
-      'SERVER_PROTOCOL' => 'HTTP/1.1',
-    )
-    cgi = CGI.new
-    assert_equal(["a","b","c","d"],cgi.keys.sort)
-    assert_equal("",cgi["d"])
-  end
-
-  def test_cgi_core_params_GET
-    update_env(
-      'REQUEST_METHOD'  => 'GET',
-      'QUERY_STRING'    => 'id=123&id=456&id=&id&str=%40h+%3D%7E+%2F%5E%24%2F',
-      'HTTP_COOKIE'     => '_session_id=12345; name1=val1&val2;',
-      'SERVER_SOFTWARE' => 'Apache 2.2.0',
-      'SERVER_PROTOCOL' => 'HTTP/1.1',
-    )
-    cgi = CGI.new
-    ## cgi[]
-    assert_equal('123', cgi['id'])
-    assert_equal('@h =~ /^$/', cgi['str'])
-    ## cgi.params
-    assert_equal(['123', '456', ''], cgi.params['id'])
-    assert_equal(['@h =~ /^$/'], cgi.params['str'])
-    ## cgi.keys
-    assert_equal(['id', 'str'], cgi.keys.sort)
-    ## cgi.key?, cgi.has_key?, cgi.include?
-    assert_equal(true,  cgi.key?('id'))
-    assert_equal(true,  cgi.has_key?('id'))
-    assert_equal(true,  cgi.include?('id'))
-    assert_equal(false, cgi.key?('foo'))
-    assert_equal(false, cgi.has_key?('foo'))
-    assert_equal(false, cgi.include?('foo'))
-    ## invalid parameter name
-    assert_equal('', cgi['*notfound*'])    # [ruby-dev:30740]
-    assert_equal([], cgi.params['*notfound*'])
-  end
-
-
-  def test_cgi_core_params_POST
-    query_str = 'id=123&id=456&id=&str=%40h+%3D%7E+%2F%5E%24%2F'
-    update_env(
-      'REQUEST_METHOD'  => 'POST',
-      'CONTENT_LENGTH'  => query_str.length.to_s,
-      'HTTP_COOKIE'     => '_session_id=12345; name1=val1&val2;',
-      'SERVER_SOFTWARE' => 'Apache 2.2.0',
-      'SERVER_PROTOCOL' => 'HTTP/1.1',
-    )
-    $stdin = StringIO.new
-    $stdin << query_str
-    $stdin.rewind
-    cgi = CGI.new
-    ## cgi[]
-    assert_equal('123', cgi['id'])
-    assert_equal('@h =~ /^$/', cgi['str'])
-    ## cgi.params
-    assert_equal(['123', '456', ''], cgi.params['id'])
-    assert_equal(['@h =~ /^$/'], cgi.params['str'])
-    ## invalid parameter name
-    assert_equal('', cgi['*notfound*'])
-    assert_equal([], cgi.params['*notfound*'])
-  ensure
-    $stdin = STDIN
-  end
-
-  def test_cgi_core_params_encoding_check
-    query_str = 'str=%BE%BE%B9%BE'
-    update_env(
-        'REQUEST_METHOD'  => 'POST',
-        'CONTENT_LENGTH'  => query_str.length.to_s,
-        'SERVER_SOFTWARE' => 'Apache 2.2.0',
-        'SERVER_PROTOCOL' => 'HTTP/1.1',
-    )
-    $stdin = StringIO.new
-    $stdin << query_str
-    $stdin.rewind
-    if defined?(::Encoding)
-      hash={}
-      cgi = CGI.new(:accept_charset=>"UTF-8"){|key,val|hash[key]=val}
-      ## cgi[]
-      assert_equal("\xBE\xBE\xB9\xBE".dup.force_encoding("UTF-8"), cgi['str'])
-      ## cgi.params
-      assert_equal(["\xBE\xBE\xB9\xBE".dup.force_encoding("UTF-8")], cgi.params['str'])
-      ## accept-charset error
-      assert_equal({"str"=>"\xBE\xBE\xB9\xBE".dup.force_encoding("UTF-8")},hash)
-
-      $stdin.rewind
-      assert_raise(CGI::InvalidEncoding) do
-        cgi = CGI.new(:accept_charset=>"UTF-8")
-      end
-
-      $stdin.rewind
-      cgi = CGI.new(:accept_charset=>"EUC-JP")
-      ## cgi[]
-      assert_equal("\xBE\xBE\xB9\xBE".dup.force_encoding("EUC-JP"), cgi['str'])
-      ## cgi.params
-      assert_equal(["\xBE\xBE\xB9\xBE".dup.force_encoding("EUC-JP")], cgi.params['str'])
-    else
-      assert(true)
-    end
-  ensure
-    $stdin = STDIN
-  end
-
-
-  def test_cgi_core_cookie
-    update_env(
-      'REQUEST_METHOD'  => 'GET',
-      'QUERY_STRING'    => 'id=123&id=456&id=&str=%40h+%3D%7E+%2F%5E%24%2F',
-      'HTTP_COOKIE'     => '_session_id=12345; name1=val1&val2;',
-      'SERVER_SOFTWARE' => 'Apache 2.2.0',
-      'SERVER_PROTOCOL' => 'HTTP/1.1',
-    )
-    cgi = CGI.new
-    assert_not_equal(nil,cgi.cookies)
-    [ ['_session_id', ['12345'],        ],
-      ['name1',       ['val1', 'val2'], ],
-    ].each do |key, expected|
-      cookie = cgi.cookies[key]
-      assert_kind_of(CGI::Cookie, cookie)
-      assert_equal(expected, cookie.value)
-      assert_equal(false, cookie.secure)
-      assert_nil(cookie.expires)
-      assert_nil(cookie.domain)
-      assert_equal('', cookie.path)
-    end
-  end
-
-
-  def test_cgi_core_maxcontentlength
-    update_env(
-      'REQUEST_METHOD'  => 'POST',
-      'CONTENT_LENGTH'  => (64 * 1024 * 1024).to_s
-    )
-    ex = assert_raise(StandardError) do
-      CGI.new
-    end
-    assert_equal("too large post data.", ex.message)
-  end if CGI.const_defined?(:MAX_CONTENT_LENGTH)
-
-
-  def test_cgi_core_out
-    update_env(
-      'REQUEST_METHOD'  => 'GET',
-      'QUERY_STRING'    => 'id=123&id=456&id=&str=%40h+%3D%7E+%2F%5E%24%2F',
-      'HTTP_COOKIE'     => '_session_id=12345; name1=val1&val2;',
-      'SERVER_SOFTWARE' => 'Apache 2.2.0',
-      'SERVER_PROTOCOL' => 'HTTP/1.1',
-    )
-    cgi = CGI.new
-    ## euc string
-    euc_str = "\270\253\244\355\241\242\277\315\244\254\245\264\245\337\244\316\244\350\244\246\244\300"
-    ## utf8 (not converted)
-    options = { 'charset'=>'utf8' }
-    $stdout = StringIO.new
-    cgi.out(options) { euc_str }
-    assert_nil(options['language'])
-    actual = $stdout.string
-    expected = "Content-Type: text/html; charset=utf8\r\n" +
-               "Content-Length: 22\r\n" +
-               "\r\n" +
-               euc_str
-    if defined?(::Encoding)
-      actual.force_encoding("ASCII-8BIT")
-      expected.force_encoding("ASCII-8BIT")
-    end
-    assert_equal(expected, actual)
-    ## language is keeped
-    options = { 'charset'=>'Shift_JIS', 'language'=>'en' }
-    $stdout = StringIO.new
-    cgi.out(options) { euc_str }
-    assert_equal('en', options['language'])
-    ## HEAD method
-    update_env('REQUEST_METHOD' => 'HEAD')
-    options = { 'charset'=>'utf8' }
-    $stdout = StringIO.new
-    cgi.out(options) { euc_str }
-    actual = $stdout.string
-    expected = "Content-Type: text/html; charset=utf8\r\n" +
-               "Content-Length: 22\r\n" +
-               "\r\n"
-    assert_equal(expected, actual)
-  end
-
-
-  def test_cgi_core_print
-    update_env(
-      'REQUEST_METHOD'  => 'GET',
-    )
-    cgi = CGI.new
-    $stdout = StringIO.new
-    str = "foobar"
-    cgi.print(str)
-    expected = str
-    actual = $stdout.string
-    assert_equal(expected, actual)
-  end
-
-
-  def test_cgi_core_environs
-    update_env(
-      'REQUEST_METHOD' => 'GET',
-    )
-    cgi = CGI.new
-    ##
-    list1 = %w[ AUTH_TYPE CONTENT_TYPE GATEWAY_INTERFACE PATH_INFO
-        PATH_TRANSLATED QUERY_STRING REMOTE_ADDR REMOTE_HOST
-        REMOTE_IDENT REMOTE_USER REQUEST_METHOD SCRIPT_NAME
-        SERVER_NAME SERVER_PROTOCOL SERVER_SOFTWARE
-        HTTP_ACCEPT HTTP_ACCEPT_CHARSET HTTP_ACCEPT_ENCODING
-        HTTP_ACCEPT_LANGUAGE HTTP_CACHE_CONTROL HTTP_FROM HTTP_HOST
-        HTTP_NEGOTIATE HTTP_PRAGMA HTTP_REFERER HTTP_USER_AGENT
-    ]
-    # list2 = %w[ CONTENT_LENGTH SERVER_PORT ]
-    ## string expected
-    list1.each do |name|
-      update_env(name => "**#{name}**")
-    end
-    list1.each do |name|
-      method = name.sub(/\AHTTP_/, '').downcase
-      actual = cgi.__send__ method
-      expected = "**#{name}**"
-      assert_equal(expected, actual)
-    end
-    ## integer expected
-    update_env('CONTENT_LENGTH' => '123')
-    update_env('SERVER_PORT' => '8080')
-    assert_equal(123, cgi.content_length)
-    assert_equal(8080, cgi.server_port)
-    ## raw cookie
-    update_env('HTTP_COOKIE' => 'name1=val1')
-    update_env('HTTP_COOKIE2' => 'name2=val2')
-    assert_equal('name1=val1', cgi.raw_cookie)
-    assert_equal('name2=val2', cgi.raw_cookie2)
-  end
-
-
-  def test_cgi_core_htmltype_header
-    update_env(
-      'REQUEST_METHOD' => 'GET',
-    )
-    ## no htmltype
-    cgi = CGI.new
-    assert_raise(NoMethodError) do cgi.doctype end
-    assert_equal("Content-Type: text/html\r\n\r\n",cgi.header)
-    ## html3
-    cgi = CGI.new('html3')
-    expected = '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">'
-    assert_equal(expected, cgi.doctype)
-    assert_equal("Content-Type: text/html\r\n\r\n",cgi.header)
-    ## html4
-    cgi = CGI.new('html4')
-    expected = '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">'
-    assert_equal(expected, cgi.doctype)
-    assert_equal("Content-Type: text/html\r\n\r\n",cgi.header)
-    ## html4 transitional
-    cgi = CGI.new('html4Tr')
-    expected = '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">'
-    assert_equal(expected, cgi.doctype)
-    assert_equal("Content-Type: text/html\r\n\r\n",cgi.header)
-    ## html4 frameset
-    cgi = CGI.new('html4Fr')
-    expected = '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Frameset//EN" "http://www.w3.org/TR/html4/frameset.dtd">'
-    assert_equal(expected, cgi.doctype)
-    assert_equal("Content-Type: text/html\r\n\r\n",cgi.header)
-    ## html5
-    cgi = CGI.new('html5')
-    expected = '<!DOCTYPE HTML>'
-    assert_equal(expected, cgi.doctype)
-    assert_match(/^<HEADER><\/HEADER>$/i,cgi.header)
-  end
-
-
-  instance_methods.each do |method|
-    private method if method =~ /^test_(.*)/ && $1 != ENV['TEST']
-  end if ENV['TEST']
-
-end
diff --git a/test/cgi/test_cgi_escape.rb b/test/cgi/test_cgi_escape.rb
new file mode 100644
index 00000000000000..f6ca658934cdec
--- /dev/null
+++ b/test/cgi/test_cgi_escape.rb
@@ -0,0 +1,325 @@
+# frozen_string_literal: true
+require 'test/unit'
+require 'cgi/escape'
+require 'stringio'
+require_relative 'update_env'
+
+
+class CGIEscapeTest < Test::Unit::TestCase
+  include CGI::Escape
+  include UpdateEnv
+
+  def setup
+    @environ = {}
+    update_env(
+      'REQUEST_METHOD' => 'GET',
+      'SCRIPT_NAME' => nil,
+    )
+    @str1="&<>\" \xE3\x82\x86\xE3\x82\x93\xE3\x82\x86\xE3\x82\x93".dup
+    @str1.force_encoding("UTF-8") if defined?(::Encoding)
+  end
+
+  def teardown
+    ENV.update(@environ)
+  end
+
+  def test_cgi_escape
+    assert_equal('%26%3C%3E%22+%E3%82%86%E3%82%93%E3%82%86%E3%82%93', CGI.escape(@str1))
+    assert_equal('%26%3C%3E%22+%E3%82%86%E3%82%93%E3%82%86%E3%82%93'.ascii_only?, CGI.escape(@str1).ascii_only?) if defined?(::Encoding)
+  end
+
+  def test_cgi_escape_with_unreserved_characters
+    assert_equal("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-._~",
+                 CGI.escape("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-._~"),
+                 "should not escape any unreserved characters, as per RFC3986 Section 2.3")
+  end
+
+  def test_cgi_escape_with_invalid_byte_sequence
+    assert_equal('%C0%3C%3C', CGI.escape("\xC0\<\<".dup.force_encoding("UTF-8")))
+  end
+
+  def test_cgi_escape_preserve_encoding
+    assert_equal(Encoding::US_ASCII, CGI.escape("\xC0\<\<".dup.force_encoding("US-ASCII")).encoding)
+    assert_equal(Encoding::ASCII_8BIT, CGI.escape("\xC0\<\<".dup.force_encoding("ASCII-8BIT")).encoding)
+    assert_equal(Encoding::UTF_8, CGI.escape("\xC0\<\<".dup.force_encoding("UTF-8")).encoding)
+  end
+
+  def test_cgi_unescape
+    str = CGI.unescape('%26%3C%3E%22+%E3%82%86%E3%82%93%E3%82%86%E3%82%93')
+    assert_equal(@str1, str)
+    return unless defined?(::Encoding)
+
+    assert_equal(@str1.encoding, str.encoding)
+    assert_equal("\u{30E1 30E2 30EA 691C 7D22}", CGI.unescape("\u{30E1 30E2 30EA}%E6%A4%9C%E7%B4%A2"))
+  end
+
+  def test_cgi_unescape_preserve_encoding
+    assert_equal(Encoding::US_ASCII, CGI.unescape("%C0%3C%3C".dup.force_encoding("US-ASCII")).encoding)
+    assert_equal(Encoding::ASCII_8BIT, CGI.unescape("%C0%3C%3C".dup.force_encoding("ASCII-8BIT")).encoding)
+    assert_equal(Encoding::UTF_8, CGI.unescape("%C0%3C%3C".dup.force_encoding("UTF-8")).encoding)
+  end
+
+  def test_cgi_unescape_accept_charset
+    return unless defined?(::Encoding)
+
+    assert_raise(TypeError) {CGI.unescape('', nil)}
+    assert_separately(%w[-rcgi/escape], "#{<<-"begin;"}\n#{<<-"end;"}")
+    begin;
+      assert_equal("", CGI.unescape(''))
+    end;
+  end
+
+  def test_cgi_escapeURIComponent
+    assert_equal('%26%3C%3E%22%20%E3%82%86%E3%82%93%E3%82%86%E3%82%93', CGI.escapeURIComponent(@str1))
+    assert_equal('%26%3C%3E%22%20%E3%82%86%E3%82%93%E3%82%86%E3%82%93'.ascii_only?, CGI.escapeURIComponent(@str1).ascii_only?) if defined?(::Encoding)
+  end
+
+  def test_cgi_escape_uri_component
+    assert_equal('%26%3C%3E%22%20%E3%82%86%E3%82%93%E3%82%86%E3%82%93', CGI.escape_uri_component(@str1))
+  end
+
+  def test_cgi_escapeURIComponent_with_unreserved_characters
+    assert_equal("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-._~",
+                 CGI.escapeURIComponent("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-._~"),
+                 "should not encode any unreserved characters, as per RFC3986 Section 2.3")
+  end
+
+  def test_cgi_escapeURIComponent_with_invalid_byte_sequence
+    assert_equal('%C0%3C%3C', CGI.escapeURIComponent("\xC0\<\<".dup.force_encoding("UTF-8")))
+  end
+
+  def test_cgi_escapeURIComponent_preserve_encoding
+    assert_equal(Encoding::US_ASCII, CGI.escapeURIComponent("\xC0\<\<".dup.force_encoding("US-ASCII")).encoding)
+    assert_equal(Encoding::ASCII_8BIT, CGI.escapeURIComponent("\xC0\<\<".dup.force_encoding("ASCII-8BIT")).encoding)
+    assert_equal(Encoding::UTF_8, CGI.escapeURIComponent("\xC0\<\<".dup.force_encoding("UTF-8")).encoding)
+  end
+
+  def test_cgi_unescapeURIComponent
+    str = CGI.unescapeURIComponent('%26%3C%3E%22%20%E3%82%86%E3%82%93%E3%82%86%E3%82%93')
+    assert_equal(@str1, str)
+    return unless defined?(::Encoding)
+
+    assert_equal("foo+bar", CGI.unescapeURIComponent("foo+bar"))
+
+    assert_equal(@str1.encoding, str.encoding)
+    assert_equal("\u{30E1 30E2 30EA 691C 7D22}", CGI.unescapeURIComponent("\u{30E1 30E2 30EA}%E6%A4%9C%E7%B4%A2"))
+  end
+
+  def test_cgi_unescape_uri_component
+    str = CGI.unescape_uri_component('%26%3C%3E%22%20%E3%82%86%E3%82%93%E3%82%86%E3%82%93')
+    assert_equal(@str1, str)
+  end
+
+  def test_cgi_unescapeURIComponent_preserve_encoding
+    assert_equal(Encoding::US_ASCII, CGI.unescapeURIComponent("%C0%3C%3C".dup.force_encoding("US-ASCII")).encoding)
+    assert_equal(Encoding::ASCII_8BIT, CGI.unescapeURIComponent("%C0%3C%3C".dup.force_encoding("ASCII-8BIT")).encoding)
+    assert_equal(Encoding::UTF_8, CGI.unescapeURIComponent("%C0%3C%3C".dup.force_encoding("UTF-8")).encoding)
+  end
+
+  def test_cgi_unescapeURIComponent_accept_charset
+    return unless defined?(::Encoding)
+
+    assert_raise(TypeError) {CGI.unescapeURIComponent('', nil)}
+    assert_separately(%w[-rcgi/escape], "#{<<-"begin;"}\n#{<<-"end;"}")
+    begin;
+      assert_equal("", CGI.unescapeURIComponent(''))
+    end;
+  end
+
+  def test_cgi_escapeHTML
+    assert_equal("&#39;&amp;&quot;&gt;&lt;", CGI.escapeHTML("'&\"><"))
+  end
+
+  def test_cgi_escape_html_duplicated
+    orig = "Ruby".dup.force_encoding("US-ASCII")
+    str = CGI.escapeHTML(orig)
+    assert_equal(orig, str)
+    assert_not_same(orig, str)
+  end
+
+  def assert_cgi_escape_html_preserve_encoding(str, encoding)
+    assert_equal(encoding, CGI.escapeHTML(str.dup.force_encoding(encoding)).encoding)
+  end
+
+  def test_cgi_escape_html_preserve_encoding
+    Encoding.list do |enc|
+      assert_cgi_escape_html_preserve_encoding("'&\"><", enc)
+      assert_cgi_escape_html_preserve_encoding("Ruby", enc)
+    end
+  end
+
+  def test_cgi_escape_html_dont_freeze
+    assert_not_predicate CGI.escapeHTML("'&\"><".dup),    :frozen?
+    assert_not_predicate CGI.escapeHTML("'&\"><".freeze), :frozen?
+    assert_not_predicate CGI.escapeHTML("Ruby".dup),      :frozen?
+    assert_not_predicate CGI.escapeHTML("Ruby".freeze),   :frozen?
+  end
+
+  def test_cgi_escape_html_large
+    return if RUBY_ENGINE == 'jruby'
+    ulong_max, size_max = RbConfig::LIMITS.values_at("ULONG_MAX", "SIZE_MAX")
+    return unless ulong_max < size_max # Platforms not concerned
+
+    size = (ulong_max / 6 + 1)
+    begin
+      str = '"' * size
+      escaped = CGI.escapeHTML(str)
+    rescue NoMemoryError
+      omit "Not enough memory"
+    rescue => e
+    end
+    assert_raise_with_message(ArgumentError, /overflow/, ->{"length = #{escaped.length}"}) do
+      raise e if e
+    end
+  end
+
+  def test_cgi_unescapeHTML
+    assert_equal("'&\"><", CGI.unescapeHTML("&#39;&amp;&quot;&gt;&lt;"))
+  end
+
+  def test_cgi_unescapeHTML_invalid
+    assert_equal('&<&amp>&quot&abcdefghijklmn', CGI.unescapeHTML('&&lt;&amp&gt;&quot&abcdefghijklmn'))
+  end
+
+  module UnescapeHTMLTests
+    def test_cgi_unescapeHTML_following_known_first_letter
+      assert_equal('&a>&q>&l>&g>', CGI.unescapeHTML('&a&gt;&q&gt;&l&gt;&g&gt;'))
+    end
+
+    def test_cgi_unescapeHTML_following_number_sign
+      assert_equal('&#>&#x>', CGI.unescapeHTML('&#&gt;&#x&gt;'))
+    end
+
+    def test_cgi_unescapeHTML_following_invalid_numeric
+      assert_equal('&#1114112>&#x110000>', CGI.unescapeHTML('&#1114112&gt;&#x110000&gt;'))
+    end
+  end
+
+  include UnescapeHTMLTests
+
+  Encoding.list.each do |enc|
+    begin
+      escaped = "&#39;&amp;&quot;&gt;&lt;".encode(enc)
+      unescaped = "'&\"><".encode(enc)
+    rescue Encoding::ConverterNotFoundError
+      next
+    else
+      define_method("test_cgi_escapeHTML:#{enc.name}") do
+        assert_equal(escaped, CGI.escapeHTML(unescaped))
+      end
+      define_method("test_cgi_unescapeHTML:#{enc.name}") do
+        assert_equal(unescaped, CGI.unescapeHTML(escaped))
+      end
+    end
+  end
+
+  Encoding.list.each do |enc|
+    next unless enc.ascii_compatible?
+    begin
+      escaped = "%25+%2B"
+      unescaped = "% +".encode(enc)
+    rescue Encoding::ConverterNotFoundError
+      next
+    else
+      define_method("test_cgi_escape:#{enc.name}") do
+        assert_equal(escaped, CGI.escape(unescaped))
+      end
+      define_method("test_cgi_unescape:#{enc.name}") do
+        assert_equal(unescaped, CGI.unescape(escaped, enc))
+      end
+    end
+  end
+
+  def test_cgi_unescapeHTML_uppercasecharacter
+    assert_equal("\xE3\x81\x82\xE3\x81\x84\xE3\x81\x86", CGI.unescapeHTML("&#x3042;&#x3044;&#X3046;"))
+  end
+
+  def test_cgi_include_escape
+    assert_equal('%26%3C%3E%22+%E3%82%86%E3%82%93%E3%82%86%E3%82%93', escape(@str1))
+  end
+
+  def test_cgi_include_escapeHTML
+    assert_equal("&#39;&amp;&quot;&gt;&lt;", escapeHTML("'&\"><"))
+  end
+
+  def test_cgi_include_h
+    assert_equal("&#39;&amp;&quot;&gt;&lt;", h("'&\"><"))
+  end
+
+  def test_cgi_include_unescape
+    str = unescape('%26%3C%3E%22+%E3%82%86%E3%82%93%E3%82%86%E3%82%93')
+    assert_equal(@str1, str)
+    return unless defined?(::Encoding)
+
+    assert_equal(@str1.encoding, str.encoding)
+    assert_equal("\u{30E1 30E2 30EA 691C 7D22}", unescape("\u{30E1 30E2 30EA}%E6%A4%9C%E7%B4%A2"))
+  end
+
+  def test_cgi_include_unescapeHTML
+    assert_equal("'&\"><", unescapeHTML("&#39;&amp;&quot;&gt;&lt;"))
+  end
+
+  def test_cgi_escapeElement
+    assert_equal("<BR>&lt;A HREF=&quot;url&quot;&gt;&lt;/A&gt;", escapeElement('<BR><A HREF="url"></A>', "A", "IMG"))
+    assert_equal("<BR>&lt;A HREF=&quot;url&quot;&gt;&lt;/A&gt;", escapeElement('<BR><A HREF="url"></A>', ["A", "IMG"]))
+    assert_equal("<BR>&lt;A HREF=&quot;url&quot;&gt;&lt;/A&gt;", escape_element('<BR><A HREF="url"></A>', "A", "IMG"))
+    assert_equal("<BR>&lt;A HREF=&quot;url&quot;&gt;&lt;/A&gt;", escape_element('<BR><A HREF="url"></A>', ["A", "IMG"]))
+
+    assert_equal("&lt;A &lt;A HREF=&quot;url&quot;&gt;&lt;/A&gt;", escapeElement('<A <A HREF="url"></A>', "A", "IMG"))
+    assert_equal("&lt;A &lt;A HREF=&quot;url&quot;&gt;&lt;/A&gt;", escapeElement('<A <A HREF="url"></A>', ["A", "IMG"]))
+    assert_equal("&lt;A &lt;A HREF=&quot;url&quot;&gt;&lt;/A&gt;", escape_element('<A <A HREF="url"></A>', "A", "IMG"))
+    assert_equal("&lt;A &lt;A HREF=&quot;url&quot;&gt;&lt;/A&gt;", escape_element('<A <A HREF="url"></A>', ["A", "IMG"]))
+
+    assert_equal("&lt;A &lt;A ", escapeElement('<A <A ', "A", "IMG"))
+    assert_equal("&lt;A &lt;A ", escapeElement('<A <A ', ["A", "IMG"]))
+  end
+
+
+  def test_cgi_unescapeElement
+    assert_equal('&lt;BR&gt;<A HREF="url"></A>', unescapeElement(escapeHTML('<BR><A HREF="url"></A>'), "A", "IMG"))
+    assert_equal('&lt;BR&gt;<A HREF="url"></A>', unescapeElement(escapeHTML('<BR><A HREF="url"></A>'), ["A", "IMG"]))
+    assert_equal('&lt;BR&gt;<A HREF="url"></A>', unescape_element(escapeHTML('<BR><A HREF="url"></A>'), "A", "IMG"))
+    assert_equal('&lt;BR&gt;<A HREF="url"></A>', unescape_element(escapeHTML('<BR><A HREF="url"></A>'), ["A", "IMG"]))
+
+    assert_equal('<A <A HREF="url"></A>', unescapeElement(escapeHTML('<A <A HREF="url"></A>'), "A", "IMG"))
+    assert_equal('<A <A HREF="url"></A>', unescapeElement(escapeHTML('<A <A HREF="url"></A>'), ["A", "IMG"]))
+    assert_equal('<A <A HREF="url"></A>', unescape_element(escapeHTML('<A <A HREF="url"></A>'), "A", "IMG"))
+    assert_equal('<A <A HREF="url"></A>', unescape_element(escapeHTML('<A <A HREF="url"></A>'), ["A", "IMG"]))
+
+    assert_equal('<A <A ', unescapeElement(escapeHTML('<A <A '), "A", "IMG"))
+    assert_equal('<A <A ', unescapeElement(escapeHTML('<A <A '), ["A", "IMG"]))
+    assert_equal('<A <A ', unescape_element(escapeHTML('<A <A '), "A", "IMG"))
+    assert_equal('<A <A ', unescape_element(escapeHTML('<A <A '), ["A", "IMG"]))
+  end
+end
+
+class CGIEscapePureRubyTest < Test::Unit::TestCase
+  def setup
+    CGI::EscapeExt.module_eval do
+      alias _escapeHTML escapeHTML
+      remove_method :escapeHTML
+      alias _unescapeHTML unescapeHTML
+      remove_method :unescapeHTML
+    end if defined?(CGI::EscapeExt)
+  end
+
+  def teardown
+    CGI::EscapeExt.module_eval do
+      alias escapeHTML _escapeHTML
+      remove_method :_escapeHTML
+      alias unescapeHTML _unescapeHTML
+      remove_method :_unescapeHTML
+    end if defined?(CGI::EscapeExt)
+  end
+
+  include CGIEscapeTest::UnescapeHTMLTests
+
+  def test_cgi_escapeHTML_with_invalid_byte_sequence
+    assert_equal("&lt;\xA4??&gt;", CGI.escapeHTML(%[<\xA4??>]))
+  end
+
+  def test_cgi_unescapeHTML_with_invalid_byte_sequence
+    input = "\xFF&"
+    assert_equal(input, CGI.unescapeHTML(input))
+  end
+end
diff --git a/test/cgi/test_cgi_header.rb b/test/cgi/test_cgi_header.rb
deleted file mode 100644
index ec2f4deb72b180..00000000000000
--- a/test/cgi/test_cgi_header.rb
+++ /dev/null
@@ -1,192 +0,0 @@
-# frozen_string_literal: true
-require 'test/unit'
-require 'cgi'
-require 'time'
-require_relative 'update_env'
-
-
-class CGIHeaderTest < Test::Unit::TestCase
-  include UpdateEnv
-
-
-  def setup
-    @environ = {}
-    update_env(
-      'SERVER_PROTOCOL' => 'HTTP/1.1',
-      'REQUEST_METHOD'  => 'GET',
-      'SERVER_SOFTWARE' => 'Apache 2.2.0',
-    )
-  end
-
-
-  def teardown
-    ENV.update(@environ)
-  end
-
-
-  def test_cgi_http_header_simple
-    cgi = CGI.new
-    ## default content type
-    expected = "Content-Type: text/html\r\n\r\n"
-    actual = cgi.http_header
-    assert_equal(expected, actual)
-    ## content type specified as string
-    expected = "Content-Type: text/xhtml; charset=utf8\r\n\r\n"
-    actual = cgi.http_header('text/xhtml; charset=utf8')
-    assert_equal(expected, actual)
-    ## content type specified as hash
-    expected = "Content-Type: image/png\r\n\r\n"
-    actual = cgi.http_header('type'=>'image/png')
-    assert_equal(expected, actual)
-    ## charset specified
-    expected = "Content-Type: text/html; charset=utf8\r\n\r\n"
-    actual = cgi.http_header('charset'=>'utf8')
-    assert_equal(expected, actual)
-  end
-
-
-  def test_cgi_http_header_complex
-    cgi = CGI.new
-    options = {
-      'type'       => 'text/xhtml',
-      'charset'    => 'utf8',
-      'status'     => 'REDIRECT',
-      'server'     => 'webrick',
-      'connection' => 'close',
-      'length'     => 123,
-      'language'   => 'ja',
-      'expires'    => Time.gm(2000, 1, 23, 12, 34, 56),
-      'location'   => 'http://www.ruby-lang.org/',
-    }
-    expected =  "Status: 302 Found\r\n".dup
-    expected << "Server: webrick\r\n"
-    expected << "Connection: close\r\n"
-    expected << "Content-Type: text/xhtml; charset=utf8\r\n"
-    expected << "Content-Length: 123\r\n"
-    expected << "Content-Language: ja\r\n"
-    expected << "Expires: Sun, 23 Jan 2000 12:34:56 GMT\r\n"
-    expected << "location: http://www.ruby-lang.org/\r\n"
-    expected << "\r\n"
-    actual = cgi.http_header(options)
-    assert_equal(expected, actual)
-  end
-
-
-  def test_cgi_http_header_argerr
-    cgi = CGI.new
-    expected = ArgumentError
-
-    assert_raise(expected) do
-      cgi.http_header(nil)
-    end
-  end
-
-
-  def test_cgi_http_header_cookie
-    cgi = CGI.new
-    cookie1 = CGI::Cookie.new('name1', 'abc', '123')
-    cookie2 = CGI::Cookie.new('name'=>'name2', 'value'=>'value2', 'secure'=>true)
-    ctype = "Content-Type: text/html\r\n"
-    sep   = "\r\n"
-    c1    = "Set-Cookie: name1=abc&123; path=\r\n"
-    c2    = "Set-Cookie: name2=value2; path=; secure\r\n"
-    ## CGI::Cookie object
-    actual = cgi.http_header('cookie'=>cookie1)
-    expected = ctype + c1 + sep
-    assert_equal(expected, actual)
-    ## String
-    actual = cgi.http_header('cookie'=>cookie2.to_s)
-    expected = ctype + c2 + sep
-    assert_equal(expected, actual)
-    ## Array
-    actual = cgi.http_header('cookie'=>[cookie1, cookie2])
-    expected = ctype + c1 + c2 + sep
-    assert_equal(expected, actual)
-    ## Hash
-    actual = cgi.http_header('cookie'=>{'name1'=>cookie1, 'name2'=>cookie2})
-    expected = ctype + c1 + c2 + sep
-    assert_equal(expected, actual)
-  end
-
-
-  def test_cgi_http_header_output_cookies
-    cgi = CGI.new
-    ## output cookies
-    cookies = [ CGI::Cookie.new('name1', 'abc', '123'),
-                CGI::Cookie.new('name'=>'name2', 'value'=>'value2', 'secure'=>true),
-              ]
-    cgi.instance_variable_set('@output_cookies', cookies)
-    expected =  "Content-Type: text/html; charset=utf8\r\n".dup
-    expected << "Set-Cookie: name1=abc&123; path=\r\n"
-    expected << "Set-Cookie: name2=value2; path=; secure\r\n"
-    expected << "\r\n"
-    ## header when string
-    actual = cgi.http_header('text/html; charset=utf8')
-    assert_equal(expected, actual)
-    ## _header_for_string
-    actual = cgi.http_header('type'=>'text/html', 'charset'=>'utf8')
-    assert_equal(expected, actual)
-  end
-
-
-  def test_cgi_http_header_nph
-    time_start = Time.now.to_i
-    cgi = CGI.new
-    ## 'nph' is true
-    ENV['SERVER_SOFTWARE'] = 'Apache 2.2.0'
-    actual1 = cgi.http_header('nph'=>true)
-    ## when old IIS, NPH-mode is forced
-    ENV['SERVER_SOFTWARE'] = 'IIS/4.0'
-    actual2 = cgi.http_header
-    actual3 = cgi.http_header('status'=>'REDIRECT', 'location'=>'http://www.example.com/')
-    ## newer IIS doesn't require NPH-mode   ## [ruby-dev:30537]
-    ENV['SERVER_SOFTWARE'] = 'IIS/5.0'
-    actual4 = cgi.http_header
-    actual5 = cgi.http_header('status'=>'REDIRECT', 'location'=>'http://www.example.com/')
-    time_end = Time.now.to_i
-    date = /^Date: ([A-Z][a-z]{2}, \d{2} [A-Z][a-z]{2} \d{4} \d\d:\d\d:\d\d GMT)\r\n/
-    [actual1, actual2, actual3].each do |actual|
-      assert_match(date, actual)
-      assert_include(time_start..time_end, date =~ actual && Time.parse($1).to_i)
-      actual.sub!(date, "Date: DATE_IS_REMOVED\r\n")
-    end
-    ## assertion
-    expected =  "HTTP/1.1 200 OK\r\n".dup
-    expected << "Date: DATE_IS_REMOVED\r\n"
-    expected << "Server: Apache 2.2.0\r\n"
-    expected << "Connection: close\r\n"
-    expected << "Content-Type: text/html\r\n"
-    expected << "\r\n"
-    assert_equal(expected, actual1)
-    expected.sub!(/^Server: .*?\r\n/, "Server: IIS/4.0\r\n")
-    assert_equal(expected, actual2)
-    expected.sub!(/^HTTP\/1.1 200 OK\r\n/, "HTTP/1.1 302 Found\r\n")
-    expected.sub!(/\r\n\r\n/, "\r\nlocation: http://www.example.com/\r\n\r\n")
-    assert_equal(expected, actual3)
-    expected =  "Content-Type: text/html\r\n".dup
-    expected << "\r\n"
-    assert_equal(expected, actual4)
-    expected =  "Status: 302 Found\r\n".dup
-    expected << "Content-Type: text/html\r\n"
-    expected << "location: http://www.example.com/\r\n"
-    expected << "\r\n"
-    assert_equal(expected, actual5)
-  ensure
-    ENV.delete('SERVER_SOFTWARE')
-  end
-
-
-  def test_cgi_http_header_crlf_injection
-    cgi = CGI.new
-    assert_raise(RuntimeError) { cgi.http_header("text/xhtml\r\nBOO") }
-    assert_raise(RuntimeError) { cgi.http_header("type" => "text/xhtml\r\nBOO") }
-    assert_raise(RuntimeError) { cgi.http_header("status" => "200 OK\r\nBOO") }
-    assert_raise(RuntimeError) { cgi.http_header("location" => "text/xhtml\r\nBOO") }
-  end
-
-
-  instance_methods.each do |method|
-    private method if method =~ /^test_(.*)/ && $1 != ENV['TEST']
-  end if ENV['TEST']
-
-end
diff --git a/test/cgi/test_cgi_modruby.rb b/test/cgi/test_cgi_modruby.rb
deleted file mode 100644
index 90132962b5a26c..00000000000000
--- a/test/cgi/test_cgi_modruby.rb
+++ /dev/null
@@ -1,149 +0,0 @@
-# frozen_string_literal: true
-require 'test/unit'
-require 'cgi'
-require_relative 'update_env'
-
-
-class CGIModrubyTest < Test::Unit::TestCase
-  include UpdateEnv
-
-
-  def setup
-    @environ = {}
-    update_env(
-      'SERVER_PROTOCOL' => 'HTTP/1.1',
-      'REQUEST_METHOD'  => 'GET',
-      #'QUERY_STRING'    => 'a=foo&b=bar',
-    )
-    CGI.class_eval { const_set(:MOD_RUBY, true) }
-    Apache._reset()
-    #@cgi = CGI.new
-    #@req = Apache.request
-  end
-
-
-  def teardown
-    ENV.update(@environ)
-    CGI.class_eval { remove_const(:MOD_RUBY) }
-  end
-
-
-  def test_cgi_modruby_simple
-    req = Apache.request
-    cgi = CGI.new
-    assert(req._setup_cgi_env_invoked?)
-    assert(! req._send_http_header_invoked?)
-    actual = cgi.http_header
-    assert_equal('', actual)
-    assert_equal('text/html', req.content_type)
-    assert(req._send_http_header_invoked?)
-  end
-
-
-  def test_cgi_modruby_complex
-    req = Apache.request
-    cgi = CGI.new
-    options = {
-      'status'   => 'FORBIDDEN',
-      'location' => 'http://www.example.com/',
-      'type'     => 'image/gif',
-      'content-encoding' => 'deflate',
-      'cookie'   => [ CGI::Cookie.new('name1', 'abc', '123'),
-                      CGI::Cookie.new('name'=>'name2', 'value'=>'value2', 'secure'=>true),
-                    ],
-    }
-    assert(req._setup_cgi_env_invoked?)
-    assert(! req._send_http_header_invoked?)
-    actual = cgi.http_header(options)
-    assert_equal('', actual)
-    assert_equal('image/gif', req.content_type)
-    assert_equal('403 Forbidden', req.status_line)
-    assert_equal(403, req.status)
-    assert_equal('deflate', req.content_encoding)
-    assert_equal('http://www.example.com/', req.headers_out['location'])
-    assert_equal(["name1=abc&123; path=", "name2=value2; path=; secure"],
-                 req.headers_out['Set-Cookie'])
-    assert(req._send_http_header_invoked?)
-  end
-
-
-  def test_cgi_modruby_location
-    req = Apache.request
-    cgi = CGI.new
-    options = {
-      'status'   => '200 OK',
-      'location' => 'http://www.example.com/',
-    }
-    cgi.http_header(options)
-    assert_equal('200 OK', req.status_line)  # should be '302 Found' ?
-    assert_equal(302, req.status)
-    assert_equal('http://www.example.com/', req.headers_out['location'])
-  end
-
-
-  def test_cgi_modruby_requestparams
-    req = Apache.request
-    req.args = 'a=foo&b=bar'
-    cgi = CGI.new
-    assert_equal('foo', cgi['a'])
-    assert_equal('bar', cgi['b'])
-  end
-
-
-  instance_methods.each do |method|
-    private method if method =~ /^test_(.*)/ && $1 != ENV['TEST']
-  end if ENV['TEST']
-
-end
-
-
-
-## dummy class for mod_ruby
-class Apache  #:nodoc:
-
-  def self._reset
-    @request = Request.new
-  end
-
-  def self.request
-    return @request
-  end
-
-  class Request
-
-    def initialize
-      hash = {}
-      def hash.add(name, value)
-        (self[name] ||= []) << value
-      end
-      @http_header = nil
-      @headers_out  = hash
-      @status_line  = nil
-      @status       = nil
-      @content_type = nil
-      @content_encoding = nil
-    end
-    attr_accessor :headers_out, :status_line, :status, :content_type, :content_encoding
-
-    attr_accessor :args
-    #def args
-    #  return ENV['QUERY_STRING']
-    #end
-
-    def send_http_header
-      @http_header = '*invoked*'
-    end
-    def _send_http_header_invoked?
-      @http_header ? true : false
-    end
-
-    def setup_cgi_env
-      @cgi_env = '*invoked*'
-    end
-    def _setup_cgi_env_invoked?
-      @cgi_env ? true : false
-    end
-
-  end
-
-end
diff --git a/test/cgi/test_cgi_multipart.rb b/test/cgi/test_cgi_multipart.rb
deleted file mode 100644
index 5e8ec253901930..00000000000000
--- a/test/cgi/test_cgi_multipart.rb
+++ /dev/null
@@ -1,385 +0,0 @@
-# frozen_string_literal: true
-require 'test/unit'
-require 'cgi'
-require 'tempfile'
-require 'stringio'
-require_relative 'update_env'
-
-
-##
-## usage:
-##   boundary = 'foobar1234'  # or nil
-##   multipart = MultiPart.new(boundary)
-##   multipart.append('name1', 'value1')
-##   multipart.append('file1', File.read('file1.html'), 'file1.html')
-##   str = multipart.close()
-##   str.each_line {|line| p line }
-##   ## output:
-##   # "--foobar1234\r\n"
-##   # "Content-Disposition: form-data: name=\"name1\"\r\n"
-##   # "\r\n"
-##   # "value1\r\n"
-##   # "--foobar1234\r\n"
-##   # "Content-Disposition: form-data: name=\"file1\"; filename=\"file1.html\"\r\n"
-##   # "Content-Type: text/html\r\n"
-##   # "\r\n"
-##   # "<html>\n"
-##   # "<body><p>Hello</p></body>\n"
-##   # "</html>\n"
-##   # "\r\n"
-##   # "--foobar1234--\r\n"
-##
-class MultiPart
-
-  def initialize(boundary=nil)
-    @boundary = boundary || create_boundary()
-    @buf = ''.dup
-    @buf.force_encoding(::Encoding::ASCII_8BIT) if defined?(::Encoding)
-  end
-  attr_reader :boundary
-
-  def append(name, value, filename=nil, content_type=nil)
-    content_type = detect_content_type(filename) if filename && content_type.nil?
-    s = filename ? "; filename=\"#{filename}\"" : ''
-    buf = @buf
-    buf << "--#{boundary}\r\n"
-    buf << "Content-Disposition: form-data: name=\"#{name}\"#{s}\r\n"
-    buf << "Content-Type: #{content_type}\r\n" if content_type
-    buf << "\r\n"
-    buf << value.b
-    buf << "\r\n"
-    return self
-  end
-
-  def close
-    buf = @buf
-    @buf = ''.dup
-    return buf << "--#{boundary}--\r\n"
-  end
-
-  def create_boundary()  #:nodoc:
-    return "--boundary#{rand().to_s[2..-1]}"
-  end
-
-  def detect_content_type(filename)   #:nodoc:
-    filename =~ /\.(\w+)\z/
-    return MIME_TYPES[$1] || 'application/octet-stream'
-  end
-
-  MIME_TYPES = {
-    'gif'      =>  'image/gif',
-    'jpg'      =>  'image/jpeg',
-    'jpeg'     =>  'image/jpeg',
-    'png'      =>  'image/png',
-    'bmp'      =>  'image/bmp',
-    'tif'      =>  'image/tiff',
-    'tiff'     =>  'image/tiff',
-    'htm'      =>  'text/html',
-    'html'     =>  'text/html',
-    'xml'      =>  'text/xml',
-    'txt'      =>  'text/plain',
-    'text'     =>  'text/plain',
-    'css'      =>  'text/css',
-    'mpg'      =>  'video/mpeg',
-    'mpeg'     =>  'video/mpeg',
-    'mov'      =>  'video/quicktime',
-    'avi'      =>  'video/x-msvideo',
-    'mp3'      =>  'audio/mpeg',
-    'mid'      =>  'audio/midi',
-    'wav'      =>  'audio/x-wav',
-    'zip'      =>  'application/zip',
-    #'tar.gz'   =>  'application/gtar',
-    'gz'       =>  'application/gzip',
-    'bz2'      =>  'application/bzip2',
-    'rtf'      =>  'application/rtf',
-    'pdf'      =>  'application/pdf',
-    'ps'       =>  'application/postscript',
-    'js'       =>  'application/x-javascript',
-    'xls'      =>  'application/vnd.ms-excel',
-    'doc'      =>  'application/msword',
-    'ppt'      =>  'application/vnd.ms-powerpoint',
-  }
-
-end
-
-
-
-class CGIMultipartTest < Test::Unit::TestCase
-  include UpdateEnv
-
-
-  def setup
-    @environ = {}
-    update_env(
-      'REQUEST_METHOD' => 'POST',
-      'CONTENT_TYPE' => nil,
-      'CONTENT_LENGTH' => nil,
-    )
-    @tempfiles = []
-  end
-
-  def teardown
-    ENV.update(@environ)
-    $stdin.close() if $stdin.is_a?(Tempfile)
-    $stdin = STDIN
-    @tempfiles.each {|t|
-      t.close!
-    }
-  end
-
-  def _prepare(data)
-    ## create multipart input
-    multipart = MultiPart.new(defined?(@boundary) ? @boundary : nil)
-    data.each do |hash|
-      multipart.append(hash[:name], hash[:value], hash[:filename])
-    end
-    input = multipart.close()
-    input = yield(input) if block_given?
-    #$stderr.puts "*** debug: input=\n#{input.collect{|line| line.inspect}.join("\n")}"
-    @boundary ||= multipart.boundary
-    ## set environment
-    ENV['CONTENT_TYPE'] = "multipart/form-data; boundary=#{@boundary}"
-    ENV['CONTENT_LENGTH'] = input.length.to_s
-    ENV['REQUEST_METHOD'] = 'POST'
-    ## set $stdin
-    tmpfile = Tempfile.new('test_cgi_multipart')
-    @tempfiles << tmpfile
-    tmpfile.binmode
-    tmpfile << input
-    tmpfile.rewind()
-    $stdin = tmpfile
-  end
-
-  def _test_multipart(cgi_options={})
-    caller(0).find {|s| s =~ /in `test_(.*?)'/ }
-    #testname = $1
-    #$stderr.puts "*** debug: testname=#{testname.inspect}"
-    _prepare(@data)
-    options = {:accept_charset=>"UTF-8"}
-    options.merge! cgi_options
-    cgi = CGI.new(options)
-    expected_names = @data.collect{|hash| hash[:name] }.sort
-    assert_equal(expected_names, cgi.params.keys.sort)
-    threshold = 1024*10
-    @data.each do |hash|
-      name = hash[:name]
-      expected = hash[:value]
-      if hash[:filename] #if file
-        expected_class = @expected_class || (hash[:value].length < threshold ? StringIO : Tempfile)
-        assert(cgi.files.keys.member?(hash[:name]))
-      else
-        expected_class = String
-        assert_equal(expected, cgi[name])
-        assert_equal(false,cgi.files.keys.member?(hash[:name]))
-      end
-      assert_kind_of(expected_class, cgi[name])
-      assert_equal(expected, cgi[name].read())
-      assert_equal(hash[:filename] || '', cgi[name].original_filename)  #if hash[:filename]
-      assert_equal(hash[:content_type] || '', cgi[name].content_type)  #if hash[:content_type]
-    end
-  ensure
-    if cgi
-      cgi.params.each {|name, vals|
-        vals.each {|val|
-          if val.kind_of?(Tempfile) && val.path
-            val.close!
-          end
-        }
-      }
-    end
-  end
-
-
-  def _read(basename)
-    filename = File.join(File.dirname(__FILE__), 'testdata', basename)
-    s = File.open(filename, 'rb') {|f| f.read() }
-
-    return s
-  end
-
-
-  def test_cgi_multipart_stringio
-    @boundary = '----WebKitFormBoundaryAAfvAII+YL9102cX'
-    @data = [
-      {:name=>'hidden1', :value=>'foobar'},
-      {:name=>'text1',   :value=>"\xE3\x81\x82\xE3\x81\x84\xE3\x81\x86\xE3\x81\x88\xE3\x81\x8A".dup},
-      {:name=>'file1',   :value=>_read('file1.html'),
-       :filename=>'file1.html', :content_type=>'text/html'},
-      {:name=>'image1',  :value=>_read('small.png'),
-       :filename=>'small.png',  :content_type=>'image/png'},  # small image
-    ]
-    @data[1][:value].force_encoding(::Encoding::UTF_8) if defined?(::Encoding)
-    @expected_class = StringIO
-    _test_multipart()
-  end
-
-
-  def test_cgi_multipart_tempfile
-    @boundary = '----WebKitFormBoundaryAAfvAII+YL9102cX'
-    @data = [
-      {:name=>'hidden1', :value=>'foobar'},
-      {:name=>'text1',   :value=>"\xE3\x81\x82\xE3\x81\x84\xE3\x81\x86\xE3\x81\x88\xE3\x81\x8A".dup},
-      {:name=>'file1',   :value=>_read('file1.html'),
-       :filename=>'file1.html', :content_type=>'text/html'},
-      {:name=>'image1',  :value=>_read('large.png'),
-       :filename=>'large.png',  :content_type=>'image/png'},  # large image
-    ]
-    @data[1][:value].force_encoding(::Encoding::UTF_8) if defined?(::Encoding)
-    @expected_class = Tempfile
-    _test_multipart()
-  end
-
-
-  def _set_const(klass, name, value)
-    old = nil
-    klass.class_eval do
-      old = const_get(name)
-      remove_const(name)
-      const_set(name, value)
-    end
-    return old
-  end
-
-
-  def test_cgi_multipart_maxmultipartlength
-    @data = [
-      {:name=>'image1', :value=>_read('large.png'),
-       :filename=>'large.png', :content_type=>'image/png'},  # large image
-    ]
-    begin
-      ex = assert_raise(StandardError) do
-        _test_multipart(:max_multipart_length=>2 * 1024) # set via simple scalar
-      end
-      assert_equal("too large multipart data.", ex.message)
-    ensure
-    end
-  end
-
-
-  def test_cgi_multipart_maxmultipartlength_lambda
-    @data = [
-      {:name=>'image1', :value=>_read('large.png'),
-       :filename=>'large.png', :content_type=>'image/png'},  # large image
-    ]
-    begin
-      ex = assert_raise(StandardError) do
-        _test_multipart(:max_multipart_length=>lambda{2*1024}) # set via lambda
-      end
-      assert_equal("too large multipart data.", ex.message)
-    ensure
-    end
-  end
-
-
-  def test_cgi_multipart_maxmultipartcount
-    @data = [
-      {:name=>'file1', :value=>_read('file1.html'),
-       :filename=>'file1.html', :content_type=>'text/html'},
-    ]
-    item = @data.first
-    500.times { @data << item }
-    #original = _set_const(CGI, :MAX_MULTIPART_COUNT, 128)
-    begin
-      ex = assert_raise(StandardError) do
-        _test_multipart()
-      end
-      assert_equal("too many parameters.", ex.message)
-    ensure
-      #_set_const(CGI, :MAX_MULTIPART_COUNT, original)
-    end
-  end if CGI.const_defined?(:MAX_MULTIPART_COUNT)
-
-
-  def test_cgi_multipart_badbody   ## [ruby-dev:28470]
-    @data = [
-      {:name=>'file1', :value=>_read('file1.html'),
-       :filename=>'file1.html', :content_type=>'text/html'},
-    ]
-    _prepare(@data) do |input|
-      input2 = input.sub(/--(\r\n)?\z/, "\r\n")
-      assert input2 != input
-      #p input2
-      input2
-    end
-    ex = assert_raise(EOFError) do
-      CGI.new(:accept_charset=>"UTF-8")
-    end
-    assert_equal("bad content body", ex.message)
-    #
-    _prepare(@data) do |input|
-      input2 = input.sub(/--(\r\n)?\z/, "")
-      assert input2 != input
-      #p input2
-      input2
-    end
-    ex = assert_raise(EOFError) do
-      CGI.new(:accept_charset=>"UTF-8")
-    end
-    assert_equal("bad content body", ex.message)
-  end
-
-
-  def test_cgi_multipart_quoteboundary  ## [JVN#84798830]
-    @boundary = '(.|\n)*'
-    @data = [
-      {:name=>'hidden1', :value=>'foobar'},
-      {:name=>'text1',   :value=>"\xE3\x81\x82\xE3\x81\x84\xE3\x81\x86\xE3\x81\x88\xE3\x81\x8A".dup},
-      {:name=>'file1',   :value=>_read('file1.html'),
-       :filename=>'file1.html', :content_type=>'text/html'},
-      {:name=>'image1',  :value=>_read('small.png'),
-       :filename=>'small.png',  :content_type=>'image/png'},  # small image
-    ]
-    @data[1][:value].force_encoding("UTF-8")
-    _prepare(@data)
-    cgi = CGI.new(:accept_charset=>"UTF-8")
-    assert_equal('file1.html', cgi['file1'].original_filename)
-  end
-
-  def test_cgi_multipart_boundary_10240 # [Bug #3866]
-    @boundary = 'AaB03x'
-    @data = [
-      {:name=>'file',   :value=>"b"*10134,
-       :filename=>'file.txt', :content_type=>'text/plain'},
-      {:name=>'foo',  :value=>"bar"},
-    ]
-    _prepare(@data)
-    cgi = CGI.new(:accept_charset=>"UTF-8")
-    assert_equal(cgi['foo'], 'bar')
-    assert_equal(cgi['file'].read, 'b'*10134)
-    cgi['file'].close! if cgi['file'].kind_of? Tempfile
-  end
-
-  def test_cgi_multipart_without_tempfile
-    assert_in_out_err([], <<-'EOM')
-      require 'cgi'
-      require 'stringio'
-      ENV['REQUEST_METHOD'] = 'POST'
-      ENV['CONTENT_TYPE'] = 'multipart/form-data; boundary=foobar1234'
-      body = <<-BODY.gsub(/\n/, "\r\n")
---foobar1234
-Content-Disposition: form-data: name=\"name1\"
-
-value1
---foobar1234
-Content-Disposition: form-data: name=\"file1\"; filename=\"file1.html\"
-Content-Type: text/html
-
-<html>
-<body><p>Hello</p></body>
-</html>
-
---foobar1234--
-BODY
-      ENV['CONTENT_LENGTH'] = body.size.to_s
-      $stdin = StringIO.new(body)
-      CGI.new
-    EOM
-  end
-
-  ###
-
-  self.instance_methods.each do |method|
-    private method if method =~ /^test_(.*)/ && $1 != ENV['TEST']
-  end if ENV['TEST']
-
-end
diff --git a/test/cgi/test_cgi_session.rb b/test/cgi/test_cgi_session.rb
deleted file mode 100644
index b16b69766e910f..00000000000000
--- a/test/cgi/test_cgi_session.rb
+++ /dev/null
@@ -1,169 +0,0 @@
-# frozen_string_literal: true
-require 'test/unit'
-require 'cgi'
-require 'cgi/session'
-require 'cgi/session/pstore'
-require 'stringio'
-require 'tmpdir'
-require_relative 'update_env'
-
-class CGISessionTest < Test::Unit::TestCase
-  include UpdateEnv
-
-  def setup
-    @environ = {}
-    @session_dir = Dir.mktmpdir(%w'session dir')
-  end
-
-  def teardown
-    ENV.update(@environ)
-    $stdout = STDOUT
-    FileUtils.rm_rf(@session_dir)
-  end
-
-  def test_cgi_session_filestore
-    update_env(
-      'REQUEST_METHOD'  => 'GET',
-  #    'QUERY_STRING'    => 'id=123&id=456&id=&str=%40h+%3D%7E+%2F%5E%24%2F',
-  #    'HTTP_COOKIE'     => '_session_id=12345; name1=val1&val2;',
-      'SERVER_SOFTWARE' => 'Apache 2.2.0',
-      'SERVER_PROTOCOL' => 'HTTP/1.1',
-    )
-    value1="value1"
-    value2="\x8F\xBC\x8D]".dup
-    value2.force_encoding("SJIS") if defined?(::Encoding)
-    cgi = CGI.new
-    session = CGI::Session.new(cgi,"tmpdir"=>@session_dir)
-    session["key1"]=value1
-    session["key2"]=value2
-    assert_equal(value1,session["key1"])
-    assert_equal(value2,session["key2"])
-    session.close
-    $stdout = StringIO.new
-    cgi.out{""}
-
-    update_env(
-      'REQUEST_METHOD'  => 'GET',
-      # 'HTTP_COOKIE'     => "_session_id=#{session_id}",
-      'QUERY_STRING'    => "_session_id=#{session.session_id}",
-      'SERVER_SOFTWARE' => 'Apache 2.2.0',
-      'SERVER_PROTOCOL' => 'HTTP/1.1',
-    )
-    cgi = CGI.new
-    session = CGI::Session.new(cgi,"tmpdir"=>@session_dir)
-    $stdout = StringIO.new
-    assert_equal(value1,session["key1"])
-    assert_equal(value2,session["key2"])
-    session.close
-
-  end
-  def test_cgi_session_pstore
-    update_env(
-      'REQUEST_METHOD'  => 'GET',
-  #    'QUERY_STRING'    => 'id=123&id=456&id=&str=%40h+%3D%7E+%2F%5E%24%2F',
-  #    'HTTP_COOKIE'     => '_session_id=12345; name1=val1&val2;',
-      'SERVER_SOFTWARE' => 'Apache 2.2.0',
-      'SERVER_PROTOCOL' => 'HTTP/1.1',
-    )
-    value1="value1"
-    value2="\x8F\xBC\x8D]".dup
-    value2.force_encoding("SJIS") if defined?(::Encoding)
-    cgi = CGI.new
-    session = CGI::Session.new(cgi,"tmpdir"=>@session_dir,"database_manager"=>CGI::Session::PStore)
-    session["key1"]=value1
-    session["key2"]=value2
-    assert_equal(value1,session["key1"])
-    assert_equal(value2,session["key2"])
-    session.close
-    $stdout = StringIO.new
-    cgi.out{""}
-
-    update_env(
-      'REQUEST_METHOD'  => 'GET',
-      # 'HTTP_COOKIE'     => "_session_id=#{session_id}",
-      'QUERY_STRING'    => "_session_id=#{session.session_id}",
-      'SERVER_SOFTWARE' => 'Apache 2.2.0',
-      'SERVER_PROTOCOL' => 'HTTP/1.1',
-    )
-    cgi = CGI.new
-    session = CGI::Session.new(cgi,"tmpdir"=>@session_dir,"database_manager"=>CGI::Session::PStore)
-    $stdout = StringIO.new
-    assert_equal(value1,session["key1"])
-    assert_equal(value2,session["key2"])
-    session.close
-  end
-  def test_cgi_session_specify_session_id
-    update_env(
-      'REQUEST_METHOD'  => 'GET',
-  #    'QUERY_STRING'    => 'id=123&id=456&id=&str=%40h+%3D%7E+%2F%5E%24%2F',
-  #    'HTTP_COOKIE'     => '_session_id=12345; name1=val1&val2;',
-      'SERVER_SOFTWARE' => 'Apache 2.2.0',
-      'SERVER_PROTOCOL' => 'HTTP/1.1',
-    )
-    value1="value1"
-    value2="\x8F\xBC\x8D]".dup
-    value2.force_encoding("SJIS") if defined?(::Encoding)
-    cgi = CGI.new
-    session = CGI::Session.new(cgi,"tmpdir"=>@session_dir,"session_id"=>"foo")
-    session["key1"]=value1
-    session["key2"]=value2
-    assert_equal(value1,session["key1"])
-    assert_equal(value2,session["key2"])
-    assert_equal("foo",session.session_id)
-    #session_id=session.session_id
-    session.close
-    $stdout = StringIO.new
-    cgi.out{""}
-
-    update_env(
-      'REQUEST_METHOD'  => 'GET',
-      # 'HTTP_COOKIE'     => "_session_id=#{session_id}",
-      'QUERY_STRING'    => "_session_id=#{session.session_id}",
-      'SERVER_SOFTWARE' => 'Apache 2.2.0',
-      'SERVER_PROTOCOL' => 'HTTP/1.1',
-    )
-    cgi = CGI.new
-    session = CGI::Session.new(cgi,"tmpdir"=>@session_dir)
-    $stdout = StringIO.new
-    assert_equal(value1,session["key1"])
-    assert_equal(value2,session["key2"])
-    assert_equal("foo",session.session_id)
-    session.close
-  end
-  def test_cgi_session_specify_session_key
-    update_env(
-      'REQUEST_METHOD'  => 'GET',
-  #    'QUERY_STRING'    => 'id=123&id=456&id=&str=%40h+%3D%7E+%2F%5E%24%2F',
-  #    'HTTP_COOKIE'     => '_session_id=12345; name1=val1&val2;',
-      'SERVER_SOFTWARE' => 'Apache 2.2.0',
-      'SERVER_PROTOCOL' => 'HTTP/1.1',
-    )
-    value1="value1"
-    value2="\x8F\xBC\x8D]".dup
-    value2.force_encoding("SJIS") if defined?(::Encoding)
-    cgi = CGI.new
-    session = CGI::Session.new(cgi,"tmpdir"=>@session_dir,"session_key"=>"bar")
-    session["key1"]=value1
-    session["key2"]=value2
-    assert_equal(value1,session["key1"])
-    assert_equal(value2,session["key2"])
-    session_id=session.session_id
-    session.close
-    $stdout = StringIO.new
-    cgi.out{""}
-
-    update_env(
-      'REQUEST_METHOD'  => 'GET',
-      'HTTP_COOKIE'     => "bar=#{session_id}",
-      # 'QUERY_STRING'    => "bar=#{session.session_id}",
-      'SERVER_SOFTWARE' => 'Apache 2.2.0',
-      'SERVER_PROTOCOL' => 'HTTP/1.1',
-    )
-    cgi = CGI.new
-    session = CGI::Session.new(cgi,"tmpdir"=>@session_dir,"session_key"=>"bar")
-    $stdout = StringIO.new
-    assert_equal(value1,session["key1"])
-    assert_equal(value2,session["key2"])
-    session.close
-  end
-end
diff --git a/test/cgi/test_cgi_tag_helper.rb b/test/cgi/test_cgi_tag_helper.rb
deleted file mode 100644
index 0b99dfc1bc4db9..00000000000000
--- a/test/cgi/test_cgi_tag_helper.rb
+++ /dev/null
@@ -1,355 +0,0 @@
-# frozen_string_literal: true
-require 'test/unit'
-require 'cgi'
-require 'stringio'
-require_relative 'update_env'
-
-
-class CGITagHelperTest < Test::Unit::TestCase
-  include UpdateEnv
-
-
-  def setup
-    @environ = {}
-    #@environ = {
-    #  'SERVER_PROTOCOL' => 'HTTP/1.1',
-    #  'REQUEST_METHOD'  => 'GET',
-    #  'SERVER_SOFTWARE' => 'Apache 2.2.0',
-    #}
-    #ENV.update(@environ)
-  end
-
-
-  def teardown
-    ENV.update(@environ)
-    $stdout = STDOUT
-  end
-
-
-  def test_cgi_tag_helper_html3
-    update_env(
-      'REQUEST_METHOD' => 'GET',
-    )
-    ## html3
-    cgi = CGI.new('html3')
-    assert_equal('<A HREF=""></A>',cgi.a)
-    assert_equal('<A HREF="bar"></A>',cgi.a('bar'))
-    assert_equal('<A HREF="">foo</A>',cgi.a{'foo'})
-    assert_equal('<A HREF="bar">foo</A>',cgi.a('bar'){'foo'})
-    assert_equal('<TT></TT>',cgi.tt)
-    assert_equal('<TT></TT>',cgi.tt('bar'))
-    assert_equal('<TT>foo</TT>',cgi.tt{'foo'})
-    assert_equal('<TT>foo</TT>',cgi.tt('bar'){'foo'})
-    assert_equal('<I></I>',cgi.i)
-    assert_equal('<I></I>',cgi.i('bar'))
-    assert_equal('<I>foo</I>',cgi.i{'foo'})
-    assert_equal('<I>foo</I>',cgi.i('bar'){'foo'})
-    assert_equal('<B></B>',cgi.b)
-    assert_equal('<B></B>',cgi.b('bar'))
-    assert_equal('<B>foo</B>',cgi.b{'foo'})
-    assert_equal('<B>foo</B>',cgi.b('bar'){'foo'})
-    assert_equal('<U></U>',cgi.u)
-    assert_equal('<U></U>',cgi.u('bar'))
-    assert_equal('<U>foo</U>',cgi.u{'foo'})
-    assert_equal('<U>foo</U>',cgi.u('bar'){'foo'})
-    assert_equal('<STRIKE></STRIKE>',cgi.strike)
-    assert_equal('<STRIKE></STRIKE>',cgi.strike('bar'))
-    assert_equal('<STRIKE>foo</STRIKE>',cgi.strike{'foo'})
-    assert_equal('<STRIKE>foo</STRIKE>',cgi.strike('bar'){'foo'})
-    assert_equal('<BIG></BIG>',cgi.big)
-    assert_equal('<BIG></BIG>',cgi.big('bar'))
-    assert_equal('<BIG>foo</BIG>',cgi.big{'foo'})
-    assert_equal('<BIG>foo</BIG>',cgi.big('bar'){'foo'})
-    assert_equal('<SMALL></SMALL>',cgi.small)
-    assert_equal('<SMALL></SMALL>',cgi.small('bar'))
-    assert_equal('<SMALL>foo</SMALL>',cgi.small{'foo'})
-    assert_equal('<SMALL>foo</SMALL>',cgi.small('bar'){'foo'})
-    assert_equal('<SUB></SUB>',cgi.sub)
-    assert_equal('<SUB></SUB>',cgi.sub('bar'))
-    assert_equal('<SUB>foo</SUB>',cgi.sub{'foo'})
-    assert_equal('<SUB>foo</SUB>',cgi.sub('bar'){'foo'})
-    assert_equal('<SUP></SUP>',cgi.sup)
-    assert_equal('<SUP></SUP>',cgi.sup('bar'))
-    assert_equal('<SUP>foo</SUP>',cgi.sup{'foo'})
-    assert_equal('<SUP>foo</SUP>',cgi.sup('bar'){'foo'})
-    assert_equal('<EM></EM>',cgi.em)
-    assert_equal('<EM></EM>',cgi.em('bar'))
-    assert_equal('<EM>foo</EM>',cgi.em{'foo'})
-    assert_equal('<EM>foo</EM>',cgi.em('bar'){'foo'})
-    assert_equal('<STRONG></STRONG>',cgi.strong)
-    assert_equal('<STRONG></STRONG>',cgi.strong('bar'))
-    assert_equal('<STRONG>foo</STRONG>',cgi.strong{'foo'})
-    assert_equal('<STRONG>foo</STRONG>',cgi.strong('bar'){'foo'})
-    assert_equal('<DFN></DFN>',cgi.dfn)
-    assert_equal('<DFN></DFN>',cgi.dfn('bar'))
-    assert_equal('<DFN>foo</DFN>',cgi.dfn{'foo'})
-    assert_equal('<DFN>foo</DFN>',cgi.dfn('bar'){'foo'})
-    assert_equal('<CODE></CODE>',cgi.code)
-    assert_equal('<CODE></CODE>',cgi.code('bar'))
-    assert_equal('<CODE>foo</CODE>',cgi.code{'foo'})
-    assert_equal('<CODE>foo</CODE>',cgi.code('bar'){'foo'})
-    assert_equal('<SAMP></SAMP>',cgi.samp)
-    assert_equal('<SAMP></SAMP>',cgi.samp('bar'))
-    assert_equal('<SAMP>foo</SAMP>',cgi.samp{'foo'})
-    assert_equal('<SAMP>foo</SAMP>',cgi.samp('bar'){'foo'})
-    assert_equal('<KBD></KBD>',cgi.kbd)
-    assert_equal('<KBD></KBD>',cgi.kbd('bar'))
-    assert_equal('<KBD>foo</KBD>',cgi.kbd{'foo'})
-    assert_equal('<KBD>foo</KBD>',cgi.kbd('bar'){'foo'})
-    assert_equal('<VAR></VAR>',cgi.var)
-    assert_equal('<VAR></VAR>',cgi.var('bar'))
-    assert_equal('<VAR>foo</VAR>',cgi.var{'foo'})
-    assert_equal('<VAR>foo</VAR>',cgi.var('bar'){'foo'})
-    assert_equal('<CITE></CITE>',cgi.cite)
-    assert_equal('<CITE></CITE>',cgi.cite('bar'))
-    assert_equal('<CITE>foo</CITE>',cgi.cite{'foo'})
-    assert_equal('<CITE>foo</CITE>',cgi.cite('bar'){'foo'})
-    assert_equal('<FONT></FONT>',cgi.font)
-    assert_equal('<FONT></FONT>',cgi.font('bar'))
-    assert_equal('<FONT>foo</FONT>',cgi.font{'foo'})
-    assert_equal('<FONT>foo</FONT>',cgi.font('bar'){'foo'})
-    assert_equal('<ADDRESS></ADDRESS>',cgi.address)
-    assert_equal('<ADDRESS></ADDRESS>',cgi.address('bar'))
-    assert_equal('<ADDRESS>foo</ADDRESS>',cgi.address{'foo'})
-    assert_equal('<ADDRESS>foo</ADDRESS>',cgi.address('bar'){'foo'})
-    assert_equal('<DIV></DIV>',cgi.div)
-    assert_equal('<DIV></DIV>',cgi.div('bar'))
-    assert_equal('<DIV>foo</DIV>',cgi.div{'foo'})
-    assert_equal('<DIV>foo</DIV>',cgi.div('bar'){'foo'})
-    assert_equal('<CENTER></CENTER>',cgi.center)
-    assert_equal('<CENTER></CENTER>',cgi.center('bar'))
-    assert_equal('<CENTER>foo</CENTER>',cgi.center{'foo'})
-    assert_equal('<CENTER>foo</CENTER>',cgi.center('bar'){'foo'})
-    assert_equal('<MAP></MAP>',cgi.map)
-    assert_equal('<MAP></MAP>',cgi.map('bar'))
-    assert_equal('<MAP>foo</MAP>',cgi.map{'foo'})
-    assert_equal('<MAP>foo</MAP>',cgi.map('bar'){'foo'})
-    assert_equal('<APPLET></APPLET>',cgi.applet)
-    assert_equal('<APPLET></APPLET>',cgi.applet('bar'))
-    assert_equal('<APPLET>foo</APPLET>',cgi.applet{'foo'})
-    assert_equal('<APPLET>foo</APPLET>',cgi.applet('bar'){'foo'})
-    assert_equal('<PRE></PRE>',cgi.pre)
-    assert_equal('<PRE></PRE>',cgi.pre('bar'))
-    assert_equal('<PRE>foo</PRE>',cgi.pre{'foo'})
-    assert_equal('<PRE>foo</PRE>',cgi.pre('bar'){'foo'})
-    assert_equal('<XMP></XMP>',cgi.xmp)
-    assert_equal('<XMP></XMP>',cgi.xmp('bar'))
-    assert_equal('<XMP>foo</XMP>',cgi.xmp{'foo'})
-    assert_equal('<XMP>foo</XMP>',cgi.xmp('bar'){'foo'})
-    assert_equal('<LISTING></LISTING>',cgi.listing)
-    assert_equal('<LISTING></LISTING>',cgi.listing('bar'))
-    assert_equal('<LISTING>foo</LISTING>',cgi.listing{'foo'})
-    assert_equal('<LISTING>foo</LISTING>',cgi.listing('bar'){'foo'})
-    assert_equal('<DL></DL>',cgi.dl)
-    assert_equal('<DL></DL>',cgi.dl('bar'))
-    assert_equal('<DL>foo</DL>',cgi.dl{'foo'})
-    assert_equal('<DL>foo</DL>',cgi.dl('bar'){'foo'})
-    assert_equal('<OL></OL>',cgi.ol)
-    assert_equal('<OL></OL>',cgi.ol('bar'))
-    assert_equal('<OL>foo</OL>',cgi.ol{'foo'})
-    assert_equal('<OL>foo</OL>',cgi.ol('bar'){'foo'})
-    assert_equal('<UL></UL>',cgi.ul)
-    assert_equal('<UL></UL>',cgi.ul('bar'))
-    assert_equal('<UL>foo</UL>',cgi.ul{'foo'})
-    assert_equal('<UL>foo</UL>',cgi.ul('bar'){'foo'})
-    assert_equal('<DIR></DIR>',cgi.dir)
-    assert_equal('<DIR></DIR>',cgi.dir('bar'))
-    assert_equal('<DIR>foo</DIR>',cgi.dir{'foo'})
-    assert_equal('<DIR>foo</DIR>',cgi.dir('bar'){'foo'})
-    assert_equal('<MENU></MENU>',cgi.menu)
-    assert_equal('<MENU></MENU>',cgi.menu('bar'))
-    assert_equal('<MENU>foo</MENU>',cgi.menu{'foo'})
-    assert_equal('<MENU>foo</MENU>',cgi.menu('bar'){'foo'})
-    assert_equal('<SELECT></SELECT>',cgi.select)
-    assert_equal('<SELECT></SELECT>',cgi.select('bar'))
-    assert_equal('<SELECT>foo</SELECT>',cgi.select{'foo'})
-    assert_equal('<SELECT>foo</SELECT>',cgi.select('bar'){'foo'})
-    assert_equal('<TABLE></TABLE>',cgi.table)
-    assert_equal('<TABLE></TABLE>',cgi.table('bar'))
-    assert_equal('<TABLE>foo</TABLE>',cgi.table{'foo'})
-    assert_equal('<TABLE>foo</TABLE>',cgi.table('bar'){'foo'})
-    assert_equal('<TITLE></TITLE>',cgi.title)
-    assert_equal('<TITLE></TITLE>',cgi.title('bar'))
-    assert_equal('<TITLE>foo</TITLE>',cgi.title{'foo'})
-    assert_equal('<TITLE>foo</TITLE>',cgi.title('bar'){'foo'})
-    assert_equal('<STYLE></STYLE>',cgi.style)
-    assert_equal('<STYLE></STYLE>',cgi.style('bar'))
-    assert_equal('<STYLE>foo</STYLE>',cgi.style{'foo'})
-    assert_equal('<STYLE>foo</STYLE>',cgi.style('bar'){'foo'})
-    assert_equal('<SCRIPT></SCRIPT>',cgi.script)
-    assert_equal('<SCRIPT></SCRIPT>',cgi.script('bar'))
-    assert_equal('<SCRIPT>foo</SCRIPT>',cgi.script{'foo'})
-    assert_equal('<SCRIPT>foo</SCRIPT>',cgi.script('bar'){'foo'})
-    assert_equal('<H1></H1>',cgi.h1)
-    assert_equal('<H1></H1>',cgi.h1('bar'))
-    assert_equal('<H1>foo</H1>',cgi.h1{'foo'})
-    assert_equal('<H1>foo</H1>',cgi.h1('bar'){'foo'})
-    assert_equal('<H2></H2>',cgi.h2)
-    assert_equal('<H2></H2>',cgi.h2('bar'))
-    assert_equal('<H2>foo</H2>',cgi.h2{'foo'})
-    assert_equal('<H2>foo</H2>',cgi.h2('bar'){'foo'})
-    assert_equal('<H3></H3>',cgi.h3)
-    assert_equal('<H3></H3>',cgi.h3('bar'))
-    assert_equal('<H3>foo</H3>',cgi.h3{'foo'})
-    assert_equal('<H3>foo</H3>',cgi.h3('bar'){'foo'})
-    assert_equal('<H4></H4>',cgi.h4)
-    assert_equal('<H4></H4>',cgi.h4('bar'))
-    assert_equal('<H4>foo</H4>',cgi.h4{'foo'})
-    assert_equal('<H4>foo</H4>',cgi.h4('bar'){'foo'})
-    assert_equal('<H5></H5>',cgi.h5)
-    assert_equal('<H5></H5>',cgi.h5('bar'))
-    assert_equal('<H5>foo</H5>',cgi.h5{'foo'})
-    assert_equal('<H5>foo</H5>',cgi.h5('bar'){'foo'})
-    assert_equal('<H6></H6>',cgi.h6)
-    assert_equal('<H6></H6>',cgi.h6('bar'))
-    assert_equal('<H6>foo</H6>',cgi.h6{'foo'})
-    assert_equal('<H6>foo</H6>',cgi.h6('bar'){'foo'})
-    assert_match(/^<TEXTAREA .*><\/TEXTAREA>$/,cgi.textarea)
-    assert_match(/COLS="70"/,cgi.textarea)
-    assert_match(/ROWS="10"/,cgi.textarea)
-    assert_match(/NAME=""/,cgi.textarea)
-    assert_match(/^<TEXTAREA .*><\/TEXTAREA>$/,cgi.textarea("bar"))
-    assert_match(/COLS="70"/,cgi.textarea("bar"))
-    assert_match(/ROWS="10"/,cgi.textarea("bar"))
-    assert_match(/NAME="bar"/,cgi.textarea("bar"))
-    assert_match(/^<TEXTAREA .*>foo<\/TEXTAREA>$/,cgi.textarea{"foo"})
-    assert_match(/COLS="70"/,cgi.textarea{"foo"})
-    assert_match(/ROWS="10"/,cgi.textarea{"foo"})
-    assert_match(/NAME=""/,cgi.textarea{"foo"})
-    assert_match(/^<TEXTAREA .*>foo<\/TEXTAREA>$/,cgi.textarea("bar"){"foo"})
-    assert_match(/COLS="70"/,cgi.textarea("bar"){"foo"})
-    assert_match(/ROWS="10"/,cgi.textarea("bar"){"foo"})
-    assert_match(/NAME="bar"/,cgi.textarea("bar"){"foo"})
-    assert_match(/^<FORM .*><\/FORM>$/,cgi.form)
-    assert_match(/METHOD="post"/,cgi.form)
-    assert_match(/ENCTYPE="application\/x-www-form-urlencoded"/,cgi.form)
-    assert_match(/^<FORM .*><\/FORM>$/,cgi.form("bar"))
-    assert_match(/METHOD="bar"/,cgi.form("bar"))
-    assert_match(/ENCTYPE="application\/x-www-form-urlencoded"/,cgi.form("bar"))
-    assert_match(/^<FORM .*>foo<\/FORM>$/,cgi.form{"foo"})
-    assert_match(/METHOD="post"/,cgi.form{"foo"})
-    assert_match(/ENCTYPE="application\/x-www-form-urlencoded"/,cgi.form{"foo"})
-    assert_match(/^<FORM .*>foo<\/FORM>$/,cgi.form("bar"){"foo"})
-    assert_match(/METHOD="bar"/,cgi.form("bar"){"foo"})
-    assert_match(/ENCTYPE="application\/x-www-form-urlencoded"/,cgi.form("bar"){"foo"})
-    assert_equal('<BLOCKQUOTE></BLOCKQUOTE>',cgi.blockquote)
-    assert_equal('<BLOCKQUOTE CITE="bar"></BLOCKQUOTE>',cgi.blockquote('bar'))
-    assert_equal('<BLOCKQUOTE>foo</BLOCKQUOTE>',cgi.blockquote{'foo'})
-    assert_equal('<BLOCKQUOTE CITE="bar">foo</BLOCKQUOTE>',cgi.blockquote('bar'){'foo'})
-    assert_equal('<CAPTION></CAPTION>',cgi.caption)
-    assert_equal('<CAPTION ALIGN="bar"></CAPTION>',cgi.caption('bar'))
-    assert_equal('<CAPTION>foo</CAPTION>',cgi.caption{'foo'})
-    assert_equal('<CAPTION ALIGN="bar">foo</CAPTION>',cgi.caption('bar'){'foo'})
-    assert_equal('<IMG SRC="" ALT="">',cgi.img)
-    assert_equal('<IMG SRC="bar" ALT="">',cgi.img('bar'))
-    assert_equal('<IMG SRC="" ALT="">',cgi.img{'foo'})
-    assert_equal('<IMG SRC="bar" ALT="">',cgi.img('bar'){'foo'})
-    assert_equal('<BASE HREF="">',cgi.base)
-    assert_equal('<BASE HREF="bar">',cgi.base('bar'))
-    assert_equal('<BASE HREF="">',cgi.base{'foo'})
-    assert_equal('<BASE HREF="bar">',cgi.base('bar'){'foo'})
-    assert_equal('<BASEFONT>',cgi.basefont)
-    assert_equal('<BASEFONT>',cgi.basefont('bar'))
-    assert_equal('<BASEFONT>',cgi.basefont{'foo'})
-    assert_equal('<BASEFONT>',cgi.basefont('bar'){'foo'})
-    assert_equal('<BR>',cgi.br)
-    assert_equal('<BR>',cgi.br('bar'))
-    assert_equal('<BR>',cgi.br{'foo'})
-    assert_equal('<BR>',cgi.br('bar'){'foo'})
-    assert_equal('<AREA>',cgi.area)
-    assert_equal('<AREA>',cgi.area('bar'))
-    assert_equal('<AREA>',cgi.area{'foo'})
-    assert_equal('<AREA>',cgi.area('bar'){'foo'})
-    assert_equal('<LINK>',cgi.link)
-    assert_equal('<LINK>',cgi.link('bar'))
-    assert_equal('<LINK>',cgi.link{'foo'})
-    assert_equal('<LINK>',cgi.link('bar'){'foo'})
-    assert_equal('<PARAM>',cgi.param)
-    assert_equal('<PARAM>',cgi.param('bar'))
-    assert_equal('<PARAM>',cgi.param{'foo'})
-    assert_equal('<PARAM>',cgi.param('bar'){'foo'})
-    assert_equal('<HR>',cgi.hr)
-    assert_equal('<HR>',cgi.hr('bar'))
-    assert_equal('<HR>',cgi.hr{'foo'})
-    assert_equal('<HR>',cgi.hr('bar'){'foo'})
-    assert_equal('<INPUT>',cgi.input)
-    assert_equal('<INPUT>',cgi.input('bar'))
-    assert_equal('<INPUT>',cgi.input{'foo'})
-    assert_equal('<INPUT>',cgi.input('bar'){'foo'})
-    assert_equal('<ISINDEX>',cgi.isindex)
-    assert_equal('<ISINDEX>',cgi.isindex('bar'))
-    assert_equal('<ISINDEX>',cgi.isindex{'foo'})
-    assert_equal('<ISINDEX>',cgi.isindex('bar'){'foo'})
-    assert_equal('<META>',cgi.meta)
-    assert_equal('<META>',cgi.meta('bar'))
-    assert_equal('<META>',cgi.meta{'foo'})
-    assert_equal('<META>',cgi.meta('bar'){'foo'})
-    assert_equal('<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN"><HTML>',cgi.html)
-    assert_equal('<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN"><HTML>foo</HTML>',cgi.html{'foo'})
-    assert_equal('<HEAD>',cgi.head)
-    assert_equal('<HEAD>foo</HEAD>',cgi.head{'foo'})
-    assert_equal('<BODY>',cgi.body)
-    assert_equal('<BODY>foo</BODY>',cgi.body{'foo'})
-    assert_equal('<P>',cgi.p)
-    assert_equal('<P>foo</P>',cgi.p{'foo'})
-    assert_equal('<PLAINTEXT>',cgi.plaintext)
-    assert_equal('<PLAINTEXT>foo</PLAINTEXT>',cgi.plaintext{'foo'})
-    assert_equal('<DT>',cgi.dt)
-    assert_equal('<DT>foo</DT>',cgi.dt{'foo'})
-    assert_equal('<DD>',cgi.dd)
-    assert_equal('<DD>foo</DD>',cgi.dd{'foo'})
-    assert_equal('<LI>',cgi.li)
-    assert_equal('<LI>foo</LI>',cgi.li{'foo'})
-    assert_equal('<OPTION>',cgi.option)
-    assert_equal('<OPTION>foo</OPTION>',cgi.option{'foo'})
-    assert_equal('<TR>',cgi.tr)
-    assert_equal('<TR>foo</TR>',cgi.tr{'foo'})
-    assert_equal('<TH>',cgi.th)
-    assert_equal('<TH>foo</TH>',cgi.th{'foo'})
-    assert_equal('<TD>',cgi.td)
-    assert_equal('<TD>foo</TD>',cgi.td{'foo'})
-    str=cgi.checkbox_group("foo",["aa","bb"],["cc","dd"])
-    assert_match(/^<INPUT .*VALUE="aa".*>bb<INPUT .*VALUE="cc".*>dd$/,str)
-    assert_match(/^<INPUT .*TYPE="checkbox".*>bb<INPUT .*TYPE="checkbox".*>dd$/,str)
-    assert_match(/^<INPUT .*NAME="foo".*>bb<INPUT .*NAME="foo".*>dd$/,str)
-    str=cgi.radio_group("foo",["aa","bb"],["cc","dd"])
-    assert_match(/^<INPUT .*VALUE="aa".*>bb<INPUT .*VALUE="cc".*>dd$/,str)
-    assert_match(/^<INPUT .*TYPE="radio".*>bb<INPUT .*TYPE="radio".*>dd$/,str)
-    assert_match(/^<INPUT .*NAME="foo".*>bb<INPUT .*NAME="foo".*>dd$/,str)
-    str=cgi.checkbox_group("foo",["aa","bb"],["cc","dd",true])
-    assert_match(/^<INPUT .*VALUE="aa".*>bb<INPUT .*VALUE="cc".*>dd$/,str)
-    assert_match(/^<INPUT .*TYPE="checkbox".*>bb<INPUT .*TYPE="checkbox".*>dd$/,str)
-    assert_match(/^<INPUT .*NAME="foo".*>bb<INPUT .*NAME="foo".*>dd$/,str)
-    assert_match(/^<INPUT .*>bb<INPUT .*CHECKED.*>dd$/,str)
-    assert_match(/<INPUT .*TYPE="text".*>/,cgi.text_field(:name=>"name",:value=>"value"))
-    str=cgi.radio_group("foo",["aa","bb"],["cc","dd",false])
-    assert_match(/^<INPUT .*VALUE="aa".*>bb<INPUT .*VALUE="cc".*>dd$/,str)
-    assert_match(/^<INPUT .*TYPE="radio".*>bb<INPUT .*TYPE="radio".*>dd$/,str)
-    assert_match(/^<INPUT .*NAME="foo".*>bb<INPUT .*NAME="foo".*>dd$/,str)
-  end
-
-=begin
-  def test_cgi_tag_helper_html4
-    ## html4
-    cgi = CGI.new('html4')
-    ## html4 transitional
-    cgi = CGI.new('html4Tr')
-    ## html4 frameset
-    cgi = CGI.new('html4Fr')
-  end
-=end
-
-  def test_cgi_tag_helper_html5
-    update_env(
-      'REQUEST_METHOD' => 'GET',
-    )
-    ## html5
-    cgi = CGI.new('html5')
-    assert_equal('<HEADER></HEADER>',cgi.header)
-    assert_equal('<FOOTER></FOOTER>',cgi.footer)
-    assert_equal('<ARTICLE></ARTICLE>',cgi.article)
-    assert_equal('<SECTION></SECTION>',cgi.section)
-    assert_equal('<!DOCTYPE HTML><HTML BLA="TEST"></HTML>',cgi.html("BLA"=>"TEST"){})
-  end
-
-end
diff --git a/test/cgi/test_cgi_util.rb b/test/cgi/test_cgi_util.rb
deleted file mode 100644
index b3a46a1c252faf..00000000000000
--- a/test/cgi/test_cgi_util.rb
+++ /dev/null
@@ -1,285 +0,0 @@
-# frozen_string_literal: true
-require 'test/unit'
-require 'cgi'
-require 'stringio'
-require_relative 'update_env'
-
-
-class CGIUtilTest < Test::Unit::TestCase
-  include CGI::Util
-  include UpdateEnv
-
-  def setup
-    @environ = {}
-    update_env(
-      'REQUEST_METHOD' => 'GET',
-      'SCRIPT_NAME' => nil,
-    )
-    @str1="&<>\" \xE3\x82\x86\xE3\x82\x93\xE3\x82\x86\xE3\x82\x93".dup
-    @str1.force_encoding("UTF-8") if defined?(::Encoding)
-  end
-
-  def teardown
-    ENV.update(@environ)
-  end
-
-  def test_cgi_escape
-    assert_equal('%26%3C%3E%22+%E3%82%86%E3%82%93%E3%82%86%E3%82%93', CGI.escape(@str1))
-    assert_equal('%26%3C%3E%22+%E3%82%86%E3%82%93%E3%82%86%E3%82%93'.ascii_only?, CGI.escape(@str1).ascii_only?) if defined?(::Encoding)
-  end
-
-  def test_cgi_escape_with_unreserved_characters
-    assert_equal("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-._~",
-                 CGI.escape("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-._~"),
-                 "should not escape any unreserved characters, as per RFC3986 Section 2.3")
-  end
-
-  def test_cgi_escape_with_invalid_byte_sequence
-    assert_equal('%C0%3C%3C', CGI.escape("\xC0\<\<".dup.force_encoding("UTF-8")))
-  end
-
-  def test_cgi_escape_preserve_encoding
-    assert_equal(Encoding::US_ASCII, CGI.escape("\xC0\<\<".dup.force_encoding("US-ASCII")).encoding)
-    assert_equal(Encoding::ASCII_8BIT, CGI.escape("\xC0\<\<".dup.force_encoding("ASCII-8BIT")).encoding)
-    assert_equal(Encoding::UTF_8, CGI.escape("\xC0\<\<".dup.force_encoding("UTF-8")).encoding)
-  end
-
-  def test_cgi_unescape
-    str = CGI.unescape('%26%3C%3E%22+%E3%82%86%E3%82%93%E3%82%86%E3%82%93')
-    assert_equal(@str1, str)
-    return unless defined?(::Encoding)
-
-    assert_equal(@str1.encoding, str.encoding)
-    assert_equal("\u{30E1 30E2 30EA 691C 7D22}", CGI.unescape("\u{30E1 30E2 30EA}%E6%A4%9C%E7%B4%A2"))
-  end
-
-  def test_cgi_unescape_preserve_encoding
-    assert_equal(Encoding::US_ASCII, CGI.unescape("%C0%3C%3C".dup.force_encoding("US-ASCII")).encoding)
-    assert_equal(Encoding::ASCII_8BIT, CGI.unescape("%C0%3C%3C".dup.force_encoding("ASCII-8BIT")).encoding)
-    assert_equal(Encoding::UTF_8, CGI.unescape("%C0%3C%3C".dup.force_encoding("UTF-8")).encoding)
-  end
-
-  def test_cgi_unescape_accept_charset
-    return unless defined?(::Encoding)
-
-    assert_raise(TypeError) {CGI.unescape('', nil)}
-    assert_separately(%w[-rcgi/util], "#{<<-"begin;"}\n#{<<-"end;"}")
-    begin;
-      assert_equal("", CGI.unescape(''))
-    end;
-  end
-
-  def test_cgi_escapeURIComponent
-    assert_equal('%26%3C%3E%22%20%E3%82%86%E3%82%93%E3%82%86%E3%82%93', CGI.escapeURIComponent(@str1))
-    assert_equal('%26%3C%3E%22%20%E3%82%86%E3%82%93%E3%82%86%E3%82%93'.ascii_only?, CGI.escapeURIComponent(@str1).ascii_only?) if defined?(::Encoding)
-  end
-
-  def test_cgi_escapeURIComponent_with_unreserved_characters
-    assert_equal("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-._~",
-                 CGI.escapeURIComponent("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-._~"),
-                 "should not encode any unreserved characters, as per RFC3986 Section 2.3")
-  end
-
-  def test_cgi_escapeURIComponent_with_invalid_byte_sequence
-    assert_equal('%C0%3C%3C', CGI.escapeURIComponent("\xC0\<\<".dup.force_encoding("UTF-8")))
-  end
-
-  def test_cgi_escapeURIComponent_preserve_encoding
-    assert_equal(Encoding::US_ASCII, CGI.escapeURIComponent("\xC0\<\<".dup.force_encoding("US-ASCII")).encoding)
-    assert_equal(Encoding::ASCII_8BIT, CGI.escapeURIComponent("\xC0\<\<".dup.force_encoding("ASCII-8BIT")).encoding)
-    assert_equal(Encoding::UTF_8, CGI.escapeURIComponent("\xC0\<\<".dup.force_encoding("UTF-8")).encoding)
-  end
-
-  def test_cgi_unescapeURIComponent
-    str = CGI.unescapeURIComponent('%26%3C%3E%22%20%E3%82%86%E3%82%93%E3%82%86%E3%82%93')
-    assert_equal(@str1, str)
-    return unless defined?(::Encoding)
-
-    assert_equal("foo+bar", CGI.unescapeURIComponent("foo+bar"))
-
-    assert_equal(@str1.encoding, str.encoding)
-    assert_equal("\u{30E1 30E2 30EA 691C 7D22}", CGI.unescapeURIComponent("\u{30E1 30E2 30EA}%E6%A4%9C%E7%B4%A2"))
-  end
-
-  def test_cgi_unescapeURIComponent_preserve_encoding
-    assert_equal(Encoding::US_ASCII, CGI.unescapeURIComponent("%C0%3C%3C".dup.force_encoding("US-ASCII")).encoding)
-    assert_equal(Encoding::ASCII_8BIT, CGI.unescapeURIComponent("%C0%3C%3C".dup.force_encoding("ASCII-8BIT")).encoding)
-    assert_equal(Encoding::UTF_8, CGI.unescapeURIComponent("%C0%3C%3C".dup.force_encoding("UTF-8")).encoding)
-  end
-
-  def test_cgi_unescapeURIComponent_accept_charset
-    return unless defined?(::Encoding)
-
-    assert_raise(TypeError) {CGI.unescapeURIComponent('', nil)}
-    assert_separately(%w[-rcgi/util], "#{<<-"begin;"}\n#{<<-"end;"}")
-    begin;
-      assert_equal("", CGI.unescapeURIComponent(''))
-    end;
-  end
-
-  def test_cgi_pretty
-    assert_equal("<HTML>\n  <BODY>\n  </BODY>\n</HTML>\n",CGI.pretty("<HTML><BODY></BODY></HTML>"))
-    assert_equal("<HTML>\n\t<BODY>\n\t</BODY>\n</HTML>\n",CGI.pretty("<HTML><BODY></BODY></HTML>","\t"))
-  end
-
-  def test_cgi_escapeHTML
-    assert_equal("&#39;&amp;&quot;&gt;&lt;", CGI.escapeHTML("'&\"><"))
-  end
-
-  def test_cgi_escape_html_duplicated
-    orig = "Ruby".dup.force_encoding("US-ASCII")
-    str = CGI.escapeHTML(orig)
-    assert_equal(orig, str)
-    assert_not_same(orig, str)
-  end
-
-  def assert_cgi_escape_html_preserve_encoding(str, encoding)
-    assert_equal(encoding, CGI.escapeHTML(str.dup.force_encoding(encoding)).encoding)
-  end
-
-  def test_cgi_escape_html_preserve_encoding
-    Encoding.list do |enc|
-      assert_cgi_escape_html_preserve_encoding("'&\"><", enc)
-      assert_cgi_escape_html_preserve_encoding("Ruby", enc)
-    end
-  end
-
-  def test_cgi_escape_html_dont_freeze
-    assert_not_predicate CGI.escapeHTML("'&\"><".dup),    :frozen?
-    assert_not_predicate CGI.escapeHTML("'&\"><".freeze), :frozen?
-    assert_not_predicate CGI.escapeHTML("Ruby".dup),      :frozen?
-    assert_not_predicate CGI.escapeHTML("Ruby".freeze),   :frozen?
-  end
-
-  def test_cgi_escape_html_large
-    return if RUBY_ENGINE == 'jruby'
-    ulong_max, size_max = RbConfig::LIMITS.values_at("ULONG_MAX", "SIZE_MAX")
-    return unless ulong_max < size_max # Platforms not concerned
-
-    size = (ulong_max / 6 + 1)
-    begin
-      str = '"' * size
-      escaped = CGI.escapeHTML(str)
-    rescue NoMemoryError
-      omit "Not enough memory"
-    rescue => e
-    end
-    assert_raise_with_message(ArgumentError, /overflow/, ->{"length = #{escaped.length}"}) do
-      raise e if e
-    end
-  end
-
-  def test_cgi_unescapeHTML
-    assert_equal("'&\"><", CGI.unescapeHTML("&#39;&amp;&quot;&gt;&lt;"))
-  end
-
-  def test_cgi_unescapeHTML_invalid
-    assert_equal('&<&amp>&quot&abcdefghijklmn', CGI.unescapeHTML('&&lt;&amp&gt;&quot&abcdefghijklmn'))
-  end
-
-  Encoding.list.each do |enc|
-    begin
-      escaped = "&#39;&amp;&quot;&gt;&lt;".encode(enc)
-      unescaped = "'&\"><".encode(enc)
-    rescue Encoding::ConverterNotFoundError
-      next
-    else
-      define_method("test_cgi_escapeHTML:#{enc.name}") do
-        assert_equal(escaped, CGI.escapeHTML(unescaped))
-      end
-      define_method("test_cgi_unescapeHTML:#{enc.name}") do
-        assert_equal(unescaped, CGI.unescapeHTML(escaped))
-      end
-    end
-  end
-
-  Encoding.list.each do |enc|
-    next unless enc.ascii_compatible?
-    begin
-      escaped = "%25+%2B"
-      unescaped = "% +".encode(enc)
-    rescue Encoding::ConverterNotFoundError
-      next
-    else
-      define_method("test_cgi_escape:#{enc.name}") do
-        assert_equal(escaped, CGI.escape(unescaped))
-      end
-      define_method("test_cgi_unescape:#{enc.name}") do
-        assert_equal(unescaped, CGI.unescape(escaped, enc))
-      end
-    end
-  end
-
-  def test_cgi_unescapeHTML_uppercasecharacter
-    assert_equal("\xE3\x81\x82\xE3\x81\x84\xE3\x81\x86", CGI.unescapeHTML("&#x3042;&#x3044;&#X3046;"))
-  end
-
-  def test_cgi_include_escape
-    assert_equal('%26%3C%3E%22+%E3%82%86%E3%82%93%E3%82%86%E3%82%93', escape(@str1))
-  end
-
-  def test_cgi_include_escapeHTML
-    assert_equal("&#39;&amp;&quot;&gt;&lt;", escapeHTML("'&\"><"))
-  end
-
-  def test_cgi_include_h
-    assert_equal("&#39;&amp;&quot;&gt;&lt;", h("'&\"><"))
-  end
-
-  def test_cgi_include_unescape
-    str = unescape('%26%3C%3E%22+%E3%82%86%E3%82%93%E3%82%86%E3%82%93')
-    assert_equal(@str1, str)
-    return unless defined?(::Encoding)
-
-    assert_equal(@str1.encoding, str.encoding)
-    assert_equal("\u{30E1 30E2 30EA 691C 7D22}", unescape("\u{30E1 30E2 30EA}%E6%A4%9C%E7%B4%A2"))
-  end
-
-  def test_cgi_include_unescapeHTML
-    assert_equal("'&\"><", unescapeHTML("&#39;&amp;&quot;&gt;&lt;"))
-  end
-
-  def test_cgi_escapeElement
-    assert_equal("<BR>&lt;A HREF=&quot;url&quot;&gt;&lt;/A&gt;", escapeElement('<BR><A HREF="url"></A>', "A", "IMG"))
-    assert_equal("<BR>&lt;A HREF=&quot;url&quot;&gt;&lt;/A&gt;", escapeElement('<BR><A HREF="url"></A>', ["A", "IMG"]))
-    assert_equal("<BR>&lt;A HREF=&quot;url&quot;&gt;&lt;/A&gt;", escape_element('<BR><A HREF="url"></A>', "A", "IMG"))
-    assert_equal("<BR>&lt;A HREF=&quot;url&quot;&gt;&lt;/A&gt;", escape_element('<BR><A HREF="url"></A>', ["A", "IMG"]))
-  end
-
-
-  def test_cgi_unescapeElement
-    assert_equal('&lt;BR&gt;<A HREF="url"></A>', unescapeElement(escapeHTML('<BR><A HREF="url"></A>'), "A", "IMG"))
-    assert_equal('&lt;BR&gt;<A HREF="url"></A>', unescapeElement(escapeHTML('<BR><A HREF="url"></A>'), ["A", "IMG"]))
-    assert_equal('&lt;BR&gt;<A HREF="url"></A>', unescape_element(escapeHTML('<BR><A HREF="url"></A>'), "A", "IMG"))
-    assert_equal('&lt;BR&gt;<A HREF="url"></A>', unescape_element(escapeHTML('<BR><A HREF="url"></A>'), ["A", "IMG"]))
-  end
-end
-
-class CGIUtilPureRubyTest < Test::Unit::TestCase
-  def setup
-    CGI::Escape.module_eval do
-      alias _escapeHTML escapeHTML
-      remove_method :escapeHTML
-      alias _unescapeHTML unescapeHTML
-      remove_method :unescapeHTML
-    end if defined?(CGI::Escape)
-  end
-
-  def teardown
-    CGI::Escape.module_eval do
-      alias escapeHTML _escapeHTML
-      remove_method :_escapeHTML
-      alias unescapeHTML _unescapeHTML
-      remove_method :_unescapeHTML
-    end if defined?(CGI::Escape)
-  end
-
-  def test_cgi_escapeHTML_with_invalid_byte_sequence
-    assert_equal("&lt;\xA4??&gt;", CGI.escapeHTML(%[<\xA4??>]))
-  end
-
-  def test_cgi_unescapeHTML_with_invalid_byte_sequence
-    input = "\xFF&"
-    assert_equal(input, CGI.unescapeHTML(input))
-  end
-end
diff --git a/test/cgi/testdata/file1.html b/test/cgi/testdata/file1.html
deleted file mode 100644
index 2ceaf6bc39364b..00000000000000
--- a/test/cgi/testdata/file1.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-  <head>
-    <title>ムスカ大佐のひとりごと</title>
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF8">
-  </head>
-  <body>
-    <p>バカどもにはちょうどいい目くらましだ。</p>
-  </body>
-</html>
diff --git a/test/cgi/testdata/large.png b/test/cgi/testdata/large.png
deleted file mode 100644
index d716396fa3ed72..00000000000000
Binary files a/test/cgi/testdata/large.png and /dev/null differ
diff --git a/test/cgi/testdata/small.png b/test/cgi/testdata/small.png
deleted file mode 100644
index 753d58e3cbbf04..00000000000000
Binary files a/test/cgi/testdata/small.png and /dev/null differ
diff --git a/test/coverage/test_coverage.rb b/test/coverage/test_coverage.rb
index 6afef8ce1bc156..80f8930472af70 100644
--- a/test/coverage/test_coverage.rb
+++ b/test/coverage/test_coverage.rb
@@ -5,22 +5,33 @@
 require "envutil"
 
 class TestCoverage < Test::Unit::TestCase
+  # The command-line arguments that we will pass to the ruby subprocess invoked
+  # by assert_in_out_err. In general this is just requiring the coverage
+  # library, but if prism is enabled we want to additionally pass that option
+  # through.
+  ARGV = ["-rcoverage"]
+
+  if RUBY_ENGINE == "ruby" && RubyVM::InstructionSequence.compile('').to_a[4][:parser] == :prism
+    ARGV << "-W:no-experimental"
+    ARGV << "--parser=prism"
+  end
+
   def test_result_without_start
-    assert_in_out_err(%w[-rcoverage], <<-"end;", [], /coverage measurement is not enabled/)
+    assert_in_out_err(ARGV, <<-"end;", [], /coverage measurement is not enabled/)
       Coverage.result
       p :NG
     end;
   end
 
   def test_peek_result_without_start
-    assert_in_out_err(%w[-rcoverage], <<-"end;", [], /coverage measurement is not enabled/)
+    assert_in_out_err(ARGV, <<-"end;", [], /coverage measurement is not enabled/)
       Coverage.peek_result
       p :NG
     end;
   end
 
   def test_result_with_nothing
-    assert_in_out_err(%w[-rcoverage], <<-"end;", ["{}"], [])
+    assert_in_out_err(ARGV, <<-"end;", ["{}"], [])
       Coverage.start
       p Coverage.result
     end;
@@ -34,7 +45,7 @@ def test_coverage_in_main_script
   end
 
   def test_coverage_running?
-    assert_in_out_err(%w[-rcoverage], <<-"end;", ["false", "true", "true", "false"], [])
+    assert_in_out_err(ARGV, <<-"end;", ["false", "true", "true", "false"], [])
       p Coverage.running?
       Coverage.start
       p Coverage.running?
@@ -56,7 +67,7 @@ def coverage_test_snapshot
           EOS
         end
 
-        assert_in_out_err(%w[-rcoverage], <<-"end;", ["[1, 0, nil]", "[1, 1, nil]", "[1, 1, nil]"], [])
+        assert_in_out_err(ARGV, <<-"end;", ["[1, 0, nil]", "[1, 1, nil]", "[1, 1, nil]"], [])
           Coverage.start
           tmp = Dir.pwd
           require tmp + "/test.rb"
@@ -92,7 +103,7 @@ def coverage_test_restarting
         exp1 = { "#{tmp}/test.rb" => [1, 0, nil] }.inspect
         exp2 = {}.inspect
         exp3 = { "#{tmp}/test2.rb" => [1] }.inspect
-        assert_in_out_err(%w[-rcoverage], <<-"end;", [exp1, exp2, exp3], [])
+        assert_in_out_err(ARGV, <<-"end;", [exp1, exp2, exp3], [])
           Coverage.start
           tmp = Dir.pwd
           require tmp + "/test.rb"
@@ -124,7 +135,7 @@ def test_big_code
           f.puts "])"
         end
 
-        assert_in_out_err(%w[-rcoverage], <<-"end;", ["10003"], [])
+        assert_in_out_err(ARGV, <<-"end;", ["10003"], [])
           Coverage.start
           tmp = Dir.pwd
           require tmp + '/test.rb'
@@ -153,7 +164,7 @@ def test_eval
           f.puts 'end'
         end
 
-        assert_in_out_err(%w[-W0 -rcoverage], <<-"end;", ["[1, 1, 1, 400, nil, nil, nil, nil, nil, nil, nil]"], [], bug13305)
+        assert_in_out_err(["-W0", *ARGV], <<-"end;", ["[1, 1, 1, 400, nil, nil, nil, nil, nil, nil, nil]"], [], bug13305)
           Coverage.start(:all)
           tmp = Dir.pwd
           require tmp + '/test.rb'
@@ -165,7 +176,7 @@ def test_eval
   end
 
   def test_eval_coverage
-    assert_in_out_err(%w[-rcoverage], <<-"end;", ["[1, 1, 1, nil, 0, nil]"], [])
+    assert_in_out_err(ARGV, <<-"end;", ["[1, 1, 1, nil, 0, nil]"], [])
       Coverage.start(eval: true, lines: true)
 
       eval(<<-RUBY, TOPLEVEL_BINDING, "test.rb")
@@ -181,6 +192,23 @@ def test_eval_coverage
     end;
   end
 
+  def test_eval_negative_lineno
+    assert_in_out_err(ARGV, <<-"end;", ["[1, 1, 1]"], [])
+      Coverage.start(eval: true, lines: true)
+
+      eval(<<-RUBY, TOPLEVEL_BINDING, "test.rb", -2)
+      p # -2 # Not subject to measurement
+      p # -1 # Not subject to measurement
+      p #  0 # Not subject to measurement
+      p #  1 # Subject to measurement
+      p #  2 # Subject to measurement
+      p #  3 # Subject to measurement
+      RUBY
+
+      p Coverage.result["test.rb"][:lines]
+    end;
+  end
+
   def test_coverage_supported
     assert Coverage.supported?(:lines)
     assert Coverage.supported?(:oneshot_lines)
@@ -242,7 +270,7 @@ def assert_coverage(code, opt, stdout)
       Dir.chdir(tmp) {
         File.write("test.rb", code)
 
-        assert_in_out_err(%w[-W0 -rcoverage], <<-"end;", stdout, [])
+        assert_in_out_err(["-W0", *ARGV], <<-"end;", stdout, [])
           Coverage.start(#{ opt })
           tmp = Dir.pwd
           require tmp + '/test.rb'
@@ -452,6 +480,8 @@ def test_branch_coverage_for_safe_method_invocation
         [:"&.", 3, 7, 0, 7,  6] => {[:then,  4, 7, 0, 7,  6]=>0, [:else,  5, 7, 0, 7,  6]=>1},
         [:"&.", 6, 8, 0, 8, 10] => {[:then,  7, 8, 0, 8, 10]=>1, [:else,  8, 8, 0, 8, 10]=>0},
         [:"&.", 9, 9, 0, 9, 10] => {[:then, 10, 9, 0, 9, 10]=>0, [:else, 11, 9, 0, 9, 10]=>1},
+        [:"&.", 12, 10, 0, 10, 6] => {[:then, 13, 10, 0, 10, 6] => 0, [:else, 14, 10, 0, 10, 6] => 1},
+        [:"&.", 15, 11, 0, 11, 5] => {[:then, 16, 11, 0, 11, 5] => 0, [:else, 17, 11, 0, 11, 5] => 1},
       }
     }
     assert_coverage(<<~"end;", { branches: true }, result)
@@ -464,6 +494,8 @@ class Dummy; def foo; end; def foo=(x); end; end
       b&.foo
       c&.foo = 1
       d&.foo = 1
+      d&.(b)
+      d&.()
     end;
   end
 
@@ -638,11 +670,11 @@ def test_clear_with_lines
         end
 
         exp = [
-          "{:lines=>[1, 0, 0, nil, 0, nil, nil]}",
-          "{:lines=>[0, 1, 1, nil, 0, nil, nil]}",
-          "{:lines=>[0, 1, 0, nil, 1, nil, nil]}",
+          { lines: [1, 0, 0, nil, 0, nil, nil] }.inspect,
+          { lines: [0, 1, 1, nil, 0, nil, nil] }.inspect,
+          { lines: [0, 1, 0, nil, 1, nil, nil] }.inspect,
         ]
-        assert_in_out_err(%w[-rcoverage], <<-"end;", exp, [])
+        assert_in_out_err(ARGV, <<-"end;", exp, [])
           Coverage.start(lines: true)
           tmp = Dir.pwd
           f = tmp + "/test.rb"
@@ -671,12 +703,12 @@ def test_clear_with_branches
         end
 
         exp = [
-          "{:branches=>{[:if, 0, 2, 2, 6, 5]=>{[:then, 1, 3, 4, 3, 8]=>0, [:else, 2, 5, 4, 5, 12]=>0}}}",
-          "{:branches=>{[:if, 0, 2, 2, 6, 5]=>{[:then, 1, 3, 4, 3, 8]=>1, [:else, 2, 5, 4, 5, 12]=>0}}}",
-          "{:branches=>{[:if, 0, 2, 2, 6, 5]=>{[:then, 1, 3, 4, 3, 8]=>0, [:else, 2, 5, 4, 5, 12]=>1}}}",
-          "{:branches=>{[:if, 0, 2, 2, 6, 5]=>{[:then, 1, 3, 4, 3, 8]=>0, [:else, 2, 5, 4, 5, 12]=>1}}}",
+          { branches: { [:if, 0, 2, 2, 6, 5] => { [:then, 1, 3, 4, 3, 8] => 0, [:else, 2, 5, 4, 5, 12] => 0 } } }.inspect,
+          { branches: { [:if, 0, 2, 2, 6, 5] => { [:then, 1, 3, 4, 3, 8] => 1, [:else, 2, 5, 4, 5, 12] => 0 } } }.inspect,
+          { branches: { [:if, 0, 2, 2, 6, 5] => { [:then, 1, 3, 4, 3, 8] => 0, [:else, 2, 5, 4, 5, 12] => 1 } } }.inspect,
+          { branches: { [:if, 0, 2, 2, 6, 5] => { [:then, 1, 3, 4, 3, 8] => 0, [:else, 2, 5, 4, 5, 12] => 1 } } }.inspect,
         ]
-        assert_in_out_err(%w[-rcoverage], <<-"end;", exp, [])
+        assert_in_out_err(ARGV, <<-"end;", exp, [])
           Coverage.start(branches: true)
           tmp = Dir.pwd
           f = tmp + "/test.rb"
@@ -707,12 +739,12 @@ def test_clear_with_methods
         end
 
         exp = [
-          "{:methods=>{[Object, :foo, 1, 0, 7, 3]=>0}}",
-          "{:methods=>{[Object, :foo, 1, 0, 7, 3]=>1}}",
-          "{:methods=>{[Object, :foo, 1, 0, 7, 3]=>1}}",
-          "{:methods=>{[Object, :foo, 1, 0, 7, 3]=>1}}"
+          { methods: { [Object, :foo, 1, 0, 7, 3] => 0 } }.inspect,
+          { methods: { [Object, :foo, 1, 0, 7, 3] => 1 } }.inspect,
+          { methods: { [Object, :foo, 1, 0, 7, 3] => 1 } }.inspect,
+          { methods: { [Object, :foo, 1, 0, 7, 3] => 1 } }.inspect
         ]
-        assert_in_out_err(%w[-rcoverage], <<-"end;", exp, [])
+        assert_in_out_err(ARGV, <<-"end;", exp, [])
           Coverage.start(methods: true)
           tmp = Dir.pwd
           f = tmp + "/test.rb"
@@ -743,12 +775,12 @@ def test_clear_with_oneshot_lines
         end
 
         exp = [
-          "{:oneshot_lines=>[1]}",
-          "{:oneshot_lines=>[2, 3]}",
-          "{:oneshot_lines=>[5]}",
-          "{:oneshot_lines=>[]}",
+          { oneshot_lines: [1] }.inspect,
+          { oneshot_lines: [2, 3] }.inspect,
+          { oneshot_lines: [5] }.inspect,
+          { oneshot_lines: [] }.inspect,
         ]
-        assert_in_out_err(%w[-rcoverage], <<-"end;", exp, [])
+        assert_in_out_err(ARGV, <<-"end;", exp, [])
           Coverage.start(oneshot_lines: true)
           tmp = Dir.pwd
           f = tmp + "/test.rb"
@@ -848,9 +880,10 @@ def baz
           EOS
         end
 
-        cov1 = "[0, 0, nil, nil, 0, 1, nil, nil, 0, 0, nil]"
-        cov2 = "[0, 0, nil, nil, 0, 1, nil, nil, 0, 1, nil]"
-        assert_in_out_err(%w[-rcoverage], <<-"end;", [cov1, cov2], [])
+        assert_separately(%w[-rcoverage], "#{<<~"begin;"}\n#{<<~'end;'}")
+        begin;
+          cov1 = [0, 0, nil, nil, 0, 1, nil, nil, 0, 0, nil]
+          cov2 = [0, 0, nil, nil, 0, 1, nil, nil, 0, 1, nil]
           Coverage.setup
           tmp = Dir.pwd
           require tmp + "/test.rb"
@@ -859,15 +892,34 @@ def baz
           bar
           Coverage.suspend
           baz
-          p Coverage.peek_result[tmp + "/test.rb"]
+          assert_equal cov1, Coverage.peek_result[tmp + "/test.rb"]
           Coverage.resume
           baz
-          p Coverage.result[tmp + "/test.rb"]
+          assert_equal cov2, Coverage.result[tmp + "/test.rb"]
         end;
 
-        cov1 = "{:lines=>[0, 0, nil, nil, 0, 1, nil, nil, 0, 0, nil], :branches=>{}, :methods=>{[Object, :baz, 9, 12, 11, 15]=>0, [Object, :bar, 5, 12, 7, 15]=>1, [Object, :foo, 1, 12, 3, 15]=>0}}"
-        cov2 = "{:lines=>[0, 0, nil, nil, 0, 1, nil, nil, 0, 1, nil], :branches=>{}, :methods=>{[Object, :baz, 9, 12, 11, 15]=>1, [Object, :bar, 5, 12, 7, 15]=>1, [Object, :foo, 1, 12, 3, 15]=>0}}"
-        assert_in_out_err(%w[-rcoverage], <<-"end;", [cov1, cov2], [])
+        assert_separately(%w[-rcoverage], "#{<<~"begin;"}\n#{<<~'end;'}")
+        begin;
+          cov1 = {
+            lines: [0, 0, nil, nil, 0, 1, nil, nil, 0, 0, nil],
+            branches: {},
+            methods: {
+              [Object, :baz, 9, 12, 11, 15]=>0,
+              [Object, :bar, 5, 12, 7, 15]=>1,
+              [Object, :foo, 1, 12, 3, 15]=>0,
+            }
+          }
+
+          cov2 = {
+            lines: [0, 0, nil, nil, 0, 1, nil, nil, 0, 1, nil],
+            branches: {},
+            methods: {
+              [Object, :baz, 9, 12, 11, 15]=>1,
+              [Object, :bar, 5, 12, 7, 15]=>1,
+              [Object, :foo, 1, 12, 3, 15]=>0,
+            }
+          }
+
           Coverage.setup(:all)
           tmp = Dir.pwd
           require tmp + "/test.rb"
@@ -876,15 +928,16 @@ def baz
           bar
           Coverage.suspend
           baz
-          p Coverage.peek_result[tmp + "/test.rb"]
+          assert_equal cov1, Coverage.peek_result[tmp + "/test.rb"]
           Coverage.resume
           baz
-          p Coverage.result[tmp + "/test.rb"]
+          assert_equal cov2, Coverage.result[tmp + "/test.rb"]
         end;
 
-        cov1 = "{:oneshot_lines=>[6]}"
-        cov2 = "{:oneshot_lines=>[6, 10]}"
-        assert_in_out_err(%w[-rcoverage], <<-"end;", [cov1, cov2], [])
+        assert_separately(%w[-rcoverage], "#{<<~"begin;"}\n#{<<~'end;'}")
+        begin;
+          cov1 = {:oneshot_lines=>[6]}
+          cov2 = {:oneshot_lines=>[6, 10]}
           Coverage.setup(oneshot_lines: true)
           tmp = Dir.pwd
           require tmp + "/test.rb"
@@ -893,17 +946,17 @@ def baz
           bar
           Coverage.suspend
           baz
-          p Coverage.peek_result[tmp + "/test.rb"]
+          assert_equal cov1, Coverage.peek_result[tmp + "/test.rb"]
           Coverage.resume
           baz
-          p Coverage.result[tmp + "/test.rb"]
+          assert_equal cov2, Coverage.result[tmp + "/test.rb"]
         end;
       }
     }
   end
 
   def test_coverage_state
-    assert_in_out_err(%w[-rcoverage], <<-"end;", [":idle", ":running", ":running", ":idle"], [])
+    assert_in_out_err(ARGV, <<-"end;", [":idle", ":running", ":running", ":idle"], [])
       p Coverage.state
       Coverage.start
       p Coverage.state
@@ -913,7 +966,7 @@ def test_coverage_state
       p Coverage.state
     end;
 
-    assert_in_out_err(%w[-rcoverage], <<-"end;", [":idle", ":suspended", ":running", ":suspended", ":running", ":suspended", ":idle"], [])
+    assert_in_out_err(ARGV, <<-"end;", [":idle", ":suspended", ":running", ":suspended", ":running", ":suspended", ":idle"], [])
       p Coverage.state
       Coverage.setup
       p Coverage.state
@@ -931,14 +984,14 @@ def test_coverage_state
   end
 
   def test_result_without_resume
-    assert_in_out_err(%w[-rcoverage], <<-"end;", ["{}"], [])
+    assert_in_out_err(ARGV, <<-"end;", ["{}"], [])
       Coverage.setup
       p Coverage.result
     end;
   end
 
   def test_result_after_suspend
-    assert_in_out_err(%w[-rcoverage], <<-"end;", ["{}"], [])
+    assert_in_out_err(ARGV, <<-"end;", ["{}"], [])
       Coverage.start
       Coverage.suspend
       p Coverage.result
@@ -946,21 +999,21 @@ def test_result_after_suspend
   end
 
   def test_resume_without_setup
-    assert_in_out_err(%w[-rcoverage], <<-"end;", [], /coverage measurement is not set up yet/)
+    assert_in_out_err(ARGV, <<-"end;", [], /coverage measurement is not set up yet/)
       Coverage.resume
       p :NG
     end;
   end
 
   def test_suspend_without_setup
-    assert_in_out_err(%w[-rcoverage], <<-"end;", [], /coverage measurement is not running/)
+    assert_in_out_err(ARGV, <<-"end;", [], /coverage measurement is not running/)
       Coverage.suspend
       p :NG
     end;
   end
 
   def test_double_resume
-    assert_in_out_err(%w[-rcoverage], <<-"end;", [], /coverage measurement is already running/)
+    assert_in_out_err(ARGV, <<-"end;", [], /coverage measurement is already running/)
       Coverage.start
       Coverage.resume
       p :NG
@@ -968,7 +1021,7 @@ def test_double_resume
   end
 
   def test_double_suspend
-    assert_in_out_err(%w[-rcoverage], <<-"end;", [], /coverage measurement is not running/)
+    assert_in_out_err(ARGV, <<-"end;", [], /coverage measurement is not running/)
       Coverage.setup
       Coverage.suspend
       p :NG
diff --git a/test/csv/helper.rb b/test/csv/helper.rb
deleted file mode 100644
index ff3aa38b10290f..00000000000000
--- a/test/csv/helper.rb
+++ /dev/null
@@ -1,42 +0,0 @@
-require "tempfile"
-require "test/unit"
-
-require "csv"
-
-require_relative "../lib/with_different_ofs"
-
-module CSVHelper
-  def with_chunk_size(chunk_size)
-    chunk_size_keep = ENV["CSV_PARSER_SCANNER_TEST_CHUNK_SIZE"]
-    begin
-      ENV["CSV_PARSER_SCANNER_TEST_CHUNK_SIZE"] = chunk_size
-      yield
-    ensure
-      ENV["CSV_PARSER_SCANNER_TEST_CHUNK_SIZE"] = chunk_size_keep
-    end
-  end
-
-  def with_verbose(verbose)
-    original = $VERBOSE
-    begin
-      $VERBOSE = verbose
-      yield
-    ensure
-      $VERBOSE = original
-    end
-  end
-
-  def with_default_internal(encoding)
-    original = Encoding.default_internal
-    begin
-      with_verbose(false) do
-        Encoding.default_internal = encoding
-      end
-      yield
-    ensure
-      with_verbose(false) do
-        Encoding.default_internal = original
-      end
-    end
-  end
-end
diff --git a/test/csv/interface/test_delegation.rb b/test/csv/interface/test_delegation.rb
deleted file mode 100644
index 349257633bde05..00000000000000
--- a/test/csv/interface/test_delegation.rb
+++ /dev/null
@@ -1,47 +0,0 @@
-# frozen_string_literal: false
-
-require_relative "../helper"
-
-class TestCSVInterfaceDelegation < Test::Unit::TestCase
-  class TestStringIO < self
-    def setup
-      @csv = CSV.new("h1,h2")
-    end
-
-    def test_flock
-      assert_raise(NotImplementedError) do
-        @csv.flock(File::LOCK_EX)
-      end
-    end
-
-    def test_ioctl
-      assert_raise(NotImplementedError) do
-        @csv.ioctl(0)
-      end
-    end
-
-    def test_stat
-      assert_raise(NotImplementedError) do
-        @csv.stat
-      end
-    end
-
-    def test_to_i
-      assert_raise(NotImplementedError) do
-        @csv.to_i
-      end
-    end
-
-    def test_binmode?
-      assert_equal(false, @csv.binmode?)
-    end
-
-    def test_path
-      assert_equal(nil, @csv.path)
-    end
-
-    def test_to_io
-      assert_instance_of(StringIO, @csv.to_io)
-    end
-  end
-end
diff --git a/test/csv/interface/test_read.rb b/test/csv/interface/test_read.rb
deleted file mode 100644
index 001177036ab3c6..00000000000000
--- a/test/csv/interface/test_read.rb
+++ /dev/null
@@ -1,381 +0,0 @@
-# frozen_string_literal: false
-
-require_relative "../helper"
-
-class TestCSVInterfaceRead < Test::Unit::TestCase
-  extend DifferentOFS
-
-  def setup
-    super
-    @data = ""
-    @data << "1\t2\t3\r\n"
-    @data << "4\t5\r\n"
-    @input = Tempfile.new(["interface-read", ".csv"], binmode: true)
-    @input << @data
-    @input.rewind
-    @rows = [
-      ["1", "2", "3"],
-      ["4", "5"],
-    ]
-  end
-
-  def teardown
-    @input.close(true)
-    super
-  end
-
-  def test_foreach
-    rows = []
-    CSV.foreach(@input.path, col_sep: "\t", row_sep: "\r\n") do |row|
-      rows << row
-    end
-    assert_equal(@rows, rows)
-  end
-
-  if respond_to?(:ractor)
-    ractor
-    def test_foreach_in_ractor
-      ractor = Ractor.new(@input.path) do |path|
-        rows = []
-        CSV.foreach(path, col_sep: "\t", row_sep: "\r\n") do |row|
-          rows << row
-        end
-        rows
-      end
-      rows = [
-        ["1", "2", "3"],
-        ["4", "5"],
-      ]
-      assert_equal(rows, ractor.take)
-    end
-  end
-
-  def test_foreach_mode
-    rows = []
-    CSV.foreach(@input.path, "r", col_sep: "\t", row_sep: "\r\n") do |row|
-      rows << row
-    end
-    assert_equal(@rows, rows)
-  end
-
-  def test_foreach_enumerator
-    rows = CSV.foreach(@input.path, col_sep: "\t", row_sep: "\r\n").to_a
-    assert_equal(@rows, rows)
-  end
-
-  def test_closed?
-    csv = CSV.open(@input.path, "r+", col_sep: "\t", row_sep: "\r\n")
-    assert_not_predicate(csv, :closed?)
-    csv.close
-    assert_predicate(csv, :closed?)
-  end
-
-  def test_open_auto_close
-    csv = nil
-    CSV.open(@input.path) do |_csv|
-      csv = _csv
-    end
-    assert_predicate(csv, :closed?)
-  end
-
-  def test_open_closed
-    csv = nil
-    CSV.open(@input.path) do |_csv|
-      csv = _csv
-      csv.close
-    end
-    assert_predicate(csv, :closed?)
-  end
-
-  def test_open_block_return_value
-    return_value = CSV.open(@input.path) do
-      "Return value."
-    end
-    assert_equal("Return value.", return_value)
-  end
-
-  def test_open_encoding_valid
-    # U+1F600 GRINNING FACE
-    # U+1F601 GRINNING FACE WITH SMILING EYES
-    File.open(@input.path, "w") do |file|
-      file << "\u{1F600},\u{1F601}"
-    end
-    CSV.open(@input.path, encoding: "utf-8") do |csv|
-      assert_equal([["\u{1F600}", "\u{1F601}"]],
-                   csv.to_a)
-    end
-  end
-
-  def test_open_encoding_invalid
-    # U+1F600 GRINNING FACE
-    # U+1F601 GRINNING FACE WITH SMILING EYES
-    File.open(@input.path, "w") do |file|
-      file << "\u{1F600},\u{1F601}"
-    end
-    CSV.open(@input.path, encoding: "EUC-JP") do |csv|
-      error = assert_raise(CSV::MalformedCSVError) do
-        csv.shift
-      end
-      assert_equal("Invalid byte sequence in EUC-JP in line 1.",
-                   error.message)
-    end
-  end
-
-  def test_open_encoding_nonexistent
-    _output, error = capture_output do
-      CSV.open(@input.path, encoding: "nonexistent") do
-      end
-    end
-    assert_equal("path:0: warning: Unsupported encoding nonexistent ignored\n",
-                 error.gsub(/\A.+:\d+: /, "path:0: "))
-  end
-
-  def test_open_encoding_utf_8_with_bom
-    # U+FEFF ZERO WIDTH NO-BREAK SPACE, BOM
-    # U+1F600 GRINNING FACE
-    # U+1F601 GRINNING FACE WITH SMILING EYES
-    File.open(@input.path, "w") do |file|
-      file << "\u{FEFF}\u{1F600},\u{1F601}"
-    end
-    CSV.open(@input.path, encoding: "bom|utf-8") do |csv|
-      assert_equal([["\u{1F600}", "\u{1F601}"]],
-                   csv.to_a)
-    end
-  end
-
-  def test_open_invalid_byte_sequence_in_utf_8
-    CSV.open(@input.path, "w", encoding: Encoding::CP932) do |rows|
-      error = assert_raise(Encoding::InvalidByteSequenceError) do
-        rows << ["\x82\xa0"]
-      end
-      assert_equal('"\x82" on UTF-8',
-                   error.message)
-    end
-  end
-
-  def test_open_with_invalid_nil
-    CSV.open(@input.path, "w", encoding: Encoding::CP932, invalid: nil) do |rows|
-      error = assert_raise(Encoding::InvalidByteSequenceError) do
-        rows << ["\x82\xa0"]
-      end
-      assert_equal('"\x82" on UTF-8',
-                   error.message)
-    end
-  end
-
-  def test_open_with_invalid_replace
-    CSV.open(@input.path, "w", encoding: Encoding::CP932, invalid: :replace) do |rows|
-      rows << ["\x82\xa0".force_encoding(Encoding::UTF_8)]
-    end
-    CSV.open(@input.path, encoding: Encoding::CP932) do |csv|
-      assert_equal([["??"]],
-                   csv.to_a)
-    end
-  end
-
-  def test_open_with_invalid_replace_and_replace_string
-    CSV.open(@input.path, "w", encoding: Encoding::CP932, invalid: :replace, replace: "X") do |rows|
-      rows << ["\x82\xa0".force_encoding(Encoding::UTF_8)]
-    end
-    CSV.open(@input.path, encoding: Encoding::CP932) do |csv|
-      assert_equal([["XX"]],
-                   csv.to_a)
-    end
-  end
-
-  def test_open_with_undef_replace
-    # U+00B7 Middle Dot
-    CSV.open(@input.path, "w", encoding: Encoding::CP932, undef: :replace) do |rows|
-      rows << ["\u00B7"]
-    end
-    CSV.open(@input.path, encoding: Encoding::CP932) do |csv|
-      assert_equal([["?"]],
-                   csv.to_a)
-    end
-  end
-
-  def test_open_with_undef_replace_and_replace_string
-    # U+00B7 Middle Dot
-    CSV.open(@input.path, "w", encoding: Encoding::CP932, undef: :replace, replace: "X") do |rows|
-      rows << ["\u00B7"]
-    end
-    CSV.open(@input.path, encoding: Encoding::CP932) do |csv|
-      assert_equal([["X"]],
-                   csv.to_a)
-    end
-  end
-
-  def test_open_with_newline
-    CSV.open(@input.path, col_sep: "\t", universal_newline: true) do |csv|
-      assert_equal(@rows, csv.to_a)
-    end
-    File.binwrite(@input.path, "1,2,3\r\n" "4,5\n")
-    CSV.open(@input.path, newline: :universal) do |csv|
-      assert_equal(@rows, csv.to_a)
-    end
-  end
-
-  def test_parse
-    assert_equal(@rows,
-                 CSV.parse(@data, col_sep: "\t", row_sep: "\r\n"))
-  end
-
-  def test_parse_block
-    rows = []
-    CSV.parse(@data, col_sep: "\t", row_sep: "\r\n") do |row|
-      rows << row
-    end
-    assert_equal(@rows, rows)
-  end
-
-  def test_parse_enumerator
-    rows = CSV.parse(@data, col_sep: "\t", row_sep: "\r\n").to_a
-    assert_equal(@rows, rows)
-  end
-
-  def test_parse_headers_only
-    table = CSV.parse("a,b,c", headers: true)
-    assert_equal([
-                   ["a", "b", "c"],
-                   [],
-                 ],
-                 [
-                   table.headers,
-                   table.each.to_a,
-                 ])
-  end
-
-  def test_parse_line
-    assert_equal(["1", "2", "3"],
-                 CSV.parse_line("1;2;3", col_sep: ";"))
-  end
-
-  def test_parse_line_shortcut
-    assert_equal(["1", "2", "3"],
-                 "1;2;3".parse_csv(col_sep: ";"))
-  end
-
-  def test_parse_line_empty
-    assert_equal(nil, CSV.parse_line(""))  # to signal eof
-  end
-
-  def test_parse_line_empty_line
-    assert_equal([], CSV.parse_line("\n1,2,3"))
-  end
-
-  def test_read
-    assert_equal(@rows,
-                 CSV.read(@input.path, col_sep: "\t", row_sep: "\r\n"))
-  end
-
-  if respond_to?(:ractor)
-    ractor
-    def test_read_in_ractor
-      ractor = Ractor.new(@input.path) do |path|
-        CSV.read(path, col_sep: "\t", row_sep: "\r\n")
-      end
-      rows = [
-        ["1", "2", "3"],
-        ["4", "5"],
-      ]
-      assert_equal(rows, ractor.take)
-    end
-  end
-
-  def test_readlines
-    assert_equal(@rows,
-                 CSV.readlines(@input.path, col_sep: "\t", row_sep: "\r\n"))
-  end
-
-  def test_open_read
-    rows = CSV.open(@input.path, col_sep: "\t", row_sep: "\r\n") do |csv|
-      csv.read
-    end
-    assert_equal(@rows, rows)
-  end
-
-  def test_open_readlines
-    rows = CSV.open(@input.path, col_sep: "\t", row_sep: "\r\n") do |csv|
-      csv.readlines
-    end
-    assert_equal(@rows, rows)
-  end
-
-  def test_table
-    table = CSV.table(@input.path, col_sep: "\t", row_sep: "\r\n")
-    assert_equal(CSV::Table.new([
-                                  CSV::Row.new([:"1", :"2", :"3"], [4, 5, nil]),
-                                ]),
-                 table)
-  end
-
-  def test_shift  # aliased as gets() and readline()
-    CSV.open(@input.path, "rb+", col_sep: "\t", row_sep: "\r\n") do |csv|
-      rows = [
-        csv.shift,
-        csv.shift,
-        csv.shift,
-      ]
-      assert_equal(@rows + [nil],
-                   rows)
-    end
-  end
-
-  def test_enumerator
-    CSV.open(@input.path, col_sep: "\t", row_sep: "\r\n") do |csv|
-      assert_equal(@rows, csv.each.to_a)
-    end
-  end
-
-  def test_shift_and_each
-    CSV.open(@input.path, col_sep: "\t", row_sep: "\r\n") do |csv|
-      rows = []
-      rows << csv.shift
-      rows.concat(csv.each.to_a)
-      assert_equal(@rows, rows)
-    end
-  end
-
-  def test_each_twice
-    CSV.open(@input.path, col_sep: "\t", row_sep: "\r\n") do |csv|
-      assert_equal([
-                     @rows,
-                     [],
-                   ],
-                   [
-                     csv.each.to_a,
-                     csv.each.to_a,
-                   ])
-    end
-  end
-
-  def test_eof?
-    eofs = []
-    CSV.open(@input.path, col_sep: "\t", row_sep: "\r\n") do |csv|
-      eofs << csv.eof?
-      csv.shift
-      eofs << csv.eof?
-      csv.shift
-      eofs << csv.eof?
-    end
-    assert_equal([false, false, true],
-                 eofs)
-  end
-
-  def test_new_nil
-    assert_raise_with_message ArgumentError, "Cannot parse nil as CSV" do
-      CSV.new(nil)
-    end
-  end
-
-  def test_options_not_modified
-    options = {}.freeze
-    CSV.foreach(@input.path, **options)
-    CSV.open(@input.path, **options) {}
-    CSV.parse("", **options)
-    CSV.parse_line("", **options)
-    CSV.read(@input.path, **options)
-    CSV.readlines(@input.path, **options)
-    CSV.table(@input.path, **options)
-  end
-end
diff --git a/test/csv/interface/test_read_write.rb b/test/csv/interface/test_read_write.rb
deleted file mode 100644
index c371e9c5fcf2aa..00000000000000
--- a/test/csv/interface/test_read_write.rb
+++ /dev/null
@@ -1,124 +0,0 @@
-# frozen_string_literal: false
-
-require_relative "../helper"
-
-class TestCSVInterfaceReadWrite < Test::Unit::TestCase
-  extend DifferentOFS
-
-  def test_filter
-    input = <<-CSV.freeze
-1;2;3
-4;5
-    CSV
-    output = ""
-    CSV.filter(input, output,
-               in_col_sep: ";",
-               out_col_sep: ",",
-               converters: :all) do |row|
-      row.map! {|n| n * 2}
-      row << "Added\r"
-    end
-    assert_equal(<<-CSV, output)
-2,4,6,"Added\r"
-8,10,"Added\r"
-    CSV
-  end
-
-  def test_filter_headers_true
-    input = <<-CSV.freeze
-Name,Value
-foo,0
-bar,1
-baz,2
-    CSV
-    output = ""
-    CSV.filter(input, output, headers: true) do |row|
-      row[0] += "X"
-      row[1] = row[1].to_i + 1
-    end
-    assert_equal(<<-CSV, output)
-fooX,1
-barX,2
-bazX,3
-    CSV
-  end
-
-  def test_filter_headers_true_write_headers
-    input = <<-CSV.freeze
-Name,Value
-foo,0
-bar,1
-baz,2
-    CSV
-    output = ""
-    CSV.filter(input, output, headers: true, out_write_headers: true) do |row|
-      if row.is_a?(Array)
-        row[0] += "X"
-        row[1] += "Y"
-      else
-        row[0] += "X"
-        row[1] = row[1].to_i + 1
-      end
-    end
-    assert_equal(<<-CSV, output)
-NameX,ValueY
-fooX,1
-barX,2
-bazX,3
-    CSV
-  end
-
-  def test_filter_headers_array_write_headers
-    input = <<-CSV.freeze
-foo,0
-bar,1
-baz,2
-    CSV
-    output = ""
-    CSV.filter(input, output,
-               headers: ["Name", "Value"],
-               out_write_headers: true) do |row|
-      row[0] += "X"
-      row[1] = row[1].to_i + 1
-    end
-    assert_equal(<<-CSV, output)
-Name,Value
-fooX,1
-barX,2
-bazX,3
-    CSV
-  end
-
-  def test_instance_same
-    data = ""
-    assert_equal(CSV.instance(data, col_sep: ";").object_id,
-                 CSV.instance(data, col_sep: ";").object_id)
-  end
-
-  def test_instance_append
-    output = ""
-    CSV.instance(output, col_sep: ";") << ["a", "b", "c"]
-    assert_equal(<<-CSV, output)
-a;b;c
-    CSV
-    CSV.instance(output, col_sep: ";") << [1, 2, 3]
-    assert_equal(<<-CSV, output)
-a;b;c
-1;2;3
-    CSV
-  end
-
-  def test_instance_shortcut
-    assert_equal(CSV.instance,
-                 CSV {|csv| csv})
-  end
-
-  def test_instance_shortcut_with_io
-    io = StringIO.new
-    from_instance = CSV.instance(io, col_sep: ";") { |csv| csv << ["a", "b", "c"] }
-    from_shortcut = CSV(io, col_sep: ";") { |csv| csv << ["e", "f", "g"] }
-
-    assert_equal(from_instance, from_shortcut)
-    assert_equal(from_instance.string, "a;b;c\ne;f;g\n")
-  end
-end
diff --git a/test/csv/interface/test_write.rb b/test/csv/interface/test_write.rb
deleted file mode 100644
index 0cd39a7663a151..00000000000000
--- a/test/csv/interface/test_write.rb
+++ /dev/null
@@ -1,217 +0,0 @@
-# frozen_string_literal: false
-
-require_relative "../helper"
-
-class TestCSVInterfaceWrite < Test::Unit::TestCase
-  extend DifferentOFS
-
-  def setup
-    super
-    @output = Tempfile.new(["interface-write", ".csv"])
-  end
-
-  def teardown
-    @output.close(true)
-    super
-  end
-
-  def test_generate_default
-    csv_text = CSV.generate do |csv|
-      csv << [1, 2, 3] << [4, nil, 5]
-    end
-    assert_equal(<<-CSV, csv_text)
-1,2,3
-4,,5
-    CSV
-  end
-
-  if respond_to?(:ractor)
-    ractor
-    def test_generate_default_in_ractor
-      ractor = Ractor.new do
-        CSV.generate do |csv|
-          csv << [1, 2, 3] << [4, nil, 5]
-        end
-      end
-      assert_equal(<<-CSV, ractor.take)
-1,2,3
-4,,5
-      CSV
-    end
-  end
-
-  def test_generate_append
-    csv_text = <<-CSV
-1,2,3
-4,,5
-    CSV
-    CSV.generate(csv_text) do |csv|
-      csv << ["last", %Q{"row"}]
-    end
-    assert_equal(<<-CSV, csv_text)
-1,2,3
-4,,5
-last,"""row"""
-    CSV
-  end
-
-  def test_generate_no_new_line
-    csv_text = CSV.generate("test") do |csv|
-      csv << ["row"]
-    end
-    assert_equal(<<-CSV, csv_text)
-testrow
-    CSV
-  end
-
-  def test_generate_line_col_sep
-    line = CSV.generate_line(["1", "2", "3"], col_sep: ";")
-    assert_equal(<<-LINE, line)
-1;2;3
-    LINE
-  end
-
-  def test_generate_line_row_sep
-    line = CSV.generate_line(["1", "2"], row_sep: nil)
-    assert_equal(<<-LINE.chomp, line)
-1,2
-    LINE
-  end
-
-  def test_generate_line_shortcut
-    line = ["1", "2", "3"].to_csv(col_sep: ";")
-    assert_equal(<<-LINE, line)
-1;2;3
-    LINE
-  end
-
-  def test_generate_lines
-    lines = CSV.generate_lines([["foo", "bar"], [1, 2], [3, 4]])
-    assert_equal(<<-LINES, lines)
-foo,bar
-1,2
-3,4
-    LINES
-  end
-
-  def test_headers_detection
-    headers = ["a", "b", "c"]
-    CSV.open(@output.path, "w", headers: true) do |csv|
-      csv << headers
-      csv << ["1", "2", "3"]
-      assert_equal(headers, csv.headers)
-    end
-  end
-
-  def test_lineno
-    CSV.open(@output.path, "w") do |csv|
-      n_lines = 20
-      n_lines.times do
-        csv << ["a", "b", "c"]
-      end
-      assert_equal(n_lines, csv.lineno)
-    end
-  end
-
-  def test_append_row
-    CSV.open(@output.path, "wb") do |csv|
-      csv <<
-        CSV::Row.new([], ["1", "2", "3"]) <<
-        CSV::Row.new([], ["a", "b", "c"])
-    end
-    assert_equal(<<-CSV, File.read(@output.path, mode: "rb"))
-1,2,3
-a,b,c
-    CSV
-  end
-
-
-  if respond_to?(:ractor)
-    ractor
-    def test_append_row_in_ractor
-      ractor = Ractor.new(@output.path) do |path|
-        CSV.open(path, "wb") do |csv|
-          csv <<
-            CSV::Row.new([], ["1", "2", "3"]) <<
-            CSV::Row.new([], ["a", "b", "c"])
-        end
-      end
-      ractor.take
-      assert_equal(<<-CSV, File.read(@output.path, mode: "rb"))
-1,2,3
-a,b,c
-      CSV
-    end
-  end
-
-  def test_append_hash
-    CSV.open(@output.path, "wb", headers: true) do |csv|
-      csv << [:a, :b, :c]
-      csv << {a: 1, b: 2, c: 3}
-      csv << {a: 4, b: 5, c: 6}
-    end
-    assert_equal(<<-CSV, File.read(@output.path, mode: "rb"))
-a,b,c
-1,2,3
-4,5,6
-    CSV
-  end
-
-  def test_append_hash_headers_array
-    CSV.open(@output.path, "wb", headers: [:b, :a, :c]) do |csv|
-      csv << {a: 1, b: 2, c: 3}
-      csv << {a: 4, b: 5, c: 6}
-    end
-    assert_equal(<<-CSV, File.read(@output.path, mode: "rb"))
-2,1,3
-5,4,6
-    CSV
-  end
-
-  def test_append_hash_headers_string
-    CSV.open(@output.path, "wb", headers: "b|a|c", col_sep: "|") do |csv|
-      csv << {"a" => 1, "b" => 2, "c" => 3}
-      csv << {"a" => 4, "b" => 5, "c" => 6}
-    end
-    assert_equal(<<-CSV, File.read(@output.path, mode: "rb"))
-2|1|3
-5|4|6
-    CSV
-  end
-
-  def test_write_headers
-    CSV.open(@output.path,
-             "wb",
-             headers:       "b|a|c",
-             write_headers: true,
-             col_sep:       "|" ) do |csv|
-      csv << {"a" => 1, "b" => 2, "c" => 3}
-      csv << {"a" => 4, "b" => 5, "c" => 6}
-    end
-    assert_equal(<<-CSV, File.read(@output.path, mode: "rb"))
-b|a|c
-2|1|3
-5|4|6
-    CSV
-  end
-
-  def test_write_headers_empty
-    CSV.open(@output.path,
-             "wb",
-             headers:       "b|a|c",
-             write_headers: true,
-             col_sep:       "|" ) do |csv|
-    end
-    assert_equal(<<-CSV, File.read(@output.path, mode: "rb"))
-b|a|c
-    CSV
-  end
-
-  def test_options_not_modified
-    options = {}.freeze
-    CSV.generate(**options) {}
-    CSV.generate_line([], **options)
-    CSV.filter("", "", **options)
-    CSV.instance("", **options)
-  end
-end
diff --git a/test/csv/line_endings.gz b/test/csv/line_endings.gz
deleted file mode 100644
index 39e1729ee4ae69..00000000000000
Binary files a/test/csv/line_endings.gz and /dev/null differ
diff --git a/test/csv/parse/test_column_separator.rb b/test/csv/parse/test_column_separator.rb
deleted file mode 100644
index d6eaa7b6de41ad..00000000000000
--- a/test/csv/parse/test_column_separator.rb
+++ /dev/null
@@ -1,40 +0,0 @@
-# -*- coding: utf-8 -*-
-# frozen_string_literal: false
-
-require_relative "../helper"
-
-class TestCSVParseColumnSeparator < Test::Unit::TestCase
-  extend DifferentOFS
-
-  def test_comma
-    assert_equal([["a", "b", nil, "d"]],
-                 CSV.parse("a,b,,d", col_sep: ","))
-  end
-
-  def test_space
-    assert_equal([["a", "b", nil, "d"]],
-                 CSV.parse("a b  d", col_sep: " "))
-  end
-
-  def test_tab
-    assert_equal([["a", "b", nil, "d"]],
-                 CSV.parse("a\tb\t\td", col_sep: "\t"))
-  end
-
-  def test_multiple_characters_include_sub_separator
-    assert_equal([["a b", nil, "d"]],
-                 CSV.parse("a b    d", col_sep: "  "))
-  end
-
-  def test_multiple_characters_leading_empty_fields
-    data = <<-CSV
-<=><=>A<=>B<=>C
-1<=>2<=>3
-    CSV
-    assert_equal([
-                   [nil, nil, "A", "B", "C"],
-                   ["1", "2", "3"],
-                 ],
-                 CSV.parse(data, col_sep: "<=>"))
-  end
-end
diff --git a/test/csv/parse/test_convert.rb b/test/csv/parse/test_convert.rb
deleted file mode 100644
index c9195c71d9be3c..00000000000000
--- a/test/csv/parse/test_convert.rb
+++ /dev/null
@@ -1,165 +0,0 @@
-# -*- coding: utf-8 -*-
-# frozen_string_literal: false
-
-require_relative "../helper"
-
-class TestCSVParseConvert < Test::Unit::TestCase
-  extend DifferentOFS
-
-  def setup
-    super
-    @data   = "Numbers,:integer,1,:float,3.015"
-    @parser = CSV.new(@data)
-
-    @custom = lambda {|field| /\A:(\S.*?)\s*\Z/ =~ field ? $1.to_sym : field}
-
-    @time = Time.utc(2018, 12, 30, 6, 41, 29)
-    @windows_safe_time_data = @time.strftime("%a %b %d %H:%M:%S %Y")
-
-    @preserving_converter = lambda do |field, info|
-      f = field.encode(CSV::ConverterEncoding)
-      return f if info.quoted?
-      begin
-        Integer(f, 10)
-      rescue
-        f
-      end
-    end
-
-    @quoted_header_converter = lambda do |field, info|
-      f = field.encode(CSV::ConverterEncoding)
-      return f if info.quoted?
-      f.to_sym
-    end
-  end
-
-  def test_integer
-    @parser.convert(:integer)
-    assert_equal(["Numbers", ":integer", 1, ":float", "3.015"],
-                 @parser.shift)
-  end
-
-  def test_float
-    @parser.convert(:float)
-    assert_equal(["Numbers", ":integer", 1.0, ":float", 3.015],
-                 @parser.shift)
-  end
-
-  def test_float_integer
-    @parser.convert(:float)
-    @parser.convert(:integer)
-    assert_equal(["Numbers", ":integer", 1.0, ":float", 3.015],
-                 @parser.shift)
-  end
-
-  def test_integer_float
-    @parser.convert(:integer)
-    @parser.convert(:float)
-    assert_equal(["Numbers", ":integer", 1, ":float", 3.015],
-                 @parser.shift)
-  end
-
-  def test_numeric
-    @parser.convert(:numeric)
-    assert_equal(["Numbers", ":integer", 1, ":float", 3.015],
-                 @parser.shift)
-  end
-
-  def test_all
-    @data   << ",#{@windows_safe_time_data}"
-    @parser =  CSV.new(@data)
-    @parser.convert(:all)
-    assert_equal(["Numbers", ":integer", 1, ":float", 3.015, @time.to_datetime],
-                 @parser.shift)
-  end
-
-  def test_custom
-    @parser.convert do |field|
-      /\A:(\S.*?)\s*\Z/ =~ field ? $1.to_sym : field
-    end
-    assert_equal(["Numbers", :integer, "1", :float, "3.015"],
-                 @parser.shift)
-  end
-
-  def test_builtin_custom
-    @parser.convert(:numeric)
-    @parser.convert(&@custom)
-    assert_equal(["Numbers", :integer, 1, :float, 3.015],
-                 @parser.shift)
-  end
-
-  def test_custom_field_info_line
-    @parser.convert do |field, info|
-      assert_equal(1, info.line)
-      info.index == 4 ? Float(field).floor : field
-    end
-    assert_equal(["Numbers", ":integer", "1", ":float", 3],
-                 @parser.shift)
-  end
-
-  def test_custom_field_info_header
-    headers = ["one", "two", "three", "four", "five"]
-    @parser = CSV.new(@data, headers: headers)
-    @parser.convert do |field, info|
-      info.header == "three" ? Integer(field) * 100 : field
-    end
-    assert_equal(CSV::Row.new(headers,
-                              ["Numbers", ":integer", 100, ":float", "3.015"]),
-                 @parser.shift)
-  end
-
-  def test_custom_blank_field
-    converter = lambda {|field| field.nil?}
-    row = CSV.parse_line('nil,', converters: converter)
-    assert_equal([false, true], row)
-  end
-
-  def test_nil_value
-    assert_equal(["nil", "", "a"],
-                 CSV.parse_line(',"",a', nil_value: "nil"))
-  end
-
-  def test_empty_value
-    assert_equal([nil, "empty", "a"],
-                 CSV.parse_line(',"",a', empty_value: "empty"))
-  end
-
-  def test_quoted_parse_line
-    row = CSV.parse_line('1,"2",3', converters: @preserving_converter)
-    assert_equal([1, "2", 3], row)
-  end
-
-  def test_quoted_parse
-    expected = [["quoted", "unquoted"], ["109", 1], ["10A", 2]]
-    rows = CSV.parse(<<~CSV, converters: @preserving_converter)
-      "quoted",unquoted
-      "109",1
-      "10A",2
-    CSV
-    assert_equal(expected, rows)
-  end
-
-  def test_quoted_alternating_quote
-    row = CSV.parse_line('"1",2,"3"', converters: @preserving_converter)
-    assert_equal(['1', 2, '3'], row)
-  end
-
-  def test_quoted_parse_headers
-    expected = [["quoted", :unquoted], ["109", "1"], ["10A", "2"]]
-    table = CSV.parse(<<~CSV, headers: true, header_converters: @quoted_header_converter)
-      "quoted",unquoted
-      "109",1
-      "10A",2
-    CSV
-    assert_equal(expected, table.to_a)
-  end
-
-  def test_quoted_parse_with_string_headers
-    expected = [["quoted", :unquoted], %w[109 1], %w[10A 2]]
-    table = CSV.parse(<<~CSV, headers: '"quoted",unquoted', header_converters: @quoted_header_converter)
-      "109",1
-      "10A",2
-    CSV
-    assert_equal(expected, table.to_a)
-  end
-end
diff --git a/test/csv/parse/test_each.rb b/test/csv/parse/test_each.rb
deleted file mode 100644
index ce0b71d0581e25..00000000000000
--- a/test/csv/parse/test_each.rb
+++ /dev/null
@@ -1,23 +0,0 @@
-# -*- coding: utf-8 -*-
-# frozen_string_literal: false
-
-require_relative "../helper"
-
-class TestCSVParseEach < Test::Unit::TestCase
-  extend DifferentOFS
-
-  def test_twice
-    data = <<-CSV
-Ruby,2.6.0,script
-    CSV
-    csv = CSV.new(data)
-    assert_equal([
-                   [["Ruby", "2.6.0", "script"]],
-                   [],
-                 ],
-                 [
-                   csv.to_a,
-                   csv.to_a,
-                 ])
-  end
-end
diff --git a/test/csv/parse/test_general.rb b/test/csv/parse/test_general.rb
deleted file mode 100644
index a565ff2ef86e40..00000000000000
--- a/test/csv/parse/test_general.rb
+++ /dev/null
@@ -1,348 +0,0 @@
-# -*- coding: utf-8 -*-
-# frozen_string_literal: false
-
-require "timeout"
-
-require_relative "../helper"
-
-#
-# Following tests are my interpretation of the
-# {CSV RCF}[https://www.ietf.org/rfc/rfc4180.txt].  I only deviate from that
-# document in one place (intentionally) and that is to make the default row
-# separator <tt>$/</tt>.
-#
-class TestCSVParseGeneral < Test::Unit::TestCase
-  extend DifferentOFS
-
-  BIG_DATA = "123456789\n" * 512
-
-  def test_mastering_regex_example
-    ex = %Q{Ten Thousand,10000, 2710 ,,"10,000","It's ""10 Grand"", baby",10K}
-    assert_equal( [ "Ten Thousand", "10000", " 2710 ", nil, "10,000",
-                    "It's \"10 Grand\", baby", "10K" ],
-                  CSV.parse_line(ex) )
-  end
-
-  # Old Ruby 1.8 CSV library tests.
-  def test_std_lib_csv
-    [ ["\t", ["\t"]],
-      ["foo,\"\"\"\"\"\",baz", ["foo", "\"\"", "baz"]],
-      ["foo,\"\"\"bar\"\"\",baz", ["foo", "\"bar\"", "baz"]],
-      ["\"\"\"\n\",\"\"\"\n\"", ["\"\n", "\"\n"]],
-      ["foo,\"\r\n\",baz", ["foo", "\r\n", "baz"]],
-      ["\"\"", [""]],
-      ["foo,\"\"\"\",baz", ["foo", "\"", "baz"]],
-      ["foo,\"\r.\n\",baz", ["foo", "\r.\n", "baz"]],
-      ["foo,\"\r\",baz", ["foo", "\r", "baz"]],
-      ["foo,\"\",baz", ["foo", "", "baz"]],
-      ["\",\"", [","]],
-      ["foo", ["foo"]],
-      [",,", [nil, nil, nil]],
-      [",", [nil, nil]],
-      ["foo,\"\n\",baz", ["foo", "\n", "baz"]],
-      ["foo,,baz", ["foo", nil, "baz"]],
-      ["\"\"\"\r\",\"\"\"\r\"", ["\"\r", "\"\r"]],
-      ["\",\",\",\"", [",", ","]],
-      ["foo,bar,", ["foo", "bar", nil]],
-      [",foo,bar", [nil, "foo", "bar"]],
-      ["foo,bar", ["foo", "bar"]],
-      [";", [";"]],
-      ["\t,\t", ["\t", "\t"]],
-      ["foo,\"\r\n\r\",baz", ["foo", "\r\n\r", "baz"]],
-      ["foo,\"\r\n\n\",baz", ["foo", "\r\n\n", "baz"]],
-      ["foo,\"foo,bar\",baz", ["foo", "foo,bar", "baz"]],
-      [";,;", [";", ";"]] ].each do |csv_test|
-      assert_equal(csv_test.last, CSV.parse_line(csv_test.first))
-    end
-
-    [ ["foo,\"\"\"\"\"\",baz", ["foo", "\"\"", "baz"]],
-      ["foo,\"\"\"bar\"\"\",baz", ["foo", "\"bar\"", "baz"]],
-      ["foo,\"\r\n\",baz", ["foo", "\r\n", "baz"]],
-      ["\"\"", [""]],
-      ["foo,\"\"\"\",baz", ["foo", "\"", "baz"]],
-      ["foo,\"\r.\n\",baz", ["foo", "\r.\n", "baz"]],
-      ["foo,\"\r\",baz", ["foo", "\r", "baz"]],
-      ["foo,\"\",baz", ["foo", "", "baz"]],
-      ["foo", ["foo"]],
-      [",,", [nil, nil, nil]],
-      [",", [nil, nil]],
-      ["foo,\"\n\",baz", ["foo", "\n", "baz"]],
-      ["foo,,baz", ["foo", nil, "baz"]],
-      ["foo,bar", ["foo", "bar"]],
-      ["foo,\"\r\n\n\",baz", ["foo", "\r\n\n", "baz"]],
-      ["foo,\"foo,bar\",baz", ["foo", "foo,bar", "baz"]] ].each do |csv_test|
-      assert_equal(csv_test.last, CSV.parse_line(csv_test.first))
-    end
-  end
-
-  # From: [ruby-core:6496]
-  def test_aras_edge_cases
-    [ [%Q{a,b},               ["a", "b"]],
-      [%Q{a,"""b"""},         ["a", "\"b\""]],
-      [%Q{a,"""b"},           ["a", "\"b"]],
-      [%Q{a,"b"""},           ["a", "b\""]],
-      [%Q{a,"\nb"""},         ["a", "\nb\""]],
-      [%Q{a,"""\nb"},         ["a", "\"\nb"]],
-      [%Q{a,"""\nb\n"""},     ["a", "\"\nb\n\""]],
-      [%Q{a,"""\nb\n""",\nc}, ["a", "\"\nb\n\"", nil]],
-      [%Q{a,,,},              ["a", nil, nil, nil]],
-      [%Q{,},                 [nil, nil]],
-      [%Q{"",""},             ["", ""]],
-      [%Q{""""},              ["\""]],
-      [%Q{"""",""},           ["\"",""]],
-      [%Q{,""},               [nil,""]],
-      [%Q{,"\r"},             [nil,"\r"]],
-      [%Q{"\r\n,"},           ["\r\n,"]],
-      [%Q{"\r\n,",},          ["\r\n,", nil]] ].each do |edge_case|
-        assert_equal(edge_case.last, CSV.parse_line(edge_case.first))
-      end
-  end
-
-  def test_james_edge_cases
-    # A read at eof? should return nil.
-    assert_equal(nil, CSV.parse_line(""))
-    #
-    # With Ruby 1.8 CSV it's impossible to tell an empty line from a line
-    # containing a single +nil+ field.  The old CSV library returns
-    # <tt>[nil]</tt> in these cases, but <tt>Array.new</tt> makes more sense to
-    # me.
-    #
-    assert_equal(Array.new, CSV.parse_line("\n1,2,3\n"))
-  end
-
-  def test_rob_edge_cases
-    [ [%Q{"a\nb"},                         ["a\nb"]],
-      [%Q{"\n\n\n"},                       ["\n\n\n"]],
-      [%Q{a,"b\n\nc"},                     ['a', "b\n\nc"]],
-      [%Q{,"\r\n"},                        [nil,"\r\n"]],
-      [%Q{,"\r\n."},                       [nil,"\r\n."]],
-      [%Q{"a\na","one newline"},           ["a\na", 'one newline']],
-      [%Q{"a\n\na","two newlines"},        ["a\n\na", 'two newlines']],
-      [%Q{"a\r\na","one CRLF"},            ["a\r\na", 'one CRLF']],
-      [%Q{"a\r\n\r\na","two CRLFs"},       ["a\r\n\r\na", 'two CRLFs']],
-      [%Q{with blank,"start\n\nfinish"\n}, ['with blank', "start\n\nfinish"]],
-    ].each do |edge_case|
-      assert_equal(edge_case.last, CSV.parse_line(edge_case.first))
-    end
-  end
-
-  def test_non_regex_edge_cases
-    # An early version of the non-regex parser fails this test
-    [ [ "foo,\"foo,bar,baz,foo\",\"foo\"",
-        ["foo", "foo,bar,baz,foo", "foo"] ] ].each do |edge_case|
-      assert_equal(edge_case.last, CSV.parse_line(edge_case.first))
-    end
-
-    assert_raise(CSV::MalformedCSVError) do
-      CSV.parse_line("1,\"23\"4\"5\", 6")
-    end
-  end
-
-  def test_malformed_csv_cr_first_line
-    error = assert_raise(CSV::MalformedCSVError) do
-      CSV.parse_line("1,2\r,3", row_sep: "\n")
-    end
-    assert_equal("Unquoted fields do not allow new line <\"\\r\"> in line 1.",
-                 error.message)
-  end
-
-  def test_malformed_csv_cr_middle_line
-    csv = <<-CSV
-line,1,abc
-line,2,"def\nghi"
-
-line,4,some\rjunk
-line,5,jkl
-    CSV
-
-    error = assert_raise(CSV::MalformedCSVError) do
-      CSV.parse(csv)
-    end
-    assert_equal("Unquoted fields do not allow new line <\"\\r\"> in line 4.",
-                 error.message)
-  end
-
-  def test_malformed_csv_unclosed_quote
-    error = assert_raise(CSV::MalformedCSVError) do
-      CSV.parse_line('1,2,"3...')
-    end
-    assert_equal("Unclosed quoted field in line 1.",
-                 error.message)
-  end
-
-  def test_malformed_csv_illegal_quote_middle_line
-    csv = <<-CSV
-line,1,abc
-line,2,"def\nghi"
-
-line,4,8'10"
-line,5,jkl
-    CSV
-
-    error = assert_raise(CSV::MalformedCSVError) do
-      CSV.parse(csv)
-    end
-    assert_equal("Illegal quoting in line 4.",
-                 error.message)
-  end
-
-  def test_the_parse_fails_fast_when_it_can_for_unquoted_fields
-    assert_parse_errors_out('valid,fields,bad start"' + BIG_DATA)
-  end
-
-  def test_the_parse_fails_fast_when_it_can_for_unescaped_quotes
-    assert_parse_errors_out('valid,fields,"bad start"unescaped' + BIG_DATA)
-  end
-
-  def test_field_size_limit_controls_lookahead
-    assert_parse_errors_out( 'valid,fields,"' + BIG_DATA + '"',
-                             field_size_limit: 2048 )
-  end
-
-  def test_field_size_limit_max_allowed
-    column = "abcde"
-    assert_equal([[column]],
-                 CSV.parse("\"#{column}\"",
-                           field_size_limit: column.size + 1))
-  end
-
-  def test_field_size_limit_quote_simple
-    column = "abcde"
-    assert_parse_errors_out("\"#{column}\"",
-                            field_size_limit: column.size)
-  end
-
-  def test_field_size_limit_no_quote_implicitly
-    column = "abcde"
-    assert_parse_errors_out("#{column}",
-                            field_size_limit: column.size)
-  end
-
-  def test_field_size_limit_no_quote_explicitly
-    column = "abcde"
-    assert_parse_errors_out("#{column}",
-                            field_size_limit: column.size,
-                            quote_char: nil)
-  end
-
-  def test_field_size_limit_in_extended_column_not_exceeding
-    data = <<~DATA
-      "a","b"
-      "
-      2
-      ",""
-    DATA
-    assert_nothing_raised(CSV::MalformedCSVError) do
-      CSV.parse(data, field_size_limit: 4)
-    end
-  end
-
-  def test_field_size_limit_in_extended_column_exceeding
-    data = <<~DATA
-      "a","b"
-      "
-      2345
-      ",""
-    DATA
-    assert_parse_errors_out(data, field_size_limit: 5)
-  end
-
-  def test_max_field_size_controls_lookahead
-    assert_parse_errors_out( 'valid,fields,"' + BIG_DATA + '"',
-                             max_field_size: 2048 )
-  end
-
-  def test_max_field_size_max_allowed
-    column = "abcde"
-    assert_equal([[column]],
-                 CSV.parse("\"#{column}\"",
-                           max_field_size: column.size))
-  end
-
-  def test_max_field_size_quote_simple
-    column = "abcde"
-    assert_parse_errors_out("\"#{column}\"",
-                            max_field_size: column.size - 1)
-  end
-
-  def test_max_field_size_no_quote_implicitly
-    column = "abcde"
-    assert_parse_errors_out("#{column}",
-                            max_field_size: column.size - 1)
-  end
-
-  def test_max_field_size_no_quote_explicitly
-    column = "abcde"
-    assert_parse_errors_out("#{column}",
-                            max_field_size: column.size - 1,
-                            quote_char: nil)
-  end
-
-  def test_max_field_size_in_extended_column_not_exceeding
-    data = <<~DATA
-      "a","b"
-      "
-      2
-      ",""
-    DATA
-    assert_nothing_raised(CSV::MalformedCSVError) do
-      CSV.parse(data, max_field_size: 3)
-    end
-  end
-
-  def test_max_field_size_in_extended_column_exceeding
-    data = <<~DATA
-      "a","b"
-      "
-      2345
-      ",""
-    DATA
-    assert_parse_errors_out(data, max_field_size: 4)
-  end
-
-  def test_row_sep_auto_cr
-    assert_equal([["a"]], CSV.parse("a\r"))
-  end
-
-  def test_row_sep_auto_lf
-    assert_equal([["a"]], CSV.parse("a\n"))
-  end
-
-  def test_row_sep_auto_cr_lf
-    assert_equal([["a"]], CSV.parse("a\r\n"))
-  end
-
-  def test_seeked_string_io
-    input_with_bom = StringIO.new("\ufeffあ,い,う\r\na,b,c\r\n")
-    input_with_bom.read(3)
-    assert_equal([
-                   ["あ", "い", "う"],
-                   ["a", "b", "c"],
-                 ],
-                 CSV.new(input_with_bom).each.to_a)
-  end
-
-  private
-
-  {
-    "YJIT"=>1,              # for --yjit-call-threshold=1
-    "MJIT"=>5, "RJIT"=>5,   # for --jit-wait
-  }.any? do |jit, timeout|
-    if (RubyVM.const_defined?(jit) and
-        jit = RubyVM.const_get(jit) and
-        jit.respond_to?(:enabled?) and
-        jit.enabled?)
-      PARSE_ERROR_TIMEOUT = timeout
-    end
-  end
-  PARSE_ERROR_TIMEOUT ||= 0.2
-
-  def assert_parse_errors_out(data, timeout: PARSE_ERROR_TIMEOUT, **options)
-    assert_raise(CSV::MalformedCSVError) do
-      Timeout.timeout(timeout) do
-        CSV.parse(data, **options)
-        fail("Parse didn't error out")
-      end
-    end
-  end
-end
diff --git a/test/csv/parse/test_header.rb b/test/csv/parse/test_header.rb
deleted file mode 100644
index e8c3786d686319..00000000000000
--- a/test/csv/parse/test_header.rb
+++ /dev/null
@@ -1,342 +0,0 @@
-# -*- coding: utf-8 -*-
-# frozen_string_literal: false
-
-require_relative "../helper"
-
-class TestCSVHeaders < Test::Unit::TestCase
-  extend DifferentOFS
-
-  def setup
-    super
-    @data = <<-CSV
-first,second,third
-A,B,C
-1,2,3
-    CSV
-  end
-
-  def test_first_row
-    [:first_row, true].each do |setting|  # two names for the same setting
-      # activate headers
-      csv = nil
-      assert_nothing_raised(Exception) do
-        csv = CSV.parse(@data, headers: setting)
-      end
-
-      # first data row - skipping headers
-      row = csv[0]
-      assert_not_nil(row)
-      assert_instance_of(CSV::Row, row)
-      assert_equal([%w{first A}, %w{second B}, %w{third C}], row.to_a)
-
-      # second data row
-      row = csv[1]
-      assert_not_nil(row)
-      assert_instance_of(CSV::Row, row)
-      assert_equal([%w{first 1}, %w{second 2}, %w{third 3}], row.to_a)
-
-      # empty
-      assert_nil(csv[2])
-    end
-  end
-
-  def test_array_of_headers
-    # activate headers
-    csv = nil
-    assert_nothing_raised(Exception) do
-      csv = CSV.parse(@data, headers: [:my, :new, :headers])
-    end
-
-    # first data row - skipping headers
-    row = csv[0]
-    assert_not_nil(row)
-    assert_instance_of(CSV::Row, row)
-    assert_equal( [[:my, "first"], [:new, "second"], [:headers, "third"]],
-                  row.to_a )
-
-    # second data row
-    row = csv[1]
-    assert_not_nil(row)
-    assert_instance_of(CSV::Row, row)
-    assert_equal([[:my, "A"], [:new, "B"], [:headers, "C"]], row.to_a)
-
-    # third data row
-    row = csv[2]
-    assert_not_nil(row)
-    assert_instance_of(CSV::Row, row)
-    assert_equal([[:my, "1"], [:new, "2"], [:headers, "3"]], row.to_a)
-
-    # empty
-    assert_nil(csv[3])
-
-    # with return and convert
-    assert_nothing_raised(Exception) do
-      csv = CSV.parse( @data, headers:           [:my, :new, :headers],
-                              return_headers:    true,
-                              header_converters: lambda { |h| h.to_s } )
-    end
-    row = csv[0]
-    assert_not_nil(row)
-    assert_instance_of(CSV::Row, row)
-    assert_equal([["my", :my], ["new", :new], ["headers", :headers]], row.to_a)
-    assert_predicate(row, :header_row?)
-    assert_not_predicate(row, :field_row?)
-  end
-
-  def test_csv_header_string
-    # activate headers
-    csv = nil
-    assert_nothing_raised(Exception) do
-      csv = CSV.parse(@data, headers: "my,new,headers")
-    end
-
-    # first data row - skipping headers
-    row = csv[0]
-    assert_not_nil(row)
-    assert_instance_of(CSV::Row, row)
-    assert_equal([%w{my first}, %w{new second}, %w{headers third}], row.to_a)
-
-    # second data row
-    row = csv[1]
-    assert_not_nil(row)
-    assert_instance_of(CSV::Row, row)
-    assert_equal([%w{my A}, %w{new B}, %w{headers C}], row.to_a)
-
-    # third data row
-    row = csv[2]
-    assert_not_nil(row)
-    assert_instance_of(CSV::Row, row)
-    assert_equal([%w{my 1}, %w{new 2}, %w{headers 3}], row.to_a)
-
-    # empty
-    assert_nil(csv[3])
-
-    # with return and convert
-    assert_nothing_raised(Exception) do
-      csv = CSV.parse( @data, headers:           "my,new,headers",
-                              return_headers:    true,
-                              header_converters: :symbol )
-    end
-    row = csv[0]
-    assert_not_nil(row)
-    assert_instance_of(CSV::Row, row)
-    assert_equal([[:my, "my"], [:new, "new"], [:headers, "headers"]], row.to_a)
-    assert_predicate(row, :header_row?)
-    assert_not_predicate(row, :field_row?)
-  end
-
-  def test_csv_header_string_inherits_separators
-    # parse with custom col_sep
-    csv = nil
-    assert_nothing_raised(Exception) do
-      csv = CSV.parse( @data.tr(",", "|"), col_sep: "|",
-                                           headers: "my|new|headers" )
-    end
-
-    # verify headers were recognized
-    row = csv[0]
-    assert_not_nil(row)
-    assert_instance_of(CSV::Row, row)
-    assert_equal([%w{my first}, %w{new second}, %w{headers third}], row.to_a)
-  end
-
-  def test_return_headers
-    # activate headers and request they are returned
-    csv = nil
-    assert_nothing_raised(Exception) do
-      csv = CSV.parse(@data, headers: true, return_headers: true)
-    end
-
-    # header row
-    row = csv[0]
-    assert_not_nil(row)
-    assert_instance_of(CSV::Row, row)
-    assert_equal( [%w{first first}, %w{second second}, %w{third third}],
-                  row.to_a )
-    assert_predicate(row, :header_row?)
-    assert_not_predicate(row, :field_row?)
-
-    # first data row - skipping headers
-    row = csv[1]
-    assert_not_nil(row)
-    assert_instance_of(CSV::Row, row)
-    assert_equal([%w{first A}, %w{second B}, %w{third C}], row.to_a)
-    assert_not_predicate(row, :header_row?)
-    assert_predicate(row, :field_row?)
-
-    # second data row
-    row = csv[2]
-    assert_not_nil(row)
-    assert_instance_of(CSV::Row, row)
-    assert_equal([%w{first 1}, %w{second 2}, %w{third 3}], row.to_a)
-    assert_not_predicate(row, :header_row?)
-    assert_predicate(row, :field_row?)
-
-    # empty
-    assert_nil(csv[3])
-  end
-
-  def test_converters
-    # create test data where headers and fields look alike
-    data = <<-CSV
-1,2,3
-1,2,3
-    CSV
-
-    # normal converters do not affect headers
-    csv = CSV.parse( data, headers:        true,
-                           return_headers: true,
-                           converters:     :numeric )
-    assert_equal([%w{1 1}, %w{2 2}, %w{3 3}], csv[0].to_a)
-    assert_equal([["1", 1], ["2", 2], ["3", 3]], csv[1].to_a)
-    assert_nil(csv[2])
-
-    # header converters do affect headers (only)
-    assert_nothing_raised(Exception) do
-      csv = CSV.parse( data, headers:           true,
-                             return_headers:    true,
-                             converters:        :numeric,
-                             header_converters: :symbol )
-    end
-    assert_equal([[:"1", "1"], [:"2", "2"], [:"3", "3"]], csv[0].to_a)
-    assert_equal([[:"1", 1], [:"2", 2], [:"3", 3]], csv[1].to_a)
-    assert_nil(csv[2])
-  end
-
-  def test_builtin_downcase_converter
-    csv = CSV.parse( "One,TWO Three", headers:           true,
-                                      return_headers:    true,
-                                      header_converters: :downcase )
-    assert_equal(%w{one two\ three}, csv.headers)
-  end
-
-  def test_builtin_symbol_converter
-    # Note that the trailing space is intentional
-    csv = CSV.parse( "One,TWO Three ", headers:           true,
-                                       return_headers:    true,
-                                       header_converters: :symbol )
-    assert_equal([:one, :two_three], csv.headers)
-  end
-
-  def test_builtin_symbol_raw_converter
-    csv = CSV.parse( "a b,c d", headers:           true,
-                     return_headers:    true,
-                     header_converters: :symbol_raw )
-    assert_equal([:"a b", :"c d"], csv.headers)
-  end
-
-  def test_builtin_symbol_converter_with_punctuation
-    csv = CSV.parse( "One, Two & Three ($)", headers:           true,
-                                             return_headers:    true,
-                                             header_converters: :symbol )
-    assert_equal([:one, :two_three], csv.headers)
-  end
-
-  def test_builtin_converters_with_blank_header
-    csv = CSV.parse( "one,,three", headers:           true,
-                                   return_headers:    true,
-                                   header_converters: [:downcase, :symbol, :symbol_raw] )
-    assert_equal([:one, nil, :three], csv.headers)
-  end
-
-  def test_custom_converter
-    converter = lambda { |header| header.tr(" ", "_") }
-    csv       = CSV.parse( "One,TWO Three",
-                           headers:           true,
-                           return_headers:    true,
-                           header_converters: converter )
-    assert_equal(%w{One TWO_Three}, csv.headers)
-  end
-
-  def test_table_support
-    csv = nil
-    assert_nothing_raised(Exception) do
-      csv = CSV.parse(@data, headers: true)
-    end
-
-    assert_instance_of(CSV::Table, csv)
-  end
-
-  def test_skip_blanks
-    @data = <<-CSV
-
-
-A,B,C
-
-1,2,3
-
-
-
-    CSV
-
-    expected = [%w[1 2 3]]
-    CSV.parse(@data, headers: true, skip_blanks: true) do |row|
-      assert_equal(expected.shift, row.fields)
-    end
-
-    expected = [%w[A B C], %w[1 2 3]]
-    CSV.parse( @data,
-               headers:        true,
-               return_headers: true,
-               skip_blanks:    true ) do |row|
-      assert_equal(expected.shift, row.fields)
-    end
-  end
-
-  def test_headers_reader
-    # no headers
-    assert_nil(CSV.new(@data).headers)
-
-    # headers
-    csv = CSV.new(@data, headers: true)
-    assert_equal(true, csv.headers)                    # before headers are read
-    csv.shift                                          # set headers
-    assert_equal(%w[first second third], csv.headers)  # after headers are read
-  end
-
-  def test_blank_row
-    @data += "\n#{@data}"  # add a blank row
-
-    # ensure that everything returned is a Row object
-    CSV.parse(@data, headers: true) do |row|
-      assert_instance_of(CSV::Row, row)
-    end
-  end
-
-  def test_nil_row_header
-    @data = <<-CSV
-A
-
-1
-    CSV
-
-    csv = CSV.parse(@data, headers: true)
-
-    # ensure nil row creates Row object with headers
-    row = csv[0]
-    assert_equal([["A"], [nil]],
-                 [row.headers, row.fields])
-  end
-
-  def test_parse_empty
-    assert_equal(CSV::Table.new([]),
-                 CSV.parse("", headers: true))
-  end
-
-  def test_parse_empty_line
-    assert_equal(CSV::Table.new([]),
-                 CSV.parse("\n", headers: true))
-  end
-
-  def test_specified_empty
-    assert_equal(CSV::Table.new([],
-                                headers: ["header1"]),
-                 CSV.parse("", headers: ["header1"]))
-  end
-
-  def test_specified_empty_line
-    assert_equal(CSV::Table.new([CSV::Row.new(["header1"], [])],
-                                headers: ["header1"]),
-                 CSV.parse("\n", headers: ["header1"]))
-  end
-end
diff --git a/test/csv/parse/test_inputs_scanner.rb b/test/csv/parse/test_inputs_scanner.rb
deleted file mode 100644
index 81327c187ff81b..00000000000000
--- a/test/csv/parse/test_inputs_scanner.rb
+++ /dev/null
@@ -1,63 +0,0 @@
-require_relative "../helper"
-
-class TestCSVParseInputsScanner < Test::Unit::TestCase
-  include CSVHelper
-
-  def test_scan_keep_over_chunks_nested_back
-    input = CSV::Parser::UnoptimizedStringIO.new("abcdefghijklmnl")
-    scanner = CSV::Parser::InputsScanner.new([input],
-                                             Encoding::UTF_8,
-                                             nil,
-                                             chunk_size: 2)
-    scanner.keep_start
-    assert_equal("abc", scanner.scan_all(/[a-c]+/))
-    scanner.keep_start
-    assert_equal("def", scanner.scan_all(/[d-f]+/))
-    scanner.keep_back
-    scanner.keep_back
-    assert_equal("abcdefg", scanner.scan_all(/[a-g]+/))
-  end
-
-  def test_scan_keep_over_chunks_nested_drop_back
-    input = CSV::Parser::UnoptimizedStringIO.new("abcdefghijklmnl")
-    scanner = CSV::Parser::InputsScanner.new([input],
-                                             Encoding::UTF_8,
-                                             nil,
-                                             chunk_size: 3)
-    scanner.keep_start
-    assert_equal("ab", scanner.scan(/../))
-    scanner.keep_start
-    assert_equal("c", scanner.scan(/./))
-    assert_equal("d", scanner.scan(/./))
-    scanner.keep_drop
-    scanner.keep_back
-    assert_equal("abcdefg", scanner.scan_all(/[a-g]+/))
-  end
-
-  def test_each_line_keep_over_chunks_multibyte
-    input = CSV::Parser::UnoptimizedStringIO.new("ab\n\u{3000}a\n")
-    scanner = CSV::Parser::InputsScanner.new([input],
-                                             Encoding::UTF_8,
-                                             nil,
-                                             chunk_size: 1)
-    each_line = scanner.each_line("\n")
-    assert_equal("ab\n", each_line.next)
-    scanner.keep_start
-    assert_equal("\u{3000}a\n", each_line.next)
-    scanner.keep_back
-    assert_equal("\u{3000}a\n", scanner.scan_all(/[^,]+/))
-  end
-
-  def test_each_line_keep_over_chunks_fit_chunk_size
-    input = CSV::Parser::UnoptimizedStringIO.new("\na")
-    scanner = CSV::Parser::InputsScanner.new([input],
-                                             Encoding::UTF_8,
-                                             nil,
-                                             chunk_size: 1)
-    each_line = scanner.each_line("\n")
-    assert_equal("\n", each_line.next)
-    scanner.keep_start
-    assert_equal("a", each_line.next)
-    scanner.keep_back
-  end
-end
diff --git a/test/csv/parse/test_invalid.rb b/test/csv/parse/test_invalid.rb
deleted file mode 100644
index ddb59e2b9a0c45..00000000000000
--- a/test/csv/parse/test_invalid.rb
+++ /dev/null
@@ -1,52 +0,0 @@
-# -*- coding: utf-8 -*-
-# frozen_string_literal: false
-
-require_relative "../helper"
-
-class TestCSVParseInvalid < Test::Unit::TestCase
-  def test_no_column_mixed_new_lines
-    error = assert_raise(CSV::MalformedCSVError) do
-      CSV.parse("\n" +
-                "\r")
-    end
-    assert_equal("New line must be <\"\\n\"> not <\"\\r\"> in line 2.",
-                 error.message)
-  end
-
-  def test_ignore_invalid_line
-    csv = CSV.new(<<-CSV, headers: true, return_headers: true)
-head1,head2,head3
-aaa,bbb,ccc
-ddd,ee"e.fff
-ggg,hhh,iii
-    CSV
-    headers = ["head1", "head2", "head3"]
-    assert_equal(CSV::Row.new(headers, headers),
-                 csv.shift)
-    assert_equal(CSV::Row.new(headers, ["aaa", "bbb", "ccc"]),
-                 csv.shift)
-    assert_equal(false, csv.eof?)
-    error = assert_raise(CSV::MalformedCSVError) do
-      csv.shift
-    end
-    assert_equal("Illegal quoting in line 3.",
-                 error.message)
-    assert_equal(false, csv.eof?)
-    assert_equal(CSV::Row.new(headers, ["ggg", "hhh", "iii"]),
-                 csv.shift)
-    assert_equal(true, csv.eof?)
-  end
-
-  def test_ignore_invalid_line_cr_lf
-    data = <<-CSV
-"1","OK"\r
-"2",""NOT" OK"\r
-"3","OK"\r
-CSV
-    csv = CSV.new(data)
-
-    assert_equal(['1', 'OK'], csv.shift)
-    assert_raise(CSV::MalformedCSVError) { csv.shift }
-    assert_equal(['3', 'OK'], csv.shift)
-  end
-end
diff --git a/test/csv/parse/test_liberal_parsing.rb b/test/csv/parse/test_liberal_parsing.rb
deleted file mode 100644
index 5796d10828c0ea..00000000000000
--- a/test/csv/parse/test_liberal_parsing.rb
+++ /dev/null
@@ -1,171 +0,0 @@
-# -*- coding: utf-8 -*-
-# frozen_string_literal: false
-
-require_relative "../helper"
-
-class TestCSVParseLiberalParsing < Test::Unit::TestCase
-  extend DifferentOFS
-
-  def test_middle_quote_start
-    input = '"Johnson, Dwayne",Dwayne "The Rock" Johnson'
-    error = assert_raise(CSV::MalformedCSVError) do
-      CSV.parse_line(input)
-    end
-    assert_equal("Illegal quoting in line 1.",
-                 error.message)
-    assert_equal(["Johnson, Dwayne", 'Dwayne "The Rock" Johnson'],
-                 CSV.parse_line(input, liberal_parsing: true))
-  end
-
-  def test_middle_quote_end
-    input = '"quoted" field'
-    error = assert_raise(CSV::MalformedCSVError) do
-      CSV.parse_line(input)
-    end
-    assert_equal("Any value after quoted field isn't allowed in line 1.",
-                 error.message)
-    assert_equal(['"quoted" field'],
-                 CSV.parse_line(input, liberal_parsing: true))
-  end
-
-  def test_endline_after_quoted_field_end
-    csv = CSV.new("A\r\n\"B\"\nC\r\n", liberal_parsing: true)
-    assert_equal(["A"], csv.gets)
-    error = assert_raise(CSV::MalformedCSVError) do
-      csv.gets
-    end
-    assert_equal('Illegal end-of-line sequence outside of a quoted field <"\n"> in line 2.',
-                 error.message)
-    assert_equal(["C"], csv.gets)
-  end
-
-  def test_quote_after_column_separator
-    error = assert_raise(CSV::MalformedCSVError) do
-      CSV.parse_line('is,this "three," or four,fields', liberal_parsing: true)
-    end
-    assert_equal("Unclosed quoted field in line 1.",
-                 error.message)
-  end
-
-  def test_quote_before_column_separator
-    assert_equal(["is", 'this "three', ' or four"', "fields"],
-                 CSV.parse_line('is,this "three, or four",fields',
-                                liberal_parsing: true))
-  end
-
-  def test_backslash_quote
-    assert_equal([
-                   "1",
-                   "\"Hamlet says, \\\"Seems",
-                   "\\\" madam! Nay it is; I know not \\\"seems.\\\"\"",
-                 ],
-                 CSV.parse_line('1,' +
-                                '"Hamlet says, \"Seems,' +
-                                '\" madam! Nay it is; I know not \"seems.\""',
-                                liberal_parsing: true))
-  end
-
-  def test_space_quote
-    input = <<~CSV
-      Los Angeles,   34°03'N,    118°15'W
-      New York City, 40°42'46"N, 74°00'21"W
-      Paris,         48°51'24"N, 2°21'03"E
-    CSV
-    assert_equal(
-                 [
-                   ["Los Angeles", "   34°03'N", "    118°15'W"],
-                   ["New York City", " 40°42'46\"N", " 74°00'21\"W"],
-                   ["Paris", "         48°51'24\"N", " 2°21'03\"E"],
-                 ],
-                 CSV.parse(input, liberal_parsing: true))
-  end
-
-  def test_double_quote_outside_quote
-    data = %Q{a,""b""}
-    error = assert_raise(CSV::MalformedCSVError) do
-      CSV.parse(data)
-    end
-    assert_equal("Any value after quoted field isn't allowed in line 1.",
-                 error.message)
-    assert_equal([
-                   [["a", %Q{""b""}]],
-                   [["a", %Q{"b"}]],
-                 ],
-                 [
-                   CSV.parse(data, liberal_parsing: true),
-                   CSV.parse(data,
-                             liberal_parsing: {
-                               double_quote_outside_quote: true,
-                             }),
-                 ])
-  end
-
-  class TestBackslashQuote < Test::Unit::TestCase
-    extend ::DifferentOFS
-
-    def test_double_quote_outside_quote
-      data = %Q{a,""b""}
-      assert_equal([
-                     [["a", %Q{""b""}]],
-                     [["a", %Q{"b"}]],
-                   ],
-                   [
-                     CSV.parse(data,
-                               liberal_parsing: {
-                                 backslash_quote: true
-                               }),
-                     CSV.parse(data,
-                               liberal_parsing: {
-                                 backslash_quote: true,
-                                 double_quote_outside_quote: true
-                               }),
-                   ])
-    end
-
-    def test_unquoted_value
-      data = %q{\"\"a\"\"}
-      assert_equal([
-                     [[%q{\"\"a\"\"}]],
-                     [[%q{""a""}]],
-                   ],
-                   [
-                     CSV.parse(data, liberal_parsing: true),
-                     CSV.parse(data,
-                               liberal_parsing: {
-                                 backslash_quote: true
-                               }),
-                   ])
-    end
-
-    def test_unquoted_value_multiple_characters_col_sep
-      data = %q{a<\\"b<=>x}
-      assert_equal([[%Q{a<"b}, "x"]],
-                   CSV.parse(data,
-                             col_sep: "<=>",
-                             liberal_parsing: {
-                               backslash_quote: true
-                             }))
-    end
-
-    def test_quoted_value
-      data = %q{"\"\"a\"\""}
-      assert_equal([
-                     [[%q{"\"\"a\"\""}]],
-                     [[%q{""a""}]],
-                     [[%q{""a""}]],
-                   ],
-                   [
-                     CSV.parse(data, liberal_parsing: true),
-                     CSV.parse(data,
-                               liberal_parsing: {
-                                 backslash_quote: true
-                               }),
-                     CSV.parse(data,
-                               liberal_parsing: {
-                                 backslash_quote: true,
-                                 double_quote_outside_quote: true
-                               }),
-                   ])
-    end
-  end
-end
diff --git a/test/csv/parse/test_quote_char_nil.rb b/test/csv/parse/test_quote_char_nil.rb
deleted file mode 100644
index fc3b646759bffb..00000000000000
--- a/test/csv/parse/test_quote_char_nil.rb
+++ /dev/null
@@ -1,93 +0,0 @@
-# -*- coding: utf-8 -*-
-# frozen_string_literal: false
-
-require_relative "../helper"
-
-class TestCSVParseQuoteCharNil < Test::Unit::TestCase
-  extend DifferentOFS
-
-  def test_full
-    assert_equal(["a", "b"], CSV.parse_line(%Q{a,b}, quote_char: nil))
-  end
-
-  def test_end_with_nil
-    assert_equal(["a", nil, nil, nil], CSV.parse_line(%Q{a,,,}, quote_char: nil))
-  end
-
-  def test_nil_nil
-    assert_equal([nil, nil], CSV.parse_line(%Q{,}, quote_char: nil))
-  end
-
-  def test_unquoted_value_multiple_characters_col_sep
-    data = %q{a<b<=>x}
-    assert_equal([[%Q{a<b}, "x"]], CSV.parse(data, col_sep: "<=>", quote_char: nil))
-  end
-
-  def test_csv_header_string
-    data = <<~DATA
-      first,second,third
-      A,B,C
-      1,2,3
-    DATA
-    assert_equal(
-      CSV::Table.new([
-        CSV::Row.new(["my", "new", "headers"], ["first", "second", "third"]),
-        CSV::Row.new(["my", "new", "headers"], ["A", "B", "C"]),
-        CSV::Row.new(["my", "new", "headers"], ["1", "2", "3"])
-      ]),
-      CSV.parse(data, headers: "my,new,headers", quote_char: nil)
-    )
-  end
-
-  def test_comma
-    assert_equal([["a", "b", nil, "d"]],
-                 CSV.parse("a,b,,d", col_sep: ",", quote_char: nil))
-  end
-
-  def test_space
-    assert_equal([["a", "b", nil, "d"]],
-                 CSV.parse("a b  d", col_sep: " ", quote_char: nil))
-  end
-
-  def encode_array(array, encoding)
-    array.collect do |element|
-      element ? element.encode(encoding) : element
-    end
-  end
-
-  def test_space_no_ascii
-    encoding = Encoding::UTF_16LE
-    assert_equal([encode_array(["a", "b", nil, "d"], encoding)],
-                 CSV.parse("a b  d".encode(encoding),
-                           col_sep: " ".encode(encoding),
-                           quote_char: nil))
-  end
-
-  def test_multiple_space
-    assert_equal([["a b", nil, "d"]],
-                 CSV.parse("a b    d", col_sep: "  ", quote_char: nil))
-  end
-
-  def test_multiple_characters_leading_empty_fields
-    data = <<-CSV
-<=><=>A<=>B<=>C
-1<=>2<=>3
-    CSV
-    assert_equal([
-                   [nil, nil, "A", "B", "C"],
-                   ["1", "2", "3"],
-                 ],
-                 CSV.parse(data, col_sep: "<=>", quote_char: nil))
-  end
-
-  def test_line
-    lines = [
-      "abc,def\n",
-    ]
-    csv = CSV.new(lines.join(""), quote_char: nil)
-    lines.each do |line|
-      csv.shift
-      assert_equal(line, csv.line)
-    end
-  end
-end
diff --git a/test/csv/parse/test_read.rb b/test/csv/parse/test_read.rb
deleted file mode 100644
index ba6fe985a94d36..00000000000000
--- a/test/csv/parse/test_read.rb
+++ /dev/null
@@ -1,27 +0,0 @@
-# -*- coding: utf-8 -*-
-# frozen_string_literal: false
-
-require_relative "../helper"
-
-class TestCSVParseRead < Test::Unit::TestCase
-  extend DifferentOFS
-
-  def test_shift
-    data = <<-CSV
-1
-2
-3
-    CSV
-    csv = CSV.new(data)
-    assert_equal([
-                   ["1"],
-                   [["2"], ["3"]],
-                   nil,
-                 ],
-                 [
-                   csv.shift,
-                   csv.read,
-                   csv.shift,
-                 ])
-  end
-end
diff --git a/test/csv/parse/test_rewind.rb b/test/csv/parse/test_rewind.rb
deleted file mode 100644
index 0aa403b75628be..00000000000000
--- a/test/csv/parse/test_rewind.rb
+++ /dev/null
@@ -1,40 +0,0 @@
-# -*- coding: utf-8 -*-
-# frozen_string_literal: false
-
-require_relative "../helper"
-
-class TestCSVParseRewind < Test::Unit::TestCase
-  extend DifferentOFS
-
-  def parse(data, **options)
-    csv = CSV.new(data, **options)
-    records = csv.to_a
-    csv.rewind
-    [records, csv.to_a]
-  end
-
-  def test_default
-    data = <<-CSV
-Ruby,2.6.0,script
-    CSV
-    assert_equal([
-                   [["Ruby", "2.6.0", "script"]],
-                   [["Ruby", "2.6.0", "script"]],
-                 ],
-                 parse(data))
-  end
-
-  def test_have_headers
-    data = <<-CSV
-Language,Version,Type
-Ruby,2.6.0,script
-    CSV
-    assert_equal([
-                   [CSV::Row.new(["Language", "Version", "Type"],
-                                 ["Ruby", "2.6.0", "script"])],
-                   [CSV::Row.new(["Language", "Version", "Type"],
-                                 ["Ruby", "2.6.0", "script"])],
-                 ],
-                 parse(data, headers: true))
-  end
-end
diff --git a/test/csv/parse/test_row_separator.rb b/test/csv/parse/test_row_separator.rb
deleted file mode 100644
index 5fd8e751528f19..00000000000000
--- a/test/csv/parse/test_row_separator.rb
+++ /dev/null
@@ -1,16 +0,0 @@
-# -*- coding: utf-8 -*-
-# frozen_string_literal: false
-
-require_relative "../helper"
-
-class TestCSVParseRowSeparator < Test::Unit::TestCase
-  extend DifferentOFS
-  include CSVHelper
-
-  def test_multiple_characters
-    with_chunk_size("1") do
-      assert_equal([["a"], ["b"]],
-                   CSV.parse("a\r\nb\r\n", row_sep: "\r\n"))
-    end
-  end
-end
diff --git a/test/csv/parse/test_skip_lines.rb b/test/csv/parse/test_skip_lines.rb
deleted file mode 100644
index 2fea02eb041aa7..00000000000000
--- a/test/csv/parse/test_skip_lines.rb
+++ /dev/null
@@ -1,126 +0,0 @@
-# frozen_string_literal: false
-
-require_relative "../helper"
-
-class TestCSVParseSkipLines < Test::Unit::TestCase
-  extend DifferentOFS
-  include CSVHelper
-
-  def test_default
-    csv = CSV.new("a,b,c\n")
-    assert_nil(csv.skip_lines)
-  end
-
-  def test_regexp
-    csv = <<-CSV
-1
-#2
- #3
-4
-    CSV
-    assert_equal([
-                   ["1"],
-                   ["4"],
-                 ],
-                 CSV.parse(csv, :skip_lines => /\A\s*#/))
-  end
-
-  def test_regexp_quoted
-    csv = <<-CSV
-1
-#2
-"#3"
-4
-    CSV
-    assert_equal([
-                   ["1"],
-                   ["#3"],
-                   ["4"],
-                 ],
-                 CSV.parse(csv, :skip_lines => /\A\s*#/))
-  end
-
-  def test_string
-    csv = <<-CSV
-1
-.2
-3.
-4
-    CSV
-    assert_equal([
-                   ["1"],
-                   ["4"],
-                 ],
-                 CSV.parse(csv, :skip_lines => "."))
-  end
-
-  class RegexStub
-  end
-
-  def test_not_matchable
-    regex_stub = RegexStub.new
-    csv = CSV.new("1\n", :skip_lines => regex_stub)
-    error = assert_raise(ArgumentError) do
-      csv.shift
-    end
-    assert_equal(":skip_lines has to respond to #match: #{regex_stub.inspect}",
-                 error.message)
-  end
-
-  class Matchable
-    def initialize(pattern)
-      @pattern = pattern
-    end
-
-    def match(line)
-      @pattern.match(line)
-    end
-  end
-
-  def test_matchable
-    csv = <<-CSV
-1
-# 2
-3
-# 4
-    CSV
-    assert_equal([
-                   ["1"],
-                   ["3"],
-                 ],
-                 CSV.parse(csv, :skip_lines => Matchable.new(/\A#/)))
-  end
-
-  def test_multibyte_data
-    # U+3042 HIRAGANA LETTER A
-    # U+3044 HIRAGANA LETTER I
-    # U+3046 HIRAGANA LETTER U
-    value = "\u3042\u3044\u3046"
-    with_chunk_size("5") do
-      assert_equal([[value], [value]],
-                   CSV.parse("#{value}\n#{value}\n",
-                             :skip_lines => /\A#/))
-    end
-  end
-
-  def test_empty_line_and_liberal_parsing
-    assert_equal([["a", "b"]],
-                 CSV.parse("a,b\n",
-                           :liberal_parsing => true,
-                           :skip_lines => /^$/))
-  end
-
-  def test_crlf
-    assert_equal([["a", "b"]],
-                 CSV.parse("a,b\r\n,\r\n",
-                           :skip_lines => /^,+$/))
-  end
-
-  def test_crlf_strip_no_last_crlf
-    assert_equal([["a"], ["b"]],
-                 CSV.parse("a\r\nb",
-                           row_sep: "\r\n",
-                           skip_lines: /^ *$/,
-                           strip: true))
-  end
-end
diff --git a/test/csv/parse/test_strip.rb b/test/csv/parse/test_strip.rb
deleted file mode 100644
index c5e35209cc16f6..00000000000000
--- a/test/csv/parse/test_strip.rb
+++ /dev/null
@@ -1,112 +0,0 @@
-# -*- coding: utf-8 -*-
-# frozen_string_literal: false
-
-require_relative "../helper"
-
-class TestCSVParseStrip < Test::Unit::TestCase
-  extend DifferentOFS
-
-  def test_both
-    assert_equal(["a", "b"],
-                 CSV.parse_line(%Q{  a  ,  b  }, strip: true))
-  end
-
-  def test_left
-    assert_equal(["a", "b"],
-                 CSV.parse_line(%Q{  a,  b}, strip: true))
-  end
-
-  def test_right
-    assert_equal(["a", "b"],
-                 CSV.parse_line(%Q{a  ,b  }, strip: true))
-  end
-
-  def test_middle
-    assert_equal(["a b"],
-                 CSV.parse_line(%Q{a b}, strip: true))
-  end
-
-  def test_quoted
-    assert_equal(["  a  ", "  b  "],
-                 CSV.parse_line(%Q{"  a  ","  b  "}, strip: true))
-  end
-
-  def test_liberal_parsing
-    assert_equal(["  a  ", "b", "  c  ", "  d  "],
-                 CSV.parse_line(%Q{"  a  ",  b  ,  "  c  ","  d  "  },
-                                strip: true,
-                                liberal_parsing: true))
-  end
-
-  def test_string
-    assert_equal(["a", " b"],
-                 CSV.parse_line(%Q{  a  , " b"  },
-                                strip: " "))
-  end
-
-  def test_no_quote
-    assert_equal(["  a  ", "  b  "],
-                 CSV.parse_line(%Q{"  a  ",  b  },
-                                strip: %Q{"},
-                                quote_char: nil))
-  end
-
-  def test_do_not_strip_cr
-    assert_equal([
-                   ["a", "b "],
-                   ["a", "b "],
-                 ],
-                 CSV.parse(%Q{"a" ,"b " \r} +
-                           %Q{"a" ,"b " \r},
-                           strip: true))
-  end
-
-  def test_do_not_strip_lf
-    assert_equal([
-                   ["a", "b "],
-                   ["a", "b "],
-                 ],
-                 CSV.parse(%Q{"a" ,"b " \n} +
-                           %Q{"a" ,"b " \n},
-                           strip: true))
-  end
-
-  def test_do_not_strip_crlf
-    assert_equal([
-                   ["a", "b "],
-                   ["a", "b "],
-                 ],
-                 CSV.parse(%Q{"a" ,"b " \r\n} +
-                           %Q{"a" ,"b " \r\n},
-                           strip: true))
-  end
-
-  def test_col_sep_incompatible_true
-    message = "The provided strip (true) and " \
-              "col_sep (\\t) options are incompatible."
-    assert_raise_with_message(ArgumentError, message) do
-      CSV.parse_line(%Q{"a"\t"b"\n},
-                     col_sep: "\t",
-                     strip: true)
-    end
-  end
-
-  def test_col_sep_incompatible_string
-    message = "The provided strip (\\t) and " \
-              "col_sep (\\t) options are incompatible."
-    assert_raise_with_message(ArgumentError, message) do
-      CSV.parse_line(%Q{"a"\t"b"\n},
-                     col_sep: "\t",
-                     strip: "\t")
-    end
-  end
-
-  def test_col_sep_compatible_string
-    assert_equal(
-      ["a", "b"],
-      CSV.parse_line(%Q{\va\tb\v\n},
-                     col_sep: "\t",
-                     strip: "\v")
-    )
-  end
-end
diff --git a/test/csv/parse/test_unconverted_fields.rb b/test/csv/parse/test_unconverted_fields.rb
deleted file mode 100644
index 437124ebd3c3cd..00000000000000
--- a/test/csv/parse/test_unconverted_fields.rb
+++ /dev/null
@@ -1,117 +0,0 @@
-# -*- coding: utf-8 -*-
-# frozen_string_literal: false
-
-require_relative "../helper"
-
-class TestCSVParseUnconvertedFields < Test::Unit::TestCase
-  extend DifferentOFS
-
-  def setup
-    super
-    @custom = lambda {|field| /\A:(\S.*?)\s*\Z/ =~ field ? $1.to_sym : field}
-
-    @headers = ["first", "second", "third"]
-    @data = <<-CSV
-first,second,third
-1,2,3
-    CSV
-  end
-
-
-  def test_custom
-    row = CSV.parse_line("Numbers,:integer,1,:float,3.015",
-                         converters:         [:numeric, @custom],
-                         unconverted_fields: true)
-    assert_equal([
-                   ["Numbers", :integer, 1, :float, 3.015],
-                   ["Numbers", ":integer", "1", ":float", "3.015"],
-                 ],
-                 [
-                   row,
-                   row.unconverted_fields,
-                 ])
-  end
-
-  def test_no_fields
-    row = CSV.parse_line("\n",
-                         converters:         [:numeric, @custom],
-                         unconverted_fields: true)
-    assert_equal([
-                   [],
-                   [],
-                 ],
-                 [
-                   row,
-                   row.unconverted_fields,
-                 ])
-  end
-
-  def test_parsed_header
-    row = CSV.parse_line(@data,
-                         converters:         :numeric,
-                         unconverted_fields: true,
-                         headers:            :first_row)
-    assert_equal([
-                   CSV::Row.new(@headers,
-                                [1, 2, 3]),
-                   ["1", "2", "3"],
-                 ],
-                 [
-                   row,
-                   row.unconverted_fields,
-                 ])
-  end
-
-  def test_return_headers
-    row = CSV.parse_line(@data,
-                         converters:         :numeric,
-                         unconverted_fields: true,
-                         headers:            :first_row,
-                         return_headers:     true)
-    assert_equal([
-                   CSV::Row.new(@headers,
-                                @headers),
-                   @headers,
-                 ],
-                 [
-                   row,
-                   row.unconverted_fields,
-                 ])
-  end
-
-  def test_header_converters
-    row = CSV.parse_line(@data,
-                         converters:         :numeric,
-                         unconverted_fields: true,
-                         headers:            :first_row,
-                         return_headers:     true,
-                         header_converters:  :symbol)
-    assert_equal([
-                   CSV::Row.new(@headers.collect(&:to_sym),
-                                @headers),
-                   @headers,
-                 ],
-                 [
-                   row,
-                   row.unconverted_fields,
-                 ])
-  end
-
-  def test_specified_headers
-    row = CSV.parse_line("\n",
-                         converters:         :numeric,
-                         unconverted_fields: true,
-                         headers:            %w{my new headers},
-                         return_headers:     true,
-                         header_converters:  :symbol)
-    assert_equal([
-                   CSV::Row.new([:my, :new, :headers],
-                                ["my", "new", "headers"]),
-                   [],
-                 ],
-                 [
-                   row,
-                   row.unconverted_fields,
-                 ])
-  end
-end
diff --git a/test/csv/test_data_converters.rb b/test/csv/test_data_converters.rb
deleted file mode 100644
index c20a5d1f4bab46..00000000000000
--- a/test/csv/test_data_converters.rb
+++ /dev/null
@@ -1,190 +0,0 @@
-# -*- coding: utf-8 -*-
-# frozen_string_literal: false
-
-require_relative "helper"
-
-class TestCSVDataConverters < Test::Unit::TestCase
-  extend DifferentOFS
-
-  def setup
-    super
-    @win_safe_time_str = Time.now.strftime("%a %b %d %H:%M:%S %Y")
-  end
-
-  def test_builtin_integer_converter
-    # does convert
-    [-5, 1, 10000000000].each do |n|
-      assert_equal(n, CSV::Converters[:integer][n.to_s])
-    end
-
-    # does not convert
-    (%w{junk 1.0} + [""]).each do |str|
-      assert_equal(str, CSV::Converters[:integer][str])
-    end
-  end
-
-  def test_builtin_float_converter
-    # does convert
-    [-5.1234, 0, 2.3e-11].each do |n|
-      assert_equal(n, CSV::Converters[:float][n.to_s])
-    end
-
-    # does not convert
-    (%w{junk 1..0 .015F} + [""]).each do |str|
-      assert_equal(str, CSV::Converters[:float][str])
-    end
-  end
-
-  def test_builtin_date_converter
-    # does convert
-    assert_instance_of(
-      Date,
-      CSV::Converters[:date][@win_safe_time_str.sub(/\d+:\d+:\d+ /, "")]
-    )
-
-    # does not convert
-    assert_instance_of(String, CSV::Converters[:date]["junk"])
-  end
-
-  def test_builtin_date_time_converter
-    # does convert
-    assert_instance_of( DateTime,
-                        CSV::Converters[:date_time][@win_safe_time_str] )
-
-    # does not convert
-    assert_instance_of(String, CSV::Converters[:date_time]["junk"])
-  end
-
-  def test_builtin_date_time_converter_iso8601_date
-    iso8601_string = "2018-01-14"
-    datetime = DateTime.new(2018, 1, 14)
-    assert_equal(datetime,
-                 CSV::Converters[:date_time][iso8601_string])
-  end
-
-  def test_builtin_date_time_converter_iso8601_minute
-    iso8601_string = "2018-01-14T22:25"
-    datetime = DateTime.new(2018, 1, 14, 22, 25)
-    assert_equal(datetime,
-                 CSV::Converters[:date_time][iso8601_string])
-  end
-
-  def test_builtin_date_time_converter_iso8601_second
-    iso8601_string = "2018-01-14T22:25:19"
-    datetime = DateTime.new(2018, 1, 14, 22, 25, 19)
-    assert_equal(datetime,
-                 CSV::Converters[:date_time][iso8601_string])
-  end
-
-  def test_builtin_date_time_converter_iso8601_under_second
-    iso8601_string = "2018-01-14T22:25:19.1"
-    datetime = DateTime.new(2018, 1, 14, 22, 25, 19.1)
-    assert_equal(datetime,
-                 CSV::Converters[:date_time][iso8601_string])
-  end
-
-  def test_builtin_date_time_converter_iso8601_under_second_offset
-    iso8601_string = "2018-01-14T22:25:19.1+09:00"
-    datetime = DateTime.new(2018, 1, 14, 22, 25, 19.1, "+9")
-    assert_equal(datetime,
-                 CSV::Converters[:date_time][iso8601_string])
-  end
-
-  def test_builtin_date_time_converter_iso8601_offset
-    iso8601_string = "2018-01-14T22:25:19+09:00"
-    datetime = DateTime.new(2018, 1, 14, 22, 25, 19, "+9")
-    assert_equal(datetime,
-                 CSV::Converters[:date_time][iso8601_string])
-  end
-
-  def test_builtin_date_time_converter_iso8601_utc
-    iso8601_string = "2018-01-14T22:25:19Z"
-    datetime = DateTime.new(2018, 1, 14, 22, 25, 19)
-    assert_equal(datetime,
-                 CSV::Converters[:date_time][iso8601_string])
-  end
-
-  def test_builtin_date_time_converter_rfc3339_minute
-    rfc3339_string = "2018-01-14 22:25"
-    datetime = DateTime.new(2018, 1, 14, 22, 25)
-    assert_equal(datetime,
-                 CSV::Converters[:date_time][rfc3339_string])
-  end
-
-  def test_builtin_date_time_converter_rfc3339_second
-    rfc3339_string = "2018-01-14 22:25:19"
-    datetime = DateTime.new(2018, 1, 14, 22, 25, 19)
-    assert_equal(datetime,
-                 CSV::Converters[:date_time][rfc3339_string])
-  end
-
-  def test_builtin_date_time_converter_rfc3339_under_second
-    rfc3339_string = "2018-01-14 22:25:19.1"
-    datetime = DateTime.new(2018, 1, 14, 22, 25, 19.1)
-    assert_equal(datetime,
-                 CSV::Converters[:date_time][rfc3339_string])
-  end
-
-  def test_builtin_date_time_converter_rfc3339_under_second_offset
-    rfc3339_string = "2018-01-14 22:25:19.1+09:00"
-    datetime = DateTime.new(2018, 1, 14, 22, 25, 19.1, "+9")
-    assert_equal(datetime,
-                 CSV::Converters[:date_time][rfc3339_string])
-  end
-
-  def test_builtin_date_time_converter_rfc3339_offset
-    rfc3339_string = "2018-01-14 22:25:19+09:00"
-    datetime = DateTime.new(2018, 1, 14, 22, 25, 19, "+9")
-    assert_equal(datetime,
-                 CSV::Converters[:date_time][rfc3339_string])
-  end
-
-  def test_builtin_date_time_converter_rfc3339_utc
-    rfc3339_string = "2018-01-14 22:25:19Z"
-    datetime = DateTime.new(2018, 1, 14, 22, 25, 19)
-    assert_equal(datetime,
-                 CSV::Converters[:date_time][rfc3339_string])
-  end
-
-  def test_builtin_date_time_converter_rfc3339_tab_minute
-    rfc3339_string = "2018-01-14\t22:25"
-    datetime = DateTime.new(2018, 1, 14, 22, 25)
-    assert_equal(datetime,
-                 CSV::Converters[:date_time][rfc3339_string])
-  end
-
-  def test_builtin_date_time_converter_rfc3339_tab_second
-    rfc3339_string = "2018-01-14\t22:25:19"
-    datetime = DateTime.new(2018, 1, 14, 22, 25, 19)
-    assert_equal(datetime,
-                 CSV::Converters[:date_time][rfc3339_string])
-  end
-
-  def test_builtin_date_time_converter_rfc3339_tab_under_second
-    rfc3339_string = "2018-01-14\t22:25:19.1"
-    datetime = DateTime.new(2018, 1, 14, 22, 25, 19.1)
-    assert_equal(datetime,
-                 CSV::Converters[:date_time][rfc3339_string])
-  end
-
-  def test_builtin_date_time_converter_rfc3339_tab_under_second_offset
-    rfc3339_string = "2018-01-14\t22:25:19.1+09:00"
-    datetime = DateTime.new(2018, 1, 14, 22, 25, 19.1, "+9")
-    assert_equal(datetime,
-                 CSV::Converters[:date_time][rfc3339_string])
-  end
-
-  def test_builtin_date_time_converter_rfc3339_tab_offset
-    rfc3339_string = "2018-01-14\t22:25:19+09:00"
-    datetime = DateTime.new(2018, 1, 14, 22, 25, 19, "+9")
-    assert_equal(datetime,
-                 CSV::Converters[:date_time][rfc3339_string])
-  end
-
-  def test_builtin_date_time_converter_rfc3339_tab_utc
-    rfc3339_string = "2018-01-14\t22:25:19Z"
-    datetime = DateTime.new(2018, 1, 14, 22, 25, 19)
-    assert_equal(datetime,
-                 CSV::Converters[:date_time][rfc3339_string])
-  end
-end
diff --git a/test/csv/test_encodings.rb b/test/csv/test_encodings.rb
deleted file mode 100644
index 032569da7a354e..00000000000000
--- a/test/csv/test_encodings.rb
+++ /dev/null
@@ -1,403 +0,0 @@
-# -*- coding: utf-8 -*-
-# frozen_string_literal: false
-
-require_relative "helper"
-
-class TestCSVEncodings < Test::Unit::TestCase
-  extend DifferentOFS
-  include CSVHelper
-
-  def setup
-    super
-    require 'tempfile'
-    @temp_csv_file = Tempfile.new(%w"test_csv. .csv")
-    @temp_csv_path = @temp_csv_file.path
-    @temp_csv_file.close
-  end
-
-  def teardown
-    @temp_csv_file.close!
-    super
-  end
-
-  ########################################
-  ### Hand Test Some Popular Encodings ###
-  ########################################
-
-  def test_parses_utf8_encoding
-    assert_parses( [ %w[ one two … ],
-                     %w[ 1   …   3 ],
-                     %w[ …   5   6 ] ], "UTF-8" )
-  end
-
-  def test_parses_latin1_encoding
-    assert_parses( [ %w[ one    two    Résumé ],
-                     %w[ 1      Résumé 3      ],
-                     %w[ Résumé 5      6      ] ], "ISO-8859-1" )
-  end
-
-  def test_parses_utf16be_encoding
-    assert_parses( [ %w[ one two … ],
-                     %w[ 1   …   3 ],
-                     %w[ …   5   6 ] ], "UTF-16BE" )
-  end
-
-  def test_parses_shift_jis_encoding
-    assert_parses( [ %w[ 一 二 三 ],
-                     %w[ 四 五 六 ],
-                     %w[ 七 八 九 ] ], "Shift_JIS" )
-  end
-
-  ###########################################################
-  ### Try Simple Reading for All Non-dummy Ruby Encodings ###
-  ###########################################################
-
-  def test_reading_with_most_encodings
-    each_encoding do |encoding|
-      begin
-        assert_parses( [ %w[ abc def ],
-                         %w[ ghi jkl ] ], encoding )
-      rescue Encoding::ConverterNotFoundError
-        fail("Failed to support #{encoding.name}.")
-      end
-    end
-  end
-
-  def test_regular_expression_escaping
-    each_encoding do |encoding|
-      begin
-        assert_parses( [ %w[ abc def ],
-                         %w[ ghi jkl ] ], encoding, col_sep: "|" )
-      rescue Encoding::ConverterNotFoundError
-        fail("Failed to properly escape #{encoding.name}.")
-      end
-    end
-  end
-
-  def test_read_with_default_encoding
-    data             = "abc"
-    default_external = Encoding.default_external
-    each_encoding do |encoding|
-      File.open(@temp_csv_path, "wb", encoding: encoding) {|f| f << data}
-      begin
-        no_warnings do
-          Encoding.default_external = encoding
-        end
-        result = CSV.read(@temp_csv_path)[0][0]
-      ensure
-        no_warnings do
-          Encoding.default_external = default_external
-        end
-      end
-      assert_equal(encoding, result.encoding)
-    end
-  end
-
-  #######################################################################
-  ### Stress Test ASCII Compatible and Non-ASCII Compatible Encodings ###
-  #######################################################################
-
-  def test_auto_line_ending_detection
-    # arrange data to place a \r at the end of CSV's read ahead point
-    encode_for_tests([["a" * 509]], row_sep: "\r\n") do |data|
-      assert_equal("\r\n".encode(data.encoding), CSV.new(data).row_sep)
-    end
-  end
-
-  def test_csv_chars_are_transcoded
-    encode_for_tests([%w[abc def]]) do |data|
-      %w[col_sep row_sep quote_char].each do |csv_char|
-        assert_equal( "|".encode(data.encoding),
-                      CSV.new(data, csv_char.to_sym => "|").send(csv_char) )
-      end
-    end
-  end
-
-  def test_parser_works_with_encoded_headers
-    encode_for_tests([%w[one two three], %w[1 2 3]]) do |data|
-      parsed = CSV.parse(data, headers: true)
-      assert_all?(parsed.headers, "Wrong data encoding.") {|h| h.encoding == data.encoding}
-      parsed.each do |row|
-        assert_all?(row.fields, "Wrong data encoding.") {|f| f.encoding == data.encoding}
-      end
-    end
-  end
-
-  def test_built_in_converters_transcode_to_utf_8_then_convert
-    encode_for_tests([%w[one two three], %w[1 2 3]]) do |data|
-      parsed = CSV.parse(data, converters: :integer)
-      assert_all?(parsed[0], "Wrong data encoding.") {|f| f.encoding == data.encoding}
-      assert_equal([1, 2, 3], parsed[1])
-    end
-  end
-
-  def test_built_in_header_converters_transcode_to_utf_8_then_convert
-    encode_for_tests([%w[one two three], %w[1 2 3]]) do |data|
-      parsed = CSV.parse( data, headers:           true,
-                                header_converters: :downcase )
-      assert_all?(parsed.headers, "Wrong data encoding.") {|h| h.encoding.name == "UTF-8"}
-      assert_all?(parsed[0].fields, "Wrong data encoding.") {|f| f.encoding == data.encoding}
-    end
-  end
-
-  def test_open_allows_you_to_set_encodings
-    encode_for_tests([%w[abc def]]) do |data|
-      # read and write in encoding
-      File.open(@temp_csv_path, "wb:#{data.encoding.name}") { |f| f << data }
-      CSV.open(@temp_csv_path, "rb:#{data.encoding.name}") do |csv|
-        csv.each do |row|
-          assert_all?(row, "Wrong data encoding.") {|f| f.encoding == data.encoding}
-        end
-      end
-
-      # read and write with transcoding
-      File.open(@temp_csv_path, "wb:UTF-32BE:#{data.encoding.name}") do |f|
-        f << data
-      end
-      CSV.open(@temp_csv_path, "rb:UTF-32BE:#{data.encoding.name}") do |csv|
-        csv.each do |row|
-          assert_all?(row, "Wrong data encoding.") {|f| f.encoding == data.encoding}
-        end
-      end
-    end
-  end
-
-  def test_foreach_allows_you_to_set_encodings
-    encode_for_tests([%w[abc def]]) do |data|
-      # read and write in encoding
-      File.open(@temp_csv_path, "wb", encoding: data.encoding) { |f| f << data }
-      CSV.foreach(@temp_csv_path, encoding: data.encoding) do |row|
-        row.each {|f| assert_equal(f.encoding, data.encoding)}
-      end
-
-      # read and write with transcoding
-      File.open(@temp_csv_path, "wb:UTF-32BE:#{data.encoding.name}") do |f|
-        f << data
-      end
-      CSV.foreach( @temp_csv_path,
-                   encoding: "UTF-32BE:#{data.encoding.name}" ) do |row|
-        assert_all?(row, "Wrong data encoding.") {|f| f.encoding == data.encoding}
-      end
-    end
-  end
-
-  def test_read_allows_you_to_set_encodings
-    encode_for_tests([%w[abc def]]) do |data|
-      # read and write in encoding
-      File.open(@temp_csv_path, "wb:#{data.encoding.name}") { |f| f << data }
-      rows = CSV.read(@temp_csv_path, encoding: data.encoding.name)
-      assert_all?(rows.flatten, "Wrong data encoding.") {|f| f.encoding == data.encoding}
-
-      # read and write with transcoding
-      File.open(@temp_csv_path, "wb:UTF-32BE:#{data.encoding.name}") do |f|
-        f << data
-      end
-      rows = CSV.read( @temp_csv_path,
-                       encoding: "UTF-32BE:#{data.encoding.name}" )
-      assert_all?(rows.flatten, "Wrong data encoding.") {|f| f.encoding == data.encoding}
-    end
-  end
-
-  #################################
-  ### Write CSV in any Encoding ###
-  #################################
-
-  def test_can_write_csv_in_any_encoding
-    each_encoding do |encoding|
-      # test generate_line with encoding hint
-      begin
-        csv = %w[abc d|ef].map { |f| f.encode(encoding) }.
-          to_csv(col_sep: "|", encoding: encoding.name)
-      rescue Encoding::ConverterNotFoundError
-        next
-      end
-      assert_equal(encoding, csv.encoding)
-
-      # test generate_line with encoding guessing from fields
-      csv = %w[abc d|ef].map { |f| f.encode(encoding) }.to_csv(col_sep: "|")
-      assert_equal(encoding, csv.encoding)
-
-      # writing to files
-      data = encode_ary([%w[abc d,ef], %w[123 456 ]], encoding)
-      CSV.open(@temp_csv_path, "wb:#{encoding.name}") do |f|
-        data.each { |row| f << row }
-      end
-      assert_equal(data, CSV.read(@temp_csv_path, encoding: encoding.name))
-    end
-  end
-
-  def test_encoding_is_upgraded_during_writing_as_needed
-    data = ["foo".force_encoding("US-ASCII"), "\u3042"]
-    assert_equal("US-ASCII", data.first.encoding.name)
-    assert_equal("UTF-8",    data.last.encoding.name)
-    assert_equal("UTF-8",    data.join('').encoding.name)
-    assert_equal("UTF-8",    data.to_csv.encoding.name)
-  end
-
-  def test_encoding_is_upgraded_for_ascii_content_during_writing_as_needed
-    data = ["foo".force_encoding("ISO-8859-1"), "\u3042"]
-    assert_equal("ISO-8859-1", data.first.encoding.name)
-    assert_equal("UTF-8",      data.last.encoding.name)
-    assert_equal("UTF-8",      data.join('').encoding.name)
-    assert_equal("UTF-8",      data.to_csv.encoding.name)
-  end
-
-  def test_encoding_is_not_upgraded_for_non_ascii_content_during_writing_as_needed
-    data = ["\u00c0".encode("ISO-8859-1"), "\u3042"]
-    assert_equal([
-                   "ISO-8859-1",
-                   "UTF-8",
-                 ],
-                 data.collect {|field| field.encoding.name})
-    assert_raise(Encoding::CompatibilityError) do
-      data.to_csv
-    end
-  end
-
-  def test_explicit_encoding
-    bug9766 = '[ruby-core:62113] [Bug #9766]'
-    s = CSV.generate(encoding: "Windows-31J") do |csv|
-      csv << ["foo".force_encoding("ISO-8859-1"), "\u3042"]
-    end
-    assert_equal(["foo,\u3042\n".encode(Encoding::Windows_31J), Encoding::Windows_31J], [s, s.encoding], bug9766)
-  end
-
-  def test_encoding_with_default_internal
-    with_default_internal(Encoding::UTF_8) do
-      s = CSV.generate(String.new(encoding: Encoding::Big5), encoding: Encoding::Big5) do |csv|
-        csv << ["漢字"]
-      end
-      assert_equal(["漢字\n".encode(Encoding::Big5), Encoding::Big5], [s, s.encoding])
-    end
-  end
-
-  def test_row_separator_detection_with_invalid_encoding
-    csv = CSV.new("invalid,\xF8\r\nvalid,x\r\n".force_encoding("UTF-8"),
-                  encoding: "UTF-8")
-    assert_equal("\r\n", csv.row_sep)
-  end
-
-  def test_invalid_encoding_row_error
-    csv = CSV.new("valid,x\rinvalid,\xF8\r".force_encoding("UTF-8"),
-                  encoding: "UTF-8", row_sep: "\r")
-    error = assert_raise(CSV::MalformedCSVError) do
-      csv.shift
-      csv.shift
-    end
-    assert_equal("Invalid byte sequence in UTF-8 in line 2.",
-                 error.message)
-  end
-
-  def test_string_input_transcode
-    # U+3042 HIRAGANA LETTER A
-    # U+3044 HIRAGANA LETTER I
-    # U+3046 HIRAGANA LETTER U
-    value = "\u3042\u3044\u3046"
-    csv = CSV.new(value, encoding: "UTF-8:EUC-JP")
-    assert_equal([[value.encode("EUC-JP")]],
-                 csv.read)
-  end
-
-  def test_string_input_set_encoding_string
-    # U+3042 HIRAGANA LETTER A
-    # U+3044 HIRAGANA LETTER I
-    # U+3046 HIRAGANA LETTER U
-    value = "\u3042\u3044\u3046".encode("EUC-JP")
-    csv = CSV.new(value.dup.force_encoding("UTF-8"), encoding: "EUC-JP")
-    assert_equal([[value.encode("EUC-JP")]],
-                 csv.read)
-  end
-
-  def test_string_input_set_encoding_encoding
-    # U+3042 HIRAGANA LETTER A
-    # U+3044 HIRAGANA LETTER I
-    # U+3046 HIRAGANA LETTER U
-    value = "\u3042\u3044\u3046".encode("EUC-JP")
-    csv = CSV.new(value.dup.force_encoding("UTF-8"),
-                  encoding: Encoding.find("EUC-JP"))
-    assert_equal([[value.encode("EUC-JP")]],
-                 csv.read)
-  end
-
-  private
-
-  def assert_parses(fields, encoding, **options)
-    encoding = Encoding.find(encoding) unless encoding.is_a? Encoding
-    orig_fields = fields
-    fields = encode_ary(fields, encoding)
-    data = ary_to_data(fields, **options)
-    parsed = CSV.parse(data, **options)
-    assert_equal(fields, parsed)
-    parsed.flatten.each_with_index do |field, i|
-      assert_equal(encoding, field.encoding, "Field[#{i + 1}] was transcoded.")
-    end
-    File.open(@temp_csv_path, "wb") {|f| f.print(data)}
-    CSV.open(@temp_csv_path, "rb:#{encoding}", **options) do |csv|
-      csv.each_with_index do |row, i|
-        assert_equal(fields[i], row)
-      end
-    end
-    begin
-      CSV.open(@temp_csv_path,
-               "rb:#{encoding}:#{__ENCODING__}",
-               **options) do |csv|
-        csv.each_with_index do |row, i|
-          assert_equal(orig_fields[i], row)
-        end
-      end unless encoding == __ENCODING__
-    rescue Encoding::ConverterNotFoundError
-    end
-    options[:encoding] = encoding.name
-    CSV.open(@temp_csv_path, **options) do |csv|
-      csv.each_with_index do |row, i|
-        assert_equal(fields[i], row)
-      end
-    end
-    options.delete(:encoding)
-    options[:external_encoding] = encoding.name
-    options[:internal_encoding] = __ENCODING__.name
-    begin
-      CSV.open(@temp_csv_path, **options) do |csv|
-        csv.each_with_index do |row, i|
-          assert_equal(orig_fields[i], row)
-        end
-      end unless encoding == __ENCODING__
-    rescue Encoding::ConverterNotFoundError
-    end
-  end
-
-  def encode_ary(ary, encoding)
-    ary.map { |row| row.map { |field| field.encode(encoding) } }
-  end
-
-  def ary_to_data(ary, **options)
-    encoding   = ary.flatten.first.encoding
-    quote_char = (options[:quote_char] || '"').encode(encoding)
-    col_sep    = (options[:col_sep]    || ",").encode(encoding)
-    row_sep    = (options[:row_sep]    || "\n").encode(encoding)
-    ary.map { |row|
-      row.map { |field|
-        [quote_char, field.encode(encoding), quote_char].join('')
-      }.join(col_sep) + row_sep
-    }.join('').encode(encoding)
-  end
-
-  def encode_for_tests(data, **options)
-    yield ary_to_data(encode_ary(data, "UTF-8"),    **options)
-    yield ary_to_data(encode_ary(data, "UTF-16BE"), **options)
-  end
-
-  def each_encoding
-    Encoding.list.each do |encoding|
-      next if encoding.dummy?  # skip "dummy" encodings
-      yield encoding
-    end
-  end
-
-  def no_warnings
-    old_verbose, $VERBOSE = $VERBOSE, nil
-    yield
-  ensure
-    $VERBOSE = old_verbose
-  end
-end
diff --git a/test/csv/test_features.rb b/test/csv/test_features.rb
deleted file mode 100644
index d6eb2dc13be165..00000000000000
--- a/test/csv/test_features.rb
+++ /dev/null
@@ -1,359 +0,0 @@
-# -*- coding: utf-8 -*-
-# frozen_string_literal: false
-
-begin
-  require "zlib"
-rescue LoadError
-end
-
-require_relative "helper"
-require "tempfile"
-
-class TestCSVFeatures < Test::Unit::TestCase
-  extend DifferentOFS
-
-  TEST_CASES = [ [%Q{a,b},               ["a", "b"]],
-                 [%Q{a,"""b"""},         ["a", "\"b\""]],
-                 [%Q{a,"""b"},           ["a", "\"b"]],
-                 [%Q{a,"b"""},           ["a", "b\""]],
-                 [%Q{a,"\nb"""},         ["a", "\nb\""]],
-                 [%Q{a,"""\nb"},         ["a", "\"\nb"]],
-                 [%Q{a,"""\nb\n"""},     ["a", "\"\nb\n\""]],
-                 [%Q{a,"""\nb\n""",\nc}, ["a", "\"\nb\n\"", nil]],
-                 [%Q{a,,,},              ["a", nil, nil, nil]],
-                 [%Q{,},                 [nil, nil]],
-                 [%Q{"",""},             ["", ""]],
-                 [%Q{""""},              ["\""]],
-                 [%Q{"""",""},           ["\"",""]],
-                 [%Q{,""},               [nil,""]],
-                 [%Q{,"\r"},             [nil,"\r"]],
-                 [%Q{"\r\n,"},           ["\r\n,"]],
-                 [%Q{"\r\n,",},          ["\r\n,", nil]] ]
-
-  def setup
-    super
-    @sample_data = <<-CSV
-line,1,abc
-line,2,"def\nghi"
-
-line,4,jkl
-    CSV
-    @csv = CSV.new(@sample_data)
-  end
-
-  def test_col_sep
-    [";", "\t"].each do |sep|
-      TEST_CASES.each do |test_case|
-        assert_equal( test_case.last.map { |t| t.tr(",", sep) unless t.nil? },
-                      CSV.parse_line( test_case.first.tr(",", sep),
-                                      col_sep: sep ) )
-      end
-    end
-    assert_equal([",,,", nil], CSV.parse_line(",,,;", col_sep: ";"))
-  end
-
-  def test_col_sep_nil
-    assert_raise_with_message(ArgumentError,
-                              ":col_sep must be 1 or more characters: nil") do
-      CSV.parse(@sample_data, col_sep: nil)
-    end
-  end
-
-  def test_col_sep_empty
-    assert_raise_with_message(ArgumentError,
-                              ":col_sep must be 1 or more characters: \"\"") do
-      CSV.parse(@sample_data, col_sep: "")
-    end
-  end
-
-  def test_row_sep
-    error = assert_raise(CSV::MalformedCSVError) do
-      CSV.parse_line("1,2,3\n,4,5\r\n", row_sep: "\r\n")
-    end
-    assert_equal("Unquoted fields do not allow new line <\"\\n\"> in line 1.",
-                 error.message)
-    assert_equal( ["1", "2", "3\n", "4", "5"],
-                  CSV.parse_line(%Q{1,2,"3\n",4,5\r\n}, row_sep: "\r\n"))
-  end
-
-  def test_quote_char
-    TEST_CASES.each do |test_case|
-      assert_equal(test_case.last.map {|t| t.tr('"', "'") unless t.nil?},
-                   CSV.parse_line(test_case.first.tr('"', "'"),
-                                  quote_char: "'" ))
-    end
-  end
-
-  def test_quote_char_special_regexp_char
-    TEST_CASES.each do |test_case|
-      assert_equal(test_case.last.map {|t| t.tr('"', "|") unless t.nil?},
-                   CSV.parse_line(test_case.first.tr('"', "|"),
-                                  quote_char: "|"))
-    end
-  end
-
-  def test_quote_char_special_regexp_char_liberal_parsing
-    TEST_CASES.each do |test_case|
-      assert_equal(test_case.last.map {|t| t.tr('"', "|") unless t.nil?},
-                   CSV.parse_line(test_case.first.tr('"', "|"),
-                                  quote_char: "|",
-                                  liberal_parsing: true))
-    end
-  end
-
-  def test_csv_char_readers
-    %w[col_sep row_sep quote_char].each do |reader|
-      csv = CSV.new("abc,def", reader.to_sym => "|")
-      assert_equal("|", csv.send(reader))
-    end
-  end
-
-  def test_row_sep_auto_discovery
-    ["\r\n", "\n", "\r"].each do |line_end|
-      data       = "1,2,3#{line_end}4,5#{line_end}"
-      discovered = CSV.new(data).row_sep
-      assert_equal(line_end, discovered)
-    end
-
-    assert_equal("\n", CSV.new("\n\r\n\r").row_sep)
-
-    assert_equal($/, CSV.new("").row_sep)
-
-    assert_equal($/, CSV.new(STDERR).row_sep)
-  end
-
-  def test_line
-    lines = [
-      %Q(\u{3000}abc,def\n),
-      %Q(\u{3000}abc,"d\nef"\n),
-      %Q(\u{3000}abc,"d\r\nef"\n),
-      %Q(\u{3000}abc,"d\ref")
-    ]
-    csv = CSV.new(lines.join(''))
-    lines.each do |line|
-      csv.shift
-      assert_equal(line, csv.line)
-    end
-  end
-
-  def test_lineno
-    assert_equal(5, @sample_data.lines.to_a.size)
-
-    4.times do |line_count|
-      assert_equal(line_count, @csv.lineno)
-      assert_not_nil(@csv.shift)
-      assert_equal(line_count + 1, @csv.lineno)
-    end
-    assert_nil(@csv.shift)
-  end
-
-  def test_readline
-    test_lineno
-
-    @csv.rewind
-
-    test_lineno
-  end
-
-  def test_unknown_options
-    assert_raise_with_message(ArgumentError, /unknown keyword/) {
-      CSV.new(@sample_data, unknown: :error)
-    }
-    assert_raise_with_message(ArgumentError, /unknown keyword/) {
-      CSV.new(@sample_data, universal_newline: true)
-    }
-  end
-
-  def test_skip_blanks
-    assert_equal(4, @csv.to_a.size)
-
-    @csv  = CSV.new(@sample_data, skip_blanks: true)
-
-    count = 0
-    @csv.each do |row|
-      count += 1
-      assert_equal("line", row.first)
-    end
-    assert_equal(3, count)
-  end
-
-  def test_csv_behavior_readers
-    %w[ unconverted_fields return_headers write_headers
-        skip_blanks        force_quotes ].each do |behavior|
-      assert_not_predicate(CSV.new("abc,def"), "#{behavior}?", "Behavior defaulted to on.")
-      csv = CSV.new("abc,def", behavior.to_sym => true)
-      assert_predicate(csv, "#{behavior}?", "Behavior change now registered.")
-    end
-  end
-
-  def test_converters_reader
-    # no change
-    assert_equal( [:integer],
-                  CSV.new("abc,def", converters: [:integer]).converters )
-
-    # just one
-    assert_equal( [:integer],
-                  CSV.new("abc,def", converters: :integer).converters )
-
-    # expanded
-    assert_equal( [:integer, :float],
-                  CSV.new("abc,def", converters: :numeric).converters )
-
-    # custom
-    csv = CSV.new("abc,def", converters: [:integer, lambda {  }])
-    assert_equal(2, csv.converters.size)
-    assert_equal(:integer, csv.converters.first)
-    assert_instance_of(Proc, csv.converters.last)
-  end
-
-  def test_header_converters_reader
-    # no change
-    hc = :header_converters
-    assert_equal([:downcase], CSV.new("abc,def", hc => [:downcase]).send(hc))
-
-    # just one
-    assert_equal([:downcase], CSV.new("abc,def", hc => :downcase).send(hc))
-
-    # custom
-    csv = CSV.new("abc,def", hc => [:symbol, lambda {  }])
-    assert_equal(2, csv.send(hc).size)
-    assert_equal(:symbol, csv.send(hc).first)
-    assert_instance_of(Proc, csv.send(hc).last)
-  end
-
-  # reported by Kev Jackson
-  def test_failing_to_escape_col_sep
-    assert_nothing_raised(Exception) { CSV.new(String.new, col_sep: "|") }
-  end
-
-  # reported by Chris Roos
-  def test_failing_to_reset_headers_in_rewind
-    csv = CSV.new("forename,surname", headers: true, return_headers: true)
-    csv.each {|row| assert_predicate row, :header_row?}
-    csv.rewind
-    csv.each {|row| assert_predicate row, :header_row?}
-  end
-
-  def test_gzip_reader
-    zipped = nil
-    assert_nothing_raised(NoMethodError) do
-      zipped = CSV.new(
-                 Zlib::GzipReader.open(
-                   File.join(File.dirname(__FILE__), "line_endings.gz")
-                 )
-               )
-    end
-    assert_equal("\r\n", zipped.row_sep)
-  ensure
-    zipped.close
-  end if defined?(Zlib::GzipReader)
-
-  def test_gzip_writer
-    Tempfile.create(%w"temp .gz") {|tempfile|
-      tempfile.close
-      file = tempfile.path
-      zipped = nil
-      assert_nothing_raised(NoMethodError) do
-        zipped = CSV.new(Zlib::GzipWriter.open(file))
-      end
-      zipped << %w[one two three]
-      zipped << [1, 2, 3]
-      zipped.close
-
-      assert_include(Zlib::GzipReader.open(file) {|f| f.read},
-                     $INPUT_RECORD_SEPARATOR, "@row_sep did not default")
-    }
-  end if defined?(Zlib::GzipWriter)
-
-  def test_inspect_is_smart_about_io_types
-    str = CSV.new("string,data").inspect
-    assert_include(str, "io_type:StringIO", "IO type not detected.")
-
-    str = CSV.new($stderr).inspect
-    assert_include(str, "io_type:$stderr", "IO type not detected.")
-
-    Tempfile.create(%w"temp .csv") {|tempfile|
-      tempfile.close
-      path = tempfile.path
-      File.open(path, "w") { |csv| csv << "one,two,three\n1,2,3\n" }
-      str  = CSV.open(path) { |csv| csv.inspect }
-      assert_include(str, "io_type:File", "IO type not detected.")
-    }
-  end
-
-  def test_inspect_shows_key_attributes
-    str = @csv.inspect
-    %w[lineno col_sep row_sep quote_char].each do |attr_name|
-      assert_match(/\b#{attr_name}:[^\s>]+/, str)
-    end
-  end
-
-  def test_inspect_shows_headers_when_available
-    csv = CSV.new("one,two,three\n1,2,3\n", headers: true)
-    assert_include(csv.inspect, "headers:true", "Header hint not shown.")
-    csv.shift  # load headers
-    assert_match(/headers:\[[^\]]+\]/, csv.inspect)
-  end
-
-  def test_inspect_encoding_is_ascii_compatible
-    csv = CSV.new("one,two,three\n1,2,3\n".encode("UTF-16BE"))
-    assert_send([Encoding, :compatible?,
-                  Encoding.find("US-ASCII"), csv.inspect.encoding],
-                "inspect() was not ASCII compatible.")
-  end
-
-  def test_version
-    assert_not_nil(CSV::VERSION)
-    assert_instance_of(String, CSV::VERSION)
-    assert_predicate(CSV::VERSION, :frozen?)
-    assert_match(/\A\d\.\d\.\d\z/, CSV::VERSION)
-  end
-
-  def test_table_nil_equality
-    assert_nothing_raised(NoMethodError) { CSV.parse("test", headers: true) == nil }
-  end
-
-  # non-seekable input stream for testing https://github.com/ruby/csv/issues/44
-  class DummyIO
-    extend Forwardable
-    def_delegators :@io, :gets, :read, :pos, :eof?  # no seek or rewind!
-    def initialize(data)
-      @io = StringIO.new(data)
-    end
-  end
-
-  def test_line_separator_autodetection_for_non_seekable_input_lf
-    c = CSV.new(DummyIO.new("one,two,three\nfoo,bar,baz\n"))
-    assert_equal [["one", "two", "three"], ["foo", "bar", "baz"]], c.each.to_a
-  end
-
-  def test_line_separator_autodetection_for_non_seekable_input_cr
-    c = CSV.new(DummyIO.new("one,two,three\rfoo,bar,baz\r"))
-    assert_equal [["one", "two", "three"], ["foo", "bar", "baz"]], c.each.to_a
-  end
-
-  def test_line_separator_autodetection_for_non_seekable_input_cr_lf
-    c = CSV.new(DummyIO.new("one,two,three\r\nfoo,bar,baz\r\n"))
-    assert_equal [["one", "two", "three"], ["foo", "bar", "baz"]], c.each.to_a
-  end
-
-  def test_line_separator_autodetection_for_non_seekable_input_1024_over_lf
-    table = (1..10).map { |row| (1..200).map { |col| "row#{row}col#{col}" }.to_a }.to_a
-    input = table.map { |line| line.join(",") }.join("\n")
-    c = CSV.new(DummyIO.new(input))
-    assert_equal table, c.each.to_a
-  end
-
-  def test_line_separator_autodetection_for_non_seekable_input_1024_over_cr_lf
-    table = (1..10).map { |row| (1..200).map { |col| "row#{row}col#{col}" }.to_a }.to_a
-    input = table.map { |line| line.join(",") }.join("\r\n")
-    c = CSV.new(DummyIO.new(input))
-    assert_equal table, c.each.to_a
-  end
-
-  def test_line_separator_autodetection_for_non_seekable_input_many_cr_only
-    # input with lots of CRs (to make sure no bytes are lost due to look-ahead)
-    c = CSV.new(DummyIO.new("foo\r" + "\r" * 9999 + "bar\r"))
-    assert_equal [["foo"]] + [[]] * 9999 + [["bar"]], c.each.to_a
-  end
-end
diff --git a/test/csv/test_patterns.rb b/test/csv/test_patterns.rb
deleted file mode 100644
index 881f03a3a4ae5e..00000000000000
--- a/test/csv/test_patterns.rb
+++ /dev/null
@@ -1,27 +0,0 @@
-# frozen_string_literal: true
-
-require_relative "helper"
-
-class TestCSVPatternMatching < Test::Unit::TestCase
-
-  def test_hash
-    case CSV::Row.new(%i{A B C}, [1, 2, 3])
-    in B: b, C: c
-      assert_equal([2, 3], [b, c])
-    end
-  end
-
-  def test_hash_rest
-    case CSV::Row.new(%i{A B C}, [1, 2, 3])
-    in B: b, **rest
-      assert_equal([2, { A: 1, C: 3 }], [b, rest])
-    end
-  end
-
-  def test_array
-    case CSV::Row.new(%i{A B C}, [1, 2, 3])
-    in *, matched
-      assert_equal(3, matched)
-    end
-  end
-end
diff --git a/test/csv/test_row.rb b/test/csv/test_row.rb
deleted file mode 100644
index b7179450412bbd..00000000000000
--- a/test/csv/test_row.rb
+++ /dev/null
@@ -1,435 +0,0 @@
-# -*- coding: utf-8 -*-
-# frozen_string_literal: false
-
-require_relative "helper"
-
-class TestCSVRow < Test::Unit::TestCase
-  extend DifferentOFS
-
-  def setup
-    super
-    @row = CSV::Row.new(%w{A B C A A}, [1, 2, 3, 4])
-  end
-
-  def test_initialize
-    # basic
-    row = CSV::Row.new(%w{A B C}, [1, 2, 3])
-    assert_not_nil(row)
-    assert_instance_of(CSV::Row, row)
-    assert_equal([["A", 1], ["B", 2], ["C", 3]], row.to_a)
-
-    # missing headers
-    row = CSV::Row.new(%w{A}, [1, 2, 3])
-    assert_not_nil(row)
-    assert_instance_of(CSV::Row, row)
-    assert_equal([["A", 1], [nil, 2], [nil, 3]], row.to_a)
-
-    # missing fields
-    row = CSV::Row.new(%w{A B C}, [1, 2])
-    assert_not_nil(row)
-    assert_instance_of(CSV::Row, row)
-    assert_equal([["A", 1], ["B", 2], ["C", nil]], row.to_a)
-  end
-
-  def test_row_type
-    # field rows
-    row = CSV::Row.new(%w{A B C}, [1, 2, 3])         # implicit
-    assert_not_predicate(row, :header_row?)
-    assert_predicate(row, :field_row?)
-    row = CSV::Row.new(%w{A B C}, [1, 2, 3], false)  # explicit
-    assert_not_predicate(row, :header_row?)
-    assert_predicate(row, :field_row?)
-
-    # header row
-    row = CSV::Row.new(%w{A B C}, [1, 2, 3], true)
-    assert_predicate(row, :header_row?)
-    assert_not_predicate(row, :field_row?)
-  end
-
-  def test_headers
-    assert_equal(%w{A B C A A}, @row.headers)
-  end
-
-  def test_field
-    # by name
-    assert_equal(2, @row.field("B"))
-    assert_equal(2, @row["B"])  # alias
-
-    # by index
-    assert_equal(3, @row.field(2))
-
-    # by range
-    assert_equal([2,3], @row.field(1..2))
-
-    # missing
-    assert_nil(@row.field("Missing"))
-    assert_nil(@row.field(10))
-
-    # minimum index
-    assert_equal(1, @row.field("A"))
-    assert_equal(1, @row.field("A", 0))
-    assert_equal(4, @row.field("A", 1))
-    assert_equal(4, @row.field("A", 2))
-    assert_equal(4, @row.field("A", 3))
-    assert_equal(nil, @row.field("A", 4))
-    assert_equal(nil, @row.field("A", 5))
-  end
-
-  def test_fetch
-    # only by name
-    assert_equal(2, @row.fetch('B'))
-
-    # missing header raises KeyError
-    assert_raise KeyError do
-      @row.fetch('foo')
-    end
-
-    # missing header yields itself to block
-    assert_equal 'bar', @row.fetch('foo') { |header|
-      header == 'foo' ? 'bar' : false }
-
-    # missing header returns the given default value
-    assert_equal 'bar', @row.fetch('foo', 'bar')
-
-    # more than one vararg raises ArgumentError
-    assert_raise ArgumentError do
-      @row.fetch('foo', 'bar', 'baz')
-    end
-  end
-
-  def test_has_key?
-    assert_equal(true, @row.has_key?('B'))
-    assert_equal(false, @row.has_key?('foo'))
-
-    # aliases
-    assert_equal(true, @row.header?('B'))
-    assert_equal(false, @row.header?('foo'))
-
-    assert_equal(true, @row.include?('B'))
-    assert_equal(false, @row.include?('foo'))
-
-    assert_equal(true, @row.member?('B'))
-    assert_equal(false, @row.member?('foo'))
-
-    assert_equal(true, @row.key?('B'))
-    assert_equal(false, @row.key?('foo'))
-  end
-
-  def test_set_field
-    # set field by name
-    assert_equal(100, @row["A"] = 100)
-
-    # set field by index
-    assert_equal(300, @row[3] = 300)
-
-    # set field by name and minimum index
-    assert_equal([:a, :b, :c], @row["A", 4] = [:a, :b, :c])
-
-    # verify the changes
-    assert_equal( [ ["A", 100],
-                    ["B", 2],
-                    ["C", 3],
-                    ["A", 300],
-                    ["A", [:a, :b, :c]] ], @row.to_a )
-
-    # assigning an index past the end
-    assert_equal("End", @row[10] = "End")
-    assert_equal( [ ["A", 100],
-                    ["B", 2],
-                    ["C", 3],
-                    ["A", 300],
-                    ["A", [:a, :b, :c]],
-                    [nil, nil],
-                    [nil, nil],
-                    [nil, nil],
-                    [nil, nil],
-                    [nil, nil],
-                    [nil, "End"] ], @row.to_a )
-
-    # assigning a new field by header
-    assert_equal("New", @row[:new] = "New")
-    assert_equal( [ ["A", 100],
-                    ["B", 2],
-                    ["C", 3],
-                    ["A", 300],
-                    ["A", [:a, :b, :c]],
-                    [nil, nil],
-                    [nil, nil],
-                    [nil, nil],
-                    [nil, nil],
-                    [nil, nil],
-                    [nil, "End"],
-                    [:new, "New"] ], @row.to_a )
-  end
-
-  def test_append
-    # add a value
-    assert_equal(@row, @row << "Value")
-    assert_equal( [ ["A", 1],
-                    ["B", 2],
-                    ["C", 3],
-                    ["A", 4],
-                    ["A", nil],
-                    [nil, "Value"] ], @row.to_a )
-
-    # add a pair
-    assert_equal(@row, @row << %w{Header Field})
-    assert_equal( [ ["A", 1],
-                    ["B", 2],
-                    ["C", 3],
-                    ["A", 4],
-                    ["A", nil],
-                    [nil, "Value"],
-                    %w{Header Field} ], @row.to_a )
-
-    # a pair with Hash syntax
-    assert_equal(@row, @row << {key: :value})
-    assert_equal( [ ["A", 1],
-                    ["B", 2],
-                    ["C", 3],
-                    ["A", 4],
-                    ["A", nil],
-                    [nil, "Value"],
-                    %w{Header Field},
-                    [:key, :value] ], @row.to_a )
-
-    # multiple fields at once
-    assert_equal(@row, @row.push(100, 200, [:last, 300]))
-    assert_equal( [ ["A", 1],
-                    ["B", 2],
-                    ["C", 3],
-                    ["A", 4],
-                    ["A", nil],
-                    [nil, "Value"],
-                    %w{Header Field},
-                    [:key, :value],
-                    [nil, 100],
-                    [nil, 200],
-                    [:last, 300] ], @row.to_a )
-  end
-
-  def test_delete
-    # by index
-    assert_equal(["B", 2], @row.delete(1))
-
-    # by header
-    assert_equal(["C", 3], @row.delete("C"))
-
-  end
-
-  def test_delete_if
-    assert_equal(@row, @row.delete_if { |h, f| h == "A" and not f.nil? })
-    assert_equal([["B", 2], ["C", 3], ["A", nil]], @row.to_a)
-  end
-
-  def test_delete_if_without_block
-    enum = @row.delete_if
-    assert_instance_of(Enumerator, enum)
-    assert_equal(@row.size, enum.size)
-
-    assert_equal(@row, enum.each { |h, f| h == "A" and not f.nil? })
-    assert_equal([["B", 2], ["C", 3], ["A", nil]], @row.to_a)
-  end
-
-  def test_fields
-    # all fields
-    assert_equal([1, 2, 3, 4, nil], @row.fields)
-
-    # by header
-    assert_equal([1, 3], @row.fields("A", "C"))
-
-    # by index
-    assert_equal([2, 3, nil], @row.fields(1, 2, 10))
-
-    # by both
-    assert_equal([2, 3, 4], @row.fields("B", "C", 3))
-
-    # with minimum indices
-    assert_equal([2, 3, 4], @row.fields("B", "C", ["A", 3]))
-
-    # by header range
-    assert_equal([2, 3], @row.values_at("B".."C"))
-  end
-
-  def test_index
-    # basic usage
-    assert_equal(0, @row.index("A"))
-    assert_equal(1, @row.index("B"))
-    assert_equal(2, @row.index("C"))
-    assert_equal(nil, @row.index("Z"))
-
-    # with minimum index
-    assert_equal(0, @row.index("A"))
-    assert_equal(0, @row.index("A", 0))
-    assert_equal(3, @row.index("A", 1))
-    assert_equal(3, @row.index("A", 2))
-    assert_equal(3, @row.index("A", 3))
-    assert_equal(4, @row.index("A", 4))
-    assert_equal(nil, @row.index("A", 5))
-  end
-
-  def test_queries
-    # fields
-    assert(@row.field?(4))
-    assert(@row.field?(nil))
-    assert(!@row.field?(10))
-  end
-
-  def test_each
-    # array style
-    ary = @row.to_a
-    @row.each do |pair|
-      assert_equal(ary.first.first, pair.first)
-      assert_equal(ary.shift.last, pair.last)
-    end
-
-    # hash style
-    ary = @row.to_a
-    @row.each do |header, field|
-      assert_equal(ary.first.first, header)
-      assert_equal(ary.shift.last, field)
-    end
-
-    # verify that we can chain the call
-    assert_equal(@row, @row.each { })
-
-    # without block
-    ary = @row.to_a
-    enum = @row.each
-    assert_instance_of(Enumerator, enum)
-    assert_equal(@row.size, enum.size)
-    enum.each do |pair|
-      assert_equal(ary.first.first, pair.first)
-      assert_equal(ary.shift.last, pair.last)
-    end
-  end
-
-  def test_each_pair
-    assert_equal([
-                   ["A", 1],
-                   ["B", 2],
-                   ["C", 3],
-                   ["A", 4],
-                   ["A", nil],
-                 ],
-                 @row.each_pair.to_a)
-  end
-
-  def test_enumerable
-    assert_equal( [["A", 1], ["A", 4], ["A", nil]],
-                  @row.select { |pair| pair.first == "A" } )
-
-    assert_equal(10, @row.inject(0) { |sum, (_, n)| sum + (n || 0) })
-  end
-
-  def test_to_a
-    row = CSV::Row.new(%w{A B C}, [1, 2, 3]).to_a
-    assert_instance_of(Array, row)
-    row.each do |pair|
-      assert_instance_of(Array, pair)
-      assert_equal(2, pair.size)
-    end
-    assert_equal([["A", 1], ["B", 2], ["C", 3]], row)
-  end
-
-  def test_to_hash
-    hash = @row.to_hash
-    assert_equal({"A" => @row["A"], "B" => @row["B"], "C" => @row["C"]}, hash)
-    hash.keys.each_with_index do |string_key, h|
-      assert_predicate(string_key, :frozen?)
-      assert_same(string_key, @row.headers[h])
-    end
-  end
-
-  def test_to_csv
-    # normal conversion
-    assert_equal("1,2,3,4,\n", @row.to_csv)
-    assert_equal("1,2,3,4,\n", @row.to_s)  # alias
-
-    # with options
-    assert_equal( "1|2|3|4|\r\n",
-                  @row.to_csv(col_sep: "|", row_sep: "\r\n") )
-  end
-
-  def test_array_delegation
-    assert_not_empty(@row, "Row was empty.")
-
-    assert_equal([@row.headers.size, @row.fields.size].max, @row.size)
-  end
-
-  def test_inspect_shows_header_field_pairs
-    str = @row.inspect
-    @row.each do |header, field|
-      assert_include(str, "#{header.inspect}:#{field.inspect}",
-                     "Header field pair not found.")
-    end
-  end
-
-  def test_inspect_encoding_is_ascii_compatible
-    assert_send([Encoding, :compatible?,
-                 Encoding.find("US-ASCII"),
-                 @row.inspect.encoding],
-                "inspect() was not ASCII compatible.")
-  end
-
-  def test_inspect_shows_symbol_headers_as_bare_attributes
-    str = CSV::Row.new(@row.headers.map { |h| h.to_sym }, @row.fields).inspect
-    @row.each do |header, field|
-      assert_include(str, "#{header}:#{field.inspect}",
-                     "Header field pair not found.")
-    end
-  end
-
-  def test_can_be_compared_with_other_classes
-    assert_not_nil(CSV::Row.new([ ], [ ]), "The row was nil")
-  end
-
-  def test_can_be_compared_when_not_a_row
-    r = @row == []
-    assert_equal false, r
-  end
-
-  def test_dig_by_index
-    assert_equal(2, @row.dig(1))
-
-    assert_nil(@row.dig(100))
-  end
-
-  def test_dig_by_header
-    assert_equal(2, @row.dig("B"))
-
-    assert_nil(@row.dig("Missing"))
-  end
-
-  def test_dig_cell
-    row = CSV::Row.new(%w{A}, [["foo", ["bar", ["baz"]]]])
-
-    assert_equal("foo", row.dig(0, 0))
-    assert_equal("bar", row.dig(0, 1, 0))
-
-    assert_equal("foo", row.dig("A", 0))
-    assert_equal("bar", row.dig("A", 1, 0))
-  end
-
-  def test_dig_cell_no_dig
-    row = CSV::Row.new(%w{A}, ["foo"])
-
-    assert_raise(TypeError) do
-      row.dig(0, 0)
-    end
-    assert_raise(TypeError) do
-      row.dig("A", 0)
-    end
-  end
-
-  def test_dup
-    row = CSV::Row.new(["A"], ["foo"])
-    dupped_row = row.dup
-    dupped_row["A"] = "bar"
-    assert_equal(["foo", "bar"],
-                 [row["A"], dupped_row["A"]])
-    dupped_row.delete("A")
-    assert_equal(["foo", nil],
-                 [row["A"], dupped_row["A"]])
-  end
-end
diff --git a/test/csv/test_table.rb b/test/csv/test_table.rb
deleted file mode 100644
index e8ab74044e0913..00000000000000
--- a/test/csv/test_table.rb
+++ /dev/null
@@ -1,691 +0,0 @@
-# -*- coding: utf-8 -*-
-# frozen_string_literal: false
-
-require_relative "helper"
-
-class TestCSVTable < Test::Unit::TestCase
-  extend DifferentOFS
-
-  def setup
-    super
-    @rows  = [ CSV::Row.new(%w{A B C}, [1, 2, 3]),
-               CSV::Row.new(%w{A B C}, [4, 5, 6]),
-               CSV::Row.new(%w{A B C}, [7, 8, 9]) ]
-    @table = CSV::Table.new(@rows)
-
-    @header_table = CSV::Table.new(
-      [CSV::Row.new(%w{A B C}, %w{A B C}, true)] + @rows
-    )
-
-    @header_only_table = CSV::Table.new([], headers: %w{A B C})
-  end
-
-  def test_initialize
-    assert_not_nil(@table)
-    assert_instance_of(CSV::Table, @table)
-  end
-
-  def test_modes
-    assert_equal(:col_or_row, @table.mode)
-
-    # non-destructive changes, intended for one shot calls
-    cols = @table.by_col
-    assert_equal(:col_or_row, @table.mode)
-    assert_equal(:col, cols.mode)
-    assert_equal(@table, cols)
-
-    rows = @table.by_row
-    assert_equal(:col_or_row, @table.mode)
-    assert_equal(:row, rows.mode)
-    assert_equal(@table, rows)
-
-    col_or_row = rows.by_col_or_row
-    assert_equal(:row, rows.mode)
-    assert_equal(:col_or_row, col_or_row.mode)
-    assert_equal(@table, col_or_row)
-
-    # destructive mode changing calls
-    assert_equal(@table, @table.by_row!)
-    assert_equal(:row, @table.mode)
-    assert_equal(@table, @table.by_col_or_row!)
-    assert_equal(:col_or_row, @table.mode)
-  end
-
-  def test_headers
-    assert_equal(@rows.first.headers, @table.headers)
-  end
-
-  def test_headers_empty
-    t = CSV::Table.new([])
-    assert_equal Array.new, t.headers
-  end
-
-  def test_headers_only
-    assert_equal(%w[A B C], @header_only_table.headers)
-  end
-
-  def test_headers_modified_by_row
-    table = CSV::Table.new([], headers: ["A", "B"])
-    table << ["a", "b"]
-    table.first << {"C" => "c"}
-    assert_equal(["A", "B", "C"], table.headers)
-  end
-
-  def test_index
-    ##################
-    ### Mixed Mode ###
-    ##################
-    # by row
-    @rows.each_index { |i| assert_equal(@rows[i], @table[i]) }
-    assert_equal(nil, @table[100])  # empty row
-
-    # by row with Range
-    assert_equal([@table[1], @table[2]], @table[1..2])
-
-    # by col
-    @rows.first.headers.each do |header|
-      assert_equal(@rows.map { |row| row[header] }, @table[header])
-    end
-    assert_equal([nil] * @rows.size, @table["Z"])  # empty col
-
-    # by cell, row then col
-    assert_equal(2, @table[0][1])
-    assert_equal(6, @table[1]["C"])
-
-    # by cell, col then row
-    assert_equal(5, @table["B"][1])
-    assert_equal(9, @table["C"][2])
-
-    # with headers (by col)
-    assert_equal(["B", 2, 5, 8], @header_table["B"])
-
-    ###################
-    ### Column Mode ###
-    ###################
-    @table.by_col!
-
-    assert_equal([2, 5, 8], @table[1])
-    assert_equal([2, 5, 8], @table["B"])
-
-    ################
-    ### Row Mode ###
-    ################
-    @table.by_row!
-
-    assert_equal(@rows[1], @table[1])
-    assert_raise(TypeError) { @table["B"] }
-
-    ############################
-    ### One Shot Mode Change ###
-    ############################
-    assert_equal(@rows[1], @table[1])
-    assert_equal([2, 5, 8], @table.by_col[1])
-    assert_equal(@rows[1], @table[1])
-  end
-
-  def test_set_row_or_column
-    ##################
-    ### Mixed Mode ###
-    ##################
-    # set row
-    @table[2] = [10, 11, 12]
-    assert_equal([%w[A B C], [1, 2, 3], [4, 5, 6], [10, 11, 12]], @table.to_a)
-
-    @table[3] = CSV::Row.new(%w[A B C], [13, 14, 15])
-    assert_equal( [%w[A B C], [1, 2, 3], [4, 5, 6], [10, 11, 12], [13, 14, 15]],
-                  @table.to_a )
-
-    # set col
-    @table["Type"] = "data"
-    assert_equal( [ %w[A B C Type],
-                    [1, 2, 3, "data"],
-                    [4, 5, 6, "data"],
-                    [10, 11, 12, "data"],
-                    [13, 14, 15, "data"] ],
-                  @table.to_a )
-
-    @table["Index"] = [1, 2, 3]
-    assert_equal( [ %w[A B C Type Index],
-                    [1, 2, 3, "data", 1],
-                    [4, 5, 6, "data", 2],
-                    [10, 11, 12, "data", 3],
-                    [13, 14, 15, "data", nil] ],
-                  @table.to_a )
-
-    @table["B"] = [100, 200]
-    assert_equal( [ %w[A B C Type Index],
-                    [1, 100, 3, "data", 1],
-                    [4, 200, 6, "data", 2],
-                    [10, nil, 12, "data", 3],
-                    [13, nil, 15, "data", nil] ],
-                  @table.to_a )
-
-    # verify resulting table
-    assert_equal(<<-CSV, @table.to_csv)
-A,B,C,Type,Index
-1,100,3,data,1
-4,200,6,data,2
-10,,12,data,3
-13,,15,data,
-    CSV
-
-    # with headers
-    @header_table["Type"] = "data"
-    assert_equal(%w[Type data data data], @header_table["Type"])
-
-    ###################
-    ### Column Mode ###
-    ###################
-    @table.by_col!
-
-    @table[1] = [2, 5, 11, 14]
-    assert_equal( [ %w[A B C Type Index],
-                    [1, 2, 3, "data", 1],
-                    [4, 5, 6, "data", 2],
-                    [10, 11, 12, "data", 3],
-                    [13, 14, 15, "data", nil] ],
-                  @table.to_a )
-
-    @table["Extra"] = "new stuff"
-    assert_equal( [ %w[A B C Type Index Extra],
-                    [1, 2, 3, "data", 1, "new stuff"],
-                    [4, 5, 6, "data", 2, "new stuff"],
-                    [10, 11, 12, "data", 3, "new stuff"],
-                    [13, 14, 15, "data", nil, "new stuff"] ],
-                  @table.to_a )
-
-    ################
-    ### Row Mode ###
-    ################
-    @table.by_row!
-
-    @table[1] = (1..6).to_a
-    assert_equal( [ %w[A B C Type Index Extra],
-                    [1, 2, 3, "data", 1, "new stuff"],
-                    [1, 2, 3, 4, 5, 6],
-                    [10, 11, 12, "data", 3, "new stuff"],
-                    [13, 14, 15, "data", nil, "new stuff"] ],
-                  @table.to_a )
-
-    assert_raise(TypeError) { @table["Extra"] = nil }
-  end
-
-  def test_set_by_col_with_header_row
-    r  = [ CSV::Row.new(%w{X Y Z}, [97, 98, 99], true) ]
-    t = CSV::Table.new(r)
-    t.by_col!
-    t['A'] = [42]
-    assert_equal(['A'], t['A'])
-  end
-
-  def test_each
-    ######################
-    ### Mixed/Row Mode ###
-    ######################
-    i = 0
-    @table.each do |row|
-      assert_equal(@rows[i], row)
-      i += 1
-    end
-
-    # verify that we can chain the call
-    assert_equal(@table, @table.each { })
-
-    # without block
-    enum = @table.each
-    assert_instance_of(Enumerator, enum)
-    assert_equal(@table.size, enum.size)
-
-    i = 0
-    enum.each do |row|
-      assert_equal(@rows[i], row)
-      i += 1
-    end
-
-    ###################
-    ### Column Mode ###
-    ###################
-    @table.by_col!
-
-    headers = @table.headers
-    @table.each do |header, column|
-      assert_equal(headers.shift, header)
-      assert_equal(@table[header], column)
-    end
-
-    # without block
-    enum = @table.each
-    assert_instance_of(Enumerator, enum)
-    assert_equal(@table.headers.size, enum.size)
-
-    headers = @table.headers
-    enum.each do |header, column|
-      assert_equal(headers.shift, header)
-      assert_equal(@table[header], column)
-    end
-
-    ############################
-    ### One Shot Mode Change ###
-    ############################
-    @table.by_col_or_row!
-
-    @table.each { |row| assert_instance_of(CSV::Row, row) }
-    @table.by_col.each { |tuple| assert_instance_of(Array, tuple) }
-    @table.each { |row| assert_instance_of(CSV::Row, row) }
-  end
-
-  def test_each_by_col_duplicated_headers
-    table = CSV.parse(<<-CSV, headers: true)
-a,a,,,b
-1,2,3,4,5
-11,12,13,14,15
-    CSV
-    assert_equal([
-                   ["a", ["1", "11"]],
-                   ["a", ["2", "12"]],
-                   [nil, ["3", "13"]],
-                   [nil, ["4", "14"]],
-                   ["b", ["5", "15"]],
-                 ],
-                 table.by_col.each.to_a)
-  end
-
-  def test_each_split
-    yielded_values = []
-    @table.each do |column1, column2, column3|
-      yielded_values << [column1, column2, column3]
-    end
-    assert_equal(@rows.collect(&:to_a),
-                 yielded_values)
-  end
-
-  def test_enumerable
-    assert_equal( @rows.values_at(0, 2),
-                  @table.select { |row| (row["B"] % 2).zero? } )
-
-    assert_equal(@rows[1], @table.find { |row| row["C"] > 5 })
-  end
-
-  def test_to_a
-    assert_equal([%w[A B C], [1, 2, 3], [4, 5, 6], [7, 8, 9]], @table.to_a)
-
-    # with headers
-    assert_equal( [%w[A B C], [1, 2, 3], [4, 5, 6], [7, 8, 9]],
-                  @header_table.to_a )
-  end
-
-  def test_to_csv
-    csv = <<-CSV
-A,B,C
-1,2,3
-4,5,6
-7,8,9
-    CSV
-
-    # normal conversion
-    assert_equal(csv, @table.to_csv)
-    assert_equal(csv, @table.to_s)  # alias
-
-    # with options
-    assert_equal( csv.gsub(",", "|").gsub("\n", "\r\n"),
-                  @table.to_csv(col_sep: "|", row_sep: "\r\n") )
-    assert_equal( csv.lines.to_a[1..-1].join(''),
-                  @table.to_csv(:write_headers => false) )
-
-    # with headers
-    assert_equal(csv, @header_table.to_csv)
-  end
-
-  def test_to_csv_limit_positive
-    assert_equal(<<-CSV, @table.to_csv(limit: 2))
-A,B,C
-1,2,3
-4,5,6
-    CSV
-  end
-
-  def test_to_csv_limit_positive_over
-    assert_equal(<<-CSV, @table.to_csv(limit: 5))
-A,B,C
-1,2,3
-4,5,6
-7,8,9
-    CSV
-  end
-
-  def test_to_csv_limit_zero
-    assert_equal(<<-CSV, @table.to_csv(limit: 0))
-A,B,C
-    CSV
-  end
-
-  def test_to_csv_limit_negative
-    assert_equal(<<-CSV, @table.to_csv(limit: -2))
-A,B,C
-1,2,3
-4,5,6
-    CSV
-  end
-
-  def test_to_csv_limit_negative_over
-    assert_equal(<<-CSV, @table.to_csv(limit: -5))
-A,B,C
-    CSV
-  end
-
-  def test_append
-    # verify that we can chain the call
-    assert_equal(@table, @table << [10, 11, 12])
-
-    # Array append
-    assert_equal(CSV::Row.new(%w[A B C], [10, 11, 12]), @table[-1])
-
-    # Row append
-    assert_equal(@table, @table << CSV::Row.new(%w[A B C], [13, 14, 15]))
-    assert_equal(CSV::Row.new(%w[A B C], [13, 14, 15]), @table[-1])
-  end
-
-  def test_delete_mixed_one
-    ##################
-    ### Mixed Mode ###
-    ##################
-    # delete a row
-    assert_equal(@rows[1], @table.delete(1))
-
-    # delete a col
-    assert_equal(@rows.map { |row| row["A"] }, @table.delete("A"))
-
-    # verify resulting table
-    assert_equal(<<-CSV, @table.to_csv)
-B,C
-2,3
-8,9
-    CSV
-  end
-
-  def test_delete_mixed_multiple
-    ##################
-    ### Mixed Mode ###
-    ##################
-    # delete row and col
-    second_row = @rows[1]
-    a_col = @rows.map { |row| row["A"] }
-    a_col_without_second_row = a_col[0..0] + a_col[2..-1]
-    assert_equal([
-                   second_row,
-                   a_col_without_second_row,
-                 ],
-                 @table.delete(1, "A"))
-
-    # verify resulting table
-    assert_equal(<<-CSV, @table.to_csv)
-B,C
-2,3
-8,9
-    CSV
-  end
-
-  def test_delete_column
-    ###################
-    ### Column Mode ###
-    ###################
-    @table.by_col!
-
-    assert_equal(@rows.map { |row| row[0] }, @table.delete(0))
-    assert_equal(@rows.map { |row| row["C"] }, @table.delete("C"))
-
-    # verify resulting table
-    assert_equal(<<-CSV, @table.to_csv)
-B
-2
-5
-8
-    CSV
-  end
-
-  def test_delete_row
-    ################
-    ### Row Mode ###
-    ################
-    @table.by_row!
-
-    assert_equal(@rows[1], @table.delete(1))
-    assert_raise(TypeError) { @table.delete("C") }
-
-    # verify resulting table
-    assert_equal(<<-CSV, @table.to_csv)
-A,B,C
-1,2,3
-7,8,9
-    CSV
-  end
-
-  def test_delete_with_blank_rows
-    data = "col1,col2\nra1,ra2\n\nrb1,rb2"
-    table = CSV.parse(data, :headers => true)
-    assert_equal(["ra2", nil, "rb2"], table.delete("col2"))
-  end
-
-  def test_delete_if_row
-    ######################
-    ### Mixed/Row Mode ###
-    ######################
-    # verify that we can chain the call
-    assert_equal(@table, @table.delete_if { |row| (row["B"] % 2).zero? })
-
-    # verify resulting table
-    assert_equal(<<-CSV, @table.to_csv)
-A,B,C
-4,5,6
-    CSV
-  end
-
-  def test_delete_if_row_without_block
-    ######################
-    ### Mixed/Row Mode ###
-    ######################
-    enum = @table.delete_if
-    assert_instance_of(Enumerator, enum)
-    assert_equal(@table.size, enum.size)
-
-    # verify that we can chain the call
-    assert_equal(@table, enum.each { |row| (row["B"] % 2).zero? })
-
-    # verify resulting table
-    assert_equal(<<-CSV, @table.to_csv)
-A,B,C
-4,5,6
-    CSV
-  end
-
-  def test_delete_if_column
-    ###################
-    ### Column Mode ###
-    ###################
-    @table.by_col!
-
-    assert_equal(@table, @table.delete_if { |h, v| h > "A" })
-    assert_equal(<<-CSV, @table.to_csv)
-A
-1
-4
-7
-    CSV
-  end
-
-  def test_delete_if_column_without_block
-    ###################
-    ### Column Mode ###
-    ###################
-    @table.by_col!
-
-    enum = @table.delete_if
-    assert_instance_of(Enumerator, enum)
-    assert_equal(@table.headers.size, enum.size)
-
-    assert_equal(@table, enum.each { |h, v| h > "A" })
-    assert_equal(<<-CSV, @table.to_csv)
-A
-1
-4
-7
-    CSV
-  end
-
-  def test_delete_headers_only
-    ###################
-    ### Column Mode ###
-    ###################
-    @header_only_table.by_col!
-
-    # delete by index
-    assert_equal([], @header_only_table.delete(0))
-    assert_equal(%w[B C], @header_only_table.headers)
-
-    # delete by header
-    assert_equal([], @header_only_table.delete("C"))
-    assert_equal(%w[B], @header_only_table.headers)
-  end
-
-  def test_values_at
-    ##################
-    ### Mixed Mode ###
-    ##################
-    # rows
-    assert_equal(@rows.values_at(0, 2), @table.values_at(0, 2))
-    assert_equal(@rows.values_at(1..2), @table.values_at(1..2))
-
-    # cols
-    assert_equal([[1, 3], [4, 6], [7, 9]], @table.values_at("A", "C"))
-    assert_equal([[2, 3], [5, 6], [8, 9]], @table.values_at("B".."C"))
-
-    ###################
-    ### Column Mode ###
-    ###################
-    @table.by_col!
-
-    assert_equal([[1, 3], [4, 6], [7, 9]], @table.values_at(0, 2))
-    assert_equal([[1, 3], [4, 6], [7, 9]], @table.values_at("A", "C"))
-
-    ################
-    ### Row Mode ###
-    ################
-    @table.by_row!
-
-    assert_equal(@rows.values_at(0, 2), @table.values_at(0, 2))
-    assert_raise(TypeError) { @table.values_at("A", "C") }
-
-    ############################
-    ### One Shot Mode Change ###
-    ############################
-    assert_equal(@rows.values_at(0, 2), @table.values_at(0, 2))
-    assert_equal([[1, 3], [4, 6], [7, 9]], @table.by_col.values_at(0, 2))
-    assert_equal(@rows.values_at(0, 2), @table.values_at(0, 2))
-  end
-
-  def test_array_delegation
-    assert_not_empty(@table, "Table was empty.")
-
-    assert_equal(@rows.size, @table.size)
-  end
-
-  def test_inspect_shows_current_mode
-    str = @table.inspect
-    assert_include(str, "mode:#{@table.mode}", "Mode not shown.")
-
-    @table.by_col!
-    str = @table.inspect
-    assert_include(str, "mode:#{@table.mode}", "Mode not shown.")
-  end
-
-  def test_inspect_encoding_is_ascii_compatible
-    assert_send([Encoding, :compatible?,
-                 Encoding.find("US-ASCII"),
-                 @table.inspect.encoding],
-                "inspect() was not ASCII compatible." )
-  end
-
-  def test_inspect_with_rows
-    additional_rows  = [ CSV::Row.new(%w{A B C}, [101, 102, 103]),
-                         CSV::Row.new(%w{A B C}, [104, 105, 106]),
-                         CSV::Row.new(%w{A B C}, [107, 108, 109]) ]
-    table = CSV::Table.new(@rows + additional_rows)
-    str_table = table.inspect
-
-    assert_equal(<<-CSV, str_table)
-#<CSV::Table mode:col_or_row row_count:7>
-A,B,C
-1,2,3
-4,5,6
-7,8,9
-101,102,103
-104,105,106
-    CSV
-  end
-
-  def test_dig_mixed
-    # by row
-    assert_equal(@rows[0], @table.dig(0))
-    assert_nil(@table.dig(100))  # empty row
-
-    # by col
-    assert_equal([2, 5, 8], @table.dig("B"))
-    assert_equal([nil] * @rows.size, @table.dig("Z"))  # empty col
-
-    # by row then col
-    assert_equal(2, @table.dig(0, 1))
-    assert_equal(6, @table.dig(1, "C"))
-
-    # by col then row
-    assert_equal(5, @table.dig("B", 1))
-    assert_equal(9, @table.dig("C", 2))
-  end
-
-  def test_dig_by_column
-    @table.by_col!
-
-    assert_equal([2, 5, 8], @table.dig(1))
-    assert_equal([2, 5, 8], @table.dig("B"))
-
-    # by col then row
-    assert_equal(5, @table.dig("B", 1))
-    assert_equal(9, @table.dig("C", 2))
-  end
-
-  def test_dig_by_row
-    @table.by_row!
-
-    assert_equal(@rows[1], @table.dig(1))
-    assert_raise(TypeError) { @table.dig("B") }
-
-    # by row then col
-    assert_equal(2, @table.dig(0, 1))
-    assert_equal(6, @table.dig(1, "C"))
-  end
-
-  def test_dig_cell
-    table = CSV::Table.new([CSV::Row.new(["A"], [["foo", ["bar", ["baz"]]]])])
-
-    # by row, col then cell
-    assert_equal("foo", table.dig(0, "A", 0))
-    assert_equal(["baz"], table.dig(0, "A", 1, 1))
-
-    # by col, row then cell
-    assert_equal("foo", table.dig("A", 0, 0))
-    assert_equal(["baz"], table.dig("A", 0, 1, 1))
-  end
-
-  def test_dig_cell_no_dig
-    table = CSV::Table.new([CSV::Row.new(["A"], ["foo"])])
-
-    # by row, col then cell
-    assert_raise(TypeError) do
-      table.dig(0, "A", 0)
-    end
-
-    # by col, row then cell
-    assert_raise(TypeError) do
-      table.dig("A", 0, 0)
-    end
-  end
-end
diff --git a/test/csv/write/test_converters.rb b/test/csv/write/test_converters.rb
deleted file mode 100644
index 0e0080b4c5cb73..00000000000000
--- a/test/csv/write/test_converters.rb
+++ /dev/null
@@ -1,53 +0,0 @@
-# -*- coding: utf-8 -*-
-# frozen_string_literal: false
-
-require_relative "../helper"
-
-module TestCSVWriteConverters
-  def test_one
-    assert_equal(%Q[=a,=b,=c\n],
-                 generate_line(["a", "b", "c"],
-                               write_converters: ->(value) {"=" + value}))
-  end
-
-  def test_multiple
-    assert_equal(%Q[=a_,=b_,=c_\n],
-                 generate_line(["a", "b", "c"],
-                               write_converters: [
-                                 ->(value) {"=" + value},
-                                 ->(value) {value + "_"},
-                               ]))
-  end
-
-  def test_nil_value
-    assert_equal(%Q[a,NaN,29\n],
-                 generate_line(["a", nil, 29],
-                               write_nil_value: "NaN"))
-  end
-
-  def test_empty_value
-    assert_equal(%Q[a,,29\n],
-                 generate_line(["a", "", 29],
-                               write_empty_value: nil))
-  end
-end
-
-class TestCSVWriteConvertersGenerateLine < Test::Unit::TestCase
-  include TestCSVWriteConverters
-  extend DifferentOFS
-
-  def generate_line(row, **kwargs)
-    CSV.generate_line(row, **kwargs)
-  end
-end
-
-class TestCSVWriteConvertersGenerate < Test::Unit::TestCase
-  include TestCSVWriteConverters
-  extend DifferentOFS
-
-  def generate_line(row, **kwargs)
-    CSV.generate(**kwargs) do |csv|
-      csv << row
-    end
-  end
-end
diff --git a/test/csv/write/test_force_quotes.rb b/test/csv/write/test_force_quotes.rb
deleted file mode 100644
index 622dcb021b4e37..00000000000000
--- a/test/csv/write/test_force_quotes.rb
+++ /dev/null
@@ -1,78 +0,0 @@
-# frozen_string_literal: false
-
-require_relative "../helper"
-
-module TestCSVWriteForceQuotes
-  def test_default
-    assert_equal(%Q[1,2,3#{$INPUT_RECORD_SEPARATOR}],
-                 generate_line(["1", "2", "3"]))
-  end
-
-  def test_true
-    assert_equal(%Q["1","2","3"#{$INPUT_RECORD_SEPARATOR}],
-                 generate_line(["1", "2", "3"],
-                               force_quotes: true))
-  end
-
-  def test_false
-    assert_equal(%Q[1,2,3#{$INPUT_RECORD_SEPARATOR}],
-                 generate_line(["1", "2", "3"],
-                               force_quotes: false))
-  end
-
-  def test_field_name
-    assert_equal(%Q["1",2,"3"#{$INPUT_RECORD_SEPARATOR}],
-                 generate_line(["1", "2", "3"],
-                               headers: ["a", "b", "c"],
-                               force_quotes: ["a", :c]))
-  end
-
-  def test_field_name_without_headers
-    force_quotes = ["a", "c"]
-    error = assert_raise(ArgumentError) do
-      generate_line(["1", "2", "3"],
-                    force_quotes: force_quotes)
-    end
-    assert_equal(":headers is required when you use field name " +
-                 "in :force_quotes: " +
-                 "#{force_quotes.first.inspect}: #{force_quotes.inspect}",
-                 error.message)
-  end
-
-  def test_field_index
-    assert_equal(%Q["1",2,"3"#{$INPUT_RECORD_SEPARATOR}],
-                 generate_line(["1", "2", "3"],
-                               force_quotes: [0, 2]))
-  end
-
-  def test_field_unknown
-    force_quotes = [1.1]
-    error = assert_raise(ArgumentError) do
-      generate_line(["1", "2", "3"],
-                    force_quotes: force_quotes)
-    end
-    assert_equal(":force_quotes element must be field index or field name: " +
-                 "#{force_quotes.first.inspect}: #{force_quotes.inspect}",
-                 error.message)
-  end
-end
-
-class TestCSVWriteForceQuotesGenerateLine < Test::Unit::TestCase
-  include TestCSVWriteForceQuotes
-  extend DifferentOFS
-
-  def generate_line(row, **kwargs)
-    CSV.generate_line(row, **kwargs)
-  end
-end
-
-class TestCSVWriteForceQuotesGenerate < Test::Unit::TestCase
-  include TestCSVWriteForceQuotes
-  extend DifferentOFS
-
-  def generate_line(row, **kwargs)
-    CSV.generate(**kwargs) do |csv|
-      csv << row
-    end
-  end
-end
diff --git a/test/csv/write/test_general.rb b/test/csv/write/test_general.rb
deleted file mode 100644
index 4788d99e81507b..00000000000000
--- a/test/csv/write/test_general.rb
+++ /dev/null
@@ -1,246 +0,0 @@
-# -*- coding: utf-8 -*-
-# frozen_string_literal: false
-
-require_relative "../helper"
-
-module TestCSVWriteGeneral
-  include CSVHelper
-
-  def test_tab
-    assert_equal("\t#{$INPUT_RECORD_SEPARATOR}",
-                 generate_line(["\t"]))
-  end
-
-  def test_quote_character
-    assert_equal(%Q[foo,"""",baz#{$INPUT_RECORD_SEPARATOR}],
-                 generate_line(["foo", %Q["], "baz"]))
-  end
-
-  def test_quote_character_double
-    assert_equal(%Q[foo,"""""",baz#{$INPUT_RECORD_SEPARATOR}],
-                 generate_line(["foo", %Q[""], "baz"]))
-  end
-
-  def test_quote
-    assert_equal(%Q[foo,"""bar""",baz#{$INPUT_RECORD_SEPARATOR}],
-                 generate_line(["foo", %Q["bar"], "baz"]))
-  end
-
-  def test_quote_lf
-    assert_equal(%Q["""\n","""\n"#{$INPUT_RECORD_SEPARATOR}],
-                 generate_line([%Q["\n], %Q["\n]]))
-  end
-
-  def test_quote_cr
-    assert_equal(%Q["""\r","""\r"#{$INPUT_RECORD_SEPARATOR}],
-                 generate_line([%Q["\r], %Q["\r]]))
-  end
-
-  def test_quote_last
-    assert_equal(%Q[foo,"bar"""#{$INPUT_RECORD_SEPARATOR}],
-                 generate_line(["foo", %Q[bar"]]))
-  end
-
-  def test_quote_lf_last
-    assert_equal(%Q[foo,"\nbar"""#{$INPUT_RECORD_SEPARATOR}],
-                 generate_line(["foo", %Q[\nbar"]]))
-  end
-
-  def test_quote_lf_value_lf
-    assert_equal(%Q[foo,"""\nbar\n"""#{$INPUT_RECORD_SEPARATOR}],
-                 generate_line(["foo", %Q["\nbar\n"]]))
-  end
-
-  def test_quote_lf_value_lf_nil
-    assert_equal(%Q[foo,"""\nbar\n""",#{$INPUT_RECORD_SEPARATOR}],
-                 generate_line(["foo", %Q["\nbar\n"], nil]))
-  end
-
-  def test_cr
-    assert_equal(%Q[foo,"\r",baz#{$INPUT_RECORD_SEPARATOR}],
-                 generate_line(["foo", "\r", "baz"]))
-  end
-
-  def test_lf
-    assert_equal(%Q[foo,"\n",baz#{$INPUT_RECORD_SEPARATOR}],
-                 generate_line(["foo", "\n", "baz"]))
-  end
-
-  def test_cr_lf
-    assert_equal(%Q[foo,"\r\n",baz#{$INPUT_RECORD_SEPARATOR}],
-                 generate_line(["foo", "\r\n", "baz"]))
-  end
-
-  def test_cr_dot_lf
-    assert_equal(%Q[foo,"\r.\n",baz#{$INPUT_RECORD_SEPARATOR}],
-                 generate_line(["foo", "\r.\n", "baz"]))
-  end
-
-  def test_cr_lf_cr
-    assert_equal(%Q[foo,"\r\n\r",baz#{$INPUT_RECORD_SEPARATOR}],
-                 generate_line(["foo", "\r\n\r", "baz"]))
-  end
-
-  def test_cr_lf_lf
-    assert_equal(%Q[foo,"\r\n\n",baz#{$INPUT_RECORD_SEPARATOR}],
-                 generate_line(["foo", "\r\n\n", "baz"]))
-  end
-
-  def test_cr_lf_comma
-    assert_equal(%Q["\r\n,"#{$INPUT_RECORD_SEPARATOR}],
-                 generate_line(["\r\n,"]))
-  end
-
-  def test_cr_lf_comma_nil
-    assert_equal(%Q["\r\n,",#{$INPUT_RECORD_SEPARATOR}],
-                 generate_line(["\r\n,", nil]))
-  end
-
-  def test_comma
-    assert_equal(%Q[","#{$INPUT_RECORD_SEPARATOR}],
-                 generate_line([","]))
-  end
-
-  def test_comma_double
-    assert_equal(%Q[",",","#{$INPUT_RECORD_SEPARATOR}],
-                 generate_line([",", ","]))
-  end
-
-  def test_comma_and_value
-    assert_equal(%Q[foo,"foo,bar",baz#{$INPUT_RECORD_SEPARATOR}],
-                 generate_line(["foo", "foo,bar", "baz"]))
-  end
-
-  def test_one_element
-    assert_equal(%Q[foo#{$INPUT_RECORD_SEPARATOR}],
-                 generate_line(["foo"]))
-  end
-
-  def test_nil_values_only
-    assert_equal(%Q[,,#{$INPUT_RECORD_SEPARATOR}],
-                 generate_line([nil, nil, nil]))
-  end
-
-  def test_nil_double_only
-    assert_equal(%Q[,#{$INPUT_RECORD_SEPARATOR}],
-                 generate_line([nil, nil]))
-  end
-
-  def test_nil_values
-    assert_equal(%Q[foo,,,#{$INPUT_RECORD_SEPARATOR}],
-                 generate_line(["foo", nil, nil, nil]))
-  end
-
-  def test_nil_value_first
-    assert_equal(%Q[,foo,baz#{$INPUT_RECORD_SEPARATOR}],
-                 generate_line([nil, "foo", "baz"]))
-  end
-
-  def test_nil_value_middle
-    assert_equal(%Q[foo,,baz#{$INPUT_RECORD_SEPARATOR}],
-                 generate_line(["foo", nil, "baz"]))
-  end
-
-  def test_nil_value_last
-    assert_equal(%Q[foo,baz,#{$INPUT_RECORD_SEPARATOR}],
-                 generate_line(["foo", "baz", nil]))
-  end
-
-  def test_nil_empty
-    assert_equal(%Q[,""#{$INPUT_RECORD_SEPARATOR}],
-                 generate_line([nil, ""]))
-  end
-
-  def test_nil_cr
-    assert_equal(%Q[,"\r"#{$INPUT_RECORD_SEPARATOR}],
-                 generate_line([nil, "\r"]))
-  end
-
-  def test_values
-    assert_equal(%Q[foo,bar#{$INPUT_RECORD_SEPARATOR}],
-                 generate_line(["foo", "bar"]))
-  end
-
-  def test_semi_colon
-    assert_equal(%Q[;#{$INPUT_RECORD_SEPARATOR}],
-                 generate_line([";"]))
-  end
-
-  def test_semi_colon_values
-    assert_equal(%Q[;,;#{$INPUT_RECORD_SEPARATOR}],
-                 generate_line([";", ";"]))
-  end
-
-  def test_tab_values
-    assert_equal(%Q[\t,\t#{$INPUT_RECORD_SEPARATOR}],
-                 generate_line(["\t", "\t"]))
-  end
-
-  def test_col_sep
-    assert_equal(%Q[a;b;;c#{$INPUT_RECORD_SEPARATOR}],
-                 generate_line(["a", "b", nil, "c"],
-                               col_sep: ";"))
-    assert_equal(%Q[a\tb\t\tc#{$INPUT_RECORD_SEPARATOR}],
-                 generate_line(["a", "b", nil, "c"],
-                               col_sep: "\t"))
-  end
-
-  def test_row_sep
-    assert_equal(%Q[a,b,,c\r\n],
-                 generate_line(["a", "b", nil, "c"],
-                               row_sep: "\r\n"))
-  end
-
-  def test_force_quotes
-    assert_equal(%Q["1","b","","already ""quoted"""#{$INPUT_RECORD_SEPARATOR}],
-                 generate_line([1, "b", nil, %Q{already "quoted"}],
-                               force_quotes: true))
-  end
-
-  def test_encoding_utf8
-    assert_equal(%Q[あ,い,う#{$INPUT_RECORD_SEPARATOR}],
-                 generate_line(["あ" , "い", "う"]))
-  end
-
-  def test_encoding_euc_jp
-    row = ["あ", "い", "う"].collect {|field| field.encode("EUC-JP")}
-    assert_equal(%Q[あ,い,う#{$INPUT_RECORD_SEPARATOR}].encode("EUC-JP"),
-                 generate_line(row))
-  end
-
-  def test_encoding_with_default_internal
-    with_default_internal(Encoding::UTF_8) do
-      row = ["あ", "い", "う"].collect {|field| field.encode("EUC-JP")}
-      assert_equal(%Q[あ,い,う#{$INPUT_RECORD_SEPARATOR}].encode("EUC-JP"),
-                   generate_line(row, encoding: Encoding::EUC_JP))
-    end
-  end
-
-  def test_with_default_internal
-    with_default_internal(Encoding::UTF_8) do
-      row = ["あ", "い", "う"].collect {|field| field.encode("EUC-JP")}
-      assert_equal(%Q[あ,い,う#{$INPUT_RECORD_SEPARATOR}].encode("EUC-JP"),
-                   generate_line(row))
-    end
-  end
-end
-
-class TestCSVWriteGeneralGenerateLine < Test::Unit::TestCase
-  include TestCSVWriteGeneral
-  extend DifferentOFS
-
-  def generate_line(row, **kwargs)
-    CSV.generate_line(row, **kwargs)
-  end
-end
-
-class TestCSVWriteGeneralGenerate < Test::Unit::TestCase
-  include TestCSVWriteGeneral
-  extend DifferentOFS
-
-  def generate_line(row, **kwargs)
-    CSV.generate(**kwargs) do |csv|
-      csv << row
-    end
-  end
-end
diff --git a/test/csv/write/test_quote_empty.rb b/test/csv/write/test_quote_empty.rb
deleted file mode 100644
index 70f73dad4ab0e2..00000000000000
--- a/test/csv/write/test_quote_empty.rb
+++ /dev/null
@@ -1,70 +0,0 @@
-# -*- coding: utf-8 -*-
-# frozen_string_literal: false
-
-require_relative "../helper"
-
-module TestCSVWriteQuoteEmpty
-  def test_quote_empty_default
-    assert_equal(%Q["""",""#{$INPUT_RECORD_SEPARATOR}],
-                 generate_line([%Q["], ""]))
-  end
-
-  def test_quote_empty_false
-    assert_equal(%Q["""",#{$INPUT_RECORD_SEPARATOR}],
-                 generate_line([%Q["], ""],
-                               quote_empty: false))
-  end
-
-  def test_empty_default
-    assert_equal(%Q[foo,"",baz#{$INPUT_RECORD_SEPARATOR}],
-                 generate_line(["foo", "", "baz"]))
-  end
-
-  def test_empty_false
-    assert_equal(%Q[foo,,baz#{$INPUT_RECORD_SEPARATOR}],
-                 generate_line(["foo", "", "baz"],
-                               quote_empty: false))
-  end
-
-  def test_empty_only_default
-    assert_equal(%Q[""#{$INPUT_RECORD_SEPARATOR}],
-                 generate_line([""]))
-  end
-
-  def test_empty_only_false
-    assert_equal(%Q[#{$INPUT_RECORD_SEPARATOR}],
-                 generate_line([""],
-                               quote_empty: false))
-  end
-
-  def test_empty_double_default
-    assert_equal(%Q["",""#{$INPUT_RECORD_SEPARATOR}],
-                 generate_line(["", ""]))
-  end
-
-  def test_empty_double_false
-    assert_equal(%Q[,#{$INPUT_RECORD_SEPARATOR}],
-                 generate_line(["", ""],
-                               quote_empty: false))
-  end
-end
-
-class TestCSVWriteQuoteEmptyGenerateLine < Test::Unit::TestCase
-  include TestCSVWriteQuoteEmpty
-  extend DifferentOFS
-
-  def generate_line(row, **kwargs)
-    CSV.generate_line(row, **kwargs)
-  end
-end
-
-class TestCSVWriteQuoteEmptyGenerate < Test::Unit::TestCase
-  include TestCSVWriteQuoteEmpty
-  extend DifferentOFS
-
-  def generate_line(row, **kwargs)
-    CSV.generate(**kwargs) do |csv|
-      csv << row
-    end
-  end
-end
diff --git a/test/date/test_date.rb b/test/date/test_date.rb
index 3f9c893efa6f35..7e37fc94d2644b 100644
--- a/test/date/test_date.rb
+++ b/test/date/test_date.rb
@@ -134,6 +134,10 @@ def test_hash
     assert_equal(9, h[Date.new(1999,5,25)])
     assert_equal(9, h[DateTime.new(1999,5,25)])
 
+    h = {}
+    h[Date.new(3171505571716611468830131104691,2,19)] = 0
+    assert_equal(true, h.key?(Date.new(3171505571716611468830131104691,2,19)))
+
     h = {}
     h[DateTime.new(1999,5,23)] = 0
     h[DateTime.new(1999,5,24)] = 1
diff --git a/test/date/test_date_conv.rb b/test/date/test_date_conv.rb
index ed478b41bb3c8d..772fbee9a4e6ce 100644
--- a/test/date/test_date_conv.rb
+++ b/test/date/test_date_conv.rb
@@ -89,11 +89,14 @@ def test_to_time__from_datetime
 		   [t.year, t.mon, t.mday, t.hour, t.min, t.sec, t.nsec])
     end
 
-    if Time.allocate.respond_to?(:subsec)
-      d = DateTime.new(2004, 9, 19, 1, 2, 3, 0) + 456789123456789123.to_r/86400000000000000000000
-      t = d.to_time.utc
-      assert_equal([2004, 9, 19, 1, 2, 3, Rational(456789123456789123,1000000000000000000)],
-		   [t.year, t.mon, t.mday, t.hour, t.min, t.sec, t.subsec])
+    # TruffleRuby does not support more than nanoseconds
+    unless RUBY_ENGINE == 'truffleruby'
+      if Time.allocate.respond_to?(:subsec)
+        d = DateTime.new(2004, 9, 19, 1, 2, 3, 0) + 456789123456789123.to_r/86400000000000000000000
+        t = d.to_time.utc
+        assert_equal([2004, 9, 19, 1, 2, 3, Rational(456789123456789123,1000000000000000000)],
+         [t.year, t.mon, t.mday, t.hour, t.min, t.sec, t.subsec])
+      end
     end
   end
 
diff --git a/test/date/test_date_parse.rb b/test/date/test_date_parse.rb
index 0b4a3836309769..cc29771cf85b22 100644
--- a/test/date/test_date_parse.rb
+++ b/test/date/test_date_parse.rb
@@ -589,10 +589,13 @@ def test__parse_odd_offset
   end
 
   def test__parse_too_long_year
-    str = "Jan 1" + "0" * 100_000
-    h = EnvUtil.timeout(3) {Date._parse(str, limit: 100_010)}
-    assert_equal(100_000, Math.log10(h[:year]))
-    assert_equal(1, h[:mon])
+    # Math.log10 does not support so big numbers like 10^100_000 on TruffleRuby
+    unless RUBY_ENGINE == 'truffleruby'
+      str = "Jan 1" + "0" * 100_000
+      h = EnvUtil.timeout(3) {Date._parse(str, limit: 100_010)}
+      assert_equal(100_000, Math.log10(h[:year]))
+      assert_equal(1, h[:mon])
+    end
 
     str = "Jan - 1" + "0" * 100_000
     h = EnvUtil.timeout(3) {Date._parse(str, limit: 100_010)}
@@ -867,9 +870,7 @@ def test__iso8601
     h = Date._iso8601(nil)
     assert_equal({}, h)
 
-    h = assert_deprecated_warn {Date._iso8601('01-02-03T04:05:06Z'.to_sym)}
-    assert_equal([2001, 2, 3, 4, 5, 6, 0],
-      h.values_at(:year, :mon, :mday, :hour, :min, :sec, :offset))
+    assert_raise(TypeError) {Date._iso8601('01-02-03T04:05:06Z'.to_sym)}
   end
 
   def test__rfc3339
@@ -889,9 +890,7 @@ def test__rfc3339
     h = Date._rfc3339(nil)
     assert_equal({}, h)
 
-    h = assert_deprecated_warn {Date._rfc3339('2001-02-03T04:05:06Z'.to_sym)}
-    assert_equal([2001, 2, 3, 4, 5, 6, 0],
-      h.values_at(:year, :mon, :mday, :hour, :min, :sec, :offset))
+    assert_raise(TypeError) {Date._rfc3339('2001-02-03T04:05:06Z'.to_sym)}
   end
 
   def test__xmlschema
@@ -978,9 +977,7 @@ def test__xmlschema
     h = Date._xmlschema(nil)
     assert_equal({}, h)
 
-    h = assert_deprecated_warn {Date._xmlschema('2001-02-03'.to_sym)}
-    assert_equal([2001, 2, 3, nil, nil, nil, nil],
-      h.values_at(:year, :mon, :mday, :hour, :min, :sec, :offset))
+    assert_raise(TypeError) {Date._xmlschema('2001-02-03'.to_sym)}
   end
 
   def test__rfc2822
@@ -1017,9 +1014,7 @@ def test__rfc2822
     h = Date._rfc2822(nil)
     assert_equal({}, h)
 
-    h = assert_deprecated_warn {Date._rfc2822('Sat, 3 Feb 2001 04:05:06 UT'.to_sym)}
-    assert_equal([2001, 2, 3, 4, 5, 6, 0],
-      h.values_at(:year, :mon, :mday, :hour, :min, :sec, :offset))
+    assert_raise(TypeError) {Date._rfc2822('Sat, 3 Feb 2001 04:05:06 UT'.to_sym)}
   end
 
   def test__httpdate
@@ -1044,9 +1039,7 @@ def test__httpdate
     h = Date._httpdate(nil)
     assert_equal({}, h)
 
-    h = assert_deprecated_warn {Date._httpdate('Sat, 03 Feb 2001 04:05:06 GMT'.to_sym)}
-    assert_equal([2001, 2, 3, 4, 5, 6, 0],
-      h.values_at(:year, :mon, :mday, :hour, :min, :sec, :offset))
+    assert_raise(TypeError) {Date._httpdate('Sat, 03 Feb 2001 04:05:06 GMT'.to_sym)}
   end
 
   def test__jisx0301
@@ -1127,9 +1120,7 @@ def test__jisx0301
     h = Date._jisx0301(nil)
     assert_equal({}, h)
 
-    h = assert_deprecated_warn {Date._jisx0301('H13.02.03T04:05:06.07+0100'.to_sym)}
-    assert_equal([2001, 2, 3, 4, 5, 6, 3600],
-      h.values_at(:year, :mon, :mday, :hour, :min, :sec, :offset))
+    assert_raise(TypeError) {Date._jisx0301('H13.02.03T04:05:06.07+0100'.to_sym)}
   end
 
   def test_iso8601
diff --git a/test/date/test_date_ractor.rb b/test/date/test_date_ractor.rb
index 7ec953d87ae5df..91ea38bb93407a 100644
--- a/test/date/test_date_ractor.rb
+++ b/test/date/test_date_ractor.rb
@@ -8,7 +8,7 @@ def code(klass = Date, share: false)
       share = #{share}
       d = Date.parse('Aug 23:55')
       Ractor.make_shareable(d) if share
-      d2, d3 = Ractor.new(d) { |d| [d, Date.parse(d.to_s)] }.take
+      d2, d3 = Ractor.new(d) { |d| [d, Date.parse(d.to_s)] }.value
       if share
         assert_same d, d2
       else
diff --git a/test/date/test_date_strftime.rb b/test/date/test_date_strftime.rb
index dd04c0d9a4ea3f..6ad69c0c2740ef 100644
--- a/test/date/test_date_strftime.rb
+++ b/test/date/test_date_strftime.rb
@@ -412,6 +412,15 @@ def test__different_format
     assert_equal('H31.04.30', Date.parse('2019-04-30').jisx0301)
     assert_equal('R01.05.01', Date.parse('2019-05-01').jisx0301)
 
+    assert_equal(d2, DateTime.iso8601('2001-02-03T04:05:06.123456+00:00', limit: 64))
+    assert_equal(d2, DateTime.rfc3339('2001-02-03T04:05:06.123456+00:00', limit: 64))
+    assert_equal(d2, DateTime.jisx0301('H13.02.03T04:05:06.123456+00:00', limit: 64))
+
+    exceeds = /string length \(\d+\) exceeds/
+    assert_raise_with_message(ArgumentError, exceeds) {DateTime.iso8601('2001-02-03T04:05:06.123456+00:00', limit: 1)}
+    assert_raise_with_message(ArgumentError, exceeds) {DateTime.rfc3339('2001-02-03T04:05:06.123456+00:00', limit: 1)}
+    assert_raise_with_message(ArgumentError, exceeds) {DateTime.jisx0301('H13.02.03T04:05:06.123456+00:00', limit: 1)}
+
     %w(M06.01.01
        M45.07.29
        T01.07.30
diff --git a/test/date/test_switch_hitter.rb b/test/date/test_switch_hitter.rb
index bdf299e03048d3..cc757825373b2a 100644
--- a/test/date/test_switch_hitter.rb
+++ b/test/date/test_switch_hitter.rb
@@ -97,6 +97,11 @@ def test_jd
 		 [d.year, d.mon, d.mday, d.hour, d.min, d.sec, d.offset])
   end
 
+  def test_ajd
+    assert_equal(Date.civil(2008, 1, 16).ajd, 4908963r/2)
+    assert_equal(Date.civil(-11082381539297990, 2, 19).ajd, -8095679714453739481r/2)
+  end
+
   def test_ordinal
     d = Date.ordinal
     assert_equal([-4712, 1], [d.year, d.yday])
diff --git a/test/did_you_mean/core_ext/test_name_error_extension.rb b/test/did_you_mean/core_ext/test_name_error_extension.rb
index c58b78455f51ea..116c7cd7b9a740 100644
--- a/test/did_you_mean/core_ext/test_name_error_extension.rb
+++ b/test/did_you_mean/core_ext/test_name_error_extension.rb
@@ -49,7 +49,7 @@ def test_correctable_error_objects_are_dumpable
 
     get_message(error)
 
-    assert_match(/^undefined method `sizee' for /,
+    assert_match(/^undefined method [`']sizee' for /,
                  Marshal.load(Marshal.dump(error)).original_message)
   end
 end
diff --git a/test/did_you_mean/spell_checking/test_method_name_check.rb b/test/did_you_mean/spell_checking/test_method_name_check.rb
index 4daaf7cec748b7..2ae5fa7d03f6d5 100644
--- a/test/did_you_mean/spell_checking/test_method_name_check.rb
+++ b/test/did_you_mean/spell_checking/test_method_name_check.rb
@@ -98,6 +98,8 @@ def nil.empty?
   end
 
   def test_does_not_append_suggestions_twice
+    omit "This test is not working with JRuby" if RUBY_ENGINE == "jruby"
+
     error = assert_raise NoMethodError do
       begin
         @user.firstname
@@ -110,6 +112,8 @@ def test_does_not_append_suggestions_twice
   end
 
   def test_does_not_append_suggestions_three_times
+    omit "This test is not working with JRuby" if RUBY_ENGINE == "jruby"
+
     error = assert_raise NoMethodError do
       begin
         @user.raise_no_method_error
diff --git a/test/did_you_mean/spell_checking/test_require_path_check.rb b/test/did_you_mean/spell_checking/test_require_path_check.rb
index d6c06e999916d0..1b96772d211dae 100644
--- a/test/did_you_mean/spell_checking/test_require_path_check.rb
+++ b/test/did_you_mean/spell_checking/test_require_path_check.rb
@@ -7,11 +7,11 @@ class RequirePathCheckTest < Test::Unit::TestCase
 
   def test_load_error_from_require_has_suggestions
     error = assert_raise LoadError do
-              require 'open_struct'
+              require 'open'
             end
 
-    assert_correction 'ostruct', error.corrections
-    assert_match "Did you mean?  ostruct", get_message(error)
+    assert_correction 'open3', error.corrections
+    assert_match "Did you mean?  open3", get_message(error)
   end
 
   def test_load_error_from_require_for_nested_files_has_suggestions
diff --git a/test/did_you_mean/test_ractor_compatibility.rb b/test/did_you_mean/test_ractor_compatibility.rb
index 7385f106122888..3166d0b6c5fee9 100644
--- a/test/did_you_mean/test_ractor_compatibility.rb
+++ b/test/did_you_mean/test_ractor_compatibility.rb
@@ -14,7 +14,7 @@ class ::Book; end
                   e.corrections # It is important to call the #corrections method within Ractor.
                   e
                 end
-              }.take
+              }.value
 
       assert_correction "Book", error.corrections
     CODE
@@ -32,7 +32,7 @@ def test_key_name_suggestion_works_in_ractor
                   e.corrections # It is important to call the #corrections method within Ractor.
                   e
                 end
-              }.take
+              }.value
 
       assert_correction ":bar", error.corrections
       assert_match "Did you mean?  :bar", get_message(error)
@@ -49,7 +49,7 @@ def test_method_name_suggestion_works_in_ractor
                   e.corrections # It is important to call the #corrections method within Ractor.
                   e
                 end
-              }.take
+              }.value
 
       assert_correction :to_s, error.corrections
       assert_match "Did you mean?  to_s",  get_message(error)
@@ -71,7 +71,7 @@ def test_pattern_key_name_suggestion_works_in_ractor
                     e.corrections # It is important to call the #corrections method within Ractor.
                     e
                   end
-                }.take
+                }.value
 
         assert_correction ":foo", error.corrections
         assert_match "Did you mean?  :foo", get_message(error)
@@ -90,7 +90,7 @@ class FirstNameError < NameError; end
           e.corrections # It is important to call the #corrections method within Ractor.
           e
         end
-      }.take
+      }.value
 
       assert_not_match(/Did you mean\?/, error.message)
     CODE
@@ -108,7 +108,7 @@ def test_variable_name_suggestion_works_in_ractor
           e.corrections # It is important to call the #corrections method within Ractor.
           e
         end
-      }.take
+      }.value
 
       assert_correction :in_ractor, error.corrections
       assert_match "Did you mean?  in_ractor", get_message(error)
diff --git a/test/digest/test_ractor.rb b/test/digest/test_ractor.rb
index b34a3653b4c54d..d7b03eaebacb0b 100644
--- a/test/digest/test_ractor.rb
+++ b/test/digest/test_ractor.rb
@@ -15,6 +15,10 @@ module TestDigestRactor
 
   def test_s_hexdigest
     assert_in_out_err([], <<-"end;", ["true", "true"], [])
+      class Ractor
+        alias value take
+      end unless Ractor.method_defined? :value # compat with Ruby 3.4 and olders
+
       $VERBOSE = nil
       require "digest"
       require "#{self.class::LIB}"
@@ -26,7 +30,7 @@ def test_s_hexdigest
         [r, hexdigest]
       end
       rs.each do |r, hexdigest|
-        puts r.take == hexdigest
+        puts r.value == hexdigest
       end
     end;
   end
diff --git a/test/drb/drbtest.rb b/test/drb/drbtest.rb
deleted file mode 100644
index 72220f32ef8bfc..00000000000000
--- a/test/drb/drbtest.rb
+++ /dev/null
@@ -1,396 +0,0 @@
-# frozen_string_literal: false
-require 'test/unit'
-require 'envutil'
-require 'drb/drb'
-require 'drb/extservm'
-require 'timeout'
-
-module DRbTests
-
-class DRbService
-  @@ruby = [EnvUtil.rubybin]
-  @@ruby << "-d" if $DEBUG
-  def self.add_service_command(nm)
-    dir = File.dirname(File.expand_path(__FILE__))
-    DRb::ExtServManager.command[nm] = @@ruby + ["#{dir}/#{nm}"]
-  end
-
-  %w(ut_drb.rb ut_array.rb ut_port.rb ut_large.rb ut_safe1.rb ut_eq.rb).each do |nm|
-    add_service_command(nm)
-  end
-
-  def initialize
-    @manager = DRb::ExtServManager.new
-    start
-    @manager.uri = server.uri
-  end
-
-  def start
-    @server = DRb::DRbServer.new('druby://localhost:0', manager, {})
-  end
-
-  attr_reader :manager
-  attr_reader :server
-
-  def ext_service(name)
-    EnvUtil.timeout(100, RuntimeError) do
-      manager.service(name)
-    end
-  end
-
-  def finish
-    server.instance_variable_get(:@grp).list.each {|th| th.join }
-    server.stop_service
-    manager.instance_variable_get(:@queue)&.push(nil)
-    manager.instance_variable_get(:@thread)&.join
-    DRb::DRbConn.stop_pool
-  end
-end
-
-class Onecky
-  include DRbUndumped
-  def initialize(n)
-    @num = n
-  end
-
-  def to_i
-    @num.to_i
-  end
-
-  def sleep(n)
-    Kernel.sleep(n)
-    to_i
-  end
-end
-
-class FailOnecky < Onecky
-  class OneckyError < RuntimeError; end
-  def to_i
-    raise(OneckyError, @num.to_s)
-  end
-end
-
-class XArray < Array
-  def initialize(ary)
-    ary.each do |x|
-      self.push(x)
-    end
-  end
-end
-
-module DRbBase
-  def setup
-    @drb_service ||= DRbService.new
-  end
-
-  def setup_service(service_name)
-    @service_name = service_name
-    @ext = @drb_service.ext_service(@service_name)
-    @there = @ext.front
-  end
-
-  def teardown
-    return if @omitted
-    @ext.stop_service if defined?(@ext) && @ext
-    if defined?(@service_name) && @service_name
-      @drb_service.manager.unregist(@service_name)
-      while (@there&&@there.to_s rescue nil)
-        # nop
-      end
-      signal = /mswin|mingw/ =~ RUBY_PLATFORM ? :KILL : :TERM
-      Thread.list.each {|th|
-        if th.respond_to?(:pid) && th[:drb_service] == @service_name
-          10.times do
-            begin
-              Process.kill signal, th.pid
-              break
-            rescue Errno::ESRCH
-              break
-            rescue Errno::EPERM # on Windows
-              sleep 0.1
-              retry
-            end
-          end
-          th.join
-        end
-      }
-    end
-    @drb_service.finish
-    DRb::DRbConn.stop_pool
-  end
-end
-
-module DRbCore
-  include DRbBase
-
-  def test_00_DRbObject
-    ro = DRbObject.new(nil, 'druby://localhost:12345')
-    assert_equal('druby://localhost:12345', ro.__drburi)
-    assert_equal(nil, ro.__drbref)
-
-    ro = DRbObject.new_with_uri('druby://localhost:12345')
-    assert_equal('druby://localhost:12345', ro.__drburi)
-    assert_equal(nil, ro.__drbref)
-
-    ro = DRbObject.new_with_uri('druby://localhost:12345?foobar')
-    assert_equal('druby://localhost:12345', ro.__drburi)
-    assert_equal(DRb::DRbURIOption.new('foobar'), ro.__drbref)
-  end
-
-  def test_01
-    assert_equal("hello", @there.hello)
-    onecky = Onecky.new('3')
-    assert_equal(6, @there.sample(onecky, 1, 2))
-    ary = @there.to_a
-    assert_kind_of(DRb::DRbObject, ary)
-
-    assert_respond_to(@there, [:to_a, true])
-    assert_respond_to(@there, [:eval, true])
-    assert_not_respond_to(@there, [:eval, false])
-    assert_not_respond_to(@there, :eval)
-  end
-
-  def test_01_02_loop
-    onecky = Onecky.new('3')
-    50.times do
-      assert_equal(6, @there.sample(onecky, 1, 2))
-      ary = @there.to_a
-      assert_kind_of(DRb::DRbObject, ary)
-    end
-  end
-
-  def test_02_basic_object
-    obj = @there.basic_object
-    assert_kind_of(DRb::DRbObject, obj)
-    assert_equal(1, obj.foo)
-    assert_raise(NoMethodError){obj.prot}
-    assert_raise(NoMethodError){obj.priv}
-  end
-
-  def test_02_unknown
-    obj = @there.unknown_class
-    assert_kind_of(DRb::DRbUnknown, obj)
-    assert_equal('DRbTests::Unknown2', obj.name)
-
-    obj = @there.unknown_module
-    assert_kind_of(DRb::DRbUnknown, obj)
-    assert_equal('DRbTests::DRbEx::', obj.name)
-
-    assert_raise(DRb::DRbUnknownError) do
-      @there.unknown_error
-    end
-
-    onecky = FailOnecky.new('3')
-
-    assert_raise(FailOnecky::OneckyError) do
-      @there.sample(onecky, 1, 2)
-    end
-  end
-
-  def test_03
-    assert_equal(8, @there.sum(1, 1, 1, 1, 1, 1, 1, 1))
-    assert_raise(DRb::DRbConnError) do
-      @there.sum(1, 1, 1, 1, 1, 1, 1, 1, 1)
-    end
-    assert_raise(DRb::DRbConnError) do
-      @there.sum('1' * 4096)
-    end
-  end
-
-  def test_04
-    assert_respond_to(@there, 'sum')
-    assert_not_respond_to(@there, "foobar")
-  end
-
-  def test_05_eq
-    a = @there.to_a[0]
-    b = @there.to_a[0]
-    assert_not_same(a, b)
-    assert_equal(a, b)
-    assert_equal(a, @there)
-    assert_equal(a.hash, b.hash)
-    assert_equal(a.hash, @there.hash)
-    assert_operator(a, :eql?, b)
-    assert_operator(a, :eql?, @there)
-  end
-
-  def test_06_timeout
-    omit if RUBY_PLATFORM.include?("armv7l-linux")
-    omit if RUBY_PLATFORM.include?("sparc-solaris2.10")
-    omit if RUBY_PLATFORM.include?("freebsd")
-    omit if defined?(RubyVM::RJIT) && RubyVM::RJIT.enabled? # expecting a certain delay is difficult for --jit-wait CI
-    Timeout.timeout(60) do
-      ten = Onecky.new(10)
-      assert_raise(Timeout::Error) do
-        @there.do_timeout(ten)
-      end
-      assert_raise(Timeout::Error) do
-        @there.do_timeout(ten)
-      end
-    end
-  end
-
-  def test_07_private_missing
-    e = assert_raise(NoMethodError) {
-      @there.method_missing(:eval, 'nil')
-    }
-    assert_match(/^private method \`eval\'/, e.message)
-
-    e = assert_raise(NoMethodError) {
-      @there.call_private_method
-    }
-    assert_match(/^private method \`call_private_method\'/, e.message)
-  end
-
-  def test_07_protected_missing
-    e = assert_raise(NoMethodError) {
-      @there.call_protected_method
-    }
-    assert_match(/^protected method \`call_protected_method\'/, e.message)
-  end
-
-  def test_07_public_missing
-    e = assert_raise(NoMethodError) {
-      @there.method_missing(:undefined_method_test)
-    }
-    assert_match(/^undefined method \`undefined_method_test\'/, e.message)
-  end
-
-  def test_07_send_missing
-    assert_raise(DRb::DRbConnError) do
-      @there.method_missing(:__send__, :to_s)
-    end
-    assert_equal(true, @there.missing)
-  end
-
-  def test_08_here
-    ro = DRbObject.new(nil, DRb.uri)
-    assert_kind_of(String, ro.to_s)
-
-    ro = DRbObject.new_with_uri(DRb.uri)
-    assert_kind_of(String, ro.to_s)
-  end
-
-  def uri_concat_option(uri, opt)
-    "#{uri}?#{opt}"
-  end
-
-  def test_09_option
-    uri = uri_concat_option(@there.__drburi, "foo")
-    ro = DRbObject.new_with_uri(uri)
-    assert_equal(ro.__drburi, @there.__drburi)
-    assert_equal(3, ro.size)
-
-    uri = uri_concat_option(@there.__drburi, "")
-    ro = DRbObject.new_with_uri(uri)
-    assert_equal(ro.__drburi, @there.__drburi)
-    assert_equal(DRb::DRbURIOption.new(''), ro.__drbref)
-
-    uri = uri_concat_option(@there.__drburi, "hello?world")
-    ro = DRbObject.new_with_uri(uri)
-    assert_equal(DRb::DRbURIOption.new('hello?world'), ro.__drbref)
-
-    uri = uri_concat_option(@there.__drburi, "?hello?world")
-    ro = DRbObject.new_with_uri(uri)
-    assert_equal(DRb::DRbURIOption.new('?hello?world'), ro.__drbref)
-  end
-
-  def test_10_yield
-    @there.simple_hash.each do |k, v|
-      assert_kind_of(String, k)
-      assert_kind_of(Symbol, v)
-    end
-  end
-
-  def test_10_yield_undumped
-    @there.xarray2_hash.each do |k, v|
-      assert_kind_of(String, k)
-      assert_kind_of(DRbObject, v)
-    end
-  end
-
-  def test_11_remote_no_method_error
-    assert_raise(DRb::DRbRemoteError) do
-      @there.remote_no_method_error
-    end
-    begin
-      @there.remote_no_method_error
-    rescue
-      error = $!
-      assert_match(/^undefined method .*\(NoMethodError\)/, error.message)
-      assert_equal('NoMethodError', error.reason)
-    end
-  end
-end
-
-module DRbAry
-  include DRbBase
-
-  def test_01
-    assert_kind_of(DRb::DRbObject, @there)
-  end
-
-  def test_02_collect
-    ary = @there.collect do |x| x + x end
-    assert_kind_of(Array, ary)
-    assert_equal([2, 4, 'IIIIII', 8, 'fivefive', 12], ary)
-  end
-
-  def test_03_redo
-    ary = []
-    count = 0
-    @there.each do |x|
-      count += 1
-      ary.push x
-      redo if count == 3
-    end
-    assert_equal([1, 2, 'III', 'III', 4, 'five', 6], ary)
-  end
-
-  # retry in block is not supported on ruby 1.9
-  #def test_04_retry
-  #  retried = false
-  #  ary = []
-  #  @there.each do |x|
-  #    ary.push x
-  #    if x == 4 && !retried
-  #	retried = true
-  #	retry
-  #    end
-  #  end
-  #  assert_equal([1, 2, 'III', 4, 1, 2, 'III', 4, 'five', 6], ary)
-  #end
-
-  def test_05_break
-    ary = []
-    @there.each do |x|
-      ary.push x
-      break if x == 4
-    end
-    assert_equal([1, 2, 'III', 4], ary)
-  end
-
-  def test_06_next
-    ary = []
-    @there.each do |x|
-      next if String === x
-      ary.push x
-    end
-    assert_equal([1, 2, 4, 6], ary)
-  end
-
-  class_eval <<EOS
-  def test_07_break_18
-    ary = []
-    result = @there.each do |x|
-      ary.push x
-      break(:done) if x == 4
-    end
-    assert_equal([1, 2, 'III', 4], ary)
-    assert_equal(:done, result)
-  end
-EOS
-
-end
-
-end
diff --git a/test/drb/ignore_test_drb.rb b/test/drb/ignore_test_drb.rb
deleted file mode 100644
index 996a554c0fefda..00000000000000
--- a/test/drb/ignore_test_drb.rb
+++ /dev/null
@@ -1,14 +0,0 @@
-# frozen_string_literal: false
-require 'drbtest'
-
-module DRbTests
-
-class TestDRbReusePort < Test::Unit::TestCase
-  include DRbAry
-
-  def setup
-    setup_service 'ut_port.rb'
-  end
-end
-
-end
diff --git a/test/drb/test_acl.rb b/test/drb/test_acl.rb
deleted file mode 100644
index ea7b32e76f526b..00000000000000
--- a/test/drb/test_acl.rb
+++ /dev/null
@@ -1,207 +0,0 @@
-# frozen_string_literal: false
-# acltest.rb - ACL unit test
-# Copyright (c) 2000 Masatoshi SEKI
-#
-# acltest.rb is copyrighted free software by Masatoshi SEKI.
-# You can redistribute it and/or modify it under the same terms as Ruby.
-
-require 'test/unit'
-require 'drb/acl'
-
-module DRbTests
-
-class SampleHosts
-  def initialize
-    list = %w(127.0.0.1 localhost
-              192.168.1.1 x68k.linux.or.jp
-              192.168.1.2 lc630.macos.or.jp
-              192.168.1.3 lib30.win32.or.jp
-              192.168.1.4 ns00.linux.or.jp
-              192.168.1.5 yum.macos.or.jp
-              ::ffff:192.168.1.5 ipv6.macos.or.jp
-              ::192.168.1.5 too.yumipv6.macos.or.jp
-              192.168.1.254 comstarz.foo.or.jp)
-
-    @hostlist = Array.new(list.size / 2)
-    @hostlist.each_index do |idx|
-      @hostlist[idx] = ["AF_INET", 10000, list[idx * 2 + 1], list[idx * 2]]
-    end
-
-    @hosts = Hash.new
-    @hostlist.each do |h|
-      @hosts[h[2].split('.')[0]] = h
-    end
-  end
-  attr_reader(:hostlist, :hosts)
-end
-
-
-class ACLEntryTest < Test::Unit::TestCase
-  HOSTS = SampleHosts.new
-
-  def setup
-    @hostlist = HOSTS.hostlist
-    @hosts = HOSTS.hosts
-  end
-
-  def test_all
-    a = ACL::ACLEntry.new("*")
-    b = ACL::ACLEntry.new("all")
-    @hostlist.each do |h|
-      assert_operator(a, :match, h)
-      assert_operator(b, :match, h)
-    end
-  end
-
-  def test_ip_v6
-    a = ACL::ACLEntry.new('::ffff:192.0.0.0/104')
-    assert_not_operator(a, :match, @hosts['localhost'])
-    assert_operator(a, :match, @hosts['yum'])
-    assert_operator(a, :match, @hosts['ipv6'])
-    assert_not_operator(a, :match, @hosts['too'])
-  end
-
-  def test_ip
-    a = ACL::ACLEntry.new('192.0.0.0/8')
-    assert_not_operator(a, :match, @hosts['localhost'])
-    assert_operator(a, :match, @hosts['yum'])
-
-    a = ACL::ACLEntry.new('192.168.1.0/255.255.255.0')
-    assert_not_operator(a, :match, @hosts['localhost'])
-    assert_operator(a, :match, @hosts['yum'])
-    assert_operator(a, :match, @hosts['x68k'])
-
-    a = ACL::ACLEntry.new('192.168.1.0/24')
-    assert_not_operator(a, :match, @hosts['localhost'])
-    assert_operator(a, :match, @hosts['yum'])
-    assert_operator(a, :match, @hosts['x68k'])
-
-    a = ACL::ACLEntry.new('92.0.0.0/8')
-    assert_not_operator(a, :match, @hosts['localhost'])
-    assert_not_operator(a, :match, @hosts['yum'])
-    assert_not_operator(a, :match, @hosts['x68k'])
-
-    a = ACL::ACLEntry.new('127.0.0.0/255.0.0.0')
-    assert_operator(a, :match, @hosts['localhost'])
-    assert_not_operator(a, :match, @hosts['yum'])
-    assert_not_operator(a, :match, @hosts['x68k'])
-
-    assert_raise(IPAddr::InvalidPrefixError) {
-      ACL::ACLEntry.new('192.168.0.0/33')
-    }
-    assert_raise(IPAddr::InvalidPrefixError) {
-      ACL::ACLEntry.new('192.168.0.0/255.255.0.255')
-    }
-  end
-
-  def test_name
-    a = ACL::ACLEntry.new('*.jp')
-    assert_not_operator(a, :match, @hosts['localhost'])
-    assert_operator(a, :match, @hosts['yum'])
-
-    a = ACL::ACLEntry.new('yum.*.jp')
-    assert_operator(a, :match, @hosts['yum'])
-    assert_not_operator(a, :match, @hosts['lc630'])
-
-    a = ACL::ACLEntry.new('*.macos.or.jp')
-    assert_operator(a, :match, @hosts['yum'])
-    assert_operator(a, :match, @hosts['lc630'])
-    assert_not_operator(a, :match, @hosts['lib30'])
-  end
-end
-
-class ACLListTest < Test::Unit::TestCase
-  HOSTS = SampleHosts.new
-
-  def setup
-    @hostlist = HOSTS.hostlist
-    @hosts = HOSTS.hosts
-  end
-
-  private
-  def build(list)
-    acl= ACL::ACLList.new
-    list.each do |s|
-      acl.add s
-    end
-    acl
-  end
-
-  public
-  def test_all_1
-    a = build(%w(all))
-    @hostlist.each do |h|
-      assert_operator(a, :match, h)
-    end
-  end
-
-  def test_all_2
-    a = build(%w(localhost 127.0.0.0/8 yum.* *))
-    @hostlist.each do |h|
-      assert_operator(a, :match, h)
-    end
-  end
-
-  def test_1
-    a = build(%w(192.168.1.0/255.255.255.252 yum.*.jp))
-    assert_operator(a, :match, @hosts['x68k'])
-    assert_operator(a, :match, @hosts['lc630'])
-    assert_operator(a, :match, @hosts['lib30'])
-    assert_not_operator(a, :match, @hosts['ns00'])
-    assert_operator(a, :match, @hosts['yum'])
-  end
-
-  def test_2
-    a = build(%w(*.linux.or.jp))
-    assert_not_operator(a, :match, @hosts['yum'])
-    assert_operator(a, :match, @hosts['x68k'])
-    assert_not_operator(a, :match, @hosts['lc630'])
-  end
-end
-
-class ACLTest < Test::Unit::TestCase
-  HOSTS = SampleHosts.new
-
-  def setup
-    @hostlist = HOSTS.hostlist
-    @hosts = HOSTS.hosts
-  end
-
-  def test_0
-    a = ACL.new
-    @hostlist.each do |h|
-      assert_operator(a, :allow_addr?, h)
-    end
-  end
-
-  def test_not_0
-    a = ACL.new([], ACL::ALLOW_DENY)
-    @hostlist.each do |h|
-      assert_not_operator(a, :allow_addr?, h)
-    end
-  end
-
-  def test_1
-    data = %w(deny all
-              allow localhost
-              allow x68k.*)
-
-    a = ACL.new(data)
-    assert_operator(a, :allow_addr?, @hosts['x68k'])
-    assert_operator(a, :allow_addr?, @hosts['localhost'])
-    assert_not_operator(a, :allow_addr?, @hosts['lc630'])
-  end
-
-  def test_not_1
-    data = %w(deny 192.0.0.0/8
-              allow localhost
-              allow x68k.*)
-
-    a = ACL.new(data, ACL::ALLOW_DENY)
-    assert_not_operator(a, :allow_addr?, @hosts['x68k'])
-    assert_operator(a, :allow_addr?, @hosts['localhost'])
-    assert_not_operator(a, :allow_addr?, @hosts['lc630'])
-  end
-end
-
-end
diff --git a/test/drb/test_drb.rb b/test/drb/test_drb.rb
deleted file mode 100644
index 11e2219badcf16..00000000000000
--- a/test/drb/test_drb.rb
+++ /dev/null
@@ -1,371 +0,0 @@
-# frozen_string_literal: false
-require_relative 'drbtest'
-
-module DRbTests
-
-class TestDRbCore < Test::Unit::TestCase
-  include DRbCore
-
-  def setup
-    super
-    setup_service 'ut_drb.rb'
-  end
-end
-
-module DRbYield
-  include DRbBase
-
-  def test_01_one
-    @there.echo_yield_1([]) {|one|
-      assert_equal([], one)
-    }
-
-    @there.echo_yield_1(1) {|one|
-      assert_equal(1, one)
-    }
-
-    @there.echo_yield_1(nil) {|one|
-      assert_equal(nil, one)
-    }
-  end
-
-  def test_02_two
-    @there.echo_yield_2([], []) {|one, two|
-      assert_equal([], one)
-      assert_equal([], two)
-    }
-
-    @there.echo_yield_2(1, 2) {|one, two|
-      assert_equal(1, one)
-      assert_equal(2, two)
-    }
-
-    @there.echo_yield_2(3, nil) {|one, two|
-      assert_equal(3, one)
-      assert_equal(nil, two)
-    }
-
-    @there.echo_yield_1([:key, :value]) {|one, two|
-      assert_equal(:key, one)
-      assert_equal(:value, two)
-    }
-  end
-
-  def test_03_many
-    @there.echo_yield_0 {|*s|
-      assert_equal([], s)
-    }
-    @there.echo_yield(nil) {|*s|
-      assert_equal([nil], s)
-    }
-    @there.echo_yield(1) {|*s|
-      assert_equal([1], s)
-    }
-    @there.echo_yield(1, 2) {|*s|
-      assert_equal([1, 2], s)
-    }
-    @there.echo_yield(1, 2, 3) {|*s|
-      assert_equal([1, 2, 3], s)
-    }
-    @there.echo_yield([], []) {|*s|
-      assert_equal([[], []], s)
-    }
-    @there.echo_yield([]) {|*s|
-      assert_equal([[]], s) # !
-    }
-  end
-
-  def test_04_many_to_one
-    @there.echo_yield_0 {|*s|
-      assert_equal([], s)
-    }
-    @there.echo_yield(nil) {|*s|
-      assert_equal([nil], s)
-    }
-    @there.echo_yield(1) {|*s|
-      assert_equal([1], s)
-    }
-    @there.echo_yield(1, 2) {|*s|
-      assert_equal([1, 2], s)
-    }
-    @there.echo_yield(1, 2, 3) {|*s|
-      assert_equal([1, 2, 3], s)
-    }
-    @there.echo_yield([], []) {|*s|
-      assert_equal([[], []], s)
-    }
-    @there.echo_yield([]) {|*s|
-      assert_equal([[]], s)
-    }
-  end
-
-  def test_05_array_subclass
-    @there.xarray_each {|x| assert_kind_of(XArray, x)}
-    @there.xarray_each {|*x| assert_kind_of(XArray, x[0])}
-  end
-end
-
-class TestDRbYield < Test::Unit::TestCase
-  include DRbYield
-
-  def setup
-    super
-    setup_service 'ut_drb.rb'
-  end
-end
-
-class TestDRbRubyYield < Test::Unit::TestCase
-  include DRbYield
-
-  def setup
-    @there = self
-    super
-  end
-
-  def echo_yield(*arg)
-    yield(*arg)
-  end
-
-  def echo_yield_0
-    yield
-  end
-
-  def echo_yield_1(a)
-    yield(a)
-  end
-
-  def echo_yield_2(a, b)
-    yield(a, b)
-  end
-
-  def xarray_each
-    xary = [XArray.new([0])]
-    xary.each do |x|
-      yield(x)
-    end
-  end
-
-end
-
-class TestDRbRuby18Yield < Test::Unit::TestCase
-  include DRbYield
-
-  class YieldTest18
-    def echo_yield(*arg, &proc)
-      proc.call(*arg)
-    end
-
-    def echo_yield_0(&proc)
-      proc.call
-    end
-
-    def echo_yield_1(a, &proc)
-      proc.call(a)
-    end
-
-    def echo_yield_2(a, b, &proc)
-      proc.call(a, b)
-    end
-
-    def xarray_each(&proc)
-      xary = [XArray.new([0])]
-      xary.each(&proc)
-    end
-
-  end
-
-  def setup
-    @there = YieldTest18.new
-    super
-  end
-end
-
-class TestDRbAry < Test::Unit::TestCase
-  include DRbAry
-
-  def setup
-    super
-    setup_service 'ut_array.rb'
-  end
-end
-
-class TestDRbMServer < Test::Unit::TestCase
-  include DRbBase
-
-  def setup
-    super
-    setup_service 'ut_drb.rb'
-    @server = (1..3).collect do |n|
-      DRb::DRbServer.new("druby://localhost:0", Onecky.new(n.to_s))
-    end
-  end
-
-  def teardown
-    @server.each do |s|
-      s.stop_service
-    end
-    super
-  end
-
-  def test_01
-    assert_equal(6, @there.sample(@server[0].front, @server[1].front, @server[2].front))
-  end
-end
-
-class TestDRbSafe1 < Test::Unit::TestCase
-  include DRbAry
-  def setup
-    super
-    setup_service 'ut_safe1.rb'
-  end
-end
-
-class TestDRbLarge < Test::Unit::TestCase
-  include DRbBase
-
-  def setup
-    super
-    setup_service 'ut_large.rb'
-  end
-
-  def test_01_large_ary
-    ary = [2] * 10240
-    assert_equal(10240, @there.size(ary))
-    assert_equal(20480, @there.sum(ary))
-    assert_equal(2 ** 10240, @there.multiply(ary))
-    assert_equal(2, @there.avg(ary))
-    assert_equal(2, @there.median(ary))
-  end
-
-  def test_02_large_ary
-    ary = ["Hello, World"] * 10240
-    assert_equal(10240, @there.size(ary))
-    assert_equal(ary[0..ary.length].inject(:+), @there.sum(ary))
-    assert_raise(TypeError) {@there.multiply(ary)}
-    assert_raise(TypeError) {@there.avg(ary)}
-    assert_raise(TypeError) {@there.median(ary)}
-  end
-
-  def test_03_large_ary
-    ary = [Thread.current] * 10240
-    assert_equal(10240, @there.size(ary))
-  end
-
-  def test_04_many_arg
-    assert_raise(DRb::DRbConnError) {
-      @there.arg_test(1, 2, 3, 4, 5, 6, 7, 8, 9, 0)
-    }
-  end
-
-  def test_05_too_large_ary
-    ary = ["Hello, World"] * 102400
-    exception = nil
-    begin
-      @there.size(ary)
-    rescue StandardError
-      exception = $!
-    end
-    assert_kind_of(StandardError, exception)
-  end
-
-  def test_06_array_operations
-    ary = [1,50,3,844,7,45,23]
-    assert_equal(7, @there.size(ary))
-    assert_equal(973, @there.sum(ary))
-    assert_equal(917217000, @there.multiply(ary))
-    assert_equal(139.0, @there.avg(ary))
-    assert_equal(23.0, @there.median(ary))
-
-    ary2 = [1,2,3,4]
-    assert_equal(4, @there.size(ary2))
-    assert_equal(10, @there.sum(ary2))
-    assert_equal(24, @there.multiply(ary2))
-    assert_equal(2.5, @there.avg(ary2))
-    assert_equal(2.5, @there.median(ary2))
-
-  end
-
-  def test_07_one_element_array
-    ary = [50]
-    assert_equal(1, @there.size(ary))
-    assert_equal(50, @there.sum(ary))
-    assert_equal(50, @there.multiply(ary))
-    assert_equal(50.0, @there.avg(ary))
-    assert_equal(50.0, @there.median(ary))
-  end
-
-  def test_08_empty_array
-    ary = []
-    assert_equal(0, @there.size(ary))
-    assert_equal(nil, @there.sum(ary))
-    assert_equal(nil, @there.multiply(ary))
-    assert_equal(nil, @there.avg(ary))
-    assert_equal(nil, @there.median(ary))
-  end
-end
-
-class TestBug4409 < Test::Unit::TestCase
-  include DRbBase
-
-  def setup
-    super
-    setup_service 'ut_eq.rb'
-  end
-
-  def test_bug4409
-    foo = @there.foo
-    assert_operator(@there, :foo?, foo)
-  end
-end
-
-class TestDRbAnyToS < Test::Unit::TestCase
-  class BO < BasicObject
-  end
-
-  def test_any_to_s
-    server = DRb::DRbServer.new('druby://localhost:0')
-    server.singleton_class.send(:public, :any_to_s)
-    assert_equal("foo:String", server.any_to_s("foo"))
-    assert_match(/\A#<DRbTests::TestDRbAnyToS::BO:0x[0-9a-f]+>\z/, server.any_to_s(BO.new))
-    server.stop_service
-    server.thread.join
-    DRb::DRbConn.stop_pool
-  end
-end
-
-class TestDRbTCP < Test::Unit::TestCase
-  def test_immediate_close
-    omit 'MinGW leaks a thread in this test' if /mingw/ =~ RUBY_PLATFORM
-    server = DRb::DRbServer.new('druby://localhost:0')
-    host, port, = DRb::DRbTCPSocket.send(:parse_uri, server.uri)
-    socket = TCPSocket.open host, port
-    socket.shutdown
-    socket.close
-    client = DRb::DRbTCPSocket.new(server.uri, socket)
-    assert client
-  ensure
-    client&.close
-    socket&.close
-    server&.stop_service
-    server&.thread&.join
-    DRb::DRbConn.stop_pool
-  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/test_drbobject.rb b/test/drb/test_drbobject.rb
deleted file mode 100644
index 2b0e2061ee4b5c..00000000000000
--- a/test/drb/test_drbobject.rb
+++ /dev/null
@@ -1,69 +0,0 @@
-require 'test/unit'
-require 'drb'
-require 'drb/timeridconv'
-require 'drb/weakidconv'
-
-module DRbObjectTest
-  class Foo
-    def initialize
-      @foo = 'foo'
-    end
-  end
-
-  def teardown
-    DRb.stop_service
-    DRb::DRbConn.stop_pool
-  end
-
-  def drb_eq(obj)
-    proxy = DRbObject.new(obj)
-    assert_equal(obj, DRb.to_obj(proxy.__drbref))
-  end
-
-  def test_DRbObject_id_dereference
-    drb_eq(Foo.new)
-    drb_eq(Foo)
-    drb_eq(File)
-    drb_eq(Enumerable)
-    drb_eq(nil)
-    drb_eq(1)
-    drb_eq($stdout)
-    drb_eq([])
-  end
-end
-
-class TestDRbObject < Test::Unit::TestCase
-  include DRbObjectTest
-
-  def setup
-    DRb.start_service
-  end
-end
-
-class TestDRbObjectTimerIdConv < Test::Unit::TestCase
-  include DRbObjectTest
-
-  def setup
-    @idconv = DRb::TimerIdConv.new
-    DRb.start_service(nil, nil, {:idconv => @idconv})
-  end
-
-  def teardown
-    super
-    # stop DRb::TimerIdConv::TimerHolder2#on_gc
-    @idconv.instance_eval do
-      @holder.instance_eval do
-        @expires = nil
-      end
-    end
-    GC.start
-  end
-end
-
-class TestDRbObjectWeakIdConv < Test::Unit::TestCase
-  include DRbObjectTest
-
-  def setup
-    DRb.start_service(nil, nil, {:idconv => DRb::WeakIdConv.new})
-  end
-end
diff --git a/test/drb/test_drbssl.rb b/test/drb/test_drbssl.rb
deleted file mode 100644
index 0c7e39ca7060a1..00000000000000
--- a/test/drb/test_drbssl.rb
+++ /dev/null
@@ -1,80 +0,0 @@
-# frozen_string_literal: false
-require_relative 'drbtest'
-
-begin
-  require 'drb/ssl'
-rescue LoadError
-end
-
-module DRbTests
-
-if Object.const_defined?("OpenSSL")
-
-
-class DRbSSLService < DRbService
-  %w(ut_drb_drbssl.rb ut_array_drbssl.rb).each do |nm|
-    add_service_command(nm)
-  end
-
-  def start
-    config = Hash.new
-
-    config[:SSLVerifyMode] = OpenSSL::SSL::VERIFY_PEER
-    config[:SSLVerifyCallback] = lambda{ |ok,x509_store|
-      true
-    }
-    begin
-      data = open("sample.key"){|io| io.read }
-      config[:SSLPrivateKey] = OpenSSL::PKey::RSA.new(data)
-      data = open("sample.crt"){|io| io.read }
-      config[:SSLCertificate] = OpenSSL::X509::Certificate.new(data)
-    rescue
-      # $stderr.puts "Switching to use self-signed certificate"
-      config[:SSLCertName] =
-        [ ["C","JP"], ["O","Foo.DRuby.Org"], ["CN", "Sample"] ]
-    end
-
-    @server = DRb::DRbServer.new('drbssl://localhost:0', manager, config)
-  end
-end
-
-class TestDRbSSLCore < Test::Unit::TestCase
-  include DRbCore
-  def setup
-    if RUBY_PLATFORM.match?(/mswin|mingw/)
-      @omitted = true
-      omit 'This test seems to randomly hang on Windows'
-    end
-    @drb_service = DRbSSLService.new
-    super
-    setup_service 'ut_drb_drbssl.rb'
-  end
-
-  def test_02_unknown
-  end
-
-  def test_01_02_loop
-  end
-
-  def test_05_eq
-  end
-end
-
-class TestDRbSSLAry < Test::Unit::TestCase
-  include DRbAry
-  def setup
-    if RUBY_PLATFORM.match?(/mswin|mingw/)
-      @omitted = true
-      omit 'This test seems to randomly hang on Windows'
-    end
-    LeakChecker.skip if defined?(LeakChecker)
-    @drb_service = DRbSSLService.new
-    super
-    setup_service 'ut_array_drbssl.rb'
-  end
-end
-
-
-end
-
-end
diff --git a/test/drb/test_drbunix.rb b/test/drb/test_drbunix.rb
deleted file mode 100644
index 95b3c3ca91a362..00000000000000
--- a/test/drb/test_drbunix.rb
+++ /dev/null
@@ -1,60 +0,0 @@
-# frozen_string_literal: false
-require_relative 'drbtest'
-
-begin
-  require 'drb/unix'
-rescue LoadError
-end
-
-module DRbTests
-
-if Object.const_defined?("UNIXServer")
-
-
-class DRbUNIXService < DRbService
-  %w(ut_drb_drbunix.rb ut_array_drbunix.rb).each do |nm|
-    add_service_command(nm)
-  end
-
-  def start
-    @server = DRb::DRbServer.new('drbunix:', manager, {})
-  end
-end
-
-class TestDRbUNIXCore < Test::Unit::TestCase
-  include DRbCore
-  def setup
-    @drb_service = DRbUNIXService.new
-    super
-    setup_service 'ut_drb_drbunix.rb'
-  end
-
-  def test_02_unknown
-  end
-
-  def test_01_02_loop
-  end
-
-  def test_05_eq
-  end
-
-  def test_bad_uri
-    assert_raise(DRb::DRbBadURI) do
-      DRb::DRbServer.new("badfile\n""drbunix:")
-    end
-  end
-end
-
-class TestDRbUNIXAry < Test::Unit::TestCase
-  include DRbAry
-  def setup
-    @drb_service = DRbUNIXService.new
-    super
-    setup_service 'ut_array_drbunix.rb'
-  end
-end
-
-
-end
-
-end
diff --git a/test/drb/ut_array.rb b/test/drb/ut_array.rb
deleted file mode 100644
index d13dda3d8e500a..00000000000000
--- a/test/drb/ut_array.rb
+++ /dev/null
@@ -1,17 +0,0 @@
-# frozen_string_literal: false
-require 'drb/drb'
-require 'drb/extserv'
-
-if __FILE__ == $0
-  def ARGV.shift
-    it = super()
-    raise "usage: #{$0} <uri> <name>" unless it
-    it
-  end
-
-  DRb.start_service('druby://localhost:0', [1, 2, 'III', 4, "five", 6])
-  es = DRb::ExtServ.new(ARGV.shift, ARGV.shift)
-  DRb.thread.join
-  es.stop_service if es.alive?
-end
-
diff --git a/test/drb/ut_array_drbssl.rb b/test/drb/ut_array_drbssl.rb
deleted file mode 100644
index 5938d9ff3dfb51..00000000000000
--- a/test/drb/ut_array_drbssl.rb
+++ /dev/null
@@ -1,39 +0,0 @@
-# frozen_string_literal: false
-require 'drb/drb'
-require 'drb/extserv'
-require 'drb/ssl'
-
-if __FILE__ == $0
-  def ARGV.shift
-    it = super()
-    raise "usage: #{$0} <uri> <name>" unless it
-    it
-  end
-
-  module DRbTests
-
-    TEST_KEY_DH1024 = OpenSSL::PKey::DH.new <<-_end_of_pem_
------BEGIN DH PARAMETERS-----
-MIGHAoGBAKnKQ8MNK6nYZzLrrcuTsLxuiJGXoOO5gT+tljOTbHBuiktdMTITzIY0
-pFxIvjG05D7HoBZQfrR0c92NGWPkAiCkhQKB8JCbPVzwNLDy6DZ0pmofDKrEsYHG
-AQjjxMXhwULlmuR/K+WwlaZPiLIBYalLAZQ7ZbOPeVkJ8ePao0eLAgEC
------END DH PARAMETERS-----
-  _end_of_pem_
-
-  end
-
-  config = Hash.new
-  config[:SSLTmpDhCallback] = proc { DRbTests::TEST_KEY_DH1024 }
-  config[:SSLVerifyMode] = OpenSSL::SSL::VERIFY_PEER
-  config[:SSLVerifyCallback] = lambda{|ok,x509_store|
-    true
-  }
-  config[:SSLCertName] =
-    [ ["C","JP"], ["O","Foo.DRuby.Org"], ["CN", "Sample"] ]
-
-  DRb.start_service('drbssl://localhost:0', [1, 2, 'III', 4, "five", 6], config)
-  es = DRb::ExtServ.new(ARGV.shift, ARGV.shift)
-  DRb.thread.join
-  es.stop_service if es.alive?
-end
-
diff --git a/test/drb/ut_array_drbunix.rb b/test/drb/ut_array_drbunix.rb
deleted file mode 100644
index b656cdaddd8476..00000000000000
--- a/test/drb/ut_array_drbunix.rb
+++ /dev/null
@@ -1,17 +0,0 @@
-# frozen_string_literal: false
-require 'drb/drb'
-require 'drb/extserv'
-
-if __FILE__ == $0
-  def ARGV.shift
-    it = super()
-    raise "usage: #{$0} <uri> <name>" unless it
-    it
-  end
-
-  DRb.start_service('drbunix:', [1, 2, 'III', 4, "five", 6])
-  es = DRb::ExtServ.new(ARGV.shift, ARGV.shift)
-  DRb.thread.join
-  es.stop_service if es.alive?
-end
-
diff --git a/test/drb/ut_drb.rb b/test/drb/ut_drb.rb
deleted file mode 100644
index 7c0603b009b221..00000000000000
--- a/test/drb/ut_drb.rb
+++ /dev/null
@@ -1,189 +0,0 @@
-# frozen_string_literal: false
-require 'drb/drb'
-require 'drb/extserv'
-require 'timeout'
-
-module DRbTests
-
-class XArray < Array
-  def initialize(ary)
-    ary.each do |x|
-      self.push(x)
-    end
-  end
-end
-
-class XArray2 < XArray
-  include DRbUndumped
-end
-
-class Unknown2
-  def initialize
-    @foo = 'unknown2'
-  end
-end
-
-class DRbEx
-  include DRbUndumped
-
-  class FooBar
-    def initialize
-      @foo = 'bar'
-    end
-  end
-
-  class UError < RuntimeError; end
-
-  def initialize
-    @xary2_hash = nil
-    @hash = nil
-    @hello = 'hello'
-  end
-  attr_reader :hello
-
-  def sample(a, b, c)
-    a.to_i + b.to_i + c.to_i
-  end
-
-  def sum(*a)
-    s = 0
-    a.each do |e|
-      s += e.to_i
-    end
-    s
-  end
-
-  def do_timeout(n)
-    Timeout.timeout(0.1) do
-      n.sleep(2)
-    end
-  end
-
-  def unknown_module
-    FooBar.new
-  end
-
-  class BO < ::BasicObject
-    def foo; 1 end
-    protected def prot; 2; end
-    private def priv; 3; end
-  end
-  def basic_object
-    @basic_object = BO.new
-  end
-
-  def unknown_class
-    Unknown2.new
-  end
-
-  def unknown_error
-    raise UError
-  end
-
-  def remote_no_method_error
-    invoke_no_method(self)
-  end
-
-  def test_yield
-    yield
-    yield([])
-    yield(*[])
-  end
-
-  def echo_yield(*arg)
-    yield(*arg)
-    nil
-  end
-
-  def echo_yield_0
-    yield
-    nil
-  end
-
-  def echo_yield_1(one)
-    yield(one)
-    nil
-  end
-
-  def echo_yield_2(one, two)
-    yield(one, two)
-    nil
-  end
-
-  def xarray_each
-    xary = [XArray.new([0])]
-    xary.each do |x|
-      yield(x)
-    end
-    nil
-  end
-
-  def xarray2_hash
-    unless @xary2_hash
-      @xary2_hash = { "a" => XArray2.new([0]), "b" => XArray2.new([1]) }
-    end
-    DRbObject.new(@xary2_hash)
-  end
-
-  def simple_hash
-    unless @hash
-      @hash = { 'a'=>:a, 'b'=>:b }
-    end
-    DRbObject.new(@hash)
-  end
-
-  def [](key)
-    key.to_s
-  end
-
-  def to_a
-    [self]
-  end
-
-  def method_missing(msg, *a, &b)
-    if msg == :missing
-      return true
-    else
-      super(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
-  end
-
-  protected
-  def call_protected_method
-    true
-  end
-end
-
-end
-
-if __FILE__ == $0
-  def ARGV.shift
-    it = super()
-    raise "usage: #{$0} <manager-uri> <name>" unless it
-    it
-  end
-
-  DRb::DRbServer.default_argc_limit(8)
-  DRb::DRbServer.default_load_limit(4096)
-  DRb.start_service('druby://localhost:0', DRbTests::DRbEx.new)
-  es = DRb::ExtServ.new(ARGV.shift, ARGV.shift)
-  DRb.thread.join
-  es.stop_service if es.alive?
-end
diff --git a/test/drb/ut_drb_drbssl.rb b/test/drb/ut_drb_drbssl.rb
deleted file mode 100644
index c8251716d6d687..00000000000000
--- a/test/drb/ut_drb_drbssl.rb
+++ /dev/null
@@ -1,40 +0,0 @@
-# frozen_string_literal: false
-require_relative "ut_drb"
-require 'drb/ssl'
-
-if __FILE__ == $0
-  def ARGV.shift
-    it = super()
-    raise "usage: #{$0} <manager-uri> <name>" unless it
-    it
-  end
-
-  module DRbTests
-
-    TEST_KEY_DH1024 = OpenSSL::PKey::DH.new <<-_end_of_pem_
------BEGIN DH PARAMETERS-----
-MIGHAoGBAKnKQ8MNK6nYZzLrrcuTsLxuiJGXoOO5gT+tljOTbHBuiktdMTITzIY0
-pFxIvjG05D7HoBZQfrR0c92NGWPkAiCkhQKB8JCbPVzwNLDy6DZ0pmofDKrEsYHG
-AQjjxMXhwULlmuR/K+WwlaZPiLIBYalLAZQ7ZbOPeVkJ8ePao0eLAgEC
------END DH PARAMETERS-----
-  _end_of_pem_
-
-  end
-
-  config = Hash.new
-  config[:SSLTmpDhCallback] = proc { DRbTests::TEST_KEY_DH1024 }
-  config[:SSLVerifyMode] = OpenSSL::SSL::VERIFY_PEER
-  config[:SSLVerifyCallback] = lambda{|ok,x509_store|
-    true
-  }
-  config[:SSLCertName] =
-    [ ["C","JP"], ["O","Foo.DRuby.Org"], ["CN", "Sample"] ]
-
-  DRb::DRbServer.default_argc_limit(8)
-  DRb::DRbServer.default_load_limit(4096)
-  DRb.start_service('drbssl://localhost:0', DRbTests::DRbEx.new, config)
-  es = DRb::ExtServ.new(ARGV.shift, ARGV.shift)
-  DRb.thread.join
-  es.stop_service if es.alive?
-end
-
diff --git a/test/drb/ut_drb_drbunix.rb b/test/drb/ut_drb_drbunix.rb
deleted file mode 100644
index ecf0920451a78d..00000000000000
--- a/test/drb/ut_drb_drbunix.rb
+++ /dev/null
@@ -1,18 +0,0 @@
-# frozen_string_literal: false
-require "#{File.dirname(File.expand_path(__FILE__))}/ut_drb"
-
-if __FILE__ == $0
-  def ARGV.shift
-    it = super()
-    raise "usage: #{$0} <manager-uri> <name>" unless it
-    it
-  end
-
-  DRb::DRbServer.default_argc_limit(8)
-  DRb::DRbServer.default_load_limit(4096)
-  DRb.start_service('drbunix:', DRbTests::DRbEx.new)
-  es = DRb::ExtServ.new(ARGV.shift, ARGV.shift)
-  DRb.thread.join
-  es.stop_service if es.alive?
-end
-
diff --git a/test/drb/ut_eq.rb b/test/drb/ut_eq.rb
deleted file mode 100644
index 56285a384f35d5..00000000000000
--- a/test/drb/ut_eq.rb
+++ /dev/null
@@ -1,37 +0,0 @@
-# frozen_string_literal: false
-require 'drb/drb'
-require 'drb/extserv'
-
-module DRbTests
-
-class Foo
-  include DRbUndumped
-end
-
-class Bar
-  include DRbUndumped
-  def initialize
-    @foo = Foo.new
-  end
-  attr_reader :foo
-
-  def foo?(foo)
-    @foo == foo
-  end
-end
-
-end
-
-if __FILE__ == $0
-  def ARGV.shift
-    it = super()
-    raise "usage: #{$0} <uri> <name>" unless it
-    it
-  end
-
-  DRb.start_service('druby://localhost:0', DRbTests::Bar.new)
-  es = DRb::ExtServ.new(ARGV.shift, ARGV.shift)
-  DRb.thread.join
-  es.stop_service if es.alive?
-end
-
diff --git a/test/drb/ut_large.rb b/test/drb/ut_large.rb
deleted file mode 100644
index 9376ff119df45c..00000000000000
--- a/test/drb/ut_large.rb
+++ /dev/null
@@ -1,62 +0,0 @@
-# frozen_string_literal: false
-require 'drb/drb'
-require 'drb/extserv'
-require 'timeout'
-
-module DRbTests
-
-class DRbLarge
-  include DRbUndumped
-
-  def size(ary)
-    ary.size
-  end
-
-  def sum(ary)
-    ary.inject(:+)
-  end
-
-  def multiply(ary)
-    ary.inject(:*)
-  end
-
-  def avg(ary)
-    return if ary.empty?
-    if ary.any? {|n| n.is_a? String}
-      raise TypeError
-    else
-      sum(ary).to_f / ary.count
-    end
-  end
-
-  def median(ary)
-    return if ary.empty?
-    if ary.any? {|n| n.is_a? String}
-      raise TypeError
-    else
-      avg ary.sort[((ary.length - 1) / 2)..(ary.length / 2)]
-    end
-  end
-
-  def arg_test(*arg)
-    # nop
-  end
-end
-
-end
-
-if __FILE__ == $0
-  def ARGV.shift
-    it = super()
-    raise "usage: #{$0} <manager-uri> <name>" unless it
-    it
-  end
-
-  DRb::DRbServer.default_argc_limit(3)
-  DRb::DRbServer.default_load_limit(100000)
-  DRb.start_service('druby://localhost:0', DRbTests::DRbLarge.new)
-  es = DRb::ExtServ.new(ARGV.shift, ARGV.shift)
-  DRb.thread.join
-  es.stop_service if es.alive?
-end
-
diff --git a/test/drb/ut_port.rb b/test/drb/ut_port.rb
deleted file mode 100644
index d317a307cc12d4..00000000000000
--- a/test/drb/ut_port.rb
+++ /dev/null
@@ -1,16 +0,0 @@
-# frozen_string_literal: false
-require 'drb/drb'
-require 'drb/extserv'
-
-if __FILE__ == $0
-  def ARGV.shift
-    it = super()
-    raise "usage: #{$0} <uri> <name>" unless it
-    it
-  end
-
-  DRb.start_service('druby://:8473', [1, 2, 'III', 4, "five", 6])
-  es = DRb::ExtServ.new(ARGV.shift, ARGV.shift)
-  DRb.thread.join
-  es.stop_service if es.alive?
-end
diff --git a/test/drb/ut_safe1.rb b/test/drb/ut_safe1.rb
deleted file mode 100644
index 4b16fa7d6d8eb7..00000000000000
--- a/test/drb/ut_safe1.rb
+++ /dev/null
@@ -1,17 +0,0 @@
-# frozen_string_literal: false
-require 'drb/drb'
-require 'drb/extserv'
-
-if __FILE__ == $0
-  def ARGV.shift
-    it = super()
-    raise "usage: #{$0} <uri> <name>" unless it
-    it
-  end
-
-  DRb.start_service('druby://localhost:0', [1, 2, 'III', 4, "five", 6],
-                    {:safe_level => 1})
-  es = DRb::ExtServ.new(ARGV.shift, ARGV.shift)
-  DRb.thread.join
-  es.stop_service if es.alive?
-end
diff --git a/test/drb/ut_timerholder.rb b/test/drb/ut_timerholder.rb
deleted file mode 100644
index 1753b30c74a9f5..00000000000000
--- a/test/drb/ut_timerholder.rb
+++ /dev/null
@@ -1,74 +0,0 @@
-# frozen_string_literal: false
-require 'test/unit'
-require 'drb/timeridconv'
-
-module DRbTests
-
-class TimerIdConvTest < Test::Unit::TestCase
-  def test_usecase_01
-    keeping = 0.1
-    idconv = DRb::TimerIdConv.new(keeping)
-
-    key = idconv.to_id(self)
-    assert_equal(key, self.__id__)
-    sleep(keeping)
-    assert_equal(idconv.to_id(false), false.__id__)
-    assert_equal(idconv.to_obj(key), self)
-    sleep(keeping)
-
-    assert_equal(idconv.to_obj(key), self)
-    sleep(keeping)
-
-    assert_equal(idconv.to_id(true), true.__id__)
-    sleep(keeping)
-
-    assert_raise do
-      assert_equal(idconv.to_obj(key), self)
-    end
-
-    assert_raise do
-      assert_equal(idconv.to_obj(false.__id__), false)
-    end
-
-    key = idconv.to_id(self)
-    assert_equal(key, self.__id__)
-    assert_equal(idconv.to_id(true), true.__id__)
-    sleep(keeping)
-    GC.start
-    sleep(keeping)
-    GC.start
-    assert_raise do
-      assert_equal(idconv.to_obj(key), self)
-    end
-  end
-
-  def test_usecase_02
-    keeping = 0.1
-    idconv = DRb::TimerIdConv.new(keeping)
-
-    key = idconv.to_id(self)
-    assert_equal(key, self.__id__)
-    sleep(keeping)
-    GC.start
-    sleep(keeping)
-    GC.start
-    assert_raise do
-      assert_equal(idconv.to_obj(key), self)
-    end
-    GC.start
-
-    key = idconv.to_id(self)
-    assert_equal(key, self.__id__)
-    sleep(keeping)
-    GC.start
-    sleep(keeping)
-    GC.start
-    assert_raise do
-      assert_equal(idconv.to_obj(key), self)
-    end
-  end
-end
-
-
-end
-
diff --git a/test/dtrace/helper.rb b/test/dtrace/helper.rb
index 7fa16965f12756..9e8c7ecd52c320 100644
--- a/test/dtrace/helper.rb
+++ b/test/dtrace/helper.rb
@@ -65,11 +65,7 @@ module DTrace
   class TestCase < Test::Unit::TestCase
     INCLUDE = File.expand_path('..', File.dirname(__FILE__))
 
-    case RUBY_PLATFORM
-    when /solaris/i
-      # increase bufsize to 8m (default 4m on Solaris)
-      DTRACE_CMD = %w[dtrace -b 8m]
-    when /darwin/i
+    if RUBY_PLATFORM =~ /darwin/i
       READ_PROBES = proc do |cmd|
         lines = nil
         PTY.spawn(*cmd) do |io, _, pid|
diff --git a/test/erb/test_erb.rb b/test/erb/test_erb.rb
index 555345a1401a6d..24f6cc5d8944e0 100644
--- a/test/erb/test_erb.rb
+++ b/test/erb/test_erb.rb
@@ -251,6 +251,12 @@ def test_explicit_trim_line_with_carriage_return
     assert_equal("line\r\n" * 3, erb.result)
   end
 
+  def test_safe_level_warning
+    assert_warning(/#{__FILE__}:#{__LINE__ + 1}/) do
+      @erb.new("", 1)
+    end
+  end
+
   def test_invalid_trim_mode
     pend if RUBY_ENGINE == 'truffleruby'
 
diff --git a/test/error_highlight/test_error_highlight.rb b/test/error_highlight/test_error_highlight.rb
index 006ecb05bf796e..8aa5eb9c8dd45f 100644
--- a/test/error_highlight/test_error_highlight.rb
+++ b/test/error_highlight/test_error_highlight.rb
@@ -1,9 +1,12 @@
 require "test/unit"
 
 require "error_highlight"
+require "did_you_mean"
 require "tempfile"
 
 class ErrorHighlightTest < Test::Unit::TestCase
+  ErrorHighlight::DefaultFormatter.max_snippet_width = 80
+
   class DummyFormatter
     def self.message_for(corrections)
       ""
@@ -23,17 +26,40 @@ def teardown
     end
   end
 
+  begin
+    method_not_exist
+  rescue NameError
+    if $!.message.include?("`")
+      def preprocess(msg)
+        msg
+      end
+    else
+      def preprocess(msg)
+        msg.sub("`", "'")
+      end
+    end
+  end
+
   if Exception.method_defined?(:detailed_message)
     def assert_error_message(klass, expected_msg, &blk)
       omit unless klass < ErrorHighlight::CoreExt
       err = assert_raise(klass, &blk)
-      assert_equal(expected_msg.chomp, err.detailed_message(highlight: false).sub(/ \((?:NoMethod|Name)Error\)/, ""))
+      spot = ErrorHighlight.spot(err)
+      if spot
+        assert_kind_of(Integer, spot[:first_lineno])
+        assert_kind_of(Integer, spot[:first_column])
+        assert_kind_of(Integer, spot[:last_lineno])
+        assert_kind_of(Integer, spot[:last_column])
+        assert_kind_of(String, spot[:snippet])
+        assert_kind_of(Array, spot[:script_lines])
+      end
+      assert_equal(preprocess(expected_msg).chomp, err.detailed_message(highlight: false).sub(/ \((?:NoMethod|Name)Error\)/, ""))
     end
   else
     def assert_error_message(klass, expected_msg, &blk)
       omit unless klass < ErrorHighlight::CoreExt
       err = assert_raise(klass, &blk)
-      assert_equal(expected_msg.chomp, err.message)
+      assert_equal(preprocess(expected_msg).chomp, err.message)
     end
   end
 
@@ -182,6 +208,15 @@ def test_CALL_arg_6
     end
   end
 
+  def test_CALL_arg_7
+    assert_error_message(ArgumentError, <<~END) do
+tried to create Proc object without a block (ArgumentError)
+    END
+
+      Proc.new
+    end
+  end
+
   def test_QCALL_1
     assert_error_message(NoMethodError, <<~END) do
 undefined method `foo' for #{ ONE_RECV_MESSAGE }
@@ -858,7 +893,7 @@ def test_COLON2_4
     def test_COLON2_5
       # Unfortunately, we cannot identify which `NotDefined` caused the NameError
       assert_error_message(NameError, <<~END) do
-uninitialized constant ErrorHighlightTest::NotDefined
+  uninitialized constant ErrorHighlightTest::NotDefined
       END
 
         ErrorHighlightTest::NotDefined::NotDefined
@@ -1217,7 +1252,7 @@ def custom_formatter.message_for(spot)
     assert_error_message(NoMethodError, <<~END) do
 undefined method `time' for #{ ONE_RECV_MESSAGE }
 
-{:first_lineno=>#{ __LINE__ + 3 }, :first_column=>7, :last_lineno=>#{ __LINE__ + 3 }, :last_column=>12, :snippet=>"      1.time {}\\n"}
+#{{ first_lineno: __LINE__ + 3, first_column: 7, last_lineno: __LINE__ + 3, last_column: 12, snippet: "      1.time {}\n" }.inspect}
     END
 
       1.time {}
@@ -1261,6 +1296,151 @@ def test_no_final_newline
     end
   end
 
+  def test_errors_on_small_terminal_window_at_the_end
+    assert_error_message(NoMethodError, <<~END) do
+undefined method `time' for #{ ONE_RECV_MESSAGE }
+
+...0000000000000000000000000000000000000000000000000000000000000000 + 1.time {}
+                                                                       ^^^^^
+    END
+
+    100000000000000000000000000000000000000000000000000000000000000000000000000000 + 1.time {}
+    end
+  end
+
+  def test_errors_on_small_terminal_window_at_the_beginning
+    assert_error_message(NoMethodError, <<~END) do
+undefined method `time' for #{ ONE_RECV_MESSAGE }
+
+      1.time { 10000000000000000000000000000000000000000000000000000000000000...
+       ^^^^^
+    END
+
+      1.time { 100000000000000000000000000000000000000000000000000000000000000000000000000000 }
+
+    end
+  end
+
+  def test_errors_on_small_terminal_window_at_the_middle_near_beginning
+    assert_error_message(NoMethodError, <<~END) do
+undefined method `time' for #{ ONE_RECV_MESSAGE }
+
+    100000000000000000000000000000000000000 + 1.time { 1000000000000000000000...
+                                               ^^^^^
+    END
+
+    100000000000000000000000000000000000000 + 1.time { 100000000000000000000000000000000000000 }
+    end
+  end
+
+  def test_errors_on_small_terminal_window_at_the_middle
+    assert_error_message(NoMethodError, <<~END) do
+undefined method `time' for #{ ONE_RECV_MESSAGE }
+
+...000000000000000000000000000000000 + 1.time { 10000000000000000000000000000...
+                                        ^^^^^
+    END
+
+    10000000000000000000000000000000000000000000000000000000000000000000000 + 1.time { 1000000000000000000000000000000 }
+    end
+  end
+
+  def test_errors_on_extremely_small_terminal_window
+    custom_max_width = 30
+    original_max_width = ErrorHighlight::DefaultFormatter.max_snippet_width
+
+    ErrorHighlight::DefaultFormatter.max_snippet_width = custom_max_width
+
+    assert_error_message(NoMethodError, <<~END) do
+undefined method `time' for #{ ONE_RECV_MESSAGE }
+
+...00000000 + 1.time { 1000...
+               ^^^^^
+    END
+
+      100000000000000 + 1.time { 100000000000000 }
+    end
+  ensure
+    ErrorHighlight::DefaultFormatter.max_snippet_width = original_max_width
+  end
+
+  def test_errors_on_terminal_window_smaller_than_min_width
+    custom_max_width = 5
+    original_max_width = ErrorHighlight::DefaultFormatter.max_snippet_width
+    min_snippet_width = ErrorHighlight::DefaultFormatter::MIN_SNIPPET_WIDTH
+
+    warning = nil
+    original_warn = Warning.instance_method(:warn)
+    Warning.class_eval do
+      remove_method(:warn)
+      define_method(:warn) {|str| warning = str}
+    end
+    begin
+      ErrorHighlight::DefaultFormatter.max_snippet_width = custom_max_width
+    ensure
+      Warning.class_eval do
+        remove_method(:warn)
+        define_method(:warn, original_warn)
+      end
+    end
+    assert_match "'max_snippet_width' adjusted to minimum value of #{min_snippet_width}", warning
+
+    assert_error_message(NoMethodError, <<~END) do
+undefined method `time' for #{ ONE_RECV_MESSAGE }
+
+...000 + 1.time {...
+          ^^^^^
+    END
+
+    100000000000000 + 1.time { 100000000000000 }
+    end
+  ensure
+    ErrorHighlight::DefaultFormatter.max_snippet_width = original_max_width
+  end
+
+  def test_errors_on_terminal_window_when_truncation_is_disabled
+    custom_max_width = nil
+    original_max_width = ErrorHighlight::DefaultFormatter.max_snippet_width
+
+    ErrorHighlight::DefaultFormatter.max_snippet_width = custom_max_width
+
+    assert_error_message(NoMethodError, <<~END) do
+undefined method `time' for #{ ONE_RECV_MESSAGE }
+
+      10000000000000000000000000000000000000000000000000000000000000000000000 + 1.time { 1000000000000000000000000000000 }
+                                                                                 ^^^^^
+    END
+
+      10000000000000000000000000000000000000000000000000000000000000000000000 + 1.time { 1000000000000000000000000000000 }
+    end
+  ensure
+    ErrorHighlight::DefaultFormatter.max_snippet_width = original_max_width
+  end
+
+  def test_errors_on_small_terminal_window_when_larger_than_viewport
+    assert_error_message(NoMethodError, <<~END) do
+undefined method `timessssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssss!' for #{ ONE_RECV_MESSAGE }
+
+      1.timesssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssss...
+       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+    END
+
+      1.timessssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssss!
+    end
+  end
+
+  def test_errors_on_small_terminal_window_when_exact_size_of_viewport
+    assert_error_message(NoMethodError, <<~END) do
+undefined method `timessssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssss!' for #{ ONE_RECV_MESSAGE }
+
+      1.timessssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssss!...
+       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+    END
+
+      1.timessssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssss! * 1000
+    end
+  end
+
   def test_simulate_funcallv_from_embedded_ruby
     assert_error_message(NoMethodError, <<~END) do
 undefined method `foo' for #{ NIL_RECV_MESSAGE }
@@ -1321,6 +1501,11 @@ def test_spot_with_backtrace_location
   def test_spot_with_node
     omit unless RubyVM::AbstractSyntaxTree.respond_to?(:node_id_for_backtrace_location)
 
+    # We can't revisit instruction sequences to find node ids if the prism
+    # compiler was used instead of the parse.y compiler. In that case, we'll
+    # omit some tests.
+    omit if RubyVM::InstructionSequence.compile("").to_a[4][:parser] == :prism
+
     begin
       raise_name_error
     rescue NameError => exc
diff --git a/test/etc/test_etc.rb b/test/etc/test_etc.rb
index 2eddcf49d732e8..c2e3af6317ecbb 100644
--- a/test/etc/test_etc.rb
+++ b/test/etc/test_etc.rb
@@ -21,7 +21,7 @@ def test_passwd
       assert_instance_of(String, s.shell)
       assert_kind_of(Integer, s.change) if s.respond_to?(:change)
       assert_kind_of(Integer, s.quota) if s.respond_to?(:quota)
-      assert(s.age.is_a?(Integer) || s.age.is_a?(String)) if s.respond_to?(:age)
+      assert(s.age.is_a?(Integer) || s.age.is_a?(String), s.age) if s.respond_to?(:age)
       assert_instance_of(String, s.uclass) if s.respond_to?(:uclass)
       assert_instance_of(String, s.comment) if s.respond_to?(:comment)
       assert_kind_of(Integer, s.expire) if s.respond_to?(:expire)
@@ -160,7 +160,7 @@ def test_pathconf
     end
     IO.pipe {|r, w|
       val = w.pathconf(Etc::PC_PIPE_BUF)
-      assert(val.nil? || val.kind_of?(Integer))
+      assert_kind_of(Integer, val) if val
     }
   end if defined?(Etc::PC_PIPE_BUF)
 
@@ -169,28 +169,89 @@ def test_nprocessors
     assert_operator(1, :<=, n)
   end
 
-  def test_ractor
+  def test_sysconfdir
+    assert_operator(File, :absolute_path?, Etc.sysconfdir)
+  end if File.method_defined?(:absolute_path?)
+
+  # All Ractor-safe methods should be tested here
+  def test_ractor_parallel
+    omit "This test is flaky and intermittently failing now on ModGC workflow" if ENV['GITHUB_WORKFLOW'] == 'ModGC'
+
+    assert_ractor(<<~RUBY, require: 'etc', timeout: 60)
+      10.times.map do
+        Ractor.new do
+          100.times do
+            raise unless String === Etc.systmpdir
+            raise unless Hash === Etc.uname
+            if defined?(Etc::SC_CLK_TCK)
+              raise unless Integer === Etc.sysconf(Etc::SC_CLK_TCK)
+            end
+            if defined?(Etc::CS_PATH)
+              raise unless String === Etc.confstr(Etc::CS_PATH)
+            end
+            if defined?(Etc::PC_PIPE_BUF)
+              IO.pipe { |r, w|
+                val = w.pathconf(Etc::PC_PIPE_BUF)
+                raise unless val.nil? || val.kind_of?(Integer)
+              }
+            end
+            raise unless Integer === Etc.nprocessors
+          end
+        end
+      end.each(&:join)
+    RUBY
+  end
+
+  def test_ractor_unsafe
+    assert_ractor(<<~RUBY, require: 'etc')
+      r = Ractor.new do
+        begin
+          Etc.passwd
+        rescue => e
+          e.class
+        end
+      end.value
+      assert_equal Ractor::UnsafeError, r
+    RUBY
+  end
+
+  def test_ractor_passwd
+    omit("https://bugs.ruby-lang.org/issues/21115")
     return unless Etc.passwd # => skip test if no platform support
     Etc.endpwent
 
     assert_ractor(<<~RUBY, require: 'etc')
-      ractor = Ractor.new do
+      ractor = Ractor.new port = Ractor::Port.new do |port|
         Etc.passwd do |s|
-          Ractor.yield :sync
-          Ractor.yield s.name
+          port << :sync
+          port << s.name
           break :done
         end
       end
-      ractor.take # => :sync
+      port.receive # => :sync
       assert_raise RuntimeError, /parallel/ do
         Etc.passwd {}
       end
-      name = ractor.take # => first name
-      ractor.take # => :done
+      name = port.receive # => first name
+      ractor.join # => :done
       name2 = Etc.passwd do |s|
         break s.name
       end
       assert_equal(name2, name)
     RUBY
   end
+
+  def test_ractor_getgrgid
+    omit("https://bugs.ruby-lang.org/issues/21115")
+
+    assert_ractor(<<~RUBY, require: 'etc')
+      20.times.map do
+        Ractor.new do
+          1000.times do
+            raise unless Etc.getgrgid(Process.gid).gid == Process.gid
+          end
+        end
+      end.each(&:join)
+    RUBY
+  end
 end
diff --git a/test/fiber/scheduler.rb b/test/fiber/scheduler.rb
index 5090271db157db..2401cb30d34563 100644
--- a/test/fiber/scheduler.rb
+++ b/test/fiber/scheduler.rb
@@ -27,7 +27,9 @@ class Scheduler
     Warning[:experimental] = experimental
   end
 
-  def initialize
+  def initialize(fiber = Fiber.current)
+    @fiber = fiber
+
     @readable = {}
     @writable = {}
     @waiting = {}
@@ -45,6 +47,10 @@ def initialize
   attr :writable
   attr :waiting
 
+  def transfer
+    @fiber.transfer
+  end
+
   def next_timeout
     _fiber, timeout = @waiting.min_by{|key, value| value}
 
@@ -62,9 +68,15 @@ def next_timeout
   def run
     # $stderr.puts [__method__, Fiber.current].inspect
 
+    readable = writable = nil
+
     while @readable.any? or @writable.any? or @waiting.any? or @blocking.any?
       # May only handle file descriptors up to 1024...
-      readable, writable = IO.select(@readable.keys + [@urgent.first], @writable.keys, [], next_timeout)
+      begin
+        readable, writable = IO.select(@readable.keys + [@urgent.first], @writable.keys, [], next_timeout)
+      rescue IOError
+        # Ignore - this can happen if the IO is closed while we are waiting.
+      end
 
       # puts "readable: #{readable}" if readable&.any?
       # puts "writable: #{writable}" if writable&.any?
@@ -88,7 +100,7 @@ def run
       end
 
       selected.each do |fiber, events|
-        fiber.resume(events)
+        fiber.transfer(events)
       end
 
       if @waiting.any?
@@ -98,7 +110,7 @@ def run
         waiting.each do |fiber, timeout|
           if fiber.alive?
             if timeout <= time
-              fiber.resume
+              fiber.transfer
             else
               @waiting[fiber] = timeout
             end
@@ -114,7 +126,7 @@ def run
         end
 
         ready.each do |fiber|
-          fiber.resume
+          fiber.transfer if fiber.alive?
         end
       end
     end
@@ -217,7 +229,7 @@ def io_wait(io, events, duration)
       @waiting[fiber] = current_time + duration
     end
 
-    Fiber.yield
+    @fiber.transfer
   ensure
     @waiting.delete(fiber) if duration
     @readable.delete(io) if readable
@@ -254,7 +266,7 @@ def block(blocker, timeout = nil)
     if timeout
       @waiting[fiber] = current_time + timeout
       begin
-        Fiber.yield
+        @fiber.transfer
       ensure
         # Remove from @waiting in the case #unblock was called before the timeout expired:
         @waiting.delete(fiber)
@@ -262,7 +274,7 @@ def block(blocker, timeout = nil)
     else
       @blocking[fiber] = true
       begin
-        Fiber.yield
+        @fiber.transfer
       ensure
         @blocking.delete(fiber)
       end
@@ -284,13 +296,37 @@ def unblock(blocker, fiber)
     io.write_nonblock('.')
   end
 
+  class FiberInterrupt
+    def initialize(fiber, exception)
+      @fiber = fiber
+      @exception = exception
+    end
+
+    def alive?
+      @fiber.alive?
+    end
+
+    def transfer
+      @fiber.raise(@exception)
+    end
+  end
+
+  def fiber_interrupt(fiber, exception)
+    @lock.synchronize do
+      @ready << FiberInterrupt.new(fiber, exception)
+    end
+
+    io = @urgent.last
+    io.write_nonblock('.')
+  end
+
   # This hook is invoked by `Fiber.schedule`. Strictly speaking, you should use
   # it to create scheduled fibers, but it is not required in practice;
   # `Fiber.new` is usually sufficient.
   def fiber(&block)
     fiber = Fiber.new(blocking: false, &block)
 
-    fiber.resume
+    fiber.transfer
 
     return fiber
   end
@@ -303,6 +339,16 @@ def address_resolve(hostname)
       Addrinfo.getaddrinfo(hostname, nil).map(&:ip_address).uniq
     end.value
   end
+
+  def blocking_operation_wait(work)
+    thread = Thread.new{work.call}
+
+    thread.join
+
+    thread = nil
+  ensure
+    thread&.kill
+  end
 end
 
 # This scheduler class implements `io_read` and `io_write` hooks which require
@@ -315,8 +361,7 @@ def io_read(io, buffer, length, offset)
     io.nonblock = true
 
     while true
-      maximum_size = buffer.size - offset
-      result = blocking{buffer.read(io, maximum_size, offset)}
+      result = blocking{buffer.read(io, 0, offset)}
 
       if result > 0
         total += result
@@ -343,8 +388,7 @@ def io_write(io, buffer, length, offset)
     io.nonblock = true
 
     while true
-      maximum_size = buffer.size - offset
-      result = blocking{buffer.write(io, maximum_size, offset)}
+      result = blocking{buffer.write(io, 0, offset)}
 
       if result > 0
         total += result
@@ -371,8 +415,7 @@ def io_pread(io, buffer, from, length, offset)
     io.nonblock = true
 
     while true
-      maximum_size = buffer.size - offset
-      result = blocking{buffer.pread(io, from, maximum_size, offset)}
+      result = blocking{buffer.pread(io, from, 0, offset)}
 
       if result > 0
         total += result
@@ -400,8 +443,7 @@ def io_pwrite(io, buffer, from, length, offset)
     io.nonblock = true
 
     while true
-      maximum_size = buffer.size - offset
-      result = blocking{buffer.pwrite(io, from, maximum_size, offset)}
+      result = blocking{buffer.pwrite(io, from, 0, offset)}
 
       if result > 0
         total += result
diff --git a/test/fiber/test_address_resolve.rb b/test/fiber/test_address_resolve.rb
index 12223bcc06fa8b..09c8db6049fa9d 100644
--- a/test/fiber/test_address_resolve.rb
+++ b/test/fiber/test_address_resolve.rb
@@ -179,7 +179,7 @@ def test_addrinfo_getaddrinfo_non_existing_domain_blocking
       Fiber.set_scheduler scheduler
 
       Fiber.schedule do
-        assert_raise(SocketError) {
+        assert_raise(Socket::ResolutionError) {
           Addrinfo.getaddrinfo("non-existing-domain.abc", nil)
         }
       end
diff --git a/test/fiber/test_enumerator.rb b/test/fiber/test_enumerator.rb
index 40f7d0172531dc..e9410f925c3b3a 100644
--- a/test/fiber/test_enumerator.rb
+++ b/test/fiber/test_enumerator.rb
@@ -42,4 +42,12 @@ def test_read_characters
     assert_predicate(i, :closed?)
     assert_predicate(o, :closed?)
   end
+
+  def enumerator_fiber_is_nonblocking
+    enumerator = Enumerator.new do |yielder|
+      yielder << Fiber.current.blocking?
+    end
+
+    assert_equal(false, enumerator.next)
+  end
 end
diff --git a/test/fiber/test_io.rb b/test/fiber/test_io.rb
index c1ad56a8cfe25a..eea06f97c829e7 100644
--- a/test/fiber/test_io.rb
+++ b/test/fiber/test_io.rb
@@ -9,7 +9,7 @@ def test_read
     omit unless defined?(UNIXSocket)
 
     i, o = UNIXSocket.pair
-    if RUBY_PLATFORM=~/mswin|mingw/
+    if RUBY_PLATFORM =~ /mswin|mingw/
       i.nonblock = true
       o.nonblock = true
     end
@@ -44,7 +44,7 @@ def test_heavy_read
     16.times.map do
       Thread.new do
         i, o = UNIXSocket.pair
-        if RUBY_PLATFORM=~/mswin|mingw/
+        if RUBY_PLATFORM =~ /mswin|mingw/
           i.nonblock = true
           o.nonblock = true
         end
@@ -67,7 +67,7 @@ def test_heavy_read
 
   def test_epipe_on_read
     omit unless defined?(UNIXSocket)
-    omit "nonblock=true isn't properly supported on Windows" if RUBY_PLATFORM=~/mswin|mingw/
+    omit "nonblock=true isn't properly supported on Windows" if RUBY_PLATFORM =~ /mswin|mingw/
 
     i, o = UNIXSocket.pair
 
@@ -153,12 +153,13 @@ def test_read_write_blocking
       Fiber.set_scheduler scheduler
 
       Fiber.schedule do
-        message = i.read(20)
+        # We add 1 here, to force the read to block (testing that specific code path).
+        message = i.read(MESSAGE.bytesize + 1)
         i.close
       end
 
       Fiber.schedule do
-        o.write("Hello World")
+        o.write(MESSAGE)
         o.close
       end
     end
@@ -219,4 +220,59 @@ def test_io_select
       assert_equal [[r], [w], []], result
     end
   end
+
+  def test_backquote
+    result = nil
+
+    thread = Thread.new do
+      scheduler = Scheduler.new
+      Fiber.set_scheduler scheduler
+      Fiber.schedule do
+        result = `#{EnvUtil.rubybin} -e "sleep 0.1;puts %[ok]"`
+      end
+    end
+    thread.join
+
+    assert_equal "ok\n", result
+  end
+
+  # Tests for https://bugs.ruby-lang.org/issues/20723 which would
+  # otherwise deadlock this test.
+  def test_close_while_reading_on_thread
+    # Windows has UNIXSocket, but only with VS 2019+
+    omit "UNIXSocket is not defined!" unless defined?(UNIXSocket)
+
+    Socket.pair(:UNIX, :STREAM) do |i, o|
+      if RUBY_PLATFORM =~ /mswin|mingw/
+        i.nonblock = true
+        o.nonblock = true
+      end
+
+      reading_thread = Thread.new do
+        Thread.current.report_on_exception = false
+        i.wait_readable
+      end
+
+      scheduler_thread = Thread.new do
+        # Wait until the reading thread is blocked on read:
+        Thread.pass until reading_thread.status == "sleep"
+
+        scheduler = Scheduler.new
+        Fiber.set_scheduler scheduler
+        Fiber.schedule do
+          i.close
+        end
+      end
+
+      assert_raise(IOError) { reading_thread.join }
+      refute_nil scheduler_thread.join(5), "expected thread to terminate within 5 seconds"
+
+      assert_predicate(i, :closed?)
+    ensure
+      scheduler_thread&.kill
+      scheduler_thread&.join rescue nil
+      reading_thread&.kill
+      reading_thread&.join rescue nil
+    end
+  end
 end
diff --git a/test/fiber/test_io_buffer.rb b/test/fiber/test_io_buffer.rb
index a08b1ce1a9d0cf..19e6c1f88e976d 100644
--- a/test/fiber/test_io_buffer.rb
+++ b/test/fiber/test_io_buffer.rb
@@ -21,7 +21,8 @@ def test_read_write_blocking
       Fiber.set_scheduler scheduler
 
       Fiber.schedule do
-        message = i.read(20)
+        # We add 1 here, to force the read to block (testing that specific code path).
+        message = i.read(MESSAGE.bytesize + 1)
         i.close
       end
 
diff --git a/test/fiber/test_io_close.rb b/test/fiber/test_io_close.rb
new file mode 100644
index 00000000000000..742b40841d90d6
--- /dev/null
+++ b/test/fiber/test_io_close.rb
@@ -0,0 +1,107 @@
+# frozen_string_literal: true
+require 'test/unit'
+require_relative 'scheduler'
+
+class TestFiberIOClose < Test::Unit::TestCase
+  def with_socket_pair(&block)
+    omit "UNIXSocket is not defined!" unless defined?(UNIXSocket)
+
+    UNIXSocket.pair do |i, o|
+      if RUBY_PLATFORM =~ /mswin|mingw/
+        i.nonblock = true
+        o.nonblock = true
+      end
+
+      yield i, o
+    end
+  end
+
+  def test_io_close_across_fibers
+    # omit "Interrupting a io_wait read is not supported!" if RUBY_PLATFORM =~ /mswin|mingw/
+
+    with_socket_pair do |i, o|
+      error = nil
+
+      thread = Thread.new do
+        scheduler = Scheduler.new
+        Fiber.set_scheduler scheduler
+
+        Fiber.schedule do
+          i.read
+        rescue => error
+          # Ignore.
+        end
+
+        Fiber.schedule do
+          i.close
+        end
+      end
+
+      thread.join
+
+      assert_instance_of IOError, error
+      assert_match(/closed/, error.message)
+    end
+  end
+
+  def test_io_close_blocking_thread
+    omit "Interrupting a io_wait read is not supported!" if RUBY_PLATFORM =~ /mswin|mingw/
+
+    with_socket_pair do |i, o|
+      error = nil
+
+      reading_thread = Thread.new do
+        i.read
+      rescue => error
+        # Ignore.
+      end
+
+      Thread.pass until reading_thread.status == 'sleep'
+
+      thread = Thread.new do
+        scheduler = Scheduler.new
+        Fiber.set_scheduler scheduler
+
+        Fiber.schedule do
+          i.close
+        end
+      end
+
+      thread.join
+      reading_thread.join
+
+      assert_instance_of IOError, error
+      assert_match(/closed/, error.message)
+    end
+  end
+
+  def test_io_close_blocking_fiber
+    # omit "Interrupting a io_wait read is not supported!" if RUBY_PLATFORM =~ /mswin|mingw/
+
+    with_socket_pair do |i, o|
+      error = nil
+
+      thread = Thread.new do
+        scheduler = Scheduler.new
+        Fiber.set_scheduler scheduler
+
+        Fiber.schedule do
+          begin
+            i.read
+          rescue => error
+            # Ignore.
+          end
+        end
+      end
+
+      Thread.pass until thread.status == 'sleep'
+
+      i.close
+
+      thread.join
+
+      assert_instance_of IOError, error
+      assert_match(/closed/, error.message)
+    end
+  end
+end
diff --git a/test/fiber/test_mutex.rb b/test/fiber/test_mutex.rb
index 449c49f38bc81e..2cee2cc235684b 100644
--- a/test/fiber/test_mutex.rb
+++ b/test/fiber/test_mutex.rb
@@ -207,7 +207,7 @@ def test_mutex_deadlock
       Fiber.schedule do
         mutex.synchronize do
           puts 'in synchronize'
-          Fiber.yield
+          scheduler.transfer
         end
       end
 
diff --git a/test/fiber/test_process.rb b/test/fiber/test_process.rb
index cc1694576eb9cd..f17f76770489f0 100644
--- a/test/fiber/test_process.rb
+++ b/test/fiber/test_process.rb
@@ -3,13 +3,15 @@
 require_relative 'scheduler'
 
 class TestFiberProcess < Test::Unit::TestCase
+  TRUE_CMD = RUBY_PLATFORM =~ /mswin|mingw/ ? "exit 0" : "true"
+
   def test_process_wait
     Thread.new do
       scheduler = Scheduler.new
       Fiber.set_scheduler scheduler
 
       Fiber.schedule do
-        pid = Process.spawn("true")
+        pid = Process.spawn(TRUE_CMD)
         Process.wait(pid)
 
         # TODO test that scheduler was invoked.
@@ -25,7 +27,7 @@ def test_system
       Fiber.set_scheduler scheduler
 
       Fiber.schedule do
-        system("true")
+        system(TRUE_CMD)
 
         # TODO test that scheduler was invoked (currently it's not).
 
@@ -49,7 +51,7 @@ def scheduler.process_wait(pid, flags)
 
       Fiber.schedule do
         assert_raise TypeError do
-          system("true")
+          system(TRUE_CMD)
         end
       end
     end.join
@@ -57,12 +59,14 @@ def scheduler.process_wait(pid, flags)
 
   def test_fork
     omit 'fork not supported' unless Process.respond_to?(:fork)
+
+    pid = Process.fork{}
+
     Thread.new do
       scheduler = Scheduler.new
       Fiber.set_scheduler scheduler
 
       Fiber.schedule do
-        pid = Process.fork {}
         Process.wait(pid)
 
         assert_predicate $?, :success?
diff --git a/test/fiber/test_queue.rb b/test/fiber/test_queue.rb
index 10d954049230cc..d78b026f11444a 100644
--- a/test/fiber/test_queue.rb
+++ b/test/fiber/test_queue.rb
@@ -5,9 +5,10 @@
 class TestFiberQueue < Test::Unit::TestCase
   def test_pop_with_timeout
     queue = Thread::Queue.new
+    kill = false
     result = :unspecified
 
-    Thread.new do
+    thread = Thread.new do
       scheduler = Scheduler.new
       Fiber.set_scheduler(scheduler)
 
@@ -16,17 +17,23 @@ def test_pop_with_timeout
       end
 
       scheduler.run
-    end.join
+    end
+    until thread.join(2)
+      kill = true
+      thread.kill
+    end
 
+    assert_false(kill, 'Getting stuck due to a possible compiler bug.')
     assert_nil result
   end
 
   def test_pop_with_timeout_and_value
     queue = Thread::Queue.new
     queue.push(:something)
+    kill = false
     result = :unspecified
 
-    Thread.new do
+    thread = Thread.new do
       scheduler = Scheduler.new
       Fiber.set_scheduler(scheduler)
 
@@ -35,8 +42,13 @@ def test_pop_with_timeout_and_value
       end
 
       scheduler.run
-    end.join
+    end
+    until thread.join(2)
+      kill = true
+      thread.kill
+    end
 
+    assert_false(kill, 'Getting stuck due to a possible compiler bug.')
     assert_equal :something, result
   end
 end
diff --git a/test/fiber/test_ractor.rb b/test/fiber/test_ractor.rb
index 3c4ccbd8e5f0f1..7dd82eda627a91 100644
--- a/test/fiber/test_ractor.rb
+++ b/test/fiber/test_ractor.rb
@@ -17,7 +17,7 @@ def test_ractor_shareable
           Fiber.current.class
         end.resume
       end
-      assert_equal(Fiber, r.take)
+      assert_equal(Fiber, r.value)
     end;
   end
 end
diff --git a/test/fiber/test_scheduler.rb b/test/fiber/test_scheduler.rb
index f8993bb18f3956..7c77bd8cf0dba4 100644
--- a/test/fiber/test_scheduler.rb
+++ b/test/fiber/test_scheduler.rb
@@ -94,6 +94,9 @@ def scheduler.io_wait
     def scheduler.kernel_sleep
     end
 
+    def scheduler.fiber_interrupt(_fiber, _exception)
+    end
+
     thread = Thread.new do
       Fiber.set_scheduler scheduler
     end
@@ -118,7 +121,7 @@ def test_current_scheduler
   end
 
   def test_autoload
-    100.times do
+    10.times do
       Object.autoload(:TestFiberSchedulerAutoload, File.expand_path("autoload.rb", __dir__))
 
       thread = Thread.new do
@@ -139,6 +142,19 @@ def test_autoload
     end
   end
 
+  def test_iseq_compile_under_gc_stress_bug_21180
+    Thread.new do
+      scheduler = Scheduler.new
+      Fiber.set_scheduler scheduler
+
+      Fiber.schedule do
+        EnvUtil.under_gc_stress do
+          RubyVM::InstructionSequence.compile_file(File::NULL)
+        end
+      end
+    end.join
+  end
+
   def test_deadlock
     mutex = Thread::Mutex.new
     condition = Thread::ConditionVariable.new
@@ -182,4 +198,32 @@ def test_deadlock
     thread.join
     signaller.join
   end
+
+  def test_condition_variable
+    condition_variable = ::Thread::ConditionVariable.new
+    mutex = ::Thread::Mutex.new
+
+    error = nil
+
+    thread = Thread.new do
+      Thread.current.report_on_exception = false
+
+      scheduler = Scheduler.new
+      Fiber.set_scheduler scheduler
+
+      fiber = Fiber.schedule do
+        begin
+          mutex.synchronize do
+            condition_variable.wait(mutex)
+          end
+        rescue => error
+        end
+      end
+
+      fiber.raise(RuntimeError)
+    end
+
+    thread.join
+    assert_kind_of RuntimeError, error
+  end
 end
diff --git a/test/fiber/test_sleep.rb b/test/fiber/test_sleep.rb
index a7e88c036741cf..187f59dbd4863c 100644
--- a/test/fiber/test_sleep.rb
+++ b/test/fiber/test_sleep.rb
@@ -35,13 +35,13 @@ def test_sleep_returns_seconds_slept
       scheduler = Scheduler.new
       Fiber.set_scheduler scheduler
       Fiber.schedule do
-        seconds = sleep(2)
+        seconds = sleep(1.1)
       end
     end
 
     thread.join
 
-    assert_operator seconds, :>=, 2, "actual: %p" % seconds
+    assert_operator seconds, :>=, 1, "actual: %p" % seconds
   end
 
   def test_broken_sleep
diff --git a/test/fiber/test_thread.rb b/test/fiber/test_thread.rb
index 5e3cc6d0e134f5..0247f330d94403 100644
--- a/test/fiber/test_thread.rb
+++ b/test/fiber/test_thread.rb
@@ -90,6 +90,47 @@ def test_thread_join_blocking
     assert_equal :done, thread.value
   end
 
+  def test_spurious_unblock_during_thread_join
+    ready = Thread::Queue.new
+
+    target_thread = Thread.new do
+      ready.pop
+      :success
+    end
+
+    Thread.pass until target_thread.status == "sleep"
+
+    result = nil
+
+    thread = Thread.new do
+      scheduler = Scheduler.new
+      Fiber.set_scheduler scheduler
+
+      # Create a fiber that will join a long-running thread:
+      joining_fiber = Fiber.schedule do
+        result = target_thread.value
+      end
+
+      # Create another fiber that spuriously unblocks the joining fiber:
+      Fiber.schedule do
+        # This interrupts the join in joining_fiber:
+        scheduler.unblock(:spurious_wakeup, joining_fiber)
+
+        # This allows the unblock to be processed:
+        sleep(0)
+
+        # This allows the target thread to finish:
+        ready.push(:done)
+      end
+
+      scheduler.run
+    end
+
+    thread.join
+
+    assert_equal :success, result
+  end
+
   def test_broken_unblock
     thread = Thread.new do
       Thread.current.report_on_exception = false
diff --git a/test/fiddle/helper.rb b/test/fiddle/helper.rb
deleted file mode 100644
index e470f5a2764396..00000000000000
--- a/test/fiddle/helper.rb
+++ /dev/null
@@ -1,184 +0,0 @@
-# frozen_string_literal: true
-
-require 'rbconfig/sizeof'
-require 'test/unit'
-require 'fiddle'
-
-# FIXME: this is stolen from DL and needs to be refactored.
-
-libc_so = libm_so = nil
-
-case RUBY_PLATFORM
-when /cygwin/
-  libc_so = "cygwin1.dll"
-  libm_so = "cygwin1.dll"
-when /android/
-  libdir = '/system/lib'
-  if [0].pack('L!').size == 8
-    libdir = '/system/lib64'
-  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*']
-  when 4
-    # 32-bit ruby
-    case RUBY_PLATFORM
-    when /armv\w+-linux/
-      # In the ARM 32-bit libc package such as libc6:armhf libc6:armel,
-      # libc.so and libm.so are installed to /lib/arm-linux-gnu*.
-      # It's not installed to /lib32.
-      dir, = Dir.glob('/lib/arm-linux-gnu*')
-      libdir = dir if dir && File.directory?(dir)
-    else
-      libdir = '/lib32' if File.directory? '/lib32'
-    end
-  when 8
-    # 64-bit ruby
-    libdir = '/lib64' if File.directory? '/lib64'
-  end
-
-  # Handle musl libc
-  libc_so, = Dir.glob(File.join(libdir, "libc.musl*.so*"))
-  if libc_so
-    libm_so = libc_so
-  else
-    # glibc
-    case RUBY_PLATFORM
-    when /alpha-linux/, /ia64-linux/
-      libc_so = "libc.so.6.1"
-      libm_so = "libm.so.6.1"
-    else
-      libc_so = "libc.so.6"
-      libm_so = "libm.so.6"
-    end
-  end
-when /mingw/, /mswin/
-  require "rbconfig"
-  crtname = RbConfig::CONFIG["RUBY_SO_NAME"][/msvc\w+/] || 'ucrtbase'
-  libc_so = libm_so = "#{crtname}.dll"
-when /darwin/
-  libc_so = libm_so = "/usr/lib/libSystem.B.dylib"
-  # macOS 11.0+ removed libSystem.B.dylib from /usr/lib. But It works with dlopen.
-  rigid_path = true
-when /kfreebsd/
-  libc_so = "/lib/libc.so.0.1"
-  libm_so = "/lib/libm.so.1"
-when /gnu/	#GNU/Hurd
-  libc_so = "/lib/libc.so.0.3"
-  libm_so = "/lib/libm.so.6"
-when /mirbsd/
-  libc_so = "/usr/lib/libc.so.41.10"
-  libm_so = "/usr/lib/libm.so.7.0"
-when /freebsd/
-  libc_so = "/lib/libc.so.7"
-  libm_so = "/lib/libm.so.5"
-when /bsd|dragonfly/
-  libc_so = "/usr/lib/libc.so"
-  libm_so = "/usr/lib/libm.so"
-when /solaris/
-  libdir = '/lib'
-  case RbConfig::SIZEOF['void*']
-  when 4
-    # 32-bit ruby
-    libdir = '/lib' if File.directory? '/lib'
-  when 8
-    # 64-bit ruby
-    libdir = '/lib/64' if File.directory? '/lib/64'
-  end
-  libc_so = File.join(libdir, "libc.so")
-  libm_so = File.join(libdir, "libm.so")
-when /aix/
-  pwd=Dir.pwd
-  libc_so = libm_so = "#{pwd}/libaixdltest.so"
-  unless File.exist? libc_so
-    cobjs=%w!strcpy.o!
-    mobjs=%w!floats.o sin.o!
-    funcs=%w!sin sinf strcpy strncpy!
-    expfile='dltest.exp'
-    require 'tmpdir'
-    Dir.mktmpdir do |_dir|
-      begin
-        Dir.chdir _dir
-        %x!/usr/bin/ar x /usr/lib/libc.a #{cobjs.join(' ')}!
-        %x!/usr/bin/ar x /usr/lib/libm.a #{mobjs.join(' ')}!
-        %x!echo "#{funcs.join("\n")}\n" > #{expfile}!
-        require 'rbconfig'
-        if RbConfig::CONFIG["GCC"] = 'yes'
-          lflag='-Wl,'
-        else
-          lflag=''
-        end
-        flags="#{lflag}-bE:#{expfile} #{lflag}-bnoentry -lm"
-        %x!#{RbConfig::CONFIG["LDSHARED"]} -o #{libc_so} #{(cobjs+mobjs).join(' ')} #{flags}!
-      ensure
-        Dir.chdir pwd
-      end
-    end
-  end
-when /haiku/
-  libdir = '/system/lib'
-  case [0].pack('L!').size
-  when 4
-    # 32-bit ruby
-    libdir = '/system/lib/x86' if File.directory? '/system/lib/x86'
-  when 8
-    # 64-bit ruby
-    libdir = '/system/lib/' if File.directory? '/system/lib/'
-  end
-  libc_so = File.join(libdir, "libroot.so")
-  libm_so = File.join(libdir, "libroot.so")
-else
-  libc_so = ARGV[0] if ARGV[0] && ARGV[0][0] == ?/
-  libm_so = ARGV[1] if ARGV[1] && ARGV[1][0] == ?/
-  if( !(libc_so && libm_so) )
-    $stderr.puts("libc and libm not found: #{$0} <libc> <libm>")
-  end
-end
-
-unless rigid_path
-  libc_so = nil if libc_so && libc_so[0] == ?/ && !File.file?(libc_so)
-  libm_so = nil if libm_so && libm_so[0] == ?/ && !File.file?(libm_so)
-end
-
-if !libc_so || !libm_so
-  ruby = EnvUtil.rubybin
-  # When the ruby binary is 32-bit and the host is 64-bit,
-  # `ldd ruby` outputs "not a dynamic executable" message.
-  # libc_so and libm_so are not set.
-  ldd = `ldd #{ruby}`
-  #puts ldd
-  libc_so = $& if !libc_so && %r{/\S*/libc\.so\S*} =~ ldd
-  libm_so = $& if !libm_so && %r{/\S*/libm\.so\S*} =~ ldd
-  #p [libc_so, libm_so]
-end
-
-Fiddle::LIBC_SO = libc_so
-Fiddle::LIBM_SO = libm_so
-
-module Fiddle
-  class TestCase < Test::Unit::TestCase
-    def setup
-      @libc = Fiddle.dlopen(LIBC_SO)
-      @libm = Fiddle.dlopen(LIBM_SO)
-    end
-
-    def teardown
-      if /linux/ =~ RUBY_PLATFORM
-        GC.start
-      end
-    end
-
-    def under_gc_stress
-      stress, GC.stress = GC.stress, true
-      yield
-    ensure
-      GC.stress = stress
-    end
-  end
-end
diff --git a/test/fiddle/test_c_struct_builder.rb b/test/fiddle/test_c_struct_builder.rb
deleted file mode 100644
index ca44c6cf7a6e25..00000000000000
--- a/test/fiddle/test_c_struct_builder.rb
+++ /dev/null
@@ -1,69 +0,0 @@
-# frozen_string_literal: true
-begin
-  require_relative 'helper'
-  require 'fiddle/struct'
-  require 'fiddle/cparser'
-  require 'fiddle/import'
-rescue LoadError
-end
-
-module Fiddle
-  class TestCStructBuilder < TestCase
-    include Fiddle::CParser
-    extend Fiddle::Importer
-
-    RBasic = struct ['void * flags',
-                     'void * klass' ]
-
-
-    RObject = struct [
-      { 'basic' => RBasic },
-      { 'as'    => union([
-                          { 'heap'=> struct([ 'uint32_t numiv',
-                                              'void * ivptr',
-                                              'void * iv_index_tbl' ]) },
-                             'void *ary[3]' ])}
-    ]
-
-
-    def test_basic_embedded_members
-      assert_equal 0, RObject.offsetof("basic.flags")
-      assert_equal Fiddle::SIZEOF_VOIDP, RObject.offsetof("basic.klass")
-    end
-
-    def test_embedded_union_members
-      assert_equal 2 * Fiddle::SIZEOF_VOIDP, RObject.offsetof("as")
-      assert_equal 2 * Fiddle::SIZEOF_VOIDP, RObject.offsetof("as.heap")
-      assert_equal 2 * Fiddle::SIZEOF_VOIDP, RObject.offsetof("as.heap.numiv")
-      assert_equal 3 * Fiddle::SIZEOF_VOIDP, RObject.offsetof("as.heap.ivptr")
-      assert_equal 4 * Fiddle::SIZEOF_VOIDP, RObject.offsetof("as.heap.iv_index_tbl")
-    end
-
-    def test_as_ary
-      assert_equal 2 * Fiddle::SIZEOF_VOIDP, RObject.offsetof("as.ary")
-    end
-
-    def test_offsetof
-      types, members = parse_struct_signature(['int64_t i','char c'])
-      my_struct = Fiddle::CStructBuilder.create(Fiddle::CStruct, types, members)
-      assert_equal 0, my_struct.offsetof("i")
-      assert_equal Fiddle::SIZEOF_INT64_T, my_struct.offsetof("c")
-    end
-
-    def test_offset_with_gap
-      types, members = parse_struct_signature(['void *p', 'char c', 'long x'])
-      my_struct = Fiddle::CStructBuilder.create(Fiddle::CStruct, types, members)
-
-      assert_equal PackInfo.align(0, ALIGN_VOIDP), my_struct.offsetof("p")
-      assert_equal PackInfo.align(SIZEOF_VOIDP, ALIGN_CHAR), my_struct.offsetof("c")
-      assert_equal SIZEOF_VOIDP + PackInfo.align(SIZEOF_CHAR, ALIGN_LONG), my_struct.offsetof("x")
-    end
-
-    def test_union_offsetof
-      types, members = parse_struct_signature(['int64_t i','char c'])
-      my_struct = Fiddle::CStructBuilder.create(Fiddle::CUnion, types, members)
-      assert_equal 0, my_struct.offsetof("i")
-      assert_equal 0, my_struct.offsetof("c")
-    end
-  end
-end if defined?(Fiddle)
diff --git a/test/fiddle/test_c_struct_entry.rb b/test/fiddle/test_c_struct_entry.rb
deleted file mode 100644
index 9fd16d71014c9d..00000000000000
--- a/test/fiddle/test_c_struct_entry.rb
+++ /dev/null
@@ -1,165 +0,0 @@
-# frozen_string_literal: true
-begin
-  require_relative 'helper'
-  require 'fiddle/struct'
-rescue LoadError
-end
-
-module Fiddle
-  class TestCStructEntity < TestCase
-    def test_class_size
-      types = [TYPE_DOUBLE, TYPE_CHAR]
-
-      size = CStructEntity.size types
-
-      alignments = types.map { |type| PackInfo::ALIGN_MAP[type] }
-
-      expected = PackInfo.align 0, alignments[0]
-      expected += PackInfo::SIZE_MAP[TYPE_DOUBLE]
-
-      expected = PackInfo.align expected, alignments[1]
-      expected += PackInfo::SIZE_MAP[TYPE_CHAR]
-
-      expected = PackInfo.align expected, alignments.max
-
-      assert_equal expected, size
-    end
-
-    def test_class_size_with_count
-      size = CStructEntity.size([[TYPE_DOUBLE, 2], [TYPE_CHAR, 20]])
-
-      types = [TYPE_DOUBLE, TYPE_CHAR]
-      alignments = types.map { |type| PackInfo::ALIGN_MAP[type] }
-
-      expected = PackInfo.align 0, alignments[0]
-      expected += PackInfo::SIZE_MAP[TYPE_DOUBLE] * 2
-
-      expected = PackInfo.align expected, alignments[1]
-      expected += PackInfo::SIZE_MAP[TYPE_CHAR] * 20
-
-      expected = PackInfo.align expected, alignments.max
-
-      assert_equal expected, size
-    end
-
-    def test_set_ctypes
-      CStructEntity.malloc([TYPE_INT, TYPE_LONG], Fiddle::RUBY_FREE) do |struct|
-        struct.assign_names %w[int long]
-
-        # this test is roundabout because the stored ctypes are not accessible
-        struct['long'] = 1
-        struct['int'] = 2
-
-        assert_equal 1, struct['long']
-        assert_equal 2, struct['int']
-      end
-    end
-
-    def test_aref_pointer_array
-      CStructEntity.malloc([[TYPE_VOIDP, 2]], Fiddle::RUBY_FREE) do |team|
-        team.assign_names(["names"])
-        Fiddle::Pointer.malloc(6, Fiddle::RUBY_FREE) do |alice|
-          alice[0, 6] = "Alice\0"
-          Fiddle::Pointer.malloc(4, Fiddle::RUBY_FREE) do |bob|
-            bob[0, 4] = "Bob\0"
-            team["names"] = [alice, bob]
-            assert_equal(["Alice", "Bob"], team["names"].map(&:to_s))
-          end
-        end
-      end
-    end
-
-    def test_aref_pointer
-      CStructEntity.malloc([TYPE_VOIDP], Fiddle::RUBY_FREE) do |user|
-        user.assign_names(["name"])
-        Fiddle::Pointer.malloc(6, Fiddle::RUBY_FREE) do |alice|
-          alice[0, 6] = "Alice\0"
-          user["name"] = alice
-          assert_equal("Alice", user["name"].to_s)
-        end
-      end
-    end
-
-    def test_new_double_free
-      types = [TYPE_INT]
-      Pointer.malloc(CStructEntity.size(types), Fiddle::RUBY_FREE) do |pointer|
-        assert_raise ArgumentError do
-          CStructEntity.new(pointer, types, Fiddle::RUBY_FREE)
-        end
-      end
-    end
-
-    def test_malloc_block
-      escaped_struct = nil
-      returned = CStructEntity.malloc([TYPE_INT], Fiddle::RUBY_FREE) do |struct|
-        assert_equal Fiddle::SIZEOF_INT, struct.size
-        assert_equal Fiddle::RUBY_FREE, struct.free.to_i
-        escaped_struct = struct
-        :returned
-      end
-      assert_equal :returned, returned
-      assert escaped_struct.freed?
-    end
-
-    def test_malloc_block_no_free
-      assert_raise ArgumentError do
-        CStructEntity.malloc([TYPE_INT]) { |struct| }
-      end
-    end
-
-    def test_free
-      struct = CStructEntity.malloc([TYPE_INT])
-      begin
-        assert_nil struct.free
-      ensure
-        Fiddle.free struct
-      end
-    end
-
-    def test_free_with_func
-      struct = CStructEntity.malloc([TYPE_INT], Fiddle::RUBY_FREE)
-      refute struct.freed?
-      struct.call_free
-      assert struct.freed?
-      struct.call_free                 # you can safely run it again
-      assert struct.freed?
-      GC.start                         # you can safely run the GC routine
-      assert struct.freed?
-    end
-
-    def test_free_with_no_func
-      struct = CStructEntity.malloc([TYPE_INT])
-      refute struct.freed?
-      struct.call_free
-      refute struct.freed?
-      struct.call_free                 # you can safely run it again
-      refute struct.freed?
-    end
-
-    def test_freed?
-      struct = CStructEntity.malloc([TYPE_INT], Fiddle::RUBY_FREE)
-      refute struct.freed?
-      struct.call_free
-      assert struct.freed?
-    end
-
-    def test_null?
-      struct = CStructEntity.malloc([TYPE_INT], Fiddle::RUBY_FREE)
-      refute struct.null?
-    end
-
-    def test_size
-      CStructEntity.malloc([TYPE_INT], Fiddle::RUBY_FREE) do |struct|
-        assert_equal Fiddle::SIZEOF_INT, struct.size
-      end
-    end
-
-    def test_size=
-      CStructEntity.malloc([TYPE_INT], Fiddle::RUBY_FREE) do |struct|
-        assert_raise NoMethodError do
-          struct.size = 1
-        end
-      end
-    end
-  end
-end if defined?(Fiddle)
diff --git a/test/fiddle/test_c_union_entity.rb b/test/fiddle/test_c_union_entity.rb
deleted file mode 100644
index e0a3757562540f..00000000000000
--- a/test/fiddle/test_c_union_entity.rb
+++ /dev/null
@@ -1,36 +0,0 @@
-# frozen_string_literal: true
-begin
-  require_relative 'helper'
-  require 'fiddle/struct'
-rescue LoadError
-end
-
-
-module Fiddle
-  class TestCUnionEntity < TestCase
-    def test_class_size
-      size = CUnionEntity.size([TYPE_DOUBLE, TYPE_CHAR])
-
-      assert_equal SIZEOF_DOUBLE, size
-    end
-
-    def test_class_size_with_count
-      size = CUnionEntity.size([[TYPE_DOUBLE, 2], [TYPE_CHAR, 20]])
-
-      assert_equal SIZEOF_CHAR * 20, size
-    end
-
-    def test_set_ctypes
-      CUnionEntity.malloc([TYPE_INT, TYPE_LONG], Fiddle::RUBY_FREE) do |union|
-        union.assign_names %w[int long]
-
-        # this test is roundabout because the stored ctypes are not accessible
-        union['long'] = 1
-        assert_equal 1, union['long']
-
-        union['int'] = 1
-        assert_equal 1, union['int']
-      end
-    end
-  end
-end if defined?(Fiddle)
diff --git a/test/fiddle/test_closure.rb b/test/fiddle/test_closure.rb
deleted file mode 100644
index 825ea9651d2554..00000000000000
--- a/test/fiddle/test_closure.rb
+++ /dev/null
@@ -1,141 +0,0 @@
-# frozen_string_literal: true
-begin
-  require_relative 'helper'
-rescue LoadError
-end
-
-module Fiddle
-  class TestClosure < Fiddle::TestCase
-    def teardown
-      super
-      # Ensure freeing all closures.
-      # See https://github.com/ruby/fiddle/issues/102#issuecomment-1241763091 .
-      not_freed_closures = []
-      ObjectSpace.each_object(Fiddle::Closure) do |closure|
-        not_freed_closures << closure unless closure.freed?
-      end
-      assert_equal([], not_freed_closures)
-    end
-
-    def test_argument_errors
-      assert_raise(TypeError) do
-        Closure.new(TYPE_INT, TYPE_INT)
-      end
-
-      assert_raise(TypeError) do
-        Closure.new('foo', [TYPE_INT])
-      end
-
-      assert_raise(TypeError) do
-        Closure.new(TYPE_INT, ['meow!'])
-      end
-    end
-
-    def test_type_symbol
-      Closure.create(:int, [:void]) do |closure|
-        assert_equal([
-                       TYPE_INT,
-                       [TYPE_VOID],
-                     ],
-                     [
-                       closure.instance_variable_get(:@ctype),
-                       closure.instance_variable_get(:@args),
-                     ])
-      end
-    end
-
-    def test_call
-      closure_class = Class.new(Closure) do
-        def call
-          10
-        end
-      end
-      closure_class.create(TYPE_INT, []) do |closure|
-        func = Function.new(closure, [], TYPE_INT)
-        assert_equal 10, func.call
-      end
-    end
-
-    def test_returner
-      closure_class = Class.new(Closure) do
-        def call thing
-          thing
-        end
-      end
-      closure_class.create(TYPE_INT, [TYPE_INT]) do |closure|
-        func = Function.new(closure, [TYPE_INT], TYPE_INT)
-        assert_equal 10, func.call(10)
-      end
-    end
-
-    def test_const_string
-      closure_class = Class.new(Closure) do
-        def call(string)
-          @return_string = "Hello! #{string}"
-          @return_string
-        end
-      end
-      closure_class.create(:const_string, [:const_string]) do |closure|
-        func = Function.new(closure, [:const_string], :const_string)
-        assert_equal("Hello! World!", func.call("World!"))
-      end
-    end
-
-    def test_free
-      Closure.create(:int, [:void]) do |closure|
-        assert(!closure.freed?)
-        closure.free
-        assert(closure.freed?)
-        closure.free
-      end
-    end
-
-    def test_block_caller
-      cb = Closure::BlockCaller.new(TYPE_INT, [TYPE_INT]) do |one|
-        one
-      end
-      begin
-        func = Function.new(cb, [TYPE_INT], TYPE_INT)
-        assert_equal 11, func.call(11)
-      ensure
-        cb.free
-      end
-    end
-
-    def test_memsize_ruby_dev_42480
-      require 'objspace'
-      n = 10000
-      n.times do
-        Closure.create(:int, [:void]) do |closure|
-          ObjectSpace.memsize_of(closure)
-        end
-      end
-    end
-
-    %w[INT SHORT CHAR LONG LONG_LONG].each do |name|
-      type = Fiddle.const_get("TYPE_#{name}") rescue next
-      size = Fiddle.const_get("SIZEOF_#{name}")
-      [[type, size-1, name], [-type, size, "unsigned_"+name]].each do |t, s, n|
-        define_method("test_conversion_#{n.downcase}") do
-          arg = nil
-
-          closure_class = Class.new(Closure) do
-            define_method(:call) {|x| arg = x}
-          end
-          closure_class.create(t, [t]) do |closure|
-            v = ~(~0 << (8*s))
-
-            arg = nil
-            assert_equal(v, closure.call(v))
-            assert_equal(arg, v, n)
-
-            arg = nil
-            func = Function.new(closure, [t], t)
-            assert_equal(v, func.call(v))
-            assert_equal(arg, v, n)
-          end
-        end
-      end
-    end
-  end
-end if defined?(Fiddle)
diff --git a/test/fiddle/test_cparser.rb b/test/fiddle/test_cparser.rb
deleted file mode 100644
index f1b67476ba8c04..00000000000000
--- a/test/fiddle/test_cparser.rb
+++ /dev/null
@@ -1,414 +0,0 @@
-# frozen_string_literal: true
-begin
-  require_relative 'helper'
-  require 'fiddle/cparser'
-  require 'fiddle/import'
-rescue LoadError
-end
-
-module Fiddle
-  class TestCParser < TestCase
-    include CParser
-
-    def test_char_ctype
-      assert_equal(TYPE_CHAR, parse_ctype('char'))
-      assert_equal(TYPE_CHAR, parse_ctype('const char'))
-      assert_equal(TYPE_CHAR, parse_ctype('signed char'))
-      assert_equal(TYPE_CHAR, parse_ctype('const signed char'))
-      assert_equal(-TYPE_CHAR, parse_ctype('unsigned char'))
-      assert_equal(-TYPE_CHAR, parse_ctype('const unsigned char'))
-    end
-
-    def test_short_ctype
-      assert_equal(TYPE_SHORT, parse_ctype('short'))
-      assert_equal(TYPE_SHORT, parse_ctype('const short'))
-      assert_equal(TYPE_SHORT, parse_ctype('short int'))
-      assert_equal(TYPE_SHORT, parse_ctype('const short int'))
-      assert_equal(TYPE_SHORT, parse_ctype('int short'))
-      assert_equal(TYPE_SHORT, parse_ctype('const int short'))
-      assert_equal(TYPE_SHORT, parse_ctype('signed short'))
-      assert_equal(TYPE_SHORT, parse_ctype('const signed short'))
-      assert_equal(TYPE_SHORT, parse_ctype('short signed'))
-      assert_equal(TYPE_SHORT, parse_ctype('const short signed'))
-      assert_equal(TYPE_SHORT, parse_ctype('signed short int'))
-      assert_equal(TYPE_SHORT, parse_ctype('const signed short int'))
-      assert_equal(TYPE_SHORT, parse_ctype('signed int short'))
-      assert_equal(TYPE_SHORT, parse_ctype('const signed int short'))
-      assert_equal(TYPE_SHORT, parse_ctype('int signed short'))
-      assert_equal(TYPE_SHORT, parse_ctype('const int signed short'))
-      assert_equal(TYPE_SHORT, parse_ctype('int short signed'))
-      assert_equal(TYPE_SHORT, parse_ctype('const int short signed'))
-      assert_equal(-TYPE_SHORT, parse_ctype('unsigned short'))
-      assert_equal(-TYPE_SHORT, parse_ctype('const unsigned short'))
-      assert_equal(-TYPE_SHORT, parse_ctype('unsigned short int'))
-      assert_equal(-TYPE_SHORT, parse_ctype('const unsigned short int'))
-      assert_equal(-TYPE_SHORT, parse_ctype('unsigned int short'))
-      assert_equal(-TYPE_SHORT, parse_ctype('const unsigned int short'))
-      assert_equal(-TYPE_SHORT, parse_ctype('short int unsigned'))
-      assert_equal(-TYPE_SHORT, parse_ctype('const short int unsigned'))
-      assert_equal(-TYPE_SHORT, parse_ctype('int unsigned short'))
-      assert_equal(-TYPE_SHORT, parse_ctype('const int unsigned short'))
-      assert_equal(-TYPE_SHORT, parse_ctype('int short unsigned'))
-      assert_equal(-TYPE_SHORT, parse_ctype('const int short unsigned'))
-    end
-
-    def test_int_ctype
-      assert_equal(TYPE_INT, parse_ctype('int'))
-      assert_equal(TYPE_INT, parse_ctype('const int'))
-      assert_equal(TYPE_INT, parse_ctype('signed int'))
-      assert_equal(TYPE_INT, parse_ctype('const signed int'))
-      assert_equal(-TYPE_INT, parse_ctype('uint'))
-      assert_equal(-TYPE_INT, parse_ctype('const uint'))
-      assert_equal(-TYPE_INT, parse_ctype('unsigned int'))
-      assert_equal(-TYPE_INT, parse_ctype('const unsigned int'))
-    end
-
-    def test_long_ctype
-      assert_equal(TYPE_LONG, parse_ctype('long'))
-      assert_equal(TYPE_LONG, parse_ctype('const long'))
-      assert_equal(TYPE_LONG, parse_ctype('long int'))
-      assert_equal(TYPE_LONG, parse_ctype('const long int'))
-      assert_equal(TYPE_LONG, parse_ctype('int long'))
-      assert_equal(TYPE_LONG, parse_ctype('const int long'))
-      assert_equal(TYPE_LONG, parse_ctype('signed long'))
-      assert_equal(TYPE_LONG, parse_ctype('const signed long'))
-      assert_equal(TYPE_LONG, parse_ctype('signed long int'))
-      assert_equal(TYPE_LONG, parse_ctype('const signed long int'))
-      assert_equal(TYPE_LONG, parse_ctype('signed int long'))
-      assert_equal(TYPE_LONG, parse_ctype('const signed int long'))
-      assert_equal(TYPE_LONG, parse_ctype('long signed'))
-      assert_equal(TYPE_LONG, parse_ctype('const long signed'))
-      assert_equal(TYPE_LONG, parse_ctype('long int signed'))
-      assert_equal(TYPE_LONG, parse_ctype('const long int signed'))
-      assert_equal(TYPE_LONG, parse_ctype('int long signed'))
-      assert_equal(TYPE_LONG, parse_ctype('const int long signed'))
-      assert_equal(-TYPE_LONG, parse_ctype('unsigned long'))
-      assert_equal(-TYPE_LONG, parse_ctype('const unsigned long'))
-      assert_equal(-TYPE_LONG, parse_ctype('unsigned long int'))
-      assert_equal(-TYPE_LONG, parse_ctype('const unsigned long int'))
-      assert_equal(-TYPE_LONG, parse_ctype('long int unsigned'))
-      assert_equal(-TYPE_LONG, parse_ctype('const long int unsigned'))
-      assert_equal(-TYPE_LONG, parse_ctype('unsigned int long'))
-      assert_equal(-TYPE_LONG, parse_ctype('const unsigned int long'))
-      assert_equal(-TYPE_LONG, parse_ctype('int unsigned long'))
-      assert_equal(-TYPE_LONG, parse_ctype('const int unsigned long'))
-      assert_equal(-TYPE_LONG, parse_ctype('int long unsigned'))
-      assert_equal(-TYPE_LONG, parse_ctype('const int long unsigned'))
-    end
-
-    def test_size_t_ctype
-      assert_equal(TYPE_SIZE_T, parse_ctype("size_t"))
-      assert_equal(TYPE_SIZE_T, parse_ctype("const size_t"))
-    end
-
-    def test_ssize_t_ctype
-      assert_equal(TYPE_SSIZE_T, parse_ctype("ssize_t"))
-      assert_equal(TYPE_SSIZE_T, parse_ctype("const ssize_t"))
-    end
-
-    def test_ptrdiff_t_ctype
-      assert_equal(TYPE_PTRDIFF_T, parse_ctype("ptrdiff_t"))
-      assert_equal(TYPE_PTRDIFF_T, parse_ctype("const ptrdiff_t"))
-    end
-
-    def test_intptr_t_ctype
-      assert_equal(TYPE_INTPTR_T, parse_ctype("intptr_t"))
-      assert_equal(TYPE_INTPTR_T, parse_ctype("const intptr_t"))
-    end
-
-    def test_uintptr_t_ctype
-      assert_equal(TYPE_UINTPTR_T, parse_ctype("uintptr_t"))
-      assert_equal(TYPE_UINTPTR_T, parse_ctype("const uintptr_t"))
-    end
-
-    def test_bool_ctype
-      assert_equal(TYPE_BOOL, parse_ctype('bool'))
-    end
-
-    def test_undefined_ctype
-      assert_raise(DLError) { parse_ctype('DWORD') }
-    end
-
-    def test_undefined_ctype_with_type_alias
-      assert_equal(-TYPE_LONG,
-                   parse_ctype('DWORD', {"DWORD" => "unsigned long"}))
-      assert_equal(-TYPE_LONG,
-                   parse_ctype('const DWORD', {"DWORD" => "unsigned long"}))
-    end
-
-    def expand_struct_types(types)
-      types.collect do |type|
-        case type
-        when Class
-          [expand_struct_types(type.types)]
-        when Array
-          [expand_struct_types([type[0]])[0][0], type[1]]
-        else
-          type
-        end
-      end
-    end
-
-    def test_struct_basic
-      assert_equal([[TYPE_INT, TYPE_CHAR], ['i', 'c']],
-                   parse_struct_signature(['int i', 'char c']))
-      assert_equal([[TYPE_INT, TYPE_CHAR], ['i', 'c']],
-                   parse_struct_signature(['const int i', 'const char c']))
-    end
-
-    def test_struct_array
-      assert_equal([[[TYPE_CHAR, 80], [TYPE_INT, 5]],
-                    ['buffer', 'x']],
-                   parse_struct_signature(['char buffer[80]',
-                                           'int[5] x']))
-      assert_equal([[[TYPE_CHAR, 80], [TYPE_INT, 5]],
-                    ['buffer', 'x']],
-                   parse_struct_signature(['const char buffer[80]',
-                                           'const int[5] x']))
-    end
-
-    def test_struct_nested_struct
-      types, members = parse_struct_signature([
-                                                'int x',
-                                                {inner: ['int i', 'char c']},
-                                              ])
-      assert_equal([[TYPE_INT, [[TYPE_INT, TYPE_CHAR]]],
-                    ['x', ['inner', ['i', 'c']]]],
-                   [expand_struct_types(types),
-                    members])
-    end
-
-    def test_struct_nested_defined_struct
-      inner = Fiddle::Importer.struct(['int i', 'char c'])
-      assert_equal([[TYPE_INT, inner],
-                    ['x', ['inner', ['i', 'c']]]],
-                   parse_struct_signature([
-                                            'int x',
-                                            {inner: inner},
-                                          ]))
-    end
-
-    def test_struct_double_nested_struct
-      types, members = parse_struct_signature([
-                                                'int x',
-                                                {
-                                                  outer: [
-                                                    'int y',
-                                                    {inner: ['int i', 'char c']},
-                                                  ],
-                                                },
-                                              ])
-      assert_equal([[TYPE_INT, [[TYPE_INT, [[TYPE_INT, TYPE_CHAR]]]]],
-                    ['x', ['outer', ['y', ['inner', ['i', 'c']]]]]],
-                   [expand_struct_types(types),
-                    members])
-    end
-
-    def test_struct_nested_struct_array
-      types, members = parse_struct_signature([
-                                                'int x',
-                                                {
-                                                  'inner[2]' => [
-                                                    'int i',
-                                                    'char c',
-                                                  ],
-                                                },
-                                              ])
-      assert_equal([[TYPE_INT, [[TYPE_INT, TYPE_CHAR], 2]],
-                    ['x', ['inner', ['i', 'c']]]],
-                   [expand_struct_types(types),
-                    members])
-    end
-
-    def test_struct_double_nested_struct_inner_array
-      types, members = parse_struct_signature(outer: [
-                                                'int x',
-                                                {
-                                                  'inner[2]' => [
-                                                    'int i',
-                                                    'char c',
-                                                  ],
-                                                },
-                                              ])
-      assert_equal([[[[TYPE_INT, [[TYPE_INT, TYPE_CHAR], 2]]]],
-                    [['outer', ['x', ['inner', ['i', 'c']]]]]],
-                   [expand_struct_types(types),
-                    members])
-    end
-
-    def test_struct_double_nested_struct_outer_array
-      types, members = parse_struct_signature([
-                                                'int x',
-                                                {
-                                                  'outer[2]' => {
-                                                    inner: [
-                                                      'int i',
-                                                      'char c',
-                                                    ],
-                                                  },
-                                                },
-                                              ])
-      assert_equal([[TYPE_INT, [[[[TYPE_INT, TYPE_CHAR]]], 2]],
-                    ['x', ['outer', [['inner', ['i', 'c']]]]]],
-                   [expand_struct_types(types),
-                    members])
-    end
-
-    def test_struct_array_str
-      assert_equal([[[TYPE_CHAR, 80], [TYPE_INT, 5]],
-                    ['buffer', 'x']],
-                   parse_struct_signature('char buffer[80], int[5] x'))
-      assert_equal([[[TYPE_CHAR, 80], [TYPE_INT, 5]],
-                    ['buffer', 'x']],
-                   parse_struct_signature('const char buffer[80], const int[5] x'))
-    end
-
-    def test_struct_function_pointer
-      assert_equal([[TYPE_VOIDP], ['cb']],
-                   parse_struct_signature(['void (*cb)(const char*)']))
-    end
-
-    def test_struct_function_pointer_str
-      assert_equal([[TYPE_VOIDP, TYPE_VOIDP], ['cb', 'data']],
-                   parse_struct_signature('void (*cb)(const char*), const char* data'))
-    end
-
-    def test_struct_string
-      assert_equal [[TYPE_INT,TYPE_VOIDP,TYPE_VOIDP], ['x', 'cb', 'name']], parse_struct_signature('int x; void (*cb)(); const char* name')
-    end
-
-    def test_struct_undefined
-      assert_raise(DLError) { parse_struct_signature(['int i', 'DWORD cb']) }
-    end
-
-    def test_struct_undefined_with_type_alias
-      assert_equal [[TYPE_INT,-TYPE_LONG], ['i', 'cb']], parse_struct_signature(['int i', 'DWORD cb'], {"DWORD" => "unsigned long"})
-    end
-
-    def test_signature_basic
-      func, ret, args = parse_signature('void func()')
-      assert_equal 'func', func
-      assert_equal TYPE_VOID, ret
-      assert_equal [], args
-    end
-
-    def test_signature_semi
-      func, ret, args = parse_signature('void func();')
-      assert_equal 'func', func
-      assert_equal TYPE_VOID, ret
-      assert_equal [], args
-    end
-
-    def test_signature_void_arg
-      func, ret, args = parse_signature('void func(void)')
-      assert_equal 'func', func
-      assert_equal TYPE_VOID, ret
-      assert_equal [], args
-    end
-
-    def test_signature_type_args
-      types = [
-        'char', 'unsigned char',
-        'short', 'unsigned short',
-        'int', 'unsigned int',
-        'long', 'unsigned long',
-        defined?(TYPE_LONG_LONG) && \
-        [
-        'long long', 'unsigned long long',
-        ],
-        'float', 'double',
-        'const char*', 'void*',
-      ].flatten.compact
-      func, ret, args = parse_signature("void func(#{types.join(',')})")
-      assert_equal 'func', func
-      assert_equal TYPE_VOID, ret
-      assert_equal [
-        TYPE_CHAR, -TYPE_CHAR,
-        TYPE_SHORT, -TYPE_SHORT,
-        TYPE_INT, -TYPE_INT,
-        TYPE_LONG, -TYPE_LONG,
-        defined?(TYPE_LONG_LONG) && \
-        [
-        TYPE_LONG_LONG, -TYPE_LONG_LONG,
-        ],
-        TYPE_FLOAT, TYPE_DOUBLE,
-        TYPE_VOIDP, TYPE_VOIDP,
-      ].flatten.compact, args
-    end
-
-    def test_signature_single_variable
-      func, ret, args = parse_signature('void func(int x)')
-      assert_equal 'func', func
-      assert_equal TYPE_VOID, ret
-      assert_equal [TYPE_INT], args
-    end
-
-    def test_signature_multiple_variables
-      func, ret, args = parse_signature('void func(int x, const char* s)')
-      assert_equal 'func', func
-      assert_equal TYPE_VOID, ret
-      assert_equal [TYPE_INT, TYPE_VOIDP], args
-    end
-
-    def test_signature_array_variable
-      func, ret, args = parse_signature('void func(int x[], int y[40])')
-      assert_equal 'func', func
-      assert_equal TYPE_VOID, ret
-      assert_equal [TYPE_VOIDP, TYPE_VOIDP], args
-    end
-
-    def test_signature_function_pointer
-      func, ret, args = parse_signature('int func(int (*sum)(int x, int y), int x, int y)')
-      assert_equal 'func', func
-      assert_equal TYPE_INT, ret
-      assert_equal [TYPE_VOIDP, TYPE_INT, TYPE_INT], args
-    end
-
-    def test_signature_variadic_arguments
-      unless Fiddle.const_defined?("TYPE_VARIADIC")
-        omit "libffi doesn't support variadic arguments"
-      end
-      assert_equal([
-                     "printf",
-                     TYPE_INT,
-                     [TYPE_VOIDP, TYPE_VARIADIC],
-                   ],
-                   parse_signature('int printf(const char *format, ...)'))
-    end
-
-    def test_signature_return_pointer
-      func, ret, args = parse_signature('void* malloc(size_t)')
-      assert_equal 'malloc', func
-      assert_equal TYPE_VOIDP, ret
-      assert_equal [TYPE_SIZE_T], args
-    end
-
-    def test_signature_return_array
-      func, ret, args = parse_signature('int (*func())[32]')
-      assert_equal 'func', func
-      assert_equal TYPE_VOIDP, ret
-      assert_equal [], args
-    end
-
-    def test_signature_return_array_with_args
-      func, ret, args = parse_signature('int (*func(const char* s))[]')
-      assert_equal 'func', func
-      assert_equal TYPE_VOIDP, ret
-      assert_equal [TYPE_VOIDP], args
-    end
-
-    def test_signature_return_function_pointer
-      func, ret, args = parse_signature('int (*func())(int x, int y)')
-      assert_equal 'func', func
-      assert_equal TYPE_VOIDP, ret
-      assert_equal [], args
-    end
-
-    def test_signature_return_function_pointer_with_args
-      func, ret, args = parse_signature('int (*func(int z))(int x, int y)')
-      assert_equal 'func', func
-      assert_equal TYPE_VOIDP, ret
-      assert_equal [TYPE_INT], args
-    end
-  end
-end if defined?(Fiddle)
diff --git a/test/fiddle/test_fiddle.rb b/test/fiddle/test_fiddle.rb
deleted file mode 100644
index 9bddb056c90c08..00000000000000
--- a/test/fiddle/test_fiddle.rb
+++ /dev/null
@@ -1,58 +0,0 @@
-# frozen_string_literal: true
-begin
-  require_relative 'helper'
-rescue LoadError
-end
-
-class TestFiddle < Fiddle::TestCase
-  def test_nil_true_etc
-    assert_equal Fiddle::Qtrue, Fiddle.dlwrap(true)
-    assert_equal Fiddle::Qfalse, Fiddle.dlwrap(false)
-    assert_equal Fiddle::Qnil, Fiddle.dlwrap(nil)
-    assert Fiddle::Qundef
-  end
-
-  def test_windows_constant
-    require 'rbconfig'
-    if RbConfig::CONFIG['host_os'] =~ /mswin|mingw/
-      assert Fiddle::WINDOWS, "Fiddle::WINDOWS should be 'true' on Windows platforms"
-    else
-      refute Fiddle::WINDOWS, "Fiddle::WINDOWS should be 'false' on non-Windows platforms"
-    end
-  end
-
-  def test_dlopen_linker_script_input_linux
-    omit("This is only for Linux") unless RUBY_PLATFORM.match?("linux")
-    if Dir.glob("/usr/lib/*/libncurses.so").empty?
-      omit("libncurses.so is needed")
-    end
-    # libncurses.so uses INPUT() on Debian GNU/Linux
-    # $ cat /usr/lib/x86_64-linux-gnu/libncurses.so
-    # INPUT(libncurses.so.6 -ltinfo)
-    handle = Fiddle.dlopen("libncurses.so")
-    begin
-      assert_equal("libncurses.so",
-                   File.basename(handle.file_name, ".*"))
-    ensure
-      handle.close
-    end
-  end
-
-  def test_dlopen_linker_script_group_linux
-    omit("This is only for Linux") unless RUBY_PLATFORM.match?("linux")
-    # libc.so uses GROUP() on Debian GNU/Linux
-    # $ cat /usr/lib/x86_64-linux-gnu/libc.so
-    # /* GNU ld script
-    #    Use the shared library, but some functions are only in
-    #    the static library, so try that secondarily.  */
-    # OUTPUT_FORMAT(elf64-x86-64)
-    # GROUP ( /lib/x86_64-linux-gnu/libc.so.6 /usr/lib/x86_64-linux-gnu/libc_nonshared.a  AS_NEEDED ( /lib64/ld-linux-x86-64.so.2 ) )
-    handle = Fiddle.dlopen("libc.so")
-    begin
-      assert_equal("libc.so",
-                   File.basename(handle.file_name, ".*"))
-    ensure
-      handle.close
-    end
-  end
-end if defined?(Fiddle)
diff --git a/test/fiddle/test_func.rb b/test/fiddle/test_func.rb
deleted file mode 100644
index ff52f727d0b025..00000000000000
--- a/test/fiddle/test_func.rb
+++ /dev/null
@@ -1,149 +0,0 @@
-# frozen_string_literal: true
-begin
-  require_relative 'helper'
-rescue LoadError
-end
-
-module Fiddle
-  class TestFunc < TestCase
-    def test_random
-      f = Function.new(@libc['srand'], [-TYPE_LONG], TYPE_VOID)
-      assert_nil f.call(10)
-    end
-
-    def test_sinf
-      begin
-        f = Function.new(@libm['sinf'], [TYPE_FLOAT], TYPE_FLOAT)
-      rescue Fiddle::DLError
-        omit "libm may not have sinf()"
-      end
-      assert_in_delta 1.0, f.call(90 * Math::PI / 180), 0.0001
-    end
-
-    def test_sin
-      f = Function.new(@libm['sin'], [TYPE_DOUBLE], TYPE_DOUBLE)
-      assert_in_delta 1.0, f.call(90 * Math::PI / 180), 0.0001
-    end
-
-    def test_string
-      under_gc_stress do
-        f = Function.new(@libc['strcpy'], [TYPE_VOIDP, TYPE_VOIDP], TYPE_VOIDP)
-        buff = +"000"
-        str = f.call(buff, "123")
-        assert_equal("123", buff)
-        assert_equal("123", str.to_s)
-      end
-    end
-
-    def test_isdigit
-      f = Function.new(@libc['isdigit'], [TYPE_INT], TYPE_INT)
-      r1 = f.call(?1.ord)
-      r2 = f.call(?2.ord)
-      rr = f.call(?r.ord)
-      assert_operator r1, :>, 0
-      assert_operator r2, :>, 0
-      assert_equal 0, rr
-    end
-
-    def test_atof
-      f = Function.new(@libc['atof'], [TYPE_VOIDP], TYPE_DOUBLE)
-      r = f.call("12.34")
-      assert_includes(12.00..13.00, r)
-    end
-
-    def test_strtod
-      f = Function.new(@libc['strtod'], [TYPE_VOIDP, TYPE_VOIDP], TYPE_DOUBLE)
-      buff1 = Pointer["12.34"]
-      buff2 = buff1 + 4
-      r = f.call(buff1, - buff2)
-      assert_in_delta(12.34, r, 0.001)
-    end
-
-    def test_qsort1
-      closure_class = Class.new(Closure) do
-        def call(x, y)
-          Pointer.new(x)[0] <=> Pointer.new(y)[0]
-        end
-      end
-
-      closure_class.create(TYPE_INT, [TYPE_VOIDP, TYPE_VOIDP]) do |callback|
-        qsort = Function.new(@libc['qsort'],
-                             [TYPE_VOIDP, TYPE_SIZE_T, TYPE_SIZE_T, TYPE_VOIDP],
-                             TYPE_VOID)
-        buff = "9341"
-        qsort.call(buff, buff.size, 1, callback)
-        assert_equal("1349", buff)
-
-        bug4929 = '[ruby-core:37395]'
-        buff = "9341"
-        under_gc_stress do
-          qsort.call(buff, buff.size, 1, callback)
-        end
-        assert_equal("1349", buff, bug4929)
-      end
-    ensure
-      # Ensure freeing all closures.
-      # See https://github.com/ruby/fiddle/issues/102#issuecomment-1241763091 .
-      not_freed_closures = []
-      ObjectSpace.each_object(Fiddle::Closure) do |closure|
-        not_freed_closures << closure unless closure.freed?
-      end
-      assert_equal([], not_freed_closures)
-    end
-
-    def test_snprintf
-      unless Fiddle.const_defined?("TYPE_VARIADIC")
-        omit "libffi doesn't support variadic arguments"
-      end
-      if Fiddle::WINDOWS
-        snprintf_name = "_snprintf"
-      else
-        snprintf_name = "snprintf"
-      end
-      begin
-        snprintf_pointer = @libc[snprintf_name]
-      rescue Fiddle::DLError
-        omit "Can't find #{snprintf_name}: #{$!.message}"
-      end
-      snprintf = Function.new(snprintf_pointer,
-                              [
-                                :voidp,
-                                :size_t,
-                                :const_string,
-                                :variadic,
-                              ],
-                              :int)
-      output_buffer = " " * 1024
-      output = Pointer[output_buffer]
-
-      written = snprintf.call(output,
-                              output.size,
-                              "int: %d, string: %.*s, const string: %s\n",
-                              :int, -29,
-                              :int, 4,
-                              :voidp, "Hello",
-                              :const_string, "World")
-      assert_equal("int: -29, string: Hell, const string: World\n",
-                   output_buffer[0, written])
-
-      string_like_class = Class.new do
-        def initialize(string)
-          @string = string
-        end
-
-        def to_str
-          @string
-        end
-      end
-      written = snprintf.call(output,
-                              output.size,
-                              "string: %.*s, const string: %s, uint: %u\n",
-                              :int, 2,
-                              :voidp, "Hello",
-                              :const_string, string_like_class.new("World"),
-                              :int, 29)
-      assert_equal("string: He, const string: World, uint: 29\n",
-                   output_buffer[0, written])
-    end
-  end
-end if defined?(Fiddle)
diff --git a/test/fiddle/test_function.rb b/test/fiddle/test_function.rb
deleted file mode 100644
index 847df3793ab168..00000000000000
--- a/test/fiddle/test_function.rb
+++ /dev/null
@@ -1,239 +0,0 @@
-# frozen_string_literal: true
-begin
-  require_relative 'helper'
-rescue LoadError
-end
-
-module Fiddle
-  class TestFunction < Fiddle::TestCase
-    def setup
-      super
-      Fiddle.last_error = nil
-      if WINDOWS
-        Fiddle.win32_last_error = nil
-        Fiddle.win32_last_socket_error = nil
-      end
-    end
-
-    def teardown
-      # Ensure freeing all closures.
-      # See https://github.com/ruby/fiddle/issues/102#issuecomment-1241763091 .
-      not_freed_closures = []
-      ObjectSpace.each_object(Fiddle::Closure) do |closure|
-        not_freed_closures << closure unless closure.freed?
-      end
-      assert_equal([], not_freed_closures)
-    end
-
-    def test_default_abi
-      func = Function.new(@libm['sin'], [TYPE_DOUBLE], TYPE_DOUBLE)
-      assert_equal Function::DEFAULT, func.abi
-    end
-
-    def test_name
-      func = Function.new(@libm['sin'], [TYPE_DOUBLE], TYPE_DOUBLE, name: 'sin')
-      assert_equal 'sin', func.name
-    end
-
-    def test_need_gvl?
-      libruby = Fiddle.dlopen(nil)
-      rb_str_dup = Function.new(libruby['rb_str_dup'],
-                                [:voidp],
-                                :voidp,
-                                need_gvl: true)
-      assert(rb_str_dup.need_gvl?)
-      assert_equal('Hello',
-                   Fiddle.dlunwrap(rb_str_dup.call(Fiddle.dlwrap('Hello'))))
-    end
-
-    def test_argument_errors
-      assert_raise(TypeError) do
-        Function.new(@libm['sin'], TYPE_DOUBLE, TYPE_DOUBLE)
-      end
-
-      assert_raise(TypeError) do
-        Function.new(@libm['sin'], ['foo'], TYPE_DOUBLE)
-      end
-
-      assert_raise(TypeError) do
-        Function.new(@libm['sin'], [TYPE_DOUBLE], 'foo')
-      end
-    end
-
-    def test_argument_type_conversion
-      type = Struct.new(:int, :call_count) do
-        def initialize(int)
-          super(int, 0)
-        end
-        def to_int
-          raise "exhausted" if (self.call_count += 1) > 1
-          self.int
-        end
-      end
-      type_arg = type.new(TYPE_DOUBLE)
-      type_result = type.new(TYPE_DOUBLE)
-      assert_nothing_raised(RuntimeError) do
-        Function.new(@libm['sin'], [type_arg], type_result)
-      end
-      assert_equal(1, type_arg.call_count)
-      assert_equal(1, type_result.call_count)
-    end
-
-    def test_call
-      func = Function.new(@libm['sin'], [TYPE_DOUBLE], TYPE_DOUBLE)
-      assert_in_delta 1.0, func.call(90 * Math::PI / 180), 0.0001
-    end
-
-    def test_argument_count
-      closure_class = Class.new(Closure) do
-        def call one
-          10 + one
-        end
-      end
-      closure_class.create(TYPE_INT, [TYPE_INT]) do |closure|
-        func = Function.new(closure, [TYPE_INT], TYPE_INT)
-
-        assert_raise(ArgumentError) do
-          func.call(1,2,3)
-        end
-        assert_raise(ArgumentError) do
-          func.call
-        end
-      end
-    end
-
-    def test_last_error
-      func = Function.new(@libc['strcpy'], [TYPE_VOIDP, TYPE_VOIDP], TYPE_VOIDP)
-
-      assert_nil Fiddle.last_error
-      func.call(+"000", "123")
-      refute_nil Fiddle.last_error
-    end
-
-    if WINDOWS
-      def test_win32_last_error
-        kernel32 = Fiddle.dlopen("kernel32")
-        args = [kernel32["SetLastError"], [-TYPE_LONG], TYPE_VOID]
-        args << Function::STDCALL if Function.const_defined?(:STDCALL)
-        set_last_error = Function.new(*args)
-        assert_nil(Fiddle.win32_last_error)
-        n = 1 << 29 | 1
-        set_last_error.call(n)
-        assert_equal(n, Fiddle.win32_last_error)
-      end
-
-      def test_win32_last_socket_error
-        ws2_32 = Fiddle.dlopen("ws2_32")
-        args = [ws2_32["WSASetLastError"], [TYPE_INT], TYPE_VOID]
-        args << Function::STDCALL if Function.const_defined?(:STDCALL)
-        wsa_set_last_error = Function.new(*args)
-        assert_nil(Fiddle.win32_last_socket_error)
-        n = 1 << 29 | 1
-        wsa_set_last_error.call(n)
-        assert_equal(n, Fiddle.win32_last_socket_error)
-      end
-    end
-
-    def test_strcpy
-      f = Function.new(@libc['strcpy'], [TYPE_VOIDP, TYPE_VOIDP], TYPE_VOIDP)
-      buff = +"000"
-      str = f.call(buff, "123")
-      assert_equal("123", buff)
-      assert_equal("123", str.to_s)
-    end
-
-    def call_proc(string_to_copy)
-      buff = +"000"
-      str = yield(buff, string_to_copy)
-      [buff, str]
-    end
-
-    def test_function_as_proc
-      f = Function.new(@libc['strcpy'], [TYPE_VOIDP, TYPE_VOIDP], TYPE_VOIDP)
-      buff, str = call_proc("123", &f)
-      assert_equal("123", buff)
-      assert_equal("123", str.to_s)
-    end
-
-    def test_function_as_method
-      f = Function.new(@libc['strcpy'], [TYPE_VOIDP, TYPE_VOIDP], TYPE_VOIDP)
-      klass = Class.new do
-        define_singleton_method(:strcpy, &f)
-      end
-      buff = +"000"
-      str = klass.strcpy(buff, "123")
-      assert_equal("123", buff)
-      assert_equal("123", str.to_s)
-    end
-
-    def test_nogvl_poll
-      # XXX hack to quiet down CI errors on EINTR from r64353
-      # [ruby-core:88360] [Misc #14937]
-      # Making pipes (and sockets) non-blocking by default would allow
-      # us to get rid of POSIX timers / timer pthread
-      # https://bugs.ruby-lang.org/issues/14968
-      IO.pipe { |r,w| IO.select([r], [w]) }
-      begin
-        poll = @libc['poll']
-      rescue Fiddle::DLError
-        omit 'poll(2) not available'
-      end
-      f = Function.new(poll, [TYPE_VOIDP, TYPE_INT, TYPE_INT], TYPE_INT)
-
-      msec = 200
-      t0 = Process.clock_gettime(Process::CLOCK_MONOTONIC, :millisecond)
-      th = Thread.new { f.call(nil, 0, msec) }
-      n1 = f.call(nil, 0, msec)
-      n2 = th.value
-      t1 = Process.clock_gettime(Process::CLOCK_MONOTONIC, :millisecond)
-      assert_in_delta(msec, t1 - t0, 180, 'slept amount of time')
-      assert_equal(0, n1, perror("poll(2) in main-thread"))
-      assert_equal(0, n2, perror("poll(2) in sub-thread"))
-    end
-
-    def test_no_memory_leak
-      if respond_to?(:assert_nothing_leaked_memory)
-        rb_obj_frozen_p_symbol = Fiddle.dlopen(nil)["rb_obj_frozen_p"]
-        rb_obj_frozen_p = Fiddle::Function.new(rb_obj_frozen_p_symbol,
-                                               [Fiddle::TYPE_UINTPTR_T],
-                                               Fiddle::TYPE_UINTPTR_T)
-        a = "a"
-        n_tries = 100_000
-        n_tries.times do
-          begin
-            a + 1
-          rescue TypeError
-          end
-        end
-        n_arguments = 1
-        sizeof_fiddle_generic = Fiddle::SIZEOF_VOIDP # Rough
-        size_per_try =
-          (sizeof_fiddle_generic * n_arguments) +
-          (Fiddle::SIZEOF_VOIDP * (n_arguments + 1))
-        assert_nothing_leaked_memory(size_per_try * n_tries) do
-          n_tries.times do
-            begin
-              rb_obj_frozen_p.call(a)
-            rescue TypeError
-            end
-          end
-        end
-      else
-        prep = 'r = Fiddle::Function.new(Fiddle.dlopen(nil)["rb_obj_frozen_p"], [Fiddle::TYPE_UINTPTR_T], Fiddle::TYPE_UINTPTR_T); a = "a"'
-        code = 'begin r.call(a); rescue TypeError; end'
-        assert_no_memory_leak(%w[-W0 -rfiddle], "#{prep}\n1000.times{#{code}}", "10_000.times {#{code}}", limit: 1.2)
-      end
-    end
-
-    private
-
-    def perror(m)
-      proc do
-        if e = Fiddle.last_error
-          m = "#{m}: #{SystemCallError.new(e).message}"
-        end
-        m
-      end
-    end
-  end
-end if defined?(Fiddle)
diff --git a/test/fiddle/test_handle.rb b/test/fiddle/test_handle.rb
deleted file mode 100644
index c19bcc66233a6e..00000000000000
--- a/test/fiddle/test_handle.rb
+++ /dev/null
@@ -1,215 +0,0 @@
-# frozen_string_literal: true
-begin
-  require_relative 'helper'
-rescue LoadError
-end
-
-module Fiddle
-  class TestHandle < TestCase
-    include Fiddle
-
-    def test_to_i
-      handle = Fiddle::Handle.new(LIBC_SO)
-      assert_kind_of Integer, handle.to_i
-    end
-
-    def test_to_ptr
-      handle = Fiddle::Handle.new(LIBC_SO)
-      ptr = handle.to_ptr
-      assert_equal ptr.to_i, handle.to_i
-    end
-
-    def test_static_sym_unknown
-      assert_raise(DLError) { Fiddle::Handle.sym('fooo') }
-      assert_raise(DLError) { Fiddle::Handle['fooo'] }
-      refute Fiddle::Handle.sym_defined?('fooo')
-    end
-
-    def test_static_sym
-      begin
-        # Linux / Darwin / FreeBSD
-        refute_nil Fiddle::Handle.sym('dlopen')
-        assert Fiddle::Handle.sym_defined?('dlopen')
-        assert_equal Fiddle::Handle.sym('dlopen'), Fiddle::Handle['dlopen']
-        return
-      rescue
-      end
-
-      begin
-        # NetBSD
-        require '-test-/dln/empty'
-        refute_nil Fiddle::Handle.sym('Init_empty')
-        assert_equal Fiddle::Handle.sym('Init_empty'), Fiddle::Handle['Init_empty']
-        return
-      rescue
-      end
-    end unless /mswin|mingw/ =~ RUBY_PLATFORM
-
-    def test_sym_closed_handle
-      handle = Fiddle::Handle.new(LIBC_SO)
-      handle.close
-      assert_raise(DLError) { handle.sym("calloc") }
-      assert_raise(DLError) { handle["calloc"] }
-    end
-
-    def test_sym_unknown
-      handle = Fiddle::Handle.new(LIBC_SO)
-      assert_raise(DLError) { handle.sym('fooo') }
-      assert_raise(DLError) { handle['fooo'] }
-      refute handle.sym_defined?('fooo')
-    end
-
-    def test_sym_with_bad_args
-      handle = Handle.new(LIBC_SO)
-      assert_raise(TypeError) { handle.sym(nil) }
-      assert_raise(TypeError) { handle[nil] }
-    end
-
-    def test_sym
-      handle = Handle.new(LIBC_SO)
-      refute_nil handle.sym('calloc')
-      refute_nil handle['calloc']
-      assert handle.sym_defined?('calloc')
-    end
-
-    def test_handle_close
-      handle = Handle.new(LIBC_SO)
-      assert_equal 0, handle.close
-    end
-
-    def test_handle_close_twice
-      handle = Handle.new(LIBC_SO)
-      handle.close
-      assert_raise(DLError) do
-        handle.close
-      end
-    end
-
-    def test_dlopen_returns_handle
-      assert_instance_of Handle, dlopen(LIBC_SO)
-    end
-
-    def test_initialize_noargs
-      handle = Handle.new
-      refute_nil handle['rb_str_new']
-    end
-
-    def test_initialize_flags
-      handle = Handle.new(LIBC_SO, RTLD_LAZY | RTLD_GLOBAL)
-      refute_nil handle['calloc']
-    end
-
-    def test_enable_close
-      handle = Handle.new(LIBC_SO)
-      assert !handle.close_enabled?, 'close is enabled'
-
-      handle.enable_close
-      assert handle.close_enabled?, 'close is not enabled'
-    end
-
-    def test_disable_close
-      handle = Handle.new(LIBC_SO)
-
-      handle.enable_close
-      assert handle.close_enabled?, 'close is enabled'
-      handle.disable_close
-      assert !handle.close_enabled?, 'close is enabled'
-    end
-
-    def test_file_name
-      file_name = Handle.new(LIBC_SO).file_name
-      if file_name
-        assert_kind_of String, file_name
-        expected = [File.basename(LIBC_SO)]
-        begin
-          expected << File.basename(File.realpath(LIBC_SO, File.dirname(file_name)))
-        rescue Errno::ENOENT
-        end
-        basename = File.basename(file_name)
-        unless File::FNM_SYSCASE.zero?
-          basename.downcase!
-          expected.each(&:downcase!)
-        end
-        assert_include expected, basename
-      end
-    end
-
-    def test_NEXT
-      begin
-        # Linux / Darwin
-        #
-        # There are two special pseudo-handles, RTLD_DEFAULT and RTLD_NEXT.  The  former  will  find
-        # the  first  occurrence  of the desired symbol using the default library search order.  The
-        # latter will find the next occurrence of a function in the search order after  the  current
-        # library.   This  allows  one  to  provide  a  wrapper  around a function in another shared
-        # library.
-        # --- Ubuntu Linux 8.04 dlsym(3)
-        handle = Handle::NEXT
-        refute_nil handle['malloc']
-        return
-      rescue
-      end
-
-      begin
-        # BSD
-        #
-        # If dlsym() is called with the special handle RTLD_NEXT, then the search
-        # for the symbol is limited to the shared objects which were loaded after
-        # the one issuing the call to dlsym().  Thus, if the function is called
-        # from the main program, all the shared libraries are searched.  If it is
-        # called from a shared library, all subsequent shared libraries are
-        # searched.  RTLD_NEXT is useful for implementing wrappers around library
-        # functions.  For example, a wrapper function getpid() could access the
-        # "real" getpid() with dlsym(RTLD_NEXT, "getpid").  (Actually, the dlfunc()
-        # interface, below, should be used, since getpid() is a function and not a
-        # data object.)
-        # --- FreeBSD 8.0 dlsym(3)
-        require '-test-/dln/empty'
-        handle = Handle::NEXT
-        refute_nil handle['Init_empty']
-        return
-      rescue
-      end
-    end unless /mswin|mingw/ =~ RUBY_PLATFORM
-
-    def test_DEFAULT
-      handle = Handle::DEFAULT
-      refute_nil handle['malloc']
-    end unless /mswin|mingw/ =~ RUBY_PLATFORM
-
-    def test_dlerror
-      # FreeBSD (at least 7.2 to 7.2) calls nsdispatch(3) when it calls
-      # getaddrinfo(3). And nsdispatch(3) doesn't call dlerror(3) even if
-      # it calls _nss_cache_cycle_prevention_function with dlsym(3).
-      # So our Fiddle::Handle#sym must call dlerror(3) before call dlsym.
-      # In general uses of dlerror(3) should call it before use it.
-      require 'socket'
-      Socket.gethostbyname("localhost")
-      Fiddle.dlopen("/lib/libc.so.7").sym('strcpy')
-    end if /freebsd/=~ RUBY_PLATFORM
-
-    def test_no_memory_leak
-      # https://github.com/ruby/fiddle/actions/runs/3202406059/jobs/5231356410
-      omit if RUBY_VERSION >= '3.2'
-
-      if respond_to?(:assert_nothing_leaked_memory)
-        n_tries = 100_000
-        assert_nothing_leaked_memory(SIZEOF_VOIDP * (n_tries / 100)) do
-          n_tries.times do
-            Fiddle::Handle.allocate
-          end
-        end
-      else
-        assert_no_memory_leak(%w[-W0 -rfiddle.so], '', '100_000.times {Fiddle::Handle.allocate}; GC.start', rss: true)
-      end
-    end
-
-    if /cygwin|mingw|mswin/ =~ RUBY_PLATFORM
-      def test_fallback_to_ansi
-        k = Fiddle::Handle.new("kernel32.dll")
-        ansi = k["GetFileAttributesA"]
-        assert_equal(ansi, k["GetFileAttributes"], "should fallback to ANSI version")
-      end
-    end
-  end
-end if defined?(Fiddle)
diff --git a/test/fiddle/test_import.rb b/test/fiddle/test_import.rb
deleted file mode 100644
index 090ace620db863..00000000000000
--- a/test/fiddle/test_import.rb
+++ /dev/null
@@ -1,490 +0,0 @@
-# coding: US-ASCII
-# frozen_string_literal: true
-begin
-  require_relative 'helper'
-  require 'fiddle/import'
-rescue LoadError
-end
-
-module Fiddle
-  module LIBC
-    extend Importer
-    dlload LIBC_SO, LIBM_SO
-
-    typealias 'string', 'char*'
-    typealias 'FILE*', 'void*'
-
-    extern "void *strcpy(char*, char*)"
-    extern "int isdigit(int)"
-    extern "double atof(string)"
-    extern "unsigned long strtoul(char*, char **, int)"
-    extern "int qsort(void*, unsigned long, unsigned long, void*)"
-    extern "int fprintf(FILE*, char*)" rescue nil
-    extern "int gettimeofday(timeval*, timezone*)" rescue nil
-
-    Timeval = struct [
-      "long tv_sec",
-      "long tv_usec",
-    ]
-    Timezone = struct [
-      "int tz_minuteswest",
-      "int tz_dsttime",
-    ]
-    MyStruct = struct [
-      "short num[5]",
-      "char c",
-      "unsigned char buff[7]",
-    ]
-    StructNestedStruct = struct [
-      {
-        "vertices[2]" => {
-          position: ["float x", "float y", "float z"],
-          texcoord: ["float u", "float v"]
-        },
-        object: ["int id", "void *user_data"],
-      },
-      "int id"
-    ]
-    UnionNestedStruct = union [
-      {
-        keyboard: [
-          'unsigned int state',
-          'char key'
-        ],
-        mouse: [
-          'unsigned int button',
-          'unsigned short x',
-          'unsigned short y'
-        ]
-      }
-    ]
-  end
-
-  class TestImport < TestCase
-    def test_ensure_call_dlload
-      err = assert_raise(RuntimeError) do
-        Class.new do
-          extend Importer
-          extern "void *strcpy(char*, char*)"
-        end
-      end
-      assert_match(/call dlload before/, err.message)
-    end
-
-    def test_struct_memory_access()
-      # check memory operations performed directly on struct
-      Fiddle::Importer.struct(['int id']).malloc(Fiddle::RUBY_FREE) do |my_struct|
-        my_struct[0, Fiddle::SIZEOF_INT] = "\x01".b * Fiddle::SIZEOF_INT
-        assert_equal 0x01010101, my_struct.id
-
-        my_struct.id = 0
-        assert_equal "\x00".b * Fiddle::SIZEOF_INT, my_struct[0, Fiddle::SIZEOF_INT]
-      end
-    end
-
-    def test_struct_ptr_array_subscript_multiarg()
-      # check memory operations performed on struct#to_ptr
-      Fiddle::Importer.struct([ 'int x' ]).malloc(Fiddle::RUBY_FREE) do |struct|
-        ptr = struct.to_ptr
-
-        struct.x = 0x02020202
-        assert_equal("\x02".b * Fiddle::SIZEOF_INT, ptr[0, Fiddle::SIZEOF_INT])
-
-        ptr[0, Fiddle::SIZEOF_INT] = "\x01".b * Fiddle::SIZEOF_INT
-        assert_equal 0x01010101, struct.x
-      end
-    end
-
-    def test_malloc()
-      LIBC::Timeval.malloc(Fiddle::RUBY_FREE) do |s1|
-        LIBC::Timeval.malloc(Fiddle::RUBY_FREE) do |s2|
-          refute_equal(s1.to_ptr.to_i, s2.to_ptr.to_i)
-        end
-      end
-    end
-
-    def test_sizeof()
-      assert_equal(SIZEOF_VOIDP, LIBC.sizeof("FILE*"))
-      assert_equal(LIBC::MyStruct.size(), LIBC.sizeof(LIBC::MyStruct))
-      LIBC::MyStruct.malloc(Fiddle::RUBY_FREE) do |my_struct|
-        assert_equal(LIBC::MyStruct.size(), LIBC.sizeof(my_struct))
-      end
-      assert_equal(SIZEOF_LONG_LONG, LIBC.sizeof("long long")) if defined?(SIZEOF_LONG_LONG)
-      assert_equal(LIBC::StructNestedStruct.size(), LIBC.sizeof(LIBC::StructNestedStruct))
-    end
-
-    Fiddle.constants.grep(/\ATYPE_(?!VOID|VARIADIC\z)(.*)/) do
-      type = $&
-      const_type_name = $1
-      size = Fiddle.const_get("SIZEOF_#{const_type_name}")
-      if const_type_name == "CONST_STRING"
-        name = "const_string"
-        type_name = "const char*"
-      else
-        name = $1.sub(/P\z/,"*").gsub(/_(?!T\z)/, " ").downcase
-        type_name = name
-      end
-      type_name = "unsigned #{$1}" if type_name =~ /\Au(long|short|char|int|long long)\z/
-
-      define_method("test_sizeof_#{name}") do
-        assert_equal(size, Fiddle::Importer.sizeof(type_name), type)
-      end
-    end
-
-    # Assert that the unsigned constants are equal to the "negative" signed ones
-    # for backwards compatibility
-    def test_unsigned_equals_negative_signed
-      Fiddle.constants.grep(/\ATYPE_(?!VOID|VARIADIC\z)(U.*)/) do |unsigned|
-        assert_equal(-Fiddle.const_get(unsigned.to_s.sub(/U/, '')),
-                     Fiddle.const_get(unsigned))
-      end
-    end
-
-    def test_type_constants
-      Fiddle::Types.constants.each do |const|
-        assert_equal Fiddle::Types.const_get(const), Fiddle.const_get("TYPE_#{const}")
-      end
-    end
-
-    def test_unsigned_result()
-      d = (2 ** 31) + 1
-
-      r = LIBC.strtoul(d.to_s, 0, 0)
-      assert_equal(d, r)
-    end
-
-    def test_io()
-      if( RUBY_PLATFORM != BUILD_RUBY_PLATFORM ) || !defined?(LIBC.fprintf)
-        return
-      end
-      io_in,io_out = IO.pipe()
-      LIBC.fprintf(io_out, "hello")
-      io_out.flush()
-      io_out.close()
-      str = io_in.read()
-      io_in.close()
-      assert_equal("hello", str)
-    end
-
-    def test_value()
-      i = LIBC.value('int', 2)
-      assert_equal(2, i.value)
-
-      d = LIBC.value('double', 2.0)
-      assert_equal(2.0, d.value)
-
-      ary = LIBC.value('int[3]', [0,1,2])
-      assert_equal([0,1,2], ary.value)
-    end
-
-    def test_struct_array_assignment()
-      Fiddle::Importer.struct(["unsigned int stages[3]"]).malloc(Fiddle::RUBY_FREE) do |instance|
-        instance.stages[0] = 1024
-        instance.stages[1] = 10
-        instance.stages[2] = 100
-        assert_equal 1024, instance.stages[0]
-        assert_equal 10, instance.stages[1]
-        assert_equal 100, instance.stages[2]
-        assert_equal [1024, 10, 100].pack(Fiddle::PackInfo::PACK_MAP[-Fiddle::TYPE_INT] * 3),
-                    instance.to_ptr[0, 3 * Fiddle::SIZEOF_INT]
-        assert_raise(IndexError) { instance.stages[-1] = 5 }
-        assert_raise(IndexError) { instance.stages[3] = 5 }
-      end
-    end
-
-    def test_nested_struct_reusing_other_structs()
-      position_struct = Fiddle::Importer.struct(['float x', 'float y', 'float z'])
-      texcoord_struct = Fiddle::Importer.struct(['float u', 'float v'])
-      vertex_struct   = Fiddle::Importer.struct(position: position_struct, texcoord: texcoord_struct)
-      mesh_struct     = Fiddle::Importer.struct([
-                                                  {
-                                                    "vertices[2]" => vertex_struct,
-                                                    object: [
-                                                      "int id",
-                                                      "void *user_data",
-                                                    ],
-                                                  },
-                                                  "int id",
-                                                ])
-      assert_equal LIBC::StructNestedStruct.size, mesh_struct.size
-
-
-      keyboard_event_struct = Fiddle::Importer.struct(['unsigned int state', 'char key'])
-      mouse_event_struct    = Fiddle::Importer.struct(['unsigned int button', 'unsigned short x', 'unsigned short y'])
-      event_union           = Fiddle::Importer.union([{ keboard: keyboard_event_struct, mouse: mouse_event_struct}])
-      assert_equal LIBC::UnionNestedStruct.size, event_union.size
-    end
-
-    def test_nested_struct_alignment_is_not_its_size()
-      inner = Fiddle::Importer.struct(['int x', 'int y', 'int z', 'int w'])
-      outer = Fiddle::Importer.struct(['char a', { 'nested' => inner }, 'char b'])
-      outer.malloc(Fiddle::RUBY_FREE) do |instance|
-        offset = instance.to_ptr.instance_variable_get(:"@offset")
-        assert_equal Fiddle::SIZEOF_INT * 5, offset.last
-        assert_equal Fiddle::SIZEOF_INT * 6, outer.size
-        assert_equal instance.to_ptr.size, outer.size
-      end
-    end
-
-    def test_struct_nested_struct_members()
-      LIBC::StructNestedStruct.malloc(Fiddle::RUBY_FREE) do |s|
-        Fiddle::Pointer.malloc(24, Fiddle::RUBY_FREE) do |user_data|
-          s.vertices[0].position.x = 1
-          s.vertices[0].position.y = 2
-          s.vertices[0].position.z = 3
-          s.vertices[0].texcoord.u = 4
-          s.vertices[0].texcoord.v = 5
-          s.vertices[1].position.x = 6
-          s.vertices[1].position.y = 7
-          s.vertices[1].position.z = 8
-          s.vertices[1].texcoord.u = 9
-          s.vertices[1].texcoord.v = 10
-          s.object.id              = 100
-          s.object.user_data       = user_data
-          s.id                     = 101
-          assert_equal({
-                         "vertices" => [
-                           {
-                             "position" => {
-                               "x" => 1,
-                               "y" => 2,
-                               "z" => 3,
-                             },
-                             "texcoord" => {
-                               "u" => 4,
-                               "v" => 5,
-                             },
-                           },
-                           {
-                             "position" => {
-                               "x" => 6,
-                               "y" => 7,
-                               "z" => 8,
-                             },
-                             "texcoord" => {
-                               "u" => 9,
-                               "v" => 10,
-                             },
-                           },
-                         ],
-                         "object" => {
-                           "id" => 100,
-                           "user_data" => user_data,
-                         },
-                         "id" => 101,
-                       },
-                       s.to_h)
-        end
-      end
-    end
-
-    def test_union_nested_struct_members()
-      LIBC::UnionNestedStruct.malloc(Fiddle::RUBY_FREE) do |s|
-        s.keyboard.state = 100
-        s.keyboard.key   = 101
-        assert_equal(100, s.mouse.button)
-        refute_equal(  0, s.mouse.x)
-      end
-    end
-
-    def test_struct_nested_struct_replace_array_element()
-      LIBC::StructNestedStruct.malloc(Fiddle::RUBY_FREE) do |s|
-        s.vertices[0].position.x = 5
-
-        vertex_struct = Fiddle::Importer.struct [{
-          position: ["float x", "float y", "float z"],
-          texcoord: ["float u", "float v"]
-        }]
-        vertex_struct.malloc(Fiddle::RUBY_FREE) do |vertex|
-          vertex.position.x = 100
-          s.vertices[0] = vertex
-
-          # make sure element was copied by value, but things like memory address
-          # should not be changed
-          assert_equal(100,              s.vertices[0].position.x)
-          refute_equal(vertex.object_id, s.vertices[0].object_id)
-          refute_equal(vertex.to_ptr,    s.vertices[0].to_ptr)
-        end
-      end
-    end
-
-    def test_struct_nested_struct_replace_array_element_nil()
-      LIBC::StructNestedStruct.malloc(Fiddle::RUBY_FREE) do |s|
-        s.vertices[0].position.x = 5
-        s.vertices[0] = nil
-        assert_equal({
-                       "position" => {
-                         "x" => 0.0,
-                         "y" => 0.0,
-                         "z" => 0.0,
-                       },
-                       "texcoord" => {
-                         "u" => 0.0,
-                         "v" => 0.0,
-                       },
-                     },
-                     s.vertices[0].to_h)
-      end
-    end
-
-    def test_struct_nested_struct_replace_array_element_hash()
-      LIBC::StructNestedStruct.malloc(Fiddle::RUBY_FREE) do |s|
-        s.vertices[0] = {
-          position: {
-            x: 10,
-            y: 100,
-          }
-        }
-        assert_equal({
-                       "position" => {
-                         "x" => 10.0,
-                         "y" => 100.0,
-                         "z" => 0.0,
-                       },
-                       "texcoord" => {
-                         "u" => 0.0,
-                         "v" => 0.0,
-                       },
-                     },
-                     s.vertices[0].to_h)
-      end
-    end
-
-    def test_struct_nested_struct_replace_entire_array()
-      LIBC::StructNestedStruct.malloc(Fiddle::RUBY_FREE) do |s|
-        vertex_struct = Fiddle::Importer.struct [{
-          position: ["float x", "float y", "float z"],
-          texcoord: ["float u", "float v"]
-        }]
-
-        vertex_struct.malloc(Fiddle::RUBY_FREE) do |same0|
-          vertex_struct.malloc(Fiddle::RUBY_FREE) do |same1|
-            same = [same0, same1]
-            same[0].position.x = 1; same[1].position.x = 6
-            same[0].position.y = 2; same[1].position.y = 7
-            same[0].position.z = 3; same[1].position.z = 8
-            same[0].texcoord.u = 4; same[1].texcoord.u = 9
-            same[0].texcoord.v = 5; same[1].texcoord.v = 10
-            s.vertices = same
-            assert_equal([
-                           {
-                             "position" => {
-                               "x" => 1.0,
-                               "y" => 2.0,
-                               "z" => 3.0,
-                             },
-                             "texcoord" => {
-                               "u" => 4.0,
-                               "v" => 5.0,
-                             },
-                           },
-                           {
-                             "position" => {
-                               "x" => 6.0,
-                               "y" => 7.0,
-                               "z" => 8.0,
-                             },
-                             "texcoord" => {
-                               "u" => 9.0,
-                               "v" => 10.0,
-                             },
-                           }
-                         ],
-                         s.vertices.collect(&:to_h))
-          end
-        end
-      end
-    end
-
-    def test_struct_nested_struct_replace_entire_array_with_different_struct()
-      LIBC::StructNestedStruct.malloc(Fiddle::RUBY_FREE) do |s|
-        different_struct_same_size = Fiddle::Importer.struct [{
-          a: ['float i', 'float j', 'float k'],
-          b: ['float l', 'float m']
-        }]
-
-        different_struct_same_size.malloc(Fiddle::RUBY_FREE) do |different0|
-          different_struct_same_size.malloc(Fiddle::RUBY_FREE) do |different1|
-            different = [different0, different1]
-            different[0].a.i = 11; different[1].a.i = 16
-            different[0].a.j = 12; different[1].a.j = 17
-            different[0].a.k = 13; different[1].a.k = 18
-            different[0].b.l = 14; different[1].b.l = 19
-            different[0].b.m = 15; different[1].b.m = 20
-            s.vertices[0][0, s.vertices[0].class.size] = different[0].to_ptr
-            s.vertices[1][0, s.vertices[1].class.size] = different[1].to_ptr
-            assert_equal([
-                           {
-                             "position" => {
-                               "x" => 11.0,
-                               "y" => 12.0,
-                               "z" => 13.0,
-                             },
-                             "texcoord" => {
-                               "u" => 14.0,
-                               "v" => 15.0,
-                             },
-                           },
-                           {
-                             "position" => {
-                               "x" => 16.0,
-                               "y" => 17.0,
-                               "z" => 18.0,
-                             },
-                             "texcoord" => {
-                               "u" => 19.0,
-                               "v" => 20.0,
-                             },
-                           }
-                         ],
-                         s.vertices.collect(&:to_h))
-          end
-        end
-      end
-    end
-
-    def test_struct()
-      LIBC::MyStruct.malloc(Fiddle::RUBY_FREE) do |s|
-        s.num = [0,1,2,3,4]
-        s.c = ?a.ord
-        s.buff = "012345\377"
-        assert_equal([0,1,2,3,4], s.num)
-        assert_equal(?a.ord, s.c)
-        assert_equal([?0.ord,?1.ord,?2.ord,?3.ord,?4.ord,?5.ord,?\377.ord], s.buff)
-      end
-    end
-
-    def test_gettimeofday()
-      if( defined?(LIBC.gettimeofday) )
-        LIBC::Timeval.malloc(Fiddle::RUBY_FREE) do |timeval|
-          LIBC::Timezone.malloc(Fiddle::RUBY_FREE) do |timezone|
-            LIBC.gettimeofday(timeval, timezone)
-          end
-          cur = Time.now()
-          assert(cur.to_i - 2 <= timeval.tv_sec && timeval.tv_sec <= cur.to_i)
-        end
-      end
-    end
-
-    def test_strcpy()
-      buff = +"000"
-      str = LIBC.strcpy(buff, "123")
-      assert_equal("123", buff)
-      assert_equal("123", str.to_s)
-    end
-
-    def test_isdigit
-      r1 = LIBC.isdigit(?1.ord)
-      r2 = LIBC.isdigit(?2.ord)
-      rr = LIBC.isdigit(?r.ord)
-      assert_operator(r1, :>, 0)
-      assert_operator(r2, :>, 0)
-      assert_equal(0, rr)
-    end
-
-    def test_atof
-      r = LIBC.atof("12.34")
-      assert_includes(12.00..13.00, r)
-    end
-  end
-end if defined?(Fiddle)
diff --git a/test/fiddle/test_memory_view.rb b/test/fiddle/test_memory_view.rb
deleted file mode 100644
index 240cda37df64e4..00000000000000
--- a/test/fiddle/test_memory_view.rb
+++ /dev/null
@@ -1,143 +0,0 @@
-# frozen_string_literal: true
-begin
-  require_relative 'helper'
-rescue LoadError
-  return
-end
-
-begin
-  require '-test-/memory_view'
-rescue LoadError
-  return
-end
-
-module Fiddle
-  class TestMemoryView < TestCase
-    def setup
-      omit "MemoryView is unavailable" unless defined? Fiddle::MemoryView
-    end
-
-    def test_null_ptr
-      assert_raise(ArgumentError) do
-        MemoryView.new(Fiddle::NULL)
-      end
-    end
-
-    def test_memory_view_from_unsupported_obj
-      obj = Object.new
-      assert_raise(ArgumentError) do
-        MemoryView.new(obj)
-      end
-    end
-
-    def test_memory_view_from_pointer
-      str = Marshal.load(Marshal.dump("hello world"))
-      ptr = Pointer[str]
-      mview = MemoryView.new(ptr)
-      assert_same(ptr, mview.obj)
-      assert_equal(str.bytesize, mview.byte_size)
-      assert_equal(true, mview.readonly?)
-      assert_equal(nil, mview.format)
-      assert_equal(1, mview.item_size)
-      assert_equal(1, mview.ndim)
-      assert_equal(nil, mview.shape)
-      assert_equal(nil, mview.strides)
-      assert_equal(nil, mview.sub_offsets)
-
-      codes = str.codepoints
-      assert_equal(codes, (0...str.bytesize).map {|i| mview[i] })
-    end
-
-    def test_memory_view_multi_dimensional
-      omit "MemoryViewTestUtils is unavailable" unless defined? MemoryViewTestUtils
-
-      buf = [ 1, 2, 3, 4,
-              5, 6, 7, 8,
-              9, 10, 11, 12 ].pack("l!*")
-      shape = [3, 4]
-      md = MemoryViewTestUtils::MultiDimensionalView.new(buf, "l!", shape, nil)
-      mview = Fiddle::MemoryView.new(md)
-      assert_equal(buf.bytesize, mview.byte_size)
-      assert_equal("l!", mview.format)
-      assert_equal(Fiddle::SIZEOF_LONG, mview.item_size)
-      assert_equal(2, mview.ndim)
-      assert_equal(shape, mview.shape)
-      assert_equal([Fiddle::SIZEOF_LONG*4, Fiddle::SIZEOF_LONG], mview.strides)
-      assert_equal(nil, mview.sub_offsets)
-      assert_equal(1, mview[0, 0])
-      assert_equal(4, mview[0, 3])
-      assert_equal(6, mview[1, 1])
-      assert_equal(10, mview[2, 1])
-    end
-
-    def test_memory_view_multi_dimensional_with_strides
-      omit "MemoryViewTestUtils is unavailable" unless defined? MemoryViewTestUtils
-
-      buf = [ 1, 2,  3,  4,  5,  6,  7,  8,
-              9, 10, 11, 12, 13, 14, 15, 16 ].pack("l!*")
-      shape = [2, 8]
-      strides = [4*Fiddle::SIZEOF_LONG*2, Fiddle::SIZEOF_LONG*2]
-      md = MemoryViewTestUtils::MultiDimensionalView.new(buf, "l!", shape, strides)
-      mview = Fiddle::MemoryView.new(md)
-      assert_equal("l!", mview.format)
-      assert_equal(Fiddle::SIZEOF_LONG, mview.item_size)
-      assert_equal(buf.bytesize, mview.byte_size)
-      assert_equal(2, mview.ndim)
-      assert_equal(shape, mview.shape)
-      assert_equal(strides, mview.strides)
-      assert_equal(nil, mview.sub_offsets)
-      assert_equal(1, mview[0, 0])
-      assert_equal(5, mview[0, 2])
-      assert_equal(9, mview[1, 0])
-      assert_equal(15, mview[1, 3])
-    end
-
-    def test_memory_view_multi_dimensional_with_multiple_members
-      omit "MemoryViewTestUtils is unavailable" unless defined? MemoryViewTestUtils
-
-      buf = [ 1, 2,  3,  4,  5,  6,  7,  8,
-             -1, -2, -3, -4, -5, -6, -7, -8].pack("s*")
-      shape = [2, 4]
-      strides = [4*Fiddle::SIZEOF_SHORT*2, Fiddle::SIZEOF_SHORT*2]
-      md = MemoryViewTestUtils::MultiDimensionalView.new(buf, "ss", shape, strides)
-      mview = Fiddle::MemoryView.new(md)
-      assert_equal("ss", mview.format)
-      assert_equal(Fiddle::SIZEOF_SHORT*2, mview.item_size)
-      assert_equal(buf.bytesize, mview.byte_size)
-      assert_equal(2, mview.ndim)
-      assert_equal(shape, mview.shape)
-      assert_equal(strides, mview.strides)
-      assert_equal(nil, mview.sub_offsets)
-      assert_equal([1, 2], mview[0, 0])
-      assert_equal([5, 6], mview[0, 2])
-      assert_equal([-1, -2], mview[1, 0])
-      assert_equal([-7, -8], mview[1, 3])
-    end
-
-    def test_export
-      str = "hello world"
-      mview_str = MemoryView.export(Pointer[str]) do |mview|
-        mview.to_s
-      end
-      assert_equal(str, mview_str)
-    end
-
-    def test_release
-      ptr = Pointer["hello world"]
-      mview = MemoryView.new(ptr)
-      assert_same(ptr, mview.obj)
-      mview.release
-      assert_nil(mview.obj)
-    end
-
-    def test_to_s
-      # U+3042 HIRAGANA LETTER A
-      data = "\u{3042}"
-      ptr = Pointer[data]
-      mview = MemoryView.new(ptr)
-      string = mview.to_s
-      assert_equal([data.b, true],
-                   [string, string.frozen?])
-    end
-  end
-end
diff --git a/test/fiddle/test_pack.rb b/test/fiddle/test_pack.rb
deleted file mode 100644
index ade1dd5040c8bf..00000000000000
--- a/test/fiddle/test_pack.rb
+++ /dev/null
@@ -1,37 +0,0 @@
-begin
-  require_relative 'helper'
-  require 'fiddle/pack'
-rescue LoadError
-  return
-end
-
-module Fiddle
-  class TestPack < TestCase
-    def test_pack_map
-      if defined?(TYPE_LONG_LONG)
-        assert_equal [0xffff_ffff_ffff_ffff], [0xffff_ffff_ffff_ffff].pack(PackInfo::PACK_MAP[-TYPE_LONG_LONG]).unpack(PackInfo::PACK_MAP[-TYPE_LONG_LONG])
-      end
-
-      case Fiddle::SIZEOF_VOIDP
-      when 8
-        assert_equal [0xffff_ffff_ffff_ffff], [0xffff_ffff_ffff_ffff].pack(PackInfo::PACK_MAP[TYPE_VOIDP]).unpack(PackInfo::PACK_MAP[TYPE_VOIDP])
-      when 4
-        assert_equal [0xffff_ffff], [0xffff_ffff].pack(PackInfo::PACK_MAP[TYPE_VOIDP]).unpack(PackInfo::PACK_MAP[TYPE_VOIDP])
-      end
-
-      case Fiddle::SIZEOF_LONG
-      when 8
-        assert_equal [0xffff_ffff_ffff_ffff], [0xffff_ffff_ffff_ffff].pack(PackInfo::PACK_MAP[-TYPE_LONG]).unpack(PackInfo::PACK_MAP[-TYPE_LONG])
-      when 4
-        assert_equal [0xffff_ffff], [0xffff_ffff].pack(PackInfo::PACK_MAP[-TYPE_LONG]).unpack(PackInfo::PACK_MAP[-TYPE_LONG])
-      end
-
-      if Fiddle::SIZEOF_INT == 4
-        assert_equal [0xffff_ffff], [0xffff_ffff].pack(PackInfo::PACK_MAP[-TYPE_INT]).unpack(PackInfo::PACK_MAP[-TYPE_INT])
-      end
-
-      assert_equal [0xffff], [0xffff].pack(PackInfo::PACK_MAP[-TYPE_SHORT]).unpack(PackInfo::PACK_MAP[-TYPE_SHORT])
-      assert_equal [0xff], [0xff].pack(PackInfo::PACK_MAP[-TYPE_CHAR]).unpack(PackInfo::PACK_MAP[-TYPE_CHAR])
-    end
-  end
-end
diff --git a/test/fiddle/test_pinned.rb b/test/fiddle/test_pinned.rb
deleted file mode 100644
index f0d375b1cc5895..00000000000000
--- a/test/fiddle/test_pinned.rb
+++ /dev/null
@@ -1,28 +0,0 @@
-# frozen_string_literal: true
-begin
-  require_relative 'helper'
-rescue LoadError
-  return
-end
-
-module Fiddle
-  class TestPinned < Fiddle::TestCase
-    def test_pin_object
-      x = Object.new
-      pinner = Pinned.new x
-      assert_same x, pinner.ref
-    end
-
-    def test_clear
-      pinner = Pinned.new Object.new
-      refute pinner.cleared?
-      pinner.clear
-      assert pinner.cleared?
-      ex = assert_raise(Fiddle::ClearedReferenceError) do
-        pinner.ref
-      end
-      assert_match "called on", ex.message
-    end
-  end
-end
-
diff --git a/test/fiddle/test_pointer.rb b/test/fiddle/test_pointer.rb
deleted file mode 100644
index f2c1d285ad5b0e..00000000000000
--- a/test/fiddle/test_pointer.rb
+++ /dev/null
@@ -1,306 +0,0 @@
-# frozen_string_literal: true
-begin
-  require_relative 'helper'
-rescue LoadError
-end
-
-module Fiddle
-  class TestPointer < TestCase
-    def dlwrap arg
-      Fiddle.dlwrap arg
-    end
-
-    def test_can_read_write_memory
-      # Allocate some memory
-      address = Fiddle.malloc(Fiddle::SIZEOF_VOIDP)
-
-      bytes_to_write = Fiddle::SIZEOF_VOIDP.times.to_a.pack("C*")
-
-      # Write to the memory
-      Fiddle::Pointer.write(address, bytes_to_write)
-
-      # Read the bytes out again
-      bytes = Fiddle::Pointer.read(address, Fiddle::SIZEOF_VOIDP)
-      assert_equal bytes_to_write, bytes
-    ensure
-      Fiddle.free address
-    end
-
-    def test_cptr_to_int
-      null = Fiddle::NULL
-      assert_equal(null.to_i, null.to_int)
-    end
-
-    def test_malloc_free_func_int
-      free = Fiddle::Function.new(Fiddle::RUBY_FREE, [TYPE_VOIDP], TYPE_VOID)
-      assert_equal free.to_i, Fiddle::RUBY_FREE.to_i
-
-      ptr  = Pointer.malloc(10, free.to_i)
-      assert_equal 10, ptr.size
-      assert_equal free.to_i, ptr.free.to_i
-    end
-
-    def test_malloc_free_func
-      free = Fiddle::Function.new(Fiddle::RUBY_FREE, [TYPE_VOIDP], TYPE_VOID)
-
-      ptr  = Pointer.malloc(10, free)
-      assert_equal 10, ptr.size
-      assert_equal free.to_i, ptr.free.to_i
-    end
-
-    def test_malloc_block
-      escaped_ptr = nil
-      returned = Pointer.malloc(10, Fiddle::RUBY_FREE) do |ptr|
-        assert_equal 10, ptr.size
-        assert_equal Fiddle::RUBY_FREE, ptr.free.to_i
-        escaped_ptr = ptr
-        :returned
-      end
-      assert_equal :returned, returned
-      assert escaped_ptr.freed?
-    end
-
-    def test_malloc_block_no_free
-      assert_raise ArgumentError do
-        Pointer.malloc(10) { |ptr| }
-      end
-    end
-
-    def test_malloc_subclass
-      subclass = Class.new(Pointer)
-      subclass.malloc(10, Fiddle::RUBY_FREE) do |ptr|
-        assert ptr.is_a?(subclass)
-      end
-    end
-
-    def test_to_str
-      str = Marshal.load(Marshal.dump("hello world"))
-      ptr = Pointer[str]
-
-      assert_equal 3, ptr.to_str(3).length
-      assert_equal str, ptr.to_str
-
-      ptr[5] = 0
-      assert_equal "hello\0world", ptr.to_str
-    end
-
-    def test_to_s
-      str = Marshal.load(Marshal.dump("hello world"))
-      ptr = Pointer[str]
-
-      assert_equal 3, ptr.to_s(3).length
-      assert_equal str, ptr.to_s
-
-      ptr[5] = 0
-      assert_equal 'hello', ptr.to_s
-    end
-
-    def test_minus
-      str = "hello world"
-      ptr = Pointer[str]
-      assert_equal ptr.to_s, (ptr + 3 - 3).to_s
-    end
-
-    # TODO: what if the pointer size is 0?  raise an exception? do we care?
-    def test_plus
-      str = "hello world"
-      ptr = Pointer[str]
-      new_str = ptr + 3
-      assert_equal 'lo world', new_str.to_s
-    end
-
-    def test_inspect
-      ptr = Pointer.new(0)
-      inspect = ptr.inspect
-      assert_match(/size=#{ptr.size}/, inspect)
-      assert_match(/free=#{sprintf("%#x", ptr.free.to_i)}/, inspect)
-      assert_match(/ptr=#{sprintf("%#x", ptr.to_i)}/, inspect)
-    end
-
-    def test_to_ptr_string
-      str = "hello world"
-      ptr = Pointer[str]
-      assert_equal str.length, ptr.size
-      assert_equal 'hello', ptr[0,5]
-    end
-
-    def test_to_ptr_io
-      Pointer.malloc(10, Fiddle::RUBY_FREE) do |buf|
-        File.open(__FILE__, 'r') do |f|
-          ptr = Pointer.to_ptr f
-          fread = Function.new(@libc['fread'],
-                              [TYPE_VOIDP, TYPE_INT, TYPE_INT, TYPE_VOIDP],
-                              TYPE_INT)
-          fread.call(buf.to_i, Fiddle::SIZEOF_CHAR, buf.size - 1, ptr.to_i)
-        end
-
-        File.open(__FILE__, 'r') do |f|
-          assert_equal f.read(9), buf.to_s
-        end
-      end
-    end
-
-    def test_to_ptr_with_ptr
-      ptr = Pointer.new 0
-      ptr2 = Pointer.to_ptr Struct.new(:to_ptr).new(ptr)
-      assert_equal ptr, ptr2
-
-      assert_raise(Fiddle::DLError) do
-        Pointer.to_ptr Struct.new(:to_ptr).new(nil)
-      end
-    end
-
-    def test_to_ptr_with_num
-      ptr = Pointer.new 0
-      assert_equal ptr, Pointer[0]
-    end
-
-    def test_equals
-      ptr   = Pointer.new 0
-      ptr2  = Pointer.new 0
-      assert_equal ptr2, ptr
-    end
-
-    def test_not_equals
-      ptr = Pointer.new 0
-      refute_equal 10, ptr, '10 should not equal the pointer'
-    end
-
-    def test_cmp
-      ptr = Pointer.new 0
-      assert_nil(ptr <=> 10, '10 should not be comparable')
-    end
-
-    def test_ref_ptr
-      ary = [0,1,2,4,5]
-      addr = Pointer.new(dlwrap(ary))
-      assert_equal addr.to_i, addr.ref.ptr.to_i
-
-      assert_equal addr.to_i, (+ (- addr)).to_i
-    end
-
-    def test_to_value
-      ary = [0,1,2,4,5]
-      addr = Pointer.new(dlwrap(ary))
-      assert_equal ary, addr.to_value
-    end
-
-    def test_free
-      ptr = Pointer.malloc(4)
-      begin
-        assert_nil ptr.free
-      ensure
-        Fiddle.free ptr
-      end
-    end
-
-    def test_free=
-      free = Function.new(Fiddle::RUBY_FREE, [TYPE_VOIDP], TYPE_VOID)
-      ptr = Pointer.malloc(4)
-      ptr.free = free
-
-      assert_equal free.ptr, ptr.free.ptr
-    end
-
-    def test_free_with_func
-      ptr = Pointer.malloc(4, Fiddle::RUBY_FREE)
-      refute ptr.freed?
-      ptr.call_free
-      assert ptr.freed?
-      ptr.call_free                 # you can safely run it again
-      assert ptr.freed?
-      GC.start                      # you can safely run the GC routine
-      assert ptr.freed?
-    end
-
-    def test_free_with_no_func
-      ptr = Pointer.malloc(4)
-      refute ptr.freed?
-      ptr.call_free
-      refute ptr.freed?
-      ptr.call_free                 # you can safely run it again
-      refute ptr.freed?
-    end
-
-    def test_freed?
-      ptr = Pointer.malloc(4, Fiddle::RUBY_FREE)
-      refute ptr.freed?
-      ptr.call_free
-      assert ptr.freed?
-    end
-
-    def test_null?
-      ptr = Pointer.new(0)
-      assert ptr.null?
-    end
-
-    def test_size
-      Pointer.malloc(4, Fiddle::RUBY_FREE) do |ptr|
-        assert_equal 4, ptr.size
-      end
-    end
-
-    def test_size=
-      Pointer.malloc(4, Fiddle::RUBY_FREE) do |ptr|
-        ptr.size = 10
-        assert_equal 10, ptr.size
-      end
-    end
-
-    def test_aref_aset
-      check = Proc.new{|str,ptr|
-        assert_equal(str.size(), ptr.size())
-        assert_equal(str, ptr.to_s())
-        assert_equal(str[0,2], ptr.to_s(2))
-        assert_equal(str[0,2], ptr[0,2])
-        assert_equal(str[1,2], ptr[1,2])
-        assert_equal(str[1,0], ptr[1,0])
-        assert_equal(str[0].ord, ptr[0])
-        assert_equal(str[1].ord, ptr[1])
-      }
-      str = Marshal.load(Marshal.dump('abc'))
-      ptr = Pointer[str]
-      check.call(str, ptr)
-
-      str[0] = "c"
-      assert_equal 'c'.ord, ptr[0] = "c".ord
-      check.call(str, ptr)
-
-      str[0,2] = "aa"
-      assert_equal 'aa', ptr[0,2] = "aa"
-      check.call(str, ptr)
-
-      ptr2 = Pointer['cdeeee']
-      str[0,2] = "cd"
-      assert_equal ptr2, ptr[0,2] = ptr2
-      check.call(str, ptr)
-
-      ptr3 = Pointer['vvvv']
-      str[0,2] = "vv"
-      assert_equal ptr3.to_i, ptr[0,2] = ptr3.to_i
-      check.call(str, ptr)
-    end
-
-    def test_null_pointer
-      nullpo = Pointer.new(0)
-      assert_raise(DLError) {nullpo[0]}
-      assert_raise(DLError) {nullpo[0] = 1}
-    end
-
-    def test_no_memory_leak
-      # https://github.com/ruby/fiddle/actions/runs/3202406059/jobs/5231356410
-      omit if RUBY_VERSION >= '3.2'
-
-      if respond_to?(:assert_nothing_leaked_memory)
-        n_tries = 100_000
-        assert_nothing_leaked_memory(SIZEOF_VOIDP * (n_tries / 100)) do
-          n_tries.times do
-            Fiddle::Pointer.allocate
-          end
-        end
-      else
-        assert_no_memory_leak(%w[-W0 -rfiddle.so], '', '100_000.times {Fiddle::Pointer.allocate}', rss: true)
-      end
-    end
-  end
-end if defined?(Fiddle)
diff --git a/test/fileutils/test_fileutils.rb b/test/fileutils/test_fileutils.rb
index 481f913d0c4e04..1d7be692f52c04 100644
--- a/test/fileutils/test_fileutils.rb
+++ b/test/fileutils/test_fileutils.rb
@@ -93,12 +93,24 @@ def no_broken_symlink?
       @@no_broken_symlink
     end
 
+    def has_capsh?
+      !!system('capsh', '--print', out: File::NULL, err: File::NULL)
+    end
+
+    def has_root_file_capabilities?
+      !!system(
+        'capsh', '--has-p=CAP_DAC_OVERRIDE', '--has-p=CAP_CHOWN', '--has-p=CAP_FOWNER',
+        out: File::NULL, err: File::NULL
+      )
+    end
+
     def root_in_posix?
       if /cygwin/ =~ RUBY_PLATFORM
         # FIXME: privilege if groups include root user?
         return Process.groups.include?(0)
-      end
-      if Process.respond_to?('uid')
+      elsif has_capsh?
+        return has_root_file_capabilities?
+      elsif Process.respond_to?('uid')
         return Process.uid == 0
       else
         return false
@@ -1337,7 +1349,7 @@ def test_chmod_symbol_mode
     # regular file. It's slightly strange. Anyway it's no effect bit.
     # see /usr/src/sys/ufs/ufs/ufs_chmod()
     # NetBSD, OpenBSD, Solaris, and AIX also deny it.
-    if /freebsd|netbsd|openbsd|solaris|aix/ !~ RUBY_PLATFORM
+    if /freebsd|netbsd|openbsd|aix/ !~ RUBY_PLATFORM
       chmod "u+t,o+t", 'tmp/a'
       assert_filemode 07500, 'tmp/a'
       chmod "a-t,a-s", 'tmp/a'
diff --git a/test/io/console/test_io_console.rb b/test/io/console/test_io_console.rb
index fd0e57b8a59a7a..c3f9c91c7dedad 100644
--- a/test/io/console/test_io_console.rb
+++ b/test/io/console/test_io_console.rb
@@ -7,6 +7,11 @@
 end
 
 class TestIO_Console < Test::Unit::TestCase
+  HOST_OS = RbConfig::CONFIG['host_os']
+  private def host_os?(os)
+    HOST_OS =~ os
+  end
+
   begin
     PATHS = $LOADED_FEATURES.grep(%r"/io/console(?:\.#{RbConfig::CONFIG['DLEXT']}|\.rb|/\w+\.rb)\z") {$`}
   rescue Encoding::CompatibilityError
@@ -15,43 +20,40 @@ class TestIO_Console < Test::Unit::TestCase
     raise
   end
   PATHS.uniq!
+  INCLUDE_OPTS = "-I#{PATHS.join(File::PATH_SEPARATOR)}"
 
   # FreeBSD seems to hang on TTOU when running parallel tests
   # tested on FreeBSD 11.x.
   #
-  # Solaris gets stuck too, even in non-parallel mode.
-  # It occurs only in chkbuild.  It does not occur when running
-  # `make test-all` in SSH terminal.
-  #
   # I suspect that it occurs only when having no TTY.
   # (Parallel mode runs tests in child processes, so I guess
   # they has no TTY.)
   # But it does not occur in `make test-all > /dev/null`, so
   # there should be an additional factor, I guess.
   def set_winsize_setup
-    @old_ttou = trap(:TTOU, 'IGNORE') if RUBY_PLATFORM =~ /freebsd|solaris/i
+    @old_ttou = trap(:TTOU, 'IGNORE') if host_os?(/freebsd/)
   end
 
   def set_winsize_teardown
     trap(:TTOU, @old_ttou) if defined?(@old_ttou) and @old_ttou
   end
 
+  exceptions = %w[ENODEV ENOTTY EBADF ENXIO].map {|e|
+    Errno.const_get(e) if Errno.const_defined?(e)
+  }
+  exceptions.compact!
+  FailedPathExceptions = (exceptions unless exceptions.empty?)
+
   def test_failed_path
-    exceptions = %w[ENODEV ENOTTY EBADF ENXIO].map {|e|
-      Errno.const_get(e) if Errno.const_defined?(e)
-    }
-    exceptions.compact!
-    omit if exceptions.empty?
     File.open(IO::NULL) do |f|
-      e = assert_raise(*exceptions) do
+      e = assert_raise(*FailedPathExceptions) do
         f.echo?
       end
       assert_include(e.message, IO::NULL)
     end
-  end
+  end if FailedPathExceptions
 
   def test_bad_keyword
-    omit if RUBY_ENGINE == 'jruby'
     assert_raise_with_message(ArgumentError, /unknown keyword:.*bad/) do
       File.open(IO::NULL) do |f|
         f.raw(bad: 0)
@@ -370,6 +372,15 @@ def assert_ctrl(expect, cc, r, w)
     w.print cc
     w.flush
     result = EnvUtil.timeout(3) {r.gets}
+    if result
+      case cc.chr
+      when "\C-A".."\C-_"
+        cc = "^" + (cc.ord | 0x40).chr
+      when "\C-?"
+        cc = "^?"
+      end
+      result.sub!(cc, "")
+    end
     assert_equal(expect, result.chomp)
   end
 
@@ -381,7 +392,7 @@ def test_intr
     # TestIO_Console#test_intr [/usr/home/chkbuild/chkbuild/tmp/build/20220304T163001Z/ruby/test/io/console/test_io_console.rb:387]:
     # <"25"> expected but was
     # <"-e:12:in `p': \e[1mexecution expired (\e[1;4mTimeout::Error\e[m\e[1m)\e[m">.
-    omit if /freebsd/ =~ RUBY_PLATFORM
+    omit if host_os?(/freebsd/)
 
     run_pty("#{<<~"begin;"}\n#{<<~'end;'}") do |r, w, _|
       begin;
@@ -407,7 +418,7 @@ def test_intr
       if cc = ctrl["intr"]
         assert_ctrl("#{cc.ord}", cc, r, w)
         assert_ctrl("#{cc.ord}", cc, r, w)
-        assert_ctrl("Interrupt", cc, r, w) unless /linux|solaris/ =~ RUBY_PLATFORM
+        assert_ctrl("Interrupt", cc, r, w) unless host_os?(/linux/)
       end
       if cc = ctrl["dsusp"]
         assert_ctrl("#{cc.ord}", cc, r, w)
@@ -440,6 +451,13 @@ def test_console_kw
     def test_sync
       assert_equal(["true"], run_pty("p IO.console.sync"))
     end
+
+    def test_ttyname
+      return unless IO.method_defined?(:ttyname)
+      # [Bug #20682]
+      # `sleep 0.1` is added to stabilize flaky failures on macOS.
+      assert_equal(["true"], run_pty("p STDIN.ttyname == STDOUT.ttyname; sleep 0.1"))
+    end
   end
 
   private
@@ -457,7 +475,7 @@ def helper
   def run_pty(src, n = 1)
     pend("PTY.spawn cannot control terminal on JRuby") if RUBY_ENGINE == 'jruby'
 
-    args = ["-I#{TestIO_Console::PATHS.join(File::PATH_SEPARATOR)}", "-rio/console", "-e", src]
+    args = [TestIO_Console::INCLUDE_OPTS, "-rio/console", "-e", src]
     args.shift if args.first == "-I" # statically linked
     r, w, pid = PTY.spawn(EnvUtil.rubybin, *args)
   rescue RuntimeError
@@ -530,10 +548,15 @@ def test_sync
     def test_getch_timeout
       assert_nil(IO.console.getch(intr: true, time: 0.1, min: 0))
     end
+
+    def test_ttyname
+      return unless IO.method_defined?(:ttyname)
+      ttyname = IO.console.ttyname
+      assert_not_nil(ttyname)
+      File.open(ttyname) {|f| assert_predicate(f, :tty?)}
+    end
   end
-end
 
-defined?(IO.console) and TestIO_Console.class_eval do
   case
   when Process.respond_to?(:daemon)
     noctty = [EnvUtil.rubybin, "-e", "Process.daemon(true)"]
@@ -545,17 +568,18 @@ def test_getch_timeout
   if noctty
     require 'tempfile'
     NOCTTY = noctty
-    def test_noctty
+    def run_noctty(src)
       t = Tempfile.new("noctty_out")
       t.close
       t2 = Tempfile.new("noctty_run")
       t2.close
       cmd = [*NOCTTY[1..-1],
+        TestIO_Console::INCLUDE_OPTS,
         '-e', 'open(ARGV[0], "w") {|f|',
         '-e',   'STDOUT.reopen(f)',
         '-e',   'STDERR.reopen(f)',
         '-e',   'require "io/console"',
-        '-e',   'f.puts IO.console.inspect',
+        '-e',   "f.puts (#{src}).inspect",
         '-e',   'f.flush',
         '-e',   'File.unlink(ARGV[1])',
         '-e', '}',
@@ -566,11 +590,18 @@ def test_noctty
         sleep 0.1
       end
       t.open
-      assert_equal("nil", t.gets(nil).chomp)
+      t.gets.lines(chomp: true)
     ensure
       t.close! if t and !t.closed?
       t2.close!
     end
+
+    def test_noctty
+      assert_equal(["nil"], run_noctty("IO.console"))
+      if IO.method_defined?(:ttyname)
+        assert_equal(["nil"], run_noctty("STDIN.ttyname rescue $!"))
+      end
+    end
   end
 end
 
diff --git a/test/io/console/test_ractor.rb b/test/io/console/test_ractor.rb
new file mode 100644
index 00000000000000..dff0c67eab0df0
--- /dev/null
+++ b/test/io/console/test_ractor.rb
@@ -0,0 +1,42 @@
+# frozen_string_literal: true
+require 'test/unit'
+require 'rbconfig'
+
+class TestIOConsoleInRactor < Test::Unit::TestCase
+  def test_ractor
+    ext = "/io/console.#{RbConfig::CONFIG['DLEXT']}"
+    path = $".find {|path| path.end_with?(ext)}
+    assert_in_out_err(%W[-r#{path}], "#{<<~"begin;"}\n#{<<~'end;'}", ["true"], [])
+    begin;
+      class Ractor
+        alias value take
+      end unless Ractor.method_defined? :value # compat with Ruby 3.4 and olders
+
+      $VERBOSE = nil
+      r = Ractor.new do
+        $stdout.console_mode
+      rescue SystemCallError
+        true
+      rescue Ractor::UnsafeError
+        false
+      else
+        true                    # should not success
+      end
+      puts r.value
+    end;
+
+    assert_in_out_err(%W[-r#{path}], "#{<<~"begin;"}\n#{<<~'end;'}", ["true"], [])
+    begin;
+      class Ractor
+        alias value take
+      end unless Ractor.method_defined? :value # compat with Ruby 3.4 and olders
+
+      console = IO.console
+      $VERBOSE = nil
+      r = Ractor.new do
+        IO.console
+      end
+      puts console.class == r.value.class
+    end;
+  end
+end if defined? Ractor
diff --git a/test/io/wait/test_io_wait.rb b/test/io/wait/test_io_wait.rb
index 7997a4814f07c7..4f8a33bc88ff20 100644
--- a/test/io/wait/test_io_wait.rb
+++ b/test/io/wait/test_io_wait.rb
@@ -36,6 +36,7 @@ def test_nread_buffered
   end
 
   def test_ready?
+    omit 'unstable on MinGW' if /mingw/ =~ RUBY_PLATFORM
     assert_not_predicate @r, :ready?, "shouldn't ready, but ready"
     @w.syswrite "."
     sleep 0.1
@@ -77,7 +78,8 @@ def test_wait_eof
     ret = nil
     assert_nothing_raised(Timeout::Error) do
       q.push(true)
-      Timeout.timeout(0.1) { ret = @r.wait }
+      t = EnvUtil.apply_timeout_scale(0.1)
+      Timeout.timeout(t) { ret = @r.wait }
     end
     assert_equal @r, ret
   ensure
@@ -112,7 +114,8 @@ def test_wait_readable_eof
     ret = nil
     assert_nothing_raised(Timeout::Error) do
       q.push(true)
-      Timeout.timeout(0.1) { ret = @r.wait_readable }
+      t = EnvUtil.apply_timeout_scale(0.1)
+      Timeout.timeout(t) { ret = @r.wait_readable }
     end
     assert_equal @r, ret
   ensure
diff --git a/test/io/wait/test_ractor.rb b/test/io/wait/test_ractor.rb
index 800216e610f17f..c77a29bff3e168 100644
--- a/test/io/wait/test_ractor.rb
+++ b/test/io/wait/test_ractor.rb
@@ -7,11 +7,15 @@ def test_ractor
     ext = "/io/wait.#{RbConfig::CONFIG['DLEXT']}"
     path = $".find {|path| path.end_with?(ext)}
     assert_in_out_err(%W[-r#{path}], <<-"end;", ["true"], [])
+      class Ractor
+        alias value take
+      end unless Ractor.method_defined? :value # compat with Ruby 3.4 and olders
+
       $VERBOSE = nil
       r = Ractor.new do
         $stdout.equal?($stdout.wait_writable)
       end
-      puts r.take
+      puts r.value
     end;
   end
 end if defined? Ractor
diff --git a/test/irb/helper.rb b/test/irb/helper.rb
deleted file mode 100644
index 122eb607f1409a..00000000000000
--- a/test/irb/helper.rb
+++ /dev/null
@@ -1,202 +0,0 @@
-require "test/unit"
-require "pathname"
-
-begin
-  require_relative "../lib/helper"
-  require_relative "../lib/envutil"
-rescue LoadError # ruby/ruby defines helpers differently
-end
-
-begin
-  require "pty"
-rescue LoadError # some platforms don't support PTY
-end
-
-module IRB
-  class InputMethod; end
-end
-
-module TestIRB
-  class TestCase < Test::Unit::TestCase
-    class TestInputMethod < ::IRB::InputMethod
-      attr_reader :list, :line_no
-
-      def initialize(list = [])
-        @line_no = 0
-        @list = list
-      end
-
-      def gets
-        @list[@line_no]&.tap {@line_no += 1}
-      end
-
-      def eof?
-        @line_no >= @list.size
-      end
-
-      def encoding
-        Encoding.default_external
-      end
-
-      def reset
-        @line_no = 0
-      end
-    end
-
-    def ruby_core?
-      !Pathname(__dir__).join("../../", "irb.gemspec").exist?
-    end
-
-    def save_encodings
-      @default_encoding = [Encoding.default_external, Encoding.default_internal]
-      @stdio_encodings = [STDIN, STDOUT, STDERR].map {|io| [io.external_encoding, io.internal_encoding] }
-    end
-
-    def restore_encodings
-      EnvUtil.suppress_warning do
-        Encoding.default_external, Encoding.default_internal = *@default_encoding
-        [STDIN, STDOUT, STDERR].zip(@stdio_encodings) do |io, encs|
-          io.set_encoding(*encs)
-        end
-      end
-    end
-
-    def without_rdoc(&block)
-      ::Kernel.send(:alias_method, :irb_original_require, :require)
-
-      ::Kernel.define_method(:require) do |name|
-        raise LoadError, "cannot load such file -- rdoc (test)" if name.match?("rdoc") || name.match?(/^rdoc\/.*/)
-        ::Kernel.send(:irb_original_require, name)
-      end
-
-      yield
-    ensure
-      EnvUtil.suppress_warning {
-        ::Kernel.send(:alias_method, :require, :irb_original_require)
-        ::Kernel.undef_method :irb_original_require
-      }
-    end
-  end
-
-  class IntegrationTestCase < TestCase
-    LIB = File.expand_path("../../lib", __dir__)
-    TIMEOUT_SEC = 3
-
-    def setup
-      @envs = {}
-      @tmpfiles = []
-
-      unless defined?(PTY)
-        omit "Integration tests require PTY."
-      end
-
-      if ruby_core?
-        omit "This test works only under ruby/irb"
-      end
-    end
-
-    def teardown
-      @tmpfiles.each do |tmpfile|
-        File.unlink(tmpfile)
-      end
-    end
-
-    def run_ruby_file(&block)
-      cmd = [EnvUtil.rubybin, "-I", LIB, @ruby_file.to_path]
-      tmp_dir = Dir.mktmpdir
-
-      @commands = []
-      lines = []
-
-      yield
-
-      PTY.spawn(@envs.merge("TERM" => "dumb"), *cmd) do |read, write, pid|
-        Timeout.timeout(TIMEOUT_SEC) do
-          while line = safe_gets(read)
-            lines << line
-
-            # means the breakpoint is triggered
-            if line.match?(/binding\.irb/)
-              while command = @commands.shift
-                write.puts(command)
-              end
-            end
-          end
-        end
-      ensure
-        read.close
-        write.close
-        kill_safely(pid)
-      end
-
-      lines.join
-    rescue Timeout::Error
-      message = <<~MSG
-      Test timedout.
-
-      #{'=' * 30} OUTPUT #{'=' * 30}
-        #{lines.map { |l| "  #{l}" }.join}
-      #{'=' * 27} END OF OUTPUT #{'=' * 27}
-      MSG
-      assert_block(message) { false }
-    ensure
-      FileUtils.remove_entry tmp_dir
-    end
-
-    # read.gets could raise exceptions on some platforms
-    # https://github.com/ruby/ruby/blob/master/ext/pty/pty.c#L721-L728
-    def safe_gets(read)
-      read.gets
-    rescue Errno::EIO
-      nil
-    end
-
-    def kill_safely pid
-      return if wait_pid pid, TIMEOUT_SEC
-
-      Process.kill :TERM, pid
-      return if wait_pid pid, 0.2
-
-      Process.kill :KILL, pid
-      Process.waitpid(pid)
-    rescue Errno::EPERM, Errno::ESRCH
-    end
-
-    def wait_pid pid, sec
-      total_sec = 0.0
-      wait_sec = 0.001 # 1ms
-
-      while total_sec < sec
-        if Process.waitpid(pid, Process::WNOHANG) == pid
-          return true
-        end
-        sleep wait_sec
-        total_sec += wait_sec
-        wait_sec *= 2
-      end
-
-      false
-    rescue Errno::ECHILD
-      true
-    end
-
-    def type(command)
-      @commands << command
-    end
-
-    def write_ruby(program)
-      @ruby_file = Tempfile.create(%w{irb- .rb})
-      @tmpfiles << @ruby_file
-      @ruby_file.write(program)
-      @ruby_file.close
-    end
-
-    def write_rc(content)
-      @irbrc = Tempfile.new('irbrc')
-      @tmpfiles << @irbrc
-      @irbrc.write(content)
-      @irbrc.close
-      @envs['IRBRC'] = @irbrc.path
-    end
-  end
-end
diff --git a/test/irb/test_cmd.rb b/test/irb/test_cmd.rb
deleted file mode 100644
index e8c959ec39956f..00000000000000
--- a/test/irb/test_cmd.rb
+++ /dev/null
@@ -1,985 +0,0 @@
-# frozen_string_literal: false
-require "rubygems"
-require "irb"
-require "irb/extend-command"
-
-require_relative "helper"
-
-module TestIRB
-  class CommandTestCase < TestCase
-    def setup
-      @pwd = Dir.pwd
-      @tmpdir = File.join(Dir.tmpdir, "test_reline_config_#{$$}")
-      begin
-        Dir.mkdir(@tmpdir)
-      rescue Errno::EEXIST
-        FileUtils.rm_rf(@tmpdir)
-        Dir.mkdir(@tmpdir)
-      end
-      Dir.chdir(@tmpdir)
-      @home_backup = ENV["HOME"]
-      ENV["HOME"] = @tmpdir
-      @xdg_config_home_backup = ENV.delete("XDG_CONFIG_HOME")
-      save_encodings
-      IRB.instance_variable_get(:@CONF).clear
-      @is_win = (RbConfig::CONFIG['host_os'] =~ /mswin|msys|mingw|cygwin|bccwin|wince|emc/)
-    end
-
-    def teardown
-      ENV["XDG_CONFIG_HOME"] = @xdg_config_home_backup
-      ENV["HOME"] = @home_backup
-      Dir.chdir(@pwd)
-      FileUtils.rm_rf(@tmpdir)
-      restore_encodings
-    end
-
-    def execute_lines(*lines, conf: {}, main: self, irb_path: nil)
-      IRB.init_config(nil)
-      IRB.conf[:VERBOSE] = false
-      IRB.conf[:PROMPT_MODE] = :SIMPLE
-      IRB.conf.merge!(conf)
-      input = TestInputMethod.new(lines)
-      irb = IRB::Irb.new(IRB::WorkSpace.new(main), input)
-      irb.context.return_format = "=> %s\n"
-      irb.context.irb_path = irb_path if irb_path
-      IRB.conf[:MAIN_CONTEXT] = irb.context
-      capture_output do
-        irb.eval_input
-      end
-    end
-  end
-
-  class FrozenObjectTest < CommandTestCase
-    def test_calling_command_on_a_frozen_main
-      main = Object.new.freeze
-
-      out, err = execute_lines(
-        "irb_info",
-        main: main
-      )
-      assert_empty err
-      assert_match(/RUBY_PLATFORM/, out)
-    end
-  end
-
-  class InfoTest < CommandTestCase
-    def setup
-      super
-      @locals_backup = ENV.delete("LANG"), ENV.delete("LC_ALL")
-    end
-
-    def teardown
-      super
-      ENV["LANG"], ENV["LC_ALL"] = @locals_backup
-    end
-
-    def test_irb_info_multiline
-      FileUtils.touch("#{@tmpdir}/.inputrc")
-      FileUtils.touch("#{@tmpdir}/.irbrc")
-
-      out, err = execute_lines(
-        "irb_info",
-        conf: { USE_MULTILINE: true, USE_SINGLELINE: false }
-      )
-
-      expected = %r{
-        Ruby\sversion:\s.+\n
-        IRB\sversion:\sirb\s.+\n
-        InputMethod:\sAbstract\sInputMethod\n
-        \.irbrc\spath:\s.+\n
-        RUBY_PLATFORM:\s.+\n
-        East\sAsian\sAmbiguous\sWidth:\s\d\n
-        #{@is_win ? 'Code\spage:\s\d+\n' : ''}
-      }x
-
-      assert_empty err
-      assert_match expected, out
-    end
-
-    def test_irb_info_singleline
-      FileUtils.touch("#{@tmpdir}/.inputrc")
-      FileUtils.touch("#{@tmpdir}/.irbrc")
-
-      out, err = execute_lines(
-        "irb_info",
-        conf: { USE_MULTILINE: false, USE_SINGLELINE: true }
-      )
-
-      expected = %r{
-        Ruby\sversion:\s.+\n
-        IRB\sversion:\sirb\s.+\n
-        InputMethod:\sAbstract\sInputMethod\n
-        \.irbrc\spath:\s.+\n
-        RUBY_PLATFORM:\s.+\n
-        East\sAsian\sAmbiguous\sWidth:\s\d\n
-        #{@is_win ? 'Code\spage:\s\d+\n' : ''}
-      }x
-
-      assert_empty err
-      assert_match expected, out
-    end
-
-    def test_irb_info_multiline_without_rc_files
-      inputrc_backup = ENV["INPUTRC"]
-      ENV["INPUTRC"] = "unknown_inpurc"
-      ext_backup = IRB::IRBRC_EXT
-      IRB.__send__(:remove_const, :IRBRC_EXT)
-      IRB.const_set(:IRBRC_EXT, "unknown_ext")
-
-      out, err = execute_lines(
-        "irb_info",
-        conf: { USE_MULTILINE: true, USE_SINGLELINE: false }
-      )
-
-      expected = %r{
-        Ruby\sversion:\s.+\n
-        IRB\sversion:\sirb\s.+\n
-        InputMethod:\sAbstract\sInputMethod\n
-        RUBY_PLATFORM:\s.+\n
-        East\sAsian\sAmbiguous\sWidth:\s\d\n
-        #{@is_win ? 'Code\spage:\s\d+\n' : ''}
-      }x
-
-      assert_empty err
-      assert_match expected, out
-    ensure
-      ENV["INPUTRC"] = inputrc_backup
-      IRB.__send__(:remove_const, :IRBRC_EXT)
-      IRB.const_set(:IRBRC_EXT, ext_backup)
-    end
-
-    def test_irb_info_singleline_without_rc_files
-      inputrc_backup = ENV["INPUTRC"]
-      ENV["INPUTRC"] = "unknown_inpurc"
-      ext_backup = IRB::IRBRC_EXT
-      IRB.__send__(:remove_const, :IRBRC_EXT)
-      IRB.const_set(:IRBRC_EXT, "unknown_ext")
-
-      out, err = execute_lines(
-        "irb_info",
-        conf: { USE_MULTILINE: false, USE_SINGLELINE: true }
-      )
-
-      expected = %r{
-        Ruby\sversion:\s.+\n
-        IRB\sversion:\sirb\s.+\n
-        InputMethod:\sAbstract\sInputMethod\n
-        RUBY_PLATFORM:\s.+\n
-        East\sAsian\sAmbiguous\sWidth:\s\d\n
-        #{@is_win ? 'Code\spage:\s\d+\n' : ''}
-      }x
-
-      assert_empty err
-      assert_match expected, out
-    ensure
-      ENV["INPUTRC"] = inputrc_backup
-      IRB.__send__(:remove_const, :IRBRC_EXT)
-      IRB.const_set(:IRBRC_EXT, ext_backup)
-    end
-
-    def test_irb_info_lang
-      FileUtils.touch("#{@tmpdir}/.inputrc")
-      FileUtils.touch("#{@tmpdir}/.irbrc")
-      ENV["LANG"] = "ja_JP.UTF-8"
-      ENV["LC_ALL"] = "en_US.UTF-8"
-
-      out, err = execute_lines(
-        "irb_info",
-        conf: { USE_MULTILINE: true, USE_SINGLELINE: false }
-      )
-
-      expected = %r{
-        Ruby\sversion: .+\n
-        IRB\sversion:\sirb .+\n
-        InputMethod:\sAbstract\sInputMethod\n
-        \.irbrc\spath: .+\n
-        RUBY_PLATFORM: .+\n
-        LANG\senv:\sja_JP\.UTF-8\n
-        LC_ALL\senv:\sen_US\.UTF-8\n
-        East\sAsian\sAmbiguous\sWidth:\s\d\n
-      }x
-
-      assert_empty err
-      assert_match expected, out
-    end
-  end
-
-  class MeasureTest < CommandTestCase
-    def test_measure
-      conf = {
-        PROMPT: {
-          DEFAULT: {
-            PROMPT_I: '> ',
-            PROMPT_S: '> ',
-            PROMPT_C: '> '
-          }
-        },
-        PROMPT_MODE: :DEFAULT,
-        MEASURE: false
-      }
-
-      c = Class.new(Object)
-      out, err = execute_lines(
-        "3\n",
-        "measure\n",
-        "3\n",
-        "measure :off\n",
-        "3\n",
-        conf: conf,
-        main: c
-      )
-
-      assert_empty err
-      assert_match(/\A=> 3\nTIME is added\.\n=> nil\nprocessing time: .+\n=> 3\n=> nil\n=> 3\n/, out)
-      assert_empty(c.class_variables)
-    end
-
-    def test_measure_keeps_previous_value
-      conf = {
-        PROMPT: {
-          DEFAULT: {
-            PROMPT_I: '> ',
-            PROMPT_S: '> ',
-            PROMPT_C: '> '
-          }
-        },
-        PROMPT_MODE: :DEFAULT,
-        MEASURE: false
-      }
-
-      c = Class.new(Object)
-      out, err = execute_lines(
-        "measure\n",
-        "3\n",
-        "_\n",
-        conf: conf,
-        main: c
-      )
-
-      assert_empty err
-      assert_match(/\ATIME is added\.\n=> nil\nprocessing time: .+\n=> 3\nprocessing time: .+\n=> 3/, out)
-      assert_empty(c.class_variables)
-    end
-
-    def test_measure_enabled_by_rc
-      conf = {
-        PROMPT: {
-          DEFAULT: {
-            PROMPT_I: '> ',
-            PROMPT_S: '> ',
-            PROMPT_C: '> '
-          }
-        },
-        PROMPT_MODE: :DEFAULT,
-        MEASURE: true
-      }
-
-      out, err = execute_lines(
-        "3\n",
-        "measure :off\n",
-        "3\n",
-        conf: conf,
-      )
-
-      assert_empty err
-      assert_match(/\Aprocessing time: .+\n=> 3\n=> nil\n=> 3\n/, out)
-    end
-
-    def test_measure_enabled_by_rc_with_custom
-      measuring_proc = proc { |line, line_no, &block|
-        time = Time.now
-        result = block.()
-        puts 'custom processing time: %fs' % (Time.now - time) if IRB.conf[:MEASURE]
-        result
-      }
-      conf = {
-        PROMPT: {
-          DEFAULT: {
-            PROMPT_I: '> ',
-            PROMPT_S: '> ',
-            PROMPT_C: '> '
-          }
-        },
-        PROMPT_MODE: :DEFAULT,
-        MEASURE: true,
-        MEASURE_PROC: { CUSTOM: measuring_proc }
-      }
-
-      out, err = execute_lines(
-        "3\n",
-        "measure :off\n",
-        "3\n",
-        conf: conf,
-      )
-      assert_empty err
-      assert_match(/\Acustom processing time: .+\n=> 3\n=> nil\n=> 3\n/, out)
-    end
-
-    def test_measure_with_custom
-      measuring_proc = proc { |line, line_no, &block|
-        time = Time.now
-        result = block.()
-        puts 'custom processing time: %fs' % (Time.now - time) if IRB.conf[:MEASURE]
-        result
-      }
-      conf = {
-        PROMPT: {
-          DEFAULT: {
-            PROMPT_I: '> ',
-            PROMPT_S: '> ',
-            PROMPT_C: '> '
-          }
-        },
-        PROMPT_MODE: :DEFAULT,
-        MEASURE: false,
-        MEASURE_PROC: { CUSTOM: measuring_proc }
-      }
-      out, err = execute_lines(
-        "3\n",
-        "measure\n",
-        "3\n",
-        "measure :off\n",
-        "3\n",
-        conf: conf
-      )
-
-      assert_empty err
-      assert_match(/\A=> 3\nCUSTOM is added\.\n=> nil\ncustom processing time: .+\n=> 3\n=> nil\n=> 3\n/, out)
-    end
-
-    def test_measure_with_proc
-      conf = {
-        PROMPT: {
-          DEFAULT: {
-            PROMPT_I: '> ',
-            PROMPT_S: '> ',
-            PROMPT_C: '> '
-          }
-        },
-        PROMPT_MODE: :DEFAULT,
-        MEASURE: false,
-      }
-      c = Class.new(Object)
-      out, err = execute_lines(
-        "3\n",
-        "measure { |context, code, line_no, &block|\n",
-        "  result = block.()\n",
-        "  puts 'aaa' if IRB.conf[:MEASURE]\n",
-        "  result\n",
-        "}\n",
-        "3\n",
-        "measure { |context, code, line_no, &block|\n",
-        "  result = block.()\n",
-        "  puts 'bbb' if IRB.conf[:MEASURE]\n",
-        "  result\n",
-        "}\n",
-        "3\n",
-        "measure :off\n",
-        "3\n",
-        conf: conf,
-        main: c
-      )
-
-      assert_empty err
-      assert_match(/\A=> 3\nBLOCK is added\.\n=> nil\naaa\n=> 3\nBLOCK is added.\naaa\n=> nil\nbbb\n=> 3\n=> nil\n=> 3\n/, out)
-      assert_empty(c.class_variables)
-    end
-  end
-
-  class IrbSourceTest < CommandTestCase
-    def test_irb_source
-      File.write("#{@tmpdir}/a.rb", "a = 'hi'\n")
-      out, err = execute_lines(
-        "a = 'bug17564'\n",
-        "a\n",
-        "irb_source '#{@tmpdir}/a.rb'\n",
-        "a\n",
-      )
-      assert_empty err
-      assert_pattern_list([
-        /=> "bug17564"\n/,
-        /=> "bug17564"\n/,
-        /   => "hi"\n/,
-        /   => nil\n/,
-        /=> "hi"\n/,
-      ], out)
-    end
-
-    def test_irb_source_without_argument
-      out, err = execute_lines(
-        "irb_source\n",
-      )
-      assert_empty err
-      assert_match(/Please specify the file name./, out)
-    end
-  end
-
-  class IrbLoadTest < CommandTestCase
-    def test_irb_load
-      File.write("#{@tmpdir}/a.rb", "a = 'hi'\n")
-      out, err = execute_lines(
-        "a = 'bug17564'\n",
-        "a\n",
-        "irb_load '#{@tmpdir}/a.rb'\n",
-        "a\n",
-      )
-      assert_empty err
-      assert_pattern_list([
-          /=> "bug17564"\n/,
-          /=> "bug17564"\n/,
-          /   => "hi"\n/,
-          /   => nil\n/,
-          /=> "bug17564"\n/,
-        ], out)
-    end
-
-    def test_irb_load_without_argument
-      out, err = execute_lines(
-        "irb_load\n",
-      )
-
-      assert_empty err
-      assert_match(/Please specify the file name./, out)
-    end
-  end
-
-  class ShowSourceTest < CommandTestCase
-    def test_show_source
-      out, err = execute_lines(
-        "show_source IRB.conf\n",
-      )
-      assert_empty err
-      assert_match(%r[/irb\.rb], out)
-    end
-
-    def test_show_source_method
-      out, err = execute_lines(
-        "p show_source('IRB.conf')\n",
-      )
-      assert_empty err
-      assert_match(%r[/irb\.rb], out)
-    end
-
-    def test_show_source_string
-      out, err = execute_lines(
-        "show_source 'IRB.conf'\n",
-      )
-      assert_empty err
-      assert_match(%r[/irb\.rb], out)
-    end
-
-    def test_show_source_alias
-      out, err = execute_lines(
-        "$ 'IRB.conf'\n",
-        conf: { COMMAND_ALIASES: { :'$' => :show_source } }
-      )
-      assert_empty err
-      assert_match(%r[/irb\.rb], out)
-    end
-
-    def test_show_source_end_finder
-      eval(code = <<-EOS, binding, __FILE__, __LINE__ + 1)
-        def show_source_test_method
-          unless true
-          end
-        end unless defined?(show_source_test_method)
-      EOS
-
-      out, err = execute_lines(
-        "show_source '#{self.class.name}#show_source_test_method'\n",
-      )
-
-      assert_empty err
-      assert_include(out, code)
-    end
-
-    def test_show_source_private_instance
-      eval(code = <<-EOS, binding, __FILE__, __LINE__ + 1)
-        class PrivateInstanceTest
-          private def show_source_test_method
-            unless true
-            end
-          end unless private_method_defined?(:show_source_test_method)
-        end
-      EOS
-
-      out, err = execute_lines(
-        "show_source '#{self.class.name}::PrivateInstanceTest#show_source_test_method'\n",
-      )
-
-      assert_empty err
-      assert_include(out, code.lines[1..-2].join)
-    end
-
-
-    def test_show_source_private
-      eval(code = <<-EOS, binding, __FILE__, __LINE__ + 1)
-        class PrivateTest
-          private def show_source_test_method
-            unless true
-            end
-          end unless private_method_defined?(:show_source_test_method)
-        end
-
-        Instance = PrivateTest.new unless defined?(Instance)
-      EOS
-
-      out, err = execute_lines(
-        "show_source '#{self.class.name}::Instance.show_source_test_method'\n",
-      )
-
-      assert_empty err
-      assert_include(out, code.lines[1..-4].join)
-    end
-  end
-
-  class WorkspaceCommandTestCase < CommandTestCase
-    def setup
-      super
-      # create Foo under the test class's namespace so it doesn't pollute global namespace
-      self.class.class_eval <<~RUBY
-        class Foo; end
-      RUBY
-    end
-  end
-
-  class CwwsTest < WorkspaceCommandTestCase
-    def test_cwws_returns_the_current_workspace_object
-      out, err = execute_lines(
-        "cwws.class",
-      )
-
-      assert_empty err
-      assert_include(out, self.class.name)
-    end
-  end
-
-  class PushwsTest < WorkspaceCommandTestCase
-    def test_pushws_switches_to_new_workspace_and_pushes_the_current_one_to_the_stack
-      out, err = execute_lines(
-        "pushws #{self.class}::Foo.new\n",
-        "cwws.class",
-      )
-      assert_empty err
-      assert_include(out, "#{self.class}::Foo")
-    end
-
-    def test_pushws_extends_the_new_workspace_with_command_bundle
-      out, err = execute_lines(
-        "pushws Object.new\n",
-        "self.singleton_class.ancestors"
-      )
-      assert_empty err
-      assert_include(out, "IRB::ExtendCommandBundle")
-    end
-
-    def test_pushws_prints_help_message_when_no_arg_is_given
-      out, err = execute_lines(
-        "pushws\n",
-      )
-      assert_empty err
-      assert_match(/No other workspace/, out)
-    end
-  end
-
-  class WorkspacesTest < WorkspaceCommandTestCase
-    def test_workspaces_returns_the_array_of_non_main_workspaces
-      out, err = execute_lines(
-        "pushws #{self.class}::Foo.new\n",
-        "workspaces.map { |w| w.class.name }",
-      )
-
-      assert_empty err
-      # self.class::Foo would be the current workspace
-      # self.class would be the old workspace that's pushed to the stack
-      assert_include(out, "=> [\"#{self.class}\"]")
-    end
-
-    def test_workspaces_returns_empty_array_when_no_workspaces_were_added
-      out, err = execute_lines(
-        "workspaces.map(&:to_s)",
-      )
-
-      assert_empty err
-      assert_include(out, "=> []")
-    end
-  end
-
-  class PopwsTest < WorkspaceCommandTestCase
-    def test_popws_replaces_the_current_workspace_with_the_previous_one
-      out, err = execute_lines(
-        "pushws Foo.new\n",
-        "popws\n",
-        "cwws.class",
-      )
-      assert_empty err
-      assert_include(out, "=> #{self.class}")
-    end
-
-    def test_popws_prints_help_message_if_the_workspace_is_empty
-      out, err = execute_lines(
-        "popws\n",
-      )
-      assert_empty err
-      assert_match(/workspace stack empty/, out)
-    end
-  end
-
-  class ChwsTest < WorkspaceCommandTestCase
-    def test_chws_replaces_the_current_workspace
-      out, err = execute_lines(
-        "chws #{self.class}::Foo.new\n",
-        "cwws.class",
-      )
-      assert_empty err
-      assert_include(out, "=> #{self.class}::Foo")
-    end
-
-    def test_chws_does_nothing_when_receiving_no_argument
-      out, err = execute_lines(
-        "chws\n",
-        "cwws.class",
-      )
-      assert_empty err
-      assert_include(out, "=> #{self.class}")
-    end
-  end
-
-  class WhereamiTest < CommandTestCase
-    def test_whereami
-      out, err = execute_lines(
-        "whereami\n",
-      )
-      assert_empty err
-      assert_match(/^From: .+ @ line \d+ :\n/, out)
-    end
-
-    def test_whereami_alias
-      out, err = execute_lines(
-        "@\n",
-      )
-      assert_empty err
-      assert_match(/^From: .+ @ line \d+ :\n/, out)
-    end
-  end
-
-
-  class ShowCmdsTest < CommandTestCase
-    def setup
-      STDIN.singleton_class.define_method :tty? do
-        false
-      end
-    end
-
-    def teardown
-      STDIN.singleton_class.remove_method :tty?
-    end
-
-    def test_show_cmds
-      out, err = execute_lines(
-        "show_cmds\n"
-      )
-
-      assert_empty err
-      assert_match(/List all available commands and their description/, out)
-      assert_match(/Start the debugger of debug\.gem/, out)
-    end
-  end
-
-  class LsTest < CommandTestCase
-    def setup
-      STDIN.singleton_class.define_method :tty? do
-        false
-      end
-    end
-
-    def teardown
-      STDIN.singleton_class.remove_method :tty?
-    end
-
-    def test_ls
-      out, err = execute_lines(
-        "class P\n",
-        "  def m() end\n",
-        "  def m2() end\n",
-        "end\n",
-
-        "class C < P\n",
-        "  def m1() end\n",
-        "  def m2() end\n",
-        "end\n",
-
-        "module M\n",
-        "  def m1() end\n",
-        "  def m3() end\n",
-        "end\n",
-
-        "module M2\n",
-        "  include M\n",
-        "  def m4() end\n",
-        "end\n",
-
-        "obj = C.new\n",
-        "obj.instance_variable_set(:@a, 1)\n",
-        "obj.extend M2\n",
-        "def obj.m5() end\n",
-        "ls obj\n",
-      )
-
-      assert_empty err
-      assert_match(/^instance variables:\s+@a\n/m, out)
-      assert_match(/P#methods:\s+m\n/m, out)
-      assert_match(/C#methods:\s+m2\n/m, out)
-      assert_match(/M#methods:\s+m1\s+m3\n/m, out)
-      assert_match(/M2#methods:\s+m4\n/m, out)
-      assert_match(/C.methods:\s+m5\n/m, out)
-    end
-
-    def test_ls_class
-      out, err = execute_lines(
-        "module M1\n",
-        "  def m2; end\n",
-        "  def m3; end\n",
-        "end\n",
-
-        "class C1\n",
-        "  def m1; end\n",
-        "  def m2; end\n",
-        "end\n",
-
-        "class C2 < C1\n",
-        "  include M1\n",
-        "  def m3; end\n",
-        "  def m4; end\n",
-        "  def self.m3; end\n",
-        "  def self.m5; end\n",
-        "end\n",
-        "ls C2"
-      )
-
-      assert_empty err
-      assert_match(/C2.methods:\s+m3\s+m5\n/, out)
-      assert_match(/C2#methods:\s+m3\s+m4\n.*M1#methods:\s+m2\n.*C1#methods:\s+m1\n/, out)
-      assert_not_match(/Module#methods/, out)
-      assert_not_match(/Class#methods/, out)
-    end
-
-    def test_ls_module
-      out, err = execute_lines(
-        "module M1\n",
-        "  def m1; end\n",
-        "  def m2; end\n",
-        "end\n",
-
-        "module M2\n",
-        "  include M1\n",
-        "  def m1; end\n",
-        "  def m3; end\n",
-        "  def self.m4; end\n",
-        "end\n",
-        "ls M2"
-      )
-
-      assert_empty err
-      assert_match(/M2\.methods:\s+m4\n/, out)
-      assert_match(/M2#methods:\s+m1\s+m3\n.*M1#methods:\s+m2\n/, out)
-      assert_not_match(/Module#methods/, out)
-    end
-
-    def test_ls_instance
-      out, err = execute_lines(
-        "class Foo; def bar; end; end\n",
-        "ls Foo.new"
-      )
-
-      assert_empty err
-      assert_match(/Foo#methods:\s+bar/, out)
-      # don't duplicate
-      assert_not_match(/Foo#methods:\s+bar\n.*Foo#methods/, out)
-    end
-
-    def test_ls_grep
-      out, err = execute_lines("ls 42\n")
-      assert_empty err
-      assert_match(/times/, out)
-      assert_match(/polar/, out)
-
-      [
-        "ls 42, grep: /times/\n",
-        "ls 42 -g times\n",
-        "ls 42 -G times\n",
-      ].each do |line|
-        out, err = execute_lines(line)
-        assert_empty err
-        assert_match(/times/, out)
-        assert_not_match(/polar/, out)
-      end
-    end
-
-    def test_ls_grep_empty
-      out, err = execute_lines("ls\n")
-      assert_empty err
-      assert_match(/whereami/, out)
-      assert_match(/show_source/, out)
-
-      [
-        "ls grep: /whereami/\n",
-        "ls -g whereami\n",
-        "ls -G whereami\n",
-      ].each do |line|
-        out, err = execute_lines(line)
-        assert_empty err
-        assert_match(/whereami/, out)
-        assert_not_match(/show_source/, out)
-      end
-    end
-
-    def test_ls_with_no_singleton_class
-      out, err = execute_lines(
-        "ls 42",
-      )
-      assert_empty err
-      assert_match(/Comparable#methods:\s+/, out)
-      assert_match(/Numeric#methods:\s+/, out)
-      assert_match(/Integer#methods:\s+/, out)
-    end
-  end
-
-  class ShowDocTest < CommandTestCase
-    def test_help
-      out, err = execute_lines(
-        "help String#gsub\n",
-        "\n",
-      )
-
-      # the former is what we'd get without document content installed, like on CI
-      # the latter is what we may get locally
-      possible_rdoc_output = [/Nothing known about String#gsub/, /gsub\(pattern\)/]
-      assert_include err, "[Deprecation] The `help` command will be repurposed to display command help in the future.\n"
-      assert(possible_rdoc_output.any? { |output| output.match?(out) }, "Expect the `help` command to match one of the possible outputs. Got:\n#{out}")
-    ensure
-      # this is the only way to reset the redefined method without coupling the test with its implementation
-      EnvUtil.suppress_warning { load "irb/cmd/help.rb" }
-    end
-
-    def test_show_doc
-      out, err = execute_lines(
-        "show_doc String#gsub\n",
-        "\n",
-      )
-
-      # the former is what we'd get without document content installed, like on CI
-      # the latter is what we may get locally
-      possible_rdoc_output = [/Nothing known about String#gsub/, /gsub\(pattern\)/]
-      assert_not_include err, "[Deprecation]"
-      assert(possible_rdoc_output.any? { |output| output.match?(out) }, "Expect the `show_doc` command to match one of the possible outputs. Got:\n#{out}")
-    ensure
-      # this is the only way to reset the redefined method without coupling the test with its implementation
-      EnvUtil.suppress_warning { load "irb/cmd/help.rb" }
-    end
-
-    def test_show_doc_without_rdoc
-      out, err = without_rdoc do
-        execute_lines(
-          "show_doc String#gsub\n",
-          "\n",
-        )
-      end
-
-      # if it fails to require rdoc, it only returns the command object
-      assert_match(/=> nil\n/, out)
-      assert_include(err, "Can't display document because `rdoc` is not installed.\n")
-    ensure
-      # this is the only way to reset the redefined method without coupling the test with its implementation
-      EnvUtil.suppress_warning { load "irb/cmd/help.rb" }
-    end
-  end
-
-  class EditTest < CommandTestCase
-    def setup
-      @original_visual = ENV["VISUAL"]
-      @original_editor = ENV["EDITOR"]
-      # noop the command so nothing gets executed
-      ENV["VISUAL"] = ": code"
-      ENV["EDITOR"] = ": code2"
-    end
-
-    def teardown
-      ENV["VISUAL"] = @original_visual
-      ENV["EDITOR"] = @original_editor
-    end
-
-    def test_edit_without_arg
-      out, err = execute_lines(
-        "edit",
-        irb_path: __FILE__
-      )
-
-      assert_empty err
-      assert_match("path: #{__FILE__}", out)
-      assert_match("command: ': code'", out)
-    end
-
-    def test_edit_with_path
-      out, err = execute_lines(
-        "edit #{__FILE__}"
-      )
-
-      assert_empty err
-      assert_match("path: #{__FILE__}", out)
-      assert_match("command: ': code'", out)
-    end
-
-    def test_edit_with_non_existing_path
-      out, err = execute_lines(
-        "edit test_cmd_non_existing_path.rb"
-      )
-
-      assert_empty err
-      assert_match(/Can not find file: test_cmd_non_existing_path\.rb/, out)
-    end
-
-    def test_edit_with_constant
-      out, err = execute_lines(
-        "edit IRB::Irb"
-      )
-
-      assert_empty err
-      assert_match(/path: .*\/lib\/irb\.rb/, out)
-      assert_match("command: ': code'", out)
-    end
-
-    def test_edit_with_class_method
-      out, err = execute_lines(
-        "edit IRB.start"
-      )
-
-      assert_empty err
-      assert_match(/path: .*\/lib\/irb\.rb/, out)
-      assert_match("command: ': code'", out)
-    end
-
-    def test_edit_with_instance_method
-      out, err = execute_lines(
-        "edit IRB::Irb#run"
-      )
-
-      assert_empty err
-      assert_match(/path: .*\/lib\/irb\.rb/, out)
-      assert_match("command: ': code'", out)
-    end
-
-    def test_edit_with_editor_env_var
-      ENV.delete("VISUAL")
-
-      out, err = execute_lines(
-        "edit",
-        irb_path: __FILE__
-      )
-
-      assert_empty err
-      assert_match("path: #{__FILE__}", out)
-      assert_match("command: ': code2'", out)
-    end
-  end
-end
diff --git a/test/irb/test_color.rb b/test/irb/test_color.rb
deleted file mode 100644
index c9d2512dc51749..00000000000000
--- a/test/irb/test_color.rb
+++ /dev/null
@@ -1,275 +0,0 @@
-# frozen_string_literal: false
-require 'irb/color'
-require 'rubygems'
-require 'stringio'
-
-require_relative "helper"
-
-module TestIRB
-  class ColorTest < TestCase
-    CLEAR     = "\e[0m"
-    BOLD      = "\e[1m"
-    UNDERLINE = "\e[4m"
-    REVERSE   = "\e[7m"
-    RED       = "\e[31m"
-    GREEN     = "\e[32m"
-    YELLOW    = "\e[33m"
-    BLUE      = "\e[34m"
-    MAGENTA   = "\e[35m"
-    CYAN      = "\e[36m"
-
-    def setup
-      super
-      if IRB.respond_to?(:conf)
-        @colorize, IRB.conf[:USE_COLORIZE] = IRB.conf[:USE_COLORIZE], true
-      end
-    end
-
-    def teardown
-      if instance_variable_defined?(:@colorize)
-        IRB.conf[:USE_COLORIZE] = @colorize
-      end
-      super
-    end
-
-    def test_colorize
-      text = "text"
-      {
-        [:BOLD]      => "#{BOLD}#{text}#{CLEAR}",
-        [:UNDERLINE] => "#{UNDERLINE}#{text}#{CLEAR}",
-        [:REVERSE]   => "#{REVERSE}#{text}#{CLEAR}",
-        [:RED]       => "#{RED}#{text}#{CLEAR}",
-        [:GREEN]     => "#{GREEN}#{text}#{CLEAR}",
-        [:YELLOW]    => "#{YELLOW}#{text}#{CLEAR}",
-        [:BLUE]      => "#{BLUE}#{text}#{CLEAR}",
-        [:MAGENTA]   => "#{MAGENTA}#{text}#{CLEAR}",
-        [:CYAN]      => "#{CYAN}#{text}#{CLEAR}",
-      }.each do |seq, result|
-        assert_equal_with_term(result, text, seq: seq)
-
-        assert_equal_with_term(text, text, seq: seq, tty: false)
-        assert_equal_with_term(text, text, seq: seq, colorable: false)
-        assert_equal_with_term(result, text, seq: seq, tty: false, colorable: true)
-      end
-    end
-
-    def test_colorize_code
-      # Common behaviors. Warn parser error, but do not warn compile error.
-      tests = {
-        "1" => "#{BLUE}#{BOLD}1#{CLEAR}",
-        "2.3" => "#{MAGENTA}#{BOLD}2.3#{CLEAR}",
-        "7r" => "#{BLUE}#{BOLD}7r#{CLEAR}",
-        "8i" => "#{BLUE}#{BOLD}8i#{CLEAR}",
-        "['foo', :bar]" => "[#{RED}#{BOLD}'#{CLEAR}#{RED}foo#{CLEAR}#{RED}#{BOLD}'#{CLEAR}, #{YELLOW}:#{CLEAR}#{YELLOW}bar#{CLEAR}]",
-        "class A; end" => "#{GREEN}class#{CLEAR} #{BLUE}#{BOLD}#{UNDERLINE}A#{CLEAR}; #{GREEN}end#{CLEAR}",
-        "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}",
-        "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}",
-        "'a\nb'" => "#{RED}#{BOLD}'#{CLEAR}#{RED}a#{CLEAR}\n#{RED}b#{CLEAR}#{RED}#{BOLD}'#{CLEAR}",
-        "%[str]" => "#{RED}#{BOLD}%[#{CLEAR}#{RED}str#{CLEAR}#{RED}#{BOLD}]#{CLEAR}",
-        "%Q[str]" => "#{RED}#{BOLD}%Q[#{CLEAR}#{RED}str#{CLEAR}#{RED}#{BOLD}]#{CLEAR}",
-        "%q[str]" => "#{RED}#{BOLD}%q[#{CLEAR}#{RED}str#{CLEAR}#{RED}#{BOLD}]#{CLEAR}",
-        "%x[cmd]" => "#{RED}#{BOLD}%x[#{CLEAR}#{RED}cmd#{CLEAR}#{RED}#{BOLD}]#{CLEAR}",
-        "%r[reg]" => "#{RED}#{BOLD}%r[#{CLEAR}#{RED}reg#{CLEAR}#{RED}#{BOLD}]#{CLEAR}",
-        "%w[a b]" => "#{RED}#{BOLD}%w[#{CLEAR}#{RED}a#{CLEAR} #{RED}b#{CLEAR}#{RED}#{BOLD}]#{CLEAR}",
-        "%W[a b]" => "#{RED}#{BOLD}%W[#{CLEAR}#{RED}a#{CLEAR} #{RED}b#{CLEAR}#{RED}#{BOLD}]#{CLEAR}",
-        "%s[a b]" => "#{YELLOW}%s[#{CLEAR}#{YELLOW}a b#{CLEAR}#{YELLOW}]#{CLEAR}",
-        "%i[c d]" => "#{YELLOW}%i[#{CLEAR}#{YELLOW}c#{CLEAR}#{YELLOW} #{CLEAR}#{YELLOW}d#{CLEAR}#{YELLOW}]#{CLEAR}",
-        "%I[c d]" => "#{YELLOW}%I[#{CLEAR}#{YELLOW}c#{CLEAR}#{YELLOW} #{CLEAR}#{YELLOW}d#{CLEAR}#{YELLOW}]#{CLEAR}",
-        "{'a': 1}" => "{#{RED}#{BOLD}'#{CLEAR}#{RED}a#{CLEAR}#{RED}#{BOLD}':#{CLEAR} #{BLUE}#{BOLD}1#{CLEAR}}",
-        ":Struct" => "#{YELLOW}:#{CLEAR}#{YELLOW}Struct#{CLEAR}",
-        '"#{}"' => "#{RED}#{BOLD}\"#{CLEAR}#{RED}\#{#{CLEAR}#{RED}}#{CLEAR}#{RED}#{BOLD}\"#{CLEAR}",
-        ':"a#{}b"' => "#{YELLOW}:\"#{CLEAR}#{YELLOW}a#{CLEAR}#{YELLOW}\#{#{CLEAR}#{YELLOW}}#{CLEAR}#{YELLOW}b#{CLEAR}#{YELLOW}\"#{CLEAR}",
-        ':"a#{ def b; end; \'c\' + "#{ :d }" }e"' => "#{YELLOW}:\"#{CLEAR}#{YELLOW}a#{CLEAR}#{YELLOW}\#{#{CLEAR} #{GREEN}def#{CLEAR} #{BLUE}#{BOLD}b#{CLEAR}; #{GREEN}end#{CLEAR}; #{RED}#{BOLD}'#{CLEAR}#{RED}c#{CLEAR}#{RED}#{BOLD}'#{CLEAR} + #{RED}#{BOLD}\"#{CLEAR}#{RED}\#{#{CLEAR} #{YELLOW}:#{CLEAR}#{YELLOW}d#{CLEAR} #{RED}}#{CLEAR}#{RED}#{BOLD}\"#{CLEAR} #{YELLOW}}#{CLEAR}#{YELLOW}e#{CLEAR}#{YELLOW}\"#{CLEAR}",
-        "[__FILE__, __LINE__, __ENCODING__]" => "[#{CYAN}#{BOLD}__FILE__#{CLEAR}, #{CYAN}#{BOLD}__LINE__#{CLEAR}, #{CYAN}#{BOLD}__ENCODING__#{CLEAR}]",
-        ":self" => "#{YELLOW}:#{CLEAR}#{YELLOW}self#{CLEAR}",
-        ":class" => "#{YELLOW}:#{CLEAR}#{YELLOW}class#{CLEAR}",
-        "[:end, 2]" => "[#{YELLOW}:#{CLEAR}#{YELLOW}end#{CLEAR}, #{BLUE}#{BOLD}2#{CLEAR}]",
-        "[:>, 3]" => "[#{YELLOW}:#{CLEAR}#{YELLOW}>#{CLEAR}, #{BLUE}#{BOLD}3#{CLEAR}]",
-        "[:`, 4]" => "[#{YELLOW}:#{CLEAR}#{YELLOW}`#{CLEAR}, #{BLUE}#{BOLD}4#{CLEAR}]",
-        ":Hello ? world : nil" => "#{YELLOW}:#{CLEAR}#{YELLOW}Hello#{CLEAR} ? world : #{CYAN}#{BOLD}nil#{CLEAR}",
-        'raise "foo#{bar}baz"' => "raise #{RED}#{BOLD}\"#{CLEAR}#{RED}foo#{CLEAR}#{RED}\#{#{CLEAR}bar#{RED}}#{CLEAR}#{RED}baz#{CLEAR}#{RED}#{BOLD}\"#{CLEAR}",
-        '["#{obj.inspect}"]' => "[#{RED}#{BOLD}\"#{CLEAR}#{RED}\#{#{CLEAR}obj.inspect#{RED}}#{CLEAR}#{RED}#{BOLD}\"#{CLEAR}]",
-        'URI.parse "#{}"' => "#{BLUE}#{BOLD}#{UNDERLINE}URI#{CLEAR}.parse #{RED}#{BOLD}\"#{CLEAR}#{RED}\#{#{CLEAR}#{RED}}#{CLEAR}#{RED}#{BOLD}\"#{CLEAR}",
-        "begin\nrescue\nend" => "#{GREEN}begin#{CLEAR}\n#{GREEN}rescue#{CLEAR}\n#{GREEN}end#{CLEAR}",
-        "foo %w[bar]" => "foo #{RED}#{BOLD}%w[#{CLEAR}#{RED}bar#{CLEAR}#{RED}#{BOLD}]#{CLEAR}",
-        "foo %i[bar]" => "foo #{YELLOW}%i[#{CLEAR}#{YELLOW}bar#{CLEAR}#{YELLOW}]#{CLEAR}",
-        "foo :@bar, baz, :@@qux, :$quux" => "foo #{YELLOW}:#{CLEAR}#{YELLOW}@bar#{CLEAR}, baz, #{YELLOW}:#{CLEAR}#{YELLOW}@@qux#{CLEAR}, #{YELLOW}:#{CLEAR}#{YELLOW}$quux#{CLEAR}",
-        "`echo`" => "#{RED}#{BOLD}`#{CLEAR}#{RED}echo#{CLEAR}#{RED}#{BOLD}`#{CLEAR}",
-        "\t" => "\t", # not ^I
-        "foo(*%W(bar))" => "foo(*#{RED}#{BOLD}%W(#{CLEAR}#{RED}bar#{CLEAR}#{RED}#{BOLD})#{CLEAR})",
-        "$stdout" => "#{GREEN}#{BOLD}$stdout#{CLEAR}",
-        "__END__" => "#{GREEN}__END__#{CLEAR}",
-        "foo\n__END__\nbar" => "foo\n#{GREEN}__END__#{CLEAR}\nbar",
-        "foo\n<<A\0\0bar\nA\nbaz" => "foo\n#{RED}<<A#{CLEAR}^@^@bar\n#{RED}A#{CLEAR}\nbaz",
-        "<<A+1\nA" => "#{RED}<<A#{CLEAR}+#{BLUE}#{BOLD}1#{CLEAR}\n#{RED}A#{CLEAR}",
-      }
-
-      tests.merge!({
-        "4.5.6" => "#{MAGENTA}#{BOLD}4.5#{CLEAR}#{RED}#{REVERSE}.6#{CLEAR}",
-        "\e[0m\n" => "#{RED}#{REVERSE}^[#{CLEAR}[#{BLUE}#{BOLD}0#{CLEAR}#{RED}#{REVERSE}m#{CLEAR}\n",
-        "<<EOS\nhere\nEOS" => "#{RED}<<EOS#{CLEAR}\n#{RED}here#{CLEAR}\n#{RED}EOS#{CLEAR}",
-      })
-
-      # specific to Ruby 3.0+
-      if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('3.0.0')
-        tests.merge!({
-          "[1]]]\u0013" => "[#{BLUE}#{BOLD}1#{CLEAR}]#{RED}#{REVERSE}]#{CLEAR}#{RED}#{REVERSE}]#{CLEAR}#{RED}#{REVERSE}^S#{CLEAR}",
-        })
-        tests.merge!({
-          "def req(true) end" => "#{GREEN}def#{CLEAR} #{BLUE}#{BOLD}req#{CLEAR}(#{RED}#{REVERSE}true#{CLEAR}) #{RED}#{REVERSE}end#{CLEAR}",
-          "nil = 1" => "#{RED}#{REVERSE}nil#{CLEAR} = #{BLUE}#{BOLD}1#{CLEAR}",
-          "alias $x $1" => "#{GREEN}alias#{CLEAR} #{GREEN}#{BOLD}$x#{CLEAR} #{RED}#{REVERSE}$1#{CLEAR}",
-          "class bad; end" => "#{GREEN}class#{CLEAR} #{RED}#{REVERSE}bad#{CLEAR}; #{GREEN}end#{CLEAR}",
-          "def req(@a) end" => "#{GREEN}def#{CLEAR} #{BLUE}#{BOLD}req#{CLEAR}(#{RED}#{REVERSE}@a#{CLEAR}) #{GREEN}end#{CLEAR}",
-        })
-        if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('3.2.0')
-          tests.merge!({
-            "def req(true) end" => "#{GREEN}def#{CLEAR} #{BLUE}#{BOLD}req#{CLEAR}(#{RED}#{REVERSE}true#{CLEAR}#{RED}#{REVERSE})#{CLEAR} #{RED}#{REVERSE}end#{CLEAR}",
-          })
-        end
-      else
-        tests.merge!({
-          "[1]]]\u0013" => "[#{BLUE}#{BOLD}1#{CLEAR}]#{RED}#{REVERSE}]#{CLEAR}]^S",
-          "def req(true) end" => "#{GREEN}def#{CLEAR} #{BLUE}#{BOLD}req#{CLEAR}(#{RED}#{REVERSE}true#{CLEAR}) end",
-          "nil = 1" => "#{CYAN}#{BOLD}nil#{CLEAR} = #{BLUE}#{BOLD}1#{CLEAR}",
-          "alias $x $1" => "#{GREEN}alias#{CLEAR} #{GREEN}#{BOLD}$x#{CLEAR} $1",
-          "class bad; end" => "#{GREEN}class#{CLEAR} bad; #{GREEN}end#{CLEAR}",
-          "def req(@a) end" => "#{GREEN}def#{CLEAR} #{BLUE}#{BOLD}req#{CLEAR}(@a) #{GREEN}end#{CLEAR}",
-        })
-      end
-
-      tests.each do |code, result|
-        assert_equal_with_term(result, code, complete: true)
-        assert_equal_with_term(result, code, complete: false)
-
-        assert_equal_with_term(code, code, complete: true, tty: false)
-        assert_equal_with_term(code, code, complete: false, tty: false)
-
-        assert_equal_with_term(code, code, complete: true, colorable: false)
-
-        assert_equal_with_term(code, code, complete: false, colorable: false)
-
-        assert_equal_with_term(result, code, complete: true, tty: false, colorable: true)
-
-        assert_equal_with_term(result, code, complete: false, tty: false, colorable: true)
-      end
-    end
-
-    def test_colorize_code_with_local_variables
-      code = "a /(b +1)/i"
-      result_without_lvars = "a #{RED}#{BOLD}/#{CLEAR}#{RED}(b +1)#{CLEAR}#{RED}#{BOLD}/i#{CLEAR}"
-      result_with_lvar = "a /(b #{BLUE}#{BOLD}+1#{CLEAR})/i"
-      result_with_lvars = "a /(b +#{BLUE}#{BOLD}1#{CLEAR})/i"
-
-      assert_equal_with_term(result_without_lvars, code)
-      assert_equal_with_term(result_with_lvar, code, local_variables: ['a'])
-      assert_equal_with_term(result_with_lvars, code, local_variables: ['a', 'b'])
-    end
-
-    def test_colorize_code_complete_true
-      # `complete: true` behaviors. Warn end-of-file.
-      {
-        "'foo' + 'bar" => "#{RED}#{BOLD}'#{CLEAR}#{RED}foo#{CLEAR}#{RED}#{BOLD}'#{CLEAR} + #{RED}#{BOLD}'#{CLEAR}#{RED}#{REVERSE}bar#{CLEAR}",
-        "('foo" => "(#{RED}#{BOLD}'#{CLEAR}#{RED}#{REVERSE}foo#{CLEAR}",
-      }.each do |code, result|
-        assert_equal_with_term(result, code, complete: true)
-
-        assert_equal_with_term(code, code, complete: true, tty: false)
-
-        assert_equal_with_term(code, code, complete: true, colorable: false)
-
-        assert_equal_with_term(result, code, complete: true, tty: false, colorable: true)
-      end
-    end
-
-    def test_colorize_code_complete_false
-      # `complete: false` behaviors. Do not warn end-of-file.
-      {
-        "'foo' + 'bar" => "#{RED}#{BOLD}'#{CLEAR}#{RED}foo#{CLEAR}#{RED}#{BOLD}'#{CLEAR} + #{RED}#{BOLD}'#{CLEAR}#{RED}bar#{CLEAR}",
-        "('foo" => "(#{RED}#{BOLD}'#{CLEAR}#{RED}foo#{CLEAR}",
-      }.each do |code, result|
-        assert_equal_with_term(result, code, complete: false)
-
-        assert_equal_with_term(code, code, complete: false, tty: false)
-
-        assert_equal_with_term(code, code, complete: false, colorable: false)
-
-        assert_equal_with_term(result, code, complete: false, tty: false, colorable: true)
-      end
-    end
-
-    def test_inspect_colorable
-      {
-        1 => true,
-        2.3 => true,
-        ['foo', :bar] => true,
-        (a = []; a << a; a) => false,
-        (h = {}; h[h] = h; h) => false,
-        { a: 4 } => true,
-        /reg/ => true,
-        (1..3) => true,
-        Object.new => false,
-        Struct => true,
-        Test => true,
-        Struct.new(:a) => false,
-        Struct.new(:a).new(1) => false,
-      }.each do |object, result|
-        assert_equal(result, IRB::Color.inspect_colorable?(object), "Case: inspect_colorable?(#{object.inspect})")
-      end
-    end
-
-    private
-
-    def with_term(tty: true)
-      stdout = $stdout
-      io = StringIO.new
-      def io.tty?; true; end if tty
-      $stdout = io
-
-      env = ENV.to_h.dup
-      ENV['TERM'] = 'xterm-256color'
-
-      yield
-    ensure
-      $stdout = stdout
-      ENV.replace(env) if env
-    end
-
-    def assert_equal_with_term(result, code, seq: nil, tty: true, **opts)
-      actual = with_term(tty: tty) do
-        if seq
-          IRB::Color.colorize(code, seq, **opts)
-        else
-          IRB::Color.colorize_code(code, **opts)
-        end
-      end
-      message = -> {
-        args = [code.dump]
-        args << seq.inspect if seq
-        opts.each {|kwd, val| args << "#{kwd}: #{val}"}
-        "Case: colorize#{seq ? "" : "_code"}(#{args.join(', ')})\nResult: #{humanized_literal(actual)}"
-      }
-      assert_equal(result, actual, message)
-    end
-
-    def humanized_literal(str)
-      str
-        .gsub(CLEAR, '@@@{CLEAR}')
-        .gsub(BOLD, '@@@{BOLD}')
-        .gsub(UNDERLINE, '@@@{UNDERLINE}')
-        .gsub(REVERSE, '@@@{REVERSE}')
-        .gsub(RED, '@@@{RED}')
-        .gsub(GREEN, '@@@{GREEN}')
-        .gsub(YELLOW, '@@@{YELLOW}')
-        .gsub(BLUE, '@@@{BLUE}')
-        .gsub(MAGENTA, '@@@{MAGENTA}')
-        .gsub(CYAN, '@@@{CYAN}')
-        .dump.gsub(/@@@/, '#')
-    end
-  end
-end
diff --git a/test/irb/test_color_printer.rb b/test/irb/test_color_printer.rb
deleted file mode 100644
index f162b88548b431..00000000000000
--- a/test/irb/test_color_printer.rb
+++ /dev/null
@@ -1,70 +0,0 @@
-# frozen_string_literal: false
-require 'irb/color_printer'
-require 'rubygems'
-require 'stringio'
-
-require_relative "helper"
-
-module TestIRB
-  class ColorPrinterTest < TestCase
-    CLEAR     = "\e[0m"
-    BOLD      = "\e[1m"
-    RED       = "\e[31m"
-    GREEN     = "\e[32m"
-    BLUE      = "\e[34m"
-    CYAN      = "\e[36m"
-
-    def setup
-      super
-      if IRB.respond_to?(:conf)
-        @colorize, IRB.conf[:USE_COLORIZE] = IRB.conf[:USE_COLORIZE], true
-      end
-      @get_screen_size = Reline.method(:get_screen_size)
-      Reline.instance_eval { undef :get_screen_size }
-      def Reline.get_screen_size
-        [36, 80]
-      end
-    end
-
-    def teardown
-      Reline.instance_eval { undef :get_screen_size }
-      Reline.define_singleton_method(:get_screen_size, @get_screen_size)
-      if instance_variable_defined?(:@colorize)
-        IRB.conf[:USE_COLORIZE] = @colorize
-      end
-      super
-    end
-
-    IRBTestColorPrinter = Struct.new(:a)
-
-    def test_color_printer
-      {
-        1 => "#{BLUE}#{BOLD}1#{CLEAR}\n",
-        "a\nb" => %[#{RED}#{BOLD}"#{CLEAR}#{RED}a\\nb#{CLEAR}#{RED}#{BOLD}"#{CLEAR}\n],
-        IRBTestColorPrinter.new('test') => "#{GREEN}#<struct TestIRB::ColorPrinterTest::IRBTestColorPrinter#{CLEAR} a#{GREEN}=#{CLEAR}#{RED}#{BOLD}\"#{CLEAR}#{RED}test#{CLEAR}#{RED}#{BOLD}\"#{CLEAR}#{GREEN}>#{CLEAR}\n",
-        Ripper::Lexer.new('1').scan => "[#{GREEN}#<Ripper::Lexer::Elem:#{CLEAR} on_int@1:0 END token: #{RED}#{BOLD}\"#{CLEAR}#{RED}1#{CLEAR}#{RED}#{BOLD}\"#{CLEAR}#{GREEN}>#{CLEAR}]\n",
-        Class.new{define_method(:pretty_print){|q| q.text("[__FILE__, __LINE__, __ENCODING__]")}}.new => "[#{CYAN}#{BOLD}__FILE__#{CLEAR}, #{CYAN}#{BOLD}__LINE__#{CLEAR}, #{CYAN}#{BOLD}__ENCODING__#{CLEAR}]\n",
-      }.each do |object, result|
-        actual = with_term { IRB::ColorPrinter.pp(object, '') }
-        assert_equal(result, actual, "Case: IRB::ColorPrinter.pp(#{object.inspect}, '')")
-      end
-    end
-
-    private
-
-    def with_term
-      stdout = $stdout
-      io = StringIO.new
-      def io.tty?; true; end
-      $stdout = io
-
-      env = ENV.to_h.dup
-      ENV['TERM'] = 'xterm-256color'
-
-      yield
-    ensure
-      $stdout = stdout
-      ENV.replace(env) if env
-    end
-  end
-end
diff --git a/test/irb/test_completion.rb b/test/irb/test_completion.rb
deleted file mode 100644
index 2a659818e37f31..00000000000000
--- a/test/irb/test_completion.rb
+++ /dev/null
@@ -1,352 +0,0 @@
-# frozen_string_literal: false
-require "pathname"
-require "irb"
-
-require_relative "helper"
-
-module TestIRB
-  class CompletionTest < TestCase
-    def setup
-      # make sure require completion candidates are not cached
-      IRB::InputCompletor.class_variable_set(:@@files_from_load_path, nil)
-    end
-
-    class MethodCompletionTest < CompletionTest
-      def test_complete_string
-        assert_include(IRB::InputCompletor.retrieve_completion_data("'foo'.up", bind: binding), "'foo'.upcase")
-        # completing 'foo bar'.up
-        assert_include(IRB::InputCompletor.retrieve_completion_data("bar'.up", bind: binding), "bar'.upcase")
-        assert_equal("String.upcase", IRB::InputCompletor.retrieve_completion_data("'foo'.upcase", bind: binding, doc_namespace: true))
-      end
-
-      def test_complete_regexp
-        assert_include(IRB::InputCompletor.retrieve_completion_data("/foo/.ma", bind: binding), "/foo/.match")
-        # completing /foo bar/.ma
-        assert_include(IRB::InputCompletor.retrieve_completion_data("bar/.ma", bind: binding), "bar/.match")
-        assert_equal("Regexp.match", IRB::InputCompletor.retrieve_completion_data("/foo/.match", bind: binding, doc_namespace: true))
-      end
-
-      def test_complete_array
-        assert_include(IRB::InputCompletor.retrieve_completion_data("[].an", bind: binding), "[].any?")
-        assert_equal("Array.any?", IRB::InputCompletor.retrieve_completion_data("[].any?", bind: binding, doc_namespace: true))
-      end
-
-      def test_complete_hash_and_proc
-        # hash
-        assert_include(IRB::InputCompletor.retrieve_completion_data("{}.an", bind: binding), "{}.any?")
-        assert_equal(["Proc.any?", "Hash.any?"], IRB::InputCompletor.retrieve_completion_data("{}.any?", bind: binding, doc_namespace: true))
-
-        # proc
-        assert_include(IRB::InputCompletor.retrieve_completion_data("{}.bin", bind: binding), "{}.binding")
-        assert_equal(["Proc.binding", "Hash.binding"], IRB::InputCompletor.retrieve_completion_data("{}.binding", bind: binding, doc_namespace: true))
-      end
-
-      def test_complete_numeric
-        assert_include(IRB::InputCompletor.retrieve_completion_data("1.positi", bind: binding), "1.positive?")
-        assert_equal("Integer.positive?", IRB::InputCompletor.retrieve_completion_data("1.positive?", bind: binding, doc_namespace: true))
-
-        assert_include(IRB::InputCompletor.retrieve_completion_data("1r.positi", bind: binding), "1r.positive?")
-        assert_equal("Rational.positive?", IRB::InputCompletor.retrieve_completion_data("1r.positive?", bind: binding, doc_namespace: true))
-
-        assert_include(IRB::InputCompletor.retrieve_completion_data("0xFFFF.positi", bind: binding), "0xFFFF.positive?")
-        assert_equal("Integer.positive?", IRB::InputCompletor.retrieve_completion_data("0xFFFF.positive?", bind: binding, doc_namespace: true))
-
-        assert_empty(IRB::InputCompletor.retrieve_completion_data("1i.positi", bind: binding))
-      end
-
-      def test_complete_symbol
-        assert_include(IRB::InputCompletor.retrieve_completion_data(":foo.to_p", bind: binding), ":foo.to_proc")
-        assert_equal("Symbol.to_proc", IRB::InputCompletor.retrieve_completion_data(":foo.to_proc", bind: binding, doc_namespace: true))
-      end
-
-      def test_complete_class
-        assert_include(IRB::InputCompletor.retrieve_completion_data("String.ne", bind: binding), "String.new")
-        assert_equal("String.new", IRB::InputCompletor.retrieve_completion_data("String.new", bind: binding, doc_namespace: true))
-      end
-    end
-
-    class RequireComepletionTest < CompletionTest
-      def test_complete_require
-        candidates = IRB::InputCompletor::CompletionProc.("'irb", "require ", "")
-        %w['irb/init 'irb/ruby-lex].each do |word|
-          assert_include candidates, word
-        end
-        # Test cache
-        candidates = IRB::InputCompletor::CompletionProc.("'irb", "require ", "")
-        %w['irb/init 'irb/ruby-lex].each do |word|
-          assert_include candidates, word
-        end
-      end
-
-      def test_complete_require_with_pathname_in_load_path
-        temp_dir = Dir.mktmpdir
-        File.write(File.join(temp_dir, "foo.rb"), "test")
-        test_path = Pathname.new(temp_dir)
-        $LOAD_PATH << test_path
-
-        candidates = IRB::InputCompletor::CompletionProc.("'foo", "require ", "")
-        assert_include candidates, "'foo"
-      ensure
-        $LOAD_PATH.pop if test_path
-        FileUtils.remove_entry(temp_dir) if temp_dir
-      end
-
-      def test_complete_require_with_string_convertable_in_load_path
-        temp_dir = Dir.mktmpdir
-        File.write(File.join(temp_dir, "foo.rb"), "test")
-        object = Object.new
-        object.define_singleton_method(:to_s) { temp_dir }
-        $LOAD_PATH << object
-
-        candidates = IRB::InputCompletor::CompletionProc.("'foo", "require ", "")
-        assert_include candidates, "'foo"
-      ensure
-        $LOAD_PATH.pop if object
-        FileUtils.remove_entry(temp_dir) if temp_dir
-      end
-
-      def test_complete_require_with_malformed_object_in_load_path
-        object = Object.new
-        def object.to_s; raise; end
-        $LOAD_PATH << object
-
-        assert_nothing_raised do
-          IRB::InputCompletor::CompletionProc.("'foo", "require ", "")
-        end
-      ensure
-        $LOAD_PATH.pop if object
-      end
-
-      def test_complete_require_library_name_first
-        candidates = IRB::InputCompletor::CompletionProc.("'csv", "require ", "")
-        assert_equal "'csv", candidates.first
-      end
-
-      def test_complete_require_relative
-        candidates = Dir.chdir(__dir__ + "/../..") do
-          IRB::InputCompletor::CompletionProc.("'lib/irb", "require_relative ", "")
-        end
-        %w['lib/irb/init 'lib/irb/ruby-lex].each do |word|
-          assert_include candidates, word
-        end
-        # Test cache
-        candidates = Dir.chdir(__dir__ + "/../..") do
-          IRB::InputCompletor::CompletionProc.("'lib/irb", "require_relative ", "")
-        end
-        %w['lib/irb/init 'lib/irb/ruby-lex].each do |word|
-          assert_include candidates, word
-        end
-      end
-    end
-
-    class VariableCompletionTest < CompletionTest
-      def test_complete_variable
-        # Bug fix issues https://github.com/ruby/irb/issues/368
-        # Variables other than `str_example` and `@str_example` are defined to ensure that irb completion does not cause unintended behavior
-        str_example = ''
-        @str_example = ''
-        private_methods = ''
-        methods = ''
-        global_variables = ''
-        local_variables = ''
-        instance_variables = ''
-
-        # suppress "assigned but unused variable" warning
-        str_example.clear
-        @str_example.clear
-        private_methods.clear
-        methods.clear
-        global_variables.clear
-        local_variables.clear
-        instance_variables.clear
-
-        assert_include(IRB::InputCompletor.retrieve_completion_data("str_examp", bind: binding), "str_example")
-        assert_equal("String", IRB::InputCompletor.retrieve_completion_data("str_example", bind: binding, doc_namespace: true))
-        assert_equal("String.to_s", IRB::InputCompletor.retrieve_completion_data("str_example.to_s", bind: binding, doc_namespace: true))
-
-        assert_include(IRB::InputCompletor.retrieve_completion_data("@str_examp", bind: binding), "@str_example")
-        assert_equal("String", IRB::InputCompletor.retrieve_completion_data("@str_example", bind: binding, doc_namespace: true))
-        assert_equal("String.to_s", IRB::InputCompletor.retrieve_completion_data("@str_example.to_s", bind: binding, doc_namespace: true))
-      end
-
-      def test_complete_sort_variables
-        xzy, xzy_1, xzy2 = '', '', ''
-
-        xzy.clear
-        xzy_1.clear
-        xzy2.clear
-
-        candidates = IRB::InputCompletor.retrieve_completion_data("xz", bind: binding, doc_namespace: false)
-        assert_equal(%w[xzy xzy2 xzy_1], candidates)
-      end
-    end
-
-    class ConstantCompletionTest < CompletionTest
-      class Foo
-        B3 = 1
-        B1 = 1
-        B2 = 1
-      end
-
-      def test_complete_constants
-        assert_equal(["Foo"], IRB::InputCompletor.retrieve_completion_data("Fo", bind: binding))
-        assert_equal(["Foo::B1", "Foo::B2", "Foo::B3"], IRB::InputCompletor.retrieve_completion_data("Foo::B", bind: binding))
-        assert_equal(["Foo::B1.positive?"], IRB::InputCompletor.retrieve_completion_data("Foo::B1.pos", bind: binding))
-
-        assert_equal(["::Forwardable"], IRB::InputCompletor.retrieve_completion_data("::Fo", bind: binding))
-        assert_equal("Forwardable", IRB::InputCompletor.retrieve_completion_data("::Forwardable", bind: binding, doc_namespace: true))
-      end
-    end
-
-    class PerfectMatchingTest < CompletionTest
-      def setup
-        # trigger PerfectMatchedProc to set up RDocRIDriver constant
-        IRB::InputCompletor::PerfectMatchedProc.("foo", bind: binding)
-
-        @original_use_stdout = IRB::InputCompletor::RDocRIDriver.use_stdout
-        # force the driver to use stdout so it doesn't start a pager and interrupt tests
-        IRB::InputCompletor::RDocRIDriver.use_stdout = true
-      end
-
-      def teardown
-        IRB::InputCompletor::RDocRIDriver.use_stdout = @original_use_stdout
-      end
-
-      def test_perfectly_matched_namespace_triggers_document_display
-        omit unless has_rdoc_content?
-
-        out, err = capture_output do
-          IRB::InputCompletor::PerfectMatchedProc.("String", bind: binding)
-        end
-
-        assert_empty(err)
-
-        assert_include(out, " S\bSt\btr\bri\bin\bng\bg")
-      end
-
-      def test_perfectly_matched_multiple_namespaces_triggers_document_display
-        result = nil
-        out, err = capture_output do
-          result = IRB::InputCompletor::PerfectMatchedProc.("{}.nil?", bind: binding)
-        end
-
-        assert_empty(err)
-
-        # check if there're rdoc contents (e.g. CI doesn't generate them)
-        if has_rdoc_content?
-          # if there's rdoc content, we can verify by checking stdout
-          # rdoc generates control characters for formatting method names
-          assert_include(out, "P\bPr\bro\boc\bc.\b.n\bni\bil\bl?\b?") # Proc.nil?
-          assert_include(out, "H\bHa\bas\bsh\bh.\b.n\bni\bil\bl?\b?") # Hash.nil?
-        else
-          # this is a hacky way to verify the rdoc rendering code path because CI doesn't have rdoc content
-          # if there are multiple namespaces to be rendered, PerfectMatchedProc renders the result with a document
-          # which always returns the bytes rendered, even if it's 0
-          assert_equal(0, result)
-        end
-      end
-
-      def test_not_matched_namespace_triggers_nothing
-        result = nil
-        out, err = capture_output do
-          result = IRB::InputCompletor::PerfectMatchedProc.("Stri", bind: binding)
-        end
-
-        assert_empty(err)
-        assert_empty(out)
-        assert_nil(result)
-      end
-
-      def test_perfect_matching_stops_without_rdoc
-        result = nil
-
-        out, err = capture_output do
-          without_rdoc do
-            result = IRB::InputCompletor::PerfectMatchedProc.("String", bind: binding)
-          end
-        end
-
-        assert_empty(err)
-        assert_not_match(/from ruby core/, out)
-        assert_nil(result)
-      end
-
-      def test_perfect_matching_handles_nil_namespace
-        out, err = capture_output do
-          # symbol literal has `nil` doc namespace so it's a good test subject
-          assert_nil(IRB::InputCompletor::PerfectMatchedProc.(":aiueo", bind: binding))
-        end
-
-        assert_empty(err)
-        assert_empty(out)
-      end
-
-      private
-
-      def has_rdoc_content?
-        File.exist?(RDoc::RI::Paths::BASE)
-      end
-    end
-
-    def test_complete_symbol
-      symbols = %w"UTF-16LE UTF-7".map do |enc|
-        "K".force_encoding(enc).to_sym
-      rescue
-      end
-      symbols += [:aiueo, :"aiu eo"]
-      candidates = IRB::InputCompletor.retrieve_completion_data(":a", bind: binding)
-      assert_include(candidates, ":aiueo")
-      assert_not_include(candidates, ":aiu eo")
-      assert_empty(IRB::InputCompletor.retrieve_completion_data(":irb_unknown_symbol_abcdefg", bind: binding))
-      # Do not complete empty symbol for performance reason
-      assert_empty(IRB::InputCompletor.retrieve_completion_data(":", bind: binding))
-    end
-
-    def test_complete_invalid_three_colons
-      assert_empty(IRB::InputCompletor.retrieve_completion_data(":::A", bind: binding))
-      assert_empty(IRB::InputCompletor.retrieve_completion_data(":::", bind: binding))
-    end
-
-    def test_complete_absolute_constants_with_special_characters
-      assert_empty(IRB::InputCompletor.retrieve_completion_data("::A:", bind: binding))
-      assert_empty(IRB::InputCompletor.retrieve_completion_data("::A.", bind: binding))
-      assert_empty(IRB::InputCompletor.retrieve_completion_data("::A(", bind: binding))
-      assert_empty(IRB::InputCompletor.retrieve_completion_data("::A)", bind: binding))
-      assert_empty(IRB::InputCompletor.retrieve_completion_data("::A[", 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
-
-    def test_complete_methods
-      obj = Object.new
-      obj.singleton_class.class_eval {
-        def public_hoge; end
-        private def private_hoge; end
-
-        # Support for overriding #methods etc.
-        def methods; end
-        def private_methods; end
-        def global_variables; end
-        def local_variables; end
-        def instance_variables; end
-      }
-      bind = obj.instance_exec { binding }
-
-      assert_include(IRB::InputCompletor.retrieve_completion_data("public_hog", bind: bind), "public_hoge")
-      assert_include(IRB::InputCompletor.retrieve_completion_data("public_hoge", bind: bind, doc_namespace: true), "public_hoge")
-
-      assert_include(IRB::InputCompletor.retrieve_completion_data("private_hog", bind: bind), "private_hoge")
-      assert_include(IRB::InputCompletor.retrieve_completion_data("private_hoge", bind: bind, doc_namespace: true), "private_hoge")
-    end
-  end
-end
diff --git a/test/irb/test_context.rb b/test/irb/test_context.rb
deleted file mode 100644
index f59a23a99df9c4..00000000000000
--- a/test/irb/test_context.rb
+++ /dev/null
@@ -1,665 +0,0 @@
-# frozen_string_literal: false
-require 'tempfile'
-require 'irb'
-require 'rubygems' if defined?(Gem)
-
-require_relative "helper"
-
-module TestIRB
-  class ContextTest < TestCase
-    def setup
-      IRB.init_config(nil)
-      IRB.conf[:USE_SINGLELINE] = false
-      IRB.conf[:VERBOSE] = false
-      workspace = IRB::WorkSpace.new(Object.new)
-      @context = IRB::Context.new(nil, workspace, TestInputMethod.new)
-
-      @get_screen_size = Reline.method(:get_screen_size)
-      Reline.instance_eval { undef :get_screen_size }
-      def Reline.get_screen_size
-        [36, 80]
-      end
-      save_encodings
-    end
-
-    def teardown
-      Reline.instance_eval { undef :get_screen_size }
-      Reline.define_singleton_method(:get_screen_size, @get_screen_size)
-      restore_encodings
-    end
-
-    def test_last_value
-      assert_nil(@context.last_value)
-      assert_nil(@context.evaluate('_', 1))
-      obj = Object.new
-      @context.set_last_value(obj)
-      assert_same(obj, @context.last_value)
-      assert_same(obj, @context.evaluate('_', 1))
-    end
-
-    def test_evaluate_with_encoding_error_without_lineno
-      assert_raise_with_message(EncodingError, /invalid symbol/) {
-        @context.evaluate(%q[:"\xAE"], 1)
-        # The backtrace of this invalid encoding hash doesn't contain lineno.
-      }
-    end
-
-    def test_evaluate_still_emits_warning
-      assert_warning("(irb):1: warning: END in method; use at_exit\n") do
-        @context.evaluate(%q[def foo; END {}; end], 1)
-      end
-    end
-
-    def test_eval_input
-      verbose, $VERBOSE = $VERBOSE, nil
-      input = TestInputMethod.new([
-        "raise 'Foo'\n",
-        "_\n",
-        "0\n",
-        "_\n",
-      ])
-      irb = IRB::Irb.new(IRB::WorkSpace.new(Object.new), input)
-      out, err = capture_output do
-        irb.eval_input
-      end
-      assert_empty err
-      assert_pattern_list([:*, /\(irb\):1:in `<main>': Foo \(RuntimeError\)\n/,
-                           :*, /#<RuntimeError: Foo>\n/,
-                           :*, /0$/,
-                           :*, /0$/,
-                           /\s*/], out)
-    ensure
-      $VERBOSE = verbose
-    end
-
-    def test_eval_input_raise2x
-      input = TestInputMethod.new([
-        "raise 'Foo'\n",
-        "raise 'Bar'\n",
-        "_\n",
-      ])
-      irb = IRB::Irb.new(IRB::WorkSpace.new(Object.new), input)
-      out, err = capture_output do
-        irb.eval_input
-      end
-      assert_empty err
-      assert_pattern_list([
-          :*, /\(irb\):1:in `<main>': Foo \(RuntimeError\)\n/,
-          :*, /\(irb\):2:in `<main>': Bar \(RuntimeError\)\n/,
-          :*, /#<RuntimeError: Bar>\n/,
-        ], out)
-    end
-
-    def test_prompt_n_deprecation
-      irb = IRB::Irb.new(IRB::WorkSpace.new(Object.new))
-
-      _, err = capture_output do
-        irb.context.prompt_n = "foo"
-        irb.context.prompt_n
-      end
-
-      assert_include err, "IRB::Context#prompt_n is deprecated"
-      assert_include err, "IRB::Context#prompt_n= is deprecated"
-    end
-
-    def test_output_to_pipe
-      require 'stringio'
-      input = TestInputMethod.new(["n=1"])
-      input.instance_variable_set(:@stdout, StringIO.new)
-      irb = IRB::Irb.new(IRB::WorkSpace.new(Object.new), input)
-      irb.context.echo_on_assignment = :truncate
-      irb.context.prompt_mode = :DEFAULT
-      out, err = capture_output do
-        irb.eval_input
-      end
-      assert_empty err
-      assert_equal "=> 1\n", out
-    end
-
-    {
-      successful: [
-        [false, "class Foo < Struct.new(:bar); end; Foo.new(123)\n", /#<struct bar=123>/],
-        [:p, "class Foo < Struct.new(:bar); end; Foo.new(123)\n", /#<struct bar=123>/],
-        [true, "class Foo < Struct.new(:bar); end; Foo.new(123)\n", /#<struct #<Class:.*>::Foo bar=123>/],
-        [:yaml, "123", /--- 123\n/],
-        [:marshal, "123", Marshal.dump(123)],
-      ],
-      failed: [
-        [false, "BasicObject.new", /#<NoMethodError: undefined method `to_s' for/],
-        [:p, "class Foo; undef inspect ;end; Foo.new", /#<NoMethodError: undefined method `inspect' for/],
-        [:yaml, "BasicObject.new", /#<NoMethodError: undefined method `inspect' for/],
-        [:marshal, "[Object.new, Class.new]", /#<TypeError: can't dump anonymous class #<Class:/]
-      ]
-    }.each do |scenario, cases|
-      cases.each do |inspect_mode, input, expected|
-        define_method "test_#{inspect_mode}_inspect_mode_#{scenario}" do
-          verbose, $VERBOSE = $VERBOSE, nil
-          irb = IRB::Irb.new(IRB::WorkSpace.new(Object.new), TestInputMethod.new([input]))
-          irb.context.inspect_mode = inspect_mode
-          out, err = capture_output do
-            irb.eval_input
-          end
-          assert_empty err
-          assert_match(expected, out)
-        ensure
-          $VERBOSE = verbose
-        end
-      end
-    end
-
-    def test_object_inspection_handles_basic_object
-      verbose, $VERBOSE = $VERBOSE, nil
-      irb = IRB::Irb.new(IRB::WorkSpace.new(Object.new), TestInputMethod.new(["BasicObject.new"]))
-      out, err = capture_output do
-        irb.eval_input
-      end
-      assert_empty err
-      assert_not_match(/NoMethodError/, out)
-      assert_match(/#<BasicObject:.*>/, out)
-    ensure
-      $VERBOSE = verbose
-    end
-
-    def test_object_inspection_falls_back_to_kernel_inspect_when_errored
-      verbose, $VERBOSE = $VERBOSE, nil
-      main = Object.new
-      main.singleton_class.module_eval <<~RUBY
-        class Foo
-          def inspect
-            raise "foo"
-          end
-        end
-      RUBY
-
-      irb = IRB::Irb.new(IRB::WorkSpace.new(main), TestInputMethod.new(["Foo.new"]))
-      out, err = capture_output do
-        irb.eval_input
-      end
-      assert_empty err
-      assert_match(/An error occurred when inspecting the object: #<RuntimeError: foo>/, out)
-      assert_match(/Result of Kernel#inspect: #<#<Class:.*>::Foo:/, out)
-    ensure
-      $VERBOSE = verbose
-    end
-
-    def test_object_inspection_prints_useful_info_when_kernel_inspect_also_errored
-      verbose, $VERBOSE = $VERBOSE, nil
-      main = Object.new
-      main.singleton_class.module_eval <<~RUBY
-        class Foo
-          def initialize
-            # Kernel#inspect goes through instance variables with #inspect
-            # So this will cause Kernel#inspect to fail
-            @foo = BasicObject.new
-          end
-
-          def inspect
-            raise "foo"
-          end
-        end
-      RUBY
-
-      irb = IRB::Irb.new(IRB::WorkSpace.new(main), TestInputMethod.new(["Foo.new"]))
-      out, err = capture_output do
-        irb.eval_input
-      end
-      assert_empty err
-      assert_match(/An error occurred when inspecting the object: #<RuntimeError: foo>/, out)
-      assert_match(/An error occurred when running Kernel#inspect: #<NoMethodError: undefined method `inspect' for/, out)
-    ensure
-      $VERBOSE = verbose
-    end
-
-    def test_default_config
-      assert_equal(true, @context.use_autocomplete?)
-    end
-
-    def test_echo_on_assignment
-      input = TestInputMethod.new([
-        "a = 1\n",
-        "a\n",
-        "a, b = 2, 3\n",
-        "a\n",
-        "b\n",
-        "b = 4\n",
-        "_\n"
-      ])
-      irb = IRB::Irb.new(IRB::WorkSpace.new(Object.new), input)
-      irb.context.return_format = "=> %s\n"
-
-      # The default
-      irb.context.echo = true
-      irb.context.echo_on_assignment = false
-      out, err = capture_output do
-        irb.eval_input
-      end
-      assert_empty err
-      assert_equal("=> 1\n=> 2\n=> 3\n=> 4\n", out)
-
-      # Everything is output, like before echo_on_assignment was introduced
-      input.reset
-      irb.context.echo = true
-      irb.context.echo_on_assignment = true
-      out, err = capture_output do
-        irb.eval_input
-      end
-      assert_empty err
-      assert_equal("=> 1\n=> 1\n=> [2, 3]\n=> 2\n=> 3\n=> 4\n=> 4\n", out)
-
-      # Nothing is output when echo is false
-      input.reset
-      irb.context.echo = false
-      irb.context.echo_on_assignment = false
-      out, err = capture_output do
-        irb.eval_input
-      end
-      assert_empty err
-      assert_equal("", out)
-
-      # Nothing is output when echo is false even if echo_on_assignment is true
-      input.reset
-      irb.context.echo = false
-      irb.context.echo_on_assignment = true
-      out, err = capture_output do
-        irb.eval_input
-      end
-      assert_empty err
-      assert_equal("", out)
-    end
-
-    def test_omit_on_assignment
-      input = TestInputMethod.new([
-        "a = [1] * 100\n",
-        "a\n",
-      ])
-      value = [1] * 100
-      irb = IRB::Irb.new(IRB::WorkSpace.new(Object.new), input)
-      irb.context.return_format = "=> %s\n"
-
-      irb.context.echo = true
-      irb.context.echo_on_assignment = false
-      out, err = capture_output do
-        irb.eval_input
-      end
-      assert_empty err
-      assert_equal("=> \n#{value.pretty_inspect}", out)
-
-      input.reset
-      irb.context.echo = true
-      irb.context.echo_on_assignment = :truncate
-      out, err = capture_output do
-        irb.eval_input
-      end
-      assert_empty err
-      assert_equal("=> \n#{value.pretty_inspect[0..3]}...\n=> \n#{value.pretty_inspect}", out)
-
-      input.reset
-      irb.context.echo = true
-      irb.context.echo_on_assignment = true
-      out, err = capture_output do
-        irb.eval_input
-      end
-      assert_empty err
-      assert_equal("=> \n#{value.pretty_inspect}=> \n#{value.pretty_inspect}", out)
-
-      input.reset
-      irb.context.echo = false
-      irb.context.echo_on_assignment = false
-      out, err = capture_output do
-        irb.eval_input
-      end
-      assert_empty err
-      assert_equal("", out)
-
-      input.reset
-      irb.context.echo = false
-      irb.context.echo_on_assignment = :truncate
-      out, err = capture_output do
-        irb.eval_input
-      end
-      assert_empty err
-      assert_equal("", out)
-
-      input.reset
-      irb.context.echo = false
-      irb.context.echo_on_assignment = true
-      out, err = capture_output do
-        irb.eval_input
-      end
-      assert_empty err
-      assert_equal("", out)
-    end
-
-    def test_omit_multiline_on_assignment
-      without_colorize do
-        input = TestInputMethod.new([
-          "class A; def inspect; ([?* * 1000] * 3).join(%{\\n}); end; end; a = A.new\n",
-          "a\n"
-        ])
-        value = ([?* * 1000] * 3).join(%{\n})
-        value_first_line = (?* * 1000).to_s
-        irb = IRB::Irb.new(IRB::WorkSpace.new(Object.new), input)
-        irb.context.return_format = "=> %s\n"
-
-        irb.context.echo = true
-        irb.context.echo_on_assignment = false
-        out, err = capture_output do
-          irb.eval_input
-        end
-        assert_empty err
-        assert_equal("=> \n#{value}\n", out)
-        irb.context.evaluate('A.remove_method(:inspect)', 0)
-
-        input.reset
-        irb.context.echo = true
-        irb.context.echo_on_assignment = :truncate
-        out, err = capture_output do
-          irb.eval_input
-        end
-        assert_empty err
-        assert_equal("=> #{value_first_line[0..(input.winsize.last - 9)]}...\n=> \n#{value}\n", out)
-        irb.context.evaluate('A.remove_method(:inspect)', 0)
-
-        input.reset
-        irb.context.echo = true
-        irb.context.echo_on_assignment = true
-        out, err = capture_output do
-          irb.eval_input
-        end
-        assert_empty err
-        assert_equal("=> \n#{value}\n=> \n#{value}\n", out)
-        irb.context.evaluate('A.remove_method(:inspect)', 0)
-
-        input.reset
-        irb.context.echo = false
-        irb.context.echo_on_assignment = false
-        out, err = capture_output do
-          irb.eval_input
-        end
-        assert_empty err
-        assert_equal("", out)
-        irb.context.evaluate('A.remove_method(:inspect)', 0)
-
-        input.reset
-        irb.context.echo = false
-        irb.context.echo_on_assignment = :truncate
-        out, err = capture_output do
-          irb.eval_input
-        end
-        assert_empty err
-        assert_equal("", out)
-        irb.context.evaluate('A.remove_method(:inspect)', 0)
-
-        input.reset
-        irb.context.echo = false
-        irb.context.echo_on_assignment = true
-        out, err = capture_output do
-          irb.eval_input
-        end
-        assert_empty err
-        assert_equal("", out)
-        irb.context.evaluate('A.remove_method(:inspect)', 0)
-      end
-    end
-
-    def test_echo_on_assignment_conf
-      # Default
-      IRB.conf[:ECHO] = nil
-      IRB.conf[:ECHO_ON_ASSIGNMENT] = nil
-      without_colorize do
-        input = TestInputMethod.new()
-        irb = IRB::Irb.new(IRB::WorkSpace.new(Object.new), input)
-
-        assert(irb.context.echo?, "echo? should be true by default")
-        assert_equal(:truncate, irb.context.echo_on_assignment?, "echo_on_assignment? should be :truncate by default")
-
-        # Explicitly set :ECHO to false
-        IRB.conf[:ECHO] = false
-        irb = IRB::Irb.new(IRB::WorkSpace.new(Object.new), input)
-
-        refute(irb.context.echo?, "echo? should be false when IRB.conf[:ECHO] is set to false")
-        assert_equal(:truncate, irb.context.echo_on_assignment?, "echo_on_assignment? should be :truncate by default")
-
-        # Explicitly set :ECHO_ON_ASSIGNMENT to true
-        IRB.conf[:ECHO] = nil
-        IRB.conf[:ECHO_ON_ASSIGNMENT] = false
-        irb = IRB::Irb.new(IRB::WorkSpace.new(Object.new), input)
-
-        assert(irb.context.echo?, "echo? should be true by default")
-        refute(irb.context.echo_on_assignment?, "echo_on_assignment? should be false when IRB.conf[:ECHO_ON_ASSIGNMENT] is set to false")
-      end
-    end
-
-    def test_multiline_output_on_default_inspector
-      main = Object.new
-      def main.inspect
-        "abc\ndef"
-      end
-
-      without_colorize do
-        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_output 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_output do
-          irb.eval_input
-        end
-        assert_empty err
-        assert_equal("=> abc\ndef\n", out)
-      end
-    end
-
-    def test_default_return_format
-      IRB.conf[:PROMPT][:MY_PROMPT] = {
-        :PROMPT_I => "%03n> ",
-        :PROMPT_S => "%03n> ",
-        :PROMPT_C => "%03n> "
-        # without :RETURN
-        # :RETURN => "%s\n"
-      }
-      IRB.conf[:PROMPT_MODE] = :MY_PROMPT
-      input = TestInputMethod.new([
-        "3"
-      ])
-      irb = IRB::Irb.new(IRB::WorkSpace.new(Object.new), input)
-      out, err = capture_output do
-        irb.eval_input
-      end
-      assert_empty err
-      assert_equal("3\n",
-                   out)
-    end
-
-    def test_eval_input_with_exception
-      pend if RUBY_ENGINE == 'truffleruby'
-      verbose, $VERBOSE = $VERBOSE, nil
-      input = TestInputMethod.new([
-        "def hoge() fuga; end; def fuga() raise; end; hoge\n",
-      ])
-      irb = IRB::Irb.new(IRB::WorkSpace.new(Object.new), input)
-      out, err = capture_output do
-        irb.eval_input
-      end
-      assert_empty err
-      if RUBY_VERSION < '3.0.0' && STDOUT.tty?
-        expected = [
-          :*, /Traceback \(most recent call last\):\n/,
-          :*, /\t 2: from \(irb\):1:in `<main>'\n/,
-          :*, /\t 1: from \(irb\):1:in `hoge'\n/,
-          :*, /\(irb\):1:in `fuga': unhandled exception\n/,
-        ]
-      else
-        expected = [
-          :*, /\(irb\):1:in `fuga': unhandled exception\n/,
-          :*, /\tfrom \(irb\):1:in `hoge'\n/,
-          :*, /\tfrom \(irb\):1:in `<main>'\n/,
-          :*
-        ]
-      end
-      assert_pattern_list(expected, out)
-    ensure
-      $VERBOSE = verbose
-    end
-
-    def test_eval_input_with_invalid_byte_sequence_exception
-      verbose, $VERBOSE = $VERBOSE, nil
-      input = TestInputMethod.new([
-        %Q{def hoge() fuga; end; def fuga() raise "A\\xF3B"; end; hoge\n},
-      ])
-      irb = IRB::Irb.new(IRB::WorkSpace.new(Object.new), input)
-      out, err = capture_output do
-        irb.eval_input
-      end
-      assert_empty err
-      if RUBY_VERSION < '3.0.0' && STDOUT.tty?
-        expected = [
-          :*, /Traceback \(most recent call last\):\n/,
-          :*, /\t 2: from \(irb\):1:in `<main>'\n/,
-          :*, /\t 1: from \(irb\):1:in `hoge'\n/,
-          :*, /\(irb\):1:in `fuga': A\\xF3B \(RuntimeError\)\n/,
-        ]
-      else
-        expected = [
-          :*, /\(irb\):1:in `fuga': A\\xF3B \(RuntimeError\)\n/,
-          :*, /\tfrom \(irb\):1:in `hoge'\n/,
-          :*, /\tfrom \(irb\):1:in `<main>'\n/,
-          :*
-        ]
-      end
-      assert_pattern_list(expected, out)
-    ensure
-      $VERBOSE = verbose
-    end
-
-    def test_eval_input_with_long_exception
-      pend if RUBY_ENGINE == 'truffleruby'
-      verbose, $VERBOSE = $VERBOSE, nil
-      nesting = 20
-      generated_code = ''
-      nesting.times do |i|
-        generated_code << "def a#{i}() a#{i + 1}; end; "
-      end
-      generated_code << "def a#{nesting}() raise; end; a0\n"
-      input = TestInputMethod.new([
-        generated_code
-      ])
-      irb = IRB::Irb.new(IRB::WorkSpace.new(Object.new), input)
-      out, err = capture_output do
-        irb.eval_input
-      end
-      assert_empty err
-      if RUBY_VERSION < '3.0.0' && STDOUT.tty?
-        expected = [
-          :*, /Traceback \(most recent call last\):\n/,
-          :*, /\t... \d+ levels...\n/,
-          :*, /\t16: from \(irb\):1:in `a4'\n/,
-          :*, /\t15: from \(irb\):1:in `a5'\n/,
-          :*, /\t14: from \(irb\):1:in `a6'\n/,
-          :*, /\t13: from \(irb\):1:in `a7'\n/,
-          :*, /\t12: from \(irb\):1:in `a8'\n/,
-          :*, /\t11: from \(irb\):1:in `a9'\n/,
-          :*, /\t10: from \(irb\):1:in `a10'\n/,
-          :*, /\t 9: from \(irb\):1:in `a11'\n/,
-          :*, /\t 8: from \(irb\):1:in `a12'\n/,
-          :*, /\t 7: from \(irb\):1:in `a13'\n/,
-          :*, /\t 6: from \(irb\):1:in `a14'\n/,
-          :*, /\t 5: from \(irb\):1:in `a15'\n/,
-          :*, /\t 4: from \(irb\):1:in `a16'\n/,
-          :*, /\t 3: from \(irb\):1:in `a17'\n/,
-          :*, /\t 2: from \(irb\):1:in `a18'\n/,
-          :*, /\t 1: from \(irb\):1:in `a19'\n/,
-          :*, /\(irb\):1:in `a20': unhandled exception\n/,
-        ]
-      else
-        expected = [
-          :*, /\(irb\):1:in `a20': unhandled exception\n/,
-          :*, /\tfrom \(irb\):1:in `a19'\n/,
-          :*, /\tfrom \(irb\):1:in `a18'\n/,
-          :*, /\tfrom \(irb\):1:in `a17'\n/,
-          :*, /\tfrom \(irb\):1:in `a16'\n/,
-          :*, /\tfrom \(irb\):1:in `a15'\n/,
-          :*, /\tfrom \(irb\):1:in `a14'\n/,
-          :*, /\tfrom \(irb\):1:in `a13'\n/,
-          :*, /\tfrom \(irb\):1:in `a12'\n/,
-          :*, /\tfrom \(irb\):1:in `a11'\n/,
-          :*, /\tfrom \(irb\):1:in `a10'\n/,
-          :*, /\tfrom \(irb\):1:in `a9'\n/,
-          :*, /\tfrom \(irb\):1:in `a8'\n/,
-          :*, /\tfrom \(irb\):1:in `a7'\n/,
-          :*, /\tfrom \(irb\):1:in `a6'\n/,
-          :*, /\tfrom \(irb\):1:in `a5'\n/,
-          :*, /\tfrom \(irb\):1:in `a4'\n/,
-          :*, /\t... \d+ levels...\n/,
-        ]
-      end
-      assert_pattern_list(expected, out)
-    ensure
-      $VERBOSE = verbose
-    end
-
-    def test_prompt_main_escape
-      main = Struct.new(:to_s).new("main\a\t\r\n")
-      irb = IRB::Irb.new(IRB::WorkSpace.new(main), TestInputMethod.new)
-      assert_equal("irb(main    )>", irb.prompt('irb(%m)>', nil, 1, 1))
-    end
-
-    def test_prompt_main_inspect_escape
-      main = Struct.new(:inspect).new("main\\n\nmain")
-      irb = IRB::Irb.new(IRB::WorkSpace.new(main), TestInputMethod.new)
-      assert_equal("irb(main\\n main)>", irb.prompt('irb(%M)>', nil, 1, 1))
-    end
-
-    def test_prompt_main_truncate
-      main = Struct.new(:to_s).new("a" * 100)
-      def main.inspect; to_s.inspect; end
-      irb = IRB::Irb.new(IRB::WorkSpace.new(main), TestInputMethod.new)
-      assert_equal('irb(aaaaaaaaaaaaaaaaaaaaaaaaaaaaa...)>', irb.prompt('irb(%m)>', nil, 1, 1))
-      assert_equal('irb("aaaaaaaaaaaaaaaaaaaaaaaaaaaa...)>', irb.prompt('irb(%M)>', nil, 1, 1))
-    end
-
-    def test_lineno
-      input = TestInputMethod.new([
-        "\n",
-        "__LINE__\n",
-        "__LINE__\n",
-        "\n",
-        "\n",
-        "__LINE__\n",
-      ])
-      irb = IRB::Irb.new(IRB::WorkSpace.new(Object.new), input)
-      out, err = capture_output do
-        irb.eval_input
-      end
-      assert_empty err
-      assert_pattern_list([
-          :*, /\b2\n/,
-          :*, /\b3\n/,
-          :*, /\b6\n/,
-        ], out)
-    end
-
-    private
-
-    def without_colorize
-      original_value = IRB.conf[:USE_COLORIZE]
-      IRB.conf[:USE_COLORIZE] = false
-      yield
-    ensure
-      IRB.conf[:USE_COLORIZE] = original_value
-    end
-  end
-end
diff --git a/test/irb/test_debug_cmd.rb b/test/irb/test_debug_cmd.rb
deleted file mode 100644
index d669c174e6ef6a..00000000000000
--- a/test/irb/test_debug_cmd.rb
+++ /dev/null
@@ -1,440 +0,0 @@
-# frozen_string_literal: true
-
-require "tempfile"
-require "tmpdir"
-
-require_relative "helper"
-
-module TestIRB
-  class DebugCommandTest < IntegrationTestCase
-    def setup
-      super
-
-      if RUBY_ENGINE == 'truffleruby'
-        omit "This test runs with ruby/debug, which doesn't work with truffleruby"
-      end
-
-      @envs.merge!("NO_COLOR" => "true", "RUBY_DEBUG_HISTORY_FILE" => '')
-    end
-
-    def test_backtrace
-      write_ruby <<~'RUBY'
-        def foo
-          binding.irb
-        end
-        foo
-      RUBY
-
-      output = run_ruby_file do
-        type "backtrace"
-        type "exit!"
-      end
-
-      assert_match(/irb\(main\):001> backtrace/, output)
-      assert_match(/Object#foo at #{@ruby_file.to_path}/, output)
-    end
-
-    def test_debug
-      write_ruby <<~'ruby'
-        binding.irb
-        puts "hello"
-      ruby
-
-      output = run_ruby_file do
-        type "debug"
-        type "next"
-        type "continue"
-      end
-
-      assert_match(/irb\(main\):001> debug/, output)
-      assert_match(/irb:rdbg\(main\):002> next/, output)
-      assert_match(/=>   2\| puts "hello"/, output)
-    end
-
-    def test_debug_command_only_runs_once
-      write_ruby <<~'ruby'
-        binding.irb
-      ruby
-
-      output = run_ruby_file do
-        type "debug"
-        type "debug"
-        type "continue"
-      end
-
-      assert_match(/irb\(main\):001> debug/, output)
-      assert_match(/irb:rdbg\(main\):002> debug/, output)
-      assert_match(/IRB is already running with a debug session/, output)
-    end
-
-    def test_next
-      write_ruby <<~'ruby'
-        binding.irb
-        puts "hello"
-      ruby
-
-      output = run_ruby_file do
-        type "next"
-        type "continue"
-      end
-
-      assert_match(/irb\(main\):001> next/, output)
-      assert_match(/=>   2\| puts "hello"/, output)
-    end
-
-    def test_break
-      write_ruby <<~'RUBY'
-        binding.irb
-        puts "Hello"
-      RUBY
-
-      output = run_ruby_file do
-        type "break 2"
-        type "continue"
-        type "continue"
-      end
-
-      assert_match(/irb\(main\):001> break/, output)
-      assert_match(/=>   2\| puts "Hello"/, output)
-    end
-
-    def test_delete
-      write_ruby <<~'RUBY'
-        binding.irb
-        puts "Hello"
-        binding.irb
-        puts "World"
-      RUBY
-
-      output = run_ruby_file do
-        type "break 4"
-        type "continue"
-        type "delete 0"
-        type "continue"
-      end
-
-      assert_match(/irb:rdbg\(main\):003> delete/, output)
-      assert_match(/deleted: #0  BP - Line/, output)
-    end
-
-    def test_step
-      write_ruby <<~'RUBY'
-        def foo
-          puts "Hello"
-        end
-        binding.irb
-        foo
-      RUBY
-
-      output = run_ruby_file do
-        type "step"
-        type "step"
-        type "continue"
-      end
-
-      assert_match(/irb\(main\):001> step/, output)
-      assert_match(/=>   5\| foo/, output)
-      assert_match(/=>   2\|   puts "Hello"/, output)
-    end
-
-    def test_long_stepping
-      write_ruby <<~'RUBY'
-        class Foo
-          def foo(num)
-            bar(num + 10)
-          end
-
-          def bar(num)
-            num
-          end
-        end
-
-        binding.irb
-        Foo.new.foo(100)
-      RUBY
-
-      output = run_ruby_file do
-        type "step"
-        type "step"
-        type "step"
-        type "step"
-        type "num"
-        type "continue"
-      end
-
-      assert_match(/irb\(main\):001> step/, output)
-      assert_match(/irb:rdbg\(main\):002> step/, output)
-      assert_match(/irb:rdbg\(#<Foo:.*>\):003> step/, output)
-      assert_match(/irb:rdbg\(#<Foo:.*>\):004> step/, output)
-      assert_match(/irb:rdbg\(#<Foo:.*>\):005> num/, output)
-      assert_match(/=> 110/, output)
-    end
-
-    def test_continue
-      write_ruby <<~'RUBY'
-        binding.irb
-        puts "Hello"
-        binding.irb
-        puts "World"
-      RUBY
-
-      output = run_ruby_file do
-        type "continue"
-        type "continue"
-      end
-
-      assert_match(/irb\(main\):001> continue/, output)
-      assert_match(/=> 3: binding.irb/, output)
-      assert_match(/irb:rdbg\(main\):002> continue/, output)
-    end
-
-    def test_finish
-      write_ruby <<~'RUBY'
-        def foo
-          binding.irb
-          puts "Hello"
-        end
-        foo
-      RUBY
-
-      output = run_ruby_file do
-        type "finish"
-        type "continue"
-      end
-
-      assert_match(/irb\(main\):001> finish/, output)
-      assert_match(/=>   4\| end/, output)
-    end
-
-    def test_info
-      write_ruby <<~'RUBY'
-        def foo
-          a = "He" + "llo"
-          binding.irb
-        end
-        foo
-      RUBY
-
-      output = run_ruby_file do
-        type "info"
-        type "continue"
-      end
-
-      assert_match(/irb\(main\):001> info/, output)
-      assert_match(/%self = main/, output)
-      assert_match(/a = "Hello"/, output)
-    end
-
-    def test_catch
-      write_ruby <<~'RUBY'
-        binding.irb
-        1 / 0
-      RUBY
-
-      output = run_ruby_file do
-        type "catch ZeroDivisionError"
-        type "continue"
-        type "continue"
-      end
-
-      assert_match(/irb\(main\):001> catch/, output)
-      assert_match(/Stop by #0  BP - Catch  "ZeroDivisionError"/, output)
-    end
-
-    def test_exit
-      write_ruby <<~'RUBY'
-        binding.irb
-        puts "hello"
-      RUBY
-
-      output = run_ruby_file do
-        type "next"
-        type "exit"
-      end
-
-      assert_match(/irb\(main\):001> next/, output)
-    end
-
-    def test_quit
-      write_ruby <<~'RUBY'
-        binding.irb
-      RUBY
-
-      output = run_ruby_file do
-        type "next"
-        type "quit!"
-      end
-
-      assert_match(/irb\(main\):001> next/, output)
-    end
-
-    def test_prompt_line_number_continues
-      write_ruby <<~'ruby'
-        binding.irb
-        puts "Hello"
-        puts "World"
-      ruby
-
-      output = run_ruby_file do
-        type "123"
-        type "456"
-        type "next"
-        type "info"
-        type "next"
-        type "continue"
-      end
-
-      assert_match(/irb\(main\):003> next/, output)
-      assert_match(/irb:rdbg\(main\):004> info/, output)
-      assert_match(/irb:rdbg\(main\):005> next/, output)
-    end
-
-    def test_prompt_irb_name_is_kept
-      write_rc <<~RUBY
-        IRB.conf[:IRB_NAME] = "foo"
-      RUBY
-
-      write_ruby <<~'ruby'
-        binding.irb
-        puts "Hello"
-      ruby
-
-      output = run_ruby_file do
-        type "next"
-        type "continue"
-      end
-
-      assert_match(/foo\(main\):001> next/, output)
-      assert_match(/foo:rdbg\(main\):002> continue/, output)
-    end
-
-    def test_irb_commands_are_available_after_moving_around_with_the_debugger
-      write_ruby <<~'ruby'
-        class Foo
-          def bar
-            puts "bar"
-          end
-        end
-
-        binding.irb
-        Foo.new.bar
-      ruby
-
-      output = run_ruby_file do
-        # Due to the way IRB defines its commands, moving into the Foo instance from main is necessary for proper testing.
-        type "next"
-        type "step"
-        type "irb_info"
-        type "continue"
-      end
-
-      assert_include(output, "InputMethod: RelineInputMethod")
-    end
-
-    def test_help_command_is_delegated_to_the_debugger
-      write_ruby <<~'ruby'
-        binding.irb
-      ruby
-
-      output = run_ruby_file do
-        type "debug"
-        type "help"
-        type "continue"
-      end
-
-      assert_include(output, "### Frame control")
-    end
-
-    def test_show_cmds_display_different_content_when_debugger_is_enabled
-      write_ruby <<~'ruby'
-        # disable pager
-        STDIN.singleton_class.define_method(:tty?) { false }
-        binding.irb
-      ruby
-
-      output = run_ruby_file do
-        type "debug"
-        type "show_cmds"
-        type "continue"
-      end
-
-      # IRB's commands should still be listed
-      assert_match(/show_cmds\s+List all available commands and their description\./, output)
-      # debug gem's commands should be appended at the end
-      assert_match(/Debugging \(from debug\.gem\)\s+### Control flow/, output)
-    end
-
-    def test_input_is_evaluated_in_the_context_of_the_current_thread
-      write_ruby <<~'ruby'
-        current_thread = Thread.current
-        binding.irb
-      ruby
-
-      output = run_ruby_file do
-        type "debug"
-        type '"Threads match: #{current_thread == Thread.current}"'
-        type "continue"
-      end
-
-      assert_match(/irb\(main\):001> debug/, output)
-      assert_match(/Threads match: true/, output)
-    end
-
-    def test_irb_switches_debugger_interface_if_debug_was_already_activated
-      write_ruby <<~'ruby'
-        require 'debug'
-        class Foo
-          def bar
-            puts "bar"
-          end
-        end
-
-        binding.irb
-        Foo.new.bar
-      ruby
-
-      output = run_ruby_file do
-        # Due to the way IRB defines its commands, moving into the Foo instance from main is necessary for proper testing.
-        type "next"
-        type "step"
-        type 'irb_info'
-        type "continue"
-      end
-
-      assert_match(/irb\(main\):001> next/, output)
-      assert_include(output, "InputMethod: RelineInputMethod")
-    end
-
-    def test_debugger_cant_be_activated_while_multi_irb_is_active
-      write_ruby <<~'ruby'
-        binding.irb
-        a = 1
-      ruby
-
-      output = run_ruby_file do
-        type "jobs"
-        type "next"
-        type "exit"
-      end
-
-      assert_match(/irb\(main\):001> jobs/, output)
-      assert_include(output, "Can't start the debugger when IRB is running in a multi-IRB session.")
-    end
-
-    def test_multi_irb_commands_are_not_available_after_activating_the_debugger
-      write_ruby <<~'ruby'
-        binding.irb
-        a = 1
-      ruby
-
-      output = run_ruby_file do
-        type "next"
-        type "jobs"
-        type "continue"
-      end
-
-      assert_match(/irb\(main\):001> next/, output)
-      assert_include(output, "Multi-IRB commands are not available when the debugger is enabled.")
-    end
-  end
-end
diff --git a/test/irb/test_eval_history.rb b/test/irb/test_eval_history.rb
deleted file mode 100644
index e81e65f7f40479..00000000000000
--- a/test/irb/test_eval_history.rb
+++ /dev/null
@@ -1,68 +0,0 @@
-# frozen_string_literal: true
-require "irb"
-
-require_relative "helper"
-
-module TestIRB
-  class EvalHistoryTest < TestCase
-    def setup
-      save_encodings
-      IRB.instance_variable_get(:@CONF).clear
-    end
-
-    def teardown
-      restore_encodings
-    end
-
-    def execute_lines(*lines, conf: {}, main: self, irb_path: nil)
-      IRB.init_config(nil)
-      IRB.conf[:VERBOSE] = false
-      IRB.conf[:PROMPT_MODE] = :SIMPLE
-      IRB.conf.merge!(conf)
-      input = TestInputMethod.new(lines)
-      irb = IRB::Irb.new(IRB::WorkSpace.new(main), input)
-      irb.context.return_format = "=> %s\n"
-      irb.context.irb_path = irb_path if irb_path
-      IRB.conf[:MAIN_CONTEXT] = irb.context
-      capture_output do
-        irb.eval_input
-      end
-    end
-
-    def test_eval_history_is_diabled_by_default
-      out, err = execute_lines(
-        "a = 1",
-        "__"
-      )
-
-      assert_empty(err)
-      assert_match(/undefined local variable or method `__'/, out)
-    end
-
-    def test_eval_history_can_be_retrieved_with_double_underscore
-      out, err = execute_lines(
-        "a = 1",
-        "__",
-        conf: { EVAL_HISTORY: 5 }
-      )
-
-      assert_empty(err)
-      assert_match("=> 1\n" + "=> 1 1\n", out)
-    end
-
-    def test_eval_history_respects_given_limit
-      out, err = execute_lines(
-        "'foo'\n",
-        "'bar'\n",
-        "'baz'\n",
-        "'xyz'\n",
-        "__",
-        conf: { EVAL_HISTORY: 4 }
-      )
-
-      assert_empty(err)
-      # Because eval_history injects `__` into the history AND decide to ignore it, we only get <limit> - 1 results
-      assert_match("2 \"bar\"\n" + "3 \"baz\"\n" + "4 \"xyz\"\n", out)
-    end
-  end
-end
diff --git a/test/irb/test_evaluation.rb b/test/irb/test_evaluation.rb
deleted file mode 100644
index adb69b20677af0..00000000000000
--- a/test/irb/test_evaluation.rb
+++ /dev/null
@@ -1,44 +0,0 @@
-# frozen_string_literal: true
-
-require "tempfile"
-
-require_relative "helper"
-
-module TestIRB
-  class EchoingTest < IntegrationTestCase
-    def test_irb_echos_by_default
-      write_ruby <<~'RUBY'
-        binding.irb
-      RUBY
-
-      output = run_ruby_file do
-        type "123123"
-        type "exit"
-      end
-
-      assert_include(output, "=> 123123")
-    end
-
-    def test_irb_doesnt_echo_line_with_semicolon
-      write_ruby <<~'RUBY'
-        binding.irb
-      RUBY
-
-      output = run_ruby_file do
-        type "123123;"
-        type "123123   ;"
-        type "123123;   "
-        type <<~RUBY
-          if true
-            123123
-          end;
-        RUBY
-        type "'evaluation ends'"
-        type "exit"
-      end
-
-      assert_include(output, "=> \"evaluation ends\"")
-      assert_not_include(output, "=> 123123")
-    end
-  end
-end
diff --git a/test/irb/test_history.rb b/test/irb/test_history.rb
deleted file mode 100644
index 15628e66e2d46e..00000000000000
--- a/test/irb/test_history.rb
+++ /dev/null
@@ -1,334 +0,0 @@
-# frozen_string_literal: false
-require 'irb'
-require 'readline'
-require "tempfile"
-
-require_relative "helper"
-
-return if RUBY_PLATFORM.match?(/solaris|mswin|mingw/i)
-
-module TestIRB
-  class HistoryTest < TestCase
-    def setup
-      IRB.conf[:RC_NAME_GENERATOR] = nil
-    end
-
-    def teardown
-      IRB.conf[:RC_NAME_GENERATOR] = nil
-    end
-
-    class TestInputMethodWithHistory < TestInputMethod
-      HISTORY = Array.new
-
-      include IRB::HistorySavingAbility
-    end
-
-    def test_history_save_1
-      omit "Skip Editline" if /EditLine/n.match(Readline::VERSION)
-      IRB.conf[:SAVE_HISTORY] = 1
-      assert_history(<<~EXPECTED_HISTORY, <<~INITIAL_HISTORY, <<~INPUT)
-        exit
-      EXPECTED_HISTORY
-        1
-        2
-        3
-        4
-      INITIAL_HISTORY
-        5
-        exit
-      INPUT
-    end
-
-    def test_history_save_100
-      omit "Skip Editline" if /EditLine/n.match(Readline::VERSION)
-      IRB.conf[:SAVE_HISTORY] = 100
-      assert_history(<<~EXPECTED_HISTORY, <<~INITIAL_HISTORY, <<~INPUT)
-        1
-        2
-        3
-        4
-        5
-        exit
-      EXPECTED_HISTORY
-        1
-        2
-        3
-        4
-      INITIAL_HISTORY
-        5
-        exit
-      INPUT
-    end
-
-    def test_history_save_bignum
-      omit "Skip Editline" if /EditLine/n.match(Readline::VERSION)
-      IRB.conf[:SAVE_HISTORY] = 10 ** 19
-      assert_history(<<~EXPECTED_HISTORY, <<~INITIAL_HISTORY, <<~INPUT)
-        1
-        2
-        3
-        4
-        5
-        exit
-      EXPECTED_HISTORY
-        1
-        2
-        3
-        4
-      INITIAL_HISTORY
-        5
-        exit
-      INPUT
-    end
-
-    def test_history_save_minus_as_infinity
-      omit "Skip Editline" if /EditLine/n.match(Readline::VERSION)
-      IRB.conf[:SAVE_HISTORY] = -1 # infinity
-      assert_history(<<~EXPECTED_HISTORY, <<~INITIAL_HISTORY, <<~INPUT)
-        1
-        2
-        3
-        4
-        5
-        exit
-      EXPECTED_HISTORY
-        1
-        2
-        3
-        4
-      INITIAL_HISTORY
-        5
-        exit
-      INPUT
-    end
-
-    def test_history_concurrent_use
-      omit "Skip Editline" if /EditLine/n.match(Readline::VERSION)
-      IRB.conf[:SAVE_HISTORY] = 1
-      assert_history(<<~EXPECTED_HISTORY, <<~INITIAL_HISTORY, <<~INPUT) do |history_file|
-        exit
-        5
-        exit
-      EXPECTED_HISTORY
-        1
-        2
-        3
-        4
-      INITIAL_HISTORY
-        5
-        exit
-      INPUT
-        assert_history(<<~EXPECTED_HISTORY2, <<~INITIAL_HISTORY2, <<~INPUT2)
-        exit
-      EXPECTED_HISTORY2
-        1
-        2
-        3
-        4
-      INITIAL_HISTORY2
-        5
-        exit
-      INPUT2
-        File.utime(File.atime(history_file), File.mtime(history_file) + 2, history_file)
-      end
-    end
-
-    def test_history_concurrent_use_not_present
-      backup_home = ENV["HOME"]
-      backup_xdg_config_home = ENV.delete("XDG_CONFIG_HOME")
-      backup_irbrc = ENV.delete("IRBRC")
-      IRB.conf[:LC_MESSAGES] = IRB::Locale.new
-      IRB.conf[:SAVE_HISTORY] = 1
-      Dir.mktmpdir("test_irb_history_") do |tmpdir|
-        ENV["HOME"] = tmpdir
-        io = TestInputMethodWithHistory.new
-        io.class::HISTORY.clear
-        io.load_history
-        io.class::HISTORY.concat(%w"line1 line2")
-
-        history_file = IRB.rc_file("_history")
-        assert_not_send [File, :file?, history_file]
-        File.write(history_file, "line0\n")
-        io.save_history
-        assert_equal(%w"line0 line1 line2", File.read(history_file).split)
-      end
-    ensure
-      ENV["HOME"] = backup_home
-      ENV["XDG_CONFIG_HOME"] = backup_xdg_config_home
-      ENV["IRBRC"] = backup_irbrc
-    end
-
-    private
-
-    def assert_history(expected_history, initial_irb_history, input)
-      backup_verbose, $VERBOSE = $VERBOSE, nil
-      backup_home = ENV["HOME"]
-      backup_xdg_config_home = ENV.delete("XDG_CONFIG_HOME")
-      IRB.conf[:LC_MESSAGES] = IRB::Locale.new
-      actual_history = nil
-      Dir.mktmpdir("test_irb_history_") do |tmpdir|
-        ENV["HOME"] = tmpdir
-        File.open(IRB.rc_file("_history"), "w") do |f|
-          f.write(initial_irb_history)
-        end
-
-        io = TestInputMethodWithHistory.new
-        io.class::HISTORY.clear
-        io.load_history
-        if block_given?
-          history = io.class::HISTORY.dup
-          yield IRB.rc_file("_history")
-          io.class::HISTORY.replace(history)
-        end
-        io.class::HISTORY.concat(input.split)
-        io.save_history
-
-        io.load_history
-        File.open(IRB.rc_file("_history"), "r") do |f|
-          actual_history = f.read
-        end
-      end
-      assert_equal(expected_history, actual_history, <<~MESSAGE)
-        expected:
-        #{expected_history}
-        but actual:
-        #{actual_history}
-      MESSAGE
-    ensure
-      $VERBOSE = backup_verbose
-      ENV["HOME"] = backup_home
-      ENV["XDG_CONFIG_HOME"] = backup_xdg_config_home
-    end
-
-    def with_temp_stdio
-      Tempfile.create("test_readline_stdin") do |stdin|
-        Tempfile.create("test_readline_stdout") do |stdout|
-          yield stdin, stdout
-        end
-      end
-    end
-  end
-
-  class IRBHistoryIntegrationTest < IntegrationTestCase
-    def test_history_saving_with_debug
-      if ruby_core?
-        omit "This test works only under ruby/irb"
-      end
-
-      write_history ""
-
-      write_ruby <<~'RUBY'
-        def foo
-        end
-
-        binding.irb
-
-        foo
-      RUBY
-
-      output = run_ruby_file do
-        type "'irb session'"
-        type "next"
-        type "'irb:debug session'"
-        type "step"
-        type "irb_info"
-        type "puts Reline::HISTORY.to_a.to_s"
-        type "q!"
-      end
-
-      assert_include(output, "InputMethod: RelineInputMethod")
-      # check that in-memory history is preserved across sessions
-      assert_include output, %q(
-        ["'irb session'", "next", "'irb:debug session'", "step", "irb_info", "puts Reline::HISTORY.to_a.to_s"]
-      ).strip
-
-      assert_equal <<~HISTORY, @history_file.open.read
-        'irb session'
-        next
-        'irb:debug session'
-        step
-        irb_info
-        puts Reline::HISTORY.to_a.to_s
-        q!
-      HISTORY
-    end
-
-    def test_history_saving_with_nested_sessions
-      write_history ""
-
-      write_ruby <<~'RUBY'
-        def foo
-          binding.irb
-        end
-
-        binding.irb
-      RUBY
-
-      run_ruby_file do
-        type "'outer session'"
-        type "foo"
-        type "'inner session'"
-        type "exit"
-        type "'outer session again'"
-        type "exit"
-      end
-
-      assert_equal <<~HISTORY, @history_file.open.read
-        'outer session'
-        foo
-        'inner session'
-        exit
-        'outer session again'
-        exit
-      HISTORY
-    end
-
-    def test_history_saving_with_nested_sessions_and_prior_history
-      write_history <<~HISTORY
-        old_history_1
-        old_history_2
-        old_history_3
-      HISTORY
-
-      write_ruby <<~'RUBY'
-        def foo
-          binding.irb
-        end
-
-        binding.irb
-      RUBY
-
-      run_ruby_file do
-        type "'outer session'"
-        type "foo"
-        type "'inner session'"
-        type "exit"
-        type "'outer session again'"
-        type "exit"
-      end
-
-      assert_equal <<~HISTORY, @history_file.open.read
-        old_history_1
-        old_history_2
-        old_history_3
-        'outer session'
-        foo
-        'inner session'
-        exit
-        'outer session again'
-        exit
-      HISTORY
-    end
-
-    private
-
-    def write_history(history)
-      @history_file = Tempfile.new('irb_history')
-      @history_file.write(history)
-      @history_file.close
-      write_rc <<~RUBY
-        IRB.conf[:HISTORY_FILE] = "#{@history_file.path}"
-      RUBY
-    end
-  end
-end
diff --git a/test/irb/test_init.rb b/test/irb/test_init.rb
deleted file mode 100644
index 9f3f2a10987c20..00000000000000
--- a/test/irb/test_init.rb
+++ /dev/null
@@ -1,177 +0,0 @@
-# frozen_string_literal: false
-require "irb"
-require "fileutils"
-
-require_relative "helper"
-
-module TestIRB
-  class InitTest < TestCase
-    def setup
-      # IRBRC is for RVM...
-      @backup_env = %w[HOME XDG_CONFIG_HOME IRBRC].each_with_object({}) do |env, hash|
-        hash[env] = ENV.delete(env)
-      end
-      ENV["HOME"] = @tmpdir = Dir.mktmpdir("test_irb_init_#{$$}")
-    end
-
-    def teardown
-      ENV.update(@backup_env)
-      FileUtils.rm_rf(@tmpdir)
-      IRB.conf.delete(:SCRIPT)
-    end
-
-    def test_setup_with_argv_preserves_global_argv
-      argv = ["foo", "bar"]
-      with_argv(argv) do
-        IRB.setup(eval("__FILE__"), argv: %w[-f])
-        assert_equal argv, ARGV
-      end
-    end
-
-    def test_setup_with_minimum_argv_does_not_change_dollar0
-      orig = $0.dup
-      IRB.setup(eval("__FILE__"), argv: %w[-f])
-      assert_equal orig, $0
-    end
-
-    def test_rc_file
-      tmpdir = @tmpdir
-      Dir.chdir(tmpdir) do
-        ENV["XDG_CONFIG_HOME"] = "#{tmpdir}/xdg"
-        IRB.conf[:RC_NAME_GENERATOR] = nil
-        assert_equal(tmpdir+"/.irb#{IRB::IRBRC_EXT}", IRB.rc_file)
-        assert_equal(tmpdir+"/.irb_history", IRB.rc_file("_history"))
-        assert_file.not_exist?(tmpdir+"/xdg")
-        IRB.conf[:RC_NAME_GENERATOR] = nil
-        FileUtils.touch(tmpdir+"/.irb#{IRB::IRBRC_EXT}")
-        assert_equal(tmpdir+"/.irb#{IRB::IRBRC_EXT}", IRB.rc_file)
-        assert_equal(tmpdir+"/.irb_history", IRB.rc_file("_history"))
-        assert_file.not_exist?(tmpdir+"/xdg")
-      end
-    end
-
-    def test_rc_file_in_subdir
-      tmpdir = @tmpdir
-      Dir.chdir(tmpdir) do
-        FileUtils.mkdir_p("#{tmpdir}/mydir")
-        Dir.chdir("#{tmpdir}/mydir") do
-          IRB.conf[:RC_NAME_GENERATOR] = nil
-          assert_equal(tmpdir+"/.irb#{IRB::IRBRC_EXT}", IRB.rc_file)
-          assert_equal(tmpdir+"/.irb_history", IRB.rc_file("_history"))
-          IRB.conf[:RC_NAME_GENERATOR] = nil
-          FileUtils.touch(tmpdir+"/.irb#{IRB::IRBRC_EXT}")
-          assert_equal(tmpdir+"/.irb#{IRB::IRBRC_EXT}", IRB.rc_file)
-          assert_equal(tmpdir+"/.irb_history", IRB.rc_file("_history"))
-        end
-      end
-    end
-
-    def test_recovery_sigint
-      pend "This test gets stuck on Solaris for unknown reason; contribution is welcome" if RUBY_PLATFORM =~ /solaris/
-      bundle_exec = ENV.key?('BUNDLE_GEMFILE') ? ['-rbundler/setup'] : []
-      status = assert_in_out_err(bundle_exec + %w[-W0 -rirb -e binding.irb;loop{Process.kill("SIGINT",$$)} -- -f --], "exit\n", //, //)
-      Process.kill("SIGKILL", status.pid) if !status.exited? && !status.stopped? && !status.signaled?
-    end
-
-    def test_no_color_environment_variable
-      orig_no_color = ENV['NO_COLOR']
-      orig_use_colorize = IRB.conf[:USE_COLORIZE]
-      IRB.conf[:USE_COLORIZE] = true
-
-      assert IRB.conf[:USE_COLORIZE]
-
-      ENV['NO_COLOR'] = 'true'
-      IRB.setup(__FILE__)
-      refute IRB.conf[:USE_COLORIZE]
-
-      ENV['NO_COLOR'] = ''
-      IRB.setup(__FILE__)
-      assert IRB.conf[:USE_COLORIZE]
-
-      ENV['NO_COLOR'] = nil
-      IRB.setup(__FILE__)
-      assert IRB.conf[:USE_COLORIZE]
-    ensure
-      ENV['NO_COLOR'] = orig_no_color
-      IRB.conf[:USE_COLORIZE] = orig_use_colorize
-    end
-
-    def test_use_autocomplete_environment_variable
-      orig_use_autocomplete_env = ENV['IRB_USE_AUTOCOMPLETE']
-      orig_use_autocomplete_conf = IRB.conf[:USE_AUTOCOMPLETE]
-
-      ENV['IRB_USE_AUTOCOMPLETE'] = nil
-      IRB.setup(__FILE__)
-      assert IRB.conf[:USE_AUTOCOMPLETE]
-
-      ENV['IRB_USE_AUTOCOMPLETE'] = ''
-      IRB.setup(__FILE__)
-      assert IRB.conf[:USE_AUTOCOMPLETE]
-
-      ENV['IRB_USE_AUTOCOMPLETE'] = 'false'
-      IRB.setup(__FILE__)
-      refute IRB.conf[:USE_AUTOCOMPLETE]
-
-      ENV['IRB_USE_AUTOCOMPLETE'] = 'true'
-      IRB.setup(__FILE__)
-      assert IRB.conf[:USE_AUTOCOMPLETE]
-    ensure
-      ENV["IRB_USE_AUTOCOMPLETE"] = orig_use_autocomplete_env
-      IRB.conf[:USE_AUTOCOMPLETE] = orig_use_autocomplete_conf
-    end
-
-    def test_noscript
-      argv = %w[--noscript -- -f]
-      IRB.setup(eval("__FILE__"), argv: argv)
-      assert_nil IRB.conf[:SCRIPT]
-      assert_equal(['-f'], argv)
-
-      argv = %w[--noscript -- a]
-      IRB.setup(eval("__FILE__"), argv: argv)
-      assert_nil IRB.conf[:SCRIPT]
-      assert_equal(['a'], argv)
-
-      argv = %w[--noscript a]
-      IRB.setup(eval("__FILE__"), argv: argv)
-      assert_nil IRB.conf[:SCRIPT]
-      assert_equal(['a'], argv)
-
-      argv = %w[--script --noscript a]
-      IRB.setup(eval("__FILE__"), argv: argv)
-      assert_nil IRB.conf[:SCRIPT]
-      assert_equal(['a'], argv)
-
-      argv = %w[--noscript --script a]
-      IRB.setup(eval("__FILE__"), argv: argv)
-      assert_equal('a', IRB.conf[:SCRIPT])
-      assert_equal([], argv)
-    end
-
-    def test_dash
-      argv = %w[-]
-      IRB.setup(eval("__FILE__"), argv: argv)
-      assert_equal('-', IRB.conf[:SCRIPT])
-      assert_equal([], argv)
-
-      argv = %w[-- -]
-      IRB.setup(eval("__FILE__"), argv: argv)
-      assert_equal('-', IRB.conf[:SCRIPT])
-      assert_equal([], argv)
-
-      argv = %w[-- - -f]
-      IRB.setup(eval("__FILE__"), argv: argv)
-      assert_equal('-', IRB.conf[:SCRIPT])
-      assert_equal(['-f'], argv)
-    end
-
-    private
-
-    def with_argv(argv)
-      orig = ARGV.dup
-      ARGV.replace(argv)
-      yield
-    ensure
-      ARGV.replace(orig)
-    end
-  end
-end
diff --git a/test/irb/test_input_method.rb b/test/irb/test_input_method.rb
deleted file mode 100644
index ea7efb5dd51160..00000000000000
--- a/test/irb/test_input_method.rb
+++ /dev/null
@@ -1,79 +0,0 @@
-# frozen_string_literal: false
-
-require "irb"
-
-require_relative "helper"
-
-module TestIRB
-  class RelineInputMethodTest < TestCase
-    def setup
-      @conf_backup = IRB.conf.dup
-      IRB.conf[:LC_MESSAGES] = IRB::Locale.new
-      save_encodings
-    end
-
-    def teardown
-      IRB.conf.replace(@conf_backup)
-      restore_encodings
-    end
-
-    def test_initialization
-      IRB::RelineInputMethod.new
-
-      assert_nil Reline.completion_append_character
-      assert_equal '', Reline.completer_quote_characters
-      assert_equal IRB::InputCompletor::BASIC_WORD_BREAK_CHARACTERS, Reline.basic_word_break_characters
-      assert_equal IRB::InputCompletor::CompletionProc, Reline.completion_proc
-      assert_equal IRB::InputCompletor::PerfectMatchedProc, Reline.dig_perfect_match_proc
-    end
-
-    def test_initialization_without_use_autocomplete
-      original_show_doc_proc = Reline.dialog_proc(:show_doc)&.dialog_proc
-      empty_proc = Proc.new {}
-      Reline.add_dialog_proc(:show_doc, empty_proc)
-
-      IRB.conf[:USE_AUTOCOMPLETE] = false
-
-      IRB::RelineInputMethod.new
-
-      refute Reline.autocompletion
-      assert_equal empty_proc, Reline.dialog_proc(:show_doc).dialog_proc
-    ensure
-      Reline.add_dialog_proc(:show_doc, original_show_doc_proc, Reline::DEFAULT_DIALOG_CONTEXT)
-    end
-
-    def test_initialization_with_use_autocomplete
-      original_show_doc_proc = Reline.dialog_proc(:show_doc)&.dialog_proc
-      empty_proc = Proc.new {}
-      Reline.add_dialog_proc(:show_doc, empty_proc)
-
-      IRB.conf[:USE_AUTOCOMPLETE] = true
-
-      IRB::RelineInputMethod.new
-
-      assert Reline.autocompletion
-      assert_equal IRB::RelineInputMethod::SHOW_DOC_DIALOG, Reline.dialog_proc(:show_doc).dialog_proc
-    ensure
-      Reline.add_dialog_proc(:show_doc, original_show_doc_proc, Reline::DEFAULT_DIALOG_CONTEXT)
-    end
-
-    def test_initialization_with_use_autocomplete_but_without_rdoc
-      original_show_doc_proc = Reline.dialog_proc(:show_doc)&.dialog_proc
-      empty_proc = Proc.new {}
-      Reline.add_dialog_proc(:show_doc, empty_proc)
-
-      IRB.conf[:USE_AUTOCOMPLETE] = true
-
-      without_rdoc do
-        IRB::RelineInputMethod.new
-      end
-
-      assert Reline.autocompletion
-      # doesn't register show_doc dialog
-      assert_equal empty_proc, Reline.dialog_proc(:show_doc).dialog_proc
-    ensure
-      Reline.add_dialog_proc(:show_doc, original_show_doc_proc, Reline::DEFAULT_DIALOG_CONTEXT)
-    end
-  end
-end
-
diff --git a/test/irb/test_irb.rb b/test/irb/test_irb.rb
deleted file mode 100644
index 08fe41f5e7854e..00000000000000
--- a/test/irb/test_irb.rb
+++ /dev/null
@@ -1,742 +0,0 @@
-# frozen_string_literal: true
-require "irb"
-
-require_relative "helper"
-
-module TestIRB
-  class InputTest < IntegrationTestCase
-    def test_symbol_aliases_are_handled_correctly
-      write_ruby <<~'RUBY'
-        class Foo
-        end
-        binding.irb
-      RUBY
-
-      output = run_ruby_file do
-        type "$ Foo"
-        type "exit!"
-      end
-
-      assert_include output, "From: #{@ruby_file.path}:1"
-    end
-
-    def test_symbol_aliases_are_handled_correctly_with_singleline_mode
-      @irbrc = Tempfile.new('irbrc')
-      @irbrc.write <<~RUBY
-        IRB.conf[:USE_SINGLELINE] = true
-      RUBY
-      @irbrc.close
-      @envs['IRBRC'] = @irbrc.path
-
-      write_ruby <<~'RUBY'
-        class Foo
-        end
-        binding.irb
-      RUBY
-
-      output = run_ruby_file do
-        type "irb_info"
-        type "$ Foo"
-        type "exit!"
-      end
-
-      # Make sure it's tested in singleline mode
-      assert_include output, "InputMethod: ReadlineInputMethod"
-      assert_include output, "From: #{@ruby_file.path}:1"
-    ensure
-      @irbrc.unlink if @irbrc
-    end
-
-    def test_symbol_aliases_dont_affect_ruby_syntax
-      write_ruby <<~'RUBY'
-        $foo = "It's a foo"
-        @bar = "It's a bar"
-        binding.irb
-      RUBY
-
-      output = run_ruby_file do
-        type "$foo"
-        type "@bar"
-        type "exit!"
-      end
-
-      assert_include output, "=> \"It's a foo\""
-      assert_include output, "=> \"It's a bar\""
-    end
-  end
-
-  class IrbIOConfigurationTest < TestCase
-    Row = Struct.new(:content, :current_line_spaces, :new_line_spaces, :indent_level)
-
-    class MockIO_AutoIndent
-      attr_reader :calculated_indent
-
-      def initialize(*params)
-        @params = params
-        @calculated_indent
-      end
-
-      def auto_indent(&block)
-        @calculated_indent = block.call(*@params)
-      end
-    end
-
-    class MockIO_DynamicPrompt
-      def initialize(params, &assertion)
-        @params = params
-        @assertion = assertion
-      end
-
-      def dynamic_prompt(&block)
-        result = block.call(@params)
-        @assertion.call(result)
-      end
-    end
-
-    def setup
-      save_encodings
-      @irb = build_irb
-    end
-
-    def teardown
-      restore_encodings
-    end
-
-    class AutoIndentationTest < IrbIOConfigurationTest
-      def test_auto_indent
-        input_with_correct_indents = [
-          [%q(def each_top_level_statement), 0, 2],
-          [%q(  initialize_input), 2, 2],
-          [%q(  catch(:TERM_INPUT) do), 2, 4],
-          [%q(    loop do), 4, 6],
-          [%q(      begin), 6, 8],
-          [%q(        prompt), 8, 8],
-          [%q(        unless l = lex), 8, 10],
-          [%q(          throw :TERM_INPUT if @line == ''), 10, 10],
-          [%q(        else), 8, 10],
-          [%q(          @line_no += l.count("\n")), 10, 10],
-          [%q(          next if l == "\n"), 10, 10],
-          [%q(          @line.concat l), 10, 10],
-          [%q(          if @code_block_open or @ltype or @continue or @indent > 0), 10, 12],
-          [%q(            next), 12, 12],
-          [%q(          end), 10, 10],
-          [%q(        end), 8, 8],
-          [%q(        if @line != "\n"), 8, 10],
-          [%q(          @line.force_encoding(@io.encoding)), 10, 10],
-          [%q(          yield @line, @exp_line_no), 10, 10],
-          [%q(        end), 8, 8],
-          [%q(        break if @io.eof?), 8, 8],
-          [%q(        @line = ''), 8, 8],
-          [%q(        @exp_line_no = @line_no), 8, 8],
-          [%q(        ), nil, 8],
-          [%q(        @indent = 0), 8, 8],
-          [%q(      rescue TerminateLineInput), 6, 8],
-          [%q(        initialize_input), 8, 8],
-          [%q(        prompt), 8, 8],
-          [%q(      end), 6, 6],
-          [%q(    end), 4, 4],
-          [%q(  end), 2, 2],
-          [%q(end), 0, 0],
-        ]
-
-        assert_rows_with_correct_indents(input_with_correct_indents)
-      end
-
-      def test_braces_on_their_own_line
-        input_with_correct_indents = [
-          [%q(if true), 0, 2],
-          [%q(  [), 2, 4],
-          [%q(  ]), 2, 2],
-          [%q(end), 0, 0],
-        ]
-
-        assert_rows_with_correct_indents(input_with_correct_indents)
-      end
-
-      def test_multiple_braces_in_a_line
-        input_with_correct_indents = [
-          [%q([[[), 0, 6],
-          [%q(    ]), 4, 4],
-          [%q(  ]), 2, 2],
-          [%q(]), 0, 0],
-          [%q([<<FOO]), 0, 0],
-          [%q(hello), 0, 0],
-          [%q(FOO), 0, 0],
-        ]
-
-        assert_rows_with_correct_indents(input_with_correct_indents)
-      end
-
-      def test_a_closed_brace_and_not_closed_brace_in_a_line
-        input_with_correct_indents = [
-          [%q(p() {), 0, 2],
-          [%q(}), 0, 0],
-        ]
-
-        assert_rows_with_correct_indents(input_with_correct_indents)
-      end
-
-      def test_symbols
-        input_with_correct_indents = [
-          [%q(:a), 0, 0],
-          [%q(:A), 0, 0],
-          [%q(:+), 0, 0],
-          [%q(:@@a), 0, 0],
-          [%q(:@a), 0, 0],
-          [%q(:$a), 0, 0],
-          [%q(:def), 0, 0],
-          [%q(:`), 0, 0],
-        ]
-
-        assert_rows_with_correct_indents(input_with_correct_indents)
-      end
-
-      def test_incomplete_coding_magic_comment
-        input_with_correct_indents = [
-          [%q(#coding:u), 0, 0],
-        ]
-
-        assert_rows_with_correct_indents(input_with_correct_indents)
-      end
-
-      def test_incomplete_encoding_magic_comment
-        input_with_correct_indents = [
-          [%q(#encoding:u), 0, 0],
-        ]
-
-        assert_rows_with_correct_indents(input_with_correct_indents)
-      end
-
-      def test_incomplete_emacs_coding_magic_comment
-        input_with_correct_indents = [
-          [%q(# -*- coding: u), 0, 0],
-        ]
-
-        assert_rows_with_correct_indents(input_with_correct_indents)
-      end
-
-      def test_incomplete_vim_coding_magic_comment
-        input_with_correct_indents = [
-          [%q(# vim:set fileencoding=u), 0, 0],
-        ]
-
-        assert_rows_with_correct_indents(input_with_correct_indents)
-      end
-
-      def test_mixed_rescue
-        input_with_correct_indents = [
-          [%q(def m), 0, 2],
-          [%q(  begin), 2, 4],
-          [%q(    begin), 4, 6],
-          [%q(      x = a rescue 4), 6, 6],
-          [%q(      y = [(a rescue 5)]), 6, 6],
-          [%q(      [x, y]), 6, 6],
-          [%q(    rescue => e), 4, 6],
-          [%q(      raise e rescue 8), 6, 6],
-          [%q(    end), 4, 4],
-          [%q(  rescue), 2, 4],
-          [%q(    raise rescue 11), 4, 4],
-          [%q(  end), 2, 2],
-          [%q(rescue => e), 0, 2],
-          [%q(  raise e rescue 14), 2, 2],
-          [%q(end), 0, 0],
-        ]
-
-        assert_rows_with_correct_indents(input_with_correct_indents)
-      end
-
-      def test_oneliner_method_definition
-        input_with_correct_indents = [
-          [%q(class A), 0, 2],
-          [%q(  def foo0), 2, 4],
-          [%q(    3), 4, 4],
-          [%q(  end), 2, 2],
-          [%q(  def foo1()), 2, 4],
-          [%q(    3), 4, 4],
-          [%q(  end), 2, 2],
-          [%q(  def foo2(a, b)), 2, 4],
-          [%q(    a + b), 4, 4],
-          [%q(  end), 2, 2],
-          [%q(  def foo3 a, b), 2, 4],
-          [%q(    a + b), 4, 4],
-          [%q(  end), 2, 2],
-          [%q(  def bar0() = 3), 2, 2],
-          [%q(  def bar1(a) = a), 2, 2],
-          [%q(  def bar2(a, b) = a + b), 2, 2],
-          [%q(  def bar3() = :s), 2, 2],
-          [%q(  def bar4() = Time.now), 2, 2],
-          [%q(end), 0, 0],
-        ]
-
-        assert_rows_with_correct_indents(input_with_correct_indents)
-      end
-
-      def test_tlambda
-        input_with_correct_indents = [
-          [%q(if true), 0, 2, 1],
-          [%q(  -> {), 2, 4, 2],
-          [%q(  }), 2, 2, 1],
-          [%q(end), 0, 0, 0],
-        ]
-
-        assert_rows_with_correct_indents(input_with_correct_indents, assert_indent_level: true)
-      end
-
-      def test_corresponding_syntax_to_keyword_do_in_class
-        input_with_correct_indents = [
-          [%q(class C), 0, 2, 1],
-          [%q(  while method_name do), 2, 4, 2],
-          [%q(    3), 4, 4, 2],
-          [%q(  end), 2, 2, 1],
-          [%q(  foo do), 2, 4, 2],
-          [%q(    3), 4, 4, 2],
-          [%q(  end), 2, 2, 1],
-          [%q(end), 0, 0, 0],
-        ]
-
-        assert_rows_with_correct_indents(input_with_correct_indents, assert_indent_level: true)
-      end
-
-      def test_corresponding_syntax_to_keyword_do
-        input_with_correct_indents = [
-          [%q(while i > 0), 0, 2, 1],
-          [%q(  3), 2, 2, 1],
-          [%q(end), 0, 0, 0],
-          [%q(while true), 0, 2, 1],
-          [%q(  3), 2, 2, 1],
-          [%q(end), 0, 0, 0],
-          [%q(while ->{i > 0}.call), 0, 2, 1],
-          [%q(  3), 2, 2, 1],
-          [%q(end), 0, 0, 0],
-          [%q(while ->{true}.call), 0, 2, 1],
-          [%q(  3), 2, 2, 1],
-          [%q(end), 0, 0, 0],
-          [%q(while i > 0 do), 0, 2, 1],
-          [%q(  3), 2, 2, 1],
-          [%q(end), 0, 0, 0],
-          [%q(while true do), 0, 2, 1],
-          [%q(  3), 2, 2, 1],
-          [%q(end), 0, 0, 0],
-          [%q(while ->{i > 0}.call do), 0, 2, 1],
-          [%q(  3), 2, 2, 1],
-          [%q(end), 0, 0, 0],
-          [%q(while ->{true}.call do), 0, 2, 1],
-          [%q(  3), 2, 2, 1],
-          [%q(end), 0, 0, 0],
-          [%q(foo do), 0, 2, 1],
-          [%q(  3), 2, 2, 1],
-          [%q(end), 0, 0, 0],
-          [%q(foo true do), 0, 2, 1],
-          [%q(  3), 2, 2, 1],
-          [%q(end), 0, 0, 0],
-          [%q(foo ->{true} do), 0, 2, 1],
-          [%q(  3), 2, 2, 1],
-          [%q(end), 0, 0, 0],
-          [%q(foo ->{i > 0} do), 0, 2, 1],
-          [%q(  3), 2, 2, 1],
-          [%q(end), 0, 0, 0],
-        ]
-
-        assert_rows_with_correct_indents(input_with_correct_indents, assert_indent_level: true)
-      end
-
-      def test_corresponding_syntax_to_keyword_for
-        input_with_correct_indents = [
-          [%q(for i in [1]), 0, 2, 1],
-          [%q(  puts i), 2, 2, 1],
-          [%q(end), 0, 0, 0],
-        ]
-
-        assert_rows_with_correct_indents(input_with_correct_indents, assert_indent_level: true)
-      end
-
-      def test_corresponding_syntax_to_keyword_for_with_do
-        input_with_correct_indents = [
-          [%q(for i in [1] do), 0, 2, 1],
-          [%q(  puts i), 2, 2, 1],
-          [%q(end), 0, 0, 0],
-        ]
-
-        assert_rows_with_correct_indents(input_with_correct_indents, assert_indent_level: true)
-      end
-
-      def test_typing_incomplete_include_interpreted_as_keyword_in
-        input_with_correct_indents = [
-          [%q(module E), 0, 2, 1],
-          [%q(end), 0, 0, 0],
-          [%q(class A), 0, 2, 1],
-          [%q(  in), 2, 2, 1] # scenario typing `include E`
-        ]
-
-        assert_rows_with_correct_indents(input_with_correct_indents, assert_indent_level: true)
-
-      end
-
-      def test_bracket_corresponding_to_times
-        input_with_correct_indents = [
-          [%q(3.times { |i|), 0, 2, 1],
-          [%q(  puts i), 2, 2, 1],
-          [%q(}), 0, 0, 0],
-        ]
-
-        assert_rows_with_correct_indents(input_with_correct_indents, assert_indent_level: true)
-      end
-
-      def test_do_corresponding_to_times
-        input_with_correct_indents = [
-          [%q(3.times do |i|), 0, 2, 1],
-          [%q(  puts i), 2, 2, 1],
-          [%q(end), 0, 0, 0],
-        ]
-
-        assert_rows_with_correct_indents(input_with_correct_indents, assert_indent_level: true)
-      end
-
-      def test_bracket_corresponding_to_loop
-        input_with_correct_indents = [
-          ['loop {', 0, 2, 1],
-          ['  3', 2, 2, 1],
-          ['}', 0, 0, 0],
-        ]
-
-        assert_rows_with_correct_indents(input_with_correct_indents, assert_indent_level: true)
-      end
-
-      def test_do_corresponding_to_loop
-        input_with_correct_indents = [
-          [%q(loop do), 0, 2, 1],
-          [%q(  3), 2, 2, 1],
-          [%q(end), 0, 0, 0],
-        ]
-
-        assert_rows_with_correct_indents(input_with_correct_indents, assert_indent_level: true)
-      end
-
-      def test_embdoc_indent
-        input_with_correct_indents = [
-          [%q(=begin), 0, 0, 0],
-          [%q(a), 0, 0, 0],
-          [%q( b), 1, 1, 0],
-          [%q(=end), 0, 0, 0],
-          [%q(if 1), 0, 2, 1],
-          [%q(  2), 2, 2, 1],
-          [%q(=begin), 0, 0, 0],
-          [%q(a), 0, 0, 0],
-          [%q( b), 1, 1, 0],
-          [%q(=end), 0, 2, 1],
-          [%q(  3), 2, 2, 1],
-          [%q(end), 0, 0, 0],
-        ]
-
-        assert_rows_with_correct_indents(input_with_correct_indents, assert_indent_level: true)
-      end
-
-      def test_heredoc_with_indent
-        if Gem::Version.new(RUBY_VERSION) < Gem::Version.new('2.7.0')
-          pend 'This test needs Ripper::Lexer#scan to take broken tokens'
-        end
-        input_with_correct_indents = [
-          [%q(<<~Q+<<~R), 0, 2, 1],
-          [%q(a), 2, 2, 1],
-          [%q(a), 2, 2, 1],
-          [%q(  b), 2, 2, 1],
-          [%q(  b), 2, 2, 1],
-          [%q(  Q), 0, 2, 1],
-          [%q(    c), 4, 4, 1],
-          [%q(    c), 4, 4, 1],
-          [%q(    R), 0, 0, 0],
-        ]
-
-        assert_rows_with_correct_indents(input_with_correct_indents, assert_indent_level: true)
-      end
-
-      def test_oneliner_def_in_multiple_lines
-        input_with_correct_indents = [
-          [%q(def a()=[), 0, 2, 1],
-          [%q(  1,), 2, 2, 1],
-          [%q(].), 0, 0, 0],
-          [%q(to_s), 0, 0, 0],
-        ]
-
-        assert_rows_with_correct_indents(input_with_correct_indents, assert_indent_level: true)
-      end
-
-      def test_broken_heredoc
-        input_with_correct_indents = [
-          [%q(def foo), 0, 2, 1],
-          [%q(  <<~Q), 2, 4, 2],
-          [%q(  Qend), 4, 4, 2],
-        ]
-
-        assert_rows_with_correct_indents(input_with_correct_indents, assert_indent_level: true)
-      end
-
-      def test_pasted_code_keep_base_indent_spaces
-        input_with_correct_indents = [
-          [%q(    def foo), 0, 6, 1],
-          [%q(        if bar), 6, 10, 2],
-          [%q(          [1), 10, 12, 3],
-          [%q(          ]+[["a), 10, 14, 4],
-          [%q(b" + `c), 0, 14, 4],
-          [%q(d` + /e), 0, 14, 4],
-          [%q(f/ + :"g), 0, 14, 4],
-          [%q(h".tap do), 0, 16, 5],
-          [%q(                1), 16, 16, 5],
-          [%q(              end), 14, 14, 4],
-          [%q(            ]), 12, 12, 3],
-          [%q(          ]), 10, 10, 2],
-          [%q(        end), 8, 6, 1],
-          [%q(    end), 4, 0, 0],
-        ]
-
-        assert_rows_with_correct_indents(input_with_correct_indents, assert_indent_level: true)
-      end
-
-      def test_pasted_code_keep_base_indent_spaces_with_heredoc
-        input_with_correct_indents = [
-          [%q(    def foo), 0, 6, 1],
-          [%q(        if bar), 6, 10, 2],
-          [%q(          [1), 10, 12, 3],
-          [%q(          ]+[["a), 10, 14, 4],
-          [%q(b" + <<~A + <<-B + <<C), 0, 16, 5],
-          [%q(                a#{), 16, 18, 6],
-          [%q(                1), 18, 18, 6],
-          [%q(                }), 16, 16, 5],
-          [%q(              A), 14, 16, 5],
-          [%q(                b#{), 16, 18, 6],
-          [%q(                1), 18, 18, 6],
-          [%q(                }), 16, 16, 5],
-          [%q(              B), 14, 0, 0],
-          [%q(c#{), 0, 2, 1],
-          [%q(1), 2, 2, 1],
-          [%q(}), 0, 0, 0],
-          [%q(C), 0, 14, 4],
-          [%q(            ]), 12, 12, 3],
-          [%q(          ]), 10, 10, 2],
-          [%q(        end), 8, 6, 1],
-          [%q(    end), 4, 0, 0],
-        ]
-
-        assert_rows_with_correct_indents(input_with_correct_indents, assert_indent_level: true)
-      end
-
-      def test_heredoc_keep_indent_spaces
-        (1..4).each do |indent|
-          row = Row.new(' ' * indent, nil, [4, indent].max, 2)
-          lines = ['def foo', '  <<~Q', row.content]
-          assert_row_indenting(lines, row)
-          assert_indent_level(lines, row.indent_level)
-        end
-      end
-
-      private
-
-      def assert_row_indenting(lines, row)
-        actual_current_line_spaces = calculate_indenting(lines, false)
-
-        error_message = <<~MSG
-          Incorrect spaces calculation for line:
-
-          ```
-        > #{lines.last}
-          ```
-
-          All lines:
-
-          ```
-          #{lines.join("\n")}
-          ```
-        MSG
-        assert_equal(row.current_line_spaces, actual_current_line_spaces, error_message)
-
-        error_message = <<~MSG
-          Incorrect spaces calculation for line after the current line:
-
-          ```
-          #{lines.last}
-        >
-          ```
-
-          All lines:
-
-          ```
-          #{lines.join("\n")}
-          ```
-        MSG
-        actual_next_line_spaces = calculate_indenting(lines, true)
-        assert_equal(row.new_line_spaces, actual_next_line_spaces, error_message)
-      end
-
-      def assert_rows_with_correct_indents(rows_with_spaces, assert_indent_level: false)
-        lines = []
-        rows_with_spaces.map do |row|
-          row = Row.new(*row)
-          lines << row.content
-          assert_row_indenting(lines, row)
-
-          if assert_indent_level
-            assert_indent_level(lines, row.indent_level)
-          end
-        end
-      end
-
-      def assert_indent_level(lines, expected)
-        code = lines.map { |l| "#{l}\n" }.join # code should end with "\n"
-        _tokens, opens, _ = @irb.scanner.check_code_state(code)
-        indent_level = @irb.scanner.calc_indent_level(opens)
-        error_message = "Calculated the wrong number of indent level for:\n #{lines.join("\n")}"
-        assert_equal(expected, indent_level, error_message)
-      end
-
-      def calculate_indenting(lines, add_new_line)
-        lines = lines + [""] if add_new_line
-        last_line_index = lines.length - 1
-        byte_pointer = lines.last.length
-
-        mock_io = MockIO_AutoIndent.new(lines, last_line_index, byte_pointer, add_new_line)
-        @irb.context.auto_indent_mode = true
-        @irb.context.io = mock_io
-        @irb.configure_io
-
-        mock_io.calculated_indent
-      end
-    end
-
-    class DynamicPromptTest < IrbIOConfigurationTest
-      def test_endless_range_at_end_of_line
-        input_with_prompt = [
-          ['001:0: :> ', %q(a = 3..)],
-          ['002:0: :> ', %q()],
-        ]
-
-        assert_dynamic_prompt(input_with_prompt)
-      end
-
-      def test_heredoc_with_embexpr
-        input_with_prompt = [
-          ['001:0:":* ', %q(<<A+%W[#{<<B)],
-          ['002:0:":* ', %q(#{<<C+%W[)],
-          ['003:0:":* ', %q(a)],
-          ['004:2:]:* ', %q(C)],
-          ['005:2:]:* ', %q(a)],
-          ['006:0:":* ', %q(]})],
-          ['007:0:":* ', %q(})],
-          ['008:0:":* ', %q(A)],
-          ['009:2:]:* ', %q(B)],
-          ['010:1:]:* ', %q(})],
-          ['011:0: :> ', %q(])],
-          ['012:0: :> ', %q()],
-        ]
-
-        assert_dynamic_prompt(input_with_prompt)
-      end
-
-      def test_heredoc_prompt_with_quotes
-        input_with_prompt = [
-          ["001:1:':* ", %q(<<~'A')],
-          ["002:1:':* ", %q(#{foobar})],
-          ["003:0: :> ", %q(A)],
-          ["004:1:`:* ", %q(<<~`A`)],
-          ["005:1:`:* ", %q(whoami)],
-          ["006:0: :> ", %q(A)],
-          ['007:1:":* ', %q(<<~"A")],
-          ['008:1:":* ', %q(foobar)],
-          ['009:0: :> ', %q(A)],
-        ]
-
-        assert_dynamic_prompt(input_with_prompt)
-      end
-
-      def test_backtick_method
-        input_with_prompt = [
-          ['001:0: :> ', %q(self.`(arg))],
-          ['002:0: :> ', %q()],
-          ['003:0: :> ', %q(def `(); end)],
-          ['004:0: :> ', %q()],
-        ]
-
-        assert_dynamic_prompt(input_with_prompt)
-      end
-
-      def test_dynamic_prompt
-        input_with_prompt = [
-          ['001:1: :* ', %q(def hoge)],
-          ['002:1: :* ', %q(  3)],
-          ['003:0: :> ', %q(end)],
-        ]
-
-        assert_dynamic_prompt(input_with_prompt)
-      end
-
-      def test_dynamic_prompt_with_double_newline_breaking_code
-        input_with_prompt = [
-          ['001:1: :* ', %q(if true)],
-          ['002:2: :* ', %q(%)],
-          ['003:1: :* ', %q(;end)],
-          ['004:1: :* ', %q(;hello)],
-          ['005:0: :> ', %q(end)],
-        ]
-
-        assert_dynamic_prompt(input_with_prompt)
-      end
-
-      def test_dynamic_prompt_with_multiline_literal
-        input_with_prompt = [
-          ['001:1: :* ', %q(if true)],
-          ['002:2:]:* ', %q(  %w[)],
-          ['003:2:]:* ', %q(  a)],
-          ['004:1: :* ', %q(  ])],
-          ['005:1: :* ', %q(  b)],
-          ['006:2:]:* ', %q(  %w[)],
-          ['007:2:]:* ', %q(  c)],
-          ['008:1: :* ', %q(  ])],
-          ['009:0: :> ', %q(end)],
-        ]
-
-        assert_dynamic_prompt(input_with_prompt)
-      end
-
-      def test_dynamic_prompt_with_blank_line
-        input_with_prompt = [
-          ['001:1:]:* ', %q(%w[)],
-          ['002:1:]:* ', %q()],
-          ['003:0: :> ', %q(])],
-        ]
-
-        assert_dynamic_prompt(input_with_prompt)
-      end
-
-      def assert_dynamic_prompt(input_with_prompt)
-        expected_prompt_list, lines = input_with_prompt.transpose
-        dynamic_prompt_executed = false
-        io = MockIO_DynamicPrompt.new(lines) do |prompt_list|
-          error_message = <<~EOM
-            Expected dynamic prompt:
-            #{expected_prompt_list.join("\n")}
-
-            Actual dynamic prompt:
-            #{prompt_list.join("\n")}
-          EOM
-          dynamic_prompt_executed = true
-          assert_equal(expected_prompt_list, prompt_list, error_message)
-        end
-        @irb.context.io = io
-        @irb.scanner.set_prompt do |ltype, indent, continue, line_no|
-          '%03d:%01d:%1s:%s ' % [line_no, indent, ltype, continue ? '*' : '>']
-        end
-        @irb.configure_io
-        assert dynamic_prompt_executed, "dynamic_prompt's assertions were not executed."
-      end
-    end
-
-    private
-
-    def build_irb
-      IRB.init_config(nil)
-      workspace = IRB::WorkSpace.new(TOPLEVEL_BINDING.dup)
-
-      IRB.conf[:VERBOSE] = false
-      IRB::Irb.new(workspace)
-    end
-  end
-end
diff --git a/test/irb/test_locale.rb b/test/irb/test_locale.rb
deleted file mode 100644
index 930a38834c1ab6..00000000000000
--- a/test/irb/test_locale.rb
+++ /dev/null
@@ -1,118 +0,0 @@
-require "irb"
-require "stringio"
-
-require_relative "helper"
-
-module TestIRB
-  class LocaleTestCase < TestCase
-    def test_initialize_with_en
-      locale = IRB::Locale.new("en_US.UTF-8")
-
-      assert_equal("en", locale.lang)
-      assert_equal("US", locale.territory)
-      assert_equal("UTF-8", locale.encoding.name)
-      assert_equal(nil, locale.modifier)
-    end
-
-    def test_initialize_with_ja
-      locale = IRB::Locale.new("ja_JP.UTF-8")
-
-      assert_equal("ja", locale.lang)
-      assert_equal("JP", locale.territory)
-      assert_equal("UTF-8", locale.encoding.name)
-      assert_equal(nil, locale.modifier)
-    end
-
-    def test_initialize_with_legacy_ja_encoding_ujis
-      original_stderr = $stderr
-      $stderr = StringIO.new
-
-      locale = IRB::Locale.new("ja_JP.ujis")
-
-      assert_equal("ja", locale.lang)
-      assert_equal("JP", locale.territory)
-      assert_equal(Encoding::EUC_JP, locale.encoding)
-      assert_equal(nil, locale.modifier)
-
-      assert_include $stderr.string, "ja_JP.ujis is obsolete. use ja_JP.EUC-JP"
-    ensure
-      $stderr = original_stderr
-    end
-
-    def test_initialize_with_legacy_ja_encoding_euc
-      original_stderr = $stderr
-      $stderr = StringIO.new
-
-      locale = IRB::Locale.new("ja_JP.euc")
-
-      assert_equal("ja", locale.lang)
-      assert_equal("JP", locale.territory)
-      assert_equal(Encoding::EUC_JP, locale.encoding)
-      assert_equal(nil, locale.modifier)
-
-      assert_include $stderr.string, "ja_JP.euc is obsolete. use ja_JP.EUC-JP"
-    ensure
-      $stderr = original_stderr
-    end
-
-    %w(IRB_LANG LC_MESSAGES LC_ALL LANG).each do |env_var|
-      define_method "test_initialize_with_#{env_var.downcase}" do
-        original_values = {
-          "IRB_LANG" => ENV["IRB_LANG"],
-          "LC_MESSAGES" => ENV["LC_MESSAGES"],
-          "LC_ALL" => ENV["LC_ALL"],
-          "LANG" => ENV["LANG"],
-        }
-
-        ENV["IRB_LANG"] = ENV["LC_MESSAGES"] = ENV["LC_ALL"] = ENV["LANG"] = nil
-        ENV[env_var] = "zh_TW.UTF-8"
-
-        locale = IRB::Locale.new
-
-        assert_equal("zh", locale.lang)
-        assert_equal("TW", locale.territory)
-        assert_equal("UTF-8", locale.encoding.name)
-        assert_equal(nil, locale.modifier)
-      ensure
-        original_values.each do |key, value|
-          ENV[key] = value
-        end
-      end
-    end
-
-    def test_load
-      # reset Locale's internal cache
-      IRB::Locale.class_variable_set(:@@loaded, [])
-      # Because error.rb files define the same class, loading them causes method redefinition warnings.
-      original_verbose = $VERBOSE
-      $VERBOSE = nil
-
-      jp_local = IRB::Locale.new("ja_JP.UTF-8")
-      jp_local.load("irb/error.rb")
-      msg = IRB::CantReturnToNormalMode.new.message
-      assert_equal("Normalモードに戻れません.", msg)
-
-      # reset Locale's internal cache
-      IRB::Locale.class_variable_set(:@@loaded, [])
-
-      en_local = IRB::Locale.new("en_US.UTF-8")
-      en_local.load("irb/error.rb")
-      msg = IRB::CantReturnToNormalMode.new.message
-      assert_equal("Can't return to normal mode.", msg)
-    ensure
-      # before turning warnings back on, load the error.rb file again to avoid warnings in other tests
-      IRB::Locale.new.load("irb/error.rb")
-      $VERBOSE = original_verbose
-    end
-
-    def test_find
-      jp_local = IRB::Locale.new("ja_JP.UTF-8")
-      path = jp_local.find("irb/error.rb")
-      assert_include(path, "/lib/irb/lc/ja/error.rb")
-
-      en_local = IRB::Locale.new("en_US.UTF-8")
-      path = en_local.find("irb/error.rb")
-      assert_include(path, "/lib/irb/lc/error.rb")
-    end
-  end
-end
diff --git a/test/irb/test_nesting_parser.rb b/test/irb/test_nesting_parser.rb
deleted file mode 100644
index ea3a23aaf5bb60..00000000000000
--- a/test/irb/test_nesting_parser.rb
+++ /dev/null
@@ -1,303 +0,0 @@
-# frozen_string_literal: false
-require 'irb'
-
-require_relative "helper"
-
-module TestIRB
-  class NestingParserTest < TestCase
-    def setup
-      save_encodings
-    end
-
-    def teardown
-      restore_encodings
-    end
-
-    def parse_by_line(code)
-      IRB::NestingParser.parse_by_line(IRB::RubyLex.ripper_lex_without_warning(code))
-    end
-
-    def test_open_tokens
-      code = <<~'EOS'
-        class A
-          def f
-            if true
-              tap do
-                {
-                  x: "
-                    #{p(1, 2, 3
-      EOS
-      opens = IRB::NestingParser.open_tokens(IRB::RubyLex.ripper_lex_without_warning(code))
-      assert_equal(%w[class def if do { " #{ (], opens.map(&:tok))
-    end
-
-    def test_parse_by_line
-      code = <<~EOS
-        (((((1+2
-        ).to_s())).tap do (((
-      EOS
-      _tokens, prev_opens, next_opens, min_depth = parse_by_line(code).last
-      assert_equal(%w[( ( ( ( (], prev_opens.map(&:tok))
-      assert_equal(%w[( ( do ( ( (], next_opens.map(&:tok))
-      assert_equal(2, min_depth)
-    end
-
-    def test_ruby_syntax
-      code = <<~'EOS'
-        class A
-          1 if 2
-          1 while 2
-          1 until 2
-          1 unless 2
-          1 rescue 2
-          begin; rescue; ensure; end
-          tap do; rescue; ensure; end
-          class B; end
-          module C; end
-          def f; end
-          def `; end
-          def f() = 1
-          %(); %w[]; %q(); %r{}; %i[]
-          "#{1}"; ''; /#{1}/; `#{1}`
-          :sym; :"sym"; :+; :`; :if
-          [1, 2, 3]
-          { x: 1, y: 2 }
-          (a, (*b, c), d), e = 1, 2, 3
-          ->(a){}; ->(a) do end
-          -> a = -> b = :do do end do end
-          if 1; elsif 2; else; end
-          unless 1; end
-          while 1; end
-          until 1; end
-          for i in j; end
-          case 1; when 2; end
-          puts(1, 2, 3)
-          loop{|i|}
-          loop do |i| end
-        end
-      EOS
-      line_results = parse_by_line(code)
-      assert_equal(code.lines.size, line_results.size)
-      class_open, *inner_line_results, class_close = line_results
-      assert_equal(['class'], class_open[2].map(&:tok))
-      inner_line_results.each {|result| assert_equal(['class'], result[2].map(&:tok)) }
-      assert_equal([], class_close[2].map(&:tok))
-    end
-
-    def test_multiline_string
-      code = <<~EOS
-        "
-        aaa
-        bbb
-        "
-        <<A
-        aaa
-        bbb
-        A
-      EOS
-      line_results = parse_by_line(code)
-      assert_equal(code.lines.size, line_results.size)
-      string_content_line, string_opens = line_results[1]
-      assert_equal("\naaa\nbbb\n", string_content_line.first.first.tok)
-      assert_equal("aaa\n", string_content_line.first.last)
-      assert_equal(['"'], string_opens.map(&:tok))
-      heredoc_content_line, heredoc_opens = line_results[6]
-      assert_equal("aaa\nbbb\n", heredoc_content_line.first.first.tok)
-      assert_equal("bbb\n", heredoc_content_line.first.last)
-      assert_equal(['<<A'], heredoc_opens.map(&:tok))
-      _line, _prev_opens, next_opens, _min_depth = line_results.last
-      assert_equal([], next_opens)
-    end
-
-    def test_backslash_continued_nested_symbol
-      code = <<~'EOS'
-        x = <<A, :\
-          heredoc #{
-            here
-          }
-        A
-        =begin
-        embdoc
-        =end
-        # comment
-
-        if # this is symbol :if
-        while
-      EOS
-      line_results = parse_by_line(code)
-      assert_equal(%w[: <<A #{], line_results[2][2].map(&:tok))
-      assert_equal(%w[while], line_results.last[2].map(&:tok))
-    end
-
-    def test_oneliner_def
-      code = <<~EOC
-        if true
-          # normal oneliner def
-          def f = 1
-          def f() = 1
-          def f(*) = 1
-          # keyword, backtick, op
-          def * = 1
-          def ` = 1
-          def if = 1
-          def *() = 1
-          def `() = 1
-          def if() = 1
-          # oneliner def with receiver
-          def a.* = 1
-          def $a.* = 1
-          def @a.` = 1
-          def A.` = 1
-          def ((a;b;c)).*() = 1
-          def ((a;b;c)).if() = 1
-          def ((a;b;c)).end() = 1
-          # multiline oneliner def
-          def f =
-          1
-          def f()
-          =
-          1
-          # oneliner def with comment and embdoc
-          def # comment
-        =begin
-        embdoc
-        =end
-            ((a;b;c))
-            . # comment
-        =begin
-        embdoc
-        =end
-            f (*) # comment
-        =begin
-        embdoc
-        =end
-          =
-          1
-          # nested oneliner def
-          def f(x = def f() = 1) = def f() = 1
-      EOC
-      _tokens, _prev_opens, next_opens, min_depth = parse_by_line(code).last
-      assert_equal(['if'], next_opens.map(&:tok))
-      assert_equal(1, min_depth)
-    end
-
-    def test_heredoc_embexpr
-      code = <<~'EOS'
-        <<A+<<B+<<C+(<<D+(<<E)
-          #{
-            <<~F+"#{<<~G}
-            #{
-              here
-            }
-            F
-            G
-            "
-          }
-        A
-        B
-        C
-        D
-        E
-        )
-      EOS
-      line_results = parse_by_line(code)
-      last_opens = line_results.last[-2]
-      assert_equal([], last_opens)
-      _tokens, _prev_opens, next_opens, _min_depth = line_results[4]
-      assert_equal(%w[( <<E <<D <<C <<B <<A #{ " <<~G <<~F #{], next_opens.map(&:tok))
-    end
-
-    def test_for_in
-      code = <<~EOS
-        for i in j
-          here
-        end
-        for i in j do
-          here
-        end
-        for i in
-          j do
-          here
-        end
-        for
-          # comment
-          i in j do
-          here
-        end
-        for (a;b;c).d in (a;b;c) do
-          here
-        end
-        for i in :in + :do do
-          here
-        end
-        for i in -> do end do
-          here
-        end
-      EOS
-      line_results = parse_by_line(code).select { |tokens,| tokens.map(&:last).include?('here') }
-      assert_equal(7, line_results.size)
-      line_results.each do |_tokens, _prev_opens, next_opens, _min_depth|
-        assert_equal(['for'], next_opens.map(&:tok))
-      end
-    end
-
-    def test_while_until
-      base_code = <<~'EOS'
-        while_or_until true
-          here
-        end
-        while_or_until a < c
-          here
-        end
-        while_or_until true do
-          here
-        end
-        while_or_until
-          # comment
-          (a + b) <
-          # comment
-          c do
-          here
-        end
-        while_or_until :\
-          do do
-          here
-        end
-        while_or_until def do; end == :do do
-          here
-        end
-        while_or_until -> do end do
-          here
-        end
-      EOS
-      %w[while until].each do |keyword|
-        code = base_code.gsub('while_or_until', keyword)
-        line_results = parse_by_line(code).select { |tokens,| tokens.map(&:last).include?('here') }
-        assert_equal(7, line_results.size)
-        line_results.each do |_tokens, _prev_opens, next_opens, _min_depth|
-          assert_equal([keyword], next_opens.map(&:tok) )
-        end
-      end
-    end
-
-    def test_case_in
-      if Gem::Version.new(RUBY_VERSION) < Gem::Version.new('2.7.0')
-        pend 'This test requires ruby version that supports case-in syntax'
-      end
-      code = <<~EOS
-        case 1
-        in 1
-          here
-        in
-          2
-          here
-        end
-      EOS
-      line_results = parse_by_line(code).select { |tokens,| tokens.map(&:last).include?('here') }
-      assert_equal(2, line_results.size)
-      line_results.each do |_tokens, _prev_opens, next_opens, _min_depth|
-        assert_equal(['in'], next_opens.map(&:tok))
-      end
-    end
-  end
-end
diff --git a/test/irb/test_option.rb b/test/irb/test_option.rb
deleted file mode 100644
index fec31f384f96fe..00000000000000
--- a/test/irb/test_option.rb
+++ /dev/null
@@ -1,13 +0,0 @@
-# frozen_string_literal: false
-require_relative "helper"
-
-module TestIRB
-  class OptionTest < TestCase
-    def test_end_of_option
-      bug4117 = '[ruby-core:33574]'
-      bundle_exec = ENV.key?('BUNDLE_GEMFILE') ? ['-rbundler/setup'] : []
-      status = assert_in_out_err(bundle_exec + %w[-W0 -rirb -e IRB.start(__FILE__) -- -f --], "", //, [], bug4117)
-      assert(status.success?, bug4117)
-    end
-  end
-end
diff --git a/test/irb/test_raise_no_backtrace_exception.rb b/test/irb/test_raise_no_backtrace_exception.rb
deleted file mode 100644
index 929577ad8e1060..00000000000000
--- a/test/irb/test_raise_no_backtrace_exception.rb
+++ /dev/null
@@ -1,56 +0,0 @@
-# frozen_string_literal: false
-require "tmpdir"
-
-require_relative "helper"
-
-module TestIRB
-  class RaiseNoBacktraceExceptionTest < TestCase
-    def test_raise_exception
-      bundle_exec = ENV.key?('BUNDLE_GEMFILE') ? ['-rbundler/setup'] : []
-      assert_in_out_err(bundle_exec + %w[-rirb -W0 -e IRB.start(__FILE__) -- -f --], <<-IRB, /Exception: foo/, [])
-      e = Exception.new("foo")
-      puts e.inspect
-      def e.backtrace; nil; end
-      raise e
-IRB
-    end
-
-    def test_raise_exception_with_invalid_byte_sequence
-      pend if RUBY_ENGINE == 'truffleruby' || /mswin|mingw/ =~ RUBY_PLATFORM
-      bundle_exec = ENV.key?('BUNDLE_GEMFILE') ? ['-rbundler/setup'] : []
-      assert_in_out_err(bundle_exec + %w[-rirb -W0 -e IRB.start(__FILE__) -- -f --], <<~IRB, /A\\xF3B \(StandardError\)/, [])
-        raise StandardError, "A\\xf3B"
-      IRB
-    end
-
-    def test_raise_exception_with_different_encoding_containing_invalid_byte_sequence
-      backup_home = ENV["HOME"]
-      Dir.mktmpdir("test_irb_raise_no_backtrace_exception_#{$$}") do |tmpdir|
-        ENV["HOME"] = tmpdir
-
-        bundle_exec = ENV.key?('BUNDLE_GEMFILE') ? ['-rbundler/setup'] : []
-        File.open("#{tmpdir}/euc.rb", 'w') do |f|
-          f.write(<<~EOF)
-            # encoding: euc-jp
-
-            def raise_euc_with_invalid_byte_sequence
-              raise "\xA4\xA2\\xFF"
-            end
-          EOF
-        end
-        env = {}
-        %w(LC_MESSAGES LC_ALL LC_CTYPE LANG).each {|n| env[n] = "ja_JP.UTF-8" }
-        # TruffleRuby warns when the locale does not exist
-        env['TRUFFLERUBYOPT'] = "#{ENV['TRUFFLERUBYOPT']} --log.level=SEVERE" if RUBY_ENGINE == 'truffleruby'
-        args = [env] + bundle_exec + %W[-rirb -C #{tmpdir} -W0 -e IRB.start(__FILE__) -- -f --]
-        error = /`raise_euc_with_invalid_byte_sequence': あ\\xFF \(RuntimeError\)/
-        assert_in_out_err(args, <<~IRB, error, [], encoding: "UTF-8")
-          require_relative 'euc'
-          raise_euc_with_invalid_byte_sequence
-        IRB
-      end
-    ensure
-      ENV["HOME"] = backup_home
-    end
-  end
-end
diff --git a/test/irb/test_ruby_lex.rb b/test/irb/test_ruby_lex.rb
deleted file mode 100644
index 09344e1b0efed9..00000000000000
--- a/test/irb/test_ruby_lex.rb
+++ /dev/null
@@ -1,256 +0,0 @@
-# frozen_string_literal: true
-require "irb"
-
-require_relative "helper"
-
-module TestIRB
-  class RubyLexTest < TestCase
-    def setup
-      save_encodings
-    end
-
-    def teardown
-      restore_encodings
-    end
-
-    def test_interpolate_token_with_heredoc_and_unclosed_embexpr
-      code = <<~'EOC'
-        ①+<<A-②
-        #{③*<<B/④
-        #{⑤&<<C|⑥
-      EOC
-      ripper_tokens = Ripper.tokenize(code)
-      rubylex_tokens = IRB::RubyLex.ripper_lex_without_warning(code)
-      # Assert no missing part
-      assert_equal(code, rubylex_tokens.map(&:tok).join)
-      # Assert ripper tokens are not removed
-      ripper_tokens.each do |tok|
-        assert(rubylex_tokens.any? { |t| t.tok == tok && t.tok != :on_ignored_by_ripper })
-      end
-      # Assert interpolated token position
-      rubylex_tokens.each do |t|
-        row, col = t.pos
-        assert_equal t.tok, code.lines[row - 1].byteslice(col, t.tok.bytesize)
-      end
-    end
-
-    def test_local_variables_dependent_code
-      lines = ["a /1#/ do", "2"]
-      assert_indent_level(lines, 1)
-      assert_code_block_open(lines, true)
-      assert_indent_level(lines, 0, local_variables: ['a'])
-      assert_code_block_open(lines, false, local_variables: ['a'])
-    end
-
-    def test_literal_ends_with_space
-      assert_code_block_open(['% a'], true)
-      assert_code_block_open(['% a '], false)
-    end
-
-    def test_literal_ends_with_newline
-      assert_code_block_open(['%'], true)
-      assert_code_block_open(['%', ''], false)
-    end
-
-    def test_should_continue
-      assert_should_continue(['a'], false)
-      assert_should_continue(['/a/'], false)
-      assert_should_continue(['a;'], false)
-      assert_should_continue(['<<A', 'A'], false)
-      assert_should_continue(['a...'], false)
-      assert_should_continue(['a\\'], true)
-      assert_should_continue(['a.'], true)
-      assert_should_continue(['a+'], true)
-      assert_should_continue(['a; #comment', '', '=begin', 'embdoc', '=end', ''], false)
-      assert_should_continue(['a+ #comment', '', '=begin', 'embdoc', '=end', ''], true)
-    end
-
-    def test_code_block_open_with_should_continue
-      # syntax ok
-      assert_code_block_open(['a'], false) # continue: false
-      assert_code_block_open(['a\\'], true) # continue: true
-
-      # recoverable syntax error code is not terminated
-      assert_code_block_open(['a+'], true)
-
-      # unrecoverable syntax error code is terminated
-      assert_code_block_open(['.; a+'], false)
-
-      # other syntax error that failed to determine if it is recoverable or not
-      assert_code_block_open(['@; a'], false)
-      assert_code_block_open(['@; a+'], true)
-      assert_code_block_open(['@; (a'], true)
-    end
-
-    def test_broken_percent_literal
-      tokens = IRB::RubyLex.ripper_lex_without_warning('%wwww')
-      pos_to_index = {}
-      tokens.each_with_index { |t, i|
-        assert_nil(pos_to_index[t.pos], "There is already another token in the position of #{t.inspect}.")
-        pos_to_index[t.pos] = i
-      }
-    end
-
-    def test_broken_percent_literal_in_method
-      tokens = IRB::RubyLex.ripper_lex_without_warning(<<~EOC.chomp)
-        def foo
-          %wwww
-        end
-      EOC
-      pos_to_index = {}
-      tokens.each_with_index { |t, i|
-        assert_nil(pos_to_index[t.pos], "There is already another token in the position of #{t.inspect}.")
-        pos_to_index[t.pos] = i
-      }
-    end
-
-    def test_unterminated_code
-      ['do', '<<A'].each do |code|
-        tokens = IRB::RubyLex.ripper_lex_without_warning(code)
-        assert_equal(code, tokens.map(&:tok).join, "Cannot reconstruct code from tokens")
-        error_tokens = tokens.map(&:event).grep(/error/)
-        assert_empty(error_tokens, 'Error tokens must be ignored if there is corresponding non-error token')
-      end
-    end
-
-    def test_unterminated_heredoc_string_literal
-      ['<<A;<<B', "<<A;<<B\n", "%W[\#{<<A;<<B", "%W[\#{<<A;<<B\n"].each do |code|
-        tokens = IRB::RubyLex.ripper_lex_without_warning(code)
-        string_literal = IRB::NestingParser.open_tokens(tokens).last
-        assert_equal('<<A', string_literal&.tok)
-      end
-    end
-
-    def test_indent_level_with_heredoc_and_embdoc
-      reference_code = <<~EOC.chomp
-        if true
-          hello
-          p(
-          )
-      EOC
-      code_with_heredoc = <<~EOC.chomp
-        if true
-          <<~A
-          A
-          p(
-          )
-      EOC
-      code_with_embdoc = <<~EOC.chomp
-        if true
-        =begin
-        =end
-          p(
-          )
-      EOC
-      expected = 1
-      assert_indent_level(reference_code.lines, expected)
-      assert_indent_level(code_with_heredoc.lines, expected)
-      assert_indent_level(code_with_embdoc.lines, expected)
-    end
-
-    def test_assignment_expression
-      context = build_context
-      ruby_lex = IRB::RubyLex.new(context)
-
-      [
-        "foo = bar",
-        "@foo = bar",
-        "$foo = bar",
-        "@@foo = bar",
-        "::Foo = bar",
-        "a::Foo = bar",
-        "Foo = bar",
-        "foo.bar = 1",
-        "foo[1] = bar",
-        "foo += bar",
-        "foo -= bar",
-        "foo ||= bar",
-        "foo &&= bar",
-        "foo, bar = 1, 2",
-        "foo.bar=(1)",
-        "foo; foo = bar",
-        "foo; foo = bar; ;\n ;",
-        "foo\nfoo = bar",
-      ].each do |exp|
-        assert(
-          ruby_lex.assignment_expression?(exp),
-          "#{exp.inspect}: should be an assignment expression"
-        )
-      end
-
-      [
-        "foo",
-        "foo.bar",
-        "foo[0]",
-        "foo = bar; foo",
-        "foo = bar\nfoo",
-      ].each do |exp|
-        refute(
-          ruby_lex.assignment_expression?(exp),
-          "#{exp.inspect}: should not be an assignment expression"
-        )
-      end
-    end
-
-    def test_assignment_expression_with_local_variable
-      context = build_context
-      ruby_lex = IRB::RubyLex.new(context)
-      code = "a /1;x=1#/"
-      refute(ruby_lex.assignment_expression?(code), "#{code}: should not be an assignment expression")
-      context.workspace.binding.eval('a = 1')
-      assert(ruby_lex.assignment_expression?(code), "#{code}: should be an assignment expression")
-      refute(ruby_lex.assignment_expression?(""), "empty code should not be an assignment expression")
-    end
-
-    def test_initialising_the_old_top_level_ruby_lex
-      assert_in_out_err(["--disable-gems", "-W:deprecated"], <<~RUBY, [], /warning: constant ::RubyLex is deprecated/)
-        require "irb"
-        ::RubyLex.new(nil)
-      RUBY
-    end
-
-    private
-
-    def build_context(local_variables = nil)
-      IRB.init_config(nil)
-      workspace = IRB::WorkSpace.new(TOPLEVEL_BINDING.dup)
-
-      if local_variables
-        local_variables.each do |n|
-          workspace.binding.local_variable_set(n, nil)
-        end
-      end
-
-      IRB.conf[:VERBOSE] = false
-      IRB::Context.new(nil, workspace)
-    end
-
-    def assert_indent_level(lines, expected, local_variables: [])
-      indent_level, _continue, _code_block_open = check_state(lines, local_variables: local_variables)
-      error_message = "Calculated the wrong number of indent level for:\n #{lines.join("\n")}"
-      assert_equal(expected, indent_level, error_message)
-    end
-
-    def assert_should_continue(lines, expected, local_variables: [])
-      _indent_level, continue, _code_block_open = check_state(lines, local_variables: local_variables)
-      error_message = "Wrong result of should_continue for:\n #{lines.join("\n")}"
-      assert_equal(expected, continue, error_message)
-    end
-
-    def assert_code_block_open(lines, expected, local_variables: [])
-      _indent_level, _continue, code_block_open = check_state(lines, local_variables: local_variables)
-      error_message = "Wrong result of code_block_open for:\n #{lines.join("\n")}"
-      assert_equal(expected, code_block_open, error_message)
-    end
-
-    def check_state(lines, local_variables: [])
-      context = build_context(local_variables)
-      code = lines.map { |l| "#{l}\n" }.join # code should end with "\n"
-      ruby_lex = IRB::RubyLex.new(context)
-      tokens, opens, terminated = ruby_lex.check_code_state(code)
-      indent_level = ruby_lex.calc_indent_level(opens)
-      continue = ruby_lex.should_continue?(tokens)
-      [indent_level, continue, !terminated]
-    end
-  end
-end
diff --git a/test/irb/test_workspace.rb b/test/irb/test_workspace.rb
deleted file mode 100644
index ff17b1a22ced4b..00000000000000
--- a/test/irb/test_workspace.rb
+++ /dev/null
@@ -1,128 +0,0 @@
-# frozen_string_literal: false
-require 'tempfile'
-require 'rubygems'
-require 'irb'
-require 'irb/workspace'
-require 'irb/color'
-
-require_relative "helper"
-
-module TestIRB
-  class WorkSpaceTest < TestCase
-    def test_code_around_binding
-      IRB.conf[:USE_COLORIZE] = false
-      Tempfile.create('irb') do |f|
-        code = <<~RUBY
-          # 1
-          # 2
-          IRB::WorkSpace.new(binding) # 3
-          # 4
-          # 5
-        RUBY
-        f.print(code)
-        f.close
-
-        workspace = eval(code, binding, f.path)
-        assert_equal(<<~EOS, without_term { workspace.code_around_binding })
-
-          From: #{f.path} @ line 3 :
-
-              1: # 1
-              2: # 2
-           => 3: IRB::WorkSpace.new(binding) # 3
-              4: # 4
-              5: # 5
-
-        EOS
-      end
-    ensure
-      IRB.conf.delete(:USE_COLORIZE)
-    end
-
-    def test_code_around_binding_with_existing_unreadable_file
-      pend 'chmod cannot make file unreadable on windows' if windows?
-      pend 'skipped in root privilege' if Process.uid == 0
-
-      Tempfile.create('irb') do |f|
-        code = "IRB::WorkSpace.new(binding)\n"
-        f.print(code)
-        f.close
-
-        File.chmod(0, f.path)
-
-        workspace = eval(code, binding, f.path)
-        assert_equal(nil, workspace.code_around_binding)
-      end
-    end
-
-    def test_code_around_binding_with_script_lines__
-      IRB.conf[:USE_COLORIZE] = false
-      with_script_lines do |script_lines|
-        Tempfile.create('irb') do |f|
-          code = "IRB::WorkSpace.new(binding)\n"
-          script_lines[f.path] = code.split(/^/)
-
-          workspace = eval(code, binding, f.path)
-          assert_equal(<<~EOS, without_term { workspace.code_around_binding })
-
-            From: #{f.path} @ line 1 :
-
-             => 1: IRB::WorkSpace.new(binding)
-
-          EOS
-        end
-      end
-    ensure
-      IRB.conf.delete(:USE_COLORIZE)
-    end
-
-    def test_code_around_binding_on_irb
-      workspace = eval("IRB::WorkSpace.new(binding)", binding, "(irb)")
-      assert_equal(nil, workspace.code_around_binding)
-    end
-
-
-    def test_toplevel_binding_local_variables
-      bug17623 = '[ruby-core:102468]'
-      bundle_exec = ENV.key?('BUNDLE_GEMFILE') ? ['-rbundler/setup'] : []
-      top_srcdir = "#{__dir__}/../.."
-      irb_path = nil
-      %w[exe libexec].find do |dir|
-        irb_path = "#{top_srcdir}/#{dir}/irb"
-        File.exist?(irb_path)
-      end or omit 'irb command not found'
-      assert_in_out_err(bundle_exec + ['-W0', "-C#{top_srcdir}", '-e', <<~RUBY , '--', '-f', '--'], 'binding.local_variables', /\[:_\]/, [], bug17623)
-        version = 'xyz' # typical rubygems loading file
-        load('#{irb_path}')
-      RUBY
-    end
-
-    private
-
-    def with_script_lines
-      script_lines = nil
-      debug_lines = {}
-      Object.class_eval do
-        if defined?(SCRIPT_LINES__)
-          script_lines = SCRIPT_LINES__
-          remove_const :SCRIPT_LINES__
-        end
-        const_set(:SCRIPT_LINES__, debug_lines)
-      end
-      yield debug_lines
-    ensure
-      Object.class_eval do
-        remove_const :SCRIPT_LINES__
-        const_set(:SCRIPT_LINES__, script_lines) if script_lines
-      end
-    end
-
-    def without_term
-      env = ENV.to_h.dup
-      ENV.delete('TERM')
-      yield
-    ensure
-      ENV.replace(env)
-    end
-  end
-end
diff --git a/test/irb/yamatanooroti/test_rendering.rb b/test/irb/yamatanooroti/test_rendering.rb
deleted file mode 100644
index 279eff6515a144..00000000000000
--- a/test/irb/yamatanooroti/test_rendering.rb
+++ /dev/null
@@ -1,370 +0,0 @@
-require 'irb'
-
-begin
-  require 'yamatanooroti'
-rescue LoadError, NameError
-  # On Ruby repository, this test suite doesn't run because Ruby repo doesn't
-  # have the yamatanooroti gem.
-  return
-end
-
-class IRB::RenderingTest < Yamatanooroti::TestCase
-  def setup
-    @pwd = Dir.pwd
-    suffix = '%010d' % Random.rand(0..65535)
-    @tmpdir = File.join(File.expand_path(Dir.tmpdir), "test_irb_#{$$}_#{suffix}")
-    begin
-      Dir.mkdir(@tmpdir)
-    rescue Errno::EEXIST
-      FileUtils.rm_rf(@tmpdir)
-      Dir.mkdir(@tmpdir)
-    end
-    @irbrc_backup = ENV['IRBRC']
-    @irbrc_file = ENV['IRBRC'] = File.join(@tmpdir, 'temporaty_irbrc')
-    File.unlink(@irbrc_file) if File.exist?(@irbrc_file)
-  end
-
-  def teardown
-    FileUtils.rm_rf(@tmpdir)
-    ENV['IRBRC'] = @irbrc_backup
-    ENV.delete('RELINE_TEST_PROMPT') if ENV['RELINE_TEST_PROMPT']
-  end
-
-  def test_launch
-    write_irbrc <<~'LINES'
-      puts 'start IRB'
-    LINES
-    start_terminal(25, 80, %W{ruby -I#{@pwd}/lib #{@pwd}/exe/irb}, startup_message: 'start IRB')
-    write(<<~EOC)
-      'Hello, World!'
-    EOC
-    close
-    assert_screen(<<~EOC)
-      start IRB
-      irb(main):001> 'Hello, World!'
-      => "Hello, World!"
-      irb(main):002>
-    EOC
-  end
-
-  def test_nomultiline
-    write_irbrc <<~'LINES'
-      puts 'start IRB'
-    LINES
-    start_terminal(25, 80, %W{ruby -I#{@pwd}/lib #{@pwd}/exe/irb --nomultiline}, startup_message: 'start IRB')
-    write(<<~EOC)
-      if true
-      if false
-      a = "hello
-      world"
-      puts a
-      end
-      end
-    EOC
-    close
-    assert_screen(<<~EOC)
-      start IRB
-      irb(main):001> if true
-      irb(main):002*   if false
-      irb(main):003*     a = "hello
-      irb(main):004" world"
-      irb(main):005*     puts a
-      irb(main):006*     end
-      irb(main):007*   end
-      => nil
-      irb(main):008>
-    EOC
-  end
-
-  def test_multiline_paste
-    write_irbrc <<~'LINES'
-      puts 'start IRB'
-    LINES
-    start_terminal(25, 80, %W{ruby -I#{@pwd}/lib #{@pwd}/exe/irb}, startup_message: 'start IRB')
-    write(<<~EOC)
-      class A
-        def inspect; '#<A>'; end
-        def a; self; end
-        def b; true; end
-      end
-
-      a = A.new
-
-      a
-       .a
-       .b
-    EOC
-    close
-    assert_screen(<<~EOC)
-      start IRB
-      irb(main):001* class A
-      irb(main):002*   def inspect; '#<A>'; end
-      irb(main):003*   def a; self; end
-      irb(main):004*   def b; true; end
-      irb(main):005> end
-      => :b
-      irb(main):006>
-      irb(main):007> a = A.new
-      => #<A>
-      irb(main):008>
-      irb(main):009> a
-      irb(main):010>  .a
-      irb(main):011> .b
-      => true
-      irb(main):012>
-    EOC
-  end
-
-  def test_evaluate_each_toplevel_statement_by_multiline_paste
-    write_irbrc <<~'LINES'
-      puts 'start IRB'
-    LINES
-    start_terminal(40, 80, %W{ruby -I#{@pwd}/lib #{@pwd}/exe/irb}, startup_message: 'start IRB')
-    write(<<~EOC)
-      class A
-        def inspect; '#<A>'; end
-        def b; self; end
-        def c; true; end
-      end
-
-      a = A.new
-
-      a
-        .b
-        # aaa
-        .c
-
-      (a)
-        &.b()
-
-
-      class A def b; self; end; def c; true; end; end;
-      a = A.new
-      a
-        .b
-        # aaa
-        .c
-      (a)
-        &.b()
-    EOC
-    close
-    assert_screen(<<~EOC)
-      start IRB
-      irb(main):001* class A
-      irb(main):002*   def inspect; '#<A>'; end
-      irb(main):003*   def b; self; end
-      irb(main):004*   def c; true; end
-      irb(main):005> end
-      => :c
-      irb(main):006>
-      irb(main):007> a = A.new
-      => #<A>
-      irb(main):008>
-      irb(main):009> a
-      irb(main):010>   .b
-      irb(main):011>   # aaa
-      irb(main):012>   .c
-      => true
-      irb(main):013>
-      irb(main):014> (a)
-      irb(main):015>   &.b()
-      => #<A>
-      irb(main):016>
-      irb(main):017>
-      irb(main):018> class A def b; self; end; def c; true; end; end;
-      irb(main):019> a = A.new
-      => #<A>
-      irb(main):020> a
-      irb(main):021>   .b
-      irb(main):022>   # aaa
-      irb(main):023>   .c
-      => true
-      irb(main):024> (a)
-      irb(main):025> &.b()
-      => #<A>
-      irb(main):026>
-    EOC
-  end
-
-  def test_symbol_with_backtick
-    write_irbrc <<~'LINES'
-      puts 'start IRB'
-    LINES
-    start_terminal(40, 80, %W{ruby -I#{@pwd}/lib #{@pwd}/exe/irb}, startup_message: 'start IRB')
-    write(<<~EOC)
-      :`
-    EOC
-    close
-    assert_screen(<<~EOC)
-      start IRB
-      irb(main):001> :`
-      => :`
-      irb(main):002>
-    EOC
-  end
-
-  def test_autocomplete_with_showdoc_in_gaps_on_narrow_screen_right
-    omit if Gem::Version.new(RUBY_VERSION) < Gem::Version.new('3.1')
-    write_irbrc <<~'LINES'
-      IRB.conf[:PROMPT][:MY_PROMPT] = {
-        :PROMPT_I => "%03n> ",
-        :PROMPT_S => "%03n> ",
-        :PROMPT_C => "%03n> "
-      }
-      IRB.conf[:PROMPT_MODE] = :MY_PROMPT
-      puts 'start IRB'
-    LINES
-    start_terminal(4, 19, %W{ruby -I/home/aycabta/ruby/reline/lib -I#{@pwd}/lib #{@pwd}/exe/irb}, startup_message: 'start IRB')
-    write("Str\C-i")
-    close
-
-    # This is because on macOS we display different shortcut for displaying the full doc
-    # 'O' is for 'Option' and 'A' is for 'Alt'
-    if RUBY_PLATFORM =~ /darwin/
-      assert_screen(<<~EOC)
-        start IRB
-        001> String
-             StringPress O
-             StructString
-      EOC
-    else
-      assert_screen(<<~EOC)
-        start IRB
-        001> String
-             StringPress A
-             StructString
-      EOC
-    end
-  end
-
-  def test_autocomplete_with_showdoc_in_gaps_on_narrow_screen_left
-    omit if Gem::Version.new(RUBY_VERSION) < Gem::Version.new('3.1')
-    write_irbrc <<~'LINES'
-      IRB.conf[:PROMPT][:MY_PROMPT] = {
-        :PROMPT_I => "%03n> ",
-        :PROMPT_S => "%03n> ",
-        :PROMPT_C => "%03n> "
-      }
-      IRB.conf[:PROMPT_MODE] = :MY_PROMPT
-      puts 'start IRB'
-    LINES
-    start_terminal(4, 12, %W{ruby -I#{@pwd}/lib #{@pwd}/exe/irb}, startup_message: 'start IRB')
-    write("Str\C-i")
-    close
-    assert_screen(<<~EOC)
-      start IRB
-      001> String
-      PressString
-      StrinStruct
-    EOC
-  end
-
-  def test_assignment_expression_truncate
-    write_irbrc <<~'LINES'
-      puts 'start IRB'
-    LINES
-    start_terminal(40, 80, %W{ruby -I#{@pwd}/lib #{@pwd}/exe/irb}, startup_message: 'start IRB')
-    # Assignment expression code that turns into non-assignment expression after evaluation
-    code = "a /'/i if false; a=1; x=1000.times.to_a#'.size"
-    write(code + "\n")
-    close
-    assert_screen(<<~EOC)
-      start IRB
-      irb(main):001> #{code}
-      =>
-      [0,
-      ...
-      irb(main):002>
-    EOC
-  end
-
-  def test_ctrl_c_is_handled
-    write_irbrc <<~'LINES'
-      puts 'start IRB'
-    LINES
-    start_terminal(40, 80, %W{ruby -I#{@pwd}/lib #{@pwd}/exe/irb}, startup_message: 'start IRB')
-    # Assignment expression code that turns into non-assignment expression after evaluation
-    write("\C-c")
-    close
-    assert_screen(<<~EOC)
-      start IRB
-      irb(main):001>
-      ^C
-      irb(main):001>
-    EOC
-  end
-
-  def test_show_cmds_with_pager_can_quit_with_ctrl_c
-    write_irbrc <<~'LINES'
-      puts 'start IRB'
-    LINES
-    start_terminal(40, 80, %W{ruby -I#{@pwd}/lib #{@pwd}/exe/irb}, startup_message: 'start IRB')
-    write("show_cmds\n")
-    write("G") # move to the end of the screen
-    write("\C-c") # quit pager
-    write("'foo' + 'bar'\n") # eval something to make sure IRB resumes
-    close
-
-    screen = result.join("\n").sub(/\n*\z/, "\n")
-    # IRB::Abort should be rescued
-    assert_not_match(/IRB::Abort/, screen)
-    # IRB should resume
-    assert_match(/foobar/, screen)
-  end
-
-  def test_pager_page_content_pages_output_when_it_does_not_fit_in_the_screen_because_of_total_length
-    write_irbrc <<~'LINES'
-      puts 'start IRB'
-      require "irb/pager"
-    LINES
-    start_terminal(10, 80, %W{ruby -I#{@pwd}/lib #{@pwd}/exe/irb}, startup_message: 'start IRB')
-    write("IRB::Pager.page_content('a' * (80 * 8))\n")
-    write("'foo' + 'bar'\n") # eval something to make sure IRB resumes
-    close
-
-    screen = result.join("\n").sub(/\n*\z/, "\n")
-    assert_match(/a{80}/, screen)
-    # because pager is invoked, foobar will not be evaluated
-    assert_not_match(/foobar/, screen)
-  end
-
-  def test_pager_page_content_pages_output_when_it_does_not_fit_in_the_screen_because_of_screen_height
-    write_irbrc <<~'LINES'
-      puts 'start IRB'
-      require "irb/pager"
-    LINES
-    start_terminal(10, 80, %W{ruby -I#{@pwd}/lib #{@pwd}/exe/irb}, startup_message: 'start IRB')
-    write("IRB::Pager.page_content('a\n' * 8)\n")
-    write("'foo' + 'bar'\n") # eval something to make sure IRB resumes
-    close
-
-    screen = result.join("\n").sub(/\n*\z/, "\n")
-    assert_match(/(a\n){8}/, screen)
-    # because pager is invoked, foobar will not be evaluated
-    assert_not_match(/foobar/, screen)
-  end
-
-  def test_pager_page_content_doesnt_page_output_when_it_fits_in_the_screen
-    write_irbrc <<~'LINES'
-      puts 'start IRB'
-      require "irb/pager"
-    LINES
-    start_terminal(10, 80, %W{ruby -I#{@pwd}/lib #{@pwd}/exe/irb}, startup_message: 'start IRB')
-    write("IRB::Pager.page_content('a' * (80 * 7))\n")
-    write("'foo' + 'bar'\n") # eval something to make sure IRB resumes
-    close
-
-    screen = result.join("\n").sub(/\n*\z/, "\n")
-    assert_match(/a{80}/, screen)
-    # because pager is not invoked, foobar will be evaluated
-    assert_match(/foobar/, screen)
-  end
-
-  private
-
-  def write_irbrc(content)
-    File.open(@irbrc_file, 'w') do |f|
-      f.write content
-    end
-  end
-end
diff --git a/test/json/fixtures/fail4.json b/test/json/fixtures/fail4.json
deleted file mode 100644
index 9de168bf34e2e3..00000000000000
--- a/test/json/fixtures/fail4.json
+++ /dev/null
@@ -1 +0,0 @@
-["extra comma",]
\ No newline at end of file
diff --git a/test/json/fixtures/fail9.json b/test/json/fixtures/fail9.json
deleted file mode 100644
index 5815574f363e58..00000000000000
--- a/test/json/fixtures/fail9.json
+++ /dev/null
@@ -1 +0,0 @@
-{"Extra comma": true,}
\ No newline at end of file
diff --git a/test/json/json_addition_test.rb b/test/json/json_addition_test.rb
index 2877bef7d8e16d..4d8d1868732ee2 100644
--- a/test/json/json_addition_test.rb
+++ b/test/json/json_addition_test.rb
@@ -1,4 +1,4 @@
-#frozen_string_literal: false
+# frozen_string_literal: true
 require_relative 'test_helper'
 require 'json/add/core'
 require 'json/add/complex'
@@ -44,10 +44,6 @@ def to_json(*args)
   end
 
   class B
-    def self.json_creatable?
-      false
-    end
-
     def to_json(*args)
       {
         'json_class'  => self.class.name,
@@ -56,10 +52,6 @@ def to_json(*args)
   end
 
   class C
-    def self.json_creatable?
-      false
-    end
-
     def to_json(*args)
       {
         'json_class'  => 'JSONAdditionTest::Nix',
@@ -69,7 +61,6 @@ def to_json(*args)
 
   def test_extended_json
     a = A.new(666)
-    assert A.json_creatable?
     json = generate(a)
     a_again = parse(json, :create_additions => true)
     assert_kind_of a.class, a_again
@@ -78,7 +69,7 @@ def test_extended_json
 
   def test_extended_json_default
     a = A.new(666)
-    assert A.json_creatable?
+    assert A.respond_to?(:json_create)
     json = generate(a)
     a_hash = parse(json)
     assert_kind_of Hash, a_hash
@@ -86,7 +77,6 @@ def test_extended_json_default
 
   def test_extended_json_disabled
     a = A.new(666)
-    assert A.json_creatable?
     json = generate(a)
     a_again = parse(json, :create_additions => true)
     assert_kind_of a.class, a_again
@@ -101,21 +91,18 @@ def test_extended_json_disabled
 
   def test_extended_json_fail1
     b = B.new
-    assert !B.json_creatable?
     json = generate(b)
     assert_equal({ "json_class"=>"JSONAdditionTest::B" }, parse(json))
   end
 
   def test_extended_json_fail2
     c = C.new
-    assert !C.json_creatable?
     json = generate(c)
     assert_raise(ArgumentError, NameError) { parse(json, :create_additions => true) }
   end
 
   def test_raw_strings
-    raw = ''
-    raw.respond_to?(:encode!) and raw.encode!(Encoding::ASCII_8BIT)
+    raw = ''.b
     raw_array = []
     for i in 0..255
       raw << i
@@ -163,6 +150,12 @@ def test_core
     assert_equal(/foo/i, JSON(JSON(/foo/i), :create_additions => true))
   end
 
+  def test_deprecated_load_create_additions
+    assert_deprecated_warning(/use JSON\.unsafe_load/) do
+      JSON.load(JSON.dump(Time.now))
+    end
+  end
+
   def test_utc_datetime
     now = Time.now
     d = DateTime.parse(now.to_s) # usual case
@@ -190,7 +183,7 @@ def test_ostruct
     # XXX this won't work; o.foo = { :bar => true }
     o.foo = { 'bar' => true }
     assert_equal o, parse(JSON(o), :create_additions => true)
-  end
+  end if defined?(::OpenStruct)
 
   def test_set
     s = Set.new([:a, :b, :c, :a])
diff --git a/test/json/json_coder_test.rb b/test/json/json_coder_test.rb
new file mode 100755
index 00000000000000..9861181910cefd
--- /dev/null
+++ b/test/json/json_coder_test.rb
@@ -0,0 +1,53 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+require_relative 'test_helper'
+
+class JSONCoderTest < Test::Unit::TestCase
+  def test_json_coder_with_proc
+    coder = JSON::Coder.new do |object|
+      "[Object object]"
+    end
+    assert_equal %(["[Object object]"]), coder.dump([Object.new])
+  end
+
+  def test_json_coder_with_proc_with_unsupported_value
+    coder = JSON::Coder.new do |object|
+      Object.new
+    end
+    assert_raise(JSON::GeneratorError) { coder.dump([Object.new]) }
+  end
+
+  def test_json_coder_options
+    coder = JSON::Coder.new(array_nl: "\n") do |object|
+      42
+    end
+
+    assert_equal "[\n42\n]", coder.dump([Object.new])
+  end
+
+  def test_json_coder_load
+    coder = JSON::Coder.new
+    assert_equal [1,2,3], coder.load("[1,2,3]")
+  end
+
+  def test_json_coder_load_options
+    coder = JSON::Coder.new(symbolize_names: true)
+    assert_equal({a: 1}, coder.load('{"a":1}'))
+  end
+
+  def test_json_coder_dump_NaN_or_Infinity
+    coder = JSON::Coder.new(&:inspect)
+    assert_equal "NaN", coder.load(coder.dump(Float::NAN))
+    assert_equal "Infinity", coder.load(coder.dump(Float::INFINITY))
+    assert_equal "-Infinity", coder.load(coder.dump(-Float::INFINITY))
+  end
+
+  def test_json_coder_dump_NaN_or_Infinity_loop
+    coder = JSON::Coder.new(&:itself)
+    error = assert_raise JSON::GeneratorError do
+      coder.dump(Float::NAN)
+    end
+    assert_include error.message, "NaN not allowed in JSON"
+  end
+end
diff --git a/test/json/json_common_interface_test.rb b/test/json/json_common_interface_test.rb
index 39d35fa7729346..745400faa14d3a 100644
--- a/test/json/json_common_interface_test.rb
+++ b/test/json/json_common_interface_test.rb
@@ -1,4 +1,5 @@
-#frozen_string_literal: false
+# frozen_string_literal: true
+
 require_relative 'test_helper'
 require 'stringio'
 require 'tempfile'
@@ -6,6 +7,13 @@
 class JSONCommonInterfaceTest < Test::Unit::TestCase
   include JSON
 
+  module MethodMissing
+    def method_missing(name, *args); end
+    def respond_to_missing?(name, include_private)
+      true
+    end
+  end
+
   def setup
     @hash = {
       'a' => 2,
@@ -17,12 +25,26 @@ def setup
       'h' => 1000.0,
       'i' => 0.001
     }
+
+    @hash_with_method_missing = {
+      'a' => 2,
+      'b' => 3.141,
+      'c' => 'c',
+      'd' => [ 1, "b", 3.14 ],
+      'e' => { 'foo' => 'bar' },
+      'g' => "\"\0\037",
+      'h' => 1000.0,
+      'i' => 0.001
+    }
+    @hash_with_method_missing.extend MethodMissing
+
     @json = '{"a":2,"b":3.141,"c":"c","d":[1,"b",3.14],"e":{"foo":"bar"},'\
       '"g":"\\"\\u0000\\u001f","h":1000.0,"i":0.001}'
   end
 
   def test_index
     assert_equal @json, JSON[@hash]
+    assert_equal @json, JSON[@hash_with_method_missing]
     assert_equal @hash, JSON[@json]
   end
 
@@ -31,11 +53,11 @@ def test_parser
   end
 
   def test_generator
-    assert_match(/::Generator\z/, JSON.generator.name)
+    assert_match(/::(TruffleRuby)?Generator\z/, JSON.generator.name)
   end
 
   def test_state
-    assert_match(/::Generator::State\z/, JSON.state.name)
+    assert_match(/::(TruffleRuby)?Generator::State\z/, JSON.state.name)
   end
 
   def test_create_id
@@ -69,6 +91,30 @@ def test_fast_generate
 
   def test_pretty_generate
     assert_equal "[\n  1,\n  2,\n  3\n]", JSON.pretty_generate([ 1, 2, 3 ])
+    assert_equal <<~JSON.strip, JSON.pretty_generate({ a: { b: "f"}, c: "d"})
+      {
+        "a": {
+          "b": "f"
+        },
+        "c": "d"
+      }
+    JSON
+
+    # Cause the state to be spilled on the heap.
+    o = Object.new
+    def o.to_s
+      "Object"
+    end
+    actual = JSON.pretty_generate({ a: { b: o}, c: "d", e: "f"})
+    assert_equal <<~JSON.strip, actual
+      {
+        "a": {
+          "b": "Object"
+        },
+        "c": "d",
+        "e": "f"
+      }
+    JSON
   end
 
   def test_load
@@ -86,6 +132,25 @@ def test_load
     tempfile.close!
   end
 
+  def test_load_with_proc
+    visited = []
+    JSON.load('{"foo": [1, 2, 3], "bar": {"baz": "plop"}}', proc { |o| visited << JSON.dump(o); o })
+
+    expected = [
+      '"foo"',
+      '1',
+      '2',
+      '3',
+      '[1,2,3]',
+      '"bar"',
+      '"baz"',
+      '"plop"',
+      '{"baz":"plop"}',
+      '{"foo":[1,2,3],"bar":{"baz":"plop"}}',
+    ]
+    assert_equal expected, visited
+  end
+
   def test_load_with_options
     json  = '{ "foo": NaN }'
     assert JSON.load(json, nil, :allow_nan => true)['foo'].nan?
@@ -99,28 +164,48 @@ def test_load_null
 
   def test_dump
     too_deep = '[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]'
-    assert_equal too_deep, dump(eval(too_deep))
-    assert_kind_of String, Marshal.dump(eval(too_deep))
-    assert_raise(ArgumentError) { dump(eval(too_deep), 100) }
-    assert_raise(ArgumentError) { Marshal.dump(eval(too_deep), 100) }
-    assert_equal too_deep, dump(eval(too_deep), 101)
-    assert_kind_of String, Marshal.dump(eval(too_deep), 101)
-    output = StringIO.new
-    dump(eval(too_deep), output)
-    assert_equal too_deep, output.string
-    output = StringIO.new
-    dump(eval(too_deep), output, 101)
-    assert_equal too_deep, output.string
+    obj = eval(too_deep)
+    assert_equal too_deep, dump(obj)
+    assert_kind_of String, Marshal.dump(obj)
+    assert_raise(ArgumentError) { dump(obj, 100) }
+    assert_raise(ArgumentError) { Marshal.dump(obj, 100) }
+    assert_equal too_deep, dump(obj, 101)
+    assert_kind_of String, Marshal.dump(obj, 101)
+
+    assert_equal too_deep, JSON.dump(obj, StringIO.new, 101, strict: false).string
+    assert_equal too_deep, dump(obj, StringIO.new, 101, strict: false).string
+    assert_raise(JSON::GeneratorError) { JSON.dump(Object.new, StringIO.new, 101, strict: true).string }
+    assert_raise(JSON::GeneratorError) { dump(Object.new, StringIO.new, 101, strict: true).string }
+
+    assert_equal too_deep, dump(obj, nil, nil, strict: false)
+    assert_equal too_deep, dump(obj, nil, 101, strict: false)
+    assert_equal too_deep, dump(obj, StringIO.new, nil, strict: false).string
+    assert_equal too_deep, dump(obj, nil, strict: false)
+    assert_equal too_deep, dump(obj, 101, strict: false)
+    assert_equal too_deep, dump(obj, StringIO.new, strict: false).string
+    assert_equal too_deep, dump(obj, strict: false)
+  end
+
+  def test_dump_in_io
+    io = StringIO.new
+    assert_same io, JSON.dump([1], io)
+    assert_equal "[1]", io.string
+
+    big_object = ["a" * 10, "b" * 40, { foo: 1.23 }] * 5000
+    io.rewind
+    assert_same io, JSON.dump(big_object, io)
+    assert_equal JSON.dump(big_object), io.string
   end
 
   def test_dump_should_modify_defaults
-    max_nesting = JSON.dump_default_options[:max_nesting]
+    max_nesting = JSON._dump_default_options[:max_nesting]
     dump([], StringIO.new, 10)
-    assert_equal max_nesting, JSON.dump_default_options[:max_nesting]
+    assert_equal max_nesting, JSON._dump_default_options[:max_nesting]
   end
 
   def test_JSON
     assert_equal @json, JSON(@hash)
+    assert_equal @json, JSON(@hash_with_method_missing)
     assert_equal @hash, JSON(@json)
   end
 
@@ -140,8 +225,35 @@ def test_load_file_with_option!
     test_load_file_with_option_shared(:load_file!)
   end
 
+  def test_load_file_with_bad_default_external_encoding
+    data = { "key" => "€" }
+    temp_file_containing(JSON.dump(data)) do |path|
+      loaded_data = with_external_encoding(Encoding::US_ASCII) do
+        JSON.load_file(path)
+      end
+      assert_equal data, loaded_data
+    end
+  end
+
+  def test_deprecated_dump_default_options
+    assert_deprecated_warning(/dump_default_options/) do
+      JSON.dump_default_options
+    end
+  end
+
   private
 
+  def with_external_encoding(encoding)
+    verbose = $VERBOSE
+    $VERBOSE = nil
+    previous_encoding = Encoding.default_external
+    Encoding.default_external = encoding
+    yield
+  ensure
+    Encoding.default_external = previous_encoding
+    $VERBOSE = verbose
+  end
+
   def test_load_shared(method_name)
     temp_file_containing(@json) do |filespec|
       assert_equal JSON.public_send(method_name, filespec), @hash
diff --git a/test/json/json_encoding_test.rb b/test/json/json_encoding_test.rb
index 68a058f7d06e94..873e96fddddd84 100644
--- a/test/json/json_encoding_test.rb
+++ b/test/json/json_encoding_test.rb
@@ -1,5 +1,5 @@
-# encoding: utf-8
-#frozen_string_literal: false
+# frozen_string_literal: true
+
 require_relative 'test_helper'
 
 class JSONEncodingTest < Test::Unit::TestCase
@@ -7,23 +7,14 @@ class JSONEncodingTest < Test::Unit::TestCase
 
   def setup
     @utf_8      = '"© ≠ €!"'
-    @ascii_8bit = @utf_8.dup.force_encoding('ascii-8bit')
+    @ascii_8bit = @utf_8.b
     @parsed     = "© ≠ €!"
     @generated  = '"\u00a9 \u2260 \u20ac!"'
-    if String.method_defined?(:encode)
-      @utf_16_data = @parsed.encode('utf-16be', 'utf-8')
-      @utf_16be = @utf_8.encode('utf-16be', 'utf-8')
-      @utf_16le = @utf_8.encode('utf-16le', 'utf-8')
-      @utf_32be = @utf_8.encode('utf-32be', 'utf-8')
-      @utf_32le = @utf_8.encode('utf-32le', 'utf-8')
-    else
-      require 'iconv'
-      @utf_16_data, = Iconv.iconv('utf-16be', 'utf-8', @parsed)
-      @utf_16be, = Iconv.iconv('utf-16be', 'utf-8', @utf_8)
-      @utf_16le, = Iconv.iconv('utf-16le', 'utf-8', @utf_8)
-      @utf_32be, = Iconv.iconv('utf-32be', 'utf-8', @utf_8)
-      @utf_32le, = Iconv.iconv('utf-32le', 'utf-8', @utf_8)
-    end
+    @utf_16_data = @parsed.encode(Encoding::UTF_16BE, Encoding::UTF_8)
+    @utf_16be = @utf_8.encode(Encoding::UTF_16BE, Encoding::UTF_8)
+    @utf_16le = @utf_8.encode(Encoding::UTF_16LE, Encoding::UTF_8)
+    @utf_32be = @utf_8.encode(Encoding::UTF_32BE, Encoding::UTF_8)
+    @utf_32le = @utf_8.encode(Encoding::UTF_32LE, Encoding::UTF_8)
   end
 
   def test_parse
@@ -36,8 +27,8 @@ def test_parse
   end
 
   def test_generate
-    assert_equal @generated, JSON.generate(@parsed, :ascii_only => true)
-    assert_equal @generated, JSON.generate(@utf_16_data, :ascii_only => true)
+    assert_equal @generated, JSON.generate(@parsed, ascii_only: true)
+    assert_equal @generated, JSON.generate(@utf_16_data, ascii_only: true)
   end
 
   def test_unicode
@@ -47,37 +38,37 @@ def test_unicode
     assert_equal '"\u001f"', 0x1f.chr.to_json
     assert_equal '" "', ' '.to_json
     assert_equal "\"#{0x7f.chr}\"", 0x7f.chr.to_json
-    utf8 = [ "© ≠ €! \01" ]
+    utf8 = ["© ≠ €! \01"]
     json = '["© ≠ €! \u0001"]'
-    assert_equal json, utf8.to_json(:ascii_only => false)
+    assert_equal json, utf8.to_json(ascii_only: false)
     assert_equal utf8, parse(json)
     json = '["\u00a9 \u2260 \u20ac! \u0001"]'
-    assert_equal json, utf8.to_json(:ascii_only => true)
+    assert_equal json, utf8.to_json(ascii_only: true)
     assert_equal utf8, parse(json)
     utf8 = ["\343\201\202\343\201\204\343\201\206\343\201\210\343\201\212"]
     json = "[\"\343\201\202\343\201\204\343\201\206\343\201\210\343\201\212\"]"
     assert_equal utf8, parse(json)
-    assert_equal json, utf8.to_json(:ascii_only => false)
+    assert_equal json, utf8.to_json(ascii_only: false)
     utf8 = ["\343\201\202\343\201\204\343\201\206\343\201\210\343\201\212"]
     assert_equal utf8, parse(json)
     json = "[\"\\u3042\\u3044\\u3046\\u3048\\u304a\"]"
-    assert_equal json, utf8.to_json(:ascii_only => true)
+    assert_equal json, utf8.to_json(ascii_only: true)
     assert_equal utf8, parse(json)
     utf8 = ['საქართველო']
     json = '["საქართველო"]'
-    assert_equal json, utf8.to_json(:ascii_only => false)
+    assert_equal json, utf8.to_json(ascii_only: false)
     json = "[\"\\u10e1\\u10d0\\u10e5\\u10d0\\u10e0\\u10d7\\u10d5\\u10d4\\u10da\\u10dd\"]"
-    assert_equal json, utf8.to_json(:ascii_only => true)
+    assert_equal json, utf8.to_json(ascii_only: true)
     assert_equal utf8, parse(json)
-    assert_equal '["Ã"]', generate(["Ã"], :ascii_only => false)
-    assert_equal '["\\u00c3"]', generate(["Ã"], :ascii_only => true)
+    assert_equal '["Ã"]', generate(["Ã"], ascii_only: false)
+    assert_equal '["\\u00c3"]', generate(["Ã"], ascii_only: true)
     assert_equal ["€"], parse('["\u20ac"]')
     utf8 = ["\xf0\xa0\x80\x81"]
     json = "[\"\xf0\xa0\x80\x81\"]"
-    assert_equal json, generate(utf8, :ascii_only => false)
+    assert_equal json, generate(utf8, ascii_only: false)
     assert_equal utf8, parse(json)
     json = '["\ud840\udc01"]'
-    assert_equal json, generate(utf8, :ascii_only => true)
+    assert_equal json, generate(utf8, ascii_only: true)
     assert_equal utf8, parse(json)
     assert_raise(JSON::ParserError) { parse('"\u"') }
     assert_raise(JSON::ParserError) { parse('"\ud800"') }
@@ -85,21 +76,196 @@ def test_unicode
 
   def test_chars
     (0..0x7f).each do |i|
-      json = '["\u%04x"]' % i
+      json = '"\u%04x"' % i
       i = i.chr
-      assert_equal i, parse(json).first[0]
-      if i == ?\b
-        generated = generate(["" << i])
-        assert '["\b"]' == generated || '["\10"]' == generated
-      elsif [?\n, ?\r, ?\t, ?\f].include?(i)
-        assert_equal '[' << ('' << i).dump << ']', generate(["" << i])
+      assert_equal i, parse(json)[0]
+      if i == "\b"
+        generated = generate(i)
+        assert ['"\b"', '"\10"'].include?(generated)
+      elsif ["\n", "\r", "\t", "\f"].include?(i)
+        assert_equal i.dump, generate(i)
       elsif i.chr < 0x20.chr
-        assert_equal json, generate(["" << i])
+        assert_equal json, generate(i)
       end
     end
     assert_raise(JSON::GeneratorError) do
-      generate(["\x80"], :ascii_only => true)
+      generate(["\x80"], ascii_only: true)
+    end
+    assert_equal "\302\200", parse('"\u0080"')
+  end
+
+  def test_deeply_nested_structures
+    # Test for deeply nested arrays
+    nesting_level = 100
+    deeply_nested = []
+    current = deeply_nested
+
+    (nesting_level - 1).times do
+      current << []
+      current = current[0]
+    end
+
+    json = generate(deeply_nested)
+    assert_equal deeply_nested, parse(json)
+
+    # Test for deeply nested objects/hashes
+    deeply_nested_hash = {}
+    current_hash = deeply_nested_hash
+
+    (nesting_level - 1).times do |i|
+      current_hash["key#{i}"] = {}
+      current_hash = current_hash["key#{i}"]
+    end
+
+    json = generate(deeply_nested_hash)
+    assert_equal deeply_nested_hash, parse(json)
+  end
+
+  def test_very_large_json_strings
+    # Create a large array with repeated elements
+    large_array = Array.new(10_000) { |i| "item#{i}" }
+
+    json = generate(large_array)
+    parsed = parse(json)
+
+    assert_equal large_array.size, parsed.size
+    assert_equal large_array.first, parsed.first
+    assert_equal large_array.last, parsed.last
+
+    # Create a large hash
+    large_hash = {}
+    10_000.times { |i| large_hash["key#{i}"] = "value#{i}" }
+
+    json = generate(large_hash)
+    parsed = parse(json)
+
+    assert_equal large_hash.size, parsed.size
+    assert_equal large_hash["key0"], parsed["key0"]
+    assert_equal large_hash["key9999"], parsed["key9999"]
+  end
+
+  def test_invalid_utf8_sequences
+    # Create strings with invalid UTF-8 sequences
+    invalid_utf8 = "\xFF\xFF"
+
+    # Test that generating JSON with invalid UTF-8 raises an error
+    # Different JSON implementations may handle this differently,
+    # so we'll check if any exception is raised
+    begin
+      generate(invalid_utf8)
+      raise "Expected an exception when generating JSON with invalid UTF8"
+    rescue StandardError => e
+      assert true
+      assert_match(%r{source sequence is illegal/malformed utf-8}, e.message)
     end
-    assert_equal "\302\200", parse('["\u0080"]').first
+  end
+
+  def test_surrogate_pair_handling
+    # Test valid surrogate pairs
+    assert_equal "\u{10000}", parse('"\ud800\udc00"')
+    assert_equal "\u{10FFFF}", parse('"\udbff\udfff"')
+
+    # The existing test already checks for orphaned high surrogate
+    assert_raise(JSON::ParserError) { parse('"\ud800"') }
+
+    # Test generating surrogate pairs
+    utf8_string = "\u{10437}"
+    generated = generate(utf8_string, ascii_only: true)
+    assert_match(/\\ud801\\udc37/, generated)
+  end
+
+  def test_json_escaping_edge_cases
+    # Test escaping forward slashes
+    assert_equal "/", parse('"\/"')
+
+    # Test escaping backslashes
+    assert_equal "\\", parse('"\\\\"')
+
+    # Test escaping quotes
+    assert_equal '"', parse('"\\""')
+
+    # Multiple escapes in sequence - different JSON parsers might handle escaped forward slashes differently
+    # Some parsers preserve the escaping, others don't
+    escaped_result = parse('"\\\\\\"\\/"')
+    assert_match(/\\"/, escaped_result)
+    assert_match(%r{/}, escaped_result)
+
+    # Generate string with all special characters
+    special_chars = "\b\f\n\r\t\"\\"
+    escaped_json = generate(special_chars)
+    assert_equal special_chars, parse(escaped_json)
+  end
+
+  def test_empty_objects_and_arrays
+    # Test empty objects with different encodings
+    assert_equal({}, parse('{}'))
+    assert_equal({}, parse('{}'.encode(Encoding::UTF_16BE)))
+    assert_equal({}, parse('{}'.encode(Encoding::UTF_16LE)))
+    assert_equal({}, parse('{}'.encode(Encoding::UTF_32BE)))
+    assert_equal({}, parse('{}'.encode(Encoding::UTF_32LE)))
+
+    # Test empty arrays with different encodings
+    assert_equal([], parse('[]'))
+    assert_equal([], parse('[]'.encode(Encoding::UTF_16BE)))
+    assert_equal([], parse('[]'.encode(Encoding::UTF_16LE)))
+    assert_equal([], parse('[]'.encode(Encoding::UTF_32BE)))
+    assert_equal([], parse('[]'.encode(Encoding::UTF_32LE)))
+
+    # Test generating empty objects and arrays
+    assert_equal '{}', generate({})
+    assert_equal '[]', generate([])
+  end
+
+  def test_null_character_handling
+    # Test parsing null character
+    assert_equal "\u0000", parse('"\u0000"')
+
+    # Test generating null character
+    string_with_null = "\u0000"
+    generated = generate(string_with_null)
+    assert_equal '"\u0000"', generated
+
+    # Test null characters in middle of string
+    mixed_string = "before\u0000after"
+    generated = generate(mixed_string)
+    assert_equal mixed_string, parse(generated)
+  end
+
+  def test_whitespace_handling
+    # Test parsing with various whitespace patterns
+    assert_equal({}, parse(' { } '))
+    assert_equal({}, parse("{\r\n}"))
+    assert_equal([], parse(" [ \n ] "))
+    assert_equal(["a", "b"], parse(" [ \n\"a\",\r\n  \"b\"\n ] "))
+    assert_equal({ "a" => "b" }, parse(" { \n\"a\" \r\n: \t\"b\"\n } "))
+
+    # Test with excessive whitespace
+    excessive_whitespace = " \n\r\t" * 10 + "{}" + " \n\r\t" * 10
+    assert_equal({}, parse(excessive_whitespace))
+
+    # Mixed whitespace in keys and values
+    mixed_json = '{"a \n b":"c \r\n d"}'
+    assert_equal({ "a \n b" => "c \r\n d" }, parse(mixed_json))
+  end
+
+  def test_control_character_handling
+    # Test all control characters (U+0000 to U+001F)
+    (0..0x1F).each do |i|
+      # Skip already tested ones
+      next if [0x08, 0x0A, 0x0D, 0x0C, 0x09].include?(i)
+
+      control_char = i.chr('UTF-8')
+      escaped_json = '"' + "\\u%04x" % i + '"'
+      assert_equal control_char, parse(escaped_json)
+
+      # Check that the character is properly escaped when generating
+      assert_match(/\\u00[0-1][0-9a-f]/, generate(control_char))
+    end
+
+    # Test string with multiple control characters
+    control_str = "\u0001\u0002\u0003\u0004"
+    generated = generate(control_str)
+    assert_equal control_str, parse(generated)
+    assert_match(/\\u0001\\u0002\\u0003\\u0004/, generated)
   end
 end
diff --git a/test/json/json_ext_parser_test.rb b/test/json/json_ext_parser_test.rb
index b5b18fb20b7086..e610f642f199a6 100644
--- a/test/json/json_ext_parser_test.rb
+++ b/test/json/json_ext_parser_test.rb
@@ -1,15 +1,71 @@
-#frozen_string_literal: false
+# frozen_string_literal: true
 require_relative 'test_helper'
 
 class JSONExtParserTest < Test::Unit::TestCase
-  if defined?(JSON::Ext::Parser)
-    def test_allocate
-      parser = JSON::Ext::Parser.new("{}")
-      assert_raise(TypeError, '[ruby-core:35079]') do
-        parser.__send__(:initialize, "{}")
-      end
-      parser = JSON::Ext::Parser.allocate
-      assert_raise(TypeError, '[ruby-core:35079]') { parser.source }
+  include JSON
+
+  def test_allocate
+    parser = JSON::Ext::Parser.new("{}")
+    parser.__send__(:initialize, "{}")
+    assert_equal "{}", parser.source
+
+    parser = JSON::Ext::Parser.allocate
+    assert_nil parser.source
+  end
+
+  def test_error_messages
+    ex = assert_raise(ParserError) { parse('Infinity something') }
+    unless RUBY_PLATFORM =~ /java/
+      assert_equal "unexpected token 'Infinity' at line 1 column 1", ex.message
+    end
+
+    ex = assert_raise(ParserError) { parse('foo bar') }
+    unless RUBY_PLATFORM =~ /java/
+      assert_equal "unexpected token 'foo' at line 1 column 1", ex.message
+    end
+
+    ex = assert_raise(ParserError) { parse('-Infinity something') }
+    unless RUBY_PLATFORM =~ /java/
+      assert_equal "unexpected token '-Infinity' at line 1 column 1", ex.message
+    end
+
+    ex = assert_raise(ParserError) { parse('NaN something') }
+    unless RUBY_PLATFORM =~ /java/
+      assert_equal "unexpected token 'NaN' at line 1 column 1", ex.message
+    end
+
+    ex = assert_raise(ParserError) { parse('   ') }
+    unless RUBY_PLATFORM =~ /java/
+      assert_equal "unexpected end of input at line 1 column 4", ex.message
     end
+
+    ex = assert_raise(ParserError) { parse('{   ') }
+    unless RUBY_PLATFORM =~ /java/
+      assert_equal "expected object key, got EOF at line 1 column 5", ex.message
+    end
+  end
+
+  if GC.respond_to?(:stress=)
+    def test_gc_stress_parser_new
+      payload = JSON.dump([{ foo: 1, bar: 2, baz: 3, egg: { spam: 4 } }] * 10)
+
+      previous_stress = GC.stress
+      JSON::Parser.new(payload).parse
+    ensure
+      GC.stress = previous_stress
+    end
+
+    def test_gc_stress
+      payload = JSON.dump([{ foo: 1, bar: 2, baz: 3, egg: { spam: 4 } }] * 10)
+
+      previous_stress = GC.stress
+      JSON.parse(payload)
+    ensure
+      GC.stress = previous_stress
+    end
+  end
+
+  def parse(json)
+    JSON::Ext::Parser.new(json).parse
   end
 end
diff --git a/test/json/json_fixtures_test.rb b/test/json/json_fixtures_test.rb
index acc87499654802..c153ebef7cbed1 100644
--- a/test/json/json_fixtures_test.rb
+++ b/test/json/json_fixtures_test.rb
@@ -1,40 +1,26 @@
-#frozen_string_literal: false
+# frozen_string_literal: true
 require_relative 'test_helper'
 
 class JSONFixturesTest < Test::Unit::TestCase
-  def setup
-    fixtures = File.join(File.dirname(__FILE__), 'fixtures/{fail,pass}*.json')
-    passed, failed = Dir[fixtures].partition { |f| f['pass'] }
-    @passed = passed.inject([]) { |a, f| a << [ f, File.read(f) ] }.sort
-    @failed = failed.inject([]) { |a, f| a << [ f, File.read(f) ] }.sort
-  end
+  fixtures = File.join(File.dirname(__FILE__), 'fixtures/{fail,pass}*.json')
+  passed, failed = Dir[fixtures].partition { |f| f['pass'] }
 
-  def test_passing
-    verbose_bak, $VERBOSE = $VERBOSE, nil
-    for name, source in @passed
-      begin
-        assert JSON.parse(source),
-          "Did not pass for fixture '#{name}': #{source.inspect}"
-      rescue => e
-        warn "\nCaught #{e.class}(#{e}) for fixture '#{name}': #{source.inspect}\n#{e.backtrace * "\n"}"
-        raise e
-      end
+  passed.each do |f|
+    name = File.basename(f).gsub(".", "_")
+    source = File.read(f)
+    define_method("test_#{name}") do
+      assert JSON.parse(source), "Did not pass for fixture '#{File.basename(f)}': #{source.inspect}"
     end
-  ensure
-    $VERBOSE = verbose_bak
   end
 
-  def test_failing
-    for name, source in @failed
+  failed.each do |f|
+    name = File.basename(f).gsub(".", "_")
+    source = File.read(f)
+    define_method("test_#{name}") do
       assert_raise(JSON::ParserError, JSON::NestingError,
         "Did not fail for fixture '#{name}': #{source.inspect}") do
         JSON.parse(source)
       end
     end
   end
-
-  def test_sanity
-    assert(@passed.size > 5)
-    assert(@failed.size > 20)
-  end
 end
diff --git a/test/json/json_generator_test.rb b/test/json/json_generator_test.rb
index 5f0101d5f68e82..914b3f4ed0a904 100755
--- a/test/json/json_generator_test.rb
+++ b/test/json/json_generator_test.rb
@@ -1,6 +1,5 @@
 #!/usr/bin/env ruby
-# encoding: utf-8
-# frozen_string_literal: false
+# frozen_string_literal: true
 
 require_relative 'test_helper'
 
@@ -20,24 +19,24 @@ def setup
     }
     @json2 = '{"a":2,"b":3.141,"c":"c","d":[1,"b",3.14],"e":{"foo":"bar"},' +
       '"g":"\\"\\u0000\\u001f","h":1000.0,"i":0.001}'
-    @json3 = <<'EOT'.chomp
-{
-  "a": 2,
-  "b": 3.141,
-  "c": "c",
-  "d": [
-    1,
-    "b",
-    3.14
-  ],
-  "e": {
-    "foo": "bar"
-  },
-  "g": "\"\u0000\u001f",
-  "h": 1000.0,
-  "i": 0.001
-}
-EOT
+    @json3 = <<~'JSON'.chomp
+      {
+        "a": 2,
+        "b": 3.141,
+        "c": "c",
+        "d": [
+          1,
+          "b",
+          3.14
+        ],
+        "e": {
+          "foo": "bar"
+        },
+        "g": "\"\u0000\u001f",
+        "h": 1000.0,
+        "i": 0.001
+      }
+    JSON
   end
 
   def silence
@@ -62,12 +61,50 @@ def test_generate
     assert_equal '666', generate(666)
   end
 
+  def test_dump_unenclosed_hash
+    assert_equal '{"a":1,"b":2}', dump(a: 1, b: 2)
+  end
+
+  def test_dump_strict
+    assert_equal '{}', dump({}, strict: true)
+
+    assert_equal '{"array":[42,4.2,"forty-two",true,false,null]}', dump({
+      "array" => [42, 4.2, "forty-two", true, false, nil]
+    }, strict: true)
+
+    assert_equal '{"int":42,"float":4.2,"string":"forty-two","true":true,"false":false,"nil":null,"hash":{}}', dump({
+      "int" => 42,
+      "float" => 4.2,
+      "string" => "forty-two",
+      "true" => true,
+      "false" => false,
+      "nil" => nil,
+      "hash" => {},
+    }, strict: true)
+
+    assert_equal '[]', dump([], strict: true)
+
+    assert_equal '42', dump(42, strict: true)
+    assert_equal 'true', dump(true, strict: true)
+
+    assert_equal '"hello"', dump(:hello, strict: true)
+    assert_equal '"hello"', :hello.to_json(strict: true)
+    assert_equal '"World"', "World".to_json(strict: true)
+  end
+
   def test_generate_pretty
     json = pretty_generate({})
-    assert_equal(<<'EOT'.chomp, json)
-{
-}
-EOT
+    assert_equal('{}', json)
+
+    json = pretty_generate({1=>{}, 2=>[], 3=>4})
+    assert_equal(<<~'JSON'.chomp, json)
+      {
+        "1": {},
+        "2": [],
+        "3": 4
+      }
+    JSON
+
     json = pretty_generate(@hash)
     # hashes aren't (insertion) ordered on every ruby implementation
     # assert_equal(@json3, json)
@@ -75,39 +112,57 @@ def test_generate_pretty
     parsed_json = parse(json)
     assert_equal(@hash, parsed_json)
     json = pretty_generate({1=>2})
-    assert_equal(<<'EOT'.chomp, json)
-{
-  "1": 2
-}
-EOT
+    assert_equal(<<~'JSON'.chomp, json)
+      {
+        "1": 2
+      }
+    JSON
     parsed_json = parse(json)
     assert_equal({"1"=>2}, parsed_json)
     assert_equal '666', pretty_generate(666)
   end
 
+  def test_generate_pretty_custom
+    state = State.new(:space_before => "<psb>", :space => "<ps>", :indent => "<pi>", :object_nl => "\n<po_nl>\n", :array_nl => "<pa_nl>")
+    json = pretty_generate({1=>{}, 2=>['a','b'], 3=>4}, state)
+    assert_equal(<<~'JSON'.chomp, json)
+      {
+      <po_nl>
+      <pi>"1"<psb>:<ps>{},
+      <po_nl>
+      <pi>"2"<psb>:<ps>[<pa_nl><pi><pi>"a",<pa_nl><pi><pi>"b"<pa_nl><pi>],
+      <po_nl>
+      <pi>"3"<psb>:<ps>4
+      <po_nl>
+      }
+    JSON
+  end
+
   def test_generate_custom
     state = State.new(:space_before => " ", :space => "   ", :indent => "<i>", :object_nl => "\n", :array_nl => "<a_nl>")
     json = generate({1=>{2=>3,4=>[5,6]}}, state)
-    assert_equal(<<'EOT'.chomp, json)
-{
-<i>"1" :   {
-<i><i>"2" :   3,
-<i><i>"4" :   [<a_nl><i><i><i>5,<a_nl><i><i><i>6<a_nl><i><i>]
-<i>}
-}
-EOT
+    assert_equal(<<~'JSON'.chomp, json)
+      {
+      <i>"1" :   {
+      <i><i>"2" :   3,
+      <i><i>"4" :   [<a_nl><i><i><i>5,<a_nl><i><i><i>6<a_nl><i><i>]
+      <i>}
+      }
+    JSON
   end
 
   def test_fast_generate
-    json = fast_generate(@hash)
-    assert_equal(parse(@json2), parse(json))
-    parsed_json = parse(json)
-    assert_equal(@hash, parsed_json)
-    json = fast_generate({1=>2})
-    assert_equal('{"1":2}', json)
-    parsed_json = parse(json)
-    assert_equal({"1"=>2}, parsed_json)
-    assert_equal '666', fast_generate(666)
+    assert_deprecated_warning(/fast_generate/) do
+      json = fast_generate(@hash)
+      assert_equal(parse(@json2), parse(json))
+      parsed_json = parse(json)
+      assert_equal(@hash, parsed_json)
+      json = fast_generate({1=>2})
+      assert_equal('{"1":2}', json)
+      parsed_json = parse(json)
+      assert_equal({"1"=>2}, parsed_json)
+      assert_equal '666', fast_generate(666)
+    end
   end
 
   def test_own_state
@@ -141,32 +196,38 @@ def test_states
     assert s[:check_circular?]
   end
 
-  def test_pretty_state
-    state = JSON.create_pretty_state
-    assert_equal({
-      :allow_nan             => false,
-      :array_nl              => "\n",
-      :ascii_only            => false,
-      :buffer_initial_length => 1024,
-      :depth                 => 0,
-      :escape_slash          => false,
-      :indent                => "  ",
-      :max_nesting           => 100,
-      :object_nl             => "\n",
-      :space                 => " ",
-      :space_before          => "",
-    }.sort_by { |n,| n.to_s }, state.to_h.sort_by { |n,| n.to_s })
+  def test_falsy_state
+    object = { foo: [1, 2], bar: { egg: :spam }}
+    expected_json = JSON.generate(
+      object,
+      array_nl:     "",
+      indent:       "",
+      object_nl:    "",
+      space:        "",
+      space_before: "",
+    )
+
+    assert_equal expected_json, JSON.generate(
+      object,
+      array_nl:     nil,
+      indent:       nil,
+      object_nl:    nil,
+      space:        nil,
+      space_before: nil,
+    )
   end
 
-  def test_safe_state
+  def test_state_defaults
     state = JSON::State.new
     assert_equal({
       :allow_nan             => false,
       :array_nl              => "",
+      :as_json               => false,
       :ascii_only            => false,
       :buffer_initial_length => 1024,
       :depth                 => 0,
-      :escape_slash          => false,
+      :script_safe           => false,
+      :strict                => false,
       :indent                => "",
       :max_nesting           => 100,
       :object_nl             => "",
@@ -175,39 +236,27 @@ def test_safe_state
     }.sort_by { |n,| n.to_s }, state.to_h.sort_by { |n,| n.to_s })
   end
 
-  def test_fast_state
-    state = JSON.create_fast_state
-    assert_equal({
-      :allow_nan             => false,
-      :array_nl              => "",
-      :ascii_only            => false,
-      :buffer_initial_length => 1024,
-      :depth                 => 0,
-      :escape_slash          => false,
-      :indent                => "",
-      :max_nesting           => 0,
-      :object_nl             => "",
-      :space                 => "",
-      :space_before          => "",
-    }.sort_by { |n,| n.to_s }, state.to_h.sort_by { |n,| n.to_s })
-  end
-
   def test_allow_nan
-    assert_raise(GeneratorError) { generate([JSON::NaN]) }
-    assert_equal '[NaN]', generate([JSON::NaN], :allow_nan => true)
-    assert_raise(GeneratorError) { fast_generate([JSON::NaN]) }
-    assert_raise(GeneratorError) { pretty_generate([JSON::NaN]) }
-    assert_equal "[\n  NaN\n]", pretty_generate([JSON::NaN], :allow_nan => true)
-    assert_raise(GeneratorError) { generate([JSON::Infinity]) }
-    assert_equal '[Infinity]', generate([JSON::Infinity], :allow_nan => true)
-    assert_raise(GeneratorError) { fast_generate([JSON::Infinity]) }
-    assert_raise(GeneratorError) { pretty_generate([JSON::Infinity]) }
-    assert_equal "[\n  Infinity\n]", pretty_generate([JSON::Infinity], :allow_nan => true)
-    assert_raise(GeneratorError) { generate([JSON::MinusInfinity]) }
-    assert_equal '[-Infinity]', generate([JSON::MinusInfinity], :allow_nan => true)
-    assert_raise(GeneratorError) { fast_generate([JSON::MinusInfinity]) }
-    assert_raise(GeneratorError) { pretty_generate([JSON::MinusInfinity]) }
-    assert_equal "[\n  -Infinity\n]", pretty_generate([JSON::MinusInfinity], :allow_nan => true)
+    assert_deprecated_warning(/fast_generate/) do
+      error = assert_raise(GeneratorError) { generate([JSON::NaN]) }
+      assert_same JSON::NaN, error.invalid_object
+      assert_equal '[NaN]', generate([JSON::NaN], :allow_nan => true)
+      assert_raise(GeneratorError) { fast_generate([JSON::NaN]) }
+      assert_raise(GeneratorError) { pretty_generate([JSON::NaN]) }
+      assert_equal "[\n  NaN\n]", pretty_generate([JSON::NaN], :allow_nan => true)
+      error = assert_raise(GeneratorError) { generate([JSON::Infinity]) }
+      assert_same JSON::Infinity, error.invalid_object
+      assert_equal '[Infinity]', generate([JSON::Infinity], :allow_nan => true)
+      assert_raise(GeneratorError) { fast_generate([JSON::Infinity]) }
+      assert_raise(GeneratorError) { pretty_generate([JSON::Infinity]) }
+      assert_equal "[\n  Infinity\n]", pretty_generate([JSON::Infinity], :allow_nan => true)
+      error = assert_raise(GeneratorError) { generate([JSON::MinusInfinity]) }
+      assert_same JSON::MinusInfinity, error.invalid_object
+      assert_equal '[-Infinity]', generate([JSON::MinusInfinity], :allow_nan => true)
+      assert_raise(GeneratorError) { fast_generate([JSON::MinusInfinity]) }
+      assert_raise(GeneratorError) { pretty_generate([JSON::MinusInfinity]) }
+      assert_equal "[\n  -Infinity\n]", pretty_generate([JSON::MinusInfinity], :allow_nan => true)
+    end
   end
 
   def test_depth
@@ -232,19 +281,19 @@ def test_buffer_initial_length
   end
 
   def test_gc
-    if respond_to?(:assert_in_out_err) && !(RUBY_PLATFORM =~ /java/)
-      assert_in_out_err(%w[-rjson], <<-EOS, [], [])
-        bignum_too_long_to_embed_as_string = 1234567890123456789012345
-        expect = bignum_too_long_to_embed_as_string.to_s
-        GC.stress = true
-
-        10.times do |i|
-          tmp = bignum_too_long_to_embed_as_string.to_json
-          raise "'\#{expect}' is expected, but '\#{tmp}'" unless tmp == expect
-        end
-      EOS
+    pid = fork do
+      bignum_too_long_to_embed_as_string = 1234567890123456789012345
+      expect = bignum_too_long_to_embed_as_string.to_s
+      GC.stress = true
+
+      10.times do |i|
+        tmp = bignum_too_long_to_embed_as_string.to_json
+        raise "#{expect}' is expected, but '#{tmp}'" unless tmp == expect
+      end
     end
-  end if GC.respond_to?(:stress=)
+    _, status = Process.waitpid2(pid)
+    assert_predicate status, :success?
+  end if GC.respond_to?(:stress=) && Process.respond_to?(:fork)
 
   def test_configure_using_configure_and_merge
     numbered_state = {
@@ -275,38 +324,36 @@ def test_configure_hash_conversion
     state.configure(:indent => '1')
     assert_equal '1', state.indent
     state = JSON.state.new
-    foo = 'foo'
+    foo = 'foo'.dup
     assert_raise(TypeError) do
       state.configure(foo)
     end
     def foo.to_h
-      { :indent => '2' }
+      { indent: '2' }
     end
     state.configure(foo)
     assert_equal '2', state.indent
   end
 
-  if defined?(JSON::Ext::Generator)
-    def test_broken_bignum # [ruby-core:38867]
-      pid = fork do
-        x = 1 << 64
-        x.class.class_eval do
-          def to_s
-          end
-        end
-        begin
-          JSON::Ext::Generator::State.new.generate(x)
-          exit 1
-        rescue TypeError
-          exit 0
+  def test_broken_bignum # [ruby-core:38867]
+    pid = fork do
+      x = 1 << 64
+      x.class.class_eval do
+        def to_s
         end
       end
-      _, status = Process.waitpid2(pid)
-      assert status.success?
-    rescue NotImplementedError
-      # forking to avoid modifying core class of a parent process and
-      # introducing race conditions of tests are run in parallel
+      begin
+        JSON::Ext::Generator::State.new.generate(x)
+        exit 1
+      rescue TypeError
+        exit 0
+      end
     end
+    _, status = Process.waitpid2(pid)
+    assert status.success?
+  rescue NotImplementedError
+    # forking to avoid modifying core class of a parent process and
+    # introducing race conditions of tests are run in parallel
   end
 
   def test_hash_likeness_set_symbol
@@ -334,9 +381,28 @@ def test_hash_likeness_set_string
     assert_equal :bar, state_hash[:foo]
   end
 
+  def test_json_state_to_h_roundtrip
+    state = JSON.state.new
+    assert_equal state.to_h, JSON.state.new(state.to_h).to_h
+  end
+
   def test_json_generate
     assert_raise JSON::GeneratorError do
-      assert_equal true, generate(["\xea"])
+      generate(["\xea"])
+    end
+  end
+
+  def test_json_generate_error_detailed_message
+    error = assert_raise JSON::GeneratorError do
+      generate(["\xea"])
+    end
+
+    assert_not_nil(error.detailed_message)
+  end
+
+  def test_json_generate_unsupported_types
+    assert_raise JSON::GeneratorError do
+      generate(Object.new, strict: true)
     end
   end
 
@@ -360,25 +426,127 @@ def test_backslash
     json = '["\\\\.(?i:gif|jpe?g|png)$"]'
     assert_equal json, generate(data)
     #
-    data = [ '\\"' ]
-    json = '["\\\\\""]'
+    data = [ '\\.(?i:gif|jpe?g|png)$\\.(?i:gif|jpe?g|png)$\\.(?i:gif|jpe?g|png)$\\.(?i:gif|jpe?g|png)$\\.(?i:gif|jpe?g|png)$\\.(?i:gif|jpe?g|png)$\\.(?i:gif|jpe?g|png)$\\.(?i:gif|jpe?g|png)$\\.(?i:gif|jpe?g|png)$\\.(?i:gif|jpe?g|png)$\\.(?i:gif|jpe?g|png)$' ]
+    json = '["\\\\.(?i:gif|jpe?g|png)$\\\\.(?i:gif|jpe?g|png)$\\\\.(?i:gif|jpe?g|png)$\\\\.(?i:gif|jpe?g|png)$\\\\.(?i:gif|jpe?g|png)$\\\\.(?i:gif|jpe?g|png)$\\\\.(?i:gif|jpe?g|png)$\\\\.(?i:gif|jpe?g|png)$\\\\.(?i:gif|jpe?g|png)$\\\\.(?i:gif|jpe?g|png)$\\\\.(?i:gif|jpe?g|png)$"]'
+    assert_equal json, generate(data)
+    #
+    data = [ '\\"\\"\\"\\"\\"\\"\\"\\"\\"\\"\\"' ]
+    json = '["\\\\\"\\\\\"\\\\\"\\\\\"\\\\\"\\\\\"\\\\\"\\\\\"\\\\\"\\\\\"\\\\\""]'
     assert_equal json, generate(data)
     #
     data = [ '/' ]
     json = '["/"]'
     assert_equal json, generate(data)
     #
+    data = [ '////////////////////////////////////////////////////////////////////////////////////' ]
+    json = '["////////////////////////////////////////////////////////////////////////////////////"]'
+    assert_equal json, generate(data)
+    #
     data = [ '/' ]
     json = '["\/"]'
+    assert_equal json, generate(data, :script_safe => true)
+    #
+    data = [ '///////////' ]
+    json = '["\/\/\/\/\/\/\/\/\/\/\/"]'
+    assert_equal json, generate(data, :script_safe => true)
+    #
+    data = [ '///////////////////////////////////////////////////////' ]
+    json = '["\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/"]'
+    assert_equal json, generate(data, :script_safe => true)
+    #
+    data = [ "\u2028\u2029" ]
+    json = '["\u2028\u2029"]'
+    assert_equal json, generate(data, :script_safe => true)
+    #
+    data = [ "ABC \u2028 DEF \u2029 GHI" ]
+    json = '["ABC \u2028 DEF \u2029 GHI"]'
+    assert_equal json, generate(data, :script_safe => true)
+    #
+    data = [ "/\u2028\u2029" ]
+    json = '["\/\u2028\u2029"]'
     assert_equal json, generate(data, :escape_slash => true)
     #
     data = ['"']
     json = '["\""]'
     assert_equal json, generate(data)
     #
+    data = ['"""""""""""""""""""""""""']
+    json = '["\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\""]'
+    assert_equal json, generate(data)
+    #
     data = ["'"]
     json = '["\\\'"]'
     assert_equal '["\'"]', generate(data)
+    #
+    data = ["倩", "瀨"]
+    json = '["倩","瀨"]'
+    assert_equal json, generate(data, script_safe: true)
+    #
+    data = '["This is a "test" of the emergency broadcast system."]'
+    json = "\"[\\\"This is a \\\"test\\\" of the emergency broadcast system.\\\"]\""
+    assert_equal json, generate(data)
+    #
+    data = '\tThis is a test of the emergency broadcast system.'
+    json = "\"\\\\tThis is a test of the emergency broadcast system.\""
+    assert_equal json, generate(data)
+    #
+    data = 'This\tis a test of the emergency broadcast system.'
+    json = "\"This\\\\tis a test of the emergency broadcast system.\""
+    assert_equal json, generate(data)
+    #
+    data = 'This is\ta test of the emergency broadcast system.'
+    json = "\"This is\\\\ta test of the emergency broadcast system.\""
+    assert_equal json, generate(data)
+    #
+    data = 'This is a test of the emergency broadcast\tsystem.'
+    json = "\"This is a test of the emergency broadcast\\\\tsystem.\""
+    assert_equal json, generate(data)
+    #
+    data = 'This is a test of the emergency broadcast\tsystem.\n'
+    json = "\"This is a test of the emergency broadcast\\\\tsystem.\\\\n\""
+    assert_equal json, generate(data)
+    data = '"' * 15
+    json = "\"\\\"\\\"\\\"\\\"\\\"\\\"\\\"\\\"\\\"\\\"\\\"\\\"\\\"\\\"\\\"\""
+    assert_equal json, generate(data)
+    data = "\"\"\"\"\"\"\"\"\"\"\"\"\"\"a"
+    json = "\"\\\"\\\"\\\"\\\"\\\"\\\"\\\"\\\"\\\"\\\"\\\"\\\"\\\"\\\"a\""
+    assert_equal json, generate(data)
+    data = "\u0001\u0001\u0001\u0001"
+    json = "\"\\u0001\\u0001\\u0001\\u0001\""
+    assert_equal json, generate(data)
+    data = "\u0001a\u0001a\u0001a\u0001a"
+    json = "\"\\u0001a\\u0001a\\u0001a\\u0001a\""
+    assert_equal json, generate(data)
+    data = "\u0001aa\u0001aa"
+    json = "\"\\u0001aa\\u0001aa\""
+    assert_equal json, generate(data)
+    data = "\u0001aa\u0001aa\u0001aa"
+    json = "\"\\u0001aa\\u0001aa\\u0001aa\""
+    assert_equal json, generate(data)
+    data = "\u0001aa\u0001aa\u0001aa\u0001aa\u0001aa\u0001aa"
+    json = "\"\\u0001aa\\u0001aa\\u0001aa\\u0001aa\\u0001aa\\u0001aa\""
+    assert_equal json, generate(data)
+    data = "\u0001a\u0002\u0001a\u0002\u0001a\u0002\u0001a\u0002\u0001a\u0002\u0001a\u0002\u0001a\u0002\u0001a\u0002"
+    json = "\"\\u0001a\\u0002\\u0001a\\u0002\\u0001a\\u0002\\u0001a\\u0002\\u0001a\\u0002\\u0001a\\u0002\\u0001a\\u0002\\u0001a\\u0002\""
+    assert_equal json, generate(data)
+    data = "ab\u0002c"
+    json = "\"ab\\u0002c\""
+    assert_equal json, generate(data)
+    data = "ab\u0002cab\u0002cab\u0002cab\u0002c"
+    json = "\"ab\\u0002cab\\u0002cab\\u0002cab\\u0002c\""
+    assert_equal json, generate(data)
+    data = "ab\u0002cab\u0002cab\u0002cab\u0002cab\u0002cab\u0002c"
+    json = "\"ab\\u0002cab\\u0002cab\\u0002cab\\u0002cab\\u0002cab\\u0002c\""
+    assert_equal json, generate(data)
+    data = "\n\t\f\b\n\t\f\b\n\t\f\b\n\t\f"
+    json = "\"\\n\\t\\f\\b\\n\\t\\f\\b\\n\\t\\f\\b\\n\\t\\f\""
+    assert_equal json, generate(data)
+    data = "\n\t\f\b\n\t\f\b\n\t\f\b\n\t\f\b"
+    json = "\"\\n\\t\\f\\b\\n\\t\\f\\b\\n\\t\\f\\b\\n\\t\\f\\b\""
+    assert_equal json, generate(data)
+    data = "a\n\t\f\b\n\t\f\b\n\t\f\b\n\t"
+    json = "\"a\\n\\t\\f\\b\\n\\t\\f\\b\\n\\t\\f\\b\\n\\t\""
+    assert_equal json, generate(data)
   end
 
   def test_string_subclass
@@ -391,13 +559,191 @@ def to_s; self; end
     end
   end
 
+  def test_invalid_encoding_string
+    error = assert_raise(JSON::GeneratorError) do
+      "\x82\xAC\xEF".to_json
+    end
+    assert_includes error.message, "source sequence is illegal/malformed utf-8"
+
+    error = assert_raise(JSON::GeneratorError) do
+      JSON.dump("\x82\xAC\xEF")
+    end
+    assert_includes error.message, "source sequence is illegal/malformed utf-8"
+
+    assert_raise(JSON::GeneratorError) do
+      JSON.dump("\x82\xAC\xEF".b)
+    end
+
+    assert_raise(JSON::GeneratorError) do
+      "\x82\xAC\xEF".b.to_json
+    end
+
+    assert_raise(JSON::GeneratorError) do
+      ["\x82\xAC\xEF".b].to_json
+    end
+
+    badly_encoded = "\x82\xAC\xEF".b
+    exception = assert_raise(JSON::GeneratorError) do
+      { foo: badly_encoded }.to_json
+    end
+
+    assert_kind_of EncodingError, exception.cause
+    assert_same badly_encoded, exception.invalid_object
+  end
+
+  class MyCustomString < String
+    def to_json(_state = nil)
+      '"my_custom_key"'
+    end
+
+    def to_s
+      self
+    end
+  end
+
+  def test_string_subclass_as_keys
+    # Ref: https://github.com/ruby/json/issues/667
+    # if key.to_s doesn't return a bare string, we call `to_json` on it.
+    key = MyCustomString.new("won't be used")
+    assert_equal '{"my_custom_key":1}', JSON.generate(key => 1)
+  end
+
+  class FakeString
+    def to_json(_state = nil)
+      raise "Shouldn't be called"
+    end
+
+    def to_s
+      self
+    end
+  end
+
+  def test_custom_object_as_keys
+    key = FakeString.new
+    error = assert_raise(TypeError) do
+      JSON.generate(key => 1)
+    end
+    assert_match "FakeString", error.message
+  end
+
+  def test_to_json_called_with_state_object
+    object = Object.new
+    called = false
+    argument = nil
+    object.singleton_class.define_method(:to_json) do |state|
+      called = true
+      argument = state
+      "<hello>"
+    end
+
+    assert_equal "<hello>", JSON.dump(object)
+    assert called, "#to_json wasn't called"
+    assert_instance_of JSON::State, argument
+  end
+
+  module CustomToJSON
+    def to_json(*)
+      %{"#{self.class.name}#to_json"}
+    end
+  end
+
+  module CustomToS
+    def to_s
+      "#{self.class.name}#to_s"
+    end
+  end
+
+  class ArrayWithToJSON < Array
+    include CustomToJSON
+  end
+
+  def test_array_subclass_with_to_json
+    assert_equal '["JSONGeneratorTest::ArrayWithToJSON#to_json"]', JSON.generate([ArrayWithToJSON.new])
+    assert_equal '{"[]":1}', JSON.generate(ArrayWithToJSON.new => 1)
+  end
+
+  class ArrayWithToS < Array
+    include CustomToS
+  end
+
+  def test_array_subclass_with_to_s
+    assert_equal '[[]]', JSON.generate([ArrayWithToS.new])
+    assert_equal '{"JSONGeneratorTest::ArrayWithToS#to_s":1}', JSON.generate(ArrayWithToS.new => 1)
+  end
+
+  class HashWithToJSON < Hash
+    include CustomToJSON
+  end
+
+  def test_hash_subclass_with_to_json
+    assert_equal '["JSONGeneratorTest::HashWithToJSON#to_json"]', JSON.generate([HashWithToJSON.new])
+    assert_equal '{"{}":1}', JSON.generate(HashWithToJSON.new => 1)
+  end
+
+  class HashWithToS < Hash
+    include CustomToS
+  end
+
+  def test_hash_subclass_with_to_s
+    assert_equal '[{}]', JSON.generate([HashWithToS.new])
+    assert_equal '{"JSONGeneratorTest::HashWithToS#to_s":1}', JSON.generate(HashWithToS.new => 1)
+  end
+
+  class StringWithToJSON < String
+    include CustomToJSON
+  end
+
+  def test_string_subclass_with_to_json
+    assert_equal '["JSONGeneratorTest::StringWithToJSON#to_json"]', JSON.generate([StringWithToJSON.new])
+    assert_equal '{"":1}', JSON.generate(StringWithToJSON.new => 1)
+  end
+
+  class StringWithToS < String
+    include CustomToS
+  end
+
+  def test_string_subclass_with_to_s
+    assert_equal '[""]', JSON.generate([StringWithToS.new])
+    assert_equal '{"JSONGeneratorTest::StringWithToS#to_s":1}', JSON.generate(StringWithToS.new => 1)
+  end
+
+  def test_string_subclass_with_broken_to_s
+    klass = Class.new(String) do
+      def to_s
+        false
+      end
+    end
+    s = klass.new("test")
+    assert_equal '["test"]', JSON.generate([s])
+
+    omit("Can't figure out how to match behavior in java code") if RUBY_PLATFORM == "java"
+
+    assert_raise TypeError do
+      JSON.generate(s => 1)
+    end
+  end
+
   if defined?(JSON::Ext::Generator) and RUBY_PLATFORM != "java"
+    def test_valid_utf8_in_different_encoding
+      utf8_string = "€™"
+      wrong_encoding_string = utf8_string.b
+      # This behavior is historical. Not necessary desirable. We should deprecated it.
+      # The pure and java version of the gem already don't behave this way.
+      assert_warning(/UTF-8 string passed as BINARY, this will raise an encoding error in json 3.0/) do
+        assert_equal utf8_string.to_json, wrong_encoding_string.to_json
+      end
+
+      assert_warning(/UTF-8 string passed as BINARY, this will raise an encoding error in json 3.0/) do
+        assert_equal JSON.dump(utf8_string), JSON.dump(wrong_encoding_string)
+      end
+    end
+
     def test_string_ext_included_calls_super
       included = false
 
-      Module.alias_method(:included_orig, :included)
-      Module.remove_method(:included)
-      Module.define_method(:included) do |base|
+      Module.send(:alias_method, :included_orig, :included)
+      Module.send(:remove_method, :included)
+      Module.send(:define_method, :included) do |base|
         included_orig(base)
         included = true
       end
@@ -409,16 +755,65 @@ def test_string_ext_included_calls_super
       assert included
     ensure
       if Module.private_method_defined?(:included_orig)
-        Module.remove_method(:included) if Module.method_defined?(:included)
-        Module.alias_method(:included, :included_orig)
-        Module.remove_method(:included_orig)
+        Module.send(:remove_method, :included) if Module.method_defined?(:included)
+        Module.send(:alias_method, :included, :included_orig)
+        Module.send(:remove_method, :included_orig)
       end
     end
   end
 
-  if defined?(Encoding)
-    def test_nonutf8_encoding
-      assert_equal("\"5\u{b0}\"", "5\xb0".force_encoding("iso-8859-1").to_json)
+  def test_nonutf8_encoding
+    assert_equal("\"5\u{b0}\"", "5\xb0".dup.force_encoding(Encoding::ISO_8859_1).to_json)
+  end
+
+  def test_utf8_multibyte
+    assert_equal('["foßbar"]', JSON.generate(["foßbar"]))
+    assert_equal('"n€ßt€ð2"', JSON.generate("n€ßt€ð2"))
+    assert_equal('"\"\u0000\u001f"', JSON.generate("\"\u0000\u001f"))
+  end
+
+  def test_fragment
+    fragment = JSON::Fragment.new(" 42")
+    assert_equal '{"number": 42}', JSON.generate({ number: fragment })
+    assert_equal '{"number": 42}', JSON.generate({ number: fragment }, strict: true)
+  end
+
+  def test_json_generate_as_json_convert_to_proc
+    object = Object.new
+    assert_equal object.object_id.to_json, JSON.generate(object, strict: true, as_json: :object_id)
+  end
+
+  def test_json_generate_float
+      values = [-1.0, 1.0, 0.0, 12.2, 7.5 / 3.2, 12.0, 100.0, 1000.0]
+      expecteds = ["-1.0", "1.0", "0.0", "12.2", "2.34375", "12.0", "100.0", "1000.0"]
+
+      if RUBY_ENGINE == "jruby"
+        values << 1746861937.7842371
+        expecteds << "1.7468619377842371E9"
+      else
+        values << 1746861937.7842371
+        expecteds << "1746861937.7842371"
+      end
+
+      if RUBY_ENGINE == "ruby"
+        values << -2.2471348024634545e-08 << -2.2471348024634545e-09 << -2.2471348024634545e-10
+        expecteds << "-0.000000022471348024634545" << "-0.0000000022471348024634545" << "-2.2471348024634546e-10"
+      end
+
+      values.zip(expecteds).each do |value, expected|
+        assert_equal expected, value.to_json
+      end
+  end
+
+  def test_numbers_of_various_sizes
+    numbers = [
+      0, 1, -1, 9, -9, 13, -13, 91, -91, 513, -513, 7513, -7513,
+      17591, -17591, -4611686018427387904, 4611686018427387903,
+      2**62, 2**63, 2**64, -(2**62), -(2**63), -(2**64)
+    ]
+
+    numbers.each do |number|
+      assert_equal "[#{number}]", JSON.generate([number])
     end
   end
 end
diff --git a/test/json/json_generic_object_test.rb b/test/json/json_generic_object_test.rb
index c4d391208cc965..471534192e94ab 100644
--- a/test/json/json_generic_object_test.rb
+++ b/test/json/json_generic_object_test.rb
@@ -1,11 +1,14 @@
-#frozen_string_literal: false
+# frozen_string_literal: true
 require_relative 'test_helper'
 
 class JSONGenericObjectTest < Test::Unit::TestCase
-  include JSON
 
   def setup
-    @go = GenericObject[ :a => 1, :b => 2 ]
+    if defined?(GenericObject)
+      @go = JSON::GenericObject[ :a => 1, :b => 2 ]
+    else
+      omit("JSON::GenericObject is not available")
+    end
   end
 
   def test_attributes
@@ -46,7 +49,7 @@ def test_parse_json
   end
 
   def test_from_hash
-    result  = GenericObject.from_hash(
+    result  = JSON::GenericObject.from_hash(
       :foo => { :bar => { :baz => true }, :quux => [ { :foobar => true } ] })
     assert_kind_of GenericObject, result.foo
     assert_kind_of GenericObject, result.foo.bar
diff --git a/test/json/json_parser_test.rb b/test/json/json_parser_test.rb
index 220826a426b1f2..106492e1c41a9c 100644
--- a/test/json/json_parser_test.rb
+++ b/test/json/json_parser_test.rb
@@ -1,9 +1,11 @@
-# encoding: utf-8
-# frozen_string_literal: false
+# frozen_string_literal: true
 require_relative 'test_helper'
 require 'stringio'
 require 'tempfile'
-require 'ostruct'
+begin
+  require 'ostruct'
+rescue LoadError
+end
 begin
   require 'bigdecimal'
 rescue LoadError
@@ -17,21 +19,28 @@ def test_construction
     assert_equal 'test', parser.source
   end
 
-  def test_argument_encoding
-    source = "{}".encode("UTF-16")
+  def test_argument_encoding_unmodified
+    source = "{}".encode(Encoding::UTF_16)
     JSON::Parser.new(source)
     assert_equal Encoding::UTF_16, source.encoding
-  end if defined?(Encoding::UTF_16)
+  end
+
+  def test_argument_encoding_for_binary_unmodified
+    source = "{}".b
+    JSON::Parser.new(source)
+    assert_equal Encoding::ASCII_8BIT, source.encoding
+  end
 
   def test_error_message_encoding
     bug10705 = '[ruby-core:67386] [Bug #10705]'
-    json = ".\"\xE2\x88\x9A\"".force_encoding(Encoding::UTF_8)
+    json = ".\"\xE2\x88\x9A\""
+    assert_equal(Encoding::UTF_8, json.encoding)
     e = assert_raise(JSON::ParserError) {
       JSON::Ext::Parser.new(json).parse
     }
     assert_equal(Encoding::UTF_8, e.message.encoding, bug10705)
     assert_include(e.message, json, bug10705)
-  end if defined?(Encoding::UTF_8) and defined?(JSON::Ext::Parser)
+  end
 
   def test_parsing
     parser = JSON::Parser.new('"test"')
@@ -95,6 +104,14 @@ def test_parse_numbers
     assert_raise(JSON::ParserError) { parse('+23') }
     assert_raise(JSON::ParserError) { parse('.23') }
     assert_raise(JSON::ParserError) { parse('023') }
+    assert_raise(JSON::ParserError) { parse('-023') }
+    assert_raise(JSON::ParserError) { parse('023.12') }
+    assert_raise(JSON::ParserError) { parse('-023.12') }
+    assert_raise(JSON::ParserError) { parse('023e12') }
+    assert_raise(JSON::ParserError) { parse('-023e12') }
+    assert_raise(JSON::ParserError) { parse('-') }
+    assert_raise(JSON::ParserError) { parse('-.1') }
+    assert_raise(JSON::ParserError) { parse('-e0') }
     assert_equal(23, parse('23'))
     assert_equal(-23, parse('-23'))
     assert_equal_float(3.141, parse('3.141'))
@@ -122,23 +139,21 @@ def test_parse_string_mixed_unicode
     assert_equal(["éé"], JSON.parse("[\"\\u00e9é\"]"))
   end
 
-  if Array.method_defined?(:permutation)
-    def test_parse_more_complex_arrays
-      a = [ nil, false, true, "foßbar", [ "n€st€d", true ], { "nested" => true, "n€ßt€ð2" => {} }]
-      a.permutation.each do |perm|
-        json = pretty_generate(perm)
-        assert_equal perm, parse(json)
-      end
+  def test_parse_more_complex_arrays
+    a = [ nil, false, true, "foßbar", [ "n€st€d", true ], { "nested" => true, "n€ßt€ð2" => {} }]
+    a.permutation.each do |perm|
+      json = pretty_generate(perm)
+      assert_equal perm, parse(json)
     end
+  end
 
-    def test_parse_complex_objects
-      a = [ nil, false, true, "foßbar", [ "n€st€d", true ], { "nested" => true, "n€ßt€ð2" => {} }]
-      a.permutation.each do |perm|
-        s = "a"
-        orig_obj = perm.inject({}) { |h, x| h[s.dup] = x; s = s.succ; h }
-        json = pretty_generate(orig_obj)
-        assert_equal orig_obj, parse(json)
-      end
+  def test_parse_complex_objects
+    a = [ nil, false, true, "foßbar", [ "n€st€d", true ], { "nested" => true, "n€ßt€ð2" => {} }]
+    a.permutation.each do |perm|
+      s = "a"
+      orig_obj = perm.inject({}) { |h, x| h[s.dup] = x; s = s.succ; h }
+      json = pretty_generate(orig_obj)
+      assert_equal orig_obj, parse(json)
     end
   end
 
@@ -173,7 +188,93 @@ def test_parse_json_primitive_values
     assert parse('NaN', :allow_nan => true).nan?
     assert parse('Infinity', :allow_nan => true).infinite?
     assert parse('-Infinity', :allow_nan => true).infinite?
-    assert_raise(JSON::ParserError) { parse('[ 1, ]') }
+  end
+
+  def test_parse_arrays_with_allow_trailing_comma
+    assert_equal([], parse('[]', allow_trailing_comma: true))
+    assert_equal([], parse('[]', allow_trailing_comma: false))
+    assert_raise(JSON::ParserError) { parse('[,]', allow_trailing_comma: true) }
+    assert_raise(JSON::ParserError) { parse('[,]', allow_trailing_comma: false) }
+
+    assert_equal([1], parse('[1]', allow_trailing_comma: true))
+    assert_equal([1], parse('[1]', allow_trailing_comma: false))
+    assert_equal([1], parse('[1,]', allow_trailing_comma: true))
+    assert_raise(JSON::ParserError) { parse('[1,]', allow_trailing_comma: false) }
+
+    assert_equal([1, 2, 3], parse('[1,2,3]', allow_trailing_comma: true))
+    assert_equal([1, 2, 3], parse('[1,2,3]', allow_trailing_comma: false))
+    assert_equal([1, 2, 3], parse('[1,2,3,]', allow_trailing_comma: true))
+    assert_raise(JSON::ParserError) { parse('[1,2,3,]', allow_trailing_comma: false) }
+
+    assert_equal([1, 2, 3], parse('[  1  ,  2  ,  3  ]', allow_trailing_comma: true))
+    assert_equal([1, 2, 3], parse('[  1  ,  2  ,  3  ]', allow_trailing_comma: false))
+    assert_equal([1, 2, 3], parse('[  1  ,  2  ,  3  ,  ]', allow_trailing_comma: true))
+    assert_raise(JSON::ParserError) { parse('[  1  ,  2  ,  3  ,  ]', allow_trailing_comma: false) }
+
+    assert_equal({'foo' => [1, 2, 3]}, parse('{ "foo": [1,2,3] }', allow_trailing_comma: true))
+    assert_equal({'foo' => [1, 2, 3]}, parse('{ "foo": [1,2,3] }', allow_trailing_comma: false))
+    assert_equal({'foo' => [1, 2, 3]}, parse('{ "foo": [1,2,3,] }', allow_trailing_comma: true))
+    assert_raise(JSON::ParserError) { parse('{ "foo": [1,2,3,] }', allow_trailing_comma: false) }
+  end
+
+  def test_parse_object_with_allow_trailing_comma
+    assert_equal({}, parse('{}', allow_trailing_comma: true))
+    assert_equal({}, parse('{}', allow_trailing_comma: false))
+    assert_raise(JSON::ParserError) { parse('{,}', allow_trailing_comma: true) }
+    assert_raise(JSON::ParserError) { parse('{,}', allow_trailing_comma: false) }
+
+    assert_equal({'foo'=>'bar'}, parse('{"foo":"bar"}', allow_trailing_comma: true))
+    assert_equal({'foo'=>'bar'}, parse('{"foo":"bar"}', allow_trailing_comma: false))
+    assert_equal({'foo'=>'bar'}, parse('{"foo":"bar",}', allow_trailing_comma: true))
+    assert_raise(JSON::ParserError) { parse('{"foo":"bar",}', allow_trailing_comma: false) }
+
+    assert_equal(
+      {'foo'=>'bar', 'baz'=>'qux', 'quux'=>'garply'},
+      parse('{"foo":"bar","baz":"qux","quux":"garply"}', allow_trailing_comma: true)
+    )
+    assert_equal(
+      {'foo'=>'bar', 'baz'=>'qux', 'quux'=>'garply'},
+      parse('{"foo":"bar","baz":"qux","quux":"garply"}', allow_trailing_comma: false)
+    )
+    assert_equal(
+      {'foo'=>'bar', 'baz'=>'qux', 'quux'=>'garply'},
+      parse('{"foo":"bar","baz":"qux","quux":"garply",}', allow_trailing_comma: true)
+    )
+    assert_raise(JSON::ParserError) {
+      parse('{"foo":"bar","baz":"qux","quux":"garply",}', allow_trailing_comma: false)
+    }
+
+    assert_equal(
+      {'foo'=>'bar', 'baz'=>'qux', 'quux'=>'garply'},
+      parse('{  "foo":"bar"  ,  "baz":"qux"  ,  "quux":"garply"  }', allow_trailing_comma: true)
+    )
+    assert_equal(
+      {'foo'=>'bar', 'baz'=>'qux', 'quux'=>'garply'},
+      parse('{  "foo":"bar"  ,  "baz":"qux"  ,  "quux":"garply"  }', allow_trailing_comma: false)
+    )
+    assert_equal(
+      {'foo'=>'bar', 'baz'=>'qux', 'quux'=>'garply'},
+      parse('{  "foo":"bar"  ,  "baz":"qux"  ,  "quux":"garply"  ,  }', allow_trailing_comma: true)
+    )
+    assert_raise(JSON::ParserError) {
+      parse('{  "foo":"bar"  ,  "baz":"qux"  ,  "quux":"garply"  ,  }', allow_trailing_comma: false)
+    }
+
+    assert_equal(
+      [{'foo'=>'bar', 'baz'=>'qux', 'quux'=>'garply'}],
+      parse('[{"foo":"bar","baz":"qux","quux":"garply"}]', allow_trailing_comma: true)
+    )
+    assert_equal(
+      [{'foo'=>'bar', 'baz'=>'qux', 'quux'=>'garply'}],
+      parse('[{"foo":"bar","baz":"qux","quux":"garply"}]', allow_trailing_comma: false)
+    )
+    assert_equal(
+      [{'foo'=>'bar', 'baz'=>'qux', 'quux'=>'garply'}],
+      parse('[{"foo":"bar","baz":"qux","quux":"garply",}]', allow_trailing_comma: true)
+    )
+    assert_raise(JSON::ParserError) {
+      parse('[{"foo":"bar","baz":"qux","quux":"garply",}]', allow_trailing_comma: false)
+    }
   end
 
   def test_parse_some_strings
@@ -187,6 +288,36 @@ def test_parse_some_strings
     )
   end
 
+  if RUBY_ENGINE != "jruby" # https://github.com/ruby/json/issues/138
+    def test_parse_broken_string
+      s = parse(%{["\x80"]})[0]
+      assert_equal("\x80", s)
+      assert_equal Encoding::UTF_8, s.encoding
+      assert_equal false, s.valid_encoding?
+
+      s = parse(%{["\x80"]}.b)[0]
+      assert_equal("\x80", s)
+      assert_equal Encoding::UTF_8, s.encoding
+      assert_equal false, s.valid_encoding?
+
+      input = %{["\x80"]}.dup.force_encoding(Encoding::US_ASCII)
+      assert_raise(Encoding::InvalidByteSequenceError) { parse(input) }
+    end
+  end
+
+  def test_invalid_unicode_escape
+    assert_raise(JSON::ParserError) { parse('"\u"') }
+    assert_raise(JSON::ParserError) { parse('"\ua"') }
+    assert_raise(JSON::ParserError) { parse('"\uaa"') }
+    assert_raise(JSON::ParserError) { parse('"\uaaa"') }
+    assert_equal "\uaaaa", parse('"\uaaaa"')
+
+    assert_raise(JSON::ParserError) { parse('"\u______"') }
+    assert_raise(JSON::ParserError) { parse('"\u1_____"') }
+    assert_raise(JSON::ParserError) { parse('"\u11____"') }
+    assert_raise(JSON::ParserError) { parse('"\u111___"') }
+  end
+
   def test_parse_big_integers
     json1 = JSON(orig = (1 << 31) - 1)
     assert_equal orig, parse(json1)
@@ -200,6 +331,15 @@ def test_parse_big_integers
     assert_equal orig, parse(json5)
   end
 
+  def test_parse_duplicate_key
+    expected = {"a" => 2}
+    assert_equal expected, parse('{"a": 1, "a": 2}', allow_duplicate_key: true)
+    assert_raise(ParserError) { parse('{"a": 1, "a": 2}', allow_duplicate_key: false) }
+    assert_deprecated_warning(/duplicate keys/) do
+      assert_equal expected, parse('{"a": 1, "a": 2}')
+    end
+  end
+
   def test_some_wrong_inputs
     assert_raise(ParserError) { parse('[] bla') }
     assert_raise(ParserError) { parse('[] 1') }
@@ -238,43 +378,56 @@ def test_freeze
   end
 
   def test_parse_comments
-    json = <<EOT
-{
-  "key1":"value1", // eol comment
-  "key2":"value2"  /* multi line
-                    *  comment */,
-  "key3":"value3"  /* multi line
-                    // nested eol comment
-                    *  comment */
-}
-EOT
+    json = <<~JSON
+      {
+        "key1":"value1", // eol comment
+        "key2":"value2"  /* multi line
+                          *  comment */,
+        "key3":"value3"  /* multi line
+                          // nested eol comment
+                          *  comment */
+      }
+    JSON
     assert_equal(
       { "key1" => "value1", "key2" => "value2", "key3" => "value3" },
       parse(json))
-    json = <<EOT
-{
-  "key1":"value1"  /* multi line
-                    // nested eol comment
-                    /* illegal nested multi line comment */
-                    *  comment */
-}
-EOT
+    json = <<~JSON
+      {
+        "key1":"value1"  /* multi line
+                          // nested eol comment
+                          /* illegal nested multi line comment */
+                          *  comment */
+      }
+    JSON
     assert_raise(ParserError) { parse(json) }
-    json = <<EOT
-{
-  "key1":"value1"  /* multi line
-                   // nested eol comment
-                   closed multi comment */
-                   and again, throw an Error */
-}
-EOT
+    json = <<~JSON
+      {
+        "key1":"value1"  /* multi line
+                          // nested eol comment
+                          /* legal nested multi line comment start sequence */
+      }
+    JSON
+    assert_equal({ "key1" => "value1" }, parse(json))
+    json = <<~JSON
+      {
+        "key1":"value1"  /* multi line
+                         // nested eol comment
+                         closed multi comment */
+                         and again, throw an Error */
+      }
+    JSON
     assert_raise(ParserError) { parse(json) }
-    json = <<EOT
-{
-  "key1":"value1"  /*/*/
-}
-EOT
+    json = <<~JSON
+      {
+        "key1":"value1"  /*/*/
+      }
+    JSON
     assert_equal({ "key1" => "value1" }, parse(json))
+    assert_equal({}, parse('{} /**/'))
+    assert_raise(ParserError) { parse('{} /* comment not closed') }
+    assert_raise(ParserError) { parse('{} /*/') }
+    assert_raise(ParserError) { parse('{} /x wrong comment') }
+    assert_raise(ParserError) { parse('{} /') }
   end
 
   def test_nesting
@@ -316,6 +469,90 @@ def test_backslash
     json = '["\/"]'
     data = [ '/' ]
     assert_equal data, parse(json)
+
+    data = ['"""""""""""""""""""""""""']
+    json = '["\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\""]'
+    assert_equal data, parse(json)
+
+    data = '["This is a "test" of the emergency broadcast system."]'
+    json = "\"[\\\"This is a \\\"test\\\" of the emergency broadcast system.\\\"]\""
+    assert_equal data, parse(json)
+
+    data = '\tThis is a test of the emergency broadcast system.'
+    json = "\"\\\\tThis is a test of the emergency broadcast system.\""
+    assert_equal data, parse(json)
+
+    data = 'This\tis a test of the emergency broadcast system.'
+    json = "\"This\\\\tis a test of the emergency broadcast system.\""
+    assert_equal data, parse(json)
+
+    data = 'This is\ta test of the emergency broadcast system.'
+    json = "\"This is\\\\ta test of the emergency broadcast system.\""
+    assert_equal data, parse(json)
+
+    data = 'This is a test of the emergency broadcast\tsystem.'
+    json = "\"This is a test of the emergency broadcast\\\\tsystem.\""
+    assert_equal data, parse(json)
+
+    data = 'This is a test of the emergency broadcast\tsystem.\n'
+    json = "\"This is a test of the emergency broadcast\\\\tsystem.\\\\n\""
+    assert_equal data, parse(json)
+
+    data = '"' * 15
+    json = "\"\\\"\\\"\\\"\\\"\\\"\\\"\\\"\\\"\\\"\\\"\\\"\\\"\\\"\\\"\\\"\""
+    assert_equal data, parse(json)
+
+    data = "\"\"\"\"\"\"\"\"\"\"\"\"\"\"a"
+    json = "\"\\\"\\\"\\\"\\\"\\\"\\\"\\\"\\\"\\\"\\\"\\\"\\\"\\\"\\\"a\""
+    assert_equal data, parse(json)
+
+    data = "\u0001\u0001\u0001\u0001"
+    json = "\"\\u0001\\u0001\\u0001\\u0001\""
+    assert_equal data, parse(json)
+
+    data = "\u0001a\u0001a\u0001a\u0001a"
+    json = "\"\\u0001a\\u0001a\\u0001a\\u0001a\""
+    assert_equal data, parse(json)
+
+    data = "\u0001aa\u0001aa"
+    json = "\"\\u0001aa\\u0001aa\""
+    assert_equal data, parse(json)
+
+    data = "\u0001aa\u0001aa\u0001aa"
+    json = "\"\\u0001aa\\u0001aa\\u0001aa\""
+    assert_equal data, parse(json)
+
+    data = "\u0001aa\u0001aa\u0001aa\u0001aa\u0001aa\u0001aa"
+    json = "\"\\u0001aa\\u0001aa\\u0001aa\\u0001aa\\u0001aa\\u0001aa\""
+    assert_equal data, parse(json)
+
+    data = "\u0001a\u0002\u0001a\u0002\u0001a\u0002\u0001a\u0002\u0001a\u0002\u0001a\u0002\u0001a\u0002\u0001a\u0002"
+    json = "\"\\u0001a\\u0002\\u0001a\\u0002\\u0001a\\u0002\\u0001a\\u0002\\u0001a\\u0002\\u0001a\\u0002\\u0001a\\u0002\\u0001a\\u0002\""
+    assert_equal data, parse(json)
+
+    data = "ab\u0002c"
+    json = "\"ab\\u0002c\""
+    assert_equal data, parse(json)
+
+    data = "ab\u0002cab\u0002cab\u0002cab\u0002c"
+    json = "\"ab\\u0002cab\\u0002cab\\u0002cab\\u0002c\""
+    assert_equal data, parse(json)
+
+    data = "ab\u0002cab\u0002cab\u0002cab\u0002cab\u0002cab\u0002c"
+    json = "\"ab\\u0002cab\\u0002cab\\u0002cab\\u0002cab\\u0002cab\\u0002c\""
+    assert_equal data, parse(json)
+
+    data = "\n\t\f\b\n\t\f\b\n\t\f\b\n\t\f"
+    json = "\"\\n\\t\\f\\b\\n\\t\\f\\b\\n\\t\\f\\b\\n\\t\\f\""
+    assert_equal data, parse(json)
+
+    data = "\n\t\f\b\n\t\f\b\n\t\f\b\n\t\f\b"
+    json = "\"\\n\\t\\f\\b\\n\\t\\f\\b\\n\\t\\f\\b\\n\\t\\f\\b\""
+    assert_equal data, parse(json)
+
+    data = "a\n\t\f\b\n\t\f\b\n\t\f\b\n\t"
+    json = "\"a\\n\\t\\f\\b\\n\\t\\f\\b\\n\\t\\f\\b\\n\\t\""
+    assert_equal data, parse(json)
   end
 
   class SubArray < Array
@@ -409,21 +646,6 @@ def self.json_create(o)
     end
   end
 
-  class SubOpenStruct < OpenStruct
-    def [](k)
-      __send__(k)
-    end
-
-    def []=(k, v)
-      @item_set = true
-      __send__("#{k}=", v)
-    end
-
-    def item_set?
-      @item_set
-    end
-  end
-
   def test_parse_object_custom_hash_derived_class
     res = parse('{"foo":"bar"}', :object_class => SubHash)
     assert_equal({"foo" => "bar"}, res)
@@ -431,24 +653,41 @@ def test_parse_object_custom_hash_derived_class
     assert res.item_set?
   end
 
-  def test_parse_object_custom_non_hash_derived_class
-    res = parse('{"foo":"bar"}', :object_class => SubOpenStruct)
-    assert_equal "bar", res.foo
-    assert_equal(SubOpenStruct, res.class)
-    assert res.item_set?
-  end
+  if defined?(::OpenStruct)
+    class SubOpenStruct < OpenStruct
+      def [](k)
+        __send__(k)
+      end
 
-  def test_parse_generic_object
-    res = parse(
-      '{"foo":"bar", "baz":{}}',
-      :object_class => JSON::GenericObject
-    )
-    assert_equal(JSON::GenericObject, res.class)
-    assert_equal "bar", res.foo
-    assert_equal "bar", res["foo"]
-    assert_equal "bar", res[:foo]
-    assert_equal "bar", res.to_hash[:foo]
-    assert_equal(JSON::GenericObject, res.baz.class)
+      def []=(k, v)
+        @item_set = true
+        __send__("#{k}=", v)
+      end
+
+      def item_set?
+        @item_set
+      end
+    end
+
+    def test_parse_object_custom_non_hash_derived_class
+      res = parse('{"foo":"bar"}', :object_class => SubOpenStruct)
+      assert_equal "bar", res.foo
+      assert_equal(SubOpenStruct, res.class)
+      assert res.item_set?
+    end
+
+    def test_parse_generic_object
+      res = parse(
+        '{"foo":"bar", "baz":{}}',
+        :object_class => JSON::GenericObject
+      )
+      assert_equal(JSON::GenericObject, res.class)
+      assert_equal "bar", res.foo
+      assert_equal "bar", res["foo"]
+      assert_equal "bar", res[:foo]
+      assert_equal "bar", res.to_hash[:foo]
+      assert_equal(JSON::GenericObject, res.baz.class)
+    end
   end
 
   def test_generate_core_subclasses_with_new_to_json
@@ -481,10 +720,52 @@ def test_generate_of_core_subclasses
   def test_parsing_frozen_ascii8bit_string
     assert_equal(
       { 'foo' => 'bar' },
-      JSON('{ "foo": "bar" }'.force_encoding(Encoding::ASCII_8BIT).freeze)
+      JSON('{ "foo": "bar" }'.b.freeze)
     )
   end
 
+  def test_parse_error_message_length
+    # Error messages aren't consistent across backends, but we can at least
+    # enforce that if they include fragments of the source it should be of
+    # reasonable size.
+    error = assert_raise(JSON::ParserError) do
+      JSON.parse('{"foo": ' + ('A' * 500) + '}')
+    end
+    assert_operator 80, :>, error.message.bytesize
+  end
+
+  def test_parse_error_incomplete_hash
+    error = assert_raise(JSON::ParserError) do
+      JSON.parse('{"input":{"firstName":"Bob","lastName":"Mob","email":"bob@example.com"}')
+    end
+    if RUBY_ENGINE == "ruby"
+      assert_equal %(expected ',' or '}' after object value, got: EOF at line 1 column 72), error.message
+    end
+  end
+
+  def test_parse_error_snippet
+    omit "C ext only test" unless RUBY_ENGINE == "ruby"
+
+    error = assert_raise(JSON::ParserError) { JSON.parse("あああああああああああああああああああああああ") }
+    assert_equal "unexpected character: 'ああああああああああ' at line 1 column 1", error.message
+
+    error = assert_raise(JSON::ParserError) { JSON.parse("aあああああああああああああああああああああああ") }
+    assert_equal "unexpected character: 'aああああああああああ' at line 1 column 1", error.message
+
+    error = assert_raise(JSON::ParserError) { JSON.parse("abあああああああああああああああああああああああ") }
+    assert_equal "unexpected character: 'abあああああああああ' at line 1 column 1", error.message
+
+    error = assert_raise(JSON::ParserError) { JSON.parse("abcあああああああああああああああああああああああ") }
+    assert_equal "unexpected character: 'abcあああああああああ' at line 1 column 1", error.message
+  end
+
+  def test_parse_leading_slash
+    # ref: https://github.com/ruby/ruby/pull/12598
+    assert_raise(JSON::ParserError) do
+      JSON.parse("/foo/bar")
+    end
+  end
+
   private
 
   def string_deduplication_available?
diff --git a/test/json/json_string_matching_test.rb b/test/json/json_string_matching_test.rb
index b9cf904aaaf7ab..21cd6490259b6b 100644
--- a/test/json/json_string_matching_test.rb
+++ b/test/json/json_string_matching_test.rb
@@ -1,4 +1,4 @@
-#frozen_string_literal: false
+# frozen_string_literal: true
 require_relative 'test_helper'
 require 'time'
 
diff --git a/test/json/ractor_test.rb b/test/json/ractor_test.rb
index cca21b20f0b798..dda34c64c08520 100644
--- a/test/json/ractor_test.rb
+++ b/test/json/ractor_test.rb
@@ -1,14 +1,25 @@
-# encoding: utf-8
-# frozen_string_literal: false
+# frozen_string_literal: true
 
 require_relative 'test_helper'
 
+begin
+  require_relative './lib/helper'
+rescue LoadError
+end
+
 class JSONInRactorTest < Test::Unit::TestCase
+  unless Ractor.method_defined?(:value)
+    module RactorBackport
+      refine Ractor do
+        alias_method :value, :take
+      end
+    end
+
+    using RactorBackport
+  end
+
   def test_generate
-    assert_separately([], "#{<<~"begin;"}\n#{<<~'end;'}")
-    begin;
-      $VERBOSE = nil
-      require "json"
+    pid = fork do
       r = Ractor.new do
         json = JSON.generate({
           'a' => 2,
@@ -22,9 +33,22 @@ def test_generate
         })
         JSON.parse(json)
       end
-      expected_json = '{"a":2,"b":3.141,"c":"c","d":[1,"b",3.14],"e":{"foo":"bar"},' +
-                      '"g":"\\"\\u0000\\u001f","h":1000.0,"i":0.001}'
-      assert_equal(JSON.parse(expected_json), r.take)
-    end;
+      expected_json = JSON.parse('{"a":2,"b":3.141,"c":"c","d":[1,"b",3.14],"e":{"foo":"bar"},' +
+                      '"g":"\\"\\u0000\\u001f","h":1000.0,"i":0.001}')
+      actual_json = r.value
+
+      if expected_json == actual_json
+        exit 0
+      else
+        puts "Expected:"
+        puts expected_json
+        puts "Acutual:"
+        puts actual_json
+        puts
+        exit 1
+      end
+    end
+    _, status = Process.waitpid2(pid)
+    assert_predicate status, :success?
   end
-end if defined?(Ractor)
+end if defined?(Ractor) && Process.respond_to?(:fork)
diff --git a/test/json/test_helper.rb b/test/json/test_helper.rb
index 446c020e8fbf03..d849e28b9b862b 100644
--- a/test/json/test_helper.rb
+++ b/test/json/test_helper.rb
@@ -1,17 +1,29 @@
-case ENV['JSON']
-when 'pure'
-  $:.unshift File.join(__dir__, '../lib')
-  require 'json/pure'
-when 'ext'
-  $:.unshift File.join(__dir__, '../ext'), File.join(__dir__, '../lib')
-  require 'json/ext'
-else
-  $:.unshift File.join(__dir__, '../ext'), File.join(__dir__, '../lib')
-  require 'json'
-end
+$LOAD_PATH.unshift(File.expand_path('../../../ext', __FILE__), File.expand_path('../../../lib', __FILE__))
 
+require 'json'
 require 'test/unit'
-begin
-  require 'byebug'
-rescue LoadError
+
+if ENV["JSON_COMPACT"]
+  if GC.respond_to?(:verify_compaction_references)
+    # This method was added in Ruby 3.0.0. Calling it this way asks the GC to
+    # move objects around, helping to find object movement bugs.
+    begin
+      GC.verify_compaction_references(expand_heap: true, toward: :empty)
+    rescue NotImplementedError, ArgumentError
+      # Some platforms don't support compaction
+    end
+  end
+
+  if GC.respond_to?(:auto_compact=)
+    begin
+      GC.auto_compact = true
+    rescue NotImplementedError
+      # Some platforms don't support compaction
+    end
+  end
+end
+
+unless defined?(Test::Unit::CoreAssertions)
+  require "core_assertions"
+  Test::Unit::TestCase.include Test::Unit::CoreAssertions
 end
diff --git a/test/lib/jit_support.rb b/test/lib/jit_support.rb
index 3f213679876129..79fdbcce48f410 100644
--- a/test/lib/jit_support.rb
+++ b/test/lib/jit_support.rb
@@ -9,17 +9,17 @@ def yjit_supported?
     @yjit_supported = ![nil, 'no'].include?(RbConfig::CONFIG['YJIT_SUPPORT'])
   end
 
+  def yjit_enabled?
+    defined?(RubyVM::YJIT.enabled?) && RubyVM::YJIT.enabled?
+  end
+
   def yjit_force_enabled?
     "#{RbConfig::CONFIG['CFLAGS']} #{RbConfig::CONFIG['CPPFLAGS']}".match?(/(\A|\s)-D ?YJIT_FORCE_ENABLE\b/)
   end
 
-  def rjit_supported?
-    return @rjit_supported if defined?(@rjit_supported)
+  def zjit_supported?
+    return @zjit_supported if defined?(@zjit_supported)
     # nil in mswin
-    @rjit_supported = ![nil, 'no'].include?(RbConfig::CONFIG['RJIT_SUPPORT'])
-  end
-
-  def rjit_force_enabled?
-    "#{RbConfig::CONFIG['CFLAGS']} #{RbConfig::CONFIG['CPPFLAGS']}".match?(/(\A|\s)-D ?RJIT_FORCE_ENABLE\b/)
+    @zjit_supported = ![nil, 'no'].include?(RbConfig::CONFIG['ZJIT_SUPPORT'])
   end
 end
diff --git a/test/lib/parser_support.rb b/test/lib/parser_support.rb
new file mode 100644
index 00000000000000..0daf45e87bbecf
--- /dev/null
+++ b/test/lib/parser_support.rb
@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+module ParserSupport
+  module_function
+
+  # Determines whether or not Prism is being used in the current process. This
+  # would have been determined by `--parser=prism` on either the command line or
+  # from within various environment variables.
+  def prism_enabled?
+    RubyVM::InstructionSequence.compile("").to_a[4][:parser] == :prism
+  end
+
+  # Determines whether or not Prism would be used by a subprocess. This is
+  # necessary because some tests run in subprocesses, and we need to know if we
+  # expect Prism to be used by those tests. This happens if Prism is configured
+  # as the default parser.
+  def prism_enabled_in_subprocess?
+    EnvUtil.invoke_ruby(["-v"], "", true, false)[0].include?("+PRISM")
+  end
+end
diff --git a/test/logger/test_formatter.rb b/test/logger/test_formatter.rb
deleted file mode 100644
index 94657229914473..00000000000000
--- a/test/logger/test_formatter.rb
+++ /dev/null
@@ -1,35 +0,0 @@
-# coding: US-ASCII
-# frozen_string_literal: false
-require 'logger'
-
-class TestFormatter < Test::Unit::TestCase
-  def test_call
-    severity = 'INFO'
-    time = Time.now
-    progname = 'ruby'
-    msg = 'This is a test'
-    formatter = Logger::Formatter.new
-
-    result = formatter.call(severity, time, progname, msg)
-    time_matcher = /\d{4}\-\d{2}\-\d{2}T\d{2}:\d{2}:\d{2}\.\d{6}/
-    matcher = /#{severity[0..0]}, \[#{time_matcher} #\d+\]  #{severity} -- #{progname}: #{msg}\n/
-
-    assert_match(matcher, result)
-  end
-
-  class CustomFormatter < Logger::Formatter
-    def call(time)
-      format_datetime(time)
-    end
-  end
-
-  def test_format_datetime
-    time = Time.now
-    formatter = CustomFormatter.new
-
-    result = formatter.call(time)
-    matcher = /^\d{4}\-\d{2}\-\d{2}T\d{2}:\d{2}:\d{2}\.\d{6}$/
-
-    assert_match(matcher, result)
-  end
-end
diff --git a/test/logger/test_logdevice.rb b/test/logger/test_logdevice.rb
deleted file mode 100644
index 8f1c15542ab889..00000000000000
--- a/test/logger/test_logdevice.rb
+++ /dev/null
@@ -1,859 +0,0 @@
-# coding: US-ASCII
-# frozen_string_literal: false
-require 'logger'
-require 'tempfile'
-require 'tmpdir'
-
-class TestLogDevice < Test::Unit::TestCase
-  class LogExcnRaiser
-    def write(*arg)
-      raise 'disk is full'
-    end
-
-    def close
-    end
-
-    def stat
-      Object.new
-    end
-  end
-
-  def setup
-    @tempfile = Tempfile.new("logger")
-    @tempfile.close
-    @filename = @tempfile.path
-    File.unlink(@filename)
-  end
-
-  def teardown
-    @tempfile.close(true)
-  end
-
-  def d(log, opt = {})
-    Logger::LogDevice.new(log, **opt)
-  end
-
-  def test_initialize
-    logdev = d(STDERR)
-    assert_equal(STDERR, logdev.dev)
-    assert_nil(logdev.filename)
-    assert_raise(TypeError) do
-      d(nil)
-    end
-    #
-    logdev = d(@filename)
-    begin
-      assert_file.exist?(@filename)
-      assert_predicate(logdev.dev, :sync)
-      refute_predicate(logdev.dev, :binmode?)
-      assert_equal(@filename, logdev.filename)
-      logdev.write('hello')
-    ensure
-      logdev.close
-    end
-    # create logfile which is already exist.
-    logdev = d(@filename)
-    begin
-      assert_predicate(logdev.dev, :sync)
-      refute_predicate(logdev.dev, :binmode?)
-      logdev.write('world')
-      logfile = File.read(@filename)
-      assert_equal(2, logfile.split(/\n/).size)
-      assert_match(/^helloworld$/, logfile)
-    ensure
-      logdev.close
-    end
-    # logfile object with path
-    tempfile = Tempfile.new("logger")
-    tempfile.sync = true
-    logdev = d(tempfile)
-    begin
-      logdev.write('world')
-      logfile = File.read(tempfile.path)
-      assert_equal(1, logfile.split(/\n/).size)
-      assert_match(/^world$/, logfile)
-      assert_equal(tempfile.path, logdev.filename)
-    ensure
-      logdev.close
-      File.unlink(tempfile)
-      tempfile.close(true)
-    end
-  end
-
-  def test_write
-    r, w = IO.pipe
-    logdev = d(w)
-    logdev.write("msg2\n\n")
-    IO.select([r], nil, nil, 0.1)
-    w.close
-    msg = r.read
-    r.close
-    assert_equal("msg2\n\n", msg)
-    #
-    logdev = d(LogExcnRaiser.new)
-    class << (stderr = '')
-      alias write concat
-    end
-    $stderr, stderr = stderr, $stderr
-    begin
-      assert_nothing_raised do
-        logdev.write('hello')
-      end
-    ensure
-      logdev.close
-      $stderr, stderr = stderr, $stderr
-    end
-    assert_equal "log writing failed. disk is full\n", stderr
-  end
-
-  def test_close
-    r, w = IO.pipe
-    logdev = d(w)
-    logdev.write("msg2\n\n")
-    IO.select([r], nil, nil, 0.1)
-    assert_not_predicate(w, :closed?)
-    logdev.close
-    assert_predicate(w, :closed?)
-    r.close
-  end
-
-  def test_reopen_io
-    logdev  = d(STDERR)
-    old_dev = logdev.dev
-    logdev.reopen
-    assert_equal(STDERR, logdev.dev)
-    assert_not_predicate(old_dev, :closed?)
-  end
-
-  def test_reopen_io_by_io
-    logdev  = d(STDERR)
-    old_dev = logdev.dev
-    logdev.reopen(STDOUT)
-    assert_equal(STDOUT, logdev.dev)
-    assert_not_predicate(old_dev, :closed?)
-  end
-
-  def test_reopen_io_by_file
-    logdev  = d(STDERR)
-    old_dev = logdev.dev
-    logdev.reopen(@filename)
-    begin
-      assert_file.exist?(@filename)
-      assert_equal(@filename, logdev.filename)
-      assert_not_predicate(old_dev, :closed?)
-    ensure
-      logdev.close
-    end
-  end
-
-  def test_reopen_file
-    logdev = d(@filename)
-    old_dev = logdev.dev
-
-    logdev.reopen
-    begin
-      assert_file.exist?(@filename)
-      assert_equal(@filename, logdev.filename)
-      assert_predicate(old_dev, :closed?)
-    ensure
-      logdev.close
-    end
-  end
-
-  def test_reopen_file_by_io
-    logdev = d(@filename)
-    old_dev = logdev.dev
-    logdev.reopen(STDOUT)
-    assert_equal(STDOUT, logdev.dev)
-    assert_nil(logdev.filename)
-    assert_predicate(old_dev, :closed?)
-  end
-
-  def test_reopen_file_by_file
-    logdev = d(@filename)
-    old_dev = logdev.dev
-
-    tempfile2 = Tempfile.new("logger")
-    tempfile2.close
-    filename2 = tempfile2.path
-    File.unlink(filename2)
-
-    logdev.reopen(filename2)
-    begin
-      assert_file.exist?(filename2)
-      assert_equal(filename2, logdev.filename)
-      assert_predicate(old_dev, :closed?)
-    ensure
-      logdev.close
-      tempfile2.close(true)
-    end
-  end
-
-  def test_shifting_size
-    tmpfile = Tempfile.new([File.basename(__FILE__, '.*'), '_1.log'])
-    logfile = tmpfile.path
-    logfile0 = logfile + '.0'
-    logfile1 = logfile + '.1'
-    logfile2 = logfile + '.2'
-    logfile3 = logfile + '.3'
-    tmpfile.close(true)
-    File.unlink(logfile) if File.exist?(logfile)
-    File.unlink(logfile0) if File.exist?(logfile0)
-    File.unlink(logfile1) if File.exist?(logfile1)
-    File.unlink(logfile2) if File.exist?(logfile2)
-    logger = Logger.new(logfile, 4, 100)
-    logger.error("0" * 15)
-    assert_file.exist?(logfile)
-    assert_file.not_exist?(logfile0)
-    logger.error("0" * 15)
-    assert_file.exist?(logfile0)
-    assert_file.not_exist?(logfile1)
-    logger.error("0" * 15)
-    assert_file.exist?(logfile1)
-    assert_file.not_exist?(logfile2)
-    logger.error("0" * 15)
-    assert_file.exist?(logfile2)
-    assert_file.not_exist?(logfile3)
-    logger.error("0" * 15)
-    assert_file.not_exist?(logfile3)
-    logger.error("0" * 15)
-    assert_file.not_exist?(logfile3)
-    logger.close
-    File.unlink(logfile)
-    File.unlink(logfile0)
-    File.unlink(logfile1)
-    File.unlink(logfile2)
-
-    tmpfile = Tempfile.new([File.basename(__FILE__, '.*'), '_2.log'])
-    logfile = tmpfile.path
-    logfile0 = logfile + '.0'
-    logfile1 = logfile + '.1'
-    logfile2 = logfile + '.2'
-    logfile3 = logfile + '.3'
-    tmpfile.close(true)
-    logger = Logger.new(logfile, 4, 150)
-    logger.error("0" * 15)
-    assert_file.exist?(logfile)
-    assert_file.not_exist?(logfile0)
-    logger.error("0" * 15)
-    assert_file.not_exist?(logfile0)
-    logger.error("0" * 15)
-    assert_file.exist?(logfile0)
-    assert_file.not_exist?(logfile1)
-    logger.error("0" * 15)
-    assert_file.not_exist?(logfile1)
-    logger.error("0" * 15)
-    assert_file.exist?(logfile1)
-    assert_file.not_exist?(logfile2)
-    logger.error("0" * 15)
-    assert_file.not_exist?(logfile2)
-    logger.error("0" * 15)
-    assert_file.exist?(logfile2)
-    assert_file.not_exist?(logfile3)
-    logger.error("0" * 15)
-    assert_file.not_exist?(logfile3)
-    logger.error("0" * 15)
-    assert_file.not_exist?(logfile3)
-    logger.error("0" * 15)
-    assert_file.not_exist?(logfile3)
-    logger.close
-    File.unlink(logfile)
-    File.unlink(logfile0)
-    File.unlink(logfile1)
-    File.unlink(logfile2)
-  end
-
-  def test_shifting_age_variants
-    logger = Logger.new(@filename, 'daily')
-    logger.info('daily')
-    logger.close
-    logger = Logger.new(@filename, 'weekly')
-    logger.info('weekly')
-    logger.close
-    logger = Logger.new(@filename, 'monthly')
-    logger.info('monthly')
-    logger.close
-  end
-
-  def test_invalid_shifting_age
-    assert_raise(ArgumentError) { Logger::Period.next_rotate_time(Time.now, 'invalid') }
-    assert_raise(ArgumentError) { Logger::Period.previous_period_end(Time.now, 'invalid') }
-  end
-
-  def test_shifting_age
-    yyyymmdd = Time.now.strftime("%Y%m%d")
-    filename1 = @filename + ".#{yyyymmdd}"
-    filename2 = @filename + ".#{yyyymmdd}.1"
-    filename3 = @filename + ".#{yyyymmdd}.2"
-    begin
-      logger = Logger.new(@filename, 'now')
-      assert_file.exist?(@filename)
-      assert_file.not_exist?(filename1)
-      assert_file.not_exist?(filename2)
-      assert_file.not_exist?(filename3)
-      logger.info("0" * 15)
-      assert_file.exist?(@filename)
-      assert_file.exist?(filename1)
-      assert_file.not_exist?(filename2)
-      assert_file.not_exist?(filename3)
-      logger.warn("0" * 15)
-      assert_file.exist?(@filename)
-      assert_file.exist?(filename1)
-      assert_file.exist?(filename2)
-      assert_file.not_exist?(filename3)
-      logger.error("0" * 15)
-      assert_file.exist?(@filename)
-      assert_file.exist?(filename1)
-      assert_file.exist?(filename2)
-      assert_file.exist?(filename3)
-    ensure
-      logger.close if logger
-      [filename1, filename2, filename3].each do |filename|
-        File.unlink(filename) if File.exist?(filename)
-      end
-    end
-  end
-
-  def test_shifting_period_suffix
-    ['%Y%m%d', '%Y-%m-%d', '%Y'].each do |format|
-      if format == '%Y%m%d' # default
-        logger = Logger.new(@filename, 'now', 1048576)
-      else # config
-        logger = Logger.new(@filename, 'now', 1048576, shift_period_suffix: format)
-      end
-      begin
-        yyyymmdd = Time.now.strftime(format)
-        filename1 = @filename + ".#{yyyymmdd}"
-        filename2 = @filename + ".#{yyyymmdd}.1"
-        filename3 = @filename + ".#{yyyymmdd}.2"
-        logger.info("0" * 15)
-        logger.info("0" * 15)
-        logger.info("0" * 15)
-        assert_file.exist?(@filename)
-        assert_file.exist?(filename1)
-        assert_file.exist?(filename2)
-        assert_file.exist?(filename3)
-      ensure
-        logger.close if logger
-        [filename1, filename2, filename3].each do |filename|
-          File.unlink(filename) if File.exist?(filename)
-        end
-      end
-    end
-  end
-
-  def test_shifting_size_in_multiprocess
-    tmpfile = Tempfile.new([File.basename(__FILE__, '.*'), '_1.log'])
-    logfile = tmpfile.path
-    logfile0 = logfile + '.0'
-    logfile1 = logfile + '.1'
-    logfile2 = logfile + '.2'
-    tmpfile.close(true)
-    File.unlink(logfile) if File.exist?(logfile)
-    File.unlink(logfile0) if File.exist?(logfile0)
-    File.unlink(logfile1) if File.exist?(logfile1)
-    File.unlink(logfile2) if File.exist?(logfile2)
-    begin
-      stderr = run_children(2, [logfile], "#{<<-"begin;"}\n#{<<-'end;'}")
-      begin;
-        logger = Logger.new(ARGV[0], 4, 10)
-        10.times do
-          logger.info '0' * 15
-        end
-      end;
-      assert_no_match(/log shifting failed/, stderr)
-      assert_no_match(/log writing failed/, stderr)
-      assert_no_match(/log rotation inter-process lock failed/, stderr)
-    ensure
-      File.unlink(logfile) if File.exist?(logfile)
-      File.unlink(logfile0) if File.exist?(logfile0)
-      File.unlink(logfile1) if File.exist?(logfile1)
-      File.unlink(logfile2) if File.exist?(logfile2)
-    end
-  end
-
-  def test_shifting_age_in_multiprocess
-    yyyymmdd = Time.now.strftime("%Y%m%d")
-    begin
-      stderr = run_children(2, [@filename], "#{<<-"begin;"}\n#{<<-'end;'}")
-      begin;
-        logger = Logger.new(ARGV[0], 'now')
-        10.times do
-          logger.info '0' * 15
-        end
-      end;
-      assert_no_match(/log shifting failed/, stderr)
-      assert_no_match(/log writing failed/, stderr)
-      assert_no_match(/log rotation inter-process lock failed/, stderr)
-    ensure
-      Dir.glob("#{@filename}.#{yyyymmdd}{,.[1-9]*}") do |filename|
-        File.unlink(filename) if File.exist?(filename)
-      end
-    end
-  end
-
-  def test_open_logfile_in_multiprocess
-    tmpfile = Tempfile.new([File.basename(__FILE__, '.*'), '_1.log'])
-    logfile = tmpfile.path
-    tmpfile.close(true)
-    begin
-      20.times do
-        run_children(2, [logfile], "#{<<-"begin;"}\n#{<<-'end;'}")
-        begin;
-          logfile = ARGV[0]
-          logdev = Logger::LogDevice.new(logfile)
-          logdev.send(:open_logfile, logfile)
-        end;
-        assert_equal(1, File.readlines(logfile).grep(/# Logfile created on/).size)
-        File.unlink(logfile)
-      end
-    ensure
-      File.unlink(logfile) if File.exist?(logfile)
-    end
-  end
-
-  def test_shifting_size_not_rotate_too_much
-    logdev0 = d(@filename)
-    logdev0.__send__(:add_log_header, @tempfile)
-    header_size = @tempfile.size
-    message = "*" * 99 + "\n"
-    shift_size = header_size + message.size * 3 - 1
-    opt = {shift_age: 1, shift_size: shift_size}
-
-    Dir.mktmpdir do |tmpdir|
-      begin
-        log = File.join(tmpdir, "log")
-        logdev1 = d(log, opt)
-        logdev2 = d(log, opt)
-
-        assert_file.identical?(log, logdev1.dev)
-        assert_file.identical?(log, logdev2.dev)
-
-        3.times{logdev1.write(message)}
-        assert_file.identical?(log, logdev1.dev)
-        assert_file.identical?(log, logdev2.dev)
-
-        logdev1.write(message)
-        assert_file.identical?(log, logdev1.dev)
-        # NOTE: below assertion fails in JRuby 9.3 and TruffleRuby
-        assert_file.identical?(log + ".0", logdev2.dev)
-
-        logdev2.write(message)
-        assert_file.identical?(log, logdev1.dev)
-        assert_file.identical?(log, logdev2.dev)
-
-        logdev1.write(message)
-        assert_file.identical?(log, logdev1.dev)
-        assert_file.identical?(log, logdev2.dev)
-      ensure
-        logdev1.close if logdev1
-        logdev2.close if logdev2
-      end
-    end
-  ensure
-    logdev0.close
-  end unless /mswin|mingw|cygwin/ =~ RbConfig::CONFIG['host_os']
-
-  def test_shifting_midnight
-    Dir.mktmpdir do |tmpdir|
-      assert_in_out_err([*%W"--disable=gems -rlogger -C#{tmpdir} -"], "#{<<-"begin;"}\n#{<<-'end;'}")
-      begin;
-        begin
-          module FakeTime
-            attr_accessor :now
-          end
-
-          class << Time
-            prepend FakeTime
-          end
-
-          log = "log"
-          File.open(log, "w") {}
-          File.utime(*[Time.mktime(2014, 1, 2, 0, 0, 0)]*2, log)
-
-          Time.now = Time.mktime(2014, 1, 2, 23, 59, 59, 999000)
-          dev = Logger::LogDevice.new(log, shift_age: 'daily')
-          dev.write("#{Time.now} hello-1\n")
-          File.utime(Time.now, Time.now, log)
-
-          Time.now = Time.mktime(2014, 1, 3, 1, 1, 1)
-          dev.write("#{Time.now} hello-2\n")
-          File.utime(Time.now, Time.now, log)
-        ensure
-          dev.close
-        end
-      end;
-
-      bug = '[GH-539]'
-      log = File.join(tmpdir, "log")
-      cont = File.read(log)
-      assert_match(/hello-2/, cont)
-      assert_not_match(/hello-1/, cont)
-      assert_file.for(bug).exist?(log+".20140102")
-      assert_match(/hello-1/, File.read(log+".20140102"), bug)
-    end
-  end
-
-  env_tz_works = /linux|darwin|freebsd|openbsd/ =~ RUBY_PLATFORM # borrow from test/ruby/test_time_tz.rb
-
-  def test_shifting_weekly
-    Dir.mktmpdir do |tmpdir|
-      assert_in_out_err([{"TZ"=>"UTC"}, *%W"-rlogger -C#{tmpdir} -"], "#{<<-"begin;"}\n#{<<-'end;'}")
-      begin;
-        begin
-          module FakeTime
-            attr_accessor :now
-          end
-
-          class << Time
-            prepend FakeTime
-          end
-
-          log = "log"
-          File.open(log, "w") {}
-          Time.now = Time.utc(2015, 12, 14, 0, 1, 1)
-          File.utime(Time.now, Time.now, log)
-
-          dev = Logger::LogDevice.new("log", shift_age: 'weekly')
-
-          Time.now = Time.utc(2015, 12, 19, 12, 34, 56)
-          dev.write("#{Time.now} hello-1\n")
-          File.utime(Time.now, Time.now, log)
-
-          Time.now = Time.utc(2015, 12, 20, 0, 1, 1)
-          dev.write("#{Time.now} hello-2\n")
-          File.utime(Time.now, Time.now, log)
-        ensure
-          dev.close if dev
-        end
-      end;
-      log = File.join(tmpdir, "log")
-      cont = File.read(log)
-      assert_match(/hello-2/, cont)
-      assert_not_match(/hello-1/, cont)
-      log = Dir.glob(log+".*")
-      assert_equal(1, log.size)
-      log, = *log
-      cont = File.read(log)
-      assert_match(/hello-1/, cont)
-      assert_equal("2015-12-19", cont[/^[-\d]+/])
-      assert_equal("20151219", log[/\d+\z/])
-    end
-  end if env_tz_works
-
-  def test_shifting_monthly
-    Dir.mktmpdir do |tmpdir|
-      assert_in_out_err([{"TZ"=>"UTC"}, *%W"-rlogger -C#{tmpdir} -"], "#{<<-"begin;"}\n#{<<-'end;'}")
-      begin;
-        begin
-          module FakeTime
-            attr_accessor :now
-          end
-
-          class << Time
-            prepend FakeTime
-          end
-
-          log = "log"
-          File.open(log, "w") {}
-          Time.now = Time.utc(2015, 12, 14, 0, 1, 1)
-          File.utime(Time.now, Time.now, log)
-
-          dev = Logger::LogDevice.new("log", shift_age: 'monthly')
-
-          Time.now = Time.utc(2015, 12, 31, 12, 34, 56)
-          dev.write("#{Time.now} hello-1\n")
-          File.utime(Time.now, Time.now, log)
-
-          Time.now = Time.utc(2016, 1, 1, 0, 1, 1)
-          dev.write("#{Time.now} hello-2\n")
-          File.utime(Time.now, Time.now, log)
-        ensure
-          dev.close if dev
-        end
-      end;
-      log = File.join(tmpdir, "log")
-      cont = File.read(log)
-      assert_match(/hello-2/, cont)
-      assert_not_match(/hello-1/, cont)
-      log = Dir.glob(log+".*")
-      assert_equal(1, log.size)
-      log, = *log
-      cont = File.read(log)
-      assert_match(/hello-1/, cont)
-      assert_equal("2015-12-31", cont[/^[-\d]+/])
-      assert_equal("20151231", log[/\d+\z/])
-    end
-  end if env_tz_works
-
-  def test_shifting_dst_change
-    Dir.mktmpdir do |tmpdir|
-      assert_in_out_err([{"TZ"=>"Europe/London"}, *%W"--disable=gems -rlogger -C#{tmpdir} -"], "#{<<-"begin;"}\n#{<<-'end;'}")
-      begin;
-        begin
-          module FakeTime
-            attr_accessor :now
-          end
-
-          class << Time
-            prepend FakeTime
-          end
-
-          log = "log"
-          File.open(log, "w") {}
-
-          Time.now = Time.mktime(2014, 3, 30, 0, 1, 1)
-          File.utime(Time.now, Time.now, log)
-
-          dev = Logger::LogDevice.new(log, shift_age: 'daily')
-          dev.write("#{Time.now} hello-1\n")
-          File.utime(*[Time.mktime(2014, 3, 30, 0, 2, 3)]*2, log)
-
-          Time.now = Time.mktime(2014, 3, 31, 0, 1, 1)
-          dev.write("#{Time.now} hello-2\n")
-          File.utime(Time.now, Time.now, log)
-        ensure
-          dev.close
-        end
-      end;
-
-      log = File.join(tmpdir, "log")
-      cont = File.read(log)
-      assert_match(/hello-2/, cont)
-      assert_not_match(/hello-1/, cont)
-      assert_file.exist?(log+".20140330")
-    end
-  end if env_tz_works
-
-  def test_shifting_weekly_dst_change
-    Dir.mktmpdir do |tmpdir|
-      assert_separately([{"TZ"=>"Europe/London"}, *%W"-rlogger -C#{tmpdir} -"], "#{<<-"begin;"}\n#{<<-'end;'}")
-      begin;
-        begin
-          module FakeTime
-            attr_accessor :now
-          end
-
-          class << Time
-            prepend FakeTime
-          end
-
-          log = "log"
-          File.open(log, "w") {}
-          Time.now = Time.mktime(2015, 10, 25, 0, 1, 1)
-          File.utime(Time.now, Time.now, log)
-
-          dev = Logger::LogDevice.new("log", shift_age: 'weekly')
-          dev.write("#{Time.now} hello-1\n")
-          File.utime(Time.now, Time.now, log)
-        ensure
-          dev.close if dev
-        end
-      end;
-      log = File.join(tmpdir, "log")
-      cont = File.read(log)
-      assert_match(/hello-1/, cont)
-    end
-  end if env_tz_works
-
-  def test_shifting_monthly_dst_change
-    Dir.mktmpdir do |tmpdir|
-      assert_separately([{"TZ"=>"Europe/London"}, *%W"-rlogger -C#{tmpdir} -"], "#{<<-"begin;"}\n#{<<-'end;'}")
-      begin;
-        begin
-          module FakeTime
-            attr_accessor :now
-          end
-
-          class << Time
-            prepend FakeTime
-          end
-
-          log = "log"
-          File.open(log, "w") {}
-          Time.now = Time.utc(2016, 9, 1, 0, 1, 1)
-          File.utime(Time.now, Time.now, log)
-
-          dev = Logger::LogDevice.new("log", shift_age: 'monthly')
-
-          Time.now = Time.utc(2016, 9, 8, 7, 6, 5)
-          dev.write("#{Time.now} hello-1\n")
-          File.utime(Time.now, Time.now, log)
-
-          Time.now = Time.utc(2016, 10, 9, 8, 7, 6)
-          dev.write("#{Time.now} hello-2\n")
-          File.utime(Time.now, Time.now, log)
-
-          Time.now = Time.utc(2016, 10, 9, 8, 7, 7)
-          dev.write("#{Time.now} hello-3\n")
-          File.utime(Time.now, Time.now, log)
-        ensure
-          dev.close if dev
-        end
-      end;
-      log = File.join(tmpdir, "log")
-      cont = File.read(log)
-      assert_match(/hello-2/, cont)
-      assert_not_match(/hello-1/, cont)
-      log = Dir.glob(log+".*")
-      assert_equal(1, log.size)
-      log, = *log
-      cont = File.read(log)
-      assert_match(/hello-1/, cont)
-      assert_equal("2016-09-08", cont[/^[-\d]+/])
-      assert_equal("20160930", log[/\d+\z/])
-    end
-  end if env_tz_works
-
-  def test_shifting_midnight_exist_file
-    Dir.mktmpdir do |tmpdir|
-      assert_in_out_err([*%W"--disable=gems -rlogger -C#{tmpdir} -"], "#{<<-"begin;"}\n#{<<-'end;'}")
-      begin;
-        begin
-          module FakeTime
-            attr_accessor :now
-          end
-
-          class << Time
-            prepend FakeTime
-          end
-
-          log = "log"
-          File.open(log, "w") {}
-          File.utime(*[Time.mktime(2014, 1, 2, 0, 0, 0)]*2, log)
-
-          Time.now = Time.mktime(2014, 1, 2, 23, 59, 59, 999000)
-          dev = Logger::LogDevice.new(log, shift_age: 'daily')
-          dev.write("#{Time.now} hello-1\n")
-          dev.close
-          File.utime(Time.now, Time.now, log)
-
-          Time.now = Time.mktime(2014, 1, 3, 1, 1, 1)
-          dev = Logger::LogDevice.new(log, shift_age: 'daily')
-          dev.write("#{Time.now} hello-2\n")
-          File.utime(Time.now, Time.now, log)
-        ensure
-          dev.close
-        end
-      end;
-
-      bug = '[GH-539]'
-      log = File.join(tmpdir, "log")
-      cont = File.read(log)
-      assert_match(/hello-2/, cont)
-      assert_not_match(/hello-1/, cont)
-      assert_file.for(bug).exist?(log+".20140102")
-      assert_match(/hello-1/, File.read(log+".20140102"), bug)
-    end
-  end
-
-  env_tz_works = /linux|darwin|freebsd/ =~ RUBY_PLATFORM # borrow from test/ruby/test_time_tz.rb
-
-  def test_shifting_weekly_exist_file
-    Dir.mktmpdir do |tmpdir|
-      assert_in_out_err([{"TZ"=>"UTC"}, *%W"-rlogger -C#{tmpdir} -"], "#{<<-"begin;"}\n#{<<-'end;'}")
-      begin;
-        begin
-          module FakeTime
-            attr_accessor :now
-          end
-
-          class << Time
-            prepend FakeTime
-          end
-
-          log = "log"
-          File.open(log, "w") {}
-          Time.now = Time.utc(2015, 12, 14, 0, 1, 1)
-          File.utime(Time.now, Time.now, log)
-
-          dev = Logger::LogDevice.new("log", shift_age: 'weekly')
-
-          Time.now = Time.utc(2015, 12, 19, 12, 34, 56)
-          dev.write("#{Time.now} hello-1\n")
-          dev.close
-          File.utime(Time.now, Time.now, log)
-
-          Time.now = Time.utc(2015, 12, 20, 0, 1, 1)
-          dev = Logger::LogDevice.new("log", shift_age: 'weekly')
-          dev.write("#{Time.now} hello-2\n")
-          File.utime(Time.now, Time.now, log)
-        ensure
-          dev.close if dev
-        end
-      end;
-      log = File.join(tmpdir, "log")
-      cont = File.read(log)
-      assert_match(/hello-2/, cont)
-      assert_not_match(/hello-1/, cont)
-      log = Dir.glob(log+".*")
-      assert_equal(1, log.size)
-      log, = *log
-      cont = File.read(log)
-      assert_match(/hello-1/, cont)
-      assert_equal("2015-12-19", cont[/^[-\d]+/])
-      assert_equal("20151219", log[/\d+\z/])
-    end
-  end if env_tz_works
-
-  def test_shifting_monthly_exist_file
-    Dir.mktmpdir do |tmpdir|
-      assert_in_out_err([{"TZ"=>"UTC"}, *%W"-rlogger -C#{tmpdir} -"], "#{<<-"begin;"}\n#{<<-'end;'}")
-      begin;
-        begin
-          module FakeTime
-            attr_accessor :now
-          end
-
-          class << Time
-            prepend FakeTime
-          end
-
-          log = "log"
-          File.open(log, "w") {}
-          Time.now = Time.utc(2015, 12, 14, 0, 1, 1)
-          File.utime(Time.now, Time.now, log)
-
-          dev = Logger::LogDevice.new("log", shift_age: 'monthly')
-
-          Time.now = Time.utc(2015, 12, 31, 12, 34, 56)
-          dev.write("#{Time.now} hello-1\n")
-          dev.close
-          File.utime(Time.now, Time.now, log)
-
-          Time.now = Time.utc(2016, 1, 1, 0, 1, 1)
-          dev = Logger::LogDevice.new("log", shift_age: 'monthly')
-          dev.write("#{Time.now} hello-2\n")
-          File.utime(Time.now, Time.now, log)
-        ensure
-          dev.close if dev
-        end
-      end;
-      log = File.join(tmpdir, "log")
-      cont = File.read(log)
-      assert_match(/hello-2/, cont)
-      assert_not_match(/hello-1/, cont)
-      log = Dir.glob(log+".*")
-      assert_equal(1, log.size)
-      log, = *log
-      cont = File.read(log)
-      assert_match(/hello-1/, cont)
-      assert_equal("2015-12-31", cont[/^[-\d]+/])
-      assert_equal("20151231", log[/\d+\z/])
-    end
-  end if env_tz_works
-
-  private
-
-  def run_children(n, args, src)
-    r, w = IO.pipe
-    [w, *(1..n).map do
-       f = IO.popen([EnvUtil.rubybin, *%w[--disable=gems -rlogger -], *args], "w", err: w)
-       f.puts(src)
-       f
-     end].each(&:close)
-    stderr = r.read
-    r.close
-    stderr
-  end
-end
diff --git a/test/logger/test_logger.rb b/test/logger/test_logger.rb
deleted file mode 100644
index 37d0f5862ab1b0..00000000000000
--- a/test/logger/test_logger.rb
+++ /dev/null
@@ -1,393 +0,0 @@
-# coding: US-ASCII
-# frozen_string_literal: false
-require 'logger'
-require 'tempfile'
-
-class TestLogger < Test::Unit::TestCase
-  include Logger::Severity
-
-  def setup
-    @logger = Logger.new(nil)
-  end
-
-  class Log
-    attr_reader :label, :datetime, :pid, :severity, :progname, :msg
-    def initialize(line)
-      /\A(\w+), \[([^#]*) #(\d+)\]\s+(\w+) -- (\w*): ([\x0-\xff]*)/ =~ line
-      @label, @datetime, @pid, @severity, @progname, @msg = $1, $2, $3, $4, $5, $6
-    end
-  end
-
-  def log_add(logger, severity, msg, progname = nil, &block)
-    log(logger, :add, severity, msg, progname, &block)
-  end
-
-  def log(logger, msg_id, *arg, &block)
-    Log.new(log_raw(logger, msg_id, *arg, &block))
-  end
-
-  def log_raw(logger, msg_id, *arg, &block)
-    Tempfile.create(File.basename(__FILE__) + '.log') {|logdev|
-      logger.instance_eval { @logdev = Logger::LogDevice.new(logdev) }
-      logger.__send__(msg_id, *arg, &block)
-      logdev.rewind
-      logdev.read
-    }
-  end
-
-  def test_level
-    @logger.level = UNKNOWN
-    assert_equal(UNKNOWN, @logger.level)
-    @logger.level = INFO
-    assert_equal(INFO, @logger.level)
-    @logger.sev_threshold = ERROR
-    assert_equal(ERROR, @logger.sev_threshold)
-    @logger.sev_threshold = WARN
-    assert_equal(WARN, @logger.sev_threshold)
-    assert_equal(WARN, @logger.level)
-
-    @logger.level = DEBUG
-    assert(@logger.debug?)
-    assert(@logger.info?)
-    @logger.level = INFO
-    assert(!@logger.debug?)
-    assert(@logger.info?)
-    assert(@logger.warn?)
-    @logger.level = WARN
-    assert(!@logger.info?)
-    assert(@logger.warn?)
-    assert(@logger.error?)
-    @logger.level = ERROR
-    assert(!@logger.warn?)
-    assert(@logger.error?)
-    assert(@logger.fatal?)
-    @logger.level = FATAL
-    assert(!@logger.error?)
-    assert(@logger.fatal?)
-    @logger.level = UNKNOWN
-    assert(!@logger.error?)
-    assert(!@logger.fatal?)
-  end
-
-  def test_symbol_level
-    logger_symbol_levels = {
-      debug:   DEBUG,
-      info:    INFO,
-      warn:    WARN,
-      error:   ERROR,
-      fatal:   FATAL,
-      unknown: UNKNOWN,
-      DEBUG:   DEBUG,
-      INFO:    INFO,
-      WARN:    WARN,
-      ERROR:   ERROR,
-      FATAL:   FATAL,
-      UNKNOWN: UNKNOWN,
-    }
-    logger_symbol_levels.each do |symbol, level|
-      @logger.level = symbol
-      assert(@logger.level == level)
-    end
-    assert_raise(ArgumentError) { @logger.level = :something_wrong }
-  end
-
-  def test_string_level
-    logger_string_levels = {
-      'debug'   => DEBUG,
-      'info'    => INFO,
-      'warn'    => WARN,
-      'error'   => ERROR,
-      'fatal'   => FATAL,
-      'unknown' => UNKNOWN,
-      'DEBUG'   => DEBUG,
-      'INFO'    => INFO,
-      'WARN'    => WARN,
-      'ERROR'   => ERROR,
-      'FATAL'   => FATAL,
-      'UNKNOWN' => UNKNOWN,
-    }
-    logger_string_levels.each do |string, level|
-      @logger.level = string
-      assert(@logger.level == level)
-    end
-    assert_raise(ArgumentError) { @logger.level = 'something_wrong' }
-  end
-
-  def test_progname
-    assert_nil(@logger.progname)
-    @logger.progname = "name"
-    assert_equal("name", @logger.progname)
-  end
-
-  def test_datetime_format
-    verbose, $VERBOSE = $VERBOSE, false
-    dummy = STDERR
-    logger = Logger.new(dummy)
-    log = log_add(logger, INFO, "foo")
-    assert_match(/^\d\d\d\d-\d\d-\d\dT\d\d:\d\d:\d\d.\s*\d+$/, log.datetime)
-    logger.datetime_format = "%d%b%Y@%H:%M:%S"
-    log = log_add(logger, INFO, "foo")
-    assert_match(/^\d\d\w\w\w\d\d\d\d@\d\d:\d\d:\d\d$/, log.datetime)
-    logger.datetime_format = ""
-    log = log_add(logger, INFO, "foo")
-    assert_match(/^$/, log.datetime)
-  ensure
-    $VERBOSE = verbose
-  end
-
-  def test_formatter
-    dummy = STDERR
-    logger = Logger.new(dummy)
-    # default
-    log = log(logger, :info, "foo")
-    assert_equal("foo\n", log.msg)
-    # config
-    logger.formatter = proc { |severity, timestamp, progname, msg|
-      "#{severity}:#{msg}\n\n"
-    }
-    line = log_raw(logger, :info, "foo")
-    assert_equal("INFO:foo\n\n", line)
-    # recover
-    logger.formatter = nil
-    log = log(logger, :info, "foo")
-    assert_equal("foo\n", log.msg)
-    # again
-    o = Object.new
-    def o.call(severity, timestamp, progname, msg)
-      "<<#{severity}-#{msg}>>\n"
-    end
-    logger.formatter = o
-    line = log_raw(logger, :info, "foo")
-    assert_equal("<""<INFO-foo>>\n", line)
-  end
-
-  def test_initialize
-    logger = Logger.new(STDERR)
-    assert_nil(logger.progname)
-    assert_equal(DEBUG, logger.level)
-    assert_nil(logger.datetime_format)
-  end
-
-  def test_initialize_with_level
-    # default
-    logger = Logger.new(STDERR)
-    assert_equal(Logger::DEBUG, logger.level)
-    # config
-    logger = Logger.new(STDERR, level: :info)
-    assert_equal(Logger::INFO, logger.level)
-  end
-
-  def test_initialize_with_progname
-    # default
-    logger = Logger.new(STDERR)
-    assert_equal(nil, logger.progname)
-    # config
-    logger = Logger.new(STDERR, progname: :progname)
-    assert_equal(:progname, logger.progname)
-  end
-
-  def test_initialize_with_formatter
-    # default
-    logger = Logger.new(STDERR)
-    log = log(logger, :info, "foo")
-    assert_equal("foo\n", log.msg)
-    # config
-    logger = Logger.new(STDERR, formatter: proc { |severity, timestamp, progname, msg|
-      "#{severity}:#{msg}\n\n"
-    })
-    line = log_raw(logger, :info, "foo")
-    assert_equal("INFO:foo\n\n", line)
-  end
-
-  def test_initialize_with_datetime_format
-    # default
-    logger = Logger.new(STDERR)
-    log = log_add(logger, INFO, "foo")
-    assert_match(/^\d\d\d\d-\d\d-\d\dT\d\d:\d\d:\d\d.\s*\d+$/, log.datetime)
-    # config
-    logger = Logger.new(STDERR, datetime_format: "%d%b%Y@%H:%M:%S")
-    log = log_add(logger, INFO, "foo")
-    assert_match(/^\d\d\w\w\w\d\d\d\d@\d\d:\d\d:\d\d$/, log.datetime)
-  end
-
-  def test_reopen
-    logger = Logger.new(STDERR)
-    logger.reopen(STDOUT)
-    assert_equal(STDOUT, logger.instance_variable_get(:@logdev).dev)
-  end
-
-  def test_reopen_nil_logdevice
-    logger = Logger.new(File::NULL)
-    assert_nothing_raised do
-      logger.reopen(STDOUT)
-    end
-  end
-
-  def test_add
-    logger = Logger.new(nil)
-    logger.progname = "my_progname"
-    assert(logger.add(INFO))
-    log = log_add(logger, nil, "msg")
-    assert_equal("ANY", log.severity)
-    assert_equal("my_progname", log.progname)
-    logger.level = WARN
-    assert(logger.log(INFO))
-    assert_nil(log_add(logger, INFO, "msg").msg)
-    log = log_add(logger, WARN, nil) { "msg" }
-    assert_equal("msg\n", log.msg)
-    log = log_add(logger, WARN, "") { "msg" }
-    assert_equal("\n", log.msg)
-    assert_equal("my_progname", log.progname)
-    log = log_add(logger, WARN, nil, "progname?")
-    assert_equal("progname?\n", log.msg)
-    assert_equal("my_progname", log.progname)
-    #
-    logger = Logger.new(nil)
-    log = log_add(logger, INFO, nil, false)
-    assert_equal("false\n", log.msg)
-  end
-
-  def test_add_binary_data_with_binmode_logdev
-    EnvUtil.with_default_internal(Encoding::UTF_8) do
-      begin
-        tempfile = Tempfile.new("logger")
-        tempfile.close
-        filename = tempfile.path
-        File.unlink(filename)
-
-        logger = Logger.new filename, binmode: true
-        logger.level = Logger::DEBUG
-
-        str = +"\x80"
-        str.force_encoding("ASCII-8BIT")
-
-        logger.add Logger::DEBUG, str
-        assert_equal(2, File.binread(filename).split(/\n/).size)
-      ensure
-        logger.close
-        tempfile.unlink
-      end
-    end
-  end
-
-  def test_level_log
-    logger = Logger.new(nil)
-    logger.progname = "my_progname"
-    log = log(logger, :debug, "custom_progname") { "msg" }
-    assert_equal("msg\n", log.msg)
-    assert_equal("custom_progname", log.progname)
-    assert_equal("DEBUG", log.severity)
-    assert_equal("D", log.label)
-    #
-    log = log(logger, :debug) { "msg_block" }
-    assert_equal("msg_block\n", log.msg)
-    assert_equal("my_progname", log.progname)
-    log = log(logger, :debug, "msg_inline")
-    assert_equal("msg_inline\n", log.msg)
-    assert_equal("my_progname", log.progname)
-    #
-    log = log(logger, :info, "custom_progname") { "msg" }
-    assert_equal("msg\n", log.msg)
-    assert_equal("custom_progname", log.progname)
-    assert_equal("INFO", log.severity)
-    assert_equal("I", log.label)
-    #
-    log = log(logger, :warn, "custom_progname") { "msg" }
-    assert_equal("msg\n", log.msg)
-    assert_equal("custom_progname", log.progname)
-    assert_equal("WARN", log.severity)
-    assert_equal("W", log.label)
-    #
-    log = log(logger, :error, "custom_progname") { "msg" }
-    assert_equal("msg\n", log.msg)
-    assert_equal("custom_progname", log.progname)
-    assert_equal("ERROR", log.severity)
-    assert_equal("E", log.label)
-    #
-    log = log(logger, :fatal, "custom_progname") { "msg" }
-    assert_equal("msg\n", log.msg)
-    assert_equal("custom_progname", log.progname)
-    assert_equal("FATAL", log.severity)
-    assert_equal("F", log.label)
-    #
-    log = log(logger, :unknown, "custom_progname") { "msg" }
-    assert_equal("msg\n", log.msg)
-    assert_equal("custom_progname", log.progname)
-    assert_equal("ANY", log.severity)
-    assert_equal("A", log.label)
-  end
-
-  def test_close
-    r, w = IO.pipe
-    assert(!w.closed?)
-    logger = Logger.new(w)
-    logger.close
-    assert(w.closed?)
-    r.close
-  end
-
-  class MyError < StandardError
-  end
-
-  class MyMsg
-    def inspect
-      "my_msg"
-    end
-  end
-
-  def test_format
-    logger = Logger.new(nil)
-    log = log_add(logger, INFO, "msg\n")
-    assert_equal("msg\n\n", log.msg)
-    begin
-      raise MyError.new("excn")
-    rescue MyError => e
-      log = log_add(logger, INFO, e)
-      assert_match(/^excn \(TestLogger::MyError\)/, log.msg)
-      # expects backtrace is dumped across multi lines.  10 might be changed.
-      assert(log.msg.split(/\n/).size >= 10)
-    end
-    log = log_add(logger, INFO, MyMsg.new)
-    assert_equal("my_msg\n", log.msg)
-  end
-
-  def test_lshift
-    r, w = IO.pipe
-    logger = Logger.new(w)
-    logger << "msg"
-    IO.select([r], nil, nil, 0.1)
-    w.close
-    msg = r.read
-    r.close
-    assert_equal("msg", msg)
-    #
-    r, w = IO.pipe
-    logger = Logger.new(w)
-    logger << "msg2\n\n"
-    IO.select([r], nil, nil, 0.1)
-    w.close
-    msg = r.read
-    r.close
-    assert_equal("msg2\n\n", msg)
-  end
-
-  class CustomLogger < Logger
-    def level
-      INFO
-    end
-  end
-
-  def test_overriding_level
-    logger = CustomLogger.new(nil)
-    log = log(logger, :info) { "msg" }
-    assert_equal "msg\n", log.msg
-    #
-    log = log(logger, :debug) { "msg" }
-    assert_nil log.msg
-  end
-
-  def test_does_not_instantiate_log_device_for_File_NULL
-    l = Logger.new(File::NULL)
-    assert_nil(l.instance_variable_get(:@logdev))
-  end
-end
diff --git a/test/logger/test_logperiod.rb b/test/logger/test_logperiod.rb
deleted file mode 100644
index 6e6e5e95337486..00000000000000
--- a/test/logger/test_logperiod.rb
+++ /dev/null
@@ -1,80 +0,0 @@
-# coding: US-ASCII
-# frozen_string_literal: false
-require 'logger'
-require 'time'
-
-class TestLogPeriod < Test::Unit::TestCase
-  def test_next_rotate_time
-    time = Time.parse("2019-07-18 13:52:02")
-
-    daily_result = Logger::Period.next_rotate_time(time, 'daily')
-    next_day = Time.parse("2019-07-19 00:00:00")
-    assert_equal(next_day, daily_result)
-
-    weekly_result = Logger::Period.next_rotate_time(time, 'weekly')
-    next_week = Time.parse("2019-07-21 00:00:00")
-    assert_equal(next_week, weekly_result)
-
-    monthly_result = Logger::Period.next_rotate_time(time, 'monthly')
-    next_month = Time.parse("2019-08-1 00:00:00")
-    assert_equal(next_month, monthly_result)
-
-    assert_raise(ArgumentError) { Logger::Period.next_rotate_time(time, 'invalid') }
-  end
-
-  def test_next_rotate_time_extreme_cases
-    # First day of Month and Saturday
-    time = Time.parse("2018-07-01 00:00:00")
-
-    daily_result = Logger::Period.next_rotate_time(time, 'daily')
-    next_day = Time.parse("2018-07-02 00:00:00")
-    assert_equal(next_day, daily_result)
-
-    weekly_result = Logger::Period.next_rotate_time(time, 'weekly')
-    next_week = Time.parse("2018-07-08 00:00:00")
-    assert_equal(next_week, weekly_result)
-
-    monthly_result = Logger::Period.next_rotate_time(time, 'monthly')
-    next_month = Time.parse("2018-08-1 00:00:00")
-    assert_equal(next_month, monthly_result)
-
-    assert_raise(ArgumentError) { Logger::Period.next_rotate_time(time, 'invalid') }
-  end
-
-  def test_previous_period_end
-    time = Time.parse("2019-07-18 13:52:02")
-
-    daily_result = Logger::Period.previous_period_end(time, 'daily')
-    day_ago = Time.parse("2019-07-17 23:59:59")
-    assert_equal(day_ago, daily_result)
-
-    weekly_result = Logger::Period.previous_period_end(time, 'weekly')
-    week_ago = Time.parse("2019-07-13 23:59:59")
-    assert_equal(week_ago, weekly_result)
-
-    monthly_result = Logger::Period.previous_period_end(time, 'monthly')
-    month_ago = Time.parse("2019-06-30 23:59:59")
-    assert_equal(month_ago, monthly_result)
-
-    assert_raise(ArgumentError) { Logger::Period.next_rotate_time(time, 'invalid') }
-  end
-
-  def test_previous_period_end_extreme_cases
-    # First day of Month and Saturday
-    time = Time.parse("2018-07-01 00:00:00")
-
-    daily_result = Logger::Period.previous_period_end(time, 'daily')
-    day_ago = Time.parse("2018-06-30 23:59:59")
-    assert_equal(day_ago, daily_result)
-
-    weekly_result = Logger::Period.previous_period_end(time, 'weekly')
-    week_ago = Time.parse("2018-06-30 23:59:59")
-    assert_equal(week_ago, weekly_result)
-
-    monthly_result = Logger::Period.previous_period_end(time, 'monthly')
-    month_ago = Time.parse("2018-06-30 23:59:59")
-    assert_equal(month_ago, monthly_result)
-
-    assert_raise(ArgumentError) { Logger::Period.next_rotate_time(time, 'invalid') }
-  end
-end
diff --git a/test/logger/test_severity.rb b/test/logger/test_severity.rb
deleted file mode 100644
index e1069c8262a00d..00000000000000
--- a/test/logger/test_severity.rb
+++ /dev/null
@@ -1,58 +0,0 @@
-# coding: US-ASCII
-# frozen_string_literal: false
-require 'logger'
-
-class TestLoggerSeverity < Test::Unit::TestCase
-  include Logger::Severity
-
-  def test_enum
-    logger_levels = Logger.constants
-    levels = ["WARN", "UNKNOWN", "INFO", "FATAL", "DEBUG", "ERROR"]
-    Logger::Severity.constants.each do |level|
-      assert(levels.include?(level.to_s))
-      assert(logger_levels.include?(level))
-    end
-    assert_equal(levels.size, Logger::Severity.constants.size)
-  end
-
-  def test_level_assignment
-    logger = Logger.new(nil)
-
-    Logger::Severity.constants.each do |level|
-      next if level == :UNKNOWN
-
-      logger.send("#{level.downcase}!")
-      assert(logger.level) == Logger::Severity.const_get(level)
-    end
-  end
-
-  def test_thread_local_level
-    logger = Logger.new(nil)
-    logger.level = INFO # default level
-    other = Logger.new(nil)
-    other.level = ERROR # default level
-
-    assert_equal(other.level, ERROR)
-    logger.with_level(:WARN) do
-      assert_equal(other.level, ERROR)
-      assert_equal(logger.level, WARN)
-
-      logger.with_level(DEBUG) do # verify reentrancy
-        assert_equal(logger.level, DEBUG)
-
-        Thread.new do
-          assert_equal(logger.level, INFO)
-          logger.with_level(:WARN) do
-            assert_equal(other.level, ERROR)
-            assert_equal(logger.level, WARN)
-          end
-          assert_equal(logger.level, INFO)
-        end.join
-
-        assert_equal(logger.level, DEBUG)
-      end
-      assert_equal(logger.level, WARN)
-    end
-    assert_equal(logger.level, INFO)
-  end
-end
diff --git a/test/mkmf/test_config.rb b/test/mkmf/test_config.rb
index 7211c61d53ef8a..0d2cb3751ccc65 100644
--- a/test/mkmf/test_config.rb
+++ b/test/mkmf/test_config.rb
@@ -1,5 +1,6 @@
 # frozen_string_literal: false
 require_relative 'base'
+require 'tempfile'
 
 class TestMkmfConfig < TestMkmf
   def test_dir_config
@@ -27,4 +28,30 @@ def test_with_config_without_arg
       assert_equal(false, with_config("foo"))
     end;
   end
+
+  def test_with_target_rbconfig
+    Tempfile.create(%w"rbconfig .rb", ".") do |tmp|
+      tmp.puts <<~'end;'
+      module RbConfig
+        CONFIG = {}
+        MAKEFILE_CONFIG = {}
+
+        def self.fire_update!(key, value); end
+        def self.expand(val, config = CONFIG); val; end
+      end;
+      ::RbConfig::CONFIG.each do |k, v|
+        tmp.puts "  CONFIG[#{k.dump}] = #{v.dump}"
+      end
+      ::RbConfig::MAKEFILE_CONFIG.each do |k, v|
+        tmp.puts "  MAKEFILE_CONFIG[#{k.dump}] = #{v.dump}"
+      end
+      tmp.puts "  CONFIG['testing-only'] = 'ok'"
+      tmp.puts "end"
+      tmp.close
+      assert_separately([], ["--target-rbconfig=#{tmp.path}"], <<-'end;')
+        assert_equal("ok", MakeMakefile::RbConfig::CONFIG["testing-only"])
+        assert_not_equal(::RbConfig, MakeMakefile::RbConfig)
+      end;
+    end
+  end
 end
diff --git a/test/mkmf/test_flags.rb b/test/mkmf/test_flags.rb
index 6fde46adecbb72..3d908c6bb40b86 100644
--- a/test/mkmf/test_flags.rb
+++ b/test/mkmf/test_flags.rb
@@ -33,7 +33,7 @@ def test_valid_warnflags
   end
 
   def test_try_ldflag_invalid_opt
-    assert_separately([], [], <<-'end;') #do
+    assert_separately([], [], <<-'end;', timeout: 30) #do
       assert(!try_ldflags("nosuch.c"), TestMkmf::MKMFLOG)
       assert(have_devel?, TestMkmf::MKMFLOG)
     end;
@@ -47,7 +47,7 @@ def test_try_cflag_invalid_opt
   end
 
   def test_try_cppflag_invalid_opt
-    assert_separately([], [], <<-'end;') #do
+    assert_separately([], [], <<-'end;', timeout: 30) #do
       assert(!try_cppflags("nosuch.c"), TestMkmf::MKMFLOG)
       assert(have_devel?, TestMkmf::MKMFLOG)
     end;
diff --git a/test/mmtk/helper.rb b/test/mmtk/helper.rb
new file mode 100644
index 00000000000000..3bede9ed301895
--- /dev/null
+++ b/test/mmtk/helper.rb
@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+require "test/unit"
+require "core_assertions"
+
+module MMTk
+  class TestCase < ::Test::Unit::TestCase
+    include Test::Unit::CoreAssertions
+
+    def setup
+      omit "Not running on MMTk" unless using_mmtk?
+
+      @original_timeout_scale = EnvUtil.timeout_scale
+      timeout_scale = ENV["RUBY_TEST_TIMEOUT_SCALE"].to_f
+      EnvUtil.timeout_scale = timeout_scale if timeout_scale > 0
+
+      super
+    end
+
+    def teardown
+      if using_mmtk?
+        EnvUtil.timeout_scale = @original_timeout_scale
+      end
+    end
+
+    private
+
+    def using_mmtk?
+      GC.config[:implementation] == "mmtk"
+    end
+  end
+end
diff --git a/test/mmtk/test_configuration.rb b/test/mmtk/test_configuration.rb
new file mode 100644
index 00000000000000..427cd9a07941c9
--- /dev/null
+++ b/test/mmtk/test_configuration.rb
@@ -0,0 +1,93 @@
+# frozen_string_literal: true
+
+require_relative "helper"
+
+module MMTk
+  class TestConfiguration < TestCase
+    def test_MMTK_THREADS
+      assert_separately([{ "MMTK_THREADS" => "5" }], <<~RUBY)
+        assert_equal(5, GC.config[:mmtk_worker_count])
+      RUBY
+
+      assert_separately([{ "MMTK_THREADS" => "1" }], <<~RUBY)
+        assert_equal(1, GC.config[:mmtk_worker_count])
+      RUBY
+    end
+
+    %w(NoGC MarkSweep Immix).each do |plan|
+      define_method(:"test_MMTK_PLAN_#{plan}") do
+        assert_separately([{ "MMTK_PLAN" => plan }], <<~RUBY)
+          assert_equal("#{plan}", GC.config[:mmtk_plan])
+        RUBY
+      end
+    end
+
+    %w(fixed dynamic).each do |heap|
+      define_method(:"test_MMTK_HEAP_MODE_#{heap}") do
+        assert_separately([{ "MMTK_HEAP_MODE" => heap }], <<~RUBY)
+          assert_equal("#{heap}", GC.config[:mmtk_heap_mode])
+        RUBY
+      end
+    end
+
+    def test_MMTK_HEAP_MIN
+      # Defaults to 1MiB
+      assert_separately([], <<~RUBY)
+        assert_equal(1 * 1024 * 1024, GC.config[:mmtk_heap_min])
+      RUBY
+
+      assert_separately([{ "MMTK_HEAP_MODE" => "dynamic", "MMTK_HEAP_MIN" => "1" }], <<~RUBY)
+        assert_equal(1, GC.config[:mmtk_heap_min])
+      RUBY
+
+      assert_separately([{ "MMTK_HEAP_MODE" => "dynamic", "MMTK_HEAP_MIN" => "10MiB", "MMTK_HEAP_MAX" => "1GiB" }], <<~RUBY)
+        assert_equal(10 * 1024 * 1024, GC.config[:mmtk_heap_min])
+      RUBY
+    end
+
+    def test_MMTK_HEAP_MIN_is_ignored_for_fixed_heaps
+      assert_separately([{ "MMTK_HEAP_MODE" => "fixed", "MMTK_HEAP_MIN" => "1" }], <<~RUBY)
+        assert_nil(GC.config[:mmtk_heap_min])
+      RUBY
+    end
+
+    def test_MMTK_HEAP_MAX
+      assert_separately([{ "MMTK_HEAP_MODE" => "fixed", "MMTK_HEAP_MAX" => "100MiB" }], <<~RUBY)
+        assert_equal(100 * 1024 * 1024, GC.config[:mmtk_heap_max])
+      RUBY
+    end
+
+    %w(MMTK_THREADS MMTK_HEAP_MIN MMTK_HEAP_MAX MMTK_HEAP_MODE MMTK_PLAN).each do |var|
+      define_method(:"test_invalid_#{var}") do
+        exit_code = assert_in_out_err(
+          [{ var => "foobar" }, "--"],
+          "",
+          [],
+          ["[FATAL] Invalid #{var} foobar"]
+        )
+
+        assert_equal(1, exit_code.exitstatus)
+      end
+    end
+
+    def test_MMTK_HEAP_MIN_greater_than_or_equal_to_MMTK_HEAP_MAX
+      exit_code = assert_in_out_err(
+        [{ "MMTK_HEAP_MIN" => "100MiB", "MMTK_HEAP_MAX" => "10MiB" }, "--"],
+        "",
+        [],
+        ["[FATAL] MMTK_HEAP_MIN(104857600) >= MMTK_HEAP_MAX(10485760)"]
+      )
+
+      assert_equal(1, exit_code.exitstatus)
+
+      exit_code = assert_in_out_err(
+        [{ "MMTK_HEAP_MIN" => "10MiB", "MMTK_HEAP_MAX" => "10MiB" }, "--"],
+        "",
+        [],
+        ["[FATAL] MMTK_HEAP_MIN(10485760) >= MMTK_HEAP_MAX(10485760)"]
+      )
+
+      assert_equal(1, exit_code.exitstatus)
+    end
+  end
+end
diff --git a/test/monitor/test_monitor.rb b/test/monitor/test_monitor.rb
index 8ff6d006df7d07..4c55afca6c869e 100644
--- a/test/monitor/test_monitor.rb
+++ b/test/monitor/test_monitor.rb
@@ -300,6 +300,8 @@ def test_timedwait
         result4 = cond.wait
         assert_equal(true, result4)
         assert_equal("bar", c)
+      ensure
+        queue3.enq(nil)
       end
     end
     assert_join_threads([th, th2])
diff --git a/test/net/fixtures/Makefile b/test/net/fixtures/Makefile
index b2bc9c7368ee2e..88c232e3b6c16b 100644
--- a/test/net/fixtures/Makefile
+++ b/test/net/fixtures/Makefile
@@ -5,11 +5,11 @@ regen_certs:
 	make server.crt
 
 cacert.pem: server.key
-	openssl req -new -x509 -days 1825 -key server.key -out cacert.pem -text -subj "/C=JP/ST=Shimane/L=Matz-e city/O=Ruby Core Team/CN=Ruby Test CA/emailAddress=security@ruby-lang.org"
+	openssl req -new -x509 -days 3650 -key server.key -out cacert.pem -subj "/C=JP/ST=Shimane/L=Matz-e city/O=Ruby Core Team/CN=Ruby Test CA/emailAddress=security@ruby-lang.org"
 
 server.csr:
-	openssl req -new -key server.key -out server.csr -text -subj "/C=JP/ST=Shimane/O=Ruby Core Team/OU=Ruby Test/CN=localhost"
+	openssl req -new -key server.key -out server.csr -subj "/C=JP/ST=Shimane/O=Ruby Core Team/OU=Ruby Test/CN=localhost"
 
 server.crt: server.csr cacert.pem
-	openssl x509 -days 1825 -CA cacert.pem -CAkey server.key -set_serial 00 -in server.csr -req -text -out server.crt
+	openssl x509 -days 3650 -CA cacert.pem -CAkey server.key -set_serial 00 -in server.csr -req -out server.crt
 	rm server.csr
diff --git a/test/net/fixtures/cacert.pem b/test/net/fixtures/cacert.pem
index f623bd62ed3758..24c83f1c652253 100644
--- a/test/net/fixtures/cacert.pem
+++ b/test/net/fixtures/cacert.pem
@@ -1,24 +1,24 @@
 -----BEGIN CERTIFICATE-----
-MIID7TCCAtWgAwIBAgIJAIltvxrFAuSnMA0GCSqGSIb3DQEBCwUAMIGMMQswCQYD
-VQQGEwJKUDEQMA4GA1UECAwHU2hpbWFuZTEUMBIGA1UEBwwLTWF0ei1lIGNpdHkx
-FzAVBgNVBAoMDlJ1YnkgQ29yZSBUZWFtMRUwEwYDVQQDDAxSdWJ5IFRlc3QgQ0Ex
-JTAjBgkqhkiG9w0BCQEWFnNlY3VyaXR5QHJ1YnktbGFuZy5vcmcwHhcNMTkwMTAy
-MDI1ODI4WhcNMjQwMTAxMDI1ODI4WjCBjDELMAkGA1UEBhMCSlAxEDAOBgNVBAgM
-B1NoaW1hbmUxFDASBgNVBAcMC01hdHotZSBjaXR5MRcwFQYDVQQKDA5SdWJ5IENv
-cmUgVGVhbTEVMBMGA1UEAwwMUnVieSBUZXN0IENBMSUwIwYJKoZIhvcNAQkBFhZz
-ZWN1cml0eUBydWJ5LWxhbmcub3JnMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
-CgKCAQEAznlbjRVhz1NlutHVrhcGnK8W0qug2ujKXv1njSC4U6nJF6py7I9EeehV
-SaKePyv+I9z3K1LnfUHOtUbdwdKC77yN66A6q2aqzu5q09/NSykcZGOIF0GuItYI
-3nvW3IqBddff2ffsyR+9pBjfb5AIPP08WowF9q4s1eGULwZc4w2B8PFhtxYANd7d
-BvGLXFlcufv9tDtzyRi4t7eqxCRJkZQIZNZ6DHHIJrNxejOILfHLarI12yk8VK6L
-2LG4WgGqyeePiRyd1o1MbuiAFYqAwpXNUbRKg5NaZGwBHZk8UZ+uFKt1QMBURO5R
-WFy1c349jbWszTqFyL4Lnbg9HhAowQIDAQABo1AwTjAdBgNVHQ4EFgQU9tEiKdU9
-I9derQyc5nWPnc34nVMwHwYDVR0jBBgwFoAU9tEiKdU9I9derQyc5nWPnc34nVMw
-DAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAQEAxj7F/u3C3fgq24N7hGRA
-of7ClFQxGmo/IGT0AISzW3HiVYiFaikKhbO1NwD9aBpD8Zwe62sCqMh8jGV/b0+q
-aOORnWYNy2R6r9FkASAglmdF6xn3bhgGD5ls4pCvcG9FynGnGc24g6MrjFNrBYUS
-2iIZsg36i0IJswo/Dy6HLphCms2BMCD3DeWtfjePUiTmQHJo6HsQIKP/u4N4Fvee
-uMBInei2M4VU74fLXbmKl1F9AEX7JDP3BKSZG19Ch5pnUo4uXM1uNTGsi07P4Y0s
-K44+SKBC0bYEFbDK0eQWMrX3kIhkPxyIWhxdq9/NqPYjShuSEAhA6CSpmRg0pqc+
-mA==
+MIID+zCCAuOgAwIBAgIUGMvHl3EhtKPKcgc3NQSAYfFuC+8wDQYJKoZIhvcNAQEL
+BQAwgYwxCzAJBgNVBAYTAkpQMRAwDgYDVQQIDAdTaGltYW5lMRQwEgYDVQQHDAtN
+YXR6LWUgY2l0eTEXMBUGA1UECgwOUnVieSBDb3JlIFRlYW0xFTATBgNVBAMMDFJ1
+YnkgVGVzdCBDQTElMCMGCSqGSIb3DQEJARYWc2VjdXJpdHlAcnVieS1sYW5nLm9y
+ZzAeFw0yNDAxMDExMTQ3MjNaFw0zMzEyMjkxMTQ3MjNaMIGMMQswCQYDVQQGEwJK
+UDEQMA4GA1UECAwHU2hpbWFuZTEUMBIGA1UEBwwLTWF0ei1lIGNpdHkxFzAVBgNV
+BAoMDlJ1YnkgQ29yZSBUZWFtMRUwEwYDVQQDDAxSdWJ5IFRlc3QgQ0ExJTAjBgkq
+hkiG9w0BCQEWFnNlY3VyaXR5QHJ1YnktbGFuZy5vcmcwggEiMA0GCSqGSIb3DQEB
+AQUAA4IBDwAwggEKAoIBAQCw+egZQ6eumJKq3hfKfED4dE/tL4FI5sjqont9ABVI
++1GSqyi1bFBgsRjM0THllIdMbKmJtWwnKW8J+5OgNN8y6Xxv8JmM/Y5vQt2lis0f
+qXmG8UTz0VTWdlAXXmhUs6lSADvAaIe4RVrCsZ97L3ZQTryY7JRVcbB4khUN3Gp0
+yg+801SXzoFTTa+UGIRLE66jH51aa5VXu99hnv1OiH8tQrjdi8mH6uG/icq4XuIe
+NWMF32wHqIOOPvQcWV3M5D2vxJEj702Ku6k9OQXkAo17qRSEonWW4HtLbtmS8He1
+JNPc/n3dVUm+fM6NoDXPoLP7j55G9zKyqGtGAWXAj1MTAgMBAAGjUzBRMB0GA1Ud
+DgQWBBSJGVleDvFp9cu9R+E0/OKYzGkwkTAfBgNVHSMEGDAWgBSJGVleDvFp9cu9
+R+E0/OKYzGkwkTAPBgNVHRMBAf8EBTADAQH/MA0GCSqGSIb3DQEBCwUAA4IBAQBl
+8GLB8skAWlkSw/FwbUmEV3zyqu+p7PNP5YIYoZs0D74e7yVulGQ6PKMZH5hrZmHo
+orFSQU+VUUirG8nDGj7Rzce8WeWBxsaDGC8CE2dq6nC6LuUwtbdMnBrH0LRWAz48
+jGFF3jHtVz8VsGfoZTZCjukWqNXvU6hETT9GsfU+PZqbqcTVRPH52+XgYayKdIbD
+r97RM4X3+aXBHcUW0b76eyyi65RR/Xtvn8ioZt2AdX7T2tZzJyXJN3Hupp77s6Ui
+AZR35SToHCZeTZD12YBvLBdaTPLZN7O/Q/aAO9ZiJaZ7SbFOjz813B2hxXab4Fob
+2uJX6eMWTVxYK5D4M9lm
 -----END CERTIFICATE-----
diff --git a/test/net/fixtures/server.crt b/test/net/fixtures/server.crt
index 5ca78a6d146a00..5d2923795dabca 100644
--- a/test/net/fixtures/server.crt
+++ b/test/net/fixtures/server.crt
@@ -1,82 +1,21 @@
-Certificate:
-    Data:
-        Version: 3 (0x2)
-        Serial Number: 2 (0x2)
-    Signature Algorithm: sha256WithRSAEncryption
-        Issuer: C=JP, ST=Shimane, L=Matz-e city, O=Ruby Core Team, CN=Ruby Test CA/emailAddress=security@ruby-lang.org
-        Validity
-            Not Before: Jan  2 03:27:13 2019 GMT
-            Not After : Jan  1 03:27:13 2024 GMT
-        Subject: C=JP, ST=Shimane, O=Ruby Core Team, OU=Ruby Test, CN=localhost
-        Subject Public Key Info:
-            Public Key Algorithm: rsaEncryption
-                Public-Key: (2048 bit)
-                Modulus:
-                    00:e8:da:9c:01:2e:2b:10:ec:49:cd:5e:07:13:07:
-                    9c:70:9e:c6:74:bc:13:c2:e1:6f:c6:82:fd:e3:48:
-                    e0:2c:a5:68:c7:9e:42:de:60:54:65:e6:6a:14:57:
-                    7a:30:d0:cc:b5:b6:d9:c3:d2:df:c9:25:97:54:67:
-                    cf:f6:be:5e:cb:8b:ee:03:c5:e1:e2:f9:e7:f7:d1:
-                    0c:47:f0:b8:da:33:5a:ad:41:ad:e7:b5:a2:7b:b7:
-                    bf:30:da:60:f8:e3:54:a2:bc:3a:fd:1b:74:d9:dc:
-                    74:42:e9:29:be:df:ac:b4:4f:eb:32:f4:06:f1:e1:
-                    8c:4b:a8:8b:fb:29:e7:b1:bf:1d:01:ee:73:0f:f9:
-                    40:dc:d5:15:79:d9:c6:73:d0:c0:dd:cb:e4:da:19:
-                    47:80:c6:14:04:72:fd:9a:7c:8f:11:82:76:49:04:
-                    79:cc:f2:5c:31:22:95:13:3e:5d:40:a6:4d:e0:a3:
-                    02:26:7d:52:3b:bb:ed:65:a1:0f:ed:6b:b0:3c:d4:
-                    de:61:15:5e:d3:dd:68:09:9f:4a:57:a5:c2:a9:6d:
-                    86:92:c5:f4:a4:d4:b7:13:3b:52:63:24:05:e2:cc:
-                    e3:8a:3c:d4:35:34:2b:10:bb:58:72:e7:e1:8d:1d:
-                    74:8c:61:16:20:3d:d0:1c:4e:8f:6e:fd:fe:64:10:
-                    4f:41
-                Exponent: 65537 (0x10001)
-        X509v3 extensions:
-            X509v3 Basic Constraints: 
-                CA:FALSE
-            Netscape Comment: 
-                OpenSSL Generated Certificate
-            X509v3 Subject Key Identifier: 
-                ED:28:C2:7E:AB:4B:C8:E8:FE:55:6D:66:95:31:1C:2D:60:F9:02:36
-            X509v3 Authority Key Identifier: 
-                keyid:F6:D1:22:29:D5:3D:23:D7:5E:AD:0C:9C:E6:75:8F:9D:CD:F8:9D:53
-
-    Signature Algorithm: sha256WithRSAEncryption
-         1d:b8:c5:8b:72:41:20:65:ad:27:6f:15:63:06:26:12:8d:9c:
-         ad:ca:f4:db:97:b4:90:cb:ff:35:94:bb:2a:a7:a1:ab:1e:35:
-         2d:a5:3f:c9:24:b0:1a:58:89:75:3e:81:0a:2c:4f:98:f9:51:
-         fb:c0:a3:09:d0:0a:9b:e7:a2:b7:c3:60:40:c8:f4:6d:b2:6a:
-         56:12:17:4c:00:24:31:df:9c:60:ae:b1:68:54:a9:e6:b5:4a:
-         04:e6:92:05:86:d9:5a:dc:96:30:a5:58:de:14:99:0f:e5:15:
-         89:3e:9b:eb:80:e3:bd:83:c3:ea:33:35:4b:3e:2f:d3:0d:64:
-         93:67:7f:8d:f5:3f:0c:27:bc:37:5a:cc:d6:47:16:af:5a:62:
-         d2:da:51:f8:74:06:6b:24:ad:28:68:08:98:37:7d:ed:0e:ab:
-         1e:82:61:05:d0:ba:75:a0:ab:21:b0:9a:fd:2b:54:86:1d:0d:
-         1f:c2:d4:77:1f:72:26:5e:ad:8a:9f:09:36:6d:44:be:74:c2:
-         5a:3e:ff:5c:9d:75:d6:38:7b:c5:39:f9:44:6e:a1:d1:8e:ff:
-         63:db:c4:bb:c6:91:92:ca:5c:60:9b:1d:eb:0a:de:08:ee:bf:
-         da:76:03:65:62:29:8b:f8:7f:c7:86:73:1e:f6:1f:2d:89:69:
-         fd:be:bd:6e
 -----BEGIN CERTIFICATE-----
-MIID4zCCAsugAwIBAgIBAjANBgkqhkiG9w0BAQsFADCBjDELMAkGA1UEBhMCSlAx
-EDAOBgNVBAgMB1NoaW1hbmUxFDASBgNVBAcMC01hdHotZSBjaXR5MRcwFQYDVQQK
-DA5SdWJ5IENvcmUgVGVhbTEVMBMGA1UEAwwMUnVieSBUZXN0IENBMSUwIwYJKoZI
-hvcNAQkBFhZzZWN1cml0eUBydWJ5LWxhbmcub3JnMB4XDTE5MDEwMjAzMjcxM1oX
-DTI0MDEwMTAzMjcxM1owYDELMAkGA1UEBhMCSlAxEDAOBgNVBAgMB1NoaW1hbmUx
-FzAVBgNVBAoMDlJ1YnkgQ29yZSBUZWFtMRIwEAYDVQQLDAlSdWJ5IFRlc3QxEjAQ
-BgNVBAMMCWxvY2FsaG9zdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
-AOjanAEuKxDsSc1eBxMHnHCexnS8E8Lhb8aC/eNI4CylaMeeQt5gVGXmahRXejDQ
-zLW22cPS38kll1Rnz/a+XsuL7gPF4eL55/fRDEfwuNozWq1Bree1onu3vzDaYPjj
-VKK8Ov0bdNncdELpKb7frLRP6zL0BvHhjEuoi/sp57G/HQHucw/5QNzVFXnZxnPQ
-wN3L5NoZR4DGFARy/Zp8jxGCdkkEeczyXDEilRM+XUCmTeCjAiZ9Uju77WWhD+1r
-sDzU3mEVXtPdaAmfSlelwqlthpLF9KTUtxM7UmMkBeLM44o81DU0KxC7WHLn4Y0d
-dIxhFiA90BxOj279/mQQT0ECAwEAAaN7MHkwCQYDVR0TBAIwADAsBglghkgBhvhC
-AQ0EHxYdT3BlblNTTCBHZW5lcmF0ZWQgQ2VydGlmaWNhdGUwHQYDVR0OBBYEFO0o
-wn6rS8jo/lVtZpUxHC1g+QI2MB8GA1UdIwQYMBaAFPbRIinVPSPXXq0MnOZ1j53N
-+J1TMA0GCSqGSIb3DQEBCwUAA4IBAQAduMWLckEgZa0nbxVjBiYSjZytyvTbl7SQ
-y/81lLsqp6GrHjUtpT/JJLAaWIl1PoEKLE+Y+VH7wKMJ0Aqb56K3w2BAyPRtsmpW
-EhdMACQx35xgrrFoVKnmtUoE5pIFhtla3JYwpVjeFJkP5RWJPpvrgOO9g8PqMzVL
-Pi/TDWSTZ3+N9T8MJ7w3WszWRxavWmLS2lH4dAZrJK0oaAiYN33tDqsegmEF0Lp1
-oKshsJr9K1SGHQ0fwtR3H3ImXq2Knwk2bUS+dMJaPv9cnXXWOHvFOflEbqHRjv9j
-28S7xpGSylxgmx3rCt4I7r/adgNlYimL+H/HhnMe9h8tiWn9vr1u
+MIIDYTCCAkkCAQAwDQYJKoZIhvcNAQELBQAwgYwxCzAJBgNVBAYTAkpQMRAwDgYD
+VQQIDAdTaGltYW5lMRQwEgYDVQQHDAtNYXR6LWUgY2l0eTEXMBUGA1UECgwOUnVi
+eSBDb3JlIFRlYW0xFTATBgNVBAMMDFJ1YnkgVGVzdCBDQTElMCMGCSqGSIb3DQEJ
+ARYWc2VjdXJpdHlAcnVieS1sYW5nLm9yZzAeFw0yNDAxMDExMTQ3MjNaFw0zMzEy
+MjkxMTQ3MjNaMGAxCzAJBgNVBAYTAkpQMRAwDgYDVQQIDAdTaGltYW5lMRcwFQYD
+VQQKDA5SdWJ5IENvcmUgVGVhbTESMBAGA1UECwwJUnVieSBUZXN0MRIwEAYDVQQD
+DAlsb2NhbGhvc3QwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCw+egZ
+Q6eumJKq3hfKfED4dE/tL4FI5sjqont9ABVI+1GSqyi1bFBgsRjM0THllIdMbKmJ
+tWwnKW8J+5OgNN8y6Xxv8JmM/Y5vQt2lis0fqXmG8UTz0VTWdlAXXmhUs6lSADvA
+aIe4RVrCsZ97L3ZQTryY7JRVcbB4khUN3Gp0yg+801SXzoFTTa+UGIRLE66jH51a
+a5VXu99hnv1OiH8tQrjdi8mH6uG/icq4XuIeNWMF32wHqIOOPvQcWV3M5D2vxJEj
+702Ku6k9OQXkAo17qRSEonWW4HtLbtmS8He1JNPc/n3dVUm+fM6NoDXPoLP7j55G
+9zKyqGtGAWXAj1MTAgMBAAEwDQYJKoZIhvcNAQELBQADggEBACtGNdj5TEtnJBYp
+M+LhBeU3oNteldfycEm993gJp6ghWZFg23oX8fVmyEeJr/3Ca9bAgDqg0t9a0npN
+oWKEY6wVKqcHgu3gSvThF5c9KhGbeDDmlTSVVNQmXWX0K2d4lS2cwZHH8mCm2mrY
+PDqlEkSc7k4qSiqigdS8i80Yk+lDXWsm8CjsiC93qaRM7DnS0WPQR0c16S95oM6G
+VklFKUSDAuFjw9aVWA/nahOucjn0w5fVW6lyIlkBslC1ChlaDgJmvhz+Ol3iMsE0
+kAmFNu2KKPVrpMWaBID49QwQTDyhetNLaVVFM88iUdA9JDoVMEuP1mm39JqyzHTu
+uBrdP4Q=
 -----END CERTIFICATE-----
diff --git a/test/net/fixtures/server.key b/test/net/fixtures/server.key
index 7f2380e71e637b..6a83d5bcf4a521 100644
--- a/test/net/fixtures/server.key
+++ b/test/net/fixtures/server.key
@@ -1,28 +1,27 @@
------BEGIN PRIVATE KEY-----
-MIIEvwIBADANBgkqhkiG9w0BAQEFAASCBKkwggSlAgEAAoIBAQDo2pwBLisQ7EnN
-XgcTB5xwnsZ0vBPC4W/Ggv3jSOAspWjHnkLeYFRl5moUV3ow0My1ttnD0t/JJZdU
-Z8/2vl7Li+4DxeHi+ef30QxH8LjaM1qtQa3ntaJ7t78w2mD441SivDr9G3TZ3HRC
-6Sm+36y0T+sy9Abx4YxLqIv7Keexvx0B7nMP+UDc1RV52cZz0MDdy+TaGUeAxhQE
-cv2afI8RgnZJBHnM8lwxIpUTPl1Apk3gowImfVI7u+1loQ/ta7A81N5hFV7T3WgJ
-n0pXpcKpbYaSxfSk1LcTO1JjJAXizOOKPNQ1NCsQu1hy5+GNHXSMYRYgPdAcTo9u
-/f5kEE9BAgMBAAECggEBAOHkwhc7DLh8IhTDNSW26oMu5OP2WU1jmiYAigDmf+OQ
-DBgrZj+JQBci8qINQxL8XLukSZn5hvQCLc7Kbyu1/wyEEUFDxSGGwwzclodr9kho
-LX2LDASPZrOSzD2+fPi2wTKmXKuS6Uc44OjQfZkYMNkz9r4Vkm8xGgOD3VipjIYX
-QXlhhdqkXZcNABsihCV52GKkDFSVm8jv95YJc5xhoYCy/3a4/qPdF0aT2R7oYUej
-hKrxVDskyooe8Zg/JTydZNV5GQEDmW01/K3r6XGT26oPi1AqMU1gtv/jkW56CRQQ
-1got8smnqM+AV7Slf9R6DauIPdQJ2S8wsr/o8ISBsOECgYEA9YrqEP2gAYSGFXRt
-liw0WI2Ant8BqXS6yvq1jLo/qWhLw/ph4Di73OQ2mpycVTpgfGr2wFPQR1XJ+0Fd
-U+Ir/C3Q7FK4VIGHK7B0zNvZr5tEjlFfeRezo2JMVw5YWeSagIFcSwK+KqCTH9qc
-pw/Eb8nB/4XNcpTZu7Fg0Wc+ooUCgYEA8sVaicn1Wxkpb45a4qfrA6wOr5xdJ4cC
-A5qs7vjX2OdPIQOmoQhdI7bCWFXZzF33wA4YCws6j5wRaySLIJqdms8Gl9QnODy1
-ZlA5gwKToBC/jqPmWAXSKb8EH7cHilaxU9OKnQ7CfwlGLHqjMtjrhR7KHlt3CVRs
-oRmvsjZVXI0CgYAmPedslAO6mMhFSSfULrhMXmV82OCqYrrA6EEkVNGbcdnzAOkD
-gfKIWabDd8bFY10po4Mguy0CHzNhBXIioWQWV5BlbhC1YKMLw+S9DzSdLAKGY9gJ
-xQ4+UQ3wtRQ/k+IYR413RUsW2oFvgZ3KSyNeAb9MK6uuv84VdG/OzVSs/QKBgQDn
-kap//l2EbObiWyaERunckdVcW0lcN+KK75J/TGwPoOwQsLvTpPe65kxRGGrtDsEQ
-uCDk/+v3KkZPLgdrrTAih9FhJ+PVN8tMcb+6IM4SA4fFFr/UPJEwct0LJ3oQ0grJ
-y+HPWFHb/Uurh7t99/4H98uR02sjQh1wOeEmm78mzQKBgQDm+LzGH0se6CXQ6cdZ
-g1JRZeXkDEsrW3hfAsW62xJQmXcWxBoblP9OamMY+A06rM5og3JbDk5Zm6JsOaA8
-wS2gw4ilp46jors4eQey8ux7kB9LzdBoDBBElnsbjLO8oBNZlVcYXg+6BOl/CUi7
-2whRF0FEjKA8ehrNhAq+VFfFNw==
------END PRIVATE KEY-----
+-----BEGIN RSA PRIVATE KEY-----
+MIIEowIBAAKCAQEAsPnoGUOnrpiSqt4XynxA+HRP7S+BSObI6qJ7fQAVSPtRkqso
+tWxQYLEYzNEx5ZSHTGypibVsJylvCfuToDTfMul8b/CZjP2Ob0LdpYrNH6l5hvFE
+89FU1nZQF15oVLOpUgA7wGiHuEVawrGfey92UE68mOyUVXGweJIVDdxqdMoPvNNU
+l86BU02vlBiESxOuox+dWmuVV7vfYZ79Toh/LUK43YvJh+rhv4nKuF7iHjVjBd9s
+B6iDjj70HFldzOQ9r8SRI+9NirupPTkF5AKNe6kUhKJ1luB7S27ZkvB3tSTT3P59
+3VVJvnzOjaA1z6Cz+4+eRvcysqhrRgFlwI9TEwIDAQABAoIBAEEYiyDP29vCzx/+
+dS3LqnI5BjUuJhXUnc6AWX/PCgVAO+8A+gZRgvct7PtZb0sM6P9ZcLrweomlGezI
+FrL0/6xQaa8bBr/ve/a8155OgcjFo6fZEw3Dz7ra5fbSiPmu4/b/kvrg+Br1l77J
+aun6uUAs1f5B9wW+vbR7tzbT/mxaUeDiBzKpe15GwcvbJtdIVMa2YErtRjc1/5B2
+BGVXyvlJv0SIlcIEMsHgnAFOp1ZgQ08aDzvilLq8XVMOahAhP1O2A3X8hKdXPyrx
+IVWE9bS9ptTo+eF6eNl+d7htpKGEZHUxinoQpWEBTv+iOoHsVunkEJ3vjLP3lyI/
+fY0NQ1ECgYEA3RBXAjgvIys2gfU3keImF8e/TprLge1I2vbWmV2j6rZCg5r/AS0u
+pii5CvJ5/T5vfJPNgPBy8B/yRDs+6PJO1GmnlhOkG9JAIPkv0RBZvR0PMBtbp6nT
+Y3yo1lwamBVBfY6rc0sLTzosZh2aGoLzrHNMQFMGaauORzBFpY5lU50CgYEAzPHl
+u5DI6Xgep1vr8QvCUuEesCOgJg8Yh1UqVoY/SmQh6MYAv1I9bLGwrb3WW/7kqIoD
+fj0aQV5buVZI2loMomtU9KY5SFIsPV+JuUpy7/+VE01ZQM5FdY8wiYCQiVZYju9X
+Wz5LxMNoz+gT7pwlLCsC4N+R8aoBk404aF1gum8CgYAJ7VTq7Zj4TFV7Soa/T1eE
+k9y8a+kdoYk3BASpCHJ29M5R2KEA7YV9wrBklHTz8VzSTFTbKHEQ5W5csAhoL5Fo
+qoHzFFi3Qx7MHESQb9qHyolHEMNx6QdsHUn7rlEnaTTyrXh3ifQtD6C0yTmFXUIS
+CW9wKApOrnyKJ9nI0HcuZQKBgQCMtoV6e9VGX4AEfpuHvAAnMYQFgeBiYTkBKltQ
+XwozhH63uMMomUmtSG87Sz1TmrXadjAhy8gsG6I0pWaN7QgBuFnzQ/HOkwTm+qKw
+AsrZt4zeXNwsH7QXHEJCFnCmqw9QzEoZTrNtHJHpNboBuVnYcoueZEJrP8OnUG3r
+UjmopwKBgAqB2KYYMUqAOvYcBnEfLDmyZv9BTVNHbR2lKkMYqv5LlvDaBxVfilE0
+2riO4p6BaAdvzXjKeRrGNEKoHNBpOSfYCOM16NjL8hIZB1CaV3WbT5oY+jp7Mzd5
+7d56RZOE+ERK2uz/7JX9VSsM/LbH9pJibd4e8mikDS9ntciqOH/3
+-----END RSA PRIVATE KEY-----
diff --git a/test/net/http/test_http.rb b/test/net/http/test_http.rb
index 0508645ac55b28..366b4cd12c8de5 100644
--- a/test/net/http/test_http.rb
+++ b/test/net/http/test_http.rb
@@ -126,10 +126,10 @@ def test_proxy_address
 
   def test_proxy_address_no_proxy
     TestNetHTTPUtils.clean_http_proxy_env do
-      http = Net::HTTP.new 'hostname.example', nil, 'proxy.example', nil, nil, nil, 'example'
+      http = Net::HTTP.new 'hostname.example', nil, 'proxy.com', nil, nil, nil, 'example'
       assert_nil http.proxy_address
 
-      http = Net::HTTP.new '10.224.1.1', nil, 'proxy.example', nil, nil, nil, 'example,10.224.0.0/22'
+      http = Net::HTTP.new '10.224.1.1', nil, 'proxy.com', nil, nil, nil, 'example,10.224.0.0/22'
       assert_nil http.proxy_address
     end
   end
@@ -254,6 +254,18 @@ def host.to_str; raise SocketError, "open failure"; end
     end
   end
 
+  def test_default_configuration
+    Net::HTTP.default_configuration = { open_timeout: 5 }
+    http = Net::HTTP.new 'hostname.example'
+    assert_equal 5, http.open_timeout
+    assert_equal 60, http.read_timeout
+
+    http.open_timeout = 10
+    assert_equal 10, http.open_timeout
+  ensure
+    Net::HTTP.default_configuration = nil
+  end
+
 end
 
 module TestNetHTTP_version_1_1_methods
@@ -442,7 +454,11 @@ def test_get2
   def test_post
     start {|http|
       _test_post__base http
+    }
+    start {|http|
       _test_post__file http
+    }
+    start {|http|
       _test_post__no_data http
     }
   end
@@ -478,12 +494,10 @@ def _test_post__no_data(http)
 
   def test_s_post
     url = "http://#{config('host')}:#{config('port')}/?q=a"
-    res = assert_warning(/Content-Type did not set/) do
-      Net::HTTP.post(
-              URI.parse(url),
-              "a=x")
-    end
-    assert_equal "application/x-www-form-urlencoded", res["Content-Type"]
+    res = Net::HTTP.post(
+            URI.parse(url),
+            "a=x")
+    assert_equal "application/octet-stream", res["Content-Type"]
     assert_equal "a=x", res.body
     assert_equal url, res["X-request-uri"]
 
@@ -549,14 +563,12 @@ def test_timeout_during_HTTP_session_write
       conn = Net::HTTP.new('localhost', port)
       conn.write_timeout = EnvUtil.apply_timeout_scale(0.01)
       conn.read_timeout = EnvUtil.apply_timeout_scale(0.01) if windows?
-      conn.open_timeout = EnvUtil.apply_timeout_scale(0.1)
+      conn.open_timeout = EnvUtil.apply_timeout_scale(1)
 
       th = Thread.new do
         err = !windows? ? Net::WriteTimeout : Net::ReadTimeout
         assert_raise(err) do
-          assert_warning(/Content-Type did not set/) do
-            conn.post('/', "a"*50_000_000)
-          end
+          conn.post('/', "a"*50_000_000)
         end
       end
       assert th.join(EnvUtil.apply_timeout_scale(10))
@@ -573,9 +585,9 @@ def test_timeout_during_non_chunked_streamed_HTTP_session_write
       port = server.addr[1]
 
       conn = Net::HTTP.new('localhost', port)
-      conn.write_timeout = 0.01
-      conn.read_timeout = 0.01 if windows?
-      conn.open_timeout = 0.1
+      conn.write_timeout = EnvUtil.apply_timeout_scale(0.01)
+      conn.read_timeout = EnvUtil.apply_timeout_scale(0.01) if windows?
+      conn.open_timeout = EnvUtil.apply_timeout_scale(1)
 
       req = Net::HTTP::Post.new('/')
       data = "a"*50_000_000
@@ -629,10 +641,12 @@ def test_request
       # _test_request__range http   # WEBrick does not support Range: header.
       _test_request__HEAD http
       _test_request__POST http
-      _test_request__stream_body http
       _test_request__uri http
       _test_request__uri_host http
     }
+    start {|http|
+      _test_request__stream_body http
+    }
   end
 
   def _test_request__GET(http)
@@ -843,7 +857,13 @@ def test_set_form
 __EOM__
       start {|http|
         _test_set_form_urlencoded(http, data.reject{|k,v|!v.is_a?(String)})
+      }
+      start {|http|
+        @server.mount('/', lambda {|req, res| res.body = req.body })
         _test_set_form_multipart(http, false, data, expected)
+      }
+      start {|http|
+        @server.mount('/', lambda {|req, res| res.body = req.body })
         _test_set_form_multipart(http, true, data, expected)
       }
     }
@@ -887,6 +907,7 @@ def test_set_form_with_file
       expected.sub!(/<filename>/, filename)
       expected.sub!(/<data>/, $test_net_http_data)
       start {|http|
+        @server.mount('/', lambda {|req, res| res.body = req.body })
         data.each{|k,v|v.rewind rescue nil}
         req = Net::HTTP::Post.new('/')
         req.set_form(data, 'multipart/form-data')
@@ -902,10 +923,11 @@ def test_set_form_with_file
           header)
         assert_equal(expected, body)
 
-        data.each{|k,v|v.rewind rescue nil}
-        req['Transfer-Encoding'] = 'chunked'
-        res = http.request req
-        #assert_equal(expected, res.body)
+        # TODO: test with chunked
+        # data.each{|k,v|v.rewind rescue nil}
+        # req['Transfer-Encoding'] = 'chunked'
+        # res = http.request req
+        # assert_equal(expected, res.body)
       }
     }
   end
@@ -984,7 +1006,7 @@ def logfile
   end
 
   def mount_proc(&block)
-    @server.mount('/continue', WEBrick::HTTPServlet::ProcHandler.new(block.to_proc))
+    @server.mount('/continue', block.to_proc)
   end
 
   def test_expect_continue
@@ -1039,7 +1061,7 @@ def test_expect_continue_error
   def test_expect_continue_error_before_body
     @log_tester = nil
     mount_proc {|req, res|
-      raise WEBrick::HTTPStatus::Forbidden
+      raise TestNetHTTPUtils::Forbidden
     }
     start {|http|
       uheader = {'content-type' => 'application/x-www-form-urlencoded', 'content-length' => '5', 'expect' => '100-continue'}
@@ -1084,7 +1106,7 @@ def logfile
   end
 
   def mount_proc(&block)
-    @server.mount('/continue', WEBrick::HTTPServlet::ProcHandler.new(block.to_proc))
+    @server.mount('/continue', block.to_proc)
   end
 
   def test_info
@@ -1159,11 +1181,11 @@ def test_keep_alive_get_auto_retry
   end
 
   def test_keep_alive_reset_on_new_connection
-    # Using WEBrick's debug log output on accepting connection:
+    # Using debug log output on accepting connection:
     #
     #   "[2021-04-29 20:36:46] DEBUG accept: 127.0.0.1:50674\n"
     @log_tester = nil
-    @server.logger.level = WEBrick::BasicLog::DEBUG
+    @logger_level = :debug
 
     start {|http|
       res = http.get('/')
@@ -1234,6 +1256,16 @@ def test_http_retry_failed
     }
   end
 
+  def test_http_retry_failed_with_block
+    start {|http|
+      http.max_retries = 10
+      called = 0
+      assert_raise(Errno::ECONNRESET){ http.get('/'){called += 1; raise Errno::ECONNRESET} }
+      assert_equal 1, called
+    }
+    @log_tester = nil
+  end
+
   def test_keep_alive_server_close
     def @server.run(sock)
       sock.close
diff --git a/test/net/http/test_httpresponse.rb b/test/net/http/test_httpresponse.rb
index 99a946748c3a3e..01281063cdade0 100644
--- a/test/net/http/test_httpresponse.rb
+++ b/test/net/http/test_httpresponse.rb
@@ -589,6 +589,41 @@ def test_read_body_string
     assert_equal 'hello', body
   end
 
+  def test_read_body_receiving_no_body
+    io = dummy_io(<<EOS)
+HTTP/1.1 204 OK
+Connection: close
+
+EOS
+
+    res = Net::HTTPResponse.read_new(io)
+    res.body_encoding = 'utf-8'
+
+    body = 'something to override'
+
+    res.reading_body io, true do
+      body = res.read_body
+    end
+
+    assert_equal nil, body
+    assert_equal nil, res.body
+  end
+
+  def test_read_body_outside_of_reading_body
+    io = dummy_io(<<EOS)
+HTTP/1.1 200 OK
+Connection: close
+Content-Length: 0
+
+EOS
+
+    res = Net::HTTPResponse.read_new(io)
+
+    assert_raise IOError do
+      res.read_body
+    end
+  end
+
   def test_uri_equals
     uri = URI 'http://example'
 
diff --git a/test/net/http/test_https.rb b/test/net/http/test_https.rb
index 72a69af1a525d6..e860c8745ed1f7 100644
--- a/test/net/http/test_https.rb
+++ b/test/net/http/test_https.rb
@@ -148,7 +148,7 @@ def test_session_reuse
       # support session resuse.  Limiting the version to the TLSv1.2 stack allows
       # this test to continue to work on LibreSSL 3.2+.  LibreSSL may eventually
       # support session reuse, but there are no current plans to do so.
-      http.ssl_version = :TLSv1
+      http.ssl_version = :TLSv1_2
     end
 
     http.start
@@ -172,16 +172,16 @@ def test_session_reuse_but_expire
     http.use_ssl = true
     http.cert_store = TEST_STORE
 
-    http.ssl_timeout = -1
+    http.ssl_timeout = 1
     http.start
     http.get("/")
     http.finish
-
+    sleep 1.25
     http.start
     http.get("/")
 
     socket = http.instance_variable_get(:@socket).io
-    assert_equal false, socket.session_reused?
+    assert_equal false, socket.session_reused?, "NOTE: OpenSSL library version is #{OpenSSL::OPENSSL_LIBRARY_VERSION}"
 
     http.finish
   end
@@ -238,27 +238,6 @@ def test_certificate_verify_failure
       http.request_get("/") {|res| }
     }
     assert_match(/certificate verify failed/, ex.message)
-    unless /mswin|mingw/ =~ RUBY_PLATFORM
-      # on Windows, Errno::ECONNRESET will be raised, and it'll be eaten by
-      # WEBrick
-      @log_tester = lambda {|log|
-        assert_equal(1, log.length)
-        assert_match(/ERROR OpenSSL::SSL::SSLError:/, log[0])
-      }
-    end
-  end
-
-  def test_identity_verify_failure
-    # the certificate's subject has CN=localhost
-    http = Net::HTTP.new(HOST_IP, config("port"))
-    http.use_ssl = true
-    http.cert_store = TEST_STORE
-    @log_tester = lambda {|_| }
-    ex = assert_raise(OpenSSL::SSL::SSLError){
-      http.request_get("/") {|res| }
-    }
-    re_msg = /certificate verify failed|hostname \"#{HOST_IP}\" does not match/
-    assert_match(re_msg, ex.message)
   end
 
   def test_timeout_during_SSL_handshake
@@ -293,7 +272,7 @@ def test_min_version
   end
 
   def test_max_version
-    http = Net::HTTP.new(HOST_IP, config("port"))
+    http = Net::HTTP.new(HOST, config("port"))
     http.use_ssl = true
     http.max_version = :SSL2
     http.verify_callback = Proc.new do |preverify_ok, store_ctx|
@@ -308,3 +287,43 @@ def test_max_version
   end
 
 end if defined?(OpenSSL::SSL)
+
+class TestNetHTTPSIdentityVerifyFailure < Test::Unit::TestCase
+  include TestNetHTTPUtils
+
+  def self.read_fixture(key)
+    File.read(File.expand_path("../fixtures/#{key}", __dir__))
+  end
+
+  HOST = 'localhost'
+  HOST_IP = '127.0.0.1'
+  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 = {
+    'host' => HOST_IP,
+    'proxy_host' => nil,
+    'proxy_port' => nil,
+    'ssl_enable' => true,
+    'ssl_certificate' => SERVER_CERT,
+    'ssl_private_key' => SERVER_KEY,
+    'ssl_tmp_dh_callback' => proc { DHPARAMS },
+  }
+
+  def test_identity_verify_failure
+    # the certificate's subject has CN=localhost
+    http = Net::HTTP.new(HOST_IP, config("port"))
+    http.use_ssl = true
+    http.cert_store = TEST_STORE
+    @log_tester = lambda {|_| }
+    ex = assert_raise(OpenSSL::SSL::SSLError){
+      http.request_get("/") {|res| }
+      sleep 0.5
+    }
+    re_msg = /certificate verify failed|hostname \"#{HOST_IP}\" does not match/
+    assert_match(re_msg, ex.message)
+  end
+end if defined?(OpenSSL::SSL)
diff --git a/test/net/http/test_https_proxy.rb b/test/net/http/test_https_proxy.rb
index 4c2a92ccd62803..f4c6aa0b6a015d 100644
--- a/test/net/http/test_https_proxy.rb
+++ b/test/net/http/test_https_proxy.rb
@@ -43,5 +43,52 @@ def test_https_proxy_authentication
       assert_join_threads([client_thread, server_thread])
     }
   end
-end if defined?(OpenSSL)
 
+
+  def read_fixture(key)
+    File.read(File.expand_path("../fixtures/#{key}", __dir__))
+  end
+
+  def test_https_proxy_ssl_connection
+    begin
+      OpenSSL
+    rescue LoadError
+      omit 'autoload problem. see [ruby-dev:45021][Bug #5786]'
+    end
+
+    TCPServer.open("127.0.0.1", 0) {|tcpserver|
+      ctx = OpenSSL::SSL::SSLContext.new
+      ctx.key = OpenSSL::PKey.read(read_fixture("server.key"))
+      ctx.cert = OpenSSL::X509::Certificate.new(read_fixture("server.crt"))
+      serv = OpenSSL::SSL::SSLServer.new(tcpserver, ctx)
+
+      _, port, _, _ = serv.addr
+      client_thread = Thread.new {
+        proxy = Net::HTTP.Proxy("127.0.0.1", port, 'user', 'password', true)
+        http = proxy.new("foo.example.org", 8000)
+        http.use_ssl = true
+        http.verify_mode = OpenSSL::SSL::VERIFY_NONE
+        begin
+          http.start
+        rescue EOFError
+        end
+      }
+      server_thread = Thread.new {
+        sock = serv.accept
+        begin
+          proxy_request = sock.gets("\r\n\r\n")
+          assert_equal(
+            "CONNECT foo.example.org:8000 HTTP/1.1\r\n" +
+            "Host: foo.example.org:8000\r\n" +
+            "Proxy-Authorization: Basic dXNlcjpwYXNzd29yZA==\r\n" +
+            "\r\n",
+            proxy_request,
+            "[ruby-core:96672]")
+        ensure
+          sock.close
+        end
+      }
+      assert_join_threads([client_thread, server_thread])
+    }
+  end
+end if defined?(OpenSSL)
diff --git a/test/net/http/utils.rb b/test/net/http/utils.rb
index e343e16712e19d..067cca02e31bff 100644
--- a/test/net/http/utils.rb
+++ b/test/net/http/utils.rb
@@ -1,13 +1,235 @@
 # frozen_string_literal: false
-require 'webrick'
-begin
-  require "webrick/https"
-rescue LoadError
-  # SSL features cannot be tested
-end
-require 'webrick/httpservlet/abstract'
+require 'socket'
+require 'openssl'
 
 module TestNetHTTPUtils
+
+  class Forbidden < StandardError; end
+
+  class HTTPServer
+    def initialize(config, &block)
+      @config = config
+      @server = TCPServer.new(@config['host'], 0)
+      @port = @server.addr[1]
+      @procs = {}
+
+      if @config['ssl_enable']
+        context = OpenSSL::SSL::SSLContext.new
+        context.cert = @config['ssl_certificate']
+        context.key = @config['ssl_private_key']
+        context.tmp_dh_callback = @config['ssl_tmp_dh_callback']
+        @ssl_server = OpenSSL::SSL::SSLServer.new(@server, context)
+      end
+
+      @block = block
+    end
+
+    def start
+      @thread = Thread.new do
+        loop do
+          socket = (@ssl_server || @server).accept
+          run(socket)
+        rescue
+        ensure
+          socket&.close
+        end
+      ensure
+        (@ssl_server || @server).close
+      end
+    end
+
+    def run(socket)
+      handle_request(socket)
+    end
+
+    def shutdown
+      @thread&.kill
+      @thread&.join
+    end
+
+    def mount(path, proc)
+      @procs[path] = proc
+    end
+
+    def mount_proc(path, &block)
+      mount(path, block.to_proc)
+    end
+
+    def handle_request(socket)
+      request_line = socket.gets
+      return if request_line.nil? || request_line.strip.empty?
+
+      method, path, _version = request_line.split
+      headers = {}
+      while (line = socket.gets)
+        break if line.strip.empty?
+        key, value = line.split(': ', 2)
+        headers[key] = value.strip
+      end
+
+      if headers['Expect'] == '100-continue'
+        socket.write "HTTP/1.1 100 Continue\r\n\r\n"
+      end
+
+      # Set default Content-Type if not provided
+      if !headers['Content-Type'] && (method == 'POST' || method == 'PUT' || method == 'PATCH')
+        headers['Content-Type'] = 'application/octet-stream'
+      end
+
+      req = Request.new(method, path, headers, socket)
+      if @procs.key?(req.path) || @procs.key?("#{req.path}/")
+        proc = @procs[req.path] || @procs["#{req.path}/"]
+        res = Response.new(socket)
+        begin
+          proc.call(req, res)
+        rescue Forbidden
+          res.status = 403
+        end
+        res.finish
+      else
+        @block.call(method, path, headers, socket)
+      end
+    end
+
+    def port
+      @port
+    end
+
+    class Request
+      attr_reader :method, :path, :headers, :query, :body
+      def initialize(method, path, headers, socket)
+        @method = method
+        @path, @query = parse_path_and_query(path)
+        @headers = headers
+        @socket = socket
+        if method == 'POST' && (@path == '/continue' || @headers['Content-Type'].include?('multipart/form-data'))
+          if @headers['Transfer-Encoding'] == 'chunked'
+            @body = read_chunked_body
+          else
+            @body = read_body
+          end
+          @query = @body.split('&').each_with_object({}) do |pair, hash|
+            key, value = pair.split('=')
+            hash[key] = value
+          end if @body && @body.include?('=')
+        end
+      end
+
+      def [](key)
+        @headers[key.downcase]
+      end
+
+      def []=(key, value)
+        @headers[key.downcase] = value
+      end
+
+      def continue
+        @socket.write "HTTP\/1.1 100 continue\r\n\r\n"
+      end
+
+      def remote_ip
+        @socket.peeraddr[3]
+      end
+
+      def peeraddr
+        @socket.peeraddr
+      end
+
+      private
+
+      def parse_path_and_query(path)
+        path, query_string = path.split('?', 2)
+        query = {}
+        if query_string
+          query_string.split('&').each do |pair|
+            key, value = pair.split('=', 2)
+            query[key] = value
+          end
+        end
+        [path, query]
+      end
+
+      def read_body
+        content_length = @headers['Content-Length']&.to_i
+        return unless content_length && content_length > 0
+        @socket.read(content_length)
+      end
+
+      def read_chunked_body
+        body = ""
+        while (chunk_size = @socket.gets.strip.to_i(16)) > 0
+          body << @socket.read(chunk_size)
+          @socket.read(2) # read \r\n after each chunk
+        end
+        body
+      end
+    end
+
+    class Response
+      attr_accessor :body, :headers, :status, :chunked, :cookies
+      def initialize(client)
+        @client = client
+        @body = ""
+        @headers = {}
+        @status = 200
+        @chunked = false
+        @cookies = []
+      end
+
+      def [](key)
+        @headers[key.downcase]
+      end
+
+      def []=(key, value)
+        @headers[key.downcase] = value
+      end
+
+      def write_chunk(chunk)
+        return unless @chunked
+        @client.write("#{chunk.bytesize.to_s(16)}\r\n")
+        @client.write("#{chunk}\r\n")
+      end
+
+      def finish
+        @client.write build_response_headers
+        if @chunked
+          write_chunk(@body)
+          @client.write "0\r\n\r\n"
+        else
+          @client.write @body
+        end
+      end
+
+      private
+
+      def build_response_headers
+        response = "HTTP/1.1 #{@status} #{status_message(@status)}\r\n"
+        if @chunked
+          @headers['Transfer-Encoding'] = 'chunked'
+        else
+          @headers['Content-Length'] = @body.bytesize.to_s
+        end
+        @headers.each do |key, value|
+          response << "#{key}: #{value}\r\n"
+        end
+        @cookies.each do |cookie|
+          response << "Set-Cookie: #{cookie}\r\n"
+        end
+        response << "\r\n"
+        response
+      end
+
+      def status_message(code)
+        case code
+        when 200 then 'OK'
+        when 301 then 'Moved Permanently'
+        when 403 then 'Forbidden'
+        else 'Unknown'
+        end
+      end
+    end
+  end
+
   def start(&block)
     new().start(&block)
   end
@@ -15,7 +237,7 @@ def start(&block)
   def new
     klass = Net::HTTP::Proxy(config('proxy_host'), config('proxy_port'))
     http = klass.new(config('host'), config('port'))
-    http.set_debug_output logfile()
+    http.set_debug_output logfile
     http
   end
 
@@ -25,7 +247,7 @@ def config(key)
   end
 
   def logfile
-    $DEBUG ? $stderr : NullWriter.new
+    $stderr if $DEBUG
   end
 
   def setup
@@ -33,91 +255,96 @@ def setup
   end
 
   def teardown
+    sleep 0.5 if @config['ssl_enable']
     if @server
       @server.shutdown
-      @server_thread.join
-      WEBrick::Utils::TimeoutHandler.terminate
     end
     @log_tester.call(@log) if @log_tester
-    # resume global state
     Net::HTTP.version_1_2
   end
 
   def spawn_server
     @log = []
-    @log_tester = lambda {|log| assert_equal([], log ) }
+    @log_tester = lambda {|log| assert_equal([], log) }
     @config = self.class::CONFIG
-    server_config = {
-      :BindAddress => config('host'),
-      :Port => 0,
-      :Logger => WEBrick::Log.new(@log, WEBrick::BasicLog::WARN),
-      :AccessLog => [],
-      :ServerType => Thread,
-    }
-    server_config[:OutputBufferSize] = 4 if config('chunked')
-    server_config[:RequestTimeout] = config('RequestTimeout') if config('RequestTimeout')
-    if defined?(OpenSSL) and config('ssl_enable')
-      server_config.update({
-        :SSLEnable      => true,
-        :SSLCertificate => config('ssl_certificate'),
-        :SSLPrivateKey  => config('ssl_private_key'),
-        :SSLTmpDhCallback => config('ssl_tmp_dh_callback'),
-      })
-    end
-    @server = WEBrick::HTTPServer.new(server_config)
-    @server.mount('/', Servlet, config('chunked'))
-    @server_thread = @server.start
-    @config['port'] = @server[:Port]
-  end
-
-  $test_net_http = nil
-  $test_net_http_data = (0...256).to_a.map {|i| i.chr }.join('') * 64
-  $test_net_http_data.force_encoding("ASCII-8BIT")
-  $test_net_http_data_type = 'application/octet-stream'
-
-  class Servlet < WEBrick::HTTPServlet::AbstractServlet
-    def initialize(this, chunked = false)
-      @chunked = chunked
-    end
-
-    def do_GET(req, res)
-      if req['Accept'] != '*/*'
-        res['Content-Type'] = req['Accept']
+    @server = HTTPServer.new(@config) do |method, path, headers, socket|
+      @log << "DEBUG accept: #{@config['host']}:#{socket.addr[1]}" if @logger_level == :debug
+      case method
+      when 'HEAD'
+        handle_head(path, headers, socket)
+      when 'GET'
+        handle_get(path, headers, socket)
+      when 'POST'
+        handle_post(path, headers, socket)
+      when 'PATCH'
+        handle_patch(path, headers, socket)
       else
-        res['Content-Type'] = $test_net_http_data_type
+        socket.print "HTTP/1.1 405 Method Not Allowed\r\nContent-Length: 0\r\n\r\n"
       end
-      res.body = $test_net_http_data
-      res.chunked = @chunked
     end
+    @server.start
+    @config['port'] = @server.port
+  end
 
-    # echo server
-    def do_POST(req, res)
-      res['Content-Type'] = req['Content-Type']
-      res['X-request-uri'] = req.request_uri.to_s
-      res.body = req.body
-      res.chunked = @chunked
+  def handle_head(path, headers, socket)
+    if headers['Accept'] != '*/*'
+      content_type = headers['Accept']
+    else
+      content_type = $test_net_http_data_type
     end
+    response = "HTTP/1.1 200 OK\r\nContent-Type: #{content_type}\r\nContent-Length: #{$test_net_http_data.bytesize}"
+    socket.print(response)
+  end
 
-    def do_PATCH(req, res)
-      res['Content-Type'] = req['Content-Type']
-      res.body = req.body
-      res.chunked = @chunked
+  def handle_get(path, headers, socket)
+    if headers['Accept'] != '*/*'
+      content_type = headers['Accept']
+    else
+      content_type = $test_net_http_data_type
     end
+    response = "HTTP/1.1 200 OK\r\nContent-Type: #{content_type}\r\nContent-Length: #{$test_net_http_data.bytesize}\r\n\r\n#{$test_net_http_data}"
+    socket.print(response)
   end
 
-  class NullWriter
-    def <<(s) end
-    def puts(*args) end
-    def print(*args) end
-    def printf(*args) end
+  def handle_post(path, headers, socket)
+    body = socket.read(headers['Content-Length'].to_i)
+    scheme = headers['X-Request-Scheme'] || 'http'
+    host = @config['host']
+    port = socket.addr[1]
+    content_type = headers['Content-Type'] || 'application/octet-stream'
+    charset = parse_content_type(content_type)[1]
+    path = "#{scheme}://#{host}:#{port}#{path}"
+    path = path.encode(charset) if charset
+    response = "HTTP/1.1 200 OK\r\nContent-Type: #{content_type}\r\nContent-Length: #{body.bytesize}\r\nX-request-uri: #{path}\r\n\r\n#{body}"
+    socket.print(response)
   end
 
+  def handle_patch(path, headers, socket)
+    body = socket.read(headers['Content-Length'].to_i)
+    content_type = headers['Content-Type'] || 'application/octet-stream'
+    response = "HTTP/1.1 200 OK\r\nContent-Type: #{content_type}\r\nContent-Length: #{body.bytesize}\r\n\r\n#{body}"
+    socket.print(response)
+  end
+
+  def parse_content_type(content_type)
+    return [nil, nil] unless content_type
+    type, *params = content_type.split(';').map(&:strip)
+    charset = params.find { |param| param.start_with?('charset=') }
+    charset = charset.split('=', 2).last if charset
+    [type, charset]
+  end
+
+  $test_net_http = nil
+  $test_net_http_data = (0...256).to_a.map { |i| i.chr }.join('') * 64
+  $test_net_http_data.force_encoding("ASCII-8BIT")
+  $test_net_http_data_type = 'application/octet-stream'
+
   def self.clean_http_proxy_env
     orig = {
-      'http_proxy'      => ENV['http_proxy'],
+      'http_proxy' => ENV['http_proxy'],
       'http_proxy_user' => ENV['http_proxy_user'],
       'http_proxy_pass' => ENV['http_proxy_pass'],
-      'no_proxy'        => ENV['no_proxy'],
+      'no_proxy' => ENV['no_proxy'],
     }
 
     orig.each_key do |key|
diff --git a/test/nkf/test_kconv.rb b/test/nkf/test_kconv.rb
deleted file mode 100644
index 3968cc47dc432f..00000000000000
--- a/test/nkf/test_kconv.rb
+++ /dev/null
@@ -1,82 +0,0 @@
-# frozen_string_literal: false
-require 'test/unit'
-require 'kconv'
-
-class TestKconv < Test::Unit::TestCase
-  def setup
-    @euc_str = "\
-\xa5\xaa\xa5\xd6\xa5\xb8\xa5\xa7\xa5\xaf\xa5\xc8\xbb\xd8\xb8\xfe\
-\xa5\xd7\xa5\xed\xa5\xb0\xa5\xe9\xa5\xdf\xa5\xf3\xa5\xb0\xb8\xc0\xb8\xec\
-\x52\x75\x62\x79".force_encoding('EUC-JP')
-    @utf8_str = "\
-\xe3\x82\xaa\xe3\x83\x96\xe3\x82\xb8\xe3\x82\xa7\
-\xe3\x82\xaf\xe3\x83\x88\xe6\x8c\x87\xe5\x90\x91\
-\xe3\x83\x97\xe3\x83\xad\xe3\x82\xb0\xe3\x83\xa9\xe3\x83\x9f\
-\xe3\x83\xb3\xe3\x82\xb0\xe8\xa8\x80\xe8\xaa\x9e\
-\x52\x75\x62\x79".force_encoding('UTF-8')
-    @sjis_str = "\
-\x83\x49\x83\x75\x83\x57\x83\x46\x83\x4e\x83\x67\x8e\x77\x8c\xfc\
-\x83\x76\x83\x8d\x83\x4f\x83\x89\x83\x7e\x83\x93\x83\x4f\x8c\xbe\x8c\xea\
-\x52\x75\x62\x79".force_encoding('Shift_JIS')
-    @jis_str = "\
-\x1b\x24\x42\x25\x2a\x25\x56\x25\x38\x25\x27\x25\x2f\x25\x48\x3b\x58\x38\x7e\
-\x25\x57\x25\x6d\x25\x30\x25\x69\x25\x5f\x25\x73\x25\x30\x38\x40\x38\x6c\x1b\x28\x42\
-\x52\x75\x62\x79".force_encoding('ISO-2022-JP')
-  end
-
-
-  def test_eucjp
-    assert(@euc_str.iseuc)
-    assert_equal(::Kconv::EUC, Kconv.guess(@euc_str))
-    assert_equal(@euc_str, @euc_str.toeuc)
-    assert_equal(@euc_str, @sjis_str.toeuc)
-    assert_equal(@euc_str, @utf8_str.toeuc)
-    assert_equal(@euc_str, @jis_str.toeuc)
-    assert_equal(@euc_str, @euc_str.kconv(::NKF::EUC))
-    assert_equal(@euc_str, @sjis_str.kconv(::NKF::EUC))
-    assert_equal(@euc_str, @utf8_str.kconv(::NKF::EUC))
-    assert_equal(@euc_str, @jis_str.kconv(::NKF::EUC))
-  end
-  def test_shiftjis
-    assert(@sjis_str.issjis)
-    assert_equal(::Kconv::SJIS, Kconv.guess(@sjis_str))
-    assert_equal(@sjis_str, @euc_str.tosjis)
-    assert_equal(@sjis_str, @sjis_str.tosjis)
-    assert_equal(@sjis_str, @utf8_str.tosjis)
-    assert_equal(@sjis_str, @jis_str.tosjis)
-    assert_equal(@sjis_str, @euc_str.kconv(::NKF::SJIS))
-    assert_equal(@sjis_str, @sjis_str.kconv(::NKF::SJIS))
-    assert_equal(@sjis_str, @utf8_str.kconv(::NKF::SJIS))
-    assert_equal(@sjis_str, @jis_str.kconv(::NKF::SJIS))
-  end
-  def test_utf8
-    assert(@utf8_str.isutf8)
-    assert_equal(::Kconv::UTF8, Kconv.guess(@utf8_str))
-    assert_equal(@utf8_str, @euc_str.toutf8)
-    assert_equal(@utf8_str, @sjis_str.toutf8)
-    assert_equal(@utf8_str, @utf8_str.toutf8)
-    assert_equal(@utf8_str, @jis_str.toutf8)
-    assert_equal(@utf8_str, @euc_str.kconv(::NKF::UTF8))
-    assert_equal(@utf8_str, @sjis_str.kconv(::NKF::UTF8))
-    assert_equal(@utf8_str, @utf8_str.kconv(::NKF::UTF8))
-    assert_equal(@utf8_str, @jis_str.kconv(::NKF::UTF8))
-  end
-  def test_jis
-    assert_equal(::Kconv::JIS, Kconv.guess(@jis_str))
-    assert_equal(@jis_str, @euc_str.tojis)
-    assert_equal(@jis_str, @sjis_str.tojis)
-    assert_equal(@jis_str, @utf8_str.tojis)
-    assert_equal(@jis_str, @jis_str.tojis)
-    assert_equal(@jis_str, @euc_str.kconv(::NKF::JIS))
-    assert_equal(@jis_str, @sjis_str.kconv(::NKF::JIS))
-    assert_equal(@jis_str, @utf8_str.kconv(::NKF::JIS))
-    assert_equal(@jis_str, @jis_str.kconv(::NKF::JIS))
-  end
-  def test_kconv
-    str = "\xc2\xa1"
-    %w/UTF-8 EUC-JP/.each do |enc|
-      s = str.dup.force_encoding(enc)
-      assert_equal(s, s.kconv(enc))
-    end
-  end
-end
diff --git a/test/nkf/test_nkf.rb b/test/nkf/test_nkf.rb
deleted file mode 100644
index eb51bf8e7d5f71..00000000000000
--- a/test/nkf/test_nkf.rb
+++ /dev/null
@@ -1,23 +0,0 @@
-# frozen_string_literal: false
-require 'test/unit'
-require 'nkf'
-
-class TestNKF < Test::Unit::TestCase
-  EUC_STR = "\xa5\xaa\xa5\xd6\xa5\xb8\xa5\xa7\xa5\xaf\xa5\xc8\xbb\xd8\xb8\xfe\
-\xa5\xb9\xa5\xaf\xa5\xea\xa5\xd7\xa5\xc8\xb8\xc0\xb8\xec\
-Ruby"
-
-  def test_guess
-    str_euc = EUC_STR
-    str_jis = NKF.nkf('-j', str_euc)
-    assert_equal(::NKF::JIS, NKF.guess(str_jis))
-    assert_equal(::NKF::EUC, NKF.guess(str_euc))
-  end
-
-  def test_ruby_dev_36909
-    assert_nothing_raised do
-      100.times { NKF.nkf("--oc=eucJP-nkf", "foo") }
-    end
-  end
-
-end
diff --git a/test/objspace/test_objspace.rb b/test/objspace/test_objspace.rb
index 43ccac79206a89..326cf22e1f01d5 100644
--- a/test/objspace/test_objspace.rb
+++ b/test/objspace/test_objspace.rb
@@ -32,7 +32,7 @@ def test_memsize_of_root_shared_string
     a = "a" * GC::INTERNAL_CONSTANTS[:RVARGC_MAX_ALLOCATE_SIZE]
     b = a.dup
     c = nil
-    ObjectSpace.each_object(String) {|x| break c = x if x == a and x.frozen?}
+    ObjectSpace.each_object(String) {|x| break c = x if a == x and x.frozen?}
     rv_size = GC::INTERNAL_CONSTANTS[:BASE_SLOT_SIZE]
     assert_equal([rv_size, rv_size, a.length + 1 + rv_size], [a, b, c].map {|x| ObjectSpace.memsize_of(x)})
   end
@@ -141,6 +141,7 @@ def test_reachable_objects_from
   end
 
   def test_reachable_objects_during_iteration
+    omit 'flaky on Visual Studio with: [BUG] Unnormalized Fixnum value' if /mswin/ =~ RUBY_PLATFORM
     opts = %w[--disable-gem --disable=frozen-string-literal -robjspace]
     assert_separately opts, "#{<<-"begin;"}\n#{<<-'end;'}"
     begin;
@@ -202,8 +203,9 @@ def test_trace_object_allocations
       assert_equal(line1,    ObjectSpace.allocation_sourceline(o1))
       assert_equal(__FILE__, ObjectSpace.allocation_sourcefile(o1))
       assert_equal(c1,       ObjectSpace.allocation_generation(o1))
-      assert_equal(Class.name, ObjectSpace.allocation_class_path(o1))
-      assert_equal(:new,       ObjectSpace.allocation_method_id(o1))
+      # These assertions fail under coverage measurement: https://bugs.ruby-lang.org/issues/21298
+      #assert_equal(self.class.name, ObjectSpace.allocation_class_path(o1))
+      #assert_equal(__method__,       ObjectSpace.allocation_method_id(o1))
 
       assert_equal(__FILE__, ObjectSpace.allocation_sourcefile(o2))
       assert_equal(line2,    ObjectSpace.allocation_sourceline(o2))
@@ -243,39 +245,38 @@ def test_trace_object_allocations
 
   def test_trace_object_allocations_start_stop_clear
     ObjectSpace.trace_object_allocations_clear # clear object_table to get rid of erroneous detection for obj3
-    GC.disable # suppress potential object reuse. see [Bug #11271]
-    begin
-      ObjectSpace.trace_object_allocations_start
+    EnvUtil.without_gc do # suppress potential object reuse. see [Bug #11271]
       begin
         ObjectSpace.trace_object_allocations_start
         begin
           ObjectSpace.trace_object_allocations_start
-          obj0 = Object.new
+          begin
+            ObjectSpace.trace_object_allocations_start
+            obj0 = Object.new
+          ensure
+            ObjectSpace.trace_object_allocations_stop
+            obj1 = Object.new
+          end
         ensure
           ObjectSpace.trace_object_allocations_stop
-          obj1 = Object.new
+          obj2 = Object.new
         end
       ensure
         ObjectSpace.trace_object_allocations_stop
-        obj2 = Object.new
+        obj3 = Object.new
       end
-    ensure
-      ObjectSpace.trace_object_allocations_stop
-      obj3 = Object.new
-    end
 
-    assert_equal(__FILE__, ObjectSpace.allocation_sourcefile(obj0))
-    assert_equal(__FILE__, ObjectSpace.allocation_sourcefile(obj1))
-    assert_equal(__FILE__, ObjectSpace.allocation_sourcefile(obj2))
-    assert_equal(nil     , ObjectSpace.allocation_sourcefile(obj3)) # after tracing
+      assert_equal(__FILE__, ObjectSpace.allocation_sourcefile(obj0))
+      assert_equal(__FILE__, ObjectSpace.allocation_sourcefile(obj1))
+      assert_equal(__FILE__, ObjectSpace.allocation_sourcefile(obj2))
+      assert_equal(nil     , ObjectSpace.allocation_sourcefile(obj3)) # after tracing
 
-    ObjectSpace.trace_object_allocations_clear
-    assert_equal(nil, ObjectSpace.allocation_sourcefile(obj0))
-    assert_equal(nil, ObjectSpace.allocation_sourcefile(obj1))
-    assert_equal(nil, ObjectSpace.allocation_sourcefile(obj2))
-    assert_equal(nil, ObjectSpace.allocation_sourcefile(obj3))
-  ensure
-    GC.enable
+      ObjectSpace.trace_object_allocations_clear
+      assert_equal(nil, ObjectSpace.allocation_sourcefile(obj0))
+      assert_equal(nil, ObjectSpace.allocation_sourcefile(obj1))
+      assert_equal(nil, ObjectSpace.allocation_sourcefile(obj2))
+      assert_equal(nil, ObjectSpace.allocation_sourcefile(obj3))
+    end
   end
 
   def test_trace_object_allocations_gc_stress
@@ -287,15 +288,70 @@ def test_trace_object_allocations_gc_stress
     assert true # success
   end
 
+  def test_trace_object_allocations_compaction
+    omit "compaction is not supported on this platform" unless GC.respond_to?(:compact)
+
+    assert_separately(%w(-robjspace), <<~RUBY)
+      ObjectSpace.trace_object_allocations do
+        objs = 100.times.map do
+          Object.new
+        end
+
+        assert_equal(__FILE__, ObjectSpace.allocation_sourcefile(objs[0]))
+
+        GC.verify_compaction_references(expand_heap: true, toward: :empty)
+
+        assert_equal(__FILE__, ObjectSpace.allocation_sourcefile(objs[0]))
+      end
+    RUBY
+  end
+
+  def test_trace_object_allocations_compaction_freed_pages
+    omit "compaction is not supported on this platform" unless GC.respond_to?(:compact)
+
+    assert_normal_exit(<<~RUBY)
+      require "objspace"
+
+      objs = []
+      ObjectSpace.trace_object_allocations do
+        1_000_000.times do
+          objs << Object.new
+        end
+      end
+
+      objs = nil
+
+      # Free pages that the objs were on
+      GC.start
+
+      # Run compaction and check that it doesn't crash
+      GC.compact
+    RUBY
+  end
+
   def test_dump_flags
     # Ensure that the fstring is promoted to old generation
     4.times { GC.start }
     info = ObjectSpace.dump("foo".freeze)
-    assert_match(/"wb_protected":true, "old":true/, info)
+    assert_include(info, '"wb_protected":true')
+    assert_include(info, '"age":3')
+    assert_include(info, '"old":true')
     assert_match(/"fstring":true/, info)
     JSON.parse(info) if defined?(JSON)
   end
 
+  def test_dump_flag_age
+    EnvUtil.without_gc do
+      o = Object.new
+
+      assert_include(ObjectSpace.dump(o), '"age":0')
+
+      GC.start
+
+      assert_include(ObjectSpace.dump(o), '"age":1')
+    end
+  end
+
   if defined?(RubyVM::Shape)
     class TooComplex; end
 
@@ -415,7 +471,7 @@ def test_dump_special_consts
     assert_equal('true', ObjectSpace.dump(true))
     assert_equal('false', ObjectSpace.dump(false))
     assert_equal('0', ObjectSpace.dump(0))
-    assert_equal('{"type":"SYMBOL", "value":"foo"}', ObjectSpace.dump(:foo))
+    assert_equal('{"type":"SYMBOL", "value":"test_dump_special_consts"}', ObjectSpace.dump(:test_dump_special_consts))
   end
 
   def test_dump_singleton_class
@@ -445,6 +501,20 @@ def test_dump_dynamic_symbol
     assert_match(/"value":"foobar\h+"/, dump)
   end
 
+  def test_dump_outputs_object_id
+    obj = Object.new
+
+    # Doesn't output object_id when it has not been seen
+    dump = ObjectSpace.dump(obj)
+    assert_not_include(dump, "\"object_id\"")
+
+    id = obj.object_id
+
+    # Outputs object_id when it has been seen
+    dump = ObjectSpace.dump(obj)
+    assert_include(dump, "\"object_id\":#{id}")
+  end
+
   def test_dump_includes_imemo_type
     assert_in_out_err(%w[-robjspace], "#{<<-"begin;"}\n#{<<-'end;'}") do |output, error|
       begin;
@@ -557,14 +627,35 @@ def dump_my_heap_please
         next if obj["type"] == "SHAPE"
 
         assert_not_nil obj["slot_size"]
-        assert_equal 0, obj["slot_size"] % GC::INTERNAL_CONSTANTS[:RVALUE_SIZE]
+        assert_equal 0, obj["slot_size"] % (GC::INTERNAL_CONSTANTS[:BASE_SLOT_SIZE] + GC::INTERNAL_CONSTANTS[:RVALUE_OVERHEAD])
       }
     end
   end
 
+  def test_dump_callinfo_includes_mid
+    assert_in_out_err(%w[-robjspace --disable-gems], "#{<<-"begin;"}\n#{<<-'end;'}") do |output, error|
+      begin;
+        class Foo
+          def foo
+            super(bar: 123) # should not crash on 0 mid
+          end
+
+          def bar
+            baz(bar: 123) # mid: baz
+          end
+        end
+
+        ObjectSpace.dump_all(output: $stdout)
+      end;
+      assert_empty error
+      assert(output.count > 1)
+      assert_includes output.grep(/"imemo_type":"callinfo"/).join("\n"), '"mid":"baz"'
+    end
+  end
+
   def test_dump_string_coderange
     assert_includes ObjectSpace.dump("TEST STRING"), '"coderange":"7bit"'
-    unknown = "TEST STRING".dup.force_encoding(Encoding::BINARY)
+    unknown = "TEST STRING".dup.force_encoding(Encoding::UTF_16BE)
     2.times do # ensure that dumping the string doesn't mutate it
       assert_includes ObjectSpace.dump(unknown), '"coderange":"unknown"'
     end
@@ -651,7 +742,7 @@ def assert_test_string_entry_correct_in_dump_all(output)
     assert_equal("TEST2", entry_hash["value"], "value is wrong")
     assert_equal("UTF-8", entry_hash["encoding"], "encoding is wrong")
     assert_equal("-", entry_hash["file"], "file is wrong")
-    assert_equal(4, entry_hash["line"], "line is wrong")
+    assert_equal(5, entry_hash["line"], "line is wrong")
     assert_equal("dump_my_heap_please", entry_hash["method"], "method is wrong")
     assert_not_nil(entry_hash["generation"])
   end
@@ -660,6 +751,7 @@ def test_dump_all
     opts = %w[--disable-gem --disable=frozen-string-literal -robjspace]
 
     assert_in_out_err(opts, "#{<<-"begin;"}#{<<-'end;'}") do |output, error|
+      # frozen_string_literal: false
       begin;
         def dump_my_heap_please
           ObjectSpace.trace_object_allocations_start
@@ -676,6 +768,7 @@ def dump_my_heap_please
 
     assert_in_out_err(%w[-robjspace], "#{<<-"begin;"}#{<<-'end;'}") do |(output), (error)|
       begin;
+        # frozen_string_literal: false
         def dump_my_heap_please
           ObjectSpace.trace_object_allocations_start
           GC.start
@@ -806,6 +899,7 @@ def test_anonymous_class_name
   def test_objspace_trace
     assert_in_out_err(%w[-robjspace/trace], "#{<<-"begin;"}\n#{<<-'end;'}") do |out, err|
       begin;
+        # frozen_string_literal: false
         a = "foo"
         b = "b" + "a" + "r"
         c = 42
@@ -813,8 +907,8 @@ def test_objspace_trace
       end;
       assert_equal ["objspace/trace is enabled"], err
       assert_equal 3, out.size
-      assert_equal '"foo" @ -:2', out[0]
-      assert_equal '"bar" @ -:3', out[1]
+      assert_equal '"foo" @ -:3', out[0]
+      assert_equal '"bar" @ -:4', out[1]
       assert_equal '42', out[2]
     end
   end
@@ -878,6 +972,19 @@ def test_load_allocation_path_load_from_binary
     # load_allocation_path_helper 'iseq = RubyVM::InstructionSequence.load_from_binary(File.binread(path))', to_binary: true
   end
 
+  def test_escape_class_name
+    class_name = '" little boby table [Bug #20892]'
+    json = ObjectSpace.dump(Class.new.tap { |c| c.set_temporary_name(class_name) })
+    assert_equal class_name, JSON.parse(json)["name"]
+  end
+
+  def test_dump_include_shareable
+    omit 'Not provided by mmtk' if RUBY_DESCRIPTION.include?("+GC[mmtk]")
+
+    assert_include(ObjectSpace.dump(ENV), '"shareable":true')
+    assert_not_include(ObjectSpace.dump([]), '"shareable":true')
+  end
+
   def test_utf8_method_names
     name = "utf8_❨╯°□°❩╯︵┻━┻"
     obj = ObjectSpace.trace_object_allocations do
diff --git a/test/objspace/test_ractor.rb b/test/objspace/test_ractor.rb
index b7008ea7314bf9..eb3044cda3c3c3 100644
--- a/test/objspace/test_ractor.rb
+++ b/test/objspace/test_ractor.rb
@@ -1,17 +1,55 @@
 require "test/unit"
 
 class TestObjSpaceRactor < Test::Unit::TestCase
-    def test_tracing_does_not_crash
-        assert_ractor(<<~RUBY, require: 'objspace')
-            ObjectSpace.trace_object_allocations do
-                r = Ractor.new do
-                    obj = 'a' * 1024
-                    Ractor.yield obj
-                end
+  def test_tracing_does_not_crash
+    assert_ractor(<<~RUBY, require: 'objspace')
+      ObjectSpace.trace_object_allocations do
+        r = Ractor.new do
+          _obj = 'a' * 1024
+        end
 
-                r.take
-                r.take
-            end
-        RUBY
-    end
+        r.join
+      end
+    RUBY
+  end
+
+  def test_undefine_finalizer
+    assert_ractor(<<~'RUBY', require: 'objspace')
+      def fin
+        ->(id) { }
+      end
+      ractors = 5.times.map do
+        Ractor.new do
+          10_000.times do
+            o = Object.new
+            ObjectSpace.define_finalizer(o, fin)
+            ObjectSpace.undefine_finalizer(o)
+          end
+        end
+      end
+
+      ractors.each(&:join)
+    RUBY
+  end
+
+  def test_copy_finalizer
+    assert_ractor(<<~'RUBY', require: 'objspace')
+      def fin
+        ->(id) { }
+      end
+      OBJ = Object.new
+      ObjectSpace.define_finalizer(OBJ, fin)
+      OBJ.freeze
+
+      ractors = 5.times.map do
+        Ractor.new do
+          10_000.times do
+            OBJ.clone
+          end
+        end
+      end
+
+      ractors.each(&:join)
+    RUBY
+  end
 end
diff --git a/test/open-uri/test_ftp.rb b/test/open-uri/test_ftp.rb
new file mode 100644
index 00000000000000..0b3bafb9e0341a
--- /dev/null
+++ b/test/open-uri/test_ftp.rb
@@ -0,0 +1,216 @@
+# frozen_string_literal: true
+require 'test/unit'
+require 'socket'
+require 'open-uri'
+
+class TestOpenURIFtp < Test::Unit::TestCase
+  def with_env(h)
+    begin
+      old = {}
+      h.each_key {|k| old[k] = ENV[k] }
+      ENV.update(h)
+      yield
+    ensure
+      ENV.update(old)
+    end
+  end
+
+  begin
+    require 'net/ftp'
+
+    def test_ftp_invalid_request
+      assert_raise(ArgumentError) { URI("ftp://127.0.0.1/").read }
+      assert_raise(ArgumentError) { URI("ftp://127.0.0.1/a%0Db").read }
+      assert_raise(ArgumentError) { URI("ftp://127.0.0.1/a%0Ab").read }
+      assert_raise(ArgumentError) { URI("ftp://127.0.0.1/a%0Db/f").read }
+      assert_raise(ArgumentError) { URI("ftp://127.0.0.1/a%0Ab/f").read }
+      assert_nothing_raised(URI::InvalidComponentError) { URI("ftp://127.0.0.1/d/f;type=x") }
+    end
+
+    def test_ftp
+      TCPServer.open("127.0.0.1", 0) {|serv|
+        _, port, _, host = serv.addr
+        th = Thread.new {
+          s = serv.accept
+          begin
+            s.print "220 Test FTP Server\r\n"
+            assert_equal("USER anonymous\r\n", s.gets); s.print "331 name ok\r\n"
+            assert_match(/\APASS .*\r\n\z/, s.gets); s.print "230 logged in\r\n"
+            assert_equal("TYPE I\r\n", s.gets); s.print "200 type set to I\r\n"
+            assert_equal("CWD foo\r\n", s.gets); s.print "250 CWD successful\r\n"
+            assert_equal("PASV\r\n", s.gets)
+            TCPServer.open("127.0.0.1", 0) {|data_serv|
+              _, data_serv_port, _, _ = data_serv.addr
+              hi = data_serv_port >> 8
+              lo = data_serv_port & 0xff
+              s.print "227 Entering Passive Mode (127,0,0,1,#{hi},#{lo}).\r\n"
+              assert_equal("RETR bar\r\n", s.gets); s.print "150 file okay\r\n"
+              data_sock = data_serv.accept
+              begin
+                data_sock << "content"
+              ensure
+                data_sock.close
+              end
+              s.print "226 transfer complete\r\n"
+              assert_nil(s.gets)
+            }
+          ensure
+            s.close if s
+          end
+        }
+        begin
+          content = URI("ftp://#{host}:#{port}/foo/bar").read
+          assert_equal("content", content)
+        ensure
+          Thread.kill(th)
+          th.join
+        end
+      }
+    end
+
+    def test_ftp_active
+      TCPServer.open("127.0.0.1", 0) {|serv|
+        _, port, _, host = serv.addr
+        th = Thread.new {
+          s = serv.accept
+          begin
+            content = "content"
+            s.print "220 Test FTP Server\r\n"
+            assert_equal("USER anonymous\r\n", s.gets); s.print "331 name ok\r\n"
+            assert_match(/\APASS .*\r\n\z/, s.gets); s.print "230 logged in\r\n"
+            assert_equal("TYPE I\r\n", s.gets); s.print "200 type set to I\r\n"
+            assert_equal("CWD foo\r\n", s.gets); s.print "250 CWD successful\r\n"
+            assert(m = /\APORT 127,0,0,1,(\d+),(\d+)\r\n\z/.match(s.gets))
+            active_port = m[1].to_i << 8 | m[2].to_i
+            TCPSocket.open("127.0.0.1", active_port) {|data_sock|
+              s.print "200 data connection opened\r\n"
+              assert_equal("RETR bar\r\n", s.gets); s.print "150 file okay\r\n"
+              begin
+                data_sock << content
+              ensure
+                data_sock.close
+              end
+              s.print "226 transfer complete\r\n"
+              assert_nil(s.gets)
+            }
+          ensure
+            s.close if s
+          end
+        }
+        begin
+          content = URI("ftp://#{host}:#{port}/foo/bar").read(:ftp_active_mode=>true)
+          assert_equal("content", content)
+        ensure
+          Thread.kill(th)
+          th.join
+        end
+      }
+    end
+
+    def test_ftp_ascii
+      TCPServer.open("127.0.0.1", 0) {|serv|
+        _, port, _, host = serv.addr
+        th = Thread.new {
+          s = serv.accept
+          begin
+            content = "content"
+            s.print "220 Test FTP Server\r\n"
+            assert_equal("USER anonymous\r\n", s.gets); s.print "331 name ok\r\n"
+            assert_match(/\APASS .*\r\n\z/, s.gets); s.print "230 logged in\r\n"
+            assert_equal("TYPE I\r\n", s.gets); s.print "200 type set to I\r\n"
+            assert_equal("CWD /foo\r\n", s.gets); s.print "250 CWD successful\r\n"
+            assert_equal("TYPE A\r\n", s.gets); s.print "200 type set to A\r\n"
+            assert_equal("SIZE bar\r\n", s.gets); s.print "213 #{content.bytesize}\r\n"
+            assert_equal("PASV\r\n", s.gets)
+            TCPServer.open("127.0.0.1", 0) {|data_serv|
+              _, data_serv_port, _, _ = data_serv.addr
+              hi = data_serv_port >> 8
+              lo = data_serv_port & 0xff
+              s.print "227 Entering Passive Mode (127,0,0,1,#{hi},#{lo}).\r\n"
+              assert_equal("RETR bar\r\n", s.gets); s.print "150 file okay\r\n"
+              data_sock = data_serv.accept
+              begin
+                data_sock << content
+              ensure
+                data_sock.close
+              end
+              s.print "226 transfer complete\r\n"
+              assert_nil(s.gets)
+            }
+          ensure
+            s.close if s
+          end
+        }
+        begin
+          length = []
+          progress = []
+          content = URI("ftp://#{host}:#{port}/%2Ffoo/b%61r;type=a").read(
+          :content_length_proc => lambda {|n| length << n },
+          :progress_proc => lambda {|n| progress << n })
+          assert_equal("content", content)
+          assert_equal([7], length)
+          assert_equal(7, progress.inject(&:+))
+        ensure
+          Thread.kill(th)
+          th.join
+        end
+      }
+    end
+  rescue LoadError
+    # net-ftp is the bundled gems at Ruby 3.1
+  end
+
+  def test_ftp_over_http_proxy
+    TCPServer.open("127.0.0.1", 0) {|proxy_serv|
+      proxy_port = proxy_serv.addr[1]
+      th = Thread.new {
+        proxy_sock = proxy_serv.accept
+        begin
+          req = proxy_sock.gets("\r\n\r\n")
+          assert_match(%r{\AGET ftp://192.0.2.1/foo/bar }, req)
+          proxy_sock.print "HTTP/1.0 200 OK\r\n"
+          proxy_sock.print "Content-Length: 4\r\n\r\n"
+          proxy_sock.print "ab\r\n"
+        ensure
+          proxy_sock.close
+        end
+      }
+      begin
+        with_env('ftp_proxy'=>"http://127.0.0.1:#{proxy_port}") {
+          content = URI("ftp://192.0.2.1/foo/bar").read
+          assert_equal("ab\r\n", content)
+        }
+      ensure
+        Thread.kill(th)
+        th.join
+      end
+    }
+  end
+
+  def test_ftp_over_http_proxy_auth
+    TCPServer.open("127.0.0.1", 0) {|proxy_serv|
+      proxy_port = proxy_serv.addr[1]
+      th = Thread.new {
+        proxy_sock = proxy_serv.accept
+        begin
+          req = proxy_sock.gets("\r\n\r\n")
+          assert_match(%r{\AGET ftp://192.0.2.1/foo/bar }, req)
+          assert_match(%r{Proxy-Authorization: Basic #{['proxy-user:proxy-password'].pack('m').chomp}\r\n}, req)
+          proxy_sock.print "HTTP/1.0 200 OK\r\n"
+          proxy_sock.print "Content-Length: 4\r\n\r\n"
+          proxy_sock.print "ab\r\n"
+        ensure
+          proxy_sock.close
+        end
+      }
+      begin
+        content = URI("ftp://192.0.2.1/foo/bar").read(
+          :proxy_http_basic_authentication => ["http://127.0.0.1:#{proxy_port}", "proxy-user", "proxy-password"])
+        assert_equal("ab\r\n", content)
+      ensure
+        Thread.kill(th)
+        th.join
+      end
+    }
+  end
+end
diff --git a/test/open-uri/test_open-uri.rb b/test/open-uri/test_open-uri.rb
index 86aefc52c8b255..0679180ce9fbfb 100644
--- a/test/open-uri/test_open-uri.rb
+++ b/test/open-uri/test_open-uri.rb
@@ -1,75 +1,18 @@
 # frozen_string_literal: true
 require 'test/unit'
 require 'open-uri'
-require 'webrick'
-require 'webrick/httpproxy'
+require 'stringio'
+require_relative 'utils'
 begin
   require 'zlib'
 rescue LoadError
 end
 
 class TestOpenURI < Test::Unit::TestCase
-
-  NullLog = Object.new
-  def NullLog.<<(arg)
-    #puts arg if / INFO / !~ arg
-  end
-
-  def with_http(log_tester=lambda {|log| assert_equal([], log) })
-    log = []
-    logger = WEBrick::Log.new(log, WEBrick::BasicLog::WARN)
-    Dir.mktmpdir {|dr|
-      srv = WEBrick::HTTPServer.new({
-        :DocumentRoot => dr,
-        :ServerType => Thread,
-        :Logger => logger,
-        :AccessLog => [[NullLog, ""]],
-        :BindAddress => '127.0.0.1',
-        :Port => 0})
-      _, port, _, host = srv.listeners[0].addr
-      server_thread = srv.start
-      server_thread2 = Thread.new {
-        server_thread.join
-        if log_tester
-          log_tester.call(log)
-        end
-      }
-      client_thread = Thread.new {
-        begin
-          yield srv, dr, "http://#{host}:#{port}", server_thread, log
-        ensure
-          srv.shutdown
-        end
-      }
-      assert_join_threads([client_thread, server_thread2])
-    }
-  ensure
-    WEBrick::Utils::TimeoutHandler.terminate
-  end
-
-  def with_env(h)
-    begin
-      old = {}
-      h.each_key {|k| old[k] = ENV[k] }
-      h.each {|k, v| ENV[k] = v }
-      yield
-    ensure
-      h.each_key {|k| ENV[k] = old[k] }
-    end
-  end
-
-  def setup
-    @proxies = %w[http_proxy HTTP_PROXY ftp_proxy FTP_PROXY no_proxy]
-    @old_proxies = @proxies.map {|k| ENV[k] }
-    @proxies.each {|k| ENV[k] = nil }
-  end
-
-  def teardown
-    @proxies.each_with_index {|k, i| ENV[k] = @old_proxies[i] }
-  end
+  include TestOpenURIUtils
 
   def test_200_uri_open
-    with_http {|srv, dr, url|
+    with_http {|srv, url|
       srv.mount_proc("/urifoo200", lambda { |req, res| res.body = "urifoo200" } )
       URI.open("#{url}/urifoo200") {|f|
         assert_equal("200", f.status[0])
@@ -79,7 +22,7 @@ def test_200_uri_open
   end
 
   def test_200
-    with_http {|srv, dr, url|
+    with_http {|srv, url|
       srv.mount_proc("/foo200", lambda { |req, res| res.body = "foo200" } )
       URI.open("#{url}/foo200") {|f|
         assert_equal("200", f.status[0])
@@ -89,7 +32,7 @@ def test_200
   end
 
   def test_200big
-    with_http {|srv, dr, url|
+    with_http {|srv, url|
       content = "foo200big"*10240
       srv.mount_proc("/foo200big", lambda { |req, res| res.body = content } )
       URI.open("#{url}/foo200big") {|f|
@@ -104,14 +47,14 @@ def test_404
       assert_equal(1, server_log.length)
       assert_match(%r{ERROR `/not-exist' not found}, server_log[0])
     }
-    with_http(log_tester) {|srv, dr, url, server_thread, server_log|
+    with_http(log_tester) {|srv, url, server_thread, server_log|
       exc = assert_raise(OpenURI::HTTPError) { URI.open("#{url}/not-exist") {} }
       assert_equal("404", exc.io.status[0])
     }
   end
 
   def test_open_uri
-    with_http {|srv, dr, url|
+    with_http {|srv, url|
       srv.mount_proc("/foo_ou", lambda { |req, res| res.body = "foo_ou" } )
       u = URI("#{url}/foo_ou")
       URI.open(u) {|f|
@@ -155,7 +98,7 @@ def test_open_timeout
       URI("http://example.com/").read(open_timeout: 0.000001)
     end if false # avoid external resources in tests
 
-    with_http {|srv, dr, url|
+    with_http {|srv, url|
       url += '/'
       srv.mount_proc('/', lambda { |_, res| res.body = 'hi' })
       begin
@@ -186,7 +129,7 @@ def o.open(foo: ) foo end
   end
 
   def test_mode
-    with_http {|srv, dr, url|
+    with_http {|srv, url|
       srv.mount_proc("/mode", lambda { |req, res| res.body = "mode" } )
       URI.open("#{url}/mode", "r") {|f|
         assert_equal("200", f.status[0])
@@ -208,7 +151,7 @@ def test_mode
   end
 
   def test_without_block
-    with_http {|srv, dr, url|
+    with_http {|srv, url|
       srv.mount_proc("/without_block", lambda { |req, res| res.body = "without_block" } )
       begin
         f = URI.open("#{url}/without_block")
@@ -221,7 +164,7 @@ def test_without_block
   end
 
   def test_close_in_block_small
-    with_http {|srv, dr, url|
+    with_http {|srv, url|
       srv.mount_proc("/close200", lambda { |req, res| res.body = "close200" } )
       assert_nothing_raised {
         URI.open("#{url}/close200") {|f|
@@ -232,7 +175,7 @@ def test_close_in_block_small
   end
 
   def test_close_in_block_big
-    with_http {|srv, dr, url|
+    with_http {|srv, url|
       content = "close200big"*10240
       srv.mount_proc("/close200big", lambda { |req, res| res.body = content } )
       assert_nothing_raised {
@@ -246,8 +189,8 @@ def test_close_in_block_big
   def test_header
     myheader1 = 'barrrr'
     myheader2 = nil
-    with_http {|srv, dr, url|
-      srv.mount_proc("/h/") {|req, res| myheader2 = req['myheader']; res.body = "foo" }
+    with_http {|srv, url|
+      srv.mount_proc("/h/", lambda {|req, res| myheader2 = req['myheader']; res.body = "foo" } )
       URI.open("#{url}/h/", 'MyHeader'=>myheader1) {|f|
         assert_equal("foo", f.read)
         assert_equal(myheader1, myheader2)
@@ -267,175 +210,11 @@ def test_non_http_proxy
     }
   end
 
-  def test_proxy
-    with_http {|srv, dr, url|
-      proxy_log = StringIO.new(''.dup)
-      proxy_logger = WEBrick::Log.new(proxy_log, WEBrick::BasicLog::WARN)
-      proxy_auth_log = ''.dup
-      proxy = WEBrick::HTTPProxyServer.new({
-        :ServerType => Thread,
-        :Logger => proxy_logger,
-        :AccessLog => [[NullLog, ""]],
-        :ProxyAuthProc => lambda {|req, res|
-          proxy_auth_log << req.request_line
-        },
-        :BindAddress => '127.0.0.1',
-        :Port => 0})
-      _, proxy_port, _, proxy_host = proxy.listeners[0].addr
-      proxy_url = "http://#{proxy_host}:#{proxy_port}/"
-      begin
-        proxy_thread = proxy.start
-        srv.mount_proc("/proxy", lambda { |req, res| res.body = "proxy" } )
-        URI.open("#{url}/proxy", :proxy=>proxy_url) {|f|
-          assert_equal("200", f.status[0])
-          assert_equal("proxy", f.read)
-        }
-        assert_match(/#{Regexp.quote url}/, proxy_auth_log); proxy_auth_log.clear
-        URI.open("#{url}/proxy", :proxy=>URI(proxy_url)) {|f|
-          assert_equal("200", f.status[0])
-          assert_equal("proxy", f.read)
-        }
-        assert_match(/#{Regexp.quote url}/, proxy_auth_log); proxy_auth_log.clear
-        URI.open("#{url}/proxy", :proxy=>nil) {|f|
-          assert_equal("200", f.status[0])
-          assert_equal("proxy", f.read)
-        }
-        assert_equal("", proxy_auth_log); proxy_auth_log.clear
-        assert_raise(ArgumentError) {
-          URI.open("#{url}/proxy", :proxy=>:invalid) {}
-        }
-        assert_equal("", proxy_auth_log); proxy_auth_log.clear
-        with_env("http_proxy"=>proxy_url) {
-          # should not use proxy for 127.0.0.0/8.
-          URI.open("#{url}/proxy") {|f|
-            assert_equal("200", f.status[0])
-            assert_equal("proxy", f.read)
-          }
-        }
-        assert_equal("", proxy_auth_log); proxy_auth_log.clear
-      ensure
-        proxy.shutdown
-        proxy_thread.join
-      end
-      assert_equal("", proxy_log.string)
-    }
-  end
-
-  def test_proxy_http_basic_authentication_failure
-    with_http {|srv, dr, url|
-      proxy_log = StringIO.new(''.dup)
-      proxy_logger = WEBrick::Log.new(proxy_log, WEBrick::BasicLog::WARN)
-      proxy_auth_log = ''.dup
-      proxy = WEBrick::HTTPProxyServer.new({
-        :ServerType => Thread,
-        :Logger => proxy_logger,
-        :AccessLog => [[NullLog, ""]],
-        :ProxyAuthProc => lambda {|req, res|
-          proxy_auth_log << req.request_line
-          if req["Proxy-Authorization"] != "Basic #{['user:pass'].pack('m').chomp}"
-            raise WEBrick::HTTPStatus::ProxyAuthenticationRequired
-          end
-        },
-        :BindAddress => '127.0.0.1',
-        :Port => 0})
-      _, proxy_port, _, proxy_host = proxy.listeners[0].addr
-      proxy_url = "http://#{proxy_host}:#{proxy_port}/"
-      begin
-        th = proxy.start
-        srv.mount_proc("/proxy", lambda { |req, res| res.body = "proxy" } )
-        exc = assert_raise(OpenURI::HTTPError) { URI.open("#{url}/proxy", :proxy=>proxy_url) {} }
-        assert_equal("407", exc.io.status[0])
-        assert_match(/#{Regexp.quote url}/, proxy_auth_log); proxy_auth_log.clear
-      ensure
-        proxy.shutdown
-        th.join
-      end
-      assert_match(/ERROR WEBrick::HTTPStatus::ProxyAuthenticationRequired/, proxy_log.string)
-    }
-  end
-
-  def test_proxy_http_basic_authentication_success
-    with_http {|srv, dr, url|
-      proxy_log = StringIO.new(''.dup)
-      proxy_logger = WEBrick::Log.new(proxy_log, WEBrick::BasicLog::WARN)
-      proxy_auth_log = ''.dup
-      proxy = WEBrick::HTTPProxyServer.new({
-        :ServerType => Thread,
-        :Logger => proxy_logger,
-        :AccessLog => [[NullLog, ""]],
-        :ProxyAuthProc => lambda {|req, res|
-          proxy_auth_log << req.request_line
-          if req["Proxy-Authorization"] != "Basic #{['user:pass'].pack('m').chomp}"
-            raise WEBrick::HTTPStatus::ProxyAuthenticationRequired
-          end
-        },
-        :BindAddress => '127.0.0.1',
-        :Port => 0})
-      _, proxy_port, _, proxy_host = proxy.listeners[0].addr
-      proxy_url = "http://#{proxy_host}:#{proxy_port}/"
-      begin
-        th = proxy.start
-        srv.mount_proc("/proxy", lambda { |req, res| res.body = "proxy" } )
-        URI.open("#{url}/proxy",
-            :proxy_http_basic_authentication=>[proxy_url, "user", "pass"]) {|f|
-          assert_equal("200", f.status[0])
-          assert_equal("proxy", f.read)
-        }
-        assert_match(/#{Regexp.quote url}/, proxy_auth_log); proxy_auth_log.clear
-        assert_raise(ArgumentError) {
-          URI.open("#{url}/proxy",
-              :proxy_http_basic_authentication=>[true, "user", "pass"]) {}
-        }
-        assert_equal("", proxy_auth_log); proxy_auth_log.clear
-      ensure
-        proxy.shutdown
-        th.join
-      end
-      assert_equal("", proxy_log.string)
-    }
-  end
-
-  def test_authenticated_proxy_http_basic_authentication_success
-    with_http {|srv, dr, url|
-      proxy_log = StringIO.new(''.dup)
-      proxy_logger = WEBrick::Log.new(proxy_log, WEBrick::BasicLog::WARN)
-      proxy_auth_log = ''.dup
-      proxy = WEBrick::HTTPProxyServer.new({
-        :ServerType => Thread,
-        :Logger => proxy_logger,
-        :AccessLog => [[NullLog, ""]],
-        :ProxyAuthProc => lambda {|req, res|
-          proxy_auth_log << req.request_line
-          if req["Proxy-Authorization"] != "Basic #{['user:pass'].pack('m').chomp}"
-            raise WEBrick::HTTPStatus::ProxyAuthenticationRequired
-          end
-        },
-        :BindAddress => '127.0.0.1',
-        :Port => 0})
-      _, proxy_port, _, proxy_host = proxy.listeners[0].addr
-      proxy_url = "http://user:pass@#{proxy_host}:#{proxy_port}/"
-      begin
-        th = proxy.start
-        srv.mount_proc("/proxy", lambda { |req, res| res.body = "proxy" } )
-        URI.open("#{url}/proxy", :proxy => proxy_url) {|f|
-          assert_equal("200", f.status[0])
-          assert_equal("proxy", f.read)
-        }
-        assert_match(/#{Regexp.quote url}/, proxy_auth_log); proxy_auth_log.clear
-        assert_equal("", proxy_auth_log); proxy_auth_log.clear
-      ensure
-        proxy.shutdown
-        th.join
-      end
-      assert_equal("", proxy_log.string)
-    }
-  end
-
   def test_redirect
-    with_http {|srv, dr, url|
-      srv.mount_proc("/r1/") {|req, res| res.status = 301; res["location"] = "#{url}/r2"; res.body = "r1" }
-      srv.mount_proc("/r2/") {|req, res| res.body = "r2" }
-      srv.mount_proc("/to-file/") {|req, res| res.status = 301; res["location"] = "file:///foo" }
+    with_http {|srv, url|
+      srv.mount_proc("/r1/", lambda {|req, res| res.status = 301; res["location"] = "#{url}/r2"; res.body = "r1" } )
+      srv.mount_proc("/r2/", lambda {|req, res| res.body = "r2" } )
+      srv.mount_proc("/to-file/", lambda {|req, res| res.status = 301; res["location"] = "file:///foo" } )
       URI.open("#{url}/r1/") {|f|
         assert_equal("#{url}/r2", f.base_uri.to_s)
         assert_equal("r2", f.read)
@@ -446,9 +225,9 @@ def test_redirect
   end
 
   def test_redirect_loop
-    with_http {|srv, dr, url|
-      srv.mount_proc("/r1/") {|req, res| res.status = 301; res["location"] = "#{url}/r2"; res.body = "r1" }
-      srv.mount_proc("/r2/") {|req, res| res.status = 301; res["location"] = "#{url}/r1"; res.body = "r2" }
+    with_http {|srv, url|
+      srv.mount_proc("/r1/", lambda {|req, res| res.status = 301; res["location"] = "#{url}/r2"; res.body = "r1" } )
+      srv.mount_proc("/r2/", lambda {|req, res| res.status = 301; res["location"] = "#{url}/r1"; res.body = "r2" } )
       assert_raise(RuntimeError) { URI.open("#{url}/r1/") {} }
     }
   end
@@ -513,20 +292,20 @@ def test_redirect_invalid
   end
 
   def setup_redirect_auth(srv, url)
-    srv.mount_proc("/r1/") {|req, res|
+    srv.mount_proc("/r1/", lambda {|req, res|
       res.status = 301
       res["location"] = "#{url}/r2"
-    }
-    srv.mount_proc("/r2/") {|req, res|
+    })
+    srv.mount_proc("/r2/", lambda {|req, res|
       if req["Authorization"] != "Basic #{['user:pass'].pack('m').chomp}"
-        raise WEBrick::HTTPStatus::Unauthorized
+        raise Unauthorized
       end
       res.body = "r2"
-    }
+    })
   end
 
   def test_redirect_auth_success
-    with_http {|srv, dr, url|
+    with_http {|srv, url|
       setup_redirect_auth(srv, url)
       URI.open("#{url}/r2/", :http_basic_authentication=>['user', 'pass']) {|f|
         assert_equal("r2", f.read)
@@ -537,9 +316,9 @@ def test_redirect_auth_success
   def test_redirect_auth_failure_r2
     log_tester = lambda {|server_log|
       assert_equal(1, server_log.length)
-      assert_match(/ERROR WEBrick::HTTPStatus::Unauthorized/, server_log[0])
+      assert_match(/ERROR Unauthorized/, server_log[0])
     }
-    with_http(log_tester) {|srv, dr, url, server_thread, server_log|
+    with_http(log_tester) {|srv, url, server_thread, server_log|
       setup_redirect_auth(srv, url)
       exc = assert_raise(OpenURI::HTTPError) { URI.open("#{url}/r2/") {} }
       assert_equal("401", exc.io.status[0])
@@ -549,23 +328,102 @@ def test_redirect_auth_failure_r2
   def test_redirect_auth_failure_r1
     log_tester = lambda {|server_log|
       assert_equal(1, server_log.length)
-      assert_match(/ERROR WEBrick::HTTPStatus::Unauthorized/, server_log[0])
+      assert_match(/ERROR Unauthorized/, server_log[0])
     }
-    with_http(log_tester) {|srv, dr, url, server_thread, server_log|
+    with_http(log_tester) {|srv, url, server_thread, server_log|
       setup_redirect_auth(srv, url)
       exc = assert_raise(OpenURI::HTTPError) { URI.open("#{url}/r1/", :http_basic_authentication=>['user', 'pass']) {} }
       assert_equal("401", exc.io.status[0])
     }
   end
 
+  def test_redirect_without_request_specific_fields_hash
+    authorization_header = nil
+    redirected_authorization_header = nil
+    with_http {|srv, url|
+      srv.mount_proc("/r1/", lambda {|req, res| res.status = 301; res["location"] = "#{url}/r2"; authorization_header = req["Authorization"]; } )
+      srv.mount_proc("/r2/", lambda {|req, res| redirected_authorization_header = req["Authorization"]; } )
+      URI.open("#{url}/r1/", "Authorization" => "dummy_token") {|f|
+        assert_equal("dummy_token", authorization_header)
+        assert_equal("#{url}/r2", f.base_uri.to_s)
+        assert_equal("dummy_token", redirected_authorization_header)
+      }
+    }
+  end
+
+  def test_redirect_with_request_specific_fields_hash
+    authorization_header = nil
+    redirected_authorization_header = "exposed_dummy_token"
+    with_http {|srv, url|
+      srv.mount_proc("/r1/", lambda {|req, res| res.status = 301; res["location"] = "#{url}/r2"; authorization_header = req["Authorization"]; } )
+      srv.mount_proc("/r2/", lambda {|req, res| redirected_authorization_header = req["Authorization"]; } )
+      URI.open("#{url}/r1/", request_specific_fields: {"Authorization" => "dummy_token"}) {|f|
+        assert_equal("dummy_token", authorization_header)
+        assert_equal("#{url}/r2", f.base_uri.to_s)
+        assert_equal(nil, redirected_authorization_header)
+      }
+    }
+  end
+
+  def test_redirect_with_request_specific_fields_proc
+    authorization_header = nil
+    redirected_authorization_header = nil
+
+    modify_authorization_header = Proc.new do |uri|
+      authorization_token = if uri.to_s.include?("/r1")
+                              "dummy_token"
+                            else
+                              "masked_dummy_token"
+                            end
+      { "Authorization" => authorization_token }
+    end
+
+    with_http {|srv, url|
+      srv.mount_proc("/r1/", lambda {|req, res| res.status = 301; res["location"] = "#{url}/r2"; authorization_header = req["Authorization"] } )
+      srv.mount_proc("/r2/", lambda {|req, res| redirected_authorization_header = req["Authorization"]; } )
+      URI.open("#{url}/r1/", request_specific_fields: modify_authorization_header) {|f|
+        assert_equal("dummy_token", authorization_header)
+        assert_equal("#{url}/r2", f.base_uri.to_s)
+        assert_equal("masked_dummy_token", redirected_authorization_header)
+      }
+    }
+  end
+
+  def test_redirect_with_invalid_request_specific_fields_format
+    with_http {|srv, url|
+      srv.mount_proc("/r1/", lambda {|req, res| res.body = "r1" } )
+      exc = assert_raise(ArgumentError) { URI.open("#{url}/r1/", request_specific_fields: "dummy_token") {} }
+      assert_equal('Invalid request_specific_fields option: "dummy_token"', exc.message)
+    }
+  end
+
+  def test_max_redirects_success
+    with_http {|srv, url|
+      srv.mount_proc("/r1/", lambda {|req, res| res.status = 301; res["location"] = "#{url}/r2"; res.body = "r1" } )
+      srv.mount_proc("/r2/", lambda {|req, res| res.status = 301; res["location"] = "#{url}/r3"; res.body = "r2" } )
+      srv.mount_proc("/r3/", lambda {|req, res| res.body = "r3" } )
+      URI.open("#{url}/r1/", max_redirects: 2) { |f| assert_equal("r3", f.read) }
+    }
+  end
+
+  def test_max_redirects_too_many
+    with_http {|srv, url|
+      srv.mount_proc("/r1/", lambda {|req, res| res.status = 301; res["location"] = "#{url}/r2"; res.body = "r1" } )
+      srv.mount_proc("/r2/", lambda {|req, res| res.status = 301; res["location"] = "#{url}/r3"; res.body = "r2" } )
+      srv.mount_proc("/r3/", lambda {|req, res| res.body = "r3" } )
+      exc = assert_raise(OpenURI::TooManyRedirects) { URI.open("#{url}/r1/", max_redirects: 1) {} }
+      assert_equal("Too many redirects", exc.message)
+    }
+  end
+
   def test_userinfo
     assert_raise(ArgumentError) { URI.open("http://user:pass@127.0.0.1/") {} }
   end
 
   def test_progress
-    with_http {|srv, dr, url|
+    with_http {|srv, url|
       content = "a" * 100000
-      srv.mount_proc("/data/") {|req, res| res.body = content }
+      srv.mount_proc("/data/", lambda {|req, res| res.body = content })
       length = []
       progress = []
       URI.open("#{url}/data/",
@@ -583,9 +441,9 @@ def test_progress
   end
 
   def test_progress_chunked
-    with_http {|srv, dr, url|
+    with_http {|srv, url|
       content = "a" * 100000
-      srv.mount_proc("/data/") {|req, res| res.body = content; res.chunked = true }
+      srv.mount_proc("/data/", lambda {|req, res| res.body = content; res.chunked = true } )
       length = []
       progress = []
       URI.open("#{url}/data/",
@@ -603,7 +461,7 @@ def test_progress_chunked
   end
 
   def test_uri_read
-    with_http {|srv, dr, url|
+    with_http {|srv, url|
       srv.mount_proc("/uriread", lambda { |req, res| res.body = "uriread" } )
       data = URI("#{url}/uriread").read
       assert_equal("200", data.status[0])
@@ -612,12 +470,12 @@ def test_uri_read
   end
 
   def test_encoding
-    with_http {|srv, dr, url|
+    with_http {|srv, url|
       content_u8 = "\u3042"
       content_ej = "\xa2\xa4".dup.force_encoding("euc-jp")
-      srv.mount_proc("/u8/") {|req, res| res.body = content_u8; res['content-type'] = 'text/plain; charset=utf-8' }
-      srv.mount_proc("/ej/") {|req, res| res.body = content_ej; res['content-type'] = 'TEXT/PLAIN; charset=EUC-JP' }
-      srv.mount_proc("/nc/") {|req, res| res.body = "aa"; res['content-type'] = 'Text/Plain' }
+      srv.mount_proc("/u8/", lambda {|req, res| res.body = content_u8; res['content-type'] = 'text/plain; charset=utf-8' } )
+      srv.mount_proc("/ej/", lambda {|req, res| res.body = content_ej; res['content-type'] = 'TEXT/PLAIN; charset=EUC-JP' } )
+      srv.mount_proc("/nc/", lambda {|req, res| res.body = "aa"; res['content-type'] = 'Text/Plain' } )
       URI.open("#{url}/u8/") {|f|
         assert_equal(content_u8, f.read)
         assert_equal("text/plain", f.content_type)
@@ -656,9 +514,9 @@ def test_encoding
   end
 
   def test_quoted_attvalue
-    with_http {|srv, dr, url|
+    with_http {|srv, url|
       content_u8 = "\u3042"
-      srv.mount_proc("/qu8/") {|req, res| res.body = content_u8; res['content-type'] = 'text/plain; charset="utf\-8"' }
+      srv.mount_proc("/qu8/", lambda {|req, res| res.body = content_u8; res['content-type'] = 'text/plain; charset="utf\-8"' } )
       URI.open("#{url}/qu8/") {|f|
         assert_equal(content_u8, f.read)
         assert_equal("text/plain", f.content_type)
@@ -668,8 +526,8 @@ def test_quoted_attvalue
   end
 
   def test_last_modified
-    with_http {|srv, dr, url|
-      srv.mount_proc("/data/") {|req, res| res.body = "foo"; res['last-modified'] = 'Fri, 07 Aug 2009 06:05:04 GMT' }
+    with_http {|srv, url|
+      srv.mount_proc("/data/", lambda {|req, res| res.body = "foo"; res['last-modified'] = 'Fri, 07 Aug 2009 06:05:04 GMT' } )
       URI.open("#{url}/data/") {|f|
         assert_equal("foo", f.read)
         assert_equal(Time.utc(2009,8,7,6,5,4), f.last_modified)
@@ -678,12 +536,12 @@ def test_last_modified
   end
 
   def test_content_encoding
-    with_http {|srv, dr, url|
+    with_http {|srv, url|
       content = "abc" * 10000
       Zlib::GzipWriter.wrap(StringIO.new(content_gz="".b)) {|z| z.write content }
-      srv.mount_proc("/data/") {|req, res| res.body = content_gz; res['content-encoding'] = 'gzip' }
-      srv.mount_proc("/data2/") {|req, res| res.body = content_gz; res['content-encoding'] = 'gzip'; res.chunked = true }
-      srv.mount_proc("/noce/") {|req, res| res.body = content_gz }
+      srv.mount_proc("/data/", lambda {|req, res| res.body = content_gz; res['content-encoding'] = 'gzip' } )
+      srv.mount_proc("/data2/", lambda {|req, res| res.body = content_gz; res['content-encoding'] = 'gzip'; res.chunked = true } )
+      srv.mount_proc("/noce/", lambda {|req, res| res.body = content_gz } )
       URI.open("#{url}/data/") {|f|
         assert_equal [], f.content_encoding
         assert_equal(content, f.read)
@@ -700,12 +558,12 @@ def test_content_encoding
   end if defined?(Zlib::GzipWriter)
 
   def test_multiple_cookies
-    with_http {|srv, dr, url|
-      srv.mount_proc("/mcookie/") {|req, res|
+    with_http {|srv, url|
+      srv.mount_proc("/mcookie/", lambda {|req, res|
         res.cookies << "name1=value1; blabla"
         res.cookies << "name2=value2; blabla"
         res.body = "foo"
-      }
+      })
       URI.open("#{url}/mcookie/") {|f|
         assert_equal("foo", f.read)
         assert_equal(["name1=value1; blabla", "name2=value2; blabla"],
@@ -716,205 +574,6 @@ def test_multiple_cookies
 
   # 192.0.2.0/24 is TEST-NET.  [RFC3330]
 
-  begin
-    require 'net/ftp'
-
-    def test_ftp_invalid_request
-      assert_raise(ArgumentError) { URI("ftp://127.0.0.1/").read }
-      assert_raise(ArgumentError) { URI("ftp://127.0.0.1/a%0Db").read }
-      assert_raise(ArgumentError) { URI("ftp://127.0.0.1/a%0Ab").read }
-      assert_raise(ArgumentError) { URI("ftp://127.0.0.1/a%0Db/f").read }
-      assert_raise(ArgumentError) { URI("ftp://127.0.0.1/a%0Ab/f").read }
-      assert_nothing_raised(URI::InvalidComponentError) { URI("ftp://127.0.0.1/d/f;type=x") }
-    end
-
-    def test_ftp
-      TCPServer.open("127.0.0.1", 0) {|serv|
-        _, port, _, host = serv.addr
-        th = Thread.new {
-          s = serv.accept
-          begin
-            s.print "220 Test FTP Server\r\n"
-            assert_equal("USER anonymous\r\n", s.gets); s.print "331 name ok\r\n"
-            assert_match(/\APASS .*\r\n\z/, s.gets); s.print "230 logged in\r\n"
-            assert_equal("TYPE I\r\n", s.gets); s.print "200 type set to I\r\n"
-            assert_equal("CWD foo\r\n", s.gets); s.print "250 CWD successful\r\n"
-            assert_equal("PASV\r\n", s.gets)
-            TCPServer.open("127.0.0.1", 0) {|data_serv|
-              _, data_serv_port, _, _ = data_serv.addr
-              hi = data_serv_port >> 8
-              lo = data_serv_port & 0xff
-              s.print "227 Entering Passive Mode (127,0,0,1,#{hi},#{lo}).\r\n"
-              assert_equal("RETR bar\r\n", s.gets); s.print "150 file okay\r\n"
-              data_sock = data_serv.accept
-              begin
-                data_sock << "content"
-              ensure
-                data_sock.close
-              end
-              s.print "226 transfer complete\r\n"
-              assert_nil(s.gets)
-            }
-          ensure
-            s.close if s
-          end
-        }
-        begin
-          content = URI("ftp://#{host}:#{port}/foo/bar").read
-          assert_equal("content", content)
-        ensure
-          Thread.kill(th)
-          th.join
-        end
-      }
-    end
-
-    def test_ftp_active
-      TCPServer.open("127.0.0.1", 0) {|serv|
-        _, port, _, host = serv.addr
-        th = Thread.new {
-          s = serv.accept
-          begin
-            content = "content"
-            s.print "220 Test FTP Server\r\n"
-            assert_equal("USER anonymous\r\n", s.gets); s.print "331 name ok\r\n"
-            assert_match(/\APASS .*\r\n\z/, s.gets); s.print "230 logged in\r\n"
-            assert_equal("TYPE I\r\n", s.gets); s.print "200 type set to I\r\n"
-            assert_equal("CWD foo\r\n", s.gets); s.print "250 CWD successful\r\n"
-            assert(m = /\APORT 127,0,0,1,(\d+),(\d+)\r\n\z/.match(s.gets))
-            active_port = m[1].to_i << 8 | m[2].to_i
-            TCPSocket.open("127.0.0.1", active_port) {|data_sock|
-              s.print "200 data connection opened\r\n"
-              assert_equal("RETR bar\r\n", s.gets); s.print "150 file okay\r\n"
-              begin
-                data_sock << content
-              ensure
-                data_sock.close
-              end
-              s.print "226 transfer complete\r\n"
-              assert_nil(s.gets)
-            }
-          ensure
-            s.close if s
-          end
-        }
-        begin
-          content = URI("ftp://#{host}:#{port}/foo/bar").read(:ftp_active_mode=>true)
-          assert_equal("content", content)
-        ensure
-          Thread.kill(th)
-          th.join
-        end
-      }
-    end
-
-    def test_ftp_ascii
-      TCPServer.open("127.0.0.1", 0) {|serv|
-        _, port, _, host = serv.addr
-        th = Thread.new {
-          s = serv.accept
-          begin
-            content = "content"
-            s.print "220 Test FTP Server\r\n"
-            assert_equal("USER anonymous\r\n", s.gets); s.print "331 name ok\r\n"
-            assert_match(/\APASS .*\r\n\z/, s.gets); s.print "230 logged in\r\n"
-            assert_equal("TYPE I\r\n", s.gets); s.print "200 type set to I\r\n"
-            assert_equal("CWD /foo\r\n", s.gets); s.print "250 CWD successful\r\n"
-            assert_equal("TYPE A\r\n", s.gets); s.print "200 type set to A\r\n"
-            assert_equal("SIZE bar\r\n", s.gets); s.print "213 #{content.bytesize}\r\n"
-            assert_equal("PASV\r\n", s.gets)
-            TCPServer.open("127.0.0.1", 0) {|data_serv|
-              _, data_serv_port, _, _ = data_serv.addr
-              hi = data_serv_port >> 8
-              lo = data_serv_port & 0xff
-              s.print "227 Entering Passive Mode (127,0,0,1,#{hi},#{lo}).\r\n"
-              assert_equal("RETR bar\r\n", s.gets); s.print "150 file okay\r\n"
-              data_sock = data_serv.accept
-              begin
-                data_sock << content
-              ensure
-                data_sock.close
-              end
-              s.print "226 transfer complete\r\n"
-              assert_nil(s.gets)
-            }
-          ensure
-            s.close if s
-          end
-        }
-        begin
-          length = []
-          progress = []
-          content = URI("ftp://#{host}:#{port}/%2Ffoo/b%61r;type=a").read(
-          :content_length_proc => lambda {|n| length << n },
-          :progress_proc => lambda {|n| progress << n })
-          assert_equal("content", content)
-          assert_equal([7], length)
-          assert_equal(7, progress.inject(&:+))
-        ensure
-          Thread.kill(th)
-          th.join
-        end
-      }
-    end
-  rescue LoadError
-    # net-ftp is the bundled gems at Ruby 3.1
-  end
-
-  def test_ftp_over_http_proxy
-    TCPServer.open("127.0.0.1", 0) {|proxy_serv|
-      proxy_port = proxy_serv.addr[1]
-      th = Thread.new {
-        proxy_sock = proxy_serv.accept
-        begin
-          req = proxy_sock.gets("\r\n\r\n")
-          assert_match(%r{\AGET ftp://192.0.2.1/foo/bar }, req)
-          proxy_sock.print "HTTP/1.0 200 OK\r\n"
-          proxy_sock.print "Content-Length: 4\r\n\r\n"
-          proxy_sock.print "ab\r\n"
-        ensure
-          proxy_sock.close
-        end
-      }
-      begin
-        with_env('ftp_proxy'=>"http://127.0.0.1:#{proxy_port}") {
-          content = URI("ftp://192.0.2.1/foo/bar").read
-          assert_equal("ab\r\n", content)
-        }
-      ensure
-        Thread.kill(th)
-        th.join
-      end
-    }
-  end
-
-  def test_ftp_over_http_proxy_auth
-    TCPServer.open("127.0.0.1", 0) {|proxy_serv|
-      proxy_port = proxy_serv.addr[1]
-      th = Thread.new {
-        proxy_sock = proxy_serv.accept
-        begin
-          req = proxy_sock.gets("\r\n\r\n")
-          assert_match(%r{\AGET ftp://192.0.2.1/foo/bar }, req)
-          assert_match(%r{Proxy-Authorization: Basic #{['proxy-user:proxy-password'].pack('m').chomp}\r\n}, req)
-          proxy_sock.print "HTTP/1.0 200 OK\r\n"
-          proxy_sock.print "Content-Length: 4\r\n\r\n"
-          proxy_sock.print "ab\r\n"
-        ensure
-          proxy_sock.close
-        end
-      }
-      begin
-        content = URI("ftp://192.0.2.1/foo/bar").read(
-          :proxy_http_basic_authentication => ["http://127.0.0.1:#{proxy_port}", "proxy-user", "proxy-password"])
-        assert_equal("ab\r\n", content)
-      ensure
-        Thread.kill(th)
-        th.join
-      end
-    }
-  end
-
   def test_meta_init_doesnt_bump_global_constant_state
     omit "RubyVM.stat not defined" unless defined? RubyVM.stat
     omit unless RubyVM.stat.has_key?(:global_constant_state)
diff --git a/test/open-uri/test_proxy.rb b/test/open-uri/test_proxy.rb
new file mode 100644
index 00000000000000..0cc711a0f3cee3
--- /dev/null
+++ b/test/open-uri/test_proxy.rb
@@ -0,0 +1,174 @@
+# frozen_string_literal: true
+require 'test/unit'
+require 'open-uri'
+require 'stringio'
+require_relative 'utils'
+
+class TestOpenURIProxy < Test::Unit::TestCase
+  include TestOpenURIUtils
+
+  def with_env(h)
+    begin
+      old = {}
+      h.each_key {|k| old[k] = ENV[k] }
+      ENV.update(h)
+      yield
+    ensure
+      ENV.update(old)
+    end
+  end
+
+  def setup
+    @proxies = %w[http_proxy HTTP_PROXY ftp_proxy FTP_PROXY no_proxy]
+    @old_proxies = @proxies.map {|k| ENV[k] }
+    @proxies.each {|k| ENV[k] = nil }
+  end
+
+  def teardown
+    @proxies.each_with_index {|k, i| ENV[k] = @old_proxies[i] }
+  end
+
+  def test_proxy
+    with_http {|srv, url|
+      proxy_log = StringIO.new(''.dup)
+      proxy_access_log = StringIO.new(''.dup)
+      proxy_auth_log = ''.dup
+      proxy_host = '127.0.0.1'
+      proxy = SimpleHTTPProxyServer.new(proxy_host, 0, lambda {|req, res|
+          proxy_auth_log << req.request_line
+      }, proxy_log, proxy_access_log)
+      proxy_port = proxy.instance_variable_get(:@server).addr[1]
+      proxy_url = "http://#{proxy_host}:#{proxy_port}/"
+      begin
+        proxy_thread = proxy.start
+        srv.mount_proc("/proxy", lambda { |req, res| res.body = "proxy" } )
+        URI.open("#{url}/proxy", :proxy=>proxy_url) {|f|
+          assert_equal("200", f.status[0])
+          assert_equal("proxy", f.read)
+        }
+        assert_match(/#{Regexp.quote url}/, proxy_auth_log); proxy_auth_log.clear
+        URI.open("#{url}/proxy", :proxy=>URI(proxy_url)) {|f|
+          assert_equal("200", f.status[0])
+          assert_equal("proxy", f.read)
+        }
+        assert_match(/#{Regexp.quote url}/, proxy_auth_log); proxy_auth_log.clear
+        URI.open("#{url}/proxy", :proxy=>nil) {|f|
+          assert_equal("200", f.status[0])
+          assert_equal("proxy", f.read)
+        }
+        assert_equal("", proxy_auth_log); proxy_auth_log.clear
+        assert_raise(ArgumentError) {
+          URI.open("#{url}/proxy", :proxy=>:invalid) {}
+        }
+        assert_equal("", proxy_auth_log); proxy_auth_log.clear
+        with_env("http_proxy"=>proxy_url) {
+          # should not use proxy for 127.0.0.0/8.
+          URI.open("#{url}/proxy") {|f|
+            assert_equal("200", f.status[0])
+            assert_equal("proxy", f.read)
+          }
+        }
+        assert_equal("", proxy_auth_log); proxy_auth_log.clear
+      ensure
+        proxy.shutdown
+        proxy_thread.join
+      end
+      assert_equal("", proxy_log.string)
+    }
+  end
+
+  def test_proxy_http_basic_authentication_failure
+    with_http {|srv, url|
+      proxy_log = StringIO.new(''.dup)
+      proxy_access_log = StringIO.new(''.dup)
+      proxy_auth_log = ''.dup
+      proxy_host = '127.0.0.1'
+      proxy = SimpleHTTPProxyServer.new(proxy_host, 0, lambda {|req, res|
+          proxy_auth_log << req.request_line
+          if req["Proxy-Authorization"] != "Basic #{['user:pass'].pack('m').chomp}"
+            raise ProxyAuthenticationRequired
+          end
+      }, proxy_log, proxy_access_log)
+      proxy_port = proxy.instance_variable_get(:@server).addr[1]
+      proxy_url = "http://#{proxy_host}:#{proxy_port}/"
+      begin
+        th = proxy.start
+        srv.mount_proc("/proxy", lambda { |req, res| res.body = "proxy" } )
+        exc = assert_raise(OpenURI::HTTPError) { URI.open("#{url}/proxy", :proxy=>proxy_url) {} }
+        assert_equal("407", exc.io.status[0])
+        assert_match(/#{Regexp.quote url}/, proxy_auth_log); proxy_auth_log.clear
+      ensure
+        proxy.shutdown
+        th.join
+      end
+      assert_match(/ERROR ProxyAuthenticationRequired/, proxy_log.string)
+    }
+  end
+
+  def test_proxy_http_basic_authentication_success
+    with_http {|srv, url|
+      proxy_log = StringIO.new(''.dup)
+      proxy_access_log = StringIO.new(''.dup)
+      proxy_auth_log = ''.dup
+      proxy_host = '127.0.0.1'
+      proxy = SimpleHTTPProxyServer.new(proxy_host, 0, lambda {|req, res|
+          proxy_auth_log << req.request_line
+          if req["Proxy-Authorization"] != "Basic #{['user:pass'].pack('m').chomp}"
+            raise ProxyAuthenticationRequired
+          end
+      }, proxy_log, proxy_access_log)
+      proxy_port = proxy.instance_variable_get(:@server).addr[1]
+      proxy_url = "http://#{proxy_host}:#{proxy_port}/"
+      begin
+        th = proxy.start
+        srv.mount_proc("/proxy", lambda { |req, res| res.body = "proxy" } )
+        URI.open("#{url}/proxy",
+            :proxy_http_basic_authentication=>[proxy_url, "user", "pass"]) {|f|
+          assert_equal("200", f.status[0])
+          assert_equal("proxy", f.read)
+        }
+        assert_match(/#{Regexp.quote url}/, proxy_auth_log); proxy_auth_log.clear
+        assert_raise(ArgumentError) {
+          URI.open("#{url}/proxy",
+              :proxy_http_basic_authentication=>[true, "user", "pass"]) {}
+        }
+        assert_equal("", proxy_auth_log); proxy_auth_log.clear
+      ensure
+        proxy.shutdown
+        th.join
+      end
+      assert_equal("", proxy_log.string)
+    }
+  end
+
+  def test_authenticated_proxy_http_basic_authentication_success
+    with_http {|srv, url|
+      proxy_log = StringIO.new(''.dup)
+      proxy_access_log = StringIO.new(''.dup)
+      proxy_auth_log = ''.dup
+      proxy_host = '127.0.0.1'
+      proxy = SimpleHTTPProxyServer.new(proxy_host, 0, lambda {|req, res|
+          proxy_auth_log << req.request_line
+          if req["Proxy-Authorization"] != "Basic #{['user:pass'].pack('m').chomp}"
+            raise ProxyAuthenticationRequired
+          end
+      }, proxy_log, proxy_access_log)
+      proxy_port = proxy.instance_variable_get(:@server).addr[1]
+      proxy_url = "http://user:pass@#{proxy_host}:#{proxy_port}/"
+      begin
+        th = proxy.start
+        srv.mount_proc("/proxy", lambda { |req, res| res.body = "proxy" } )
+        URI.open("#{url}/proxy", :proxy => proxy_url) {|f|
+          assert_equal("200", f.status[0])
+          assert_equal("proxy", f.read)
+        }
+        assert_match(/#{Regexp.quote url}/, proxy_auth_log); proxy_auth_log.clear
+        assert_equal("", proxy_auth_log); proxy_auth_log.clear
+      ensure
+        proxy.shutdown
+        th.join
+      end
+      assert_equal("", proxy_log.string)
+    }
+  end
+end
diff --git a/test/open-uri/test_ssl.rb b/test/open-uri/test_ssl.rb
index 3f94cab40fe82f..389391e685fc59 100644
--- a/test/open-uri/test_ssl.rb
+++ b/test/open-uri/test_ssl.rb
@@ -1,59 +1,14 @@
 # frozen_string_literal: true
 require 'test/unit'
 require 'open-uri'
-require 'stringio'
-require 'webrick'
+require_relative 'utils'
 begin
   require 'openssl'
-  require 'webrick/https'
 rescue LoadError
 end
-require 'webrick/httpproxy'
 
 class TestOpenURISSL < Test::Unit::TestCase
-end
-
-class TestOpenURISSL
-  NullLog = Object.new
-  def NullLog.<<(arg)
-  end
-
-  def with_https(log_tester=lambda {|log| assert_equal([], log) })
-    log = []
-    logger = WEBrick::Log.new(log, WEBrick::BasicLog::WARN)
-    Dir.mktmpdir {|dr|
-      srv = WEBrick::HTTPServer.new({
-        :DocumentRoot => dr,
-        :ServerType => Thread,
-        :Logger => logger,
-        :AccessLog => [[NullLog, ""]],
-        :SSLEnable => true,
-        :SSLCertificate => OpenSSL::X509::Certificate.new(SERVER_CERT),
-        :SSLPrivateKey => OpenSSL::PKey::RSA.new(SERVER_KEY),
-        :SSLTmpDhCallback => proc { OpenSSL::PKey::DH.new(DHPARAMS) },
-        :BindAddress => '127.0.0.1',
-        :Port => 0})
-      _, port, _, host = srv.listeners[0].addr
-      threads = []
-      server_thread = srv.start
-      threads << Thread.new {
-        server_thread.join
-        if log_tester
-          log_tester.call(log)
-        end
-      }
-      threads << Thread.new {
-        begin
-          yield srv, dr, "https://#{host}:#{port}", server_thread, log, threads
-        ensure
-          srv.shutdown
-        end
-      }
-      assert_join_threads(threads)
-    }
-  ensure
-    WEBrick::Utils::TimeoutHandler.terminate
-  end
+  include TestOpenURIUtils
 
   def setup
     @proxies = %w[http_proxy HTTP_PROXY https_proxy HTTPS_PROXY ftp_proxy FTP_PROXY no_proxy]
@@ -68,7 +23,9 @@ def teardown
   def setup_validation(srv, dr)
     cacert_filename = "#{dr}/cacert.pem"
     URI.open(cacert_filename, "w") {|f| f << CA_CERT }
-    srv.mount_proc("/data", lambda { |req, res| res.body = "ddd" } )
+    if srv.respond_to?(:mount_proc)
+      srv.mount_proc("/data", lambda { |req, res| res.body = "ddd" } )
+    end
     cacert_filename
   end
 
@@ -93,17 +50,10 @@ def test_validation_noverify
   end
 
   def test_validation_failure
-    unless /mswin|mingw/ =~ RUBY_PLATFORM
-      # on Windows, Errno::ECONNRESET will be raised, and it'll be eaten by
-      # WEBrick
-      log_tester = lambda {|server_log|
-        assert_equal(1, server_log.length)
-        assert_match(/ERROR OpenSSL::SSL::SSLError:/, server_log[0])
-      }
-    end
-    with_https(log_tester) {|srv, dr, url, server_thread, server_log|
+    with_https(nil) {|srv, dr, url|
       setup_validation(srv, dr)
       assert_raise(OpenSSL::SSL::SSLError) { URI.open("#{url}/data") {} }
+      sleep 0.5 unless RUBY_PLATFORM =~ /mswin|mingw/
     }
   end
 
@@ -126,39 +76,6 @@ def test_bad_ssl_version
     }
   end
 
-  def with_https_proxy(proxy_log_tester=lambda {|proxy_log, proxy_access_log| assert_equal([], proxy_log) })
-    proxy_log = []
-    proxy_logger = WEBrick::Log.new(proxy_log, WEBrick::BasicLog::WARN)
-    with_https {|srv, dr, url, server_thread, server_log, threads|
-      srv.mount_proc("/proxy", lambda { |req, res| res.body = "proxy" } )
-      cacert_filename = "#{dr}/cacert.pem"
-      open(cacert_filename, "w") {|f| f << CA_CERT }
-      cacert_directory = "#{dr}/certs"
-      Dir.mkdir cacert_directory
-      hashed_name = "%08x.0" % OpenSSL::X509::Certificate.new(CA_CERT).subject.hash
-      open("#{cacert_directory}/#{hashed_name}", "w") {|f| f << CA_CERT }
-      proxy = WEBrick::HTTPProxyServer.new({
-        :ServerType => Thread,
-        :Logger => proxy_logger,
-        :AccessLog => [[proxy_access_log=[], WEBrick::AccessLog::COMMON_LOG_FORMAT]],
-        :BindAddress => '127.0.0.1',
-        :Port => 0})
-      _, proxy_port, _, proxy_host = proxy.listeners[0].addr
-      proxy_thread = proxy.start
-      threads << Thread.new {
-        proxy_thread.join
-        if proxy_log_tester
-          proxy_log_tester.call(proxy_log, proxy_access_log)
-        end
-      }
-      begin
-        yield srv, dr, url, cacert_filename, cacert_directory, proxy_host, proxy_port
-      ensure
-        proxy.shutdown
-      end
-    }
-  end
-
   def test_proxy_cacert_file
     url = nil
     proxy_log_tester = lambda {|proxy_log, proxy_access_log|
@@ -192,341 +109,3 @@ def test_proxy_cacert_dir
   end
 
 end if defined?(OpenSSL::SSL)
-
-if defined?(OpenSSL::SSL)
-# cp /etc/ssl/openssl.cnf . # I copied from OpenSSL 1.1.1b source
-
-# mkdir demoCA demoCA/private demoCA/newcerts
-# touch demoCA/index.txt
-# echo 00 > demoCA/serial
-# openssl genrsa -des3 -out demoCA/private/cakey.pem 2048
-# openssl req -new -key demoCA/private/cakey.pem -out demoCA/careq.pem -subj "/C=JP/ST=Tokyo/O=RubyTest/CN=Ruby Test CA"
-# # basicConstraints=CA:TRUE is required; the default openssl.cnf has it in [v3_ca]
-# openssl ca -config openssl.cnf -extensions v3_ca -out demoCA/cacert.pem -startdate 090101000000Z -enddate 491231235959Z -batch -keyfile demoCA/private/cakey.pem -selfsign -infiles demoCA/careq.pem
-
-# mkdir server
-# openssl genrsa -des3 -out server/server.key 2048
-# openssl req -new -key server/server.key -out server/csr.pem -subj "/C=JP/ST=Tokyo/O=RubyTest/CN=127.0.0.1"
-# openssl ca -config openssl.cnf -startdate 090101000000Z -enddate 491231235959Z -in server/csr.pem -keyfile demoCA/private/cakey.pem -cert demoCA/cacert.pem -out server/cert.pem
-
-# demoCA/cacert.pem => TestOpenURISSL::CA_CERT
-# server/cert.pem => TestOpenURISSL::SERVER_CERT
-# `openssl rsa -in server/server.key -text` => TestOpenURISSL::SERVER_KEY
-
-TestOpenURISSL::CA_CERT = <<'End'
-Certificate:
-    Data:
-        Version: 3 (0x2)
-        Serial Number: 0 (0x0)
-        Signature Algorithm: sha256WithRSAEncryption
-        Issuer: C=JP, ST=Tokyo, O=RubyTest, CN=Ruby Test CA
-        Validity
-            Not Before: Jan  1 00:00:00 2009 GMT
-            Not After : Dec 31 23:59:59 2049 GMT
-        Subject: C=JP, ST=Tokyo, O=RubyTest, CN=Ruby Test CA
-        Subject Public Key Info:
-            Public Key Algorithm: rsaEncryption
-                RSA Public-Key: (2048 bit)
-                Modulus:
-                    00:ad:f3:4d:5b:0b:01:54:cc:86:36:d1:93:6b:33:
-                    56:25:90:61:d6:9a:a0:f4:24:20:ee:c8:14:ab:0f:
-                    4b:89:d8:7c:bb:c0:f8:7f:fb:e9:a2:d5:1c:6b:6f:
-                    dc:5c:23:b1:49:aa:2c:e8:ca:43:48:64:69:4b:8a:
-                    bd:44:57:9b:14:d9:7a:b2:49:00:d6:c2:74:67:62:
-                    52:1d:a9:32:df:fe:7a:22:20:49:83:e1:cb:3d:dc:
-                    1a:2a:f0:36:20:c1:e8:c8:89:d4:51:1a:68:91:20:
-                    e0:ba:67:0a:b2:6b:f8:e3:8c:f5:ee:a1:36:b1:89:
-                    ec:23:b6:f2:39:a9:b9:2e:ea:de:d9:86:e5:42:11:
-                    46:ed:10:9a:90:76:44:4e:4d:49:2d:49:e8:e3:cb:
-                    ff:7a:7d:80:cb:bf:c4:c3:69:ba:9c:60:4a:de:af:
-                    bf:26:78:b8:fb:46:d1:37:d0:89:ba:78:93:6a:37:
-                    a5:e9:58:e7:e2:e3:7d:7c:95:20:79:41:56:15:cd:
-                    b2:c6:3b:e1:b7:e7:ba:47:60:9a:05:b1:07:f3:26:
-                    72:9d:3b:1b:02:18:3d:d5:de:e6:e9:30:a9:b5:8f:
-                    15:1b:40:f9:64:61:54:d3:53:e8:c4:29:4a:89:f3:
-                    e5:0d:fd:16:61:ee:f2:6d:8a:45:a8:34:7e:53:46:
-                    8e:87
-                Exponent: 65537 (0x10001)
-        X509v3 extensions:
-            X509v3 Subject Key Identifier:
-                A0:7E:0B:AD:A3:AD:37:D7:21:0B:75:6F:8A:90:5F:8C:C9:69:DF:98
-            X509v3 Authority Key Identifier:
-                keyid:A0:7E:0B:AD:A3:AD:37:D7:21:0B:75:6F:8A:90:5F:8C:C9:69:DF:98
-
-            X509v3 Basic Constraints: critical
-                CA:TRUE
-    Signature Algorithm: sha256WithRSAEncryption
-         06:ea:06:02:19:9a:cb:94:a2:7e:c0:86:71:66:e7:a5:71:46:
-         a2:25:55:f5:e5:58:df:d1:91:58:e6:8a:0e:91:b3:22:4c:88:
-         4d:5f:02:af:0f:73:65:0d:af:9a:f2:e4:36:f3:1f:e8:28:1d:
-         9c:74:72:5b:f7:12:e8:fa:45:d6:df:e5:f1:d3:91:f4:0e:db:
-         e2:56:63:ee:82:57:6f:12:ad:d7:0d:de:5a:8c:3d:76:d2:87:
-         c9:48:1c:c4:f3:89:63:3c:c2:25:e0:dd:63:a6:4c:6c:5a:07:
-         7b:86:78:62:86:02:a1:ef:0e:41:75:c5:d4:61:ab:c3:3b:9b:
-         51:0b:e6:34:6d:0b:14:5a:2d:aa:d3:58:26:43:8f:4c:d7:45:
-         73:1e:67:66:5e:f3:0c:69:70:27:a1:d5:70:f3:5a:10:98:c8:
-         4f:8a:3b:9f:ad:8e:8d:49:8f:fb:f6:36:5d:4f:70:f9:4f:54:
-         33:cf:a2:a6:1d:8c:61:b9:30:42:f2:49:d1:3d:a1:f1:eb:1e:
-         78:a6:30:f8:8a:48:89:c7:3e:bd:0d:d8:72:04:a6:00:e5:62:
-         a4:13:3f:9e:b6:86:25:dc:d1:ff:3a:fc:f5:0e:e4:0e:f7:b8:
-         66:90:fe:4f:c2:54:2a:7f:61:6e:e7:4b:bf:40:7e:75:30:02:
-         5b:bb:91:1b
------BEGIN CERTIFICATE-----
-MIIDXDCCAkSgAwIBAgIBADANBgkqhkiG9w0BAQsFADBHMQswCQYDVQQGEwJKUDEO
-MAwGA1UECAwFVG9reW8xETAPBgNVBAoMCFJ1YnlUZXN0MRUwEwYDVQQDDAxSdWJ5
-IFRlc3QgQ0EwHhcNMDkwMTAxMDAwMDAwWhcNNDkxMjMxMjM1OTU5WjBHMQswCQYD
-VQQGEwJKUDEOMAwGA1UECAwFVG9reW8xETAPBgNVBAoMCFJ1YnlUZXN0MRUwEwYD
-VQQDDAxSdWJ5IFRlc3QgQ0EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
-AQCt801bCwFUzIY20ZNrM1YlkGHWmqD0JCDuyBSrD0uJ2Hy7wPh/++mi1Rxrb9xc
-I7FJqizoykNIZGlLir1EV5sU2XqySQDWwnRnYlIdqTLf/noiIEmD4cs93Boq8DYg
-wejIidRRGmiRIOC6Zwqya/jjjPXuoTaxiewjtvI5qbku6t7ZhuVCEUbtEJqQdkRO
-TUktSejjy/96fYDLv8TDabqcYErer78meLj7RtE30Im6eJNqN6XpWOfi4318lSB5
-QVYVzbLGO+G357pHYJoFsQfzJnKdOxsCGD3V3ubpMKm1jxUbQPlkYVTTU+jEKUqJ
-8+UN/RZh7vJtikWoNH5TRo6HAgMBAAGjUzBRMB0GA1UdDgQWBBSgfguto6031yEL
-dW+KkF+MyWnfmDAfBgNVHSMEGDAWgBSgfguto6031yELdW+KkF+MyWnfmDAPBgNV
-HRMBAf8EBTADAQH/MA0GCSqGSIb3DQEBCwUAA4IBAQAG6gYCGZrLlKJ+wIZxZuel
-cUaiJVX15Vjf0ZFY5ooOkbMiTIhNXwKvD3NlDa+a8uQ28x/oKB2cdHJb9xLo+kXW
-3+Xx05H0DtviVmPugldvEq3XDd5ajD120ofJSBzE84ljPMIl4N1jpkxsWgd7hnhi
-hgKh7w5BdcXUYavDO5tRC+Y0bQsUWi2q01gmQ49M10VzHmdmXvMMaXAnodVw81oQ
-mMhPijufrY6NSY/79jZdT3D5T1Qzz6KmHYxhuTBC8knRPaHx6x54pjD4ikiJxz69
-DdhyBKYA5WKkEz+etoYl3NH/Ovz1DuQO97hmkP5PwlQqf2Fu50u/QH51MAJbu5Eb
------END CERTIFICATE-----
-End
-
-TestOpenURISSL::SERVER_CERT = <<'End'
-Certificate:
-    Data:
-        Version: 3 (0x2)
-        Serial Number: 1 (0x1)
-        Signature Algorithm: sha256WithRSAEncryption
-        Issuer: C=JP, ST=Tokyo, O=RubyTest, CN=Ruby Test CA
-        Validity
-            Not Before: Jan  1 00:00:00 2009 GMT
-            Not After : Dec 31 23:59:59 2049 GMT
-        Subject: C=JP, ST=Tokyo, O=RubyTest, CN=127.0.0.1
-        Subject Public Key Info:
-            Public Key Algorithm: rsaEncryption
-                RSA Public-Key: (2048 bit)
-                Modulus:
-                    00:cb:b3:71:95:12:70:fc:db:d4:a9:a7:66:d6:d3:
-                    09:dd:06:80:19:e1:f2:d6:1e:31:b6:6b:20:75:51:
-                    dc:a7:37:a9:ac:5b:57:5d:69:36:b6:de:1d:2c:f6:
-                    44:64:f8:e8:d6:f0:da:38:6a:ba:c2:b1:9e:dc:bb:
-                    79:94:e0:25:0c:ce:76:87:17:5d:79:9e:14:9e:bd:
-                    4c:0d:aa:74:10:3a:96:ef:76:82:d5:72:16:b5:c1:
-                    ac:17:2d:90:83:73:5c:d7:a6:f5:36:0f:4c:55:f3:
-                    30:5d:19:dc:01:0e:f8:e6:fe:a5:ad:52:88:59:dc:
-                    4a:07:ed:a2:eb:a1:01:63:c4:8a:92:ba:06:80:9b:
-                    0d:85:f2:9f:f9:70:ac:d7:ad:f0:7a:3f:b8:92:2a:
-                    33:ca:69:d0:01:65:5d:31:38:1d:f6:1f:b2:17:07:
-                    7e:ac:88:67:a6:c4:5f:3e:93:94:61:e6:e4:49:9d:
-                    ba:d4:d2:e8:e3:93:d1:66:79:c5:e3:1d:f8:5a:50:
-                    54:58:3d:04:b0:fd:65:d1:b3:8a:b5:8a:30:5f:b2:
-                    dc:34:1a:14:f7:74:4c:03:29:97:63:5a:d7:de:bb:
-                    eb:7f:4a:2a:90:59:c0:2b:47:09:82:8f:75:de:14:
-                    3f:bc:78:9a:69:25:80:5b:6c:a0:65:12:0d:29:61:
-                    ac:f9
-                Exponent: 65537 (0x10001)
-        X509v3 extensions:
-            X509v3 Basic Constraints:
-                CA:FALSE
-            Netscape Comment:
-                OpenSSL Generated Certificate
-            X509v3 Subject Key Identifier:
-                EC:6B:7C:79:B8:3B:11:1D:42:F3:9A:2A:CF:9A:15:59:D7:F9:D8:C6
-            X509v3 Authority Key Identifier:
-                keyid:A0:7E:0B:AD:A3:AD:37:D7:21:0B:75:6F:8A:90:5F:8C:C9:69:DF:98
-
-    Signature Algorithm: sha256WithRSAEncryption
-         29:14:db:71:e9:a0:86:f8:cc:4d:e4:8a:76:78:a7:ff:4e:94:
-         b4:4d:92:dc:57:9a:52:64:46:27:15:8b:4f:2a:18:a7:0d:fc:
-         d2:75:ce:4e:49:97:0b:46:71:57:23:e3:a5:c0:c5:71:94:fc:
-         f2:1d:3b:06:93:82:03:59:56:d4:fb:09:06:08:b4:97:50:33:
-         cf:58:89:dd:91:31:07:26:9a:7e:7f:8d:71:de:09:dc:4f:e5:
-         6b:a3:10:71:d4:50:24:43:a0:1c:f5:2a:d9:1a:fb:e3:d6:f1:
-         bc:6b:42:67:16:b4:3b:31:f4:ec:03:7d:78:e2:64:16:57:6d:
-         ba:7c:0c:e1:14:b2:7c:75:4e:2b:09:3e:86:e4:aa:cc:7e:5c:
-         2b:bd:8d:26:4d:49:36:74:86:fe:c5:a6:15:4a:af:e8:b4:4e:
-         d5:f2:e1:59:c2:fb:7e:c3:c4:f1:63:d8:c2:b0:9a:ae:31:96:
-         90:c3:09:d0:ce:2e:31:90:d7:83:dd:ac:31:cc:f7:87:41:08:
-         92:33:28:52:fa:2d:9e:ad:ae:6a:9f:c3:be:ce:c1:a6:e4:16:
-         2f:69:34:40:86:b6:10:21:0e:31:69:81:9e:fc:fd:c3:06:25:
-         65:37:d3:d9:4a:20:84:aa:e7:0e:60:7c:bf:3f:88:67:ac:e5:
-         8c:e0:61:d6
------BEGIN CERTIFICATE-----
-MIIDgTCCAmmgAwIBAgIBATANBgkqhkiG9w0BAQsFADBHMQswCQYDVQQGEwJKUDEO
-MAwGA1UECAwFVG9reW8xETAPBgNVBAoMCFJ1YnlUZXN0MRUwEwYDVQQDDAxSdWJ5
-IFRlc3QgQ0EwHhcNMDkwMTAxMDAwMDAwWhcNNDkxMjMxMjM1OTU5WjBEMQswCQYD
-VQQGEwJKUDEOMAwGA1UECAwFVG9reW8xETAPBgNVBAoMCFJ1YnlUZXN0MRIwEAYD
-VQQDDAkxMjcuMC4wLjEwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDL
-s3GVEnD829Spp2bW0wndBoAZ4fLWHjG2ayB1UdynN6msW1ddaTa23h0s9kRk+OjW
-8No4arrCsZ7cu3mU4CUMznaHF115nhSevUwNqnQQOpbvdoLVcha1wawXLZCDc1zX
-pvU2D0xV8zBdGdwBDvjm/qWtUohZ3EoH7aLroQFjxIqSugaAmw2F8p/5cKzXrfB6
-P7iSKjPKadABZV0xOB32H7IXB36siGemxF8+k5Rh5uRJnbrU0ujjk9FmecXjHfha
-UFRYPQSw/WXRs4q1ijBfstw0GhT3dEwDKZdjWtfeu+t/SiqQWcArRwmCj3XeFD+8
-eJppJYBbbKBlEg0pYaz5AgMBAAGjezB5MAkGA1UdEwQCMAAwLAYJYIZIAYb4QgEN
-BB8WHU9wZW5TU0wgR2VuZXJhdGVkIENlcnRpZmljYXRlMB0GA1UdDgQWBBTsa3x5
-uDsRHULzmirPmhVZ1/nYxjAfBgNVHSMEGDAWgBSgfguto6031yELdW+KkF+MyWnf
-mDANBgkqhkiG9w0BAQsFAAOCAQEAKRTbcemghvjMTeSKdnin/06UtE2S3FeaUmRG
-JxWLTyoYpw380nXOTkmXC0ZxVyPjpcDFcZT88h07BpOCA1lW1PsJBgi0l1Azz1iJ
-3ZExByaafn+Ncd4J3E/la6MQcdRQJEOgHPUq2Rr749bxvGtCZxa0OzH07AN9eOJk
-FldtunwM4RSyfHVOKwk+huSqzH5cK72NJk1JNnSG/sWmFUqv6LRO1fLhWcL7fsPE
-8WPYwrCarjGWkMMJ0M4uMZDXg92sMcz3h0EIkjMoUvotnq2uap/Dvs7BpuQWL2k0
-QIa2ECEOMWmBnvz9wwYlZTfT2UoghKrnDmB8vz+IZ6zljOBh1g==
------END CERTIFICATE-----
-End
-
-TestOpenURISSL::SERVER_KEY = <<'End'
-RSA Private-Key: (2048 bit, 2 primes)
-modulus:
-    00:cb:b3:71:95:12:70:fc:db:d4:a9:a7:66:d6:d3:
-    09:dd:06:80:19:e1:f2:d6:1e:31:b6:6b:20:75:51:
-    dc:a7:37:a9:ac:5b:57:5d:69:36:b6:de:1d:2c:f6:
-    44:64:f8:e8:d6:f0:da:38:6a:ba:c2:b1:9e:dc:bb:
-    79:94:e0:25:0c:ce:76:87:17:5d:79:9e:14:9e:bd:
-    4c:0d:aa:74:10:3a:96:ef:76:82:d5:72:16:b5:c1:
-    ac:17:2d:90:83:73:5c:d7:a6:f5:36:0f:4c:55:f3:
-    30:5d:19:dc:01:0e:f8:e6:fe:a5:ad:52:88:59:dc:
-    4a:07:ed:a2:eb:a1:01:63:c4:8a:92:ba:06:80:9b:
-    0d:85:f2:9f:f9:70:ac:d7:ad:f0:7a:3f:b8:92:2a:
-    33:ca:69:d0:01:65:5d:31:38:1d:f6:1f:b2:17:07:
-    7e:ac:88:67:a6:c4:5f:3e:93:94:61:e6:e4:49:9d:
-    ba:d4:d2:e8:e3:93:d1:66:79:c5:e3:1d:f8:5a:50:
-    54:58:3d:04:b0:fd:65:d1:b3:8a:b5:8a:30:5f:b2:
-    dc:34:1a:14:f7:74:4c:03:29:97:63:5a:d7:de:bb:
-    eb:7f:4a:2a:90:59:c0:2b:47:09:82:8f:75:de:14:
-    3f:bc:78:9a:69:25:80:5b:6c:a0:65:12:0d:29:61:
-    ac:f9
-publicExponent: 65537 (0x10001)
-privateExponent:
-    12:be:d5:b2:01:3b:72:99:8c:4d:7c:81:43:3d:b2:
-    87:ab:84:78:5d:49:aa:98:a6:bc:81:c9:3f:e2:a3:
-    aa:a3:bd:b2:85:c9:59:68:48:47:b5:d2:fb:83:42:
-    32:04:91:f0:cd:c3:57:33:c3:32:0d:84:70:0d:b4:
-    97:95:b4:f3:23:c0:d6:97:b8:db:6b:47:bc:7f:f1:
-    12:c4:df:df:6a:74:df:5e:89:95:b8:e5:0c:1e:e1:
-    86:54:84:1b:04:af:c3:8c:b2:be:21:d4:45:88:96:
-    a7:ca:ac:6b:50:84:69:45:7f:db:9e:5f:bb:dd:40:
-    d6:cf:f0:91:3c:84:d3:38:65:c9:15:f7:9e:37:aa:
-    1a:2e:bc:16:b6:95:be:bc:af:45:76:ba:ad:99:f6:
-    ef:6a:e8:fd:f0:31:89:19:c4:04:67:a1:ec:c4:79:
-    59:08:77:ab:0b:65:88:88:02:b1:38:5c:80:4e:27:
-    78:b2:a5:bd:b5:ad:d5:9c:4c:ea:ad:db:05:56:25:
-    70:28:da:22:fb:d8:de:8c:3b:78:fe:3e:cf:ed:1b:
-    f9:97:c6:b6:4a:bf:60:08:8f:dc:85:5e:b1:49:ab:
-    87:8b:68:72:f4:6a:3f:bc:db:a3:6c:f7:e8:b0:15:
-    bb:4b:ba:37:49:a2:d1:7c:f8:4f:1b:05:11:22:d9:
-    81
-prime1:
-    00:fb:d2:cb:14:61:00:c1:7a:83:ba:fe:79:97:a2:
-    4d:5a:ea:40:78:96:6e:d2:be:71:5b:c6:2c:1f:c9:
-    18:48:6b:ae:20:86:87:b5:08:0b:17:69:ca:93:cd:
-    00:36:22:51:7b:d5:2d:8c:0c:0e:de:bc:86:a8:07:
-    0e:c5:57:e4:df:be:ed:7d:cc:b1:a4:d6:a8:2b:00:
-    65:2a:69:30:5e:dc:6d:6d:c4:c8:7e:20:34:eb:6f:
-    5e:cf:b3:b8:2e:8d:56:31:44:a8:17:ea:be:65:19:
-    ff:da:14:e0:0c:73:56:14:08:47:4c:5b:79:51:74:
-    5d:bc:e7:fe:01:2f:55:27:69
-prime2:
-    00:cf:14:54:47:bb:5f:5d:d6:2b:2d:ed:a6:8a:6f:
-    36:fc:47:5e:9f:84:ae:aa:1f:f8:44:50:91:15:f5:
-    ed:9d:29:d9:2b:2a:19:66:56:2e:96:15:b5:8e:a9:
-    7f:89:27:21:b5:57:55:7e:2a:c5:8c:93:fe:f6:0a:
-    a5:17:15:91:91:b3:7d:35:1a:d5:9a:2e:b8:0d:ad:
-    e6:97:6d:83:a3:27:29:ee:00:74:ef:57:34:f3:07:
-    ad:12:43:37:0c:5c:b7:26:34:bc:4e:3a:43:65:6b:
-    0c:b8:23:ac:77:fd:b2:23:eb:7b:65:70:f6:96:c4:
-    17:2c:aa:24:b8:a5:5e:b7:11
-exponent1:
-    00:92:32:ae:f4:05:dd:0a:76:b6:43:b9:b9:9d:ee:
-    fc:39:ec:05:c1:fc:94:1a:85:b6:0a:31:e3:2c:10:
-    f3:a8:17:db:df:c6:3a:c3:3f:08:31:6f:99:cc:75:
-    17:ca:55:e2:38:a2:6a:ef:03:91:1e:7f:15:2e:37:
-    ea:bb:67:6b:d8:fa:5f:a6:c9:4f:d9:03:46:5e:b0:
-    bc:0b:03:46:b1:cc:07:3b:d3:23:13:16:5f:a2:cf:
-    e5:9b:70:1b:5d:eb:70:3e:ea:3d:2c:a5:7c:23:f6:
-    14:33:e8:2a:ab:0f:ca:c9:96:84:ce:2f:cd:1f:1d:
-    0f:ce:bc:61:1b:0e:ff:c1:01
-exponent2:
-    00:9e:0b:f3:03:48:73:d1:e7:9a:cf:13:f9:ae:e0:
-    91:03:dc:e8:d0:30:f1:2a:30:fa:48:11:81:9a:54:
-    37:c5:62:e2:37:fa:8a:a6:3b:92:94:c3:fe:ec:e2:
-    5a:cf:70:09:5f:21:47:c3:e2:9b:21:de:f6:92:0c:
-    af:d1:bd:89:7b:bd:95:0b:49:ee:cb:1d:6b:26:2d:
-    9a:b7:ea:42:b4:ec:38:29:49:39:f6:4e:05:c0:93:
-    14:39:c3:09:29:ab:3d:b1:b0:40:24:28:7d:b5:d3:
-    0d:43:21:1f:09:f9:9b:d3:a4:6f:6a:8d:db:f6:57:
-    b5:24:46:bb:7e:1d:e0:fb:31
-coefficient:
-    10:93:1d:c8:33:a5:c1:d3:84:6a:22:68:e5:60:cc:
-    9c:27:0a:52:0b:58:a3:0c:83:f4:f4:46:09:0c:a1:
-    41:a6:ea:bf:80:9d:0e:5d:d8:3d:25:00:c5:a1:35:
-    7a:8c:ea:95:16:94:c3:7c:8f:2b:e0:53:ea:66:ae:
-    19:be:55:04:3d:ee:e2:4b:a8:69:1b:7e:d8:09:7f:
-    ed:7c:ee:95:88:10:dc:4b:5b:bf:81:a4:e8:dc:7e:
-    4f:e5:c3:90:c4:e5:5a:90:10:32:d6:08:b5:1f:5d:
-    09:18:d8:44:28:e4:c4:c7:07:75:9b:9b:b3:80:86:
-    68:9d:fe:68:f3:4d:db:66
-writing RSA key
------BEGIN RSA PRIVATE KEY-----
-MIIEpAIBAAKCAQEAy7NxlRJw/NvUqadm1tMJ3QaAGeHy1h4xtmsgdVHcpzeprFtX
-XWk2tt4dLPZEZPjo1vDaOGq6wrGe3Lt5lOAlDM52hxddeZ4Unr1MDap0EDqW73aC
-1XIWtcGsFy2Qg3Nc16b1Ng9MVfMwXRncAQ745v6lrVKIWdxKB+2i66EBY8SKkroG
-gJsNhfKf+XCs163wej+4kiozymnQAWVdMTgd9h+yFwd+rIhnpsRfPpOUYebkSZ26
-1NLo45PRZnnF4x34WlBUWD0EsP1l0bOKtYowX7LcNBoU93RMAymXY1rX3rvrf0oq
-kFnAK0cJgo913hQ/vHiaaSWAW2ygZRINKWGs+QIDAQABAoIBABK+1bIBO3KZjE18
-gUM9soerhHhdSaqYpryByT/io6qjvbKFyVloSEe10vuDQjIEkfDNw1czwzINhHAN
-tJeVtPMjwNaXuNtrR7x/8RLE399qdN9eiZW45Qwe4YZUhBsEr8OMsr4h1EWIlqfK
-rGtQhGlFf9ueX7vdQNbP8JE8hNM4ZckV9543qhouvBa2lb68r0V2uq2Z9u9q6P3w
-MYkZxARnoezEeVkId6sLZYiIArE4XIBOJ3iypb21rdWcTOqt2wVWJXAo2iL72N6M
-O3j+Ps/tG/mXxrZKv2AIj9yFXrFJq4eLaHL0aj+826Ns9+iwFbtLujdJotF8+E8b
-BREi2YECgYEA+9LLFGEAwXqDuv55l6JNWupAeJZu0r5xW8YsH8kYSGuuIIaHtQgL
-F2nKk80ANiJRe9UtjAwO3ryGqAcOxVfk377tfcyxpNaoKwBlKmkwXtxtbcTIfiA0
-629ez7O4Lo1WMUSoF+q+ZRn/2hTgDHNWFAhHTFt5UXRdvOf+AS9VJ2kCgYEAzxRU
-R7tfXdYrLe2mim82/Eden4Suqh/4RFCRFfXtnSnZKyoZZlYulhW1jql/iSchtVdV
-firFjJP+9gqlFxWRkbN9NRrVmi64Da3ml22Doycp7gB071c08wetEkM3DFy3JjS8
-TjpDZWsMuCOsd/2yI+t7ZXD2lsQXLKokuKVetxECgYEAkjKu9AXdCna2Q7m5ne78
-OewFwfyUGoW2CjHjLBDzqBfb38Y6wz8IMW+ZzHUXylXiOKJq7wORHn8VLjfqu2dr
-2PpfpslP2QNGXrC8CwNGscwHO9MjExZfos/lm3AbXetwPuo9LKV8I/YUM+gqqw/K
-yZaEzi/NHx0PzrxhGw7/wQECgYEAngvzA0hz0eeazxP5ruCRA9zo0DDxKjD6SBGB
-mlQ3xWLiN/qKpjuSlMP+7OJaz3AJXyFHw+KbId72kgyv0b2Je72VC0nuyx1rJi2a
-t+pCtOw4KUk59k4FwJMUOcMJKas9sbBAJCh9tdMNQyEfCfmb06Rvao3b9le1JEa7
-fh3g+zECgYAQkx3IM6XB04RqImjlYMycJwpSC1ijDIP09EYJDKFBpuq/gJ0OXdg9
-JQDFoTV6jOqVFpTDfI8r4FPqZq4ZvlUEPe7iS6hpG37YCX/tfO6ViBDcS1u/gaTo
-3H5P5cOQxOVakBAy1gi1H10JGNhEKOTExwd1m5uzgIZonf5o803bZg==
------END RSA PRIVATE KEY-----
-End
-
-TestOpenURISSL::DHPARAMS = <<'End'
-    DH Parameters: (2048 bit)
-        prime:
-            00:ec:4e:a4:06:b6:22:ca:f9:8a:00:cc:d0:ee:2f:
-            16:bf:05:64:f5:8f:fe:7f:c4:bb:b0:24:cd:ef:5d:
-            8a:90:ad:dc:a9:dd:63:84:90:d8:25:ba:d8:78:d5:
-            77:91:42:0a:84:fc:56:1e:13:9b:1c:aa:43:d5:1f:
-            38:52:92:fe:b3:66:f9:e7:e8:8c:77:a1:a6:2f:b3:
-            98:98:d2:13:fc:57:1c:2a:14:dc:bd:e6:9b:54:19:
-            99:4f:ce:81:64:a6:32:7f:8e:61:50:5f:45:3a:e5:
-            0c:f7:13:f3:b8:ad:d5:77:ca:09:42:f7:d8:30:27:
-            7b:2c:f0:b4:b5:a0:04:96:34:0b:47:81:1d:7f:c1:
-            3a:62:86:8e:7d:f8:13:7f:9a:b1:8b:09:23:9e:55:
-            59:41:cd:f0:86:09:c4:b7:d1:69:54:cb:d0:f5:e9:
-            27:c9:e1:81:e4:a1:df:6b:20:1c:df:e8:54:02:f2:
-            37:fc:2a:f7:d5:b3:6f:79:7e:70:22:78:79:18:3c:
-            75:14:68:4a:05:9f:ac:d4:7f:9a:79:db:9d:0a:6e:
-            ec:0a:04:70:bf:c9:4a:59:81:a2:1f:33:9b:4a:66:
-            bc:03:ce:8a:1b:e3:03:ec:ba:39:26:ab:90:dc:39:
-            41:a1:d8:f7:20:3c:8f:af:12:2f:f7:a9:6f:44:f1:
-            6d:03
-        generator: 2 (0x2)
------BEGIN DH PARAMETERS-----
-MIIBCAKCAQEA7E6kBrYiyvmKAMzQ7i8WvwVk9Y/+f8S7sCTN712KkK3cqd1jhJDY
-JbrYeNV3kUIKhPxWHhObHKpD1R84UpL+s2b55+iMd6GmL7OYmNIT/FccKhTcveab
-VBmZT86BZKYyf45hUF9FOuUM9xPzuK3Vd8oJQvfYMCd7LPC0taAEljQLR4Edf8E6
-YoaOffgTf5qxiwkjnlVZQc3whgnEt9FpVMvQ9eknyeGB5KHfayAc3+hUAvI3/Cr3
-1bNveX5wInh5GDx1FGhKBZ+s1H+aedudCm7sCgRwv8lKWYGiHzObSma8A86KG+MD
-7Lo5JquQ3DlBodj3IDyPrxIv96lvRPFtAwIBAg==
------END DH PARAMETERS-----
-End
-
-end
diff --git a/test/open-uri/utils.rb b/test/open-uri/utils.rb
new file mode 100644
index 00000000000000..e7ca64bd1c2dd0
--- /dev/null
+++ b/test/open-uri/utils.rb
@@ -0,0 +1,738 @@
+require 'socket'
+require 'net/http'
+begin
+  require 'openssl'
+rescue LoadError
+end
+
+class SimpleHTTPServer
+  def initialize(bind_addr, port, log)
+    @server = TCPServer.new(bind_addr, port)
+    @log = log
+    @procs = {}
+  end
+
+  def mount_proc(path, proc)
+    @procs[path] = proc
+  end
+
+  def start
+    @thread = Thread.new do
+      loop do
+        client = @server.accept
+        handle_request(client)
+        client.close
+      end
+    end
+  end
+
+  def shutdown
+    @thread.kill
+    @server.close
+  end
+
+  private
+
+  def handle_request(client)
+    request_line = client.gets
+    return if request_line.nil?
+
+    method, path, _ = request_line.split
+    headers = {}
+    while (line = client.gets) && line != "\r\n"
+      key, value = line.split(": ", 2)
+      headers[key.downcase] = value.strip
+    end
+
+    if @procs.key?(path) || @procs.key?("#{path}/")
+      proc = @procs[path] || @procs["#{path}/"]
+      req = Request.new(method, path, headers)
+      res = Response.new(client)
+      proc.call(req, res)
+      res.finish
+    else
+      @log << "ERROR `#{path}' not found"
+      client.print "HTTP/1.1 404 Not Found\r\nContent-Length: 0\r\n\r\n"
+    end
+  rescue ::TestOpenURI::Unauthorized
+    @log << "ERROR Unauthorized"
+    client.print "HTTP/1.1 401 Unauthorized\r\nContent-Length: 0\r\n\r\n"
+  end
+
+  class Request
+    attr_reader :method, :path, :headers
+    def initialize(method, path, headers)
+      @method = method
+      @path = path
+      @headers = headers
+      parse_basic_auth
+    end
+
+    def [](key)
+      @headers[key.downcase]
+    end
+
+    def []=(key, value)
+      @headers[key.downcase] = value
+    end
+
+    private
+
+    def parse_basic_auth
+      auth = @headers['Authorization']
+      return unless auth && auth.start_with?('Basic ')
+
+      encoded_credentials = auth.split(' ', 2).last
+      decoded_credentials = [encoded_credentials].pack("m")
+      @username, @password = decoded_credentials.split(':', 2)
+    end
+  end
+
+  class Response
+    attr_accessor :body, :headers, :status, :chunked, :cookies
+    def initialize(client)
+      @client = client
+      @body = ""
+      @headers = {}
+      @status = 200
+      @chunked = false
+      @cookies = []
+    end
+
+    def [](key)
+      @headers[key.downcase]
+    end
+
+    def []=(key, value)
+      @headers[key.downcase] = value
+    end
+
+    def write_chunk(chunk)
+      return unless @chunked
+      @client.write("#{chunk.bytesize.to_s(16)}\r\n")
+      @client.write("#{chunk}\r\n")
+    end
+
+    def finish
+      @client.write build_response_headers
+      if @chunked
+        write_chunk(@body)
+        @client.write "0\r\n\r\n"
+      else
+        @client.write @body
+      end
+    end
+
+    private
+
+    def build_response_headers
+      response = "HTTP/1.1 #{@status} #{status_message(@status)}\r\n"
+      if @chunked
+        @headers['Transfer-Encoding'] = 'chunked'
+      else
+        @headers['Content-Length'] = @body.bytesize.to_s
+      end
+      @headers.each do |key, value|
+        response << "#{key}: #{value}\r\n"
+      end
+      @cookies.each do |cookie|
+        response << "Set-Cookie: #{cookie}\r\n"
+      end
+      response << "\r\n"
+      response
+    end
+
+    def status_message(code)
+      case code
+      when 200 then 'OK'
+      when 301 then 'Moved Permanently'
+      else 'Unknown'
+      end
+    end
+  end
+end
+
+class SimpleHTTPProxyServer
+  def initialize(host, port, auth_proc = nil, log, access_log)
+    @server = TCPServer.new(host, port)
+    @auth_proc = auth_proc
+    @log = log
+    @access_log = access_log
+  end
+
+  def start
+    @thread = Thread.new do
+      loop do
+        client = @server.accept
+        request_line = client.gets
+        headers = {}
+        while (line = client.gets) && (line != "\r\n")
+          key, value = line.chomp.split(/:\s*/, 2)
+          headers[key] = value
+        end
+        next unless request_line
+
+        method, path, _ = request_line.split(' ')
+        handle_request(client, method, path, request_line, headers)
+      rescue IOError
+      end
+    end
+  end
+
+  def shutdown
+    @thread.kill
+    @server.close
+  end
+
+  private
+
+  def handle_request(client, method, path, request_line, headers)
+    if @auth_proc
+      req = Request.new(method, path, request_line, headers)
+      res = Struct.new(:body, :status).new("", 200)
+      @auth_proc.call(req, res)
+      if res.status != 200
+        client.print "HTTP/1.1 #{res.status}\r\nContent-Type: text/plain\r\n\r\n#{res.body}"
+        return
+      end
+    end
+
+    if method == 'CONNECT'
+      proxy_connect(path, client)
+    else
+      proxy_request(path, client)
+    end
+  rescue TestOpenURIProxy::ProxyAuthenticationRequired
+    @log << "ERROR ProxyAuthenticationRequired"
+    client.print "HTTP/1.1 407 Proxy Authentication Required\r\nContent-Length: 0\r\n\r\n"
+  ensure
+    client.close
+  end
+
+  def proxy_connect(path, client)
+    host, port = path.split(':')
+    backend = TCPSocket.new(host, port.to_i)
+    client.puts "HTTP/1.1 200 Connection Established\r\n\r\n"
+    @access_log << "CONNECT #{path} \n"
+    begin
+      while fds = IO.select([client, backend])
+        if fds[0].include?(client)
+          data = client.readpartial(1024)
+          backend.write(data)
+        elsif fds[0].include?(backend)
+          data = backend.readpartial(1024)
+          client.write(data)
+        end
+      end
+    rescue
+      backend.close
+    end
+  end
+
+  def proxy_request(path, client)
+    path.gsub!(/\Ahttps?:\/\//, '')
+    host, path = path.split('/')
+    host, port = host.split(':')
+    Net::HTTP.start(host, port) do |http|
+      response = http.get("/#{path}")
+      client.print "HTTP/1.1 #{response.code}\r\nContent-Type: #{response.content_type}\r\n\r\n#{response.body}"
+    end
+  end
+
+  class Request
+    attr_reader :method, :path, :request_line, :headers
+    def initialize(method, path, request_line, headers)
+      @method = method
+      @path = path
+      @request_line = request_line
+      @headers = headers
+    end
+
+    def [](key)
+      @headers[key]
+    end
+  end
+end
+
+class SimpleHTTPSServer
+  def initialize(cert, key, dh, bind_addr, port, log)
+    @cert = cert
+    @key = key
+    @dh = dh
+    @bind_addr = bind_addr
+    @port = port
+    @log = log
+    @server = TCPServer.new(@bind_addr, @port)
+    context = OpenSSL::SSL::SSLContext.new
+    context.cert = @cert
+    context.key = @key
+    context.tmp_dh_callback = proc { @dh }
+    @ssl_server = OpenSSL::SSL::SSLServer.new(@server, context)
+  end
+
+  def start
+    @thread = Thread.new do
+      loop do
+        ssl_socket = @ssl_server.accept
+        handle_request(ssl_socket)
+        ssl_socket.close
+      end
+    rescue OpenSSL::SSL::SSLError
+    end
+  end
+
+  def shutdown
+    @thread.kill
+    @server.close
+  end
+
+  def handle_request(socket)
+    request_line = socket.gets
+    return if request_line.nil? || request_line.strip.empty?
+
+    _, path, _ = request_line.split
+    headers = {}
+    while (line = socket.gets)
+      break if line.strip.empty?
+      key, value = line.split(': ', 2)
+      headers[key] = value.strip
+    end
+
+    response = case path
+               when '/data'
+                 "HTTP/1.1 200 OK\r\nContent-Type: text/plain\r\nContent-Length: 3\r\n\r\nddd"
+               when "/proxy"
+                 "HTTP/1.1 200 OK\r\nContent-Type: text/plain\r\nContent-Length: 5\r\n\r\nproxy"
+               else
+                 "HTTP/1.1 404 Not Found\r\nContent-Length: 0\r\n\r\n"
+               end
+
+    socket.print(response)
+  end
+end
+
+module TestOpenURIUtils
+  class Unauthorized < StandardError; end
+  class ProxyAuthenticationRequired < StandardError; end
+
+  def with_http(log_tester=lambda {|log| assert_equal([], log) })
+    log = []
+    host = "127.0.0.1"
+    srv = SimpleHTTPServer.new(host, 0, log)
+
+    server_thread = srv.start
+    server_thread2 = Thread.new {
+      server_thread.join
+      if log_tester
+        log_tester.call(log)
+      end
+    }
+
+    port = srv.instance_variable_get(:@server).addr[1]
+
+    client_thread = Thread.new {
+      begin
+        yield srv, "http://#{host}:#{port}", server_thread, log
+      ensure
+        srv.shutdown
+      end
+    }
+    assert_join_threads([client_thread, server_thread2])
+  end
+
+  def with_https_proxy(proxy_log_tester=lambda {|proxy_log, proxy_access_log| assert_equal([], proxy_log) })
+    proxy_log = []
+    proxy_access_log = []
+    with_https {|srv, dr, url|
+      srv.instance_variable_get(:@server).setsockopt(Socket::SOL_SOCKET, Socket::SO_REUSEADDR, true)
+      cacert_filename = "#{dr}/cacert.pem"
+      open(cacert_filename, "w") {|f| f << CA_CERT }
+      cacert_directory = "#{dr}/certs"
+      Dir.mkdir cacert_directory
+      hashed_name = "%08x.0" % OpenSSL::X509::Certificate.new(CA_CERT).subject.hash
+      open("#{cacert_directory}/#{hashed_name}", "w") {|f| f << CA_CERT }
+      proxy_host = '127.0.0.1'
+      proxy = SimpleHTTPProxyServer.new(proxy_host, 0, proxy_log, proxy_access_log)
+      proxy_port = proxy.instance_variable_get(:@server).addr[1]
+      proxy_thread = proxy.start
+      thread = Thread.new {
+        proxy_thread.join
+        if proxy_log_tester
+          proxy_log_tester.call(proxy_log, proxy_access_log)
+        end
+      }
+      begin
+        yield srv, dr, url, cacert_filename, cacert_directory, proxy_host, proxy_port
+        sleep 1
+      ensure
+        proxy.shutdown
+      end
+      assert_join_threads([thread])
+    }
+  end
+
+  if defined?(OpenSSL::SSL)
+  def with_https(log_tester=lambda {|log| assert_equal([], log) })
+    log = []
+    Dir.mktmpdir {|dr|
+      cert = OpenSSL::X509::Certificate.new(SERVER_CERT)
+      key = OpenSSL::PKey::RSA.new(SERVER_KEY)
+      dh = OpenSSL::PKey::DH.new(DHPARAMS)
+      host = '127.0.0.1'
+      srv = SimpleHTTPSServer.new(cert, key, dh, host, 0, log)
+      port = srv.instance_variable_get(:@server).addr[1]
+      threads = []
+      server_thread = srv.start
+      threads << Thread.new {
+        server_thread.join
+        if log_tester
+          log_tester.call(log)
+        end
+      }
+      threads << Thread.new {
+        begin
+          yield srv, dr, "https://#{host}:#{port}"
+        ensure
+          srv.shutdown
+        end
+      }
+      assert_join_threads(threads)
+    }
+  end
+
+  # cp /etc/ssl/openssl.cnf . # I copied from OpenSSL 1.1.1b source
+
+  # mkdir demoCA demoCA/private demoCA/newcerts
+  # touch demoCA/index.txt
+  # echo 00 > demoCA/serial
+  # openssl genrsa -des3 -out demoCA/private/cakey.pem 2048
+  # openssl req -new -key demoCA/private/cakey.pem -out demoCA/careq.pem -subj "/C=JP/ST=Tokyo/O=RubyTest/CN=Ruby Test CA"
+  # # basicConstraints=CA:TRUE is required; the default openssl.cnf has it in [v3_ca]
+  # openssl ca -config openssl.cnf -extensions v3_ca -out demoCA/cacert.pem -startdate 090101000000Z -enddate 491231235959Z -batch -keyfile demoCA/private/cakey.pem -selfsign -infiles demoCA/careq.pem
+
+  # mkdir server
+  # openssl genrsa -des3 -out server/server.key 2048
+  # openssl req -new -key server/server.key -out server/csr.pem -subj "/C=JP/ST=Tokyo/O=RubyTest/CN=127.0.0.1"
+  # openssl ca -config openssl.cnf -startdate 090101000000Z -enddate 491231235959Z -in server/csr.pem -keyfile demoCA/private/cakey.pem -cert demoCA/cacert.pem -out server/cert.pem
+
+  # demoCA/cacert.pem => TestOpenURISSL::CA_CERT
+  # server/cert.pem => TestOpenURISSL::SERVER_CERT
+  # `openssl rsa -in server/server.key -text` => TestOpenURISSL::SERVER_KEY
+
+  CA_CERT = <<'End'
+Certificate:
+    Data:
+        Version: 3 (0x2)
+        Serial Number: 0 (0x0)
+        Signature Algorithm: sha256WithRSAEncryption
+        Issuer: C=JP, ST=Tokyo, O=RubyTest, CN=Ruby Test CA
+        Validity
+            Not Before: Jan  1 00:00:00 2009 GMT
+            Not After : Dec 31 23:59:59 2049 GMT
+        Subject: C=JP, ST=Tokyo, O=RubyTest, CN=Ruby Test CA
+        Subject Public Key Info:
+            Public Key Algorithm: rsaEncryption
+                RSA Public-Key: (2048 bit)
+                Modulus:
+                    00:ad:f3:4d:5b:0b:01:54:cc:86:36:d1:93:6b:33:
+                    56:25:90:61:d6:9a:a0:f4:24:20:ee:c8:14:ab:0f:
+                    4b:89:d8:7c:bb:c0:f8:7f:fb:e9:a2:d5:1c:6b:6f:
+                    dc:5c:23:b1:49:aa:2c:e8:ca:43:48:64:69:4b:8a:
+                    bd:44:57:9b:14:d9:7a:b2:49:00:d6:c2:74:67:62:
+                    52:1d:a9:32:df:fe:7a:22:20:49:83:e1:cb:3d:dc:
+                    1a:2a:f0:36:20:c1:e8:c8:89:d4:51:1a:68:91:20:
+                    e0:ba:67:0a:b2:6b:f8:e3:8c:f5:ee:a1:36:b1:89:
+                    ec:23:b6:f2:39:a9:b9:2e:ea:de:d9:86:e5:42:11:
+                    46:ed:10:9a:90:76:44:4e:4d:49:2d:49:e8:e3:cb:
+                    ff:7a:7d:80:cb:bf:c4:c3:69:ba:9c:60:4a:de:af:
+                    bf:26:78:b8:fb:46:d1:37:d0:89:ba:78:93:6a:37:
+                    a5:e9:58:e7:e2:e3:7d:7c:95:20:79:41:56:15:cd:
+                    b2:c6:3b:e1:b7:e7:ba:47:60:9a:05:b1:07:f3:26:
+                    72:9d:3b:1b:02:18:3d:d5:de:e6:e9:30:a9:b5:8f:
+                    15:1b:40:f9:64:61:54:d3:53:e8:c4:29:4a:89:f3:
+                    e5:0d:fd:16:61:ee:f2:6d:8a:45:a8:34:7e:53:46:
+                    8e:87
+                Exponent: 65537 (0x10001)
+        X509v3 extensions:
+            X509v3 Subject Key Identifier:
+                A0:7E:0B:AD:A3:AD:37:D7:21:0B:75:6F:8A:90:5F:8C:C9:69:DF:98
+            X509v3 Authority Key Identifier:
+                keyid:A0:7E:0B:AD:A3:AD:37:D7:21:0B:75:6F:8A:90:5F:8C:C9:69:DF:98
+
+            X509v3 Basic Constraints: critical
+                CA:TRUE
+    Signature Algorithm: sha256WithRSAEncryption
+         06:ea:06:02:19:9a:cb:94:a2:7e:c0:86:71:66:e7:a5:71:46:
+         a2:25:55:f5:e5:58:df:d1:91:58:e6:8a:0e:91:b3:22:4c:88:
+         4d:5f:02:af:0f:73:65:0d:af:9a:f2:e4:36:f3:1f:e8:28:1d:
+         9c:74:72:5b:f7:12:e8:fa:45:d6:df:e5:f1:d3:91:f4:0e:db:
+         e2:56:63:ee:82:57:6f:12:ad:d7:0d:de:5a:8c:3d:76:d2:87:
+         c9:48:1c:c4:f3:89:63:3c:c2:25:e0:dd:63:a6:4c:6c:5a:07:
+         7b:86:78:62:86:02:a1:ef:0e:41:75:c5:d4:61:ab:c3:3b:9b:
+         51:0b:e6:34:6d:0b:14:5a:2d:aa:d3:58:26:43:8f:4c:d7:45:
+         73:1e:67:66:5e:f3:0c:69:70:27:a1:d5:70:f3:5a:10:98:c8:
+         4f:8a:3b:9f:ad:8e:8d:49:8f:fb:f6:36:5d:4f:70:f9:4f:54:
+         33:cf:a2:a6:1d:8c:61:b9:30:42:f2:49:d1:3d:a1:f1:eb:1e:
+         78:a6:30:f8:8a:48:89:c7:3e:bd:0d:d8:72:04:a6:00:e5:62:
+         a4:13:3f:9e:b6:86:25:dc:d1:ff:3a:fc:f5:0e:e4:0e:f7:b8:
+         66:90:fe:4f:c2:54:2a:7f:61:6e:e7:4b:bf:40:7e:75:30:02:
+         5b:bb:91:1b
+-----BEGIN CERTIFICATE-----
+MIIDXDCCAkSgAwIBAgIBADANBgkqhkiG9w0BAQsFADBHMQswCQYDVQQGEwJKUDEO
+MAwGA1UECAwFVG9reW8xETAPBgNVBAoMCFJ1YnlUZXN0MRUwEwYDVQQDDAxSdWJ5
+IFRlc3QgQ0EwHhcNMDkwMTAxMDAwMDAwWhcNNDkxMjMxMjM1OTU5WjBHMQswCQYD
+VQQGEwJKUDEOMAwGA1UECAwFVG9reW8xETAPBgNVBAoMCFJ1YnlUZXN0MRUwEwYD
+VQQDDAxSdWJ5IFRlc3QgQ0EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
+AQCt801bCwFUzIY20ZNrM1YlkGHWmqD0JCDuyBSrD0uJ2Hy7wPh/++mi1Rxrb9xc
+I7FJqizoykNIZGlLir1EV5sU2XqySQDWwnRnYlIdqTLf/noiIEmD4cs93Boq8DYg
+wejIidRRGmiRIOC6Zwqya/jjjPXuoTaxiewjtvI5qbku6t7ZhuVCEUbtEJqQdkRO
+TUktSejjy/96fYDLv8TDabqcYErer78meLj7RtE30Im6eJNqN6XpWOfi4318lSB5
+QVYVzbLGO+G357pHYJoFsQfzJnKdOxsCGD3V3ubpMKm1jxUbQPlkYVTTU+jEKUqJ
+8+UN/RZh7vJtikWoNH5TRo6HAgMBAAGjUzBRMB0GA1UdDgQWBBSgfguto6031yEL
+dW+KkF+MyWnfmDAfBgNVHSMEGDAWgBSgfguto6031yELdW+KkF+MyWnfmDAPBgNV
+HRMBAf8EBTADAQH/MA0GCSqGSIb3DQEBCwUAA4IBAQAG6gYCGZrLlKJ+wIZxZuel
+cUaiJVX15Vjf0ZFY5ooOkbMiTIhNXwKvD3NlDa+a8uQ28x/oKB2cdHJb9xLo+kXW
+3+Xx05H0DtviVmPugldvEq3XDd5ajD120ofJSBzE84ljPMIl4N1jpkxsWgd7hnhi
+hgKh7w5BdcXUYavDO5tRC+Y0bQsUWi2q01gmQ49M10VzHmdmXvMMaXAnodVw81oQ
+mMhPijufrY6NSY/79jZdT3D5T1Qzz6KmHYxhuTBC8knRPaHx6x54pjD4ikiJxz69
+DdhyBKYA5WKkEz+etoYl3NH/Ovz1DuQO97hmkP5PwlQqf2Fu50u/QH51MAJbu5Eb
+-----END CERTIFICATE-----
+End
+
+  SERVER_CERT = <<'End'
+Certificate:
+    Data:
+        Version: 3 (0x2)
+        Serial Number: 1 (0x1)
+        Signature Algorithm: sha256WithRSAEncryption
+        Issuer: C=JP, ST=Tokyo, O=RubyTest, CN=Ruby Test CA
+        Validity
+            Not Before: Jan  1 00:00:00 2009 GMT
+            Not After : Dec 31 23:59:59 2049 GMT
+        Subject: C=JP, ST=Tokyo, O=RubyTest, CN=127.0.0.1
+        Subject Public Key Info:
+            Public Key Algorithm: rsaEncryption
+                RSA Public-Key: (2048 bit)
+                Modulus:
+                    00:cb:b3:71:95:12:70:fc:db:d4:a9:a7:66:d6:d3:
+                    09:dd:06:80:19:e1:f2:d6:1e:31:b6:6b:20:75:51:
+                    dc:a7:37:a9:ac:5b:57:5d:69:36:b6:de:1d:2c:f6:
+                    44:64:f8:e8:d6:f0:da:38:6a:ba:c2:b1:9e:dc:bb:
+                    79:94:e0:25:0c:ce:76:87:17:5d:79:9e:14:9e:bd:
+                    4c:0d:aa:74:10:3a:96:ef:76:82:d5:72:16:b5:c1:
+                    ac:17:2d:90:83:73:5c:d7:a6:f5:36:0f:4c:55:f3:
+                    30:5d:19:dc:01:0e:f8:e6:fe:a5:ad:52:88:59:dc:
+                    4a:07:ed:a2:eb:a1:01:63:c4:8a:92:ba:06:80:9b:
+                    0d:85:f2:9f:f9:70:ac:d7:ad:f0:7a:3f:b8:92:2a:
+                    33:ca:69:d0:01:65:5d:31:38:1d:f6:1f:b2:17:07:
+                    7e:ac:88:67:a6:c4:5f:3e:93:94:61:e6:e4:49:9d:
+                    ba:d4:d2:e8:e3:93:d1:66:79:c5:e3:1d:f8:5a:50:
+                    54:58:3d:04:b0:fd:65:d1:b3:8a:b5:8a:30:5f:b2:
+                    dc:34:1a:14:f7:74:4c:03:29:97:63:5a:d7:de:bb:
+                    eb:7f:4a:2a:90:59:c0:2b:47:09:82:8f:75:de:14:
+                    3f:bc:78:9a:69:25:80:5b:6c:a0:65:12:0d:29:61:
+                    ac:f9
+                Exponent: 65537 (0x10001)
+        X509v3 extensions:
+            X509v3 Basic Constraints:
+                CA:FALSE
+            Netscape Comment:
+                OpenSSL Generated Certificate
+            X509v3 Subject Key Identifier:
+                EC:6B:7C:79:B8:3B:11:1D:42:F3:9A:2A:CF:9A:15:59:D7:F9:D8:C6
+            X509v3 Authority Key Identifier:
+                keyid:A0:7E:0B:AD:A3:AD:37:D7:21:0B:75:6F:8A:90:5F:8C:C9:69:DF:98
+
+    Signature Algorithm: sha256WithRSAEncryption
+         29:14:db:71:e9:a0:86:f8:cc:4d:e4:8a:76:78:a7:ff:4e:94:
+         b4:4d:92:dc:57:9a:52:64:46:27:15:8b:4f:2a:18:a7:0d:fc:
+         d2:75:ce:4e:49:97:0b:46:71:57:23:e3:a5:c0:c5:71:94:fc:
+         f2:1d:3b:06:93:82:03:59:56:d4:fb:09:06:08:b4:97:50:33:
+         cf:58:89:dd:91:31:07:26:9a:7e:7f:8d:71:de:09:dc:4f:e5:
+         6b:a3:10:71:d4:50:24:43:a0:1c:f5:2a:d9:1a:fb:e3:d6:f1:
+         bc:6b:42:67:16:b4:3b:31:f4:ec:03:7d:78:e2:64:16:57:6d:
+         ba:7c:0c:e1:14:b2:7c:75:4e:2b:09:3e:86:e4:aa:cc:7e:5c:
+         2b:bd:8d:26:4d:49:36:74:86:fe:c5:a6:15:4a:af:e8:b4:4e:
+         d5:f2:e1:59:c2:fb:7e:c3:c4:f1:63:d8:c2:b0:9a:ae:31:96:
+         90:c3:09:d0:ce:2e:31:90:d7:83:dd:ac:31:cc:f7:87:41:08:
+         92:33:28:52:fa:2d:9e:ad:ae:6a:9f:c3:be:ce:c1:a6:e4:16:
+         2f:69:34:40:86:b6:10:21:0e:31:69:81:9e:fc:fd:c3:06:25:
+         65:37:d3:d9:4a:20:84:aa:e7:0e:60:7c:bf:3f:88:67:ac:e5:
+         8c:e0:61:d6
+-----BEGIN CERTIFICATE-----
+MIIDgTCCAmmgAwIBAgIBATANBgkqhkiG9w0BAQsFADBHMQswCQYDVQQGEwJKUDEO
+MAwGA1UECAwFVG9reW8xETAPBgNVBAoMCFJ1YnlUZXN0MRUwEwYDVQQDDAxSdWJ5
+IFRlc3QgQ0EwHhcNMDkwMTAxMDAwMDAwWhcNNDkxMjMxMjM1OTU5WjBEMQswCQYD
+VQQGEwJKUDEOMAwGA1UECAwFVG9reW8xETAPBgNVBAoMCFJ1YnlUZXN0MRIwEAYD
+VQQDDAkxMjcuMC4wLjEwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDL
+s3GVEnD829Spp2bW0wndBoAZ4fLWHjG2ayB1UdynN6msW1ddaTa23h0s9kRk+OjW
+8No4arrCsZ7cu3mU4CUMznaHF115nhSevUwNqnQQOpbvdoLVcha1wawXLZCDc1zX
+pvU2D0xV8zBdGdwBDvjm/qWtUohZ3EoH7aLroQFjxIqSugaAmw2F8p/5cKzXrfB6
+P7iSKjPKadABZV0xOB32H7IXB36siGemxF8+k5Rh5uRJnbrU0ujjk9FmecXjHfha
+UFRYPQSw/WXRs4q1ijBfstw0GhT3dEwDKZdjWtfeu+t/SiqQWcArRwmCj3XeFD+8
+eJppJYBbbKBlEg0pYaz5AgMBAAGjezB5MAkGA1UdEwQCMAAwLAYJYIZIAYb4QgEN
+BB8WHU9wZW5TU0wgR2VuZXJhdGVkIENlcnRpZmljYXRlMB0GA1UdDgQWBBTsa3x5
+uDsRHULzmirPmhVZ1/nYxjAfBgNVHSMEGDAWgBSgfguto6031yELdW+KkF+MyWnf
+mDANBgkqhkiG9w0BAQsFAAOCAQEAKRTbcemghvjMTeSKdnin/06UtE2S3FeaUmRG
+JxWLTyoYpw380nXOTkmXC0ZxVyPjpcDFcZT88h07BpOCA1lW1PsJBgi0l1Azz1iJ
+3ZExByaafn+Ncd4J3E/la6MQcdRQJEOgHPUq2Rr749bxvGtCZxa0OzH07AN9eOJk
+FldtunwM4RSyfHVOKwk+huSqzH5cK72NJk1JNnSG/sWmFUqv6LRO1fLhWcL7fsPE
+8WPYwrCarjGWkMMJ0M4uMZDXg92sMcz3h0EIkjMoUvotnq2uap/Dvs7BpuQWL2k0
+QIa2ECEOMWmBnvz9wwYlZTfT2UoghKrnDmB8vz+IZ6zljOBh1g==
+-----END CERTIFICATE-----
+End
+
+  SERVER_KEY = <<'End'
+RSA Private-Key: (2048 bit, 2 primes)
+modulus:
+    00:cb:b3:71:95:12:70:fc:db:d4:a9:a7:66:d6:d3:
+    09:dd:06:80:19:e1:f2:d6:1e:31:b6:6b:20:75:51:
+    dc:a7:37:a9:ac:5b:57:5d:69:36:b6:de:1d:2c:f6:
+    44:64:f8:e8:d6:f0:da:38:6a:ba:c2:b1:9e:dc:bb:
+    79:94:e0:25:0c:ce:76:87:17:5d:79:9e:14:9e:bd:
+    4c:0d:aa:74:10:3a:96:ef:76:82:d5:72:16:b5:c1:
+    ac:17:2d:90:83:73:5c:d7:a6:f5:36:0f:4c:55:f3:
+    30:5d:19:dc:01:0e:f8:e6:fe:a5:ad:52:88:59:dc:
+    4a:07:ed:a2:eb:a1:01:63:c4:8a:92:ba:06:80:9b:
+    0d:85:f2:9f:f9:70:ac:d7:ad:f0:7a:3f:b8:92:2a:
+    33:ca:69:d0:01:65:5d:31:38:1d:f6:1f:b2:17:07:
+    7e:ac:88:67:a6:c4:5f:3e:93:94:61:e6:e4:49:9d:
+    ba:d4:d2:e8:e3:93:d1:66:79:c5:e3:1d:f8:5a:50:
+    54:58:3d:04:b0:fd:65:d1:b3:8a:b5:8a:30:5f:b2:
+    dc:34:1a:14:f7:74:4c:03:29:97:63:5a:d7:de:bb:
+    eb:7f:4a:2a:90:59:c0:2b:47:09:82:8f:75:de:14:
+    3f:bc:78:9a:69:25:80:5b:6c:a0:65:12:0d:29:61:
+    ac:f9
+publicExponent: 65537 (0x10001)
+privateExponent:
+    12:be:d5:b2:01:3b:72:99:8c:4d:7c:81:43:3d:b2:
+    87:ab:84:78:5d:49:aa:98:a6:bc:81:c9:3f:e2:a3:
+    aa:a3:bd:b2:85:c9:59:68:48:47:b5:d2:fb:83:42:
+    32:04:91:f0:cd:c3:57:33:c3:32:0d:84:70:0d:b4:
+    97:95:b4:f3:23:c0:d6:97:b8:db:6b:47:bc:7f:f1:
+    12:c4:df:df:6a:74:df:5e:89:95:b8:e5:0c:1e:e1:
+    86:54:84:1b:04:af:c3:8c:b2:be:21:d4:45:88:96:
+    a7:ca:ac:6b:50:84:69:45:7f:db:9e:5f:bb:dd:40:
+    d6:cf:f0:91:3c:84:d3:38:65:c9:15:f7:9e:37:aa:
+    1a:2e:bc:16:b6:95:be:bc:af:45:76:ba:ad:99:f6:
+    ef:6a:e8:fd:f0:31:89:19:c4:04:67:a1:ec:c4:79:
+    59:08:77:ab:0b:65:88:88:02:b1:38:5c:80:4e:27:
+    78:b2:a5:bd:b5:ad:d5:9c:4c:ea:ad:db:05:56:25:
+    70:28:da:22:fb:d8:de:8c:3b:78:fe:3e:cf:ed:1b:
+    f9:97:c6:b6:4a:bf:60:08:8f:dc:85:5e:b1:49:ab:
+    87:8b:68:72:f4:6a:3f:bc:db:a3:6c:f7:e8:b0:15:
+    bb:4b:ba:37:49:a2:d1:7c:f8:4f:1b:05:11:22:d9:
+    81
+prime1:
+    00:fb:d2:cb:14:61:00:c1:7a:83:ba:fe:79:97:a2:
+    4d:5a:ea:40:78:96:6e:d2:be:71:5b:c6:2c:1f:c9:
+    18:48:6b:ae:20:86:87:b5:08:0b:17:69:ca:93:cd:
+    00:36:22:51:7b:d5:2d:8c:0c:0e:de:bc:86:a8:07:
+    0e:c5:57:e4:df:be:ed:7d:cc:b1:a4:d6:a8:2b:00:
+    65:2a:69:30:5e:dc:6d:6d:c4:c8:7e:20:34:eb:6f:
+    5e:cf:b3:b8:2e:8d:56:31:44:a8:17:ea:be:65:19:
+    ff:da:14:e0:0c:73:56:14:08:47:4c:5b:79:51:74:
+    5d:bc:e7:fe:01:2f:55:27:69
+prime2:
+    00:cf:14:54:47:bb:5f:5d:d6:2b:2d:ed:a6:8a:6f:
+    36:fc:47:5e:9f:84:ae:aa:1f:f8:44:50:91:15:f5:
+    ed:9d:29:d9:2b:2a:19:66:56:2e:96:15:b5:8e:a9:
+    7f:89:27:21:b5:57:55:7e:2a:c5:8c:93:fe:f6:0a:
+    a5:17:15:91:91:b3:7d:35:1a:d5:9a:2e:b8:0d:ad:
+    e6:97:6d:83:a3:27:29:ee:00:74:ef:57:34:f3:07:
+    ad:12:43:37:0c:5c:b7:26:34:bc:4e:3a:43:65:6b:
+    0c:b8:23:ac:77:fd:b2:23:eb:7b:65:70:f6:96:c4:
+    17:2c:aa:24:b8:a5:5e:b7:11
+exponent1:
+    00:92:32:ae:f4:05:dd:0a:76:b6:43:b9:b9:9d:ee:
+    fc:39:ec:05:c1:fc:94:1a:85:b6:0a:31:e3:2c:10:
+    f3:a8:17:db:df:c6:3a:c3:3f:08:31:6f:99:cc:75:
+    17:ca:55:e2:38:a2:6a:ef:03:91:1e:7f:15:2e:37:
+    ea:bb:67:6b:d8:fa:5f:a6:c9:4f:d9:03:46:5e:b0:
+    bc:0b:03:46:b1:cc:07:3b:d3:23:13:16:5f:a2:cf:
+    e5:9b:70:1b:5d:eb:70:3e:ea:3d:2c:a5:7c:23:f6:
+    14:33:e8:2a:ab:0f:ca:c9:96:84:ce:2f:cd:1f:1d:
+    0f:ce:bc:61:1b:0e:ff:c1:01
+exponent2:
+    00:9e:0b:f3:03:48:73:d1:e7:9a:cf:13:f9:ae:e0:
+    91:03:dc:e8:d0:30:f1:2a:30:fa:48:11:81:9a:54:
+    37:c5:62:e2:37:fa:8a:a6:3b:92:94:c3:fe:ec:e2:
+    5a:cf:70:09:5f:21:47:c3:e2:9b:21:de:f6:92:0c:
+    af:d1:bd:89:7b:bd:95:0b:49:ee:cb:1d:6b:26:2d:
+    9a:b7:ea:42:b4:ec:38:29:49:39:f6:4e:05:c0:93:
+    14:39:c3:09:29:ab:3d:b1:b0:40:24:28:7d:b5:d3:
+    0d:43:21:1f:09:f9:9b:d3:a4:6f:6a:8d:db:f6:57:
+    b5:24:46:bb:7e:1d:e0:fb:31
+coefficient:
+    10:93:1d:c8:33:a5:c1:d3:84:6a:22:68:e5:60:cc:
+    9c:27:0a:52:0b:58:a3:0c:83:f4:f4:46:09:0c:a1:
+    41:a6:ea:bf:80:9d:0e:5d:d8:3d:25:00:c5:a1:35:
+    7a:8c:ea:95:16:94:c3:7c:8f:2b:e0:53:ea:66:ae:
+    19:be:55:04:3d:ee:e2:4b:a8:69:1b:7e:d8:09:7f:
+    ed:7c:ee:95:88:10:dc:4b:5b:bf:81:a4:e8:dc:7e:
+    4f:e5:c3:90:c4:e5:5a:90:10:32:d6:08:b5:1f:5d:
+    09:18:d8:44:28:e4:c4:c7:07:75:9b:9b:b3:80:86:
+    68:9d:fe:68:f3:4d:db:66
+writing RSA key
+-----BEGIN RSA PRIVATE KEY-----
+MIIEpAIBAAKCAQEAy7NxlRJw/NvUqadm1tMJ3QaAGeHy1h4xtmsgdVHcpzeprFtX
+XWk2tt4dLPZEZPjo1vDaOGq6wrGe3Lt5lOAlDM52hxddeZ4Unr1MDap0EDqW73aC
+1XIWtcGsFy2Qg3Nc16b1Ng9MVfMwXRncAQ745v6lrVKIWdxKB+2i66EBY8SKkroG
+gJsNhfKf+XCs163wej+4kiozymnQAWVdMTgd9h+yFwd+rIhnpsRfPpOUYebkSZ26
+1NLo45PRZnnF4x34WlBUWD0EsP1l0bOKtYowX7LcNBoU93RMAymXY1rX3rvrf0oq
+kFnAK0cJgo913hQ/vHiaaSWAW2ygZRINKWGs+QIDAQABAoIBABK+1bIBO3KZjE18
+gUM9soerhHhdSaqYpryByT/io6qjvbKFyVloSEe10vuDQjIEkfDNw1czwzINhHAN
+tJeVtPMjwNaXuNtrR7x/8RLE399qdN9eiZW45Qwe4YZUhBsEr8OMsr4h1EWIlqfK
+rGtQhGlFf9ueX7vdQNbP8JE8hNM4ZckV9543qhouvBa2lb68r0V2uq2Z9u9q6P3w
+MYkZxARnoezEeVkId6sLZYiIArE4XIBOJ3iypb21rdWcTOqt2wVWJXAo2iL72N6M
+O3j+Ps/tG/mXxrZKv2AIj9yFXrFJq4eLaHL0aj+826Ns9+iwFbtLujdJotF8+E8b
+BREi2YECgYEA+9LLFGEAwXqDuv55l6JNWupAeJZu0r5xW8YsH8kYSGuuIIaHtQgL
+F2nKk80ANiJRe9UtjAwO3ryGqAcOxVfk377tfcyxpNaoKwBlKmkwXtxtbcTIfiA0
+629ez7O4Lo1WMUSoF+q+ZRn/2hTgDHNWFAhHTFt5UXRdvOf+AS9VJ2kCgYEAzxRU
+R7tfXdYrLe2mim82/Eden4Suqh/4RFCRFfXtnSnZKyoZZlYulhW1jql/iSchtVdV
+firFjJP+9gqlFxWRkbN9NRrVmi64Da3ml22Doycp7gB071c08wetEkM3DFy3JjS8
+TjpDZWsMuCOsd/2yI+t7ZXD2lsQXLKokuKVetxECgYEAkjKu9AXdCna2Q7m5ne78
+OewFwfyUGoW2CjHjLBDzqBfb38Y6wz8IMW+ZzHUXylXiOKJq7wORHn8VLjfqu2dr
+2PpfpslP2QNGXrC8CwNGscwHO9MjExZfos/lm3AbXetwPuo9LKV8I/YUM+gqqw/K
+yZaEzi/NHx0PzrxhGw7/wQECgYEAngvzA0hz0eeazxP5ruCRA9zo0DDxKjD6SBGB
+mlQ3xWLiN/qKpjuSlMP+7OJaz3AJXyFHw+KbId72kgyv0b2Je72VC0nuyx1rJi2a
+t+pCtOw4KUk59k4FwJMUOcMJKas9sbBAJCh9tdMNQyEfCfmb06Rvao3b9le1JEa7
+fh3g+zECgYAQkx3IM6XB04RqImjlYMycJwpSC1ijDIP09EYJDKFBpuq/gJ0OXdg9
+JQDFoTV6jOqVFpTDfI8r4FPqZq4ZvlUEPe7iS6hpG37YCX/tfO6ViBDcS1u/gaTo
+3H5P5cOQxOVakBAy1gi1H10JGNhEKOTExwd1m5uzgIZonf5o803bZg==
+-----END RSA PRIVATE KEY-----
+End
+
+  DHPARAMS = <<'End'
+    DH Parameters: (2048 bit)
+        prime:
+            00:ec:4e:a4:06:b6:22:ca:f9:8a:00:cc:d0:ee:2f:
+            16:bf:05:64:f5:8f:fe:7f:c4:bb:b0:24:cd:ef:5d:
+            8a:90:ad:dc:a9:dd:63:84:90:d8:25:ba:d8:78:d5:
+            77:91:42:0a:84:fc:56:1e:13:9b:1c:aa:43:d5:1f:
+            38:52:92:fe:b3:66:f9:e7:e8:8c:77:a1:a6:2f:b3:
+            98:98:d2:13:fc:57:1c:2a:14:dc:bd:e6:9b:54:19:
+            99:4f:ce:81:64:a6:32:7f:8e:61:50:5f:45:3a:e5:
+            0c:f7:13:f3:b8:ad:d5:77:ca:09:42:f7:d8:30:27:
+            7b:2c:f0:b4:b5:a0:04:96:34:0b:47:81:1d:7f:c1:
+            3a:62:86:8e:7d:f8:13:7f:9a:b1:8b:09:23:9e:55:
+            59:41:cd:f0:86:09:c4:b7:d1:69:54:cb:d0:f5:e9:
+            27:c9:e1:81:e4:a1:df:6b:20:1c:df:e8:54:02:f2:
+            37:fc:2a:f7:d5:b3:6f:79:7e:70:22:78:79:18:3c:
+            75:14:68:4a:05:9f:ac:d4:7f:9a:79:db:9d:0a:6e:
+            ec:0a:04:70:bf:c9:4a:59:81:a2:1f:33:9b:4a:66:
+            bc:03:ce:8a:1b:e3:03:ec:ba:39:26:ab:90:dc:39:
+            41:a1:d8:f7:20:3c:8f:af:12:2f:f7:a9:6f:44:f1:
+            6d:03
+        generator: 2 (0x2)
+-----BEGIN DH PARAMETERS-----
+MIIBCAKCAQEA7E6kBrYiyvmKAMzQ7i8WvwVk9Y/+f8S7sCTN712KkK3cqd1jhJDY
+JbrYeNV3kUIKhPxWHhObHKpD1R84UpL+s2b55+iMd6GmL7OYmNIT/FccKhTcveab
+VBmZT86BZKYyf45hUF9FOuUM9xPzuK3Vd8oJQvfYMCd7LPC0taAEljQLR4Edf8E6
+YoaOffgTf5qxiwkjnlVZQc3whgnEt9FpVMvQ9eknyeGB5KHfayAc3+hUAvI3/Cr3
+1bNveX5wInh5GDx1FGhKBZ+s1H+aedudCm7sCgRwv8lKWYGiHzObSma8A86KG+MD
+7Lo5JquQ3DlBodj3IDyPrxIv96lvRPFtAwIBAg==
+-----END DH PARAMETERS-----
+End
+  end
+end
diff --git a/test/openssl/fixtures/pkey/certificate.der b/test/openssl/fixtures/pkey/certificate.der
deleted file mode 100644
index 7d44df8413aac2..00000000000000
Binary files a/test/openssl/fixtures/pkey/certificate.der and /dev/null differ
diff --git a/test/openssl/fixtures/pkey/dh1024.pem b/test/openssl/fixtures/pkey/dh1024.pem
deleted file mode 100644
index f99c757f21a419..00000000000000
--- a/test/openssl/fixtures/pkey/dh1024.pem
+++ /dev/null
@@ -1,5 +0,0 @@
------BEGIN DH PARAMETERS-----
-MIGHAoGBAKnKQ8MNK6nYZzLrrcuTsLxuiJGXoOO5gT+tljOTbHBuiktdMTITzIY0
-pFxIvjG05D7HoBZQfrR0c92NGWPkAiCkhQKB8JCbPVzwNLDy6DZ0pmofDKrEsYHG
-AQjjxMXhwULlmuR/K+WwlaZPiLIBYalLAZQ7ZbOPeVkJ8ePao0eLAgEC
------END DH PARAMETERS-----
diff --git a/test/openssl/fixtures/pkey/dh2048_ffdhe2048.pem b/test/openssl/fixtures/pkey/dh2048_ffdhe2048.pem
new file mode 100644
index 00000000000000..9b182b7201fd94
--- /dev/null
+++ b/test/openssl/fixtures/pkey/dh2048_ffdhe2048.pem
@@ -0,0 +1,8 @@
+-----BEGIN DH PARAMETERS-----
+MIIBCAKCAQEA//////////+t+FRYortKmq/cViAnPTzx2LnFg84tNpWp4TZBFGQz
++8yTnc4kmz75fS/jY2MMddj2gbICrsRhetPfHtXV/WVhJDP1H18GbtCFY2VVPe0a
+87VXE15/V8k1mE8McODmi3fipona8+/och3xWKE2rec1MKzKT0g6eXq8CrGCsyT7
+YdEIqUuyyOP7uWrat2DX9GgdT0Kj3jlN9K5W7edjcrsZCwenyO4KbXCeAvzhzffi
+7MA0BM0oNC9hkXL+nOmFg/+OTxIy7vKBg8P+OxtMb61zO7X8vC7CIAXFjvGDfRaD
+ssbzSibBsu/6iGtCOGEoXJf//////////wIBAg==
+-----END DH PARAMETERS-----
diff --git a/test/openssl/fixtures/pkey/dsa2048.pem b/test/openssl/fixtures/pkey/dsa2048.pem
new file mode 100644
index 00000000000000..3f22b22b58bd0a
--- /dev/null
+++ b/test/openssl/fixtures/pkey/dsa2048.pem
@@ -0,0 +1,15 @@
+-----BEGIN PRIVATE KEY-----
+MIICXgIBADCCAjYGByqGSM44BAEwggIpAoIBAQDXZhJ/dQoWkQELzjzlx8FtIp96
+voCYe5NY0H8j0jz7GyHpXt41+MteqkZK3/Ah+cNR9uG8iEYArAZ71LcWotfee2Gz
+xdxozr9bRt0POYhO2YIsfMpBrEskPsDH2g/2nFV8l4OJgxU2qZUrF4PN5ha+Mu6u
+sVtN8hjvAvnbf4Pxn0b8NN9f4PJncroUa8acv5WsV85E1RW7NYCefggU4LytYIHg
+euRF9eY9gVCX5MkUgW2xODHIYJhwk/+5lJxG7qUsSahD/nPHO/yoWgdVHq2DkdTq
+KYXkAxx2PJcTBOHTglhE6mgCbEKp8vcfElnBWyCT6QykclZiPXXD2JV829J/Ah0A
+vYa+/G/gUZiomyejVje6UsGoCc+vInxmovOL8QKCAQEAhnKEigYPw6u8JY7v5iGo
+Ylz8qiMFYmaJCwevf3KCjWeEXuNO4OrKdfzkQl1tPuGLioYFfP1A2yGosjdUdLEB
+0JqnzlKxUp+G6RfBj+WYzbgc5hr7t0M+reAJh09/hDzqfxjcgiHstq7mpRXBP8Y7
+iu27s7TRYJNSAYRvWcXNSBEUym3mHBBbZn7VszYooSrn60/iZ8I+VY1UF/fgqhbj
+JfaaZNQCDO9K3Vb3rsXoYd8+bOZIen9uHB+pNjMqhpl4waysqrlpGFeeqdxivH6S
+vkrHLs6/eWVMnS08RdcryoCrI3Bm8mMBKQglDwKLnWLfzG565qEhslzyCd/l9k9a
+cwQfAh0Ao8/g72fSFmo04FizM7DZJSIPqDLjfZu9hLvUFA==
+-----END PRIVATE KEY-----
diff --git a/test/openssl/fixtures/pkey/empty.der b/test/openssl/fixtures/pkey/empty.der
deleted file mode 100644
index e69de29bb2d1d6..00000000000000
diff --git a/test/openssl/fixtures/pkey/empty.pem b/test/openssl/fixtures/pkey/empty.pem
deleted file mode 100644
index e69de29bb2d1d6..00000000000000
diff --git a/test/openssl/fixtures/pkey/fullchain.pem b/test/openssl/fixtures/pkey/fullchain.pem
deleted file mode 100644
index 624785d326a071..00000000000000
--- a/test/openssl/fixtures/pkey/fullchain.pem
+++ /dev/null
@@ -1,56 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIFKTCCBBGgAwIBAgISBFspP+tJfRaC6xprreB4Rp9KMA0GCSqGSIb3DQEBCwUA
-MDIxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1MZXQncyBFbmNyeXB0MQswCQYDVQQD
-EwJSMzAeFw0yMTA0MTcwMjQzMTlaFw0yMTA3MTYwMjQzMTlaMBwxGjAYBgNVBAMT
-EXd3dy5jb2Rlb3Rha3UuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
-AQEAx6h5vNPfkkrtYWxn1PWDDLRAwrGmZbkYPttjHBRSwTcd7rsIX4PcSzw9fWxm
-K4vIkAYoKAElIvsSE3xRUjyzMrACfdhK5J8rG25fq94iVyoYaNBQV0WMJkO6X47s
-hGeIKkK91ohR5b2tMw3/z9zELP0TVo2TPG7rYsBZm34myldqDA8yVEBEOa+Qdpda
-9xewPhkkdpAU55qgWTrD21m7vGq9WpsBz4wNKnwVsaugtkRH82VPIfaL4ZI9kox6
-QoPWe/tHUBdlDkuT7ud77eLAWnC/5Clg28/9GU/Z8Nj8SrrKuXL6WUXmxxaAhWUR
-Qx4VblZeuIpwd0nHyP0hz4CWKQIDAQABo4ICTTCCAkkwDgYDVR0PAQH/BAQDAgWg
-MB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAMBgNVHRMBAf8EAjAAMB0G
-A1UdDgQWBBTKiSGZuLFSIG2JPbFSZa9TxMu5WTAfBgNVHSMEGDAWgBQULrMXt1hW
-y65QCUDmH6+dixTCxjBVBggrBgEFBQcBAQRJMEcwIQYIKwYBBQUHMAGGFWh0dHA6
-Ly9yMy5vLmxlbmNyLm9yZzAiBggrBgEFBQcwAoYWaHR0cDovL3IzLmkubGVuY3Iu
-b3JnLzAcBgNVHREEFTATghF3d3cuY29kZW90YWt1LmNvbTBMBgNVHSAERTBDMAgG
-BmeBDAECATA3BgsrBgEEAYLfEwEBATAoMCYGCCsGAQUFBwIBFhpodHRwOi8vY3Bz
-LmxldHNlbmNyeXB0Lm9yZzCCAQUGCisGAQQB1nkCBAIEgfYEgfMA8QB3AJQgvB6O
-1Y1siHMfgosiLA3R2k1ebE+UPWHbTi9YTaLCAAABeN3s/lgAAAQDAEgwRgIhAKFY
-Q+vBe3zyeBazxp8kVN7oLvcQ6Y9PPz199tVhYnEbAiEAhU/xdbQaY/6b93h+7NTF
-sPG7X4lq/3UoNgoXcAVGZgoAdgD2XJQv0XcwIhRUGAgwlFaO400TGTO/3wwvIAvM
-TvFk4wAAAXjd7P5OAAAEAwBHMEUCIQDWd79+jWaGuf3acm5/yV95jL2KvzeGFfdU
-HZlKIeWFmAIgDSZ6ug7AyhYNKjzFV4ZSICln+L4yI92EpOa+8gDG6/0wDQYJKoZI
-hvcNAQELBQADggEBAHIhMYm06lLFmJL+cfIg5fFEmFNdHmmZn88Hypv4/MtmqTKv
-5asF/z3TvhW4hX2+TY+NdcqGT7cZFo/ZF/tS6oBXPgmBYM1dEfp2FAdnGNOySC5Y
-7RC4Uk9TUpP2g101YBmj6dQKQluAwIQk+gO4MSlHE0J0U/lMpjvrLWcuHbV4/xWJ
-IdM+iPq8GeYt5epYmNc7XeRIgv7V3RxDQdBv2OVM5mtPVerdiO0ISrdbe5mvz2+Z
-rhSg+EJNHlmMwcq5HqtMwS8M8Ax+vLmWCOkPWXhyV8wQaQcFjZJfpIGUvCnMTqsh
-kSIYXq2CbSDUUFRFssNN6EdVms0KnmW3BUu0xAk=
------END CERTIFICATE-----
------BEGIN CERTIFICATE-----
-MIIEZTCCA02gAwIBAgIQQAF1BIMUpMghjISpDBbN3zANBgkqhkiG9w0BAQsFADA/
-MSQwIgYDVQQKExtEaWdpdGFsIFNpZ25hdHVyZSBUcnVzdCBDby4xFzAVBgNVBAMT
-DkRTVCBSb290IENBIFgzMB4XDTIwMTAwNzE5MjE0MFoXDTIxMDkyOTE5MjE0MFow
-MjELMAkGA1UEBhMCVVMxFjAUBgNVBAoTDUxldCdzIEVuY3J5cHQxCzAJBgNVBAMT
-AlIzMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuwIVKMz2oJTTDxLs
-jVWSw/iC8ZmmekKIp10mqrUrucVMsa+Oa/l1yKPXD0eUFFU1V4yeqKI5GfWCPEKp
-Tm71O8Mu243AsFzzWTjn7c9p8FoLG77AlCQlh/o3cbMT5xys4Zvv2+Q7RVJFlqnB
-U840yFLuta7tj95gcOKlVKu2bQ6XpUA0ayvTvGbrZjR8+muLj1cpmfgwF126cm/7
-gcWt0oZYPRfH5wm78Sv3htzB2nFd1EbjzK0lwYi8YGd1ZrPxGPeiXOZT/zqItkel
-/xMY6pgJdz+dU/nPAeX1pnAXFK9jpP+Zs5Od3FOnBv5IhR2haa4ldbsTzFID9e1R
-oYvbFQIDAQABo4IBaDCCAWQwEgYDVR0TAQH/BAgwBgEB/wIBADAOBgNVHQ8BAf8E
-BAMCAYYwSwYIKwYBBQUHAQEEPzA9MDsGCCsGAQUFBzAChi9odHRwOi8vYXBwcy5p
-ZGVudHJ1c3QuY29tL3Jvb3RzL2RzdHJvb3RjYXgzLnA3YzAfBgNVHSMEGDAWgBTE
-p7Gkeyxx+tvhS5B1/8QVYIWJEDBUBgNVHSAETTBLMAgGBmeBDAECATA/BgsrBgEE
-AYLfEwEBATAwMC4GCCsGAQUFBwIBFiJodHRwOi8vY3BzLnJvb3QteDEubGV0c2Vu
-Y3J5cHQub3JnMDwGA1UdHwQ1MDMwMaAvoC2GK2h0dHA6Ly9jcmwuaWRlbnRydXN0
-LmNvbS9EU1RST09UQ0FYM0NSTC5jcmwwHQYDVR0OBBYEFBQusxe3WFbLrlAJQOYf
-r52LFMLGMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjANBgkqhkiG9w0B
-AQsFAAOCAQEA2UzgyfWEiDcx27sT4rP8i2tiEmxYt0l+PAK3qB8oYevO4C5z70kH
-ejWEHx2taPDY/laBL21/WKZuNTYQHHPD5b1tXgHXbnL7KqC401dk5VvCadTQsvd8
-S8MXjohyc9z9/G2948kLjmE6Flh9dDYrVYA9x2O+hEPGOaEOa1eePynBgPayvUfL
-qjBstzLhWVQLGAkXXmNs+5ZnPBxzDJOLxhF2JIbeQAcH5H0tZrUlo5ZYyOqA7s9p
-O5b85o3AM/OJ+CktFBQtfvBhcJVd9wvlwPsk+uyOy2HI7mNxKKgsBTt375teA2Tw
-UdHkhVNcsAKX1H7GNNLOEADksd86wuoXvg==
------END CERTIFICATE-----
diff --git a/test/openssl/fixtures/pkey/garbage.txt b/test/openssl/fixtures/pkey/garbage.txt
deleted file mode 100644
index 557db03de997c8..00000000000000
--- a/test/openssl/fixtures/pkey/garbage.txt
+++ /dev/null
@@ -1 +0,0 @@
-Hello World
diff --git a/test/openssl/fixtures/pkey/p256_too_large.pem b/test/openssl/fixtures/pkey/p256_too_large.pem
deleted file mode 100644
index a73ac37f875dd8..00000000000000
--- a/test/openssl/fixtures/pkey/p256_too_large.pem
+++ /dev/null
@@ -1,5 +0,0 @@
------BEGIN EC PRIVATE KEY-----
-MHcCAQEEIP+TT0V8Fndsnacji9tyf6hmhHywcOWTee9XkiBeJoVloAoGCCqGSM49
-AwEHoUQDQgAEBkhhJIU/2/YdPSlY2I1k25xjK4trr5OXSgXvBC21PtY0HQ7lor7A
-jzT0giJITqmcd81fwGw5+96zLcdxTF1hVQ==
------END EC PRIVATE KEY-----
diff --git a/test/openssl/fixtures/pkey/p384_invalid.pem b/test/openssl/fixtures/pkey/p384_invalid.pem
deleted file mode 100644
index d5cdc9a3afba8a..00000000000000
--- a/test/openssl/fixtures/pkey/p384_invalid.pem
+++ /dev/null
@@ -1,6 +0,0 @@
------BEGIN EC PRIVATE KEY-----
-MIGkAgEBBDDA1Tm0m7YhkfeVpFuarAJYVlHp2tQj+1fOBiLa10t9E8TiQO/hVfxB
-vGaVEQwOheWgBwYFK4EEACKhZANiAASyGqmryZGqdpsq5gEDIfNvgC3AwSJxiBCL
-XKHBTFRp+tCezLDOK/6V8KK/vVGBJlGFW6/I7ahyXprxS7xs7hPA9iz5YiuqXlu+
-lbrIpZOz7b73hyQQCkvbBO/Avg+hPAk=
------END EC PRIVATE KEY-----
diff --git a/test/openssl/fixtures/ssl/openssl_fips.cnf.tmpl b/test/openssl/fixtures/ssl/openssl_fips.cnf.tmpl
deleted file mode 100644
index be0768d52319e1..00000000000000
--- a/test/openssl/fixtures/ssl/openssl_fips.cnf.tmpl
+++ /dev/null
@@ -1,19 +0,0 @@
-config_diagnostics = 1
-openssl_conf = openssl_init
-
-# It seems that the .include needs an absolute path.
-.include OPENSSL_DIR/ssl/fipsmodule.cnf
-
-[openssl_init]
-providers = provider_sect
-alg_section = algorithm_sect
-
-[provider_sect]
-fips = fips_sect
-base = base_sect
-
-[base_sect]
-activate = 1
-
-[algorithm_sect]
-default_properties = fips=yes
diff --git a/test/openssl/test_asn1.rb b/test/openssl/test_asn1.rb
index 6eb45094a2e023..1b933a78bf3226 100644
--- a/test/openssl/test_asn1.rb
+++ b/test/openssl/test_asn1.rb
@@ -326,7 +326,9 @@ def test_object_identifier
     oid = (0...100).to_a.join(".").b
     obj = OpenSSL::ASN1::ObjectId.new(oid)
     assert_equal oid, obj.oid
+  end
 
+  def test_object_identifier_equality
     aki = [
       OpenSSL::ASN1::ObjectId.new("authorityKeyIdentifier"),
       OpenSSL::ASN1::ObjectId.new("X509v3 Authority Key Identifier"),
@@ -341,17 +343,22 @@ def test_object_identifier
 
     aki.each do |a|
       aki.each do |b|
-        assert a == b
+        assert_equal true, a == b
       end
 
       ski.each do |b|
-        refute a == b
+        assert_equal false, a == b
       end
     end
 
-    assert_raise(TypeError) {
-      OpenSSL::ASN1::ObjectId.new("authorityKeyIdentifier") == nil
-    }
+    obj1 = OpenSSL::ASN1::ObjectId.new("1.2.34.56789.10")
+    obj2 = OpenSSL::ASN1::ObjectId.new("1.2.34.56789.10")
+    obj3 = OpenSSL::ASN1::ObjectId.new("1.2.34.56789.11")
+    omit "OID 1.2.34.56789.10 is registered" if obj1.sn
+    assert_equal true, obj1 == obj2
+    assert_equal false, obj1 == obj3
+
+    assert_equal false, OpenSSL::ASN1::ObjectId.new("authorityKeyIdentifier") == nil
   end
 
   def test_sequence
@@ -382,6 +389,11 @@ def test_sequence
     ])
     expected.indefinite_length = true
     encode_test B(%w{ 30 80 04 01 00 00 00 }), expected
+
+    # Missing EOC at the end of contents octets
+    assert_raise(OpenSSL::ASN1::ASN1Error) {
+      OpenSSL::ASN1.decode(B(%w{ 30 80 01 01 FF }))
+    }
   end
 
   def test_set
@@ -399,17 +411,16 @@ def test_set
   def test_utctime
     encode_decode_test B(%w{ 17 0D }) + "160908234339Z".b,
       OpenSSL::ASN1::UTCTime.new(Time.utc(2016, 9, 8, 23, 43, 39))
-    begin
-      # possible range of UTCTime is 1969-2068 currently
-      encode_decode_test B(%w{ 17 0D }) + "690908234339Z".b,
-        OpenSSL::ASN1::UTCTime.new(Time.utc(1969, 9, 8, 23, 43, 39))
-    rescue OpenSSL::ASN1::ASN1Error
-      pend "No negative time_t support?"
-    end
-    # Seconds is omitted. LibreSSL 3.6.0 requires it
-    return if libressl?
-    decode_test B(%w{ 17 0B }) + "1609082343Z".b,
-      OpenSSL::ASN1::UTCTime.new(Time.utc(2016, 9, 8, 23, 43, 0))
+
+    # 1950-2049 range is assumed to match RFC 5280's expectation
+    encode_decode_test B(%w{ 17 0D }) + "490908234339Z".b,
+      OpenSSL::ASN1::UTCTime.new(Time.utc(2049, 9, 8, 23, 43, 39))
+    encode_decode_test B(%w{ 17 0D }) + "500908234339Z".b,
+      OpenSSL::ASN1::UTCTime.new(Time.utc(1950, 9, 8, 23, 43, 39))
+    assert_raise(OpenSSL::ASN1::ASN1Error) {
+      OpenSSL::ASN1::UTCTime.new(Time.new(2049, 12, 31, 23, 0, 0, "-04:00")).to_der
+    }
+
     # not implemented
     # decode_test B(%w{ 17 11 }) + "500908234339+0930".b,
     #   OpenSSL::ASN1::UTCTime.new(Time.new(1950, 9, 8, 23, 43, 39, "+09:30"))
@@ -428,10 +439,6 @@ def test_generalizedtime
       OpenSSL::ASN1::GeneralizedTime.new(Time.utc(2016, 12, 8, 19, 34, 29))
     encode_decode_test B(%w{ 18 0F }) + "99990908234339Z".b,
       OpenSSL::ASN1::GeneralizedTime.new(Time.utc(9999, 9, 8, 23, 43, 39))
-    # LibreSSL 3.6.0 requires the seconds element
-    return if libressl?
-    decode_test B(%w{ 18 0D }) + "201612081934Z".b,
-      OpenSSL::ASN1::GeneralizedTime.new(Time.utc(2016, 12, 8, 19, 34, 0))
     # not implemented
     # decode_test B(%w{ 18 13 }) + "20161208193439+0930".b,
     #   OpenSSL::ASN1::GeneralizedTime.new(Time.new(2016, 12, 8, 19, 34, 39, "+09:30"))
@@ -459,7 +466,7 @@ def test_basic_asn1data
     encode_decode_test B(%w{ 81 00 }), OpenSSL::ASN1::ASN1Data.new(B(%w{}), 1, :CONTEXT_SPECIFIC)
     encode_decode_test B(%w{ C1 00 }), OpenSSL::ASN1::ASN1Data.new(B(%w{}), 1, :PRIVATE)
     encode_decode_test B(%w{ 1F 20 00 }), OpenSSL::ASN1::ASN1Data.new(B(%w{}), 32, :UNIVERSAL)
-    encode_decode_test B(%w{ 1F C0 20 00 }), OpenSSL::ASN1::ASN1Data.new(B(%w{}), 8224, :UNIVERSAL)
+    encode_decode_test B(%w{ 9F C0 20 00 }), OpenSSL::ASN1::ASN1Data.new(B(%w{}), 8224, :CONTEXT_SPECIFIC)
     encode_decode_test B(%w{ 41 02 AB CD }), OpenSSL::ASN1::ASN1Data.new(B(%w{ AB CD }), 1, :APPLICATION)
     encode_decode_test B(%w{ 41 81 80 } + %w{ AB CD } * 64), OpenSSL::ASN1::ASN1Data.new(B(%w{ AB CD } * 64), 1, :APPLICATION)
     encode_decode_test B(%w{ 41 82 01 00 } + %w{ AB CD } * 128), OpenSSL::ASN1::ASN1Data.new(B(%w{ AB CD } * 128), 1, :APPLICATION)
diff --git a/test/openssl/test_bn.rb b/test/openssl/test_bn.rb
index ea88ff06ce397c..f663102d45c2a7 100644
--- a/test/openssl/test_bn.rb
+++ b/test/openssl/test_bn.rb
@@ -321,6 +321,8 @@ def test_argument_error
   end
 
   def test_get_flags_and_set_flags
+    return if aws_lc? # AWS-LC does not support BN::CONSTTIME.
+
     e = OpenSSL::BN.new(999)
 
     assert_equal(0, e.get_flags(OpenSSL::BN::CONSTTIME))
@@ -343,28 +345,40 @@ def test_get_flags_and_set_flags
     assert_equal(4, e.get_flags(OpenSSL::BN::CONSTTIME))
   end
 
-  if respond_to?(:ractor)
+  if defined?(Ractor) && respond_to?(:ractor)
+    unless Ractor.method_defined?(:value) # Ruby 3.4 or earlier
+      using Module.new {
+        refine Ractor do
+          alias value take
+        end
+      }
+    end
+
     ractor
     def test_ractor
-      assert_equal(@e1, Ractor.new { OpenSSL::BN.new("999") }.take)
-      assert_equal(@e3, Ractor.new { OpenSSL::BN.new("\a\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF", 2) }.take)
-      assert_equal("999", Ractor.new(@e1) { |e1| e1.to_s }.take)
-      assert_equal("07FFFFFFFFFFFFFFFFFFFFFFFFFF", Ractor.new(@e3) { |e3| e3.to_s(16) }.take)
-      assert_equal(2**107-1, Ractor.new(@e3) { _1.to_i }.take)
-      assert_equal([1000, -999], Ractor.new(@e2) { _1.coerce(1000) }.take)
-      assert_equal(false, Ractor.new  { 1.to_bn.zero? }.take)
-      assert_equal(true, Ractor.new { 1.to_bn.one? }.take)
-      assert_equal(true, Ractor.new(@e2) { _1.negative? }.take)
-      assert_equal("-03E7", Ractor.new(@e2) { _1.to_s(16) }.take)
-      assert_equal(2**107-1, Ractor.new(@e3) { _1.to_i }.take)
-      assert_equal([1000, -999], Ractor.new(@e2) { _1.coerce(1000) }.take)
-      assert_equal(true, Ractor.new { 0.to_bn.zero? }.take)
-      assert_equal(true, Ractor.new { 1.to_bn.one? }.take )
-      assert_equal(false,Ractor.new { 2.to_bn.odd? }.take)
-      assert_equal(true, Ractor.new(@e2) { _1.negative? }.take)
-      assert_include(128..255, Ractor.new { OpenSSL::BN.rand(8)}.take)
-      assert_include(0...2**32, Ractor.new { OpenSSL::BN.generate_prime(32) }.take)
-      assert_equal(0, Ractor.new { OpenSSL::BN.new(999).get_flags(OpenSSL::BN::CONSTTIME) }.take)
+      assert_equal(@e1, Ractor.new { OpenSSL::BN.new("999") }.value)
+      assert_equal(@e3, Ractor.new { OpenSSL::BN.new("\a\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF", 2) }.value)
+      assert_equal("999", Ractor.new(@e1) { |e1| e1.to_s }.value)
+      assert_equal("07FFFFFFFFFFFFFFFFFFFFFFFFFF", Ractor.new(@e3) { |e3| e3.to_s(16) }.value)
+      assert_equal(2**107-1, Ractor.new(@e3) { _1.to_i }.value)
+      assert_equal([1000, -999], Ractor.new(@e2) { _1.coerce(1000) }.value)
+      assert_equal(false, Ractor.new  { 1.to_bn.zero? }.value)
+      assert_equal(true, Ractor.new { 1.to_bn.one? }.value)
+      assert_equal(true, Ractor.new(@e2) { _1.negative? }.value)
+      assert_equal("-03E7", Ractor.new(@e2) { _1.to_s(16) }.value)
+      assert_equal(2**107-1, Ractor.new(@e3) { _1.to_i }.value)
+      assert_equal([1000, -999], Ractor.new(@e2) { _1.coerce(1000) }.value)
+      assert_equal(true, Ractor.new { 0.to_bn.zero? }.value)
+      assert_equal(true, Ractor.new { 1.to_bn.one? }.value )
+      assert_equal(false,Ractor.new { 2.to_bn.odd? }.value)
+      assert_equal(true, Ractor.new(@e2) { _1.negative? }.value)
+      assert_include(128..255, Ractor.new { OpenSSL::BN.rand(8)}.value)
+      assert_include(0...2**32, Ractor.new { OpenSSL::BN.generate_prime(32) }.value)
+      if !aws_lc? # AWS-LC does not support BN::CONSTTIME.
+        assert_equal(0, Ractor.new { OpenSSL::BN.new(999).get_flags(OpenSSL::BN::CONSTTIME) }.value)
+      end
+      # test if shareable when frozen
+      assert Ractor.shareable?(@e1.freeze)
     end
   end
 end
diff --git a/test/openssl/test_buffering.rb b/test/openssl/test_buffering.rb
index 7575c5b4fe49fe..466bbcfa231243 100644
--- a/test/openssl/test_buffering.rb
+++ b/test/openssl/test_buffering.rb
@@ -31,7 +31,7 @@ def sysread(size)
     end
 
     def syswrite(str)
-      @io << str
+      @io.append_as_bytes(str)
       str.size
     end
   end
diff --git a/test/openssl/test_cipher.rb b/test/openssl/test_cipher.rb
index 8faa57064872c4..cd0b3dcb4450f6 100644
--- a/test/openssl/test_cipher.rb
+++ b/test/openssl/test_cipher.rb
@@ -128,6 +128,30 @@ def test_ctr_if_exists
     assert_equal pt, cipher.update(ct) << cipher.final
   end
 
+  def test_update_with_buffer
+    cipher = OpenSSL::Cipher.new("aes-128-ecb").encrypt
+    cipher.random_key
+    expected = cipher.update("data") << cipher.final
+    assert_equal 16, expected.bytesize
+
+    # Buffer is supplied
+    cipher.reset
+    buf = String.new
+    assert_same buf, cipher.update("data", buf)
+    assert_equal expected, buf + cipher.final
+
+    # Buffer is frozen
+    cipher.reset
+    assert_raise(FrozenError) { cipher.update("data", String.new.freeze) }
+
+    # Buffer is a shared string [ruby-core:120141] [Bug #20937]
+    cipher.reset
+    buf = "x" * 1024
+    shared = buf[-("data".bytesize + 32)..-1]
+    assert_same shared, cipher.update("data", shared)
+    assert_equal expected, shared + cipher.final
+  end
+
   def test_ciphers
     ciphers = OpenSSL::Cipher.ciphers
     assert_kind_of Array, ciphers
@@ -331,6 +355,22 @@ def test_aes_gcm_key_iv_order_issue
     assert_equal tag1, tag2
   end
 
+  def test_aes_keywrap_pad
+    # RFC 5649 Section 6; The second example
+    kek = ["5840df6e29b02af1ab493b705bf16ea1ae8338f4dcc176a8"].pack("H*")
+    key = ["466f7250617369"].pack("H*")
+    wrap = ["afbeb0f07dfbf5419200f2ccb50bb24f"].pack("H*")
+
+    begin
+      cipher = OpenSSL::Cipher.new("id-aes192-wrap-pad").encrypt
+    rescue OpenSSL::Cipher::CipherError, RuntimeError
+      omit "id-aes192-wrap-pad is not supported: #$!"
+    end
+    cipher.key = kek
+    ct = cipher.update(key) << cipher.final
+    assert_equal wrap, ct
+  end
+
   def test_non_aead_cipher_set_auth_data
     assert_raise(OpenSSL::Cipher::CipherError) {
       cipher = OpenSSL::Cipher.new("aes-128-cfb").encrypt
diff --git a/test/openssl/test_config.rb b/test/openssl/test_config.rb
index 6dbb9c61388644..c10a855a4bf959 100644
--- a/test/openssl/test_config.rb
+++ b/test/openssl/test_config.rb
@@ -39,9 +39,13 @@ def test_s_parse
     assert_equal("[ default ]\n\n", c.to_s)
     c = OpenSSL::Config.parse(@it.to_s)
     assert_equal(['CA_default', 'ca', 'default'], c.sections.sort)
+    assert_predicate(c, :frozen?)
   end
 
   def test_s_parse_format
+    # AWS-LC removed support for parsing $foo variables.
+    return if aws_lc?
+
     c = OpenSSL::Config.parse(<<__EOC__)
  baz =qx\t                # "baz = qx"
 
@@ -188,6 +192,7 @@ def test_initialize
     c = OpenSSL::Config.new
     assert_equal("", c.to_s)
     assert_equal([], c.sections)
+    assert_predicate(c, :frozen?)
   end
 
   def test_initialize_with_empty_file
@@ -211,13 +216,15 @@ def test_get_value
     assert_raise(TypeError) do
       @it.get_value(nil, 'HOME') # not allowed unlike Config#value
     end
-    # fallback to 'default' ugly...
-    assert_equal('.', @it.get_value('unknown', 'HOME'))
+    unless aws_lc? # AWS-LC does not support the fallback
+      # fallback to 'default' ugly...
+      assert_equal('.', @it.get_value('unknown', 'HOME'))
+    end
   end
 
   def test_get_value_ENV
-    # LibreSSL removed support for NCONF_get_string(conf, "ENV", str)
-    return if libressl?
+    # LibreSSL and AWS-LC removed support for NCONF_get_string(conf, "ENV", str)
+    return if libressl? || aws_lc?
 
     key = ENV.keys.first
     assert_not_nil(key) # make sure we have at least one ENV var.
@@ -268,11 +275,22 @@ def test_inspect
   def test_dup
     assert_equal(['CA_default', 'ca', 'default'], @it.sections.sort)
     c1 = @it.dup
+    assert_predicate(c1, :frozen?)
     assert_equal(@it.sections.sort, c1.sections.sort)
     c2 = @it.clone
+    assert_predicate(c2, :frozen?)
     assert_equal(@it.sections.sort, c2.sections.sort)
   end
 
+  if respond_to?(:ractor)
+    ractor
+    def test_ractor
+      assert(Ractor.shareable?(@it))
+      assert(Ractor.shareable?(OpenSSL::Config.parse("[empty]\n")))
+      assert(Ractor.shareable?(OpenSSL::Config::DEFAULT_CONFIG_FILE))
+    end
+  end
+
   private
 
   def in_tmpdir(*args)
diff --git a/test/openssl/test_digest.rb b/test/openssl/test_digest.rb
index b0b5b9bed1eb33..5b4eb3c74c440a 100644
--- a/test/openssl/test_digest.rb
+++ b/test/openssl/test_digest.rb
@@ -88,7 +88,6 @@ def test_sha2
   end
 
   def test_sha512_truncate
-    pend "SHA512_224 is not implemented" unless digest_available?('SHA512-224')
     sha512_224_a = "d5cdb9ccc769a5121d4175f2bfdd13d6310e0d3d361ea75d82108327"
     sha512_256_a = "455e518824bc0601f9fb858ff5c37d417d67c2f8e0df2babe4808858aea830f8"
 
@@ -100,15 +99,14 @@ def test_sha512_truncate
   end
 
   def test_sha3
-    pend "SHA3 is not implemented" unless digest_available?('SHA3-224')
     s224 = '6b4e03423667dbb73b6e15454f0eb1abd4597f9a1b078e3f5b5a6bc7'
     s256 = 'a7ffc6f8bf1ed76651c14756a061d662f580ff4de43b49fa82d80a4b80f8434a'
     s384 = '0c63a75b845e4f7d01107d852e4c2485c51a50aaaa94fc61995e71bbee983a2ac3713831264adb47fb6bd1e058d5f004'
     s512 = 'a69f73cca23a9ac5c8b567dc185a756e97c982164fe25859e0d1dcc1475c80a615b2123af1f5f94c11e3e9402c3ac558f500199d95b6d3e301758586281dcd26'
-    assert_equal(OpenSSL::Digest.hexdigest('SHA3-224', ""), s224)
-    assert_equal(OpenSSL::Digest.hexdigest('SHA3-256', ""), s256)
-    assert_equal(OpenSSL::Digest.hexdigest('SHA3-384', ""), s384)
-    assert_equal(OpenSSL::Digest.hexdigest('SHA3-512', ""), s512)
+    assert_equal(s224, OpenSSL::Digest.hexdigest('SHA3-224', ""))
+    assert_equal(s256, OpenSSL::Digest.hexdigest('SHA3-256', ""))
+    assert_equal(s384, OpenSSL::Digest.hexdigest('SHA3-384', ""))
+    assert_equal(s512, OpenSSL::Digest.hexdigest('SHA3-512', ""))
   end
 
   def test_digest_by_oid_and_name_sha2
@@ -126,6 +124,15 @@ def test_openssl_digest
     end
   end
 
+  def test_digests
+    digests = OpenSSL::Digest.digests
+    assert_kind_of Array, digests
+    assert_include digests, "md5"
+    assert_include digests, "sha1"
+    assert_include digests, "sha256"
+    assert_include digests, "sha512"
+  end
+
   private
 
   def check_digest(oid)
@@ -136,14 +143,6 @@ def check_digest(oid)
     d = OpenSSL::Digest.new(oid.oid)
     assert_not_nil(d)
   end
-
-  def digest_available?(name)
-    begin
-      OpenSSL::Digest.new(name)
-    rescue RuntimeError
-      false
-    end
-  end
 end
 
 end
diff --git a/test/openssl/test_fips.rb b/test/openssl/test_fips.rb
index 43042beab866ed..efc2655e25bf54 100644
--- a/test/openssl/test_fips.rb
+++ b/test/openssl/test_fips.rb
@@ -28,12 +28,19 @@ def test_fips_mode_get_is_false_on_fips_mode_disabled
   end
 
   def test_fips_mode_is_reentrant
-    OpenSSL.fips_mode = false
-    OpenSSL.fips_mode = false
+    return if aws_lc? # AWS-LC's FIPS mode is decided at compile time.
+
+    assert_separately(["-ropenssl"], <<~"end;")
+      OpenSSL.fips_mode = false
+      OpenSSL.fips_mode = false
+    end;
   end
 
   def test_fips_mode_get_with_fips_mode_set
-    omit('OpenSSL is not FIPS-capable') unless OpenSSL::OPENSSL_FIPS
+    return if aws_lc? # AWS-LC's FIPS mode is decided at compile time.
+    unless ENV["TEST_RUBY_OPENSSL_FIPS_ENABLED"]
+      omit "Only for FIPS mode environment"
+    end
 
     assert_separately(["-ropenssl"], <<~"end;")
       begin
diff --git a/test/openssl/test_kdf.rb b/test/openssl/test_kdf.rb
index f4790c96afa7ea..6a12a25aa8305a 100644
--- a/test/openssl/test_kdf.rb
+++ b/test/openssl/test_kdf.rb
@@ -132,7 +132,6 @@ def test_scrypt_rfc7914_second
   end
 
   def test_hkdf_rfc5869_test_case_1
-    pend "HKDF is not implemented" unless OpenSSL::KDF.respond_to?(:hkdf) # OpenSSL >= 1.1.0
     hash = "sha256"
     ikm = B("0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b")
     salt = B("000102030405060708090a0b0c")
@@ -146,7 +145,6 @@ def test_hkdf_rfc5869_test_case_1
   end
 
   def test_hkdf_rfc5869_test_case_3
-    pend "HKDF is not implemented" unless OpenSSL::KDF.respond_to?(:hkdf) # OpenSSL >= 1.1.0
     hash = "sha256"
     ikm = B("0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b")
     salt = B("")
@@ -160,7 +158,6 @@ def test_hkdf_rfc5869_test_case_3
   end
 
   def test_hkdf_rfc5869_test_case_4
-    pend "HKDF is not implemented" unless OpenSSL::KDF.respond_to?(:hkdf) # OpenSSL >= 1.1.0
     hash = "sha1"
     ikm = B("0b0b0b0b0b0b0b0b0b0b0b")
     salt = B("000102030405060708090a0b0c")
diff --git a/test/openssl/test_ocsp.rb b/test/openssl/test_ocsp.rb
index 85f133752cb660..cf96fc22e515ba 100644
--- a/test/openssl/test_ocsp.rb
+++ b/test/openssl/test_ocsp.rb
@@ -228,7 +228,7 @@ def test_basic_response_response_operations
     assert_equal OpenSSL::OCSP::V_CERTSTATUS_REVOKED, single.cert_status
     assert_equal OpenSSL::OCSP::REVOKED_STATUS_UNSPECIFIED, single.revocation_reason
     assert_equal now - 400, single.revocation_time
-    assert_in_delta (now - 301), single.this_update, 1
+    assert_in_delta (now - 300), single.this_update, 1
     assert_equal nil, single.next_update
     assert_equal [], single.extensions
 
diff --git a/test/openssl/test_ossl.rb b/test/openssl/test_ossl.rb
index 979669a00394e1..9f4b39d4f52ba4 100644
--- a/test/openssl/test_ossl.rb
+++ b/test/openssl/test_ossl.rb
@@ -1,8 +1,6 @@
 # frozen_string_literal: true
 require_relative "utils"
 
-require 'benchmark'
-
 if defined?(OpenSSL)
 
 class OpenSSL::OSSL < OpenSSL::SSLTestCase
@@ -54,8 +52,14 @@ def test_memcmp_timing
 
     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
+      t1 = Process.clock_gettime(Process::CLOCK_MONOTONIC)
+      100.times { OpenSSL.fixed_length_secure_compare(a, b) }
+      t2 = Process.clock_gettime(Process::CLOCK_MONOTONIC)
+      100.times { OpenSSL.fixed_length_secure_compare(a, c) }
+      t3 = Process.clock_gettime(Process::CLOCK_MONOTONIC)
+
+      a_b_time += t2 - t1
+      a_c_time += t3 - t2
     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")
diff --git a/test/openssl/test_pair.rb b/test/openssl/test_pair.rb
index 14786100df5177..10942191dd7614 100644
--- a/test/openssl/test_pair.rb
+++ b/test/openssl/test_pair.rb
@@ -101,6 +101,27 @@ def test_getc
     }
   end
 
+  def test_getbyte
+    ssl_pair {|s1, s2|
+      s1 << "a"
+      assert_equal(97, s2.getbyte)
+    }
+  end
+
+  def test_readbyte
+    ssl_pair {|s1, s2|
+      s1 << "b"
+      assert_equal(98, s2.readbyte)
+    }
+  end
+
+  def test_readbyte_eof
+    ssl_pair {|s1, s2|
+      s2.close
+      assert_raise(EOFError) { s1.readbyte }
+    }
+  end
+
   def test_gets
     ssl_pair {|s1, s2|
       s1 << "abc\n\n$def123ghi"
@@ -115,6 +136,17 @@ def test_gets
     }
   end
 
+  def test_gets_chomp
+    ssl_pair {|s1, s2|
+      s1 << "line1\r\nline2\r\nline3\r\n"
+      s1.close
+
+      assert_equal("line1", s2.gets("\r\n", chomp: true))
+      assert_equal("line2\r\n", s2.gets("\r\n", chomp: false))
+      assert_equal("line3", s2.gets(chomp: true))
+    }
+  end
+
   def test_gets_eof_limit
     ssl_pair {|s1, s2|
       s1.write("hello")
@@ -239,12 +271,17 @@ def test_read_with_outbuf
 
       buf = +"garbage"
       assert_equal :wait_readable, s2.read_nonblock(100, buf, exception: false)
-      assert_equal "", buf
+      assert_equal "garbage", buf
 
       s1.close
       buf = +"garbage"
-      assert_equal nil, s2.read(100, buf)
+      assert_nil s2.read(100, buf)
       assert_equal "", buf
+
+      buf = +"garbage"
+      ret = s2.read(0, buf)
+      assert_same buf, ret
+      assert_equal "", ret
     }
   end
 
diff --git a/test/openssl/test_pkcs12.rb b/test/openssl/test_pkcs12.rb
index e6b91b52afbb7e..1b5328774e4f2a 100644
--- a/test/openssl/test_pkcs12.rb
+++ b/test/openssl/test_pkcs12.rb
@@ -159,7 +159,6 @@ def test_create_with_mac_itr
         DEFAULT_PBE_PKEYS,
         DEFAULT_PBE_CERTS,
         nil,
-        nil,
         2048
       )
 
@@ -178,6 +177,38 @@ def test_create_with_mac_itr
       end
     end
 
+    def test_create_with_keytype
+      omit "AWS-LC does not support KEY_SIG and KEY_EX" if aws_lc?
+
+      OpenSSL::PKCS12.create(
+        "omg",
+        "hello",
+        @mykey,
+        @mycert,
+        [],
+        DEFAULT_PBE_PKEYS,
+        DEFAULT_PBE_CERTS,
+        nil,
+        nil,
+        OpenSSL::PKCS12::KEY_SIG
+      )
+
+      assert_raise(ArgumentError) do
+        OpenSSL::PKCS12.create(
+          "omg",
+          "hello",
+          @mykey,
+          @mycert,
+          [],
+          DEFAULT_PBE_PKEYS,
+          DEFAULT_PBE_CERTS,
+          nil,
+          nil,
+          2048
+        )
+      end
+    end
+
     def test_new_with_no_keys
       # generated with:
       #   openssl pkcs12 -certpbe PBE-SHA1-3DES -in <@mycert> -nokeys -export
@@ -308,6 +339,48 @@ def test_dup
       )
       assert_equal p12.to_der, p12.dup.to_der
     end
+
+    def test_set_mac_pkcs12kdf
+      p12 = OpenSSL::PKCS12.create(
+        "pass",
+        "name",
+        @mykey,
+        @mycert,
+        nil,
+        nil,
+        nil,
+        nil,
+        1234, # mac_iter
+        nil,
+      )
+      macdata = macdata(p12)
+      # Depends on the OpenSSL version: SHA256 in OpenSSL >= 3.0
+      assert_include ["SHA1", "SHA256"], macdata[:mac_algo]
+      assert_equal 1234, macdata[:iter]
+
+      p12.set_mac("pass", "macsalt", 2345, "SHA384")
+      macdata = macdata(p12)
+      assert_equal "SHA384", macdata[:mac_algo]
+      assert_equal "macsalt", macdata[:salt]
+      assert_equal 2345, macdata[:iter]
+      assert_equal @mykey.to_der, OpenSSL::PKCS12.new(p12.to_der, "pass").key.to_der
+    end
+
+    private
+
+    def macdata(p12)
+      # See RFC 7292
+      asn1 = OpenSSL::ASN1.decode(p12.to_der)
+      macdata = asn1.value[2]
+      mac = macdata.value[0]
+      mac_algo = mac.value[0].value[0].value
+      _mac_params = mac.value[0].value[1]
+      {
+        mac_algo: mac_algo,
+        salt: macdata.value[1].value,
+        iter: macdata.value[2]&.value,
+      }
+    end
   end
 end
 
diff --git a/test/openssl/test_pkcs7.rb b/test/openssl/test_pkcs7.rb
index ba8b93d034ec79..5a52f4ce5f346b 100644
--- a/test/openssl/test_pkcs7.rb
+++ b/test/openssl/test_pkcs7.rb
@@ -46,13 +46,15 @@ def test_signed
     assert_equal(1, signers.size)
     assert_equal(@ee1_cert.serial, signers[0].serial)
     assert_equal(@ee1_cert.issuer.to_s, signers[0].issuer.to_s)
+    # AWS-LC does not generate authenticatedAttributes
+    assert_in_delta(Time.now, signers[0].signed_time, 10) unless aws_lc?
 
     # Normally OpenSSL tries to translate the supplied content into canonical
     # MIME format (e.g. a newline character is converted into CR+LF).
     # If the content is a binary, PKCS7::BINARY flag should be used.
 
     data = "aaaaa\nbbbbb\nccccc\n"
-    flag = OpenSSL::PKCS7::BINARY
+    flag = OpenSSL::PKCS7::BINARY | OpenSSL::PKCS7::NOATTR
     tmp = OpenSSL::PKCS7.sign(@ee1_cert, @rsa1024, data, ca_certs, flag)
     p7 = OpenSSL::PKCS7.new(tmp.to_der)
     certs = p7.certificates
@@ -65,6 +67,7 @@ def test_signed
     assert_equal(1, signers.size)
     assert_equal(@ee1_cert.serial, signers[0].serial)
     assert_equal(@ee1_cert.issuer.to_s, signers[0].issuer.to_s)
+    assert_raise(OpenSSL::PKCS7::PKCS7Error) { signers[0].signed_time }
 
     # A signed-data which have multiple signatures can be created
     # through the following steps.
@@ -133,6 +136,50 @@ def test_detached_sign
     assert_equal(@ee1_cert.issuer.to_s, signers[0].issuer.to_s)
   end
 
+  def test_signed_authenticated_attributes
+    # Using static PEM data because AWS-LC does not support generating one
+    # with authenticatedAttributes.
+    #
+    # p7 was generated with OpenSSL 3.4.1 with this program with commandline
+    # "faketime 2025-04-03Z ruby prog.rb":
+    #
+    #   require_relative "test/openssl/utils"
+    #   include OpenSSL::TestUtils
+    #   key = Fixtures.pkey("p256")
+    #   cert = issue_cert(OpenSSL::X509::Name.new([["CN", "cert"]]), key, 1, [], nil, nil)
+    #   p7 = OpenSSL::PKCS7.sign(cert, key, "content", [])
+    #   puts p7.to_pem
+    p7 = OpenSSL::PKCS7.new(<<~EOF)
+-----BEGIN PKCS7-----
+MIICvgYJKoZIhvcNAQcCoIICrzCCAqsCAQExDzANBglghkgBZQMEAgEFADAWBgkq
+hkiG9w0BBwGgCQQHY29udGVudKCCAQ4wggEKMIGxoAMCAQICAQEwCgYIKoZIzj0E
+AwIwDzENMAsGA1UEAwwEY2VydDAeFw0yNTA0MDIyMzAwMDFaFw0yNTA0MDMwMTAw
+MDFaMA8xDTALBgNVBAMMBGNlcnQwWTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAQW
+CWTZz6hVQgpDrh5kb1uEs09YHuVJn8CsrjV4bLnADNT/QbnVe20J4FSX4xqFm2f1
+87Ukp0XiomZLf11eekQ2MAoGCCqGSM49BAMCA0gAMEUCIEg1fDI8b3hZAArgniVk
+HeM6puwgcMh5NXwvJ9x0unVmAiEAppecVTSQ+yEPyBG415Og6sK+RC78pcByEC81
+C/QSwRYxggFpMIIBZQIBATAUMA8xDTALBgNVBAMMBGNlcnQCAQEwDQYJYIZIAWUD
+BAIBBQCggeQwGAYJKoZIhvcNAQkDMQsGCSqGSIb3DQEHATAcBgkqhkiG9w0BCQUx
+DxcNMjUwNDAzMDAwMDAxWjAvBgkqhkiG9w0BCQQxIgQg7XACtDnprIRfIjV9gius
+FERzD722AW0+yUMil7nsn3MweQYJKoZIhvcNAQkPMWwwajALBglghkgBZQMEASow
+CwYJYIZIAWUDBAEWMAsGCWCGSAFlAwQBAjAKBggqhkiG9w0DBzAOBggqhkiG9w0D
+AgICAIAwDQYIKoZIhvcNAwICAUAwBwYFKw4DAgcwDQYIKoZIhvcNAwICASgwCgYI
+KoZIzj0EAwIESDBGAiEAssymc28HySAhg+XeWIpSbtzkwycr2JG6dzHRZ+vn0ocC
+IQCJVpo1FTLZOHSc9UpjS+VKR4cg50Iz0HiPyo6hwjCrwA==
+-----END PKCS7-----
+    EOF
+
+    cert = p7.certificates[0]
+    store = OpenSSL::X509::Store.new.tap { |store|
+      store.time = Time.utc(2025, 4, 3)
+      store.add_cert(cert)
+    }
+    assert_equal(true, p7.verify([], store))
+    assert_equal(1, p7.signers.size)
+    signer = p7.signers[0]
+    assert_in_delta(Time.utc(2025, 4, 3), signer.signed_time, 10)
+  end
+
   def test_enveloped
     certs = [@ee1_cert, @ee2_cert]
     cipher = OpenSSL::Cipher::AES.new("128-CBC")
@@ -153,10 +200,58 @@ def test_enveloped
     assert_equal(data, p7.decrypt(@rsa1024, @ee2_cert))
 
     assert_equal(data, p7.decrypt(@rsa1024))
+
+    # Default cipher has been removed in v3.3
+    assert_raise_with_message(ArgumentError, /RC2-40-CBC/) {
+      OpenSSL::PKCS7.encrypt(certs, data)
+    }
+  end
+
+  def test_data
+    asn1 = OpenSSL::ASN1::Sequence([
+      OpenSSL::ASN1::ObjectId("pkcs7-data"),
+      OpenSSL::ASN1::OctetString("content", 0, :EXPLICIT),
+    ])
+    p7 = OpenSSL::PKCS7.new
+    p7.type = :data
+    p7.data = "content"
+    assert_raise(OpenSSL::PKCS7::PKCS7Error) { p7.add_certificate(@ee1_cert) }
+    assert_raise(OpenSSL::PKCS7::PKCS7Error) { p7.certificates = [@ee1_cert] }
+    assert_raise(OpenSSL::PKCS7::PKCS7Error) { p7.cipher = "aes-128-cbc" }
+    assert_equal(asn1.to_der, p7.to_der)
+
+    p7 = OpenSSL::PKCS7.new(asn1)
+    assert_equal(:data, p7.type)
+    assert_equal(false, p7.detached?)
+    # Not applicable
+    assert_nil(p7.certificates)
+    assert_nil(p7.crls)
+    # Not applicable. Should they return nil or raise an exception instead?
+    assert_equal([], p7.signers)
+    assert_equal([], p7.recipients)
+    # PKCS7#verify can't distinguish verification failure and other errors
+    store = OpenSSL::X509::Store.new
+    assert_equal(false, p7.verify([@ee1_cert], store))
+    assert_raise(OpenSSL::PKCS7::PKCS7Error) { p7.decrypt(@rsa1024) }
+  end
+
+  def test_empty_signed_data_ruby_bug_19974
+    data = "-----BEGIN PKCS7-----\nMAsGCSqGSIb3DQEHAg==\n-----END PKCS7-----\n"
+    assert_raise(ArgumentError) { OpenSSL::PKCS7.new(data) }
+
+    data = <<END
+MIME-Version: 1.0
+Content-Disposition: attachment; filename="smime.p7m"
+Content-Type: application/x-pkcs7-mime; smime-type=signed-data; name="smime.p7m"
+Content-Transfer-Encoding: base64
+
+#{data}
+END
+    assert_raise(OpenSSL::PKCS7::PKCS7Error) { OpenSSL::PKCS7.read_smime(data) }
   end
 
   def test_graceful_parsing_failure #[ruby-core:43250]
-    contents = File.read(__FILE__)
+    contents = "not a valid PKCS #7 PEM block"
     assert_raise(ArgumentError) { OpenSSL::PKCS7.new(contents) }
   end
 
@@ -191,6 +286,8 @@ def test_set_type_encrypted
   end
 
   def test_smime
+    pend "AWS-LC has no current support for SMIME with PKCS7" if aws_lc?
+
     store = OpenSSL::X509::Store.new
     store.add_cert(@ca_cert)
     ca_certs = [@ca_cert]
@@ -212,6 +309,14 @@ def test_smime
     assert_equal(p7.to_der, OpenSSL::PKCS7.read_smime(smime).to_der)
   end
 
+  def test_to_text
+    omit "AWS-LC does not support PKCS7.to_text" if aws_lc?
+
+    p7 = OpenSSL::PKCS7.new
+    p7.type = "signed"
+    assert_match(/signed/, p7.to_text)
+  end
+
   def test_degenerate_pkcs7
     ca_cert_pem = <<END
 -----BEGIN CERTIFICATE-----
@@ -249,78 +354,32 @@ def test_degenerate_pkcs7
     end
   end
 
-  def test_split_content
-     pki_message_pem = <<END
------BEGIN PKCS7-----
-MIIHSwYJKoZIhvcNAQcCoIIHPDCCBzgCAQExCzAJBgUrDgMCGgUAMIIDiAYJKoZI
-hvcNAQcBoIIDeQSCA3UwgAYJKoZIhvcNAQcDoIAwgAIBADGCARAwggEMAgEAMHUw
-cDEQMA4GA1UECgwHZXhhbXBsZTEXMBUGA1UEAwwOVEFSTUFDIFJPT1QgQ0ExIjAg
-BgkqhkiG9w0BCQEWE3NvbWVvbmVAZXhhbXBsZS5vcmcxCzAJBgNVBAYTAlVTMRIw
-EAYDVQQHDAlUb3duIEhhbGwCAWYwDQYJKoZIhvcNAQEBBQAEgYBspXXse8ZhG1FE
-E3PVAulbvrdR52FWPkpeLvSjgEkYzTiUi0CC3poUL1Ku5mOlavWAJgoJpFICDbvc
-N4ZNDCwOhnzoI9fMGmm1gvPQy15BdhhZRo9lP7Ga/Hg2APKT0/0yhPsmJ+w+u1e7
-OoJEVeEZ27x3+u745bGEcu8of5th6TCABgkqhkiG9w0BBwEwFAYIKoZIhvcNAwcE
-CBNs2U5mMsd/oIAEggIQU6cur8QBz02/4eMpHdlU9IkyrRMiaMZ/ky9zecOAjnvY
-d2jZqS7RhczpaNJaSli3GmDsKrF+XqE9J58s9ScGqUigzapusTsxIoRUPr7Ztb0a
-pg8VWDipAsuw7GfEkgx868sV93uC4v6Isfjbhd+JRTFp/wR1kTi7YgSXhES+RLUW
-gQbDIDgEQYxJ5U951AJtnSpjs9za2ZkTdd8RSEizJK0bQ1vqLoApwAVgZqluATqQ
-AHSDCxhweVYw6+y90B9xOrqPC0eU7Wzryq2+Raq5ND2Wlf5/N11RQ3EQdKq/l5Te
-ijp9PdWPlkUhWVoDlOFkysjk+BE+7AkzgYvz9UvBjmZsMsWqf+KsZ4S8/30ndLzu
-iucsu6eOnFLLX8DKZxV6nYffZOPzZZL8hFBcE7PPgSdBEkazMrEBXq1j5mN7exbJ
-NOA5uGWyJNBMOCe+1JbxG9UeoqvCCTHESxEeDu7xR3NnSOD47n7cXwHr81YzK2zQ
-5oWpP3C8jzI7tUjLd1S0Z3Psd17oaCn+JOfUtuB0nc3wfPF/WPo0xZQodWxp2/Cl
-EltR6qr1zf5C7GwmLzBZ6bHFAIT60/JzV0/56Pn8ztsRFtI4cwaBfTfvnwi8/sD9
-/LYOMY+/b6UDCUSR7RTN7XfrtAqDEzSdzdJkOWm1jvM8gkLmxpZdvxG3ZvDYnEQE
-5Nq+un5nAny1wf3rWierBAjE5ntiAmgs5AAAAAAAAAAAAACgggHqMIIB5jCCAU+g
-AwIBAgIBATANBgkqhkiG9w0BAQUFADAvMS0wKwYDVQQDEyQwQUM5RjAyNi1EQ0VB
-LTRDMTItOTEyNy1DMEZEN0QyQThCNUEwHhcNMTIxMDE5MDk0NTQ3WhcNMTMxMDE5
-MDk0NTQ3WjAvMS0wKwYDVQQDEyQwQUM5RjAyNi1EQ0VBLTRDMTItOTEyNy1DMEZE
-N0QyQThCNUEwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBALTsTNyGIsKvyw56
-WI3Gll/RmjsupkrdEtPbx7OjS9MEgyhOAf9+u6CV0LJGHpy7HUeROykF6xpbSdCm
-Mr6kNObl5N0ljOb8OmV4atKjmGg1rWawDLyDQ9Dtuby+dzfHtzAzP+J/3ZoOtSqq
-AHVTnCclU1pm/uHN0HZ5nL5iLJTvAgMBAAGjEjAQMA4GA1UdDwEB/wQEAwIFoDAN
-BgkqhkiG9w0BAQUFAAOBgQA8K+BouEV04HRTdMZd3akjTQOm6aEGW4nIRnYIf8ZV
-mvUpLirVlX/unKtJinhGisFGpuYLMpemx17cnGkBeLCQRvHQjC+ho7l8/LOGheMS
-nvu0XHhvmJtRbm8MKHhogwZqHFDnXonvjyqhnhEtK5F2Fimcce3MoF2QtEe0UWv/
-8DGCAaowggGmAgEBMDQwLzEtMCsGA1UEAxMkMEFDOUYwMjYtRENFQS00QzEyLTkx
-MjctQzBGRDdEMkE4QjVBAgEBMAkGBSsOAwIaBQCggc0wEgYKYIZIAYb4RQEJAjEE
-EwIxOTAYBgkqhkiG9w0BCQMxCwYJKoZIhvcNAQcBMBwGCSqGSIb3DQEJBTEPFw0x
-MjEwMTkwOTQ1NDdaMCAGCmCGSAGG+EUBCQUxEgQQ2EFUJdQNwQDxclIQ8qNyYzAj
-BgkqhkiG9w0BCQQxFgQUy8GFXPpAwRJUT3rdvNC9Pn+4eoswOAYKYIZIAYb4RQEJ
-BzEqEygwRkU3QzJEQTVEMDc2NzFFOTcxNDlCNUE3MDRCMERDNkM4MDYwRDJBMA0G
-CSqGSIb3DQEBAQUABIGAWUNdzvU2iiQOtihBwF0h48Nnw/2qX8uRjg6CVTOMcGji
-BxjUMifEbT//KJwljshl4y3yBLqeVYLOd04k6aKSdjgdZnrnUPI6p5tL5PfJkTAE
-L6qflZ9YCU5erE4T5U98hCQBMh4nOYxgaTjnZzhpkKQuEiKq/755cjzTzlI/eok=
------END PKCS7-----
-END
-    pki_message_content_pem = <<END
------BEGIN PKCS7-----
-MIIDawYJKoZIhvcNAQcDoIIDXDCCA1gCAQAxggEQMIIBDAIBADB1MHAxEDAOBgNV
-BAoMB2V4YW1wbGUxFzAVBgNVBAMMDlRBUk1BQyBST09UIENBMSIwIAYJKoZIhvcN
-AQkBFhNzb21lb25lQGV4YW1wbGUub3JnMQswCQYDVQQGEwJVUzESMBAGA1UEBwwJ
-VG93biBIYWxsAgFmMA0GCSqGSIb3DQEBAQUABIGAbKV17HvGYRtRRBNz1QLpW763
-UedhVj5KXi70o4BJGM04lItAgt6aFC9SruZjpWr1gCYKCaRSAg273DeGTQwsDoZ8
-6CPXzBpptYLz0MteQXYYWUaPZT+xmvx4NgDyk9P9MoT7JifsPrtXuzqCRFXhGdu8
-d/ru+OWxhHLvKH+bYekwggI9BgkqhkiG9w0BBwEwFAYIKoZIhvcNAwcECBNs2U5m
-Msd/gIICGFOnLq/EAc9Nv+HjKR3ZVPSJMq0TImjGf5Mvc3nDgI572Hdo2aku0YXM
-6WjSWkpYtxpg7Cqxfl6hPSefLPUnBqlIoM2qbrE7MSKEVD6+2bW9GqYPFVg4qQLL
-sOxnxJIMfOvLFfd7guL+iLH424XfiUUxaf8EdZE4u2IEl4REvkS1FoEGwyA4BEGM
-SeVPedQCbZ0qY7Pc2tmZE3XfEUhIsyStG0Nb6i6AKcAFYGapbgE6kAB0gwsYcHlW
-MOvsvdAfcTq6jwtHlO1s68qtvkWquTQ9lpX+fzddUUNxEHSqv5eU3oo6fT3Vj5ZF
-IVlaA5ThZMrI5PgRPuwJM4GL8/VLwY5mbDLFqn/irGeEvP99J3S87ornLLunjpxS
-y1/AymcVep2H32Tj82WS/IRQXBOzz4EnQRJGszKxAV6tY+Zje3sWyTTgObhlsiTQ
-TDgnvtSW8RvVHqKrwgkxxEsRHg7u8UdzZ0jg+O5+3F8B6/NWMyts0OaFqT9wvI8y
-O7VIy3dUtGdz7Hde6Ggp/iTn1LbgdJ3N8Hzxf1j6NMWUKHVsadvwpRJbUeqq9c3+
-QuxsJi8wWemxxQCE+tPyc1dP+ej5/M7bERbSOHMGgX03758IvP7A/fy2DjGPv2+l
-AwlEke0Uze1367QKgxM0nc3SZDlptY7zPIJC5saWXb8Rt2bw2JxEBOTavrp+ZwJ8
-tcH961onq8Tme2ICaCzk
------END PKCS7-----
-END
-    pki_msg = OpenSSL::PKCS7.new(pki_message_pem)
-    store = OpenSSL::X509::Store.new
-    pki_msg.verify(nil, store, nil, OpenSSL::PKCS7::NOVERIFY)
-    p7enc = OpenSSL::PKCS7.new(pki_msg.data)
-    assert_equal(pki_message_content_pem, p7enc.to_pem)
+  def test_decode_ber_constructed_string
+    p7 = OpenSSL::PKCS7.encrypt([@ee1_cert], "content", "aes-128-cbc")
+
+    # Make an equivalent BER to p7.to_der. Here we convert the encryptedContent
+    # field of EncryptedContentInfo into a constructed encoding using the
+    # indefinite length form.
+    # See https://www.rfc-editor.org/rfc/rfc2315#section-10.1
+    asn1 = OpenSSL::ASN1.decode(p7.to_der)
+    asn1.indefinite_length = true
+    enveloped_data_explicit_tag = asn1.value[1]
+    enveloped_data_explicit_tag.indefinite_length = true
+    enveloped_data = enveloped_data_explicit_tag.value[0]
+    enveloped_data.indefinite_length = true
+    encrypted_content_info = enveloped_data.value[2]
+    encrypted_content_info.indefinite_length = true
+    orig = encrypted_content_info.value[2]
+    encrypted_content_info.value[2] = OpenSSL::ASN1::ASN1Data.new([
+      OpenSSL::ASN1::OctetString(orig.value[...5]),
+      OpenSSL::ASN1::OctetString(orig.value[5...]),
+    ], 0, :CONTEXT_SPECIFIC).tap { |x| x.indefinite_length = true }
+
+    assert_not_equal(p7.to_der, asn1.to_der)
+    assert_equal(p7.to_der, OpenSSL::PKCS7.new(asn1.to_der).to_der)
+
+    assert_equal("content", OpenSSL::PKCS7.new(p7.to_der).decrypt(@rsa1024))
+    assert_equal("content", OpenSSL::PKCS7.new(asn1.to_der).decrypt(@rsa1024))
   end
 end
 
diff --git a/test/openssl/test_pkey.rb b/test/openssl/test_pkey.rb
index 5fe37e2d6426d1..71f5da81d145e7 100644
--- a/test/openssl/test_pkey.rb
+++ b/test/openssl/test_pkey.rb
@@ -2,28 +2,13 @@
 require_relative "utils"
 
 class OpenSSL::TestPKey < OpenSSL::PKeyTestCase
-  def test_generic_oid_inspect
+  def test_generic_oid_inspect_rsa
     # RSA private key
     rsa = Fixtures.pkey("rsa-1")
     assert_instance_of OpenSSL::PKey::RSA, rsa
     assert_equal "rsaEncryption", rsa.oid
     assert_match %r{oid=rsaEncryption}, rsa.inspect
-
-    # X25519 private key
-    x25519_pem = <<~EOF
-    -----BEGIN PRIVATE KEY-----
-    MC4CAQAwBQYDK2VuBCIEIHcHbQpzGKV9PBbBclGyZkXfTC+H68CZKrF3+6UduSwq
-    -----END PRIVATE KEY-----
-    EOF
-    begin
-      x25519 = OpenSSL::PKey.read(x25519_pem)
-    rescue OpenSSL::PKey::PKeyError
-      # OpenSSL < 1.1.0
-      pend "X25519 is not implemented"
-    end
-    assert_instance_of OpenSSL::PKey::PKey, x25519
-    assert_equal "X25519", x25519.oid
-    assert_match %r{oid=X25519}, x25519.inspect
+    assert_match %r{type_name=RSA}, rsa.inspect if openssl?(3, 0, 0)
   end
 
   def test_s_generate_parameters
@@ -38,6 +23,12 @@ def test_s_generate_parameters
     assert_raise(OpenSSL::PKey::PKeyError) {
       OpenSSL::PKey.generate_parameters("EC", "invalid" => "option")
     }
+  end
+
+  def test_s_generate_parameters_with_block
+    # DSA kengen is not FIPS-approved.
+    # https://github.com/openssl/openssl/commit/49a35f0#diff-605396c063194975af8ce31399d42690ab18186b422fb5012101cc9132660fe1R611-R614
+    omit_on_fips
 
     # Parameter generation callback is called
     if openssl?(3, 0, 0, 0) && !openssl?(3, 0, 0, 6)
@@ -82,6 +73,9 @@ def test_hmac_sign_verify
   end
 
   def test_ed25519
+    # Ed25519 is not FIPS-approved.
+    omit_on_fips
+
     # Test vector from RFC 8032 Section 7.1 TEST 2
     priv_pem = <<~EOF
     -----BEGIN PRIVATE KEY-----
@@ -93,37 +87,22 @@ def test_ed25519
     MCowBQYDK2VwAyEAPUAXw+hDiVqStwqnTRt+vJyYLM8uxJaMwM1V8Sr0Zgw=
     -----END PUBLIC KEY-----
     EOF
-    begin
-      priv = OpenSSL::PKey.read(priv_pem)
-      pub = OpenSSL::PKey.read(pub_pem)
-    rescue OpenSSL::PKey::PKeyError
-      # OpenSSL < 1.1.1
-      if !openssl?(1, 1, 1)
-        pend "Ed25519 is not implemented"
-      elsif OpenSSL.fips_mode && openssl?(3, 1, 0, 0)
-        # See OpenSSL providers/fips/fipsprov.c PROV_NAMES_ED25519 entries
-        # with FIPS_UNAPPROVED_PROPERTIES in OpenSSL 3.1+.
-        pend "Ed25519 is not approved in OpenSSL 3.1+ FIPS code"
-      end
-    end
+    priv = OpenSSL::PKey.read(priv_pem)
+    pub = OpenSSL::PKey.read(pub_pem)
     assert_instance_of OpenSSL::PKey::PKey, priv
     assert_instance_of OpenSSL::PKey::PKey, pub
     assert_equal priv_pem, priv.private_to_pem
     assert_equal pub_pem, priv.public_to_pem
     assert_equal pub_pem, pub.public_to_pem
 
-    begin
-      assert_equal "4ccd089b28ff96da9db6c346ec114e0f5b8a319f35aba624da8cf6ed4fb8a6fb",
-        priv.raw_private_key.unpack1("H*")
-      assert_equal OpenSSL::PKey.new_raw_private_key("ED25519", priv.raw_private_key).private_to_pem,
-        priv.private_to_pem
-      assert_equal "3d4017c3e843895a92b70aa74d1b7ebc9c982ccf2ec4968cc0cd55f12af4660c",
-        priv.raw_public_key.unpack1("H*")
-      assert_equal OpenSSL::PKey.new_raw_public_key("ED25519", priv.raw_public_key).public_to_pem,
-        pub.public_to_pem
-    rescue NoMethodError
-      pend "running OpenSSL version does not have raw public key support"
-    end
+    assert_equal "4ccd089b28ff96da9db6c346ec114e0f5b8a319f35aba624da8cf6ed4fb8a6fb",
+      priv.raw_private_key.unpack1("H*")
+    assert_equal OpenSSL::PKey.new_raw_private_key("ED25519", priv.raw_private_key).private_to_pem,
+      priv.private_to_pem
+    assert_equal "3d4017c3e843895a92b70aa74d1b7ebc9c982ccf2ec4968cc0cd55f12af4660c",
+      priv.raw_public_key.unpack1("H*")
+    assert_equal OpenSSL::PKey.new_raw_public_key("ED25519", priv.raw_public_key).public_to_pem,
+      pub.public_to_pem
 
     sig = [<<~EOF.gsub(/[^0-9a-f]/, "")].pack("H*")
     92a009a9f0d4cab8720e820b5f642540
@@ -146,6 +125,8 @@ def test_ed25519
   end
 
   def test_x25519
+    omit_on_fips
+
     # Test vector from RFC 7748 Section 6.1
     alice_pem = <<~EOF
     -----BEGIN PRIVATE KEY-----
@@ -158,39 +139,48 @@ def test_x25519
     -----END PUBLIC KEY-----
     EOF
     shared_secret = "4a5d9d5ba4ce2de1728e3bf480350f25e07e21c947d19e3376f09b3c1e161742"
-    begin
-      alice = OpenSSL::PKey.read(alice_pem)
-      bob = OpenSSL::PKey.read(bob_pem)
-    rescue OpenSSL::PKey::PKeyError
-      # OpenSSL < 1.1.0
-      pend "X25519 is not implemented"
-    end
+
+    alice = OpenSSL::PKey.read(alice_pem)
+    bob = OpenSSL::PKey.read(bob_pem)
     assert_instance_of OpenSSL::PKey::PKey, alice
+    assert_equal "X25519", alice.oid
+    assert_match %r{oid=X25519}, alice.inspect
     assert_equal alice_pem, alice.private_to_pem
     assert_equal bob_pem, bob.public_to_pem
     assert_equal [shared_secret].pack("H*"), alice.derive(bob)
-    begin
-      alice_private = OpenSSL::PKey.new_raw_private_key("X25519", alice.raw_private_key)
-      bob_public = OpenSSL::PKey.new_raw_public_key("X25519", bob.raw_public_key)
-      alice_private_raw = alice.raw_private_key.unpack1("H*")
-      bob_public_raw = bob.raw_public_key.unpack1("H*")
-    rescue NoMethodError
-      # OpenSSL < 1.1.1
-      pend "running OpenSSL version does not have raw public key support"
-    end
+
+    alice_private = OpenSSL::PKey.new_raw_private_key("X25519", alice.raw_private_key)
+    bob_public = OpenSSL::PKey.new_raw_public_key("X25519", bob.raw_public_key)
     assert_equal alice_private.private_to_pem,
       alice.private_to_pem
     assert_equal bob_public.public_to_pem,
       bob.public_to_pem
     assert_equal "77076d0a7318a57d3c16c17251b26645df4c2f87ebc0992ab177fba51db92c2a",
-      alice_private_raw
+      alice.raw_private_key.unpack1("H*")
     assert_equal "de9edb7d7b7dc1b4d35b61c2ece435373f8343c85b78674dadfc7e146f882b4f",
-      bob_public_raw
+      bob.raw_public_key.unpack1("H*")
   end
 
-  def raw_initialize
-    pend "Ed25519 is not implemented" unless openssl?(1, 1, 1) # >= v1.1.1
+  def test_ml_dsa
+    # AWS-LC also supports ML-DSA, but it's implemented in a different way
+    return unless openssl?(3, 5, 0)
+
+    pkey = OpenSSL::PKey.generate_key("ML-DSA-44")
+    assert_match(/type_name=ML-DSA-44/, pkey.inspect)
+    sig = pkey.sign(nil, "data")
+    assert_equal(2420, sig.bytesize)
+    assert_equal(true, pkey.verify(nil, sig, "data"))
+
+    pub2 = OpenSSL::PKey.read(pkey.public_to_der)
+    assert_equal(true, pub2.verify(nil, sig, "data"))
+
+    raw_public_key = pkey.raw_public_key
+    assert_equal(1312, raw_public_key.bytesize)
+    pub3 = OpenSSL::PKey.new_raw_public_key("ML-DSA-44", raw_public_key)
+    assert_equal(true, pub3.verify(nil, sig, "data"))
+  end
 
+  def test_raw_initialize_errors
     assert_raise(OpenSSL::PKey::PKeyError) { OpenSSL::PKey.new_raw_private_key("foo123", "xxx") }
     assert_raise(OpenSSL::PKey::PKeyError) { OpenSSL::PKey.new_raw_private_key("ED25519", "xxx") }
     assert_raise(OpenSSL::PKey::PKeyError) { OpenSSL::PKey.new_raw_public_key("foo123", "xxx") }
diff --git a/test/openssl/test_pkey_dh.rb b/test/openssl/test_pkey_dh.rb
index 161af1897bd1c4..cf56032cb3048b 100644
--- a/test/openssl/test_pkey_dh.rb
+++ b/test/openssl/test_pkey_dh.rb
@@ -19,14 +19,21 @@ def test_new_generate
   end if ENV["OSSL_TEST_ALL"]
 
   def test_new_break
-    assert_nil(OpenSSL::PKey::DH.new(NEW_KEYLEN) { break })
-    assert_raise(RuntimeError) do
-      OpenSSL::PKey::DH.new(NEW_KEYLEN) { raise }
+    unless openssl? && OpenSSL.fips_mode
+      assert_nil(OpenSSL::PKey::DH.new(NEW_KEYLEN) { break })
+      assert_raise(RuntimeError) do
+        OpenSSL::PKey::DH.new(NEW_KEYLEN) { raise }
+      end
+    else
+      # The block argument is not executed in FIPS case.
+      # See https://github.com/ruby/openssl/issues/692 for details.
+      assert(OpenSSL::PKey::DH.new(NEW_KEYLEN) { break })
+      assert(OpenSSL::PKey::DH.new(NEW_KEYLEN) { raise })
     end
   end
 
   def test_derive_key
-    params = Fixtures.pkey("dh1024")
+    params = Fixtures.pkey("dh2048_ffdhe2048")
     dh1 = OpenSSL::PKey.generate_key(params)
     dh2 = OpenSSL::PKey.generate_key(params)
     dh1_pub = OpenSSL::PKey.read(dh1.public_to_der)
@@ -44,34 +51,38 @@ def test_derive_key
   end
 
   def test_DHparams
-    dh1024 = Fixtures.pkey("dh1024")
-    dh1024params = dh1024.public_key
+    dh = Fixtures.pkey("dh2048_ffdhe2048")
+    dh_params = dh.public_key
 
     asn1 = OpenSSL::ASN1::Sequence([
-      OpenSSL::ASN1::Integer(dh1024.p),
-      OpenSSL::ASN1::Integer(dh1024.g)
+      OpenSSL::ASN1::Integer(dh.p),
+      OpenSSL::ASN1::Integer(dh.g)
     ])
     key = OpenSSL::PKey::DH.new(asn1.to_der)
-    assert_same_dh dh1024params, key
+    assert_same_dh dh_params, key
 
     pem = <<~EOF
     -----BEGIN DH PARAMETERS-----
-    MIGHAoGBAKnKQ8MNK6nYZzLrrcuTsLxuiJGXoOO5gT+tljOTbHBuiktdMTITzIY0
-    pFxIvjG05D7HoBZQfrR0c92NGWPkAiCkhQKB8JCbPVzwNLDy6DZ0pmofDKrEsYHG
-    AQjjxMXhwULlmuR/K+WwlaZPiLIBYalLAZQ7ZbOPeVkJ8ePao0eLAgEC
+    MIIBCAKCAQEA//////////+t+FRYortKmq/cViAnPTzx2LnFg84tNpWp4TZBFGQz
+    +8yTnc4kmz75fS/jY2MMddj2gbICrsRhetPfHtXV/WVhJDP1H18GbtCFY2VVPe0a
+    87VXE15/V8k1mE8McODmi3fipona8+/och3xWKE2rec1MKzKT0g6eXq8CrGCsyT7
+    YdEIqUuyyOP7uWrat2DX9GgdT0Kj3jlN9K5W7edjcrsZCwenyO4KbXCeAvzhzffi
+    7MA0BM0oNC9hkXL+nOmFg/+OTxIy7vKBg8P+OxtMb61zO7X8vC7CIAXFjvGDfRaD
+    ssbzSibBsu/6iGtCOGEoXJf//////////wIBAg==
     -----END DH PARAMETERS-----
     EOF
+
     key = OpenSSL::PKey::DH.new(pem)
-    assert_same_dh dh1024params, key
+    assert_same_dh dh_params, key
     key = OpenSSL::PKey.read(pem)
-    assert_same_dh dh1024params, key
+    assert_same_dh dh_params, key
 
-    assert_equal asn1.to_der, dh1024.to_der
-    assert_equal pem, dh1024.export
+    assert_equal asn1.to_der, dh.to_der
+    assert_equal pem, dh.export
   end
 
   def test_public_key
-    dh = Fixtures.pkey("dh1024")
+    dh = Fixtures.pkey("dh2048_ffdhe2048")
     public_key = dh.public_key
     assert_no_key(public_key) #implies public_key.public? is false!
     assert_equal(dh.to_der, public_key.to_der)
@@ -80,7 +91,8 @@ def test_public_key
 
   def test_generate_key
     # Deprecated in v3.0.0; incompatible with OpenSSL 3.0
-    dh = Fixtures.pkey("dh1024").public_key # creates a copy with params only
+    # Creates a copy with params only
+    dh = Fixtures.pkey("dh2048_ffdhe2048").public_key
     assert_no_key(dh)
     dh.generate_key!
     assert_key(dh)
@@ -91,7 +103,15 @@ def test_generate_key
   end if !openssl?(3, 0, 0)
 
   def test_params_ok?
-    dh0 = Fixtures.pkey("dh1024")
+    # Skip the tests in old OpenSSL version 1.1.1c or early versions before
+    # applying the following commits in OpenSSL 1.1.1d to make `DH_check`
+    # function pass the RFC 7919 FFDHE group texts.
+    # https://github.com/openssl/openssl/pull/9435
+    if openssl? && !openssl?(1, 1, 1, 4)
+      pend 'DH check for RFC 7919 FFDHE group texts is not implemented'
+    end
+
+    dh0 = Fixtures.pkey("dh2048_ffdhe2048")
 
     dh1 = OpenSSL::PKey::DH.new(OpenSSL::ASN1::Sequence([
       OpenSSL::ASN1::Integer(dh0.p),
@@ -99,16 +119,46 @@ def test_params_ok?
     ]))
     assert_equal(true, dh1.params_ok?)
 
-    dh2 = OpenSSL::PKey::DH.new(OpenSSL::ASN1::Sequence([
-      OpenSSL::ASN1::Integer(dh0.p + 1),
-      OpenSSL::ASN1::Integer(dh0.g)
-    ]))
-    assert_equal(false, dh2.params_ok?)
+    # AWS-LC automatically does parameter checks on the parsed params.
+    if aws_lc?
+      assert_raise(OpenSSL::PKey::DHError) {
+        OpenSSL::PKey::DH.new(OpenSSL::ASN1::Sequence([
+          OpenSSL::ASN1::Integer(dh0.p + 1),
+          OpenSSL::ASN1::Integer(dh0.g)
+        ]))
+      }
+    else
+      dh2 = OpenSSL::PKey::DH.new(OpenSSL::ASN1::Sequence([
+        OpenSSL::ASN1::Integer(dh0.p + 1),
+        OpenSSL::ASN1::Integer(dh0.g)
+      ]))
+      assert_equal(false, dh2.params_ok?)
+    end
+
+  end
+
+  def test_params
+    dh = Fixtures.pkey("dh2048_ffdhe2048")
+    assert_kind_of(OpenSSL::BN, dh.p)
+    assert_equal(dh.p, dh.params["p"])
+    assert_kind_of(OpenSSL::BN, dh.g)
+    assert_equal(dh.g, dh.params["g"])
+    assert_nil(dh.pub_key)
+    assert_nil(dh.params["pub_key"])
+    assert_nil(dh.priv_key)
+    assert_nil(dh.params["priv_key"])
+
+    dhkey = OpenSSL::PKey.generate_key(dh)
+    assert_equal(dh.params["p"], dhkey.params["p"])
+    assert_kind_of(OpenSSL::BN, dhkey.pub_key)
+    assert_equal(dhkey.pub_key, dhkey.params["pub_key"])
+    assert_kind_of(OpenSSL::BN, dhkey.priv_key)
+    assert_equal(dhkey.priv_key, dhkey.params["priv_key"])
   end
 
   def test_dup
     # Parameters only
-    dh1 = Fixtures.pkey("dh1024")
+    dh1 = Fixtures.pkey("dh2048_ffdhe2048")
     dh2 = dh1.dup
     assert_equal dh1.to_der, dh2.to_der
     assert_not_equal nil, dh1.p
@@ -125,7 +175,7 @@ def test_dup
     end
 
     # With a key pair
-    dh3 = OpenSSL::PKey.generate_key(Fixtures.pkey("dh1024"))
+    dh3 = OpenSSL::PKey.generate_key(Fixtures.pkey("dh2048_ffdhe2048"))
     dh4 = dh3.dup
     assert_equal dh3.to_der, dh4.to_der
     assert_equal dh1.to_der, dh4.to_der # encodes parameters only
@@ -136,7 +186,7 @@ def test_dup
   end
 
   def test_marshal
-    dh = Fixtures.pkey("dh1024")
+    dh = Fixtures.pkey("dh2048_ffdhe2048")
     deserialized = Marshal.load(Marshal.dump(dh))
 
     assert_equal dh.to_der, deserialized.to_der
diff --git a/test/openssl/test_pkey_dsa.rb b/test/openssl/test_pkey_dsa.rb
index 3f64a80e324814..b88247634646a8 100644
--- a/test/openssl/test_pkey_dsa.rb
+++ b/test/openssl/test_pkey_dsa.rb
@@ -4,6 +4,11 @@
 if defined?(OpenSSL) && defined?(OpenSSL::PKey::DSA)
 
 class OpenSSL::TestPKeyDSA < OpenSSL::PKeyTestCase
+  def setup
+    # May not be available in FIPS mode as DSA has been deprecated in FIPS 186-5
+    omit_on_fips
+  end
+
   def test_private
     key = Fixtures.pkey("dsa1024")
     assert_equal true, key.private?
@@ -28,6 +33,12 @@ def test_new_break
     end
   end
 
+  def test_new_empty
+    key = OpenSSL::PKey::DSA.new
+    assert_nil(key.p)
+    assert_raise(OpenSSL::PKey::PKeyError) { key.to_der }
+  end
+
   def test_generate
     # DSA.generate used to call DSA_generate_parameters_ex(), which adjusts the
     # size of q according to the size of p
@@ -48,27 +59,29 @@ def test_generate
   end
 
   def test_sign_verify
-    dsa512 = Fixtures.pkey("dsa512")
+    # The DSA valid size is 2048 or 3072 on FIPS.
+    # https://github.com/openssl/openssl/blob/7649b5548e5c0352b91d9d3ed695e42a2ac1e99c/providers/common/securitycheck.c#L185-L188
+    dsa = Fixtures.pkey("dsa2048")
     data = "Sign me!"
     if defined?(OpenSSL::Digest::DSS1)
-      signature = dsa512.sign(OpenSSL::Digest.new('DSS1'), data)
-      assert_equal true, dsa512.verify(OpenSSL::Digest.new('DSS1'), signature, data)
+      signature = dsa.sign(OpenSSL::Digest.new('DSS1'), data)
+      assert_equal true, dsa.verify(OpenSSL::Digest.new('DSS1'), signature, data)
     end
 
-    signature = dsa512.sign("SHA256", data)
-    assert_equal true, dsa512.verify("SHA256", signature, data)
+    signature = dsa.sign("SHA256", data)
+    assert_equal true, dsa.verify("SHA256", signature, data)
 
     signature0 = (<<~'end;').unpack1("m")
-      MCwCFH5h40plgU5Fh0Z4wvEEpz0eE9SnAhRPbkRB8ggsN/vsSEYMXvJwjGg/
-      6g==
+      MD4CHQC0zmRkVOAHJTm28fS5PVUv+4LtBeNaKqr/yfmVAh0AsTcLqofWHoW8X5oWu8AOvngOcFVZ
+      cLTvhY3XNw==
     end;
-    assert_equal true, dsa512.verify("SHA256", signature0, data)
+    assert_equal true, dsa.verify("SHA256", signature0, data)
     signature1 = signature0.succ
-    assert_equal false, dsa512.verify("SHA256", signature1, data)
+    assert_equal false, dsa.verify("SHA256", signature1, data)
   end
 
   def test_sign_verify_raw
-    key = Fixtures.pkey("dsa512")
+    key = Fixtures.pkey("dsa2048")
     data = 'Sign me!'
     digest = OpenSSL::Digest.digest('SHA1', data)
 
@@ -79,19 +92,19 @@ def test_sign_verify_raw
     sig = key.syssign(digest)
     assert_equal true, key.sysverify(digest, sig)
     assert_equal false, key.sysverify(digest, invalid_sig)
-    assert_raise(OpenSSL::PKey::DSAError) { key.sysverify(digest, malformed_sig) }
+    assert_sign_verify_false_or_error{ key.sysverify(digest, malformed_sig) }
     assert_equal true, key.verify_raw(nil, sig, digest)
     assert_equal false, key.verify_raw(nil, invalid_sig, digest)
-    assert_raise(OpenSSL::PKey::PKeyError) { key.verify_raw(nil, malformed_sig, digest) }
+    assert_sign_verify_false_or_error { key.verify_raw(nil, malformed_sig, digest) }
 
     # Sign by #sign_raw
     sig = key.sign_raw(nil, digest)
     assert_equal true, key.sysverify(digest, sig)
     assert_equal false, key.sysverify(digest, invalid_sig)
-    assert_raise(OpenSSL::PKey::DSAError) { key.sysverify(digest, malformed_sig) }
+    assert_sign_verify_false_or_error { key.sysverify(digest, malformed_sig) }
     assert_equal true, key.verify_raw(nil, sig, digest)
     assert_equal false, key.verify_raw(nil, invalid_sig, digest)
-    assert_raise(OpenSSL::PKey::PKeyError) { key.verify_raw(nil, malformed_sig, digest) }
+    assert_sign_verify_false_or_error { key.verify_raw(nil, malformed_sig, digest) }
   end
 
   def test_DSAPrivateKey
@@ -223,6 +236,27 @@ def test_read_DSAPublicKey_pem
     assert_equal(nil, key.priv_key)
   end
 
+  def test_params
+    key = Fixtures.pkey("dsa2048")
+    assert_kind_of(OpenSSL::BN, key.p)
+    assert_equal(key.p, key.params["p"])
+    assert_kind_of(OpenSSL::BN, key.q)
+    assert_equal(key.q, key.params["q"])
+    assert_kind_of(OpenSSL::BN, key.g)
+    assert_equal(key.g, key.params["g"])
+    assert_kind_of(OpenSSL::BN, key.pub_key)
+    assert_equal(key.pub_key, key.params["pub_key"])
+    assert_kind_of(OpenSSL::BN, key.priv_key)
+    assert_equal(key.priv_key, key.params["priv_key"])
+
+    pubkey = OpenSSL::PKey.read(key.public_to_der)
+    assert_equal(key.params["p"], pubkey.params["p"])
+    assert_equal(key.pub_key, pubkey.pub_key)
+    assert_equal(key.pub_key, pubkey.params["pub_key"])
+    assert_nil(pubkey.priv_key)
+    assert_nil(pubkey.params["priv_key"])
+  end
+
   def test_dup
     key = Fixtures.pkey("dsa1024")
     key2 = key.dup
diff --git a/test/openssl/test_pkey_ec.rb b/test/openssl/test_pkey_ec.rb
index 126c1347cf22c9..1953b4c2dae6b8 100644
--- a/test/openssl/test_pkey_ec.rb
+++ b/test/openssl/test_pkey_ec.rb
@@ -88,11 +88,20 @@ def test_check_key
     assert_equal(true, key2.check_key)
 
     # Behavior of EVP_PKEY_public_check changes between OpenSSL 1.1.1 and 3.0
-    key4 = Fixtures.pkey("p256_too_large")
-    assert_raise(OpenSSL::PKey::ECError) { key4.check_key }
-
-    key5 = Fixtures.pkey("p384_invalid")
-    assert_raise(OpenSSL::PKey::ECError) { key5.check_key }
+    # The public key does not match the private key
+    ec_key_data = <<~EOF
+    -----BEGIN EC PRIVATE KEY-----
+    MHcCAQEEIP+TT0V8Fndsnacji9tyf6hmhHywcOWTee9XkiBeJoVloAoGCCqGSM49
+    AwEHoUQDQgAEBkhhJIU/2/YdPSlY2I1k25xjK4trr5OXSgXvBC21PtY0HQ7lor7A
+    jzT0giJITqmcd81fwGw5+96zLcdxTF1hVQ==
+    -----END EC PRIVATE KEY-----
+    EOF
+    if aws_lc? # AWS-LC automatically does key checks on the parsed key.
+      assert_raise(OpenSSL::PKey::PKeyError) { OpenSSL::PKey.read(ec_key_data) }
+    else
+      key4 = OpenSSL::PKey.read(ec_key_data)
+      assert_raise(OpenSSL::PKey::ECError) { key4.check_key }
+    end
 
     # EC#private_key= is deprecated in 3.0 and won't work on OpenSSL 3.0
     if !openssl?(3, 0, 0)
@@ -143,19 +152,19 @@ def test_sign_verify_raw
     sig = key.dsa_sign_asn1(data1)
     assert_equal true, key.dsa_verify_asn1(data1, sig)
     assert_equal false, key.dsa_verify_asn1(data2, sig)
-    assert_raise(OpenSSL::PKey::ECError) { key.dsa_verify_asn1(data1, malformed_sig) }
+    assert_sign_verify_false_or_error { key.dsa_verify_asn1(data1, malformed_sig) }
     assert_equal true, key.verify_raw(nil, sig, data1)
     assert_equal false, key.verify_raw(nil, sig, data2)
-    assert_raise(OpenSSL::PKey::PKeyError) { key.verify_raw(nil, malformed_sig, data1) }
+    assert_sign_verify_false_or_error { key.verify_raw(nil, malformed_sig, data1) }
 
     # Sign by #sign_raw
     sig = key.sign_raw(nil, data1)
     assert_equal true, key.dsa_verify_asn1(data1, sig)
     assert_equal false, key.dsa_verify_asn1(data2, sig)
-    assert_raise(OpenSSL::PKey::ECError) { key.dsa_verify_asn1(data1, malformed_sig) }
+    assert_sign_verify_false_or_error { key.dsa_verify_asn1(data1, malformed_sig) }
     assert_equal true, key.verify_raw(nil, sig, data1)
     assert_equal false, key.verify_raw(nil, sig, data2)
-    assert_raise(OpenSSL::PKey::PKeyError) { key.verify_raw(nil, malformed_sig, data1) }
+    assert_sign_verify_false_or_error{ key.verify_raw(nil, malformed_sig, data1) }
   end
 
   def test_dsa_sign_asn1_FIPS186_3
@@ -229,6 +238,8 @@ def test_ECPrivateKey_with_parameters
   end
 
   def test_ECPrivateKey_encrypted
+    omit_on_fips
+
     p256 = Fixtures.pkey("p256")
     # key = abcdef
     pem = <<~EOF
@@ -298,7 +309,10 @@ def test_ec_group
     assert_equal group1.to_der, group2.to_der
     assert_equal group1, group2
     group2.asn1_flag ^=OpenSSL::PKey::EC::NAMED_CURVE
-    assert_not_equal group1.to_der, group2.to_der
+    # AWS-LC does not support serializing explicit curves.
+    unless aws_lc?
+      assert_not_equal group1.to_der, group2.to_der
+    end
     assert_equal group1, group2
 
     group3 = group1.dup
@@ -419,28 +433,6 @@ def test_ec_point_mul
       # 3 * (6, 3) + 3 * (5, 1) = (7, 6)
       result_a2 = point_a.mul(3, 3)
       assert_equal B(%w{ 04 07 06 }), result_a2.to_octet_string(:uncompressed)
-      EnvUtil.suppress_warning do # Point#mul(ary, ary [, bn]) is deprecated
-        begin
-          result_b1 = point_a.mul([3], [])
-        rescue NotImplementedError
-          # LibreSSL and OpenSSL 3.0 do no longer support this form of calling
-          next
-        end
-
-        # 3 * point_a = 3 * (6, 3) = (16, 13)
-        result_b1 = point_a.mul([3], [])
-        assert_equal B(%w{ 04 10 0D }), result_b1.to_octet_string(:uncompressed)
-        # 3 * point_a + 2 * point_a = 3 * (6, 3) + 2 * (6, 3) = (7, 11)
-        result_b1 = point_a.mul([3, 2], [point_a])
-        assert_equal B(%w{ 04 07 0B }), result_b1.to_octet_string(:uncompressed)
-        # 3 * point_a + 5 * point_a.group.generator = 3 * (6, 3) + 5 * (5, 1) = (13, 10)
-        result_b1 = point_a.mul([3], [], 5)
-        assert_equal B(%w{ 04 0D 0A }), result_b1.to_octet_string(:uncompressed)
-
-        assert_raise(ArgumentError) { point_a.mul([1], [point_a]) }
-        assert_raise(TypeError) { point_a.mul([1], nil) }
-        assert_raise(TypeError) { point_a.mul([nil], []) }
-      end
     rescue OpenSSL::PKey::EC::Group::Error
       # CentOS patches OpenSSL to reject curves defined over Fp where p < 256 bits
       raise if $!.message !~ /unsupported field/
@@ -453,6 +445,9 @@ def test_ec_point_mul
     # invalid argument
     point = p256_key.public_key
     assert_raise(TypeError) { point.mul(nil) }
+
+    # mul with arrays was removed in version 4.0.0
+    assert_raise(NotImplementedError) { point.mul([1], []) }
   end
 
 # test Group: asn1_flag, point_conversion
diff --git a/test/openssl/test_pkey_rsa.rb b/test/openssl/test_pkey_rsa.rb
index 61c55c60b255d0..850c16a029e1d3 100644
--- a/test/openssl/test_pkey_rsa.rb
+++ b/test/openssl/test_pkey_rsa.rb
@@ -14,9 +14,7 @@ def test_no_private_exp
   end if !openssl?(3, 0, 0) # Impossible state in OpenSSL 3.0
 
   def test_private
-    # Generated by key size and public exponent
-    key = OpenSSL::PKey::RSA.new(512, 3)
-    assert(key.private?)
+    key = Fixtures.pkey("rsa2048")
 
     # Generated by DER
     key2 = OpenSSL::PKey::RSA.new(key.to_der)
@@ -46,66 +44,77 @@ def test_private
   end
 
   def test_new
-    key = OpenSSL::PKey::RSA.new(512)
-    assert_equal 512, key.n.num_bits
+    key = OpenSSL::PKey::RSA.new(2048)
+    assert_equal 2048, key.n.num_bits
     assert_equal 65537, key.e
     assert_not_nil key.d
+    assert(key.private?)
+  end
+
+  def test_new_public_exponent
+    # At least 2024-bits RSA key are required in FIPS.
+    omit_on_fips
 
     # Specify public exponent
-    key2 = OpenSSL::PKey::RSA.new(512, 3)
-    assert_equal 512, key2.n.num_bits
-    assert_equal 3, key2.e
-    assert_not_nil key2.d
+    key = OpenSSL::PKey::RSA.new(512, 3)
+    assert_equal 512, key.n.num_bits
+    assert_equal 3, key.e
   end
 
   def test_s_generate
-    key1 = OpenSSL::PKey::RSA.generate(512)
-    assert_equal 512, key1.n.num_bits
+    key1 = OpenSSL::PKey::RSA.generate(2048)
+    assert_equal 2048, key1.n.num_bits
     assert_equal 65537, key1.e
+  end
+
+  def test_s_generate_public_exponent
+    # At least 2024-bits RSA key are required in FIPS.
+    omit_on_fips
 
     # Specify public exponent
-    key2 = OpenSSL::PKey::RSA.generate(512, 3)
-    assert_equal 512, key2.n.num_bits
-    assert_equal 3, key2.e
-    assert_not_nil key2.d
+    key = OpenSSL::PKey::RSA.generate(512, 3)
+    assert_equal 512, key.n.num_bits
+    assert_equal 3, key.e
   end
 
   def test_new_break
-    assert_nil(OpenSSL::PKey::RSA.new(1024) { break })
+    assert_nil(OpenSSL::PKey::RSA.new(2048) { break })
     assert_raise(RuntimeError) do
-      OpenSSL::PKey::RSA.new(1024) { raise }
+      OpenSSL::PKey::RSA.new(2048) { raise }
     end
   end
 
   def test_sign_verify
-    rsa1024 = Fixtures.pkey("rsa1024")
+    rsa = Fixtures.pkey("rsa2048")
     data = "Sign me!"
-    signature = rsa1024.sign("SHA256", data)
-    assert_equal true, rsa1024.verify("SHA256", signature, data)
+    signature = rsa.sign("SHA256", data)
+    assert_equal true, rsa.verify("SHA256", signature, data)
 
     signature0 = (<<~'end;').unpack1("m")
-      oLCgbprPvfhM4pjFQiDTFeWI9Sk+Og7Nh9TmIZ/xSxf2CGXQrptlwo7NQ28+
-      WA6YQo8jPH4hSuyWIM4Gz4qRYiYRkl5TDMUYob94zm8Si1HxEiS9354tzvqS
-      zS8MLW2BtNPuTubMxTItHGTnOzo9sUg0LAHVFt8kHG2NfKAw/gQ=
+      ooy49i8aeFtkDYUU0RPDsEugGiNw4lZxpbQPnIwtdftEkka945IqKZ/MY3YSw7wKsvBZeaTy8GqL
+      lSWLThsRFDV+UUS9zUBbQ9ygNIT8OjdV+tNL63ZpKGprczSnw4F05MQIpajNRud/8jiI9rf+Wysi
+      WwXecjMl2FlXlLJHY4PFQZU5TiametB4VCQRMcjLo1uf26u/yRpiGaYyqn5vxs0SqNtUDM1UL6x4
+      NHCAdqLjuFRQPjYp1vGLD3eSl4061pS8x1NVap3YGbYfGUyzZO4VfwFwf1jPdhp/OX/uZw4dGB2H
+      gSK+q1JiDFwEE6yym5tdKovL1g1NhFYHF6gkZg==
     end;
-    assert_equal true, rsa1024.verify("SHA256", signature0, data)
+    assert_equal true, rsa.verify("SHA256", signature0, data)
     signature1 = signature0.succ
-    assert_equal false, rsa1024.verify("SHA256", signature1, data)
+    assert_equal false, rsa.verify("SHA256", signature1, data)
   end
 
   def test_sign_verify_options
-    key = Fixtures.pkey("rsa1024")
+    key = Fixtures.pkey("rsa2048")
     data = "Sign me!"
     pssopts = {
       "rsa_padding_mode" => "pss",
       "rsa_pss_saltlen" => 20,
-      "rsa_mgf1_md" => "SHA1"
+      "rsa_mgf1_md" => "SHA256"
     }
     sig_pss = key.sign("SHA256", data, pssopts)
-    assert_equal 128, sig_pss.bytesize
+    assert_equal 256, sig_pss.bytesize
     assert_equal true, key.verify("SHA256", sig_pss, data, pssopts)
     assert_equal true, key.verify_pss("SHA256", sig_pss, data,
-                                      salt_length: 20, mgf1_hash: "SHA1")
+                                      salt_length: 20, mgf1_hash: "SHA256")
     # Defaults to PKCS #1 v1.5 padding => verification failure
     assert_equal false, key.verify("SHA256", sig_pss, data)
 
@@ -175,35 +184,47 @@ def test_verify_empty_rsa
   end
 
   def test_sign_verify_pss
-    key = Fixtures.pkey("rsa1024")
+    key = Fixtures.pkey("rsa2048")
     data = "Sign me!"
     invalid_data = "Sign me?"
 
-    signature = key.sign_pss("SHA256", data, salt_length: 20, mgf1_hash: "SHA1")
-    assert_equal 128, signature.bytesize
+    signature = key.sign_pss("SHA256", data, salt_length: 20, mgf1_hash: "SHA256")
+    assert_equal 256, signature.bytesize
     assert_equal true,
-      key.verify_pss("SHA256", signature, data, salt_length: 20, mgf1_hash: "SHA1")
+      key.verify_pss("SHA256", signature, data, salt_length: 20, mgf1_hash: "SHA256")
     assert_equal true,
-      key.verify_pss("SHA256", signature, data, salt_length: :auto, mgf1_hash: "SHA1")
+      key.verify_pss("SHA256", signature, data, salt_length: :auto, mgf1_hash: "SHA256")
     assert_equal false,
-      key.verify_pss("SHA256", signature, invalid_data, salt_length: 20, mgf1_hash: "SHA1")
+      key.verify_pss("SHA256", signature, invalid_data, salt_length: 20, mgf1_hash: "SHA256")
 
-    signature = key.sign_pss("SHA256", data, salt_length: :digest, mgf1_hash: "SHA1")
+    signature = key.sign_pss("SHA256", data, salt_length: :digest, mgf1_hash: "SHA256")
     assert_equal true,
-      key.verify_pss("SHA256", signature, data, salt_length: 32, mgf1_hash: "SHA1")
+      key.verify_pss("SHA256", signature, data, salt_length: 32, mgf1_hash: "SHA256")
     assert_equal true,
-      key.verify_pss("SHA256", signature, data, salt_length: :auto, mgf1_hash: "SHA1")
+      key.verify_pss("SHA256", signature, data, salt_length: :auto, mgf1_hash: "SHA256")
     assert_equal false,
-      key.verify_pss("SHA256", signature, data, salt_length: 20, mgf1_hash: "SHA1")
-
-    signature = key.sign_pss("SHA256", data, salt_length: :max, mgf1_hash: "SHA1")
-    assert_equal true,
-      key.verify_pss("SHA256", signature, data, salt_length: 94, mgf1_hash: "SHA1")
-    assert_equal true,
-      key.verify_pss("SHA256", signature, data, salt_length: :auto, mgf1_hash: "SHA1")
+      key.verify_pss("SHA256", signature, data, salt_length: 20, mgf1_hash: "SHA256")
+
+    # The sign_pss with `salt_length: :max` raises the "invalid salt length"
+    # error in FIPS. We need to skip the tests in FIPS.
+    # According to FIPS 186-5 section 5.4, the salt length shall be between zero
+    # and the output block length of the digest function (inclusive).
+    #
+    # FIPS 186-5 section 5.4 PKCS #1
+    # https://nvlpubs.nist.gov/nistpubs/FIPS/NIST.FIPS.186-5.pdf
+    unless OpenSSL.fips_mode
+      signature = key.sign_pss("SHA256", data, salt_length: :max, mgf1_hash: "SHA256")
+      # Should verify on the following salt_length (sLen).
+      # sLen <= emLen (octat) - 2 - hLen (octet) = 2048 / 8 - 2 - 256 / 8 = 222
+      # https://datatracker.ietf.org/doc/html/rfc8017#section-9.1.1
+      assert_equal true,
+        key.verify_pss("SHA256", signature, data, salt_length: 222, mgf1_hash: "SHA256")
+      assert_equal true,
+        key.verify_pss("SHA256", signature, data, salt_length: :auto, mgf1_hash: "SHA256")
+    end
 
     assert_raise(OpenSSL::PKey::RSAError) {
-      key.sign_pss("SHA256", data, salt_length: 95, mgf1_hash: "SHA1")
+      key.sign_pss("SHA256", data, salt_length: 223, mgf1_hash: "SHA256")
     }
   end
 
@@ -213,8 +234,13 @@ def test_encrypt_decrypt
 
     # Defaults to PKCS #1 v1.5
     raw = "data"
-    enc = rsapub.encrypt(raw)
-    assert_equal raw, rsapriv.decrypt(enc)
+    # According to the NIST SP 800-131A Rev. 2 section 6, PKCS#1 v1.5 padding is
+    # not permitted for key agreement and key transport using RSA in FIPS.
+    # https://nvlpubs.nist.gov/nistpubs/SpecialPublications/NIST.SP.800-131Ar2.pdf
+    unless OpenSSL.fips_mode
+      enc = rsapub.encrypt(raw)
+      assert_equal raw, rsapriv.decrypt(enc)
+    end
 
     # Invalid options
     assert_raise(OpenSSL::PKey::PKeyError) {
@@ -227,11 +253,13 @@ def test_encrypt_decrypt_legacy
     rsapub = OpenSSL::PKey.read(rsapriv.public_to_der)
 
     # Defaults to PKCS #1 v1.5
-    raw = "data"
-    enc_legacy = rsapub.public_encrypt(raw)
-    assert_equal raw, rsapriv.decrypt(enc_legacy)
-    enc_new = rsapub.encrypt(raw)
-    assert_equal raw, rsapriv.private_decrypt(enc_new)
+    unless OpenSSL.fips_mode
+      raw = "data"
+      enc_legacy = rsapub.public_encrypt(raw)
+      assert_equal raw, rsapriv.decrypt(enc_legacy)
+      enc_new = rsapub.encrypt(raw)
+      assert_equal raw, rsapriv.private_decrypt(enc_new)
+    end
 
     # OAEP with default parameters
     raw = "data"
@@ -292,53 +320,67 @@ def test_to_der
   end
 
   def test_RSAPrivateKey
-    rsa1024 = Fixtures.pkey("rsa1024")
+    rsa = Fixtures.pkey("rsa2048")
     asn1 = OpenSSL::ASN1::Sequence([
       OpenSSL::ASN1::Integer(0),
-      OpenSSL::ASN1::Integer(rsa1024.n),
-      OpenSSL::ASN1::Integer(rsa1024.e),
-      OpenSSL::ASN1::Integer(rsa1024.d),
-      OpenSSL::ASN1::Integer(rsa1024.p),
-      OpenSSL::ASN1::Integer(rsa1024.q),
-      OpenSSL::ASN1::Integer(rsa1024.dmp1),
-      OpenSSL::ASN1::Integer(rsa1024.dmq1),
-      OpenSSL::ASN1::Integer(rsa1024.iqmp)
+      OpenSSL::ASN1::Integer(rsa.n),
+      OpenSSL::ASN1::Integer(rsa.e),
+      OpenSSL::ASN1::Integer(rsa.d),
+      OpenSSL::ASN1::Integer(rsa.p),
+      OpenSSL::ASN1::Integer(rsa.q),
+      OpenSSL::ASN1::Integer(rsa.dmp1),
+      OpenSSL::ASN1::Integer(rsa.dmq1),
+      OpenSSL::ASN1::Integer(rsa.iqmp)
     ])
     key = OpenSSL::PKey::RSA.new(asn1.to_der)
     assert_predicate key, :private?
-    assert_same_rsa rsa1024, key
+    assert_same_rsa rsa, key
 
     pem = <<~EOF
     -----BEGIN RSA PRIVATE KEY-----
-    MIICXgIBAAKBgQDLwsSw1ECnPtT+PkOgHhcGA71nwC2/nL85VBGnRqDxOqjVh7Cx
-    aKPERYHsk4BPCkE3brtThPWc9kjHEQQ7uf9Y1rbCz0layNqHyywQEVLFmp1cpIt/
-    Q3geLv8ZD9pihowKJDyMDiN6ArYUmZczvW4976MU3+l54E6lF/JfFEU5hwIDAQAB
-    AoGBAKSl/MQarye1yOysqX6P8fDFQt68VvtXkNmlSiKOGuzyho0M+UVSFcs6k1L0
-    maDE25AMZUiGzuWHyaU55d7RXDgeskDMakD1v6ZejYtxJkSXbETOTLDwUWTn618T
-    gnb17tU1jktUtU67xK/08i/XodlgnQhs6VoHTuCh3Hu77O6RAkEA7+gxqBuZR572
-    74/akiW/SuXm0SXPEviyO1MuSRwtI87B02D0qgV8D1UHRm4AhMnJ8MCs1809kMQE
-    JiQUCrp9mQJBANlt2ngBO14us6NnhuAseFDTBzCHXwUUu1YKHpMMmxpnGqaldGgX
-    sOZB3lgJsT9VlGf3YGYdkLTNVbogQKlKpB8CQQDiSwkb4vyQfDe8/NpU5Not0fII
-    8jsDUCb+opWUTMmfbxWRR3FBNu8wnym/m19N4fFj8LqYzHX4KY0oVPu6qvJxAkEA
-    wa5snNekFcqONLIE4G5cosrIrb74sqL8GbGb+KuTAprzj5z1K8Bm0UW9lTjVDjDi
-    qRYgZfZSL+x1P/54+xTFSwJAY1FxA/N3QPCXCjPh5YqFxAMQs2VVYTfg+t0MEcJD
-    dPMQD5JX6g5HKnHFg2mZtoXQrWmJSn7p8GJK8yNTopEErA==
+    MIIEpAIBAAKCAQEAuV9ht9J7k4NBs38jOXvvTKY9gW8nLICSno5EETR1cuF7i4pN
+    s9I1QJGAFAX0BEO4KbzXmuOvfCpD3CU+Slp1enenfzq/t/e/1IRW0wkJUJUFQign
+    4CtrkJL+P07yx18UjyPlBXb81ApEmAB5mrJVSrWmqbjs07JbuS4QQGGXLc+Su96D
+    kYKmSNVjBiLxVVSpyZfAY3hD37d60uG+X8xdW5v68JkRFIhdGlb6JL8fllf/A/bl
+    NwdJOhVr9mESHhwGjwfSeTDPfd8ZLE027E5lyAVX9KZYcU00mOX+fdxOSnGqS/8J
+    DRh0EPHDL15RcJjV2J6vZjPb0rOYGDoMcH+94wIDAQABAoIBAAzsamqfYQAqwXTb
+    I0CJtGg6msUgU7HVkOM+9d3hM2L791oGHV6xBAdpXW2H8LgvZHJ8eOeSghR8+dgq
+    PIqAffo4x1Oma+FOg3A0fb0evyiACyrOk+EcBdbBeLo/LcvahBtqnDfiUMQTpy6V
+    seSoFCwuN91TSCeGIsDpRjbG1vxZgtx+uI+oH5+ytqJOmfCksRDCkMglGkzyfcl0
+    Xc5CUhIJ0my53xijEUQl19rtWdMnNnnkdbG8PT3LZlOta5Do86BElzUYka0C6dUc
+    VsBDQ0Nup0P6rEQgy7tephHoRlUGTYamsajGJaAo1F3IQVIrRSuagi7+YpSpCqsW
+    wORqorkCgYEA7RdX6MDVrbw7LePnhyuaqTiMK+055/R1TqhB1JvvxJ1CXk2rDL6G
+    0TLHQ7oGofd5LYiemg4ZVtWdJe43BPZlVgT6lvL/iGo8JnrncB9Da6L7nrq/+Rvj
+    XGjf1qODCK+LmreZWEsaLPURIoR/Ewwxb9J2zd0CaMjeTwafJo1CZvcCgYEAyCgb
+    aqoWvUecX8VvARfuA593Lsi50t4MEArnOXXcd1RnXoZWhbx5rgO8/ATKfXr0BK/n
+    h2GF9PfKzHFm/4V6e82OL7gu/kLy2u9bXN74vOvWFL5NOrOKPM7Kg+9I131kNYOw
+    Ivnr/VtHE5s0dY7JChYWE1F3vArrOw3T00a4CXUCgYEA0SqY+dS2LvIzW4cHCe9k
+    IQqsT0yYm5TFsUEr4sA3xcPfe4cV8sZb9k/QEGYb1+SWWZ+AHPV3UW5fl8kTbSNb
+    v4ng8i8rVVQ0ANbJO9e5CUrepein2MPL0AkOATR8M7t7dGGpvYV0cFk8ZrFx0oId
+    U0PgYDotF/iueBWlbsOM430CgYEAqYI95dFyPI5/AiSkY5queeb8+mQH62sdcCCr
+    vd/w/CZA/K5sbAo4SoTj8dLk4evU6HtIa0DOP63y071eaxvRpTNqLUOgmLh+D6gS
+    Cc7TfLuFrD+WDBatBd5jZ+SoHccVrLR/4L8jeodo5FPW05A+9gnKXEXsTxY4LOUC
+    9bS4e1kCgYAqVXZh63JsMwoaxCYmQ66eJojKa47VNrOeIZDZvd2BPVf30glBOT41
+    gBoDG3WMPZoQj9pb7uMcrnvs4APj2FIhMU8U15LcPAj59cD6S6rWnAxO8NFK7HQG
+    4Jxg3JNNf8ErQoCHb1B3oVdXJkmbJkARoDpBKmTCgKtP8ADYLmVPQw==
     -----END RSA PRIVATE KEY-----
     EOF
     key = OpenSSL::PKey::RSA.new(pem)
-    assert_same_rsa rsa1024, key
+    assert_same_rsa rsa, key
 
-    assert_equal asn1.to_der, rsa1024.to_der
-    assert_equal pem, rsa1024.export
+    assert_equal asn1.to_der, rsa.to_der
+    assert_equal pem, rsa.export
 
     # Unknown PEM prepended
-    cert = issue_cert(OpenSSL::X509::Name.new([["CN", "nobody"]]), rsa1024, 1, [], nil, nil)
-    str = cert.to_text + cert.to_pem + rsa1024.to_pem
+    cert = issue_cert(OpenSSL::X509::Name.new([["CN", "nobody"]]), rsa, 1, [], nil, nil)
+    str = cert.to_text + cert.to_pem + rsa.to_pem
     key = OpenSSL::PKey::RSA.new(str)
-    assert_same_rsa rsa1024, key
+    assert_same_rsa rsa, key
   end
 
   def test_RSAPrivateKey_encrypted
+    omit_on_fips
+
     rsa1024 = Fixtures.pkey("rsa1024")
     # key = abcdef
     pem = <<~EOF
@@ -438,6 +480,8 @@ def test_PUBKEY
   end
 
   def test_pem_passwd
+    omit_on_fips
+
     key = Fixtures.pkey("rsa1024")
     pem3c = key.to_pem("aes-128-cbc", "key")
     assert_match (/ENCRYPTED/), pem3c
@@ -484,41 +528,75 @@ def test_private_encoding
   end
 
   def test_private_encoding_encrypted
-    rsa1024 = Fixtures.pkey("rsa1024")
-    encoded = rsa1024.private_to_der("aes-128-cbc", "abcdef")
+    rsa = Fixtures.pkey("rsa2048")
+    encoded = rsa.private_to_der("aes-128-cbc", "abcdef")
     asn1 = OpenSSL::ASN1.decode(encoded) # PKCS #8 EncryptedPrivateKeyInfo
     assert_kind_of OpenSSL::ASN1::Sequence, asn1
     assert_equal 2, asn1.value.size
-    assert_not_equal rsa1024.private_to_der, encoded
-    assert_same_rsa rsa1024, OpenSSL::PKey.read(encoded, "abcdef")
-    assert_same_rsa rsa1024, OpenSSL::PKey.read(encoded) { "abcdef" }
+    assert_not_equal rsa.private_to_der, encoded
+    assert_same_rsa rsa, OpenSSL::PKey.read(encoded, "abcdef")
+    assert_same_rsa rsa, OpenSSL::PKey.read(encoded) { "abcdef" }
     assert_raise(OpenSSL::PKey::PKeyError) { OpenSSL::PKey.read(encoded, "abcxyz") }
 
-    encoded = rsa1024.private_to_pem("aes-128-cbc", "abcdef")
+    encoded = rsa.private_to_pem("aes-128-cbc", "abcdef")
     assert_match (/BEGIN ENCRYPTED PRIVATE KEY/), encoded.lines[0]
-    assert_same_rsa rsa1024, OpenSSL::PKey.read(encoded, "abcdef")
+    assert_same_rsa rsa, OpenSSL::PKey.read(encoded, "abcdef")
 
-    # certtool --load-privkey=test/fixtures/pkey/rsa1024.pem --to-p8 --password=abcdef
+    # Use openssl instead of certtool due to https://gitlab.com/gnutls/gnutls/-/issues/1632
+    # openssl pkcs8 -in test/openssl/fixtures/pkey/rsa2048.pem -topk8 -v2 aes-128-cbc -passout pass:abcdef
     pem = <<~EOF
     -----BEGIN ENCRYPTED PRIVATE KEY-----
-    MIICojAcBgoqhkiG9w0BDAEDMA4ECLqajUdSNfzwAgIEkQSCAoCDWhxr1HUrKLXA
-    FsFGGQfPT0aKH4gZipaSXXQRl0KwifHwHoDtfo/mAkJVZMnUVOm1AQ4LTFS3EdTy
-    JUwICGEQHb7QAiokIRoi0K2yHhOxVO8qgbnWuisWpiT6Ru1jCqTs/wcqlqF7z2jM
-    oXDk/vuekKst1DDXDcHrzhDkwhCQWj6jt1r2Vwaryy0FyeqsWAgBDiK2LsnCgkGD
-    21uhNZ/iWMG6tvY9hB8MDdiBJ41YdSG/AKLulAxQ1ibJz0Tasu66TmwFvWhBlME+
-    QbqfgmkgWg5buu53SvDfCA47zXihclbtdfW+U3CJ9OJkx0535TVdZbuC1QgKXvG7
-    4iKGFRMWYJqZvZM3GL4xbC75AxjXZsdCfV81VjZxjeU6ung/NRzCuCUcmBOQzo1D
-    Vv6COwAa6ttQWM0Ti8oIQHdu5Qi+nuOEHDLxCxD962M37H99sEO5cESjmrGVxhEo
-    373L4+11geGSCajdp0yiAGnXQfwaKta8cL693bRObN+b1Y+vqtDKH26N9a4R3qgg
-    2XwgQ5GH5CODoXZpi0wxncXO+3YuuhGeArtzKSXLNxHzIMlY7wZX+0e9UU03zfV/
-    aOe4/q5DpkNxgHePt0oEpamSKY5W3jzVi1dlFWsRjud1p/Grt2zjSWTYClBlJqG1
-    A/3IeDZCu+acaePJjFyv5dFffIj2l4bAYB+LFrZlSu3F/EimO/dCDWJ9JGlMK0aF
-    l9brh7786Mo+YfyklaqMMEHBbbR2Es7PR6Gt7lrcIXmzy9XSsxT6IiD1rG9KKR3i
-    CQxTup6JAx9w1q+adL+Ypikoy3gGD/ccUY6TtPoCmkQwSCS+JqQnFlCiThDJbu+V
-    eqqUNkZq
+    MIIFLTBXBgkqhkiG9w0BBQ0wSjApBgkqhkiG9w0BBQwwHAQIay5V8CDQi5oCAggA
+    MAwGCCqGSIb3DQIJBQAwHQYJYIZIAWUDBAECBBB6eyagcbsvdQlM1kPcH7kiBIIE
+    0Ng1apIyoPAZ4BfC4kMNeSmeAv3XspxqYi3uWzXiNyTcoE6390swrwM6WvdpXvLI
+    /n/V06krxPZ9X4fBG2kLUzXt5f09lEvmQU1HW1wJGU5Sq3bNeXBrlJF4DzJE4WWd
+    whVVvNMm44ghdzN/jGSw3z+6d717N+waa7vrpBDsHjhsPNwxpyzUvcFPFysTazxx
+    kN/dziIBF6SRKi6w8VaJEMQ8czGu5T3jOc2e/1p3/AYhHLPS4NHhLR5OUh0TKqLK
+    tANAqI9YqCAjhqcYCmN3mMQXY52VfOqG9hlX1x9ZQyqiH7l102EWbPqouk6bCBLQ
+    wHepPg4uK99Wsdh65qEryNnXQ5ZmO6aGb6T3TFENCaNKmi8Nh+/5dr7J7YfhIwpo
+    FqHvk0hrZ8r3EQlr8/td0Yb1/IKzeQ34638uXf9UxK7C6o+ilsmJDR4PHJUfZL23
+    Yb9qWJ0GEzd5AMsI7x6KuUxSuH9nKniv5Tzyty3Xmb4FwXUyADWE19cVuaT+HrFz
+    GraKnA3UXbEgWAU48/l4K2HcAHyHDD2Kbp8k+o1zUkH0fWUdfE6OUGtx19Fv44Jh
+    B7xDngK8K48C6nrj06/DSYfXlb2X7WQiapeG4jt6U57tLH2XAjHCkvu0IBZ+//+P
+    yIWduEHQ3w8FBRcIsTNJo5CjkGk580TVQB/OBLWfX48Ay3oF9zgnomDIlVjl9D0n
+    lKxw/KMCLkvB78rUeGbr1Kwj36FhGpTBw3FgcYGa5oWFZTlcOgMTXLqlbb9JnDlA
+    Zs7Tu0WTyOTV/Dne9nEm39Dzu6wRojiIpmygTD4FI7rmOy3CYNvL3XPv7XQj0hny
+    Ee/fLxugYlQnwPZSqOVEQY2HsG7AmEHRsvy4bIWIGt+yzAPZixt9MUdJh91ttRt7
+    QA/8J1pAsGqEuQpF6UUINZop3J7twfhO4zWYN/NNQ52eWNX2KLfjfGRhrvatzmZ0
+    BuCsCI9hwEeE6PTlhbX1Rs177MrDc3vlqz2V3Po0OrFjXAyg9DR/OC4iK5wOG2ZD
+    7StVSP8bzwQXsz3fJ0ardKXgnU2YDAP6Vykjgt+nFI09HV/S2faOc2g/UK4Y2khl
+    J93u/GHMz/Kr3bKWGY1/6nPdIdFheQjsiNhd5gI4tWik2B3QwU9mETToZ2LSvDHU
+    jYCys576xJLkdMM6nJdq72z4tCoES9IxyHVs4uLjHKIo/ZtKr+8xDo8IL4ax3U8+
+    NMhs/lwReHmPGahm1fu9zLRbNCVL7e0zrOqbjvKcSEftObpV/LLcPYXtEm+lZcck
+    /PMw49HSE364anKEXCH1cyVWJwdZRpFUHvRpLIrpHru7/cthhiEMdLgK1/x8sLob
+    DiyieLxH1DPeXT4X+z94ER4IuPVOcV5AXc/omghispEX6DNUnn5jC4e3WyabjUbw
+    MuO9lVH9Wi2/ynExCqVmQkdbTXuLwjni1fJ27Q5zb0aCmhO8eq6P869NCjhJuiUj
+    NI9XtGLP50YVWE0kL8KEJqnyFudky8Khzk4/dyixQFqin5GfT4vetrLunGHy7lRB
+    3LpnFrpMOr+0xr1RW1k9vlmjRsJSiojJfReYO7gH3B5swiww2azogoL+4jhF1Jxh
+    OYLWdkKhP2jSVGqtIDtny0O4lBm2+hLpWjiI0mJQ7wdA
     -----END ENCRYPTED PRIVATE KEY-----
     EOF
-    assert_same_rsa rsa1024, OpenSSL::PKey.read(pem, "abcdef")
+    assert_same_rsa rsa, OpenSSL::PKey.read(pem, "abcdef")
+  end
+
+  def test_params
+    key = Fixtures.pkey("rsa2048")
+    assert_equal(2048, key.n.num_bits)
+    assert_equal(key.n, key.params["n"])
+    assert_equal(65537, key.e)
+    assert_equal(key.e, key.params["e"])
+    [:d, :p, :q, :dmp1, :dmq1, :iqmp].each do |name|
+      assert_kind_of(OpenSSL::BN, key.send(name))
+      assert_equal(key.send(name), key.params[name.to_s])
+    end
+
+    pubkey = OpenSSL::PKey.read(key.public_to_der)
+    assert_equal(key.n, pubkey.n)
+    assert_equal(key.e, pubkey.e)
+    [:d, :p, :q, :dmp1, :dmq1, :iqmp].each do |name|
+      assert_nil(pubkey.send(name))
+      assert_nil(pubkey.params[name.to_s])
+    end
   end
 
   def test_dup
diff --git a/test/openssl/test_provider.rb b/test/openssl/test_provider.rb
index d0e66785870eb0..6f85c00c988204 100644
--- a/test/openssl/test_provider.rb
+++ b/test/openssl/test_provider.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 require_relative 'utils'
-if defined?(OpenSSL) && defined?(OpenSSL::Provider) && !OpenSSL.fips_mode
+if defined?(OpenSSL) && defined?(OpenSSL::Provider)
 
 class OpenSSL::TestProvider < OpenSSL::TestCase
   def test_openssl_provider_name_inspect
@@ -12,14 +12,22 @@ def test_openssl_provider_name_inspect
   end
 
   def test_openssl_provider_names
+    # We expect the following providers are loaded in the cases:
+    # * Non-FIPS: default
+    # * FIPS: fips, base
+    # Use the null provider to test the added provider.
+    # See provider(7) - OPENSSL PROVIDERS to see the list of providers, and
+    # OSSL_PROVIDER-null(7) to check the details of the null provider.
     with_openssl <<-'end;'
-      legacy_provider = OpenSSL::Provider.load("legacy")
-      assert_equal(2, OpenSSL::Provider.provider_names.size)
-      assert_includes(OpenSSL::Provider.provider_names, "legacy")
+      num = OpenSSL::Provider.provider_names.size
 
-      assert_equal(true, legacy_provider.unload)
-      assert_equal(1, OpenSSL::Provider.provider_names.size)
-      assert_not_includes(OpenSSL::Provider.provider_names, "legacy")
+      added_provider = OpenSSL::Provider.load("null")
+      assert_equal(num + 1, OpenSSL::Provider.provider_names.size)
+      assert_includes(OpenSSL::Provider.provider_names, "null")
+
+      assert_equal(true, added_provider.unload)
+      assert_equal(num, OpenSSL::Provider.provider_names.size)
+      assert_not_includes(OpenSSL::Provider.provider_names, "null")
     end;
   end
 
@@ -33,8 +41,16 @@ def test_unloaded_openssl_provider
   end
 
   def test_openssl_legacy_provider
+    # The legacy provider is not supported on FIPS.
+    omit_on_fips
+
     with_openssl(<<-'end;')
-      OpenSSL::Provider.load("legacy")
+      begin
+        OpenSSL::Provider.load("legacy")
+      rescue OpenSSL::Provider::ProviderError
+        omit "Only for OpenSSL with legacy provider"
+      end
+
       algo = "RC4"
       data = "a" * 1000
       key = OpenSSL::Random.random_bytes(16)
diff --git a/test/openssl/test_ssl.rb b/test/openssl/test_ssl.rb
index 07dc9a343cef8e..febac061564dfd 100644
--- a/test/openssl/test_ssl.rb
+++ b/test/openssl/test_ssl.rb
@@ -15,11 +15,16 @@ def test_bad_socket
     end
   end
 
+  def test_ctx_setup
+    ctx = OpenSSL::SSL::SSLContext.new
+    assert_equal true, ctx.setup
+    assert_predicate ctx, :frozen?
+    assert_equal nil, ctx.setup
+  end
+
   def test_ctx_options
     ctx = OpenSSL::SSL::SSLContext.new
 
-    assert (OpenSSL::SSL::OP_ALL & ctx.options) == OpenSSL::SSL::OP_ALL,
-           "OP_ALL is set by default"
     ctx.options = 4
     assert_equal 4, ctx.options & 4
     if ctx.options != 4
@@ -33,6 +38,30 @@ def test_ctx_options
     assert_equal nil, ctx.setup
   end
 
+  def test_ctx_options_config
+    omit "LibreSSL and AWS-LC do not support OPENSSL_CONF" if libressl? || aws_lc?
+
+    Tempfile.create("openssl.cnf") { |f|
+      f.puts(<<~EOF)
+        openssl_conf = default_conf
+        [default_conf]
+        ssl_conf = ssl_sect
+        [ssl_sect]
+        system_default = ssl_default_sect
+        [ssl_default_sect]
+        Options = -SessionTicket
+      EOF
+      f.close
+
+      assert_separately([{ "OPENSSL_CONF" => f.path }, "-ropenssl"], <<~"end;")
+        ctx = OpenSSL::SSL::SSLContext.new
+        assert_equal OpenSSL::SSL::OP_NO_TICKET, ctx.options & OpenSSL::SSL::OP_NO_TICKET
+        ctx.set_params
+        assert_equal OpenSSL::SSL::OP_NO_TICKET, ctx.options & OpenSSL::SSL::OP_NO_TICKET
+      end;
+    }
+  end
+
   def test_ssl_with_server_cert
     ctx_proc = -> ctx {
       ctx.cert = @svr_cert
@@ -117,6 +146,30 @@ def test_socket_open_with_local_address_port_context
     }
   end
 
+  def test_socket_close_write
+    server_proc = proc do |ctx, ssl|
+      message = ssl.read
+      ssl.write(message)
+      ssl.close_write
+    ensure
+      ssl.close
+    end
+
+    start_server(server_proc: server_proc) do |port|
+      ctx = OpenSSL::SSL::SSLContext.new
+      ssl = OpenSSL::SSL::SSLSocket.open("127.0.0.1", port, context: ctx)
+      ssl.sync_close = true
+      ssl.connect
+
+      message = "abc"*1024
+      ssl.write message
+      ssl.close_write
+      assert_equal message, ssl.read
+    ensure
+      ssl&.close
+    end
+  end
+
   def test_add_certificate
     ctx_proc = -> ctx {
       # Unset values set by start_server
@@ -177,6 +230,34 @@ def test_add_certificate_multiple_certs
     end
   end
 
+  def test_extra_chain_cert_auto_chain
+    start_server { |port|
+      server_connect(port) { |ssl|
+        ssl.puts "abc"; assert_equal "abc\n", ssl.gets
+        assert_equal @svr_cert.to_der, ssl.peer_cert.to_der
+        assert_equal [@svr_cert], ssl.peer_cert_chain
+      }
+    }
+
+    # AWS-LC enables SSL_MODE_NO_AUTO_CHAIN by default
+    unless aws_lc?
+      ctx_proc = -> ctx {
+        # Sanity check: start_server won't set extra_chain_cert
+        assert_nil ctx.extra_chain_cert
+        ctx.cert_store = OpenSSL::X509::Store.new.tap { |store|
+          store.add_cert(@ca_cert)
+        }
+      }
+      start_server(ctx_proc: ctx_proc) { |port|
+        server_connect(port) { |ssl|
+          ssl.puts "abc"; assert_equal "abc\n", ssl.gets
+          assert_equal @svr_cert.to_der, ssl.peer_cert.to_der
+          assert_equal [@svr_cert, @ca_cert], ssl.peer_cert_chain
+        }
+      }
+    end
+  end
+
   def test_sysread_and_syswrite
     start_server { |port|
       server_connect(port) { |ssl|
@@ -189,10 +270,38 @@ def test_sysread_and_syswrite
         ssl.syswrite(str)
         assert_same buf, ssl.sysread(str.size, buf)
         assert_equal(str, buf)
+
+        obj = Object.new
+        obj.define_singleton_method(:to_str) { str }
+        ssl.syswrite(obj)
+        assert_equal(str, ssl.sysread(str.bytesize))
       }
     }
   end
 
+  def test_read_with_timeout
+    omit "does not support timeout" unless IO.method_defined?(:timeout)
+
+    start_server do |port|
+      server_connect(port) do |ssl|
+        str = +("x" * 100 + "\n")
+        ssl.syswrite(str)
+        assert_equal(str, ssl.sysread(str.bytesize))
+
+        ssl.timeout = 0.1
+        assert_raise(IO::TimeoutError) { ssl.sysread(1) }
+
+        ssl.syswrite(str)
+        assert_equal(str, ssl.sysread(str.bytesize))
+
+        buf = "orig".b
+        assert_raise(IO::TimeoutError) { ssl.sysread(1, buf) }
+        assert_equal("orig", buf)
+        assert_nothing_raised { buf.clear }
+      end
+    end
+  end
+
   def test_getbyte
     start_server { |port|
       server_connect(port) { |ssl|
@@ -206,6 +315,19 @@ def test_getbyte
     }
   end
 
+  def test_readbyte
+    start_server { |port|
+      server_connect(port) { |ssl|
+        str = +("x" * 100 + "\n")
+        ssl.syswrite(str)
+        newstr = str.bytesize.times.map { |i|
+          ssl.readbyte
+        }.pack("C*")
+        assert_equal(str, newstr)
+      }
+    }
+  end
+
   def test_sync_close
     start_server do |port|
       begin
@@ -259,27 +381,27 @@ def test_verify_mode_server_cert
       empty_store = OpenSSL::X509::Store.new
 
       # Valid certificate, SSL_VERIFY_PEER
+      ctx = OpenSSL::SSL::SSLContext.new
+      ctx.verify_mode = OpenSSL::SSL::VERIFY_PEER
+      ctx.cert_store = populated_store
       assert_nothing_raised {
-        ctx = OpenSSL::SSL::SSLContext.new
-        ctx.verify_mode = OpenSSL::SSL::VERIFY_PEER
-        ctx.cert_store = populated_store
         server_connect(port, ctx) { |ssl| ssl.puts("abc"); ssl.gets }
       }
 
       # Invalid certificate, SSL_VERIFY_NONE
+      ctx = OpenSSL::SSL::SSLContext.new
+      ctx.verify_mode = OpenSSL::SSL::VERIFY_NONE
+      ctx.cert_store = empty_store
       assert_nothing_raised {
-        ctx = OpenSSL::SSL::SSLContext.new
-        ctx.verify_mode = OpenSSL::SSL::VERIFY_NONE
-        ctx.cert_store = empty_store
         server_connect(port, ctx) { |ssl| ssl.puts("abc"); ssl.gets }
       }
 
       # Invalid certificate, SSL_VERIFY_PEER
-      assert_handshake_error {
-        ctx = OpenSSL::SSL::SSLContext.new
-        ctx.verify_mode = OpenSSL::SSL::VERIFY_PEER
-        ctx.cert_store = empty_store
-        server_connect(port, ctx) { |ssl| ssl.puts("abc"); ssl.gets }
+      ctx = OpenSSL::SSL::SSLContext.new
+      ctx.verify_mode = OpenSSL::SSL::VERIFY_PEER
+      ctx.cert_store = empty_store
+      assert_raise(OpenSSL::SSL::SSLError) {
+        server_connect(port, ctx)
       }
     }
   end
@@ -307,10 +429,15 @@ def test_verify_mode_client_cert_required
 
   def test_client_auth_success
     vflag = OpenSSL::SSL::VERIFY_PEER|OpenSSL::SSL::VERIFY_FAIL_IF_NO_PEER_CERT
-    start_server(verify_mode: vflag,
-      ctx_proc: proc { |ctx|
-        ctx.max_version = OpenSSL::SSL::TLS1_2_VERSION if libressl?(3, 2, 0)
-    }) { |port|
+    ctx_proc = proc { |ctx|
+      store = OpenSSL::X509::Store.new
+      store.add_cert(@ca_cert)
+      store.purpose = OpenSSL::X509::PURPOSE_SSL_CLIENT
+      ctx.cert_store = store
+      # LibreSSL doesn't support client_cert_cb in TLS 1.3
+      ctx.max_version = OpenSSL::SSL::TLS1_2_VERSION if libressl?
+    }
+    start_server(verify_mode: vflag, ctx_proc: ctx_proc) { |port|
       ctx = OpenSSL::SSL::SSLContext.new
       ctx.key = @cli_key
       ctx.cert = @cli_cert
@@ -352,9 +479,13 @@ def test_client_cert_cb_ignore_error
   end
 
   def test_client_ca
-    pend "LibreSSL 3.2 has broken client CA support" if libressl?(3, 2, 0)
+    pend "LibreSSL doesn't support certificate_authorities" if libressl?
 
     ctx_proc = Proc.new do |ctx|
+      store = OpenSSL::X509::Store.new
+      store.add_cert(@ca_cert)
+      store.purpose = OpenSSL::X509::PURPOSE_SSL_CLIENT
+      ctx.cert_store = store
       ctx.client_ca = [@ca_cert]
     end
 
@@ -420,7 +551,7 @@ def test_verify_result
       ssl.sync_close = true
       begin
         assert_raise(OpenSSL::SSL::SSLError){ ssl.connect }
-        assert_equal(OpenSSL::X509::V_ERR_SELF_SIGNED_CERT_IN_CHAIN, ssl.verify_result)
+        assert_equal(OpenSSL::X509::V_ERR_UNABLE_TO_GET_ISSUER_CERT_LOCALLY, ssl.verify_result)
       ensure
         ssl.close
       end
@@ -524,12 +655,9 @@ def test_finished_messages
     start_server(accept_proc: proc { |server|
       server_finished = server.finished_message
       server_peer_finished = server.peer_finished_message
-    }, ctx_proc: proc { |ctx|
-      ctx.max_version = OpenSSL::SSL::TLS1_2_VERSION if libressl?(3, 2, 0)
     }) { |port|
       ctx = OpenSSL::SSL::SSLContext.new
       ctx.verify_mode = OpenSSL::SSL::VERIFY_NONE
-      ctx.max_version = :TLS1_2 if libressl?(3, 2, 0) && !libressl?(3, 3, 0)
       server_connect(port, ctx) { |ssl|
         ssl.puts "abc"; ssl.gets
 
@@ -557,8 +685,10 @@ def test_sslctx_set_params
   end
 
   def test_post_connect_check_with_anon_ciphers
+    omit "AWS-LC does not support DHE ciphersuites" if aws_lc?
+
     ctx_proc = -> ctx {
-      ctx.ssl_version = :TLSv1_2
+      ctx.max_version = OpenSSL::SSL::TLS1_2_VERSION
       ctx.ciphers = "aNULL"
       ctx.tmp_dh = Fixtures.pkey("dh-1")
       ctx.security_level = 0
@@ -566,7 +696,7 @@ def test_post_connect_check_with_anon_ciphers
 
     start_server(ctx_proc: ctx_proc) { |port|
       ctx = OpenSSL::SSL::SSLContext.new
-      ctx.ssl_version = :TLSv1_2
+      ctx.max_version = OpenSSL::SSL::TLS1_2_VERSION
       ctx.ciphers = "aNULL"
       ctx.security_level = 0
       server_connect(port, ctx) { |ssl|
@@ -673,7 +803,7 @@ def test_verify_wildcard
     assert_equal(true,  OpenSSL::SSL.verify_wildcard("xn--qdk4b9b", "xn--qdk4b9b"))
   end
 
-  # Comments in this test is excerpted from http://tools.ietf.org/html/rfc6125#page-27
+  # Comments in this test is excerpted from https://www.rfc-editor.org/rfc/rfc6125#page-27
   def test_post_connection_check_wildcard_san
     # case-insensitive ASCII comparison
     # RFC 6125, section 6.4.1
@@ -710,11 +840,6 @@ def test_post_connection_check_wildcard_san
     #     buzz.example.net, respectively).  ...
     assert_equal(true, OpenSSL::SSL.verify_certificate_identity(
       create_cert_with_san('DNS:baz*.example.com'), 'baz1.example.com'))
-
-    # LibreSSL 3.5.0+ doesn't support other wildcard certificates
-    # (it isn't required to, as RFC states MAY, not MUST)
-    return if libressl?(3, 5, 0)
-
     assert_equal(true, OpenSSL::SSL.verify_certificate_identity(
       create_cert_with_san('DNS:*baz.example.com'), 'foobaz.example.com'))
     assert_equal(true, OpenSSL::SSL.verify_certificate_identity(
@@ -798,11 +923,17 @@ def test_post_connection_check_wildcard_cn
   end
 
   def create_cert_with_san(san)
-    ef = OpenSSL::X509::ExtensionFactory.new
     cert = OpenSSL::X509::Certificate.new
     cert.subject = OpenSSL::X509::Name.parse("/DC=some/DC=site/CN=Some Site")
-    ext = ef.create_ext('subjectAltName', san)
-    cert.add_extension(ext)
+    v = OpenSSL::ASN1::Sequence(san.split(",").map { |item|
+      type, value = item.split(":", 2)
+      case type
+      when "DNS" then OpenSSL::ASN1::IA5String(value, 2, :IMPLICIT)
+      when "IP" then OpenSSL::ASN1::OctetString(IPAddr.new(value).hton, 7, :IMPLICIT)
+      else raise "unsupported"
+      end
+    })
+    cert.add_extension(OpenSSL::X509::Extension.new("subjectAltName", v))
     cert
   end
 
@@ -839,7 +970,7 @@ def socketpair
   end
 
   def test_keylog_cb
-    pend "Keylog callback is not supported" if !openssl?(1, 1, 1) || libressl?
+    omit "Keylog callback is not supported" if libressl?
 
     prefix = 'CLIENT_RANDOM'
     context = OpenSSL::SSL::SSLContext.new
@@ -859,30 +990,28 @@ def test_keylog_cb
       end
     end
 
-    if tls13_supported?
-      prefixes = [
-        'SERVER_HANDSHAKE_TRAFFIC_SECRET',
-        'EXPORTER_SECRET',
-        'SERVER_TRAFFIC_SECRET_0',
-        'CLIENT_HANDSHAKE_TRAFFIC_SECRET',
-        'CLIENT_TRAFFIC_SECRET_0',
-      ]
-      context = OpenSSL::SSL::SSLContext.new
-      context.min_version = context.max_version = OpenSSL::SSL::TLS1_3_VERSION
-      cb_called = false
-      context.keylog_cb = proc do |_sock, line|
-        cb_called = true
-        assert_not_nil(prefixes.delete(line.split.first))
-      end
+    prefixes = [
+      'SERVER_HANDSHAKE_TRAFFIC_SECRET',
+      'EXPORTER_SECRET',
+      'SERVER_TRAFFIC_SECRET_0',
+      'CLIENT_HANDSHAKE_TRAFFIC_SECRET',
+      'CLIENT_TRAFFIC_SECRET_0',
+    ]
+    context = OpenSSL::SSL::SSLContext.new
+    context.min_version = context.max_version = OpenSSL::SSL::TLS1_3_VERSION
+    cb_called = false
+    context.keylog_cb = proc do |_sock, line|
+      cb_called = true
+      assert_not_nil(prefixes.delete(line.split.first))
+    end
 
-      start_server do |port|
-        server_connect(port, context) do |ssl|
-          ssl.puts "abc"
-          assert_equal("abc\n", ssl.gets)
-          assert_equal(true, cb_called)
-        end
-        assert_equal(0, prefixes.size)
+    start_server do |port|
+      server_connect(port, context) do |ssl|
+        ssl.puts "abc"
+        assert_equal("abc\n", ssl.gets)
+        assert_equal(true, cb_called)
       end
+      assert_equal(0, prefixes.size)
     end
   end
 
@@ -992,13 +1121,11 @@ def test_accept_errors_include_peeraddr
 
   def test_verify_hostname_on_connect
     ctx_proc = proc { |ctx|
-      san = "DNS:a.example.com,DNS:*.b.example.com"
-      san += ",DNS:c*.example.com,DNS:d.*.example.com" unless libressl?(3, 2, 2)
       exts = [
         ["keyUsage", "keyEncipherment,digitalSignature", true],
-        ["subjectAltName", san],
+        ["subjectAltName", "DNS:a.example.com,DNS:*.b.example.com," \
+                           "DNS:c*.example.com,DNS:d.*.example.com"],
       ]
-
       ctx.cert = issue_cert(@svr, @svr_key, 4, exts, @ca_cert, @ca_key)
       ctx.key = @svr_key
     }
@@ -1020,7 +1147,6 @@ def test_verify_hostname_on_connect
         ["cx.example.com", true],
         ["d.x.example.com", false],
       ].each do |name, expected_ok|
-        next if name.start_with?('cx') if libressl?(3, 2, 2)
         begin
           sock = TCPSocket.new("127.0.0.1", port)
           ssl = OpenSSL::SSL::SSLSocket.new(sock, ctx)
@@ -1029,7 +1155,7 @@ def test_verify_hostname_on_connect
             ssl.connect
             ssl.puts "abc"; assert_equal "abc\n", ssl.gets
           else
-            assert_handshake_error { ssl.connect }
+            assert_raise(OpenSSL::SSL::SSLError) { ssl.connect }
           end
         ensure
           ssl.close if ssl
@@ -1067,7 +1193,7 @@ def test_verify_hostname_failure_error_code
         sock = TCPSocket.new("127.0.0.1", port)
         ssl = OpenSSL::SSL::SSLSocket.new(sock, ctx)
         ssl.hostname = "b.example.com"
-        assert_handshake_error { ssl.connect }
+        assert_raise(OpenSSL::SSL::SSLError) { ssl.connect }
         assert_equal false, verify_callback_ok
         assert_equal OpenSSL::X509::V_ERR_HOSTNAME_MISMATCH, verify_callback_err
       ensure
@@ -1080,9 +1206,7 @@ def test_connect_certificate_verify_failed_exception_message
     start_server(ignore_listener_error: true) { |port|
       ctx = OpenSSL::SSL::SSLContext.new
       ctx.set_params
-      # OpenSSL <= 1.1.0: "self signed certificate in certificate chain"
-      # OpenSSL >= 3.0.0: "self-signed certificate in certificate chain"
-      assert_raise_with_message(OpenSSL::SSL::SSLError, /self.signed/) {
+      assert_raise_with_message(OpenSSL::SSL::SSLError, /unable to get local issuer certificate/) {
         server_connect(port, ctx)
       }
     }
@@ -1124,34 +1248,33 @@ def check_supported_protocol_versions
       OpenSSL::SSL::TLS1_VERSION,
       OpenSSL::SSL::TLS1_1_VERSION,
       OpenSSL::SSL::TLS1_2_VERSION,
-      # OpenSSL 1.1.1
-      defined?(OpenSSL::SSL::TLS1_3_VERSION) && OpenSSL::SSL::TLS1_3_VERSION,
-    ].compact
+      OpenSSL::SSL::TLS1_3_VERSION,
+    ]
 
-    # Prepare for testing & do sanity check
     supported = []
-    possible_versions.each do |ver|
-      catch(:unsupported) {
-        ctx_proc = proc { |ctx|
-          begin
-            ctx.min_version = ctx.max_version = ver
-          rescue ArgumentError, OpenSSL::SSL::SSLError
-            throw :unsupported
-          end
+    ctx_proc = proc { |ctx|
+      # The default security level is 1 in OpenSSL <= 3.1, 2 in OpenSSL >= 3.2
+      # In OpenSSL >= 3.0, TLS 1.1 or older is disabled at level 1
+      ctx.security_level = 0
+      # Explicitly reset them to avoid influenced by OPENSSL_CONF
+      ctx.min_version = ctx.max_version = nil
+    }
+    start_server(ctx_proc: ctx_proc, ignore_listener_error: true) do |port|
+      possible_versions.each do |ver|
+        ctx = OpenSSL::SSL::SSLContext.new
+        ctx.security_level = 0
+        ctx.min_version = ctx.max_version = ver
+        server_connect(port, ctx) { |ssl|
+          ssl.puts "abc"; assert_equal "abc\n", ssl.gets
         }
-        start_server(ctx_proc: ctx_proc, ignore_listener_error: true) do |port|
-          begin
-            server_connect(port) { |ssl|
-              ssl.puts "abc"; assert_equal "abc\n", ssl.gets
-            }
-          rescue OpenSSL::SSL::SSLError, Errno::ECONNRESET
-          else
-            supported << ver
-          end
-        end
-      }
+        supported << ver
+      rescue OpenSSL::SSL::SSLError, Errno::ECONNRESET
+      end
     end
-    assert_not_empty supported
+
+    # Sanity check: in our test suite we assume these are always supported
+    assert_include(supported, OpenSSL::SSL::TLS1_2_VERSION)
+    assert_include(supported, OpenSSL::SSL::TLS1_3_VERSION)
 
     supported
   end
@@ -1169,7 +1292,7 @@ def test_set_params_min_version
       start_server(ctx_proc: ctx_proc, ignore_listener_error: true) { |port|
         ctx = OpenSSL::SSL::SSLContext.new
         ctx.set_params(cert_store: store, verify_hostname: false)
-        assert_handshake_error { server_connect(port, ctx) { } }
+        assert_raise(OpenSSL::SSL::SSLError) { server_connect(port, ctx) }
       }
     end
   end
@@ -1185,18 +1308,20 @@ def test_minmax_version
       OpenSSL::SSL::TLS1_VERSION => { name: "TLSv1", method: "TLSv1" },
       OpenSSL::SSL::TLS1_1_VERSION => { name: "TLSv1.1", method: "TLSv1_1" },
       OpenSSL::SSL::TLS1_2_VERSION => { name: "TLSv1.2", method: "TLSv1_2" },
-      # OpenSSL 1.1.1
-      defined?(OpenSSL::SSL::TLS1_3_VERSION) && OpenSSL::SSL::TLS1_3_VERSION =>
-      { name: "TLSv1.3", method: nil },
+      OpenSSL::SSL::TLS1_3_VERSION => { name: "TLSv1.3", method: nil },
     }
 
     # Server enables a single version
     supported.each do |ver|
-      ctx_proc = proc { |ctx| ctx.min_version = ctx.max_version = ver }
+      ctx_proc = proc { |ctx|
+        ctx.security_level = 0
+        ctx.min_version = ctx.max_version = ver
+      }
       start_server(ctx_proc: ctx_proc, ignore_listener_error: true) { |port|
         supported.each do |cver|
           # Client enables a single version
           ctx1 = OpenSSL::SSL::SSLContext.new
+          ctx1.security_level = 0
           ctx1.min_version = ctx1.max_version = cver
           if ver == cver
             server_connect(port, ctx1) { |ssl|
@@ -1204,13 +1329,14 @@ def test_minmax_version
               ssl.puts "abc"; assert_equal "abc\n", ssl.gets
             }
           else
-            assert_handshake_error { server_connect(port, ctx1) { } }
+            assert_raise(OpenSSL::SSL::SSLError) { server_connect(port, ctx1) }
           end
 
           # There is no version-specific SSL methods for TLS 1.3
           if cver <= OpenSSL::SSL::TLS1_2_VERSION
             # Client enables a single version using #ssl_version=
             ctx2 = OpenSSL::SSL::SSLContext.new
+            ctx2.security_level = 0
             ctx2.ssl_version = vmap[cver][:method]
             if ver == cver
               server_connect(port, ctx2) { |ssl|
@@ -1218,13 +1344,14 @@ def test_minmax_version
                 ssl.puts "abc"; assert_equal "abc\n", ssl.gets
               }
             else
-              assert_handshake_error { server_connect(port, ctx2) { } }
+              assert_raise(OpenSSL::SSL::SSLError) { server_connect(port, ctx2) }
             end
           end
         end
 
         # Client enables all supported versions
         ctx3 = OpenSSL::SSL::SSLContext.new
+        ctx3.security_level = 0
         ctx3.min_version = ctx3.max_version = nil
         server_connect(port, ctx3) { |ssl|
           assert_equal vmap[ver][:name], ssl.ssl_version
@@ -1239,12 +1366,17 @@ def test_minmax_version
 
     # Server sets min_version (earliest is disabled)
     sver = supported[1]
-    ctx_proc = proc { |ctx| ctx.min_version = sver }
+    ctx_proc = proc { |ctx|
+      ctx.security_level = 0
+      ctx.min_version = sver
+    }
     start_server(ctx_proc: ctx_proc, ignore_listener_error: true) { |port|
       supported.each do |cver|
         # Client sets min_version
         ctx1 = OpenSSL::SSL::SSLContext.new
+        ctx1.security_level = 0
         ctx1.min_version = cver
+        ctx1.max_version = 0
         server_connect(port, ctx1) { |ssl|
           assert_equal vmap[supported.last][:name], ssl.ssl_version
           ssl.puts "abc"; assert_equal "abc\n", ssl.gets
@@ -1252,6 +1384,8 @@ def test_minmax_version
 
         # Client sets max_version
         ctx2 = OpenSSL::SSL::SSLContext.new
+        ctx2.security_level = 0
+        ctx2.min_version = 0
         ctx2.max_version = cver
         if cver >= sver
           server_connect(port, ctx2) { |ssl|
@@ -1259,14 +1393,18 @@ def test_minmax_version
             ssl.puts "abc"; assert_equal "abc\n", ssl.gets
           }
         else
-          assert_handshake_error { server_connect(port, ctx2) { } }
+          assert_raise(OpenSSL::SSL::SSLError) { server_connect(port, ctx2) }
         end
       end
     }
 
     # Server sets max_version (latest is disabled)
     sver = supported[-2]
-    ctx_proc = proc { |ctx| ctx.max_version = sver }
+    ctx_proc = proc { |ctx|
+      ctx.security_level = 0
+      ctx.min_version = 0
+      ctx.max_version = sver
+    }
     start_server(ctx_proc: ctx_proc, ignore_listener_error: true) { |port|
       supported.each do |cver|
         # Client sets min_version
@@ -1278,11 +1416,13 @@ def test_minmax_version
             ssl.puts "abc"; assert_equal "abc\n", ssl.gets
           }
         else
-          assert_handshake_error { server_connect(port, ctx1) { } }
+          assert_raise(OpenSSL::SSL::SSLError) { server_connect(port, ctx1) }
         end
 
         # Client sets max_version
         ctx2 = OpenSSL::SSL::SSLContext.new
+        ctx2.security_level = 0
+        ctx2.min_version = 0
         ctx2.max_version = cver
         server_connect(port, ctx2) { |ssl|
           if cver >= sver
@@ -1296,15 +1436,106 @@ def test_minmax_version
     }
   end
 
+  def test_minmax_version_system_default
+    omit "LibreSSL and AWS-LC do not support OPENSSL_CONF" if libressl? || aws_lc?
+
+    Tempfile.create("openssl.cnf") { |f|
+      f.puts(<<~EOF)
+        openssl_conf = default_conf
+        [default_conf]
+        ssl_conf = ssl_sect
+        [ssl_sect]
+        system_default = ssl_default_sect
+        [ssl_default_sect]
+        MaxProtocol = TLSv1.2
+      EOF
+      f.close
+
+      start_server(ignore_listener_error: true) do |port|
+        assert_separately([{ "OPENSSL_CONF" => f.path }, "-ropenssl", "-", port.to_s], <<~"end;")
+          sock = TCPSocket.new("127.0.0.1", ARGV[0].to_i)
+          ctx = OpenSSL::SSL::SSLContext.new
+          ctx.min_version = OpenSSL::SSL::TLS1_2_VERSION
+          ssl = OpenSSL::SSL::SSLSocket.new(sock, ctx)
+          ssl.sync_close = true
+          ssl.connect
+          assert_equal("TLSv1.2", ssl.ssl_version)
+          ssl.puts("abc"); assert_equal("abc\n", ssl.gets)
+          ssl.close
+        end;
+
+        assert_separately([{ "OPENSSL_CONF" => f.path }, "-ropenssl", "-", port.to_s], <<~"end;")
+          sock = TCPSocket.new("127.0.0.1", ARGV[0].to_i)
+          ctx = OpenSSL::SSL::SSLContext.new
+          ctx.min_version = OpenSSL::SSL::TLS1_2_VERSION
+          ctx.max_version = nil
+          ssl = OpenSSL::SSL::SSLSocket.new(sock, ctx)
+          ssl.sync_close = true
+          ssl.connect
+          assert_equal("TLSv1.3", ssl.ssl_version)
+          ssl.puts("abc"); assert_equal("abc\n", ssl.gets)
+          ssl.close
+        end;
+      end
+    }
+  end
+
+  def test_respect_system_default_min
+    omit "LibreSSL and AWS-LC do not support OPENSSL_CONF" if libressl? || aws_lc?
+
+    Tempfile.create("openssl.cnf") { |f|
+      f.puts(<<~EOF)
+        openssl_conf = default_conf
+        [default_conf]
+        ssl_conf = ssl_sect
+        [ssl_sect]
+        system_default = ssl_default_sect
+        [ssl_default_sect]
+        MinProtocol = TLSv1.3
+      EOF
+      f.close
+
+      ctx_proc = proc { |ctx|
+        ctx.min_version = ctx.max_version = OpenSSL::SSL::TLS1_2_VERSION
+      }
+      start_server(ctx_proc: ctx_proc, ignore_listener_error: true) do |port|
+        assert_separately([{ "OPENSSL_CONF" => f.path }, "-ropenssl", "-", port.to_s], <<~"end;")
+          sock = TCPSocket.new("127.0.0.1", ARGV[0].to_i)
+          ctx = OpenSSL::SSL::SSLContext.new
+          ssl = OpenSSL::SSL::SSLSocket.new(sock, ctx)
+          ssl.sync_close = true
+          assert_raise(OpenSSL::SSL::SSLError) do
+            ssl.connect
+          end
+          ssl.close
+        end;
+      end
+
+      ctx_proc = proc { |ctx|
+        ctx.min_version = ctx.max_version = OpenSSL::SSL::TLS1_3_VERSION
+      }
+      start_server(ctx_proc: ctx_proc, ignore_listener_error: true) do |port|
+        assert_separately([{ "OPENSSL_CONF" => f.path }, "-ropenssl", "-", port.to_s], <<~"end;")
+          sock = TCPSocket.new("127.0.0.1", ARGV[0].to_i)
+          ctx = OpenSSL::SSL::SSLContext.new
+          ssl = OpenSSL::SSL::SSLSocket.new(sock, ctx)
+          ssl.sync_close = true
+          ssl.connect
+          assert_equal("TLSv1.3", ssl.ssl_version)
+          ssl.puts("abc"); assert_equal("abc\n", ssl.gets)
+          ssl.close
+        end;
+      end
+    }
+  end
+
   def test_options_disable_versions
     # It's recommended to use SSLContext#{min,max}_version= instead in real
     # applications. The purpose of this test case is to check that SSL options
     # are properly propagated to OpenSSL library.
     supported = check_supported_protocol_versions
-    if !defined?(OpenSSL::SSL::TLS1_3_VERSION) ||
-        !supported.include?(OpenSSL::SSL::TLS1_2_VERSION) ||
-        !supported.include?(OpenSSL::SSL::TLS1_3_VERSION) ||
-        !defined?(OpenSSL::SSL::OP_NO_TLSv1_3) # LibreSSL < 3.4
+    if !supported.include?(OpenSSL::SSL::TLS1_2_VERSION) ||
+        !supported.include?(OpenSSL::SSL::TLS1_3_VERSION)
       pend "this test case requires both TLS 1.2 and TLS 1.3 to be supported " \
         "and enabled by default"
     end
@@ -1319,7 +1550,7 @@ def test_options_disable_versions
       # Client only supports TLS 1.2
       ctx1 = OpenSSL::SSL::SSLContext.new
       ctx1.min_version = ctx1.max_version = OpenSSL::SSL::TLS1_2_VERSION
-      assert_handshake_error { server_connect(port, ctx1) { } }
+      assert_raise(OpenSSL::SSL::SSLError) { server_connect(port, ctx1) }
 
       # Client only supports TLS 1.3
       ctx2 = OpenSSL::SSL::SSLContext.new
@@ -1335,7 +1566,7 @@ def test_options_disable_versions
       # Client doesn't support TLS 1.2
       ctx1 = OpenSSL::SSL::SSLContext.new
       ctx1.options |= OpenSSL::SSL::OP_NO_TLSv1_2
-      assert_handshake_error { server_connect(port, ctx1) { } }
+      assert_raise(OpenSSL::SSL::SSLError) { server_connect(port, ctx1) }
 
       # Client supports TLS 1.2 by default
       ctx2 = OpenSSL::SSL::SSLContext.new
@@ -1359,7 +1590,7 @@ def test_renegotiation_cb
     num_handshakes = 0
     renegotiation_cb = Proc.new { |ssl| num_handshakes += 1 }
     ctx_proc = Proc.new { |ctx| ctx.renegotiation_cb = renegotiation_cb }
-    start_server_version(:SSLv23, ctx_proc) { |port|
+    start_server(ctx_proc: ctx_proc) { |port|
       server_connect(port) { |ssl|
         assert_equal(1, num_handshakes)
         ssl.puts "abc"; assert_equal "abc\n", ssl.gets
@@ -1375,7 +1606,7 @@ def test_alpn_protocol_selection_ary
       }
       ctx.alpn_protocols = advertised
     }
-    start_server_version(:SSLv23, ctx_proc) { |port|
+    start_server(ctx_proc: ctx_proc) { |port|
       ctx = OpenSSL::SSL::SSLContext.new
       ctx.alpn_protocols = advertised
       server_connect(port, ctx) { |ssl|
@@ -1417,9 +1648,10 @@ def test_npn_protocol_selection_ary
 
     advertised = ["http/1.1", "spdy/2"]
     ctx_proc = proc { |ctx| ctx.npn_protocols = advertised }
-    start_server_version(:TLSv1_2, ctx_proc) { |port|
+    start_server(ctx_proc: ctx_proc) { |port|
       selector = lambda { |which|
         ctx = OpenSSL::SSL::SSLContext.new
+        ctx.max_version = :TLS1_2
         ctx.npn_select_cb = -> (protocols) { protocols.send(which) }
         server_connect(port, ctx) { |ssl|
           assert_equal(advertised.send(which), ssl.npn_protocol)
@@ -1439,9 +1671,10 @@ def advertised.each
       yield "spdy/2"
     end
     ctx_proc = Proc.new { |ctx| ctx.npn_protocols = advertised }
-    start_server_version(:TLSv1_2, ctx_proc) { |port|
+    start_server(ctx_proc: ctx_proc) { |port|
       selector = lambda { |selected, which|
         ctx = OpenSSL::SSL::SSLContext.new
+        ctx.max_version = :TLS1_2
         ctx.npn_select_cb = -> (protocols) { protocols.to_a.send(which) }
         server_connect(port, ctx) { |ssl|
           assert_equal(selected, ssl.npn_protocol)
@@ -1456,8 +1689,9 @@ def test_npn_protocol_selection_cancel
     return unless OpenSSL::SSL::SSLContext.method_defined?(:npn_select_cb)
 
     ctx_proc = Proc.new { |ctx| ctx.npn_protocols = ["http/1.1"] }
-    start_server_version(:TLSv1_2, ctx_proc) { |port|
+    start_server(ctx_proc: ctx_proc, ignore_listener_error: true) { |port|
       ctx = OpenSSL::SSL::SSLContext.new
+      ctx.max_version = :TLS1_2
       ctx.npn_select_cb = -> (protocols) { raise RuntimeError.new }
       assert_raise(RuntimeError) { server_connect(port, ctx) }
     }
@@ -1466,22 +1700,22 @@ def test_npn_protocol_selection_cancel
   def test_npn_advertised_protocol_too_long
     return unless OpenSSL::SSL::SSLContext.method_defined?(:npn_select_cb)
 
-    ctx_proc = Proc.new { |ctx| ctx.npn_protocols = ["a" * 256] }
-    start_server_version(:TLSv1_2, ctx_proc) { |port|
-      ctx = OpenSSL::SSL::SSLContext.new
-      ctx.npn_select_cb = -> (protocols) { protocols.first }
-      assert_handshake_error { server_connect(port, ctx) }
-    }
+    ctx = OpenSSL::SSL::SSLContext.new
+    assert_raise(OpenSSL::SSL::SSLError) do
+      ctx.npn_protocols = ["a" * 256]
+      ctx.setup
+    end
   end
 
   def test_npn_selected_protocol_too_long
     return unless OpenSSL::SSL::SSLContext.method_defined?(:npn_select_cb)
 
     ctx_proc = Proc.new { |ctx| ctx.npn_protocols = ["http/1.1"] }
-    start_server_version(:TLSv1_2, ctx_proc) { |port|
+    start_server(ctx_proc: ctx_proc, ignore_listener_error: true) { |port|
       ctx = OpenSSL::SSL::SSLContext.new
+      ctx.max_version = :TLS1_2
       ctx.npn_select_cb = -> (protocols) { "a" * 256 }
-      assert_handshake_error { server_connect(port, ctx) }
+      assert_raise(OpenSSL::SSL::SSLError) { server_connect(port, ctx) }
     }
   end
 
@@ -1515,12 +1749,12 @@ def test_sync_close_without_connect
   def test_get_ephemeral_key
     # kRSA
     ctx_proc1 = proc { |ctx|
-      ctx.ssl_version = :TLSv1_2
+      ctx.max_version = OpenSSL::SSL::TLS1_2_VERSION
       ctx.ciphers = "kRSA"
     }
     start_server(ctx_proc: ctx_proc1, ignore_listener_error: true) do |port|
       ctx = OpenSSL::SSL::SSLContext.new
-      ctx.ssl_version = :TLSv1_2
+      ctx.max_version = OpenSSL::SSL::TLS1_2_VERSION
       ctx.ciphers = "kRSA"
       begin
         server_connect(port, ctx) { |ssl| assert_nil ssl.tmp_key }
@@ -1531,30 +1765,27 @@ def test_get_ephemeral_key
     end
 
     # DHE
-    # TODO: How to test this with TLS 1.3?
-    ctx_proc2 = proc { |ctx|
-      ctx.ssl_version = :TLSv1_2
-      ctx.ciphers = "EDH"
-      ctx.tmp_dh = Fixtures.pkey("dh-1")
-    }
-    start_server(ctx_proc: ctx_proc2) do |port|
-      ctx = OpenSSL::SSL::SSLContext.new
-      ctx.ssl_version = :TLSv1_2
-      ctx.ciphers = "EDH"
-      server_connect(port, ctx) { |ssl|
-        assert_instance_of OpenSSL::PKey::DH, ssl.tmp_key
-      }
+    # OpenSSL 3.0 added support for named FFDHE groups in TLS 1.3
+    # LibreSSL does not support named FFDHE groups currently
+    # AWS-LC does not support DHE ciphersuites
+    if openssl?(3, 0, 0)
+      start_server do |port|
+        ctx = OpenSSL::SSL::SSLContext.new
+        ctx.groups = "ffdhe3072"
+        server_connect(port, ctx) { |ssl|
+          assert_instance_of OpenSSL::PKey::DH, ssl.tmp_key
+          assert_equal 3072, ssl.tmp_key.p.num_bits
+          ssl.puts "abc"; assert_equal "abc\n", ssl.gets
+        }
+      end
     end
 
     # ECDHE
     ctx_proc3 = proc { |ctx|
-      ctx.ciphers = "DEFAULT:!kRSA:!kEDH"
-      ctx.ecdh_curves = "P-256"
+      ctx.groups = "P-256"
     }
     start_server(ctx_proc: ctx_proc3) do |port|
-      ctx = OpenSSL::SSL::SSLContext.new
-      ctx.ciphers = "DEFAULT:!kRSA:!kEDH"
-      server_connect(port, ctx) { |ssl|
+      server_connect(port) { |ssl|
         assert_instance_of OpenSSL::PKey::EC, ssl.tmp_key
         ssl.puts "abc"; assert_equal "abc\n", ssl.gets
       }
@@ -1563,11 +1794,11 @@ def test_get_ephemeral_key
 
   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)
+    unless supported.include?(OpenSSL::SSL::TLS1_1_VERSION)
+      omit "TLS 1.1 support is required to run this test case"
+    end
 
-    pend "Fallback SCSV is not supported" unless \
-      OpenSSL::SSL::SSLContext.method_defined?(:enable_fallback_scsv)
+    omit "Fallback SCSV is not supported" if libressl?
 
     start_server do |port|
       ctx = OpenSSL::SSL::SSLContext.new
@@ -1578,11 +1809,15 @@ def test_fallback_scsv
     end
 
     ctx_proc = proc { |ctx|
+      ctx.security_level = 0
+      ctx.min_version = 0
       ctx.max_version = OpenSSL::SSL::TLS1_1_VERSION
     }
     start_server(ctx_proc: ctx_proc) do |port|
       ctx = OpenSSL::SSL::SSLContext.new
       ctx.enable_fallback_scsv
+      ctx.security_level = 0
+      ctx.min_version = 0
       ctx.max_version = OpenSSL::SSL::TLS1_1_VERSION
       # Here is OK too
       # TLS1.2 not supported, fallback to TLS1.1 and signaling the fallback
@@ -1600,19 +1835,24 @@ def test_fallback_scsv
       # Otherwise, this test fails when using openssl 1.1.1 (or later) that supports TLS1.3.
       # TODO: We may need another test for TLS1.3 because it seems to have a different mechanism.
       ctx1 = OpenSSL::SSL::SSLContext.new
+      ctx1.security_level = 0
+      ctx1.min_version = 0
       ctx1.max_version = OpenSSL::SSL::TLS1_2_VERSION
       s1 = OpenSSL::SSL::SSLSocket.new(sock1, ctx1)
 
       ctx2 = OpenSSL::SSL::SSLContext.new
       ctx2.enable_fallback_scsv
+      ctx2.security_level = 0
+      ctx2.min_version = 0
       ctx2.max_version = OpenSSL::SSL::TLS1_1_VERSION
       s2 = OpenSSL::SSL::SSLSocket.new(sock2, ctx2)
+      # AWS-LC has slightly different error messages in all-caps.
       t = Thread.new {
-        assert_raise_with_message(OpenSSL::SSL::SSLError, /inappropriate fallback/) {
+        assert_raise_with_message(OpenSSL::SSL::SSLError, /inappropriate fallback|INAPPROPRIATE_FALLBACK/) {
           s2.connect
         }
       }
-      assert_raise_with_message(OpenSSL::SSL::SSLError, /inappropriate fallback/) {
+      assert_raise_with_message(OpenSSL::SSL::SSLError, /inappropriate fallback|INAPPROPRIATE_FALLBACK/) {
         s1.accept
       }
       t.join
@@ -1623,6 +1863,8 @@ def test_fallback_scsv
   end
 
   def test_tmp_dh_callback
+    omit "AWS-LC does not support DHE ciphersuites" if aws_lc?
+
     dh = Fixtures.pkey("dh-1")
     called = false
     ctx_proc = -> ctx {
@@ -1642,11 +1884,6 @@ def test_tmp_dh_callback
   end
 
   def test_ciphersuites_method_tls_connection
-    ssl_ctx = OpenSSL::SSL::SSLContext.new
-    if !tls13_supported? || !ssl_ctx.respond_to?(:ciphersuites=)
-      pend 'TLS 1.3 not supported'
-    end
-
     csuite = ['TLS_AES_128_GCM_SHA256', 'TLSv1.3', 128, 128]
     inputs = [csuite[0], [csuite[0]], [csuite]]
 
@@ -1658,11 +1895,7 @@ def test_ciphersuites_method_tls_connection
 
         server_connect(port, cli_ctx) do |ssl|
           assert_equal('TLSv1.3', ssl.ssl_version)
-          if libressl?(3, 4, 0) && !libressl?(3, 5, 0)
-            assert_equal("AEAD-AES128-GCM-SHA256", ssl.cipher[0])
-          else
-            assert_equal(csuite[0], ssl.cipher[0])
-          end
+          assert_equal(csuite[0], ssl.cipher[0])
           ssl.puts('abc'); assert_equal("abc\n", ssl.gets)
         end
       end
@@ -1671,26 +1904,21 @@ def test_ciphersuites_method_tls_connection
 
   def test_ciphersuites_method_nil_argument
     ssl_ctx = OpenSSL::SSL::SSLContext.new
-    pend 'ciphersuites= method is missing' unless ssl_ctx.respond_to?(:ciphersuites=)
-
     assert_nothing_raised { ssl_ctx.ciphersuites = nil }
   end
 
   def test_ciphersuites_method_frozen_object
     ssl_ctx = OpenSSL::SSL::SSLContext.new
-    pend 'ciphersuites= method is missing' unless ssl_ctx.respond_to?(:ciphersuites=)
-
     ssl_ctx.freeze
     assert_raise(FrozenError) { ssl_ctx.ciphersuites = 'TLS_AES_256_GCM_SHA384' }
   end
 
   def test_ciphersuites_method_bogus_csuite
     ssl_ctx = OpenSSL::SSL::SSLContext.new
-    pend 'ciphersuites= method is missing' unless ssl_ctx.respond_to?(:ciphersuites=)
-
+    # AWS-LC has slightly different error messages in all-caps.
     assert_raise_with_message(
       OpenSSL::SSL::SSLError,
-      /SSL_CTX_set_ciphersuites: no cipher match/i
+      /SSL_CTX_set_ciphersuites: (no cipher match|NO_CIPHER_MATCH)/i
     ) { ssl_ctx.ciphersuites = 'BOGUS' }
   end
 
@@ -1726,19 +1954,96 @@ def test_ciphers_method_frozen_object
   end
 
   def test_ciphers_method_bogus_csuite
-    omit "Old #{OpenSSL::OPENSSL_LIBRARY_VERSION}" if
-      year = OpenSSL::OPENSSL_LIBRARY_VERSION[/\A OpenSSL\s+[01]\..*\s\K\d+\z/x] and
-      year.to_i <= 2018
-
     ssl_ctx = OpenSSL::SSL::SSLContext.new
 
+    # AWS-LC has slightly different error messages in all-caps.
     assert_raise_with_message(
       OpenSSL::SSL::SSLError,
-      /SSL_CTX_set_cipher_list: no cipher match/i
+      /SSL_CTX_set_cipher_list: (no cipher match|NO_CIPHER_MATCH)/i
     ) { ssl_ctx.ciphers = 'BOGUS' }
   end
 
+  def test_sigalgs
+    omit "SSL_CTX_set1_sigalgs_list() not supported" if libressl?
+
+    svr_exts = [
+      ["keyUsage", "keyEncipherment,digitalSignature", true],
+      ["subjectAltName", "DNS:localhost", false],
+    ]
+    ecdsa_key = Fixtures.pkey("p256")
+    ecdsa_cert = issue_cert(@svr, ecdsa_key, 10, svr_exts, @ca_cert, @ca_key)
+
+    ctx_proc = -> ctx {
+      # Unset values set by start_server
+      ctx.cert = ctx.key = ctx.extra_chain_cert = nil
+      ctx.add_certificate(@svr_cert, @svr_key, [@ca_cert]) # RSA
+      ctx.add_certificate(ecdsa_cert, ecdsa_key, [@ca_cert]) # ECDSA
+    }
+    start_server(ctx_proc: ctx_proc) do |port|
+      ctx1 = OpenSSL::SSL::SSLContext.new
+      ctx1.sigalgs = "rsa_pss_rsae_sha256"
+      server_connect(port, ctx1) { |ssl|
+        assert_kind_of(OpenSSL::PKey::RSA, ssl.peer_cert.public_key)
+        ssl.puts("abc"); ssl.gets
+      }
+
+      ctx2 = OpenSSL::SSL::SSLContext.new
+      ctx2.sigalgs = "ed25519:ecdsa_secp256r1_sha256"
+      server_connect(port, ctx2) { |ssl|
+        assert_kind_of(OpenSSL::PKey::EC, ssl.peer_cert.public_key)
+        ssl.puts("abc"); ssl.gets
+      }
+    end
+
+    # Frozen
+    ssl_ctx = OpenSSL::SSL::SSLContext.new
+    ssl_ctx.freeze
+    assert_raise(FrozenError) { ssl_ctx.sigalgs = "ECDSA+SHA256:RSA+SHA256" }
+
+    # Bogus
+    ssl_ctx = OpenSSL::SSL::SSLContext.new
+    assert_raise(TypeError) { ssl_ctx.sigalgs = nil }
+    assert_raise(OpenSSL::SSL::SSLError) { ssl_ctx.sigalgs = "BOGUS" }
+  end
+
+  def test_client_sigalgs
+    omit "SSL_CTX_set1_client_sigalgs_list() not supported" if libressl? || aws_lc?
+
+    cli_exts = [
+      ["keyUsage", "keyEncipherment,digitalSignature", true],
+      ["subjectAltName", "DNS:localhost", false],
+    ]
+    ecdsa_key = Fixtures.pkey("p256")
+    ecdsa_cert = issue_cert(@cli, ecdsa_key, 10, cli_exts, @ca_cert, @ca_key)
+
+    ctx_proc = -> ctx {
+      store = OpenSSL::X509::Store.new
+      store.add_cert(@ca_cert)
+      store.purpose = OpenSSL::X509::PURPOSE_SSL_CLIENT
+      ctx.cert_store = store
+      ctx.verify_mode = OpenSSL::SSL::VERIFY_PEER|OpenSSL::SSL::VERIFY_FAIL_IF_NO_PEER_CERT
+      ctx.client_sigalgs = "ECDSA+SHA256"
+    }
+    start_server(ctx_proc: ctx_proc, ignore_listener_error: true) do |port|
+      ctx1 = OpenSSL::SSL::SSLContext.new
+      ctx1.add_certificate(@cli_cert, @cli_key) # RSA
+      assert_handshake_error {
+        server_connect(port, ctx1) { |ssl|
+          ssl.puts("abc"); ssl.gets
+        }
+      }
+
+      ctx2 = OpenSSL::SSL::SSLContext.new
+      ctx2.add_certificate(ecdsa_cert, ecdsa_key) # ECDSA
+      server_connect(port, ctx2) { |ssl|
+        ssl.puts("abc"); ssl.gets
+      }
+    end
+  end
+
   def test_connect_works_when_setting_dh_callback_to_nil
+    omit "AWS-LC does not support DHE ciphersuites" if aws_lc?
+
     ctx_proc = -> ctx {
       ctx.max_version = :TLS1_2
       ctx.ciphers = "DH:!NULL" # use DH
@@ -1754,6 +2059,8 @@ def test_connect_works_when_setting_dh_callback_to_nil
   end
 
   def test_tmp_dh
+    omit "AWS-LC does not support DHE ciphersuites" if aws_lc?
+
     dh = Fixtures.pkey("dh-1")
     ctx_proc = -> ctx {
       ctx.max_version = :TLS1_2
@@ -1767,17 +2074,17 @@ def test_tmp_dh
     end
   end
 
-  def test_ecdh_curves_tls12
+  def test_set_groups_tls12
     ctx_proc = -> ctx {
       # Enable both ECDHE (~ TLS 1.2) cipher suites and TLS 1.3
       ctx.max_version = OpenSSL::SSL::TLS1_2_VERSION
       ctx.ciphers = "kEECDH"
-      ctx.ecdh_curves = "P-384:P-521"
+      ctx.groups = "P-384:P-521"
     }
     start_server(ctx_proc: ctx_proc, ignore_listener_error: true) do |port|
       # Test 1: Client=P-256:P-384, Server=P-384:P-521 --> P-384
       ctx = OpenSSL::SSL::SSLContext.new
-      ctx.ecdh_curves = "P-256:P-384"
+      ctx.groups = "P-256:P-384"
       server_connect(port, ctx) { |ssl|
         cs = ssl.cipher[0]
         assert_match (/\AECDH/), cs
@@ -1787,31 +2094,36 @@ def test_ecdh_curves_tls12
 
       # Test 2: Client=P-256, Server=P-521:P-384 --> Fail
       ctx = OpenSSL::SSL::SSLContext.new
-      ctx.ecdh_curves = "P-256"
+      ctx.groups = "P-256"
       assert_raise(OpenSSL::SSL::SSLError) {
         server_connect(port, ctx) { }
       }
 
       # Test 3: Client=P-521:P-384, Server=P-521:P-384 --> P-521
       ctx = OpenSSL::SSL::SSLContext.new
-      ctx.ecdh_curves = "P-521:P-384"
+      ctx.groups = "P-521:P-384"
       server_connect(port, ctx) { |ssl|
         assert_equal "secp521r1", ssl.tmp_key.group.curve_name
         ssl.puts "abc"; assert_equal "abc\n", ssl.gets
       }
+
+      # Test 4: #ecdh_curves= alias
+      ctx = OpenSSL::SSL::SSLContext.new
+      ctx.ecdh_curves = "P-256:P-384"
+      server_connect(port, ctx) { |ssl|
+        assert_equal "secp384r1", ssl.tmp_key.group.curve_name
+      }
     end
   end
 
-  def test_ecdh_curves_tls13
-    pend "TLS 1.3 not supported" unless tls13_supported?
-
+  def test_set_groups_tls13
     ctx_proc = -> ctx {
       # Assume TLS 1.3 is enabled and chosen by default
-      ctx.ecdh_curves = "P-384:P-521"
+      ctx.groups = "P-384:P-521"
     }
     start_server(ctx_proc: ctx_proc, ignore_listener_error: true) do |port|
       ctx = OpenSSL::SSL::SSLContext.new
-      ctx.ecdh_curves = "P-256:P-384" # disable P-521
+      ctx.groups = "P-256:P-384" # disable P-521
 
       server_connect(port, ctx) { |ssl|
         assert_equal "TLSv1.3", ssl.ssl_version
@@ -1823,9 +2135,8 @@ def test_ecdh_curves_tls13
 
   def test_security_level
     ctx = OpenSSL::SSL::SSLContext.new
-    begin
-      ctx.security_level = 1
-    rescue NotImplementedError
+    ctx.security_level = 1
+    if aws_lc? # AWS-LC does not support security levels.
       assert_equal(0, ctx.security_level)
       return
     end
@@ -1904,20 +2215,6 @@ def test_export_keying_material
 
   private
 
-  def start_server_version(version, ctx_proc = nil,
-                           server_proc = method(:readwrite_loop), &blk)
-    ctx_wrap = Proc.new { |ctx|
-      ctx.ssl_version = version
-      ctx_proc.call(ctx) if ctx_proc
-    }
-    start_server(
-      ctx_proc: ctx_wrap,
-      server_proc: server_proc,
-      ignore_listener_error: true,
-      &blk
-    )
-  end
-
   def server_connect(port, ctx = nil)
     sock = TCPSocket.new("127.0.0.1", port)
     ssl = ctx ? OpenSSL::SSL::SSLSocket.new(sock, ctx) : OpenSSL::SSL::SSLSocket.new(sock)
diff --git a/test/openssl/test_ssl_session.rb b/test/openssl/test_ssl_session.rb
index 89cf672a7bcc27..f453f58657f143 100644
--- a/test/openssl/test_ssl_session.rb
+++ b/test/openssl/test_ssl_session.rb
@@ -5,7 +5,9 @@
 
 class OpenSSL::TestSSLSession < OpenSSL::SSLTestCase
   def test_session
-    ctx_proc = proc { |ctx| ctx.ssl_version = :TLSv1_2 }
+    ctx_proc = proc { |ctx|
+      ctx.max_version = OpenSSL::SSL::TLS1_2_VERSION
+    }
     start_server(ctx_proc: ctx_proc) do |port|
       server_connect_with_session(port, nil, nil) { |ssl|
         session = ssl.session
@@ -28,9 +30,10 @@ def test_session
     end
   end
 
+  # PEM file updated to use TLS 1.2 with ECDHE-RSA-AES256-SHA.
   DUMMY_SESSION = <<__EOS__
 -----BEGIN SSL SESSION PARAMETERS-----
-MIIDzQIBAQICAwEEAgA5BCAF219w9ZEV8dNA60cpEGOI34hJtIFbf3bkfzSgMyad
+MIIDzQIBAQICAwMEAsAUBCAF219w9ZEV8dNA60cpEGOI34hJtIFbf3bkfzSgMyad
 MQQwyGLbkCxE4OiMLdKKem+pyh8V7ifoP7tCxhdmwoDlJxI1v6nVCjai+FGYuncy
 NNSWoQYCBE4DDWuiAwIBCqOCAo4wggKKMIIBcqADAgECAgECMA0GCSqGSIb3DQEB
 BQUAMD0xEzARBgoJkiaJk/IsZAEZFgNvcmcxGTAXBgoJkiaJk/IsZAEZFglydWJ5
@@ -54,9 +57,10 @@ def test_session
 -----END SSL SESSION PARAMETERS-----
 __EOS__
 
+  # PEM file updated to use TLS 1.1 with ECDHE-RSA-AES256-SHA.
   DUMMY_SESSION_NO_EXT = <<-__EOS__
 -----BEGIN SSL SESSION PARAMETERS-----
-MIIDCAIBAQICAwAEAgA5BCDyAW7rcpzMjDSosH+Tv6sukymeqgq3xQVVMez628A+
+MIIDCAIBAQICAwIEAsAUBCDyAW7rcpzMjDSosH+Tv6sukymeqgq3xQVVMez628A+
 lAQw9TrKzrIqlHEh6ltuQaqv/Aq83AmaAlogYktZgXAjOGnhX7ifJDNLMuCfQq53
 hPAaoQYCBE4iDeeiBAICASyjggKOMIICijCCAXKgAwIBAgIBAjANBgkqhkiG9w0B
 AQUFADA9MRMwEQYKCZImiZPyLGQBGRYDb3JnMRkwFwYKCZImiZPyLGQBGRYJcnVi
@@ -120,7 +124,8 @@ def test_resumption
       ctx.options &= ~OpenSSL::SSL::OP_NO_TICKET
       # Disable server-side session cache which is enabled by default
       ctx.session_cache_mode = OpenSSL::SSL::SSLContext::SESSION_CACHE_OFF
-      ctx.max_version = OpenSSL::SSL::TLS1_2_VERSION if libressl?(3, 2, 0)
+      # Session tickets must be retrieved via ctx.session_new_cb in TLS 1.3 in AWS-LC.
+      ctx.max_version = OpenSSL::SSL::TLS1_2_VERSION if libressl? || aws_lc?
     }
     start_server(ctx_proc: ctx_proc) do |port|
       sess1 = server_connect_with_session(port, nil, nil) { |ssl|
@@ -143,7 +148,7 @@ def test_resumption
 
   def test_server_session_cache
     ctx_proc = Proc.new do |ctx|
-      ctx.ssl_version = :TLSv1_2
+      ctx.max_version = OpenSSL::SSL::TLS1_2_VERSION
       ctx.options |= OpenSSL::SSL::OP_NO_TICKET
     end
 
@@ -197,7 +202,7 @@ def test_server_session_cache
       10.times do |i|
         connections = i
         cctx = OpenSSL::SSL::SSLContext.new
-        cctx.ssl_version = :TLSv1_2
+        cctx.max_version = OpenSSL::SSL::TLS1_2_VERSION
         server_connect_with_session(port, cctx, first_session) { |ssl|
           ssl.puts("abc"); assert_equal "abc\n", ssl.gets
           first_session ||= ssl.session
@@ -219,11 +224,11 @@ def test_server_session_cache
   # deadlock.
   TEST_SESSION_REMOVE_CB = ENV["OSSL_TEST_ALL"] == "1"
 
-  def test_ctx_client_session_cb
-    ctx_proc = proc { |ctx| ctx.ssl_version = :TLSv1_2 }
-    start_server(ctx_proc: ctx_proc) do |port|
+  def test_ctx_client_session_cb_tls12
+    start_server do |port|
       called = {}
       ctx = OpenSSL::SSL::SSLContext.new
+      ctx.min_version = ctx.max_version = :TLS1_2
       ctx.session_cache_mode = OpenSSL::SSL::SSLContext::SESSION_CACHE_CLIENT
       ctx.session_new_cb = lambda { |ary|
         sock, sess = ary
@@ -233,19 +238,69 @@ def test_ctx_client_session_cb
         ctx.session_remove_cb = lambda { |ary|
           ctx, sess = ary
           called[:remove] = [ctx, sess]
-          # any resulting value is OK (ignored)
         }
       end
 
       server_connect_with_session(port, ctx, nil) { |ssl|
-        assert_equal(1, ctx.session_cache_stats[:cache_num])
         assert_equal(1, ctx.session_cache_stats[:connect_good])
         assert_equal([ssl, ssl.session], called[:new])
-        assert(ctx.session_remove(ssl.session))
-        assert(!ctx.session_remove(ssl.session))
-        if TEST_SESSION_REMOVE_CB
-          assert_equal([ctx, ssl.session], called[:remove])
+        # AWS-LC doesn't support internal session caching on the client, but
+        # the callback is still enabled as expected.
+        unless aws_lc?
+          assert_equal(1, ctx.session_cache_stats[:cache_num])
+          assert_equal(true, ctx.session_remove(ssl.session))
+          if TEST_SESSION_REMOVE_CB
+            assert_equal([ctx, ssl.session], called[:remove])
+          end
         end
+        assert_equal(false, ctx.session_remove(ssl.session))
+      }
+    end
+  end
+
+  def test_ctx_client_session_cb_tls13
+    omit "LibreSSL does not call session_new_cb in TLS 1.3" if libressl?
+    omit "AWS-LC does not support internal session caching on the client" if aws_lc?
+
+    start_server do |port|
+      called = {}
+      ctx = OpenSSL::SSL::SSLContext.new
+      ctx.min_version = :TLS1_3
+      ctx.session_cache_mode = OpenSSL::SSL::SSLContext::SESSION_CACHE_CLIENT
+      ctx.session_new_cb = lambda { |ary|
+        sock, sess = ary
+        called[:new] = [sock, sess]
+      }
+
+      server_connect_with_session(port, ctx, nil) { |ssl|
+        ssl.puts("abc"); assert_equal("abc\n", ssl.gets)
+
+        assert_operator(1, :<=, ctx.session_cache_stats[:cache_num])
+        assert_operator(1, :<=, ctx.session_cache_stats[:connect_good])
+        assert_equal([ssl, ssl.session], called[:new])
+      }
+    end
+  end
+
+  def test_ctx_client_session_cb_tls13_exception
+    omit "LibreSSL does not call session_new_cb in TLS 1.3" if libressl?
+
+    server_proc = lambda do |ctx, ssl|
+      readwrite_loop(ctx, ssl)
+    rescue SystemCallError, OpenSSL::SSL::SSLError
+    end
+    start_server(server_proc: server_proc) do |port|
+      ctx = OpenSSL::SSL::SSLContext.new
+      ctx.min_version = :TLS1_3
+      ctx.session_cache_mode = OpenSSL::SSL::SSLContext::SESSION_CACHE_CLIENT
+      ctx.session_new_cb = lambda { |ary|
+        raise "in session_new_cb"
+      }
+
+      server_connect_with_session(port, ctx, nil) { |ssl|
+        assert_raise_with_message(RuntimeError, /in session_new_cb/) {
+          ssl.puts("abc"); assert_equal("abc\n", ssl.gets)
+        }
       }
     end
   end
@@ -254,11 +309,11 @@ def test_ctx_server_session_cb
     connections = nil
     called = {}
     cctx = OpenSSL::SSL::SSLContext.new
-    cctx.ssl_version = :TLSv1_2
+    cctx.max_version = OpenSSL::SSL::TLS1_2_VERSION
     sctx = nil
     ctx_proc = Proc.new { |ctx|
       sctx = ctx
-      ctx.ssl_version = :TLSv1_2
+      ctx.max_version = OpenSSL::SSL::TLS1_2_VERSION
       ctx.options |= OpenSSL::SSL::OP_NO_TICKET
 
       # get_cb is called whenever a client proposed to resume a session but
@@ -328,11 +383,6 @@ def test_ctx_server_session_cb
       connections = 2
       sess2 = server_connect_with_session(port, cctx, sess0.dup) { |ssl|
         ssl.puts("abc"); assert_equal "abc\n", ssl.gets
-        if !ssl.session_reused? && openssl?(1, 1, 0) && !openssl?(1, 1, 0, 7)
-          # OpenSSL >= 1.1.0, < 1.1.0g
-          pend "External session cache is not working; " \
-            "see https://github.com/openssl/openssl/pull/4014"
-        end
         assert_equal true, ssl.session_reused?
         ssl.session
       }
diff --git a/test/openssl/test_ts.rb b/test/openssl/test_ts.rb
index 7cb1a1fe8eb072..ac0469ad567e1e 100644
--- a/test/openssl/test_ts.rb
+++ b/test/openssl/test_ts.rb
@@ -323,6 +323,8 @@ def test_response_default_policy
     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)
+
+    assert_match(/1\.2\.3\.4\.6/, resp.to_text)
   end
 
   def test_response_bad_purpose
diff --git a/test/openssl/test_x509attr.rb b/test/openssl/test_x509attr.rb
index 2919d23d2d38c7..bec03a1871d10c 100644
--- a/test/openssl/test_x509attr.rb
+++ b/test/openssl/test_x509attr.rb
@@ -48,6 +48,10 @@ def test_invalid_value
     assert_raise(TypeError) {
       attr.value = "1234"
     }
+    assert_raise(OpenSSL::X509::AttributeError) {
+      v = OpenSSL::ASN1::Set([OpenSSL::ASN1::UTF8String("1234")], 17, :EXPLICIT)
+      attr.value = v
+    }
     assert_equal(test_der, attr.to_der)
     assert_raise(OpenSSL::X509::AttributeError) {
       attr.oid = "abc123"
diff --git a/test/openssl/test_x509cert.rb b/test/openssl/test_x509cert.rb
index 64805504de36a5..5fc87d9c675d46 100644
--- a/test/openssl/test_x509cert.rb
+++ b/test/openssl/test_x509cert.rb
@@ -68,7 +68,7 @@ def test_validity
     assert_equal(now.getutc, cert.not_after)
   end
 
-  def test_extension
+  def test_extension_factory
     ca_exts = [
       ["basicConstraints","CA:TRUE",true],
       ["keyUsage","keyCertSign, cRLSign",true],
@@ -76,9 +76,6 @@ def test_extension
       ["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?)
@@ -90,7 +87,6 @@ def test_extension
       ["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)
@@ -98,15 +94,54 @@ 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)
+  end
+
+  def test_akiski
+    ca_cert = generate_cert(@ca, @rsa2048, 4, nil)
+    ef = OpenSSL::X509::ExtensionFactory.new(ca_cert, ca_cert)
+    ca_cert.add_extension(
+      ef.create_extension("subjectKeyIdentifier", "hash", false))
+    ca_cert.add_extension(
+      ef.create_extension("authorityKeyIdentifier", "issuer:always,keyid:always", false))
+    ca_cert.sign(@rsa2048, "sha256")
+
+    ca_keyid = get_subject_key_id(ca_cert.to_der, hex: false)
+    assert_equal ca_keyid, ca_cert.authority_key_identifier
+    assert_equal ca_keyid, ca_cert.subject_key_identifier
+
+    ee_cert = generate_cert(@ee1, Fixtures.pkey("p256"), 5, ca_cert)
+    ef = OpenSSL::X509::ExtensionFactory.new(ca_cert, ee_cert)
+    ee_cert.add_extension(
+      ef.create_extension("subjectKeyIdentifier", "hash", false))
+    ee_cert.add_extension(
+      ef.create_extension("authorityKeyIdentifier", "issuer:always,keyid:always", false))
+    ee_cert.sign(@rsa2048, "sha256")
+
+    ee_keyid = get_subject_key_id(ee_cert.to_der, hex: false)
+    assert_equal ca_keyid, ee_cert.authority_key_identifier
+    assert_equal ee_keyid, ee_cert.subject_key_identifier
+  end
+
+  def test_akiski_missing
+    cert = issue_cert(@ee1, @rsa2048, 1, [], nil, nil)
+    assert_nil(cert.authority_key_identifier)
+    assert_nil(cert.subject_key_identifier)
+  end
 
+  def test_crl_uris_no_crl_distribution_points
+    cert = issue_cert(@ee1, @rsa2048, 1, [], nil, nil)
+    assert_nil(cert.crl_uris)
+  end
+
+  def test_crl_uris
+    # Multiple DistributionPoint contains a single general name each
     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)
+    cdp_cert = generate_cert(@ee1, @rsa2048, 3, nil)
     ef.subject_certificate = cdp_cert
     cdp_cert.add_extension(ef.create_extension("crlDistributionPoints", "@crlDistPts"))
     cdp_cert.sign(@rsa2048, "sha256")
@@ -114,9 +149,50 @@ def test_extension
       ["http://www.example.com/crl", "ldap://ldap.example.com/cn=ca?certificateRevocationList;binary"],
       cdp_cert.crl_uris
     )
+  end
+
+  def test_crl_uris_multiple_general_names
+    # Single DistributionPoint contains multiple general names of type URI
+    ef = OpenSSL::X509::ExtensionFactory.new
+    ef.config = OpenSSL::Config.parse(<<~_cnf_)
+      [crlDistPts_section]
+      fullname = URI:http://www.example.com/crl, URI:ldap://ldap.example.com/cn=ca?certificateRevocationList;binary
+    _cnf_
+    cdp_cert = generate_cert(@ee1, @rsa2048, 3, nil)
+    ef.subject_certificate = cdp_cert
+    cdp_cert.add_extension(ef.create_extension("crlDistributionPoints", "crlDistPts_section"))
+    cdp_cert.sign(@rsa2048, "sha256")
+    assert_equal(
+      ["http://www.example.com/crl", "ldap://ldap.example.com/cn=ca?certificateRevocationList;binary"],
+      cdp_cert.crl_uris
+    )
+  end
+
+  def test_crl_uris_no_uris
+    # The only DistributionPointName is a directoryName
+    ef = OpenSSL::X509::ExtensionFactory.new
+    ef.config = OpenSSL::Config.parse(<<~_cnf_)
+      [crlDistPts_section]
+      fullname = dirName:dirname_section
+      [dirname_section]
+      CN = dirname
+    _cnf_
+    cdp_cert = generate_cert(@ee1, @rsa2048, 3, nil)
+    ef.subject_certificate = cdp_cert
+    cdp_cert.add_extension(ef.create_extension("crlDistributionPoints", "crlDistPts_section"))
+    cdp_cert.sign(@rsa2048, "sha256")
+    assert_nil(cdp_cert.crl_uris)
+  end
+
+  def test_aia_missing
+    cert = issue_cert(@ee1, @rsa2048, 1, [], nil, nil)
+    assert_nil(cert.ca_issuer_uris)
+    assert_nil(cert.ocsp_uris)
+  end
 
+  def test_aia
     ef = OpenSSL::X509::ExtensionFactory.new
-    aia_cert = generate_cert(@ee1, @rsa1024, 4, ca_cert)
+    aia_cert = generate_cert(@ee1, @rsa2048, 4, nil)
     ef.subject_certificate = aia_cert
     aia_cert.add_extension(
       ef.create_extension(
@@ -137,13 +213,6 @@ def test_extension
       ["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
@@ -222,6 +291,14 @@ def test_sign_and_verify_dsa_md5
     }
   end
 
+  def test_sign_and_verify_ed25519
+    # Ed25519 is not FIPS-approved.
+    omit_on_fips
+    ed25519 = OpenSSL::PKey::generate_key("ED25519")
+    cert = issue_cert(@ca, ed25519, 1, [], nil, nil, digest: nil)
+    assert_equal(true, cert.verify(ed25519))
+  end
+
   def test_dsa_with_sha2
     cert = issue_cert(@ca, @dsa256, 1, [], nil, nil, digest: "sha256")
     assert_equal("dsa_with_SHA256", cert.signature_algorithm)
@@ -291,37 +368,63 @@ def test_marshal
   end
 
   def test_load_file_empty_pem
-    empty_path = Fixtures.file_path("pkey", "empty.pem")
-    assert_raise(OpenSSL::X509::CertificateError) do
-      OpenSSL::X509::Certificate.load_file(empty_path)
+    Tempfile.create("empty.pem") do |f|
+      f.close
+
+      assert_raise(OpenSSL::X509::CertificateError) do
+        OpenSSL::X509::Certificate.load_file(f.path)
+      end
     end
   end
 
   def test_load_file_fullchain_pem
-    fullchain_path = Fixtures.file_path("pkey", "fullchain.pem")
-    certificates = OpenSSL::X509::Certificate.load_file(fullchain_path)
-    assert_equal 2, certificates.size
-    assert_equal "/CN=www.codeotaku.com", certificates[0].subject.to_s
-    assert_equal "/C=US/O=Let's Encrypt/CN=R3", certificates[1].subject.to_s
+    cert1 = issue_cert(@ee1, @rsa2048, 1, [], nil, nil)
+    cert2 = issue_cert(@ca, @rsa2048, 1, [], nil, nil)
+
+    Tempfile.create("fullchain.pem") do |f|
+      f.puts cert1.to_pem
+      f.puts cert2.to_pem
+      f.close
+
+      certificates = OpenSSL::X509::Certificate.load_file(f.path)
+      assert_equal 2, certificates.size
+      assert_equal @ee1, certificates[0].subject
+      assert_equal @ca, certificates[1].subject
+    end
   end
 
   def test_load_file_certificate_der
-    fullchain_path = Fixtures.file_path("pkey", "certificate.der")
-    certificates = OpenSSL::X509::Certificate.load_file(fullchain_path)
+    cert = issue_cert(@ca, @rsa2048, 1, [], nil, nil)
+    Tempfile.create("certificate.der", binmode: true) do |f|
+      f.write cert.to_der
+      f.close
+
+      certificates = OpenSSL::X509::Certificate.load_file(f.path)
 
-    # DER encoding can only contain one certificate:
-    assert_equal 1, certificates.size
-    assert_equal "/CN=www.codeotaku.com", certificates[0].subject.to_s
+      # DER encoding can only contain one certificate:
+      assert_equal 1, certificates.size
+      assert_equal cert.to_der, certificates[0].to_der
+    end
   end
 
   def test_load_file_fullchain_garbage
-    fullchain_path = Fixtures.file_path("pkey", "garbage.txt")
+    Tempfile.create("garbage.txt") do |f|
+      f.puts "not a certificate"
+      f.close
 
-    assert_raise(OpenSSL::X509::CertificateError) do
-      OpenSSL::X509::Certificate.load_file(fullchain_path)
+      assert_raise(OpenSSL::X509::CertificateError) do
+        OpenSSL::X509::Certificate.load_file(f.path)
+      end
     end
   end
 
+  def test_tbs_precert_bytes
+    cert = issue_cert(@ca, @rsa2048, 1, [], nil, nil)
+    seq = OpenSSL::ASN1.decode(cert.tbs_bytes)
+
+    assert_equal 7, seq.value.size
+  end
+
   private
 
   def certificate_error_returns_false
diff --git a/test/openssl/test_x509crl.rb b/test/openssl/test_x509crl.rb
index 146ee073098c2e..89165388db197a 100644
--- a/test/openssl/test_x509crl.rb
+++ b/test/openssl/test_x509crl.rb
@@ -204,6 +204,21 @@ def test_sign_and_verify
     assert_equal(false, crl.verify(@dsa512))
   end
 
+  def test_sign_and_verify_ed25519
+    # Ed25519 is not FIPS-approved.
+    omit_on_fips
+    ed25519 = OpenSSL::PKey::generate_key("ED25519")
+    cert = issue_cert(@ca, ed25519, 1, [], nil, nil, digest: nil)
+    crl = issue_crl([], 1, Time.now, Time.now+1600, [],
+                    cert, ed25519, nil)
+    assert_equal(false, crl_error_returns_false { crl.verify(@rsa1024) })
+    assert_equal(false, crl_error_returns_false { crl.verify(@rsa2048) })
+    assert_equal(false, crl.verify(OpenSSL::PKey::generate_key("ED25519")))
+    assert_equal(true,  crl.verify(ed25519))
+    crl.version = 0
+    assert_equal(false, crl.verify(ed25519))
+  end
+
   def test_revoked_to_der
     # revokedCertificates     SEQUENCE OF SEQUENCE  {
     #      userCertificate         CertificateSerialNumber,
diff --git a/test/openssl/test_x509ext.rb b/test/openssl/test_x509ext.rb
index 838780d3250478..59a41ed7369fdc 100644
--- a/test/openssl/test_x509ext.rb
+++ b/test/openssl/test_x509ext.rb
@@ -50,24 +50,22 @@ def test_create_by_factory
     cdp = ef.create_extension("crlDistributionPoints", "@crlDistPts")
     assert_equal(false, cdp.critical?)
     assert_equal("crlDistributionPoints", cdp.oid)
-    assert_match(%{URI:http://www\.example\.com/crl}, cdp.value)
-    assert_match(
-      %r{URI:ldap://ldap\.example\.com/cn=ca\?certificateRevocationList;binary},
-      cdp.value)
+    assert_include(cdp.value, "URI:http://www.example.com/crl")
+    assert_include(cdp.value,
+      "URI:ldap://ldap.example.com/cn=ca?certificateRevocationList;binary")
 
     cdp = ef.create_extension("crlDistributionPoints", "critical, @crlDistPts")
     assert_equal(true, cdp.critical?)
     assert_equal("crlDistributionPoints", cdp.oid)
-    assert_match(%{URI:http://www.example.com/crl}, cdp.value)
-    assert_match(
-      %r{URI:ldap://ldap.example.com/cn=ca\?certificateRevocationList;binary},
-      cdp.value)
+    assert_include(cdp.value, "URI:http://www.example.com/crl")
+    assert_include(cdp.value,
+      "URI:ldap://ldap.example.com/cn=ca?certificateRevocationList;binary")
 
     cp = ef.create_extension("certificatePolicies", "@certPolicies")
     assert_equal(false, cp.critical?)
     assert_equal("certificatePolicies", cp.oid)
-    assert_match(%r{2.23.140.1.2.1}, cp.value)
-    assert_match(%r{http://cps.example.com}, cp.value)
+    assert_include(cp.value, "2.23.140.1.2.1")
+    assert_include(cp.value, "http://cps.example.com")
   end
 
   def test_factory_create_extension_sn_ln
diff --git a/test/openssl/test_x509req.rb b/test/openssl/test_x509req.rb
index ff17c411630626..18d3e7f8f30450 100644
--- a/test/openssl/test_x509req.rb
+++ b/test/openssl/test_x509req.rb
@@ -17,21 +17,21 @@ def issue_csr(ver, dn, key, digest)
     req = OpenSSL::X509::Request.new
     req.version = ver
     req.subject = dn
-    req.public_key = key.public_key
+    req.public_key = key
     req.sign(key, digest)
     req
   end
 
   def test_public_key
     req = issue_csr(0, @dn, @rsa1024, OpenSSL::Digest.new('SHA256'))
-    assert_equal(@rsa1024.public_key.to_der, req.public_key.to_der)
+    assert_equal(@rsa1024.public_to_der, req.public_key.public_to_der)
     req = OpenSSL::X509::Request.new(req.to_der)
-    assert_equal(@rsa1024.public_key.to_der, req.public_key.to_der)
+    assert_equal(@rsa1024.public_to_der, req.public_key.public_to_der)
 
     req = issue_csr(0, @dn, @dsa512, OpenSSL::Digest.new('SHA256'))
-    assert_equal(@dsa512.public_key.to_der, req.public_key.to_der)
+    assert_equal(@dsa512.public_to_der, req.public_key.public_to_der)
     req = OpenSSL::X509::Request.new(req.to_der)
-    assert_equal(@dsa512.public_key.to_der, req.public_key.to_der)
+    assert_equal(@dsa512.public_to_der, req.public_key.public_to_der)
   end
 
   def test_version
@@ -39,11 +39,6 @@ def test_version
     assert_equal(0, req.version)
     req = OpenSSL::X509::Request.new(req.to_der)
     assert_equal(0, req.version)
-
-    req = issue_csr(1, @dn, @rsa1024, OpenSSL::Digest.new('SHA256'))
-    assert_equal(1, req.version)
-    req = OpenSSL::X509::Request.new(req.to_der)
-    assert_equal(1, req.version)
   end
 
   def test_subject
@@ -106,7 +101,7 @@ def test_sign_and_verify_rsa_sha1
     assert_equal(false, req.verify(@rsa2048))
     assert_equal(false, request_error_returns_false { req.verify(@dsa256) })
     assert_equal(false, request_error_returns_false { req.verify(@dsa512) })
-    req.version = 1
+    req.subject = OpenSSL::X509::Name.parse("/C=JP/CN=FooBarFooBar")
     assert_equal(false, req.verify(@rsa1024))
   rescue OpenSSL::X509::RequestError # RHEL 9 disables SHA1
   end
@@ -137,6 +132,19 @@ def test_sign_and_verify_dsa_md5
       issue_csr(0, @dn, @dsa512, OpenSSL::Digest.new('MD5')) }
   end
 
+  def test_sign_and_verify_ed25519
+    # Ed25519 is not FIPS-approved.
+    omit_on_fips
+    ed25519 = OpenSSL::PKey::generate_key("ED25519")
+    req = issue_csr(0, @dn, ed25519, nil)
+    assert_equal(false, request_error_returns_false { req.verify(@rsa1024) })
+    assert_equal(false, request_error_returns_false { req.verify(@rsa2048) })
+    assert_equal(false, req.verify(OpenSSL::PKey::generate_key("ED25519")))
+    assert_equal(true, req.verify(ed25519))
+    req.public_key = @rsa1024.public_key
+    assert_equal(false, req.verify(ed25519))
+  end
+
   def test_dup
     req = issue_csr(0, @dn, @rsa1024, OpenSSL::Digest.new('SHA256'))
     assert_equal(req.to_der, req.dup.to_der)
diff --git a/test/openssl/test_x509store.rb b/test/openssl/test_x509store.rb
index d6c0e707a27f19..745ae7dd1392d6 100644
--- a/test/openssl/test_x509store.rb
+++ b/test/openssl/test_x509store.rb
@@ -329,15 +329,12 @@ def test_verify_with_crl
   end
 
   def test_add_cert_duplicate
-    # Up until OpenSSL 1.1.0, X509_STORE_add_{cert,crl}() returned an error
-    # if the given certificate is already in the X509_STORE
-    return if openssl?(1, 1, 0) || libressl?
     ca1 = OpenSSL::X509::Name.parse_rfc2253("CN=Root CA")
     ca1_key = Fixtures.pkey("rsa-1")
     ca1_cert = issue_cert(ca1, ca1_key, 1, [], nil, nil)
     store = OpenSSL::X509::Store.new
     store.add_cert(ca1_cert)
-    assert_raise(OpenSSL::X509::StoreError){
+    assert_nothing_raised {
       store.add_cert(ca1_cert)  # add same certificate twice
     }
 
@@ -349,7 +346,7 @@ def test_add_cert_duplicate
     crl2 = issue_crl(revoke_info, 2, now+1800, now+3600, [],
                      ca1_cert, ca1_key, "sha256")
     store.add_crl(crl1)
-    assert_raise(OpenSSL::X509::StoreError){
+    assert_nothing_raised {
       store.add_crl(crl2) # add CRL issued by same CA twice.
     }
   end
diff --git a/test/openssl/ut_eof.rb b/test/openssl/ut_eof.rb
index 7b18f43a79874f..06aa632a650784 100644
--- a/test/openssl/ut_eof.rb
+++ b/test/openssl/ut_eof.rb
@@ -8,6 +8,10 @@ def test_getbyte_eof
     open_file("") {|f| assert_nil f.getbyte }
   end
 
+  def test_readbyte_eof
+    open_file("") {|f| assert_raise(EOFError) { f.readbyte } }
+  end
+
   def test_eof_0
     open_file("") {|f|
       assert_equal("", f.read(0))
diff --git a/test/openssl/utils.rb b/test/openssl/utils.rb
index 3856bea875d5e7..ff789ff284e589 100644
--- a/test/openssl/utils.rb
+++ b/test/openssl/utils.rb
@@ -24,10 +24,6 @@ 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
@@ -107,7 +103,7 @@ def get_subject_key_id(cert, hex: true)
   end
 
   def openssl?(major = nil, minor = nil, fix = nil, patch = 0, status = 0)
-    return false if OpenSSL::OPENSSL_VERSION.include?("LibreSSL")
+    return false if OpenSSL::OPENSSL_VERSION.include?("LibreSSL") || OpenSSL::OPENSSL_VERSION.include?("AWS-LC")
     return true unless major
     OpenSSL::OPENSSL_VERSION_NUMBER >=
       major * 0x10000000 + minor * 0x100000 + fix * 0x1000 + patch * 0x10 +
@@ -119,6 +115,10 @@ def libressl?(major = nil, minor = nil, fix = nil)
     return false unless version
     !major || (version.map(&:to_i) <=> [major, minor, fix]) >= 0
   end
+
+  def aws_lc?
+    OpenSSL::OPENSSL_VERSION.include?("AWS-LC")
+  end
 end
 
 class OpenSSL::TestCase < Test::Unit::TestCase
@@ -139,6 +139,30 @@ def teardown
     # OpenSSL error stack must be empty
     assert_equal([], OpenSSL.errors)
   end
+
+  # Omit the tests in FIPS.
+  #
+  # For example, the password based encryption used in the PEM format uses MD5
+  # for deriving the encryption key from the password, and MD5 is not
+  # FIPS-approved.
+  #
+  # See https://github.com/openssl/openssl/discussions/21830#discussioncomment-6865636
+  # for details.
+  def omit_on_fips
+    return unless OpenSSL.fips_mode
+
+    omit <<~MESSAGE
+      Only for OpenSSL non-FIPS with the following possible reasons:
+      * A testing logic is non-FIPS specific.
+      * An encryption used in the test is not FIPS-approved.
+    MESSAGE
+  end
+
+  def omit_on_non_fips
+    return if OpenSSL.fips_mode
+
+    omit "Only for OpenSSL FIPS"
+  end
 end
 
 class OpenSSL::SSLTestCase < OpenSSL::TestCase
@@ -166,30 +190,18 @@ def setup
     @server = nil
   end
 
-  def tls13_supported?
-    return false unless defined?(OpenSSL::SSL::TLS1_3_VERSION)
-    ctx = OpenSSL::SSL::SSLContext.new
-    ctx.min_version = ctx.max_version = OpenSSL::SSL::TLS1_3_VERSION
-    true
-  rescue
-  end
-
   def readwrite_loop(ctx, ssl)
     while line = ssl.gets
       ssl.write(line)
     end
   end
 
-  def start_server(verify_mode: OpenSSL::SSL::VERIFY_NONE, start_immediately: true,
+  def start_server(verify_mode: OpenSSL::SSL::VERIFY_NONE,
                    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
-      store.add_cert(@ca_cert)
-      store.purpose = OpenSSL::X509::PURPOSE_SSL_CLIENT
       ctx = OpenSSL::SSL::SSLContext.new
-      ctx.cert_store = store
       ctx.cert = @svr_cert
       ctx.key = @svr_key
       ctx.verify_mode = verify_mode
@@ -200,7 +212,6 @@ def start_server(verify_mode: OpenSSL::SSL::VERIFY_NONE, start_immediately: true
       port = tcps.connect_address.ip_port
 
       ssls = OpenSSL::SSL::SSLServer.new(tcps, ctx)
-      ssls.start_immediately = start_immediately
 
       threads = []
       begin
@@ -275,6 +286,14 @@ def check_component(base, test, keys)
       assert_equal base.send(comp), test.send(comp)
     }
   end
+
+  def assert_sign_verify_false_or_error
+    ret = yield
+  rescue => e
+    assert_kind_of(OpenSSL::PKey::PKeyError, e)
+  else
+    assert_equal(false, ret)
+  end
 end
 
 module OpenSSL::Certs
diff --git a/test/optparse/test_acceptable.rb b/test/optparse/test_acceptable.rb
index 12f5322726b053..8b578effdec20b 100644
--- a/test/optparse/test_acceptable.rb
+++ b/test/optparse/test_acceptable.rb
@@ -8,6 +8,7 @@ def setup
     @opt.def_option("--integer VAL", Integer) { |v| @integer = v }
     @opt.def_option("--float VAL",   Float)   { |v| @float   = v }
     @opt.def_option("--numeric VAL", Numeric) { |v| @numeric = v }
+    @opt.def_option("--array VAL", Array) { |v| @array = v }
 
     @opt.def_option("--decimal-integer VAL",
                     OptionParser::DecimalInteger) { |i| @decimal_integer = i }
@@ -195,4 +196,10 @@ def test_decimal_numeric
     end
   end
 
+  def test_array
+    assert_equal(%w"", no_error {@opt.parse!(%w"--array a,b,c")})
+    assert_equal(%w"a b c", @array)
+    assert_equal(%w"", no_error {@opt.parse!(%w"--array a")})
+    assert_equal(%w"a", @array)
+  end
 end
diff --git a/test/optparse/test_optarg.rb b/test/optparse/test_optarg.rb
index 81127a8a3757c0..f94460527fdeb1 100644
--- a/test/optparse/test_optarg.rb
+++ b/test/optparse/test_optarg.rb
@@ -9,6 +9,8 @@ def setup
     @opt.def_option("--regexp[=REGEXP]", Regexp) {|x| @reopt = x}
     @opt.def_option "--with_underscore[=VAL]" do |x| @flag = x end
     @opt.def_option "--with-hyphen[=VAL]" do |x| @flag = x end
+    @opt.def_option("--fallback[=VAL]") do |x = "fallback"| @flag = x end
+    @opt.def_option("--lambda[=VAL]", &->(x) {@flag = x})
     @reopt = nil
   end
 
@@ -57,4 +59,18 @@ def test_hyphenize
     assert_equal(%w"", no_error {@opt.parse!(%w"--with_hyphen=foo4")})
     assert_equal("foo4", @flag)
   end
+
+  def test_default_argument
+    assert_equal(%w"", no_error {@opt.parse!(%w"--fallback=val1")})
+    assert_equal("val1", @flag)
+    assert_equal(%w"", no_error {@opt.parse!(%w"--fallback")})
+    assert_equal("fallback", @flag)
+  end
+
+  def test_lambda
+    assert_equal(%w"", no_error {@opt.parse!(%w"--lambda=lambda1")})
+    assert_equal("lambda1", @flag)
+    assert_equal(%w"", no_error {@opt.parse!(%w"--lambda")})
+    assert_equal(nil, @flag)
+  end
 end
diff --git a/test/optparse/test_optparse.rb b/test/optparse/test_optparse.rb
index bfa705ad03ab4d..ff334009a69c59 100644
--- a/test/optparse/test_optparse.rb
+++ b/test/optparse/test_optparse.rb
@@ -73,10 +73,30 @@ def test_into
     @opt.def_option "-p", "--port=PORT", "port", Integer
     @opt.def_option "-v", "--verbose" do @verbose = true end
     @opt.def_option "-q", "--quiet" do @quiet = true end
+    @opt.def_option "-o", "--option [OPT]" do |opt| @option = opt end
+    @opt.def_option "-a", "--array [VAL]", Array do |val| val end
     result = {}
     @opt.parse %w(--host localhost --port 8000 -v), into: result
     assert_equal({host: "localhost", port: 8000, verbose: true}, result)
     assert_equal(true, @verbose)
+    result = {}
+    @opt.parse %w(--option -q), into: result
+    assert_equal({quiet: true, option: nil}, result)
+    result = {}
+    @opt.parse %w(--option OPTION -v), into: result
+    assert_equal({verbose: true, option: "OPTION"}, result)
+    result = {}
+    @opt.parse %w(-a b,c,d), into: result
+    assert_equal({array: %w(b c d)}, result)
+    result = {}
+    @opt.parse %w(--array b,c,d), into: result
+    assert_equal({array: %w(b c d)}, result)
+    result = {}
+    @opt.parse %w(-a b), into: result
+    assert_equal({array: %w(b)}, result)
+    result = {}
+    @opt.parse %w(--array b), into: result
+    assert_equal({array: %w(b)}, result)
   end
 
   def test_require_exact
@@ -88,9 +108,9 @@ def test_require_exact
     end
 
     @opt.require_exact = true
-    %w(--zrs -F -Ffoo).each do |arg|
+    [%w(--zrs foo), %w(--zrs=foo), %w(-F foo), %w(-Ffoo)].each do |args|
       result = {}
-      @opt.parse([arg, 'foo'], into: result)
+      @opt.parse(args, into: result)
       assert_equal({zrs: 'foo'}, result)
     end
 
@@ -99,6 +119,43 @@ def test_require_exact
     assert_raise(OptionParser::InvalidOption) {@opt.parse(%w(-zrs foo))}
     assert_raise(OptionParser::InvalidOption) {@opt.parse(%w(-zr foo))}
     assert_raise(OptionParser::InvalidOption) {@opt.parse(%w(-z foo))}
+
+    @opt.def_option('-f', '--[no-]foo', 'foo') {|arg| @foo = arg}
+    @opt.parse(%w[-f])
+    assert_equal(true, @foo)
+    @opt.parse(%w[--foo])
+    assert_equal(true, @foo)
+    @opt.parse(%w[--no-foo])
+    assert_equal(false, @foo)
+  end
+
+  def test_exact_option
+    @opt.def_option('-F', '--zrs=IRS', 'zrs')
+    %w(--zrs --zr --z -zfoo -z -F -Ffoo).each do |arg|
+      result = {}
+      @opt.parse([arg, 'foo'], into: result)
+      assert_equal({zrs: 'foo'}, result)
+    end
+
+    [%w(--zrs foo), %w(--zrs=foo), %w(-F foo), %w(-Ffoo)].each do |args|
+      result = {}
+      @opt.parse(args, into: result, exact: true)
+      assert_equal({zrs: 'foo'}, result)
+    end
+
+    assert_raise(OptionParser::InvalidOption) {@opt.parse(%w(--zr foo), exact: true)}
+    assert_raise(OptionParser::InvalidOption) {@opt.parse(%w(--z foo), exact: true)}
+    assert_raise(OptionParser::InvalidOption) {@opt.parse(%w(-zrs foo), exact: true)}
+    assert_raise(OptionParser::InvalidOption) {@opt.parse(%w(-zr foo), exact: true)}
+    assert_raise(OptionParser::InvalidOption) {@opt.parse(%w(-z foo), exact: true)}
+
+    @opt.def_option('-f', '--[no-]foo', 'foo') {|arg| @foo = arg}
+    @opt.parse(%w[-f], exact: true)
+    assert_equal(true, @foo)
+    @opt.parse(%w[--foo], exact: true)
+    assert_equal(true, @foo)
+    @opt.parse(%w[--no-foo], exact: true)
+    assert_equal(false, @foo)
   end
 
   def test_raise_unknown
@@ -120,4 +177,55 @@ def test_nonopt_pattern
     e = assert_raise(OptionParser::InvalidOption) {@opt.parse(%w(-t))}
     assert_equal(["-t"], e.args)
   end
+
+  def test_help_pager
+    require 'tmpdir'
+    Dir.mktmpdir do |dir|
+      File.open(File.join(dir, "options.rb"), "w") do |f|
+        f.puts "#{<<~"begin;"}\n#{<<~'end;'}"
+        begin;
+          stdout = $stdout.dup
+          def stdout.tty?; true; end
+          $stdout = stdout
+          ARGV.options do |opt|
+          end;
+          100.times {|i| f.puts "  opt.on('--opt-#{i}') {}"}
+          f.puts "#{<<~"begin;"}\n#{<<~'end;'}"
+          begin;
+            opt.parse!
+          end
+        end;
+      end
+
+      optparse = $".find {|path| path.end_with?("/optparse.rb")}
+      args = ["-r#{optparse}", "options.rb", "--help"]
+      cmd = File.join(dir, "pager.cmd")
+      if RbConfig::CONFIG["EXECUTABLE_EXTS"]&.include?(".cmd")
+        command = "@echo off"
+      else # if File.executable?("/bin/sh")
+        # TruffleRuby just calls `posix_spawnp` and no fallback to `/bin/sh`.
+        command = "#!/bin/sh\n"
+      end
+
+      [
+        [{"RUBY_PAGER"=>cmd, "PAGER"=>"echo ng"}, "Executing RUBY_PAGER"],
+        [{"RUBY_PAGER"=>nil, "PAGER"=>cmd}, "Executing PAGER"],
+      ].each do |env, expected|
+        File.write(cmd, "#{command}\n" "echo #{expected}\n", perm: 0o700)
+        assert_in_out_err([env, *args], "", [expected], chdir: dir)
+      end
+    end
+  end
+
+  def test_program_name
+    program = $0
+    $0 = "rdbg3.5"
+    assert_equal "rdbg3.5", OptionParser.new.program_name
+    RbConfig::CONFIG["EXECUTABLE_EXTS"]&.split(" ") do |ext|
+      $0 = "rdbg3.5" + ext
+      assert_equal "rdbg3.5", OptionParser.new.program_name
+    end
+  ensure
+    $0 = program
+  end
 end
diff --git a/test/optparse/test_placearg.rb b/test/optparse/test_placearg.rb
index ed0e4d3e6c61e0..d5be5a66fb1345 100644
--- a/test/optparse/test_placearg.rb
+++ b/test/optparse/test_placearg.rb
@@ -7,12 +7,18 @@ def setup
     @opt.def_option("-x [VAL]") {|x| @flag = x}
     @opt.def_option("--option [VAL]") {|x| @flag = x}
     @opt.def_option("-T [level]", /^[0-4]$/, Integer) {|x| @topt = x}
+    @opt.def_option("--enum [VAL]", [:Alpha, :Bravo, :Charlie]) {|x| @enum = x}
+    @opt.def_option("--enumval [VAL]", [[:Alpha, 1], [:Bravo, 2], [:Charlie, 3]]) {|x| @enum = x}
+    @opt.def_option("--integer [VAL]", Integer, [1, 2, 3]) {|x| @integer = x}
+    @opt.def_option("--range [VAL]", Integer, 1..3) {|x| @range = x}
     @topt = nil
     @opt.def_option("-n") {}
     @opt.def_option("--regexp [REGEXP]", Regexp) {|x| @reopt = x}
     @reopt = nil
     @opt.def_option "--with_underscore=VAL" do |x| @flag = x end
     @opt.def_option "--with-hyphen=VAL" do |x| @flag = x end
+    @opt.def_option("--fallback [VAL]") do |x = "fallback"| @flag = x end
+    @opt.def_option("--lambda [VAL]", &->(x) {@flag = x})
   end
 
   def test_short
@@ -73,4 +79,43 @@ def test_conv
     assert_equal(%w"te.rb", no_error('[ruby-dev:38333]') {@opt.parse!(%w"-T1 te.rb")})
     assert_equal(1, @topt)
   end
+
+  def test_default_argument
+    assert_equal(%w"", no_error {@opt.parse!(%w"--fallback=val1")})
+    assert_equal("val1", @flag)
+    assert_equal(%w"", no_error {@opt.parse!(%w"--fallback val2")})
+    assert_equal("val2", @flag)
+    assert_equal(%w"", no_error {@opt.parse!(%w"--fallback")})
+    assert_equal("fallback", @flag)
+  end
+
+  def test_lambda
+    assert_equal(%w"", no_error {@opt.parse!(%w"--lambda=lambda1")})
+    assert_equal("lambda1", @flag)
+    assert_equal(%w"", no_error {@opt.parse!(%w"--lambda lambda2")})
+    assert_equal("lambda2", @flag)
+    assert_equal(%w"", no_error {@opt.parse!(%w"--lambda")})
+    assert_equal(nil, @flag)
+  end
+
+  def test_enum
+    assert_equal([], no_error {@opt.parse!(%w"--enum=A")})
+    assert_equal(:Alpha, @enum)
+  end
+
+  def test_enum_pair
+    assert_equal([], no_error {@opt.parse!(%w"--enumval=A")})
+    assert_equal(1, @enum)
+  end
+
+  def test_enum_conversion
+    assert_equal([], no_error {@opt.parse!(%w"--integer=1")})
+    assert_equal(1, @integer)
+  end
+
+  def test_enum_range
+    assert_equal([], no_error {@opt.parse!(%w"--range=1")})
+    assert_equal(1, @range)
+    assert_raise(OptionParser::InvalidArgument) {@opt.parse!(%w"--range=4")}
+  end
 end
diff --git a/test/optparse/test_reqarg.rb b/test/optparse/test_reqarg.rb
index d5686d13aa8acd..31d4fef417ff21 100644
--- a/test/optparse/test_reqarg.rb
+++ b/test/optparse/test_reqarg.rb
@@ -6,6 +6,7 @@ def setup
     super
     @opt.def_option "--with_underscore=VAL" do |x| @flag = x end
     @opt.def_option "--with-hyphen=VAL" do |x| @flag = x end
+    @opt.def_option("--lambda=VAL", &->(x) {@flag = x})
   end
 
   class Def1 < TestOptionParser
@@ -81,6 +82,11 @@ def test_hyphenize
     assert_equal("foo4", @flag)
   end
 
+  def test_lambda
+    assert_equal(%w"", no_error {@opt.parse!(%w"--lambda=lambda1")})
+    assert_equal("lambda1", @flag)
+  end
+
   class TestOptionParser::WithPattern < TestOptionParser
     def test_pattern
       pat = num = nil
diff --git a/test/optparse/test_switch.rb b/test/optparse/test_switch.rb
new file mode 100644
index 00000000000000..b06f4e310bc52e
--- /dev/null
+++ b/test/optparse/test_switch.rb
@@ -0,0 +1,50 @@
+# frozen_string_literal: false
+
+require 'test/unit'
+require 'optparse'
+
+
+class TestOptionParserSwitch < Test::Unit::TestCase
+
+  def setup
+    @parser = OptionParser.new
+  end
+
+  def assert_invalidarg_error(msg, &block)
+    exc = assert_raise(OptionParser::InvalidArgument) do
+      yield
+    end
+    assert_equal "invalid argument: #{msg}", exc.message
+  end
+
+  def test_make_switch__enum_array
+    p = @parser
+    p.on("--enum=<val>", ["aa", "bb", "cc"])
+    p.permute(["--enum=bb"], into: (opts={}))
+    assert_equal({:enum=>"bb"}, opts)
+    assert_invalidarg_error("--enum=dd") do
+      p.permute(["--enum=dd"], into: (opts={}))
+    end
+  end
+
+  def test_make_switch__enum_hash
+    p = @parser
+    p.on("--hash=<val>", {"aa"=>"AA", "bb"=>"BB"})
+    p.permute(["--hash=bb"], into: (opts={}))
+    assert_equal({:hash=>"BB"}, opts)
+    assert_invalidarg_error("--hash=dd") do
+      p.permute(["--hash=dd"], into: (opts={}))
+    end
+  end
+
+  def test_make_switch__enum_set
+    p = @parser
+    p.on("--set=<val>", Set.new(["aa", "bb", "cc"]))
+    p.permute(["--set=bb"], into: (opts={}))
+    assert_equal({:set=>"bb"}, opts)
+    assert_invalidarg_error("--set=dd") do
+      p.permute(["--set=dd"], into: (opts={}))
+    end
+  end
+
+end
diff --git a/test/ostruct/test_ostruct.rb b/test/ostruct/test_ostruct.rb
deleted file mode 100644
index 256db7a0c71203..00000000000000
--- a/test/ostruct/test_ostruct.rb
+++ /dev/null
@@ -1,415 +0,0 @@
-# frozen_string_literal: true
-require 'test/unit'
-require 'ostruct'
-require 'yaml'
-
-class TC_OpenStruct < Test::Unit::TestCase
-  def test_initialize
-    h = {name: "John Smith", age: 70, pension: 300}
-    assert_equal h, OpenStruct.new(h).to_h
-    assert_equal h, OpenStruct.new(OpenStruct.new(h)).to_h
-    assert_equal h, OpenStruct.new(Struct.new(*h.keys).new(*h.values)).to_h
-  end
-
-  def test_respond_to
-    o = OpenStruct.new
-    o.a = 1
-    assert_respond_to(o, :a)
-    assert_respond_to(o, :a=)
-  end
-
-  def test_respond_to_with_lazy_getter
-    o = OpenStruct.new a: 1
-    assert_respond_to(o, :a)
-    assert_respond_to(o, :a=)
-  end
-
-  def test_respond_to_allocated
-    assert_not_respond_to(OpenStruct.allocate, :a)
-  end
-
-  def test_equality
-    o1 = OpenStruct.new
-    o2 = OpenStruct.new
-    assert_equal(o1, o2)
-
-    o1.a = 'a'
-    assert_not_equal(o1, o2)
-
-    o2.a = 'a'
-    assert_equal(o1, o2)
-
-    o1.a = 'b'
-    assert_not_equal(o1, o2)
-
-    o2 = Object.new
-    o2.instance_eval{@table = {:a => 'b'}}
-    assert_not_equal(o1, o2)
-  end
-
-  def test_inspect
-    foo = OpenStruct.new
-    assert_equal("#<OpenStruct>", foo.inspect)
-    foo.bar = 1
-    foo.baz = 2
-    assert_equal("#<OpenStruct bar=1, baz=2>", foo.inspect)
-    assert_equal(false, foo.inspect.frozen?)
-
-    foo = OpenStruct.new
-    foo.bar = OpenStruct.new
-    assert_equal('#<OpenStruct bar=#<OpenStruct>>', foo.inspect)
-    foo.bar.foo = foo
-    assert_equal('#<OpenStruct bar=#<OpenStruct foo=#<OpenStruct ...>>>', foo.inspect)
-    assert_equal(false, foo.inspect.frozen?)
-  end
-
-  def test_frozen
-    o = OpenStruct.new(foo: 42)
-    o.a = 'a'
-    o.freeze
-    assert_raise(FrozenError) {o.b = 'b'}
-    assert_not_respond_to(o, :b)
-    assert_raise(FrozenError) {o.a = 'z'}
-    assert_equal('a', o.a)
-    assert_equal(42, o.foo)
-    o = OpenStruct.new :a => 42
-    def o.frozen?; nil end
-    o.freeze
-    assert_raise(FrozenError, '[ruby-core:22559]') {o.a = 1764}
-  end
-
-  def test_delete_field
-    bug = '[ruby-core:33010]'
-    o = OpenStruct.new
-    assert_not_respond_to(o, :a)
-    assert_not_respond_to(o, :a=)
-    o.a = 'a'
-    assert_respond_to(o, :a)
-    assert_respond_to(o, :a=)
-    a = o.delete_field :a
-    assert_not_respond_to(o, :a, bug)
-    assert_not_respond_to(o, :a=, bug)
-    assert_equal('a', a)
-    s = Object.new
-    def s.to_sym
-      :foo
-    end
-    o[s] = true
-    assert_respond_to(o, :foo)
-    assert_respond_to(o, :foo=)
-    o.delete_field s
-    assert_not_respond_to(o, :foo)
-    assert_not_respond_to(o, :foo=)
-
-    assert_raise(NameError) { o.delete_field(s) }
-    assert_equal(:bar, o.delete_field(s) { :bar })
-
-    o[s] = :foobar
-    assert_respond_to(o, :foo)
-    assert_respond_to(o, :foo=)
-    assert_equal(:foobar, o.delete_field(s) { :baz })
-
-    assert_equal(42, OpenStruct.new(foo: 42).delete_field(:foo) { :bug })
-
-    o = OpenStruct.new(block_given?: 42)
-    assert_raise(NameError) { o.delete_field(:foo) }
-  end
-
-  def test_setter
-    os = OpenStruct.new
-    os[:foo] = :bar
-    assert_equal :bar, os.foo
-    os['foo'] = :baz
-    assert_equal :baz, os.foo
-  end
-
-  def test_getter
-    os = OpenStruct.new
-    os.foo = :bar
-    assert_equal :bar, os[:foo]
-    assert_equal :bar, os['foo']
-  end
-
-  def test_dig
-    os1 = OpenStruct.new
-    os2 = OpenStruct.new
-    os1.child = os2
-    os2.foo = :bar
-    os2.child = [42]
-    assert_equal :bar, os1.dig("child", :foo)
-    assert_nil os1.dig("parent", :foo)
-    assert_raise(TypeError) { os1.dig("child", 0) }
-  end
-
-  def test_to_h
-    h = {name: "John Smith", age: 70, pension: 300}
-    os = OpenStruct.new(h)
-    to_h = os.to_h
-    assert_equal(h, to_h)
-
-    to_h[:age] = 71
-    assert_equal(70, os.age)
-    assert_equal(70, h[:age])
-
-    assert_equal(h, OpenStruct.new("name" => "John Smith", "age" => 70, pension: 300).to_h)
-  end
-
-  def test_to_h_with_block
-    os = OpenStruct.new("country" => "Australia", :capital => "Canberra")
-    assert_equal({"country" => "AUSTRALIA", "capital" => "CANBERRA" },
-                 os.to_h {|name, value| [name.to_s, value.upcase]})
-    assert_equal("Australia", os.country)
-  end
-
-  def test_each_pair
-    h = {name: "John Smith", age: 70, pension: 300}
-    os = OpenStruct.new(h)
-    assert_same os, os.each_pair{ }
-    assert_equal '#<Enumerator: #<OpenStruct name="John Smith", age=70, pension=300>:each_pair>', os.each_pair.inspect
-    assert_equal [[:name, "John Smith"], [:age, 70], [:pension, 300]], os.each_pair.to_a
-    assert_equal 3, os.each_pair.size
-  end
-
-  def test_eql_and_hash
-    os1 = OpenStruct.new age: 70
-    os2 = OpenStruct.new age: 70.0
-    assert_equal os1, os2
-    assert_equal false, os1.eql?(os2)
-    assert_not_equal os1.hash, os2.hash
-    assert_equal true, os1.eql?(os1.dup)
-    assert_equal os1.hash, os1.dup.hash
-  end
-
-  def test_method_missing
-    os = OpenStruct.new
-    e = assert_raise(NoMethodError) { os.foo true }
-    assert_equal :foo, e.name
-    assert_equal [true], e.args
-    assert_match(/#{__callee__}/, e.backtrace[0])
-    e = assert_raise(ArgumentError) { os.send :foo=, true, true }
-    assert_match(/#{__callee__}/, e.backtrace[0])
-  end
-
-  def test_accessor_defines_method
-    os = OpenStruct.new(foo: 42)
-    assert_respond_to(os, :foo)
-    assert_equal(42, os.foo)
-    assert_equal([:foo, :foo=], os.singleton_methods.sort)
-  end
-
-  def test_does_not_redefine
-    $VERBOSE, verbose_bak = nil, $VERBOSE
-    os = OpenStruct.new(foo: 42)
-    def os.foo
-      43
-    end
-    os.foo = 44
-    assert_equal(43, os.foo)
-  ensure
-    $VERBOSE = verbose_bak
-  end
-
-  def test_allocate_subclass
-    bug = '[ruby-core:80292] [Bug #13358] allocate should not call initialize'
-    c = Class.new(OpenStruct) {
-      def initialize(x,y={})super(y);end
-    }
-    os = assert_nothing_raised(ArgumentError, bug) {c.allocate}
-    assert_instance_of(c, os)
-  end
-
-  def test_initialize_subclass
-    c = Class.new(OpenStruct) {
-      def initialize(x,y={})super(y);end
-    }
-    o = c.new(1, {a: 42})
-    assert_equal(42, o.dup.a)
-    assert_equal(42, o.clone.a)
-  end
-
-  def test_private_method
-    os = OpenStruct.new
-    class << os
-      private
-      def foo
-      end
-    end
-    assert_raise_with_message(NoMethodError, /private method/) do
-      os.foo true, true
-    end
-  end
-
-  def test_protected_method
-    os = OpenStruct.new
-    class << os
-      protected
-      def foo
-      end
-    end
-    assert_raise_with_message(NoMethodError, /protected method/) do
-      os.foo true, true
-    end
-  end
-
-  def test_access_undefined
-    os = OpenStruct.new
-    assert_nil os.foo
-  end
-
-  def test_overridden_private_methods
-    os = OpenStruct.new(puts: :foo, format: :bar)
-    assert_equal(:foo, os.puts)
-    assert_equal(:bar, os.format)
-  end
-
-  def test_super
-    c = Class.new(OpenStruct) {
-      def foo; super; end
-    }
-    os = c.new(foo: :bar)
-    assert_equal(:bar, os.foo)
-  end
-
-  def test_overridden_public_methods
-    os = OpenStruct.new(method: :foo, class: :bar)
-    assert_equal(:foo, os.method)
-    assert_equal(:bar, os.class)
-  end
-
-  def test_access_original_methods
-    os = OpenStruct.new(method: :foo, hash: 42)
-    assert_equal(os.object_id, os.method!(:object_id).call)
-    assert_not_equal(42, os.hash!)
-    refute os.methods.include?(:"!~!")
-  end
-
-  def test_override_subclass
-    c = Class.new(OpenStruct) {
-      def foo; :protect_me; end
-      private def bar; :protect_me; end
-      def inspect; 'protect me'; end
-    }
-    o = c.new(
-      foo: 1, bar: 2, inspect: '3', # in subclass: protected
-      table!: 4, # bang method: protected
-      each_pair: 5, to_s: 'hello', # others: not protected
-    )
-    # protected:
-    assert_equal(:protect_me, o.foo)
-    assert_equal(:protect_me, o.send(:bar))
-    assert_equal('protect me', o.inspect)
-    assert_not_equal(4, o.send(:table!))
-    # not protected:
-    assert_equal(5, o.each_pair)
-    assert_equal('hello', o.to_s)
-  end
-
-  def test_override_submodule
-    m = Module.new {
-      def foo; :protect_me; end
-      private def bar; :protect_me; end
-      def inspect; 'protect me'; end
-    }
-    m2 = Module.new {
-      def added_to_all_open_struct; :override_me; end
-    }
-    OpenStruct.class_eval do
-      include m2
-      # prepend case tbd
-      def added_to_all_open_struct_2; :override_me; end
-    end
-    c = Class.new(OpenStruct) { include m }
-    o = c.new(
-      foo: 1, bar: 2, inspect: '3', # in subclass: protected
-      table!: 4, # bang method: protected
-      each_pair: 5, to_s: 'hello', # others: not protected
-                                   # including those added by the user:
-      added_to_all_open_struct: 6, added_to_all_open_struct_2: 7,
-    )
-    # protected:
-    assert_equal(:protect_me, o.foo)
-    assert_equal(:protect_me, o.send(:bar))
-    assert_equal('protect me', o.inspect)
-    assert_not_equal(4, o.send(:table!))
-    # not protected:
-    assert_equal(5, o.each_pair)
-    assert_equal('hello', o.to_s)
-    assert_equal(6, o.added_to_all_open_struct)
-    assert_equal(7, o.added_to_all_open_struct_2)
-  end
-
-  def test_mistaken_subclass
-    sub = Class.new(OpenStruct) do
-      def [](k)
-        __send__(k)
-        super
-      end
-
-      def []=(k, v)
-        @item_set = true
-        __send__("#{k}=", v)
-        super
-      end
-    end
-    o = sub.new
-    o.foo = 42
-    assert_equal 42, o.foo
-  end
-
-  def test_ractor
-    assert_ractor(<<~RUBY, require: 'ostruct')
-      obj1 = OpenStruct.new(a: 42, b: 42)
-      obj1.c = 42
-      obj1.freeze
-
-      obj2 = Ractor.new obj1 do |obj|
-        obj
-      end.take
-      assert obj1.object_id == obj2.object_id
-    RUBY
-  end if defined?(Ractor)
-
-  def test_access_methods_from_different_ractor
-    assert_ractor(<<~RUBY, require: 'ostruct')
-      os = OpenStruct.new
-      os.value = 100
-      r = Ractor.new(os) do |x|
-        v = x.value
-        Ractor.yield v
-      end
-      assert 100 == r.take
-    RUBY
-  end if defined?(Ractor)
-
-  def test_legacy_yaml
-    s = "--- !ruby/object:OpenStruct\ntable:\n  :foo: 42\n"
-    o = YAML.safe_load(s, permitted_classes: [Symbol, OpenStruct])
-    assert_equal(42, o.foo)
-
-    o = OpenStruct.new(table: {foo: 42})
-    assert_equal({foo: 42}, YAML.safe_load(YAML.dump(o), permitted_classes: [Symbol, OpenStruct]).table)
-  end if RUBY_VERSION >= '2.6'
-
-  def test_yaml
-    h = {name: "John Smith", age: 70, pension: 300.42}
-    yaml = "--- !ruby/object:OpenStruct\nname: John Smith\nage: 70\npension: 300.42\n"
-    os1 = OpenStruct.new(h)
-    os2 = YAML.safe_load(os1.to_yaml, permitted_classes: [Symbol, OpenStruct])
-    assert_equal yaml, os1.to_yaml
-    assert_equal os1, os2
-    assert_equal true, os1.eql?(os2)
-    assert_equal 300.42, os2.pension
-  end if RUBY_VERSION >= '2.6'
-
-  def test_marshal
-    o = OpenStruct.new(name: "John Smith", age: 70, pension: 300.42)
-    o2 = Marshal.load(Marshal.dump(o))
-    assert_equal o, o2
-  end
-
-  def test_class
-    os = OpenStruct.new(class: 'my-class', method: 'post')
-    assert_equal('my-class', os.class)
-    assert_equal(OpenStruct, os.class!)
-  end
-end
diff --git a/test/pathname/test_pathname.rb b/test/pathname/test_pathname.rb
index a23dc21ae36f84..6a4bb784bd0d66 100644
--- a/test/pathname/test_pathname.rb
+++ b/test/pathname/test_pathname.rb
@@ -1333,6 +1333,14 @@ def test_s_glob_3args
     }
   end
 
+  def test_mktmpdir
+    Pathname.mktmpdir do |dir|
+      assert_equal Pathname(dir), dir
+      assert dir.directory?
+      assert dir.exist?
+    end
+  end
+
   def test_s_getwd
     wd = Pathname.getwd
     assert_kind_of(Pathname, wd)
@@ -1467,7 +1475,8 @@ def assert_mode(val, mask, path, mesg = nil)
 
   def test_mkpath
     with_tmpchdir('rubytest-pathname') {|dir|
-      Pathname("a/b/c/d").mkpath
+      path = Pathname("a/b/c/d")
+      assert_equal(path, path.mkpath)
       assert_file.directory?("a/b/c/d")
       unless File.stat(dir).world_readable?
         # mktmpdir should make unreadable
@@ -1483,7 +1492,8 @@ def test_rmtree
     with_tmpchdir('rubytest-pathname') {|dir|
       Pathname("a/b/c/d").mkpath
       assert_file.exist?("a/b/c/d")
-      Pathname("a").rmtree
+      path = Pathname("a")
+      assert_equal(path, path.rmtree)
       assert_file.not_exist?("a")
     }
   end
diff --git a/test/pathname/test_ractor.rb b/test/pathname/test_ractor.rb
index 3d7b63deed4b6a..f06b7501f3448b 100644
--- a/test/pathname/test_ractor.rb
+++ b/test/pathname/test_ractor.rb
@@ -9,14 +9,17 @@ def setup
 
   def test_ractor_shareable
     assert_separately([], "#{<<~"begin;"}\n#{<<~'end;'}")
+    class Ractor
+      alias value take
+    end unless Ractor.method_defined? :value # compat with Ruby 3.4 and olders
+
     begin;
       $VERBOSE = nil
       require "pathname"
       r = Ractor.new Pathname("a") do |x|
         x.join(Pathname("b"), Pathname("c"))
       end
-      assert_equal(Pathname("a/b/c"), r.take)
+      assert_equal(Pathname("a/b/c"), r.value)
     end;
   end
 end
-
diff --git a/test/prism/api/command_line_test.rb b/test/prism/api/command_line_test.rb
new file mode 100644
index 00000000000000..e53d18703a4dff
--- /dev/null
+++ b/test/prism/api/command_line_test.rb
@@ -0,0 +1,114 @@
+# frozen_string_literal: true
+
+require_relative "../test_helper"
+
+module Prism
+  class CommandLineTest < TestCase
+    def test_command_line_p
+      program = Prism.parse("1", command_line: "p").value
+      statements = program.statements.body
+
+      assert_equal 2, statements.length
+      assert_kind_of CallNode, statements.last
+      assert_equal :print, statements.last.name
+    end
+
+    def test_command_line_n
+      program = Prism.parse("1", command_line: "n").value
+      statements = program.statements.body
+
+      assert_equal 1, statements.length
+      assert_kind_of WhileNode, statements.first
+
+      predicate = statements.first.predicate
+      assert_kind_of CallNode, predicate
+      assert_equal :gets, predicate.name
+
+      arguments = predicate.arguments.arguments
+      assert_equal 1, arguments.length
+      assert_equal :$/, arguments.first.name
+    end
+
+    def test_command_line_a
+      program = Prism.parse("1", command_line: "na").value
+      statements = program.statements.body
+
+      assert_equal 1, statements.length
+      assert_kind_of WhileNode, statements.first
+
+      statement = statements.first.statements.body.first
+      assert_kind_of GlobalVariableWriteNode, statement
+      assert_equal :$F, statement.name
+    end
+
+    def test_command_line_l
+      program = Prism.parse("1", command_line: "nl").value
+      statements = program.statements.body
+
+      assert_equal 1, statements.length
+      assert_kind_of WhileNode, statements.first
+
+      predicate = statements.first.predicate
+      assert_kind_of CallNode, predicate
+      assert_equal :gets, predicate.name
+
+      arguments = predicate.arguments
+      assert arguments.contains_keywords?
+
+      arguments = predicate.arguments.arguments
+      assert_equal 2, arguments.length
+      assert_equal :$/, arguments.first.name
+      assert_equal "chomp", arguments.last.elements.first.key.unescaped
+    end
+
+    def test_command_line_e
+      result = Prism.parse("1 if 2..3")
+      assert_equal 2, result.warnings.length
+
+      result = Prism.parse("1 if 2..3", command_line: "e")
+      assert_equal 0, result.warnings.length
+    end
+
+    def test_command_line_x_implicit
+      result = Prism.parse_statement(<<~RUBY, main_script: true)
+        #!/bin/bash
+        exit 1
+
+        #!/usr/bin/env ruby
+        1
+      RUBY
+
+      assert_kind_of IntegerNode, result
+    end
+
+    def test_command_line_x_explicit
+      result = Prism.parse_statement(<<~RUBY, command_line: "x")
+        exit 1
+
+        #!/usr/bin/env ruby
+        1
+      RUBY
+
+      assert_kind_of IntegerNode, result
+    end
+
+    def test_command_line_x_implicit_fail
+      result = Prism.parse(<<~RUBY, main_script: true)
+        #!/bin/bash
+        exit 1
+      RUBY
+
+      assert_equal 1, result.errors.length
+      assert_equal :load, result.errors.first.level
+    end
+
+    def test_command_line_x_explicit_fail
+      result = Prism.parse(<<~RUBY, command_line: "x")
+        exit 1
+      RUBY
+
+      assert_equal 1, result.errors.length
+      assert_equal :load, result.errors.first.level
+    end
+  end
+end
diff --git a/test/prism/api/dump_test.rb b/test/prism/api/dump_test.rb
new file mode 100644
index 00000000000000..941088e1592ca8
--- /dev/null
+++ b/test/prism/api/dump_test.rb
@@ -0,0 +1,56 @@
+# frozen_string_literal: true
+
+return if ENV["PRISM_BUILD_MINIMAL"]
+
+require_relative "../test_helper"
+
+module Prism
+  class DumpTest < TestCase
+    Fixture.each do |fixture|
+      define_method(fixture.test_name) { assert_dump(fixture) }
+    end
+
+    def test_dump
+      filepath = __FILE__
+      source = File.read(filepath, binmode: true, external_encoding: Encoding::UTF_8)
+
+      assert_equal Prism.lex(source, filepath: filepath).value, Prism.lex_file(filepath).value
+      assert_equal Prism.dump(source, filepath: filepath), Prism.dump_file(filepath)
+
+      serialized = Prism.dump(source, filepath: filepath)
+      ast1 = Prism.load(source, serialized).value
+      ast2 = Prism.parse(source, filepath: filepath).value
+      ast3 = Prism.parse_file(filepath).value
+
+      assert_equal_nodes ast1, ast2
+      assert_equal_nodes ast2, ast3
+    end
+
+    def test_dump_file
+      assert_nothing_raised do
+        Prism.dump_file(__FILE__)
+      end
+
+      error = assert_raise Errno::ENOENT do
+        Prism.dump_file("idontexist.rb")
+      end
+
+      assert_equal "No such file or directory - idontexist.rb", error.message
+
+      assert_raise TypeError do
+        Prism.dump_file(nil)
+      end
+    end
+
+    private
+
+    def assert_dump(fixture)
+      source = fixture.read
+
+      result = Prism.parse(source, filepath: fixture.path)
+      dumped = Prism.dump(source, filepath: fixture.path)
+
+      assert_equal_nodes(result.value, Prism.load(source, dumped).value)
+    end
+  end
+end
diff --git a/test/prism/api/freeze_test.rb b/test/prism/api/freeze_test.rb
new file mode 100644
index 00000000000000..5533a003313856
--- /dev/null
+++ b/test/prism/api/freeze_test.rb
@@ -0,0 +1,60 @@
+# frozen_string_literal: true
+
+require_relative "../test_helper"
+
+module Prism
+  class FreezeTest < TestCase
+    def test_parse
+      assert_frozen(Prism.parse("1 + 2; %i{foo} + %i{bar}", freeze: true))
+    end
+
+    def test_lex
+      assert_frozen(Prism.lex("1 + 2; %i{foo} + %i{bar}", freeze: true))
+    end
+
+    def test_parse_lex
+      assert_frozen(Prism.parse_lex("1 + 2; %i{foo} + %i{bar}", freeze: true))
+      assert_frozen(Prism.parse_lex("# encoding: euc-jp\n%i{foo}", freeze: true))
+    end
+
+    def test_parse_comments
+      assert_frozen(Prism.parse_comments("# comment", freeze: true))
+    end
+
+    def test_parse_stream
+      assert_frozen(Prism.parse_stream(StringIO.new("1 + 2; %i{foo} + %i{bar}"), freeze: true))
+    end
+
+    if !ENV["PRISM_BUILD_MINIMAL"]
+      def test_dump
+        assert_frozen(Prism.dump("1 + 2; %i{foo} + %i{bar}", freeze: true))
+      end
+    end
+
+    private
+
+    def assert_frozen_each(value)
+      assert_predicate value, :frozen?
+
+      value.instance_variables.each do |name|
+        case (child = value.instance_variable_get(name))
+        when Array
+          child.each { |item| assert_frozen_each(item) }
+        when Hash
+          child.each { |key, item| assert_frozen_each(key); assert_frozen_each(item) }
+        else
+          assert_frozen_each(child)
+        end
+      end
+    end
+
+    if defined?(Ractor.shareable?)
+      def assert_frozen(value)
+        assert_frozen_each(value)
+        assert Ractor.shareable?(value), -> { binding.irb }
+      end
+    else
+      alias assert_frozen assert_frozen_each
+    end
+  end
+end
diff --git a/test/prism/api/lex_test.rb b/test/prism/api/lex_test.rb
new file mode 100644
index 00000000000000..0b675b215f3f0e
--- /dev/null
+++ b/test/prism/api/lex_test.rb
@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+require_relative "../test_helper"
+
+module Prism
+  class LexTest < TestCase
+    def test_lex_result
+      result = Prism.lex("")
+      assert_kind_of LexResult, result
+
+      result = Prism.lex_file(__FILE__)
+      assert_kind_of LexResult, result
+    end
+
+    def test_parse_lex_result
+      result = Prism.parse_lex("")
+      assert_kind_of ParseLexResult, result
+
+      result = Prism.parse_lex_file(__FILE__)
+      assert_kind_of ParseLexResult, result
+    end
+  end
+end
diff --git a/test/prism/api/parse_comments_test.rb b/test/prism/api/parse_comments_test.rb
new file mode 100644
index 00000000000000..4dbcca1827f29e
--- /dev/null
+++ b/test/prism/api/parse_comments_test.rb
@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+require_relative "../test_helper"
+
+module Prism
+  class ParseCommentsTest < TestCase
+    def test_parse_comments
+      comments = Prism.parse_comments("# foo")
+
+      assert_kind_of Array, comments
+      assert_equal 1, comments.length
+    end
+
+    def test_parse_file_comments
+      comments = Prism.parse_file_comments(__FILE__)
+
+      assert_kind_of Array, comments
+      assert_equal 1, comments.length
+    end
+
+    def test_parse_file_comments_error
+      error = assert_raise Errno::ENOENT do
+        Prism.parse_file_comments("idontexist.rb")
+      end
+
+      assert_equal "No such file or directory - idontexist.rb", error.message
+
+      assert_raise TypeError do
+        Prism.parse_file_comments(nil)
+      end
+    end
+  end
+end
diff --git a/test/prism/api/parse_stream_test.rb b/test/prism/api/parse_stream_test.rb
new file mode 100644
index 00000000000000..1c068c617c44a2
--- /dev/null
+++ b/test/prism/api/parse_stream_test.rb
@@ -0,0 +1,81 @@
+# frozen_string_literal: true
+
+require_relative "../test_helper"
+
+module Prism
+  class ParseStreamTest < TestCase
+    def test_single_line
+      io = StringIO.new("1 + 2")
+      result = Prism.parse_stream(io)
+
+      assert result.success?
+      assert_kind_of Prism::CallNode, result.statement
+    end
+
+    def test_multi_line
+      io = StringIO.new("1 + 2\n3 + 4")
+      result = Prism.parse_stream(io)
+
+      assert result.success?
+      assert_kind_of Prism::CallNode, result.statement
+      assert_kind_of Prism::CallNode, result.statement
+    end
+
+    def test_multi_read
+      io = StringIO.new("a" * 4096 * 4)
+      result = Prism.parse_stream(io)
+
+      assert result.success?
+      assert_kind_of Prism::CallNode, result.statement
+    end
+
+    def test___END__
+      io = StringIO.new("1 + 2\n3 + 4\n__END__\n5 + 6")
+      result = Prism.parse_stream(io)
+
+      assert result.success?
+      assert_equal 2, result.value.statements.body.length
+      assert_equal "5 + 6", io.read
+    end
+
+    def test_false___END___in_string
+      io = StringIO.new("1 + 2\n3 + 4\n\"\n__END__\n\"\n5 + 6")
+      result = Prism.parse_stream(io)
+
+      assert result.success?
+      assert_equal 4, result.value.statements.body.length
+    end
+
+    def test_false___END___in_regexp
+      io = StringIO.new("1 + 2\n3 + 4\n/\n__END__\n/\n5 + 6")
+      result = Prism.parse_stream(io)
+
+      assert result.success?
+      assert_equal 4, result.value.statements.body.length
+    end
+
+    def test_false___END___in_list
+      io = StringIO.new("1 + 2\n3 + 4\n%w[\n__END__\n]\n5 + 6")
+      result = Prism.parse_stream(io)
+
+      assert result.success?
+      assert_equal 4, result.value.statements.body.length
+    end
+
+    def test_false___END___in_heredoc
+      io = StringIO.new("1 + 2\n3 + 4\n<<-EOF\n__END__\nEOF\n5 + 6")
+      result = Prism.parse_stream(io)
+
+      assert result.success?
+      assert_equal 4, result.value.statements.body.length
+    end
+
+    def test_nul_bytes
+      io = StringIO.new("1 # \0\0\0 \n2 # \0\0\0\n3")
+      result = Prism.parse_stream(io)
+
+      assert result.success?
+      assert_equal 3, result.value.statements.body.length
+    end
+  end
+end
diff --git a/test/prism/api/parse_success_test.rb b/test/prism/api/parse_success_test.rb
new file mode 100644
index 00000000000000..2caaa5136e2ef2
--- /dev/null
+++ b/test/prism/api/parse_success_test.rb
@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+require_relative "../test_helper"
+
+module Prism
+  class ParseSuccessTest < TestCase
+    def test_parse_success?
+      assert Prism.parse_success?("1")
+      refute Prism.parse_success?("<>")
+    end
+
+    def test_parse_file_success?
+      assert Prism.parse_file_success?(__FILE__)
+    end
+  end
+end
diff --git a/test/prism/api/parse_test.rb b/test/prism/api/parse_test.rb
new file mode 100644
index 00000000000000..bbce8a8fadb80c
--- /dev/null
+++ b/test/prism/api/parse_test.rb
@@ -0,0 +1,171 @@
+# frozen_string_literal: true
+
+require_relative "../test_helper"
+
+module Prism
+  class ParseTest < TestCase
+    def test_parse_result
+      result = Prism.parse("")
+      assert_kind_of ParseResult, result
+
+      result = Prism.parse_file(__FILE__)
+      assert_kind_of ParseResult, result
+    end
+
+    def test_parse_empty_string
+      result = Prism.parse("")
+      assert_equal [], result.value.statements.body
+    end
+
+    def test_parse_takes_file_path
+      filepath = "filepath.rb"
+      result = Prism.parse("def foo; __FILE__; end", filepath: filepath)
+
+      assert_equal filepath, find_source_file_node(result.value).filepath
+    end
+
+    def test_parse_takes_line
+      line = 4
+      result = Prism.parse("def foo\n __FILE__\nend", line: line)
+
+      assert_equal line, result.value.location.start_line
+      assert_equal line + 1, find_source_file_node(result.value).location.start_line
+
+      result = Prism.parse_lex("def foo\n __FILE__\nend", line: line)
+      assert_equal line, result.value.first.location.start_line
+    end
+
+    def test_parse_takes_negative_lines
+      line = -2
+      result = Prism.parse("def foo\n __FILE__\nend", line: line)
+
+      assert_equal line, result.value.location.start_line
+      assert_equal line + 1, find_source_file_node(result.value).location.start_line
+
+      result = Prism.parse_lex("def foo\n __FILE__\nend", line: line)
+      assert_equal line, result.value.first.location.start_line
+    end
+
+    def test_parse_file
+      node = Prism.parse_file(__FILE__).value
+      assert_kind_of ProgramNode, node
+
+      error = assert_raise Errno::ENOENT do
+        Prism.parse_file("idontexist.rb")
+      end
+
+      assert_equal "No such file or directory - idontexist.rb", error.message
+
+      assert_raise TypeError do
+        Prism.parse_file(nil)
+      end
+    end
+
+    def test_parse_tempfile
+      Tempfile.create(["test_parse_tempfile", ".rb"]) do |t|
+        t.puts ["begin\n", " end\n"]
+        t.flush
+        Prism.parse_file(t.path)
+      end
+    end
+
+    if RUBY_ENGINE != "truffleruby"
+      def test_parse_nonascii
+        Dir.mktmpdir do |dir|
+          path = File.join(dir, "\u{3042 3044 3046 3048 304a}.rb".encode(Encoding::Windows_31J))
+          File.write(path, "ok")
+          Prism.parse_file(path)
+        end
+      end
+    end
+
+    def test_parse_directory
+      error = nil
+
+      begin
+        Prism.parse_file(__dir__)
+      rescue SystemCallError => error
+      end
+
+      assert_kind_of Errno::EISDIR, error
+    end
+
+    def test_partial_script
+      assert Prism.parse_failure?("break")
+      assert Prism.parse_success?("break", partial_script: true)
+
+      assert Prism.parse_failure?("next")
+      assert Prism.parse_success?("next", partial_script: true)
+
+      assert Prism.parse_failure?("redo")
+      assert Prism.parse_success?("redo", partial_script: true)
+
+      assert Prism.parse_failure?("yield")
+      assert Prism.parse_success?("yield", partial_script: true)
+    end
+
+    def test_version
+      assert Prism.parse_success?("1 + 1", version: "3.3")
+      assert Prism.parse_success?("1 + 1", version: "3.3.0")
+      assert Prism.parse_success?("1 + 1", version: "3.3.1")
+      assert Prism.parse_success?("1 + 1", version: "3.3.9")
+      assert Prism.parse_success?("1 + 1", version: "3.3.10")
+
+      assert Prism.parse_success?("1 + 1", version: "3.4")
+      assert Prism.parse_success?("1 + 1", version: "3.4.0")
+      assert Prism.parse_success?("1 + 1", version: "3.4.9")
+      assert Prism.parse_success?("1 + 1", version: "3.4.10")
+
+      assert Prism.parse_success?("1 + 1", version: "3.5")
+      assert Prism.parse_success?("1 + 1", version: "3.5.0")
+
+      assert Prism.parse_success?("1 + 1", version: "latest")
+
+      # Test edge case
+      error = assert_raise(ArgumentError) { Prism.parse("1 + 1", version: "latest2") }
+      assert_equal "invalid version: latest2", error.message
+
+      assert_raise ArgumentError do
+        Prism.parse("1 + 1", version: "3.3.a")
+      end
+
+      # Not supported version (too old)
+      assert_raise ArgumentError do
+        Prism.parse("1 + 1", version: "3.2.0")
+      end
+
+      # Not supported version (too new)
+      assert_raise ArgumentError do
+        Prism.parse("1 + 1", version: "3.6.0")
+      end
+    end
+
+    def test_scopes
+      assert_kind_of Prism::CallNode, Prism.parse_statement("foo")
+      assert_kind_of Prism::LocalVariableReadNode, Prism.parse_statement("foo", scopes: [[:foo]])
+      assert_kind_of Prism::LocalVariableReadNode, Prism.parse_statement("foo", scopes: [Prism.scope(locals: [:foo])])
+
+      assert Prism.parse_failure?("foo(*)")
+      assert Prism.parse_success?("foo(*)", scopes: [Prism.scope(forwarding: [:*])])
+
+      assert Prism.parse_failure?("foo(**)")
+      assert Prism.parse_success?("foo(**)", scopes: [Prism.scope(forwarding: [:**])])
+
+      assert Prism.parse_failure?("foo(&)")
+      assert Prism.parse_success?("foo(&)", scopes: [Prism.scope(forwarding: [:&])])
+
+      assert Prism.parse_failure?("foo(...)")
+      assert Prism.parse_success?("foo(...)", scopes: [Prism.scope(forwarding: [:"..."])])
+    end
+
+    private
+
+    def find_source_file_node(program)
+      queue = [program]
+      while (node = queue.shift)
+        return node if node.is_a?(SourceFileNode)
+        queue.concat(node.compact_child_nodes)
+      end
+    end
+  end
+end
diff --git a/test/yarp/bom_test.rb b/test/prism/bom_test.rb
similarity index 86%
rename from test/yarp/bom_test.rb
rename to test/prism/bom_test.rb
index 3a4e04a900afd2..890bc4b36c3ac4 100644
--- a/test/yarp/bom_test.rb
+++ b/test/prism/bom_test.rb
@@ -2,11 +2,11 @@
 
 # Don't bother checking this on these engines, this is such a specific Ripper
 # test.
-return if RUBY_ENGINE == "jruby" || RUBY_ENGINE == "truffleruby"
+return if RUBY_ENGINE != "ruby"
 
 require_relative "test_helper"
 
-module YARP
+module Prism
   class BOMTest < TestCase
     def test_ident
       assert_bom("foo")
@@ -53,7 +53,7 @@ def test_string
 
     def assert_bom(source)
       bommed = "\xEF\xBB\xBF#{source}"
-      assert_equal YARP.lex_ripper(bommed), YARP.lex_compat(bommed).value
+      assert_equal Prism.lex_ripper(bommed), Prism.lex_compat(bommed).value
     end
   end
 end
diff --git a/test/prism/encoding/encodings_test.rb b/test/prism/encoding/encodings_test.rb
new file mode 100644
index 00000000000000..4ad2b465cc1842
--- /dev/null
+++ b/test/prism/encoding/encodings_test.rb
@@ -0,0 +1,101 @@
+# frozen_string_literal: true
+
+return if RUBY_ENGINE != "ruby"
+
+require_relative "../test_helper"
+
+module Prism
+  class EncodingsTest < TestCase
+    class ConstantContext < BasicObject
+      def self.const_missing(const)
+        const
+      end
+    end
+
+    class IdentifierContext < BasicObject
+      def method_missing(name, *)
+        name
+      end
+    end
+
+    # These test that we're correctly parsing codepoints for each alias of each
+    # encoding that prism supports.
+    each_encoding do |encoding, range|
+      (encoding.names - %w[external internal filesystem locale]).each do |name|
+        define_method(:"test_encoding_#{name}") do
+          assert_encoding(encoding, name, range)
+        end
+      end
+    end
+
+    private
+
+    def assert_encoding_constant(name, character)
+      source = "# encoding: #{name}\n#{character}"
+      expected = ConstantContext.new.instance_eval(source)
+
+      result = Prism.parse(source)
+      assert result.success?
+
+      actual = result.value.statements.body.last
+      assert_kind_of ConstantReadNode, actual
+      assert_equal expected, actual.name
+    end
+
+    def assert_encoding_identifier(name, character)
+      source = "# encoding: #{name}\n#{character}"
+      expected = IdentifierContext.new.instance_eval(source)
+
+      result = Prism.parse(source)
+      assert result.success?
+
+      actual = result.value.statements.body.last
+      assert_kind_of CallNode, actual
+      assert_equal expected, actual.name
+    end
+
+    # Check that we can properly parse every codepoint in the given encoding.
+    def assert_encoding(encoding, name, range)
+      # I'm not entirely sure, but I believe these codepoints are incorrect in
+      # their parsing in CRuby. They all report as matching `[[:lower:]]` but
+      # then they are parsed as constants. This is because CRuby determines if
+      # an identifier is a constant or not by case folding it down to lowercase
+      # and checking if there is a difference. And even though they report
+      # themselves as lowercase, their case fold is different. I have reported
+      # this bug upstream.
+      case encoding
+      when Encoding::UTF_8, Encoding::UTF_8_MAC, Encoding::UTF8_DoCoMo, Encoding::UTF8_KDDI, Encoding::UTF8_SoftBank, Encoding::CESU_8
+        range = range.to_a - [
+          0x01c5, 0x01c8, 0x01cb, 0x01f2, 0x1f88, 0x1f89, 0x1f8a, 0x1f8b,
+          0x1f8c, 0x1f8d, 0x1f8e, 0x1f8f, 0x1f98, 0x1f99, 0x1f9a, 0x1f9b,
+          0x1f9c, 0x1f9d, 0x1f9e, 0x1f9f, 0x1fa8, 0x1fa9, 0x1faa, 0x1fab,
+          0x1fac, 0x1fad, 0x1fae, 0x1faf, 0x1fbc, 0x1fcc, 0x1ffc,
+        ]
+      when Encoding::Windows_1253
+        range = range.to_a - [0xb5]
+      end
+
+      range.each do |codepoint|
+        character = codepoint.chr(encoding)
+
+        if character.match?(/[[:alpha:]]/)
+          if character.match?(/[[:upper:]]/)
+            assert_encoding_constant(name, character)
+          else
+            assert_encoding_identifier(name, character)
+          end
+        elsif character.match?(/[[:alnum:]]/)
+          assert_encoding_identifier(name, "_#{character}")
+        else
+          next if ["/", "{"].include?(character)
+
+          source = "# encoding: #{name}\n/(?##{character})/\n"
+          assert Prism.parse_success?(source), "Expected #{source.inspect} to parse successfully."
+        end
+      rescue RangeError
+        source = "# encoding: #{name}\n\\x#{codepoint.to_s(16)}"
+        assert Prism.parse_failure?(source)
+      end
+    end
+  end
+end
diff --git a/test/prism/encoding/regular_expression_encoding_test.rb b/test/prism/encoding/regular_expression_encoding_test.rb
new file mode 100644
index 00000000000000..e2daae1d7faf67
--- /dev/null
+++ b/test/prism/encoding/regular_expression_encoding_test.rb
@@ -0,0 +1,131 @@
+# frozen_string_literal: true
+
+return unless defined?(RubyVM::InstructionSequence)
+return if RubyVM::InstructionSequence.compile("").to_a[4][:parser] == :prism
+
+require_relative "../test_helper"
+
+module Prism
+  class RegularExpressionEncodingTest < TestCase
+    each_encoding do |encoding, _|
+      define_method(:"test_regular_expression_encoding_flags_#{encoding.name}") do
+        assert_regular_expression_encoding_flags(encoding, ["/a/", "/ą/", "//"])
+      end
+
+      escapes = ["\\x00", "\\x7F", "\\x80", "\\xFF", "\\u{00}", "\\u{7F}", "\\u{80}", "\\M-\\C-?"]
+      escapes = escapes.concat(escapes.product(escapes).map(&:join))
+
+      define_method(:"test_regular_expression_escape_encoding_flags_#{encoding.name}") do
+        assert_regular_expression_encoding_flags(encoding, escapes.map { |e| "/#{e}/" })
+      end
+
+      ["n", "u", "e", "s"].each do |modifier|
+        define_method(:"test_regular_expression_encoding_modifiers_/#{modifier}_#{encoding.name}") do
+          regexp_sources = ["abc", "garçon", "\\x80", "gar\\xC3\\xA7on", "gar\\u{E7}on", "abc\\u{FFFFFF}", "\\x80\\u{80}" ]
+
+          assert_regular_expression_encoding_flags(
+            encoding,
+            regexp_sources.product(["n", "u", "e", "s"]).map { |r, modifier| "/#{r}/#{modifier}" }
+          )
+        end
+      end
+    end
+
+    private
+
+    def assert_regular_expression_encoding_flags(encoding, regexps)
+      regexps.each do |regexp|
+        regexp_modifier_used = regexp.end_with?("/u") || regexp.end_with?("/e") || regexp.end_with?("/s") || regexp.end_with?("/n")
+        source = "# encoding: #{encoding.name}\n#{regexp}"
+
+        encoding_errors = ["invalid multibyte char", "escaped non ASCII character in UTF-8 regexp", "differs from source encoding"]
+        skipped_errors = ["invalid multibyte escape", "incompatible character encoding", "UTF-8 character in non UTF-8 regexp", "invalid Unicode range", "invalid Unicode list"]
+
+        # TODO (nirvdrum 21-Feb-2024): Prism currently does not handle Regexp validation unless modifiers are used. So, skip processing those errors for now: https://github.com/ruby/prism/issues/2104
+        unless regexp_modifier_used
+          skipped_errors += encoding_errors
+          encoding_errors.clear
+        end
+
+        expected =
+          begin
+            eval(source).encoding
+          rescue SyntaxError => error
+            if encoding_errors.find { |e| error.message.include?(e) }
+              error.message.split("\n").map { |m| m[/: (.+?)$/, 1] }
+            elsif skipped_errors.find { |e| error.message.include?(e) }
+              next
+            else
+              raise
+            end
+          end
+
+        actual =
+          Prism.parse(source).then do |result|
+            if result.success?
+              regexp = result.statement
+
+              actual_encoding = if regexp.forced_utf8_encoding?
+                Encoding::UTF_8
+              elsif regexp.forced_binary_encoding?
+                Encoding::ASCII_8BIT
+              elsif regexp.forced_us_ascii_encoding?
+                Encoding::US_ASCII
+              elsif regexp.ascii_8bit?
+                Encoding::ASCII_8BIT
+              elsif regexp.utf_8?
+                Encoding::UTF_8
+              elsif regexp.euc_jp?
+                Encoding::EUC_JP
+              elsif regexp.windows_31j?
+                Encoding::Windows_31J
+              else
+                encoding
+              end
+
+              if regexp.utf_8? && actual_encoding != Encoding::UTF_8
+                raise "expected regexp encoding to be UTF-8 due to '/u' modifier, but got #{actual_encoding.name}"
+              elsif regexp.ascii_8bit? && (actual_encoding != Encoding::ASCII_8BIT && actual_encoding != Encoding::US_ASCII)
+                raise "expected regexp encoding to be ASCII-8BIT or US-ASCII due to '/n' modifier, but got #{actual_encoding.name}"
+              elsif regexp.euc_jp? && actual_encoding != Encoding::EUC_JP
+                raise "expected regexp encoding to be EUC-JP due to '/e' modifier, but got #{actual_encoding.name}"
+              elsif regexp.windows_31j? && actual_encoding != Encoding::Windows_31J
+                raise "expected regexp encoding to be Windows-31J due to '/s' modifier, but got #{actual_encoding.name}"
+              end
+
+              if regexp.utf_8? && regexp.forced_utf8_encoding?
+                raise "the forced_utf8 flag should not be set when the UTF-8 modifier (/u) is used"
+              elsif regexp.ascii_8bit? && regexp.forced_binary_encoding?
+                raise "the forced_ascii_8bit flag should not be set when the UTF-8 modifier (/u) is used"
+              end
+
+              actual_encoding
+            else
+              errors = result.errors.map(&:message)
+
+              if errors.last&.include?("UTF-8 mixed within")
+                nil
+              else
+                errors
+              end
+            end
+          end
+
+        # TODO (nirvdrum 22-Feb-2024): Remove this workaround once Prism better maps CRuby's error messages.
+        # This class of error message is tricky. The part not being compared is a representation of the regexp.
+        # Depending on the source encoding and any encoding modifiers being used, CRuby alters how the regexp is represented.
+        # Sometimes it's an MBC string. Other times it uses hexadecimal character escapes. And in other cases it uses
+        # the long-form Unicode escape sequences. This short-circuit checks that the error message is mostly correct.
+        if expected.is_a?(Array) && actual.is_a?(Array)
+          if expected.last.start_with?("/.../n has a non escaped non ASCII character in non ASCII-8BIT script:") &&
+              actual.last.start_with?("/.../n has a non escaped non ASCII character in non ASCII-8BIT script:")
+            expected.pop
+            actual.pop
+          end
+        end
+
+        assert_equal expected, actual
+      end
+    end
+  end
+end
diff --git a/test/prism/encoding/string_encoding_test.rb b/test/prism/encoding/string_encoding_test.rb
new file mode 100644
index 00000000000000..6f9d86df3be454
--- /dev/null
+++ b/test/prism/encoding/string_encoding_test.rb
@@ -0,0 +1,136 @@
+# frozen_string_literal: true
+
+require_relative "../test_helper"
+
+module Prism
+  class StringEncodingTest < TestCase
+    each_encoding do |encoding, _|
+      define_method(:"test_#{encoding.name}") do
+        assert_encoding(encoding)
+      end
+    end
+
+    def test_coding
+      actual = Prism.parse_statement("# coding: utf-8\n'string'").unescaped.encoding
+      assert_equal Encoding::UTF_8, actual
+    end
+
+    def test_coding_with_whitespace
+      actual = Prism.parse_statement("# coding \t \r  \v   :     \t \v    \r   ascii-8bit \n'string'").unescaped.encoding
+      assert_equal Encoding::ASCII_8BIT, actual
+    end
+
+    def test_emacs_style
+      actual = Prism.parse_statement("# -*- coding: utf-8 -*-\n'string'").unescaped.encoding
+      assert_equal Encoding::UTF_8, actual
+    end
+
+    def test_utf_8_unix
+      actual = Prism.parse_statement("# coding: utf-8-unix\n'string'").unescaped.encoding
+      assert_equal Encoding::UTF_8, actual
+    end
+
+    def test_utf_8_dos
+      actual = Prism.parse_statement("# coding: utf-8-dos\n'string'").unescaped.encoding
+      assert_equal Encoding::UTF_8, actual
+    end
+
+    def test_utf_8_mac
+      actual = Prism.parse_statement("# coding: utf-8-mac\n'string'").unescaped.encoding
+      assert_equal Encoding::UTF_8, actual
+    end
+
+    def test_utf_8_star
+      actual = Prism.parse_statement("# coding: utf-8-*\n'string'").unescaped.encoding
+      assert_equal Encoding::UTF_8, actual
+    end
+
+    def test_first_lexed_token
+      encoding = Prism.lex("# encoding: ascii-8bit").value[0][0].value.encoding
+      assert_equal Encoding::ASCII_8BIT, encoding
+    end
+
+    if !ENV["PRISM_BUILD_MINIMAL"]
+      # This test may be a little confusing. Basically when we use our strpbrk,
+      # it takes into account the encoding of the file.
+      def test_strpbrk_multibyte
+        result = Prism.parse(<<~RUBY)
+          # encoding: Shift_JIS
+          %w[\x81\x5c]
+        RUBY
+
+        assert(result.errors.empty?)
+        assert_equal(
+          (+"\x81\x5c").force_encoding(Encoding::Shift_JIS),
+          result.statement.elements.first.unescaped
+        )
+      end
+
+      def test_slice_encoding
+        slice = Prism.parse("# encoding: Shift_JIS\nア").value.slice
+        assert_equal (+"ア").force_encoding(Encoding::SHIFT_JIS), slice
+        assert_equal Encoding::SHIFT_JIS, slice.encoding
+      end
+
+      def test_multibyte_escapes
+        [
+          ["'", "'"],
+          ["\"", "\""],
+          ["`", "`"],
+          ["/", "/"],
+          ["<<'HERE'\n", "\nHERE"],
+          ["<<-HERE\n", "\nHERE"]
+        ].each do |opening, closing|
+          assert Prism.parse_success?("# encoding: shift_jis\n'\\\x82\xA0'\n")
+        end
+      end
+    end
+
+    private
+
+    def assert_encoding(encoding)
+      escapes = ["\\x00", "\\x7F", "\\x80", "\\xFF", "\\u{00}", "\\u{7F}", "\\u{80}", "\\M-\\C-?"]
+      escapes = escapes.concat(escapes.product(escapes).map(&:join))
+
+      escapes.each do |escaped|
+        source = "# encoding: #{encoding.name}\n\"#{escaped}\""
+
+        expected =
+          begin
+            eval(source).encoding
+          rescue SyntaxError => error
+            if error.message.include?("UTF-8 mixed within")
+              error.message[/UTF-8 mixed within .+? source/]
+            else
+              raise
+            end
+          end
+
+        actual =
+          Prism.parse(source).then do |result|
+            if result.success?
+              string = result.statement
+
+              if string.forced_utf8_encoding?
+                Encoding::UTF_8
+              elsif string.forced_binary_encoding?
+                Encoding::ASCII_8BIT
+              else
+                encoding
+              end
+            else
+              error = result.errors.first
+
+              if error.message.include?("mixed")
+                error.message
+              else
+                raise error.message
+              end
+            end
+          end
+
+        assert_equal expected, actual
+      end
+    end
+  end
+end
diff --git a/test/prism/encoding/symbol_encoding_test.rb b/test/prism/encoding/symbol_encoding_test.rb
new file mode 100644
index 00000000000000..20c998a58bb8ce
--- /dev/null
+++ b/test/prism/encoding/symbol_encoding_test.rb
@@ -0,0 +1,108 @@
+# frozen_string_literal: true
+
+return if RUBY_ENGINE != "ruby"
+
+require_relative "../test_helper"
+
+module Prism
+  class SymbolEncodingTest < TestCase
+    each_encoding do |encoding, _|
+      define_method(:"test_symbols_#{encoding.name}") do
+        assert_symbols(encoding)
+      end
+
+      define_method(:"test_escapes_#{encoding.name}") do
+        assert_escapes(encoding)
+      end
+    end
+
+    private
+
+    def expected_encoding(source)
+      eval(source).encoding
+    end
+
+    def actual_encoding(source, encoding)
+      result = Prism.parse(source)
+
+      if result.success?
+        symbol = result.statement
+
+        if symbol.forced_utf8_encoding?
+          Encoding::UTF_8
+        elsif symbol.forced_binary_encoding?
+          Encoding::ASCII_8BIT
+        elsif symbol.forced_us_ascii_encoding?
+          Encoding::US_ASCII
+        else
+          encoding
+        end
+      else
+        raise SyntaxError.new(result.errors.map(&:message).join("\n"))
+      end
+    end
+
+    def assert_symbols(encoding)
+      [:a, :ą, :+].each do |symbol|
+        source = "# encoding: #{encoding.name}\n#{symbol.inspect}"
+
+        expected =
+          begin
+            expected_encoding(source)
+          rescue SyntaxError => error
+            if error.message.include?("invalid multibyte")
+              "invalid multibyte"
+            else
+              raise
+            end
+          end
+
+        actual =
+          begin
+            actual_encoding(source, encoding)
+          rescue SyntaxError => error
+            if error.message.include?("invalid multibyte")
+              "invalid multibyte"
+            else
+              raise
+            end
+          end
+
+        assert_equal expected, actual
+      end
+    end
+
+    def assert_escapes(encoding)
+      escapes = ["\\x00", "\\x7F", "\\x80", "\\xFF", "\\u{00}", "\\u{7F}", "\\u{80}", "\\M-\\C-?"]
+      escapes = escapes.concat(escapes.product(escapes).map(&:join))
+
+      escapes.each do |escaped|
+        source = "# encoding: #{encoding.name}\n:\"#{escaped}\""
+
+        expected =
+          begin
+            expected_encoding(source)
+          rescue SyntaxError => error
+            if error.message.include?("UTF-8 mixed within")
+              error.message[/UTF-8 mixed within .+? source/]
+            else
+              raise
+            end
+          end
+
+        actual =
+          begin
+            actual_encoding(source, encoding)
+          rescue SyntaxError => error
+            if error.message.include?("mixed")
+              error.message.split("\n", 2).first
+            else
+              raise
+            end
+          end
+
+        assert_equal expected, actual
+      end
+    end
+  end
+end
diff --git a/test/prism/errors/1_2_3.txt b/test/prism/errors/1_2_3.txt
new file mode 100644
index 00000000000000..345452911f38e3
--- /dev/null
+++ b/test/prism/errors/1_2_3.txt
@@ -0,0 +1,11 @@
+(1, 2, 3)
+  ^ unexpected ',', expecting end-of-input
+  ^ unexpected ',', ignoring it
+  ^ expected a matching `)`
+  ^ unexpected ',', expecting end-of-input
+  ^ unexpected ',', ignoring it
+     ^ unexpected ',', expecting end-of-input
+     ^ unexpected ',', ignoring it
+        ^ unexpected ')', expecting end-of-input
+        ^ unexpected ')', ignoring it
+
diff --git a/test/prism/errors/aliasing_global_variable_with_global_number_variable.txt b/test/prism/errors/aliasing_global_variable_with_global_number_variable.txt
new file mode 100644
index 00000000000000..2f40a6a32886ab
--- /dev/null
+++ b/test/prism/errors/aliasing_global_variable_with_global_number_variable.txt
@@ -0,0 +1,3 @@
+alias $a $1
+         ^~ invalid argument being passed to `alias`; can't make alias for the number variables
+
diff --git a/test/prism/errors/aliasing_global_variable_with_non_global_variable.txt b/test/prism/errors/aliasing_global_variable_with_non_global_variable.txt
new file mode 100644
index 00000000000000..b6f013bab5234c
--- /dev/null
+++ b/test/prism/errors/aliasing_global_variable_with_non_global_variable.txt
@@ -0,0 +1,3 @@
+alias $a b
+         ^ invalid argument being passed to `alias`; expected a bare word, symbol, constant, or global variable
+
diff --git a/test/prism/errors/aliasing_non_global_variable_with_global_variable.txt b/test/prism/errors/aliasing_non_global_variable_with_global_variable.txt
new file mode 100644
index 00000000000000..8863f342f0f65c
--- /dev/null
+++ b/test/prism/errors/aliasing_non_global_variable_with_global_variable.txt
@@ -0,0 +1,3 @@
+alias a $b
+        ^~ invalid argument being passed to `alias`; expected a bare word, symbol, constant, or global variable
+
diff --git a/test/prism/errors/alnum_delimiters.txt b/test/prism/errors/alnum_delimiters.txt
new file mode 100644
index 00000000000000..c9ed06ae51d066
--- /dev/null
+++ b/test/prism/errors/alnum_delimiters.txt
@@ -0,0 +1,3 @@
+%qXfooX
+^ unknown type of %string
+
diff --git a/test/prism/errors/alnum_delimiters_2.txt b/test/prism/errors/alnum_delimiters_2.txt
new file mode 100644
index 00000000000000..3f78b434d6c436
--- /dev/null
+++ b/test/prism/errors/alnum_delimiters_2.txt
@@ -0,0 +1,3 @@
+%QXfooX
+^ unknown type of %string
+
diff --git a/test/prism/errors/alnum_delimiters_3.txt b/test/prism/errors/alnum_delimiters_3.txt
new file mode 100644
index 00000000000000..55ef8d29a54012
--- /dev/null
+++ b/test/prism/errors/alnum_delimiters_3.txt
@@ -0,0 +1,3 @@
+%wXfooX
+^ unknown type of %string
+
diff --git a/test/prism/errors/alnum_delimiters_4.txt b/test/prism/errors/alnum_delimiters_4.txt
new file mode 100644
index 00000000000000..603b54debdcfa5
--- /dev/null
+++ b/test/prism/errors/alnum_delimiters_4.txt
@@ -0,0 +1,3 @@
+%WxfooX
+^ unknown type of %string
+
diff --git a/test/prism/errors/alnum_delimiters_5.txt b/test/prism/errors/alnum_delimiters_5.txt
new file mode 100644
index 00000000000000..31c344ea90202e
--- /dev/null
+++ b/test/prism/errors/alnum_delimiters_5.txt
@@ -0,0 +1,3 @@
+%iXfooX
+^ unknown type of %string
+
diff --git a/test/prism/errors/alnum_delimiters_6.txt b/test/prism/errors/alnum_delimiters_6.txt
new file mode 100644
index 00000000000000..79ffbbb1b84b70
--- /dev/null
+++ b/test/prism/errors/alnum_delimiters_6.txt
@@ -0,0 +1,3 @@
+%IXfooX
+^ unknown type of %string
+
diff --git a/test/prism/errors/alnum_delimiters_7.txt b/test/prism/errors/alnum_delimiters_7.txt
new file mode 100644
index 00000000000000..809192e031f87e
--- /dev/null
+++ b/test/prism/errors/alnum_delimiters_7.txt
@@ -0,0 +1,3 @@
+%xXfooX
+^ unknown type of %string
+
diff --git a/test/prism/errors/alnum_delimiters_8.txt b/test/prism/errors/alnum_delimiters_8.txt
new file mode 100644
index 00000000000000..abfcf119c005ce
--- /dev/null
+++ b/test/prism/errors/alnum_delimiters_8.txt
@@ -0,0 +1,3 @@
+%rXfooX
+^ unknown type of %string
+
diff --git a/test/prism/errors/alnum_delimiters_9.txt b/test/prism/errors/alnum_delimiters_9.txt
new file mode 100644
index 00000000000000..ae56d7be4fb43e
--- /dev/null
+++ b/test/prism/errors/alnum_delimiters_9.txt
@@ -0,0 +1,3 @@
+%sXfooX
+^ unknown type of %string
+
diff --git a/test/prism/errors/amperand_dot_after_endless_range.txt b/test/prism/errors/amperand_dot_after_endless_range.txt
new file mode 100644
index 00000000000000..ab8c8ccc4d4d10
--- /dev/null
+++ b/test/prism/errors/amperand_dot_after_endless_range.txt
@@ -0,0 +1,3 @@
+0 if true...&.abs
+            ^~ unexpected '&.'; ... is a non-associative operator
+
diff --git a/test/prism/errors/argument_after_ellipsis.txt b/test/prism/errors/argument_after_ellipsis.txt
new file mode 100644
index 00000000000000..3d708648a40bd1
--- /dev/null
+++ b/test/prism/errors/argument_after_ellipsis.txt
@@ -0,0 +1,3 @@
+def foo(...); foo(..., 1); end
+                       ^ unexpected argument after `...`
+
diff --git a/test/prism/errors/argument_forwarding_only_effects_its_own_internals.txt b/test/prism/errors/argument_forwarding_only_effects_its_own_internals.txt
new file mode 100644
index 00000000000000..9c3f0ae3f76fe7
--- /dev/null
+++ b/test/prism/errors/argument_forwarding_only_effects_its_own_internals.txt
@@ -0,0 +1,3 @@
+def a(...); b(...); end; def c(x, y, z); b(...); end
+                                           ^~~ unexpected ... when the parent method is not forwarding
+
diff --git a/test/prism/errors/argument_forwarding_when_parent_is_not_forwarding.txt b/test/prism/errors/argument_forwarding_when_parent_is_not_forwarding.txt
new file mode 100644
index 00000000000000..017ba7eec9eb1b
--- /dev/null
+++ b/test/prism/errors/argument_forwarding_when_parent_is_not_forwarding.txt
@@ -0,0 +1,3 @@
+def a(x, y, z); b(...); end
+                  ^~~ unexpected ... when the parent method is not forwarding
+
diff --git a/test/prism/errors/arguments_after_block.txt b/test/prism/errors/arguments_after_block.txt
new file mode 100644
index 00000000000000..c33039146fd44c
--- /dev/null
+++ b/test/prism/errors/arguments_after_block.txt
@@ -0,0 +1,17 @@
+a(&block, foo)
+        ^ unexpected argument after a block argument
+a(&block,)
+        ^ unexpected argument after a block argument
+a.(&block,)
+         ^ unexpected argument after a block argument
+a[&block,]
+        ^ unexpected argument after a block argument
+def a(&block)
+  p(&block,)
+          ^ unexpected argument after a block argument
+  a.(&block,)
+           ^ unexpected argument after a block argument
+  a[&block,]
+          ^ unexpected argument after a block argument
+end
+
diff --git a/test/prism/errors/arguments_binding_power_for_and.txt b/test/prism/errors/arguments_binding_power_for_and.txt
new file mode 100644
index 00000000000000..0585a091f4d6ad
--- /dev/null
+++ b/test/prism/errors/arguments_binding_power_for_and.txt
@@ -0,0 +1,5 @@
+foo(*bar and baz)
+         ^~~ unexpected 'and'; expected a `)` to close the arguments
+                ^ unexpected ')', expecting end-of-input
+                ^ unexpected ')', ignoring it
+
diff --git a/test/prism/errors/arguments_invalid_comma.txt b/test/prism/errors/arguments_invalid_comma.txt
new file mode 100644
index 00000000000000..4e1360580c4982
--- /dev/null
+++ b/test/prism/errors/arguments_invalid_comma.txt
@@ -0,0 +1,4 @@
+p(a,b
+,)
+^ invalid comma
+
diff --git a/test/prism/errors/arguments_splat_after_star_star.txt b/test/prism/errors/arguments_splat_after_star_star.txt
new file mode 100644
index 00000000000000..c50c81a9a32e62
--- /dev/null
+++ b/test/prism/errors/arguments_splat_after_star_star.txt
@@ -0,0 +1,3 @@
+def f(*, **); p(**, *); end
+                    ^ unexpected `*` splat argument after a `**` keyword splat argument
+
diff --git a/test/prism/errors/array_invalid_comma.txt b/test/prism/errors/array_invalid_comma.txt
new file mode 100644
index 00000000000000..2f52a253e0fbe9
--- /dev/null
+++ b/test/prism/errors/array_invalid_comma.txt
@@ -0,0 +1,4 @@
+[a
+,]
+^ invalid comma
+
diff --git a/test/prism/errors/array_with_double_commas.txt b/test/prism/errors/array_with_double_commas.txt
new file mode 100644
index 00000000000000..7c971103f645fb
--- /dev/null
+++ b/test/prism/errors/array_with_double_commas.txt
@@ -0,0 +1,3 @@
+[a:1,,]
+     ^ unexpected ','; expected a `]` to close the array
+
diff --git a/test/prism/errors/assign_to_numbered_parameter.txt b/test/prism/errors/assign_to_numbered_parameter.txt
new file mode 100644
index 00000000000000..74cc0c4032428e
--- /dev/null
+++ b/test/prism/errors/assign_to_numbered_parameter.txt
@@ -0,0 +1,11 @@
+a in _1
+     ^~ _1 is reserved for numbered parameters
+a => _1
+     ^~ _1 is reserved for numbered parameters
+1 => a, _1
+        ^~ _1 is reserved for numbered parameters
+1 in a, _1
+        ^~ _1 is reserved for numbered parameters
+/(?<_1>)/ =~ a
+    ^~ _1 is reserved for numbered parameters
+
diff --git a/test/prism/errors/bad_arguments.txt b/test/prism/errors/bad_arguments.txt
new file mode 100644
index 00000000000000..ea19efd3c8fec7
--- /dev/null
+++ b/test/prism/errors/bad_arguments.txt
@@ -0,0 +1,6 @@
+def foo(A, @a, $A, @@a);end
+        ^ invalid formal argument; formal argument cannot be a constant
+           ^~ invalid formal argument; formal argument cannot be an instance variable
+               ^~ invalid formal argument; formal argument cannot be a global variable
+                   ^~~ invalid formal argument; formal argument cannot be a class variable
+
diff --git a/test/prism/errors/begin_at_toplevel.txt b/test/prism/errors/begin_at_toplevel.txt
new file mode 100644
index 00000000000000..ce3d3b8d002728
--- /dev/null
+++ b/test/prism/errors/begin_at_toplevel.txt
@@ -0,0 +1,3 @@
+def foo; BEGIN {}; end
+         ^~~~~ BEGIN is permitted only at toplevel
+
diff --git a/test/prism/errors/binary_range_with_left_unary_range.txt b/test/prism/errors/binary_range_with_left_unary_range.txt
new file mode 100644
index 00000000000000..85cf55fb8064cf
--- /dev/null
+++ b/test/prism/errors/binary_range_with_left_unary_range.txt
@@ -0,0 +1,8 @@
+..1..
+   ^~ unexpected range operator; .. and ... are non-associative and cannot be chained
+...1..
+    ^~ unexpected range operator; .. and ... are non-associative and cannot be chained
+    ^~ unexpected ..; .. is a non-associative operator
+    ^~ unexpected .., expecting end-of-input
+    ^~ unexpected .., ignoring it
+
diff --git a/test/prism/errors/block_arg_and_block.txt b/test/prism/errors/block_arg_and_block.txt
new file mode 100644
index 00000000000000..c355c404758341
--- /dev/null
+++ b/test/prism/errors/block_arg_and_block.txt
@@ -0,0 +1,3 @@
+foo(&1) { }
+        ^~~ both block arg and actual block given; only one block is allowed
+
diff --git a/test/prism/errors/block_args_in_array_assignment.txt b/test/prism/errors/block_args_in_array_assignment.txt
new file mode 100644
index 00000000000000..71dca8452b9c38
--- /dev/null
+++ b/test/prism/errors/block_args_in_array_assignment.txt
@@ -0,0 +1,3 @@
+matrix[5, &block] = 8
+          ^~~~~~ unexpected block arg given in index assignment; blocks are not allowed in index assignment expressions
+
diff --git a/test/prism/errors/block_beginning_with_brace_and_ending_with_end.txt b/test/prism/errors/block_beginning_with_brace_and_ending_with_end.txt
new file mode 100644
index 00000000000000..16af8200ec8930
--- /dev/null
+++ b/test/prism/errors/block_beginning_with_brace_and_ending_with_end.txt
@@ -0,0 +1,5 @@
+x.each { x end
+           ^~~ unexpected 'end', expecting end-of-input
+           ^~~ unexpected 'end', ignoring it
+              ^ expected a block beginning with `{` to end with `}`
+
diff --git a/test/prism/errors/break_1.txt b/test/prism/errors/break_1.txt
new file mode 100644
index 00000000000000..5d74e7bde0f1af
--- /dev/null
+++ b/test/prism/errors/break_1.txt
@@ -0,0 +1,4 @@
+break 1,;
+        ^ unexpected ';'; expected an argument
+^~~~~~~~ Invalid break
+
diff --git a/test/prism/errors/break_1_2_3.txt b/test/prism/errors/break_1_2_3.txt
new file mode 100644
index 00000000000000..817207cbfe3d39
--- /dev/null
+++ b/test/prism/errors/break_1_2_3.txt
@@ -0,0 +1,8 @@
+break(1, 2, 3)
+       ^ unexpected ',', expecting end-of-input
+       ^ unexpected ',', ignoring it
+       ^ expected a matching `)`
+             ^ unexpected ')', expecting end-of-input
+             ^ unexpected ')', ignoring it
+^~~~~~~~~~~~~ Invalid break
+
diff --git a/test/prism/errors/call_with_block_and_write.txt b/test/prism/errors/call_with_block_and_write.txt
new file mode 100644
index 00000000000000..f63d94770eb327
--- /dev/null
+++ b/test/prism/errors/call_with_block_and_write.txt
@@ -0,0 +1,4 @@
+foo {} &&= 1
+^~~~~~ unexpected write target
+       ^~~ unexpected operator after a call with a block
+
diff --git a/test/prism/errors/call_with_block_operator_write.txt b/test/prism/errors/call_with_block_operator_write.txt
new file mode 100644
index 00000000000000..3c36050b34f0fb
--- /dev/null
+++ b/test/prism/errors/call_with_block_operator_write.txt
@@ -0,0 +1,4 @@
+foo {} += 1
+^~~~~~ unexpected write target
+       ^~ unexpected operator after a call with a block
+
diff --git a/test/prism/errors/call_with_block_or_write.txt b/test/prism/errors/call_with_block_or_write.txt
new file mode 100644
index 00000000000000..2cced0db75d50b
--- /dev/null
+++ b/test/prism/errors/call_with_block_or_write.txt
@@ -0,0 +1,4 @@
+foo {} ||= 1
+^~~~~~ unexpected write target
+       ^~~ unexpected operator after a call with a block
+
diff --git a/test/prism/errors/cannot_assign_to_a_reserved_numbered_parameter.txt b/test/prism/errors/cannot_assign_to_a_reserved_numbered_parameter.txt
new file mode 100644
index 00000000000000..750915fb1fb398
--- /dev/null
+++ b/test/prism/errors/cannot_assign_to_a_reserved_numbered_parameter.txt
@@ -0,0 +1,14 @@
+begin
+  _1=:a;_2=:a;_3=:a;_4=:a;_5=:a
+  ^~ _1 is reserved for numbered parameters
+        ^~ _2 is reserved for numbered parameters
+              ^~ _3 is reserved for numbered parameters
+                    ^~ _4 is reserved for numbered parameters
+                          ^~ _5 is reserved for numbered parameters
+  _6=:a;_7=:a;_8=:a;_9=:a;_10=:a
+  ^~ _6 is reserved for numbered parameters
+        ^~ _7 is reserved for numbered parameters
+              ^~ _8 is reserved for numbered parameters
+                    ^~ _9 is reserved for numbered parameters
+end
+
diff --git a/test/prism/errors/case_without_clauses.txt b/test/prism/errors/case_without_clauses.txt
new file mode 100644
index 00000000000000..3bbbfdd97fa136
--- /dev/null
+++ b/test/prism/errors/case_without_clauses.txt
@@ -0,0 +1,4 @@
+case :a
+^~~~ expected a `when` or `in` clause after `case`
+end
+
diff --git a/test/prism/errors/case_without_when_clauses_errors_on_else_clause.txt b/test/prism/errors/case_without_when_clauses_errors_on_else_clause.txt
new file mode 100644
index 00000000000000..c5a1179fb9dbc3
--- /dev/null
+++ b/test/prism/errors/case_without_when_clauses_errors_on_else_clause.txt
@@ -0,0 +1,5 @@
+case :a
+^~~~ expected a `when` or `in` clause after `case`
+else
+end
+
diff --git a/test/prism/errors/check_value_expression.txt b/test/prism/errors/check_value_expression.txt
new file mode 100644
index 00000000000000..33a472d94c167d
--- /dev/null
+++ b/test/prism/errors/check_value_expression.txt
@@ -0,0 +1,20 @@
+1 => ^(return)
+       ^~~~~~ unexpected void value expression
+while true
+  1 => ^(break)
+         ^~~~~ unexpected void value expression
+  1 => ^(next)
+         ^~~~ unexpected void value expression
+  1 => ^(redo)
+         ^~~~ unexpected void value expression
+  1 => ^(retry)
+         ^~~~~ Invalid retry without rescue
+         ^~~~~ unexpected void value expression
+  1 => ^(2 => a)
+         ^~~~~~ unexpected void value expression
+end
+1 => ^(if 1; (return) else (return) end)
+              ^~~~~~ unexpected void value expression
+1 => ^(unless 1; (return) else (return) end)
+                  ^~~~~~ unexpected void value expression
+
diff --git a/test/prism/errors/class_definition_in_method_body.txt b/test/prism/errors/class_definition_in_method_body.txt
new file mode 100644
index 00000000000000..fcdc5746eecdfa
--- /dev/null
+++ b/test/prism/errors/class_definition_in_method_body.txt
@@ -0,0 +1,3 @@
+def foo;class A;end;end
+        ^~~~~ unexpected class definition in method body
+
diff --git a/test/prism/errors/class_definition_in_method_defs.txt b/test/prism/errors/class_definition_in_method_defs.txt
new file mode 100644
index 00000000000000..23bee0b6fb3342
--- /dev/null
+++ b/test/prism/errors/class_definition_in_method_defs.txt
@@ -0,0 +1,7 @@
+def foo(bar = class A;end);end
+              ^~~~~ unexpected class definition in method body
+def foo;rescue;class A;end;end
+               ^~~~~ unexpected class definition in method body
+def foo;ensure;class A;end;end
+               ^~~~~ unexpected class definition in method body
+
diff --git a/test/prism/errors/class_name.txt b/test/prism/errors/class_name.txt
new file mode 100644
index 00000000000000..8b75896ddbacb7
--- /dev/null
+++ b/test/prism/errors/class_name.txt
@@ -0,0 +1,3 @@
+class 0.X end
+      ^~~ unexpected constant path after `class`; class/module name must be CONSTANT
+
diff --git a/test/prism/errors/command_call_in.txt b/test/prism/errors/command_call_in.txt
new file mode 100644
index 00000000000000..2fdcf0973897b7
--- /dev/null
+++ b/test/prism/errors/command_call_in.txt
@@ -0,0 +1,5 @@
+foo 1 in a
+      ^~ unexpected 'in', expecting end-of-input
+      ^~ unexpected 'in', ignoring it
+a = foo 2 in b
+
diff --git a/test/prism/errors/command_calls.txt b/test/prism/errors/command_calls.txt
new file mode 100644
index 00000000000000..19812a1d0a6780
--- /dev/null
+++ b/test/prism/errors/command_calls.txt
@@ -0,0 +1,3 @@
+[a b]
+  ^ unexpected local variable or method; expected a `,` separator for the array elements
+
diff --git a/test/prism/errors/command_calls_10.txt b/test/prism/errors/command_calls_10.txt
new file mode 100644
index 00000000000000..f4d9f0fabcf9ff
--- /dev/null
+++ b/test/prism/errors/command_calls_10.txt
@@ -0,0 +1,3 @@
++a b
+   ^ unexpected local variable or method, expecting end-of-input
+
diff --git a/test/prism/errors/command_calls_11.txt b/test/prism/errors/command_calls_11.txt
new file mode 100644
index 00000000000000..868476c0c31935
--- /dev/null
+++ b/test/prism/errors/command_calls_11.txt
@@ -0,0 +1,3 @@
+a + b c
+      ^ unexpected local variable or method, expecting end-of-input
+
diff --git a/test/prism/errors/command_calls_12.txt b/test/prism/errors/command_calls_12.txt
new file mode 100644
index 00000000000000..50c9ae88e3a4b8
--- /dev/null
+++ b/test/prism/errors/command_calls_12.txt
@@ -0,0 +1,3 @@
+a && b c
+       ^ unexpected local variable or method, expecting end-of-input
+
diff --git a/test/prism/errors/command_calls_13.txt b/test/prism/errors/command_calls_13.txt
new file mode 100644
index 00000000000000..50dc4a84a02ae2
--- /dev/null
+++ b/test/prism/errors/command_calls_13.txt
@@ -0,0 +1,3 @@
+a =~ b c
+       ^ unexpected local variable or method, expecting end-of-input
+
diff --git a/test/prism/errors/command_calls_14.txt b/test/prism/errors/command_calls_14.txt
new file mode 100644
index 00000000000000..1b16fd32453122
--- /dev/null
+++ b/test/prism/errors/command_calls_14.txt
@@ -0,0 +1,3 @@
+a = b, c d
+         ^ unexpected local variable or method, expecting end-of-input
+
diff --git a/test/prism/errors/command_calls_15.txt b/test/prism/errors/command_calls_15.txt
new file mode 100644
index 00000000000000..d2409fd002360d
--- /dev/null
+++ b/test/prism/errors/command_calls_15.txt
@@ -0,0 +1,3 @@
+a = *b c
+       ^ unexpected local variable or method, expecting end-of-input
+
diff --git a/test/prism/errors/command_calls_16.txt b/test/prism/errors/command_calls_16.txt
new file mode 100644
index 00000000000000..ceb07dfe30aa11
--- /dev/null
+++ b/test/prism/errors/command_calls_16.txt
@@ -0,0 +1,3 @@
+a, b = c = d f
+             ^ unexpected local variable or method, expecting end-of-input
+
diff --git a/test/prism/errors/command_calls_17.txt b/test/prism/errors/command_calls_17.txt
new file mode 100644
index 00000000000000..a78ac0985d1202
--- /dev/null
+++ b/test/prism/errors/command_calls_17.txt
@@ -0,0 +1,5 @@
+a ? b c : d e
+     ^ expected a `:` after the true expression of a ternary operator
+        ^ unexpected ':', expecting end-of-input
+        ^ unexpected ':', ignoring it
+
diff --git a/test/prism/errors/command_calls_18.txt b/test/prism/errors/command_calls_18.txt
new file mode 100644
index 00000000000000..393e7e0ae63cc1
--- /dev/null
+++ b/test/prism/errors/command_calls_18.txt
@@ -0,0 +1,3 @@
+defined? a b
+           ^ unexpected local variable or method, expecting end-of-input
+
diff --git a/test/prism/errors/command_calls_19.txt b/test/prism/errors/command_calls_19.txt
new file mode 100644
index 00000000000000..e045187f1e4734
--- /dev/null
+++ b/test/prism/errors/command_calls_19.txt
@@ -0,0 +1,3 @@
+! ! a b
+      ^ unexpected local variable or method, expecting end-of-input
+
diff --git a/test/prism/errors/command_calls_2.txt b/test/prism/errors/command_calls_2.txt
new file mode 100644
index 00000000000000..b0983c015bb49d
--- /dev/null
+++ b/test/prism/errors/command_calls_2.txt
@@ -0,0 +1,6 @@
+{a: b c}
+     ^ expected a `}` to close the hash literal
+      ^ unexpected local variable or method, expecting end-of-input
+       ^ unexpected '}', expecting end-of-input
+       ^ unexpected '}', ignoring it
+
diff --git a/test/prism/errors/command_calls_20.txt b/test/prism/errors/command_calls_20.txt
new file mode 100644
index 00000000000000..3058ebce963cbb
--- /dev/null
+++ b/test/prism/errors/command_calls_20.txt
@@ -0,0 +1,3 @@
+def f a = b c; end
+           ^ expected a delimiter to close the parameters
+
diff --git a/test/prism/errors/command_calls_21.txt b/test/prism/errors/command_calls_21.txt
new file mode 100644
index 00000000000000..73d8f83539a468
--- /dev/null
+++ b/test/prism/errors/command_calls_21.txt
@@ -0,0 +1,5 @@
+def f(a = b c); end
+            ^ unexpected local variable or method; expected a `)` to close the parameters
+             ^ unexpected ')', expecting end-of-input
+             ^ unexpected ')', ignoring it
+
diff --git a/test/prism/errors/command_calls_22.txt b/test/prism/errors/command_calls_22.txt
new file mode 100644
index 00000000000000..5a234e04e8b779
--- /dev/null
+++ b/test/prism/errors/command_calls_22.txt
@@ -0,0 +1,3 @@
+a = b rescue c d
+               ^ unexpected local variable or method, expecting end-of-input
+
diff --git a/test/prism/errors/command_calls_23.txt b/test/prism/errors/command_calls_23.txt
new file mode 100644
index 00000000000000..db85589ffdea5d
--- /dev/null
+++ b/test/prism/errors/command_calls_23.txt
@@ -0,0 +1,3 @@
+def a = b rescue c d
+                   ^ unexpected local variable or method, expecting end-of-input
+
diff --git a/test/prism/errors/command_calls_24.txt b/test/prism/errors/command_calls_24.txt
new file mode 100644
index 00000000000000..3046b36dc1256f
--- /dev/null
+++ b/test/prism/errors/command_calls_24.txt
@@ -0,0 +1,5 @@
+->a=b c{}
+     ^ expected a `do` keyword or a `{` to open the lambda block
+         ^ unexpected end-of-input, assuming it is closing the parent top level context
+         ^ expected a lambda block beginning with `do` to end with `end`
+
diff --git a/test/prism/errors/command_calls_25.txt b/test/prism/errors/command_calls_25.txt
new file mode 100644
index 00000000000000..5fddd90fdd09ae
--- /dev/null
+++ b/test/prism/errors/command_calls_25.txt
@@ -0,0 +1,8 @@
+->(a=b c){}
+      ^ expected a matching `)`
+      ^ expected a `do` keyword or a `{` to open the lambda block
+        ^ unexpected ')', expecting end-of-input
+        ^ unexpected ')', ignoring it
+           ^ unexpected end-of-input, assuming it is closing the parent top level context
+           ^ expected a lambda block beginning with `do` to end with `end`
+
diff --git a/test/prism/errors/command_calls_26.txt b/test/prism/errors/command_calls_26.txt
new file mode 100644
index 00000000000000..29ed4cb903b051
--- /dev/null
+++ b/test/prism/errors/command_calls_26.txt
@@ -0,0 +1,3 @@
+case; when a b; end
+            ^ expected a delimiter after the predicates of a `when` clause
+
diff --git a/test/prism/errors/command_calls_27.txt b/test/prism/errors/command_calls_27.txt
new file mode 100644
index 00000000000000..8d1c3ee07791a8
--- /dev/null
+++ b/test/prism/errors/command_calls_27.txt
@@ -0,0 +1,3 @@
+case; in a if a b; end
+^~~~ expected a predicate for a case matching statement
+
diff --git a/test/prism/errors/command_calls_28.txt b/test/prism/errors/command_calls_28.txt
new file mode 100644
index 00000000000000..4bfe88d67ba87e
--- /dev/null
+++ b/test/prism/errors/command_calls_28.txt
@@ -0,0 +1,3 @@
+case; in a unless a b; end
+^~~~ expected a predicate for a case matching statement
+
diff --git a/test/prism/errors/command_calls_29.txt b/test/prism/errors/command_calls_29.txt
new file mode 100644
index 00000000000000..eae012ab44c77f
--- /dev/null
+++ b/test/prism/errors/command_calls_29.txt
@@ -0,0 +1,3 @@
+begin; rescue a b; end
+               ^ expected a closing delimiter for the `rescue` clause
+
diff --git a/test/prism/errors/command_calls_3.txt b/test/prism/errors/command_calls_3.txt
new file mode 100644
index 00000000000000..77af72b904809e
--- /dev/null
+++ b/test/prism/errors/command_calls_3.txt
@@ -0,0 +1,3 @@
+...a b
+     ^ unexpected local variable or method, expecting end-of-input
+
diff --git a/test/prism/errors/command_calls_30.txt b/test/prism/errors/command_calls_30.txt
new file mode 100644
index 00000000000000..48e35685cbaf30
--- /dev/null
+++ b/test/prism/errors/command_calls_30.txt
@@ -0,0 +1,3 @@
+begin; rescue a b => c; end
+               ^ expected a closing delimiter for the `rescue` clause
+
diff --git a/test/prism/errors/command_calls_4.txt b/test/prism/errors/command_calls_4.txt
new file mode 100644
index 00000000000000..4be14e57e4774e
--- /dev/null
+++ b/test/prism/errors/command_calls_4.txt
@@ -0,0 +1,3 @@
+if ...a b; end
+        ^ expected `then` or `;` or '\n'
+
diff --git a/test/prism/errors/command_calls_5.txt b/test/prism/errors/command_calls_5.txt
new file mode 100644
index 00000000000000..799a6c1136b678
--- /dev/null
+++ b/test/prism/errors/command_calls_5.txt
@@ -0,0 +1,3 @@
+a b, c d
+       ^ unexpected local variable or method, expecting end-of-input
+
diff --git a/test/prism/errors/command_calls_6.txt b/test/prism/errors/command_calls_6.txt
new file mode 100644
index 00000000000000..6f09d36e942d71
--- /dev/null
+++ b/test/prism/errors/command_calls_6.txt
@@ -0,0 +1,6 @@
+a(b, c d)
+       ^ unexpected local variable or method; expected a `)` to close the arguments
+       ^ unexpected local variable or method, expecting end-of-input
+        ^ unexpected ')', expecting end-of-input
+        ^ unexpected ')', ignoring it
+
diff --git a/test/prism/errors/command_calls_7.txt b/test/prism/errors/command_calls_7.txt
new file mode 100644
index 00000000000000..b5d74209fa6f2f
--- /dev/null
+++ b/test/prism/errors/command_calls_7.txt
@@ -0,0 +1,6 @@
+a(*b c)
+     ^ unexpected local variable or method; expected a `)` to close the arguments
+     ^ unexpected local variable or method, expecting end-of-input
+      ^ unexpected ')', expecting end-of-input
+      ^ unexpected ')', ignoring it
+
diff --git a/test/prism/errors/command_calls_8.txt b/test/prism/errors/command_calls_8.txt
new file mode 100644
index 00000000000000..e574063e72a607
--- /dev/null
+++ b/test/prism/errors/command_calls_8.txt
@@ -0,0 +1,6 @@
+a(**b c)
+      ^ unexpected local variable or method; expected a `)` to close the arguments
+      ^ unexpected local variable or method, expecting end-of-input
+       ^ unexpected ')', expecting end-of-input
+       ^ unexpected ')', ignoring it
+
diff --git a/test/prism/errors/command_calls_9.txt b/test/prism/errors/command_calls_9.txt
new file mode 100644
index 00000000000000..69515d959c0698
--- /dev/null
+++ b/test/prism/errors/command_calls_9.txt
@@ -0,0 +1,6 @@
+a(&b c)
+     ^ unexpected local variable or method; expected a `)` to close the arguments
+     ^ unexpected local variable or method, expecting end-of-input
+      ^ unexpected ')', expecting end-of-input
+      ^ unexpected ')', ignoring it
+
diff --git a/test/prism/errors/conditional_predicate_closed.txt b/test/prism/errors/conditional_predicate_closed.txt
new file mode 100644
index 00000000000000..6655fd2b1ceb72
--- /dev/null
+++ b/test/prism/errors/conditional_predicate_closed.txt
@@ -0,0 +1,6 @@
+if 0 0; elsif 0 0; end
+     ^ expected `then` or `;` or '\n'
+                ^ expected `then` or `;` or '\n'
+unless 0 0; end
+         ^ expected `then` or `;` or '\n'
+
diff --git a/test/prism/errors/constant_assignment_in_method.txt b/test/prism/errors/constant_assignment_in_method.txt
new file mode 100644
index 00000000000000..1ee49bffe6f57b
--- /dev/null
+++ b/test/prism/errors/constant_assignment_in_method.txt
@@ -0,0 +1,3 @@
+def foo();A=1;end
+          ^~~ dynamic constant assignment
+
diff --git a/test/prism/errors/constant_path_with_invalid_token_after.txt b/test/prism/errors/constant_path_with_invalid_token_after.txt
new file mode 100644
index 00000000000000..acb6dba30a3cec
--- /dev/null
+++ b/test/prism/errors/constant_path_with_invalid_token_after.txt
@@ -0,0 +1,4 @@
+A::$b
+   ^ expected a constant after the `::` operator
+   ^~ unexpected global variable, expecting end-of-input
+
diff --git a/test/prism/errors/content_after_unterminated_heredoc.txt b/test/prism/errors/content_after_unterminated_heredoc.txt
new file mode 100644
index 00000000000000..c0446a8c39fff4
--- /dev/null
+++ b/test/prism/errors/content_after_unterminated_heredoc.txt
@@ -0,0 +1,4 @@
+<<~FOO.foo
+   ^~~ unterminated heredoc; can't find string "FOO" anywhere before EOF
+   ^~~ unterminated heredoc; can't find string "FOO" anywhere before EOF
+
diff --git a/test/prism/errors/cr_without_lf_in_percent_expression.txt b/test/prism/errors/cr_without_lf_in_percent_expression.txt
new file mode 100644
index 00000000000000..903f8b4b4afa7e
--- /dev/null
+++ b/test/prism/errors/cr_without_lf_in_percent_expression.txt
@@ -0,0 +1,3 @@
+%
+  ^ unterminated string meets end of file
+
diff --git a/test/prism/errors/def_ivar.txt b/test/prism/errors/def_ivar.txt
new file mode 100644
index 00000000000000..11620885cfce31
--- /dev/null
+++ b/test/prism/errors/def_ivar.txt
@@ -0,0 +1,3 @@
+def @foo; end
+    ^~~~ unexpected instance variable; expected a method name
+
diff --git a/test/prism/errors/def_with_empty_expression_receiver.txt b/test/prism/errors/def_with_empty_expression_receiver.txt
new file mode 100644
index 00000000000000..153fe8a1c6f7e9
--- /dev/null
+++ b/test/prism/errors/def_with_empty_expression_receiver.txt
@@ -0,0 +1,3 @@
+def ().a; end
+    ^ expected a receiver for the method definition
+
diff --git a/test/prism/errors/def_with_expression_receiver_and_no_identifier.txt b/test/prism/errors/def_with_expression_receiver_and_no_identifier.txt
new file mode 100644
index 00000000000000..1aefc07f1a2b2f
--- /dev/null
+++ b/test/prism/errors/def_with_expression_receiver_and_no_identifier.txt
@@ -0,0 +1,4 @@
+def (a); end
+       ^ expected a `.` or `::` after the receiver in a method definition
+       ^ unexpected ';'; expected a method name
+
diff --git a/test/prism/errors/def_with_multiple_statements_receiver.txt b/test/prism/errors/def_with_multiple_statements_receiver.txt
new file mode 100644
index 00000000000000..80c9d4c19018e0
--- /dev/null
+++ b/test/prism/errors/def_with_multiple_statements_receiver.txt
@@ -0,0 +1,10 @@
+def (
+a
+b
+^ expected a matching `)`
+^ expected a `.` or `::` after the receiver in a method definition
+ ^ expected a delimiter to close the parameters
+).c; end
+^ unexpected ')', ignoring it
+ ^ unexpected '.', ignoring it
+
diff --git a/test/prism/errors/defined_empty.txt b/test/prism/errors/defined_empty.txt
new file mode 100644
index 00000000000000..4d7ea76413120c
--- /dev/null
+++ b/test/prism/errors/defined_empty.txt
@@ -0,0 +1,3 @@
+defined?()
+        ^ expected an expression after `defined?`
+
diff --git a/test/prism/errors/defining_numbered_parameter.txt b/test/prism/errors/defining_numbered_parameter.txt
new file mode 100644
index 00000000000000..2bf05d9563131b
--- /dev/null
+++ b/test/prism/errors/defining_numbered_parameter.txt
@@ -0,0 +1,3 @@
+def _1; end
+    ^~ _1 is reserved for numbered parameters
+
diff --git a/test/prism/errors/defining_numbered_parameter_2.txt b/test/prism/errors/defining_numbered_parameter_2.txt
new file mode 100644
index 00000000000000..dc4739b126abe6
--- /dev/null
+++ b/test/prism/errors/defining_numbered_parameter_2.txt
@@ -0,0 +1,3 @@
+def self._1; end
+         ^~ _1 is reserved for numbered parameters
+
diff --git a/test/prism/errors/defs_endless_method.txt b/test/prism/errors/defs_endless_method.txt
new file mode 100644
index 00000000000000..80db648e62750b
--- /dev/null
+++ b/test/prism/errors/defs_endless_method.txt
@@ -0,0 +1,12 @@
+def f=(k,v)=1
+    ^~ invalid method name; a setter method cannot be defined in an endless method definition
+
+def obj.f=(k,v)=1
+        ^~ invalid method name; a setter method cannot be defined in an endless method definition
+
+def []=(k,v)=1
+    ^~~ invalid method name; a setter method cannot be defined in an endless method definition
+
+def obj.[]=(k,v)=1
+        ^~~ invalid method name; a setter method cannot be defined in an endless method definition
+
diff --git a/test/prism/errors/do_not_allow_characters_other_than_0_9_a_f_and_A_F_in_u_Unicode_character_notation.txt b/test/prism/errors/do_not_allow_characters_other_than_0_9_a_f_and_A_F_in_u_Unicode_character_notation.txt
new file mode 100644
index 00000000000000..953b9589d1ff67
--- /dev/null
+++ b/test/prism/errors/do_not_allow_characters_other_than_0_9_a_f_and_A_F_in_u_Unicode_character_notation.txt
@@ -0,0 +1,4 @@
+"\u{000z}"
+       ^ invalid Unicode escape sequence
+       ^ unterminated Unicode escape
+
diff --git a/test/prism/errors/do_not_allow_forward_arguments_in_blocks.txt b/test/prism/errors/do_not_allow_forward_arguments_in_blocks.txt
new file mode 100644
index 00000000000000..df495576177796
--- /dev/null
+++ b/test/prism/errors/do_not_allow_forward_arguments_in_blocks.txt
@@ -0,0 +1,3 @@
+a {|...|}
+    ^~~ unexpected ... when the parent method is not forwarding
+
diff --git a/test/prism/errors/do_not_allow_forward_arguments_in_lambda_literals.txt b/test/prism/errors/do_not_allow_forward_arguments_in_lambda_literals.txt
new file mode 100644
index 00000000000000..c2405a5c66fed1
--- /dev/null
+++ b/test/prism/errors/do_not_allow_forward_arguments_in_lambda_literals.txt
@@ -0,0 +1,3 @@
+->(...) {}
+   ^~~ unexpected ... when the parent method is not forwarding
+
diff --git a/test/prism/errors/do_not_allow_more_than_6_hexadecimal_digits_in_u_Unicode_character_notation.txt b/test/prism/errors/do_not_allow_more_than_6_hexadecimal_digits_in_u_Unicode_character_notation.txt
new file mode 100644
index 00000000000000..50795c93533896
--- /dev/null
+++ b/test/prism/errors/do_not_allow_more_than_6_hexadecimal_digits_in_u_Unicode_character_notation.txt
@@ -0,0 +1,3 @@
+"\u{0000001}"
+    ^~~~~~~ invalid Unicode escape sequence; maximum length is 6 digits
+
diff --git a/test/prism/errors/do_not_allow_multiple_codepoints_in_a_single_character_literal.txt b/test/prism/errors/do_not_allow_multiple_codepoints_in_a_single_character_literal.txt
new file mode 100644
index 00000000000000..1a93dc6c694326
--- /dev/null
+++ b/test/prism/errors/do_not_allow_multiple_codepoints_in_a_single_character_literal.txt
@@ -0,0 +1,3 @@
+?\u{0001 0002}
+         ^~~ invalid Unicode escape sequence; Multiple codepoints at single character literal are disallowed
+
diff --git a/test/prism/errors/do_not_allow_trailing_commas_in_lambda_parameters.txt b/test/prism/errors/do_not_allow_trailing_commas_in_lambda_parameters.txt
new file mode 100644
index 00000000000000..11f23f034576b4
--- /dev/null
+++ b/test/prism/errors/do_not_allow_trailing_commas_in_lambda_parameters.txt
@@ -0,0 +1,3 @@
+-> (a, b, ) {}
+        ^ unexpected `,` in parameters
+
diff --git a/test/prism/errors/do_not_allow_trailing_commas_in_method_parameters.txt b/test/prism/errors/do_not_allow_trailing_commas_in_method_parameters.txt
new file mode 100644
index 00000000000000..c0fec0c7048a0c
--- /dev/null
+++ b/test/prism/errors/do_not_allow_trailing_commas_in_method_parameters.txt
@@ -0,0 +1,3 @@
+def foo(a,b,c,);end
+             ^ unexpected `,` in parameters
+
diff --git a/test/prism/errors/dont_allow_return_inside_class_body.txt b/test/prism/errors/dont_allow_return_inside_class_body.txt
new file mode 100644
index 00000000000000..286eba210339b5
--- /dev/null
+++ b/test/prism/errors/dont_allow_return_inside_class_body.txt
@@ -0,0 +1,3 @@
+class A; return; end
+         ^~~~~~ Invalid return in class/module body
+
diff --git a/test/prism/errors/dont_allow_return_inside_module_body.txt b/test/prism/errors/dont_allow_return_inside_module_body.txt
new file mode 100644
index 00000000000000..85dd619a932340
--- /dev/null
+++ b/test/prism/errors/dont_allow_return_inside_module_body.txt
@@ -0,0 +1,3 @@
+module A; return; end
+          ^~~~~~ Invalid return in class/module body
+
diff --git a/test/prism/errors/dont_allow_return_inside_sclass_body.txt b/test/prism/errors/dont_allow_return_inside_sclass_body.txt
new file mode 100644
index 00000000000000..c29fe017282053
--- /dev/null
+++ b/test/prism/errors/dont_allow_return_inside_sclass_body.txt
@@ -0,0 +1,3 @@
+class << A; return; end
+            ^~~~~~ Invalid return in class/module body
+
diff --git a/test/prism/errors/dont_allow_setting_to_back_and_nth_reference.txt b/test/prism/errors/dont_allow_setting_to_back_and_nth_reference.txt
new file mode 100644
index 00000000000000..71b5b94589c038
--- /dev/null
+++ b/test/prism/errors/dont_allow_setting_to_back_and_nth_reference.txt
@@ -0,0 +1,7 @@
+begin
+$+ = nil
+^~ Can't set variable $+
+$1466 = nil
+^~~~~ Can't set variable $1466
+end
+
diff --git a/test/prism/errors/double_arguments_forwarding.txt b/test/prism/errors/double_arguments_forwarding.txt
new file mode 100644
index 00000000000000..29c78f8c802aa9
--- /dev/null
+++ b/test/prism/errors/double_arguments_forwarding.txt
@@ -0,0 +1,4 @@
+def foo(..., ...)
+             ^~~ unexpected parameter order
+end
+
diff --git a/test/prism/errors/double_scope_numbered_parameters.txt b/test/prism/errors/double_scope_numbered_parameters.txt
new file mode 100644
index 00000000000000..0bb9df4ede08eb
--- /dev/null
+++ b/test/prism/errors/double_scope_numbered_parameters.txt
@@ -0,0 +1,3 @@
+-> { _1 + -> { _2 } }
+               ^~ numbered parameter is already used in outer block
+
diff --git a/test/prism/errors/double_scope_repeated_numbered_parameters.txt b/test/prism/errors/double_scope_repeated_numbered_parameters.txt
new file mode 100644
index 00000000000000..7b7b85a847a96d
--- /dev/null
+++ b/test/prism/errors/double_scope_repeated_numbered_parameters.txt
@@ -0,0 +1,3 @@
+-> { _1 + -> { _1 } }
+               ^~ numbered parameter is already used in outer block
+
diff --git a/test/prism/errors/double_splat_followed_by_splat_argument.txt b/test/prism/errors/double_splat_followed_by_splat_argument.txt
new file mode 100644
index 00000000000000..b2aec1167e83e4
--- /dev/null
+++ b/test/prism/errors/double_splat_followed_by_splat_argument.txt
@@ -0,0 +1,3 @@
+a(**kwargs, *args)
+            ^~~~~ unexpected `*` splat argument after a `**` keyword splat argument
+
diff --git a/test/prism/errors/double_splat_with_double_commas.txt b/test/prism/errors/double_splat_with_double_commas.txt
new file mode 100644
index 00000000000000..27873b7fac574a
--- /dev/null
+++ b/test/prism/errors/double_splat_with_double_commas.txt
@@ -0,0 +1,3 @@
+[**a,,]
+     ^ unexpected ','; expected a `]` to close the array
+
diff --git a/test/prism/errors/duplicate_pattern_capture.txt b/test/prism/errors/duplicate_pattern_capture.txt
new file mode 100644
index 00000000000000..4b48fd31188d41
--- /dev/null
+++ b/test/prism/errors/duplicate_pattern_capture.txt
@@ -0,0 +1,17 @@
+case (); in [a, a]; end
+                ^ duplicated variable name
+case (); in [a, *a]; end
+                 ^ duplicated variable name
+case (); in {a: a, b: a}; end
+                      ^ duplicated variable name
+case (); in {a: a, **a}; end
+                     ^ duplicated variable name
+case (); in [a, {a:}]; end
+                 ^ duplicated variable name
+case (); in [a, {a: {a: {a: [a]}}}]; end
+                             ^ duplicated variable name
+case (); in a => a; end
+                 ^ duplicated variable name
+case (); in [A => a, {a: b => a}]; end
+                              ^ duplicated variable name
+
diff --git a/test/prism/errors/duplicate_pattern_hash_key.txt b/test/prism/errors/duplicate_pattern_hash_key.txt
new file mode 100644
index 00000000000000..201b51234faffd
--- /dev/null
+++ b/test/prism/errors/duplicate_pattern_hash_key.txt
@@ -0,0 +1,4 @@
+case (); in {a:, a:}; end
+                 ^~ duplicated key name
+                 ^ duplicated variable name
+
diff --git a/test/prism/errors/duplicate_pattern_hash_key_2.txt b/test/prism/errors/duplicate_pattern_hash_key_2.txt
new file mode 100644
index 00000000000000..66756c454a50f2
--- /dev/null
+++ b/test/prism/errors/duplicate_pattern_hash_key_2.txt
@@ -0,0 +1,3 @@
+case (); in {a:1, a:2}; end
+                  ^~ duplicated key name
+
diff --git a/test/prism/errors/duplicated_parameter_names.txt b/test/prism/errors/duplicated_parameter_names.txt
new file mode 100644
index 00000000000000..7b82685ca3633e
--- /dev/null
+++ b/test/prism/errors/duplicated_parameter_names.txt
@@ -0,0 +1,3 @@
+def foo(a,b,a);end
+            ^ duplicated argument name
+
diff --git a/test/prism/errors/duplicated_parameter_names_2.txt b/test/prism/errors/duplicated_parameter_names_2.txt
new file mode 100644
index 00000000000000..8396993d5692d0
--- /dev/null
+++ b/test/prism/errors/duplicated_parameter_names_2.txt
@@ -0,0 +1,3 @@
+def foo(a,b,*a);end
+             ^ duplicated argument name
+
diff --git a/test/prism/errors/duplicated_parameter_names_3.txt b/test/prism/errors/duplicated_parameter_names_3.txt
new file mode 100644
index 00000000000000..437a6623c3e365
--- /dev/null
+++ b/test/prism/errors/duplicated_parameter_names_3.txt
@@ -0,0 +1,3 @@
+def foo(a,b,**a);end
+              ^ duplicated argument name
+
diff --git a/test/prism/errors/duplicated_parameter_names_4.txt b/test/prism/errors/duplicated_parameter_names_4.txt
new file mode 100644
index 00000000000000..a420dd8a695ba3
--- /dev/null
+++ b/test/prism/errors/duplicated_parameter_names_4.txt
@@ -0,0 +1,3 @@
+def foo(a,b,&a);end
+             ^ duplicated argument name
+
diff --git a/test/prism/errors/duplicated_parameter_names_5.txt b/test/prism/errors/duplicated_parameter_names_5.txt
new file mode 100644
index 00000000000000..694d3a668c0179
--- /dev/null
+++ b/test/prism/errors/duplicated_parameter_names_5.txt
@@ -0,0 +1,3 @@
+def foo(a = 1,b,*c);end
+                ^ unexpected parameter `*`
+
diff --git a/test/prism/errors/dynamic_label_pattern.txt b/test/prism/errors/dynamic_label_pattern.txt
new file mode 100644
index 00000000000000..b8d1012e45bc55
--- /dev/null
+++ b/test/prism/errors/dynamic_label_pattern.txt
@@ -0,0 +1,3 @@
+:a => 'a': | 1
+           ^ expected a pattern expression after the key
+
diff --git a/test/prism/errors/ellipsis_in_no_paren_call.txt b/test/prism/errors/ellipsis_in_no_paren_call.txt
new file mode 100644
index 00000000000000..87a847d19273c5
--- /dev/null
+++ b/test/prism/errors/ellipsis_in_no_paren_call.txt
@@ -0,0 +1,3 @@
+def foo(...); foo 1, ...; end
+                     ^~~ unexpected `...` in an non-parenthesized call
+
diff --git a/test/prism/errors/escape_unicode_curly_whitespace.txt b/test/prism/errors/escape_unicode_curly_whitespace.txt
new file mode 100644
index 00000000000000..324d8a2ae51f07
--- /dev/null
+++ b/test/prism/errors/escape_unicode_curly_whitespace.txt
@@ -0,0 +1,5 @@
+"\u{
+    ^ invalid Unicode escape sequence
+    ^ unterminated Unicode escape
+61}"
+
diff --git a/test/prism/errors/for_loop_delimiter.txt b/test/prism/errors/for_loop_delimiter.txt
new file mode 100644
index 00000000000000..07002d9d0645a2
--- /dev/null
+++ b/test/prism/errors/for_loop_delimiter.txt
@@ -0,0 +1,3 @@
+for a in b end
+           ^~~ unexpected 'end'; expected a 'do', newline, or ';' after the 'for' loop collection
+
diff --git a/test/prism/errors/for_loops_index_missing.txt b/test/prism/errors/for_loops_index_missing.txt
new file mode 100644
index 00000000000000..a57c22b0449b5e
--- /dev/null
+++ b/test/prism/errors/for_loops_index_missing.txt
@@ -0,0 +1,5 @@
+for in 1..10
+^~~ expected an index after `for`
+i
+end
+
diff --git a/test/prism/errors/for_loops_only_end.txt b/test/prism/errors/for_loops_only_end.txt
new file mode 100644
index 00000000000000..a8eaf0b8ab32d9
--- /dev/null
+++ b/test/prism/errors/for_loops_only_end.txt
@@ -0,0 +1,6 @@
+for end
+^~~ expected an index after `for`
+   ^ expected an `in` after the index in a `for` statement
+   ^ expected a collection after the `in` in a `for` statement
+    ^~~ unexpected 'end'; expected a 'do', newline, or ';' after the 'for' loop collection
+
diff --git a/test/prism/errors/forwarding_arg_after_keyword_rest.txt b/test/prism/errors/forwarding_arg_after_keyword_rest.txt
new file mode 100644
index 00000000000000..86fe4aad93f8c2
--- /dev/null
+++ b/test/prism/errors/forwarding_arg_after_keyword_rest.txt
@@ -0,0 +1,3 @@
+def f(**,...);end
+         ^~~ unexpected parameter order
+
diff --git a/test/prism/errors/forwarding_arg_and_block.txt b/test/prism/errors/forwarding_arg_and_block.txt
new file mode 100644
index 00000000000000..65c75a5d7cfc85
--- /dev/null
+++ b/test/prism/errors/forwarding_arg_and_block.txt
@@ -0,0 +1,3 @@
+def foo(...) = foo(...) { }
+                        ^~~ both block arg and actual block given; only one block is allowed
+
diff --git a/test/prism/errors/heredoc_unterminated.txt b/test/prism/errors/heredoc_unterminated.txt
new file mode 100644
index 00000000000000..3c6aeaeb81fdb5
--- /dev/null
+++ b/test/prism/errors/heredoc_unterminated.txt
@@ -0,0 +1,9 @@
+a=>{<<b
+      ^ unterminated heredoc; can't find string "b" anywhere before EOF
+    ^~~ unexpected heredoc beginning; expected a key in the hash pattern
+      ^ unterminated heredoc; can't find string "b" anywhere before EOF
+    ^~~ expected a label as the key in the hash pattern
+       ^ expected a `}` to close the pattern expression
+       ^ unexpected heredoc ending, expecting end-of-input
+       ^ unexpected heredoc ending, ignoring it
+
diff --git a/test/prism/errors/incomplete_instance_var_string.txt b/test/prism/errors/incomplete_instance_var_string.txt
new file mode 100644
index 00000000000000..b28947fc0e3c6a
--- /dev/null
+++ b/test/prism/errors/incomplete_instance_var_string.txt
@@ -0,0 +1,4 @@
+%@#@@#
+    ^ '@' without identifiers is not allowed as an instance variable name
+    ^ unexpected instance variable, expecting end-of-input
+
diff --git a/test/prism/errors/index_call_with_block_and_write.txt b/test/prism/errors/index_call_with_block_and_write.txt
new file mode 100644
index 00000000000000..3d92fbfea745c6
--- /dev/null
+++ b/test/prism/errors/index_call_with_block_and_write.txt
@@ -0,0 +1,5 @@
+foo[1] {} &&= 1
+^~~~~~~~~ unexpected write target
+          ^~~ unexpected operator after a call with arguments
+          ^~~ unexpected operator after a call with a block
+
diff --git a/test/prism/errors/index_call_with_block_operator_write.txt b/test/prism/errors/index_call_with_block_operator_write.txt
new file mode 100644
index 00000000000000..96c413cd39f9e2
--- /dev/null
+++ b/test/prism/errors/index_call_with_block_operator_write.txt
@@ -0,0 +1,5 @@
+foo[1] {} += 1
+^~~~~~~~~ unexpected write target
+          ^~ unexpected operator after a call with arguments
+          ^~ unexpected operator after a call with a block
+
diff --git a/test/prism/errors/index_call_with_block_or_write.txt b/test/prism/errors/index_call_with_block_or_write.txt
new file mode 100644
index 00000000000000..2d250fba063bbc
--- /dev/null
+++ b/test/prism/errors/index_call_with_block_or_write.txt
@@ -0,0 +1,5 @@
+foo[1] {} ||= 1
+^~~~~~~~~ unexpected write target
+          ^~~ unexpected operator after a call with arguments
+          ^~~ unexpected operator after a call with a block
+
diff --git a/test/prism/errors/infix_after_label.txt b/test/prism/errors/infix_after_label.txt
new file mode 100644
index 00000000000000..c3bcfaecebd928
--- /dev/null
+++ b/test/prism/errors/infix_after_label.txt
@@ -0,0 +1,6 @@
+{ 'a':.upcase => 1 }
+      ^ unexpected '.'; expected a value in the hash literal
+      ^ expected a `}` to close the hash literal
+                   ^ unexpected '}', expecting end-of-input
+                   ^ unexpected '}', ignoring it
+
diff --git a/test/prism/errors/interpolated_regular_expression_with_unknown_regexp_options.txt b/test/prism/errors/interpolated_regular_expression_with_unknown_regexp_options.txt
new file mode 100644
index 00000000000000..8e78753b1ccc31
--- /dev/null
+++ b/test/prism/errors/interpolated_regular_expression_with_unknown_regexp_options.txt
@@ -0,0 +1,3 @@
+/#{foo}/AZaz
+       ^~~~~ unknown regexp options - AZaz
+
diff --git a/test/prism/errors/invalid_global_variable_write.txt b/test/prism/errors/invalid_global_variable_write.txt
new file mode 100644
index 00000000000000..9d9018bcf14ac5
--- /dev/null
+++ b/test/prism/errors/invalid_global_variable_write.txt
@@ -0,0 +1,4 @@
+$',
+^~ Can't set variable $'
+^~ unexpected write target
+
diff --git a/test/prism/errors/invalid_hex_escape.txt b/test/prism/errors/invalid_hex_escape.txt
new file mode 100644
index 00000000000000..4fb847f6d24232
--- /dev/null
+++ b/test/prism/errors/invalid_hex_escape.txt
@@ -0,0 +1,3 @@
+"\xx"
+ ^~ invalid hex escape sequence
+
diff --git a/test/prism/errors/invalid_multi_target.txt b/test/prism/errors/invalid_multi_target.txt
new file mode 100644
index 00000000000000..9756278b0cf6ae
--- /dev/null
+++ b/test/prism/errors/invalid_multi_target.txt
@@ -0,0 +1,3 @@
+foo,
+^~~ unexpected write target
+
diff --git a/test/prism/errors/invalid_multi_target_10.txt b/test/prism/errors/invalid_multi_target_10.txt
new file mode 100644
index 00000000000000..0e87b67d36d817
--- /dev/null
+++ b/test/prism/errors/invalid_multi_target_10.txt
@@ -0,0 +1,3 @@
+Foo,
+^~~ unexpected write target
+
diff --git a/test/prism/errors/invalid_multi_target_11.txt b/test/prism/errors/invalid_multi_target_11.txt
new file mode 100644
index 00000000000000..8185cde79e9879
--- /dev/null
+++ b/test/prism/errors/invalid_multi_target_11.txt
@@ -0,0 +1,3 @@
+::Foo,
+^~~~~ unexpected write target
+
diff --git a/test/prism/errors/invalid_multi_target_12.txt b/test/prism/errors/invalid_multi_target_12.txt
new file mode 100644
index 00000000000000..f511a8a76f1ffd
--- /dev/null
+++ b/test/prism/errors/invalid_multi_target_12.txt
@@ -0,0 +1,3 @@
+Foo::Foo,
+^~~~~~~~ unexpected write target
+
diff --git a/test/prism/errors/invalid_multi_target_13.txt b/test/prism/errors/invalid_multi_target_13.txt
new file mode 100644
index 00000000000000..7c9a3fb4e1e46d
--- /dev/null
+++ b/test/prism/errors/invalid_multi_target_13.txt
@@ -0,0 +1,3 @@
+Foo::foo,
+^~~~~~~~ unexpected write target
+
diff --git a/test/prism/errors/invalid_multi_target_14.txt b/test/prism/errors/invalid_multi_target_14.txt
new file mode 100644
index 00000000000000..88dc08de922b72
--- /dev/null
+++ b/test/prism/errors/invalid_multi_target_14.txt
@@ -0,0 +1,3 @@
+foo[foo],
+^~~~~~~~ unexpected write target
+
diff --git a/test/prism/errors/invalid_multi_target_15.txt b/test/prism/errors/invalid_multi_target_15.txt
new file mode 100644
index 00000000000000..c140833467c54c
--- /dev/null
+++ b/test/prism/errors/invalid_multi_target_15.txt
@@ -0,0 +1,3 @@
+(foo, bar)
+^~~~~~~~~~ unexpected write target
+
diff --git a/test/prism/errors/invalid_multi_target_16.txt b/test/prism/errors/invalid_multi_target_16.txt
new file mode 100644
index 00000000000000..20ea56331f5458
--- /dev/null
+++ b/test/prism/errors/invalid_multi_target_16.txt
@@ -0,0 +1,3 @@
+foo((foo, bar))
+    ^~~~~~~~~~ unexpected write target
+
diff --git a/test/prism/errors/invalid_multi_target_17.txt b/test/prism/errors/invalid_multi_target_17.txt
new file mode 100644
index 00000000000000..da1ced0c59581e
--- /dev/null
+++ b/test/prism/errors/invalid_multi_target_17.txt
@@ -0,0 +1,3 @@
+foo((*))
+    ^~~ unexpected write target
+
diff --git a/test/prism/errors/invalid_multi_target_18.txt b/test/prism/errors/invalid_multi_target_18.txt
new file mode 100644
index 00000000000000..2beed193b44d78
--- /dev/null
+++ b/test/prism/errors/invalid_multi_target_18.txt
@@ -0,0 +1,3 @@
+foo(((foo, bar), *))
+    ^~~~~~~~~~~~~~~ unexpected write target
+
diff --git a/test/prism/errors/invalid_multi_target_19.txt b/test/prism/errors/invalid_multi_target_19.txt
new file mode 100644
index 00000000000000..b5e3e6999add1c
--- /dev/null
+++ b/test/prism/errors/invalid_multi_target_19.txt
@@ -0,0 +1,3 @@
+(foo, bar) + 1
+^~~~~~~~~~ unexpected write target
+
diff --git a/test/prism/errors/invalid_multi_target_2.txt b/test/prism/errors/invalid_multi_target_2.txt
new file mode 100644
index 00000000000000..68a7bbc305b7a2
--- /dev/null
+++ b/test/prism/errors/invalid_multi_target_2.txt
@@ -0,0 +1,3 @@
+foo = 1; foo,
+         ^~~ unexpected write target
+
diff --git a/test/prism/errors/invalid_multi_target_20.txt b/test/prism/errors/invalid_multi_target_20.txt
new file mode 100644
index 00000000000000..e800bcf20444a9
--- /dev/null
+++ b/test/prism/errors/invalid_multi_target_20.txt
@@ -0,0 +1,3 @@
+(foo, bar) in baz
+^~~~~~~~~~ unexpected write target
+
diff --git a/test/prism/errors/invalid_multi_target_3.txt b/test/prism/errors/invalid_multi_target_3.txt
new file mode 100644
index 00000000000000..51e62076038d40
--- /dev/null
+++ b/test/prism/errors/invalid_multi_target_3.txt
@@ -0,0 +1,3 @@
+foo.bar,
+^~~~~~~ unexpected write target
+
diff --git a/test/prism/errors/invalid_multi_target_4.txt b/test/prism/errors/invalid_multi_target_4.txt
new file mode 100644
index 00000000000000..f4c3599ffea15c
--- /dev/null
+++ b/test/prism/errors/invalid_multi_target_4.txt
@@ -0,0 +1,3 @@
+*foo,
+^~~~ unexpected write target
+
diff --git a/test/prism/errors/invalid_multi_target_5.txt b/test/prism/errors/invalid_multi_target_5.txt
new file mode 100644
index 00000000000000..5d143a3f5dc71d
--- /dev/null
+++ b/test/prism/errors/invalid_multi_target_5.txt
@@ -0,0 +1,3 @@
+@foo,
+^~~~ unexpected write target
+
diff --git a/test/prism/errors/invalid_multi_target_6.txt b/test/prism/errors/invalid_multi_target_6.txt
new file mode 100644
index 00000000000000..6d15893f57d3ed
--- /dev/null
+++ b/test/prism/errors/invalid_multi_target_6.txt
@@ -0,0 +1,3 @@
+@@foo,
+^~~~~ unexpected write target
+
diff --git a/test/prism/errors/invalid_multi_target_7.txt b/test/prism/errors/invalid_multi_target_7.txt
new file mode 100644
index 00000000000000..451f9f0a00e17e
--- /dev/null
+++ b/test/prism/errors/invalid_multi_target_7.txt
@@ -0,0 +1,3 @@
+$foo,
+^~~~ unexpected write target
+
diff --git a/test/prism/errors/invalid_multi_target_8.txt b/test/prism/errors/invalid_multi_target_8.txt
new file mode 100644
index 00000000000000..fdbe272f9a0278
--- /dev/null
+++ b/test/prism/errors/invalid_multi_target_8.txt
@@ -0,0 +1,4 @@
+$1,
+^~ Can't set variable $1
+^~ unexpected write target
+
diff --git a/test/prism/errors/invalid_multi_target_9.txt b/test/prism/errors/invalid_multi_target_9.txt
new file mode 100644
index 00000000000000..038f355c5da459
--- /dev/null
+++ b/test/prism/errors/invalid_multi_target_9.txt
@@ -0,0 +1,4 @@
+$+,
+^~ Can't set variable $+
+^~ unexpected write target
+
diff --git a/test/prism/errors/invalid_number_underscores.txt b/test/prism/errors/invalid_number_underscores.txt
new file mode 100644
index 00000000000000..8fc79ed7a27067
--- /dev/null
+++ b/test/prism/errors/invalid_number_underscores.txt
@@ -0,0 +1,3 @@
+1__1
+  ^ invalid underscore placement in number
+
diff --git a/test/prism/errors/invalid_number_underscores_10.txt b/test/prism/errors/invalid_number_underscores_10.txt
new file mode 100644
index 00000000000000..53b0cc07196b98
--- /dev/null
+++ b/test/prism/errors/invalid_number_underscores_10.txt
@@ -0,0 +1,3 @@
+01_1_
+    ^ trailing '_' in number
+
diff --git a/test/prism/errors/invalid_number_underscores_11.txt b/test/prism/errors/invalid_number_underscores_11.txt
new file mode 100644
index 00000000000000..469110f86fecce
--- /dev/null
+++ b/test/prism/errors/invalid_number_underscores_11.txt
@@ -0,0 +1,3 @@
+0d1_1_
+     ^ trailing '_' in number
+
diff --git a/test/prism/errors/invalid_number_underscores_12.txt b/test/prism/errors/invalid_number_underscores_12.txt
new file mode 100644
index 00000000000000..a9b63a4b6c2b80
--- /dev/null
+++ b/test/prism/errors/invalid_number_underscores_12.txt
@@ -0,0 +1,3 @@
+0x1_1_
+     ^ trailing '_' in number
+
diff --git a/test/prism/errors/invalid_number_underscores_2.txt b/test/prism/errors/invalid_number_underscores_2.txt
new file mode 100644
index 00000000000000..2762e087907c8e
--- /dev/null
+++ b/test/prism/errors/invalid_number_underscores_2.txt
@@ -0,0 +1,3 @@
+0b1__1
+    ^ invalid underscore placement in number
+
diff --git a/test/prism/errors/invalid_number_underscores_3.txt b/test/prism/errors/invalid_number_underscores_3.txt
new file mode 100644
index 00000000000000..23f1e0b10be283
--- /dev/null
+++ b/test/prism/errors/invalid_number_underscores_3.txt
@@ -0,0 +1,3 @@
+0o1__1
+    ^ invalid underscore placement in number
+
diff --git a/test/prism/errors/invalid_number_underscores_4.txt b/test/prism/errors/invalid_number_underscores_4.txt
new file mode 100644
index 00000000000000..ced149752fafab
--- /dev/null
+++ b/test/prism/errors/invalid_number_underscores_4.txt
@@ -0,0 +1,3 @@
+01__1
+   ^ invalid underscore placement in number
+
diff --git a/test/prism/errors/invalid_number_underscores_5.txt b/test/prism/errors/invalid_number_underscores_5.txt
new file mode 100644
index 00000000000000..5e3f2bf6824f6b
--- /dev/null
+++ b/test/prism/errors/invalid_number_underscores_5.txt
@@ -0,0 +1,3 @@
+0d1__1
+    ^ invalid underscore placement in number
+
diff --git a/test/prism/errors/invalid_number_underscores_6.txt b/test/prism/errors/invalid_number_underscores_6.txt
new file mode 100644
index 00000000000000..225b654248fd59
--- /dev/null
+++ b/test/prism/errors/invalid_number_underscores_6.txt
@@ -0,0 +1,3 @@
+0x1__1
+    ^ invalid underscore placement in number
+
diff --git a/test/prism/errors/invalid_number_underscores_7.txt b/test/prism/errors/invalid_number_underscores_7.txt
new file mode 100644
index 00000000000000..d953b4cbc4e8a7
--- /dev/null
+++ b/test/prism/errors/invalid_number_underscores_7.txt
@@ -0,0 +1,3 @@
+1_1_
+   ^ trailing '_' in number
+
diff --git a/test/prism/errors/invalid_number_underscores_8.txt b/test/prism/errors/invalid_number_underscores_8.txt
new file mode 100644
index 00000000000000..cbdcd95d8f487c
--- /dev/null
+++ b/test/prism/errors/invalid_number_underscores_8.txt
@@ -0,0 +1,3 @@
+0b1_1_
+     ^ trailing '_' in number
+
diff --git a/test/prism/errors/invalid_number_underscores_9.txt b/test/prism/errors/invalid_number_underscores_9.txt
new file mode 100644
index 00000000000000..173282ffb2ed4b
--- /dev/null
+++ b/test/prism/errors/invalid_number_underscores_9.txt
@@ -0,0 +1,3 @@
+0o1_1_
+     ^ trailing '_' in number
+
diff --git a/test/prism/errors/invalid_operator_write_dot.txt b/test/prism/errors/invalid_operator_write_dot.txt
new file mode 100644
index 00000000000000..666817e60f0eec
--- /dev/null
+++ b/test/prism/errors/invalid_operator_write_dot.txt
@@ -0,0 +1,3 @@
+foo.+= 1
+     ^ unexpected write target
+
diff --git a/test/prism/errors/invalid_operator_write_fcall.txt b/test/prism/errors/invalid_operator_write_fcall.txt
new file mode 100644
index 00000000000000..2748bf32918a18
--- /dev/null
+++ b/test/prism/errors/invalid_operator_write_fcall.txt
@@ -0,0 +1,3 @@
+foo! += 1
+^~~~ unexpected write target
+
diff --git a/test/prism/errors/invalid_splat.txt b/test/prism/errors/invalid_splat.txt
new file mode 100644
index 00000000000000..cffd0f987913d6
--- /dev/null
+++ b/test/prism/errors/invalid_splat.txt
@@ -0,0 +1,4 @@
+(1
+*a)
+^~ unexpected write target
+
diff --git a/test/prism/errors/it_with_ordinary_parameter.txt b/test/prism/errors/it_with_ordinary_parameter.txt
new file mode 100644
index 00000000000000..ff9c4276cac9ec
--- /dev/null
+++ b/test/prism/errors/it_with_ordinary_parameter.txt
@@ -0,0 +1,3 @@
+proc { || it }
+          ^~ 'it' is not allowed when an ordinary parameter is defined
+
diff --git a/test/prism/errors/keyword_args_in_array_assignment.txt b/test/prism/errors/keyword_args_in_array_assignment.txt
new file mode 100644
index 00000000000000..e379ec0ef46d35
--- /dev/null
+++ b/test/prism/errors/keyword_args_in_array_assignment.txt
@@ -0,0 +1,3 @@
+matrix[5, axis: :y] = 8
+          ^~~~~~~~ unexpected keyword arg given in index assignment; keywords are not allowed in index assignment expressions
+
diff --git a/test/prism/errors/keywords_parameters_before_required_parameters.txt b/test/prism/errors/keywords_parameters_before_required_parameters.txt
new file mode 100644
index 00000000000000..42d036e95018cc
--- /dev/null
+++ b/test/prism/errors/keywords_parameters_before_required_parameters.txt
@@ -0,0 +1,4 @@
+def foo(b:, a)
+            ^ unexpected parameter order
+end
+
diff --git a/test/prism/errors/label_in_parentheses.txt b/test/prism/errors/label_in_parentheses.txt
new file mode 100644
index 00000000000000..4f6e3e9e36ddf2
--- /dev/null
+++ b/test/prism/errors/label_in_parentheses.txt
@@ -0,0 +1,3 @@
+("a":)
+ ^~~~ unexpected label
+
diff --git a/test/prism/errors/loop_conditional_is_closed.txt b/test/prism/errors/loop_conditional_is_closed.txt
new file mode 100644
index 00000000000000..2be13533199771
--- /dev/null
+++ b/test/prism/errors/loop_conditional_is_closed.txt
@@ -0,0 +1,4 @@
+while 0 0; foo; end; until 0 0; foo; end
+       ^ expected a predicate expression for the `while` statement
+                            ^ expected a predicate expression for the `until` statement
+
diff --git a/test/prism/errors/match_plus.txt b/test/prism/errors/match_plus.txt
new file mode 100644
index 00000000000000..5e349a96ad67df
--- /dev/null
+++ b/test/prism/errors/match_plus.txt
@@ -0,0 +1,7 @@
+a in b + c
+       ^ unexpected '+', expecting end-of-input
+       ^ unexpected '+', ignoring it
+a => b + c
+       ^ unexpected '+', expecting end-of-input
+       ^ unexpected '+', ignoring it
+
diff --git a/test/prism/errors/match_predicate_after_and_with_dot_method_call.txt b/test/prism/errors/match_predicate_after_and_with_dot_method_call.txt
new file mode 100644
index 00000000000000..32b77d127c0a66
--- /dev/null
+++ b/test/prism/errors/match_predicate_after_and_with_dot_method_call.txt
@@ -0,0 +1,3 @@
+1 and 2 in 3.inspect
+            ^ unexpected '.', expecting end-of-input
+
diff --git a/test/prism/errors/match_predicate_after_and_with_opreator.txt b/test/prism/errors/match_predicate_after_and_with_opreator.txt
new file mode 100644
index 00000000000000..5a0c5925ea004f
--- /dev/null
+++ b/test/prism/errors/match_predicate_after_and_with_opreator.txt
@@ -0,0 +1,3 @@
+1 and 2 in 3 % 4
+             ^ unexpected '%', expecting end-of-input
+
diff --git a/test/prism/errors/match_predicate_after_or_with_dot_method_call.txt b/test/prism/errors/match_predicate_after_or_with_dot_method_call.txt
new file mode 100644
index 00000000000000..0a940166dcfe9d
--- /dev/null
+++ b/test/prism/errors/match_predicate_after_or_with_dot_method_call.txt
@@ -0,0 +1,3 @@
+'a' or 1 in 1.upcase
+             ^ unexpected '.', expecting end-of-input
+
diff --git a/test/prism/errors/match_predicate_after_or_with_opreator.txt b/test/prism/errors/match_predicate_after_or_with_opreator.txt
new file mode 100644
index 00000000000000..8ea69e4787230f
--- /dev/null
+++ b/test/prism/errors/match_predicate_after_or_with_opreator.txt
@@ -0,0 +1,3 @@
+1 or 2 in 3 + 4
+            ^ unexpected '+', expecting end-of-input
+
diff --git a/test/prism/errors/match_predicate_after_rescue_with_dot_method_call.txt b/test/prism/errors/match_predicate_after_rescue_with_dot_method_call.txt
new file mode 100644
index 00000000000000..fead8aaf234069
--- /dev/null
+++ b/test/prism/errors/match_predicate_after_rescue_with_dot_method_call.txt
@@ -0,0 +1,3 @@
+'a' rescue 2 in 3.upcase
+                 ^ unexpected '.', expecting end-of-input
+
diff --git a/test/prism/errors/match_predicate_after_rescue_with_opreator.txt b/test/prism/errors/match_predicate_after_rescue_with_opreator.txt
new file mode 100644
index 00000000000000..b2363a544d0c75
--- /dev/null
+++ b/test/prism/errors/match_predicate_after_rescue_with_opreator.txt
@@ -0,0 +1,3 @@
+1 rescue 2 in 3 << 4
+                ^~ unexpected <<, expecting end-of-input
+
diff --git a/test/prism/errors/match_required_after_and_with_dot_method_call.txt b/test/prism/errors/match_required_after_and_with_dot_method_call.txt
new file mode 100644
index 00000000000000..0ecf86bae1c40b
--- /dev/null
+++ b/test/prism/errors/match_required_after_and_with_dot_method_call.txt
@@ -0,0 +1,3 @@
+1 and 2 => 3.inspect
+            ^ unexpected '.', expecting end-of-input
+
diff --git a/test/prism/errors/match_required_after_and_with_opreator.txt b/test/prism/errors/match_required_after_and_with_opreator.txt
new file mode 100644
index 00000000000000..eafbc1f12a5834
--- /dev/null
+++ b/test/prism/errors/match_required_after_and_with_opreator.txt
@@ -0,0 +1,3 @@
+1 and 2 => 3 - 4
+             ^ unexpected '-', expecting end-of-input
+
diff --git a/test/prism/errors/match_required_after_or_with_dot_method_call.txt b/test/prism/errors/match_required_after_or_with_dot_method_call.txt
new file mode 100644
index 00000000000000..479413250de5a9
--- /dev/null
+++ b/test/prism/errors/match_required_after_or_with_dot_method_call.txt
@@ -0,0 +1,3 @@
+1 or 2 => 3.inspect
+           ^ unexpected '.', expecting end-of-input
+
diff --git a/test/prism/errors/match_required_after_or_with_opreator.txt b/test/prism/errors/match_required_after_or_with_opreator.txt
new file mode 100644
index 00000000000000..c35f3b66e48bd4
--- /dev/null
+++ b/test/prism/errors/match_required_after_or_with_opreator.txt
@@ -0,0 +1,3 @@
+1 or 2 => 3 ^ 4
+            ^ unexpected '^', expecting end-of-input
+
diff --git a/test/prism/errors/match_required_after_rescue_with_dot_method_call.txt b/test/prism/errors/match_required_after_rescue_with_dot_method_call.txt
new file mode 100644
index 00000000000000..d72d72ce606d48
--- /dev/null
+++ b/test/prism/errors/match_required_after_rescue_with_dot_method_call.txt
@@ -0,0 +1,3 @@
+1 rescue 2 => 3.inspect
+               ^ unexpected '.', expecting end-of-input
+
diff --git a/test/prism/errors/match_required_after_rescue_with_opreator.txt b/test/prism/errors/match_required_after_rescue_with_opreator.txt
new file mode 100644
index 00000000000000..903e2ccc8e6dc4
--- /dev/null
+++ b/test/prism/errors/match_required_after_rescue_with_opreator.txt
@@ -0,0 +1,3 @@
+1 rescue 2 => 3 ** 4
+                ^~ unexpected '**', expecting end-of-input
+
diff --git a/test/prism/errors/method_parameters_after_arguments_forwarding.txt b/test/prism/errors/method_parameters_after_arguments_forwarding.txt
new file mode 100644
index 00000000000000..ec2aefda1def7e
--- /dev/null
+++ b/test/prism/errors/method_parameters_after_arguments_forwarding.txt
@@ -0,0 +1,4 @@
+def foo(..., a)
+             ^ unexpected parameter order
+end
+
diff --git a/test/prism/errors/method_parameters_after_block.txt b/test/prism/errors/method_parameters_after_block.txt
new file mode 100644
index 00000000000000..6e2091d5d1e5aa
--- /dev/null
+++ b/test/prism/errors/method_parameters_after_block.txt
@@ -0,0 +1,4 @@
+def foo(&block, a)
+                ^ unexpected parameter order
+end
+
diff --git a/test/prism/errors/method_with_arguments_after_anonymous_block.txt b/test/prism/errors/method_with_arguments_after_anonymous_block.txt
new file mode 100644
index 00000000000000..0d986b3c0102a9
--- /dev/null
+++ b/test/prism/errors/method_with_arguments_after_anonymous_block.txt
@@ -0,0 +1,4 @@
+def foo(&, a)
+           ^ unexpected parameter order
+end
+
diff --git a/test/prism/errors/missing_terminator_in_parentheses.txt b/test/prism/errors/missing_terminator_in_parentheses.txt
new file mode 100644
index 00000000000000..af4b698f0c9bfa
--- /dev/null
+++ b/test/prism/errors/missing_terminator_in_parentheses.txt
@@ -0,0 +1,3 @@
+(0 0)
+   ^ unexpected integer, expecting end-of-input
+
diff --git a/test/prism/errors/module_definition_in_method_body.txt b/test/prism/errors/module_definition_in_method_body.txt
new file mode 100644
index 00000000000000..59900c96dde039
--- /dev/null
+++ b/test/prism/errors/module_definition_in_method_body.txt
@@ -0,0 +1,3 @@
+def foo;module A;end;end
+        ^~~~~~ unexpected module definition in method body
+
diff --git a/test/prism/errors/module_definition_in_method_body_within_block.txt b/test/prism/errors/module_definition_in_method_body_within_block.txt
new file mode 100644
index 00000000000000..204be3560798c6
--- /dev/null
+++ b/test/prism/errors/module_definition_in_method_body_within_block.txt
@@ -0,0 +1,7 @@
+def foo
+  bar do
+    module Foo;end
+    ^~~~~~ unexpected module definition in method body
+  end
+end
+
diff --git a/test/prism/errors/module_definition_in_method_defs.txt b/test/prism/errors/module_definition_in_method_defs.txt
new file mode 100644
index 00000000000000..c5a6a8a2e8ab61
--- /dev/null
+++ b/test/prism/errors/module_definition_in_method_defs.txt
@@ -0,0 +1,7 @@
+def foo(bar = module A;end);end
+              ^~~~~~ unexpected module definition in method body
+def foo;rescue;module A;end;end
+               ^~~~~~ unexpected module definition in method body
+def foo;ensure;module A;end;end
+               ^~~~~~ unexpected module definition in method body
+
diff --git a/test/prism/errors/module_name_recoverable.txt b/test/prism/errors/module_name_recoverable.txt
new file mode 100644
index 00000000000000..58a28a60c566e4
--- /dev/null
+++ b/test/prism/errors/module_name_recoverable.txt
@@ -0,0 +1,4 @@
+module Parent module end
+              ^~~~~~ unexpected constant path after `module`; class/module name must be CONSTANT
+                     ^~~ unexpected 'end', assuming it is closing the parent module definition
+
diff --git a/test/prism/errors/multi_target_parens.txt b/test/prism/errors/multi_target_parens.txt
new file mode 100644
index 00000000000000..fe1b9a4b180e32
--- /dev/null
+++ b/test/prism/errors/multi_target_parens.txt
@@ -0,0 +1,19 @@
+( + ( * ) )
+    ^~~~~ unexpected write target
+( a ( * ) )
+    ^~~~~ unexpected write target
+( 1 + ( * ) )
+      ^~~~~ unexpected write target
+( .. ( * ) )
+     ^~~~~ unexpected write target
+( a = ( * ) )
+      ^~~~~ unexpected write target
+( * = ( * ) )
+      ^~~~~ unexpected write target
+( a if ( * ) )
+       ^~~~~ unexpected write target
+( 1; ( * ) )
+     ^~~~~ unexpected write target
+( def f() = ( * ) )
+            ^~~~~ unexpected write target
+
diff --git a/test/prism/errors/multi_target_star.txt b/test/prism/errors/multi_target_star.txt
new file mode 100644
index 00000000000000..3d6d7f42867adb
--- /dev/null
+++ b/test/prism/errors/multi_target_star.txt
@@ -0,0 +1,17 @@
+[(*),]
+ ^~~ unexpected write target
+[1,(a,*b,(c,d)),1]
+   ^~~~~~~~~~~~ unexpected write target
+{a:(*),}
+   ^~~ unexpected write target
+[1+(*),]
+   ^~~ unexpected write target
+x=(*),1
+  ^~~ unexpected write target
+p((*),)
+  ^~~ unexpected write target
+p (*),1
+  ^~~ unexpected write target
+x = def f = (*),1
+            ^~~ unexpected write target
+
diff --git a/test/prism/errors/multiple_error_in_parameters_order.txt b/test/prism/errors/multiple_error_in_parameters_order.txt
new file mode 100644
index 00000000000000..5dae0a105ac466
--- /dev/null
+++ b/test/prism/errors/multiple_error_in_parameters_order.txt
@@ -0,0 +1,5 @@
+def foo(**args, a, b:)
+                ^ unexpected parameter order
+                   ^~ unexpected parameter order
+end
+
diff --git a/test/prism/errors/next_1.txt b/test/prism/errors/next_1.txt
new file mode 100644
index 00000000000000..83ce038ebbde36
--- /dev/null
+++ b/test/prism/errors/next_1.txt
@@ -0,0 +1,4 @@
+next 1,;
+       ^ unexpected ';'; expected an argument
+^~~~~~~ Invalid next
+
diff --git a/test/prism/errors/next_1_2_3.txt b/test/prism/errors/next_1_2_3.txt
new file mode 100644
index 00000000000000..7abe577ab34505
--- /dev/null
+++ b/test/prism/errors/next_1_2_3.txt
@@ -0,0 +1,8 @@
+next(1, 2, 3)
+      ^ unexpected ',', expecting end-of-input
+      ^ unexpected ',', ignoring it
+      ^ expected a matching `)`
+            ^ unexpected ')', expecting end-of-input
+            ^ unexpected ')', ignoring it
+^~~~~~~~~~~~ Invalid next
+
diff --git a/test/prism/errors/non_assoc_equality.txt b/test/prism/errors/non_assoc_equality.txt
new file mode 100644
index 00000000000000..9b3f13754913a9
--- /dev/null
+++ b/test/prism/errors/non_assoc_equality.txt
@@ -0,0 +1,25 @@
+1 == 2 == 3
+       ^~ unexpected '=='; '==' is a non-associative operator
+       ^~ unexpected '==', expecting end-of-input
+       ^~ unexpected '==', ignoring it
+1 != 2 != 3
+       ^~ unexpected '!='; '!=' is a non-associative operator
+       ^~ unexpected '!=', expecting end-of-input
+       ^~ unexpected '!=', ignoring it
+1 === 2 === 3
+        ^~~ unexpected '==='; '===' is a non-associative operator
+        ^~~ unexpected '===', expecting end-of-input
+        ^~~ unexpected '===', ignoring it
+1 =~ 2 =~ 3
+       ^~ unexpected '=~'; '=~' is a non-associative operator
+       ^~ unexpected '=~', expecting end-of-input
+       ^~ unexpected '=~', ignoring it
+1 !~ 2 !~ 3
+       ^~ unexpected '!~'; '!~' is a non-associative operator
+       ^~ unexpected '!~', expecting end-of-input
+       ^~ unexpected '!~', ignoring it
+1 <=> 2 <=> 3
+        ^~~ unexpected '<=>'; '<=>' is a non-associative operator
+        ^~~ unexpected '<=>', expecting end-of-input
+        ^~~ unexpected '<=>', ignoring it
+
diff --git a/test/prism/errors/non_assoc_range.txt b/test/prism/errors/non_assoc_range.txt
new file mode 100644
index 00000000000000..12eec105940a71
--- /dev/null
+++ b/test/prism/errors/non_assoc_range.txt
@@ -0,0 +1,5 @@
+1....2
+    ^ unexpected '.'; ... is a non-associative operator
+    ^ unexpected '.', expecting end-of-input
+    ^ unexpected '.', ignoring it
+
diff --git a/test/prism/errors/numbered_and_write.txt b/test/prism/errors/numbered_and_write.txt
new file mode 100644
index 00000000000000..f80b97b2d58d06
--- /dev/null
+++ b/test/prism/errors/numbered_and_write.txt
@@ -0,0 +1,3 @@
+tap { _1 &&= 1 }
+      ^~ _1 is reserved for numbered parameters
+
diff --git a/test/prism/errors/numbered_operator_write.txt b/test/prism/errors/numbered_operator_write.txt
new file mode 100644
index 00000000000000..70cd58c81132ca
--- /dev/null
+++ b/test/prism/errors/numbered_operator_write.txt
@@ -0,0 +1,3 @@
+tap { _1 += 1 }
+      ^~ _1 is reserved for numbered parameters
+
diff --git a/test/prism/errors/numbered_or_write.txt b/test/prism/errors/numbered_or_write.txt
new file mode 100644
index 00000000000000..b27495498d05a5
--- /dev/null
+++ b/test/prism/errors/numbered_or_write.txt
@@ -0,0 +1,3 @@
+tap { _1 ||= 1 }
+      ^~ _1 is reserved for numbered parameters
+
diff --git a/test/prism/errors/numbered_parameters_in_block_arguments.txt b/test/prism/errors/numbered_parameters_in_block_arguments.txt
new file mode 100644
index 00000000000000..d01999c53ea304
--- /dev/null
+++ b/test/prism/errors/numbered_parameters_in_block_arguments.txt
@@ -0,0 +1,3 @@
+foo { |_1| }
+       ^~ _1 is reserved for numbered parameters
+
diff --git a/test/prism/errors/optional_block_parameters_with_unary_operator.txt b/test/prism/errors/optional_block_parameters_with_unary_operator.txt
new file mode 100644
index 00000000000000..fd45f126487b1c
--- /dev/null
+++ b/test/prism/errors/optional_block_parameters_with_unary_operator.txt
@@ -0,0 +1,3 @@
+foo { |a = +b| }
+           ^ unexpected '+'; unary calls are not allowed in this context
+
diff --git a/test/prism/errors/optional_block_parameters_with_unary_operator_2.txt b/test/prism/errors/optional_block_parameters_with_unary_operator_2.txt
new file mode 100644
index 00000000000000..ba98f36f84e6d4
--- /dev/null
+++ b/test/prism/errors/optional_block_parameters_with_unary_operator_2.txt
@@ -0,0 +1,3 @@
+foo { |a = -b| }
+           ^ unexpected '-'; unary calls are not allowed in this context
+
diff --git a/test/prism/errors/optional_block_parameters_with_unary_operator_3.txt b/test/prism/errors/optional_block_parameters_with_unary_operator_3.txt
new file mode 100644
index 00000000000000..97700598918534
--- /dev/null
+++ b/test/prism/errors/optional_block_parameters_with_unary_operator_3.txt
@@ -0,0 +1,3 @@
+foo { |a = !b| }
+           ^ unexpected '!'; unary calls are not allowed in this context
+
diff --git a/test/prism/errors/optional_block_parameters_with_unary_operator_4.txt b/test/prism/errors/optional_block_parameters_with_unary_operator_4.txt
new file mode 100644
index 00000000000000..9bec68d7b3517f
--- /dev/null
+++ b/test/prism/errors/optional_block_parameters_with_unary_operator_4.txt
@@ -0,0 +1,3 @@
+foo { |a = ~b| }
+           ^ unexpected '~'; unary calls are not allowed in this context
+
diff --git a/test/prism/errors/parameter_name_ending_with_bang_or_question_mark.txt b/test/prism/errors/parameter_name_ending_with_bang_or_question_mark.txt
new file mode 100644
index 00000000000000..db4fd6928abca9
--- /dev/null
+++ b/test/prism/errors/parameter_name_ending_with_bang_or_question_mark.txt
@@ -0,0 +1,4 @@
+def foo(x!,y?); end
+        ^~ unexpected name for a parameter
+           ^~ unexpected name for a parameter
+
diff --git a/test/prism/errors/parameters_invalid_comma.txt b/test/prism/errors/parameters_invalid_comma.txt
new file mode 100644
index 00000000000000..2d22f7ca76e6dc
--- /dev/null
+++ b/test/prism/errors/parameters_invalid_comma.txt
@@ -0,0 +1,4 @@
+def f(a
+,b);end
+^ invalid comma
+
diff --git a/test/prism/errors/pre_execution_context.txt b/test/prism/errors/pre_execution_context.txt
new file mode 100644
index 00000000000000..18b11bae97a9b8
--- /dev/null
+++ b/test/prism/errors/pre_execution_context.txt
@@ -0,0 +1,4 @@
+BEGIN { 1 + }
+            ^ unexpected '}'; expected an expression after the operator
+            ^ unexpected '}', assuming it is closing the parent 'BEGIN' block
+
diff --git a/test/prism/errors/pre_execution_missing_brace.txt b/test/prism/errors/pre_execution_missing_brace.txt
new file mode 100644
index 00000000000000..e51cd0732e2b71
--- /dev/null
+++ b/test/prism/errors/pre_execution_missing_brace.txt
@@ -0,0 +1,3 @@
+BEGIN 1 }
+     ^ expected a `{` after `BEGIN`
+
diff --git a/test/prism/errors/range_and_bin_op.txt b/test/prism/errors/range_and_bin_op.txt
new file mode 100644
index 00000000000000..55928c409b8a9d
--- /dev/null
+++ b/test/prism/errors/range_and_bin_op.txt
@@ -0,0 +1,5 @@
+1..2..3
+    ^~ unexpected ..; .. is a non-associative operator
+    ^~ unexpected .., expecting end-of-input
+    ^~ unexpected .., ignoring it
+
diff --git a/test/prism/errors/range_and_bin_op_2.txt b/test/prism/errors/range_and_bin_op_2.txt
new file mode 100644
index 00000000000000..6ca91a26eb97b7
--- /dev/null
+++ b/test/prism/errors/range_and_bin_op_2.txt
@@ -0,0 +1,5 @@
+1..2..
+    ^~ unexpected ..; .. is a non-associative operator
+    ^~ unexpected .., expecting end-of-input
+    ^~ unexpected .., ignoring it
+
diff --git a/test/prism/errors/range_and_bin_op_3.txt b/test/prism/errors/range_and_bin_op_3.txt
new file mode 100644
index 00000000000000..34390d0776a758
--- /dev/null
+++ b/test/prism/errors/range_and_bin_op_3.txt
@@ -0,0 +1,3 @@
+1.. || 2
+     ^ unexpected '|'; expected an expression after the operator
+
diff --git a/test/prism/errors/range_and_bin_op_4.txt b/test/prism/errors/range_and_bin_op_4.txt
new file mode 100644
index 00000000000000..ce6e79e5ff59cc
--- /dev/null
+++ b/test/prism/errors/range_and_bin_op_4.txt
@@ -0,0 +1,5 @@
+1.. & 2
+    ^ unexpected '&'; .. is a non-associative operator
+    ^ unexpected '&', expecting end-of-input
+    ^ unexpected '&', ignoring it
+
diff --git a/test/prism/errors/range_and_bin_op_5.txt b/test/prism/errors/range_and_bin_op_5.txt
new file mode 100644
index 00000000000000..4ed91e1052031c
--- /dev/null
+++ b/test/prism/errors/range_and_bin_op_5.txt
@@ -0,0 +1,6 @@
+1.. * 2
+    ^ unexpected *; .. is a non-associative operator
+    ^ unexpected *, expecting end-of-input
+      ^ unexpected write target
+    ^~~ unexpected write target
+
diff --git a/test/prism/errors/range_and_bin_op_6.txt b/test/prism/errors/range_and_bin_op_6.txt
new file mode 100644
index 00000000000000..5cdd7a4f44d67d
--- /dev/null
+++ b/test/prism/errors/range_and_bin_op_6.txt
@@ -0,0 +1,3 @@
+1.. / 2
+    ^ unterminated regexp meets end of file; expected a closing delimiter
+
diff --git a/test/prism/errors/range_and_bin_op_7.txt b/test/prism/errors/range_and_bin_op_7.txt
new file mode 100644
index 00000000000000..3f91b5e97ffe9f
--- /dev/null
+++ b/test/prism/errors/range_and_bin_op_7.txt
@@ -0,0 +1,3 @@
+1.. % 2
+       ^ unterminated string meets end of file
+
diff --git a/test/prism/errors/range_and_bin_op_8.txt b/test/prism/errors/range_and_bin_op_8.txt
new file mode 100644
index 00000000000000..afbf3719d5502c
--- /dev/null
+++ b/test/prism/errors/range_and_bin_op_8.txt
@@ -0,0 +1,4 @@
+1.. ** 2
+    ^~ unexpected **, expecting end-of-input
+    ^~ unexpected **, ignoring it
+
diff --git a/test/prism/errors/range_doubled.txt b/test/prism/errors/range_doubled.txt
new file mode 100644
index 00000000000000..ef63d1bedea27e
--- /dev/null
+++ b/test/prism/errors/range_doubled.txt
@@ -0,0 +1,3 @@
+p(...1...)
+      ^~~ unexpected range operator; .. and ... are non-associative and cannot be chained
+
diff --git a/test/prism/errors/rational_number_with_exponential_portion.txt b/test/prism/errors/rational_number_with_exponential_portion.txt
new file mode 100644
index 00000000000000..01a03d538f8216
--- /dev/null
+++ b/test/prism/errors/rational_number_with_exponential_portion.txt
@@ -0,0 +1,4 @@
+1e1r; 1e1ri
+   ^ unexpected local variable or method, expecting end-of-input
+         ^~ unexpected local variable or method, expecting end-of-input
+
diff --git a/test/prism/errors/regexp_unicode_too_short.txt b/test/prism/errors/regexp_unicode_too_short.txt
new file mode 100644
index 00000000000000..b6504ec9f9e2e7
--- /dev/null
+++ b/test/prism/errors/regexp_unicode_too_short.txt
@@ -0,0 +1,4 @@
+/\u
+ ^~ too short escape sequence: \u
+^ unterminated regexp meets end of file; expected a closing delimiter
+
diff --git a/test/prism/errors/regular_expression_with_unknown_regexp_options.txt b/test/prism/errors/regular_expression_with_unknown_regexp_options.txt
new file mode 100644
index 00000000000000..c37291ca40f224
--- /dev/null
+++ b/test/prism/errors/regular_expression_with_unknown_regexp_options.txt
@@ -0,0 +1,3 @@
+/foo/AZaz
+    ^~~~~ unknown regexp options - AZaz
+
diff --git a/test/prism/errors/repeated_parameter_name_in_destructured_params.txt b/test/prism/errors/repeated_parameter_name_in_destructured_params.txt
new file mode 100644
index 00000000000000..766c235325bc19
--- /dev/null
+++ b/test/prism/errors/repeated_parameter_name_in_destructured_params.txt
@@ -0,0 +1,3 @@
+def f(a, (b, (a))); end
+              ^ duplicated argument name
+
diff --git a/test/prism/errors/rest_keywords_parameters_before_required_parameters.txt b/test/prism/errors/rest_keywords_parameters_before_required_parameters.txt
new file mode 100644
index 00000000000000..406f326712ee7c
--- /dev/null
+++ b/test/prism/errors/rest_keywords_parameters_before_required_parameters.txt
@@ -0,0 +1,4 @@
+def foo(**rest, b:)
+                ^~ unexpected parameter order
+end
+
diff --git a/test/prism/errors/return_1.txt b/test/prism/errors/return_1.txt
new file mode 100644
index 00000000000000..ca3c3494d23a01
--- /dev/null
+++ b/test/prism/errors/return_1.txt
@@ -0,0 +1,3 @@
+return 1,;
+         ^ unexpected ';'; expected an argument
+
diff --git a/test/prism/errors/return_1_2_3.txt b/test/prism/errors/return_1_2_3.txt
new file mode 100644
index 00000000000000..8f6dbaf194149d
--- /dev/null
+++ b/test/prism/errors/return_1_2_3.txt
@@ -0,0 +1,7 @@
+return(1, 2, 3)
+        ^ unexpected ',', expecting end-of-input
+        ^ unexpected ',', ignoring it
+        ^ expected a matching `)`
+              ^ unexpected ')', expecting end-of-input
+              ^ unexpected ')', ignoring it
+
diff --git a/test/prism/errors/returning_to_optional_parameters_multiple_times.txt b/test/prism/errors/returning_to_optional_parameters_multiple_times.txt
new file mode 100644
index 00000000000000..83ca73185094c0
--- /dev/null
+++ b/test/prism/errors/returning_to_optional_parameters_multiple_times.txt
@@ -0,0 +1,4 @@
+def foo(a, b = 1, c, d = 2, e)
+                       ^ unexpected parameter order
+end
+
diff --git a/test/prism/errors/semicolon_after_inheritance_operator.txt b/test/prism/errors/semicolon_after_inheritance_operator.txt
new file mode 100644
index 00000000000000..6b67e6048ac675
--- /dev/null
+++ b/test/prism/errors/semicolon_after_inheritance_operator.txt
@@ -0,0 +1,3 @@
+class Foo < Bar end
+               ^ unexpected `end`, expecting ';' or '\n'
+
diff --git a/test/prism/errors/setter_method_cannot_be_defined_in_an_endless_method_definition.txt b/test/prism/errors/setter_method_cannot_be_defined_in_an_endless_method_definition.txt
new file mode 100644
index 00000000000000..7927664f3c12ba
--- /dev/null
+++ b/test/prism/errors/setter_method_cannot_be_defined_in_an_endless_method_definition.txt
@@ -0,0 +1,6 @@
+def a=() = 42
+    ^~ invalid method name; a setter method cannot be defined in an endless method definition
+
+def []=() = 42
+    ^~~ invalid method name; a setter method cannot be defined in an endless method definition
+
diff --git a/test/prism/errors/shadow_args_in_block.txt b/test/prism/errors/shadow_args_in_block.txt
new file mode 100644
index 00000000000000..1e7d5f9cd45353
--- /dev/null
+++ b/test/prism/errors/shadow_args_in_block.txt
@@ -0,0 +1,3 @@
+tap{|a;a|}
+       ^ duplicated argument name
+
diff --git a/test/prism/errors/shadow_args_in_lambda.txt b/test/prism/errors/shadow_args_in_lambda.txt
new file mode 100644
index 00000000000000..2399a0ebd5443c
--- /dev/null
+++ b/test/prism/errors/shadow_args_in_lambda.txt
@@ -0,0 +1,5 @@
+->a;b{}
+   ^ expected a `do` keyword or a `{` to open the lambda block
+       ^ unexpected end-of-input, assuming it is closing the parent top level context
+       ^ expected a lambda block beginning with `do` to end with `end`
+
diff --git a/test/prism/errors/singleton_class_delimiter.txt b/test/prism/errors/singleton_class_delimiter.txt
new file mode 100644
index 00000000000000..6a0232cb400665
--- /dev/null
+++ b/test/prism/errors/singleton_class_delimiter.txt
@@ -0,0 +1,3 @@
+class <<self rand end
+             ^~~~ unexpected local variable or method; expected a newline or a ';' after the singleton class
+
diff --git a/test/prism/errors/singleton_method_for_literals.txt b/test/prism/errors/singleton_method_for_literals.txt
new file mode 100644
index 00000000000000..6247b4f025523f
--- /dev/null
+++ b/test/prism/errors/singleton_method_for_literals.txt
@@ -0,0 +1,39 @@
+def (1).g; end
+     ^ cannot define singleton method for literals
+def ((a; 1)).foo; end
+         ^ cannot define singleton method for literals
+def ((return; 1)).bar; end
+              ^ cannot define singleton method for literals
+def (((1))).foo; end
+       ^ cannot define singleton method for literals
+def (__FILE__).foo; end
+     ^~~~~~~~ cannot define singleton method for literals
+def (__ENCODING__).foo; end
+     ^~~~~~~~~~~~ cannot define singleton method for literals
+def (__LINE__).foo; end
+     ^~~~~~~~ cannot define singleton method for literals
+def ("foo").foo; end
+     ^~~~~ cannot define singleton method for literals
+def (3.14).foo; end
+     ^~~~ cannot define singleton method for literals
+def (3.14i).foo; end
+     ^~~~~ cannot define singleton method for literals
+def (:foo).foo; end
+     ^~~~ cannot define singleton method for literals
+def (:'foo').foo; end
+     ^~~~~~ cannot define singleton method for literals
+def (:'f{o}').foo; end
+     ^~~~~~~ cannot define singleton method for literals
+def ('foo').foo; end
+     ^~~~~ cannot define singleton method for literals
+def ("foo").foo; end
+     ^~~~~ cannot define singleton method for literals
+def ("#{fo}o").foo; end
+     ^~~~~~~~ cannot define singleton method for literals
+def (/foo/).foo; end
+     ^~~~~ cannot define singleton method for literals
+def (/f#{oo}/).foo; end
+     ^~~~~~~~ cannot define singleton method for literals
+def ([1]).foo; end
+     ^~~ cannot define singleton method for literals
+
diff --git a/test/prism/errors/splat_argument_after_keyword_argument.txt b/test/prism/errors/splat_argument_after_keyword_argument.txt
new file mode 100644
index 00000000000000..fd2dbd0003e469
--- /dev/null
+++ b/test/prism/errors/splat_argument_after_keyword_argument.txt
@@ -0,0 +1,3 @@
+a(foo: bar, *args)
+            ^~~~~ unexpected `*` splat argument after a `**` keyword splat argument
+
diff --git a/test/prism/errors/statement_at_non_statement.txt b/test/prism/errors/statement_at_non_statement.txt
new file mode 100644
index 00000000000000..40fe7d862e135c
--- /dev/null
+++ b/test/prism/errors/statement_at_non_statement.txt
@@ -0,0 +1,9 @@
+foo(alias x y)
+    ^~~~~ unexpected an `alias` at a non-statement position
+foo(BEGIN { bar })
+    ^~~~~ unexpected a `BEGIN` at a non-statement position
+foo(END { bar })
+    ^~~ unexpected an `END` at a non-statement position
+foo(undef x)
+    ^~~~~ unexpected an `undef` at a non-statement position
+
diff --git a/test/prism/errors/statement_operators.txt b/test/prism/errors/statement_operators.txt
new file mode 100644
index 00000000000000..04b7c57477382f
--- /dev/null
+++ b/test/prism/errors/statement_operators.txt
@@ -0,0 +1,25 @@
+alias x y + 1
+          ^ unexpected '+', expecting end-of-input
+          ^ unexpected '+', ignoring it
+alias x y.z
+         ^ unexpected '.', expecting end-of-input
+         ^ unexpected '.', ignoring it
+BEGIN { bar } + 1
+              ^ unexpected '+', expecting end-of-input
+              ^ unexpected '+', ignoring it
+BEGIN { bar }.z
+             ^ unexpected '.', expecting end-of-input
+             ^ unexpected '.', ignoring it
+END { bar } + 1
+            ^ unexpected '+', expecting end-of-input
+            ^ unexpected '+', ignoring it
+END { bar }.z
+           ^ unexpected '.', expecting end-of-input
+           ^ unexpected '.', ignoring it
+undef x + 1
+        ^ unexpected '+', expecting end-of-input
+        ^ unexpected '+', ignoring it
+undef x.z
+       ^ unexpected '.', expecting end-of-input
+       ^ unexpected '.', ignoring it
+
diff --git a/test/prism/errors/switching_to_named_arguments_twice.txt b/test/prism/errors/switching_to_named_arguments_twice.txt
new file mode 100644
index 00000000000000..5dae0a105ac466
--- /dev/null
+++ b/test/prism/errors/switching_to_named_arguments_twice.txt
@@ -0,0 +1,5 @@
+def foo(**args, a, b:)
+                ^ unexpected parameter order
+                   ^~ unexpected parameter order
+end
+
diff --git a/test/prism/errors/switching_to_optional_arguments_twice.txt b/test/prism/errors/switching_to_optional_arguments_twice.txt
new file mode 100644
index 00000000000000..5dae0a105ac466
--- /dev/null
+++ b/test/prism/errors/switching_to_optional_arguments_twice.txt
@@ -0,0 +1,5 @@
+def foo(**args, a, b:)
+                ^ unexpected parameter order
+                   ^~ unexpected parameter order
+end
+
diff --git a/test/prism/errors/symbol_in_hash.txt b/test/prism/errors/symbol_in_hash.txt
new file mode 100644
index 00000000000000..9e687583e5badc
--- /dev/null
+++ b/test/prism/errors/symbol_in_hash.txt
@@ -0,0 +1,3 @@
+{x:'y':}
+   ^~~~ unexpected label
+
diff --git a/test/prism/errors/symbol_in_keyword_parameter.txt b/test/prism/errors/symbol_in_keyword_parameter.txt
new file mode 100644
index 00000000000000..9df43d8c5a6e3b
--- /dev/null
+++ b/test/prism/errors/symbol_in_keyword_parameter.txt
@@ -0,0 +1,3 @@
+def foo(x:'y':); end
+          ^~~~ unexpected label
+
diff --git a/test/prism/errors/targeting_numbered_parameter.txt b/test/prism/errors/targeting_numbered_parameter.txt
new file mode 100644
index 00000000000000..39c40ad7b96444
--- /dev/null
+++ b/test/prism/errors/targeting_numbered_parameter.txt
@@ -0,0 +1,3 @@
+-> { _1, = 0 }
+     ^~ _1 is reserved for numbered parameters
+
diff --git a/test/prism/errors/top_level_constant_starting_with_downcased_identifier.txt b/test/prism/errors/top_level_constant_starting_with_downcased_identifier.txt
new file mode 100644
index 00000000000000..b7b54dd74e0c67
--- /dev/null
+++ b/test/prism/errors/top_level_constant_starting_with_downcased_identifier.txt
@@ -0,0 +1,4 @@
+::foo::A
+  ^ expected a constant after the `::` operator
+  ^~~ unexpected local variable or method, expecting end-of-input
+
diff --git a/test/prism/errors/top_level_constant_with_downcased_identifier.txt b/test/prism/errors/top_level_constant_with_downcased_identifier.txt
new file mode 100644
index 00000000000000..032bcfaebb7542
--- /dev/null
+++ b/test/prism/errors/top_level_constant_with_downcased_identifier.txt
@@ -0,0 +1,4 @@
+::foo
+  ^ expected a constant after the `::` operator
+  ^~~ unexpected local variable or method, expecting end-of-input
+
diff --git a/test/prism/errors/trailing_comma_after_block.txt b/test/prism/errors/trailing_comma_after_block.txt
new file mode 100644
index 00000000000000..d25db0efbeca3b
--- /dev/null
+++ b/test/prism/errors/trailing_comma_after_block.txt
@@ -0,0 +1,3 @@
+p{|&,|}
+    ^ unexpected `,` in parameters
+
diff --git a/test/prism/errors/trailing_comma_in_calls.txt b/test/prism/errors/trailing_comma_in_calls.txt
new file mode 100644
index 00000000000000..966d911087f408
--- /dev/null
+++ b/test/prism/errors/trailing_comma_in_calls.txt
@@ -0,0 +1,3 @@
+foo 1,
+     ^ unexpected end-of-input; expected an argument
+
diff --git a/test/prism/errors/unexpected_block.txt b/test/prism/errors/unexpected_block.txt
new file mode 100644
index 00000000000000..2c0741cd30665e
--- /dev/null
+++ b/test/prism/errors/unexpected_block.txt
@@ -0,0 +1,3 @@
+def foo = yield(&:+)
+                ^~~ block argument should not be given
+
diff --git a/test/prism/errors/unterminated_W_list.txt b/test/prism/errors/unterminated_W_list.txt
new file mode 100644
index 00000000000000..89cab68abb8377
--- /dev/null
+++ b/test/prism/errors/unterminated_W_list.txt
@@ -0,0 +1,3 @@
+%w[
+^~~ unterminated list; expected a closing delimiter for the `%w`
+
diff --git a/test/prism/errors/unterminated_argument_expression.txt b/test/prism/errors/unterminated_argument_expression.txt
new file mode 100644
index 00000000000000..c250a94becbe83
--- /dev/null
+++ b/test/prism/errors/unterminated_argument_expression.txt
@@ -0,0 +1,5 @@
+a %
+  ^ unterminated quoted string meets end of file
+   ^ unexpected end-of-input; expected an expression after the operator
+   ^ unexpected end-of-input, assuming it is closing the parent top level context
+
diff --git a/test/prism/errors/unterminated_block.txt b/test/prism/errors/unterminated_block.txt
new file mode 100644
index 00000000000000..8cc772db162206
--- /dev/null
+++ b/test/prism/errors/unterminated_block.txt
@@ -0,0 +1,4 @@
+foo {
+     ^ unexpected end-of-input, assuming it is closing the parent top level context
+     ^ expected a block beginning with `{` to end with `}`
+
diff --git a/test/prism/errors/unterminated_embdoc.txt b/test/prism/errors/unterminated_embdoc.txt
new file mode 100644
index 00000000000000..1dd9ea3ac498eb
--- /dev/null
+++ b/test/prism/errors/unterminated_embdoc.txt
@@ -0,0 +1,3 @@
+=begin
+^~~~~~ embedded document meets end of file
+
diff --git a/test/prism/errors/unterminated_embdoc_2.txt b/test/prism/errors/unterminated_embdoc_2.txt
new file mode 100644
index 00000000000000..1dd9ea3ac498eb
--- /dev/null
+++ b/test/prism/errors/unterminated_embdoc_2.txt
@@ -0,0 +1,3 @@
+=begin
+^~~~~~ embedded document meets end of file
+
diff --git a/test/prism/errors/unterminated_empty_string.txt b/test/prism/errors/unterminated_empty_string.txt
new file mode 100644
index 00000000000000..597102f7ee74e2
--- /dev/null
+++ b/test/prism/errors/unterminated_empty_string.txt
@@ -0,0 +1,3 @@
+"
+ ^ unterminated string meets end of file
+
diff --git a/test/prism/errors/unterminated_global_variable.txt b/test/prism/errors/unterminated_global_variable.txt
new file mode 100644
index 00000000000000..ce3e960b2e2b40
--- /dev/null
+++ b/test/prism/errors/unterminated_global_variable.txt
@@ -0,0 +1,3 @@
+$
+^ '$' without identifiers is not allowed as a global variable name
+
diff --git a/test/prism/errors/unterminated_global_variable_2.txt b/test/prism/errors/unterminated_global_variable_2.txt
new file mode 100644
index 00000000000000..302293b538d3ad
--- /dev/null
+++ b/test/prism/errors/unterminated_global_variable_2.txt
@@ -0,0 +1,3 @@
+$ 
+^ '$' without identifiers is not allowed as a global variable name
+
diff --git a/test/prism/errors/unterminated_i_list.txt b/test/prism/errors/unterminated_i_list.txt
new file mode 100644
index 00000000000000..c48be9971d5c8e
--- /dev/null
+++ b/test/prism/errors/unterminated_i_list.txt
@@ -0,0 +1,3 @@
+%i[
+^~~ unterminated list; expected a closing delimiter for the `%i`
+
diff --git a/test/prism/errors/unterminated_interpolated_string.txt b/test/prism/errors/unterminated_interpolated_string.txt
new file mode 100644
index 00000000000000..e74a4c9e2048ca
--- /dev/null
+++ b/test/prism/errors/unterminated_interpolated_string.txt
@@ -0,0 +1,3 @@
+"hello
+      ^ unterminated string meets end of file
+
diff --git a/test/prism/errors/unterminated_interpolated_symbol.txt b/test/prism/errors/unterminated_interpolated_symbol.txt
new file mode 100644
index 00000000000000..faa75972809fc7
--- /dev/null
+++ b/test/prism/errors/unterminated_interpolated_symbol.txt
@@ -0,0 +1,3 @@
+:"#
+   ^ unterminated symbol; expected a closing delimiter for the interpolated symbol
+
diff --git a/test/prism/errors/unterminated_method_parameters.txt b/test/prism/errors/unterminated_method_parameters.txt
new file mode 100644
index 00000000000000..e71371ba162e0c
--- /dev/null
+++ b/test/prism/errors/unterminated_method_parameters.txt
@@ -0,0 +1,3 @@
+foo(
+    ^ unexpected end-of-input; expected a `)` to close the arguments
+
diff --git a/test/prism/errors/unterminated_parenthesized_expression.txt b/test/prism/errors/unterminated_parenthesized_expression.txt
new file mode 100644
index 00000000000000..9025eec453de92
--- /dev/null
+++ b/test/prism/errors/unterminated_parenthesized_expression.txt
@@ -0,0 +1,4 @@
+(1 + 2
+      ^ unexpected end-of-input, assuming it is closing the parent top level context
+      ^ expected a matching `)`
+
diff --git a/test/prism/errors/unterminated_regular_expression.txt b/test/prism/errors/unterminated_regular_expression.txt
new file mode 100644
index 00000000000000..48f3a3081081ae
--- /dev/null
+++ b/test/prism/errors/unterminated_regular_expression.txt
@@ -0,0 +1,3 @@
+/hello
+^ unterminated regexp meets end of file; expected a closing delimiter
+
diff --git a/test/prism/errors/unterminated_regular_expression_with_heredoc.txt b/test/prism/errors/unterminated_regular_expression_with_heredoc.txt
new file mode 100644
index 00000000000000..d4688d6c9e660b
--- /dev/null
+++ b/test/prism/errors/unterminated_regular_expression_with_heredoc.txt
@@ -0,0 +1,4 @@
+<<-END + /b
+         ^ unterminated regexp meets end of file; expected a closing delimiter
+END
+
diff --git a/test/prism/errors/unterminated_s_symbol.txt b/test/prism/errors/unterminated_s_symbol.txt
new file mode 100644
index 00000000000000..0f4be932b3bb12
--- /dev/null
+++ b/test/prism/errors/unterminated_s_symbol.txt
@@ -0,0 +1,3 @@
+%s[abc
+^~~ unterminated quoted string; expected a closing delimiter for the dynamic symbol
+
diff --git a/test/prism/errors/unterminated_string.txt b/test/prism/errors/unterminated_string.txt
new file mode 100644
index 00000000000000..89c0a08b3e8fb4
--- /dev/null
+++ b/test/prism/errors/unterminated_string.txt
@@ -0,0 +1,3 @@
+'hello
+^ unterminated string meets end of file
+
diff --git a/test/prism/errors/unterminated_unicode_brackets_should_be_a_syntax_error.txt b/test/prism/errors/unterminated_unicode_brackets_should_be_a_syntax_error.txt
new file mode 100644
index 00000000000000..f3ac9f29ab94ba
--- /dev/null
+++ b/test/prism/errors/unterminated_unicode_brackets_should_be_a_syntax_error.txt
@@ -0,0 +1,3 @@
+?\u{3
+ ^~~~ invalid Unicode list: \u{3
+
diff --git a/test/prism/errors/unterminated_xstring.txt b/test/prism/errors/unterminated_xstring.txt
new file mode 100644
index 00000000000000..ccd529774c3967
--- /dev/null
+++ b/test/prism/errors/unterminated_xstring.txt
@@ -0,0 +1,3 @@
+`hello
+^ expected a closing delimiter for the `%x` or backtick string
+
diff --git a/test/prism/errors/void_value_expression_in_arguments.txt b/test/prism/errors/void_value_expression_in_arguments.txt
new file mode 100644
index 00000000000000..f57aee14543131
--- /dev/null
+++ b/test/prism/errors/void_value_expression_in_arguments.txt
@@ -0,0 +1,17 @@
+foo(return)
+    ^~~~~~ unexpected void value expression
+foo(1, return)
+       ^~~~~~ unexpected void value expression
+foo(*return)
+     ^~~~~~ unexpected void value expression
+foo(**return)
+      ^~~~~~ unexpected void value expression
+foo(&return)
+     ^~~~~~ unexpected void value expression
+foo(return => 1)
+    ^~~~~~ unexpected void value expression
+foo(:a => return)
+          ^~~~~~ unexpected void value expression
+foo(a: return)
+       ^~~~~~ unexpected void value expression
+
diff --git a/test/prism/errors/void_value_expression_in_array.txt b/test/prism/errors/void_value_expression_in_array.txt
new file mode 100644
index 00000000000000..a0e86fb13569d3
--- /dev/null
+++ b/test/prism/errors/void_value_expression_in_array.txt
@@ -0,0 +1,15 @@
+[return]
+ ^~~~~~ unexpected void value expression
+[1, return]
+    ^~~~~~ unexpected void value expression
+[ return => 1 ]
+  ^~~~~~ unexpected void value expression
+[ 1 => return ]
+       ^~~~~~ unexpected void value expression
+[ a: return ]
+     ^~~~~~ unexpected void value expression
+[ *return ]
+   ^~~~~~ unexpected void value expression
+[ **return ]
+    ^~~~~~ unexpected void value expression
+
diff --git a/test/prism/errors/void_value_expression_in_assignment.txt b/test/prism/errors/void_value_expression_in_assignment.txt
new file mode 100644
index 00000000000000..c651d7f39ee62a
--- /dev/null
+++ b/test/prism/errors/void_value_expression_in_assignment.txt
@@ -0,0 +1,9 @@
+a = return
+    ^~~~~~ unexpected void value expression
+a = 1, return
+       ^~~~~~ unexpected void value expression
+a, b = return, 1
+       ^~~~~~ unexpected void value expression
+a, b = 1, *return
+           ^~~~~~ unexpected void value expression
+
diff --git a/test/prism/errors/void_value_expression_in_begin_statement.txt b/test/prism/errors/void_value_expression_in_begin_statement.txt
new file mode 100644
index 00000000000000..aa8f1ded964c66
--- /dev/null
+++ b/test/prism/errors/void_value_expression_in_begin_statement.txt
@@ -0,0 +1,21 @@
+x = return 1
+    ^~~~~~~~ unexpected void value expression
+x = return, 1
+    ^~~~~~ unexpected void value expression
+x = 1, return
+       ^~~~~~ unexpected void value expression
+x, y = return
+       ^~~~~~ unexpected void value expression
+x = begin return ensure end
+          ^~~~~~ unexpected void value expression
+x = begin ensure return end
+                 ^~~~~~ unexpected void value expression
+x = begin return ensure return end
+          ^~~~~~ unexpected void value expression
+x = begin return; rescue; return end
+          ^~~~~~ unexpected void value expression
+x = begin return; rescue; return; else return end
+          ^~~~~~ unexpected void value expression
+x = begin; return; rescue; retry; end
+           ^~~~~~ unexpected void value expression
+
diff --git a/test/prism/errors/void_value_expression_in_binary_call.txt b/test/prism/errors/void_value_expression_in_binary_call.txt
new file mode 100644
index 00000000000000..096b42be4deae2
--- /dev/null
+++ b/test/prism/errors/void_value_expression_in_binary_call.txt
@@ -0,0 +1,11 @@
+1 + (return)
+     ^~~~~~ unexpected void value expression
+(return) + 1
+ ^~~~~~ unexpected void value expression
+1 and (return)
+(return) and 1
+ ^~~~~~ unexpected void value expression
+1 or (return)
+(return) or 1
+ ^~~~~~ unexpected void value expression
+
diff --git a/test/prism/errors/void_value_expression_in_call.txt b/test/prism/errors/void_value_expression_in_call.txt
new file mode 100644
index 00000000000000..90e6481c4ceba7
--- /dev/null
+++ b/test/prism/errors/void_value_expression_in_call.txt
@@ -0,0 +1,11 @@
+(return).foo
+ ^~~~~~ unexpected void value expression
+(return).(1)
+ ^~~~~~ unexpected void value expression
+(return)[1]
+ ^~~~~~ unexpected void value expression
+(return)[1] = 2
+ ^~~~~~ unexpected void value expression
+(return)::foo
+ ^~~~~~ unexpected void value expression
+
diff --git a/test/prism/errors/void_value_expression_in_constant_path.txt b/test/prism/errors/void_value_expression_in_constant_path.txt
new file mode 100644
index 00000000000000..1dab6902a2785e
--- /dev/null
+++ b/test/prism/errors/void_value_expression_in_constant_path.txt
@@ -0,0 +1,5 @@
+(return)::A
+ ^~~~~~ unexpected void value expression
+class (return)::A; end
+       ^~~~~~ unexpected void value expression
+
diff --git a/test/prism/errors/void_value_expression_in_def.txt b/test/prism/errors/void_value_expression_in_def.txt
new file mode 100644
index 00000000000000..fed52a667762e1
--- /dev/null
+++ b/test/prism/errors/void_value_expression_in_def.txt
@@ -0,0 +1,10 @@
+def (return).x
+     ^~~~~~ unexpected void value expression
+end
+def x(a = return)
+          ^~~~~~ unexpected void value expression
+end
+def x(a: return)
+         ^~~~~~ unexpected void value expression
+end
+
diff --git a/test/prism/errors/void_value_expression_in_expression.txt b/test/prism/errors/void_value_expression_in_expression.txt
new file mode 100644
index 00000000000000..f6165a7ba63fd8
--- /dev/null
+++ b/test/prism/errors/void_value_expression_in_expression.txt
@@ -0,0 +1,19 @@
+(return) ? 1 : 1
+ ^~~~~~ unexpected void value expression
+(return)..1
+ ^~~~~~ unexpected void value expression
+1..(return)
+    ^~~~~~ unexpected void value expression
+(return)...1
+ ^~~~~~ unexpected void value expression
+1...(return)
+     ^~~~~~ unexpected void value expression
+(..(return))
+    ^~~~~~ unexpected void value expression
+(...(return))
+     ^~~~~~ unexpected void value expression
+((return)..)
+  ^~~~~~ unexpected void value expression
+((return)...)
+  ^~~~~~ unexpected void value expression
+
diff --git a/test/prism/errors/void_value_expression_in_hash.txt b/test/prism/errors/void_value_expression_in_hash.txt
new file mode 100644
index 00000000000000..7795511443792e
--- /dev/null
+++ b/test/prism/errors/void_value_expression_in_hash.txt
@@ -0,0 +1,9 @@
+{ return => 1 }
+  ^~~~~~ unexpected void value expression
+{ 1 => return }
+       ^~~~~~ unexpected void value expression
+{ a: return }
+     ^~~~~~ unexpected void value expression
+{ **return }
+    ^~~~~~ unexpected void value expression
+
diff --git a/test/prism/errors/void_value_expression_in_modifier.txt b/test/prism/errors/void_value_expression_in_modifier.txt
new file mode 100644
index 00000000000000..7d7b444e331d9f
--- /dev/null
+++ b/test/prism/errors/void_value_expression_in_modifier.txt
@@ -0,0 +1,13 @@
+1 if (return)
+      ^~~~~~ unexpected void value expression
+1 unless (return)
+          ^~~~~~ unexpected void value expression
+1 while (return)
+         ^~~~~~ unexpected void value expression
+1 until (return)
+         ^~~~~~ unexpected void value expression
+(return) => a
+ ^~~~~~ unexpected void value expression
+(return) in a
+ ^~~~~~ unexpected void value expression
+
diff --git a/test/prism/errors/void_value_expression_in_statement.txt b/test/prism/errors/void_value_expression_in_statement.txt
new file mode 100644
index 00000000000000..87dbfa5cc92da5
--- /dev/null
+++ b/test/prism/errors/void_value_expression_in_statement.txt
@@ -0,0 +1,26 @@
+if (return)
+    ^~~~~~ unexpected void value expression
+end
+unless (return)
+        ^~~~~~ unexpected void value expression
+end
+while (return)
+       ^~~~~~ unexpected void value expression
+end
+until (return)
+       ^~~~~~ unexpected void value expression
+end
+case (return)
+      ^~~~~~ unexpected void value expression
+when 1
+end
+class A < (return)
+           ^~~~~~ unexpected void value expression
+end
+class << (return)
+          ^~~~~~ unexpected void value expression
+end
+for x in (return)
+          ^~~~~~ unexpected void value expression
+end
+
diff --git a/test/prism/errors/void_value_expression_in_unary_call.txt b/test/prism/errors/void_value_expression_in_unary_call.txt
new file mode 100644
index 00000000000000..61e849255c7616
--- /dev/null
+++ b/test/prism/errors/void_value_expression_in_unary_call.txt
@@ -0,0 +1,5 @@
++(return)
+  ^~~~~~ unexpected void value expression
+not return
+    ^~~~~~ unexpected void value expression
+
diff --git a/test/prism/errors/while_endless_method.txt b/test/prism/errors/while_endless_method.txt
new file mode 100644
index 00000000000000..6f062d89d0f850
--- /dev/null
+++ b/test/prism/errors/while_endless_method.txt
@@ -0,0 +1,5 @@
+while def f = g do end
+                      ^ expected a predicate expression for the `while` statement
+                      ^ unexpected end-of-input, assuming it is closing the parent top level context
+                      ^ expected an `end` to close the `while` statement
+
diff --git a/test/prism/errors/writing_numbered_parameter.txt b/test/prism/errors/writing_numbered_parameter.txt
new file mode 100644
index 00000000000000..17dcc6e8f03a27
--- /dev/null
+++ b/test/prism/errors/writing_numbered_parameter.txt
@@ -0,0 +1,3 @@
+-> { _1 = 0 }
+     ^~ _1 is reserved for numbered parameters
+
diff --git a/test/prism/errors/xstring_concat.txt b/test/prism/errors/xstring_concat.txt
new file mode 100644
index 00000000000000..f4d453d68d15f1
--- /dev/null
+++ b/test/prism/errors/xstring_concat.txt
@@ -0,0 +1,5 @@
+<<`EOC` "bar"
+^~~~~~~ expected a string for concatenation
+echo foo
+EOC
+
diff --git a/test/prism/errors_test.rb b/test/prism/errors_test.rb
new file mode 100644
index 00000000000000..62bbd8458b2ca9
--- /dev/null
+++ b/test/prism/errors_test.rb
@@ -0,0 +1,119 @@
+# frozen_string_literal: true
+
+require_relative "test_helper"
+
+module Prism
+  class ErrorsTest < TestCase
+    base = File.expand_path("errors", __dir__)
+    filepaths = Dir["*.txt", base: base]
+
+    if RUBY_VERSION < "3.0"
+      filepaths -= [
+        "cannot_assign_to_a_reserved_numbered_parameter.txt",
+        "writing_numbered_parameter.txt",
+        "targeting_numbered_parameter.txt",
+        "defining_numbered_parameter.txt",
+        "defining_numbered_parameter_2.txt",
+        "numbered_parameters_in_block_arguments.txt",
+        "numbered_and_write.txt",
+        "numbered_or_write.txt",
+        "numbered_operator_write.txt"
+      ]
+    end
+
+    if RUBY_VERSION < "3.4"
+      filepaths -= [
+        "it_with_ordinary_parameter.txt",
+        "block_args_in_array_assignment.txt",
+        "keyword_args_in_array_assignment.txt"
+      ]
+    end
+
+    if RUBY_VERSION < "3.4" || RUBY_RELEASE_DATE < "2024-07-24"
+      filepaths -= ["dont_allow_return_inside_sclass_body.txt"]
+    end
+
+    filepaths.each do |filepath|
+      define_method(:"test_#{File.basename(filepath, ".txt")}") do
+        assert_errors(File.join(base, filepath))
+      end
+    end
+
+    def test_newline_preceding_eof
+      err = Prism.parse("foo(").errors.first
+      assert_equal 1, err.location.start_line
+
+      err = Prism.parse("foo(\n").errors.first
+      assert_equal 1, err.location.start_line
+
+      err = Prism.parse("foo(\n\n\n\n\n").errors.first
+      assert_equal 5, err.location.start_line
+    end
+
+    def test_embdoc_ending
+      source = <<~RUBY
+        =begin\n=end
+        =begin\n=end\0
+        =begin\n=end\C-d
+        =begin\n=end\C-z
+      RUBY
+
+      source.each_line do |line|
+        assert_valid_syntax(source)
+        assert_predicate Prism.parse(source), :success?
+      end
+    end
+
+    def test_unterminated_string_closing
+      statement = Prism.parse_statement("'hello")
+      assert_equal statement.unescaped, "hello"
+      assert_empty statement.closing
+    end
+
+    def test_unterminated_interpolated_string_closing
+      statement = Prism.parse_statement('"hello')
+      assert_equal statement.unescaped, "hello"
+      assert_empty statement.closing
+    end
+
+    def test_unterminated_empty_string_closing
+      statement = Prism.parse_statement('"')
+      assert_empty statement.unescaped
+      assert_empty statement.closing
+    end
+
+    def test_invalid_message_name
+      assert_equal :"", Prism.parse_statement("+.@foo,+=foo").write_name
+    end
+
+    def test_circular_parameters
+      source = <<~RUBY
+        def foo(bar = bar) = 42
+        def foo(bar: bar) = 42
+        proc { |foo = foo| }
+        proc { |foo: foo| }
+      RUBY
+
+      source.each_line do |line|
+        assert_predicate Prism.parse(line, version: "3.3.0"), :failure?
+        assert_predicate Prism.parse(line), :success?
+      end
+    end
+
+    private
+
+    def assert_errors(filepath)
+      expected = File.read(filepath, binmode: true, external_encoding: Encoding::UTF_8)
+
+      source = expected.lines.grep_v(/^\s*\^/).join.gsub(/\n*\z/, "")
+      refute_valid_syntax(source)
+
+      result = Prism.parse(source)
+      errors = result.errors
+      refute_empty errors, "Expected errors in #{filepath}"
+
+      actual = result.errors_format
+      assert_equal expected, actual, "Expected errors to match for #{filepath}"
+    end
+  end
+end
diff --git a/test/yarp/fixtures/alias.txt b/test/prism/fixtures/alias.txt
similarity index 100%
rename from test/yarp/fixtures/alias.txt
rename to test/prism/fixtures/alias.txt
diff --git a/test/prism/fixtures/arithmetic.txt b/test/prism/fixtures/arithmetic.txt
new file mode 100644
index 00000000000000..b1e1267b95c2de
--- /dev/null
+++ b/test/prism/fixtures/arithmetic.txt
@@ -0,0 +1,13 @@
+foo !bar
+
+-foo*bar
+
++foo**bar
+
+foo ~bar
+
+foo << bar << baz
+
+-1**2
+
+-1.zero?
diff --git a/test/prism/fixtures/arrays.txt b/test/prism/fixtures/arrays.txt
new file mode 100644
index 00000000000000..2897189518976b
--- /dev/null
+++ b/test/prism/fixtures/arrays.txt
@@ -0,0 +1,122 @@
+[*a]
+
+foo[bar, baz] = 1, 2, 3
+
+[a: [:b, :c]]
+
+
+
+[:a, :b,
+:c,1,
+
+
+
+:d,
+]
+
+
+[:a, :b,
+:c,1,
+
+
+
+:d
+
+
+]
+
+[foo => bar]
+
+foo[bar][baz] = qux
+
+foo[bar][baz]
+
+[
+]
+
+foo[bar, baz]
+
+foo[bar, baz] = qux
+
+foo[0], bar[0] = 1, 2
+
+foo[bar[baz] = qux]
+
+foo[bar]
+
+foo[bar] = baz
+
+[**{}]
+
+[**kw]
+
+[1, **kw]
+
+[1, **kw, **{}, **kw]
+
+[
+  foo => bar,
+]
+
+
+%i#one two three#
+
+%w#one two three#
+
+%x#one two three#
+
+
+%i@one two three@
+
+%w@one two three@
+
+%x@one two three@
+
+
+%i{one two three}
+
+%w{one two three}
+
+%x{one two three}
+
+%w[\C:]
+
+foo[] += 1
+
+foo[] ||= 1
+
+foo[] &&= 1
+
+foo.foo[] += 1
+
+foo.foo[] ||= 1
+
+foo.foo[] &&= 1
+
+foo[bar] += 1
+
+foo[bar] ||= 1
+
+foo[bar] &&= 1
+
+foo.foo[bar] += 1
+
+foo.foo[bar] ||= 1
+
+foo.foo[bar] &&= 1
+
+def f(*); a[*]; end
+
+def f(*); a[1, *]; end
+
+def f(*); a[*] = 1; end
+
+def f(*); a[1, *] = 1; end
+
+def f(*); a[*] += 1; end
+
+def f(*); a[1, *] &&= 1; end
+
+def f(*); rescue => a[*]; end
+
+def f(*); rescue => a[1, *]; end
diff --git a/test/yarp/fixtures/begin_ensure.txt b/test/prism/fixtures/begin_ensure.txt
similarity index 100%
rename from test/yarp/fixtures/begin_ensure.txt
rename to test/prism/fixtures/begin_ensure.txt
diff --git a/test/prism/fixtures/begin_rescue.txt b/test/prism/fixtures/begin_rescue.txt
new file mode 100644
index 00000000000000..790574f4ffe195
--- /dev/null
+++ b/test/prism/fixtures/begin_rescue.txt
@@ -0,0 +1,85 @@
+begin; a; rescue; b; else; c; end
+
+begin; a; rescue; b; else; c; ensure; d; end
+
+begin; rescue ; end
+
+begin; rescue ; ensure ; end
+
+begin; rescue ; else ; end
+
+begin
+a
+end
+
+begin; a; end
+
+begin a
+ end
+
+begin a; end
+
+begin
+a
+rescue
+b
+rescue
+c
+rescue
+d
+end
+
+begin
+  a
+rescue Exception => ex
+  b
+rescue AnotherException, OneMoreException => ex
+  c
+end
+
+begin
+  a
+rescue Exception => ex
+  b
+ensure
+  b
+end
+
+%!abc!
+
+begin
+a
+rescue
+b
+end
+
+begin;a;rescue;b;end
+
+begin
+a;rescue
+b;end
+
+begin
+a
+rescue Exception
+b
+end
+
+begin
+a
+rescue Exception, CustomException
+b
+end
+
+begin
+  a
+rescue Exception, CustomException => ex
+  b
+end
+
+begin
+  a
+rescue Exception => ex
+  b
+end
+
diff --git a/test/yarp/fixtures/blocks.txt b/test/prism/fixtures/blocks.txt
similarity index 100%
rename from test/yarp/fixtures/blocks.txt
rename to test/prism/fixtures/blocks.txt
diff --git a/test/yarp/fixtures/boolean_operators.txt b/test/prism/fixtures/boolean_operators.txt
similarity index 100%
rename from test/yarp/fixtures/boolean_operators.txt
rename to test/prism/fixtures/boolean_operators.txt
diff --git a/test/yarp/fixtures/booleans.txt b/test/prism/fixtures/booleans.txt
similarity index 100%
rename from test/yarp/fixtures/booleans.txt
rename to test/prism/fixtures/booleans.txt
diff --git a/test/prism/fixtures/break.txt b/test/prism/fixtures/break.txt
new file mode 100644
index 00000000000000..5532322c5cecc8
--- /dev/null
+++ b/test/prism/fixtures/break.txt
@@ -0,0 +1,29 @@
+tap { break }
+
+tap { break (1), (2), (3) }
+
+tap { break 1 }
+
+tap { break 1, 2,
+3 }
+
+tap { break 1, 2, 3 }
+
+tap { break [1, 2, 3] }
+
+tap { break(
+  1
+  2
+) }
+
+tap { break() }
+
+tap { break(1) }
+
+foo { break 42 } == 42
+
+foo { |a| break } == 42
+
+while _ && break; end
+
+until _ && break; end
diff --git a/test/prism/fixtures/case.txt b/test/prism/fixtures/case.txt
new file mode 100644
index 00000000000000..733e1e54d2423e
--- /dev/null
+++ b/test/prism/fixtures/case.txt
@@ -0,0 +1,55 @@
+case :hi
+when :hi
+end
+
+case true; when true; puts :hi; when false; puts :bye; end
+
+case; when *foo; end
+
+case :hi
+when :hi
+else
+:b
+end
+
+case this; when FooBar, BazBonk; end
+
+case
+when foo == bar
+end
+
+case
+when a
+else
+  # empty
+end
+
+case type;
+  ;when :b;
+  ;  else;
+   end
+
+case ;;;;;;;; when 1; end
+
+case 1 in 2
+when 3
+end
+
+case 1 in 2; when 3; end
+
+case 1 in 2
+in 3
+end
+
+case 1 in 2; in 3; end
+
+case a
+in b if c and d
+  e
+end
+
+1.then do
+  case 1
+  in ^_1
+  end
+end
diff --git a/test/yarp/fixtures/classes.txt b/test/prism/fixtures/classes.txt
similarity index 100%
rename from test/yarp/fixtures/classes.txt
rename to test/prism/fixtures/classes.txt
diff --git a/test/prism/fixtures/command_method_call.txt b/test/prism/fixtures/command_method_call.txt
new file mode 100644
index 00000000000000..182b87948b52d5
--- /dev/null
+++ b/test/prism/fixtures/command_method_call.txt
@@ -0,0 +1,41 @@
+foo 1
+
+foo bar 1
+
+foo 1 if bar 2
+
+foo 1 unless bar 2
+
+foo 1 while bar 2
+
+foo 1 until bar 2
+
+foo 1 rescue bar 2
+
+foo[bar 1]
+
+foo 1 and bar 2
+
+foo 1 or bar 2
+
+not foo 1
+
+foo = bar = baz 1
+
+def foo = bar 1
+
+1.foo 2
+
+1.foo.bar 2
+
+1.foo[2].bar 3
+
+1.foo(2).bar 3
+
+1.foo(&2).bar 3
+
+!foo 1 and !bar 2
+
+!foo 1 or !bar 2
+
+not !foo 1
diff --git a/test/prism/fixtures/comment_single.txt b/test/prism/fixtures/comment_single.txt
new file mode 100644
index 00000000000000..72037a6ea1a8ec
--- /dev/null
+++ b/test/prism/fixtures/comment_single.txt
@@ -0,0 +1 @@
+foo # Bar
\ No newline at end of file
diff --git a/test/yarp/fixtures/comments.txt b/test/prism/fixtures/comments.txt
similarity index 100%
rename from test/yarp/fixtures/comments.txt
rename to test/prism/fixtures/comments.txt
diff --git a/test/yarp/fixtures/constants.txt b/test/prism/fixtures/constants.txt
similarity index 100%
rename from test/yarp/fixtures/constants.txt
rename to test/prism/fixtures/constants.txt
diff --git a/test/yarp/fixtures/dash_heredocs.txt b/test/prism/fixtures/dash_heredocs.txt
similarity index 100%
rename from test/yarp/fixtures/dash_heredocs.txt
rename to test/prism/fixtures/dash_heredocs.txt
diff --git a/test/prism/fixtures/defined.txt b/test/prism/fixtures/defined.txt
new file mode 100644
index 00000000000000..09fc0a29e74539
--- /dev/null
+++ b/test/prism/fixtures/defined.txt
@@ -0,0 +1,19 @@
+defined? 1 and defined? 2
+
+defined?(x %= 2)
+
+defined?(foo and bar)
+
+defined? 1
+
+defined?("foo"
+)
+
+defined?
+1
+
+defined?
+(1)
+
+defined?
+()
diff --git a/test/yarp/fixtures/dos_endings.txt b/test/prism/fixtures/dos_endings.txt
similarity index 100%
rename from test/yarp/fixtures/dos_endings.txt
rename to test/prism/fixtures/dos_endings.txt
diff --git a/test/prism/fixtures/dstring.txt b/test/prism/fixtures/dstring.txt
new file mode 100644
index 00000000000000..ef698d8fe9a978
--- /dev/null
+++ b/test/prism/fixtures/dstring.txt
@@ -0,0 +1,42 @@
+"foo
+  bar"
+
+"foo
+  #{bar}"
+
+"fo
+o" "ba
+r"
+
+"
+foo\
+"
+
+"
+foo\\
+"
+
+"
+foo\\\
+"
+
+"
+foo\\\\
+"
+
+"
+foo\\\\\
+"
+
+"
+foo\
+b\nar
+#{}
+"
+
+"foo
+\n#{}bar\n\n#{}
+a\nb\n#{}\nc\n"
+
+"
+’"
diff --git a/test/prism/fixtures/dsym_str.txt b/test/prism/fixtures/dsym_str.txt
new file mode 100644
index 00000000000000..0af0a8ddaf78a1
--- /dev/null
+++ b/test/prism/fixtures/dsym_str.txt
@@ -0,0 +1,5 @@
+:"foo
+  bar"
+
+:"
+’"
diff --git a/test/yarp/fixtures/embdoc_no_newline_at_end.txt b/test/prism/fixtures/embdoc_no_newline_at_end.txt
similarity index 100%
rename from test/yarp/fixtures/embdoc_no_newline_at_end.txt
rename to test/prism/fixtures/embdoc_no_newline_at_end.txt
diff --git a/test/prism/fixtures/emoji_method_calls.txt b/test/prism/fixtures/emoji_method_calls.txt
new file mode 100644
index 00000000000000..96d0daba33079e
--- /dev/null
+++ b/test/prism/fixtures/emoji_method_calls.txt
@@ -0,0 +1 @@
+foo.🌊 = 1
diff --git a/test/prism/fixtures/encoding_binary.txt b/test/prism/fixtures/encoding_binary.txt
new file mode 100644
index 00000000000000..f3dfc85abd3c8f
--- /dev/null
+++ b/test/prism/fixtures/encoding_binary.txt
@@ -0,0 +1,9 @@
+# encoding: binary
+
+"\xcd"
+
+:"\xcd"
+
+/#{"\xcd"}/
+
+%W[\xC0]
diff --git a/test/prism/fixtures/encoding_euc_jp.txt b/test/prism/fixtures/encoding_euc_jp.txt
new file mode 100644
index 00000000000000..bbee76eae51419
--- /dev/null
+++ b/test/prism/fixtures/encoding_euc_jp.txt
@@ -0,0 +1,6 @@
+# encoding: euc-jp
+
+# \x8E indicates a double-byte character, \x01 is not a valid second byte in euc-jp
+"\x8E\x01"
+
+%W["\x8E\x01"]
diff --git a/test/yarp/fixtures/endless_methods.txt b/test/prism/fixtures/endless_methods.txt
similarity index 100%
rename from test/yarp/fixtures/endless_methods.txt
rename to test/prism/fixtures/endless_methods.txt
diff --git a/test/yarp/fixtures/endless_range_in_conditional.txt b/test/prism/fixtures/endless_range_in_conditional.txt
similarity index 100%
rename from test/yarp/fixtures/endless_range_in_conditional.txt
rename to test/prism/fixtures/endless_range_in_conditional.txt
diff --git a/test/yarp/fixtures/for.txt b/test/prism/fixtures/for.txt
similarity index 100%
rename from test/yarp/fixtures/for.txt
rename to test/prism/fixtures/for.txt
diff --git a/test/yarp/fixtures/global_variables.txt b/test/prism/fixtures/global_variables.txt
similarity index 100%
rename from test/yarp/fixtures/global_variables.txt
rename to test/prism/fixtures/global_variables.txt
diff --git a/test/prism/fixtures/hashes.txt b/test/prism/fixtures/hashes.txt
new file mode 100644
index 00000000000000..0afb8db496d1f2
--- /dev/null
+++ b/test/prism/fixtures/hashes.txt
@@ -0,0 +1,28 @@
+{}
+
+{
+}
+
+{ a => b, c => d }
+
+{ a => b, **c }
+
+{
+      a: b,
+      c: d
+
+
+
+    }
+
+{ a: b, c: d, **e, f: g }
+
+{ "a": !b? }
+
+a = 1
+tap do
+  b = 1
+  { a:, b:, c:, D: }
+end
+
+{ a: -1 }
diff --git a/test/prism/fixtures/heredoc.txt b/test/prism/fixtures/heredoc.txt
new file mode 100644
index 00000000000000..f94fd912df8544
--- /dev/null
+++ b/test/prism/fixtures/heredoc.txt
@@ -0,0 +1,2 @@
+<<TEXT
+TEXT
diff --git a/test/prism/fixtures/heredoc_with_carriage_returns.txt b/test/prism/fixtures/heredoc_with_carriage_returns.txt
new file mode 100644
index 00000000000000..32a2d87b245419
--- /dev/null
+++ b/test/prism/fixtures/heredoc_with_carriage_returns.txt
@@ -0,0 +1,2 @@
+<<TEXT
+TEXT
diff --git a/test/prism/fixtures/heredoc_with_comment.txt b/test/prism/fixtures/heredoc_with_comment.txt
new file mode 100644
index 00000000000000..8e7b7275bdf703
--- /dev/null
+++ b/test/prism/fixtures/heredoc_with_comment.txt
@@ -0,0 +1,3 @@
+<<-TARGET.chomp # the heredoc end token doesn't always precede the comment
+  content makes for an obvious error
+TARGET
\ No newline at end of file
diff --git a/test/yarp/fixtures/heredoc_with_escaped_newline_at_start.txt b/test/prism/fixtures/heredoc_with_escaped_newline_at_start.txt
similarity index 100%
rename from test/yarp/fixtures/heredoc_with_escaped_newline_at_start.txt
rename to test/prism/fixtures/heredoc_with_escaped_newline_at_start.txt
diff --git a/test/yarp/fixtures/heredoc_with_trailing_newline.txt b/test/prism/fixtures/heredoc_with_trailing_newline.txt
similarity index 100%
rename from test/yarp/fixtures/heredoc_with_trailing_newline.txt
rename to test/prism/fixtures/heredoc_with_trailing_newline.txt
diff --git a/test/prism/fixtures/heredocs_leading_whitespace.txt b/test/prism/fixtures/heredocs_leading_whitespace.txt
new file mode 100644
index 00000000000000..660ecb45431a1a
--- /dev/null
+++ b/test/prism/fixtures/heredocs_leading_whitespace.txt
@@ -0,0 +1,29 @@
+<<-'  FOO'
+a
+b
+     FOO
+
+<<-"  FOO"
+a
+b
+     FOO
+
+<<-`  FOO`
+a
+b
+     FOO
+
+<<-'  FOO'
+a
+b
+  FOO
+
+<<~'  FOO'
+a
+b
+     FOO
+
+<<~'  FOO'
+a
+b
+  FOO
diff --git a/test/prism/fixtures/heredocs_nested.txt b/test/prism/fixtures/heredocs_nested.txt
new file mode 100644
index 00000000000000..080237827897ae
--- /dev/null
+++ b/test/prism/fixtures/heredocs_nested.txt
@@ -0,0 +1,22 @@
+<<~RUBY
+pre
+#{
+<<RUBY
+  hello
+RUBY
+}
+post
+RUBY
+
+# depth greater than PM_LEX_STACK_SIZE
+<<-A
+#{
+<<-B
+#{
+<<-C
+#{3}
+C
+}
+B
+}
+A
diff --git a/test/prism/fixtures/heredocs_with_fake_newlines.txt b/test/prism/fixtures/heredocs_with_fake_newlines.txt
new file mode 100644
index 00000000000000..887b7ab5e76142
--- /dev/null
+++ b/test/prism/fixtures/heredocs_with_fake_newlines.txt
@@ -0,0 +1,55 @@
+<<-RUBY
+  \n
+  \n
+  exit
+  \\n
+  \n\n\n\n
+  argh
+  \\
+  \\\
+  foo\nbar
+  \f
+  ok
+RUBY
+
+<<~RUBY
+  \n
+  \n
+  exit
+  \\n
+  \n\n\n\n
+  argh
+  \\
+  \\\
+  foo\nbar
+  \f
+  ok
+RUBY
+
+<<~RUBY
+  #{123}\n
+  \n
+  exit
+  \\#{123}n
+  \n#{123}\n\n\n
+  argh
+  \\#{123}baz
+  \\\
+  foo\nbar
+  \f
+  ok
+RUBY
+
+<<'RUBY'
+  \n
+  \n
+  exit
+  \n
+  \n\n\n\n
+  argh
+  \
+  \
+  foo\nbar
+  \f
+  ok
+RUBY
diff --git a/test/yarp/fixtures/heredocs_with_ignored_newlines.txt b/test/prism/fixtures/heredocs_with_ignored_newlines.txt
similarity index 100%
rename from test/yarp/fixtures/heredocs_with_ignored_newlines.txt
rename to test/prism/fixtures/heredocs_with_ignored_newlines.txt
diff --git a/test/yarp/fixtures/heredocs_with_ignored_newlines_and_non_empty.txt b/test/prism/fixtures/heredocs_with_ignored_newlines_and_non_empty.txt
similarity index 100%
rename from test/yarp/fixtures/heredocs_with_ignored_newlines_and_non_empty.txt
rename to test/prism/fixtures/heredocs_with_ignored_newlines_and_non_empty.txt
diff --git a/test/prism/fixtures/if.txt b/test/prism/fixtures/if.txt
new file mode 100644
index 00000000000000..4139bae5edbbd2
--- /dev/null
+++ b/test/prism/fixtures/if.txt
@@ -0,0 +1,42 @@
+if true; 1; end
+
+if true
+1 else 2 end
+
+if true then true elsif false then false elsif nil then nil else self end
+
+1 if true
+
+tap { break if true }
+
+tap { next if true }
+
+return if true
+
+tap { if exit_loop then break 42 end }
+
+if foo
+then bar
+end
+
+a if b if c
+
+if true
+  a b:
+else
+end
+
+if type in 1
+elsif type in B
+end
+
+if f1
+  lambda do |_|
+  end
+elsif f2
+  lambda do |_|
+  end
+else
+  lambda do |_|
+  end
+end
diff --git a/test/yarp/fixtures/indented_file_end.txt b/test/prism/fixtures/indented_file_end.txt
similarity index 100%
rename from test/yarp/fixtures/indented_file_end.txt
rename to test/prism/fixtures/indented_file_end.txt
diff --git a/test/yarp/fixtures/integer_operations.txt b/test/prism/fixtures/integer_operations.txt
similarity index 100%
rename from test/yarp/fixtures/integer_operations.txt
rename to test/prism/fixtures/integer_operations.txt
diff --git a/test/prism/fixtures/it.txt b/test/prism/fixtures/it.txt
new file mode 100644
index 00000000000000..76deb68028d9db
--- /dev/null
+++ b/test/prism/fixtures/it.txt
@@ -0,0 +1,3 @@
+x do
+  it
+end
diff --git a/test/prism/fixtures/it_indirect_writes.txt b/test/prism/fixtures/it_indirect_writes.txt
new file mode 100644
index 00000000000000..bb87e9483e2a75
--- /dev/null
+++ b/test/prism/fixtures/it_indirect_writes.txt
@@ -0,0 +1,23 @@
+tap { it += 1 }
+
+tap { it ||= 1 }
+
+tap { it &&= 1 }
+
+tap { it; it += 1 }
+
+tap { it; it ||= 1 }
+
+tap { it; it &&= 1 }
+
+tap { it += 1; it }
+
+tap { it ||= 1; it }
+
+tap { it &&= 1; it }
+
+tap { it; it += 1; it }
+
+tap { it; it ||= 1; it }
+
+tap { it; it &&= 1; it }
diff --git a/test/prism/fixtures/keyword_method_names.txt b/test/prism/fixtures/keyword_method_names.txt
new file mode 100644
index 00000000000000..d3b6eac537963a
--- /dev/null
+++ b/test/prism/fixtures/keyword_method_names.txt
@@ -0,0 +1,20 @@
+def def
+end
+
+def self.ensure
+end
+
+private def foo
+  bar do
+  end
+end
+
+def m(a, **nil)
+end
+
+%{abc}
+
+%"abc"
+
+def nil::a
+end
diff --git a/test/prism/fixtures/keywords.txt b/test/prism/fixtures/keywords.txt
new file mode 100644
index 00000000000000..6d24a9f47656c9
--- /dev/null
+++ b/test/prism/fixtures/keywords.txt
@@ -0,0 +1,11 @@
+tap { redo }
+
+begin; rescue; retry; end
+
+self
+
+__ENCODING__
+
+__FILE__
+
+__LINE__
diff --git a/test/prism/fixtures/lambda.txt b/test/prism/fixtures/lambda.txt
new file mode 100644
index 00000000000000..8d67b4dd79f43c
--- /dev/null
+++ b/test/prism/fixtures/lambda.txt
@@ -0,0 +1,27 @@
+->(
+  foo
+) {}
+
+->(x: "b#{a}") { }
+
+->(a: b * 3) {}
+
+-> foo = bar do end
+
+-> foo: bar do end
+
+def foo(*, **)
+  ->() { bar(*, **) }
+end
+
+p{|a:
+b|}
+
+->(a:
+b){}
+
+->a:
+b{}
+
+->a:
+{}
diff --git a/test/prism/fixtures/method_calls.txt b/test/prism/fixtures/method_calls.txt
new file mode 100644
index 00000000000000..987fb3f90ff5a2
--- /dev/null
+++ b/test/prism/fixtures/method_calls.txt
@@ -0,0 +1,156 @@
+foo.bar %{baz}
+
+a.b(c, d)
+
+a.b()
+
+foo
+  .bar
+  &.baz
+
+a!
+
+a.()
+
+a.(1, 2, 3)
+
+a::b
+
+a::b c
+
+foo.bar = 1
+
+a?
+
+a(&block)
+
+a(**kwargs)
+
+a.b.c
+
+a(b, c)
+
+a()
+
+a(*args)
+
+a b, c
+
+a.b c, d
+
+foo.foo, bar.bar = 1, 2
+
+a&.b
+
+a&.()
+
+a&.b(c)
+
+a&.b()
+
+foo :a, :b if bar? or baz and qux
+
+foo(:a,
+
+	 :b
+)
+
+foo(*rest)
+
+foo(:a, :h => [:x, :y], :a => :b, &:bar)
+
+hi 123, { :there => :friend, **{}, whatup: :dog }
+
+foo :a, b: true do |a, b| puts a end
+
+hi there: :friend
+
+hi :there => :friend, **{}, whatup: :dog
+
+hi(:there => :friend, **{}, whatup: :dog)
+
+foo({ a: true, b: false, }, &:block)
+
+hi :there => :friend
+
+foo(:a,
+:b,
+)
+
+foo(
+:a,
+b: :c,
+)
+
+foo &:block
+
+foo a: true, b: false, &:block
+
+some_func 1, kwarg: 2
+
+Kernel.Integer(10)
+
+x.each { }
+
+foo.map { $& }
+
+A::B::C :foo
+
+A::B::C(:foo)
+
+A::B::C(:foo) { }
+
+foo("a": -1)
+
+foo bar: { baz: qux do end }
+
+foo bar: { **kw do end }
+
+foo "#{bar.map do "baz" end}" do end
+
+foo class Bar baz do end end
+
+foo module Bar baz do end end
+
+foo [baz do end]
+
+p begin 1.times do 1 end end
+
+foo :a,
+  if x
+    bar do |a|
+      a
+    end
+  end
+
+foo :a,
+  while x
+    bar do |a|
+      a
+    end
+  end,
+  until x
+    baz do
+    end
+  end
+
+{} + A {}
+
+{} + A { |a| a }
+
+A {} + A {}
+
+lst << A {}
+
+"#{ join (" ") }"
+
+"#{(v)}"
+
+def f(*); p *; end
+
+foo 1, Bar { 1 }
+
+foo = 1
+foo {}
+
+@a.b "c#{name}": 42
diff --git a/test/prism/fixtures/methods.txt b/test/prism/fixtures/methods.txt
new file mode 100644
index 00000000000000..eb0a5ca3dcfa8b
--- /dev/null
+++ b/test/prism/fixtures/methods.txt
@@ -0,0 +1,190 @@
+def foo((bar, baz))
+end
+
+def foo((bar, baz), optional = 1, (bin, bag))
+end
+
+
+def a; ensure; end
+
+def (b).a
+end
+
+def (a)::b
+end
+
+def false.a
+end
+
+def a(...)
+end
+
+def $var.a
+end
+
+def a.b
+end
+
+def @var.a
+end
+
+def a b:; end
+
+%,abc,
+
+def a(b:)
+end
+
+def a(**b)
+end
+
+def a(**)
+end
+
+a = 1; def a
+end
+
+def a b, c, d
+end
+
+def nil.a
+end
+
+def a b:, c: 1
+end
+
+def a(b:, c: 1)
+end
+
+def a(b:
+  1, c:)
+end
+
+%.abc.
+
+def a b = 1, c = 2
+end
+
+def a()
+end
+
+def a b, c = 2
+end
+
+def a b
+end
+
+def a; rescue; else; ensure; end
+
+def a *b
+end
+
+def a(*)
+end
+
+def a
+b = 1
+end
+
+def self.a
+end
+
+def true.a
+end
+
+def a
+end
+
+def hi
+return :hi if true
+:bye
+end
+
+def foo = 1
+def bar = 2
+
+def foo(bar) = 123
+
+def foo = 123
+
+def a(*); b(*); end
+
+def a(*, **); b { c(*, **) }; end
+
+def a(...); b(...); end
+
+def a(...); b(1, 2, ...); end
+
+def (c = b).a
+end
+
+def a &b
+end
+
+def a(&)
+end
+
+def @@var.a
+end
+
+def (a = b).C
+end
+
+def self.Array_function; end
+
+Const = 1; def Const.a
+end
+
+def a(...); "foo#{b(...)}"; end
+
+def foo
+  {}.merge **bar, **baz, **qux
+end
+
+def bar(a: (1...10))
+end
+
+def bar(a: (...10))
+end
+
+def bar(a: (1...))
+end
+
+def bar(a = (1...10))
+end
+
+def bar(a = (...10))
+end
+
+def bar(a = (1...))
+end
+
+def method(a)
+  item >> a {}
+end
+
+foo = 1
+def foo.bar; end
+
+def f(*); [*]; end
+
+def f x:-a; end
+
+def f x:+a; end
+
+def f x:!a; end
+
+def foo x:%(xx); end
+
+def foo(...)
+  bar(...)
+end
+
+def foo(bar = (def baz(bar) = bar; 1)) = 2
+
+def (class Foo; end).foo(bar = 1) = 2
+
+module Foo
+  def clone(opts = nil || (return self))
+  end
+end
diff --git a/test/yarp/fixtures/modules.txt b/test/prism/fixtures/modules.txt
similarity index 100%
rename from test/yarp/fixtures/modules.txt
rename to test/prism/fixtures/modules.txt
diff --git a/test/prism/fixtures/multi_write.txt b/test/prism/fixtures/multi_write.txt
new file mode 100644
index 00000000000000..edbcafb969772a
--- /dev/null
+++ b/test/prism/fixtures/multi_write.txt
@@ -0,0 +1,4 @@
+foo = 1 rescue nil
+foo, bar = 1 rescue nil
+foo = 1, 2 rescue nil
+foo, bar = 1, 2 rescue nil
diff --git a/test/yarp/fixtures/newline_terminated.txt b/test/prism/fixtures/newline_terminated.txt
similarity index 100%
rename from test/yarp/fixtures/newline_terminated.txt
rename to test/prism/fixtures/newline_terminated.txt
diff --git a/test/prism/fixtures/next.txt b/test/prism/fixtures/next.txt
new file mode 100644
index 00000000000000..2ef14c6304e929
--- /dev/null
+++ b/test/prism/fixtures/next.txt
@@ -0,0 +1,24 @@
+tap { next }
+
+tap { next (1), (2), (3) }
+
+tap { next 1 }
+
+tap { next 1, 2,
+3 }
+
+tap { next 1, 2, 3 }
+
+tap { next [1, 2, 3] }
+
+tap { next(
+  1
+  2
+) }
+
+tap { next
+1 }
+
+tap { next() }
+
+tap { next(1) }
diff --git a/test/yarp/fixtures/nils.txt b/test/prism/fixtures/nils.txt
similarity index 100%
rename from test/yarp/fixtures/nils.txt
rename to test/prism/fixtures/nils.txt
diff --git a/test/yarp/fixtures/non_alphanumeric_methods.txt b/test/prism/fixtures/non_alphanumeric_methods.txt
similarity index 100%
rename from test/yarp/fixtures/non_alphanumeric_methods.txt
rename to test/prism/fixtures/non_alphanumeric_methods.txt
diff --git a/test/yarp/fixtures/not.txt b/test/prism/fixtures/not.txt
similarity index 100%
rename from test/yarp/fixtures/not.txt
rename to test/prism/fixtures/not.txt
diff --git a/test/prism/fixtures/numbers.txt b/test/prism/fixtures/numbers.txt
new file mode 100644
index 00000000000000..47f20dcb42d864
--- /dev/null
+++ b/test/prism/fixtures/numbers.txt
@@ -0,0 +1,67 @@
+0
+
+1
+
+1.0
+
+2
+
+0b0
+
+0b1
+
+0b10
+
+0d0
+
+0d1
+
+0d2
+
+00
+
+01
+
+02
+
+0o0
+
+0o1
+
+0o2
+
+0x0
+
+0x1
+
+0x2
+
+1i
+
+1r
+
+-1
+
+1ri
+
+1.2r
+
+1.2ri
+
+-1ri
+
+-1.2r
+
+-1.2ri
+
+0o1r
+
+0o1i
+
+0o1ri
+
+0d1r
+
+0d1i
+
+0b1ri
diff --git a/test/prism/fixtures/patterns.txt b/test/prism/fixtures/patterns.txt
new file mode 100644
index 00000000000000..449dac619b45df
--- /dev/null
+++ b/test/prism/fixtures/patterns.txt
@@ -0,0 +1,224 @@
+foo => bar
+foo => 1
+foo => 1.0
+foo => 1i
+foo => 1r
+foo => :foo
+foo => %s[foo]
+foo => :"foo"
+foo => /foo/
+foo => `foo`
+foo => %x[foo]
+foo => %i[foo]
+foo => %I[foo]
+foo => %w[foo]
+foo => %W[foo]
+foo => %q[foo]
+foo => %Q[foo]
+foo => "foo"
+foo => nil
+foo => self
+foo => true
+foo => false
+foo => __FILE__
+foo => __LINE__
+foo => __ENCODING__
+foo => -> { bar }
+
+foo => 1 .. 1
+foo => 1.0 .. 1.0
+foo => 1i .. 1i
+foo => 1r .. 1r
+foo => :foo .. :foo
+foo => %s[foo] .. %s[foo]
+foo => :"foo" .. :"foo"
+foo => /foo/ .. /foo/
+foo => `foo` .. `foo`
+foo => %x[foo] .. %x[foo]
+foo => %i[foo] .. %i[foo]
+foo => %I[foo] .. %I[foo]
+foo => %w[foo] .. %w[foo]
+foo => %W[foo] .. %W[foo]
+foo => %q[foo] .. %q[foo]
+foo => %Q[foo] .. %Q[foo]
+foo => "foo" .. "foo"
+foo => nil .. nil
+foo => self .. self
+foo => true .. true
+foo => false .. false
+foo => __FILE__ .. __FILE__
+foo => __LINE__ .. __LINE__
+foo => __ENCODING__ .. __ENCODING__
+foo => -> { bar } .. -> { bar }
+
+bar = 1; foo => ^bar
+foo => ^@bar
+foo => ^@@bar
+foo => ^$bar
+
+foo => ^(1)
+foo => ^(nil)
+foo => ^("bar" + "baz")
+
+foo => Foo
+foo => Foo::Bar::Baz
+foo => ::Foo
+foo => ::Foo::Bar::Baz
+
+foo => Foo()
+foo => Foo(1)
+foo => Foo(1, 2, 3)
+foo => Foo(bar)
+foo => Foo(*bar, baz)
+foo => Foo(bar, *baz)
+foo => Foo(*bar, baz, *qux)
+
+foo => Foo[]
+foo => Foo[1]
+foo => Foo[1, 2, 3]
+foo => Foo[Foo[]]
+foo => Foo[bar]
+foo => Foo[*bar, baz]
+foo => Foo[bar, *baz]
+foo => Foo[*bar, baz, *qux]
+
+foo => *bar
+foo => *bar, baz, qux
+foo => bar, *baz, qux
+foo => bar, baz, *qux
+foo => *bar, baz, *qux
+foo => bar,;
+
+foo => []
+foo => [[[[[]]]]]
+
+foo => [*bar]
+foo => [*bar, baz, qux]
+foo => [bar, *baz, qux]
+foo => [bar, baz, *qux]
+foo => [*bar, baz, *qux]
+
+foo in bar
+foo in 1
+foo in 1.0
+foo in 1i
+foo in 1r
+foo in :foo
+foo in %s[foo]
+foo in :"foo"
+foo in /foo/
+foo in `foo`
+foo in %x[foo]
+foo in %i[foo]
+foo in %I[foo]
+foo in %w[foo]
+foo in %W[foo]
+foo in %q[foo]
+foo in %Q[foo]
+foo in "foo"
+foo in nil
+foo in self
+foo in true
+foo in false
+foo in __FILE__
+foo in __LINE__
+foo in __ENCODING__
+foo in -> { bar }
+foo in bar,;
+
+case foo; in bar then end
+case foo; in 1 then end
+case foo; in 1.0 then end
+case foo; in 1i then end
+case foo; in 1r then end
+case foo; in :foo then end
+case foo; in %s[foo] then end
+case foo; in :"foo" then end
+case foo; in /foo/ then end
+case foo; in `foo` then end
+case foo; in %x[foo] then end
+case foo; in %i[foo] then end
+case foo; in %I[foo] then end
+case foo; in %w[foo] then end
+case foo; in %W[foo] then end
+case foo; in %q[foo] then end
+case foo; in %Q[foo] then end
+case foo; in "foo" then end
+case foo; in nil then end
+case foo; in self then end
+case foo; in true then end
+case foo; in false then end
+case foo; in __FILE__ then end
+case foo; in __LINE__ then end
+case foo; in __ENCODING__ then end
+case foo; in -> { bar } then end
+
+case foo; in bar if baz then end
+case foo; in 1 if baz then end
+case foo; in 1.0 if baz then end
+case foo; in 1i if baz then end
+case foo; in 1r if baz then end
+case foo; in :foo if baz then end
+case foo; in %s[foo] if baz then end
+case foo; in :"foo" if baz then end
+case foo; in /foo/ if baz then end
+case foo; in `foo` if baz then end
+case foo; in %x[foo] if baz then end
+case foo; in %i[foo] if baz then end
+case foo; in %I[foo] if baz then end
+case foo; in %w[foo] if baz then end
+case foo; in %W[foo] if baz then end
+case foo; in %q[foo] if baz then end
+case foo; in %Q[foo] if baz then end
+case foo; in "foo" if baz then end
+case foo; in nil if baz then end
+case foo; in self if baz then end
+case foo; in true if baz then end
+case foo; in false if baz then end
+case foo; in __FILE__ if baz then end
+case foo; in __LINE__ if baz then end
+case foo; in __ENCODING__ if baz then end
+case foo; in -> { bar } if baz then end
+
+if a in []
+end
+
+a => [
+  b
+]
+
+foo in A[
+  bar: B[
+    value: a
+  ]
+]
+
+foo in bar => baz
+foo => bar => baz
+
+foo, bar, baz = 1, 2
+foo do
+  [1, 2] => [foo, bar] => baz
+end
+
+foo => Object[{x:}]
+
+1.then { 1 in ^_1 }
+
+(
+  a,
+  b
+) = c
+
+case (); in [_a, _a]; end
+case (); in [{a:1}, {a:2}]; end
+a => ^({'a' => 'b'})
+
+a in b, and c
+a in b, or c
+(a in b,) and c
+(a in b,) or c
+
+x => ^([*a.x])
+x => ^([**a.x])
+x => ^({ a: })
diff --git a/test/yarp/fixtures/procs.txt b/test/prism/fixtures/procs.txt
similarity index 100%
rename from test/yarp/fixtures/procs.txt
rename to test/prism/fixtures/procs.txt
diff --git a/test/yarp/fixtures/range_begin_open_exclusive.txt b/test/prism/fixtures/range_begin_open_exclusive.txt
similarity index 100%
rename from test/yarp/fixtures/range_begin_open_exclusive.txt
rename to test/prism/fixtures/range_begin_open_exclusive.txt
diff --git a/test/yarp/fixtures/range_begin_open_inclusive.txt b/test/prism/fixtures/range_begin_open_inclusive.txt
similarity index 100%
rename from test/yarp/fixtures/range_begin_open_inclusive.txt
rename to test/prism/fixtures/range_begin_open_inclusive.txt
diff --git a/test/prism/fixtures/range_beginless.txt b/test/prism/fixtures/range_beginless.txt
new file mode 100644
index 00000000000000..a55b9b57e77b12
--- /dev/null
+++ b/test/prism/fixtures/range_beginless.txt
@@ -0,0 +1,5 @@
+def f(x = ...?a); end
+
+def f(x: ...?a); end
+
+def f() ...:a; end
diff --git a/test/yarp/fixtures/range_end_open_exclusive.txt b/test/prism/fixtures/range_end_open_exclusive.txt
similarity index 100%
rename from test/yarp/fixtures/range_end_open_exclusive.txt
rename to test/prism/fixtures/range_end_open_exclusive.txt
diff --git a/test/yarp/fixtures/range_end_open_inclusive.txt b/test/prism/fixtures/range_end_open_inclusive.txt
similarity index 100%
rename from test/yarp/fixtures/range_end_open_inclusive.txt
rename to test/prism/fixtures/range_end_open_inclusive.txt
diff --git a/test/prism/fixtures/ranges.txt b/test/prism/fixtures/ranges.txt
new file mode 100644
index 00000000000000..87eac6d2419a54
--- /dev/null
+++ b/test/prism/fixtures/ranges.txt
@@ -0,0 +1,51 @@
+(...2)
+
+(..2)
+
+foo ((1..1))
+
+1...2
+
+foo[...2]
+
+{ foo: ...bar }
+
+(1...)
+
+1..2
+
+{ foo: ..bar }
+
+(1..)
+
+1 .. ..1
+
+1.. && 2
+
+1.. == 2
+
+1.. != 2
+
+1.. === 2
+
+1.. <=> 2
+
+1.. =~ 2
+
+1.. !~ 2
+
+1.. < 2
+
+1.. > 2
+
+1.. <= 2
+
+1.. >= 2
+
+1.. << 2
+
+1.. >> 2
+
+1.. + 2
+
+1.. - 2
diff --git a/test/prism/fixtures/regex.txt b/test/prism/fixtures/regex.txt
new file mode 100644
index 00000000000000..712bfc081acfc3
--- /dev/null
+++ b/test/prism/fixtures/regex.txt
@@ -0,0 +1,58 @@
+foo /bar/
+
+%r{abc}i
+
+/a\b/
+
+/aaa #$bbb/
+
+/aaa #{bbb} ccc/
+
+[/(?<foo>bar)/ =~ baz, foo]
+
+/abc/i
+
+%r/[a-z$._?][\w$.?#@~]*:/i
+
+%r/([a-z$._?][\w$.?#@~]*)(\s+)(equ)/i
+
+%r/[a-z$._?][\w$.?#@~]*/i
+
+%r(
+(?:[#$%_']|\(\)|\(,\)|\[\]|[0-9])*
+  (?:[#$%_']+)
+)
+
+/(?#\))/ =~ "hi"
+
+%r#pound#
+
+/aaa #{bbb}/o
+
+/(?<a\
+b>)/ =~ ""; ab
+
+/(?<abc>)(?<abc>)/ =~ ""; abc
+
+/(?<a b>)/ =~ ""
+
+a = 1
+tap { /(?<a>)/ =~ to_s }
+
+/(?<foo>)/ =~ ""
+/(?<Foo>)/ =~ ""
+
+/(?<nil>)/ =~ ""
+def foo(nil:) = /(?<nil>)/ =~ ""
+
+/(?-x:#)/x
+
+/a
+b\
+c\
+d\\\
+e\\
+f\
+/
+
+//
diff --git a/test/prism/fixtures/regex_char_width.txt b/test/prism/fixtures/regex_char_width.txt
new file mode 100644
index 00000000000000..7096b715844b2d
--- /dev/null
+++ b/test/prism/fixtures/regex_char_width.txt
@@ -0,0 +1,3 @@
+# encoding: sjis
+/Ⅷ(?<a>.)Ⅹ(?<b>.)/ =~ 'ⅧaⅩb'
+[a, b]
diff --git a/test/prism/fixtures/regex_escape_encoding.txt b/test/prism/fixtures/regex_escape_encoding.txt
new file mode 100644
index 00000000000000..74e1647d675025
--- /dev/null
+++ b/test/prism/fixtures/regex_escape_encoding.txt
@@ -0,0 +1,3 @@
+# encoding: US-ASCII
+str = "hello \xFC"
+str =~ /hello \u{fc}/
diff --git a/test/prism/fixtures/regex_with_fake_newlines.txt b/test/prism/fixtures/regex_with_fake_newlines.txt
new file mode 100644
index 00000000000000..d92a2e4adea96f
--- /dev/null
+++ b/test/prism/fixtures/regex_with_fake_newlines.txt
@@ -0,0 +1,41 @@
+/
+  \n
+  \n
+  exit
+  \\n
+  \n\n\n\n
+  argh
+  \\
+  \\\
+  foo\nbar
+  \f
+  ok
+/
+
+%r{
+  \n
+  \n
+  exit
+  \\n
+  \n\n\n\n
+  argh
+  \\
+  \\\
+  foo\nbar
+  \f
+  ok
+}
+
+%r{
+  #{123}\n
+  \n
+  exit\\\
+  \\#{123}n
+  \n#{123}\n\n\n
+  argh\
+  \\#{123}baz\\
+  \\\
+  foo\nbar
+  \f
+  ok
+}
diff --git a/test/prism/fixtures/repeat_parameters.txt b/test/prism/fixtures/repeat_parameters.txt
new file mode 100644
index 00000000000000..9c69e9718ad22f
--- /dev/null
+++ b/test/prism/fixtures/repeat_parameters.txt
@@ -0,0 +1,38 @@
+def foo(a, _)
+end
+
+def foo(a, _, _)
+end
+
+def foo(a, _, _, _b)
+end
+
+def foo(a, _, _, _b, _b)
+end
+
+def foo(a, (b, *_c, d), (e, *_c, f))
+end
+
+def foo(_a, _a, b, c)
+end
+
+def foo((a, *_b, c), (d, *_b, e))
+end
+
+def foo(_a = 1, _a = 2)
+end
+
+def foo(_a:, _a:)
+end
+
+def foo(_a: 1, _a: 2)
+end
+
+def foo(_a, **_a)
+end
+
+def foo(_a, &_a)
+end
+
+def foo(_a, *_a)
+end
diff --git a/test/prism/fixtures/rescue.txt b/test/prism/fixtures/rescue.txt
new file mode 100644
index 00000000000000..f4364630291207
--- /dev/null
+++ b/test/prism/fixtures/rescue.txt
@@ -0,0 +1,39 @@
+foo rescue nil
+
+foo rescue
+nil
+
+tap { break rescue nil }
+
+tap { next rescue nil }
+
+return rescue nil
+
+foo rescue nil || 1
+
+foo rescue nil ? 1 : 2
+
+begin; a; rescue *b; end
+
+foo do |x|
+  bar(y) rescue ArgumentError fail "baz"
+end
+
+if a = foo rescue nil
+  bar
+end
+
+def some_method = other_method 42 rescue nil
+
+def a
+  a b:
+rescue
+end
+
+foo if bar rescue baz
+
+z = x y rescue c d
+
+begin
+rescue => A[]
+end
diff --git a/test/prism/fixtures/rescue_modifier.txt b/test/prism/fixtures/rescue_modifier.txt
new file mode 100644
index 00000000000000..def9e2dbedef93
--- /dev/null
+++ b/test/prism/fixtures/rescue_modifier.txt
@@ -0,0 +1,7 @@
+a rescue b if c
+
+a = b rescue c if d
+
+a, = b rescue c if d
+
+def a = b rescue c if d
diff --git a/test/yarp/fixtures/return.txt b/test/prism/fixtures/return.txt
similarity index 100%
rename from test/yarp/fixtures/return.txt
rename to test/prism/fixtures/return.txt
diff --git a/test/yarp/fixtures/seattlerb/BEGIN.txt b/test/prism/fixtures/seattlerb/BEGIN.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/BEGIN.txt
rename to test/prism/fixtures/seattlerb/BEGIN.txt
diff --git a/test/prism/fixtures/seattlerb/README.rdoc b/test/prism/fixtures/seattlerb/README.rdoc
new file mode 100644
index 00000000000000..1e5bfbdfe01682
--- /dev/null
+++ b/test/prism/fixtures/seattlerb/README.rdoc
@@ -0,0 +1,113 @@
+= ruby_parser
+
+home :: https://github.com/seattlerb/ruby_parser
+bugs :: https://github.com/seattlerb/ruby_parser/issues
+rdoc :: http://docs.seattlerb.org/ruby_parser
+
+== DESCRIPTION:
+
+ruby_parser (RP) is a ruby parser written in pure ruby (utilizing
+racc--which does by default use a C extension). It outputs
+s-expressions which can be manipulated and converted back to ruby via
+the ruby2ruby gem.
+
+As an example:
+
+    def conditional1 arg1
+      return 1 if arg1 == 0
+      return 0
+    end
+
+becomes:
+
+    s(:defn, :conditional1, s(:args, :arg1),
+      s(:if,
+        s(:call, s(:lvar, :arg1), :==, s(:lit, 0)),
+        s(:return, s(:lit, 1)),
+        nil),
+      s(:return, s(:lit, 0)))
+
+Tested against 801,039 files from the latest of all rubygems (as of 2013-05):
+
+* 1.8 parser is at 99.9739% accuracy, 3.651 sigma
+* 1.9 parser is at 99.9940% accuracy, 4.013 sigma
+* 2.0 parser is at 99.9939% accuracy, 4.008 sigma
+* 2.6 parser is at 99.9972% accuracy, 4.191 sigma
+* 3.0 parser has a 100% parse rate.
+  * Tested against 2,672,412 unique ruby files across 167k gems.
+  * As do all the others now, basically.
+
+== FEATURES/PROBLEMS:
+
+* Pure ruby, no compiles.
+* Includes preceding comment data for defn/defs/class/module nodes!
+* Incredibly simple interface.
+* Output is 100% equivalent to ParseTree.
+  * Can utilize PT's SexpProcessor and UnifiedRuby for language processing.
+* Known Issue: Speed is now pretty good, but can always improve:
+  * RP parses a corpus of 3702 files in 125s (avg 108 Kb/s)
+  * MRI+PT parsed the same in 67.38s (avg 200.89 Kb/s)
+* Known Issue: Code is much better, but still has a long way to go.
+* Known Issue: Totally awesome.
+* Known Issue: line number values can be slightly off. Parsing LR sucks.
+
+== SYNOPSIS:
+
+  RubyParser.new.parse "1+1"
+  # => s(:call, s(:lit, 1), :+, s(:lit, 1))
+
+You can also use Ruby19Parser, Ruby18Parser, or RubyParser.for_current_ruby:
+
+  RubyParser.for_current_ruby.parse "1+1"
+  # => s(:call, s(:lit, 1), :+, s(:lit, 1))
+
+== DEVELOPER NOTES:
+
+To add a new version:
+
+* New parser should be generated from lib/ruby_parser[23].yy.
+* Extend lib/ruby_parser[23].yy with new class name.
+* Add new version number to V2/V3 in Rakefile for rule creation.
+* Add new `ruby_parse "x.y.z"` line to Rakefile for rake compare (line ~300).
+* Require generated parser in lib/ruby_parser.rb.
+* Add new V## = ::Ruby##Parser; end to ruby_parser.rb (bottom of file).
+* Add empty TestRubyParserShared##Plus module and TestRubyParserV## to test/test_ruby_parser.rb.
+* Extend Manifest.txt with generated file names.
+* Add new version number to sexp_processor's pt_testcase.rb in all_versions.
+
+Until all of these are done, you won't have a clean test run.
+
+== REQUIREMENTS:
+
+* ruby. woot.
+* sexp_processor for Sexp and SexpProcessor classes, and testing.
+* racc full package for parser development (compiling .y to .rb).
+
+== INSTALL:
+
+* sudo gem install ruby_parser
+
+== LICENSE:
+
+(The MIT License)
+
+Copyright (c) Ryan Davis, seattle.rb
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+'Software'), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/test/yarp/fixtures/seattlerb/TestRubyParserShared.txt b/test/prism/fixtures/seattlerb/TestRubyParserShared.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/TestRubyParserShared.txt
rename to test/prism/fixtures/seattlerb/TestRubyParserShared.txt
diff --git a/test/yarp/fixtures/seattlerb/__ENCODING__.txt b/test/prism/fixtures/seattlerb/__ENCODING__.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/__ENCODING__.txt
rename to test/prism/fixtures/seattlerb/__ENCODING__.txt
diff --git a/test/yarp/fixtures/seattlerb/alias_gvar_backref.txt b/test/prism/fixtures/seattlerb/alias_gvar_backref.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/alias_gvar_backref.txt
rename to test/prism/fixtures/seattlerb/alias_gvar_backref.txt
diff --git a/test/yarp/fixtures/seattlerb/alias_resword.txt b/test/prism/fixtures/seattlerb/alias_resword.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/alias_resword.txt
rename to test/prism/fixtures/seattlerb/alias_resword.txt
diff --git a/test/yarp/fixtures/seattlerb/and_multi.txt b/test/prism/fixtures/seattlerb/and_multi.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/and_multi.txt
rename to test/prism/fixtures/seattlerb/and_multi.txt
diff --git a/test/yarp/fixtures/seattlerb/aref_args_assocs.txt b/test/prism/fixtures/seattlerb/aref_args_assocs.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/aref_args_assocs.txt
rename to test/prism/fixtures/seattlerb/aref_args_assocs.txt
diff --git a/test/yarp/fixtures/seattlerb/aref_args_lit_assocs.txt b/test/prism/fixtures/seattlerb/aref_args_lit_assocs.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/aref_args_lit_assocs.txt
rename to test/prism/fixtures/seattlerb/aref_args_lit_assocs.txt
diff --git a/test/yarp/fixtures/seattlerb/args_kw_block.txt b/test/prism/fixtures/seattlerb/args_kw_block.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/args_kw_block.txt
rename to test/prism/fixtures/seattlerb/args_kw_block.txt
diff --git a/test/yarp/fixtures/seattlerb/array_line_breaks.txt b/test/prism/fixtures/seattlerb/array_line_breaks.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/array_line_breaks.txt
rename to test/prism/fixtures/seattlerb/array_line_breaks.txt
diff --git a/test/yarp/fixtures/seattlerb/array_lits_trailing_calls.txt b/test/prism/fixtures/seattlerb/array_lits_trailing_calls.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/array_lits_trailing_calls.txt
rename to test/prism/fixtures/seattlerb/array_lits_trailing_calls.txt
diff --git a/test/yarp/fixtures/seattlerb/assoc__bare.txt b/test/prism/fixtures/seattlerb/assoc__bare.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/assoc__bare.txt
rename to test/prism/fixtures/seattlerb/assoc__bare.txt
diff --git a/test/yarp/fixtures/seattlerb/assoc_label.txt b/test/prism/fixtures/seattlerb/assoc_label.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/assoc_label.txt
rename to test/prism/fixtures/seattlerb/assoc_label.txt
diff --git a/test/yarp/fixtures/seattlerb/attr_asgn_colon_id.txt b/test/prism/fixtures/seattlerb/attr_asgn_colon_id.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/attr_asgn_colon_id.txt
rename to test/prism/fixtures/seattlerb/attr_asgn_colon_id.txt
diff --git a/test/yarp/fixtures/seattlerb/attrasgn_array_arg.txt b/test/prism/fixtures/seattlerb/attrasgn_array_arg.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/attrasgn_array_arg.txt
rename to test/prism/fixtures/seattlerb/attrasgn_array_arg.txt
diff --git a/test/yarp/fixtures/seattlerb/attrasgn_array_lhs.txt b/test/prism/fixtures/seattlerb/attrasgn_array_lhs.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/attrasgn_array_lhs.txt
rename to test/prism/fixtures/seattlerb/attrasgn_array_lhs.txt
diff --git a/test/yarp/fixtures/seattlerb/attrasgn_primary_dot_constant.txt b/test/prism/fixtures/seattlerb/attrasgn_primary_dot_constant.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/attrasgn_primary_dot_constant.txt
rename to test/prism/fixtures/seattlerb/attrasgn_primary_dot_constant.txt
diff --git a/test/yarp/fixtures/seattlerb/backticks_interpolation_line.txt b/test/prism/fixtures/seattlerb/backticks_interpolation_line.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/backticks_interpolation_line.txt
rename to test/prism/fixtures/seattlerb/backticks_interpolation_line.txt
diff --git a/test/yarp/fixtures/seattlerb/bang_eq.txt b/test/prism/fixtures/seattlerb/bang_eq.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/bang_eq.txt
rename to test/prism/fixtures/seattlerb/bang_eq.txt
diff --git a/test/yarp/fixtures/seattlerb/bdot2.txt b/test/prism/fixtures/seattlerb/bdot2.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/bdot2.txt
rename to test/prism/fixtures/seattlerb/bdot2.txt
diff --git a/test/yarp/fixtures/seattlerb/bdot3.txt b/test/prism/fixtures/seattlerb/bdot3.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/bdot3.txt
rename to test/prism/fixtures/seattlerb/bdot3.txt
diff --git a/test/yarp/fixtures/seattlerb/begin_ensure_no_bodies.txt b/test/prism/fixtures/seattlerb/begin_ensure_no_bodies.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/begin_ensure_no_bodies.txt
rename to test/prism/fixtures/seattlerb/begin_ensure_no_bodies.txt
diff --git a/test/yarp/fixtures/seattlerb/begin_rescue_else_ensure_bodies.txt b/test/prism/fixtures/seattlerb/begin_rescue_else_ensure_bodies.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/begin_rescue_else_ensure_bodies.txt
rename to test/prism/fixtures/seattlerb/begin_rescue_else_ensure_bodies.txt
diff --git a/test/yarp/fixtures/seattlerb/begin_rescue_else_ensure_no_bodies.txt b/test/prism/fixtures/seattlerb/begin_rescue_else_ensure_no_bodies.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/begin_rescue_else_ensure_no_bodies.txt
rename to test/prism/fixtures/seattlerb/begin_rescue_else_ensure_no_bodies.txt
diff --git a/test/yarp/fixtures/seattlerb/begin_rescue_ensure_no_bodies.txt b/test/prism/fixtures/seattlerb/begin_rescue_ensure_no_bodies.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/begin_rescue_ensure_no_bodies.txt
rename to test/prism/fixtures/seattlerb/begin_rescue_ensure_no_bodies.txt
diff --git a/test/yarp/fixtures/seattlerb/block_arg__bare.txt b/test/prism/fixtures/seattlerb/block_arg__bare.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/block_arg__bare.txt
rename to test/prism/fixtures/seattlerb/block_arg__bare.txt
diff --git a/test/yarp/fixtures/seattlerb/block_arg_kwsplat.txt b/test/prism/fixtures/seattlerb/block_arg_kwsplat.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/block_arg_kwsplat.txt
rename to test/prism/fixtures/seattlerb/block_arg_kwsplat.txt
diff --git a/test/yarp/fixtures/seattlerb/block_arg_opt_arg_block.txt b/test/prism/fixtures/seattlerb/block_arg_opt_arg_block.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/block_arg_opt_arg_block.txt
rename to test/prism/fixtures/seattlerb/block_arg_opt_arg_block.txt
diff --git a/test/yarp/fixtures/seattlerb/block_arg_opt_splat.txt b/test/prism/fixtures/seattlerb/block_arg_opt_splat.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/block_arg_opt_splat.txt
rename to test/prism/fixtures/seattlerb/block_arg_opt_splat.txt
diff --git a/test/yarp/fixtures/seattlerb/block_arg_opt_splat_arg_block_omfg.txt b/test/prism/fixtures/seattlerb/block_arg_opt_splat_arg_block_omfg.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/block_arg_opt_splat_arg_block_omfg.txt
rename to test/prism/fixtures/seattlerb/block_arg_opt_splat_arg_block_omfg.txt
diff --git a/test/yarp/fixtures/seattlerb/block_arg_optional.txt b/test/prism/fixtures/seattlerb/block_arg_optional.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/block_arg_optional.txt
rename to test/prism/fixtures/seattlerb/block_arg_optional.txt
diff --git a/test/yarp/fixtures/seattlerb/block_arg_scope.txt b/test/prism/fixtures/seattlerb/block_arg_scope.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/block_arg_scope.txt
rename to test/prism/fixtures/seattlerb/block_arg_scope.txt
diff --git a/test/yarp/fixtures/seattlerb/block_arg_scope2.txt b/test/prism/fixtures/seattlerb/block_arg_scope2.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/block_arg_scope2.txt
rename to test/prism/fixtures/seattlerb/block_arg_scope2.txt
diff --git a/test/yarp/fixtures/seattlerb/block_arg_splat_arg.txt b/test/prism/fixtures/seattlerb/block_arg_splat_arg.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/block_arg_splat_arg.txt
rename to test/prism/fixtures/seattlerb/block_arg_splat_arg.txt
diff --git a/test/yarp/fixtures/seattlerb/block_args_kwargs.txt b/test/prism/fixtures/seattlerb/block_args_kwargs.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/block_args_kwargs.txt
rename to test/prism/fixtures/seattlerb/block_args_kwargs.txt
diff --git a/test/yarp/fixtures/seattlerb/block_args_no_kwargs.txt b/test/prism/fixtures/seattlerb/block_args_no_kwargs.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/block_args_no_kwargs.txt
rename to test/prism/fixtures/seattlerb/block_args_no_kwargs.txt
diff --git a/test/yarp/fixtures/seattlerb/block_args_opt1.txt b/test/prism/fixtures/seattlerb/block_args_opt1.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/block_args_opt1.txt
rename to test/prism/fixtures/seattlerb/block_args_opt1.txt
diff --git a/test/yarp/fixtures/seattlerb/block_args_opt2.txt b/test/prism/fixtures/seattlerb/block_args_opt2.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/block_args_opt2.txt
rename to test/prism/fixtures/seattlerb/block_args_opt2.txt
diff --git a/test/yarp/fixtures/seattlerb/block_args_opt2_2.txt b/test/prism/fixtures/seattlerb/block_args_opt2_2.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/block_args_opt2_2.txt
rename to test/prism/fixtures/seattlerb/block_args_opt2_2.txt
diff --git a/test/yarp/fixtures/seattlerb/block_args_opt3.txt b/test/prism/fixtures/seattlerb/block_args_opt3.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/block_args_opt3.txt
rename to test/prism/fixtures/seattlerb/block_args_opt3.txt
diff --git a/test/yarp/fixtures/seattlerb/block_call_defn_call_block_call.txt b/test/prism/fixtures/seattlerb/block_call_defn_call_block_call.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/block_call_defn_call_block_call.txt
rename to test/prism/fixtures/seattlerb/block_call_defn_call_block_call.txt
diff --git a/test/yarp/fixtures/seattlerb/block_call_dot_op2_brace_block.txt b/test/prism/fixtures/seattlerb/block_call_dot_op2_brace_block.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/block_call_dot_op2_brace_block.txt
rename to test/prism/fixtures/seattlerb/block_call_dot_op2_brace_block.txt
diff --git a/test/yarp/fixtures/seattlerb/block_call_dot_op2_cmd_args_do_block.txt b/test/prism/fixtures/seattlerb/block_call_dot_op2_cmd_args_do_block.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/block_call_dot_op2_cmd_args_do_block.txt
rename to test/prism/fixtures/seattlerb/block_call_dot_op2_cmd_args_do_block.txt
diff --git a/test/yarp/fixtures/seattlerb/block_call_operation_colon.txt b/test/prism/fixtures/seattlerb/block_call_operation_colon.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/block_call_operation_colon.txt
rename to test/prism/fixtures/seattlerb/block_call_operation_colon.txt
diff --git a/test/yarp/fixtures/seattlerb/block_call_operation_dot.txt b/test/prism/fixtures/seattlerb/block_call_operation_dot.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/block_call_operation_dot.txt
rename to test/prism/fixtures/seattlerb/block_call_operation_dot.txt
diff --git a/test/yarp/fixtures/seattlerb/block_call_paren_call_block_call.txt b/test/prism/fixtures/seattlerb/block_call_paren_call_block_call.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/block_call_paren_call_block_call.txt
rename to test/prism/fixtures/seattlerb/block_call_paren_call_block_call.txt
diff --git a/test/yarp/fixtures/seattlerb/block_command_operation_colon.txt b/test/prism/fixtures/seattlerb/block_command_operation_colon.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/block_command_operation_colon.txt
rename to test/prism/fixtures/seattlerb/block_command_operation_colon.txt
diff --git a/test/yarp/fixtures/seattlerb/block_command_operation_dot.txt b/test/prism/fixtures/seattlerb/block_command_operation_dot.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/block_command_operation_dot.txt
rename to test/prism/fixtures/seattlerb/block_command_operation_dot.txt
diff --git a/test/yarp/fixtures/seattlerb/block_decomp_anon_splat_arg.txt b/test/prism/fixtures/seattlerb/block_decomp_anon_splat_arg.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/block_decomp_anon_splat_arg.txt
rename to test/prism/fixtures/seattlerb/block_decomp_anon_splat_arg.txt
diff --git a/test/yarp/fixtures/seattlerb/block_decomp_arg_splat.txt b/test/prism/fixtures/seattlerb/block_decomp_arg_splat.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/block_decomp_arg_splat.txt
rename to test/prism/fixtures/seattlerb/block_decomp_arg_splat.txt
diff --git a/test/yarp/fixtures/seattlerb/block_decomp_arg_splat_arg.txt b/test/prism/fixtures/seattlerb/block_decomp_arg_splat_arg.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/block_decomp_arg_splat_arg.txt
rename to test/prism/fixtures/seattlerb/block_decomp_arg_splat_arg.txt
diff --git a/test/yarp/fixtures/seattlerb/block_decomp_splat.txt b/test/prism/fixtures/seattlerb/block_decomp_splat.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/block_decomp_splat.txt
rename to test/prism/fixtures/seattlerb/block_decomp_splat.txt
diff --git a/test/yarp/fixtures/seattlerb/block_kw.txt b/test/prism/fixtures/seattlerb/block_kw.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/block_kw.txt
rename to test/prism/fixtures/seattlerb/block_kw.txt
diff --git a/test/yarp/fixtures/seattlerb/block_kw__required.txt b/test/prism/fixtures/seattlerb/block_kw__required.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/block_kw__required.txt
rename to test/prism/fixtures/seattlerb/block_kw__required.txt
diff --git a/test/yarp/fixtures/seattlerb/block_kwarg_lvar.txt b/test/prism/fixtures/seattlerb/block_kwarg_lvar.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/block_kwarg_lvar.txt
rename to test/prism/fixtures/seattlerb/block_kwarg_lvar.txt
diff --git a/test/yarp/fixtures/seattlerb/block_kwarg_lvar_multiple.txt b/test/prism/fixtures/seattlerb/block_kwarg_lvar_multiple.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/block_kwarg_lvar_multiple.txt
rename to test/prism/fixtures/seattlerb/block_kwarg_lvar_multiple.txt
diff --git a/test/yarp/fixtures/seattlerb/block_opt_arg.txt b/test/prism/fixtures/seattlerb/block_opt_arg.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/block_opt_arg.txt
rename to test/prism/fixtures/seattlerb/block_opt_arg.txt
diff --git a/test/yarp/fixtures/seattlerb/block_opt_splat.txt b/test/prism/fixtures/seattlerb/block_opt_splat.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/block_opt_splat.txt
rename to test/prism/fixtures/seattlerb/block_opt_splat.txt
diff --git a/test/yarp/fixtures/seattlerb/block_opt_splat_arg_block_omfg.txt b/test/prism/fixtures/seattlerb/block_opt_splat_arg_block_omfg.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/block_opt_splat_arg_block_omfg.txt
rename to test/prism/fixtures/seattlerb/block_opt_splat_arg_block_omfg.txt
diff --git a/test/yarp/fixtures/seattlerb/block_optarg.txt b/test/prism/fixtures/seattlerb/block_optarg.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/block_optarg.txt
rename to test/prism/fixtures/seattlerb/block_optarg.txt
diff --git a/test/yarp/fixtures/seattlerb/block_paren_splat.txt b/test/prism/fixtures/seattlerb/block_paren_splat.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/block_paren_splat.txt
rename to test/prism/fixtures/seattlerb/block_paren_splat.txt
diff --git a/test/yarp/fixtures/seattlerb/block_reg_optarg.txt b/test/prism/fixtures/seattlerb/block_reg_optarg.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/block_reg_optarg.txt
rename to test/prism/fixtures/seattlerb/block_reg_optarg.txt
diff --git a/test/yarp/fixtures/seattlerb/block_return.txt b/test/prism/fixtures/seattlerb/block_return.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/block_return.txt
rename to test/prism/fixtures/seattlerb/block_return.txt
diff --git a/test/yarp/fixtures/seattlerb/block_scope.txt b/test/prism/fixtures/seattlerb/block_scope.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/block_scope.txt
rename to test/prism/fixtures/seattlerb/block_scope.txt
diff --git a/test/yarp/fixtures/seattlerb/block_splat_reg.txt b/test/prism/fixtures/seattlerb/block_splat_reg.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/block_splat_reg.txt
rename to test/prism/fixtures/seattlerb/block_splat_reg.txt
diff --git a/test/yarp/fixtures/seattlerb/bug169.txt b/test/prism/fixtures/seattlerb/bug169.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/bug169.txt
rename to test/prism/fixtures/seattlerb/bug169.txt
diff --git a/test/yarp/fixtures/seattlerb/bug179.txt b/test/prism/fixtures/seattlerb/bug179.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/bug179.txt
rename to test/prism/fixtures/seattlerb/bug179.txt
diff --git a/test/yarp/fixtures/seattlerb/bug190.txt b/test/prism/fixtures/seattlerb/bug190.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/bug190.txt
rename to test/prism/fixtures/seattlerb/bug190.txt
diff --git a/test/yarp/fixtures/seattlerb/bug191.txt b/test/prism/fixtures/seattlerb/bug191.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/bug191.txt
rename to test/prism/fixtures/seattlerb/bug191.txt
diff --git a/test/yarp/fixtures/seattlerb/bug202.txt b/test/prism/fixtures/seattlerb/bug202.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/bug202.txt
rename to test/prism/fixtures/seattlerb/bug202.txt
diff --git a/test/yarp/fixtures/seattlerb/bug236.txt b/test/prism/fixtures/seattlerb/bug236.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/bug236.txt
rename to test/prism/fixtures/seattlerb/bug236.txt
diff --git a/test/yarp/fixtures/seattlerb/bug290.txt b/test/prism/fixtures/seattlerb/bug290.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/bug290.txt
rename to test/prism/fixtures/seattlerb/bug290.txt
diff --git a/test/yarp/fixtures/seattlerb/bug_187.txt b/test/prism/fixtures/seattlerb/bug_187.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/bug_187.txt
rename to test/prism/fixtures/seattlerb/bug_187.txt
diff --git a/test/yarp/fixtures/seattlerb/bug_215.txt b/test/prism/fixtures/seattlerb/bug_215.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/bug_215.txt
rename to test/prism/fixtures/seattlerb/bug_215.txt
diff --git a/test/yarp/fixtures/seattlerb/bug_249.txt b/test/prism/fixtures/seattlerb/bug_249.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/bug_249.txt
rename to test/prism/fixtures/seattlerb/bug_249.txt
diff --git a/test/yarp/fixtures/seattlerb/bug_and.txt b/test/prism/fixtures/seattlerb/bug_and.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/bug_and.txt
rename to test/prism/fixtures/seattlerb/bug_and.txt
diff --git a/test/yarp/fixtures/seattlerb/bug_args__19.txt b/test/prism/fixtures/seattlerb/bug_args__19.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/bug_args__19.txt
rename to test/prism/fixtures/seattlerb/bug_args__19.txt
diff --git a/test/yarp/fixtures/seattlerb/bug_args_masgn.txt b/test/prism/fixtures/seattlerb/bug_args_masgn.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/bug_args_masgn.txt
rename to test/prism/fixtures/seattlerb/bug_args_masgn.txt
diff --git a/test/yarp/fixtures/seattlerb/bug_args_masgn2.txt b/test/prism/fixtures/seattlerb/bug_args_masgn2.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/bug_args_masgn2.txt
rename to test/prism/fixtures/seattlerb/bug_args_masgn2.txt
diff --git a/test/yarp/fixtures/seattlerb/bug_args_masgn_outer_parens__19.txt b/test/prism/fixtures/seattlerb/bug_args_masgn_outer_parens__19.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/bug_args_masgn_outer_parens__19.txt
rename to test/prism/fixtures/seattlerb/bug_args_masgn_outer_parens__19.txt
diff --git a/test/yarp/fixtures/seattlerb/bug_call_arglist_parens.txt b/test/prism/fixtures/seattlerb/bug_call_arglist_parens.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/bug_call_arglist_parens.txt
rename to test/prism/fixtures/seattlerb/bug_call_arglist_parens.txt
diff --git a/test/yarp/fixtures/seattlerb/bug_case_when_regexp.txt b/test/prism/fixtures/seattlerb/bug_case_when_regexp.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/bug_case_when_regexp.txt
rename to test/prism/fixtures/seattlerb/bug_case_when_regexp.txt
diff --git a/test/yarp/fixtures/seattlerb/bug_comma.txt b/test/prism/fixtures/seattlerb/bug_comma.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/bug_comma.txt
rename to test/prism/fixtures/seattlerb/bug_comma.txt
diff --git a/test/yarp/fixtures/seattlerb/bug_cond_pct.txt b/test/prism/fixtures/seattlerb/bug_cond_pct.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/bug_cond_pct.txt
rename to test/prism/fixtures/seattlerb/bug_cond_pct.txt
diff --git a/test/yarp/fixtures/seattlerb/bug_hash_args.txt b/test/prism/fixtures/seattlerb/bug_hash_args.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/bug_hash_args.txt
rename to test/prism/fixtures/seattlerb/bug_hash_args.txt
diff --git a/test/yarp/fixtures/seattlerb/bug_hash_args_trailing_comma.txt b/test/prism/fixtures/seattlerb/bug_hash_args_trailing_comma.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/bug_hash_args_trailing_comma.txt
rename to test/prism/fixtures/seattlerb/bug_hash_args_trailing_comma.txt
diff --git a/test/yarp/fixtures/seattlerb/bug_hash_interp_array.txt b/test/prism/fixtures/seattlerb/bug_hash_interp_array.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/bug_hash_interp_array.txt
rename to test/prism/fixtures/seattlerb/bug_hash_interp_array.txt
diff --git a/test/yarp/fixtures/seattlerb/bug_masgn_right.txt b/test/prism/fixtures/seattlerb/bug_masgn_right.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/bug_masgn_right.txt
rename to test/prism/fixtures/seattlerb/bug_masgn_right.txt
diff --git a/test/yarp/fixtures/seattlerb/bug_not_parens.txt b/test/prism/fixtures/seattlerb/bug_not_parens.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/bug_not_parens.txt
rename to test/prism/fixtures/seattlerb/bug_not_parens.txt
diff --git a/test/yarp/fixtures/seattlerb/bug_op_asgn_rescue.txt b/test/prism/fixtures/seattlerb/bug_op_asgn_rescue.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/bug_op_asgn_rescue.txt
rename to test/prism/fixtures/seattlerb/bug_op_asgn_rescue.txt
diff --git a/test/yarp/fixtures/seattlerb/call_and.txt b/test/prism/fixtures/seattlerb/call_and.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/call_and.txt
rename to test/prism/fixtures/seattlerb/call_and.txt
diff --git a/test/yarp/fixtures/seattlerb/call_arg_assoc.txt b/test/prism/fixtures/seattlerb/call_arg_assoc.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/call_arg_assoc.txt
rename to test/prism/fixtures/seattlerb/call_arg_assoc.txt
diff --git a/test/yarp/fixtures/seattlerb/call_arg_assoc_kwsplat.txt b/test/prism/fixtures/seattlerb/call_arg_assoc_kwsplat.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/call_arg_assoc_kwsplat.txt
rename to test/prism/fixtures/seattlerb/call_arg_assoc_kwsplat.txt
diff --git a/test/yarp/fixtures/seattlerb/call_arg_kwsplat.txt b/test/prism/fixtures/seattlerb/call_arg_kwsplat.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/call_arg_kwsplat.txt
rename to test/prism/fixtures/seattlerb/call_arg_kwsplat.txt
diff --git a/test/yarp/fixtures/seattlerb/call_args_assoc_quoted.txt b/test/prism/fixtures/seattlerb/call_args_assoc_quoted.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/call_args_assoc_quoted.txt
rename to test/prism/fixtures/seattlerb/call_args_assoc_quoted.txt
diff --git a/test/yarp/fixtures/seattlerb/call_args_assoc_trailing_comma.txt b/test/prism/fixtures/seattlerb/call_args_assoc_trailing_comma.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/call_args_assoc_trailing_comma.txt
rename to test/prism/fixtures/seattlerb/call_args_assoc_trailing_comma.txt
diff --git a/test/yarp/fixtures/seattlerb/call_args_command.txt b/test/prism/fixtures/seattlerb/call_args_command.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/call_args_command.txt
rename to test/prism/fixtures/seattlerb/call_args_command.txt
diff --git a/test/yarp/fixtures/seattlerb/call_array_arg.txt b/test/prism/fixtures/seattlerb/call_array_arg.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/call_array_arg.txt
rename to test/prism/fixtures/seattlerb/call_array_arg.txt
diff --git a/test/yarp/fixtures/seattlerb/call_array_block_call.txt b/test/prism/fixtures/seattlerb/call_array_block_call.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/call_array_block_call.txt
rename to test/prism/fixtures/seattlerb/call_array_block_call.txt
diff --git a/test/yarp/fixtures/seattlerb/call_array_lambda_block_call.txt b/test/prism/fixtures/seattlerb/call_array_lambda_block_call.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/call_array_lambda_block_call.txt
rename to test/prism/fixtures/seattlerb/call_array_lambda_block_call.txt
diff --git a/test/yarp/fixtures/seattlerb/call_array_lit_inline_hash.txt b/test/prism/fixtures/seattlerb/call_array_lit_inline_hash.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/call_array_lit_inline_hash.txt
rename to test/prism/fixtures/seattlerb/call_array_lit_inline_hash.txt
diff --git a/test/yarp/fixtures/seattlerb/call_assoc.txt b/test/prism/fixtures/seattlerb/call_assoc.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/call_assoc.txt
rename to test/prism/fixtures/seattlerb/call_assoc.txt
diff --git a/test/yarp/fixtures/seattlerb/call_assoc_new.txt b/test/prism/fixtures/seattlerb/call_assoc_new.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/call_assoc_new.txt
rename to test/prism/fixtures/seattlerb/call_assoc_new.txt
diff --git a/test/yarp/fixtures/seattlerb/call_assoc_new_if_multiline.txt b/test/prism/fixtures/seattlerb/call_assoc_new_if_multiline.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/call_assoc_new_if_multiline.txt
rename to test/prism/fixtures/seattlerb/call_assoc_new_if_multiline.txt
diff --git a/test/yarp/fixtures/seattlerb/call_assoc_trailing_comma.txt b/test/prism/fixtures/seattlerb/call_assoc_trailing_comma.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/call_assoc_trailing_comma.txt
rename to test/prism/fixtures/seattlerb/call_assoc_trailing_comma.txt
diff --git a/test/yarp/fixtures/seattlerb/call_bang_command_call.txt b/test/prism/fixtures/seattlerb/call_bang_command_call.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/call_bang_command_call.txt
rename to test/prism/fixtures/seattlerb/call_bang_command_call.txt
diff --git a/test/yarp/fixtures/seattlerb/call_bang_squiggle.txt b/test/prism/fixtures/seattlerb/call_bang_squiggle.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/call_bang_squiggle.txt
rename to test/prism/fixtures/seattlerb/call_bang_squiggle.txt
diff --git a/test/yarp/fixtures/seattlerb/call_begin_call_block_call.txt b/test/prism/fixtures/seattlerb/call_begin_call_block_call.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/call_begin_call_block_call.txt
rename to test/prism/fixtures/seattlerb/call_begin_call_block_call.txt
diff --git a/test/yarp/fixtures/seattlerb/call_block_arg_named.txt b/test/prism/fixtures/seattlerb/call_block_arg_named.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/call_block_arg_named.txt
rename to test/prism/fixtures/seattlerb/call_block_arg_named.txt
diff --git a/test/yarp/fixtures/seattlerb/call_carat.txt b/test/prism/fixtures/seattlerb/call_carat.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/call_carat.txt
rename to test/prism/fixtures/seattlerb/call_carat.txt
diff --git a/test/yarp/fixtures/seattlerb/call_colon2.txt b/test/prism/fixtures/seattlerb/call_colon2.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/call_colon2.txt
rename to test/prism/fixtures/seattlerb/call_colon2.txt
diff --git a/test/yarp/fixtures/seattlerb/call_colon_parens.txt b/test/prism/fixtures/seattlerb/call_colon_parens.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/call_colon_parens.txt
rename to test/prism/fixtures/seattlerb/call_colon_parens.txt
diff --git a/test/yarp/fixtures/seattlerb/call_div.txt b/test/prism/fixtures/seattlerb/call_div.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/call_div.txt
rename to test/prism/fixtures/seattlerb/call_div.txt
diff --git a/test/yarp/fixtures/seattlerb/call_dot_parens.txt b/test/prism/fixtures/seattlerb/call_dot_parens.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/call_dot_parens.txt
rename to test/prism/fixtures/seattlerb/call_dot_parens.txt
diff --git a/test/yarp/fixtures/seattlerb/call_env.txt b/test/prism/fixtures/seattlerb/call_env.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/call_env.txt
rename to test/prism/fixtures/seattlerb/call_env.txt
diff --git a/test/yarp/fixtures/seattlerb/call_eq3.txt b/test/prism/fixtures/seattlerb/call_eq3.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/call_eq3.txt
rename to test/prism/fixtures/seattlerb/call_eq3.txt
diff --git a/test/yarp/fixtures/seattlerb/call_gt.txt b/test/prism/fixtures/seattlerb/call_gt.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/call_gt.txt
rename to test/prism/fixtures/seattlerb/call_gt.txt
diff --git a/test/yarp/fixtures/seattlerb/call_kwsplat.txt b/test/prism/fixtures/seattlerb/call_kwsplat.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/call_kwsplat.txt
rename to test/prism/fixtures/seattlerb/call_kwsplat.txt
diff --git a/test/yarp/fixtures/seattlerb/call_leading_dots.txt b/test/prism/fixtures/seattlerb/call_leading_dots.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/call_leading_dots.txt
rename to test/prism/fixtures/seattlerb/call_leading_dots.txt
diff --git a/test/yarp/fixtures/seattlerb/call_leading_dots_comment.txt b/test/prism/fixtures/seattlerb/call_leading_dots_comment.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/call_leading_dots_comment.txt
rename to test/prism/fixtures/seattlerb/call_leading_dots_comment.txt
diff --git a/test/yarp/fixtures/seattlerb/call_lt.txt b/test/prism/fixtures/seattlerb/call_lt.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/call_lt.txt
rename to test/prism/fixtures/seattlerb/call_lt.txt
diff --git a/test/yarp/fixtures/seattlerb/call_lte.txt b/test/prism/fixtures/seattlerb/call_lte.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/call_lte.txt
rename to test/prism/fixtures/seattlerb/call_lte.txt
diff --git a/test/yarp/fixtures/seattlerb/call_not.txt b/test/prism/fixtures/seattlerb/call_not.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/call_not.txt
rename to test/prism/fixtures/seattlerb/call_not.txt
diff --git a/test/yarp/fixtures/seattlerb/call_pipe.txt b/test/prism/fixtures/seattlerb/call_pipe.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/call_pipe.txt
rename to test/prism/fixtures/seattlerb/call_pipe.txt
diff --git a/test/yarp/fixtures/seattlerb/call_rshift.txt b/test/prism/fixtures/seattlerb/call_rshift.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/call_rshift.txt
rename to test/prism/fixtures/seattlerb/call_rshift.txt
diff --git a/test/yarp/fixtures/seattlerb/call_self_brackets.txt b/test/prism/fixtures/seattlerb/call_self_brackets.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/call_self_brackets.txt
rename to test/prism/fixtures/seattlerb/call_self_brackets.txt
diff --git a/test/yarp/fixtures/seattlerb/call_spaceship.txt b/test/prism/fixtures/seattlerb/call_spaceship.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/call_spaceship.txt
rename to test/prism/fixtures/seattlerb/call_spaceship.txt
diff --git a/test/yarp/fixtures/seattlerb/call_stabby_do_end_with_block.txt b/test/prism/fixtures/seattlerb/call_stabby_do_end_with_block.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/call_stabby_do_end_with_block.txt
rename to test/prism/fixtures/seattlerb/call_stabby_do_end_with_block.txt
diff --git a/test/yarp/fixtures/seattlerb/call_stabby_with_braces_block.txt b/test/prism/fixtures/seattlerb/call_stabby_with_braces_block.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/call_stabby_with_braces_block.txt
rename to test/prism/fixtures/seattlerb/call_stabby_with_braces_block.txt
diff --git a/test/yarp/fixtures/seattlerb/call_star.txt b/test/prism/fixtures/seattlerb/call_star.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/call_star.txt
rename to test/prism/fixtures/seattlerb/call_star.txt
diff --git a/test/yarp/fixtures/seattlerb/call_star2.txt b/test/prism/fixtures/seattlerb/call_star2.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/call_star2.txt
rename to test/prism/fixtures/seattlerb/call_star2.txt
diff --git a/test/yarp/fixtures/seattlerb/call_trailing_comma.txt b/test/prism/fixtures/seattlerb/call_trailing_comma.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/call_trailing_comma.txt
rename to test/prism/fixtures/seattlerb/call_trailing_comma.txt
diff --git a/test/yarp/fixtures/seattlerb/call_trailing_dots.txt b/test/prism/fixtures/seattlerb/call_trailing_dots.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/call_trailing_dots.txt
rename to test/prism/fixtures/seattlerb/call_trailing_dots.txt
diff --git a/test/yarp/fixtures/seattlerb/call_unary_bang.txt b/test/prism/fixtures/seattlerb/call_unary_bang.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/call_unary_bang.txt
rename to test/prism/fixtures/seattlerb/call_unary_bang.txt
diff --git a/test/yarp/fixtures/seattlerb/case_in.txt b/test/prism/fixtures/seattlerb/case_in.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/case_in.txt
rename to test/prism/fixtures/seattlerb/case_in.txt
diff --git a/test/yarp/fixtures/seattlerb/case_in_31.txt b/test/prism/fixtures/seattlerb/case_in_31.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/case_in_31.txt
rename to test/prism/fixtures/seattlerb/case_in_31.txt
diff --git a/test/yarp/fixtures/seattlerb/case_in_37.txt b/test/prism/fixtures/seattlerb/case_in_37.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/case_in_37.txt
rename to test/prism/fixtures/seattlerb/case_in_37.txt
diff --git a/test/yarp/fixtures/seattlerb/case_in_42.txt b/test/prism/fixtures/seattlerb/case_in_42.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/case_in_42.txt
rename to test/prism/fixtures/seattlerb/case_in_42.txt
diff --git a/test/yarp/fixtures/seattlerb/case_in_42_2.txt b/test/prism/fixtures/seattlerb/case_in_42_2.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/case_in_42_2.txt
rename to test/prism/fixtures/seattlerb/case_in_42_2.txt
diff --git a/test/yarp/fixtures/seattlerb/case_in_47.txt b/test/prism/fixtures/seattlerb/case_in_47.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/case_in_47.txt
rename to test/prism/fixtures/seattlerb/case_in_47.txt
diff --git a/test/yarp/fixtures/seattlerb/case_in_67.txt b/test/prism/fixtures/seattlerb/case_in_67.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/case_in_67.txt
rename to test/prism/fixtures/seattlerb/case_in_67.txt
diff --git a/test/yarp/fixtures/seattlerb/case_in_86.txt b/test/prism/fixtures/seattlerb/case_in_86.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/case_in_86.txt
rename to test/prism/fixtures/seattlerb/case_in_86.txt
diff --git a/test/yarp/fixtures/seattlerb/case_in_86_2.txt b/test/prism/fixtures/seattlerb/case_in_86_2.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/case_in_86_2.txt
rename to test/prism/fixtures/seattlerb/case_in_86_2.txt
diff --git a/test/yarp/fixtures/seattlerb/case_in_array_pat_const.txt b/test/prism/fixtures/seattlerb/case_in_array_pat_const.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/case_in_array_pat_const.txt
rename to test/prism/fixtures/seattlerb/case_in_array_pat_const.txt
diff --git a/test/yarp/fixtures/seattlerb/case_in_array_pat_const2.txt b/test/prism/fixtures/seattlerb/case_in_array_pat_const2.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/case_in_array_pat_const2.txt
rename to test/prism/fixtures/seattlerb/case_in_array_pat_const2.txt
diff --git a/test/yarp/fixtures/seattlerb/case_in_array_pat_paren_assign.txt b/test/prism/fixtures/seattlerb/case_in_array_pat_paren_assign.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/case_in_array_pat_paren_assign.txt
rename to test/prism/fixtures/seattlerb/case_in_array_pat_paren_assign.txt
diff --git a/test/yarp/fixtures/seattlerb/case_in_const.txt b/test/prism/fixtures/seattlerb/case_in_const.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/case_in_const.txt
rename to test/prism/fixtures/seattlerb/case_in_const.txt
diff --git a/test/yarp/fixtures/seattlerb/case_in_else.txt b/test/prism/fixtures/seattlerb/case_in_else.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/case_in_else.txt
rename to test/prism/fixtures/seattlerb/case_in_else.txt
diff --git a/test/yarp/fixtures/seattlerb/case_in_find.txt b/test/prism/fixtures/seattlerb/case_in_find.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/case_in_find.txt
rename to test/prism/fixtures/seattlerb/case_in_find.txt
diff --git a/test/yarp/fixtures/seattlerb/case_in_find_array.txt b/test/prism/fixtures/seattlerb/case_in_find_array.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/case_in_find_array.txt
rename to test/prism/fixtures/seattlerb/case_in_find_array.txt
diff --git a/test/yarp/fixtures/seattlerb/case_in_hash_pat.txt b/test/prism/fixtures/seattlerb/case_in_hash_pat.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/case_in_hash_pat.txt
rename to test/prism/fixtures/seattlerb/case_in_hash_pat.txt
diff --git a/test/yarp/fixtures/seattlerb/case_in_hash_pat_assign.txt b/test/prism/fixtures/seattlerb/case_in_hash_pat_assign.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/case_in_hash_pat_assign.txt
rename to test/prism/fixtures/seattlerb/case_in_hash_pat_assign.txt
diff --git a/test/yarp/fixtures/seattlerb/case_in_hash_pat_paren_assign.txt b/test/prism/fixtures/seattlerb/case_in_hash_pat_paren_assign.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/case_in_hash_pat_paren_assign.txt
rename to test/prism/fixtures/seattlerb/case_in_hash_pat_paren_assign.txt
diff --git a/test/yarp/fixtures/seattlerb/case_in_hash_pat_paren_true.txt b/test/prism/fixtures/seattlerb/case_in_hash_pat_paren_true.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/case_in_hash_pat_paren_true.txt
rename to test/prism/fixtures/seattlerb/case_in_hash_pat_paren_true.txt
diff --git a/test/yarp/fixtures/seattlerb/case_in_hash_pat_rest.txt b/test/prism/fixtures/seattlerb/case_in_hash_pat_rest.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/case_in_hash_pat_rest.txt
rename to test/prism/fixtures/seattlerb/case_in_hash_pat_rest.txt
diff --git a/test/yarp/fixtures/seattlerb/case_in_hash_pat_rest_solo.txt b/test/prism/fixtures/seattlerb/case_in_hash_pat_rest_solo.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/case_in_hash_pat_rest_solo.txt
rename to test/prism/fixtures/seattlerb/case_in_hash_pat_rest_solo.txt
diff --git a/test/yarp/fixtures/seattlerb/case_in_if_unless_post_mod.txt b/test/prism/fixtures/seattlerb/case_in_if_unless_post_mod.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/case_in_if_unless_post_mod.txt
rename to test/prism/fixtures/seattlerb/case_in_if_unless_post_mod.txt
diff --git a/test/yarp/fixtures/seattlerb/case_in_multiple.txt b/test/prism/fixtures/seattlerb/case_in_multiple.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/case_in_multiple.txt
rename to test/prism/fixtures/seattlerb/case_in_multiple.txt
diff --git a/test/yarp/fixtures/seattlerb/case_in_or.txt b/test/prism/fixtures/seattlerb/case_in_or.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/case_in_or.txt
rename to test/prism/fixtures/seattlerb/case_in_or.txt
diff --git a/test/yarp/fixtures/seattlerb/class_comments.txt b/test/prism/fixtures/seattlerb/class_comments.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/class_comments.txt
rename to test/prism/fixtures/seattlerb/class_comments.txt
diff --git a/test/yarp/fixtures/seattlerb/cond_unary_minus.txt b/test/prism/fixtures/seattlerb/cond_unary_minus.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/cond_unary_minus.txt
rename to test/prism/fixtures/seattlerb/cond_unary_minus.txt
diff --git a/test/yarp/fixtures/seattlerb/const_2_op_asgn_or2.txt b/test/prism/fixtures/seattlerb/const_2_op_asgn_or2.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/const_2_op_asgn_or2.txt
rename to test/prism/fixtures/seattlerb/const_2_op_asgn_or2.txt
diff --git a/test/yarp/fixtures/seattlerb/const_3_op_asgn_or.txt b/test/prism/fixtures/seattlerb/const_3_op_asgn_or.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/const_3_op_asgn_or.txt
rename to test/prism/fixtures/seattlerb/const_3_op_asgn_or.txt
diff --git a/test/yarp/fixtures/seattlerb/const_op_asgn_and1.txt b/test/prism/fixtures/seattlerb/const_op_asgn_and1.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/const_op_asgn_and1.txt
rename to test/prism/fixtures/seattlerb/const_op_asgn_and1.txt
diff --git a/test/yarp/fixtures/seattlerb/const_op_asgn_and2.txt b/test/prism/fixtures/seattlerb/const_op_asgn_and2.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/const_op_asgn_and2.txt
rename to test/prism/fixtures/seattlerb/const_op_asgn_and2.txt
diff --git a/test/yarp/fixtures/seattlerb/const_op_asgn_or.txt b/test/prism/fixtures/seattlerb/const_op_asgn_or.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/const_op_asgn_or.txt
rename to test/prism/fixtures/seattlerb/const_op_asgn_or.txt
diff --git a/test/yarp/fixtures/seattlerb/defined_eh_parens.txt b/test/prism/fixtures/seattlerb/defined_eh_parens.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/defined_eh_parens.txt
rename to test/prism/fixtures/seattlerb/defined_eh_parens.txt
diff --git a/test/yarp/fixtures/seattlerb/defn_arg_asplat_arg.txt b/test/prism/fixtures/seattlerb/defn_arg_asplat_arg.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/defn_arg_asplat_arg.txt
rename to test/prism/fixtures/seattlerb/defn_arg_asplat_arg.txt
diff --git a/test/yarp/fixtures/seattlerb/defn_arg_forward_args.txt b/test/prism/fixtures/seattlerb/defn_arg_forward_args.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/defn_arg_forward_args.txt
rename to test/prism/fixtures/seattlerb/defn_arg_forward_args.txt
diff --git a/test/yarp/fixtures/seattlerb/defn_args_forward_args.txt b/test/prism/fixtures/seattlerb/defn_args_forward_args.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/defn_args_forward_args.txt
rename to test/prism/fixtures/seattlerb/defn_args_forward_args.txt
diff --git a/test/yarp/fixtures/seattlerb/defn_comments.txt b/test/prism/fixtures/seattlerb/defn_comments.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/defn_comments.txt
rename to test/prism/fixtures/seattlerb/defn_comments.txt
diff --git a/test/yarp/fixtures/seattlerb/defn_endless_command.txt b/test/prism/fixtures/seattlerb/defn_endless_command.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/defn_endless_command.txt
rename to test/prism/fixtures/seattlerb/defn_endless_command.txt
diff --git a/test/yarp/fixtures/seattlerb/defn_endless_command_rescue.txt b/test/prism/fixtures/seattlerb/defn_endless_command_rescue.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/defn_endless_command_rescue.txt
rename to test/prism/fixtures/seattlerb/defn_endless_command_rescue.txt
diff --git a/test/yarp/fixtures/seattlerb/defn_forward_args.txt b/test/prism/fixtures/seattlerb/defn_forward_args.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/defn_forward_args.txt
rename to test/prism/fixtures/seattlerb/defn_forward_args.txt
diff --git a/test/yarp/fixtures/seattlerb/defn_forward_args__no_parens.txt b/test/prism/fixtures/seattlerb/defn_forward_args__no_parens.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/defn_forward_args__no_parens.txt
rename to test/prism/fixtures/seattlerb/defn_forward_args__no_parens.txt
diff --git a/test/yarp/fixtures/seattlerb/defn_kwarg_env.txt b/test/prism/fixtures/seattlerb/defn_kwarg_env.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/defn_kwarg_env.txt
rename to test/prism/fixtures/seattlerb/defn_kwarg_env.txt
diff --git a/test/yarp/fixtures/seattlerb/defn_kwarg_kwarg.txt b/test/prism/fixtures/seattlerb/defn_kwarg_kwarg.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/defn_kwarg_kwarg.txt
rename to test/prism/fixtures/seattlerb/defn_kwarg_kwarg.txt
diff --git a/test/yarp/fixtures/seattlerb/defn_kwarg_kwsplat.txt b/test/prism/fixtures/seattlerb/defn_kwarg_kwsplat.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/defn_kwarg_kwsplat.txt
rename to test/prism/fixtures/seattlerb/defn_kwarg_kwsplat.txt
diff --git a/test/yarp/fixtures/seattlerb/defn_kwarg_kwsplat_anon.txt b/test/prism/fixtures/seattlerb/defn_kwarg_kwsplat_anon.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/defn_kwarg_kwsplat_anon.txt
rename to test/prism/fixtures/seattlerb/defn_kwarg_kwsplat_anon.txt
diff --git a/test/yarp/fixtures/seattlerb/defn_kwarg_lvar.txt b/test/prism/fixtures/seattlerb/defn_kwarg_lvar.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/defn_kwarg_lvar.txt
rename to test/prism/fixtures/seattlerb/defn_kwarg_lvar.txt
diff --git a/test/yarp/fixtures/seattlerb/defn_kwarg_no_parens.txt b/test/prism/fixtures/seattlerb/defn_kwarg_no_parens.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/defn_kwarg_no_parens.txt
rename to test/prism/fixtures/seattlerb/defn_kwarg_no_parens.txt
diff --git a/test/yarp/fixtures/seattlerb/defn_kwarg_val.txt b/test/prism/fixtures/seattlerb/defn_kwarg_val.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/defn_kwarg_val.txt
rename to test/prism/fixtures/seattlerb/defn_kwarg_val.txt
diff --git a/test/yarp/fixtures/seattlerb/defn_no_kwargs.txt b/test/prism/fixtures/seattlerb/defn_no_kwargs.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/defn_no_kwargs.txt
rename to test/prism/fixtures/seattlerb/defn_no_kwargs.txt
diff --git a/test/yarp/fixtures/seattlerb/defn_oneliner.txt b/test/prism/fixtures/seattlerb/defn_oneliner.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/defn_oneliner.txt
rename to test/prism/fixtures/seattlerb/defn_oneliner.txt
diff --git a/test/yarp/fixtures/seattlerb/defn_oneliner_eq2.txt b/test/prism/fixtures/seattlerb/defn_oneliner_eq2.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/defn_oneliner_eq2.txt
rename to test/prism/fixtures/seattlerb/defn_oneliner_eq2.txt
diff --git a/test/yarp/fixtures/seattlerb/defn_oneliner_noargs.txt b/test/prism/fixtures/seattlerb/defn_oneliner_noargs.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/defn_oneliner_noargs.txt
rename to test/prism/fixtures/seattlerb/defn_oneliner_noargs.txt
diff --git a/test/yarp/fixtures/seattlerb/defn_oneliner_noargs_parentheses.txt b/test/prism/fixtures/seattlerb/defn_oneliner_noargs_parentheses.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/defn_oneliner_noargs_parentheses.txt
rename to test/prism/fixtures/seattlerb/defn_oneliner_noargs_parentheses.txt
diff --git a/test/yarp/fixtures/seattlerb/defn_oneliner_rescue.txt b/test/prism/fixtures/seattlerb/defn_oneliner_rescue.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/defn_oneliner_rescue.txt
rename to test/prism/fixtures/seattlerb/defn_oneliner_rescue.txt
diff --git a/test/yarp/fixtures/seattlerb/defn_opt_last_arg.txt b/test/prism/fixtures/seattlerb/defn_opt_last_arg.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/defn_opt_last_arg.txt
rename to test/prism/fixtures/seattlerb/defn_opt_last_arg.txt
diff --git a/test/yarp/fixtures/seattlerb/defn_opt_reg.txt b/test/prism/fixtures/seattlerb/defn_opt_reg.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/defn_opt_reg.txt
rename to test/prism/fixtures/seattlerb/defn_opt_reg.txt
diff --git a/test/yarp/fixtures/seattlerb/defn_opt_splat_arg.txt b/test/prism/fixtures/seattlerb/defn_opt_splat_arg.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/defn_opt_splat_arg.txt
rename to test/prism/fixtures/seattlerb/defn_opt_splat_arg.txt
diff --git a/test/yarp/fixtures/seattlerb/defn_powarg.txt b/test/prism/fixtures/seattlerb/defn_powarg.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/defn_powarg.txt
rename to test/prism/fixtures/seattlerb/defn_powarg.txt
diff --git a/test/yarp/fixtures/seattlerb/defn_reg_opt_reg.txt b/test/prism/fixtures/seattlerb/defn_reg_opt_reg.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/defn_reg_opt_reg.txt
rename to test/prism/fixtures/seattlerb/defn_reg_opt_reg.txt
diff --git a/test/yarp/fixtures/seattlerb/defn_splat_arg.txt b/test/prism/fixtures/seattlerb/defn_splat_arg.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/defn_splat_arg.txt
rename to test/prism/fixtures/seattlerb/defn_splat_arg.txt
diff --git a/test/yarp/fixtures/seattlerb/defn_unary_not.txt b/test/prism/fixtures/seattlerb/defn_unary_not.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/defn_unary_not.txt
rename to test/prism/fixtures/seattlerb/defn_unary_not.txt
diff --git a/test/yarp/fixtures/seattlerb/defns_reserved.txt b/test/prism/fixtures/seattlerb/defns_reserved.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/defns_reserved.txt
rename to test/prism/fixtures/seattlerb/defns_reserved.txt
diff --git a/test/yarp/fixtures/seattlerb/defs_as_arg_with_do_block_inside.txt b/test/prism/fixtures/seattlerb/defs_as_arg_with_do_block_inside.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/defs_as_arg_with_do_block_inside.txt
rename to test/prism/fixtures/seattlerb/defs_as_arg_with_do_block_inside.txt
diff --git a/test/yarp/fixtures/seattlerb/defs_comments.txt b/test/prism/fixtures/seattlerb/defs_comments.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/defs_comments.txt
rename to test/prism/fixtures/seattlerb/defs_comments.txt
diff --git a/test/yarp/fixtures/seattlerb/defs_endless_command.txt b/test/prism/fixtures/seattlerb/defs_endless_command.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/defs_endless_command.txt
rename to test/prism/fixtures/seattlerb/defs_endless_command.txt
diff --git a/test/yarp/fixtures/seattlerb/defs_endless_command_rescue.txt b/test/prism/fixtures/seattlerb/defs_endless_command_rescue.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/defs_endless_command_rescue.txt
rename to test/prism/fixtures/seattlerb/defs_endless_command_rescue.txt
diff --git a/test/yarp/fixtures/seattlerb/defs_kwarg.txt b/test/prism/fixtures/seattlerb/defs_kwarg.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/defs_kwarg.txt
rename to test/prism/fixtures/seattlerb/defs_kwarg.txt
diff --git a/test/yarp/fixtures/seattlerb/defs_oneliner.txt b/test/prism/fixtures/seattlerb/defs_oneliner.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/defs_oneliner.txt
rename to test/prism/fixtures/seattlerb/defs_oneliner.txt
diff --git a/test/yarp/fixtures/seattlerb/defs_oneliner_eq2.txt b/test/prism/fixtures/seattlerb/defs_oneliner_eq2.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/defs_oneliner_eq2.txt
rename to test/prism/fixtures/seattlerb/defs_oneliner_eq2.txt
diff --git a/test/yarp/fixtures/seattlerb/defs_oneliner_rescue.txt b/test/prism/fixtures/seattlerb/defs_oneliner_rescue.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/defs_oneliner_rescue.txt
rename to test/prism/fixtures/seattlerb/defs_oneliner_rescue.txt
diff --git a/test/yarp/fixtures/seattlerb/difficult0_.txt b/test/prism/fixtures/seattlerb/difficult0_.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/difficult0_.txt
rename to test/prism/fixtures/seattlerb/difficult0_.txt
diff --git a/test/yarp/fixtures/seattlerb/difficult1_line_numbers.txt b/test/prism/fixtures/seattlerb/difficult1_line_numbers.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/difficult1_line_numbers.txt
rename to test/prism/fixtures/seattlerb/difficult1_line_numbers.txt
diff --git a/test/yarp/fixtures/seattlerb/difficult1_line_numbers2.txt b/test/prism/fixtures/seattlerb/difficult1_line_numbers2.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/difficult1_line_numbers2.txt
rename to test/prism/fixtures/seattlerb/difficult1_line_numbers2.txt
diff --git a/test/yarp/fixtures/seattlerb/difficult2_.txt b/test/prism/fixtures/seattlerb/difficult2_.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/difficult2_.txt
rename to test/prism/fixtures/seattlerb/difficult2_.txt
diff --git a/test/yarp/fixtures/seattlerb/difficult3_.txt b/test/prism/fixtures/seattlerb/difficult3_.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/difficult3_.txt
rename to test/prism/fixtures/seattlerb/difficult3_.txt
diff --git a/test/yarp/fixtures/seattlerb/difficult3_2.txt b/test/prism/fixtures/seattlerb/difficult3_2.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/difficult3_2.txt
rename to test/prism/fixtures/seattlerb/difficult3_2.txt
diff --git a/test/yarp/fixtures/seattlerb/difficult3_3.txt b/test/prism/fixtures/seattlerb/difficult3_3.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/difficult3_3.txt
rename to test/prism/fixtures/seattlerb/difficult3_3.txt
diff --git a/test/yarp/fixtures/seattlerb/difficult3_4.txt b/test/prism/fixtures/seattlerb/difficult3_4.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/difficult3_4.txt
rename to test/prism/fixtures/seattlerb/difficult3_4.txt
diff --git a/test/yarp/fixtures/seattlerb/difficult3_5.txt b/test/prism/fixtures/seattlerb/difficult3_5.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/difficult3_5.txt
rename to test/prism/fixtures/seattlerb/difficult3_5.txt
diff --git a/test/yarp/fixtures/seattlerb/difficult3__10.txt b/test/prism/fixtures/seattlerb/difficult3__10.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/difficult3__10.txt
rename to test/prism/fixtures/seattlerb/difficult3__10.txt
diff --git a/test/yarp/fixtures/seattlerb/difficult3__11.txt b/test/prism/fixtures/seattlerb/difficult3__11.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/difficult3__11.txt
rename to test/prism/fixtures/seattlerb/difficult3__11.txt
diff --git a/test/yarp/fixtures/seattlerb/difficult3__12.txt b/test/prism/fixtures/seattlerb/difficult3__12.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/difficult3__12.txt
rename to test/prism/fixtures/seattlerb/difficult3__12.txt
diff --git a/test/yarp/fixtures/seattlerb/difficult3__6.txt b/test/prism/fixtures/seattlerb/difficult3__6.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/difficult3__6.txt
rename to test/prism/fixtures/seattlerb/difficult3__6.txt
diff --git a/test/yarp/fixtures/seattlerb/difficult3__7.txt b/test/prism/fixtures/seattlerb/difficult3__7.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/difficult3__7.txt
rename to test/prism/fixtures/seattlerb/difficult3__7.txt
diff --git a/test/yarp/fixtures/seattlerb/difficult3__8.txt b/test/prism/fixtures/seattlerb/difficult3__8.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/difficult3__8.txt
rename to test/prism/fixtures/seattlerb/difficult3__8.txt
diff --git a/test/yarp/fixtures/seattlerb/difficult3__9.txt b/test/prism/fixtures/seattlerb/difficult3__9.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/difficult3__9.txt
rename to test/prism/fixtures/seattlerb/difficult3__9.txt
diff --git a/test/yarp/fixtures/seattlerb/difficult4__leading_dots.txt b/test/prism/fixtures/seattlerb/difficult4__leading_dots.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/difficult4__leading_dots.txt
rename to test/prism/fixtures/seattlerb/difficult4__leading_dots.txt
diff --git a/test/yarp/fixtures/seattlerb/difficult4__leading_dots2.txt b/test/prism/fixtures/seattlerb/difficult4__leading_dots2.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/difficult4__leading_dots2.txt
rename to test/prism/fixtures/seattlerb/difficult4__leading_dots2.txt
diff --git a/test/yarp/fixtures/seattlerb/difficult6_.txt b/test/prism/fixtures/seattlerb/difficult6_.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/difficult6_.txt
rename to test/prism/fixtures/seattlerb/difficult6_.txt
diff --git a/test/yarp/fixtures/seattlerb/difficult6__7.txt b/test/prism/fixtures/seattlerb/difficult6__7.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/difficult6__7.txt
rename to test/prism/fixtures/seattlerb/difficult6__7.txt
diff --git a/test/yarp/fixtures/seattlerb/difficult6__8.txt b/test/prism/fixtures/seattlerb/difficult6__8.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/difficult6__8.txt
rename to test/prism/fixtures/seattlerb/difficult6__8.txt
diff --git a/test/yarp/fixtures/seattlerb/difficult7_.txt b/test/prism/fixtures/seattlerb/difficult7_.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/difficult7_.txt
rename to test/prism/fixtures/seattlerb/difficult7_.txt
diff --git a/test/yarp/fixtures/seattlerb/do_bug.txt b/test/prism/fixtures/seattlerb/do_bug.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/do_bug.txt
rename to test/prism/fixtures/seattlerb/do_bug.txt
diff --git a/test/yarp/fixtures/seattlerb/do_lambda.txt b/test/prism/fixtures/seattlerb/do_lambda.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/do_lambda.txt
rename to test/prism/fixtures/seattlerb/do_lambda.txt
diff --git a/test/yarp/fixtures/seattlerb/dot2_nil__26.txt b/test/prism/fixtures/seattlerb/dot2_nil__26.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/dot2_nil__26.txt
rename to test/prism/fixtures/seattlerb/dot2_nil__26.txt
diff --git a/test/yarp/fixtures/seattlerb/dot3_nil__26.txt b/test/prism/fixtures/seattlerb/dot3_nil__26.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/dot3_nil__26.txt
rename to test/prism/fixtures/seattlerb/dot3_nil__26.txt
diff --git a/test/yarp/fixtures/seattlerb/dstr_evstr.txt b/test/prism/fixtures/seattlerb/dstr_evstr.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/dstr_evstr.txt
rename to test/prism/fixtures/seattlerb/dstr_evstr.txt
diff --git a/test/yarp/fixtures/seattlerb/dstr_evstr_empty_end.txt b/test/prism/fixtures/seattlerb/dstr_evstr_empty_end.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/dstr_evstr_empty_end.txt
rename to test/prism/fixtures/seattlerb/dstr_evstr_empty_end.txt
diff --git a/test/yarp/fixtures/seattlerb/dstr_lex_state.txt b/test/prism/fixtures/seattlerb/dstr_lex_state.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/dstr_lex_state.txt
rename to test/prism/fixtures/seattlerb/dstr_lex_state.txt
diff --git a/test/yarp/fixtures/seattlerb/dstr_str.txt b/test/prism/fixtures/seattlerb/dstr_str.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/dstr_str.txt
rename to test/prism/fixtures/seattlerb/dstr_str.txt
diff --git a/test/yarp/fixtures/seattlerb/dsym_esc_to_sym.txt b/test/prism/fixtures/seattlerb/dsym_esc_to_sym.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/dsym_esc_to_sym.txt
rename to test/prism/fixtures/seattlerb/dsym_esc_to_sym.txt
diff --git a/test/yarp/fixtures/seattlerb/dsym_to_sym.txt b/test/prism/fixtures/seattlerb/dsym_to_sym.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/dsym_to_sym.txt
rename to test/prism/fixtures/seattlerb/dsym_to_sym.txt
diff --git a/test/yarp/fixtures/seattlerb/eq_begin_line_numbers.txt b/test/prism/fixtures/seattlerb/eq_begin_line_numbers.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/eq_begin_line_numbers.txt
rename to test/prism/fixtures/seattlerb/eq_begin_line_numbers.txt
diff --git a/test/yarp/fixtures/seattlerb/eq_begin_why_wont_people_use_their_spacebar.txt b/test/prism/fixtures/seattlerb/eq_begin_why_wont_people_use_their_spacebar.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/eq_begin_why_wont_people_use_their_spacebar.txt
rename to test/prism/fixtures/seattlerb/eq_begin_why_wont_people_use_their_spacebar.txt
diff --git a/test/yarp/fixtures/seattlerb/evstr_evstr.txt b/test/prism/fixtures/seattlerb/evstr_evstr.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/evstr_evstr.txt
rename to test/prism/fixtures/seattlerb/evstr_evstr.txt
diff --git a/test/yarp/fixtures/seattlerb/evstr_str.txt b/test/prism/fixtures/seattlerb/evstr_str.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/evstr_str.txt
rename to test/prism/fixtures/seattlerb/evstr_str.txt
diff --git a/test/yarp/fixtures/seattlerb/expr_not_bang.txt b/test/prism/fixtures/seattlerb/expr_not_bang.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/expr_not_bang.txt
rename to test/prism/fixtures/seattlerb/expr_not_bang.txt
diff --git a/test/yarp/fixtures/seattlerb/f_kw.txt b/test/prism/fixtures/seattlerb/f_kw.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/f_kw.txt
rename to test/prism/fixtures/seattlerb/f_kw.txt
diff --git a/test/yarp/fixtures/seattlerb/f_kw__required.txt b/test/prism/fixtures/seattlerb/f_kw__required.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/f_kw__required.txt
rename to test/prism/fixtures/seattlerb/f_kw__required.txt
diff --git a/test/yarp/fixtures/seattlerb/flip2_env_lvar.txt b/test/prism/fixtures/seattlerb/flip2_env_lvar.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/flip2_env_lvar.txt
rename to test/prism/fixtures/seattlerb/flip2_env_lvar.txt
diff --git a/test/yarp/fixtures/seattlerb/float_with_if_modifier.txt b/test/prism/fixtures/seattlerb/float_with_if_modifier.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/float_with_if_modifier.txt
rename to test/prism/fixtures/seattlerb/float_with_if_modifier.txt
diff --git a/test/yarp/fixtures/seattlerb/heredoc__backslash_dos_format.txt b/test/prism/fixtures/seattlerb/heredoc__backslash_dos_format.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/heredoc__backslash_dos_format.txt
rename to test/prism/fixtures/seattlerb/heredoc__backslash_dos_format.txt
diff --git a/test/yarp/fixtures/seattlerb/heredoc_backslash_nl.txt b/test/prism/fixtures/seattlerb/heredoc_backslash_nl.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/heredoc_backslash_nl.txt
rename to test/prism/fixtures/seattlerb/heredoc_backslash_nl.txt
diff --git a/test/yarp/fixtures/seattlerb/heredoc_bad_hex_escape.txt b/test/prism/fixtures/seattlerb/heredoc_bad_hex_escape.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/heredoc_bad_hex_escape.txt
rename to test/prism/fixtures/seattlerb/heredoc_bad_hex_escape.txt
diff --git a/test/yarp/fixtures/seattlerb/heredoc_bad_oct_escape.txt b/test/prism/fixtures/seattlerb/heredoc_bad_oct_escape.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/heredoc_bad_oct_escape.txt
rename to test/prism/fixtures/seattlerb/heredoc_bad_oct_escape.txt
diff --git a/test/yarp/fixtures/seattlerb/heredoc_comma_arg.txt b/test/prism/fixtures/seattlerb/heredoc_comma_arg.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/heredoc_comma_arg.txt
rename to test/prism/fixtures/seattlerb/heredoc_comma_arg.txt
diff --git a/test/yarp/fixtures/seattlerb/heredoc_lineno.txt b/test/prism/fixtures/seattlerb/heredoc_lineno.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/heredoc_lineno.txt
rename to test/prism/fixtures/seattlerb/heredoc_lineno.txt
diff --git a/test/yarp/fixtures/seattlerb/heredoc_nested.txt b/test/prism/fixtures/seattlerb/heredoc_nested.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/heredoc_nested.txt
rename to test/prism/fixtures/seattlerb/heredoc_nested.txt
diff --git a/test/yarp/fixtures/seattlerb/heredoc_squiggly.txt b/test/prism/fixtures/seattlerb/heredoc_squiggly.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/heredoc_squiggly.txt
rename to test/prism/fixtures/seattlerb/heredoc_squiggly.txt
diff --git a/test/yarp/fixtures/seattlerb/heredoc_squiggly_blank_line_plus_interpolation.txt b/test/prism/fixtures/seattlerb/heredoc_squiggly_blank_line_plus_interpolation.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/heredoc_squiggly_blank_line_plus_interpolation.txt
rename to test/prism/fixtures/seattlerb/heredoc_squiggly_blank_line_plus_interpolation.txt
diff --git a/test/yarp/fixtures/seattlerb/heredoc_squiggly_blank_lines.txt b/test/prism/fixtures/seattlerb/heredoc_squiggly_blank_lines.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/heredoc_squiggly_blank_lines.txt
rename to test/prism/fixtures/seattlerb/heredoc_squiggly_blank_lines.txt
diff --git a/test/yarp/fixtures/seattlerb/heredoc_squiggly_empty.txt b/test/prism/fixtures/seattlerb/heredoc_squiggly_empty.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/heredoc_squiggly_empty.txt
rename to test/prism/fixtures/seattlerb/heredoc_squiggly_empty.txt
diff --git a/test/yarp/fixtures/seattlerb/heredoc_squiggly_interp.txt b/test/prism/fixtures/seattlerb/heredoc_squiggly_interp.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/heredoc_squiggly_interp.txt
rename to test/prism/fixtures/seattlerb/heredoc_squiggly_interp.txt
diff --git a/test/yarp/fixtures/seattlerb/heredoc_squiggly_no_indent.txt b/test/prism/fixtures/seattlerb/heredoc_squiggly_no_indent.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/heredoc_squiggly_no_indent.txt
rename to test/prism/fixtures/seattlerb/heredoc_squiggly_no_indent.txt
diff --git a/test/yarp/fixtures/seattlerb/heredoc_squiggly_tabs.txt b/test/prism/fixtures/seattlerb/heredoc_squiggly_tabs.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/heredoc_squiggly_tabs.txt
rename to test/prism/fixtures/seattlerb/heredoc_squiggly_tabs.txt
diff --git a/test/yarp/fixtures/seattlerb/heredoc_squiggly_tabs_extra.txt b/test/prism/fixtures/seattlerb/heredoc_squiggly_tabs_extra.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/heredoc_squiggly_tabs_extra.txt
rename to test/prism/fixtures/seattlerb/heredoc_squiggly_tabs_extra.txt
diff --git a/test/yarp/fixtures/seattlerb/heredoc_squiggly_visually_blank_lines.txt b/test/prism/fixtures/seattlerb/heredoc_squiggly_visually_blank_lines.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/heredoc_squiggly_visually_blank_lines.txt
rename to test/prism/fixtures/seattlerb/heredoc_squiggly_visually_blank_lines.txt
diff --git a/test/yarp/fixtures/seattlerb/heredoc_trailing_slash_continued_call.txt b/test/prism/fixtures/seattlerb/heredoc_trailing_slash_continued_call.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/heredoc_trailing_slash_continued_call.txt
rename to test/prism/fixtures/seattlerb/heredoc_trailing_slash_continued_call.txt
diff --git a/test/yarp/fixtures/seattlerb/heredoc_unicode.txt b/test/prism/fixtures/seattlerb/heredoc_unicode.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/heredoc_unicode.txt
rename to test/prism/fixtures/seattlerb/heredoc_unicode.txt
diff --git a/test/yarp/fixtures/seattlerb/heredoc_with_carriage_return_escapes.txt b/test/prism/fixtures/seattlerb/heredoc_with_carriage_return_escapes.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/heredoc_with_carriage_return_escapes.txt
rename to test/prism/fixtures/seattlerb/heredoc_with_carriage_return_escapes.txt
diff --git a/test/yarp/fixtures/seattlerb/heredoc_with_carriage_return_escapes_windows.txt b/test/prism/fixtures/seattlerb/heredoc_with_carriage_return_escapes_windows.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/heredoc_with_carriage_return_escapes_windows.txt
rename to test/prism/fixtures/seattlerb/heredoc_with_carriage_return_escapes_windows.txt
diff --git a/test/yarp/fixtures/seattlerb/heredoc_with_extra_carriage_horrible_mix.txt b/test/prism/fixtures/seattlerb/heredoc_with_extra_carriage_horrible_mix.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/heredoc_with_extra_carriage_horrible_mix.txt
rename to test/prism/fixtures/seattlerb/heredoc_with_extra_carriage_horrible_mix.txt
diff --git a/test/yarp/fixtures/seattlerb/heredoc_with_extra_carriage_returns.txt b/test/prism/fixtures/seattlerb/heredoc_with_extra_carriage_returns.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/heredoc_with_extra_carriage_returns.txt
rename to test/prism/fixtures/seattlerb/heredoc_with_extra_carriage_returns.txt
diff --git a/test/yarp/fixtures/seattlerb/heredoc_with_extra_carriage_returns_windows.txt b/test/prism/fixtures/seattlerb/heredoc_with_extra_carriage_returns_windows.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/heredoc_with_extra_carriage_returns_windows.txt
rename to test/prism/fixtures/seattlerb/heredoc_with_extra_carriage_returns_windows.txt
diff --git a/test/yarp/fixtures/seattlerb/heredoc_with_interpolation_and_carriage_return_escapes.txt b/test/prism/fixtures/seattlerb/heredoc_with_interpolation_and_carriage_return_escapes.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/heredoc_with_interpolation_and_carriage_return_escapes.txt
rename to test/prism/fixtures/seattlerb/heredoc_with_interpolation_and_carriage_return_escapes.txt
diff --git a/test/yarp/fixtures/seattlerb/heredoc_with_interpolation_and_carriage_return_escapes_windows.txt b/test/prism/fixtures/seattlerb/heredoc_with_interpolation_and_carriage_return_escapes_windows.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/heredoc_with_interpolation_and_carriage_return_escapes_windows.txt
rename to test/prism/fixtures/seattlerb/heredoc_with_interpolation_and_carriage_return_escapes_windows.txt
diff --git a/test/yarp/fixtures/seattlerb/heredoc_with_not_global_interpolation.txt b/test/prism/fixtures/seattlerb/heredoc_with_not_global_interpolation.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/heredoc_with_not_global_interpolation.txt
rename to test/prism/fixtures/seattlerb/heredoc_with_not_global_interpolation.txt
diff --git a/test/yarp/fixtures/seattlerb/heredoc_with_only_carriage_returns.txt b/test/prism/fixtures/seattlerb/heredoc_with_only_carriage_returns.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/heredoc_with_only_carriage_returns.txt
rename to test/prism/fixtures/seattlerb/heredoc_with_only_carriage_returns.txt
diff --git a/test/yarp/fixtures/seattlerb/heredoc_with_only_carriage_returns_windows.txt b/test/prism/fixtures/seattlerb/heredoc_with_only_carriage_returns_windows.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/heredoc_with_only_carriage_returns_windows.txt
rename to test/prism/fixtures/seattlerb/heredoc_with_only_carriage_returns_windows.txt
diff --git a/test/yarp/fixtures/seattlerb/if_elsif.txt b/test/prism/fixtures/seattlerb/if_elsif.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/if_elsif.txt
rename to test/prism/fixtures/seattlerb/if_elsif.txt
diff --git a/test/yarp/fixtures/seattlerb/if_symbol.txt b/test/prism/fixtures/seattlerb/if_symbol.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/if_symbol.txt
rename to test/prism/fixtures/seattlerb/if_symbol.txt
diff --git a/test/yarp/fixtures/seattlerb/in_expr_no_case.txt b/test/prism/fixtures/seattlerb/in_expr_no_case.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/in_expr_no_case.txt
rename to test/prism/fixtures/seattlerb/in_expr_no_case.txt
diff --git a/test/yarp/fixtures/seattlerb/index_0.txt b/test/prism/fixtures/seattlerb/index_0.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/index_0.txt
rename to test/prism/fixtures/seattlerb/index_0.txt
diff --git a/test/yarp/fixtures/seattlerb/index_0_opasgn.txt b/test/prism/fixtures/seattlerb/index_0_opasgn.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/index_0_opasgn.txt
rename to test/prism/fixtures/seattlerb/index_0_opasgn.txt
diff --git a/test/yarp/fixtures/seattlerb/integer_with_if_modifier.txt b/test/prism/fixtures/seattlerb/integer_with_if_modifier.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/integer_with_if_modifier.txt
rename to test/prism/fixtures/seattlerb/integer_with_if_modifier.txt
diff --git a/test/yarp/fixtures/seattlerb/interpolated_symbol_array_line_breaks.txt b/test/prism/fixtures/seattlerb/interpolated_symbol_array_line_breaks.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/interpolated_symbol_array_line_breaks.txt
rename to test/prism/fixtures/seattlerb/interpolated_symbol_array_line_breaks.txt
diff --git a/test/yarp/fixtures/seattlerb/interpolated_word_array_line_breaks.txt b/test/prism/fixtures/seattlerb/interpolated_word_array_line_breaks.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/interpolated_word_array_line_breaks.txt
rename to test/prism/fixtures/seattlerb/interpolated_word_array_line_breaks.txt
diff --git a/test/yarp/fixtures/seattlerb/iter_args_1.txt b/test/prism/fixtures/seattlerb/iter_args_1.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/iter_args_1.txt
rename to test/prism/fixtures/seattlerb/iter_args_1.txt
diff --git a/test/yarp/fixtures/seattlerb/iter_args_10_1.txt b/test/prism/fixtures/seattlerb/iter_args_10_1.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/iter_args_10_1.txt
rename to test/prism/fixtures/seattlerb/iter_args_10_1.txt
diff --git a/test/yarp/fixtures/seattlerb/iter_args_10_2.txt b/test/prism/fixtures/seattlerb/iter_args_10_2.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/iter_args_10_2.txt
rename to test/prism/fixtures/seattlerb/iter_args_10_2.txt
diff --git a/test/yarp/fixtures/seattlerb/iter_args_11_1.txt b/test/prism/fixtures/seattlerb/iter_args_11_1.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/iter_args_11_1.txt
rename to test/prism/fixtures/seattlerb/iter_args_11_1.txt
diff --git a/test/yarp/fixtures/seattlerb/iter_args_11_2.txt b/test/prism/fixtures/seattlerb/iter_args_11_2.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/iter_args_11_2.txt
rename to test/prism/fixtures/seattlerb/iter_args_11_2.txt
diff --git a/test/yarp/fixtures/seattlerb/iter_args_2__19.txt b/test/prism/fixtures/seattlerb/iter_args_2__19.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/iter_args_2__19.txt
rename to test/prism/fixtures/seattlerb/iter_args_2__19.txt
diff --git a/test/yarp/fixtures/seattlerb/iter_args_3.txt b/test/prism/fixtures/seattlerb/iter_args_3.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/iter_args_3.txt
rename to test/prism/fixtures/seattlerb/iter_args_3.txt
diff --git a/test/yarp/fixtures/seattlerb/iter_args_4.txt b/test/prism/fixtures/seattlerb/iter_args_4.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/iter_args_4.txt
rename to test/prism/fixtures/seattlerb/iter_args_4.txt
diff --git a/test/yarp/fixtures/seattlerb/iter_args_5.txt b/test/prism/fixtures/seattlerb/iter_args_5.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/iter_args_5.txt
rename to test/prism/fixtures/seattlerb/iter_args_5.txt
diff --git a/test/yarp/fixtures/seattlerb/iter_args_6.txt b/test/prism/fixtures/seattlerb/iter_args_6.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/iter_args_6.txt
rename to test/prism/fixtures/seattlerb/iter_args_6.txt
diff --git a/test/yarp/fixtures/seattlerb/iter_args_7_1.txt b/test/prism/fixtures/seattlerb/iter_args_7_1.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/iter_args_7_1.txt
rename to test/prism/fixtures/seattlerb/iter_args_7_1.txt
diff --git a/test/yarp/fixtures/seattlerb/iter_args_7_2.txt b/test/prism/fixtures/seattlerb/iter_args_7_2.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/iter_args_7_2.txt
rename to test/prism/fixtures/seattlerb/iter_args_7_2.txt
diff --git a/test/yarp/fixtures/seattlerb/iter_args_8_1.txt b/test/prism/fixtures/seattlerb/iter_args_8_1.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/iter_args_8_1.txt
rename to test/prism/fixtures/seattlerb/iter_args_8_1.txt
diff --git a/test/yarp/fixtures/seattlerb/iter_args_8_2.txt b/test/prism/fixtures/seattlerb/iter_args_8_2.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/iter_args_8_2.txt
rename to test/prism/fixtures/seattlerb/iter_args_8_2.txt
diff --git a/test/yarp/fixtures/seattlerb/iter_args_9_1.txt b/test/prism/fixtures/seattlerb/iter_args_9_1.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/iter_args_9_1.txt
rename to test/prism/fixtures/seattlerb/iter_args_9_1.txt
diff --git a/test/yarp/fixtures/seattlerb/iter_args_9_2.txt b/test/prism/fixtures/seattlerb/iter_args_9_2.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/iter_args_9_2.txt
rename to test/prism/fixtures/seattlerb/iter_args_9_2.txt
diff --git a/test/yarp/fixtures/seattlerb/iter_kwarg.txt b/test/prism/fixtures/seattlerb/iter_kwarg.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/iter_kwarg.txt
rename to test/prism/fixtures/seattlerb/iter_kwarg.txt
diff --git a/test/yarp/fixtures/seattlerb/iter_kwarg_kwsplat.txt b/test/prism/fixtures/seattlerb/iter_kwarg_kwsplat.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/iter_kwarg_kwsplat.txt
rename to test/prism/fixtures/seattlerb/iter_kwarg_kwsplat.txt
diff --git a/test/yarp/fixtures/seattlerb/label_vs_string.txt b/test/prism/fixtures/seattlerb/label_vs_string.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/label_vs_string.txt
rename to test/prism/fixtures/seattlerb/label_vs_string.txt
diff --git a/test/yarp/fixtures/seattlerb/lambda_do_vs_brace.txt b/test/prism/fixtures/seattlerb/lambda_do_vs_brace.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/lambda_do_vs_brace.txt
rename to test/prism/fixtures/seattlerb/lambda_do_vs_brace.txt
diff --git a/test/yarp/fixtures/seattlerb/lasgn_arg_rescue_arg.txt b/test/prism/fixtures/seattlerb/lasgn_arg_rescue_arg.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/lasgn_arg_rescue_arg.txt
rename to test/prism/fixtures/seattlerb/lasgn_arg_rescue_arg.txt
diff --git a/test/yarp/fixtures/seattlerb/lasgn_call_bracket_rescue_arg.txt b/test/prism/fixtures/seattlerb/lasgn_call_bracket_rescue_arg.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/lasgn_call_bracket_rescue_arg.txt
rename to test/prism/fixtures/seattlerb/lasgn_call_bracket_rescue_arg.txt
diff --git a/test/yarp/fixtures/seattlerb/lasgn_call_nobracket_rescue_arg.txt b/test/prism/fixtures/seattlerb/lasgn_call_nobracket_rescue_arg.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/lasgn_call_nobracket_rescue_arg.txt
rename to test/prism/fixtures/seattlerb/lasgn_call_nobracket_rescue_arg.txt
diff --git a/test/yarp/fixtures/seattlerb/lasgn_command.txt b/test/prism/fixtures/seattlerb/lasgn_command.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/lasgn_command.txt
rename to test/prism/fixtures/seattlerb/lasgn_command.txt
diff --git a/test/yarp/fixtures/seattlerb/lasgn_env.txt b/test/prism/fixtures/seattlerb/lasgn_env.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/lasgn_env.txt
rename to test/prism/fixtures/seattlerb/lasgn_env.txt
diff --git a/test/yarp/fixtures/seattlerb/lasgn_ivar_env.txt b/test/prism/fixtures/seattlerb/lasgn_ivar_env.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/lasgn_ivar_env.txt
rename to test/prism/fixtures/seattlerb/lasgn_ivar_env.txt
diff --git a/test/yarp/fixtures/seattlerb/lasgn_lasgn_command_call.txt b/test/prism/fixtures/seattlerb/lasgn_lasgn_command_call.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/lasgn_lasgn_command_call.txt
rename to test/prism/fixtures/seattlerb/lasgn_lasgn_command_call.txt
diff --git a/test/yarp/fixtures/seattlerb/lasgn_middle_splat.txt b/test/prism/fixtures/seattlerb/lasgn_middle_splat.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/lasgn_middle_splat.txt
rename to test/prism/fixtures/seattlerb/lasgn_middle_splat.txt
diff --git a/test/yarp/fixtures/seattlerb/magic_encoding_comment.txt b/test/prism/fixtures/seattlerb/magic_encoding_comment.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/magic_encoding_comment.txt
rename to test/prism/fixtures/seattlerb/magic_encoding_comment.txt
diff --git a/test/yarp/fixtures/seattlerb/masgn_anon_splat_arg.txt b/test/prism/fixtures/seattlerb/masgn_anon_splat_arg.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/masgn_anon_splat_arg.txt
rename to test/prism/fixtures/seattlerb/masgn_anon_splat_arg.txt
diff --git a/test/yarp/fixtures/seattlerb/masgn_arg_colon_arg.txt b/test/prism/fixtures/seattlerb/masgn_arg_colon_arg.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/masgn_arg_colon_arg.txt
rename to test/prism/fixtures/seattlerb/masgn_arg_colon_arg.txt
diff --git a/test/yarp/fixtures/seattlerb/masgn_arg_ident.txt b/test/prism/fixtures/seattlerb/masgn_arg_ident.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/masgn_arg_ident.txt
rename to test/prism/fixtures/seattlerb/masgn_arg_ident.txt
diff --git a/test/yarp/fixtures/seattlerb/masgn_arg_splat_arg.txt b/test/prism/fixtures/seattlerb/masgn_arg_splat_arg.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/masgn_arg_splat_arg.txt
rename to test/prism/fixtures/seattlerb/masgn_arg_splat_arg.txt
diff --git a/test/yarp/fixtures/seattlerb/masgn_colon2.txt b/test/prism/fixtures/seattlerb/masgn_colon2.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/masgn_colon2.txt
rename to test/prism/fixtures/seattlerb/masgn_colon2.txt
diff --git a/test/yarp/fixtures/seattlerb/masgn_colon3.txt b/test/prism/fixtures/seattlerb/masgn_colon3.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/masgn_colon3.txt
rename to test/prism/fixtures/seattlerb/masgn_colon3.txt
diff --git a/test/yarp/fixtures/seattlerb/masgn_command_call.txt b/test/prism/fixtures/seattlerb/masgn_command_call.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/masgn_command_call.txt
rename to test/prism/fixtures/seattlerb/masgn_command_call.txt
diff --git a/test/yarp/fixtures/seattlerb/masgn_double_paren.txt b/test/prism/fixtures/seattlerb/masgn_double_paren.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/masgn_double_paren.txt
rename to test/prism/fixtures/seattlerb/masgn_double_paren.txt
diff --git a/test/yarp/fixtures/seattlerb/masgn_lhs_splat.txt b/test/prism/fixtures/seattlerb/masgn_lhs_splat.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/masgn_lhs_splat.txt
rename to test/prism/fixtures/seattlerb/masgn_lhs_splat.txt
diff --git a/test/yarp/fixtures/seattlerb/masgn_paren.txt b/test/prism/fixtures/seattlerb/masgn_paren.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/masgn_paren.txt
rename to test/prism/fixtures/seattlerb/masgn_paren.txt
diff --git a/test/yarp/fixtures/seattlerb/masgn_splat_arg.txt b/test/prism/fixtures/seattlerb/masgn_splat_arg.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/masgn_splat_arg.txt
rename to test/prism/fixtures/seattlerb/masgn_splat_arg.txt
diff --git a/test/yarp/fixtures/seattlerb/masgn_splat_arg_arg.txt b/test/prism/fixtures/seattlerb/masgn_splat_arg_arg.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/masgn_splat_arg_arg.txt
rename to test/prism/fixtures/seattlerb/masgn_splat_arg_arg.txt
diff --git a/test/yarp/fixtures/seattlerb/masgn_star.txt b/test/prism/fixtures/seattlerb/masgn_star.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/masgn_star.txt
rename to test/prism/fixtures/seattlerb/masgn_star.txt
diff --git a/test/yarp/fixtures/seattlerb/masgn_var_star_var.txt b/test/prism/fixtures/seattlerb/masgn_var_star_var.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/masgn_var_star_var.txt
rename to test/prism/fixtures/seattlerb/masgn_var_star_var.txt
diff --git a/test/yarp/fixtures/seattlerb/messy_op_asgn_lineno.txt b/test/prism/fixtures/seattlerb/messy_op_asgn_lineno.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/messy_op_asgn_lineno.txt
rename to test/prism/fixtures/seattlerb/messy_op_asgn_lineno.txt
diff --git a/test/yarp/fixtures/seattlerb/method_call_assoc_trailing_comma.txt b/test/prism/fixtures/seattlerb/method_call_assoc_trailing_comma.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/method_call_assoc_trailing_comma.txt
rename to test/prism/fixtures/seattlerb/method_call_assoc_trailing_comma.txt
diff --git a/test/yarp/fixtures/seattlerb/method_call_trailing_comma.txt b/test/prism/fixtures/seattlerb/method_call_trailing_comma.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/method_call_trailing_comma.txt
rename to test/prism/fixtures/seattlerb/method_call_trailing_comma.txt
diff --git a/test/yarp/fixtures/seattlerb/mlhs_back_anonsplat.txt b/test/prism/fixtures/seattlerb/mlhs_back_anonsplat.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/mlhs_back_anonsplat.txt
rename to test/prism/fixtures/seattlerb/mlhs_back_anonsplat.txt
diff --git a/test/yarp/fixtures/seattlerb/mlhs_back_splat.txt b/test/prism/fixtures/seattlerb/mlhs_back_splat.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/mlhs_back_splat.txt
rename to test/prism/fixtures/seattlerb/mlhs_back_splat.txt
diff --git a/test/yarp/fixtures/seattlerb/mlhs_front_anonsplat.txt b/test/prism/fixtures/seattlerb/mlhs_front_anonsplat.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/mlhs_front_anonsplat.txt
rename to test/prism/fixtures/seattlerb/mlhs_front_anonsplat.txt
diff --git a/test/yarp/fixtures/seattlerb/mlhs_front_splat.txt b/test/prism/fixtures/seattlerb/mlhs_front_splat.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/mlhs_front_splat.txt
rename to test/prism/fixtures/seattlerb/mlhs_front_splat.txt
diff --git a/test/yarp/fixtures/seattlerb/mlhs_keyword.txt b/test/prism/fixtures/seattlerb/mlhs_keyword.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/mlhs_keyword.txt
rename to test/prism/fixtures/seattlerb/mlhs_keyword.txt
diff --git a/test/yarp/fixtures/seattlerb/mlhs_mid_anonsplat.txt b/test/prism/fixtures/seattlerb/mlhs_mid_anonsplat.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/mlhs_mid_anonsplat.txt
rename to test/prism/fixtures/seattlerb/mlhs_mid_anonsplat.txt
diff --git a/test/yarp/fixtures/seattlerb/mlhs_mid_splat.txt b/test/prism/fixtures/seattlerb/mlhs_mid_splat.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/mlhs_mid_splat.txt
rename to test/prism/fixtures/seattlerb/mlhs_mid_splat.txt
diff --git a/test/yarp/fixtures/seattlerb/mlhs_rescue.txt b/test/prism/fixtures/seattlerb/mlhs_rescue.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/mlhs_rescue.txt
rename to test/prism/fixtures/seattlerb/mlhs_rescue.txt
diff --git a/test/yarp/fixtures/seattlerb/module_comments.txt b/test/prism/fixtures/seattlerb/module_comments.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/module_comments.txt
rename to test/prism/fixtures/seattlerb/module_comments.txt
diff --git a/test/yarp/fixtures/seattlerb/multiline_hash_declaration.txt b/test/prism/fixtures/seattlerb/multiline_hash_declaration.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/multiline_hash_declaration.txt
rename to test/prism/fixtures/seattlerb/multiline_hash_declaration.txt
diff --git a/test/yarp/fixtures/seattlerb/non_interpolated_symbol_array_line_breaks.txt b/test/prism/fixtures/seattlerb/non_interpolated_symbol_array_line_breaks.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/non_interpolated_symbol_array_line_breaks.txt
rename to test/prism/fixtures/seattlerb/non_interpolated_symbol_array_line_breaks.txt
diff --git a/test/yarp/fixtures/seattlerb/non_interpolated_word_array_line_breaks.txt b/test/prism/fixtures/seattlerb/non_interpolated_word_array_line_breaks.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/non_interpolated_word_array_line_breaks.txt
rename to test/prism/fixtures/seattlerb/non_interpolated_word_array_line_breaks.txt
diff --git a/test/yarp/fixtures/seattlerb/op_asgn_command_call.txt b/test/prism/fixtures/seattlerb/op_asgn_command_call.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/op_asgn_command_call.txt
rename to test/prism/fixtures/seattlerb/op_asgn_command_call.txt
diff --git a/test/yarp/fixtures/seattlerb/op_asgn_dot_ident_command_call.txt b/test/prism/fixtures/seattlerb/op_asgn_dot_ident_command_call.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/op_asgn_dot_ident_command_call.txt
rename to test/prism/fixtures/seattlerb/op_asgn_dot_ident_command_call.txt
diff --git a/test/yarp/fixtures/seattlerb/op_asgn_index_command_call.txt b/test/prism/fixtures/seattlerb/op_asgn_index_command_call.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/op_asgn_index_command_call.txt
rename to test/prism/fixtures/seattlerb/op_asgn_index_command_call.txt
diff --git a/test/yarp/fixtures/seattlerb/op_asgn_primary_colon_const_command_call.txt b/test/prism/fixtures/seattlerb/op_asgn_primary_colon_const_command_call.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/op_asgn_primary_colon_const_command_call.txt
rename to test/prism/fixtures/seattlerb/op_asgn_primary_colon_const_command_call.txt
diff --git a/test/yarp/fixtures/seattlerb/op_asgn_primary_colon_identifier1.txt b/test/prism/fixtures/seattlerb/op_asgn_primary_colon_identifier1.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/op_asgn_primary_colon_identifier1.txt
rename to test/prism/fixtures/seattlerb/op_asgn_primary_colon_identifier1.txt
diff --git a/test/yarp/fixtures/seattlerb/op_asgn_primary_colon_identifier_command_call.txt b/test/prism/fixtures/seattlerb/op_asgn_primary_colon_identifier_command_call.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/op_asgn_primary_colon_identifier_command_call.txt
rename to test/prism/fixtures/seattlerb/op_asgn_primary_colon_identifier_command_call.txt
diff --git a/test/yarp/fixtures/seattlerb/op_asgn_val_dot_ident_command_call.txt b/test/prism/fixtures/seattlerb/op_asgn_val_dot_ident_command_call.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/op_asgn_val_dot_ident_command_call.txt
rename to test/prism/fixtures/seattlerb/op_asgn_val_dot_ident_command_call.txt
diff --git a/test/yarp/fixtures/seattlerb/parse_def_special_name.txt b/test/prism/fixtures/seattlerb/parse_def_special_name.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/parse_def_special_name.txt
rename to test/prism/fixtures/seattlerb/parse_def_special_name.txt
diff --git a/test/yarp/fixtures/seattlerb/parse_if_not_canonical.txt b/test/prism/fixtures/seattlerb/parse_if_not_canonical.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/parse_if_not_canonical.txt
rename to test/prism/fixtures/seattlerb/parse_if_not_canonical.txt
diff --git a/test/yarp/fixtures/seattlerb/parse_if_not_noncanonical.txt b/test/prism/fixtures/seattlerb/parse_if_not_noncanonical.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/parse_if_not_noncanonical.txt
rename to test/prism/fixtures/seattlerb/parse_if_not_noncanonical.txt
diff --git a/test/yarp/fixtures/seattlerb/parse_line_block.txt b/test/prism/fixtures/seattlerb/parse_line_block.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/parse_line_block.txt
rename to test/prism/fixtures/seattlerb/parse_line_block.txt
diff --git a/test/yarp/fixtures/seattlerb/parse_line_block_inline_comment.txt b/test/prism/fixtures/seattlerb/parse_line_block_inline_comment.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/parse_line_block_inline_comment.txt
rename to test/prism/fixtures/seattlerb/parse_line_block_inline_comment.txt
diff --git a/test/yarp/fixtures/seattlerb/parse_line_block_inline_comment_leading_newlines.txt b/test/prism/fixtures/seattlerb/parse_line_block_inline_comment_leading_newlines.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/parse_line_block_inline_comment_leading_newlines.txt
rename to test/prism/fixtures/seattlerb/parse_line_block_inline_comment_leading_newlines.txt
diff --git a/test/yarp/fixtures/seattlerb/parse_line_block_inline_multiline_comment.txt b/test/prism/fixtures/seattlerb/parse_line_block_inline_multiline_comment.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/parse_line_block_inline_multiline_comment.txt
rename to test/prism/fixtures/seattlerb/parse_line_block_inline_multiline_comment.txt
diff --git a/test/yarp/fixtures/seattlerb/parse_line_call_ivar_arg_no_parens_line_break.txt b/test/prism/fixtures/seattlerb/parse_line_call_ivar_arg_no_parens_line_break.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/parse_line_call_ivar_arg_no_parens_line_break.txt
rename to test/prism/fixtures/seattlerb/parse_line_call_ivar_arg_no_parens_line_break.txt
diff --git a/test/yarp/fixtures/seattlerb/parse_line_call_ivar_line_break_paren.txt b/test/prism/fixtures/seattlerb/parse_line_call_ivar_line_break_paren.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/parse_line_call_ivar_line_break_paren.txt
rename to test/prism/fixtures/seattlerb/parse_line_call_ivar_line_break_paren.txt
diff --git a/test/yarp/fixtures/seattlerb/parse_line_call_no_args.txt b/test/prism/fixtures/seattlerb/parse_line_call_no_args.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/parse_line_call_no_args.txt
rename to test/prism/fixtures/seattlerb/parse_line_call_no_args.txt
diff --git a/test/yarp/fixtures/seattlerb/parse_line_defn_complex.txt b/test/prism/fixtures/seattlerb/parse_line_defn_complex.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/parse_line_defn_complex.txt
rename to test/prism/fixtures/seattlerb/parse_line_defn_complex.txt
diff --git a/test/yarp/fixtures/seattlerb/parse_line_defn_no_parens.txt b/test/prism/fixtures/seattlerb/parse_line_defn_no_parens.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/parse_line_defn_no_parens.txt
rename to test/prism/fixtures/seattlerb/parse_line_defn_no_parens.txt
diff --git a/test/yarp/fixtures/seattlerb/parse_line_defn_no_parens_args.txt b/test/prism/fixtures/seattlerb/parse_line_defn_no_parens_args.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/parse_line_defn_no_parens_args.txt
rename to test/prism/fixtures/seattlerb/parse_line_defn_no_parens_args.txt
diff --git a/test/yarp/fixtures/seattlerb/parse_line_dot2.txt b/test/prism/fixtures/seattlerb/parse_line_dot2.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/parse_line_dot2.txt
rename to test/prism/fixtures/seattlerb/parse_line_dot2.txt
diff --git a/test/yarp/fixtures/seattlerb/parse_line_dot2_open.txt b/test/prism/fixtures/seattlerb/parse_line_dot2_open.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/parse_line_dot2_open.txt
rename to test/prism/fixtures/seattlerb/parse_line_dot2_open.txt
diff --git a/test/yarp/fixtures/seattlerb/parse_line_dot3.txt b/test/prism/fixtures/seattlerb/parse_line_dot3.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/parse_line_dot3.txt
rename to test/prism/fixtures/seattlerb/parse_line_dot3.txt
diff --git a/test/yarp/fixtures/seattlerb/parse_line_dot3_open.txt b/test/prism/fixtures/seattlerb/parse_line_dot3_open.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/parse_line_dot3_open.txt
rename to test/prism/fixtures/seattlerb/parse_line_dot3_open.txt
diff --git a/test/yarp/fixtures/seattlerb/parse_line_dstr_escaped_newline.txt b/test/prism/fixtures/seattlerb/parse_line_dstr_escaped_newline.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/parse_line_dstr_escaped_newline.txt
rename to test/prism/fixtures/seattlerb/parse_line_dstr_escaped_newline.txt
diff --git a/test/yarp/fixtures/seattlerb/parse_line_dstr_soft_newline.txt b/test/prism/fixtures/seattlerb/parse_line_dstr_soft_newline.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/parse_line_dstr_soft_newline.txt
rename to test/prism/fixtures/seattlerb/parse_line_dstr_soft_newline.txt
diff --git a/test/yarp/fixtures/seattlerb/parse_line_evstr_after_break.txt b/test/prism/fixtures/seattlerb/parse_line_evstr_after_break.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/parse_line_evstr_after_break.txt
rename to test/prism/fixtures/seattlerb/parse_line_evstr_after_break.txt
diff --git a/test/yarp/fixtures/seattlerb/parse_line_hash_lit.txt b/test/prism/fixtures/seattlerb/parse_line_hash_lit.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/parse_line_hash_lit.txt
rename to test/prism/fixtures/seattlerb/parse_line_hash_lit.txt
diff --git a/test/yarp/fixtures/seattlerb/parse_line_heredoc.txt b/test/prism/fixtures/seattlerb/parse_line_heredoc.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/parse_line_heredoc.txt
rename to test/prism/fixtures/seattlerb/parse_line_heredoc.txt
diff --git a/test/yarp/fixtures/seattlerb/parse_line_heredoc_evstr.txt b/test/prism/fixtures/seattlerb/parse_line_heredoc_evstr.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/parse_line_heredoc_evstr.txt
rename to test/prism/fixtures/seattlerb/parse_line_heredoc_evstr.txt
diff --git a/test/yarp/fixtures/seattlerb/parse_line_heredoc_hardnewline.txt b/test/prism/fixtures/seattlerb/parse_line_heredoc_hardnewline.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/parse_line_heredoc_hardnewline.txt
rename to test/prism/fixtures/seattlerb/parse_line_heredoc_hardnewline.txt
diff --git a/test/yarp/fixtures/seattlerb/parse_line_heredoc_regexp_chars.txt b/test/prism/fixtures/seattlerb/parse_line_heredoc_regexp_chars.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/parse_line_heredoc_regexp_chars.txt
rename to test/prism/fixtures/seattlerb/parse_line_heredoc_regexp_chars.txt
diff --git a/test/yarp/fixtures/seattlerb/parse_line_iter_call_no_parens.txt b/test/prism/fixtures/seattlerb/parse_line_iter_call_no_parens.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/parse_line_iter_call_no_parens.txt
rename to test/prism/fixtures/seattlerb/parse_line_iter_call_no_parens.txt
diff --git a/test/yarp/fixtures/seattlerb/parse_line_iter_call_parens.txt b/test/prism/fixtures/seattlerb/parse_line_iter_call_parens.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/parse_line_iter_call_parens.txt
rename to test/prism/fixtures/seattlerb/parse_line_iter_call_parens.txt
diff --git a/test/yarp/fixtures/seattlerb/parse_line_multiline_str.txt b/test/prism/fixtures/seattlerb/parse_line_multiline_str.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/parse_line_multiline_str.txt
rename to test/prism/fixtures/seattlerb/parse_line_multiline_str.txt
diff --git a/test/yarp/fixtures/seattlerb/parse_line_multiline_str_literal_n.txt b/test/prism/fixtures/seattlerb/parse_line_multiline_str_literal_n.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/parse_line_multiline_str_literal_n.txt
rename to test/prism/fixtures/seattlerb/parse_line_multiline_str_literal_n.txt
diff --git a/test/yarp/fixtures/seattlerb/parse_line_newlines.txt b/test/prism/fixtures/seattlerb/parse_line_newlines.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/parse_line_newlines.txt
rename to test/prism/fixtures/seattlerb/parse_line_newlines.txt
diff --git a/test/yarp/fixtures/seattlerb/parse_line_op_asgn.txt b/test/prism/fixtures/seattlerb/parse_line_op_asgn.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/parse_line_op_asgn.txt
rename to test/prism/fixtures/seattlerb/parse_line_op_asgn.txt
diff --git a/test/yarp/fixtures/seattlerb/parse_line_postexe.txt b/test/prism/fixtures/seattlerb/parse_line_postexe.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/parse_line_postexe.txt
rename to test/prism/fixtures/seattlerb/parse_line_postexe.txt
diff --git a/test/yarp/fixtures/seattlerb/parse_line_preexe.txt b/test/prism/fixtures/seattlerb/parse_line_preexe.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/parse_line_preexe.txt
rename to test/prism/fixtures/seattlerb/parse_line_preexe.txt
diff --git a/test/yarp/fixtures/seattlerb/parse_line_rescue.txt b/test/prism/fixtures/seattlerb/parse_line_rescue.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/parse_line_rescue.txt
rename to test/prism/fixtures/seattlerb/parse_line_rescue.txt
diff --git a/test/yarp/fixtures/seattlerb/parse_line_return.txt b/test/prism/fixtures/seattlerb/parse_line_return.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/parse_line_return.txt
rename to test/prism/fixtures/seattlerb/parse_line_return.txt
diff --git a/test/yarp/fixtures/seattlerb/parse_line_str_with_newline_escape.txt b/test/prism/fixtures/seattlerb/parse_line_str_with_newline_escape.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/parse_line_str_with_newline_escape.txt
rename to test/prism/fixtures/seattlerb/parse_line_str_with_newline_escape.txt
diff --git a/test/yarp/fixtures/seattlerb/parse_line_to_ary.txt b/test/prism/fixtures/seattlerb/parse_line_to_ary.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/parse_line_to_ary.txt
rename to test/prism/fixtures/seattlerb/parse_line_to_ary.txt
diff --git a/test/yarp/fixtures/seattlerb/parse_line_trailing_newlines.txt b/test/prism/fixtures/seattlerb/parse_line_trailing_newlines.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/parse_line_trailing_newlines.txt
rename to test/prism/fixtures/seattlerb/parse_line_trailing_newlines.txt
diff --git a/test/yarp/fixtures/seattlerb/parse_opt_call_args_assocs_comma.txt b/test/prism/fixtures/seattlerb/parse_opt_call_args_assocs_comma.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/parse_opt_call_args_assocs_comma.txt
rename to test/prism/fixtures/seattlerb/parse_opt_call_args_assocs_comma.txt
diff --git a/test/yarp/fixtures/seattlerb/parse_opt_call_args_lit_comma.txt b/test/prism/fixtures/seattlerb/parse_opt_call_args_lit_comma.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/parse_opt_call_args_lit_comma.txt
rename to test/prism/fixtures/seattlerb/parse_opt_call_args_lit_comma.txt
diff --git a/test/yarp/fixtures/seattlerb/parse_pattern_019.txt b/test/prism/fixtures/seattlerb/parse_pattern_019.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/parse_pattern_019.txt
rename to test/prism/fixtures/seattlerb/parse_pattern_019.txt
diff --git a/test/yarp/fixtures/seattlerb/parse_pattern_044.txt b/test/prism/fixtures/seattlerb/parse_pattern_044.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/parse_pattern_044.txt
rename to test/prism/fixtures/seattlerb/parse_pattern_044.txt
diff --git a/test/yarp/fixtures/seattlerb/parse_pattern_051.txt b/test/prism/fixtures/seattlerb/parse_pattern_051.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/parse_pattern_051.txt
rename to test/prism/fixtures/seattlerb/parse_pattern_051.txt
diff --git a/test/yarp/fixtures/seattlerb/parse_pattern_058.txt b/test/prism/fixtures/seattlerb/parse_pattern_058.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/parse_pattern_058.txt
rename to test/prism/fixtures/seattlerb/parse_pattern_058.txt
diff --git a/test/yarp/fixtures/seattlerb/parse_pattern_058_2.txt b/test/prism/fixtures/seattlerb/parse_pattern_058_2.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/parse_pattern_058_2.txt
rename to test/prism/fixtures/seattlerb/parse_pattern_058_2.txt
diff --git a/test/yarp/fixtures/seattlerb/parse_pattern_069.txt b/test/prism/fixtures/seattlerb/parse_pattern_069.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/parse_pattern_069.txt
rename to test/prism/fixtures/seattlerb/parse_pattern_069.txt
diff --git a/test/yarp/fixtures/seattlerb/parse_pattern_076.txt b/test/prism/fixtures/seattlerb/parse_pattern_076.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/parse_pattern_076.txt
rename to test/prism/fixtures/seattlerb/parse_pattern_076.txt
diff --git a/test/yarp/fixtures/seattlerb/parse_until_not_canonical.txt b/test/prism/fixtures/seattlerb/parse_until_not_canonical.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/parse_until_not_canonical.txt
rename to test/prism/fixtures/seattlerb/parse_until_not_canonical.txt
diff --git a/test/yarp/fixtures/seattlerb/parse_until_not_noncanonical.txt b/test/prism/fixtures/seattlerb/parse_until_not_noncanonical.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/parse_until_not_noncanonical.txt
rename to test/prism/fixtures/seattlerb/parse_until_not_noncanonical.txt
diff --git a/test/yarp/fixtures/seattlerb/parse_while_not_canonical.txt b/test/prism/fixtures/seattlerb/parse_while_not_canonical.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/parse_while_not_canonical.txt
rename to test/prism/fixtures/seattlerb/parse_while_not_canonical.txt
diff --git a/test/yarp/fixtures/seattlerb/parse_while_not_noncanonical.txt b/test/prism/fixtures/seattlerb/parse_while_not_noncanonical.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/parse_while_not_noncanonical.txt
rename to test/prism/fixtures/seattlerb/parse_while_not_noncanonical.txt
diff --git a/test/yarp/fixtures/seattlerb/pctW_lineno.txt b/test/prism/fixtures/seattlerb/pctW_lineno.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/pctW_lineno.txt
rename to test/prism/fixtures/seattlerb/pctW_lineno.txt
diff --git a/test/yarp/fixtures/seattlerb/pct_Q_backslash_nl.txt b/test/prism/fixtures/seattlerb/pct_Q_backslash_nl.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/pct_Q_backslash_nl.txt
rename to test/prism/fixtures/seattlerb/pct_Q_backslash_nl.txt
diff --git a/test/yarp/fixtures/seattlerb/pct_nl.txt b/test/prism/fixtures/seattlerb/pct_nl.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/pct_nl.txt
rename to test/prism/fixtures/seattlerb/pct_nl.txt
diff --git a/test/yarp/fixtures/seattlerb/pct_w_heredoc_interp_nested.txt b/test/prism/fixtures/seattlerb/pct_w_heredoc_interp_nested.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/pct_w_heredoc_interp_nested.txt
rename to test/prism/fixtures/seattlerb/pct_w_heredoc_interp_nested.txt
diff --git a/test/yarp/fixtures/seattlerb/pipe_semicolon.txt b/test/prism/fixtures/seattlerb/pipe_semicolon.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/pipe_semicolon.txt
rename to test/prism/fixtures/seattlerb/pipe_semicolon.txt
diff --git a/test/yarp/fixtures/seattlerb/pipe_space.txt b/test/prism/fixtures/seattlerb/pipe_space.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/pipe_space.txt
rename to test/prism/fixtures/seattlerb/pipe_space.txt
diff --git a/test/yarp/fixtures/seattlerb/qWords_space.txt b/test/prism/fixtures/seattlerb/qWords_space.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/qWords_space.txt
rename to test/prism/fixtures/seattlerb/qWords_space.txt
diff --git a/test/yarp/fixtures/seattlerb/qsymbols.txt b/test/prism/fixtures/seattlerb/qsymbols.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/qsymbols.txt
rename to test/prism/fixtures/seattlerb/qsymbols.txt
diff --git a/test/yarp/fixtures/seattlerb/qsymbols_empty.txt b/test/prism/fixtures/seattlerb/qsymbols_empty.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/qsymbols_empty.txt
rename to test/prism/fixtures/seattlerb/qsymbols_empty.txt
diff --git a/test/yarp/fixtures/seattlerb/qsymbols_empty_space.txt b/test/prism/fixtures/seattlerb/qsymbols_empty_space.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/qsymbols_empty_space.txt
rename to test/prism/fixtures/seattlerb/qsymbols_empty_space.txt
diff --git a/test/yarp/fixtures/seattlerb/qsymbols_interp.txt b/test/prism/fixtures/seattlerb/qsymbols_interp.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/qsymbols_interp.txt
rename to test/prism/fixtures/seattlerb/qsymbols_interp.txt
diff --git a/test/yarp/fixtures/seattlerb/quoted_symbol_hash_arg.txt b/test/prism/fixtures/seattlerb/quoted_symbol_hash_arg.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/quoted_symbol_hash_arg.txt
rename to test/prism/fixtures/seattlerb/quoted_symbol_hash_arg.txt
diff --git a/test/yarp/fixtures/seattlerb/quoted_symbol_keys.txt b/test/prism/fixtures/seattlerb/quoted_symbol_keys.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/quoted_symbol_keys.txt
rename to test/prism/fixtures/seattlerb/quoted_symbol_keys.txt
diff --git a/test/yarp/fixtures/seattlerb/qw_escape.txt b/test/prism/fixtures/seattlerb/qw_escape.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/qw_escape.txt
rename to test/prism/fixtures/seattlerb/qw_escape.txt
diff --git a/test/yarp/fixtures/seattlerb/qw_escape_term.txt b/test/prism/fixtures/seattlerb/qw_escape_term.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/qw_escape_term.txt
rename to test/prism/fixtures/seattlerb/qw_escape_term.txt
diff --git a/test/yarp/fixtures/seattlerb/qwords_empty.txt b/test/prism/fixtures/seattlerb/qwords_empty.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/qwords_empty.txt
rename to test/prism/fixtures/seattlerb/qwords_empty.txt
diff --git a/test/yarp/fixtures/seattlerb/read_escape_unicode_curlies.txt b/test/prism/fixtures/seattlerb/read_escape_unicode_curlies.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/read_escape_unicode_curlies.txt
rename to test/prism/fixtures/seattlerb/read_escape_unicode_curlies.txt
diff --git a/test/yarp/fixtures/seattlerb/read_escape_unicode_h4.txt b/test/prism/fixtures/seattlerb/read_escape_unicode_h4.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/read_escape_unicode_h4.txt
rename to test/prism/fixtures/seattlerb/read_escape_unicode_h4.txt
diff --git a/test/yarp/fixtures/seattlerb/regexp.txt b/test/prism/fixtures/seattlerb/regexp.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/regexp.txt
rename to test/prism/fixtures/seattlerb/regexp.txt
diff --git a/test/yarp/fixtures/seattlerb/regexp_esc_C_slash.txt b/test/prism/fixtures/seattlerb/regexp_esc_C_slash.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/regexp_esc_C_slash.txt
rename to test/prism/fixtures/seattlerb/regexp_esc_C_slash.txt
diff --git a/test/yarp/fixtures/seattlerb/regexp_esc_u.txt b/test/prism/fixtures/seattlerb/regexp_esc_u.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/regexp_esc_u.txt
rename to test/prism/fixtures/seattlerb/regexp_esc_u.txt
diff --git a/test/yarp/fixtures/seattlerb/regexp_escape_extended.txt b/test/prism/fixtures/seattlerb/regexp_escape_extended.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/regexp_escape_extended.txt
rename to test/prism/fixtures/seattlerb/regexp_escape_extended.txt
diff --git a/test/yarp/fixtures/seattlerb/regexp_unicode_curlies.txt b/test/prism/fixtures/seattlerb/regexp_unicode_curlies.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/regexp_unicode_curlies.txt
rename to test/prism/fixtures/seattlerb/regexp_unicode_curlies.txt
diff --git a/test/yarp/fixtures/seattlerb/required_kwarg_no_value.txt b/test/prism/fixtures/seattlerb/required_kwarg_no_value.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/required_kwarg_no_value.txt
rename to test/prism/fixtures/seattlerb/required_kwarg_no_value.txt
diff --git a/test/yarp/fixtures/seattlerb/rescue_do_end_ensure_result.txt b/test/prism/fixtures/seattlerb/rescue_do_end_ensure_result.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/rescue_do_end_ensure_result.txt
rename to test/prism/fixtures/seattlerb/rescue_do_end_ensure_result.txt
diff --git a/test/yarp/fixtures/seattlerb/rescue_do_end_no_raise.txt b/test/prism/fixtures/seattlerb/rescue_do_end_no_raise.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/rescue_do_end_no_raise.txt
rename to test/prism/fixtures/seattlerb/rescue_do_end_no_raise.txt
diff --git a/test/yarp/fixtures/seattlerb/rescue_do_end_raised.txt b/test/prism/fixtures/seattlerb/rescue_do_end_raised.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/rescue_do_end_raised.txt
rename to test/prism/fixtures/seattlerb/rescue_do_end_raised.txt
diff --git a/test/yarp/fixtures/seattlerb/rescue_do_end_rescued.txt b/test/prism/fixtures/seattlerb/rescue_do_end_rescued.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/rescue_do_end_rescued.txt
rename to test/prism/fixtures/seattlerb/rescue_do_end_rescued.txt
diff --git a/test/yarp/fixtures/seattlerb/rescue_in_block.txt b/test/prism/fixtures/seattlerb/rescue_in_block.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/rescue_in_block.txt
rename to test/prism/fixtures/seattlerb/rescue_in_block.txt
diff --git a/test/yarp/fixtures/seattlerb/rescue_parens.txt b/test/prism/fixtures/seattlerb/rescue_parens.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/rescue_parens.txt
rename to test/prism/fixtures/seattlerb/rescue_parens.txt
diff --git a/test/yarp/fixtures/seattlerb/return_call_assocs.txt b/test/prism/fixtures/seattlerb/return_call_assocs.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/return_call_assocs.txt
rename to test/prism/fixtures/seattlerb/return_call_assocs.txt
diff --git a/test/yarp/fixtures/seattlerb/rhs_asgn.txt b/test/prism/fixtures/seattlerb/rhs_asgn.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/rhs_asgn.txt
rename to test/prism/fixtures/seattlerb/rhs_asgn.txt
diff --git a/test/yarp/fixtures/seattlerb/ruby21_numbers.txt b/test/prism/fixtures/seattlerb/ruby21_numbers.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/ruby21_numbers.txt
rename to test/prism/fixtures/seattlerb/ruby21_numbers.txt
diff --git a/test/yarp/fixtures/seattlerb/safe_attrasgn.txt b/test/prism/fixtures/seattlerb/safe_attrasgn.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/safe_attrasgn.txt
rename to test/prism/fixtures/seattlerb/safe_attrasgn.txt
diff --git a/test/yarp/fixtures/seattlerb/safe_attrasgn_constant.txt b/test/prism/fixtures/seattlerb/safe_attrasgn_constant.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/safe_attrasgn_constant.txt
rename to test/prism/fixtures/seattlerb/safe_attrasgn_constant.txt
diff --git a/test/yarp/fixtures/seattlerb/safe_call.txt b/test/prism/fixtures/seattlerb/safe_call.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/safe_call.txt
rename to test/prism/fixtures/seattlerb/safe_call.txt
diff --git a/test/yarp/fixtures/seattlerb/safe_call_after_newline.txt b/test/prism/fixtures/seattlerb/safe_call_after_newline.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/safe_call_after_newline.txt
rename to test/prism/fixtures/seattlerb/safe_call_after_newline.txt
diff --git a/test/yarp/fixtures/seattlerb/safe_call_dot_parens.txt b/test/prism/fixtures/seattlerb/safe_call_dot_parens.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/safe_call_dot_parens.txt
rename to test/prism/fixtures/seattlerb/safe_call_dot_parens.txt
diff --git a/test/yarp/fixtures/seattlerb/safe_call_newline.txt b/test/prism/fixtures/seattlerb/safe_call_newline.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/safe_call_newline.txt
rename to test/prism/fixtures/seattlerb/safe_call_newline.txt
diff --git a/test/yarp/fixtures/seattlerb/safe_call_operator.txt b/test/prism/fixtures/seattlerb/safe_call_operator.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/safe_call_operator.txt
rename to test/prism/fixtures/seattlerb/safe_call_operator.txt
diff --git a/test/yarp/fixtures/seattlerb/safe_call_rhs_newline.txt b/test/prism/fixtures/seattlerb/safe_call_rhs_newline.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/safe_call_rhs_newline.txt
rename to test/prism/fixtures/seattlerb/safe_call_rhs_newline.txt
diff --git a/test/yarp/fixtures/seattlerb/safe_calls.txt b/test/prism/fixtures/seattlerb/safe_calls.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/safe_calls.txt
rename to test/prism/fixtures/seattlerb/safe_calls.txt
diff --git a/test/yarp/fixtures/seattlerb/safe_op_asgn.txt b/test/prism/fixtures/seattlerb/safe_op_asgn.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/safe_op_asgn.txt
rename to test/prism/fixtures/seattlerb/safe_op_asgn.txt
diff --git a/test/yarp/fixtures/seattlerb/safe_op_asgn2.txt b/test/prism/fixtures/seattlerb/safe_op_asgn2.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/safe_op_asgn2.txt
rename to test/prism/fixtures/seattlerb/safe_op_asgn2.txt
diff --git a/test/yarp/fixtures/seattlerb/slashy_newlines_within_string.txt b/test/prism/fixtures/seattlerb/slashy_newlines_within_string.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/slashy_newlines_within_string.txt
rename to test/prism/fixtures/seattlerb/slashy_newlines_within_string.txt
diff --git a/test/yarp/fixtures/seattlerb/stabby_arg_no_paren.txt b/test/prism/fixtures/seattlerb/stabby_arg_no_paren.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/stabby_arg_no_paren.txt
rename to test/prism/fixtures/seattlerb/stabby_arg_no_paren.txt
diff --git a/test/yarp/fixtures/seattlerb/stabby_arg_opt_splat_arg_block_omfg.txt b/test/prism/fixtures/seattlerb/stabby_arg_opt_splat_arg_block_omfg.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/stabby_arg_opt_splat_arg_block_omfg.txt
rename to test/prism/fixtures/seattlerb/stabby_arg_opt_splat_arg_block_omfg.txt
diff --git a/test/yarp/fixtures/seattlerb/stabby_block_iter_call.txt b/test/prism/fixtures/seattlerb/stabby_block_iter_call.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/stabby_block_iter_call.txt
rename to test/prism/fixtures/seattlerb/stabby_block_iter_call.txt
diff --git a/test/yarp/fixtures/seattlerb/stabby_block_iter_call_no_target_with_arg.txt b/test/prism/fixtures/seattlerb/stabby_block_iter_call_no_target_with_arg.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/stabby_block_iter_call_no_target_with_arg.txt
rename to test/prism/fixtures/seattlerb/stabby_block_iter_call_no_target_with_arg.txt
diff --git a/test/yarp/fixtures/seattlerb/stabby_block_kw.txt b/test/prism/fixtures/seattlerb/stabby_block_kw.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/stabby_block_kw.txt
rename to test/prism/fixtures/seattlerb/stabby_block_kw.txt
diff --git a/test/yarp/fixtures/seattlerb/stabby_block_kw__required.txt b/test/prism/fixtures/seattlerb/stabby_block_kw__required.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/stabby_block_kw__required.txt
rename to test/prism/fixtures/seattlerb/stabby_block_kw__required.txt
diff --git a/test/yarp/fixtures/seattlerb/stabby_proc_scope.txt b/test/prism/fixtures/seattlerb/stabby_proc_scope.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/stabby_proc_scope.txt
rename to test/prism/fixtures/seattlerb/stabby_proc_scope.txt
diff --git a/test/yarp/fixtures/seattlerb/str_backslashes.txt b/test/prism/fixtures/seattlerb/str_backslashes.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/str_backslashes.txt
rename to test/prism/fixtures/seattlerb/str_backslashes.txt
diff --git a/test/yarp/fixtures/seattlerb/str_double_double_escaped_newline.txt b/test/prism/fixtures/seattlerb/str_double_double_escaped_newline.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/str_double_double_escaped_newline.txt
rename to test/prism/fixtures/seattlerb/str_double_double_escaped_newline.txt
diff --git a/test/yarp/fixtures/seattlerb/str_double_escaped_newline.txt b/test/prism/fixtures/seattlerb/str_double_escaped_newline.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/str_double_escaped_newline.txt
rename to test/prism/fixtures/seattlerb/str_double_escaped_newline.txt
diff --git a/test/yarp/fixtures/seattlerb/str_double_newline.txt b/test/prism/fixtures/seattlerb/str_double_newline.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/str_double_newline.txt
rename to test/prism/fixtures/seattlerb/str_double_newline.txt
diff --git a/test/yarp/fixtures/seattlerb/str_evstr.txt b/test/prism/fixtures/seattlerb/str_evstr.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/str_evstr.txt
rename to test/prism/fixtures/seattlerb/str_evstr.txt
diff --git a/test/yarp/fixtures/seattlerb/str_evstr_escape.txt b/test/prism/fixtures/seattlerb/str_evstr_escape.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/str_evstr_escape.txt
rename to test/prism/fixtures/seattlerb/str_evstr_escape.txt
diff --git a/test/yarp/fixtures/seattlerb/str_heredoc_interp.txt b/test/prism/fixtures/seattlerb/str_heredoc_interp.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/str_heredoc_interp.txt
rename to test/prism/fixtures/seattlerb/str_heredoc_interp.txt
diff --git a/test/yarp/fixtures/seattlerb/str_interp_ternary_or_label.txt b/test/prism/fixtures/seattlerb/str_interp_ternary_or_label.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/str_interp_ternary_or_label.txt
rename to test/prism/fixtures/seattlerb/str_interp_ternary_or_label.txt
diff --git a/test/yarp/fixtures/seattlerb/str_lit_concat_bad_encodings.txt b/test/prism/fixtures/seattlerb/str_lit_concat_bad_encodings.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/str_lit_concat_bad_encodings.txt
rename to test/prism/fixtures/seattlerb/str_lit_concat_bad_encodings.txt
diff --git a/test/yarp/fixtures/seattlerb/str_newline_hash_line_number.txt b/test/prism/fixtures/seattlerb/str_newline_hash_line_number.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/str_newline_hash_line_number.txt
rename to test/prism/fixtures/seattlerb/str_newline_hash_line_number.txt
diff --git a/test/yarp/fixtures/seattlerb/str_pct_Q_nested.txt b/test/prism/fixtures/seattlerb/str_pct_Q_nested.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/str_pct_Q_nested.txt
rename to test/prism/fixtures/seattlerb/str_pct_Q_nested.txt
diff --git a/test/yarp/fixtures/seattlerb/str_pct_nested_nested.txt b/test/prism/fixtures/seattlerb/str_pct_nested_nested.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/str_pct_nested_nested.txt
rename to test/prism/fixtures/seattlerb/str_pct_nested_nested.txt
diff --git a/test/yarp/fixtures/seattlerb/str_pct_q.txt b/test/prism/fixtures/seattlerb/str_pct_q.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/str_pct_q.txt
rename to test/prism/fixtures/seattlerb/str_pct_q.txt
diff --git a/test/yarp/fixtures/seattlerb/str_single_double_escaped_newline.txt b/test/prism/fixtures/seattlerb/str_single_double_escaped_newline.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/str_single_double_escaped_newline.txt
rename to test/prism/fixtures/seattlerb/str_single_double_escaped_newline.txt
diff --git a/test/yarp/fixtures/seattlerb/str_single_escaped_newline.txt b/test/prism/fixtures/seattlerb/str_single_escaped_newline.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/str_single_escaped_newline.txt
rename to test/prism/fixtures/seattlerb/str_single_escaped_newline.txt
diff --git a/test/yarp/fixtures/seattlerb/str_single_newline.txt b/test/prism/fixtures/seattlerb/str_single_newline.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/str_single_newline.txt
rename to test/prism/fixtures/seattlerb/str_single_newline.txt
diff --git a/test/yarp/fixtures/seattlerb/str_str.txt b/test/prism/fixtures/seattlerb/str_str.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/str_str.txt
rename to test/prism/fixtures/seattlerb/str_str.txt
diff --git a/test/yarp/fixtures/seattlerb/str_str_str.txt b/test/prism/fixtures/seattlerb/str_str_str.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/str_str_str.txt
rename to test/prism/fixtures/seattlerb/str_str_str.txt
diff --git a/test/yarp/fixtures/seattlerb/super_arg.txt b/test/prism/fixtures/seattlerb/super_arg.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/super_arg.txt
rename to test/prism/fixtures/seattlerb/super_arg.txt
diff --git a/test/yarp/fixtures/seattlerb/symbol_empty.txt b/test/prism/fixtures/seattlerb/symbol_empty.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/symbol_empty.txt
rename to test/prism/fixtures/seattlerb/symbol_empty.txt
diff --git a/test/yarp/fixtures/seattlerb/symbol_list.txt b/test/prism/fixtures/seattlerb/symbol_list.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/symbol_list.txt
rename to test/prism/fixtures/seattlerb/symbol_list.txt
diff --git a/test/yarp/fixtures/seattlerb/symbols.txt b/test/prism/fixtures/seattlerb/symbols.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/symbols.txt
rename to test/prism/fixtures/seattlerb/symbols.txt
diff --git a/test/yarp/fixtures/seattlerb/symbols_empty.txt b/test/prism/fixtures/seattlerb/symbols_empty.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/symbols_empty.txt
rename to test/prism/fixtures/seattlerb/symbols_empty.txt
diff --git a/test/yarp/fixtures/seattlerb/symbols_empty_space.txt b/test/prism/fixtures/seattlerb/symbols_empty_space.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/symbols_empty_space.txt
rename to test/prism/fixtures/seattlerb/symbols_empty_space.txt
diff --git a/test/yarp/fixtures/seattlerb/symbols_interp.txt b/test/prism/fixtures/seattlerb/symbols_interp.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/symbols_interp.txt
rename to test/prism/fixtures/seattlerb/symbols_interp.txt
diff --git a/test/yarp/fixtures/seattlerb/thingy.txt b/test/prism/fixtures/seattlerb/thingy.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/thingy.txt
rename to test/prism/fixtures/seattlerb/thingy.txt
diff --git a/test/yarp/fixtures/seattlerb/uminus_float.txt b/test/prism/fixtures/seattlerb/uminus_float.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/uminus_float.txt
rename to test/prism/fixtures/seattlerb/uminus_float.txt
diff --git a/test/yarp/fixtures/seattlerb/unary_minus.txt b/test/prism/fixtures/seattlerb/unary_minus.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/unary_minus.txt
rename to test/prism/fixtures/seattlerb/unary_minus.txt
diff --git a/test/yarp/fixtures/seattlerb/unary_plus.txt b/test/prism/fixtures/seattlerb/unary_plus.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/unary_plus.txt
rename to test/prism/fixtures/seattlerb/unary_plus.txt
diff --git a/test/yarp/fixtures/seattlerb/unary_plus_on_literal.txt b/test/prism/fixtures/seattlerb/unary_plus_on_literal.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/unary_plus_on_literal.txt
rename to test/prism/fixtures/seattlerb/unary_plus_on_literal.txt
diff --git a/test/yarp/fixtures/seattlerb/unary_tilde.txt b/test/prism/fixtures/seattlerb/unary_tilde.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/unary_tilde.txt
rename to test/prism/fixtures/seattlerb/unary_tilde.txt
diff --git a/test/yarp/fixtures/seattlerb/utf8_bom.txt b/test/prism/fixtures/seattlerb/utf8_bom.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/utf8_bom.txt
rename to test/prism/fixtures/seattlerb/utf8_bom.txt
diff --git a/test/yarp/fixtures/seattlerb/when_splat.txt b/test/prism/fixtures/seattlerb/when_splat.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/when_splat.txt
rename to test/prism/fixtures/seattlerb/when_splat.txt
diff --git a/test/yarp/fixtures/seattlerb/words_interp.txt b/test/prism/fixtures/seattlerb/words_interp.txt
similarity index 100%
rename from test/yarp/fixtures/seattlerb/words_interp.txt
rename to test/prism/fixtures/seattlerb/words_interp.txt
diff --git a/test/prism/fixtures/single_method_call_with_bang.txt b/test/prism/fixtures/single_method_call_with_bang.txt
new file mode 100644
index 00000000000000..929efb30534598
--- /dev/null
+++ b/test/prism/fixtures/single_method_call_with_bang.txt
@@ -0,0 +1 @@
+foo!
diff --git a/test/yarp/fixtures/single_quote_heredocs.txt b/test/prism/fixtures/single_quote_heredocs.txt
similarity index 100%
rename from test/yarp/fixtures/single_quote_heredocs.txt
rename to test/prism/fixtures/single_quote_heredocs.txt
diff --git a/test/prism/fixtures/spanning_heredoc.txt b/test/prism/fixtures/spanning_heredoc.txt
new file mode 100644
index 00000000000000..d09cb11b1f7de1
--- /dev/null
+++ b/test/prism/fixtures/spanning_heredoc.txt
@@ -0,0 +1,63 @@
+# test regex, string, and lists that span a heredoc thanks to an escaped newline
+
+# ripper incorrectly creates a "b\nb" token instead of two separate string tokens
+pp <<-A.gsub(/b\
+a
+A
+b/, "")
+
+# ripper incorrectly creates a "d\nd" token instead of two separate string tokens
+pp <<-A, "d\
+c
+A
+d"
+
+# ripper gets this right
+pp <<-A, %q[f\
+e
+A
+f]
+
+# ripper incorrectly creates a "h\nh" token instead of two separate string tokens
+pp <<-A, %Q[h\
+g
+A
+h]
+
+# ripper can't parse this successfully, though ruby runs it correctly
+pp <<-A, %w[j\
+i
+A
+j]
+
+# ripper can't parse this successfully, though ruby runs it correctly
+# TODO: prism does not include the "\n" in "l\nl" in the AST like ruby does
+pp <<-A, %W[l\
+k
+A
+l]
+
+# ripper can't parse this successfully, though ruby runs it correctly
+pp <<-A, %i[n\
+m
+A
+n]
+
+# ripper gets this one wrong in the same way that prism does ...
+# TODO: prism does not include the "\n" in "p\np" in the AST like ruby does
+pp <<-A, %I[p\
+o
+A
+p]
+
+<<A; /\
+A
+(?<a>)/ =~ ''
+
+<<A; :'a
+A
+b'
+
+<<A; :"a
+A
+b"
diff --git a/test/prism/fixtures/spanning_heredoc_newlines.txt b/test/prism/fixtures/spanning_heredoc_newlines.txt
new file mode 100644
index 00000000000000..32c9943aeb4239
--- /dev/null
+++ b/test/prism/fixtures/spanning_heredoc_newlines.txt
@@ -0,0 +1,23 @@
+<<A+%
+A
+
+
+<<A+%r
+A
+
+
+<<A+%q
+A
+
+
+<<A+%Q
+A
+
+
+<<A+%s
+A
+
+
+<<A+%x
+A
+
diff --git a/test/prism/fixtures/strings.txt b/test/prism/fixtures/strings.txt
new file mode 100644
index 00000000000000..1419f975b7bb6b
--- /dev/null
+++ b/test/prism/fixtures/strings.txt
@@ -0,0 +1,185 @@
+%%abc%
+
+%^abc^
+
+%&abc&
+
+%*abc*
+
+%_abc_
+
+%+abc+
+
+%-abc-
+
+%:abc:
+
+%;abc;
+
+%'abc'
+
+%~abc~
+
+%?abc?
+
+%w{    }
+
+%/abc/
+
+%`abc`
+
+"#@@foo"
+
+%\abc\
+
+%{aaa #{bbb} ccc}
+
+%[foo[]]
+
+"foo" +
+#
+"bar"
+
+"
+foo\
+b\nar
+"
+
+"foo
+\nbar\n\n
+a\nb\n\nc\n"
+
+%q{abc}
+
+%s[abc]
+
+%{abc}
+
+''
+
+"abc"
+
+"#@---"
+
+"aaa #{bbb} ccc"
+
+'abc'
+
+%w[a b c]
+
+%w[a[] b[[]] c[]]
+
+%w[foo\ bar \#{1}]
+
+%w[foo\ bar baz]
+
+%w[foo\ bar\\ baz\\\
+ bat]
+
+%W[#{foo}\
+bar
+baz #{bat}
+]
+
+%w(foo\n)
+
+%w(foo\
+)
+
+%w(foo \n)
+
+%W(foo\
+bar)
+
+%w[foo     bar]
+
+%w[
+  a   
+  b   c  
+ d   
+]
+
+%w[
+  foo\nbar baz\n\n\
+  bat\n\\\n\foo
+]
+
+%W[
+  foo\nbar baz\n\n\
+  bat\n\\\n\foo
+]
+
+%w[foo\
+  bar
+  baz\\
+  bat
+  1\n
+  2
+  3\\n
+]
+
+%W[foo\
+  bar
+  baz\\
+  bat
+  1\n
+  2
+  3\\n
+]
+
+%W[f\u{006f 006f}]
+
+%W[a b#{c}d e]
+
+%W[a b c]
+
+%w[
+  a
+  b
+  c
+]
+
+'\' foo \' bar'
+
+'\\ foo \\ bar'
+
+'foo\
+bar\\
+baz
+'
+
+"#$foo"
+
+"#@foo"
+
+"\x7 \x23 \x61"
+
+"\7 \43 \141"
+
+"ち\xE3\x81\xFF"
+
+"\777"
+
+%[abc]
+
+%(abc)
+
+%@abc@
+
+%$abc$
+
+?a
+
+?a "a"
+
+%Q{abc}
+
+%Q(\«)
+
+%q(\«)
+
+%^#$^#
+
+%@#@#
+
+"#{"#{B} C"} D"
diff --git a/test/prism/fixtures/super.txt b/test/prism/fixtures/super.txt
new file mode 100644
index 00000000000000..cd7aaf992ee4d7
--- /dev/null
+++ b/test/prism/fixtures/super.txt
@@ -0,0 +1,17 @@
+super
+
+super()
+
+super(1)
+
+super(1, 2, 3)
+
+super &:foo
+
+super(&:foo)
+
+super {}
+
+super(1, 2, 3) {}
+
+super(1, 2, 3, &:foo)
diff --git a/test/prism/fixtures/symbols.txt b/test/prism/fixtures/symbols.txt
new file mode 100644
index 00000000000000..34895b9e9fdf59
--- /dev/null
+++ b/test/prism/fixtures/symbols.txt
@@ -0,0 +1,104 @@
+:'abc'
+
+:"#{var}"
+
+:"abc#{1}"
+
+:"
+foo\
+b\nar
+"
+
+:"
+foo\
+b\nar
+#{}
+"
+
+[:Υ, :ά, :ŗ, :ρ]
+
+:-@
+
+:-
+
+:%
+
+:|
+
+:+@
+
+:+
+
+:/
+
+:**
+
+:*
+
+:~@
+
+[1, 1.0, 1r, 1i]
+
+:~
+
+:a
+
+%i[a b c]
+
+%i[a b#{1} #{2}c d#{3}f]
+
+%I[a b#{1} #{2}c d#{3}f]
+
+:@@a
+
+:👍
+
+%i[a\b]
+
+:$a
+
+:@a
+
+:do
+
+:&
+
+:`
+
+:!@
+
+:!~
+
+:!
+
+:[]
+
+:[]=
+
+:^
+
+:==
+
+:===
+
+:=~
+
+:>=
+
+:>>
+
+:>
+
+:<=>
+
+:<=
+
+:<<
+
+:<
+
+:__LINE__
+
+:__FILE__
+
+:__ENCODING__
diff --git a/test/yarp/fixtures/ternary_operator.txt b/test/prism/fixtures/ternary_operator.txt
similarity index 100%
rename from test/yarp/fixtures/ternary_operator.txt
rename to test/prism/fixtures/ternary_operator.txt
diff --git a/test/prism/fixtures/tilde_heredocs.txt b/test/prism/fixtures/tilde_heredocs.txt
new file mode 100644
index 00000000000000..cca47ef00bbac5
--- /dev/null
+++ b/test/prism/fixtures/tilde_heredocs.txt
@@ -0,0 +1,97 @@
+<<~EOF
+  a
+#{1}
+  a
+EOF
+
+<<~EOF
+  a
+EOF
+
+<<~EOF
+	a
+  b
+		c
+EOF
+
+<<~EOF
+  #{1} a
+EOF
+
+<<~EOF
+  a #{1}
+EOF
+
+<<~EOF
+  a
+ #{1}
+EOF
+
+<<~EOF
+  a
+  #{1}
+EOF
+
+<<~EOF
+  a
+  b
+EOF
+
+<<~EOF
+  a
+   b
+EOF
+
+<<~EOF
+			a
+		b
+EOF
+
+<<~'EOF'
+  a #{1}
+EOF
+
+<<~EOF
+	a
+	 b
+EOF
+
+<<~EOF
+	 a
+	b
+EOF
+
+<<~EOF
+  	a
+        b
+EOF
+
+<<~EOF
+  a
+
+  b
+EOF
+
+<<~EOF
+  a
+
+  b
+EOF
+
+<<~EOF
+  a
+
+
+
+  b
+EOF
+
+<<~EOF
+
+  #{1}a
+    EOF
+
+<<~EOT
+  #{1}
+	b
+EOT
diff --git a/test/yarp/fixtures/undef.txt b/test/prism/fixtures/undef.txt
similarity index 100%
rename from test/yarp/fixtures/undef.txt
rename to test/prism/fixtures/undef.txt
diff --git a/test/yarp/fixtures/unescaping.txt b/test/prism/fixtures/unescaping.txt
similarity index 100%
rename from test/yarp/fixtures/unescaping.txt
rename to test/prism/fixtures/unescaping.txt
diff --git a/test/prism/fixtures/unless.txt b/test/prism/fixtures/unless.txt
new file mode 100644
index 00000000000000..678d58991b3d92
--- /dev/null
+++ b/test/prism/fixtures/unless.txt
@@ -0,0 +1,14 @@
+unless true; 1; end
+
+unless true
+1 else 2 end
+
+1 unless true
+
+tap { break unless true }
+
+tap { next unless true }
+
+return unless true
+
+foo :a, :b unless bar?
diff --git a/test/yarp/fixtures/unparser/LICENSE b/test/prism/fixtures/unparser/LICENSE
similarity index 100%
rename from test/yarp/fixtures/unparser/LICENSE
rename to test/prism/fixtures/unparser/LICENSE
diff --git a/test/yarp/fixtures/unparser/corpus/literal/alias.txt b/test/prism/fixtures/unparser/corpus/literal/alias.txt
similarity index 100%
rename from test/yarp/fixtures/unparser/corpus/literal/alias.txt
rename to test/prism/fixtures/unparser/corpus/literal/alias.txt
diff --git a/test/yarp/fixtures/unparser/corpus/literal/assignment.txt b/test/prism/fixtures/unparser/corpus/literal/assignment.txt
similarity index 100%
rename from test/yarp/fixtures/unparser/corpus/literal/assignment.txt
rename to test/prism/fixtures/unparser/corpus/literal/assignment.txt
diff --git a/test/yarp/fixtures/unparser/corpus/literal/block.txt b/test/prism/fixtures/unparser/corpus/literal/block.txt
similarity index 100%
rename from test/yarp/fixtures/unparser/corpus/literal/block.txt
rename to test/prism/fixtures/unparser/corpus/literal/block.txt
diff --git a/test/yarp/fixtures/unparser/corpus/literal/case.txt b/test/prism/fixtures/unparser/corpus/literal/case.txt
similarity index 100%
rename from test/yarp/fixtures/unparser/corpus/literal/case.txt
rename to test/prism/fixtures/unparser/corpus/literal/case.txt
diff --git a/test/yarp/fixtures/unparser/corpus/literal/class.txt b/test/prism/fixtures/unparser/corpus/literal/class.txt
similarity index 100%
rename from test/yarp/fixtures/unparser/corpus/literal/class.txt
rename to test/prism/fixtures/unparser/corpus/literal/class.txt
diff --git a/test/yarp/fixtures/unparser/corpus/literal/def.txt b/test/prism/fixtures/unparser/corpus/literal/def.txt
similarity index 100%
rename from test/yarp/fixtures/unparser/corpus/literal/def.txt
rename to test/prism/fixtures/unparser/corpus/literal/def.txt
diff --git a/test/yarp/fixtures/unparser/corpus/literal/defined.txt b/test/prism/fixtures/unparser/corpus/literal/defined.txt
similarity index 100%
rename from test/yarp/fixtures/unparser/corpus/literal/defined.txt
rename to test/prism/fixtures/unparser/corpus/literal/defined.txt
diff --git a/test/yarp/fixtures/unparser/corpus/literal/defs.txt b/test/prism/fixtures/unparser/corpus/literal/defs.txt
similarity index 100%
rename from test/yarp/fixtures/unparser/corpus/literal/defs.txt
rename to test/prism/fixtures/unparser/corpus/literal/defs.txt
diff --git a/test/yarp/fixtures/unparser/corpus/literal/dstr.txt b/test/prism/fixtures/unparser/corpus/literal/dstr.txt
similarity index 100%
rename from test/yarp/fixtures/unparser/corpus/literal/dstr.txt
rename to test/prism/fixtures/unparser/corpus/literal/dstr.txt
diff --git a/test/yarp/fixtures/unparser/corpus/literal/empty.txt b/test/prism/fixtures/unparser/corpus/literal/empty.txt
similarity index 100%
rename from test/yarp/fixtures/unparser/corpus/literal/empty.txt
rename to test/prism/fixtures/unparser/corpus/literal/empty.txt
diff --git a/test/yarp/fixtures/unparser/corpus/literal/empty_begin.txt b/test/prism/fixtures/unparser/corpus/literal/empty_begin.txt
similarity index 100%
rename from test/yarp/fixtures/unparser/corpus/literal/empty_begin.txt
rename to test/prism/fixtures/unparser/corpus/literal/empty_begin.txt
diff --git a/test/prism/fixtures/unparser/corpus/literal/flipflop.txt b/test/prism/fixtures/unparser/corpus/literal/flipflop.txt
new file mode 100644
index 00000000000000..139904a53f505d
--- /dev/null
+++ b/test/prism/fixtures/unparser/corpus/literal/flipflop.txt
@@ -0,0 +1,10 @@
+if ((i == 4)..(i == 4))
+  foo
+end
+if ((i == 4)...(i == 4))
+  foo
+end
+if ..foo
+end
+if foo..;
+end
diff --git a/test/yarp/fixtures/unparser/corpus/literal/for.txt b/test/prism/fixtures/unparser/corpus/literal/for.txt
similarity index 100%
rename from test/yarp/fixtures/unparser/corpus/literal/for.txt
rename to test/prism/fixtures/unparser/corpus/literal/for.txt
diff --git a/test/yarp/fixtures/unparser/corpus/literal/hookexe.txt b/test/prism/fixtures/unparser/corpus/literal/hookexe.txt
similarity index 100%
rename from test/yarp/fixtures/unparser/corpus/literal/hookexe.txt
rename to test/prism/fixtures/unparser/corpus/literal/hookexe.txt
diff --git a/test/yarp/fixtures/unparser/corpus/literal/if.txt b/test/prism/fixtures/unparser/corpus/literal/if.txt
similarity index 100%
rename from test/yarp/fixtures/unparser/corpus/literal/if.txt
rename to test/prism/fixtures/unparser/corpus/literal/if.txt
diff --git a/test/yarp/fixtures/unparser/corpus/literal/kwbegin.txt b/test/prism/fixtures/unparser/corpus/literal/kwbegin.txt
similarity index 100%
rename from test/yarp/fixtures/unparser/corpus/literal/kwbegin.txt
rename to test/prism/fixtures/unparser/corpus/literal/kwbegin.txt
diff --git a/test/yarp/fixtures/unparser/corpus/literal/lambda.txt b/test/prism/fixtures/unparser/corpus/literal/lambda.txt
similarity index 100%
rename from test/yarp/fixtures/unparser/corpus/literal/lambda.txt
rename to test/prism/fixtures/unparser/corpus/literal/lambda.txt
diff --git a/test/yarp/fixtures/unparser/corpus/literal/literal.txt b/test/prism/fixtures/unparser/corpus/literal/literal.txt
similarity index 100%
rename from test/yarp/fixtures/unparser/corpus/literal/literal.txt
rename to test/prism/fixtures/unparser/corpus/literal/literal.txt
diff --git a/test/yarp/fixtures/unparser/corpus/literal/module.txt b/test/prism/fixtures/unparser/corpus/literal/module.txt
similarity index 100%
rename from test/yarp/fixtures/unparser/corpus/literal/module.txt
rename to test/prism/fixtures/unparser/corpus/literal/module.txt
diff --git a/test/yarp/fixtures/unparser/corpus/literal/opasgn.txt b/test/prism/fixtures/unparser/corpus/literal/opasgn.txt
similarity index 100%
rename from test/yarp/fixtures/unparser/corpus/literal/opasgn.txt
rename to test/prism/fixtures/unparser/corpus/literal/opasgn.txt
diff --git a/test/yarp/fixtures/unparser/corpus/literal/pattern.txt b/test/prism/fixtures/unparser/corpus/literal/pattern.txt
similarity index 100%
rename from test/yarp/fixtures/unparser/corpus/literal/pattern.txt
rename to test/prism/fixtures/unparser/corpus/literal/pattern.txt
diff --git a/test/yarp/fixtures/unparser/corpus/literal/pragma.txt b/test/prism/fixtures/unparser/corpus/literal/pragma.txt
similarity index 100%
rename from test/yarp/fixtures/unparser/corpus/literal/pragma.txt
rename to test/prism/fixtures/unparser/corpus/literal/pragma.txt
diff --git a/test/yarp/fixtures/unparser/corpus/literal/range.txt b/test/prism/fixtures/unparser/corpus/literal/range.txt
similarity index 100%
rename from test/yarp/fixtures/unparser/corpus/literal/range.txt
rename to test/prism/fixtures/unparser/corpus/literal/range.txt
diff --git a/test/yarp/fixtures/unparser/corpus/literal/rescue.txt b/test/prism/fixtures/unparser/corpus/literal/rescue.txt
similarity index 100%
rename from test/yarp/fixtures/unparser/corpus/literal/rescue.txt
rename to test/prism/fixtures/unparser/corpus/literal/rescue.txt
diff --git a/test/yarp/fixtures/unparser/corpus/literal/send.txt b/test/prism/fixtures/unparser/corpus/literal/send.txt
similarity index 100%
rename from test/yarp/fixtures/unparser/corpus/literal/send.txt
rename to test/prism/fixtures/unparser/corpus/literal/send.txt
diff --git a/test/yarp/fixtures/unparser/corpus/literal/since/27.txt b/test/prism/fixtures/unparser/corpus/literal/since/27.txt
similarity index 100%
rename from test/yarp/fixtures/unparser/corpus/literal/since/27.txt
rename to test/prism/fixtures/unparser/corpus/literal/since/27.txt
diff --git a/test/yarp/fixtures/unparser/corpus/literal/since/30.txt b/test/prism/fixtures/unparser/corpus/literal/since/30.txt
similarity index 100%
rename from test/yarp/fixtures/unparser/corpus/literal/since/30.txt
rename to test/prism/fixtures/unparser/corpus/literal/since/30.txt
diff --git a/test/yarp/fixtures/unparser/corpus/literal/since/31.txt b/test/prism/fixtures/unparser/corpus/literal/since/31.txt
similarity index 100%
rename from test/yarp/fixtures/unparser/corpus/literal/since/31.txt
rename to test/prism/fixtures/unparser/corpus/literal/since/31.txt
diff --git a/test/prism/fixtures/unparser/corpus/literal/since/32.txt b/test/prism/fixtures/unparser/corpus/literal/since/32.txt
new file mode 100644
index 00000000000000..b8e096d8fcbad4
--- /dev/null
+++ b/test/prism/fixtures/unparser/corpus/literal/since/32.txt
@@ -0,0 +1,11 @@
+def foo(argument, **)
+  bar(argument, **)
+end
+
+def foo(argument, *)
+  bar(argument, *)
+end
+
+def foo(**)
+  { default: 1, ** }
+end
diff --git a/test/yarp/fixtures/unparser/corpus/literal/singletons.txt b/test/prism/fixtures/unparser/corpus/literal/singletons.txt
similarity index 100%
rename from test/yarp/fixtures/unparser/corpus/literal/singletons.txt
rename to test/prism/fixtures/unparser/corpus/literal/singletons.txt
diff --git a/test/yarp/fixtures/unparser/corpus/literal/super.txt b/test/prism/fixtures/unparser/corpus/literal/super.txt
similarity index 100%
rename from test/yarp/fixtures/unparser/corpus/literal/super.txt
rename to test/prism/fixtures/unparser/corpus/literal/super.txt
diff --git a/test/prism/fixtures/unparser/corpus/literal/unary.txt b/test/prism/fixtures/unparser/corpus/literal/unary.txt
new file mode 100644
index 00000000000000..6992d86bb02dbe
--- /dev/null
+++ b/test/prism/fixtures/unparser/corpus/literal/unary.txt
@@ -0,0 +1,9 @@
+!1
+!(!1)
+!(!(foo || bar))
+!(!1).baz
+~a
+-a
++a
+-(-a).foo
++(+a).foo
diff --git a/test/yarp/fixtures/unparser/corpus/literal/undef.txt b/test/prism/fixtures/unparser/corpus/literal/undef.txt
similarity index 100%
rename from test/yarp/fixtures/unparser/corpus/literal/undef.txt
rename to test/prism/fixtures/unparser/corpus/literal/undef.txt
diff --git a/test/yarp/fixtures/unparser/corpus/literal/variables.txt b/test/prism/fixtures/unparser/corpus/literal/variables.txt
similarity index 100%
rename from test/yarp/fixtures/unparser/corpus/literal/variables.txt
rename to test/prism/fixtures/unparser/corpus/literal/variables.txt
diff --git a/test/yarp/fixtures/unparser/corpus/literal/while.txt b/test/prism/fixtures/unparser/corpus/literal/while.txt
similarity index 100%
rename from test/yarp/fixtures/unparser/corpus/literal/while.txt
rename to test/prism/fixtures/unparser/corpus/literal/while.txt
diff --git a/test/yarp/fixtures/unparser/corpus/semantic/and.txt b/test/prism/fixtures/unparser/corpus/semantic/and.txt
similarity index 100%
rename from test/yarp/fixtures/unparser/corpus/semantic/and.txt
rename to test/prism/fixtures/unparser/corpus/semantic/and.txt
diff --git a/test/yarp/fixtures/unparser/corpus/semantic/block.txt b/test/prism/fixtures/unparser/corpus/semantic/block.txt
similarity index 100%
rename from test/yarp/fixtures/unparser/corpus/semantic/block.txt
rename to test/prism/fixtures/unparser/corpus/semantic/block.txt
diff --git a/test/yarp/fixtures/unparser/corpus/semantic/def.txt b/test/prism/fixtures/unparser/corpus/semantic/def.txt
similarity index 100%
rename from test/yarp/fixtures/unparser/corpus/semantic/def.txt
rename to test/prism/fixtures/unparser/corpus/semantic/def.txt
diff --git a/test/yarp/fixtures/unparser/corpus/semantic/dstr.txt b/test/prism/fixtures/unparser/corpus/semantic/dstr.txt
similarity index 100%
rename from test/yarp/fixtures/unparser/corpus/semantic/dstr.txt
rename to test/prism/fixtures/unparser/corpus/semantic/dstr.txt
diff --git a/test/yarp/fixtures/unparser/corpus/semantic/kwbegin.txt b/test/prism/fixtures/unparser/corpus/semantic/kwbegin.txt
similarity index 100%
rename from test/yarp/fixtures/unparser/corpus/semantic/kwbegin.txt
rename to test/prism/fixtures/unparser/corpus/semantic/kwbegin.txt
diff --git a/test/yarp/fixtures/unparser/corpus/semantic/literal.txt b/test/prism/fixtures/unparser/corpus/semantic/literal.txt
similarity index 100%
rename from test/yarp/fixtures/unparser/corpus/semantic/literal.txt
rename to test/prism/fixtures/unparser/corpus/semantic/literal.txt
diff --git a/test/prism/fixtures/unparser/corpus/semantic/opasgn.txt b/test/prism/fixtures/unparser/corpus/semantic/opasgn.txt
new file mode 100644
index 00000000000000..8b4bc5d2395ed5
--- /dev/null
+++ b/test/prism/fixtures/unparser/corpus/semantic/opasgn.txt
@@ -0,0 +1 @@
+y["#{42}\n"] += "#{42}\n"
diff --git a/test/yarp/fixtures/unparser/corpus/semantic/send.txt b/test/prism/fixtures/unparser/corpus/semantic/send.txt
similarity index 100%
rename from test/yarp/fixtures/unparser/corpus/semantic/send.txt
rename to test/prism/fixtures/unparser/corpus/semantic/send.txt
diff --git a/test/yarp/fixtures/unparser/corpus/semantic/undef.txt b/test/prism/fixtures/unparser/corpus/semantic/undef.txt
similarity index 100%
rename from test/yarp/fixtures/unparser/corpus/semantic/undef.txt
rename to test/prism/fixtures/unparser/corpus/semantic/undef.txt
diff --git a/test/yarp/fixtures/unparser/corpus/semantic/while.txt b/test/prism/fixtures/unparser/corpus/semantic/while.txt
similarity index 100%
rename from test/yarp/fixtures/unparser/corpus/semantic/while.txt
rename to test/prism/fixtures/unparser/corpus/semantic/while.txt
diff --git a/test/prism/fixtures/until.txt b/test/prism/fixtures/until.txt
new file mode 100644
index 00000000000000..652fc8c5a7c802
--- /dev/null
+++ b/test/prism/fixtures/until.txt
@@ -0,0 +1,13 @@
+until true; 1; end
+
+1 until true
+
+tap { break until true }
+
+tap { next until true }
+
+return until true
+
+foo :a, :b until bar?
+
+foo while bar in baz
diff --git a/test/prism/fixtures/variables.txt b/test/prism/fixtures/variables.txt
new file mode 100644
index 00000000000000..4f4dc6f9c82112
--- /dev/null
+++ b/test/prism/fixtures/variables.txt
@@ -0,0 +1,49 @@
+@@abc
+
+@@abc = 1
+
+@@foo, @@bar = 1
+
+@@foo = 1, 2
+
+$abc = 1
+
+$abc
+
+@abc
+
+@abc = 1
+
+a
+
+abc = 1
+
+$foo, $bar = 1
+
+$foo = 1, 2
+
+@foo, @bar = 1
+
+@foo = 1, 2
+
+foo = 1; foo = 1, 2
+
+foo = 1, 2
+
+foo, * = 1, 2
+
+foo, = 1, 2
+
+foo, *bar = 1, 2
+
+foo, (bar, baz) = 1, [2, 3]
+
+foo = *bar
+
+Foo = 1, 2
+
+(a; b; c)
+
+a, (b, c), d = []
+
+(a,), = []
diff --git a/test/prism/fixtures/while.txt b/test/prism/fixtures/while.txt
new file mode 100644
index 00000000000000..b776f755eeb798
--- /dev/null
+++ b/test/prism/fixtures/while.txt
@@ -0,0 +1,23 @@
+while true; 1; end
+
+1 while true
+
+tap { break while true }
+
+tap { next while true }
+
+return while true
+
+foo :a, :b while bar?
+
+tap { while def self.foo a = tap do end; end; break; end }
+
+tap { while class Foo a = tap do end; end; break; end }
+
+tap { while class << self; tap do end; end; break; end }
+
+tap { while class << self; a = tap do end; end; break; end }
+
+while def foo = bar do end; end
+
+foo while bar in baz
diff --git a/test/yarp/fixtures/whitequark/LICENSE b/test/prism/fixtures/whitequark/LICENSE
similarity index 90%
rename from test/yarp/fixtures/whitequark/LICENSE
rename to test/prism/fixtures/whitequark/LICENSE
index 971310e3d689fe..43f9788985305d 100644
--- a/test/yarp/fixtures/whitequark/LICENSE
+++ b/test/prism/fixtures/whitequark/LICENSE
@@ -1,4 +1,5 @@
-Copyright (c) 2013-2016 whitequark  <whitequark@whitequark.org>
+Copyright (c) 2013-2024 parser project contributors
+Copyright (c) 2013-2016 Catherine  <whitequark@whitequark.org>
 
 Parts of the source are derived from ruby_parser:
 Copyright (c) Ryan Davis, seattle.rb
diff --git a/test/yarp/fixtures/whitequark/__ENCODING__.txt b/test/prism/fixtures/whitequark/__ENCODING__.txt
similarity index 100%
rename from test/yarp/fixtures/whitequark/__ENCODING__.txt
rename to test/prism/fixtures/whitequark/__ENCODING__.txt
diff --git a/test/yarp/fixtures/whitequark/__ENCODING___legacy_.txt b/test/prism/fixtures/whitequark/__ENCODING___legacy_.txt
similarity index 100%
rename from test/yarp/fixtures/whitequark/__ENCODING___legacy_.txt
rename to test/prism/fixtures/whitequark/__ENCODING___legacy_.txt
diff --git a/test/yarp/fixtures/whitequark/alias.txt b/test/prism/fixtures/whitequark/alias.txt
similarity index 100%
rename from test/yarp/fixtures/whitequark/alias.txt
rename to test/prism/fixtures/whitequark/alias.txt
diff --git a/test/yarp/fixtures/whitequark/alias_gvar.txt b/test/prism/fixtures/whitequark/alias_gvar.txt
similarity index 100%
rename from test/yarp/fixtures/whitequark/alias_gvar.txt
rename to test/prism/fixtures/whitequark/alias_gvar.txt
diff --git a/test/yarp/fixtures/whitequark/ambiuous_quoted_label_in_ternary_operator.txt b/test/prism/fixtures/whitequark/ambiuous_quoted_label_in_ternary_operator.txt
similarity index 100%
rename from test/yarp/fixtures/whitequark/ambiuous_quoted_label_in_ternary_operator.txt
rename to test/prism/fixtures/whitequark/ambiuous_quoted_label_in_ternary_operator.txt
diff --git a/test/yarp/fixtures/whitequark/and.txt b/test/prism/fixtures/whitequark/and.txt
similarity index 100%
rename from test/yarp/fixtures/whitequark/and.txt
rename to test/prism/fixtures/whitequark/and.txt
diff --git a/test/yarp/fixtures/whitequark/and_asgn.txt b/test/prism/fixtures/whitequark/and_asgn.txt
similarity index 100%
rename from test/yarp/fixtures/whitequark/and_asgn.txt
rename to test/prism/fixtures/whitequark/and_asgn.txt
diff --git a/test/yarp/fixtures/whitequark/and_or_masgn.txt b/test/prism/fixtures/whitequark/and_or_masgn.txt
similarity index 100%
rename from test/yarp/fixtures/whitequark/and_or_masgn.txt
rename to test/prism/fixtures/whitequark/and_or_masgn.txt
diff --git a/test/yarp/fixtures/whitequark/anonymous_blockarg.txt b/test/prism/fixtures/whitequark/anonymous_blockarg.txt
similarity index 100%
rename from test/yarp/fixtures/whitequark/anonymous_blockarg.txt
rename to test/prism/fixtures/whitequark/anonymous_blockarg.txt
diff --git a/test/yarp/fixtures/whitequark/arg.txt b/test/prism/fixtures/whitequark/arg.txt
similarity index 100%
rename from test/yarp/fixtures/whitequark/arg.txt
rename to test/prism/fixtures/whitequark/arg.txt
diff --git a/test/prism/fixtures/whitequark/arg_combinations.txt b/test/prism/fixtures/whitequark/arg_combinations.txt
new file mode 100644
index 00000000000000..801b1e47f4c58e
--- /dev/null
+++ b/test/prism/fixtures/whitequark/arg_combinations.txt
@@ -0,0 +1,29 @@
+def f &b; end
+
+def f *r, &b; end
+
+def f *r, p, &b; end
+
+def f ; end
+
+def f a, &b; end
+
+def f a, *r, &b; end
+
+def f a, *r, p, &b; end
+
+def f a, o=1, &b; end
+
+def f a, o=1, *r, &b; end
+
+def f a, o=1, *r, p, &b; end
+
+def f a, o=1, p, &b; end
+
+def f o=1, &b; end
+
+def f o=1, *r, &b; end
+
+def f o=1, *r, p, &b; end
+
+def f o=1, p, &b; end
diff --git a/test/yarp/fixtures/whitequark/arg_duplicate_ignored.txt b/test/prism/fixtures/whitequark/arg_duplicate_ignored.txt
similarity index 100%
rename from test/yarp/fixtures/whitequark/arg_duplicate_ignored.txt
rename to test/prism/fixtures/whitequark/arg_duplicate_ignored.txt
diff --git a/test/yarp/fixtures/whitequark/arg_label.txt b/test/prism/fixtures/whitequark/arg_label.txt
similarity index 100%
rename from test/yarp/fixtures/whitequark/arg_label.txt
rename to test/prism/fixtures/whitequark/arg_label.txt
diff --git a/test/yarp/fixtures/whitequark/arg_scope.txt b/test/prism/fixtures/whitequark/arg_scope.txt
similarity index 100%
rename from test/yarp/fixtures/whitequark/arg_scope.txt
rename to test/prism/fixtures/whitequark/arg_scope.txt
diff --git a/test/yarp/fixtures/whitequark/args.txt b/test/prism/fixtures/whitequark/args.txt
similarity index 100%
rename from test/yarp/fixtures/whitequark/args.txt
rename to test/prism/fixtures/whitequark/args.txt
diff --git a/test/yarp/fixtures/whitequark/args_args_assocs.txt b/test/prism/fixtures/whitequark/args_args_assocs.txt
similarity index 100%
rename from test/yarp/fixtures/whitequark/args_args_assocs.txt
rename to test/prism/fixtures/whitequark/args_args_assocs.txt
diff --git a/test/yarp/fixtures/whitequark/args_args_assocs_comma.txt b/test/prism/fixtures/whitequark/args_args_assocs_comma.txt
similarity index 100%
rename from test/yarp/fixtures/whitequark/args_args_assocs_comma.txt
rename to test/prism/fixtures/whitequark/args_args_assocs_comma.txt
diff --git a/test/yarp/fixtures/whitequark/args_args_comma.txt b/test/prism/fixtures/whitequark/args_args_comma.txt
similarity index 100%
rename from test/yarp/fixtures/whitequark/args_args_comma.txt
rename to test/prism/fixtures/whitequark/args_args_comma.txt
diff --git a/test/yarp/fixtures/whitequark/args_args_star.txt b/test/prism/fixtures/whitequark/args_args_star.txt
similarity index 100%
rename from test/yarp/fixtures/whitequark/args_args_star.txt
rename to test/prism/fixtures/whitequark/args_args_star.txt
diff --git a/test/yarp/fixtures/whitequark/args_assocs_comma.txt b/test/prism/fixtures/whitequark/args_assocs_comma.txt
similarity index 100%
rename from test/yarp/fixtures/whitequark/args_assocs_comma.txt
rename to test/prism/fixtures/whitequark/args_assocs_comma.txt
diff --git a/test/yarp/fixtures/whitequark/args_block_pass.txt b/test/prism/fixtures/whitequark/args_block_pass.txt
similarity index 100%
rename from test/yarp/fixtures/whitequark/args_block_pass.txt
rename to test/prism/fixtures/whitequark/args_block_pass.txt
diff --git a/test/yarp/fixtures/whitequark/args_cmd.txt b/test/prism/fixtures/whitequark/args_cmd.txt
similarity index 100%
rename from test/yarp/fixtures/whitequark/args_cmd.txt
rename to test/prism/fixtures/whitequark/args_cmd.txt
diff --git a/test/yarp/fixtures/whitequark/args_star.txt b/test/prism/fixtures/whitequark/args_star.txt
similarity index 100%
rename from test/yarp/fixtures/whitequark/args_star.txt
rename to test/prism/fixtures/whitequark/args_star.txt
diff --git a/test/yarp/fixtures/whitequark/array_assocs.txt b/test/prism/fixtures/whitequark/array_assocs.txt
similarity index 100%
rename from test/yarp/fixtures/whitequark/array_assocs.txt
rename to test/prism/fixtures/whitequark/array_assocs.txt
diff --git a/test/yarp/fixtures/whitequark/array_plain.txt b/test/prism/fixtures/whitequark/array_plain.txt
similarity index 100%
rename from test/yarp/fixtures/whitequark/array_plain.txt
rename to test/prism/fixtures/whitequark/array_plain.txt
diff --git a/test/yarp/fixtures/whitequark/array_splat.txt b/test/prism/fixtures/whitequark/array_splat.txt
similarity index 100%
rename from test/yarp/fixtures/whitequark/array_splat.txt
rename to test/prism/fixtures/whitequark/array_splat.txt
diff --git a/test/yarp/fixtures/whitequark/array_symbols.txt b/test/prism/fixtures/whitequark/array_symbols.txt
similarity index 100%
rename from test/yarp/fixtures/whitequark/array_symbols.txt
rename to test/prism/fixtures/whitequark/array_symbols.txt
diff --git a/test/yarp/fixtures/whitequark/array_symbols_empty.txt b/test/prism/fixtures/whitequark/array_symbols_empty.txt
similarity index 100%
rename from test/yarp/fixtures/whitequark/array_symbols_empty.txt
rename to test/prism/fixtures/whitequark/array_symbols_empty.txt
diff --git a/test/yarp/fixtures/whitequark/array_symbols_interp.txt b/test/prism/fixtures/whitequark/array_symbols_interp.txt
similarity index 100%
rename from test/yarp/fixtures/whitequark/array_symbols_interp.txt
rename to test/prism/fixtures/whitequark/array_symbols_interp.txt
diff --git a/test/yarp/fixtures/whitequark/array_words.txt b/test/prism/fixtures/whitequark/array_words.txt
similarity index 100%
rename from test/yarp/fixtures/whitequark/array_words.txt
rename to test/prism/fixtures/whitequark/array_words.txt
diff --git a/test/yarp/fixtures/whitequark/array_words_empty.txt b/test/prism/fixtures/whitequark/array_words_empty.txt
similarity index 100%
rename from test/yarp/fixtures/whitequark/array_words_empty.txt
rename to test/prism/fixtures/whitequark/array_words_empty.txt
diff --git a/test/yarp/fixtures/whitequark/array_words_interp.txt b/test/prism/fixtures/whitequark/array_words_interp.txt
similarity index 100%
rename from test/yarp/fixtures/whitequark/array_words_interp.txt
rename to test/prism/fixtures/whitequark/array_words_interp.txt
diff --git a/test/yarp/fixtures/whitequark/asgn_cmd.txt b/test/prism/fixtures/whitequark/asgn_cmd.txt
similarity index 100%
rename from test/yarp/fixtures/whitequark/asgn_cmd.txt
rename to test/prism/fixtures/whitequark/asgn_cmd.txt
diff --git a/test/yarp/fixtures/whitequark/asgn_mrhs.txt b/test/prism/fixtures/whitequark/asgn_mrhs.txt
similarity index 100%
rename from test/yarp/fixtures/whitequark/asgn_mrhs.txt
rename to test/prism/fixtures/whitequark/asgn_mrhs.txt
diff --git a/test/yarp/fixtures/whitequark/back_ref.txt b/test/prism/fixtures/whitequark/back_ref.txt
similarity index 100%
rename from test/yarp/fixtures/whitequark/back_ref.txt
rename to test/prism/fixtures/whitequark/back_ref.txt
diff --git a/test/yarp/fixtures/whitequark/bang.txt b/test/prism/fixtures/whitequark/bang.txt
similarity index 100%
rename from test/yarp/fixtures/whitequark/bang.txt
rename to test/prism/fixtures/whitequark/bang.txt
diff --git a/test/yarp/fixtures/whitequark/bang_cmd.txt b/test/prism/fixtures/whitequark/bang_cmd.txt
similarity index 100%
rename from test/yarp/fixtures/whitequark/bang_cmd.txt
rename to test/prism/fixtures/whitequark/bang_cmd.txt
diff --git a/test/yarp/fixtures/whitequark/begin_cmdarg.txt b/test/prism/fixtures/whitequark/begin_cmdarg.txt
similarity index 100%
rename from test/yarp/fixtures/whitequark/begin_cmdarg.txt
rename to test/prism/fixtures/whitequark/begin_cmdarg.txt
diff --git a/test/yarp/fixtures/whitequark/beginless_erange_after_newline.txt b/test/prism/fixtures/whitequark/beginless_erange_after_newline.txt
similarity index 100%
rename from test/yarp/fixtures/whitequark/beginless_erange_after_newline.txt
rename to test/prism/fixtures/whitequark/beginless_erange_after_newline.txt
diff --git a/test/yarp/fixtures/whitequark/beginless_irange_after_newline.txt b/test/prism/fixtures/whitequark/beginless_irange_after_newline.txt
similarity index 100%
rename from test/yarp/fixtures/whitequark/beginless_irange_after_newline.txt
rename to test/prism/fixtures/whitequark/beginless_irange_after_newline.txt
diff --git a/test/yarp/fixtures/whitequark/beginless_range.txt b/test/prism/fixtures/whitequark/beginless_range.txt
similarity index 100%
rename from test/yarp/fixtures/whitequark/beginless_range.txt
rename to test/prism/fixtures/whitequark/beginless_range.txt
diff --git a/test/prism/fixtures/whitequark/block_arg_combinations.txt b/test/prism/fixtures/whitequark/block_arg_combinations.txt
new file mode 100644
index 00000000000000..ccb9cfea56c7c8
--- /dev/null
+++ b/test/prism/fixtures/whitequark/block_arg_combinations.txt
@@ -0,0 +1,57 @@
+f{  }
+
+f{ | | }
+
+f{ |&b| }
+
+f{ |*, &b| }
+
+f{ |*r, p, &b| }
+
+f{ |*s, &b| }
+
+f{ |*s| }
+
+f{ |*| }
+
+f{ |;
+a
+| }
+
+f{ |;a| }
+
+f{ |a, &b| }
+
+f{ |a, *, &b| }
+
+f{ |a, *r, p, &b| }
+
+f{ |a, *s, &b| }
+
+f{ |a, *s| }
+
+f{ |a, *| }
+
+f{ |a, c| }
+
+f{ |a, o=1, &b| }
+
+f{ |a, o=1, *r, p, &b| }
+
+f{ |a, o=1, o1=2, *r, &b| }
+
+f{ |a, o=1, p, &b| }
+
+f{ |a,| }
+
+f{ |a| }
+
+f{ |o=1, &b| }
+
+f{ |o=1, *r, &b| }
+
+f{ |o=1, *r, p, &b| }
+
+f{ |o=1, p, &b| }
+
+f{ || }
diff --git a/test/prism/fixtures/whitequark/block_kwarg.txt b/test/prism/fixtures/whitequark/block_kwarg.txt
new file mode 100644
index 00000000000000..9f1283371f432c
--- /dev/null
+++ b/test/prism/fixtures/whitequark/block_kwarg.txt
@@ -0,0 +1 @@
+f{ |foo:| }
diff --git a/test/prism/fixtures/whitequark/block_kwarg_combinations.txt b/test/prism/fixtures/whitequark/block_kwarg_combinations.txt
new file mode 100644
index 00000000000000..3dbb961777a8f8
--- /dev/null
+++ b/test/prism/fixtures/whitequark/block_kwarg_combinations.txt
@@ -0,0 +1,5 @@
+f{ |**baz, &b| }
+
+f{ |foo: 1, &b| }
+
+f{ |foo: 1, bar: 2, **baz, &b| }
diff --git a/test/yarp/fixtures/whitequark/blockarg.txt b/test/prism/fixtures/whitequark/blockarg.txt
similarity index 100%
rename from test/yarp/fixtures/whitequark/blockarg.txt
rename to test/prism/fixtures/whitequark/blockarg.txt
diff --git a/test/yarp/fixtures/whitequark/blockargs.txt b/test/prism/fixtures/whitequark/blockargs.txt
similarity index 100%
rename from test/yarp/fixtures/whitequark/blockargs.txt
rename to test/prism/fixtures/whitequark/blockargs.txt
diff --git a/test/yarp/fixtures/whitequark/bug_435.txt b/test/prism/fixtures/whitequark/bug_435.txt
similarity index 100%
rename from test/yarp/fixtures/whitequark/bug_435.txt
rename to test/prism/fixtures/whitequark/bug_435.txt
diff --git a/test/yarp/fixtures/whitequark/bug_447.txt b/test/prism/fixtures/whitequark/bug_447.txt
similarity index 100%
rename from test/yarp/fixtures/whitequark/bug_447.txt
rename to test/prism/fixtures/whitequark/bug_447.txt
diff --git a/test/yarp/fixtures/whitequark/bug_452.txt b/test/prism/fixtures/whitequark/bug_452.txt
similarity index 100%
rename from test/yarp/fixtures/whitequark/bug_452.txt
rename to test/prism/fixtures/whitequark/bug_452.txt
diff --git a/test/yarp/fixtures/whitequark/bug_466.txt b/test/prism/fixtures/whitequark/bug_466.txt
similarity index 100%
rename from test/yarp/fixtures/whitequark/bug_466.txt
rename to test/prism/fixtures/whitequark/bug_466.txt
diff --git a/test/yarp/fixtures/whitequark/bug_473.txt b/test/prism/fixtures/whitequark/bug_473.txt
similarity index 100%
rename from test/yarp/fixtures/whitequark/bug_473.txt
rename to test/prism/fixtures/whitequark/bug_473.txt
diff --git a/test/yarp/fixtures/whitequark/bug_480.txt b/test/prism/fixtures/whitequark/bug_480.txt
similarity index 100%
rename from test/yarp/fixtures/whitequark/bug_480.txt
rename to test/prism/fixtures/whitequark/bug_480.txt
diff --git a/test/yarp/fixtures/whitequark/bug_481.txt b/test/prism/fixtures/whitequark/bug_481.txt
similarity index 100%
rename from test/yarp/fixtures/whitequark/bug_481.txt
rename to test/prism/fixtures/whitequark/bug_481.txt
diff --git a/test/yarp/fixtures/whitequark/bug_ascii_8bit_in_literal.txt b/test/prism/fixtures/whitequark/bug_ascii_8bit_in_literal.txt
similarity index 100%
rename from test/yarp/fixtures/whitequark/bug_ascii_8bit_in_literal.txt
rename to test/prism/fixtures/whitequark/bug_ascii_8bit_in_literal.txt
diff --git a/test/yarp/fixtures/whitequark/bug_cmd_string_lookahead.txt b/test/prism/fixtures/whitequark/bug_cmd_string_lookahead.txt
similarity index 100%
rename from test/yarp/fixtures/whitequark/bug_cmd_string_lookahead.txt
rename to test/prism/fixtures/whitequark/bug_cmd_string_lookahead.txt
diff --git a/test/yarp/fixtures/whitequark/bug_cmdarg.txt b/test/prism/fixtures/whitequark/bug_cmdarg.txt
similarity index 100%
rename from test/yarp/fixtures/whitequark/bug_cmdarg.txt
rename to test/prism/fixtures/whitequark/bug_cmdarg.txt
diff --git a/test/yarp/fixtures/whitequark/bug_def_no_paren_eql_begin.txt b/test/prism/fixtures/whitequark/bug_def_no_paren_eql_begin.txt
similarity index 100%
rename from test/yarp/fixtures/whitequark/bug_def_no_paren_eql_begin.txt
rename to test/prism/fixtures/whitequark/bug_def_no_paren_eql_begin.txt
diff --git a/test/yarp/fixtures/whitequark/bug_do_block_in_call_args.txt b/test/prism/fixtures/whitequark/bug_do_block_in_call_args.txt
similarity index 100%
rename from test/yarp/fixtures/whitequark/bug_do_block_in_call_args.txt
rename to test/prism/fixtures/whitequark/bug_do_block_in_call_args.txt
diff --git a/test/yarp/fixtures/whitequark/bug_do_block_in_cmdarg.txt b/test/prism/fixtures/whitequark/bug_do_block_in_cmdarg.txt
similarity index 100%
rename from test/yarp/fixtures/whitequark/bug_do_block_in_cmdarg.txt
rename to test/prism/fixtures/whitequark/bug_do_block_in_cmdarg.txt
diff --git a/test/yarp/fixtures/whitequark/bug_do_block_in_hash_brace.txt b/test/prism/fixtures/whitequark/bug_do_block_in_hash_brace.txt
similarity index 100%
rename from test/yarp/fixtures/whitequark/bug_do_block_in_hash_brace.txt
rename to test/prism/fixtures/whitequark/bug_do_block_in_hash_brace.txt
diff --git a/test/yarp/fixtures/whitequark/bug_heredoc_do.txt b/test/prism/fixtures/whitequark/bug_heredoc_do.txt
similarity index 100%
rename from test/yarp/fixtures/whitequark/bug_heredoc_do.txt
rename to test/prism/fixtures/whitequark/bug_heredoc_do.txt
diff --git a/test/yarp/fixtures/whitequark/bug_interp_single.txt b/test/prism/fixtures/whitequark/bug_interp_single.txt
similarity index 100%
rename from test/yarp/fixtures/whitequark/bug_interp_single.txt
rename to test/prism/fixtures/whitequark/bug_interp_single.txt
diff --git a/test/yarp/fixtures/whitequark/bug_lambda_leakage.txt b/test/prism/fixtures/whitequark/bug_lambda_leakage.txt
similarity index 100%
rename from test/yarp/fixtures/whitequark/bug_lambda_leakage.txt
rename to test/prism/fixtures/whitequark/bug_lambda_leakage.txt
diff --git a/test/yarp/fixtures/whitequark/bug_regex_verification.txt b/test/prism/fixtures/whitequark/bug_regex_verification.txt
similarity index 100%
rename from test/yarp/fixtures/whitequark/bug_regex_verification.txt
rename to test/prism/fixtures/whitequark/bug_regex_verification.txt
diff --git a/test/yarp/fixtures/whitequark/bug_rescue_empty_else.txt b/test/prism/fixtures/whitequark/bug_rescue_empty_else.txt
similarity index 100%
rename from test/yarp/fixtures/whitequark/bug_rescue_empty_else.txt
rename to test/prism/fixtures/whitequark/bug_rescue_empty_else.txt
diff --git a/test/yarp/fixtures/whitequark/bug_while_not_parens_do.txt b/test/prism/fixtures/whitequark/bug_while_not_parens_do.txt
similarity index 100%
rename from test/yarp/fixtures/whitequark/bug_while_not_parens_do.txt
rename to test/prism/fixtures/whitequark/bug_while_not_parens_do.txt
diff --git a/test/yarp/fixtures/whitequark/case_cond.txt b/test/prism/fixtures/whitequark/case_cond.txt
similarity index 100%
rename from test/yarp/fixtures/whitequark/case_cond.txt
rename to test/prism/fixtures/whitequark/case_cond.txt
diff --git a/test/yarp/fixtures/whitequark/case_cond_else.txt b/test/prism/fixtures/whitequark/case_cond_else.txt
similarity index 100%
rename from test/yarp/fixtures/whitequark/case_cond_else.txt
rename to test/prism/fixtures/whitequark/case_cond_else.txt
diff --git a/test/yarp/fixtures/whitequark/case_expr.txt b/test/prism/fixtures/whitequark/case_expr.txt
similarity index 100%
rename from test/yarp/fixtures/whitequark/case_expr.txt
rename to test/prism/fixtures/whitequark/case_expr.txt
diff --git a/test/yarp/fixtures/whitequark/case_expr_else.txt b/test/prism/fixtures/whitequark/case_expr_else.txt
similarity index 100%
rename from test/yarp/fixtures/whitequark/case_expr_else.txt
rename to test/prism/fixtures/whitequark/case_expr_else.txt
diff --git a/test/yarp/fixtures/whitequark/casgn_scoped.txt b/test/prism/fixtures/whitequark/casgn_scoped.txt
similarity index 100%
rename from test/yarp/fixtures/whitequark/casgn_scoped.txt
rename to test/prism/fixtures/whitequark/casgn_scoped.txt
diff --git a/test/yarp/fixtures/whitequark/casgn_toplevel.txt b/test/prism/fixtures/whitequark/casgn_toplevel.txt
similarity index 100%
rename from test/yarp/fixtures/whitequark/casgn_toplevel.txt
rename to test/prism/fixtures/whitequark/casgn_toplevel.txt
diff --git a/test/yarp/fixtures/whitequark/casgn_unscoped.txt b/test/prism/fixtures/whitequark/casgn_unscoped.txt
similarity index 100%
rename from test/yarp/fixtures/whitequark/casgn_unscoped.txt
rename to test/prism/fixtures/whitequark/casgn_unscoped.txt
diff --git a/test/yarp/fixtures/whitequark/character.txt b/test/prism/fixtures/whitequark/character.txt
similarity index 100%
rename from test/yarp/fixtures/whitequark/character.txt
rename to test/prism/fixtures/whitequark/character.txt
diff --git a/test/yarp/fixtures/whitequark/class.txt b/test/prism/fixtures/whitequark/class.txt
similarity index 100%
rename from test/yarp/fixtures/whitequark/class.txt
rename to test/prism/fixtures/whitequark/class.txt
diff --git a/test/yarp/fixtures/whitequark/class_super.txt b/test/prism/fixtures/whitequark/class_super.txt
similarity index 100%
rename from test/yarp/fixtures/whitequark/class_super.txt
rename to test/prism/fixtures/whitequark/class_super.txt
diff --git a/test/yarp/fixtures/whitequark/class_super_label.txt b/test/prism/fixtures/whitequark/class_super_label.txt
similarity index 100%
rename from test/yarp/fixtures/whitequark/class_super_label.txt
rename to test/prism/fixtures/whitequark/class_super_label.txt
diff --git a/test/yarp/fixtures/whitequark/comments_before_leading_dot__27.txt b/test/prism/fixtures/whitequark/comments_before_leading_dot__27.txt
similarity index 100%
rename from test/yarp/fixtures/whitequark/comments_before_leading_dot__27.txt
rename to test/prism/fixtures/whitequark/comments_before_leading_dot__27.txt
diff --git a/test/yarp/fixtures/whitequark/complex.txt b/test/prism/fixtures/whitequark/complex.txt
similarity index 100%
rename from test/yarp/fixtures/whitequark/complex.txt
rename to test/prism/fixtures/whitequark/complex.txt
diff --git a/test/yarp/fixtures/whitequark/cond_begin.txt b/test/prism/fixtures/whitequark/cond_begin.txt
similarity index 100%
rename from test/yarp/fixtures/whitequark/cond_begin.txt
rename to test/prism/fixtures/whitequark/cond_begin.txt
diff --git a/test/yarp/fixtures/whitequark/cond_begin_masgn.txt b/test/prism/fixtures/whitequark/cond_begin_masgn.txt
similarity index 100%
rename from test/yarp/fixtures/whitequark/cond_begin_masgn.txt
rename to test/prism/fixtures/whitequark/cond_begin_masgn.txt
diff --git a/test/yarp/fixtures/whitequark/cond_eflipflop.txt b/test/prism/fixtures/whitequark/cond_eflipflop.txt
similarity index 100%
rename from test/yarp/fixtures/whitequark/cond_eflipflop.txt
rename to test/prism/fixtures/whitequark/cond_eflipflop.txt
diff --git a/test/prism/fixtures/whitequark/cond_eflipflop_with_beginless_range.txt b/test/prism/fixtures/whitequark/cond_eflipflop_with_beginless_range.txt
new file mode 100644
index 00000000000000..757863b12bf56c
--- /dev/null
+++ b/test/prism/fixtures/whitequark/cond_eflipflop_with_beginless_range.txt
@@ -0,0 +1 @@
+if ...bar; end
diff --git a/test/prism/fixtures/whitequark/cond_eflipflop_with_endless_range.txt b/test/prism/fixtures/whitequark/cond_eflipflop_with_endless_range.txt
new file mode 100644
index 00000000000000..8a3b815ec9c9fc
--- /dev/null
+++ b/test/prism/fixtures/whitequark/cond_eflipflop_with_endless_range.txt
@@ -0,0 +1 @@
+if foo...; end
diff --git a/test/yarp/fixtures/whitequark/cond_iflipflop.txt b/test/prism/fixtures/whitequark/cond_iflipflop.txt
similarity index 100%
rename from test/yarp/fixtures/whitequark/cond_iflipflop.txt
rename to test/prism/fixtures/whitequark/cond_iflipflop.txt
diff --git a/test/prism/fixtures/whitequark/cond_iflipflop_with_beginless_range.txt b/test/prism/fixtures/whitequark/cond_iflipflop_with_beginless_range.txt
new file mode 100644
index 00000000000000..4ff5b09690055c
--- /dev/null
+++ b/test/prism/fixtures/whitequark/cond_iflipflop_with_beginless_range.txt
@@ -0,0 +1 @@
+if ..bar; end
diff --git a/test/prism/fixtures/whitequark/cond_iflipflop_with_endless_range.txt b/test/prism/fixtures/whitequark/cond_iflipflop_with_endless_range.txt
new file mode 100644
index 00000000000000..2739ad0e2a31a7
--- /dev/null
+++ b/test/prism/fixtures/whitequark/cond_iflipflop_with_endless_range.txt
@@ -0,0 +1 @@
+if foo..; end
diff --git a/test/yarp/fixtures/whitequark/cond_match_current_line.txt b/test/prism/fixtures/whitequark/cond_match_current_line.txt
similarity index 100%
rename from test/yarp/fixtures/whitequark/cond_match_current_line.txt
rename to test/prism/fixtures/whitequark/cond_match_current_line.txt
diff --git a/test/yarp/fixtures/whitequark/const_op_asgn.txt b/test/prism/fixtures/whitequark/const_op_asgn.txt
similarity index 100%
rename from test/yarp/fixtures/whitequark/const_op_asgn.txt
rename to test/prism/fixtures/whitequark/const_op_asgn.txt
diff --git a/test/yarp/fixtures/whitequark/const_scoped.txt b/test/prism/fixtures/whitequark/const_scoped.txt
similarity index 100%
rename from test/yarp/fixtures/whitequark/const_scoped.txt
rename to test/prism/fixtures/whitequark/const_scoped.txt
diff --git a/test/yarp/fixtures/whitequark/const_toplevel.txt b/test/prism/fixtures/whitequark/const_toplevel.txt
similarity index 100%
rename from test/yarp/fixtures/whitequark/const_toplevel.txt
rename to test/prism/fixtures/whitequark/const_toplevel.txt
diff --git a/test/yarp/fixtures/whitequark/const_unscoped.txt b/test/prism/fixtures/whitequark/const_unscoped.txt
similarity index 100%
rename from test/yarp/fixtures/whitequark/const_unscoped.txt
rename to test/prism/fixtures/whitequark/const_unscoped.txt
diff --git a/test/yarp/fixtures/whitequark/cpath.txt b/test/prism/fixtures/whitequark/cpath.txt
similarity index 100%
rename from test/yarp/fixtures/whitequark/cpath.txt
rename to test/prism/fixtures/whitequark/cpath.txt
diff --git a/test/yarp/fixtures/whitequark/cvar.txt b/test/prism/fixtures/whitequark/cvar.txt
similarity index 100%
rename from test/yarp/fixtures/whitequark/cvar.txt
rename to test/prism/fixtures/whitequark/cvar.txt
diff --git a/test/yarp/fixtures/whitequark/cvasgn.txt b/test/prism/fixtures/whitequark/cvasgn.txt
similarity index 100%
rename from test/yarp/fixtures/whitequark/cvasgn.txt
rename to test/prism/fixtures/whitequark/cvasgn.txt
diff --git a/test/yarp/fixtures/whitequark/dedenting_heredoc.txt b/test/prism/fixtures/whitequark/dedenting_heredoc.txt
similarity index 100%
rename from test/yarp/fixtures/whitequark/dedenting_heredoc.txt
rename to test/prism/fixtures/whitequark/dedenting_heredoc.txt
diff --git a/test/yarp/fixtures/whitequark/dedenting_interpolating_heredoc_fake_line_continuation.txt b/test/prism/fixtures/whitequark/dedenting_interpolating_heredoc_fake_line_continuation.txt
similarity index 100%
rename from test/yarp/fixtures/whitequark/dedenting_interpolating_heredoc_fake_line_continuation.txt
rename to test/prism/fixtures/whitequark/dedenting_interpolating_heredoc_fake_line_continuation.txt
diff --git a/test/yarp/fixtures/whitequark/dedenting_non_interpolating_heredoc_line_continuation.txt b/test/prism/fixtures/whitequark/dedenting_non_interpolating_heredoc_line_continuation.txt
similarity index 100%
rename from test/yarp/fixtures/whitequark/dedenting_non_interpolating_heredoc_line_continuation.txt
rename to test/prism/fixtures/whitequark/dedenting_non_interpolating_heredoc_line_continuation.txt
diff --git a/test/yarp/fixtures/whitequark/def.txt b/test/prism/fixtures/whitequark/def.txt
similarity index 100%
rename from test/yarp/fixtures/whitequark/def.txt
rename to test/prism/fixtures/whitequark/def.txt
diff --git a/test/yarp/fixtures/whitequark/defined.txt b/test/prism/fixtures/whitequark/defined.txt
similarity index 100%
rename from test/yarp/fixtures/whitequark/defined.txt
rename to test/prism/fixtures/whitequark/defined.txt
diff --git a/test/yarp/fixtures/whitequark/defs.txt b/test/prism/fixtures/whitequark/defs.txt
similarity index 100%
rename from test/yarp/fixtures/whitequark/defs.txt
rename to test/prism/fixtures/whitequark/defs.txt
diff --git a/test/prism/fixtures/whitequark/emit_arg_inside_procarg0_legacy.txt b/test/prism/fixtures/whitequark/emit_arg_inside_procarg0_legacy.txt
new file mode 100644
index 00000000000000..a985f15b6e0351
--- /dev/null
+++ b/test/prism/fixtures/whitequark/emit_arg_inside_procarg0_legacy.txt
@@ -0,0 +1 @@
+f{ |a| }
diff --git a/test/yarp/fixtures/whitequark/empty_stmt.txt b/test/prism/fixtures/whitequark/empty_stmt.txt
similarity index 100%
rename from test/yarp/fixtures/whitequark/empty_stmt.txt
rename to test/prism/fixtures/whitequark/empty_stmt.txt
diff --git a/test/yarp/fixtures/whitequark/endless_comparison_method.txt b/test/prism/fixtures/whitequark/endless_comparison_method.txt
similarity index 100%
rename from test/yarp/fixtures/whitequark/endless_comparison_method.txt
rename to test/prism/fixtures/whitequark/endless_comparison_method.txt
diff --git a/test/yarp/fixtures/whitequark/endless_method.txt b/test/prism/fixtures/whitequark/endless_method.txt
similarity index 100%
rename from test/yarp/fixtures/whitequark/endless_method.txt
rename to test/prism/fixtures/whitequark/endless_method.txt
diff --git a/test/yarp/fixtures/whitequark/endless_method_command_syntax.txt b/test/prism/fixtures/whitequark/endless_method_command_syntax.txt
similarity index 100%
rename from test/yarp/fixtures/whitequark/endless_method_command_syntax.txt
rename to test/prism/fixtures/whitequark/endless_method_command_syntax.txt
diff --git a/test/yarp/fixtures/whitequark/endless_method_forwarded_args_legacy.txt b/test/prism/fixtures/whitequark/endless_method_forwarded_args_legacy.txt
similarity index 100%
rename from test/yarp/fixtures/whitequark/endless_method_forwarded_args_legacy.txt
rename to test/prism/fixtures/whitequark/endless_method_forwarded_args_legacy.txt
diff --git a/test/yarp/fixtures/whitequark/endless_method_with_rescue_mod.txt b/test/prism/fixtures/whitequark/endless_method_with_rescue_mod.txt
similarity index 100%
rename from test/yarp/fixtures/whitequark/endless_method_with_rescue_mod.txt
rename to test/prism/fixtures/whitequark/endless_method_with_rescue_mod.txt
diff --git a/test/yarp/fixtures/whitequark/endless_method_without_args.txt b/test/prism/fixtures/whitequark/endless_method_without_args.txt
similarity index 100%
rename from test/yarp/fixtures/whitequark/endless_method_without_args.txt
rename to test/prism/fixtures/whitequark/endless_method_without_args.txt
diff --git a/test/yarp/fixtures/whitequark/ensure.txt b/test/prism/fixtures/whitequark/ensure.txt
similarity index 100%
rename from test/yarp/fixtures/whitequark/ensure.txt
rename to test/prism/fixtures/whitequark/ensure.txt
diff --git a/test/yarp/fixtures/whitequark/ensure_empty.txt b/test/prism/fixtures/whitequark/ensure_empty.txt
similarity index 100%
rename from test/yarp/fixtures/whitequark/ensure_empty.txt
rename to test/prism/fixtures/whitequark/ensure_empty.txt
diff --git a/test/yarp/fixtures/whitequark/false.txt b/test/prism/fixtures/whitequark/false.txt
similarity index 100%
rename from test/yarp/fixtures/whitequark/false.txt
rename to test/prism/fixtures/whitequark/false.txt
diff --git a/test/prism/fixtures/whitequark/find_pattern.txt b/test/prism/fixtures/whitequark/find_pattern.txt
new file mode 100644
index 00000000000000..fb8999ae288af5
--- /dev/null
+++ b/test/prism/fixtures/whitequark/find_pattern.txt
@@ -0,0 +1,7 @@
+case foo; in *, 42, * then true; end
+
+case foo; in Array[*, 1, *] then true; end
+
+case foo; in String(*, 1, *) then true; end
+
+case foo; in [*x, 1 => a, *y] then true; end
diff --git a/test/yarp/fixtures/whitequark/float.txt b/test/prism/fixtures/whitequark/float.txt
similarity index 100%
rename from test/yarp/fixtures/whitequark/float.txt
rename to test/prism/fixtures/whitequark/float.txt
diff --git a/test/yarp/fixtures/whitequark/for.txt b/test/prism/fixtures/whitequark/for.txt
similarity index 100%
rename from test/yarp/fixtures/whitequark/for.txt
rename to test/prism/fixtures/whitequark/for.txt
diff --git a/test/yarp/fixtures/whitequark/for_mlhs.txt b/test/prism/fixtures/whitequark/for_mlhs.txt
similarity index 100%
rename from test/yarp/fixtures/whitequark/for_mlhs.txt
rename to test/prism/fixtures/whitequark/for_mlhs.txt
diff --git a/test/yarp/fixtures/whitequark/forward_arg.txt b/test/prism/fixtures/whitequark/forward_arg.txt
similarity index 100%
rename from test/yarp/fixtures/whitequark/forward_arg.txt
rename to test/prism/fixtures/whitequark/forward_arg.txt
diff --git a/test/yarp/fixtures/whitequark/forward_arg_with_open_args.txt b/test/prism/fixtures/whitequark/forward_arg_with_open_args.txt
similarity index 100%
rename from test/yarp/fixtures/whitequark/forward_arg_with_open_args.txt
rename to test/prism/fixtures/whitequark/forward_arg_with_open_args.txt
diff --git a/test/yarp/fixtures/whitequark/forward_args_legacy.txt b/test/prism/fixtures/whitequark/forward_args_legacy.txt
similarity index 100%
rename from test/yarp/fixtures/whitequark/forward_args_legacy.txt
rename to test/prism/fixtures/whitequark/forward_args_legacy.txt
diff --git a/test/yarp/fixtures/whitequark/forwarded_argument_with_kwrestarg.txt b/test/prism/fixtures/whitequark/forwarded_argument_with_kwrestarg.txt
similarity index 100%
rename from test/yarp/fixtures/whitequark/forwarded_argument_with_kwrestarg.txt
rename to test/prism/fixtures/whitequark/forwarded_argument_with_kwrestarg.txt
diff --git a/test/yarp/fixtures/whitequark/forwarded_argument_with_restarg.txt b/test/prism/fixtures/whitequark/forwarded_argument_with_restarg.txt
similarity index 100%
rename from test/yarp/fixtures/whitequark/forwarded_argument_with_restarg.txt
rename to test/prism/fixtures/whitequark/forwarded_argument_with_restarg.txt
diff --git a/test/yarp/fixtures/whitequark/forwarded_kwrestarg.txt b/test/prism/fixtures/whitequark/forwarded_kwrestarg.txt
similarity index 100%
rename from test/yarp/fixtures/whitequark/forwarded_kwrestarg.txt
rename to test/prism/fixtures/whitequark/forwarded_kwrestarg.txt
diff --git a/test/yarp/fixtures/whitequark/forwarded_kwrestarg_with_additional_kwarg.txt b/test/prism/fixtures/whitequark/forwarded_kwrestarg_with_additional_kwarg.txt
similarity index 100%
rename from test/yarp/fixtures/whitequark/forwarded_kwrestarg_with_additional_kwarg.txt
rename to test/prism/fixtures/whitequark/forwarded_kwrestarg_with_additional_kwarg.txt
diff --git a/test/yarp/fixtures/whitequark/forwarded_restarg.txt b/test/prism/fixtures/whitequark/forwarded_restarg.txt
similarity index 100%
rename from test/yarp/fixtures/whitequark/forwarded_restarg.txt
rename to test/prism/fixtures/whitequark/forwarded_restarg.txt
diff --git a/test/yarp/fixtures/whitequark/gvar.txt b/test/prism/fixtures/whitequark/gvar.txt
similarity index 100%
rename from test/yarp/fixtures/whitequark/gvar.txt
rename to test/prism/fixtures/whitequark/gvar.txt
diff --git a/test/yarp/fixtures/whitequark/gvasgn.txt b/test/prism/fixtures/whitequark/gvasgn.txt
similarity index 100%
rename from test/yarp/fixtures/whitequark/gvasgn.txt
rename to test/prism/fixtures/whitequark/gvasgn.txt
diff --git a/test/yarp/fixtures/whitequark/hash_empty.txt b/test/prism/fixtures/whitequark/hash_empty.txt
similarity index 100%
rename from test/yarp/fixtures/whitequark/hash_empty.txt
rename to test/prism/fixtures/whitequark/hash_empty.txt
diff --git a/test/yarp/fixtures/whitequark/hash_hashrocket.txt b/test/prism/fixtures/whitequark/hash_hashrocket.txt
similarity index 100%
rename from test/yarp/fixtures/whitequark/hash_hashrocket.txt
rename to test/prism/fixtures/whitequark/hash_hashrocket.txt
diff --git a/test/yarp/fixtures/whitequark/hash_kwsplat.txt b/test/prism/fixtures/whitequark/hash_kwsplat.txt
similarity index 100%
rename from test/yarp/fixtures/whitequark/hash_kwsplat.txt
rename to test/prism/fixtures/whitequark/hash_kwsplat.txt
diff --git a/test/yarp/fixtures/whitequark/hash_label.txt b/test/prism/fixtures/whitequark/hash_label.txt
similarity index 100%
rename from test/yarp/fixtures/whitequark/hash_label.txt
rename to test/prism/fixtures/whitequark/hash_label.txt
diff --git a/test/yarp/fixtures/whitequark/hash_label_end.txt b/test/prism/fixtures/whitequark/hash_label_end.txt
similarity index 100%
rename from test/yarp/fixtures/whitequark/hash_label_end.txt
rename to test/prism/fixtures/whitequark/hash_label_end.txt
diff --git a/test/yarp/fixtures/whitequark/hash_pair_value_omission.txt b/test/prism/fixtures/whitequark/hash_pair_value_omission.txt
similarity index 100%
rename from test/yarp/fixtures/whitequark/hash_pair_value_omission.txt
rename to test/prism/fixtures/whitequark/hash_pair_value_omission.txt
diff --git a/test/yarp/fixtures/whitequark/heredoc.txt b/test/prism/fixtures/whitequark/heredoc.txt
similarity index 100%
rename from test/yarp/fixtures/whitequark/heredoc.txt
rename to test/prism/fixtures/whitequark/heredoc.txt
diff --git a/test/yarp/fixtures/whitequark/if.txt b/test/prism/fixtures/whitequark/if.txt
similarity index 100%
rename from test/yarp/fixtures/whitequark/if.txt
rename to test/prism/fixtures/whitequark/if.txt
diff --git a/test/yarp/fixtures/whitequark/if_else.txt b/test/prism/fixtures/whitequark/if_else.txt
similarity index 100%
rename from test/yarp/fixtures/whitequark/if_else.txt
rename to test/prism/fixtures/whitequark/if_else.txt
diff --git a/test/yarp/fixtures/whitequark/if_elsif.txt b/test/prism/fixtures/whitequark/if_elsif.txt
similarity index 100%
rename from test/yarp/fixtures/whitequark/if_elsif.txt
rename to test/prism/fixtures/whitequark/if_elsif.txt
diff --git a/test/yarp/fixtures/whitequark/if_masgn__24.txt b/test/prism/fixtures/whitequark/if_masgn__24.txt
similarity index 100%
rename from test/yarp/fixtures/whitequark/if_masgn__24.txt
rename to test/prism/fixtures/whitequark/if_masgn__24.txt
diff --git a/test/yarp/fixtures/whitequark/if_mod.txt b/test/prism/fixtures/whitequark/if_mod.txt
similarity index 100%
rename from test/yarp/fixtures/whitequark/if_mod.txt
rename to test/prism/fixtures/whitequark/if_mod.txt
diff --git a/test/yarp/fixtures/whitequark/if_nl_then.txt b/test/prism/fixtures/whitequark/if_nl_then.txt
similarity index 100%
rename from test/yarp/fixtures/whitequark/if_nl_then.txt
rename to test/prism/fixtures/whitequark/if_nl_then.txt
diff --git a/test/yarp/fixtures/whitequark/int.txt b/test/prism/fixtures/whitequark/int.txt
similarity index 100%
rename from test/yarp/fixtures/whitequark/int.txt
rename to test/prism/fixtures/whitequark/int.txt
diff --git a/test/yarp/fixtures/whitequark/int___LINE__.txt b/test/prism/fixtures/whitequark/int___LINE__.txt
similarity index 100%
rename from test/yarp/fixtures/whitequark/int___LINE__.txt
rename to test/prism/fixtures/whitequark/int___LINE__.txt
diff --git a/test/yarp/fixtures/whitequark/interp_digit_var.txt b/test/prism/fixtures/whitequark/interp_digit_var.txt
similarity index 100%
rename from test/yarp/fixtures/whitequark/interp_digit_var.txt
rename to test/prism/fixtures/whitequark/interp_digit_var.txt
diff --git a/test/yarp/fixtures/whitequark/ivar.txt b/test/prism/fixtures/whitequark/ivar.txt
similarity index 100%
rename from test/yarp/fixtures/whitequark/ivar.txt
rename to test/prism/fixtures/whitequark/ivar.txt
diff --git a/test/yarp/fixtures/whitequark/ivasgn.txt b/test/prism/fixtures/whitequark/ivasgn.txt
similarity index 100%
rename from test/yarp/fixtures/whitequark/ivasgn.txt
rename to test/prism/fixtures/whitequark/ivasgn.txt
diff --git a/test/yarp/fixtures/whitequark/keyword_argument_omission.txt b/test/prism/fixtures/whitequark/keyword_argument_omission.txt
similarity index 100%
rename from test/yarp/fixtures/whitequark/keyword_argument_omission.txt
rename to test/prism/fixtures/whitequark/keyword_argument_omission.txt
diff --git a/test/yarp/fixtures/whitequark/kwarg.txt b/test/prism/fixtures/whitequark/kwarg.txt
similarity index 100%
rename from test/yarp/fixtures/whitequark/kwarg.txt
rename to test/prism/fixtures/whitequark/kwarg.txt
diff --git a/test/prism/fixtures/whitequark/kwarg_combinations.txt b/test/prism/fixtures/whitequark/kwarg_combinations.txt
new file mode 100644
index 00000000000000..1bd792856e2d66
--- /dev/null
+++ b/test/prism/fixtures/whitequark/kwarg_combinations.txt
@@ -0,0 +1,7 @@
+def f (foo: 1, &b); end
+
+def f (foo: 1, bar: 2, **baz, &b); end
+
+def f **baz, &b; end
+
+def f *, **; end
diff --git a/test/prism/fixtures/whitequark/kwarg_no_paren.txt b/test/prism/fixtures/whitequark/kwarg_no_paren.txt
new file mode 100644
index 00000000000000..cf29c273d0daa8
--- /dev/null
+++ b/test/prism/fixtures/whitequark/kwarg_no_paren.txt
@@ -0,0 +1,5 @@
+def f foo:
+; end
+
+def f foo: -1
+; end
diff --git a/test/yarp/fixtures/whitequark/kwbegin_compstmt.txt b/test/prism/fixtures/whitequark/kwbegin_compstmt.txt
similarity index 100%
rename from test/yarp/fixtures/whitequark/kwbegin_compstmt.txt
rename to test/prism/fixtures/whitequark/kwbegin_compstmt.txt
diff --git a/test/yarp/fixtures/whitequark/kwnilarg.txt b/test/prism/fixtures/whitequark/kwnilarg.txt
similarity index 100%
rename from test/yarp/fixtures/whitequark/kwnilarg.txt
rename to test/prism/fixtures/whitequark/kwnilarg.txt
diff --git a/test/yarp/fixtures/whitequark/kwoptarg.txt b/test/prism/fixtures/whitequark/kwoptarg.txt
similarity index 100%
rename from test/yarp/fixtures/whitequark/kwoptarg.txt
rename to test/prism/fixtures/whitequark/kwoptarg.txt
diff --git a/test/yarp/fixtures/whitequark/kwoptarg_with_kwrestarg_and_forwarded_args.txt b/test/prism/fixtures/whitequark/kwoptarg_with_kwrestarg_and_forwarded_args.txt
similarity index 100%
rename from test/yarp/fixtures/whitequark/kwoptarg_with_kwrestarg_and_forwarded_args.txt
rename to test/prism/fixtures/whitequark/kwoptarg_with_kwrestarg_and_forwarded_args.txt
diff --git a/test/yarp/fixtures/whitequark/kwrestarg_named.txt b/test/prism/fixtures/whitequark/kwrestarg_named.txt
similarity index 100%
rename from test/yarp/fixtures/whitequark/kwrestarg_named.txt
rename to test/prism/fixtures/whitequark/kwrestarg_named.txt
diff --git a/test/yarp/fixtures/whitequark/kwrestarg_unnamed.txt b/test/prism/fixtures/whitequark/kwrestarg_unnamed.txt
similarity index 100%
rename from test/yarp/fixtures/whitequark/kwrestarg_unnamed.txt
rename to test/prism/fixtures/whitequark/kwrestarg_unnamed.txt
diff --git a/test/yarp/fixtures/whitequark/lbrace_arg_after_command_args.txt b/test/prism/fixtures/whitequark/lbrace_arg_after_command_args.txt
similarity index 100%
rename from test/yarp/fixtures/whitequark/lbrace_arg_after_command_args.txt
rename to test/prism/fixtures/whitequark/lbrace_arg_after_command_args.txt
diff --git a/test/yarp/fixtures/whitequark/lparenarg_after_lvar__since_25.txt b/test/prism/fixtures/whitequark/lparenarg_after_lvar__since_25.txt
similarity index 100%
rename from test/yarp/fixtures/whitequark/lparenarg_after_lvar__since_25.txt
rename to test/prism/fixtures/whitequark/lparenarg_after_lvar__since_25.txt
diff --git a/test/yarp/fixtures/whitequark/lvar.txt b/test/prism/fixtures/whitequark/lvar.txt
similarity index 100%
rename from test/yarp/fixtures/whitequark/lvar.txt
rename to test/prism/fixtures/whitequark/lvar.txt
diff --git a/test/prism/fixtures/whitequark/lvar_injecting_match.txt b/test/prism/fixtures/whitequark/lvar_injecting_match.txt
new file mode 100644
index 00000000000000..2d18c84b5710a5
--- /dev/null
+++ b/test/prism/fixtures/whitequark/lvar_injecting_match.txt
@@ -0,0 +1,3 @@
+/(?<a>a)/ =~ 'a'; /#{}(?<b>b)/ =~ 'b'; a; b
+
+/(?<match>bar)/ =~ 'bar'; match
diff --git a/test/yarp/fixtures/whitequark/lvasgn.txt b/test/prism/fixtures/whitequark/lvasgn.txt
similarity index 100%
rename from test/yarp/fixtures/whitequark/lvasgn.txt
rename to test/prism/fixtures/whitequark/lvasgn.txt
diff --git a/test/prism/fixtures/whitequark/marg_combinations.txt b/test/prism/fixtures/whitequark/marg_combinations.txt
new file mode 100644
index 00000000000000..aff34dcb6201e8
--- /dev/null
+++ b/test/prism/fixtures/whitequark/marg_combinations.txt
@@ -0,0 +1,19 @@
+def f (((a))); end
+
+def f ((*)); end
+
+def f ((*, p)); end
+
+def f ((*r)); end
+
+def f ((*r, p)); end
+
+def f ((a, *)); end
+
+def f ((a, *, p)); end
+
+def f ((a, *r)); end
+
+def f ((a, *r, p)); end
+
+def f ((a, a1)); end
diff --git a/test/yarp/fixtures/whitequark/masgn.txt b/test/prism/fixtures/whitequark/masgn.txt
similarity index 100%
rename from test/yarp/fixtures/whitequark/masgn.txt
rename to test/prism/fixtures/whitequark/masgn.txt
diff --git a/test/yarp/fixtures/whitequark/masgn_attr.txt b/test/prism/fixtures/whitequark/masgn_attr.txt
similarity index 100%
rename from test/yarp/fixtures/whitequark/masgn_attr.txt
rename to test/prism/fixtures/whitequark/masgn_attr.txt
diff --git a/test/yarp/fixtures/whitequark/masgn_cmd.txt b/test/prism/fixtures/whitequark/masgn_cmd.txt
similarity index 100%
rename from test/yarp/fixtures/whitequark/masgn_cmd.txt
rename to test/prism/fixtures/whitequark/masgn_cmd.txt
diff --git a/test/yarp/fixtures/whitequark/masgn_const.txt b/test/prism/fixtures/whitequark/masgn_const.txt
similarity index 100%
rename from test/yarp/fixtures/whitequark/masgn_const.txt
rename to test/prism/fixtures/whitequark/masgn_const.txt
diff --git a/test/yarp/fixtures/whitequark/masgn_nested.txt b/test/prism/fixtures/whitequark/masgn_nested.txt
similarity index 100%
rename from test/yarp/fixtures/whitequark/masgn_nested.txt
rename to test/prism/fixtures/whitequark/masgn_nested.txt
diff --git a/test/yarp/fixtures/whitequark/masgn_splat.txt b/test/prism/fixtures/whitequark/masgn_splat.txt
similarity index 100%
rename from test/yarp/fixtures/whitequark/masgn_splat.txt
rename to test/prism/fixtures/whitequark/masgn_splat.txt
diff --git a/test/yarp/fixtures/whitequark/method_definition_in_while_cond.txt b/test/prism/fixtures/whitequark/method_definition_in_while_cond.txt
similarity index 100%
rename from test/yarp/fixtures/whitequark/method_definition_in_while_cond.txt
rename to test/prism/fixtures/whitequark/method_definition_in_while_cond.txt
diff --git a/test/yarp/fixtures/whitequark/module.txt b/test/prism/fixtures/whitequark/module.txt
similarity index 100%
rename from test/yarp/fixtures/whitequark/module.txt
rename to test/prism/fixtures/whitequark/module.txt
diff --git a/test/prism/fixtures/whitequark/multiple_args_with_trailing_comma.txt b/test/prism/fixtures/whitequark/multiple_args_with_trailing_comma.txt
new file mode 100644
index 00000000000000..b69073875784ff
--- /dev/null
+++ b/test/prism/fixtures/whitequark/multiple_args_with_trailing_comma.txt
@@ -0,0 +1 @@
+f{ |a, b,| }
diff --git a/test/yarp/fixtures/whitequark/multiple_pattern_matches.txt b/test/prism/fixtures/whitequark/multiple_pattern_matches.txt
similarity index 100%
rename from test/yarp/fixtures/whitequark/multiple_pattern_matches.txt
rename to test/prism/fixtures/whitequark/multiple_pattern_matches.txt
diff --git a/test/yarp/fixtures/whitequark/newline_in_hash_argument.txt b/test/prism/fixtures/whitequark/newline_in_hash_argument.txt
similarity index 100%
rename from test/yarp/fixtures/whitequark/newline_in_hash_argument.txt
rename to test/prism/fixtures/whitequark/newline_in_hash_argument.txt
diff --git a/test/yarp/fixtures/whitequark/nil.txt b/test/prism/fixtures/whitequark/nil.txt
similarity index 100%
rename from test/yarp/fixtures/whitequark/nil.txt
rename to test/prism/fixtures/whitequark/nil.txt
diff --git a/test/yarp/fixtures/whitequark/nil_expression.txt b/test/prism/fixtures/whitequark/nil_expression.txt
similarity index 100%
rename from test/yarp/fixtures/whitequark/nil_expression.txt
rename to test/prism/fixtures/whitequark/nil_expression.txt
diff --git a/test/yarp/fixtures/whitequark/non_lvar_injecting_match.txt b/test/prism/fixtures/whitequark/non_lvar_injecting_match.txt
similarity index 100%
rename from test/yarp/fixtures/whitequark/non_lvar_injecting_match.txt
rename to test/prism/fixtures/whitequark/non_lvar_injecting_match.txt
diff --git a/test/yarp/fixtures/whitequark/not.txt b/test/prism/fixtures/whitequark/not.txt
similarity index 100%
rename from test/yarp/fixtures/whitequark/not.txt
rename to test/prism/fixtures/whitequark/not.txt
diff --git a/test/yarp/fixtures/whitequark/not_cmd.txt b/test/prism/fixtures/whitequark/not_cmd.txt
similarity index 100%
rename from test/yarp/fixtures/whitequark/not_cmd.txt
rename to test/prism/fixtures/whitequark/not_cmd.txt
diff --git a/test/yarp/fixtures/whitequark/not_masgn__24.txt b/test/prism/fixtures/whitequark/not_masgn__24.txt
similarity index 100%
rename from test/yarp/fixtures/whitequark/not_masgn__24.txt
rename to test/prism/fixtures/whitequark/not_masgn__24.txt
diff --git a/test/yarp/fixtures/whitequark/nth_ref.txt b/test/prism/fixtures/whitequark/nth_ref.txt
similarity index 100%
rename from test/yarp/fixtures/whitequark/nth_ref.txt
rename to test/prism/fixtures/whitequark/nth_ref.txt
diff --git a/test/yarp/fixtures/whitequark/numbered_args_after_27.txt b/test/prism/fixtures/whitequark/numbered_args_after_27.txt
similarity index 100%
rename from test/yarp/fixtures/whitequark/numbered_args_after_27.txt
rename to test/prism/fixtures/whitequark/numbered_args_after_27.txt
diff --git a/test/yarp/fixtures/whitequark/numparam_outside_block.txt b/test/prism/fixtures/whitequark/numparam_outside_block.txt
similarity index 100%
rename from test/yarp/fixtures/whitequark/numparam_outside_block.txt
rename to test/prism/fixtures/whitequark/numparam_outside_block.txt
diff --git a/test/prism/fixtures/whitequark/numparam_ruby_bug_19025.txt b/test/prism/fixtures/whitequark/numparam_ruby_bug_19025.txt
new file mode 100644
index 00000000000000..f9ffd4329aa508
--- /dev/null
+++ b/test/prism/fixtures/whitequark/numparam_ruby_bug_19025.txt
@@ -0,0 +1 @@
+p { [_1 **2] }
diff --git a/test/yarp/fixtures/whitequark/op_asgn.txt b/test/prism/fixtures/whitequark/op_asgn.txt
similarity index 100%
rename from test/yarp/fixtures/whitequark/op_asgn.txt
rename to test/prism/fixtures/whitequark/op_asgn.txt
diff --git a/test/yarp/fixtures/whitequark/op_asgn_cmd.txt b/test/prism/fixtures/whitequark/op_asgn_cmd.txt
similarity index 100%
rename from test/yarp/fixtures/whitequark/op_asgn_cmd.txt
rename to test/prism/fixtures/whitequark/op_asgn_cmd.txt
diff --git a/test/yarp/fixtures/whitequark/op_asgn_index.txt b/test/prism/fixtures/whitequark/op_asgn_index.txt
similarity index 100%
rename from test/yarp/fixtures/whitequark/op_asgn_index.txt
rename to test/prism/fixtures/whitequark/op_asgn_index.txt
diff --git a/test/yarp/fixtures/whitequark/op_asgn_index_cmd.txt b/test/prism/fixtures/whitequark/op_asgn_index_cmd.txt
similarity index 100%
rename from test/yarp/fixtures/whitequark/op_asgn_index_cmd.txt
rename to test/prism/fixtures/whitequark/op_asgn_index_cmd.txt
diff --git a/test/yarp/fixtures/whitequark/optarg.txt b/test/prism/fixtures/whitequark/optarg.txt
similarity index 100%
rename from test/yarp/fixtures/whitequark/optarg.txt
rename to test/prism/fixtures/whitequark/optarg.txt
diff --git a/test/yarp/fixtures/whitequark/or.txt b/test/prism/fixtures/whitequark/or.txt
similarity index 100%
rename from test/yarp/fixtures/whitequark/or.txt
rename to test/prism/fixtures/whitequark/or.txt
diff --git a/test/yarp/fixtures/whitequark/or_asgn.txt b/test/prism/fixtures/whitequark/or_asgn.txt
similarity index 100%
rename from test/yarp/fixtures/whitequark/or_asgn.txt
rename to test/prism/fixtures/whitequark/or_asgn.txt
diff --git a/test/yarp/fixtures/whitequark/parser_bug_272.txt b/test/prism/fixtures/whitequark/parser_bug_272.txt
similarity index 100%
rename from test/yarp/fixtures/whitequark/parser_bug_272.txt
rename to test/prism/fixtures/whitequark/parser_bug_272.txt
diff --git a/test/yarp/fixtures/whitequark/parser_bug_490.txt b/test/prism/fixtures/whitequark/parser_bug_490.txt
similarity index 100%
rename from test/yarp/fixtures/whitequark/parser_bug_490.txt
rename to test/prism/fixtures/whitequark/parser_bug_490.txt
diff --git a/test/yarp/fixtures/whitequark/parser_bug_507.txt b/test/prism/fixtures/whitequark/parser_bug_507.txt
similarity index 100%
rename from test/yarp/fixtures/whitequark/parser_bug_507.txt
rename to test/prism/fixtures/whitequark/parser_bug_507.txt
diff --git a/test/yarp/fixtures/whitequark/parser_bug_518.txt b/test/prism/fixtures/whitequark/parser_bug_518.txt
similarity index 100%
rename from test/yarp/fixtures/whitequark/parser_bug_518.txt
rename to test/prism/fixtures/whitequark/parser_bug_518.txt
diff --git a/test/yarp/fixtures/whitequark/parser_bug_525.txt b/test/prism/fixtures/whitequark/parser_bug_525.txt
similarity index 100%
rename from test/yarp/fixtures/whitequark/parser_bug_525.txt
rename to test/prism/fixtures/whitequark/parser_bug_525.txt
diff --git a/test/yarp/fixtures/whitequark/parser_bug_604.txt b/test/prism/fixtures/whitequark/parser_bug_604.txt
similarity index 100%
rename from test/yarp/fixtures/whitequark/parser_bug_604.txt
rename to test/prism/fixtures/whitequark/parser_bug_604.txt
diff --git a/test/yarp/fixtures/whitequark/parser_bug_640.txt b/test/prism/fixtures/whitequark/parser_bug_640.txt
similarity index 100%
rename from test/yarp/fixtures/whitequark/parser_bug_640.txt
rename to test/prism/fixtures/whitequark/parser_bug_640.txt
diff --git a/test/yarp/fixtures/whitequark/parser_bug_645.txt b/test/prism/fixtures/whitequark/parser_bug_645.txt
similarity index 100%
rename from test/yarp/fixtures/whitequark/parser_bug_645.txt
rename to test/prism/fixtures/whitequark/parser_bug_645.txt
diff --git a/test/yarp/fixtures/whitequark/parser_bug_830.txt b/test/prism/fixtures/whitequark/parser_bug_830.txt
similarity index 100%
rename from test/yarp/fixtures/whitequark/parser_bug_830.txt
rename to test/prism/fixtures/whitequark/parser_bug_830.txt
diff --git a/test/prism/fixtures/whitequark/parser_bug_989.txt b/test/prism/fixtures/whitequark/parser_bug_989.txt
new file mode 100644
index 00000000000000..b7b99612b4e25f
--- /dev/null
+++ b/test/prism/fixtures/whitequark/parser_bug_989.txt
@@ -0,0 +1,3 @@
+	<<-HERE
+		content
+	HERE
diff --git a/test/yarp/fixtures/whitequark/parser_drops_truncated_parts_of_squiggly_heredoc.txt b/test/prism/fixtures/whitequark/parser_drops_truncated_parts_of_squiggly_heredoc.txt
similarity index 100%
rename from test/yarp/fixtures/whitequark/parser_drops_truncated_parts_of_squiggly_heredoc.txt
rename to test/prism/fixtures/whitequark/parser_drops_truncated_parts_of_squiggly_heredoc.txt
diff --git a/test/yarp/fixtures/whitequark/parser_slash_slash_n_escaping_in_literals.txt b/test/prism/fixtures/whitequark/parser_slash_slash_n_escaping_in_literals.txt
similarity index 100%
rename from test/yarp/fixtures/whitequark/parser_slash_slash_n_escaping_in_literals.txt
rename to test/prism/fixtures/whitequark/parser_slash_slash_n_escaping_in_literals.txt
diff --git a/test/yarp/fixtures/whitequark/pattern_matching__FILE__LINE_literals.txt b/test/prism/fixtures/whitequark/pattern_matching__FILE__LINE_literals.txt
similarity index 100%
rename from test/yarp/fixtures/whitequark/pattern_matching__FILE__LINE_literals.txt
rename to test/prism/fixtures/whitequark/pattern_matching__FILE__LINE_literals.txt
diff --git a/test/yarp/fixtures/whitequark/pattern_matching_blank_else.txt b/test/prism/fixtures/whitequark/pattern_matching_blank_else.txt
similarity index 100%
rename from test/yarp/fixtures/whitequark/pattern_matching_blank_else.txt
rename to test/prism/fixtures/whitequark/pattern_matching_blank_else.txt
diff --git a/test/prism/fixtures/whitequark/pattern_matching_const_pattern.txt b/test/prism/fixtures/whitequark/pattern_matching_const_pattern.txt
new file mode 100644
index 00000000000000..82821dbc83c903
--- /dev/null
+++ b/test/prism/fixtures/whitequark/pattern_matching_const_pattern.txt
@@ -0,0 +1,11 @@
+case foo; in A() then true; end
+
+case foo; in A(1, 2) then true; end
+
+case foo; in A(x:) then true; end
+
+case foo; in A[1, 2] then true; end
+
+case foo; in A[] then true; end
+
+case foo; in A[x:] then true; end
diff --git a/test/prism/fixtures/whitequark/pattern_matching_constants.txt b/test/prism/fixtures/whitequark/pattern_matching_constants.txt
new file mode 100644
index 00000000000000..aba764ff3567b7
--- /dev/null
+++ b/test/prism/fixtures/whitequark/pattern_matching_constants.txt
@@ -0,0 +1,5 @@
+case foo; in ::A then true; end
+
+case foo; in A then true; end
+
+case foo; in A::B then true; end
diff --git a/test/yarp/fixtures/whitequark/pattern_matching_else.txt b/test/prism/fixtures/whitequark/pattern_matching_else.txt
similarity index 100%
rename from test/yarp/fixtures/whitequark/pattern_matching_else.txt
rename to test/prism/fixtures/whitequark/pattern_matching_else.txt
diff --git a/test/prism/fixtures/whitequark/pattern_matching_explicit_array_match.txt b/test/prism/fixtures/whitequark/pattern_matching_explicit_array_match.txt
new file mode 100644
index 00000000000000..61e518d0fbacc6
--- /dev/null
+++ b/test/prism/fixtures/whitequark/pattern_matching_explicit_array_match.txt
@@ -0,0 +1,19 @@
+case foo; in [*, x] then true; end
+
+case foo; in [*x, y] then true; end
+
+case foo; in [x, *, y] then true; end
+
+case foo; in [x, *y, z] then true; end
+
+case foo; in [x, y, *] then true; end
+
+case foo; in [x, y, *z] then true; end
+
+case foo; in [x, y,] then true; end
+
+case foo; in [x, y] then true; end
+
+case foo; in [x,] then nil; end
+
+case foo; in [x] then nil; end
diff --git a/test/prism/fixtures/whitequark/pattern_matching_expr_in_paren.txt b/test/prism/fixtures/whitequark/pattern_matching_expr_in_paren.txt
new file mode 100644
index 00000000000000..9b2e91b70dc868
--- /dev/null
+++ b/test/prism/fixtures/whitequark/pattern_matching_expr_in_paren.txt
@@ -0,0 +1 @@
+case foo; in (1) then true; end
diff --git a/test/prism/fixtures/whitequark/pattern_matching_hash.txt b/test/prism/fixtures/whitequark/pattern_matching_hash.txt
new file mode 100644
index 00000000000000..b26f2c59dca224
--- /dev/null
+++ b/test/prism/fixtures/whitequark/pattern_matching_hash.txt
@@ -0,0 +1,48 @@
+case foo; 
+        in a: {b:}, c:
+          p c
+      ; end
+
+case foo; 
+        in {Foo: 42
+        }
+          false
+      ; end
+
+case foo; 
+        in {a:
+              2}
+          false
+      ; end
+
+case foo; 
+        in {a:
+        }
+          true
+      ; end
+
+case foo; 
+        in {a: 1
+        }
+          false
+      ; end
+
+case foo; in ** then true; end
+
+case foo; in **a then true; end
+
+case foo; in a: 1 then true; end
+
+case foo; in a: 1, _a:, ** then true; end
+
+case foo; in a: 1, b: 2 then true; end
+
+case foo; in a: then true; end
+
+case foo; in a:, b: then true; end
+
+case foo; in { a: 1 } then true; end
+
+case foo; in { a: 1, } then true; end
+
+case foo; in {} then true; end
diff --git a/test/prism/fixtures/whitequark/pattern_matching_if_unless_modifiers.txt b/test/prism/fixtures/whitequark/pattern_matching_if_unless_modifiers.txt
new file mode 100644
index 00000000000000..05ca31735545e4
--- /dev/null
+++ b/test/prism/fixtures/whitequark/pattern_matching_if_unless_modifiers.txt
@@ -0,0 +1,3 @@
+case foo; in x if true; nil; end
+
+case foo; in x unless true; nil; end
diff --git a/test/prism/fixtures/whitequark/pattern_matching_implicit_array_match.txt b/test/prism/fixtures/whitequark/pattern_matching_implicit_array_match.txt
new file mode 100644
index 00000000000000..360c5150a51f93
--- /dev/null
+++ b/test/prism/fixtures/whitequark/pattern_matching_implicit_array_match.txt
@@ -0,0 +1,15 @@
+case foo; in * then nil; end
+
+case foo; in *x then nil; end
+
+case foo; in *x, y, z then nil; end
+
+case foo; in 1, "a", [], {} then nil; end
+
+case foo; in x, *y, z then nil; end
+
+case foo; in x, then nil; end
+
+case foo; in x, y then nil; end
+
+case foo; in x, y, then nil; end
diff --git a/test/prism/fixtures/whitequark/pattern_matching_keyword_variable.txt b/test/prism/fixtures/whitequark/pattern_matching_keyword_variable.txt
new file mode 100644
index 00000000000000..83c7a06b09e3c1
--- /dev/null
+++ b/test/prism/fixtures/whitequark/pattern_matching_keyword_variable.txt
@@ -0,0 +1 @@
+case foo; in self then true; end
diff --git a/test/prism/fixtures/whitequark/pattern_matching_lambda.txt b/test/prism/fixtures/whitequark/pattern_matching_lambda.txt
new file mode 100644
index 00000000000000..eeccdc70e0cf92
--- /dev/null
+++ b/test/prism/fixtures/whitequark/pattern_matching_lambda.txt
@@ -0,0 +1 @@
+case foo; in ->{ 42 } then true; end
diff --git a/test/prism/fixtures/whitequark/pattern_matching_match_alt.txt b/test/prism/fixtures/whitequark/pattern_matching_match_alt.txt
new file mode 100644
index 00000000000000..6c6549916d3b92
--- /dev/null
+++ b/test/prism/fixtures/whitequark/pattern_matching_match_alt.txt
@@ -0,0 +1 @@
+case foo; in 1 | 2 then true; end
diff --git a/test/prism/fixtures/whitequark/pattern_matching_match_as.txt b/test/prism/fixtures/whitequark/pattern_matching_match_as.txt
new file mode 100644
index 00000000000000..2a105f9f367b93
--- /dev/null
+++ b/test/prism/fixtures/whitequark/pattern_matching_match_as.txt
@@ -0,0 +1 @@
+case foo; in 1 => a then true; end
diff --git a/test/prism/fixtures/whitequark/pattern_matching_nil_pattern.txt b/test/prism/fixtures/whitequark/pattern_matching_nil_pattern.txt
new file mode 100644
index 00000000000000..46dce94a2dc633
--- /dev/null
+++ b/test/prism/fixtures/whitequark/pattern_matching_nil_pattern.txt
@@ -0,0 +1 @@
+case foo; in **nil then true; end
diff --git a/test/prism/fixtures/whitequark/pattern_matching_no_body.txt b/test/prism/fixtures/whitequark/pattern_matching_no_body.txt
new file mode 100644
index 00000000000000..73b471d3521db1
--- /dev/null
+++ b/test/prism/fixtures/whitequark/pattern_matching_no_body.txt
@@ -0,0 +1 @@
+case foo; in 1; end
diff --git a/test/prism/fixtures/whitequark/pattern_matching_ranges.txt b/test/prism/fixtures/whitequark/pattern_matching_ranges.txt
new file mode 100644
index 00000000000000..7e603e77b05dee
--- /dev/null
+++ b/test/prism/fixtures/whitequark/pattern_matching_ranges.txt
@@ -0,0 +1,11 @@
+case foo; in ...2 then true; end
+
+case foo; in ..2 then true; end
+
+case foo; in 1.. then true; end
+
+case foo; in 1... then true; end
+
+case foo; in 1...2 then true; end
+
+case foo; in 1..2 then true; end
diff --git a/test/yarp/fixtures/whitequark/pattern_matching_single_line.txt b/test/prism/fixtures/whitequark/pattern_matching_single_line.txt
similarity index 100%
rename from test/yarp/fixtures/whitequark/pattern_matching_single_line.txt
rename to test/prism/fixtures/whitequark/pattern_matching_single_line.txt
diff --git a/test/yarp/fixtures/whitequark/pattern_matching_single_line_allowed_omission_of_parentheses.txt b/test/prism/fixtures/whitequark/pattern_matching_single_line_allowed_omission_of_parentheses.txt
similarity index 100%
rename from test/yarp/fixtures/whitequark/pattern_matching_single_line_allowed_omission_of_parentheses.txt
rename to test/prism/fixtures/whitequark/pattern_matching_single_line_allowed_omission_of_parentheses.txt
diff --git a/test/prism/fixtures/whitequark/pattern_matching_single_match.txt b/test/prism/fixtures/whitequark/pattern_matching_single_match.txt
new file mode 100644
index 00000000000000..c174376585d6dc
--- /dev/null
+++ b/test/prism/fixtures/whitequark/pattern_matching_single_match.txt
@@ -0,0 +1 @@
+case foo; in x then x; end
diff --git a/test/prism/fixtures/whitequark/pin_expr.txt b/test/prism/fixtures/whitequark/pin_expr.txt
new file mode 100644
index 00000000000000..a072c7c19470f2
--- /dev/null
+++ b/test/prism/fixtures/whitequark/pin_expr.txt
@@ -0,0 +1,14 @@
+case foo; in ^$TestPatternMatching; end
+
+case foo; in ^(0+0) then nil; end
+
+case foo; in ^(1
+); end
+
+case foo; in ^(42) then nil; end
+
+case foo; in ^@@TestPatternMatching; end
+
+case foo; in ^@a; end
+
+case foo; in { foo: ^(42) } then nil; end
diff --git a/test/yarp/fixtures/whitequark/postexe.txt b/test/prism/fixtures/whitequark/postexe.txt
similarity index 100%
rename from test/yarp/fixtures/whitequark/postexe.txt
rename to test/prism/fixtures/whitequark/postexe.txt
diff --git a/test/yarp/fixtures/whitequark/preexe.txt b/test/prism/fixtures/whitequark/preexe.txt
similarity index 100%
rename from test/yarp/fixtures/whitequark/preexe.txt
rename to test/prism/fixtures/whitequark/preexe.txt
diff --git a/test/yarp/fixtures/whitequark/procarg0.txt b/test/prism/fixtures/whitequark/procarg0.txt
similarity index 100%
rename from test/yarp/fixtures/whitequark/procarg0.txt
rename to test/prism/fixtures/whitequark/procarg0.txt
diff --git a/test/prism/fixtures/whitequark/procarg0_legacy.txt b/test/prism/fixtures/whitequark/procarg0_legacy.txt
new file mode 100644
index 00000000000000..a985f15b6e0351
--- /dev/null
+++ b/test/prism/fixtures/whitequark/procarg0_legacy.txt
@@ -0,0 +1 @@
+f{ |a| }
diff --git a/test/yarp/fixtures/whitequark/range_exclusive.txt b/test/prism/fixtures/whitequark/range_exclusive.txt
similarity index 100%
rename from test/yarp/fixtures/whitequark/range_exclusive.txt
rename to test/prism/fixtures/whitequark/range_exclusive.txt
diff --git a/test/yarp/fixtures/whitequark/range_inclusive.txt b/test/prism/fixtures/whitequark/range_inclusive.txt
similarity index 100%
rename from test/yarp/fixtures/whitequark/range_inclusive.txt
rename to test/prism/fixtures/whitequark/range_inclusive.txt
diff --git a/test/yarp/fixtures/whitequark/rational.txt b/test/prism/fixtures/whitequark/rational.txt
similarity index 100%
rename from test/yarp/fixtures/whitequark/rational.txt
rename to test/prism/fixtures/whitequark/rational.txt
diff --git a/test/yarp/fixtures/whitequark/regex_interp.txt b/test/prism/fixtures/whitequark/regex_interp.txt
similarity index 100%
rename from test/yarp/fixtures/whitequark/regex_interp.txt
rename to test/prism/fixtures/whitequark/regex_interp.txt
diff --git a/test/yarp/fixtures/whitequark/regex_plain.txt b/test/prism/fixtures/whitequark/regex_plain.txt
similarity index 100%
rename from test/yarp/fixtures/whitequark/regex_plain.txt
rename to test/prism/fixtures/whitequark/regex_plain.txt
diff --git a/test/yarp/fixtures/whitequark/resbody_list.txt b/test/prism/fixtures/whitequark/resbody_list.txt
similarity index 100%
rename from test/yarp/fixtures/whitequark/resbody_list.txt
rename to test/prism/fixtures/whitequark/resbody_list.txt
diff --git a/test/yarp/fixtures/whitequark/resbody_list_mrhs.txt b/test/prism/fixtures/whitequark/resbody_list_mrhs.txt
similarity index 100%
rename from test/yarp/fixtures/whitequark/resbody_list_mrhs.txt
rename to test/prism/fixtures/whitequark/resbody_list_mrhs.txt
diff --git a/test/yarp/fixtures/whitequark/resbody_list_var.txt b/test/prism/fixtures/whitequark/resbody_list_var.txt
similarity index 100%
rename from test/yarp/fixtures/whitequark/resbody_list_var.txt
rename to test/prism/fixtures/whitequark/resbody_list_var.txt
diff --git a/test/yarp/fixtures/whitequark/resbody_var.txt b/test/prism/fixtures/whitequark/resbody_var.txt
similarity index 100%
rename from test/yarp/fixtures/whitequark/resbody_var.txt
rename to test/prism/fixtures/whitequark/resbody_var.txt
diff --git a/test/yarp/fixtures/whitequark/rescue.txt b/test/prism/fixtures/whitequark/rescue.txt
similarity index 100%
rename from test/yarp/fixtures/whitequark/rescue.txt
rename to test/prism/fixtures/whitequark/rescue.txt
diff --git a/test/yarp/fixtures/whitequark/rescue_else.txt b/test/prism/fixtures/whitequark/rescue_else.txt
similarity index 100%
rename from test/yarp/fixtures/whitequark/rescue_else.txt
rename to test/prism/fixtures/whitequark/rescue_else.txt
diff --git a/test/yarp/fixtures/whitequark/rescue_else_ensure.txt b/test/prism/fixtures/whitequark/rescue_else_ensure.txt
similarity index 100%
rename from test/yarp/fixtures/whitequark/rescue_else_ensure.txt
rename to test/prism/fixtures/whitequark/rescue_else_ensure.txt
diff --git a/test/yarp/fixtures/whitequark/rescue_ensure.txt b/test/prism/fixtures/whitequark/rescue_ensure.txt
similarity index 100%
rename from test/yarp/fixtures/whitequark/rescue_ensure.txt
rename to test/prism/fixtures/whitequark/rescue_ensure.txt
diff --git a/test/yarp/fixtures/whitequark/rescue_in_lambda_block.txt b/test/prism/fixtures/whitequark/rescue_in_lambda_block.txt
similarity index 100%
rename from test/yarp/fixtures/whitequark/rescue_in_lambda_block.txt
rename to test/prism/fixtures/whitequark/rescue_in_lambda_block.txt
diff --git a/test/yarp/fixtures/whitequark/rescue_mod.txt b/test/prism/fixtures/whitequark/rescue_mod.txt
similarity index 100%
rename from test/yarp/fixtures/whitequark/rescue_mod.txt
rename to test/prism/fixtures/whitequark/rescue_mod.txt
diff --git a/test/yarp/fixtures/whitequark/rescue_mod_asgn.txt b/test/prism/fixtures/whitequark/rescue_mod_asgn.txt
similarity index 100%
rename from test/yarp/fixtures/whitequark/rescue_mod_asgn.txt
rename to test/prism/fixtures/whitequark/rescue_mod_asgn.txt
diff --git a/test/yarp/fixtures/whitequark/rescue_mod_masgn.txt b/test/prism/fixtures/whitequark/rescue_mod_masgn.txt
similarity index 100%
rename from test/yarp/fixtures/whitequark/rescue_mod_masgn.txt
rename to test/prism/fixtures/whitequark/rescue_mod_masgn.txt
diff --git a/test/yarp/fixtures/whitequark/rescue_mod_op_assign.txt b/test/prism/fixtures/whitequark/rescue_mod_op_assign.txt
similarity index 100%
rename from test/yarp/fixtures/whitequark/rescue_mod_op_assign.txt
rename to test/prism/fixtures/whitequark/rescue_mod_op_assign.txt
diff --git a/test/yarp/fixtures/whitequark/rescue_without_begin_end.txt b/test/prism/fixtures/whitequark/rescue_without_begin_end.txt
similarity index 100%
rename from test/yarp/fixtures/whitequark/rescue_without_begin_end.txt
rename to test/prism/fixtures/whitequark/rescue_without_begin_end.txt
diff --git a/test/yarp/fixtures/whitequark/restarg_named.txt b/test/prism/fixtures/whitequark/restarg_named.txt
similarity index 100%
rename from test/yarp/fixtures/whitequark/restarg_named.txt
rename to test/prism/fixtures/whitequark/restarg_named.txt
diff --git a/test/yarp/fixtures/whitequark/restarg_unnamed.txt b/test/prism/fixtures/whitequark/restarg_unnamed.txt
similarity index 100%
rename from test/yarp/fixtures/whitequark/restarg_unnamed.txt
rename to test/prism/fixtures/whitequark/restarg_unnamed.txt
diff --git a/test/yarp/fixtures/whitequark/return.txt b/test/prism/fixtures/whitequark/return.txt
similarity index 100%
rename from test/yarp/fixtures/whitequark/return.txt
rename to test/prism/fixtures/whitequark/return.txt
diff --git a/test/yarp/fixtures/whitequark/return_block.txt b/test/prism/fixtures/whitequark/return_block.txt
similarity index 100%
rename from test/yarp/fixtures/whitequark/return_block.txt
rename to test/prism/fixtures/whitequark/return_block.txt
diff --git a/test/yarp/fixtures/whitequark/ruby_bug_10279.txt b/test/prism/fixtures/whitequark/ruby_bug_10279.txt
similarity index 100%
rename from test/yarp/fixtures/whitequark/ruby_bug_10279.txt
rename to test/prism/fixtures/whitequark/ruby_bug_10279.txt
diff --git a/test/yarp/fixtures/whitequark/ruby_bug_10653.txt b/test/prism/fixtures/whitequark/ruby_bug_10653.txt
similarity index 100%
rename from test/yarp/fixtures/whitequark/ruby_bug_10653.txt
rename to test/prism/fixtures/whitequark/ruby_bug_10653.txt
diff --git a/test/yarp/fixtures/whitequark/ruby_bug_11107.txt b/test/prism/fixtures/whitequark/ruby_bug_11107.txt
similarity index 100%
rename from test/yarp/fixtures/whitequark/ruby_bug_11107.txt
rename to test/prism/fixtures/whitequark/ruby_bug_11107.txt
diff --git a/test/yarp/fixtures/whitequark/ruby_bug_11380.txt b/test/prism/fixtures/whitequark/ruby_bug_11380.txt
similarity index 100%
rename from test/yarp/fixtures/whitequark/ruby_bug_11380.txt
rename to test/prism/fixtures/whitequark/ruby_bug_11380.txt
diff --git a/test/yarp/fixtures/whitequark/ruby_bug_11873.txt b/test/prism/fixtures/whitequark/ruby_bug_11873.txt
similarity index 100%
rename from test/yarp/fixtures/whitequark/ruby_bug_11873.txt
rename to test/prism/fixtures/whitequark/ruby_bug_11873.txt
diff --git a/test/yarp/fixtures/whitequark/ruby_bug_11873_a.txt b/test/prism/fixtures/whitequark/ruby_bug_11873_a.txt
similarity index 100%
rename from test/yarp/fixtures/whitequark/ruby_bug_11873_a.txt
rename to test/prism/fixtures/whitequark/ruby_bug_11873_a.txt
diff --git a/test/yarp/fixtures/whitequark/ruby_bug_11873_b.txt b/test/prism/fixtures/whitequark/ruby_bug_11873_b.txt
similarity index 100%
rename from test/yarp/fixtures/whitequark/ruby_bug_11873_b.txt
rename to test/prism/fixtures/whitequark/ruby_bug_11873_b.txt
diff --git a/test/yarp/fixtures/whitequark/ruby_bug_11989.txt b/test/prism/fixtures/whitequark/ruby_bug_11989.txt
similarity index 100%
rename from test/yarp/fixtures/whitequark/ruby_bug_11989.txt
rename to test/prism/fixtures/whitequark/ruby_bug_11989.txt
diff --git a/test/yarp/fixtures/whitequark/ruby_bug_11990.txt b/test/prism/fixtures/whitequark/ruby_bug_11990.txt
similarity index 100%
rename from test/yarp/fixtures/whitequark/ruby_bug_11990.txt
rename to test/prism/fixtures/whitequark/ruby_bug_11990.txt
diff --git a/test/yarp/fixtures/whitequark/ruby_bug_12073.txt b/test/prism/fixtures/whitequark/ruby_bug_12073.txt
similarity index 100%
rename from test/yarp/fixtures/whitequark/ruby_bug_12073.txt
rename to test/prism/fixtures/whitequark/ruby_bug_12073.txt
diff --git a/test/yarp/fixtures/whitequark/ruby_bug_12402.txt b/test/prism/fixtures/whitequark/ruby_bug_12402.txt
similarity index 100%
rename from test/yarp/fixtures/whitequark/ruby_bug_12402.txt
rename to test/prism/fixtures/whitequark/ruby_bug_12402.txt
diff --git a/test/yarp/fixtures/whitequark/ruby_bug_12669.txt b/test/prism/fixtures/whitequark/ruby_bug_12669.txt
similarity index 100%
rename from test/yarp/fixtures/whitequark/ruby_bug_12669.txt
rename to test/prism/fixtures/whitequark/ruby_bug_12669.txt
diff --git a/test/yarp/fixtures/whitequark/ruby_bug_12686.txt b/test/prism/fixtures/whitequark/ruby_bug_12686.txt
similarity index 100%
rename from test/yarp/fixtures/whitequark/ruby_bug_12686.txt
rename to test/prism/fixtures/whitequark/ruby_bug_12686.txt
diff --git a/test/yarp/fixtures/whitequark/ruby_bug_13547.txt b/test/prism/fixtures/whitequark/ruby_bug_13547.txt
similarity index 100%
rename from test/yarp/fixtures/whitequark/ruby_bug_13547.txt
rename to test/prism/fixtures/whitequark/ruby_bug_13547.txt
diff --git a/test/yarp/fixtures/whitequark/ruby_bug_14690.txt b/test/prism/fixtures/whitequark/ruby_bug_14690.txt
similarity index 100%
rename from test/yarp/fixtures/whitequark/ruby_bug_14690.txt
rename to test/prism/fixtures/whitequark/ruby_bug_14690.txt
diff --git a/test/yarp/fixtures/whitequark/ruby_bug_15789.txt b/test/prism/fixtures/whitequark/ruby_bug_15789.txt
similarity index 100%
rename from test/yarp/fixtures/whitequark/ruby_bug_15789.txt
rename to test/prism/fixtures/whitequark/ruby_bug_15789.txt
diff --git a/test/prism/fixtures/whitequark/ruby_bug_18878.txt b/test/prism/fixtures/whitequark/ruby_bug_18878.txt
new file mode 100644
index 00000000000000..583280c9e33a62
--- /dev/null
+++ b/test/prism/fixtures/whitequark/ruby_bug_18878.txt
@@ -0,0 +1 @@
+Foo::Bar { |a| 42 }
diff --git a/test/prism/fixtures/whitequark/ruby_bug_19281.txt b/test/prism/fixtures/whitequark/ruby_bug_19281.txt
new file mode 100644
index 00000000000000..cd154f97569199
--- /dev/null
+++ b/test/prism/fixtures/whitequark/ruby_bug_19281.txt
@@ -0,0 +1,7 @@
+a.b (1;2),(3),(4)
+
+a.b (;),(),()
+
+p (1;2),(3),(4)
+
+p (;),(),()
diff --git a/test/prism/fixtures/whitequark/ruby_bug_19539.txt b/test/prism/fixtures/whitequark/ruby_bug_19539.txt
new file mode 100644
index 00000000000000..b2d052d94da0c9
--- /dev/null
+++ b/test/prism/fixtures/whitequark/ruby_bug_19539.txt
@@ -0,0 +1,9 @@
+<<' FOO'
+[Bug #19539]
+ FOO
+
+
+<<-' FOO'
+[Bug #19539]
+ FOO
+
diff --git a/test/yarp/fixtures/whitequark/ruby_bug_9669.txt b/test/prism/fixtures/whitequark/ruby_bug_9669.txt
similarity index 100%
rename from test/yarp/fixtures/whitequark/ruby_bug_9669.txt
rename to test/prism/fixtures/whitequark/ruby_bug_9669.txt
diff --git a/test/yarp/fixtures/whitequark/sclass.txt b/test/prism/fixtures/whitequark/sclass.txt
similarity index 100%
rename from test/yarp/fixtures/whitequark/sclass.txt
rename to test/prism/fixtures/whitequark/sclass.txt
diff --git a/test/yarp/fixtures/whitequark/self.txt b/test/prism/fixtures/whitequark/self.txt
similarity index 100%
rename from test/yarp/fixtures/whitequark/self.txt
rename to test/prism/fixtures/whitequark/self.txt
diff --git a/test/yarp/fixtures/whitequark/send_attr_asgn.txt b/test/prism/fixtures/whitequark/send_attr_asgn.txt
similarity index 100%
rename from test/yarp/fixtures/whitequark/send_attr_asgn.txt
rename to test/prism/fixtures/whitequark/send_attr_asgn.txt
diff --git a/test/yarp/fixtures/whitequark/send_attr_asgn_conditional.txt b/test/prism/fixtures/whitequark/send_attr_asgn_conditional.txt
similarity index 100%
rename from test/yarp/fixtures/whitequark/send_attr_asgn_conditional.txt
rename to test/prism/fixtures/whitequark/send_attr_asgn_conditional.txt
diff --git a/test/yarp/fixtures/whitequark/send_binary_op.txt b/test/prism/fixtures/whitequark/send_binary_op.txt
similarity index 100%
rename from test/yarp/fixtures/whitequark/send_binary_op.txt
rename to test/prism/fixtures/whitequark/send_binary_op.txt
diff --git a/test/yarp/fixtures/whitequark/send_block_chain_cmd.txt b/test/prism/fixtures/whitequark/send_block_chain_cmd.txt
similarity index 100%
rename from test/yarp/fixtures/whitequark/send_block_chain_cmd.txt
rename to test/prism/fixtures/whitequark/send_block_chain_cmd.txt
diff --git a/test/yarp/fixtures/whitequark/send_block_conditional.txt b/test/prism/fixtures/whitequark/send_block_conditional.txt
similarity index 100%
rename from test/yarp/fixtures/whitequark/send_block_conditional.txt
rename to test/prism/fixtures/whitequark/send_block_conditional.txt
diff --git a/test/yarp/fixtures/whitequark/send_call.txt b/test/prism/fixtures/whitequark/send_call.txt
similarity index 100%
rename from test/yarp/fixtures/whitequark/send_call.txt
rename to test/prism/fixtures/whitequark/send_call.txt
diff --git a/test/yarp/fixtures/whitequark/send_conditional.txt b/test/prism/fixtures/whitequark/send_conditional.txt
similarity index 100%
rename from test/yarp/fixtures/whitequark/send_conditional.txt
rename to test/prism/fixtures/whitequark/send_conditional.txt
diff --git a/test/yarp/fixtures/whitequark/send_index.txt b/test/prism/fixtures/whitequark/send_index.txt
similarity index 100%
rename from test/yarp/fixtures/whitequark/send_index.txt
rename to test/prism/fixtures/whitequark/send_index.txt
diff --git a/test/yarp/fixtures/whitequark/send_index_asgn.txt b/test/prism/fixtures/whitequark/send_index_asgn.txt
similarity index 100%
rename from test/yarp/fixtures/whitequark/send_index_asgn.txt
rename to test/prism/fixtures/whitequark/send_index_asgn.txt
diff --git a/test/yarp/fixtures/whitequark/send_index_asgn_legacy.txt b/test/prism/fixtures/whitequark/send_index_asgn_legacy.txt
similarity index 100%
rename from test/yarp/fixtures/whitequark/send_index_asgn_legacy.txt
rename to test/prism/fixtures/whitequark/send_index_asgn_legacy.txt
diff --git a/test/yarp/fixtures/whitequark/send_index_cmd.txt b/test/prism/fixtures/whitequark/send_index_cmd.txt
similarity index 100%
rename from test/yarp/fixtures/whitequark/send_index_cmd.txt
rename to test/prism/fixtures/whitequark/send_index_cmd.txt
diff --git a/test/yarp/fixtures/whitequark/send_index_legacy.txt b/test/prism/fixtures/whitequark/send_index_legacy.txt
similarity index 100%
rename from test/yarp/fixtures/whitequark/send_index_legacy.txt
rename to test/prism/fixtures/whitequark/send_index_legacy.txt
diff --git a/test/yarp/fixtures/whitequark/send_lambda.txt b/test/prism/fixtures/whitequark/send_lambda.txt
similarity index 100%
rename from test/yarp/fixtures/whitequark/send_lambda.txt
rename to test/prism/fixtures/whitequark/send_lambda.txt
diff --git a/test/yarp/fixtures/whitequark/send_lambda_args.txt b/test/prism/fixtures/whitequark/send_lambda_args.txt
similarity index 100%
rename from test/yarp/fixtures/whitequark/send_lambda_args.txt
rename to test/prism/fixtures/whitequark/send_lambda_args.txt
diff --git a/test/yarp/fixtures/whitequark/send_lambda_args_noparen.txt b/test/prism/fixtures/whitequark/send_lambda_args_noparen.txt
similarity index 100%
rename from test/yarp/fixtures/whitequark/send_lambda_args_noparen.txt
rename to test/prism/fixtures/whitequark/send_lambda_args_noparen.txt
diff --git a/test/yarp/fixtures/whitequark/send_lambda_args_shadow.txt b/test/prism/fixtures/whitequark/send_lambda_args_shadow.txt
similarity index 100%
rename from test/yarp/fixtures/whitequark/send_lambda_args_shadow.txt
rename to test/prism/fixtures/whitequark/send_lambda_args_shadow.txt
diff --git a/test/yarp/fixtures/whitequark/send_lambda_legacy.txt b/test/prism/fixtures/whitequark/send_lambda_legacy.txt
similarity index 100%
rename from test/yarp/fixtures/whitequark/send_lambda_legacy.txt
rename to test/prism/fixtures/whitequark/send_lambda_legacy.txt
diff --git a/test/yarp/fixtures/whitequark/send_op_asgn_conditional.txt b/test/prism/fixtures/whitequark/send_op_asgn_conditional.txt
similarity index 100%
rename from test/yarp/fixtures/whitequark/send_op_asgn_conditional.txt
rename to test/prism/fixtures/whitequark/send_op_asgn_conditional.txt
diff --git a/test/yarp/fixtures/whitequark/send_plain.txt b/test/prism/fixtures/whitequark/send_plain.txt
similarity index 100%
rename from test/yarp/fixtures/whitequark/send_plain.txt
rename to test/prism/fixtures/whitequark/send_plain.txt
diff --git a/test/yarp/fixtures/whitequark/send_plain_cmd.txt b/test/prism/fixtures/whitequark/send_plain_cmd.txt
similarity index 100%
rename from test/yarp/fixtures/whitequark/send_plain_cmd.txt
rename to test/prism/fixtures/whitequark/send_plain_cmd.txt
diff --git a/test/yarp/fixtures/whitequark/send_self.txt b/test/prism/fixtures/whitequark/send_self.txt
similarity index 100%
rename from test/yarp/fixtures/whitequark/send_self.txt
rename to test/prism/fixtures/whitequark/send_self.txt
diff --git a/test/yarp/fixtures/whitequark/send_self_block.txt b/test/prism/fixtures/whitequark/send_self_block.txt
similarity index 100%
rename from test/yarp/fixtures/whitequark/send_self_block.txt
rename to test/prism/fixtures/whitequark/send_self_block.txt
diff --git a/test/yarp/fixtures/whitequark/send_unary_op.txt b/test/prism/fixtures/whitequark/send_unary_op.txt
similarity index 100%
rename from test/yarp/fixtures/whitequark/send_unary_op.txt
rename to test/prism/fixtures/whitequark/send_unary_op.txt
diff --git a/test/yarp/fixtures/whitequark/slash_newline_in_heredocs.txt b/test/prism/fixtures/whitequark/slash_newline_in_heredocs.txt
similarity index 100%
rename from test/yarp/fixtures/whitequark/slash_newline_in_heredocs.txt
rename to test/prism/fixtures/whitequark/slash_newline_in_heredocs.txt
diff --git a/test/yarp/fixtures/whitequark/space_args_arg.txt b/test/prism/fixtures/whitequark/space_args_arg.txt
similarity index 100%
rename from test/yarp/fixtures/whitequark/space_args_arg.txt
rename to test/prism/fixtures/whitequark/space_args_arg.txt
diff --git a/test/yarp/fixtures/whitequark/space_args_arg_block.txt b/test/prism/fixtures/whitequark/space_args_arg_block.txt
similarity index 100%
rename from test/yarp/fixtures/whitequark/space_args_arg_block.txt
rename to test/prism/fixtures/whitequark/space_args_arg_block.txt
diff --git a/test/yarp/fixtures/whitequark/space_args_arg_call.txt b/test/prism/fixtures/whitequark/space_args_arg_call.txt
similarity index 100%
rename from test/yarp/fixtures/whitequark/space_args_arg_call.txt
rename to test/prism/fixtures/whitequark/space_args_arg_call.txt
diff --git a/test/yarp/fixtures/whitequark/space_args_arg_newline.txt b/test/prism/fixtures/whitequark/space_args_arg_newline.txt
similarity index 100%
rename from test/yarp/fixtures/whitequark/space_args_arg_newline.txt
rename to test/prism/fixtures/whitequark/space_args_arg_newline.txt
diff --git a/test/yarp/fixtures/whitequark/space_args_block.txt b/test/prism/fixtures/whitequark/space_args_block.txt
similarity index 100%
rename from test/yarp/fixtures/whitequark/space_args_block.txt
rename to test/prism/fixtures/whitequark/space_args_block.txt
diff --git a/test/yarp/fixtures/whitequark/space_args_cmd.txt b/test/prism/fixtures/whitequark/space_args_cmd.txt
similarity index 100%
rename from test/yarp/fixtures/whitequark/space_args_cmd.txt
rename to test/prism/fixtures/whitequark/space_args_cmd.txt
diff --git a/test/yarp/fixtures/whitequark/string___FILE__.txt b/test/prism/fixtures/whitequark/string___FILE__.txt
similarity index 100%
rename from test/yarp/fixtures/whitequark/string___FILE__.txt
rename to test/prism/fixtures/whitequark/string___FILE__.txt
diff --git a/test/yarp/fixtures/whitequark/string_concat.txt b/test/prism/fixtures/whitequark/string_concat.txt
similarity index 100%
rename from test/yarp/fixtures/whitequark/string_concat.txt
rename to test/prism/fixtures/whitequark/string_concat.txt
diff --git a/test/yarp/fixtures/whitequark/string_dvar.txt b/test/prism/fixtures/whitequark/string_dvar.txt
similarity index 100%
rename from test/yarp/fixtures/whitequark/string_dvar.txt
rename to test/prism/fixtures/whitequark/string_dvar.txt
diff --git a/test/yarp/fixtures/whitequark/string_interp.txt b/test/prism/fixtures/whitequark/string_interp.txt
similarity index 100%
rename from test/yarp/fixtures/whitequark/string_interp.txt
rename to test/prism/fixtures/whitequark/string_interp.txt
diff --git a/test/yarp/fixtures/whitequark/string_plain.txt b/test/prism/fixtures/whitequark/string_plain.txt
similarity index 100%
rename from test/yarp/fixtures/whitequark/string_plain.txt
rename to test/prism/fixtures/whitequark/string_plain.txt
diff --git a/test/yarp/fixtures/whitequark/super.txt b/test/prism/fixtures/whitequark/super.txt
similarity index 100%
rename from test/yarp/fixtures/whitequark/super.txt
rename to test/prism/fixtures/whitequark/super.txt
diff --git a/test/yarp/fixtures/whitequark/super_block.txt b/test/prism/fixtures/whitequark/super_block.txt
similarity index 100%
rename from test/yarp/fixtures/whitequark/super_block.txt
rename to test/prism/fixtures/whitequark/super_block.txt
diff --git a/test/yarp/fixtures/whitequark/symbol_interp.txt b/test/prism/fixtures/whitequark/symbol_interp.txt
similarity index 100%
rename from test/yarp/fixtures/whitequark/symbol_interp.txt
rename to test/prism/fixtures/whitequark/symbol_interp.txt
diff --git a/test/yarp/fixtures/whitequark/symbol_plain.txt b/test/prism/fixtures/whitequark/symbol_plain.txt
similarity index 100%
rename from test/yarp/fixtures/whitequark/symbol_plain.txt
rename to test/prism/fixtures/whitequark/symbol_plain.txt
diff --git a/test/yarp/fixtures/whitequark/ternary.txt b/test/prism/fixtures/whitequark/ternary.txt
similarity index 100%
rename from test/yarp/fixtures/whitequark/ternary.txt
rename to test/prism/fixtures/whitequark/ternary.txt
diff --git a/test/yarp/fixtures/whitequark/ternary_ambiguous_symbol.txt b/test/prism/fixtures/whitequark/ternary_ambiguous_symbol.txt
similarity index 100%
rename from test/yarp/fixtures/whitequark/ternary_ambiguous_symbol.txt
rename to test/prism/fixtures/whitequark/ternary_ambiguous_symbol.txt
diff --git a/test/yarp/fixtures/whitequark/trailing_forward_arg.txt b/test/prism/fixtures/whitequark/trailing_forward_arg.txt
similarity index 100%
rename from test/yarp/fixtures/whitequark/trailing_forward_arg.txt
rename to test/prism/fixtures/whitequark/trailing_forward_arg.txt
diff --git a/test/yarp/fixtures/whitequark/true.txt b/test/prism/fixtures/whitequark/true.txt
similarity index 100%
rename from test/yarp/fixtures/whitequark/true.txt
rename to test/prism/fixtures/whitequark/true.txt
diff --git a/test/yarp/fixtures/whitequark/unary_num_pow_precedence.txt b/test/prism/fixtures/whitequark/unary_num_pow_precedence.txt
similarity index 100%
rename from test/yarp/fixtures/whitequark/unary_num_pow_precedence.txt
rename to test/prism/fixtures/whitequark/unary_num_pow_precedence.txt
diff --git a/test/yarp/fixtures/whitequark/undef.txt b/test/prism/fixtures/whitequark/undef.txt
similarity index 100%
rename from test/yarp/fixtures/whitequark/undef.txt
rename to test/prism/fixtures/whitequark/undef.txt
diff --git a/test/yarp/fixtures/whitequark/unless.txt b/test/prism/fixtures/whitequark/unless.txt
similarity index 100%
rename from test/yarp/fixtures/whitequark/unless.txt
rename to test/prism/fixtures/whitequark/unless.txt
diff --git a/test/yarp/fixtures/whitequark/unless_else.txt b/test/prism/fixtures/whitequark/unless_else.txt
similarity index 100%
rename from test/yarp/fixtures/whitequark/unless_else.txt
rename to test/prism/fixtures/whitequark/unless_else.txt
diff --git a/test/yarp/fixtures/whitequark/unless_mod.txt b/test/prism/fixtures/whitequark/unless_mod.txt
similarity index 100%
rename from test/yarp/fixtures/whitequark/unless_mod.txt
rename to test/prism/fixtures/whitequark/unless_mod.txt
diff --git a/test/yarp/fixtures/whitequark/until.txt b/test/prism/fixtures/whitequark/until.txt
similarity index 100%
rename from test/yarp/fixtures/whitequark/until.txt
rename to test/prism/fixtures/whitequark/until.txt
diff --git a/test/yarp/fixtures/whitequark/until_mod.txt b/test/prism/fixtures/whitequark/until_mod.txt
similarity index 100%
rename from test/yarp/fixtures/whitequark/until_mod.txt
rename to test/prism/fixtures/whitequark/until_mod.txt
diff --git a/test/yarp/fixtures/whitequark/until_post.txt b/test/prism/fixtures/whitequark/until_post.txt
similarity index 100%
rename from test/yarp/fixtures/whitequark/until_post.txt
rename to test/prism/fixtures/whitequark/until_post.txt
diff --git a/test/yarp/fixtures/whitequark/var_and_asgn.txt b/test/prism/fixtures/whitequark/var_and_asgn.txt
similarity index 100%
rename from test/yarp/fixtures/whitequark/var_and_asgn.txt
rename to test/prism/fixtures/whitequark/var_and_asgn.txt
diff --git a/test/yarp/fixtures/whitequark/var_op_asgn.txt b/test/prism/fixtures/whitequark/var_op_asgn.txt
similarity index 100%
rename from test/yarp/fixtures/whitequark/var_op_asgn.txt
rename to test/prism/fixtures/whitequark/var_op_asgn.txt
diff --git a/test/yarp/fixtures/whitequark/var_op_asgn_cmd.txt b/test/prism/fixtures/whitequark/var_op_asgn_cmd.txt
similarity index 100%
rename from test/yarp/fixtures/whitequark/var_op_asgn_cmd.txt
rename to test/prism/fixtures/whitequark/var_op_asgn_cmd.txt
diff --git a/test/yarp/fixtures/whitequark/var_or_asgn.txt b/test/prism/fixtures/whitequark/var_or_asgn.txt
similarity index 100%
rename from test/yarp/fixtures/whitequark/var_or_asgn.txt
rename to test/prism/fixtures/whitequark/var_or_asgn.txt
diff --git a/test/yarp/fixtures/whitequark/when_multi.txt b/test/prism/fixtures/whitequark/when_multi.txt
similarity index 100%
rename from test/yarp/fixtures/whitequark/when_multi.txt
rename to test/prism/fixtures/whitequark/when_multi.txt
diff --git a/test/yarp/fixtures/whitequark/when_splat.txt b/test/prism/fixtures/whitequark/when_splat.txt
similarity index 100%
rename from test/yarp/fixtures/whitequark/when_splat.txt
rename to test/prism/fixtures/whitequark/when_splat.txt
diff --git a/test/yarp/fixtures/whitequark/when_then.txt b/test/prism/fixtures/whitequark/when_then.txt
similarity index 100%
rename from test/yarp/fixtures/whitequark/when_then.txt
rename to test/prism/fixtures/whitequark/when_then.txt
diff --git a/test/yarp/fixtures/whitequark/while.txt b/test/prism/fixtures/whitequark/while.txt
similarity index 100%
rename from test/yarp/fixtures/whitequark/while.txt
rename to test/prism/fixtures/whitequark/while.txt
diff --git a/test/yarp/fixtures/whitequark/while_mod.txt b/test/prism/fixtures/whitequark/while_mod.txt
similarity index 100%
rename from test/yarp/fixtures/whitequark/while_mod.txt
rename to test/prism/fixtures/whitequark/while_mod.txt
diff --git a/test/yarp/fixtures/whitequark/while_post.txt b/test/prism/fixtures/whitequark/while_post.txt
similarity index 100%
rename from test/yarp/fixtures/whitequark/while_post.txt
rename to test/prism/fixtures/whitequark/while_post.txt
diff --git a/test/yarp/fixtures/whitequark/xstring_interp.txt b/test/prism/fixtures/whitequark/xstring_interp.txt
similarity index 100%
rename from test/yarp/fixtures/whitequark/xstring_interp.txt
rename to test/prism/fixtures/whitequark/xstring_interp.txt
diff --git a/test/yarp/fixtures/whitequark/xstring_plain.txt b/test/prism/fixtures/whitequark/xstring_plain.txt
similarity index 100%
rename from test/yarp/fixtures/whitequark/xstring_plain.txt
rename to test/prism/fixtures/whitequark/xstring_plain.txt
diff --git a/test/yarp/fixtures/whitequark/zsuper.txt b/test/prism/fixtures/whitequark/zsuper.txt
similarity index 100%
rename from test/yarp/fixtures/whitequark/zsuper.txt
rename to test/prism/fixtures/whitequark/zsuper.txt
diff --git a/test/prism/fixtures/xstring.txt b/test/prism/fixtures/xstring.txt
new file mode 100644
index 00000000000000..465a14e84bb57f
--- /dev/null
+++ b/test/prism/fixtures/xstring.txt
@@ -0,0 +1,21 @@
+%x[foo]
+
+`foo #{bar} baz`
+
+`foo`
+
+%x{
+  foo
+}
+
+``
+
+%x{}
+
+`
+foo\
+b\nar
+`
+
+`
+’`
diff --git a/test/prism/fixtures/xstring_with_backslash.txt b/test/prism/fixtures/xstring_with_backslash.txt
new file mode 100644
index 00000000000000..b51bb0f6f9058b
--- /dev/null
+++ b/test/prism/fixtures/xstring_with_backslash.txt
@@ -0,0 +1 @@
+`f\oo`
diff --git a/test/prism/fixtures/yield.txt b/test/prism/fixtures/yield.txt
new file mode 100644
index 00000000000000..752ba27a2e67f4
--- /dev/null
+++ b/test/prism/fixtures/yield.txt
@@ -0,0 +1,7 @@
+def foo; yield; end
+
+def foo; yield(); end
+
+def foo; yield(1); end
+
+def foo; yield(1, 2, 3); end
diff --git a/test/prism/fixtures_test.rb b/test/prism/fixtures_test.rb
new file mode 100644
index 00000000000000..3b4a502b9010f1
--- /dev/null
+++ b/test/prism/fixtures_test.rb
@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+return if RUBY_VERSION < "3.2.0"
+
+require_relative "test_helper"
+
+module Prism
+  class FixturesTest < TestCase
+    except = []
+
+
+    if RUBY_VERSION < "3.3.0"
+      # Ruby < 3.3.0 cannot parse heredocs where there are leading whitespace
+      # characters in the heredoc start.
+      # Example: <<~'   EOF' or <<-'  EOF'
+      # https://bugs.ruby-lang.org/issues/19539
+      except << "heredocs_leading_whitespace.txt"
+      except << "whitequark/ruby_bug_19539.txt"
+
+      # https://bugs.ruby-lang.org/issues/19025
+      except << "whitequark/numparam_ruby_bug_19025.txt"
+      # https://bugs.ruby-lang.org/issues/18878
+      except << "whitequark/ruby_bug_18878.txt"
+      # https://bugs.ruby-lang.org/issues/19281
+      except << "whitequark/ruby_bug_19281.txt"
+    end
+
+    Fixture.each(except: except) do |fixture|
+      define_method(fixture.test_name) { assert_valid_syntax(fixture.read) }
+    end
+  end
+end
diff --git a/test/yarp/fuzzer_test.rb b/test/prism/fuzzer_test.rb
similarity index 89%
rename from test/yarp/fuzzer_test.rb
rename to test/prism/fuzzer_test.rb
index f4abcd4ac8000f..4927478bdc2a1d 100644
--- a/test/yarp/fuzzer_test.rb
+++ b/test/prism/fuzzer_test.rb
@@ -2,11 +2,12 @@
 
 require_relative "test_helper"
 
-module YARP
-  # These tests are simply to exercise snippets found by the fuzzer that caused invalid memory access.
+module Prism
+  # These tests are simply to exercise snippets found by the fuzzer that caused
+  # invalid memory access.
   class FuzzerTest < TestCase
     def self.snippet(name, source)
-      define_method(:"test_fuzzer_#{name}") { YARP.dump(source) }
+      define_method(:"test_fuzzer_#{name}") { Prism.profile(source) }
     end
 
     snippet "incomplete global variable", "$"
@@ -35,22 +36,27 @@ def self.snippet(name, source)
     snippet "escaped unicode at end of file 7", '"\\u3'
     snippet "escaped unicode at end of file 8", '"\\u33'
     snippet "escaped unicode at end of file 9", '"\\u333'
+    snippet "float suffix at end of file", "1e"
+    snippet "parameter name that is zero length", "a { |b;"
 
     snippet "statements node with multiple heredocs", <<~EOF
       for <<A + <<B
       A
       B
     EOF
+
     snippet "create a binary call node with arg before receiver", <<~EOF
       <<-A.g/{/
       A
       /, ""\\
     EOF
+
     snippet "regular expression with start and end out of order", <<~RUBY
       <<-A.g//,
       A
       /{/, ''\\
     RUBY
+
     snippet "interpolated regular expression with start and end out of order", <<~RUBY
       <<-A.g/{/,
       A
diff --git a/test/prism/heredoc_dedent_test.rb b/test/prism/heredoc_dedent_test.rb
new file mode 100644
index 00000000000000..4e7a3c0a142af6
--- /dev/null
+++ b/test/prism/heredoc_dedent_test.rb
@@ -0,0 +1,134 @@
+# frozen_string_literal: true
+
+require_relative "test_helper"
+
+module Prism
+  class HeredocDedentTest < TestCase
+    def test_content_dedented_interpolation_content
+      assert_heredoc_dedent(
+        "  a\n" "1\n" "  a\n",
+        "<<~EOF\n" "  a\n" "\#{1}\n" "  a\n" "EOF\n"
+      )
+    end
+
+    def test_content
+      assert_heredoc_dedent(
+        "a\n",
+        "<<~EOF\n" "  a\n" "EOF\n"
+      )
+    end
+
+    def test_tabs_dedent_spaces
+      assert_heredoc_dedent(
+        "\ta\n" "b\n" "\t\tc\n",
+        "<<~EOF\n" "\ta\n" "  b\n" "\t\tc\n" "EOF\n"
+      )
+    end
+
+    def test_interpolation_then_content
+      assert_heredoc_dedent(
+        "1 a\n",
+        "<<~EOF\n" "  \#{1} a\n" "EOF\n"
+      )
+    end
+
+    def test_content_then_interpolation
+      assert_heredoc_dedent(
+        "a 1\n",
+        "<<~EOF\n" "  a \#{1}\n" "EOF\n"
+      )
+    end
+
+    def test_content_dedented_interpolation
+      assert_heredoc_dedent(
+        " a\n" "1\n",
+        "<<~EOF\n" "  a\n" " \#{1}\n" "EOF\n"
+      )
+    end
+
+    def test_content_interpolation
+      assert_heredoc_dedent(
+        "a\n" "1\n",
+        "<<~EOF\n" "  a\n" "  \#{1}\n" "EOF\n"
+      )
+    end
+
+    def test_content_content
+      assert_heredoc_dedent(
+        "a\n" "b\n",
+        "<<~EOF\n" "  a\n" "  b\n" "EOF\n"
+      )
+    end
+
+    def test_content_indented_content
+      assert_heredoc_dedent(
+        "a\n" "  b\n",
+        "<<~EOF\n" "  a\n" "    b\n" "EOF\n"
+      )
+    end
+
+    def test_content_dedented_content
+      assert_heredoc_dedent(
+        "\ta\n" "b\n",
+        "<<~EOF\n" "\t\t\ta\n" "\t\tb\n" "EOF\n"
+      )
+    end
+
+    def test_single_quote
+      assert_heredoc_dedent(
+        "a \#{1}\n",
+        "<<~'EOF'\n" "a \#{1}\n" "EOF\n"
+      )
+    end
+
+    def test_mixed_indentation
+      assert_heredoc_dedent(
+        "a\n" " b\n",
+        "<<~EOF\n" "\ta\n" "\t b\n" "EOF\n"
+      )
+    end
+
+    def test_indented_content_content
+      assert_heredoc_dedent(
+        " a\n" "b\n",
+        "<<~EOF\n" "\t a\n" "\tb\n" "EOF\n"
+      )
+    end
+
+    def test_indent_size
+      assert_heredoc_dedent(
+        "a\n" "  b\n",
+        "<<~EOF\n" "\ta\n" "          b\n" "EOF\n"
+      )
+    end
+
+    def test_blank_lines
+      assert_heredoc_dedent(
+        "a\n" "\n" "b\n",
+        "<<~EOF\n" "  a\n" "\n" "  b\n" "EOF\n"
+      )
+    end
+
+    def test_many_blank_lines
+      assert_heredoc_dedent(
+        "a\n" "\n" "\n" "\n" "\n" "b\n",
+        "<<~EOF\n" "  a\n" "\n" "\n" "\n" "\n" "  b\n" "EOF\n"
+      )
+    end
+
+    private
+
+    def assert_heredoc_dedent(expected, source)
+      node = Prism.parse_statement(source)
+
+      if node.is_a?(StringNode)
+        actual = node.unescaped
+      else
+        actual = node.parts.map { |part| part.is_a?(StringNode) ? part.unescaped : "1" }.join
+      end
+
+      assert_equal(expected, actual)
+      assert_equal(eval(source), actual)
+    end
+  end
+end
diff --git a/test/prism/lex_test.rb b/test/prism/lex_test.rb
new file mode 100644
index 00000000000000..d34c3d9dd3cb2f
--- /dev/null
+++ b/test/prism/lex_test.rb
@@ -0,0 +1,102 @@
+# frozen_string_literal: true
+
+return if !(RUBY_ENGINE == "ruby" && RUBY_VERSION >= "3.2.0")
+
+require_relative "test_helper"
+
+module Prism
+  class LexTest < TestCase
+    except = [
+      # It seems like there are some oddities with nested heredocs and ripper.
+      # Waiting for feedback on https://bugs.ruby-lang.org/issues/19838.
+      "seattlerb/heredoc_nested.txt",
+      "whitequark/dedenting_heredoc.txt",
+      # Ripper seems to have a bug that the regex portions before and after
+      # the heredoc are combined into a single token. See
+      # https://bugs.ruby-lang.org/issues/19838.
+      "spanning_heredoc.txt",
+      "spanning_heredoc_newlines.txt",
+      # Prism emits a single :on_tstring_content in <<- style heredocs when there
+      # is a line continuation preceded by escaped backslashes. It should emit two, same
+      # as if the backslashes are not present.
+      "heredocs_with_fake_newlines.txt",
+    ]
+
+    if RUBY_VERSION < "3.3.0"
+      # This file has changed behavior in Ripper in Ruby 3.3, so we skip it if
+      # we're on an earlier version.
+      except << "seattlerb/pct_w_heredoc_interp_nested.txt"
+
+      # Ruby < 3.3.0 cannot parse heredocs where there are leading whitespace
+      # characters in the heredoc start.
+      # Example: <<~'   EOF' or <<-'  EOF'
+      # https://bugs.ruby-lang.org/issues/19539
+      except << "heredocs_leading_whitespace.txt"
+      except << "whitequark/ruby_bug_19539.txt"
+
+      # https://bugs.ruby-lang.org/issues/19025
+      except << "whitequark/numparam_ruby_bug_19025.txt"
+      # https://bugs.ruby-lang.org/issues/18878
+      except << "whitequark/ruby_bug_18878.txt"
+      # https://bugs.ruby-lang.org/issues/19281
+      except << "whitequark/ruby_bug_19281.txt"
+    end
+
+    Fixture.each(except: except) do |fixture|
+      define_method(fixture.test_name) { assert_lex(fixture) }
+    end
+
+    def test_lex_file
+      assert_nothing_raised do
+        Prism.lex_file(__FILE__)
+      end
+
+      error = assert_raise Errno::ENOENT do
+        Prism.lex_file("idontexist.rb")
+      end
+
+      assert_equal "No such file or directory - idontexist.rb", error.message
+
+      assert_raise TypeError do
+        Prism.lex_file(nil)
+      end
+    end
+
+    def test_parse_lex
+      node, tokens = Prism.parse_lex("def foo; end").value
+
+      assert_kind_of ProgramNode, node
+      assert_equal 5, tokens.length
+    end
+
+    def test_parse_lex_file
+      node, tokens = Prism.parse_lex_file(__FILE__).value
+
+      assert_kind_of ProgramNode, node
+      refute_empty tokens
+
+      error = assert_raise Errno::ENOENT do
+        Prism.parse_lex_file("idontexist.rb")
+      end
+
+      assert_equal "No such file or directory - idontexist.rb", error.message
+
+      assert_raise TypeError do
+        Prism.parse_lex_file(nil)
+      end
+    end
+
+    private
+
+    def assert_lex(fixture)
+      source = fixture.read
+
+      result = Prism.lex_compat(source)
+      assert_equal [], result.errors
+
+      Prism.lex_ripper(source).zip(result.value).each do |(ripper, prism)|
+        assert_equal ripper, prism
+      end
+    end
+  end
+end
diff --git a/test/prism/library_symbols_test.rb b/test/prism/library_symbols_test.rb
new file mode 100644
index 00000000000000..44f225478bdab2
--- /dev/null
+++ b/test/prism/library_symbols_test.rb
@@ -0,0 +1,104 @@
+# frozen_string_literal: true
+
+require_relative "test_helper"
+
+return if RUBY_PLATFORM !~ /linux/
+return if RUBY_PLATFORM =~ /powerpc64le/
+
+module Prism
+  #
+  #  examine a prism dll or static archive for expected external symbols.
+  #  these tests only work on a linux system right now.
+  #
+  class LibrarySymbolsTest < TestCase
+    def setup
+      super
+
+      @libprism_a = File.expand_path("../../build/libprism.a", __dir__)
+      @libprism_so = File.expand_path("../../build/libprism.so", __dir__)
+      @prism_so = File.expand_path("../../lib/prism/prism.so", __dir__)
+    end
+
+    # objdump runner and helpers
+    def objdump(path)
+      assert_path_exist(path)
+      %x(objdump --section=.text --syms #{path}).split("\n")
+    end
+
+    def global_objdump_symbols(path)
+      objdump(path).select { |line| line[17] == "g" }
+    end
+
+    def hidden_global_objdump_symbols(path)
+      global_objdump_symbols(path).select { |line| line =~ / \.hidden / }
+    end
+
+    def visible_global_objdump_symbols(path)
+      global_objdump_symbols(path).reject { |line| line =~ / \.hidden / }
+    end
+
+    # nm runner and helpers
+    def nm(path)
+      assert_path_exist(path)
+      %x(nm #{path}).split("\n")
+    end
+
+    def global_nm_symbols(path)
+      nm(path).select { |line| line[17] == "T" }
+    end
+
+    def local_nm_symbols(path)
+      nm(path).select { |line| line[17] == "t" }
+    end
+
+    # dig the symbol name out of each line. works for both `objdump` and `nm` output.
+    def names(symbol_lines)
+      symbol_lines.map { |line| line.split(/\s+/).last }
+    end
+
+    #
+    #  static archive - libprism.a
+    #
+    def test_libprism_a_contains_nothing_globally_visible
+      omit("libprism.a is not built") unless File.exist?(@libprism_a)
+
+      assert_empty(names(visible_global_objdump_symbols(@libprism_a)))
+    end
+
+    def test_libprism_a_contains_hidden_pm_symbols
+      omit("libprism.a is not built") unless File.exist?(@libprism_a)
+
+      names(hidden_global_objdump_symbols(@libprism_a)).tap do |symbols|
+        assert_includes(symbols, "pm_parse")
+        assert_includes(symbols, "pm_version")
+      end
+    end
+
+    #
+    #  shared object - libprism.so
+    #
+    def test_libprism_so_exports_only_the_necessary_functions
+      omit("libprism.so is not built") unless File.exist?(@libprism_so)
+
+      names(global_nm_symbols(@libprism_so)).tap do |symbols|
+        assert_includes(symbols, "pm_parse")
+        assert_includes(symbols, "pm_version")
+      end
+      names(local_nm_symbols(@libprism_so)).tap do |symbols|
+        assert_includes(symbols, "pm_encoding_utf_8_isupper_char")
+      end
+      # TODO: someone who uses this library needs to finish this test
+    end
+
+    #
+    #  shared object - prism.so
+    #
+    def test_prism_so_exports_only_the_C_extension_init_function
+      omit("prism.so is not built") unless File.exist?(@prism_so)
+
+      names(global_nm_symbols(@prism_so)).tap do |symbols|
+        assert_equal(["Init_prism"], symbols)
+      end
+    end
+  end
+end
diff --git a/test/prism/locals_test.rb b/test/prism/locals_test.rb
new file mode 100644
index 00000000000000..e0e9a458559759
--- /dev/null
+++ b/test/prism/locals_test.rb
@@ -0,0 +1,241 @@
+# frozen_string_literal: true
+
+# This test is going to use the RubyVM::InstructionSequence class to compile
+# local tables and compare against them to ensure we have the same locals in the
+# same order. This is important to guarantee that we compile indices correctly
+# on CRuby (in terms of compatibility).
+#
+# There have also been changes made in other versions of Ruby, so we only want
+# to test on the most recent versions.
+return if !defined?(RubyVM::InstructionSequence) || RUBY_VERSION < "3.4.0"
+
+# If we're on Ruby 3.4.0 and the default parser is Prism, then there is no point
+# in comparing the locals because they will be the same.
+return if RubyVM::InstructionSequence.compile("").to_a[4][:parser] == :prism
+
+# In Ruby 3.4.0, the local table for method forwarding changed. But 3.4.0 can
+# refer to the dev version, so while 3.4.0 still isn't released, we need to
+# check if we have a high enough revision.
+return if RubyVM::InstructionSequence.compile("def foo(...); end").to_a[13][2][2][10].length != 1
+
+# Omit tests if running on a 32-bit machine because there is a bug with how
+# Ruby is handling large ISeqs on 32-bit machines
+return if RUBY_PLATFORM =~ /i686/
+
+require_relative "test_helper"
+
+module Prism
+  class LocalsTest < TestCase
+    except = [
+      # Skip this fixture because it has a different number of locals because
+      # CRuby is eliminating dead code.
+      "whitequark/ruby_bug_10653.txt"
+    ]
+
+    Fixture.each(except: except) do |fixture|
+      define_method(fixture.test_name) { assert_locals(fixture) }
+    end
+
+    def setup
+      @previous_default_external = Encoding.default_external
+      ignore_warnings { Encoding.default_external = Encoding::UTF_8 }
+    end
+
+    def teardown
+      ignore_warnings { Encoding.default_external = @previous_default_external }
+    end
+
+    private
+
+    def assert_locals(fixture)
+      source = fixture.read
+
+      expected = cruby_locals(source)
+      actual = prism_locals(source)
+
+      assert_equal(expected, actual)
+    end
+
+    # A wrapper around a RubyVM::InstructionSequence that provides a more
+    # convenient interface for accessing parts of the iseq.
+    class ISeq
+      attr_reader :parts
+
+      def initialize(parts)
+        @parts = parts
+      end
+
+      def type
+        parts[0]
+      end
+
+      def local_table
+        parts[10]
+      end
+
+      def instructions
+        parts[13]
+      end
+
+      def each_child
+        instructions.each do |instruction|
+          # Only look at arrays. Other instructions are line numbers or
+          # tracepoint events.
+          next unless instruction.is_a?(Array)
+
+          instruction.each do |opnd|
+            # Only look at arrays. Other operands are literals.
+            next unless opnd.is_a?(Array)
+
+            # Only look at instruction sequences. Other operands are literals.
+            next unless opnd[0] == "YARVInstructionSequence/SimpleDataFormat"
+
+            yield ISeq.new(opnd)
+          end
+        end
+      end
+    end
+
+    # Used to hold the place of a local that will be in the local table but
+    # cannot be accessed directly from the source code. For example, the
+    # iteration variable in a for loop or the positional parameter on a method
+    # definition that is destructured.
+    AnonymousLocal = Object.new
+
+    # For the given source, compiles with CRuby and returns a list of all of the
+    # sets of local variables that were encountered.
+    def cruby_locals(source)
+      locals = [] #: Array[Array[Symbol | Integer]]
+      stack = [ISeq.new(ignore_warnings { RubyVM::InstructionSequence.compile(source) }.to_a)]
+
+      while (iseq = stack.pop)
+        names = [*iseq.local_table]
+        names.map!.with_index do |name, index|
+          # When an anonymous local variable is present in the iseq's local
+          # table, it is represented as the stack offset from the top.
+          # However, when these are dumped to binary and read back in, they
+          # are replaced with the symbol :#arg_rest. To consistently handle
+          # this, we replace them here with their index.
+          if name == :"#arg_rest"
+            names.length - index + 1
+          else
+            name
+          end
+        end
+
+        locals << names
+        iseq.each_child { |child| stack << child }
+      end
+
+      locals
+    end
+
+    # For the given source, parses with prism and returns a list of all of the
+    # sets of local variables that were encountered.
+    def prism_locals(source)
+      locals = [] #: Array[Array[Symbol | Integer]]
+      stack = [Prism.parse(source).value] #: Array[Prism::node]
+
+      while (node = stack.pop)
+        case node
+        when BlockNode, DefNode, LambdaNode
+          names = node.locals
+          params = nil
+
+          if node.is_a?(DefNode)
+            params = node.parameters
+          elsif node.parameters.is_a?(NumberedParametersNode)
+            # nothing
+          elsif node.parameters.is_a?(ItParametersNode)
+            names.unshift(AnonymousLocal)
+          else
+            params = node.parameters&.parameters
+          end
+
+          # prism places parameters in the same order that they appear in the
+          # source. CRuby places them in the order that they need to appear
+          # according to their own internal calling convention. We mimic that
+          # order here so that we can compare properly.
+          if params
+            sorted = [
+              *params.requireds.map do |required|
+                if required.is_a?(RequiredParameterNode)
+                  required.name
+                else
+                  AnonymousLocal
+                end
+              end,
+              *params.optionals.map(&:name),
+              *((params.rest.name || :*) if params.rest && !params.rest.is_a?(ImplicitRestNode)),
+              *params.posts.map do |post|
+                if post.is_a?(RequiredParameterNode)
+                  post.name
+                else
+                  AnonymousLocal
+                end
+              end,
+              *params.keywords.grep(RequiredKeywordParameterNode).map(&:name),
+              *params.keywords.grep(OptionalKeywordParameterNode).map(&:name),
+            ]
+
+            sorted << AnonymousLocal if params.keywords.any?
+
+            if params.keyword_rest.is_a?(ForwardingParameterNode)
+              if sorted.length == 0
+                sorted.push(:"...")
+              else
+                sorted.push(:*, :**, :&, :"...")
+              end
+            elsif params.keyword_rest.is_a?(KeywordRestParameterNode)
+              sorted << (params.keyword_rest.name || :**)
+            end
+
+            # Recurse down the parameter tree to find any destructured
+            # parameters and add them after the other parameters.
+            param_stack = params.requireds.concat(params.posts).grep(MultiTargetNode).reverse
+            while (param = param_stack.pop)
+              case param
+              when MultiTargetNode
+                param_stack.concat(param.rights.reverse)
+                param_stack << param.rest if param.rest&.expression && !sorted.include?(param.rest.expression.name)
+                param_stack.concat(param.lefts.reverse)
+              when RequiredParameterNode
+                sorted << param.name
+              when SplatNode
+                sorted << param.expression.name
+              end
+            end
+
+            if params.block
+              sorted << (params.block.name || :&)
+            end
+
+            names = sorted.concat(names - sorted)
+          end
+
+          names.map!.with_index do |name, index|
+            if name == AnonymousLocal
+              names.length - index + 1
+            else
+              name
+            end
+          end
+
+          locals << names
+        when ClassNode, ModuleNode, ProgramNode, SingletonClassNode
+          locals << node.locals
+        when ForNode
+          locals << [2]
+        when PostExecutionNode
+          locals.push([], [])
+        when InterpolatedRegularExpressionNode
+          locals << [] if node.once?
+        end
+
+        stack.concat(node.compact_child_nodes)
+      end
+
+      locals
+    end
+  end
+end
diff --git a/test/prism/magic_comment_test.rb b/test/prism/magic_comment_test.rb
new file mode 100644
index 00000000000000..ab4b5f56e5169b
--- /dev/null
+++ b/test/prism/magic_comment_test.rb
@@ -0,0 +1,117 @@
+# frozen_string_literal: true
+
+require_relative "test_helper"
+
+module Prism
+  class MagicCommentTest < TestCase
+    if RUBY_ENGINE == "ruby"
+      class MagicCommentRipper < Ripper
+        attr_reader :magic_comments
+
+        def initialize(*)
+          super
+          @magic_comments = []
+        end
+
+        def on_magic_comment(key, value)
+          @magic_comments << [key, value]
+          super
+        end
+      end
+
+      Fixture.each do |fixture|
+        define_method(fixture.test_name) { assert_magic_comments(fixture) }
+      end
+    end
+
+    def test_encoding
+      assert_magic_encoding(Encoding::US_ASCII, "# encoding: ascii")
+    end
+
+    def test_coding
+      assert_magic_encoding(Encoding::US_ASCII, "# coding: ascii")
+    end
+
+    def test_eNcOdInG
+      assert_magic_encoding(Encoding::US_ASCII, "# eNcOdInG: ascii")
+    end
+
+    def test_CoDiNg
+      assert_magic_encoding(Encoding::US_ASCII, "# CoDiNg: ascii")
+    end
+
+    def test_encoding_whitespace
+      assert_magic_encoding(Encoding::US_ASCII, "# \s\t\v encoding \s\t\v : \s\t\v ascii \s\t\v")
+    end
+
+    def test_emacs_encoding
+      assert_magic_encoding(Encoding::US_ASCII, "# -*- encoding: ascii -*-")
+    end
+
+    def test_emacs_coding
+      assert_magic_encoding(Encoding::US_ASCII, "# -*- coding: ascii -*-")
+    end
+
+    def test_emacs_eNcOdInG
+      assert_magic_encoding(Encoding::US_ASCII, "# -*- eNcOdInG: ascii -*-")
+    end
+
+    def test_emacs_CoDiNg
+      assert_magic_encoding(Encoding::US_ASCII, "# -*- CoDiNg: ascii -*-")
+    end
+
+    def test_emacs_whitespace
+      assert_magic_encoding(Encoding::US_ASCII, "# -*- \s\t\v encoding \s\t\v : \s\t\v ascii \s\t\v -*-")
+    end
+
+    def test_emacs_multiple
+      assert_magic_encoding(Encoding::US_ASCII, "# -*- foo: bar; encoding: ascii -*-")
+    end
+
+    def test_coding_whitespace
+      assert_magic_encoding(Encoding::ASCII_8BIT, "# coding \t \r  \v   :     \t \v    \r   ascii-8bit")
+    end
+
+    def test_vim
+      assert_magic_encoding(Encoding::Windows_31J, "# vim: filetype=ruby, fileencoding=windows-31j, tabsize=3, shiftwidth=3")
+    end
+
+    private
+
+    def assert_magic_encoding(expected, line)
+      source = %Q{#{line}\n""}
+      actual = Prism.parse(source).encoding
+
+      # Compare against our expectation.
+      assert_equal expected, actual
+
+      # Compare against Ruby's expectation.
+      if defined?(RubyVM::InstructionSequence)
+        previous = $VERBOSE
+        expected =
+          begin
+            $VERBOSE = nil
+            RubyVM::InstructionSequence.compile(source).eval.encoding
+          ensure
+            $VERBOSE = previous
+          end
+        assert_equal expected, actual
+      end
+    end
+
+    def assert_magic_comments(fixture)
+      source = fixture.read
+
+      # Check that we get the correct number of magic comments when lexing with
+      # ripper.
+      expected = MagicCommentRipper.new(source).tap(&:parse).magic_comments
+      actual = Prism.parse(source).magic_comments
+
+      assert_equal expected.length, actual.length
+      expected.zip(actual).each do |(expected_key, expected_value), magic_comment|
+        assert_equal expected_key, magic_comment.key
+        assert_equal expected_value, magic_comment.value
+      end
+    end
+  end
+end
diff --git a/test/prism/newline_offsets_test.rb b/test/prism/newline_offsets_test.rb
new file mode 100644
index 00000000000000..99b808b1df6571
--- /dev/null
+++ b/test/prism/newline_offsets_test.rb
@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+require_relative "test_helper"
+
+module Prism
+  class NewlineOffsetsTest < TestCase
+    Fixture.each do |fixture|
+      define_method(fixture.test_name) { assert_newline_offsets(fixture) }
+    end
+
+    private
+
+    def assert_newline_offsets(fixture)
+      source = fixture.read
+
+      expected = [0]
+      source.b.scan("\n") { expected << $~.offset(0)[0] + 1 }
+
+      assert_equal expected, Prism.parse(source).source.offsets
+    end
+  end
+end
diff --git a/test/prism/newline_test.rb b/test/prism/newline_test.rb
new file mode 100644
index 00000000000000..fefe9def91f1e6
--- /dev/null
+++ b/test/prism/newline_test.rb
@@ -0,0 +1,98 @@
+# frozen_string_literal: true
+
+require_relative "test_helper"
+
+return unless defined?(RubyVM::InstructionSequence)
+
+module Prism
+  class NewlineTest < TestCase
+    skips = %w[
+      errors_test.rb
+      locals_test.rb
+      regexp_test.rb
+      test_helper.rb
+      unescape_test.rb
+      encoding/regular_expression_encoding_test.rb
+      encoding/string_encoding_test.rb
+      result/breadth_first_search_test.rb
+      result/static_literals_test.rb
+      result/warnings_test.rb
+      ruby/parser_test.rb
+      ruby/ruby_parser_test.rb
+    ]
+
+    base = __dir__
+    (Dir["{,api/,encoding/,result/,ruby/}*.rb", base: base] - skips).each do |relative|
+      define_method(:"test_#{relative}") do
+        assert_newlines(base, relative)
+      end
+    end
+
+    private
+
+    def assert_newlines(base, relative)
+      filepath = File.join(base, relative)
+      source = File.read(filepath, binmode: true, external_encoding: Encoding::UTF_8)
+      expected = rubyvm_lines(source)
+
+      result = Prism.parse_file(filepath)
+      assert_empty result.errors
+      actual = prism_lines(result)
+
+      source.each_line.with_index(1) do |line, line_number|
+        # Lines like `while (foo = bar)` result in two line flags in the
+        # bytecode but only one newline flag in the AST. We need to remove the
+        # extra line flag from the bytecode to make the test pass.
+        if line.match?(/while \(/)
+          index = expected.index(line_number)
+          expected.delete_at(index) if index
+        end
+
+        # Lines like `foo =` where the value is on the next line result in
+        # another line flag in the bytecode but only one newline flag in the
+        # AST.
+        if line.match?(/^\s+\w+ =$/)
+          if source.lines[line_number].match?(/^\s+case/)
+            actual[actual.index(line_number)] += 1
+          else
+            actual.delete_at(actual.index(line_number))
+          end
+        end
+
+        if line.match?(/^\s+\w+ = \[$/)
+          if !expected.include?(line_number) && !expected.include?(line_number + 2)
+            actual[actual.index(line_number)] += 1
+          end
+        end
+      end
+
+      assert_equal expected, actual
+    end
+
+    def rubyvm_lines(source)
+      queue = [ignore_warnings { RubyVM::InstructionSequence.compile(source) }]
+      lines = []
+
+      while iseq = queue.shift
+        lines.concat(iseq.trace_points.filter_map { |line, event| line if event == :line })
+        iseq.each_child { |insn| queue << insn unless insn.label.start_with?("ensure in ") }
+      end
+
+      lines.sort
+    end
+
+    def prism_lines(result)
+      result.mark_newlines!
+
+      queue = [result.value]
+      newlines = []
+
+      while node = queue.shift
+        queue.concat(node.compact_child_nodes)
+        newlines << result.source.line(node.location.start_offset) if node&.newline_flag?
+      end
+
+      newlines.sort
+    end
+  end
+end
diff --git a/test/prism/onigmo_test.rb b/test/prism/onigmo_test.rb
new file mode 100644
index 00000000000000..03f44c4e4cec7e
--- /dev/null
+++ b/test/prism/onigmo_test.rb
@@ -0,0 +1,66 @@
+# frozen_string_literal: true
+
+return if RUBY_ENGINE != "ruby"
+
+require_relative "test_helper"
+
+begin
+  require "onigmo"
+rescue LoadError
+  # In CRuby's CI, we're not going to test against the parser gem because we
+  # don't want to have to install it. So in this case we'll just skip this test.
+  return
+end
+
+module Prism
+  class OnigmoTest < TestCase
+    def test_ONIGERR_PARSE_DEPTH_LIMIT_OVER
+      assert_error(%Q{#{"(" * 4096}a#{")" * 4096}}, "parse depth limit over")
+    end
+
+    def test_ONIGERR_EMPTY_CHAR_CLASS
+      assert_error("[]", "empty char-class")
+    end
+
+    def test_ONIGERR_TARGET_OF_REPEAT_OPERATOR_NOT_SPECIFIED
+      assert_error("*", "target of repeat operator is not specified")
+      assert_error("+", "target of repeat operator is not specified")
+      assert_error("?", "target of repeat operator is not specified")
+    end
+
+    def test_ONIGERR_EMPTY_GROUP_NAME
+      assert_error("(?<>)", "group name is empty")
+    end
+
+    def test_ONIGERR_END_PATTERN_WITH_UNMATCHED_PARENTHESIS
+      assert_error("(", "end pattern with unmatched parenthesis")
+      assert_error("(|", "end pattern with unmatched parenthesis")
+      assert_error("(?<", "end pattern with unmatched parenthesis")
+    end
+
+    def test_ONIGERR_END_PATTERN_IN_GROUP
+      assert_error("(?", "end pattern in group")
+      assert_error("(?#", "end pattern in group")
+    end
+
+    def test_ONIGERR_UNDEFINED_GROUP_OPTION
+      assert_error("(?P", "undefined group option")
+    end
+
+    def test_ONIGERR_UNMATCHED_CLOSE_PARENTHESIS
+      assert_error(")", "unmatched close parenthesis")
+    end
+
+    private
+
+    def assert_error(source, message)
+      result = Prism.parse("/#{source}/")
+
+      assert result.failure?, "Expected #{source.inspect} to error"
+      assert_equal message, result.errors.first.message
+
+      error = assert_raise(ArgumentError) { Onigmo.parse(source) }
+      assert_equal message, error.message
+    end
+  end
+end
diff --git a/test/prism/percent_delimiter_string_test.rb b/test/prism/percent_delimiter_string_test.rb
new file mode 100644
index 00000000000000..6fd825ad06d56f
--- /dev/null
+++ b/test/prism/percent_delimiter_string_test.rb
@@ -0,0 +1,82 @@
+# frozen_string_literal: true
+
+require_relative "test_helper"
+
+module Prism
+  module PercentDelimiterTests
+    def test_newline_terminator_with_lf_crlf
+      str = l "\n123456\r\n"
+      assert_parse "123456", str
+    end
+
+    def test_newline_terminator_with_lf_crlf_with_extra_cr
+      str = l "\n123456\r\r\n"
+      assert_parse "123456\r", str
+    end
+
+    def test_newline_terminator_with_crlf_pair
+      str = l "\r\n123456\r\n"
+      assert_parse "123456", str
+    end
+
+    def test_newline_terminator_with_crlf_crlf_with_extra_cr
+      str = l "\r\n123456\r\r\n"
+      assert_parse "123456\r", str
+    end
+
+    def test_newline_terminator_with_cr_cr
+      str = l "\r123456\r;\n"
+      assert_parse "123456", str
+    end
+
+    def test_newline_terminator_with_crlf_lf
+      str = l "\r\n123456\n;\n"
+      assert_parse "123456", str
+    end
+
+    def test_cr_crlf
+      str = l "\r1\r\n \r"
+      assert_parse "1\n ", str
+    end
+
+    def test_lf_crlf
+      str = l "\n1\r\n \n"
+      assert_parse "1", str
+    end
+
+    def test_lf_lf
+      str = l "\n1\n \n"
+      assert_parse "1", str
+    end
+
+    def assert_parse(expected, str)
+      assert_equal expected, find_node(str).unescaped
+    end
+  end
+
+  class PercentDelimiterStringTest < TestCase
+    include PercentDelimiterTests
+
+    def find_node(str)
+      tree = Prism.parse str
+      tree.value.breadth_first_search { |x| Prism::StringNode === x }
+    end
+
+    def l(str)
+      "%" + str
+    end
+  end
+
+  class PercentDelimiterRegexpTest < TestCase
+    include PercentDelimiterTests
+
+    def l(str)
+      "%r" + str
+    end
+
+    def find_node(str)
+      tree = Prism.parse str
+      tree.value.breadth_first_search { |x| Prism::RegularExpressionNode === x }
+    end
+  end
+end
diff --git a/test/prism/ractor_test.rb b/test/prism/ractor_test.rb
new file mode 100644
index 00000000000000..fba10dbfe257a5
--- /dev/null
+++ b/test/prism/ractor_test.rb
@@ -0,0 +1,70 @@
+# frozen_string_literal: true
+
+return unless defined?(Ractor) && Process.respond_to?(:fork)
+
+require_relative "test_helper"
+
+module Prism
+  class RactorTest < TestCase
+    def test_version
+      assert_match(/\A\d+\.\d+\.\d+\z/, with_ractor { Prism::VERSION })
+    end
+
+    def test_parse_file
+      assert_equal("Prism::ParseResult", with_ractor(__FILE__) { |filepath| Prism.parse_file(filepath).class })
+    end
+
+    def test_lex_file
+      assert_equal("Prism::LexResult", with_ractor(__FILE__) { |filepath| Prism.lex_file(filepath).class })
+    end
+
+    def test_parse_file_comments
+      assert_equal("Array", with_ractor(__FILE__) { |filepath| Prism.parse_file_comments(filepath).class })
+    end
+
+    def test_parse_lex_file
+      assert_equal("Prism::ParseLexResult", with_ractor(__FILE__) { |filepath| Prism.parse_lex_file(filepath).class })
+    end
+
+    def test_parse_success
+      assert_equal("true", with_ractor("1 + 1") { |source| Prism.parse_success?(source) })
+    end
+
+    def test_parse_failure
+      assert_equal("true", with_ractor("1 +") { |source| Prism.parse_failure?(source) })
+    end
+
+    def test_string_query_local
+      assert_equal("true", with_ractor("foo") { |source| StringQuery.local?(source) })
+    end
+
+    def test_string_query_constant
+      assert_equal("true", with_ractor("FOO") { |source| StringQuery.constant?(source) })
+    end
+
+    def test_string_query_method_name
+      assert_equal("true", with_ractor("foo?") { |source| StringQuery.method_name?(source) })
+    end
+
+    if !ENV["PRISM_BUILD_MINIMAL"]
+      def test_dump_file
+        result = with_ractor(__FILE__) { |filepath| Prism.dump_file(filepath) }
+        assert_operator(result, :start_with?, "PRISM")
+      end
+    end
+
+    private
+
+    # Note that this must be done in a subprocess, otherwise it can mess up
+    # CRuby's test suite.
+    def with_ractor(*arguments, &block)
+      IO.popen("-") do |reader|
+        if reader
+          reader.gets.chomp
+        else
+          puts(ignore_warnings { Ractor.new(*arguments, &block) }.value)
+        end
+      end
+    end
+  end
+end
diff --git a/test/prism/regexp_test.rb b/test/prism/regexp_test.rb
new file mode 100644
index 00000000000000..cde0c23f97681e
--- /dev/null
+++ b/test/prism/regexp_test.rb
@@ -0,0 +1,265 @@
+# frozen_string_literal: true
+
+require_relative "test_helper"
+
+module Prism
+  class RegexpTest < TestCase
+    ############################################################################
+    # These tests test the actual use case of extracting named capture groups
+    ############################################################################
+
+    def test_named_captures_with_arrows
+      assert_equal([:foo], named_captures("(?<foo>bar)"))
+    end
+
+    def test_named_captures_with_single_quotes
+      assert_equal([:foo], named_captures("(?'foo'bar)"))
+    end
+
+    def test_nested_named_captures_with_arrows
+      assert_equal([:foo, :bar], named_captures("(?<foo>(?<bar>baz))"))
+    end
+
+    def test_nested_named_captures_with_single_quotes
+      assert_equal([:foo, :bar], named_captures("(?'foo'(?'bar'baz))"))
+    end
+
+    def test_allows_duplicate_named_captures
+      assert_equal([:foo], named_captures("(?<foo>bar)(?<foo>baz)"))
+    end
+
+    def test_named_capture_inside_fake_range_quantifier
+      assert_equal([:foo], named_captures("foo{1, (?<foo>2)}"))
+    end
+
+    def test_fake_named_captures_inside_character_sets
+      assert_equal([], named_captures("[a-z(?<foo>)]"))
+    end
+
+    def test_fake_named_capture_inside_character_set_with_escaped_ending
+      assert_equal([], named_captures("[a-z\\](?<foo>)]"))
+    end
+
+    ############################################################################
+    # These tests test the rest of the AST. They are not exhaustive, but they
+    # should cover the most common cases. We test these to make sure we don't
+    # accidentally regress and stop being able to extract named captures.
+    ############################################################################
+
+    def test_alternation
+      assert_valid_regexp("foo|bar")
+    end
+
+    def test_anchors
+      assert_valid_regexp("^foo$")
+    end
+
+    def test_any
+      assert_valid_regexp(".")
+    end
+
+    def test_posix_character_classes
+      assert_valid_regexp("[[:digit:]]")
+    end
+
+    def test_negated_posix_character_classes
+      assert_valid_regexp("[[:^digit:]]")
+    end
+
+    def test_invalid_posix_character_classes_should_fall_back_to_regular_classes
+      assert_valid_regexp("[[:foo]]")
+    end
+
+    def test_character_sets
+      assert_valid_regexp("[abc]")
+    end
+
+    def test_nested_character_sets
+      assert_valid_regexp("[[abc]]")
+    end
+
+    def test_nested_character_sets_with_operators
+      assert_valid_regexp("[[abc] && [def]]")
+    end
+
+    def test_named_capture_inside_nested_character_set
+      assert_equal([], named_captures("[foo (?<foo>bar)]"))
+    end
+
+    def test_negated_character_sets
+      assert_valid_regexp("[^abc]")
+    end
+
+    def test_character_ranges
+      assert_valid_regexp("[a-z]")
+    end
+
+    def test_negated_character_ranges
+      assert_valid_regexp("[^a-z]")
+    end
+
+    def test_comments
+      assert_valid_regexp("(?#foo)")
+    end
+
+    def test_comments_with_escaped_parentheses
+      assert_valid_regexp("(?#foo\\)\\))")
+    end
+
+    def test_non_capturing_groups
+      assert_valid_regexp("(?:foo)")
+    end
+
+    def test_positive_lookaheads
+      assert_valid_regexp("(?=foo)")
+    end
+
+    def test_negative_lookaheads
+      assert_valid_regexp("(?!foo)")
+    end
+
+    def test_positive_lookbehinds
+      assert_valid_regexp("(?<=foo)")
+    end
+
+    def test_negative_lookbehinds
+      assert_valid_regexp("(?<!foo)")
+    end
+
+    def test_atomic_groups
+      assert_valid_regexp("(?>foo)")
+    end
+
+    def test_absence_operator
+      assert_valid_regexp("(?~foo)")
+    end
+
+    def test_conditional_expression_with_index
+      assert_valid_regexp("(?(1)foo)")
+    end
+
+    def test_conditional_expression_with_name
+      assert_valid_regexp("(?(foo)bar)")
+    end
+
+    def test_conditional_expression_with_group
+      assert_valid_regexp("(?(<foo>)bar)")
+    end
+
+    def test_options_on_groups
+      assert_valid_regexp("(?imxdau:foo)")
+    end
+
+    def test_options_on_groups_getting_turned_off
+      assert_valid_regexp("(?-imx:foo)")
+    end
+
+    def test_options_on_groups_some_getting_turned_on_some_getting_turned_off
+      assert_valid_regexp("(?im-x:foo)")
+    end
+
+    def test_star_quantifier
+      assert_valid_regexp("foo*")
+    end
+
+    def test_plus_quantifier
+      assert_valid_regexp("foo+")
+    end
+
+    def test_question_mark_quantifier
+      assert_valid_regexp("foo?")
+    end
+
+    def test_endless_range_quantifier
+      assert_valid_regexp("foo{1,}")
+    end
+
+    def test_beginless_range_quantifier
+      assert_valid_regexp("foo{,1}")
+    end
+
+    def test_range_quantifier
+      assert_valid_regexp("foo{1,2}")
+    end
+
+    def test_fake_range_quantifier_because_of_spaces
+      assert_valid_regexp("foo{1, 2}")
+    end
+
+    def test_fake_range_quantifier_because_unclosed
+      assert_valid_regexp("\\A{")
+    end
+
+    ############################################################################
+    # These test that flag values are correct.
+    ############################################################################
+
+    def test_flag_ignorecase
+      assert_equal(Regexp::IGNORECASE, options("i"))
+    end
+
+    def test_flag_extended
+      assert_equal(Regexp::EXTENDED, options("x"))
+    end
+
+    def test_flag_multiline
+      assert_equal(Regexp::MULTILINE, options("m"))
+    end
+
+    def test_flag_fixedencoding
+      assert_equal(Regexp::FIXEDENCODING, options("e"))
+      assert_equal(Regexp::FIXEDENCODING, options("u"))
+      assert_equal(Regexp::FIXEDENCODING, options("s"))
+    end
+
+    def test_flag_noencoding
+      assert_equal(Regexp::NOENCODING, options("n"))
+    end
+
+    def test_flag_once
+      assert_equal(0, options("o"))
+    end
+
+    def test_flag_combined
+      value = Regexp::IGNORECASE | Regexp::MULTILINE | Regexp::EXTENDED
+      assert_equal(value, options("mix"))
+    end
+
+    def test_last_encoding_option_wins
+      regex = "/foo/nu"
+      option = Prism.parse_statement(regex).options
+
+      assert_equal Regexp::FIXEDENCODING, option
+
+      regex = "/foo/un"
+      option = Prism.parse_statement(regex).options
+
+      assert_equal Regexp::NOENCODING, option
+    end
+
+    private
+
+    def assert_valid_regexp(source)
+      assert Prism.parse_success?("/#{source}/ =~ \"\"")
+    end
+
+    def named_captures(source)
+      Prism.parse("/#{source}/ =~ \"\"").value.locals
+    end
+
+    def options(flags)
+      options =
+        ["/foo/#{flags}", "/foo\#{1}/#{flags}"].map do |source|
+          Prism.parse_statement(source).options
+        end
+
+      # Check that we get the same set of options from both regular expressions
+      # and interpolated regular expressions.
+      assert_equal(1, options.uniq.length)
+
+      # Return the options from the first regular expression since we know they
+      # are the same.
+      options.first
+    end
+  end
+end
diff --git a/test/prism/result/attribute_write_test.rb b/test/prism/result/attribute_write_test.rb
new file mode 100644
index 00000000000000..8f2e35273806e0
--- /dev/null
+++ b/test/prism/result/attribute_write_test.rb
@@ -0,0 +1,56 @@
+# frozen_string_literal: true
+
+require_relative "../test_helper"
+
+module Prism
+  class AttributeWriteTest < TestCase
+    module Target
+      def self.value
+        2
+      end
+
+      def self.value=(value)
+        2
+      end
+
+      def self.[]=(index, value)
+        2
+      end
+    end
+
+    def test_named_call_with_operator
+      assert_attribute_write("Target.value = 1")
+    end
+
+    def test_named_call_without_operator
+      assert_attribute_write("Target.value=(1)")
+    end
+
+    def test_indexed_call_with_operator
+      assert_attribute_write("Target[0] = 1")
+    end
+
+    def test_indexed_call_without_operator
+      refute_attribute_write("Target.[]=(0, 1)")
+    end
+
+    def test_comparison_operators
+      refute_attribute_write("Target.value == 1")
+      refute_attribute_write("Target.value === 1")
+    end
+
+    private
+
+    def assert_attribute_write(source)
+      call = Prism.parse_statement(source)
+      assert(call.attribute_write?)
+      assert_equal(1, eval(source))
+    end
+
+    def refute_attribute_write(source)
+      call = Prism.parse_statement(source)
+      refute(call.attribute_write?)
+      refute_equal(1, eval(source))
+    end
+  end
+end
diff --git a/test/prism/result/breadth_first_search_test.rb b/test/prism/result/breadth_first_search_test.rb
new file mode 100644
index 00000000000000..e2e043a902102e
--- /dev/null
+++ b/test/prism/result/breadth_first_search_test.rb
@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+require_relative "../test_helper"
+
+module Prism
+  class BreadthFirstSearchTest < TestCase
+    def test_breadth_first_search
+      result = Prism.parse("[1 + 2, 2]")
+      found =
+        result.value.breadth_first_search do |node|
+          node.is_a?(IntegerNode) && node.value == 2
+        end
+
+      refute_nil found
+      assert_equal 8, found.start_offset
+    end
+  end
+end
diff --git a/test/prism/result/comments_test.rb b/test/prism/result/comments_test.rb
new file mode 100644
index 00000000000000..178623a75ff688
--- /dev/null
+++ b/test/prism/result/comments_test.rb
@@ -0,0 +1,138 @@
+# frozen_string_literal: true
+
+require_relative "../test_helper"
+
+module Prism
+  class CommentsTest < TestCase
+    def test_comment_inline
+      source = "# comment"
+      assert_equal [0], Prism.parse(source).source.offsets
+
+      assert_comment(
+        source,
+        InlineComment,
+        start_offset: 0,
+        end_offset: 9,
+        start_line: 1,
+        end_line: 1,
+        start_column: 0,
+        end_column: 9
+      )
+    end
+
+    def test_comment_inline_def
+      source = <<~RUBY
+      def foo
+        # a comment
+      end
+      RUBY
+
+      assert_comment(
+        source,
+        InlineComment,
+        start_offset: 10,
+        end_offset: 21,
+        start_line: 2,
+        end_line: 2,
+        start_column: 2,
+        end_column: 13
+      )
+    end
+
+    def test___END__
+      result = Prism.parse(<<~RUBY)
+        __END__
+        comment
+      RUBY
+
+      data_loc = result.data_loc
+      assert_equal 0, data_loc.start_offset
+      assert_equal 16, data_loc.end_offset
+    end
+
+    def test___END__crlf
+      result = Prism.parse("__END__\r\ncomment\r\n")
+
+      data_loc = result.data_loc
+      assert_equal 0, data_loc.start_offset
+      assert_equal 18, data_loc.end_offset
+    end
+
+    def test_comment_embedded_document
+      source = <<~RUBY
+        =begin
+        comment
+        =end
+      RUBY
+
+      assert_comment(
+        source,
+        EmbDocComment,
+        start_offset: 0,
+        end_offset: 20,
+        start_line: 1,
+        end_line: 4,
+        start_column: 0,
+        end_column: 0
+      )
+    end
+
+    def test_comment_embedded_document_with_content_on_same_line
+      source = <<~RUBY
+        =begin other stuff
+        =end
+      RUBY
+
+      assert_comment(
+        source,
+        EmbDocComment,
+        start_offset: 0,
+        end_offset: 24,
+        start_line: 1,
+        end_line: 3,
+        start_column: 0,
+        end_column: 0
+      )
+    end
+
+    def test_attaching_comments
+      source = <<~RUBY
+        # Foo class
+        class Foo
+          # bar method
+          def bar
+            # baz invocation
+            baz
+          end # bar end
+        end # Foo end
+      RUBY
+
+      result = Prism.parse(source)
+      result.attach_comments!
+      tree = result.value
+      class_node = tree.statements.body.first
+      method_node = class_node.body.body.first
+      call_node = method_node.body.body.first
+
+      assert_equal("# Foo class\n# Foo end", class_node.location.comments.map { |c| c.location.slice }.join("\n"))
+      assert_equal("# bar method\n# bar end", method_node.location.comments.map { |c| c.location.slice }.join("\n"))
+      assert_equal("# baz invocation", call_node.location.comments.map { |c| c.location.slice }.join("\n"))
+    end
+
+    private
+
+    def assert_comment(source, type, start_offset:, end_offset:, start_line:, end_line:, start_column:, end_column:)
+      result = Prism.parse(source)
+      assert result.errors.empty?, result.errors.map(&:message).join("\n")
+      assert_kind_of type, result.comments.first
+
+      location = result.comments.first.location
+      assert_equal start_offset, location.start_offset, -> { "Expected start_offset to be #{start_offset}" }
+      assert_equal end_offset, location.end_offset, -> { "Expected end_offset to be #{end_offset}" }
+      assert_equal start_line, location.start_line, -> { "Expected start_line to be #{start_line}" }
+      assert_equal end_line, location.end_line, -> { "Expected end_line to be #{end_line}" }
+      assert_equal start_column, location.start_column, -> { "Expected start_column to be #{start_column}" }
+      assert_equal end_column, location.end_column, -> { "Expected end_column to be #{end_column}" }
+    end
+  end
+end
diff --git a/test/prism/result/constant_path_node_test.rb b/test/prism/result/constant_path_node_test.rb
new file mode 100644
index 00000000000000..75925600ca7ff7
--- /dev/null
+++ b/test/prism/result/constant_path_node_test.rb
@@ -0,0 +1,91 @@
+# frozen_string_literal: true
+
+require_relative "../test_helper"
+
+module Prism
+  class ConstantPathNodeTest < TestCase
+    def test_full_name_for_constant_path
+      source = <<~RUBY
+        Foo:: # comment
+          Bar::Baz::
+            Qux
+      RUBY
+
+      constant_path = Prism.parse_statement(source)
+      assert_equal("Foo::Bar::Baz::Qux", constant_path.full_name)
+    end
+
+    def test_full_name_for_constant_path_with_self
+      source = <<~RUBY
+        self:: # comment
+          Bar::Baz::
+            Qux
+      RUBY
+
+      constant_path = Prism.parse_statement(source)
+      assert_raise(ConstantPathNode::DynamicPartsInConstantPathError) do
+        constant_path.full_name
+      end
+    end
+
+    def test_full_name_for_constant_path_with_variable
+      source = <<~RUBY
+        foo:: # comment
+          Bar::Baz::
+            Qux
+      RUBY
+
+      constant_path = Prism.parse_statement(source)
+
+      assert_raise(ConstantPathNode::DynamicPartsInConstantPathError) do
+        constant_path.full_name
+      end
+    end
+
+    def test_full_name_for_constant_path_target
+      source = <<~RUBY
+        Foo:: # comment
+          Bar::Baz::
+            Qux, Something = [1, 2]
+      RUBY
+
+      node = Prism.parse_statement(source)
+      assert_equal("Foo::Bar::Baz::Qux", node.lefts.first.full_name)
+    end
+
+    def test_full_name_for_constant_path_with_stovetop_start
+      source = <<~RUBY
+        ::Foo:: # comment
+          Bar::Baz::
+            Qux, Something = [1, 2]
+      RUBY
+
+      node = Prism.parse_statement(source)
+      assert_equal("::Foo::Bar::Baz::Qux", node.lefts.first.full_name)
+    end
+
+    def test_full_name_for_constant_path_target_with_non_constant_parent
+      source = <<~RUBY
+        self::Foo, Bar = [1, 2]
+      RUBY
+
+      constant_target = Prism.parse_statement(source)
+      dynamic, static = constant_target.lefts
+
+      assert_raise(ConstantPathNode::DynamicPartsInConstantPathError) do
+        dynamic.full_name
+      end
+
+      assert_equal("Bar", static.full_name)
+    end
+
+    def test_full_name_for_constant_read_node
+      source = <<~RUBY
+        Bar
+      RUBY
+
+      constant = Prism.parse_statement(source)
+      assert_equal("Bar", constant.full_name)
+    end
+  end
+end
diff --git a/test/prism/result/equality_test.rb b/test/prism/result/equality_test.rb
new file mode 100644
index 00000000000000..4f6e665a88caa2
--- /dev/null
+++ b/test/prism/result/equality_test.rb
@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+require_relative "../test_helper"
+
+module Prism
+  class EqualityTest < TestCase
+    def test_equality
+      assert_operator Prism.parse_statement("1"), :===, Prism.parse_statement("1")
+      assert_operator Prism.parse("1").value, :===, Prism.parse("1").value
+
+      complex_source = "class Something; @var = something.else { _1 }; end"
+      assert_operator Prism.parse_statement(complex_source), :===, Prism.parse_statement(complex_source)
+
+      refute_operator Prism.parse_statement("1"), :===, Prism.parse_statement("2")
+      refute_operator Prism.parse_statement("1"), :===, Prism.parse_statement("0x1")
+
+      complex_source_1 = "class Something; @var = something.else { _1 }; end"
+      complex_source_2 = "class Something; @var = something.else { _2 }; end"
+      refute_operator Prism.parse_statement(complex_source_1), :===, Prism.parse_statement(complex_source_2)
+    end
+  end
+end
diff --git a/test/prism/result/heredoc_test.rb b/test/prism/result/heredoc_test.rb
new file mode 100644
index 00000000000000..7913c04a88ec6e
--- /dev/null
+++ b/test/prism/result/heredoc_test.rb
@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+require_relative "../test_helper"
+
+module Prism
+  class HeredocTest < TestCase
+    def test_heredoc?
+      refute Prism.parse_statement("\"foo\"").heredoc?
+      refute Prism.parse_statement("\"foo \#{1}\"").heredoc?
+      refute Prism.parse_statement("`foo`").heredoc?
+      refute Prism.parse_statement("`foo \#{1}`").heredoc?
+
+      assert Prism.parse_statement("<<~HERE\nfoo\nHERE\n").heredoc?
+      assert Prism.parse_statement("<<~HERE\nfoo \#{1}\nHERE\n").heredoc?
+      assert Prism.parse_statement("<<~`HERE`\nfoo\nHERE\n").heredoc?
+      assert Prism.parse_statement("<<~`HERE`\nfoo \#{1}\nHERE\n").heredoc?
+    end
+  end
+end
diff --git a/test/prism/result/implicit_array_test.rb b/test/prism/result/implicit_array_test.rb
new file mode 100644
index 00000000000000..e7ddde70aa478b
--- /dev/null
+++ b/test/prism/result/implicit_array_test.rb
@@ -0,0 +1,59 @@
+# frozen_string_literal: true
+
+require_relative "../test_helper"
+
+module Prism
+  class ImplicitArrayTest < TestCase
+    def test_call_node
+      assert_implicit_array("a.a = *b")
+      assert_implicit_array("a.a = 1, 2, 3")
+      assert_implicit_array("a[a] = *b")
+      assert_implicit_array("a[a] = 1, 2, 3")
+    end
+
+    def test_class_variable_write_node
+      assert_implicit_array("@@a = *b")
+      assert_implicit_array("@@a = 1, 2, 3")
+    end
+
+    def test_constant_path_write_node
+      assert_implicit_array("A::A = *b")
+      assert_implicit_array("A::A = 1, 2, 3")
+    end
+
+    def test_constant_write_node
+      assert_implicit_array("A = *b")
+      assert_implicit_array("A = 1, 2, 3")
+    end
+
+    def test_global_variable_write_node
+      assert_implicit_array("$a = *b")
+      assert_implicit_array("$a = 1, 2, 3")
+    end
+
+    def test_instance_variable_write_node
+      assert_implicit_array("@a = *b")
+      assert_implicit_array("@a = 1, 2, 3")
+    end
+
+    def test_local_variable_write_node
+      assert_implicit_array("a = *b")
+      assert_implicit_array("a = 1, 2, 3")
+    end
+
+    def test_multi_write_node
+      assert_implicit_array("a, b, c = *b")
+      assert_implicit_array("a, b, c = 1, 2, 3")
+    end
+
+    private
+
+    def assert_implicit_array(source)
+      assert Prism.parse_success?(source)
+      assert Prism.parse_failure?("if #{source} then end")
+
+      assert_valid_syntax(source)
+      refute_valid_syntax("if #{source} then end")
+    end
+  end
+end
diff --git a/test/prism/result/index_write_test.rb b/test/prism/result/index_write_test.rb
new file mode 100644
index 00000000000000..0d5383b601286d
--- /dev/null
+++ b/test/prism/result/index_write_test.rb
@@ -0,0 +1,89 @@
+# frozen_string_literal: true
+
+require_relative "../test_helper"
+
+module Prism
+  class IndexWriteTest < TestCase
+    def test_keywords_3_3
+      assert_parse_success(<<~RUBY, "3.3.0")
+        foo[bar: 1] = 1
+        foo[bar: 1] &&= 1
+        foo[bar: 1] ||= 1
+        foo[bar: 1] += 1
+      RUBY
+
+      assert_parse_success(<<~RUBY, "3.3.0")
+        def foo(**)
+          bar[**] = 1
+          bar[**] &&= 1
+          bar[**] ||= 1
+          bar[**] += 1
+        end
+      RUBY
+    end
+
+    def test_block_3_3
+      assert_parse_success(<<~RUBY, "3.3.0")
+        foo[&bar] = 1
+        foo[&bar] &&= 1
+        foo[&bar] ||= 1
+        foo[&bar] += 1
+      RUBY
+
+      assert_parse_success(<<~RUBY, "3.3.0")
+        def foo(&)
+          bar[&] = 1
+          bar[&] &&= 1
+          bar[&] ||= 1
+          bar[&] += 1
+        end
+      RUBY
+    end
+
+    def test_keywords_latest
+      assert_parse_failure(<<~RUBY)
+        foo[bar: 1] = 1
+        foo[bar: 1] &&= 1
+        foo[bar: 1] ||= 1
+        foo[bar: 1] += 1
+      RUBY
+
+      assert_parse_failure(<<~RUBY)
+        def foo(**)
+          bar[**] = 1
+          bar[**] &&= 1
+          bar[**] ||= 1
+          bar[**] += 1
+        end
+      RUBY
+    end
+
+    def test_block_latest
+      assert_parse_failure(<<~RUBY)
+        foo[&bar] = 1
+        foo[&bar] &&= 1
+        foo[&bar] ||= 1
+        foo[&bar] += 1
+      RUBY
+
+      assert_parse_failure(<<~RUBY)
+        def foo(&)
+          bar[&] = 1
+          bar[&] &&= 1
+          bar[&] ||= 1
+          bar[&] += 1
+        end
+      RUBY
+    end
+
+    private
+
+    def assert_parse_success(source, version = "latest")
+      assert Prism.parse_success?(source, version: version)
+    end
+
+    def assert_parse_failure(source, version = "latest")
+      assert Prism.parse_failure?(source, version: version)
+    end
+  end
+end
diff --git a/test/prism/result/integer_base_flags_test.rb b/test/prism/result/integer_base_flags_test.rb
new file mode 100644
index 00000000000000..e3ab8c691096af
--- /dev/null
+++ b/test/prism/result/integer_base_flags_test.rb
@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+require_relative "../test_helper"
+
+module Prism
+  class IntegerBaseFlagsTest < TestCase
+    # Through some bit hackery, we want to allow consumers to use the integer
+    # base flags as the base itself. It has a nice property that the current
+    # alignment provides them in the correct order. So here we test that our
+    # assumption holds so that it doesn't change out from under us.
+    #
+    # In C, this would look something like:
+    #
+    #     ((flags & ~DECIMAL) >> 1) || 10
+    #
+    # We have to do some other work in Ruby because 0 is truthy and ~ on an
+    # integer doesn't have a fixed width.
+    def test_flags
+      assert_equal 2, base("0b1")
+      assert_equal 8, base("0o1")
+      assert_equal 10, base("0d1")
+      assert_equal 16, base("0x1")
+    end
+
+    private
+
+    def base(source)
+      node = Prism.parse_statement(source)
+      value = (node.send(:flags) & (0b111100 - IntegerBaseFlags::DECIMAL)) >> 1
+      value == 0 ? 10 : value
+    end
+  end
+end
diff --git a/test/prism/result/integer_parse_test.rb b/test/prism/result/integer_parse_test.rb
new file mode 100644
index 00000000000000..7b5ce98bb6a223
--- /dev/null
+++ b/test/prism/result/integer_parse_test.rb
@@ -0,0 +1,41 @@
+# frozen_string_literal: true
+
+require_relative "../test_helper"
+
+module Prism
+  class IntegerParseTest < TestCase
+    def test_integer_parse
+      assert_integer_parse(1)
+      assert_integer_parse(50)
+      assert_integer_parse(100)
+      assert_integer_parse(100, "1_0_0")
+      assert_integer_parse(8, "0_1_0")
+
+      assert_integer_parse(10, "0b1010")
+      assert_integer_parse(10, "0B1010")
+      assert_integer_parse(10, "0o12")
+      assert_integer_parse(10, "0O12")
+      assert_integer_parse(10, "012")
+      assert_integer_parse(10, "0d10")
+      assert_integer_parse(10, "0D10")
+      assert_integer_parse(10, "0xA")
+      assert_integer_parse(10, "0XA")
+
+      assert_integer_parse(2**32)
+      assert_integer_parse(2**64 + 2**32)
+      assert_integer_parse(2**128 + 2**64 + 2**32)
+
+      num = 99 ** 99
+      assert_integer_parse(num, "0b#{num.to_s(2)}")
+      assert_integer_parse(num, "0o#{num.to_s(8)}")
+      assert_integer_parse(num, "0d#{num.to_s(10)}")
+      assert_integer_parse(num, "0x#{num.to_s(16)}")
+    end
+
+    private
+
+    def assert_integer_parse(expected, source = expected.to_s)
+      assert_equal expected, Prism.parse_statement(source).value
+    end
+  end
+end
diff --git a/test/prism/result/named_capture_test.rb b/test/prism/result/named_capture_test.rb
new file mode 100644
index 00000000000000..36cb9108992aed
--- /dev/null
+++ b/test/prism/result/named_capture_test.rb
@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+require_relative "../test_helper"
+
+module Prism
+  class NamedCaptureTest < TestCase
+    def test_hex_escapes
+      assert_equal :😀, parse_name("\\xf0\\x9f\\x98\\x80")
+    end
+
+    def test_unicode_escape
+      assert_equal :し, parse_name("\\u3057")
+    end
+
+    def test_unicode_escapes_bracess
+      assert_equal :😀, parse_name("\\u{1f600}")
+    end
+
+    def test_octal_escapes
+      assert_equal :😀, parse_name("\\xf0\\x9f\\x98\\200")
+    end
+
+    private
+
+    def parse_name(content)
+      Prism.parse_statement("/(?<#{content}>)/ =~ ''").targets.first.name
+    end
+  end
+end
diff --git a/test/prism/result/node_id_test.rb b/test/prism/result/node_id_test.rb
new file mode 100644
index 00000000000000..59b79bc5746693
--- /dev/null
+++ b/test/prism/result/node_id_test.rb
@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+require_relative "../test_helper"
+
+module Prism
+  class NodeIdTest < TestCase
+    Fixture.each do |fixture|
+      define_method(fixture.test_name) { assert_node_ids(fixture.read) }
+    end
+
+    private
+
+    def assert_node_ids(source)
+      queue = [Prism.parse(source).value]
+      node_ids = []
+
+      while (node = queue.shift)
+        node_ids << node.node_id
+        queue.concat(node.compact_child_nodes)
+      end
+
+      node_ids.sort!
+      refute_includes node_ids, 0
+      assert_equal node_ids, node_ids.uniq
+    end
+  end
+end
diff --git a/test/prism/result/numeric_value_test.rb b/test/prism/result/numeric_value_test.rb
new file mode 100644
index 00000000000000..5c89230a1fee41
--- /dev/null
+++ b/test/prism/result/numeric_value_test.rb
@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+require_relative "../test_helper"
+
+module Prism
+  class NumericValueTest < TestCase
+    def test_numeric_value
+      assert_equal 123, Prism.parse_statement("123").value
+      assert_equal 3.14, Prism.parse_statement("3.14").value
+      assert_equal 42i, Prism.parse_statement("42i").value
+      assert_equal 42.1ri, Prism.parse_statement("42.1ri").value
+      assert_equal 3.14i, Prism.parse_statement("3.14i").value
+      assert_equal 42r, Prism.parse_statement("42r").value
+      assert_equal 0.5r, Prism.parse_statement("0.5r").value
+      assert_equal 42ri, Prism.parse_statement("42ri").value
+      assert_equal 0.5ri, Prism.parse_statement("0.5ri").value
+      assert_equal 0xFFr, Prism.parse_statement("0xFFr").value
+      assert_equal 0xFFri, Prism.parse_statement("0xFFri").value
+    end
+  end
+end
diff --git a/test/prism/result/overlap_test.rb b/test/prism/result/overlap_test.rb
new file mode 100644
index 00000000000000..155bc870d36f74
--- /dev/null
+++ b/test/prism/result/overlap_test.rb
@@ -0,0 +1,43 @@
+# frozen_string_literal: true
+
+require_relative "../test_helper"
+
+module Prism
+  class OverlapTest < TestCase
+    Fixture.each do |fixture|
+      define_method(fixture.test_name) { assert_overlap(fixture) }
+    end
+
+    private
+
+    # Check that the location ranges of each node in the tree are a superset of
+    # their respective child nodes.
+    def assert_overlap(fixture)
+      queue = [Prism.parse_file(fixture.full_path).value]
+
+      while (current = queue.shift)
+        # We only want to compare parent/child location overlap in the case that
+        # we are not looking at a heredoc. That's because heredoc locations are
+        # special in that they only use the declaration of the heredoc.
+        compare = !(current.is_a?(StringNode) ||
+                    current.is_a?(XStringNode) ||
+                    current.is_a?(InterpolatedStringNode) ||
+                    current.is_a?(InterpolatedXStringNode)) ||
+        !current.opening&.start_with?("<<")
+
+        current.child_nodes.each do |child|
+          # child_nodes can return nil values, so we need to skip those.
+          next unless child
+
+          # Now that we know we have a child node, add that to the queue.
+          queue << child
+
+          if compare
+            assert_operator current.location.start_offset, :<=, child.location.start_offset
+            assert_operator current.location.end_offset, :>=, child.location.end_offset
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/test/prism/result/regular_expression_options_test.rb b/test/prism/result/regular_expression_options_test.rb
new file mode 100644
index 00000000000000..ff6e20526fdd93
--- /dev/null
+++ b/test/prism/result/regular_expression_options_test.rb
@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+require_relative "../test_helper"
+
+module Prism
+  class RegularExpressionOptionsTest < TestCase
+    def test_options
+      assert_equal "", Prism.parse_statement("__FILE__").filepath
+      assert_equal "foo.rb", Prism.parse_statement("__FILE__", filepath: "foo.rb").filepath
+
+      assert_equal 1, Prism.parse_statement("foo").location.start_line
+      assert_equal 10, Prism.parse_statement("foo", line: 10).location.start_line
+
+      refute Prism.parse_statement("\"foo\"").frozen?
+      assert Prism.parse_statement("\"foo\"", frozen_string_literal: true).frozen?
+      refute Prism.parse_statement("\"foo\"", frozen_string_literal: false).frozen?
+
+      assert_kind_of CallNode, Prism.parse_statement("foo")
+      assert_kind_of LocalVariableReadNode, Prism.parse_statement("foo", scopes: [[:foo]])
+      assert_equal 1, Prism.parse_statement("foo", scopes: [[:foo], []]).depth
+
+      assert_equal [:foo], Prism.parse("foo", scopes: [[:foo]]).value.locals
+    end
+  end
+end
diff --git a/test/prism/result/source_location_test.rb b/test/prism/result/source_location_test.rb
new file mode 100644
index 00000000000000..7bdc707658e2a0
--- /dev/null
+++ b/test/prism/result/source_location_test.rb
@@ -0,0 +1,950 @@
+# frozen_string_literal: true
+
+require_relative "../test_helper"
+
+module Prism
+  class SourceLocationTest < TestCase
+    def test_AliasGlobalVariableNode
+      assert_location(AliasGlobalVariableNode, "alias $foo $bar")
+    end
+
+    def test_AliasMethodNode
+      assert_location(AliasMethodNode, "alias foo bar")
+    end
+
+    def test_AlternationPatternNode
+      assert_location(AlternationPatternNode, "foo => bar | baz", 7...16, &:pattern)
+    end
+
+    def test_AndNode
+      assert_location(AndNode, "foo and bar")
+      assert_location(AndNode, "foo && bar")
+    end
+
+    def test_ArgumentsNode
+      assert_location(ArgumentsNode, "foo(bar, baz, qux)", 4...17, &:arguments)
+    end
+
+    def test_ArrayNode
+      assert_location(ArrayNode, "[foo, bar, baz]")
+      assert_location(ArrayNode, "%i[foo bar baz]")
+      assert_location(ArrayNode, "%I[foo bar baz]")
+      assert_location(ArrayNode, "%w[foo bar baz]")
+      assert_location(ArrayNode, "%W[foo bar baz]")
+    end
+
+    def test_ArrayPatternNode
+      assert_location(ArrayPatternNode, "foo => bar, baz", 7...15, &:pattern)
+      assert_location(ArrayPatternNode, "foo => [bar, baz]", 7...17, &:pattern)
+      assert_location(ArrayPatternNode, "foo => *bar", 7...11, &:pattern)
+      assert_location(ArrayPatternNode, "foo => []", 7...9, &:pattern)
+      assert_location(ArrayPatternNode, "foo => Foo[]", 7...12, &:pattern)
+      assert_location(ArrayPatternNode, "foo => Foo[bar]", 7...15, &:pattern)
+    end
+
+    def test_AssocNode
+      assert_location(AssocNode, "{ '': 1 }", 2...7) { |node| node.elements.first }
+      assert_location(AssocNode, "{ foo: :bar }", 2...11) { |node| node.elements.first }
+      assert_location(AssocNode, "{ :foo => :bar }", 2...14) { |node| node.elements.first }
+      assert_location(AssocNode, "foo(bar: :baz)", 4...13) { |node| node.arguments.arguments.first.elements.first }
+    end
+
+    def test_AssocSplatNode
+      assert_location(AssocSplatNode, "{ **foo }", 2...7) { |node| node.elements.first }
+      assert_location(AssocSplatNode, "foo(**bar)", 4...9) { |node| node.arguments.arguments.first.elements.first }
+    end
+
+    def test_BackReferenceReadNode
+      assert_location(BackReferenceReadNode, "$+")
+    end
+
+    def test_BeginNode
+      assert_location(BeginNode, "begin foo end")
+      assert_location(BeginNode, "begin foo rescue bar end")
+      assert_location(BeginNode, "begin foo; rescue bar\nelse baz end")
+      assert_location(BeginNode, "begin foo; rescue bar\nelse baz\nensure qux end")
+
+      assert_location(BeginNode, "class Foo\nrescue then end", 0..25, &:body)
+      assert_location(BeginNode, "module Foo\nrescue then end", 0..26, &:body)
+    end
+
+    def test_BlockArgumentNode
+      assert_location(BlockArgumentNode, "foo(&bar)", 4...8, &:block)
+    end
+
+    def test_BlockLocalVariableNode
+      assert_location(BlockLocalVariableNode, "foo { |;bar| }", 8...11) do |node|
+        node.block.parameters.locals.first
+      end
+    end
+
+    def test_BlockNode
+      assert_location(BlockNode, "foo {}", 4...6, &:block)
+      assert_location(BlockNode, "foo do end", 4...10, &:block)
+    end
+
+    def test_BlockParameterNode
+      assert_location(BlockParameterNode, "def foo(&bar) end", 8...12) { |node| node.parameters.block }
+    end
+
+    def test_BlockParametersNode
+      assert_location(BlockParametersNode, "foo { || }", 6...8) { |node| node.block.parameters }
+      assert_location(BlockParametersNode, "foo { |bar| baz }", 6...11) { |node| node.block.parameters }
+      assert_location(BlockParametersNode, "foo { |bar; baz| baz }", 6...16) { |node| node.block.parameters }
+
+      assert_location(BlockParametersNode, "-> () {}", 3...5, &:parameters)
+      assert_location(BlockParametersNode, "-> (bar) { baz }", 3...8, &:parameters)
+      assert_location(BlockParametersNode, "-> (bar; baz) { baz }", 3...13, &:parameters)
+    end
+
+    def test_BreakNode
+      assert_location(BreakNode, "tap { break }", 6...11) { |node| node.block.body.body.first }
+      assert_location(BreakNode, "tap { break foo }", 6...15) { |node| node.block.body.body.first }
+      assert_location(BreakNode, "tap { break foo, bar }", 6...20) { |node| node.block.body.body.first }
+      assert_location(BreakNode, "tap { break(foo) }", 6...16) { |node| node.block.body.body.first }
+    end
+
+    def test_CallNode
+      assert_location(CallNode, "foo")
+      assert_location(CallNode, "foo?")
+      assert_location(CallNode, "foo!")
+
+      assert_location(CallNode, "foo()")
+      assert_location(CallNode, "foo?()")
+      assert_location(CallNode, "foo!()")
+
+      assert_location(CallNode, "foo(bar)")
+      assert_location(CallNode, "foo?(bar)")
+      assert_location(CallNode, "foo!(bar)")
+
+      assert_location(CallNode, "!foo")
+      assert_location(CallNode, "~foo")
+      assert_location(CallNode, "+foo")
+      assert_location(CallNode, "-foo")
+
+      assert_location(CallNode, "not foo")
+      assert_location(CallNode, "not(foo)")
+      assert_location(CallNode, "not()")
+
+      assert_location(CallNode, "foo + bar")
+      assert_location(CallNode, "foo -\n  bar")
+
+      assert_location(CallNode, "Foo()")
+      assert_location(CallNode, "Foo(bar)")
+
+      assert_location(CallNode, "Foo::Bar()")
+      assert_location(CallNode, "Foo::Bar(baz)")
+
+      assert_location(CallNode, "Foo::bar")
+      assert_location(CallNode, "Foo::bar()")
+      assert_location(CallNode, "Foo::bar(baz)")
+
+      assert_location(CallNode, "Foo.bar")
+      assert_location(CallNode, "Foo.bar()")
+      assert_location(CallNode, "Foo.bar(baz)")
+
+      assert_location(CallNode, "foo::bar")
+      assert_location(CallNode, "foo::bar()")
+      assert_location(CallNode, "foo::bar(baz)")
+
+      assert_location(CallNode, "foo.bar")
+      assert_location(CallNode, "foo.bar()")
+      assert_location(CallNode, "foo.bar(baz)")
+
+      assert_location(CallNode, "foo&.bar")
+      assert_location(CallNode, "foo&.bar()")
+      assert_location(CallNode, "foo&.bar(baz)")
+
+      assert_location(CallNode, "foo[]")
+      assert_location(CallNode, "foo[bar]")
+      assert_location(CallNode, "foo[bar, baz]")
+
+      assert_location(CallNode, "foo[] = 1")
+      assert_location(CallNode, "foo[bar] = 1")
+      assert_location(CallNode, "foo[bar, baz] = 1")
+
+      assert_location(CallNode, "foo.()")
+      assert_location(CallNode, "foo.(bar)")
+
+      assert_location(CallNode, "foo&.()")
+      assert_location(CallNode, "foo&.(bar)")
+
+      assert_location(CallNode, "foo::()")
+      assert_location(CallNode, "foo::(bar)")
+      assert_location(CallNode, "foo::(bar, baz)")
+
+      assert_location(CallNode, "foo bar baz")
+      assert_location(CallNode, "foo bar('baz')")
+    end
+
+    def test_CallAndWriteNode
+      assert_location(CallAndWriteNode, "foo.foo &&= bar")
+    end
+
+    def test_CallOperatorWriteNode
+      assert_location(CallOperatorWriteNode, "foo.foo += bar")
+    end
+
+    def test_CallOrWriteNode
+      assert_location(CallOrWriteNode, "foo.foo ||= bar")
+    end
+
+    def test_CallTargetNode
+      assert_location(CallTargetNode, "foo.bar, = baz", 0...7) do |node|
+        node.lefts.first
+      end
+    end
+
+    def test_CapturePatternNode
+      assert_location(CapturePatternNode, "case foo; in bar => baz; end", 13...23) do |node|
+        node.conditions.first.pattern
+      end
+    end
+
+    def test_CaseNode
+      assert_location(CaseNode, "case foo; when bar; end")
+      assert_location(CaseNode, "case foo; when bar; else; end")
+      assert_location(CaseNode, "case foo; when bar; when baz; end")
+      assert_location(CaseNode, "case foo; when bar; when baz; else; end")
+    end
+
+    def test_CaseMatchNode
+      assert_location(CaseMatchNode, "case foo; in bar; end")
+      assert_location(CaseMatchNode, "case foo; in bar; else; end")
+      assert_location(CaseMatchNode, "case foo; in bar; in baz; end")
+      assert_location(CaseMatchNode, "case foo; in bar; in baz; else; end")
+    end
+
+    def test_ClassNode
+      assert_location(ClassNode, "class Foo end")
+      assert_location(ClassNode, "class Foo < Bar; end")
+    end
+
+    def test_ClassVariableAndWriteNode
+      assert_location(ClassVariableAndWriteNode, "@@foo &&= bar")
+    end
+
+    def test_ClassVariableOperatorWriteNode
+      assert_location(ClassVariableOperatorWriteNode, "@@foo += bar")
+    end
+
+    def test_ClassVariableOrWriteNode
+      assert_location(ClassVariableOrWriteNode, "@@foo ||= bar")
+    end
+
+    def test_ClassVariableReadNode
+      assert_location(ClassVariableReadNode, "@@foo")
+    end
+
+    def test_ClassVariableTargetNode
+      assert_location(ClassVariableTargetNode, "@@foo, @@bar = baz", 0...5) do |node|
+        node.lefts.first
+      end
+    end
+
+    def test_ClassVariableWriteNode
+      assert_location(ClassVariableWriteNode, "@@foo = bar")
+    end
+
+    def test_ConstantPathAndWriteNode
+      assert_location(ConstantPathAndWriteNode, "Parent::Child &&= bar")
+    end
+
+    def test_ConstantPathNode
+      assert_location(ConstantPathNode, "Foo::Bar")
+      assert_location(ConstantPathNode, "::Foo")
+      assert_location(ConstantPathNode, "::Foo::Bar")
+    end
+
+    def test_ConstantPathOperatorWriteNode
+      assert_location(ConstantPathOperatorWriteNode, "Parent::Child += bar")
+    end
+
+    def test_ConstantPathOrWriteNode
+      assert_location(ConstantPathOrWriteNode, "Parent::Child ||= bar")
+    end
+
+    def test_ConstantPathTargetNode
+      assert_location(ConstantPathTargetNode, "::Foo, ::Bar = baz", 0...5) do |node|
+        node.lefts.first
+      end
+    end
+
+    def test_ConstantPathWriteNode
+      assert_location(ConstantPathWriteNode, "Foo::Bar = baz")
+      assert_location(ConstantPathWriteNode, "::Foo = bar")
+      assert_location(ConstantPathWriteNode, "::Foo::Bar = baz")
+    end
+
+    def test_ConstantAndWriteNode
+      assert_location(ConstantAndWriteNode, "Foo &&= bar")
+    end
+
+    def test_ConstantOperatorWriteNode
+      assert_location(ConstantOperatorWriteNode, "Foo += bar")
+    end
+
+    def test_ConstantOrWriteNode
+      assert_location(ConstantOrWriteNode, "Foo ||= bar")
+    end
+
+    def test_ConstantReadNode
+      assert_location(ConstantReadNode, "Foo")
+    end
+
+    def test_ConstantTargetNode
+      assert_location(ConstantTargetNode, "Foo, Bar = baz", 0...3) do |node|
+        node.lefts.first
+      end
+    end
+
+    def test_ConstantWriteNode
+      assert_location(ConstantWriteNode, "Foo = bar")
+    end
+
+    def test_DefNode
+      assert_location(DefNode, "def foo; bar; end")
+      assert_location(DefNode, "def foo = bar")
+      assert_location(DefNode, "def foo.bar; baz; end")
+      assert_location(DefNode, "def foo.bar = baz")
+    end
+
+    def test_DefinedNode
+      assert_location(DefinedNode, "defined? foo")
+      assert_location(DefinedNode, "defined?(foo)")
+    end
+
+    def test_ElseNode
+      assert_location(ElseNode, "if foo; bar; else; baz; end", 13...27, &:subsequent)
+      assert_location(ElseNode, "foo ? bar : baz", 10...15, &:subsequent)
+    end
+
+    def test_EmbeddedStatementsNode
+      assert_location(EmbeddedStatementsNode, '"foo #{bar} baz"', 5...11) { |node| node.parts[1] }
+    end
+
+    def test_EmbeddedVariableNode
+      assert_location(EmbeddedVariableNode, '"foo #@@bar baz"', 5...11) { |node| node.parts[1] }
+    end
+
+    def test_EnsureNode
+      assert_location(EnsureNode, "begin; foo; ensure; bar; end", 12...28, &:ensure_clause)
+    end
+
+    def test_FalseNode
+      assert_location(FalseNode, "false")
+    end
+
+    def test_FindPatternNode
+      assert_location(FindPatternNode, "case foo; in *, bar, *; end", 13...22) do |node|
+        node.conditions.first.pattern
+      end
+    end
+
+    def test_FlipFlopNode
+      assert_location(FlipFlopNode, "if foo..bar; end", 3..11, &:predicate)
+    end
+
+    def test_FloatNode
+      assert_location(FloatNode, "0.0")
+      assert_location(FloatNode, "1.0")
+      assert_location(FloatNode, "1.0e10")
+      assert_location(FloatNode, "1.0e-10")
+    end
+
+    def test_ForNode
+      assert_location(ForNode, "for foo in bar; end")
+      assert_location(ForNode, "for foo, bar in baz do end")
+    end
+
+    def test_ForwardingArgumentsNode
+      assert_location(ForwardingArgumentsNode, "def foo(...); bar(...); end", 18...21) do |node|
+        node.body.body.first.arguments.arguments.first
+      end
+    end
+
+    def test_ForwardingParameterNode
+      assert_location(ForwardingParameterNode, "def foo(...); end", 8...11) do |node|
+        node.parameters.keyword_rest
+      end
+    end
+
+    def test_ForwardingSuperNode
+      assert_location(ForwardingSuperNode, "super")
+      assert_location(ForwardingSuperNode, "super {}")
+    end
+
+    def test_GlobalVariableAndWriteNode
+      assert_location(GlobalVariableAndWriteNode, "$foo &&= bar")
+    end
+
+    def test_GlobalVariableOperatorWriteNode
+      assert_location(GlobalVariableOperatorWriteNode, "$foo += bar")
+    end
+
+    def test_GlobalVariableOrWriteNode
+      assert_location(GlobalVariableOrWriteNode, "$foo ||= bar")
+    end
+
+    def test_GlobalVariableReadNode
+      assert_location(GlobalVariableReadNode, "$foo")
+    end
+
+    def test_GlobalVariableTargetNode
+      assert_location(GlobalVariableTargetNode, "$foo, $bar = baz", 0...4) do |node|
+        node.lefts.first
+      end
+    end
+
+    def test_GlobalVariableWriteNode
+      assert_location(GlobalVariableWriteNode, "$foo = bar")
+    end
+
+    def test_HashNode
+      assert_location(HashNode, "{ foo: 2 }")
+      assert_location(HashNode, "{ \nfoo: 2, \nbar: 3 \n}")
+    end
+
+    def test_HashPatternNode
+      assert_location(HashPatternNode, "case foo; in bar: baz; end", 13...21) do |node|
+        node.conditions.first.pattern
+      end
+    end
+
+    def test_IfNode
+      assert_location(IfNode, "if type in 1;elsif type in B;end")
+    end
+
+    def test_ImaginaryNode
+      assert_location(ImaginaryNode, "1i")
+      assert_location(ImaginaryNode, "1ri")
+    end
+
+    def test_ImplicitNode
+      assert_location(ImplicitNode, "{ foo: }", 2...6) do |node|
+        node.elements.first.value
+      end
+
+      assert_location(ImplicitNode, "{ Foo: }", 2..6) do |node|
+        node.elements.first.value
+      end
+
+      assert_location(ImplicitNode, "foo = 1; { foo: }", 11..15) do |node|
+        node.elements.first.value
+      end
+    end
+
+    def test_ImplicitRestNode
+      assert_location(ImplicitRestNode, "foo, = bar", 3..4, &:rest)
+
+      assert_location(ImplicitRestNode, "for foo, in bar do end", 7..8) do |node|
+        node.index.rest
+      end
+
+      assert_location(ImplicitRestNode, "foo { |bar,| }", 10..11) do |node|
+        node.block.parameters.parameters.rest
+      end
+
+      assert_location(ImplicitRestNode, "foo in [bar,]", 11..12) do |node|
+        node.pattern.rest
+      end
+    end
+
+    def test_InNode
+      assert_location(InNode, "case foo; in bar; end", 10...16) do |node|
+        node.conditions.first
+      end
+    end
+
+    def test_IndexAndWriteNode
+      assert_location(IndexAndWriteNode, "foo[foo] &&= bar")
+    end
+
+    def test_IndexOperatorWriteNode
+      assert_location(IndexOperatorWriteNode, "foo[foo] += bar")
+    end
+
+    def test_IndexOrWriteNode
+      assert_location(IndexOrWriteNode, "foo[foo] ||= bar")
+    end
+
+    def test_IndexTargetNode
+      assert_location(IndexTargetNode, "foo[bar], = qux", 0...8) do |node|
+        node.lefts.first
+      end
+    end
+
+    def test_InstanceVariableAndWriteNode
+      assert_location(InstanceVariableAndWriteNode, "@foo &&= bar")
+    end
+
+    def test_InstanceVariableOperatorWriteNode
+      assert_location(InstanceVariableOperatorWriteNode, "@foo += bar")
+    end
+
+    def test_InstanceVariableOrWriteNode
+      assert_location(InstanceVariableOrWriteNode, "@foo ||= bar")
+    end
+
+    def test_InstanceVariableReadNode
+      assert_location(InstanceVariableReadNode, "@foo")
+    end
+
+    def test_InstanceVariableTargetNode
+      assert_location(InstanceVariableTargetNode, "@foo, @bar = baz", 0...4) do |node|
+        node.lefts.first
+      end
+    end
+
+    def test_InstanceVariableWriteNode
+      assert_location(InstanceVariableWriteNode, "@foo = bar")
+    end
+
+    def test_IntegerNode
+      assert_location(IntegerNode, "0")
+      assert_location(IntegerNode, "1")
+      assert_location(IntegerNode, "1_000")
+      assert_location(IntegerNode, "0x1")
+      assert_location(IntegerNode, "0x1_000")
+      assert_location(IntegerNode, "0b1")
+      assert_location(IntegerNode, "0b1_000")
+      assert_location(IntegerNode, "0o1")
+      assert_location(IntegerNode, "0o1_000")
+    end
+
+    def test_InterpolatedMatchLastLineNode
+      assert_location(InterpolatedMatchLastLineNode, "if /foo \#{bar}/ then end", 3...15, &:predicate)
+    end
+
+    def test_InterpolatedRegularExpressionNode
+      assert_location(InterpolatedRegularExpressionNode, "/\#{foo}/")
+      assert_location(InterpolatedRegularExpressionNode, "/\#{foo}/io")
+    end
+
+    def test_InterpolatedStringNode
+      assert_location(InterpolatedStringNode, "\"foo \#@bar baz\"")
+      assert_location(InterpolatedStringNode, "<<~A\nhello \#{1} world\nA", 0...4)
+      assert_location(InterpolatedStringNode, '"foo" "bar"')
+    end
+
+    def test_InterpolatedSymbolNode
+      assert_location(InterpolatedSymbolNode, ':"#{foo}bar"')
+    end
+
+    def test_InterpolatedXStringNode
+      assert_location(InterpolatedXStringNode, '`foo #{bar} baz`')
+    end
+
+    def test_ItLocalVariableReadNode
+      assert_location(ItLocalVariableReadNode, "-> { it }", 5...7) do |node|
+        node.body.body.first
+      end
+
+      assert_location(ItLocalVariableReadNode, "foo { it }", 6...8) do |node|
+        node.block.body.body.first
+      end
+
+      assert_location(CallNode, "-> { it }", 5...7, version: "3.3.0") do |node|
+        node.body.body.first
+      end
+
+      assert_location(ItLocalVariableReadNode, "-> { it }", 5...7, version: "3.4.0") do |node|
+        node.body.body.first
+      end
+    end
+
+    def test_ItParametersNode
+      assert_location(ItParametersNode, "-> { it }", &:parameters)
+    end
+
+    def test_KeywordHashNode
+      assert_location(KeywordHashNode, "foo(a, b: 1)", 7...11) { |node| node.arguments.arguments[1] }
+    end
+
+    def test_KeywordRestParameterNode
+      assert_location(KeywordRestParameterNode, "def foo(**); end", 8...10) do |node|
+        node.parameters.keyword_rest
+      end
+
+      assert_location(KeywordRestParameterNode, "def foo(**bar); end", 8...13) do |node|
+        node.parameters.keyword_rest
+      end
+    end
+
+    def test_LambdaNode
+      assert_location(LambdaNode, "-> { foo }")
+      assert_location(LambdaNode, "-> do foo end")
+    end
+
+    def test_LocalVariableAndWriteNode
+      assert_location(LocalVariableAndWriteNode, "foo &&= bar")
+      assert_location(LocalVariableAndWriteNode, "foo = 1; foo &&= bar", 9...20)
+    end
+
+    def test_LocalVariableOperatorWriteNode
+      assert_location(LocalVariableOperatorWriteNode, "foo += bar")
+      assert_location(LocalVariableOperatorWriteNode, "foo = 1; foo += bar", 9...19)
+    end
+
+    def test_LocalVariableOrWriteNode
+      assert_location(LocalVariableOrWriteNode, "foo ||= bar")
+      assert_location(LocalVariableOrWriteNode, "foo = 1; foo ||= bar", 9...20)
+    end
+
+    def test_LocalVariableReadNode
+      assert_location(LocalVariableReadNode, "foo = 1; foo", 9...12)
+    end
+
+    def test_LocalVariableTargetNode
+      assert_location(LocalVariableTargetNode, "foo, bar = baz", 0...3) do |node|
+        node.lefts.first
+      end
+    end
+
+    def test_LocalVariableWriteNode
+      assert_location(LocalVariableWriteNode, "foo = bar")
+    end
+
+    def test_MatchLastLineNode
+      assert_location(MatchLastLineNode, "if /foo/ then end", 3...8, &:predicate)
+    end
+
+    def test_MatchPredicateNode
+      assert_location(MatchPredicateNode, "foo in bar")
+    end
+
+    def test_MatchRequiredNode
+      assert_location(MatchRequiredNode, "foo => bar")
+    end
+
+    def test_MatchWriteNode
+      assert_location(MatchWriteNode, "/(?<foo>)/ =~ foo")
+    end
+
+    def test_ModuleNode
+      assert_location(ModuleNode, "module Foo end")
+    end
+
+    def test_MultiTargetNode
+      assert_location(MultiTargetNode, "for foo, bar in baz do end", 4...12, &:index)
+      assert_location(MultiTargetNode, "foo, (bar, baz) = qux", 5...15) { |node| node.lefts.last }
+      assert_location(MultiTargetNode, "def foo((bar)); end", 8...13) do |node|
+        node.parameters.requireds.first
+      end
+    end
+
+    def test_MultiWriteNode
+      assert_location(MultiWriteNode, "foo, bar = baz")
+      assert_location(MultiWriteNode, "(foo, bar) = baz")
+      assert_location(MultiWriteNode, "((foo, bar)) = baz")
+    end
+
+    def test_NextNode
+      assert_location(NextNode, "tap { next }", 6...10) { |node| node.block.body.body.first }
+      assert_location(NextNode, "tap { next foo }", 6...14) { |node| node.block.body.body.first }
+      assert_location(NextNode, "tap { next foo, bar }", 6...19) { |node| node.block.body.body.first }
+      assert_location(NextNode, "tap { next(foo) }", 6...15) { |node| node.block.body.body.first }
+    end
+
+    def test_NilNode
+      assert_location(NilNode, "nil")
+    end
+
+    def test_NoKeywordsParameterNode
+      assert_location(NoKeywordsParameterNode, "def foo(**nil); end", 8...13) { |node| node.parameters.keyword_rest }
+    end
+
+    def test_NumberedParametersNode
+      assert_location(NumberedParametersNode, "-> { _1 }", &:parameters)
+      assert_location(NumberedParametersNode, "foo { _1 }", 4...10) { |node| node.block.parameters }
+    end
+
+    def test_NumberedReferenceReadNode
+      assert_location(NumberedReferenceReadNode, "$1")
+    end
+
+    def test_OptionalKeywordParameterNode
+      assert_location(OptionalKeywordParameterNode, "def foo(bar: nil); end", 8...16) do |node|
+        node.parameters.keywords.first
+      end
+    end
+
+    def test_OptionalParameterNode
+      assert_location(OptionalParameterNode, "def foo(bar = nil); end", 8...17) do |node|
+        node.parameters.optionals.first
+      end
+    end
+
+    def test_OrNode
+      assert_location(OrNode, "foo || bar")
+      assert_location(OrNode, "foo or bar")
+    end
+
+    def test_ParametersNode
+      assert_location(ParametersNode, "def foo(bar, baz); end", 8...16, &:parameters)
+    end
+
+    def test_ParenthesesNode
+      assert_location(ParenthesesNode, "()")
+      assert_location(ParenthesesNode, "(foo)")
+      assert_location(ParenthesesNode, "foo (bar), baz", 4...9) { |node| node.arguments.arguments.first }
+      assert_location(ParenthesesNode, "def (foo).bar; end", 4...9, &:receiver)
+    end
+
+    def test_PinnedExpressionNode
+      assert_location(PinnedExpressionNode, "foo in ^(bar)", 7...13, &:pattern)
+    end
+
+    def test_PinnedVariableNode
+      assert_location(PinnedVariableNode, "bar = 1; foo in ^bar", 16...20, &:pattern)
+      assert_location(PinnedVariableNode, "proc { 1 in ^it }.call(1)", 12...15) do |node|
+        node.receiver.block.body.body.first.pattern
+      end
+    end
+
+    def test_PostExecutionNode
+      assert_location(PostExecutionNode, "END {}")
+      assert_location(PostExecutionNode, "END { foo }")
+    end
+
+    def test_PreExecutionNode
+      assert_location(PreExecutionNode, "BEGIN {}")
+      assert_location(PreExecutionNode, "BEGIN { foo }")
+    end
+
+    def test_RangeNode
+      assert_location(RangeNode, "1..2")
+      assert_location(RangeNode, "1...2")
+
+      assert_location(RangeNode, "..2")
+      assert_location(RangeNode, "...2")
+
+      assert_location(RangeNode, "1..")
+      assert_location(RangeNode, "1...")
+    end
+
+    def test_RationalNode
+      assert_location(RationalNode, "1r")
+      assert_location(RationalNode, "1.0r")
+    end
+
+    def test_RedoNode
+      assert_location(RedoNode, "tap { redo }", 6...10) { |node| node.block.body.body.first }
+    end
+
+    def test_RegularExpressionNode
+      assert_location(RegularExpressionNode, "/foo/")
+      assert_location(RegularExpressionNode, "/foo/io")
+    end
+
+    def test_RequiredKeywordParameterNode
+      assert_location(RequiredKeywordParameterNode, "def foo(bar:); end", 8...12) do |node|
+        node.parameters.keywords.first
+      end
+    end
+
+    def test_RequiredParameterNode
+      assert_location(RequiredParameterNode, "def foo(bar); end", 8...11) do |node|
+        node.parameters.requireds.first
+      end
+    end
+
+    def test_RescueNode
+      code = <<~RUBY
+      begin
+        body
+      rescue TypeError
+      rescue ArgumentError
+      end
+      RUBY
+      assert_location(RescueNode, code, 13...50) { |node| node.rescue_clause }
+      assert_location(RescueNode, code, 30...50) { |node| node.rescue_clause.subsequent }
+    end
+
+    def test_RescueModifierNode
+      assert_location(RescueModifierNode, "foo rescue bar")
+    end
+
+    def test_RestParameterNode
+      assert_location(RestParameterNode, "def foo(*bar); end", 8...12) do |node|
+        node.parameters.rest
+      end
+    end
+
+    def test_RetryNode
+      assert_location(RetryNode, "begin; rescue; retry; end", 15...20) { |node| node.rescue_clause.statements.body.first }
+    end
+
+    def test_ReturnNode
+      assert_location(ReturnNode, "return")
+      assert_location(ReturnNode, "return foo")
+      assert_location(ReturnNode, "return foo, bar")
+      assert_location(ReturnNode, "return(foo)")
+    end
+
+    def test_SelfNode
+      assert_location(SelfNode, "self")
+    end
+
+    def test_ShareableConstantNode
+      source = <<~RUBY
+        # shareable_constant_value: literal
+        C = { foo: 1 }
+      RUBY
+
+      assert_location(ShareableConstantNode, source, 36...50)
+    end
+
+    def test_SingletonClassNode
+      assert_location(SingletonClassNode, "class << self; end")
+    end
+
+    def test_SourceEncodingNode
+      assert_location(SourceEncodingNode, "__ENCODING__")
+    end
+
+    def test_SourceFileNode
+      assert_location(SourceFileNode, "__FILE__")
+    end
+
+    def test_SourceLineNode
+      assert_location(SourceLineNode, "__LINE__")
+    end
+
+    def test_SplatNode
+      assert_location(SplatNode, "*foo = bar", 0...4, &:rest)
+    end
+
+    def test_StatementsNode
+      assert_location(StatementsNode, "foo { 1 }", 6...7) { |node| node.block.body }
+
+      assert_location(StatementsNode, "(1)", 1...2, &:body)
+
+      assert_location(StatementsNode, "def foo; 1; end", 9...10, &:body)
+      assert_location(StatementsNode, "def foo = 1", 10...11, &:body)
+      assert_location(StatementsNode, "def foo; 1\n2; end", 9...12, &:body)
+
+      assert_location(StatementsNode, "if foo; bar; end", 8...11, &:statements)
+      assert_location(StatementsNode, "foo if bar", 0...3, &:statements)
+
+      assert_location(StatementsNode, "if foo; foo; elsif bar; bar; end", 24...27) { |node| node.subsequent.statements }
+      assert_location(StatementsNode, "if foo; foo; else; bar; end", 19...22) { |node| node.subsequent.statements }
+
+      assert_location(StatementsNode, "unless foo; bar; end", 12...15, &:statements)
+      assert_location(StatementsNode, "foo unless bar", 0...3, &:statements)
+
+      assert_location(StatementsNode, "case; when foo; bar; end", 16...19) { |node| node.conditions.first.statements }
+
+      assert_location(StatementsNode, "while foo; bar; end", 11...14, &:statements)
+      assert_location(StatementsNode, "foo while bar", 0...3, &:statements)
+
+      assert_location(StatementsNode, "until foo; bar; end", 11...14, &:statements)
+      assert_location(StatementsNode, "foo until bar", 0...3, &:statements)
+
+      assert_location(StatementsNode, "for foo in bar; baz; end", 16...19, &:statements)
+
+      assert_location(StatementsNode, "begin; foo; end", 7...10, &:statements)
+      assert_location(StatementsNode, "begin; rescue; foo; end", 15...18) { |node| node.rescue_clause.statements }
+      assert_location(StatementsNode, "begin; ensure; foo; end", 15...18) { |node| node.ensure_clause.statements }
+      assert_location(StatementsNode, "begin; rescue; else; foo; end", 21...24) { |node| node.else_clause.statements }
+
+      assert_location(StatementsNode, "class Foo; foo; end", 11...14, &:body)
+      assert_location(StatementsNode, "module Foo; foo; end", 12...15, &:body)
+      assert_location(StatementsNode, "class << self; foo; end", 15...18, &:body)
+
+      assert_location(StatementsNode, "-> { foo }", 5...8, &:body)
+      assert_location(StatementsNode, "BEGIN { foo }", 8...11, &:statements)
+      assert_location(StatementsNode, "END { foo }", 6...9, &:statements)
+
+      assert_location(StatementsNode, "\"\#{foo}\"", 3...6) { |node| node.parts.first.statements }
+    end
+
+    def test_StringNode
+      assert_location(StringNode, '"foo"')
+      assert_location(StringNode, '%q[foo]')
+    end
+
+    def test_SuperNode
+      assert_location(SuperNode, "super foo")
+      assert_location(SuperNode, "super foo, bar")
+
+      assert_location(SuperNode, "super()")
+      assert_location(SuperNode, "super(foo)")
+      assert_location(SuperNode, "super(foo, bar)")
+
+      assert_location(SuperNode, "super() {}")
+    end
+
+    def test_SymbolNode
+      assert_location(SymbolNode, ":foo")
+    end
+
+    def test_TrueNode
+      assert_location(TrueNode, "true")
+    end
+
+    def test_UndefNode
+      assert_location(UndefNode, "undef foo")
+      assert_location(UndefNode, "undef foo, bar")
+    end
+
+    def test_UnlessNode
+      assert_location(UnlessNode, "foo unless bar")
+      assert_location(UnlessNode, "unless bar; foo; end")
+    end
+
+    def test_UntilNode
+      assert_location(UntilNode, "foo = bar until baz")
+      assert_location(UntilNode, "until bar;baz;end")
+    end
+
+    def test_WhenNode
+      assert_location(WhenNode, "case foo; when bar; end", 10...18) { |node| node.conditions.first }
+    end
+
+    def test_WhileNode
+      assert_location(WhileNode, "foo = bar while foo != baz")
+      assert_location(WhileNode, "while a;bar;baz;end")
+    end
+
+    def test_XStringNode
+      assert_location(XStringNode, "`foo`")
+      assert_location(XStringNode, "%x[foo]")
+    end
+
+    def test_YieldNode
+      assert_location(YieldNode, "def test; yield; end", 10...15) { |node| node.body.body.first }
+      assert_location(YieldNode, "def test; yield foo; end", 10...19) { |node| node.body.body.first }
+      assert_location(YieldNode, "def test; yield foo, bar; end", 10...24) { |node| node.body.body.first }
+      assert_location(YieldNode, "def test; yield(foo); end", 10...20) { |node| node.body.body.first }
+    end
+
+    def test_all_tested
+      expected = Prism.constants.grep(/.Node$/).sort - %i[MissingNode ProgramNode]
+      actual = SourceLocationTest.instance_methods(false).grep(/.Node$/).map { |name| name[5..].to_sym }.sort
+      assert_equal expected, actual
+    end
+
+    private
+
+    def assert_location(kind, source, expected = 0...source.length, **options)
+      result = Prism.parse(source, **options)
+      assert result.success?
+
+      node = result.value.statements.body.last
+      node = yield node if block_given?
+
+      if expected.begin == 0
+        assert_equal 0, node.location.start_column
+      end
+
+      if expected.end == source.length
+        assert_equal source.split("\n").last.length, node.location.end_column
+      end
+
+      assert_kind_of kind, node
+      assert_equal expected.begin, node.location.start_offset
+      assert_equal expected.end, node.location.end_offset
+    end
+  end
+end
diff --git a/test/prism/result/static_inspect_test.rb b/test/prism/result/static_inspect_test.rb
new file mode 100644
index 00000000000000..cf8cef3298a73b
--- /dev/null
+++ b/test/prism/result/static_inspect_test.rb
@@ -0,0 +1,89 @@
+# frozen_string_literal: true
+
+require_relative "../test_helper"
+
+module Prism
+  class StaticInspectTest < TestCase
+    def test_false
+      assert_equal "false", static_inspect("false")
+    end
+
+    def test_float
+      assert_equal "0.25", static_inspect("0.25")
+      assert_equal "5.125", static_inspect("5.125")
+
+      assert_equal "0.0", static_inspect("0.0")
+      assert_equal "-0.0", static_inspect("-0.0")
+
+      assert_equal "1.0e+100", static_inspect("1e100")
+      assert_equal "-1.0e+100", static_inspect("-1e100")
+
+      assert_equal "Infinity", static_inspect("1e1000")
+      assert_equal "-Infinity", static_inspect("-1e1000")
+    end
+
+    def test_imaginary
+      assert_equal "(0+1i)", static_inspect("1i")
+      assert_equal "(0-1i)", static_inspect("-1i")
+    end
+
+    def test_integer
+      assert_equal "1000", static_inspect("1_0_0_0")
+      assert_equal "10000000000000000000000000000", static_inspect("1_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0")
+    end
+
+    def test_nil
+      assert_equal "nil", static_inspect("nil")
+    end
+
+    def test_rational
+      assert_equal "(0/1)", static_inspect("0r")
+      assert_equal "(1/1)", static_inspect("1r")
+      assert_equal "(1/1)", static_inspect("1.0r")
+      assert_equal "(77777/1000)", static_inspect("77.777r")
+    end
+
+    def test_regular_expression
+      assert_equal "/.*/", static_inspect("/.*/")
+      assert_equal "/.*/i", static_inspect("/.*/i")
+      assert_equal "/.*/", static_inspect("/.*/u")
+      assert_equal "/.*/n", static_inspect("/.*/un")
+    end
+
+    def test_source_encoding
+      assert_equal "#<Encoding:UTF-8>", static_inspect("__ENCODING__")
+      assert_equal "#<Encoding:Windows-31J>", static_inspect("__ENCODING__", encoding: "Windows-31J")
+    end
+
+    def test_source_file
+      assert_equal __FILE__.inspect, static_inspect("__FILE__", filepath: __FILE__, frozen_string_literal: true)
+    end
+
+    def test_source_line
+      assert_equal "1", static_inspect("__LINE__")
+      assert_equal "5", static_inspect("__LINE__", line: 5)
+    end
+
+    def test_string
+      assert_equal "\"\"", static_inspect('""', frozen_string_literal: true)
+      assert_equal "\"Hello, World!\"", static_inspect('"Hello, World!"', frozen_string_literal: true)
+      assert_equal "\"\\a\"", static_inspect("\"\\a\"", frozen_string_literal: true)
+    end
+
+    def test_symbol
+      assert_equal ":foo", static_inspect(":foo")
+      assert_equal ":foo", static_inspect("%s[foo]")
+    end
+
+    def test_true
+      assert_equal "true", static_inspect("true")
+    end
+
+    private
+
+    def static_inspect(source, **options)
+      warnings = Prism.parse("{ #{source} => 1, #{source} => 1 }", **options).warnings
+      warnings.last.message[/^key (.+) is duplicated and overwritten on line \d/, 1]
+    end
+  end
+end
diff --git a/test/prism/result/static_literals_test.rb b/test/prism/result/static_literals_test.rb
new file mode 100644
index 00000000000000..dcfc692897cd66
--- /dev/null
+++ b/test/prism/result/static_literals_test.rb
@@ -0,0 +1,92 @@
+# frozen_string_literal: true
+
+require_relative "../test_helper"
+
+module Prism
+  class StaticLiteralsTest < TestCase
+    def test_static_literals
+      assert_warning("1")
+      assert_warning("0xA", "10", "10")
+      assert_warning("0o10", "8", "8")
+      assert_warning("0b10", "2", "2")
+      assert_warning("1_000", "1000", "1000")
+      assert_warning((2**32).to_s(10), "0x#{(2**32).to_s(16)}", (2**32).to_s(10))
+      assert_warning((2**64).to_s(10), "0x#{(2**64).to_s(16)}", (2**64).to_s(10))
+
+      refute_warning("1", "-1")
+      refute_warning((2**32).to_s(10), "-0x#{(2**32).to_s(16)}")
+      refute_warning((2**64).to_s(10), "-0x#{(2**64).to_s(16)}")
+
+      assert_warning("__LINE__", "2", "2")
+      assert_warning("3", "__LINE__", "3")
+
+      assert_warning("1.0")
+      assert_warning("1e2", "100.0", "100.0")
+
+      assert_warning("1r", "1r", "(1/1)")
+      assert_warning("1.0r", "1.0r", "(1/1)")
+
+      assert_warning("1i", "1i", "(0+1i)")
+      assert_warning("1.0i", "1.0i", "(0+1.0i)")
+
+      assert_warning("1ri", "1ri", "(0+(1/1)*i)")
+      assert_warning("1.0ri", "1.0ri", "(0+(1/1)*i)")
+
+      assert_warning("__FILE__", "\"#{__FILE__}\"", __FILE__)
+      assert_warning("\"#{__FILE__}\"")
+      assert_warning("\"foo\"")
+
+      assert_warning("/foo/")
+
+      refute_warning("/foo/", "/foo/i")
+
+      assert_warning(":foo")
+      assert_warning("%s[foo]", ":foo", ":foo")
+
+      assert_warning("true")
+      assert_warning("false")
+      assert_warning("nil")
+      assert_warning("__ENCODING__", "__ENCODING__", "#<Encoding:UTF-8>")
+    end
+
+    private
+
+    class NullWarning
+      def message
+        ""
+      end
+    end
+
+    def parse_warnings(left, right)
+      warnings = []
+
+      warnings << (Prism.parse(<<~RUBY, filepath: __FILE__).warnings.first || NullWarning.new)
+        {
+          #{left} => 1,
+          #{right} => 2
+        }
+      RUBY
+
+      warnings << (Prism.parse(<<~RUBY, filepath: __FILE__).warnings.first || NullWarning.new)
+        case foo
+        when #{left}
+        when #{right}
+        end
+      RUBY
+
+      warnings
+    end
+
+    def assert_warning(left, right = left, message = left)
+      hash_keys, when_clauses = parse_warnings(left, right)
+
+      assert_include hash_keys.message, message
+      assert_include hash_keys.message, "line 3"
+      assert_include when_clauses.message, "line 3"
+    end
+
+    def refute_warning(left, right)
+      assert_empty parse_warnings(left, right).grep_v(NullWarning)
+    end
+  end
+end
diff --git a/test/prism/result/string_test.rb b/test/prism/result/string_test.rb
new file mode 100644
index 00000000000000..48c7f592eb9406
--- /dev/null
+++ b/test/prism/result/string_test.rb
@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+require_relative "../test_helper"
+
+module Prism
+  class StringTest < TestCase
+    def test_regular_expression_node_unescaped_frozen
+      node = Prism.parse_statement("/foo/")
+      assert_predicate node.unescaped, :frozen?
+    end
+
+    def test_source_file_node_filepath_frozen
+      node = Prism.parse_statement("__FILE__")
+      assert_predicate node.filepath, :frozen?
+    end
+
+    def test_string_node_unescaped_frozen
+      node = Prism.parse_statement('"foo"')
+      assert_predicate node.unescaped, :frozen?
+    end
+
+    def test_symbol_node_unescaped_frozen
+      node = Prism.parse_statement(":foo")
+      assert_predicate node.unescaped, :frozen?
+    end
+
+    def test_xstring_node_unescaped_frozen
+      node = Prism.parse_statement("`foo`")
+      assert_predicate node.unescaped, :frozen?
+    end
+  end
+end
diff --git a/test/prism/result/warnings_test.rb b/test/prism/result/warnings_test.rb
new file mode 100644
index 00000000000000..4643fb134fe759
--- /dev/null
+++ b/test/prism/result/warnings_test.rb
@@ -0,0 +1,432 @@
+# frozen_string_literal: true
+
+return if RUBY_VERSION < "3.1"
+
+require_relative "../test_helper"
+
+module Prism
+  class WarningsTest < TestCase
+    def test_ambiguous_uminus
+      assert_warning("a -b", "ambiguous first argument")
+    end
+
+    def test_ambiguous_uplus
+      assert_warning("a +b", "ambiguous first argument")
+    end
+
+    def test_ambiguous_ustar
+      assert_warning("a *b", "argument prefix")
+    end
+
+    def test_ambiguous_regexp
+      assert_warning("a /b/", "wrap regexp in parentheses")
+    end
+
+    def test_ambiguous_ampersand
+      assert_warning("a &b", "argument prefix")
+      assert_warning("a &:+", "argument prefix")
+
+      refute_warning("a &:b")
+      refute_warning("a &:'b'")
+      refute_warning("a &:\"b\"")
+    end
+
+    def test_binary_operator
+      [
+        [:**, "argument prefix"],
+        [:*, "argument prefix"],
+        [:<<, "here document"],
+        [:&, "argument prefix"],
+        [:+, "unary operator"],
+        [:-, "unary operator"],
+        [:/, "regexp literal"],
+        [:%, "string literal"]
+      ].each do |(operator, warning)|
+        assert_warning("puts 1 #{operator}0", warning)
+        assert_warning("puts :a #{operator}0", warning)
+        assert_warning("m = 1; puts m #{operator}0", warning)
+      end
+    end
+
+    def test_equal_in_conditional
+      assert_warning("if a = 1; end; a = a", "should be ==")
+    end
+
+    def test_dot_dot_dot_eol
+      assert_warning("_ = foo...", "... at EOL")
+      assert_warning("def foo(...) = bar ...", "... at EOL")
+
+      assert_warning("_ = foo... #", "... at EOL")
+      assert_warning("_ = foo... \t\v\f\n", "... at EOL")
+
+      refute_warning("p foo...bar")
+      refute_warning("p foo...      bar")
+    end
+
+    def test_END_in_method
+      assert_warning("def foo; END {}; end", "END in method")
+    end
+
+    def test_duplicated_hash_key
+      assert_warning("{ a: 1, a: 2 }", "duplicated and overwritten")
+      assert_warning("{ a: 1, **{ a: 2 } }", "duplicated and overwritten")
+    end
+
+    def test_duplicated_when_clause
+      assert_warning("case 1; when 1, 1; end", "when' clause")
+    end
+
+    def test_float_out_of_range
+      assert_warning("_ = 1.0e100000", "out of range")
+    end
+
+    def test_indentation_mismatch
+      assert_warning("if true\n  end", "mismatched indentations at 'end' with 'if'")
+      assert_warning("if true\n  elsif true\nend", "mismatched indentations at 'elsif' with 'if'")
+      assert_warning("if true\n  else\nend", "mismatched indentations at 'else' with 'if'", "mismatched indentations at 'end' with 'else'")
+
+      assert_warning("unless true\n  end", "mismatched indentations at 'end' with 'unless'")
+      assert_warning("unless true\n  else\nend", "mismatched indentations at 'else' with 'unless'", "mismatched indentations at 'end' with 'else'")
+
+      assert_warning("while true\n  end", "mismatched indentations at 'end' with 'while'")
+      assert_warning("until true\n  end", "mismatched indentations at 'end' with 'until'")
+
+      assert_warning("begin\n  end", "mismatched indentations at 'end' with 'begin'")
+      assert_warning("begin\n  rescue\nend", "mismatched indentations at 'rescue' with 'begin'")
+      assert_warning("begin\n  ensure\nend", "mismatched indentations at 'ensure' with 'begin'")
+      assert_warning("begin\nrescue\n  else\nend", "mismatched indentations at 'else' with 'begin'", "mismatched indentations at 'end' with 'else'")
+      assert_warning("begin\n  rescue\n    ensure\n      end", "mismatched indentations at 'rescue' with 'begin'", "mismatched indentations at 'ensure' with 'begin'", "mismatched indentations at 'end' with 'begin'");
+
+      assert_warning("def foo\n  end", "mismatched indentations at 'end' with 'def'")
+      assert_warning("def foo\n  rescue\nend", "mismatched indentations at 'rescue' with 'def'")
+      assert_warning("def foo\n  ensure\nend", "mismatched indentations at 'ensure' with 'def'")
+      assert_warning("def foo\nrescue\n  else\nend", "mismatched indentations at 'else' with 'def'", "mismatched indentations at 'end' with 'else'")
+      assert_warning("def foo\n  rescue\n    ensure\n      end", "mismatched indentations at 'rescue' with 'def'", "mismatched indentations at 'ensure' with 'def'", "mismatched indentations at 'end' with 'def'");
+
+      assert_warning("class Foo\n  end", "mismatched indentations at 'end' with 'class'")
+      assert_warning("class Foo\n  rescue\nend", "mismatched indentations at 'rescue' with 'class'")
+      assert_warning("class Foo\n  ensure\nend", "mismatched indentations at 'ensure' with 'class'")
+      assert_warning("class Foo\nrescue\n  else\nend", "mismatched indentations at 'else' with 'class'", "mismatched indentations at 'end' with 'else'")
+      assert_warning("class Foo\n  rescue\n    ensure\n      end", "mismatched indentations at 'rescue' with 'class'", "mismatched indentations at 'ensure' with 'class'", "mismatched indentations at 'end' with 'class'");
+
+      assert_warning("module Foo\n  end", "mismatched indentations at 'end' with 'module'")
+      assert_warning("module Foo\n  rescue\nend", "mismatched indentations at 'rescue' with 'module'")
+      assert_warning("module Foo\n  ensure\nend", "mismatched indentations at 'ensure' with 'module'")
+      assert_warning("module Foo\nrescue\n  else\nend", "mismatched indentations at 'else' with 'module'", "mismatched indentations at 'end' with 'else'")
+      assert_warning("module Foo\n  rescue\n    ensure\n      end", "mismatched indentations at 'rescue' with 'module'", "mismatched indentations at 'ensure' with 'module'", "mismatched indentations at 'end' with 'module'");
+
+      assert_warning("class << foo\n  end", "mismatched indentations at 'end' with 'class'")
+      assert_warning("class << foo\n  rescue\nend", "mismatched indentations at 'rescue' with 'class'")
+      assert_warning("class << foo\n  ensure\nend", "mismatched indentations at 'ensure' with 'class'")
+      assert_warning("class << foo\nrescue\n  else\nend", "mismatched indentations at 'else' with 'class'", "mismatched indentations at 'end' with 'else'")
+      assert_warning("class << foo\n  rescue\n    ensure\n      end", "mismatched indentations at 'rescue' with 'class'", "mismatched indentations at 'ensure' with 'class'", "mismatched indentations at 'end' with 'class'");
+
+      assert_warning("case 1; when 2\n  end", "mismatched indentations at 'end' with 'case'")
+      assert_warning("case 1; in 2\n  end", "mismatched indentations at 'end' with 'case'")
+
+      assert_warning("  case 1\nwhen 2\n  end", "mismatched indentations at 'when' with 'case'")
+      refute_warning("case 1\n  when 2\n    when 3\nend") # case/when allows more indentation
+
+      assert_warning("-> {\n  }", "mismatched indentations at '}' with '->'")
+      assert_warning("-> do\n  end", "mismatched indentations at 'end' with '->'")
+      assert_warning("-> do\n  rescue\nend", "mismatched indentations at 'rescue' with '->'")
+      assert_warning("-> do\n  ensure\nend", "mismatched indentations at 'ensure' with '->'")
+      assert_warning("-> do\nrescue\n  else\nend", "mismatched indentations at 'else' with '->'", "mismatched indentations at 'end' with 'else'")
+      assert_warning("-> do\n  rescue\n    ensure\n      end", "mismatched indentations at 'rescue' with '->'", "mismatched indentations at 'ensure' with '->'", "mismatched indentations at 'end' with '->'");
+      assert_warning("foo do\nrescue\n  else\nend", "mismatched indentations at 'end' with 'else'")
+
+      refute_warning("class Foo; end") # same line
+      refute_warning("; class Foo\nend") # non whitespace on opening line
+      refute_warning("\tclass Foo\n        end") # tab stop matches space
+      refute_warning("    \tclass Foo\n        end") # tab stop matches space
+    end
+
+    def test_integer_in_flip_flop
+      assert_warning("1 if 2..foo", "integer")
+    end
+
+    def test_literal_in_conditionals
+      sources = [
+        "if (a = 2); a; end",
+        "if ($a = 2); end",
+        "if (@a = 2); end",
+        "if a; elsif b = 2; b end",
+        "unless (a = 2); a; end",
+        "unless ($a = 2); end",
+        "unless (@a = 2); end",
+        "while (a = 2); a; end",
+        "while ($a = 2); end",
+        "while (@a = 2); end",
+        "until (a = 2); a; end",
+        "until ($a = 2); end",
+        "until (@a = 2); end",
+        "foo if (a, b = 2); [a, b]",
+        "foo if a = 2 and a",
+        "(@foo = 1) ? a : b",
+        "!(a = 2) and a",
+        "not a = 2 and a"
+      ]
+
+      if RUBY_VERSION >= "3.3"
+        sources.push(
+          "if (@@a = 2); end",
+          "unless (@@a = 2); end",
+          "while (@@a = 2); end",
+          "until (@@a = 2); end"
+        )
+      end
+
+      sources.each do |source|
+        assert_warning(source, "= literal' in conditional, should be ==")
+      end
+    end
+
+    def test_keyword_eol
+      assert_warning("if\ntrue; end", "end of line")
+      assert_warning("if true\nelsif\nfalse; end", "end of line")
+    end
+
+    def test_numbered_reference
+      assert_warning("_ = _ = $999999999999999999999", "too big for a number variable, always nil")
+    end
+
+    def test_shareable_constant_value
+      assert_warning("foo # shareable_constant_value: none", "ignored")
+      assert_warning("\v  # shareable_constant_value: none", "ignored")
+
+      refute_warning("# shareable_constant_value: none")
+      refute_warning("    # shareable_constant_value: none")
+      refute_warning("\t\t# shareable_constant_value: none")
+    end
+
+    def test_string_in_predicate
+      assert_warning("if 'foo'; end", "string")
+      assert_warning("if \"\#{foo}\"; end", "string")
+      assert_warning("if __FILE__; end", "string")
+    end
+
+    def test_symbol_in_predicate
+      assert_warning("if :foo; end", "symbol")
+      assert_warning("if :\"\#{foo}\"; end", "symbol")
+    end
+
+    def test_literal_in_predicate
+      assert_warning("if __LINE__; end", "literal")
+      assert_warning("if __ENCODING__; end", "literal")
+      assert_warning("if 1; end", "literal")
+      assert_warning("if 1.0; end", "literal")
+      assert_warning("if 1r; end", "literal")
+      assert_warning("if 1i; end", "literal")
+    end
+
+    def test_regexp_in_predicate
+      assert_warning("if /foo/; end", "regex")
+      assert_warning("if /foo\#{bar}/; end", "regex")
+    end
+
+    def test_unused_local_variables
+      assert_warning("foo = 1", "unused")
+
+      refute_warning("foo = 1", compare: false, command_line: "e")
+      refute_warning("foo = 1", compare: false, scopes: [[]])
+
+      assert_warning("def foo; bar = 1; end", "unused")
+      assert_warning("def foo; bar, = 1; end", "unused")
+
+      refute_warning("def foo; bar &&= 1; end")
+      refute_warning("def foo; bar ||= 1; end")
+      refute_warning("def foo; bar += 1; end")
+
+      refute_warning("def foo; bar = bar; end")
+      refute_warning("def foo; bar = bar = 1; end")
+      refute_warning("def foo; bar = (bar = 1); end")
+      refute_warning("def foo; bar = begin; bar = 1; end; end")
+      refute_warning("def foo; bar = (qux; bar = 1); end")
+      refute_warning("def foo; bar, = bar = 1; end")
+      refute_warning("def foo; bar, = 1, bar = 1; end")
+
+      refute_warning("def foo(bar); end")
+      refute_warning("def foo(bar = 1); end")
+      refute_warning("def foo((bar)); end")
+      refute_warning("def foo(*bar); end")
+      refute_warning("def foo(*, bar); end")
+      refute_warning("def foo(*, (bar)); end")
+      refute_warning("def foo(bar:); end")
+      refute_warning("def foo(**bar); end")
+      refute_warning("def foo(&bar); end")
+      refute_warning("->(bar) {}")
+      refute_warning("->(; bar) {}", compare: false)
+
+      refute_warning("def foo; bar = 1; tap { bar }; end")
+      refute_warning("def foo; bar = 1; tap { baz = bar; baz }; end")
+
+      refute_warning("def foo; bar = 1; end", line: -2, compare: false)
+    end
+
+    def test_void_statements
+      assert_warning("foo = 1; foo", "a variable in void")
+      assert_warning("@foo", "a variable in void")
+      assert_warning("@@foo", "a variable in void")
+      assert_warning("$foo", "a variable in void")
+      assert_warning("$+", "a variable in void")
+      assert_warning("$1", "a variable in void")
+
+      assert_warning("self", "self in void")
+      assert_warning("nil", "nil in void")
+      assert_warning("true", "true in void")
+      assert_warning("false", "false in void")
+
+      assert_warning("1", "literal in void")
+      assert_warning("1.0", "literal in void")
+      assert_warning("1r", "literal in void")
+      assert_warning("1i", "literal in void")
+      assert_warning(":foo", "literal in void")
+      assert_warning("\"foo\"", "literal in void")
+      assert_warning("\"foo\#{1}\"", "literal in void")
+      assert_warning("/foo/", "literal in void")
+      assert_warning("/foo\#{1}/", "literal in void")
+
+      assert_warning("Foo", "constant in void")
+      assert_warning("::Foo", ":: in void")
+      assert_warning("Foo::Bar", ":: in void")
+
+      assert_warning("1..2", ".. in void")
+      assert_warning("1..", ".. in void")
+      assert_warning("..2", ".. in void")
+      assert_warning("1...2", "... in void")
+      assert_warning("1...;", "... in void")
+      assert_warning("...2", "... in void")
+
+      assert_warning("defined?(foo)", "defined? in void")
+
+      assert_warning("1 + 1", "+ in void")
+      assert_warning("1 - 1", "- in void")
+      assert_warning("1 * 1", "* in void")
+      assert_warning("1 / 1", "/ in void")
+      assert_warning("1 % 1", "% in void")
+      assert_warning("1 | 1", "| in void")
+      assert_warning("1 ^ 1", "^ in void")
+      assert_warning("1 & 1", "& in void")
+      assert_warning("1 > 1", "> in void")
+      assert_warning("1 < 1", "< in void")
+
+      assert_warning("1 ** 1", "** in void")
+      assert_warning("1 <= 1", "<= in void")
+      assert_warning("1 >= 1", ">= in void")
+      assert_warning("1 != 1", "!= in void")
+      assert_warning("1 == 1", "== in void")
+      assert_warning("1 <=> 1", "<=> in void")
+
+      assert_warning("+foo", "+@ in void")
+      assert_warning("-foo", "-@ in void")
+
+      assert_warning("def foo; @bar; @baz; end", "variable in void")
+      refute_warning("def foo; @bar; end")
+      refute_warning("@foo", compare: false, scopes: [[]])
+    end
+
+    def test_unreachable_statement
+      assert_warning("begin; rescue; retry; foo; end", "statement not reached")
+
+      assert_warning("return; foo", "statement not reached")
+
+      assert_warning("tap { break; foo }", "statement not reached")
+      assert_warning("tap { break 1; foo }", "statement not reached")
+
+      assert_warning("tap { next; foo }", "statement not reached")
+      assert_warning("tap { next 1; foo }", "statement not reached")
+
+      assert_warning("tap { redo; foo }", "statement not reached")
+    end
+
+    if windows?
+      def test_shebang_ending_with_carriage_return
+        refute_warning("#!ruby\r\np(123)\n", compare: false)
+      end
+    else
+      def test_shebang_ending_with_carriage_return
+        msg = "shebang line ending with \\r may cause problems"
+
+        assert_warning(<<~RUBY, msg, compare: false, main_script: true)
+          #!ruby\r
+          p(123)
+        RUBY
+
+        assert_warning(<<~RUBY, msg, compare: false, main_script: true)
+          #!ruby \r
+          p(123)
+        RUBY
+
+        assert_warning(<<~RUBY, msg, compare: false, main_script: true)
+          #!ruby -Eutf-8\r
+          p(123)
+        RUBY
+
+        # Used with the `-x` object, to ignore the script up until the first
+        # shebang that mentioned "ruby".
+        assert_warning(<<~SCRIPT, msg, compare: false, main_script: true)
+          #!/usr/bin/env bash
+          # Some initial shell script or other content
+          # that Ruby should ignore
+          echo "This is shell script part"
+          exit 0
+
+          #! /usr/bin/env ruby -Eutf-8\r
+          # Ruby script starts here
+          puts "Hello from Ruby!"
+        SCRIPT
+
+        refute_warning("#ruby not_a_shebang\r\n", compare: false, main_script: true)
+
+        # CRuby doesn't emit the warning if a malformed file only has `\r` and
+        # not `\n`. https://bugs.ruby-lang.org/issues/20700.
+        refute_warning("#!ruby\r", compare: false, main_script: true)
+      end
+    end
+
+    def test_warnings_verbosity
+      warning = Prism.parse("def foo; END { }; end").warnings.first
+      assert_equal "END in method; use at_exit", warning.message
+      assert_equal :default, warning.level
+
+      warning = Prism.parse("foo /regexp/").warnings.first
+      assert_equal "ambiguous `/`; wrap regexp in parentheses or add a space after `/` operator", warning.message
+      assert_equal :verbose, warning.level
+    end
+
+    private
+
+    def assert_warning(source, *messages, compare: true, **options)
+      warnings = Prism.parse(source, **options).warnings
+      assert_equal messages.length, warnings.length, "Expected #{messages.length} warning(s) in #{source.inspect}, got #{warnings.map(&:message).inspect}"
+
+      warnings.zip(messages).each do |warning, message|
+        assert_include warning.message, message
+      end
+
+      if compare && defined?(RubyVM::AbstractSyntaxTree)
+        stderr = capture_stderr { RubyVM::AbstractSyntaxTree.parse(source) }
+        messages.each { |message| assert_include stderr, message }
+      end
+    end
+
+    def refute_warning(source, compare: true, **options)
+      assert_empty Prism.parse(source, **options).warnings
+
+      if compare && defined?(RubyVM::AbstractSyntaxTree)
+        assert_empty capture_stderr { RubyVM::AbstractSyntaxTree.parse(source) }
+      end
+    end
+
+    def capture_stderr
+      stderr, $stderr, verbose, $VERBOSE = $stderr, StringIO.new, $VERBOSE, true
+
+      begin
+        yield
+        $stderr.string
+      ensure
+        $stderr, $VERBOSE = stderr, verbose
+      end
+    end
+  end
+end
diff --git a/test/prism/ruby/compiler_test.rb b/test/prism/ruby/compiler_test.rb
new file mode 100644
index 00000000000000..35ccfd59507ff5
--- /dev/null
+++ b/test/prism/ruby/compiler_test.rb
@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+# typed: ignore
+
+require_relative "../test_helper"
+
+module Prism
+  class CompilerTest < TestCase
+    class SExpressions < Prism::Compiler
+      def visit_arguments_node(node)
+        [:arguments, super]
+      end
+
+      def visit_call_node(node)
+        [:call, super]
+      end
+
+      def visit_integer_node(node)
+        [:integer]
+      end
+
+      def visit_program_node(node)
+        [:program, super]
+      end
+    end
+
+    def test_compiler
+      expected = [:program, [[[:call, [[:integer], [:arguments, [[:integer]]]]]]]]
+      assert_equal expected, Prism.parse("1 + 2").value.accept(SExpressions.new)
+    end
+  end
+end
diff --git a/test/prism/ruby/desugar_compiler_test.rb b/test/prism/ruby/desugar_compiler_test.rb
new file mode 100644
index 00000000000000..fe9a25e030cf3f
--- /dev/null
+++ b/test/prism/ruby/desugar_compiler_test.rb
@@ -0,0 +1,80 @@
+# frozen_string_literal: true
+
+require_relative "../test_helper"
+
+module Prism
+  class DesugarCompilerTest < TestCase
+    def test_and_write
+      assert_desugars("(AndNode (ClassVariableReadNode) (ClassVariableWriteNode (CallNode)))", "@@foo &&= bar")
+      assert_not_desugared("Foo::Bar &&= baz", "Desugaring would execute Foo twice or need temporary variables")
+      assert_desugars("(AndNode (ConstantReadNode) (ConstantWriteNode (CallNode)))", "Foo &&= bar")
+      assert_desugars("(AndNode (GlobalVariableReadNode) (GlobalVariableWriteNode (CallNode)))", "$foo &&= bar")
+      assert_desugars("(AndNode (InstanceVariableReadNode) (InstanceVariableWriteNode (CallNode)))", "@foo &&= bar")
+      assert_desugars("(AndNode (LocalVariableReadNode) (LocalVariableWriteNode (CallNode)))", "foo &&= bar")
+      assert_desugars("(AndNode (LocalVariableReadNode) (LocalVariableWriteNode (CallNode)))", "foo = 1; foo &&= bar")
+    end
+
+    def test_or_write
+      assert_desugars("(IfNode (DefinedNode (ClassVariableReadNode)) (StatementsNode (ClassVariableReadNode)) (ElseNode (StatementsNode (ClassVariableWriteNode (CallNode)))))", "@@foo ||= bar")
+      assert_not_desugared("Foo::Bar ||= baz", "Desugaring would execute Foo twice or need temporary variables")
+      assert_desugars("(IfNode (DefinedNode (ConstantReadNode)) (StatementsNode (ConstantReadNode)) (ElseNode (StatementsNode (ConstantWriteNode (CallNode)))))", "Foo ||= bar")
+      assert_desugars("(IfNode (DefinedNode (GlobalVariableReadNode)) (StatementsNode (GlobalVariableReadNode)) (ElseNode (StatementsNode (GlobalVariableWriteNode (CallNode)))))", "$foo ||= bar")
+      assert_desugars("(OrNode (InstanceVariableReadNode) (InstanceVariableWriteNode (CallNode)))", "@foo ||= bar")
+      assert_desugars("(OrNode (LocalVariableReadNode) (LocalVariableWriteNode (CallNode)))", "foo ||= bar")
+      assert_desugars("(OrNode (LocalVariableReadNode) (LocalVariableWriteNode (CallNode)))", "foo = 1; foo ||= bar")
+    end
+
+    def test_operator_write
+      assert_desugars("(ClassVariableWriteNode (CallNode (ClassVariableReadNode) (ArgumentsNode (CallNode))))", "@@foo += bar")
+      assert_not_desugared("Foo::Bar += baz", "Desugaring would execute Foo twice or need temporary variables")
+      assert_desugars("(ConstantWriteNode (CallNode (ConstantReadNode) (ArgumentsNode (CallNode))))", "Foo += bar")
+      assert_desugars("(GlobalVariableWriteNode (CallNode (GlobalVariableReadNode) (ArgumentsNode (CallNode))))", "$foo += bar")
+      assert_desugars("(InstanceVariableWriteNode (CallNode (InstanceVariableReadNode) (ArgumentsNode (CallNode))))", "@foo += bar")
+      assert_desugars("(LocalVariableWriteNode (CallNode (LocalVariableReadNode) (ArgumentsNode (CallNode))))", "foo += bar")
+      assert_desugars("(LocalVariableWriteNode (CallNode (LocalVariableReadNode) (ArgumentsNode (CallNode))))", "foo = 1; foo += bar")
+    end
+
+    private
+
+    def ast_inspect(node)
+      parts = [node.class.name.split("::").last]
+
+      node.deconstruct_keys(nil).each do |_, value|
+        case value
+        when Node
+          parts << ast_inspect(value)
+        when Array
+          parts.concat(value.map { |element| ast_inspect(element) })
+        end
+      end
+
+      "(#{parts.join(" ")})"
+    end
+
+    # Ensure every node is only present once in the AST.
+    # If the same node is present twice it would most likely indicate it is executed twice, which is invalid semantically.
+    # This also acts as a sanity check that Node#child_nodes returns only nodes or nil (which caught a couple bugs).
+    def ensure_every_node_once_in_ast(node, all_nodes = {}.compare_by_identity)
+      if all_nodes.include?(node)
+        raise "#{node.inspect} is present multiple times in the desugared AST and likely executed multiple times"
+      else
+        all_nodes[node] = true
+      end
+      node.child_nodes.each do |child|
+        ensure_every_node_once_in_ast(child, all_nodes) unless child.nil?
+      end
+    end
+
+    def assert_desugars(expected, source)
+      ast = Prism.parse(source).value.accept(DesugarCompiler.new)
+      assert_equal expected, ast_inspect(ast.statements.body.last)
+
+      ensure_every_node_once_in_ast(ast)
+    end
+
+    def assert_not_desugared(source, reason)
+      ast = Prism.parse(source).value
+      assert_equal_nodes(ast, ast.accept(DesugarCompiler.new))
+    end
+  end
+end
diff --git a/test/prism/ruby/dispatcher_test.rb b/test/prism/ruby/dispatcher_test.rb
new file mode 100644
index 00000000000000..83eb29e1f3b738
--- /dev/null
+++ b/test/prism/ruby/dispatcher_test.rb
@@ -0,0 +1,55 @@
+# frozen_string_literal: true
+
+require_relative "../test_helper"
+
+module Prism
+  class DispatcherTest < TestCase
+    class TestListener
+      attr_reader :events_received
+
+      def initialize
+        @events_received = []
+      end
+
+      def on_call_node_enter(node)
+        events_received << :on_call_node_enter
+      end
+
+      def on_call_node_leave(node)
+        events_received << :on_call_node_leave
+      end
+
+      def on_integer_node_enter(node)
+        events_received << :on_integer_node_enter
+      end
+    end
+
+    def test_dispatching_events
+      listener_manual = TestListener.new
+      listener_public = TestListener.new
+
+      dispatcher = Dispatcher.new
+      dispatcher.register(listener_manual, :on_call_node_enter, :on_call_node_leave, :on_integer_node_enter)
+      dispatcher.register_public_methods(listener_public)
+
+      root = Prism.parse(<<~RUBY).value
+        def foo
+          something(1, 2, 3)
+        end
+      RUBY
+
+      dispatcher.dispatch(root)
+
+      [listener_manual, listener_public].each do |listener|
+        assert_equal([:on_call_node_enter, :on_integer_node_enter, :on_integer_node_enter, :on_integer_node_enter, :on_call_node_leave], listener.events_received)
+        listener.events_received.clear
+      end
+
+      dispatcher.dispatch_once(root.statements.body.first.body.body.first)
+
+      [listener_manual, listener_public].each do |listener|
+        assert_equal([:on_call_node_enter, :on_call_node_leave], listener.events_received)
+      end
+    end
+  end
+end
diff --git a/test/prism/ruby/location_test.rb b/test/prism/ruby/location_test.rb
new file mode 100644
index 00000000000000..33f844243c0547
--- /dev/null
+++ b/test/prism/ruby/location_test.rb
@@ -0,0 +1,251 @@
+# frozen_string_literal: true
+
+require_relative "../test_helper"
+
+module Prism
+  class LocationTest < TestCase
+    def test_join
+      call = Prism.parse_statement("1234 + 567")
+      receiver = call.receiver
+      argument = call.arguments.arguments.first
+
+      joined = receiver.location.join(argument.location)
+      assert_equal 0, joined.start_offset
+      assert_equal 10, joined.length
+
+      assert_raise(RuntimeError, "Incompatible locations") do
+        argument.location.join(receiver.location)
+      end
+
+      other_argument = Prism.parse_statement("1234 + 567").arguments.arguments.first
+
+      assert_raise(RuntimeError, "Incompatible sources") do
+        other_argument.location.join(receiver.location)
+      end
+
+      assert_raise(RuntimeError, "Incompatible sources") do
+        receiver.location.join(other_argument.location)
+      end
+    end
+
+    def test_character_offsets
+      program = Prism.parse("😀 + 😀\n😍 ||= 😍").value
+
+      # first 😀
+      location = program.statements.body.first.receiver.location
+      assert_equal 0, location.start_character_offset
+      assert_equal 1, location.end_character_offset
+      assert_equal 0, location.start_character_column
+      assert_equal 1, location.end_character_column
+
+      # second 😀
+      location = program.statements.body.first.arguments.arguments.first.location
+      assert_equal 4, location.start_character_offset
+      assert_equal 5, location.end_character_offset
+      assert_equal 4, location.start_character_column
+      assert_equal 5, location.end_character_column
+
+      # first 😍
+      location = program.statements.body.last.name_loc
+      assert_equal 6, location.start_character_offset
+      assert_equal 7, location.end_character_offset
+      assert_equal 0, location.start_character_column
+      assert_equal 1, location.end_character_column
+
+      # second 😍
+      location = program.statements.body.last.value.location
+      assert_equal 12, location.start_character_offset
+      assert_equal 13, location.end_character_offset
+      assert_equal 6, location.start_character_column
+      assert_equal 7, location.end_character_column
+    end
+
+    def test_code_units
+      program = Prism.parse("😀 + 😀\n😍 ||= 😍").value
+
+      # first 😀
+      location = program.statements.body.first.receiver.location
+
+      assert_equal 0, location.start_code_units_offset(Encoding::UTF_8)
+      assert_equal 0, location.start_code_units_offset(Encoding::UTF_16LE)
+      assert_equal 0, location.start_code_units_offset(Encoding::UTF_32LE)
+
+      assert_equal 1, location.end_code_units_offset(Encoding::UTF_8)
+      assert_equal 2, location.end_code_units_offset(Encoding::UTF_16LE)
+      assert_equal 1, location.end_code_units_offset(Encoding::UTF_32LE)
+
+      assert_equal 0, location.start_code_units_column(Encoding::UTF_8)
+      assert_equal 0, location.start_code_units_column(Encoding::UTF_16LE)
+      assert_equal 0, location.start_code_units_column(Encoding::UTF_32LE)
+
+      assert_equal 1, location.end_code_units_column(Encoding::UTF_8)
+      assert_equal 2, location.end_code_units_column(Encoding::UTF_16LE)
+      assert_equal 1, location.end_code_units_column(Encoding::UTF_32LE)
+
+      # second 😀
+      location = program.statements.body.first.arguments.arguments.first.location
+
+      assert_equal 4, location.start_code_units_offset(Encoding::UTF_8)
+      assert_equal 5, location.start_code_units_offset(Encoding::UTF_16LE)
+      assert_equal 4, location.start_code_units_offset(Encoding::UTF_32LE)
+
+      assert_equal 5, location.end_code_units_offset(Encoding::UTF_8)
+      assert_equal 7, location.end_code_units_offset(Encoding::UTF_16LE)
+      assert_equal 5, location.end_code_units_offset(Encoding::UTF_32LE)
+
+      assert_equal 4, location.start_code_units_column(Encoding::UTF_8)
+      assert_equal 5, location.start_code_units_column(Encoding::UTF_16LE)
+      assert_equal 4, location.start_code_units_column(Encoding::UTF_32LE)
+
+      assert_equal 5, location.end_code_units_column(Encoding::UTF_8)
+      assert_equal 7, location.end_code_units_column(Encoding::UTF_16LE)
+      assert_equal 5, location.end_code_units_column(Encoding::UTF_32LE)
+
+      # first 😍
+      location = program.statements.body.last.name_loc
+
+      assert_equal 6, location.start_code_units_offset(Encoding::UTF_8)
+      assert_equal 8, location.start_code_units_offset(Encoding::UTF_16LE)
+      assert_equal 6, location.start_code_units_offset(Encoding::UTF_32LE)
+
+      assert_equal 7, location.end_code_units_offset(Encoding::UTF_8)
+      assert_equal 10, location.end_code_units_offset(Encoding::UTF_16LE)
+      assert_equal 7, location.end_code_units_offset(Encoding::UTF_32LE)
+
+      assert_equal 0, location.start_code_units_column(Encoding::UTF_8)
+      assert_equal 0, location.start_code_units_column(Encoding::UTF_16LE)
+      assert_equal 0, location.start_code_units_column(Encoding::UTF_32LE)
+
+      assert_equal 1, location.end_code_units_column(Encoding::UTF_8)
+      assert_equal 2, location.end_code_units_column(Encoding::UTF_16LE)
+      assert_equal 1, location.end_code_units_column(Encoding::UTF_32LE)
+
+      # second 😍
+      location = program.statements.body.last.value.location
+
+      assert_equal 12, location.start_code_units_offset(Encoding::UTF_8)
+      assert_equal 15, location.start_code_units_offset(Encoding::UTF_16LE)
+      assert_equal 12, location.start_code_units_offset(Encoding::UTF_32LE)
+
+      assert_equal 13, location.end_code_units_offset(Encoding::UTF_8)
+      assert_equal 17, location.end_code_units_offset(Encoding::UTF_16LE)
+      assert_equal 13, location.end_code_units_offset(Encoding::UTF_32LE)
+
+      assert_equal 6, location.start_code_units_column(Encoding::UTF_8)
+      assert_equal 7, location.start_code_units_column(Encoding::UTF_16LE)
+      assert_equal 6, location.start_code_units_column(Encoding::UTF_32LE)
+
+      assert_equal 7, location.end_code_units_column(Encoding::UTF_8)
+      assert_equal 9, location.end_code_units_column(Encoding::UTF_16LE)
+      assert_equal 7, location.end_code_units_column(Encoding::UTF_32LE)
+    end
+
+    def test_cached_code_units
+      result = Prism.parse("😀 + 😀\n😍 ||= 😍")
+
+      utf8_cache = result.code_units_cache(Encoding::UTF_8)
+      utf16_cache = result.code_units_cache(Encoding::UTF_16LE)
+      utf32_cache = result.code_units_cache(Encoding::UTF_32LE)
+
+      # first 😀
+      location = result.value.statements.body.first.receiver.location
+
+      assert_equal 0, location.cached_start_code_units_offset(utf8_cache)
+      assert_equal 0, location.cached_start_code_units_offset(utf16_cache)
+      assert_equal 0, location.cached_start_code_units_offset(utf32_cache)
+
+      assert_equal 1, location.cached_end_code_units_offset(utf8_cache)
+      assert_equal 2, location.cached_end_code_units_offset(utf16_cache)
+      assert_equal 1, location.cached_end_code_units_offset(utf32_cache)
+
+      assert_equal 0, location.cached_start_code_units_column(utf8_cache)
+      assert_equal 0, location.cached_start_code_units_column(utf16_cache)
+      assert_equal 0, location.cached_start_code_units_column(utf32_cache)
+
+      assert_equal 1, location.cached_end_code_units_column(utf8_cache)
+      assert_equal 2, location.cached_end_code_units_column(utf16_cache)
+      assert_equal 1, location.cached_end_code_units_column(utf32_cache)
+
+      # second 😀
+      location = result.value.statements.body.first.arguments.arguments.first.location
+
+      assert_equal 4, location.cached_start_code_units_offset(utf8_cache)
+      assert_equal 5, location.cached_start_code_units_offset(utf16_cache)
+      assert_equal 4, location.cached_start_code_units_offset(utf32_cache)
+
+      assert_equal 5, location.cached_end_code_units_offset(utf8_cache)
+      assert_equal 7, location.cached_end_code_units_offset(utf16_cache)
+      assert_equal 5, location.cached_end_code_units_offset(utf32_cache)
+
+      assert_equal 4, location.cached_start_code_units_column(utf8_cache)
+      assert_equal 5, location.cached_start_code_units_column(utf16_cache)
+      assert_equal 4, location.cached_start_code_units_column(utf32_cache)
+
+      assert_equal 5, location.cached_end_code_units_column(utf8_cache)
+      assert_equal 7, location.cached_end_code_units_column(utf16_cache)
+      assert_equal 5, location.cached_end_code_units_column(utf32_cache)
+    end
+
+    def test_code_units_binary_valid_utf8
+      program = Prism.parse(<<~RUBY).value
+        # -*- encoding: binary -*-
+
+        😀 + 😀
+      RUBY
+
+      receiver = program.statements.body.first.receiver
+      assert_equal "😀".b.to_sym, receiver.name
+
+      location = receiver.location
+      assert_equal 1, location.end_code_units_column(Encoding::UTF_8)
+      assert_equal 2, location.end_code_units_column(Encoding::UTF_16LE)
+      assert_equal 1, location.end_code_units_column(Encoding::UTF_32LE)
+    end
+
+    def test_code_units_binary_invalid_utf8
+      program = Prism.parse(<<~RUBY).value
+        # -*- encoding: binary -*-
+
+        \x90 + \x90
+      RUBY
+
+      receiver = program.statements.body.first.receiver
+      assert_equal "\x90".b.to_sym, receiver.name
+
+      location = receiver.location
+      assert_equal 1, location.end_code_units_column(Encoding::UTF_8)
+      assert_equal 1, location.end_code_units_column(Encoding::UTF_16LE)
+      assert_equal 1, location.end_code_units_column(Encoding::UTF_32LE)
+    end
+
+    def test_chop
+      location = Prism.parse("foo").value.location
+
+      assert_equal "fo", location.chop.slice
+      assert_equal "", location.chop.chop.chop.slice
+
+      # Check that we don't go negative.
+      10.times { location = location.chop }
+      assert_equal "", location.slice
+    end
+
+    def test_slice_lines
+      method = Prism.parse_statement("\nprivate def foo\nend\n").arguments.arguments.first
+
+      assert_equal "private def foo\nend\n", method.slice_lines
+    end
+
+    def test_adjoin
+      program = Prism.parse("foo.bar = 1").value
+
+      location = program.statements.body.first.message_loc
+      adjoined = location.adjoin("=")
+
+      assert_kind_of Location, adjoined
+      refute_equal location, adjoined
+
+      assert_equal 4, adjoined.start_offset
+      assert_equal 9, adjoined.end_offset
+    end
+  end
+end
diff --git a/test/prism/ruby/parameters_signature_test.rb b/test/prism/ruby/parameters_signature_test.rb
new file mode 100644
index 00000000000000..af5b54ed91eac9
--- /dev/null
+++ b/test/prism/ruby/parameters_signature_test.rb
@@ -0,0 +1,92 @@
+# frozen_string_literal: true
+
+return if RUBY_VERSION < "3.2"
+
+require_relative "../test_helper"
+
+module Prism
+  class ParametersSignatureTest < TestCase
+    def test_req
+      assert_parameters([[:req, :a]], "a")
+    end
+
+    def test_req_destructure
+      assert_parameters([[:req]], "(a, b)")
+    end
+
+    def test_opt
+      assert_parameters([[:opt, :a]], "a = 1")
+    end
+
+    def test_rest
+      assert_parameters([[:rest, :a]], "*a")
+    end
+
+    def test_rest_anonymous
+      assert_parameters([[:rest, :*]], "*")
+    end
+
+    def test_post
+      assert_parameters([[:rest, :a], [:req, :b]], "*a, b")
+    end
+
+    def test_post_destructure
+      assert_parameters([[:rest, :a], [:req]], "*a, (b, c)")
+    end
+
+    def test_keyreq
+      assert_parameters([[:keyreq, :a]], "a:")
+    end
+
+    def test_key
+      assert_parameters([[:key, :a]], "a: 1")
+    end
+
+    def test_keyrest
+      assert_parameters([[:keyrest, :a]], "**a")
+    end
+
+    def test_nokey
+      assert_parameters([[:nokey]], "**nil")
+    end
+
+    def test_keyrest_anonymous
+      assert_parameters([[:keyrest, :**]], "**")
+    end
+
+    if RUBY_ENGINE != "truffleruby"
+      def test_key_ordering
+        assert_parameters([[:keyreq, :a], [:keyreq, :b], [:key, :c], [:key, :d]], "a:, c: 1, b:, d: 2")
+      end
+    end
+
+    def test_block
+      assert_parameters([[:block, :a]], "&a")
+    end
+
+    def test_block_anonymous
+      assert_parameters([[:block, :&]], "&")
+    end
+
+    def test_forwarding
+      assert_parameters([[:rest, :*], [:keyrest, :**], [:block, :&]], "...")
+    end
+
+    private
+
+    def assert_parameters(expected, source)
+      # Compare against our expectation.
+      assert_equal(expected, signature(source))
+
+      # Compare against Ruby's expectation.
+      object = Object.new
+      eval("def object.m(#{source}); end")
+      assert_equal(expected, object.method(:m).parameters)
+    end
+
+    def signature(source)
+      program = Prism.parse("def m(#{source}); end").value
+      program.statements.body.first.parameters.signature
+    end
+  end
+end
diff --git a/test/prism/ruby/parser_test.rb b/test/prism/ruby/parser_test.rb
new file mode 100644
index 00000000000000..cd52758f2e51eb
--- /dev/null
+++ b/test/prism/ruby/parser_test.rb
@@ -0,0 +1,291 @@
+# frozen_string_literal: true
+
+require_relative "../test_helper"
+
+begin
+  verbose, $VERBOSE = $VERBOSE, nil
+  require "parser/ruby33"
+  require "prism/translation/parser33"
+  require "prism/translation/parser34"
+rescue LoadError
+  # In CRuby's CI, we're not going to test against the parser gem because we
+  # don't want to have to install it. So in this case we'll just skip this test.
+  return
+ensure
+  $VERBOSE = verbose
+end
+
+# First, opt in to every AST feature.
+Parser::Builders::Default.modernize
+Prism::Translation::Parser::Builder.modernize
+
+# The parser gem rejects some strings that would most likely lead to errors
+# in consumers due to encoding problems. RuboCop however monkey-patches this
+# method out in order to accept such code.
+# https://github.com/whitequark/parser/blob/v3.3.6.0/lib/parser/builders/default.rb#L2289-L2295
+Parser::Builders::Default.prepend(
+  Module.new {
+    def string_value(token)
+      value(token)
+    end
+  }
+)
+
+# Modify the source map == check so that it doesn't check against the node
+# itself so we don't get into a recursive loop.
+Parser::Source::Map.prepend(
+  Module.new {
+    def ==(other)
+      self.class == other.class &&
+        (instance_variables - %i[@node]).map do |ivar|
+          instance_variable_get(ivar) == other.instance_variable_get(ivar)
+        end.reduce(:&)
+    end
+  }
+)
+
+# Next, ensure that we're comparing the nodes and also comparing the source
+# ranges so that we're getting all of the necessary information.
+Parser::AST::Node.prepend(
+  Module.new {
+    def ==(other)
+      super && (location == other.location)
+    end
+  }
+)
+
+module Prism
+  class ParserTest < TestCase
+    # These files contain code with valid syntax that can't be parsed.
+    skip_syntax_error = [
+      # alias/undef with %s(abc) symbol literal
+      "alias.txt",
+      "seattlerb/bug_215.txt",
+
+      # 1.. && 2
+      "ranges.txt",
+    ]
+
+    # These files contain code that is being parsed incorrectly by the parser
+    # gem, and therefore we don't want to compare against our translation.
+    skip_incorrect = [
+      # https://github.com/whitequark/parser/issues/1017
+      "spanning_heredoc.txt",
+      "spanning_heredoc_newlines.txt",
+
+      # https://github.com/whitequark/parser/issues/1021
+      "seattlerb/heredoc_nested.txt",
+
+      # https://github.com/whitequark/parser/issues/1016
+      "whitequark/unary_num_pow_precedence.txt",
+
+      # https://github.com/whitequark/parser/issues/950
+      "whitequark/dedenting_interpolating_heredoc_fake_line_continuation.txt",
+
+      # Contains an escaped multibyte character. This is supposed to drop to backslash
+      "seattlerb/regexp_escape_extended.txt",
+
+      # https://github.com/whitequark/parser/issues/1020
+      # These contain consecutive \r characters, followed by \n. Prism only receives
+      # the already modified source buffer which dropped one \r but must know the
+      # original code to parse it correctly.
+      "seattlerb/heredoc_with_extra_carriage_returns_windows.txt",
+      "seattlerb/heredoc_with_only_carriage_returns_windows.txt",
+      "seattlerb/heredoc_with_only_carriage_returns.txt",
+
+      # https://github.com/whitequark/parser/issues/1026
+      # Regex with \c escape
+      "unescaping.txt",
+      "seattlerb/regexp_esc_C_slash.txt",
+    ]
+
+    # These files are either failing to parse or failing to translate, so we'll
+    # skip them for now.
+    skip_all = skip_incorrect | [
+    ]
+
+    # Not sure why these files are failing on JRuby, but skipping them for now.
+    if RUBY_ENGINE == "jruby"
+      skip_all.push("emoji_method_calls.txt", "symbols.txt")
+    end
+
+    # These files are failing to translate their lexer output into the lexer
+    # output expected by the parser gem, so we'll skip them for now.
+    skip_tokens = [
+      "dash_heredocs.txt",
+      "embdoc_no_newline_at_end.txt",
+      "methods.txt",
+      "seattlerb/bug169.txt",
+      "seattlerb/case_in.txt",
+      "seattlerb/difficult4__leading_dots2.txt",
+      "seattlerb/difficult6__7.txt",
+      "seattlerb/difficult6__8.txt",
+      "seattlerb/heredoc_unicode.txt",
+      "seattlerb/parse_line_heredoc.txt",
+      "seattlerb/pct_w_heredoc_interp_nested.txt",
+      "seattlerb/required_kwarg_no_value.txt",
+      "seattlerb/TestRubyParserShared.txt",
+      "unparser/corpus/literal/assignment.txt",
+      "unparser/corpus/literal/literal.txt",
+      "whitequark/args.txt",
+      "whitequark/beginless_erange_after_newline.txt",
+      "whitequark/beginless_irange_after_newline.txt",
+      "whitequark/forward_arg_with_open_args.txt",
+      "whitequark/kwarg_no_paren.txt",
+      "whitequark/lbrace_arg_after_command_args.txt",
+      "whitequark/multiple_pattern_matches.txt",
+      "whitequark/newline_in_hash_argument.txt",
+      "whitequark/pattern_matching_expr_in_paren.txt",
+      "whitequark/pattern_matching_hash.txt",
+      "whitequark/ruby_bug_14690.txt",
+      "whitequark/ruby_bug_9669.txt",
+      "whitequark/space_args_arg_block.txt",
+      "whitequark/space_args_block.txt"
+    ]
+
+    Fixture.each(except: skip_syntax_error) do |fixture|
+      define_method(fixture.test_name) do
+        assert_equal_parses(
+          fixture,
+          compare_asts: !skip_all.include?(fixture.path),
+          compare_tokens: !skip_tokens.include?(fixture.path),
+          compare_comments: fixture.path != "embdoc_no_newline_at_end.txt"
+        )
+      end
+    end
+
+    def test_non_prism_builder_class_deprecated
+      warnings = capture_warnings { Prism::Translation::Parser33.new(Parser::Builders::Default.new) }
+
+      assert_include(warnings, "#{__FILE__}:#{__LINE__ - 2}")
+      assert_include(warnings, "is not a `Prism::Translation::Parser::Builder` subclass")
+
+      warnings = capture_warnings { Prism::Translation::Parser33.new }
+      assert_empty(warnings)
+    end
+
+    if RUBY_VERSION >= "3.3"
+      def test_current_parser_for_current_ruby
+        major, minor, _patch = Gem::Version.new(RUBY_VERSION).segments
+        # Let's just hope there never is a Ruby 3.10 or similar
+        expected = major * 10 + minor
+        assert_equal(expected, Translation::ParserCurrent.new.version)
+      end
+    end
+
+    def test_it_block_parameter_syntax
+      it_fixture_path = Pathname(__dir__).join("../../../test/prism/fixtures/it.txt")
+
+      buffer = Parser::Source::Buffer.new(it_fixture_path)
+      buffer.source = it_fixture_path.read
+      actual_ast = Prism::Translation::Parser34.new.tokenize(buffer)[0]
+
+      it_block_parameter_sexp = parse_sexp {
+        s(:itblock,
+          s(:send, nil, :x), :it,
+          s(:lvar, :it))
+      }
+
+      assert_equal(it_block_parameter_sexp, actual_ast.to_sexp)
+    end
+
+    private
+
+    def assert_equal_parses(fixture, compare_asts: true, compare_tokens: true, compare_comments: true)
+      buffer = Parser::Source::Buffer.new(fixture.path, 1)
+      buffer.source = fixture.read
+
+      parser = Parser::Ruby33.new
+      parser.diagnostics.consumer = ->(*) {}
+      parser.diagnostics.all_errors_are_fatal = true
+
+      expected_ast, expected_comments, expected_tokens =
+        ignore_warnings { parser.tokenize(buffer) }
+
+      actual_ast, actual_comments, actual_tokens =
+        ignore_warnings { Prism::Translation::Parser33.new.tokenize(buffer) }
+
+      if expected_ast == actual_ast
+        if !compare_asts && !Fixture.custom_base_path?
+          puts "#{fixture.path} is now passing"
+        end
+
+        assert_equal expected_ast, actual_ast, -> { assert_equal_asts_message(expected_ast, actual_ast) }
+
+        begin
+          assert_equal_tokens(expected_tokens, actual_tokens)
+        rescue Test::Unit::AssertionFailedError
+          raise if compare_tokens
+        else
+          puts "#{fixture.path} is now passing" if !compare_tokens && !Fixture.custom_base_path?
+        end
+
+        assert_equal_comments(expected_comments, actual_comments) if compare_comments
+      elsif compare_asts
+        assert_equal expected_ast, actual_ast, -> { assert_equal_asts_message(expected_ast, actual_ast) }
+      end
+    end
+
+    def assert_equal_asts_message(expected_ast, actual_ast)
+      queue = [[expected_ast, actual_ast]]
+
+      while (left, right = queue.shift)
+        if left.type != right.type
+          return "expected: #{left.type}\nactual: #{right.type}"
+        end
+
+        if left.location != right.location
+          return "expected:\n#{left.inspect}\n#{left.location.inspect}\nactual:\n#{right.inspect}\n#{right.location.inspect}"
+        end
+
+        if left.type == :str && left.children[0] != right.children[0]
+          return "expected: #{left.inspect}\nactual: #{right.inspect}"
+        end
+
+        left.children.zip(right.children).each do |left_child, right_child|
+          queue << [left_child, right_child] if left_child.is_a?(Parser::AST::Node)
+        end
+      end
+
+      "expected: #{expected_ast.inspect}\nactual: #{actual_ast.inspect}"
+    end
+
+    def assert_equal_tokens(expected_tokens, actual_tokens)
+      if expected_tokens != actual_tokens
+        index = 0
+        max_index = [expected_tokens, actual_tokens].map(&:size).max
+
+        while index <= max_index
+          expected_token = expected_tokens.fetch(index, [])
+          actual_token = actual_tokens.fetch(index, [])
+
+          index += 1
+
+          # There are a lot of tokens that have very specific meaning according
+          # to the context of the parser. We don't expose that information in
+          # prism, so we need to normalize these tokens a bit.
+          if expected_token[0] == :kDO_BLOCK && actual_token[0] == :kDO
+            actual_token[0] = expected_token[0]
+          end
+
+          # Now we can assert that the tokens are actually equal.
+          assert_equal expected_token, actual_token, -> {
+            "expected: #{expected_token.inspect}\n" \
+            "actual: #{actual_token.inspect}"
+          }
+        end
+      end
+    end
+
+    def assert_equal_comments(expected_comments, actual_comments)
+      assert_equal expected_comments, actual_comments, -> {
+        "expected: #{expected_comments.inspect}\n" \
+        "actual: #{actual_comments.inspect}"
+      }
+    end
+
+    def parse_sexp(&block)
+      Class.new { extend AST::Sexp }.instance_eval(&block).to_sexp
+    end
+  end
+end
diff --git a/test/yarp/pattern_test.rb b/test/prism/ruby/pattern_test.rb
similarity index 86%
rename from test/yarp/pattern_test.rb
rename to test/prism/ruby/pattern_test.rb
index d34fe84458f206..23f512fc1c089c 100644
--- a/test/yarp/pattern_test.rb
+++ b/test/prism/ruby/pattern_test.rb
@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
-require_relative "test_helper"
+require_relative "../test_helper"
 
-module YARP
+module Prism
   class PatternTest < TestCase
     def test_invalid_syntax
       assert_raise(Pattern::CompilationError) { scan("", "<>") }
@@ -43,7 +43,7 @@ def test_array_pattern_no_constant
     end
 
     def test_array_pattern
-      results = scan("1 + 2", "CallNode[name: \"+\", receiver: IntegerNode, arguments: [IntegerNode]]")
+      results = scan("1 + 2", "CallNode[name: :+, receiver: IntegerNode, arguments: [IntegerNode]]")
 
       assert_equal 1, results.length
     end
@@ -69,13 +69,13 @@ def test_object_const
     end
 
     def test_constant_path
-      results = scan("Foo + Bar + Baz", "YARP::ConstantReadNode")
+      results = scan("Foo + Bar + Baz", "Prism::ConstantReadNode")
 
       assert_equal 3, results.length
     end
 
     def test_hash_pattern_no_constant
-      results = scan("Foo + Bar + Baz", "{ name: \"+\" }")
+      results = scan("Foo + Bar + Baz", "{ name: :+ }")
 
       assert_equal 2, results.length
     end
@@ -84,7 +84,7 @@ def test_hash_pattern_regexp
       results = scan("Foo + Bar + Baz", "{ name: /^[[:punct:]]$/ }")
 
       assert_equal 2, results.length
-      assert_equal ["YARP::CallNode"], results.map { |node| node.class.name }.uniq
+      assert_equal ["Prism::CallNode"], results.map { |node| node.class.name }.uniq
     end
 
     def test_nil
@@ -126,7 +126,7 @@ def test_symbol
     private
 
     def scan(source, query)
-      YARP::Pattern.new(query).scan(YARP.parse(source).value).to_a
+      Prism::Pattern.new(query).scan(Prism.parse(source).value).to_a
     end
   end
 end
diff --git a/test/prism/ruby/reflection_test.rb b/test/prism/ruby/reflection_test.rb
new file mode 100644
index 00000000000000..3ac462e1ac858b
--- /dev/null
+++ b/test/prism/ruby/reflection_test.rb
@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+require_relative "../test_helper"
+
+module Prism
+  class ReflectionTest < TestCase
+    def test_fields_for
+      fields = Reflection.fields_for(CallNode)
+      methods = CallNode.instance_methods(false)
+
+      fields.each do |field|
+        if field.is_a?(Reflection::FlagsField)
+          field.flags.each do |flag|
+            assert_includes methods, flag
+          end
+        else
+          assert_includes methods, field.name
+        end
+      end
+    end
+  end
+end
diff --git a/test/prism/ruby/relocation_test.rb b/test/prism/ruby/relocation_test.rb
new file mode 100644
index 00000000000000..f8372afa6df32b
--- /dev/null
+++ b/test/prism/ruby/relocation_test.rb
@@ -0,0 +1,192 @@
+# frozen_string_literal: true
+
+require_relative "../test_helper"
+
+module Prism
+  class RelocationTest < TestCase
+    def test_repository_filepath
+      repository = Relocation.filepath(__FILE__).lines
+      declaration = Prism.parse_file(__FILE__).value.statements.body[1]
+
+      assert_equal 5, declaration.save(repository).start_line
+    end
+
+    def test_filepath
+      repository = Relocation.filepath(__FILE__).filepath
+      declaration = Prism.parse_file(__FILE__).value.statements.body[1]
+
+      assert_equal __FILE__, declaration.save(repository).filepath
+    end
+
+    def test_lines
+      source = "class Foo😀\nend"
+      repository = Relocation.string(source).lines
+      declaration = Prism.parse(source).value.statements.body.first
+
+      node_entry = declaration.save(repository)
+      location_entry = declaration.save_location(repository)
+
+      assert_equal 1, node_entry.start_line
+      assert_equal 2, node_entry.end_line
+
+      assert_equal 1, location_entry.start_line
+      assert_equal 2, location_entry.end_line
+    end
+
+    def test_offsets
+      source = "class Foo😀\nend"
+      repository = Relocation.string(source).offsets
+      declaration = Prism.parse(source).value.statements.body.first
+
+      node_entry = declaration.constant_path.save(repository)
+      location_entry = declaration.constant_path.save_location(repository)
+
+      assert_equal 6, node_entry.start_offset
+      assert_equal 13, node_entry.end_offset
+
+      assert_equal 6, location_entry.start_offset
+      assert_equal 13, location_entry.end_offset
+    end
+
+    def test_character_offsets
+      source = "class Foo😀\nend"
+      repository = Relocation.string(source).character_offsets
+      declaration = Prism.parse(source).value.statements.body.first
+
+      node_entry = declaration.constant_path.save(repository)
+      location_entry = declaration.constant_path.save_location(repository)
+
+      assert_equal 6, node_entry.start_character_offset
+      assert_equal 10, node_entry.end_character_offset
+
+      assert_equal 6, location_entry.start_character_offset
+      assert_equal 10, location_entry.end_character_offset
+    end
+
+    def test_code_unit_offsets
+      source = "class Foo😀\nend"
+      repository = Relocation.string(source).code_unit_offsets(Encoding::UTF_16LE)
+      declaration = Prism.parse(source).value.statements.body.first
+
+      node_entry = declaration.constant_path.save(repository)
+      location_entry = declaration.constant_path.save_location(repository)
+
+      assert_equal 6, node_entry.start_code_units_offset
+      assert_equal 11, node_entry.end_code_units_offset
+
+      assert_equal 6, location_entry.start_code_units_offset
+      assert_equal 11, location_entry.end_code_units_offset
+    end
+
+    def test_columns
+      source = "class Foo😀\nend"
+      repository = Relocation.string(source).columns
+      declaration = Prism.parse(source).value.statements.body.first
+
+      node_entry = declaration.constant_path.save(repository)
+      location_entry = declaration.constant_path.save_location(repository)
+
+      assert_equal 6, node_entry.start_column
+      assert_equal 13, node_entry.end_column
+
+      assert_equal 6, location_entry.start_column
+      assert_equal 13, location_entry.end_column
+    end
+
+    def test_character_columns
+      source = "class Foo😀\nend"
+      repository = Relocation.string(source).character_columns
+      declaration = Prism.parse(source).value.statements.body.first
+
+      node_entry = declaration.constant_path.save(repository)
+      location_entry = declaration.constant_path.save_location(repository)
+
+      assert_equal 6, node_entry.start_character_column
+      assert_equal 10, node_entry.end_character_column
+
+      assert_equal 6, location_entry.start_character_column
+      assert_equal 10, location_entry.end_character_column
+    end
+
+    def test_code_unit_columns
+      source = "class Foo😀\nend"
+      repository = Relocation.string(source).code_unit_columns(Encoding::UTF_16LE)
+      declaration = Prism.parse(source).value.statements.body.first
+
+      node_entry = declaration.constant_path.save(repository)
+      location_entry = declaration.constant_path.save_location(repository)
+
+      assert_equal 6, node_entry.start_code_units_column
+      assert_equal 11, node_entry.end_code_units_column
+
+      assert_equal 6, location_entry.start_code_units_column
+      assert_equal 11, location_entry.end_code_units_column
+    end
+
+    def test_leading_comments
+      source = "# leading\nclass Foo\nend"
+      repository = Relocation.string(source).leading_comments
+      declaration = Prism.parse(source).value.statements.body.first
+
+      node_entry = declaration.save(repository)
+      location_entry = declaration.save_location(repository)
+
+      assert_equal ["# leading"], node_entry.leading_comments.map(&:slice)
+      assert_equal ["# leading"], location_entry.leading_comments.map(&:slice)
+    end
+
+    def test_trailing_comments
+      source = "class Foo\nend\n# trailing"
+      repository = Relocation.string(source).trailing_comments
+      declaration = Prism.parse(source).value.statements.body.first
+
+      node_entry = declaration.save(repository)
+      location_entry = declaration.save_location(repository)
+
+      assert_equal ["# trailing"], node_entry.trailing_comments.map(&:slice)
+      assert_equal ["# trailing"], location_entry.trailing_comments.map(&:slice)
+    end
+
+    def test_comments
+      source = "# leading\nclass Foo\nend\n# trailing"
+      repository = Relocation.string(source).comments
+      declaration = Prism.parse(source).value.statements.body.first
+
+      node_entry = declaration.save(repository)
+      location_entry = declaration.save_location(repository)
+
+      assert_equal ["# leading", "# trailing"], node_entry.comments.map(&:slice)
+      assert_equal ["# leading", "# trailing"], location_entry.comments.map(&:slice)
+    end
+
+    def test_misconfiguration
+      assert_raise Relocation::Repository::ConfigurationError do
+        Relocation.string("").comments.leading_comments
+      end
+
+      assert_raise Relocation::Repository::ConfigurationError do
+        Relocation.string("").comments.trailing_comments
+      end
+
+      assert_raise Relocation::Repository::ConfigurationError do
+        Relocation.string("").code_unit_offsets(Encoding::UTF_8).code_unit_offsets(Encoding::UTF_16LE)
+      end
+
+      assert_raise Relocation::Repository::ConfigurationError do
+        Relocation.string("").lines.lines
+      end
+    end
+
+    def test_missing_values
+      source = "class Foo; end"
+      repository = Relocation.string(source).lines
+
+      declaration = Prism.parse(source).value.statements.body.first
+      entry = declaration.constant_path.save(repository)
+
+      assert_raise Relocation::Entry::MissingValueError do
+        entry.start_offset
+      end
+    end
+  end
+end
diff --git a/test/prism/ruby/ripper_test.rb b/test/prism/ruby/ripper_test.rb
new file mode 100644
index 00000000000000..d4b278c28e1366
--- /dev/null
+++ b/test/prism/ruby/ripper_test.rb
@@ -0,0 +1,64 @@
+# frozen_string_literal: true
+
+return if RUBY_VERSION < "3.3" || RUBY_ENGINE == "truffleruby"
+
+require_relative "../test_helper"
+
+module Prism
+  class RipperTest < TestCase
+    # Skip these tests that Ripper is reporting the wrong results for.
+    incorrect = [
+      # Ripper incorrectly attributes the block to the keyword.
+      "seattlerb/block_break.txt",
+      "seattlerb/block_next.txt",
+      "seattlerb/block_return.txt",
+      "whitequark/break_block.txt",
+      "whitequark/next_block.txt",
+      "whitequark/return_block.txt",
+
+      # Ripper is not accounting for locals created by patterns using the **
+      # operator within an `in` clause.
+      "seattlerb/parse_pattern_058.txt",
+
+      # Ripper cannot handle named capture groups in regular expressions.
+      "regex.txt",
+      "regex_char_width.txt",
+      "whitequark/lvar_injecting_match.txt",
+
+      # Ripper fails to understand some structures that span across heredocs.
+      "spanning_heredoc.txt"
+    ]
+
+    # Skip these tests that we haven't implemented yet.
+    omitted = [
+      "dos_endings.txt",
+      "heredocs_with_fake_newlines.txt",
+      "heredocs_with_ignored_newlines.txt",
+      "seattlerb/block_call_dot_op2_brace_block.txt",
+      "seattlerb/block_command_operation_colon.txt",
+      "seattlerb/block_command_operation_dot.txt",
+      "seattlerb/heredoc__backslash_dos_format.txt",
+      "seattlerb/heredoc_backslash_nl.txt",
+      "seattlerb/heredoc_nested.txt",
+      "seattlerb/heredoc_squiggly_blank_line_plus_interpolation.txt",
+      "tilde_heredocs.txt",
+      "unparser/corpus/semantic/dstr.txt",
+      "whitequark/dedenting_heredoc.txt",
+      "whitequark/parser_drops_truncated_parts_of_squiggly_heredoc.txt",
+      "whitequark/parser_slash_slash_n_escaping_in_literals.txt",
+      "whitequark/ruby_bug_18878.txt",
+      "whitequark/send_block_chain_cmd.txt",
+      "whitequark/slash_newline_in_heredocs.txt"
+    ]
+
+    Fixture.each(except: incorrect | omitted) do |fixture|
+      define_method(fixture.test_name) { assert_ripper(fixture.read) }
+    end
+
+    private
+
+    def assert_ripper(source)
+      assert_equal Ripper.sexp_raw(source), Prism::Translation::Ripper.sexp_raw(source)
+    end
+  end
+end
diff --git a/test/prism/ruby/ruby_parser_test.rb b/test/prism/ruby/ruby_parser_test.rb
new file mode 100644
index 00000000000000..03bcfafc42b767
--- /dev/null
+++ b/test/prism/ruby/ruby_parser_test.rb
@@ -0,0 +1,137 @@
+# frozen_string_literal: true
+
+return if RUBY_ENGINE == "jruby"
+
+require_relative "../test_helper"
+
+begin
+  require "ruby_parser"
+rescue LoadError
+  # In CRuby's CI, we're not going to test against the ruby_parser gem because
+  # we don't want to have to install it. So in this case we'll just skip this
+  # test.
+  return
+end
+
+# We want to also compare lines and files to make sure we're setting them
+# correctly.
+Sexp.prepend(
+  Module.new do
+    def ==(other)
+      super && line == other.line && file == other.file # && line_max == other.line_max
+    end
+  end
+)
+
+module Prism
+  class RubyParserTest < TestCase
+    todos = [
+      "encoding_euc_jp.txt",
+      "newline_terminated.txt",
+      "regex_char_width.txt",
+      "seattlerb/bug169.txt",
+      "seattlerb/masgn_colon3.txt",
+      "seattlerb/messy_op_asgn_lineno.txt",
+      "seattlerb/op_asgn_primary_colon_const_command_call.txt",
+      "seattlerb/regexp_esc_C_slash.txt",
+      "seattlerb/str_lit_concat_bad_encodings.txt",
+      "strings.txt",
+      "unescaping.txt",
+      "unparser/corpus/literal/kwbegin.txt",
+      "unparser/corpus/literal/send.txt",
+      "whitequark/masgn_const.txt",
+      "whitequark/pattern_matching_constants.txt",
+      "whitequark/pattern_matching_implicit_array_match.txt",
+      "whitequark/pattern_matching_single_match.txt",
+      "whitequark/ruby_bug_12402.txt",
+      "whitequark/ruby_bug_14690.txt",
+      "whitequark/space_args_block.txt"
+    ]
+
+    # https://github.com/seattlerb/ruby_parser/issues/344
+    failures = [
+      "alias.txt",
+      "dsym_str.txt",
+      "dos_endings.txt",
+      "heredocs_with_fake_newlines.txt",
+      "heredocs_with_ignored_newlines.txt",
+      "method_calls.txt",
+      "methods.txt",
+      "multi_write.txt",
+      "not.txt",
+      "patterns.txt",
+      "regex.txt",
+      "seattlerb/and_multi.txt",
+      "seattlerb/heredoc__backslash_dos_format.txt",
+      "seattlerb/heredoc_bad_hex_escape.txt",
+      "seattlerb/heredoc_bad_oct_escape.txt",
+      "seattlerb/heredoc_with_extra_carriage_horrible_mix.txt",
+      "seattlerb/heredoc_with_extra_carriage_returns_windows.txt",
+      "seattlerb/heredoc_with_only_carriage_returns_windows.txt",
+      "seattlerb/heredoc_with_only_carriage_returns.txt",
+      "spanning_heredoc_newlines.txt",
+      "spanning_heredoc.txt",
+      "symbols.txt",
+      "tilde_heredocs.txt",
+      "unparser/corpus/literal/literal.txt",
+      "while.txt",
+      "whitequark/cond_eflipflop.txt",
+      "whitequark/cond_iflipflop.txt",
+      "whitequark/cond_match_current_line.txt",
+      "whitequark/dedenting_heredoc.txt",
+      "whitequark/lvar_injecting_match.txt",
+      "whitequark/not.txt",
+      "whitequark/numparam_ruby_bug_19025.txt",
+      "whitequark/op_asgn_cmd.txt",
+      "whitequark/parser_bug_640.txt",
+      "whitequark/parser_slash_slash_n_escaping_in_literals.txt",
+      "whitequark/pattern_matching_single_line_allowed_omission_of_parentheses.txt",
+      "whitequark/pattern_matching_single_line.txt",
+      "whitequark/ruby_bug_11989.txt",
+      "whitequark/ruby_bug_18878.txt",
+      "whitequark/ruby_bug_19281.txt",
+      "whitequark/slash_newline_in_heredocs.txt"
+    ]
+
+    Fixture.each(except: failures) do |fixture|
+      define_method(fixture.test_name) do
+        assert_ruby_parser(fixture, todos.include?(fixture.path))
+      end
+    end
+
+    private
+
+    def assert_ruby_parser(fixture, allowed_failure)
+      source = fixture.read
+      expected = ignore_warnings { ::RubyParser.new.parse(source, fixture.path) }
+      actual = Prism::Translation::RubyParser.new.parse(source, fixture.path)
+
+      if !allowed_failure
+        assert_equal(expected, actual, -> { message(expected, actual) })
+      elsif expected == actual
+        puts "#{name} now passes"
+      end
+    end
+
+    def message(expected, actual)
+      if expected == actual
+        nil
+      elsif expected.is_a?(Sexp) && actual.is_a?(Sexp)
+        if expected.line != actual.line
+          "expected: (#{expected.inspect} line=#{expected.line}), actual: (#{actual.inspect} line=#{actual.line})"
+        elsif expected.file != actual.file
+          "expected: (#{expected.inspect} file=#{expected.file}), actual: (#{actual.inspect} file=#{actual.file})"
+        elsif expected.length != actual.length
+          "expected: (#{expected.inspect} length=#{expected.length}), actual: (#{actual.inspect} length=#{actual.length})"
+        else
+          expected.zip(actual).find do |expected_field, actual_field|
+            result = message(expected_field, actual_field)
+            break result if result
+          end
+        end
+      else
+        "expected: #{expected.inspect}, actual: #{actual.inspect}"
+      end
+    end
+  end
+end
diff --git a/test/prism/ruby/string_query_test.rb b/test/prism/ruby/string_query_test.rb
new file mode 100644
index 00000000000000..aa50c10ff326a2
--- /dev/null
+++ b/test/prism/ruby/string_query_test.rb
@@ -0,0 +1,60 @@
+# frozen_string_literal: true
+
+require_relative "../test_helper"
+
+module Prism
+  class StringQueryTest < TestCase
+    def test_local?
+      assert_predicate StringQuery.new("a"), :local?
+      assert_predicate StringQuery.new("a1"), :local?
+      assert_predicate StringQuery.new("self"), :local?
+
+      assert_predicate StringQuery.new("_a"), :local?
+      assert_predicate StringQuery.new("_1"), :local?
+
+      assert_predicate StringQuery.new("😀"), :local?
+      assert_predicate StringQuery.new("ア".encode("Windows-31J")), :local?
+
+      refute_predicate StringQuery.new("1"), :local?
+      refute_predicate StringQuery.new("A"), :local?
+    end
+
+    def test_constant?
+      assert_predicate StringQuery.new("A"), :constant?
+      assert_predicate StringQuery.new("A1"), :constant?
+      assert_predicate StringQuery.new("A_B"), :constant?
+      assert_predicate StringQuery.new("BEGIN"), :constant?
+
+      assert_predicate StringQuery.new("À"), :constant?
+      assert_predicate StringQuery.new("A".encode("US-ASCII")), :constant?
+
+      refute_predicate StringQuery.new("a"), :constant?
+      refute_predicate StringQuery.new("1"), :constant?
+    end
+
+    def test_method_name?
+      assert_predicate StringQuery.new("a"), :method_name?
+      assert_predicate StringQuery.new("A"), :method_name?
+      assert_predicate StringQuery.new("__FILE__"), :method_name?
+
+      assert_predicate StringQuery.new("a?"), :method_name?
+      assert_predicate StringQuery.new("a!"), :method_name?
+      assert_predicate StringQuery.new("a="), :method_name?
+
+      assert_predicate StringQuery.new("+"), :method_name?
+      assert_predicate StringQuery.new("<<"), :method_name?
+      assert_predicate StringQuery.new("==="), :method_name?
+
+      assert_predicate StringQuery.new("_0"), :method_name?
+
+      refute_predicate StringQuery.new("1"), :method_name?
+      refute_predicate StringQuery.new("_1"), :method_name?
+    end
+
+    def test_invalid_encoding
+      assert_raise ArgumentError do
+        StringQuery.new("A".encode("UTF-16LE")).local?
+      end
+    end
+  end
+end
diff --git a/test/prism/ruby/tunnel_test.rb b/test/prism/ruby/tunnel_test.rb
new file mode 100644
index 00000000000000..0214681604a42a
--- /dev/null
+++ b/test/prism/ruby/tunnel_test.rb
@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+require_relative "../test_helper"
+
+module Prism
+  class TunnelTest < TestCase
+    def test_tunnel
+      program = Prism.parse("foo(1) +\n  bar(2, 3) +\n  baz(3, 4, 5)").value
+
+      tunnel = program.tunnel(1, 4).last
+      assert_kind_of IntegerNode, tunnel
+      assert_equal 1, tunnel.value
+
+      tunnel = program.tunnel(2, 6).last
+      assert_kind_of IntegerNode, tunnel
+      assert_equal 2, tunnel.value
+
+      tunnel = program.tunnel(3, 9).last
+      assert_kind_of IntegerNode, tunnel
+      assert_equal 4, tunnel.value
+
+      tunnel = program.tunnel(3, 8)
+      assert_equal [ProgramNode, StatementsNode, CallNode, ArgumentsNode, CallNode, ArgumentsNode], tunnel.map(&:class)
+    end
+  end
+end
diff --git a/test/prism/snippets_test.rb b/test/prism/snippets_test.rb
new file mode 100644
index 00000000000000..66802c5dc3a1be
--- /dev/null
+++ b/test/prism/snippets_test.rb
@@ -0,0 +1,43 @@
+# frozen_string_literal: true
+
+require_relative "test_helper"
+
+module Prism
+  class SnippetsTest < TestCase
+    except = [
+      "encoding_binary.txt",
+      "newline_terminated.txt",
+      "seattlerb/begin_rescue_else_ensure_no_bodies.txt",
+      "seattlerb/case_in.txt",
+      "seattlerb/parse_line_defn_no_parens.txt",
+      "seattlerb/pct_nl.txt",
+      "seattlerb/str_heredoc_interp.txt",
+      "spanning_heredoc_newlines.txt",
+      "unparser/corpus/semantic/dstr.txt",
+      "whitequark/dedenting_heredoc.txt",
+      "whitequark/multiple_pattern_matches.txt"
+    ]
+
+    Fixture.each(except: except) do |fixture|
+      define_method(fixture.test_name) { assert_snippets(fixture) }
+    end
+
+    private
+
+    # We test every snippet (separated by \n\n) in isolation to ensure the
+    # parser does not try to read bytes further than the end of each snippet.
+    def assert_snippets(fixture)
+      fixture.read.split(/(?<=\S)\n\n(?=\S)/).each do |snippet|
+        snippet = snippet.rstrip
+
+        result = Prism.parse(snippet, filepath: fixture.path)
+        assert result.success?
+
+        if !ENV["PRISM_BUILD_MINIMAL"]
+          dumped = Prism.dump(snippet, filepath: fixture.path)
+          assert_equal_nodes(result.value, Prism.load(snippet, dumped).value)
+        end
+      end
+    end
+  end
+end
diff --git a/test/prism/test_helper.rb b/test/prism/test_helper.rb
new file mode 100644
index 00000000000000..0be9d1e7da4f36
--- /dev/null
+++ b/test/prism/test_helper.rb
@@ -0,0 +1,334 @@
+# frozen_string_literal: true
+
+require "prism"
+require "pp"
+require "ripper"
+require "stringio"
+require "test/unit"
+require "tempfile"
+
+puts "Using prism backend: #{Prism::BACKEND}" if ENV["PRISM_FFI_BACKEND"]
+
+# It is useful to have a diff even if the strings to compare are big
+# However, ruby/ruby does not have a version of Test::Unit with access to
+# max_diff_target_string_size
+if defined?(Test::Unit::Assertions::AssertionMessage)
+  Test::Unit::Assertions::AssertionMessage.max_diff_target_string_size = 5000
+end
+
+module Prism
+  # A convenience method for retrieving the first statement in the source string
+  # parsed by Prism.
+  def self.parse_statement(source, **options)
+    parse(source, **options).value.statements.body.first
+  end
+
+  class ParseResult < Result
+    # Returns the first statement in the body of the parsed source.
+    def statement
+      value.statements.body.first
+    end
+  end
+
+  class TestCase < ::Test::Unit::TestCase
+    # We have a set of fixtures that we use to test various aspects of the
+    # parser. They are all represented as .txt files under the
+    # test/prism/fixtures directory. Typically in test files you will find calls
+    # to Fixture.each which yields Fixture objects to the given block. These
+    # are used to define test methods that assert against each fixture in some
+    # way.
+    class Fixture
+      BASE = ENV.fetch("FIXTURE_BASE", File.join(__dir__, "fixtures"))
+
+      attr_reader :path
+
+      def initialize(path)
+        @path = path
+      end
+
+      def read
+        File.read(full_path, binmode: true, external_encoding: Encoding::UTF_8)
+      end
+
+      def full_path
+        File.join(BASE, path)
+      end
+
+      def snapshot_path
+        File.join(File.expand_path("../..", __dir__), "snapshots", path)
+      end
+
+      def test_name
+        :"test_#{path}"
+      end
+
+      def self.each(except: [], &block)
+        glob_pattern = ENV.fetch("FOCUS") { custom_base_path? ? File.join("**", "*.rb") : File.join("**", "*.txt") }
+        paths = Dir[glob_pattern, base: BASE] - except
+        paths.each { |path| yield Fixture.new(path) }
+      end
+
+      def self.custom_base_path?
+        ENV.key?("FIXTURE_BASE")
+      end
+    end
+
+    # Yield each encoding that we want to test, along with a range of the
+    # codepoints that should be tested.
+    def self.each_encoding
+      codepoints_1byte = 0...0x100
+
+      yield Encoding::ASCII_8BIT, codepoints_1byte
+      yield Encoding::US_ASCII, codepoints_1byte
+
+      if !ENV["PRISM_BUILD_MINIMAL"]
+        yield Encoding::Windows_1253, codepoints_1byte
+      end
+
+      # By default we don't test every codepoint in these encodings because it
+      # takes a very long time.
+      return unless ENV["PRISM_TEST_ALL_ENCODINGS"]
+
+      yield Encoding::CP850, codepoints_1byte
+      yield Encoding::CP852, codepoints_1byte
+      yield Encoding::CP855, codepoints_1byte
+      yield Encoding::GB1988, codepoints_1byte
+      yield Encoding::IBM437, codepoints_1byte
+      yield Encoding::IBM720, codepoints_1byte
+      yield Encoding::IBM737, codepoints_1byte
+      yield Encoding::IBM775, codepoints_1byte
+      yield Encoding::IBM852, codepoints_1byte
+      yield Encoding::IBM855, codepoints_1byte
+      yield Encoding::IBM857, codepoints_1byte
+      yield Encoding::IBM860, codepoints_1byte
+      yield Encoding::IBM861, codepoints_1byte
+      yield Encoding::IBM862, codepoints_1byte
+      yield Encoding::IBM863, codepoints_1byte
+      yield Encoding::IBM864, codepoints_1byte
+      yield Encoding::IBM865, codepoints_1byte
+      yield Encoding::IBM866, codepoints_1byte
+      yield Encoding::IBM869, codepoints_1byte
+      yield Encoding::ISO_8859_1, codepoints_1byte
+      yield Encoding::ISO_8859_2, codepoints_1byte
+      yield Encoding::ISO_8859_3, codepoints_1byte
+      yield Encoding::ISO_8859_4, codepoints_1byte
+      yield Encoding::ISO_8859_5, codepoints_1byte
+      yield Encoding::ISO_8859_6, codepoints_1byte
+      yield Encoding::ISO_8859_7, codepoints_1byte
+      yield Encoding::ISO_8859_8, codepoints_1byte
+      yield Encoding::ISO_8859_9, codepoints_1byte
+      yield Encoding::ISO_8859_10, codepoints_1byte
+      yield Encoding::ISO_8859_11, codepoints_1byte
+      yield Encoding::ISO_8859_13, codepoints_1byte
+      yield Encoding::ISO_8859_14, codepoints_1byte
+      yield Encoding::ISO_8859_15, codepoints_1byte
+      yield Encoding::ISO_8859_16, codepoints_1byte
+      yield Encoding::KOI8_R, codepoints_1byte
+      yield Encoding::KOI8_U, codepoints_1byte
+      yield Encoding::MACCENTEURO, codepoints_1byte
+      yield Encoding::MACCROATIAN, codepoints_1byte
+      yield Encoding::MACCYRILLIC, codepoints_1byte
+      yield Encoding::MACGREEK, codepoints_1byte
+      yield Encoding::MACICELAND, codepoints_1byte
+      yield Encoding::MACROMAN, codepoints_1byte
+      yield Encoding::MACROMANIA, codepoints_1byte
+      yield Encoding::MACTHAI, codepoints_1byte
+      yield Encoding::MACTURKISH, codepoints_1byte
+      yield Encoding::MACUKRAINE, codepoints_1byte
+      yield Encoding::TIS_620, codepoints_1byte
+      yield Encoding::Windows_1250, codepoints_1byte
+      yield Encoding::Windows_1251, codepoints_1byte
+      yield Encoding::Windows_1252, codepoints_1byte
+      yield Encoding::Windows_1254, codepoints_1byte
+      yield Encoding::Windows_1255, codepoints_1byte
+      yield Encoding::Windows_1256, codepoints_1byte
+      yield Encoding::Windows_1257, codepoints_1byte
+      yield Encoding::Windows_1258, codepoints_1byte
+      yield Encoding::Windows_874, codepoints_1byte
+
+      codepoints_2bytes = 0...0x10000
+
+      yield Encoding::Big5, codepoints_2bytes
+      yield Encoding::Big5_HKSCS, codepoints_2bytes
+      yield Encoding::Big5_UAO, codepoints_2bytes
+      yield Encoding::CP949, codepoints_2bytes
+      yield Encoding::CP950, codepoints_2bytes
+      yield Encoding::CP951, codepoints_2bytes
+      yield Encoding::EUC_KR, codepoints_2bytes
+      yield Encoding::GBK, codepoints_2bytes
+      yield Encoding::GB12345, codepoints_2bytes
+      yield Encoding::GB2312, codepoints_2bytes
+      yield Encoding::MACJAPANESE, codepoints_2bytes
+      yield Encoding::Shift_JIS, codepoints_2bytes
+      yield Encoding::SJIS_DoCoMo, codepoints_2bytes
+      yield Encoding::SJIS_KDDI, codepoints_2bytes
+      yield Encoding::SJIS_SoftBank, codepoints_2bytes
+      yield Encoding::Windows_31J, codepoints_2bytes
+
+      codepoints_unicode = (0...0x110000)
+
+      yield Encoding::UTF_8, codepoints_unicode
+      yield Encoding::UTF8_MAC, codepoints_unicode
+      yield Encoding::UTF8_DoCoMo, codepoints_unicode
+      yield Encoding::UTF8_KDDI, codepoints_unicode
+      yield Encoding::UTF8_SoftBank, codepoints_unicode
+      yield Encoding::CESU_8, codepoints_unicode
+
+      codepoints_eucjp = [
+        *(0...0x10000),
+        *(0...0x10000).map { |bytes| bytes | 0x8F0000 }
+      ]
+
+      yield Encoding::CP51932, codepoints_eucjp
+      yield Encoding::EUC_JP, codepoints_eucjp
+      yield Encoding::EUCJP_MS, codepoints_eucjp
+      yield Encoding::EUC_JIS_2004, codepoints_eucjp
+
+      codepoints_emacs_mule = [
+        *(0...0x80),
+        *((0x81...0x90).flat_map { |byte1| (0x90...0x100).map { |byte2| byte1 << 8 | byte2 } }),
+        *((0x90...0x9C).flat_map { |byte1| (0xA0...0x100).flat_map { |byte2| (0xA0...0x100).flat_map { |byte3| byte1 << 16 | byte2 << 8 | byte3 } } }),
+        *((0xF0...0xF5).flat_map { |byte2| (0xA0...0x100).flat_map { |byte3| (0xA0...0x100).flat_map { |byte4| 0x9C << 24 | byte3 << 16 | byte3 << 8 | byte4 } } }),
+      ]
+
+      yield Encoding::EMACS_MULE, codepoints_emacs_mule
+      yield Encoding::STATELESS_ISO_2022_JP, codepoints_emacs_mule
+      yield Encoding::STATELESS_ISO_2022_JP_KDDI, codepoints_emacs_mule
+
+      codepoints_gb18030 = [
+        *(0...0x80),
+        *((0x81..0xFE).flat_map { |byte1| (0x40...0x100).map { |byte2| byte1 << 8 | byte2 } }),
+        *((0x81..0xFE).flat_map { |byte1| (0x30...0x40).flat_map { |byte2| (0x81..0xFE).flat_map { |byte3| (0x2F...0x41).map { |byte4| byte1 << 24 | byte2 << 16 | byte3 << 8 | byte4 } } } }),
+      ]
+
+      yield Encoding::GB18030, codepoints_gb18030
+
+      codepoints_euc_tw = [
+        *(0..0x7F),
+        *(0xA1..0xFF).flat_map { |byte1| (0xA1..0xFF).map { |byte2| (byte1 << 8) | byte2 } },
+        *(0xA1..0xB0).flat_map { |byte2| (0xA1..0xFF).flat_map { |byte3| (0xA1..0xFF).flat_map { |byte4| 0x8E << 24 | byte2 << 16 | byte3 << 8 | byte4 } } }
+      ]
+
+      yield Encoding::EUC_TW, codepoints_euc_tw
+    end
+
+    # True if the current platform is Windows.
+    def self.windows?
+      RbConfig::CONFIG["host_os"].match?(/bccwin|cygwin|djgpp|mingw|mswin|wince/i)
+    end
+
+    private
+
+    if RUBY_ENGINE == "ruby" && RubyVM::InstructionSequence.compile("").to_a[4][:parser] != :prism
+      # Check that the given source is valid syntax by compiling it with RubyVM.
+      def check_syntax(source)
+        ignore_warnings { RubyVM::InstructionSequence.compile(source) }
+      end
+
+      # Assert that the given source is valid Ruby syntax by attempting to
+      # compile it, and then implicitly checking that it does not raise an
+      # syntax errors.
+      def assert_valid_syntax(source)
+        check_syntax(source)
+      end
+
+      # Refute that the given source is invalid Ruby syntax by attempting to
+      # compile it and asserting that it raises a SyntaxError.
+      def refute_valid_syntax(source)
+        assert_raise(SyntaxError) { check_syntax(source) }
+      end
+    else
+      def assert_valid_syntax(source)
+      end
+
+      def refute_valid_syntax(source)
+      end
+    end
+
+    # CRuby has this same method, so define it so that we don't accidentally
+    # break CRuby CI.
+    def assert_raises(*args, &block)
+      raise "Use assert_raise instead"
+    end
+
+    def assert_equal_nodes(expected, actual, compare_location: true, parent: nil)
+      assert_equal expected.class, actual.class
+
+      case expected
+      when Array
+        assert_equal(
+          expected.size,
+          actual.size,
+          -> { "Arrays were different sizes. Parent: #{parent.pretty_inspect}" }
+        )
+
+        expected.zip(actual).each do |(expected_element, actual_element)|
+          assert_equal_nodes(
+            expected_element,
+            actual_element,
+            compare_location: compare_location,
+            parent: actual
+          )
+        end
+      when SourceFileNode
+        expected_deconstruct = expected.deconstruct_keys(nil)
+        actual_deconstruct = actual.deconstruct_keys(nil)
+        assert_equal expected_deconstruct.keys, actual_deconstruct.keys
+
+        # Filepaths can be different if test suites were run on different
+        # machines. We accommodate for this by comparing the basenames, and not
+        # the absolute filepaths.
+        expected_filepath = expected_deconstruct.delete(:filepath)
+        actual_filepath = actual_deconstruct.delete(:filepath)
+
+        assert_equal expected_deconstruct, actual_deconstruct
+        assert_equal File.basename(expected_filepath), File.basename(actual_filepath)
+      when Node
+        deconstructed_expected = expected.deconstruct_keys(nil)
+        deconstructed_actual = actual.deconstruct_keys(nil)
+        assert_equal deconstructed_expected.keys, deconstructed_actual.keys
+
+        deconstructed_expected.each_key do |key|
+          assert_equal_nodes(
+            deconstructed_expected[key],
+            deconstructed_actual[key],
+            compare_location: compare_location,
+            parent: actual
+          )
+        end
+      when Location
+        assert_operator actual.start_offset, :<=, actual.end_offset, -> {
+          "start_offset > end_offset for #{actual.inspect}, parent is #{parent.pretty_inspect}"
+        }
+
+        if compare_location
+          assert_equal(
+            expected.start_offset,
+            actual.start_offset,
+            -> { "Start locations were different. Parent: #{parent.pretty_inspect}" }
+          )
+
+          assert_equal(
+            expected.end_offset,
+            actual.end_offset,
+            -> { "End locations were different. Parent: #{parent.pretty_inspect}" }
+          )
+        end
+      else
+        assert_equal expected, actual
+      end
+    end
+
+    def capture_warnings
+      $stderr = StringIO.new
+      yield
+      $stderr.string
+    ensure
+      $stderr = STDERR
+    end
+
+    def ignore_warnings
+      capture_warnings { return yield }
+    end
+  end
+end
diff --git a/test/prism/unescape_test.rb b/test/prism/unescape_test.rb
new file mode 100644
index 00000000000000..d241f28c0873b7
--- /dev/null
+++ b/test/prism/unescape_test.rb
@@ -0,0 +1,245 @@
+# frozen_string_literal: true
+
+require_relative "test_helper"
+
+return if Prism::BACKEND == :FFI
+return if RUBY_VERSION < "3.1.0"
+return if RUBY_VERSION >= "3.4.0"
+
+module Prism
+  class UnescapeTest < TestCase
+    module Context
+      class Base
+        attr_reader :left, :right
+
+        def initialize(left, right)
+          @left = left
+          @right = right
+        end
+
+        def name
+          "#{left}#{right}".delete("\n")
+        end
+
+        private
+
+        def code(escape)
+          "#{left}\\#{escape}#{right}".b
+        end
+
+        def ruby(escape)
+          previous, $VERBOSE = $VERBOSE, nil
+
+          begin
+            yield eval(code(escape))
+          rescue SyntaxError
+            :error
+          ensure
+            $VERBOSE = previous
+          end
+        end
+
+        def prism(escape)
+          result = Prism.parse(code(escape), encoding: "binary")
+
+          if result.success?
+            yield result.statement
+          else
+            :error
+          end
+        end
+
+        def `(command)
+          command
+        end
+      end
+
+      class List < Base
+        def ruby_result(escape)
+          ruby(escape) { |value| value.first.to_s }
+        end
+
+        def prism_result(escape)
+          prism(escape) { |node| node.elements.first.unescaped }
+        end
+      end
+
+      class Symbol < Base
+        def ruby_result(escape)
+          ruby(escape, &:to_s)
+        end
+
+        def prism_result(escape)
+          prism(escape, &:unescaped)
+        end
+      end
+
+      class String < Base
+        def ruby_result(escape)
+          ruby(escape, &:itself)
+        end
+
+        def prism_result(escape)
+          prism(escape, &:unescaped)
+        end
+      end
+
+      class Heredoc < Base
+        def ruby_result(escape)
+          ruby(escape, &:itself)
+        end
+
+        def prism_result(escape)
+          prism(escape) do |node|
+            case node.type
+            when :interpolated_string_node, :interpolated_x_string_node
+              node.parts.flat_map(&:unescaped).join
+            else
+              node.unescaped
+            end
+          end
+        end
+      end
+
+      class RegExp < Base
+        def ruby_result(escape)
+          ruby(escape, &:source)
+        end
+
+        def prism_result(escape)
+          prism(escape, &:unescaped)
+        end
+      end
+    end
+
+    def test_char; assert_context(Context::String.new("?", "")); end
+    def test_sqte; assert_context(Context::String.new("'", "'")); end
+    def test_dqte; assert_context(Context::String.new("\"", "\"")); end
+    def test_lwrq; assert_context(Context::String.new("%q[", "]")); end
+    def test_uprq; assert_context(Context::String.new("%Q[", "]")); end
+    def test_dstr; assert_context(Context::String.new("%[", "]")); end
+    def test_xstr; assert_context(Context::String.new("`", "`")); end
+    def test_lwrx; assert_context(Context::String.new("%x[", "]")); end
+    def test_h0_1; assert_context(Context::String.new("<<H\n", "\nH")); end
+    def test_h0_2; assert_context(Context::String.new("<<'H'\n", "\nH")); end
+    def test_h0_3; assert_context(Context::String.new("<<\"H\"\n", "\nH")); end
+    def test_h0_4; assert_context(Context::String.new("<<`H`\n", "\nH")); end
+    def test_hd_1; assert_context(Context::String.new("<<-H\n", "\nH")); end
+    def test_hd_2; assert_context(Context::String.new("<<-'H'\n", "\nH")); end
+    def test_hd_3; assert_context(Context::String.new("<<-\"H\"\n", "\nH")); end
+    def test_hd_4; assert_context(Context::String.new("<<-`H`\n", "\nH")); end
+    def test_ht_1; assert_context(Context::Heredoc.new("<<~H\n", "\nH")); end
+    def test_ht_2; assert_context(Context::Heredoc.new("<<~'H'\n", "\nH")); end
+    def test_ht_3; assert_context(Context::Heredoc.new("<<~\"H\"\n", "\nH")); end
+    def test_ht_4; assert_context(Context::Heredoc.new("<<~`H`\n", "\nH")); end
+    def test_pw_1; assert_context(Context::List.new("%w[", "]")); end
+    def test_pw_2; assert_context(Context::List.new("%w<", ">")); end
+    def test_uprw; assert_context(Context::List.new("%W[", "]")); end
+    def test_lwri; assert_context(Context::List.new("%i[", "]")); end
+    def test_upri; assert_context(Context::List.new("%I[", "]")); end
+    def test_lwrs; assert_context(Context::Symbol.new("%s[", "]")); end
+    def test_sym1; assert_context(Context::Symbol.new(":'", "'")); end
+    def test_sym2; assert_context(Context::Symbol.new(":\"", "\"")); end
+    def test_reg1; assert_context(Context::RegExp.new("/", "/")); end
+    def test_reg2; assert_context(Context::RegExp.new("%r[", "]")); end
+    def test_reg3; assert_context(Context::RegExp.new("%r<", ">")); end
+    def test_reg4; assert_context(Context::RegExp.new("%r{", "}")); end
+    def test_reg5; assert_context(Context::RegExp.new("%r(", ")")); end
+    def test_reg6; assert_context(Context::RegExp.new("%r|", "|")); end
+
+    private
+
+    def assert_context(context)
+      octal = [*("0".."7")]
+      hex = [*("a".."f"), *("A".."F"), *("0".."9")]
+
+      (0...256).each do |ord|
+        # I think this might be a bug in Ruby.
+        next if context.name == "?" && ord == 0xFF
+
+        # We don't currently support scanning for the number of capture groups
+        # to validate backreferences so these are all going to fail.
+        next if (context.name == "//" || context.name.start_with?("%r")) && ord.chr.start_with?(/\d/)
+
+        # \u is passed directly on to the regular expression engine and it is
+        # responsible for handling syntax errors. In this case we do not check
+        # it because it would require going through the compiler.
+        next if context.is_a?(Context::RegExp) && ord.chr == "u"
+
+        # \a \b \c ...
+        assert_unescape(context, ord.chr)
+      end
+
+      # \\r\n
+      assert_unescape(context, "\r\n")
+
+      # We don't currently support scanning for the number of capture groups to
+      # validate backreferences so these are all going to fail.
+      if context.name != "//" && !context.name.start_with?("%r")
+        # \00 \01 \02 ...
+        octal.product(octal).each { |digits| assert_unescape(context, digits.join) }
+
+        # \000 \001 \002 ...
+        octal.product(octal).product(octal).each { |digits| assert_unescape(context, digits.join) }
+      end
+
+      # \x0 \x1 \x2 ...
+      hex.each { |digit| assert_unescape(context, "x#{digit}") }
+
+      # \x00 \x01 \x02 ...
+      hex.product(hex).each { |digits| assert_unescape(context, "x#{digits.join}") }
+
+      # \u0000 \u0001 \u0002 ...
+      assert_unescape(context, "u#{["5"].concat(hex.sample(3)).join}")
+
+      # The behavior of whitespace in the middle of these escape sequences
+      # changed in Ruby 3.3.0, so we only want to test against latest.
+      if RUBY_VERSION >= "3.3.0"
+        # \u{00  00} ...
+        assert_unescape(context, "u{00#{["5"].concat(hex.sample(3)).join} \t\v 00#{["5"].concat(hex.sample(3)).join}}")
+      end
+
+      (0...128).each do |ord|
+        chr = ord.chr
+        next if chr == "\\" || !chr.match?(/[[:print:]]/)
+
+        # \C-a \C-b \C-c ...
+        assert_unescape(context, "C-#{chr}")
+
+        # \C-\a \C-\b \C-\c ...
+        assert_unescape(context, "C-\\#{chr}")
+
+        # \ca \cb \cc ...
+        assert_unescape(context, "c#{chr}")
+
+        # \M-a \M-b \M-c ...
+        assert_unescape(context, "M-#{chr}")
+
+        # \M-\C-a \M-\C-b \M-\C-c ...
+        assert_unescape(context, "M-\\C-#{chr}")
+
+        # \M-\ca \M-\cb \M-\cc ...
+        assert_unescape(context, "M-\\c#{chr}")
+
+        # \c\M-a \c\M-b \c\M-c ...
+        assert_unescape(context, "c\\M-#{chr}")
+      end
+    end
+
+    def assert_unescape(context, escape)
+      expected = context.ruby_result(escape)
+      actual = context.prism_result(escape)
+
+      message = -> do
+        "Expected #{context.name} to unescape #{escape.inspect} to " \
+          "#{expected.inspect}, but got #{actual.inspect}"
+      end
+
+      if expected == :error || actual == :error
+        assert_equal expected, actual, message
+      else
+        assert_equal expected.bytes, actual.bytes, message
+      end
+    end
+  end
+end
diff --git a/test/prism/version_test.rb b/test/prism/version_test.rb
new file mode 100644
index 00000000000000..149cfd62b49a8b
--- /dev/null
+++ b/test/prism/version_test.rb
@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+require_relative "test_helper"
+
+module Prism
+  class VersionTest < TestCase
+    def test_prism_version_is_set
+      refute_nil VERSION
+    end
+  end
+end
diff --git a/test/psych/helper.rb b/test/psych/helper.rb
index 4e82887c6d1c2c..639f6055ff6b8f 100644
--- a/test/psych/helper.rb
+++ b/test/psych/helper.rb
@@ -2,7 +2,6 @@
 require 'test/unit'
 require 'stringio'
 require 'tempfile'
-require 'date'
 
 require 'psych'
 
diff --git a/test/psych/test_data.rb b/test/psych/test_data.rb
new file mode 100644
index 00000000000000..a67a037b9e4af5
--- /dev/null
+++ b/test/psych/test_data.rb
@@ -0,0 +1,69 @@
+# frozen_string_literal: true
+require_relative 'helper'
+
+class PsychDataWithIvar < Data.define(:foo)
+  attr_reader :bar
+  def initialize(**)
+    @bar = 'hello'
+    super
+  end
+end unless RUBY_VERSION < "3.2"
+
+module Psych
+  class TestData < TestCase
+    class SelfReferentialData < Data.define(:foo)
+      attr_accessor :ref
+      def initialize(foo:)
+        @ref = self
+        super
+      end
+    end unless RUBY_VERSION < "3.2"
+
+    def setup
+      omit "Data requires ruby >= 3.2" if RUBY_VERSION < "3.2"
+    end
+
+    # TODO: move to another test?
+    def test_dump_data
+      assert_equal <<~eoyml, Psych.dump(PsychDataWithIvar["bar"])
+        --- !ruby/data-with-ivars:PsychDataWithIvar
+        members:
+          foo: bar
+        ivars:
+          "@bar": hello
+      eoyml
+    end
+
+    def test_self_referential_data
+      circular = SelfReferentialData.new("foo")
+
+      loaded = Psych.unsafe_load(Psych.dump(circular))
+      assert_instance_of(SelfReferentialData, loaded.ref)
+
+      assert_equal(circular, loaded)
+      assert_same(loaded, loaded.ref)
+    end
+
+    def test_roundtrip
+      thing = PsychDataWithIvar.new("bar")
+      data = Psych.unsafe_load(Psych.dump(thing))
+
+      assert_equal "hello", data.bar
+      assert_equal "bar",   data.foo
+    end
+
+    def test_load
+      obj = Psych.unsafe_load(<<~eoyml)
+        --- !ruby/data-with-ivars:PsychDataWithIvar
+        members:
+          foo: bar
+        ivars:
+          "@bar": hello
+      eoyml
+
+      assert_equal "hello", obj.bar
+      assert_equal "bar",   obj.foo
+    end
+  end
+end
+
diff --git a/test/psych/test_date_time.rb b/test/psych/test_date_time.rb
index 3379bd24bf4c69..79a48e24720e9a 100644
--- a/test/psych/test_date_time.rb
+++ b/test/psych/test_date_time.rb
@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 require_relative 'helper'
-require 'date'
 
 module Psych
   class TestDateTime < TestCase
@@ -86,5 +85,20 @@ def test_alias_with_time
       assert_match('&', yaml)
       assert_match('*', yaml)
     end
+
+    def test_overwritten_to_s
+      pend "Failing on JRuby" if RUBY_PLATFORM =~ /java/
+      s = Psych.dump(Date.new(2023, 9, 2), permitted_classes: [Date])
+      assert_separately(%W[-rpsych -rdate - #{s}], "#{<<~"begin;"}\n#{<<~'end;'}")
+      class Date
+        undef to_s
+        def to_s; strftime("%D"); end
+      end
+      expected = ARGV.shift
+      begin;
+        s = Psych.dump(Date.new(2023, 9, 2), permitted_classes: [Date])
+        assert_equal(expected, s)
+      end;
+    end
   end
 end
diff --git a/test/psych/test_exception.rb b/test/psych/test_exception.rb
index c1e69ab18d7610..6fd92abf9d22d6 100644
--- a/test/psych/test_exception.rb
+++ b/test/psych/test_exception.rb
@@ -82,6 +82,19 @@ def test_load_stream_takes_file
       assert_equal 'omg!', ex.file
     end
 
+    def test_safe_load_stream_takes_file
+      ex = assert_raise(Psych::SyntaxError) do
+        Psych.safe_load_stream '--- `'
+      end
+      assert_nil ex.file
+      assert_match '(<unknown>)', ex.message
+
+      ex = assert_raise(Psych::SyntaxError) do
+        Psych.safe_load_stream '--- `', filename: 'omg!'
+      end
+      assert_equal 'omg!', ex.file
+    end
+
     def test_parse_file_exception
       Tempfile.create(['parsefile', 'yml']) {|t|
         t.binmode
diff --git a/test/psych/test_object_references.rb b/test/psych/test_object_references.rb
index 269d72242e05d7..0498d54eecccff 100644
--- a/test/psych/test_object_references.rb
+++ b/test/psych/test_object_references.rb
@@ -31,6 +31,11 @@ def test_struct_has_references
       assert_reference_trip Struct.new(:foo).new(1)
     end
 
+    def test_data_has_references
+      omit "Data requires ruby >= 3.2" if RUBY_VERSION < "3.2"
+      assert_reference_trip Data.define(:foo).new(1)
+    end
+
     def assert_reference_trip obj
       yml = Psych.dump([obj, obj])
       assert_match(/\*-?\d+/, yml)
@@ -39,7 +44,7 @@ def assert_reference_trip obj
       rescue Psych::DisallowedClass
         data = Psych.unsafe_load yml
       end
-      assert_equal data.first.object_id, data.last.object_id
+      assert_same data.first, data.last
     end
 
     def test_float_references
@@ -49,7 +54,7 @@ def test_float_references
 - *name
       eoyml
       assert_equal data.first, data.last
-      assert_equal data.first.object_id, data.last.object_id
+      assert_same data.first, data.last
     end
 
     def test_binary_references
@@ -60,7 +65,7 @@ def test_binary_references
 - *name
       eoyml
       assert_equal data.first, data.last
-      assert_equal data.first.object_id, data.last.object_id
+      assert_same data.first, data.last
     end
 
     def test_regexp_references
@@ -70,7 +75,7 @@ def test_regexp_references
 - *name
       eoyml
       assert_equal data.first, data.last
-      assert_equal data.first.object_id, data.last.object_id
+      assert_same data.first, data.last
     end
   end
 end
diff --git a/test/psych/test_parser.rb b/test/psych/test_parser.rb
index 3b67a8eab143cc..c1e0abb89d0806 100644
--- a/test/psych/test_parser.rb
+++ b/test/psych/test_parser.rb
@@ -384,6 +384,25 @@ def test_event_location
                      [:end_stream, [2, 0, 2, 0]]], events
     end
 
+    if Psych::Parser.method_defined?(:code_point_limit)
+      def test_code_point_limit
+        yaml = "foo: bar\n" * 500_000
+        assert_raise(org.snakeyaml.engine.v2.exceptions.YamlEngineException) do
+          Psych.load(yaml)
+        end
+
+        assert_nothing_raised do
+          begin
+            old_code_point_limit, Psych::Parser.code_point_limit = Psych::Parser::code_point_limit, 5_000_000
+
+            Psych.load(yaml)
+          ensure
+            Psych::Parser.code_point_limit = old_code_point_limit
+          end
+        end
+      end
+    end
+
     def assert_called call, with = nil, parser = @parser
       if with
         call = parser.handler.calls.find { |x|
diff --git a/test/psych/test_psych.rb b/test/psych/test_psych.rb
index c977e799e3447a..4455c471e7142c 100644
--- a/test/psych/test_psych.rb
+++ b/test/psych/test_psych.rb
@@ -89,6 +89,7 @@ def test_dump_stream
     things = [22, "foo \n", {}]
     stream = Psych.dump_stream(*things)
     assert_equal things, Psych.load_stream(stream)
+    assert_equal things, Psych.safe_load_stream(stream)
   end
 
   def test_dump_file
@@ -119,6 +120,8 @@ def test_libyaml_version
   def test_load_stream
     docs = Psych.load_stream("--- foo\n...\n--- bar\n...")
     assert_equal %w{ foo bar }, docs
+    safe_docs = Psych.safe_load_stream("--- foo\n...\n--- bar\n...")
+    assert_equal %w{ foo bar }, safe_docs
   end
 
   def test_load_stream_freeze
@@ -138,10 +141,18 @@ def test_load_stream_default_fallback
     assert_equal [], Psych.load_stream("")
   end
 
+  def test_safe_load_stream_default_fallback
+    assert_equal [], Psych.safe_load_stream("")
+  end
+
   def test_load_stream_raises_on_bad_input
     assert_raise(Psych::SyntaxError) { Psych.load_stream("--- `") }
   end
 
+  def test_safe_load_stream_raises_on_bad_input
+    assert_raise(Psych::SyntaxError) { Psych.safe_load_stream("--- `") }
+  end
+
   def test_parse_stream
     docs = Psych.parse_stream("--- foo\n...\n--- bar\n...")
     assert_equal(%w[foo bar], docs.children.map(&:transform))
@@ -430,6 +441,32 @@ def test_safe_dump_symbols
     assert_match(/\A--- :foo\n(?:\.\.\.\n)?\z/, Psych.safe_dump(:foo, permitted_symbols: [:foo]))
   end
 
+  def test_safe_dump_stringify_names
+    yaml = <<-eoyml
+---
+foo:
+  bar: bar
+  'no': special escapes
+  123: number
+eoyml
+
+    payload = Psych.safe_dump({
+      foo: {
+        bar: "bar",
+        no: "special escapes",
+        123 => "number"
+      }
+    }, stringify_names: true)
+    assert_equal yaml, payload
+
+    assert_equal("---\nfoo: :bar\n", Psych.safe_dump({foo: :bar}, stringify_names: true, permitted_symbols: [:bar]))
+
+    error = assert_raise Psych::DisallowedClass do
+      Psych.safe_dump({foo: :bar}, stringify_names: true)
+    end
+    assert_equal "Tried to dump unspecified class: Symbol(:bar)", error.message
+  end
+
   def test_safe_dump_aliases
     x = []
     x << x
diff --git a/test/psych/test_psych_set.rb b/test/psych/test_psych_set.rb
new file mode 100644
index 00000000000000..c72cd73f1805cd
--- /dev/null
+++ b/test/psych/test_psych_set.rb
@@ -0,0 +1,57 @@
+# frozen_string_literal: true
+require_relative 'helper'
+
+module Psych
+  class TestPsychSet < TestCase
+    def setup
+      super
+      @set = Psych::Set.new
+      @set['foo'] = 'bar'
+      @set['bar'] = 'baz'
+    end
+
+    def test_dump
+      assert_match(/!set/, Psych.dump(@set))
+    end
+
+    def test_roundtrip
+      assert_cycle(@set)
+    end
+
+    ###
+    # FIXME: Syck should also support !!set as shorthand
+    def test_load_from_yaml
+      loaded = Psych.unsafe_load(<<-eoyml)
+--- !set
+foo: bar
+bar: baz
+      eoyml
+      assert_equal(@set, loaded)
+    end
+
+    def test_loaded_class
+      assert_instance_of(Psych::Set, Psych.unsafe_load(Psych.dump(@set)))
+    end
+
+    def test_set_shorthand
+      loaded = Psych.unsafe_load(<<-eoyml)
+--- !!set
+foo: bar
+bar: baz
+      eoyml
+      assert_instance_of(Psych::Set, loaded)
+    end
+
+    def test_set_self_reference
+      @set['self'] = @set
+      assert_cycle(@set)
+    end
+
+    def test_stringify_names
+      @set[:symbol] = :value
+
+      assert_match(/^:symbol: :value/, Psych.dump(@set))
+      assert_match(/^symbol: :value/, Psych.dump(@set, stringify_names: true))
+    end
+  end
+end
diff --git a/test/psych/test_ractor.rb b/test/psych/test_ractor.rb
index 1b0d8106098b55..f1c8327aa343c0 100644
--- a/test/psych/test_ractor.rb
+++ b/test/psych/test_ractor.rb
@@ -7,7 +7,7 @@ def test_ractor_round_trip
       obj = {foo: [42]}
       obj2 = Ractor.new(obj) do |obj|
         Psych.unsafe_load(Psych.dump(obj))
-      end.take
+      end.value
       assert_equal obj, obj2
     RUBY
   end
@@ -33,7 +33,7 @@ def test_ractor_config
           val * 2
         end
         Psych.load('--- !!omap hello')
-      end.take
+      end.value
       assert_equal 'hellohello', r
       assert_equal 'hello', Psych.load('--- !!omap hello')
     RUBY
@@ -43,7 +43,7 @@ def test_ractor_constants
     assert_ractor(<<~RUBY, require_relative: 'helper')
       r = Ractor.new do
         Psych.libyaml_version.join('.') == Psych::LIBYAML_VERSION
-      end.take
+      end.value
       assert_equal true, r
     RUBY
   end
diff --git a/test/psych/test_safe_load.rb b/test/psych/test_safe_load.rb
index a9ed73752816d2..e6ca1e142b6849 100644
--- a/test/psych/test_safe_load.rb
+++ b/test/psych/test_safe_load.rb
@@ -114,6 +114,38 @@ def test_anon_struct
       end
     end
 
+    D = Data.define(:d) unless RUBY_VERSION < "3.2"
+
+    def test_data_depends_on_sym
+      omit "Data requires ruby >= 3.2" if RUBY_VERSION < "3.2"
+      assert_safe_cycle(D.new(nil), permitted_classes: [D, Symbol])
+      assert_raise(Psych::DisallowedClass) do
+        cycle D.new(nil), permitted_classes: [D]
+      end
+    end
+
+    def test_anon_data
+      omit "Data requires ruby >= 3.2" if RUBY_VERSION < "3.2"
+      assert Psych.safe_load(<<-eoyml, permitted_classes: [Data, Symbol])
+--- !ruby/data
+  foo: bar
+      eoyml
+
+      assert_raise(Psych::DisallowedClass) do
+        Psych.safe_load(<<-eoyml, permitted_classes: [Data])
+--- !ruby/data
+  foo: bar
+        eoyml
+      end
+
+      assert_raise(Psych::DisallowedClass) do
+        Psych.safe_load(<<-eoyml, permitted_classes: [Symbol])
+--- !ruby/data
+  foo: bar
+        eoyml
+      end
+    end
+
     def test_safe_load_default_fallback
       assert_nil Psych.safe_load("")
     end
diff --git a/test/psych/test_scalar_scanner.rb b/test/psych/test_scalar_scanner.rb
index 145db58fd9515b..2637a74df82b31 100644
--- a/test/psych/test_scalar_scanner.rb
+++ b/test/psych/test_scalar_scanner.rb
@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 require_relative 'helper'
-require 'date'
 
 module Psych
   class TestScalarScanner < TestCase
@@ -126,6 +125,19 @@ def test_scan_strings_ending_with_underscores
       assert_equal '100_', ss.tokenize('100_')
     end
 
+    def test_scan_strings_with_legacy_int_delimiters
+      assert_equal '0x_,_', ss.tokenize('0x_,_')
+      assert_equal '+0__,,', ss.tokenize('+0__,,')
+      assert_equal '-0b,_,', ss.tokenize('-0b,_,')
+    end
+
+    def test_scan_strings_with_strict_int_delimiters
+      scanner = Psych::ScalarScanner.new ClassLoader.new, strict_integer: true
+      assert_equal '0x___', scanner.tokenize('0x___')
+      assert_equal '+0____', scanner.tokenize('+0____')
+      assert_equal '-0b___', scanner.tokenize('-0b___')
+    end
+
     def test_scan_int_commas_and_underscores
       # NB: This test is to ensure backward compatibility with prior Psych versions,
       # not to test against any actual YAML specification.
@@ -150,7 +162,7 @@ def test_scan_int_commas_and_underscores
     end
 
     def test_scan_strict_int_commas_and_underscores
-      # this test is to ensure adherance to YML spec using the 'strict_integer' option
+      # this test is to ensure adherence to YML spec using the 'strict_integer' option
       scanner = Psych::ScalarScanner.new ClassLoader.new, strict_integer: true
       assert_equal 123_456_789, scanner.tokenize('123_456_789')
       assert_equal '123,456,789', scanner.tokenize('123,456,789')
diff --git a/test/psych/test_serialize_subclasses.rb b/test/psych/test_serialize_subclasses.rb
index 344c79b3eff969..640c331337dac0 100644
--- a/test/psych/test_serialize_subclasses.rb
+++ b/test/psych/test_serialize_subclasses.rb
@@ -35,5 +35,23 @@ def test_struct_subclass
       so = StructSubclass.new('foo', [1,2,3])
       assert_equal so, Psych.unsafe_load(Psych.dump(so))
     end
+
+    class DataSubclass < Data.define(:foo)
+      def initialize(foo:)
+        @bar = "hello #{foo}"
+        super(foo: foo)
+      end
+
+      def == other
+        super(other) && @bar == other.instance_eval{ @bar }
+      end
+    end unless RUBY_VERSION < "3.2"
+
+    def test_data_subclass
+      omit "Data requires ruby >= 3.2" if RUBY_VERSION < "3.2"
+      so = DataSubclass.new('foo')
+      assert_equal so, Psych.unsafe_load(Psych.dump(so))
+    end
+
   end
 end
diff --git a/test/psych/test_set.rb b/test/psych/test_set.rb
index 87944d839ea09d..ccd591c6263beb 100644
--- a/test/psych/test_set.rb
+++ b/test/psych/test_set.rb
@@ -1,50 +1,36 @@
+# encoding: UTF-8
 # frozen_string_literal: true
 require_relative 'helper'
+require 'set' unless defined?(Set)
 
 module Psych
   class TestSet < TestCase
     def setup
-      super
-      @set = Psych::Set.new
-      @set['foo'] = 'bar'
-      @set['bar'] = 'baz'
+      @set = ::Set.new([1, 2, 3])
     end
 
     def test_dump
-      assert_match(/!set/, Psych.dump(@set))
+      assert_equal <<~YAML, Psych.dump(@set)
+        --- !ruby/object:Set
+        hash:
+          1: true
+          2: true
+          3: true
+      YAML
     end
 
-    def test_roundtrip
-      assert_cycle(@set)
-    end
-
-    ###
-    # FIXME: Syck should also support !!set as shorthand
-    def test_load_from_yaml
-      loaded = Psych.unsafe_load(<<-eoyml)
---- !set
-foo: bar
-bar: baz
-      eoyml
-      assert_equal(@set, loaded)
-    end
-
-    def test_loaded_class
-      assert_instance_of(Psych::Set, Psych.unsafe_load(Psych.dump(@set)))
-    end
-
-    def test_set_shorthand
-      loaded = Psych.unsafe_load(<<-eoyml)
---- !!set
-foo: bar
-bar: baz
-      eoyml
-      assert_instance_of(Psych::Set, loaded)
+    def test_load
+      assert_equal @set, Psych.load(<<~YAML, permitted_classes: [::Set])
+        --- !ruby/object:Set
+        hash:
+          1: true
+          2: true
+          3: true
+      YAML
     end
 
-    def test_set_self_reference
-      @set['self'] = @set
-      assert_cycle(@set)
+    def test_roundtrip
+      assert_equal @set, Psych.load(Psych.dump(@set), permitted_classes: [::Set])
     end
   end
 end
diff --git a/test/psych/test_stream.rb b/test/psych/test_stream.rb
index 9b71c6d9965feb..ae940d1ee4e1dd 100644
--- a/test/psych/test_stream.rb
+++ b/test/psych/test_stream.rb
@@ -54,6 +54,14 @@ def test_load_stream_yields_documents
       assert_equal %w{ foo bar }, list
     end
 
+    def test_safe_load_stream_yields_documents
+      list = []
+      Psych.safe_load_stream("--- foo\n...\n--- bar") do |ruby|
+        list << ruby
+      end
+      assert_equal %w{ foo bar }, list
+    end
+
     def test_load_stream_break
       list = []
       Psych.load_stream("--- foo\n...\n--- `") do |ruby|
diff --git a/test/psych/test_string.rb b/test/psych/test_string.rb
index 0dc34b3083d641..cfd235a5194b97 100644
--- a/test/psych/test_string.rb
+++ b/test/psych/test_string.rb
@@ -17,17 +17,17 @@ def initialize
       end
     end
 
-    # 'y' and 'n' are kind of ambiguous.  Syck treated y and n literals in
+    # 'y', 'Y', 'n', 'N' are kind of ambiguous.  Syck treated those literals in
     # YAML documents as strings.  But this is not what the YAML 1.1 spec says.
     # YAML 1.1 says they should be treated as booleans.  When we're dumping
     # documents, we know it's a string, so adding quotes will eliminate the
     # "ambiguity" in the emitted document
-    def test_y_is_quoted
-      assert_match(/"y"/, Psych.dump("y"))
-    end
 
-    def test_n_is_quoted
-      assert_match(/"n"/, Psych.dump("n"))
+    def test_all_yaml_1_1_booleans_are_quoted
+      yaml_1_1_booleans = %w[y Y yes Yes YES n N no No NO true True TRUE false False FALSE on On ON off Off OFF] # from https://yaml.org/type/bool.html
+      yaml_1_1_booleans.each do |boolean|
+        assert_match(/"#{boolean}"|'#{boolean}'/, Psych.dump(boolean))
+      end
     end
 
     def test_string_with_newline
@@ -50,6 +50,16 @@ def test_doublequotes_when_there_is_a_single
       assert_equal str, Psych.load(yaml)
     end
 
+    def test_single_quote_when_matching_date
+      pend "Failing on JRuby" if RUBY_PLATFORM =~ /java/
+
+      lib = File.expand_path("../../../lib", __FILE__)
+      assert_separately(["-I", lib, "-r", "psych"], __FILE__, __LINE__ + 1, <<~'RUBY')
+        yml = Psych.dump('2024-11-19')
+        assert_equal '2024-11-19', Psych.load(yml)
+      RUBY
+    end
+
     def test_plain_when_shorten_than_line_width_and_no_final_line_break
       str = "Lorem ipsum"
       yaml = Psych.dump str, line_width: 12
diff --git a/test/psych/test_stringio.rb b/test/psych/test_stringio.rb
new file mode 100644
index 00000000000000..7fef1402a0ae95
--- /dev/null
+++ b/test/psych/test_stringio.rb
@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+require_relative 'helper'
+
+module Psych
+  class TestStringIO < TestCase
+    # The superclass of StringIO before Ruby 3.0 was `Data`,
+    # which can interfere with the Ruby 3.2+ `Data` dumping.
+    def test_stringio
+      assert_nothing_raised do
+        Psych.dump(StringIO.new("foo"))
+      end
+    end
+  end
+end
diff --git a/test/psych/test_yaml.rb b/test/psych/test_yaml.rb
index cedec46cc70e5b..134c346c90585d 100644
--- a/test/psych/test_yaml.rb
+++ b/test/psych/test_yaml.rb
@@ -1,14 +1,12 @@
 # -*- coding: us-ascii; mode: ruby; ruby-indent-level: 4; tab-width: 4 -*-
 # frozen_string_literal: true
-#												vim:sw=4:ts=4
-# $Id$
-#
+
 require_relative 'helper'
-require 'ostruct'
 
 # [ruby-core:01946]
 module Psych_Tests
     StructTest = Struct::new( :c )
+    DataTest   = Data.define( :c ) unless RUBY_VERSION < "3.2"
 end
 
 class Psych_Unit_Tests < Psych::TestCase
@@ -17,8 +15,14 @@ def teardown
     end
 
     def test_y_method
-      assert_raise(NoMethodError) do
-        OpenStruct.new.y 1
+      begin
+        require 'ostruct'
+
+        assert_raise(NoMethodError) do
+          OpenStruct.new.y 1
+        end
+      rescue LoadError
+        omit("OpenStruct is not available")
       end
     end
 
@@ -32,34 +36,38 @@ def test_multiline_regexp
         assert_cycle(Regexp.new("foo\nbar"))
     end
 
+    def test_regexp_with_slash
+      assert_cycle(Regexp.new('/'))
+    end
+
     # [ruby-core:34969]
     def test_regexp_with_n
         assert_cycle(Regexp.new('',Regexp::NOENCODING))
     end
-	#
-	# Tests modified from 00basic.t in Psych.pm
-	#
-	def test_basic_map
-		# Simple map
-		assert_parse_only(
-			{ 'one' => 'foo', 'three' => 'baz', 'two' => 'bar' }, <<EOY
+    #
+    # Tests modified from 00basic.t in Psych.pm
+    #
+    def test_basic_map
+        # Simple map
+        assert_parse_only(
+            { 'one' => 'foo', 'three' => 'baz', 'two' => 'bar' }, <<EOY
 one: foo
 two: bar
 three: baz
 EOY
-		)
-	end
-
-	def test_basic_strings
-		# Common string types
-		assert_cycle("x")
-		assert_cycle(":x")
-		assert_cycle(":")
-		assert_parse_only(
-			{ 1 => 'simple string', 2 => 42, 3 => '1 Single Quoted String',
-			  4 => 'Psych\'s Double "Quoted" String', 5 => "A block\n  with several\n    lines.\n",
-			  6 => "A \"chomped\" block", 7 => "A folded\n string\n", 8 => ": started string" },
-			  <<EOY
+        )
+    end
+
+    def test_basic_strings
+        # Common string types
+        assert_cycle("x")
+        assert_cycle(":x")
+        assert_cycle(":")
+        assert_parse_only(
+            { 1 => 'simple string', 2 => 42, 3 => '1 Single Quoted String',
+              4 => 'Psych\'s Double "Quoted" String', 5 => "A block\n  with several\n    lines.\n",
+              6 => "A \"chomped\" block", 7 => "A folded\n string\n", 8 => ": started string" },
+              <<EOY
 1: simple string
 2: 42
 3: '1 Single Quoted String'
@@ -76,44 +84,44 @@ def test_basic_strings
    string
 8: ": started string"
 EOY
-		)
-	end
-
-	#
-	# Test the specification examples
-	# - Many examples have been changes because of whitespace problems that
-	#   caused the two to be inequivalent, or keys to be sorted wrong
-	#
-
-	def test_spec_simple_implicit_sequence
-	  	# Simple implicit sequence
-		assert_to_yaml(
-			[ 'Mark McGwire', 'Sammy Sosa', 'Ken Griffey' ], <<EOY
+        )
+    end
+
+    #
+    # Test the specification examples
+    # - Many examples have been changes because of whitespace problems that
+    #   caused the two to be inequivalent, or keys to be sorted wrong
+    #
+
+    def test_spec_simple_implicit_sequence
+          # Simple implicit sequence
+        assert_to_yaml(
+            [ 'Mark McGwire', 'Sammy Sosa', 'Ken Griffey' ], <<EOY
 - Mark McGwire
 - Sammy Sosa
 - Ken Griffey
 EOY
-		)
-	end
+        )
+    end
 
-	def test_spec_simple_implicit_map
-		# Simple implicit map
-		assert_to_yaml(
-			{ 'hr' => 65, 'avg' => 0.278, 'rbi' => 147 }, <<EOY
+    def test_spec_simple_implicit_map
+        # Simple implicit map
+        assert_to_yaml(
+            { 'hr' => 65, 'avg' => 0.278, 'rbi' => 147 }, <<EOY
 avg: 0.278
 hr: 65
 rbi: 147
 EOY
-		)
-	end
-
-	def test_spec_simple_map_with_nested_sequences
-		# Simple mapping with nested sequences
-		assert_to_yaml(
-			{ 'american' =>
-			  [ 'Boston Red Sox', 'Detroit Tigers', 'New York Yankees' ],
-			  'national' =>
-			  [ 'New York Mets', 'Chicago Cubs', 'Atlanta Braves' ] }, <<EOY
+        )
+    end
+
+    def test_spec_simple_map_with_nested_sequences
+        # Simple mapping with nested sequences
+        assert_to_yaml(
+            { 'american' =>
+              [ 'Boston Red Sox', 'Detroit Tigers', 'New York Yankees' ],
+              'national' =>
+              [ 'New York Mets', 'Chicago Cubs', 'Atlanta Braves' ] }, <<EOY
 american:
   - Boston Red Sox
   - Detroit Tigers
@@ -123,16 +131,16 @@ def test_spec_simple_map_with_nested_sequences
   - Chicago Cubs
   - Atlanta Braves
 EOY
-		)
-	end
-
-	def test_spec_simple_sequence_with_nested_map
-		# Simple sequence with nested map
-		assert_to_yaml(
-		  [
-		    {'name' => 'Mark McGwire', 'hr' => 65, 'avg' => 0.278},
-			{'name' => 'Sammy Sosa', 'hr' => 63, 'avg' => 0.288}
-		  ], <<EOY
+        )
+    end
+
+    def test_spec_simple_sequence_with_nested_map
+        # Simple sequence with nested map
+        assert_to_yaml(
+          [
+            {'name' => 'Mark McGwire', 'hr' => 65, 'avg' => 0.278},
+            {'name' => 'Sammy Sosa', 'hr' => 63, 'avg' => 0.288}
+          ], <<EOY
 -
   avg: 0.278
   hr: 65
@@ -142,38 +150,38 @@ def test_spec_simple_sequence_with_nested_map
   hr: 63
   name: Sammy Sosa
 EOY
-		)
-	end
-
-	def test_spec_sequence_of_sequences
-		# Simple sequence with inline sequences
-		assert_parse_only(
-		  [
-		  	[ 'name', 'hr', 'avg' ],
-			[ 'Mark McGwire', 65, 0.278 ],
-			[ 'Sammy Sosa', 63, 0.288 ]
-		  ], <<EOY
+        )
+    end
+
+    def test_spec_sequence_of_sequences
+        # Simple sequence with inline sequences
+        assert_parse_only(
+          [
+              [ 'name', 'hr', 'avg' ],
+            [ 'Mark McGwire', 65, 0.278 ],
+            [ 'Sammy Sosa', 63, 0.288 ]
+          ], <<EOY
 - [ name         , hr , avg   ]
 - [ Mark McGwire , 65 , 0.278 ]
 - [ Sammy Sosa   , 63 , 0.288 ]
 EOY
-		)
-	end
-
-	def test_spec_mapping_of_mappings
-		# Simple map with inline maps
-		assert_parse_only(
-		  { 'Mark McGwire' =>
-		    { 'hr' => 65, 'avg' => 0.278 },
-			'Sammy Sosa' =>
-		    { 'hr' => 63, 'avg' => 0.288 }
-		  }, <<EOY
+        )
+    end
+
+    def test_spec_mapping_of_mappings
+        # Simple map with inline maps
+        assert_parse_only(
+          { 'Mark McGwire' =>
+            { 'hr' => 65, 'avg' => 0.278 },
+            'Sammy Sosa' =>
+            { 'hr' => 63, 'avg' => 0.288 }
+          }, <<EOY
 Mark McGwire: {hr: 65, avg: 0.278}
 Sammy Sosa:   {hr: 63,
                avg: 0.288}
 EOY
-		)
-	end
+        )
+    end
 
     def test_ambiguous_comments
         # [ruby-talk:88012]
@@ -182,11 +190,11 @@ def test_ambiguous_comments
 EOY
     end
 
-	def test_spec_nested_comments
-		# Map and sequences with comments
-		assert_parse_only(
-		  { 'hr' => [ 'Mark McGwire', 'Sammy Sosa' ],
-		    'rbi' => [ 'Sammy Sosa', 'Ken Griffey' ] }, <<EOY
+    def test_spec_nested_comments
+        # Map and sequences with comments
+        assert_parse_only(
+          { 'hr' => [ 'Mark McGwire', 'Sammy Sosa' ],
+            'rbi' => [ 'Sammy Sosa', 'Ken Griffey' ] }, <<EOY
 hr: # 1998 hr ranking
   - Mark McGwire
   - Sammy Sosa
@@ -195,16 +203,16 @@ def test_spec_nested_comments
   - Sammy Sosa
   - Ken Griffey
 EOY
-		)
-	end
-
-	def test_spec_anchors_and_aliases
-		# Anchors and aliases
-		assert_parse_only(
-			{ 'hr' =>
-			  [ 'Mark McGwire', 'Sammy Sosa' ],
-			  'rbi' =>
-			  [ 'Sammy Sosa', 'Ken Griffey' ] }, <<EOY
+        )
+    end
+
+    def test_spec_anchors_and_aliases
+        # Anchors and aliases
+        assert_parse_only(
+            { 'hr' =>
+              [ 'Mark McGwire', 'Sammy Sosa' ],
+              'rbi' =>
+              [ 'Sammy Sosa', 'Ken Griffey' ] }, <<EOY
 hr:
    - Mark McGwire
    # Name "Sammy Sosa" scalar SS
@@ -214,7 +222,7 @@ def test_spec_anchors_and_aliases
    - *SS
    - Ken Griffey
 EOY
-	 	)
+         )
 
         assert_to_yaml(
             [{"arrival"=>"EDI", "departure"=>"LAX", "fareref"=>"DOGMA", "currency"=>"GBP"}, {"arrival"=>"MEL", "departure"=>"SYD", "fareref"=>"MADF", "currency"=>"AUD"}, {"arrival"=>"MCO", "departure"=>"JFK", "fareref"=>"DFSF", "currency"=>"USD"}], <<EOY
@@ -251,13 +259,13 @@ def test_spec_anchors_and_aliases
 EOY
         )
 
-	end
+    end
 
-	def test_spec_mapping_between_sequences
-		# Complex key #1
-		assert_parse_only(
-			{ [ 'Detroit Tigers', 'Chicago Cubs' ] => [ Date.new( 2001, 7, 23 ) ],
-			  [ 'New York Yankees', 'Atlanta Braves' ] => [ Date.new( 2001, 7, 2 ), Date.new( 2001, 8, 12 ), Date.new( 2001, 8, 14 ) ] }, <<EOY
+    def test_spec_mapping_between_sequences
+        # Complex key #1
+        assert_parse_only(
+            { [ 'Detroit Tigers', 'Chicago Cubs' ] => [ Date.new( 2001, 7, 23 ) ],
+              [ 'New York Yankees', 'Atlanta Braves' ] => [ Date.new( 2001, 7, 2 ), Date.new( 2001, 8, 12 ), Date.new( 2001, 8, 14 ) ] }, <<EOY
 ? # PLAY SCHEDULE
   - Detroit Tigers
   - Chicago Cubs
@@ -269,16 +277,16 @@ def test_spec_mapping_between_sequences
 : [ 2001-07-02, 2001-08-12,
     2001-08-14 ]
 EOY
-		)
-
-		# Complex key #2
-		assert_parse_only(
-		  { [ 'New York Yankees', 'Atlanta Braves' ] =>
-		    [ Date.new( 2001, 7, 2 ), Date.new( 2001, 8, 12 ),
-			  Date.new( 2001, 8, 14 ) ],
-			[ 'Detroit Tigers', 'Chicago Cubs' ] =>
-			[ Date.new( 2001, 7, 23 ) ]
-		  }, <<EOY
+        )
+
+        # Complex key #2
+        assert_parse_only(
+          { [ 'New York Yankees', 'Atlanta Braves' ] =>
+            [ Date.new( 2001, 7, 2 ), Date.new( 2001, 8, 12 ),
+              Date.new( 2001, 8, 14 ) ],
+            [ 'Detroit Tigers', 'Chicago Cubs' ] =>
+            [ Date.new( 2001, 7, 23 ) ]
+          }, <<EOY
 ?
     - New York Yankees
     - Atlanta Braves
@@ -292,17 +300,17 @@ def test_spec_mapping_between_sequences
 :
   - 2001-07-23
 EOY
-		)
-	end
-
-	def test_spec_sequence_key_shortcut
-		# Shortcut sequence map
-		assert_parse_only(
-		  { 'invoice' => 34843, 'date' => Date.new( 2001, 1, 23 ),
-		    'bill-to' => 'Chris Dumars', 'product' =>
-			[ { 'item' => 'Super Hoop', 'quantity' => 1 },
-			  { 'item' => 'Basketball', 'quantity' => 4 },
-			  { 'item' => 'Big Shoes', 'quantity' => 1 } ] }, <<EOY
+        )
+    end
+
+    def test_spec_sequence_key_shortcut
+        # Shortcut sequence map
+        assert_parse_only(
+          { 'invoice' => 34843, 'date' => Date.new( 2001, 1, 23 ),
+            'bill-to' => 'Chris Dumars', 'product' =>
+            [ { 'item' => 'Super Hoop', 'quantity' => 1 },
+              { 'item' => 'Basketball', 'quantity' => 4 },
+              { 'item' => 'Big Shoes', 'quantity' => 1 } ] }, <<EOY
 invoice: 34843
 date   : 2001-01-23
 bill-to: Chris Dumars
@@ -314,8 +322,8 @@ def test_spec_sequence_key_shortcut
   - item    : Big Shoes
     quantity: 1
 EOY
-		)
-	end
+        )
+    end
 
     def test_spec_sequence_in_sequence_shortcut
         # Seq-in-seq
@@ -351,31 +359,31 @@ def test_spec_sequence_shortcuts
 EOY
     end
 
-	def test_spec_single_literal
-		# Literal scalar block
-		assert_parse_only( [ "\\/|\\/|\n/ |  |_\n" ], <<EOY )
+    def test_spec_single_literal
+        # Literal scalar block
+        assert_parse_only( [ "\\/|\\/|\n/ |  |_\n" ], <<EOY )
 - |
     \\/|\\/|
     / |  |_
 EOY
-	end
+    end
 
-	def test_spec_single_folded
-		# Folded scalar block
-		assert_parse_only(
-			[ "Mark McGwire's year was crippled by a knee injury.\n" ], <<EOY
+    def test_spec_single_folded
+        # Folded scalar block
+        assert_parse_only(
+            [ "Mark McGwire's year was crippled by a knee injury.\n" ], <<EOY
 - >
     Mark McGwire\'s
     year was crippled
     by a knee injury.
 EOY
-		)
-	end
+        )
+    end
 
-	def test_spec_preserve_indent
-		# Preserve indented spaces
-		assert_parse_only(
-			"Sammy Sosa completed another fine season with great stats.\n\n  63 Home Runs\n  0.288 Batting Average\n\nWhat a year!\n", <<EOY
+    def test_spec_preserve_indent
+        # Preserve indented spaces
+        assert_parse_only(
+            "Sammy Sosa completed another fine season with great stats.\n\n  63 Home Runs\n  0.288 Batting Average\n\nWhat a year!\n", <<EOY
 --- >
  Sammy Sosa completed another
  fine season with great stats.
@@ -385,13 +393,13 @@ def test_spec_preserve_indent
 
  What a year!
 EOY
-		)
-	end
+        )
+    end
 
-	def test_spec_indentation_determines_scope
-		assert_parse_only(
-			{ 'name' => 'Mark McGwire', 'accomplishment' => "Mark set a major league home run record in 1998.\n",
-			  'stats' => "65 Home Runs\n0.278 Batting Average\n" }, <<EOY
+    def test_spec_indentation_determines_scope
+        assert_parse_only(
+            { 'name' => 'Mark McGwire', 'accomplishment' => "Mark set a major league home run record in 1998.\n",
+              'stats' => "65 Home Runs\n0.278 Batting Average\n" }, <<EOY
 name: Mark McGwire
 accomplishment: >
    Mark set a major league
@@ -400,14 +408,14 @@ def test_spec_indentation_determines_scope
    65 Home Runs
    0.278 Batting Average
 EOY
-		)
-	end
-
-	def test_spec_multiline_scalars
-		# Multiline flow scalars
-	 	assert_parse_only(
-	 		{ 'plain' => 'This unquoted scalar spans many lines.',
-	 		  'quoted' => "So does this quoted scalar.\n" }, <<EOY
+        )
+    end
+
+    def test_spec_multiline_scalars
+        # Multiline flow scalars
+         assert_parse_only(
+             { 'plain' => 'This unquoted scalar spans many lines.',
+               'quoted' => "So does this quoted scalar.\n" }, <<EOY
 plain: This unquoted
        scalar spans
        many lines.
@@ -415,19 +423,19 @@ def test_spec_multiline_scalars
   So does this quoted
   scalar.\\n"
 EOY
-		)
-	end
+        )
+    end
 
-	def test_spec_type_int
-		assert_parse_only(
-			{ 'canonical' => 12345, 'decimal' => 12345, 'octal' => '014'.oct, 'hexadecimal' => '0xC'.hex }, <<EOY
+    def test_spec_type_int
+        assert_parse_only(
+            { 'canonical' => 12345, 'decimal' => 12345, 'octal' => '014'.oct, 'hexadecimal' => '0xC'.hex }, <<EOY
 canonical: 12345
 decimal: +12,345
 octal: 014
 hexadecimal: 0xC
 EOY
-		)
-		assert_parse_only(
+        )
+        assert_parse_only(
             { 'canonical' => 685230, 'decimal' => 685230, 'octal' => 02472256, 'hexadecimal' => 0x0A74AE, 'sexagesimal' => 685230 }, <<EOY)
 canonical: 685230
 decimal: +685,230
@@ -435,48 +443,48 @@ def test_spec_type_int
 hexadecimal: 0x0A,74,AE
 sexagesimal: 190:20:30
 EOY
-	end
+    end
 
-	def test_spec_type_float
-		assert_parse_only(
-			{ 'canonical' => 1230.15, 'exponential' => 1230.15, 'fixed' => 1230.15,
-			  'negative infinity' => -1.0/0.0 }, <<EOY)
+    def test_spec_type_float
+        assert_parse_only(
+            { 'canonical' => 1230.15, 'exponential' => 1230.15, 'fixed' => 1230.15,
+              'negative infinity' => -1.0/0.0 }, <<EOY)
 canonical: 1.23015e+3
 exponential: 12.3015e+02
 fixed: 1,230.15
 negative infinity: -.inf
 EOY
-		nan = Psych::load( <<EOY )
+        nan = Psych::load( <<EOY )
 not a number: .NaN
 EOY
-		assert( nan['not a number'].nan? )
-	end
+        assert( nan['not a number'].nan? )
+    end
 
-	def test_spec_type_misc
-		assert_parse_only(
-			{ nil => nil, true => true, false => false, 'string' => '12345' }, <<EOY
+    def test_spec_type_misc
+        assert_parse_only(
+            { nil => nil, true => true, false => false, 'string' => '12345' }, <<EOY
 null: ~
 true: yes
 false: no
 string: '12345'
 EOY
-		)
-	end
-
-	def test_spec_complex_invoice
-		# Complex invoice type
-		id001 = { 'given' => 'Chris', 'family' => 'Dumars', 'address' =>
-			{ 'lines' => "458 Walkman Dr.\nSuite #292\n", 'city' => 'Royal Oak',
-			  'state' => 'MI', 'postal' => 48046 } }
-		assert_parse_only(
-			{ 'invoice' => 34843, 'date' => Date.new( 2001, 1, 23 ),
-			  'bill-to' => id001, 'ship-to' => id001, 'product' =>
-			  [ { 'sku' => 'BL394D', 'quantity' => 4,
-			      'description' => 'Basketball', 'price' => 450.00 },
-				{ 'sku' => 'BL4438H', 'quantity' => 1,
-				  'description' => 'Super Hoop', 'price' => 2392.00 } ],
-			  'tax' => 251.42, 'total' => 4443.52,
-			  'comments' => "Late afternoon is best. Backup contact is Nancy Billsmer @ 338-4338.\n" }, <<EOY
+        )
+    end
+
+    def test_spec_complex_invoice
+        # Complex invoice type
+        id001 = { 'given' => 'Chris', 'family' => 'Dumars', 'address' =>
+            { 'lines' => "458 Walkman Dr.\nSuite #292\n", 'city' => 'Royal Oak',
+              'state' => 'MI', 'postal' => 48046 } }
+        assert_parse_only(
+            { 'invoice' => 34843, 'date' => Date.new( 2001, 1, 23 ),
+              'bill-to' => id001, 'ship-to' => id001, 'product' =>
+              [ { 'sku' => 'BL394D', 'quantity' => 4,
+                  'description' => 'Basketball', 'price' => 450.00 },
+                { 'sku' => 'BL4438H', 'quantity' => 1,
+                  'description' => 'Super Hoop', 'price' => 2392.00 } ],
+              'tax' => 251.42, 'total' => 4443.52,
+              'comments' => "Late afternoon is best. Backup contact is Nancy Billsmer @ 338-4338.\n" }, <<EOY
 invoice: 34843
 date   : 2001-01-23
 bill-to: &id001
@@ -507,12 +515,12 @@ def test_spec_complex_invoice
     Backup contact is Nancy
     Billsmer @ 338-4338.
 EOY
-		)
-	end
+        )
+    end
 
-	def test_spec_log_file
-		doc_ct = 0
-		Psych::load_stream( <<EOY
+    def test_spec_log_file
+        doc_ct = 0
+        Psych::load_stream( <<EOY
 ---
 Time: 2001-11-23 15:01:42 -05:00
 User: ed
@@ -540,52 +548,52 @@ def test_spec_log_file
     code: |-
       foo = bar
 EOY
-		) { |doc|
-			case doc_ct
-				when 0
-					assert_equal( doc, { 'Time' => mktime( 2001, 11, 23, 15, 01, 42, 00, "-05:00" ),
-						'User' => 'ed', 'Warning' => "This is an error message for the log file\n" } )
-				when 1
-					assert_equal( doc, { 'Time' => mktime( 2001, 11, 23, 15, 02, 31, 00, "-05:00" ),
-						'User' => 'ed', 'Warning' => "A slightly different error message.\n" } )
-				when 2
-					assert_equal( doc, { 'Date' => mktime( 2001, 11, 23, 15, 03, 17, 00, "-05:00" ),
-						'User' => 'ed', 'Fatal' => "Unknown variable \"bar\"\n",
-						'Stack' => [
-							{ 'file' => 'TopClass.py', 'line' => 23, 'code' => "x = MoreObject(\"345\\n\")\n" },
-							{ 'file' => 'MoreClass.py', 'line' => 58, 'code' => "foo = bar" } ] } )
-			end
-			doc_ct += 1
-		}
-		assert_equal( doc_ct, 3 )
-	end
-
-	def test_spec_root_fold
-		y = Psych::load( <<EOY
+        ) { |doc|
+            case doc_ct
+                when 0
+                    assert_equal( doc, { 'Time' => mktime( 2001, 11, 23, 15, 01, 42, 00, "-05:00" ),
+                        'User' => 'ed', 'Warning' => "This is an error message for the log file\n" } )
+                when 1
+                    assert_equal( doc, { 'Time' => mktime( 2001, 11, 23, 15, 02, 31, 00, "-05:00" ),
+                        'User' => 'ed', 'Warning' => "A slightly different error message.\n" } )
+                when 2
+                    assert_equal( doc, { 'Date' => mktime( 2001, 11, 23, 15, 03, 17, 00, "-05:00" ),
+                        'User' => 'ed', 'Fatal' => "Unknown variable \"bar\"\n",
+                        'Stack' => [
+                            { 'file' => 'TopClass.py', 'line' => 23, 'code' => "x = MoreObject(\"345\\n\")\n" },
+                            { 'file' => 'MoreClass.py', 'line' => 58, 'code' => "foo = bar" } ] } )
+            end
+            doc_ct += 1
+        }
+        assert_equal( doc_ct, 3 )
+    end
+
+    def test_spec_root_fold
+        y = Psych::load( <<EOY
 ---
 This Psych stream contains a single text value.
 The next stream is a log file - a sequence of
 log entries. Adding an entry to the log is a
 simple matter of appending it at the end.
 EOY
-		)
-		assert_equal( y, "This Psych stream contains a single text value. The next stream is a log file - a sequence of log entries. Adding an entry to the log is a simple matter of appending it at the end." )
-	end
+        )
+        assert_equal( y, "This Psych stream contains a single text value. The next stream is a log file - a sequence of log entries. Adding an entry to the log is a simple matter of appending it at the end." )
+    end
 
-	def test_spec_root_mapping
-		y = Psych::unsafe_load( <<EOY
+    def test_spec_root_mapping
+        y = Psych::unsafe_load( <<EOY
 # This stream is an example of a top-level mapping.
 invoice : 34843
 date    : 2001-01-23
 total   : 4443.52
 EOY
-		)
-		assert_equal( y, { 'invoice' => 34843, 'date' => Date.new( 2001, 1, 23 ), 'total' => 4443.52 } )
-	end
+        )
+        assert_equal( y, { 'invoice' => 34843, 'date' => Date.new( 2001, 1, 23 ), 'total' => 4443.52 } )
+    end
 
-	def test_spec_oneline_docs
-		doc_ct = 0
-		Psych::load_stream( <<EOY
+    def test_spec_oneline_docs
+        doc_ct = 0
+        Psych::load_stream( <<EOY
 # The following is a sequence of three documents.
 # The first contains an empty mapping, the second
 # an empty sequence, and the last an empty string.
@@ -593,21 +601,21 @@ def test_spec_oneline_docs
 --- [ ]
 --- ''
 EOY
-		) { |doc|
-			case doc_ct
-				when 0
-					assert_equal( doc, {} )
-				when 1
-					assert_equal( doc, [] )
-				when 2
-					assert_equal( doc, '' )
-			end
-			doc_ct += 1
-		}
-		assert_equal( doc_ct, 3 )
-	end
-
-	def test_spec_domain_prefix
+        ) { |doc|
+            case doc_ct
+                when 0
+                    assert_equal( doc, {} )
+                when 1
+                    assert_equal( doc, [] )
+                when 2
+                    assert_equal( doc, '' )
+            end
+            doc_ct += 1
+        }
+        assert_equal( doc_ct, 3 )
+    end
+
+    def test_spec_domain_prefix
         customer_proc = proc { |type, val|
             if Hash === val
                 _, _, type = type.split( ':', 3 )
@@ -619,7 +627,7 @@ def test_spec_domain_prefix
         }
         Psych.add_domain_type( "domain.tld/2002", 'invoice', &customer_proc )
         Psych.add_domain_type( "domain.tld/2002", 'customer', &customer_proc )
-		assert_parse_only( { "invoice"=> { "customers"=> [ { "given"=>"Chris", "type"=>"domain customer", "family"=>"Dumars" } ], "type"=>"domain invoice" } }, <<EOY
+        assert_parse_only( { "invoice"=> { "customers"=> [ { "given"=>"Chris", "type"=>"domain customer", "family"=>"Dumars" } ], "type"=>"domain invoice" } }, <<EOY
 # 'http://domain.tld,2002/invoice' is some type family.
 invoice: !domain.tld/2002:invoice
   # 'seq' is shorthand for 'http://yaml.org/seq'.
@@ -632,12 +640,12 @@ def test_spec_domain_prefix
       given : Chris
       family : Dumars
 EOY
-		)
-	end
+        )
+    end
 
-	def test_spec_throwaway
-		assert_parse_only(
-			{"this"=>"contains three lines of text.\nThe third one starts with a\n# character. This isn't a comment.\n"}, <<EOY
+    def test_spec_throwaway
+        assert_parse_only(
+            {"this"=>"contains three lines of text.\nThe third one starts with a\n# character. This isn't a comment.\n"}, <<EOY
 ### These are four throwaway comment  ###
 
 ### lines (the second line is empty). ###
@@ -649,19 +657,19 @@ def test_spec_throwaway
 # These are three throwaway comment
 # lines (the first line is empty).
 EOY
-		)
-	end
+        )
+    end
 
-	def test_spec_force_implicit
-		# Force implicit
-		assert_parse_only(
-			{ 'integer' => 12, 'also int' => 12, 'string' => '12' }, <<EOY
+    def test_spec_force_implicit
+        # Force implicit
+        assert_parse_only(
+            { 'integer' => 12, 'also int' => 12, 'string' => '12' }, <<EOY
 integer: 12
 also int: ! "12"
 string: !str 12
 EOY
-		)
-	end
+        )
+    end
 
     ###
     # Commenting out this test.  This line:
@@ -672,44 +680,44 @@ def test_spec_force_implicit
     #
     #   http://yaml.org/spec/1.1/#id896876
     #
-#	def test_spec_url_escaping
-#		Psych.add_domain_type( "domain.tld,2002", "type0" ) { |type, val|
-#			"ONE: #{val}"
-#		}
-#		Psych.add_domain_type( "domain.tld,2002", "type%30" ) { |type, val|
-#			"TWO: #{val}"
-#		}
-#		assert_parse_only(
-#			{ 'same' => [ 'ONE: value', 'ONE: value' ], 'different' => [ 'TWO: value' ] }, <<EOY
+#    def test_spec_url_escaping
+#        Psych.add_domain_type( "domain.tld,2002", "type0" ) { |type, val|
+#            "ONE: #{val}"
+#        }
+#        Psych.add_domain_type( "domain.tld,2002", "type%30" ) { |type, val|
+#            "TWO: #{val}"
+#        }
+#        assert_parse_only(
+#            { 'same' => [ 'ONE: value', 'ONE: value' ], 'different' => [ 'TWO: value' ] }, <<EOY
 #same:
 #  - !domain.tld,2002/type\\x30 value
 #  - !domain.tld,2002/type0 value
 #different: # As far as the Psych parser is concerned
 #  - !domain.tld,2002/type%30 value
 #EOY
-#		)
-#	end
-
-	def test_spec_override_anchor
-		# Override anchor
-		a001 = "The alias node below is a repeated use of this value.\n"
-		assert_parse_only(
-			{ 'anchor' => 'This scalar has an anchor.', 'override' => a001, 'alias' => a001 }, <<EOY
+#        )
+#    end
+
+    def test_spec_override_anchor
+        # Override anchor
+        a001 = "The alias node below is a repeated use of this value.\n"
+        assert_parse_only(
+            { 'anchor' => 'This scalar has an anchor.', 'override' => a001, 'alias' => a001 }, <<EOY
 anchor : &A001 This scalar has an anchor.
 override : &A001 >
  The alias node below is a
  repeated use of this value.
 alias : *A001
 EOY
-		)
-	end
+        )
+    end
 
-	def test_spec_explicit_families
+    def test_spec_explicit_families
         Psych.add_domain_type( "somewhere.com/2002", 'type' ) { |type, val|
             "SOMEWHERE: #{val}"
         }
-		assert_parse_only(
-			{ 'not-date' => '2002-04-28', 'picture' => "GIF89a\f\000\f\000\204\000\000\377\377\367\365\365\356\351\351\345fff\000\000\000\347\347\347^^^\363\363\355\216\216\216\340\340\340\237\237\237\223\223\223\247\247\247\236\236\236i^\020' \202\n\001\000;", 'hmm' => "SOMEWHERE: family above is short for\nhttp://somewhere.com/type\n" }, <<EOY
+        assert_parse_only(
+            { 'not-date' => '2002-04-28', 'picture' => "GIF89a\f\000\f\000\204\000\000\377\377\367\365\365\356\351\351\345fff\000\000\000\347\347\347^^^\363\363\355\216\216\216\340\340\340\237\237\237\223\223\223\247\247\247\236\236\236i^\020' \202\n\001\000;", 'hmm' => "SOMEWHERE: family above is short for\nhttp://somewhere.com/type\n" }, <<EOY
 not-date: !str 2002-04-28
 picture: !binary |
  R0lGODlhDAAMAIQAAP//9/X
@@ -721,34 +729,34 @@ def test_spec_explicit_families
  family above is short for
  http://somewhere.com/type
 EOY
-		)
-	end
-
-	def test_spec_application_family
-		# Testing the clarkevans.com graphs
-		Psych.add_domain_type( "clarkevans.com/2002", 'graph/shape' ) { |type, val|
-			if Array === val
-				val << "Shape Container"
-				val
-			else
-				raise ArgumentError, "Invalid graph of type #{val.class}: " + val.inspect
-			end
-		}
-		one_shape_proc = Proc.new { |type, val|
-			if Hash === val
+        )
+    end
+
+    def test_spec_application_family
+        # Testing the clarkevans.com graphs
+        Psych.add_domain_type( "clarkevans.com/2002", 'graph/shape' ) { |type, val|
+            if Array === val
+                val << "Shape Container"
+                val
+            else
+                raise ArgumentError, "Invalid graph of type #{val.class}: " + val.inspect
+            end
+        }
+        one_shape_proc = Proc.new { |type, val|
+            if Hash === val
                 type = type.split( /:/ )
-				val['TYPE'] = "Shape: #{type[2]}"
-				val
-			else
-				raise ArgumentError, "Invalid graph of type #{val.class}: " + val.inspect
-			end
-		}
-		Psych.add_domain_type( "clarkevans.com/2002", 'graph/circle', &one_shape_proc )
-		Psych.add_domain_type( "clarkevans.com/2002", 'graph/line', &one_shape_proc )
-		Psych.add_domain_type( "clarkevans.com/2002", 'graph/text', &one_shape_proc )
+                val['TYPE'] = "Shape: #{type[2]}"
+                val
+            else
+                raise ArgumentError, "Invalid graph of type #{val.class}: " + val.inspect
+            end
+        }
+        Psych.add_domain_type( "clarkevans.com/2002", 'graph/circle', &one_shape_proc )
+        Psych.add_domain_type( "clarkevans.com/2002", 'graph/line', &one_shape_proc )
+        Psych.add_domain_type( "clarkevans.com/2002", 'graph/text', &one_shape_proc )
         # MODIFIED to remove invalid Psych
-		assert_parse_only(
-			[[{"radius"=>7, "center"=>{"x"=>73, "y"=>129}, "TYPE"=>"Shape: graph/circle"}, {"finish"=>{"x"=>89, "y"=>102}, "TYPE"=>"Shape: graph/line", "start"=>{"x"=>73, "y"=>129}}, {"TYPE"=>"Shape: graph/text", "value"=>"Pretty vector drawing.", "start"=>{"x"=>73, "y"=>129}, "color"=>16772795}, "Shape Container"]], <<EOY
+        assert_parse_only(
+            [[{"radius"=>7, "center"=>{"x"=>73, "y"=>129}, "TYPE"=>"Shape: graph/circle"}, {"finish"=>{"x"=>89, "y"=>102}, "TYPE"=>"Shape: graph/line", "start"=>{"x"=>73, "y"=>129}}, {"TYPE"=>"Shape: graph/text", "value"=>"Pretty vector drawing.", "start"=>{"x"=>73, "y"=>129}, "color"=>16772795}, "Shape Container"]], <<EOY
 - !clarkevans.com/2002:graph/shape
   - !/graph/circle
     center: &ORIGIN {x: 73, y: 129}
@@ -761,12 +769,12 @@ def test_spec_application_family
     color: 0xFFEEBB
     value: Pretty vector drawing.
 EOY
-		)
-	end
+        )
+    end
 
-	def test_spec_float_explicit
-		assert_parse_only(
-			[ 10.0, 10.0, 10.0, 10.0 ], <<EOY
+    def test_spec_float_explicit
+        assert_parse_only(
+            [ 10.0, 10.0, 10.0, 10.0 ], <<EOY
 # All entries in the sequence
 # have the same type and value.
 - 10.0
@@ -776,15 +784,15 @@ def test_spec_float_explicit
   1\\
   0"
 EOY
-		)
-	end
-
-	def test_spec_builtin_seq
-		# Assortment of sequences
-		assert_parse_only(
-			{ 'empty' => [], 'in-line' => [ 'one', 'two', 'three', 'four', 'five' ],
-			  'nested' => [ 'First item in top sequence', [ 'Subordinate sequence entry' ],
-			  	"A multi-line sequence entry\n", 'Sixth item in top sequence' ] }, <<EOY
+        )
+    end
+
+    def test_spec_builtin_seq
+        # Assortment of sequences
+        assert_parse_only(
+            { 'empty' => [], 'in-line' => [ 'one', 'two', 'three', 'four', 'five' ],
+              'nested' => [ 'First item in top sequence', [ 'Subordinate sequence entry' ],
+                  "A multi-line sequence entry\n", 'Sixth item in top sequence' ] }, <<EOY
 empty: []
 in-line: [ one, two, three # May span lines,
          , four,           # indentation is
@@ -798,24 +806,24 @@ def test_spec_builtin_seq
    sequence entry
  - Sixth item in top sequence
 EOY
-		)
-	end
-
-	def test_spec_builtin_map
-		# Assortment of mappings
-		assert_parse_only(
-			{ 'empty' => {}, 'in-line' => { 'one' => 1, 'two' => 2 },
-			  'spanning' => { 'one' => 1, 'two' => 2 },
-			  'nested' => { 'first' => 'First entry', 'second' =>
-			  	{ 'key' => 'Subordinate mapping' }, 'third' =>
-				  [ 'Subordinate sequence', {}, 'Previous mapping is empty.',
-					{ 'A key' => 'value pair in a sequence.', 'A second' => 'key:value pair.' },
-					'The previous entry is equal to the following one.',
-					{ 'A key' => 'value pair in a sequence.', 'A second' => 'key:value pair.' } ],
-				  12.0 => 'This key is a float.', "?\n" => 'This key had to be protected.',
-				  "\a" => 'This key had to be escaped.',
-				  "This is a multi-line folded key\n" => "Whose value is also multi-line.\n",
-				  [ 'This key', 'is a sequence' ] => [ 'With a sequence value.' ] } }, <<EOY
+        )
+    end
+
+    def test_spec_builtin_map
+        # Assortment of mappings
+        assert_parse_only(
+            { 'empty' => {}, 'in-line' => { 'one' => 1, 'two' => 2 },
+              'spanning' => { 'one' => 1, 'two' => 2 },
+              'nested' => { 'first' => 'First entry', 'second' =>
+                  { 'key' => 'Subordinate mapping' }, 'third' =>
+                  [ 'Subordinate sequence', {}, 'Previous mapping is empty.',
+                    { 'A key' => 'value pair in a sequence.', 'A second' => 'key:value pair.' },
+                    'The previous entry is equal to the following one.',
+                    { 'A key' => 'value pair in a sequence.', 'A second' => 'key:value pair.' } ],
+                  12.0 => 'This key is a float.', "?\n" => 'This key had to be protected.',
+                  "\a" => 'This key had to be escaped.',
+                  "This is a multi-line folded key\n" => "Whose value is also multi-line.\n",
+                  [ 'This key', 'is a sequence' ] => [ 'With a sequence value.' ] } }, <<EOY
 
 empty: {}
 in-line: { one: 1, two: 2 }
@@ -860,13 +868,13 @@ def test_spec_builtin_map
 # :
 #  with a: mapping value.
 EOY
-		)
-	end
+        )
+    end
 
-	def test_spec_builtin_literal_blocks
-		# Assortment of literal scalar blocks
-		assert_parse_only(
-			{"both are equal to"=>"  This has no newline.", "is equal to"=>"The \\ ' \" characters may be\nfreely used. Leading white\n   space is significant.\n\nLine breaks are significant.\nThus this value contains one\nempty line and ends with a\nsingle line break, but does\nnot start with one.\n", "also written as"=>"  This has no newline.", "indented and chomped"=>"  This has no newline.", "empty"=>"", "literal"=>"The \\ ' \" characters may be\nfreely used. Leading white\n   space is significant.\n\nLine breaks are significant.\nThus this value contains one\nempty line and ends with a\nsingle line break, but does\nnot start with one.\n"}, <<EOY
+    def test_spec_builtin_literal_blocks
+        # Assortment of literal scalar blocks
+        assert_parse_only(
+            {"both are equal to"=>"  This has no newline.", "is equal to"=>"The \\ ' \" characters may be\nfreely used. Leading white\n   space is significant.\n\nLine breaks are significant.\nThus this value contains one\nempty line and ends with a\nsingle line break, but does\nnot start with one.\n", "also written as"=>"  This has no newline.", "indented and chomped"=>"  This has no newline.", "empty"=>"", "literal"=>"The \\ ' \" characters may be\nfreely used. Leading white\n   space is significant.\n\nLine breaks are significant.\nThus this value contains one\nempty line and ends with a\nsingle line break, but does\nnot start with one.\n"}, <<EOY
 empty: |
 
 literal: |
@@ -900,15 +908,15 @@ def test_spec_builtin_literal_blocks
 
 both are equal to: "  This has no newline."
 EOY
-		)
-
-		str1 = "This has one newline.\n"
-		str2 = "This has no newline."
-		str3 = "This has two newlines.\n\n"
-		assert_parse_only(
-			{ 'clipped' => str1, 'same as "clipped" above' => str1,
-			  'stripped' => str2, 'same as "stripped" above' => str2,
-			  'kept' => str3, 'same as "kept" above' => str3 }, <<EOY
+        )
+
+        str1 = "This has one newline.\n"
+        str2 = "This has no newline."
+        str3 = "This has two newlines.\n\n"
+        assert_parse_only(
+            { 'clipped' => str1, 'same as "clipped" above' => str1,
+              'stripped' => str2, 'same as "stripped" above' => str2,
+              'kept' => str3, 'same as "kept" above' => str3 }, <<EOY
 clipped: |
     This has one newline.
 
@@ -925,11 +933,11 @@ def test_spec_builtin_literal_blocks
 same as "kept" above: "This has two newlines.\\n\\n"
 
 EOY
-		)
-	end
+        )
+    end
 
-	def test_spec_span_single_quote
-		assert_parse_only( {"third"=>"a single quote ' must be escaped.", "second"=>"! : \\ etc. can be used freely.", "is same as"=>"this contains six spaces\nand one line break", "empty"=>"", "span"=>"this contains six spaces\nand one line break"}, <<EOY
+    def test_spec_span_single_quote
+        assert_parse_only( {"third"=>"a single quote ' must be escaped.", "second"=>"! : \\ etc. can be used freely.", "is same as"=>"this contains six spaces\nand one line break", "empty"=>"", "span"=>"this contains six spaces\nand one line break"}, <<EOY
 empty: ''
 second: '! : \\ etc. can be used freely.'
 third: 'a single quote '' must be escaped.'
@@ -940,11 +948,11 @@ def test_spec_span_single_quote
       line break'
 is same as: "this contains six spaces\\nand one line break"
 EOY
-		)
-	end
+        )
+    end
 
-	def test_spec_span_double_quote
-		assert_parse_only( {"is equal to"=>"this contains four  spaces", "third"=>"a \" or a \\ must be escaped.", "second"=>"! : etc. can be used freely.", "empty"=>"", "fourth"=>"this value ends with an LF.\n", "span"=>"this contains four  spaces"}, <<EOY
+    def test_spec_span_double_quote
+        assert_parse_only( {"is equal to"=>"this contains four  spaces", "third"=>"a \" or a \\ must be escaped.", "second"=>"! : etc. can be used freely.", "empty"=>"", "fourth"=>"this value ends with an LF.\n", "span"=>"this contains four  spaces"}, <<EOY
 empty: ""
 second: "! : etc. can be used freely."
 third: "a \\\" or a \\\\ must be escaped."
@@ -954,29 +962,29 @@ def test_spec_span_double_quote
       spaces"
 is equal to: "this contains four  spaces"
 EOY
-		)
-	end
-
-	def test_spec_builtin_time
-		# Time
-		assert_parse_only(
-			{ "space separated" => mktime( 2001, 12, 14, 21, 59, 43, ".10", "-05:00" ),
-			  "canonical" => mktime( 2001, 12, 15, 2, 59, 43, ".10" ),
-			  "date (noon UTC)" => Date.new( 2002, 12, 14),
-			  "valid iso8601" => mktime( 2001, 12, 14, 21, 59, 43, ".10", "-05:00" ) }, <<EOY
+        )
+    end
+
+    def test_spec_builtin_time
+        # Time
+        assert_parse_only(
+            { "space separated" => mktime( 2001, 12, 14, 21, 59, 43, ".10", "-05:00" ),
+              "canonical" => mktime( 2001, 12, 15, 2, 59, 43, ".10" ),
+              "date (noon UTC)" => Date.new( 2002, 12, 14),
+              "valid iso8601" => mktime( 2001, 12, 14, 21, 59, 43, ".10", "-05:00" ) }, <<EOY
 canonical: 2001-12-15T02:59:43.1Z
 valid iso8601: 2001-12-14t21:59:43.10-05:00
 space separated: 2001-12-14 21:59:43.10 -05:00
 date (noon UTC): 2002-12-14
 EOY
-		)
-	end
-
-	def test_spec_builtin_binary
-		arrow_gif = "GIF89a\f\000\f\000\204\000\000\377\377\367\365\365\356\351\351\345fff\000\000\000\347\347\347^^^\363\363\355\216\216\216\340\340\340\237\237\237\223\223\223\247\247\247\236\236\236iiiccc\243\243\243\204\204\204\377\376\371\377\376\371\377\376\371\377\376\371\377\376\371\377\376\371\377\376\371\377\376\371\377\376\371\377\376\371\377\376\371\377\376\371\377\376\371\377\376\371!\376\016Made with GIMP\000,\000\000\000\000\f\000\f\000\000\005,  \216\2010\236\343@\024\350i\020\304\321\212\010\034\317\200M$z\357\3770\205p\270\2601f\r\e\316\001\303\001\036\020' \202\n\001\000;"
-		assert_parse_only(
-			{ 'canonical' => arrow_gif, 'base64' => arrow_gif,
-			  'description' => "The binary value above is a tiny arrow encoded as a gif image.\n" }, <<EOY
+        )
+    end
+
+    def test_spec_builtin_binary
+        arrow_gif = "GIF89a\f\000\f\000\204\000\000\377\377\367\365\365\356\351\351\345fff\000\000\000\347\347\347^^^\363\363\355\216\216\216\340\340\340\237\237\237\223\223\223\247\247\247\236\236\236iiiccc\243\243\243\204\204\204\377\376\371\377\376\371\377\376\371\377\376\371\377\376\371\377\376\371\377\376\371\377\376\371\377\376\371\377\376\371\377\376\371\377\376\371\377\376\371\377\376\371!\376\016Made with GIMP\000,\000\000\000\000\f\000\f\000\000\005,  \216\2010\236\343@\024\350i\020\304\321\212\010\034\317\200M$z\357\3770\205p\270\2601f\r\e\316\001\303\001\036\020' \202\n\001\000;"
+        assert_parse_only(
+            { 'canonical' => arrow_gif, 'base64' => arrow_gif,
+              'description' => "The binary value above is a tiny arrow encoded as a gif image.\n" }, <<EOY
 canonical: !binary "\\
  R0lGODlhDAAMAIQAAP//9/X17unp5WZmZgAAAOf\\
  n515eXvPz7Y6OjuDg4J+fn5OTk6enp56enmlpaW\\
@@ -997,19 +1005,19 @@ def test_spec_builtin_binary
  The binary value above is a tiny arrow
  encoded as a gif image.
 EOY
-		)
-	end
-	def test_ruby_regexp
-		# Test Ruby regular expressions
-		assert_to_yaml(
-			{ 'simple' => /a.b/, 'complex' => %r'\A"((?:[^"]|\")+)"',
-			  'case-insensitive' => /George McFly/i }, <<EOY
+        )
+    end
+    def test_ruby_regexp
+        # Test Ruby regular expressions
+        assert_to_yaml(
+            { 'simple' => /a.b/, 'complex' => %r'\A"((?:[^"]|\")+)"',
+              'case-insensitive' => /George McFly/i }, <<EOY
 case-insensitive: !ruby/regexp "/George McFly/i"
 complex: !ruby/regexp "/\\\\A\\"((?:[^\\"]|\\\\\\")+)\\"/"
 simple: !ruby/regexp "/a.b/"
 EOY
-		)
-	end
+        )
+    end
 
     #
     # Test of Ranges
@@ -1033,15 +1041,14 @@ 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(
-			[ book_struct.new( "Yukihiro Matsumoto", "Ruby in a Nutshell", 2002, "0-596-00214-9" ),
-			  book_struct.new( [ 'Dave Thomas', 'Andy Hunt' ], "The Pickaxe", 2002,
-				book_struct.new( "This should be the ISBN", "but I have another struct here", 2002, "None" )
-			  ) ], <<EOY
+    def test_ruby_struct
+        # Ruby structures
+        book_struct = Struct::new( "MyBookStruct", :author, :title, :year, :isbn )
+        assert_to_yaml(
+            [ book_struct.new( "Yukihiro Matsumoto", "Ruby in a Nutshell", 2002, "0-596-00214-9" ),
+              book_struct.new( [ 'Dave Thomas', 'Andy Hunt' ], "The Pickaxe", 2002,
+                book_struct.new( "This should be the ISBN", "but I have another struct here", 2002, "None" )
+              ) ], <<EOY
 - !ruby/struct:MyBookStruct
   author: Yukihiro Matsumoto
   title: Ruby in a Nutshell
@@ -1059,64 +1066,105 @@ def test_ruby_struct
     year: 2002
     isbn: None
 EOY
-		)
+        )
 
         assert_to_yaml( Psych_Tests::StructTest.new( 123 ), <<EOY )
 --- !ruby/struct:Psych_Tests::StructTest
 c: 123
 EOY
 
-	end
+    ensure
+        Struct.__send__(:remove_const, :MyBookStruct) if book_struct
+    end
+
+    def test_ruby_data
+        omit "Data requires ruby >= 3.2" if RUBY_VERSION < "3.2"
+        # Ruby Data value objects
+        book_class = Data.define(:author, :title, :year, :isbn)
+        Object.const_set(:MyBookData, book_class)
+        assert_to_yaml(
+            [ book_class.new( "Yukihiro Matsumoto", "Ruby in a Nutshell", 2002, "0-596-00214-9" ),
+              book_class.new( [ 'Dave Thomas', 'Andy Hunt' ], "The Pickaxe", 2002,
+                book_class.new( "This should be the ISBN", "but I have more data here", 2002, "None" )
+              )
+            ], <<EOY
+- !ruby/data:MyBookData
+  author: Yukihiro Matsumoto
+  title: Ruby in a Nutshell
+  year: 2002
+  isbn: 0-596-00214-9
+- !ruby/data:MyBookData
+  author:
+    - Dave Thomas
+    - Andy Hunt
+  title: The Pickaxe
+  year: 2002
+  isbn: !ruby/data:MyBookData
+    author: This should be the ISBN
+    title: but I have more data here
+    year: 2002
+    isbn: None
+EOY
+        )
+
+        assert_to_yaml( Psych_Tests::DataTest.new( 123 ), <<EOY )
+--- !ruby/data:Psych_Tests::DataTest
+c: 123
+EOY
+
+    ensure
+        Object.__send__(:remove_const, :MyBookData) if book_class
+    end
 
-	def test_ruby_rational
-		assert_to_yaml( Rational(1, 2), <<EOY )
+    def test_ruby_rational
+        assert_to_yaml( Rational(1, 2), <<EOY )
 --- !ruby/object:Rational
 numerator: 1
 denominator: 2
 EOY
 
-		# Read Psych dumped by the ruby 1.8.3.
-		assert_to_yaml( Rational(1, 2), "!ruby/object:Rational 1/2\n" )
-		assert_raise( ArgumentError ) { Psych.unsafe_load("!ruby/object:Rational INVALID/RATIONAL\n") }
-	end
+        # Read Psych dumped by the ruby 1.8.3.
+        assert_to_yaml( Rational(1, 2), "!ruby/object:Rational 1/2\n" )
+        assert_raise( ArgumentError ) { Psych.unsafe_load("!ruby/object:Rational INVALID/RATIONAL\n") }
+    end
 
-	def test_ruby_complex
-		assert_to_yaml( Complex(3, 4), <<EOY )
+    def test_ruby_complex
+        assert_to_yaml( Complex(3, 4), <<EOY )
 --- !ruby/object:Complex
 image: 4
 real: 3
 EOY
 
-		# Read Psych dumped by the ruby 1.8.3.
-		assert_to_yaml( Complex(3, 4), "!ruby/object:Complex 3+4i\n" )
-		assert_raise( ArgumentError ) { Psych.unsafe_load("!ruby/object:Complex INVALID+COMPLEXi\n") }
-	end
+        # Read Psych dumped by the ruby 1.8.3.
+        assert_to_yaml( Complex(3, 4), "!ruby/object:Complex 3+4i\n" )
+        assert_raise( ArgumentError ) { Psych.unsafe_load("!ruby/object:Complex INVALID+COMPLEXi\n") }
+    end
 
-	def test_emitting_indicators
-		assert_to_yaml( "Hi, from Object 1. You passed: please, pretty please", <<EOY
+    def test_emitting_indicators
+        assert_to_yaml( "Hi, from Object 1. You passed: please, pretty please", <<EOY
 --- "Hi, from Object 1. You passed: please, pretty please"
 EOY
-		)
-	end
-
-	##
-	## Test the Psych::Stream class -- INACTIVE at the moment
-	##
-	#def test_document
-	#	y = Psych::Stream.new( :Indent => 2, :UseVersion => 0 )
-	#	y.add(
-	#		{ 'hi' => 'hello', 'map' =>
-	#			{ 'good' => 'two' },
-	#		  'time' => Time.now,
-	#		  'try' => /^po(.*)$/,
-	#		  'bye' => 'goodbye'
-	#		}
-	#	)
-	#	y.add( { 'po' => 'nil', 'oper' => 90 } )
-	#	y.add( { 'hi' => 'wow!', 'bye' => 'wow!' } )
-	#	y.add( { [ 'Red Socks', 'Boston' ] => [ 'One', 'Two', 'Three' ] } )
-	#	y.add( [ true, false, false ] )
-	#end
+        )
+    end
+
+    ##
+    ## Test the Psych::Stream class -- INACTIVE at the moment
+    ##
+    #def test_document
+    #    y = Psych::Stream.new( :Indent => 2, :UseVersion => 0 )
+    #    y.add(
+    #        { 'hi' => 'hello', 'map' =>
+    #            { 'good' => 'two' },
+    #          'time' => Time.now,
+    #          'try' => /^po(.*)$/,
+    #          'bye' => 'goodbye'
+    #        }
+    #    )
+    #    y.add( { 'po' => 'nil', 'oper' => 90 } )
+    #    y.add( { 'hi' => 'wow!', 'bye' => 'wow!' } )
+    #    y.add( { [ 'Red Socks', 'Boston' ] => [ 'One', 'Two', 'Three' ] } )
+    #    y.add( [ true, false, false ] )
+    #end
 
     #
     # Test YPath choices parsing
diff --git a/test/psych/test_yaml_special_cases.rb b/test/psych/test_yaml_special_cases.rb
index 205457bcae58ec..f1a607783ec37c 100644
--- a/test/psych/test_yaml_special_cases.rb
+++ b/test/psych/test_yaml_special_cases.rb
@@ -15,6 +15,7 @@ def test_empty_string
       s = ""
       assert_equal false, Psych.unsafe_load(s)
       assert_equal [], Psych.load_stream(s)
+      assert_equal [], Psych.safe_load_stream(s)
       assert_equal false, Psych.parse(s)
       assert_equal [], Psych.parse_stream(s).transform
       assert_nil   Psych.safe_load(s)
@@ -24,6 +25,7 @@ def test_false
       s = "false"
       assert_equal false, Psych.load(s)
       assert_equal [false], Psych.load_stream(s)
+      assert_equal [false], Psych.safe_load_stream(s)
       assert_equal false, Psych.parse(s).transform
       assert_equal [false], Psych.parse_stream(s).transform
       assert_equal false, Psych.safe_load(s)
@@ -33,6 +35,7 @@ def test_n
       s = "n"
       assert_equal "n", Psych.load(s)
       assert_equal ["n"], Psych.load_stream(s)
+      assert_equal ["n"], Psych.safe_load_stream(s)
       assert_equal "n", Psych.parse(s).transform
       assert_equal ["n"], Psych.parse_stream(s).transform
       assert_equal "n", Psych.safe_load(s)
@@ -42,6 +45,7 @@ def test_off
       s = "off"
       assert_equal false, Psych.load(s)
       assert_equal [false], Psych.load_stream(s)
+      assert_equal [false], Psych.safe_load_stream(s)
       assert_equal false, Psych.parse(s).transform
       assert_equal [false], Psych.parse_stream(s).transform
       assert_equal false, Psych.safe_load(s)
@@ -51,6 +55,7 @@ def test_inf
       s = "-.inf"
       assert_equal(-Float::INFINITY, Psych.load(s))
       assert_equal([-Float::INFINITY], Psych.load_stream(s))
+      assert_equal([-Float::INFINITY], Psych.safe_load_stream(s))
       assert_equal(-Float::INFINITY, Psych.parse(s).transform)
       assert_equal([-Float::INFINITY], Psych.parse_stream(s).transform)
       assert_equal(-Float::INFINITY, Psych.safe_load(s))
@@ -60,6 +65,7 @@ def test_NaN
       s = ".NaN"
       assert Psych.load(s).nan?
       assert Psych.load_stream(s).first.nan?
+      assert Psych.safe_load_stream(s).first.nan?
       assert Psych.parse(s).transform.nan?
       assert Psych.parse_stream(s).transform.first.nan?
       assert Psych.safe_load(s).nan?
@@ -69,6 +75,7 @@ def test_0xC
       s = "0xC"
       assert_equal 12, Psych.load(s)
       assert_equal [12], Psych.load_stream(s)
+      assert_equal [12], Psych.safe_load_stream(s)
       assert_equal 12, Psych.parse(s).transform
       assert_equal [12], Psych.parse_stream(s).transform
       assert_equal 12, Psych.safe_load(s)
@@ -78,6 +85,7 @@ def test_arrows
       s = "<<"
       assert_equal "<<", Psych.load(s)
       assert_equal ["<<"], Psych.load_stream(s)
+      assert_equal ["<<"], Psych.safe_load_stream(s)
       assert_equal "<<", Psych.parse(s).transform
       assert_equal ["<<"], Psych.parse_stream(s).transform
       assert_equal "<<", Psych.safe_load(s)
@@ -87,6 +95,7 @@ def test_arrows_hash
       s = "<<: {}"
       assert_equal({}, Psych.load(s))
       assert_equal [{}], Psych.load_stream(s)
+      assert_equal [{}], Psych.safe_load_stream(s)
       assert_equal({}, Psych.parse(s).transform)
       assert_equal [{}], Psych.parse_stream(s).transform
       assert_equal({}, Psych.safe_load(s))
@@ -96,6 +105,7 @@ def test_thousand
       s = "- 1000\n- +1000\n- 1_000"
       assert_equal [1000, 1000, 1000], Psych.load(s)
       assert_equal [[1000, 1000, 1000]], Psych.load_stream(s)
+      assert_equal [[1000, 1000, 1000]], Psych.safe_load_stream(s)
       assert_equal [1000, 1000, 1000], Psych.parse(s).transform
       assert_equal [[1000, 1000, 1000]], Psych.parse_stream(s).transform
       assert_equal [1000, 1000, 1000], Psych.safe_load(s)
@@ -105,6 +115,7 @@ def test_8
       s = "[8, 08, 0o10, 010]"
       assert_equal [8, "08", "0o10", 8], Psych.load(s)
       assert_equal [[8, "08", "0o10", 8]], Psych.load_stream(s)
+      assert_equal [[8, "08", "0o10", 8]], Psych.safe_load_stream(s)
       assert_equal [8, "08", "0o10", 8], Psych.parse(s).transform
       assert_equal [[8, "08", "0o10", 8]], Psych.parse_stream(s).transform
       assert_equal [8, "08", "0o10", 8], Psych.safe_load(s)
@@ -114,6 +125,7 @@ def test_null
       s = "null"
       assert_nil   Psych.load(s)
       assert_equal [nil], Psych.load_stream(s)
+      assert_equal [nil], Psych.safe_load_stream(s)
       assert_nil   Psych.parse(s).transform
       assert_equal [nil], Psych.parse_stream(s).transform
       assert_nil   Psych.safe_load(s)
diff --git a/test/psych/test_yamlstore.rb b/test/psych/test_yamlstore.rb
index 1a1be3700eff9f..c2721c41ea8780 100644
--- a/test/psych/test_yamlstore.rb
+++ b/test/psych/test_yamlstore.rb
@@ -23,14 +23,18 @@ def load(content)
 
   class YAMLStoreTest < TestCase
     def setup
-      @dir = Dir.mktmpdir("rubytest-file")
-      File.chown(-1, Process.gid, @dir)
-      @yamlstore_file = make_tmp_filename("yamlstore")
-      @yamlstore = YAML::Store.new(@yamlstore_file)
+      if defined?(::PStore)
+        @dir = Dir.mktmpdir("rubytest-file")
+        File.chown(-1, Process.gid, @dir)
+        @yamlstore_file = make_tmp_filename("yamlstore")
+        @yamlstore = YAML::Store.new(@yamlstore_file)
+      else
+        omit "PStore is not available"
+      end
     end
 
     def teardown
-      FileUtils.remove_entry_secure @dir
+      FileUtils.remove_entry_secure(@dir) if @dir
     end
 
     def make_tmp_filename(prefix)
@@ -97,5 +101,5 @@ def test_writing_inside_readonly_transaction_raises_error
         end
       end
     end
-  end
+  end if defined?(::PStore)
 end if defined?(Psych)
diff --git a/test/psych/visitors/test_to_ruby.rb b/test/psych/visitors/test_to_ruby.rb
index 3d4608b903d0fb..89c367665191f9 100644
--- a/test/psych/visitors/test_to_ruby.rb
+++ b/test/psych/visitors/test_to_ruby.rb
@@ -319,7 +319,7 @@ def test_alias
 
         list = seq.to_ruby
         assert_equal %w{ foo foo }, list
-        assert_equal list[0].object_id, list[1].object_id
+        assert_same list[0], list[1]
       end
 
       def test_mapping_with_str_tag
diff --git a/test/psych/visitors/test_yaml_tree.rb b/test/psych/visitors/test_yaml_tree.rb
index 01e685134aef9d..bd3919f83d67f3 100644
--- a/test/psych/visitors/test_yaml_tree.rb
+++ b/test/psych/visitors/test_yaml_tree.rb
@@ -73,6 +73,27 @@ def test_override_method
         assert_equal s.method, obj.method
       end
 
+      D = Data.define(:foo) unless RUBY_VERSION < "3.2"
+
+      def test_data
+        omit "Data requires ruby >= 3.2" if RUBY_VERSION < "3.2"
+        assert_cycle D.new('bar')
+      end
+
+      def test_data_anon
+        omit "Data requires ruby >= 3.2" if RUBY_VERSION < "3.2"
+        d = Data.define(:foo).new('bar')
+        obj =  Psych.unsafe_load(Psych.dump(d))
+        assert_equal d.foo, obj.foo
+      end
+
+      def test_data_override_method
+        omit "Data requires ruby >= 3.2" if RUBY_VERSION < "3.2"
+        d = Data.define(:method).new('override')
+        obj =  Psych.unsafe_load(Psych.dump(d))
+        assert_equal d.method, obj.method
+      end
+
       def test_exception
         ex = Exception.new 'foo'
         loaded = Psych.unsafe_load(Psych.dump(ex))
diff --git a/test/rdoc/MarkdownTest_1.0.3/Amps and angle encoding.text b/test/rdoc/MarkdownTest_1.0.3/Amps and angle encoding.text
deleted file mode 100644
index 0e9527f9311d12..00000000000000
--- a/test/rdoc/MarkdownTest_1.0.3/Amps and angle encoding.text	
+++ /dev/null
@@ -1,21 +0,0 @@
-AT&T has an ampersand in their name.
-
-AT&amp;T is another way to write it.
-
-This & that.
-
-4 < 5.
-
-6 > 5.
-
-Here's a [link] [1] with an ampersand in the URL.
-
-Here's a link with an amersand in the link text: [AT&T] [2].
-
-Here's an inline [link](/script?foo=1&bar=2).
-
-Here's an inline [link](</script?foo=1&bar=2>).
-
-
-[1]: http://example.com/?foo=1&bar=2
-[2]: http://att.com/  "AT&T"
\ No newline at end of file
diff --git a/test/rdoc/MarkdownTest_1.0.3/Auto links.text b/test/rdoc/MarkdownTest_1.0.3/Auto links.text
deleted file mode 100644
index abbc48869de2c8..00000000000000
--- a/test/rdoc/MarkdownTest_1.0.3/Auto links.text	
+++ /dev/null
@@ -1,13 +0,0 @@
-Link: <http://example.com/>.
-
-With an ampersand: <http://example.com/?foo=1&bar=2>
-
-* In a list?
-* <http://example.com/>
-* It should.
-
-> Blockquoted: <http://example.com/>
-
-Auto-links should not occur here: `<http://example.com/>`
-
-	or here: <http://example.com/>
\ No newline at end of file
diff --git a/test/rdoc/MarkdownTest_1.0.3/Backslash escapes.text b/test/rdoc/MarkdownTest_1.0.3/Backslash escapes.text
deleted file mode 100644
index 5b014cb33d16c4..00000000000000
--- a/test/rdoc/MarkdownTest_1.0.3/Backslash escapes.text	
+++ /dev/null
@@ -1,120 +0,0 @@
-These should all get escaped:
-
-Backslash: \\
-
-Backtick: \`
-
-Asterisk: \*
-
-Underscore: \_
-
-Left brace: \{
-
-Right brace: \}
-
-Left bracket: \[
-
-Right bracket: \]
-
-Left paren: \(
-
-Right paren: \)
-
-Greater-than: \>
-
-Hash: \#
-
-Period: \.
-
-Bang: \!
-
-Plus: \+
-
-Minus: \-
-
-
-
-These should not, because they occur within a code block:
-
-	Backslash: \\
-
-	Backtick: \`
-
-	Asterisk: \*
-
-	Underscore: \_
-
-	Left brace: \{
-
-	Right brace: \}
-
-	Left bracket: \[
-
-	Right bracket: \]
-
-	Left paren: \(
-
-	Right paren: \)
-
-	Greater-than: \>
-
-	Hash: \#
-
-	Period: \.
-
-	Bang: \!
-
-	Plus: \+
-
-	Minus: \-
-
-
-Nor should these, which occur in code spans:
-
-Backslash: `\\`
-
-Backtick: `` \` ``
-
-Asterisk: `\*`
-
-Underscore: `\_`
-
-Left brace: `\{`
-
-Right brace: `\}`
-
-Left bracket: `\[`
-
-Right bracket: `\]`
-
-Left paren: `\(`
-
-Right paren: `\)`
-
-Greater-than: `\>`
-
-Hash: `\#`
-
-Period: `\.`
-
-Bang: `\!`
-
-Plus: `\+`
-
-Minus: `\-`
-
-
-These should get escaped, even though they're matching pairs for
-other Markdown constructs:
-
-\*asterisks\*
-
-\_underscores\_
-
-\`backticks\`
-
-This is a code span with a literal backslash-backtick sequence: `` \` ``
-
-This is a tag with unescaped backticks <span attr='`ticks`'>bar</span>.
-
-This is a tag with backslashes <span attr='\\backslashes\\'>bar</span>.
diff --git a/test/rdoc/MarkdownTest_1.0.3/Blockquotes with code blocks.text b/test/rdoc/MarkdownTest_1.0.3/Blockquotes with code blocks.text
deleted file mode 100644
index c31d171049d281..00000000000000
--- a/test/rdoc/MarkdownTest_1.0.3/Blockquotes with code blocks.text	
+++ /dev/null
@@ -1,11 +0,0 @@
-> Example:
-> 
->     sub status {
->         print "working";
->     }
-> 
-> Or:
-> 
->     sub status {
->         return "working";
->     }
diff --git a/test/rdoc/MarkdownTest_1.0.3/Code Blocks.text b/test/rdoc/MarkdownTest_1.0.3/Code Blocks.text
deleted file mode 100644
index b54b09285a7066..00000000000000
--- a/test/rdoc/MarkdownTest_1.0.3/Code Blocks.text	
+++ /dev/null
@@ -1,14 +0,0 @@
-	code block on the first line
-	
-Regular text.
-
-    code block indented by spaces
-
-Regular text.
-
-	the lines in this block  
-	all contain trailing spaces  
-
-Regular Text.
-
-	code block on the last line
\ No newline at end of file
diff --git a/test/rdoc/MarkdownTest_1.0.3/Code Spans.text b/test/rdoc/MarkdownTest_1.0.3/Code Spans.text
deleted file mode 100644
index 750a1973df9cd9..00000000000000
--- a/test/rdoc/MarkdownTest_1.0.3/Code Spans.text	
+++ /dev/null
@@ -1,6 +0,0 @@
-`<test a="` content of attribute `">`
-
-Fix for backticks within HTML tag: <span attr='`ticks`'>like this</span>
-
-Here's how you put `` `backticks` `` in a code span.
-
diff --git a/test/rdoc/MarkdownTest_1.0.3/Hard-wrapped paragraphs with list-like lines.text b/test/rdoc/MarkdownTest_1.0.3/Hard-wrapped paragraphs with list-like lines.text
deleted file mode 100644
index f8a5b27bf41828..00000000000000
--- a/test/rdoc/MarkdownTest_1.0.3/Hard-wrapped paragraphs with list-like lines.text	
+++ /dev/null
@@ -1,8 +0,0 @@
-In Markdown 1.0.0 and earlier. Version
-8. This line turns into a list item.
-Because a hard-wrapped line in the
-middle of a paragraph looked like a
-list item.
-
-Here's one with a bullet.
-* criminey.
diff --git a/test/rdoc/MarkdownTest_1.0.3/Horizontal rules.text b/test/rdoc/MarkdownTest_1.0.3/Horizontal rules.text
deleted file mode 100644
index 1594bda27b4130..00000000000000
--- a/test/rdoc/MarkdownTest_1.0.3/Horizontal rules.text	
+++ /dev/null
@@ -1,67 +0,0 @@
-Dashes:
-
----
-
- ---
- 
-  ---
-
-   ---
-
-	---
-
-- - -
-
- - - -
- 
-  - - -
-
-   - - -
-
-	- - -
-
-
-Asterisks:
-
-***
-
- ***
- 
-  ***
-
-   ***
-
-	***
-
-* * *
-
- * * *
- 
-  * * *
-
-   * * *
-
-	* * *
-
-
-Underscores:
-
-___
-
- ___
- 
-  ___
-
-   ___
-
-    ___
-
-_ _ _
-
- _ _ _
- 
-  _ _ _
-
-   _ _ _
-
-    _ _ _
diff --git a/test/rdoc/MarkdownTest_1.0.3/Inline HTML (Advanced).text b/test/rdoc/MarkdownTest_1.0.3/Inline HTML (Advanced).text
deleted file mode 100644
index 86b7206d2a1954..00000000000000
--- a/test/rdoc/MarkdownTest_1.0.3/Inline HTML (Advanced).text	
+++ /dev/null
@@ -1,15 +0,0 @@
-Simple block on one line:
-
-<div>foo</div>
-
-And nested without indentation:
-
-<div>
-<div>
-<div>
-foo
-</div>
-<div style=">"/>
-</div>
-<div>bar</div>
-</div>
diff --git a/test/rdoc/MarkdownTest_1.0.3/Inline HTML (Simple).text b/test/rdoc/MarkdownTest_1.0.3/Inline HTML (Simple).text
deleted file mode 100644
index 14aa2dc272d0a0..00000000000000
--- a/test/rdoc/MarkdownTest_1.0.3/Inline HTML (Simple).text	
+++ /dev/null
@@ -1,69 +0,0 @@
-Here's a simple block:
-
-<div>
-	foo
-</div>
-
-This should be a code block, though:
-
-	<div>
-		foo
-	</div>
-
-As should this:
-
-	<div>foo</div>
-
-Now, nested:
-
-<div>
-	<div>
-		<div>
-			foo
-		</div>
-	</div>
-</div>
-
-This should just be an HTML comment:
-
-<!-- Comment -->
-
-Multiline:
-
-<!--
-Blah
-Blah
--->
-
-Code block:
-
-	<!-- Comment -->
-
-Just plain comment, with trailing spaces on the line:
-
-<!-- foo -->   
-
-Code:
-
-	<hr />
-	
-Hr's:
-
-<hr>
-
-<hr/>
-
-<hr />
-
-<hr>   
-
-<hr/>  
-
-<hr /> 
-
-<hr class="foo" id="bar" />
-
-<hr class="foo" id="bar"/>
-
-<hr class="foo" id="bar" >
-
diff --git a/test/rdoc/MarkdownTest_1.0.3/Inline HTML comments.text b/test/rdoc/MarkdownTest_1.0.3/Inline HTML comments.text
deleted file mode 100644
index 41d830d0385fee..00000000000000
--- a/test/rdoc/MarkdownTest_1.0.3/Inline HTML comments.text	
+++ /dev/null
@@ -1,13 +0,0 @@
-Paragraph one.
-
-<!-- This is a simple comment -->
-
-<!--
-	This is another comment.
--->
-
-Paragraph two.
-
-<!-- one comment block -- -- with two comments -->
-
-The end.
diff --git a/test/rdoc/MarkdownTest_1.0.3/Links, inline style.text b/test/rdoc/MarkdownTest_1.0.3/Links, inline style.text
deleted file mode 100644
index 09017a90c70ab0..00000000000000
--- a/test/rdoc/MarkdownTest_1.0.3/Links, inline style.text	
+++ /dev/null
@@ -1,12 +0,0 @@
-Just a [URL](/url/).
-
-[URL and title](/url/ "title").
-
-[URL and title](/url/  "title preceded by two spaces").
-
-[URL and title](/url/	"title preceded by a tab").
-
-[URL and title](/url/ "title has spaces afterward"  ).
-
-
-[Empty]().
diff --git a/test/rdoc/MarkdownTest_1.0.3/Links, reference style.text b/test/rdoc/MarkdownTest_1.0.3/Links, reference style.text
deleted file mode 100644
index 341ec88e3d017c..00000000000000
--- a/test/rdoc/MarkdownTest_1.0.3/Links, reference style.text	
+++ /dev/null
@@ -1,71 +0,0 @@
-Foo [bar] [1].
-
-Foo [bar][1].
-
-Foo [bar]
-[1].
-
-[1]: /url/  "Title"
-
-
-With [embedded [brackets]] [b].
-
-
-Indented [once][].
-
-Indented [twice][].
-
-Indented [thrice][].
-
-Indented [four][] times.
-
- [once]: /url
-
-  [twice]: /url
-
-   [thrice]: /url
-
-    [four]: /url
-
-
-[b]: /url/
-
-* * *
-
-[this] [this] should work
-
-So should [this][this].
-
-And [this] [].
-
-And [this][].
-
-And [this].
-
-But not [that] [].
-
-Nor [that][].
-
-Nor [that].
-
-[Something in brackets like [this][] should work]
-
-[Same with [this].]
-
-In this case, [this](/somethingelse/) points to something else.
-
-Backslashing should suppress \[this] and [this\].
-
-[this]: foo
-
-
-* * *
-
-Here's one where the [link
-breaks] across lines.
-
-Here's another where the [link 
-breaks] across lines, but with a line-ending space.
-
-
-[link breaks]: /url/
diff --git a/test/rdoc/MarkdownTest_1.0.3/Links, shortcut references.text b/test/rdoc/MarkdownTest_1.0.3/Links, shortcut references.text
deleted file mode 100644
index 8c44c98feed2c7..00000000000000
--- a/test/rdoc/MarkdownTest_1.0.3/Links, shortcut references.text	
+++ /dev/null
@@ -1,20 +0,0 @@
-This is the [simple case].
-
-[simple case]: /simple
-
-
-
-This one has a [line
-break].
-
-This one has a [line 
-break] with a line-ending space.
-
-[line break]: /foo
-
-
-[this] [that] and the [other]
-
-[this]: /this
-[that]: /that
-[other]: /other
diff --git a/test/rdoc/MarkdownTest_1.0.3/Literal quotes in titles.text b/test/rdoc/MarkdownTest_1.0.3/Literal quotes in titles.text
deleted file mode 100644
index 29d0e4235b22ad..00000000000000
--- a/test/rdoc/MarkdownTest_1.0.3/Literal quotes in titles.text	
+++ /dev/null
@@ -1,7 +0,0 @@
-Foo [bar][].
-
-Foo [bar](/url/ "Title with "quotes" inside").
-
-
-  [bar]: /url/ "Title with "quotes" inside"
-
diff --git a/test/rdoc/MarkdownTest_1.0.3/Markdown Documentation - Basics.text b/test/rdoc/MarkdownTest_1.0.3/Markdown Documentation - Basics.text
deleted file mode 100644
index b499390f2dc50a..00000000000000
--- a/test/rdoc/MarkdownTest_1.0.3/Markdown Documentation - Basics.text	
+++ /dev/null
@@ -1,306 +0,0 @@
-Markdown: Basics
-================
-
-<ul id="ProjectSubmenu">
-    <li><a href="/projects/markdown/" title="Markdown Project Page">Main</a></li>
-    <li><a class="selected" title="Markdown Basics">Basics</a></li>
-    <li><a href="/projects/markdown/syntax" title="Markdown Syntax Documentation">Syntax</a></li>
-    <li><a href="/projects/markdown/license" title="Pricing and License Information">License</a></li>
-    <li><a href="/projects/markdown/dingus" title="Online Markdown Web Form">Dingus</a></li>
-</ul>
-
-
-Getting the Gist of Markdown's Formatting Syntax
-------------------------------------------------
-
-This page offers a brief overview of what it's like to use Markdown.
-The [syntax page] [s] provides complete, detailed documentation for
-every feature, but Markdown should be very easy to pick up simply by
-looking at a few examples of it in action. The examples on this page
-are written in a before/after style, showing example syntax and the
-HTML output produced by Markdown.
-
-It's also helpful to simply try Markdown out; the [Dingus] [d] is a
-web application that allows you type your own Markdown-formatted text
-and translate it to XHTML.
-
-**Note:** This document is itself written using Markdown; you
-can [see the source for it by adding '.text' to the URL] [src].
-
-  [s]: /projects/markdown/syntax  "Markdown Syntax"
-  [d]: /projects/markdown/dingus  "Markdown Dingus"
-  [src]: /projects/markdown/basics.text
-
-
-## Paragraphs, Headers, Blockquotes ##
-
-A paragraph is simply one or more consecutive lines of text, separated
-by one or more blank lines. (A blank line is any line that looks like a
-blank line -- a line containing nothing spaces or tabs is considered
-blank.) Normal paragraphs should not be intended with spaces or tabs.
-
-Markdown offers two styles of headers: *Setext* and *atx*.
-Setext-style headers for `<h1>` and `<h2>` are created by
-"underlining" with equal signs (`=`) and hyphens (`-`), respectively.
-To create an atx-style header, you put 1-6 hash marks (`#`) at the
-beginning of the line -- the number of hashes equals the resulting
-HTML header level.
-
-Blockquotes are indicated using email-style '`>`' angle brackets.
-
-Markdown:
-
-    A First Level Header
-    ====================
-    
-    A Second Level Header
-    ---------------------
-
-    Now is the time for all good men to come to
-    the aid of their country. This is just a
-    regular paragraph.
-
-    The quick brown fox jumped over the lazy
-    dog's back.
-    
-    ### Header 3
-
-    > This is a blockquote.
-    > 
-    > This is the second paragraph in the blockquote.
-    >
-    > ## This is an H2 in a blockquote
-
-
-Output:
-
-    <h1>A First Level Header</h1>
-    
-    <h2>A Second Level Header</h2>
-    
-    <p>Now is the time for all good men to come to
-    the aid of their country. This is just a
-    regular paragraph.</p>
-    
-    <p>The quick brown fox jumped over the lazy
-    dog's back.</p>
-    
-    <h3>Header 3</h3>
-    
-    <blockquote>
-        <p>This is a blockquote.</p>
-        
-        <p>This is the second paragraph in the blockquote.</p>
-        
-        <h2>This is an H2 in a blockquote</h2>
-    </blockquote>
-
-
-
-### Phrase Emphasis ###
-
-Markdown uses asterisks and underscores to indicate spans of emphasis.
-
-Markdown:
-
-    Some of these words *are emphasized*.
-    Some of these words _are emphasized also_.
-    
-    Use two asterisks for **strong emphasis**.
-    Or, if you prefer, __use two underscores instead__.
-
-Output:
-
-    <p>Some of these words <em>are emphasized</em>.
-    Some of these words <em>are emphasized also</em>.</p>
-    
-    <p>Use two asterisks for <strong>strong emphasis</strong>.
-    Or, if you prefer, <strong>use two underscores instead</strong>.</p>
-   
-
-
-## Lists ##
-
-Unordered (bulleted) lists use asterisks, pluses, and hyphens (`*`,
-`+`, and `-`) as list markers. These three markers are
-interchangeable; this:
-
-    *   Candy.
-    *   Gum.
-    *   Booze.
-
-this:
-
-    +   Candy.
-    +   Gum.
-    +   Booze.
-
-and this:
-
-    -   Candy.
-    -   Gum.
-    -   Booze.
-
-all produce the same output:
-
-    <ul>
-    <li>Candy.</li>
-    <li>Gum.</li>
-    <li>Booze.</li>
-    </ul>
-
-Ordered (numbered) lists use regular numbers, followed by periods, as
-list markers:
-
-    1.  Red
-    2.  Green
-    3.  Blue
-
-Output:
-
-    <ol>
-    <li>Red</li>
-    <li>Green</li>
-    <li>Blue</li>
-    </ol>
-
-If you put blank lines between items, you'll get `<p>` tags for the
-list item text. You can create multi-paragraph list items by indenting
-the paragraphs by 4 spaces or 1 tab:
-
-    *   A list item.
-    
-        With multiple paragraphs.
-
-    *   Another item in the list.
-
-Output:
-
-    <ul>
-    <li><p>A list item.</p>
-    <p>With multiple paragraphs.</p></li>
-    <li><p>Another item in the list.</p></li>
-    </ul>
-    
-
-
-### Links ###
-
-Markdown supports two styles for creating links: *inline* and
-*reference*. With both styles, you use square brackets to delimit the
-text you want to turn into a link.
-
-Inline-style links use parentheses immediately after the link text.
-For example:
-
-    This is an [example link](http://example.com/).
-
-Output:
-
-    <p>This is an <a href="http://example.com/">
-    example link</a>.</p>
-
-Optionally, you may include a title attribute in the parentheses:
-
-    This is an [example link](http://example.com/ "With a Title").
-
-Output:
-
-    <p>This is an <a href="http://example.com/" title="With a Title">
-    example link</a>.</p>
-
-Reference-style links allow you to refer to your links by names, which
-you define elsewhere in your document:
-
-    I get 10 times more traffic from [Google][1] than from
-    [Yahoo][2] or [MSN][3].
-
-    [1]: http://google.com/        "Google"
-    [2]: http://search.yahoo.com/  "Yahoo Search"
-    [3]: http://search.msn.com/    "MSN Search"
-
-Output:
-
-    <p>I get 10 times more traffic from <a href="http://google.com/"
-    title="Google">Google</a> than from <a href="http://search.yahoo.com/"
-    title="Yahoo Search">Yahoo</a> or <a href="http://search.msn.com/"
-    title="MSN Search">MSN</a>.</p>
-
-The title attribute is optional. Link names may contain letters,
-numbers and spaces, but are *not* case sensitive:
-
-    I start my morning with a cup of coffee and
-    [The New York Times][NY Times].
-
-    [ny times]: http://www.nytimes.com/
-
-Output:
-
-    <p>I start my morning with a cup of coffee and
-    <a href="http://www.nytimes.com/">The New York Times</a>.</p>
-
-
-### Images ###
-
-Image syntax is very much like link syntax.
-
-Inline (titles are optional):
-
-    ![alt text](/path/to/img.jpg "Title")
-
-Reference-style:
-
-    ![alt text][id]
-
-    [id]: /path/to/img.jpg "Title"
-
-Both of the above examples produce the same output:
-
-    <img src="/path/to/img.jpg" alt="alt text" title="Title" />
-
-
-
-### Code ###
-
-In a regular paragraph, you can create code span by wrapping text in
-backtick quotes. Any ampersands (`&`) and angle brackets (`<` or
-`>`) will automatically be translated into HTML entities. This makes
-it easy to use Markdown to write about HTML example code:
-
-    I strongly recommend against using any `<blink>` tags.
-
-    I wish SmartyPants used named entities like `&mdash;`
-    instead of decimal-encoded entities like `&#8212;`.
-
-Output:
-
-    <p>I strongly recommend against using any
-    <code>&lt;blink&gt;</code> tags.</p>
-    
-    <p>I wish SmartyPants used named entities like
-    <code>&amp;mdash;</code> instead of decimal-encoded
-    entities like <code>&amp;#8212;</code>.</p>
-
-
-To specify an entire block of pre-formatted code, indent every line of
-the block by 4 spaces or 1 tab. Just like with code spans, `&`, `<`,
-and `>` characters will be escaped automatically.
-
-Markdown:
-
-    If you want your page to validate under XHTML 1.0 Strict,
-    you've got to put paragraph tags in your blockquotes:
-
-        <blockquote>
-            <p>For example.</p>
-        </blockquote>
-
-Output:
-
-    <p>If you want your page to validate under XHTML 1.0 Strict,
-    you've got to put paragraph tags in your blockquotes:</p>
-    
-    <pre><code>&lt;blockquote&gt;
-        &lt;p&gt;For example.&lt;/p&gt;
-    &lt;/blockquote&gt;
-    </code></pre>
diff --git a/test/rdoc/MarkdownTest_1.0.3/Markdown Documentation - Syntax.text b/test/rdoc/MarkdownTest_1.0.3/Markdown Documentation - Syntax.text
deleted file mode 100644
index 184018a5acf6f4..00000000000000
--- a/test/rdoc/MarkdownTest_1.0.3/Markdown Documentation - Syntax.text	
+++ /dev/null
@@ -1,888 +0,0 @@
-Markdown: Syntax
-================
-
-<ul id="ProjectSubmenu">
-    <li><a href="/projects/markdown/" title="Markdown Project Page">Main</a></li>
-    <li><a href="/projects/markdown/basics" title="Markdown Basics">Basics</a></li>
-    <li><a class="selected" title="Markdown Syntax Documentation">Syntax</a></li>
-    <li><a href="/projects/markdown/license" title="Pricing and License Information">License</a></li>
-    <li><a href="/projects/markdown/dingus" title="Online Markdown Web Form">Dingus</a></li>
-</ul>
-
-
-*   [Overview](#overview)
-    *   [Philosophy](#philosophy)
-    *   [Inline HTML](#html)
-    *   [Automatic Escaping for Special Characters](#autoescape)
-*   [Block Elements](#block)
-    *   [Paragraphs and Line Breaks](#p)
-    *   [Headers](#header)
-    *   [Blockquotes](#blockquote)
-    *   [Lists](#list)
-    *   [Code Blocks](#precode)
-    *   [Horizontal Rules](#hr)
-*   [Span Elements](#span)
-    *   [Links](#link)
-    *   [Emphasis](#em)
-    *   [Code](#code)
-    *   [Images](#img)
-*   [Miscellaneous](#misc)
-    *   [Backslash Escapes](#backslash)
-    *   [Automatic Links](#autolink)
-
-
-**Note:** This document is itself written using Markdown; you
-can [see the source for it by adding '.text' to the URL][src].
-
-  [src]: /projects/markdown/syntax.text
-
-* * *
-
-<h2 id="overview">Overview</h2>
-
-<h3 id="philosophy">Philosophy</h3>
-
-Markdown is intended to be as easy-to-read and easy-to-write as is feasible.
-
-Readability, however, is emphasized above all else. A Markdown-formatted
-document should be publishable as-is, as plain text, without looking
-like it's been marked up with tags or formatting instructions. While
-Markdown's syntax has been influenced by several existing text-to-HTML
-filters -- including [Setext] [1], [atx] [2], [Textile] [3], [reStructuredText] [4],
-[Grutatext] [5], and [EtText] [6] -- the single biggest source of
-inspiration for Markdown's syntax is the format of plain text email.
-
-  [1]: http://docutils.sourceforge.net/mirror/setext.html
-  [2]: http://www.aaronsw.com/2002/atx/
-  [3]: http://textism.com/tools/textile/
-  [4]: http://docutils.sourceforge.net/rst.html
-  [5]: http://www.triptico.com/software/grutatxt.html
-  [6]: http://ettext.taint.org/doc/
-
-To this end, Markdown's syntax is comprised entirely of punctuation
-characters, which punctuation characters have been carefully chosen so
-as to look like what they mean. E.g., asterisks around a word actually
-look like \*emphasis\*. Markdown lists look like, well, lists. Even
-blockquotes look like quoted passages of text, assuming you've ever
-used email.
-
-
-
-<h3 id="html">Inline HTML</h3>
-
-Markdown's syntax is intended for one purpose: to be used as a
-format for *writing* for the web.
-
-Markdown is not a replacement for HTML, or even close to it. Its
-syntax is very small, corresponding only to a very small subset of
-HTML tags. The idea is *not* to create a syntax that makes it easier
-to insert HTML tags. In my opinion, HTML tags are already easy to
-insert. The idea for Markdown is to make it easy to read, write, and
-edit prose. HTML is a *publishing* format; Markdown is a *writing*
-format. Thus, Markdown's formatting syntax only addresses issues that
-can be conveyed in plain text.
-
-For any markup that is not covered by Markdown's syntax, you simply
-use HTML itself. There's no need to preface it or delimit it to
-indicate that you're switching from Markdown to HTML; you just use
-the tags.
-
-The only restrictions are that block-level HTML elements -- e.g. `<div>`,
-`<table>`, `<pre>`, `<p>`, etc. -- must be separated from surrounding
-content by blank lines, and the start and end tags of the block should
-not be indented with tabs or spaces. Markdown is smart enough not
-to add extra (unwanted) `<p>` tags around HTML block-level tags.
-
-For example, to add an HTML table to a Markdown article:
-
-    This is a regular paragraph.
-
-    <table>
-        <tr>
-            <td>Foo</td>
-        </tr>
-    </table>
-
-    This is another regular paragraph.
-
-Note that Markdown formatting syntax is not processed within block-level
-HTML tags. E.g., you can't use Markdown-style `*emphasis*` inside an
-HTML block.
-
-Span-level HTML tags -- e.g. `<span>`, `<cite>`, or `<del>` -- can be
-used anywhere in a Markdown paragraph, list item, or header. If you
-want, you can even use HTML tags instead of Markdown formatting; e.g. if
-you'd prefer to use HTML `<a>` or `<img>` tags instead of Markdown's
-link or image syntax, go right ahead.
-
-Unlike block-level HTML tags, Markdown syntax *is* processed within
-span-level tags.
-
-
-<h3 id="autoescape">Automatic Escaping for Special Characters</h3>
-
-In HTML, there are two characters that demand special treatment: `<`
-and `&`. Left angle brackets are used to start tags; ampersands are
-used to denote HTML entities. If you want to use them as literal
-characters, you must escape them as entities, e.g. `&lt;`, and
-`&amp;`.
-
-Ampersands in particular are bedeviling for web writers. If you want to
-write about 'AT&T', you need to write '`AT&amp;T`'. You even need to
-escape ampersands within URLs. Thus, if you want to link to:
-
-    http://images.google.com/images?num=30&q=larry+bird
-
-you need to encode the URL as:
-
-    http://images.google.com/images?num=30&amp;q=larry+bird
-
-in your anchor tag `href` attribute. Needless to say, this is easy to
-forget, and is probably the single most common source of HTML validation
-errors in otherwise well-marked-up web sites.
-
-Markdown allows you to use these characters naturally, taking care of
-all the necessary escaping for you. If you use an ampersand as part of
-an HTML entity, it remains unchanged; otherwise it will be translated
-into `&amp;`.
-
-So, if you want to include a copyright symbol in your article, you can write:
-
-    &copy;
-
-and Markdown will leave it alone. But if you write:
-
-    AT&T
-
-Markdown will translate it to:
-
-    AT&amp;T
-
-Similarly, because Markdown supports [inline HTML](#html), if you use
-angle brackets as delimiters for HTML tags, Markdown will treat them as
-such. But if you write:
-
-    4 < 5
-
-Markdown will translate it to:
-
-    4 &lt; 5
-
-However, inside Markdown code spans and blocks, angle brackets and
-ampersands are *always* encoded automatically. This makes it easy to use
-Markdown to write about HTML code. (As opposed to raw HTML, which is a
-terrible format for writing about HTML syntax, because every single `<`
-and `&` in your example code needs to be escaped.)
-
-
-* * *
-
-
-<h2 id="block">Block Elements</h2>
-
-
-<h3 id="p">Paragraphs and Line Breaks</h3>
-
-A paragraph is simply one or more consecutive lines of text, separated
-by one or more blank lines. (A blank line is any line that looks like a
-blank line -- a line containing nothing but spaces or tabs is considered
-blank.) Normal paragraphs should not be intended with spaces or tabs.
-
-The implication of the "one or more consecutive lines of text" rule is
-that Markdown supports "hard-wrapped" text paragraphs. This differs
-significantly from most other text-to-HTML formatters (including Movable
-Type's "Convert Line Breaks" option) which translate every line break
-character in a paragraph into a `<br />` tag.
-
-When you *do* want to insert a `<br />` break tag using Markdown, you
-end a line with two or more spaces, then type return.
-
-Yes, this takes a tad more effort to create a `<br />`, but a simplistic
-"every line break is a `<br />`" rule wouldn't work for Markdown.
-Markdown's email-style [blockquoting][bq] and multi-paragraph [list items][l]
-work best -- and look better -- when you format them with hard breaks.
-
-  [bq]: #blockquote
-  [l]:  #list
-
-
-
-<h3 id="header">Headers</h3>
-
-Markdown supports two styles of headers, [Setext] [1] and [atx] [2].
-
-Setext-style headers are "underlined" using equal signs (for first-level
-headers) and dashes (for second-level headers). For example:
-
-    This is an H1
-    =============
-
-    This is an H2
-    -------------
-
-Any number of underlining `=`'s or `-`'s will work.
-
-Atx-style headers use 1-6 hash characters at the start of the line,
-corresponding to header levels 1-6. For example:
-
-    # This is an H1
-
-    ## This is an H2
-
-    ###### This is an H6
-
-Optionally, you may "close" atx-style headers. This is purely
-cosmetic -- you can use this if you think it looks better. The
-closing hashes don't even need to match the number of hashes
-used to open the header. (The number of opening hashes
-determines the header level.) :
-
-    # This is an H1 #
-
-    ## This is an H2 ##
-
-    ### This is an H3 ######
-
-
-<h3 id="blockquote">Blockquotes</h3>
-
-Markdown uses email-style `>` characters for blockquoting. If you're
-familiar with quoting passages of text in an email message, then you
-know how to create a blockquote in Markdown. It looks best if you hard
-wrap the text and put a `>` before every line:
-
-    > This is a blockquote with two paragraphs. Lorem ipsum dolor sit amet,
-    > consectetuer adipiscing elit. Aliquam hendrerit mi posuere lectus.
-    > Vestibulum enim wisi, viverra nec, fringilla in, laoreet vitae, risus.
-    > 
-    > Donec sit amet nisl. Aliquam semper ipsum sit amet velit. Suspendisse
-    > id sem consectetuer libero luctus adipiscing.
-
-Markdown allows you to be lazy and only put the `>` before the first
-line of a hard-wrapped paragraph:
-
-    > This is a blockquote with two paragraphs. Lorem ipsum dolor sit amet,
-    consectetuer adipiscing elit. Aliquam hendrerit mi posuere lectus.
-    Vestibulum enim wisi, viverra nec, fringilla in, laoreet vitae, risus.
-
-    > Donec sit amet nisl. Aliquam semper ipsum sit amet velit. Suspendisse
-    id sem consectetuer libero luctus adipiscing.
-
-Blockquotes can be nested (i.e. a blockquote-in-a-blockquote) by
-adding additional levels of `>`:
-
-    > This is the first level of quoting.
-    >
-    > > This is nested blockquote.
-    >
-    > Back to the first level.
-
-Blockquotes can contain other Markdown elements, including headers, lists,
-and code blocks:
-
-	> ## This is a header.
-	> 
-	> 1.   This is the first list item.
-	> 2.   This is the second list item.
-	> 
-	> Here's some example code:
-	> 
-	>     return shell_exec("echo $input | $markdown_script");
-
-Any decent text editor should make email-style quoting easy. For
-example, with BBEdit, you can make a selection and choose Increase
-Quote Level from the Text menu.
-
-
-<h3 id="list">Lists</h3>
-
-Markdown supports ordered (numbered) and unordered (bulleted) lists.
-
-Unordered lists use asterisks, pluses, and hyphens -- interchangeably
--- as list markers:
-
-    *   Red
-    *   Green
-    *   Blue
-
-is equivalent to:
-
-    +   Red
-    +   Green
-    +   Blue
-
-and:
-
-    -   Red
-    -   Green
-    -   Blue
-
-Ordered lists use numbers followed by periods:
-
-    1.  Bird
-    2.  McHale
-    3.  Parish
-
-It's important to note that the actual numbers you use to mark the
-list have no effect on the HTML output Markdown produces. The HTML
-Markdown produces from the above list is:
-
-    <ol>
-    <li>Bird</li>
-    <li>McHale</li>
-    <li>Parish</li>
-    </ol>
-
-If you instead wrote the list in Markdown like this:
-
-    1.  Bird
-    1.  McHale
-    1.  Parish
-
-or even:
-
-    3. Bird
-    1. McHale
-    8. Parish
-
-you'd get the exact same HTML output. The point is, if you want to,
-you can use ordinal numbers in your ordered Markdown lists, so that
-the numbers in your source match the numbers in your published HTML.
-But if you want to be lazy, you don't have to.
-
-If you do use lazy list numbering, however, you should still start the
-list with the number 1. At some point in the future, Markdown may support
-starting ordered lists at an arbitrary number.
-
-List markers typically start at the left margin, but may be indented by
-up to three spaces. List markers must be followed by one or more spaces
-or a tab.
-
-To make lists look nice, you can wrap items with hanging indents:
-
-    *   Lorem ipsum dolor sit amet, consectetuer adipiscing elit.
-        Aliquam hendrerit mi posuere lectus. Vestibulum enim wisi,
-        viverra nec, fringilla in, laoreet vitae, risus.
-    *   Donec sit amet nisl. Aliquam semper ipsum sit amet velit.
-        Suspendisse id sem consectetuer libero luctus adipiscing.
-
-But if you want to be lazy, you don't have to:
-
-    *   Lorem ipsum dolor sit amet, consectetuer adipiscing elit.
-    Aliquam hendrerit mi posuere lectus. Vestibulum enim wisi,
-    viverra nec, fringilla in, laoreet vitae, risus.
-    *   Donec sit amet nisl. Aliquam semper ipsum sit amet velit.
-    Suspendisse id sem consectetuer libero luctus adipiscing.
-
-If list items are separated by blank lines, Markdown will wrap the
-items in `<p>` tags in the HTML output. For example, this input:
-
-    *   Bird
-    *   Magic
-
-will turn into:
-
-    <ul>
-    <li>Bird</li>
-    <li>Magic</li>
-    </ul>
-
-But this:
-
-    *   Bird
-
-    *   Magic
-
-will turn into:
-
-    <ul>
-    <li><p>Bird</p></li>
-    <li><p>Magic</p></li>
-    </ul>
-
-List items may consist of multiple paragraphs. Each subsequent
-paragraph in a list item must be intended by either 4 spaces
-or one tab:
-
-    1.  This is a list item with two paragraphs. Lorem ipsum dolor
-        sit amet, consectetuer adipiscing elit. Aliquam hendrerit
-        mi posuere lectus.
-
-        Vestibulum enim wisi, viverra nec, fringilla in, laoreet
-        vitae, risus. Donec sit amet nisl. Aliquam semper ipsum
-        sit amet velit.
-
-    2.  Suspendisse id sem consectetuer libero luctus adipiscing.
-
-It looks nice if you indent every line of the subsequent
-paragraphs, but here again, Markdown will allow you to be
-lazy:
-
-    *   This is a list item with two paragraphs.
-
-        This is the second paragraph in the list item. You're
-    only required to indent the first line. Lorem ipsum dolor
-    sit amet, consectetuer adipiscing elit.
-
-    *   Another item in the same list.
-
-To put a blockquote within a list item, the blockquote's `>`
-delimiters need to be indented:
-
-    *   A list item with a blockquote:
-
-        > This is a blockquote
-        > inside a list item.
-
-To put a code block within a list item, the code block needs
-to be indented *twice* -- 8 spaces or two tabs:
-
-    *   A list item with a code block:
-
-            <code goes here>
-
-
-It's worth noting that it's possible to trigger an ordered list by
-accident, by writing something like this:
-
-    1986. What a great season.
-
-In other words, a *number-period-space* sequence at the beginning of a
-line. To avoid this, you can backslash-escape the period:
-
-    1986\. What a great season.
-
-
-
-<h3 id="precode">Code Blocks</h3>
-
-Pre-formatted code blocks are used for writing about programming or
-markup source code. Rather than forming normal paragraphs, the lines
-of a code block are interpreted literally. Markdown wraps a code block
-in both `<pre>` and `<code>` tags.
-
-To produce a code block in Markdown, simply indent every line of the
-block by at least 4 spaces or 1 tab. For example, given this input:
-
-    This is a normal paragraph:
-
-        This is a code block.
-
-Markdown will generate:
-
-    <p>This is a normal paragraph:</p>
-
-    <pre><code>This is a code block.
-    </code></pre>
-
-One level of indentation -- 4 spaces or 1 tab -- is removed from each
-line of the code block. For example, this:
-
-    Here is an example of AppleScript:
-
-        tell application "Foo"
-            beep
-        end tell
-
-will turn into:
-
-    <p>Here is an example of AppleScript:</p>
-
-    <pre><code>tell application "Foo"
-        beep
-    end tell
-    </code></pre>
-
-A code block continues until it reaches a line that is not indented
-(or the end of the article).
-
-Within a code block, ampersands (`&`) and angle brackets (`<` and `>`)
-are automatically converted into HTML entities. This makes it very
-easy to include example HTML source code using Markdown -- just paste
-it and indent it, and Markdown will handle the hassle of encoding the
-ampersands and angle brackets. For example, this:
-
-        <div class="footer">
-            &copy; 2004 Foo Corporation
-        </div>
-
-will turn into:
-
-    <pre><code>&lt;div class="footer"&gt;
-        &amp;copy; 2004 Foo Corporation
-    &lt;/div&gt;
-    </code></pre>
-
-Regular Markdown syntax is not processed within code blocks. E.g.,
-asterisks are just literal asterisks within a code block. This means
-it's also easy to use Markdown to write about Markdown's own syntax.
-
-
-
-<h3 id="hr">Horizontal Rules</h3>
-
-You can produce a horizontal rule tag (`<hr />`) by placing three or
-more hyphens, asterisks, or underscores on a line by themselves. If you
-wish, you may use spaces between the hyphens or asterisks. Each of the
-following lines will produce a horizontal rule:
-
-    * * *
-
-    ***
-
-    *****
-	
-    - - -
-
-    ---------------------------------------
-
-	_ _ _
-
-
-* * *
-
-<h2 id="span">Span Elements</h2>
-
-<h3 id="link">Links</h3>
-
-Markdown supports two style of links: *inline* and *reference*.
-
-In both styles, the link text is delimited by [square brackets].
-
-To create an inline link, use a set of regular parentheses immediately
-after the link text's closing square bracket. Inside the parentheses,
-put the URL where you want the link to point, along with an *optional*
-title for the link, surrounded in quotes. For example:
-
-    This is [an example](http://example.com/ "Title") inline link.
-
-    [This link](http://example.net/) has no title attribute.
-
-Will produce:
-
-    <p>This is <a href="http://example.com/" title="Title">
-    an example</a> inline link.</p>
-
-    <p><a href="http://example.net/">This link</a> has no
-    title attribute.</p>
-
-If you're referring to a local resource on the same server, you can
-use relative paths:
-
-    See my [About](/about/) page for details.
-
-Reference-style links use a second set of square brackets, inside
-which you place a label of your choosing to identify the link:
-
-    This is [an example][id] reference-style link.
-
-You can optionally use a space to separate the sets of brackets:
-
-    This is [an example] [id] reference-style link.
-
-Then, anywhere in the document, you define your link label like this,
-on a line by itself:
-
-    [id]: http://example.com/  "Optional Title Here"
-
-That is:
-
-*   Square brackets containing the link identifier (optionally
-    indented from the left margin using up to three spaces);
-*   followed by a colon;
-*   followed by one or more spaces (or tabs);
-*   followed by the URL for the link;
-*   optionally followed by a title attribute for the link, enclosed
-    in double or single quotes.
-
-The link URL may, optionally, be surrounded by angle brackets:
-
-    [id]: <http://example.com/>  "Optional Title Here"
-
-You can put the title attribute on the next line and use extra spaces
-or tabs for padding, which tends to look better with longer URLs:
-
-    [id]: http://example.com/longish/path/to/resource/here
-        "Optional Title Here"
-
-Link definitions are only used for creating links during Markdown
-processing, and are stripped from your document in the HTML output.
-
-Link definition names may constist of letters, numbers, spaces, and punctuation -- but they are *not* case sensitive. E.g. these two links:
-
-	[link text][a]
-	[link text][A]
-
-are equivalent.
-
-The *implicit link name* shortcut allows you to omit the name of the
-link, in which case the link text itself is used as the name.
-Just use an empty set of square brackets -- e.g., to link the word
-"Google" to the google.com web site, you could simply write:
-
-	[Google][]
-
-And then define the link:
-
-	[Google]: http://google.com/
-
-Because link names may contain spaces, this shortcut even works for
-multiple words in the link text:
-
-	Visit [Daring Fireball][] for more information.
-
-And then define the link:
-	
-	[Daring Fireball]: http://daringfireball.net/
-
-Link definitions can be placed anywhere in your Markdown document. I
-tend to put them immediately after each paragraph in which they're
-used, but if you want, you can put them all at the end of your
-document, sort of like footnotes.
-
-Here's an example of reference links in action:
-
-    I get 10 times more traffic from [Google] [1] than from
-    [Yahoo] [2] or [MSN] [3].
-
-      [1]: http://google.com/        "Google"
-      [2]: http://search.yahoo.com/  "Yahoo Search"
-      [3]: http://search.msn.com/    "MSN Search"
-
-Using the implicit link name shortcut, you could instead write:
-
-    I get 10 times more traffic from [Google][] than from
-    [Yahoo][] or [MSN][].
-
-      [google]: http://google.com/        "Google"
-      [yahoo]:  http://search.yahoo.com/  "Yahoo Search"
-      [msn]:    http://search.msn.com/    "MSN Search"
-
-Both of the above examples will produce the following HTML output:
-
-    <p>I get 10 times more traffic from <a href="http://google.com/"
-    title="Google">Google</a> than from
-    <a href="http://search.yahoo.com/" title="Yahoo Search">Yahoo</a>
-    or <a href="http://search.msn.com/" title="MSN Search">MSN</a>.</p>
-
-For comparison, here is the same paragraph written using
-Markdown's inline link style:
-
-    I get 10 times more traffic from [Google](http://google.com/ "Google")
-    than from [Yahoo](http://search.yahoo.com/ "Yahoo Search") or
-    [MSN](http://search.msn.com/ "MSN Search").
-
-The point of reference-style links is not that they're easier to
-write. The point is that with reference-style links, your document
-source is vastly more readable. Compare the above examples: using
-reference-style links, the paragraph itself is only 81 characters
-long; with inline-style links, it's 176 characters; and as raw HTML,
-it's 234 characters. In the raw HTML, there's more markup than there
-is text.
-
-With Markdown's reference-style links, a source document much more
-closely resembles the final output, as rendered in a browser. By
-allowing you to move the markup-related metadata out of the paragraph,
-you can add links without interrupting the narrative flow of your
-prose.
-
-
-<h3 id="em">Emphasis</h3>
-
-Markdown treats asterisks (`*`) and underscores (`_`) as indicators of
-emphasis. Text wrapped with one `*` or `_` will be wrapped with an
-HTML `<em>` tag; double `*`'s or `_`'s will be wrapped with an HTML
-`<strong>` tag. E.g., this input:
-
-    *single asterisks*
-
-    _single underscores_
-
-    **double asterisks**
-
-    __double underscores__
-
-will produce:
-
-    <em>single asterisks</em>
-
-    <em>single underscores</em>
-
-    <strong>double asterisks</strong>
-
-    <strong>double underscores</strong>
-
-You can use whichever style you prefer; the lone restriction is that
-the same character must be used to open and close an emphasis span.
-
-Emphasis can be used in the middle of a word:
-
-    un*fucking*believable
-
-But if you surround an `*` or `_` with spaces, it'll be treated as a
-literal asterisk or underscore.
-
-To produce a literal asterisk or underscore at a position where it
-would otherwise be used as an emphasis delimiter, you can backslash
-escape it:
-
-    \*this text is surrounded by literal asterisks\*
-
-
-
-<h3 id="code">Code</h3>
-
-To indicate a span of code, wrap it with backtick quotes (`` ` ``).
-Unlike a pre-formatted code block, a code span indicates code within a
-normal paragraph. For example:
-
-    Use the `printf()` function.
-
-will produce:
-
-    <p>Use the <code>printf()</code> function.</p>
-
-To include a literal backtick character within a code span, you can use
-multiple backticks as the opening and closing delimiters:
-
-    ``There is a literal backtick (`) here.``
-
-which will produce this:
-
-    <p><code>There is a literal backtick (`) here.</code></p>
-
-The backtick delimiters surrounding a code span may include spaces --
-one after the opening, one before the closing. This allows you to place
-literal backtick characters at the beginning or end of a code span:
-
-	A single backtick in a code span: `` ` ``
-	
-	A backtick-delimited string in a code span: `` `foo` ``
-
-will produce:
-
-	<p>A single backtick in a code span: <code>`</code></p>
-	
-	<p>A backtick-delimited string in a code span: <code>`foo`</code></p>
-
-With a code span, ampersands and angle brackets are encoded as HTML
-entities automatically, which makes it easy to include example HTML
-tags. Markdown will turn this:
-
-    Please don't use any `<blink>` tags.
-
-into:
-
-    <p>Please don't use any <code>&lt;blink&gt;</code> tags.</p>
-
-You can write this:
-
-    `&#8212;` is the decimal-encoded equivalent of `&mdash;`.
-
-to produce:
-
-    <p><code>&amp;#8212;</code> is the decimal-encoded
-    equivalent of <code>&amp;mdash;</code>.</p>
-
-
-
-<h3 id="img">Images</h3>
-
-Admittedly, it's fairly difficult to devise a "natural" syntax for
-placing images into a plain text document format.
-
-Markdown uses an image syntax that is intended to resemble the syntax
-for links, allowing for two styles: *inline* and *reference*.
-
-Inline image syntax looks like this:
-
-    ![Alt text](/path/to/img.jpg)
-
-    ![Alt text](/path/to/img.jpg "Optional title")
-
-That is:
-
-*   An exclamation mark: `!`;
-*   followed by a set of square brackets, containing the `alt`
-    attribute text for the image;
-*   followed by a set of parentheses, containing the URL or path to
-    the image, and an optional `title` attribute enclosed in double
-    or single quotes.
-
-Reference-style image syntax looks like this:
-
-    ![Alt text][id]
-
-Where "id" is the name of a defined image reference. Image references
-are defined using syntax identical to link references:
-
-    [id]: url/to/image  "Optional title attribute"
-
-As of this writing, Markdown has no syntax for specifying the
-dimensions of an image; if this is important to you, you can simply
-use regular HTML `<img>` tags.
-
-
-* * *
-
-
-<h2 id="misc">Miscellaneous</h2>
-
-<h3 id="autolink">Automatic Links</h3>
-
-Markdown supports a shortcut style for creating "automatic" links for URLs and email addresses: simply surround the URL or email address with angle brackets. What this means is that if you want to show the actual text of a URL or email address, and also have it be a clickable link, you can do this:
-
-    <http://example.com/>
-    
-Markdown will turn this into:
-
-    <a href="http://example.com/">http://example.com/</a>
-
-Automatic links for email addresses work similarly, except that
-Markdown will also perform a bit of randomized decimal and hex
-entity-encoding to help obscure your address from address-harvesting
-spambots. For example, Markdown will turn this:
-
-    <address@example.com>
-
-into something like this:
-
-    <a href="&#x6D;&#x61;i&#x6C;&#x74;&#x6F;:&#x61;&#x64;&#x64;&#x72;&#x65;
-    &#115;&#115;&#64;&#101;&#120;&#x61;&#109;&#x70;&#x6C;e&#x2E;&#99;&#111;
-    &#109;">&#x61;&#x64;&#x64;&#x72;&#x65;&#115;&#115;&#64;&#101;&#120;&#x61;
-    &#109;&#x70;&#x6C;e&#x2E;&#99;&#111;&#109;</a>
-
-which will render in a browser as a clickable link to "address@example.com".
-
-(This sort of entity-encoding trick will indeed fool many, if not
-most, address-harvesting bots, but it definitely won't fool all of
-them. It's better than nothing, but an address published in this way
-will probably eventually start receiving spam.)
-
-
-
-<h3 id="backslash">Backslash Escapes</h3>
-
-Markdown allows you to use backslash escapes to generate literal
-characters which would otherwise have special meaning in Markdown's
-formatting syntax. For example, if you wanted to surround a word with
-literal asterisks (instead of an HTML `<em>` tag), you can backslashes
-before the asterisks, like this:
-
-    \*literal asterisks\*
-
-Markdown provides backslash escapes for the following characters:
-
-    \   backslash
-    `   backtick
-    *   asterisk
-    _   underscore
-    {}  curly braces
-    []  square brackets
-    ()  parentheses
-    #   hash mark
-	+	plus sign
-	-	minus sign (hyphen)
-    .   dot
-    !   exclamation mark
-
diff --git a/test/rdoc/MarkdownTest_1.0.3/Nested blockquotes.text b/test/rdoc/MarkdownTest_1.0.3/Nested blockquotes.text
deleted file mode 100644
index ed3c624ffbedcb..00000000000000
--- a/test/rdoc/MarkdownTest_1.0.3/Nested blockquotes.text	
+++ /dev/null
@@ -1,5 +0,0 @@
-> foo
->
-> > bar
->
-> foo
diff --git a/test/rdoc/MarkdownTest_1.0.3/Ordered and unordered lists.text b/test/rdoc/MarkdownTest_1.0.3/Ordered and unordered lists.text
deleted file mode 100644
index 7f3b49777f29e8..00000000000000
--- a/test/rdoc/MarkdownTest_1.0.3/Ordered and unordered lists.text	
+++ /dev/null
@@ -1,131 +0,0 @@
-## Unordered
-
-Asterisks tight:
-
-*	asterisk 1
-*	asterisk 2
-*	asterisk 3
-
-
-Asterisks loose:
-
-*	asterisk 1
-
-*	asterisk 2
-
-*	asterisk 3
-
-* * *
-
-Pluses tight:
-
-+	Plus 1
-+	Plus 2
-+	Plus 3
-
-
-Pluses loose:
-
-+	Plus 1
-
-+	Plus 2
-
-+	Plus 3
-
-* * *
-
-
-Minuses tight:
-
--	Minus 1
--	Minus 2
--	Minus 3
-
-
-Minuses loose:
-
--	Minus 1
-
--	Minus 2
-
--	Minus 3
-
-
-## Ordered
-
-Tight:
-
-1.	First
-2.	Second
-3.	Third
-
-and:
-
-1. One
-2. Two
-3. Three
-
-
-Loose using tabs:
-
-1.	First
-
-2.	Second
-
-3.	Third
-
-and using spaces:
-
-1. One
-
-2. Two
-
-3. Three
-
-Multiple paragraphs:
-
-1.	Item 1, graf one.
-
-	Item 2. graf two. The quick brown fox jumped over the lazy dog's
-	back.
-	
-2.	Item 2.
-
-3.	Item 3.
-
-
-
-## Nested
-
-*	Tab
-	*	Tab
-		*	Tab
-
-Here's another:
-
-1. First
-2. Second:
-	* Fee
-	* Fie
-	* Foe
-3. Third
-
-Same thing but with paragraphs:
-
-1. First
-
-2. Second:
-	* Fee
-	* Fie
-	* Foe
-
-3. Third
-
-
-This was an error in Markdown 1.0.1:
-
-*	this
-
-	*	sub
-
-	that
diff --git a/test/rdoc/MarkdownTest_1.0.3/Strong and em together.text b/test/rdoc/MarkdownTest_1.0.3/Strong and em together.text
deleted file mode 100644
index 95ee690dbe2713..00000000000000
--- a/test/rdoc/MarkdownTest_1.0.3/Strong and em together.text	
+++ /dev/null
@@ -1,7 +0,0 @@
-***This is strong and em.***
-
-So is ***this*** word.
-
-___This is strong and em.___
-
-So is ___this___ word.
diff --git a/test/rdoc/MarkdownTest_1.0.3/Tabs.text b/test/rdoc/MarkdownTest_1.0.3/Tabs.text
deleted file mode 100644
index 589d1136e19c0b..00000000000000
--- a/test/rdoc/MarkdownTest_1.0.3/Tabs.text
+++ /dev/null
@@ -1,21 +0,0 @@
-+	this is a list item
-	indented with tabs
-
-+   this is a list item
-    indented with spaces
-
-Code:
-
-	this code block is indented by one tab
-
-And:
-
-		this code block is indented by two tabs
-
-And:
-
-	+	this is an example list item
-		indented with tabs
-	
-	+   this is an example list item
-	    indented with spaces
diff --git a/test/rdoc/MarkdownTest_1.0.3/Tidyness.text b/test/rdoc/MarkdownTest_1.0.3/Tidyness.text
deleted file mode 100644
index 5f18b8da214b79..00000000000000
--- a/test/rdoc/MarkdownTest_1.0.3/Tidyness.text
+++ /dev/null
@@ -1,5 +0,0 @@
-> A list within a blockquote:
-> 
-> *	asterisk 1
-> *	asterisk 2
-> *	asterisk 3
diff --git a/test/rdoc/README b/test/rdoc/README
deleted file mode 100644
index 4ef17a77f7731b..00000000000000
--- a/test/rdoc/README
+++ /dev/null
@@ -1 +0,0 @@
-you don't have to
diff --git a/test/rdoc/binary.dat b/test/rdoc/binary.dat
deleted file mode 100644
index 371950efe69506..00000000000000
Binary files a/test/rdoc/binary.dat and /dev/null differ
diff --git a/test/rdoc/helper.rb b/test/rdoc/helper.rb
deleted file mode 100644
index 79854330604b4b..00000000000000
--- a/test/rdoc/helper.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-# frozen_string_literal: true
-
-require_relative 'support/test_case'
-require_relative 'support/formatter_test_case'
-require_relative 'support/text_formatter_test_case'
diff --git a/test/rdoc/hidden.zip.txt b/test/rdoc/hidden.zip.txt
deleted file mode 100644
index 2400e38b7debe2..00000000000000
--- a/test/rdoc/hidden.zip.txt
+++ /dev/null
@@ -1 +0,0 @@
-PK
diff --git a/test/rdoc/support/formatter_test_case.rb b/test/rdoc/support/formatter_test_case.rb
deleted file mode 100644
index 9f49dd0897c277..00000000000000
--- a/test/rdoc/support/formatter_test_case.rb
+++ /dev/null
@@ -1,764 +0,0 @@
-# frozen_string_literal: true
-require 'test/unit'
-
-##
-# Test case for creating new RDoc::Markup formatters.  See
-# test/test_rdoc_markup_to_*.rb for examples.
-#
-# This test case adds a variety of tests to your subclass when
-# #add_visitor_tests is called.  Most tests set up a scenario then call a
-# method you will provide to perform the assertion on the output.
-#
-# Your subclass must instantiate a visitor and assign it to <tt>@to</tt>.
-#
-# For example, test_accept_blank_line sets up a RDoc::Markup::BlockLine then
-# calls accept_blank_line on your visitor.  You are responsible for asserting
-# that the output is correct.
-#
-# Example:
-#
-#  class TestRDocMarkupToNewFormat < RDoc::Markup::FormatterTestCase
-#
-#    add_visitor_tests
-#
-#    def setup
-#      super
-#
-#      @to = RDoc::Markup::ToNewFormat.new
-#    end
-#
-#    def accept_blank_line
-#      assert_equal :junk, @to.res.join
-#    end
-#
-#    # ...
-#
-#  end
-
-class RDoc::Markup::FormatterTestCase < RDoc::TestCase
-
-  ##
-  # Call #setup when inheriting from this test case.
-  #
-  # Provides the following instance variables:
-  #
-  # +@m+::           RDoc::Markup.new
-  # +@RM+::          RDoc::Markup # to reduce typing
-  # +@bullet_list+:: @RM::List.new :BULLET, # ...
-  # +@label_list+::  @RM::List.new :LABEL, # ...
-  # +@lalpha_list+:: @RM::List.new :LALPHA, # ...
-  # +@note_list+::   @RM::List.new :NOTE, # ...
-  # +@number_list+:: @RM::List.new :NUMBER, # ...
-  # +@ualpha_list+:: @RM::List.new :UALPHA, # ...
-
-  def setup
-    super
-
-    @options = RDoc::Options.new
-
-    @m = @RM.new
-
-    @bullet_list = @RM::List.new(:BULLET,
-      @RM::ListItem.new(nil, @RM::Paragraph.new('l1')),
-      @RM::ListItem.new(nil, @RM::Paragraph.new('l2')))
-
-    @label_list = @RM::List.new(:LABEL,
-      @RM::ListItem.new('cat', @RM::Paragraph.new('cats are cool')),
-      @RM::ListItem.new('dog', @RM::Paragraph.new('dogs are cool too')))
-
-    @lalpha_list = @RM::List.new(:LALPHA,
-      @RM::ListItem.new(nil, @RM::Paragraph.new('l1')),
-      @RM::ListItem.new(nil, @RM::Paragraph.new('l2')))
-
-    @note_list = @RM::List.new(:NOTE,
-      @RM::ListItem.new('cat', @RM::Paragraph.new('cats are cool')),
-      @RM::ListItem.new('dog', @RM::Paragraph.new('dogs are cool too')))
-
-    @number_list = @RM::List.new(:NUMBER,
-      @RM::ListItem.new(nil, @RM::Paragraph.new('l1')),
-      @RM::ListItem.new(nil, @RM::Paragraph.new('l2')))
-
-    @ualpha_list = @RM::List.new(:UALPHA,
-      @RM::ListItem.new(nil, @RM::Paragraph.new('l1')),
-      @RM::ListItem.new(nil, @RM::Paragraph.new('l2')))
-  end
-
-  ##
-  # Call to add the visitor tests to your test case
-
-  def self.add_visitor_tests
-    class_eval do
-
-      ##
-      # Calls start_accepting which needs to verify startup state
-
-      def test_start_accepting
-        @to.start_accepting
-
-        start_accepting
-      end
-
-      ##
-      # Calls end_accepting on your test case which needs to call
-      # <tt>@to.end_accepting</tt> and verify document generation
-
-      def test_end_accepting
-        @to.start_accepting
-        @to.res << 'hi'
-
-        end_accepting
-      end
-
-      ##
-      # Calls accept_blank_line
-
-      def test_accept_blank_line
-        @to.start_accepting
-
-        @to.accept_blank_line @RM::BlankLine.new
-
-        accept_blank_line
-      end
-
-      ##
-      # Calls accept_block_quote
-
-      def test_accept_block_quote
-        @to.start_accepting
-
-        @to.accept_block_quote block para 'quote'
-
-        accept_block_quote
-      end
-      ##
-      # Test case that calls <tt>@to.accept_document</tt>
-
-      def test_accept_document
-        @to.start_accepting
-        @to.accept_document @RM::Document.new @RM::Paragraph.new 'hello'
-
-        accept_document
-      end
-
-      ##
-      # Calls accept_heading with a level 5 RDoc::Markup::Heading
-
-      def test_accept_heading
-        @to.start_accepting
-
-        @to.accept_heading @RM::Heading.new(5, 'Hello')
-
-        accept_heading
-      end
-
-      ##
-      # Calls accept_heading_1 with a level 1 RDoc::Markup::Heading
-
-      def test_accept_heading_1
-        @to.start_accepting
-
-        @to.accept_heading @RM::Heading.new(1, 'Hello')
-
-        accept_heading_1
-      end
-
-      ##
-      # Calls accept_heading_2 with a level 2 RDoc::Markup::Heading
-
-      def test_accept_heading_2
-        @to.start_accepting
-
-        @to.accept_heading @RM::Heading.new(2, 'Hello')
-
-        accept_heading_2
-      end
-
-      ##
-      # Calls accept_heading_3 with a level 3 RDoc::Markup::Heading
-
-      def test_accept_heading_3
-        @to.start_accepting
-
-        @to.accept_heading @RM::Heading.new(3, 'Hello')
-
-        accept_heading_3
-      end
-
-      ##
-      # Calls accept_heading_4 with a level 4 RDoc::Markup::Heading
-
-      def test_accept_heading_4
-        @to.start_accepting
-
-        @to.accept_heading @RM::Heading.new(4, 'Hello')
-
-        accept_heading_4
-      end
-
-      ##
-      # Calls accept_heading_b with a bold level 1 RDoc::Markup::Heading
-
-      def test_accept_heading_b
-        @to.start_accepting
-
-        @to.accept_heading @RM::Heading.new(1, '*Hello*')
-
-        accept_heading_b
-      end
-
-      ##
-      # Calls accept_heading_suppressed_crossref with a level 1
-      # RDoc::Markup::Heading containing a suppressed crossref
-
-      def test_accept_heading_suppressed_crossref # HACK to_html_crossref test
-        @to.start_accepting
-
-        @to.accept_heading @RM::Heading.new(1, '\\Hello')
-
-        accept_heading_suppressed_crossref
-      end
-
-      ##
-      # Calls accept_paragraph
-
-      def test_accept_paragraph
-        @to.start_accepting
-
-        @to.accept_paragraph @RM::Paragraph.new('hi')
-
-        accept_paragraph
-      end
-
-      ##
-      # Calls accept_paragraph_b with a RDoc::Markup::Paragraph containing
-      # bold words
-
-      def test_accept_paragraph_b
-        @to.start_accepting
-
-        @to.accept_paragraph @RM::Paragraph.new('reg <b>bold words</b> reg')
-
-        accept_paragraph_b
-      end
-
-      ##
-      # Calls accept_paragraph_br with a RDoc::Markup::Paragraph containing
-      # a \<br>
-
-      def test_accept_paragraph_br
-        @to.start_accepting
-
-        @to.accept_paragraph para 'one<br>two'
-
-        accept_paragraph_br
-      end
-
-      ##
-      # Calls accept_paragraph with a Paragraph containing a hard break
-
-      def test_accept_paragraph_break
-        @to.start_accepting
-
-        @to.accept_paragraph para('hello', hard_break, 'world')
-
-        accept_paragraph_break
-      end
-
-      ##
-      # Calls accept_paragraph_i with a RDoc::Markup::Paragraph containing
-      # emphasized words
-
-      def test_accept_paragraph_i
-        @to.start_accepting
-
-        @to.accept_paragraph @RM::Paragraph.new('reg <em>italic words</em> reg')
-
-        accept_paragraph_i
-      end
-
-      ##
-      # Calls accept_paragraph_plus with a RDoc::Markup::Paragraph containing
-      # teletype words
-
-      def test_accept_paragraph_plus
-        @to.start_accepting
-
-        @to.accept_paragraph @RM::Paragraph.new('reg +teletype+ reg')
-
-        accept_paragraph_plus
-      end
-
-      ##
-      # Calls accept_paragraph_star with a RDoc::Markup::Paragraph containing
-      # bold words
-
-      def test_accept_paragraph_star
-        @to.start_accepting
-
-        @to.accept_paragraph @RM::Paragraph.new('reg *bold* reg')
-
-        accept_paragraph_star
-      end
-
-      ##
-      # Calls accept_paragraph_underscore with a RDoc::Markup::Paragraph
-      # containing emphasized words
-
-      def test_accept_paragraph_underscore
-        @to.start_accepting
-
-        @to.accept_paragraph @RM::Paragraph.new('reg _italic_ reg')
-
-        accept_paragraph_underscore
-      end
-
-      ##
-      # Calls accept_verbatim with a RDoc::Markup::Verbatim
-
-      def test_accept_verbatim
-        @to.start_accepting
-
-        @to.accept_verbatim @RM::Verbatim.new("hi\n", "  world\n")
-
-        accept_verbatim
-      end
-
-      ##
-      # Calls accept_raw with a RDoc::Markup::Raw
-
-      def test_accept_raw
-        @to.start_accepting
-
-        @to.accept_raw @RM::Raw.new("<table>",
-                                    "<tr><th>Name<th>Count",
-                                    "<tr><td>a<td>1",
-                                    "<tr><td>b<td>2",
-                                    "</table>")
-
-        accept_raw
-      end
-
-      ##
-      # Calls accept_rule with a RDoc::Markup::Rule
-
-      def test_accept_rule
-        @to.start_accepting
-
-        @to.accept_rule @RM::Rule.new(4)
-
-        accept_rule
-      end
-
-      ##
-      # Calls accept_list_item_start_bullet
-
-      def test_accept_list_item_start_bullet
-        @to.start_accepting
-
-        @to.accept_list_start @bullet_list
-
-        @to.accept_list_item_start @bullet_list.items.first
-
-        accept_list_item_start_bullet
-      end
-
-      ##
-      # Calls accept_list_item_start_label
-
-      def test_accept_list_item_start_label
-        @to.start_accepting
-
-        @to.accept_list_start @label_list
-
-        @to.accept_list_item_start @label_list.items.first
-
-        accept_list_item_start_label
-      end
-
-      ##
-      # Calls accept_list_item_start_lalpha
-
-      def test_accept_list_item_start_lalpha
-        @to.start_accepting
-
-        @to.accept_list_start @lalpha_list
-
-        @to.accept_list_item_start @lalpha_list.items.first
-
-        accept_list_item_start_lalpha
-      end
-
-      ##
-      # Calls accept_list_item_start_note
-
-      def test_accept_list_item_start_note
-        @to.start_accepting
-
-        @to.accept_list_start @note_list
-
-        @to.accept_list_item_start @note_list.items.first
-
-        accept_list_item_start_note
-      end
-
-      ##
-      # Calls accept_list_item_start_note_2
-
-      def test_accept_list_item_start_note_2
-        list = list(:NOTE,
-                 item('<tt>teletype</tt>',
-                   para('teletype description')))
-
-        @to.start_accepting
-
-        list.accept @to
-
-        @to.end_accepting
-
-        accept_list_item_start_note_2
-      end
-
-      ##
-      # Calls accept_list_item_start_note_multi_description
-
-      def test_accept_list_item_start_note_multi_description
-        list = list(:NOTE,
-                 item(%w[label],
-                   para('description one')),
-                 item(nil, para('description two')))
-
-        @to.start_accepting
-
-        list.accept @to
-
-        @to.end_accepting
-
-        accept_list_item_start_note_multi_description
-      end
-
-      ##
-      # Calls accept_list_item_start_note_multi_label
-
-      def test_accept_list_item_start_note_multi_label
-        list = list(:NOTE,
-                 item(%w[one two],
-                   para('two headers')))
-
-        @to.start_accepting
-
-        list.accept @to
-
-        @to.end_accepting
-
-        accept_list_item_start_note_multi_label
-      end
-
-      ##
-      # Calls accept_list_item_start_number
-
-      def test_accept_list_item_start_number
-        @to.start_accepting
-
-        @to.accept_list_start @number_list
-
-        @to.accept_list_item_start @number_list.items.first
-
-        accept_list_item_start_number
-      end
-
-      ##
-      # Calls accept_list_item_start_ualpha
-
-      def test_accept_list_item_start_ualpha
-        @to.start_accepting
-
-        @to.accept_list_start @ualpha_list
-
-        @to.accept_list_item_start @ualpha_list.items.first
-
-        accept_list_item_start_ualpha
-      end
-
-      ##
-      # Calls accept_list_item_end_bullet
-
-      def test_accept_list_item_end_bullet
-        @to.start_accepting
-
-        @to.accept_list_start @bullet_list
-
-        @to.accept_list_item_start @bullet_list.items.first
-
-        @to.accept_list_item_end @bullet_list.items.first
-
-        accept_list_item_end_bullet
-      end
-
-      ##
-      # Calls accept_list_item_end_label
-
-      def test_accept_list_item_end_label
-        @to.start_accepting
-
-        @to.accept_list_start @label_list
-
-        @to.accept_list_item_start @label_list.items.first
-
-        @to.accept_list_item_end @label_list.items.first
-
-        accept_list_item_end_label
-      end
-
-      ##
-      # Calls accept_list_item_end_lalpha
-
-      def test_accept_list_item_end_lalpha
-        @to.start_accepting
-
-        @to.accept_list_start @lalpha_list
-
-        @to.accept_list_item_start @lalpha_list.items.first
-
-        @to.accept_list_item_end @lalpha_list.items.first
-
-        accept_list_item_end_lalpha
-      end
-
-      ##
-      # Calls accept_list_item_end_note
-
-      def test_accept_list_item_end_note
-        @to.start_accepting
-
-        @to.accept_list_start @note_list
-
-        @to.accept_list_item_start @note_list.items.first
-
-        @to.accept_list_item_end @note_list.items.first
-
-        accept_list_item_end_note
-      end
-
-      ##
-      # Calls accept_list_item_end_number
-
-      def test_accept_list_item_end_number
-        @to.start_accepting
-
-        @to.accept_list_start @number_list
-
-        @to.accept_list_item_start @number_list.items.first
-
-        @to.accept_list_item_end @number_list.items.first
-
-        accept_list_item_end_number
-      end
-
-      ##
-      # Calls accept_list_item_end_ualpha
-
-      def test_accept_list_item_end_ualpha
-        @to.start_accepting
-
-        @to.accept_list_start @ualpha_list
-
-        @to.accept_list_item_start @ualpha_list.items.first
-
-        @to.accept_list_item_end @ualpha_list.items.first
-
-        accept_list_item_end_ualpha
-      end
-
-      ##
-      # Calls accept_list_start_bullet
-
-      def test_accept_list_start_bullet
-        @to.start_accepting
-
-        @to.accept_list_start @bullet_list
-
-        accept_list_start_bullet
-      end
-
-      ##
-      # Calls accept_list_start_label
-
-      def test_accept_list_start_label
-        @to.start_accepting
-
-        @to.accept_list_start @label_list
-
-        accept_list_start_label
-      end
-
-      ##
-      # Calls accept_list_start_lalpha
-
-      def test_accept_list_start_lalpha
-        @to.start_accepting
-
-        @to.accept_list_start @lalpha_list
-
-        accept_list_start_lalpha
-      end
-
-      ##
-      # Calls accept_list_start_note
-
-      def test_accept_list_start_note
-        @to.start_accepting
-
-        @to.accept_list_start @note_list
-
-        accept_list_start_note
-      end
-
-      ##
-      # Calls accept_list_start_number
-
-      def test_accept_list_start_number
-        @to.start_accepting
-
-        @to.accept_list_start @number_list
-
-        accept_list_start_number
-      end
-
-      ##
-      # Calls accept_list_start_ualpha
-
-      def test_accept_list_start_ualpha
-        @to.start_accepting
-
-        @to.accept_list_start @ualpha_list
-
-        accept_list_start_ualpha
-      end
-
-      ##
-      # Calls accept_list_end_bullet
-
-      def test_accept_list_end_bullet
-        @to.start_accepting
-
-        @to.accept_list_start @bullet_list
-
-        @to.accept_list_end @bullet_list
-
-        accept_list_end_bullet
-      end
-
-      ##
-      # Calls accept_list_end_label
-
-      def test_accept_list_end_label
-        @to.start_accepting
-
-        @to.accept_list_start @label_list
-
-        @to.accept_list_end @label_list
-
-        accept_list_end_label
-      end
-
-      ##
-      # Calls accept_list_end_lalpha
-
-      def test_accept_list_end_lalpha
-        @to.start_accepting
-
-        @to.accept_list_start @lalpha_list
-
-        @to.accept_list_end @lalpha_list
-
-        accept_list_end_lalpha
-      end
-
-      ##
-      # Calls accept_list_end_number
-
-      def test_accept_list_end_number
-        @to.start_accepting
-
-        @to.accept_list_start @number_list
-
-        @to.accept_list_end @number_list
-
-        accept_list_end_number
-      end
-
-      ##
-      # Calls accept_list_end_note
-
-      def test_accept_list_end_note
-        @to.start_accepting
-
-        @to.accept_list_start @note_list
-
-        @to.accept_list_end @note_list
-
-        accept_list_end_note
-      end
-
-      ##
-      # Calls accept_list_end_ualpha
-
-      def test_accept_list_end_ualpha
-        @to.start_accepting
-
-        @to.accept_list_start @ualpha_list
-
-        @to.accept_list_end @ualpha_list
-
-        accept_list_end_ualpha
-      end
-
-      ##
-      # Calls list_nested with a two-level list
-
-      def test_list_nested
-        doc = @RM::Document.new(
-                @RM::List.new(:BULLET,
-                  @RM::ListItem.new(nil,
-                    @RM::Paragraph.new('l1'),
-                    @RM::List.new(:BULLET,
-                      @RM::ListItem.new(nil,
-                        @RM::Paragraph.new('l1.1')))),
-                  @RM::ListItem.new(nil,
-                    @RM::Paragraph.new('l2'))))
-
-        doc.accept @to
-
-        list_nested
-      end
-
-      ##
-      # Calls list_verbatim with a list containing a verbatim block
-
-      def test_list_verbatim # HACK overblown
-        doc =
-          doc(
-            list(:BULLET,
-              item(nil,
-                para('list stuff'),
-                blank_line,
-                verb("* list\n",
-                     "  with\n",
-                     "\n",
-                     "  second\n",
-                     "\n",
-                     "  1. indented\n",
-                     "  2. numbered\n",
-                     "\n",
-                     "  third\n",
-                     "\n",
-                     "* second\n"))))
-
-        doc.accept @to
-
-        list_verbatim
-      end
-    end
-  end
-
-end
diff --git a/test/rdoc/support/test_case.rb b/test/rdoc/support/test_case.rb
deleted file mode 100644
index d98dbe0d7bff7a..00000000000000
--- a/test/rdoc/support/test_case.rb
+++ /dev/null
@@ -1,217 +0,0 @@
-require 'bundler/errors'
-begin
-  gem 'test-unit'
-rescue NoMethodError, Gem::LoadError, Bundler::GemfileNotFound
-  # for ruby tests
-end
-
-require 'test/unit'
-
-require 'fileutils'
-require 'pp'
-require 'tempfile'
-require 'tmpdir'
-require 'stringio'
-
-require_relative '../../../lib/rdoc'
-
-##
-# RDoc::TestCase is an abstract TestCase to provide common setup and teardown
-# across all RDoc tests.  The test case uses test-unit, so all the assertions
-# of test-unit may be used.
-#
-# The testcase provides the following:
-#
-# * A reset code-object tree
-# * A reset markup preprocessor (RDoc::Markup::PreProcess)
-# * The <code>@RM</code> alias of RDoc::Markup (for less typing)
-# * <code>@pwd</code> containing the current working directory
-# * FileUtils, pp, Tempfile, Dir.tmpdir and StringIO
-
-class RDoc::TestCase < Test::Unit::TestCase
-
-  ##
-  # Abstract test-case setup
-
-  def setup
-    super
-
-    @orig_home = ENV["HOME"]
-    FileUtils.mkdir_p(@test_home = Dir.mktmpdir("test_rdoc_"))
-    ENV["HOME"] = @test_home
-
-    @top_level = nil
-
-    @RM = RDoc::Markup
-
-    @pwd = Dir.pwd
-
-    @store = RDoc::Store.new
-
-    @rdoc = RDoc::RDoc.new
-    @rdoc.store = @store
-    @rdoc.options = RDoc::Options.new
-
-    g = Object.new
-    def g.class_dir() end
-    def g.file_dir() end
-    @rdoc.generator = g
-
-    RDoc::Markup::PreProcess.reset
-  end
-
-  ##
-  # Abstract test-case teardown
-
-  def teardown
-    ENV["HOME"] = @orig_home if defined?(@orig_home)
-    defined?(@test_home) and FileUtils.rm_rf @test_home
-
-    super
-  end
-
-  ##
-  # Asserts +path+ is a file
-
-  def assert_file path
-    assert File.file?(path), "#{path} is not a file"
-  end
-
-  ##
-  # Asserts +path+ is a directory
-
-  def assert_directory path
-    assert File.directory?(path), "#{path} is not a directory"
-  end
-
-  ##
-  # Refutes +path+ exists
-
-  def refute_file path
-    refute File.exist?(path), "#{path} exists"
-  end
-
-  ##
-  # Shortcut for RDoc::Markup::BlankLine.new
-
-  def blank_line
-    @RM::BlankLine.new
-  end
-
-  ##
-  # Shortcut for RDoc::Markup::BlockQuote.new with +contents+
-
-  def block *contents
-    @RM::BlockQuote.new(*contents)
-  end
-
-  ##
-  # Creates an RDoc::Comment with +text+ which was defined on +top_level+.
-  # By default the comment has the 'rdoc' format.
-
-  def comment text, top_level = @top_level, language = nil
-    comment = RDoc::Comment.new text, top_level, language
-    comment
-  end
-
-  ##
-  # Shortcut for RDoc::Markup::Document.new with +contents+
-
-  def doc *contents
-    @RM::Document.new(*contents)
-  end
-
-  ##
-  # Shortcut for RDoc::Markup::HardBreak.new
-
-  def hard_break
-    @RM::HardBreak.new
-  end
-
-  ##
-  # Shortcut for RDoc::Markup::Heading.new with +level+ and +text+
-
-  def head level, text
-    @RM::Heading.new level, text
-  end
-
-  ##
-  # Shortcut for RDoc::Markup::ListItem.new with +label+ and +parts+
-
-  def item label = nil, *parts
-    @RM::ListItem.new label, *parts
-  end
-
-  ##
-  # Shortcut for RDoc::Markup::List.new with +type+ and +items+
-
-  def list type = nil, *items
-    @RM::List.new type, *items
-  end
-
-  ##
-  # Enables pretty-print output
-
-  def mu_pp obj # :nodoc:
-    s = obj.pretty_inspect
-    s = RDoc::Encoding.change_encoding s, Encoding.default_external
-    s.chomp
-  end
-
-  ##
-  # Shortcut for RDoc::Markup::Paragraph.new with +contents+
-
-  def para *a
-    @RM::Paragraph.new(*a)
-  end
-
-  ##
-  # Shortcut for RDoc::Markup::Rule.new with +weight+
-
-  def rule weight
-    @RM::Rule.new weight
-  end
-
-  ##
-  # Shortcut for RDoc::Markup::Raw.new with +contents+
-
-  def raw *contents
-    @RM::Raw.new(*contents)
-  end
-
-  ##
-  # Creates a temporary directory changes the current directory to it for the
-  # duration of the block.
-  #
-  # Depends upon Dir.mktmpdir
-
-  def temp_dir
-    Dir.mktmpdir do |temp_dir|
-      Dir.chdir temp_dir do
-        yield temp_dir
-      end
-    end
-  end
-
-  ##
-  # Shortcut for RDoc::Markup::Verbatim.new with +parts+
-
-  def verb *parts
-    @RM::Verbatim.new(*parts)
-  end
-
-  ##
-  # run capture_io with setting $VERBOSE = true
-
-  def verbose_capture_output
-    capture_output do
-      begin
-        orig_verbose = $VERBOSE
-        $VERBOSE = true
-        yield
-      ensure
-        $VERBOSE = orig_verbose
-      end
-    end
-  end
-end
diff --git a/test/rdoc/support/text_formatter_test_case.rb b/test/rdoc/support/text_formatter_test_case.rb
deleted file mode 100644
index e359028a292259..00000000000000
--- a/test/rdoc/support/text_formatter_test_case.rb
+++ /dev/null
@@ -1,114 +0,0 @@
-# frozen_string_literal: true
-##
-# Test case for creating new plain-text RDoc::Markup formatters.  See also
-# RDoc::Markup::FormatterTestCase
-#
-# See test_rdoc_markup_to_rdoc.rb for a complete example.
-#
-# Example:
-#
-#  class TestRDocMarkupToNewTextFormat < RDoc::Markup::TextFormatterTestCase
-#
-#    add_visitor_tests
-#    add_text_tests
-#
-#    def setup
-#      super
-#
-#      @to = RDoc::Markup::ToNewTextFormat.new
-#    end
-#
-#    def accept_blank_line
-#      assert_equal :junk, @to.res.join
-#    end
-#
-#    # ...
-#
-#  end
-
-class RDoc::Markup::TextFormatterTestCase < RDoc::Markup::FormatterTestCase
-
-  ##
-  # Adds test cases to the calling TestCase.
-
-  def self.add_text_tests
-    self.class_eval do
-
-      ##
-      # Test case that calls <tt>@to.accept_heading</tt>
-
-      def test_accept_heading_indent
-        @to.start_accepting
-        @to.indent = 3
-        @to.accept_heading @RM::Heading.new(1, 'Hello')
-
-        accept_heading_indent
-      end
-
-      ##
-      # Test case that calls <tt>@to.accept_rule</tt>
-
-      def test_accept_rule_indent
-        @to.start_accepting
-        @to.indent = 3
-        @to.accept_rule @RM::Rule.new(1)
-
-        accept_rule_indent
-      end
-
-      ##
-      # Test case that calls <tt>@to.accept_verbatim</tt>
-
-      def test_accept_verbatim_indent
-        @to.start_accepting
-        @to.indent = 2
-        @to.accept_verbatim @RM::Verbatim.new("hi\n", " world\n")
-
-        accept_verbatim_indent
-      end
-
-      ##
-      # Test case that calls <tt>@to.accept_verbatim</tt> with a big indent
-
-      def test_accept_verbatim_big_indent
-        @to.start_accepting
-        @to.indent = 2
-        @to.accept_verbatim @RM::Verbatim.new("hi\n", "world\n")
-
-        accept_verbatim_big_indent
-      end
-
-      ##
-      # Test case that calls <tt>@to.accept_paragraph</tt> with an indent
-
-      def test_accept_paragraph_indent
-        @to.start_accepting
-        @to.indent = 3
-        @to.accept_paragraph @RM::Paragraph.new(('words ' * 30).strip)
-
-        accept_paragraph_indent
-      end
-
-      ##
-      # Test case that calls <tt>@to.accept_paragraph</tt> with a long line
-
-      def test_accept_paragraph_wrap
-        @to.start_accepting
-        @to.accept_paragraph @RM::Paragraph.new(('words ' * 30).strip)
-
-        accept_paragraph_wrap
-      end
-
-      ##
-      # Test case that calls <tt>@to.attributes</tt> with an escaped
-      # cross-reference.  If this test doesn't pass something may be very
-      # wrong.
-
-      def test_attributes
-        assert_equal 'Dog', @to.attributes("\\Dog")
-      end
-
-    end
-  end
-
-end
diff --git a/test/rdoc/test.ja.largedoc b/test/rdoc/test.ja.largedoc
deleted file mode 100644
index a9c6c4691c73e8..00000000000000
--- a/test/rdoc/test.ja.largedoc
+++ /dev/null
@@ -1,3 +0,0 @@
-# -*- coding: utf-8 -*-
- 吾輩（わがはい）は猫である。名前はまだ無い。
- どこで生れたかとんと見当（けんとう）がつかぬ。何でも薄暗いじめじめした所でニャーニャー泣いていた事だけは記憶している。吾輩はここで始めて人間というものを見た。しかもあとで聞くとそれは書生という人間中で一番獰悪（どうあく）な種族であったそうだ。この書生というのは時々我々を捕（つかま）えて煮（に）て食うという話である。しかしその当時は何という考もなかったから別段恐しいとも思わなかった。ただ彼の掌（てのひら）に載せられてスーと持ち上げられた時何だかフワフワした感じがあったばかりである。掌の上で少し落ちついて書生の顔を見たのがいわゆる人間というものの見始（みはじめ）であろう。この時妙なものだと思った感じが今でも残っている。第一毛をもって装飾されべきはずの顔がつるつるしてまるで薬缶（やかん）だ。その後（ご）猫にもだいぶ逢（あ）ったがこんな片輪（かたわ）には一度も出会（でく）わした事がない。のみならず顔の真中があまりに突起している。そうしてその穴の中から時々ぷうぷうと煙（けむり）を吹く。どうも咽（む）せぽくて実に弱った。これが人間の飲む煙草（たばこ）というものである事はようやくこの頃知った。
diff --git a/test/rdoc/test.ja.rdoc b/test/rdoc/test.ja.rdoc
deleted file mode 100644
index cd01cab37a13ac..00000000000000
--- a/test/rdoc/test.ja.rdoc
+++ /dev/null
@@ -1,10 +0,0 @@
-# -*- coding: utf-8 -*-
-
-こんにちは！
-
-初めまして。アーロンと申します。
-
-どんな食べ物が好きですか？私はフランスの料理が大好きです。
-日本の料理も大好きです。
-
-食べ物を食べるのが大好きだけど、お皿を洗うのが大嫌いです。
diff --git a/test/rdoc/test.ja.txt b/test/rdoc/test.ja.txt
deleted file mode 100644
index 96e1db93d36cfe..00000000000000
--- a/test/rdoc/test.ja.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-こんにちは！
-
-初めまして。アーロンと申します。
-
-どんな食べ物が好きですか？私はフランスの料理が大好きです。
-日本の料理も大好きです。
-
-食べ物を食べるのが大好きだけど、お皿を洗うのが大嫌いです。
diff --git a/test/rdoc/test.txt b/test/rdoc/test.txt
deleted file mode 100644
index 16b14f5da9e2fc..00000000000000
--- a/test/rdoc/test.txt
+++ /dev/null
@@ -1 +0,0 @@
-test file
diff --git a/test/rdoc/test_rdoc_alias.rb b/test/rdoc/test_rdoc_alias.rb
deleted file mode 100644
index 3c096a49b4c5bf..00000000000000
--- a/test/rdoc/test_rdoc_alias.rb
+++ /dev/null
@@ -1,13 +0,0 @@
-# frozen_string_literal: true
-require_relative 'xref_test_case'
-
-class TestRDocAlias < XrefTestCase
-
-  def test_to_s
-    a = RDoc::Alias.new nil, 'a', 'b', ''
-    a.parent = @c2
-
-    assert_equal 'alias: b -> #a in: RDoc::NormalClass C2 < Object', a.to_s
-  end
-
-end
diff --git a/test/rdoc/test_rdoc_any_method.rb b/test/rdoc/test_rdoc_any_method.rb
deleted file mode 100644
index b11c15420c2c58..00000000000000
--- a/test/rdoc/test_rdoc_any_method.rb
+++ /dev/null
@@ -1,609 +0,0 @@
-# frozen_string_literal: true
-require_relative 'xref_test_case'
-
-class TestRDocAnyMethod < XrefTestCase
-
-  def test_aref
-    m = RDoc::AnyMethod.new nil, 'method?'
-
-    assert_equal 'method-i-method-3F', m.aref
-
-    m.singleton = true
-
-    assert_equal 'method-c-method-3F', m.aref
-  end
-
-  def test_arglists
-    m = RDoc::AnyMethod.new nil, 'method'
-
-    assert_nil m.arglists
-
-    m.params = "(a, b)"
-    m.block_params = "c, d"
-
-    assert_equal "method(a, b) { |c, d| ... }", m.arglists
-
-    call_seq = <<-SEQ
-method(a) { |c| ... }
-method(a, b) { |c, d| ... }
-    SEQ
-
-    m.call_seq = call_seq.dup
-
-    assert_equal call_seq, m.arglists
-  end
-
-  def test_c_function
-    @c1_m.c_function = 'my_c1_m'
-
-    assert_equal 'my_c1_m', @c1_m.c_function
-  end
-
-  def test_call_seq_equals
-    m = RDoc::AnyMethod.new nil, nil
-
-    m.call_seq = ''
-
-    assert_nil m.call_seq
-
-    m.call_seq = 'foo'
-
-    assert_equal 'foo', m.call_seq
-  end
-
-  def test_call_seq_alias_for
-    a = RDoc::AnyMethod.new nil, "each"
-    m = RDoc::AnyMethod.new nil, "each_line"
-
-    a.call_seq = <<-CALLSEQ
-each(foo)
-each_line(foo)
-    CALLSEQ
-
-    m.is_alias_for = a
-
-    assert_equal "each_line(foo)", m.call_seq
-  end
-
-  def test_full_name
-    assert_equal 'C1::m', @c1.method_list.first.full_name
-  end
-
-  def test_has_call_seq?
-    m = RDoc::AnyMethod.new nil, "each_line"
-    m2 = RDoc::AnyMethod.new nil, "each"
-    assert_equal false, m.has_call_seq?
-    m.call_seq = "each_line()"
-    assert_equal true, m.has_call_seq?
-
-    m = RDoc::AnyMethod.new nil, "each_line"
-    m.is_alias_for = m2
-    assert_equal false, m.has_call_seq?
-    m2.call_seq = "each_line()"
-    assert_equal true, m.has_call_seq?
-  end
-
-  def test_is_alias_for
-    assert_equal @c2_b, @c2_a.is_alias_for
-
-    # set string on instance variable
-    loaded = Marshal.load Marshal.dump @c2_a
-
-    loaded.store = @store
-
-    assert_equal @c2_b, loaded.is_alias_for, 'Marshal.load'
-
-    m1 = RDoc::AnyMethod.new nil, 'm1'
-    m1.store = @store
-    m1.instance_variable_set :@is_alias_for, ['Missing', false, 'method']
-
-    assert_nil m1.is_alias_for, 'missing alias'
-  end
-
-  def test_call_seq_handles_aliases
-    # see 0ead786
-    @store.path = Dir.tmpdir
-    top_level = @store.add_file 'file.rb'
-    cm = top_level.add_class RDoc::ClassModule, 'Klass'
-
-    method_with_call_seq = RDoc::AnyMethod.new(nil, "method_with_call_seq")
-    method_with_call_seq.call_seq = <<~SEQ
-      method_with_call_seq(a)
-      method_with_call_seq(a, b)
-      alias_to_method(a)
-      alias_to_method(a, b)
-    SEQ
-    cm.add_method(method_with_call_seq)
-
-    alias_to_method = method_with_call_seq.add_alias(
-      RDoc::Alias.new(nil, "method_with_call_seq", "alias_to_method", "comment"),
-      cm
-    )
-
-    assert_equal("method_with_call_seq(a)\nmethod_with_call_seq(a, b)",
-                 method_with_call_seq.call_seq)
-    assert_equal("alias_to_method(a)\nalias_to_method(a, b)",
-                 alias_to_method.call_seq)
-  end
-
-  def test_call_seq_returns_nil_if_alias_is_missing_from_call_seq
-    @store.path = Dir.tmpdir
-    top_level = @store.add_file 'file.rb'
-    cm = top_level.add_class RDoc::ClassModule, 'Klass'
-
-    method_with_call_seq = RDoc::AnyMethod.new(nil, "method_with_call_seq")
-    method_with_call_seq.call_seq = <<~SEQ
-      method_with_call_seq(a)
-      method_with_call_seq(a, b)
-    SEQ
-    cm.add_method(method_with_call_seq)
-
-    alias_to_method = method_with_call_seq.add_alias(
-      RDoc::Alias.new(nil, "method_with_call_seq", "alias_to_method", "comment"),
-      cm
-    )
-
-    assert_equal("method_with_call_seq(a)\nmethod_with_call_seq(a, b)",
-                 method_with_call_seq.call_seq)
-    assert_nil(alias_to_method.call_seq)
-  end
-
-  def test_markup_code
-    tokens = [
-      { :line_no => 0, :char_no => 0, :kind => :on_const, :text => 'CONSTANT' },
-    ]
-
-    @c2_a.collect_tokens
-    @c2_a.add_tokens(tokens)
-
-    expected = '<span class="ruby-constant">CONSTANT</span>'
-
-    assert_equal expected, @c2_a.markup_code
-  end
-
-  def test_markup_code_with_line_numbers
-    position_comment = "# File #{@file_name}, line 1"
-    tokens = [
-      { :line_no => 1, :char_no => 0, :kind => :on_comment, :text => position_comment },
-      { :line_no => 1, :char_no => position_comment.size, :kind => :on_nl, :text => "\n" },
-      { :line_no => 2, :char_no => 0, :kind => :on_const, :text => 'A' },
-      { :line_no => 2, :char_no => 1, :kind => :on_nl, :text => "\n" },
-      { :line_no => 3, :char_no => 0, :kind => :on_const, :text => 'B' }
-    ]
-
-    @c2_a.collect_tokens
-    @c2_a.add_tokens(tokens)
-
-    assert_equal <<-EXPECTED.chomp, @c2_a.markup_code
-<span class="ruby-comment"># File xref_data.rb, line 1</span>
-<span class="ruby-constant">A</span>
-<span class="ruby-constant">B</span>
-    EXPECTED
-
-    @options.line_numbers = true
-    assert_equal <<-EXPECTED.chomp, @c2_a.markup_code
-  <span class="ruby-comment"># File xref_data.rb</span>
-<span class="line-num">1</span> <span class="ruby-constant">A</span>
-<span class="line-num">2</span> <span class="ruby-constant">B</span>
-    EXPECTED
-  end
-
-  def test_markup_code_empty
-    assert_equal '', @c2_a.markup_code
-  end
-
-  def test_markup_code_with_variable_expansion
-    m = RDoc::AnyMethod.new nil, 'method'
-    m.parent = @c1
-    m.block_params = '"Hello, #{world}", yield_arg'
-    m.params = 'a'
-
-    assert_equal '(a) { |"Hello, #{world}", yield_arg| ... }', m.param_seq
-  end
-
-  def test_marshal_dump
-    @store.path = Dir.tmpdir
-    top_level = @store.add_file 'file.rb'
-
-    m = RDoc::AnyMethod.new nil, 'method'
-    m.block_params = 'some_block'
-    m.call_seq     = 'call_seq'
-    m.comment      = 'this is a comment'
-    m.params       = 'param'
-    m.record_location top_level
-
-    cm = top_level.add_class RDoc::ClassModule, 'Klass'
-    cm.add_method m
-
-    section = cm.sections.first
-
-    al = RDoc::Alias.new nil, 'method', 'aliased', 'alias comment'
-    al_m = m.add_alias al, cm
-
-    loaded = Marshal.load Marshal.dump m
-    loaded.store = @store
-
-    comment = RDoc::Markup::Document.new(
-                RDoc::Markup::Paragraph.new('this is a comment'))
-
-    assert_equal m, loaded
-
-    assert_equal [al_m.name],    loaded.aliases.map { |alas| alas.name }
-    assert_equal 'some_block',   loaded.block_params
-    assert_equal 'call_seq',     loaded.call_seq
-    assert_equal comment,        loaded.comment
-    assert_equal top_level,      loaded.file
-    assert_equal 'Klass#method', loaded.full_name
-    assert_equal 'method',       loaded.name
-    assert_equal 'param',        loaded.params
-    assert_nil                   loaded.singleton # defaults to nil
-    assert_equal :public,        loaded.visibility
-    assert_equal cm,             loaded.parent
-    assert_equal section,        loaded.section
-  end
-
-  def test_marshal_load_aliased_method
-    aliased_method = Marshal.load Marshal.dump(@c2_a)
-
-    aliased_method.store = @store
-
-    assert_equal 'C2#a',  aliased_method.full_name
-    assert_equal 'C2',    aliased_method.parent_name
-    assert_equal '()',    aliased_method.params
-    assert_equal @c2_b,   aliased_method.is_alias_for, 'is_alias_for'
-    assert                aliased_method.display?
-  end
-
-  def test_marshal_load_aliased_method_with_nil_singleton
-    aliased_method = Marshal.load Marshal.dump(@c2_a)
-
-    aliased_method.store = @store
-    aliased_method.is_alias_for = ["C2", nil, "b"]
-
-    assert_equal 'C2#a',  aliased_method.full_name
-    assert_equal 'C2',    aliased_method.parent_name
-    assert_equal '()',    aliased_method.params
-    assert_equal @c2_b,   aliased_method.is_alias_for, 'is_alias_for'
-    assert                aliased_method.display?
-  end
-
-  def test_marshal_load_class_method
-    class_method = Marshal.load Marshal.dump(@c1.find_class_method_named 'm')
-
-    assert_equal 'C1::m', class_method.full_name
-    assert_equal 'C1',    class_method.parent_name
-    assert_equal '()',    class_method.params
-    assert                class_method.display?
-  end
-
-  def test_marshal_load_instance_method
-    instance_method = Marshal.load Marshal.dump(@c1.find_instance_method_named 'm')
-
-    assert_equal 'C1#m',  instance_method.full_name
-    assert_equal 'C1',    instance_method.parent_name
-    assert_equal '(foo)', instance_method.params
-    assert                instance_method.display?
-  end
-
-  def test_marshal_load_version_0
-    @store.path = Dir.tmpdir
-    top_level = @store.add_file 'file.rb'
-
-    m = RDoc::AnyMethod.new nil, 'method'
-
-    cm = top_level.add_class RDoc::ClassModule, 'Klass'
-    cm.add_method m
-
-    section = cm.sections.first
-
-    al = RDoc::Alias.new nil, 'method', 'aliased', 'alias comment'
-    al_m = m.add_alias al, cm
-
-    loaded = Marshal.load "\x04\bU:\x14RDoc::AnyMethod[\x0Fi\x00I" +
-                          "\"\vmethod\x06:\x06EF\"\x11Klass#method0:\vpublic" +
-                          "o:\eRDoc::Markup::Document\x06:\v@parts[\x06" +
-                          "o:\x1CRDoc::Markup::Paragraph\x06;\t[\x06I" +
-                          "\"\x16this is a comment\x06;\x06FI" +
-                          "\"\rcall_seq\x06;\x06FI\"\x0Fsome_block\x06;\x06F" +
-                          "[\x06[\aI\"\faliased\x06;\x06Fo;\b\x06;\t[\x06" +
-                          "o;\n\x06;\t[\x06I\"\x12alias comment\x06;\x06FI" +
-                          "\"\nparam\x06;\x06F"
-
-    loaded.store = @store
-
-    comment = RDoc::Markup::Document.new(
-                RDoc::Markup::Paragraph.new('this is a comment'))
-
-    assert_equal m, loaded
-
-    assert_equal [al_m.name],    loaded.aliases.map { |alas| alas.name }
-    assert_equal 'some_block',   loaded.block_params
-    assert_equal 'call_seq',     loaded.call_seq
-    assert_equal comment,        loaded.comment
-    assert_equal 'Klass#method', loaded.full_name
-    assert_equal 'method',       loaded.name
-    assert_equal 'param',        loaded.params
-    assert_nil                   loaded.singleton # defaults to nil
-    assert_equal :public,        loaded.visibility
-    assert_nil                   loaded.file
-    assert_equal cm,             loaded.parent
-    assert_equal section,        loaded.section
-    assert_nil                   loaded.is_alias_for
-
-    assert loaded.display?
-  end
-
-  def test_marshal_dump_version_2
-    @store.path = Dir.tmpdir
-    top_level = @store.add_file 'file.rb'
-
-    m = RDoc::AnyMethod.new nil, 'method'
-    m.block_params = 'some_block'
-    m.call_seq     = 'call_seq'
-    m.comment      = 'this is a comment'
-    m.params       = 'param'
-    m.record_location top_level
-
-    cm = top_level.add_class RDoc::ClassModule, 'Klass'
-    cm.add_method m
-
-    section = cm.sections.first
-
-    al = RDoc::Alias.new nil, 'method', 'aliased', 'alias comment'
-    al_m = m.add_alias al, cm
-
-    loaded = Marshal.load "\x04\bU:\x14RDoc::AnyMethod[\x14i\bI" +
-                          "\"\vmethod\x06:\x06ETI" +
-                          "\"\x11Klass#method\x06;\x06T0:\vpublic" +
-                          "o:\eRDoc::Markup::Document\b:\v@parts[\x06" +
-                          "o:\x1CRDoc::Markup::Paragraph\x06;\t[\x06I" +
-                          "\"\x16this is a comment\x06;\x06T:\n@file0" +
-                          ":0@omit_headings_from_table_of_contents_below0" +
-                          "I\"\rcall_seq\x06;\x06TI\"\x0Fsome_block\x06" +
-                          ";\x06T[\x06[\aI\"\faliased\x06;\x06To;\b\b;\t" +
-                          "[\x06o;\n\x06;\t[\x06I\"\x12alias comment\x06" +
-                          ";\x06T;\v0;\f0I\"\nparam\x06;\x06TI" +
-                          "\"\ffile.rb\x06;\x06TFI\"\nKlass\x06;\x06T" +
-                          "c\x16RDoc::ClassModule0"
-
-    loaded.store = @store
-
-    comment = doc(para('this is a comment'))
-
-    assert_equal m, loaded
-
-    assert_equal [al_m.name],    loaded.aliases.map { |alas| alas.name }
-    assert_equal 'some_block',   loaded.block_params
-    assert_equal 'call_seq',     loaded.call_seq
-    assert_equal comment,        loaded.comment
-    assert_equal top_level,      loaded.file
-    assert_equal 'Klass#method', loaded.full_name
-    assert_equal 'method',       loaded.name
-    assert_equal 'param',        loaded.params
-    assert_nil                   loaded.singleton # defaults to nil
-    assert_equal :public,        loaded.visibility
-    assert_equal cm,             loaded.parent
-    assert_equal section,        loaded.section
-    assert_nil                   loaded.is_alias_for
-  end
-
-  def test_name
-    m = RDoc::AnyMethod.new nil, nil
-
-    assert_nil m.name
-  end
-
-  def test_name_call_seq
-    m = RDoc::AnyMethod.new nil, nil
-
-    m.call_seq = "yields(name)\nyields(name, description)"
-
-    assert_equal 'yields', m.name
-  end
-
-  def test_name_call_seq_dot
-    m = RDoc::AnyMethod.new nil, nil
-
-    m.call_seq = "obj.yields(name)\nobj.yields(name, description)"
-
-    assert_equal 'yields', m.name
-  end
-
-  def test_param_list_block_params
-    m = RDoc::AnyMethod.new nil, 'method'
-    m.parent = @c1
-
-    m.block_params = 'c, d'
-
-    assert_equal %w[c d], m.param_list
-  end
-
-  def test_param_list_call_seq
-    m = RDoc::AnyMethod.new nil, 'method'
-    m.parent = @c1
-
-    call_seq = <<-SEQ
-method(a) { |c| ... }
-method(a, b) { |c, d| ... }
-    SEQ
-
-    m.call_seq = call_seq
-
-    assert_equal %w[a b c d], m.param_list
-  end
-
-  def test_param_list_default
-    m = RDoc::AnyMethod.new nil, 'method'
-    m.parent = @c1
-
-    m.params = '(b = default)'
-
-    assert_equal %w[b], m.param_list
-  end
-
-  def test_param_list_params
-    m = RDoc::AnyMethod.new nil, 'method'
-    m.parent = @c1
-
-    m.params = '(a, b)'
-
-    assert_equal %w[a b], m.param_list
-  end
-
-  def test_param_list_params_block_params
-    m = RDoc::AnyMethod.new nil, 'method'
-    m.parent = @c1
-
-    m.params = '(a, b)'
-    m.block_params = 'c, d'
-
-    assert_equal %w[a b c d], m.param_list
-  end
-
-  def test_param_list_empty_params_with_block
-    m = RDoc::AnyMethod.new nil, 'method'
-    m.parent = @c1
-
-    m.params = '()'
-    m.block_params = 'a, b'
-
-    assert_equal %w[a b], m.param_list
-  end
-
-  def test_param_list_ampersand_param_block_params
-    m = RDoc::AnyMethod.new nil, 'method'
-    m.parent = @c1
-
-    m.params = '(a, b, &block)'
-    m.block_params = 'c, d'
-
-    assert_equal %w[a b c d], m.param_list
-  end
-
-  def test_param_list_ampersand_param
-    m = RDoc::AnyMethod.new nil, 'method'
-    m.parent = @c1
-
-    m.params = '(a, b, &block)'
-
-    assert_equal %w[a b block], m.param_list
-  end
-
-  def test_param_seq
-    m = RDoc::AnyMethod.new nil, 'method'
-    m.parent = @c1
-    m.params = 'a'
-
-    assert_equal '(a)', m.param_seq
-
-    m.params = '(a)'
-
-    assert_equal '(a)', m.param_seq
-
-    m.params = "(a,\n  b)"
-
-    assert_equal '(a, b)', m.param_seq
-
-    m.block_params = "c,\n  d"
-
-    assert_equal '(a, b) { |c, d| ... }', m.param_seq
-  end
-
-  def test_param_seq_call_seq
-    m = RDoc::AnyMethod.new nil, 'method'
-    m.parent = @c1
-
-    call_seq = <<-SEQ
-method(a) { |c| ... }
-method(a, b) { |c, d| ... }
-    SEQ
-
-    m.call_seq = call_seq
-
-    assert_equal '(a, b) { |c, d| }', m.param_seq
-
-  end
-
-  def test_parent_name
-    assert_equal 'C1', @c1.method_list.first.parent_name
-    assert_equal 'C1', @c1.method_list.last.parent_name
-  end
-
-  def test_skip_description?
-    m = RDoc::AnyMethod.new nil, "each_line"
-    m2 = RDoc::AnyMethod.new nil, "each"
-    assert_equal false, m.skip_description?
-    assert_equal false, m2.skip_description?
-
-    m.is_alias_for = m2
-    m2.aliases << m
-    assert_equal false, m.skip_description?
-    assert_equal false, m2.skip_description?
-
-    m2.call_seq = "each()"
-    assert_equal true, m.skip_description?
-    assert_equal false, m2.skip_description?
-
-    m2.call_seq = "each_line()"
-    assert_equal false, m.skip_description?
-    assert_equal true, m2.skip_description?
-
-    m2.call_seq = "each()\neach_line()"
-    assert_equal false, m.skip_description?
-    assert_equal false, m2.skip_description?
-  end
-
-  def test_store_equals
-    loaded = Marshal.load Marshal.dump(@c1.method_list.last)
-
-    loaded.store = @store
-
-    assert_equal @store, loaded.file.store
-  end
-
-  def test_superclass_method
-    m3 = RDoc::AnyMethod.new '', 'no_super'
-
-    m2 = RDoc::AnyMethod.new '', 'supers'
-    m2.calls_super = true
-
-    m1 = RDoc::AnyMethod.new '', 'supers'
-
-    c1 = RDoc::NormalClass.new 'Outer'
-    c1.store = @store
-    c1.add_method m1
-
-    c2 = RDoc::NormalClass.new 'Inner', c1
-    c2.store = @store
-    c2.add_method m2
-    c2.add_method m3
-
-    assert_nil m3.superclass_method,
-               'no superclass method for no_super'
-
-    assert_equal m1, m2.superclass_method,
-                 'superclass method missing for supers'
-  end
-
-  def test_superclass_method_multilevel
-    m2 = RDoc::AnyMethod.new '', 'supers'
-    m2.calls_super = true
-
-    m1 = RDoc::AnyMethod.new '', 'supers'
-
-    c1 = RDoc::NormalClass.new 'Outer'
-    c1.store = @store
-    c1.add_method m1
-
-    c2 = RDoc::NormalClass.new 'Middle', c1
-    c2.store = @store
-
-    c3 = RDoc::NormalClass.new 'Inner', c2
-    c3.store = @store
-    c3.add_method m2
-
-    assert_equal m1, m2.superclass_method,
-                 'superclass method missing for supers'
-  end
-
-end
diff --git a/test/rdoc/test_rdoc_attr.rb b/test/rdoc/test_rdoc_attr.rb
deleted file mode 100644
index cff52acf31b028..00000000000000
--- a/test/rdoc/test_rdoc_attr.rb
+++ /dev/null
@@ -1,190 +0,0 @@
-# frozen_string_literal: true
-require_relative 'helper'
-
-class TestRDocAttr < RDoc::TestCase
-
-  def setup
-    super
-
-    @a = RDoc::Attr.new nil, 'attr', 'RW', ''
-  end
-
-  def test_aref
-    m = RDoc::Attr.new nil, 'attr', 'RW', nil
-
-    assert_equal 'attribute-i-attr', m.aref
-  end
-
-  def test_arglists
-    assert_nil @a.arglists
-  end
-
-  def test_block_params
-    assert_nil @a.block_params
-  end
-
-  def test_call_seq
-    assert_nil @a.call_seq
-  end
-
-  def test_definition
-    assert_equal 'attr_accessor', @a.definition
-
-    @a.rw = 'R'
-
-    assert_equal 'attr_reader', @a.definition
-
-    @a.rw = 'W'
-
-    assert_equal 'attr_writer', @a.definition
-  end
-
-  def test_full_name
-    assert_equal '(unknown)#attr', @a.full_name
-  end
-
-  def test_marshal_dump
-    tl = @store.add_file 'file.rb'
-
-    @a.comment = 'this is a comment'
-    @a.record_location tl
-
-    cm = tl.add_class RDoc::NormalClass, 'Klass'
-    cm.add_attribute @a
-
-    section = cm.sections.first
-
-    loaded = Marshal.load Marshal.dump @a
-    loaded.store = @store
-
-    assert_equal @a, loaded
-
-    comment = RDoc::Markup::Document.new(
-                RDoc::Markup::Paragraph.new('this is a comment'))
-
-    assert_equal comment,      loaded.comment
-    assert_equal 'file.rb',    loaded.file.relative_name
-    assert_equal 'Klass#attr', loaded.full_name
-    assert_equal 'attr',       loaded.name
-    assert_equal 'RW',         loaded.rw
-    assert_equal false,        loaded.singleton
-    assert_equal :public,      loaded.visibility
-    assert_equal tl,           loaded.file
-    assert_equal cm,           loaded.parent
-    assert_equal section,      loaded.section
-  end
-
-  def test_marshal_dump_singleton
-    tl = @store.add_file 'file.rb'
-
-    @a.comment = 'this is a comment'
-    @a.record_location tl
-
-    cm = tl.add_class RDoc::NormalClass, 'Klass'
-    cm.add_attribute @a
-
-    section = cm.sections.first
-
-    @a.rw = 'R'
-    @a.singleton = true
-    @a.visibility = :protected
-
-    loaded = Marshal.load Marshal.dump @a
-    loaded.store = @store
-
-    assert_equal @a, loaded
-
-    comment = RDoc::Markup::Document.new(
-                RDoc::Markup::Paragraph.new('this is a comment'))
-
-    assert_equal comment,       loaded.comment
-    assert_equal 'Klass::attr', loaded.full_name
-    assert_equal 'attr',        loaded.name
-    assert_equal 'R',           loaded.rw
-    assert_equal true,          loaded.singleton
-    assert_equal :protected,    loaded.visibility
-    assert_equal tl,            loaded.file
-    assert_equal cm,            loaded.parent
-    assert_equal section,       loaded.section
-  end
-
-  def test_marshal_load_version_1
-    tl = @store.add_file 'file.rb'
-    cm = tl.add_class RDoc::NormalClass, 'Klass'
-    section = cm.sections.first
-
-    data = "\x04\bU:\x0FRDoc::Attr[\fi\x06I\"\tattr\x06:\x06EF" +
-           "\"\x0FKlass#attrI\"\aRW\x06;\x06F:\vpublic" +
-           "o:\eRDoc::Markup::Document\x06:\v@parts[\x06" +
-           "o:\x1CRDoc::Markup::Paragraph\x06;\t[\x06I" +
-           "\"\x16this is a comment\x06;\x06FF"
-
-    loaded = Marshal.load data
-    loaded.store = @store
-
-    comment = RDoc::Markup::Document.new(
-                RDoc::Markup::Paragraph.new('this is a comment'))
-
-    assert_equal comment,      loaded.comment
-    assert_equal 'Klass#attr', loaded.full_name
-    assert_equal 'attr',       loaded.name
-    assert_equal 'RW',         loaded.rw
-    assert_equal false,        loaded.singleton
-    assert_equal :public,      loaded.visibility
-
-    # version 2
-    assert_nil                 loaded.file
-
-    # version 3
-    assert_equal cm,           loaded.parent
-    assert_equal section,      loaded.section
-
-    assert                     loaded.display?
-  end
-
-  def test_marshal_load_version_2
-    tl = @store.add_file 'file.rb'
-    cm = tl.add_class RDoc::NormalClass, 'Klass'
-    section = cm.sections.first
-
-    loaded = Marshal.load "\x04\bU:\x0FRDoc::Attr[\ri\aI\"\tattr\x06" +
-                          ":\x06ETI\"\x0FKlass#attr\x06;\x06TI\"\aRW\x06" +
-                          ";\x06T:\vpublico:\eRDoc::Markup::Document\a" +
-                          ":\v@parts[\x06o:\x1CRDoc::Markup::Paragraph\x06;" +
-                          "\t[\x06I\"\x16this is a comment\x06;\x06T:\n" +
-                          "@file0FI\"\ffile.rb\x06;\x06T"
-    loaded.store = @store
-
-    comment = doc(para('this is a comment'))
-
-    assert_equal comment,      loaded.comment
-    assert_equal 'Klass#attr', loaded.full_name
-    assert_equal 'attr',       loaded.name
-    assert_equal 'RW',         loaded.rw
-    assert_equal false,        loaded.singleton
-    assert_equal :public,      loaded.visibility
-    assert_equal tl,           loaded.file
-
-    # version 3
-    assert_equal cm,           loaded.parent
-    assert_equal section,      loaded.section
-
-    assert loaded.display?
-  end
-
-  def test_params
-    assert_nil @a.params
-  end
-
-  def test_singleton
-    refute @a.singleton
-  end
-
-  def test_type
-    assert_equal 'instance', @a.type
-
-    @a.singleton = true
-    assert_equal 'class', @a.type
-  end
-
-end
diff --git a/test/rdoc/test_rdoc_class_module.rb b/test/rdoc/test_rdoc_class_module.rb
deleted file mode 100644
index 27d37cb7dd5932..00000000000000
--- a/test/rdoc/test_rdoc_class_module.rb
+++ /dev/null
@@ -1,1503 +0,0 @@
-# frozen_string_literal: true
-require_relative 'xref_test_case'
-
-class TestRDocClassModule < XrefTestCase
-
-  def test_add_comment
-    tl1 = @store.add_file 'one.rb'
-    tl2 = @store.add_file 'two.rb'
-    tl3 = @store.add_file 'three.rb'
-
-    cm = RDoc::ClassModule.new 'Klass'
-    comment_tl1 = RDoc::Comment.new('# comment 1', @top_level, :ruby)
-    cm.add_comment comment_tl1, tl1
-
-    assert_equal [[comment_tl1, tl1]], cm.comment_location
-    assert_equal 'comment 1', cm.comment.text
-
-    comment_tl2 = RDoc::Comment.new('# comment 2', @top_level, :ruby)
-    cm.add_comment comment_tl2, tl2
-
-    assert_equal [[comment_tl1, tl1], [comment_tl2, tl2]], cm.comment_location
-    assert_equal "comment 1\n---\ncomment 2", cm.comment
-
-    comment_tl3 = RDoc::Comment.new('# * comment 3', @top_level, :ruby)
-    cm.add_comment comment_tl3, tl3
-
-    assert_equal [[comment_tl1, tl1],
-                  [comment_tl2, tl2],
-                  [comment_tl3, tl3]], cm.comment_location
-    assert_equal "comment 1\n---\ncomment 2\n---\n* comment 3", cm.comment
-  end
-
-  def test_add_comment_comment
-    cm = RDoc::ClassModule.new 'Klass'
-
-    cm.add_comment comment('comment'), @top_level
-
-    assert_equal 'comment', cm.comment.text
-  end
-
-  def test_add_comment_duplicate
-    tl1 = @store.add_file 'one.rb'
-
-    cm = RDoc::ClassModule.new 'Klass'
-    comment1 = RDoc::Comment.new('# comment 1', @top_level, :ruby)
-    comment2 = RDoc::Comment.new('# comment 2', @top_level, :ruby)
-    cm.add_comment comment1, tl1
-    cm.add_comment comment2, tl1
-
-    assert_equal [[comment1, tl1],
-                  [comment2, tl1]], cm.comment_location
-  end
-
-  def test_add_comment_stopdoc
-    tl = @store.add_file 'file.rb'
-
-    cm = RDoc::ClassModule.new 'Klass'
-    cm.stop_doc
-
-    cm.add_comment '# comment 1', tl
-
-    assert_empty cm.comment
-  end
-
-  def test_ancestors
-    assert_equal [@parent, @object, "BasicObject"], @child.ancestors
-  end
-
-  def test_comment_equals
-    cm = RDoc::ClassModule.new 'Klass'
-    cm.comment = RDoc::Comment.new('# comment 1', @top_level, :ruby)
-
-    assert_equal 'comment 1', cm.comment.to_s
-
-    cm.comment = RDoc::Comment.new('# comment 2', @top_level, :ruby)
-
-    assert_equal "comment 1\n---\ncomment 2", cm.comment.to_s
-
-    cm.comment = RDoc::Comment.new('# * comment 3', @top_level, :ruby)
-
-    assert_equal "comment 1\n---\ncomment 2\n---\n* comment 3", cm.comment.to_s
-  end
-
-  def test_comment_equals_comment
-    cm = RDoc::ClassModule.new 'Klass'
-
-    cm.comment = comment 'comment'
-
-    assert_equal 'comment', cm.comment.text
-  end
-
-  def test_document_self_or_methods
-    assert @c1.document_self_or_methods
-
-    @c1.document_self = false
-
-    assert @c1.document_self_or_methods
-
-    @c1_plus.document_self = false
-    @c1_m.document_self = false
-
-    assert @c1.document_self_or_methods
-
-    @c1__m.document_self = false
-
-    refute @c1.document_self_or_methods
-  end
-
-  def test_documented_eh
-    cm = RDoc::ClassModule.new 'C'
-
-    refute cm.documented?, 'no comments, no markers'
-
-    cm.add_comment '', @top_level
-
-    refute cm.documented?, 'empty comment'
-
-    cm.add_comment 'hi', @top_level
-
-    assert cm.documented?, 'commented'
-
-    cm.comment_location.clear
-
-    refute cm.documented?, 'no comment'
-
-    cm.document_self = nil # notify :nodoc:
-
-    assert cm.documented?, ':nodoc:'
-  end
-
-  def test_each_ancestor
-    assert_equal [@parent, @object], @child.each_ancestor.to_a
-  end
-
-  def test_each_ancestor_cycle
-    m_incl = RDoc::Include.new 'M', nil
-
-    m = @top_level.add_module RDoc::NormalModule, 'M'
-    m.add_include m_incl
-
-    assert_empty m.each_ancestor.to_a
-  end
-
-  # handle making a short module alias of yourself
-
-  def test_find_class_named
-    @c2.classes_hash['C2'] = @c2
-
-    assert_nil @c2.find_class_named('C1')
-  end
-
-  def test_from_module_comment
-    tl = @store.add_file 'file.rb'
-    klass = tl.add_class RDoc::NormalModule, 'Klass'
-    klass.add_comment 'really a class', tl
-
-    klass = RDoc::ClassModule.from_module RDoc::NormalClass, klass
-
-    assert_equal [['really a class', tl]], klass.comment_location
-  end
-
-  def test_marshal_dump
-    @store.path = Dir.tmpdir
-    tl = @store.add_file 'file.rb'
-
-    ns = tl.add_module RDoc::NormalModule, 'Namespace'
-
-    cm = ns.add_class RDoc::NormalClass, 'Klass', 'Super'
-    cm.document_self = true
-    cm.record_location tl
-
-    a1 = RDoc::Attr.new nil, 'a1', 'RW', ''
-    a1.record_location tl
-    a2 = RDoc::Attr.new nil, 'a2', 'RW', '', true
-    a2.record_location tl
-
-    m1 = RDoc::AnyMethod.new nil, 'm1'
-    m1.record_location tl
-
-    c1 = RDoc::Constant.new 'C1', nil, ''
-    c1.record_location tl
-
-    i1 = RDoc::Include.new 'I1', ''
-    i1.record_location tl
-
-    e1 = RDoc::Extend.new 'E1', ''
-    e1.record_location tl
-
-    section_comment = RDoc::Comment.new('section comment')
-    section_comment.location = tl
-
-    assert_equal 1, cm.sections.length, 'sanity, default section only'
-    s0 = cm.sections.first
-    s1 = cm.add_section 'section', section_comment
-
-    cm.add_attribute a1
-    cm.add_attribute a2
-    cm.add_method m1
-    cm.add_constant c1
-    cm.add_include i1
-    cm.add_extend e1
-    cm.add_comment 'this is a comment', tl
-
-    loaded = Marshal.load Marshal.dump cm
-    loaded.store = @store
-
-    assert_equal cm, loaded
-
-    inner = RDoc::Markup::Document.new(
-      RDoc::Markup::Paragraph.new('this is a comment'))
-    inner.file = tl
-
-    comment = RDoc::Markup::Document.new inner
-
-    assert_equal [a2, a1],           loaded.attributes.sort
-    assert_equal comment,            loaded.comment
-    assert_equal [c1],               loaded.constants
-    assert_equal 'Namespace::Klass', loaded.full_name
-    assert_equal [i1],               loaded.includes
-    assert_equal [e1],               loaded.extends
-    assert_equal [m1],               loaded.method_list
-    assert_equal 'Klass',            loaded.name
-    assert_equal 'Super',            loaded.superclass
-    assert_equal [tl],               loaded.in_files
-    assert_equal 'Namespace',        loaded.parent.name
-
-    expected = { nil => s0, 'section' => s1 }
-    assert_equal expected, loaded.sections_hash
-
-    assert_equal tl, loaded.attributes.first.file
-
-    assert_equal tl, loaded.constants.first.file
-
-    assert_equal tl, loaded.includes.first.file
-
-    assert_equal tl, loaded.extends.first.file
-
-    assert_equal tl, loaded.method_list.first.file
-  end
-
-  def test_marshal_dump_visibility
-    @store.path = Dir.tmpdir
-    tl = @store.add_file 'file.rb'
-
-    ns = tl.add_module RDoc::NormalModule, 'Namespace'
-
-    cm = ns.add_class RDoc::NormalClass, 'Klass', 'Super'
-    cm.record_location tl
-
-    a1 = RDoc::Attr.new nil, 'a1', 'RW', ''
-    a1.record_location tl
-    a1.document_self = false
-
-    m1 = RDoc::AnyMethod.new nil, 'm1'
-    m1.record_location tl
-    m1.document_self = false
-
-    c1 = RDoc::Constant.new 'C1', nil, ''
-    c1.record_location tl
-    c1.document_self = false
-
-    i1 = RDoc::Include.new 'I1', ''
-    i1.record_location tl
-    i1.document_self = false
-
-    e1 = RDoc::Extend.new 'E1', ''
-    e1.record_location tl
-    e1.document_self = false
-
-    section_comment = RDoc::Comment.new('section comment')
-    section_comment.location = tl
-
-    assert_equal 1, cm.sections.length, 'sanity, default section only'
-
-    cm.add_attribute a1
-    cm.add_method m1
-    cm.add_constant c1
-    cm.add_include i1
-    cm.add_extend e1
-    cm.add_comment 'this is a comment', tl
-
-    loaded = Marshal.load Marshal.dump cm
-    loaded.store = @store
-
-    assert_equal cm, loaded
-
-    assert_empty loaded.attributes
-    assert_empty loaded.constants
-    assert_empty loaded.includes
-    assert_empty loaded.extends
-    assert_empty loaded.method_list
-  end
-
-  def test_marshal_load_version_0
-    tl = @store.add_file 'file.rb'
-    ns = tl.add_module RDoc::NormalModule, 'Namespace'
-    cm = ns.add_class RDoc::NormalClass, 'Klass', 'Super'
-
-    a = RDoc::Attr.new(nil, 'a1', 'RW', '')
-    m = RDoc::AnyMethod.new(nil, 'm1')
-    c = RDoc::Constant.new('C1', nil, '')
-    i = RDoc::Include.new('I1', '')
-
-    s0 = cm.sections.first
-
-    cm.add_attribute a
-    cm.add_method m
-    cm.add_constant c
-    cm.add_include i
-    cm.add_comment 'this is a comment', tl
-
-    loaded = Marshal.load "\x04\bU:\x16RDoc::NormalClass[\x0Ei\x00\"\nKlass" +
-                          "\"\x15Namespace::KlassI\"\nSuper\x06:\x06EF" +
-                          "o:\eRDoc::Markup::Document\x06:\v@parts[\x06" +
-                          "o:\x1CRDoc::Markup::Paragraph\x06;\b[\x06I" +
-                          "\"\x16this is a comment\x06;\x06F[\x06[\aI" +
-                          "\"\aa1\x06;\x06FI\"\aRW\x06;\x06F[\x06[\aI" +
-                          "\"\aC1\x06;\x06Fo;\a\x06;\b[\x00[\x06[\aI" +
-                          "\"\aI1\x06;\x06Fo;\a\x06;\b[\x00[\a[\aI" +
-                          "\"\nclass\x06;\x06F[\b[\a:\vpublic[\x00[\a" +
-                          ":\x0Eprotected[\x00[\a:\fprivate[\x00[\aI" +
-                          "\"\rinstance\x06;\x06F[\b[\a;\n[\x06I" +
-                          "\"\am1\x06;\x06F[\a;\v[\x00[\a;\f[\x00"
-
-    loaded.store = @store
-
-    assert_equal cm, loaded
-
-    comment = RDoc::Markup::Document.new(
-                RDoc::Markup::Paragraph.new('this is a comment'))
-
-    assert_equal [a],                loaded.attributes
-    assert_equal comment,            loaded.comment
-    assert_equal [c],                loaded.constants
-    assert_equal 'Namespace::Klass', loaded.full_name
-    assert_equal [i],                loaded.includes
-    assert_equal [m],                loaded.method_list
-    assert_equal 'Klass',            loaded.name
-    assert_equal 'Super',            loaded.superclass
-    assert_nil                       loaded.file
-    assert_empty                     loaded.in_files
-    assert_nil                       loaded.parent
-    assert                           loaded.current_section
-
-    expected = { nil => s0 }
-    assert_equal expected, loaded.sections_hash
-
-    assert loaded.display?
-  end
-
-  def test_marshal_load_version_1
-    tl = @store.add_file 'file.rb'
-
-    ns = tl.add_module RDoc::NormalModule, 'Namespace'
-
-    cm = ns.add_class RDoc::NormalClass, 'Klass', 'Super'
-    cm.record_location tl
-
-    a1 = RDoc::Attr.new nil, 'a1', 'RW', ''
-    a1.record_location tl
-    a2 = RDoc::Attr.new nil, 'a2', 'RW', '', true
-    a2.record_location tl
-
-    m1 = RDoc::AnyMethod.new nil, 'm1'
-    m1.record_location tl
-
-    c1 = RDoc::Constant.new 'C1', nil, ''
-    c1.record_location tl
-
-    i1 = RDoc::Include.new 'I1', ''
-    i1.record_location tl
-
-    s0 = cm.sections.first
-
-    cm.add_attribute a1
-    cm.add_attribute a2
-    cm.add_method m1
-    cm.add_constant c1
-    cm.add_include i1
-    cm.add_comment 'this is a comment', tl
-
-    loaded = Marshal.load "\x04\bU:\x16RDoc::NormalClass[\x0Ei\x06I\"\nKlass" +
-                          "\x06:\x06EFI\"\x15Namespace::Klass\x06;\x06FI" +
-                          "\"\nSuper\x06;\x06Fo:\eRDoc::Markup::Document\a" +
-                          ":\v@parts[\x06o;\a\a;\b[\x06o" +
-                          ":\x1CRDoc::Markup::Paragraph\x06;\b" +
-                          "[\x06I\"\x16this is a comment\x06;\x06F" +
-                          ":\n@fileI\"\ffile.rb\x06;\x06F;\n0[\a[\nI" +
-                          "\"\aa2\x06;\x06FI\"\aRW\x06;\x06F:\vpublicT@\x11" +
-                          "[\nI\"\aa1\x06;\x06FI\"\aRW\x06;\x06F;\vF@\x11" +
-                          "[\x06[\bI\"\aC1\x06;\x06Fo;\a\a;\b[\x00;\n0@\x11" +
-                          "[\x06[\bI\"\aI1\x06;\x06Fo;\a\a;\b[\x00;\n0@\x11" +
-                          "[\a[\aI\"\nclass\x06;\x06F[\b[\a;\v[\x00" +
-                          "[\a:\x0Eprotected[\x00[\a:\fprivate[\x00[\aI" +
-                          "\"\rinstance\x06;\x06F[\b[\a;\v[\x06[\aI" +
-                          "\"\am1\x06;\x06F@\x11[\a;\f[\x00[\a;\r[\x00"
-
-    loaded.store = @store
-
-    assert_equal cm, loaded
-
-    inner = RDoc::Markup::Document.new(
-      RDoc::Markup::Paragraph.new('this is a comment'))
-    inner.file = tl
-
-    comment = RDoc::Markup::Document.new inner
-
-    assert_equal [a2, a1],           loaded.attributes.sort
-    assert_equal comment,            loaded.comment
-    assert_equal [c1],               loaded.constants
-    assert_equal 'Namespace::Klass', loaded.full_name
-    assert_equal [i1],               loaded.includes
-    assert_empty                     loaded.extends
-    assert_equal [m1],               loaded.method_list
-    assert_equal 'Klass',            loaded.name
-    assert_equal 'Super',            loaded.superclass
-    assert_empty                     loaded.in_files
-    assert_nil                       loaded.parent
-    assert                           loaded.current_section
-
-    assert_equal tl, loaded.attributes.first.file
-    assert_equal tl, loaded.constants.first.file
-    assert_equal tl, loaded.includes.first.file
-    assert_equal tl, loaded.method_list.first.file
-
-    expected = { nil => s0 }
-    assert_equal expected, loaded.sections_hash
-  end
-
-  def test_marshal_load_version_2
-    tl = @store.add_file 'file.rb'
-
-    ns = tl.add_module RDoc::NormalModule, 'Namespace'
-
-    cm = ns.add_class RDoc::NormalClass, 'Klass', 'Super'
-    cm.record_location tl
-
-    a1 = RDoc::Attr.new nil, 'a1', 'RW', ''
-    a1.record_location tl
-    a2 = RDoc::Attr.new nil, 'a2', 'RW', '', true
-    a2.record_location tl
-
-    m1 = RDoc::AnyMethod.new nil, 'm1'
-    m1.record_location tl
-
-    c1 = RDoc::Constant.new 'C1', nil, ''
-    c1.record_location tl
-
-    i1 = RDoc::Include.new 'I1', ''
-    i1.record_location tl
-
-    e1 = RDoc::Extend.new 'E1', ''
-    e1.record_location tl
-
-    s0 = cm.sections.first
-
-    cm.add_attribute a1
-    cm.add_attribute a2
-    cm.add_method m1
-    cm.add_constant c1
-    cm.add_include i1
-    cm.add_extend e1
-    cm.add_comment 'this is a comment', tl
-
-    loaded = Marshal.load "\x04\bU:\x16RDoc::NormalClass[\x0Fi\aI\"\nKlass" +
-                          "\x06:\x06EFI\"\x15Namespace::Klass\x06;\x06FI" +
-                          "\"\nSuper\x06;\x06Fo:\eRDoc::Markup::Document\a" +
-                          ":\v@parts[\x06o;\a\a;\b[\x06o" +
-                          ":\x1CRDoc::Markup::Paragraph\x06;\b" +
-                          "[\x06I\"\x16this is a comment\x06;\x06F" +
-                          ":\n@fileI\"\ffile.rb\x06;\x06F;\n0[\a[\nI" +
-                          "\"\aa2\x06;\x06FI\"\aRW\x06;\x06F:\vpublicT@\x11" +
-                          "[\nI\"\aa1\x06;\x06FI\"\aRW\x06;\x06F;\vF@\x11" +
-                          "[\x06[\bI\"\aC1\x06;\x06Fo;\a\a;\b[\x00;\n0@\x11" +
-                          "[\x06[\bI\"\aI1\x06;\x06Fo;\a\a;\b[\x00;\n0@\x11" +
-                          "[\a[\aI\"\nclass\x06;\x06F[\b[\a;\v[\x00" +
-                          "[\a:\x0Eprotected[\x00[\a:\fprivate[\x00[\aI" +
-                          "\"\rinstance\x06;\x06F[\b[\a;\v[\x06[\aI" +
-                          "\"\am1\x06;\x06F@\x11[\a;\f[\x00[\a;\r[\x00" +
-                          "[\x06[\bI\"\aE1\x06;\x06Fo;\a\a;\b[\x00;\n0@\x11"
-
-    loaded.store = @store
-
-    assert_equal cm, loaded
-
-    inner = RDoc::Markup::Document.new(
-      RDoc::Markup::Paragraph.new('this is a comment'))
-    inner.file = tl
-
-    comment = RDoc::Markup::Document.new inner
-
-    assert_equal [a2, a1],           loaded.attributes.sort
-    assert_equal comment,            loaded.comment
-    assert_equal [c1],               loaded.constants
-    assert_equal 'Namespace::Klass', loaded.full_name
-    assert_equal [i1],               loaded.includes
-    assert_equal [e1],               loaded.extends
-    assert_equal [m1],               loaded.method_list
-    assert_equal 'Klass',            loaded.name
-    assert_equal 'Super',            loaded.superclass
-    assert_empty                     loaded.in_files
-    assert_nil                       loaded.parent
-    assert                           loaded.current_section
-
-    assert_equal tl, loaded.attributes. first.file
-    assert_equal tl, loaded.constants.  first.file
-    assert_equal tl, loaded.includes.   first.file
-    assert_equal tl, loaded.extends.    first.file
-    assert_equal tl, loaded.method_list.first.file
-
-    expected = { nil => s0 }
-    assert_equal expected, loaded.sections_hash
-  end
-
-  def test_marshal_load_version_3
-    tl = @store.add_file 'file.rb'
-
-    ns = tl.add_module RDoc::NormalModule, 'Namespace'
-
-    cm = ns.add_class RDoc::NormalClass, 'Klass', 'Super'
-    cm.record_location tl
-
-    a1 = RDoc::Attr.new nil, 'a1', 'RW', ''
-    a1.record_location tl
-    a2 = RDoc::Attr.new nil, 'a2', 'RW', '', true
-    a2.record_location tl
-
-    m1 = RDoc::AnyMethod.new nil, 'm1'
-    m1.record_location tl
-
-    c1 = RDoc::Constant.new 'C1', nil, ''
-    c1.record_location tl
-
-    i1 = RDoc::Include.new 'I1', ''
-    i1.record_location tl
-
-    e1 = RDoc::Extend.new 'E1', ''
-    e1.record_location tl
-
-    section_comment = RDoc::Comment.new('section comment')
-    section_comment.location = tl
-
-    assert_equal 1, cm.sections.length, 'sanity, default section only'
-    s0 = cm.sections.first
-    s1 = cm.add_section 'section', section_comment
-
-    cm.add_attribute a1
-    cm.add_attribute a2
-    cm.add_method m1
-    cm.add_constant c1
-    cm.add_include i1
-    cm.add_extend e1
-    cm.add_comment 'this is a comment', tl
-
-    loaded = Marshal.load "\x04\bU:\x16RDoc::NormalClass[\x13i\bI\"\nKlass" +
-                          "\x06:\x06ETI\"\x15Namespace::Klass\x06;\x06TI" +
-                          "\"\nSuper\x06;\x06To:\eRDoc::Markup::Document\a" +
-                          ":\v@parts[\x06o;\a\a;\b[\x06o" +
-                          ":\x1CRDoc::Markup::Paragraph\x06;\b[\x06I" +
-                          "\"\x16this is a comment\x06;\x06T:\n@fileI" +
-                          "\"\ffile.rb\x06;\x06T;\n0[\a[\nI\"\aa2\x06;" +
-                          "\x06TI\"\aRW\x06;\x06T:\vpublicT@\x11[\nI" +
-                          "\"\aa1\x06;\x06TI\"\aRW\x06;\x06T;\vF@\x11" +
-                          "[\x06U:\x13RDoc::Constant[\x0Fi\x00I\"\aC1\x06" +
-                          ";\x06TI\"\x19Namespace::Klass::C1\x06;\x06T00o" +
-                          ";\a\a;\b[\x00;\n0@\x11@\ac\x16RDoc::NormalClass0" +
-                          "[\x06[\bI\"\aI1\x06;\x06To;\a\a;\b[\x00;\n0@\x11" +
-                          "[\a[\aI\"\nclass\x06;\x06T[\b[\a;\v[\x00[\a" +
-                          ":\x0Eprotected[\x00[\a:\fprivate[\x00[\aI" +
-                          "\"\rinstance\x06;\x06T[\b[\a;\v[\x06[\aI" +
-                          "\"\am1\x06;\x06T@\x11[\a;\r[\x00[\a;\x0E[\x00" +
-                          "[\x06[\bI\"\aE1\x06;\x06To;\a\a;\b[\x00;\n0@\x11" +
-                          "[\aU:\eRDoc::Context::Section[\bi\x000o;\a\a;\b" +
-                          "[\x00;\n0U;\x0F[\bi\x00I\"\fsection\x06;\x06To" +
-                          ";\a\a;\b[\x06o;\a\a;\b[\x06o;\t\x06;\b[\x06I" +
-                          "\"\x14section comment\x06;\x06T;\n@\x11;\n0" +
-                          "[\x06@\x11I\"\x0ENamespace\x06" +
-                          ";\x06Tc\x17RDoc::NormalModule"
-
-    loaded.store = @store
-
-    assert_equal cm, loaded
-
-    inner = RDoc::Markup::Document.new(
-      RDoc::Markup::Paragraph.new('this is a comment'))
-    inner.file = tl
-
-    comment = RDoc::Markup::Document.new inner
-
-    assert_equal [a2, a1],           loaded.attributes.sort
-    assert_equal comment,            loaded.comment
-    assert_equal [c1],               loaded.constants
-    assert_equal 'Namespace::Klass', loaded.full_name
-    assert_equal [i1],               loaded.includes
-    assert_equal [e1],               loaded.extends
-    assert_equal [m1],               loaded.method_list
-    assert_equal 'Klass',            loaded.name
-    assert_equal 'Super',            loaded.superclass
-    assert_equal 'Namespace',        loaded.parent.name
-    assert                           loaded.current_section
-
-    expected = {
-      nil       => s0,
-      'section' => s1,
-    }
-
-    assert_equal expected,           loaded.sections_hash
-    assert_equal [tl],               loaded.in_files
-
-    assert_equal tl, loaded.attributes. first.file
-    assert_equal tl, loaded.constants.  first.file
-    assert_equal tl, loaded.includes.   first.file
-    assert_equal tl, loaded.extends.    first.file
-    assert_equal tl, loaded.method_list.first.file
-  end
-
-  def test_merge
-    tl = @store.add_file 'one.rb'
-    p1  = tl.add_class RDoc::NormalClass, 'Parent'
-    c1  = p1.add_class RDoc::NormalClass, 'Klass'
-
-    c2 = RDoc::NormalClass.new 'Klass'
-
-    c2.merge c1
-
-    assert_equal 'Parent', c1.parent_name, 'original parent name'
-    assert_equal 'Parent', c2.parent_name, 'merged parent name'
-
-    assert c1.current_section, 'original current_section'
-    assert c2.current_section, 'merged current_section'
-  end
-
-  def test_merge_attributes
-    tl1 = @store.add_file 'one.rb'
-    tl2 = @store.add_file 'two.rb'
-
-    cm1 = RDoc::ClassModule.new 'Klass'
-
-    attr = cm1.add_attribute RDoc::Attr.new(nil, 'a1', 'RW', '')
-    attr.record_location tl1
-    attr = cm1.add_attribute RDoc::Attr.new(nil, 'a3', 'R', '')
-    attr.record_location tl1
-    attr = cm1.add_attribute RDoc::Attr.new(nil, 'a4', 'R', '')
-    attr.record_location tl1
-
-    cm2 = RDoc::ClassModule.new 'Klass'
-    # TODO allow merging when comment == ''
-    cm2.instance_variable_set :@comment, @RM::Document.new
-
-    attr = cm2.add_attribute RDoc::Attr.new(nil, 'a2', 'RW', '')
-    attr.record_location tl2
-    attr = cm2.add_attribute RDoc::Attr.new(nil, 'a3', 'W', '')
-    attr.record_location tl1
-    attr = cm2.add_attribute RDoc::Attr.new(nil, 'a4', 'W', '')
-    attr.record_location tl1
-
-    cm1.merge cm2
-
-    expected = [
-      RDoc::Attr.new(nil, 'a2', 'RW', ''),
-      RDoc::Attr.new(nil, 'a3', 'W',  ''),
-      RDoc::Attr.new(nil, 'a4', 'W',  ''),
-    ]
-
-    expected.each do |a| a.parent = cm1 end
-    assert_equal expected, cm1.attributes.sort
-  end
-
-  def test_merge_attributes_version_0
-    tl1 = @store.add_file 'one.rb'
-
-    cm1 = RDoc::ClassModule.new 'Klass'
-
-    attr = cm1.add_attribute RDoc::Attr.new(nil, 'a1', 'RW', '')
-    attr.record_location tl1
-    attr = cm1.add_attribute RDoc::Attr.new(nil, 'a3', 'R', '')
-    attr.record_location tl1
-    attr = cm1.add_attribute RDoc::Attr.new(nil, 'a4', 'R', '')
-    attr.record_location tl1
-
-    cm2 = RDoc::ClassModule.new 'Klass'
-    # TODO allow merging when comment == ''
-    cm2.instance_variable_set :@comment, @RM::Document.new
-
-    attr = cm2.add_attribute RDoc::Attr.new(nil, 'a2', 'RW', '')
-    attr = cm2.add_attribute RDoc::Attr.new(nil, 'a3', 'W', '')
-    attr = cm2.add_attribute RDoc::Attr.new(nil, 'a4', 'W', '')
-
-    cm1.merge cm2
-
-    expected = [
-      RDoc::Attr.new(nil, 'a1', 'RW', ''),
-      RDoc::Attr.new(nil, 'a2', 'RW', ''),
-      RDoc::Attr.new(nil, 'a3', 'RW', ''),
-      RDoc::Attr.new(nil, 'a4', 'RW', ''),
-    ]
-
-    expected.each do |a| a.parent = cm1 end
-    assert_equal expected, cm1.attributes.sort
-  end
-
-  def test_merge_collections_drop
-    tl = @store.add_file 'file'
-
-    cm1 = RDoc::ClassModule.new 'C'
-    cm1.record_location tl
-
-    const = cm1.add_constant RDoc::Constant.new('CONST', nil, nil)
-    const.record_location tl
-
-    cm2 = RDoc::ClassModule.new 'C'
-    cm2.record_location tl
-
-    added = []
-    removed = []
-
-    cm1.merge_collections cm1.constants, cm2.constants, cm2.in_files do |add, c|
-      if add then
-        added << c
-      else
-        removed << c
-      end
-    end
-
-    assert_empty added
-    assert_equal [const], removed
-  end
-
-  def test_merge_comment
-    tl1 = @store.add_file 'one.rb'
-    tl2 = @store.add_file 'two.rb'
-
-    cm1 = tl1.add_class RDoc::ClassModule, 'Klass'
-    cm1.add_comment 'klass 1', tl1
-    cm1.record_location tl1
-
-    cm2 = tl1.add_class RDoc::NormalClass, 'Klass'
-    cm2.add_comment 'klass 2', tl2
-    cm2.add_comment 'klass 3', tl1
-    cm2.record_location tl1
-    cm2.record_location tl2
-
-    cm2 = Marshal.load Marshal.dump cm2
-    cm2.store = @store
-
-    cm1.merge cm2
-
-    inner1 = @RM::Document.new @RM::Paragraph.new 'klass 3'
-    inner1.file = 'one.rb'
-    inner2 = @RM::Document.new @RM::Paragraph.new 'klass 2'
-    inner2.file = 'two.rb'
-
-    expected = @RM::Document.new inner2, inner1
-
-    assert_equal expected, cm1.comment
-  end
-
-  def test_merge_comment_version_0
-    tl = @store.add_file 'file.rb'
-
-    cm1 = RDoc::ClassModule.new 'Klass'
-    cm1.add_comment 'klass 1', tl
-
-    cm2 = RDoc::ClassModule.new 'Klass'
-
-    cm2.instance_variable_set(:@comment,
-                              @RM::Document.new(
-                                @RM::Paragraph.new('klass 2')))
-    cm2.instance_variable_set :@comment_location, @RM::Document.new(cm2.comment)
-
-    cm1.merge cm2
-
-    inner = @RM::Document.new @RM::Paragraph.new 'klass 1'
-    inner.file = 'file.rb'
-
-    expected = @RM::Document.new \
-      inner,
-      @RM::Document.new(@RM::Paragraph.new('klass 2'))
-
-    assert_equal expected, cm1.comment
-  end
-
-  def test_merge_constants
-    tl1 = @store.add_file 'one.rb'
-    tl2 = @store.add_file 'two.rb'
-
-    cm1 = tl1.add_class RDoc::ClassModule, 'Klass'
-
-    const = cm1.add_constant RDoc::Constant.new('C1', nil, 'one')
-    const.record_location tl1
-    const = cm1.add_constant RDoc::Constant.new('C3', nil, 'one')
-    const.record_location tl1
-
-    store = RDoc::Store.new
-    tl = store.add_file 'one.rb'
-    cm2 = tl.add_class RDoc::ClassModule, 'Klass'
-    cm2.instance_variable_set :@comment, @RM::Document.new
-
-    const = cm2.add_constant RDoc::Constant.new('C2', nil, 'two')
-    const.record_location tl2
-    const = cm2.add_constant RDoc::Constant.new('C3', nil, 'one')
-    const.record_location tl1
-    const = cm2.add_constant RDoc::Constant.new('C4', nil, 'one')
-    const.record_location tl1
-
-    cm1.merge cm2
-
-    expected = [
-      RDoc::Constant.new('C2', nil, 'two'),
-      RDoc::Constant.new('C3', nil, 'one'),
-      RDoc::Constant.new('C4', nil, 'one'),
-    ]
-
-    expected.each do |a| a.parent = cm1 end
-
-    assert_equal expected, cm1.constants.sort
-  end
-
-  def test_merge_constants_version_0
-    tl1 = @store.add_file 'one.rb'
-
-    cm1 = tl1.add_class RDoc::ClassModule, 'Klass'
-
-    const = cm1.add_constant RDoc::Constant.new('C1', nil, 'one')
-    const.record_location tl1
-    const = cm1.add_constant RDoc::Constant.new('C3', nil, 'one')
-    const.record_location tl1
-
-    store = RDoc::Store.new
-    tl = store.add_file 'one.rb'
-    cm2 = tl.add_class RDoc::ClassModule, 'Klass'
-    cm2.instance_variable_set :@comment, @RM::Document.new
-
-    const = cm2.add_constant RDoc::Constant.new('C2', nil, 'two')
-    const = cm2.add_constant RDoc::Constant.new('C3', nil, 'two')
-    const = cm2.add_constant RDoc::Constant.new('C4', nil, 'two')
-
-    cm1.merge cm2
-
-    expected = [
-      RDoc::Constant.new('C1', nil, 'one'),
-      RDoc::Constant.new('C2', nil, 'two'),
-      RDoc::Constant.new('C3', nil, 'one'),
-      RDoc::Constant.new('C4', nil, 'two'),
-    ]
-
-    expected.each do |a| a.parent = cm1 end
-
-    assert_equal expected, cm1.constants.sort
-  end
-
-  def test_merge_extends
-    tl1 = @store.add_file 'one.rb'
-    cm1 = tl1.add_class RDoc::ClassModule, 'Klass'
-
-    ext = cm1.add_extend RDoc::Extend.new('I1', 'one')
-    ext.record_location tl1
-    ext = cm1.add_extend RDoc::Extend.new('I3', 'one')
-    ext.record_location tl1
-
-    tl2 = @store.add_file 'two.rb'
-    tl2.store = RDoc::Store.new
-
-    cm2 = tl2.add_class RDoc::ClassModule, 'Klass'
-    cm2.instance_variable_set :@comment, @RM::Document.new
-
-    ext = cm2.add_extend RDoc::Extend.new('I2', 'two')
-    ext.record_location tl2
-    ext = cm2.add_extend RDoc::Extend.new('I3', 'one')
-    ext.record_location tl1
-    ext = cm2.add_extend RDoc::Extend.new('I4', 'one')
-    ext.record_location tl1
-
-    cm1.merge cm2
-
-    expected = [
-      RDoc::Extend.new('I2', 'two'),
-      RDoc::Extend.new('I3', 'one'),
-      RDoc::Extend.new('I4', 'one'),
-    ]
-
-    expected.each do |a| a.parent = cm1 end
-
-    assert_equal expected, cm1.extends.sort
-  end
-
-  def test_merge_includes
-    tl1 = @store.add_file 'one.rb'
-
-    cm1 = tl1.add_class RDoc::ClassModule, 'Klass'
-
-    incl = cm1.add_include RDoc::Include.new('I1', 'one')
-    incl.record_location tl1
-    incl = cm1.add_include RDoc::Include.new('I3', 'one')
-    incl.record_location tl1
-
-    tl2 = @store.add_file 'two.rb'
-    tl2.store = RDoc::Store.new
-
-    cm2 = tl2.add_class RDoc::ClassModule, 'Klass'
-    cm2.instance_variable_set :@comment, @RM::Document.new
-
-    incl = cm2.add_include RDoc::Include.new('I2', 'two')
-    incl.record_location tl2
-    incl = cm2.add_include RDoc::Include.new('I3', 'one')
-    incl.record_location tl1
-    incl = cm2.add_include RDoc::Include.new('I4', 'one')
-    incl.record_location tl1
-
-    cm1.merge cm2
-
-    expected = [
-      RDoc::Include.new('I2', 'two'),
-      RDoc::Include.new('I3', 'one'),
-      RDoc::Include.new('I4', 'one'),
-    ]
-
-    expected.each do |a| a.parent = cm1 end
-
-    assert_equal expected, cm1.includes.sort
-  end
-
-  def test_merge_includes_version_0
-    tl1 = @store.add_file 'one.rb'
-
-    cm1 = tl1.add_class RDoc::ClassModule, 'Klass'
-
-    incl = cm1.add_include RDoc::Include.new('I1', 'one')
-    incl.record_location tl1
-    incl = cm1.add_include RDoc::Include.new('I3', 'one')
-    incl.record_location tl1
-
-    tl2 = @store.add_file 'one.rb'
-    tl2.store = RDoc::Store.new
-
-    cm2 = tl2.add_class RDoc::ClassModule, 'Klass'
-    cm2.instance_variable_set :@comment, @RM::Document.new
-
-    incl = cm2.add_include RDoc::Include.new('I2', 'two')
-    incl = cm2.add_include RDoc::Include.new('I3', 'two')
-    incl = cm2.add_include RDoc::Include.new('I4', 'two')
-
-    cm1.merge cm2
-
-    expected = [
-      RDoc::Include.new('I1', 'one'),
-      RDoc::Include.new('I2', 'two'),
-      RDoc::Include.new('I3', 'one'),
-      RDoc::Include.new('I4', 'two'),
-    ]
-
-    expected.each do |a| a.parent = cm1 end
-
-    assert_equal expected, cm1.includes.sort
-  end
-
-  def test_merge_methods
-    tl1 = @store.add_file 'one.rb'
-    tl2 = @store.add_file 'two.rb'
-
-    cm1 = tl1.add_class RDoc::NormalClass, 'Klass'
-
-    meth = cm1.add_method RDoc::AnyMethod.new(nil, 'm1')
-    meth.record_location tl1
-    meth = cm1.add_method RDoc::AnyMethod.new(nil, 'm3')
-    meth.record_location tl1
-
-    cm2 = RDoc::ClassModule.new 'Klass'
-    cm2.store = @store
-    cm2.instance_variable_set :@comment, @RM::Document.new
-
-    meth = cm2.add_method RDoc::AnyMethod.new(nil, 'm2')
-    meth.record_location tl2
-    meth = cm2.add_method RDoc::AnyMethod.new(nil, 'm3')
-    meth.record_location tl1
-    meth = cm2.add_method RDoc::AnyMethod.new(nil, 'm4')
-    meth.record_location tl1
-
-    cm1.merge cm2
-
-    expected = [
-      RDoc::AnyMethod.new(nil, 'm2'),
-      RDoc::AnyMethod.new(nil, 'm3'),
-      RDoc::AnyMethod.new(nil, 'm4'),
-    ]
-
-    expected.each do |a| a.parent = cm1 end
-
-    assert_equal expected, cm1.method_list.sort
-  end
-
-  def test_merge_methods_version_0
-    tl1 = @store.add_file 'one.rb'
-
-    cm1 = tl1.add_class RDoc::NormalClass, 'Klass'
-
-    meth = cm1.add_method RDoc::AnyMethod.new(nil, 'm1')
-    meth.record_location tl1
-    meth = cm1.add_method RDoc::AnyMethod.new(nil, 'm3')
-    meth.record_location tl1
-
-    cm2 = RDoc::ClassModule.new 'Klass'
-    cm2.store = @store
-    cm2.instance_variable_set :@comment, @RM::Document.new
-
-    meth = cm2.add_method RDoc::AnyMethod.new(nil, 'm2')
-    meth = cm2.add_method RDoc::AnyMethod.new(nil, 'm3')
-    meth = cm2.add_method RDoc::AnyMethod.new(nil, 'm4')
-
-    cm1.merge cm2
-
-    expected = [
-      RDoc::AnyMethod.new(nil, 'm1'),
-      RDoc::AnyMethod.new(nil, 'm2'),
-      RDoc::AnyMethod.new(nil, 'm3'),
-      RDoc::AnyMethod.new(nil, 'm4'),
-    ]
-
-    expected.each do |a| a.parent = cm1 end
-
-    assert_equal expected, cm1.method_list.sort
-  end
-
-  def test_merge_sections
-    store1 = @store
-
-    tl1_1 = store1.add_file 'one.rb'
-
-    cm1  = tl1_1.add_class RDoc::ClassModule, 'Klass'
-    cm1.record_location tl1_1
-
-    s1_0 = cm1.sections.first
-    s1_1 = cm1.add_section 'section 1', comment('comment 1',   tl1_1)
-           cm1.add_section 'section 2', comment('comment 2 a', tl1_1)
-           cm1.add_section 'section 4', comment('comment 4 a', tl1_1)
-
-    store2 = RDoc::Store.new
-    tl2_1 = store2.add_file 'one.rb'
-    tl2_2 = store2.add_file 'two.rb'
-
-    cm2  = tl2_1.add_class RDoc::ClassModule, 'Klass'
-    cm2.record_location tl2_1
-    cm2.record_location tl2_2
-
-           cm2.sections.first
-    s2_2 = cm2.add_section 'section 2', comment('comment 2 b', tl2_1)
-    s2_3 = cm2.add_section 'section 3', comment('comment 3',   tl2_2)
-           cm2.add_section 'section 4', comment('comment 4 b', tl2_2)
-
-    cm1.merge cm2
-
-    expected = [
-      s1_0,
-      s1_1,
-      s2_2,
-      s2_3,
-      RDoc::Context::Section.new(cm1, 'section 4', nil)
-    ]
-
-    merged_sections = cm1.sections.sort_by do |s|
-      s.title || ''
-    end
-
-    assert_equal expected, merged_sections
-
-    assert_equal [comment('comment 2 b', tl2_1)],
-                 cm1.sections_hash['section 2'].comments
-
-    expected_s4_comments = [
-      comment('comment 4 a', tl2_1),
-      comment('comment 4 b', tl2_2),
-    ]
-
-    assert_equal expected_s4_comments, cm1.sections_hash['section 4'].comments
-  end
-
-  def test_merge_sections_overlap
-    store1 = @store
-
-    tl1_1 = store1.add_file 'one.rb'
-    tl1_3 = store1.add_file 'three.rb'
-
-    cm1  = tl1_1.add_class RDoc::ClassModule, 'Klass'
-    cm1.record_location tl1_1
-
-    cm1.add_section 'section', comment('comment 1 a', tl1_1)
-    cm1.add_section 'section', comment('comment 3',   tl1_3)
-
-    store2 = RDoc::Store.new
-    tl2_1 = store2.add_file 'one.rb'
-    tl2_2 = store2.add_file 'two.rb'
-    tl2_3 = store2.add_file 'three.rb'
-
-    cm2  = tl2_1.add_class RDoc::ClassModule, 'Klass'
-    cm2.record_location tl2_1
-    cm2.record_location tl2_2
-
-    s2_0 = cm2.sections.first
-    s2_1 = cm2.add_section 'section', comment('comment 1 b', tl1_1)
-           cm2.add_section 'section', comment('comment 2',   tl2_2)
-
-    cm1.merge_sections cm2
-
-    expected = [
-      s2_0,
-      s2_1,
-    ]
-
-    merged_sections = cm1.sections.sort_by do |s|
-      s.title || ''
-    end
-
-    assert_equal expected, merged_sections
-
-    expected = [
-      comment('comment 1 b', tl2_1),
-      comment('comment 3',   tl2_3),
-      comment('comment 2',   tl2_2),
-    ]
-
-    comments = cm1.sections_hash['section'].comments
-
-    assert_equal expected, comments.sort_by { |c| c.file.name }
-  end
-
-  def test_parse
-    tl1 = @store.add_file 'one.rb'
-    tl2 = @store.add_file 'two.rb'
-
-    cm = RDoc::ClassModule.new 'Klass'
-    cm.add_comment 'comment 1', tl1
-    cm.add_comment 'comment 2', tl2
-
-    doc1 = @RM::Document.new @RM::Paragraph.new 'comment 1'
-    doc1.file = tl1
-    doc2 = @RM::Document.new @RM::Paragraph.new 'comment 2'
-    doc2.file = tl2
-
-    expected = @RM::Document.new doc1, doc2
-
-    assert_equal expected, cm.parse(cm.comment_location)
-  end
-
-  def test_parse_comment
-    tl1 = @store.add_file 'one.rb'
-
-    cm = RDoc::ClassModule.new 'Klass'
-    cm.comment = comment 'comment 1', tl1
-
-    doc = @RM::Document.new @RM::Paragraph.new 'comment 1'
-    doc.file = tl1
-
-    assert_equal doc, cm.parse(cm.comment)
-  end
-
-  def test_parse_comment_format
-    tl1 = @store.add_file 'one.rb'
-
-    cm = RDoc::ClassModule.new 'Klass'
-    cm.comment = comment 'comment ((*1*))', tl1
-    cm.comment.format = 'rd'
-
-    doc = @RM::Document.new @RM::Paragraph.new 'comment <em>1</em>'
-    doc.file = tl1
-
-    assert_equal doc, cm.parse(cm.comment)
-  end
-
-  def test_parse_comment_location
-    tl1 = @store.add_file 'one.rb'
-    tl2 = @store.add_file 'two.rb'
-
-    cm = tl1.add_class RDoc::NormalClass, 'Klass'
-    cm.add_comment 'comment 1', tl1
-    cm.add_comment 'comment 2', tl2
-
-    cm = Marshal.load Marshal.dump cm
-
-    doc1 = @RM::Document.new @RM::Paragraph.new 'comment 1'
-    doc1.file = tl1
-    doc2 = @RM::Document.new @RM::Paragraph.new 'comment 2'
-    doc2.file = tl2
-
-    assert_same cm.comment_location, cm.parse(cm.comment_location)
-  end
-
-  def test_remove_nodoc_children
-    parent = @top_level.add_class RDoc::ClassModule, 'A'
-    parent.modules_hash.replace 'B' => true, 'C' => true
-    @store.modules_hash.replace 'A::B' => true
-
-    parent.classes_hash.replace 'D' => true, 'E' => true
-    @store.classes_hash.replace 'A::D' => true
-
-    parent.remove_nodoc_children
-
-    assert_equal %w[B], parent.modules_hash.keys
-    assert_equal %w[D], parent.classes_hash.keys
-  end
-
-  def test_search_record
-    @c2_c3.add_comment 'This is a comment.', @xref_data
-
-    expected = [
-      'C3',
-      'C2::C3',
-      'C2::C3',
-      '',
-      'C2/C3.html',
-      '',
-      "<p>This is a comment.\n"
-    ]
-
-    assert_equal expected, @c2_c3.search_record
-  end
-
-  def test_search_record_merged
-    @c2_c3.add_comment 'comment A', @store.add_file('a.rb')
-    @c2_c3.add_comment 'comment B', @store.add_file('b.rb')
-
-    expected = [
-      'C3',
-      'C2::C3',
-      'C2::C3',
-      '',
-      'C2/C3.html',
-      '',
-      "<p>comment A\n<p>comment B\n"
-    ]
-
-    assert_equal expected, @c2_c3.search_record
-  end
-
-  def test_store_equals
-    # version 2
-    loaded = Marshal.load "\x04\bU:\x16RDoc::NormalClass[\x0Fi\aI\"\nKlass" +
-                          "\x06:\x06EFI\"\x15Namespace::Klass\x06;\x06FI" +
-                          "\"\nSuper\x06;\x06Fo:\eRDoc::Markup::Document\a" +
-                          ":\v@parts[\x06o;\a\a;\b[\x06o" +
-                          ":\x1CRDoc::Markup::Paragraph\x06;\b" +
-                          "[\x06I\"\x16this is a comment\x06;\x06F" +
-                          ":\n@fileI\"\ffile.rb\x06;\x06F;\n0[\a[\nI" +
-                          "\"\aa2\x06;\x06FI\"\aRW\x06;\x06F:\vpublicT@\x11" +
-                          "[\nI\"\aa1\x06;\x06FI\"\aRW\x06;\x06F;\vF@\x11" +
-                          "[\x06[\bI\"\aC1\x06;\x06Fo;\a\a;\b[\x00;\n0@\x11" +
-                          "[\x06[\bI\"\aI1\x06;\x06Fo;\a\a;\b[\x00;\n0@\x11" +
-                          "[\a[\aI\"\nclass\x06;\x06F[\b[\a;\v[\x00" +
-                          "[\a:\x0Eprotected[\x00[\a:\fprivate[\x00[\aI" +
-                          "\"\rinstance\x06;\x06F[\b[\a;\v[\x06[\aI" +
-                          "\"\am1\x06;\x06F@\x11[\a;\f[\x00[\a;\r[\x00" +
-                          "[\x06[\bI\"\aE1\x06;\x06Fo;\a\a;\b[\x00;\n0@\x11"
-
-    loaded.store = @store
-
-    assert_same @store, loaded.store
-
-    a = loaded.attributes.first
-    assert_same @store, a.store
-    assert_same @store, a.file.store
-
-    c = loaded.constants.first
-    assert_same @store, c.store
-    assert_same @store, c.file.store
-
-    i = loaded.includes.first
-    assert_same @store, i.store
-    assert_same @store, i.file.store
-
-    e = loaded.extends.first
-    assert_same @store, e.store
-    assert_same @store, e.file.store
-
-    m = loaded.method_list.first
-    assert_same @store, m.store
-    assert_same @store, m.file.store
-  end
-
-  def test_superclass
-    assert_equal @c3_h1, @c3_h2.superclass
-  end
-
-  def test_update_aliases_class
-    n1 = @xref_data.add_module RDoc::NormalClass, 'N1'
-    n1_k2 = n1.add_module RDoc::NormalClass, 'N2'
-
-    a1 = RDoc::Constant.new 'A1', '', ''
-    n1.add_module_alias n1_k2, n1_k2.name, a1, @xref_data
-
-    n1_a1_c = n1.constants.find { |c| c.name == 'A1' }
-    refute_nil n1_a1_c
-    assert_equal n1_k2, n1_a1_c.is_alias_for, 'sanity check'
-
-    n1.update_aliases
-
-    n1_a1_k = @xref_data.find_class_or_module 'N1::A1'
-    refute_nil n1_a1_k
-    assert_equal n1_k2, n1_a1_k.is_alias_for
-    refute_equal n1_k2, n1_a1_k
-
-    assert_equal 1, n1_k2.aliases.length
-    assert_equal n1_a1_k, n1_k2.aliases.first
-
-    assert_equal 'N1::N2', n1_k2.full_name
-    assert_equal 'N1::A1', n1_a1_k.full_name
-  end
-
-  def test_update_aliases_module
-    n1 = @xref_data.add_module RDoc::NormalModule, 'N1'
-    n1_n2 = n1.add_module RDoc::NormalModule, 'N2'
-
-    a1 = RDoc::Constant.new 'A1', '', ''
-    n1.add_module_alias n1_n2, n1_n2.name, a1, @xref_data
-
-    n1_a1_c = n1.constants.find { |c| c.name == 'A1' }
-    refute_nil n1_a1_c
-    assert_equal n1_n2, n1_a1_c.is_alias_for, 'sanity check'
-
-    n1.update_aliases
-
-    n1_a1_m = @xref_data.find_class_or_module 'N1::A1'
-    refute_nil n1_a1_m
-    assert_equal n1_n2, n1_a1_m.is_alias_for
-    refute_equal n1_n2, n1_a1_m
-
-    assert_equal 1, n1_n2.aliases.length
-    assert_equal n1_a1_m, n1_n2.aliases.first
-
-    assert_equal 'N1::N2', n1_n2.full_name
-    assert_equal 'N1::A1', n1_a1_m.full_name
-  end
-
-  def test_update_aliases_reparent
-    l1 = @xref_data.add_module RDoc::NormalModule, 'L1'
-    l1_l2 = l1.add_module RDoc::NormalModule, 'L2'
-    o1 = @xref_data.add_module RDoc::NormalModule, 'O1'
-
-    a1 = RDoc::Constant.new 'A1', '', ''
-    o1.add_module_alias l1_l2, l1_l2.name, a1, @xref_data
-
-    o1_a1_c = o1.constants.find { |c| c.name == 'A1' }
-    refute_nil o1_a1_c
-    assert_equal l1_l2, o1_a1_c.is_alias_for
-    refute_equal l1_l2, o1_a1_c
-
-    o1.update_aliases
-
-    o1_a1_m = @xref_data.find_class_or_module 'O1::A1'
-    refute_nil o1_a1_m
-    assert_equal l1_l2, o1_a1_m.is_alias_for
-
-    assert_equal 1, l1_l2.aliases.length
-    assert_equal o1_a1_m, l1_l2.aliases[0]
-
-    assert_equal 'L1::L2', l1_l2.full_name
-    assert_equal 'O1::A1', o1_a1_m.full_name
-  end
-
-  def test_update_aliases_reparent_root
-    store = RDoc::Store.new
-
-    top_level = store.add_file 'file.rb'
-
-    klass  = top_level.add_class RDoc::NormalClass, 'Klass'
-    object = top_level.add_class RDoc::NormalClass, 'Object'
-
-    const = RDoc::Constant.new 'A', nil, ''
-    const.record_location top_level
-    const.is_alias_for = klass
-
-    a = RDoc::Constant.new 'A', '', ''
-    top_level.add_module_alias klass, klass.name, a, top_level
-
-    object.add_constant const
-
-    object.update_aliases
-
-    assert_equal %w[A Klass Object], store.classes_hash.keys.sort
-
-    assert_equal 'A',     store.classes_hash['A'].full_name
-    assert_equal 'Klass', store.classes_hash['Klass'].full_name
-  end
-
-  def test_update_includes
-    a = RDoc::Include.new 'M1', nil
-    b = RDoc::Include.new 'M2', nil
-    c = RDoc::Include.new 'C', nil
-
-    @c1.add_include a
-    @c1.add_include b
-    @c1.add_include c
-    @c1.ancestors # cache included modules
-
-    @m1_m2.document_self = nil
-    assert @m1_m2.remove_from_documentation?
-
-    assert @store.modules_hash.key? @m1_m2.full_name
-    refute @store.modules_hash[@m1_m2.full_name].nil?
-
-    @store.remove_nodoc @store.modules_hash
-    refute @store.modules_hash.key? @m1_m2.full_name
-
-    @c1.update_includes
-
-    assert_equal [a, c], @c1.includes
-  end
-
-  def test_update_includes_trim
-    a = RDoc::Include.new 'D::M', nil
-    b = RDoc::Include.new 'D::M', nil
-
-    @c1.add_include a
-    @c1.add_include b
-    @c1.ancestors # cache included modules
-
-    @c1.update_includes
-
-    assert_equal [a], @c1.includes
-  end
-
-  def test_update_includes_with_colons
-    a = RDoc::Include.new 'M1', nil
-    b = RDoc::Include.new 'M1::M2', nil
-    c = RDoc::Include.new 'C', nil
-
-    @c1.add_include a
-    @c1.add_include b
-    @c1.add_include c
-    @c1.ancestors # cache included modules
-
-    @m1_m2.document_self = nil
-    assert @m1_m2.remove_from_documentation?
-
-    assert @store.modules_hash.key? @m1_m2.full_name
-    refute @store.modules_hash[@m1_m2.full_name].nil?
-    @store.remove_nodoc @store.modules_hash
-    refute @store.modules_hash.key? @m1_m2.full_name
-
-    @c1.update_includes
-
-    assert_equal [a, c], @c1.includes
-  end
-
-  def test_update_extends
-    a = RDoc::Extend.new 'M1', nil
-    b = RDoc::Extend.new 'M2', nil
-    c = RDoc::Extend.new 'C', nil
-
-    @c1.add_extend a
-    @c1.add_extend b
-    @c1.add_extend c
-    @c1.each_extend do |extend| extend.module end # cache extended modules
-
-    @m1_m2.document_self = nil
-    assert @m1_m2.remove_from_documentation?
-
-    assert @store.modules_hash.key? @m1_m2.full_name
-    refute @store.modules_hash[@m1_m2.full_name].nil?
-    @store.remove_nodoc @store.modules_hash
-    refute @store.modules_hash.key? @m1_m2.full_name
-
-    @c1.update_extends
-
-    assert_equal [a, b, c], @c1.extends
-  end
-
-  def test_update_extends_trim
-    a = RDoc::Extend.new 'D::M', nil
-    b = RDoc::Extend.new 'D::M', nil
-
-    @c1.add_extend a
-    @c1.add_extend b
-    @c1.each_extend do |extend| extend.module end # cache extended modules
-
-    @c1.update_extends
-
-    assert_equal [a], @c1.extends
-  end
-
-  def test_update_extends_with_colons
-    a = RDoc::Extend.new 'M1', nil
-    b = RDoc::Extend.new 'M1::M2', nil
-    c = RDoc::Extend.new 'C', nil
-
-    @c1.add_extend a
-    @c1.add_extend b
-    @c1.add_extend c
-    @c1.each_extend do |extend| extend.module end # cache extended modules
-
-    @m1_m2.document_self = nil
-    assert @m1_m2.remove_from_documentation?
-
-    assert @store.modules_hash.key? @m1_m2.full_name
-    refute @store.modules_hash[@m1_m2.full_name].nil?
-
-    @store.remove_nodoc @store.modules_hash
-    refute @store.modules_hash.key? @m1_m2.full_name
-
-    @c1.update_extends
-
-    assert_equal [a, c], @c1.extends
-  end
-
-end
diff --git a/test/rdoc/test_rdoc_code_object.rb b/test/rdoc/test_rdoc_code_object.rb
deleted file mode 100644
index 24e228cce17941..00000000000000
--- a/test/rdoc/test_rdoc_code_object.rb
+++ /dev/null
@@ -1,440 +0,0 @@
-# coding: US-ASCII
-# frozen_string_literal: true
-
-require_relative 'xref_test_case'
-
-class TestRDocCodeObject < XrefTestCase
-
-  def setup
-    super
-
-    @co = RDoc::CodeObject.new
-  end
-
-  def test_initialize
-    assert @co.document_self, 'document_self'
-    assert @co.document_children, 'document_children'
-    refute @co.force_documentation, 'force_documentation'
-    refute @co.done_documenting, 'done_documenting'
-    refute @co.received_nodoc, 'received_nodoc'
-    assert_equal '', @co.comment, 'comment is empty'
-  end
-
-  def test_comment_equals
-    @co.comment = ''
-
-    assert_equal '', @co.comment
-
-    @co.comment = 'I am a comment'
-
-    assert_equal 'I am a comment', @co.comment
-  end
-
-  def test_comment_equals_comment
-    @co.comment = comment ''
-
-    assert_equal '', @co.comment.text
-
-    @co.comment = comment 'I am a comment'
-
-    assert_equal 'I am a comment', @co.comment.text
-  end
-
-  def test_comment_equals_document
-    doc = RDoc::Markup::Document.new
-    @co.comment = doc
-
-    @co.comment = ''
-
-    assert_equal doc, @co.comment
-  end
-
-  def test_comment_equals_encoding
-    refute_equal Encoding::UTF_8, ''.encoding, 'Encoding sanity check'
-
-    input = 'text'
-    input = RDoc::Encoding.change_encoding input, Encoding::UTF_8
-
-    @co.comment = input
-
-    assert_equal 'text', @co.comment
-    assert_equal Encoding::UTF_8, @co.comment.encoding
-  end
-
-  def test_comment_equals_encoding_blank
-    refute_equal Encoding::UTF_8, ''.encoding, 'Encoding sanity check'
-
-    input = ''
-    input = RDoc::Encoding.change_encoding input, Encoding::UTF_8
-
-    @co.comment = input
-
-    assert_equal '', @co.comment
-    assert_equal Encoding::UTF_8, @co.comment.encoding
-  end
-
-  def test_display_eh_document_self
-    assert @co.display?
-
-    @co.document_self = false
-
-    refute @co.display?
-  end
-
-  def test_display_eh_ignore
-    assert @co.display?
-
-    @co.ignore
-
-    refute @co.display?
-
-    @co.stop_doc
-
-    refute @co.display?
-
-    @co.done_documenting = false
-
-    refute @co.display?
-  end
-
-  def test_display_eh_suppress
-    assert @co.display?
-
-    @co.suppress
-
-    refute @co.display?
-
-    @co.comment = comment('hi')
-
-    refute @co.display?
-
-    @co.done_documenting = false
-
-    assert @co.display?
-
-    @co.ignore
-    @co.done_documenting = false
-
-    refute @co.display?
-  end
-
-  def test_document_children_equals
-    @co.document_children = false
-
-    refute @co.document_children
-
-    @store.rdoc.options.visibility = :nodoc
-
-    @co.store = @store
-
-    assert @co.document_children
-
-    @co.document_children = false
-
-    assert @co.document_children
-  end
-
-  def test_document_self_equals
-    @co.document_self = false
-    refute @co.document_self
-
-    @store.rdoc.options.visibility = :nodoc
-
-    @co.store = @store
-
-    assert @co.document_self
-
-    @co.document_self = false
-
-    assert @co.document_self
-  end
-
-  def test_documented_eh
-    refute @co.documented?
-
-    @co.comment = 'hi'
-
-    assert @co.documented?
-
-    @co.comment.replace ''
-
-    refute @co.documented?
-
-    @co.document_self = nil # notify :nodoc:
-
-    assert @co.documented?
-  end
-
-  def test_done_documenting
-    # once done_documenting is set, other properties refuse to go to "true"
-    @co.done_documenting = true
-
-    @co.document_self = true
-    refute @co.document_self
-
-    @co.document_children = true
-    refute @co.document_children
-
-    @co.force_documentation = true
-    refute @co.force_documentation
-
-    @co.start_doc
-    refute @co.document_self
-    refute @co.document_children
-
-    # turning done_documenting on
-    # resets others to true
-
-    @co.done_documenting = false
-    assert @co.document_self
-    assert @co.document_children
-
-    @co.done_documenting = true
-
-    @store.rdoc.options.visibility = :nodoc
-
-    @co.store = @store
-
-    refute @co.done_documenting
-
-    @co.done_documenting = true
-
-    refute @co.done_documenting
-  end
-
-  def test_each_parent
-    parents = []
-
-    @parent_m.each_parent do |code_object|
-      parents << code_object
-    end
-
-    assert_equal [@parent, @xref_data], parents
-  end
-
-  def test_file_name
-    assert_nil @co.file_name
-
-    @co.record_location @store.add_file 'lib/file.rb'
-
-    assert_equal 'lib/file.rb', @co.file_name
-  end
-
-  def test_full_name_equals
-    @co.full_name = 'hi'
-
-    assert_equal 'hi', @co.instance_variable_get(:@full_name)
-
-    @co.full_name = nil
-
-    assert_nil @co.instance_variable_get(:@full_name)
-  end
-
-  def test_ignore
-    @co.ignore
-
-    refute @co.document_self
-    refute @co.document_children
-    assert @co.ignored?
-
-    @store.rdoc.options.visibility = :nodoc
-
-    @co.store = @store
-
-    assert @co.document_self
-    assert @co.document_children
-    refute @co.ignored?
-
-    @co.ignore
-
-    refute @co.ignored?
-  end
-
-  def test_ignore_eh
-    refute @co.ignored?
-
-    @co.ignore
-
-    assert @co.ignored?
-  end
-
-  def test_line
-    @c1_m.line = 5
-
-    assert_equal 5, @c1_m.line
-  end
-
-  def test_metadata
-    assert_empty @co.metadata
-
-    @co.metadata['markup'] = 'not_rdoc'
-
-    expected = { 'markup' => 'not_rdoc' }
-
-    assert_equal expected, @co.metadata
-
-    assert_equal 'not_rdoc', @co.metadata['markup']
-  end
-
-  def test_options
-    assert_kind_of RDoc::Options, @co.options
-
-    @co.store = @store
-
-    assert_same @options, @co.options
-  end
-
-  def test_parent_file_name
-    assert_equal '(unknown)', @co.parent_file_name
-    assert_equal 'xref_data.rb', @c1.parent_file_name
-  end
-
-  def test_parent_name
-    assert_equal '(unknown)', @co.parent_name
-    assert_equal 'xref_data.rb', @c1.parent_name
-    assert_equal 'C2', @c2_c3.parent_name
-  end
-
-  def test_received_ndoc
-    @co.document_self = false
-    refute @co.received_nodoc
-
-    @co.document_self = nil
-    assert @co.received_nodoc
-
-    @co.document_self = true
-  end
-
-  def test_record_location
-    @co.record_location @xref_data
-
-    assert_equal 'xref_data.rb', @co.file.relative_name
-  end
-
-  def test_record_location_ignored
-    @co.ignore
-    @co.record_location @xref_data
-
-    refute @co.ignored?
-  end
-
-  def test_record_location_suppressed
-    @co.suppress
-    @co.record_location @xref_data
-
-    refute @co.suppressed?
-  end
-
-  def test_section
-    parent = RDoc::Context.new
-    section = parent.sections.first
-
-    @co.parent = parent
-    @co.instance_variable_set :@section, section
-
-    assert_equal section, @co.section
-
-    @co.instance_variable_set :@section, nil
-    @co.instance_variable_set :@section_title, nil
-
-    assert_equal section, @co.section
-
-    @co.instance_variable_set :@section, nil
-    @co.instance_variable_set :@section_title, 'new title'
-
-    assert_equal 'new title', @co.section.title
-  end
-
-  def test_start_doc
-    @co.document_self = false
-    @co.document_children = false
-
-    @co.start_doc
-
-    assert @co.document_self
-    assert @co.document_children
-  end
-
-  def test_start_doc_ignored
-    @co.ignore
-
-    @co.start_doc
-
-    assert @co.document_self
-    assert @co.document_children
-    refute @co.ignored?
-  end
-
-  def test_start_doc_suppressed
-    @co.suppress
-
-    @co.start_doc
-
-    assert @co.document_self
-    assert @co.document_children
-    refute @co.suppressed?
-  end
-
-  def test_store_equals
-    @co.document_self = false
-
-    @co.store = @store
-
-    refute @co.document_self
-
-    @store.rdoc.options.visibility = :nodoc
-
-    @co.store = @store
-
-    assert @co.document_self
-  end
-
-  def test_stop_doc
-    @co.document_self = true
-    @co.document_children = true
-
-    @co.stop_doc
-
-    refute @co.document_self
-    refute @co.document_children
-
-    @store.rdoc.options.visibility = :nodoc
-
-    @co.store = @store
-
-    assert @co.document_self
-    assert @co.document_children
-
-    @co.stop_doc
-
-    assert @co.document_self
-    assert @co.document_children
-  end
-
-  def test_suppress
-    @co.suppress
-
-    refute @co.document_self
-    refute @co.document_children
-    assert @co.suppressed?
-
-    @store.rdoc.options.visibility = :nodoc
-
-    @co.store = @store
-
-    refute @co.suppressed?
-
-    @co.suppress
-
-    refute @co.suppressed?
-  end
-
-  def test_suppress_eh
-    refute @co.suppressed?
-
-    @co.suppress
-
-    assert @co.suppressed?
-  end
-
-end
diff --git a/test/rdoc/test_rdoc_comment.rb b/test/rdoc/test_rdoc_comment.rb
deleted file mode 100644
index 28e8cf76b4b9fa..00000000000000
--- a/test/rdoc/test_rdoc_comment.rb
+++ /dev/null
@@ -1,506 +0,0 @@
-# coding: us-ascii
-# frozen_string_literal: true
-
-require_relative 'helper'
-
-class TestRDocComment < RDoc::TestCase
-
-  def setup
-    super
-
-    @top_level = @store.add_file 'file.rb'
-    @comment = RDoc::Comment.new
-    @comment.location = @top_level
-    @comment.text = 'this is a comment'
-  end
-
-  def test_empty_eh
-    refute_empty @comment
-
-    @comment = ''
-
-    assert_empty @comment
-  end
-
-  def test_equals2
-    assert_equal @comment, @comment.dup
-
-    c2 = @comment.dup
-    c2.text = nil
-
-    refute_equal @comment, c2
-
-    c3 = @comment.dup
-    c3.location = nil
-
-    refute_equal @comment, c3
-  end
-
-  def test_extract_call_seq
-    m = RDoc::AnyMethod.new nil, 'm'
-
-    comment = RDoc::Comment.new <<-COMMENT, @top_level
-call-seq:
-  bla => true or false
-
-moar comment
-    COMMENT
-
-    comment.extract_call_seq m
-
-    assert_equal "bla => true or false\n", m.call_seq
-  end
-
-  def test_extract_call_seq_blank
-    m = RDoc::AnyMethod.new nil, 'm'
-
-    comment = RDoc::Comment.new <<-COMMENT, @top_level
-call-seq:
-  bla => true or false
-
-    COMMENT
-
-    comment.extract_call_seq m
-
-    assert_equal "bla => true or false\n", m.call_seq
-  end
-
-  def test_extract_call_seq_commented
-    m = RDoc::AnyMethod.new nil, 'm'
-
-    comment = RDoc::Comment.new <<-COMMENT, @top_level
-# call-seq:
-#   bla => true or false
-#
-# moar comment
-    COMMENT
-
-    comment.extract_call_seq m
-
-    assert_nil m.call_seq
-  end
-
-  def test_extract_call_seq_no_blank
-    m = RDoc::AnyMethod.new nil, 'm'
-
-    comment = RDoc::Comment.new <<-COMMENT, @top_level
-call-seq:
-  bla => true or false
-    COMMENT
-
-    comment.extract_call_seq m
-
-    assert_equal "bla => true or false\n", m.call_seq
-  end
-
-  def test_extract_call_seq_undent
-    m = RDoc::AnyMethod.new nil, 'm'
-
-    comment = RDoc::Comment.new <<-COMMENT, @top_level
-call-seq:
-  bla => true or false
-moar comment
-    COMMENT
-
-    comment.extract_call_seq m
-
-    assert_equal "bla => true or false\nmoar comment\n", m.call_seq
-  end
-
-  def test_extract_call_seq_c
-    comment = RDoc::Comment.new <<-COMMENT
-call-seq:
-  commercial() -> Date <br />
-  commercial(cwyear, cweek=41, cwday=5, sg=nil) -> Date [ruby 1.8] <br />
-  commercial(cwyear, cweek=1, cwday=1, sg=nil) -> Date [ruby 1.9]
-
-If no arguments are given:
-* ruby 1.8: returns a +Date+ for 1582-10-15 (the Day of Calendar Reform in
-  Italy)
-* ruby 1.9: returns a +Date+ for julian day 0
-
-Otherwise, returns a +Date+ for the commercial week year, commercial week,
-and commercial week day given. Ignores the 4th argument.
-    COMMENT
-
-    method_obj = RDoc::AnyMethod.new nil, 'blah'
-
-    comment.extract_call_seq method_obj
-
-    expected = <<-CALL_SEQ.chomp
-commercial() -> Date <br />
-commercial(cwyear, cweek=41, cwday=5, sg=nil) -> Date [ruby 1.8] <br />
-commercial(cwyear, cweek=1, cwday=1, sg=nil) -> Date [ruby 1.9]
-
-    CALL_SEQ
-
-    assert_equal expected, method_obj.call_seq
-  end
-
-  def test_extract_call_seq_c_no_blank
-    comment = RDoc::Comment.new <<-COMMENT
-call-seq:
-  commercial() -> Date <br />
-  commercial(cwyear, cweek=41, cwday=5, sg=nil) -> Date [ruby 1.8] <br />
-  commercial(cwyear, cweek=1, cwday=1, sg=nil) -> Date [ruby 1.9]
-    COMMENT
-
-    method_obj = RDoc::AnyMethod.new nil, 'blah'
-
-    comment.extract_call_seq method_obj
-
-    expected = <<-CALL_SEQ.chomp
-commercial() -> Date <br />
-commercial(cwyear, cweek=41, cwday=5, sg=nil) -> Date [ruby 1.8] <br />
-commercial(cwyear, cweek=1, cwday=1, sg=nil) -> Date [ruby 1.9]
-
-    CALL_SEQ
-
-    assert_equal expected, method_obj.call_seq
-  end
-
-  def test_extract_call_seq_c_separator
-    comment = RDoc::Comment.new <<-'COMMENT'
-call-seq:
-   ARGF.readlines(sep=$/)     -> array
-   ARGF.readlines(limit)      -> array
-   ARGF.readlines(sep, limit) -> array
-
-   ARGF.to_a(sep=$/)     -> array
-   ARGF.to_a(limit)      -> array
-   ARGF.to_a(sep, limit) -> array
-
-Reads +ARGF+'s current file in its entirety, returning an +Array+ of its
-lines, one line per element. Lines are assumed to be separated by _sep_.
-
-   lines = ARGF.readlines
-   lines[0]                #=> "This is line one\n"
-
-    COMMENT
-
-    method_obj = RDoc::AnyMethod.new nil, 'blah'
-
-    comment.extract_call_seq method_obj
-
-    expected = <<-CALL_SEQ
-ARGF.readlines(sep=$/)     -> array
-ARGF.readlines(limit)      -> array
-ARGF.readlines(sep, limit) -> array
-ARGF.to_a(sep=$/)     -> array
-ARGF.to_a(limit)      -> array
-ARGF.to_a(sep, limit) -> array
-    CALL_SEQ
-
-    assert_equal expected, method_obj.call_seq
-
-    expected = <<-'COMMENT'
-
-Reads +ARGF+'s current file in its entirety, returning an +Array+ of its
-lines, one line per element. Lines are assumed to be separated by _sep_.
-
-   lines = ARGF.readlines
-   lines[0]                #=> "This is line one\n"
-
-    COMMENT
-
-    assert_equal expected, comment.text
-  end
-
-  def test_extract_call_linear_performance
-    pre = ->(n) {[n, RDoc::Comment.new("\n"*n + 'call-seq:' + 'a'*n)]}
-    method_obj = RDoc::AnyMethod.new nil, 'blah'
-    assert_linear_performance((2..5).map {|i| 10**i}, pre: pre) do |n, comment|
-      comment.extract_call_seq method_obj
-      assert_equal n, method_obj.call_seq.size
-    end
-  end
-
-  def test_force_encoding
-    @comment = RDoc::Encoding.change_encoding @comment, Encoding::UTF_8
-
-    assert_equal Encoding::UTF_8, @comment.text.encoding
-  end
-
-  def test_format
-    assert_equal 'rdoc', @comment.format
-  end
-
-  def test_format_equals
-    c = comment 'content'
-    document = c.parse
-
-    c.format = RDoc::RD
-
-    assert_equal RDoc::RD, c.format
-    refute_same document, c.parse
-  end
-
-  def test_initialize_copy
-    copy = @comment.dup
-
-    refute_same @comment.text, copy.text
-    assert_same @comment.location, copy.location
-  end
-
-  def test_location
-    assert_equal @top_level, @comment.location
-  end
-
-  def test_normalize
-    @comment.text = <<-TEXT
-  # comment
-    TEXT
-    @comment.language = :ruby
-
-    assert_same @comment, @comment.normalize
-
-    assert_equal 'comment', @comment.text
-  end
-
-  def test_normalize_twice
-    @comment.text = <<-TEXT
-  # comment
-    TEXT
-
-    @comment.normalize
-
-    text = @comment.text
-
-    @comment.normalize
-
-    assert_same text, @comment.text, 'normalize not cached'
-  end
-
-  def test_normalize_document
-    @comment.text = nil
-    @comment.document = @RM::Document.new
-
-    assert_same @comment, @comment.normalize
-
-    assert_nil @comment.text
-  end
-
-  def test_normalize_eh
-    refute @comment.normalized?
-
-    @comment.normalize
-
-    assert @comment.normalized?
-  end
-
-  def test_text
-    assert_equal 'this is a comment', @comment.text
-  end
-
-  def test_text_equals
-    @comment.text = 'other'
-
-    assert_equal 'other', @comment.text
-    refute @comment.normalized?
-  end
-
-  def test_text_equals_no_text
-    c = RDoc::Comment.new nil, @top_level
-    c.document = @RM::Document.new
-
-    e = assert_raise RDoc::Error do
-      c.text = 'other'
-    end
-
-    assert_equal 'replacing document-only comment is not allowed', e.message
-  end
-
-  def test_text_equals_parsed
-    document = @comment.parse
-
-    @comment.text = 'other'
-
-    refute_equal document, @comment.parse
-  end
-
-  def test_tomdoc_eh
-    refute @comment.tomdoc?
-
-    @comment.format = 'tomdoc'
-
-    assert @comment.tomdoc?
-  end
-
-  def test_parse
-    parsed = @comment.parse
-
-    expected = @RM::Document.new(
-      @RM::Paragraph.new('this is a comment'))
-
-    expected.file = @top_level
-
-    assert_equal expected, parsed
-    assert_same  parsed, @comment.parse
-  end
-
-  def test_parse_rd
-    c = comment 'it ((*works*))'
-    c.format = 'rd'
-
-    expected =
-      @RM::Document.new(
-        @RM::Paragraph.new('it <em>works</em>'))
-    expected.file = @top_level
-
-    assert_equal expected, c.parse
-  end
-
-  def test_remove_private_encoding
-    comment = RDoc::Comment.new <<-EOS, @top_level
-# This is text
-#--
-# this is private
-    EOS
-
-    comment = RDoc::Encoding.change_encoding comment, Encoding::IBM437
-
-    comment.remove_private
-
-    assert_equal Encoding::IBM437, comment.text.encoding
-  end
-
-  def test_remove_private_hash
-    @comment.text = <<-TEXT
-#--
-# private
-#++
-# public
-    TEXT
-
-    @comment.remove_private
-
-    assert_equal "# public\n", @comment.text
-  end
-
-  def test_remove_private_hash_trail
-    comment = RDoc::Comment.new <<-EOS, @top_level
-# This is text
-#--
-# this is private
-    EOS
-
-    expected = RDoc::Comment.new <<-EOS, @top_level
-# This is text
-    EOS
-
-    comment.remove_private
-
-    assert_equal expected, comment
-  end
-
-  def test_remove_private_long
-    comment = RDoc::Comment.new <<-EOS, @top_level
-#-----
-#++
-# this is text
-#-----
-    EOS
-
-    expected = RDoc::Comment.new <<-EOS, @top_level
-# this is text
-    EOS
-
-    comment.remove_private
-
-    assert_equal expected, comment
-  end
-
-  def test_remove_private_rule
-    comment = RDoc::Comment.new <<-EOS, @top_level
-# This is text with a rule:
-# ---
-# this is also text
-    EOS
-
-    expected = comment.dup
-
-    comment.remove_private
-
-    assert_equal expected, comment
-  end
-
-  def test_remove_private_star
-    @comment.text = <<-TEXT
-/*
- *--
- * private
- *++
- * public
- */
-    TEXT
-
-    @comment.remove_private
-
-    assert_equal "/*\n * public\n */\n", @comment.text
-  end
-
-  def test_remove_private_star2
-    @comment.text = <<-TEXT
-/*--
- * private
- *++
- * public
- */
-    TEXT
-
-    @comment.remove_private
-
-    assert_equal "/*--\n * private\n *++\n * public\n */\n", @comment.text
-  end
-
-  def test_remove_private_toggle
-    comment = RDoc::Comment.new <<-EOS, @top_level
-# This is text
-#--
-# this is private
-#++
-# This is text again.
-    EOS
-
-    expected = RDoc::Comment.new <<-EOS, @top_level
-# This is text
-# This is text again.
-    EOS
-
-    comment.remove_private
-
-    assert_equal expected, comment
-  end
-
-  def test_remove_private_toggle_encoding
-    comment = RDoc::Comment.new <<-EOS, @top_level
-# This is text
-#--
-# this is private
-#++
-# This is text again.
-    EOS
-
-    comment = RDoc::Encoding.change_encoding comment, Encoding::IBM437
-
-    comment.remove_private
-
-    assert_equal Encoding::IBM437, comment.text.encoding
-  end
-
-  def test_remove_private_toggle_encoding_ruby_bug?
-    comment = RDoc::Comment.new <<-EOS, @top_level
-#--
-# this is private
-#++
-# This is text again.
-    EOS
-
-    comment = RDoc::Encoding.change_encoding comment, Encoding::IBM437
-
-    comment.remove_private
-
-    assert_equal Encoding::IBM437, comment.text.encoding
-  end
-
-end
diff --git a/test/rdoc/test_rdoc_constant.rb b/test/rdoc/test_rdoc_constant.rb
deleted file mode 100644
index 32ffe3f84d9156..00000000000000
--- a/test/rdoc/test_rdoc_constant.rb
+++ /dev/null
@@ -1,182 +0,0 @@
-# frozen_string_literal: true
-require_relative 'xref_test_case'
-
-class TestRDocConstant < XrefTestCase
-
-  def setup
-    super
-
-    @const = @c1.constants.first
-  end
-
-  def test_documented_eh
-    top_level = @store.add_file 'file.rb'
-
-    const = RDoc::Constant.new 'CONST', nil, nil
-    top_level.add_constant const
-
-    refute const.documented?
-
-    const.comment = comment 'comment'
-
-    assert const.documented?
-  end
-
-  def test_documented_eh_alias
-    top_level = @store.add_file 'file.rb'
-
-    const = RDoc::Constant.new 'CONST', nil, nil
-    top_level.add_constant const
-
-    refute const.documented?
-
-    const.is_alias_for = 'C1'
-
-    refute const.documented?
-
-    @c1.add_comment comment('comment'), @top_level
-
-    assert const.documented?
-  end
-
-  def test_full_name
-    assert_equal 'C1::CONST', @const.full_name
-  end
-
-  def test_is_alias_for
-    top_level = @store.add_file 'file.rb'
-
-    c = RDoc::Constant.new 'CONST', nil, 'comment'
-    top_level.add_constant c
-
-    assert_nil c.is_alias_for
-
-    c.is_alias_for = 'C1'
-
-    assert_equal @c1, c.is_alias_for
-
-    c.is_alias_for = 'unknown'
-
-    assert_equal 'unknown', c.is_alias_for
-  end
-
-  def test_marshal_dump
-    top_level = @store.add_file 'file.rb'
-
-    c = RDoc::Constant.new 'CONST', nil, 'this is a comment'
-    c.record_location top_level
-
-    aliased = top_level.add_class RDoc::NormalClass, 'Aliased'
-    c.is_alias_for = aliased
-
-    cm = top_level.add_class RDoc::NormalClass, 'Klass'
-    cm.add_constant c
-
-    section = cm.sections.first
-
-    loaded = Marshal.load Marshal.dump c
-    loaded.store = @store
-
-    comment = doc(para('this is a comment'))
-
-    assert_equal c, loaded
-
-    assert_equal aliased,        loaded.is_alias_for
-    assert_equal comment,        loaded.comment
-    assert_equal top_level,      loaded.file
-    assert_equal 'Klass::CONST', loaded.full_name
-    assert_equal 'CONST',        loaded.name
-    assert_equal :public,        loaded.visibility
-    assert_equal cm,             loaded.parent
-    assert_equal section,        loaded.section
-  end
-
-  def test_marshal_load
-    top_level = @store.add_file 'file.rb'
-
-    c = RDoc::Constant.new 'CONST', nil, 'this is a comment'
-    c.record_location top_level
-
-    cm = top_level.add_class RDoc::NormalClass, 'Klass'
-    cm.add_constant c
-
-    section = cm.sections.first
-
-    loaded = Marshal.load Marshal.dump c
-    loaded.store = @store
-
-    comment = doc(para('this is a comment'))
-
-    assert_equal c, loaded
-
-    assert_nil                   loaded.is_alias_for
-    assert_equal comment,        loaded.comment
-    assert_equal top_level,      loaded.file
-    assert_equal 'Klass::CONST', loaded.full_name
-    assert_equal 'CONST',        loaded.name
-    assert_equal :public,        loaded.visibility
-    assert_equal cm,             loaded.parent
-    assert_equal section,        loaded.section
-
-    assert                       loaded.display?
-  end
-
-  def test_marshal_load_version_0
-    top_level = @store.add_file 'file.rb'
-
-    aliased = top_level.add_class RDoc::NormalClass, 'Aliased'
-    cm      = top_level.add_class RDoc::NormalClass, 'Klass'
-    section = cm.sections.first
-
-    loaded = Marshal.load "\x04\bU:\x13RDoc::Constant[\x0Fi\x00I" +
-                          "\"\nCONST\x06:\x06ETI\"\x11Klass::CONST\x06" +
-                          ";\x06T0I\"\fAliased\x06;\x06To" +
-                          ":\eRDoc::Markup::Document\a:\v@parts[\x06o" +
-                          ":\x1CRDoc::Markup::Paragraph\x06;\b[\x06I" +
-                          "\"\x16this is a comment\x06;\x06T:\n@file0I" +
-                          "\"\ffile.rb\x06;\x06TI\"\nKlass\x06" +
-                          ";\x06Tc\x16RDoc::NormalClass0"
-
-    loaded.store = @store
-
-    comment = doc(para('this is a comment'))
-
-    assert_equal aliased,        loaded.is_alias_for
-    assert_equal comment,        loaded.comment
-    assert_equal top_level,      loaded.file
-    assert_equal 'Klass::CONST', loaded.full_name
-    assert_equal 'CONST',        loaded.name
-    assert_equal :public,        loaded.visibility
-    assert_equal cm,             loaded.parent
-    assert_equal section,        loaded.section
-
-    assert loaded.display?
-  end
-
-  def test_marshal_round_trip
-    top_level = @store.add_file 'file.rb'
-
-    c = RDoc::Constant.new 'CONST', nil, 'this is a comment'
-    c.record_location top_level
-    c.is_alias_for = 'Unknown'
-
-    cm = top_level.add_class RDoc::NormalClass, 'Klass'
-    cm.add_constant c
-
-    section = cm.sections.first
-
-    loaded = Marshal.load Marshal.dump c
-    loaded.store = @store
-
-    reloaded = Marshal.load Marshal.dump loaded
-    reloaded.store = @store
-
-    assert_equal section,   reloaded.section
-    assert_equal 'Unknown', reloaded.is_alias_for
-  end
-
-  def test_path
-    assert_equal 'C1.html#CONST', @const.path
-  end
-
-end
diff --git a/test/rdoc/test_rdoc_context.rb b/test/rdoc/test_rdoc_context.rb
deleted file mode 100644
index 85665599fbe41c..00000000000000
--- a/test/rdoc/test_rdoc_context.rb
+++ /dev/null
@@ -1,965 +0,0 @@
-# frozen_string_literal: true
-require_relative 'xref_test_case'
-
-class TestRDocContext < XrefTestCase
-
-  def setup
-    super
-
-    @context = RDoc::Context.new
-    @context.store = @store
-  end
-
-  def test_initialize
-    assert_empty @context.in_files
-    assert_equal 'unknown', @context.name
-    assert_equal '', @context.comment
-    assert_nil   @context.parent
-    assert_equal :public, @context.visibility
-    assert_equal 1, @context.sections.length
-    assert_nil   @context.temporary_section
-
-    assert_empty @context.classes_hash
-    assert_empty @context.modules_hash
-
-    assert_empty @context.method_list
-    assert_empty @context.attributes
-    assert_empty @context.aliases
-    assert_empty @context.requires
-    assert_empty @context.includes
-    assert_empty @context.constants
-  end
-
-  def test_add_alias
-    as = RDoc::Alias.new nil, 'old_name', 'new_name', 'comment'
-
-    @context.add_alias as
-
-    assert_equal [as], @context.external_aliases
-    assert_equal [as], @context.unmatched_alias_lists['#old_name']
-  end
-
-  def test_add
-    @context.add RDoc::Extend,  'Ext', 'comment'
-    @context.add RDoc::Include, 'Incl', 'comment'
-
-    refute_empty @context.extends
-    refute_empty @context.includes
-  end
-
-  def test_add_alias_method_attr
-    top_level = @store.add_file 'file.rb'
-
-    attr = RDoc::Attr.new nil, 'old_name', 'R', ''
-
-    as = RDoc::Alias.new nil, 'old_name', 'new_name', 'comment'
-    as.record_location top_level
-    as.parent = @context
-
-    @context.add_attribute attr
-    @context.add_alias as
-
-    assert_empty @context.aliases
-    assert_empty @context.unmatched_alias_lists
-    assert_equal %w[old_name new_name], @context.attributes.map { |m| m.name }
-
-    new = @context.attributes.last
-    assert_equal top_level, new.file
-  end
-
-  def test_add_alias_method
-    top_level = @store.add_file 'file.rb'
-
-    meth = RDoc::AnyMethod.new nil, 'old_name'
-    meth.singleton = false
-
-    as = RDoc::Alias.new nil, 'old_name', 'new_name', 'comment'
-    as.record_location top_level
-    as.parent = @context
-
-    @context.add_method meth
-    @context.add_alias as
-
-    assert_empty @context.aliases
-    assert_empty @context.unmatched_alias_lists
-    assert_equal %w[old_name new_name], @context.method_list.map { |m| m.name }
-
-    new = @context.method_list.last
-    assert_equal top_level, new.file
-  end
-
-  def test_add_alias_method_singleton
-    meth = RDoc::AnyMethod.new nil, 'old_name'
-    meth.singleton = true
-
-    as = RDoc::Alias.new nil, 'old_name', 'new_name', 'comment'
-    as.singleton = true
-
-    as.parent = @context
-
-    @context.add_method meth
-    @context.add_alias as
-
-    assert_empty @context.aliases
-    assert_empty @context.unmatched_alias_lists
-    assert_equal %w[old_name new_name], @context.method_list.map { |m| m.name }
-
-    assert @context.method_list.last.singleton
-  end
-
-  def test_add_class
-    @c1.add_class RDoc::NormalClass, 'Klass', 'Object'
-
-    assert_includes @c1.classes.map { |k| k.full_name }, 'C1::Klass'
-    assert_includes @store.all_classes.map { |k| k.full_name }, 'C1::Klass'
-  end
-
-  def test_add_class_basic_object
-    @xref_data.add_class RDoc::NormalClass, 'BasicObject'
-
-    basic = @xref_data.find_module_named 'BasicObject'
-
-    assert_nil basic.superclass
-
-    @c1.add_class RDoc::NormalClass, 'BasicObject'
-
-    basic = @c1.find_module_named 'BasicObject'
-
-    assert_equal @object, basic.superclass
-  end
-
-  def test_add_class_object
-    @xref_data.add_class RDoc::NormalClass, 'Object'
-
-    object = @xref_data.find_module_named 'Object'
-
-    assert_equal 'BasicObject', object.superclass
-
-    @c1.add_class RDoc::NormalClass, 'Object'
-
-    object = @c1.find_module_named 'Object'
-
-    assert_equal 'Object', object.superclass.full_name
-  end
-
-  def test_add_class_singleton
-    @c1.add_class RDoc::NormalClass, 'Klass', 'Object'
-
-    assert_includes @c1.classes.map { |k| k.full_name }, 'C1::Klass'
-    assert_includes @store.all_classes.map { |k| k.full_name }, 'C1::Klass'
-  end
-
-  def test_add_class_superclass
-    @c1.add_class RDoc::NormalClass, 'Klass', 'Object'
-    @c1.add_class RDoc::NormalClass, 'Klass', 'Other'
-    @c1.add_class RDoc::NormalClass, 'Klass', 'Object'
-
-    klass = @c1.find_module_named 'Klass'
-    assert_equal 'Other', klass.superclass
-  end
-
-  def test_add_class_upgrade
-    @c1.add_module RDoc::NormalModule, 'Klass'
-    @c1.add_class RDoc::NormalClass, 'Klass', nil
-
-    assert_includes @c1.classes.map { |k| k.full_name }, 'C1::Klass',
-                    'c1 classes'
-    refute_includes @c1.modules.map { |k| k.full_name }, 'C1::Klass',
-                    'c1 modules'
-
-    assert_includes @store.all_classes.map { |k| k.full_name }, 'C1::Klass',
-                    'TopLevel classes'
-    refute_includes @store.all_modules.map { |k| k.full_name }, 'C1::Klass',
-                    'TopLevel modules'
-  end
-
-  def test_add_constant
-    const = RDoc::Constant.new 'NAME', 'value', 'comment'
-    @context.add_constant const
-
-    assert_equal [const], @context.constants
-  end
-
-  def test_add_extend
-    ext = RDoc::Extend.new 'Name', 'comment'
-    @context.add_extend ext
-
-    assert_equal [ext], @context.extends
-  end
-
-  def test_add_include
-    incl = RDoc::Include.new 'Name', 'comment'
-    @context.add_include incl
-
-    assert_equal [incl], @context.includes
-  end
-
-  def test_add_method
-    meth = RDoc::AnyMethod.new nil, 'old_name'
-    meth.visibility = nil
-
-    @context.add_method meth
-
-    assert_equal [meth], @context.method_list
-    assert_equal :public, meth.visibility
-  end
-
-  def test_add_method_alias
-    as = RDoc::Alias.new nil, 'old_name', 'new_name', 'comment'
-    meth = RDoc::AnyMethod.new nil, 'old_name'
-
-    @context.add_alias as
-    refute_empty @context.external_aliases
-
-    @context.add_method meth
-
-    assert_empty @context.external_aliases
-    assert_empty @context.unmatched_alias_lists
-    assert_equal %w[old_name new_name], @context.method_list.map { |m| m.name }
-  end
-
-  def test_add_method_duplicate
-    @store.rdoc.options.verbosity = 2
-
-    meth1 = RDoc::AnyMethod.new nil, 'name'
-    meth1.record_location @store.add_file 'first.rb'
-    meth1.visibility = nil
-    meth1.comment = comment 'first'
-
-    @context.add_method meth1
-
-    meth2 = RDoc::AnyMethod.new nil, 'name'
-    meth2.record_location @store.add_file 'second.rb'
-    meth2.comment = comment 'second'
-
-    _, err = verbose_capture_output do
-      @context.add_method meth2
-    end
-
-    expected = 'Duplicate method (unknown)#name in file second.rb, ' \
-               'previously in file first.rb'
-
-    assert_equal expected, err.chomp
-
-    method = @context.method_list.first
-
-    assert_equal 'first', method.comment.text
-  end
-
-  def test_add_method_duplicate_loading
-    @context.store = nil
-
-    meth1 = RDoc::AnyMethod.new nil, 'name'
-    meth1.record_location @store.add_file 'first.rb'
-    meth1.visibility = nil
-    meth1.comment = comment 'first'
-
-    @context.add_method meth1
-
-    meth2 = RDoc::AnyMethod.new nil, 'name'
-    meth2.record_location @store.add_file 'second.rb'
-    meth2.comment = comment 'second'
-
-    _, err = verbose_capture_output do
-      @context.add_method meth2
-    end
-
-    assert_empty err
-
-    method = @context.method_list.first
-
-    assert_equal 'first', method.comment.text
-  end
-
-  def test_add_module
-    @c1.add_module RDoc::NormalModule, 'Mod'
-
-    assert_includes @c1.modules.map { |m| m.full_name }, 'C1::Mod'
-  end
-
-  def test_add_module_alias
-    tl = @store.add_file 'file.rb'
-
-    c4 = RDoc::Constant.new 'C4', '', ''
-    c3_c4 = @c2.add_module_alias @c2_c3, @c2_c3.name, c4, tl
-
-    alias_constant = @c2.constants.first
-
-    assert_equal 'C2::C4', c3_c4.full_name
-    assert_equal tl, alias_constant.file
-  end
-
-  def test_add_module_alias_top_level
-    store = RDoc::Store.new
-
-    top_level = store.add_file 'file.rb'
-
-    klass  = top_level.add_class RDoc::NormalClass, 'Klass'
-    klass.comment = 'klass comment'
-
-    object = top_level.add_class RDoc::NormalClass, 'Object'
-
-    a = RDoc::Constant.new 'A', '', ''
-    top_level.add_module_alias klass, klass.name, a, top_level
-
-    refute_empty object.constants
-
-    constant = object.constants.first
-
-    assert_equal 'klass comment', constant.comment
-  end
-
-  def test_add_module_class
-    k = @c1.add_class RDoc::NormalClass, 'Klass', nil
-    m = @c1.add_module RDoc::NormalModule, 'Klass'
-
-    assert_equal k, m, 'returns class'
-    assert_empty @c1.modules
-  end
-
-  def test_add_require
-    req = RDoc::Require.new 'require', 'comment'
-    @c1.add_require req
-
-    assert_empty @c1.requires
-    assert_includes @c1.top_level.requires, req
-  end
-
-  def test_add_section
-    default_section = @context.sections.first
-
-    @context.add_section nil, comment('comment', @top_level)
-
-    assert_equal 1, @context.sections.length
-    assert_equal [comment("comment", @top_level)],
-                 @context.sections.first.comments
-
-    @context.add_section nil, comment('new comment', @top_level)
-
-    assert_equal 1, @context.sections.length
-    assert_equal [comment('comment', @top_level),
-                  comment('new comment', @top_level)],
-                 @context.sections.first.comments
-
-    @context.add_section 'other', comment('', @top_level)
-
-    assert_equal 2, @context.sections.length
-
-    new_section = @context.sections.find { |section| section.title == 'other' }
-    assert new_section
-    assert_equal default_section, @context.current_section
-  end
-
-  def test_add_section_no_comment
-    default_section = @context.sections.first
-
-    @context.add_section nil
-
-    assert_equal 1, @context.sections.length
-
-    @context.add_section 'other'
-
-    assert_equal 2, @context.sections.length
-
-    new_section = @context.sections.find { |section| section.title == 'other' }
-
-    assert new_section
-    assert_equal default_section, @context.current_section
-  end
-
-  def test_add_to
-    incl = RDoc::Include.new 'Name', 'comment'
-    arr = []
-    @context.add_to arr, incl
-
-    assert_includes arr, incl
-    assert_equal @context, incl.parent
-    assert_equal @context.current_section, incl.section
-  end
-
-  def test_add_to_temporary_section
-    incl = RDoc::Include.new 'Name', 'comment'
-    arr = []
-    section =
-      @context.add_section 'temporary', RDoc::Comment.new('', @top_level)
-    @context.temporary_section = section
-
-    @context.add_to arr, incl
-
-    assert_includes arr, incl
-    assert_equal @context, incl.parent
-    assert_equal section, incl.section
-  end
-
-  def test_add_to_no_document_self
-    incl = RDoc::Include.new 'Name', 'comment'
-    arr = []
-    @context.document_self = false
-    @context.add_to arr, incl
-
-    refute_includes arr, incl
-  end
-
-  def test_add_to_done_documenting
-    incl = RDoc::Include.new 'Name', 'comment'
-    arr = []
-    @context.done_documenting = true
-    @context.add_to arr, incl
-
-    refute_includes arr, incl
-  end
-
-  def bench_add_include
-    cm = RDoc::ClassModule.new 'Klass'
-
-    assert_performance_linear 0.5 do |count|
-      count.times do |i|
-        cm.add_include RDoc::Include.new("N::M#{i}", nil)
-      end
-    end
-  end
-
-  def test_child_name
-    assert_equal 'C1::C1', @c1.child_name('C1')
-  end
-
-  def test_classes
-    assert_equal %w[C2::C3], @c2.classes.map { |k| k.full_name }
-    assert_equal %w[C3::H1 C3::H2], @c3.classes.map { |k| k.full_name }.sort
-  end
-
-  def test_current_section
-    default_section = @context.current_section
-
-    new_section =
-      @context.add_section 'other', RDoc::Comment.new('', @top_level)
-    @context.temporary_section = new_section
-
-    assert_equal new_section, @context.current_section
-    assert_equal default_section, @context.current_section
-  end
-
-  def test_defined_in_eh
-    assert @c1.defined_in?(@c1.top_level)
-
-    refute @c1.defined_in?(@store.add_file('name.rb'))
-  end
-
-  def test_equals2
-    assert_equal @c3,    @c3
-    refute_equal @c2,    @c3
-    refute_equal @c2_c3, @c3
-  end
-
-  def test_each_method_enumerator
-    assert_kind_of Enumerator, @c1.each_method
-  end
-
-  def test_each_section
-    sects  = []
-    consts = []
-    attrs  = []
-
-    @c1.each_section do |section, constants, attributes|
-      sects  << section
-      consts << constants
-      attrs  << attributes
-    end
-
-    assert_equal [nil, 'separate'], sects.map { |section| section.title }
-
-    expected_consts = [
-      [@c1.constants.first],
-      [],
-    ]
-
-    assert_equal expected_consts, consts
-
-    expected_attrs = [
-      [@c1.attributes[0], @c1.attributes[3]],
-      [@c1.attributes[1], @c1.attributes[2]],
-    ]
-
-    assert_equal expected_attrs, attrs
-  end
-
-  def test_each_section_only_display
-    sects  = []
-    consts = []
-    attrs  = []
-
-    @c7.each_section do |section, constants, attributes|
-      sects  << section
-      consts << constants
-      attrs  << attributes
-    end
-
-    assert_equal [nil], sects.map { |section| section.title }
-
-    expected_consts = [
-      @c7.constants.select(&:display?).sort
-    ]
-
-    assert_equal expected_consts, consts
-
-    expected_attrs = [
-      @c7.attributes.select(&:display?).sort
-    ]
-
-    assert_equal expected_attrs, attrs
-  end
-
-  def test_each_section_enumerator
-    assert_kind_of Enumerator, @c1.each_section
-  end
-
-  def test_find_attribute_named
-    assert_nil         @c1.find_attribute_named('none')
-    assert_equal 'R',  @c1.find_attribute_named('attr').rw
-    assert_equal 'R',  @c1.find_attribute_named('attr_reader').rw
-    assert_equal 'W',  @c1.find_attribute_named('attr_writer').rw
-    assert_equal 'RW', @c1.find_attribute_named('attr_accessor').rw
-  end
-
-  def test_find_class_method_named
-    assert_nil @c1.find_class_method_named('none')
-
-    m = @c1.find_class_method_named('m')
-    assert_instance_of RDoc::AnyMethod, m
-    assert m.singleton
-  end
-
-  def test_find_constant_named
-    assert_nil             @c1.find_constant_named('NONE')
-    assert_equal ':const', @c1.find_constant_named('CONST').value
-  end
-
-  def test_find_enclosing_module_named
-    assert_nil        @c2_c3.find_enclosing_module_named('NONE')
-    assert_equal @c1, @c2_c3.find_enclosing_module_named('C1')
-    assert_equal @c2, @c2_c3.find_enclosing_module_named('C2')
-  end
-
-  def test_find_file_named
-    assert_nil               @c1.find_file_named('nonexistent.rb')
-    assert_equal @xref_data, @c1.find_file_named(@file_name)
-  end
-
-  def test_find_instance_method_named
-    assert_nil @c1.find_instance_method_named('none')
-
-    m = @c1.find_instance_method_named('m')
-    assert_instance_of RDoc::AnyMethod, m
-    refute m.singleton
-  end
-
-  def test_find_local_symbol
-    assert_equal true,       @c1.find_local_symbol('m').singleton
-    assert_equal ':const',   @c1.find_local_symbol('CONST').value
-    assert_equal 'R',        @c1.find_local_symbol('attr').rw
-    assert_equal @xref_data, @c1.find_local_symbol(@file_name)
-    assert_equal @c2_c3,     @c2.find_local_symbol('C3')
-  end
-
-  def test_find_method
-    loaded_c2 = Marshal.load Marshal.dump @c2
-    assert_equal @c2_a, loaded_c2.find_method('a', false)
-    assert_equal @c2_b, loaded_c2.find_method('b', false)
-    assert_equal @c2_a, loaded_c2.find_method('a', nil)
-    assert_equal @c2_b, loaded_c2.find_method('b', nil)
-  end
-
-  def test_find_method_named
-    assert_equal true, @c1.find_method_named('m').singleton
-  end
-
-  def test_find_module_named
-    assert_equal @c2_c3, @c2.find_module_named('C3')
-    assert_equal @c2,    @c2.find_module_named('C2')
-    assert_equal @c1,    @c2.find_module_named('C1')
-
-    assert_equal 'C2::C3', @c2.find_module_named('C3').full_name
-  end
-
-  def test_find_symbol
-    c3 = @xref_data.find_module_named('C3')
-    assert_equal c3,     @xref_data.find_symbol('C3')
-    assert_equal c3,     @c2.find_symbol('::C3')
-    assert_equal @c2_c3, @c2.find_symbol('C3')
-  end
-
-  def test_find_symbol_method
-    assert_equal @c1__m, @c1.find_symbol('m')
-    assert_equal @c1_m,  @c1.find_symbol('#m')
-    assert_equal @c1__m, @c1.find_symbol('::m')
-  end
-
-  def test_find_symbol_module
-    assert_nil @m1_m2.find_symbol_module 'N'
-    assert_nil @m1_m2.find_symbol_module 'M2::M1'
-
-    @m1_m2.parent = nil # loaded from legacy ri store
-
-    assert_nil @m1_m2.find_symbol_module 'N'
-    assert_nil @m1_m2.find_symbol_module 'M2::M1'
-  end
-
-  def test_fully_documented_eh
-    context = RDoc::Context.new
-
-    refute context.fully_documented?
-
-    context.comment = 'hi'
-
-    assert context.fully_documented?
-
-    m = @c1_m
-
-    context.add_method m
-
-    refute context.fully_documented?
-
-    m.comment = 'hi'
-
-    assert context.fully_documented?
-
-    c = RDoc::Constant.new 'C', '0', nil
-
-    context.add_constant c
-
-    refute context.fully_documented?
-
-    c.comment = 'hi'
-
-    assert context.fully_documented?
-
-    a = RDoc::Attr.new '', 'a', 'RW', nil
-
-    context.add_attribute a
-
-    refute context.fully_documented?
-
-    a.comment = 'hi'
-
-    assert context.fully_documented?
-  end
-
-  def test_spaceship
-    assert_equal(-1, @c2.<=>(@c3))
-    assert_equal 0,  @c2.<=>(@c2)
-    assert_equal 1,  @c3.<=>(@c2)
-
-    assert_equal 1,  @c2_c3.<=>(@c2)
-    assert_equal(-1, @c2_c3.<=>(@c3))
-
-    assert_nil @c2.<=>(Gem.loaded_specs.values.first)
-  end
-
-  def test_methods_by_type
-    expected = {
-      'instance' => {
-        :private   => [],
-        :protected => [],
-        :public    => [@c1_plus, @c1_m],
-      },
-      'class' => {
-        :private   => [],
-        :protected => [],
-        :public    => [@c1__m],
-      },
-    }
-
-    assert_equal expected, @c1.methods_by_type
-  end
-
-  def test_methods_by_type_section
-    separate = @c1.sections_hash['separate']
-    @c1_m.section = separate
-
-    expected = {
-      'instance' => {
-        :private   => [],
-        :protected => [],
-        :public    => [@c1_m],
-      },
-      'class' => {
-        :private   => [],
-        :protected => [],
-        :public    => [],
-      },
-    }
-
-    assert_equal expected, @c1.methods_by_type(separate)
-  end
-
-  def test_methods_matching
-    methods = []
-
-    @parent.methods_matching 'm' do |m|
-      methods << m
-    end
-
-    assert_equal [@parent_m], methods
-  end
-
-  def test_methods_matching_singleton
-    methods = []
-
-    @parent.methods_matching 'm', true do |m|
-      methods << m
-    end
-
-    assert_equal [@parent__m], methods
-  end
-
-  def test_methods_matching_inherit
-    methods = []
-
-    @child.methods_matching 'm' do |m|
-      methods << m
-    end
-
-    assert_equal [@parent_m], methods
-  end
-
-  def test_remove_invisible_private
-    util_visibilities
-
-    @vis.remove_invisible :private
-
-    assert_equal [@pub, @prot, @priv], @vis.method_list
-    assert_equal [@apub, @aprot, @apriv], @vis.attributes
-    assert_equal [@cpub, @cpriv], @vis.constants
-  end
-
-  def test_remove_invisible_nodoc
-    util_visibilities
-
-    @vis.remove_invisible :nodoc
-
-    assert_equal [@pub, @prot, @priv], @vis.method_list
-    assert_equal [@apub, @aprot, @apriv], @vis.attributes
-    assert_equal [@cpub, @cpriv], @vis.constants
-  end
-
-  def test_remove_invisible_protected
-    util_visibilities
-
-    @vis.remove_invisible :protected
-
-    assert_equal [@pub, @prot], @vis.method_list
-    assert_equal [@apub, @aprot], @vis.attributes
-    assert_equal [@cpub], @vis.constants
-  end
-
-  def test_remove_invisible_public
-    util_visibilities
-
-    @vis.remove_invisible :public
-
-    assert_equal [@pub], @vis.method_list
-    assert_equal [@apub], @vis.attributes
-    assert_equal [@cpub], @vis.constants
-  end
-
-  def test_remove_invisible_public_force
-    util_visibilities
-
-    @priv.force_documentation = true
-    @prot.force_documentation = true
-    @apriv.force_documentation = true
-    @aprot.force_documentation = true
-    @cpriv.force_documentation = true
-
-    @vis.remove_invisible :public
-
-    assert_equal [@pub, @prot, @priv], @vis.method_list
-    assert_equal [@apub, @aprot, @apriv], @vis.attributes
-    assert_equal [@cpub, @cpriv], @vis.constants
-  end
-
-  def test_remove_invisible_in_protected
-    util_visibilities
-
-    methods = [@pub, @prot, @priv]
-
-    @c1.remove_invisible_in methods, :protected
-
-    assert_equal [@pub, @prot], methods
-  end
-
-  def test_remove_invisible_in_protected_force
-    util_visibilities
-
-    @priv.force_documentation = true
-
-    methods = [@pub, @prot, @priv]
-
-    @c1.remove_invisible_in methods, :protected
-
-    assert_equal [@pub, @prot, @priv], methods
-  end
-
-  def test_remove_invisible_in_public
-    util_visibilities
-
-    methods = [@pub, @prot, @priv]
-
-    @c1.remove_invisible_in methods, :public
-
-    assert_equal [@pub], methods
-  end
-
-  def test_remove_invisible_in_public_force
-    util_visibilities
-
-    @prot.force_documentation = true
-    @priv.force_documentation = true
-
-    methods = [@pub, @prot, @priv]
-
-    @c1.remove_invisible_in methods, :public
-
-    assert_equal [@pub, @prot, @priv], methods
-  end
-
-  def test_section_contents
-    default = @context.sections.first
-    @context.add_method RDoc::AnyMethod.new(nil, 'm1')
-
-    b = @context.add_section 'B'
-    m = @context.add_method RDoc::AnyMethod.new(nil, 'm2')
-    m.section = b
-
-    assert_equal [default, b], @context.section_contents
-  end
-
-  def test_section_contents_no_default
-    @context = RDoc::Context.new
-    b = @context.add_section 'B'
-    m = @context.add_method RDoc::AnyMethod.new(nil, 'm')
-    m.section = b
-
-    assert_equal [b], @context.section_contents
-  end
-
-  def test_section_contents_only_default
-    @context = RDoc::Context.new
-
-    @context.add_method RDoc::AnyMethod.new(nil, 'm')
-
-    assert_empty @context.section_contents
-  end
-
-  def test_section_contents_unused
-    @context = RDoc::Context.new
-
-    @context.add_method RDoc::AnyMethod.new(nil, 'm')
-    @context.add_section 'B'
-
-    assert_empty @context.section_contents
-  end
-
-  def test_set_current_section
-    default_section = @context.sections.first
-
-    @context.set_current_section nil, RDoc::Comment.new('', @top_level)
-
-    assert_equal default_section, @context.current_section
-
-    @context.set_current_section 'other', RDoc::Comment.new('', @top_level)
-
-    new_section = @context.sections.find { |section|
-      section != default_section
-    }
-
-    assert_equal new_section, @context.current_section
-  end
-
-  def test_sort_sections
-    c = RDoc::Context.new
-    c.add_section 'C'
-    c.add_section 'A'
-    c.add_section 'B'
-
-    titles = c.sort_sections.map { |section| section.title }
-
-    assert_equal [nil, 'A', 'B', 'C'], titles
-  end
-
-  def test_sort_sections_tomdoc
-    c = RDoc::Context.new
-    c.add_section 'Public'
-    c.add_section 'Internal'
-    c.add_section 'Deprecated'
-
-    titles = c.sort_sections.map { |section| section.title }
-
-    assert_equal [nil, 'Public', 'Internal', 'Deprecated'], titles
-  end
-
-  def test_sort_sections_tomdoc_missing
-    c = RDoc::Context.new
-    c.add_section 'Internal'
-    c.add_section 'Public'
-
-    titles = c.sort_sections.map { |section| section.title }
-
-    assert_equal [nil, 'Public', 'Internal'], titles
-  end
-
-  def test_visibility_def
-    assert_equal :private, @c6.find_method_named('priv1').visibility
-    assert_equal :protected, @c6.find_method_named('prot1').visibility
-    assert_equal :public, @c6.find_method_named('pub1').visibility
-    assert_equal :private, @c6.find_method_named('priv2').visibility
-    assert_equal :protected, @c6.find_method_named('prot2').visibility
-    assert_equal :public, @c6.find_method_named('pub2').visibility
-    assert_equal :private, @c6.find_method_named('priv3').visibility
-    assert_equal :protected, @c6.find_method_named('prot3').visibility
-    assert_equal :public, @c6.find_method_named('pub3').visibility
-    assert_equal :private, @c6.find_method_named('priv4').visibility
-    assert_equal :protected, @c6.find_method_named('prot4').visibility
-    assert_equal :public, @c6.find_method_named('pub4').visibility
-    assert_equal :private, @c6.find_method_named('priv5').visibility
-    assert_equal :protected, @c6.find_method_named('prot5').visibility
-    assert_equal :public, @c6.find_method_named('pub5').visibility
-    assert_equal :private, @c6.find_method_named('priv6').visibility
-    assert_equal :protected, @c6.find_method_named('prot6').visibility
-    assert_equal :public, @c6.find_method_named('pub6').visibility
-  end
-
-  def util_visibilities
-    @pub  = RDoc::AnyMethod.new nil, 'pub'
-    @prot = RDoc::AnyMethod.new nil, 'prot'
-    @priv = RDoc::AnyMethod.new nil, 'priv'
-
-    @apub  = RDoc::Attr.new nil, 'pub',  'RW', nil
-    @aprot = RDoc::Attr.new nil, 'prot', 'RW', nil
-    @apriv = RDoc::Attr.new nil, 'priv', 'RW', nil
-
-    @cpub  = RDoc::Constant.new 'CONST_PUBLIC', nil, nil
-    @cpriv = RDoc::Constant.new 'CONST_PRIVATE', nil, nil
-
-    @vis = RDoc::NormalClass.new 'Vis'
-    @vis.add_method @pub
-    @vis.add_method @prot
-    @vis.add_method @priv
-
-    @vis.add_attribute @apub
-    @vis.add_attribute @aprot
-    @vis.add_attribute @apriv
-
-    @vis.add_constant @cpub
-    @vis.add_constant @cpriv
-
-    @prot.visibility = :protected
-    @priv.visibility = :private
-
-    @aprot.visibility = :protected
-    @apriv.visibility = :private
-
-    @cpriv.visibility = :private
-  end
-
-end
diff --git a/test/rdoc/test_rdoc_context_section.rb b/test/rdoc/test_rdoc_context_section.rb
deleted file mode 100644
index 6834cccafbe041..00000000000000
--- a/test/rdoc/test_rdoc_context_section.rb
+++ /dev/null
@@ -1,146 +0,0 @@
-# frozen_string_literal: true
-require_relative 'helper'
-
-class TestRDocContextSection < RDoc::TestCase
-
-  def setup
-    super
-
-    @top_level = @store.add_file 'file.rb'
-
-    @klass = @top_level.add_class RDoc::NormalClass, 'Object'
-
-    @S = RDoc::Context::Section
-    @s = @S.new @klass, 'section', comment('# comment', @top_level, :ruby)
-  end
-
-  def test_add_comment
-    file1 = @store.add_file 'file1.rb'
-
-    klass = file1.add_class RDoc::NormalClass, 'Klass'
-
-    c1 = RDoc::Comment.new "# :section: section\n", file1
-    c2 = RDoc::Comment.new "# hello\n",             file1
-    c3 = RDoc::Comment.new "# world\n",             file1
-
-    s = @S.new klass, 'section', c1
-
-    assert_empty s.comments
-
-    s.add_comment nil
-
-    assert_empty s.comments
-
-    s.add_comment c2
-
-    assert_equal [c2], s.comments
-
-    s.add_comment c3
-
-    assert_equal [c2, c3], s.comments
-  end
-
-  def test_aref
-    assert_equal 'section', @s.aref
-
-    assert_equal '5Buntitled-5D', @S.new(nil, nil, nil).aref
-
-    assert_equal 'one+two', @S.new(nil, 'one two', nil).aref
-  end
-
-  def test_eql_eh
-    other = @S.new @klass, 'other', comment('# comment', @top_level)
-
-    assert @s.eql? @s
-    assert @s.eql? @s.dup
-    refute @s.eql? other
-  end
-
-  def test_equals
-    other = @S.new @klass, 'other', comment('# comment', @top_level)
-
-    assert_equal @s, @s
-    assert_equal @s, @s.dup
-    refute_equal @s, other
-  end
-
-  def test_extract_comment
-    assert_equal '',    @s.extract_comment(comment('')).text
-    assert_equal '',    @s.extract_comment(comment("# :section: b\n")).text
-    assert_equal '# c', @s.extract_comment(comment("# :section: b\n# c")).text
-    assert_equal '# c',
-                 @s.extract_comment(comment("# a\n# :section: b\n# c")).text
-  end
-
-  def test_hash
-    other = @S.new @klass, 'other', comment('# comment', @top_level)
-
-    assert_equal @s.hash, @s.hash
-    assert_equal @s.hash, @s.dup.hash
-    refute_equal @s.hash, other.hash
-  end
-
-  def test_marshal_dump
-    loaded = Marshal.load Marshal.dump @s
-
-    expected = RDoc::Comment.new('comment', @top_level).parse
-    expected = doc(expected)
-
-    assert_equal 'section', loaded.title
-    assert_equal expected,  loaded.comments
-    assert_nil              loaded.parent, 'parent is set manually'
-  end
-
-  def test_marshal_dump_no_comment
-    s = @S.new @klass, 'section', comment('')
-
-    loaded = Marshal.load Marshal.dump s
-
-    assert_equal 'section', loaded.title
-    assert_empty            loaded.comments
-    assert_nil              loaded.parent, 'parent is set manually'
-  end
-
-  def test_marshal_load_version_0
-    loaded = Marshal.load "\x04\bU:\eRDoc::Context::Section" +
-                          "[\bi\x00I\"\fsection\x06:\x06EFo" +
-                          ":\eRDoc::Markup::Document\a:\v@parts" +
-                          "[\x06o;\a\a;\b[\x06o" +
-                          ":\x1CRDoc::Markup::Paragraph\x06;\b" +
-                          "[\x06I\"\fcomment\x06;\x06F:\n@fileI" +
-                          "\"\ffile.rb\x06;\x06F;\n0"
-
-    expected = doc RDoc::Comment.new('comment', @top_level).parse
-
-    assert_equal 'section', loaded.title
-    assert_equal expected,  loaded.comments
-    assert_nil              loaded.parent, 'parent is set manually'
-  end
-
-  def test_remove_comment_array
-    other = @store.add_file 'other.rb'
-
-    other_comment = comment('bogus', other)
-
-    @s.add_comment other_comment
-
-    @s.remove_comment comment('bogus', @top_level)
-
-    assert_equal [other_comment], @s.comments
-  end
-
-  def test_remove_comment_document
-    other = @store.add_file 'other.rb'
-
-    other_comment = comment('bogus', other)
-
-    @s.add_comment other_comment
-
-    loaded = Marshal.load Marshal.dump @s
-
-    loaded.remove_comment comment('bogus', @top_level)
-
-    assert_equal doc(other_comment.parse), loaded.comments
-  end
-
-end
diff --git a/test/rdoc/test_rdoc_cross_reference.rb b/test/rdoc/test_rdoc_cross_reference.rb
deleted file mode 100644
index cbda77a7981ea0..00000000000000
--- a/test/rdoc/test_rdoc_cross_reference.rb
+++ /dev/null
@@ -1,219 +0,0 @@
-# frozen_string_literal: true
-require_relative 'xref_test_case'
-
-class TestRDocCrossReference < XrefTestCase
-  EXAMPLE_METHODS = %w'== === != =~ !~ < > <= >= <=> [] []= << >>
-    -@ +@ ! - + * / % ** !@ ` | & ^ ~ __id__
-  '
-
-  def setup
-    super
-
-    @xref = RDoc::CrossReference.new @c1
-  end
-
-  def assert_ref expected, name
-    assert_equal expected, @xref.resolve(name, 'fail')
-  end
-
-  def refute_ref name
-    assert_equal name, @xref.resolve(name, name)
-  end
-
-  def test_METHOD_REGEXP_STR
-    re = /\A(?:#{RDoc::CrossReference::METHOD_REGEXP_STR})\z/
-
-    EXAMPLE_METHODS.each do |x|
-      re =~ x
-      assert_equal x, $&
-    end
-  end
-
-  def test_resolve_C2
-    @xref = RDoc::CrossReference.new @c2
-
-    refute_ref '#m'
-
-    assert_ref @c1__m,    'C1::m'
-    assert_ref @c2_c3,    'C2::C3'
-    assert_ref @c2_c3_m,  'C2::C3#m'
-    assert_ref @c2_c3_h1, 'C3::H1'
-    assert_ref @c4,       'C4'
-
-    assert_ref @c3_h2, 'C3::H2'
-    refute_ref 'H1'
-  end
-
-  def test_resolve_C2_C3
-    @xref = RDoc::CrossReference.new @c2_c3
-
-    assert_ref @c2_c3_m, '#m'
-
-    assert_ref @c2_c3, 'C3'
-    assert_ref @c2_c3_m, 'C3#m'
-
-    assert_ref @c2_c3_h1, 'H1'
-    assert_ref @c2_c3_h1, 'C3::H1'
-
-    assert_ref @c4, 'C4'
-
-    assert_ref @c3_h2, 'C3::H2'
-  end
-
-  def test_resolve_C3
-    @xref = RDoc::CrossReference.new @c3
-
-    assert_ref @c3, 'C3'
-
-    refute_ref '#m'
-    refute_ref 'C3#m'
-
-    assert_ref @c3_h1, 'H1'
-
-    assert_ref @c3_h1, 'C3::H1'
-    assert_ref @c3_h2, 'C3::H2'
-
-    assert_ref @c4, 'C4'
-  end
-
-  def test_resolve_C4
-    @xref = RDoc::CrossReference.new @c4
-
-    # C4 ref inside a C4 containing a C4 should resolve to the contained class
-    assert_ref @c4_c4, 'C4'
-  end
-
-  def test_resolve_C4_C4
-    @xref = RDoc::CrossReference.new @c4_c4
-
-    # A C4 reference inside a C4 class contained within a C4 class should
-    # resolve to the inner C4 class.
-    assert_ref @c4_c4, 'C4'
-  end
-
-  def test_resolve_class_and_method_of_the_same_name
-    assert_ref @c10_class, 'C10'
-    assert_ref @c10_method, '#C10'
-    assert_ref @c11_class, 'C11'
-    assert_ref @c11_method, '#C11'
-    assert_ref @c10_c11_class, 'C10::C11'
-    assert_ref @c10_c11_method, 'C10#C11'
-  end
-
-  def test_resolve_class
-    assert_ref @c1, 'C1'
-    refute_ref 'H1'
-
-    assert_ref @c2,       'C2'
-    assert_ref @c2_c3,    'C2::C3'
-    assert_ref @c2_c3_h1, 'C2::C3::H1'
-
-    assert_ref @c3,    '::C3'
-    assert_ref @c3_h1, '::C3::H1'
-
-    assert_ref @c4_c4, 'C4::C4'
-  end
-
-  def test_resolve_file
-    refute_ref 'xref_data.rb'
-  end
-
-  def test_resolve_method
-    assert_ref @c1__m,    'm'
-    assert_ref @c1__m,    '::m'
-    assert_ref @c1_m,     '#m'
-    assert_ref @c1_plus,  '#+'
-
-    assert_ref @c1_m,     'C1#m'
-    assert_ref @c1_plus,  'C1#+'
-    assert_ref @c1__m,    'C1.m'
-    assert_ref @c1__m,    'C1::m'
-
-    assert_ref @c1_m, 'C1#m'
-    assert_ref @c1_m, 'C1#m()'
-    assert_ref @c1_m, 'C1#m(*)'
-
-    assert_ref @c1_plus, 'C1#+'
-    assert_ref @c1_plus, 'C1#+()'
-    assert_ref @c1_plus, 'C1#+(*)'
-
-    assert_ref @c1__m, 'C1.m'
-    assert_ref @c1__m, 'C1.m()'
-    assert_ref @c1__m, 'C1.m(*)'
-
-    assert_ref @c1__m, 'C1::m'
-    assert_ref @c1__m, 'C1::m()'
-    assert_ref @c1__m, 'C1::m(*)'
-
-    assert_ref @c2_c3_m, 'C2::C3#m'
-
-    assert_ref @c2_c3_m, 'C2::C3.m'
-
-    # TODO stop escaping - HTML5 allows anything but space
-    assert_ref @c2_c3_h1_meh, 'C2::C3::H1#m?'
-
-    assert_ref @c2_c3_m, '::C2::C3#m'
-    assert_ref @c2_c3_m, '::C2::C3#m()'
-    assert_ref @c2_c3_m, '::C2::C3#m(*)'
-  end
-
-  def test_resolve_the_same_name_in_instance_and_class_method
-    assert_ref @c9_a_i_foo, 'C9::A#foo'
-    assert_ref @c9_a_c_bar, 'C9::A::bar'
-    assert_ref @c9_b_c_foo, 'C9::B::foo'
-    assert_ref @c9_b_i_bar, 'C9::B#bar'
-    assert_ref @c9_b_c_foo, 'C9::B.foo'
-    assert_ref @c9_a_c_bar, 'C9::B.bar'
-  end
-
-  def test_resolve_page
-    page = @store.add_file 'README.txt', parser: RDoc::Parser::Simple
-
-    assert_ref page, 'README'
-  end
-
-  def assert_resolve_method(x)
-    @c1.methods_hash.clear
-
-    i_op = RDoc::AnyMethod.new nil, x
-    i_op.singleton = false
-    @c1.add_method i_op
-
-    c_op = RDoc::AnyMethod.new nil, x
-    c_op.singleton = true
-    @c1.add_method c_op
-
-    assert_ref i_op, x
-    assert_ref i_op, "##{x}"
-    assert_ref c_op, "::#{x}"
-
-    assert_ref i_op, "C1##{x}"
-    assert_ref c_op, "C1::#{x}"
-  end
-
-  EXAMPLE_METHODS.each do |x|
-    define_method("test_resolve_method:#{x}") do
-      assert_resolve_method(x)
-    end
-  end
-
-  def test_resolve_no_ref
-    assert_equal '', @xref.resolve('', '')
-
-    assert_equal "bogus",     @xref.resolve("bogus",     "bogus")
-    assert_equal "\\bogus",   @xref.resolve("\\bogus",   "\\bogus")
-    assert_equal "\\\\bogus", @xref.resolve("\\\\bogus", "\\\\bogus")
-
-    assert_equal "\\#n",    @xref.resolve("\\#n",    "fail")
-    assert_equal "\\#n()",  @xref.resolve("\\#n()",  "fail")
-    assert_equal "\\#n(*)", @xref.resolve("\\#n(*)", "fail")
-
-    assert_equal "C1",   @xref.resolve("\\C1",   "fail")
-    assert_equal "::C3", @xref.resolve("\\::C3", "fail")
-
-    assert_equal "succeed",      @xref.resolve("::C3::H1#n",    "succeed")
-    assert_equal "succeed",      @xref.resolve("::C3::H1#n(*)", "succeed")
-    assert_equal "\\::C3::H1#n", @xref.resolve("\\::C3::H1#n",  "fail")
-  end
-
-end
diff --git a/test/rdoc/test_rdoc_encoding.rb b/test/rdoc/test_rdoc_encoding.rb
deleted file mode 100644
index 58536b035e3a1a..00000000000000
--- a/test/rdoc/test_rdoc_encoding.rb
+++ /dev/null
@@ -1,184 +0,0 @@
-# coding: US-ASCII
-# frozen_string_literal: true
-
-require_relative 'helper'
-
-class TestRDocEncoding < RDoc::TestCase
-
-  def setup
-    super
-
-    @tempfile = Tempfile.new 'test_rdoc_encoding'
-  end
-
-  def teardown
-    @tempfile.close!
-
-    super
-  end
-
-  def test_class_read_file
-    @tempfile.write "hi everybody"
-    @tempfile.flush
-
-    assert_equal "hi everybody", RDoc::Encoding.read_file(@tempfile.path, nil)
-  end
-
-  def test_class_read_file_encoding
-    expected = "# coding: utf-8\nhi everybody"
-
-    @tempfile.write expected
-    @tempfile.flush
-
-    contents = RDoc::Encoding.read_file @tempfile.path, Encoding::UTF_8
-    assert_equal "# coding: utf-8\nhi everybody", contents
-    assert_equal Encoding::UTF_8, contents.encoding
-  end
-
-  def test_class_read_file_encoding_convert
-    content = ""
-    content = RDoc::Encoding.change_encoding content, 'ISO-8859-1'
-    content << "# coding: ISO-8859-1\nhi \xE9verybody"
-
-    @tempfile.write content
-    @tempfile.flush
-
-    contents = RDoc::Encoding.read_file @tempfile.path, Encoding::UTF_8
-    assert_equal Encoding::UTF_8, contents.encoding
-    assert_equal "# coding: ISO-8859-1\nhi \u00e9verybody", contents.sub("\r", '')
-  end
-
-  def test_class_read_file_encoding_fail
-    @tempfile.write "# coding: utf-8\n\317\200" # pi
-    @tempfile.flush
-
-    contents = :junk
-
-    _, err = verbose_capture_output do
-      contents = RDoc::Encoding.read_file @tempfile.path, Encoding::US_ASCII
-    end
-
-    assert_nil contents
-
-    assert_match %r%^unable to convert%, err
-  end
-
-  def test_class_read_file_encoding_fancy
-    expected = "# -*- coding: utf-8; fill-column: 74 -*-\nhi everybody"
-    expected = RDoc::Encoding.change_encoding expected, Encoding::UTF_8
-
-    @tempfile.write expected
-    @tempfile.flush
-
-    contents = RDoc::Encoding.read_file @tempfile.path, Encoding::UTF_8
-    assert_equal "# -*- coding: utf-8; fill-column: 74 -*-\nhi everybody", contents
-    assert_equal Encoding::UTF_8, contents.encoding
-  end
-
-  def test_class_read_file_encoding_force_transcode
-    @tempfile.write "# coding: utf-8\n\317\200" # pi
-    @tempfile.flush
-
-    contents = RDoc::Encoding.read_file @tempfile.path, Encoding::US_ASCII, true
-
-    assert_equal "# coding: utf-8\n?", contents
-    assert_equal Encoding::US_ASCII, contents.encoding
-  end
-
-  def test_class_read_file_encoding_guess
-    path = File.expand_path '../test.ja.txt', __FILE__
-    content = RDoc::Encoding.read_file path, Encoding::UTF_8
-
-    assert_equal Encoding::UTF_8, content.encoding
-  end
-
-  def test_class_read_file_encoding_invalid
-    @tempfile.write "# coding: ascii\nM\xE4r"
-    @tempfile.flush
-
-    contents = :junk
-    _, err = verbose_capture_output do
-      contents = RDoc::Encoding.read_file @tempfile.path, Encoding::UTF_8
-    end
-
-    assert_equal "unable to convert \"\\xE4\" on US-ASCII for #{@tempfile.path}, skipping\n", err
-
-    assert_nil contents
-  end
-
-  def test_class_read_file_encoding_with_signature
-    @tempfile.write "\xEF\xBB\xBFhi everybody"
-    @tempfile.flush
-
-    bug3360 = '[ruby-dev:41452]'
-    content = RDoc::Encoding.read_file @tempfile.path, Encoding::UTF_8
-    assert_equal Encoding::UTF_8, content.encoding, bug3360
-    assert_equal "hi everybody", content, bug3360
-  end
-
-  def test_class_read_file_encoding_iso_2022_jp
-    input = "# coding: ISO-2022-JP\n:\e$B%3%^%s%I\e(B:"
-
-    @tempfile.write input
-    @tempfile.flush
-
-    contents = RDoc::Encoding.read_file @tempfile.path, Encoding::UTF_8
-
-    expected = "# coding: ISO-2022-JP\n:\xe3\x82\xb3\xe3\x83\x9e\xe3\x83\xb3\xe3\x83\x89:"
-    expected = RDoc::Encoding.change_encoding expected, Encoding::UTF_8
-
-    assert_equal expected, contents
-    assert_equal Encoding::UTF_8, contents.encoding
-  end
-
-  def test_class_detect_encoding
-    s = "# coding: UTF-8\n"
-    encoding = RDoc::Encoding.detect_encoding s
-
-    # sanity check for 1.8
-
-    assert_equal Encoding::UTF_8, encoding
-
-    s = "#!/bin/ruby\n# coding: UTF-8\n"
-    encoding = RDoc::Encoding.detect_encoding s
-
-    assert_equal Encoding::UTF_8, encoding
-
-    s = "<?xml version='1.0' encoding='UTF-8'?>\n"
-    encoding = RDoc::Encoding.detect_encoding s
-
-    assert_equal Encoding::UTF_8, encoding
-
-    s = "<?xml version='1.0' encoding=\"UTF-8\"?>\n"
-    encoding = RDoc::Encoding.detect_encoding s
-
-    assert_equal Encoding::UTF_8, encoding
-  end
-
-  def test_class_set_encoding_bad
-    s = ""
-    encoding = RDoc::Encoding.detect_encoding s
-
-    assert_nil encoding
-
-    s = "# vim:set fileencoding=utf-8:\n"
-    encoding = RDoc::Encoding.detect_encoding s
-
-    assert_nil encoding
-
-    s = "# vim:set fileencoding=utf-8:\n"
-    encoding = RDoc::Encoding.detect_encoding s
-
-    assert_nil encoding
-
-    assert_raise ArgumentError do
-      s = RDoc::Encoding.detect_encoding "# -*- encoding: undecided -*-\n"
-    end
-  end
-
-  def test_sanity
-    assert_equal Encoding::US_ASCII, ''.encoding,
-                 'If this file is not ASCII tests may incorrectly pass'
-  end
-
-end
diff --git a/test/rdoc/test_rdoc_extend.rb b/test/rdoc/test_rdoc_extend.rb
deleted file mode 100644
index cc5038cc517424..00000000000000
--- a/test/rdoc/test_rdoc_extend.rb
+++ /dev/null
@@ -1,94 +0,0 @@
-# frozen_string_literal: true
-require_relative 'xref_test_case'
-
-class TestRDocExtend < XrefTestCase
-
-  def setup
-    super
-
-    @ext = RDoc::Extend.new 'M1', 'comment'
-    @ext.parent = @m1
-    @ext.store = @store
-  end
-
-  def test_module
-    assert_equal @m1, @ext.module
-    assert_equal 'Unknown', RDoc::Extend.new('Unknown', 'comment').module
-  end
-
-  def test_module_extended
-    m1 = @xref_data.add_module RDoc::NormalModule, 'Mod1'
-                  m1.add_module RDoc::NormalModule, 'Mod3'
-    m1_m2       = m1.add_module RDoc::NormalModule, 'Mod2'
-    m1_m2_m3    = m1_m2.add_module RDoc::NormalModule, 'Mod3'
-                  m1_m2_m3.add_module RDoc::NormalModule, 'Mod4'
-                  m1_m2.add_module RDoc::NormalModule, 'Mod4'
-    m1_m2_k0    = m1_m2.add_class RDoc::NormalClass, 'Klass0'
-    m1_m2_k0_m4 = m1_m2_k0.add_module RDoc::NormalModule, 'Mod4'
-                  m1_m2_k0_m4.add_module RDoc::NormalModule, 'Mod6'
-                  m1_m2_k0.add_module RDoc::NormalModule, 'Mod5'
-
-    e0_m4 = RDoc::Extend.new 'Mod4', nil
-    e0_m5 = RDoc::Extend.new 'Mod5', nil
-    e0_m6 = RDoc::Extend.new 'Mod6', nil
-    e0_m1 = RDoc::Extend.new 'Mod1', nil
-    e0_m2 = RDoc::Extend.new 'Mod2', nil
-    e0_m3 = RDoc::Extend.new 'Mod3', nil
-
-    m1_m2_k0.add_extend e0_m4
-    m1_m2_k0.add_extend e0_m5
-    m1_m2_k0.add_extend e0_m6
-    m1_m2_k0.add_extend e0_m1
-    m1_m2_k0.add_extend e0_m2
-    m1_m2_k0.add_extend e0_m3
-
-    assert_equal [e0_m4, e0_m5, e0_m6, e0_m1, e0_m2, e0_m3], m1_m2_k0.extends
-    assert_equal [@object, 'BasicObject'], m1_m2_k0.ancestors
-
-    m1_k1 = m1.add_class RDoc::NormalClass, 'Klass1'
-
-    e1_m1 = RDoc::Extend.new 'Mod1', nil
-    e1_m2 = RDoc::Extend.new 'Mod2', nil
-    e1_m3 = RDoc::Extend.new 'Mod3', nil
-    e1_m4 = RDoc::Extend.new 'Mod4', nil
-    e1_k0_m4 = RDoc::Extend.new 'Klass0::Mod4', nil
-
-    m1_k1.add_extend e1_m1
-    m1_k1.add_extend e1_m2
-    m1_k1.add_extend e1_m3
-    m1_k1.add_extend e1_m4
-    m1_k1.add_extend e1_k0_m4
-
-    assert_equal [e1_m1, e1_m2, e1_m3, e1_m4, e1_k0_m4], m1_k1.extends
-    assert_equal [@object, 'BasicObject'], m1_k1.ancestors
-
-    m1_k2 = m1.add_class RDoc::NormalClass, 'Klass2'
-
-    e2_m1 = RDoc::Extend.new 'Mod1', nil
-    e2_m2 = RDoc::Extend.new 'Mod2', nil
-    e2_m3 = RDoc::Extend.new 'Mod3', nil
-    e2_k0_m4 = RDoc::Extend.new 'Klass0::Mod4', nil
-
-    m1_k2.add_extend e2_m1
-    m1_k2.add_extend e2_m3
-    m1_k2.add_extend e2_m2
-    m1_k2.add_extend e2_k0_m4
-
-    assert_equal [e2_m1, e2_m3, e2_m2, e2_k0_m4], m1_k2.extends
-    assert_equal [@object, 'BasicObject'], m1_k2.ancestors
-
-    m1_k3 = m1.add_class RDoc::NormalClass, 'Klass3'
-
-    e3_m1 = RDoc::Extend.new 'Mod1', nil
-    e3_m2 = RDoc::Extend.new 'Mod2', nil
-    e3_m4 = RDoc::Extend.new 'Mod4', nil
-
-    m1_k3.add_extend e3_m1
-    m1_k3.add_extend e3_m2
-    m1_k3.add_extend e3_m4
-
-    assert_equal [e3_m1, e3_m2, e3_m4], m1_k3.extends
-    assert_equal [@object, 'BasicObject'], m1_k3.ancestors
-  end
-
-end
diff --git a/test/rdoc/test_rdoc_generator_darkfish.rb b/test/rdoc/test_rdoc_generator_darkfish.rb
deleted file mode 100644
index 96319bb4f74d37..00000000000000
--- a/test/rdoc/test_rdoc_generator_darkfish.rb
+++ /dev/null
@@ -1,353 +0,0 @@
-# frozen_string_literal: true
-require_relative 'helper'
-
-class TestRDocGeneratorDarkfish < RDoc::TestCase
-
-  def setup
-    super
-
-    @lib_dir = "#{@pwd}/lib"
-    $LOAD_PATH.unshift @lib_dir # ensure we load from this RDoc
-
-    @options = RDoc::Options.new
-    @options.option_parser = OptionParser.new
-
-    @tmpdir = File.join Dir.tmpdir, "test_rdoc_generator_darkfish_#{$$}"
-    FileUtils.mkdir_p @tmpdir
-    Dir.chdir @tmpdir
-    @options.op_dir = @tmpdir
-    @options.generator = RDoc::Generator::Darkfish
-
-    $LOAD_PATH.each do |path|
-      darkfish_dir = File.join path, 'rdoc/generator/template/darkfish/'
-      next unless File.directory? darkfish_dir
-      @options.template_dir = darkfish_dir
-      break
-    end
-
-    @rdoc.options = @options
-
-    @g = @options.generator.new @store, @options
-    @rdoc.generator = @g
-
-    @top_level = @store.add_file 'file.rb'
-    @top_level.parser = RDoc::Parser::Ruby
-    @klass = @top_level.add_class RDoc::NormalClass, 'Klass'
-
-    @alias_constant = RDoc::Constant.new 'A', nil, ''
-    @alias_constant.record_location @top_level
-
-    @top_level.add_constant @alias_constant
-
-    @klass.add_module_alias @klass, @klass.name, @alias_constant, @top_level
-
-    @meth = RDoc::AnyMethod.new nil, 'method'
-    @meth_bang = RDoc::AnyMethod.new nil, 'method!'
-    @meth_with_html_tag_yield = RDoc::AnyMethod.new nil, 'method_with_html_tag_yield'
-    @meth_with_html_tag_yield.block_params = '%<<script>alert("atui")</script>>, yield_arg'
-    @attr = RDoc::Attr.new nil, 'attr', 'RW', ''
-
-    @klass.add_method @meth
-    @klass.add_method @meth_bang
-    @klass.add_method @meth_with_html_tag_yield
-    @klass.add_attribute @attr
-
-    @ignored = @top_level.add_class RDoc::NormalClass, 'Ignored'
-    @ignored.ignore
-
-    @store.complete :private
-
-    @object      = @store.find_class_or_module 'Object'
-    @klass_alias = @store.find_class_or_module 'Klass::A'
-  end
-
-  def teardown
-    super
-
-    $LOAD_PATH.shift
-    Dir.chdir @pwd
-    FileUtils.rm_rf @tmpdir
-  end
-
-  def test_generate
-    top_level = @store.add_file 'file.rb'
-    top_level.add_class @klass.class, @klass.name
-    @klass.add_class RDoc::NormalClass, 'Inner'
-    @klass.add_comment <<~RDOC, top_level
-    = Heading 1
-    Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
-    == Heading 1.1
-    tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
-    === Heading 1.1.1
-    quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
-    ==== Heading 1.1.1.1
-    consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
-    == Heading 1.2
-    cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat
-    == Heading 1.3
-    non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
-    === Heading 1.3.1
-    etc etc...
-    RDOC
-
-    @g.generate
-
-    assert_file 'index.html'
-    assert_file 'Object.html'
-    assert_file 'Klass.html'
-    assert_file 'Klass/Inner.html'
-    assert_file 'table_of_contents.html'
-    assert_file 'js/search_index.js'
-
-    assert_hard_link 'css/rdoc.css'
-    assert_hard_link 'css/fonts.css'
-
-    assert_hard_link 'fonts/SourceCodePro-Bold.ttf'
-    assert_hard_link 'fonts/SourceCodePro-Regular.ttf'
-
-    encoding = Regexp.escape Encoding::UTF_8.name
-
-    assert_match %r%<meta charset="#{encoding}">%, File.binread('index.html')
-    assert_match %r%<meta charset="#{encoding}">%, File.binread('Object.html')
-
-    refute_match(/Ignored/, File.binread('index.html'))
-    summary = File.binread('index.html')[%r[<summary.*Klass\.html.*</summary>.*</details>]m]
-    assert_match(%r[Klass/Inner\.html".*>Inner<], summary)
-
-    klass = File.binread('Klass.html')
-    klassnav = klass[%r[<div class="nav-section">.*<div id="class-metadata">]m]
-    assert_match(
-      %r[<li>\s*<details open>\s*<summary>\s*<a href=\S+>Heading 1</a>\s*</summary>\s*<ul]m,
-      klassnav
-    )
-    assert_match(
-      %r[<li>\s*<a href=\S+>Heading 1.1.1.1</a>\s*</ul>\s*</details>\s*</li>]m,
-      klassnav
-    )
-
-    assert_match(/<h1 id="class-Klass-label-Heading\+1">Heading 1(?!\.)/,
-                 klass[%r[<section class=\"description\">.*</section>]m])
-    toc = File.binread('table_of_contents.html')
-    assert_match(
-      %r[<a\s+href="Klass\.html#class-Klass-label-Heading\+1">Heading 1</a>]m,
-      toc[%r[<h2\s+id=\"classes\">.*(?=<h2\b)]m][%r[<a\s+href="Klass\.html".*(?=</li\b)]m]
-    )
-  end
-
-  def test_generate_page
-    @store.add_file 'outer.rdoc', parser: RDoc::Parser::Simple
-    @store.add_file 'outer/inner.rdoc', parser: RDoc::Parser::Simple
-    @g.generate
-    assert_file 'outer_rdoc.html'
-    assert_file 'outer/inner_rdoc.html'
-    index = File.binread('index.html')
-    re = %r[<summary><a href="\./outer_rdoc\.html">outer</a></summary>.*?</details>]m
-    assert_match(re, index)
-    summary = index[re]
-    assert_match %r[<a href="\./outer/inner_rdoc.html">inner</a>], summary
-    re = %r[<details open><summary><a href="\./outer_rdoc\.html">outer</a></summary>.*?</details>]m
-    assert_match(re, File.binread('outer_rdoc.html'))
-    re = %r[<details open><summary><a href="\.\./outer_rdoc\.html">outer</a></summary>.*?</details>]m
-    assert_match(re, File.binread('outer/inner_rdoc.html'))
-  end
-
-  def test_generate_dry_run
-    @g.dry_run = true
-    top_level = @store.add_file 'file.rb'
-    top_level.add_class @klass.class, @klass.name
-
-    @g.generate
-
-    refute_file 'index.html'
-    refute_file 'Object.html'
-  end
-
-  def test_generate_static
-    FileUtils.mkdir_p 'dir/images'
-    FileUtils.touch 'dir/images/image.png'
-    FileUtils.mkdir_p 'file'
-    FileUtils.touch 'file/file.txt'
-
-    @options.static_path = [
-      File.expand_path('dir'),
-      File.expand_path('file/file.txt'),
-    ]
-
-    @g.generate
-
-    assert_file 'images/image.png'
-    assert_file 'file.txt'
-  end
-
-  def test_generate_static_dry_run
-    FileUtils.mkdir 'static'
-    FileUtils.touch 'static/image.png'
-
-    @options.static_path = [File.expand_path('static')]
-    @g.dry_run = true
-
-    @g.generate
-
-    refute_file 'image.png'
-  end
-
-  def test_install_rdoc_static_file
-    src = Pathname File.expand_path(__FILE__, @pwd)
-    dst = File.join @tmpdir, File.basename(src)
-    options = {}
-
-    @g.install_rdoc_static_file src, dst, options
-
-    assert_file dst
-    assert_hard_link dst
-  end
-
-  def test_install_rdoc_static_file_missing
-    src = Pathname(__FILE__) + 'nonexistent'
-    dst = File.join @tmpdir, File.basename(src)
-    options = {}
-
-    @g.install_rdoc_static_file src, dst, options
-
-    refute_file dst
-  end
-
-  def test_setup
-    @g.setup
-
-    assert_equal [@klass_alias, @ignored, @klass, @object],
-                 @g.classes.sort_by { |klass| klass.full_name }
-    assert_equal [@top_level],                           @g.files
-    assert_equal [@meth, @meth, @meth_bang, @meth_bang, @meth_with_html_tag_yield, @meth_with_html_tag_yield], @g.methods
-    assert_equal [@klass_alias, @klass, @object], @g.modsort
-  end
-
-  def test_template_for
-    classpage = Pathname.new @options.template_dir + 'class.rhtml'
-
-    template = @g.send(:template_for, classpage, true, RDoc::ERBIO)
-    assert_kind_of RDoc::ERBIO, template
-
-    assert_same template, @g.send(:template_for, classpage)
-  end
-
-  def test_template_for_dry_run
-    classpage = Pathname.new @options.template_dir + 'class.rhtml'
-
-    template = @g.send(:template_for, classpage, true, ERB)
-    assert_kind_of ERB, template
-
-    assert_same template, @g.send(:template_for, classpage)
-  end
-
-  def test_template_for_partial
-    partial = Pathname.new @options.template_dir + '_sidebar_classes.rhtml'
-
-    template = @g.send(:template_for, partial, false, RDoc::ERBPartial)
-
-    assert_kind_of RDoc::ERBPartial, template
-
-    assert_same template, @g.send(:template_for, partial)
-  end
-
-  def test_generated_method_with_html_tag_yield
-    top_level = @store.add_file 'file.rb'
-    top_level.add_class @klass.class, @klass.name
-
-    @g.generate
-
-    path = File.join @tmpdir, 'A.html'
-
-    f = open(path)
-    internal_file = f.read
-    method_name_index = internal_file.index('<span class="method-name">method_with_html_tag_yield</span>')
-    last_of_method_name_index = method_name_index + internal_file[method_name_index..-1].index('<div class="method-description">') - 1
-    method_name = internal_file[method_name_index..last_of_method_name_index]
-    f.close
-
-    assert_includes method_name, '{ |%&lt;&lt;script&gt;alert(&quot;atui&quot;)&lt;/script&gt;&gt;, yield_arg| ... }'
-  end
-
-  def test_generated_filename_with_html_tag
-    filename = '"><em>should be escaped'
-    begin # in @tmpdir
-      File.write(filename, '')
-    rescue SystemCallError
-      # ", <, > chars are prohibited as filename
-      return
-    else
-      File.unlink(filename)
-    end
-    @store.add_file filename
-    doc = @store.all_files.last
-    doc.parser = RDoc::Parser::Simple
-
-    @g.generate
-
-    Dir.glob("*.html", base: @tmpdir) do |html|
-      File.binread(File.join(@tmpdir, html)).scan(/.*should be escaped.*/) do |line|
-        assert_not_include line, "<em>", html
-      end
-    end
-  end
-
-  def test_template_stylesheets
-    css = Tempfile.create(%W'hoge .css', Dir.mktmpdir('tmp', '.'))
-    File.write(css, '')
-    css.close
-    base = File.basename(css)
-    refute_file(base)
-
-    @options.template_stylesheets << css
-
-    @g.generate
-
-    assert_file base
-    assert_include File.binread('index.html'), %Q[href="./#{base}"]
-  end
-
-  def test_title
-    title = "RDoc Test".freeze
-    @options.title = title
-    @g.generate
-
-    assert_main_title(File.binread('index.html'), title)
-  end
-
-  def test_title_escape
-    title = %[<script>alert("RDoc")</script>].freeze
-    @options.title = title
-    @g.generate
-
-    assert_main_title(File.binread('index.html'), title)
-  end
-
-  ##
-  # Asserts that +filename+ has a link count greater than 1 if hard links to
-  # @tmpdir are supported.
-
-  def assert_hard_link filename
-    assert_file filename
-
-    src = @g.template_dir + '_head.rhtml'
-    dst = File.join @tmpdir, 'hardlinktest'
-
-    begin
-      FileUtils.ln src, dst
-      nlink = File.stat(dst).nlink if File.identical? src, dst
-      FileUtils.rm dst
-      return if nlink == 1
-    rescue SystemCallError
-      return
-    end
-
-    assert_operator File.stat(filename).nlink, :>, 1,
-                    "#{filename} is not hard-linked"
-  end
-
-  def assert_main_title(content, title)
-    title = CGI.escapeHTML(title)
-    assert_equal(title, content[%r[<title>(.*?)<\/title>]im, 1])
-    assert_include(content[%r[<main\s[^<>]*+>\s*(.*?)</main>]im, 1], title)
-  end
-end
diff --git a/test/rdoc/test_rdoc_generator_json_index.rb b/test/rdoc/test_rdoc_generator_json_index.rb
deleted file mode 100644
index 6b69337b4505ae..00000000000000
--- a/test/rdoc/test_rdoc_generator_json_index.rb
+++ /dev/null
@@ -1,349 +0,0 @@
-# coding: US-ASCII
-# frozen_string_literal: true
-
-require_relative 'helper'
-
-class TestRDocGeneratorJsonIndex < RDoc::TestCase
-
-  def setup
-    super
-
-    @tmpdir = Dir.mktmpdir "test_rdoc_generator_darkfish_#{$$}_"
-    FileUtils.mkdir_p @tmpdir
-
-    @options = RDoc::Options.new
-    @options.files = []
-    # JsonIndex is used in conjunction with another generator
-    @options.setup_generator 'darkfish'
-    @options.template_dir = ''
-    @options.op_dir = @tmpdir
-    @options.option_parser = OptionParser.new
-    @options.finish
-
-    @darkfish = RDoc::Generator::Darkfish.new @store, @options
-    @g = RDoc::Generator::JsonIndex.new @darkfish, @options
-
-    @rdoc.options = @options
-    @rdoc.generator = @g
-
-    @top_level = @store.add_file 'file.rb'
-    @top_level.parser = RDoc::Parser::Ruby
-
-    @klass = @top_level.add_class RDoc::NormalClass, 'C'
-
-    @meth = @klass.add_method RDoc::AnyMethod.new(nil, 'meth')
-    @meth.record_location @top_level
-
-    @nest_klass = @klass.add_class RDoc::NormalClass, 'D'
-    @nest_klass.record_location @top_level
-
-    @nest_meth = @nest_klass.add_method RDoc::AnyMethod.new(nil, 'meth')
-
-    @ignored = @top_level.add_class RDoc::NormalClass, 'Ignored'
-    @ignored.ignore
-
-    @page = @store.add_file 'page.rdoc'
-    @page.parser = RDoc::Parser::Simple
-
-    @top_levels = [@top_level, @page].sort
-    @klasses    = [@klass, @nest_klass, @ignored]
-
-    Dir.chdir @tmpdir
-  end
-
-  def teardown
-    super
-
-    Dir.chdir @pwd
-    FileUtils.rm_rf @tmpdir
-  end
-
-  def test_build_index
-    index = @g.build_index
-
-    expected = {
-      :index => {
-        :searchIndex     => %w[c d meth() meth() page],
-        :longSearchIndex => %w[c c::d c#meth() c::d#meth()],
-        :info            => [
-          @klass.search_record[2..-1],
-          @nest_klass.search_record[2..-1],
-          @meth.search_record[2..-1],
-          @nest_meth.search_record[2..-1],
-          @page.search_record[2..-1],
-        ],
-      },
-    }
-
-    expected[:index][:longSearchIndex] << ''
-
-    assert_equal expected, index
-  end
-
-  def test_class_dir
-    assert_equal @darkfish.class_dir, @g.class_dir
-  end
-
-  def test_file_dir
-    assert_equal @darkfish.file_dir, @g.file_dir
-  end
-
-  def test_generate
-    @g.generate
-
-    assert_file 'js/searcher.js'
-    assert_file 'js/navigation.js'
-    assert_file 'js/search_index.js'
-
-    srcdir = File.expand_path('lib/rdoc', @pwd)
-    if !File.directory? srcdir
-      # for Ruby core repository
-      srcdir = File.expand_path("../../../lib/rdoc", __FILE__)
-    end
-
-    orig_file = Pathname(File.join srcdir, 'generator/template/json_index/js/navigation.js')
-    generated_file = Pathname(File.join @tmpdir, 'js/navigation.js')
-
-    # This is dirty hack on JRuby
-    assert orig_file.mtime.inspect == generated_file.mtime.inspect,
-      '.js files should be the same timestamp of original'
-
-    json = File.read 'js/search_index.js'
-
-    json =~ /\Avar search_data = /
-
-    assignment = $&
-    index = $'
-
-    refute_empty assignment
-
-    index = JSON.parse index
-
-    info = [
-      @klass.search_record[2..-1],
-      @nest_klass.search_record[2..-1],
-      @meth.search_record[2..-1],
-      @nest_meth.search_record[2..-1],
-      @page.search_record[2..-1],
-    ]
-
-    expected = {
-      'index' => {
-        'searchIndex' => [
-          'c',
-          'd',
-          'meth()',
-          'meth()',
-          'page',
-        ],
-        'longSearchIndex' => [
-          'c',
-          'c::d',
-          'c#meth()',
-          'c::d#meth()',
-          '',
-        ],
-        'info' => info,
-      },
-    }
-
-    assert_equal expected, index
-  end
-
-  def test_generate_search_index_with_reproducible_builds
-    backup_epoch = ENV['SOURCE_DATE_EPOCH']
-    ruby_birthday = Time.parse 'Wed, 24 Feb 1993 21:00:00 +0900'
-    ENV['SOURCE_DATE_EPOCH'] = ruby_birthday.to_i.to_s
-
-    @g.generate
-
-    assert_file 'js/search_index.js'
-    generated_search_index = Pathname(File.join @tmpdir, 'js/search_index.js')
-    assert_equal ruby_birthday, generated_search_index.mtime
-
-    ENV['SOURCE_DATE_EPOCH'] = backup_epoch
-  end
-
-  def test_generate_gzipped
-    begin
-      require 'zlib'
-    rescue LoadError
-      omit "no zlib"
-    end
-    @g.generate
-    @g.generate_gzipped
-
-    assert_file 'js/searcher.js'
-    assert_file 'js/searcher.js.gz'
-    assert_file 'js/navigation.js'
-    assert_file 'js/navigation.js.gz'
-    assert_file 'js/search_index.js'
-    assert_file 'js/search_index.js.gz'
-
-    json = File.open('js/search_index.js.gz', 'rb') {|gzip|
-      Zlib::GzipReader.new(gzip).read
-    }
-
-    json =~ /\Avar search_data = /
-
-    assignment = $&
-    index = $'
-
-    refute_empty assignment
-
-    index = JSON.parse index
-
-    info = [
-      @klass.search_record[2..-1],
-      @nest_klass.search_record[2..-1],
-      @meth.search_record[2..-1],
-      @nest_meth.search_record[2..-1],
-      @page.search_record[2..-1],
-    ]
-
-    expected = {
-      'index' => {
-        'searchIndex' => [
-          'c',
-          'd',
-          'meth()',
-          'meth()',
-          'page',
-        ],
-        'longSearchIndex' => [
-          'c',
-          'c::d',
-          'c#meth()',
-          'c::d#meth()',
-          '',
-        ],
-        'info' => info,
-      },
-    }
-
-    assert_equal expected, index
-  end
-
-  def test_generate_utf_8
-    text = "5\xB0"
-    text = RDoc::Encoding.change_encoding text, Encoding::ISO_8859_1
-    @klass.add_comment comment(text), @top_level
-
-    @g.generate
-
-    json = File.read 'js/search_index.js'
-    json.force_encoding Encoding::UTF_8
-
-    json =~ /\Avar search_data = /
-
-    index = $'
-
-    index = JSON.parse index
-
-    klass_record = @klass.search_record[2..-1]
-    klass_record[-1] = "<p>5\xc2\xb0\n"
-    klass_record[-1] = RDoc::Encoding.change_encoding klass_record[-1], Encoding::UTF_8
-
-    info = [
-      klass_record,
-      @nest_klass.search_record[2..-1],
-      @meth.search_record[2..-1],
-      @nest_meth.search_record[2..-1],
-      @page.search_record[2..-1],
-    ]
-
-    expected = {
-      'index' => {
-        'searchIndex' => [
-          'c',
-          'd',
-          'meth()',
-          'meth()',
-          'page',
-        ],
-        'longSearchIndex' => [
-          'c',
-          'c::d',
-          'c#meth()',
-          'c::d#meth()',
-          '',
-        ],
-        'info' => info,
-      },
-    }
-
-    assert_equal expected, index
-  end
-
-  def test_index_classes
-    @g.reset @top_levels, @klasses
-
-    @g.index_classes
-
-    expected = {
-      :searchIndex     => %w[c d],
-      :longSearchIndex => %w[c c::d],
-      :info            => [
-        @klass.search_record[2..-1],
-        @nest_klass.search_record[2..-1],
-      ],
-    }
-
-    assert_equal expected, @g.index
-  end
-
-  def test_index_classes_nodoc
-    @klass.document_self      = false
-    @nest_klass.document_self = false
-    @meth.document_self       = false
-    @nest_meth.document_self  = false
-
-    @g.reset @top_levels, @klasses
-
-    @g.index_classes
-
-    expected = {
-      :searchIndex     => [],
-      :longSearchIndex => [],
-      :info            => [],
-    }
-
-    assert_equal expected, @g.index
-  end
-
-  def test_index_methods
-    @g.reset @top_levels, @klasses
-
-    @g.index_methods
-
-    expected = {
-      :searchIndex     => %w[meth() meth()],
-      :longSearchIndex => %w[c#meth() c::d#meth()],
-      :info            => [
-        @meth.search_record[2..-1],
-        @nest_meth.search_record[2..-1],
-      ],
-    }
-
-    assert_equal expected, @g.index
-  end
-
-  def test_index_pages
-    @g.reset @top_levels, @klasses
-
-    @g.index_pages
-
-    expected = {
-      :searchIndex     => %w[page],
-      :longSearchIndex => [''],
-      :info            => [@page.search_record[2..-1]],
-    }
-
-    assert_equal expected, @g.index
-  end
-
-  def test_search_string
-    assert_equal 'cd', @g.search_string('C d')
-  end
-
-end
diff --git a/test/rdoc/test_rdoc_generator_markup.rb b/test/rdoc/test_rdoc_generator_markup.rb
deleted file mode 100644
index 7c021e432e08ac..00000000000000
--- a/test/rdoc/test_rdoc_generator_markup.rb
+++ /dev/null
@@ -1,59 +0,0 @@
-# frozen_string_literal: true
-require_relative 'helper'
-
-class TestRDocGeneratorMarkup < RDoc::TestCase
-
-  include RDoc::Text
-  include RDoc::Generator::Markup
-
-  attr_reader :store
-
-  def setup
-    super
-
-    @options = RDoc::Options.new
-    @rdoc.options = @options
-
-    @parent = self
-    @path = '/index.html'
-    @symbols = {}
-  end
-
-  def test_aref_to
-    assert_equal 'Foo/Bar.html', aref_to('Foo/Bar.html')
-  end
-
-  def test_as_href
-    assert_equal '../index.html', as_href('Foo/Bar.html')
-  end
-
-  def test_cvs_url
-    assert_equal 'http://example/this_page',
-                 cvs_url('http://example/', 'this_page')
-
-    assert_equal 'http://example/?page=this_page&foo=bar',
-                 cvs_url('http://example/?page=%s&foo=bar', 'this_page')
-  end
-
-  def test_description
-    @comment = '= Hello'
-
-    links = '<span><a href="#label-Hello">&para;</a> ' +
-            '<a href="#top">&uarr;</a></span>'
-
-    assert_equal "\n<h1 id=\"label-Hello\">Hello#{links}</h1>\n", description
-  end
-
-  def test_formatter
-    assert_kind_of RDoc::Markup::ToHtmlCrossref, formatter
-    refute formatter.show_hash
-    assert_same self, formatter.context
-  end
-
-  attr_reader :path
-
-  def find_symbol name
-    @symbols[name]
-  end
-
-end
diff --git a/test/rdoc/test_rdoc_generator_pot.rb b/test/rdoc/test_rdoc_generator_pot.rb
deleted file mode 100644
index bafe9ecca56f9f..00000000000000
--- a/test/rdoc/test_rdoc_generator_pot.rb
+++ /dev/null
@@ -1,92 +0,0 @@
-# frozen_string_literal: true
-require_relative 'helper'
-
-class TestRDocGeneratorPOT < RDoc::TestCase
-
-  def setup
-    super
-
-    @options = RDoc::Options.new
-    @tmpdir = File.join Dir.tmpdir, "test_rdoc_generator_pot_#{$$}"
-    FileUtils.mkdir_p @tmpdir
-
-    @generator = RDoc::Generator::POT.new @store, @options
-
-    @top_level = @store.add_file 'file.rb'
-    @klass = @top_level.add_class RDoc::NormalClass, 'Object'
-    @klass.add_comment 'This is a class', @top_level
-    @klass.add_section 'This is a section', comment('This is a section comment')
-
-    @const = RDoc::Constant.new "CONSTANT", "29", "This is a constant"
-
-    @meth = RDoc::AnyMethod.new nil, 'method'
-    @meth.record_location @top_level
-    @meth.comment = 'This is a method'
-
-    @attr = RDoc::Attr.new nil, 'attr', 'RW', ''
-    @attr.record_location @top_level
-    @attr.comment = 'This is an attribute'
-
-    @klass.add_constant @const
-    @klass.add_method @meth
-    @klass.add_attribute @attr
-
-    Dir.chdir @tmpdir
-  end
-
-  def teardown
-    super
-
-    Dir.chdir @pwd
-    FileUtils.rm_rf @tmpdir
-  end
-
-  def test_generate
-    @generator.generate
-
-    assert_equal <<-POT, File.read(File.join(@tmpdir, 'rdoc.pot'))
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSEION\\n"
-"Report-Msgid-Bugs-To:\\n"
-"PO-Revision-Date: YEAR-MO_DA HO:MI+ZONE\\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\\n"
-"Language-Team: LANGUAGE <LL@li.org>\\n"
-"Language:\\n"
-"MIME-Version: 1.0\\n"
-"Content-Type: text/plain; charset=CHARSET\\n"
-"Content-Transfer-Encoding: 8bit\\n"
-"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\\n"
-
-#. Object
-msgid "This is a class"
-msgstr ""
-
-#. Object::CONSTANT
-msgid "This is a constant"
-msgstr ""
-
-#. Object#method
-msgid "This is a method"
-msgstr ""
-
-#. Object: section title
-msgid "This is a section"
-msgstr ""
-
-#. Object: This is a section
-msgid "This is a section comment"
-msgstr ""
-
-#. Object#attr
-msgid "This is an attribute"
-msgstr ""
-    POT
-  end
-
-end
diff --git a/test/rdoc/test_rdoc_generator_pot_po.rb b/test/rdoc/test_rdoc_generator_pot_po.rb
deleted file mode 100644
index 7696a1f5b1f1bb..00000000000000
--- a/test/rdoc/test_rdoc_generator_pot_po.rb
+++ /dev/null
@@ -1,52 +0,0 @@
-# frozen_string_literal: true
-require_relative 'helper'
-
-class TestRDocGeneratorPOTPO < RDoc::TestCase
-
-  def setup
-    super
-    @po = RDoc::Generator::POT::PO.new
-  end
-
-  def test_empty
-    assert_equal header, @po.to_s
-  end
-
-  def test_have_entry
-    @po.add(entry("Hello", {}))
-    assert_equal <<-PO, @po.to_s
-#{header}
-msgid "Hello"
-msgstr ""
-    PO
-  end
-
-  private
-
-  def entry(msgid, options)
-    RDoc::Generator::POT::POEntry.new(msgid, options)
-  end
-
-  def header
-    <<-'HEADER'
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSEION\n"
-"Report-Msgid-Bugs-To:\n"
-"PO-Revision-Date: YEAR-MO_DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language:\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CHARSET\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
-    HEADER
-  end
-
-end
diff --git a/test/rdoc/test_rdoc_generator_pot_po_entry.rb b/test/rdoc/test_rdoc_generator_pot_po_entry.rb
deleted file mode 100644
index d3d6271b233913..00000000000000
--- a/test/rdoc/test_rdoc_generator_pot_po_entry.rb
+++ /dev/null
@@ -1,140 +0,0 @@
-# frozen_string_literal: true
-require_relative 'helper'
-
-class TestRDocGeneratorPOTPOEntry < RDoc::TestCase
-
-  def test_msgid_normal
-    assert_equal <<-'ENTRY', entry("Hello", {}).to_s
-msgid "Hello"
-msgstr ""
-    ENTRY
-  end
-
-  def test_msgid_multiple_lines
-    assert_equal <<-'ENTRY', entry("Hello\nWorld", {}).to_s
-msgid ""
-"Hello\n"
-"World"
-msgstr ""
-    ENTRY
-  end
-
-  def test_msgid_tab
-    assert_equal <<-'ENTRY', entry("Hello\tWorld", {}).to_s
-msgid "Hello\tWorld"
-msgstr ""
-    ENTRY
-  end
-
-  def test_msgid_back_slash
-    assert_equal <<-'ENTRY', entry("Hello \\ World", {}).to_s
-msgid "Hello \\ World"
-msgstr ""
-    ENTRY
-  end
-
-  def test_msgid_double_quote
-    assert_equal <<-'ENTRY', entry("Hello \"World\"!", {}).to_s
-msgid "Hello \"World\"!"
-msgstr ""
-    ENTRY
-  end
-
-  def test_translator_comment_normal
-    options = {:translator_comment => "Greeting"}
-    assert_equal <<-'ENTRY', entry("Hello", options).to_s
-# Greeting
-msgid "Hello"
-msgstr ""
-    ENTRY
-  end
-
-  def test_translator_comment_multiple_lines
-    options = {:translator_comment => "Greeting\nfor morning"}
-    assert_equal <<-'ENTRY', entry("Hello", options).to_s
-# Greeting
-# for morning
-msgid "Hello"
-msgstr ""
-    ENTRY
-  end
-
-  def test_extracted_comment_normal
-    options = {:extracted_comment => "Object"}
-    assert_equal <<-'ENTRY', entry("Hello", options).to_s
-#. Object
-msgid "Hello"
-msgstr ""
-    ENTRY
-  end
-
-  def test_extracted_comment_multiple_lines
-    options = {:extracted_comment => "Object\nMorning#greeting"}
-    assert_equal <<-'ENTRY', entry("Hello", options).to_s
-#. Object
-#. Morning#greeting
-msgid "Hello"
-msgstr ""
-    ENTRY
-  end
-
-  def test_references_normal
-    options = {:references => [["lib/rdoc.rb", 29]]}
-    assert_equal <<-'ENTRY', entry("Hello", options).to_s
-#: lib/rdoc.rb:29
-msgid "Hello"
-msgstr ""
-    ENTRY
-  end
-
-  def test_references_multiple
-    options = {:references => [["lib/rdoc.rb", 29], ["lib/rdoc/i18n.rb", 9]]}
-    assert_equal <<-'ENTRY', entry("Hello", options).to_s
-#: lib/rdoc.rb:29
-#: lib/rdoc/i18n.rb:9
-msgid "Hello"
-msgstr ""
-    ENTRY
-  end
-
-  def test_flags_normal
-    options = {:flags => ["fuzzy"]}
-    assert_equal <<-'ENTRY', entry("Hello", options).to_s
-#, fuzzy
-msgid "Hello"
-msgstr ""
-    ENTRY
-  end
-
-  def test_flags_multiple
-    options = {:flags => ["fuzzy", "ruby-format"]}
-    assert_equal <<-'ENTRY', entry("Hello", options).to_s
-#, fuzzy,ruby-format
-msgid "Hello"
-msgstr ""
-    ENTRY
-  end
-
-  def test_full
-    options = {
-      :translator_comment => "Greeting",
-      :extracted_comment  => "Morning#greeting",
-      :references         => [["lib/rdoc.rb", 29]],
-      :flags              => ["fuzzy"],
-    }
-    assert_equal <<-'ENTRY', entry("Hello", options).to_s
-# Greeting
-#. Morning#greeting
-#: lib/rdoc.rb:29
-#, fuzzy
-msgid "Hello"
-msgstr ""
-    ENTRY
-  end
-
-  private
-  def entry(msgid, options)
-    RDoc::Generator::POT::POEntry.new(msgid, options)
-  end
-
-end
diff --git a/test/rdoc/test_rdoc_generator_ri.rb b/test/rdoc/test_rdoc_generator_ri.rb
deleted file mode 100644
index 195c0d24821346..00000000000000
--- a/test/rdoc/test_rdoc_generator_ri.rb
+++ /dev/null
@@ -1,76 +0,0 @@
-# frozen_string_literal: true
-require_relative 'helper'
-
-class TestRDocGeneratorRI < RDoc::TestCase
-
-  def setup
-    super
-
-    @options = RDoc::Options.new
-    @options.encoding = Encoding::UTF_8
-    @store.encoding = Encoding::UTF_8
-
-    @tmpdir = File.join Dir.tmpdir, "test_rdoc_generator_ri_#{$$}"
-    FileUtils.mkdir_p @tmpdir
-
-    @g = RDoc::Generator::RI.new @store, @options
-
-    @top_level = @store.add_file 'file.rb'
-    @klass = @top_level.add_class RDoc::NormalClass, 'Object'
-
-    @meth = RDoc::AnyMethod.new nil, 'method'
-    @meth.record_location @top_level
-
-    @meth_bang = RDoc::AnyMethod.new nil, 'method!'
-    @meth_bang.record_location @top_level
-
-    @attr = RDoc::Attr.new nil, 'attr', 'RW', ''
-    @attr.record_location @top_level
-
-    @klass.add_method @meth
-    @klass.add_method @meth_bang
-    @klass.add_attribute @attr
-
-    Dir.chdir @tmpdir
-  end
-
-  def teardown
-    super
-
-    Dir.chdir @pwd
-    FileUtils.rm_rf @tmpdir
-  end
-
-  def test_generate
-    @g.generate
-
-    assert_file File.join(@tmpdir, 'cache.ri')
-
-    assert_file File.join(@tmpdir, 'Object', 'cdesc-Object.ri')
-
-    assert_file File.join(@tmpdir, 'Object', 'attr-i.ri')
-    assert_file File.join(@tmpdir, 'Object', 'method-i.ri')
-    assert_file File.join(@tmpdir, 'Object', 'method%21-i.ri')
-
-    store = RDoc::RI::Store.new @tmpdir
-    store.load_cache
-
-    encoding = Encoding::UTF_8
-
-    assert_equal encoding, store.encoding
-  end
-
-  def test_generate_dry_run
-    @store.dry_run = true
-    @g = RDoc::Generator::RI.new @store, @options
-
-    top_level = @store.add_file 'file.rb'
-    top_level.add_class @klass.class, @klass.name
-
-    @g.generate
-
-    refute_file File.join(@tmpdir, 'cache.ri')
-    refute_file File.join(@tmpdir, 'Object')
-  end
-
-end
diff --git a/test/rdoc/test_rdoc_i18n_locale.rb b/test/rdoc/test_rdoc_i18n_locale.rb
deleted file mode 100644
index 746d659c67c3bb..00000000000000
--- a/test/rdoc/test_rdoc_i18n_locale.rb
+++ /dev/null
@@ -1,74 +0,0 @@
-# frozen_string_literal: true
-require_relative 'helper'
-
-class TestRDocI18nLocale < RDoc::TestCase
-
-  def setup
-    super
-    @locale = locale('fr')
-
-    @tmpdir = File.join Dir.tmpdir, "test_rdoc_i18n_locale_#{$$}"
-    FileUtils.mkdir_p @tmpdir
-
-    @locale_dir = @tmpdir
-  end
-
-  def teardown
-    FileUtils.rm_rf @tmpdir
-    super
-  end
-
-  def test_name
-    assert_equal 'fr', locale('fr').name
-  end
-
-  def test_load_nonexistent_po
-    locale = File.join(@locale_dir, 'nonexsitent-locale')
-    refute_file locale
-    refute @locale.load(locale)
-  end
-
-  def test_load_existent_po
-    begin
-      require 'gettext/po_parser'
-    rescue LoadError
-      omit 'gettext gem is not found'
-    end
-
-    fr_locale_dir = File.join @locale_dir, 'fr'
-    FileUtils.mkdir_p fr_locale_dir
-    File.open File.join(fr_locale_dir, 'rdoc.po'), 'w' do |po|
-      po.puts <<-PO
-msgid ""
-msgstr ""
-"Language: fr\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-msgid "Hello"
-msgstr "Bonjour"
-      PO
-    end
-
-    assert @locale.load(@locale_dir)
-    assert_equal 'Bonjour', @locale.translate('Hello')
-  end
-
-  def test_translate_existent_message
-    messages = @locale.instance_variable_get(:@messages)
-    messages['Hello'] = 'Bonjour'
-    assert_equal 'Bonjour', @locale.translate('Hello')
-  end
-
-  def test_translate_nonexistent_message
-    assert_equal 'Hello', @locale.translate('Hello')
-  end
-
-  private
-
-  def locale(name)
-    RDoc::I18n::Locale.new(name)
-  end
-
-end
diff --git a/test/rdoc/test_rdoc_i18n_text.rb b/test/rdoc/test_rdoc_i18n_text.rb
deleted file mode 100644
index 89b7e97708a4a4..00000000000000
--- a/test/rdoc/test_rdoc_i18n_text.rb
+++ /dev/null
@@ -1,124 +0,0 @@
-# frozen_string_literal: true
-require_relative 'helper'
-
-class TestRDocI18nText < RDoc::TestCase
-
-  def test_multiple_paragraphs
-    paragraph1 = <<-PARAGRAPH.strip
-RDoc produces HTML and command-line documentation for Ruby projects.  RDoc
-includes the +rdoc+ and +ri+ tools for generating and displaying documentation
-from the command-line.
-    PARAGRAPH
-
-    paragraph2 = <<-PARAGRAPH.strip
-This command generates documentation for all the Ruby and C source
-files in and below the current directory.  These will be stored in a
-documentation tree starting in the subdirectory +doc+.
-    PARAGRAPH
-
-    raw = <<-RAW
-#{paragraph1}
-
-#{paragraph2}
-    RAW
-
-    expected = [
-      {
-        :type      => :paragraph,
-        :paragraph => paragraph1,
-        :line_no   => 1,
-      },
-      {
-        :type      => :paragraph,
-        :paragraph => paragraph2,
-        :line_no   => 5,
-      },
-    ]
-    assert_equal expected, extract_messages(raw)
-  end
-
-  def test_translate_multiple_paragraphs
-    paragraph1 = <<-PARAGRAPH.strip
-Paragraph 1.
-    PARAGRAPH
-    paragraph2 = <<-PARAGRAPH.strip
-Paragraph 2.
-    PARAGRAPH
-
-    raw = <<-RAW
-#{paragraph1}
-
-#{paragraph2}
-    RAW
-
-    expected = <<-TRANSLATED
-Paragraphe 1.
-
-Paragraphe 2.
-    TRANSLATED
-    assert_equal expected, translate(raw)
-  end
-
-  def test_translate_not_translated_message
-    nonexistent_paragraph = <<-PARAGRAPH.strip
-Nonexistent paragraph.
-    PARAGRAPH
-
-    raw = <<-RAW
-#{nonexistent_paragraph}
-    RAW
-
-    expected = <<-TRANSLATED
-#{nonexistent_paragraph}
-    TRANSLATED
-    assert_equal expected, translate(raw)
-  end
-
-  def test_translate_keep_empty_lines
-    raw = <<-RAW
-Paragraph 1.
-
-
-
-
-Paragraph 2.
-    RAW
-
-    expected = <<-TRANSLATED
-Paragraphe 1.
-
-
-
-
-Paragraphe 2.
-    TRANSLATED
-    assert_equal expected, translate(raw)
-  end
-
-  private
-
-  def extract_messages(raw)
-    text = RDoc::I18n::Text.new(raw)
-    messages = []
-    text.extract_messages do |message|
-      messages << message
-    end
-    messages
-  end
-
-  def locale
-    locale = RDoc::I18n::Locale.new('fr')
-    messages = locale.instance_variable_get(:@messages)
-    messages['markdown'] = 'markdown (markdown in fr)'
-    messages['Hello'] = 'Bonjour (Hello in fr)'
-    messages['Paragraph 1.'] = 'Paragraphe 1.'
-    messages['Paragraph 2.'] = 'Paragraphe 2.'
-    locale
-  end
-
-  def translate(raw)
-    text = RDoc::I18n::Text.new(raw)
-    text.translate(locale)
-  end
-
-end
diff --git a/test/rdoc/test_rdoc_include.rb b/test/rdoc/test_rdoc_include.rb
deleted file mode 100644
index 380464f6cc2fb9..00000000000000
--- a/test/rdoc/test_rdoc_include.rb
+++ /dev/null
@@ -1,109 +0,0 @@
-# frozen_string_literal: true
-require_relative 'xref_test_case'
-
-class TestRDocInclude < XrefTestCase
-
-  def setup
-    super
-
-    @inc = RDoc::Include.new 'M1', 'comment'
-    @inc.parent = @m1
-    @inc.record_location @top_level
-    @inc.store = @store
-  end
-
-  def test_module
-    assert_equal @m1, @inc.module
-    assert_equal 'Unknown', RDoc::Include.new('Unknown', 'comment').module
-  end
-
-  def test_module_extended
-    m1 = @xref_data.add_module RDoc::NormalModule, 'Mod1'
-    m1_m3 = m1.add_module RDoc::NormalModule, 'Mod3'
-    m1_m2 = m1.add_module RDoc::NormalModule, 'Mod2'
-    m1_m2_m3 = m1_m2.add_module RDoc::NormalModule, 'Mod3'
-    m1_m2_m3_m4 = m1_m2_m3.add_module RDoc::NormalModule, 'Mod4'
-    m1_m2_m4 = m1_m2.add_module RDoc::NormalModule, 'Mod4'
-    m1_m2_k0 = m1_m2.add_class RDoc::NormalClass, 'Klass0'
-    m1_m2_k0_m4 = m1_m2_k0.add_module RDoc::NormalModule, 'Mod4'
-    #m1_m2_k0_m4_m5 = m1_m2_k0_m4.add_module RDoc::NormalModule, 'Mod5'
-    m1_m2_k0_m4_m6 = m1_m2_k0_m4.add_module RDoc::NormalModule, 'Mod6'
-    m1_m2_k0_m5 = m1_m2_k0.add_module RDoc::NormalModule, 'Mod5'
-
-    i0_m4 = RDoc::Include.new 'Mod4', nil
-    i0_m5 = RDoc::Include.new 'Mod5', nil
-    i0_m6 = RDoc::Include.new 'Mod6', nil
-    i0_m1 = RDoc::Include.new 'Mod1', nil
-    i0_m2 = RDoc::Include.new 'Mod2', nil
-    i0_m3 = RDoc::Include.new 'Mod3', nil
-
-    m1_m2_k0.add_include i0_m4
-    m1_m2_k0.add_include i0_m5
-    m1_m2_k0.add_include i0_m6
-    m1_m2_k0.add_include i0_m1
-    m1_m2_k0.add_include i0_m2
-    m1_m2_k0.add_include i0_m3
-
-    assert_equal [i0_m4, i0_m5, i0_m6, i0_m1, i0_m2, i0_m3], m1_m2_k0.includes
-    assert_equal [m1_m2_m3, m1_m2, m1, m1_m2_k0_m4_m6, m1_m2_k0_m5,
-                  m1_m2_k0_m4, @object, 'BasicObject'], m1_m2_k0.ancestors
-
-    m1_k1 = m1.add_class RDoc::NormalClass, 'Klass1'
-
-    i1_m1 = RDoc::Include.new 'Mod1', nil
-    i1_m2 = RDoc::Include.new 'Mod2', nil
-    i1_m3 = RDoc::Include.new 'Mod3', nil
-    i1_m4 = RDoc::Include.new 'Mod4', nil
-    i1_k0_m4 = RDoc::Include.new 'Klass0::Mod4', nil
-
-    m1_k1.add_include i1_m1
-    m1_k1.add_include i1_m2
-    m1_k1.add_include i1_m3
-    m1_k1.add_include i1_m4
-    m1_k1.add_include i1_k0_m4
-
-    assert_equal [i1_m1, i1_m2, i1_m3, i1_m4, i1_k0_m4], m1_k1.includes
-    assert_equal [m1_m2_k0_m4, m1_m2_m3_m4, m1_m2_m3, m1_m2, m1, @object,
-                  'BasicObject'], m1_k1.ancestors
-
-    m1_k2 = m1.add_class RDoc::NormalClass, 'Klass2'
-
-    i2_m1 = RDoc::Include.new 'Mod1', nil
-    i2_m2 = RDoc::Include.new 'Mod2', nil
-    i2_m3 = RDoc::Include.new 'Mod3', nil
-    i2_k0_m4 = RDoc::Include.new 'Klass0::Mod4', nil
-
-    m1_k2.add_include i2_m1
-    m1_k2.add_include i2_m3
-    m1_k2.add_include i2_m2
-    m1_k2.add_include i2_k0_m4
-
-    assert_equal [i2_m1, i2_m3, i2_m2, i2_k0_m4], m1_k2.includes
-    assert_equal [m1_m2_k0_m4, m1_m2, m1_m3, m1, @object, 'BasicObject'],
-                 m1_k2.ancestors
-
-    m1_k3 = m1.add_class RDoc::NormalClass, 'Klass3'
-
-    i3_m1 = RDoc::Include.new 'Mod1', nil
-    i3_m2 = RDoc::Include.new 'Mod2', nil
-    i3_m4 = RDoc::Include.new 'Mod4', nil
-
-    m1_k3.add_include i3_m1
-    m1_k3.add_include i3_m2
-    m1_k3.add_include i3_m4
-
-    assert_equal [i3_m1, i3_m2, i3_m4], m1_k3.includes
-    assert_equal [m1_m2_m4, m1_m2, m1, @object, 'BasicObject'], m1_k3.ancestors
-  end
-
-  def test_store_equals
-    incl = RDoc::Include.new 'M', nil
-    incl.record_location RDoc::TopLevel.new @top_level.name
-
-    incl.store = @store
-
-    assert_same @top_level, incl.file
-    assert_same @store,     incl.file.store
-  end
-
-end
diff --git a/test/rdoc/test_rdoc_markdown.rb b/test/rdoc/test_rdoc_markdown.rb
deleted file mode 100644
index dd6f312fa912f8..00000000000000
--- a/test/rdoc/test_rdoc_markdown.rb
+++ /dev/null
@@ -1,1090 +0,0 @@
-# coding: UTF-8
-# frozen_string_literal: true
-
-require_relative 'helper'
-require_relative '../../lib/rdoc/markup/block_quote'
-require_relative '../../lib/rdoc/markdown'
-
-class TestRDocMarkdown < RDoc::TestCase
-
-  def setup
-    super
-
-    @RM = RDoc::Markup
-
-    @parser = RDoc::Markdown.new
-
-    @to_html = RDoc::Markup::ToHtml.new(RDoc::Options.new, nil)
-  end
-
-  def test_class_parse
-    doc = RDoc::Markdown.parse "hello\n\nworld"
-
-    expected = doc(para("hello"), para("world"))
-
-    assert_equal expected, doc
-  end
-
-  def test_emphasis
-    assert_equal '_word_',             @parser.emphasis('word')
-    assert_equal '<em>two words</em>', @parser.emphasis('two words')
-    assert_equal '<em>*bold*</em>',    @parser.emphasis('*bold*')
-  end
-
-  def test_parse_auto_link_email
-    doc = parse "Autolink: <nobody-0+_./!%~$@example>"
-
-    expected = doc(para("Autolink: mailto:nobody-0+_./!%~$@example"))
-
-    assert_equal expected, doc
-  end
-
-  def test_parse_auto_link_url
-    doc = parse "Autolink: <http://example>"
-
-    expected = doc(para("Autolink: http://example"))
-
-    assert_equal expected, doc
-  end
-
-  def test_parse_block_quote
-    doc = parse <<-BLOCK_QUOTE
-> this is
-> a block quote
-    BLOCK_QUOTE
-
-    expected =
-      doc(
-        block(
-          para("this is\na block quote")))
-
-    assert_equal expected, doc
-  end
-
-  def test_parse_block_quote_continue
-    doc = parse <<-BLOCK_QUOTE
-> this is
-a block quote
-    BLOCK_QUOTE
-
-    expected =
-      doc(
-        block(
-          para("this is\na block quote")))
-
-    assert_equal expected, doc
-  end
-
-  def test_parse_block_quote_list
-    doc = parse <<-BLOCK_QUOTE
-> text
->
-> * one
-> * two
-    BLOCK_QUOTE
-
-    expected =
-      doc(
-        block(
-          para("text"),
-          list(:BULLET,
-            item(nil, para("one")),
-            item(nil, para("two")))))
-
-    assert_equal expected, doc
-  end
-
-  def test_parse_block_quote_newline
-    doc = parse <<-BLOCK_QUOTE
-> this is
-a block quote
-
-    BLOCK_QUOTE
-
-    expected =
-      doc(
-        block(
-          para("this is\na block quote")))
-
-    assert_equal expected, doc
-  end
-
-  def test_parse_block_quote_separate
-    doc = parse <<-BLOCK_QUOTE
-> this is
-a block quote
-
-> that continues
-    BLOCK_QUOTE
-
-    expected =
-      doc(
-        block(
-          para("this is\na block quote"),
-          para("that continues")))
-
-    assert_equal expected, doc
-  end
-
-  def test_parse_char_entity
-    doc = parse '&pi; &nn;'
-
-    expected = doc(para('π &nn;'))
-
-    assert_equal expected, doc
-  end
-
-  def test_parse_code
-    doc = parse "Code: `text`"
-
-    expected = doc(para("Code: <code>text</code>"))
-
-    assert_equal expected, doc
-  end
-
-  def test_parse_code_github
-    doc = <<-MD
-Example:
-
-```
-code goes here
-```
-    MD
-
-    expected =
-      doc(
-        para("Example:"),
-        verb("code goes here\n"))
-
-    assert_equal expected, parse(doc)
-    assert_equal expected, parse(doc.sub(/^\n/, ''))
-
-    @parser.github = false
-
-    expected =
-      doc(para("Example:"),
-          para("<code>\n""code goes here\n</code>"))
-
-    assert_equal expected, parse(doc)
-
-    expected =
-      doc(para("Example:\n<code>\n""code goes here\n</code>"))
-
-    assert_equal expected, parse(doc.sub(/^\n/, ''))
-  end
-
-  def test_parse_code_github_format
-    doc = <<-MD
-Example:
-
-``` ruby
-code goes here
-```
-    MD
-
-    code = verb("code goes here\n")
-    code.format = :ruby
-
-    expected =
-      doc(
-        para("Example:"),
-        code)
-
-    assert_equal expected, parse(doc)
-    assert_equal expected, parse(doc.sub(/^\n/, ''))
-
-    @parser.github = false
-
-    expected =
-      doc(para("Example:"),
-          para("<code>ruby\n""code goes here\n</code>"))
-
-    assert_equal expected, parse(doc)
-
-    expected =
-      doc(para("Example:\n<code>ruby\n""code goes here\n</code>"))
-
-    assert_equal expected, parse(doc.sub(/^\n/, ''))
-  end
-
-  def test_parse_definition_list
-    doc = parse <<-MD
-one
-:   This is a definition
-
-two
-:   This is another definition
-    MD
-
-    expected = doc(
-      list(:NOTE,
-        item(%w[one], para("This is a definition")),
-        item(%w[two], para("This is another definition"))))
-
-    assert_equal expected, doc
-  end
-
-  def test_parse_definition_list_indents
-    doc = parse <<-MD
-zero
-: Indented zero characters
-
-one
- : Indented one characters
-
-two
-  : Indented two characters
-
-three
-   : Indented three characters
-
-four
-    : Indented four characters
-
-    MD
-
-    expected = doc(
-      list(:NOTE,
-        item(%w[zero],  para("Indented zero characters")),
-        item(%w[one],   para("Indented one characters")),
-        item(%w[two],   para("Indented two characters")),
-        item(%w[three], para("Indented three characters"))),
-      para("four\n : Indented four characters"))
-
-    assert_equal expected, doc
-  end
-
-  def test_parse_definition_list_multi_description
-    doc = parse <<-MD
-label
-:   This is a definition
-
-:   This is another definition
-    MD
-
-    expected = doc(
-      list(:NOTE,
-        item(%w[label], para("This is a definition")),
-        item(nil,       para("This is another definition"))))
-
-    assert_equal expected, doc
-  end
-
-  def test_parse_definition_list_multi_label
-    doc = parse <<-MD
-one
-two
-:   This is a definition
-    MD
-
-    expected = doc(
-      list(:NOTE,
-        item(%w[one two], para("This is a definition"))))
-
-    assert_equal expected, doc
-  end
-
-  def test_parse_definition_list_multi_line
-    doc = parse <<-MD
-one
-:   This is a definition
-that extends to two lines
-
-two
-:   This is another definition
-that also extends to two lines
-    MD
-
-    expected = doc(
-      list(:NOTE,
-        item(%w[one],
-          para("This is a definition\nthat extends to two lines")),
-        item(%w[two],
-          para("This is another definition\nthat also extends to two lines"))))
-
-    assert_equal expected, doc
-  end
-
-  def test_parse_definition_list_no
-    @parser.definition_lists = false
-
-    doc = parse <<-MD
-one
-:   This is a definition
-
-two
-:   This is another definition
-    MD
-
-    expected = doc(
-        para("one\n: This is a definition"),
-        para("two\n: This is another definition"))
-
-    assert_equal expected, doc
-  end
-
-  def test_parse_entity_dec
-    doc = parse "Entity: &#65;"
-
-    expected = doc(para("Entity: A"))
-
-    assert_equal expected, doc
-  end
-
-  def test_parse_entity_hex
-    doc = parse "Entity: &#x41;"
-
-    expected = doc(para("Entity: A"))
-
-    assert_equal expected, doc
-  end
-
-  def test_parse_entity_named
-    doc = parse "Entity: &pi;"
-
-    expected = doc(para("Entity: π"))
-
-    assert_equal expected, doc
-  end
-
-  def test_parse_emphasis_star
-    doc = parse "it *works*\n"
-
-    expected = @RM::Document.new(
-      @RM::Paragraph.new("it _works_"))
-
-    assert_equal expected, doc
-  end
-
-  def test_parse_emphasis_underscore
-    doc = parse "it _works_\n"
-
-    expected =
-      doc(
-        para("it _works_"))
-
-    assert_equal expected, doc
-  end
-
-  def test_parse_emphasis_underscore_embedded
-    doc = parse "foo_bar bar_baz\n"
-
-    expected =
-      doc(
-        para("foo_bar bar_baz"))
-
-    assert_equal expected, doc
-  end
-
-  def test_parse_emphasis_underscore_in_word
-    doc = parse "it foo_bar_baz\n"
-
-    expected =
-      doc(
-        para("it foo_bar_baz"))
-
-    assert_equal expected, doc
-  end
-
-  def test_parse_escape
-    assert_equal doc(para("Backtick: `")), parse("Backtick: \\`")
-
-    assert_equal doc(para("Backslash: \\")), parse("Backslash: \\\\")
-
-    assert_equal doc(para("Colon: :")), parse("Colon: \\:")
-  end
-
-  def test_parse_heading_atx
-    doc = parse "# heading\n"
-
-    expected = @RM::Document.new(
-      @RM::Heading.new(1, "heading"))
-
-    assert_equal expected, doc
-  end
-
-  def test_parse_heading_setext_dash
-    doc = parse <<-MD
-heading
----
-    MD
-
-    expected = @RM::Document.new(
-      @RM::Heading.new(2, "heading"))
-
-    assert_equal expected, doc
-  end
-
-  def test_parse_heading_setext_equals
-    doc = parse <<-MD
-heading
-===
-    MD
-
-    expected = @RM::Document.new(
-      @RM::Heading.new(1, "heading"))
-
-    assert_equal expected, doc
-  end
-
-  def test_parse_html
-    @parser.html = true
-
-    doc = parse "<address>Links here</address>\n"
-
-    expected = doc(
-      @RM::Raw.new("<address>Links here</address>"))
-
-    assert_equal expected, doc
-  end
-
-  def test_parse_html_hr
-    @parser.html = true
-
-    doc = parse "<hr>\n"
-
-    expected = doc(raw("<hr>"))
-
-    assert_equal expected, doc
-  end
-
-  def test_parse_html_no_html
-    @parser.html = false
-
-    doc = parse "<address>Links here</address>\n"
-
-    expected = doc()
-
-    assert_equal expected, doc
-  end
-
-  def test_parse_image
-    doc = parse "image ![alt text](path/to/image.jpg)"
-
-    expected = doc(para("image rdoc-image:path/to/image.jpg"))
-
-    assert_equal expected, doc
-  end
-
-  def test_parse_image_link
-    @parser.html = true
-
-    doc = parse "[![alt text](path/to/image.jpg)](http://example.com)"
-
-    expected =
-      doc(
-        para('{rdoc-image:path/to/image.jpg}[http://example.com]'))
-
-    assert_equal expected, doc
-  end
-
-  def test_parse_line_break
-    doc = parse "Some text  \nwith extra lines"
-
-    expected = doc(
-      para("Some text", hard_break, "with extra lines"))
-
-    assert_equal expected, doc
-  end
-
-  def test_parse_link_reference_id
-    doc = parse <<-MD
-This is [an example][id] reference-style link.
-
-[id]: http://example.com "Optional Title Here"
-    MD
-
-    expected = doc(
-      para("This is {an example}[http://example.com] reference-style link."))
-
-    assert_equal expected, doc
-  end
-
-  def test_parse_link_reference_id_adjacent
-    doc = parse <<-MD
-[this] [this] should work
-
-[this]: example
-    MD
-
-    expected = doc(
-      para("{this}[example] should work"))
-
-    assert_equal expected, doc
-  end
-
-  def test_parse_link_reference_id_eof
-    doc = parse <<-MD.chomp
-This is [an example][id] reference-style link.
-
-[id]: http://example.com "Optional Title Here"
-    MD
-
-    expected = doc(
-      para("This is {an example}[http://example.com] reference-style link."))
-
-    assert_equal expected, doc
-  end
-
-  def test_parse_link_reference_id_many
-    doc = parse <<-MD
-This is [an example][id] reference-style link.
-
-And [another][id].
-
-[id]: http://example.com "Optional Title Here"
-    MD
-
-    expected = doc(
-      para("This is {an example}[http://example.com] reference-style link."),
-      para("And {another}[http://example.com]."))
-
-    assert_equal expected, doc
-  end
-
-  def test_parse_link_reference_implicit
-    doc = parse <<-MD
-This is [an example][] reference-style link.
-
-[an example]: http://example.com "Optional Title Here"
-    MD
-
-    expected = doc(
-      para("This is {an example}[http://example.com] reference-style link."))
-
-    assert_equal expected, doc
-  end
-
-  def test_parse_list_bullet
-    doc = parse <<-MD
-* one
-* two
-    MD
-
-    expected = doc(
-      list(:BULLET,
-        item(nil, para("one")),
-        item(nil, para("two"))))
-
-    assert_equal expected, doc
-  end
-
-  def test_parse_list_bullet_auto_link
-    doc = parse <<-MD
-* <http://example/>
-    MD
-
-    expected = doc(
-      list(:BULLET,
-        item(nil, para("http://example/"))))
-
-    assert_equal expected, doc
-  end
-
-  def test_parse_list_bullet_continue
-    doc = parse <<-MD
-* one
-
-* two
-    MD
-
-    expected = doc(
-      list(:BULLET,
-        item(nil, para("one")),
-        item(nil, para("two"))))
-
-    assert_equal expected, doc
-  end
-
-  def test_parse_list_bullet_multiline
-    doc = parse <<-MD
-* one
-  two
-    MD
-
-    expected = doc(
-      list(:BULLET,
-        item(nil, para("one\n two"))))
-
-    assert_equal expected, doc
-  end
-
-  def test_parse_list_bullet_nest
-    doc = parse <<-MD
-* outer
-    * inner
-    MD
-
-    expected = doc(
-      list(:BULLET,
-        item(nil,
-          para("outer"),
-          list(:BULLET,
-            item(nil,
-              para("inner"))))))
-
-    assert_equal expected, doc
-  end
-
-  def test_parse_list_bullet_nest_loose
-    doc = parse <<-MD
-* outer
-
-    * inner
-    MD
-
-    expected = doc(
-      list(:BULLET,
-        item(nil,
-          para("outer"),
-          list(:BULLET,
-            item(nil, para("inner"))))))
-
-    assert_equal expected, doc
-  end
-
-  def test_parse_list_bullet_nest_continue
-    doc = parse <<-MD
-* outer
-    * inner
-  continue inner
-* outer 2
-    MD
-
-    expected = doc(
-      list(:BULLET,
-        item(nil,
-          para("outer"),
-          list(:BULLET,
-            item(nil,
-              para("inner\n continue inner")))),
-        item(nil,
-          para("outer 2"))))
-
-    assert_equal expected, doc
-  end
-
-  def test_parse_list_number
-    doc = parse <<-MD
-1. one
-1. two
-    MD
-
-    expected = doc(
-      list(:NUMBER,
-        item(nil, para("one")),
-        item(nil, para("two"))))
-
-    assert_equal expected, doc
-  end
-
-  def test_parse_list_number_continue
-    doc = parse <<-MD
-1. one
-
-1. two
-    MD
-
-    expected = doc(
-      list(:NUMBER,
-        item(nil, para("one")),
-        item(nil, para("two"))))
-
-    assert_equal expected, doc
-  end
-
-  def test_parse_note
-    @parser.notes = true
-
-    doc = parse <<-MD
-Some text.[^1]
-
-[^1]: With a footnote
-    MD
-
-    expected = doc(
-      para("Some text.{*1}[rdoc-label:foottext-1:footmark-1]"),
-      @RM::Rule.new(1),
-      para("{^1}[rdoc-label:footmark-1:foottext-1] With a footnote"))
-
-    assert_equal expected, doc
-  end
-
-  def test_parse_note_indent
-    @parser.notes = true
-
-    doc = parse <<-MD
-Some text.[^1]
-
-[^1]: With a footnote
-
-    more
-    MD
-
-    expected = doc(
-      para("Some text.{*1}[rdoc-label:foottext-1:footmark-1]"),
-      rule(1),
-      para("{^1}[rdoc-label:footmark-1:foottext-1] With a footnote\n\nmore"))
-
-    assert_equal expected, doc
-  end
-
-  def test_parse_note_inline
-    @parser.notes = true
-
-    doc = parse <<-MD
-Some text. ^[With a footnote]
-    MD
-
-    expected = doc(
-      para("Some text. {*1}[rdoc-label:foottext-1:footmark-1]"),
-      @RM::Rule.new(1),
-      para("{^1}[rdoc-label:footmark-1:foottext-1] With a footnote"))
-
-    assert_equal expected, doc
-  end
-
-  def test_parse_note_no_notes
-    @parser.notes = false
-
-    assert_raise RDoc::Markdown::ParseError do
-      parse "Some text.[^1]"
-    end
-  end
-
-  def test_parse_note_multiple
-    @parser.notes = true
-
-    doc = parse <<-MD
-Some text[^1]
-with inline notes^[like this]
-and an extra note.[^2]
-
-[^1]: With a footnote
-[^2]: Which should be numbered correctly
-    MD
-
-    expected = doc(
-      para("Some text{*1}[rdoc-label:foottext-1:footmark-1]\n" +
-           "with inline notes{*2}[rdoc-label:foottext-2:footmark-2]\n" +
-           "and an extra note.{*3}[rdoc-label:foottext-3:footmark-3]"),
-
-      rule(1),
-
-      para("{^1}[rdoc-label:footmark-1:foottext-1] With a footnote"),
-      para("{^2}[rdoc-label:footmark-2:foottext-2] like this"),
-      para("{^3}[rdoc-label:footmark-3:foottext-3] " +
-           "Which should be numbered correctly"))
-
-    assert_equal expected, doc
-  end
-
-  def test_parse_paragraph
-    doc = parse "it worked\n"
-
-    expected = doc(para("it worked"))
-
-    assert_equal expected, doc
-  end
-
-  def test_parse_paragraph_break_on_newline
-    @parser.break_on_newline = true
-
-    doc = parse "one\ntwo\n"
-
-    expected = doc(para("one", hard_break, "two"))
-
-    assert_equal expected, doc
-
-    doc = parse "one  \ntwo\nthree\n"
-
-    expected = doc(para("one", hard_break, "two", hard_break, "three"))
-
-    assert_equal expected, doc
-  end
-
-  def test_parse_paragraph_stars
-    doc = parse "it worked ****\n"
-
-    expected = @RM::Document.new(
-      @RM::Paragraph.new("it worked ****"))
-
-    assert_equal expected, doc
-  end
-
-  def test_parse_paragraph_html
-    @parser.html = true
-
-    doc = parse "<address>Links here</address>"
-
-    expected = doc(raw("<address>Links here</address>"))
-
-    assert_equal expected, doc
-  end
-
-  def test_parse_paragraph_html_no_html
-    @parser.html = false
-
-    doc = parse "<address>Links here</address>"
-
-    expected = doc()
-
-    assert_equal expected, doc
-  end
-
-  def test_parse_paragraph_indent_one
-    doc = parse <<-MD
- text
-    MD
-
-    expected = doc(para("text"))
-
-    assert_equal expected, doc
-  end
-
-  def test_parse_paragraph_indent_two
-    doc = parse <<-MD
-  text
-    MD
-
-    expected = doc(para("text"))
-
-    assert_equal expected, doc
-  end
-
-  def test_parse_paragraph_indent_three
-    doc = parse <<-MD
-   text
-    MD
-
-    expected = doc(para("text"))
-
-    assert_equal expected, doc
-  end
-
-  def test_parse_paragraph_multiline
-    doc = parse "one\ntwo"
-
-    expected = doc(para("one\ntwo"))
-
-    assert_equal expected, doc
-  end
-
-  def test_parse_paragraph_two
-    doc = parse "one\n\ntwo"
-
-    expected = @RM::Document.new(
-      @RM::Paragraph.new("one"),
-      @RM::Paragraph.new("two"))
-
-    assert_equal expected, doc
-  end
-
-  def test_parse_plain
-    doc = parse "it worked"
-
-    expected = @RM::Document.new(
-      @RM::Paragraph.new("it worked"))
-
-    assert_equal expected, doc
-  end
-
-  def test_parse_reference_link_embedded_bracket
-    doc = parse "With [embedded [brackets]] [b].\n\n[b]: /url/\n"
-
-    expected =
-      doc(
-        para("With {embedded [brackets]}[/url/]."))
-
-    assert_equal expected, doc
-  end
-
-  def test_parse_rule_dash
-    doc = parse "- - -\n\n"
-
-    expected = @RM::Document.new(@RM::Rule.new(1))
-
-    assert_equal expected, doc
-  end
-
-  def test_parse_rule_underscore
-    doc = parse "_ _ _\n\n"
-
-    expected = @RM::Document.new(@RM::Rule.new(1))
-
-    assert_equal expected, doc
-  end
-
-  def test_parse_rule_star
-    doc = parse "* * *\n\n"
-
-    expected = @RM::Document.new(@RM::Rule.new(1))
-
-    assert_equal expected, doc
-  end
-
-  def test_parse_strong_star
-    doc = parse "it **works**\n"
-
-    expected = @RM::Document.new(
-      @RM::Paragraph.new("it *works*"))
-
-    assert_equal expected, doc
-  end
-
-  def test_parse_strong_underscore
-    doc = parse "it __works__\n"
-
-    expected = @RM::Document.new(
-      @RM::Paragraph.new("it *works*"))
-
-    assert_equal expected, doc
-  end
-
-  def test_parse_strong_emphasis_star
-    doc = parse "it ***works***\n"
-
-    expected = @RM::Document.new(
-      @RM::Paragraph.new("it <b>_works_</b>"))
-
-    assert_equal expected, doc
-  end
-
-  def test_parse_strong_emphasis_underscore
-    doc = parse "it ___works___\n"
-
-    expected = @RM::Document.new(
-      @RM::Paragraph.new("it <b>_works_</b>"))
-
-    assert_equal expected, doc
-  end
-
-  def test_parse_strike_tilde
-    doc = parse "it ~~works~~\n"
-
-    expected = @RM::Document.new(
-      @RM::Paragraph.new("it ~works~"))
-
-    assert_equal expected, doc
-  end
-
-  def test_parse_strike_words_tilde
-    doc = parse "it ~~works fine~~\n"
-
-    expected = @RM::Document.new(
-      @RM::Paragraph.new("it <s>works fine</s>"))
-
-    assert_equal expected, doc
-  end
-
-  def test_parse_strike_tilde_no
-    @parser.strike = false
-
-    doc = parse "it ~~works fine~~\n"
-
-    expected = @RM::Document.new(
-      @RM::Paragraph.new("it ~~works fine~~"))
-
-    assert_equal expected, doc
-  end
-
-  def test_parse_style
-    @parser.css = true
-
-    doc = parse "<style>h1 { color: red }</style>\n"
-
-    expected = doc(
-      @RM::Raw.new("<style>h1 { color: red }</style>"))
-
-    assert_equal expected, doc
-  end
-
-  def test_parse_style_disabled
-    doc = parse "<style>h1 { color: red }</style>\n"
-
-    expected = doc()
-
-    assert_equal expected, doc
-  end
-
-  def test_parse_verbatim
-    doc = parse <<-MD
-    text
-    MD
-
-    expected = doc(verb("text\n"))
-
-    assert_equal expected, doc
-  end
-
-  def test_parse_verbatim_eof
-    doc = parse "    text"
-
-    expected = doc(verb("text\n"))
-
-    assert_equal expected, doc
-  end
-
-  def test_strong
-    assert_equal '*word*',            @parser.strong('word')
-    assert_equal '<b>two words</b>',  @parser.strong('two words')
-    assert_equal '<b>_emphasis_</b>', @parser.strong('_emphasis_')
-  end
-
-  def test_code_fence_with_unintended_array
-    doc = parse '```<ruby>```'
-
-    expected = doc(verb('<ruby>'))
-
-    assert_equal expected, doc
-  end
-
-  def test_gfm_table
-    doc = parse <<~MD
-    |      |                 |compare-ruby|built-ruby|
-    |------|:----------------|-----------:|---------:|
-    |test  | 1               |     11.618M|   10.757M|
-    |      |                 |       1.08x|         -|
-    |test  | 10              |      1.849M|    1.723M|
-    |      |                 |       1.07x|         -|
-    MD
-
-    head = ["", "", "compare-ruby", "built-ruby"]
-    align = [nil, :left, :right, :right]
-    body = [
-      ["test", "1", "11.618M", "10.757M"],
-      ["", "", "1.08x", "-"],
-      ["test", "10", "1.849M", "1.723M"],
-      ["", "", "1.07x", "-"],
-    ]
-    expected = doc(@RM::Table.new(head, align, body))
-
-    assert_equal expected, doc
-  end
-
-  def test_gfm_table_2
-    doc = parse <<~'MD'
-    | Cmd | Returns | Meaning
-    ----- | :-----: | -------
-    |"b"  | boolean | True if file1 is a block device
-    "c"   | boolean | True if file1 is a character device
-    |"\|" | boolean | escaped bar \| test
-    MD
-
-    head = %w[Cmd Returns Meaning]
-    align = [nil, :center, nil]
-    body = [
-      ['"b"', 'boolean', 'True if file1 is a block device'],
-      ['"c"', 'boolean', 'True if file1 is a character device'],
-      ['"|"', 'boolean', 'escaped bar | test'],
-    ]
-    expected = doc(@RM::Table.new(head, align, body))
-
-    assert_equal expected, doc
-  end
-
-  def parse text
-    @parser.parse text
-  end
-
-end
diff --git a/test/rdoc/test_rdoc_markdown_test.rb b/test/rdoc/test_rdoc_markdown_test.rb
deleted file mode 100644
index d4f894c9246ee6..00000000000000
--- a/test/rdoc/test_rdoc_markdown_test.rb
+++ /dev/null
@@ -1,1883 +0,0 @@
-# frozen_string_literal: true
-require_relative 'helper'
-require 'pp'
-
-require_relative '../../lib/rdoc'
-require_relative '../../lib/rdoc/markdown'
-
-class TestRDocMarkdownTest < RDoc::TestCase
-
-  MARKDOWN_TEST_PATH = File.expand_path '../MarkdownTest_1.0.3/', __FILE__
-
-  def setup
-    super
-
-    @parser = RDoc::Markdown.new
-  end
-
-  def test_amps_and_angle_encoding
-    input = File.read "#{MARKDOWN_TEST_PATH}/Amps and angle encoding.text"
-
-    doc = @parser.parse input
-
-    expected =
-      doc(
-        para("AT&T has an ampersand in their name."),
-        para("AT&T is another way to write it."),
-        para("This & that."),
-        para("4 < 5."),
-        para("6 > 5."),
-        para("Here's a {link}[http://example.com/?foo=1&bar=2] with " +
-             "an ampersand in the URL."),
-        para("Here's a link with an amersand in the link text: " +
-             "{AT&T}[http://att.com/]."),
-        para("Here's an inline {link}[/script?foo=1&bar=2]."),
-        para("Here's an inline {link}[/script?foo=1&bar=2]."))
-
-    assert_equal expected, doc
-  end
-
-  def test_auto_links
-    input = File.read "#{MARKDOWN_TEST_PATH}/Auto links.text"
-
-    doc = @parser.parse input
-
-    # TODO verify rdoc auto-links too
-    expected =
-      doc(
-        para("Link: http://example.com/."),
-        para("With an ampersand: http://example.com/?foo=1&bar=2"),
-        list(:BULLET,
-          item(nil, para("In a list?")),
-          item(nil, para("http://example.com/")),
-          item(nil, para("It should."))),
-        block(
-          para("Blockquoted: http://example.com/")),
-        para("Auto-links should not occur here: " +
-             "<code><http://example.com/></code>"),
-        verb("or here: <http://example.com/>\n"))
-
-    assert_equal expected, doc
-  end
-
-  def test_backslash_escapes
-    input = File.read "#{MARKDOWN_TEST_PATH}/Backslash escapes.text"
-
-    doc = @parser.parse input
-
-    expected =
-      doc(
-        para("These should all get escaped:"),
-
-        para("Backslash: \\"),
-        para("Backtick: `"),
-        para("Asterisk: *"),
-        para("Underscore: _"),
-        para("Left brace: {"),
-        para("Right brace: }"),
-        para("Left bracket: ["),
-        para("Right bracket: ]"),
-        para("Left paren: ("),
-        para("Right paren: )"),
-        para("Greater-than: >"),
-        para("Hash: #"),
-        para("Period: ."),
-        para("Bang: !"),
-        para("Plus: +"),
-        para("Minus: -"),
-
-        para("These should not, because they occur within a code block:"),
-
-        verb("Backslash: \\\\\n",
-             "\n",
-             "Backtick: \\`\n",
-             "\n",
-             "Asterisk: \\*\n",
-             "\n",
-             "Underscore: \\_\n",
-             "\n",
-             "Left brace: \\{\n",
-             "\n",
-             "Right brace: \\}\n",
-             "\n",
-             "Left bracket: \\[\n",
-             "\n",
-             "Right bracket: \\]\n",
-             "\n",
-             "Left paren: \\(\n",
-             "\n",
-             "Right paren: \\)\n",
-             "\n",
-             "Greater-than: \\>\n",
-             "\n",
-             "Hash: \\#\n",
-             "\n",
-             "Period: \\.\n",
-             "\n",
-             "Bang: \\!\n",
-             "\n",
-             "Plus: \\+\n",
-             "\n",
-             "Minus: \\-\n"),
-
-        para("Nor should these, which occur in code spans:"),
-
-        para("Backslash: <code>\\\\</code>"),
-        para("Backtick: <code>\\`</code>"),
-        para("Asterisk: <code>\\*</code>"),
-        para("Underscore: <code>\\_</code>"),
-        para("Left brace: <code>\\{</code>"),
-        para("Right brace: <code>\\}</code>"),
-        para("Left bracket: <code>\\[</code>"),
-        para("Right bracket: <code>\\]</code>"),
-        para("Left paren: <code>\\(</code>"),
-        para("Right paren: <code>\\)</code>"),
-        para("Greater-than: <code>\\></code>"),
-        para("Hash: <code>\\#</code>"),
-        para("Period: <code>\\.</code>"),
-        para("Bang: <code>\\!</code>"),
-        para("Plus: <code>\\+</code>"),
-        para("Minus: <code>\\-</code>"),
-
-        para("These should get escaped, even though they're matching pairs for\n" +
-             "other Markdown constructs:"),
-
-        para("\*asterisks\*"),
-        para("\_underscores\_"),
-        para("`backticks`"),
-
-        para("This is a code span with a literal backslash-backtick " +
-             "sequence: <code>\\`</code>"),
-
-        para("This is a tag with unescaped backticks " +
-             "<span attr='`ticks`'>bar</span>."),
-
-        para("This is a tag with backslashes " +
-             "<span attr='\\\\backslashes\\\\'>bar</span>."))
-
-    assert_equal expected, doc
-  end
-
-  def test_blockquotes_with_code_blocks
-    input = File.read "#{MARKDOWN_TEST_PATH}/Blockquotes with code blocks.text"
-
-    doc = @parser.parse input
-
-    expected =
-      doc(
-        block(
-          para("Example:"),
-          verb("sub status {\n",
-               "    print \"working\";\n",
-               "}\n"),
-          para("Or:"),
-          verb("sub status {\n",
-               "    return \"working\";\n",
-               "}\n")))
-
-    assert_equal expected, doc
-  end
-
-  def test_code_blocks
-    input = File.read "#{MARKDOWN_TEST_PATH}/Code Blocks.text"
-
-    doc = @parser.parse input
-
-    expected =
-      doc(
-        verb("code block on the first line\n"),
-        para("Regular text."),
-
-        verb("code block indented by spaces\n"),
-        para("Regular text."),
-
-        verb("the lines in this block  \n",
-             "all contain trailing spaces  \n"),
-        para("Regular Text."),
-
-        verb("code block on the last line\n"))
-
-    assert_equal expected, doc
-  end
-
-  def test_code_spans
-    input = File.read "#{MARKDOWN_TEST_PATH}/Code Spans.text"
-
-    doc = @parser.parse input
-
-    expected = doc(
-      para("<code><test a=\"</code> content of attribute <code>\"></code>"),
-      para("Fix for backticks within HTML tag: " +
-           "<span attr='`ticks`'>like this</span>"),
-      para("Here's how you put <code>`backticks`</code> in a code span."))
-
-    assert_equal expected, doc
-  end
-
-  def test_hard_wrapped_paragraphs_with_list_like_lines
-    input = File.read "#{MARKDOWN_TEST_PATH}/Hard-wrapped paragraphs with list-like lines.text"
-
-    doc = @parser.parse input
-
-    expected =
-      doc(
-        para("In Markdown 1.0.0 and earlier. Version\n" +
-             "8. This line turns into a list item.\n"   +
-             "Because a hard-wrapped line in the\n"     +
-             "middle of a paragraph looked like a\n"    +
-             "list item."),
-        para("Here's one with a bullet.\n" +
-             "* criminey."))
-
-    assert_equal expected, doc
-  end
-
-  def test_horizontal_rules
-    input = File.read "#{MARKDOWN_TEST_PATH}/Horizontal rules.text"
-
-    doc = @parser.parse input
-
-    expected =
-      doc(
-        para("Dashes:"),
-
-        rule(1),
-        rule(1),
-        rule(1),
-        rule(1),
-        verb("---\n"),
-
-        rule(1),
-        rule(1),
-        rule(1),
-        rule(1),
-        verb("- - -\n"),
-
-        para("Asterisks:"),
-
-        rule(1),
-        rule(1),
-        rule(1),
-        rule(1),
-        verb("***\n"),
-
-        rule(1),
-        rule(1),
-        rule(1),
-        rule(1),
-        verb("* * *\n"),
-
-        para("Underscores:"),
-
-        rule(1),
-        rule(1),
-        rule(1),
-        rule(1),
-        verb("___\n"),
-
-        rule(1),
-        rule(1),
-        rule(1),
-        rule(1),
-        verb("_ _ _\n"))
-
-    assert_equal expected, doc
-  end
-
-  def test_inline_html_advanced
-    input = File.read "#{MARKDOWN_TEST_PATH}/Inline HTML (Advanced).text"
-
-    @parser.html = true
-
-    doc = @parser.parse input
-
-    expected =
-      doc(
-        para("Simple block on one line:"),
-        raw("<div>foo</div>"),
-        para("And nested without indentation:"),
-        raw(<<-RAW.chomp))
-<div>
-<div>
-<div>
-foo
-</div>
-<div style=">"/>
-</div>
-<div>bar</div>
-</div>
-        RAW
-
-    assert_equal expected, doc
-  end
-
-  def test_inline_html_simple
-    input = File.read "#{MARKDOWN_TEST_PATH}/Inline HTML (Simple).text"
-
-    @parser.html = true
-
-    doc = @parser.parse input
-
-    expected =
-      doc(
-       para("Here's a simple block:"),
-       raw("<div>\n\tfoo\n</div>"),
-
-       para("This should be a code block, though:"),
-       verb("<div>\n",
-            "\tfoo\n",
-            "</div>\n"),
-
-       para("As should this:"),
-       verb("<div>foo</div>\n"),
-
-       para("Now, nested:"),
-       raw("<div>\n\t<div>\n\t\t<div>\n\t\t\tfoo\n" +
-           "\t\t</div>\n\t</div>\n</div>"),
-
-       para("This should just be an HTML comment:"),
-       raw("<!-- Comment -->"),
-
-       para("Multiline:"),
-       raw("<!--\nBlah\nBlah\n-->"),
-
-       para("Code block:"),
-       verb("<!-- Comment -->\n"),
-
-       para("Just plain comment, with trailing spaces on the line:"),
-       raw("<!-- foo -->"),
-
-       para("Code:"),
-       verb("<hr />\n"),
-
-       para("Hr's:"),
-       raw("<hr>"),
-       raw("<hr/>"),
-       raw("<hr />"),
-
-       raw("<hr>"),
-       raw("<hr/>"),
-       raw("<hr />"),
-
-       raw("<hr class=\"foo\" id=\"bar\" />"),
-       raw("<hr class=\"foo\" id=\"bar\"/>"),
-       raw("<hr class=\"foo\" id=\"bar\" >"))
-
-    assert_equal expected, doc
-  end
-
-  def test_inline_html_comments
-    input = File.read "#{MARKDOWN_TEST_PATH}/Inline HTML comments.text"
-
-    doc = @parser.parse input
-
-    expected =
-      doc(
-        para("Paragraph one."),
-
-        raw("<!-- This is a simple comment -->"),
-
-        raw("<!--\n\tThis is another comment.\n-->"),
-
-        para("Paragraph two."),
-
-        raw("<!-- one comment block -- -- with two comments -->"),
-
-        para("The end."))
-
-    assert_equal expected, doc
-  end
-
-  def test_links_inline_style
-    input = File.read "#{MARKDOWN_TEST_PATH}/Links, inline style.text"
-
-    doc = @parser.parse input
-
-    expected =
-      doc(
-        para("Just a {URL}[/url/]."),
-        para("{URL and title}[/url/]."),
-        para("{URL and title}[/url/]."),
-        para("{URL and title}[/url/]."),
-        para("{URL and title}[/url/]."),
-        para("{Empty}[]."))
-
-    assert_equal expected, doc
-  end
-
-  def test_links_reference_style
-    input = File.read "#{MARKDOWN_TEST_PATH}/Links, reference style.text"
-
-    doc = @parser.parse input
-
-    expected =
-      doc(
-        para("Foo {bar}[/url/]."),
-        para("Foo {bar}[/url/]."),
-        para("Foo {bar}[/url/]."),
-
-        para("With {embedded [brackets]}[/url/]."),
-
-        para("Indented {once}[/url]."),
-        para("Indented {twice}[/url]."),
-        para("Indented {thrice}[/url]."),
-        para("Indented [four][] times."),
-
-        verb("[four]: /url\n"),
-
-        rule(1),
-
-        para("{this}[foo] should work"),
-        para("So should {this}[foo]."),
-        para("And {this}[foo]."),
-        para("And {this}[foo]."),
-        para("And {this}[foo]."),
-
-        para("But not [that] []."),
-        para("Nor [that][]."),
-        para("Nor [that]."),
-
-        para("[Something in brackets like {this}[foo] should work]"),
-        para("[Same with {this}[foo].]"),
-
-        para("In this case, {this}[/somethingelse/] points to something else."),
-        para("Backslashing should suppress [this] and [this]."),
-
-        rule(1),
-
-        para("Here's one where the {link breaks}[/url/] across lines."),
-        para("Here's another where the {link breaks}[/url/] across lines, " +
-             "but with a line-ending space."))
-
-    assert_equal expected, doc
-  end
-
-  def test_links_shortcut_references
-    input = File.read "#{MARKDOWN_TEST_PATH}/Links, shortcut references.text"
-
-    doc = @parser.parse input
-
-    expected =
-      doc(
-        para("This is the {simple case}[/simple]."),
-        para("This one has a {line break}[/foo]."),
-        para("This one has a {line break}[/foo] with a line-ending space."),
-        para("{this}[/that] and the {other}[/other]"))
-
-    assert_equal expected, doc
-  end
-
-  def test_literal_quotes_in_titles
-    input = File.read "#{MARKDOWN_TEST_PATH}/Literal quotes in titles.text"
-
-    doc = @parser.parse input
-
-    # TODO support title attribute
-    expected =
-      doc(
-        para("Foo {bar}[/url/]."),
-        para("Foo {bar}[/url/]."))
-
-    assert_equal expected, doc
-  end
-
-  def test_markdown_documentation_basics
-    input = File.read "#{MARKDOWN_TEST_PATH}/Markdown Documentation - Basics.text"
-
-    doc = @parser.parse input
-
-    expected =
-      doc(
-        head(1, "Markdown: Basics"),
-
-        raw(<<-RAW.chomp),
-<ul id="ProjectSubmenu">
-    <li><a href="/projects/markdown/" title="Markdown Project Page">Main</a></li>
-    <li><a class="selected" title="Markdown Basics">Basics</a></li>
-    <li><a href="/projects/markdown/syntax" title="Markdown Syntax Documentation">Syntax</a></li>
-    <li><a href="/projects/markdown/license" title="Pricing and License Information">License</a></li>
-    <li><a href="/projects/markdown/dingus" title="Online Markdown Web Form">Dingus</a></li>
-</ul>
-        RAW
-
-        head(2, "Getting the Gist of Markdown's Formatting Syntax"),
-
-        para("This page offers a brief overview of what it's like to use Markdown.\n" +
-             "The {syntax page}[/projects/markdown/syntax] provides complete, detailed documentation for\n" +
-             "every feature, but Markdown should be very easy to pick up simply by\n" +
-             "looking at a few examples of it in action. The examples on this page\n" +
-             "are written in a before/after style, showing example syntax and the\n" +
-             "HTML output produced by Markdown."),
-
-        para("It's also helpful to simply try Markdown out; the {Dingus}[/projects/markdown/dingus] is a\n" +
-             "web application that allows you type your own Markdown-formatted text\n" +
-             "and translate it to XHTML."),
-
-        para("<b>Note:</b> This document is itself written using Markdown; you\n" +
-             "can {see the source for it by adding '.text' to the URL}[/projects/markdown/basics.text]."),
-
-        head(2, "Paragraphs, Headers, Blockquotes"),
-
-        para("A paragraph is simply one or more consecutive lines of text, separated\n" +
-             "by one or more blank lines. (A blank line is any line that looks like a\n" +
-             "blank line -- a line containing nothing spaces or tabs is considered\n" +
-             "blank.) Normal paragraphs should not be intended with spaces or tabs."),
-
-        para("Markdown offers two styles of headers: _Setext_ and _atx_.\n" +
-             "Setext-style headers for <code><h1></code> and <code><h2></code> are created by\n" +
-             "\"underlining\" with equal signs (<code>=</code>) and hyphens (<code>-</code>), respectively.\n" +
-             "To create an atx-style header, you put 1-6 hash marks (<code>#</code>) at the\n" +
-             "beginning of the line -- the number of hashes equals the resulting\n" +
-             "HTML header level."),
-
-        para("Blockquotes are indicated using email-style '<code>></code>' angle brackets."),
-
-        para("Markdown:"),
-
-        verb("A First Level Header\n",
-             "====================\n",
-             "\n",
-             "A Second Level Header\n",
-             "---------------------\n",
-             "\n",
-             "Now is the time for all good men to come to\n",
-             "the aid of their country. This is just a\n",
-             "regular paragraph.\n",
-             "\n",
-             "The quick brown fox jumped over the lazy\n",
-             "dog's back.\n",
-             "\n",
-             "### Header 3\n",
-             "\n",
-             "> This is a blockquote.\n",
-             "> \n",
-             "> This is the second paragraph in the blockquote.\n",
-             ">\n",
-             "> ## This is an H2 in a blockquote\n"),
-
-        para("Output:"),
-
-        verb("<h1>A First Level Header</h1>\n",
-             "\n",
-             "<h2>A Second Level Header</h2>\n",
-             "\n",
-             "<p>Now is the time for all good men to come to\n",
-             "the aid of their country. This is just a\n",
-             "regular paragraph.</p>\n",
-             "\n",
-             "<p>The quick brown fox jumped over the lazy\n",
-             "dog's back.</p>\n",
-             "\n",
-             "<h3>Header 3</h3>\n",
-             "\n",
-             "<blockquote>\n",
-             "    <p>This is a blockquote.</p>\n",
-             "\n",
-             "    <p>This is the second paragraph in the blockquote.</p>\n",
-             "\n",
-             "    <h2>This is an H2 in a blockquote</h2>\n",
-             "</blockquote>\n"),
-
-        head(3, "Phrase Emphasis"),
-        para("Markdown uses asterisks and underscores to indicate spans of emphasis."),
-
-        para("Markdown:"),
-
-        verb("Some of these words *are emphasized*.\n",
-             "Some of these words _are emphasized also_.\n",
-             "\n",
-             "Use two asterisks for **strong emphasis**.\n",
-             "Or, if you prefer, __use two underscores instead__.\n"),
-
-        para("Output:"),
-
-        verb("<p>Some of these words <em>are emphasized</em>.\n",
-             "Some of these words <em>are emphasized also</em>.</p>\n",
-             "\n",
-             "<p>Use two asterisks for <strong>strong emphasis</strong>.\n",
-             "Or, if you prefer, <strong>use two underscores instead</strong>.</p>\n"),
-
-        head(2, "Lists"),
-
-        para("Unordered (bulleted) lists use asterisks, pluses, and hyphens (<code>*</code>,\n" +
-             "<code>+</code>, and <code>-</code>) as list markers. These three markers are\n" +
-             "interchangeable; this:"),
-
-        verb("*   Candy.\n",
-             "*   Gum.\n",
-             "*   Booze.\n"),
-
-        para("this:"),
-
-        verb("+   Candy.\n",
-             "+   Gum.\n",
-             "+   Booze.\n"),
-
-        para("and this:"),
-
-        verb("-   Candy.\n",
-             "-   Gum.\n",
-             "-   Booze.\n"),
-
-        para("all produce the same output:"),
-
-        verb("<ul>\n",
-             "<li>Candy.</li>\n",
-             "<li>Gum.</li>\n",
-             "<li>Booze.</li>\n",
-             "</ul>\n"),
-
-        para("Ordered (numbered) lists use regular numbers, followed by periods, as\n" +
-             "list markers:"),
-
-        verb("1.  Red\n",
-             "2.  Green\n",
-             "3.  Blue\n"),
-
-        para("Output:"),
-
-        verb("<ol>\n",
-             "<li>Red</li>\n",
-             "<li>Green</li>\n",
-             "<li>Blue</li>\n",
-             "</ol>\n"),
-
-        para("If you put blank lines between items, you'll get <code><p></code> tags for the\n" +
-             "list item text. You can create multi-paragraph list items by indenting\n" +
-             "the paragraphs by 4 spaces or 1 tab:"),
-
-        verb("*   A list item.\n",
-             "\n",
-             "    With multiple paragraphs.\n",
-             "\n",
-             "*   Another item in the list.\n"),
-
-        para("Output:"),
-
-        verb("<ul>\n",
-             "<li><p>A list item.</p>\n",
-             "<p>With multiple paragraphs.</p></li>\n",
-             "<li><p>Another item in the list.</p></li>\n",
-             "</ul>\n"),
-
-        head(3, "Links"),
-
-        para("Markdown supports two styles for creating links: _inline_ and\n" +
-             "_reference_. With both styles, you use square brackets to delimit the\n" +
-             "text you want to turn into a link."),
-
-        para("Inline-style links use parentheses immediately after the link text.\n" +
-             "For example:"),
-
-        verb("This is an [example link](http://example.com/).\n"),
-
-        para("Output:"),
-
-        verb("<p>This is an <a href=\"http://example.com/\">\n",
-             "example link</a>.</p>\n"),
-
-        para("Optionally, you may include a title attribute in the parentheses:"),
-
-        verb("This is an [example link](http://example.com/ \"With a Title\").\n"),
-
-        para("Output:"),
-
-        verb("<p>This is an <a href=\"http://example.com/\" title=\"With a Title\">\n",
-             "example link</a>.</p>\n"),
-
-        para("Reference-style links allow you to refer to your links by names, which\n" +
-             "you define elsewhere in your document:"),
-
-        verb("I get 10 times more traffic from [Google][1] than from\n",
-             "[Yahoo][2] or [MSN][3].\n",
-             "\n",
-             "[1]: http://google.com/        \"Google\"\n",
-             "[2]: http://search.yahoo.com/  \"Yahoo Search\"\n",
-             "[3]: http://search.msn.com/    \"MSN Search\"\n"),
-
-        para("Output:"),
-
-        verb("<p>I get 10 times more traffic from <a href=\"http://google.com/\"\n",
-             "title=\"Google\">Google</a> than from <a href=\"http://search.yahoo.com/\"\n",
-             "title=\"Yahoo Search\">Yahoo</a> or <a href=\"http://search.msn.com/\"\n",
-             "title=\"MSN Search\">MSN</a>.</p>\n"),
-
-        para("The title attribute is optional. Link names may contain letters,\n" +
-             "numbers and spaces, but are _not_ case sensitive:"),
-
-        verb("I start my morning with a cup of coffee and\n",
-             "[The New York Times][NY Times].\n",
-             "\n",
-             "[ny times]: http://www.nytimes.com/\n"),
-
-        para("Output:"),
-
-        verb("<p>I start my morning with a cup of coffee and\n",
-             "<a href=\"http://www.nytimes.com/\">The New York Times</a>.</p>\n"),
-
-        head(3, "Images"),
-
-        para("Image syntax is very much like link syntax."),
-
-        para("Inline (titles are optional):"),
-
-        verb("![alt text](/path/to/img.jpg \"Title\")\n"),
-
-        para("Reference-style:"),
-
-        verb("![alt text][id]\n",
-             "\n",
-             "[id]: /path/to/img.jpg \"Title\"\n"),
-
-        para("Both of the above examples produce the same output:"),
-
-        verb("<img src=\"/path/to/img.jpg\" alt=\"alt text\" title=\"Title\" />\n"),
-
-        head(3, "Code"),
-
-        para("In a regular paragraph, you can create code span by wrapping text in\n" +
-             "backtick quotes. Any ampersands (<code>&</code>) and angle brackets (<code><</code> or\n" +
-             "<code>></code>) will automatically be translated into HTML entities. This makes\n" +
-             "it easy to use Markdown to write about HTML example code:"),
-
-        verb(
-             "I strongly recommend against using any `<blink>` tags.\n",
-             "\n",
-             "I wish SmartyPants used named entities like `&mdash;`\n",
-             "instead of decimal-encoded entities like `&#8212;`.\n"),
-
-        para("Output:"),
-
-        verb("<p>I strongly recommend against using any\n",
-             "<code>&lt;blink&gt;</code> tags.</p>\n",
-             "\n",
-             "<p>I wish SmartyPants used named entities like\n",
-             "<code>&amp;mdash;</code> instead of decimal-encoded\n",
-             "entities like <code>&amp;#8212;</code>.</p>\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, <code>&</code>, <code><</code>,\n" +
-             "and <code>></code> characters will be escaped automatically."),
-
-        para("Markdown:"),
-
-        verb("If you want your page to validate under XHTML 1.0 Strict,\n",
-             "you've got to put paragraph tags in your blockquotes:\n",
-             "\n",
-             "    <blockquote>\n",
-             "        <p>For example.</p>\n",
-             "    </blockquote>\n"),
-
-        para("Output:"),
-
-        verb("<p>If you want your page to validate under XHTML 1.0 Strict,\n",
-             "you've got to put paragraph tags in your blockquotes:</p>\n",
-             "\n",
-             "<pre><code>&lt;blockquote&gt;\n",
-             "    &lt;p&gt;For example.&lt;/p&gt;\n",
-             "&lt;/blockquote&gt;\n",
-             "</code></pre>\n"))
-
-    assert_equal expected, doc
-  end
-
-  def test_markdown_documentation_syntax
-    input = File.read "#{MARKDOWN_TEST_PATH}/Markdown Documentation - Syntax.text"
-
-    doc = @parser.parse input
-
-    expected =
-      doc(
-        head(1, "Markdown: Syntax"),
-
-        raw(<<-RAW.chomp),
-<ul id="ProjectSubmenu">
-    <li><a href="/projects/markdown/" title="Markdown Project Page">Main</a></li>
-    <li><a href="/projects/markdown/basics" title="Markdown Basics">Basics</a></li>
-    <li><a class="selected" title="Markdown Syntax Documentation">Syntax</a></li>
-    <li><a href="/projects/markdown/license" title="Pricing and License Information">License</a></li>
-    <li><a href="/projects/markdown/dingus" title="Online Markdown Web Form">Dingus</a></li>
-</ul>
-        RAW
-
-        list(:BULLET,
-          item(nil,
-            para("{Overview}[#overview]"),
-            list(:BULLET,
-              item(nil,
-                para("{Philosophy}[#philosophy]")),
-              item(nil,
-                para("{Inline HTML}[#html]")),
-              item(nil,
-                para("{Automatic Escaping for Special Characters}[#autoescape]")))),
-          item(nil,
-            para("{Block Elements}[#block]"),
-            list(:BULLET,
-              item(nil,
-                para("{Paragraphs and Line Breaks}[#p]")),
-              item(nil,
-                para("{Headers}[#header]")),
-              item(nil,
-                para("{Blockquotes}[#blockquote]")),
-              item(nil,
-                para("{Lists}[#list]")),
-              item(nil,
-                para("{Code Blocks}[#precode]")),
-              item(nil,
-                para("{Horizontal Rules}[#hr]")))),
-          item(nil,
-            para("{Span Elements}[#span]"),
-            list(:BULLET,
-              item(nil,
-                para("{Links}[#link]")),
-              item(nil,
-                para("{Emphasis}[#em]")),
-              item(nil,
-                para("{Code}[#code]")),
-              item(nil,
-                para("{Images}[#img]")))),
-          item(nil,
-            para("{Miscellaneous}[#misc]"),
-            list(:BULLET,
-              item(nil,
-                para("{Backslash Escapes}[#backslash]")),
-              item(nil,
-                para("{Automatic Links}[#autolink]"))))),
-
-        para("<b>Note:</b> This document is itself written using Markdown; you\n" +
-             "can {see the source for it by adding '.text' to the URL}[/projects/markdown/syntax.text]."),
-
-        rule(1),
-
-        raw("<h2 id=\"overview\">Overview</h2>"),
-
-        raw("<h3 id=\"philosophy\">Philosophy</h3>"),
-
-        para("Markdown is intended to be as easy-to-read and easy-to-write as is feasible."),
-
-        para("Readability, however, is emphasized above all else. A Markdown-formatted\n" +
-             "document should be publishable as-is, as plain text, without looking\n" +
-             "like it's been marked up with tags or formatting instructions. While\n" +
-             "Markdown's syntax has been influenced by several existing text-to-HTML\n" +
-             "filters -- including {Setext}[http://docutils.sourceforge.net/mirror/setext.html], {atx}[http://www.aaronsw.com/2002/atx/], {Textile}[http://textism.com/tools/textile/], {reStructuredText}[http://docutils.sourceforge.net/rst.html],\n" +
-             "{Grutatext}[http://www.triptico.com/software/grutatxt.html], and {EtText}[http://ettext.taint.org/doc/] -- the single biggest source of\n" +
-             "inspiration for Markdown's syntax is the format of plain text email."),
-
-        para("To this end, Markdown's syntax is comprised entirely of punctuation\n" +
-             "characters, which punctuation characters have been carefully chosen so\n" +
-             "as to look like what they mean. E.g., asterisks around a word actually\n" +
-             "look like \*emphasis\*. Markdown lists look like, well, lists. Even\n" +
-             "blockquotes look like quoted passages of text, assuming you've ever\n" +
-             "used email."),
-
-        raw("<h3 id=\"html\">Inline HTML</h3>"),
-
-        para("Markdown's syntax is intended for one purpose: to be used as a\n" +
-             "format for _writing_ for the web."),
-
-        para("Markdown is not a replacement for HTML, or even close to it. Its\n" +
-             "syntax is very small, corresponding only to a very small subset of\n" +
-             "HTML tags. The idea is _not_ to create a syntax that makes it easier\n" +
-             "to insert HTML tags. In my opinion, HTML tags are already easy to\n" +
-             "insert. The idea for Markdown is to make it easy to read, write, and\n" +
-             "edit prose. HTML is a _publishing_ format; Markdown is a _writing_\n" +
-             "format. Thus, Markdown's formatting syntax only addresses issues that\n" +
-             "can be conveyed in plain text."),
-
-        para("For any markup that is not covered by Markdown's syntax, you simply\n" +
-             "use HTML itself. There's no need to preface it or delimit it to\n" +
-             "indicate that you're switching from Markdown to HTML; you just use\n" +
-             "the tags."),
-
-        para("The only restrictions are that block-level HTML elements -- e.g. <code><div></code>,\n" +
-             "<code><table></code>, <code><pre></code>, <code><p></code>, etc. -- must be separated from surrounding\n" +
-             "content by blank lines, and the start and end tags of the block should\n" +
-             "not be indented with tabs or spaces. Markdown is smart enough not\n" +
-             "to add extra (unwanted) <code><p></code> tags around HTML block-level tags."),
-
-        para("For example, to add an HTML table to a Markdown article:"),
-
-        verb("This is a regular paragraph.\n",
-             "\n",
-             "<table>\n",
-             "    <tr>\n",
-             "        <td>Foo</td>\n",
-             "    </tr>\n",
-             "</table>\n",
-             "\n",
-             "This is another regular paragraph.\n"),
-
-        para("Note that Markdown formatting syntax is not processed within block-level\n" +
-             "HTML tags. E.g., you can't use Markdown-style <code>*emphasis*</code> inside an\n" +
-             "HTML block."),
-
-        para("Span-level HTML tags -- e.g. <code><span></code>, <code><cite></code>, or <code><del></code> -- can be\n" +
-             "used anywhere in a Markdown paragraph, list item, or header. If you\n" +
-             "want, you can even use HTML tags instead of Markdown formatting; e.g. if\n" +
-             "you'd prefer to use HTML <code><a></code> or <code><img></code> tags instead of Markdown's\n" +
-             "link or image syntax, go right ahead."),
-
-        para("Unlike block-level HTML tags, Markdown syntax _is_ processed within\n" +
-             "span-level tags."),
-
-        raw("<h3 id=\"autoescape\">Automatic Escaping for Special Characters</h3>"),
-
-        para("In HTML, there are two characters that demand special treatment: <code><</code>\n" +
-             "and <code>&</code>. Left angle brackets are used to start tags; ampersands are\n" +
-             "used to denote HTML entities. If you want to use them as literal\n" +
-             "characters, you must escape them as entities, e.g. <code>&lt;</code>, and\n" +
-             "<code>&amp;</code>."),
-
-        para("Ampersands in particular are bedeviling for web writers. If you want to\n" +
-             "write about 'AT&T', you need to write '<code>AT&amp;T</code>'. You even need to\n" +
-             "escape ampersands within URLs. Thus, if you want to link to:"),
-
-        verb("http://images.google.com/images?num=30&q=larry+bird\n"),
-
-        para("you need to encode the URL as:"),
-
-        verb("http://images.google.com/images?num=30&amp;q=larry+bird\n"),
-
-        para("in your anchor tag <code>href</code> attribute. Needless to say, this is easy to\n" +
-             "forget, and is probably the single most common source of HTML validation\n" +
-             "errors in otherwise well-marked-up web sites."),
-
-        para("Markdown allows you to use these characters naturally, taking care of\n" +
-             "all the necessary escaping for you. If you use an ampersand as part of\n" +
-             "an HTML entity, it remains unchanged; otherwise it will be translated\n" +
-             "into <code>&amp;</code>."),
-
-        para("So, if you want to include a copyright symbol in your article, you can write:"),
-
-        verb("&copy;\n"),
-
-        para("and Markdown will leave it alone. But if you write:"),
-
-        verb("AT&T\n"),
-
-        para("Markdown will translate it to:"),
-
-        verb("AT&amp;T\n"),
-
-        para("Similarly, because Markdown supports {inline HTML}[#html], if you use\n" +
-             "angle brackets as delimiters for HTML tags, Markdown will treat them as\n" +
-             "such. But if you write:"),
-
-        verb("4 < 5\n"),
-
-        para("Markdown will translate it to:"),
-
-        verb("4 &lt; 5\n"),
-
-        para("However, inside Markdown code spans and blocks, angle brackets and\n" +
-             "ampersands are _always_ encoded automatically. This makes it easy to use\n" +
-             "Markdown to write about HTML code. (As opposed to raw HTML, which is a\n" +
-             "terrible format for writing about HTML syntax, because every single <code><</code>\n" +
-             "and <code>&</code> in your example code needs to be escaped.)"),
-
-        rule(1),
-
-        raw("<h2 id=\"block\">Block Elements</h2>"),
-
-        raw("<h3 id=\"p\">Paragraphs and Line Breaks</h3>"),
-
-        para("A paragraph is simply one or more consecutive lines of text, separated\n" +
-             "by one or more blank lines. (A blank line is any line that looks like a\n" +
-             "blank line -- a line containing nothing but spaces or tabs is considered\n" +
-             "blank.) Normal paragraphs should not be intended with spaces or tabs."),
-
-        para("The implication of the \"one or more consecutive lines of text\" rule is\n" +
-             "that Markdown supports \"hard-wrapped\" text paragraphs. This differs\n" +
-             "significantly from most other text-to-HTML formatters (including Movable\n" +
-             "Type's \"Convert Line Breaks\" option) which translate every line break\n" +
-             "character in a paragraph into a <code><br /></code> tag."),
-
-        para("When you _do_ want to insert a <code><br /></code> break tag using Markdown, you\n" +
-             "end a line with two or more spaces, then type return."),
-
-        para("Yes, this takes a tad more effort to create a <code><br /></code>, but a simplistic\n" +
-             "\"every line break is a <code><br /></code>\" rule wouldn't work for Markdown.\n" +
-             "Markdown's email-style {blockquoting}[#blockquote] and multi-paragraph {list items}[#list]\n" +
-             "work best -- and look better -- when you format them with hard breaks."),
-
-        raw("<h3 id=\"header\">Headers</h3>"),
-
-        para("Markdown supports two styles of headers, {Setext}[http://docutils.sourceforge.net/mirror/setext.html] and {atx}[http://www.aaronsw.com/2002/atx/]."),
-
-        para("Setext-style headers are \"underlined\" using equal signs (for first-level\n" +
-             "headers) and dashes (for second-level headers). For example:"),
-
-        verb("This is an H1\n",
-             "=============\n",
-             "\n",
-             "This is an H2\n",
-             "-------------\n"),
-
-        para("Any number of underlining <code>=</code>'s or <code>-</code>'s will work."),
-
-        para("Atx-style headers use 1-6 hash characters at the start of the line,\n" +
-             "corresponding to header levels 1-6. For example:"),
-
-        verb("# This is an H1\n",
-             "\n",
-             "## This is an H2\n",
-             "\n",
-             "###### This is an H6\n"),
-
-        para("Optionally, you may \"close\" atx-style headers. This is purely\n" +
-             "cosmetic -- you can use this if you think it looks better. The\n" +
-             "closing hashes don't even need to match the number of hashes\n" +
-             "used to open the header. (The number of opening hashes\n" +
-             "determines the header level.) :"),
-
-        verb("# This is an H1 #\n",
-             "\n",
-             "## This is an H2 ##\n",
-             "\n",
-             "### This is an H3 ######\n"),
-
-        raw("<h3 id=\"blockquote\">Blockquotes</h3>"),
-
-        para(
-             "Markdown uses email-style <code>></code> characters for blockquoting. If you're\n" +
-             "familiar with quoting passages of text in an email message, then you\n" +
-             "know how to create a blockquote in Markdown. It looks best if you hard\n" +
-             "wrap the text and put a <code>></code> before every line:"),
-
-        verb("> This is a blockquote with two paragraphs. Lorem ipsum dolor sit amet,\n",
-             "> consectetuer adipiscing elit. Aliquam hendrerit mi posuere lectus.\n",
-             "> Vestibulum enim wisi, viverra nec, fringilla in, laoreet vitae, risus.\n",
-             "> \n",
-             "> Donec sit amet nisl. Aliquam semper ipsum sit amet velit. Suspendisse\n",
-             "> id sem consectetuer libero luctus adipiscing.\n"),
-
-        para("Markdown allows you to be lazy and only put the <code>></code> before the first\n" +
-             "line of a hard-wrapped paragraph:"),
-
-        verb("> This is a blockquote with two paragraphs. Lorem ipsum dolor sit amet,\n",
-             "consectetuer adipiscing elit. Aliquam hendrerit mi posuere lectus.\n",
-             "Vestibulum enim wisi, viverra nec, fringilla in, laoreet vitae, risus.\n",
-             "\n",
-             "> Donec sit amet nisl. Aliquam semper ipsum sit amet velit. Suspendisse\n",
-             "id sem consectetuer libero luctus adipiscing.\n"),
-
-        para("Blockquotes can be nested (i.e. a blockquote-in-a-blockquote) by\n" +
-             "adding additional levels of <code>></code>:"),
-
-        verb("> This is the first level of quoting.\n",
-             ">\n",
-             "> > This is nested blockquote.\n",
-             ">\n",
-             "> Back to the first level.\n"),
-
-        para("Blockquotes can contain other Markdown elements, including headers, lists,\n" +
-             "and code blocks:"),
-
-        verb("> ## This is a header.\n",
-             "> \n",
-             "> 1.   This is the first list item.\n",
-             "> 2.   This is the second list item.\n",
-             "> \n",
-             "> Here's some example code:\n",
-             "> \n",
-             ">     return shell_exec(\"echo $input | $markdown_script\");\n"),
-
-        para("Any decent text editor should make email-style quoting easy. For\n" +
-             "example, with BBEdit, you can make a selection and choose Increase\n" +
-             "Quote Level from the Text menu."),
-
-        raw("<h3 id=\"list\">Lists</h3>"),
-
-        para("Markdown supports ordered (numbered) and unordered (bulleted) lists."),
-
-        para("Unordered lists use asterisks, pluses, and hyphens -- interchangeably\n" +
-             "-- as list markers:"),
-
-        verb("*   Red\n",
-             "*   Green\n",
-             "*   Blue\n"),
-
-        para("is equivalent to:"),
-
-        verb("+   Red\n",
-             "+   Green\n",
-             "+   Blue\n"),
-
-        para("and:"),
-
-        verb("-   Red\n",
-             "-   Green\n",
-             "-   Blue\n"),
-
-        para("Ordered lists use numbers followed by periods:"),
-
-        verb("1.  Bird\n",
-             "2.  McHale\n",
-             "3.  Parish\n"),
-
-        para("It's important to note that the actual numbers you use to mark the\n" +
-             "list have no effect on the HTML output Markdown produces. The HTML\n" +
-             "Markdown produces from the above list is:"),
-
-        verb("<ol>\n",
-             "<li>Bird</li>\n",
-             "<li>McHale</li>\n",
-             "<li>Parish</li>\n",
-             "</ol>\n"),
-
-        para("If you instead wrote the list in Markdown like this:"),
-
-        verb("1.  Bird\n",
-             "1.  McHale\n",
-             "1.  Parish\n"),
-
-        para("or even:"),
-
-        verb("3. Bird\n",
-             "1. McHale\n",
-             "8. Parish\n"),
-
-        para("you'd get the exact same HTML output. The point is, if you want to,\n" +
-             "you can use ordinal numbers in your ordered Markdown lists, so that\n" +
-             "the numbers in your source match the numbers in your published HTML.\n" +
-             "But if you want to be lazy, you don't have to."),
-
-        para("If you do use lazy list numbering, however, you should still start the\n" +
-             "list with the number 1. At some point in the future, Markdown may support\n" +
-             "starting ordered lists at an arbitrary number."),
-
-        para("List markers typically start at the left margin, but may be indented by\n" +
-             "up to three spaces. List markers must be followed by one or more spaces\n" +
-             "or a tab."),
-
-        para("To make lists look nice, you can wrap items with hanging indents:"),
-
-        verb("*   Lorem ipsum dolor sit amet, consectetuer adipiscing elit.\n",
-             "    Aliquam hendrerit mi posuere lectus. Vestibulum enim wisi,\n",
-             "    viverra nec, fringilla in, laoreet vitae, risus.\n",
-             "*   Donec sit amet nisl. Aliquam semper ipsum sit amet velit.\n",
-             "    Suspendisse id sem consectetuer libero luctus adipiscing.\n"),
-
-        para("But if you want to be lazy, you don't have to:"),
-
-        verb("*   Lorem ipsum dolor sit amet, consectetuer adipiscing elit.\n",
-             "Aliquam hendrerit mi posuere lectus. Vestibulum enim wisi,\n",
-             "viverra nec, fringilla in, laoreet vitae, risus.\n",
-             "*   Donec sit amet nisl. Aliquam semper ipsum sit amet velit.\n",
-             "Suspendisse id sem consectetuer libero luctus adipiscing.\n"),
-
-        para("If list items are separated by blank lines, Markdown will wrap the\n" +
-             "items in <code><p></code> tags in the HTML output. For example, this input:"),
-
-        verb("*   Bird\n",
-             "*   Magic\n"),
-
-        para("will turn into:"),
-
-        verb("<ul>\n",
-             "<li>Bird</li>\n",
-             "<li>Magic</li>\n",
-             "</ul>\n"),
-
-        para("But this:"),
-
-        verb("*   Bird\n",
-             "\n",
-             "*   Magic\n"),
-
-        para("will turn into:"),
-
-        verb("<ul>\n",
-             "<li><p>Bird</p></li>\n",
-             "<li><p>Magic</p></li>\n",
-             "</ul>\n"),
-
-        para("List items may consist of multiple paragraphs. Each subsequent\n" +
-             "paragraph in a list item must be intended by either 4 spaces\n" +
-             "or one tab:"),
-
-        verb("1.  This is a list item with two paragraphs. Lorem ipsum dolor\n",
-             "    sit amet, consectetuer adipiscing elit. Aliquam hendrerit\n",
-             "    mi posuere lectus.\n",
-             "\n",
-             "    Vestibulum enim wisi, viverra nec, fringilla in, laoreet\n",
-             "    vitae, risus. Donec sit amet nisl. Aliquam semper ipsum\n",
-             "    sit amet velit.\n",
-             "\n",
-             "2.  Suspendisse id sem consectetuer libero luctus adipiscing.\n"),
-
-        para("It looks nice if you indent every line of the subsequent\n" +
-             "paragraphs, but here again, Markdown will allow you to be\n" +
-             "lazy:"),
-
-        verb("*   This is a list item with two paragraphs.\n",
-             "\n",
-             "    This is the second paragraph in the list item. You're\n",
-             "only required to indent the first line. Lorem ipsum dolor\n",
-             "sit amet, consectetuer adipiscing elit.\n",
-             "\n",
-             "*   Another item in the same list.\n"),
-
-        para("To put a blockquote within a list item, the blockquote's <code>></code>\n" +
-             "delimiters need to be indented:"),
-
-        verb("*   A list item with a blockquote:\n",
-             "\n",
-             "    > This is a blockquote\n",
-             "    > inside a list item.\n"),
-
-        para(
-             "To put a code block within a list item, the code block needs\n" +
-             "to be indented _twice_ -- 8 spaces or two tabs:"),
-
-        verb("*   A list item with a code block:\n",
-             "\n",
-             "        <code goes here>\n"),
-
-        para("It's worth noting that it's possible to trigger an ordered list by\n" +
-             "accident, by writing something like this:"),
-
-        verb("1986. What a great season.\n"),
-
-        para("In other words, a <em>number-period-space</em> sequence at the beginning of a\n" +
-             "line. To avoid this, you can backslash-escape the period:"),
-
-        verb("1986\\. What a great season.\n"),
-
-        raw("<h3 id=\"precode\">Code Blocks</h3>"),
-
-        para("Pre-formatted code blocks are used for writing about programming or\n" +
-             "markup source code. Rather than forming normal paragraphs, the lines\n" +
-             "of a code block are interpreted literally. Markdown wraps a code block\n" +
-             "in both <code><pre></code> and <code><code></code> tags."),
-
-        para("To produce a code block in Markdown, simply indent every line of the\n" +
-             "block by at least 4 spaces or 1 tab. For example, given this input:"),
-
-        verb("This is a normal paragraph:\n",
-             "\n",
-             "    This is a code block.\n"),
-
-        para("Markdown will generate:"),
-
-        verb("<p>This is a normal paragraph:</p>\n",
-             "\n",
-             "<pre><code>This is a code block.\n",
-             "</code></pre>\n"),
-
-        para("One level of indentation -- 4 spaces or 1 tab -- is removed from each\n" +
-             "line of the code block. For example, this:"),
-
-        verb("Here is an example of AppleScript:\n",
-             "\n",
-             "    tell application \"Foo\"\n",
-             "        beep\n",
-             "    end tell\n"),
-
-        para("will turn into:"),
-
-        verb("<p>Here is an example of AppleScript:</p>\n",
-             "\n",
-             "<pre><code>tell application \"Foo\"\n",
-             "    beep\n",
-             "end tell\n",
-             "</code></pre>\n"),
-
-        para("A code block continues until it reaches a line that is not indented\n" +
-             "(or the end of the article)."),
-
-        para("Within a code block, ampersands (<code>&</code>) and angle brackets (<code><</code> and <code>></code>)\n" +
-             "are automatically converted into HTML entities. This makes it very\n" +
-             "easy to include example HTML source code using Markdown -- just paste\n" +
-             "it and indent it, and Markdown will handle the hassle of encoding the\n" +
-             "ampersands and angle brackets. For example, this:"),
-
-        verb("    <div class=\"footer\">\n",
-             "        &copy; 2004 Foo Corporation\n",
-             "    </div>\n"),
-
-        para("will turn into:"),
-
-        verb("<pre><code>&lt;div class=\"footer\"&gt;\n",
-             "    &amp;copy; 2004 Foo Corporation\n",
-             "&lt;/div&gt;\n",
-             "</code></pre>\n"),
-
-        para("Regular Markdown syntax is not processed within code blocks. E.g.,\n" +
-             "asterisks are just literal asterisks within a code block. This means\n" +
-             "it's also easy to use Markdown to write about Markdown's own syntax."),
-
-        raw("<h3 id=\"hr\">Horizontal Rules</h3>"),
-
-        para("You can produce a horizontal rule tag (<code><hr /></code>) by placing three or\n" +
-             "more hyphens, asterisks, or underscores on a line by themselves. If you\n" +
-             "wish, you may use spaces between the hyphens or asterisks. Each of the\n" +
-             "following lines will produce a horizontal rule:"),
-
-        verb("* * *\n",
-             "\n",
-             "***\n",
-             "\n",
-             "*****\n",
-             "\n",
-             "- - -\n",
-             "\n",
-             "---------------------------------------\n",
-             "\n",
-             "_ _ _\n"),
-
-        rule(1),
-
-        raw("<h2 id=\"span\">Span Elements</h2>"),
-
-        raw("<h3 id=\"link\">Links</h3>"),
-
-        para("Markdown supports two style of links: _inline_ and _reference_."),
-
-        para("In both styles, the link text is delimited by [square brackets]."),
-
-        para("To create an inline link, use a set of regular parentheses immediately\n" +
-             "after the link text's closing square bracket. Inside the parentheses,\n" +
-             "put the URL where you want the link to point, along with an _optional_\n" +
-             "title for the link, surrounded in quotes. For example:"),
-
-        verb("This is [an example](http://example.com/ \"Title\") inline link.\n",
-             "\n",
-             "[This link](http://example.net/) has no title attribute.\n"),
-
-        para("Will produce:"),
-
-        verb("<p>This is <a href=\"http://example.com/\" title=\"Title\">\n",
-             "an example</a> inline link.</p>\n",
-             "\n",
-             "<p><a href=\"http://example.net/\">This link</a> has no\n",
-             "title attribute.</p>\n"),
-
-        para("If you're referring to a local resource on the same server, you can\n" +
-             "use relative paths:"),
-
-        verb("See my [About](/about/) page for details.\n"),
-
-        para("Reference-style links use a second set of square brackets, inside\n" +
-             "which you place a label of your choosing to identify the link:"),
-
-        verb("This is [an example][id] reference-style link.\n"),
-
-        para("You can optionally use a space to separate the sets of brackets:"),
-
-        verb("This is [an example] [id] reference-style link.\n"),
-
-        para("Then, anywhere in the document, you define your link label like this,\n" +
-             "on a line by itself:"),
-
-        verb("[id]: http://example.com/  \"Optional Title Here\"\n"),
-
-        para("That is:"),
-
-        list(:BULLET,
-          item(nil,
-            para("Square brackets containing the link identifier (optionally\n" +
-                 "indented from the left margin using up to three spaces);")),
-          item(nil,
-            para("followed by a colon;")),
-          item(nil,
-            para("followed by one or more spaces (or tabs);")),
-          item(nil,
-            para("followed by the URL for the link;")),
-          item(nil,
-            para("optionally followed by a title attribute for the link, enclosed\n" +
-                 "in double or single quotes."))),
-
-        para("The link URL may, optionally, be surrounded by angle brackets:"),
-
-        verb("[id]: <http://example.com/>  \"Optional Title Here\"\n"),
-
-        para("You can put the title attribute on the next line and use extra spaces\n" +
-             "or tabs for padding, which tends to look better with longer URLs:"),
-
-        verb("[id]: http://example.com/longish/path/to/resource/here\n",
-             "    \"Optional Title Here\"\n"),
-
-        para("Link definitions are only used for creating links during Markdown\n" +
-             "processing, and are stripped from your document in the HTML output."),
-
-        para("Link definition names may constist of letters, numbers, spaces, and punctuation -- but they are _not_ case sensitive. E.g. these two links:"),
-
-        verb("[link text][a]\n",
-             "[link text][A]\n"),
-
-        para("are equivalent."),
-
-        para("The <em>implicit link name</em> shortcut allows you to omit the name of the\n" +
-             "link, in which case the link text itself is used as the name.\n" +
-             "Just use an empty set of square brackets -- e.g., to link the word\n" +
-             "\"Google\" to the google.com web site, you could simply write:"),
-
-        verb("[Google][]\n"),
-
-        para("And then define the link:"),
-
-        verb("[Google]: http://google.com/\n"),
-
-        para("Because link names may contain spaces, this shortcut even works for\n" +
-            "multiple words in the link text:"),
-
-
-        verb("Visit [Daring Fireball][] for more information.\n"),
-
-        para("And then define the link:"),
-
-        verb("[Daring Fireball]: http://daringfireball.net/\n"),
-
-        para("Link definitions can be placed anywhere in your Markdown document. I\n" +
-             "tend to put them immediately after each paragraph in which they're\n" +
-             "used, but if you want, you can put them all at the end of your\n" +
-             "document, sort of like footnotes."),
-
-        para("Here's an example of reference links in action:"),
-
-        verb("I get 10 times more traffic from [Google] [1] than from\n",
-             "[Yahoo] [2] or [MSN] [3].\n",
-             "\n",
-             "  [1]: http://google.com/        \"Google\"\n",
-             "  [2]: http://search.yahoo.com/  \"Yahoo Search\"\n",
-             "  [3]: http://search.msn.com/    \"MSN Search\"\n"),
-
-        para("Using the implicit link name shortcut, you could instead write:"),
-
-        verb("I get 10 times more traffic from [Google][] than from\n",
-             "[Yahoo][] or [MSN][].\n",
-             "\n",
-             "  [google]: http://google.com/        \"Google\"\n",
-             "  [yahoo]:  http://search.yahoo.com/  \"Yahoo Search\"\n",
-             "  [msn]:    http://search.msn.com/    \"MSN Search\"\n"),
-
-        para("Both of the above examples will produce the following HTML output:"),
-
-        verb("<p>I get 10 times more traffic from <a href=\"http://google.com/\"\n",
-             "title=\"Google\">Google</a> than from\n",
-             "<a href=\"http://search.yahoo.com/\" title=\"Yahoo Search\">Yahoo</a>\n",
-             "or <a href=\"http://search.msn.com/\" title=\"MSN Search\">MSN</a>.</p>\n"),
-
-        para("For comparison, here is the same paragraph written using\n" +
-             "Markdown's inline link style:"),
-
-        verb("I get 10 times more traffic from [Google](http://google.com/ \"Google\")\n",
-             "than from [Yahoo](http://search.yahoo.com/ \"Yahoo Search\") or\n",
-             "[MSN](http://search.msn.com/ \"MSN Search\").\n"),
-
-        para("The point of reference-style links is not that they're easier to\n" +
-             "write. The point is that with reference-style links, your document\n" +
-             "source is vastly more readable. Compare the above examples: using\n" +
-             "reference-style links, the paragraph itself is only 81 characters\n" +
-             "long; with inline-style links, it's 176 characters; and as raw HTML,\n" +
-             "it's 234 characters. In the raw HTML, there's more markup than there\n" +
-             "is text."),
-
-        para("With Markdown's reference-style links, a source document much more\n" +
-             "closely resembles the final output, as rendered in a browser. By\n" +
-             "allowing you to move the markup-related metadata out of the paragraph,\n" +
-             "you can add links without interrupting the narrative flow of your\n" +
-             "prose."),
-
-        raw("<h3 id=\"em\">Emphasis</h3>"),
-
-        para("Markdown treats asterisks (<code>*</code>) and underscores (<code>_</code>) as indicators of\n" +
-             "emphasis. Text wrapped with one <code>*</code> or <code>_</code> will be wrapped with an\n" +
-             "HTML <code><em></code> tag; double <code>*</code>'s or <code>_</code>'s will be wrapped with an HTML\n" +
-             "<code><strong></code> tag. E.g., this input:"),
-
-        verb("*single asterisks*\n",
-             "\n",
-             "_single underscores_\n",
-             "\n",
-             "**double asterisks**\n",
-             "\n",
-             "__double underscores__\n"),
-
-        para("will produce:"),
-
-        verb("<em>single asterisks</em>\n",
-             "\n",
-             "<em>single underscores</em>\n",
-             "\n",
-             "<strong>double asterisks</strong>\n",
-             "\n",
-             "<strong>double underscores</strong>\n"),
-
-        para("You can use whichever style you prefer; the lone restriction is that\n" +
-             "the same character must be used to open and close an emphasis span."),
-
-        para("Emphasis can be used in the middle of a word:"),
-
-        verb("un*fucking*believable\n"),
-
-        para("But if you surround an <code>*</code> or <code>_</code> with spaces, it'll be treated as a\n" +
-             "literal asterisk or underscore."),
-
-        para("To produce a literal asterisk or underscore at a position where it\n" +
-             "would otherwise be used as an emphasis delimiter, you can backslash\n" +
-             "escape it:"),
-
-        verb("\\*this text is surrounded by literal asterisks\\*\n"),
-
-        raw("<h3 id=\"code\">Code</h3>"),
-
-        para("To indicate a span of code, wrap it with backtick quotes (<code>`</code>).\n" +
-             "Unlike a pre-formatted code block, a code span indicates code within a\n" +
-             "normal paragraph. For example:"),
-
-        verb("Use the `printf()` function.\n"),
-
-        para("will produce:"),
-
-        verb("<p>Use the <code>printf()</code> function.</p>\n"),
-
-        para("To include a literal backtick character within a code span, you can use\n" +
-             "multiple backticks as the opening and closing delimiters:"),
-
-        verb("``There is a literal backtick (`) here.``\n"),
-
-        para("which will produce this:"),
-
-        verb("<p><code>There is a literal backtick (`) here.</code></p>\n"),
-
-        para("The backtick delimiters surrounding a code span may include spaces --\n" +
-             "one after the opening, one before the closing. This allows you to place\n" +
-             "literal backtick characters at the beginning or end of a code span:"),
-
-        verb("A single backtick in a code span: `` ` ``\n",
-             "\n",
-             "A backtick-delimited string in a code span: `` `foo` ``\n"),
-
-        para("will produce:"),
-
-        verb("<p>A single backtick in a code span: <code>`</code></p>\n",
-             "\n",
-             "<p>A backtick-delimited string in a code span: <code>`foo`</code></p>\n"),
-
-        para("With a code span, ampersands and angle brackets are encoded as HTML\n" +
-             "entities automatically, which makes it easy to include example HTML\n" +
-             "tags. Markdown will turn this:"),
-
-        verb("Please don't use any `<blink>` tags.\n"),
-
-        para("into:"),
-
-        verb("<p>Please don't use any <code>&lt;blink&gt;</code> tags.</p>\n"),
-
-        para("You can write this:"),
-
-        verb("`&#8212;` is the decimal-encoded equivalent of `&mdash;`.\n"),
-
-        para("to produce:"),
-
-        verb( "<p><code>&amp;#8212;</code> is the decimal-encoded\n",
-             "equivalent of <code>&amp;mdash;</code>.</p>\n"),
-
-        raw("<h3 id=\"img\">Images</h3>"),
-
-        para("Admittedly, it's fairly difficult to devise a \"natural\" syntax for\n" +
-             "placing images into a plain text document format."),
-
-        para("Markdown uses an image syntax that is intended to resemble the syntax\n" +
-             "for links, allowing for two styles: _inline_ and _reference_."),
-
-        para("Inline image syntax looks like this:"),
-
-        verb("![Alt text](/path/to/img.jpg)\n",
-             "\n",
-             "![Alt text](/path/to/img.jpg \"Optional title\")\n"),
-
-        para("That is:"),
-
-        list(:BULLET,
-          item(nil,
-            para("An exclamation mark: <code>!</code>;")),
-          item(nil,
-            para("followed by a set of square brackets, containing the <code>alt</code>\n" +
-                 "attribute text for the image;")),
-          item(nil,
-            para("followed by a set of parentheses, containing the URL or path to\n" +
-                 "the image, and an optional <code>title</code> attribute enclosed in double\n" +
-                 "or single quotes."))),
-
-        para("Reference-style image syntax looks like this:"),
-
-        verb("![Alt text][id]\n"),
-
-        para("Where \"id\" is the name of a defined image reference. Image references\n" +
-             "are defined using syntax identical to link references:"),
-
-        verb("[id]: url/to/image  \"Optional title attribute\"\n"),
-
-        para("As of this writing, Markdown has no syntax for specifying the\n" +
-             "dimensions of an image; if this is important to you, you can simply\n" +
-             "use regular HTML <code><img></code> tags."),
-
-        rule(1),
-
-        raw("<h2 id=\"misc\">Miscellaneous</h2>"),
-
-        raw("<h3 id=\"autolink\">Automatic Links</h3>"),
-
-        para("Markdown supports a shortcut style for creating \"automatic\" links for URLs and email addresses: simply surround the URL or email address with angle brackets. What this means is that if you want to show the actual text of a URL or email address, and also have it be a clickable link, you can do this:"),
-
-        verb("<http://example.com/>\n"),
-
-        para("Markdown will turn this into:"),
-
-        verb("<a href=\"http://example.com/\">http://example.com/</a>\n"),
-
-        para("Automatic links for email addresses work similarly, except that\n" +
-             "Markdown will also perform a bit of randomized decimal and hex\n" +
-             "entity-encoding to help obscure your address from address-harvesting\n" +
-             "spambots. For example, Markdown will turn this:"),
-
-        verb("<address@example.com>\n"),
-
-        para("into something like this:"),
-
-        verb("<a href=\"&#x6D;&#x61;i&#x6C;&#x74;&#x6F;:&#x61;&#x64;&#x64;&#x72;&#x65;\n",
-             "&#115;&#115;&#64;&#101;&#120;&#x61;&#109;&#x70;&#x6C;e&#x2E;&#99;&#111;\n",
-             "&#109;\">&#x61;&#x64;&#x64;&#x72;&#x65;&#115;&#115;&#64;&#101;&#120;&#x61;\n",
-             "&#109;&#x70;&#x6C;e&#x2E;&#99;&#111;&#109;</a>\n"),
-
-        para("which will render in a browser as a clickable link to \"address@example.com\"."),
-
-        para("(This sort of entity-encoding trick will indeed fool many, if not\n" +
-               "most, address-harvesting bots, but it definitely won't fool all of\n" +
-               "them. It's better than nothing, but an address published in this way\n" +
-               "will probably eventually start receiving spam.)"),
-
-        raw("<h3 id=\"backslash\">Backslash Escapes</h3>"),
-
-        para("Markdown allows you to use backslash escapes to generate literal\n" +
-             "characters which would otherwise have special meaning in Markdown's\n" +
-             "formatting syntax. For example, if you wanted to surround a word with\n" +
-             "literal asterisks (instead of an HTML <code><em></code> tag), you can backslashes\n" +
-             "before the asterisks, like this:"),
-
-        verb("\\*literal asterisks\\*\n"),
-
-        para("Markdown provides backslash escapes for the following characters:"),
-
-        verb("\\   backslash\n",
-             "`   backtick\n",
-             "*   asterisk\n",
-             "_   underscore\n",
-             "{}  curly braces\n",
-             "[]  square brackets\n",
-             "()  parentheses\n",
-             "#   hash mark\n",
-             "+	plus sign\n",
-             "-	minus sign (hyphen)\n",
-             ".   dot\n",
-             "!   exclamation mark\n"))
-
-    assert_equal expected, doc
-  end
-
-  def test_nested_blockquotes
-    input = File.read "#{MARKDOWN_TEST_PATH}/Nested blockquotes.text"
-
-    doc = @parser.parse input
-
-    expected =
-      doc(
-        block(
-          para("foo"),
-          block(
-            para("bar")),
-          para("foo")))
-
-    assert_equal expected, doc
-  end
-
-  def test_ordered_and_unordered_lists
-    input = File.read "#{MARKDOWN_TEST_PATH}/Ordered and unordered lists.text"
-
-    doc = @parser.parse input
-
-    expected =
-      doc(
-        head(2, 'Unordered'),
-
-        para('Asterisks tight:'),
-        list(:BULLET,
-          item(nil, para("asterisk 1")),
-          item(nil, para("asterisk 2")),
-          item(nil, para("asterisk 3"))),
-        para('Asterisks loose:'),
-        list(:BULLET,
-          item(nil, para("asterisk 1")),
-          item(nil, para("asterisk 2")),
-          item(nil, para("asterisk 3"))),
-
-        rule(1),
-
-        para("Pluses tight:"),
-        list(:BULLET,
-          item(nil, para("Plus 1")),
-          item(nil, para("Plus 2")),
-          item(nil, para("Plus 3"))),
-        para("Pluses loose:"),
-        list(:BULLET,
-          item(nil, para("Plus 1")),
-          item(nil, para("Plus 2")),
-          item(nil, para("Plus 3"))),
-
-        rule(1),
-
-        para("Minuses tight:"),
-        list(:BULLET,
-          item(nil, para("Minus 1")),
-          item(nil, para("Minus 2")),
-          item(nil, para("Minus 3"))),
-        para("Minuses loose:"),
-        list(:BULLET,
-          item(nil, para("Minus 1")),
-          item(nil, para("Minus 2")),
-          item(nil, para("Minus 3"))),
-
-        head(2, "Ordered"),
-
-        para("Tight:"),
-        list(:NUMBER,
-          item(nil, para("First")),
-          item(nil, para("Second")),
-          item(nil, para("Third"))),
-        para("and:"),
-        list(:NUMBER,
-          item(nil, para("One")),
-          item(nil, para("Two")),
-          item(nil, para("Three"))),
-
-        para("Loose using tabs:"),
-        list(:NUMBER,
-          item(nil, para("First")),
-          item(nil, para("Second")),
-          item(nil, para("Third"))),
-        para("and using spaces:"),
-        list(:NUMBER,
-          item(nil, para("One")),
-          item(nil, para("Two")),
-          item(nil, para("Three"))),
-
-        para("Multiple paragraphs:"),
-        list(:NUMBER,
-          item(nil,
-            para("Item 1, graf one."),
-            para("Item 2. graf two. The quick brown fox " +
-                 "jumped over the lazy dog's\nback.")),
-          item(nil, para("Item 2.")),
-          item(nil, para("Item 3."))),
-
-        head(2, "Nested"),
-        list(:BULLET,
-          item(nil,
-            para("Tab"),
-            list(:BULLET,
-              item(nil,
-                para("Tab"),
-                list(:BULLET,
-                  item(nil,
-                    para("Tab"))))))),
-
-        para("Here's another:"),
-        list(:NUMBER,
-          item(nil, para("First")),
-          item(nil, para("Second:"),
-            list(:BULLET,
-              item(nil, para("Fee")),
-              item(nil, para("Fie")),
-              item(nil, para("Foe")))),
-          item(nil, para("Third"))),
-
-        para("Same thing but with paragraphs:"),
-        list(:NUMBER,
-          item(nil, para("First")),
-          item(nil, para("Second:"),
-            list(:BULLET,
-              item(nil, para("Fee")),
-              item(nil, para("Fie")),
-              item(nil, para("Foe")))),
-          item(nil, para("Third"))),
-
-        para("This was an error in Markdown 1.0.1:"),
-        list(:BULLET,
-          item(nil,
-            para("this"),
-            list(:BULLET,
-              item(nil, para("sub"))),
-            para("that"))))
-
-    assert_equal expected, doc
-  end
-
-  def test_strong_and_em_together
-    input = File.read "#{MARKDOWN_TEST_PATH}/Strong and em together.text"
-
-    doc = @parser.parse input
-
-    expected =
-      doc(
-        para("<b><em>This is strong and em.</em></b>"),
-        para("So is <b>_this_</b> word."),
-        para("<b><em>This is strong and em.</em></b>"),
-        para("So is <b>_this_</b> word."))
-
-    assert_equal expected, doc
-  end
-
-  def test_tabs
-    input = File.read "#{MARKDOWN_TEST_PATH}/Tabs.text"
-
-    doc = @parser.parse input
-
-    expected =
-      doc(
-        list(:BULLET,
-          item(nil,
-            para("this is a list item\nindented with tabs")),
-          item(nil,
-            para("this is a list item\nindented with spaces"))),
-
-        para("Code:"),
-
-        verb("this code block is indented by one tab\n"),
-
-        para("And:"),
-
-        verb("\tthis code block is indented by two tabs\n"),
-
-        para("And:"),
-
-        verb(
-          "+\tthis is an example list item\n",
-          "\tindented with tabs\n",
-          "\n",
-          "+   this is an example list item\n",
-          "    indented with spaces\n"))
-
-    assert_equal expected, doc
-  end
-
-  def test_tidyness
-    input = File.read "#{MARKDOWN_TEST_PATH}/Tidyness.text"
-
-    doc = @parser.parse input
-
-    expected =
-      doc(
-        block(
-          para("A list within a blockquote:"),
-          list(:BULLET,
-            item(nil, para("asterisk 1")),
-            item(nil, para("asterisk 2")),
-            item(nil, para("asterisk 3")))))
-
-    assert_equal expected, doc
-  end
-
-end
diff --git a/test/rdoc/test_rdoc_markup.rb b/test/rdoc/test_rdoc_markup.rb
deleted file mode 100644
index 4d79f8bc3f217d..00000000000000
--- a/test/rdoc/test_rdoc_markup.rb
+++ /dev/null
@@ -1,95 +0,0 @@
-# frozen_string_literal: true
-require_relative 'helper'
-
-class TestRDocMarkup < RDoc::TestCase
-
-  def test_class_parse
-    expected = @RM::Document.new(
-      @RM::Paragraph.new('hello'))
-
-    assert_equal expected, RDoc::Markup.parse('hello')
-  end
-
-  def test_convert
-    str = <<-STR
-now is
-the time
-
-  hello
-  dave
-
-1. l1
-2. l2
-    STR
-
-    m = RDoc::Markup.new
-
-    tt = RDoc::Markup::ToTest.new m
-
-    out = m.convert str, tt
-
-    expected = [
-      "now is the time",
-      "\n",
-      "  hello\n  dave\n",
-      "1: ",
-      "l1",
-      "1: ",
-      "l2",
-    ]
-
-    assert_equal expected, out
-  end
-
-  def test_convert_custom_markup
-    str = <<-STR
-{stricken}
-    STR
-
-    m = RDoc::Markup.new
-    m.add_word_pair '{', '}', :STRIKE
-
-    tt = RDoc::Markup::ToTest.new nil, m
-    tt.add_tag :STRIKE, 'STRIKE ', ' STRIKE'
-
-    out = m.convert str, tt
-
-    expected = [
-      "STRIKE stricken STRIKE",
-    ]
-
-    assert_equal expected, out
-  end
-
-  def test_convert_document
-    doc = RDoc::Markup::Parser.parse <<-STR
-now is
-the time
-
-  hello
-  dave
-
-1. l1
-2. l2
-    STR
-
-    m = RDoc::Markup.new
-
-    tt = RDoc::Markup::ToTest.new m
-
-    out = m.convert doc, tt
-
-    expected = [
-      "now is the time",
-      "\n",
-      "  hello\n  dave\n",
-      "1: ",
-      "l1",
-      "1: ",
-      "l2",
-    ]
-
-    assert_equal expected, out
-  end
-
-end
diff --git a/test/rdoc/test_rdoc_markup_attribute_manager.rb b/test/rdoc/test_rdoc_markup_attribute_manager.rb
deleted file mode 100644
index dcae48525d06c4..00000000000000
--- a/test/rdoc/test_rdoc_markup_attribute_manager.rb
+++ /dev/null
@@ -1,395 +0,0 @@
-# frozen_string_literal: true
-require_relative 'helper'
-
-class TestRDocMarkupAttributeManager < RDoc::TestCase
-
-  def setup
-    super
-
-    @am = RDoc::Markup::AttributeManager.new
-
-    @bold_on  = @am.changed_attribute_by_name([], [:BOLD])
-    @bold_off = @am.changed_attribute_by_name([:BOLD], [])
-
-    @tt_on    = @am.changed_attribute_by_name([], [:TT])
-    @tt_off   = @am.changed_attribute_by_name([:TT], [])
-
-    @em_on    = @am.changed_attribute_by_name([], [:EM])
-    @em_off   = @am.changed_attribute_by_name([:EM], [])
-
-    @bold_em_on   = @am.changed_attribute_by_name([], [:BOLD] | [:EM])
-    @bold_em_off  = @am.changed_attribute_by_name([:BOLD] | [:EM], [])
-
-    @em_then_bold = @am.changed_attribute_by_name([:EM], [:EM] | [:BOLD])
-
-    @em_to_bold   = @am.changed_attribute_by_name([:EM], [:BOLD])
-
-    @am.add_word_pair("{", "}", :WOMBAT)
-    @wombat_on    = @am.changed_attribute_by_name([], [:WOMBAT])
-    @wombat_off   = @am.changed_attribute_by_name([:WOMBAT], [])
-
-    @klass = RDoc::Markup::AttributeManager
-    @formatter = RDoc::Markup::Formatter.new @rdoc.options
-    @formatter.add_tag :BOLD, '<B>', '</B>'
-    @formatter.add_tag :EM, '<EM>', '</EM>'
-    @formatter.add_tag :TT, '<CODE>', '</CODE>'
-  end
-
-  def crossref(text)
-    crossref_bitmap = @am.attributes.bitmap_for(:_REGEXP_HANDLING_) |
-                      @am.attributes.bitmap_for(:CROSSREF)
-
-    [ @am.changed_attribute_by_name([], [:CROSSREF, :_REGEXP_HANDLING_]),
-      RDoc::Markup::RegexpHandling.new(crossref_bitmap, text),
-      @am.changed_attribute_by_name([:CROSSREF, :_REGEXP_HANDLING_], [])
-    ]
-  end
-
-  def test_adding
-    assert_equal(["cat ", @wombat_on, "and", @wombat_off, " dog" ],
-                  @am.flow("cat {and} dog"))
-    #assert_equal(["cat {and} dog" ], @am.flow("cat \\{and} dog"))
-  end
-
-  def test_add_html_tag
-    @am.add_html("Test", :TEST)
-    tags = @am.html_tags
-    assert_equal(6, tags.size)
-    assert(tags.has_key?("test"))
-  end
-
-  def test_add_regexp_handling
-    @am.add_regexp_handling "WikiWord", :WIKIWORD
-    regexp_handlings = @am.regexp_handlings
-
-    assert_equal 1, regexp_handlings.size
-    assert regexp_handlings.assoc "WikiWord"
-  end
-
-  def test_add_word_pair
-    @am.add_word_pair '%', '&', 'percent and'
-
-    assert @am.word_pair_map.include?(/(%)(\S+)(&)/)
-    assert @am.protectable.include?('%')
-    assert !@am.protectable.include?('&')
-  end
-
-  def test_add_word_pair_angle
-    e = assert_raise ArgumentError do
-      @am.add_word_pair '<', '>', 'angles'
-    end
-
-    assert_equal "Word flags may not start with '<'", e.message
-  end
-
-  def test_add_word_pair_invalid
-    assert_raise ArgumentError do
-      @am.add_word_pair("<", "<", :TEST)
-    end
-  end
-
-  def test_add_word_pair_map
-    @am.add_word_pair("x", "y", :TEST)
-
-    word_pair_map = @am.word_pair_map
-
-    assert_includes word_pair_map.keys.map { |r| r.source }, "(x)(\\S+)(y)"
-  end
-
-  def test_add_word_pair_matching
-    @am.add_word_pair '^', '^', 'caret'
-
-    assert @am.matching_word_pairs.include?('^')
-    assert @am.protectable.include?('^')
-  end
-
-  def test_basic
-    assert_equal(["cat"], @am.flow("cat"))
-
-    assert_equal(["cat ", @bold_on, "and", @bold_off, " dog"],
-                  @am.flow("cat *and* dog"))
-
-    assert_equal(["cat ", @bold_on, "AND", @bold_off, " dog"],
-                  @am.flow("cat *AND* dog"))
-
-    assert_equal(["cat ", @em_on, "And", @em_off, " dog"],
-                  @am.flow("cat _And_ dog"))
-
-    assert_equal(["cat *and dog*"], @am.flow("cat *and dog*"))
-
-    assert_equal(["*cat and* dog"], @am.flow("*cat and* dog"))
-
-    assert_equal(["cat *and ", @bold_on, "dog", @bold_off],
-                  @am.flow("cat *and *dog*"))
-
-    assert_equal(["cat ", @em_on, "and", @em_off, " dog"],
-                  @am.flow("cat _and_ dog"))
-
-    assert_equal(["cat_and_dog"],
-                  @am.flow("cat_and_dog"))
-
-    assert_equal(["cat ", @tt_on, "and", @tt_off, " dog"],
-                  @am.flow("cat +and+ dog"))
-
-    assert_equal(["cat ", @tt_on, "X::Y", @tt_off, " dog"],
-                  @am.flow("cat +X::Y+ dog"))
-
-    assert_equal(["cat ", @bold_on, "a_b_c", @bold_off, " dog"],
-                  @am.flow("cat *a_b_c* dog"))
-
-    assert_equal(["cat __ dog"],
-                  @am.flow("cat __ dog"))
-
-    assert_equal(["cat ", @em_on, "_", @em_off, " dog"],
-                  @am.flow("cat ___ dog"))
-
-    assert_equal(["cat and ", @em_on, "5", @em_off, " dogs"],
-                  @am.flow("cat and _5_ dogs"))
-
-    assert_equal([@tt_on, "__id__", @tt_off], @am.flow("+__id__+"))
-  end
-
-  def test_bold
-    assert_equal [@bold_on, 'bold', @bold_off],
-                 @am.flow("*bold*")
-
-    assert_equal [@bold_on, 'Bold:', @bold_off],
-                 @am.flow("*Bold:*")
-
-    assert_equal [@bold_on, '\\bold', @bold_off],
-                 @am.flow("*\\bold*")
-  end
-
-  def test_bold_html_escaped
-    assert_equal ['cat <b>dog</b>'], @am.flow('cat \<b>dog</b>')
-  end
-
-  def test_combined
-    assert_equal(["cat ", @em_on, "and", @em_off, " ", @bold_on, "dog", @bold_off],
-                  @am.flow("cat _and_ *dog*"))
-
-    assert_equal(["cat ", @em_on, "a__nd", @em_off, " ", @bold_on, "dog", @bold_off],
-                  @am.flow("cat _a__nd_ *dog*"))
-  end
-
-  def test_convert_attrs
-    str = '+foo+'.dup
-    attrs = RDoc::Markup::AttrSpan.new str.length, @am.exclusive_bitmap
-
-    @am.convert_attrs str, attrs, true
-    @am.convert_attrs str, attrs
-
-    assert_equal "\000foo\000", str
-
-    str = '+:foo:+'.dup
-    attrs = RDoc::Markup::AttrSpan.new str.length, @am.exclusive_bitmap
-
-    @am.convert_attrs str, attrs, true
-    @am.convert_attrs str, attrs
-
-    assert_equal "\000:foo:\000", str
-
-    str = '+x-y+'.dup
-    attrs = RDoc::Markup::AttrSpan.new str.length, @am.exclusive_bitmap
-
-    @am.convert_attrs str, attrs, true
-    @am.convert_attrs str, attrs
-
-    assert_equal "\000x-y\000", str
-  end
-
-  def test_convert_attrs_ignores_code
-    assert_equal 'foo <CODE>__send__</CODE> bar', output('foo <code>__send__</code> bar')
-  end
-
-  def test_convert_attrs_ignores_tt
-    assert_equal 'foo <CODE>__send__</CODE> bar', output('foo <tt>__send__</tt> bar')
-  end
-
-  def test_convert_attrs_preserves_double
-    assert_equal 'foo.__send__ :bar', output('foo.__send__ :bar')
-    assert_equal 'use __FILE__ to', output('use __FILE__ to')
-  end
-
-  def test_convert_attrs_does_not_ignore_after_tt
-    assert_equal 'the <CODE>IF:</CODE><EM>key</EM> directive', output('the <tt>IF:</tt>_key_ directive')
-  end
-
-  def test_escapes
-    assert_equal '<CODE>text</CODE>',   output('<tt>text</tt>')
-    assert_equal '<tt>text</tt>',       output('\\<tt>text</tt>')
-    assert_equal '<tt>',                output('\\<tt>')
-    assert_equal '<CODE><tt></CODE>',   output('<tt>\\<tt></tt>')
-    assert_equal '<CODE>\\<tt></CODE>', output('<tt>\\\\<tt></tt>')
-    assert_equal '<B>text</B>',         output('*text*')
-    assert_equal '*text*',              output('\\*text*')
-    assert_equal '\\',                  output('\\')
-    assert_equal '\\text',              output('\\text')
-    assert_equal '\\\\text',            output('\\\\text')
-    assert_equal 'text \\ text',        output('text \\ text')
-
-    assert_equal 'and <CODE>\\s</CODE> matches space',
-                 output('and <tt>\\s</tt> matches space')
-    assert_equal 'use <CODE><tt>text</CODE></tt> for code',
-                 output('use <tt>\\<tt>text</tt></tt> for code')
-    assert_equal 'use <CODE><tt>text</tt></CODE> for code',
-                 output('use <tt>\\<tt>text\\</tt></tt> for code')
-    assert_equal 'use <tt><tt>text</tt></tt> for code',
-                 output('use \\<tt>\\<tt>text</tt></tt> for code')
-    assert_equal 'use <tt><CODE>text</CODE></tt> for code',
-                 output('use \\<tt><tt>text</tt></tt> for code')
-    assert_equal 'use <CODE>+text+</CODE> for code',
-                 output('use <tt>\\+text+</tt> for code')
-    assert_equal 'use <tt><CODE>text</CODE></tt> for code',
-                 output('use \\<tt>+text+</tt> for code')
-    assert_equal 'illegal <tag>not</tag> changed',
-                 output('illegal <tag>not</tag> changed')
-    assert_equal 'unhandled <p>tag</p> unchanged',
-                 output('unhandled <p>tag</p> unchanged')
-  end
-
-  def test_exclude_tag
-    assert_equal '<CODE>aaa</CODE>[:symbol]', output('+aaa+[:symbol]')
-    assert_equal '<CODE>aaa[:symbol]</CODE>', output('+aaa[:symbol]+')
-    assert_equal 'aaa[:symbol]', output('aaa[:symbol]')
-    assert_equal '<B><CODE>index</CODE></B>', output('<b><tt>index</tt></b>')
-  end
-
-  def test_exclude_tag_flow
-    assert_equal [@tt_on, "aaa", @tt_off, "[:symbol]"],
-                  @am.flow("+aaa+[:symbol]")
-    assert_equal [@tt_on, "aaa[:symbol]", @tt_off],
-                  @am.flow("+aaa[:symbol]+")
-    assert_equal ["aaa[:symbol]"],
-                  @am.flow("aaa[:symbol]")
-  end
-
-  def test_html_like_em_bold
-    assert_equal ["cat ", @em_on, "and ", @em_to_bold, "dog", @bold_off],
-                  @am.flow("cat <i>and </i><b>dog</b>")
-  end
-
-  def test_html_like_em_bold_SGML
-    assert_equal ["cat ", @em_on, "and ", @em_to_bold, "dog", @bold_off],
-                  @am.flow("cat <i>and <b></i>dog</b>")
-  end
-
-  def test_html_like_em_bold_nested_1
-    assert_equal(["cat ", @bold_em_on, "and", @bold_em_off, " dog"],
-                  @am.flow("cat <i><b>and</b></i> dog"))
-  end
-
-  def test_html_like_em_bold_nested_2
-    assert_equal ["cat ", @em_on, "and ", @em_then_bold, "dog", @bold_em_off],
-                  @am.flow("cat <i>and <b>dog</b></i>")
-  end
-
-  def test_html_like_em_bold_nested_mixed_case
-    assert_equal ["cat ", @em_on, "and ", @em_then_bold, "dog", @bold_em_off],
-                  @am.flow("cat <i>and <B>dog</B></I>")
-  end
-
-  def test_html_like_em_bold_mixed_case
-    assert_equal ["cat ", @em_on, "and", @em_off, " ", @bold_on, "dog", @bold_off],
-                  @am.flow("cat <i>and</i> <B>dog</b>")
-  end
-
-  def test_html_like_teletype
-    assert_equal ["cat ", @tt_on, "dog", @tt_off],
-                 @am.flow("cat <tt>dog</Tt>")
-  end
-
-  def test_html_like_teletype_em_bold_SGML
-    assert_equal [@tt_on, "cat", @tt_off, " ", @em_on, "and ", @em_to_bold, "dog", @bold_off],
-                  @am.flow("<tt>cat</tt> <i>and <b></i>dog</b>")
-  end
-
-  def test_initial_html
-    html_tags = @am.html_tags
-    assert html_tags.is_a?(Hash)
-    assert_equal(5, html_tags.size)
-  end
-
-  def test_initial_word_pairs
-    word_pairs = @am.matching_word_pairs
-    assert word_pairs.is_a?(Hash)
-    assert_equal(3, word_pairs.size)
-  end
-
-  def test_mask_protected_sequence
-    def @am.str()     @str       end
-    def @am.str=(str) @str = str end
-
-    @am.str = '<code>foo</code>'.dup
-    @am.mask_protected_sequences
-
-    assert_equal "<code>foo</code>",       @am.str
-
-    @am.str = '<code>foo\\</code>'.dup
-    @am.mask_protected_sequences
-
-    assert_equal "<code>foo<\x04/code>", @am.str, 'escaped close'
-
-    @am.str = '<code>foo\\\\</code>'.dup
-    @am.mask_protected_sequences
-
-    assert_equal "<code>foo\\</code>",     @am.str, 'escaped backslash'
-  end
-
-  def test_protect
-    assert_equal(['cat \\ dog'],
-                 @am.flow('cat \\ dog'))
-
-    assert_equal(["cat <tt>dog</Tt>"],
-                 @am.flow("cat \\<tt>dog</Tt>"))
-
-    assert_equal(["cat ", @em_on, "and", @em_off, " <B>dog</b>"],
-                  @am.flow("cat <i>and</i> \\<B>dog</b>"))
-
-    assert_equal(["*word* or <b>text</b>"],
-                 @am.flow("\\*word* or \\<b>text</b>"))
-
-    assert_equal(["_cat_", @em_on, "dog", @em_off],
-                  @am.flow("\\_cat_<i>dog</i>"))
-  end
-
-  def test_lost_tag_for_the_second_time
-    str = "cat <tt>dog</tt>"
-    assert_equal(["cat ", @tt_on, "dog", @tt_off],
-                 @am.flow(str))
-    assert_equal(["cat ", @tt_on, "dog", @tt_off],
-                 @am.flow(str))
-  end
-
-  def test_regexp_handling
-    @am.add_regexp_handling(RDoc::CrossReference::CROSSREF_REGEXP, :CROSSREF)
-
-    #
-    # The apostrophes in "cats'" and "dogs'" suppress the flagging of these
-    # words as potential cross-references, which is necessary for the unit
-    # tests.  Unfortunately, the markup engine right now does not actually
-    # check whether a cross-reference is valid before flagging it.
-    #
-    assert_equal(["cats'"], @am.flow("cats'"))
-
-    assert_equal(["cats' ", crossref("#fred"), " dogs'"].flatten,
-                  @am.flow("cats' #fred dogs'"))
-
-    assert_equal([crossref("#fred"), " dogs'"].flatten,
-                  @am.flow("#fred dogs'"))
-
-    assert_equal(["cats' ", crossref("#fred")].flatten, @am.flow("cats' #fred"))
-
-    assert_equal(["(", crossref("#fred"), ")"].flatten, @am.flow("(#fred)"))
-  end
-
-  def test_tt_html
-    assert_equal [@tt_on, '"\n"', @tt_off],
-                 @am.flow('<tt>"\n"</tt>')
-  end
-
-  def output str
-    @formatter.convert_flow @am.flow str
-  end
-
-end
diff --git a/test/rdoc/test_rdoc_markup_attributes.rb b/test/rdoc/test_rdoc_markup_attributes.rb
deleted file mode 100644
index 1ab408d8018a9b..00000000000000
--- a/test/rdoc/test_rdoc_markup_attributes.rb
+++ /dev/null
@@ -1,39 +0,0 @@
-# frozen_string_literal: true
-require_relative 'helper'
-
-class TestRDocMarkupAttributes < RDoc::TestCase
-
-  def setup
-    super
-
-    @as = RDoc::Markup::Attributes.new
-  end
-
-  def test_bitmap_for
-    assert_equal 2, @as.bitmap_for('two')
-    assert_equal 2, @as.bitmap_for('two')
-    assert_equal 4, @as.bitmap_for('three')
-  end
-
-  def test_as_string
-    @as.bitmap_for 'two'
-    @as.bitmap_for 'three'
-
-    assert_equal 'none',                  @as.as_string(0)
-    assert_equal '_REGEXP_HANDLING_',     @as.as_string(1)
-    assert_equal 'two',                   @as.as_string(2)
-    assert_equal '_REGEXP_HANDLING_,two', @as.as_string(3)
-  end
-
-  def test_each_name_of
-    @as.bitmap_for 'two'
-    @as.bitmap_for 'three'
-
-    assert_equal %w[],          @as.each_name_of(0).to_a
-    assert_equal %w[],          @as.each_name_of(1).to_a
-    assert_equal %w[two],       @as.each_name_of(2).to_a
-    assert_equal %w[three],     @as.each_name_of(4).to_a
-    assert_equal %w[two three], @as.each_name_of(6).to_a
-  end
-
-end
diff --git a/test/rdoc/test_rdoc_markup_document.rb b/test/rdoc/test_rdoc_markup_document.rb
deleted file mode 100644
index e4f3b9daf1b670..00000000000000
--- a/test/rdoc/test_rdoc_markup_document.rb
+++ /dev/null
@@ -1,207 +0,0 @@
-# frozen_string_literal: true
-require_relative 'helper'
-
-class TestRDocMarkupDocument < RDoc::TestCase
-
-  def setup
-    super
-
-    @d = @RM::Document.new
-  end
-
-  def test_append
-    @d << @RM::Paragraph.new('hi')
-
-    expected = @RM::Document.new @RM::Paragraph.new('hi')
-
-    assert_equal expected, @d
-  end
-
-  def test_append_document
-    @d << @RM::Document.new
-
-    assert_empty @d
-
-    @d << @RM::Document.new(@RM::Paragraph.new('hi'))
-
-    expected = @RM::Document.new @RM::Paragraph.new('hi'), @RM::BlankLine.new
-
-    assert_equal expected, @d
-  end
-
-  def test_append_string
-    @d << ''
-
-    assert_empty @d
-
-    assert_raise ArgumentError do
-      @d << 'hi'
-    end
-  end
-
-  def test_concat
-    @d.concat [@RM::BlankLine.new, @RM::BlankLine.new]
-
-    refute_empty @d
-  end
-
-  def test_each
-    a = @RM::Document.new
-    b = @RM::Document.new(@RM::Paragraph.new('hi'))
-
-    @d.push a, b
-
-    assert_equal [a, b], @d.map { |sub_doc| sub_doc }
-  end
-
-  def test_empty_eh
-    assert_empty @d
-
-    @d << @RM::BlankLine.new
-
-    refute_empty @d
-  end
-
-  def test_empty_eh_document
-    d = @RM::Document.new @d
-
-    assert_empty d
-  end
-
-  def test_equals2
-    d2 = @RM::Document.new
-
-    assert_equal @d, d2
-
-    d2 << @RM::BlankLine.new
-
-    refute_equal @d, d2
-  end
-
-  def test_equals2_file
-    d2 = @RM::Document.new
-    d2.file = 'file.rb'
-
-    refute_equal @d, d2
-
-    @d.file = 'file.rb'
-
-    assert_equal @d, d2
-  end
-
-  def test_file_equals
-    @d.file = 'file.rb'
-
-    assert_equal 'file.rb', @d.file
-  end
-
-  def test_file_equals_top_level
-    @d.file = @store.add_file 'file.rb'
-
-    assert_equal 'file.rb', @d.file
-  end
-
-  def test_lt2
-    @d << @RM::BlankLine.new
-
-    refute_empty @d
-  end
-
-  def test_merge
-    original = @RM::Document.new @RM::Paragraph.new 'original'
-    original.file = 'file.rb'
-    root = @RM::Document.new original
-
-    replace = @RM::Document.new @RM::Paragraph.new 'replace'
-    replace.file = 'file.rb'
-
-    other = @RM::Document.new replace
-
-    result = root.merge other
-
-    inner = @RM::Document.new @RM::Paragraph.new 'replace'
-    inner.file = 'file.rb'
-    expected = @RM::Document.new inner
-
-    assert_equal expected, result
-  end
-
-  def test_merge_add
-    original = @RM::Document.new @RM::Paragraph.new 'original'
-    original.file = 'file.rb'
-    root = @RM::Document.new original
-
-    addition = @RM::Document.new @RM::Paragraph.new 'addition'
-    addition.file = 'other.rb'
-
-    other = @RM::Document.new addition
-
-    result = root.merge other
-
-    expected = @RM::Document.new original, addition
-
-    assert_equal expected, result
-  end
-
-  def test_merge_empty
-    original = @RM::Document.new
-    root = @RM::Document.new original
-
-    replace = @RM::Document.new @RM::Paragraph.new 'replace'
-    replace.file = 'file.rb'
-
-    other = @RM::Document.new replace
-
-    result = root.merge other
-
-    inner = @RM::Document.new @RM::Paragraph.new 'replace'
-    inner.file = 'file.rb'
-    expected = @RM::Document.new inner
-
-    assert_equal expected, result
-  end
-
-  def test_push
-    @d.push @RM::BlankLine.new, @RM::BlankLine.new
-
-    refute_empty @d
-  end
-
-  def test_table_of_contents
-    doc = @RM::Document.new(
-      @RM::Heading.new(1, 'A'),
-      @RM::Paragraph.new('B'),
-      @RM::Heading.new(2, 'C'),
-      @RM::Paragraph.new('D'),
-      @RM::Heading.new(1, 'E'),
-      @RM::Paragraph.new('F'))
-
-    expected = [
-      @RM::Heading.new(1, 'A'),
-      @RM::Heading.new(2, 'C'),
-      @RM::Heading.new(1, 'E'),
-    ]
-
-    assert_equal expected, doc.table_of_contents
-  end
-
-  def test_table_of_contents_omit_headings_below
-    document = doc(
-      head(1, 'A'),
-      para('B'),
-      head(2, 'C'),
-      para('D'),
-      head(1, 'E'),
-      para('F'))
-
-    document.omit_headings_below = 1
-
-    expected = [
-      head(1, 'A'),
-      head(1, 'E'),
-    ]
-
-    assert_equal expected, document.table_of_contents
-  end
-
-end
diff --git a/test/rdoc/test_rdoc_markup_formatter.rb b/test/rdoc/test_rdoc_markup_formatter.rb
deleted file mode 100644
index 8702db379df7e9..00000000000000
--- a/test/rdoc/test_rdoc_markup_formatter.rb
+++ /dev/null
@@ -1,175 +0,0 @@
-# frozen_string_literal: true
-require_relative 'helper'
-
-class TestRDocMarkupFormatter < RDoc::TestCase
-
-  class ToTest < RDoc::Markup::Formatter
-
-    def initialize markup
-      super nil, markup
-
-      add_tag :TT, '<code>', '</code>'
-    end
-
-    def accept_paragraph paragraph
-      @res += attributes(paragraph.text)
-    end
-
-    def attributes text
-      convert_flow @am.flow text.dup
-    end
-
-    def handle_regexp_CAPS target
-      "handled #{target.text}"
-    end
-
-    def start_accepting
-      @res = ""
-    end
-
-    def end_accepting
-      @res
-    end
-
-  end
-
-  def setup
-    super
-
-    @markup = @RM.new
-    @markup.add_regexp_handling(/[A-Z]+/, :CAPS)
-
-    @attribute_manager = @markup.attribute_manager
-    @attributes = @attribute_manager.attributes
-
-    @to = ToTest.new @markup
-
-    @caps            = @attributes.bitmap_for :CAPS
-    @regexp_handling = @attributes.bitmap_for :_REGEXP_HANDLING_
-    @tt              = @attributes.bitmap_for :TT
-  end
-
-  def test_class_gen_relative_url
-    def gen(from, to)
-      RDoc::Markup::ToHtml.gen_relative_url from, to
-    end
-
-    assert_equal 'a.html',    gen('a.html',   'a.html')
-    assert_equal 'b.html',    gen('a.html',   'b.html')
-
-    assert_equal 'd.html',    gen('a/c.html', 'a/d.html')
-    assert_equal '../a.html', gen('a/c.html', 'a.html')
-    assert_equal 'a/c.html',  gen('a.html',   'a/c.html')
-  end
-
-  def regexp_handling_names
-    @attribute_manager.regexp_handlings.map do |_, mask|
-      @attributes.as_string mask
-    end
-  end
-
-  def test_add_regexp_handling_RDOCLINK
-    @to.add_regexp_handling_RDOCLINK
-
-    assert_includes regexp_handling_names, 'RDOCLINK'
-
-    def @to.handle_regexp_RDOCLINK target
-      "<#{target.text}>"
-    end
-
-    document = doc(para('{foo}[rdoc-label:bar].'))
-
-    formatted = document.accept @to
-
-    assert_equal '{foo}[<rdoc-label:bar>].', formatted
-  end
-
-  def test_add_regexp_handling_TIDYLINK
-    @to.add_regexp_handling_TIDYLINK
-
-    assert_includes regexp_handling_names, 'TIDYLINK'
-
-    def @to.handle_regexp_TIDYLINK target
-      "<#{target.text}>"
-    end
-
-    document = doc(para('foo[rdoc-label:bar].'))
-
-    formatted = document.accept @to
-
-    assert_equal '<foo[rdoc-label:bar]>.', formatted
-
-    document = doc(para('{foo}[rdoc-label:bar].'))
-
-    formatted = document.accept @to
-
-    assert_equal '<{foo}[rdoc-label:bar]>.', formatted
-  end
-
-  def test_parse_url
-    scheme, url, id = @to.parse_url 'example/foo'
-
-    assert_equal 'http',        scheme
-    assert_equal 'example/foo', url
-    assert_nil   id
-  end
-
-  def test_parse_url_anchor
-    scheme, url, id = @to.parse_url '#foottext-1'
-
-    assert_nil   scheme
-    assert_equal '#foottext-1', url
-    assert_nil   id
-  end
-
-  def test_parse_url_link
-    scheme, url, id = @to.parse_url 'link:README.txt'
-
-    assert_equal 'link',       scheme
-    assert_equal 'README.txt', url
-    assert_nil   id
-  end
-
-  def test_parse_url_link_id
-    scheme, url, id = @to.parse_url 'link:README.txt#label-foo'
-
-    assert_equal 'link',                 scheme
-    assert_equal 'README.txt#label-foo', url
-    assert_nil   id
-  end
-
-  def test_parse_url_rdoc_label
-    scheme, url, id = @to.parse_url 'rdoc-label:foo'
-
-    assert_equal 'link', scheme
-    assert_equal '#foo', url
-    assert_nil   id
-
-    scheme, url, id = @to.parse_url 'rdoc-label:foo:bar'
-
-    assert_equal 'link',      scheme
-    assert_equal '#foo',      url
-    assert_equal ' id="bar"', id
-  end
-
-  def test_parse_url_scheme
-    scheme, url, id = @to.parse_url 'http://example/foo'
-
-    assert_equal 'http',               scheme
-    assert_equal 'http://example/foo', url
-    assert_nil   id
-
-    scheme, url, id = @to.parse_url 'https://example/foo'
-
-    assert_equal 'https',               scheme
-    assert_equal 'https://example/foo', url
-    assert_nil   id
-  end
-
-  def test_convert_tt_regexp_handling
-    converted = @to.convert '<code>AAA</code>'
-
-    assert_equal '<code>AAA</code>', converted
-  end
-
-end
diff --git a/test/rdoc/test_rdoc_markup_hard_break.rb b/test/rdoc/test_rdoc_markup_hard_break.rb
deleted file mode 100644
index ac67c68d10596d..00000000000000
--- a/test/rdoc/test_rdoc_markup_hard_break.rb
+++ /dev/null
@@ -1,31 +0,0 @@
-# frozen_string_literal: true
-require_relative 'helper'
-
-class TestRDocMarkupHardBreak < RDoc::TestCase
-
-  def setup
-    super
-
-    @hb = RDoc::Markup::HardBreak.new
-  end
-
-  def test_accept
-    visitor = Object.new
-
-    def visitor.accept_hard_break(obj) @obj = obj end
-    def visitor.obj() @obj end
-
-    @hb.accept visitor
-
-    assert_same @hb, visitor.obj
-  end
-
-  def test_equals2
-    other = RDoc::Markup::HardBreak.new
-
-    assert_equal @hb, other
-
-    refute_equal @hb, Object.new
-  end
-
-end
diff --git a/test/rdoc/test_rdoc_markup_heading.rb b/test/rdoc/test_rdoc_markup_heading.rb
deleted file mode 100644
index de92af91a05ea4..00000000000000
--- a/test/rdoc/test_rdoc_markup_heading.rb
+++ /dev/null
@@ -1,29 +0,0 @@
-# frozen_string_literal: true
-require_relative 'helper'
-
-class TestRDocMarkupHeading < RDoc::TestCase
-
-  def setup
-    super
-
-    @h = RDoc::Markup::Heading.new 1, 'Hello *Friend*!'
-  end
-
-  def test_aref
-    assert_equal 'label-Hello+Friend-21', @h.aref
-  end
-
-  def test_label
-    assert_equal 'label-Hello+Friend-21', @h.label
-    assert_equal 'label-Hello+Friend-21', @h.label(nil)
-
-    context = RDoc::NormalClass.new 'Foo'
-
-    assert_equal 'class-Foo-label-Hello+Friend-21', @h.label(context)
-  end
-
-  def test_plain_html
-    assert_equal 'Hello <strong>Friend</strong>!', @h.plain_html
-  end
-
-end
diff --git a/test/rdoc/test_rdoc_markup_include.rb b/test/rdoc/test_rdoc_markup_include.rb
deleted file mode 100644
index b3e9b845c33d88..00000000000000
--- a/test/rdoc/test_rdoc_markup_include.rb
+++ /dev/null
@@ -1,19 +0,0 @@
-# frozen_string_literal: true
-require_relative 'helper'
-
-class TestRDocMarkupInclude < RDoc::TestCase
-
-  def setup
-    super
-
-    @include = @RM::Include.new 'file', [Dir.tmpdir]
-  end
-
-  def test_equals2
-    assert_equal @include, @RM::Include.new('file', [Dir.tmpdir])
-    refute_equal @include, @RM::Include.new('file', %w[.])
-    refute_equal @include, @RM::Include.new('other', [Dir.tmpdir])
-    refute_equal @include, Object.new
-  end
-
-end
diff --git a/test/rdoc/test_rdoc_markup_indented_paragraph.rb b/test/rdoc/test_rdoc_markup_indented_paragraph.rb
deleted file mode 100644
index d2a9cbe5ca7a6d..00000000000000
--- a/test/rdoc/test_rdoc_markup_indented_paragraph.rb
+++ /dev/null
@@ -1,53 +0,0 @@
-# frozen_string_literal: true
-require_relative 'helper'
-
-class TestRDocMarkupIndentedParagraph < RDoc::TestCase
-
-  def setup
-    super
-
-    @IP = RDoc::Markup::IndentedParagraph
-  end
-
-  def test_initialize
-    ip = @IP.new 2, 'a', 'b'
-
-    assert_equal 2, ip.indent
-    assert_equal %w[a b], ip.parts
-  end
-
-  def test_accept
-    visitor = Object.new
-    def visitor.accept_indented_paragraph(obj) @obj = obj end
-    def visitor.obj() @obj end
-
-    paragraph = @IP.new 0
-
-    paragraph.accept visitor
-
-    assert_equal paragraph, visitor.obj
-  end
-
-  def test_equals2
-    one = @IP.new 1
-    two = @IP.new 2
-
-    assert_equal one, one
-    refute_equal one, two
-  end
-
-  def test_text
-    paragraph = @IP.new(2, 'hello', ' world')
-
-    assert_equal 'hello world', paragraph.text
-  end
-
-  def test_text_break
-    paragraph = @IP.new(2, 'hello', hard_break, 'world')
-
-    assert_equal 'helloworld', paragraph.text
-
-    assert_equal "hello\n  world", paragraph.text("\n")
-  end
-
-end
diff --git a/test/rdoc/test_rdoc_markup_paragraph.rb b/test/rdoc/test_rdoc_markup_paragraph.rb
deleted file mode 100644
index 1b26846eb33be7..00000000000000
--- a/test/rdoc/test_rdoc_markup_paragraph.rb
+++ /dev/null
@@ -1,32 +0,0 @@
-# frozen_string_literal: true
-require_relative 'helper'
-
-class TestRDocMarkupParagraph < RDoc::TestCase
-
-  def test_accept
-    visitor = Object.new
-    def visitor.accept_paragraph(obj) @obj = obj end
-    def visitor.obj() @obj end
-
-    paragraph = RDoc::Markup::Paragraph.new
-
-    paragraph.accept visitor
-
-    assert_same paragraph, visitor.obj
-  end
-
-  def test_text
-    paragraph = para('hello', ' world')
-
-    assert_equal 'hello world', paragraph.text
-  end
-
-  def test_text_break
-    paragraph = para('hello', hard_break, 'world')
-
-    assert_equal 'helloworld', paragraph.text
-
-    assert_equal "hello\nworld", paragraph.text("\n")
-  end
-
-end
diff --git a/test/rdoc/test_rdoc_markup_parser.rb b/test/rdoc/test_rdoc_markup_parser.rb
deleted file mode 100644
index 6fccf09612ca54..00000000000000
--- a/test/rdoc/test_rdoc_markup_parser.rb
+++ /dev/null
@@ -1,1684 +0,0 @@
-# coding: utf-8
-# frozen_string_literal: true
-
-require_relative 'helper'
-
-class TestRDocMarkupParser < RDoc::TestCase
-
-  def setup
-    super
-
-    @RMP = @RM::Parser
-  end
-
-  def test_build_heading
-    parser = @RMP.new
-
-    parser.tokens.replace [
-      [:TEXT,    'heading three',  4, 0],
-      [:NEWLINE, "\n",            17, 0],
-    ]
-
-    assert_equal @RM::Heading.new(3, 'heading three'), parser.build_heading(3)
-  end
-
-  def test_get
-    parser = util_parser
-
-    assert_equal [:HEADER, 1, 0, 0], parser.get
-
-    assert_equal 7, parser.tokens.length
-  end
-
-  def test_parse_bullet
-    str = <<-STR
-* l1
-* l2
-    STR
-
-    expected = [
-      @RM::List.new(:BULLET, *[
-        @RM::ListItem.new(nil,
-          @RM::Paragraph.new('l1')),
-        @RM::ListItem.new(nil,
-          @RM::Paragraph.new('l2'))])]
-
-    assert_equal expected, @RMP.parse(str).parts
-  end
-
-  def test_parse_bullet_utf_8
-    str = <<-STR
-* 新しい機能
-    STR
-
-    expected = [
-      @RM::List.new(:BULLET, *[
-        @RM::ListItem.new(nil,
-          @RM::Paragraph.new('新しい機能'))])]
-
-    assert_equal expected, @RMP.parse(str).parts
-  end
-
-  def test_parse_bullet_verbatim_heading
-    str = <<-STR
-* l1
-    v
-
-= H
-    STR
-
-    expected = [
-      @RM::List.new(:BULLET, *[
-        @RM::ListItem.new(nil,
-          @RM::Paragraph.new('l1'),
-          @RM::Verbatim.new("v\n"))]),
-      @RM::Heading.new(1, 'H')]
-
-    assert_equal expected, @RMP.parse(str).parts
-  end
-
-  def test_parse_bullet_heading
-    str = <<-STR
-* = l1
-    STR
-
-    expected = [
-      @RM::List.new(:BULLET, *[
-        @RM::ListItem.new(nil,
-          @RM::Heading.new(1, 'l1'))])]
-
-    assert_equal expected, @RMP.parse(str).parts
-  end
-
-  def test_parse_bullet_indent
-    str = <<-STR
-* l1
-  * l1.1
-* l2
-    STR
-
-    expected = [
-      @RM::List.new(:BULLET, *[
-        @RM::ListItem.new(nil,
-          @RM::Paragraph.new('l1'),
-          @RM::List.new(:BULLET, *[
-            @RM::ListItem.new(nil,
-              @RM::Paragraph.new('l1.1'))])),
-        @RM::ListItem.new(nil,
-          @RM::Paragraph.new('l2'))])]
-
-    assert_equal expected, @RMP.parse(str).parts
-  end
-
-  def test_parse_bullet_paragraph
-    str = <<-STR
-now is
-* l1
-* l2
-the time
-    STR
-
-    expected = [
-      @RM::Paragraph.new('now is'),
-      @RM::List.new(:BULLET, *[
-        @RM::ListItem.new(nil,
-          @RM::Paragraph.new('l1')),
-        @RM::ListItem.new(nil,
-          @RM::Paragraph.new('l2')),
-      ]),
-      @RM::Paragraph.new('the time'),
-    ]
-
-    assert_equal expected, @RMP.parse(str).parts
-  end
-
-  def test_parse_bullet_multiline
-    str = <<-STR
-* l1
-  l1+
-* l2
-    STR
-
-    expected = [
-      list(:BULLET,
-        item(nil,
-          para('l1 ', 'l1+')),
-        item(nil,
-          para('l2')))]
-
-    assert_equal expected, @RMP.parse(str).parts
-  end
-
-  def test_parse_bullet_multiparagraph
-    str = <<-STR
-* l1
-
-  l1+
-    STR
-
-    expected = [
-      @RM::List.new(:BULLET, *[
-        @RM::ListItem.new(nil,
-          @RM::Paragraph.new('l1'),
-          @RM::BlankLine.new,
-          @RM::Paragraph.new('l1+')),
-      ]),
-    ]
-
-    assert_equal expected, @RMP.parse(str).parts
-  end
-
-  def test_parse_bullet_indent_verbatim
-    str = <<-STR
-* l1
-  * l1.1
-    text
-      code
-        code
-
-    text
-* l2
-    STR
-
-    expected = [
-      list(:BULLET,
-        item(nil,
-          para('l1'),
-          list(:BULLET,
-            item(nil,
-              para('l1.1 ', 'text'),
-              verb("code\n", "  code\n"),
-              para('text')))),
-        item(nil,
-          para('l2')))]
-
-    assert_equal expected, @RMP.parse(str).parts
-  end
-
-  def test_parse_dash
-    str = <<-STR
-- one
-- two
-    STR
-
-    expected = [
-      @RM::List.new(:BULLET, *[
-        @RM::ListItem.new(nil,
-          @RM::Paragraph.new('one')),
-        @RM::ListItem.new(nil,
-          @RM::Paragraph.new('two'))])]
-
-    assert_equal expected, @RMP.parse(str).parts
-  end
-
-  def test_parse_heading
-    str = '= heading one'
-
-    expected = [
-      @RM::Heading.new(1, 'heading one')]
-
-    assert_equal expected, @RMP.parse(str).parts
-  end
-
-  def test_parse_heading_three
-    str = '=== heading three'
-
-    expected = [
-      @RM::Heading.new(3, 'heading three')]
-
-    assert_equal expected, @RMP.parse(str).parts
-  end
-
-  def test_parse_heading_bullet
-    str = '= * heading one'
-
-    expected = [
-      @RM::Heading.new(1, '* heading one')]
-
-    assert_equal expected, @RMP.parse(str).parts
-  end
-
-  def test_parse_heading_empty
-    str = <<-STR
-===
-* bullet
-    STR
-
-    expected = [
-      @RM::Heading.new(3, ''),
-      @RM::BlankLine.new,
-      @RM::List.new(:BULLET, *[
-        @RM::ListItem.new(nil,
-          @RM::Paragraph.new('bullet'))]),
-    ]
-
-    assert_equal expected, @RMP.parse(str).parts
-  end
-
-  def test_parse_heading_heading
-    str = '= ='
-
-    expected = [
-      @RM::Heading.new(1, '=')]
-
-    assert_equal expected, @RMP.parse(str).parts
-  end
-
-  def test_parse_heading_lalpha
-    str = '= b. heading one'
-
-    expected = [
-      @RM::Heading.new(1, 'b. heading one')]
-
-    assert_equal expected, @RMP.parse(str).parts
-  end
-
-  def test_parse_heading_label
-    str = '= [heading one]'
-
-    expected = [
-      @RM::Heading.new(1, '[heading one]')]
-
-    assert_equal expected, @RMP.parse(str).parts
-  end
-
-  def test_parse_heading_note
-    str = '= heading one::'
-
-    expected = [
-      @RM::Heading.new(1, 'heading one::')]
-
-    assert_equal expected, @RMP.parse(str).parts
-  end
-
-  def test_parse_heading_number
-    str = '= 5. heading one'
-
-    expected = [
-      @RM::Heading.new(1, '5. heading one')]
-
-    assert_equal expected, @RMP.parse(str).parts
-  end
-
-  def test_parse_heading_ualpha
-    str = '= B. heading one'
-
-    expected = [
-      @RM::Heading.new(1, 'B. heading one')]
-
-    assert_equal expected, @RMP.parse(str).parts
-  end
-
-  def test_parse_label
-    str = <<-STR
-[one] item one
-[two] item two
-    STR
-
-    expected = [
-      list(:LABEL,
-        item(%w[one],
-          para('item one')),
-        item(%w[two],
-          para('item two')))]
-
-    assert_equal expected, @RMP.parse(str).parts
-  end
-
-  def test_parse_label_bullet
-    str = <<-STR
-[cat] l1
-      * l1.1
-[dog] l2
-    STR
-
-    expected = [
-      list(:LABEL,
-        item(%w[cat],
-          para('l1'),
-          list(:BULLET,
-            item(nil,
-              para('l1.1')))),
-        item(%w[dog],
-          para('l2')))]
-
-    assert_equal expected, @RMP.parse(str).parts
-  end
-
-  def test_parse_label_multi_label
-    str = <<-STR
-[one]
-[two] some description
-    STR
-
-    expected = [
-      list(:LABEL,
-        item(%w[one two],
-          para('some description')))]
-
-    assert_equal expected, @RMP.parse(str).parts
-  end
-
-  def test_parse_label_multi_line
-    str = <<-STR
-[cat] l1
-      continuation
-[dog] l2
-    STR
-
-    expected = [
-      list(:LABEL,
-        item(%w[cat],
-          para('l1 ', 'continuation')),
-        item(%w[dog],
-          para('l2')))]
-
-    assert_equal expected, @RMP.parse(str).parts
-  end
-
-  def test_parse_label_newline
-    str = <<-STR
-[one]
-  item one
-[two]
-  item two
-    STR
-
-    expected = [
-      list(:LABEL,
-        item(%w[one],
-          para('item one')),
-        item(%w[two],
-          para('item two')))]
-
-    assert_equal expected, @RMP.parse(str).parts
-  end
-
-  def test_parse_lalpha
-    str = <<-STR
-a. l1
-b. l2
-    STR
-
-    expected = [
-      @RM::List.new(:LALPHA, *[
-        @RM::ListItem.new(nil,
-          @RM::Paragraph.new('l1')),
-        @RM::ListItem.new(nil,
-          @RM::Paragraph.new('l2'))])]
-
-    assert_equal expected, @RMP.parse(str).parts
-  end
-
-  def test_parse_lalpha_ualpha
-    str = <<-STR
-a. l1
-b. l2
-A. l3
-A. l4
-    STR
-
-    expected = [
-      @RM::List.new(:LALPHA, *[
-        @RM::ListItem.new(nil,
-          @RM::Paragraph.new('l1')),
-        @RM::ListItem.new(nil,
-          @RM::Paragraph.new('l2'))]),
-      @RM::List.new(:UALPHA, *[
-        @RM::ListItem.new(nil,
-          @RM::Paragraph.new('l3')),
-        @RM::ListItem.new(nil,
-          @RM::Paragraph.new('l4'))])]
-
-    assert_equal expected, @RMP.parse(str).parts
-  end
-
-  def test_parse_lalpha_utf_8
-    str = <<-STR
-a. 新しい機能
-    STR
-
-    expected = [
-      @RM::List.new(:LALPHA, *[
-        @RM::ListItem.new(nil,
-          @RM::Paragraph.new('新しい機能'))])]
-
-    assert_equal expected, @RMP.parse(str).parts
-  end
-
-  def test_parse_line_break
-    str = "now is\nthe time  \nfor all"
-
-    expected = [
-      para('now is ', 'the time'),
-      blank_line,
-      para('for all')]
-
-    assert_equal expected, @RMP.parse(str).parts
-  end
-
-  def test_parse_list_list_1
-    str = <<-STR
-10. para 1
-
-    [label 1]
-      para 1.1
-
-        code
-
-      para 1.2
-    STR
-
-    expected = [
-      list(:NUMBER,
-        item(nil,
-          para('para 1'),
-          blank_line,
-          list(:LABEL,
-            item(%w[label\ 1],
-              para('para 1.1'),
-              blank_line,
-              verb("code\n"),
-              para('para 1.2')))))]
-
-    assert_equal expected, @RMP.parse(str).parts
-  end
-
-  def test_parse_list_list_2
-    str = <<-STR
-6. para
-
-   label 1::  text 1
-   label 2::  text 2
-    STR
-
-    expected = [
-      list(:NUMBER,
-        item(nil,
-          para('para'),
-          blank_line,
-          list(:NOTE,
-            item(%w[label\ 1],
-              para('text 1')),
-            item(%w[label\ 2],
-              para('text 2')))))]
-
-    assert_equal expected, @RMP.parse(str).parts
-  end
-
-  def test_parse_list_verbatim
-    str = <<-STR
-* one
-    verb1
-    verb2
-* two
-    STR
-
-    expected = [
-      @RM::List.new(:BULLET, *[
-        @RM::ListItem.new(nil,
-          @RM::Paragraph.new('one'),
-          @RM::Verbatim.new("verb1\n", "verb2\n")),
-        @RM::ListItem.new(nil,
-          @RM::Paragraph.new('two'))])]
-
-    assert_equal expected, @RMP.parse(str).parts
-  end
-
-  def test_parse_lists
-    str = <<-STR
-now is
-* l1
-1. n1
-2. n2
-* l2
-the time
-    STR
-
-    expected = [
-      @RM::Paragraph.new('now is'),
-      @RM::List.new(:BULLET, *[
-        @RM::ListItem.new(nil,
-          @RM::Paragraph.new('l1'))]),
-      @RM::List.new(:NUMBER, *[
-        @RM::ListItem.new(nil,
-          @RM::Paragraph.new('n1')),
-        @RM::ListItem.new(nil,
-          @RM::Paragraph.new('n2'))]),
-      @RM::List.new(:BULLET, *[
-        @RM::ListItem.new(nil,
-          @RM::Paragraph.new('l2'))]),
-      @RM::Paragraph.new('the time')]
-
-    assert_equal expected, @RMP.parse(str).parts
-  end
-
-  def test_parse_note
-    str = <<-STR
-one:: item one
-two:: item two
-    STR
-
-    expected = [
-      list(:NOTE,
-        item(%w[one],
-          para('item one')),
-        item(%w[two],
-          para('item two')))]
-
-    assert_equal expected, @RMP.parse(str).parts
-  end
-
-  def test_parse_note_empty
-    str = <<-STR
-one::
-two::
-    STR
-
-    expected = [
-      list(:NOTE,
-        item(%w[one two],
-          blank_line))]
-
-    assert_equal expected, @RMP.parse(str).parts
-  end
-
-  def test_parse_note_note
-    str = <<-STR
-one:: two::
-    STR
-
-    expected = [
-      list(:NOTE,
-        item(%w[one],
-          list(:NOTE,
-            item(%w[two],
-              blank_line))))]
-
-    assert_equal expected, @RMP.parse(str).parts
-  end
-
-  def test_parse_number_bullet
-    str = <<-STR
-1. l1
-   * l1.1
-2. l2
-    STR
-
-    expected = [
-      list(:NUMBER,
-        item(nil,
-          para('l1'),
-          list(:BULLET,
-            item(nil,
-              para('l1.1')))),
-        item(nil,
-          para('l2')))]
-
-    assert_equal expected, @RMP.parse(str).parts
-  end
-
-  def test_parse_paragraph
-    str = <<-STR
-now is the time
-
-for all good men
-    STR
-
-    expected = [
-      @RM::Paragraph.new('now is the time'),
-      @RM::BlankLine.new,
-      @RM::Paragraph.new('for all good men')]
-    assert_equal expected, @RMP.parse(str).parts
-  end
-
-  def test_parse_paragraph_multiline
-    str = "now is the time\nfor all good men"
-
-    expected = @RM::Paragraph.new 'now is the time ', 'for all good men'
-    assert_equal [expected], @RMP.parse(str).parts
-  end
-
-  def test_parse_paragraph_verbatim
-    str = <<-STR
-now is the time
-  code _line_ here
-for all good men
-    STR
-
-    expected = [
-      @RM::Paragraph.new('now is the time'),
-      @RM::Verbatim.new("code _line_ here\n"),
-      @RM::Paragraph.new('for all good men'),
-    ]
-    assert_equal expected, @RMP.parse(str).parts
-  end
-
-  def test_parse_rule
-    str = <<-STR
-now is the time
-
----
-
-for all good men
-    STR
-
-    expected = [
-      @RM::Paragraph.new('now is the time'),
-      @RM::BlankLine.new,
-      @RM::Rule.new(1),
-      @RM::BlankLine.new,
-      @RM::Paragraph.new('for all good men')]
-
-    assert_equal expected, @RMP.parse(str).parts
-  end
-
-  def test_parse_ualpha
-    str = <<-STR
-A. l1
-B. l2
-    STR
-
-    expected = [
-      @RM::List.new(:UALPHA, *[
-        @RM::ListItem.new(nil,
-          @RM::Paragraph.new('l1')),
-        @RM::ListItem.new(nil,
-          @RM::Paragraph.new('l2'))])]
-
-    assert_equal expected, @RMP.parse(str).parts
-  end
-
-  def test_parse_trailing_cr
-    expected = [ @RM::Paragraph.new('Text') ]
-    assert_equal expected, @RMP.parse("Text\r").parts
-  end
-
-  def test_parse_verbatim
-    str = <<-STR
-now is
-   code
-the time
-    STR
-
-    expected = [
-      @RM::Paragraph.new('now is'),
-      @RM::Verbatim.new("code\n"),
-      @RM::Paragraph.new('the time'),
-    ]
-
-    assert_equal expected, @RMP.parse(str).parts
-  end
-
-  def test_parse_verbatim_bullet
-    str = <<-STR
-  * blah
-    STR
-
-    expected = [
-      @RM::Verbatim.new("* blah\n")]
-
-    assert_equal expected, @RMP.parse(str).parts
-  end
-
-  def test_parse_verbatim_dash
-    str = <<-STR
-  - blah
-    STR
-
-    expected = [
-      @RM::Verbatim.new("- blah\n")]
-
-    assert_equal expected, @RMP.parse(str).parts
-  end
-
-  def test_parse_verbatim_fold
-    str = <<-STR
-now is
-   code
-
-
-   code1
-
-the time
-    STR
-
-    expected = [
-      @RM::Paragraph.new('now is'),
-      @RM::Verbatim.new("code\n", "\n", "code1\n"),
-      @RM::Paragraph.new('the time'),
-    ]
-
-    assert_equal expected, @RMP.parse(str).parts
-  end
-
-  def test_parse_verbatim_heading
-    str = <<-STR
-text
-   ===   heading three
-    STR
-
-    expected = [
-      @RM::Paragraph.new('text'),
-      @RM::Verbatim.new("===   heading three\n")]
-
-    assert_equal expected, @RMP.parse(str).parts
-  end
-
-  def test_parse_verbatim_heading2
-    str = "text\n   code\n=== heading three"
-
-    expected = [
-      @RM::Paragraph.new('text'),
-      @RM::Verbatim.new("code\n"),
-      @RM::Heading.new(3, 'heading three')]
-
-    assert_equal expected, @RMP.parse(str).parts
-  end
-
-  def test_parse_verbatim_label
-    str = <<-STR
-  [blah] blah
-    STR
-
-    expected = [
-      @RM::Verbatim.new("[blah] blah\n")]
-
-    assert_equal expected, @RMP.parse(str).parts
-  end
-
-  def test_parse_verbatim_lalpha
-    str = <<-STR
-  b. blah
-    STR
-
-    expected = [
-      @RM::Verbatim.new("b. blah\n")]
-
-    assert_equal expected, @RMP.parse(str).parts
-  end
-
-  def test_parse_verbatim_markup_example
-    str = <<-STR
-text
-   code
-   === heading three
-    STR
-
-    expected = [
-      @RM::Paragraph.new('text'),
-      @RM::Verbatim.new("code\n", "=== heading three\n")]
-
-    assert_equal expected, @RMP.parse(str).parts
-  end
-
-  def test_parse_verbatim_merge
-    str = <<-STR
-now is
-   code
-
-   code1
-the time
-    STR
-
-    expected = [
-      @RM::Paragraph.new('now is'),
-      @RM::Verbatim.new("code\n", "\n", "code1\n"),
-      @RM::Paragraph.new('the time'),
-    ]
-
-    assert_equal expected, @RMP.parse(str).parts
-  end
-
-  def test_parse_verbatim_merge2
-    str = <<-STR
-now is
-   code
-
-   code1
-
-   code2
-the time
-    STR
-
-    expected = [
-      @RM::Paragraph.new('now is'),
-      @RM::Verbatim.new("code\n", "\n", "code1\n", "\n", "code2\n"),
-      @RM::Paragraph.new('the time'),
-    ]
-
-    assert_equal expected, @RMP.parse(str).parts
-  end
-
-  def test_parse_verbatim_multiline
-    str = <<-STR
-now is
-   code
-   code1
-the time
-    STR
-
-    expected = [
-      @RM::Paragraph.new('now is'),
-      @RM::Verbatim.new("code\n", "code1\n"),
-      @RM::Paragraph.new('the time'),
-    ]
-
-    assert_equal expected, @RMP.parse(str).parts
-  end
-
-  def test_parse_verbatim_multilevel
-    str = <<-STR
-now is the time
-  code
- more code
-for all good men
-    STR
-
-    expected = [
-      @RM::Paragraph.new('now is the time'),
-      @RM::Verbatim.new(" code\n",
-                        "more code\n"),
-      @RM::Paragraph.new('for all good men'),
-    ]
-
-    assert_equal expected, @RMP.parse(str).parts
-  end
-
-  def test_parse_verbatim_note
-    str = <<-STR
-  blah:: blah
-    STR
-
-    expected = [
-      @RM::Verbatim.new("blah:: blah\n")]
-
-    assert_equal expected, @RMP.parse(str).parts
-  end
-
-  def test_parse_verbatim_number
-    str = <<-STR
-  2. blah
-    STR
-
-    expected = [
-      @RM::Verbatim.new("2. blah\n")]
-
-    assert_equal expected, @RMP.parse(str).parts
-  end
-
-  def test_parse_verbatim_rule
-    str = <<-STR
-text
-
-  --- lib/blah.rb.orig
-  +++ lib/blah.rb
-    STR
-
-    expected = [
-      @RM::Paragraph.new('text'),
-      @RM::BlankLine.new,
-      @RM::Verbatim.new("--- lib/blah.rb.orig\n",
-                        "+++ lib/blah.rb\n")]
-
-    assert_equal expected, @RMP.parse(str).parts
-  end
-
-  def test_parse_verbatim_rule2
-    str = <<-STR.chomp
-text
-
-  ---
-    STR
-
-    expected = [
-      @RM::Paragraph.new('text'),
-      @RM::BlankLine.new,
-      @RM::Verbatim.new("---")]
-
-    assert_equal expected, @RMP.parse(str).parts
-  end
-
-  def test_parse_verbatim_trim
-    str = <<-STR
-now is
-   code
-
-   code1
-
-the time
-    STR
-
-    expected = [
-      @RM::Paragraph.new('now is'),
-      @RM::Verbatim.new("code\n",
-                        "\n",
-                        "code1\n"),
-      @RM::Paragraph.new('the time'),
-    ]
-
-    assert_equal expected, @RMP.parse(str).parts
-  end
-
-  def test_parse_verbatim_ualpha
-    str = <<-STR
-  B. blah
-    STR
-
-    expected = [
-      @RM::Verbatim.new("B. blah\n")]
-
-    assert_equal expected, @RMP.parse(str).parts
-  end
-
-  def test_parse_whitespace
-    expected = [
-      @RM::Paragraph.new('hello'),
-    ]
-
-    assert_equal expected, @RMP.parse('hello').parts
-
-    expected = [
-      @RM::Verbatim.new('hello '),
-    ]
-
-    assert_equal expected, @RMP.parse('  hello ').parts
-
-    expected = [
-      @RM::Verbatim.new('hello          '),
-    ]
-
-    assert_equal expected, @RMP.parse('                 hello          ').parts
-
-    expected = [
-      @RM::Paragraph.new('1'),
-      @RM::Verbatim.new("2\n", ' 3'),
-    ]
-
-    assert_equal expected, @RMP.parse("1\n 2\n  3").parts
-
-    expected = [
-      @RM::Verbatim.new("1\n",
-                        " 2\n",
-                        "  3"),
-    ]
-
-    assert_equal expected, @RMP.parse("  1\n   2\n    3").parts
-
-    expected = [
-      @RM::Paragraph.new('1'),
-      @RM::Verbatim.new("2\n",
-                        " 3\n"),
-      @RM::Paragraph.new('1'),
-      @RM::Verbatim.new('2'),
-    ]
-
-    assert_equal expected, @RMP.parse("1\n 2\n  3\n1\n 2").parts
-
-    expected = [
-      @RM::Verbatim.new("1\n",
-                        " 2\n",
-                        "  3\n",
-                        "1\n",
-                        ' 2'),
-    ]
-
-    assert_equal expected, @RMP.parse("  1\n   2\n    3\n  1\n   2").parts
-
-    expected = [
-      @RM::Verbatim.new("1\n",
-                        " 2\n",
-                        "\n",
-                        '  3'),
-    ]
-
-    assert_equal expected, @RMP.parse("  1\n   2\n\n    3").parts
-  end
-
-  def test_parse_block_quote
-    expected = [
-      @RM::BlockQuote.new(@RM::Paragraph.new("foo"))
-    ]
-    assert_equal expected, @RMP.parse(<<-DOC).parts
->>>
-  foo
-    DOC
-
-    expected = [
-      @RM::BlockQuote.new(@RM::Paragraph.new("foo"),
-                          @RM::Verbatim.new("code\n"),
-                          @RM::Paragraph.new("bar"))
-    ]
-    assert_equal expected, @RMP.parse(<<-DOC).parts
->>>
-  foo
-    code
-  bar
-    DOC
-
-    expected = [
-      @RM::BlockQuote.new(@RM::Paragraph.new("foo"),
-                          @RM::BlockQuote.new(@RM::Paragraph.new("bar")),
-                          @RM::Paragraph.new("zot"))
-    ]
-    assert_equal expected, @RMP.parse(<<-DOC).parts
->>>
-  foo
-  >>>
-    bar
-  zot
-    DOC
-  end
-
-  def test_peek_token
-    parser = util_parser
-
-    assert_equal [:HEADER, 1, 0, 0], parser.peek_token
-
-    assert_equal 8, parser.tokens.length
-  end
-
-  def test_skip
-    parser = util_parser
-
-    assert_equal [:HEADER, 1, 0, 0], parser.skip(:HEADER)
-
-    assert_equal [:TEXT, 'Heading', 2, 0], parser.get
-
-    assert_equal [:NEWLINE, "\n", 9, 0], parser.peek_token
-
-    assert_raise RDoc::Markup::Parser::ParseError do
-      parser.skip :NONE
-    end
-
-    assert_equal [:NEWLINE, "\n", 9, 0], parser.peek_token
-
-    assert_nil parser.skip(:NONE, false)
-
-    assert_equal [:NEWLINE, "\n", 9, 0], parser.peek_token
-  end
-
-  def test_tokenize_bullet
-    str = <<-STR
-* l1
-    STR
-
-    expected = [
-      [:BULLET,  '*',     0, 0],
-      [:TEXT,    'l1',    2, 0],
-      [:NEWLINE, "\n",    4, 0],
-    ]
-
-    assert_equal expected, @RMP.tokenize(str)
-  end
-
-  def test_tokenize_bullet_indent
-    str = <<-STR
-* l1
-  * l1.1
-    STR
-
-    expected = [
-      [:BULLET,  '*',     0, 0],
-      [:TEXT,    'l1',    2, 0],
-      [:NEWLINE, "\n",    4, 0],
-      [:BULLET,  '*',     2, 1],
-      [:TEXT,    'l1.1',  4, 1],
-      [:NEWLINE, "\n",    8, 1],
-    ]
-
-    assert_equal expected, @RMP.tokenize(str)
-  end
-
-  def test_tokenize_heading
-    str = <<-STR
-= Heading
-== Heading 2
-    STR
-
-    expected = [
-      [:HEADER,  1,            0, 0],
-      [:TEXT,    'Heading',    2, 0],
-      [:NEWLINE, "\n",         9, 0],
-      [:HEADER,  2,            0, 1],
-      [:TEXT,    'Heading 2',  3, 1],
-      [:NEWLINE, "\n",        12, 1],
-    ]
-
-    assert_equal expected, @RMP.tokenize(str)
-  end
-
-  def test_tokenize_heading_empty
-    str = <<-STR
-===
-* bullet
-    STR
-
-    expected = [
-      [:HEADER,  3,        0, 0],
-      [:NEWLINE, "\n",     3, 0],
-      [:BULLET,  "*",      0, 1],
-      [:TEXT,    "bullet", 2, 1],
-      [:NEWLINE, "\n",     8, 1],
-    ]
-
-    assert_equal expected, @RMP.tokenize(str)
-  end
-
-  def test_tokenize_heading_heading
-    str = <<-STR
-= =
-    STR
-
-    expected = [
-      [:HEADER,  1,    0, 0],
-      [:TEXT,    '=',  2, 0],
-      [:NEWLINE, "\n", 3, 0],
-    ]
-
-    assert_equal expected, @RMP.tokenize(str)
-  end
-
-  def test_tokenize_heading_no_space
-    str = <<-STR
-=Heading
-==Heading 2
-    STR
-
-    expected = [
-      [:HEADER,  1,            0, 0],
-      [:TEXT,    'Heading',    1, 0],
-      [:NEWLINE, "\n",         8, 0],
-      [:HEADER,  2,            0, 1],
-      [:TEXT,    'Heading 2',  2, 1],
-      [:NEWLINE, "\n",        11, 1],
-    ]
-
-    assert_equal expected, @RMP.tokenize(str)
-  end
-
-  def test_tokenize_label
-    str = <<-STR
-[cat] l1
-[dog] l1.1
-    STR
-
-    expected = [
-      [:LABEL,   'cat',   0, 0],
-      [:TEXT,    'l1',    6, 0],
-      [:NEWLINE, "\n",    8, 0],
-      [:LABEL,   'dog',   0, 1],
-      [:TEXT,    'l1.1',  6, 1],
-      [:NEWLINE, "\n",   10, 1],
-    ]
-
-    assert_equal expected, @RMP.tokenize(str)
-  end
-
-  def test_tokenize_label_note
-    str = <<-STR
-[label]
-  note::
-    STR
-
-    expected = [
-      [:LABEL,   'label', 0, 0],
-      [:NEWLINE, "\n",    7, 0],
-      [:NOTE,    'note',  2, 1],
-      [:NEWLINE, "\n",    8, 1],
-    ]
-
-    assert_equal expected, @RMP.tokenize(str)
-  end
-
-  def test_tokenize_label_newline
-    str = <<-STR
-[cat]
-  l1
-    STR
-
-    expected = [
-      [:LABEL,   'cat',   0, 0],
-      [:NEWLINE, "\n",    5, 0],
-      [:TEXT,    'l1',    2, 1],
-      [:NEWLINE, "\n",    4, 1],
-    ]
-
-    assert_equal expected, @RMP.tokenize(str)
-  end
-
-  def test_tokenize_label_newline_windows
-    str = <<-STR
-[cat]\r
-  l1\r
-    STR
-
-    expected = [
-      [:LABEL,   'cat',   0, 0],
-      [:NEWLINE, "\n",    6, 0],
-      [:TEXT,    'l1',    2, 1],
-      [:NEWLINE, "\n",    5, 1],
-    ]
-
-    assert_equal expected, @RMP.tokenize(str)
-  end
-
-  def test_tokenize_lalpha
-    str = <<-STR
-a. l1
-b. l1.1
-    STR
-
-    expected = [
-      [:LALPHA,  'a',     0, 0],
-      [:TEXT,    'l1',    3, 0],
-      [:NEWLINE, "\n",    5, 0],
-      [:LALPHA,  'b',     0, 1],
-      [:TEXT,    'l1.1',  3, 1],
-      [:NEWLINE, "\n",    7, 1],
-    ]
-
-    assert_equal expected, @RMP.tokenize(str)
-  end
-
-  def test_tokenize_line_break
-    str = "now is\nthe time  \nfor all\n"
-
-    expected = [
-      [:TEXT,    'now is',    0, 0],
-      [:NEWLINE, "\n",        6, 0],
-      [:TEXT,    'the time',  0, 1],
-      [:BREAK,   "  ",        8, 1],
-      [:NEWLINE, "\n",       10, 1],
-      [:TEXT,    'for all',   0, 2],
-      [:NEWLINE, "\n",        7, 2],
-    ]
-
-    assert_equal expected, @RMP.tokenize(str)
-  end
-
-  def test_tokenize_line_break_long
-    str = "now is\nthe time   \nfor all\n"
-
-    expected = [
-      [:TEXT,    'now is',     0, 0],
-      [:NEWLINE, "\n",         6, 0],
-      [:TEXT,    'the time ',  0, 1],
-      [:BREAK,   '  ',         9, 1],
-      [:NEWLINE, "\n",        11, 1],
-      [:TEXT,    'for all',    0, 2],
-      [:NEWLINE, "\n",         7, 2],
-    ]
-
-    assert_equal expected, @RMP.tokenize(str)
-  end
-
-  def test_tokenize_line_break_no_short
-    str = "now is\nthe time \nfor all\n"
-
-    expected = [
-      [:TEXT,    'now is',    0, 0],
-      [:NEWLINE, "\n",        6, 0],
-      [:TEXT,    'the time ', 0, 1],
-      [:NEWLINE, "\n",        9, 1],
-      [:TEXT,    'for all',   0, 2],
-      [:NEWLINE, "\n",        7, 2],
-    ]
-
-    assert_equal expected, @RMP.tokenize(str)
-  end
-
-  def test_tokenize_note
-    str = <<-STR
-cat:: l1
-dog:: l1.1
-    STR
-
-    expected = [
-      [:NOTE,    'cat',   0, 0],
-      [:TEXT,    'l1',    6, 0],
-      [:NEWLINE, "\n",    8, 0],
-      [:NOTE,    'dog',   0, 1],
-      [:TEXT,    'l1.1',  6, 1],
-      [:NEWLINE, "\n",   10, 1],
-    ]
-
-    assert_equal expected, @RMP.tokenize(str)
-  end
-
-  def test_tokenize_note_empty
-    str = <<-STR
-cat::
-dog::
-    STR
-
-    expected = [
-      [:NOTE,    'cat', 0, 0],
-      [:NEWLINE, "\n",  5, 0],
-      [:NOTE,    'dog', 0, 1],
-      [:NEWLINE, "\n",  5, 1],
-    ]
-
-    assert_equal expected, @RMP.tokenize(str)
-  end
-
-  def test_tokenize_note_newline
-    str = <<-STR
-cat::
-  l1
-    STR
-
-    expected = [
-      [:NOTE,    'cat',   0, 0],
-      [:NEWLINE, "\n",    5, 0],
-      [:TEXT,    'l1',    2, 1],
-      [:NEWLINE, "\n",    4, 1],
-    ]
-
-    assert_equal expected, @RMP.tokenize(str)
-  end
-
-  def test_tokenize_note_utf_8
-    str = <<-STR
-cät:: l1a
-      l1b
-døg:: l2a
-      l2b
-    STR
-
-    expected = [
-      [:NOTE,    'cät',   0, 0],
-      [:TEXT,    'l1a',   6, 0],
-      [:NEWLINE, "\n",    9, 0],
-      [:TEXT,    'l1b',   6, 1],
-      [:NEWLINE, "\n",    9, 1],
-      [:NOTE,    'døg',   0, 2],
-      [:TEXT,    'l2a',   6, 2],
-      [:NEWLINE, "\n",    9, 2],
-      [:TEXT,    'l2b',   6, 3],
-      [:NEWLINE, "\n",    9, 3],
-    ]
-
-    assert_equal expected, @RMP.tokenize(str)
-  end
-
-  def test_tokenize_note_newline_windows
-    str = <<-STR
-cat::\r
-  l1\r
-    STR
-
-    expected = [
-      [:NOTE,    'cat',   0, 0],
-      [:NEWLINE, "\n",    6, 0],
-      [:TEXT,    'l1',    2, 1],
-      [:NEWLINE, "\n",    5, 1],
-    ]
-
-    assert_equal expected, @RMP.tokenize(str)
-  end
-
-  def test_tokenize_note_not
-    str = <<-STR
-Cat::Dog
-    STR
-
-    expected = [
-      [:TEXT,    'Cat::Dog', 0, 0],
-      [:NEWLINE, "\n",       8, 0],
-    ]
-
-    assert_equal expected, @RMP.tokenize(str)
-  end
-
-  def test_tokenize_number
-    str = <<-STR
-1. l1
-2. l1.1
-    STR
-
-    expected = [
-      [:NUMBER,  '1',     0, 0],
-      [:TEXT,    'l1',    3, 0],
-      [:NEWLINE, "\n",    5, 0],
-      [:NUMBER,  '2',     0, 1],
-      [:TEXT,    'l1.1',  3, 1],
-      [:NEWLINE, "\n",    7, 1],
-    ]
-
-    assert_equal expected, @RMP.tokenize(str)
-  end
-
-  def test_tokenize_number_period
-    str = <<-STR
-1. blah blah blah
-   l.
-2. blah blah blah blah
-   d.
-    STR
-
-    expected = [
-      [:NUMBER,  "1",                    0, 0],
-      [:TEXT,    "blah blah blah",       3, 0],
-      [:NEWLINE, "\n",                  17, 0],
-
-      [:TEXT,    "l.",                   3, 1],
-      [:NEWLINE, "\n",                   5, 1],
-
-      [:NUMBER,  "2",                    0, 2],
-      [:TEXT,    "blah blah blah blah",  3, 2],
-      [:NEWLINE, "\n",                  22, 2],
-
-      [:TEXT,    "d.",                   3, 3],
-      [:NEWLINE, "\n",                   5, 3]
-    ]
-
-    assert_equal expected, @RMP.tokenize(str)
-  end
-
-  def test_tokenize_number_period_continue
-    str = <<-STR
-1. blah blah blah
-   l.  more stuff
-2. blah blah blah blah
-   d. other stuff
-    STR
-
-    expected = [
-      [:NUMBER,  "1",                    0, 0],
-      [:TEXT,    "blah blah blah",       3, 0],
-      [:NEWLINE, "\n",                  17, 0],
-
-      [:LALPHA,  "l",                    3, 1],
-      [:TEXT,    "more stuff",           7, 1],
-      [:NEWLINE, "\n",                  17, 1],
-
-      [:NUMBER,  "2",                    0, 2],
-      [:TEXT,    "blah blah blah blah",  3, 2],
-      [:NEWLINE, "\n",                  22, 2],
-
-      [:LALPHA,  "d",                    3, 3],
-      [:TEXT,    "other stuff",          6, 3],
-      [:NEWLINE, "\n",                  17, 3]
-    ]
-
-    assert_equal expected, @RMP.tokenize(str)
-  end
-
-  def test_tokenize_paragraphs
-    str = <<-STR
-now is
-the time
-
-for all
-    STR
-
-    expected = [
-      [:TEXT,    'now is',   0, 0],
-      [:NEWLINE, "\n",       6, 0],
-      [:TEXT,    'the time', 0, 1],
-      [:NEWLINE, "\n",       8, 1],
-      [:NEWLINE, "\n",       0, 2],
-      [:TEXT,    'for all',  0, 3],
-      [:NEWLINE, "\n",       7, 3],
-    ]
-
-    assert_equal expected, @RMP.tokenize(str)
-  end
-
-  def test_tokenize_rule
-    str = <<-STR
----
-
---- blah ---
-    STR
-
-    expected = [
-      [:RULE,    1,            0, 0],
-      [:NEWLINE, "\n",         3, 0],
-      [:NEWLINE, "\n",         0, 1],
-      [:TEXT, "--- blah ---",  0, 2],
-      [:NEWLINE, "\n",        12, 2],
-    ]
-
-    assert_equal expected, @RMP.tokenize(str)
-  end
-
-  def test_tokenize_rule_windows
-    str = <<-STR
----\r
-
---- blah ---\r
-    STR
-
-    expected = [
-      [:RULE,    1,            0, 0],
-      [:NEWLINE, "\n",         4, 0],
-      [:NEWLINE, "\n",         0, 1],
-      [:TEXT, "--- blah ---",  0, 2],
-      [:NEWLINE, "\n",        13, 2],
-    ]
-
-    assert_equal expected, @RMP.tokenize(str)
-  end
-
-  def test_tokenize_ualpha
-    str = <<-STR
-A. l1
-B. l1.1
-    STR
-
-    expected = [
-      [:UALPHA,  'A',     0, 0],
-      [:TEXT,    'l1',    3, 0],
-      [:NEWLINE, "\n",    5, 0],
-      [:UALPHA,  'B',     0, 1],
-      [:TEXT,    'l1.1',  3, 1],
-      [:NEWLINE, "\n",    7, 1],
-    ]
-
-    assert_equal expected, @RMP.tokenize(str)
-  end
-
-  def test_tokenize_verbatim_heading
-    str = <<-STR
-Example heading:
-
-   === heading three
-    STR
-
-    expected = [
-      [:TEXT,    'Example heading:',  0, 0],
-      [:NEWLINE, "\n",               16, 0],
-      [:NEWLINE, "\n",                0, 1],
-      [:HEADER,  3,                   3, 2],
-      [:TEXT,    'heading three',     7, 2],
-      [:NEWLINE, "\n",               20, 2],
-    ]
-
-    assert_equal expected, @RMP.tokenize(str)
-  end
-
-  def test_tokenize_verbatim_rule
-    str = <<-STR
-  Verbatim section here that is double-underlined
-  ===============================================
-    STR
-
-    expected = [
-      [:TEXT,    'Verbatim section here that is double-underlined',  2, 0],
-      [:NEWLINE, "\n",                                              49, 0],
-      [:HEADER,  47,                                                 2, 1],
-      [:NEWLINE, "\n",                                              49, 1],
-    ]
-
-    assert_equal expected, @RMP.tokenize(str)
-  end
-
-  def test_tokenize_verbatim_rule_fancy
-    str = <<-STR
-  A
-    b
-  ===============================================
-    c
-    STR
-
-    expected = [
-      [:TEXT,    'A',   2, 0],
-      [:NEWLINE, "\n",  3, 0],
-      [:TEXT,    'b',   4, 1],
-      [:NEWLINE, "\n",  5, 1],
-      [:HEADER,  47,    2, 2],
-      [:NEWLINE, "\n", 49, 2],
-      [:TEXT,    'c',   4, 3],
-      [:NEWLINE, "\n",  5, 3],
-    ]
-
-    assert_equal expected, @RMP.tokenize(str)
-  end
-
-  # HACK move to Verbatim test case
-  def test_verbatim_normalize
-    v = @RM::Verbatim.new "foo\n", "\n", "\n", "bar\n"
-
-    v.normalize
-
-    assert_equal ["foo\n", "\n", "bar\n"], v.parts
-
-    v = @RM::Verbatim.new "foo\n", "\n"
-
-    v.normalize
-
-    assert_equal ["foo\n"], v.parts
-  end
-
-  def test_unget
-    parser = util_parser
-
-    parser.get
-
-    parser.unget
-
-    assert_equal [:HEADER, 1, 0, 0], parser.peek_token
-
-    assert_raise @RMP::Error do
-      parser.unget
-    end
-
-    assert_equal 8, parser.tokens.length
-  end
-
-  def util_parser
-    str = <<-STR
-= Heading
-
-Some text here
-some more text over here
-    STR
-
-    @parser = @RMP.new
-    @parser.tokenize str
-    @parser
-  end
-
-end
diff --git a/test/rdoc/test_rdoc_markup_pre_process.rb b/test/rdoc/test_rdoc_markup_pre_process.rb
deleted file mode 100644
index cc5bdc3abf390e..00000000000000
--- a/test/rdoc/test_rdoc_markup_pre_process.rb
+++ /dev/null
@@ -1,467 +0,0 @@
-# frozen_string_literal: true
-
-require_relative 'helper'
-
-class TestRDocMarkupPreProcess < RDoc::TestCase
-
-  def setup
-    super
-
-    @tempfile = Tempfile.new 'test_rdoc_markup_pre_process'
-    @file_name = File.basename @tempfile.path
-    @dir  = File.dirname @tempfile.path
-
-    @pp = RDoc::Markup::PreProcess.new @tempfile.path, [@dir, File.dirname(__FILE__)]
-  end
-
-  def teardown
-    super
-
-    @tempfile.close!
-  end
-
-  def test_class_register
-    RDoc::Markup::PreProcess.register 'for_test' do raise 'fail' end
-
-    assert_equal %w[for_test], RDoc::Markup::PreProcess.registered.keys
-  end
-
-  def test_class_post_process
-    RDoc::Markup::PreProcess.post_process do end
-
-    assert_equal 1, RDoc::Markup::PreProcess.post_processors.length,
-                 proc{RDoc::Markup::PreProcess.post_processors.inspect}
-  end
-
-  def test_include_file
-    @tempfile.write <<-INCLUDE
-# -*- mode: rdoc; coding: utf-8; fill-column: 74; -*-
-
-Regular expressions (<i>regexp</i>s) are patterns which describe the
-contents of a string.
-    INCLUDE
-
-    @tempfile.flush
-    @tempfile.rewind
-
-    content = @pp.include_file @file_name, '', nil
-
-    expected = <<-EXPECTED
-Regular expressions (<i>regexp</i>s) are patterns which describe the
-contents of a string.
-    EXPECTED
-
-    assert_equal expected, content
-  end
-
-  def test_include_file_encoding_incompatible
-    @tempfile.write <<-INCLUDE
-# -*- mode: rdoc; coding: utf-8; fill-column: 74; -*-
-
-π
-    INCLUDE
-
-    @tempfile.flush
-    @tempfile.rewind
-
-    content = @pp.include_file @file_name, '', Encoding::US_ASCII
-
-    expected = "?\n"
-
-    assert_equal expected, content
-  end
-
-  def test_include_file_in_other_directory
-    content = nil
-    out, err = capture_output do
-      content = @pp.include_file "test.txt", '', nil
-    end
-
-    assert_empty out
-    assert_empty err
-
-    assert_equal "test file\n", content
-  end
-
-  def test_handle
-    text = "# :main: M\n"
-    out = @pp.handle text
-
-    assert_equal "#\n", out
-  end
-
-  def test_handle_comment
-    text = "# :main: M\n"
-    c = comment text
-
-    out = @pp.handle c
-
-    assert_equal "#\n", out
-  end
-
-  def test_handle_markup
-    c = comment ':markup: rd'
-
-    @pp.handle c
-
-    assert_equal 'rd', c.format
-  end
-
-  def test_handle_markup_empty
-    c = comment ':markup:'
-
-    @pp.handle c
-
-    assert_equal 'rdoc', c.format
-  end
-
-  def test_handle_post_process
-    cd = RDoc::CodeObject.new
-
-    RDoc::Markup::PreProcess.post_process do |text, code_object|
-      code_object.metadata[:stuff] = text
-
-      :junk
-    end
-
-    text = "# a b c\n"
-
-    out = @pp.handle text, cd
-
-    assert_equal "# a b c\n", out
-    assert_equal "# a b c\n", cd.metadata[:stuff]
-  end
-
-  def test_handle_unregistered
-    text = "# :x: y\n"
-    out = @pp.handle text
-
-    assert_equal text, out
-  end
-
-  def test_handle_directive_blankline
-    result = @pp.handle_directive '#', 'arg', 'a, b'
-
-    assert_equal "#:arg: a, b\n", result
-  end
-
-  def test_handle_directive_downcase
-    method = RDoc::AnyMethod.new nil, 'm'
-
-    @pp.handle_directive '', 'ARG', 'a, b', method
-
-    assert_equal 'a, b', method.params
-  end
-
-  def test_handle_directive_arg
-    method = RDoc::AnyMethod.new nil, 'm'
-
-    @pp.handle_directive '', 'arg', 'a, b', method
-
-    assert_equal 'a, b', method.params
-  end
-
-  def test_handle_directive_arg_no_context
-    result = @pp.handle_directive '', 'arg', 'a, b', nil
-
-    assert_equal ":arg: a, b\n", result
-  end
-
-  def test_handle_directive_args
-    method = RDoc::AnyMethod.new nil, 'm'
-
-    @pp.handle_directive '', 'args', 'a, b', method
-
-    assert_equal 'a, b', method.params
-  end
-
-  def test_handle_directive_block
-    result = @pp.handle_directive '', 'x', 'y' do |directive, param|
-      ''
-    end
-
-    assert_empty result
-  end
-
-  def test_handle_directive_block_false
-    result = @pp.handle_directive '', 'x', 'y' do |directive, param|
-      false
-    end
-
-    assert_equal ":x: y\n", result
-  end
-
-  def test_handle_directive_block_nil
-    result = @pp.handle_directive '', 'x', 'y' do |directive, param|
-      nil
-    end
-
-    assert_equal ":x: y\n", result
-  end
-
-  def test_handle_directive_category
-    context = RDoc::Context.new
-    original_section = context.current_section
-
-    @pp.handle_directive '', 'category', 'other', context
-
-    refute_equal original_section, context.current_section
-  end
-
-  def test_handle_directive_doc
-    code_object = RDoc::CodeObject.new
-    code_object.document_self = false
-    code_object.force_documentation = false
-
-    @pp.handle_directive '', 'doc', nil, code_object
-
-    assert code_object.document_self
-    assert code_object.force_documentation
-  end
-
-  def test_handle_directive_doc_no_context
-    result = @pp.handle_directive '', 'doc', nil
-
-    assert_equal "\n", result
-  end
-
-  def test_handle_directive_enddoc
-    code_object = RDoc::CodeObject.new
-
-    @pp.handle_directive '', 'enddoc', nil, code_object
-
-    assert code_object.done_documenting
-  end
-
-  def test_handle_directive_include
-    @tempfile.write 'included'
-    @tempfile.flush
-
-    result = @pp.handle_directive '', 'include', @file_name
-
-    assert_equal 'included', result
-  end
-
-  def test_handle_directive_main
-    @pp.options = RDoc::Options.new
-
-    @pp.handle_directive '', 'main', 'M'
-
-    assert_equal 'M', @pp.options.main_page
-  end
-
-  def test_handle_directive_notnew
-    m = RDoc::AnyMethod.new nil, 'm'
-
-    @pp.handle_directive '', 'notnew', nil, m
-
-    assert m.dont_rename_initialize
-  end
-
-  def test_handle_directive_not_new
-    m = RDoc::AnyMethod.new nil, 'm'
-
-    @pp.handle_directive '', 'not_new', nil, m
-
-    assert m.dont_rename_initialize
-  end
-
-  def test_handle_directive_not_dash_new
-    m = RDoc::AnyMethod.new nil, 'm'
-
-    @pp.handle_directive '', 'not-new', nil, m
-
-    assert m.dont_rename_initialize
-  end
-
-  def test_handle_directive_nodoc
-    code_object = RDoc::CodeObject.new
-    code_object.document_self = true
-    code_object.document_children = true
-
-    @pp.handle_directive '', 'nodoc', nil, code_object
-
-    refute code_object.document_self
-    assert code_object.document_children
-  end
-
-  def test_handle_directive_nodoc_all
-    code_object = RDoc::CodeObject.new
-    code_object.document_self = true
-    code_object.document_children = true
-
-    @pp.handle_directive '', 'nodoc', 'all', code_object
-
-    refute code_object.document_self
-    refute code_object.document_children
-  end
-
-  def test_handle_directive_nodoc_no_context
-    result = @pp.handle_directive '', 'nodoc', nil
-
-    assert_equal "\n", result
-  end
-
-  def test_handle_directive_registered
-    RDoc::Markup::PreProcess.register 'x'
-
-    result = @pp.handle_directive '', 'x', 'y'
-
-    assert_nil result
-
-    result = @pp.handle_directive '', 'x', 'y' do |directive, param|
-      false
-    end
-
-    assert_equal ":x: y\n", result
-
-    result = @pp.handle_directive '', 'x', 'y' do |directive, param|
-      ''
-    end
-
-    assert_equal '', result
-  end
-
-  def test_handle_directive_registered_block
-    called = nil
-
-    RDoc::Markup::PreProcess.register 'x' do |directive, param|
-      called = [directive, param]
-      'blah'
-    end
-
-    result = @pp.handle_directive '', 'x', 'y'
-
-    assert_equal 'blah', result
-    assert_equal %w[x y], called
-  end
-
-  def test_handle_directive_registered_code_object
-    RDoc::Markup::PreProcess.register 'x'
-    code_object = RDoc::CodeObject.new
-
-    @pp.handle_directive '', 'x', 'y', code_object
-
-    assert_equal 'y', code_object.metadata['x']
-
-    code_object.metadata.clear
-
-    result = @pp.handle_directive '', 'x', 'y' do |directive, param|
-      false
-    end
-
-    assert_equal ":x: y\n", result
-    assert_empty code_object.metadata
-
-    result = @pp.handle_directive '', 'x', 'y' do |directive, param|
-      ''
-    end
-
-    assert_equal '', result
-    assert_empty code_object.metadata
-  end
-
-  def test_handle_directive_startdoc
-    code_object = RDoc::CodeObject.new
-    code_object.stop_doc
-    code_object.force_documentation = false
-
-    @pp.handle_directive '', 'startdoc', nil, code_object
-
-    assert code_object.document_self
-    assert code_object.document_children
-    assert code_object.force_documentation
-  end
-
-  def test_handle_directive_stopdoc
-    code_object = RDoc::CodeObject.new
-
-    @pp.handle_directive '', 'stopdoc', nil, code_object
-
-    refute code_object.document_self
-    refute code_object.document_children
-  end
-
-  def test_handle_directive_title
-    @pp.options = RDoc::Options.new
-
-    @pp.handle_directive '', 'title', 'T'
-
-    assert_equal 'T', @pp.options.title
-  end
-
-  def test_handle_directive_unhandled
-    code_object = RDoc::CodeObject.new
-
-    @pp.handle_directive '', 'x', 'y', code_object
-
-    assert_equal 'y', code_object.metadata['x']
-
-    code_object.metadata.clear
-
-    @pp.handle_directive '', 'x', '', code_object
-
-    assert_includes code_object.metadata, 'x'
-  end
-
-  def test_handle_directive_unhandled_block
-    code_object = RDoc::CodeObject.new
-
-    @pp.handle_directive '', 'x', 'y', code_object do
-      false
-    end
-
-    assert_empty code_object.metadata
-
-    @pp.handle_directive '', 'x', 'y', code_object do
-      nil
-    end
-
-    assert_equal 'y', code_object.metadata['x']
-
-    code_object.metadata.clear
-
-    @pp.handle_directive '', 'x', 'y', code_object do
-      ''
-    end
-
-    assert_empty code_object.metadata
-  end
-
-  def test_handle_directive_yield
-    method = RDoc::AnyMethod.new nil, 'm'
-    method.params = 'index, &block'
-
-    @pp.handle_directive '', 'yield', 'item', method
-
-    assert_equal 'item', method.block_params
-    assert_equal 'index', method.params
-  end
-
-  def test_handle_directive_yield_block_param
-    method = RDoc::AnyMethod.new nil, 'm'
-    method.params = '&block'
-
-    @pp.handle_directive '', 'yield', 'item', method
-
-    assert_equal 'item', method.block_params
-    assert_empty method.params
-  end
-
-  def test_handle_directive_yield_no_context
-    method = RDoc::AnyMethod.new nil, 'm'
-
-    @pp.handle_directive '', 'yield', 'item', method
-
-    assert_equal 'item', method.block_params
-  end
-
-  def test_handle_directive_yields
-    method = RDoc::AnyMethod.new nil, 'm'
-
-    @pp.handle_directive '', 'yields', 'item', method
-
-    assert_equal 'item', method.block_params
-  end
-
-end
diff --git a/test/rdoc/test_rdoc_markup_raw.rb b/test/rdoc/test_rdoc_markup_raw.rb
deleted file mode 100644
index 52887e6f6c6030..00000000000000
--- a/test/rdoc/test_rdoc_markup_raw.rb
+++ /dev/null
@@ -1,22 +0,0 @@
-# frozen_string_literal: true
-require_relative 'helper'
-
-class TestRDocMarkupRaw < RDoc::TestCase
-
-  def setup
-    super
-
-    @p = @RM::Raw.new
-  end
-
-  def test_push
-    @p.push 'hi', 'there'
-
-    assert_equal @RM::Raw.new('hi', 'there'), @p
-  end
-
-  def test_pretty_print
-    assert_equal '[raw: ]', mu_pp(@p)
-  end
-
-end
diff --git a/test/rdoc/test_rdoc_markup_to_ansi.rb b/test/rdoc/test_rdoc_markup_to_ansi.rb
deleted file mode 100644
index 81372c64d284df..00000000000000
--- a/test/rdoc/test_rdoc_markup_to_ansi.rb
+++ /dev/null
@@ -1,369 +0,0 @@
-# frozen_string_literal: true
-require_relative 'helper'
-
-class TestRDocMarkupToAnsi < RDoc::Markup::TextFormatterTestCase
-
-  add_visitor_tests
-  add_text_tests
-
-  def setup
-    super
-
-    @to = RDoc::Markup::ToAnsi.new
-  end
-
-  def accept_blank_line
-    assert_equal "\e[0m\n", @to.res.join
-  end
-
-  def accept_block_quote
-    assert_equal "\e[0m> quote\n", @to.res.join
-  end
-
-  def accept_document
-    assert_equal "\e[0mhello\n", @to.res.join
-  end
-
-  def accept_heading
-    assert_equal "\e[0mHello\n", @to.res.join
-  end
-
-  def accept_list_end_bullet
-    assert_empty @to.list_index
-    assert_empty @to.list_type
-    assert_empty @to.list_width
-  end
-
-  def accept_list_end_label
-    assert_empty @to.list_index
-    assert_empty @to.list_type
-    assert_empty @to.list_width
-  end
-
-  def accept_list_end_lalpha
-    assert_empty @to.list_index
-    assert_empty @to.list_type
-    assert_empty @to.list_width
-  end
-
-  def accept_list_end_note
-    assert_empty @to.list_index
-    assert_empty @to.list_type
-    assert_empty @to.list_width
-  end
-
-  def accept_list_end_number
-    assert_empty @to.list_index
-    assert_empty @to.list_type
-    assert_empty @to.list_width
-  end
-
-  def accept_list_end_ualpha
-    assert_empty @to.list_index
-    assert_empty @to.list_type
-    assert_empty @to.list_width
-  end
-
-  def accept_list_item_end_bullet
-    assert_equal 0, @to.indent, 'indent'
-  end
-
-  def accept_list_item_end_label
-    assert_equal "\e[0mcat:\n", @to.res.join
-    assert_equal 0, @to.indent, 'indent'
-  end
-
-  def accept_list_item_end_lalpha
-    assert_equal 0, @to.indent, 'indent'
-    assert_equal 'b', @to.list_index.last
-  end
-
-  def accept_list_item_end_note
-    assert_equal "\e[0mcat:\n", @to.res.join
-    assert_equal 0, @to.indent, 'indent'
-  end
-
-  def accept_list_item_end_number
-    assert_equal 0, @to.indent, 'indent'
-    assert_equal 2, @to.list_index.last
-  end
-
-  def accept_list_item_end_ualpha
-    assert_equal 0, @to.indent, 'indent'
-    assert_equal 'B', @to.list_index.last
-  end
-
-  def accept_list_item_start_bullet
-    assert_equal %W"\e[0m", @to.res
-    assert_equal '* ', @to.prefix
-  end
-
-  def accept_list_item_start_label
-    assert_equal %W"\e[0m", @to.res
-    assert_equal "cat:\n  ", @to.prefix
-
-    assert_equal 2, @to.indent
-  end
-
-  def accept_list_item_start_lalpha
-    assert_equal %W"\e[0m", @to.res
-    assert_equal 'a. ', @to.prefix
-
-    assert_equal 'a', @to.list_index.last
-    assert_equal 3, @to.indent
-  end
-
-  def accept_list_item_start_note
-    assert_equal %W"\e[0m", @to.res
-    assert_equal "cat:\n  ", @to.prefix
-
-    assert_equal 2, @to.indent
-  end
-
-  def accept_list_item_start_number
-    assert_equal %W"\e[0m", @to.res
-    assert_equal '1. ', @to.prefix
-
-    assert_equal 1, @to.list_index.last
-    assert_equal 3, @to.indent
-  end
-
-  def accept_list_item_start_ualpha
-    assert_equal %W"\e[0m", @to.res
-    assert_equal 'A. ', @to.prefix
-
-    assert_equal 'A', @to.list_index.last
-    assert_equal 3, @to.indent
-  end
-
-  def accept_list_start_bullet
-    assert_equal "\e[0m",   @to.res.join
-    assert_equal [nil],     @to.list_index
-    assert_equal [:BULLET], @to.list_type
-    assert_equal [1],       @to.list_width
-  end
-
-  def accept_list_start_label
-    assert_equal "\e[0m",  @to.res.join
-    assert_equal [nil],    @to.list_index
-    assert_equal [:LABEL], @to.list_type
-    assert_equal [2],      @to.list_width
-  end
-
-  def accept_list_start_lalpha
-    assert_equal "\e[0m",   @to.res.join
-    assert_equal ['a'],     @to.list_index
-    assert_equal [:LALPHA], @to.list_type
-    assert_equal [1],       @to.list_width
-  end
-
-  def accept_list_start_note
-    assert_equal "\e[0m", @to.res.join
-    assert_equal [nil],   @to.list_index
-    assert_equal [:NOTE], @to.list_type
-    assert_equal [2],     @to.list_width
-  end
-
-  def accept_list_start_number
-    assert_equal "\e[0m",   @to.res.join
-    assert_equal [1],       @to.list_index
-    assert_equal [:NUMBER], @to.list_type
-    assert_equal [1],       @to.list_width
-  end
-
-  def accept_list_start_ualpha
-    assert_equal "\e[0m",   @to.res.join
-    assert_equal ['A'],     @to.list_index
-    assert_equal [:UALPHA], @to.list_type
-    assert_equal [1],       @to.list_width
-  end
-
-  def accept_paragraph
-    assert_equal "\e[0mhi\n", @to.res.join
-  end
-
-  def accept_raw
-    raw = <<-RAW.rstrip
-\e[0m<table>
-<tr><th>Name<th>Count
-<tr><td>a<td>1
-<tr><td>b<td>2
-</table>
-    RAW
-
-    assert_equal raw, @to.res.join
-  end
-
-  def accept_rule
-    assert_equal "\e[0m#{'-' * 78}\n", @to.res.join
-  end
-
-  def accept_verbatim
-    assert_equal "\e[0m  hi\n    world\n\n", @to.res.join
-  end
-
-  def end_accepting
-    assert_equal "\e[0mhi", @to.end_accepting
-  end
-
-  def start_accepting
-    assert_equal 0, @to.indent
-    assert_equal %W"\e[0m", @to.res
-    assert_empty @to.list_index
-    assert_empty @to.list_type
-    assert_empty @to.list_width
-  end
-
-  def accept_heading_1
-    assert_equal "\e[0m\e[1;32mHello\e[m\n", @to.end_accepting
-  end
-
-  def accept_heading_2
-    assert_equal "\e[0m\e[4;32mHello\e[m\n", @to.end_accepting
-  end
-
-  def accept_heading_3
-    assert_equal "\e[0m\e[32mHello\e[m\n", @to.end_accepting
-  end
-
-  def accept_heading_4
-    assert_equal "\e[0mHello\n", @to.end_accepting
-  end
-
-  def accept_heading_indent
-    assert_equal "\e[0m   \e[1;32mHello\e[m\n", @to.end_accepting
-  end
-
-  def accept_heading_b
-    assert_equal "\e[0m\e[1;32m\e[1mHello\e[m\e[m\n", @to.end_accepting
-  end
-
-  def accept_heading_suppressed_crossref
-    assert_equal "\e[0m\e[1;32mHello\e[m\n", @to.end_accepting
-  end
-
-  def accept_list_item_start_note_2
-    assert_equal "\e[0m\e[7mteletype\e[m:\n  teletype description\n\n",
-                 @to.res.join
-  end
-
-  def accept_list_item_start_note_multi_description
-    assert_equal "\e[0mlabel:\n  description one\n\n  description two\n\n",
-                 @to.res.join
-  end
-
-  def accept_list_item_start_note_multi_label
-    assert_equal "\e[0mone\ntwo:\n  two headers\n\n",
-                 @to.res.join
-  end
-
-  def accept_paragraph_b
-    assert_equal "\e[0mreg \e[1mbold words\e[m reg\n", @to.end_accepting
-  end
-
-  def accept_paragraph_br
-    assert_equal "\e[0mone\ntwo\n", @to.end_accepting
-  end
-
-  def accept_paragraph_break
-    assert_equal "\e[0mhello\nworld\n", @to.end_accepting
-  end
-
-  def accept_paragraph_i
-    assert_equal "\e[0mreg \e[4mitalic words\e[m reg\n", @to.end_accepting
-  end
-
-  def accept_paragraph_indent
-    expected = <<-EXPECTED
-\e[0m   words words words words words words words words words words words words
-   words words words words words words words words words words words words
-   words words words words words words
-    EXPECTED
-
-    assert_equal expected, @to.end_accepting
-  end
-
-  def accept_paragraph_plus
-    assert_equal "\e[0mreg \e[7mteletype\e[m reg\n", @to.end_accepting
-  end
-
-  def accept_paragraph_star
-    assert_equal "\e[0mreg \e[1mbold\e[m reg\n", @to.end_accepting
-  end
-
-  def accept_paragraph_underscore
-    assert_equal "\e[0mreg \e[4mitalic\e[m reg\n", @to.end_accepting
-  end
-
-  def accept_paragraph_wrap
-    expected = <<-EXPECTED
-\e[0mwords words words words words words words words words words words words words
-words words words words words words words words words words words words words
-words words words words
-    EXPECTED
-
-    assert_equal expected, @to.end_accepting
-  end
-
-  def accept_rule_indent
-    assert_equal "\e[0m   #{'-' * 75}\n", @to.end_accepting
-  end
-
-  def accept_verbatim_indent
-    assert_equal "\e[0m    hi\n     world\n\n", @to.end_accepting
-  end
-
-  def accept_verbatim_big_indent
-    assert_equal "\e[0m    hi\n    world\n\n", @to.end_accepting
-  end
-
-  def list_nested
-    expected = <<-EXPECTED
-\e[0m* l1
-  * l1.1
-* l2
-    EXPECTED
-
-    assert_equal expected, @to.end_accepting
-  end
-
-  def list_verbatim
-    expected = <<-EXPECTED # HACK overblown
-\e[0m* list stuff
-
-    * list
-      with
-
-      second
-
-      1. indented
-      2. numbered
-
-      third
-
-    * second
-
-    EXPECTED
-
-    assert_equal expected, @to.end_accepting
-  end
-
-  # functional test
-  def test_convert_list_note
-    note_list = <<-NOTE_LIST
-foo ::
-bar ::
-  hi
-    NOTE_LIST
-
-    expected = <<-EXPECTED
-\e[0mfoo
-bar:
-  hi
-
-    EXPECTED
-
-    assert_equal expected, @to.convert(note_list)
-  end
-
-end
diff --git a/test/rdoc/test_rdoc_markup_to_bs.rb b/test/rdoc/test_rdoc_markup_to_bs.rb
deleted file mode 100644
index 7ebde481e63ba9..00000000000000
--- a/test/rdoc/test_rdoc_markup_to_bs.rb
+++ /dev/null
@@ -1,352 +0,0 @@
-# frozen_string_literal: true
-require_relative 'helper'
-
-class TestRDocMarkupToBs < RDoc::Markup::TextFormatterTestCase
-
-  add_visitor_tests
-  add_text_tests
-
-  def setup
-    super
-
-    @to = RDoc::Markup::ToBs.new
-  end
-
-  def accept_blank_line
-    assert_equal "\n", @to.res.join
-  end
-
-  def accept_block_quote
-    assert_equal "> quote\n", @to.res.join
-  end
-
-  def accept_document
-    assert_equal "hello\n", @to.res.join
-  end
-
-  def accept_heading
-    assert_equal "===== H\bHe\bel\bll\blo\bo\n", @to.res.join
-  end
-
-  def accept_list_end_bullet
-    assert_empty @to.list_index
-    assert_empty @to.list_type
-    assert_empty @to.list_width
-  end
-
-  def accept_list_end_label
-    assert_empty @to.list_index
-    assert_empty @to.list_type
-    assert_empty @to.list_width
-  end
-
-  def accept_list_end_lalpha
-    assert_empty @to.list_index
-    assert_empty @to.list_type
-    assert_empty @to.list_width
-  end
-
-  def accept_list_end_note
-    assert_empty @to.list_index
-    assert_empty @to.list_type
-    assert_empty @to.list_width
-  end
-
-  def accept_list_end_number
-    assert_empty @to.list_index
-    assert_empty @to.list_type
-    assert_empty @to.list_width
-  end
-
-  def accept_list_end_ualpha
-    assert_empty @to.list_index
-    assert_empty @to.list_type
-    assert_empty @to.list_width
-  end
-
-  def accept_list_item_end_bullet
-    assert_equal 0, @to.indent, 'indent'
-  end
-
-  def accept_list_item_end_label
-    assert_equal "cat:\n", @to.res.join
-    assert_equal 0, @to.indent, 'indent'
-  end
-
-  def accept_list_item_end_lalpha
-    assert_equal 0, @to.indent, 'indent'
-    assert_equal 'b', @to.list_index.last
-  end
-
-  def accept_list_item_end_note
-    assert_equal "cat:\n", @to.res.join
-    assert_equal 0, @to.indent, 'indent'
-  end
-
-  def accept_list_item_end_number
-    assert_equal 0, @to.indent, 'indent'
-    assert_equal 2, @to.list_index.last
-  end
-
-  def accept_list_item_end_ualpha
-    assert_equal 0, @to.indent, 'indent'
-    assert_equal 'B', @to.list_index.last
-  end
-
-  def accept_list_item_start_bullet
-    assert_equal [''], @to.res
-    assert_equal '* ', @to.prefix
-  end
-
-  def accept_list_item_start_label
-    assert_equal [''], @to.res
-    assert_equal "cat:\n  ", @to.prefix
-
-    assert_equal 2, @to.indent
-  end
-
-  def accept_list_item_start_lalpha
-    assert_equal [''], @to.res
-    assert_equal 'a. ', @to.prefix
-
-    assert_equal 'a', @to.list_index.last
-    assert_equal 3, @to.indent
-  end
-
-  def accept_list_item_start_note
-    assert_equal [''], @to.res
-    assert_equal "cat:\n  ", @to.prefix
-
-    assert_equal 2, @to.indent
-  end
-
-  def accept_list_item_start_number
-    assert_equal [''], @to.res
-    assert_equal '1. ', @to.prefix
-
-    assert_equal 1, @to.list_index.last
-    assert_equal 3, @to.indent
-  end
-
-  def accept_list_item_start_ualpha
-    assert_equal [''], @to.res
-    assert_equal 'A. ', @to.prefix
-
-    assert_equal 'A', @to.list_index.last
-    assert_equal 3, @to.indent
-  end
-
-  def accept_list_start_bullet
-    assert_equal "",   @to.res.join
-    assert_equal [nil],     @to.list_index
-    assert_equal [:BULLET], @to.list_type
-    assert_equal [1],       @to.list_width
-  end
-
-  def accept_list_start_label
-    assert_equal "",  @to.res.join
-    assert_equal [nil],    @to.list_index
-    assert_equal [:LABEL], @to.list_type
-    assert_equal [2],      @to.list_width
-  end
-
-  def accept_list_start_lalpha
-    assert_equal "",   @to.res.join
-    assert_equal ['a'],     @to.list_index
-    assert_equal [:LALPHA], @to.list_type
-    assert_equal [1],       @to.list_width
-  end
-
-  def accept_list_start_note
-    assert_equal "", @to.res.join
-    assert_equal [nil],   @to.list_index
-    assert_equal [:NOTE], @to.list_type
-    assert_equal [2],     @to.list_width
-  end
-
-  def accept_list_start_number
-    assert_equal "",   @to.res.join
-    assert_equal [1],       @to.list_index
-    assert_equal [:NUMBER], @to.list_type
-    assert_equal [1],       @to.list_width
-  end
-
-  def accept_list_start_ualpha
-    assert_equal "",   @to.res.join
-    assert_equal ['A'],     @to.list_index
-    assert_equal [:UALPHA], @to.list_type
-    assert_equal [1],       @to.list_width
-  end
-
-  def accept_paragraph
-    assert_equal "hi\n", @to.res.join
-  end
-
-  def accept_raw
-    raw = <<-RAW.rstrip
-<table>
-<tr><th>Name<th>Count
-<tr><td>a<td>1
-<tr><td>b<td>2
-</table>
-    RAW
-
-    assert_equal raw, @to.res.join
-  end
-
-  def accept_rule
-    assert_equal "#{'-' * 78}\n", @to.res.join
-  end
-
-  def accept_verbatim
-    assert_equal "  hi\n    world\n\n", @to.res.join
-  end
-
-  def end_accepting
-    assert_equal "hi", @to.end_accepting
-  end
-
-  def start_accepting
-    assert_equal 0, @to.indent
-    assert_equal [''], @to.res
-    assert_empty @to.list_index
-    assert_empty @to.list_type
-    assert_empty @to.list_width
-  end
-
-  def accept_heading_1
-    assert_equal "= H\bHe\bel\bll\blo\bo\n", @to.end_accepting
-  end
-
-  def accept_heading_2
-    assert_equal "== H\bHe\bel\bll\blo\bo\n", @to.end_accepting
-  end
-
-  def accept_heading_3
-    assert_equal "=== H\bHe\bel\bll\blo\bo\n", @to.end_accepting
-  end
-
-  def accept_heading_4
-    assert_equal "==== H\bHe\bel\bll\blo\bo\n", @to.end_accepting
-  end
-
-  def accept_heading_indent
-    assert_equal "   = H\bHe\bel\bll\blo\bo\n", @to.end_accepting
-  end
-
-  def accept_heading_b
-    assert_equal "= H\bHe\bel\bll\blo\bo\n", @to.end_accepting
-  end
-
-  def accept_heading_suppressed_crossref
-    assert_equal "= H\bHe\bel\bll\blo\bo\n", @to.end_accepting
-  end
-
-  def accept_list_item_start_note_2
-    assert_equal "teletype:\n  teletype description\n\n", @to.res.join
-  end
-
-  def accept_list_item_start_note_multi_description
-    assert_equal "label:\n  description one\n\n  description two\n\n",
-                 @to.res.join
-  end
-
-  def accept_list_item_start_note_multi_label
-    assert_equal "one\ntwo:\n  two headers\n\n", @to.res.join
-  end
-
-  def accept_paragraph_b
-    assert_equal "reg b\bbo\bol\bld\bd \b w\bwo\bor\brd\bds\bs reg\n",
-                 @to.end_accepting
-  end
-
-  def accept_paragraph_br
-    assert_equal "one\ntwo\n", @to.end_accepting
-  end
-
-  def accept_paragraph_break
-    assert_equal "hello\nworld\n",
-                 @to.end_accepting
-  end
-
-  def accept_paragraph_i
-    assert_equal "reg _\bi_\bt_\ba_\bl_\bi_\bc_\b _\bw_\bo_\br_\bd_\bs reg\n",
-                 @to.end_accepting
-  end
-
-  def accept_paragraph_indent
-    expected = <<-EXPECTED
-   words words words words words words words words words words words words
-   words words words words words words words words words words words words
-   words words words words words words
-    EXPECTED
-
-    assert_equal expected, @to.end_accepting
-  end
-
-  def accept_paragraph_plus
-    assert_equal "reg teletype reg\n", @to.end_accepting
-  end
-
-  def accept_paragraph_star
-    assert_equal "reg b\bbo\bol\bld\bd reg\n", @to.end_accepting
-  end
-
-  def accept_paragraph_underscore
-    assert_equal "reg _\bi_\bt_\ba_\bl_\bi_\bc reg\n", @to.end_accepting
-  end
-
-  def accept_paragraph_wrap
-    expected = <<-EXPECTED
-words words words words words words words words words words words words words
-words words words words words words words words words words words words words
-words words words words
-    EXPECTED
-
-    assert_equal expected, @to.end_accepting
-  end
-
-  def accept_rule_indent
-    assert_equal "   #{'-' * 75}\n", @to.end_accepting
-  end
-
-  def accept_verbatim_indent
-    assert_equal "    hi\n     world\n\n", @to.end_accepting
-  end
-
-  def accept_verbatim_big_indent
-    assert_equal "    hi\n    world\n\n", @to.end_accepting
-  end
-
-  def list_nested
-    expected = <<-EXPECTED
-* l1
-  * l1.1
-* l2
-    EXPECTED
-
-    assert_equal expected, @to.end_accepting
-  end
-
-  def list_verbatim
-    expected = <<-EXPECTED # HACK overblown
-* list stuff
-
-    * list
-      with
-
-      second
-
-      1. indented
-      2. numbered
-
-      third
-
-    * second
-
-    EXPECTED
-
-    assert_equal expected, @to.end_accepting
-  end
-
-end
diff --git a/test/rdoc/test_rdoc_markup_to_html.rb b/test/rdoc/test_rdoc_markup_to_html.rb
deleted file mode 100644
index 6897c8132ef355..00000000000000
--- a/test/rdoc/test_rdoc_markup_to_html.rb
+++ /dev/null
@@ -1,959 +0,0 @@
-# frozen_string_literal: true
-require_relative 'helper'
-
-class TestRDocMarkupToHtml < RDoc::Markup::FormatterTestCase
-
-  add_visitor_tests
-
-  def setup
-    super
-
-    @to = RDoc::Markup::ToHtml.new @options
-  end
-
-  def accept_blank_line
-    assert_empty @to.res.join
-  end
-
-  def accept_block_quote
-    assert_equal "\n<blockquote>\n<p>quote</p>\n</blockquote>\n", @to.res.join
-  end
-
-  def accept_document
-    assert_equal "\n<p>hello</p>\n", @to.res.join
-  end
-
-  def accept_heading
-    links = '<span><a href="#label-Hello">&para;</a> ' +
-            '<a href="#top">&uarr;</a></span>'
-    expected = "\n<h5 id=\"label-Hello\">Hello#{links}</h5>\n"
-
-    assert_equal expected, @to.res.join
-  end
-
-  def accept_heading_1
-    links = '<span><a href="#label-Hello">&para;</a> ' +
-            '<a href="#top">&uarr;</a></span>'
-
-    assert_equal "\n<h1 id=\"label-Hello\">Hello#{links}</h1>\n", @to.res.join
-  end
-
-  def accept_heading_2
-    links = '<span><a href="#label-Hello">&para;</a> ' +
-            '<a href="#top">&uarr;</a></span>'
-
-    assert_equal "\n<h2 id=\"label-Hello\">Hello#{links}</h2>\n", @to.res.join
-  end
-
-  def accept_heading_3
-    links = '<span><a href="#label-Hello">&para;</a> ' +
-            '<a href="#top">&uarr;</a></span>'
-
-    assert_equal "\n<h3 id=\"label-Hello\">Hello#{links}</h3>\n", @to.res.join
-  end
-
-  def accept_heading_4
-    links = '<span><a href="#label-Hello">&para;</a> ' +
-            '<a href="#top">&uarr;</a></span>'
-
-    assert_equal "\n<h4 id=\"label-Hello\">Hello#{links}</h4>\n", @to.res.join
-  end
-
-  def accept_heading_b
-    links = '<span><a href="#label-Hello">&para;</a> ' +
-            '<a href="#top">&uarr;</a></span>'
-    inner = "<strong>Hello</strong>"
-
-    assert_equal "\n<h1 id=\"label-Hello\">#{inner}#{links}</h1>\n",
-                 @to.res.join
-  end
-
-  def accept_heading_suppressed_crossref
-    links = '<span><a href="#label-Hello">&para;</a> ' +
-            '<a href="#top">&uarr;</a></span>'
-
-    assert_equal "\n<h1 id=\"label-Hello\">Hello#{links}</h1>\n", @to.res.join
-  end
-
-  def accept_list_end_bullet
-    assert_equal [], @to.list
-    assert_equal [], @to.in_list_entry
-
-    assert_equal "<ul></ul>\n", @to.res.join
-  end
-
-  def accept_list_end_label
-    assert_equal [], @to.list
-    assert_equal [], @to.in_list_entry
-
-    assert_equal "<dl class=\"rdoc-list label-list\"></dl>\n", @to.res.join
-  end
-
-  def accept_list_end_lalpha
-    assert_equal [], @to.list
-    assert_equal [], @to.in_list_entry
-
-    assert_equal "<ol style=\"list-style-type: lower-alpha\"></ol>\n", @to.res.join
-  end
-
-  def accept_list_end_number
-    assert_equal [], @to.list
-    assert_equal [], @to.in_list_entry
-
-    assert_equal "<ol></ol>\n", @to.res.join
-  end
-
-  def accept_list_end_note
-    assert_equal [], @to.list
-    assert_equal [], @to.in_list_entry
-
-    assert_equal "<dl class=\"rdoc-list note-list\"></dl>\n", @to.res.join
-  end
-
-  def accept_list_end_ualpha
-    assert_equal [], @to.list
-    assert_equal [], @to.in_list_entry
-
-    assert_equal "<ol style=\"list-style-type: upper-alpha\"></ol>\n", @to.res.join
-  end
-
-  def accept_list_item_end_bullet
-    assert_equal %w[</li>], @to.in_list_entry
-  end
-
-  def accept_list_item_end_label
-    assert_equal %w[</dd>], @to.in_list_entry
-  end
-
-  def accept_list_item_end_lalpha
-    assert_equal %w[</li>], @to.in_list_entry
-  end
-
-  def accept_list_item_end_note
-    assert_equal %w[</dd>], @to.in_list_entry
-  end
-
-  def accept_list_item_end_number
-    assert_equal %w[</li>], @to.in_list_entry
-  end
-
-  def accept_list_item_end_ualpha
-    assert_equal %w[</li>], @to.in_list_entry
-  end
-
-  def accept_list_item_start_bullet
-    assert_equal "<ul><li>", @to.res.join
-  end
-
-  def accept_list_item_start_label
-    assert_equal "<dl class=\"rdoc-list label-list\"><dt>cat\n<dd>", @to.res.join
-  end
-
-  def accept_list_item_start_lalpha
-    assert_equal "<ol style=\"list-style-type: lower-alpha\"><li>", @to.res.join
-  end
-
-  def accept_list_item_start_note
-    assert_equal "<dl class=\"rdoc-list note-list\"><dt>cat\n<dd>",
-                 @to.res.join
-  end
-
-  def accept_list_item_start_note_2
-    expected = <<-EXPECTED
-<dl class="rdoc-list note-list"><dt><code>teletype</code>
-<dd>
-<p>teletype description</p>
-</dd></dl>
-    EXPECTED
-
-    assert_equal expected, @to.res.join
-  end
-
-  def accept_list_item_start_note_multi_description
-    expected = <<-EXPECTED
-<dl class="rdoc-list note-list"><dt>label
-<dd>
-<p>description one</p>
-</dd><dd>
-<p>description two</p>
-</dd></dl>
-    EXPECTED
-
-    assert_equal expected, @to.res.join
-  end
-
-  def accept_list_item_start_note_multi_label
-    expected = <<-EXPECTED
-<dl class="rdoc-list note-list"><dt>one
-<dt>two
-<dd>
-<p>two headers</p>
-</dd></dl>
-    EXPECTED
-
-    assert_equal expected, @to.res.join
-  end
-
-  def accept_list_item_start_number
-    assert_equal "<ol><li>", @to.res.join
-  end
-
-  def accept_list_item_start_ualpha
-    assert_equal "<ol style=\"list-style-type: upper-alpha\"><li>", @to.res.join
-  end
-
-  def accept_list_start_bullet
-    assert_equal [:BULLET], @to.list
-    assert_equal [false], @to.in_list_entry
-
-    assert_equal "<ul>", @to.res.join
-  end
-
-  def accept_list_start_label
-    assert_equal [:LABEL], @to.list
-    assert_equal [false], @to.in_list_entry
-
-    assert_equal '<dl class="rdoc-list label-list">', @to.res.join
-  end
-
-  def accept_list_start_lalpha
-    assert_equal [:LALPHA], @to.list
-    assert_equal [false], @to.in_list_entry
-
-    assert_equal "<ol style=\"list-style-type: lower-alpha\">", @to.res.join
-  end
-
-  def accept_list_start_note
-    assert_equal [:NOTE], @to.list
-    assert_equal [false], @to.in_list_entry
-
-    assert_equal "<dl class=\"rdoc-list note-list\">", @to.res.join
-  end
-
-  def accept_list_start_number
-    assert_equal [:NUMBER], @to.list
-    assert_equal [false], @to.in_list_entry
-
-    assert_equal "<ol>", @to.res.join
-  end
-
-  def accept_list_start_ualpha
-    assert_equal [:UALPHA], @to.list
-    assert_equal [false], @to.in_list_entry
-
-    assert_equal "<ol style=\"list-style-type: upper-alpha\">", @to.res.join
-  end
-
-  def accept_paragraph
-    assert_equal "\n<p>hi</p>\n", @to.res.join
-  end
-
-  def accept_paragraph_b
-    assert_equal "\n<p>reg <strong>bold words</strong> reg</p>\n", @to.res.join
-  end
-
-  def accept_paragraph_br
-    assert_equal "\n<p>one<br>two</p>\n", @to.res.join
-  end
-
-  def accept_paragraph_break
-    assert_equal "\n<p>hello<br> world</p>\n", @to.res.join
-  end
-
-  def accept_paragraph_i
-    assert_equal "\n<p>reg <em>italic words</em> reg</p>\n", @to.res.join
-  end
-
-  def accept_paragraph_plus
-    assert_equal "\n<p>reg <code>teletype</code> reg</p>\n", @to.res.join
-  end
-
-  def accept_paragraph_star
-    assert_equal "\n<p>reg <strong>bold</strong> reg</p>\n", @to.res.join
-  end
-
-  def accept_paragraph_underscore
-    assert_equal "\n<p>reg <em>italic</em> reg</p>\n", @to.res.join
-  end
-
-  def accept_raw
-    raw = <<-RAW.rstrip
-<table>
-<tr><th>Name<th>Count
-<tr><td>a<td>1
-<tr><td>b<td>2
-</table>
-    RAW
-
-    assert_equal raw, @to.res.join
-  end
-
-  def accept_rule
-    assert_equal "<hr>\n", @to.res.join
-  end
-
-  def accept_verbatim
-    assert_equal "\n<pre class=\"ruby\"><span class=\"ruby-identifier\">hi</span>\n  <span class=\"ruby-identifier\">world</span>\n</pre>\n", @to.res.join
-  end
-
-  def end_accepting
-    assert_equal 'hi', @to.end_accepting
-  end
-
-  def start_accepting
-    assert_equal [], @to.res
-    assert_equal [], @to.in_list_entry
-    assert_equal [], @to.list
-  end
-
-  def list_nested
-    expected = <<-EXPECTED
-<ul><li>
-<p>l1</p>
-<ul><li>
-<p>l1.1</p>
-</li></ul>
-</li><li>
-<p>l2</p>
-</li></ul>
-    EXPECTED
-
-    assert_equal expected, @to.res.join
-  end
-
-  def list_verbatim
-    expected = <<-EXPECTED
-<ul><li>
-<p>list stuff</p>
-
-<pre>* list
-  with
-
-  second
-
-  1. indented
-  2. numbered
-
-  third
-
-* second</pre>
-</li></ul>
-    EXPECTED
-
-    assert_equal expected, @to.end_accepting
-  end
-
-  def test_accept_heading_7
-    @to.start_accepting
-
-    @to.accept_heading @RM::Heading.new(7, 'Hello')
-
-    links = '<span><a href="#label-Hello">&para;</a> ' +
-            '<a href="#top">&uarr;</a></span>'
-
-    assert_equal "\n<h6 id=\"label-Hello\">Hello#{links}</h6>\n", @to.res.join
-  end
-
-  def test_accept_heading_aref_class
-    @to.code_object = RDoc::NormalClass.new 'Foo'
-    @to.start_accepting
-
-    @to.accept_heading head(1, 'Hello')
-
-    links = '<span><a href="#class-Foo-label-Hello">&para;</a> ' +
-            '<a href="#top">&uarr;</a></span>'
-
-    assert_equal "\n<h1 id=\"class-Foo-label-Hello\">Hello#{links}</h1>\n",
-                 @to.res.join
-  end
-
-  def test_accept_heading_aref_method
-    @to.code_object = RDoc::AnyMethod.new nil, 'foo'
-    @to.start_accepting
-
-    @to.accept_heading @RM::Heading.new(1, 'Hello')
-
-    links = '<span><a href="#method-i-foo-label-Hello">&para;</a> ' +
-            '<a href="#top">&uarr;</a></span>'
-
-    assert_equal "\n<h1 id=\"method-i-foo-label-Hello\">Hello#{links}</h1>\n",
-                 @to.res.join
-  end
-
-  def test_accept_heading_pipe
-    @options.pipe = true
-
-    @to.start_accepting
-
-    @to.accept_heading @RM::Heading.new(1, 'Hello')
-
-    assert_equal "\n<h1 id=\"label-Hello\">Hello</h1>\n", @to.res.join
-  end
-
-  def test_accept_paragraph_newline
-    @to.start_accepting
-
-    @to.accept_paragraph para("hello\n", "world\n")
-
-    assert_equal "\n<p>hello world </p>\n", @to.res.join
-  end
-
-  def test_accept_heading_output_decoration
-    @options.output_decoration = false
-
-    @to.start_accepting
-
-    @to.accept_heading @RM::Heading.new(1, 'Hello')
-
-    assert_equal "\n<h1>Hello<span><a href=\"#label-Hello\">&para;</a> <a href=\"#top\">&uarr;</a></span></h1>\n", @to.res.join
-  end
-
-  def test_accept_heading_output_decoration_with_pipe
-    @options.pipe = true
-    @options.output_decoration = false
-
-    @to.start_accepting
-
-    @to.accept_heading @RM::Heading.new(1, 'Hello')
-
-    assert_equal "\n<h1>Hello</h1>\n", @to.res.join
-  end
-
-  def test_accept_verbatim_parseable
-    verb = @RM::Verbatim.new("class C\n", "end\n")
-
-    @to.start_accepting
-    @to.accept_verbatim verb
-
-    expected = <<-EXPECTED
-
-<pre class="ruby"><span class="ruby-keyword">class</span> <span class="ruby-constant">C</span>
-<span class="ruby-keyword">end</span>
-</pre>
-    EXPECTED
-
-    assert_equal expected, @to.res.join
-  end
-
-  def test_accept_verbatim_parseable_error
-    verb = @RM::Verbatim.new("a % 09 # => blah\n")
-
-    @to.start_accepting
-    @to.accept_verbatim verb
-
-    inner = CGI.escapeHTML "a % 09 # => blah"
-
-    expected = <<-EXPECTED
-
-<pre>#{inner}</pre>
-    EXPECTED
-
-    assert_equal expected, @to.res.join
-  end
-
-  def test_accept_verbatim_nl_after_backslash
-    verb = @RM::Verbatim.new("a = 1 if first_flag_var and \\\n", "  this_is_flag_var\n")
-
-    @to.start_accepting
-    @to.accept_verbatim verb
-
-    expected = <<-EXPECTED
-
-<pre class="ruby"><span class="ruby-identifier">a</span> = <span class="ruby-value">1</span> <span class="ruby-keyword">if</span> <span class="ruby-identifier">first_flag_var</span> <span class="ruby-keyword">and</span> \\
-  <span class="ruby-identifier">this_is_flag_var</span>
-</pre>
-    EXPECTED
-
-    assert_equal expected, @to.res.join
-  end
-
-  def test_accept_verbatim_pipe
-    @options.pipe = true
-
-    verb = @RM::Verbatim.new("1 + 1\n")
-    verb.format = :ruby
-
-    @to.start_accepting
-    @to.accept_verbatim verb
-
-    expected = <<-EXPECTED
-
-<pre><code>1 + 1
-</code></pre>
-    EXPECTED
-
-    assert_equal expected, @to.res.join
-  end
-
-  def test_accept_verbatim_escape_in_string
-    code = <<-'RUBY'
-def foo
-  [
-    '\\',
-    '\'',
-    "'",
-    "\'\"\`",
-    "\#",
-    "\#{}",
-    "#",
-    "#{}",
-    /'"/,
-    /\'\"/,
-    /\//,
-    /\\/,
-    /\#/,
-    /\#{}/,
-    /#/,
-    /#{}/
-  ]
-end
-def bar
-end
-    RUBY
-    verb = @RM::Verbatim.new(*code.split(/(?<=\n)/))
-
-    @to.start_accepting
-    @to.accept_verbatim verb
-
-    expected = <<-'EXPECTED'
-
-<pre class="ruby"><span class="ruby-keyword">def</span> <span class="ruby-identifier ruby-title">foo</span>
-  [
-    <span class="ruby-string">&#39;\\&#39;</span>,
-    <span class="ruby-string">&#39;\&#39;&#39;</span>,
-    <span class="ruby-string">&quot;&#39;&quot;</span>,
-    <span class="ruby-string">&quot;\&#39;\&quot;\`&quot;</span>,
-    <span class="ruby-string">&quot;\#&quot;</span>,
-    <span class="ruby-string">&quot;\#{}&quot;</span>,
-    <span class="ruby-string">&quot;#&quot;</span>,
-    <span class="ruby-node">&quot;#{}&quot;</span>,
-    <span class="ruby-regexp">/&#39;&quot;/</span>,
-    <span class="ruby-regexp">/\&#39;\&quot;/</span>,
-    <span class="ruby-regexp">/\//</span>,
-    <span class="ruby-regexp">/\\/</span>,
-    <span class="ruby-regexp">/\#/</span>,
-    <span class="ruby-regexp">/\#{}/</span>,
-    <span class="ruby-regexp">/#/</span>,
-    <span class="ruby-regexp">/#{}/</span>
-  ]
-<span class="ruby-keyword">end</span>
-<span class="ruby-keyword">def</span> <span class="ruby-identifier ruby-title">bar</span>
-<span class="ruby-keyword">end</span>
-</pre>
-    EXPECTED
-
-    assert_equal expected, @to.res.join
-  end
-
-  def test_accept_verbatim_escape_in_backtick
-    code = <<-'RUBY'
-def foo
-  [
-    `\\`,
-    `\'\"\``,
-    `\#`,
-    `\#{}`,
-    `#`,
-    `#{}`
-  ]
-end
-def bar
-end
-    RUBY
-    verb = @RM::Verbatim.new(*code.split(/(?<=\n)/))
-
-    @to.start_accepting
-    @to.accept_verbatim verb
-
-    expected = <<-'EXPECTED'
-
-<pre class="ruby"><span class="ruby-keyword">def</span> <span class="ruby-identifier ruby-title">foo</span>
-  [
-    <span class="ruby-string">`\\`</span>,
-    <span class="ruby-string">`\&#39;\&quot;\``</span>,
-    <span class="ruby-string">`\#`</span>,
-    <span class="ruby-string">`\#{}`</span>,
-    <span class="ruby-string">`#`</span>,
-    <span class="ruby-node">`#{}`</span>
-  ]
-<span class="ruby-keyword">end</span>
-<span class="ruby-keyword">def</span> <span class="ruby-identifier ruby-title">bar</span>
-<span class="ruby-keyword">end</span>
-</pre>
-    EXPECTED
-
-    assert_equal expected, @to.res.join
-  end
-
-  def test_accept_verbatim_ruby
-    verb = @RM::Verbatim.new("1 + 1\n")
-    verb.format = :ruby
-
-    @to.start_accepting
-    @to.accept_verbatim verb
-
-    expected = <<-EXPECTED
-
-<pre class="ruby"><span class="ruby-value">1</span> <span class="ruby-operator">+</span> <span class="ruby-value">1</span>
-</pre>
-    EXPECTED
-
-    assert_equal expected, @to.res.join
-  end
-
-  def test_accept_verbatim_redefinable_operators
-    functions = %w[| ^ & <=> == === =~ > >= < <= << >> + - * / % ** ~ +@ -@ [] []= ` !  != !~].flat_map { |redefinable_op|
-      ["def #{redefinable_op}\n", "end\n"]
-    }
-
-    verb = @RM::Verbatim.new(*functions)
-
-    @to.start_accepting
-    @to.accept_verbatim verb
-
-    expected = <<-EXPECTED
-
-<pre class="ruby">
-    EXPECTED
-    expected = expected.rstrip
-
-    %w[| ^ &amp; &lt;=&gt; == === =~ &gt; &gt;= &lt; &lt;= &lt;&lt; &gt;&gt; + - * / % ** ~ +@ -@ [] []= ` !  != !~].each do |html_escaped_op|
-      expected += <<-EXPECTED
-<span class="ruby-keyword">def</span> <span class="ruby-identifier ruby-title">#{html_escaped_op}</span>
-<span class="ruby-keyword">end</span>
-      EXPECTED
-    end
-
-    expected += <<-EXPECTED
-</pre>
-EXPECTED
-
-    assert_equal expected, @to.res.join
-  end
-
-  def test_convert_string
-    assert_equal '&lt;&gt;', @to.convert_string('<>')
-  end
-
-  def test_convert_HYPERLINK_irc
-    result = @to.convert 'irc://irc.freenode.net/#ruby-lang'
-
-    assert_equal "\n<p><a href=\"irc://irc.freenode.net/#ruby-lang\">irc.freenode.net/#ruby-lang</a></p>\n", result
-  end
-
-  def test_convert_RDOCLINK_label_label
-    result = @to.convert 'rdoc-label:label-One'
-
-    assert_equal "\n<p><a href=\"#label-One\">One</a></p>\n", result
-  end
-
-  def test_convert_RDOCLINK_label_foottext
-    result = @to.convert 'rdoc-label:foottext-1'
-
-    assert_equal "\n<p><a href=\"#foottext-1\">1</a></p>\n", result
-  end
-
-  def test_convert_RDOCLINK_label_footmark
-    result = @to.convert 'rdoc-label:footmark-1'
-
-    assert_equal "\n<p><a href=\"#footmark-1\">1</a></p>\n", result
-  end
-
-  def test_convert_RDOCLINK_ref
-    result = @to.convert 'rdoc-ref:C'
-
-    assert_equal "\n<p>C</p>\n", result
-  end
-
-  def test_convert_RDOCLINK_escape_image
-    assert_escaped '<script>', 'rdoc-image:"><script>alert(`rdoc-image`)</script>"'
-  end
-
-  def test_convert_RDOCLINK_escape_label_id
-    assert_escaped '<script>', 'rdoc-label::path::"><script>alert(`rdoc-label_id`)</script>"'
-  end
-
-  def test_convert_RDOCLINK_escape_label_path
-    assert_escaped '<script>', 'rdoc-label::"><script>alert(`rdoc-label_path`)</script>"'
-  end
-
-  def test_convert_RDOCLINK_escape_ref
-    assert_escaped '<script>', 'rdoc-ref:"><script>alert(`rdoc-ref`)</script>"'
-  end
-
-  def test_convert_RDOCLINK_escape_xxx
-    assert_escaped '<script>', 'rdoc-xxx:"><script>alert(`rdoc-xxx`)</script>"'
-  end
-
-  def test_convert_TIDYLINK_footnote
-    result = @to.convert 'text{*1}[rdoc-label:foottext-1:footmark-1]'
-
-    assert_equal "\n<p>text<sup><a id=\"footmark-1\" href=\"#foottext-1\">1</a></sup></p>\n", result
-  end
-
-  def test_convert_TIDYLINK_multiple
-    result = @to.convert '{a}[http://example] {b}[http://example]'
-
-    expected = <<-EXPECTED
-
-<p><a href=\"http://example\">a</a> <a href=\"http://example\">b</a></p>
-    EXPECTED
-
-    assert_equal expected, result
-  end
-
-  def test_convert_TIDYLINK_image
-    result =
-      @to.convert '{rdoc-image:path/to/image.jpg}[http://example.com]'
-
-    expected =
-      "\n<p><a href=\"http://example.com\"><img src=\"path/to/image.jpg\"></a></p>\n"
-
-    assert_equal expected, result
-
-    result =
-      @to.convert '{rdoc-image:<script>alert`link text`</script>}[http://example.com]'
-
-    assert_not_include result, "<script>"
-  end
-
-  def test_convert_TIDYLINK_rdoc_label
-    result = @to.convert '{foo}[rdoc-label:foottext-1]'
-
-    assert_equal "\n<p><a href=\"#foottext-1\">foo</a></p>\n", result
-  end
-
-  def test_convert_TIDYLINK_irc
-    result = @to.convert '{ruby-lang}[irc://irc.freenode.net/#ruby-lang]'
-
-    assert_equal "\n<p><a href=\"irc://irc.freenode.net/#ruby-lang\">ruby-lang</a></p>\n", result
-  end
-
-  def test_convert_TIDYLINK_escape_text
-    assert_escaped '<script>', '{<script>alert`link text`</script>}[a]'
-    assert_escaped '<script>', 'x:/<script>alert(1);</script>[[]'
-  end
-
-  def test_convert_TIDYLINK_escape_javascript
-    assert_not_include '{click}[javascript:alert`javascript_scheme`]', '<a href="javascript:'
-  end
-
-  def test_convert_TIDYLINK_escape_onmouseover
-    assert_escaped '"/onmouseover="', '{onmouseover}[http://"/onmouseover="alert`on_mouse_link`"]'
-  end
-
-  def test_convert_TIDYLINK_escape_onerror
-    assert_escaped '"onerror="', '{link_image}[http://"onerror="alert`link_image`".png]'
-  end
-
-  def test_convert_with_exclude_tag
-    assert_equal "\n<p><code>aaa</code>[:symbol]</p>\n", @to.convert('+aaa+[:symbol]')
-    assert_equal "\n<p><code>aaa[:symbol]</code></p>\n", @to.convert('+aaa[:symbol]+')
-    assert_equal "\n<p><code>https:</code>-foobar</p>\n", @to.convert('<tt>https:</tt>-foobar')
-    assert_equal "\n<p><a href=\":symbol\">aaa</a></p>\n", @to.convert('aaa[:symbol]')
-  end
-
-  def test_convert_underscore_adjacent_to_code
-    assert_equal "\n<p><code>aaa</code>_</p>\n", @to.convert(%q{+aaa+_})
-    assert_equal "\n<p>\u{2018}<code>i386-mswin32_</code><em>MSRTVERSION</em>\u{2019}</p>\n", @to.convert(%q{`+i386-mswin32_+_MSRTVERSION_'})
-  end
-
-  def test_gen_url
-    assert_equal '<a href="example">example</a>',
-                 @to.gen_url('link:example', 'example')
-  end
-
-  def test_gen_url_rdoc_label
-    assert_equal '<a href="#foottext-1">example</a>',
-                 @to.gen_url('rdoc-label:foottext-1', 'example')
-  end
-
-  def test_gen_url_rdoc_label_id
-    assert_equal '<sup><a id="footmark-1" href="#foottext-1">example</a></sup>',
-                 @to.gen_url('rdoc-label:foottext-1:footmark-1', 'example')
-  end
-
-  def test_gen_url_image_url
-    assert_equal '<img src="http://example.com/image.png" />', @to.gen_url('http://example.com/image.png', 'ignored')
-  end
-
-  def test_gen_url_ssl_image_url
-    assert_equal '<img src="https://example.com/image.png" />', @to.gen_url('https://example.com/image.png', 'ignored')
-  end
-
-  def test_gen_url_rdoc_file
-    assert_equal '<a href="example_rdoc.html">example</a>',
-                 @to.gen_url('example.rdoc', 'example')
-    assert_equal '<a href="doc/example_rdoc.html">example</a>',
-                 @to.gen_url('doc/example.rdoc', 'example')
-    assert_equal '<a href="../ex.doc/example_rdoc.html">example</a>',
-                 @to.gen_url('../ex.doc/example.rdoc', 'example')
-    assert_equal '<a href="doc/example_rdoc.html#label-one">example</a>',
-                 @to.gen_url('doc/example.rdoc#label-one', 'example')
-    assert_equal '<a href="../ex.doc/example_rdoc.html#label-two">example</a>',
-                 @to.gen_url('../ex.doc/example.rdoc#label-two', 'example')
-  end
-
-  def test_gen_url_md_file
-    assert_equal '<a href="example_md.html">example</a>',
-                 @to.gen_url('example.md', 'example')
-    assert_equal '<a href="doc/example_md.html">example</a>',
-                 @to.gen_url('doc/example.md', 'example')
-    assert_equal '<a href="../ex.doc/example_md.html">example</a>',
-                 @to.gen_url('../ex.doc/example.md', 'example')
-    assert_equal '<a href="doc/example_md.html#label-one">example</a>',
-                 @to.gen_url('doc/example.md#label-one', 'example')
-    assert_equal '<a href="../ex.doc/example_md.html#label-two">example</a>',
-                 @to.gen_url('../ex.doc/example.md#label-two', 'example')
-  end
-
-  def test_gen_url_rb_file
-    assert_equal '<a href="example_rb.html">example</a>',
-                 @to.gen_url('example.rb', 'example')
-    assert_equal '<a href="doc/example_rb.html">example</a>',
-                 @to.gen_url('doc/example.rb', 'example')
-    assert_equal '<a href="../ex.doc/example_rb.html">example</a>',
-                 @to.gen_url('../ex.doc/example.rb', 'example')
-    assert_equal '<a href="doc/example_rb.html#label-one">example</a>',
-                 @to.gen_url('doc/example.rb#label-one', 'example')
-    assert_equal '<a href="../ex.doc/example_rb.html#label-two">example</a>',
-                 @to.gen_url('../ex.doc/example.rb#label-two', 'example')
-  end
-
-  def test_handle_regexp_HYPERLINK_link
-    target = RDoc::Markup::RegexpHandling.new 0, 'link:README.txt'
-
-    link = @to.handle_regexp_HYPERLINK target
-
-    assert_equal '<a href="README.txt">README.txt</a>', link
-  end
-
-  def test_handle_regexp_HYPERLINK_irc
-    target = RDoc::Markup::RegexpHandling.new 0, 'irc://irc.freenode.net/#ruby-lang'
-
-    link = @to.handle_regexp_HYPERLINK target
-
-    assert_equal '<a href="irc://irc.freenode.net/#ruby-lang">irc.freenode.net/#ruby-lang</a>', link
-  end
-
-  def test_handle_regexp_HYPERLINK_escape
-    code = 'irc://irc.freenode.net/"><script>alert(`irc`)</script><a"'
-    assert_escaped '<script>', code
-  end
-
-  def test_list_verbatim_2
-    str = "* one\n    verb1\n    verb2\n* two\n"
-
-    expected = <<-EXPECTED
-<ul><li>
-<p>one</p>
-
-<pre class=\"ruby\"><span class=\"ruby-identifier\">verb1</span>
-<span class=\"ruby-identifier\">verb2</span>
-</pre>
-</li><li>
-<p>two</p>
-</li></ul>
-    EXPECTED
-
-    assert_equal expected, @m.convert(str, @to)
-  end
-
-  def test_block_quote_in_verbatim
-    str = "BlockQuote\n  >>>\n"
-
-    expected = <<-EXPECTED
-<p>BlockQuote</p>
-<pre>&gt;&gt;&gt;</pre>
-    EXPECTED
-
-    assert_equal expected, @m.convert(str, @to).gsub(/^\n/, "")
-
-    str = "BlockQuote\n  >>>  word\n"
-
-    expected = <<-EXPECTED
-<p>BlockQuote</p>
-<pre>&gt;&gt;&gt;  word</pre>
-    EXPECTED
-
-    assert_equal expected, @m.convert(str, @to).gsub(/^\n/, "")
-  end
-
-  def test_parseable_eh
-    valid_syntax = [
-      'def x() end',
-      'def x; end',
-      'class C; end',
-      "module M end",
-      'a # => blah',
-      'x { |y| nil }',
-      'x do |y| nil end',
-      '# only a comment',
-      'require "foo"',
-      'cls="foo"'
-    ]
-    invalid_syntax = [
-      'def x end',
-      'class C < end',
-      'module M < C end',
-      'a=># blah',
-      'x { |y| ... }',
-      'x do |y| ... end',
-      '// only a comment',
-      '<% require "foo" %>',
-      'class="foo"'
-    ]
-    valid_syntax.each do |t|
-      assert @to.parseable?(t), "valid syntax considered invalid: #{t}"
-    end
-    invalid_syntax.each do |t|
-      refute @to.parseable?(t), "invalid syntax considered valid: #{t}"
-    end
-  end
-
-  def test_to_html
-    assert_equal "\n<p><code>--</code></p>\n", util_format("<tt>--</tt>")
-  end
-
-  def util_format text
-    paragraph = RDoc::Markup::Paragraph.new text
-
-    @to.start_accepting
-    @to.accept_paragraph paragraph
-    @to.end_accepting
-  end
-
-  def test_accept_table
-    header = %w[Col1 Col2 Col3]
-    body = [
-      %w[cell1_1 cell1_2 cell1_3],
-      %w[cell2_1 cell2_2 cell2_3],
-      ['<script>alert("foo");</script>',],
-      %w[+code+ _em_ **strong**],
-    ]
-    aligns = [:left, :right, nil]
-    @to.start_accepting
-    @to.accept_table(header, body, aligns)
-    res = @to.end_accepting
-    assert_include(res[%r<<th[^<>]*>Col1</th>>], 'align="left"')
-    assert_include(res[%r<<th[^<>]*>Col2</th>>], 'align="right"')
-    assert_not_include(res[%r<<th[^<>]*>Col3</th>>], 'align=')
-    assert_include(res[%r<<td[^<>]*>cell1_1</td>>], 'align="left"')
-    assert_include(res[%r<<td[^<>]*>cell1_2</td>>], 'align="right"')
-    assert_not_include(res[%r<<td[^<>]*>cell1_3</td>>], 'align=')
-    assert_include(res[%r<<td[^<>]*>cell2_1</td>>], 'align="left"')
-    assert_include(res[%r<<td[^<>]*>cell2_2</td>>], 'align="right"')
-    assert_not_include(res[%r<<td[^<>]*>cell2_3</td>>], 'align=')
-    assert_not_include(res, '<script>')
-    assert_include(res[%r<<td[^<>]*>.*script.*</td>>], '&lt;script&gt;')
-    assert_include(res[%r<<td[^<>]*>.*code.*</td>>], '<code>code</code>')
-    assert_include(res[%r<<td[^<>]*>.*em.*</td>>], '<em>em</em>')
-    assert_include(res[%r<<td[^<>]*>.*strong.*</td>>], '<strong>strong</strong>')
-  end
-
-  def assert_escaped(unexpected, code)
-    result = @to.convert(code)
-    assert_not_include result, unexpected
-    assert_include result, CGI.escapeHTML(unexpected)
-  end
-end
diff --git a/test/rdoc/test_rdoc_markup_to_html_crossref.rb b/test/rdoc/test_rdoc_markup_to_html_crossref.rb
deleted file mode 100644
index 4b87dd5da5bc19..00000000000000
--- a/test/rdoc/test_rdoc_markup_to_html_crossref.rb
+++ /dev/null
@@ -1,268 +0,0 @@
-# frozen_string_literal: true
-require_relative 'xref_test_case'
-
-class TestRDocMarkupToHtmlCrossref < XrefTestCase
-
-  def setup
-    super
-
-    @options.hyperlink_all = true
-
-    @to = RDoc::Markup::ToHtmlCrossref.new @options, 'index.html', @c1
-  end
-
-  def test_convert_CROSSREF
-    result = @to.convert 'C1'
-
-    assert_equal para("<a href=\"C1.html\"><code>C1</code></a>"), result
-  end
-
-  def test_convert_CROSSREF_method
-    result = @to.convert 'C1#m(foo, bar, baz)'
-
-    assert_equal para("<a href=\"C1.html#method-i-m\"><code>C1#m(foo, bar, baz)</code></a>"), result
-  end
-
-  def test_convert_CROSSREF_label
-    result = @to.convert 'C1@foo'
-    assert_equal para("<a href=\"C1.html#class-C1-label-foo\">foo at <code>C1</code></a>"), result
-
-    result = @to.convert 'C1#m@foo'
-    assert_equal para("<a href=\"C1.html#method-i-m-label-foo\">foo at <code>C1#m</code></a>"),
-                 result
-  end
-
-  def test_convert_CROSSREF_label_for_md
-    result = @to.convert 'EXAMPLE@foo'
-    assert_equal para("<a href=\"EXAMPLE_md.html#label-foo\">foo at <code>EXAMPLE</code></a>"), result
-  end
-
-  def test_convert_CROSSREF_label_period
-    result = @to.convert 'C1@foo.'
-    assert_equal para("<a href=\"C1.html#class-C1-label-foo\">foo at <code>C1</code></a>."), result
-  end
-
-  def test_convert_CROSSREF_label_space
-    result = @to.convert 'C1@foo+bar'
-    assert_equal para("<a href=\"C1.html#class-C1-label-foo+bar\">foo bar at <code>C1</code></a>"),
-                 result
-  end
-
-  def test_convert_CROSSREF_section
-    @c1.add_section 'Section'
-
-    result = @to.convert 'C1@Section'
-    assert_equal para("<a href=\"C1.html#Section\">Section at <code>C1</code></a>"), result
-  end
-
-  def test_convert_CROSSREF_constant
-    result = @to.convert 'C1::CONST'
-
-    assert_equal para("<a href=\"C1.html#CONST\"><code>C1::CONST</code></a>"), result
-  end
-
-  def test_convert_RDOCLINK_rdoc_ref
-    result = @to.convert 'rdoc-ref:C1'
-
-    assert_equal para("<a href=\"C1.html\"><code>C1</code></a>"), result
-  end
-
-  def test_convert_RDOCLINK_rdoc_ref_method
-    result = @to.convert 'rdoc-ref:C1#m'
-
-    assert_equal para("<a href=\"C1.html#method-i-m\"><code>C1#m</code></a>"), result
-  end
-
-  def test_convert_RDOCLINK_rdoc_ref_method_label
-    result = @to.convert 'rdoc-ref:C1#m@foo'
-
-    assert_equal para("<a href=\"C1.html#method-i-m-label-foo\">foo at <code>C1#m</code></a>"),
-                 result, 'rdoc-ref:C1#m@foo'
-  end
-
-  def test_convert_RDOCLINK_rdoc_ref_method_percent
-    m = @c1.add_method RDoc::AnyMethod.new nil, '%'
-    m.singleton = false
-
-    result = @to.convert 'rdoc-ref:C1#%'
-
-    assert_equal para("<a href=\"C1.html#method-i-25\"><code>C1#%</code></a>"), result
-
-    m.singleton = true
-
-    result = @to.convert 'rdoc-ref:C1::%'
-
-    assert_equal para("<a href=\"C1.html#method-c-25\"><code>C1::%</code></a>"), result
-  end
-
-  def test_convert_RDOCLINK_rdoc_ref_method_escape_html
-    m = @c1.add_method RDoc::AnyMethod.new nil, '<<'
-    m.singleton = false
-
-    result = @to.convert 'rdoc-ref:C1#<<'
-
-    assert_equal para("<a href=\"C1.html#method-i-3C-3C\"><code>C1#&lt;&lt;</code></a>"), result
-    m.singleton = true
-
-    result = @to.convert 'rdoc-ref:C1::<<'
-
-    assert_equal para("<a href=\"C1.html#method-c-3C-3C\"><code>C1::&lt;&lt;</code></a>"), result
-  end
-
-  def test_convert_RDOCLINK_rdoc_ref_method_percent_label
-    m = @c1.add_method RDoc::AnyMethod.new nil, '%'
-    m.singleton = false
-
-    result = @to.convert 'rdoc-ref:C1#%@f'
-
-    assert_equal para("<a href=\"C1.html#method-i-25-label-f\">f at <code>C1#%</code></a>"),
-                 result
-
-    m.singleton = true
-
-    result = @to.convert 'rdoc-ref:C1::%@f'
-
-    assert_equal para("<a href=\"C1.html#method-c-25-label-f\">f at <code>C1::%</code></a>"),
-                 result
-  end
-
-  def test_convert_RDOCLINK_rdoc_ref_label
-    result = @to.convert 'rdoc-ref:C1@foo'
-
-    assert_equal para("<a href=\"C1.html#class-C1-label-foo\">foo at <code>C1</code></a>"), result,
-                 'rdoc-ref:C1@foo'
-  end
-
-  def test_gen_url
-    assert_equal '<a href="C1.html">Some class</a>',
-                 @to.gen_url('rdoc-ref:C1', 'Some class')
-
-    assert_equal '<a href="http://example">HTTP example</a>',
-                 @to.gen_url('http://example', 'HTTP example')
-  end
-
-  def test_handle_regexp_CROSSREF
-    assert_equal "<a href=\"C2/C3.html\"><code>C2::C3</code></a>", REGEXP_HANDLING('C2::C3')
-  end
-
-  def test_handle_regexp_CROSSREF_label
-    assert_equal "<a href=\"C1.html#method-i-m-label-foo\">foo at <code>C1#m</code></a>",
-                 REGEXP_HANDLING('C1#m@foo')
-  end
-
-  def test_handle_regexp_CROSSREF_show_hash_false
-    @to.show_hash = false
-
-    assert_equal "<a href=\"C1.html#method-i-m\"><code>m</code></a>",
-                 REGEXP_HANDLING('#m')
-  end
-
-  def test_handle_regexp_CROSSREF_with_arg_looks_like_TIDYLINK
-    result = @to.convert 'C1.m[:sym]'
-
-    assert_equal para("<a href=\"C1.html#method-c-m\"><code>C1.m[:sym]</code></a>"), result,
-                 'C1.m[:sym]'
-  end
-
-  def test_handle_regexp_HYPERLINK_rdoc
-    readme = @store.add_file 'README.txt'
-    readme.parser = RDoc::Parser::Simple
-
-    @to = RDoc::Markup::ToHtmlCrossref.new @options, 'C2.html', @c2
-
-    link = @to.handle_regexp_HYPERLINK hyper 'C2::C3'
-
-    assert_equal '<a href="C2/C3.html"><code>C2::C3</code></a>', link
-
-    link = @to.handle_regexp_HYPERLINK hyper 'C4'
-
-    assert_equal '<a href="C4.html"><code>C4</code></a>', link
-
-    link = @to.handle_regexp_HYPERLINK hyper 'README.txt'
-
-    assert_equal '<a href="README_txt.html">README.txt</a>', link
-  end
-
-  def test_handle_regexp_TIDYLINK_rdoc
-    readme = @store.add_file 'README.txt'
-    readme.parser = RDoc::Parser::Simple
-
-    @to = RDoc::Markup::ToHtmlCrossref.new @options, 'C2.html', @c2
-
-    link = @to.handle_regexp_TIDYLINK tidy 'C2::C3'
-
-    assert_equal '<a href="C2/C3.html">tidy</a>', link
-
-    link = @to.handle_regexp_TIDYLINK tidy 'C4'
-
-    assert_equal '<a href="C4.html">tidy</a>', link
-
-    link = @to.handle_regexp_TIDYLINK tidy 'C1#m'
-
-    assert_equal '<a href="C1.html#method-i-m">tidy</a>', link
-
-    link = @to.handle_regexp_TIDYLINK tidy 'README.txt'
-
-    assert_equal '<a href="README_txt.html">tidy</a>', link
-  end
-
-  def test_handle_regexp_TIDYLINK_label
-    link = @to.handle_regexp_TIDYLINK tidy 'C1#m@foo'
-
-    assert_equal "<a href=\"C1.html#method-i-m-label-foo\">tidy</a>",
-                 link, 'C1#m@foo'
-  end
-
-  def test_to_html_CROSSREF_email
-    @options.hyperlink_all = false
-
-    @to = RDoc::Markup::ToHtmlCrossref.new @options, 'index.html', @c1
-
-    result = @to.to_html 'first.last@example.com'
-
-    assert_equal 'first.last@example.com', result
-  end
-
-  def test_to_html_CROSSREF_email_hyperlink_all
-    result = @to.to_html 'first.last@example.com'
-
-    assert_equal 'first.last@example.com', result
-  end
-
-  def test_link
-    assert_equal 'n', @to.link('n', 'n')
-
-    assert_equal '<a href="C1.html#method-c-m"><code>m</code></a>', @to.link('m', 'm')
-  end
-
-  def test_link_for_method_traverse
-    @to = RDoc::Markup::ToHtmlCrossref.new @options, 'C2.html', @c9
-    assert_equal '<a href="C9/A.html#method-i-foo"><code>C9::B#foo</code></a>', @to.link('C9::B#foo', 'C9::B#foo')
-  end
-
-  def test_link_class_method_full
-    assert_equal '<a href="Parent.html#method-c-m"><code>Parent::m</code></a>',
-                 @to.link('Parent::m', 'Parent::m')
-  end
-
-  def para text
-    "\n<p>#{text}</p>\n"
-  end
-
-  def REGEXP_HANDLING text
-    @to.handle_regexp_CROSSREF regexp_handling text
-  end
-
-  def hyper reference
-    RDoc::Markup::RegexpHandling.new 0, "rdoc-ref:#{reference}"
-  end
-
-  def regexp_handling text
-    RDoc::Markup::RegexpHandling.new 0, text
-  end
-
-  def tidy reference
-    RDoc::Markup::RegexpHandling.new 0, "{tidy}[rdoc-ref:#{reference}]"
-  end
-
-end
diff --git a/test/rdoc/test_rdoc_markup_to_html_snippet.rb b/test/rdoc/test_rdoc_markup_to_html_snippet.rb
deleted file mode 100644
index 94f58b652939bc..00000000000000
--- a/test/rdoc/test_rdoc_markup_to_html_snippet.rb
+++ /dev/null
@@ -1,709 +0,0 @@
-# frozen_string_literal: true
-require_relative 'helper'
-
-class TestRDocMarkupToHtmlSnippet < RDoc::Markup::FormatterTestCase
-
-  add_visitor_tests
-
-  def setup
-    super
-
-    @to = RDoc::Markup::ToHtmlSnippet.new @options, 100, 100
-    @ellipsis = @to.to_html '...'
-  end
-
-  def accept_blank_line
-    assert_empty @to.res.join
-  end
-
-  def accept_block_quote
-    assert_equal "\n<blockquote><p>quote\n</blockquote>\n", @to.res.join
-
-    assert_equal 5, @to.characters
-  end
-
-  def accept_document
-    assert_equal "<p>hello\n", @to.res.join
-    assert_equal 5, @to.characters
-  end
-
-  def accept_heading
-    assert_equal "<p>Hello\n", @to.res.join
-    assert_equal 5, @to.characters
-  end
-
-  def accept_heading_1
-    assert_equal "<p>Hello\n", @to.res.join
-    assert_equal 5, @to.characters
-  end
-
-  def accept_heading_2
-    assert_equal "<p>Hello\n", @to.res.join
-    assert_equal 5, @to.characters
-  end
-
-  def accept_heading_3
-    assert_equal "<p>Hello\n", @to.res.join
-    assert_equal 5, @to.characters
-  end
-
-  def accept_heading_4
-    assert_equal "<p>Hello\n", @to.res.join
-    assert_equal 5, @to.characters
-  end
-
-  def accept_heading_b
-    assert_equal "<p><strong>Hello</strong>\n",
-                 @to.res.join
-    assert_equal 5, @to.characters
-  end
-
-  def accept_heading_suppressed_crossref
-    assert_equal "<p>Hello\n", @to.res.join
-    assert_equal 5, @to.characters
-  end
-
-  def accept_list_end_bullet
-    assert_equal [], @to.list
-    assert_equal [], @to.in_list_entry
-
-    assert_equal "\n", @to.res.join
-    assert_equal 0, @to.characters
-  end
-
-  def accept_list_end_label
-    assert_equal [], @to.list
-    assert_equal [], @to.in_list_entry
-
-    assert_equal "\n", @to.res.join
-    assert_equal 0, @to.characters
-  end
-
-  def accept_list_end_lalpha
-    assert_equal [], @to.list
-    assert_equal [], @to.in_list_entry
-
-    assert_equal "\n", @to.res.join
-    assert_equal 0, @to.characters
-  end
-
-  def accept_list_end_number
-    assert_equal [], @to.list
-    assert_equal [], @to.in_list_entry
-
-    assert_equal "\n", @to.res.join
-    assert_equal 0, @to.characters
-  end
-
-  def accept_list_end_note
-    assert_equal [], @to.list
-    assert_equal [], @to.in_list_entry
-
-    assert_equal "\n", @to.res.join
-    assert_equal 0, @to.characters
-  end
-
-  def accept_list_end_ualpha
-    assert_equal [], @to.list
-    assert_equal [], @to.in_list_entry
-
-    assert_equal "\n", @to.res.join
-    assert_equal 0, @to.characters
-  end
-
-  def accept_list_item_end_bullet
-    assert_equal [''], @to.in_list_entry
-    assert_equal 0, @to.characters
-  end
-
-  def accept_list_item_end_label
-    assert_equal [''], @to.in_list_entry
-    assert_equal 4, @to.characters
-  end
-
-  def accept_list_item_end_lalpha
-    assert_equal [''], @to.in_list_entry
-    assert_equal 0, @to.characters
-  end
-
-  def accept_list_item_end_note
-    assert_equal [''], @to.in_list_entry
-    assert_equal 4, @to.characters
-  end
-
-  def accept_list_item_end_number
-    assert_equal [''], @to.in_list_entry
-    assert_equal 0, @to.characters
-  end
-
-  def accept_list_item_end_ualpha
-    assert_equal [''], @to.in_list_entry
-    assert_equal 0, @to.characters
-  end
-
-  def accept_list_item_start_bullet
-    assert_equal "<p>", @to.res.join
-    assert_equal 0, @to.characters
-  end
-
-  def accept_list_item_start_label
-    assert_equal "<p>cat &mdash; ", @to.res.join
-    assert_equal 4, @to.characters
-  end
-
-  def accept_list_item_start_lalpha
-    assert_equal "<p>", @to.res.join
-    assert_equal 0, @to.characters
-  end
-
-  def accept_list_item_start_note
-    assert_equal "<p>cat &mdash; ",
-                 @to.res.join
-    assert_equal 4, @to.characters
-  end
-
-  def accept_list_item_start_note_2
-    expected = <<-EXPECTED
-<p><code>teletype</code> &mdash; teletype description
-
-    EXPECTED
-
-    assert_equal expected, @to.res.join
-    assert_equal 29, @to.characters
-  end
-
-  def accept_list_item_start_note_multi_description
-    expected = <<-EXPECTED
-<p>label &mdash; description one
-<p>description two
-
-    EXPECTED
-
-    assert_equal expected, @to.res.join
-    assert_equal 37, @to.characters
-  end
-
-  def accept_list_item_start_note_multi_label
-    expected = <<-EXPECTED
-<p>one, two &mdash; two headers
-
-    EXPECTED
-
-    assert_equal expected, @to.res.join
-    assert_equal 18, @to.characters
-  end
-
-  def accept_list_item_start_number
-    assert_equal "<p>", @to.res.join
-    assert_equal 0, @to.characters
-  end
-
-  def accept_list_item_start_ualpha
-    assert_equal "<p>", @to.res.join
-    assert_equal 0, @to.characters
-  end
-
-  def accept_list_start_bullet
-    assert_equal [:BULLET], @to.list
-    assert_equal [''], @to.in_list_entry
-
-    assert_equal '', @to.res.join
-    assert_equal 0, @to.characters
-  end
-
-  def accept_list_start_label
-    assert_equal [:LABEL], @to.list
-    assert_equal [''], @to.in_list_entry
-
-    assert_equal '', @to.res.join
-    assert_equal 0, @to.characters
-  end
-
-  def accept_list_start_lalpha
-    assert_equal [:LALPHA], @to.list
-    assert_equal [''], @to.in_list_entry
-
-    assert_equal '', @to.res.join
-    assert_equal 0, @to.characters
-  end
-
-  def accept_list_start_note
-    assert_equal [:NOTE], @to.list
-    assert_equal [''], @to.in_list_entry
-
-    assert_equal '', @to.res.join
-    assert_equal 0, @to.characters
-  end
-
-  def accept_list_start_number
-    assert_equal [:NUMBER], @to.list
-    assert_equal [''], @to.in_list_entry
-
-    assert_equal '', @to.res.join
-    assert_equal 0, @to.characters
-  end
-
-  def accept_list_start_ualpha
-    assert_equal [:UALPHA], @to.list
-    assert_equal [''], @to.in_list_entry
-
-    assert_equal '', @to.res.join
-    assert_equal 0, @to.characters
-  end
-
-  def accept_paragraph
-    assert_equal "<p>hi\n", @to.res.join
-
-    assert_equal 2, @to.characters
-  end
-
-  def accept_paragraph_b
-    assert_equal "<p>reg <strong>bold words</strong> reg\n", @to.res.join
-
-    assert_equal 18, @to.characters
-  end
-
-  def accept_paragraph_br
-    assert_equal "<p>one<br>two\n", @to.res.join
-
-    assert_equal 6, @to.characters
-  end
-
-  def accept_paragraph_break
-    assert_equal "<p>hello<br>\nworld\n", @to.res.join
-
-    assert_equal 11, @to.characters
-  end
-
-  def accept_paragraph_i
-    assert_equal "<p>reg <em>italic words</em> reg\n", @to.res.join
-
-    assert_equal 20, @to.characters
-  end
-
-  def accept_paragraph_plus
-    assert_equal "<p>reg <code>teletype</code> reg\n", @to.res.join
-
-    assert_equal 16, @to.characters
-  end
-
-  def accept_paragraph_star
-    assert_equal "<p>reg <strong>bold</strong> reg\n", @to.res.join
-
-    assert_equal 12, @to.characters
-  end
-
-  def accept_paragraph_underscore
-    assert_equal "<p>reg <em>italic</em> reg\n", @to.res.join
-
-    assert_equal 14, @to.characters
-  end
-
-  def accept_raw
-    assert_equal '', @to.res.join
-    assert_equal 0, @to.characters
-  end
-
-  def accept_rule
-    assert_empty @to.res
-    assert_equal 0, @to.characters
-  end
-
-  def accept_verbatim
-    assert_equal "\n<pre class=\"ruby\"><span class=\"ruby-identifier\">hi</span>\n  <span class=\"ruby-identifier\">world</span>\n</pre>\n", @to.res.join
-    assert_equal 10, @to.characters
-  end
-
-  def end_accepting
-    assert_equal 'hi', @to.res.join
-  end
-
-  def start_accepting
-    assert_equal [], @to.res
-    assert_equal [], @to.in_list_entry
-    assert_equal [], @to.list
-    assert_equal 0,  @to.characters
-  end
-
-  def list_nested
-    expected = <<-EXPECTED
-<p>l1
-<p>l1.1
-
-<p>l2
-
-    EXPECTED
-
-    assert_equal expected, @to.res.join
-    assert_equal 8, @to.characters
-  end
-
-  def list_verbatim
-    expected = <<-EXPECTED
-<p>list stuff
-
-<pre>* list
-  with
-
-  second
-
-  1. indented
-  2. numbered
-
-  third
-
-* second</pre>
-
-    EXPECTED
-
-    assert_equal expected, @to.end_accepting
-    assert_equal 81, @to.characters
-  end
-
-  def test_accept_heading_7
-    @to.start_accepting
-
-    @to.accept_heading @RM::Heading.new(7, 'Hello')
-
-    assert_equal "<p>Hello\n", @to.res.join
-    assert_equal 5, @to.characters
-  end
-
-  def test_accept_heading_aref_class
-    @to.code_object = RDoc::NormalClass.new 'Foo'
-    @to.start_accepting
-
-    @to.accept_heading @RM::Heading.new(1, 'Hello')
-
-    assert_equal "<p>Hello\n",
-                 @to.res.join
-    assert_equal 5, @to.characters
-  end
-
-  def test_accept_heading_aref_method
-    @to.code_object = RDoc::AnyMethod.new nil, 'foo'
-    @to.start_accepting
-
-    @to.accept_heading @RM::Heading.new(1, 'Hello')
-
-    assert_equal "<p>Hello\n",
-                 @to.res.join
-    assert_equal 5, @to.characters
-  end
-
-  def test_accept_verbatim_ruby
-    options = RDoc::Options.new
-    rdoc = RDoc::RDoc.new
-    rdoc.options = options
-    RDoc::RDoc.current = rdoc
-
-    verb = @RM::Verbatim.new("class C\n", "end\n")
-
-    @to.start_accepting
-    @to.accept_verbatim verb
-
-    expected = <<-EXPECTED
-
-<pre class="ruby"><span class="ruby-keyword">class</span> <span class="ruby-constant">C</span>
-<span class="ruby-keyword">end</span>
-</pre>
-    EXPECTED
-
-    assert_equal expected, @to.res.join
-    assert_equal 11, @to.characters
-  end
-
-  def test_accept_verbatim_ruby_error
-    options = RDoc::Options.new
-    rdoc = RDoc::RDoc.new
-    rdoc.options = options
-    RDoc::RDoc.current = rdoc
-
-    verb = @RM::Verbatim.new("a % 09 # => blah\n")
-
-    @to.start_accepting
-    @to.accept_verbatim verb
-
-    inner = CGI.escapeHTML "a % 09 # => blah"
-
-    expected = <<-EXPECTED
-
-<pre>#{inner}</pre>
-    EXPECTED
-
-    assert_equal expected, @to.res.join
-    assert_equal 16, @to.characters
-  end
-
-  def test_add_paragraph
-    @to = RDoc::Markup::ToHtmlSnippet.new @options, 0, 3
-    assert_throws :done do
-      @to.add_paragraph
-      @to.add_paragraph
-      @to.add_paragraph
-    end
-
-    assert_equal 3, @to.paragraphs
-  end
-
-  def test_convert_limit
-    rdoc = <<-RDOC
-= Hello
-
-This is some text, it *will* be cut off after 100 characters and an ellipsis
-must follow
-
-So there you have it
-    RDOC
-
-    expected = <<-EXPECTED
-<p>Hello
-<p>This is some text, it <strong>will</strong> be cut off after 100 characters and an ellipsis must follow
-<p>So there you #{@ellipsis}
-    EXPECTED
-
-    actual = @to.convert rdoc
-
-    assert_equal expected, actual
-    assert_equal 111, @to.characters, 'snippet character length'
-  end
-
-  def test_convert_limit_2
-    rdoc = <<-RDOC
-Outputs formatted RI data for the class or method +name+.
-
-Returns true if +name+ was found, false if it was not an alternative could
-be guessed, raises an error if +name+ couldn't be guessed.
-    RDOC
-
-    expected = <<-EXPECTED
-<p>Outputs formatted RI data for the class or method <code>name</code>.
-<p>Returns true if <code>name</code> was found, false if it was #{@ellipsis}
-    EXPECTED
-
-    actual = @to.convert rdoc
-
-    assert_equal expected, actual
-    assert_equal 159, @to.characters, 'snippet character length'
-  end
-
-  def test_convert_limit_paragraphs
-    @to = RDoc::Markup::ToHtmlSnippet.new @options, 100, 3
-
-    rdoc = <<-RDOC
-= \RDoc - Ruby Documentation System
-
-* {RDoc Project Page}[https://github.com/ruby/rdoc]
-* {RDoc Documentation}[https://ruby.github.io/rdoc]
-* {RDoc Bug Tracker}[https://github.com/ruby/rdoc/issues]
-
-== DESCRIPTION:
-
-RDoc produces HTML and command-line documentation for Ruby projects.  RDoc
-includes the +rdoc+ and +ri+ tools for generating and displaying online
-documentation.
-
-See RDoc for a description of RDoc's markup and basic use.
-    RDOC
-
-    expected = <<-EXPECTED
-<p>RDoc - Ruby Documentation System
-<p>RDoc Project Page
-<p>RDoc Documentation
-    EXPECTED
-
-    actual = @to.convert rdoc
-
-    assert_equal expected, actual
-    assert_equal 67, @to.characters
-  end
-
-  def test_convert_limit_in_tag
-    @to = RDoc::Markup::ToHtmlSnippet.new @options, 4
-    rdoc = "* ab *c* d\n"
-
-    expected = "<p>ab <strong>c</strong> #{@ellipsis}\n\n"
-
-    actual = @to.convert rdoc
-
-    assert_equal 4, @to.characters
-    assert_equal expected, actual
-  end
-
-  def test_convert_limit_verbatim
-    rdoc = <<-RDOC
-= Hello There
-
-This is some text, it *will* be cut off after 100 characters
-
-  This one is cut off in this verbatim section
-    RDOC
-
-    expected = <<-EXPECTED
-<p>Hello There
-<p>This is some text, it <strong>will</strong> be cut off after 100 characters
-
-<pre>This one is cut off in this verbatim ...</pre>
-    EXPECTED
-
-    actual = @to.convert rdoc
-
-    assert_equal expected, actual
-    assert_equal 113, @to.characters
-  end
-
-  def test_convert_limit_verbatim_2
-    rdoc = <<-RDOC
-Extracts the class, selector and method name parts from +name+ like
-Foo::Bar#baz.
-
-NOTE: Given Foo::Bar, Bar is considered a class even though it may be a
-      method
-    RDOC
-
-    expected = <<-EXPECTED
-<p>Extracts the class, selector and method name parts from <code>name</code> like Foo::Bar#baz.
-<p>NOTE: Given Foo::Bar, #{@ellipsis}
-    EXPECTED
-
-    actual = @to.convert rdoc
-
-    assert_equal expected, actual
-    assert_equal 101, @to.characters
-  end
-
-  def test_convert_limit_verbatim_multiline
-    rdoc = <<-RDOC
-Look for directives in a normal comment block:
-
-  # :stopdoc:
-  # Don't display comment from this point forward
-
-This routine modifies its +comment+ parameter.
-    RDOC
-
-    inner = CGI.escapeHTML "# Don't display comment from this point forward"
-    expected = <<-EXPECTED
-<p>Look for directives in a normal comment block:
-
-<pre class=\"ruby\"><span class=\"ruby-comment\"># :stopdoc:</span>
-<span class=\"ruby-comment\">#{inner}</span>
-</pre>
-    EXPECTED
-
-    actual = @to.convert rdoc
-
-    assert_equal expected, actual
-    assert_equal 105, @to.characters
-  end
-
-  def test_convert_limit_over
-    @to = RDoc::Markup::ToHtmlSnippet.new @options, 4
-    rdoc = "* text\n" * 2
-
-    expected = "<p>text\n"
-    expected = expected.chomp
-    expected << " #{@ellipsis}\n"
-
-    actual = @to.convert rdoc
-
-    assert_equal 4, @to.characters
-    assert_equal expected, actual
-  end
-
-  def test_convert_string
-    assert_equal '&lt;&gt;', @to.convert_string('<>')
-  end
-
-  def test_convert_RDOCLINK_label_label
-    result = @to.convert 'rdoc-label:label-One'
-
-    assert_equal "<p>One\n", result
-    assert_equal 3, @to.characters
-  end
-
-  def test_convert_RDOCLINK_label_foottext
-    result = @to.convert 'rdoc-label:foottext-1'
-
-    assert_equal "<p>1\n", result
-    assert_equal 1, @to.characters
-  end
-
-  def test_convert_RDOCLINK_label_footmark
-    result = @to.convert 'rdoc-label:footmark-1'
-
-    assert_equal "<p>1\n", result
-    assert_equal 1, @to.characters
-  end
-
-  def test_convert_RDOCLINK_ref
-    result = @to.convert 'rdoc-ref:C'
-
-    assert_equal "<p>C\n", result
-    assert_equal 1, @to.characters
-  end
-
-  def test_convert_TIDYLINK_rdoc_label
-    result = @to.convert '{foo}[rdoc-label:foottext-1]'
-
-    assert_equal "<p>foo\n", result
-    assert_equal 3, @to.characters
-  end
-
-  def test_handle_regexp_HYPERLINK_link
-    target = RDoc::Markup::RegexpHandling.new 0, 'link:README.txt'
-
-    link = @to.handle_regexp_HYPERLINK target
-
-    assert_equal 'README.txt', link
-  end
-
-  def test_list_verbatim_2
-    str = "* one\n    verb1\n    verb2\n* two\n"
-
-    expected = <<-EXPECTED
-<p>one
-
-<pre class=\"ruby\"><span class=\"ruby-identifier\">verb1</span>
-<span class=\"ruby-identifier\">verb2</span>
-</pre>
-<p>two
-
-    EXPECTED
-
-    assert_equal expected, @m.convert(str, @to)
-    assert_equal 17, @to.characters
-  end
-
-  def test_on_tags
-    on = RDoc::Markup::AttrChanger.new 2, 0
-
-    @to.on_tags [], on
-
-    assert_equal 2, @to.mask
-  end
-
-  def test_off_tags
-    on  = RDoc::Markup::AttrChanger.new 2, 0
-    off = RDoc::Markup::AttrChanger.new 0, 2
-
-    @to.on_tags  [], on
-    @to.off_tags [], off
-
-    assert_equal 0, @to.mask
-  end
-
-  def test_to_html
-    assert_equal "<p><code>--</code>\n", util_format("<tt>--</tt>")
-    assert_equal 2, @to.characters
-  end
-
-  def util_format text
-    paragraph = RDoc::Markup::Paragraph.new text
-
-    @to.start_accepting
-    @to.accept_paragraph paragraph
-    @to.end_accepting
-  end
-
-end
diff --git a/test/rdoc/test_rdoc_markup_to_joined_paragraph.rb b/test/rdoc/test_rdoc_markup_to_joined_paragraph.rb
deleted file mode 100644
index 8bd2d67247c83d..00000000000000
--- a/test/rdoc/test_rdoc_markup_to_joined_paragraph.rb
+++ /dev/null
@@ -1,32 +0,0 @@
-# frozen_string_literal: true
-require_relative 'helper'
-
-class TestRDocMarkupToJoinedParagraph < RDoc::TestCase
-
-  def setup
-    super
-
-    @to = RDoc::Markup::ToJoinedParagraph.new
-  end
-
-  def test_accept_paragraph
-    parsed = para('hello', ' ', 'world')
-
-    @to.accept_paragraph parsed
-
-    expected = para('hello world')
-
-    assert_equal expected, parsed
-  end
-
-  def test_accept_paragraph_break
-    parsed = para('hello', ' ', 'world', hard_break, 'everyone')
-
-    @to.accept_paragraph parsed
-
-    expected = para('hello world', hard_break, 'everyone')
-
-    assert_equal expected, parsed
-  end
-
-end
diff --git a/test/rdoc/test_rdoc_markup_to_label.rb b/test/rdoc/test_rdoc_markup_to_label.rb
deleted file mode 100644
index 2bf2e0ecdfc4dd..00000000000000
--- a/test/rdoc/test_rdoc_markup_to_label.rb
+++ /dev/null
@@ -1,112 +0,0 @@
-# frozen_string_literal: true
-require_relative 'helper'
-
-class TestRDocMarkupToLabel < RDoc::Markup::FormatterTestCase
-
-  add_visitor_tests
-
-  def setup
-    super
-
-    @to = RDoc::Markup::ToLabel.new
-  end
-
-  def empty
-    assert_empty @to.res
-  end
-
-  def end_accepting
-    assert_equal %w[hi], @to.res
-  end
-
-  alias accept_blank_line                             empty
-  alias accept_block_quote                            empty
-  alias accept_document                               empty
-  alias accept_heading                                empty
-  alias accept_heading_1                              empty
-  alias accept_heading_2                              empty
-  alias accept_heading_3                              empty
-  alias accept_heading_4                              empty
-  alias accept_heading_b                              empty
-  alias accept_heading_suppressed_crossref            empty
-  alias accept_list_end_bullet                        empty
-  alias accept_list_end_label                         empty
-  alias accept_list_end_lalpha                        empty
-  alias accept_list_end_note                          empty
-  alias accept_list_end_number                        empty
-  alias accept_list_end_ualpha                        empty
-  alias accept_list_item_end_bullet                   empty
-  alias accept_list_item_end_label                    empty
-  alias accept_list_item_end_lalpha                   empty
-  alias accept_list_item_end_note                     empty
-  alias accept_list_item_end_number                   empty
-  alias accept_list_item_end_ualpha                   empty
-  alias accept_list_item_start_bullet                 empty
-  alias accept_list_item_start_label                  empty
-  alias accept_list_item_start_lalpha                 empty
-  alias accept_list_item_start_note                   empty
-  alias accept_list_item_start_note_2                 empty
-  alias accept_list_item_start_note_multi_description empty
-  alias accept_list_item_start_note_multi_label       empty
-  alias accept_list_item_start_number                 empty
-  alias accept_list_item_start_ualpha                 empty
-  alias accept_list_start_bullet                      empty
-  alias accept_list_start_label                       empty
-  alias accept_list_start_lalpha                      empty
-  alias accept_list_start_note                        empty
-  alias accept_list_start_number                      empty
-  alias accept_list_start_ualpha                      empty
-  alias accept_paragraph                              empty
-  alias accept_paragraph_b                            empty
-  alias accept_paragraph_br                           empty
-  alias accept_paragraph_break                        empty
-  alias accept_paragraph_i                            empty
-  alias accept_paragraph_plus                         empty
-  alias accept_paragraph_star                         empty
-  alias accept_paragraph_underscore                   empty
-  alias accept_raw                                    empty
-  alias accept_rule                                   empty
-  alias accept_verbatim                               empty
-  alias list_nested                                   empty
-  alias list_verbatim                                 empty
-  alias start_accepting                               empty
-
-  def test_convert_bold
-    assert_equal 'bold', @to.convert('<b>bold</b>')
-    assert_equal 'bold', @to.convert('*bold*')
-  end
-
-  def test_convert_crossref
-    assert_equal 'SomeClass', @to.convert('SomeClass')
-    assert_equal 'SomeClass', @to.convert('\\SomeClass')
-
-    assert_equal 'some_method', @to.convert('some_method')
-    assert_equal 'some_method', @to.convert('\\some_method')
-
-    assert_equal '23some_method', @to.convert('#some_method')
-    assert_equal '23some_method', @to.convert('\\#some_method')
-  end
-
-  def test_convert_em
-    assert_equal 'em', @to.convert('<em>em</em>')
-    assert_equal 'em', @to.convert('*em*')
-  end
-
-  def test_convert_em_dash # for HTML conversion
-    assert_equal '-', @to.convert('--')
-  end
-
-  def test_convert_escape
-    assert_equal 'a+-3E+b', @to.convert('a > b')
-  end
-
-  def test_convert_tidylink
-    assert_equal 'text', @to.convert('{text}[stuff]')
-    assert_equal 'text', @to.convert('text[stuff]')
-  end
-
-  def test_convert_tt
-    assert_equal 'tt', @to.convert('<tt>tt</tt>')
-  end
-
-end
diff --git a/test/rdoc/test_rdoc_markup_to_markdown.rb b/test/rdoc/test_rdoc_markup_to_markdown.rb
deleted file mode 100644
index ff47364faa464e..00000000000000
--- a/test/rdoc/test_rdoc_markup_to_markdown.rb
+++ /dev/null
@@ -1,389 +0,0 @@
-# frozen_string_literal: true
-require_relative 'helper'
-
-class TestRDocMarkupToMarkdown < RDoc::Markup::TextFormatterTestCase
-
-  add_visitor_tests
-  add_text_tests
-
-  def setup
-    super
-
-    @to = RDoc::Markup::ToMarkdown.new
-  end
-
-  def accept_blank_line
-    assert_equal "\n", @to.res.join
-  end
-
-  def accept_block_quote
-    assert_equal "> quote\n", @to.res.join
-  end
-
-  def accept_document
-    assert_equal "hello\n", @to.res.join
-  end
-
-  def accept_heading
-    assert_equal "##### Hello\n", @to.res.join
-  end
-
-  def accept_list_end_bullet
-    assert_empty @to.list_index
-    assert_empty @to.list_type
-    assert_empty @to.list_width
-  end
-
-  def accept_list_end_label
-    assert_empty @to.list_index
-    assert_empty @to.list_type
-    assert_empty @to.list_width
-  end
-
-  def accept_list_end_lalpha
-    assert_empty @to.list_index
-    assert_empty @to.list_type
-    assert_empty @to.list_width
-  end
-
-  def accept_list_end_note
-    assert_empty @to.list_index
-    assert_empty @to.list_type
-    assert_empty @to.list_width
-  end
-
-  def accept_list_end_number
-    assert_empty @to.list_index
-    assert_empty @to.list_type
-    assert_empty @to.list_width
-  end
-
-  def accept_list_end_ualpha
-    assert_empty @to.list_index
-    assert_empty @to.list_type
-    assert_empty @to.list_width
-  end
-
-  def accept_list_item_end_bullet
-    assert_equal 0, @to.indent, 'indent'
-  end
-
-  def accept_list_item_end_label
-    assert_equal "cat\n:   ", @to.res.join
-    assert_equal 0, @to.indent, 'indent'
-  end
-
-  def accept_list_item_end_lalpha
-    assert_equal 0, @to.indent, 'indent'
-    assert_equal 2, @to.list_index.last
-  end
-
-  def accept_list_item_end_note
-    assert_equal "cat\n:   ", @to.res.join
-    assert_equal 0, @to.indent, 'indent'
-  end
-
-  def accept_list_item_end_number
-    assert_equal 0, @to.indent, 'indent'
-    assert_equal 2, @to.list_index.last
-  end
-
-  def accept_list_item_end_ualpha
-    assert_equal 0, @to.indent, 'indent'
-    assert_equal 2, @to.list_index.last
-  end
-
-  def accept_list_item_start_bullet
-    assert_equal [""], @to.res
-    assert_equal '*   ', @to.prefix
-  end
-
-  def accept_list_item_start_label
-    assert_equal [""], @to.res
-    assert_equal "cat\n:   ", @to.prefix
-
-    assert_equal 4, @to.indent
-  end
-
-  def accept_list_item_start_lalpha
-    assert_equal [""], @to.res
-    assert_equal '1.  ', @to.prefix
-
-    assert_equal 1, @to.list_index.last
-    assert_equal 4, @to.indent
-  end
-
-  def accept_list_item_start_note
-    assert_equal [""], @to.res
-    assert_equal "cat\n:   ", @to.prefix
-
-    assert_equal 4, @to.indent
-  end
-
-  def accept_list_item_start_number
-    assert_equal [""], @to.res
-    assert_equal '1.  ', @to.prefix
-
-    assert_equal 1, @to.list_index.last
-    assert_equal 4, @to.indent
-  end
-
-  def accept_list_item_start_ualpha
-    assert_equal [""], @to.res
-    assert_equal '1.  ', @to.prefix
-
-    assert_equal 1, @to.list_index.last
-    assert_equal 4, @to.indent
-  end
-
-  def accept_list_start_bullet
-    assert_equal "",   @to.res.join
-    assert_equal [nil],     @to.list_index
-    assert_equal [:BULLET], @to.list_type
-    assert_equal [4],       @to.list_width
-  end
-
-  def accept_list_start_label
-    assert_equal "",  @to.res.join
-    assert_equal [nil],    @to.list_index
-    assert_equal [:LABEL], @to.list_type
-    assert_equal [4],      @to.list_width
-  end
-
-  def accept_list_start_lalpha
-    assert_equal "",   @to.res.join
-    assert_equal [1],     @to.list_index
-    assert_equal [:LALPHA], @to.list_type
-    assert_equal [4],       @to.list_width
-  end
-
-  def accept_list_start_note
-    assert_equal "", @to.res.join
-    assert_equal [nil],   @to.list_index
-    assert_equal [:NOTE], @to.list_type
-    assert_equal [4],     @to.list_width
-  end
-
-  def accept_list_start_number
-    assert_equal "",   @to.res.join
-    assert_equal [1],       @to.list_index
-    assert_equal [:NUMBER], @to.list_type
-    assert_equal [4],       @to.list_width
-  end
-
-  def accept_list_start_ualpha
-    assert_equal "",   @to.res.join
-    assert_equal [1],     @to.list_index
-    assert_equal [:UALPHA], @to.list_type
-    assert_equal [4],       @to.list_width
-  end
-
-  def accept_paragraph
-    assert_equal "hi\n", @to.res.join
-  end
-
-  def accept_raw
-    raw = <<-RAW.rstrip
-<table>
-<tr><th>Name<th>Count
-<tr><td>a<td>1
-<tr><td>b<td>2
-</table>
-    RAW
-
-    assert_equal raw, @to.res.join
-  end
-
-  def accept_rule
-    assert_equal "---\n", @to.res.join
-  end
-
-  def accept_verbatim
-    assert_equal "    hi\n      world\n\n", @to.res.join
-  end
-
-  def end_accepting
-    assert_equal "hi", @to.end_accepting
-  end
-
-  def start_accepting
-    assert_equal 0, @to.indent
-    assert_equal [""], @to.res
-    assert_empty @to.list_index
-    assert_empty @to.list_type
-    assert_empty @to.list_width
-  end
-
-  def accept_heading_1
-    assert_equal "# Hello\n", @to.end_accepting
-  end
-
-  def accept_heading_2
-    assert_equal "## Hello\n", @to.end_accepting
-  end
-
-  def accept_heading_3
-    assert_equal "### Hello\n", @to.end_accepting
-  end
-
-  def accept_heading_4
-    assert_equal "#### Hello\n", @to.end_accepting
-  end
-
-  def accept_heading_indent
-    assert_equal "   # Hello\n", @to.end_accepting
-  end
-
-  def accept_heading_b
-    assert_equal "# **Hello**\n", @to.end_accepting
-  end
-
-  def accept_heading_suppressed_crossref
-    assert_equal "# Hello\n", @to.end_accepting
-  end
-
-  def accept_list_item_start_note_2
-    assert_equal "`teletype`\n:   teletype description\n\n", @to.res.join
-  end
-
-  def accept_list_item_start_note_multi_description
-    assert_equal "label\n:   description one\n\n:   description two\n\n",
-                 @to.res.join
-  end
-
-  def accept_list_item_start_note_multi_label
-    assert_equal "one\ntwo\n:   two headers\n\n", @to.res.join
-  end
-
-  def accept_paragraph_b
-    assert_equal "reg **bold words** reg\n", @to.end_accepting
-  end
-
-  def accept_paragraph_br
-    assert_equal "one  \ntwo\n", @to.end_accepting
-  end
-
-  def accept_paragraph_break
-    assert_equal "hello  \nworld\n", @to.end_accepting
-  end
-
-  def accept_paragraph_i
-    assert_equal "reg *italic words* reg\n", @to.end_accepting
-  end
-
-  def accept_paragraph_indent
-    expected = <<-EXPECTED
-   words words words words words words words words words words words words
-   words words words words words words words words words words words words
-   words words words words words words
-    EXPECTED
-
-    assert_equal expected, @to.end_accepting
-  end
-
-  def accept_paragraph_plus
-    assert_equal "reg `teletype` reg\n", @to.end_accepting
-  end
-
-  def accept_paragraph_star
-    assert_equal "reg **bold** reg\n", @to.end_accepting
-  end
-
-  def accept_paragraph_underscore
-    assert_equal "reg *italic* reg\n", @to.end_accepting
-  end
-
-  def accept_paragraph_wrap
-    expected = <<-EXPECTED
-words words words words words words words words words words words words words
-words words words words words words words words words words words words words
-words words words words
-    EXPECTED
-
-    assert_equal expected, @to.end_accepting
-  end
-
-  def accept_rule_indent
-    assert_equal "   ---\n", @to.end_accepting
-  end
-
-  def accept_verbatim_indent
-    assert_equal "      hi\n       world\n\n", @to.end_accepting
-  end
-
-  def accept_verbatim_big_indent
-    assert_equal "      hi\n      world\n\n", @to.end_accepting
-  end
-
-  def list_nested
-    expected = <<-EXPECTED
-*   l1
-    *   l1.1
-
-*   l2
-
-    EXPECTED
-
-    assert_equal expected, @to.end_accepting
-  end
-
-  def list_verbatim
-    expected = <<-EXPECTED # HACK overblown
-*   list stuff
-
-        * list
-          with
-
-          second
-
-          1. indented
-          2. numbered
-
-          third
-
-        * second
-
-
-    EXPECTED
-
-    assert_equal expected, @to.end_accepting
-  end
-
-  def test_convert_RDOCLINK
-    result = @to.convert 'rdoc-garbage:C'
-
-    assert_equal "C\n", result
-  end
-
-  def test_convert_RDOCLINK_image
-    result = @to.convert 'rdoc-image:/path/to/image.jpg'
-
-    assert_equal "![](/path/to/image.jpg)\n", result
-  end
-
-  def test_convert_TIDYLINK
-    result = @to.convert \
-      '{DSL}[https://en.wikipedia.org/wiki/Domain-specific_language]'
-
-    expected = "[DSL](https://en.wikipedia.org/wiki/Domain-specific_language)\n"
-
-    assert_equal expected, result
-  end
-
-  def test_handle_rdoc_link_label_footmark
-    assert_equal '[^1]:', @to.handle_rdoc_link('rdoc-label:footmark-1:x')
-  end
-
-  def test_handle_rdoc_link_label_foottext
-    assert_equal '[^1]',   @to.handle_rdoc_link('rdoc-label:foottext-1:x')
-  end
-
-  def test_handle_rdoc_link_label_label
-    assert_equal '[x](#label-x)', @to.handle_rdoc_link('rdoc-label:label-x')
-  end
-
-  def test_handle_rdoc_link_ref
-    assert_equal 'x', @to.handle_rdoc_link('rdoc-ref:x')
-  end
-
-end
diff --git a/test/rdoc/test_rdoc_markup_to_rdoc.rb b/test/rdoc/test_rdoc_markup_to_rdoc.rb
deleted file mode 100644
index bb30ee52262da2..00000000000000
--- a/test/rdoc/test_rdoc_markup_to_rdoc.rb
+++ /dev/null
@@ -1,377 +0,0 @@
-# frozen_string_literal: true
-require_relative 'helper'
-
-class TestRDocMarkupToRDoc < RDoc::Markup::TextFormatterTestCase
-
-  add_visitor_tests
-  add_text_tests
-
-  def setup
-    super
-
-    @to = RDoc::Markup::ToRdoc.new
-  end
-
-  def accept_blank_line
-    assert_equal "\n", @to.res.join
-  end
-
-  def accept_block_quote
-    assert_equal "> quote\n", @to.res.join
-  end
-
-  def accept_document
-    assert_equal "hello\n", @to.res.join
-  end
-
-  def accept_heading
-    assert_equal "===== Hello\n", @to.res.join
-  end
-
-  def accept_list_end_bullet
-    assert_empty @to.list_index
-    assert_empty @to.list_type
-    assert_empty @to.list_width
-  end
-
-  def accept_list_end_label
-    assert_empty @to.list_index
-    assert_empty @to.list_type
-    assert_empty @to.list_width
-  end
-
-  def accept_list_end_lalpha
-    assert_empty @to.list_index
-    assert_empty @to.list_type
-    assert_empty @to.list_width
-  end
-
-  def accept_list_end_note
-    assert_empty @to.list_index
-    assert_empty @to.list_type
-    assert_empty @to.list_width
-  end
-
-  def accept_list_end_number
-    assert_empty @to.list_index
-    assert_empty @to.list_type
-    assert_empty @to.list_width
-  end
-
-  def accept_list_end_ualpha
-    assert_empty @to.list_index
-    assert_empty @to.list_type
-    assert_empty @to.list_width
-  end
-
-  def accept_list_item_end_bullet
-    assert_equal 0, @to.indent, 'indent'
-  end
-
-  def accept_list_item_end_label
-    assert_equal "cat:\n", @to.res.join
-    assert_equal 0, @to.indent, 'indent'
-  end
-
-  def accept_list_item_end_lalpha
-    assert_equal 0, @to.indent, 'indent'
-    assert_equal 'b', @to.list_index.last
-  end
-
-  def accept_list_item_end_note
-    assert_equal "cat:\n", @to.res.join
-    assert_equal 0, @to.indent, 'indent'
-  end
-
-  def accept_list_item_end_number
-    assert_equal 0, @to.indent, 'indent'
-    assert_equal 2, @to.list_index.last
-  end
-
-  def accept_list_item_end_ualpha
-    assert_equal 0, @to.indent, 'indent'
-    assert_equal 'B', @to.list_index.last
-  end
-
-  def accept_list_item_start_bullet
-    assert_equal [""], @to.res
-    assert_equal '* ', @to.prefix
-  end
-
-  def accept_list_item_start_label
-    assert_equal [""], @to.res
-    assert_equal "cat:\n  ", @to.prefix
-
-    assert_equal 2, @to.indent
-  end
-
-  def accept_list_item_start_lalpha
-    assert_equal [""], @to.res
-    assert_equal 'a. ', @to.prefix
-
-    assert_equal 'a', @to.list_index.last
-    assert_equal 3, @to.indent
-  end
-
-  def accept_list_item_start_note
-    assert_equal [""], @to.res
-    assert_equal "cat:\n  ", @to.prefix
-
-    assert_equal 2, @to.indent
-  end
-
-  def accept_list_item_start_number
-    assert_equal [""], @to.res
-    assert_equal '1. ', @to.prefix
-
-    assert_equal 1, @to.list_index.last
-    assert_equal 3, @to.indent
-  end
-
-  def accept_list_item_start_ualpha
-    assert_equal [""], @to.res
-    assert_equal 'A. ', @to.prefix
-
-    assert_equal 'A', @to.list_index.last
-    assert_equal 3, @to.indent
-  end
-
-  def accept_list_start_bullet
-    assert_equal "",   @to.res.join
-    assert_equal [nil],     @to.list_index
-    assert_equal [:BULLET], @to.list_type
-    assert_equal [1],       @to.list_width
-  end
-
-  def accept_list_start_label
-    assert_equal "",  @to.res.join
-    assert_equal [nil],    @to.list_index
-    assert_equal [:LABEL], @to.list_type
-    assert_equal [2],      @to.list_width
-  end
-
-  def accept_list_start_lalpha
-    assert_equal "",   @to.res.join
-    assert_equal ['a'],     @to.list_index
-    assert_equal [:LALPHA], @to.list_type
-    assert_equal [1],       @to.list_width
-  end
-
-  def accept_list_start_note
-    assert_equal "", @to.res.join
-    assert_equal [nil],   @to.list_index
-    assert_equal [:NOTE], @to.list_type
-    assert_equal [2],     @to.list_width
-  end
-
-  def accept_list_start_number
-    assert_equal "",   @to.res.join
-    assert_equal [1],       @to.list_index
-    assert_equal [:NUMBER], @to.list_type
-    assert_equal [1],       @to.list_width
-  end
-
-  def accept_list_start_ualpha
-    assert_equal "",   @to.res.join
-    assert_equal ['A'],     @to.list_index
-    assert_equal [:UALPHA], @to.list_type
-    assert_equal [1],       @to.list_width
-  end
-
-  def accept_paragraph
-    assert_equal "hi\n", @to.res.join
-  end
-
-  def accept_raw
-    raw = <<-RAW.rstrip
-<table>
-<tr><th>Name<th>Count
-<tr><td>a<td>1
-<tr><td>b<td>2
-</table>
-    RAW
-
-    assert_equal raw, @to.res.join
-  end
-
-  def accept_rule
-    assert_equal "#{'-' * 78}\n", @to.res.join
-  end
-
-  def accept_verbatim
-    assert_equal "  hi\n    world\n\n", @to.res.join
-  end
-
-  def end_accepting
-    assert_equal "hi", @to.end_accepting
-  end
-
-  def start_accepting
-    assert_equal 0, @to.indent
-    assert_equal [""], @to.res
-    assert_empty @to.list_index
-    assert_empty @to.list_type
-    assert_empty @to.list_width
-  end
-
-  def accept_heading_1
-    assert_equal "= Hello\n", @to.end_accepting
-  end
-
-  def accept_heading_2
-    assert_equal "== Hello\n", @to.end_accepting
-  end
-
-  def accept_heading_3
-    assert_equal "=== Hello\n", @to.end_accepting
-  end
-
-  def accept_heading_4
-    assert_equal "==== Hello\n", @to.end_accepting
-  end
-
-  def accept_heading_indent
-    assert_equal "   = Hello\n", @to.end_accepting
-  end
-
-  def accept_heading_b
-    assert_equal "= <b>Hello</b>\n", @to.end_accepting
-  end
-
-  def accept_heading_suppressed_crossref
-    assert_equal "= Hello\n", @to.end_accepting
-  end
-
-  def accept_list_item_start_note_2
-    assert_equal "<tt>teletype</tt>:\n  teletype description\n\n", @to.res.join
-  end
-
-  def accept_list_item_start_note_multi_description
-    assert_equal "label:\n  description one\n\n  description two\n\n",
-                 @to.res.join
-  end
-
-  def accept_list_item_start_note_multi_label
-    assert_equal "one\ntwo:\n  two headers\n\n", @to.res.join
-  end
-
-  def accept_paragraph_b
-    assert_equal "reg <b>bold words</b> reg\n", @to.end_accepting
-  end
-
-  def accept_paragraph_br
-    assert_equal "one\ntwo\n", @to.end_accepting
-  end
-
-  def accept_paragraph_break
-    assert_equal "hello\nworld\n", @to.end_accepting
-  end
-
-  def accept_paragraph_i
-    assert_equal "reg <em>italic words</em> reg\n", @to.end_accepting
-  end
-
-  def accept_paragraph_indent
-    expected = <<-EXPECTED
-   words words words words words words words words words words words words
-   words words words words words words words words words words words words
-   words words words words words words
-    EXPECTED
-
-    assert_equal expected, @to.end_accepting
-  end
-
-  def accept_paragraph_plus
-    assert_equal "reg <tt>teletype</tt> reg\n", @to.end_accepting
-  end
-
-  def accept_paragraph_star
-    assert_equal "reg <b>bold</b> reg\n", @to.end_accepting
-  end
-
-  def accept_paragraph_underscore
-    assert_equal "reg <em>italic</em> reg\n", @to.end_accepting
-  end
-
-  def accept_paragraph_wrap
-    expected = <<-EXPECTED
-words words words words words words words words words words words words words
-words words words words words words words words words words words words words
-words words words words
-    EXPECTED
-
-    assert_equal expected, @to.end_accepting
-  end
-
-  def accept_rule_indent
-    assert_equal "   #{'-' * 75}\n", @to.end_accepting
-  end
-
-  def accept_verbatim_indent
-    assert_equal "    hi\n     world\n\n", @to.end_accepting
-  end
-
-  def accept_verbatim_big_indent
-    assert_equal "    hi\n    world\n\n", @to.end_accepting
-  end
-
-  def list_nested
-    expected = <<-EXPECTED
-* l1
-  * l1.1
-* l2
-    EXPECTED
-
-    assert_equal expected, @to.end_accepting
-  end
-
-  def list_verbatim
-    expected = <<-EXPECTED # HACK overblown
-* list stuff
-
-    * list
-      with
-
-      second
-
-      1. indented
-      2. numbered
-
-      third
-
-    * second
-
-    EXPECTED
-
-    assert_equal expected, @to.end_accepting
-  end
-
-  # functional test
-  def test_convert_list_note
-    note_list = <<-NOTE_LIST
-foo ::
-bar ::
-  hi
-    NOTE_LIST
-
-    expected = <<-EXPECTED
-foo
-bar:
-  hi
-
-    EXPECTED
-
-    assert_equal expected, @to.convert(note_list)
-  end
-
-  def test_accept_indented_paragraph
-    ip = RDoc::Markup::IndentedParagraph.new 2, 'cats are cool'
-
-    @to.start_accepting
-
-    @to.accept_indented_paragraph ip
-
-    assert_equal "  cats are cool\n", @to.end_accepting
-  end
-
-end
diff --git a/test/rdoc/test_rdoc_markup_to_table_of_contents.rb b/test/rdoc/test_rdoc_markup_to_table_of_contents.rb
deleted file mode 100644
index 7512495aec2291..00000000000000
--- a/test/rdoc/test_rdoc_markup_to_table_of_contents.rb
+++ /dev/null
@@ -1,126 +0,0 @@
-# frozen_string_literal: true
-require_relative 'helper'
-
-class TestRDocMarkupToTableOfContents < RDoc::Markup::FormatterTestCase
-
-  add_visitor_tests
-
-  def setup
-    super
-
-    @to = RDoc::Markup::ToTableOfContents.new
-  end
-
-  def end_accepting
-    assert_equal %w[hi], @to.res
-  end
-
-  def empty
-    assert_empty @to.res
-  end
-
-  def accept_heading
-    assert_equal [@RM::Heading.new(5, 'Hello')], @to.res
-  end
-
-  def accept_heading_1
-    assert_equal [@RM::Heading.new(1, 'Hello')], @to.res
-  end
-
-  def accept_heading_2
-    assert_equal [@RM::Heading.new(2, 'Hello')], @to.res
-  end
-
-  def accept_heading_3
-    assert_equal [@RM::Heading.new(3, 'Hello')], @to.res
-  end
-
-  def accept_heading_4
-    assert_equal [@RM::Heading.new(4, 'Hello')], @to.res
-  end
-
-  def accept_heading_b
-    assert_equal [@RM::Heading.new(1, '*Hello*')], @to.res
-  end
-
-  def accept_heading_suppressed_crossref
-    assert_equal [@RM::Heading.new(1, '\\Hello')], @to.res
-  end
-
-  alias accept_blank_line                             empty
-  alias accept_block_quote                            empty
-  alias accept_document                               empty
-  alias accept_list_end_bullet                        empty
-  alias accept_list_end_label                         empty
-  alias accept_list_end_lalpha                        empty
-  alias accept_list_end_note                          empty
-  alias accept_list_end_number                        empty
-  alias accept_list_end_ualpha                        empty
-  alias accept_list_item_end_bullet                   empty
-  alias accept_list_item_end_label                    empty
-  alias accept_list_item_end_lalpha                   empty
-  alias accept_list_item_end_note                     empty
-  alias accept_list_item_end_number                   empty
-  alias accept_list_item_end_ualpha                   empty
-  alias accept_list_item_start_bullet                 empty
-  alias accept_list_item_start_label                  empty
-  alias accept_list_item_start_lalpha                 empty
-  alias accept_list_item_start_note                   empty
-  alias accept_list_item_start_note_2                 empty
-  alias accept_list_item_start_note_multi_description empty
-  alias accept_list_item_start_note_multi_label       empty
-  alias accept_list_item_start_number                 empty
-  alias accept_list_item_start_ualpha                 empty
-  alias accept_list_start_bullet                      empty
-  alias accept_list_start_label                       empty
-  alias accept_list_start_lalpha                      empty
-  alias accept_list_start_note                        empty
-  alias accept_list_start_number                      empty
-  alias accept_list_start_ualpha                      empty
-  alias accept_paragraph                              empty
-  alias accept_paragraph_b                            empty
-  alias accept_paragraph_br                           empty
-  alias accept_paragraph_break                        empty
-  alias accept_paragraph_i                            empty
-  alias accept_paragraph_plus                         empty
-  alias accept_paragraph_star                         empty
-  alias accept_paragraph_underscore                   empty
-  alias accept_raw                                    empty
-  alias accept_rule                                   empty
-  alias accept_verbatim                               empty
-  alias list_nested                                   empty
-  alias list_verbatim                                 empty
-  alias start_accepting                               empty
-
-  def test_accept_document_omit_headings_below
-    document = doc
-    document.omit_headings_below = 2
-
-    @to.accept_document document
-
-    assert_equal 2, @to.omit_headings_below
-  end
-
-  def test_accept_heading_suppressed
-    @to.start_accepting
-    @to.omit_headings_below = 4
-
-    suppressed = head 5, 'Hello'
-
-    @to.accept_heading suppressed
-
-    assert_empty @to.res
-  end
-
-  def test_suppressed_eh
-    @to.omit_headings_below = nil
-
-    refute @to.suppressed? head(1, '')
-
-    @to.omit_headings_below = 1
-
-    refute @to.suppressed? head(1, '')
-    assert @to.suppressed? head(2, '')
-  end
-
-end
diff --git a/test/rdoc/test_rdoc_markup_to_tt_only.rb b/test/rdoc/test_rdoc_markup_to_tt_only.rb
deleted file mode 100644
index c709d7a4d5b2ed..00000000000000
--- a/test/rdoc/test_rdoc_markup_to_tt_only.rb
+++ /dev/null
@@ -1,246 +0,0 @@
-# frozen_string_literal: true
-require_relative 'helper'
-
-class TestRDocMarkupToTtOnly < RDoc::Markup::FormatterTestCase
-
-  add_visitor_tests
-
-  def setup
-    super
-
-    @to = RDoc::Markup::ToTtOnly.new
-  end
-
-  def accept_blank_line
-    assert_empty @to.end_accepting
-  end
-
-  def accept_block_quote
-    assert_empty @to.end_accepting
-  end
-
-  def accept_document
-    assert_equal [], @to.res
-  end
-
-  def accept_heading
-    assert_empty @to.end_accepting
-  end
-
-  def accept_list_end_bullet
-    assert_empty @to.res
-  end
-
-  def accept_list_end_label
-    assert_empty @to.res
-  end
-
-  def accept_list_end_lalpha
-    assert_empty @to.res
-  end
-
-  def accept_list_end_note
-    assert_empty @to.res
-  end
-
-  def accept_list_end_number
-    assert_empty @to.res
-  end
-
-  def accept_list_end_ualpha
-    assert_empty @to.res
-  end
-
-  def accept_list_item_end_bullet
-    assert_empty @to.res
-  end
-
-  def accept_list_item_end_label
-    assert_empty @to.res
-  end
-
-  def accept_list_item_end_lalpha
-    assert_empty @to.res
-  end
-
-  def accept_list_item_end_note
-    assert_empty @to.res
-  end
-
-  def accept_list_item_end_number
-    assert_empty @to.res
-  end
-
-  def accept_list_item_end_ualpha
-    assert_empty @to.res
-  end
-
-  def accept_list_item_start_bullet
-    assert_empty @to.res
-  end
-
-  def accept_list_item_start_label
-    assert_empty @to.res
-  end
-
-  def accept_list_item_start_lalpha
-    assert_empty @to.res
-  end
-
-  def accept_list_item_start_note
-    assert_empty @to.res
-  end
-
-  def accept_list_item_start_number
-    assert_empty @to.res
-  end
-
-  def accept_list_item_start_ualpha
-    assert_empty @to.res
-  end
-
-  def accept_list_start_bullet
-    assert_empty @to.res
-  end
-
-  def accept_list_start_label
-    assert_empty @to.res
-  end
-
-  def accept_list_start_lalpha
-    assert_empty @to.res
-  end
-
-  def accept_list_start_note
-    assert_empty @to.res
-  end
-
-  def accept_list_start_number
-    assert_empty @to.res
-  end
-
-  def accept_list_start_ualpha
-    assert_empty @to.res
-  end
-
-  def accept_paragraph
-    assert_empty @to.end_accepting
-  end
-
-  def accept_paragraph_break
-    assert_empty @to.end_accepting
-  end
-
-  def accept_raw
-    assert_empty @to.end_accepting
-  end
-
-  def accept_rule
-    assert_empty @to.end_accepting
-  end
-
-  def accept_verbatim
-    assert_empty @to.end_accepting
-  end
-
-  def end_accepting
-    assert_equal %w[hi], @to.end_accepting
-  end
-
-  def start_accepting
-    assert_empty @to.end_accepting
-  end
-
-  def accept_heading_1
-    assert_empty @to.end_accepting
-  end
-
-  def accept_heading_2
-    assert_empty @to.end_accepting
-  end
-
-  def accept_heading_3
-    assert_empty @to.end_accepting
-  end
-
-  def accept_heading_4
-    assert_empty @to.end_accepting
-  end
-
-  def accept_heading_indent
-    assert_empty @to.end_accepting
-  end
-
-  def accept_heading_b
-    assert_empty @to.end_accepting
-  end
-
-  def accept_heading_suppressed_crossref
-    assert_empty @to.end_accepting
-  end
-
-  def accept_list_item_start_note_2
-    assert_equal [nil, 'teletype', nil], @to.res
-  end
-
-  def accept_list_item_start_note_multi_description
-    assert_empty @to.res
-  end
-
-  def accept_list_item_start_note_multi_label
-    assert_empty @to.res
-  end
-
-  def accept_paragraph_b
-    assert_empty @to.end_accepting
-  end
-
-  def accept_paragraph_br
-    assert_empty @to.end_accepting
-  end
-
-  def accept_paragraph_i
-    assert_empty @to.end_accepting
-  end
-
-  def accept_paragraph_indent
-    assert_empty @to.end_accepting
-  end
-
-  def accept_paragraph_plus
-    assert_equal %w[teletype], @to.end_accepting
-  end
-
-  def accept_paragraph_star
-    assert_empty @to.end_accepting
-  end
-
-  def accept_paragraph_underscore
-    assert_empty @to.end_accepting
-  end
-
-  def accept_paragraph_wrap
-    assert_empty @to.end_accepting
-  end
-
-  def accept_rule_indent
-    assert_empty @to.end_accepting
-  end
-
-  def accept_verbatim_indent
-    assert_empty @to.end_accepting
-  end
-
-  def accept_verbatim_big_indent
-    assert_empty @to.end_accepting
-  end
-
-  def list_nested
-    assert_empty @to.end_accepting
-  end
-
-  def list_verbatim
-    assert_empty @to.end_accepting
-  end
-
-end
diff --git a/test/rdoc/test_rdoc_markup_verbatim.rb b/test/rdoc/test_rdoc_markup_verbatim.rb
deleted file mode 100644
index 2f8a57266a9a16..00000000000000
--- a/test/rdoc/test_rdoc_markup_verbatim.rb
+++ /dev/null
@@ -1,29 +0,0 @@
-# frozen_string_literal: true
-require_relative 'helper'
-
-class TestRDocMarkupVerbatim < RDoc::TestCase
-
-  def test_equals2
-    v1 = verb('1 + 1')
-    v2 = verb('1 + 1')
-    v3 = verb('1 + 2')
-    v4 = verb('1 + 1')
-    v4.format = :ruby
-
-    assert_equal v1, v2
-
-    refute_equal v1, v3
-    refute_equal v1, v4
-  end
-
-  def test_ruby_eh
-    verbatim = RDoc::Markup::Verbatim.new
-
-    refute verbatim.ruby?
-
-    verbatim.format = :ruby
-
-    assert verbatim.ruby?
-  end
-
-end
diff --git a/test/rdoc/test_rdoc_method_attr.rb b/test/rdoc/test_rdoc_method_attr.rb
deleted file mode 100644
index d607619a60a20c..00000000000000
--- a/test/rdoc/test_rdoc_method_attr.rb
+++ /dev/null
@@ -1,193 +0,0 @@
-# frozen_string_literal: true
-require_relative 'xref_test_case'
-
-class TestRDocMethodAttr < XrefTestCase
-
-  def test_initialize_copy
-    refute_same @c1_m.full_name, @c1_m.dup.full_name
-  end
-
-  def test_block_params_equal
-    m = RDoc::MethodAttr.new(nil, 'foo')
-
-    m.block_params = ''
-    assert_equal '', m.block_params
-
-    m.block_params = 'a_var'
-    assert_equal 'a_var', m.block_params
-
-    m.block_params = '()'
-    assert_equal '', m.block_params
-
-    m.block_params = '(a_var, b_var)'
-    assert_equal 'a_var, b_var', m.block_params
-
-    m.block_params = '.to_s + "</#{element.upcase}>"'
-    assert_equal '', m.block_params
-
-    m.block_params = 'i.name'
-    assert_equal 'name', m.block_params
-
-    m.block_params = 'attr.expanded_name, attr.value'
-    assert_equal 'expanded_name, value', m.block_params
-
-    m.block_params = 'expanded_name, attr.value'
-    assert_equal 'expanded_name, value', m.block_params
-
-    m.block_params = 'attr.expanded_name, value'
-    assert_equal 'expanded_name, value', m.block_params
-
-    m.block_params = '(@base_notifier)'
-    assert_equal 'base_notifier', m.block_params
-
-    m.block_params = 'if @signal_status == :IN_LOAD'
-    assert_equal '', m.block_params
-
-    m.block_params = 'e if e.kind_of? Element'
-    assert_equal 'e', m.block_params
-
-    m.block_params = '(e, f) if e.kind_of? Element'
-    assert_equal 'e, f', m.block_params
-
-    m.block_params = 'back_path, back_name'
-    assert_equal 'back_path, back_name', m.block_params
-
-    m.block_params = '(*a[1..-1])'
-    assert_equal '*a', m.block_params
-
-    m.block_params = '@@context[:node] if defined? @@context[:node].namespace'
-    assert_equal 'context', m.block_params
-
-    m.block_params = '(result, klass.const_get(constant_name))'
-    assert_equal 'result, const', m.block_params
-
-    m.block_params = 'name.to_s if (bitmap & bit) != 0'
-    assert_equal 'name', m.block_params
-
-    m.block_params = 'line unless line.deleted'
-    assert_equal 'line', m.block_params
-
-    m.block_params = 'str + rs'
-    assert_equal 'str', m.block_params
-
-    m.block_params = 'f+rs'
-    assert_equal 'f', m.block_params
-
-    m.block_params = '[user, realm, hash[user]]'
-    assert_equal 'user, realm, hash', m.block_params
-
-    m.block_params = 'proc{|rc| rc == "rc" ? irbrc : irbrc+rc| ... }'
-    assert_equal 'proc', m.block_params
-
-    m.block_params = 'lambda { |x| x.to_i }'
-    assert_equal 'lambda', m.block_params
-
-    m.block_params = '$&'
-    assert_equal 'str', m.block_params
-
-    m.block_params = 'Inflections.instance'
-    assert_equal 'instance', m.block_params
-
-    m.block_params = 'self.class::STARTED'
-    assert_equal 'STARTED', m.block_params
-
-    m.block_params = 'Test::Unit::TestCase::STARTED'
-    assert_equal 'STARTED', m.block_params
-
-    m.block_params = 'ActiveSupport::OptionMerger.new(self, options)'
-    assert_equal 'option_merger', m.block_params
-
-    m.block_params = ', msg'
-    assert_equal '', m.block_params
-
-    m.block_params = '[size.to_s(16), term, chunk, term].join'
-    assert_equal '[size, term, chunk, term].join', m.block_params
-
-    m.block_params = 'YPath.new( path )'
-    assert_equal 'y_path', m.block_params
-
-  end
-
-  def test_find_method_or_attribute_recursive
-    inc = RDoc::Include.new 'M1', nil
-    @m1.add_include inc # M1 now includes itself
-
-    assert_nil @m1_m.find_method_or_attribute 'm'
-  end
-
-  def test_full_name
-    assert_equal 'C1#m',  @c1_m.full_name
-    assert_equal 'C1::m', @c1__m.full_name
-  end
-
-  def test_is_alias_for
-    assert_equal @c2_b, @c2_a.is_alias_for
-  end
-
-  def test_output_name
-    assert_equal '#m',  @c1_m.output_name(@c1)
-    assert_equal '::m', @c1__m.output_name(@c1)
-
-    assert_equal 'C1#m', @c1_m.output_name(@c2)
-    assert_equal 'C1.m', @c1__m.output_name(@c2)
-  end
-
-  def test_search_record
-    @c1_m.comment = 'This is a comment.'
-
-    expected = [
-      'm',
-      'C1#m',
-      'm',
-      'C1',
-      'C1.html#method-i-m',
-      '(foo)',
-      "<p>This is a comment.\n",
-    ]
-
-    assert_equal expected, @c1_m.search_record
-  end
-
-  def test_spaceship
-    assert_nil @c1_m.<=>(RDoc::CodeObject.new)
-  end
-
-  def test_equals2
-    assert_equal @c1_m, @c1_m
-    refute_equal @c1_m, @parent_m
-  end
-
-  def test_pretty_print
-    temp_dir do |tmpdir|
-      s = RDoc::RI::Store.new tmpdir
-      s.rdoc = @rdoc
-
-      top_level = s.add_file 'file.rb'
-      meth_bang = RDoc::AnyMethod.new nil, 'method!'
-      meth_bang.record_location top_level
-
-      meth_bang_alias = RDoc::Alias.new nil, 'method!', 'method_bang', ''
-      meth_bang_alias.record_location top_level
-
-      klass = top_level.add_class RDoc::NormalClass, 'Object'
-      klass.add_method meth_bang
-
-      meth_bang.add_alias meth_bang_alias, klass
-
-      s.save
-
-      meth_alias_from_store = s.load_method 'Object', '#method_bang'
-
-      expected = "[RDoc::AnyMethod Object#method_bang public alias for method!]"
-      actual =  mu_pp meth_alias_from_store
-      assert_equal expected, actual
-    end
-  end
-
-  def test_to_s
-    assert_equal 'RDoc::AnyMethod: C1#m',  @c1_m.to_s
-    assert_equal 'RDoc::AnyMethod: C2#b',  @c2_b.to_s
-    assert_equal 'RDoc::AnyMethod: C1::m', @c1__m.to_s
-  end
-
-end
diff --git a/test/rdoc/test_rdoc_normal_class.rb b/test/rdoc/test_rdoc_normal_class.rb
deleted file mode 100644
index 3d097ebb52d8f0..00000000000000
--- a/test/rdoc/test_rdoc_normal_class.rb
+++ /dev/null
@@ -1,47 +0,0 @@
-# frozen_string_literal: true
-require_relative 'xref_test_case'
-
-class TestRDocNormalClass < XrefTestCase
-
-  def test_ancestors
-    klass = @top_level.add_class RDoc::NormalClass, 'Klass'
-    incl = RDoc::Include.new 'Incl', ''
-
-    sub_klass = @top_level.add_class RDoc::NormalClass, 'SubClass'
-    sub_klass.superclass = klass
-    sub_klass.add_include incl
-
-    assert_equal [incl.name, klass, @object, 'BasicObject'], sub_klass.ancestors
-  end
-
-  def test_ancestors_multilevel
-    c1 = @top_level.add_class RDoc::NormalClass, 'Outer'
-    c2 = @top_level.add_class RDoc::NormalClass, 'Middle', c1.full_name
-    c3 = @top_level.add_class RDoc::NormalClass, 'Inner', c2.full_name
-
-    assert_equal [c2, c1, @object, 'BasicObject'], c3.ancestors
-  end
-
-  def test_aref
-    assert_equal 'class-C1',     @c1.aref
-    assert_equal 'class-C2::C3', @c2_c3.aref
-  end
-
-  def test_direct_ancestors
-    incl = RDoc::Include.new 'Incl', ''
-
-    c1 = @top_level.add_class RDoc::NormalClass, 'Outer'
-    c2 = @top_level.add_class RDoc::NormalClass, 'Middle', c1.full_name
-    c3 = @top_level.add_class RDoc::NormalClass, 'Inner', c2.full_name
-    c3.add_include incl
-
-    assert_equal [incl.name, c2], c3.direct_ancestors
-  end
-
-  def test_definition
-    c = RDoc::NormalClass.new 'C'
-
-    assert_equal 'class C', c.definition
-  end
-
-end
diff --git a/test/rdoc/test_rdoc_normal_module.rb b/test/rdoc/test_rdoc_normal_module.rb
deleted file mode 100644
index cccee5c44ca536..00000000000000
--- a/test/rdoc/test_rdoc_normal_module.rb
+++ /dev/null
@@ -1,42 +0,0 @@
-# frozen_string_literal: true
-require_relative 'xref_test_case'
-
-class TestRDocNormalModule < XrefTestCase
-
-  def setup
-    super
-
-    @mod = RDoc::NormalModule.new 'Mod'
-  end
-
-  def test_ancestors_module
-    top_level = @store.add_file 'file.rb'
-    mod = top_level.add_module RDoc::NormalModule, 'Mod'
-    incl = RDoc::Include.new 'Incl', ''
-
-    mod.add_include incl
-
-    assert_equal [incl.name], mod.ancestors
-
-    mod2 = top_level.add_module RDoc::NormalModule, 'Inc2'
-    inc2 = RDoc::Include.new 'Inc2', ''
-    mod.add_include inc2
-    assert_equal [mod2, incl.name], mod.ancestors
-  end
-
-  def test_aref
-    assert_equal 'module-M1',     @m1.aref
-    assert_equal 'module-M1::M2', @m1_m2.aref
-  end
-
-  def test_definition
-    m = RDoc::NormalModule.new 'M'
-
-    assert_equal 'module M', m.definition
-  end
-
-  def test_module_eh
-    assert @mod.module?
-  end
-
-end
diff --git a/test/rdoc/test_rdoc_options.rb b/test/rdoc/test_rdoc_options.rb
deleted file mode 100644
index 443d595ca6812b..00000000000000
--- a/test/rdoc/test_rdoc_options.rb
+++ /dev/null
@@ -1,910 +0,0 @@
-# frozen_string_literal: true
-require_relative 'helper'
-
-class TestRDocOptions < RDoc::TestCase
-
-  def setup
-    super
-
-    @options = RDoc::Options.new
-    @generators = RDoc::RDoc::GENERATORS.dup
-  end
-
-  def teardown
-    super
-
-    RDoc::RDoc::GENERATORS.replace @generators
-  end
-
-  def test_check_files
-    omit "assumes UNIX permission model" if /mswin|mingw/ =~ RUBY_PLATFORM
-    omit "assumes that euid is not root" if Process.euid == 0
-
-    out, err = capture_output do
-      temp_dir do
-        FileUtils.touch 'unreadable'
-        FileUtils.chmod 0, 'unreadable'
-
-        @options.files = %w[nonexistent unreadable]
-
-        @options.check_files
-      end
-    end
-
-    assert_empty @options.files
-
-    assert_empty out
-    assert_empty err
-  end
-
-  def test_check_files_warn
-    @options.verbosity = 2
-
-    out, err = verbose_capture_output do
-      @options.files = %w[nonexistent]
-
-      @options.check_files
-    end
-
-    assert_empty out
-    assert_equal "file 'nonexistent' not found\n", err
-    assert_empty @options.files
-  end
-
-  def test_dry_run_default
-    refute @options.dry_run
-  end
-
-  def test_to_yaml
-    RDoc.load_yaml
-
-    coder = YAML.load(@options.to_yaml)
-
-    encoding = 'UTF-8'
-
-    expected = {
-      'charset'              => 'UTF-8',
-      'encoding'             => encoding,
-      'exclude'              => %w[~\z \.orig\z \.rej\z \.bak\z \.gemspec\z],
-      'hyperlink_all'        => false,
-      'line_numbers'         => false,
-      'locale'               => nil,
-      'locale_dir'           => 'locale',
-      'locale_name'          => nil,
-      'main_page'            => nil,
-      'markup'               => 'rdoc',
-      'output_decoration'    => true,
-      'page_dir'             => nil,
-      'rdoc_include'         => [],
-      'show_hash'            => false,
-      'static_path'          => [],
-      'tab_width'            => 8,
-      'template_stylesheets' => [],
-      'title'                => nil,
-      'visibility'           => :protected,
-      'webcvs'               => nil,
-      'skip_tests'           => true,
-    }
-
-    assert_equal expected, coder
-  end
-
-  def test_to_yaml_trim_paths
-    RDoc.load_yaml
-
-    subdir = nil
-    coder = nil
-
-    temp_dir do |dir|
-      FileUtils.mkdir 'project'
-      FileUtils.mkdir 'dir'
-      FileUtils.touch 'file'
-
-      Dir.chdir 'project' do
-        subdir = File.expand_path 'subdir'
-        FileUtils.mkdir 'subdir'
-        @options.parse %w[
-          --copy subdir
-          --copy ../file
-          --copy ../
-          --copy /
-          --include subdir
-          --include ../dir
-          --include ../
-          --include /
-        ]
-
-        coder = YAML.load(@options.to_yaml)
-      end
-    end
-
-    assert_equal [subdir], coder['rdoc_include']
-
-    assert_equal [subdir], coder['static_path']
-  end
-
-  def test_encoding_default
-    assert_equal Encoding::UTF_8, @options.encoding
-  end
-
-  def test_generator_descriptions
-    # HACK autotest/isolate should take care of this
-    RDoc::RDoc::GENERATORS.clear
-    RDoc::RDoc::GENERATORS['darkfish'] = RDoc::Generator::Darkfish
-    RDoc::RDoc::GENERATORS['ri']       = RDoc::Generator::RI
-
-    expected = <<-EXPECTED.chomp
-  darkfish - HTML generator, written by Michael Granger
-  ri       - creates ri data files
-    EXPECTED
-
-    assert_equal expected, @options.generator_descriptions
-  end
-
-  def test_init_with_encoding
-    RDoc.load_yaml
-
-    @options.encoding = Encoding::IBM437
-
-    options = @options.to_yaml
-    options = YAML.safe_load(options, permitted_classes: [Symbol])
-    options = RDoc::Options.new(options)
-
-    assert_equal Encoding::IBM437, options.encoding
-  end
-
-  def test_init_with_trim_paths
-    RDoc.load_yaml
-
-    yaml = <<-YAML
----
-static_path:
-- /etc
-rdoc_include:
-- /etc
-    YAML
-
-    options = YAML.safe_load(yaml, permitted_classes: [Symbol])
-    options = RDoc::Options.new(options)
-
-    assert_empty options.rdoc_include
-    assert_empty options.static_path
-  end
-
-  def test_parse_copy_files_file_relative
-    file = File.basename __FILE__
-    expected = File.expand_path __FILE__
-
-    Dir.chdir File.expand_path('..', __FILE__) do
-      @options.parse %W[--copy-files #{file}]
-
-      assert_equal [expected], @options.static_path
-    end
-  end
-
-  def test_parse_copy_files_file_absolute
-    @options.parse %W[--copy-files #{File.expand_path __FILE__}]
-
-    assert_equal [File.expand_path(__FILE__)], @options.static_path
-  end
-
-  def test_parse_copy_files_directory_relative
-    @options.parse %w[--copy-files .]
-
-    assert_equal [@pwd], @options.static_path
-  end
-
-  def test_parse_copy_files_directory_absolute
-    @options.parse %w[--copy-files /]
-
-    assert_equal 1, @options.static_path.length
-
-    assert_match %r%^([A-Z]:)?/$%i, @options.static_path.first
-  end
-
-  def test_parse_coverage
-    @options.parse %w[--dcov]
-
-    assert @options.coverage_report
-    assert @options.force_update
-  end
-
-  def test_parse_coverage_C
-    @options.parse %w[-C]
-
-    assert @options.coverage_report
-    assert @options.force_update
-  end
-
-  def test_parse_coverage_no
-    @options.parse %w[--no-dcov]
-
-    refute @options.coverage_report
-  end
-
-  def test_parse_coverage_level_1
-    @options.parse %w[--dcov=1]
-
-    assert_equal 1, @options.coverage_report
-  end
-
-  def test_parse_coverage_C_level_1
-    @options.parse %w[-C1]
-
-    assert_equal 1, @options.coverage_report
-  end
-
-  def test_parse_coverage_C_level_0
-    @options.parse %w[-C0]
-
-    assert_equal 0, @options.coverage_report
-    assert @options.force_update
-  end
-
-  def test_parse_dash_p
-    out, err = capture_output do
-      @options.parse %w[-p]
-    end
-
-    assert @options.pipe
-    refute_match %r%^Usage: %, err
-    refute_match %r%^invalid options%, err
-
-    assert_empty out
-  end
-
-  def test_parse_dash_p_files
-    out, err = capture_output do
-      @options.parse ['-p', File.expand_path(__FILE__)]
-    end
-
-    refute @options.pipe
-    refute_match %r%^Usage: %, err
-    assert_match %r%^invalid options: -p .with files.%, err
-
-    assert_empty out
-  end
-
-  def test_parse_default
-    @options.parse []
-    @options.finish
-
-    assert_equal RDoc::Generator::Darkfish,             @options.generator
-    assert_equal 'darkfish',                            @options.template
-    assert_match %r%rdoc/generator/template/darkfish$%, @options.template_dir
-  end
-
-  def test_parse_deprecated
-    dep_hash = RDoc::Options::DEPRECATED
-    options = dep_hash.keys.sort
-
-    out, err = capture_output do
-      @options.parse options
-    end
-
-    dep_hash.each_pair do |opt, message|
-      assert_match %r%.*#{opt}.+#{message}%, err
-    end
-
-    assert_empty out
-  end
-
-  def test_parse_dry_run
-    @options.parse %w[--dry-run]
-
-    assert @options.dry_run
-  end
-
-  def test_parse_encoding
-    @options.parse %w[--encoding Big5]
-
-    assert_equal Encoding::Big5, @options.encoding
-    assert_equal 'Big5',         @options.charset
-  end
-
-  def test_parse_encoding_invalid
-    out, err = capture_output do
-      @options.parse %w[--encoding invalid]
-    end
-
-    assert_match %r%^invalid options: --encoding invalid%, err
-
-    assert_empty out
-  end
-
-  def test_parse_formatter
-    e = assert_raise OptionParser::InvalidOption do
-      @options.parse %w[--format darkfish --format ri]
-    end
-
-    assert_equal 'invalid option: --format generator already set to darkfish',
-                 e.message
-  end
-
-  def test_parse_force_update
-    @options.parse %w[--force-update]
-
-    assert @options.force_update
-
-    @options.parse %w[--no-force-update]
-
-    assert !@options.force_update
-
-    @options.parse %w[-U]
-
-    assert @options.force_update
-  end
-
-  def test_parse_formatter_ri
-    e = assert_raise OptionParser::InvalidOption do
-      @options.parse %w[--format darkfish --ri]
-    end
-
-    assert_equal 'invalid option: --ri generator already set to darkfish',
-                 e.message
-
-    @options = RDoc::Options.new
-
-    e = assert_raise OptionParser::InvalidOption do
-      @options.parse %w[--format darkfish -r]
-    end
-
-    assert_equal 'invalid option: -r generator already set to darkfish',
-                 e.message
-  end
-
-  def test_parse_formatter_ri_site
-    e = assert_raise OptionParser::InvalidOption do
-      @options.parse %w[--format darkfish --ri-site]
-    end
-
-    assert_equal 'invalid option: --ri-site generator already set to darkfish',
-                 e.message
-
-    @options = RDoc::Options.new
-
-    e = assert_raise OptionParser::InvalidOption do
-      @options.parse %w[--format darkfish -R]
-    end
-
-    assert_equal 'invalid option: -R generator already set to darkfish',
-                 e.message
-  end
-
-  def test_parse_h
-    out, = capture_output do
-      begin
-        @options.parse %w[-h]
-      rescue SystemExit
-      end
-    end
-
-    assert_equal 1, out.scan(/HTML generator options:/).length
-    assert_equal 1, out.scan(/ri generator options:/).  length
-  end
-
-  def test_parse_help
-    out, = capture_output do
-      begin
-        @options.parse %w[--help]
-      rescue SystemExit
-      end
-    end
-
-    assert_equal 1, out.scan(/HTML generator options:/).length
-    assert_equal 1, out.scan(/ri generator options:/).  length
-  end
-
-  def test_parse_help_extra_generator
-    RDoc::RDoc::GENERATORS['test'] = Class.new do
-      def self.setup_options options
-        op = options.option_parser
-
-        op.separator 'test generator options:'
-      end
-    end
-
-    out, = capture_output do
-      begin
-        @options.parse %w[--help]
-      rescue SystemExit
-      end
-    end
-
-    assert_equal 1, out.scan(/HTML generator options:/).length
-    assert_equal 1, out.scan(/ri generator options:/).  length
-    assert_equal 1, out.scan(/test generator options:/).length
-  end
-
-  def test_parse_format_for_extra_generator
-    RDoc::RDoc::GENERATORS['test'] = Class.new do
-      def self.setup_options options
-        op = options.option_parser
-
-        op.separator 'test generator options:'
-      end
-    end
-
-    @options.setup_generator 'test'
-
-    assert_equal @options.generator_name, 'test'
-  end
-
-  def test_parse_ignore_invalid
-    out, err = capture_output do
-      @options.parse %w[--ignore-invalid --bogus]
-    end
-
-    refute_match %r%^Usage: %, err
-    assert_match %r%^invalid options: --bogus%, err
-
-    assert_empty out
-  end
-
-  def test_parse_ignore_invalid_default
-    out, err = capture_output do
-      @options.parse %w[--bogus --main BLAH]
-    end
-
-    refute_match %r%^Usage: %, err
-    assert_match %r%^invalid options: --bogus%, err
-
-    assert_equal 'BLAH', @options.main_page
-
-    assert_empty out
-  end
-
-  def test_parse_ignore_invalid_no
-    out, err = capture_output do
-      assert_raise SystemExit do
-        @options.parse %w[--no-ignore-invalid --bogus=arg --bobogus --visibility=extended]
-      end
-    end
-
-    assert_match %r%^Usage: %, err
-    assert_match %r%^invalid options: --bogus=arg, --bobogus, --visibility=extended%, err
-
-    assert_empty out
-  end
-
-  def test_parse_ignore_invalid_no_quiet
-    out, err = capture_output do
-      assert_raise SystemExit do
-        @options.parse %w[--quiet --no-ignore-invalid --bogus=arg --bobogus --visibility=extended]
-      end
-    end
-
-    refute_match %r%^Usage: %, err
-    assert_match %r%^invalid options: --bogus=arg, --bobogus, --visibility=extended%, err
-
-    assert_empty out
-  end
-
-  def test_ignore_needless_arg
-    out, err = capture_output do
-      @options.parse %w[--ri=foo]
-    end
-
-    assert_match %r%^invalid options: --ri=foo%, err
-
-    assert_empty out
-  end
-
-  def test_ignore_missing_arg
-    out, err = capture_output do
-      @options.parse %w[--copy-files]
-    end
-
-    assert_match %r%^invalid options: --copy-files%, err
-
-    assert_empty out
-  end
-
-  def test_parse_main
-    out, err = capture_output do
-      @options.parse %w[--main MAIN]
-    end
-
-    assert_empty out
-    assert_empty err
-
-    assert_equal 'MAIN', @options.main_page
-  end
-
-  def test_parse_markup
-    out, err = capture_output do
-      @options.parse %w[--markup tomdoc]
-    end
-
-    assert_empty out
-    assert_empty err
-
-    assert_equal 'tomdoc', @options.markup
-  end
-
-  def test_parse_page_dir
-    assert_nil @options.page_dir
-
-    out, err = capture_output do
-      @options.parse %W[--page-dir #{Dir.tmpdir}]
-      @options.finish
-    end
-
-    assert_empty out
-    assert_empty err
-
-    expected = nil
-    begin
-      expected =
-        Pathname(Dir.tmpdir).expand_path.relative_path_from @options.root
-    rescue ArgumentError
-      # On Windows, sometimes crosses different drive letters.
-      expected = Pathname(Dir.tmpdir).expand_path
-    end
-
-    assert_equal expected,     @options.page_dir
-    assert_equal [Dir.tmpdir], @options.files
-  end
-
-  def test_parse_page_dir_root
-    assert_nil @options.page_dir
-
-    Dir.mktmpdir do |dir|
-      abs_root     = dir
-      abs_page_dir = File.join dir, 'pages'
-      FileUtils.mkdir abs_page_dir
-
-      out, err = capture_output do
-        @options.parse %W[--page-dir #{abs_page_dir} --root #{abs_root}]
-        @options.finish
-      end
-
-      assert_empty out
-      assert_empty err
-
-      assert_equal Pathname('pages'), @options.page_dir
-      assert_equal [abs_page_dir],    @options.files
-    end
-  end
-
-  def test_parse_ri_site
-    @options.parse %w[--ri-site]
-
-    assert_equal RDoc::Generator::RI,      @options.generator
-    assert_equal RDoc::RI::Paths.site_dir, @options.op_dir
-  end
-
-  def test_parse_root
-    assert_equal Pathname(Dir.pwd), @options.root
-
-    out, err = capture_output do
-      @options.parse %W[--root #{Dir.tmpdir}]
-    end
-
-    assert_empty out
-    assert_empty err
-
-    assert_equal Pathname(Dir.tmpdir), @options.root
-
-    @options.finish
-    assert_includes @options.rdoc_include, @options.root.to_s
-  end
-
-  def test_parse_tab_width
-    @options.parse %w[--tab-width=1]
-    assert_equal 1, @options.tab_width
-
-    @options.parse %w[-w2]
-    assert_equal 2, @options.tab_width
-
-    _, err = capture_output do
-      @options.parse %w[-w=2]
-    end
-
-    assert_match 'invalid options', err
-
-    _, err = capture_output do
-      @options.parse %w[-w0]
-    end
-
-    assert_match 'invalid options', err
-  end
-
-  def test_parse_template
-    out, err = capture_output do
-      @options.parse %w[--template darkfish]
-    end
-
-    assert_empty out
-    assert_empty err
-
-    assert_equal 'darkfish', @options.template
-
-    assert_match %r%rdoc/generator/template/darkfish$%, @options.template_dir
-  end
-
-  def test_parse_template_nonexistent
-    out, err = capture_output do
-      @options.parse %w[--template NONEXISTENT]
-    end
-
-    assert_empty out
-    assert_equal "could not find template NONEXISTENT\n", err
-
-    @options.finish
-    assert_equal 'darkfish', @options.template
-    assert_match %r%rdoc/generator/template/darkfish$%, @options.template_dir
-  end
-
-  def test_parse_template_load_path
-    orig_LOAD_PATH = $LOAD_PATH.dup
-
-    template_dir = nil
-
-    Dir.mktmpdir do |dir|
-      $LOAD_PATH << dir
-
-      template_dir = File.join dir, 'rdoc', 'generator', 'template', 'load_path'
-
-      FileUtils.mkdir_p template_dir
-
-      out, err = capture_output do
-        @options.parse %w[--template load_path]
-      end
-
-      assert_empty out
-      assert_empty err
-    end
-
-    assert_equal 'load_path',  @options.template
-    assert_equal template_dir, @options.template_dir
-  ensure
-    $LOAD_PATH.replace orig_LOAD_PATH
-  end
-
-  def test_parse_template_stylesheets
-    css = nil
-    Dir.mktmpdir do |dir|
-      css = File.join(dir, "hoge.css")
-      File.write(css, "")
-      out, err = capture_output do
-        @options.parse %W[--template-stylesheets #{css}]
-      end
-
-      assert_empty out
-      assert_empty err
-    end
-    assert_include @options.template_stylesheets, css
-  end
-
-  def test_parse_visibility
-    @options.parse %w[--visibility=public]
-    assert_equal :public, @options.visibility
-
-    @options.parse %w[--visibility=protected]
-    assert_equal :protected, @options.visibility
-
-    @options.parse %w[--visibility=private]
-    assert_equal :private, @options.visibility
-
-    @options.parse %w[--visibility=nodoc]
-    assert_equal :nodoc, @options.visibility
-  end
-
-  def test_parse_write_options
-    tmpdir = File.join Dir.tmpdir, "test_rdoc_options_#{$$}"
-    FileUtils.mkdir_p tmpdir
-
-    Dir.chdir tmpdir do
-      e = assert_raise SystemExit do
-        @options.parse %w[--write-options]
-        @options.finish
-      end
-
-      assert_equal 0, e.status
-
-      assert File.exist? '.rdoc_options'
-    end
-  ensure
-    FileUtils.rm_rf tmpdir
-  end
-
-  def test_parse_extension_alias
-    out, err = capture_output do
-      @options.parse %w[--extension foobar=rdoc]
-    end
-
-    assert_includes RDoc::Parser.parsers, [/\.foobar$/, RDoc::Parser::Simple]
-
-    assert_empty out
-    assert_empty err
-  end
-
-  def test_setup_generator
-    test_generator = Class.new do
-      def self.setup_options op
-        @op = op
-      end
-
-      def self.op() @op end
-    end
-
-    RDoc::RDoc::GENERATORS['test'] = test_generator
-
-    @options.setup_generator 'test'
-
-    assert_equal test_generator, @options.generator
-    assert_equal [test_generator], @options.generator_options
-
-    assert_equal @options, test_generator.op
-  ensure
-    RDoc::RDoc::GENERATORS.delete 'test'
-  end
-
-  def test_setup_generator_no_option_parser
-    test_generator = Class.new do
-      def self.setup_options op
-        op.option_parser.separator nil
-        @op = op
-      end
-
-      def self.op() @op end
-    end
-
-    RDoc::RDoc::GENERATORS['test'] = test_generator
-
-    @options.setup_generator 'test'
-
-    assert_equal test_generator, @options.generator
-    assert_equal [test_generator], @options.generator_options
-
-    assert_equal @options, test_generator.op
-  ensure
-    RDoc::RDoc::GENERATORS.delete 'test'
-  end
-
-  def test_update_output_dir
-    assert @options.update_output_dir
-
-    @options.update_output_dir = false
-
-    refute @options.update_output_dir
-  end
-
-  def test_warn
-    out, err = capture_output do
-      @options.warn "warnings off"
-    end
-
-    assert_empty out
-    assert_empty err
-
-    @options.verbosity = 2
-
-    out, err = verbose_capture_output do
-      @options.warn "warnings on"
-    end
-
-    assert_empty out
-    assert_equal "warnings on\n", err
-  end
-
-  def test_write_options
-    temp_dir do |dir|
-      @options.write_options
-
-      assert File.exist? '.rdoc_options'
-
-      options = File.read('.rdoc_options')
-      options = YAML.safe_load(options, permitted_classes: [Symbol])
-      assert_equal @options, RDoc::Options.new(options)
-    end
-  end
-
-  def test_version
-    out, _ = capture_output do
-      begin
-        @options.parse %w[--version]
-      rescue SystemExit
-      end
-    end
-
-    assert out.include?(RDoc::VERSION)
-
-    out, _ = capture_output do
-      begin
-        @options.parse %w[-v]
-      rescue SystemExit
-      end
-    end
-
-    assert out.include?(RDoc::VERSION)
-  end
-
-  def test_visibility
-    @options.visibility = :all
-    assert_equal :private, @options.visibility
-  end
-
-  def test_load_options
-    temp_dir do
-      options = RDoc::Options.new
-      options.markup = 'tomdoc'
-      options.write_options
-
-      options = RDoc::Options.load_options
-
-      assert_equal 'tomdoc', options.markup
-    end
-  end
-
-  def test_load_options_invalid
-    temp_dir do
-      File.open '.rdoc_options', 'w' do |io|
-        io.write "a: !ruby.yaml.org,2002:str |\nfoo"
-      end
-
-      e = assert_raise RDoc::Error do
-        RDoc::Options.load_options
-      end
-
-      options_file = File.expand_path '.rdoc_options'
-      assert_equal "#{options_file} is not a valid rdoc options file", e.message
-    end
-  end
-
-  def test_load_options_empty_file
-    temp_dir do
-      File.open '.rdoc_options', 'w' do |io|
-      end
-
-      options = RDoc::Options.load_options
-
-      assert_equal 'rdoc', options.markup
-    end
-  end
-
-  def test_load_options_partial_override
-    temp_dir do
-      File.open '.rdoc_options', 'w' do |io|
-        io.puts "markup: Markdown"
-        io.puts "encoding: iso-8859-1"
-        io.puts "static_path: [static]"
-        io.puts "rdoc_include: [.]"
-        io.puts "page_dir: pages"
-      end
-
-      options = RDoc::Options.load_options
-
-      assert_equal 'Markdown', options.markup
-      assert_equal Encoding::ISO_8859_1, options.encoding
-      assert_equal ["static"], options.static_path
-      assert_equal ["."], options.rdoc_include
-      assert_equal "pages", options.page_dir
-    end
-  end
-
-  def test_load_options_no_file
-    temp_dir do
-      options = RDoc::Options.load_options
-
-      assert_kind_of RDoc::Options, options
-    end
-  end
-
-  def test_skip_test_default_value
-    @options.parse %w[]
-    assert_equal true, @options.skip_tests
-  end
-
-  def test_no_skip_test_value
-    @options.parse %w[--no-skipping-tests]
-    assert_equal false, @options.skip_tests
-  end
-
-  class DummyCoder < Hash
-    alias add :[]=
-    def tag=(tag)
-    end
-  end
-end
diff --git a/test/rdoc/test_rdoc_parser.rb b/test/rdoc/test_rdoc_parser.rb
deleted file mode 100644
index 7cc3c2d9262f76..00000000000000
--- a/test/rdoc/test_rdoc_parser.rb
+++ /dev/null
@@ -1,323 +0,0 @@
-# -*- coding: us-ascii -*-
-# frozen_string_literal: true
-
-require_relative 'helper'
-
-class TestRDocParser < RDoc::TestCase
-
-  def setup
-    super
-
-    @RP = RDoc::Parser
-    @binary_dat = File.expand_path '../binary.dat', __FILE__
-
-    @fn = 'file.rb'
-    @top_level = RDoc::TopLevel.new @fn
-    @options = RDoc::Options.new
-  end
-
-  def test_class_binary_eh_ISO_2022_JP
-    iso_2022_jp = File.join Dir.tmpdir, "test_rdoc_parser_#{$$}.rd"
-
-    File.open iso_2022_jp, 'wb' do |io|
-      io.write "# coding: ISO-2022-JP\n"
-      io.write ":\e$B%3%^%s%I\e(B:\n"
-    end
-
-    refute @RP.binary? iso_2022_jp
-  ensure
-    File.unlink iso_2022_jp
-  end
-
-  def test_class_binary_eh_marshal
-    marshal = File.join Dir.tmpdir, "test_rdoc_parser_#{$$}.marshal"
-    File.open marshal, 'wb' do |io|
-      io.write Marshal.dump('')
-      io.write 'lots of text ' * 500
-    end
-
-    assert @RP.binary?(marshal)
-  ensure
-    File.unlink marshal
-  end
-
-  def test_class_binary_japanese_text
-    file_name = File.expand_path '../test.ja.txt', __FILE__
-    refute @RP.binary?(file_name)
-  end
-
-  def test_class_binary_large_japanese_rdoc
-    capture_output do
-      begin
-        extenc, Encoding.default_external =
-          Encoding.default_external, Encoding::US_ASCII
-        file_name = File.expand_path '../test.ja.largedoc', __FILE__
-        assert !@RP.binary?(file_name)
-      ensure
-        Encoding.default_external = extenc
-      end
-    end
-  end
-
-  def test_class_binary_japanese_rdoc
-    file_name = File.expand_path '../test.ja.rdoc', __FILE__
-    refute @RP.binary?(file_name)
-  end
-
-  def test_class_can_parse
-    assert_equal @RP.can_parse(__FILE__), @RP::Ruby
-
-    readme_file_name = File.expand_path '../test.txt', __FILE__
-
-    assert_equal @RP::Simple, @RP.can_parse(readme_file_name)
-
-    assert_equal @RP::Simple, @RP.can_parse(@binary_dat)
-
-    jtest_file_name = File.expand_path '../test.ja.txt', __FILE__
-    assert_equal @RP::Simple, @RP.can_parse(jtest_file_name)
-
-    jtest_rdoc_file_name = File.expand_path '../test.ja.rdoc', __FILE__
-    assert_equal @RP::Simple, @RP.can_parse(jtest_rdoc_file_name)
-
-    readme_file_name = File.expand_path '../README', __FILE__
-    assert_equal @RP::Simple, @RP.can_parse(readme_file_name)
-
-    jtest_largerdoc_file_name = File.expand_path '../test.ja.largedoc', __FILE__
-    assert_equal @RP::Simple, @RP.can_parse(jtest_largerdoc_file_name)
-
-    @RP.alias_extension 'rdoc', 'largedoc'
-    assert_equal @RP::Simple, @RP.can_parse(jtest_largerdoc_file_name)
-  end
-
-  def test_class_for_executable
-    temp_dir do
-      content = "#!/usr/bin/env ruby -w\n"
-      File.open 'app', 'w' do |io| io.write content end
-      app = @store.add_file 'app'
-
-      parser = @RP.for app, 'app', content, @options, :stats
-
-      assert_kind_of RDoc::Parser::Ruby, parser
-
-      assert_equal 'app', parser.file_name
-    end
-  end
-
-  def test_class_for_forbidden
-    omit 'chmod not supported' if Gem.win_platform?
-
-    tf = Tempfile.open 'forbidden' do |io|
-      begin
-        File.chmod 0000, io.path
-        forbidden = @store.add_file io.path
-
-        parser = @RP.for forbidden, 'forbidden', '', @options, :stats
-
-        assert_nil parser
-      ensure
-        File.chmod 0400, io.path
-      end
-      io
-    end
-    tf.close!
-  end
-
-  def test_class_for_modeline
-    temp_dir do
-      content = "# -*- rdoc -*-\n= NEWS\n"
-
-      File.open 'NEWS', 'w' do |io| io.write content end
-      app = @store.add_file 'NEWS'
-
-      parser = @RP.for app, 'NEWS', content, @options, :stats
-
-      assert_kind_of RDoc::Parser::Simple, parser
-
-      assert_equal "= NEWS\n", parser.content
-    end
-  end
-
-  def test_can_parse_modeline
-    readme_ext = File.join Dir.tmpdir, "README.EXT.#{$$}"
-
-    File.open readme_ext, 'w' do |io|
-      io.puts "# README.EXT -  -*- rdoc -*- created at: Mon Aug 7 16:45:54 JST 1995"
-      io.puts
-      io.puts "This document explains how to make extension libraries for Ruby."
-    end
-
-    assert_equal RDoc::Parser::Simple, @RP.can_parse(readme_ext)
-  ensure
-    File.unlink readme_ext
-  end
-
-  ##
-  # Selenium hides a .jar file using a .txt extension.
-
-  def test_class_can_parse_zip
-    hidden_zip = File.expand_path '../hidden.zip.txt', __FILE__
-    assert_nil @RP.can_parse(hidden_zip)
-  end
-
-  def test_check_modeline
-    readme_ext = File.join Dir.tmpdir, "README.EXT.#{$$}"
-
-    File.open readme_ext, 'w' do |io|
-      io.puts "# README.EXT -  -*- RDoc -*- created at: Mon Aug 7 16:45:54 JST 1995"
-      io.puts
-      io.puts "This document explains how to make extension libraries for Ruby."
-    end
-
-    assert_equal 'rdoc', @RP.check_modeline(readme_ext)
-  ensure
-    File.unlink readme_ext
-  end
-
-  def test_check_modeline_coding
-    readme_ext = File.join Dir.tmpdir, "README.EXT.#{$$}"
-
-    File.open readme_ext, 'w' do |io|
-      io.puts "# -*- coding: utf-8 -*-"
-    end
-
-    assert_nil @RP.check_modeline readme_ext
-  ensure
-    File.unlink readme_ext
-  end
-
-  def test_check_modeline_with_other
-    readme_ext = File.join Dir.tmpdir, "README.EXT.#{$$}"
-
-    File.open readme_ext, 'w' do |io|
-      io.puts "# README.EXT -  -*- mode: RDoc; indent-tabs-mode: nil -*-"
-      io.puts
-      io.puts "This document explains how to make extension libraries for Ruby."
-    end
-
-    assert_equal 'rdoc', @RP.check_modeline(readme_ext)
-  ensure
-    File.unlink readme_ext
-  end
-
-  def test_check_modeline_no_modeline
-    readme_ext = File.join Dir.tmpdir, "README.EXT.#{$$}"
-
-    File.open readme_ext, 'w' do |io|
-      io.puts "This document explains how to make extension libraries for Ruby."
-    end
-
-    assert_nil @RP.check_modeline(readme_ext)
-  ensure
-    File.unlink readme_ext
-  end
-
-  def test_class_for_binary
-    rp = @RP.dup
-
-    class << rp
-      alias old_can_parse can_parse
-    end
-
-    def rp.can_parse(*args) nil end
-
-    assert_nil @RP.for(nil, @binary_dat, nil, nil, nil)
-  end
-
-  def test_class_for_markup
-    content = <<-CONTENT
-# coding: utf-8 markup: rd
-    CONTENT
-
-    parser = @RP.for @top_level, __FILE__, content, @options, nil
-
-    assert_kind_of @RP::RD, parser
-  end
-
-  def test_class_use_markup
-    content = <<-CONTENT
-# coding: utf-8 markup: rd
-    CONTENT
-
-    parser = @RP.use_markup content
-
-    assert_equal @RP::RD, parser
-  end
-
-  def test_class_use_markup_markdown
-    content = <<-CONTENT
-# coding: utf-8 markup: markdown
-    CONTENT
-
-    parser = @RP.use_markup content
-
-    assert_equal @RP::Ruby, parser
-  end
-
-  def test_class_use_markup_modeline
-    content = <<-CONTENT
-# -*- coding: utf-8 -*-
-# markup: rd
-    CONTENT
-
-    parser = @RP.use_markup content
-
-    assert_equal @RP::RD, parser
-  end
-
-  def test_class_use_markup_modeline_shebang
-    content = <<-CONTENT
-#!/bin/sh
-/* -*- coding: utf-8 -*-
- * markup: rd
- */
-    CONTENT
-
-    parser = @RP.use_markup content
-
-    assert_equal @RP::RD, parser
-  end
-
-  def test_class_use_markup_shebang
-    content = <<-CONTENT
-#!/usr/bin/env ruby
-# coding: utf-8 markup: rd
-    CONTENT
-
-    parser = @RP.use_markup content
-
-    assert_equal @RP::RD, parser
-  end
-
-  def test_class_use_markup_tomdoc
-    content = <<-CONTENT
-# coding: utf-8 markup: tomdoc
-    CONTENT
-
-    parser = @RP.use_markup content
-
-    assert_equal @RP::Ruby, parser
-  end
-
-  def test_class_use_markup_none
-    parser = @RP.use_markup ''
-
-    assert_nil parser
-  end
-
-  def test_class_use_markup_unknown
-    content = <<-CONTENT
-# :markup: RDoc
-    CONTENT
-
-    parser = @RP.use_markup content
-
-    assert_nil parser
-  end
-
-  def test_initialize
-    @RP.new @top_level, @fn, '', @options, nil
-
-    assert_equal @RP, @top_level.parser
-  end
-
-end
diff --git a/test/rdoc/test_rdoc_parser_c.rb b/test/rdoc/test_rdoc_parser_c.rb
deleted file mode 100644
index ed3a18e45f21c4..00000000000000
--- a/test/rdoc/test_rdoc_parser_c.rb
+++ /dev/null
@@ -1,2070 +0,0 @@
-# frozen_string_literal: true
-require_relative 'helper'
-
-=begin
-  TODO: test call-seq parsing
-
-/*
- *  call-seq:
- *     ARGF.readlines(sep=$/)     -> array
- *     ARGF.readlines(limit)      -> array
- *     ARGF.readlines(sep, limit) -> array
- *
- *     ARGF.to_a(sep=$/)     -> array
- *     ARGF.to_a(limit)      -> array
- *     ARGF.to_a(sep, limit) -> array
- *
- *  Reads +ARGF+'s current file in its entirety, returning an +Array+ of its
- *  lines, one line per element. Lines are assumed to be separated by _sep_.
- *
- *     lines = ARGF.readlines
- *     lines[0]                #=> "This is line one\n"
- */
-
-assert call-seq did not stop at first empty line
-
-/*
- * call-seq:
- *
- *  flt ** other  ->  float
- *
- * Raises <code>float</code> the <code>other</code> power.
- *
- *    2.0**3      #=> 8.0
- */
-
-assert call-seq correct (bug: was empty)
-
-/* call-seq: flt ** other  ->  float */
-
-assert call-seq correct
-
-=end
-
-class TestRDocParserC < RDoc::TestCase
-
-  def setup
-    super
-
-    @tempfile = Tempfile.new self.class.name
-    filename = @tempfile.path
-
-    @top_level = @store.add_file filename
-    @fn = filename
-    @options = RDoc::Options.new
-    @options.verbosity = 2
-    @stats = RDoc::Stats.new @store, 0
-  end
-
-  def teardown
-    super
-
-    @tempfile.close!
-  end
-
-  def test_class_can_parse
-    c_parser = RDoc::Parser::C
-
-    temp_dir do
-      FileUtils.touch 'file.C'
-      assert_equal c_parser, c_parser.can_parse('file.C')
-
-      FileUtils.touch 'file.CC'
-      assert_equal c_parser, c_parser.can_parse('file.CC')
-
-      FileUtils.touch 'file.H'
-      assert_equal c_parser, c_parser.can_parse('file.H')
-
-      FileUtils.touch 'file.HH'
-      assert_equal c_parser, c_parser.can_parse('file.HH')
-
-      FileUtils.touch 'file.c'
-      assert_equal c_parser, c_parser.can_parse('file.c')
-
-      FileUtils.touch 'file.cc'
-      assert_equal c_parser, c_parser.can_parse('file.cc')
-
-      FileUtils.touch 'file.cpp'
-      assert_equal c_parser, c_parser.can_parse('file.cpp')
-
-      FileUtils.touch 'file.cxx'
-      assert_equal c_parser, c_parser.can_parse('file.cxx')
-
-      FileUtils.touch 'file.h'
-      assert_equal c_parser, c_parser.can_parse('file.h')
-
-      FileUtils.touch 'file.hh'
-      assert_equal c_parser, c_parser.can_parse('file.hh')
-
-      FileUtils.touch 'file.y'
-      assert_equal c_parser, c_parser.can_parse('file.y')
-    end
-  end
-
-  def test_known_classes
-    RDoc::KNOWN_CLASSES.each do |var, name|
-      case name
-      when "Refinement"
-        next unless defined?(Refinement)
-      when "RubyVM"
-        next unless defined?(RubyVM)
-      when "Bignum", "Fixnum", "Data", "Socket", /\A(?![A-Z])/
-        next
-      end
-      obj = Object.const_get(name)
-      assert_equal obj.name, name
-      case var
-      when /\Arb_c/
-        assert_kind_of Class, obj
-      when /\Arb_m/
-        assert_kind_of Module, obj
-      when /\Arb_e/
-        assert_operator obj, :<=, Exception
-      else
-        raise "unknown prefix: #{var} => #{name}"
-      end
-    end
-  end
-
-  def test_initialize
-    some_ext        = @top_level.add_class RDoc::NormalClass, 'SomeExt'
-                      @top_level.add_class RDoc::SingleClass, 'SomeExtSingle'
-
-    @store.cache[:c_class_variables] = {
-      @fn => { 'cSomeExt' => 'SomeExt' }
-    }
-
-    @store.cache[:c_singleton_class_variables] = {
-      @fn => { 'cSomeExtSingle' => 'SomeExtSingle' }
-    }
-
-    parser = RDoc::Parser::C.new @top_level, @fn, '', @options, @stats
-
-    expected = { 'cSomeExt' => some_ext }
-    assert_equal expected, parser.classes
-
-    expected = { 'cSomeExtSingle' => 'SomeExtSingle' }
-    assert_equal expected, parser.singleton_classes
-
-    expected = {
-      'cSomeExt'       => 'SomeExt',
-      'cSomeExtSingle' => 'SomeExtSingle',
-    }
-    known_classes = parser.known_classes.delete_if do |key, _|
-      RDoc::KNOWN_CLASSES.keys.include? key
-    end
-
-    assert_equal expected, known_classes
-  end
-
-  def assert_do_attr(flags)
-    content = <<-EOF
-void Init_Blah(void) {
-  cBlah = rb_define_class("Blah", rb_cObject);
-
-  /*
-   * This is an accessor
-   */
-  #{yield "cBlah", "accessor", flags[1], flags[1]};
-
-  /*
-   * This is a reader
-   */
-  #{yield "cBlah", "reader", flags[1], flags[0]};
-
-  /*
-   * This is a writer
-   */
-  #{yield "cBlah", "writer", flags[0], flags[1]};
-}
-    EOF
-
-    klass = util_get_class content, 'cBlah'
-
-    attrs = klass.attributes
-    assert_equal 3, attrs.length, attrs.inspect
-
-    accessor = attrs.shift
-    assert_equal 'accessor',            accessor.name
-    assert_equal 'RW',                  accessor.rw
-    assert_equal 'This is an accessor', accessor.comment.text
-    assert_equal @top_level,            accessor.file
-
-    reader = attrs.shift
-    assert_equal 'reader',           reader.name
-    assert_equal 'R',                reader.rw
-    assert_equal 'This is a reader', reader.comment.text
-
-    writer = attrs.shift
-    assert_equal 'writer',           writer.name
-    assert_equal 'W',                writer.rw
-    assert_equal 'This is a writer', writer.comment.text
-  end
-
-  {
-    num: %w[0 1],
-    macro: %w[FALSE TRUE],
-    ruby: %w[Qfalse Qtrue],
-    bool: %w[false true],
-  }.each_pair do |name, values|
-    define_method("test_do_attr:rb_attr:intern:#{name}") do
-      assert_do_attr(values) {|c, name, r, w| %[rb_attr(#{c}, rb_intern("#{name}"), #{r}, #{w}, Qfalse)]}
-    end
-    define_method("test_do_attr:rb_attr:intern_const:#{name}") do
-      assert_do_attr(values) {|c, name, r, w| %[rb_attr(#{c}, rb_intern_const("#{name}"), #{r}, #{w}, Qfalse)]}
-    end
-    define_method("test_do_attr:rb_define_attr:#{name}") do
-      assert_do_attr(values) {|c, name, r, w| %[rb_define_attr(#{c}, "#{name}", #{r}, #{w})]}
-    end
-  end
-
-  def test_do_aliases
-    content = <<-EOF
-/*
- * This should show up as an alias with documentation
- */
-VALUE blah(VALUE klass, VALUE year) {
-}
-
-void Init_Blah(void) {
-  cDate = rb_define_class("Date", rb_cObject);
-
-  rb_define_method(cDate, "blah", blah, 1);
-
-  rb_define_alias(cDate, "bleh", "blah");
-}
-    EOF
-
-    klass = util_get_class content, 'cDate'
-
-    methods = klass.method_list
-    assert_equal 2,      methods.length
-    assert_equal 'bleh', methods.last.name
-    assert_equal 'blah', methods.last.is_alias_for.name
-
-    assert_equal @top_level, methods.last.is_alias_for.file
-    assert_equal @top_level, methods.last.file
-  end
-
-  def test_do_aliases_singleton
-    content = <<-EOF
-/*
- * This should show up as a method with documentation
- */
-VALUE blah(VALUE klass, VALUE year) {
-}
-
-void Init_Blah(void) {
-  cDate = rb_define_class("Date", rb_cObject);
-  sDate = rb_singleton_class(cDate);
-
-  rb_define_method(sDate, "blah", blah, 1);
-
-  /*
-   * This should show up as an alias
-   */
-  rb_define_alias(sDate, "bleh", "blah");
-}
-    EOF
-
-    klass = util_get_class content, 'cDate'
-
-    methods = klass.method_list
-
-    assert_equal 2,      methods.length
-    assert_equal 'bleh', methods.last.name
-    assert               methods.last.singleton
-    assert_equal 'blah', methods.last.is_alias_for.name
-    assert_equal 'This should show up as an alias', methods.last.comment.text
-  end
-
-  def test_do_aliases_missing_class
-    content = <<-EOF
-void Init_Blah(void) {
-  rb_define_alias(cDate, "b", "a");
-}
-    EOF
-
-    _, err = verbose_capture_output do
-      refute util_get_class(content, 'cDate')
-    end
-
-    assert_equal "Enclosing class or module \"cDate\" for alias b a is not known\n",
-                 err
-  end
-
-  def test_do_classes_class
-    content = <<-EOF
-/* Document-class: Foo
- * this is the Foo class
- */
-VALUE cFoo = rb_define_class("Foo", rb_cObject);
-    EOF
-
-    klass = util_get_class content, 'cFoo'
-    assert_equal "this is the Foo class", klass.comment.text
-  end
-
-  def test_do_classes_duplicate_class
-    content = <<-EOF
-/* Document-class: Foo
- * first
- */
-VALUE cFoo = rb_define_class("Foo", rb_cObject);
-/* Document-class: Foo
- * second
- */
-VALUE cFoo = rb_define_class("Foo", rb_cObject);
-    EOF
-
-    klass = util_get_class content, 'cFoo'
-    assert_equal 1, klass.comment_location.size
-    first = klass.comment_location.first
-    first_comment = first[0]
-    assert_equal 'first', first_comment.text
-  end
-
-  def test_do_classes_struct
-    content = <<-EOF
-/* Document-class: Foo
- * this is the Foo class
- */
-VALUE cFoo = rb_struct_define(
-        "Foo",
-        "some", "various", "fields", NULL);
-    EOF
-
-    klass = util_get_class content, 'cFoo'
-    assert_equal "this is the Foo class", klass.comment.text
-
-    attributes = klass.attributes
-    assert_equal 3, attributes.size, -> {attributes}
-    ["some", "various", "fields"].zip(attributes) do |name, attr|
-      assert_equal RDoc::Attr.new("", name, "RW", ""), attr
-    end
-  end
-
-  def test_do_classes_struct_under
-    content = <<-EOF
-/* Document-class: Kernel::Foo
- * this is the Foo class under Kernel
- */
-VALUE cFoo = rb_struct_define_under(
-        rb_mKernel, "Foo",
-        "some", "various", "fields", NULL);
-    EOF
-
-    klass = util_get_class content, 'cFoo'
-    assert_equal 'Kernel::Foo', klass.full_name
-    assert_equal "this is the Foo class under Kernel", klass.comment.text
-
-    attributes = klass.attributes
-    assert_equal 3, attributes.size, -> {attributes}
-    ["some", "various", "fields"].zip(attributes) do |name, attr|
-      assert_equal RDoc::Attr.new("", name, "RW", ""), attr
-    end
-  end
-
-  def test_do_classes_struct_without_accessor
-    content = <<-EOF
-/* Document-class: Foo
- * this is the Foo class
- */
-VALUE cFoo = rb_struct_define_without_accessor(
-        "Foo", rb_cObject, foo_alloc,
-        "some", "various", "fields", NULL);
-    EOF
-
-    klass = util_get_class content, 'cFoo'
-    assert_equal "this is the Foo class", klass.comment.text
-    assert_empty klass.attributes
-  end
-
-  def test_do_classes_struct_without_accessor_under
-    content = <<-EOF
-/* Document-class: Kernel::Foo
- * this is the Foo class under Kernel
- */
-VALUE cFoo = rb_struct_define_without_accessor_under(
-        rb_mKernel, "Foo", rb_cObject, foo_alloc,
-        "some", "various", "fields", NULL);
-    EOF
-
-    klass = util_get_class content, 'cFoo'
-    assert_equal 'Kernel::Foo', klass.full_name
-    assert_equal "this is the Foo class under Kernel", klass.comment.text
-    assert_empty klass.attributes
-  end
-
-  def test_do_classes_class_under
-    content = <<-EOF
-/* Document-class: Kernel::Foo
- * this is the Foo class under Kernel
- */
-VALUE cFoo = rb_define_class_under(rb_mKernel, "Foo", rb_cObject);
-    EOF
-
-    klass = util_get_class content, 'cFoo'
-    assert_equal 'Kernel::Foo', klass.full_name
-    assert_equal "this is the Foo class under Kernel", klass.comment.text
-  end
-
-  def test_do_classes_class_under_rb_path2class
-    content = <<-EOF
-/* Document-class: Kernel::Foo
- * this is Kernel::Foo < A::B
- */
-VALUE cFoo = rb_define_class_under(rb_mKernel, "Foo", rb_path2class("A::B"));
-    EOF
-
-    klass = util_get_class content, 'cFoo'
-
-    assert_equal 'Kernel::Foo', klass.full_name
-    assert_equal 'A::B', klass.superclass
-    assert_equal 'this is Kernel::Foo < A::B', klass.comment.text
-  end
-
-  def test_do_classes_singleton
-    content = <<-EOF
-VALUE cFoo = rb_define_class("Foo", rb_cObject);
-VALUE cFooS = rb_singleton_class(cFoo);
-    EOF
-
-    util_get_class content, 'cFooS'
-
-    assert_equal 'Foo', @parser.singleton_classes['cFooS']
-  end
-
-  def test_do_classes_module
-    content = <<-EOF
-/* Document-module: Foo
- * this is the Foo module
- */
-VALUE mFoo = rb_define_module("Foo");
-    EOF
-
-    klass = util_get_class content, 'mFoo'
-    assert_equal "this is the Foo module", klass.comment.text
-  end
-
-  def test_do_classes_module_under
-    content = <<-EOF
-/* Document-module: Kernel::Foo
- * this is the Foo module under Kernel
- */
-VALUE mFoo = rb_define_module_under(rb_mKernel, "Foo");
-    EOF
-
-    klass = util_get_class content, 'mFoo'
-    assert_equal "this is the Foo module under Kernel", klass.comment.text
-  end
-
-  def test_do_constants
-    content = <<-EOF
-#include <ruby.h>
-
-void Init_foo(){
-   VALUE cFoo = rb_define_class("Foo", rb_cObject);
-
-   /* 300: The highest possible score in bowling */
-   rb_define_const(cFoo, "PERFECT", INT2FIX(300));
-
-   /* Huzzah!: What you cheer when you roll a perfect game */
-   rb_define_const(cFoo, "CHEER", rb_str_new2("Huzzah!"));
-
-   /* TEST\:TEST: Checking to see if escaped colon works */
-   rb_define_const(cFoo, "TEST", rb_str_new2("TEST:TEST"));
-
-   /* \\: The file separator on MS Windows */
-   rb_define_const(cFoo, "MSEPARATOR", rb_str_new2("\\"));
-
-   /* /: The file separator on Unix */
-   rb_define_const(cFoo, "SEPARATOR", rb_str_new2("/"));
-
-   /* C:\\Program Files\\Stuff: A directory on MS Windows */
-   rb_define_const(cFoo, "STUFF", rb_str_new2("C:\\Program Files\\Stuff"));
-
-   /* Default definition */
-   rb_define_const(cFoo, "NOSEMI", INT2FIX(99));
-
-   rb_define_const(cFoo, "NOCOMMENT", rb_str_new2("No comment"));
-
-   /*
-    * Multiline comment goes here because this comment spans multiple lines.
-    * Multiline comment goes here because this comment spans multiple lines.
-    */
-   rb_define_const(cFoo, "MULTILINE", INT2FIX(1));
-
-   /*
-    * 1: Multiline comment goes here because this comment spans multiple lines.
-    * Multiline comment goes here because this comment spans multiple lines.
-    */
-   rb_define_const(cFoo, "MULTILINE_VALUE", INT2FIX(1));
-
-   /* Multiline comment goes here because this comment spans multiple lines.
-    * Multiline comment goes here because this comment spans multiple lines.
-    */
-   rb_define_const(cFoo, "MULTILINE_NOT_EMPTY", INT2FIX(1));
-
-   /*
-    * Multiline comment goes here because this comment spans multiple lines.
-    * 1: However, the value extraction should only happen for the first line
-    */
-   rb_define_const(cFoo, "MULTILINE_COLON_ON_SECOND_LINE", INT2FIX(1));
-
-}
-    EOF
-
-    @parser = util_parser content
-
-    @parser.do_classes_and_modules
-    @parser.do_constants
-
-    klass = @parser.classes['cFoo']
-    assert klass
-
-    constants = klass.constants
-    assert !klass.constants.empty?
-
-    assert_equal @top_level, constants.first.file
-
-    constants = constants.map { |c| [c.name, c.value, c.comment.text] }
-
-    assert_equal ['PERFECT', '300', 'The highest possible score in bowling   '],
-                 constants.shift
-    assert_equal ['CHEER', 'Huzzah!',
-                  'What you cheer when you roll a perfect game   '],
-                 constants.shift
-    assert_equal ['TEST', 'TEST:TEST',
-                  'Checking to see if escaped colon works   '],
-                 constants.shift
-    assert_equal ['MSEPARATOR', '\\',
-                  'The file separator on MS Windows   '],
-                 constants.shift
-    assert_equal ['SEPARATOR', '/',
-                  'The file separator on Unix   '],
-                 constants.shift
-    assert_equal ['STUFF', 'C:\\Program Files\\Stuff',
-                  'A directory on MS Windows   '],
-                 constants.shift
-    assert_equal ['NOSEMI', 'INT2FIX(99)',
-                  'Default definition   '],
-                 constants.shift
-    assert_equal ['NOCOMMENT', 'rb_str_new2("No comment")', ''],
-                 constants.shift
-
-    comment = <<-EOF.chomp
-Multiline comment goes here because this comment spans multiple lines.
-Multiline comment goes here because this comment spans multiple lines.
-    EOF
-    assert_equal ['MULTILINE',           'INT2FIX(1)', comment], constants.shift
-    assert_equal ['MULTILINE_VALUE',     '1',          comment], constants.shift
-    assert_equal ['MULTILINE_NOT_EMPTY', 'INT2FIX(1)', comment], constants.shift
-
-    comment = <<-EOF.chomp
-Multiline comment goes here because this comment spans multiple lines.
-1: However, the value extraction should only happen for the first line
-    EOF
-    assert_equal ['MULTILINE_COLON_ON_SECOND_LINE', 'INT2FIX(1)', comment],
-                 constants.shift
-
-    assert constants.empty?, constants.inspect
-  end
-
-  def test_do_constants_curses
-    content = <<-EOF
-void Init_curses(){
-  mCurses = rb_define_module("Curses");
-
-  /*
-   * Document-const: Curses::COLOR_BLACK
-   *
-   * Value of the color black
-   */
-  rb_curses_define_const(COLOR_BLACK);
-}
-    EOF
-
-    @parser = util_parser content
-
-    @parser.do_classes_and_modules
-    @parser.do_constants
-
-    klass = @parser.classes['mCurses']
-
-    constants = klass.constants
-    refute_empty klass.constants
-
-    assert_equal 'COLOR_BLACK', constants.first.name
-    assert_equal 'UINT2NUM(COLOR_BLACK)', constants.first.value
-    assert_equal 'Value of the color black', constants.first.comment.text
-  end
-
-  def test_do_constants_file
-    content = <<-EOF
-void Init_File(void) {
-  /*  Document-const: LOCK_SH
-   *
-   *  Shared lock
-   */
-  rb_file_const("LOCK_SH", INT2FIX(LOCK_SH));
-}
-    EOF
-
-    @parser = util_parser content
-
-    @parser.do_classes_and_modules
-    @parser.do_constants
-
-    klass = @parser.classes['rb_mFConst']
-
-    constants = klass.constants
-    refute_empty klass.constants
-
-    constant = constants.first
-
-    assert_equal 'LOCK_SH',          constant.name
-    assert_equal 'INT2FIX(LOCK_SH)', constant.value
-    assert_equal 'Shared lock',      constant.comment.text
-
-    @parser = util_parser <<-EOF
-void Init_File(void) {
-  rb_cFile = rb_define_class("File", rb_cIO);
-  rb_mFConst = rb_define_module_under(rb_cFile, "Constants");
-}
-    EOF
-    @parser.do_classes_and_modules
-    @parser.do_constants
-
-    assert_equal 'File::Constants',  klass.full_name
-  end
-
-  def test_do_includes
-    content = <<-EOF
-Init_foo() {
-   VALUE cFoo = rb_define_class("Foo", rb_cObject);
-   VALUE mInc = rb_define_module("Inc");
-
-   rb_include_module(cFoo, mInc);
-}
-    EOF
-
-    klass = util_get_class content, 'cFoo'
-
-    incl = klass.includes.first
-    assert_equal 'Inc',      incl.name
-    assert_equal '',         incl.comment.text
-    assert_equal @top_level, incl.file
-  end
-
-  # HACK parsing warning instead of setting up in file
-  def test_do_methods_in_c
-    content = <<-EOF
-VALUE blah(VALUE klass, VALUE year) {
-}
-
-void Init_Blah(void) {
-  cDate = rb_define_class("Date", rb_cObject);
-
-  rb_define_method(cDate, "blah", blah, 1); /* in blah.c */
-}
-    EOF
-
-    klass = nil
-
-    _, err = verbose_capture_output do
-      klass = util_get_class content, 'cDate'
-    end
-
-    assert_equal 'Date', klass.full_name
-    assert_match ' blah.c ', err
-  end
-
-  # HACK parsing warning instead of setting up in file
-  def test_do_methods_in_cpp
-    content = <<-EOF
-VALUE blah(VALUE klass, VALUE year) {
-}
-
-void Init_Blah(void) {
-  cDate = rb_define_class("Date", rb_cObject);
-
-  rb_define_method(cDate, "blah", blah, 1); /* in blah.cpp */
-}
-    EOF
-
-    klass = nil
-
-    _, err = verbose_capture_output do
-      klass = util_get_class content, 'cDate'
-    end
-
-    assert_equal 'Date', klass.full_name
-    assert_match ' blah.cpp ', err
-  end
-
-  # HACK parsing warning instead of setting up in file
-  def test_do_methods_in_y
-    content = <<-EOF
-VALUE blah(VALUE klass, VALUE year) {
-}
-
-void Init_Blah(void) {
-  cDate = rb_define_class("Date", rb_cObject);
-
-  rb_define_method(cDate, "blah", blah, 1); /* in blah.y */
-}
-    EOF
-
-    klass = nil
-
-    _, err = verbose_capture_output do
-      klass = util_get_class content, 'cDate'
-    end
-
-    assert_equal 'Date', klass.full_name
-    assert_match ' blah.y ', err
-  end
-
-  def test_do_methods_singleton_class
-    content = <<-EOF
-VALUE blah(VALUE klass, VALUE year) {
-}
-
-void Init_Blah(void) {
-  cDate = rb_define_class("Date", rb_cObject);
-  sDate = rb_singleton_class(cDate);
-
-  rb_define_method(sDate, "blah", blah, 1);
-}
-    EOF
-
-    klass = util_get_class content, 'cDate'
-
-    methods = klass.method_list
-    assert_equal 1,      methods.length
-    assert_equal 'blah', methods.first.name
-    assert               methods.first.singleton
-  end
-
-  def test_do_missing
-    parser = util_parser
-
-    klass_a = @top_level.add_class RDoc::ClassModule, 'A'
-    parser.classes['a'] = klass_a
-
-    parser.enclosure_dependencies['c'] << 'b'
-    parser.enclosure_dependencies['b'] << 'a'
-    parser.enclosure_dependencies['d'] << 'a'
-
-    parser.missing_dependencies['d'] = ['d', :class, 'D', 'Object', 'a']
-    parser.missing_dependencies['c'] = ['c', :class, 'C', 'Object', 'b']
-    parser.missing_dependencies['b'] = ['b', :class, 'B', 'Object', 'a']
-
-    parser.do_missing
-
-    assert_equal %w[A A::B A::B::C A::D],
-                 @store.all_classes_and_modules.map { |m| m.full_name }.sort
-  end
-
-  def test_do_missing_cycle
-    parser = util_parser
-
-    klass_a = @top_level.add_class RDoc::ClassModule, 'A'
-    parser.classes['a'] = klass_a
-
-    parser.enclosure_dependencies['c'] << 'b'
-    parser.enclosure_dependencies['b'] << 'a'
-
-    parser.missing_dependencies['c'] = ['c', :class, 'C', 'Object', 'b']
-    parser.missing_dependencies['b'] = ['b', :class, 'B', 'Object', 'a']
-
-    parser.enclosure_dependencies['y'] << 'z'
-    parser.enclosure_dependencies['z'] << 'y'
-
-    parser.missing_dependencies['y'] = ['y', :class, 'Y', 'Object', 'z']
-    parser.missing_dependencies['z'] = ['z', :class, 'Z', 'Object', 'y']
-
-    _, err = verbose_capture_output do
-      parser.do_missing
-    end
-
-    expected = 'Unable to create class Y (y), class Z (z) ' +
-               'due to a cyclic class or module creation'
-
-    assert_equal expected, err.chomp
-
-    assert_equal %w[A A::B A::B::C],
-                 @store.all_classes_and_modules.map { |m| m.full_name }.sort
-  end
-
-  def test_find_alias_comment
-    parser = util_parser
-
-    comment = parser.find_alias_comment 'C', '[]', 'index'
-
-    assert_equal '', comment.text
-
-    parser = util_parser <<-C
-/*
- * comment
- */
-
-rb_define_alias(C, "[]", "index");
-    C
-
-    comment = parser.find_alias_comment 'C', '[]', 'index'
-
-    assert_equal "/*\n * comment\n */\n\n", comment.text
-  end
-
-  def test_find_attr_comment_document_attr
-    parser= util_parser <<-C
-/*
- * Document-attr: y
- * comment
- */
-    C
-
-    comment = parser.find_attr_comment nil, 'y'
-
-    assert_equal "/*\n * \n * comment\n */", comment.text
-  end
-
-  def test_find_attr_comment_document_attr_oneline
-    parser= util_parser <<-C
-/* Document-attr: y
- * comment
- */
-    C
-
-    comment = parser.find_attr_comment nil, 'y'
-
-    assert_equal "/* \n * comment\n */", comment.text
-  end
-
-  def test_find_attr_comment_document_attr_overlap
-    parser= util_parser <<-C
-/* Document-attr: x
- * comment
- */
-
-/* Document-attr: y
- * comment
- */
-    C
-
-    comment = parser.find_attr_comment nil, 'y'
-
-    assert_equal "/* \n * comment\n */", comment.text
-  end
-
-  def test_find_class_comment
-    @options.rdoc_include << File.dirname(__FILE__)
-
-    content = <<-EOF
-/*
- * Comment 1
- */
-foo = rb_define_class("MyClassName1", rb_cObject);
-
-/*
- * Comment 2
- */
-bar = rb_define_class("MyClassName2", rb_cObject);
-    EOF
-
-    util_get_class content
-
-    assert_equal "Comment 1", @parser.classes['foo'].comment.text
-    assert_equal "Comment 2", @parser.classes['bar'].comment.text
-  end
-
-  def test_find_class_comment_init
-    content = <<-EOF
-/*
- * a comment for class Foo
- */
-void
-Init_Foo(void) {
-  VALUE foo = rb_define_class("Foo", rb_cObject);
-}
-    EOF
-
-    klass = util_get_class content, 'foo'
-
-    assert_equal "a comment for class Foo", klass.comment.text
-  end
-
-
-  def test_find_class_comment_initvm
-    content = <<-EOF
-/*
- * a comment for class Foo
- */
-void
-InitVM_Foo(void) {
-  VALUE foo = rb_define_class("Foo", rb_cObject);
-}
-    EOF
-
-    klass = util_get_class content, 'foo'
-
-    assert_equal "a comment for class Foo", klass.comment.text
-  end
-
-  def test_find_class_comment_define_class
-    content = <<-EOF
-/*
- * a comment for class Foo
- */
-VALUE foo = rb_define_class("Foo", rb_cObject);
-    EOF
-
-    klass = util_get_class content, 'foo'
-
-    assert_equal "a comment for class Foo", klass.comment.text
-  end
-
-  def test_find_class_comment_define_class_Init_Foo
-    content = <<-EOF
-/*
- * a comment for class Foo on Init
- */
-void
-Init_Foo(void) {
-    /*
-     * a comment for class Foo on rb_define_class
-     */
-    VALUE foo = rb_define_class("Foo", rb_cObject);
-}
-    EOF
-
-    klass = util_get_class content, 'foo'
-
-    assert_equal "a comment for class Foo on Init", klass.comment.text
-  end
-
-  def test_find_class_comment_define_class_Init_Foo_no_void
-    content = <<-EOF
-/*
- * a comment for class Foo on Init
- */
-void
-Init_Foo() {
-    /*
-     * a comment for class Foo on rb_define_class
-     */
-    VALUE foo = rb_define_class("Foo", rb_cObject);
-}
-    EOF
-
-    klass = util_get_class content, 'foo'
-
-    assert_equal "a comment for class Foo on Init", klass.comment.text
-  end
-
-  def test_find_class_comment_define_class_bogus_comment
-    content = <<-EOF
-/*
- * a comment for other_function
- */
-void
-other_function() {
-}
-
-void
-Init_Foo(void) {
-    VALUE foo = rb_define_class("Foo", rb_cObject);
-}
-    EOF
-
-    klass = util_get_class content, 'foo'
-
-    assert_equal '', klass.comment.text
-  end
-
-  def test_find_class_comment_define_class_under
-    content = <<-EOF
-/*
- * a comment for class Foo
- */
-VALUE foo = rb_define_class_under(rb_cObject, "Foo", rb_cObject);
-    EOF
-
-    klass = util_get_class content, 'foo'
-
-    assert_equal "a comment for class Foo", klass.comment.text
-  end
-
-  def test_find_class_comment_define_class_under_Init
-    content = <<-EOF
-/*
- * a comment for class Foo on Init
- */
-void
-Init_Foo(void) {
-    /*
-     * a comment for class Foo on rb_define_class
-     */
-    VALUE foo = rb_define_class_under(rb_cObject, "Foo", rb_cObject);
-}
-    EOF
-
-    klass = util_get_class content, 'foo'
-
-    # the inner comment is used since Object::Foo is not necessarily the same
-    # thing as "Foo" for Init_
-    assert_equal "a comment for class Foo on rb_define_class",
-                 klass.comment.text
-  end
-
-  def test_find_const_comment_rb_define
-    content = <<-EOF
-/*
- * A comment
- */
-rb_define_const(cFoo, "CONST", value);
-    EOF
-
-    parser = util_parser content
-
-    comment = parser.find_const_comment 'const', 'CONST'
-
-    assert_equal "/*\n * A comment\n */\n", comment.text
-  end
-
-  def test_find_const_comment_document_const
-    content = <<-EOF
-/*
- * Document-const: CONST
- *
- * A comment
- */
-    EOF
-
-    parser = util_parser content
-
-    comment = parser.find_const_comment nil, 'CONST'
-
-    assert_equal "/*\n *\n * A comment\n */", comment.text
-  end
-
-  def test_find_const_comment_document_const_full_name
-    content = <<-EOF
-/*
- * Document-const: Foo::CONST
- *
- * A comment
- */
-    EOF
-
-    parser = util_parser content
-
-    comment = parser.find_const_comment nil, 'CONST', 'Foo'
-
-    assert_equal "/*\n *\n * A comment\n */", comment.text
-  end
-
-  def test_find_body
-    content = <<-EOF
-/*
- * a comment for other_function
- */
-VALUE
-other_function() {
-}
-
-void
-Init_Foo(void) {
-    VALUE foo = rb_define_class("Foo", rb_cObject);
-
-    rb_define_method(foo, "my_method", other_function, 0);
-}
-    EOF
-
-    klass = util_get_class content, 'foo'
-    other_function = klass.method_list.first
-
-    assert_equal 'my_method', other_function.name
-    assert_equal "a comment for other_function",
-                 other_function.comment.text
-    assert_equal '()', other_function.params
-
-    code = other_function.token_stream.first[:text]
-
-    assert_equal "VALUE\nother_function() {\n}", code
-  end
-
-  def test_find_body_2
-    content = <<-CONTENT
-/* Copyright (C) 2010  Sven Herzberg
- *
- * This file is free software; the author(s) gives unlimited
- * permission to copy and/or distribute it, with or without
- * modifications, as long as this notice is preserved.
- */
-
-#include <ruby.h>
-
-static VALUE
-wrap_initialize (VALUE  self)
-{
-  return self;
-}
-
-/* */
-static VALUE
-wrap_shift (VALUE self,
-            VALUE arg)
-{
-  return self;
-}
-
-void
-init_gi_repository (void)
-{
-  VALUE mTest = rb_define_module ("Test");
-  VALUE cTest = rb_define_class_under (mTest, "Test", rb_cObject);
-
-  rb_define_method (cTest, "initialize", wrap_initialize, 0);
-  rb_define_method (cTest, "shift", wrap_shift, 0);
-}
-    CONTENT
-
-    klass = util_get_class content, 'cTest'
-    assert_equal 2, klass.method_list.length
-  end
-
-  def test_find_body_cast
-    content = <<-EOF
-/*
- * a comment for other_function
- */
-VALUE
-other_function() {
-}
-
-void
-Init_Foo(void) {
-    VALUE foo = rb_define_class("Foo", rb_cObject);
-
-    rb_define_method(foo, "my_method", (METHOD)other_function, 0);
-}
-    EOF
-
-    klass = util_get_class content, 'foo'
-    other_function = klass.method_list.first
-
-    assert_equal 'my_method', other_function.name
-    assert_equal "a comment for other_function",
-                 other_function.comment.text
-    assert_equal '()', other_function.params
-
-    code = other_function.token_stream.first[:text]
-
-    assert_equal "VALUE\nother_function() {\n}", code
-  end
-
-  def test_find_body_define
-    content = <<-EOF
-#define something something_else
-
-#define other_function rb_other_function
-
-/*
- * a comment for rb_other_function
- */
-VALUE
-rb_other_function() {
-}
-
-void
-Init_Foo(void) {
-    VALUE foo = rb_define_class("Foo", rb_cObject);
-
-    rb_define_method(foo, "my_method", other_function, 0);
-}
-    EOF
-
-    klass = util_get_class content, 'foo'
-    other_function = klass.method_list.first
-
-    assert_equal 'my_method', other_function.name
-    assert_equal 'a comment for rb_other_function', other_function.comment.text
-    assert_equal '()', other_function.params
-    assert_equal 8, other_function.line
-
-    code = other_function.token_stream.first[:text]
-
-    assert_equal "VALUE\nrb_other_function() {\n}", code
-  end
-
-  def test_find_body_define_comment
-    content = <<-EOF
-/*
- * a comment for other_function
- */
-#define other_function rb_other_function
-
-/* */
-VALUE
-rb_other_function() {
-}
-
-void
-Init_Foo(void) {
-    VALUE foo = rb_define_class("Foo", rb_cObject);
-
-    rb_define_method(foo, "my_method", other_function, 0);
-}
-    EOF
-
-    klass = util_get_class content, 'foo'
-    other_function = klass.method_list.first
-
-    assert_equal 'my_method', other_function.name
-    assert_equal 'a comment for other_function', other_function.comment.text
-    assert_equal '()', other_function.params
-    assert_equal 4, other_function.line
-
-    code = other_function.token_stream.first[:text]
-
-    assert_equal "#define other_function rb_other_function", code
-  end
-
-  def test_find_body_document_method
-    content = <<-EOF
-/*
- * Document-method: bar
- * Document-method: baz
- *
- * a comment for bar
- */
-VALUE
-bar() {
-}
-
-void
-Init_Foo(void) {
-    VALUE foo = rb_define_class("Foo", rb_cObject);
-
-    rb_define_method(foo, "bar", bar, 0);
-    rb_define_method(foo, "baz", bar, 0);
-}
-    EOF
-
-    klass = util_get_class content, 'foo'
-    assert_equal 2, klass.method_list.length
-
-    methods = klass.method_list.sort
-
-    bar = methods.first
-    assert_equal 'Foo#bar', bar.full_name
-    assert_equal "a comment for bar", bar.comment.text
-
-    baz = methods.last
-    assert_equal 'Foo#baz', baz.full_name
-    assert_equal "a comment for bar", baz.comment.text
-  end
-
-  def test_find_body_document_method_equals
-    content = <<-EOF
-/*
- * Document-method: Zlib::GzipFile#mtime=
- *
- * A comment
- */
-static VALUE
-rb_gzfile_set_mtime(VALUE obj, VALUE mtime)
-{
-
-void
-Init_zlib() {
-    mZlib = rb_define_module("Zlib");
-    cGzipFile = rb_define_class_under(mZlib, "GzipFile", rb_cObject);
-    cGzipWriter = rb_define_class_under(mZlib, "GzipWriter", cGzipFile);
-    rb_define_method(cGzipWriter, "mtime=", rb_gzfile_set_mtime, 1);
-}
-    EOF
-
-    klass = util_get_class content, 'cGzipWriter'
-    assert_equal 1, klass.method_list.length
-
-    methods = klass.method_list.sort
-
-    bar = methods.first
-    assert_equal 'Zlib::GzipWriter#mtime=', bar.full_name
-    assert_equal 'A comment', bar.comment.text
-  end
-
-  def test_find_body_document_method_same
-    content = <<-EOF
-VALUE
-s_bar() {
-}
-
-VALUE
-bar() {
-}
-
-/*
- * Document-method: Foo::bar
- *
- * a comment for Foo::bar
- */
-
-/*
- * Document-method: Foo#bar
- *
- * a comment for Foo#bar
- */
-
-void
-Init_Foo(void) {
-    VALUE foo = rb_define_class("Foo", rb_cObject);
-
-    rb_define_singleton_method(foo, "bar", s_bar, 0);
-    rb_define_method(foo, "bar", bar, 0);
-}
-    EOF
-
-    klass = util_get_class content, 'foo'
-    assert_equal 2, klass.method_list.length
-
-    methods = klass.method_list.sort
-
-    s_bar = methods.first
-    assert_equal 'Foo::bar', s_bar.full_name
-    assert_equal "a comment for Foo::bar", s_bar.comment.text
-
-    bar = methods.last
-    assert_equal 'Foo#bar', bar.full_name
-    assert_equal "a comment for Foo#bar", bar.comment.text
-  end
-
-  def test_find_body_macro
-    content = <<-EOF
-/*
- * a comment for other_function
- */
-DLL_LOCAL VALUE
-other_function() {
-}
-
-void
-Init_Foo(void) {
-    VALUE foo = rb_define_class("Foo", rb_cObject);
-
-    rb_define_method(foo, "my_method", other_function, 0);
-}
-    EOF
-
-    klass = util_get_class content, 'foo'
-    other_function = klass.method_list.first
-
-    assert_equal 'my_method', other_function.name
-    assert_equal "a comment for other_function",
-                 other_function.comment.text
-    assert_equal '()', other_function.params
-
-    code = other_function.token_stream.first[:text]
-
-    assert_equal "DLL_LOCAL VALUE\nother_function() {\n}", code
-  end
-
-  def test_find_modifiers_call_seq
-    comment = RDoc::Comment.new <<-COMMENT
-call-seq:
-  commercial() -> Date <br />
-
-If no arguments are given:
-
-    COMMENT
-
-    parser = util_parser
-    method_obj = RDoc::AnyMethod.new nil, 'blah'
-
-    parser.find_modifiers comment, method_obj
-
-    expected = <<-CALL_SEQ.chomp
-commercial() -> Date <br />
-
-    CALL_SEQ
-
-    assert_equal expected, method_obj.call_seq
-  end
-
-  def test_find_modifiers_nodoc
-    comment = RDoc::Comment.new <<-COMMENT
-/* :nodoc:
- *
- * Blah
- */
-
-    COMMENT
-
-    parser = util_parser
-    method_obj = RDoc::AnyMethod.new nil, 'blah'
-
-    parser.find_modifiers comment, method_obj
-
-    assert_nil method_obj.document_self
-  end
-
-  def test_find_modifiers_yields
-    comment = RDoc::Comment.new <<-COMMENT, @top_level, :c
-/* :yields: a, b
- *
- * Blah
- */
-
-    COMMENT
-
-    parser = util_parser
-    method_obj = RDoc::AnyMethod.new nil, 'blah'
-
-    parser.find_modifiers comment, method_obj
-
-    assert_equal 'a, b', method_obj.block_params
-
-    assert_equal "\n\nBlah", comment.text
-  end
-
-  def test_handle_method_args_minus_1
-    parser = util_parser "Document-method: Object#m\n blah */"
-
-    parser.content = <<-BODY
-VALUE
-rb_other(VALUE obj) {
-  rb_funcall(obj, rb_intern("other"), 0);
-  return rb_str_new2("blah, blah, blah");
-}
-
-VALUE
-rb_m(int argc, VALUE *argv, VALUE obj) {
-  VALUE o1, o2;
-  rb_scan_args(argc, argv, "1", &o1, &o2);
-}
-    BODY
-
-    parser.handle_method 'method', 'rb_cObject', 'm', 'rb_m', -1
-
-    m = @top_level.find_module_named('Object').method_list.first
-
-    assert_equal 'm', m.name
-    assert_equal @top_level, m.file
-    assert_equal 7, m.line
-
-    assert_equal '(p1)', m.params
-  end
-
-  def test_handle_method_args_0
-    parser = util_parser "Document-method: BasicObject#==\n blah */"
-
-    parser.handle_method 'method', 'rb_cBasicObject', '==', 'rb_obj_equal', 0
-
-    bo = @top_level.find_module_named 'BasicObject'
-
-    assert_equal 1, bo.method_list.length
-
-    equals2 = bo.method_list.first
-
-    assert_equal '()', equals2.params
-  end
-
-  def test_handle_method_args_1
-    parser = util_parser "Document-method: BasicObject#==\n blah */"
-
-    parser.handle_method 'method', 'rb_cBasicObject', '==', 'rb_obj_equal', 1
-
-    bo = @top_level.find_module_named 'BasicObject'
-
-    assert_equal 1, bo.method_list.length
-
-    equals2 = bo.method_list.first
-
-    assert_equal '(p1)', equals2.params
-  end
-
-  def test_handle_method_args_2
-    parser = util_parser "Document-method: BasicObject#==\n blah */"
-
-    parser.handle_method 'method', 'rb_cBasicObject', '==', 'rb_obj_equal', 2
-
-    bo = @top_level.find_module_named 'BasicObject'
-
-    assert_equal 1, bo.method_list.length
-
-    equals2 = bo.method_list.first
-
-    assert_equal '(p1, p2)', equals2.params
-  end
-
-  # test_handle_args_minus_1 handled by test_handle_method
-
-  def test_handle_method_args_minus_2
-    parser = util_parser "Document-method: BasicObject#==\n blah */"
-
-    parser.handle_method 'method', 'rb_cBasicObject', '==', 'rb_obj_equal', -2
-
-    bo = @top_level.find_module_named 'BasicObject'
-
-    assert_equal 1, bo.method_list.length
-
-    equals2 = bo.method_list.first
-
-    assert_equal '(*args)', equals2.params
-  end
-
-  def test_handle_method_initialize
-    parser = util_parser "Document-method: BasicObject::new\n blah */"
-
-    parser.handle_method('private_method', 'rb_cBasicObject',
-                         'initialize', 'rb_obj_dummy', -1)
-
-    bo = @top_level.find_module_named 'BasicObject'
-
-    assert_equal 1, bo.method_list.length
-
-    new = bo.method_list.first
-
-    assert_equal 'new',   new.name
-    assert_equal :public, new.visibility
-  end
-
-  def test_handle_singleton
-    parser = util_parser <<-SINGLE
-void Init_Blah(void) {
-  cDate = rb_define_class("Date", rb_cObject);
-  sDate = rb_singleton_class(cDate);
-}
-    SINGLE
-
-    parser.scan
-
-    assert_equal 'Date', parser.known_classes['sDate']
-    assert_equal 'Date', parser.singleton_classes['sDate']
-  end
-
-  def test_look_for_directives_in
-    parser = util_parser
-
-    comment = RDoc::Comment.new "# :other: not_handled\n"
-
-    parser.look_for_directives_in @top_level, comment
-
-    assert_equal "# :other: not_handled\n", comment.text
-    assert_equal 'not_handled', @top_level.metadata['other']
-  end
-
-  def test_load_variable_map
-    some_ext = @top_level.add_class RDoc::NormalClass, 'SomeExt'
-               @top_level.add_class RDoc::NormalClass, 'OtherExt'
-
-    @store.cache[:c_class_variables][@fn]       = { 'cSomeExt'  => 'SomeExt'  }
-    @store.cache[:c_class_variables]['other.c'] = { 'cOtherExt' => 'OtherExt' }
-
-    parser = util_parser
-
-    map = parser.load_variable_map :c_class_variables
-
-    expected = { 'cSomeExt' => some_ext }
-
-    assert_equal expected, map
-
-    assert_equal 'SomeExt', parser.known_classes['cSomeExt']
-    assert_nil              parser.known_classes['cOtherExt']
-  end
-
-  def test_load_variable_map_empty
-    parser = util_parser
-
-    map = parser.load_variable_map :c_class_variables
-
-    assert_empty map
-  end
-
-  def test_load_variable_map_legacy
-    @store.cache[:c_class_variables] = nil
-
-    parser = util_parser
-
-    map = parser.load_variable_map :c_class_variables
-
-    assert_empty map
-  end
-
-  def test_load_variable_map_singleton
-    @top_level.add_class RDoc::NormalClass, 'SomeExt'
-    @top_level.add_class RDoc::NormalClass, 'OtherExt'
-
-    @store.cache[:c_singleton_class_variables][@fn] =
-      { 'cSomeExt'  => 'SomeExt'  }
-    @store.cache[:c_singleton_class_variables]['other.c'] =
-      { 'cOtherExt' => 'OtherExt' }
-
-    parser = util_parser
-
-    map = parser.load_variable_map :c_singleton_class_variables
-
-    expected = { 'cSomeExt' => 'SomeExt' }
-
-    assert_equal expected, map
-
-    assert_equal 'SomeExt', parser.known_classes['cSomeExt']
-    assert_nil              parser.known_classes['cOtherExt']
-  end
-
-  def test_load_variable_map_trim
-    a = @top_level.add_class RDoc::NormalClass, 'A'
-
-    @store.cache[:c_class_variables][@fn] = {
-      'cA'  => 'A',
-      'cB'  => 'B',
-    }
-
-    parser = util_parser
-
-    map = parser.load_variable_map :c_class_variables
-
-    expected = { 'cA' => a }
-
-    assert_equal expected, map
-  end
-
-  def test_define_method
-    content = <<-EOF
-/*Method Comment! */
-static VALUE
-rb_io_s_read(argc, argv, io)
-    int argc;
-    VALUE *argv;
-    VALUE io;
-{
-}
-
-void
-Init_IO(void) {
-    /*
-     * a comment for class Foo on rb_define_class
-     */
-    VALUE rb_cIO = rb_define_class("IO", rb_cObject);
-    rb_define_singleton_method(rb_cIO, "read", rb_io_s_read, -1);
-}
-    EOF
-
-    klass = util_get_class content, 'rb_cIO'
-    read_method = klass.method_list.first
-    assert_equal "read", read_method.name
-    assert_equal "Method Comment!   ", read_method.comment.text
-    assert_equal "rb_io_s_read", read_method.c_function
-    assert read_method.singleton
-    assert_nil read_method.section.title
-  end
-
-  def test_define_method_with_category
-    content = <<-EOF
-/* :category: Awesome Methods
-   Method Comment!
- */
-static VALUE
-rb_io_s_read(argc, argv, io)
-    int argc;
-    VALUE *argv;
-    VALUE io;
-{
-}
-
-void
-Init_IO(void) {
-    /*
-     * a comment for class Foo on rb_define_class
-     */
-    VALUE rb_cIO = rb_define_class("IO", rb_cObject);
-    rb_define_singleton_method(rb_cIO, "read", rb_io_s_read, -1);
-}
-    EOF
-
-    klass = util_get_class content, 'rb_cIO'
-    read_method = klass.method_list.first
-    assert_equal "read", read_method.name
-    assert_equal "Method Comment!", read_method.comment.text.strip
-    assert_equal "rb_io_s_read", read_method.c_function
-    assert read_method.singleton
-    assert_equal "Awesome Methods", read_method.section.title
-  end
-
-  def test_define_method_dynamically
-    content = <<-EOF
-void
-Init_foo(void)
-{
-    rb_define_singleton_method(obj, "foo", foo, -1);
-}
-    EOF
-
-    klass = util_get_class content, 'obj'
-    assert_nil klass
-  end
-
-  def test_define_method_with_prototype
-    content = <<-EOF
-static VALUE rb_io_s_read(int, VALUE*, VALUE);
-
-/* Method Comment! */
-static VALUE
-rb_io_s_read(argc, argv, io)
-    int argc;
-    VALUE *argv;
-    VALUE io;
-{
-}
-
-void
-Init_IO(void) {
-    /*
-     * a comment for class Foo on rb_define_class
-     */
-    VALUE rb_cIO = rb_define_class("IO", rb_cObject);
-    rb_define_singleton_method(rb_cIO, "read", rb_io_s_read, -1);
-}
-    EOF
-
-    klass = util_get_class content, 'rb_cIO'
-    read_method = klass.method_list.first
-    assert_equal "read", read_method.name
-    assert_equal "Method Comment!   ", read_method.comment.text
-    assert_equal "rb_io_s_read", read_method.c_function
-    assert read_method.singleton
-  end
-
-  def test_define_method_private
-    content = <<-EOF
-/*Method Comment! */
-static VALUE
-rb_io_s_read(argc, argv, io)
-    int argc;
-    VALUE *argv;
-    VALUE io;
-{
-}
-
-void
-Init_IO(void) {
-    /*
-     * a comment for class Foo on rb_define_class
-     */
-    VALUE rb_cIO = rb_define_class("IO", rb_cObject);
-    rb_define_private_method(rb_cIO, "read", rb_io_s_read, -1);
-}
-    EOF
-
-    klass = util_get_class content, 'rb_cIO'
-    read_method = klass.method_list.first
-    assert_equal 'IO#read', read_method.full_name
-    assert_equal :private, read_method.visibility
-    assert_equal "Method Comment!   ", read_method.comment.text
-  end
-
-  def test_define_method_private_singleton
-    content = <<-EOF
-/*Method Comment! */
-static VALUE
-rb_io_s_read(argc, argv, io)
-    int argc;
-    VALUE *argv;
-    VALUE io;
-{
-}
-
-void
-Init_IO(void) {
-    /*
-     * a comment for class Foo on rb_define_class
-     */
-    VALUE rb_cIO = rb_define_class("IO", rb_cObject);
-    VALUE rb_cIO_s = rb_singleton_class(rb_cIO);
-    rb_define_private_method(rb_cIO_s, "read", rb_io_s_read, -1);
-}
-    EOF
-
-    klass = util_get_class content, 'rb_cIO'
-    read_method = klass.method_list.first
-    assert_equal "read", read_method.name
-    assert_equal "Method Comment!   ", read_method.comment.text
-    assert_equal :private, read_method.visibility
-    assert read_method.singleton
-  end
-
-  def test_define_method_singleton
-    content = <<-EOF
-/*Method Comment! */
-static VALUE
-rb_io_s_read(argc, argv, io)
-    int argc;
-    VALUE *argv;
-    VALUE io;
-{
-}
-
-void
-Init_IO(void) {
-    /*
-     * a comment for class Foo on rb_define_class
-     */
-    VALUE rb_cIO = rb_define_class("IO", rb_cObject);
-    VALUE rb_cIO_s = rb_singleton_class(rb_cIO);
-    rb_define_method(rb_cIO_s, "read", rb_io_s_read, -1);
-}
-    EOF
-
-    klass = util_get_class content, 'rb_cIO'
-    read_method = klass.method_list.first
-    assert_equal "read", read_method.name
-    assert_equal "Method Comment!   ", read_method.comment.text
-    assert read_method.singleton
-  end
-
-  def test_rb_scan_args
-    parser = util_parser
-
-    assert_equal '(p1)',
-                 parser.rb_scan_args('rb_scan_args(a, b, "1",)')
-    assert_equal '(p1, p2)',
-                 parser.rb_scan_args('rb_scan_args(a, b, "2",)')
-
-    assert_equal '(p1 = v1)',
-                 parser.rb_scan_args('rb_scan_args(a, b, "01",)')
-    assert_equal '(p1 = v1, p2 = v2)',
-                 parser.rb_scan_args('rb_scan_args(a, b, "02",)')
-
-    assert_equal '(p1, p2 = v2)',
-                 parser.rb_scan_args('rb_scan_args(a, b, "11",)')
-
-    assert_equal '(p1, *args)',
-                 parser.rb_scan_args('rb_scan_args(a, b, "1*",)')
-    assert_equal '(p1, p2 = {})',
-                 parser.rb_scan_args('rb_scan_args(a, b, "1:",)')
-    assert_equal '(p1, &block)',
-                 parser.rb_scan_args('rb_scan_args(a, b, "1&",)')
-
-    assert_equal '(p1, p2)',
-                 parser.rb_scan_args('rb_scan_args(a, b, "101",)')
-
-    assert_equal '(p1, p2 = v2, p3)',
-                 parser.rb_scan_args('rb_scan_args(a, b, "111",)')
-
-    assert_equal '(p1, *args, p3)',
-                 parser.rb_scan_args('rb_scan_args(a, b, "1*1",)')
-
-    assert_equal '(p1, p2 = v2, *args)',
-                 parser.rb_scan_args('rb_scan_args(a, b, "11*",)')
-    assert_equal '(p1, p2 = v2, p3 = {})',
-                 parser.rb_scan_args('rb_scan_args(a, b, "11:",)')
-    assert_equal '(p1, p2 = v2, &block)',
-                 parser.rb_scan_args('rb_scan_args(a, b, "11&",)')
-
-    assert_equal '(p1, p2 = v2, *args, p4, p5 = {}, &block)',
-                 parser.rb_scan_args('rb_scan_args(a, b, "11*1:&",)')
-
-    # The following aren't valid according to spec but are according to the
-    # implementation.
-    assert_equal '(*args)',
-                 parser.rb_scan_args('rb_scan_args(a, b, "*",)')
-    assert_equal '(p1 = {})',
-                 parser.rb_scan_args('rb_scan_args(a, b, ":",)')
-    assert_equal '(&block)',
-                 parser.rb_scan_args('rb_scan_args(a, b, "&",)')
-
-    assert_equal '(*args, p2 = {})',
-                 parser.rb_scan_args('rb_scan_args(a, b, "*:",)')
-    assert_equal '(p1 = {}, &block)',
-                 parser.rb_scan_args('rb_scan_args(a, b, ":&",)')
-    assert_equal '(*args, p2 = {}, &block)',
-                 parser.rb_scan_args('rb_scan_args(a, b, "*:&",)')
-  end
-
-  def test_scan
-    parser = util_parser <<-C
-void Init(void) {
-    mM = rb_define_module("M");
-    cC = rb_define_class("C", rb_cObject);
-    sC = rb_singleton_class(cC);
-}
-    C
-
-    parser.scan
-
-    expected = {
-      @fn => {
-        'mM' => 'M',
-        'cC' => 'C', }}
-    assert_equal expected, @store.c_class_variables
-
-    expected = {
-      @fn => {
-        'sC' => 'C' } }
-    assert_equal expected, @store.c_singleton_class_variables
-  end
-
-  def test_scan_method_copy
-    parser = util_parser <<-C
-/*
- *  call-seq:
- *    pathname.to_s    -> string
- *    pathname.to_path -> string
- *
- *  Return the path as a String.
- *
- *  to_path is implemented so Pathname objects are usable with File.open, etc.
- */
-static VALUE
-path_to_s(VALUE self) { }
-
-/*
- *  call-seq:
- *     str[index]               -> new_str or nil
- *     str[start, length]       -> new_str or nil
- *     str.slice(index)         -> new_str or nil
- *     str.slice(start, length) -> new_str or nil
- */
-static VALUE
-path_aref_m(int argc, VALUE *argv, VALUE str) { }
-
-/*
- *  call-seq:
- *     string <=> other_string   -> -1, 0, +1 or nil
- */
-static VALUE
-path_cmp_m(VALUE str1, VALUE str2) { }
-
-/*
- *  call-seq:
- *     str == obj    -> true or false
- *     str === obj   -> true or false
- */
-VALUE
-rb_str_equal(VALUE str1, VALUE str2) { }
-
-Init_pathname()
-{
-    rb_cPathname = rb_define_class("Pathname", rb_cObject);
-
-    rb_define_method(rb_cPathname, "to_s",    path_to_s, 0);
-    rb_define_method(rb_cPathname, "to_path", path_to_s, 0);
-    rb_define_method(rb_cPathname, "[]",      path_aref_m, -1);
-    rb_define_method(rb_cPathname, "slice",   path_aref_m, -1);
-    rb_define_method(rb_cPathname, "<=>",     path_cmp_m, 1);
-    rb_define_method(rb_cPathname, "==",      rb_str_equal), 2);
-    rb_define_method(rb_cPathname, "===",     rb_str_equal), 2);
-}
-    C
-
-    parser.scan
-
-    pathname = @store.classes_hash['Pathname']
-
-    to_path = pathname.method_list.find { |m| m.name == 'to_path' }
-    assert_equal "pathname.to_path -> string", to_path.call_seq
-
-    to_s = pathname.method_list.find { |m| m.name == 'to_s' }
-    assert_equal "pathname.to_s    -> string", to_s.call_seq
-
-    index_expected = <<-EXPECTED.chomp
-str[index]               -> new_str or nil
-str[start, length]       -> new_str or nil
-    EXPECTED
-
-    index = pathname.method_list.find { |m| m.name == '[]' }
-    assert_equal index_expected, index.call_seq, '[]'
-
-    slice_expected = <<-EXPECTED.chomp
-str.slice(index)         -> new_str or nil
-str.slice(start, length) -> new_str or nil
-    EXPECTED
-
-    slice = pathname.method_list.find { |m| m.name == 'slice' }
-    assert_equal slice_expected, slice.call_seq
-
-    spaceship = pathname.method_list.find { |m| m.name == '<=>' }
-    assert_equal "string <=> other_string   -> -1, 0, +1 or nil",
-                 spaceship.call_seq
-
-    equals2 = pathname.method_list.find { |m| m.name == '==' }
-    assert_match 'str == obj', equals2.call_seq
-
-    equals3 = pathname.method_list.find { |m| m.name == '===' }
-    assert_match 'str === obj', equals3.call_seq
-  end
-
-  def test_scan_order_dependent
-    parser = util_parser <<-C
-void a(void) {
-    mA = rb_define_module("A");
-}
-
-void b(void) {
-    cB = rb_define_class_under(mA, "B", rb_cObject);
-}
-
-void c(void) {
-    mC = rb_define_module_under(cB, "C");
-}
-
-void d(void) {
-    mD = rb_define_class_under(mC, "D");
-}
-    C
-
-    parser.scan
-
-    assert_equal %w[A A::B A::B::C],
-                 @store.all_classes_and_modules.map { |m| m.full_name }.sort
-  end
-
-  def test_markup_format_default
-    content = <<-EOF
-void Init_Blah(void) {
-  cBlah = rb_define_class("Blah", rb_cObject);
-
-  /*
-   * This should be interpreted in the default format.
-   */
-  rb_attr(cBlah, rb_intern("default_format"), 1, 1, Qfalse);
-}
-    EOF
-
-    klass = util_get_class content, 'cBlah'
-    assert_equal("rdoc", klass.attributes.find {|a| a.name == "default_format"}.comment.format)
-  end
-
-  def test_markup_format_override
-    content = <<-EOF
-void Init_Blah(void) {
-  cBlah = rb_define_class("Blah", rb_cObject);
-
-  /*
-   * This should be interpreted in the default format.
-   */
-  rb_attr(cBlah, rb_intern("default_format"), 1, 1, Qfalse);
-}
-    EOF
-
-    @options.markup = "markdown"
-    klass = util_get_class content, 'cBlah'
-    assert_equal("markdown", klass.attributes.find {|a| a.name == "default_format"}.comment.format)
-  end
-
-  def util_get_class content, name = nil
-    @parser = util_parser content
-    @parser.scan
-
-    @parser.classes[name] if name
-  end
-
-  def util_parser content = ''
-    RDoc::Parser::C.new @top_level, @fn, content, @options, @stats
-  end
-
-end
diff --git a/test/rdoc/test_rdoc_parser_changelog.rb b/test/rdoc/test_rdoc_parser_changelog.rb
deleted file mode 100644
index 587a156d3a3ef0..00000000000000
--- a/test/rdoc/test_rdoc_parser_changelog.rb
+++ /dev/null
@@ -1,484 +0,0 @@
-# frozen_string_literal: true
-require_relative 'helper'
-
-class TestRDocParserChangeLog < RDoc::TestCase
-
-  def setup
-    super
-
-    @tempfile  = Tempfile.new 'ChangeLog'
-    @top_level = @store.add_file @tempfile.path
-    @options   = RDoc::Options.new
-    @stats     = RDoc::Stats.new @store, 0
-  end
-
-  def teardown
-    @tempfile.close!
-
-    super
-  end
-
-  def test_class_can_parse
-    parser = RDoc::Parser::ChangeLog
-
-    temp_dir do
-      FileUtils.touch 'ChangeLog'
-      assert_equal parser, parser.can_parse('ChangeLog')
-
-      assert_equal parser, parser.can_parse(@tempfile.path)
-
-      FileUtils.touch 'ChangeLog.rb'
-      assert_equal RDoc::Parser::Ruby, parser.can_parse('ChangeLog.rb')
-    end
-  end
-
-  def test_continue_entry_body
-    parser = util_parser
-
-    entry_body = ['a'.dup]
-
-    parser.continue_entry_body entry_body, 'b'
-
-    assert_equal ['a b'], entry_body
-  end
-
-  def test_continue_entry_body_empty
-    parser = util_parser
-
-    entry_body = []
-
-    parser.continue_entry_body entry_body, ''
-
-    assert_empty entry_body
-  end
-
-  def test_continue_entry_body_function
-    parser = util_parser
-
-    entry_body = ['file: (func1)'.dup]
-
-    parser.continue_entry_body entry_body, '(func2): blah'
-
-    assert_equal ['file: (func1, func2): blah'], entry_body
-  end
-
-  def test_create_document
-    parser = util_parser
-
-    groups = {
-      '2012-12-04' => [
-        ['Tue Dec  4 08:33:46 2012  Eric Hodel  <drbrain@segment7.net>',
-          %w[a:one b:two]],
-        ['Tue Dec  4 08:32:10 2012  Eric Hodel  <drbrain@segment7.net>',
-          %w[c:three d:four]]],
-      '2012-12-03' => [
-        ['Mon Dec  3 20:28:02 2012  Koichi Sasada  <ko1@atdot.net>',
-          %w[e:five f:six]]],
-    }
-
-    expected =
-      doc(
-        head(1, File.basename(@tempfile.path)),
-        blank_line,
-        head(2, '2012-12-04'),
-        blank_line,
-        head(3, 'Tue Dec  4 08:33:46 2012  Eric Hodel  <drbrain@segment7.net>'),
-        blank_line,
-        list(:NOTE, item('a', para('one')), item('b', para('two'))),
-        head(3, 'Tue Dec  4 08:32:10 2012  Eric Hodel  <drbrain@segment7.net>'),
-        blank_line,
-        list(:NOTE, item('c', para('three')), item('d', para('four'))),
-        head(2, '2012-12-03'),
-        blank_line,
-        head(3, 'Mon Dec  3 20:28:02 2012  Koichi Sasada  <ko1@atdot.net>'),
-        blank_line,
-        list(:NOTE, item('e', para('five')), item('f', para('six'))))
-
-    expected.file = @top_level
-
-    document = parser.create_document(groups)
-
-    assert_equal expected, document
-
-    assert_equal 2, document.omit_headings_below
-
-    headings = document.parts.select do |part|
-      RDoc::Markup::Heading === part and part.level == 2
-    end
-
-    refute headings.all? { |heading| heading.text.frozen? }
-  end
-
-  def test_create_entries
-    parser = util_parser
-
-    entries = [
-      ['Tue Dec  1 02:03:04 2012  Eric Hodel  <drbrain@segment7.net>',
-        %w[a:one b:two]],
-      ['Tue Dec  5 06:07:08 2012  Eric Hodel  <drbrain@segment7.net>',
-        %w[c:three d:four]],
-    ]
-
-    expected = [
-      head(3, 'Tue Dec  1 02:03:04 2012  Eric Hodel  <drbrain@segment7.net>'),
-      blank_line,
-      list(:NOTE, item('a', para('one')), item('b', para('two'))),
-      head(3, 'Tue Dec  5 06:07:08 2012  Eric Hodel  <drbrain@segment7.net>'),
-      blank_line,
-      list(:NOTE, item('c', para('three')), item('d', para('four'))),
-    ]
-
-    entries = parser.create_entries(entries)
-    assert_equal expected, entries
-  end
-
-  def test_create_entries_colons
-    parser = util_parser
-
-    entries = [
-      ['Wed Dec  5 12:17:11 2012  Naohisa Goto  <ngotogenome@gmail.com>',
-        ['func.rb (DL::Function#bind): log stuff [ruby-core:50562]']],
-    ]
-
-    expected = [
-      head(3,
-           'Wed Dec  5 12:17:11 2012  Naohisa Goto  <ngotogenome@gmail.com>'),
-      blank_line,
-      list(:NOTE,
-           item('func.rb (DL::Function#bind)',
-                para('log stuff [ruby-core:50562]')))]
-
-    assert_equal expected, parser.create_entries(entries)
-  end
-
-  def test_create_items
-    parser = util_parser
-
-    items = [
-	    'README.EXT:  Converted to RDoc format',
-	    'README.EXT.ja:  ditto',
-    ]
-
-    expected =
-      list(:NOTE,
-        item('README.EXT',
-          para('Converted to RDoc format')),
-        item('README.EXT.ja',
-          para('ditto')))
-
-    assert_equal expected, parser.create_items(items)
-  end
-
-  def test_group_entries
-    parser = util_parser
-
-    entries = [
-      [ 'Tue Dec  4 08:33:46 2012  Eric Hodel  <drbrain@segment7.net>',
-        %w[one two]],
-      [ 'Tue Dec  4 08:32:10 2012  Eric Hodel  <drbrain@segment7.net>',
-        %w[three four]],
-      [ 'Mon Dec  3 20:28:02 2012  Koichi Sasada  <ko1@atdot.net>',
-        %w[five six]],
-      [ '2008-01-30  H.J. Lu  <hongjiu.lu@intel.com>',
-        %w[seven eight]]]
-
-    expected = {
-      '2012-12-04' => [
-        ['Tue Dec  4 08:33:46 2012  Eric Hodel  <drbrain@segment7.net>',
-          %w[one two]],
-        ['Tue Dec  4 08:32:10 2012  Eric Hodel  <drbrain@segment7.net>',
-          %w[three four]]],
-      '2012-12-03' => [
-        ['Mon Dec  3 20:28:02 2012  Koichi Sasada  <ko1@atdot.net>',
-          %w[five six]]],
-      '2008-01-30' => [
-        ['2008-01-30  H.J. Lu  <hongjiu.lu@intel.com>',
-          %w[seven eight]]],
-    }
-
-    assert_equal expected, parser.group_entries(entries)
-  end
-
-  def test_parse_entries
-    parser = util_parser <<-ChangeLog
-Tue Dec  4 08:33:46 2012  Eric Hodel  <drbrain@segment7.net>
-
-	* README.EXT:  Converted to RDoc format
-	* README.EXT.ja:  ditto
-
-Mon Dec  3 20:28:02 2012  Koichi Sasada  <ko1@atdot.net>
-
-	* compile.c (iseq_specialized_instruction):
-	  change condition of using `opt_send_simple'.
-	  More method invocations can be simple.
-
-commit\ 8187228de0142d3ac7950b7d977c2849e934c637
-
-Other note that will be ignored
-
-    ChangeLog
-
-    expected = [
-      [ 'Tue Dec  4 08:33:46 2012  Eric Hodel  <drbrain@segment7.net>',
-        [ 'README.EXT:  Converted to RDoc format',
-          'README.EXT.ja:  ditto']],
-      [ 'Mon Dec  3 20:28:02 2012  Koichi Sasada  <ko1@atdot.net>',
-        [ 'compile.c (iseq_specialized_instruction): change condition of ' +
-          'using `opt_send_simple\'. More method invocations can be simple.']]]
-
-    assert_equal expected, parser.parse_entries
-  end
-
-  def test_parse_entries_bad_time
-    parser = util_parser <<-ChangeLog
-2008-01-30  H.J. Lu  <hongjiu.lu@intel.com>
-
-        PR libffi/34612
-        * src/x86/sysv.S (ffi_closure_SYSV): Pop 4 byte from stack when
-        returning struct.
-
-    ChangeLog
-
-    expected = [
-      [ '2008-01-30  H.J. Lu  <hongjiu.lu@intel.com>',
-        [ 'src/x86/sysv.S (ffi_closure_SYSV): Pop 4 byte from stack when ' +
-          'returning struct.']]
-    ]
-
-    assert_equal expected, parser.parse_entries
-  end
-
-  def test_parse_entries_gnu
-    parser = util_parser <<-ChangeLog
-1998-08-17  Richard Stallman  <rms@gnu.org>
-
-* register.el (insert-register): Return nil.
-(jump-to-register): Likewise.
-
-* sort.el (sort-subr): Return nil.
-
-* keyboard.c (menu_bar_items, tool_bar_items)
-(Fexecute_extended_command): Deal with 'keymap' property.
-    ChangeLog
-
-    expected = [
-      [ '1998-08-17  Richard Stallman  <rms@gnu.org>',
-        [ 'register.el (insert-register): Return nil.',
-          '(jump-to-register): Likewise.',
-          'sort.el (sort-subr): Return nil.',
-          'keyboard.c (menu_bar_items, tool_bar_items, ' +
-          'Fexecute_extended_command): Deal with \'keymap\' property.']]]
-
-    assert_equal expected, parser.parse_entries
-  end
-
-  def test_parse_entries_git
-    parser = util_parser <<-ChangeLog
-commit\ 709bed2afaee50e2ce803f87bf1ee8291bea41e3
-  Author: git <svn-admin@ruby-lang.org>
-  Date:   2021-01-21 01:03:52 +0900
-
-    * 2021-01-21 [ci skip]
-ChangeLog
-
-    expected = [
-      [ "709bed2afaee50e2ce80",
-       [ "git", "svn-admin@ruby-lang.org",
-         "2021-01-21 01:03:52 +0900",
-         "* 2021-01-21 [ci skip]\n"]]]
-
-    assert_equal expected, parser.parse_entries
-  end
-
-  def test_scan
-    parser = util_parser <<-ChangeLog
-Tue Dec  4 08:32:10 2012  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/rdoc/ri/driver.rb:  Fixed ri page display for files with
-	  extensions.
-	* test/rdoc/test_rdoc_ri_driver.rb:  Test for above
-
-Mon Dec  3 20:37:22 2012  Koichi Sasada  <ko1@atdot.net>
-
-	* vm_exec.c: check VM_COLLECT_USAGE_DETAILS.
-
-    ChangeLog
-
-    parser.scan
-
-    expected = doc(
-      head(1, File.basename(@tempfile.path)),
-      blank_line,
-      head(2, '2012-12-04'),
-      blank_line,
-      head(3, 'Tue Dec  4 08:32:10 2012  Eric Hodel  <drbrain@segment7.net>'),
-      blank_line,
-      list(:NOTE,
-        item('lib/rdoc/ri/driver.rb', para('Fixed ri page display for ' +
-                       'files with extensions.')),
-        item('test/rdoc/test_rdoc_ri_driver.rb', para('Test for above'))),
-      head(2, '2012-12-03'),
-      blank_line,
-      head(3, 'Mon Dec  3 20:37:22 2012  Koichi Sasada  <ko1@atdot.net>'),
-      blank_line,
-      list(:NOTE,
-        item('vm_exec.c', para('check VM_COLLECT_USAGE_DETAILS.'))))
-
-    expected.file = @top_level
-
-    assert_equal expected, @top_level.comment
-  end
-
-  def test_scan_git
-    parser = util_parser <<-ChangeLog
-commit\ 38816887962ec167ee46acf500f68df5c3013163
-Author: git <svn-admin@ruby-lang.org>
-Date:   Sun Jan 24 14:35:51 2021 +0900
-
-    * 2021-01-24 [ci skip]
-
-commit\ db7d0b89f6eca66cc7eb155c95f9123133da1ffc
-Author: git <svn-admin@ruby-lang.org>
-Date:   Sat, 23 Jan 2021 06:01:39 +0900
-
-    * 2021-01-23 [ci skip]
-
-commit\ a3efbda7128ef20b55505b32d1608ea48f80af4a
-Author: git <svn-admin@ruby-lang.org>
-Date:   2021-01-22T02:49:39+09:00
-
-    * 2021-01-22 [ci skip]
-
-commit\ 709bed2afaee50e2ce803f87bf1ee8291bea41e3
-  Author: git <svn-admin@ruby-lang.org>
-  Date:   2021-01-21 01:03:52 +0900
-
-    * 2021-01-21 [ci skip]
-
-commit\ a8dc5156e183489c5121fb1759bda5d9406d9175
-  Author: git <svn-admin@ruby-lang.org>
-  Date:   2021-01-20 01:58:26 +0900
-
-    * 2021-01-20 [ci skip]
-
-commit\ de5f8a92d5001799bedb3b1a271a2d9b23c6c8fb
-  Author: Masataka Pocke Kuwabara <kuwabara@pocke.me>
-  Date:   2021-01-01 14:25:08 +0900
-
-    Make args info for RubyVM::AST to available on endless method without parens
-
-    Problem
-    ===
-
-    Arguments information is missing for endless method without parens.
-    For example:
-
-    ```ruby
-    # ok
-    ```
-
-    It causes an error if a program expects `args` node exists.
-
-    Solution
-    ===
-
-    Call `new_args` on this case.
-ChangeLog
-
-    parser.scan
-
-    expected = doc(
-      head(1, File.basename(@tempfile.path)),
-      blank_line,
-      head(2, '2021-01-24'),
-      blank_line,
-      log_entry(nil, '38816887962ec167ee46',
-                'git', 'svn-admin@ruby-lang.org', 'Sun Jan 24 14:35:51 2021 +0900',
-                [list(:BULLET, item(nil, para('2021-01-24 [ci skip]')))]),
-      head(2, '2021-01-23'),
-      blank_line,
-      log_entry(nil, 'db7d0b89f6eca66cc7eb',
-                'git', 'svn-admin@ruby-lang.org', 'Sat, 23 Jan 2021 06:01:39 +0900',
-                [list(:BULLET, item(nil, para('2021-01-23 [ci skip]')))]),
-      head(2, '2021-01-22'),
-      blank_line,
-      log_entry(nil, 'a3efbda7128ef20b5550',
-                'git', 'svn-admin@ruby-lang.org', '2021-01-22T02:49:39+09:00',
-                [list(:BULLET, item(nil, para('2021-01-22 [ci skip]')))]),
-      head(2, '2021-01-21'),
-      blank_line,
-      log_entry(nil, '709bed2afaee50e2ce80',
-                'git', 'svn-admin@ruby-lang.org', '2021-01-21 01:03:52 +0900',
-                [list(:BULLET, item(nil, para('2021-01-21 [ci skip]')))]),
-      head(2, '2021-01-20'),
-      blank_line,
-      log_entry(nil, 'a8dc5156e183489c5121',
-                'git', 'svn-admin@ruby-lang.org', '2021-01-20 01:58:26 +0900',
-                [list(:BULLET, item(nil, para('2021-01-20 [ci skip]')))]),
-      head(2, '2021-01-01'),
-      blank_line,
-      log_entry(nil, 'de5f8a92d5001799bedb',
-                'Masataka Pocke Kuwabara', 'kuwabara@pocke.me', '2021-01-01 14:25:08 +0900',
-                [head(4, 'Make args info for RubyVM::AST to available on endless method without parens'),
-                 head(5, 'Problem'),
-                 para("Arguments information is missing for endless method without parens.\n" +
-                      "For example:"),
-                 verb("# ok\n").tap {|v| v.format = :ruby},
-                 para('It causes an error if a program expects <code>args</code> node exists.'),
-                 head(5, 'Solution'),
-                 para('Call <code>new_args</code> on this case.')]))
-
-    expected.file = @top_level
-
-    assert_equal expected, @top_level.comment
-  end
-
-  def test_scan_git_commit_date
-    parser = util_parser <<-ChangeLog
-commit\ ee1e690a2df901adb279d7a63fbd92c64e0a5ae6
-  Author:     Igor Zubkov <igor.zubkov@gmail.com>
-  AuthorDate: 2016-10-25 03:56:11 +0900
-  Commit:     Nobuyoshi Nakada <nobu@ruby-lang.org>
-  CommitDate: 2021-01-07 13:40:42 +0900
-
-    We don't need "require 'uri'" after "require 'net/http'".
-
-commit\ 4d0985a7bd8f591dff4b430e288bfd83af782e51
-  Author:     git <svn-admin@ruby-lang.org>
-  AuthorDate: 2021-01-07 10:21:34 +0900
-  Commit:     git <svn-admin@ruby-lang.org>
-  CommitDate: 2021-01-07 10:21:34 +0900
-
-    * 2021-01-07 [ci skip]
-ChangeLog
-
-    parser.scan
-
-    expected = doc(
-      head(1, File.basename(@tempfile.path)),
-      blank_line,
-      head(2, "2021-01-07"),
-      blank_line,
-      log_entry(nil, 'ee1e690a2df901adb279',
-                'Igor Zubkov', 'igor.zubkov@gmail.com',
-                '2016-10-25 03:56:11 +0900',
-                [head(4, %[We don't need "require 'uri'" after "require 'net/http'".])]),
-      log_entry(nil, '4d0985a7bd8f591dff4b',
-                'git', 'svn-admin@ruby-lang.org',
-                '2021-01-07 10:21:34 +0900',
-                [list(:BULLET, item(nil, para("2021-01-07 [ci skip]")))]))
-
-    expected.file = @top_level
-
-    assert_equal expected, @top_level.comment
-  end
-
-  def util_parser content = ''
-    RDoc::Parser::ChangeLog.new \
-      @top_level, @tempfile.path, content, @options, @stats
-  end
-
-  def log_entry(*a)
-    RDoc::Parser::ChangeLog::Git::LogEntry.new(*a)
-  end
-end
diff --git a/test/rdoc/test_rdoc_parser_markdown.rb b/test/rdoc/test_rdoc_parser_markdown.rb
deleted file mode 100644
index cca9c1ddfd0f8b..00000000000000
--- a/test/rdoc/test_rdoc_parser_markdown.rb
+++ /dev/null
@@ -1,61 +0,0 @@
-# frozen_string_literal: true
-require_relative 'helper'
-
-class TestRDocParserMarkdown < RDoc::TestCase
-
-  def setup
-    super
-
-    @RP = RDoc::Parser
-
-    @tempfile = Tempfile.new self.class.name
-    filename = @tempfile.path
-
-    @top_level = @store.add_file filename
-    @fn = filename
-    @options = RDoc::Options.new
-    @stats = RDoc::Stats.new @store, 0
-  end
-
-  def teardown
-    super
-
-    @tempfile.close!
-  end
-
-  def test_file
-    assert_kind_of RDoc::Parser::Text, util_parser('')
-  end
-
-  def test_class_can_parse
-    temp_dir do
-      FileUtils.touch 'foo.md'
-      assert_equal @RP::Markdown, @RP.can_parse('foo.md')
-      FileUtils.touch 'foo.md.ja'
-      assert_equal @RP::Markdown, @RP.can_parse('foo.md.ja')
-
-      FileUtils.touch 'foo.markdown'
-      assert_equal @RP::Markdown, @RP.can_parse('foo.markdown')
-      FileUtils.touch 'foo.markdown.ja'
-      assert_equal @RP::Markdown, @RP.can_parse('foo.markdown.ja')
-    end
-  end
-
-  def test_scan
-    parser = util_parser 'it *really* works'
-
-    expected =
-      @RM::Document.new(
-        @RM::Paragraph.new('it _really_ works'))
-    expected.file = @top_level
-
-    parser.scan
-
-    assert_equal expected, @top_level.comment.parse
-  end
-
-  def util_parser content
-    RDoc::Parser::Markdown.new @top_level, @fn, content, @options, @stats
-  end
-
-end
diff --git a/test/rdoc/test_rdoc_parser_rd.rb b/test/rdoc/test_rdoc_parser_rd.rb
deleted file mode 100644
index 48663e6d7d791d..00000000000000
--- a/test/rdoc/test_rdoc_parser_rd.rb
+++ /dev/null
@@ -1,55 +0,0 @@
-# frozen_string_literal: true
-require_relative 'helper'
-
-class TestRDocParserRd < RDoc::TestCase
-
-  def setup
-    super
-
-    @RP = RDoc::Parser
-
-    @tempfile = Tempfile.new self.class.name
-    filename = @tempfile.path
-
-    @top_level = @store.add_file filename
-    @fn = filename
-    @options = RDoc::Options.new
-    @stats = RDoc::Stats.new @store, 0
-  end
-
-  def teardown
-    super
-
-    @tempfile.close!
-  end
-
-  def test_file
-    assert_kind_of RDoc::Parser::Text, util_parser('')
-  end
-
-  def test_class_can_parse
-    temp_dir do
-      FileUtils.touch 'foo.rd'
-      assert_equal @RP::RD, @RP.can_parse('foo.rd')
-
-      FileUtils.touch 'foo.rd.ja'
-      assert_equal @RP::RD, @RP.can_parse('foo.rd.ja')
-    end
-  end
-
-  def test_scan
-    parser = util_parser 'it ((*really*)) works'
-
-    expected = doc(para('it <em>really</em> works'))
-    expected.file = @top_level
-
-    parser.scan
-
-    assert_equal expected, @top_level.comment.parse
-  end
-
-  def util_parser content
-    RDoc::Parser::RD.new @top_level, @fn, content, @options, @stats
-  end
-
-end
diff --git a/test/rdoc/test_rdoc_parser_ruby.rb b/test/rdoc/test_rdoc_parser_ruby.rb
deleted file mode 100644
index 1f75ba7c6ef2b4..00000000000000
--- a/test/rdoc/test_rdoc_parser_ruby.rb
+++ /dev/null
@@ -1,4376 +0,0 @@
-# frozen_string_literal: true
-
-require_relative 'helper'
-
-class TestRDocParserRuby < RDoc::TestCase
-
-  def setup
-    super
-
-    @tempfile = Tempfile.new self.class.name
-    @filename = @tempfile.path
-
-    # Some tests need two paths.
-    @tempfile2 = Tempfile.new self.class.name
-    @filename2 = @tempfile2.path
-
-    @top_level = @store.add_file @filename
-    @top_level2 = @store.add_file @filename2
-
-    @options = RDoc::Options.new
-    @options.quiet = true
-    @options.option_parser = OptionParser.new
-
-    @comment = RDoc::Comment.new '', @top_level
-
-    @stats = RDoc::Stats.new @store, 0
-  end
-
-  def teardown
-    super
-
-    @tempfile.close!
-    @tempfile2.close!
-  end
-
-  def test_collect_first_comment
-    p = util_parser <<-CONTENT
-# first
-
-# second
-class C; end
-    CONTENT
-
-    comment = p.collect_first_comment
-
-    assert_equal RDoc::Comment.new("# first\n", @top_level), comment
-  end
-
-  def test_collect_first_comment_encoding
-    @options.encoding = Encoding::CP852
-
-    p = util_parser <<-CONTENT
-# first
-
-# second
-class C; end
-    CONTENT
-
-    comment = p.collect_first_comment
-
-    assert_equal Encoding::CP852, comment.text.encoding
-  end
-
-  def test_collect_first_comment_rd_hash
-    parser = util_parser <<-CONTENT
-=begin
-first
-=end
-
-# second
-class C; end
-    CONTENT
-
-    comment = parser.collect_first_comment
-
-    assert_equal RDoc::Comment.new("first\n", @top_level), comment
-  end
-
-  def test_get_class_or_module
-    ctxt = RDoc::Context.new
-    ctxt.store = @store
-
-    cont, name_t, given_name = util_parser('A')    .get_class_or_module ctxt
-
-    assert_equal ctxt, cont
-    assert_equal 'A', name_t[:text]
-    assert_equal 'A', given_name
-
-    cont, name_t, given_name = util_parser('B::C') .get_class_or_module ctxt
-
-    b = @store.find_module_named('B')
-    assert_equal b, cont
-    assert_equal [@top_level], b.in_files
-    assert_equal 'C', name_t[:text]
-    assert_equal 'B::C', given_name
-
-    cont, name_t, given_name = util_parser('D:: E').get_class_or_module ctxt
-
-    assert_equal @store.find_module_named('D'), cont
-    assert_equal 'E', name_t[:text]
-    assert_equal 'D::E', given_name
-
-    assert_nothing_raised do
-      util_parser("A::\nB").get_class_or_module ctxt
-    end
-  end
-
-  def test_get_class_or_module_document_children
-    ctxt = @top_level.add_class RDoc::NormalClass, 'A'
-    ctxt.stop_doc
-
-    util_parser('B::C').get_class_or_module ctxt
-
-    b = @store.find_module_named('A::B')
-    assert b.ignored?
-
-    d = @top_level.add_class RDoc::NormalClass, 'A::D'
-
-    util_parser('D::E').get_class_or_module ctxt
-
-    refute d.ignored?
-  end
-
-  def test_get_class_or_module_ignore_constants
-    ctxt = RDoc::Context.new
-    ctxt.store = @store
-
-    util_parser('A')   .get_class_or_module ctxt, true
-    util_parser('A::B').get_class_or_module ctxt, true
-
-    assert_empty ctxt.constants
-    assert_empty @store.modules_hash.keys
-    assert_empty @store.classes_hash.keys
-  end
-
-  def test_get_class_specification
-    assert_equal 'A',    util_parser('A')   .get_class_specification
-    assert_equal 'A::B', util_parser('A::B').get_class_specification
-    assert_equal '::A',  util_parser('::A').get_class_specification
-
-    assert_equal 'self', util_parser('self').get_class_specification
-
-    assert_equal '',     util_parser('').get_class_specification
-
-    assert_equal '',     util_parser('$g').get_class_specification
-  end
-
-  def test_get_symbol_or_name
-    util_parser "* & | + 5 / 4"
-
-    assert_equal '*', @parser.get_symbol_or_name
-
-    @parser.skip_tkspace
-
-    assert_equal '&', @parser.get_symbol_or_name
-
-    @parser.skip_tkspace
-
-    assert_equal '|', @parser.get_symbol_or_name
-
-    @parser.skip_tkspace
-
-    assert_equal '+', @parser.get_symbol_or_name
-
-    @parser.skip_tkspace
-    @parser.get_tk
-    @parser.skip_tkspace
-
-    assert_equal '/', @parser.get_symbol_or_name
-  end
-
-  def test_suppress_parents
-    a = @top_level.add_class RDoc::NormalClass, 'A'
-    b = a.add_class RDoc::NormalClass, 'B'
-    c = b.add_class RDoc::NormalClass, 'C'
-
-    util_parser ''
-
-    @parser.suppress_parents c, a
-
-    assert c.suppressed?
-    assert b.suppressed?
-    refute a.suppressed?
-  end
-
-  def test_suppress_parents_documented
-    a = @top_level.add_class RDoc::NormalClass, 'A'
-    b = a.add_class RDoc::NormalClass, 'B'
-    b.add_comment RDoc::Comment.new("hello"), @top_level
-    c = b.add_class RDoc::NormalClass, 'C'
-
-    util_parser ''
-
-    @parser.suppress_parents c, a
-
-    assert c.suppressed?
-    refute b.suppressed?
-    refute a.suppressed?
-  end
-
-  def test_look_for_directives_in_attr
-    util_parser ""
-
-    comment = RDoc::Comment.new "# :attr: my_attr\n", @top_level
-
-    @parser.look_for_directives_in @top_level, comment
-
-    assert_equal "# :attr: my_attr\n", comment.text
-
-    comment = RDoc::Comment.new "# :attr_reader: my_method\n", @top_level
-
-    @parser.look_for_directives_in @top_level, comment
-
-    assert_equal "# :attr_reader: my_method\n", comment.text
-
-    comment = RDoc::Comment.new "# :attr_writer: my_method\n", @top_level
-
-    @parser.look_for_directives_in @top_level, comment
-
-    assert_equal "# :attr_writer: my_method\n", comment.text
-  end
-
-  def test_look_for_directives_in_commented
-    util_parser ""
-
-    comment = RDoc::Comment.new <<-COMMENT, @top_level
-# how to make a section:
-# # :section: new section
-    COMMENT
-
-    @parser.look_for_directives_in @top_level, comment
-
-    section = @top_level.current_section
-    assert_nil   section.title
-    assert_nil   section.comment
-
-    assert_equal "# how to make a section:\n# # :section: new section\n",
-                 comment.text
-  end
-
-  def test_look_for_directives_in_method
-    util_parser ""
-
-    comment = RDoc::Comment.new "# :method: my_method\n", @top_level
-
-    @parser.look_for_directives_in @top_level, comment
-
-    assert_equal "# :method: my_method\n", comment.text
-
-    comment = RDoc::Comment.new "# :singleton-method: my_method\n", @top_level
-
-    @parser.look_for_directives_in @top_level, comment
-
-    assert_equal "# :singleton-method: my_method\n", comment.text
-  end
-
-  def test_look_for_directives_in_section
-    util_parser ""
-
-    comment = RDoc::Comment.new <<-COMMENT, @top_level
-# :section: new section
-# woo stuff
-    COMMENT
-
-    @parser.look_for_directives_in @top_level, comment
-
-    section = @top_level.current_section
-    assert_equal 'new section', section.title
-    assert_equal [comment("# woo stuff\n", @top_level)], section.comments
-
-    assert_empty comment
-  end
-
-  def test_look_for_directives_in_unhandled
-    util_parser ""
-
-    comment = RDoc::Comment.new "# :unhandled: blah\n", @top_level
-
-    @parser.look_for_directives_in @top_level, comment
-
-    assert_equal 'blah', @top_level.metadata['unhandled']
-  end
-
-  def test_parse_for_in
-    klass = RDoc::NormalClass.new 'Foo'
-    klass.parent = @top_level
-
-    comment = RDoc::Comment.new '', @top_level
-
-    util_parser <<ruby
-def sum(n)
-  result = 0
-  for i in 1..n do
-    result += i
-  end
-  result
-end
-ruby
-
-    tk = @parser.get_tk
-
-    @parser.parse_method klass, RDoc::Parser::Ruby::NORMAL, tk, comment
-
-    sum = klass.method_list.first
-    assert_equal 'sum',      sum.name
-    assert_equal @top_level, sum.file
-  end
-
-  def test_parse_on_ignored_nl_with_nil_text
-    util_parser <<ruby
-class Foo
-  def meth
-    variable # comment
-      .chain
-  end
-end
-ruby
-
-    expected = <<EXPECTED
-<span class="ruby-keyword">def</span> <span class="ruby-identifier ruby-title">meth</span>
-  <span class="ruby-identifier">variable</span> <span class="ruby-comment"># comment</span>
-    .<span class="ruby-identifier">chain</span>
-<span class="ruby-keyword">end</span>
-EXPECTED
-    expected = expected.rstrip
-
-    @parser.scan
-
-    foo = @store.find_class_named 'Foo'
-    meth = foo.method_list.first
-
-    assert_equal 'meth',     meth.name
-    assert_equal @top_level, meth.file
-
-    markup_code = meth.markup_code.sub(/^.*\n/, '')
-    assert_equal expected, markup_code
-  end
-
-  def test_parse_redefined_op_with_constant
-    klass = RDoc::NormalClass.new 'Foo'
-    klass.parent = @top_level
-
-    comment = RDoc::Comment.new '', @top_level
-
-    util_parser <<ruby
-def meth
-  Integer::**()
-  return Integer::**()
-  break Integer::**()
-  case Integer::**()
-  when Integer::**()
-  end
-  while Integer::**()
-  end
-  yield Integer::**()
-  defined? Integer::**()
-  if Integer::**()
-  end
-end
-ruby
-
-    tk = @parser.get_tk
-
-    @parser.parse_method klass, RDoc::Parser::Ruby::NORMAL, tk, comment
-
-    meth = klass.method_list.first
-    assert_equal 'meth',     meth.name
-  end
-
-  def test_parse_alias
-    klass = RDoc::NormalClass.new 'Foo'
-    klass.parent = @top_level
-
-    util_parser "alias :next= :bar"
-
-    tk = @parser.get_tk
-
-    alas = @parser.parse_alias klass, RDoc::Parser::Ruby::NORMAL, tk, 'comment'
-
-    assert_equal 'bar',      alas.old_name
-    assert_equal 'next=',    alas.new_name
-    assert_equal klass,      alas.parent
-    assert_equal 'comment',  alas.comment
-    assert_equal @top_level, alas.file
-    assert_equal 1,          alas.line
-  end
-
-  def test_parse_alias_singleton
-    klass = RDoc::NormalClass.new 'Foo'
-    klass.parent = @top_level
-
-    util_parser "alias :next= :bar"
-
-    tk = @parser.get_tk
-
-    alas = @parser.parse_alias klass, RDoc::Parser::Ruby::SINGLE, tk, 'comment'
-
-    assert_equal 'bar',      alas.old_name
-    assert_equal 'next=',    alas.new_name
-    assert_equal klass,      alas.parent
-    assert_equal 'comment',  alas.comment
-    assert_equal @top_level, alas.file
-    assert                   alas.singleton
-  end
-
-  def test_parse_alias_stopdoc
-    klass = RDoc::NormalClass.new 'Foo'
-    klass.parent = @top_level
-    klass.stop_doc
-
-    util_parser "alias :next= :bar"
-
-    tk = @parser.get_tk
-
-    @parser.parse_alias klass, RDoc::Parser::Ruby::NORMAL, tk, 'comment'
-
-    assert_empty klass.aliases
-    assert_empty klass.unmatched_alias_lists
-  end
-
-  def test_parse_alias_meta
-    klass = RDoc::NormalClass.new 'Foo'
-    klass.parent = @top_level
-
-    util_parser "alias m.chop m"
-
-    tk = @parser.get_tk
-
-    alas = @parser.parse_alias klass, RDoc::Parser::Ruby::NORMAL, tk, 'comment'
-
-    assert_nil alas
-  end
-
-  def test_parse_attr
-    klass = RDoc::NormalClass.new 'Foo'
-    klass.parent = @top_level
-
-    comment = RDoc::Comment.new "##\n# my attr\n", @top_level, :ruby
-
-    util_parser "attr :foo, :bar"
-
-    tk = @parser.get_tk
-
-    @parser.parse_attr klass, RDoc::Parser::Ruby::NORMAL, tk, comment
-
-    assert_equal 1, klass.attributes.length
-
-    foo = klass.attributes.first
-    assert_equal 'foo', foo.name
-    assert_equal 'my attr', foo.comment.text
-    assert_equal @top_level, foo.file
-    assert_equal 1, foo.line
-  end
-
-  def test_parse_attr_stopdoc
-    klass = RDoc::NormalClass.new 'Foo'
-    klass.parent = @top_level
-    klass.stop_doc
-
-    comment = RDoc::Comment.new "##\n# my attr\n", @top_level
-
-    util_parser "attr :foo, :bar"
-
-    tk = @parser.get_tk
-
-    @parser.parse_attr klass, RDoc::Parser::Ruby::NORMAL, tk, comment
-
-    assert_empty klass.attributes
-  end
-
-  def test_parse_attr_accessor
-    klass = RDoc::NormalClass.new 'Foo'
-    klass.parent = @top_level
-
-    comment = RDoc::Comment.new "##\n# my attr\n", @top_level, :ruby
-
-    util_parser "attr_accessor :foo, :bar"
-
-    tk = @parser.get_tk
-
-    @parser.parse_attr_accessor klass, RDoc::Parser::Ruby::NORMAL, tk, comment
-
-    assert_equal 2, klass.attributes.length
-
-    foo = klass.attributes.first
-    assert_equal 'foo', foo.name
-    assert_equal 'RW', foo.rw
-    assert_equal 'my attr', foo.comment.text
-    assert_equal @top_level, foo.file
-    assert_equal 1, foo.line
-
-    bar = klass.attributes.last
-    assert_equal 'bar', bar.name
-    assert_equal 'RW', bar.rw
-    assert_equal 'my attr', bar.comment.text
-  end
-
-  def test_parse_attr_accessor_with_newline
-    klass = RDoc::NormalClass.new 'Foo'
-    klass.parent = @top_level
-
-    comment = RDoc::Comment.new "##\n# my attr\n", @top_level, :ruby
-
-    util_parser "attr_accessor :foo, :bar,\n  :baz,\n  :qux"
-
-    tk = @parser.get_tk
-
-    @parser.parse_attr_accessor klass, RDoc::Parser::Ruby::NORMAL, tk, comment
-
-    assert_equal 4, klass.attributes.length
-
-    foo = klass.attributes[0]
-    assert_equal 'foo', foo.name
-    assert_equal 'RW', foo.rw
-    assert_equal 'my attr', foo.comment.text
-    assert_equal @top_level, foo.file
-    assert_equal 1, foo.line
-
-    bar = klass.attributes[1]
-    assert_equal 'bar', bar.name
-    assert_equal 'RW', bar.rw
-    assert_equal 'my attr', bar.comment.text
-
-    bar = klass.attributes[2]
-    assert_equal 'baz', bar.name
-    assert_equal 'RW', bar.rw
-    assert_equal 'my attr', bar.comment.text
-
-    bar = klass.attributes[3]
-    assert_equal 'qux', bar.name
-    assert_equal 'RW', bar.rw
-    assert_equal 'my attr', bar.comment.text
-  end
-
-  def test_parse_attr_accessor_nodoc
-    klass = RDoc::NormalClass.new 'Foo'
-    klass.parent = @top_level
-
-    comment = RDoc::Comment.new "##\n# my attr\n", @top_level
-
-    util_parser "attr_accessor :foo, :bar # :nodoc:"
-
-    tk = @parser.get_tk
-
-    @parser.parse_attr_accessor klass, RDoc::Parser::Ruby::NORMAL, tk, comment
-
-    assert_equal 0, klass.attributes.length
-  end
-
-  def test_parse_attr_accessor_nodoc_track
-    klass = RDoc::NormalClass.new 'Foo'
-    klass.parent = @top_level
-
-    comment = RDoc::Comment.new "##\n# my attr\n", @top_level
-
-    @options.visibility = :nodoc
-
-    util_parser "attr_accessor :foo, :bar # :nodoc:"
-
-    tk = @parser.get_tk
-
-    @parser.parse_attr_accessor klass, RDoc::Parser::Ruby::NORMAL, tk, comment
-
-    refute_empty klass.attributes
-  end
-
-  def test_parse_attr_accessor_stopdoc
-    klass = RDoc::NormalClass.new 'Foo'
-    klass.parent = @top_level
-    klass.stop_doc
-
-    comment = RDoc::Comment.new "##\n# my attr\n", @top_level
-
-    util_parser "attr_accessor :foo, :bar"
-
-    tk = @parser.get_tk
-
-    @parser.parse_attr_accessor klass, RDoc::Parser::Ruby::NORMAL, tk, comment
-
-    assert_empty klass.attributes
-  end
-
-  def test_parse_attr_accessor_writer
-    klass = RDoc::NormalClass.new 'Foo'
-    klass.parent = @top_level
-
-    comment = RDoc::Comment.new "##\n# my attr\n", @top_level, :ruby
-
-    util_parser "attr_writer :foo, :bar"
-
-    tk = @parser.get_tk
-
-    @parser.parse_attr_accessor klass, RDoc::Parser::Ruby::NORMAL, tk, comment
-
-    assert_equal 2, klass.attributes.length
-
-    foo = klass.attributes.first
-    assert_equal 'foo', foo.name
-    assert_equal 'W', foo.rw
-    assert_equal "my attr", foo.comment.text
-    assert_equal @top_level, foo.file
-
-    bar = klass.attributes.last
-    assert_equal 'bar', bar.name
-    assert_equal 'W', bar.rw
-    assert_equal "my attr", bar.comment.text
-  end
-
-  def test_parse_meta_attr
-    klass = RDoc::NormalClass.new 'Foo'
-    klass.parent = @top_level
-
-    comment = RDoc::Comment.new "##\n# :attr: \n# my method\n", @top_level, :ruby
-
-    util_parser "add_my_method :foo, :bar"
-
-    tk = @parser.get_tk
-
-    @parser.parse_meta_attr klass, RDoc::Parser::Ruby::NORMAL, tk, comment
-
-    assert_equal 2, klass.attributes.length
-    foo = klass.attributes.first
-    assert_equal 'foo', foo.name
-    assert_equal 'RW', foo.rw
-    assert_equal "my method", foo.comment.text
-    assert_equal @top_level, foo.file
-  end
-
-  def test_parse_meta_attr_accessor
-    klass = RDoc::NormalClass.new 'Foo'
-    klass.parent = @top_level
-
-    comment =
-      RDoc::Comment.new "##\n# :attr_accessor: \n# my method\n", @top_level, :ruby
-
-    util_parser "add_my_method :foo, :bar"
-
-    tk = @parser.get_tk
-
-    @parser.parse_meta_attr klass, RDoc::Parser::Ruby::NORMAL, tk, comment
-
-    assert_equal 2, klass.attributes.length
-    foo = klass.attributes.first
-    assert_equal 'foo', foo.name
-    assert_equal 'RW', foo.rw
-    assert_equal 'my method', foo.comment.text
-    assert_equal @top_level, foo.file
-  end
-
-  def test_parse_meta_attr_named
-    klass = RDoc::NormalClass.new 'Foo'
-    klass.parent = @top_level
-
-    comment = RDoc::Comment.new "##\n# :attr: foo\n# my method\n", @top_level, :ruby
-
-    util_parser "add_my_method :foo, :bar"
-
-    tk = @parser.get_tk
-
-    @parser.parse_meta_attr klass, RDoc::Parser::Ruby::NORMAL, tk, comment
-
-    assert_equal 1, klass.attributes.length
-    foo = klass.attributes.first
-    assert_equal 'foo', foo.name
-    assert_equal 'RW', foo.rw
-    assert_equal 'my method', foo.comment.text
-    assert_equal @top_level, foo.file
-  end
-
-  def test_parse_meta_attr_reader
-    klass = RDoc::NormalClass.new 'Foo'
-    klass.parent = @top_level
-
-    comment =
-      RDoc::Comment.new "##\n# :attr_reader: \n# my method\n", @top_level, :ruby
-
-    util_parser "add_my_method :foo, :bar"
-
-    tk = @parser.get_tk
-
-    @parser.parse_meta_attr klass, RDoc::Parser::Ruby::NORMAL, tk, comment
-
-    foo = klass.attributes.first
-    assert_equal 'foo', foo.name
-    assert_equal 'R', foo.rw
-    assert_equal 'my method', foo.comment.text
-    assert_equal @top_level, foo.file
-  end
-
-  def test_parse_meta_attr_stopdoc
-    klass = RDoc::NormalClass.new 'Foo'
-    klass.parent = @top_level
-    klass.stop_doc
-
-    comment = RDoc::Comment.new "##\n# :attr: \n# my method\n", @top_level
-
-    util_parser "add_my_method :foo, :bar"
-
-    tk = @parser.get_tk
-
-    @parser.parse_meta_attr klass, RDoc::Parser::Ruby::NORMAL, tk, comment
-
-    assert_empty klass.attributes
-  end
-
-  def test_parse_meta_attr_writer
-    klass = RDoc::NormalClass.new 'Foo'
-    klass.parent = @top_level
-
-    comment =
-      RDoc::Comment.new "##\n# :attr_writer: \n# my method\n", @top_level, :ruby
-
-    util_parser "add_my_method :foo, :bar"
-
-    tk = @parser.get_tk
-
-    @parser.parse_meta_attr klass, RDoc::Parser::Ruby::NORMAL, tk, comment
-
-    foo = klass.attributes.first
-    assert_equal 'foo', foo.name
-    assert_equal 'W', foo.rw
-    assert_equal "my method", foo.comment.text
-    assert_equal @top_level, foo.file
-  end
-
-  def test_parse_class
-    comment = RDoc::Comment.new "##\n# my class\n", @top_level, :ruby
-
-    util_parser "class Foo\nend"
-
-    tk = @parser.get_tk
-
-    @parser.parse_class @top_level, RDoc::Parser::Ruby::NORMAL, tk, comment
-
-    foo = @top_level.classes.first
-    assert_equal 'Foo', foo.full_name
-    assert_equal 'my class', foo.comment.text
-    assert_equal [@top_level], foo.in_files
-    assert_equal 1, foo.line
-  end
-
-  def test_parse_class_singleton
-    comment = RDoc::Comment.new "##\n# my class\n", @top_level
-
-    util_parser <<-RUBY
-class C
-  class << self
-  end
-end
-    RUBY
-
-    tk = @parser.get_tk
-
-    @parser.parse_class @top_level, RDoc::Parser::Ruby::NORMAL, tk, comment
-
-    c = @top_level.classes.first
-    assert_equal 'C', c.full_name
-    assert_equal 1, c.line
-  end
-
-  def test_parse_class_ghost_method
-    util_parser <<-CLASS
-class Foo
-  ##
-  # :method: blah
-  # my method
-end
-    CLASS
-
-    tk = @parser.get_tk
-
-    @parser.parse_class @top_level, RDoc::Parser::Ruby::NORMAL, tk, @comment
-
-    foo = @top_level.classes.first
-    assert_equal 'Foo', foo.full_name
-
-    blah = foo.method_list.first
-    assert_equal 'Foo#blah', blah.full_name
-    assert_equal 3, blah.line
-    assert_equal @top_level, blah.file
-  end
-
-  def test_parse_class_in_a_file_repeatedly
-    @filename = 'a.rb'
-    comment_a = RDoc::Comment.new "# aaa\n", @top_level
-    util_parser "class Foo\nend"
-    tk = @parser.get_tk
-    @parser.parse_class @top_level, RDoc::Parser::Ruby::NORMAL, tk, comment_a
-    comment_b = RDoc::Comment.new "# bbb\n", @top_level
-    util_parser "class Foo\nend"
-    tk = @parser.get_tk
-    @parser.parse_class @top_level, RDoc::Parser::Ruby::NORMAL, tk, comment_b
-
-    @filename = 'b.rb'
-    comment_c = RDoc::Comment.new "# ccc\n", @top_level
-    util_parser "class Foo\nend"
-    tk = @parser.get_tk
-    @parser.parse_class @top_level, RDoc::Parser::Ruby::NORMAL, tk, comment_c
-
-    foo = @top_level.classes.first
-    assert_equal 'Foo', foo.full_name
-    assert_equal [[comment_a, @top_level],
-                  [comment_b, @top_level],
-                  [comment_c, @top_level]], foo.comment_location
-    assert_equal [@top_level], foo.in_files
-    assert_equal 1, foo.line
-  end
-
-  def test_parse_class_ghost_method_yields
-    util_parser <<-CLASS
-class Foo
-  ##
-  # :method:
-  # :call-seq:
-  #   yields(name)
-end
-    CLASS
-
-    tk = @parser.get_tk
-
-    @parser.parse_class @top_level, RDoc::Parser::Ruby::NORMAL, tk, @comment
-
-    foo = @top_level.classes.first
-    assert_equal 'Foo', foo.full_name
-
-    blah = foo.method_list.first
-    assert_equal 'Foo#yields', blah.full_name
-    assert_equal 'yields(name)', blah.call_seq
-    assert_equal 3, blah.line
-    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
-  ##
-  # :method: one
-  #
-  # my method
-
-  ##
-  # :method: two
-  #
-  # my method
-
-  [:one, :two].each do |t|
-    eval("def #{t}; \"#{t}\"; end")
-  end
-end
-    CLASS
-
-    tk = @parser.get_tk
-
-    @parser.parse_class @top_level, RDoc::Parser::Ruby::NORMAL, tk, @comment
-
-    foo = @top_level.classes.first
-    assert_equal 'Foo', foo.full_name
-
-    assert_equal 2, foo.method_list.length
-  end
-
-  def test_parse_class_nodoc
-    comment = RDoc::Comment.new "##\n# my class\n", @top_level
-
-    util_parser "class Foo # :nodoc:\nend"
-
-    tk = @parser.get_tk
-
-    @parser.parse_class @top_level, RDoc::Parser::Ruby::NORMAL, tk, comment
-
-    foo = @top_level.classes.first
-    assert_equal 'Foo', foo.full_name
-    assert_empty foo.comment
-    assert_equal [@top_level], foo.in_files
-    assert_equal 1, foo.line
-  end
-
-  def test_parse_class_single_root
-    comment = RDoc::Comment.new "##\n# my class\n", @top_level
-
-    util_parser "class << ::Foo\nend"
-
-    tk = @parser.get_tk
-
-    @parser.parse_class @top_level, RDoc::Parser::Ruby::NORMAL, tk, comment
-
-    foo = @store.all_modules.first
-    assert_equal 'Foo', foo.full_name
-  end
-
-  def test_parse_class_stopdoc
-    @top_level.stop_doc
-
-    comment = RDoc::Comment.new "##\n# my class\n", @top_level
-
-    util_parser "class Foo\nend"
-
-    tk = @parser.get_tk
-
-    @parser.parse_class @top_level, RDoc::Parser::Ruby::NORMAL, tk, comment
-
-    assert_empty @top_level.classes.first.comment
-  end
-
-  def test_parse_class_lower_name_warning
-    @options.verbosity = 2
-    stds = capture_output do
-      util_parser "class foo\nend"
-      tk = @parser.get_tk
-      @parser.parse_class @top_level, RDoc::Parser::Ruby::NORMAL, tk, @comment
-    end
-    err = stds[1]
-    assert_match(/Expected class name or '<<\'\. Got/, err)
-  end
-
-  def test_parse_syntax_error_code
-    @options.verbosity = 2
-    stds = capture_output do
-      begin
-        util_parser <<INVALID_CODE
-# invalid class name
-class Invalid::@@Code
-end
-INVALID_CODE
-        @parser.scan
-      rescue
-      end
-    end
-    err = stds[1]
-
-    expected = <<EXPECTED
-RDoc::Parser::Ruby failure around line 2 of
-#{@filename}
-
-class Invalid::@@Code
-EXPECTED
-
-    assert_match(expected, err)
-  end
-
-  def test_parse_multi_ghost_methods
-    util_parser <<-'CLASS'
-class Foo
-  ##
-  # :method: one
-  #
-  # my method
-
-  ##
-  # :method: two
-  #
-  # my method
-
-  [:one, :two].each do |t|
-    eval("def #{t}; \"#{t}\"; end")
-  end
-end
-    CLASS
-
-    tk = @parser.get_tk
-
-    @parser.parse_class @top_level, RDoc::Parser::Ruby::NORMAL, tk, @comment
-
-    foo = @top_level.classes.first
-    assert_equal 'Foo', foo.full_name
-
-    assert_equal 2, foo.method_list.length
-  end
-
-  def test_parse_const_fail_w_meta
-    util_parser <<-CLASS
-class ConstFailMeta
-  ##
-  # :attr: one
-  #
-  # an attribute
-
-  OtherModule.define_attr(self, :one)
-end
-    CLASS
-
-    tk = @parser.get_tk
-
-    @parser.parse_class @top_level, RDoc::Parser::Ruby::NORMAL, tk, @comment
-
-    const_fail_meta = @top_level.classes.first
-    assert_equal 'ConstFailMeta', const_fail_meta.full_name
-
-    assert_equal 1, const_fail_meta.attributes.length
-  end
-
-  def test_parse_class_nested_superclass
-    foo = @top_level.add_module RDoc::NormalModule, 'Foo'
-
-    util_parser "class Bar < Super\nend"
-
-    tk = @parser.get_tk
-
-    @parser.parse_class foo, RDoc::Parser::Ruby::NORMAL, tk, @comment
-
-    bar = foo.classes.first
-    assert_equal 'Super', bar.superclass
-  end
-
-  def test_parse_module
-    comment = RDoc::Comment.new "##\n# my module\n", @top_level, :ruby
-
-    util_parser "module Foo\nend"
-
-    tk = @parser.get_tk
-
-    @parser.parse_module @top_level, RDoc::Parser::Ruby::NORMAL, tk, comment
-
-    foo = @top_level.modules.first
-    assert_equal 'Foo', foo.full_name
-    assert_equal 'my module', foo.comment.text
-  end
-
-  def test_parse_module_nodoc
-    @top_level.stop_doc
-
-    comment = RDoc::Comment.new "##\n# my module\n", @top_level
-
-    util_parser "module Foo # :nodoc:\nend"
-
-    tk = @parser.get_tk
-
-    @parser.parse_module @top_level, RDoc::Parser::Ruby::NORMAL, tk, comment
-
-    foo = @top_level.modules.first
-    assert_equal 'Foo', foo.full_name
-    assert_empty foo.comment
-  end
-
-  def test_parse_module_stopdoc
-    @top_level.stop_doc
-
-    comment = RDoc::Comment.new "##\n# my module\n", @top_level
-
-    util_parser "module Foo\nend"
-
-    tk = @parser.get_tk
-
-    @parser.parse_module @top_level, RDoc::Parser::Ruby::NORMAL, tk, comment
-
-    foo = @top_level.modules.first
-    assert_equal 'Foo', foo.full_name
-    assert_empty foo.comment
-  end
-
-  def test_parse_class_colon3
-    code = <<-CODE
-class A
-  class ::B
-  end
-end
-    CODE
-
-    util_parser code
-
-    @parser.parse_class @top_level, false, @parser.get_tk, @comment
-
-    assert_equal %w[A B], @store.all_classes.map { |c| c.full_name }.sort
-  end
-
-  def test_parse_class_colon3_self_reference
-    code = <<-CODE
-class A::B
-  class ::A
-  end
-end
-    CODE
-
-    util_parser code
-
-    @parser.parse_class @top_level, false, @parser.get_tk, @comment
-
-    assert_equal %w[A A::B], @store.all_classes.map { |c| c.full_name }.sort
-  end
-
-  def test_parse_class_single
-    code = <<-CODE
-class A
-  class << B
-  end
-  class << d = Object.new
-    def foo; end
-    alias bar foo
-  end
-end
-    CODE
-
-    util_parser code
-
-    @parser.parse_class @top_level, false, @parser.get_tk, @comment
-
-    assert_equal %w[A], @store.all_classes.map { |c| c.full_name }
-
-    modules = @store.all_modules.sort_by { |c| c.full_name }
-    assert_equal %w[A::B A::d], modules.map { |c| c.full_name }
-
-    b = modules.first
-    assert_equal 2,  b.line
-
-    # make sure method/alias was not added to enclosing class/module
-    a = @store.classes_hash['A']
-    assert_empty a.method_list
-
-    # make sure non-constant-named module will be removed from documentation
-    d = @store.modules_hash['A::d']
-    assert d.remove_from_documentation?
-  end
-
-  def test_parse_class_single_gvar
-    code = <<-CODE
-class << $g
-  def m
-  end
-end
-    CODE
-
-    util_parser code
-
-    @parser.parse_class @top_level, false, @parser.get_tk, ''
-
-    assert_empty @store.all_classes
-    mod = @store.all_modules.first
-
-    refute mod.document_self
-
-    assert_empty mod.method_list
-  end
-
-  # TODO this is really a Context#add_class test
-  def test_parse_class_object
-    code = <<-CODE
-module A
-  class B
-  end
-  class Object
-  end
-  class C < Object
-  end
-end
-    CODE
-
-    util_parser code
-
-    @parser.parse_module @top_level, false, @parser.get_tk, @comment
-
-    assert_equal %w[A],
-      @store.all_modules.map { |c| c.full_name }
-    assert_equal %w[A::B A::C A::Object],
-      @store.all_classes.map { |c| c.full_name }.sort
-
-    assert_equal 'Object',    @store.classes_hash['A::B'].superclass
-    assert_equal 'Object',    @store.classes_hash['A::Object'].superclass
-    assert_equal 'A::Object', @store.classes_hash['A::C'].superclass.full_name
-  end
-
-  def test_parse_class_mistaken_for_module
-    # The code below is not strictly legal Ruby (Foo must have been defined
-    # before Foo::Bar is encountered), but RDoc might encounter Foo::Bar
-    # before Foo if they live in different files.
-
-    code = <<-RUBY
-class Foo::Bar
-end
-
-module Foo::Baz
-end
-
-class Foo
-end
-    RUBY
-
-    util_parser code
-
-    @parser.scan
-
-    assert_equal %w[Foo::Baz], @store.modules_hash.keys
-    assert_empty @top_level.modules
-
-    foo = @top_level.classes.first
-    assert_equal 'Foo', foo.full_name
-
-    bar = foo.classes.first
-    assert_equal 'Foo::Bar', bar.full_name
-
-    baz = foo.modules.first
-    assert_equal 'Foo::Baz', baz.full_name
-  end
-
-  def test_parse_class_definition_encountered_after_class_reference
-    # The code below is not legal Ruby (Foo must have been defined before
-    # Foo.bar is encountered), but RDoc might encounter Foo.bar before Foo if
-    # they live in different files.
-
-    code = <<-EOF
-def Foo.bar
-end
-
-class Foo < IO
-end
-    EOF
-
-    util_parser code
-
-    @parser.scan
-
-    assert_empty @store.modules_hash
-    assert_empty @store.all_modules
-
-    foo = @top_level.classes.first
-    assert_equal 'Foo', foo.full_name
-    assert_equal 'IO', foo.superclass
-
-    bar = foo.method_list.first
-    assert_equal 'bar', bar.name
-  end
-
-  def test_parse_module_relative_to_top_level_namespace
-    comment = RDoc::Comment.new <<-EOF, @top_level
-#
-# Weirdly named module
-#
-EOF
-
-    code = <<-EOF
-#{comment.text}
-module ::Foo
-  class Helper
-  end
-end
-EOF
-
-    util_parser code
-    @parser.scan()
-
-    foo = @top_level.modules.first
-    assert_equal 'Foo', foo.full_name
-    assert_equal 'Weirdly named module', foo.comment.text
-
-    helper = foo.classes.first
-    assert_equal 'Foo::Helper', helper.full_name
-  end
-
-  def test_parse_comment_attr
-    klass = RDoc::NormalClass.new 'Foo'
-    klass.parent = @top_level
-
-    comment = RDoc::Comment.new "##\n# :attr: foo\n# my attr\n", @top_level, :ruby
-
-    util_parser "\n"
-
-    tk = @parser.get_tk
-
-    @parser.parse_comment klass, tk, comment
-
-    foo = klass.attributes.first
-    assert_equal 'foo',      foo.name
-    assert_equal 'RW',       foo.rw
-    assert_equal 'my attr',  foo.comment.text
-    assert_equal @top_level, foo.file
-    assert_equal 1,          foo.line
-
-    assert_nil               foo.viewer
-    assert_equal true,       foo.document_children
-    assert_equal true,       foo.document_self
-    assert_equal false,      foo.done_documenting
-    assert_equal false,      foo.force_documentation
-    assert_equal klass,      foo.parent
-    assert_equal :public,    foo.visibility
-    assert_equal "\n",       foo.text
-
-    assert_equal klass.current_section, foo.section
-  end
-
-  def test_parse_comment_attr_attr_reader
-    klass = RDoc::NormalClass.new 'Foo'
-    klass.parent = @top_level
-
-    comment = RDoc::Comment.new "##\n# :attr_reader: foo\n", @top_level
-
-    util_parser "\n"
-
-    tk = @parser.get_tk
-
-    @parser.parse_comment klass, tk, comment
-
-    foo = klass.attributes.first
-    assert_equal 'foo',      foo.name
-    assert_equal 'R',        foo.rw
-  end
-
-  def test_parse_comment_attr_stopdoc
-    klass = RDoc::NormalClass.new 'Foo'
-    klass.parent = @top_level
-    klass.stop_doc
-
-    comment = RDoc::Comment.new "##\n# :attr: foo\n# my attr\n", @top_level
-
-    util_parser "\n"
-
-    tk = @parser.get_tk
-
-    @parser.parse_comment klass, tk, comment
-
-    assert_empty klass.attributes
-  end
-
-  def test_parse_comment_method
-    klass = RDoc::NormalClass.new 'Foo'
-    klass.parent = @top_level
-
-    comment = RDoc::Comment.new "##\n# :method: foo\n# my method\n", @top_level, :ruby
-
-    util_parser "\n"
-
-    tk = @parser.get_tk
-
-    @parser.parse_comment klass, tk, comment
-
-    foo = klass.method_list.first
-    assert_equal 'foo',       foo.name
-    assert_equal 'my method', foo.comment.text
-    assert_equal @top_level,  foo.file
-    assert_equal 2,           foo.line
-
-    assert_equal [],          foo.aliases
-    assert_nil                foo.block_params
-    assert_nil                foo.call_seq
-    assert_nil                foo.is_alias_for
-    assert_nil                foo.viewer
-    assert_equal true,        foo.document_children
-    assert_equal true,        foo.document_self
-    assert_equal '',          foo.params
-    assert_equal false,       foo.done_documenting
-    assert_equal false,       foo.dont_rename_initialize
-    assert_equal false,       foo.force_documentation
-    assert_equal klass,       foo.parent
-    assert_equal false,       foo.singleton
-    assert_equal :public,     foo.visibility
-    assert_equal "\n",        foo.text
-    assert_equal klass.current_section, foo.section
-
-    stream = [
-      {
-        :line_no => 2, :char_no => 1, :kind => :on_comment,
-        :text => "# File #{@top_level.relative_name}, line 2"
-      },
-      { :line_no => 0, :char_no => 0, :kind => :on_nl, :text => "\n" },
-      { :line_no => 1, :char_no => 1, :kind => :on_sp, :text => '' }
-    ]
-    parsed_stream = foo.token_stream.map { |t|
-      {
-        :line_no => t[:line_no],
-        :char_no => t[:char_no],
-        :kind => t[:kind],
-        :text => t[:text]
-      }
-    }
-
-    assert_equal stream, parsed_stream
-  end
-
-  def test_parse_comment_method_args
-    klass = RDoc::NormalClass.new 'Foo'
-    klass.parent = @top_level
-
-
-    util_parser "\n"
-
-    tk = @parser.get_tk
-
-    @parser.parse_comment klass, tk,
-                          comment("##\n# :method: foo\n# :args: a, b\n")
-
-    foo = klass.method_list.first
-    assert_equal 'foo',  foo.name
-    assert_equal 'a, b', foo.params
-  end
-
-  def test_parse_comment_method_stopdoc
-    klass = RDoc::NormalClass.new 'Foo'
-    klass.parent = @top_level
-    klass.stop_doc
-
-    comment = RDoc::Comment.new "##\n# :method: foo\n# my method\n", @top_level
-
-    util_parser "\n"
-
-    tk = @parser.get_tk
-
-    @parser.parse_comment klass, tk, comment
-
-    assert_empty klass.method_list
-  end
-
-  def test_parse_constant
-    klass = @top_level.add_class RDoc::NormalClass, 'Foo'
-
-    util_parser "A = v"
-
-    tk = @parser.get_tk
-
-    @parser.parse_constant klass, tk, @comment
-
-    foo = klass.constants.first
-
-    assert_equal 'A', foo.name
-    assert_equal @top_level, foo.file
-    assert_equal 1, foo.line
-  end
-
-  def test_parse_constant_attrasgn
-    klass = @top_level.add_class RDoc::NormalClass, 'Foo'
-
-    util_parser "A[k] = v"
-
-    tk = @parser.get_tk
-
-    @parser.parse_constant klass, tk, @comment
-
-    assert klass.constants.empty?
-  end
-
-  def test_parse_constant_alias
-    klass = @top_level.add_class RDoc::NormalClass, 'Foo'
-    klass.add_class RDoc::NormalClass, 'B'
-
-    util_parser "A = B"
-
-    tk = @parser.get_tk
-
-    @parser.parse_constant klass, tk, @comment
-
-    assert_equal [], klass.modules.map(&:full_name)
-    assert_equal ['Foo::B', 'Foo::A'], klass.classes.map(&:full_name)
-    assert_equal ['Foo::A'], klass.constants.map(&:full_name)
-    assert_equal 'Foo::A', klass.find_module_named('A').full_name
-  end
-
-  def test_parse_constant_alias_same_name
-    foo = @top_level.add_class RDoc::NormalClass, 'Foo'
-    @top_level.add_class RDoc::NormalClass, 'Bar'
-    bar = foo.add_class RDoc::NormalClass, 'Bar'
-
-    assert @store.find_class_or_module('::Bar')
-
-    util_parser "A = ::Bar"
-
-    tk = @parser.get_tk
-
-    @parser.parse_constant foo, tk, @comment
-
-    assert_equal 'A', bar.find_module_named('A').full_name
-  end
-
-  def test_parse_constant_in_method
-    klass = @top_level.add_class RDoc::NormalClass, 'Foo'
-
-    util_parser 'A::B = v'
-
-    tk = @parser.get_tk
-
-    @parser.parse_constant klass, tk, @comment, true
-
-    assert_empty klass.constants
-
-    assert_empty @store.modules_hash.keys
-    assert_equal %w[Foo], @store.classes_hash.keys
-  end
-
-  def test_parse_constant_rescue
-    klass = @top_level.add_class RDoc::NormalClass, 'Foo'
-
-    util_parser "A => e"
-
-    tk = @parser.get_tk
-
-    @parser.parse_constant klass, tk, @comment
-
-    assert_empty klass.constants
-    assert_empty klass.modules
-
-    assert_empty @store.modules_hash.keys
-    assert_equal %w[Foo], @store.classes_hash.keys
-  end
-
-  def test_parse_constant_stopdoc
-    klass = @top_level.add_class RDoc::NormalClass, 'Foo'
-    klass.stop_doc
-
-    util_parser "A = v"
-
-    tk = @parser.get_tk
-
-    @parser.parse_constant klass, tk, @comment
-
-    assert_empty klass.constants
-  end
-
-  def test_parse_comment_nested
-    content = <<-CONTENT
-A::B::C = 1
-    CONTENT
-
-    util_parser content
-
-    tk = @parser.get_tk
-
-    parsed = @parser.parse_constant @top_level, tk, 'comment'
-
-    assert parsed
-
-    a = @top_level.find_module_named 'A'
-    b = a.find_module_named 'B'
-    c = b.constants.first
-
-    assert_equal 'A::B::C', c.full_name
-    assert_equal 'comment', c.comment
-  end
-
-  def test_parse_class_the_same_of_outside
-    util_parser <<-RUBY
-module A
-  class A::B
-  end
-end
-    RUBY
-
-    @parser.scan
-
-    assert_includes @store.modules_hash, 'A'
-    module_a = @store.find_module_named 'A'
-    refute_empty module_a.classes_hash
-    assert_includes module_a.classes_hash, 'B'
-    refute_includes module_a.classes_hash, 'A'
-  end
-
-  def test_parse_constant_the_same_of_outside
-    util_parser <<-RUBY
-module A
-  class B
-    class C
-    end
-  end
-
-  def self.foo
-    A::B::C
-  end
-end
-    RUBY
-
-    expected = <<EXPECTED
-<span class="ruby-keyword">def</span> <span class="ruby-keyword">self</span>.<span class="ruby-identifier ruby-title">foo</span>
-  <span class="ruby-constant">A</span><span class="ruby-operator">::</span><span class="ruby-constant">B</span><span class="ruby-operator">::</span><span class="ruby-constant">C</span>
-<span class="ruby-keyword">end</span>
-EXPECTED
-    expected = expected.rstrip
-
-    @parser.scan
-
-    module_a = @store.find_module_named 'A'
-    foo = module_a.method_list.first
-    markup_code = foo.markup_code.sub(/^.*\n/, '')
-    assert_equal expected, markup_code
-  end
-
-  def test_parse_constant_with_bracket
-    util_parser <<-RUBY
-class Klass
-end
-
-class Klass2
-  CONSTANT = Klass
-end
-
-class Klass3
-  CONSTANT_2 = {}
-  CONSTANT_2[1] = Klass
-end
-    RUBY
-
-    @parser.scan
-
-    klass = @store.find_class_named 'Klass'
-    klass2 = @store.find_class_named 'Klass2'
-    klass3 = @store.find_class_named 'Klass3'
-    assert_equal klass, klass2.constants.first.is_alias_for
-    refute_equal klass, klass3.constants.first.is_alias_for
-    assert_nil klass3.find_module_named 'CONSTANT_2'
-  end
-
-  def test_parse_extend_or_include_extend
-    klass = RDoc::NormalClass.new 'C'
-    klass.parent = @top_level
-
-    comment = RDoc::Comment.new "# my extend\n", @top_level, :ruby
-
-    util_parser "extend I"
-
-    @parser.get_tk # extend
-
-    @parser.parse_extend_or_include RDoc::Extend, klass, comment
-
-    assert_equal 1, klass.extends.length
-
-    ext = klass.extends.first
-    assert_equal 'I', ext.name
-    assert_equal 'my extend', ext.comment.text
-    assert_equal @top_level, ext.file
-  end
-
-  def test_parse_extend_or_include_include
-    klass = RDoc::NormalClass.new 'C'
-    klass.parent = @top_level
-
-    comment = RDoc::Comment.new "# my include\n", @top_level, :ruby
-
-    util_parser "include I"
-
-    @parser.get_tk # include
-
-    @parser.parse_extend_or_include RDoc::Include, klass, comment
-
-    assert_equal 1, klass.includes.length
-
-    incl = klass.includes.first
-    assert_equal 'I', incl.name
-    assert_equal 'my include', incl.comment.text
-    assert_equal @top_level, incl.file
-  end
-
-  def test_parse_meta_method
-    klass = RDoc::NormalClass.new 'Foo'
-    klass.parent = @top_level
-
-    comment = RDoc::Comment.new "##\n# my method\n", @top_level, :ruby
-
-    util_parser "add_my_method :foo, :bar\nadd_my_method :baz"
-
-    tk = @parser.get_tk
-
-    @parser.parse_meta_method klass, RDoc::Parser::Ruby::NORMAL, tk, comment
-
-    foo = klass.method_list.first
-    assert_equal 'foo',       foo.name
-    assert_equal 'my method', foo.comment.text
-    assert_equal @top_level,  foo.file
-    assert_equal 1,           foo.line
-
-    assert_equal [],      foo.aliases
-    assert_nil            foo.block_params
-    assert_nil            foo.call_seq
-    assert_equal true,    foo.document_children
-    assert_equal true,    foo.document_self
-    assert_equal false,   foo.done_documenting
-    assert_equal false,   foo.dont_rename_initialize
-    assert_equal false,   foo.force_documentation
-    assert_nil            foo.is_alias_for
-    assert_equal '',      foo.params
-    assert_equal klass,   foo.parent
-    assert_equal false,   foo.singleton
-    assert_equal 'add_my_method :foo', foo.text
-    assert_nil            foo.viewer
-    assert_equal :public, foo.visibility
-    assert_equal klass.current_section, foo.section
-
-    stream = [
-      {
-        :line_no => 1, :char_no => 1, :kind => :on_comment,
-        :text => "# File #{@top_level.relative_name}, line 1"
-      },
-      { :line_no => 0, :char_no => 0, :kind => :on_nl, :text => "\n" },
-      { :line_no => 1, :char_no => 1, :kind => :on_sp, :text => '' },
-      { :line_no => 1, :char_no => 0, :kind => :on_ident, :text => 'add_my_method' },
-      { :line_no => 1, :char_no => 13, :kind => :on_sp, :text => ' ' },
-      { :line_no => 1, :char_no => 14, :kind => :on_symbol, :text => ':foo' },
-      { :line_no => 1, :char_no => 18, :kind => :on_comma, :text => ',' },
-      { :line_no => 1, :char_no => 19, :kind => :on_sp, :text => ' ' },
-      { :line_no => 1, :char_no => 20, :kind => :on_symbol, :text => ':bar' },
-      { :line_no => 1, :char_no => 24, :kind => :on_nl, :text => "\n" }
-    ]
-    parsed_stream = foo.token_stream.map { |t|
-      {
-        :line_no => t[:line_no],
-        :char_no => t[:char_no],
-        :kind => t[:kind],
-        :text => t[:text]
-      }
-    }
-
-    assert_equal stream, parsed_stream
-  end
-
-  def test_parse_meta_method_block
-    klass = RDoc::NormalClass.new 'Foo'
-    klass.parent = @top_level
-
-    comment = RDoc::Comment.new "##\n# my method\n", @top_level
-
-    content = <<-CONTENT
-inline(:my_method) do |*args|
-  "this method causes z to disappear"
-end
-    CONTENT
-
-    util_parser content
-
-    tk = @parser.get_tk
-
-    @parser.parse_meta_method klass, RDoc::Parser::Ruby::NORMAL, tk, comment
-
-    rest = { :line_no => 3, :char_no => 3, :kind => :on_nl, :text => "\n" }
-    tk = @parser.get_tk
-    tk = { :line_no => tk[:line_no], :char_no => tk[:char_no], :kind => tk[:kind], :text => tk[:text] }
-    assert_equal rest, tk
-  end
-
-  def test_parse_meta_method_define_method
-    klass = RDoc::NormalClass.new 'Foo'
-    comment = RDoc::Comment.new "##\n# my method\n", @top_level, :ruby
-
-    util_parser "define_method :foo do end"
-
-    tk = @parser.get_tk
-
-    @parser.parse_meta_method klass, RDoc::Parser::Ruby::NORMAL, tk, comment
-
-    foo = klass.method_list.first
-    assert_equal 'foo', foo.name
-    assert_equal 'my method', foo.comment.text
-    assert_equal @top_level,  foo.file
-  end
-
-  def test_parse_meta_method_name
-    klass = RDoc::NormalClass.new 'Foo'
-    klass.parent = @top_level
-
-    comment =
-      RDoc::Comment.new "##\n# :method: woo_hoo!\n# my method\n", @top_level, :ruby
-
-    util_parser "add_my_method :foo, :bar\nadd_my_method :baz"
-
-    tk = @parser.get_tk
-
-    @parser.parse_meta_method klass, RDoc::Parser::Ruby::NORMAL, tk, comment
-
-    foo = klass.method_list.first
-    assert_equal 'woo_hoo!',  foo.name
-    assert_equal 'my method', foo.comment.text
-    assert_equal @top_level,  foo.file
-  end
-
-  def test_parse_meta_method_singleton
-    klass = RDoc::NormalClass.new 'Foo'
-    klass.parent = @top_level
-
-    comment =
-      RDoc::Comment.new "##\n# :singleton-method:\n# my method\n", @top_level, :ruby
-
-    util_parser "add_my_method :foo, :bar\nadd_my_method :baz"
-
-    tk = @parser.get_tk
-
-    @parser.parse_meta_method klass, RDoc::Parser::Ruby::NORMAL, tk, comment
-
-    foo = klass.method_list.first
-    assert_equal 'foo', foo.name
-    assert_equal true, foo.singleton, 'singleton method'
-    assert_equal 'my method', foo.comment.text
-    assert_equal @top_level,  foo.file
-  end
-
-  def test_parse_meta_method_singleton_name
-    klass = RDoc::NormalClass.new 'Foo'
-    klass.parent = @top_level
-
-    comment =
-      RDoc::Comment.new "##\n# :singleton-method: woo_hoo!\n# my method\n",
-                        @top_level, :ruby
-
-    util_parser "add_my_method :foo, :bar\nadd_my_method :baz"
-
-    tk = @parser.get_tk
-
-    @parser.parse_meta_method klass, RDoc::Parser::Ruby::NORMAL, tk, comment
-
-    foo = klass.method_list.first
-    assert_equal 'woo_hoo!', foo.name
-    assert_equal true, foo.singleton, 'singleton method'
-    assert_equal 'my method', foo.comment.text
-    assert_equal @top_level,  foo.file
-  end
-
-  def test_parse_meta_method_string_name
-    klass = RDoc::NormalClass.new 'Foo'
-    comment = RDoc::Comment.new "##\n# my method\n", @top_level, :ruby
-
-    util_parser "add_my_method 'foo'"
-
-    tk = @parser.get_tk
-
-    @parser.parse_meta_method klass, RDoc::Parser::Ruby::NORMAL, tk, comment
-
-    foo = klass.method_list.first
-    assert_equal 'foo', foo.name
-    assert_equal 'my method', foo.comment.text
-    assert_equal @top_level,  foo.file
-  end
-
-  def test_parse_meta_method_stopdoc
-    klass = RDoc::NormalClass.new 'Foo'
-    klass.parent = @top_level
-    klass.stop_doc
-
-    comment = RDoc::Comment.new "##\n# my method\n", @top_level
-
-    util_parser "add_my_method :foo, :bar\nadd_my_method :baz"
-
-    tk = @parser.get_tk
-
-    @parser.parse_meta_method klass, RDoc::Parser::Ruby::NORMAL, tk, comment
-
-    assert_empty klass.method_list
-  end
-
-  def test_parse_meta_method_unknown
-    klass = RDoc::NormalClass.new 'Foo'
-    comment = RDoc::Comment.new "##\n# my method\n", @top_level, :ruby
-
-    util_parser "add_my_method ('foo')"
-
-    tk = @parser.get_tk
-
-    @parser.parse_meta_method klass, RDoc::Parser::Ruby::NORMAL, tk, comment
-
-    foo = klass.method_list.first
-    assert_equal 'unknown', foo.name
-    assert_equal 'my method', foo.comment.text
-    assert_equal @top_level,  foo.file
-  end
-
-  def test_parse_method
-    klass = RDoc::NormalClass.new 'Foo'
-    klass.parent = @top_level
-
-    comment = RDoc::Comment.new "##\n# my method\n", @top_level, :ruby
-
-    util_parser "def foo() :bar end"
-
-    tk = @parser.get_tk
-
-    @parser.parse_method klass, RDoc::Parser::Ruby::NORMAL, tk, comment
-
-    foo = klass.method_list.first
-    assert_equal 'foo',       foo.name
-    assert_equal 'my method', foo.comment.text
-    assert_equal @top_level,  foo.file
-    assert_equal 1,           foo.line
-
-    assert_equal [],        foo.aliases
-    assert_nil              foo.block_params
-    assert_nil              foo.call_seq
-    assert_nil              foo.is_alias_for
-    assert_nil              foo.viewer
-    assert_equal true,      foo.document_children
-    assert_equal true,      foo.document_self
-    assert_equal '()',      foo.params
-    assert_equal false,     foo.done_documenting
-    assert_equal false,     foo.dont_rename_initialize
-    assert_equal false,     foo.force_documentation
-    assert_equal klass,     foo.parent
-    assert_equal false,     foo.singleton
-    assert_equal :public,   foo.visibility
-    assert_equal 'def foo', foo.text
-    assert_equal klass.current_section, foo.section
-
-    stream = [
-      {
-        :line_no => 1, :char_no => 1, :kind => :on_comment,
-        :text => "# File #{@top_level.relative_name}, line 1" },
-      { :line_no => 0, :char_no => 0, :kind => :on_nl, :text => "\n" },
-      { :line_no => 1, :char_no => 1, :kind => :on_sp, :text => '' },
-      { :line_no => 1, :char_no => 0, :kind => :on_kw, :text => 'def' },
-      { :line_no => 1, :char_no => 3, :kind => :on_sp, :text => ' ' },
-      { :line_no => 1, :char_no => 4, :kind => :on_ident, :text => 'foo' },
-      { :line_no => 1, :char_no => 7, :kind => :on_lparen, :text => '(' },
-      { :line_no => 1, :char_no => 8, :kind => :on_rparen, :text => ')' },
-      { :line_no => 1, :char_no => 9, :kind => :on_sp, :text => ' ' },
-      { :line_no => 1, :char_no => 10, :kind => :on_symbol, :text => ':bar' },
-      { :line_no => 1, :char_no => 14, :kind => :on_sp, :text => ' ' },
-      { :line_no => 1, :char_no => 15, :kind => :on_kw, :text => 'end' }
-    ]
-    parsed_stream = foo.token_stream.map { |t|
-      {
-        :line_no => t[:line_no],
-        :char_no => t[:char_no],
-        :kind => t[:kind],
-        :text => t[:text]
-      }
-    }
-    assert_equal stream, parsed_stream
-  end
-
-  def test_parse_redefinable_methods
-    klass = RDoc::NormalClass.new 'Foo'
-    klass.parent = @top_level
-
-    comment = RDoc::Comment.new "", @top_level
-
-    redefinable_ops = %w[| ^ & <=> == === =~ > >= < <= << >> + - * / % ** ~ +@ -@ [] []= ` !  != !~]
-    redefinable_ops.each do |redefinable_op|
-      util_parser "def #{redefinable_op}\nend\n"
-      tk = @parser.get_tk
-      @parser.parse_method klass, RDoc::Parser::Ruby::NORMAL, tk, comment
-    end
-
-    klass.method_list.each do |method|
-      assert_equal :on_ident, method.token_stream[5][:kind]
-      assert_includes redefinable_ops, method.token_stream[5][:text]
-    end
-  end
-
-  def test_parse_method_with_args_directive
-    util_parser <<-RUBY
-class C
-  def meth_with_args_after # :args: a, b, c
-  end
-
-  ##
-  # :args: d, e, f
-  def meth_with_args_before
-end
-    RUBY
-
-    @parser.scan
-
-    c = @store.find_class_named 'C'
-
-    assert_equal 'C#meth_with_args_after', c.method_list[0].full_name
-    assert_equal 'a, b, c', c.method_list[0].params
-    assert_equal 'C#meth_with_args_before', c.method_list[1].full_name
-    assert_equal 'd, e, f', c.method_list[1].params
-  end
-
-  def test_parse_method_bracket
-    util_parser <<-RUBY
-class C
-  def []; end
-  def self.[]; end
-  def []=; end
-  def self.[]=; end
-end
-    RUBY
-
-    @parser.scan
-
-    c = @store.find_class_named 'C'
-
-    assert_equal 4, c.method_list.size
-    assert_equal 'C#[]', c.method_list[0].full_name
-    assert_equal 'C::[]', c.method_list[1].full_name
-    assert_equal 'C#[]=', c.method_list[2].full_name
-    assert_equal 'C::[]=', c.method_list[3].full_name
-    assert c.aliases.empty?
-  end
-
-  def test_parse_method_alias
-    klass = RDoc::NormalClass.new 'Foo'
-    klass.parent = @top_level
-
-    util_parser "def m() alias a b; end"
-
-    tk = @parser.get_tk
-
-    @parser.parse_method klass, RDoc::Parser::Ruby::NORMAL, tk, @comment
-
-    assert klass.aliases.empty?
-  end
-
-  def test_parse_method_ampersand
-    klass = RDoc::NormalClass.new 'Foo'
-    klass.parent = @top_level
-
-    util_parser "def self.&\nend"
-
-    tk = @parser.get_tk
-
-    @parser.parse_method klass, RDoc::Parser::Ruby::NORMAL, tk, @comment
-
-    ampersand = klass.method_list.first
-    assert_equal '&', ampersand.name
-    assert            ampersand.singleton
-  end
-
-  def test_parse_method_constant
-    c = RDoc::Constant.new 'CONST', nil, ''
-    m = @top_level.add_class RDoc::NormalModule, 'M'
-    m.add_constant c
-
-    util_parser "def CONST.m() end"
-
-    tk = @parser.get_tk
-
-    @parser.parse_method m, RDoc::Parser::Ruby::NORMAL, tk, @comment
-
-    assert_empty @store.modules_hash.keys
-    assert_equal %w[M], @store.classes_hash.keys
-  end
-
-  def test_parse_method_false
-    util_parser "def false.foo() :bar end"
-
-    tk = @parser.get_tk
-
-    @parser.parse_method @top_level, RDoc::Parser::Ruby::NORMAL, tk, @comment
-
-    klass = @store.find_class_named 'FalseClass'
-
-    foo = klass.method_list.first
-    assert_equal 'foo', foo.name
-  end
-
-  def test_parse_method_funky
-    klass = RDoc::NormalClass.new 'Foo'
-    klass.parent = @top_level
-
-    util_parser "def (blah).foo() :bar end"
-
-    tk = @parser.get_tk
-
-    @parser.parse_method klass, RDoc::Parser::Ruby::NORMAL, tk, @comment
-
-    assert_empty klass.method_list
-  end
-
-  def test_parse_method_gvar
-    util_parser "def $stdout.foo() :bar end"
-
-    tk = @parser.get_tk
-
-    @parser.parse_method @top_level, RDoc::Parser::Ruby::NORMAL, tk, @comment
-
-    assert @top_level.method_list.empty?
-  end
-
-  def test_parse_method_gvar_insane
-    util_parser "def $stdout.foo() class << $other; end; end"
-
-    tk = @parser.get_tk
-
-    @parser.parse_method @top_level, RDoc::Parser::Ruby::NORMAL, tk, @comment
-
-    assert @top_level.method_list.empty?
-
-    assert_empty @store.all_classes
-
-    assert_equal 1, @store.all_modules.length
-
-    refute @store.all_modules.first.document_self
-  end
-
-  def test_parse_method_internal_gvar
-    klass = RDoc::NormalClass.new 'Foo'
-    klass.parent = @top_level
-
-    util_parser "def foo() def $blah.bar() end end"
-
-    tk = @parser.get_tk
-
-    @parser.parse_method klass, RDoc::Parser::Ruby::NORMAL, tk, @comment
-
-    assert_equal 1, klass.method_list.length
-  end
-
-  def test_parse_method_internal_ivar
-    klass = RDoc::NormalClass.new 'Foo'
-    klass.parent = @top_level
-
-    util_parser "def foo() def @blah.bar() end end"
-
-    tk = @parser.get_tk
-
-    @parser.parse_method klass, RDoc::Parser::Ruby::NORMAL, tk, @comment
-
-    assert_equal 1, klass.method_list.length
-  end
-
-  def test_parse_method_internal_lvar
-    klass = RDoc::NormalClass.new 'Foo'
-    klass.parent = @top_level
-
-    util_parser "def foo() def blah.bar() end end"
-
-    tk = @parser.get_tk
-
-    @parser.parse_method klass, RDoc::Parser::Ruby::NORMAL, tk, @comment
-
-    assert_equal 1, klass.method_list.length
-  end
-
-  def test_parse_method_nil
-    util_parser "def nil.foo() :bar end"
-
-    tk = @parser.get_tk
-
-    @parser.parse_method @top_level, RDoc::Parser::Ruby::NORMAL, tk, @comment
-
-    klass = @store.find_class_named 'NilClass'
-
-    foo = klass.method_list.first
-    assert_equal 'foo', foo.name
-  end
-
-  def test_parse_method_nodoc
-    klass = RDoc::NormalClass.new 'Foo'
-    klass.parent = @top_level
-
-    util_parser "def foo # :nodoc:\nend"
-
-    tk = @parser.get_tk
-
-    @parser.parse_method klass, RDoc::Parser::Ruby::NORMAL, tk, comment('')
-
-    assert_empty klass.method_list
-  end
-
-  def test_parse_method_nodoc_track
-    klass = RDoc::NormalClass.new 'Foo'
-    klass.parent = @top_level
-
-    @options.visibility = :nodoc
-
-    util_parser "def foo # :nodoc:\nend"
-
-    tk = @parser.get_tk
-
-    @parser.parse_method klass, RDoc::Parser::Ruby::NORMAL, tk, comment('')
-
-    refute_empty klass.method_list
-  end
-
-  def test_parse_method_no_parens
-    klass = RDoc::NormalClass.new 'Foo'
-    klass.parent = @top_level
-
-    util_parser "def foo arg1, arg2 = {}\nend"
-
-    tk = @parser.get_tk
-
-    @parser.parse_method klass, RDoc::Parser::Ruby::NORMAL, tk, @comment
-
-    foo = klass.method_list.first
-    assert_equal '(arg1, arg2 = {})', foo.params
-    assert_equal @top_level, foo.file
-  end
-
-  def test_parse_method_parameters_comment
-    klass = RDoc::NormalClass.new 'Foo'
-    klass.parent = @top_level
-
-    util_parser "def foo arg1, arg2 # some useful comment\nend"
-
-    tk = @parser.get_tk
-
-    @parser.parse_method klass, RDoc::Parser::Ruby::NORMAL, tk, @comment
-
-    foo = klass.method_list.first
-    assert_equal '(arg1, arg2)', foo.params
-  end
-
-  def test_parse_method_parameters_comment_continue
-    klass = RDoc::NormalClass.new 'Foo'
-    klass.parent = @top_level
-
-    util_parser "def foo arg1, arg2, # some useful comment\narg3\nend"
-
-    tk = @parser.get_tk
-
-    @parser.parse_method klass, RDoc::Parser::Ruby::NORMAL, tk, @comment
-
-    foo = klass.method_list.first
-    assert_equal '(arg1, arg2, arg3)', foo.params
-  end
-
-  def test_parse_method_parameters_with_paren_comment_continue
-    klass = RDoc::NormalClass.new 'Foo'
-    klass.parent = @top_level
-
-    util_parser "def foo(arg1, arg2, # some useful comment\narg3)\nend"
-
-    tk = @parser.get_tk
-
-    @parser.parse_method klass, RDoc::Parser::Ruby::NORMAL, tk, @comment
-
-    foo = klass.method_list.first
-    assert_equal '(arg1, arg2, arg3)', foo.params
-  end
-
-  def test_parse_method_star
-    klass = RDoc::NormalClass.new 'Foo'
-    klass.parent = @top_level
-
-    util_parser "def self.*\nend"
-
-    tk = @parser.get_tk
-
-    @parser.parse_method klass, RDoc::Parser::Ruby::NORMAL, tk, @comment
-
-    ampersand = klass.method_list.first
-    assert_equal '*', ampersand.name
-    assert            ampersand.singleton
-  end
-
-  def test_parse_method_stopdoc
-    klass = RDoc::NormalClass.new 'Foo'
-    klass.parent = @top_level
-    klass.stop_doc
-
-    comment = RDoc::Comment.new "##\n# my method\n", @top_level
-
-    util_parser "def foo() :bar end"
-
-    tk = @parser.get_tk
-
-    @parser.parse_method klass, RDoc::Parser::Ruby::NORMAL, tk, comment
-
-    assert_empty klass.method_list
-  end
-
-  def test_parse_method_toplevel
-    klass = @top_level
-
-    util_parser "def foo arg1, arg2\nend"
-
-    tk = @parser.get_tk
-
-    @parser.parse_method klass, RDoc::Parser::Ruby::NORMAL, tk, @comment
-
-    object = @store.find_class_named 'Object'
-
-    foo = object.method_list.first
-    assert_equal 'Object#foo', foo.full_name
-    assert_equal @top_level, foo.file
-  end
-
-  def test_parse_method_toplevel_class
-    klass = @top_level
-
-    util_parser "def Object.foo arg1, arg2\nend"
-
-    tk = @parser.get_tk
-
-    @parser.parse_method klass, RDoc::Parser::Ruby::NORMAL, tk, @comment
-
-    object = @store.find_class_named 'Object'
-
-    foo = object.method_list.first
-    assert_equal 'Object::foo', foo.full_name
-  end
-
-  def test_parse_method_true
-    util_parser "def true.foo() :bar end"
-
-    tk = @parser.get_tk
-
-    @parser.parse_method @top_level, RDoc::Parser::Ruby::NORMAL, tk, @comment
-
-    klass = @store.find_class_named 'TrueClass'
-
-    foo = klass.method_list.first
-    assert_equal 'foo', foo.name
-  end
-
-  def test_parse_method_utf8
-    klass = RDoc::NormalClass.new 'Foo'
-    klass.parent = @top_level
-
-    method = "def ω() end"
-
-    assert_equal Encoding::UTF_8, method.encoding
-
-    util_parser method
-
-    tk = @parser.get_tk
-
-    @parser.parse_method klass, RDoc::Parser::Ruby::NORMAL, tk, @comment
-
-    omega = klass.method_list.first
-    assert_equal "def \317\211", omega.text
-  end
-
-  def test_parse_method_dummy
-    util_parser ".method() end"
-
-    @parser.parse_method_dummy @top_level
-
-    assert_nil @parser.get_tk
-  end
-
-  def test_parse_method_or_yield_parameters_hash
-    util_parser "({})\n"
-
-    m = RDoc::AnyMethod.new nil, 'm'
-
-    result = @parser.parse_method_or_yield_parameters m
-
-    assert_equal '({})', result
-  end
-
-  def test_parse_statements_class_if
-    util_parser <<-CODE
-module Foo
-  X = if TRUE then
-        ''
-      end
-
-  def blah
-  end
-end
-    CODE
-
-    @parser.parse_statements @top_level, RDoc::Parser::Ruby::NORMAL, nil
-
-    foo = @top_level.modules.first
-    assert_equal 'Foo', foo.full_name, 'module Foo'
-
-    methods = foo.method_list
-    assert_equal 1, methods.length
-    assert_equal 'Foo#blah', methods.first.full_name
-  end
-
-  def test_parse_statements_postfix_if_unless
-    util_parser <<-CODE
-class C
-  def foo
-    1 if nil
-  end
-
-  def bar
-    2 unless nil
-  end
-end
-    CODE
-
-    @parser.parse_statements @top_level, RDoc::Parser::Ruby::NORMAL, nil
-
-    c = @top_level.classes.first
-    assert_equal 'C', c.full_name, 'class C'
-
-    methods = c.method_list
-    assert_equal 2, methods.length
-    assert_equal 'C#foo', methods[0].full_name
-    assert_equal 'C#bar', methods[1].full_name
-  end
-
-  def test_parse_statements_postfix_if_unless_with_expr_mid
-    util_parser <<-CODE
-class A
-  class B
-    def foo
-      return if nil
-    end
-  end
-
-  class C
-  end
-end
-    CODE
-
-    @parser.parse_statements @top_level, RDoc::Parser::Ruby::NORMAL, nil
-
-    a = @top_level.classes.first
-    assert_equal 'A', a.full_name, 'class A'
-    assert_equal 2, a.classes.length
-    b = a.classes[0]
-    assert_equal 'A::B', b.full_name, 'class A::B'
-    c = a.classes[1]
-    assert_equal 'A::C', c.full_name, 'class A::C'
-  end
-
-  def test_parse_statements_class_nested
-    comment = RDoc::Comment.new "##\n# my method\n", @top_level
-
-    util_parser "module Foo\n#{comment.text}class Bar\nend\nend"
-
-    @parser.parse_statements @top_level, RDoc::Parser::Ruby::NORMAL
-
-    foo = @top_level.modules.first
-    assert_equal 'Foo', foo.full_name, 'module Foo'
-
-    bar = foo.classes.first
-    assert_equal 'Foo::Bar', bar.full_name, 'class Foo::Bar'
-    assert_equal 'my method', bar.comment.text
-  end
-
-  def test_parse_statements_def_percent_string_pound
-    util_parser "class C\ndef a\n%r{#}\n%r{\#{}}\nend\ndef b() end\nend"
-
-    @parser.parse_statements @top_level, RDoc::Parser::Ruby::NORMAL
-
-    x = @top_level.classes.first
-
-    assert_equal 2, x.method_list.length
-    a = x.method_list.first
-
-
-    expected = [
-      {
-        :line_no => 2, :char_no => 1, :kind => :on_comment,
-        :text => "# File #{@filename}, line 2"
-      },
-      { :line_no => 0, :char_no => 0, :kind => :on_nl, :text => "\n" },
-      { :line_no => 1, :char_no => 1, :kind => :on_sp, :text => '' },
-      { :line_no => 2, :char_no => 0, :kind => :on_kw, :text => 'def' },
-      { :line_no => 2, :char_no => 3, :kind => :on_sp, :text => ' ' },
-      { :line_no => 2, :char_no => 4, :kind => :on_ident, :text => 'a' },
-      { :line_no => 2, :char_no => 5, :kind => :on_nl, :text => "\n" },
-      { :line_no => 3, :char_no => 0, :kind => :on_regexp, :text => '%r{#}' },
-      { :line_no => 3, :char_no => 5, :kind => :on_nl, :text => "\n" },
-      { :line_no => 4, :char_no => 0, :kind => :on_regexp, :text => '%r{#{}}' },
-      { :line_no => 4, :char_no => 7, :kind => :on_nl, :text => "\n" },
-      { :line_no => 5, :char_no => 0, :kind => :on_kw, :text => 'end' }
-    ]
-    parsed_stream = a.token_stream.map { |tk|
-      {
-        :line_no => tk[:line_no],
-        :char_no => tk[:char_no],
-        :kind => tk[:kind],
-        :text => tk[:text]
-      }
-    }
-
-    assert_equal expected, parsed_stream
-  end
-
-  def test_parse_statements_encoding
-    @options.encoding = Encoding::CP852
-
-    content = <<-EOF
-class Foo
-  ##
-  # this is my method
-  add_my_method :foo
-end
-    EOF
-
-    util_parser content
-
-    @parser.parse_statements @top_level
-
-    foo = @top_level.classes.first.method_list.first
-    assert_equal 'foo', foo.name
-    assert_equal 'this is my method', foo.comment.text
-    assert_equal Encoding::CP852, foo.comment.text.encoding
-  end
-
-  def test_parse_statements_enddoc
-    klass = @top_level.add_class RDoc::NormalClass, 'Foo'
-
-    util_parser "\n# :enddoc:"
-
-    @parser.parse_statements klass, RDoc::Parser::Ruby::NORMAL, nil
-
-    assert klass.done_documenting
-  end
-
-  def test_parse_statements_enddoc_top_level
-    util_parser "\n# :enddoc:"
-
-    assert_throws :eof do
-      @parser.parse_statements @top_level, RDoc::Parser::Ruby::NORMAL, nil
-    end
-  end
-
-  def test_parse_statements_identifier_meta_method
-    content = <<-EOF
-class Foo
-  ##
-  # this is my method
-  add_my_method :foo
-end
-    EOF
-
-    util_parser content
-
-    @parser.parse_statements @top_level
-
-    foo = @top_level.classes.first.method_list.first
-    assert_equal 'foo', foo.name
-  end
-
-  def test_parse_statements_identifier_alias_method
-    content = <<-RUBY
-class Foo
-  def foo() end
-  alias_method :foo2, :foo
-end
-    RUBY
-
-    util_parser content
-
-    @parser.parse_statements @top_level
-
-    foo = @top_level.classes.first.method_list[0]
-    assert_equal 'foo', foo.name
-
-    foo2 = @top_level.classes.first.method_list.last
-    assert_equal 'foo2', foo2.name
-    assert_equal 'foo', foo2.is_alias_for.name
-    assert @top_level.classes.first.aliases.empty?
-  end
-
-  def test_parse_statements_identifier_alias_method_before_original_method
-    # This is not strictly legal Ruby code, but it simulates finding an alias
-    # for a method before finding the original method, which might happen
-    # to rdoc if the alias is in a different file than the original method
-    # and rdoc processes the alias' file first.
-    content = <<-EOF
-class Foo
-  alias_method :foo2, :foo
-
-  alias_method :foo3, :foo
-
-  def foo()
-  end
-
-  alias_method :foo4, :foo
-
-  alias_method :foo5, :unknown
-end
-EOF
-
-    util_parser content
-
-    @parser.parse_statements @top_level
-
-    foo = @top_level.classes.first.method_list[0]
-    assert_equal 'foo', foo.name
-
-    foo2 = @top_level.classes.first.method_list[1]
-    assert_equal 'foo2', foo2.name
-    assert_equal 'foo', foo2.is_alias_for.name
-
-    foo3 = @top_level.classes.first.method_list[2]
-    assert_equal 'foo3', foo3.name
-    assert_equal 'foo', foo3.is_alias_for.name
-
-    foo4 = @top_level.classes.first.method_list.last
-    assert_equal 'foo4', foo4.name
-    assert_equal 'foo', foo4.is_alias_for.name
-
-    assert_equal 'unknown', @top_level.classes.first.external_aliases[0].old_name
-  end
-
-  def test_parse_statements_identifier_args
-    comment = "##\n# :args: x\n# :method: b\n# my method\n"
-
-    util_parser "module M\n#{comment}def_delegator :a, :b, :b\nend"
-
-    @parser.parse_statements @top_level, RDoc::Parser::Ruby::NORMAL
-
-    m = @top_level.modules.first
-    assert_equal 'M', m.full_name
-
-    b = m.method_list.first
-    assert_equal 'M#b', b.full_name
-    assert_equal 'x', b.params
-    assert_equal 'my method', b.comment.text
-
-    assert_nil m.params, 'Module parameter not removed'
-  end
-
-  def test_parse_statements_identifier_constant
-    sixth_constant = <<-EOF
-Class.new do
-  rule :file do
-    all(x, y, z) {
-      def value
-        find(:require).each {|r| require r.value }
-        find(:grammar).map {|g| g.value }
-      end
-      def min; end
-    }
-  end
-end
-    EOF
-
-    content = <<-EOF
-class Foo
-  FIRST_CONSTANT = 5
-
-  SECOND_CONSTANT = [
-     1,
-     2,
-     3
-  ]
-
-  THIRD_CONSTANT = {
-     :foo => 'bar',
-     :x => 'y'
-  }
-
-  FOURTH_CONSTANT = SECOND_CONSTANT.map do |element|
-    element + 1
-    element + 2
-  end
-
-  FIFTH_CONSTANT = SECOND_CONSTANT.map { |element| element + 1 }
-
-  SIXTH_CONSTANT = #{sixth_constant}
-
-  SEVENTH_CONSTANT = proc { |i| begin i end }
-
-  EIGHTH_CONSTANT = "a" \\
-                    "b"
-end
-EOF
-
-    util_parser content
-
-    @parser.parse_statements @top_level
-
-    constants = @top_level.classes.first.constants
-
-    constant = constants[0]
-    assert_equal 'FIRST_CONSTANT', constant.name
-    assert_equal '5', constant.value
-    assert_equal @top_level, constant.file
-
-    constant = constants[1]
-    assert_equal 'SECOND_CONSTANT', constant.name
-    assert_equal "[\n1,\n2,\n3\n]", constant.value
-    assert_equal @top_level, constant.file
-
-    constant = constants[2]
-    assert_equal 'THIRD_CONSTANT', constant.name
-    assert_equal "{\n:foo => 'bar',\n:x => 'y'\n}", constant.value
-    assert_equal @top_level, constant.file
-
-    constant = constants[3]
-    assert_equal 'FOURTH_CONSTANT', constant.name
-    assert_equal "SECOND_CONSTANT.map do |element|\nelement + 1\nelement + 2\nend", constant.value
-    assert_equal @top_level, constant.file
-
-    constant = constants[4]
-    assert_equal 'FIFTH_CONSTANT', constant.name
-    assert_equal 'SECOND_CONSTANT.map { |element| element + 1 }', constant.value
-    assert_equal @top_level, constant.file
-
-    # TODO: parse as class
-    constant = constants[5]
-    assert_equal 'SIXTH_CONSTANT', constant.name
-    assert_equal sixth_constant.lines.map(&:strip).join("\n"), constant.value
-    assert_equal @top_level, constant.file
-
-    # TODO: parse as method
-    constant = constants[6]
-    assert_equal 'SEVENTH_CONSTANT', constant.name
-    assert_equal "proc { |i| begin i end }", constant.value
-    assert_equal @top_level, constant.file
-
-    constant = constants[7]
-    assert_equal 'EIGHTH_CONSTANT', constant.name
-    assert_equal "\"a\" \\\n\"b\"", constant.value
-    assert_equal @top_level, constant.file
-  end
-
-  def test_parse_statements_identifier_attr
-    content = "class Foo\nattr :foo\nend"
-
-    util_parser content
-
-    @parser.parse_statements @top_level
-
-    foo = @top_level.classes.first.attributes.first
-    assert_equal 'foo', foo.name
-    assert_equal 'R', foo.rw
-  end
-
-  def test_parse_statements_identifier_attr_accessor
-    content = "class Foo\nattr_accessor :foo\nend"
-
-    util_parser content
-
-    @parser.parse_statements @top_level
-
-    foo = @top_level.classes.first.attributes.first
-    assert_equal 'foo', foo.name
-    assert_equal 'RW', foo.rw
-  end
-
-  def test_parse_statements_identifier_define_method
-    util_parser <<-RUBY
-class C
-  ##
-  # :method: a
-  define_method :a do end
-  ##
-  # :method: b
-  define_method :b do end
-end
-    RUBY
-
-    @parser.parse_statements @top_level
-    c = @top_level.classes.first
-
-    assert_equal %w[a b], c.method_list.map { |m| m.name }
-  end
-
-  def test_parse_statements_identifier_include
-    content = "class Foo\ninclude Bar\nend"
-
-    util_parser content
-
-    @parser.parse_statements @top_level
-
-    foo = @top_level.classes.first
-    assert_equal 'Foo', foo.name
-    assert_equal 1, foo.includes.length
-  end
-
-  def test_parse_statements_identifier_module_function
-    content = "module Foo\ndef foo() end\nmodule_function :foo\nend"
-
-    util_parser content
-
-    @parser.parse_statements @top_level
-
-    foo, s_foo = @top_level.modules.first.method_list
-    assert_equal 'foo',    foo.name,       'instance method name'
-    assert_equal :private, foo.visibility, 'instance method visibility'
-    assert_equal false,    foo.singleton,  'instance method singleton'
-
-    assert_equal 'foo',   s_foo.name,       'module function name'
-    assert_equal :public, s_foo.visibility, 'module function visibility'
-    assert_equal true,    s_foo.singleton,  'module function singleton'
-  end
-
-  def test_parse_statements_identifier_private
-    content = "class Foo\nprivate\ndef foo() end\nend"
-
-    util_parser content
-
-    @parser.parse_statements @top_level
-
-    foo = @top_level.classes.first.method_list.first
-    assert_equal 'foo', foo.name
-    assert_equal :private, foo.visibility
-  end
-
-  def test_parse_statements_identifier_public_class_method
-    content = <<-CONTENT
-class Date
-  def self.now; end
-  private_class_method :now
-end
-
-class DateTime < Date
-  public_class_method :now
-end
-    CONTENT
-
-    util_parser content
-
-    @parser.parse_statements @top_level
-
-    date, date_time = @top_level.classes.sort_by { |c| c.full_name }
-
-    date_now      = date.method_list.first
-    date_time_now = date_time.method_list.sort_by { |m| m.full_name }.first
-
-    assert_equal :private, date_now.visibility
-    assert_equal :public,  date_time_now.visibility
-  end
-
-  def test_parse_statements_identifier_private_class_method
-    content = <<-CONTENT
-class Date
-  def self.now; end
-  public_class_method :now
-end
-
-class DateTime < Date
-  private_class_method :now
-end
-    CONTENT
-
-    util_parser content
-
-    @parser.parse_statements @top_level
-
-    # TODO sort classes by default
-    date, date_time = @top_level.classes.sort_by { |c| c.full_name }
-
-    date_now      = date.method_list.first
-    date_time_now = date_time.method_list.sort_by { |m| m.full_name }.first
-
-    assert_equal :public,  date_now.visibility,      date_now.full_name
-    assert_equal :private, date_time_now.visibility, date_time_now.full_name
-  end
-
-  def test_parse_statements_complex_condition_in_for
-    util_parser <<RUBY
-class Foo
-  def blah()
-    for i in (k)...n do
-    end
-    for i in (k)...n
-    end
-  end
-end
-RUBY
-
-    expected = <<EXPECTED
-<span class="ruby-keyword">def</span> <span class="ruby-identifier ruby-title">blah</span>()
-  <span class="ruby-keyword">for</span> <span class="ruby-identifier">i</span> <span class="ruby-keyword">in</span> (<span class="ruby-identifier">k</span>)<span class="ruby-operator">...</span><span class="ruby-identifier">n</span> <span class="ruby-keyword">do</span>
-  <span class="ruby-keyword">end</span>
-  <span class="ruby-keyword">for</span> <span class="ruby-identifier">i</span> <span class="ruby-keyword">in</span> (<span class="ruby-identifier">k</span>)<span class="ruby-operator">...</span><span class="ruby-identifier">n</span>
-  <span class="ruby-keyword">end</span>
-<span class="ruby-keyword">end</span>
-EXPECTED
-    expected = expected.rstrip
-
-    @parser.scan
-
-    foo = @top_level.classes.first
-    assert_equal 'Foo', foo.full_name
-
-    blah = foo.method_list.first
-    markup_code = blah.markup_code.sub(/^.*\n/, '')
-    assert_equal expected, markup_code
-  end
-
-  def test_parse_instance_operation_method
-    util_parser <<-RUBY
-class Foo
-  def self.& end
-end
-    RUBY
-
-    expected = <<EXPECTED
-  <span class="ruby-keyword">def</span> <span class="ruby-keyword">self</span>.<span class="ruby-identifier ruby-title">&amp;</span> <span class="ruby-keyword">end</span>
-<span class="ruby-keyword">end</span>
-EXPECTED
-    expected = expected.rstrip
-
-    @parser.scan
-
-    foo = @top_level.classes.first
-    assert_equal 'Foo', foo.full_name
-
-    blah = foo.method_list.first
-    markup_code = blah.markup_code.sub(/^.*\n/, '')
-    assert_equal expected, markup_code
-  end
-
-  def test_parse_statements_postfix_if_after_heredocbeg
-    @filename = 'file.rb'
-    util_parser <<RUBY
-class Foo
-  def blah()
-    <<-EOM if true
-    EOM
-  end
-end
-RUBY
-
-    expected = <<EXPECTED
-  <span class="ruby-keyword">def</span> <span class="ruby-identifier ruby-title">blah</span>()
-    <span class="ruby-identifier">&lt;&lt;-EOM</span> <span class="ruby-keyword">if</span> <span class="ruby-keyword">true</span>
-<span class="ruby-value"></span><span class="ruby-identifier">    EOM</span>
-  <span class="ruby-keyword">end</span>
-EXPECTED
-    expected = expected.rstrip
-
-    @parser.scan
-
-    foo = @top_level.classes.first
-    assert_equal 'Foo', foo.full_name
-
-    blah = foo.method_list.first
-    markup_code = blah.markup_code.sub(/^.*\n/, '')
-    assert_equal expected, markup_code
-  end
-
-  def test_parse_mutable_heredocbeg
-    @filename = 'file.rb'
-    util_parser <<RUBY
-class Foo
-  def blah()
-    @str = -<<-EOM
-    EOM
-  end
-end
-RUBY
-
-    expected = <<EXPECTED
-  <span class="ruby-keyword">def</span> <span class="ruby-identifier ruby-title">blah</span>()
-    <span class="ruby-ivar">@str</span> = <span class="ruby-identifier">-&lt;&lt;-EOM</span>
-<span class="ruby-value"></span><span class="ruby-identifier">    EOM</span>
-  <span class="ruby-keyword">end</span>
-EXPECTED
-    expected = expected.rstrip
-
-    @parser.scan
-
-    foo = @top_level.classes.first
-    assert_equal 'Foo', foo.full_name
-
-    blah = foo.method_list.first
-    markup_code = blah.markup_code.sub(/^.*\n/, '')
-    assert_equal expected, markup_code
-  end
-
-  def test_parse_heredoc_end
-    code = "A = <<eos\n""OK\n""eos\n"
-    util_parser code
-    @parser.parse_statements @top_level
-    @parser.scan
-    c = @top_level.classes.first.constants.first
-    assert_equal("A", c.name)
-
-    util_parser code.gsub(/$/, "\r")
-    @parser.parse_statements @top_level
-    @parser.scan
-    c = @top_level.classes.first.constants.first
-    assert_equal("A", c.name)
-  end
-
-  def test_parse_statements_method_oneliner_with_regexp
-    util_parser <<RUBY
-class Foo
-  def blah() /bar/ end
-end
-RUBY
-
-    expected = <<EXPECTED
-<span class="ruby-keyword">def</span> <span class="ruby-identifier ruby-title">blah</span>() <span class="ruby-regexp">/bar/</span> <span class="ruby-keyword">end</span>
-EXPECTED
-    expected = expected.rstrip
-
-    @parser.scan
-
-    foo = @top_level.classes.first
-    assert_equal 'Foo', foo.full_name
-
-    blah = foo.method_list.first
-    markup_code = blah.markup_code.sub(/^.*\n/, '')
-    assert_equal expected, markup_code
-  end
-
-  def test_parse_statements_embdoc_in_document
-    @filename = 'file.rb'
-    util_parser <<RUBY
-class Foo
-  # doc
-  #
-  #   =begin
-  #   test embdoc
-  #   =end
-  #
-  def blah
-  end
-end
-RUBY
-
-    expected = <<EXPECTED
-<p>doc
-
-<pre class="ruby"><span class="ruby-comment">=begin
-test embdoc
-=end</span>
-</pre>
-EXPECTED
-
-    @parser.scan
-
-    foo = @top_level.classes.first
-    assert_equal 'Foo', foo.full_name
-
-    blah = foo.method_list.first
-    markup_comment = blah.search_record[6]
-    assert_equal expected, markup_comment
-  end
-
-  def test_parse_require_dynamic_string
-    content = <<-RUBY
-prefix = 'path'
-require "\#{prefix}/a_library"
-require 'test'
-RUBY
-
-    util_parser content
-
-    @parser.parse_statements @top_level
-
-    assert_equal 1, @top_level.requires.length
-  end
-
-  def test_parse_postfix_nodoc
-    util_parser <<-RUBY
-class A
-end # :nodoc:
-
-class B
-  def a
-  end # :nodoc:
-
-  def b
-  end
-end
-RUBY
-
-    @parser.parse_statements @top_level
-
-    c_a = @top_level.classes.select(&:document_self).first
-    assert_equal 'B', c_a.full_name
-
-    assert_equal 2, @top_level.classes.length
-    assert_equal 1, @top_level.classes.count(&:document_self)
-    assert_equal 1, c_a.method_list.length
-    assert_equal 'B#b', c_a.method_list.first.full_name
-  end
-
-  def test_parse_statements_identifier_require
-    content = "require 'bar'"
-
-    util_parser content
-
-    @parser.parse_statements @top_level
-
-    assert_equal 1, @top_level.requires.length
-  end
-
-  def test_parse_statements_identifier_yields
-    comment = "##\n# :yields: x\n# :method: b\n# my method\n"
-
-    util_parser "module M\n#{comment}def_delegator :a, :b, :b\nend"
-
-    @parser.parse_statements @top_level, RDoc::Parser::Ruby::NORMAL
-
-    m = @top_level.modules.first
-    assert_equal 'M', m.full_name
-
-    b = m.method_list.first
-    assert_equal 'M#b', b.full_name
-    assert_equal 'x', b.block_params
-    assert_equal 'my method', b.comment.text
-
-    assert_nil m.params, 'Module parameter not removed'
-  end
-
-  def test_parse_statements_stopdoc_alias
-    klass = @top_level.add_class RDoc::NormalClass, 'Foo'
-
-    util_parser "\n# :stopdoc:\nalias old new"
-
-    @parser.parse_statements klass, RDoc::Parser::Ruby::NORMAL, nil
-
-    assert_empty klass.aliases
-    assert_empty klass.unmatched_alias_lists
-  end
-
-  def test_parse_statements_stopdoc_identifier_alias_method
-    klass = @top_level.add_class RDoc::NormalClass, 'Foo'
-
-    util_parser "\n# :stopdoc:\nalias_method :old :new"
-
-    @parser.parse_statements klass, RDoc::Parser::Ruby::NORMAL, nil
-
-    assert_empty klass.aliases
-    assert_empty klass.unmatched_alias_lists
-  end
-
-  def test_parse_statements_stopdoc_identifier_metaprogrammed
-    klass = @top_level.add_class RDoc::NormalClass, 'Foo'
-
-    util_parser "\n# :stopdoc:\n# attr :meta"
-
-    @parser.parse_statements klass, RDoc::Parser::Ruby::NORMAL, nil
-
-    assert_empty klass.method_list
-    assert_empty klass.attributes
-  end
-
-  def test_parse_statements_stopdoc_constant
-    klass = @top_level.add_class RDoc::NormalClass, 'Foo'
-
-    util_parser "\n# :stopdoc:\nA = v"
-
-    @parser.parse_statements klass, RDoc::Parser::Ruby::NORMAL, nil
-
-    assert_empty klass.constants
-  end
-
-  def test_parse_statements_stopdoc_def
-    klass = @top_level.add_class RDoc::NormalClass, 'Foo'
-
-    util_parser "\n# :stopdoc:\ndef m\n end"
-
-    @parser.parse_statements klass, RDoc::Parser::Ruby::NORMAL, nil
-
-    assert_empty klass.method_list
-  end
-
-  def test_parse_statements_super
-    m = RDoc::AnyMethod.new '', 'm'
-    util_parser 'super'
-
-    @parser.parse_statements @top_level, RDoc::Parser::Ruby::NORMAL, m
-
-    assert m.calls_super
-  end
-
-  def test_parse_statements_super_no_method
-    content = "super"
-
-    util_parser content
-
-    @parser.parse_statements @top_level
-
-    assert_nil @parser.get_tk
-  end
-
-  def test_parse_statements_while_begin
-    util_parser <<-RUBY
-class A
-  def a
-    while begin a; b end
-    end
-  end
-
-  def b
-  end
-end
-    RUBY
-
-    @parser.parse_statements @top_level
-
-    c_a = @top_level.classes.first
-    assert_equal 'A', c_a.full_name
-
-    assert_equal 1, @top_level.classes.length
-
-    m_a = c_a.method_list.first
-    m_b = c_a.method_list.last
-
-    assert_equal 'A#a', m_a.full_name
-    assert_equal 'A#b', m_b.full_name
-  end
-
-
-  def test_parse_symbol_in_paren_arg
-    util_parser <<RUBY
-class Foo
-  def blah
-  end
-  private(:blah)
-end
-RUBY
-
-    @parser.scan
-
-    foo = @top_level.classes.first
-    assert_equal 'Foo', foo.full_name
-
-    blah = foo.method_list.first
-    assert_equal :private, blah.visibility
-  end
-
-  def test_parse_symbol_in_arg
-    util_parser '[:blah, "blah", "#{blah}", blah]'
-    @parser.get_tk # skip '['
-
-    assert_equal 'blah', @parser.parse_symbol_in_arg
-    @parser.get_tk # skip ','
-
-    @parser.skip_tkspace
-
-    assert_equal 'blah', @parser.parse_symbol_in_arg
-    @parser.get_tk # skip ','
-
-    @parser.skip_tkspace
-
-    assert_nil @parser.parse_symbol_in_arg
-    @parser.get_tk # skip ','
-
-    @parser.skip_tkspace
-
-    assert_nil @parser.parse_symbol_in_arg
-  end
-
-  def test_parse_percent_symbol
-    content = '%s[foo bar]'
-    util_parser content
-    tk = @parser.get_tk
-    assert_equal :on_symbol, tk[:kind]
-    assert_equal content, tk[:text]
-  end
-
-  def test_parse_statements_alias_method
-    content = <<-CONTENT
-class A
-  alias_method :a, :[] unless c
-end
-
-B = A
-
-class C
-end
-    CONTENT
-
-    util_parser content
-
-    @parser.parse_statements @top_level
-
-    # HACK where are the assertions?
-  end
-
-  def test_parse_top_level_statements_enddoc
-    util_parser <<-CONTENT
-# :enddoc:
-    CONTENT
-
-    assert_throws :eof do
-      @parser.parse_top_level_statements @top_level
-    end
-  end
-
-  def test_parse_top_level_statements_stopdoc
-    @top_level.stop_doc
-    content = "# this is the top-level comment"
-
-    util_parser content
-
-    @parser.parse_top_level_statements @top_level
-
-    assert_empty @top_level.comment
-  end
-
-  def test_parse_top_level_statements_stopdoc_integration
-    content = <<-CONTENT
-# :stopdoc:
-
-class Example
-  def method_name
-  end
-end
-    CONTENT
-
-    util_parser content
-
-    @parser.parse_top_level_statements @top_level
-
-    assert_equal 1, @top_level.classes.length
-    assert_empty @top_level.modules
-
-    assert @top_level.find_module_named('Example').ignored?
-  end
-
-  # This tests parse_comment
-  def test_parse_top_level_statements_constant_nodoc_integration
-    content = <<-CONTENT
-class A
-  C = A # :nodoc:
-end
-    CONTENT
-
-    util_parser content
-
-    @parser.parse_top_level_statements @top_level
-
-    klass = @top_level.find_module_named('A')
-
-    c = klass.constants.first
-
-    assert_nil c.document_self, 'C should not be documented'
-  end
-
-  def test_parse_yield_in_braces_with_parens
-    klass = RDoc::NormalClass.new 'Foo'
-    klass.parent = @top_level
-
-    util_parser "def foo\nn.times { |i| yield nth(i) }\nend"
-
-    tk = @parser.get_tk
-
-    @parser.parse_method klass, RDoc::Parser::Ruby::NORMAL, tk, @comment
-
-    foo = klass.method_list.first
-    assert_equal 'nth(i)', foo.block_params
-  end
-
-  def test_read_directive
-    parser = util_parser '# :category: test'
-
-    directive, value = parser.read_directive %w[category]
-
-    assert_equal 'category', directive
-    assert_equal 'test', value
-
-    assert_nil parser.get_tk
-  end
-
-  def test_read_directive_allow
-    parser = util_parser '# :category: test'
-
-    directive = parser.read_directive []
-
-    assert_nil directive
-
-    assert_nil parser.get_tk
-  end
-
-  def test_read_directive_empty
-    parser = util_parser '# test'
-
-    directive = parser.read_directive %w[category]
-
-    assert_nil directive
-
-    assert_nil parser.get_tk
-  end
-
-  def test_read_directive_no_comment
-    parser = util_parser ''
-
-    directive = parser.read_directive %w[category]
-
-    assert_nil directive
-
-    assert_nil parser.get_tk
-  end
-
-  def test_read_directive_one_liner
-    parser = util_parser 'AAA = 1 # :category: test'
-
-    directive, value = parser.read_directive %w[category]
-
-    assert_equal 'category', directive
-    assert_equal 'test', value
-
-    assert_equal :on_const, parser.get_tk[:kind]
-  end
-
-  def test_read_directive_linear_performance
-    pre = ->(i) {util_parser '# ' + '0'*i + '=000:'}
-    assert_linear_performance((1..5).map{|i|10**i}, pre: pre) do |parser|
-      assert_nil parser.read_directive []
-    end
-  end
-
-  def test_read_documentation_modifiers
-    c = RDoc::Context.new
-
-    parser = util_parser '# :category: test'
-
-    parser.read_documentation_modifiers c, %w[category]
-
-    assert_equal 'test', c.current_section.title
-  end
-
-  def test_read_documentation_modifiers_notnew
-    m = RDoc::AnyMethod.new nil, 'initialize'
-
-    parser = util_parser '# :notnew: test'
-
-    parser.read_documentation_modifiers m, %w[notnew]
-
-    assert m.dont_rename_initialize
-  end
-
-  def test_read_documentation_modifiers_not_dash_new
-    m = RDoc::AnyMethod.new nil, 'initialize'
-
-    parser = util_parser '# :not-new: test'
-
-    parser.read_documentation_modifiers m, %w[not-new]
-
-    assert m.dont_rename_initialize
-  end
-
-  def test_read_documentation_modifiers_not_new
-    m = RDoc::AnyMethod.new nil, 'initialize'
-
-    parser = util_parser '# :not_new: test'
-
-    parser.read_documentation_modifiers m, %w[not_new]
-
-    assert m.dont_rename_initialize
-  end
-
-  def test_sanity_integer
-    util_parser '1'
-    assert_equal '1', @parser.get_tk[:text]
-
-    util_parser '1.0'
-    assert_equal '1.0', @parser.get_tk[:text]
-  end
-
-  def test_sanity_interpolation
-    last_tk = nil
-    util_parser 'class A; B = "#{c}"; end'
-
-    while tk = @parser.get_tk do last_tk = tk end
-
-    assert_equal 'end', last_tk[:text]
-  end
-
-  # If you're writing code like this you're doing it wrong
-
-  def test_sanity_interpolation_crazy
-    util_parser '"#{"#{"a")}" if b}"'
-
-    assert_equal '"#{"#{"a")}" if b}"', @parser.get_tk[:text]
-    assert_nil @parser.get_tk
-  end
-
-  def test_sanity_interpolation_curly
-    util_parser '%{ #{} }'
-
-    assert_equal '%{ #{} }', @parser.get_tk[:text]
-    assert_nil @parser.get_tk
-  end
-
-  def test_sanity_interpolation_format
-    util_parser '"#{stftime("%m-%d")}"'
-
-    while @parser.get_tk do end
-  end
-
-  def test_sanity_symbol_interpolation
-    util_parser ':"#{bar}="'
-
-    while @parser.get_tk do end
-  end
-
-  def test_scan_cr
-    content = <<-CONTENT
-class C\r
-  def m\r
-    a=\\\r
-      123\r
-  end\r
-end\r
-    CONTENT
-
-    util_parser content
-
-    @parser.scan
-
-    c = @top_level.classes.first
-
-    assert_equal 1, c.method_list.length
-  end
-
-  def test_scan_block_comment
-    content = <<-CONTENT
-=begin rdoc
-Foo comment
-=end
-
-class Foo
-
-=begin
-m comment
-=end
-
-  def m() end
-end
-    CONTENT
-
-    util_parser content
-
-    @parser.scan
-
-    foo = @top_level.classes.first
-
-    assert_equal 'Foo comment', foo.comment.text
-
-    m = foo.method_list.first
-
-    assert_equal 'm comment', m.comment.text
-  end
-
-  def test_scan_block_comment_nested # Issue #41
-    content = <<-CONTENT
-require 'something'
-=begin rdoc
-findmeindoc
-=end
-module Foo
-    class Bar
-    end
-end
-    CONTENT
-
-    util_parser content
-
-    @parser.scan
-
-    foo = @top_level.modules.first
-
-    assert_equal 'Foo', foo.full_name
-    assert_equal 'findmeindoc', foo.comment.text
-
-    bar = foo.classes.first
-
-    assert_equal 'Foo::Bar', bar.full_name
-    assert_equal '', bar.comment.text
-  end
-
-  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 block with longer / more advanced formatting
-  # within.
-  #
-  ##
-    content = <<-CONTENT
-=begin rdoc
-
-= DESCRIPTION
-
-This is a simple test class
-
-= RUMPUS
-
-Is a silly word
-
-=end
-class StevenSimpleClass
-  # A band on my iPhone as I wrote this test
-  FRUIT_BATS="Make nice music"
-
-=begin rdoc
-A nice girl
-=end
-
-  def lauren
-    puts "Summoning Lauren!"
-  end
-end
-    CONTENT
-    util_parser content
-
-    @parser.scan
-
-    foo = @top_level.classes.first
-
-    assert_equal "= DESCRIPTION\n\nThis is a simple test class\n\n= RUMPUS\n\nIs a silly word",
-      foo.comment.text
-
-    m = foo.method_list.first
-
-    assert_equal 'A nice girl', m.comment.text
-  end
-
-  def test_scan_class_nested_nodoc
-    content = <<-CONTENT
-class A::B # :nodoc:
-end
-    CONTENT
-
-    util_parser content
-
-    @parser.scan
-
-    visible = @store.all_classes_and_modules.select { |mod| mod.display? }
-
-    assert_empty visible.map { |mod| mod.full_name }
-  end
-
-  def test_scan_constant_in_method
-    content = <<-CONTENT # newline is after M is important
-module M
-  def m
-    A
-    B::C
-  end
-end
-    CONTENT
-
-    util_parser content
-
-    @parser.scan
-
-    m = @top_level.modules.first
-
-    assert_empty m.constants
-
-    assert_empty @store.classes_hash.keys
-    assert_equal %w[M], @store.modules_hash.keys
-  end
-
-  def test_scan_constant_in_rescue
-    content = <<-CONTENT # newline is after M is important
-module M
-  def m
-  rescue A::B
-  rescue A::C => e
-  rescue A::D, A::E
-  rescue A::F,
-         A::G
-  rescue H
-  rescue I => e
-  rescue J, K
-  rescue L =>
-    e
-  rescue M;
-  rescue N,
-         O => e
-  end
-end
-    CONTENT
-
-    util_parser content
-
-    @parser.scan
-
-    m = @top_level.modules.first
-
-    assert_empty m.constants
-
-    assert_empty @store.classes_hash.keys
-    assert_equal %w[M], @store.modules_hash.keys
-  end
-
-  def test_scan_constant_nodoc
-    content = <<-CONTENT # newline is after M is important
-module M
-
-  C = v # :nodoc:
-end
-    CONTENT
-
-    util_parser content
-
-    @parser.scan
-
-    c = @top_level.modules.first.constants.first
-
-    assert c.documented?
-  end
-
-  def test_scan_constant_nodoc_block
-    content = <<-CONTENT # newline is after M is important
-module M
-
-  C = v do # :nodoc:
-  end
-end
-    CONTENT
-
-    util_parser content
-
-    @parser.scan
-
-    c = @top_level.modules.first.constants.first
-
-    assert c.documented?
-  end
-
-  def test_scan_duplicate_module
-    content = <<-CONTENT
-# comment a
-module Foo
-end
-
-# comment b
-module Foo
-end
-    CONTENT
-
-    util_parser content
-
-    @parser.scan
-
-    foo = @top_level.modules.first
-
-    expected = [
-      RDoc::Comment.new('comment a', @top_level),
-      RDoc::Comment.new('comment b', @top_level)
-    ]
-
-    assert_equal expected, foo.comment_location.map { |c, l| c }
-  end
-
-  def test_scan_meta_method_block
-    content = <<-CONTENT
-class C
-
-  ##
-  #  my method
-
-  inline(:my_method) do |*args|
-    "this method used to cause z to disappear"
-  end
-
-  def z
-  end
-    CONTENT
-
-    util_parser content
-
-    @parser.scan
-
-    assert_equal 2, @top_level.classes.first.method_list.length
-  end
-
-  def test_scan_method_semi_method
-    content = <<-CONTENT
-class A
-  def self.m() end; def self.m=() end
-end
-
-class B
-  def self.m() end
-end
-    CONTENT
-
-    util_parser content
-
-    @parser.scan
-
-    a = @store.find_class_named 'A'
-    assert a, 'missing A'
-
-    assert_equal 2, a.method_list.length
-
-    b = @store.find_class_named 'B'
-    assert b, 'missing B'
-
-    assert_equal 1, b.method_list.length
-  end
-
-  def test_scan_markup_override
-    content = <<-CONTENT
-# *awesome*
-class C
-  # :markup: rd
-  # ((*radical*))
-  def m
-  end
-end
-    CONTENT
-
-    util_parser content
-
-    @parser.scan
-
-    c = @top_level.classes.first
-
-    assert_equal 'rdoc', c.comment.format
-
-    assert_equal 'rd', c.method_list.first.comment.format
-  end
-
-  def test_scan_markup_first_comment
-    content = <<-CONTENT
-# :markup: rd
-
-# ((*awesome*))
-class C
-  # ((*radical*))
-  def m
-  end
-end
-    CONTENT
-
-    util_parser content
-
-    @parser.scan
-
-    c = @top_level.classes.first
-
-    assert_equal 'rd', c.comment.format
-
-    assert_equal 'rd', c.method_list.first.comment.format
-  end
-
-  def test_scan_rails_routes
-    util_parser <<-ROUTES_RB
-namespace :api do
-  scope module: :v1 do
-  end
-end
-    ROUTES_RB
-
-    @parser.scan
-
-    assert_empty @top_level.classes
-    assert_empty @top_level.modules
-  end
-
-  def test_scan_tomdoc_meta
-    util_parser <<-RUBY
-# :markup: tomdoc
-
-class C
-
-  # Signature
-  #
-  #   find_by_<field>[_and_<field>...](args)
-  #
-  # field - A field name.
-
-end
-
-    RUBY
-
-    @parser.scan
-
-    c = @top_level.classes.first
-
-    m = c.method_list.first
-
-    assert_equal "find_by_<field>[_and_<field>...]", m.name
-    assert_equal "find_by_<field>[_and_<field>...](args)\n", m.call_seq
-
-    expected =
-      doc(
-        head(3, 'Signature'),
-        list(:NOTE,
-          item(%w[field],
-            para('A field name.'))))
-    expected.file = @top_level
-
-    assert_equal expected, m.comment.parse
-  end
-
-  def test_scan_stopdoc
-    util_parser <<-RUBY
-class C
-  # :stopdoc:
-  class Hidden
-  end
-end
-    RUBY
-
-    @parser.scan
-
-    c = @top_level.classes.first
-
-    hidden = c.classes.first
-
-    refute hidden.document_self
-    assert hidden.ignored?
-  end
-
-  def test_scan_stopdoc_class_alias
-    util_parser <<-RUBY
-# :stopdoc:
-module A
-  B = C
-end
-    RUBY
-
-    @parser.scan
-
-    assert_empty @store.all_classes
-
-    assert_equal 1, @store.all_modules.length
-    m = @store.all_modules.first
-
-    assert m.ignored?
-  end
-
-  def test_scan_stopdoc_nested
-    util_parser <<-RUBY
-# :stopdoc:
-class A::B
-end
-    RUBY
-
-    @parser.scan
-
-    a   = @store.modules_hash['A']
-    a_b = @store.classes_hash['A::B']
-
-    refute a.document_self, 'A is inside stopdoc'
-    assert a.ignored?,      'A is inside stopdoc'
-
-    refute a_b.document_self, 'A::B is inside stopdoc'
-    assert a_b.ignored?,      'A::B is inside stopdoc'
-  end
-
-  def test_scan_struct_self_brackets
-    util_parser <<-RUBY
-class C < M.m
-  def self.[]
-  end
-end
-    RUBY
-
-    @parser.scan
-
-    c = @store.find_class_named 'C'
-    assert_equal %w[C::[]], c.method_list.map { |m| m.full_name }
-  end
-
-  def test_scan_visibility
-    util_parser <<-RUBY
-class C
-   def a() end
-
-   private :a
-
-   class << self
-     def b() end
-     private :b
-   end
-end
-    RUBY
-
-    @parser.scan
-
-    c = @store.find_class_named 'C'
-
-    c_a = c.find_method_named 'a'
-
-    assert_equal :private, c_a.visibility
-    refute c_a.singleton
-
-    c_b = c.find_method_named 'b'
-
-    assert_equal :private, c_b.visibility
-    assert c_b.singleton
-  end
-
-  def test_scan_visibility_count
-    util_parser <<-RUBY
-class C < Original::Base
-  class C2 < Original::Base
-    def m0() end
-    def m1() end
-
-    private
-
-    def m2() end
-    def m3() end
-    def m4() end
-  end
-end
-    RUBY
-
-    @parser.scan
-
-    c = @store.find_class_named 'C::C2'
-
-    private_method_count = c.method_list.count { |m| :private == m.visibility }
-    assert_equal 3, private_method_count
-
-    public_method_count = c.method_list.count { |m| :public == m.visibility }
-    assert_equal 2, public_method_count
-  end
-
-  def test_scan_constant_visibility
-    util_parser <<-RUBY
-class C
-   CONST_A = 123
-
-   CONST_B = 234
-   private_constant :CONST_B
-
-   CONST_C = 345
-   public_constant :CONST_C
-end
-    RUBY
-
-    @parser.scan
-
-    c = @store.find_class_named 'C'
-    const_a, const_b, const_c = c.constants.sort_by(&:name)
-
-    assert_equal 'CONST_A', const_a.name
-    assert_equal :public, const_a.visibility
-
-    assert_equal 'CONST_B', const_b.name
-    assert_equal :private, const_b.visibility
-
-    assert_equal 'CONST_C', const_c.name
-    assert_equal :public, const_c.visibility
-  end
-
-  def test_document_after_rescue_inside_paren
-    util_parser <<-RUBY
-class C
-  attr_accessor :sample if (1.inexistent_method rescue false)
-  # first
-  # second
-  def a
-  end
-end
-    RUBY
-
-    @parser.scan
-
-    c = @store.find_class_named 'C'
-
-    c_a = c.find_method_named 'a'
-    assert_equal "first\nsecond", c_a.comment.text
-  end
-
-  def test_singleton_method_via_eigenclass
-    util_parser <<-RUBY
-class C
-   class << self
-     def a() end
-   end
-end
-    RUBY
-
-    @parser.scan
-
-    c   = @store.find_class_named 'C'
-    c_a = c.find_method_named 'a'
-
-    assert_equal :public, c_a.visibility
-    assert c_a.singleton
-  end
-
-  def test_stopdoc_after_comment
-    util_parser <<-EOS
-      module Bar
-        # hello
-        module Foo
-          # :stopdoc:
-        end
-        # there
-        class Baz
-          # :stopdoc:
-        end
-      end
-    EOS
-
-    @parser.parse_statements @top_level
-
-    foo = @top_level.modules.first.modules.first
-    assert_equal 'Foo', foo.name
-    assert_equal 'hello', foo.comment.text
-
-    baz = @top_level.modules.first.classes.first
-    assert_equal 'Baz', baz.name
-    assert_equal 'there', baz.comment.text
-  end
-
-  def util_parser(content)
-    @parser = RDoc::Parser::Ruby.new @top_level, @filename, content, @options,
-                                     @stats
-  end
-
-  def util_two_parsers(first_file_content, second_file_content)
-    util_parser first_file_content
-
-    @parser2 = RDoc::Parser::Ruby.new @top_level2, @filename,
-                                      second_file_content, @options, @stats
-  end
-
-  def test_parse_const_third_party
-    util_parser <<-CLASS
-class A
-  true if B
-  true if B::C
-  true if B::C::D
-
-  module B
-  end
-end
-    CLASS
-
-    tk = @parser.get_tk
-
-    @parser.parse_class @top_level, RDoc::Parser::Ruby::NORMAL, tk, @comment
-
-    a = @top_level.classes.first
-    assert_equal 'A', a.full_name
-
-    visible = @store.all_modules.reject { |mod| mod.suppressed? }
-    visible = visible.map { |mod| mod.full_name }
-
-    assert_equal ['A::B'], visible
-  end
-
-  def test_parse_const_alias_defined_elsewhere
-    util_parser <<-CLASS
-module A
-  Aliased = Defined
-end
-
-module A
-  class Defined
-  end
-end
-    CLASS
-
-    @parser.scan
-
-    a = @top_level.modules.first
-    assert_equal 'A', a.full_name
-    aliased = a.constants.first
-    assert_equal 'A::Aliased', aliased.full_name
-    assert_equal [], a.modules.map(&:full_name)
-    assert_equal ['A::Defined', 'A::Aliased'], a.classes.map(&:full_name)
-    assert_equal ['A::Aliased'], a.constants.map(&:full_name)
-
-    visible = @store.all_modules.reject { |mod| mod.suppressed? }
-    visible = visible.map { |mod| mod.full_name }
-
-    assert_equal ['A'], visible
-  end
-
-  def test_parse_const_alias_defined_far_away
-    util_parser <<-CLASS
-module A
-  Aliased = ::B::C::Defined
-end
-
-module B
-  module C
-    class Defined
-    end
-  end
-end
-    CLASS
-
-    @parser.scan
-
-    a = @top_level.modules.first
-    assert_equal 'A', a.full_name
-    assert_empty a.classes
-    assert_empty a.modules
-    assert_equal ['A::Aliased'], a.constants.map(&:full_name)
-
-    defined = @store.find_class_named 'B::C::Defined'
-    assert_equal 'B::C::Defined', defined.full_name
-
-    aliased = @store.find_class_named 'B::C::Aliased'
-    assert_equal 'B::C::Aliased', aliased.full_name
-
-    visible = @store.all_modules.reject { |mod| mod.suppressed? }
-    visible = visible.map { |mod| mod.full_name }
-
-    assert_equal ['A', 'B', 'B::C'], visible
-  end
-
-  def test_parse_include_by_dynamic_definition
-    util_parser <<-CLASS
-module A
-  class B
-    include(Module.new do
-      def e(m)
-      end
-    end)
-  end
-
-  class C
-  end
-
-  class D
-  end
-end
-    CLASS
-
-    @parser.scan
-
-    a = @store.find_module_named 'A'
-    assert_equal 'A', a.full_name
-    a_b = a.find_class_named 'B'
-    assert_equal 'A::B', a_b.full_name
-    a_c = a.find_class_named 'C'
-    assert_equal 'A::C', a_c.full_name
-    a_d = a.find_class_named 'D'
-    assert_equal 'A::D', a_d.full_name
-  end
-
-  def test_parse_include_by_dynamic_definition_without_paren
-    util_parser <<-CLASS
-module A
-  class B
-    include(Module.new do
-      def e m
-      end
-    end)
-  end
-
-  class C
-  end
-
-  class D
-  end
-end
-    CLASS
-
-    @parser.scan
-
-    a = @store.find_module_named 'A'
-    assert_equal 'A', a.full_name
-    a_b = a.find_class_named 'B'
-    assert_equal 'A::B', a_b.full_name
-    a_c = a.find_class_named 'C'
-    assert_equal 'A::C', a_c.full_name
-    a_d = a.find_class_named 'D'
-    assert_equal 'A::D', a_d.full_name
-  end
-
-  def test_parse_include_by_dynamic_definition_via_variable
-    util_parser <<-CLASS
-module A
-  class B
-    m = Module.new do
-      def e(m)
-      end
-    end
-    include m
-  end
-
-  class C
-  end
-
-  class D
-  end
-end
-    CLASS
-
-    @parser.scan
-
-    a = @store.find_module_named 'A'
-    assert_equal 'A', a.full_name
-    a_b = a.find_class_named 'B'
-    assert_equal 'A::B', a_b.full_name
-    a_c = a.find_class_named 'C'
-    assert_equal 'A::C', a_c.full_name
-    a_d = a.find_class_named 'D'
-    assert_equal 'A::D', a_d.full_name
-  end
-
-  def test_parse_include_by_dynamic_definition_with_brace
-    util_parser <<-CLASS
-module A
-  class B
-    extend(e {
-      def f(g)
-      end
-    })
-  end
-
-  class C
-  end
-
-  class D
-  end
-end
-    CLASS
-
-    @parser.scan
-
-    a = @store.find_module_named 'A'
-    assert_equal 'A', a.full_name
-    a_b = a.find_class_named 'B'
-    assert_equal 'A::B', a_b.full_name
-    a_c = a.find_class_named 'C'
-    assert_equal 'A::C', a_c.full_name
-    a_d = a.find_class_named 'D'
-    assert_equal 'A::D', a_d.full_name
-  end
-
-  def test_parse_include_by_dynamic_definition_directly
-    util_parser <<-CLASS
-module A
-  class B
-    include Module.new do
-      def e m
-      end
-    end
-  end
-
-  class C
-  end
-
-  class D
-  end
-end
-    CLASS
-
-    @parser.scan
-
-    a = @store.find_module_named 'A'
-    assert_equal 'A', a.full_name
-    a_b = a.find_class_named 'B'
-    assert_equal 'A::B', a_b.full_name
-    a_c = a.find_class_named 'C'
-    assert_equal 'A::C', a_c.full_name
-    a_d = a.find_class_named 'D'
-    assert_equal 'A::D', a_d.full_name
-  end
-
-  def test_parse_included
-    util_parser <<-CLASS
-module A
-  module B
-    extend ActiveSupport::Concern
-    included do
-      ##
-      # :singleton-method:
-      # Hello
-      mattr_accessor :foo
-    end
-  end
-end
-    CLASS
-
-    @parser.scan
-
-    a = @store.find_module_named 'A'
-    assert_equal 'A', a.full_name
-    a_b = a.find_module_named 'B'
-    assert_equal 'A::B', a_b.full_name
-    meth = a_b.method_list.first
-    assert_equal 'foo', meth.name
-    assert_equal 'Hello', meth.comment.text
-  end
-
-  def test_end_that_doesnt_belong_to_class_doesnt_change_visibility
-    util_parser <<-CLASS
-class A
-  private
-
-  begin
-  end
-
-  # Hello
-  def foo() end
-end
-    CLASS
-
-    @parser.scan
-
-    a = @store.find_class_named 'A'
-    assert_equal 'A', a.full_name
-    assert_equal 'foo', a.find_method_named('foo').name
-    meth = a.method_list.first
-    assert_equal 'Hello', meth.comment.text
-  end
-
-  def test_parenthesized_cdecl
-    util_parser <<-RUBY
-module DidYouMean
-  class << (NameErrorCheckers = Object.new)
-  end
-end
-    RUBY
-
-    @parser.scan
-
-    refute_predicate @store.find_class_or_module('DidYouMean'), :nil?
-    refute_predicate @store.find_class_or_module('DidYouMean::NameErrorCheckers'), :nil?
-  end
-end
diff --git a/test/rdoc/test_rdoc_parser_simple.rb b/test/rdoc/test_rdoc_parser_simple.rb
deleted file mode 100644
index 4255cb97d875bb..00000000000000
--- a/test/rdoc/test_rdoc_parser_simple.rb
+++ /dev/null
@@ -1,115 +0,0 @@
-# frozen_string_literal: true
-require_relative 'helper'
-
-class TestRDocParserSimple < RDoc::TestCase
-
-  def setup
-    super
-
-    @tempfile = Tempfile.new self.class.name
-    filename = @tempfile.path
-
-    @top_level = @store.add_file filename
-    @fn = filename
-    @options = RDoc::Options.new
-    @stats = RDoc::Stats.new @store, 0
-  end
-
-  def teardown
-    super
-
-    @tempfile.close!
-  end
-
-  def test_initialize_metadata
-    parser = util_parser ":unhandled: \n"
-
-    assert_includes @top_level.metadata, 'unhandled'
-
-    assert_equal ":unhandled: \n", parser.content
-  end
-
-  def test_remove_coding_comment
-    parser = util_parser <<-TEXT
-# -*- mode: rdoc; coding: utf-8; fill-column: 74; -*-
-
-Regular expressions (<i>regexp</i>s) are patterns which describe the
-contents of a string.
-    TEXT
-
-    parser.scan
-
-    expected = <<-TEXT.strip
-Regular expressions (<i>regexp</i>s) are patterns which describe the
-contents of a string.
-    TEXT
-
-    assert_equal expected, @top_level.comment.text
-  end
-
-  # RDoc stops processing comments if it finds a comment line CONTAINING
-  # '<tt>#--</tt>'. This can be used to separate external from internal
-  # comments, or to stop a comment being associated with a method,
-  # class, or module. Commenting CAN be turned back on with
-  # a line that STARTS '<tt>#++</tt>'.
-  #
-  # I've seen guys that comment their code like this:
-  #   # This method....
-  #   #-----------------
-  #   def method
-  #
-  # => either we do it only in ruby code, or we require the leading #
-  #    (to avoid conflict with rules).
-  #
-  #   TODO: require the leading #, to provide the feature in simple text files.
-  #   Note: in ruby & C code, we require '#--' & '#++' or '*--' & '*++',
-  #   to allow rules:
-  #
-  #   # this is a comment
-  #   #---
-  #   # private text
-  #   #+++
-  #   # this is a rule:
-  #   # ---
-
-  def test_remove_private_comments
-    parser = util_parser "foo\n\n--\nbar\n++\n\nbaz\n"
-
-    parser.scan
-
-    expected = "foo\n\n\nbaz"
-
-    assert_equal expected, @top_level.comment.text
-  end
-
-  def test_remove_private_comments_rule
-    parser = util_parser "foo\n---\nbar"
-
-    parser.scan
-
-    expected = "foo\n---\nbar"
-
-    assert_equal expected, @top_level.comment.text
-  end
-
-  def test_remove_private_comments_star
-    parser = util_parser "* foo\n* bar\n"
-
-    parser.scan
-
-    assert_equal "* foo\n* bar", @top_level.comment.text
-  end
-
-  def test_scan
-    parser = util_parser 'it *really* works'
-
-    parser.scan
-
-    assert_equal 'it *really* works', @top_level.comment.text
-  end
-
-  def util_parser(content)
-    RDoc::Parser::Simple.new @top_level, @fn, content, @options, @stats
-  end
-
-end
diff --git a/test/rdoc/test_rdoc_rd.rb b/test/rdoc/test_rdoc_rd.rb
deleted file mode 100644
index 38de575bb05713..00000000000000
--- a/test/rdoc/test_rdoc_rd.rb
+++ /dev/null
@@ -1,30 +0,0 @@
-# frozen_string_literal: true
-require_relative 'helper'
-
-class TestRDocRd < RDoc::TestCase
-
-  def test_class_parse
-    expected =
-      @RM::Document.new(
-        @RM::Paragraph.new('hello'))
-
-    assert_equal expected, RDoc::RD.parse("hello")
-  end
-
-  def test_class_parse_begin_end
-    expected =
-      @RM::Document.new(
-        @RM::Paragraph.new('hello'))
-
-    assert_equal expected, RDoc::RD.parse("=begin\nhello\n=end\n")
-  end
-
-  def test_class_parse_newline
-    expected =
-      @RM::Document.new(
-        @RM::Paragraph.new('hello'))
-
-    assert_equal expected, RDoc::RD.parse("hello\n")
-  end
-
-end
diff --git a/test/rdoc/test_rdoc_rd_block_parser.rb b/test/rdoc/test_rdoc_rd_block_parser.rb
deleted file mode 100644
index ca0ac9f9e952c4..00000000000000
--- a/test/rdoc/test_rdoc_rd_block_parser.rb
+++ /dev/null
@@ -1,557 +0,0 @@
-# frozen_string_literal: true
-require_relative 'helper'
-
-class TestRDocRdBlockParser < RDoc::TestCase
-
-  def setup
-    super
-
-    @block_parser = RDoc::RD::BlockParser.new
-  end
-
-  def test_add_footnote
-    index = @block_parser.add_footnote 'context'
-
-    assert_equal 1, index
-
-    expected = [
-      para('{^1}[rdoc-label:footmark-1:foottext-1]', ' ', 'context'),
-      blank_line,
-    ]
-
-    assert_equal expected, @block_parser.footnotes
-
-    index = @block_parser.add_footnote 'other'
-
-    assert_equal 2, index
-  end
-
-  def test_parse_desclist
-    list = <<-LIST
-:one
-  desc one
-:two
-  desc two
-    LIST
-
-    expected =
-      doc(
-        list(:NOTE,
-          item("one", para("desc one")),
-          item("two", para("desc two"))))
-
-    assert_equal expected, parse(list)
-  end
-
-  def test_parse_enumlist
-    list = <<-LIST
-(1) one
-(1) two
-    LIST
-
-    expected =
-      doc(
-        list(:NUMBER,
-          item(nil, para("one")),
-          item(nil, para("two"))))
-
-    assert_equal expected, parse(list)
-  end
-
-  def test_parse_enumlist_paragraphs
-    list = <<-LIST
-(1) one
-
-    two
-    LIST
-
-    expected =
-      doc(
-        list(:NUMBER,
-          item(nil,
-            para("one"),
-            para("two"))))
-
-    assert_equal expected, parse(list)
-  end
-
-  def test_parse_enumlist_multiline
-    list = <<-LIST
-(1) one
-    two
-    LIST
-
-    contents = "one\n     two" # 1.8 vs 1.9
-
-    expected =
-      doc(
-        list(:NUMBER,
-          item(nil, para(*contents))))
-
-    assert_equal expected, parse(list)
-  end
-
-  def test_parse_enumlist_verbatim
-    list = <<-LIST
-(1) item
-      verbatim
-    LIST
-
-    expected =
-      doc(
-        list(:NUMBER,
-          item(nil,
-            para("item"),
-            verb("verbatim\n"))))
-
-    assert_equal expected, parse(list)
-  end
-
-  def test_parse_enumlist_verbatim_continue
-    list = <<-LIST
-(1) one
-      verbatim
-    two
-    LIST
-
-    expected =
-      doc(
-        list(:NUMBER,
-          item(nil,
-            para("one"),
-            verb("verbatim\n"),
-            para("two"))))
-
-    assert_equal expected, parse(list)
-  end
-
-  def test_parse_footnote
-    expected =
-      doc(
-        para("{*1}[rdoc-label:foottext-1:footmark-1]"),
-        rule(1),
-        para("{^1}[rdoc-label:footmark-1:foottext-1]", " ", "text"),
-        blank_line)
-
-    assert_equal expected, parse("((-text-))")
-  end
-
-  def test_parse_include
-    @block_parser.include_path = [Dir.tmpdir]
-
-    expected = doc(@RM::Include.new("parse_include", [Dir.tmpdir]))
-
-    assert_equal expected, parse("<<< parse_include")
-  end
-
-  def test_parse_include_subtree
-    @block_parser.include_path = [Dir.tmpdir]
-
-    expected =
-      doc(
-        blank_line,
-        para("include <em>worked</em>"),
-        blank_line,
-        blank_line)
-
-    tf = Tempfile.open %w[parse_include .rd] do |io|
-      io.puts "=begin\ninclude ((*worked*))\n=end"
-      io.flush
-
-      str = <<-STR
-<<< #{File.basename io.path}
-      STR
-
-      assert_equal expected, parse(str)
-      io
-    end
-    tf.close!
-  end
-
-=begin
-  def test_parse_include_other_format
-    @block_parser.include_path = [Dir.tmpdir]
-
-    expected =
-      doc(
-        blank_line,
-        para("include ((*worked*))"),
-        blank_line,
-        blank_line)
-
-    str = <<~STR
-    =begin nonrd
-    <<< worked
-    =end
-    STR
-
-    assert_equal(expected, @block_parser.parse str.lines.to_a)
-  end
-=end
-
-  def test_parse_heading
-    assert_equal doc(head(1, "H")), parse("= H")
-    assert_equal doc(head(2, "H")), parse("== H")
-    assert_equal doc(head(3, "H")), parse("=== H")
-    assert_equal doc(head(4, "H")), parse("==== H")
-    assert_equal doc(head(5, "H")), parse("+ H")
-    assert_equal doc(head(6, "H")), parse("++ H")
-  end
-
-  def test_parse_itemlist
-    list = <<-LIST
-* one
-* two
-    LIST
-
-    expected =
-      doc(
-        list(:BULLET,
-          item(nil, para("one")),
-          item(nil, para("two"))))
-
-    assert_equal expected, parse(list)
-  end
-
-  def test_parse_itemlist_multiline
-    list = <<-LIST
-* one
-  two
-    LIST
-
-    contents = "one\n   two" # 1.8 vs 1.9
-
-    expected =
-      doc(
-        list(:BULLET,
-          item(nil, para(*contents))))
-
-    assert_equal expected, parse(list)
-  end
-
-  def test_parse_itemlist_nest
-    list = <<-LIST
-* one
-  * inner
-* two
-    LIST
-
-    expected =
-      doc(
-        list(:BULLET,
-          item(nil,
-            para("one"),
-            list(:BULLET,
-              item(nil, para("inner")))),
-          item(nil,
-            para("two"))))
-
-    assert_equal expected, parse(list)
-  end
-
-  def test_parse_itemlist_paragraphs
-    list = <<-LIST
-* one
-
-  two
-    LIST
-
-    expected =
-      doc(
-        list(:BULLET,
-          item(nil,
-            para("one"),
-            para("two"))))
-
-    assert_equal expected, parse(list)
-  end
-
-  def test_parse_itemlist_verbatim
-    list = <<-LIST
-* item
-    verbatim
-    LIST
-
-    expected =
-      doc(
-        list(:BULLET,
-          item(nil,
-            para("item"),
-            verb("verbatim\n"))))
-
-    assert_equal expected, parse(list)
-  end
-
-  def test_parse_itemlist_verbatim_continue
-    list = <<-LIST
-* one
-    verbatim
-  two
-    LIST
-
-    expected =
-      doc(
-        list(:BULLET,
-          item(nil,
-            para("one"),
-            verb("verbatim\n"),
-            para("two"))))
-
-    assert_equal expected, parse(list)
-  end
-
-  def test_parse_lists
-    list = <<-LIST
-(1) one
-(1) two
-* three
-* four
-(1) five
-(1) six
-    LIST
-
-    expected =
-      doc(
-        list(:NUMBER,
-          item(nil, para("one")),
-          item(nil, para("two"))),
-        list(:BULLET,
-          item(nil, para("three")),
-          item(nil, para("four"))),
-        list(:NUMBER,
-          item(nil, para("five")),
-          item(nil, para("six"))))
-
-    assert_equal expected, parse(list)
-  end
-
-  def test_parse_lists_nest
-    list = <<-LIST
-(1) one
-(1) two
-      * three
-      * four
-(1) five
-(1) six
-    LIST
-
-    expected =
-      doc(
-        list(:NUMBER,
-          item(nil, para("one")),
-          item(nil,
-            para("two"),
-            list(:BULLET,
-              item(nil, para("three")),
-              item(nil, para("four")))),
-          item(nil, para("five")),
-          item(nil, para("six"))))
-
-    assert_equal expected, parse(list)
-  end
-
-  def test_parse_lists_nest_verbatim
-    list = <<-LIST
-(1) one
-(1) two
-      * three
-      * four
-     verbatim
-(1) five
-(1) six
-    LIST
-
-    expected =
-      doc(
-        list(:NUMBER,
-          item(nil, para("one")),
-          item(nil,
-            para("two"),
-            list(:BULLET,
-              item(nil, para("three")),
-              item(nil, para("four"))),
-            verb("verbatim\n")),
-          item(nil, para("five")),
-          item(nil, para("six"))))
-
-    assert_equal expected, parse(list)
-  end
-
-  def test_parse_lists_nest_verbatim2
-    list = <<-LIST
-(1) one
-(1) two
-      * three
-      * four
-      verbatim
-(1) five
-(1) six
-    LIST
-
-    expected =
-      doc(
-        list(:NUMBER,
-          item(nil, para("one")),
-          item(nil,
-            para("two"),
-            list(:BULLET,
-              item(nil, para("three")),
-              item(nil, para("four"))),
-            verb("verbatim\n")),
-          item(nil, para("five")),
-          item(nil, para("six"))))
-
-    assert_equal expected, parse(list)
-  end
-
-  def test_parse_methodlist
-    list = <<-LIST
---- Array#each {|i| ... }
-      yield block for each item.
---- Array#index(val)
-      return index of first item which equals with val. if it hasn't
-      same item, return nil.
-    LIST
-
-    expected =
-      doc(
-        list(:LABEL,
-          item(
-            "<tt>Array#each {|i| ... }</tt>",
-            para("yield block for each item.")),
-          item(
-            "<tt>Array#index(val)</tt>",
-            para("return index of first item which equals with val. if it hasn't same item, return nil."))))
-
-    assert_equal expected, parse(list)
-  end
-
-  def test_parse_methodlist_empty
-    list = <<-LIST
---- A#b
-
-    LIST
-
-    expected =
-      doc(
-        list(:LABEL,
-          item("<tt>A#b</tt>")))
-
-    assert_equal expected, parse(list)
-  end
-
-  def test_parse_methodlist_paragraph
-    list = <<-LIST
---- A#b
-
-    one
-    LIST
-
-    expected =
-      doc(
-        list(:LABEL,
-          item(
-            "<tt>A#b</tt>",
-            para("one"))))
-
-    assert_equal expected, parse(list)
-  end
-
-  def test_parse_methodlist_paragraph2
-    list = <<-LIST.chomp
---- A#b
-
-    one
-two
-    LIST
-
-    expected =
-      doc(
-        list(:LABEL,
-          item(
-            "<tt>A#b</tt>",
-            para("one"))),
-        para("two"))
-
-    assert_equal expected, parse(list)
-  end
-
-  def test_parse_methodlist_paragraph_verbatim
-    list = <<-LIST.chomp
---- A#b
-
-    text
-      verbatim
-    LIST
-
-    expected =
-      doc(
-        list(:LABEL,
-          item(
-            "<tt>A#b</tt>",
-            para("text"),
-            verb("verbatim\n"))))
-
-    assert_equal expected, parse(list)
-  end
-
-  def test_parse_verbatim
-    assert_equal doc(verb("verbatim\n")), parse("  verbatim")
-  end
-
-  def test_parse_verbatim_blankline
-    expected = doc(verb("one\n", "\n", "two\n"))
-
-    verbatim = <<-VERBATIM
-  one
-
-  two
-    VERBATIM
-
-    assert_equal expected, parse(verbatim)
-  end
-
-  def test_parse_verbatim_indent
-    expected = doc(verb("one\n", " two\n"))
-
-    verbatim = <<-VERBATIM
-  one
-   two
-    VERBATIM
-
-    assert_equal expected, parse(verbatim)
-  end
-
-  def test_parse_verbatim_multi
-    expected = doc(verb("one\n", "two\n"))
-
-    verbatim = <<-VERBATIM
-  one
-  two
-    VERBATIM
-
-    assert_equal expected, parse(verbatim)
-  end
-
-  def test_parse_textblock
-    assert_equal doc(para("text")), parse("text")
-  end
-
-  def test_parse_textblock_multi
-    expected = doc(para("one two"))
-
-    assert_equal expected, parse("one\ntwo")
-  end
-
-  def parse text
-    text = ["=begin", text, "=end"].join "\n"
-
-    doc = @block_parser.parse text.lines.to_a
-
-    assert_equal blank_line, doc.parts.shift, "=begin blankline"
-    assert_equal blank_line, doc.parts.pop, "=end blankline"
-
-    doc
-  end
-
-end
diff --git a/test/rdoc/test_rdoc_rd_inline.rb b/test/rdoc/test_rdoc_rd_inline.rb
deleted file mode 100644
index 6bfb229933b156..00000000000000
--- a/test/rdoc/test_rdoc_rd_inline.rb
+++ /dev/null
@@ -1,63 +0,0 @@
-# frozen_string_literal: true
-require_relative 'helper'
-
-class TestRDocRdInline < RDoc::TestCase
-
-  def setup
-    super
-
-    @inline = RDoc::RD::Inline.new '+text+', 'text'
-  end
-
-  def test_class_new
-    inline = RDoc::RD::Inline.new @inline
-
-    refute_equal inline.rdoc, inline.reference
-  end
-
-  def test_initialize
-    inline = RDoc::RD::Inline.new 'text'
-
-    assert_equal inline.rdoc, inline.reference
-    refute_same  inline.rdoc, inline.reference
-  end
-
-  def test_initialize_inline
-    inline = RDoc::RD::Inline.new @inline
-
-    assert_equal '+text+', inline.rdoc
-    assert_equal 'text',   inline.reference
-  end
-
-  def test_append_inline
-    out = @inline.append @inline
-
-    assert_same @inline, out
-
-    assert_equal '+text++text+', @inline.rdoc
-    assert_equal 'texttext',     @inline.reference
-  end
-
-  def test_append_string
-    @inline.append ' more'
-
-    assert_equal '+text+ more', @inline.rdoc
-    assert_equal 'text more',   @inline.reference
-  end
-
-  def test_equals2
-    assert_equal @inline, RDoc::RD::Inline.new('+text+', 'text')
-    refute_equal @inline, RDoc::RD::Inline.new('+text+', 'other')
-    refute_equal @inline, RDoc::RD::Inline.new('+other+', 'text')
-    refute_equal @inline, Object.new
-  end
-
-  def test_inspect
-    assert_equal '(inline: +text+)', @inline.inspect
-  end
-
-  def test_to_s
-    assert_equal '+text+', @inline.to_s
-  end
-
-end
diff --git a/test/rdoc/test_rdoc_rd_inline_parser.rb b/test/rdoc/test_rdoc_rd_inline_parser.rb
deleted file mode 100644
index 9aff6139bc83ad..00000000000000
--- a/test/rdoc/test_rdoc_rd_inline_parser.rb
+++ /dev/null
@@ -1,178 +0,0 @@
-# frozen_string_literal: true
-require_relative 'helper'
-
-class TestRDocRdInlineParser < RDoc::TestCase
-
-  def setup
-    super
-
-    @block_parser = RDoc::RD::BlockParser.new
-    @block_parser.instance_variable_set :@i, 0
-    @inline_parser = RDoc::RD::InlineParser.new @block_parser
-  end
-
-  def test_parse
-    assert_equal 'regular <em>emphasis</em>', parse('regular ((*emphasis*))')
-  end
-
-  def test_parse_code
-    assert_equal '<code>text</code>', parse('(({text}))')
-  end
-
-  def test_parse_em
-    assert_equal '<em>text</em>', parse('((*text*))')
-  end
-
-  def test_parse_footnote
-    assert_equal '{*1}[rdoc-label:foottext-1:footmark-1]', parse('((-text-))')
-
-    expected = [
-      @RM::Paragraph.new('{^1}[rdoc-label:footmark-1:foottext-1]', ' ', 'text'),
-      blank_line,
-    ]
-
-    assert_equal expected, @block_parser.footnotes
-  end
-
-  def test_parse_index
-    assert_equal '<span id="label-text">text</span>', parse('((:text:))')
-
-    assert_includes @block_parser.labels, 'text'
-  end
-
-  def test_parse_kbd
-    assert_equal '<tt>text</tt>', parse('((%text%))')
-  end
-
-  def test_parse_multiple
-    assert_equal '<em>one</em> <em>two</em>', parse('((*one*)) ((*two*))')
-  end
-
-  def test_parse_newline
-    assert_equal "one\ntwo", parse("one\ntwo")
-  end
-
-  def test_parse_quote
-    assert_equal 'one " two', parse('one " two')
-  end
-
-  def test_parse_ref
-    assert_equal '{text}[rdoc-label:text]', parse('((<text>))')
-  end
-
-  def test_parse_ref_em
-    assert_equal '{<em>text</em>}[rdoc-label:text]', parse('((<((*text*))>))')
-  end
-
-  def test_parse_ref_filename_quote
-    assert_equal '{RD/foo}[rdoc-label:RD/foo]', parse('((<RD/"foo">))')
-  end
-
-  def test_parse_ref_filename
-    assert_equal '{RD}[rdoc-label:RD/]', parse('((<RD/>))')
-  end
-
-  def test_parse_ref_quote
-    assert_equal '{text \\"}[rdoc-label:text \\"]', parse('((<text \">))')
-  end
-
-  def test_parse_ref_quote_content
-    assert_equal '{<em>text</em>}[rdoc-label:text]',
-                 parse('((<"((*text*))">))')
-  end
-
-  def test_parse_ref_quote_content_multi
-    assert_equal '{<em>one</em> <em>two</em>}[rdoc-label:one two]',
-                 parse('((<"((*one*)) ((*two*))">))')
-  end
-
-  def test_parse_ref_substitute
-    assert_equal '{text}[rdoc-label:thing]', parse('((<text|thing>))')
-  end
-
-  def test_parse_ref_substitute_element_quote
-    assert_equal '{text}[rdoc-label:"RD"]',
-                 parse('((<text|"RD">))')
-  end
-
-  def test_parse_ref_substitute_filename
-    assert_equal '{text}[rdoc-label:RD/]', parse('((<text|RD/>))')
-  end
-
-  def test_parse_ref_substitute_filename_label
-    assert_equal '{text}[rdoc-label:RD/label]',
-                 parse('((<text|RD/label>))')
-  end
-
-  def test_parse_ref_substitute_filename_quote
-    assert_equal '{text}[rdoc-label:"RD"/]', parse('((<text|"RD"/>))')
-  end
-
-  def test_parse_ref_substitute_multi_content
-    assert_equal '{<em>one</em> two}[rdoc-label:thing]',
-                 parse('((<((*one*)) two|thing>))')
-  end
-
-  def test_parse_ref_substitute_multi_content2
-    assert_equal '{<em>one</em> \\" two}[rdoc-label:thing]',
-                 parse('((<((*one*)) \" two|thing>))')
-  end
-
-  def test_parse_ref_substitute_multi_content3
-    assert_equal '{<em>one</em> \\" <em>two</em>}[rdoc-label:thing]',
-                 parse('((<((*one*)) \" ((*two*))|thing>))')
-  end
-
-  def test_parse_ref_substitute_quote
-    assert_equal '{one | two}[rdoc-label:thing]',
-                 parse('((<"one | two"|thing>))')
-  end
-
-  def test_parse_ref_substitute_quote_content
-    assert_equal '{<em>text</em>}[rdoc-label:thing]',
-                 parse('((<"((*text*))"|thing>))')
-  end
-
-  def test_parse_ref_substitute_url
-    assert_equal '{text}[http://example]',
-                 parse('((<text|URL:http://example>))')
-  end
-
-  def test_parse_ref_url
-    assert_equal '{http://example}[http://example]',
-                 parse('((<URL:http://example>))')
-  end
-
-  def test_parse_var
-    assert_equal '+text+', parse('((|text|))')
-  end
-
-  def test_parse_verb
-    assert_equal '<tt>text</tt>', parse("(('text'))")
-  end
-
-  def test_parse_verb_backslash
-    assert_equal "<tt>(('text'))</tt>", parse("(('(('text\\'))'))")
-  end
-
-  def test_parse_verb_backslash_backslash
-    assert_equal '<tt>text \\</tt>', parse("(('text \\\\'))")
-  end
-
-  def test_parse_verb_backslash_quote
-    assert_equal '<tt>text "</tt>', parse("(('text \\\"'))")
-  end
-
-  def test_parse_verb_emphasis
-    assert_equal '<tt>((*emphasis*))</tt>', parse("(('((*emphasis*))'))")
-  end
-
-  def test_parse_verb_multiple
-    assert_equal '<tt>((*text*))</tt>', parse("(('((*text*))'))")
-  end
-
-  def parse text
-    @inline_parser.parse text
-  end
-
-end
diff --git a/test/rdoc/test_rdoc_rdoc.rb b/test/rdoc/test_rdoc_rdoc.rb
deleted file mode 100644
index 853d7dad22904e..00000000000000
--- a/test/rdoc/test_rdoc_rdoc.rb
+++ /dev/null
@@ -1,593 +0,0 @@
-# frozen_string_literal: true
-require_relative 'helper'
-
-class TestRDocRDoc < RDoc::TestCase
-
-  def setup
-    super
-
-    @rdoc = RDoc::RDoc.new
-    @rdoc.options = RDoc::Options.new
-
-    @stats = RDoc::Stats.new @store, 0, 0
-    @rdoc.instance_variable_set :@stats, @stats
-  end
-
-  def test_document # functional test
-    options = RDoc::Options.new
-    options.files = [File.expand_path('../xref_data.rb', __FILE__)]
-    options.setup_generator 'ri'
-    options.main_page = 'MAIN_PAGE.rdoc'
-    options.root      = Pathname File.expand_path('..', __FILE__)
-    options.title     = 'title'
-
-    rdoc = RDoc::RDoc.new
-
-    temp_dir do
-      options.op_dir = 'ri'
-
-      capture_output do
-        rdoc.document options
-      end
-
-      assert File.directory? 'ri'
-      assert_equal rdoc, rdoc.store.rdoc
-    end
-
-    store = rdoc.store
-
-    assert_equal 'MAIN_PAGE.rdoc', store.main
-    assert_equal 'title',          store.title
-  end
-
-  def test_document_with_dry_run # functional test
-    options = RDoc::Options.new
-    options.files = [File.expand_path('../xref_data.rb', __FILE__)]
-    options.setup_generator 'darkfish'
-    options.main_page = 'MAIN_PAGE.rdoc'
-    options.root      = Pathname File.expand_path('..', __FILE__)
-    options.title     = 'title'
-    options.dry_run = true
-
-    rdoc = RDoc::RDoc.new
-
-    out = nil
-    temp_dir do
-      out, = capture_output do
-        rdoc.document options
-      end
-
-      refute File.directory? 'doc'
-      assert_equal rdoc, rdoc.store.rdoc
-    end
-    assert_includes out, '100%'
-
-    store = rdoc.store
-
-    assert_equal 'MAIN_PAGE.rdoc', store.main
-    assert_equal 'title',          store.title
-  end
-
-  def test_gather_files
-    a = File.expand_path __FILE__
-    b = File.expand_path '../test_rdoc_text.rb', __FILE__
-
-    assert_equal [a, b], @rdoc.gather_files([b, a, b])
-
-    assert_empty @rdoc.gather_files([b, a, b])
-
-    @rdoc.last_modified[a] -= 10
-    assert_equal [a, b], @rdoc.gather_files([b, a, b])
-  end
-
-  def test_handle_pipe
-    $stdin = StringIO.new "hello"
-
-    out, = capture_output do
-      @rdoc.handle_pipe
-    end
-
-    assert_equal "\n<p>hello</p>\n", out
-  ensure
-    $stdin = STDIN
-  end
-
-  def test_handle_pipe_rd
-    $stdin = StringIO.new "=begin\nhello\n=end"
-
-    @rdoc.options.markup = 'rd'
-
-    out, = capture_output do
-      @rdoc.handle_pipe
-    end
-
-    assert_equal "\n<p>hello</p>\n", out
-  ensure
-    $stdin = STDIN
-  end
-
-  def test_normalized_file_list
-    test_path = File.expand_path(__FILE__)
-    files = temp_dir do |dir|
-      flag_file = @rdoc.output_flag_file dir
-
-      FileUtils.touch flag_file
-
-      @rdoc.normalized_file_list [test_path, flag_file]
-    end
-
-    files = files.map { |file, *| File.expand_path file }
-
-    assert_equal [test_path], files
-  end
-
-  def test_normalized_file_list_not_modified
-    @rdoc.last_modified[__FILE__] = File.stat(__FILE__).mtime
-
-    files = @rdoc.normalized_file_list [__FILE__]
-
-    files = files.collect {|file, mtime| file if mtime}.compact
-
-    assert_empty(files)
-  end
-
-  def test_normalized_file_list_non_file_directory
-    dev = File::NULL
-    omit "#{dev} is not a character special" unless
-      File.chardev? dev
-
-    files = nil
-
-    out, err = verbose_capture_output do
-      files = @rdoc.normalized_file_list [dev]
-    end
-
-    files = files.map { |file| File.expand_path file }
-
-    assert_empty files
-
-    assert_empty out
-    assert_match %r"^rdoc can't parse", err
-    assert_match %r"#{dev}$",           err
-  end
-
-  def test_normalized_file_list_with_dot_doc
-    expected_files = []
-    files = temp_dir do |dir|
-      a = File.expand_path('a.rb')
-      b = File.expand_path('b.rb')
-      c = File.expand_path('c.rb')
-      FileUtils.touch a
-      FileUtils.touch b
-      FileUtils.touch c
-      # Use Dir.glob to convert short path of Dir.tmpdir to long path.
-      a = Dir.glob(a).first
-      b = Dir.glob(b).first
-      c = Dir.glob(c).first
-
-      dot_doc = File.expand_path('.document')
-      FileUtils.touch dot_doc
-      open(dot_doc, 'w') do |f|
-        f.puts 'a.rb'
-        f.puts 'b.rb'
-      end
-      expected_files << a
-      expected_files << b
-
-      @rdoc.normalized_file_list [File.realpath(dir)]
-    end
-
-    files = files.map { |file, *| File.expand_path file }
-
-    assert_equal expected_files, files
-  end
-
-  def test_normalized_file_list_with_dot_doc_overridden_by_exclude_option
-    expected_files = []
-    files = temp_dir do |dir|
-      a = File.expand_path('a.rb')
-      b = File.expand_path('b.rb')
-      c = File.expand_path('c.rb')
-      FileUtils.touch a
-      FileUtils.touch b
-      FileUtils.touch c
-      # Use Dir.glob to convert short path of Dir.tmpdir to long path.
-      a = Dir.glob(a).first
-      b = Dir.glob(b).first
-      c = Dir.glob(c).first
-
-      dot_doc = File.expand_path('.document')
-      FileUtils.touch dot_doc
-      open(dot_doc, 'w') do |f|
-        f.puts 'a.rb'
-        f.puts 'b.rb'
-      end
-      expected_files << a
-
-      @rdoc.options.exclude = Regexp.new(['b.rb'].join('|'))
-      @rdoc.normalized_file_list [File.realpath(dir)]
-    end
-
-    files = files.map { |file, *| File.expand_path file }
-
-    assert_equal expected_files, files
-  end
-
-  def test_normalized_file_list_with_skipping_tests_enabled
-    files = temp_dir do |dir|
-      @a = File.expand_path('a.rb')
-      spec_dir = File.expand_path('spec')
-      spec_file = File.expand_path(File.join('spec', 'my_spec.rb'))
-      test_dir = File.expand_path('test')
-      test_file = File.expand_path(File.join('test', 'my_test.rb'))
-      FileUtils.touch @a
-      FileUtils.mkdir_p spec_dir
-      FileUtils.touch spec_file
-      FileUtils.mkdir_p test_dir
-      FileUtils.touch test_file
-
-      @rdoc.options.skip_tests = true
-      @rdoc.normalized_file_list [File.realpath(dir)]
-    end
-
-    files = files.map { |file, *| File.expand_path file }
-    assert_equal [@a], files
-  end
-
-  def test_normalized_file_list_with_skipping_tests_disabled
-    files = temp_dir do |dir|
-      @a = File.expand_path('a.rb')
-      spec_dir = File.expand_path('spec')
-      @spec_file = File.expand_path(File.join('spec', 'my_spec.rb'))
-      test_dir = File.expand_path('test')
-      @test_file = File.expand_path(File.join('test', 'my_test.rb'))
-      FileUtils.touch @a
-      FileUtils.mkdir_p spec_dir
-      FileUtils.touch @spec_file
-      FileUtils.mkdir_p test_dir
-      FileUtils.touch @test_file
-
-      @rdoc.options.skip_tests = false
-      @rdoc.normalized_file_list [File.realpath(dir)]
-    end
-
-    files = files.map { |file, *| File.expand_path file }
-    assert_equal [@a, @spec_file, @test_file], files.sort
-  end
-
-  def test_parse_file
-    @rdoc.store = RDoc::Store.new
-
-    temp_dir do |dir|
-      @rdoc.options.root = Pathname(Dir.pwd)
-
-      File.open 'test.txt', 'w' do |io|
-        io.puts 'hi'
-      end
-
-      top_level = @rdoc.parse_file 'test.txt'
-
-      assert_equal 'test.txt', top_level.absolute_name
-      assert_equal 'test.txt', top_level.relative_name
-    end
-  end
-
-  def test_parse_file_binary
-    @rdoc.store = RDoc::Store.new
-
-    root = File.dirname __FILE__
-
-    @rdoc.options.root = Pathname root
-
-    out, err = capture_output do
-      Dir.chdir root do
-        assert_nil @rdoc.parse_file 'binary.dat'
-      end
-    end
-
-    assert_empty out
-    assert_empty err
-  end
-
-  def test_parse_file_include_root
-    @rdoc.store = RDoc::Store.new
-
-    test_path = File.expand_path('..', __FILE__)
-    top_level = nil
-    temp_dir do |dir|
-      @rdoc.options.parse %W[--root #{test_path}]
-      @rdoc.options.finish
-
-      File.open 'include.txt', 'w' do |io|
-        io.puts ':include: test.txt'
-      end
-
-      out, err = capture_output do
-        top_level = @rdoc.parse_file 'include.txt'
-      end
-      assert_empty out
-      assert_empty err
-    end
-    assert_equal "test file", top_level.comment.text
-  end
-
-  def test_parse_file_page_dir
-    @rdoc.store = RDoc::Store.new
-
-    temp_dir do |dir|
-      FileUtils.mkdir 'pages'
-      @rdoc.options.page_dir = Pathname('pages')
-      @rdoc.options.root = Pathname(Dir.pwd)
-
-      File.open 'pages/test.txt', 'w' do |io|
-        io.puts 'hi'
-      end
-
-      top_level = @rdoc.parse_file 'pages/test.txt'
-
-      assert_equal 'pages/test.txt', top_level.absolute_name
-      assert_equal 'test.txt',       top_level.relative_name
-    end
-  end
-
-  def test_parse_file_relative
-    pwd = Dir.pwd
-
-    @rdoc.store = RDoc::Store.new
-
-    temp_dir do |dir|
-      @rdoc.options.root = Pathname(dir)
-
-      File.open 'test.txt', 'w' do |io|
-        io.puts 'hi'
-      end
-
-      test_txt = File.join dir, 'test.txt'
-
-      Dir.chdir pwd do
-        top_level = @rdoc.parse_file test_txt
-
-        assert_equal test_txt,   top_level.absolute_name
-        assert_equal 'test.txt', top_level.relative_name
-      end
-    end
-  end
-
-  def test_parse_file_encoding
-    @rdoc.options.encoding = Encoding::ISO_8859_1
-    @rdoc.store = RDoc::Store.new
-
-    tf = Tempfile.open 'test.txt' do |io|
-      io.write 'hi'
-      io.rewind
-
-      top_level = @rdoc.parse_file io.path
-
-      assert_equal Encoding::ISO_8859_1, top_level.absolute_name.encoding
-      io
-    end
-    tf.close!
-  end
-
-  def test_parse_file_forbidden
-    omit 'chmod not supported' if Gem.win_platform?
-    omit "assumes that euid is not root" if Process.euid == 0
-
-    @rdoc.store = RDoc::Store.new
-
-    tf = Tempfile.open 'test.txt' do |io|
-      io.write 'hi'
-      io.rewind
-
-      File.chmod 0000, io.path
-
-      begin
-        top_level = :bug
-
-        _, err = capture_output do
-          top_level = @rdoc.parse_file io.path
-        end
-
-        assert_match "Unable to read #{io.path},", err
-
-        assert_nil top_level
-      ensure
-        File.chmod 0400, io.path
-      end
-      io
-    end
-    tf.close!
-  end
-
-  def test_remove_unparseable
-    file_list = %w[
-      blah.class
-      blah.eps
-      blah.erb
-      blah.scpt.txt
-      blah.svg
-      blah.ttf
-      blah.yml
-    ]
-
-    assert_empty @rdoc.remove_unparseable file_list
-  end
-
-  def test_remove_unparseable_tags_emacs
-    temp_dir do
-      File.open 'TAGS', 'wb' do |io| # emacs
-        io.write "\f\nlib/foo.rb,43\n"
-      end
-
-      file_list = %w[
-        TAGS
-      ]
-
-      assert_empty @rdoc.remove_unparseable file_list
-    end
-  end
-
-  def test_remove_unparseable_tags_vim
-    temp_dir do
-      File.open 'TAGS', 'w' do |io| # emacs
-        io.write "!_TAG_"
-      end
-
-      file_list = %w[
-        TAGS
-      ]
-
-      assert_empty @rdoc.remove_unparseable file_list
-    end
-  end
-
-  def test_remove_unparseable_CVE_2021_31799
-    omit 'for Un*x platforms' if Gem.win_platform?
-    temp_dir do
-      file_list = ['| touch evil.txt && echo tags']
-      file_list.each do |f|
-        FileUtils.touch f rescue omit
-      end
-
-      assert_equal file_list, @rdoc.remove_unparseable(file_list)
-      assert_equal file_list, Dir.children('.')
-    end
-  end
-
-  def test_setup_output_dir
-    Dir.mktmpdir {|d|
-      path = File.join d, 'testdir'
-
-      last = @rdoc.setup_output_dir path, false
-
-      assert_empty last
-
-      assert File.directory? path
-      assert File.exist? @rdoc.output_flag_file path
-    }
-  end
-
-  def test_setup_output_dir_dry_run
-    @rdoc.options.dry_run = true
-
-    Dir.mktmpdir do |d|
-      path = File.join d, 'testdir'
-
-      @rdoc.setup_output_dir path, false
-
-      refute File.exist? path
-    end
-  end
-
-  def test_setup_output_dir_exists
-    Dir.mktmpdir {|path|
-      File.open @rdoc.output_flag_file(path), 'w' do |io|
-        io.puts Time.at 0
-        io.puts "./lib/rdoc.rb\t#{Time.at 86400}"
-      end
-
-      last = @rdoc.setup_output_dir path, false
-
-      assert_equal 1, last.size
-      assert_equal Time.at(86400), last['./lib/rdoc.rb']
-    }
-  end
-
-  def test_setup_output_dir_exists_empty_created_rid
-    Dir.mktmpdir {|path|
-      File.open @rdoc.output_flag_file(path), 'w' do end
-
-      e = assert_raise RDoc::Error do
-        @rdoc.setup_output_dir path, false
-      end
-
-      assert_match %r%Directory #{Regexp.escape path} already exists%, e.message
-    }
-  end
-
-  def test_setup_output_dir_exists_file
-    tf = Tempfile.open 'test_rdoc_rdoc' do |tempfile|
-      path = tempfile.path
-
-      e = assert_raise RDoc::Error do
-        @rdoc.setup_output_dir path, false
-      end
-
-      assert_match(%r%#{Regexp.escape path} exists and is not a directory%,
-                   e.message)
-      tempfile
-    end
-    tf.close!
-  end
-
-  def test_setup_output_dir_exists_not_rdoc
-    Dir.mktmpdir do |dir|
-      e = assert_raise RDoc::Error do
-        @rdoc.setup_output_dir dir, false
-      end
-
-      assert_match %r%Directory #{Regexp.escape dir} already exists%, e.message
-    end
-  end
-
-  def test_update_output_dir
-    Dir.mktmpdir do |d|
-      @rdoc.update_output_dir d, Time.now, {}
-
-      assert File.exist? "#{d}/created.rid"
-    end
-  end
-
-  def test_update_output_dir_dont
-    Dir.mktmpdir do |d|
-      @rdoc.options.update_output_dir = false
-      @rdoc.update_output_dir d, Time.now, {}
-
-      refute File.exist? "#{d}/created.rid"
-    end
-  end
-
-  def test_update_output_dir_dry_run
-    Dir.mktmpdir do |d|
-      @rdoc.options.dry_run = true
-      @rdoc.update_output_dir d, Time.now, {}
-
-      refute File.exist? "#{d}/created.rid"
-    end
-  end
-
-  def test_update_output_dir_with_reproducible_time
-    Dir.mktmpdir do |d|
-      backup_epoch = ENV['SOURCE_DATE_EPOCH']
-      ruby_birthday = Time.parse 'Wed, 24 Feb 1993 21:00:00 +0900'
-      ENV['SOURCE_DATE_EPOCH'] = ruby_birthday.to_i.to_s
-
-      @rdoc.update_output_dir d, Time.now, {}
-
-      assert File.exist? "#{d}/created.rid"
-
-      f = File.open("#{d}/created.rid", 'r')
-      head_timestamp = Time.parse f.gets.chomp
-      f.close
-      assert_equal ruby_birthday, head_timestamp
-
-      ENV['SOURCE_DATE_EPOCH'] = backup_epoch
-    end
-  end
-
-  def test_normalized_file_list_removes_created_rid_dir
-    temp_dir do |d|
-      FileUtils.mkdir "doc"
-      flag_file = @rdoc.output_flag_file "doc"
-      file = File.join "doc", "test"
-      FileUtils.touch flag_file
-      FileUtils.touch file
-
-      file_list = ["doc"]
-
-      output = @rdoc.normalized_file_list file_list
-
-      assert_empty output
-    end
-  end
-end
diff --git a/test/rdoc/test_rdoc_require.rb b/test/rdoc/test_rdoc_require.rb
deleted file mode 100644
index 4cc53e6c6cb9f4..00000000000000
--- a/test/rdoc/test_rdoc_require.rb
+++ /dev/null
@@ -1,25 +0,0 @@
-# frozen_string_literal: true
-require_relative 'xref_test_case'
-
-class TestRDocRequire < XrefTestCase
-
-  def setup
-    super
-
-    @req = RDoc::Require.new 'foo', 'comment'
-  end
-
-  def test_initialize
-    assert_equal 'foo', @req.name
-
-    RDoc::Require.new '"foo"', ''
-    assert_equal 'foo', @req.name
-
-    RDoc::Require.new '\'foo\'', ''
-    assert_equal 'foo', @req.name
-
-    RDoc::Require.new '|foo|', ''
-    assert_equal 'foo', @req.name, 'for fortran?'
-  end
-
-end
diff --git a/test/rdoc/test_rdoc_ri_driver.rb b/test/rdoc/test_rdoc_ri_driver.rb
deleted file mode 100644
index 39e6e677596dbd..00000000000000
--- a/test/rdoc/test_rdoc_ri_driver.rb
+++ /dev/null
@@ -1,1561 +0,0 @@
-# frozen_string_literal: true
-require_relative 'helper'
-
-class TestRDocRIDriver < RDoc::TestCase
-
-  def setup
-    super
-
-    @home_ri = File.join @test_home, 'dot_ri'
-
-    FileUtils.mkdir_p @home_ri
-
-    @orig_ri = ENV.delete('RI')
-    @rdoc_home = File.join @test_home, ".rdoc"
-    FileUtils.mkdir_p @rdoc_home
-
-    @options = RDoc::RI::Driver.default_options
-    @options[:use_system] = false
-    @options[:use_site]   = false
-    @options[:use_home]   = false
-    @options[:use_gems]   = false
-
-    @options[:home]       = @rdoc_home
-    @options[:use_stdout] = true
-    @options[:formatter]  = @RM::ToRdoc
-
-    @driver = RDoc::RI::Driver.new @options
-  end
-
-  def teardown
-    defined?(@orig_ri) and ENV['RI'] = @orig_ri
-
-    super
-  end
-
-  case RUBY_PLATFORM
-  when /mswin|mingw/
-    DUMMY_PAGER = "type nul"
-  else
-    DUMMY_PAGER = "true"
-  end
-
-  def with_dummy_pager
-    pager_env, ENV['RI_PAGER'] = ENV['RI_PAGER'], DUMMY_PAGER
-    yield
-  ensure
-    ENV['RI_PAGER'] = pager_env
-  end
-
-  def test_self_dump
-    util_store
-
-    out, = capture_output do
-      RDoc::RI::Driver.dump @store1.cache_path
-    end
-
-    assert_match %r%:class_methods%,    out
-    assert_match %r%:modules%,          out
-    assert_match %r%:instance_methods%, out
-    assert_match %r%:ancestors%,        out
-  end
-
-  def test_add_also_in_empty
-    out = @RM::Document.new
-
-    @driver.add_also_in out, []
-
-    assert_empty out
-  end
-
-  def test_add_also_in
-    util_multi_store
-    @store1.type = :system
-    @store2.type = :home
-
-    out = @RM::Document.new
-
-    @driver.add_also_in out, [@store1, @store2]
-
-    expected = @RM::Document.new(
-      @RM::Rule.new(1),
-      @RM::Paragraph.new('Also found in:'),
-      @RM::Verbatim.new("ruby core", "\n",
-                        @rdoc_home, "\n"))
-
-    assert_equal expected, out
-  end
-
-  def test_add_class
-    util_multi_store
-
-    out = @RM::Document.new
-
-    @driver.add_class out, 'Bar', [@cBar]
-
-    expected = @RM::Document.new(
-      @RM::Heading.new(1, 'Bar < Foo'),
-      @RM::BlankLine.new)
-
-    assert_equal expected, out
-  end
-
-  def test_add_from
-    util_store
-    @store1.type = :system
-
-    out = @RM::Document.new
-
-    @driver.add_from out, @store1
-
-    expected = @RM::Document.new @RM::Paragraph.new("(from ruby core)")
-
-    assert_equal expected, out
-  end
-
-  def test_add_extends
-    util_store
-
-    out = @RM::Document.new
-
-    @driver.add_extends out, [[[@cFooExt], @store1]]
-
-    expected = @RM::Document.new(
-      @RM::Rule.new(1),
-      @RM::Heading.new(1, "Extended by:"),
-      @RM::Paragraph.new("Ext (from #{@store1.friendly_path})"),
-      @RM::BlankLine.new,
-      @RM::Paragraph.new("Extend thingy"),
-      @RM::BlankLine.new)
-
-    assert_equal expected, out
-  end
-
-  def test_add_extension_modules_empty
-    out = @RM::Document.new
-
-    @driver.add_extension_modules out, 'Includes', []
-
-    assert_empty out
-  end
-
-  def test_add_extension_modules_many
-    util_store
-
-    out = @RM::Document.new
-
-    enum = RDoc::Include.new 'Enumerable', nil
-    @cFoo.add_include enum
-
-    @driver.add_extension_modules out, 'Includes', [[[@cFooInc, enum], @store1]]
-
-    expected = @RM::Document.new(
-      @RM::Rule.new(1),
-      @RM::Heading.new(1, "Includes:"),
-      @RM::Paragraph.new("(from #{@store1.friendly_path})"),
-      @RM::BlankLine.new,
-      @RM::Paragraph.new("Inc"),
-      @RM::BlankLine.new,
-      @RM::Paragraph.new("Include thingy"),
-      @RM::BlankLine.new,
-      @RM::Verbatim.new("Enumerable", "\n"))
-
-    assert_equal expected, out
-  end
-
-  def test_add_extension_modules_many_no_doc
-    util_store
-
-    out = @RM::Document.new
-
-    enum = RDoc::Include.new 'Enumerable', nil
-    @cFoo.add_include enum
-    @cFooInc.instance_variable_set :@comment, ''
-
-    @driver.add_extension_modules out, 'Includes', [[[@cFooInc, enum], @store1]]
-
-    expected = @RM::Document.new(
-      @RM::Rule.new(1),
-      @RM::Heading.new(1, "Includes:"),
-      @RM::Paragraph.new("(from #{@store1.friendly_path})"),
-      @RM::Verbatim.new("Inc", "\n",
-                        "Enumerable", "\n"))
-
-    assert_equal expected, out
-  end
-
-  def test_add_extension_modules_one
-    util_store
-
-    out = @RM::Document.new
-
-    @driver.add_extension_modules out, 'Includes', [[[@cFooInc], @store1]]
-
-    expected = @RM::Document.new(
-      @RM::Rule.new(1),
-      @RM::Heading.new(1, "Includes:"),
-      @RM::Paragraph.new("Inc (from #{@store1.friendly_path})"),
-      @RM::BlankLine.new,
-      @RM::Paragraph.new("Include thingy"),
-      @RM::BlankLine.new)
-
-    assert_equal expected, out
-  end
-
-  def test_add_includes
-    util_store
-
-    out = @RM::Document.new
-
-    @driver.add_includes out, [[[@cFooInc], @store1]]
-
-    expected = @RM::Document.new(
-      @RM::Rule.new(1),
-      @RM::Heading.new(1, "Includes:"),
-      @RM::Paragraph.new("Inc (from #{@store1.friendly_path})"),
-      @RM::BlankLine.new,
-      @RM::Paragraph.new("Include thingy"),
-      @RM::BlankLine.new)
-
-    assert_equal expected, out
-  end
-
-  def test_add_method
-    util_store
-
-    out = doc
-
-    @driver.add_method out, 'Foo::Bar#blah'
-
-    expected =
-      doc(
-        head(1, 'Foo::Bar#blah'),
-        blank_line,
-        para("(from #{@rdoc_home})"),
-        head(3, 'Implementation from Bar'),
-        rule(1),
-        verb("blah(5) => 5\n",
-             "blah(6) => 6\n"),
-        rule(1),
-        blank_line,
-        blank_line)
-
-    assert_equal expected, out
-  end
-
-  def test_add_method_that_is_alias_for_original
-    util_store
-
-    out = doc
-
-    @driver.add_method out, 'Qux#aliased'
-
-    expected =
-      doc(
-        head(1, 'Qux#aliased'),
-        blank_line,
-        para("(from #{@rdoc_home})"),
-        rule(1),
-        blank_line,
-        para('alias comment'),
-        blank_line,
-        blank_line,
-        para('(This method is an alias for Qux#original.)'),
-        blank_line,
-        para('original comment'),
-        blank_line,
-        blank_line)
-
-    assert_equal expected, out
-  end
-
-  def test_add_method_attribute
-    util_store
-
-    out = doc
-
-    @driver.add_method out, 'Foo::Bar#attr'
-
-    expected =
-      doc(
-        head(1, 'Foo::Bar#attr'),
-        blank_line,
-        para("(from #{@rdoc_home})"),
-        rule(1),
-        blank_line,
-        blank_line)
-
-    assert_equal expected, out
-  end
-
-  def test_add_method_inherited
-    util_multi_store
-
-    out = doc
-
-    @driver.add_method out, 'Bar#inherit'
-
-    expected =
-      doc(
-        head(1, 'Bar#inherit'),
-        blank_line,
-        para("(from #{@rdoc_home})"),
-        head(3, 'Implementation from Foo'),
-        rule(1),
-        blank_line,
-        blank_line)
-
-    assert_equal expected, out
-  end
-
-  def test_add_method_overridden
-    util_multi_store
-
-    out = doc
-
-    @driver.add_method out, 'Bar#override'
-
-    expected =
-      doc(
-        head(1, 'Bar#override'),
-        blank_line,
-        para("(from #{@store2.path})"),
-        rule(1),
-        blank_line,
-        para('must be displayed'),
-        blank_line,
-        blank_line)
-
-    assert_equal expected, out
-  end
-
-  def test_add_method_documentation
-    util_store
-
-    out = doc()
-
-    missing = RDoc::AnyMethod.new nil, 'missing'
-    @cFoo.add_method missing
-
-    @driver.add_method_documentation out, @cFoo
-
-    expected =
-      doc(
-        head(1, 'Foo#inherit'),
-        blank_line,
-        para("(from #{@rdoc_home})"),
-        rule(1),
-        blank_line,
-        blank_line,
-        head(1, 'Foo#override'),
-        blank_line,
-        para("(from #{@rdoc_home})"),
-        rule(1),
-        blank_line,
-        para('must not be displayed in Bar#override'),
-        blank_line,
-        blank_line)
-
-    assert_equal expected, out
-  end
-
-  def test_add_method_list
-    out = @RM::Document.new
-
-    @driver.add_method_list out, %w[new parse], 'Class methods'
-
-    expected = @RM::Document.new(
-      @RM::Heading.new(1, 'Class methods:'),
-      @RM::BlankLine.new,
-      @RM::Verbatim.new('new'),
-      @RM::Verbatim.new('parse'),
-      @RM::BlankLine.new)
-
-    assert_equal expected, out
-  end
-
-  def test_output_width
-    @options[:width] = 10
-    driver = RDoc::RI::Driver.new @options
-
-    doc = @RM::Document.new
-    doc << @RM::IndentedParagraph.new(0, 'new, parse, foo, bar, baz')
-
-    out, = capture_output do
-      driver.display doc
-    end
-
-    expected = "new, parse, foo,\nbar, baz\n"
-
-    assert_equal expected, out
-  end
-
-  def test_add_method_list_interative
-    @options[:interactive] = true
-    driver = RDoc::RI::Driver.new @options
-
-    out = @RM::Document.new
-
-    driver.add_method_list out, %w[new parse], 'Class methods'
-
-    expected = @RM::Document.new(
-      @RM::Heading.new(1, 'Class methods:'),
-      @RM::BlankLine.new,
-      @RM::IndentedParagraph.new(2, 'new, parse'),
-      @RM::BlankLine.new)
-
-    assert_equal expected, out
-  end
-
-  def test_add_method_list_none
-    out = @RM::Document.new
-
-    @driver.add_method_list out, [], 'Class'
-
-    assert_equal @RM::Document.new, out
-  end
-
-  def test_ancestors_of
-    util_ancestors_store
-
-    assert_equal %w[X Mixin Object Foo], @driver.ancestors_of('Foo::Bar')
-  end
-
-  def test_ancestors_of_chained_inclusion
-    # Store represents something like:
-    #
-    #   module X
-    #   end
-    #
-    #   module Y
-    #     include X
-    #   end
-    #
-    #   class Z
-    #     include Y
-    #   end
-    #
-    # Y is not chosen randomly, it has to be after Object in the alphabet
-    # to reproduce https://github.com/ruby/rdoc/issues/814.
-    store = RDoc::RI::Store.new @home_ri
-    store.cache[:ancestors] = { "Z" => ["Object", "Y"], "Y" => ["X"] }
-    store.cache[:modules] = %W[X Y Z]
-    @driver.stores = [store]
-
-    assert_equal %w[X Y Object], @driver.ancestors_of('Z')
-  end
-
-  def test_classes
-    util_multi_store
-
-    expected = {
-      'Ambiguous' => [@store1, @store2],
-      'Bar'       => [@store2],
-      'Ext'       => [@store1],
-      'Foo'       => [@store1, @store2],
-      'Foo::Bar'  => [@store1],
-      'Foo::Baz'  => [@store1, @store2],
-      'Inc'       => [@store1],
-      'Qux'       => [@store1],
-    }
-
-    classes = @driver.classes
-
-    assert_equal expected.keys.sort, classes.keys.sort
-
-    expected.each do |klass, stores|
-      assert_equal stores, classes[klass].sort_by { |store| store.path },
-                   "mismatch for #{klass}"
-    end
-  end
-
-  def test_class_document
-    util_store
-
-    tl1 = @store1.add_file 'one.rb'
-    tl2 = @store1.add_file 'two.rb'
-
-    @cFoo.add_comment 'one', tl1
-    @cFoo.add_comment 'two', tl2
-
-    @store1.save_class @cFoo
-
-    found = [
-      [@store1, @store1.load_class(@cFoo.full_name)]
-    ]
-
-    extends  = [[[@cFooExt], @store1]]
-    includes = [[[@cFooInc], @store1]]
-
-    out = @driver.class_document @cFoo.full_name, found, [], includes, extends
-
-    expected = @RM::Document.new
-    @driver.add_class expected, 'Foo', []
-    @driver.add_includes expected, includes
-    @driver.add_extends  expected, extends
-    @driver.add_from expected, @store1
-    expected << @RM::Rule.new(1)
-
-    doc = @RM::Document.new(@RM::Paragraph.new('one'))
-    doc.file = 'one.rb'
-    expected.push doc
-    expected << @RM::BlankLine.new
-    doc = @RM::Document.new(@RM::Paragraph.new('two'))
-    doc.file = 'two.rb'
-    expected.push doc
-
-    expected << @RM::Rule.new(1)
-    expected << @RM::Heading.new(1, 'Instance methods:')
-    expected << @RM::BlankLine.new
-    expected << @RM::Verbatim.new('inherit')
-    expected << @RM::Verbatim.new('override')
-    expected << @RM::BlankLine.new
-
-    assert_equal expected, out
-  end
-
-  def test_complete
-    store = RDoc::RI::Store.new @home_ri
-    store.cache[:ancestors] = {
-      'Foo'      => %w[Object],
-      'Foo::Bar' => %w[Object],
-    }
-    store.cache[:class_methods] = {
-      'Foo' => %w[bar]
-    }
-    store.cache[:instance_methods] = {
-      'Foo' => %w[Bar]
-    }
-    store.cache[:modules] = %w[
-      Foo
-      Foo::Bar
-    ]
-
-    @driver.stores = [store]
-
-    assert_equal %w[Foo         ], @driver.complete('F')
-    assert_equal %w[    Foo::Bar], @driver.complete('Foo::B')
-
-    assert_equal %w[Foo#Bar],           @driver.complete('Foo#'),   'Foo#'
-    assert_equal %w[Foo#Bar  Foo::bar], @driver.complete('Foo.'),   'Foo.'
-    assert_equal %w[Foo::Bar Foo::bar], @driver.complete('Foo::'),  'Foo::'
-
-    assert_equal %w[         Foo::bar], @driver.complete('Foo::b'), 'Foo::b'
-  end
-
-  def test_complete_ancestor
-    util_ancestors_store
-
-    assert_equal %w[Foo::Bar#i_method], @driver.complete('Foo::Bar#')
-
-    assert_equal %w[Foo::Bar#i_method Foo::Bar::c_method Foo::Bar::new],
-                 @driver.complete('Foo::Bar.')
-  end
-
-  def test_complete_classes
-    util_store
-
-    assert_equal %w[                       ], @driver.complete('[')
-    assert_equal %w[                       ], @driver.complete('[::')
-    assert_equal %w[Foo                    ], @driver.complete('F')
-    assert_equal %w[Foo:: Foo::Bar Foo::Baz], @driver.complete('Foo::')
-    assert_equal %w[      Foo::Bar Foo::Baz], @driver.complete('Foo::B')
-  end
-
-  def test_complete_multistore
-    util_multi_store
-
-    assert_equal %w[Bar], @driver.complete('B')
-    assert_equal %w[Foo], @driver.complete('F')
-    assert_equal %w[Foo::Bar Foo::Baz], @driver.complete('Foo::B')
-  end
-
-  def test_display
-    doc = @RM::Document.new(
-            @RM::Paragraph.new('hi'))
-
-    out, = capture_output do
-      @driver.display doc
-    end
-
-    assert_equal "hi\n", out
-  end
-
-  def test_display_class
-    util_store
-
-    out, = capture_output do
-      @driver.display_class 'Foo::Bar'
-    end
-
-    assert_match %r%^= Foo::Bar%, out
-    assert_match %r%^\(from%, out
-
-    assert_match %r%^= Class methods:%, out
-    assert_match %r%^  new%, out
-    assert_match %r%^= Instance methods:%, out
-    assert_match %r%^  blah%, out
-    assert_match %r%^= Attributes:%, out
-    assert_match %r%^  attr_accessor attr%, out
-
-    assert_equal 1, out.scan(/^-{50,}$/).length, out
-
-    refute_match %r%Foo::Bar#blah%, out
-  end
-
-  def test_display_class_all
-    util_store
-
-    @driver.show_all = true
-
-    out, = capture_output do
-      @driver.display_class 'Foo::Bar'
-    end
-
-    assert_match %r%^= Foo::Bar%, out
-    assert_match %r%^\(from%, out
-
-    assert_match %r%^= Class methods:%, out
-    assert_match %r%^  new%, out
-    assert_match %r%^= Instance methods:%, out
-    assert_match %r%^  blah%, out
-    assert_match %r%^= Attributes:%, out
-    assert_match %r%^  attr_accessor attr%, out
-
-    assert_equal 6, out.scan(/^-{50,}$/).length, out
-
-    assert_match %r%Foo::Bar#blah%, out
-  end
-
-  def test_display_class_ambiguous
-    util_multi_store
-
-    out, = capture_output do
-      @driver.display_class 'Ambiguous'
-    end
-
-    assert_match %r%^= Ambiguous < Object$%, out
-  end
-
-  def test_display_class_multi_no_doc
-    util_multi_store
-
-    out, = capture_output do
-      @driver.display_class 'Foo::Baz'
-    end
-
-    assert_match %r%^= Foo::Baz%, out
-    assert_match %r%-\n%, out
-    assert_match %r%Also found in:%, out
-    assert_match %r%#{Regexp.escape @home_ri}%, out
-    assert_match %r%#{Regexp.escape @home_ri2}%, out
-  end
-
-  def test_display_class_superclass
-    util_multi_store
-
-    out, = capture_output do
-      @driver.display_class 'Bar'
-    end
-
-    assert_match %r%^= Bar < Foo%, out
-  end
-
-  def test_display_class_module
-    util_store
-
-    out, = capture_output do
-      @driver.display_class 'Inc'
-    end
-
-    assert_match %r%^= Inc$%, out
-  end
-
-  def test_display_class_page
-    out, = capture_output do
-      @driver.display_class 'ruby:README'
-    end
-
-    assert_empty out
-  end
-
-  def test_display_method
-    util_store
-
-    out, = capture_output do
-      @driver.display_method 'Foo::Bar#blah'
-    end
-
-    assert_match %r%Foo::Bar#blah%, out
-    assert_match %r%blah.5%,        out
-    assert_match %r%blah.6%,        out
-  end
-
-  def test_display_method_attribute
-    util_store
-
-    out, = capture_output do
-      @driver.display_method 'Foo::Bar#attr'
-    end
-
-    assert_match %r%Foo::Bar#attr%, out
-    refute_match %r%Implementation from%, out
-  end
-
-  def test_display_method_inherited
-    util_multi_store
-
-    out, = capture_output do
-      @driver.display_method 'Bar#inherit'
-    end
-
-    assert_match %r%^= Bar#inherit%, out
-    assert_match %r%^=== Implementation from Foo%, out
-  end
-
-  def test_display_method_overridden
-    util_multi_store
-
-    out, = capture_output do
-      @driver.display_method 'Bar#override'
-    end
-
-    refute_match %r%must not be displayed%, out
-  end
-
-  def test_display_name
-    util_store
-
-    out, = capture_output do
-      assert_equal true, @driver.display_name('home:README.rdoc')
-    end
-
-    expected = <<-EXPECTED
-= README
-This is a README
-    EXPECTED
-
-    assert_equal expected, out
-  end
-
-  def test_display_name_not_found_class
-    util_store
-
-    out, = capture_output do
-      assert_equal false, @driver.display_name('Foo::B')
-    end
-
-    expected = <<-EXPECTED
-Foo::B not found, maybe you meant:
-
-Foo::Bar
-Foo::Baz
-    EXPECTED
-
-    assert_equal expected, out
-  end
-
-  def test_display_name_not_found_method
-    util_store
-
-    out, = capture_output do
-      assert_equal false, @driver.display_name('Foo::Bar#b')
-    end
-
-    expected = <<-EXPECTED
-Foo::Bar#b not found, maybe you meant:
-
-Foo::Bar#blah
-Foo::Bar#bother
-    EXPECTED
-
-    assert_equal expected, out
-  end
-
-  def test_display_name_not_found_special
-    util_store
-
-    assert_raise RDoc::RI::Driver::NotFoundError do
-      assert_equal false, @driver.display_name('Set#[]')
-    end
-  end
-
-  def test_display_method_params
-    util_store
-
-    out, = capture_output do
-      @driver.display_method 'Foo::Bar#bother'
-    end
-
-    assert_match %r%things.*stuff%, out
-  end
-
-  def test_display_page
-    util_store
-
-    out, = capture_output do
-      @driver.display_page 'home:README.rdoc'
-    end
-
-    assert_match %r%= README%, out
-  end
-
-  def test_display_page_add_extension
-    util_store
-
-    out, = capture_output do
-      @driver.display_page 'home:README'
-    end
-
-    assert_match %r%= README%, out
-  end
-
-  def test_display_page_ambiguous
-    util_store
-
-    other = @store1.add_file 'README.md'
-    other.parser = RDoc::Parser::Simple
-    other.comment =
-      doc(
-        head(1, 'README.md'),
-        para('This is the other README'))
-
-    @store1.save_page other
-
-    out, = capture_output do
-      @driver.display_page 'home:README'
-    end
-
-    assert_match %r%= README pages in #{@rdoc_home}%, out
-    assert_match %r%README\.rdoc%,               out
-    assert_match %r%README\.md%,                 out
-  end
-
-  def test_display_page_extension
-    util_store
-
-    other = @store1.add_file 'README.EXT'
-    other.parser = RDoc::Parser::Simple
-    other.comment =
-      doc(
-        head(1, 'README.EXT'),
-        para('This is the other README'))
-
-    @store1.save_page other
-
-    out, = capture_output do
-      @driver.display_page 'home:README.EXT'
-    end
-
-    assert_match 'other README', out
-  end
-
-  def test_display_page_ignore_directory
-    util_store
-
-    other = @store1.add_file 'doc/globals.rdoc'
-    other.parser = RDoc::Parser::Simple
-    other.comment =
-      doc(
-        head(1, 'globals.rdoc'),
-        para('Globals go here'))
-
-    @store1.save_page other
-
-    out, = capture_output do
-      @driver.display_page 'home:globals'
-    end
-
-    assert_match %r%= globals\.rdoc%, out
-  end
-
-  def test_display_page_missing
-    util_store
-
-    out, = capture_output do
-      @driver.display_page 'home:missing'
-    end
-
-    out, = capture_output do
-      @driver.display_page_list @store1
-    end
-
-    assert_match %r%= Pages in #{@rdoc_home}%, out
-    assert_match %r%README\.rdoc%,        out
-  end
-
-  def test_display_page_list
-    util_store
-
-    other = @store1.add_file 'OTHER.rdoc'
-    other.parser = RDoc::Parser::Simple
-    other.comment =
-      doc(
-        head(1, 'OTHER'),
-        para('This is OTHER'))
-
-    @store1.save_page other
-
-    out, = capture_output do
-      @driver.display_page_list @store1
-    end
-
-    assert_match %r%= Pages in #{@rdoc_home}%, out
-    assert_match %r%README\.rdoc%,        out
-    assert_match %r%OTHER\.rdoc%,         out
-  end
-
-  def test_expand_class
-    util_store
-
-    assert_equal 'Foo',       @driver.expand_class('F')
-    assert_equal 'Foo::Bar',  @driver.expand_class('F::Bar')
-
-    assert_raise RDoc::RI::Driver::NotFoundError do
-      @driver.expand_class 'F::B'
-    end
-  end
-
-  def test_expand_class_2
-    @store1 = RDoc::RI::Store.new @home_ri, :home
-
-    @top_level = @store1.add_file 'file.rb'
-
-    @cFoo = @top_level.add_class RDoc::NormalClass, 'Foo'
-    @mFox = @top_level.add_module RDoc::NormalModule, 'Fox'
-    @cFoo_Bar = @cFoo.add_class RDoc::NormalClass, 'Bar'
-    @store1.save
-
-    @driver.stores = [@store1]
-    assert_raise RDoc::RI::Driver::NotFoundError do
-      @driver.expand_class 'F'
-    end
-    assert_equal 'Foo::Bar',  @driver.expand_class('F::Bar')
-    assert_equal 'Foo::Bar',  @driver.expand_class('F::B')
-  end
-
-  def test_expand_class_3
-    @store1 = RDoc::RI::Store.new @home_ri, :home
-
-    @top_level = @store1.add_file 'file.rb'
-
-    @cFoo = @top_level.add_class RDoc::NormalClass, 'Foo'
-    @mFox = @top_level.add_module RDoc::NormalModule, 'FooBar'
-    @store1.save
-
-    @driver.stores = [@store1]
-
-    assert_equal 'Foo',  @driver.expand_class('Foo')
-  end
-
-  def test_expand_name
-    util_store
-
-    assert_equal '.b',        @driver.expand_name('b')
-    assert_equal 'Foo',       @driver.expand_name('F')
-    assert_equal 'Foo::Bar#', @driver.expand_name('F::Bar#')
-
-    e = assert_raise RDoc::RI::Driver::NotFoundError do
-      @driver.expand_name 'Z'
-    end
-
-    assert_equal 'Z', e.name
-
-    @driver.stores << RDoc::Store.new(nil, :system)
-
-    assert_equal 'ruby:README', @driver.expand_name('ruby:README')
-    assert_equal 'ruby:',       @driver.expand_name('ruby:')
-
-    e = assert_raise RDoc::RI::Driver::NotFoundError do
-      @driver.expand_name 'nonexistent_gem:'
-    end
-
-    assert_equal 'nonexistent_gem', e.name
-  end
-
-  def test_find_methods
-    util_store
-
-    items = []
-
-    @driver.find_methods 'Foo::Bar.' do |store, klass, ancestor, types, method|
-      items << [store, klass, ancestor, types, method]
-    end
-
-    expected = [
-      [@store1, 'Foo::Bar', 'Foo::Bar', :both, nil],
-    ]
-
-    assert_equal expected, items
-  end
-
-  def test_find_methods_method
-    util_store
-
-    items = []
-
-    @driver.find_methods '.blah' do |store, klass, ancestor, types, method|
-      items << [store, klass, ancestor, types, method]
-    end
-
-    expected = [
-      [@store1, 'Ambiguous', 'Ambiguous', :both, 'blah'],
-      [@store1, 'Ext',       'Ext',       :both, 'blah'],
-      [@store1, 'Foo',       'Foo',       :both, 'blah'],
-      [@store1, 'Foo::Bar',  'Foo::Bar',  :both, 'blah'],
-      [@store1, 'Foo::Baz',  'Foo::Baz',  :both, 'blah'],
-      [@store1, 'Inc',       'Inc',       :both, 'blah'],
-      [@store1, 'Qux',       'Qux',       :both, 'blah'],
-    ]
-
-    assert_equal expected, items
-  end
-
-  def test_filter_methods
-    util_multi_store
-
-    name = 'Bar#override'
-
-    found = @driver.load_methods_matching name
-
-    sorted = @driver.filter_methods found, name
-
-    expected = [[@store2, [@override]]]
-
-    assert_equal expected, sorted
-  end
-
-  def test_filter_methods_not_found
-    util_multi_store
-
-    name = 'Bar#inherit'
-
-    found = @driver.load_methods_matching name
-
-    sorted = @driver.filter_methods found, name
-
-    assert_equal found, sorted
-  end
-
-  def test_find_store
-    @driver.stores << RDoc::Store.new(nil,              :system)
-    @driver.stores << RDoc::Store.new('doc/gem-1.0/ri', :gem)
-
-    assert_equal 'ruby',    @driver.find_store('ruby')
-    assert_equal 'gem-1.0', @driver.find_store('gem-1.0')
-    assert_equal 'gem-1.0', @driver.find_store('gem')
-
-    e = assert_raise RDoc::RI::Driver::NotFoundError do
-      @driver.find_store 'nonexistent'
-    end
-
-    assert_equal 'nonexistent', e.name
-  end
-
-  def test_did_you_mean
-    omit 'skip test with did_you_men' unless defined? DidYouMean::SpellChecker
-
-    util_ancestors_store
-
-    e = assert_raise RDoc::RI::Driver::NotFoundError do
-      @driver.lookup_method 'Foo.i_methdo'
-    end
-    assert_equal "Nothing known about Foo.i_methdo\nDid you mean?  i_method", e.message
-
-    e = assert_raise RDoc::RI::Driver::NotFoundError do
-      @driver.lookup_method 'Foo#i_methdo'
-    end
-    assert_equal "Nothing known about Foo#i_methdo\nDid you mean?  i_method", e.message
-
-    e = assert_raise RDoc::RI::Driver::NotFoundError do
-      @driver.lookup_method 'Foo::i_methdo'
-    end
-    assert_equal "Nothing known about Foo::i_methdo\nDid you mean?  c_method", e.message
-  end
-
-  def test_formatter
-    tty = Object.new
-    def tty.tty?() true; end
-
-    @options.delete :use_stdout
-    @options.delete :formatter
-
-    driver = RDoc::RI::Driver.new @options
-
-    assert_instance_of @RM::ToAnsi, driver.formatter(tty)
-
-    assert_instance_of @RM::ToBs, driver.formatter(StringIO.new)
-
-    driver.instance_variable_set :@paging, true
-
-    assert_instance_of @RM::ToBs, driver.formatter(StringIO.new)
-  end
-
-  def test_method_type
-    assert_equal :both,     @driver.method_type(nil)
-    assert_equal :both,     @driver.method_type('.')
-    assert_equal :instance, @driver.method_type('#')
-    assert_equal :class,    @driver.method_type('::')
-  end
-
-  def test_name_regexp
-    assert_equal %r%^RDoc::AnyMethod#new$%,
-                 @driver.name_regexp('RDoc::AnyMethod#new')
-
-    assert_equal %r%^RDoc::AnyMethod::new$%,
-                 @driver.name_regexp('RDoc::AnyMethod::new')
-
-    assert_equal %r%^RDoc::AnyMethod(#|::)new$%,
-                 @driver.name_regexp('RDoc::AnyMethod.new')
-
-    assert_equal %r%^Hash(#|::)\[\]$%,
-                 @driver.name_regexp('Hash.[]')
-
-    assert_equal %r%^Hash::\[\]$%,
-                 @driver.name_regexp('Hash::[]')
-  end
-
-  def test_list_known_classes
-    util_store
-
-    out, = capture_output do
-      @driver.list_known_classes
-    end
-
-    assert_equal "Ambiguous\nExt\nFoo\nFoo::Bar\nFoo::Baz\nInc\nQux\n", out
-  end
-
-  def test_list_known_classes_name
-    util_store
-
-    out, = capture_output do
-      @driver.list_known_classes %w[F I]
-    end
-
-    assert_equal "Foo\nFoo::Bar\nFoo::Baz\nInc\n", out
-  end
-
-  def test_list_methods_matching
-    util_store
-
-    assert_equal %w[
-        Foo::Bar#attr
-        Foo::Bar#blah
-        Foo::Bar#bother
-        Foo::Bar::new
-      ],
-      @driver.list_methods_matching('Foo::Bar.').sort
-  end
-
-  def test_list_methods_matching_inherit
-    util_multi_store
-
-    assert_equal %w[
-        Bar#baz
-        Bar#inherit
-        Bar#override
-      ],
-      @driver.list_methods_matching('Bar.').sort
-  end
-
-  def test_list_methods_matching_regexp
-    util_store
-
-    index = RDoc::AnyMethod.new nil, '[]'
-    index.record_location @top_level
-    @cFoo.add_method index
-    @store1.save_method @cFoo, index
-
-    c_index = RDoc::AnyMethod.new nil, '[]'
-    c_index.singleton = true
-    c_index.record_location @top_level
-    @cFoo.add_method c_index
-    @store1.save_method @cFoo, c_index
-
-    @store1.save_cache
-
-    assert_equal %w[Foo#[]], @driver.list_methods_matching('Foo#[]')
-    assert_equal %w[Foo::[]], @driver.list_methods_matching('Foo::[]')
-  end
-
-  def test_load_method
-    util_store
-
-    method = @driver.load_method(@store1, :instance_methods, 'Foo', '#',
-                                 'inherit')
-
-    assert_equal @inherit, method
-  end
-
-  def test_load_method_inherited
-    util_multi_store
-
-    method = @driver.load_method(@store2, :instance_methods, 'Bar', '#',
-                                 'inherit')
-
-    assert_nil method
-  end
-
-  def test_load_methods_matching
-    util_store
-
-    expected = [[@store1, [@inherit]]]
-
-    assert_equal expected, @driver.load_methods_matching('Foo#inherit')
-
-    expected = [[@store1, [@blah]]]
-
-    assert_equal expected, @driver.load_methods_matching('.blah')
-
-    assert_empty @driver.load_methods_matching('.b')
-  end
-
-  def test_load_methods_matching_inherited
-    util_multi_store
-
-    expected = [[@store1, [@inherit]]]
-
-    assert_equal expected, @driver.load_methods_matching('Bar#inherit')
-  end
-
-  def test_load_method_missing
-    util_store
-
-    FileUtils.rm @store1.method_file 'Foo', '#inherit'
-
-    method = @driver.load_method(@store1, :instance_methods, 'Foo', '#',
-                                 'inherit')
-
-    assert_equal '(unknown)#inherit', method.full_name
-  end
-
-  def test_page
-    @driver.use_stdout = false
-
-    with_dummy_pager do
-      @driver.page do |io|
-        omit "couldn't find a standard pager" if io == $stdout
-
-        assert @driver.paging?
-      end
-    end
-
-    refute @driver.paging?
-  end
-
-  def test_page_in_presence_of_child_status
-    @driver.use_stdout = false
-
-    with_dummy_pager do
-      @driver.page do |io|
-        refute_equal $stdout, io
-        assert @driver.paging?
-      end
-    end
-  end
-
-  def test_page_stdout
-    @driver.use_stdout = true
-
-    @driver.page do |io|
-      assert_equal $stdout, io
-    end
-
-    refute @driver.paging?
-  end
-
-  def test_parse_name_method
-    klass, type, meth = @driver.parse_name 'foo'
-
-    assert_equal '',    klass, 'foo class'
-    assert_equal '.',   type,  'foo type'
-    assert_equal 'foo', meth,  'foo method'
-
-    klass, type, meth = @driver.parse_name '#foo'
-
-    assert_equal '',    klass, '#foo class'
-    assert_equal '#',   type,  '#foo type'
-    assert_equal 'foo', meth,  '#foo method'
-
-    klass, type, meth = @driver.parse_name '::foo'
-
-    assert_equal '',    klass, '::foo class'
-    assert_equal '::',  type,  '::foo type'
-    assert_equal 'foo', meth,  '::foo method'
-  end
-
-  def test_parse_name_page
-    klass, type, meth = @driver.parse_name 'ruby:README'
-
-    assert_equal 'ruby',   klass, 'ruby project'
-    assert_equal ':',      type,  'ruby type'
-    assert_equal 'README', meth,  'ruby page'
-
-    klass, type, meth = @driver.parse_name 'ruby:'
-
-    assert_equal 'ruby',   klass, 'ruby project'
-    assert_equal ':',      type,  'ruby type'
-    assert_nil             meth,  'ruby page'
-  end
-
-  def test_parse_name_page_extenson
-    klass, type, meth = @driver.parse_name 'ruby:README.EXT'
-
-    assert_equal 'ruby',      klass, 'ruby project'
-    assert_equal ':',         type,  'ruby type'
-    assert_equal 'README.EXT', meth,  'ruby page'
-  end
-
-  def test_parse_name_single_class
-    klass, type, meth = @driver.parse_name 'Foo'
-
-    assert_equal 'Foo', klass, 'Foo class'
-    assert_nil          type,  'Foo type'
-    assert_nil          meth,  'Foo method'
-
-    klass, type, meth = @driver.parse_name 'Foo#'
-
-    assert_equal 'Foo', klass, 'Foo# class'
-    assert_equal '#',   type,  'Foo# type'
-    assert_nil          meth,  'Foo# method'
-
-    klass, type, meth = @driver.parse_name 'Foo::'
-
-    assert_equal 'Foo', klass, 'Foo:: class'
-    assert_equal '::',  type,  'Foo:: type'
-    assert_nil          meth,  'Foo:: method'
-
-    klass, type, meth = @driver.parse_name 'Foo.'
-
-    assert_equal 'Foo', klass, 'Foo. class'
-    assert_equal '.',   type,  'Foo. type'
-    assert_nil          meth,  'Foo. method'
-
-    klass, type, meth = @driver.parse_name 'Foo#Bar'
-
-    assert_equal 'Foo', klass, 'Foo#Bar class'
-    assert_equal '#',   type,  'Foo#Bar type'
-    assert_equal 'Bar', meth,  'Foo#Bar method'
-
-    klass, type, meth = @driver.parse_name 'Foo.Bar'
-
-    assert_equal 'Foo', klass, 'Foo.Bar class'
-    assert_equal '.',   type,  'Foo.Bar type'
-    assert_equal 'Bar', meth,  'Foo.Bar method'
-
-    klass, type, meth = @driver.parse_name 'Foo::bar'
-
-    assert_equal 'Foo', klass, 'Foo::bar class'
-    assert_equal '::',  type,  'Foo::bar type'
-    assert_equal 'bar', meth,  'Foo::bar method'
-  end
-
-  def test_parse_name_namespace
-    klass, type, meth = @driver.parse_name 'Foo::Bar'
-
-    assert_equal 'Foo::Bar', klass, 'Foo::Bar class'
-    assert_nil               type,  'Foo::Bar type'
-    assert_nil               meth,  'Foo::Bar method'
-
-    klass, type, meth = @driver.parse_name 'Foo::Bar#'
-
-    assert_equal 'Foo::Bar', klass, 'Foo::Bar# class'
-    assert_equal '#',        type,  'Foo::Bar# type'
-    assert_nil               meth,  'Foo::Bar# method'
-
-    klass, type, meth = @driver.parse_name 'Foo::Bar#baz'
-
-    assert_equal 'Foo::Bar', klass, 'Foo::Bar#baz class'
-    assert_equal '#',        type,  'Foo::Bar#baz type'
-    assert_equal 'baz',      meth,  'Foo::Bar#baz method'
-  end
-
-  def test_parse_name_special
-    specials = %w[
-      %
-      &
-      *
-      +
-      +@
-      -
-      -@
-      /
-      <
-      <<
-      <=
-      <=>
-      ==
-      ===
-      =>
-      =~
-      >
-      >>
-      []
-      []=
-      ^
-      `
-      |
-      ~
-      ~@
-    ]
-
-    specials.each do |special|
-      parsed = @driver.parse_name special
-
-      assert_equal ['', '.', special], parsed
-    end
-  end
-
-  def test_setup_pager # this test doesn't do anything anymore :(
-    @driver.use_stdout = false
-
-    pager = with_dummy_pager do @driver.setup_pager end
-
-    omit "couldn't find a standard pager" unless pager
-
-    assert @driver.paging?
-  ensure
-    pager.close if pager
-  end
-
-  def util_ancestors_store
-    store1 = RDoc::RI::Store.new @home_ri
-    store1.cache[:ancestors] = {
-      'Foo'      => %w[Object],
-      'Foo::Bar' => %w[Foo],
-    }
-    store1.cache[:class_methods] = {
-      'Foo'      => %w[c_method new],
-      'Foo::Bar' => %w[new],
-    }
-    store1.cache[:instance_methods] = {
-      'Foo' => %w[i_method],
-    }
-    store1.cache[:modules] = %w[
-      Foo
-      Foo::Bar
-    ]
-
-    store2 = RDoc::RI::Store.new @home_ri
-    store2.cache[:ancestors] = {
-      'Foo'    => %w[Mixin Object],
-      'Mixin'  => %w[],
-      'Object' => %w[X Object],
-      'X'      => %w[Object],
-    }
-    store2.cache[:class_methods] = {
-      'Foo'    => %w[c_method new],
-      'Mixin'  => %w[],
-      'X'      => %w[],
-      'Object' => %w[],
-    }
-    store2.cache[:instance_methods] = {
-      'Foo'   => %w[i_method],
-      'Mixin' => %w[],
-    }
-    store2.cache[:modules] = %w[
-      Foo
-      Mixin
-      Object
-      X
-    ]
-
-    @driver.stores = store1, store2
-  end
-
-  def util_multi_store
-    util_store
-
-    @home_ri2 = "#{@home_ri}2"
-    @store2 = RDoc::RI::Store.new @home_ri2
-
-    @top_level = @store2.add_file 'file.rb'
-
-    # as if seen in a namespace like class Ambiguous::Other
-    @mAmbiguous = @top_level.add_module RDoc::NormalModule, 'Ambiguous'
-
-    @cFoo = @top_level.add_class RDoc::NormalClass, 'Foo'
-
-    @cBar = @top_level.add_class RDoc::NormalClass, 'Bar', 'Foo'
-    @cFoo_Baz = @cFoo.add_class RDoc::NormalClass, 'Baz'
-
-    @baz = @cBar.add_method RDoc::AnyMethod.new(nil, 'baz')
-    @baz.record_location @top_level
-
-    @override = @cBar.add_method RDoc::AnyMethod.new(nil, 'override')
-    @override.comment = 'must be displayed'
-    @override.record_location @top_level
-
-    @store2.save
-
-    @driver.stores = [@store1, @store2]
-  end
-
-  def util_store
-    @store1 = RDoc::RI::Store.new @home_ri, :home
-
-    @top_level = @store1.add_file 'file.rb'
-
-    @readme = @store1.add_file 'README.rdoc'
-    @readme.parser = RDoc::Parser::Simple
-    @readme.comment =
-      doc(
-        head(1, 'README'),
-        para('This is a README'))
-
-    @cFoo = @top_level.add_class RDoc::NormalClass, 'Foo'
-    @mExt = @top_level.add_module RDoc::NormalModule, 'Ext'
-    @mInc = @top_level.add_module RDoc::NormalModule, 'Inc'
-    @cAmbiguous = @top_level.add_class RDoc::NormalClass, 'Ambiguous'
-
-    doc = @RM::Document.new @RM::Paragraph.new('Extend thingy')
-    @cFooExt = @cFoo.add_extend RDoc::Extend.new('Ext', doc)
-    @cFooExt.record_location @top_level
-    doc = @RM::Document.new @RM::Paragraph.new('Include thingy')
-    @cFooInc = @cFoo.add_include RDoc::Include.new('Inc', doc)
-    @cFooInc.record_location @top_level
-
-    @cFoo_Bar = @cFoo.add_class RDoc::NormalClass, 'Bar'
-
-    @blah = @cFoo_Bar.add_method RDoc::AnyMethod.new(nil, 'blah')
-    @blah.call_seq = "blah(5) => 5\nblah(6) => 6\n"
-    @blah.record_location @top_level
-
-    @bother = @cFoo_Bar.add_method RDoc::AnyMethod.new(nil, 'bother')
-    @bother.block_params = "stuff"
-    @bother.params = "(things)"
-    @bother.record_location @top_level
-
-    @new = @cFoo_Bar.add_method RDoc::AnyMethod.new nil, 'new'
-    @new.record_location @top_level
-    @new.singleton = true
-
-    @attr = @cFoo_Bar.add_attribute RDoc::Attr.new nil, 'attr', 'RW', ''
-    @attr.record_location @top_level
-
-    @cFoo_Baz = @cFoo.add_class RDoc::NormalClass, 'Baz'
-    @cFoo_Baz.record_location @top_level
-
-    @inherit = @cFoo.add_method RDoc::AnyMethod.new(nil, 'inherit')
-    @inherit.record_location @top_level
-
-    # overridden by Bar in multi_store
-    @overridden = @cFoo.add_method RDoc::AnyMethod.new(nil, 'override')
-    @overridden.comment = 'must not be displayed in Bar#override'
-    @overridden.record_location @top_level
-
-    @cQux = @top_level.add_class RDoc::NormalClass, 'Qux'
-
-    @original = @cQux.add_method RDoc::AnyMethod.new(nil, 'original')
-    @original.comment = 'original comment'
-    @original.record_location @top_level
-
-    @aliased = @original.add_alias RDoc::Alias.new(nil, 'original', 'aliased', 'alias comment'), @cQux
-    @aliased.record_location @top_level
-
-    @store1.save
-
-    @driver.stores = [@store1]
-  end
-
-end
diff --git a/test/rdoc/test_rdoc_ri_paths.rb b/test/rdoc/test_rdoc_ri_paths.rb
deleted file mode 100644
index 6dccd6dbdd0f29..00000000000000
--- a/test/rdoc/test_rdoc_ri_paths.rb
+++ /dev/null
@@ -1,157 +0,0 @@
-# frozen_string_literal: true
-require_relative 'helper'
-
-class TestRDocRIPaths < RDoc::TestCase
-
-  def setup
-    super
-
-    @orig_env = ENV.to_hash
-    @orig_gem_path = Gem.path
-
-    @tempdir = File.join Dir.tmpdir, "test_rdoc_ri_paths_#{$$}"
-    Gem.use_paths @tempdir
-    Gem.ensure_gem_subdirectories @tempdir
-
-    specs = [
-      @rake_10   = Gem::Specification.new('rake', '10.0.1'),
-      @rdoc_4_0  = Gem::Specification.new('rdoc', '4.0'),
-      @rdoc_3_12 = Gem::Specification.new('rdoc', '3.12'),
-      @nodoc     = Gem::Specification.new('nodoc', '1.0'),
-    ]
-
-    specs.each do |spec|
-      spec.loaded_from = spec.spec_file
-
-      File.open spec.spec_file, 'w' do |file|
-        file.write spec.to_ruby_for_cache
-      end
-
-      FileUtils.mkdir_p File.join(spec.doc_dir, 'ri') unless
-        spec.name == 'nodoc'
-    end
-
-    Gem::Specification.reset
-    Gem::Specification.all = specs
-  end
-
-  def teardown
-    Gem.use_paths(*@orig_gem_path)
-    Gem::Specification.reset
-    FileUtils.rm_rf @tempdir
-    ENV.replace(@orig_env)
-
-    super
-  end
-
-  def test_class_each
-    enum = RDoc::RI::Paths.each true, true, true, :all
-
-    path = enum.map { |dir,| dir }
-
-    assert_equal RDoc::RI::Paths.system_dir,          path.shift
-    assert_equal RDoc::RI::Paths.site_dir,            path.shift
-    assert_equal RDoc::RI::Paths.home_dir,            path.shift if RDoc::RI::Paths.home_dir
-    assert_equal File.join(@nodoc.doc_dir, 'ri'),     path.shift
-    assert_equal File.join(@rake_10.doc_dir, 'ri'),   path.shift
-    assert_equal File.join(@rdoc_4_0.doc_dir, 'ri'),  path.shift
-    assert_equal File.join(@rdoc_3_12.doc_dir, 'ri'), path.shift
-    assert_empty path
-  end
-
-  def test_class_gemdirs_latest
-    Dir.chdir @tempdir do
-      gemdirs = RDoc::RI::Paths.gemdirs :latest
-
-      expected = [
-        File.join(@rake_10.doc_dir, 'ri'),
-        File.join(@rdoc_4_0.doc_dir, 'ri'),
-      ]
-
-      assert_equal expected, gemdirs
-    end
-  end
-
-  def test_class_gemdirs_legacy
-    Dir.chdir @tempdir do
-      gemdirs = RDoc::RI::Paths.gemdirs true
-
-      expected = [
-        File.join(@rake_10.doc_dir, 'ri'),
-        File.join(@rdoc_4_0.doc_dir, 'ri'),
-      ]
-
-      assert_equal expected, gemdirs
-    end
-  end
-
-  def test_class_gemdirs_all
-    Dir.chdir @tempdir do
-      gemdirs = RDoc::RI::Paths.gemdirs :all
-
-      expected = [
-        File.join(@nodoc.doc_dir,     'ri'),
-        File.join(@rake_10.doc_dir,   'ri'),
-        File.join(@rdoc_4_0.doc_dir,  'ri'),
-        File.join(@rdoc_3_12.doc_dir, 'ri'),
-      ]
-
-      assert_equal expected, gemdirs
-    end
-  end
-
-  def test_class_gem_dir
-    dir = RDoc::RI::Paths.gem_dir 'rake', '10.0.1'
-
-    expected = File.join @rake_10.doc_dir, 'ri'
-
-    assert_equal expected, dir
-  end
-
-  def test_class_home_dir
-    dir = RDoc::RI::Paths.home_dir
-
-    assert_equal RDoc::RI::Paths::HOMEDIR, dir
-  end
-
-  def test_class_path_nonexistent
-    temp_dir do |dir|
-      nonexistent = File.join dir, 'nonexistent'
-      dir = RDoc::RI::Paths.path true, true, true, true, nonexistent
-
-      refute_includes dir, nonexistent
-    end
-  end
-
-  def test_class_raw_path
-    path = RDoc::RI::Paths.raw_path true, true, true, true
-
-    assert_equal RDoc::RI::Paths.system_dir,        path.shift
-    assert_equal RDoc::RI::Paths.site_dir,          path.shift
-    assert_equal RDoc::RI::Paths.home_dir,          path.shift if RDoc::RI::Paths.home_dir
-    assert_equal File.join(@rake_10.doc_dir, 'ri'), path.shift
-  end
-
-  def test_class_raw_path_extra_dirs
-    path = RDoc::RI::Paths.raw_path true, true, true, true, '/nonexistent'
-
-    assert_equal '/nonexistent',                    path.shift
-    assert_equal RDoc::RI::Paths.system_dir,        path.shift
-    assert_equal RDoc::RI::Paths.site_dir,          path.shift
-    assert_equal RDoc::RI::Paths.home_dir,          path.shift if RDoc::RI::Paths.home_dir
-    assert_equal File.join(@rake_10.doc_dir, 'ri'), path.shift
-  end
-
-  def test_class_site_dir
-    dir = RDoc::RI::Paths.site_dir
-
-    assert_equal File.join(RDoc::RI::Paths::BASE, 'site'), dir
-  end
-
-  def test_class_system_dir
-    dir = RDoc::RI::Paths.system_dir
-
-    assert_equal File.join(RDoc::RI::Paths::BASE, 'system'), dir
-  end
-
-end
diff --git a/test/rdoc/test_rdoc_rubygems_hook.rb b/test/rdoc/test_rdoc_rubygems_hook.rb
deleted file mode 100644
index 59a7ed0f898403..00000000000000
--- a/test/rdoc/test_rdoc_rubygems_hook.rb
+++ /dev/null
@@ -1,287 +0,0 @@
-# frozen_string_literal: true
-require 'rubygems'
-require 'fileutils'
-require 'tmpdir'
-require_relative '../../lib/rdoc/rubygems_hook'
-require 'test/unit'
-
-class TestRDocRubygemsHook < Test::Unit::TestCase
-  def setup
-    @a = Gem::Specification.new do |s|
-      s.platform    = Gem::Platform::RUBY
-      s.name        = "a"
-      s.version     = 2
-      s.rdoc_options = %w[--main MyTitle]
-      s.extra_rdoc_files = %w[README]
-    end
-    @tempdir = File.realpath(Dir.mktmpdir("test_rubygems_hook_"))
-
-    @orig_envs = %w[
-      GEM_VENDOR
-      GEMRC
-      XDG_CACHE_HOME
-      XDG_CONFIG_HOME
-      XDG_DATA_HOME
-      SOURCE_DATE_EPOCH
-      BUNDLER_VERSION
-      HOME
-      RDOCOPT
-    ].map {|e| [e, ENV.delete(e)]}.to_h
-    ENV["HOME"] = @tempdir
-
-    Gem.configuration = nil
-
-    @a.instance_variable_set(:@doc_dir, File.join(@tempdir, "doc"))
-    @a.instance_variable_set(:@gem_dir, File.join(@tempdir, "a-2"))
-    @a.instance_variable_set(:@full_gem_path, File.join(@tempdir, "a-2"))
-    @a.loaded_from = File.join(@tempdir, 'a-2', 'a-2.gemspec')
-
-    FileUtils.mkdir_p File.join(@tempdir, 'a-2', 'lib')
-    FileUtils.touch   File.join(@tempdir, 'a-2', 'lib', 'a.rb')
-    FileUtils.touch   File.join(@tempdir, 'a-2', 'README')
-
-    @hook = RDoc::RubygemsHook.new @a
-
-    begin
-      RDoc::RubygemsHook.load_rdoc
-    rescue Gem::DocumentError => e
-      omit e.message
-    end
-    @old_ui = Gem::DefaultUserInteraction.ui
-    Gem::DefaultUserInteraction.ui = Gem::SilentUI.new
-  end
-
-  def teardown
-    ui = Gem::DefaultUserInteraction.ui
-    Gem::DefaultUserInteraction.ui = @old_ui
-    FileUtils.rm_rf @tempdir
-    ui.close
-    ENV.update(@orig_envs)
-  end
-
-  def test_initialize
-    refute @hook.generate_rdoc
-    assert @hook.generate_ri
-
-    rdoc = RDoc::RubygemsHook.new @a, false, false
-
-    refute rdoc.generate_rdoc
-    refute rdoc.generate_ri
-  end
-
-  def test_delete_legacy_args
-    args = %w[
-      --inline-source
-      --one-file
-      --promiscuous
-      -p
-    ]
-
-    @hook.delete_legacy_args args
-
-    assert_empty args
-  end
-
-  def test_document
-    options = RDoc::Options.new
-    options.files = []
-
-    rdoc = @hook.new_rdoc
-    rdoc.store = RDoc::Store.new
-    @hook.instance_variable_set :@rdoc, rdoc
-    @hook.instance_variable_set :@file_info, []
-
-    @hook.document 'darkfish', options, @a.doc_dir('rdoc')
-
-    assert @hook.rdoc_installed?
-  end
-
-  def test_generate
-    FileUtils.mkdir_p @a.doc_dir
-    FileUtils.mkdir_p File.join(@a.gem_dir, 'lib')
-
-    @hook.generate
-
-    refute @hook.rdoc_installed?
-    assert @hook.ri_installed?
-
-    rdoc = @hook.instance_variable_get :@rdoc
-
-    refute rdoc.options.hyperlink_all
-    assert_equal Pathname(@a.full_gem_path), rdoc.options.root
-    assert_equal %w[README lib], rdoc.options.files.sort
-
-    assert_equal 'MyTitle', rdoc.store.main
-  end
-
-  def test_generate_all
-    @hook.generate_rdoc = true
-    @hook.generate_ri   = true
-
-    FileUtils.mkdir_p @a.doc_dir
-    FileUtils.mkdir_p File.join(@a.gem_dir, 'lib')
-
-    @hook.generate
-
-    assert @hook.rdoc_installed?
-    assert @hook.ri_installed?
-
-    rdoc = @hook.instance_variable_get :@rdoc
-
-    refute rdoc.options.hyperlink_all
-    assert_equal Pathname(@a.full_gem_path), rdoc.options.root
-    assert_equal %w[README lib], rdoc.options.files.sort
-
-    assert_equal 'MyTitle', rdoc.store.main
-  end
-
-  def test_generate_configuration_rdoc_array
-    Gem.configuration[:rdoc] = %w[-A]
-
-    FileUtils.mkdir_p @a.doc_dir
-    FileUtils.mkdir_p File.join(@a.gem_dir, 'lib')
-
-    @hook.generate
-
-    rdoc = @hook.instance_variable_get :@rdoc
-
-    assert rdoc.options.hyperlink_all
-  end
-
-  def test_generate_configuration_rdoc_string
-    Gem.configuration[:rdoc] = '-A'
-
-    FileUtils.mkdir_p @a.doc_dir
-    FileUtils.mkdir_p File.join(@a.gem_dir, 'lib')
-
-    @hook.generate
-
-    rdoc = @hook.instance_variable_get :@rdoc
-
-    assert rdoc.options.hyperlink_all
-  end
-
-  def test_generate_default_gem
-    Gem::Deprecate.skip_during do
-      if Gem.respond_to?(:default_specifications_dir)
-        klass = Gem
-      else
-        klass = Gem::Specification
-      end
-      @a.loaded_from = File.join klass.default_specifications_dir, 'a.gemspec'
-    end
-
-    @hook.generate
-
-    refute @hook.rdoc_installed?
-    refute @hook.ri_installed?
-  end
-
-  def test_generate_disabled
-    @hook.generate_rdoc = false
-    @hook.generate_ri   = false
-
-    @hook.generate
-
-    refute @hook.rdoc_installed?
-    refute @hook.ri_installed?
-  end
-
-  def test_generate_force
-    FileUtils.mkdir_p @a.doc_dir 'ri'
-    FileUtils.mkdir_p @a.doc_dir 'rdoc'
-    FileUtils.mkdir_p File.join(@a.gem_dir, 'lib')
-
-    @hook.force = true
-
-    @hook.generate
-
-    assert_path_not_exist File.join(@a.doc_dir('rdoc'), 'index.html')
-    assert_path_exist File.join(@a.doc_dir('ri'),   'cache.ri')
-  end
-
-  def test_generate_no_overwrite
-    FileUtils.mkdir_p @a.doc_dir 'ri'
-    FileUtils.mkdir_p @a.doc_dir 'rdoc'
-    FileUtils.mkdir_p File.join(@a.gem_dir, 'lib')
-
-    @hook.generate
-
-    assert_path_not_exist File.join(@a.doc_dir('rdoc'), 'index.html')
-    assert_path_not_exist File.join(@a.doc_dir('ri'),   'cache.ri')
-  end
-
-  def test_new_rdoc
-    assert_kind_of RDoc::RDoc, @hook.new_rdoc
-  end
-
-  def test_rdoc_installed?
-    refute @hook.rdoc_installed?
-
-    FileUtils.mkdir_p @a.doc_dir 'rdoc'
-
-    assert @hook.rdoc_installed?
-  end
-
-  def test_remove
-    FileUtils.mkdir_p @a.doc_dir 'rdoc'
-    FileUtils.mkdir_p @a.doc_dir 'ri'
-
-    @hook.remove
-
-    refute @hook.rdoc_installed?
-    refute @hook.ri_installed?
-
-    assert_path_exist @a.doc_dir
-  end
-
-  def test_remove_unwritable
-    omit 'chmod not supported' if Gem.win_platform?
-    omit "assumes that euid is not root" if Process.euid == 0
-
-    FileUtils.mkdir_p @a.base_dir
-    FileUtils.chmod 0, @a.base_dir
-
-    e = assert_raise Gem::FilePermissionError do
-      @hook.remove
-    end
-
-    assert_equal @a.base_dir, e.directory
-  ensure
-    FileUtils.chmod(0755, @a.base_dir) if File.directory?(@a.base_dir)
-  end
-
-  def test_ri_installed?
-    refute @hook.ri_installed?
-
-    FileUtils.mkdir_p @a.doc_dir 'ri'
-
-    assert @hook.ri_installed?
-  end
-
-  def test_setup
-    @hook.setup
-
-    assert_path_exist @a.doc_dir
-  end
-
-  def test_setup_unwritable
-    omit 'chmod not supported' if Gem.win_platform?
-    omit "assumes that euid is not root" if Process.euid == 0
-
-    FileUtils.mkdir_p @a.doc_dir
-    FileUtils.chmod 0, @a.doc_dir
-
-    e = assert_raise Gem::FilePermissionError do
-      @hook.setup
-    end
-
-    assert_equal @a.doc_dir, e.directory
-  ensure
-    if File.exist? @a.doc_dir
-      FileUtils.chmod 0755, @a.doc_dir
-      FileUtils.rm_r @a.doc_dir
-    end
-  end
-
-end
diff --git a/test/rdoc/test_rdoc_servlet.rb b/test/rdoc/test_rdoc_servlet.rb
deleted file mode 100644
index 7a5b15a6ebd466..00000000000000
--- a/test/rdoc/test_rdoc_servlet.rb
+++ /dev/null
@@ -1,555 +0,0 @@
-# frozen_string_literal: true
-require_relative 'helper'
-begin
-  require 'webrick'
-rescue LoadError
-end
-
-class TestRDocServlet < RDoc::TestCase
-
-  def setup
-    super
-
-    @orig_gem_path = Gem.path
-
-    @tempdir = File.join Dir.tmpdir, "test_rdoc_servlet_#{$$}"
-    Gem.use_paths @tempdir
-    Gem.ensure_gem_subdirectories @tempdir
-
-    @spec = Gem::Specification.new 'spec', '1.0'
-    @spec.loaded_from = @spec.spec_file
-
-    Gem::Specification.reset
-    Gem::Specification.all = [@spec]
-
-    @server = {}
-    def @server.mount(*) end
-
-    @stores = {}
-    @cache  = Hash.new { |hash, store| hash[store] = {} }
-
-    @extra_dirs = [File.join(@tempdir, 'extra1'), File.join(@tempdir, 'extra2')]
-
-    @s = RDoc::Servlet.new @server, @stores, @cache, nil, @extra_dirs
-
-    @req = WEBrick::HTTPRequest.new :Logger => nil
-    @res = WEBrick::HTTPResponse.new :HTTPVersion => '1.0'
-
-    def @req.path= path
-      instance_variable_set :@path, path
-    end
-
-    @req.instance_variable_set :@header, Hash.new { |h, k| h[k] = [] }
-
-    @base        = File.join @tempdir, 'base'
-    @system_dir  = File.join @tempdir, 'base', 'system'
-    @home_dir    = File.join @tempdir, 'home'
-    @gem_doc_dir = File.join @tempdir, 'doc'
-
-    @orig_base = RDoc::RI::Paths::BASE
-    RDoc::RI::Paths::BASE.replace @base
-    @orig_ri_path_homedir = RDoc::RI::Paths::HOMEDIR
-    RDoc::RI::Paths.send :remove_const, :HOMEDIR
-    RDoc::RI::Paths.const_set :HOMEDIR, @home_dir
-
-    RDoc::RI::Paths.instance_variable_set \
-      :@gemdirs, %w[/nonexistent/gems/example-1.0/ri]
-  end
-
-  def teardown
-    super
-
-    Gem.use_paths(*@orig_gem_path)
-    Gem::Specification.reset
-
-    FileUtils.rm_rf @tempdir
-
-    RDoc::RI::Paths::BASE.replace @orig_base
-    RDoc::RI::Paths.send :remove_const, :HOMEDIR
-    RDoc::RI::Paths.const_set :HOMEDIR, @orig_ri_path_homedir
-    RDoc::RI::Paths.instance_variable_set :@gemdirs, nil
-  end
-
-  def test_asset
-    temp_dir do
-      FileUtils.mkdir 'css'
-
-      now = Time.now
-      File.open 'css/rdoc.css', 'w' do |io| io.write 'h1 { color: red }' end
-      File.utime now, now, 'css/rdoc.css'
-
-      @s.asset_dirs[:darkfish] = '.'
-
-      @req.path = '/css/rdoc.css'
-
-      @s.asset :darkfish, @req, @res
-
-      assert_equal 'h1 { color: red }', @res.body
-      assert_equal 'text/css',          @res.content_type
-      assert_equal now.httpdate,        @res['last-modified']
-    end
-  end
-
-  def test_do_GET
-    touch_system_cache_path
-
-    @req.path = '/ruby/Missing.html'
-
-    @s.do_GET @req, @res
-
-    assert_equal 404, @res.status
-  end
-
-  def test_do_GET_asset_darkfish
-    temp_dir do
-      FileUtils.mkdir 'css'
-      FileUtils.touch 'css/rdoc.css'
-
-      @s.asset_dirs[:darkfish] = '.'
-
-      @req.path = '/css/rdoc.css'
-
-      @s.do_GET @req, @res
-
-      assert_equal 'text/css',          @res.content_type
-    end
-  end
-
-  def test_do_GET_asset_json_index
-    temp_dir do
-      FileUtils.mkdir 'js'
-      FileUtils.touch 'js/navigation.js'
-
-      @s.asset_dirs[:json_index] = '.'
-
-      @req.path = '/js/navigation.js'
-
-      @s.do_GET @req, @res
-
-      assert_equal 'application/javascript', @res.content_type
-    end
-  end
-
-  def test_do_GET_error
-    touch_system_cache_path
-
-    def @req.path() raise 'no' end
-
-    @s.do_GET @req, @res
-
-    assert_equal 500, @res.status
-  end
-
-  def test_do_GET_mount_path
-    @s = RDoc::Servlet.new @server, @stores, @cache, '/mount/path'
-
-    temp_dir do
-      FileUtils.mkdir 'css'
-      FileUtils.touch 'css/rdoc.css'
-
-      @s.asset_dirs[:darkfish] = '.'
-
-      @req.path = '/mount/path/css/rdoc.css'.dup
-
-      @s.do_GET @req, @res
-
-      assert_equal 'text/css', @res.content_type
-    end
-  end
-
-  def do_GET_not_found
-    touch_system_cache_path
-
-    @req.path = "/#{@spec.full_name}"
-
-    @s.do_GET @req, @res
-
-    assert_equal 404, @res.status
-  end
-
-  def test_do_GET_not_modified
-    touch_system_cache_path
-    @req.header['if-modified-since'] = [(Time.now + 10).httpdate]
-    @req.path = '/ruby/Missing.html'
-
-    assert_raise WEBrick::HTTPStatus::NotModified do
-      @s.do_GET @req, @res
-    end
-  end
-
-  def test_do_GET_root
-    touch_system_cache_path
-
-    @req.path = '/'
-
-    @s.do_GET @req, @res
-
-    assert_equal 'text/html',                                 @res.content_type
-    assert_match %r%<title>Local RDoc Documentation</title>%, @res.body
-  end
-
-  def test_do_GET_root_search
-    touch_system_cache_path
-
-    @req.path = '/js/search_index.js'
-
-    @s.do_GET @req, @res
-
-    assert_equal 'application/javascript', @res.content_type, @res.body
-  end
-
-  def test_documentation_page_class
-    store = RDoc::Store.new
-
-    generator = @s.generator_for store
-
-    file      = store.add_file 'file.rb'
-    klass     = file.add_class RDoc::NormalClass, 'Klass'
-                klass.add_class RDoc::NormalClass, 'Sub'
-
-    @s.documentation_page store, generator, 'Klass::Sub.html', @req, @res
-
-    assert_match %r%<title>class Klass::Sub - </title>%,            @res.body
-    assert_match %r%<body id="top" role="document" class="class">%, @res.body
-  end
-
-  def test_documentation_page_not_found
-    store = RDoc::Store.new
-
-    generator = @s.generator_for store
-
-    @req.path = '/ruby/Missing.html'
-
-    @s.documentation_page store, generator, 'Missing.html', @req, @res
-
-    assert_equal 404, @res.status
-  end
-
-  def test_documentation_page_page
-    store = RDoc::Store.new
-
-    generator = @s.generator_for store
-
-    store.add_file 'README.rdoc', parser: RDoc::Parser::Simple
-
-    @s.documentation_page store, generator, 'README_rdoc.html', @req, @res
-
-    assert_match %r%<title>README - </title>%, @res.body
-    assert_match %r%<body [^>]+ class="file">%,      @res.body
-  end
-
-  def test_documentation_page_page_with_nesting
-    store = RDoc::Store.new
-
-    generator = @s.generator_for store
-
-    store.add_file 'nesting/README.rdoc', parser: RDoc::Parser::Simple
-
-    @s.documentation_page store, generator, 'nesting/README_rdoc.html', @req, @res
-
-    assert_equal 200, @res.status
-  end
-
-  def test_documentation_source
-    store, path = @s.documentation_source '/ruby/Object.html'
-
-    assert_equal @system_dir, store.path
-
-    assert_equal 'Object.html', path
-  end
-
-  def test_documentation_source_cached
-    cached_store = RDoc::Store.new
-
-    @stores['ruby'] = cached_store
-
-    store, path = @s.documentation_source '/ruby/Object.html'
-
-    assert_same cached_store, store
-
-    assert_equal 'Object.html', path
-  end
-
-  def test_error
-    e = RuntimeError.new 'foo'
-    e.set_backtrace caller
-
-    @s.error e, @req, @res
-
-    assert_equal 'text/html',      @res.content_type
-    assert_equal 500,              @res.status
-    assert_match %r%<title>Error%, @res.body
-  end
-
-  def test_generator_for
-    store = RDoc::Store.new
-    store.main  = 'MAIN_PAGE.rdoc'
-    store.title = 'Title'
-
-    generator = @s.generator_for store
-
-    refute generator.file_output
-
-    assert_equal '..', generator.asset_rel_path
-
-    assert_equal 'MAIN_PAGE.rdoc', @s.options.main_page
-    assert_equal 'Title',          @s.options.title
-
-    assert_kind_of RDoc::RDoc, store.rdoc
-    assert_same generator, store.rdoc.generator
-  end
-
-  def test_if_modified_since
-    omit 'File.utime on directory not supported' if Gem.win_platform?
-
-    temp_dir do
-      now = Time.now
-      File.utime now, now, '.'
-
-      @s.if_modified_since @req, @res, '.'
-
-      assert_equal now.to_i, Time.parse(@res['last-modified']).to_i
-    end
-  end
-
-  def test_if_modified_since_not_modified
-    omit 'File.utime on directory not supported' if Gem.win_platform?
-
-    temp_dir do
-      now = Time.now
-      File.utime now, now, '.'
-
-      @req.header['if-modified-since'] = [(now + 10).httpdate]
-
-      assert_raise WEBrick::HTTPStatus::NotModified do
-        @s.if_modified_since @req, @res, '.'
-      end
-
-      assert_equal now.to_i, Time.parse(@res['last-modified']).to_i
-    end
-  end
-
-  def test_installed_docs
-    touch_system_cache_path
-    touch_extra_cache_path
-
-    expected = [
-      ['My Extra Documentation', 'extra-1/', true, :extra,
-        @extra_dirs[0]],
-      ['Extra Documentation', 'extra-2/', false, :extra,
-        @extra_dirs[1]],
-      ['Ruby Documentation', 'ruby/', true,  :system,
-        @system_dir],
-      ['Site Documentation', 'site/', false, :site,
-        File.join(@base, 'site')],
-      ['Home Documentation', 'home/', false, :home,
-        RDoc::RI::Paths::HOMEDIR],
-      ['spec-1.0', 'spec-1.0/',       false, :gem,
-        File.join(@spec.doc_dir, 'ri')],
-    ]
-
-    assert_equal expected, @s.installed_docs
-  end
-
-  def test_not_found
-    generator = @s.generator_for RDoc::Store.new
-
-    @req.path = '/ruby/Missing.html'
-
-    @s.not_found generator, @req, @res
-
-    assert_equal 404,                                @res.status
-    assert_match %r%<title>Not Found</title>%,       @res.body
-    assert_match %r%<kbd>/ruby/Missing\.html</kbd>%, @res.body
-  end
-
-  def test_not_found_message
-    generator = @s.generator_for RDoc::Store.new
-
-    @req.path = '/ruby/Missing.html'
-
-    @s.not_found generator, @req, @res, 'woo, this is a message'
-
-    assert_equal 404,                          @res.status
-    assert_match %r%<title>Not Found</title>%, @res.body
-    assert_match %r%woo, this is a message%,   @res.body
-  end
-
-  def test_ri_paths
-    paths = @s.ri_paths
-
-    expected = [
-      [@extra_dirs[0],                 :extra],
-      [@extra_dirs[1],                 :extra],
-      [@system_dir,                    :system],
-      [File.join(@base, 'site'),       :site],
-      [RDoc::RI::Paths::HOMEDIR,       :home],
-      [File.join(@spec.doc_dir, 'ri'), :gem],
-    ]
-
-    assert_equal expected, paths.to_a
-  end
-
-  def test_root
-    @s.root @req, @res
-
-    assert_equal 'text/html',                                 @res.content_type
-    assert_match %r%<title>Local RDoc Documentation</title>%, @res.body
-  end
-
-  def test_root_search
-    touch_system_cache_path
-    touch_extra_cache_path
-
-    @s.root_search @req, @res
-
-    assert_equal 'application/javascript', @res.content_type
-
-    @res.body =~ /\{.*\}/
-
-    index = JSON.parse $&
-
-    expected = {
-      'index' => {
-        'searchIndex' => %w[
-          My\ Extra\ Documentation
-          Ruby\ Documentation
-        ],
-        'longSearchIndex' => %w[
-          My\ Extra\ Documentation
-          Ruby\ Documentation
-        ],
-        'info' => [
-          ['My Extra Documentation', '', @extra_dirs[0], '',
-            'My Extra Documentation'],
-          ['Ruby Documentation', '', 'ruby', '',
-            'Documentation for the Ruby standard library'],
-        ],
-      }
-    }
-
-    assert_equal expected, index
-  end
-
-  def test_show_documentation_index
-    touch_system_cache_path
-
-    @req.path = '/ruby'
-
-    @s.show_documentation @req, @res
-
-    assert_equal 'text/html',                               @res.content_type
-    assert_match %r%<title>Standard Library Documentation%, @res.body
-  end
-
-  def test_show_documentation_table_of_contents
-    touch_system_cache_path
-
-    @req.path = '/ruby/table_of_contents.html'
-
-    @s.show_documentation @req, @res
-
-    assert_equal 'text/html',         @res.content_type
-    assert_match %r%<title>Table of Contents - Standard Library Documentation%,
-                 @res.body
-  end
-
-  def test_show_documentation_page
-    touch_system_cache_path
-
-    @req.path = '/ruby/Missing.html'
-
-    @s.show_documentation @req, @res
-
-    assert_equal 404, @res.status
-  end
-
-  def test_show_documentation_search_index
-    touch_system_cache_path
-
-    @req.path = '/ruby/js/search_index.js'
-
-    @s.show_documentation @req, @res
-
-    assert_equal 'application/javascript', @res.content_type
-    assert_match %r%\Avar search_data =%,  @res.body
-  end
-
-  def test_store_for_gem
-    ri_dir = File.join @gem_doc_dir, 'spec-1.0', 'ri'
-    FileUtils.mkdir_p ri_dir
-    FileUtils.touch File.join ri_dir, 'cache.ri'
-
-    store = @s.store_for 'spec-1.0'
-
-    assert_equal File.join(@gem_doc_dir, 'spec-1.0', 'ri'), store.path
-    assert_equal :gem, store.type
-  end
-
-  def test_store_for_home
-    store = @s.store_for 'home'
-
-    assert_equal @home_dir, store.path
-    assert_equal :home, store.type
-  end
-
-  def test_store_for_missing_documentation
-    FileUtils.mkdir_p(File.join @gem_doc_dir, 'spec-1.0', 'ri')
-
-    e = assert_raise WEBrick::HTTPStatus::NotFound do
-      @s.store_for 'spec-1.0'
-    end
-
-    assert_equal 'Could not find documentation for "spec-1.0". Please run `gem rdoc --ri gem_name`',
-                 e.message
-  end
-
-  def test_store_for_missing_gem
-    e = assert_raise WEBrick::HTTPStatus::NotFound do
-      @s.store_for 'missing'
-    end
-
-    assert_equal 'Could not find gem "missing". Are you sure you installed it?',
-                 e.message
-  end
-
-  def test_store_for_ruby
-    store = @s.store_for 'ruby'
-
-    assert_equal @system_dir, store.path
-    assert_equal :system, store.type
-  end
-
-  def test_store_for_site
-    store = @s.store_for 'site'
-
-    assert_equal File.join(@base, 'site'), store.path
-    assert_equal :site, store.type
-  end
-
-  def test_store_for_extra
-    store = @s.store_for 'extra-1'
-
-    assert_equal @extra_dirs.first, store.path
-    assert_equal :extra, store.type
-  end
-
-  def touch_system_cache_path
-    store = RDoc::Store.new @system_dir
-    store.title = 'Standard Library Documentation'
-
-    FileUtils.mkdir_p File.dirname store.cache_path
-
-    store.save
-  end
-
-  def touch_extra_cache_path
-    store = RDoc::Store.new @extra_dirs.first
-    store.title = 'My Extra Documentation'
-
-    FileUtils.mkdir_p File.dirname store.cache_path
-
-    store.save
-  end
-
-end if defined?(WEBrick)
diff --git a/test/rdoc/test_rdoc_single_class.rb b/test/rdoc/test_rdoc_single_class.rb
deleted file mode 100644
index e81a1498ba8d07..00000000000000
--- a/test/rdoc/test_rdoc_single_class.rb
+++ /dev/null
@@ -1,20 +0,0 @@
-# frozen_string_literal: true
-require_relative 'helper'
-
-class TestRDocSingleClass < RDoc::TestCase
-
-  def setup
-    super
-
-    @c = RDoc::SingleClass.new 'C'
-  end
-
-  def test_aref_prefix
-    assert_equal 'sclass', @c.aref_prefix
-  end
-
-  def test_definition
-    assert_equal 'class << C', @c.definition
-  end
-
-end
diff --git a/test/rdoc/test_rdoc_stats.rb b/test/rdoc/test_rdoc_stats.rb
deleted file mode 100644
index ce272d36cf2881..00000000000000
--- a/test/rdoc/test_rdoc_stats.rb
+++ /dev/null
@@ -1,722 +0,0 @@
-# frozen_string_literal: true
-require_relative 'helper'
-
-class TestRDocStats < RDoc::TestCase
-
-  def setup
-    super
-
-    @s = RDoc::Stats.new @store, 0
-
-    @tl = @store.add_file 'file.rb'
-    @tl.parser = RDoc::Parser::Ruby
-  end
-
-  def test_doc_stats
-    c = RDoc::CodeObject.new
-
-    assert_equal [1, 1], @s.doc_stats([c])
-  end
-
-  def test_doc_stats_documented
-    c = RDoc::CodeObject.new
-    c.comment = comment 'x'
-
-    assert_equal [1, 0], @s.doc_stats([c])
-  end
-
-  def test_doc_stats_display_eh
-    c = RDoc::CodeObject.new
-    c.ignore
-
-    assert_equal [0, 0], @s.doc_stats([c])
-  end
-
-  def test_report_attr
-    c = @tl.add_class RDoc::NormalClass, 'C'
-    c.record_location @tl
-    c.add_comment 'C', @tl
-
-    a = RDoc::Attr.new nil, 'a', 'RW', nil
-    a.record_location @tl
-    c.add_attribute a
-
-    @store.complete :public
-
-    report = @s.report
-
-    expected =
-      doc(
-        para('The following items are not documented:'),
-        blank_line,
-        verb(
-          "class C # is documented\n",
-          "\n",
-          "  attr_accessor :a # in file file.rb\n",
-          "\n",
-          "end\n"),
-        blank_line)
-
-    assert_equal expected, report
-  end
-
-  def test_report_attr_documented
-    c = @tl.add_class RDoc::NormalClass, 'C'
-    c.record_location @tl
-    c.add_comment 'C', @tl
-
-    a = RDoc::Attr.new nil, 'a', 'RW', 'a'
-    a.record_location @tl
-    c.add_attribute a
-
-    @store.complete :public
-
-    report = @s.report
-
-    assert_equal @s.great_job, report
-  end
-
-  def test_report_attr_line
-    c = @tl.add_class RDoc::NormalClass, 'C'
-    c.record_location @tl
-    c.add_comment 'C', @tl
-
-    a = RDoc::Attr.new nil, 'a', 'RW', nil
-    a.record_location @tl
-    a.line = 3
-    c.add_attribute a
-
-    @store.complete :public
-
-    assert_match '# in file file.rb:3', @s.report.accept(to_rdoc)
-  end
-
-  def test_report_constant
-    m = @tl.add_module RDoc::NormalModule, 'M'
-    m.record_location @tl
-    m.add_comment 'M', @tl
-
-    c = RDoc::Constant.new 'C', nil, nil
-    c.record_location @tl
-    m.add_constant c
-
-    @store.complete :public
-
-    report = @s.report
-
-    expected =
-      doc(
-        para('The following items are not documented:'),
-        blank_line,
-        verb(
-          "module M # is documented\n",
-          "\n",
-          "  # in file file.rb\n",
-          "  C = nil\n",
-          "\n",
-          "end\n"),
-        blank_line)
-
-    assert_equal expected, report
-  end
-
-  def test_report_constant_alias
-    mod = @tl.add_module RDoc::NormalModule, 'M'
-
-    c = @tl.add_class RDoc::NormalClass, 'C'
-    mod.add_constant c
-
-    ca = RDoc::Constant.new 'CA', nil, nil
-    ca.is_alias_for = c
-
-    @tl.add_constant ca
-
-    @store.complete :public
-
-    report = @s.report
-
-    # TODO change this to refute match, aliases should be ignored as they are
-    # programmer convenience constructs
-    assert_match 'class Object', report.accept(to_rdoc)
-  end
-
-  def test_report_constant_documented
-    m = @tl.add_module RDoc::NormalModule, 'M'
-    m.record_location @tl
-    m.add_comment 'M', @tl
-
-    c = RDoc::Constant.new 'C', nil, 'C'
-    c.record_location @tl
-    m.add_constant c
-
-    @store.complete :public
-
-    report = @s.report
-
-    assert_equal @s.great_job, report
-  end
-
-  def test_report_constant_line
-    m = @tl.add_module RDoc::NormalModule, 'M'
-    m.record_location @tl
-    m.add_comment 'M', @tl
-
-    c = RDoc::Constant.new 'C', nil, nil
-    c.record_location @tl
-    c.line = 5
-    m.add_constant c
-
-    @store.complete :public
-
-    assert_match '# in file file.rb:5', @s.report.accept(to_rdoc)
-  end
-
-  def test_report_class
-    c = @tl.add_class RDoc::NormalClass, 'C'
-    c.record_location @tl
-
-    m = RDoc::AnyMethod.new nil, 'm'
-    m.record_location @tl
-    c.add_method m
-    m.comment = 'm'
-
-    @store.complete :public
-
-    report = @s.report
-
-    expected =
-      doc(
-        para('The following items are not documented:'),
-        blank_line,
-        para('In files:'),
-        list(:BULLET, *[
-          item(nil, para('file.rb'))]),
-        blank_line,
-        verb("class C\n", "end\n"),
-        blank_line)
-
-    assert_equal expected, report
-  end
-
-  def test_report_skip_object
-    c = @tl.add_class RDoc::NormalClass, 'Object'
-    c.record_location @tl
-
-    m = RDoc::AnyMethod.new nil, 'm'
-    m.record_location @tl
-    c.add_method m
-    m.comment = 'm'
-
-    @store.complete :public
-
-    refute_match %r%^class Object$%, @s.report.accept(to_rdoc)
-  end
-
-  def test_report_class_documented
-    c = @tl.add_class RDoc::NormalClass, 'C'
-    c.record_location @tl
-    c.add_comment 'C', @tl
-
-    m = RDoc::AnyMethod.new nil, 'm'
-    m.record_location @tl
-    c.add_method m
-    m.comment = 'm'
-
-    @store.complete :public
-
-    report = @s.report
-
-    assert_equal @s.great_job, report
-  end
-
-  def test_report_class_documented_level_1
-    c1 = @tl.add_class RDoc::NormalClass, 'C1'
-    c1.record_location @tl
-    c1.add_comment 'C1', @tl
-
-    m1 = RDoc::AnyMethod.new nil, 'm1'
-    m1.record_location @tl
-    c1.add_method m1
-    m1.comment = 'm1'
-
-    c2 = @tl.add_class RDoc::NormalClass, 'C2'
-    c2.record_location @tl
-
-    m2 = RDoc::AnyMethod.new nil, 'm2'
-    m2.record_location @tl
-    c2.add_method m2
-    m2.comment = 'm2'
-
-    @store.complete :public
-
-    @s.coverage_level = 1
-
-    report = @s.report
-
-    expected =
-      doc(
-        para('The following items are not documented:'),
-        blank_line,
-        para('In files:'),
-        list(:BULLET, *[
-          item(nil, para('file.rb'))]),
-        blank_line,
-        verb("class C2\n", "end\n"),
-        blank_line)
-
-    assert_equal expected, report
-  end
-
-  def test_report_class_empty
-    @tl.add_class RDoc::NormalClass, 'C'
-
-    @store.complete :public
-
-    report = @s.report
-
-    expected =
-      doc(
-        para('The following items are not documented:'),
-        blank_line,
-        para('class C is referenced but empty.'),
-        para("It probably came from another project.  I'm sorry I'm holding it against you."),
-        blank_line)
-
-    assert_equal expected, report
-  end
-
-  def test_report_class_empty_2
-    c1 = @tl.add_class RDoc::NormalClass, 'C1'
-    c1.record_location @tl
-
-    c2 = @tl.add_class RDoc::NormalClass, 'C2'
-    c2.record_location @tl
-    c2.add_comment 'C2', @tl
-
-    @store.complete :public
-
-    @s.coverage_level = 1
-    report = @s.report
-
-    expected =
-      doc(
-        para('The following items are not documented:'),
-        blank_line,
-        para('In files:'),
-        list(:BULLET, *[
-          item(nil, para('file.rb'))]),
-        blank_line,
-        verb("class C1\n", "end\n"),
-        blank_line)
-
-    assert_equal expected, report
-  end
-
-  def test_report_class_method_documented
-    c = @tl.add_class RDoc::NormalClass, 'C'
-    c.record_location @tl
-
-    m = RDoc::AnyMethod.new nil, 'm'
-    m.record_location @tl
-    c.add_method m
-    m.comment = 'm'
-
-    @store.complete :public
-
-    report = @s.report
-
-    expected =
-      doc(
-        para('The following items are not documented:'),
-        blank_line,
-        para('In files:'),
-        list(:BULLET, *[
-          item(nil, para('file.rb'))]),
-        blank_line,
-        verb("class C\n", "end\n"),
-        blank_line)
-
-    assert_equal expected, report
-  end
-
-  def test_report_class_module_ignore
-    c = @tl.add_class RDoc::NormalClass, 'C'
-    c.ignore
-
-    @store.complete :public
-
-    report = @s.report_class_module c
-
-    assert_nil report
-  end
-
-  def test_report_empty
-    @store.complete :public
-
-    report = @s.report
-
-    assert_equal @s.great_job, report
-  end
-
-  def test_report_method
-    c = @tl.add_class RDoc::NormalClass, 'C'
-    c.record_location @tl
-    c.add_comment 'C', @tl
-
-    m1 = RDoc::AnyMethod.new nil, 'm1'
-    m1.record_location @tl
-    c.add_method m1
-
-    m2 = RDoc::AnyMethod.new nil, 'm2'
-    m2.record_location @tl
-    c.add_method m2
-    m2.comment = 'm2'
-
-    @store.complete :public
-
-    report = @s.report
-
-    expected =
-      doc(
-        para('The following items are not documented:'),
-        blank_line,
-        verb(*[
-          "class C # is documented\n",
-          "\n",
-          "  # in file file.rb\n",
-          "  def m1; end\n",
-          "\n",
-          "end\n"]),
-        blank_line)
-
-    assert_equal expected, report
-  end
-
-  def test_report_method_class
-    c = @tl.add_class RDoc::NormalClass, 'C'
-    c.record_location @tl
-    c.add_comment 'C', @tl
-
-    m1 = RDoc::AnyMethod.new nil, 'm1'
-    m1.record_location @tl
-    m1.singleton = true
-    c.add_method m1
-
-    m2 = RDoc::AnyMethod.new nil, 'm2'
-    m2.record_location @tl
-    m2.singleton = true
-    c.add_method m2
-    m2.comment = 'm2'
-
-    @store.complete :public
-
-    report = @s.report
-
-    expected =
-      doc(
-        para('The following items are not documented:'),
-        blank_line,
-        verb(*[
-          "class C # is documented\n",
-          "\n",
-          "  # in file file.rb\n",
-          "  def self.m1; end\n",
-          "\n",
-          "end\n"]),
-        blank_line)
-
-    assert_equal expected, report
-  end
-
-  def test_report_method_documented
-    c = @tl.add_class RDoc::NormalClass, 'C'
-    c.record_location @tl
-    c.add_comment 'C', @tl
-
-    m = RDoc::AnyMethod.new nil, 'm'
-    m.record_location @tl
-    c.add_method m
-    m.comment = 'm'
-
-    @store.complete :public
-
-    report = @s.report
-
-    assert_equal @s.great_job, report
-  end
-
-  def test_report_method_line
-    c = @tl.add_class RDoc::NormalClass, 'C'
-    c.record_location @tl
-    c.add_comment 'C', @tl
-
-    m1 = RDoc::AnyMethod.new nil, 'm1'
-    m1.record_location @tl
-    m1.line = 4
-    c.add_method m1
-
-    @store.complete :public
-
-    assert_match '# in file file.rb:4', @s.report.accept(to_rdoc)
-  end
-
-  def test_report_method_parameters
-    c = @tl.add_class RDoc::NormalClass, 'C'
-    c.record_location @tl
-    c.add_comment 'C', @tl
-
-    m1 = RDoc::AnyMethod.new nil, 'm1'
-    m1.record_location @tl
-    m1.params = '(p1, p2)'
-    m1.comment = 'Stuff with +p1+'
-    c.add_method m1
-
-    m2 = RDoc::AnyMethod.new nil, 'm2'
-    m2.record_location @tl
-    c.add_method m2
-    m2.comment = 'm2'
-
-    @store.complete :public
-
-    @s.coverage_level = 1
-    report = @s.report
-
-    expected =
-      doc(
-        para('The following items are not documented:'),
-        blank_line,
-        verb(*[
-          "class C # is documented\n",
-          "\n",
-          "  # in file file.rb\n",
-          "  # +p2+ is not documented\n",
-          "  def m1(p1, p2); end\n",
-          "\n",
-          "end\n"]),
-        blank_line)
-
-    assert_equal expected, report
-  end
-
-  def test_report_method_parameters_documented
-    @tl.parser = RDoc::Parser::Ruby
-    c = @tl.add_class RDoc::NormalClass, 'C'
-    c.record_location @tl
-    c.add_comment 'C', @tl
-
-    m = RDoc::AnyMethod.new nil, 'm'
-    m.record_location @tl
-    m.params = '(p1)'
-    m.comment = 'Stuff with +p1+'
-    c.add_method m
-
-    @store.complete :public
-
-    @s.coverage_level = 1
-    report = @s.report
-
-    assert_equal @s.great_job, report
-  end
-
-  def test_report_method_parameters_yield
-    c = @tl.add_class RDoc::NormalClass, 'C'
-    c.record_location @tl
-    c.add_comment 'C', @tl
-
-    m = RDoc::AnyMethod.new nil, 'm'
-    m.record_location @tl
-    m.call_seq = <<-SEQ
-m(a) { |c| ... }
-m(a, b) { |c, d| ... }
-    SEQ
-    m.comment = 'Stuff with +a+, yields +c+ for you to do stuff with'
-    c.add_method m
-
-    @store.complete :public
-
-    @s.coverage_level = 1
-    report = @s.report
-
-    expected =
-      doc(
-        para('The following items are not documented:'),
-        blank_line,
-        verb(
-          "class C # is documented\n",
-          "\n",
-          "  # in file file.rb\n",
-          "  # +b+, +d+ is not documented\n",
-          "  def m; end\n",
-          "\n",
-          "end\n"),
-        blank_line)
-
-    assert_equal expected, report
-  end
-
-  def test_summary
-    c = @tl.add_class RDoc::NormalClass, 'C'
-    c.record_location @tl
-
-    m = @tl.add_module RDoc::NormalModule, 'M'
-    m.record_location @tl
-
-    a = RDoc::Attr.new nil, 'a', 'RW', nil
-    a.record_location @tl
-    c.add_attribute a
-
-    c_c = RDoc::Constant.new 'C', nil, nil
-    c_c.record_location @tl
-    c.add_constant c_c
-
-    m = RDoc::AnyMethod.new nil, 'm'
-    m.record_location @tl
-    c.add_method m
-
-    @store.complete :public
-
-    summary = @s.summary.accept to_rdoc
-    summary.sub!(/  Elapsed:.*/m, '')
-
-    expected = <<-EXPECTED
-  Files:      0
-
-  Classes:    1 (1 undocumented)
-  Modules:    1 (1 undocumented)
-  Constants:  1 (1 undocumented)
-  Attributes: 1 (1 undocumented)
-  Methods:    1 (1 undocumented)
-
-  Total:      5 (5 undocumented)
-    0.00% documented
-
-    EXPECTED
-
-    assert_equal summary, expected
-  end
-
-  def test_summary_level_false
-    c = @tl.add_class RDoc::NormalClass, 'C'
-    c.record_location @tl
-
-    @store.complete :public
-
-    @s.coverage_level = false
-
-    summary = @s.summary.accept to_rdoc
-    summary.sub!(/  Elapsed:.*/m, '')
-
-    expected = <<-EXPECTED
-  Files:      0
-
-  Classes:    1 (1 undocumented)
-  Modules:    0 (0 undocumented)
-  Constants:  0 (0 undocumented)
-  Attributes: 0 (0 undocumented)
-  Methods:    0 (0 undocumented)
-
-  Total:      1 (1 undocumented)
-    0.00% documented
-
-    EXPECTED
-
-    assert_equal summary, expected
-  end
-
-  def test_summary_level_1
-    c = @tl.add_class RDoc::NormalClass, 'C'
-    c.record_location @tl
-    c.add_comment 'C', @tl
-
-    m = RDoc::AnyMethod.new nil, 'm'
-    m.record_location @tl
-    m.params = '(p1, p2)'
-    m.comment = 'Stuff with +p1+'
-    c.add_method m
-
-    @store.complete :public
-
-    @s.coverage_level = 1
-    @s.report
-
-    summary = @s.summary.accept to_rdoc
-    summary.sub!(/  Elapsed:.*/m, '')
-
-    expected = <<-EXPECTED
-  Files:      0
-
-  Classes:    1 (0 undocumented)
-  Modules:    0 (0 undocumented)
-  Constants:  0 (0 undocumented)
-  Attributes: 0 (0 undocumented)
-  Methods:    1 (0 undocumented)
-  Parameters: 2 (1 undocumented)
-
-  Total:      4 (1 undocumented)
-   75.00% documented
-
-    EXPECTED
-
-    assert_equal summary, expected
-  end
-
-  def to_rdoc
-    RDoc::Markup::ToRdoc.new
-  end
-
-  def test_undoc_params
-    method = RDoc::AnyMethod.new [], 'm'
-    method.params = '(a)'
-    method.comment = comment 'comment'
-
-    total, undoc = @s.undoc_params method
-
-    assert_equal 1,     total
-    assert_equal %w[a], undoc
-  end
-
-  def test_undoc_params_block
-    method = RDoc::AnyMethod.new [], 'm'
-    method.params = '(&a)'
-    method.comment = comment '+a+'
-
-    total, undoc = @s.undoc_params method
-
-    assert_equal 1, total
-    assert_empty    undoc
-  end
-
-  def test_undoc_params_documented
-    method = RDoc::AnyMethod.new [], 'm'
-    method.params = '(a)'
-    method.comment = comment '+a+'
-
-    total, undoc = @s.undoc_params method
-
-    assert_equal 1, total
-    assert_empty    undoc
-  end
-
-  def test_undoc_params_keywords
-    method = RDoc::AnyMethod.new [], 'm'
-    method.params = '(**a)'
-    method.comment = comment '+a+'
-
-    total, undoc = @s.undoc_params method
-
-    assert_equal 1, total
-    assert_empty    undoc
-  end
-
-  def test_undoc_params_splat
-    method = RDoc::AnyMethod.new [], 'm'
-    method.params = '(*a)'
-    method.comment = comment '+a+'
-
-    total, undoc = @s.undoc_params method
-
-    assert_equal 1, total
-    assert_empty    undoc
-  end
-
-end
diff --git a/test/rdoc/test_rdoc_store.rb b/test/rdoc/test_rdoc_store.rb
deleted file mode 100644
index 50e8667d81b02f..00000000000000
--- a/test/rdoc/test_rdoc_store.rb
+++ /dev/null
@@ -1,1012 +0,0 @@
-# frozen_string_literal: true
-require_relative 'xref_test_case'
-
-class TestRDocStore < XrefTestCase
-
-  OBJECT_ANCESTORS = %w[BasicObject]
-
-  def setup
-    super
-
-    @tmpdir = File.join Dir.tmpdir, "test_rdoc_ri_store_#{$$}"
-    @s = RDoc::RI::Store.new @tmpdir
-    @s.rdoc = @rdoc
-
-    @top_level = @s.add_file 'file.rb'
-
-    @page = @s.add_file 'README.txt', parser: RDoc::Parser::Simple
-    @page.comment = RDoc::Comment.new 'This is a page', @page
-
-    @klass = @top_level.add_class RDoc::NormalClass, 'Object'
-    @klass.add_comment 'original', @top_level
-    @klass.record_location @top_level
-
-    @cmeth = RDoc::AnyMethod.new nil, 'cmethod'
-    @cmeth.singleton = true
-    @cmeth.record_location @top_level
-
-    @meth_comment = RDoc::Comment.new 'method comment'
-    @meth_comment.location = @top_level
-
-    @meth = RDoc::AnyMethod.new nil, 'method'
-    @meth.record_location @top_level
-    @meth.comment = @meth_comment
-
-    @meth_bang = RDoc::AnyMethod.new nil, 'method!'
-    @meth_bang.record_location @top_level
-
-    @meth_bang_alias = RDoc::Alias.new nil, 'method!', 'method_bang', ''
-    @meth_bang_alias.record_location @top_level
-
-    @meth_bang.add_alias @meth_bang_alias, @klass
-
-    @attr_comment = RDoc::Comment.new 'attribute comment'
-    @attr_comment.location = @top_level
-
-    @attr = RDoc::Attr.new nil, 'attr', 'RW', ''
-    @attr.record_location @top_level
-    @attr.comment = @attr_comment
-
-    @klass.add_method @cmeth
-    @klass.add_method @meth
-    @klass.add_method @meth_bang
-    @klass.add_attribute @attr
-
-    @nest_klass = @klass.add_class RDoc::NormalClass, 'SubClass'
-    @nest_meth = RDoc::AnyMethod.new nil, 'method'
-    @nest_meth.record_location @top_level
-
-    @nest_incl = RDoc::Include.new 'Incl', ''
-    @nest_incl.record_location @top_level
-
-    @nest_klass.add_method @nest_meth
-    @nest_klass.add_include @nest_incl
-
-    @mod = @top_level.add_module RDoc::NormalModule, 'Mod'
-    @mod.record_location @top_level
-  end
-
-  def teardown
-    super
-
-    FileUtils.rm_rf @tmpdir
-  end
-
-  def assert_cache imethods, cmethods, attrs, modules,
-                   ancestors = {}, pages = [], main = nil, title = nil
-    imethods ||= { 'Object' => %w[method method! method_bang] }
-    cmethods ||= { 'Object' => %w[cmethod] }
-    attrs    ||= { 'Object' => ['attr_accessor attr'] }
-
-    # this is sort-of a hack
-    @s.clean_cache_collection ancestors
-
-    expected = {
-      :ancestors                   => ancestors,
-      :attributes                  => attrs,
-      :class_methods               => cmethods,
-      :c_class_variables           => {},
-      :c_singleton_class_variables => {},
-      :encoding                    => nil,
-      :instance_methods            => imethods,
-      :modules                     => modules,
-      :pages                       => pages,
-      :main                        => main,
-      :title                       => title,
-    }
-
-    @s.save_cache
-
-    assert_equal expected, @s.cache
-  end
-
-  def test_add_c_enclosure
-    @s.add_c_enclosure 'cC1', @c1
-
-    expected = { 'cC1' => @c1 }
-
-    assert_equal expected, @s.c_enclosure_classes
-  end
-
-  def test_add_c_variables
-    options = RDoc::Options.new
-
-    c_file = @s.add_file 'ext.c'
-
-    some_ext   = c_file.add_class RDoc::NormalClass, 'SomeExt'
-                 c_file.add_class RDoc::SingleClass, 'SomeExtSingle'
-
-    c_parser = RDoc::Parser::C.new c_file, 'ext.c', '', options, nil
-
-    c_parser.classes['cSomeExt']             = some_ext
-    c_parser.singleton_classes['s_cSomeExt'] = 'SomeExtSingle'
-
-    @s.add_c_variables c_parser
-
-    expected = { 'ext.c' => { 'cSomeExt' => 'SomeExt' } }
-
-    assert_equal expected, @s.c_class_variables
-
-    expected = { 'ext.c' => { 's_cSomeExt' => 'SomeExtSingle' } }
-
-    assert_equal expected, @s.c_singleton_class_variables
-  end
-
-  def test_add_file
-    top_level = @store.add_file 'file.rb'
-
-    assert_kind_of RDoc::TopLevel, top_level
-    assert_equal @store, top_level.store
-    assert_equal 'file.rb', top_level.name
-    assert_includes @store.all_files, top_level
-
-    assert_same top_level, @store.add_file('file.rb')
-    refute_same top_level, @store.add_file('other.rb')
-  end
-
-  def test_add_file_relative
-    top_level = @store.add_file 'path/file.rb', relative_name: 'file.rb'
-
-    assert_kind_of RDoc::TopLevel, top_level
-    assert_equal @store, top_level.store
-
-    assert_equal 'path/file.rb', top_level.absolute_name
-    assert_equal 'file.rb',      top_level.relative_name
-
-    assert_includes @store.all_files, top_level
-
-    assert_same top_level, @store.add_file('file.rb')
-    refute_same top_level, @store.add_file('other.rb')
-  end
-
-  def test_all_classes_and_modules
-    expected = %w[
-      C1 C10 C10::C11 C11 C2 C2::C3 C2::C3::H1 C3 C3::H1 C3::H2 C4 C4::C4 C5 C5::C1 C6 C7 C8 C8::S1 C9 C9::A C9::B
-      Child
-      M1 M1::M2
-      Object
-      Parent
-    ]
-
-    assert_equal expected,
-                 @store.all_classes_and_modules.map { |m| m.full_name }.sort
-  end
-
-  def test_all_files
-    assert_equal %w[EXAMPLE.md xref_data.rb],
-                 @store.all_files.map { |m| m.full_name }.sort
-  end
-
-  def test_all_modules
-    assert_equal %w[M1 M1::M2],
-                 @store.all_modules.map { |m| m.full_name }.sort
-  end
-
-  def test_attributes
-    @s.cache[:attributes]['Object'] = %w[attr]
-
-    expected = { 'Object' => %w[attr] }
-
-    assert_equal expected, @s.attributes
-  end
-
-  def test_class_file
-    assert_equal File.join(@tmpdir, 'Object', 'cdesc-Object.ri'),
-                 @s.class_file('Object')
-    assert_equal File.join(@tmpdir, 'Object', 'SubClass', 'cdesc-SubClass.ri'),
-                 @s.class_file('Object::SubClass')
-  end
-
-  def test_class_methods
-    @s.cache[:class_methods]['Object'] = %w[method]
-
-    expected = { 'Object' => %w[method] }
-
-    assert_equal expected, @s.class_methods
-  end
-
-  def test_class_path
-    assert_equal File.join(@tmpdir, 'Object'), @s.class_path('Object')
-    assert_equal File.join(@tmpdir, 'Object', 'SubClass'),
-                 @s.class_path('Object::SubClass')
-  end
-
-  def test_classes
-    expected = %w[
-      C1 C10 C10::C11 C11 C2 C2::C3 C2::C3::H1 C3 C3::H1 C3::H2 C4 C4::C4 C5 C5::C1 C6 C7 C8 C8::S1 C9 C9::A C9::B
-      Child
-      Object
-      Parent
-    ]
-
-    assert_equal expected, @store.all_classes.map { |m| m.full_name }.sort
-  end
-
-  def test_complete
-    a1 = RDoc::Constant.new 'A1', '', ''
-    @c2.add_module_alias @c2_c3, @c2_c3.name, a1, @top_level
-
-    @store.complete :public
-
-    a1 = @xref_data.find_class_or_module 'C2::A1'
-
-    assert_equal 'C2::A1', a1.full_name
-    refute_empty a1.aliases
-  end
-
-  def test_complete_nodoc
-    c_nodoc = @top_level.add_class RDoc::NormalClass, 'Nodoc'
-    c_nodoc.record_location @top_level
-    c_nodoc.document_self = nil
-
-    @s.complete :nodoc
-
-    assert_includes @s.classes_hash.keys, 'Nodoc'
-  end
-
-  def test_find_c_enclosure
-    assert_nil @s.find_c_enclosure 'cC1'
-
-    @s.add_c_enclosure 'cC1', @c1
-
-    assert_equal @c1, @s.find_c_enclosure('cC1')
-  end
-
-  def test_find_c_enclosure_from_cache
-    @s.save_class @klass
-    @s.classes_hash.clear
-
-    assert_nil @s.find_c_enclosure 'cObject'
-
-    @s.c_enclosure_names['cObject'] = 'Object'
-
-    klass = @s.find_c_enclosure('cObject')
-    assert_equal @klass, klass
-
-    assert_empty klass.comment_location
-    assert_equal @top_level, klass.parent
-
-    assert_includes @s.c_enclosure_classes, 'cObject'
-  end
-
-  def test_find_c_enclosure_from_cache_legacy
-    @klass.in_files.clear
-    @s.save_class @klass
-    @s.classes_hash.clear
-
-    assert_nil @s.find_c_enclosure 'cObject'
-
-    @s.c_enclosure_names['cObject'] = 'Object'
-
-    assert_nil @s.find_c_enclosure('cObject')
-  end
-
-  def test_find_class_named
-    assert_equal @c1, @store.find_class_named('C1')
-
-    assert_equal @c2_c3, @store.find_class_named('C2::C3')
-  end
-
-  def test_find_class_named_from
-    assert_equal @c5_c1, @store.find_class_named_from('C1', 'C5')
-
-    assert_equal @c1,    @store.find_class_named_from('C1', 'C4')
-  end
-
-  def test_find_class_or_module
-    assert_equal @m1, @store.find_class_or_module('M1')
-    assert_equal @c1, @store.find_class_or_module('C1')
-
-    assert_equal @m1, @store.find_class_or_module('::M1')
-    assert_equal @c1, @store.find_class_or_module('::C1')
-  end
-
-  def test_find_file_named
-    assert_equal @xref_data, @store.find_file_named(@file_name)
-  end
-
-  def test_find_module_named
-    assert_equal @m1,    @store.find_module_named('M1')
-    assert_equal @m1_m2, @store.find_module_named('M1::M2')
-  end
-
-  def test_find_text_page
-    page = @store.add_file 'PAGE.txt', parser: RDoc::Parser::Simple
-
-    assert_nil @store.find_text_page 'no such page'
-
-    assert_equal page, @store.find_text_page('PAGE.txt')
-  end
-
-  def test_friendly_path
-    @orig_xdg_data_home = ENV.delete('XDG_DATA_HOME')
-
-    @s.path = @tmpdir
-    @s.type = nil
-    assert_equal @s.path, @s.friendly_path
-
-    @s.type = :extra
-    assert_equal @s.path, @s.friendly_path
-
-    @s.type = :system
-    assert_equal "ruby core", @s.friendly_path
-
-    @s.type = :site
-    assert_equal "ruby site", @s.friendly_path
-
-    @s.type = :home
-    assert_equal File.expand_path("~/.local/share/rdoc"), @s.friendly_path
-
-    @s.type = :gem
-    @s.path = "#{@tmpdir}/gem_repository/doc/gem_name-1.0/ri"
-    assert_equal "gem gem_name-1.0", @s.friendly_path
-  ensure
-    ENV['XDG_DATA_HOME'] = @orig_xdg_data_home
-  end
-
-  def test_dry_run
-    refute @s.dry_run
-
-    @s.dry_run = true
-
-    assert @s.dry_run
-  end
-
-  def test_instance_methods
-    @s.cache[:instance_methods]['Object'] = %w[method]
-
-    expected = { 'Object' => %w[method] }
-
-    assert_equal expected, @s.instance_methods
-  end
-
-  def test_load_all
-    FileUtils.mkdir_p @tmpdir
-
-    @s.save
-
-    s = RDoc::Store.new @tmpdir
-
-    s.load_all
-
-    assert_equal [@klass, @nest_klass], s.all_classes.sort
-    assert_equal [@mod],                s.all_modules.sort
-    assert_equal [@page, @top_level],   s.all_files.sort
-
-    methods = s.all_classes_and_modules.flat_map do |mod|
-      mod.method_list
-    end.sort
-
-    _meth_bang_alias = RDoc::AnyMethod.new nil, 'method_bang'
-    _meth_bang_alias.parent = @klass
-
-    assert_equal [@meth, @meth_bang, _meth_bang_alias, @nest_meth, @cmeth],
-                 methods.sort_by { |m| m.full_name }
-
-    method = methods.find { |m| m == @meth }
-    assert_equal @meth_comment.parse, method.comment
-
-    assert_equal @klass, methods.last.parent
-
-    attributes = s.all_classes_and_modules.flat_map do |mod|
-      mod.attributes
-    end.sort
-
-    assert_equal [@attr], attributes
-
-    assert_equal @attr_comment.parse, attributes.first.comment
-  end
-
-  def test_load_cache
-    cache = {
-      :c_class_variables           =>
-        { 'file.c' => { 'cKlass' => 'Klass' } },
-      :c_singleton_class_variables =>
-        { 'file.c' => { 'sKlass' => 'KlassSingle' } },
-      :encoding                    => :encoding_value,
-      :methods                     => { "Object" => %w[Object#method] },
-      :main                        => @page.full_name,
-      :modules                     => %w[Object],
-      :pages                       => [],
-    }
-
-    Dir.mkdir @tmpdir
-
-    File.open File.join(@tmpdir, 'cache.ri'), 'wb' do |io|
-      Marshal.dump cache, io
-    end
-
-    @s.load_cache
-
-    assert_equal cache, @s.cache
-
-    assert_equal :encoding_value, @s.encoding
-    assert_equal 'README.txt',    @s.main
-
-    expected = { 'file.c' => { 'cKlass' => 'Klass' } }
-    assert_equal expected, @s.cache[:c_class_variables]
-
-    expected = { 'file.c' => { 'sKlass' => 'KlassSingle' } }
-    assert_equal expected, @s.cache[:c_singleton_class_variables]
-
-    expected = { 'cKlass' => 'Klass' }
-    assert_equal expected, @s.c_enclosure_names
-  end
-
-  def test_load_cache_encoding_differs
-    cache = {
-      :c_class_variables           => {},
-      :c_singleton_class_variables => {},
-      :encoding                    => Encoding::ISO_8859_1,
-      :main                        => nil,
-      :methods                     => { "Object" => %w[Object#method] },
-      :modules                     => %w[Object],
-      :pages                       => [],
-    }
-
-    Dir.mkdir @tmpdir
-
-    File.open File.join(@tmpdir, 'cache.ri'), 'wb' do |io|
-      Marshal.dump cache, io
-    end
-
-    @s.encoding = Encoding::UTF_8
-
-    @s.load_cache
-
-    assert_equal cache, @s.cache
-
-    assert_equal Encoding::UTF_8, @s.encoding
-  end
-
-  def test_load_cache_no_cache
-    cache = {
-      :ancestors                   => {},
-      :attributes                  => {},
-      :class_methods               => {},
-      :c_class_variables           => {},
-      :c_singleton_class_variables => {},
-      :encoding                    => nil,
-      :instance_methods            => {},
-      :main                        => nil,
-      :modules                     => [],
-      :pages                       => [],
-      :title                       => nil,
-    }
-
-    @s.load_cache
-
-    assert_equal cache, @s.cache
-  end
-
-  def test_load_cache_legacy
-    cache = {
-      :ancestors        => {},
-      :attributes       => {},
-      :class_methods    => {},
-      :encoding         => :encoding_value,
-      :instance_methods => { "Object" => %w[Object#method] },
-      :modules          => %w[Object],
-      # no :pages
-      # no :main
-      # no :c_class_variables
-      # no :c_singleton_class_variables
-    }
-
-    Dir.mkdir @tmpdir
-
-    File.open File.join(@tmpdir, 'cache.ri'), 'wb' do |io|
-      Marshal.dump cache, io
-    end
-
-    @s.load_cache
-
-    expected = {
-      :ancestors                   => {},
-      :attributes                  => {},
-      :class_methods               => {},
-      :c_class_variables           => {},
-      :c_singleton_class_variables => {},
-      :encoding                    => :encoding_value,
-      :instance_methods            => { "Object" => %w[Object#method] },
-      :main                        => nil,
-      :modules                     => %w[Object],
-      :pages                       => [],
-    }
-
-    assert_equal expected, @s.cache
-
-    assert_equal :encoding_value, @s.encoding
-    assert_nil                    @s.main
-  end
-
-  def test_load_class
-    @s.save_class @klass
-    @s.classes_hash.clear
-
-    assert_equal @klass, @s.load_class('Object')
-
-    assert_includes @s.classes_hash, 'Object'
-  end
-
-  def test_load_single_class
-    @s.save_class @c8_s1
-    @s.classes_hash.clear
-
-    assert_equal @c8_s1, @s.load_class('C8::S1')
-
-    assert_includes @s.classes_hash, 'C8::S1'
-  end
-
-  def test_load_method
-    @s.save_method @klass, @meth_bang
-
-    meth = @s.load_method('Object', '#method!')
-    assert_equal @meth_bang, meth
-    assert_equal @klass, meth.parent
-    assert_equal @s, meth.store
-  end
-
-  def test_load_method_legacy
-    @s.save_method @klass, @meth
-
-    file = @s.method_file @klass.full_name, @meth.full_name
-
-    File.open file, 'wb' do |io|
-      io.write "\x04\bU:\x14RDoc::AnyMethod[\x0Fi\x00I" +
-               "\"\vmethod\x06:\x06EF\"\x11Klass#method0:\vpublic" +
-               "o:\eRDoc::Markup::Document\x06:\v@parts[\x06" +
-               "o:\x1CRDoc::Markup::Paragraph\x06;\t[\x06I" +
-               "\"\x16this is a comment\x06;\x06FI" +
-               "\"\rcall_seq\x06;\x06FI\"\x0Fsome_block\x06;\x06F" +
-               "[\x06[\aI\"\faliased\x06;\x06Fo;\b\x06;\t[\x06" +
-               "o;\n\x06;\t[\x06I\"\x12alias comment\x06;\x06FI" +
-               "\"\nparam\x06;\x06F"
-    end
-
-    meth = @s.load_method('Object', '#method')
-    assert_equal 'Klass#method', meth.full_name
-    assert_equal @klass,         meth.parent
-    assert_equal @s,             meth.store
-  end
-
-  def test_load_page
-    @s.save_page @page
-
-    assert_equal @page, @s.load_page('README.txt')
-  end
-
-  def test_main
-    assert_nil @s.main
-
-    @s.main = 'README.txt'
-
-    assert_equal 'README.txt', @s.main
-  end
-
-  def test_method_file
-    assert_equal File.join(@tmpdir, 'Object', 'method-i.ri'),
-                 @s.method_file('Object', 'Object#method')
-
-    assert_equal File.join(@tmpdir, 'Object', 'method%21-i.ri'),
-                 @s.method_file('Object', 'Object#method!')
-
-    assert_equal File.join(@tmpdir, 'Object', 'SubClass', 'method%21-i.ri'),
-                 @s.method_file('Object::SubClass', 'Object::SubClass#method!')
-
-    assert_equal File.join(@tmpdir, 'Object', 'method-c.ri'),
-                 @s.method_file('Object', 'Object::method')
-  end
-
-  def test_module_names
-    @s.save_class @klass
-
-    assert_equal %w[Object], @s.module_names
-  end
-
-  def test_page
-    page = @store.add_file 'PAGE.txt', parser: RDoc::Parser::Simple
-
-    assert_nil @store.page 'no such page'
-
-    assert_equal page, @store.page('PAGE')
-  end
-
-  def test_page_with_extension
-    page = @store.add_file 'PAGE.txt', parser: RDoc::Parser::Simple
-
-    assert_nil @store.page 'no such page'
-
-    assert_equal page, @store.page('PAGE.txt')
-  end
-
-  def test_save
-    FileUtils.mkdir_p @tmpdir
-
-    @s.save
-
-    assert_directory File.join(@tmpdir, 'Object')
-
-    assert_file File.join(@tmpdir, 'Object', 'cdesc-Object.ri')
-    assert_file File.join(@tmpdir, 'Object', 'method-i.ri')
-    assert_file File.join(@tmpdir, 'page-README_txt.ri')
-
-    assert_file File.join(@tmpdir, 'cache.ri')
-
-    expected = {
-      :ancestors => {
-        'Object::SubClass' => %w[Incl Object],
-      },
-      :attributes => { 'Object' => ['attr_accessor attr'] },
-      :class_methods => { 'Object' => %w[cmethod] },
-      :c_class_variables => {},
-      :c_singleton_class_variables => {},
-      :instance_methods => {
-        'Object' => %w[attr method method! method_bang],
-        'Object::SubClass' => %w[method],
-      },
-      :main => nil,
-      :modules => %w[Mod Object Object::SubClass],
-      :encoding => nil,
-      :pages => %w[README.txt],
-      :title => nil,
-    }
-
-    expected[:ancestors]['Object'] = %w[BasicObject]
-
-    File.open File.join(@tmpdir, 'cache.ri'), 'rb' do |io|
-      cache = Marshal.load io.read
-
-      assert_equal expected, cache
-    end
-  end
-
-  def test_save_cache
-    @s.save_class @klass
-    @s.save_method @klass, @meth
-    @s.save_method @klass, @cmeth
-    @s.save_class @nest_klass
-    @s.save_page @page
-    @s.encoding = :encoding_value
-    @s.main     = @page.full_name
-    @s.title    = 'title'
-
-    options = RDoc::Options.new
-
-    c_file = @s.add_file 'ext.c'
-
-    some_ext   = c_file.add_class RDoc::NormalClass, 'SomeExt'
-                 c_file.add_class RDoc::SingleClass, 'SomeExtSingle'
-
-    c_parser = RDoc::Parser::C.new c_file, 'ext.c', '', options, nil
-
-    c_parser.classes['cSomeExt']             = some_ext
-    c_parser.singleton_classes['s_cSomeExt'] = 'SomeExtSingle'
-
-    @s.add_c_variables c_parser
-
-    @s.save_cache
-
-    assert_file File.join(@tmpdir, 'cache.ri')
-
-    c_class_variables = {
-      'ext.c' => {
-        'cSomeExt' => 'SomeExt'
-      }
-    }
-
-    c_singleton_class_variables = {
-      'ext.c' => {
-        's_cSomeExt' => 'SomeExtSingle'
-      }
-    }
-
-    expected = {
-      :ancestors => {
-        'Object::SubClass' => %w[Incl Object],
-      },
-      :attributes => { 'Object' => ['attr_accessor attr'] },
-      :class_methods => { 'Object' => %w[cmethod] },
-      :c_class_variables => c_class_variables,
-      :c_singleton_class_variables => c_singleton_class_variables,
-      :instance_methods => {
-        'Object' => %w[method method! method_bang],
-        'Object::SubClass' => %w[method],
-      },
-      :main => @page.full_name,
-      :modules => %w[Object Object::SubClass],
-      :encoding => :encoding_value,
-      :pages => %w[README.txt],
-      :title => 'title',
-    }
-
-    expected[:ancestors]['Object'] = %w[BasicObject]
-
-    File.open File.join(@tmpdir, 'cache.ri'), 'rb' do |io|
-      cache = Marshal.load io.read
-
-      assert_equal expected, cache
-    end
-  end
-
-  def test_save_cache_dry_run
-    @s.dry_run = true
-
-    @s.save_class @klass
-    @s.save_method @klass, @meth
-    @s.save_method @klass, @cmeth
-    @s.save_class @nest_klass
-
-    @s.save_cache
-
-    refute_file File.join(@tmpdir, 'cache.ri')
-  end
-
-  def test_save_cache_duplicate_methods
-    @s.save_method @klass, @meth
-    @s.save_method @klass, @meth
-
-    @s.save_cache
-
-    assert_cache({ 'Object' => %w[method] }, {}, {}, [])
-  end
-
-  def test_save_cache_duplicate_pages
-    @s.save_page @page
-    @s.save_page @page
-
-    @s.save_cache
-
-    assert_cache({}, {}, {}, [], {}, %w[README.txt])
-  end
-
-  def test_save_class
-    @s.save_class @klass
-
-    assert_directory File.join(@tmpdir, 'Object')
-    assert_file File.join(@tmpdir, 'Object', 'cdesc-Object.ri')
-
-    assert_cache nil, nil, nil, %w[Object], 'Object' => OBJECT_ANCESTORS
-
-    assert_equal @klass, @s.load_class('Object')
-  end
-
-  def test_save_class_basic_object
-    @klass.instance_variable_set :@superclass, nil
-
-    @s.save_class @klass
-
-    assert_directory File.join(@tmpdir, 'Object')
-    assert_file File.join(@tmpdir, 'Object', 'cdesc-Object.ri')
-
-    assert_cache(nil, nil, nil, %w[Object])
-
-    assert_equal @klass, @s.load_class('Object')
-  end
-
-  def test_save_class_delete
-    # save original
-    @s.save_class @klass
-    @s.save_method @klass, @meth
-    @s.save_method @klass, @meth_bang
-    @s.save_method @klass, @cmeth
-    @s.save_method @klass, @attr
-    @s.save_cache
-
-    klass = RDoc::NormalClass.new 'Object'
-
-    meth = klass.add_method RDoc::AnyMethod.new(nil, 'replace')
-    meth.record_location @top_level
-
-    # load original, save newly updated class
-    @s = RDoc::RI::Store.new @tmpdir
-    @s.load_cache
-    @s.save_class klass
-    @s.save_cache
-
-    # load from disk again
-    @s = RDoc::RI::Store.new @tmpdir
-    @s.load_cache
-
-    @s.load_class 'Object'
-
-    assert_cache({ 'Object' => %w[replace] }, {},
-                 { 'Object' => %w[attr_accessor\ attr] }, %w[Object],
-                   'Object' => OBJECT_ANCESTORS)
-
-    # assert these files were deleted
-    refute_file @s.method_file(@klass.full_name, @meth.full_name)
-    refute_file @s.method_file(@klass.full_name, @meth_bang.full_name)
-    refute_file @s.method_file(@klass.full_name, @cmeth.full_name)
-
-    # assert these files were not deleted
-    assert_file @s.method_file(@klass.full_name, @attr.full_name)
-  end
-
-  def test_save_class_dry_run
-    @s.dry_run = true
-
-    @s.save_class @klass
-
-    refute_file File.join(@tmpdir, 'Object')
-    refute_file File.join(@tmpdir, 'Object', 'cdesc-Object.ri')
-  end
-
-  def test_save_class_loaded
-    @s.save
-
-    assert_directory File.join(@tmpdir, 'Object')
-    assert_file      File.join(@tmpdir, 'Object', 'cdesc-Object.ri')
-
-    assert_file @s.method_file(@klass.full_name, @attr.full_name)
-    assert_file @s.method_file(@klass.full_name, @cmeth.full_name)
-    assert_file @s.method_file(@klass.full_name, @meth.full_name)
-    assert_file @s.method_file(@klass.full_name, @meth_bang.full_name)
-
-    s = RDoc::Store.new @s.path
-    s.load_cache
-
-    loaded = s.load_class 'Object'
-
-    assert_equal @klass, loaded
-
-    s.save_class loaded
-
-    s = RDoc::Store.new @s.path
-    s.load_cache
-
-    reloaded = s.load_class 'Object'
-
-    assert_equal @klass, reloaded
-
-    # assert these files were not deleted.  Bug #171
-    assert_file s.method_file(@klass.full_name, @attr.full_name)
-    assert_file s.method_file(@klass.full_name, @cmeth.full_name)
-    assert_file s.method_file(@klass.full_name, @meth.full_name)
-    assert_file s.method_file(@klass.full_name, @meth_bang.full_name)
-  end
-
-  def test_save_class_merge
-    @s.save_class @klass
-
-    klass = RDoc::NormalClass.new 'Object'
-    klass.add_comment 'new comment', @top_level
-
-    s = RDoc::RI::Store.new @tmpdir
-    s.save_class klass
-
-    s = RDoc::RI::Store.new @tmpdir
-
-    inner = @RM::Document.new @RM::Paragraph.new 'new comment'
-    inner.file = @top_level
-
-    document = @RM::Document.new inner
-
-    assert_equal document, s.load_class('Object').comment_location
-  end
-
-  # This is a functional test
-  def test_save_class_merge_constant
-    store = RDoc::Store.new
-    tl = store.add_file 'file.rb'
-
-    klass = tl.add_class RDoc::NormalClass, 'C'
-    klass.add_comment 'comment', tl
-
-    const = klass.add_constant RDoc::Constant.new('CONST', nil, nil)
-    const.record_location tl
-
-    @s.save_class klass
-
-    # separate parse run, independent store
-    store = RDoc::Store.new
-    tl = store.add_file 'file.rb'
-    klass2 = tl.add_class RDoc::NormalClass, 'C'
-    klass2.record_location tl
-
-    s = RDoc::RI::Store.new @tmpdir
-    s.save_class klass2
-
-    # separate `ri` run, independent store
-    s = RDoc::RI::Store.new @tmpdir
-
-    result = s.load_class 'C'
-
-    assert_empty result.constants
-  end
-
-  def test_save_class_methods
-    @s.save_class @klass
-
-    assert_directory File.join(@tmpdir, 'Object')
-    assert_file File.join(@tmpdir, 'Object', 'cdesc-Object.ri')
-
-    assert_cache nil, nil, nil, %w[Object], 'Object' => OBJECT_ANCESTORS
-
-    assert_equal @klass, @s.load_class('Object')
-  end
-
-  def test_save_class_nested
-    @s.save_class @nest_klass
-
-    assert_directory File.join(@tmpdir, 'Object', 'SubClass')
-    assert_file File.join(@tmpdir, 'Object', 'SubClass', 'cdesc-SubClass.ri')
-
-    assert_cache({ 'Object::SubClass' => %w[method] }, {}, {},
-                 %w[Object::SubClass], 'Object::SubClass' => %w[Incl Object])
-  end
-
-  def test_save_method
-    @s.save_method @klass, @meth
-
-    assert_directory File.join(@tmpdir, 'Object')
-    assert_file File.join(@tmpdir, 'Object', 'method-i.ri')
-
-    assert_cache({ 'Object' => %w[method] }, {}, {}, [])
-
-    assert_equal @meth, @s.load_method('Object', '#method')
-  end
-
-  def test_save_method_dry_run
-    @s.dry_run = true
-
-    @s.save_method @klass, @meth
-
-    refute_file File.join(@tmpdir, 'Object')
-    refute_file File.join(@tmpdir, 'Object', 'method-i.ri')
-  end
-
-  def test_save_method_nested
-    @s.save_method @nest_klass, @nest_meth
-
-    assert_directory File.join(@tmpdir, 'Object', 'SubClass')
-    assert_file File.join(@tmpdir, 'Object', 'SubClass', 'method-i.ri')
-
-    assert_cache({ 'Object::SubClass' => %w[method] }, {}, {}, [])
-  end
-
-  def test_save_page
-    @s.save_page @page
-
-    assert_file File.join(@tmpdir, 'page-README_txt.ri')
-
-    assert_cache({}, {}, {}, [], {}, %w[README.txt])
-  end
-
-  def test_save_page_file
-    @s.save_page @top_level
-
-    refute_file File.join(@tmpdir, 'page-file_rb.ri')
-  end
-
-  def test_source
-    @s.path = @tmpdir
-    @s.type = nil
-    assert_equal @s.path, @s.source
-
-    @s.type = :extra
-    assert_equal @s.path, @s.source
-
-    @s.type = :system
-    assert_equal "ruby", @s.source
-
-    @s.type = :site
-    assert_equal "site", @s.source
-
-    @s.type = :home
-    assert_equal "home", @s.source
-
-    @s.type = :gem
-    @s.path = "#{@tmpdir}/gem_repository/doc/gem_name-1.0/ri"
-    assert_equal "gem_name-1.0", @s.source
-  end
-
-  def test_title
-    assert_nil @s.title
-
-    @s.title = 'rdoc'
-
-    assert_equal 'rdoc', @s.title
-  end
-
-end
diff --git a/test/rdoc/test_rdoc_task.rb b/test/rdoc/test_rdoc_task.rb
deleted file mode 100644
index 67d223087b8872..00000000000000
--- a/test/rdoc/test_rdoc_task.rb
+++ /dev/null
@@ -1,182 +0,0 @@
-# frozen_string_literal: true
-require_relative 'helper'
-begin
-  require 'rake'
-rescue LoadError
-end
-
-class TestRDocTask < RDoc::TestCase
-
-  def setup
-    super
-
-    Rake::Task.clear
-
-    @t = RDoc::Task.new
-  end
-
-  def test_clobber_task_description
-    assert_equal 'Remove RDoc HTML files', @t.clobber_task_description
-  end
-
-  def test_inline_source
-    _, err = verbose_capture_output do
-      assert @t.inline_source
-    end
-
-    assert_equal "RDoc::Task#inline_source is deprecated\n", err
-
-    _, err = verbose_capture_output do
-      @t.inline_source = false
-    end
-
-    assert_equal "RDoc::Task#inline_source is deprecated\n", err
-
-    capture_output do
-      assert @t.inline_source
-    end
-  end
-
-  def test_markup_option
-    rdoc_task = RDoc::Task.new do |rd|
-      rd.markup = "tomdoc"
-    end
-
-    assert_equal %w[-o html --markup tomdoc], rdoc_task.option_list
-  end
-
-  def test_tasks_creation
-    RDoc::Task.new
-    assert Rake::Task[:rdoc]
-    assert Rake::Task[:clobber_rdoc]
-    assert Rake::Task[:rerdoc]
-    assert Rake::Task[:"rdoc:coverage"]
-    assert_equal ["html/created.rid"], Rake::Task[:rdoc].prerequisites
-  end
-
-  def test_tasks_creation_with_custom_name_symbol
-    rd = RDoc::Task.new(:rdoc_dev)
-    assert Rake::Task[:rdoc_dev]
-    assert Rake::Task[:clobber_rdoc_dev]
-    assert Rake::Task[:rerdoc_dev]
-    assert Rake::Task[:"rdoc_dev:coverage"]
-    assert_equal :rdoc_dev, rd.name
-  end
-
-  def test_tasks_option_parser
-    rdoc_task = RDoc::Task.new do |rd|
-      rd.title = "Test Tasks Option Parser"
-      rd.main = "README.md"
-      rd.rdoc_files.include("README.md")
-      rd.options << "--all"
-    end
-
-    assert_equal "Test Tasks Option Parser", rdoc_task.title
-    assert_equal "README.md", rdoc_task.main
-    assert rdoc_task.rdoc_files.include?("README.md")
-    assert rdoc_task.options.include?("--all")
-
-    args = %w[--all -o html --main README.md] << "--title" << "Test Tasks Option Parser" << "README.md"
-    assert_equal args, rdoc_task.option_list + rdoc_task.rdoc_files
-  end
-
-  def test_generator_option
-    rdoc_task = RDoc::Task.new do |rd|
-      rd.generator = "ri"
-    end
-
-    assert_equal %w[-o html -f ri], rdoc_task.option_list
-  end
-
-  def test_main_option
-    rdoc_task = RDoc::Task.new do |rd|
-      rd.main = "README.md"
-    end
-
-    assert_equal %w[-o html --main README.md], rdoc_task.option_list
-  end
-
-  def test_output_dir_option
-    rdoc_task = RDoc::Task.new do |rd|
-      rd.rdoc_dir = "zomg"
-    end
-
-    assert_equal %w[-o zomg], rdoc_task.option_list
-  end
-
-  def test_rdoc_task_description
-    assert_equal 'Build RDoc HTML files', @t.rdoc_task_description
-  end
-
-  def test_rerdoc_task_description
-    assert_equal 'Rebuild RDoc HTML files', @t.rerdoc_task_description
-  end
-
-  def test_coverage_task_description
-    assert_equal 'Print RDoc coverage report', @t.coverage_task_description
-  end
-
-  def test_tasks_creation_with_custom_name_string
-    rd = RDoc::Task.new("rdoc_dev")
-    assert Rake::Task[:rdoc_dev]
-    assert Rake::Task[:clobber_rdoc_dev]
-    assert Rake::Task[:rerdoc_dev]
-    assert Rake::Task[:"rdoc_dev:coverage"]
-    assert_equal "rdoc_dev", rd.name
-  end
-
-  def test_tasks_creation_with_custom_name_hash
-    options = {
-      :rdoc => "rdoc",
-      :clobber_rdoc => "rdoc:clean",
-      :rerdoc => "rdoc:force"
-    }
-
-    Rake::Task.clear
-
-    rd = RDoc::Task.new(options)
-    assert Rake::Task[:"rdoc"]
-    assert Rake::Task[:"rdoc:clean"]
-    assert Rake::Task[:"rdoc:force"]
-    assert Rake::Task[:"rdoc:coverage"]
-    assert_raise(RuntimeError) { Rake::Task[:clobber_rdoc] }
-    assert_equal options, rd.name
-  end
-
-  def test_tasks_creation_with_custom_name_hash_will_use_default_if_an_option_isnt_given
-    RDoc::Task.new(:clobber_rdoc => "rdoc:clean")
-    assert Rake::Task[:rdoc]
-    assert Rake::Task[:"rdoc:clean"]
-    assert Rake::Task[:rerdoc]
-    assert Rake::Task[:"rdoc:coverage"]
-  end
-
-  def test_tasks_creation_with_custom_name_hash_raises_exception_if_invalid_option_given
-    assert_raise(ArgumentError) do
-      RDoc::Task.new(:foo => "bar")
-    end
-
-    begin
-      RDoc::Task.new(:foo => "bar")
-    rescue ArgumentError => e
-      assert_match(/foo/, e.message)
-    end
-  end
-
-  def test_template_option
-    rdoc_task = RDoc::Task.new do |rd|
-      rd.template = "foo"
-    end
-
-    assert_equal %w[-o html -T foo], rdoc_task.option_list
-  end
-
-  def test_title_option
-    rdoc_task = RDoc::Task.new do |rd|
-      rd.title = "Test Title Option"
-    end
-
-    assert_equal %w[-o html] << "--title" << "Test Title Option", rdoc_task.option_list
-  end
-
-end if defined?(Rake::Task)
diff --git a/test/rdoc/test_rdoc_text.rb b/test/rdoc/test_rdoc_text.rb
deleted file mode 100644
index a6b1597bbf7992..00000000000000
--- a/test/rdoc/test_rdoc_text.rb
+++ /dev/null
@@ -1,585 +0,0 @@
-# frozen_string_literal: true
-
-require_relative 'helper'
-require 'timeout'
-
-class TestRDocText < RDoc::TestCase
-
-  include RDoc::Text
-
-  def setup
-    super
-
-    @options = RDoc::Options.new
-
-    @top_level = @store.add_file 'file.rb'
-    @language = nil
-  end
-
-  def test_self_encode_fallback
-    assert_equal '…',
-                 RDoc::Text::encode_fallback('…', Encoding::UTF_8,    '...')
-    assert_equal '...',
-                 RDoc::Text::encode_fallback('…', Encoding::US_ASCII, '...')
-  end
-
-  def test_expand_tabs
-    assert_equal("hello\n  dave",
-                 expand_tabs("hello\n  dave"), 'spaces')
-
-    assert_equal("hello\n        dave",
-                 expand_tabs("hello\n\tdave"), 'tab')
-
-    assert_equal("hello\n        dave",
-                 expand_tabs("hello\n \tdave"), '1 space tab')
-
-    assert_equal("hello\n        dave",
-                 expand_tabs("hello\n  \tdave"), '2 space tab')
-
-    assert_equal("hello\n        dave",
-                 expand_tabs("hello\n   \tdave"), '3 space tab')
-
-    assert_equal("hello\n        dave",
-                 expand_tabs("hello\n    \tdave"), '4 space tab')
-
-    assert_equal("hello\n        dave",
-                 expand_tabs("hello\n     \tdave"), '5 space tab')
-
-    assert_equal("hello\n        dave",
-                 expand_tabs("hello\n      \tdave"), '6 space tab')
-
-    assert_equal("hello\n        dave",
-                 expand_tabs("hello\n       \tdave"), '7 space tab')
-
-    assert_equal("hello\n                dave",
-                 expand_tabs("hello\n         \tdave"), '8 space tab')
-
-    assert_equal('.               .',
-                 expand_tabs(".\t\t."), 'dot tab tab dot')
-
-    assert_equal('a       a',
-                 Timeout.timeout(1) {expand_tabs("\ra\ta")}, "carriage return")
-  end
-
-  def test_expand_tabs_encoding
-    inn = "hello\ns\tdave"
-    inn = RDoc::Encoding.change_encoding inn, Encoding::BINARY
-
-    out = expand_tabs inn
-
-    assert_equal "hello\ns       dave", out
-    assert_equal Encoding::BINARY, out.encoding
-  end
-
-  def test_flush_left
-    text = <<-TEXT
-
-  we don't worry too much.
-
-  The comments associated with
-    TEXT
-
-    expected = <<-EXPECTED
-
-we don't worry too much.
-
-The comments associated with
-    EXPECTED
-
-    assert_equal expected, flush_left(text)
-  end
-
-  def test_flush_left_encoding
-    text = <<-TEXT
-
-  we don't worry too much.
-
-  The comments associated with
-    TEXT
-
-    text = RDoc::Encoding.change_encoding text, Encoding::US_ASCII
-
-    expected = <<-EXPECTED
-
-we don't worry too much.
-
-The comments associated with
-    EXPECTED
-
-    result = flush_left text
-
-    assert_equal expected, result
-    assert_equal Encoding::US_ASCII, result.encoding
-  end
-
-  def test_markup_string
-    out = markup('hi').gsub("\n", '')
-
-    assert_equal '<p>hi</p>', out
-  end
-
-  def test_markup_comment
-    out = markup(comment('hi')).gsub("\n", '')
-
-    assert_equal '<p>hi</p>', out
-  end
-
-  def test_normalize_comment_hash
-    text = <<-TEXT
-##
-# we don't worry too much.
-#
-# The comments associated with
-    TEXT
-
-    expected = <<-EXPECTED.rstrip
-we don't worry too much.
-
-The comments associated with
-    EXPECTED
-
-    @language = :ruby
-
-    assert_equal expected, normalize_comment(text)
-  end
-
-  def test_normalize_comment_stars_single_space
-    text = <<-TEXT
-/*
- * we don't worry too much.
- *
- * The comments associated with
- */
-    TEXT
-
-    expected = <<-EXPECTED.rstrip
-we don't worry too much.
-
-The comments associated with
-    EXPECTED
-
-    @language = :c
-
-    assert_equal expected, normalize_comment(text)
-  end
-
-  def test_normalize_comment_stars_single_double_space
-    text = <<-TEXT
-/*
- *  we don't worry too much.
- *
- *  The comments associated with
- */
-    TEXT
-
-    expected = <<-EXPECTED.rstrip
-we don't worry too much.
-
-The comments associated with
-    EXPECTED
-
-    @language = :c
-
-    assert_equal expected, normalize_comment(text)
-  end
-
-  def test_parse
-    assert_kind_of RDoc::Markup::Document, parse('hi')
-  end
-
-  def test_parse_comment
-    expected = RDoc::Markup::Document.new
-    expected.file = @top_level
-
-    c = comment ''
-    parsed = parse c
-
-    assert_equal expected, parsed
-    assert_same parsed, parse(c)
-  end
-
-  def test_parse_document
-    assert_equal RDoc::Markup::Document.new, parse(RDoc::Markup::Document.new)
-  end
-
-  def test_parse_empty
-    assert_equal RDoc::Markup::Document.new, parse('')
-  end
-
-  def test_parse_empty_newline
-    @language = :ruby
-
-    assert_equal RDoc::Markup::Document.new, parse("#\n")
-  end
-
-  def test_parse_format_markdown
-    expected =
-      @RM::Document.new(
-        @RM::Paragraph.new('it _works_'))
-
-    parsed = parse 'it *works*', 'markdown'
-
-    assert_equal expected, parsed
-  end
-
-  def test_parse_format_rd
-    expected =
-      @RM::Document.new(
-        @RM::Paragraph.new('it <em>works</em>'))
-
-    parsed = parse 'it ((*works*))', 'rd'
-
-    assert_equal expected, parsed
-  end
-
-  def test_parse_format_tomdoc
-    code = verb('1 + 1')
-    code.format = :ruby
-
-    expected =
-      doc(
-        para('It does a thing'),
-        blank_line,
-        head(3, 'Examples'),
-        blank_line,
-        code)
-
-    text = <<-TOMDOC
-It does a thing
-
-Examples
-
-  1 + 1
-    TOMDOC
-
-    parsed = parse text, 'tomdoc'
-
-    assert_equal expected, parsed
-  end
-
-  def test_parse_newline
-    assert_equal RDoc::Markup::Document.new, parse("\n")
-  end
-
-  def test_snippet
-    text = <<-TEXT
-This is one-hundred characters or more of text in a single paragraph.  This
-paragraph will be cut off some point after the one-hundredth character.
-    TEXT
-
-    expected = <<-EXPECTED
-<p>This is one-hundred characters or more of text in a single paragraph.  This paragraph will be cut off …
-    EXPECTED
-
-    assert_equal expected, snippet(text)
-  end
-
-  def test_snippet_comment
-    c = comment 'This is a comment'
-
-    assert_equal "<p>This is a comment\n", snippet(c)
-  end
-
-  def test_snippet_short
-    text = 'This is a comment'
-
-    assert_equal "<p>#{text}\n", snippet(text)
-  end
-
-  def test_strip_hashes
-    text = <<-TEXT
-##
-# we don't worry too much.
-#
-# The comments associated with
-    TEXT
-
-    expected = <<-EXPECTED
-
-  we don't worry too much.
-
-  The comments associated with
-    EXPECTED
-
-    assert_equal expected, strip_hashes(text)
-  end
-
-  def test_strip_hashes_encoding
-    text = <<-TEXT
-##
-# we don't worry too much.
-#
-# The comments associated with
-    TEXT
-
-    text = RDoc::Encoding.change_encoding text, Encoding::CP852
-
-    expected = <<-EXPECTED
-
-  we don't worry too much.
-
-  The comments associated with
-    EXPECTED
-
-    stripped = strip_hashes text
-
-    assert_equal expected, stripped
-    assert_equal Encoding::CP852, stripped.encoding
-  end
-
-  def test_strip_newlines
-    assert_equal ' ',  strip_newlines("\n \n")
-
-    assert_equal 'hi', strip_newlines("\n\nhi")
-
-    assert_equal 'hi', strip_newlines(    "hi\n\n")
-
-    assert_equal 'hi', strip_newlines("\n\nhi\n\n")
-  end
-
-  def test_strip_newlines_encoding
-    assert_equal Encoding::UTF_8, ''.encoding, 'Encoding sanity check'
-
-    text = " \n"
-    text = RDoc::Encoding.change_encoding text, Encoding::US_ASCII
-
-    stripped = strip_newlines text
-
-    assert_equal ' ', stripped
-
-    assert_equal Encoding::US_ASCII, stripped.encoding
-  end
-
-  def test_strip_stars
-    text = <<-TEXT
-/*
- * * we don't worry too much.
- *
- * The comments associated with
- */
-    TEXT
-
-    expected = <<-EXPECTED
-
-   * we don't worry too much.
-
-   The comments associated with
-    EXPECTED
-
-    assert_equal expected, strip_stars(text)
-  end
-
-  def test_strip_stars_document_method
-    text = <<-TEXT
-/*
- * Document-method: Zlib::GzipFile#mtime=
- *
- * A comment
- */
-    TEXT
-
-    expected = <<-EXPECTED
-
-   A comment
-    EXPECTED
-
-    assert_equal expected, strip_stars(text)
-  end
-
-  def test_strip_stars_document_method_special
-    text = <<-TEXT
-/*
- * Document-method: Zlib::GzipFile#mtime=
- * Document-method: []
- * Document-method: `
- * Document-method: |
- * Document-method: &
- * Document-method: <=>
- * Document-method: =~
- * Document-method: +
- * Document-method: -
- * Document-method: +@
- *
- * A comment
- */
-    TEXT
-
-    expected = <<-EXPECTED
-
-   A comment
-    EXPECTED
-
-    assert_equal expected, strip_stars(text)
-  end
-
-  def test_strip_stars_encoding
-    text = <<-TEXT
-/*
- * * we don't worry too much.
- *
- * The comments associated with
- */
-    TEXT
-
-    text = RDoc::Encoding.change_encoding text, Encoding::CP852
-
-    expected = <<-EXPECTED
-
-   * we don't worry too much.
-
-   The comments associated with
-    EXPECTED
-
-    result = strip_stars text
-
-    assert_equal expected, result
-    assert_equal Encoding::CP852, result.encoding
-  end
-
-  def test_strip_stars_encoding2
-    text = <<-TEXT
-/*
- * * we don't worry too much.
- *
- * The comments associated with
- */
-    TEXT
-
-    text = RDoc::Encoding.change_encoding text, Encoding::BINARY
-
-    expected = <<-EXPECTED
-
-   * we don't worry too much.
-
-   The comments associated with
-    EXPECTED
-
-    result = strip_stars text
-
-    assert_equal expected, result
-    assert_equal Encoding::BINARY, result.encoding
-  end
-
-  def test_strip_stars_no_stars
-    text = <<-TEXT
-* we don't worry too much.
-
-The comments associated with
-
-    TEXT
-
-    expected = <<-EXPECTED
-* we don't worry too much.
-
-The comments associated with
-
-    EXPECTED
-
-    assert_equal expected, strip_stars(text)
-  end
-
-  def test_to_html_apostrophe
-    assert_equal '‘a', to_html("'a")
-    assert_equal 'a’', to_html("a'")
-
-    assert_equal '‘a’ ‘', to_html("'a' '")
-  end
-
-  def test_to_html_apostrophe_entity
-    assert_equal '‘a', to_html("&#39;a")
-    assert_equal 'a’', to_html("a&#39;")
-
-    assert_equal '‘a’ ‘', to_html("&#39;a&#39; &#39;")
-  end
-
-  def test_to_html_backslash
-    assert_equal 'S', to_html('\\S')
-  end
-
-  def test_to_html_br
-    assert_equal '<br>', to_html('<br>')
-  end
-
-  def test_to_html_copyright
-    assert_equal '©', to_html('(c)')
-    assert_equal '©', to_html('(C)')
-  end
-
-  def test_to_html_dash
-    assert_equal '-',  to_html('-')
-    assert_equal '–',  to_html('--')
-    assert_equal '—',  to_html('---')
-    assert_equal '—-', to_html('----')
-  end
-
-  def test_to_html_double_backtick
-    assert_equal '“a',  to_html('``a')
-    assert_equal '“a“', to_html('``a``')
-    assert_equal '“a”', to_html("``a''")
-  end
-
-  def test_to_html_double_quote
-    assert_equal '“a',  to_html('"a')
-    assert_equal '“a”', to_html('"a"')
-  end
-
-  def test_to_html_double_quote_quot
-    assert_equal '“a',  to_html('&quot;a')
-    assert_equal '“a”', to_html('&quot;a&quot;')
-  end
-
-  def test_to_html_double_tick
-    assert_equal '”a',        to_html("''a")
-    assert_equal '”a”', to_html("''a''")
-  end
-
-  def test_to_html_ellipsis
-    assert_equal '..', to_html('..')
-    assert_equal '…',  to_html('...')
-    assert_equal '.…', to_html('....')
-  end
-
-  def test_to_html_encoding
-    s = '...(c)'.encode Encoding::Shift_JIS
-
-    html = to_html s
-
-    assert_equal Encoding::Shift_JIS, html.encoding
-
-    expected = '…(c)'.encode Encoding::Shift_JIS
-
-    assert_equal expected, html
-  end
-
-  def test_to_html_html_tag
-    assert_equal '<a href="http://example">hi’s</a>',
-                 to_html('<a href="http://example">hi\'s</a>')
-  end
-
-  def test_to_html_registered_trademark
-    assert_equal '®', to_html('(r)')
-    assert_equal '®', to_html('(R)')
-  end
-
-  def test_to_html_tt_tag
-    assert_equal '<tt>hi\'s</tt>',   to_html('<tt>hi\'s</tt>')
-    assert_equal '<tt>hi\\\'s</tt>', to_html('<tt>hi\\\\\'s</tt>')
-  end
-
-  def test_to_html_tt_tag_mismatch
-    _, err = verbose_capture_output do
-      assert_equal '<tt>hi', to_html('<tt>hi')
-    end
-
-    assert_equal "mismatched <tt> tag\n", err
-  end
-
-  def formatter
-    RDoc::Markup::ToHtml.new @options
-  end
-
-  def options
-    @options
-  end
-
-end
diff --git a/test/rdoc/test_rdoc_token_stream.rb b/test/rdoc/test_rdoc_token_stream.rb
deleted file mode 100644
index 29c5047fb57a25..00000000000000
--- a/test/rdoc/test_rdoc_token_stream.rb
+++ /dev/null
@@ -1,57 +0,0 @@
-# frozen_string_literal: true
-require_relative 'helper'
-
-class TestRDocTokenStream < RDoc::TestCase
-
-  def test_class_to_html
-    tokens = [
-      { :line_no => 0, :char_no => 0, :kind => :on_const, :text => 'CONSTANT' },
-      { :line_no => 0, :char_no => 0, :kind => :on_kw, :text => 'KW' },
-      { :line_no => 0, :char_no => 0, :kind => :on_ivar, :text => 'IVAR' },
-      { :line_no => 0, :char_no => 0, :kind => :on_op, :text => 'Op' },
-      { :line_no => 0, :char_no => 0, :kind => :on_ident, :text => 'Id' },
-      { :line_no => 0, :char_no => 0, :kind => :on_backref, :text => 'Node' },
-      { :line_no => 0, :char_no => 0, :kind => :on_comment, :text => 'COMMENT' },
-      { :line_no => 0, :char_no => 0, :kind => :on_regexp, :text => 'REGEXP' },
-      { :line_no => 0, :char_no => 0, :kind => :on_tstring, :text => 'STRING' },
-      { :line_no => 0, :char_no => 0, :kind => :on_int, :text => 'Val' },
-      { :line_no => 0, :char_no => 0, :kind => :on_unknown, :text => '\\' }
-    ]
-
-    expected = [
-      '<span class="ruby-constant">CONSTANT</span>',
-      '<span class="ruby-keyword">KW</span>',
-      '<span class="ruby-ivar">IVAR</span>',
-      '<span class="ruby-operator">Op</span>',
-      '<span class="ruby-identifier">Id</span>',
-      '<span class="ruby-node">Node</span>',
-      '<span class="ruby-comment">COMMENT</span>',
-      '<span class="ruby-regexp">REGEXP</span>',
-      '<span class="ruby-string">STRING</span>',
-      '<span class="ruby-value">Val</span>',
-      '\\'
-    ].join
-
-    assert_equal expected, RDoc::TokenStream.to_html(tokens)
-  end
-
-  def test_class_to_html_empty
-    assert_equal '', RDoc::TokenStream.to_html([])
-  end
-
-  def test_tokens_to_s
-    foo = Class.new do
-      include RDoc::TokenStream
-
-      def initialize
-        @token_stream = [
-          { line_no: 0, char_no: 0, kind: :on_ident,   text: "foo" },
-          { line_no: 0, char_no: 0, kind: :on_sp,      text: " " },
-          { line_no: 0, char_no: 0, kind: :on_tstring, text: "'bar'" },
-        ]
-      end
-    end.new
-
-    assert_equal "foo 'bar'", foo.tokens_to_s
-  end
-end
diff --git a/test/rdoc/test_rdoc_tom_doc.rb b/test/rdoc/test_rdoc_tom_doc.rb
deleted file mode 100644
index ddecea4b21ca65..00000000000000
--- a/test/rdoc/test_rdoc_tom_doc.rb
+++ /dev/null
@@ -1,579 +0,0 @@
-# frozen_string_literal: true
-require_relative 'helper'
-
-class TestRDocTomDoc < RDoc::TestCase
-
-  def setup
-    super
-
-    @top_level = @store.add_file 'file.rb'
-
-    @TD = RDoc::TomDoc
-    @td = @TD.new
-  end
-
-  def test_class_add_post_processor
-    RDoc::TomDoc.add_post_processor
-
-    pp = RDoc::Markup::PreProcess.new __FILE__, []
-
-    text = "# Public: Do some stuff\n"
-
-    comment = RDoc::Comment.new text, nil
-    comment.format = 'tomdoc'
-
-    parent = RDoc::Context.new
-
-    pp.handle comment, parent
-
-    method = parent.add_method RDoc::AnyMethod.new(nil, 'm')
-
-    assert_equal 'Public', method.section.title
-    assert_equal "# Do some stuff\n", comment.text
-  end
-
-  def test_class_signature
-    c = comment <<-COMMENT
-Signature
-
-  method_<here>(args)
-
-here - something
-    COMMENT
-    c.format = 'tomdoc'
-
-    signature = @TD.signature c
-
-    assert_equal "method_<here>(args)\n", signature
-  end
-
-  def test_class_signature_no_space
-    c = comment <<-COMMENT
-Signature
-  method_<here>(args)
-
-here - something
-    COMMENT
-    c.format = 'tomdoc'
-
-    signature = @TD.signature c
-
-    assert_equal "method_<here>(args)\n", signature
-
-    expected =
-      doc(
-        head(3, 'Signature'),
-        list(:NOTE,
-          item(%w[here],
-            para('something'))))
-    expected.file = @top_level
-
-    assert_equal expected, c.parse
-  end
-
-  def test_class_signature_none
-    c = comment ''
-    c.format = 'tomdoc'
-
-    assert_nil @TD.signature c
-  end
-
-  def test_class_rdoc
-    c = comment <<-COMMENT
-=== Signature
-
-  method_<here>(args)
-
-here - something
-    COMMENT
-    c.format = 'rdoc'
-
-    signature = @TD.signature c
-
-    assert_nil signature
-  end
-
-  def test_class_signature_two_space
-    c = comment <<-COMMENT
-Signature
-
-
-  method_<here>(args)
-
-here - something
-    COMMENT
-    c.format = 'tomdoc'
-
-    signature = @TD.signature c
-
-    assert_equal "method_<here>(args)\n", signature
-
-    expected =
-      doc(
-        head(3, 'Signature'),
-        list(:NOTE,
-          item(%w[here],
-            para('something'))))
-    expected.file = @top_level
-
-    assert_equal expected, c.parse
-  end
-
-  def test_parse_paragraph
-    text = "Public: Do some stuff\n"
-
-    expected =
-      @RM::Document.new(
-        @RM::Paragraph.new('Do some stuff'))
-
-    assert_equal expected, @TD.parse(text)
-  end
-
-  def test_parse_multiline_paragraph
-    text = "Public: Do some stuff\n"
-    text += "On a new line\n"
-
-    expected =
-      doc(
-        para('Do some stuff', ' ', 'On a new line'))
-
-    assert_equal expected, @TD.parse(text)
-  end
-
-  def test_parse_arguments
-    text = <<-TEXT
-Create new Arg object.
-
-name        - name of argument
-description - arguments description
-    TEXT
-
-    expected =
-      doc(
-        para('Create new Arg object.'),
-        blank_line,
-        list(:NOTE,
-          item(%w[name],
-            para('name of argument')),
-          item(%w[description],
-            para('arguments description'))))
-
-    assert_equal expected, @TD.parse(text)
-  end
-
-  def test_parse_arguments_array
-    text = <<-TEXT
-Create new Arg object.
-
-names[] - names of arguments
-    TEXT
-
-    expected =
-      doc(
-        para('Create new Arg object.'),
-        blank_line,
-        list(:NOTE,
-          item(%w[names[]],
-            para('names of arguments'))))
-
-    assert_equal expected, @TD.parse(text)
-  end
-
-  def test_parse_arguments_multiline
-    text = <<-TEXT
-Do some stuff
-
-foo - A comment goes here
-  and is more than one line
-    TEXT
-
-    expected =
-      doc(
-        para('Do some stuff'),
-        blank_line,
-        list(:NOTE,
-          item(%w[foo],
-            para('A comment goes here', ' ', 'and is more than one line'))))
-
-    assert_equal expected, @TD.parse(text)
-  end
-
-  def test_parse_arguments_nested
-    text = <<-TEXT
-Do some stuff
-
-foo - A comment goes here
-      :bar - bar documentation
-    TEXT
-
-    expected =
-      doc(
-        para('Do some stuff'),
-        blank_line,
-        list(:NOTE,
-          item(%w[foo],
-            para('A comment goes here'),
-            list(:NOTE,
-              item(%w[:bar],
-                para('bar documentation'))))))
-
-    assert_equal expected, @TD.parse(text)
-  end
-
-  def test_parse_examples
-    text = <<-TEXT
-Do some stuff
-
-Examples
-
-  1 + 1
-    TEXT
-
-    code = verb("1 + 1\n")
-    code.format = :ruby
-
-    expected =
-      doc(
-        para('Do some stuff'),
-        blank_line,
-        head(3, 'Examples'),
-        blank_line,
-        code)
-
-    document = @TD.parse(text)
-    assert_equal expected, document
-    assert document.parts.last.ruby?
-  end
-
-  def test_parse_examples_signature
-    text = <<-TEXT
-Do some stuff
-
-Examples
-
-  1 + 1
-
-Signature
-
-  foo(args)
-    TEXT
-
-    code1 = verb("1 + 1\n")
-    code1.format = :ruby
-
-    code2 = verb("foo(args)\n")
-
-    expected =
-      doc(
-        para('Do some stuff'),
-        blank_line,
-        head(3, 'Examples'),
-        blank_line,
-        code1,
-        head(3, 'Signature'),
-        blank_line,
-        code2)
-
-    document = @TD.parse text
-
-    assert_equal expected, document
-  end
-
-  def test_parse_returns
-    text = <<-TEXT
-Do some stuff
-
-Returns a thing
-
-Returns another thing
-    TEXT
-
-    expected =
-      doc(
-        para('Do some stuff'),
-        blank_line,
-        head(3, 'Returns'),
-        blank_line,
-        para('Returns a thing'),
-        blank_line,
-        para('Returns another thing'))
-
-    assert_equal expected, @TD.parse(text)
-  end
-
-  def test_parse_returns_with_raises
-    text = <<-TEXT
-Do some stuff
-
-Returns a thing
-Raises ArgumentError when stuff
-Raises StandardError when stuff
-    TEXT
-    expected =
-      doc(
-        para('Do some stuff'),
-        blank_line,
-        head(3, 'Returns'),
-        blank_line,
-        para('Returns a thing'),
-        para('Raises ArgumentError when stuff'),
-        para('Raises StandardError when stuff'))
-
-    assert_equal expected, @TD.parse(text)
-  end
-
-  def test_parse_raises_without_returns
-    text = <<-TEXT
-Do some stuff
-
-Raises ArgumentError when stuff
-    TEXT
-    expected =
-      doc(
-        para('Do some stuff'),
-        blank_line,
-        head(3, 'Returns'),
-        blank_line,
-        para('Raises ArgumentError when stuff'))
-
-    assert_equal expected, @TD.parse(text)
-  end
-
-  def test_parse_returns_multiline
-    text = <<-TEXT
-Do some stuff
-
-Returns a thing
-  that is multiline
-    TEXT
-
-    expected =
-      doc(
-        para('Do some stuff'),
-        blank_line,
-        head(3, 'Returns'),
-        blank_line,
-        para('Returns a thing', ' ', 'that is multiline'))
-
-    assert_equal expected, @TD.parse(text)
-  end
-
-  def test_parse_returns_multiline_and_raises
-    text = <<-TEXT
-Do some stuff
-
-Returns a thing
-  that is multiline
-Raises ArgumentError
-    TEXT
-
-    expected =
-      doc(
-        para('Do some stuff'),
-        blank_line,
-        head(3, 'Returns'),
-        blank_line,
-        para('Returns a thing', ' ', 'that is multiline'),
-        para('Raises ArgumentError'))
-
-    assert_equal expected, @TD.parse(text)
-  end
-
-  def test_parse_signature
-    text = <<-TEXT
-Do some stuff
-
-Signature
-
-  some_method(args)
-    TEXT
-
-    expected =
-      @RM::Document.new(
-        @RM::Paragraph.new('Do some stuff'),
-        @RM::BlankLine.new,
-        @RM::Heading.new(3, 'Signature'),
-        @RM::BlankLine.new,
-        @RM::Verbatim.new("some_method(args)\n"))
-
-    assert_equal expected, @TD.parse(text)
-  end
-
-  def test_tokenize_paragraph
-    @td.tokenize "Public: Do some stuff\n"
-
-    expected = [
-      [:TEXT,    "Do some stuff",  0, 0],
-      [:NEWLINE, "\n",            13, 0],
-    ]
-
-    assert_equal expected, @td.tokens
-  end
-
-  def test_tokenize_multiline_paragraph
-    text = "Public: Do some stuff\n"
-    text += "On a new line\n"
-
-    @td.tokenize text
-
-    expected = [
-      [:TEXT,     "Do some stuff",   0, 0],
-      [:NEWLINE,  "\n",             13, 0],
-      [:TEXT,     "On a new line",   0, 1],
-      [:NEWLINE,  "\n",             13, 1]
-    ]
-
-    assert_equal expected, @td.tokens
-  end
-
-  def test_tokenize_arguments
-    @td.tokenize <<-TEXT
-Create new Arg object.
-
-name        - name of argument
-description - arguments description
-    TEXT
-
-    expected = [
-      [:TEXT,    "Create new Arg object.",  0, 0],
-      [:NEWLINE, "\n",                     22, 0],
-      [:NEWLINE, "\n",                      0, 1],
-      [:NOTE,    "name",                    0, 2],
-      [:TEXT,    "name of argument",       14, 2],
-      [:NEWLINE, "\n",                     30, 2],
-      [:NOTE,    "description",             0, 3],
-      [:TEXT,    "arguments description",  14, 3],
-      [:NEWLINE, "\n",                     35, 3],
-    ]
-
-    assert_equal expected, @td.tokens
-  end
-
-  def test_tokenize_arguments_array
-    @td.tokenize <<-TEXT
-Create new Arg object.
-
-names[stuff] - names of arguments
-    TEXT
-
-    expected = [
-      [:TEXT,    "Create new Arg object.",  0, 0],
-      [:NEWLINE, "\n",                     22, 0],
-      [:NEWLINE, "\n",                      0, 1],
-      [:NOTE,    "names[stuff]",            0, 2],
-      [:TEXT,    "names of arguments",     15, 2],
-      [:NEWLINE, "\n",                     33, 2],
-    ]
-
-    assert_equal expected, @td.tokens
-  end
-
-  def test_tokenize_arguments_multiline
-    @td.tokenize <<-TEXT
-Do some stuff
-
-foo - A comment goes here
-  and is more than one line
-    TEXT
-
-    expected = [
-      [:TEXT,    "Do some stuff",              0, 0],
-      [:NEWLINE, "\n",                        13, 0],
-      [:NEWLINE, "\n",                         0, 1],
-      [:NOTE,    "foo",                        0, 2],
-      [:TEXT,    "A comment goes here",        6, 2],
-      [:NEWLINE, "\n",                        25, 2],
-      [:TEXT,    "and is more than one line",  2, 3],
-      [:NEWLINE, "\n",                        27, 3],
-    ]
-
-    assert_equal expected, @td.tokens
-  end
-
-  def test_tokenize_arguments_nested
-    @td.tokenize <<-TEXT
-Do some stuff
-
-foo - A comment goes here
-      :bar - bar documentation
-    TEXT
-
-    expected = [
-      [:TEXT,    "Do some stuff",              0, 0],
-      [:NEWLINE, "\n",                        13, 0],
-      [:NEWLINE, "\n",                         0, 1],
-      [:NOTE,    "foo",                        0, 2],
-      [:TEXT,    "A comment goes here",        6, 2],
-      [:NEWLINE, "\n",                        25, 2],
-      [:NOTE,    ":bar",                       6, 3],
-      [:TEXT,    "bar documentation",         13, 3],
-      [:NEWLINE, "\n",                        30, 3],
-    ]
-
-    assert_equal expected, @td.tokens
-  end
-
-  def test_tokenize_examples
-    @td.tokenize <<-TEXT
-Do some stuff
-
-Examples
-
-  1 + 1
-    TEXT
-
-    expected = [
-      [:TEXT,    "Do some stuff",  0, 0],
-      [:NEWLINE, "\n",            13, 0],
-      [:NEWLINE, "\n",             0, 1],
-      [:HEADER,  3,                0, 2],
-      [:TEXT,    "Examples",       0, 2],
-      [:NEWLINE, "\n",             8, 2],
-      [:NEWLINE, "\n",             0, 3],
-      [:TEXT,    "1 + 1",          2, 4],
-      [:NEWLINE, "\n",             7, 4],
-    ]
-
-    assert_equal expected, @td.tokens
-  end
-
-  def test_tokenize_returns
-    @td.tokenize <<-TEXT
-Do some stuff
-
-Returns a thing
-    TEXT
-
-    expected = [
-      [:TEXT,    "Do some stuff",    0, 0],
-      [:NEWLINE, "\n",              13, 0],
-      [:NEWLINE, "\n",               0, 1],
-      [:TEXT,    "Returns a thing",  0, 2],
-      [:NEWLINE, "\n",              15, 2],
-    ]
-
-    assert_equal expected, @td.tokens
-  end
-
-  def test_tokenize_returns_multiline
-    @td.tokenize <<-TEXT
-Do some stuff
-
-Returns a thing
-  that is multiline
-    TEXT
-
-    expected = [
-      [:TEXT,    "Do some stuff",      0, 0],
-      [:NEWLINE, "\n",                13, 0],
-      [:NEWLINE, "\n",                 0, 1],
-      [:TEXT,    "Returns a thing",    0, 2],
-      [:NEWLINE, "\n",                15, 2],
-      [:TEXT,    "that is multiline",  2, 3],
-      [:NEWLINE, "\n",                19, 3],
-    ]
-
-    assert_equal expected, @td.tokens
-  end
-
-end
diff --git a/test/rdoc/test_rdoc_top_level.rb b/test/rdoc/test_rdoc_top_level.rb
deleted file mode 100644
index 3cfaa9b7637445..00000000000000
--- a/test/rdoc/test_rdoc_top_level.rb
+++ /dev/null
@@ -1,290 +0,0 @@
-# frozen_string_literal: true
-require_relative 'xref_test_case'
-
-class TestRDocTopLevel < XrefTestCase
-
-  def setup
-    super
-
-    @top_level = @store.add_file 'path/top_level.rb'
-    @top_level.parser = RDoc::Parser::Ruby
-  end
-
-  def test_initialize
-    t = RDoc::TopLevel.new 'path/file.rb'
-
-    assert_equal 'path/file.rb', t.absolute_name
-    assert_equal 'path/file.rb', t.relative_name
-  end
-
-  def test_initialize_relative
-    t = RDoc::TopLevel.new 'path/file.rb', 'file.rb'
-
-    assert_equal 'path/file.rb', t.absolute_name
-    assert_equal 'file.rb',      t.relative_name
-  end
-
-  def test_add_alias
-    a = RDoc::Alias.new nil, 'old', 'new', nil
-    @top_level.add_alias a
-
-    object = @store.find_class_named 'Object'
-    expected = { '#old' => [a] }
-    assert_equal expected, object.unmatched_alias_lists
-    assert_includes object.in_files, @top_level
-  end
-
-  def test_add_alias_nodoc
-    @top_level.document_self = false
-
-    a = RDoc::Alias.new nil, 'old', 'new', nil
-    @top_level.add_alias a
-
-    object = @store.find_class_named('Object')
-    assert_empty object.unmatched_alias_lists
-    assert_includes object.in_files, @top_level
-  end
-
-  def test_add_constant
-    const = RDoc::Constant.new 'C', nil, nil
-    @top_level.add_constant const
-
-    object = @store.find_class_named 'Object'
-    assert_equal [const], object.constants
-    assert_includes object.in_files, @top_level
-  end
-
-  def test_add_constant_nodoc
-    @top_level.document_self = false
-
-    const = RDoc::Constant.new 'C', nil, nil
-    @top_level.add_constant const
-
-    object = @store.find_class_named 'Object'
-    assert_empty object.constants
-    assert_includes object.in_files, @top_level
-  end
-
-  def test_add_include
-    include = RDoc::Include.new 'C', nil
-    @top_level.add_include include
-
-    object = @store.find_class_named 'Object'
-    assert_equal [include], object.includes
-    assert_includes object.in_files, @top_level
-  end
-
-  def test_add_include_nodoc
-    @top_level.document_self = false
-
-    include = RDoc::Include.new 'C', nil
-    @top_level.add_include include
-
-    object = @store.find_class_named('Object')
-    assert_empty object.includes
-    assert_includes object.in_files, @top_level
-  end
-
-  def test_add_method
-    method = RDoc::AnyMethod.new nil, 'm'
-    @top_level.add_method method
-
-    object = @store.find_class_named 'Object'
-    assert_equal [@c10_method, @c11_method, method], object.method_list
-    assert_includes object.in_files, @top_level
-  end
-
-  def test_add_method_stopdoc
-    @top_level.document_self = false
-
-    method = RDoc::AnyMethod.new nil, 'm'
-    @top_level.add_method method
-
-    object = @store.find_class_named('Object')
-    assert_equal [@c10_method, @c11_method], object.method_list
-    assert_includes object.in_files, @top_level
-  end
-
-  def test_base_name
-    assert_equal 'top_level.rb', @top_level.base_name
-  end
-
-  def test_display_eh
-    refute @top_level.display?
-
-    page = @store.add_file 'README.txt'
-    page.parser = RDoc::Parser::Simple
-
-    assert page.display?
-  end
-
-  def test_eql_eh
-    top_level2 = @store.add_file 'path/top_level.rb'
-    other_level = @store.add_file 'path/other_level.rb'
-
-    assert_operator @top_level, :eql?, top_level2
-
-    refute_operator other_level, :eql?, @top_level
-  end
-
-  def test_equals2
-    top_level2 = @store.add_file 'path/top_level.rb'
-    other_level = @store.add_file 'path/other_level.rb'
-
-    assert_equal @top_level, top_level2
-
-    refute_equal other_level, @top_level
-  end
-
-  def test_find_class_or_module
-    assert_equal @c1,    @xref_data.find_class_or_module('C1')
-    assert_equal @c2_c3, @xref_data.find_class_or_module('C2::C3')
-    assert_equal @c4,    @xref_data.find_class_or_module('C4')
-    assert_equal @m1_m2, @xref_data.find_class_or_module('M1::M2')
-  end
-
-  def test_full_name
-    assert_equal 'path/top_level.rb', @top_level.full_name
-  end
-
-  def test_hash
-    tl2 = @store.add_file 'path/top_level.rb'
-    tl3 = @store.add_file 'other/top_level.rb'
-
-    assert_equal @top_level.hash, tl2.hash
-    refute_equal @top_level.hash, tl3.hash
-  end
-
-  def test_http_url
-    assert_equal 'prefix/path/top_level_rb.html', @top_level.http_url('prefix')
-
-    other_level = @store.add_file 'path.other/level.rb'
-    assert_equal 'prefix/path_other/level_rb.html', other_level.http_url('prefix')
-  end
-
-  def test_last_modified
-    assert_nil @top_level.last_modified
-    stat = Object.new
-    def stat.mtime() 0 end
-    @top_level.file_stat = stat
-    assert_equal 0, @top_level.last_modified
-  end
-
-  def test_marshal_dump
-    page = @store.add_file 'README.txt'
-    page.parser = RDoc::Parser::Simple
-    page.comment = RDoc::Comment.new 'This is a page', page
-
-    loaded = Marshal.load Marshal.dump page
-
-    comment = RDoc::Markup::Document.new(
-                RDoc::Markup::Paragraph.new('This is a page'))
-    comment.file = loaded
-
-    assert_equal page, loaded
-
-    assert_equal 'README.txt', loaded.absolute_name
-    assert_equal 'README.txt', loaded.relative_name
-
-    assert_equal RDoc::Parser::Simple, loaded.parser
-
-    assert_equal comment, loaded.comment
-  end
-
-  def test_marshal_load_version_0
-    loaded = Marshal.load "\x04\bU:\x13RDoc::TopLevel" +
-                          "[\ti\x00I\"\x0FREADME.txt\x06:\x06EF" +
-                          "c\x19RDoc::Parser::Simple" +
-                          "o:\eRDoc::Markup::Document\a:\v@parts" +
-                          "[\x06o:\x1CRDoc::Markup::Paragraph\x06;\b" +
-                          "[\x06I\"\x13This is a page\x06;\x06F:\n@file@\a"
-
-    comment = RDoc::Markup::Document.new(
-                RDoc::Markup::Paragraph.new('This is a page'))
-    comment.file = loaded
-
-    assert_equal 'README.txt', loaded.absolute_name
-    assert_equal 'README.txt', loaded.relative_name
-
-    assert_equal RDoc::Parser::Simple, loaded.parser
-
-    assert_equal comment, loaded.comment
-
-    assert loaded.display?
-  end
-
-  def test_name
-    assert_equal 'top_level.rb', @top_level.name
-  end
-
-  def test_page_name
-    assert_equal 'top_level', @top_level.page_name
-
-    tl = @store.add_file 'README.ja'
-
-    assert_equal 'README.ja', tl.page_name
-
-    tl = @store.add_file 'Rakefile'
-
-    assert_equal 'Rakefile', tl.page_name
-  end
-
-  def test_page_name_trim_extension
-    tl = @store.add_file 'README.ja.rdoc'
-
-    assert_equal 'README.ja', tl.page_name
-
-    tl = @store.add_file 'README.ja.md'
-
-    assert_equal 'README.ja', tl.page_name
-
-    tl = @store.add_file 'README.txt'
-
-    assert_equal 'README', tl.page_name
-  end
-
-  def test_search_record
-    assert_nil @xref_data.search_record
-  end
-
-  def test_search_record_page
-    page = @store.add_file 'README.txt'
-    page.parser = RDoc::Parser::Simple
-    page.comment = 'This is a comment.'
-
-    expected = [
-      'README',
-      '',
-      'README',
-      '',
-      'README_txt.html',
-      '',
-      "<p>This is a comment.\n",
-    ]
-
-    assert_equal expected, page.search_record
-  end
-
-  def test_text_eh
-    refute @xref_data.text?
-
-    rd = @store.add_file 'rd_format.rd'
-    rd.parser = RDoc::Parser::RD
-
-    assert rd.text?
-
-    simple = @store.add_file 'simple.txt'
-    simple.parser = RDoc::Parser::Simple
-
-    assert simple.text?
-  end
-
-  def test_text_eh_no_parser
-    refute @xref_data.text?
-
-    rd = @store.add_file 'rd_format.rd'
-
-    refute rd.text?
-  end
-
-end
diff --git a/test/rdoc/xref_data.rb b/test/rdoc/xref_data.rb
deleted file mode 100644
index c9315b78061dc6..00000000000000
--- a/test/rdoc/xref_data.rb
+++ /dev/null
@@ -1,151 +0,0 @@
-# frozen_string_literal: true
-XREF_DATA = <<-XREF_DATA
-class C1
-
-  attr :attr
-
-  # :section: separate
-
-  attr_reader :attr_reader
-  attr_writer :attr_writer
-
-  # :section:
-  attr_accessor :attr_accessor
-
-  CONST = :const
-
-  def self.m
-  end
-
-  def m foo
-  end
-
-  def +
-  end
-end
-
-class C2
-  def b
-  end
-
-  alias a b
-
-  class C3
-    def m
-    end
-
-    class H1
-      def m?
-      end
-    end
-  end
-end
-
-class C3
-  class H1
-  end
-
-  class H2 < H1
-  end
-end
-
-class C4
-  class C4
-  end
-end
-
-class C5
-  class C1
-  end
-end
-
-class C6
-  private def priv1() end
-  def pub1() end
-  protected def prot1() end
-  def pub2() end
-  public def pub3() end
-  def pub4() end
-
-  private
-  private def priv2() end
-  def priv3() end
-  protected def prot2() end
-  def priv4() end
-  public def pub5() end
-  def priv5() end
-
-  protected
-  private def priv6() end
-  def prot3() end
-  protected def prot4() end
-  def prot5() end
-  public def pub6() end
-  def prot6() end
-end
-
-class C7
-  attr_reader :attr_reader
-  attr_reader :attr_reader_nodoc # :nodoc:
-  attr_writer :attr_writer
-  attr_writer :attr_writer_nodoc # :nodoc:
-  attr_accessor :attr_accessor
-  attr_accessor :attr_accessor_nodoc # :nodoc:
-
-  CONST = :const
-  CONST_NODOC = :const_nodoc # :nodoc:
-end
-
-class C8
-  class << self
-    class S1
-    end
-  end
-end
-
-class C9
-  class A
-    def foo() end
-    def self.bar() end
-  end
-
-  class B < A
-    def self.foo() end
-    def bar() end
-  end
-end
-
-class C10
-  class C11
-  end
-
-  def C11
-  end
-end
-
-def C10
-end
-
-class C11
-end
-
-def C11
-end
-
-module M1
-  def m
-  end
-end
-
-module M1::M2
-end
-
-class Parent
-  def m() end
-  def self.m() end
-end
-
-class Child < Parent
-end
-
-XREF_DATA
diff --git a/test/rdoc/xref_test_case.rb b/test/rdoc/xref_test_case.rb
deleted file mode 100644
index 0f7395e516dc55..00000000000000
--- a/test/rdoc/xref_test_case.rb
+++ /dev/null
@@ -1,93 +0,0 @@
-# frozen_string_literal: true
-ENV['RDOC_TEST'] = 'yes'
-
-require_relative 'helper'
-require File.expand_path '../xref_data', __FILE__
-
-class XrefTestCase < RDoc::TestCase
-
-  def setup
-    super
-
-    @options = RDoc::Options.new
-    @options.quiet = true
-
-    @rdoc.options = @options
-
-    @file_name = 'xref_data.rb'
-    @xref_data = @store.add_file @file_name
-    @top_level = @xref_data
-
-    stats = RDoc::Stats.new @store, 0
-
-    parser = RDoc::Parser::Ruby.new @xref_data, @file_name, XREF_DATA, @options,
-                                    stats
-
-    @example_md = @store.add_file 'EXAMPLE.md'
-    @example_md.parser = RDoc::Parser::Markdown
-
-    @top_levels = []
-    @top_levels.push parser.scan
-    @top_levels.push @example_md
-
-    generator = Object.new
-    def generator.class_dir() nil end
-    def generator.file_dir() nil end
-    @rdoc.options = @options
-    @rdoc.generator = generator
-
-    @c1       = @xref_data.find_module_named 'C1'
-    @c1__m    = @c1.find_class_method_named 'm' # C1::m
-    @c1_m     = @c1.find_instance_method_named 'm'  # C1#m
-    @c1_plus  = @c1.find_instance_method_named '+'
-
-    @c2    = @xref_data.find_module_named 'C2'
-    @c2_a  = @c2.method_list.last
-    @c2_b  = @c2.method_list.first
-
-    @c2_c3 = @xref_data.find_module_named 'C2::C3'
-    @c2_c3_m = @c2_c3.method_list.first # C2::C3#m
-
-    @c2_c3_h1 = @xref_data.find_module_named 'C2::C3::H1'
-    @c2_c3_h1_meh = @c2_c3_h1.method_list.first # C2::C3::H1#m?
-
-    @c3    = @xref_data.find_module_named 'C3'
-    @c4    = @xref_data.find_module_named 'C4'
-    @c4_c4 = @xref_data.find_module_named 'C4::C4'
-    @c5_c1 = @xref_data.find_module_named 'C5::C1'
-    @c3_h1 = @xref_data.find_module_named 'C3::H1'
-    @c3_h2 = @xref_data.find_module_named 'C3::H2'
-    @c6    = @xref_data.find_module_named 'C6'
-    @c7    = @xref_data.find_module_named 'C7'
-    @c8    = @xref_data.find_module_named 'C8'
-    @c8_s1 = @xref_data.find_module_named 'C8::S1'
-
-    @c9         = @xref_data.find_module_named 'C9'
-    @c9_a       = @xref_data.find_module_named 'C9::A'
-    @c9_a_i_foo = @c9_a.method_list.first
-    @c9_a_c_bar = @c9_a.method_list.last
-    @c9_b       = @xref_data.find_module_named 'C9::B'
-    @c9_b_c_foo = @c9_b.method_list.first
-    @c9_b_i_bar = @c9_b.method_list.last
-
-    @object         = @xref_data.find_module_named 'Object'
-    @c10_class      = @xref_data.find_module_named 'C10'
-    @c10_method     = @object.find_method_named 'C10'
-    @c11_class      = @xref_data.find_module_named 'C11'
-    @c10_c11_class  = @c10_class.find_module_named 'C11'
-    @c10_c11_method = @c10_class.find_method_named 'C11'
-    @c11_method     = @object.find_method_named 'C11'
-
-    @m1    = @xref_data.find_module_named 'M1'
-    @m1_m  = @m1.method_list.first
-
-    @m1_m2 = @xref_data.find_module_named 'M1::M2'
-
-    @parent = @xref_data.find_module_named 'Parent'
-    @child  = @xref_data.find_module_named 'Child'
-
-    @parent_m  = @parent.method_list.first # Parent#m
-    @parent__m = @parent.method_list.last  # Parent::m
-  end
-
-end
diff --git a/test/reline/helper.rb b/test/reline/helper.rb
deleted file mode 100644
index bb2389318739aa..00000000000000
--- a/test/reline/helper.rb
+++ /dev/null
@@ -1,169 +0,0 @@
-$LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
-
-ENV['TERM'] = 'xterm' # for some CI environments
-
-require 'reline'
-require 'test/unit'
-
-begin
-  require 'rbconfig'
-rescue LoadError
-end
-
-begin
-  # This should exist and available in load path when this file is mirrored to ruby/ruby and running at there
-  if File.exist?(File.expand_path('../../tool/lib/envutil.rb', __dir__))
-    require 'envutil'
-  end
-rescue LoadError
-end
-
-module Reline
-  class <<self
-    def test_mode(ansi: false)
-        remove_const('IOGate') if const_defined?('IOGate')
-        const_set('IOGate', ansi ? Reline::ANSI : Reline::GeneralIO)
-        if ENV['RELINE_TEST_ENCODING']
-          encoding = Encoding.find(ENV['RELINE_TEST_ENCODING'])
-        else
-          encoding = Encoding::UTF_8
-        end
-        Reline::GeneralIO.reset(encoding: encoding) unless ansi
-        core.config.instance_variable_set(:@test_mode, true)
-        core.config.reset
-    end
-
-    def test_reset
-      remove_const('IOGate') if const_defined?('IOGate')
-      const_set('IOGate', Reline::GeneralIO)
-      Reline.instance_variable_set(:@core, nil)
-    end
-
-    # Return a executable name to spawn Ruby process. In certain build configuration,
-    # "ruby" may not be available.
-    def test_rubybin
-      # When this test suite is running in ruby/ruby, prefer EnvUtil result over original implementation
-      if const_defined?(:EnvUtil)
-        return EnvUtil.rubybin
-      end
-
-      # The following is a simplified port of EnvUtil.rubybin in ruby/ruby
-      if ruby = ENV["RUBY"]
-        return ruby
-      end
-      ruby = "ruby"
-      exeext = RbConfig::CONFIG["EXEEXT"]
-      rubyexe = (ruby + exeext if exeext and !exeext.empty?)
-      if File.exist? ruby and File.executable? ruby and !File.directory? ruby
-        return File.expand_path(ruby)
-      end
-      if rubyexe and File.exist? rubyexe and File.executable? rubyexe
-        return File.expand_path(rubyexe)
-      end
-      if defined?(RbConfig.ruby)
-        RbConfig.ruby
-      else
-        "ruby"
-      end
-    end
-  end
-end
-
-def start_pasting
-  Reline::GeneralIO.start_pasting
-end
-
-def finish_pasting
-  Reline::GeneralIO.finish_pasting
-end
-
-class Reline::TestCase < Test::Unit::TestCase
-  private def convert_str(input, options = {}, normalized = nil)
-    return nil if input.nil?
-    input.chars.map { |c|
-      if Reline::Unicode::EscapedChars.include?(c.ord)
-        c
-      else
-        c.encode(@line_editor.instance_variable_get(:@encoding), Encoding::UTF_8, **options)
-      end
-    }.join
-  rescue Encoding::UndefinedConversionError, Encoding::InvalidByteSequenceError
-    input.unicode_normalize!(:nfc)
-    if normalized
-      options[:undef] = :replace
-      options[:replace] = '?'
-    end
-    normalized = true
-    retry
-  end
-
-  def input_key_by_symbol(input)
-    @line_editor.input_key(Reline::Key.new(input, input, false))
-  end
-
-  def input_keys(input, convert = true)
-    input = convert_str(input) if convert
-    input.chars.each do |c|
-      if c.bytesize == 1
-        eighth_bit = 0b10000000
-        byte = c.bytes.first
-        if byte.allbits?(eighth_bit)
-          @line_editor.input_key(Reline::Key.new(byte ^ eighth_bit, byte, true))
-        else
-          @line_editor.input_key(Reline::Key.new(byte, byte, false))
-        end
-      else
-        c.bytes.each do |b|
-          @line_editor.input_key(Reline::Key.new(b, b, false))
-        end
-      end
-    end
-  end
-
-  def input_raw_keys(input, convert = true)
-    input = convert_str(input) if convert
-    input.bytes.each do |b|
-      @line_editor.input_key(Reline::Key.new(b, b, false))
-    end
-  end
-
-  def assert_line(expected)
-    expected = convert_str(expected)
-    assert_equal(expected, @line_editor.line)
-  end
-
-  def assert_byte_pointer_size(expected)
-    expected = convert_str(expected)
-    byte_pointer = @line_editor.instance_variable_get(:@byte_pointer)
-    chunk = @line_editor.line.byteslice(0, byte_pointer)
-    assert_equal(
-      expected.bytesize, byte_pointer,
-      <<~EOM)
-        <#{expected.inspect} (#{expected.encoding.inspect})> expected but was
-        <#{chunk.inspect} (#{chunk.encoding.inspect})> in <Terminal #{Reline::GeneralIO.encoding.inspect}>
-      EOM
-  end
-
-  def assert_cursor(expected)
-    assert_equal(expected, @line_editor.instance_variable_get(:@cursor))
-  end
-
-  def assert_cursor_max(expected)
-    assert_equal(expected, @line_editor.instance_variable_get(:@cursor_max))
-  end
-
-  def assert_line_index(expected)
-    assert_equal(expected, @line_editor.instance_variable_get(:@line_index))
-  end
-
-  def assert_whole_lines(expected)
-    assert_equal(expected, @line_editor.whole_lines)
-  end
-
-  def assert_key_binding(input, method_symbol, editing_modes = [:emacs, :vi_insert, :vi_command])
-    editing_modes.each do |editing_mode|
-      @config.editing_mode = editing_mode
-      assert_equal(method_symbol, @config.editing_mode.default_key_bindings[input.bytes])
-    end
-  end
-end
diff --git a/test/reline/test_ansi_with_terminfo.rb b/test/reline/test_ansi_with_terminfo.rb
deleted file mode 100644
index 13874606598246..00000000000000
--- a/test/reline/test_ansi_with_terminfo.rb
+++ /dev/null
@@ -1,112 +0,0 @@
-require_relative 'helper'
-require 'reline/ansi'
-
-class Reline::ANSI::TestWithTerminfo < Reline::TestCase
-  def setup
-    Reline.send(:test_mode, ansi: true)
-    @config = Reline::Config.new
-    Reline.core.io_gate.set_default_key_bindings(@config, allow_terminfo: true)
-  end
-
-  def teardown
-    Reline.test_reset
-  end
-
-  # Home key
-  def test_khome
-    assert_key_binding(Reline::Terminfo.tigetstr('khome'), :ed_move_to_beg)
-  rescue Reline::Terminfo::TerminfoError => e
-    omit e.message
-  end
-
-  # End key
-  def test_kend
-    assert_key_binding(Reline::Terminfo.tigetstr('kend'), :ed_move_to_end)
-  rescue Reline::Terminfo::TerminfoError => e
-    omit e.message
-  end
-
-  # Delete key
-  def test_kdch1
-    assert_key_binding(Reline::Terminfo.tigetstr('kdch1'), :key_delete)
-  rescue Reline::Terminfo::TerminfoError => e
-    omit e.message
-  end
-
-  # PgUp key
-  def test_kpp
-    assert_key_binding(Reline::Terminfo.tigetstr('kpp'), :ed_search_prev_history)
-  rescue Reline::Terminfo::TerminfoError => e
-    omit e.message
-  end
-
-  # PgDn key
-  def test_knp
-    assert_key_binding(Reline::Terminfo.tigetstr('knp'), :ed_search_next_history)
-  rescue Reline::Terminfo::TerminfoError => e
-    omit e.message
-  end
-
-  # Up arrow key
-  def test_kcuu1
-    assert_key_binding(Reline::Terminfo.tigetstr('kcuu1'), :ed_prev_history)
-  rescue Reline::Terminfo::TerminfoError => e
-    omit e.message
-  end
-
-  # Down arrow key
-  def test_kcud1
-    assert_key_binding(Reline::Terminfo.tigetstr('kcud1'), :ed_next_history)
-  rescue Reline::Terminfo::TerminfoError => e
-    omit e.message
-  end
-
-  # Right arrow key
-  def test_kcuf1
-    assert_key_binding(Reline::Terminfo.tigetstr('kcuf1'), :ed_next_char)
-  rescue Reline::Terminfo::TerminfoError => e
-    omit e.message
-  end
-
-  # Left arrow key
-  def test_kcub1
-    assert_key_binding(Reline::Terminfo.tigetstr('kcub1'), :ed_prev_char)
-  rescue Reline::Terminfo::TerminfoError => e
-    omit e.message
-  end
-
-  # Home and End; always mapped regardless of terminfo enabled or not
-  def test_home_end
-    assert_key_binding("\e[H", :ed_move_to_beg)
-    assert_key_binding("\e[F", :ed_move_to_end)
-  end
-
-  # Arrow; always mapped regardless of terminfo enabled or not
-  def test_arrow
-    assert_key_binding("\e[A", :ed_prev_history)
-    assert_key_binding("\e[B", :ed_next_history)
-    assert_key_binding("\e[C", :ed_next_char)
-    assert_key_binding("\e[D", :ed_prev_char)
-  end
-
-  # Ctrl+arrow and Meta+arrow; always mapped regardless of terminfo enabled or not
-  def test_extended
-    assert_key_binding("\e[1;5C", :em_next_word) # Ctrl+→
-    assert_key_binding("\e[1;5D", :ed_prev_word) # Ctrl+←
-    assert_key_binding("\e[1;3C", :em_next_word) # Meta+→
-    assert_key_binding("\e[1;3D", :ed_prev_word) # Meta+←
-    assert_key_binding("\e\e[C", :em_next_word) # Meta+→
-    assert_key_binding("\e\e[D", :ed_prev_word) # Meta+←
-  end
-
-  # Shift-Tab; always mapped regardless of terminfo enabled or not
-  def test_shift_tab
-    assert_key_binding("\e[Z", :completion_journey_up, [:emacs, :vi_insert])
-  end
-
-  # A few emacs bindings that are always mapped regardless of terminfo enabled or not
-  def test_more_emacs
-    assert_key_binding("\e ", :em_set_mark, [:emacs])
-    assert_key_binding("\C-x\C-x", :em_exchange_mark, [:emacs])
-  end
-end if Reline::Terminfo.enabled?
diff --git a/test/reline/test_ansi_without_terminfo.rb b/test/reline/test_ansi_without_terminfo.rb
deleted file mode 100644
index 3d153514f3b62f..00000000000000
--- a/test/reline/test_ansi_without_terminfo.rb
+++ /dev/null
@@ -1,77 +0,0 @@
-require_relative 'helper'
-require 'reline/ansi'
-
-class Reline::ANSI::TestWithoutTerminfo < Reline::TestCase
-  def setup
-    Reline.send(:test_mode, ansi: true)
-    @config = Reline::Config.new
-    Reline.core.io_gate.set_default_key_bindings(@config, allow_terminfo: false)
-  end
-
-  def teardown
-    Reline.test_reset
-  end
-
-  def test_home
-    assert_key_binding("\e[1~", :ed_move_to_beg) # Console (80x25)
-    assert_key_binding("\e[H", :ed_move_to_beg) # KDE
-    assert_key_binding("\e[7~", :ed_move_to_beg) # urxvt / exoterm
-    assert_key_binding("\eOH", :ed_move_to_beg) # GNOME
-  end
-
-  def test_end
-    assert_key_binding("\e[4~", :ed_move_to_end) # Console (80x25)
-    assert_key_binding("\e[F", :ed_move_to_end) # KDE
-    assert_key_binding("\e[8~", :ed_move_to_end) # urxvt / exoterm
-    assert_key_binding("\eOF", :ed_move_to_end) # GNOME
-  end
-
-  def test_delete
-    assert_key_binding("\e[3~", :key_delete)
-  end
-
-  def test_up_arrow
-    assert_key_binding("\e[A", :ed_prev_history) # Console (80x25)
-    assert_key_binding("\eGA", :ed_prev_history) # KDE
-    assert_key_binding("\eOA", :ed_prev_history)
-  end
-
-  def test_down_arrow
-    assert_key_binding("\e[B", :ed_next_history) # Console (80x25)
-    assert_key_binding("\eGB", :ed_next_history) # KDE
-    assert_key_binding("\eOB", :ed_next_history)
-  end
-
-  def test_right_arrow
-    assert_key_binding("\e[C", :ed_next_char) # Console (80x25)
-    assert_key_binding("\eGC", :ed_next_char) # KDE
-    assert_key_binding("\eOC", :ed_next_char)
-  end
-
-  def test_left_arrow
-    assert_key_binding("\e[D", :ed_prev_char) # Console (80x25)
-    assert_key_binding("\eGD", :ed_prev_char) # KDE
-    assert_key_binding("\eOD", :ed_prev_char)
-  end
-
-  # Ctrl+arrow and Meta+arrow; always mapped regardless of terminfo enabled or not
-  def test_extended
-    assert_key_binding("\e[1;5C", :em_next_word) # Ctrl+→
-    assert_key_binding("\e[1;5D", :ed_prev_word) # Ctrl+←
-    assert_key_binding("\e[1;3C", :em_next_word) # Meta+→
-    assert_key_binding("\e[1;3D", :ed_prev_word) # Meta+←
-    assert_key_binding("\e\e[C", :em_next_word) # Meta+→
-    assert_key_binding("\e\e[D", :ed_prev_word) # Meta+←
-  end
-
-  # Shift-Tab; always mapped regardless of terminfo enabled or not
-  def test_shift_tab
-    assert_key_binding("\e[Z", :completion_journey_up, [:emacs, :vi_insert])
-  end
-
-  # A few emacs bindings that are always mapped regardless of terminfo enabled or not
-  def test_more_emacs
-    assert_key_binding("\e ", :em_set_mark, [:emacs])
-    assert_key_binding("\C-x\C-x", :em_exchange_mark, [:emacs])
-  end
-end
diff --git a/test/reline/test_config.rb b/test/reline/test_config.rb
deleted file mode 100644
index b16aed720a9542..00000000000000
--- a/test/reline/test_config.rb
+++ /dev/null
@@ -1,412 +0,0 @@
-require_relative 'helper'
-
-class Reline::Config::Test < Reline::TestCase
-  def setup
-    @pwd = Dir.pwd
-    @tmpdir = File.join(Dir.tmpdir, "test_reline_config_#{$$}")
-    begin
-      Dir.mkdir(@tmpdir)
-    rescue Errno::EEXIST
-      FileUtils.rm_rf(@tmpdir)
-      Dir.mkdir(@tmpdir)
-    end
-    Dir.chdir(@tmpdir)
-    Reline.test_mode
-    @config = Reline::Config.new
-  end
-
-  def teardown
-    Dir.chdir(@pwd)
-    FileUtils.rm_rf(@tmpdir)
-    Reline.test_reset
-    @config.reset
-  end
-
-  def test_read_lines
-    @config.read_lines(<<~LINES.lines)
-      set bell-style on
-    LINES
-
-    assert_equal :audible, @config.instance_variable_get(:@bell_style)
-  end
-
-  def test_read_lines_with_variable
-    @config.read_lines(<<~LINES.lines)
-      set disable-completion on
-    LINES
-
-    assert_equal true, @config.instance_variable_get(:@disable_completion)
-  end
-
-  def test_string_value
-    @config.read_lines(<<~LINES.lines)
-      set show-mode-in-prompt on
-      set emacs-mode-string Emacs
-    LINES
-
-    assert_equal 'Emacs', @config.instance_variable_get(:@emacs_mode_string)
-  end
-
-  def test_string_value_with_brackets
-    @config.read_lines(<<~LINES.lines)
-      set show-mode-in-prompt on
-      set emacs-mode-string [Emacs]
-    LINES
-
-    assert_equal '[Emacs]', @config.instance_variable_get(:@emacs_mode_string)
-  end
-
-  def test_string_value_with_brackets_and_quotes
-    @config.read_lines(<<~LINES.lines)
-      set show-mode-in-prompt on
-      set emacs-mode-string "[Emacs]"
-    LINES
-
-    assert_equal '[Emacs]', @config.instance_variable_get(:@emacs_mode_string)
-  end
-
-  def test_string_value_with_parens
-    @config.read_lines(<<~LINES.lines)
-      set show-mode-in-prompt on
-      set emacs-mode-string (Emacs)
-    LINES
-
-    assert_equal '(Emacs)', @config.instance_variable_get(:@emacs_mode_string)
-  end
-
-  def test_string_value_with_parens_and_quotes
-    @config.read_lines(<<~LINES.lines)
-      set show-mode-in-prompt on
-      set emacs-mode-string "(Emacs)"
-    LINES
-
-    assert_equal '(Emacs)', @config.instance_variable_get(:@emacs_mode_string)
-  end
-
-  def test_encoding_is_ascii
-    @config.reset
-    Reline.core.io_gate.reset(encoding: Encoding::US_ASCII)
-    @config = Reline::Config.new
-
-    assert_equal true, @config.convert_meta
-  end
-
-  def test_encoding_is_not_ascii
-    @config.reset
-    Reline.core.io_gate.reset(encoding: Encoding::UTF_8)
-    @config = Reline::Config.new
-
-    assert_equal nil, @config.convert_meta
-  end
-
-  def test_comment_line
-    @config.read_lines([" #a: error\n"])
-    assert_not_include @config.key_bindings, nil
-  end
-
-  def test_invalid_keystroke
-    @config.read_lines(["a: error\n"])
-    assert_not_include @config.key_bindings, nil
-  end
-
-  def test_bind_key
-    assert_equal ['input'.bytes, 'abcde'.bytes], @config.bind_key('"input"', '"abcde"')
-  end
-
-  def test_bind_key_with_macro
-
-    assert_equal ['input'.bytes, :abcde], @config.bind_key('"input"', 'abcde')
-  end
-
-  def test_bind_key_with_escaped_chars
-    assert_equal ['input'.bytes, "\e \\ \" ' \a \b \d \f \n \r \t \v".bytes], @config.bind_key('"input"', '"\\e \\\\ \\" \\\' \\a \\b \\d \\f \\n \\r \\t \\v"')
-  end
-
-  def test_bind_key_with_ctrl_chars
-    assert_equal ['input'.bytes, "\C-h\C-h".bytes], @config.bind_key('"input"', '"\C-h\C-H"')
-    assert_equal ['input'.bytes, "\C-h\C-h".bytes], @config.bind_key('"input"', '"\Control-h\Control-H"')
-  end
-
-  def test_bind_key_with_meta_chars
-    assert_equal ['input'.bytes, "\M-h\M-H".bytes], @config.bind_key('"input"', '"\M-h\M-H"')
-    assert_equal ['input'.bytes, "\M-h\M-H".bytes], @config.bind_key('"input"', '"\Meta-h\Meta-H"')
-  end
-
-  def test_bind_key_with_octal_number
-    input = %w{i n p u t}.map(&:ord)
-    assert_equal [input, "\1".bytes], @config.bind_key('"input"', '"\1"')
-    assert_equal [input, "\12".bytes], @config.bind_key('"input"', '"\12"')
-    assert_equal [input, "\123".bytes], @config.bind_key('"input"', '"\123"')
-    assert_equal [input, "\123".bytes + '4'.bytes], @config.bind_key('"input"', '"\1234"')
-  end
-
-  def test_bind_key_with_hexadecimal_number
-    input = %w{i n p u t}.map(&:ord)
-    assert_equal [input, "\x4".bytes], @config.bind_key('"input"', '"\x4"')
-    assert_equal [input, "\x45".bytes], @config.bind_key('"input"', '"\x45"')
-    assert_equal [input, "\x45".bytes + '6'.bytes], @config.bind_key('"input"', '"\x456"')
-  end
-
-  def test_include
-    File.open('included_partial', 'wt') do |f|
-      f.write(<<~PARTIAL_LINES)
-        set bell-style on
-      PARTIAL_LINES
-    end
-    @config.read_lines(<<~LINES.lines)
-      $include included_partial
-    LINES
-
-    assert_equal :audible, @config.instance_variable_get(:@bell_style)
-  end
-
-  def test_if
-    @config.read_lines(<<~LINES.lines)
-      $if Ruby
-      set bell-style audible
-      $else
-      set bell-style visible
-      $endif
-    LINES
-
-    assert_equal :audible, @config.instance_variable_get(:@bell_style)
-  end
-
-  def test_if_with_false
-    @config.read_lines(<<~LINES.lines)
-      $if Python
-      set bell-style audible
-      $else
-      set bell-style visible
-      $endif
-    LINES
-
-    assert_equal :visible, @config.instance_variable_get(:@bell_style)
-  end
-
-  def test_if_with_indent
-    %w[Ruby Reline].each do |cond|
-      @config.read_lines(<<~LINES.lines)
-        set bell-style none
-          $if #{cond}
-            set bell-style audible
-          $else
-            set bell-style visible
-          $endif
-      LINES
-
-      assert_equal :audible, @config.instance_variable_get(:@bell_style)
-    end
-  end
-
-  def test_unclosed_if
-    e = assert_raise(Reline::Config::InvalidInputrc) do
-      @config.read_lines(<<~LINES.lines, "INPUTRC")
-        $if Ruby
-      LINES
-    end
-    assert_equal "INPUTRC:1: unclosed if", e.message
-  end
-
-  def test_unmatched_else
-    e = assert_raise(Reline::Config::InvalidInputrc) do
-      @config.read_lines(<<~LINES.lines, "INPUTRC")
-        $else
-      LINES
-    end
-    assert_equal "INPUTRC:1: unmatched else", e.message
-  end
-
-  def test_unmatched_endif
-    e = assert_raise(Reline::Config::InvalidInputrc) do
-      @config.read_lines(<<~LINES.lines, "INPUTRC")
-        $endif
-      LINES
-    end
-    assert_equal "INPUTRC:1: unmatched endif", e.message
-  end
-
-  def test_default_key_bindings
-    @config.add_default_key_binding('abcd'.bytes, 'EFGH'.bytes)
-    @config.read_lines(<<~'LINES'.lines)
-      "abcd": "ABCD"
-      "ijkl": "IJKL"
-    LINES
-
-    expected = { 'abcd'.bytes => 'ABCD'.bytes, 'ijkl'.bytes => 'IJKL'.bytes }
-    assert_equal expected, @config.key_bindings
-  end
-
-  def test_additional_key_bindings
-    @config.read_lines(<<~'LINES'.lines)
-      "ef": "EF"
-      "gh": "GH"
-    LINES
-
-    expected = { 'ef'.bytes => 'EF'.bytes, 'gh'.bytes => 'GH'.bytes }
-    assert_equal expected, @config.key_bindings
-  end
-
-  def test_additional_key_bindings_with_nesting_and_comment_out
-    @config.read_lines(<<~'LINES'.lines)
-      #"ab": "AB"
-        #"cd": "cd"
-      "ef": "EF"
-        "gh": "GH"
-    LINES
-
-    expected = { 'ef'.bytes => 'EF'.bytes, 'gh'.bytes => 'GH'.bytes }
-    assert_equal expected, @config.key_bindings
-  end
-
-  def test_additional_key_bindings_for_other_keymap
-    @config.read_lines(<<~'LINES'.lines)
-      set keymap vi-command
-      "ab": "AB"
-      set keymap vi-insert
-      "cd": "CD"
-      set keymap emacs
-      "ef": "EF"
-      set editing-mode vi # keymap changes to be vi-insert
-    LINES
-
-    expected = { 'cd'.bytes => 'CD'.bytes }
-    assert_equal expected, @config.key_bindings
-  end
-
-  def test_additional_key_bindings_for_auxiliary_emacs_keymaps
-    @config.read_lines(<<~'LINES'.lines)
-      set keymap emacs
-      "ab": "AB"
-      set keymap emacs-standard
-      "cd": "CD"
-      set keymap emacs-ctlx
-      "ef": "EF"
-      set keymap emacs-meta
-      "gh": "GH"
-      set editing-mode emacs # keymap changes to be emacs
-    LINES
-
-    expected = {
-      'ab'.bytes => 'AB'.bytes,
-      'cd'.bytes => 'CD'.bytes,
-      "\C-xef".bytes => 'EF'.bytes,
-      "\egh".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
-
-  def test_empty_inputrc_env
-    inputrc_backup = ENV['INPUTRC']
-    ENV['INPUTRC'] = ''
-    assert_nothing_raised do
-      @config.read
-    end
-  ensure
-    ENV['INPUTRC'] = inputrc_backup
-  end
-
-  def test_inputrc
-    inputrc_backup = ENV['INPUTRC']
-    expected = "#{@tmpdir}/abcde"
-    ENV['INPUTRC'] = expected
-    assert_equal expected, @config.inputrc_path
-  ensure
-    ENV['INPUTRC'] = inputrc_backup
-  end
-
-  def test_inputrc_with_utf8
-    # This file is encoded by UTF-8 so this heredoc string is also UTF-8.
-    @config.read_lines(<<~'LINES'.lines)
-      set editing-mode vi
-      set vi-cmd-mode-string 🍸
-      set vi-ins-mode-string 🍶
-    LINES
-    assert_equal '🍸', @config.vi_cmd_mode_string
-    assert_equal '🍶', @config.vi_ins_mode_string
-  rescue Reline::ConfigEncodingConversionError
-    # do nothing
-  end
-
-  def test_inputrc_with_eucjp
-    @config.read_lines(<<~"LINES".encode(Encoding::EUC_JP).lines)
-      set editing-mode vi
-      set vi-cmd-mode-string ｫｬｯ
-      set vi-ins-mode-string 能
-    LINES
-    assert_equal 'ｫｬｯ'.encode(Reline.encoding_system_needs), @config.vi_cmd_mode_string
-    assert_equal '能'.encode(Reline.encoding_system_needs), @config.vi_ins_mode_string
-  rescue Reline::ConfigEncodingConversionError
-    # do nothing
-  end
-
-  def test_empty_inputrc
-    assert_nothing_raised do
-      @config.read_lines([])
-    end
-  end
-
-  def test_xdg_config_home
-    home_backup = ENV['HOME']
-    xdg_config_home_backup = ENV['XDG_CONFIG_HOME']
-    xdg_config_home = File.expand_path("#{@tmpdir}/.config/example_dir")
-    expected = File.expand_path("#{xdg_config_home}/readline/inputrc")
-    FileUtils.mkdir_p(File.dirname(expected))
-    FileUtils.touch(expected)
-    ENV['HOME'] = @tmpdir
-    ENV['XDG_CONFIG_HOME'] = xdg_config_home
-    assert_equal expected, @config.inputrc_path
-  ensure
-    FileUtils.rm(expected)
-    ENV['XDG_CONFIG_HOME'] = xdg_config_home_backup
-    ENV['HOME'] = home_backup
-  end
-
-  def test_empty_xdg_config_home
-    home_backup = ENV['HOME']
-    xdg_config_home_backup = ENV['XDG_CONFIG_HOME']
-    ENV['HOME'] = @tmpdir
-    ENV['XDG_CONFIG_HOME'] = ''
-    expected = File.expand_path('~/.config/readline/inputrc')
-    FileUtils.mkdir_p(File.dirname(expected))
-    FileUtils.touch(expected)
-    assert_equal expected, @config.inputrc_path
-  ensure
-    FileUtils.rm(expected)
-    ENV['XDG_CONFIG_HOME'] = xdg_config_home_backup
-    ENV['HOME'] = home_backup
-  end
-
-  def test_relative_xdg_config_home
-    home_backup = ENV['HOME']
-    xdg_config_home_backup = ENV['XDG_CONFIG_HOME']
-    ENV['HOME'] = @tmpdir
-    expected = File.expand_path('~/.config/readline/inputrc')
-    FileUtils.mkdir_p(File.dirname(expected))
-    FileUtils.touch(expected)
-    result = Dir.chdir(@tmpdir) do
-      xdg_config_home = ".config/example_dir"
-      ENV['XDG_CONFIG_HOME'] = xdg_config_home
-      inputrc = "#{xdg_config_home}/readline/inputrc"
-      FileUtils.mkdir_p(File.dirname(inputrc))
-      FileUtils.touch(inputrc)
-      @config.inputrc_path
-    end
-    assert_equal expected, result
-    FileUtils.rm(expected)
-    ENV['XDG_CONFIG_HOME'] = xdg_config_home_backup
-    ENV['HOME'] = home_backup
-  end
-end
-
diff --git a/test/reline/test_history.rb b/test/reline/test_history.rb
deleted file mode 100644
index ddf8fb14726b3b..00000000000000
--- a/test/reline/test_history.rb
+++ /dev/null
@@ -1,308 +0,0 @@
-require_relative 'helper'
-require "reline/history"
-
-class Reline::History::Test < Reline::TestCase
-  def setup
-    Reline.send(:test_mode)
-  end
-
-  def teardown
-    Reline.test_reset
-  end
-
-  def test_ancestors
-    assert_equal(Reline::History.ancestors.include?(Array), true)
-  end
-
-  def test_to_s
-    history = history_new
-    expected = "HISTORY"
-    assert_equal(expected, history.to_s)
-  end
-
-  def test_get
-    history, lines = lines = history_new_and_push_history(5)
-    lines.each_with_index do |s, i|
-      assert_external_string_equal(s, history[i])
-    end
-  end
-
-  def test_get__negative
-    history, lines = lines = history_new_and_push_history(5)
-    (1..5).each do |i|
-      assert_equal(lines[-i], history[-i])
-    end
-  end
-
-  def test_get__out_of_range
-    history, _ = history_new_and_push_history(5)
-    invalid_indexes = [5, 6, 100, -6, -7, -100]
-    invalid_indexes.each do |i|
-      assert_raise(IndexError, "i=<#{i}>") do
-        history[i]
-      end
-    end
-
-    invalid_indexes = [100_000_000_000_000_000_000,
-                       -100_000_000_000_000_000_000]
-    invalid_indexes.each do |i|
-      assert_raise(RangeError, "i=<#{i}>") do
-        history[i]
-      end
-    end
-  end
-
-  def test_set
-    begin
-      history, _ = history_new_and_push_history(5)
-      5.times do |i|
-        expected = "set: #{i}"
-        history[i] = expected
-        assert_external_string_equal(expected, history[i])
-      end
-    rescue NotImplementedError
-    end
-  end
-
-  def test_set__out_of_range
-    history = history_new
-    assert_raise(IndexError, NotImplementedError, "index=<0>") do
-      history[0] = "set: 0"
-    end
-
-    history, _ = history_new_and_push_history(5)
-    invalid_indexes = [5, 6, 100, -6, -7, -100]
-    invalid_indexes.each do |i|
-      assert_raise(IndexError, NotImplementedError, "index=<#{i}>") do
-        history[i] = "set: #{i}"
-      end
-    end
-
-    invalid_indexes = [100_000_000_000_000_000_000,
-                       -100_000_000_000_000_000_000]
-    invalid_indexes.each do |i|
-      assert_raise(RangeError, NotImplementedError, "index=<#{i}>") do
-        history[i] = "set: #{i}"
-      end
-    end
-  end
-
-  def test_push
-    history = history_new
-    5.times do |i|
-      s = i.to_s
-      assert_equal(history, history.push(s))
-      assert_external_string_equal(s, history[i])
-    end
-    assert_equal(5, history.length)
-  end
-
-  def test_push__operator
-    history = history_new
-    5.times do |i|
-      s = i.to_s
-      assert_equal(history, history << s)
-      assert_external_string_equal(s, history[i])
-    end
-    assert_equal(5, history.length)
-  end
-
-  def test_push__plural
-    history = history_new
-    assert_equal(history, history.push("0", "1", "2", "3", "4"))
-    (0..4).each do |i|
-      assert_external_string_equal(i.to_s, history[i])
-    end
-    assert_equal(5, history.length)
-
-    assert_equal(history, history.push("5", "6", "7", "8", "9"))
-    (5..9).each do |i|
-      assert_external_string_equal(i.to_s, history[i])
-    end
-    assert_equal(10, history.length)
-  end
-
-  def test_pop
-    history = history_new
-    begin
-      assert_equal(nil, history.pop)
-
-      history, lines = lines = history_new_and_push_history(5)
-      (1..5).each do |i|
-        assert_external_string_equal(lines[-i], history.pop)
-        assert_equal(lines.length - i, history.length)
-      end
-
-      assert_equal(nil, history.pop)
-    rescue NotImplementedError
-    end
-  end
-
-  def test_shift
-    history = history_new
-    begin
-      assert_equal(nil, history.shift)
-
-      history, lines = lines = history_new_and_push_history(5)
-      (0..4).each do |i|
-        assert_external_string_equal(lines[i], history.shift)
-        assert_equal(lines.length - (i + 1), history.length)
-      end
-
-      assert_equal(nil, history.shift)
-    rescue NotImplementedError
-    end
-  end
-
-  def test_each
-    history = history_new
-    e = history.each do |s|
-      assert(false) # not reachable
-    end
-    assert_equal(history, e)
-    history, lines = lines = history_new_and_push_history(5)
-    i = 0
-    e = history.each do |s|
-      assert_external_string_equal(history[i], s)
-      assert_external_string_equal(lines[i], s)
-      i += 1
-    end
-    assert_equal(history, e)
-  end
-
-  def test_each__enumerator
-    history = history_new
-    e = history.each
-    assert_instance_of(Enumerator, e)
-  end
-
-  def test_length
-    history = history_new
-    assert_equal(0, history.length)
-    push_history(history, 1)
-    assert_equal(1, history.length)
-    push_history(history, 4)
-    assert_equal(5, history.length)
-    history.clear
-    assert_equal(0, history.length)
-  end
-
-  def test_empty_p
-    history = history_new
-    2.times do
-      assert(history.empty?)
-      history.push("s")
-      assert_equal(false, history.empty?)
-      history.clear
-      assert(history.empty?)
-    end
-  end
-
-  def test_delete_at
-    begin
-      history, lines = lines = history_new_and_push_history(5)
-      (0..4).each do |i|
-        assert_external_string_equal(lines[i], history.delete_at(0))
-      end
-      assert(history.empty?)
-
-      history, lines = lines = history_new_and_push_history(5)
-      (1..5).each do |i|
-        assert_external_string_equal(lines[lines.length - i], history.delete_at(-1))
-      end
-      assert(history.empty?)
-
-      history, lines = lines = history_new_and_push_history(5)
-      assert_external_string_equal(lines[0], history.delete_at(0))
-      assert_external_string_equal(lines[4], history.delete_at(3))
-      assert_external_string_equal(lines[1], history.delete_at(0))
-      assert_external_string_equal(lines[3], history.delete_at(1))
-      assert_external_string_equal(lines[2], history.delete_at(0))
-      assert(history.empty?)
-    rescue NotImplementedError
-    end
-  end
-
-  def test_delete_at__out_of_range
-    history = history_new
-    assert_raise(IndexError, NotImplementedError, "index=<0>") do
-      history.delete_at(0)
-    end
-
-    history, _ = history_new_and_push_history(5)
-    invalid_indexes = [5, 6, 100, -6, -7, -100]
-    invalid_indexes.each do |i|
-      assert_raise(IndexError, NotImplementedError, "index=<#{i}>") do
-        history.delete_at(i)
-      end
-    end
-
-    invalid_indexes = [100_000_000_000_000_000_000,
-                       -100_000_000_000_000_000_000]
-    invalid_indexes.each do |i|
-      assert_raise(RangeError, NotImplementedError, "index=<#{i}>") do
-        history.delete_at(i)
-      end
-    end
-  end
-
-  def test_history_size_zero
-    history = history_new(history_size: 0)
-    assert_equal 0, history.size
-    history << 'aa'
-    history << 'bb'
-    assert_equal 0, history.size
-    history.push(*%w{aa bb cc})
-    assert_equal 0, history.size
-  end
-
-  def test_history_size_negative_unlimited
-    history = history_new(history_size: -1)
-    assert_equal 0, history.size
-    history << 'aa'
-    history << 'bb'
-    assert_equal 2, history.size
-    history.push(*%w{aa bb cc})
-    assert_equal 5, history.size
-  end
-
-  private
-
-  def history_new(history_size: 10)
-    Reline::History.new(Struct.new(:history_size).new(history_size))
-  end
-
-  def push_history(history, num)
-    lines = []
-    num.times do |i|
-      s = "a"
-      i.times do
-        s = s.succ
-      end
-      lines.push("#{i + 1}:#{s}")
-    end
-    history.push(*lines)
-    return history, lines
-  end
-
-  def history_new_and_push_history(num)
-    history = history_new(history_size: 100)
-    return push_history(history, num)
-  end
-
-  def assert_external_string_equal(expected, actual)
-    assert_equal(expected, actual)
-    mes = "Encoding of #{actual.inspect} is expected #{get_default_internal_encoding.inspect} but #{actual.encoding}"
-    assert_equal(get_default_internal_encoding, actual.encoding, mes)
-  end
-
-  def get_default_internal_encoding
-    if encoding = Reline.core.encoding
-      encoding
-    elsif 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_key_actor_emacs.rb b/test/reline/test_key_actor_emacs.rb
deleted file mode 100644
index 4575e51eb20079..00000000000000
--- a/test/reline/test_key_actor_emacs.rb
+++ /dev/null
@@ -1,2379 +0,0 @@
-require_relative 'helper'
-
-class Reline::KeyActor::Emacs::Test < Reline::TestCase
-  def setup
-    Reline.send(:test_mode)
-    @prompt = '> '
-    @config = Reline::Config.new # Emacs mode is default
-    @config.autocompletion = false
-    Reline::HISTORY.instance_variable_set(:@config, @config)
-    Reline::HISTORY.clear
-    @encoding = Reline.core.encoding
-    @line_editor = Reline::LineEditor.new(@config, @encoding)
-    @line_editor.reset(@prompt, encoding: @encoding)
-  end
-
-  def teardown
-    Reline.test_reset
-  end
-
-  def test_ed_insert_one
-    input_keys('a')
-    assert_line('a')
-    assert_byte_pointer_size('a')
-    assert_cursor(1)
-    assert_cursor_max(1)
-  end
-
-  def test_ed_insert_two
-    input_keys('ab')
-    assert_line('ab')
-    assert_byte_pointer_size('ab')
-    assert_cursor(2)
-    assert_cursor_max(2)
-  end
-
-  def test_ed_insert_mbchar_one
-    input_keys('か')
-    assert_line('か')
-    assert_byte_pointer_size('か')
-    assert_cursor(2)
-    assert_cursor_max(2)
-  end
-
-  def test_ed_insert_mbchar_two
-    input_keys('かき')
-    assert_line('かき')
-    assert_byte_pointer_size('かき')
-    assert_cursor(4)
-    assert_cursor_max(4)
-  end
-
-  def test_ed_insert_for_mbchar_by_plural_code_points
-    input_keys("か\u3099")
-    assert_line("か\u3099")
-    assert_byte_pointer_size("か\u3099")
-    assert_cursor(2)
-    assert_cursor_max(2)
-  end
-
-  def test_ed_insert_for_plural_mbchar_by_plural_code_points
-    input_keys("か\u3099き\u3099")
-    assert_line("か\u3099き\u3099")
-    assert_byte_pointer_size("か\u3099き\u3099")
-    assert_cursor(4)
-    assert_cursor_max(4)
-  end
-
-  def test_move_next_and_prev
-    input_keys('abd')
-    assert_byte_pointer_size('abd')
-    assert_cursor(3)
-    assert_cursor_max(3)
-    input_keys("\C-b", false)
-    assert_byte_pointer_size('ab')
-    assert_cursor(2)
-    assert_cursor_max(3)
-    input_keys("\C-b", false)
-    assert_byte_pointer_size('a')
-    assert_cursor(1)
-    assert_cursor_max(3)
-    input_keys("\C-f", false)
-    assert_byte_pointer_size('ab')
-    assert_cursor(2)
-    assert_cursor_max(3)
-    input_keys('c')
-    assert_byte_pointer_size('abc')
-    assert_cursor(3)
-    assert_cursor_max(4)
-    assert_line('abcd')
-  end
-
-  def test_move_next_and_prev_for_mbchar
-    input_keys('かきけ')
-    assert_byte_pointer_size('かきけ')
-    assert_cursor(6)
-    assert_cursor_max(6)
-    input_keys("\C-b", false)
-    assert_byte_pointer_size('かき')
-    assert_cursor(4)
-    assert_cursor_max(6)
-    input_keys("\C-b", false)
-    assert_byte_pointer_size('か')
-    assert_cursor(2)
-    assert_cursor_max(6)
-    input_keys("\C-f", false)
-    assert_byte_pointer_size('かき')
-    assert_cursor(4)
-    assert_cursor_max(6)
-    input_keys('く')
-    assert_byte_pointer_size('かきく')
-    assert_cursor(6)
-    assert_cursor_max(8)
-    assert_line('かきくけ')
-  end
-
-  def test_move_next_and_prev_for_mbchar_by_plural_code_points
-    input_keys("か\u3099き\u3099け\u3099")
-    assert_byte_pointer_size("か\u3099き\u3099け\u3099")
-    assert_cursor(6)
-    assert_cursor_max(6)
-    input_keys("\C-b", false)
-    assert_byte_pointer_size("か\u3099き\u3099")
-    assert_cursor(4)
-    assert_cursor_max(6)
-    input_keys("\C-b", false)
-    assert_byte_pointer_size("か\u3099")
-    assert_cursor(2)
-    assert_cursor_max(6)
-    input_keys("\C-f", false)
-    assert_byte_pointer_size("か\u3099き\u3099")
-    assert_cursor(4)
-    assert_cursor_max(6)
-    input_keys("く\u3099")
-    assert_byte_pointer_size("か\u3099き\u3099く\u3099")
-    assert_cursor(6)
-    assert_cursor_max(8)
-    assert_line("か\u3099き\u3099く\u3099け\u3099")
-  end
-
-  def test_move_to_beg_end
-    input_keys('bcd')
-    assert_byte_pointer_size('bcd')
-    assert_cursor(3)
-    assert_cursor_max(3)
-    input_keys("\C-a", false)
-    assert_byte_pointer_size('')
-    assert_cursor(0)
-    assert_cursor_max(3)
-    input_keys('a')
-    assert_byte_pointer_size('a')
-    assert_cursor(1)
-    assert_cursor_max(4)
-    input_keys("\C-e", false)
-    assert_byte_pointer_size('abcd')
-    assert_cursor(4)
-    assert_cursor_max(4)
-    input_keys('e')
-    assert_byte_pointer_size('abcde')
-    assert_cursor(5)
-    assert_cursor_max(5)
-    assert_line('abcde')
-  end
-
-  def test_ed_newline_with_cr
-    input_keys('ab')
-    assert_byte_pointer_size('ab')
-    assert_cursor(2)
-    assert_cursor_max(2)
-    refute(@line_editor.finished?)
-    input_keys("\C-m", false)
-    assert_line('ab')
-    assert(@line_editor.finished?)
-  end
-
-  def test_ed_newline_with_lf
-    input_keys('ab')
-    assert_byte_pointer_size('ab')
-    assert_cursor(2)
-    assert_cursor_max(2)
-    refute(@line_editor.finished?)
-    input_keys("\C-j", false)
-    assert_line('ab')
-    assert(@line_editor.finished?)
-  end
-
-  def test_em_delete_prev_char
-    input_keys('ab')
-    assert_byte_pointer_size('ab')
-    assert_cursor(2)
-    assert_cursor_max(2)
-    input_keys("\C-h", false)
-    assert_byte_pointer_size('a')
-    assert_cursor(1)
-    assert_cursor_max(1)
-    assert_line('a')
-  end
-
-  def test_em_delete_prev_char_for_mbchar
-    input_keys('かき')
-    assert_byte_pointer_size('かき')
-    assert_cursor(4)
-    assert_cursor_max(4)
-    input_keys("\C-h", false)
-    assert_byte_pointer_size('か')
-    assert_cursor(2)
-    assert_cursor_max(2)
-    assert_line('か')
-  end
-
-  def test_em_delete_prev_char_for_mbchar_by_plural_code_points
-    input_keys("か\u3099き\u3099")
-    assert_byte_pointer_size("か\u3099き\u3099")
-    assert_cursor(4)
-    assert_cursor_max(4)
-    input_keys("\C-h", false)
-    assert_byte_pointer_size("か\u3099")
-    assert_cursor(2)
-    assert_cursor_max(2)
-    assert_line("か\u3099")
-  end
-
-  def test_ed_quoted_insert
-    input_keys("ab\C-v\C-acd")
-    assert_line("ab\C-acd")
-    assert_byte_pointer_size("ab\C-acd")
-    assert_cursor(6)
-    assert_cursor_max(6)
-    input_keys("\C-q\C-b")
-    assert_line("ab\C-acd\C-b")
-    assert_byte_pointer_size("ab\C-acd\C-b")
-    assert_cursor(8)
-    assert_cursor_max(8)
-  end
-
-  def test_ed_kill_line
-    input_keys("\C-k", false)
-    assert_byte_pointer_size('')
-    assert_cursor(0)
-    assert_cursor_max(0)
-    assert_line('')
-    input_keys('abc')
-    assert_byte_pointer_size('abc')
-    assert_cursor(3)
-    assert_cursor_max(3)
-    input_keys("\C-k", false)
-    assert_byte_pointer_size('abc')
-    assert_cursor(3)
-    assert_cursor_max(3)
-    assert_line('abc')
-    input_keys("\C-b\C-k", false)
-    assert_byte_pointer_size('ab')
-    assert_cursor(2)
-    assert_cursor_max(2)
-    assert_line('ab')
-  end
-
-  def test_em_kill_line
-    @line_editor.input_key(Reline::Key.new(:em_kill_line, :em_kill_line, false))
-    assert_byte_pointer_size('')
-    assert_cursor(0)
-    assert_cursor_max(0)
-    assert_line('')
-    input_keys('abc')
-    @line_editor.input_key(Reline::Key.new(:em_kill_line, :em_kill_line, false))
-    assert_byte_pointer_size('')
-    assert_cursor(0)
-    assert_cursor_max(0)
-    assert_line('')
-    input_keys('abc')
-    input_keys("\C-b", false)
-    @line_editor.input_key(Reline::Key.new(:em_kill_line, :em_kill_line, false))
-    assert_byte_pointer_size('')
-    assert_cursor(0)
-    assert_cursor_max(0)
-    assert_line('')
-    input_keys('abc')
-    input_keys("\C-a", false)
-    @line_editor.input_key(Reline::Key.new(:em_kill_line, :em_kill_line, false))
-    assert_byte_pointer_size('')
-    assert_cursor(0)
-    assert_cursor_max(0)
-    assert_line('')
-  end
-
-  def test_ed_move_to_beg
-    input_keys('abd')
-    assert_byte_pointer_size('abd')
-    assert_cursor(3)
-    assert_cursor_max(3)
-    input_keys("\C-b", false)
-    assert_byte_pointer_size('ab')
-    assert_cursor(2)
-    assert_cursor_max(3)
-    input_keys('c')
-    assert_byte_pointer_size('abc')
-    assert_cursor(3)
-    assert_cursor_max(4)
-    input_keys("\C-a", false)
-    assert_byte_pointer_size('')
-    assert_cursor(0)
-    assert_cursor_max(4)
-    input_keys('012')
-    assert_byte_pointer_size('012')
-    assert_cursor(3)
-    assert_cursor_max(7)
-    assert_line('012abcd')
-    input_keys("\C-a", false)
-    assert_byte_pointer_size('')
-    assert_cursor(0)
-    assert_cursor_max(7)
-    input_keys('ABC')
-    assert_byte_pointer_size('ABC')
-    assert_cursor(3)
-    assert_cursor_max(10)
-    assert_line('ABC012abcd')
-    input_keys("\C-f" * 10 + "\C-a", false)
-    assert_byte_pointer_size('')
-    assert_cursor(0)
-    assert_cursor_max(10)
-    input_keys('a')
-    assert_byte_pointer_size('a')
-    assert_cursor(1)
-    assert_cursor_max(11)
-    assert_line('aABC012abcd')
-  end
-
-  def test_ed_move_to_beg_with_blank
-    input_keys('  abc')
-    assert_byte_pointer_size('  abc')
-    assert_cursor(5)
-    assert_cursor_max(5)
-    input_keys("\C-a", false)
-    assert_byte_pointer_size('')
-    assert_cursor(0)
-    assert_cursor_max(5)
-  end
-
-  def test_ed_move_to_end
-    input_keys('abd')
-    assert_byte_pointer_size('abd')
-    assert_cursor(3)
-    assert_cursor_max(3)
-    input_keys("\C-b", false)
-    assert_byte_pointer_size('ab')
-    assert_cursor(2)
-    assert_cursor_max(3)
-    input_keys('c')
-    assert_byte_pointer_size('abc')
-    assert_cursor(3)
-    assert_cursor_max(4)
-    input_keys("\C-e", false)
-    assert_byte_pointer_size('abcd')
-    assert_cursor(4)
-    assert_cursor_max(4)
-    input_keys('012')
-    assert_byte_pointer_size('abcd012')
-    assert_cursor(7)
-    assert_cursor_max(7)
-    assert_line('abcd012')
-    input_keys("\C-e", false)
-    assert_byte_pointer_size('abcd012')
-    assert_cursor(7)
-    assert_cursor_max(7)
-    input_keys('ABC')
-    assert_byte_pointer_size('abcd012ABC')
-    assert_cursor(10)
-    assert_cursor_max(10)
-    assert_line('abcd012ABC')
-    input_keys("\C-b" * 10 + "\C-e", false)
-    assert_byte_pointer_size('abcd012ABC')
-    assert_cursor(10)
-    assert_cursor_max(10)
-    input_keys('a')
-    assert_byte_pointer_size('abcd012ABCa')
-    assert_cursor(11)
-    assert_cursor_max(11)
-    assert_line('abcd012ABCa')
-  end
-
-  def test_em_delete
-    input_keys('ab')
-    assert_byte_pointer_size('ab')
-    assert_cursor(2)
-    assert_cursor_max(2)
-    input_keys("\C-a", false)
-    assert_byte_pointer_size('')
-    assert_cursor(0)
-    assert_cursor_max(2)
-    input_keys("\C-d", false)
-    assert_byte_pointer_size('')
-    assert_cursor(0)
-    assert_cursor_max(1)
-    assert_line('b')
-  end
-
-  def test_em_delete_for_mbchar
-    input_keys('かき')
-    assert_byte_pointer_size('かき')
-    assert_cursor(4)
-    assert_cursor_max(4)
-    input_keys("\C-a", false)
-    assert_byte_pointer_size('')
-    assert_cursor(0)
-    assert_cursor_max(4)
-    input_keys("\C-d", false)
-    assert_byte_pointer_size('')
-    assert_cursor(0)
-    assert_cursor_max(2)
-    assert_byte_pointer_size('')
-    assert_cursor(0)
-    assert_cursor_max(2)
-    assert_line('き')
-  end
-
-  def test_em_delete_for_mbchar_by_plural_code_points
-    input_keys("か\u3099き\u3099")
-    assert_byte_pointer_size("か\u3099き\u3099")
-    assert_cursor(4)
-    assert_cursor_max(4)
-    input_keys("\C-a", false)
-    assert_byte_pointer_size('')
-    assert_cursor(0)
-    assert_cursor_max(4)
-    input_keys("\C-d", false)
-    assert_byte_pointer_size('')
-    assert_cursor(0)
-    assert_cursor_max(2)
-    assert_line("き\u3099")
-  end
-
-  def test_em_delete_ends_editing
-    input_keys("\C-d") # quit from inputing
-    assert_line(nil)
-    assert(@line_editor.finished?)
-  end
-
-  def test_ed_clear_screen
-    refute(@line_editor.instance_variable_get(:@cleared))
-    input_keys("\C-l", false)
-    assert(@line_editor.instance_variable_get(:@cleared))
-  end
-
-  def test_ed_clear_screen_with_inputed
-    input_keys('abc')
-    input_keys("\C-b", false)
-    refute(@line_editor.instance_variable_get(:@cleared))
-    assert_byte_pointer_size('ab')
-    assert_cursor(2)
-    assert_cursor_max(3)
-    input_keys("\C-l", false)
-    assert(@line_editor.instance_variable_get(:@cleared))
-    assert_byte_pointer_size('ab')
-    assert_cursor(2)
-    assert_cursor_max(3)
-    assert_line('abc')
-  end
-
-  def test_key_delete
-    input_keys('abc')
-    assert_cursor(3)
-    assert_cursor_max(3)
-    @line_editor.input_key(Reline::Key.new(:key_delete, :key_delete, false))
-    assert_cursor(3)
-    assert_cursor_max(3)
-    assert_line('abc')
-  end
-
-  def test_key_delete_does_not_end_editing
-    @line_editor.input_key(Reline::Key.new(:key_delete, :key_delete, false))
-    assert_cursor(0)
-    assert_cursor_max(0)
-    assert_line('')
-    refute(@line_editor.finished?)
-  end
-
-  def test_key_delete_preserves_cursor
-    input_keys('abc')
-    input_keys("\C-b", false)
-    assert_cursor(2)
-    assert_cursor_max(3)
-    @line_editor.input_key(Reline::Key.new(:key_delete, :key_delete, false))
-    assert_cursor(2)
-    assert_cursor_max(2)
-    assert_line('ab')
-  end
-
-  def test_em_next_word
-    assert_byte_pointer_size('')
-    assert_cursor(0)
-    input_keys('abc def{bbb}ccc')
-    input_keys("\C-a\M-F", false)
-    assert_byte_pointer_size('abc')
-    assert_cursor(3)
-    input_keys("\M-F", false)
-    assert_byte_pointer_size('abc def')
-    assert_cursor(7)
-    input_keys("\M-F", false)
-    assert_byte_pointer_size('abc def{bbb')
-    assert_cursor(11)
-    input_keys("\M-F", false)
-    assert_byte_pointer_size('abc def{bbb}ccc')
-    assert_cursor(15)
-    input_keys("\M-F", false)
-    assert_byte_pointer_size('abc def{bbb}ccc')
-    assert_cursor(15)
-  end
-
-  def test_em_next_word_for_mbchar
-    assert_cursor(0)
-    input_keys('あいう かきく{さしす}たちつ')
-    input_keys("\C-a\M-F", false)
-    assert_byte_pointer_size('あいう')
-    assert_cursor(6)
-    input_keys("\M-F", false)
-    assert_byte_pointer_size('あいう かきく')
-    assert_cursor(13)
-    input_keys("\M-F", false)
-    assert_byte_pointer_size('あいう かきく{さしす')
-    assert_cursor(20)
-    input_keys("\M-F", false)
-    assert_byte_pointer_size('あいう かきく{さしす}たちつ')
-    assert_cursor(27)
-    input_keys("\M-F", false)
-    assert_byte_pointer_size('あいう かきく{さしす}たちつ')
-    assert_cursor(27)
-  end
-
-  def test_em_next_word_for_mbchar_by_plural_code_points
-    assert_cursor(0)
-    input_keys("あいう か\u3099き\u3099く\u3099{さしす}たちつ")
-    input_keys("\C-a\M-F", false)
-    assert_byte_pointer_size("あいう")
-    assert_cursor(6)
-    input_keys("\M-F", false)
-    assert_byte_pointer_size("あいう か\u3099き\u3099く\u3099")
-    assert_cursor(13)
-    input_keys("\M-F", false)
-    assert_byte_pointer_size("あいう か\u3099き\u3099く\u3099{さしす")
-    assert_cursor(20)
-    input_keys("\M-F", false)
-    assert_byte_pointer_size("あいう か\u3099き\u3099く\u3099{さしす}たちつ")
-    assert_cursor(27)
-    input_keys("\M-F", false)
-    assert_byte_pointer_size("あいう か\u3099き\u3099く\u3099{さしす}たちつ")
-    assert_cursor(27)
-  end
-
-  def test_em_prev_word
-    input_keys('abc def{bbb}ccc')
-    assert_byte_pointer_size('abc def{bbb}ccc')
-    assert_cursor(15)
-    input_keys("\M-B", false)
-    assert_byte_pointer_size('abc def{bbb}')
-    assert_cursor(12)
-    input_keys("\M-B", false)
-    assert_byte_pointer_size('abc def{')
-    assert_cursor(8)
-    input_keys("\M-B", false)
-    assert_byte_pointer_size('abc ')
-    assert_cursor(4)
-    input_keys("\M-B", false)
-    assert_byte_pointer_size('')
-    assert_cursor(0)
-    input_keys("\M-B", false)
-    assert_byte_pointer_size('')
-    assert_cursor(0)
-  end
-
-  def test_em_prev_word_for_mbchar
-    input_keys('あいう かきく{さしす}たちつ')
-    assert_byte_pointer_size('あいう かきく{さしす}たちつ')
-    assert_cursor(27)
-    input_keys("\M-B", false)
-    assert_byte_pointer_size('あいう かきく{さしす}')
-    assert_cursor(21)
-    input_keys("\M-B", false)
-    assert_byte_pointer_size('あいう かきく{')
-    assert_cursor(14)
-    input_keys("\M-B", false)
-    assert_byte_pointer_size('あいう ')
-    assert_cursor(7)
-    input_keys("\M-B", false)
-    assert_byte_pointer_size('')
-    assert_cursor(0)
-    input_keys("\M-B", false)
-    assert_byte_pointer_size('')
-    assert_cursor(0)
-  end
-
-  def test_em_prev_word_for_mbchar_by_plural_code_points
-    input_keys("あいう か\u3099き\u3099く\u3099{さしす}たちつ")
-    assert_byte_pointer_size("あいう か\u3099き\u3099く\u3099{さしす}たちつ")
-    assert_cursor(27)
-    input_keys("\M-B", false)
-    assert_byte_pointer_size("あいう か\u3099き\u3099く\u3099{さしす}")
-    assert_cursor(21)
-    input_keys("\M-B", false)
-    assert_byte_pointer_size("あいう か\u3099き\u3099く\u3099{")
-    assert_cursor(14)
-    input_keys("\M-B", false)
-    assert_byte_pointer_size('あいう ')
-    assert_cursor(7)
-    input_keys("\M-B", false)
-    assert_byte_pointer_size('')
-    assert_cursor(0)
-    input_keys("\M-B", false)
-    assert_byte_pointer_size('')
-    assert_cursor(0)
-  end
-
-  def test_em_delete_next_word
-    input_keys('abc def{bbb}ccc')
-    input_keys("\C-a", false)
-    assert_byte_pointer_size('')
-    assert_cursor(0)
-    assert_cursor_max(15)
-    input_keys("\M-d", false)
-    assert_byte_pointer_size('')
-    assert_cursor(0)
-    assert_cursor_max(12)
-    assert_line(' def{bbb}ccc')
-    input_keys("\M-d", false)
-    assert_byte_pointer_size('')
-    assert_cursor(0)
-    assert_cursor_max(8)
-    assert_line('{bbb}ccc')
-    input_keys("\M-d", false)
-    assert_byte_pointer_size('')
-    assert_cursor(0)
-    assert_cursor_max(4)
-    assert_line('}ccc')
-    input_keys("\M-d", false)
-    assert_byte_pointer_size('')
-    assert_cursor(0)
-    assert_cursor_max(0)
-    assert_line('')
-  end
-
-  def test_em_delete_next_word_for_mbchar
-    input_keys('あいう かきく{さしす}たちつ')
-    input_keys("\C-a", false)
-    assert_byte_pointer_size('')
-    assert_cursor(0)
-    assert_cursor_max(27)
-    input_keys("\M-d", false)
-    assert_byte_pointer_size('')
-    assert_cursor(0)
-    assert_cursor_max(21)
-    assert_line(' かきく{さしす}たちつ')
-    input_keys("\M-d", false)
-    assert_byte_pointer_size('')
-    assert_cursor(0)
-    assert_cursor_max(14)
-    assert_line('{さしす}たちつ')
-    input_keys("\M-d", false)
-    assert_byte_pointer_size('')
-    assert_cursor(0)
-    assert_cursor_max(7)
-    assert_line('}たちつ')
-    input_keys("\M-d", false)
-    assert_byte_pointer_size('')
-    assert_cursor(0)
-    assert_cursor_max(0)
-    assert_line('')
-  end
-
-  def test_em_delete_next_word_for_mbchar_by_plural_code_points
-    input_keys("あいう か\u3099き\u3099く\u3099{さしす}たちつ")
-    input_keys("\C-a", false)
-    assert_byte_pointer_size('')
-    assert_cursor(0)
-    assert_cursor_max(27)
-    assert_byte_pointer_size('')
-    assert_cursor(0)
-    assert_cursor_max(27)
-    input_keys("\M-d", false)
-    assert_byte_pointer_size('')
-    assert_cursor(0)
-    assert_cursor_max(21)
-    assert_line(" か\u3099き\u3099く\u3099{さしす}たちつ")
-    input_keys("\M-d", false)
-    assert_byte_pointer_size('')
-    assert_cursor(0)
-    assert_cursor_max(14)
-    assert_line('{さしす}たちつ')
-    input_keys("\M-d", false)
-    assert_byte_pointer_size('')
-    assert_cursor(0)
-    assert_cursor_max(7)
-    assert_line('}たちつ')
-    input_keys("\M-d", false)
-    assert_byte_pointer_size('')
-    assert_cursor(0)
-    assert_cursor_max(0)
-    assert_line('')
-  end
-
-  def test_ed_delete_prev_word
-    input_keys('abc def{bbb}ccc')
-    assert_byte_pointer_size('abc def{bbb}ccc')
-    assert_cursor(15)
-    assert_cursor_max(15)
-    input_keys("\M-\C-H", false)
-    assert_byte_pointer_size('abc def{bbb}')
-    assert_cursor(12)
-    assert_cursor_max(12)
-    assert_line('abc def{bbb}')
-    input_keys("\M-\C-H", false)
-    assert_byte_pointer_size('abc def{')
-    assert_cursor(8)
-    assert_cursor_max(8)
-    assert_line('abc def{')
-    input_keys("\M-\C-H", false)
-    assert_byte_pointer_size('abc ')
-    assert_cursor(4)
-    assert_cursor_max(4)
-    assert_line('abc ')
-    input_keys("\M-\C-H", false)
-    assert_byte_pointer_size('')
-    assert_cursor(0)
-    assert_cursor_max(0)
-    assert_line('')
-  end
-
-  def test_ed_delete_prev_word_for_mbchar
-    input_keys('あいう かきく{さしす}たちつ')
-    assert_byte_pointer_size('あいう かきく{さしす}たちつ')
-    assert_cursor(27)
-    assert_cursor_max(27)
-    input_keys("\M-\C-H", false)
-    assert_byte_pointer_size('あいう かきく{さしす}')
-    assert_cursor(21)
-    assert_cursor_max(21)
-    assert_line('あいう かきく{さしす}')
-    input_keys("\M-\C-H", false)
-    assert_byte_pointer_size('あいう かきく{')
-    assert_cursor(14)
-    assert_cursor_max(14)
-    assert_line('あいう かきく{')
-    input_keys("\M-\C-H", false)
-    assert_byte_pointer_size('あいう ')
-    assert_cursor(7)
-    assert_cursor_max(7)
-    assert_line('あいう ')
-    input_keys("\M-\C-H", false)
-    assert_byte_pointer_size('')
-    assert_cursor(0)
-    assert_cursor_max(0)
-    assert_line('')
-  end
-
-  def test_ed_delete_prev_word_for_mbchar_by_plural_code_points
-    input_keys("あいう か\u3099き\u3099く\u3099{さしす}たちつ")
-    assert_byte_pointer_size("あいう か\u3099き\u3099く\u3099{さしす}たちつ")
-    assert_cursor(27)
-    assert_cursor_max(27)
-    input_keys("\M-\C-H", false)
-    assert_byte_pointer_size("あいう か\u3099き\u3099く\u3099{さしす}")
-    assert_cursor(21)
-    assert_cursor_max(21)
-    assert_line("あいう か\u3099き\u3099く\u3099{さしす}")
-    input_keys("\M-\C-H", false)
-    assert_byte_pointer_size("あいう か\u3099き\u3099く\u3099{")
-    assert_cursor(14)
-    assert_cursor_max(14)
-    assert_line("あいう か\u3099き\u3099く\u3099{")
-    input_keys("\M-\C-H", false)
-    assert_byte_pointer_size("あいう ")
-    assert_cursor(7)
-    assert_cursor_max(7)
-    assert_line('あいう ')
-    input_keys("\M-\C-H", false)
-    assert_byte_pointer_size('')
-    assert_cursor(0)
-    assert_cursor_max(0)
-    assert_line('')
-  end
-
-  def test_ed_transpose_chars
-    input_keys('abc')
-    input_keys("\C-a", false)
-    assert_byte_pointer_size('')
-    assert_cursor(0)
-    assert_cursor_max(3)
-    input_keys("\C-t", false)
-    assert_byte_pointer_size('')
-    assert_cursor(0)
-    assert_cursor_max(3)
-    assert_line('abc')
-    input_keys("\C-f\C-t", false)
-    assert_byte_pointer_size('ba')
-    assert_cursor(2)
-    assert_cursor_max(3)
-    assert_line('bac')
-    input_keys("\C-t", false)
-    assert_byte_pointer_size('bca')
-    assert_cursor(3)
-    assert_cursor_max(3)
-    assert_line('bca')
-    input_keys("\C-t", false)
-    assert_byte_pointer_size('bac')
-    assert_cursor(3)
-    assert_cursor_max(3)
-    assert_line('bac')
-  end
-
-  def test_ed_transpose_chars_for_mbchar
-    input_keys('あかさ')
-    input_keys("\C-a", false)
-    assert_byte_pointer_size('')
-    assert_cursor(0)
-    assert_cursor_max(6)
-    input_keys("\C-t", false)
-    assert_byte_pointer_size('')
-    assert_cursor(0)
-    assert_cursor_max(6)
-    assert_line('あかさ')
-    input_keys("\C-f\C-t", false)
-    assert_byte_pointer_size('かあ')
-    assert_cursor(4)
-    assert_cursor_max(6)
-    assert_line('かあさ')
-    input_keys("\C-t", false)
-    assert_byte_pointer_size('かさあ')
-    assert_cursor(6)
-    assert_cursor_max(6)
-    assert_line('かさあ')
-    input_keys("\C-t", false)
-    assert_byte_pointer_size('かあさ')
-    assert_cursor(6)
-    assert_cursor_max(6)
-    assert_line('かあさ')
-  end
-
-  def test_ed_transpose_chars_for_mbchar_by_plural_code_points
-    input_keys("あか\u3099さ")
-    input_keys("\C-a", false)
-    assert_byte_pointer_size('')
-    assert_cursor(0)
-    assert_cursor_max(6)
-    input_keys("\C-t", false)
-    assert_byte_pointer_size('')
-    assert_cursor(0)
-    assert_cursor_max(6)
-    assert_line("あか\u3099さ")
-    input_keys("\C-f\C-t", false)
-    assert_byte_pointer_size("か\u3099あ")
-    assert_cursor(4)
-    assert_cursor_max(6)
-    assert_line("か\u3099あさ")
-    input_keys("\C-t", false)
-    assert_byte_pointer_size("か\u3099さあ")
-    assert_cursor(6)
-    assert_cursor_max(6)
-    assert_line("か\u3099さあ")
-    input_keys("\C-t", false)
-    assert_byte_pointer_size("か\u3099あさ")
-    assert_cursor(6)
-    assert_cursor_max(6)
-    assert_line("か\u3099あさ")
-  end
-
-  def test_ed_transpose_words
-    input_keys('abc def')
-    assert_line('abc def')
-    assert_byte_pointer_size('abc def')
-    assert_cursor(7)
-    assert_cursor_max(7)
-    input_keys("\M-t", false)
-    assert_line('def abc')
-    assert_byte_pointer_size('def abc')
-    assert_cursor(7)
-    assert_cursor_max(7)
-    input_keys("\C-a\C-k", false)
-    input_keys(' abc  def   ')
-    input_keys("\C-b" * 4, false)
-    assert_line(' abc  def   ')
-    assert_byte_pointer_size(' abc  de')
-    assert_cursor(8)
-    assert_cursor_max(12)
-    input_keys("\M-t", false)
-    assert_line(' def  abc   ')
-    assert_byte_pointer_size(' def  abc')
-    assert_cursor(9)
-    assert_cursor_max(12)
-    input_keys("\C-a\C-k", false)
-    input_keys(' abc  def   ')
-    input_keys("\C-b" * 6, false)
-    assert_line(' abc  def   ')
-    assert_byte_pointer_size(' abc  ')
-    assert_cursor(6)
-    assert_cursor_max(12)
-    input_keys("\M-t", false)
-    assert_line(' def  abc   ')
-    assert_byte_pointer_size(' def  abc')
-    assert_cursor(9)
-    assert_cursor_max(12)
-    input_keys("\M-t", false)
-    assert_line(' abc     def')
-    assert_byte_pointer_size(' abc     def')
-    assert_cursor(12)
-    assert_cursor_max(12)
-  end
-
-  def test_ed_transpose_words_for_mbchar
-    input_keys('あいう かきく')
-    assert_line('あいう かきく')
-    assert_byte_pointer_size('あいう かきく')
-    assert_cursor(13)
-    assert_cursor_max(13)
-    input_keys("\M-t", false)
-    assert_line('かきく あいう')
-    assert_byte_pointer_size('かきく あいう')
-    assert_cursor(13)
-    assert_cursor_max(13)
-    input_keys("\C-a\C-k", false)
-    input_keys(' あいう  かきく   ')
-    input_keys("\C-b" * 4, false)
-    assert_line(' あいう  かきく   ')
-    assert_byte_pointer_size(' あいう  かき')
-    assert_cursor(13)
-    assert_cursor_max(18)
-    input_keys("\M-t", false)
-    assert_line(' かきく  あいう   ')
-    assert_byte_pointer_size(' かきく  あいう')
-    assert_cursor(15)
-    assert_cursor_max(18)
-    input_keys("\C-a\C-k", false)
-    input_keys(' あいう  かきく   ')
-    input_keys("\C-b" * 6, false)
-    assert_line(' あいう  かきく   ')
-    assert_byte_pointer_size(' あいう  ')
-    assert_cursor(9)
-    assert_cursor_max(18)
-    input_keys("\M-t", false)
-    assert_line(' かきく  あいう   ')
-    assert_byte_pointer_size(' かきく  あいう')
-    assert_cursor(15)
-    assert_cursor_max(18)
-    input_keys("\M-t", false)
-    assert_line(' あいう     かきく')
-    assert_byte_pointer_size(' あいう     かきく')
-    assert_cursor(18)
-    assert_cursor_max(18)
-  end
-
-  def test_ed_transpose_words_with_one_word
-    input_keys('abc  ')
-    assert_line('abc  ')
-    assert_byte_pointer_size('abc  ')
-    assert_cursor(5)
-    assert_cursor_max(5)
-    input_keys("\M-t", false)
-    assert_line('abc  ')
-    assert_byte_pointer_size('abc  ')
-    assert_cursor(5)
-    assert_cursor_max(5)
-    input_keys("\C-b", false)
-    assert_line('abc  ')
-    assert_byte_pointer_size('abc ')
-    assert_cursor(4)
-    assert_cursor_max(5)
-    input_keys("\M-t", false)
-    assert_line('abc  ')
-    assert_byte_pointer_size('abc ')
-    assert_cursor(4)
-    assert_cursor_max(5)
-    input_keys("\C-b" * 2, false)
-    assert_line('abc  ')
-    assert_byte_pointer_size('ab')
-    assert_cursor(2)
-    assert_cursor_max(5)
-    input_keys("\M-t", false)
-    assert_line('abc  ')
-    assert_byte_pointer_size('ab')
-    assert_cursor(2)
-    assert_cursor_max(5)
-    input_keys("\M-t", false)
-    assert_line('abc  ')
-    assert_byte_pointer_size('ab')
-    assert_cursor(2)
-    assert_cursor_max(5)
-  end
-
-  def test_ed_transpose_words_with_one_word_for_mbchar
-    input_keys('あいう  ')
-    assert_line('あいう  ')
-    assert_byte_pointer_size('あいう  ')
-    assert_cursor(8)
-    assert_cursor_max(8)
-    input_keys("\M-t", false)
-    assert_line('あいう  ')
-    assert_byte_pointer_size('あいう  ')
-    assert_cursor(8)
-    assert_cursor_max(8)
-    input_keys("\C-b", false)
-    assert_line('あいう  ')
-    assert_byte_pointer_size('あいう ')
-    assert_cursor(7)
-    assert_cursor_max(8)
-    input_keys("\M-t", false)
-    assert_line('あいう  ')
-    assert_byte_pointer_size('あいう ')
-    assert_cursor(7)
-    assert_cursor_max(8)
-    input_keys("\C-b" * 2, false)
-    assert_line('あいう  ')
-    assert_byte_pointer_size('あい')
-    assert_cursor(4)
-    assert_cursor_max(8)
-    input_keys("\M-t", false)
-    assert_line('あいう  ')
-    assert_byte_pointer_size('あい')
-    assert_cursor(4)
-    assert_cursor_max(8)
-    input_keys("\M-t", false)
-    assert_line('あいう  ')
-    assert_byte_pointer_size('あい')
-    assert_cursor(4)
-    assert_cursor_max(8)
-  end
-
-  def test_ed_digit
-    input_keys('0123')
-    assert_byte_pointer_size('0123')
-    assert_cursor(4)
-    assert_cursor_max(4)
-    assert_line('0123')
-  end
-
-  def test_ed_next_and_prev_char
-    input_keys('abc')
-    assert_byte_pointer_size('abc')
-    assert_cursor(3)
-    assert_cursor_max(3)
-    input_keys("\C-b", false)
-    assert_byte_pointer_size('ab')
-    assert_cursor(2)
-    assert_cursor_max(3)
-    input_keys("\C-b", false)
-    assert_byte_pointer_size('a')
-    assert_cursor(1)
-    assert_cursor_max(3)
-    input_keys("\C-b", false)
-    assert_byte_pointer_size('')
-    assert_cursor(0)
-    assert_cursor_max(3)
-    input_keys("\C-b", false)
-    assert_byte_pointer_size('')
-    assert_cursor(0)
-    assert_cursor_max(3)
-    input_keys("\C-f", false)
-    assert_byte_pointer_size('a')
-    assert_cursor(1)
-    assert_cursor_max(3)
-    input_keys("\C-f", false)
-    assert_byte_pointer_size('ab')
-    assert_cursor(2)
-    assert_cursor_max(3)
-    input_keys("\C-f", false)
-    assert_byte_pointer_size('abc')
-    assert_cursor(3)
-    assert_cursor_max(3)
-    input_keys("\C-f", false)
-    assert_byte_pointer_size('abc')
-    assert_cursor(3)
-    assert_cursor_max(3)
-  end
-
-  def test_ed_next_and_prev_char_for_mbchar
-    input_keys('あいう')
-    assert_byte_pointer_size('あいう')
-    assert_cursor(6)
-    assert_cursor_max(6)
-    input_keys("\C-b", false)
-    assert_byte_pointer_size('あい')
-    assert_cursor(4)
-    assert_cursor_max(6)
-    input_keys("\C-b", false)
-    assert_byte_pointer_size('あ')
-    assert_cursor(2)
-    assert_cursor_max(6)
-    input_keys("\C-b", false)
-    assert_byte_pointer_size('')
-    assert_cursor(0)
-    assert_cursor_max(6)
-    input_keys("\C-b", false)
-    assert_byte_pointer_size('')
-    assert_cursor(0)
-    assert_cursor_max(6)
-    input_keys("\C-f", false)
-    assert_byte_pointer_size('あ')
-    assert_cursor(2)
-    assert_cursor_max(6)
-    input_keys("\C-f", false)
-    assert_byte_pointer_size('あい')
-    assert_cursor(4)
-    assert_cursor_max(6)
-    input_keys("\C-f", false)
-    assert_byte_pointer_size('あいう')
-    assert_cursor(6)
-    assert_cursor_max(6)
-    input_keys("\C-f", false)
-    assert_byte_pointer_size('あいう')
-    assert_cursor(6)
-    assert_cursor_max(6)
-  end
-
-  def test_ed_next_and_prev_char_for_mbchar_by_plural_code_points
-    input_keys("か\u3099き\u3099く\u3099")
-    assert_byte_pointer_size("か\u3099き\u3099く\u3099")
-    assert_cursor(6)
-    assert_cursor_max(6)
-    input_keys("\C-b", false)
-    assert_byte_pointer_size("か\u3099き\u3099")
-    assert_cursor(4)
-    assert_cursor_max(6)
-    input_keys("\C-b", false)
-    assert_byte_pointer_size("か\u3099")
-    assert_cursor(2)
-    assert_cursor_max(6)
-    input_keys("\C-b", false)
-    assert_byte_pointer_size('')
-    assert_cursor(0)
-    assert_cursor_max(6)
-    input_keys("\C-b", false)
-    assert_byte_pointer_size('')
-    assert_cursor(0)
-    assert_cursor_max(6)
-    input_keys("\C-f", false)
-    assert_byte_pointer_size("か\u3099")
-    assert_cursor(2)
-    assert_cursor_max(6)
-    input_keys("\C-f", false)
-    assert_byte_pointer_size("か\u3099き\u3099")
-    assert_cursor(4)
-    assert_cursor_max(6)
-    input_keys("\C-f", false)
-    assert_byte_pointer_size("か\u3099き\u3099く\u3099")
-    assert_cursor(6)
-    assert_cursor_max(6)
-    input_keys("\C-f", false)
-    assert_byte_pointer_size("か\u3099き\u3099く\u3099")
-    assert_cursor(6)
-    assert_cursor_max(6)
-  end
-
-  def test_em_capitol_case
-    input_keys('abc def{bbb}ccc')
-    input_keys("\C-a\M-c", false)
-    assert_byte_pointer_size('Abc')
-    assert_cursor(3)
-    assert_cursor_max(15)
-    assert_line('Abc def{bbb}ccc')
-    input_keys("\M-c", false)
-    assert_byte_pointer_size('Abc Def')
-    assert_cursor(7)
-    assert_cursor_max(15)
-    assert_line('Abc Def{bbb}ccc')
-    input_keys("\M-c", false)
-    assert_byte_pointer_size('Abc Def{Bbb')
-    assert_cursor(11)
-    assert_cursor_max(15)
-    assert_line('Abc Def{Bbb}ccc')
-    input_keys("\M-c", false)
-    assert_byte_pointer_size('Abc Def{Bbb}Ccc')
-    assert_cursor(15)
-    assert_cursor_max(15)
-    assert_line('Abc Def{Bbb}Ccc')
-  end
-
-  def test_em_capitol_case_with_complex_example
-    input_keys('{}#*    AaA!!!cCc   ')
-    input_keys("\C-a\M-c", false)
-    assert_byte_pointer_size('{}#*    Aaa')
-    assert_cursor(11)
-    assert_cursor_max(20)
-    assert_line('{}#*    Aaa!!!cCc   ')
-    input_keys("\M-c", false)
-    assert_byte_pointer_size('{}#*    Aaa!!!Ccc')
-    assert_cursor(17)
-    assert_cursor_max(20)
-    assert_line('{}#*    Aaa!!!Ccc   ')
-    input_keys("\M-c", false)
-    assert_byte_pointer_size('{}#*    Aaa!!!Ccc   ')
-    assert_cursor(20)
-    assert_cursor_max(20)
-    assert_line('{}#*    Aaa!!!Ccc   ')
-  end
-
-  def test_em_lower_case
-    input_keys('AbC def{bBb}CCC')
-    input_keys("\C-a\M-l", false)
-    assert_byte_pointer_size('abc')
-    assert_cursor(3)
-    assert_cursor_max(15)
-    assert_line('abc def{bBb}CCC')
-    input_keys("\M-l", false)
-    assert_byte_pointer_size('abc def')
-    assert_cursor(7)
-    assert_cursor_max(15)
-    assert_line('abc def{bBb}CCC')
-    input_keys("\M-l", false)
-    assert_byte_pointer_size('abc def{bbb')
-    assert_cursor(11)
-    assert_cursor_max(15)
-    assert_line('abc def{bbb}CCC')
-    input_keys("\M-l", false)
-    assert_byte_pointer_size('abc def{bbb}ccc')
-    assert_cursor(15)
-    assert_cursor_max(15)
-    assert_line('abc def{bbb}ccc')
-  end
-
-  def test_em_lower_case_with_complex_example
-    input_keys('{}#*    AaA!!!cCc   ')
-    input_keys("\C-a\M-l", false)
-    assert_byte_pointer_size('{}#*    aaa')
-    assert_cursor(11)
-    assert_cursor_max(20)
-    assert_line('{}#*    aaa!!!cCc   ')
-    input_keys("\M-l", false)
-    assert_byte_pointer_size('{}#*    aaa!!!ccc')
-    assert_cursor(17)
-    assert_cursor_max(20)
-    assert_line('{}#*    aaa!!!ccc   ')
-    input_keys("\M-l", false)
-    assert_byte_pointer_size('{}#*    aaa!!!ccc   ')
-    assert_cursor(20)
-    assert_cursor_max(20)
-    assert_line('{}#*    aaa!!!ccc   ')
-  end
-
-  def test_em_upper_case
-    input_keys('AbC def{bBb}CCC')
-    input_keys("\C-a\M-u", false)
-    assert_byte_pointer_size('ABC')
-    assert_cursor(3)
-    assert_cursor_max(15)
-    assert_line('ABC def{bBb}CCC')
-    input_keys("\M-u", false)
-    assert_byte_pointer_size('ABC DEF')
-    assert_cursor(7)
-    assert_cursor_max(15)
-    assert_line('ABC DEF{bBb}CCC')
-    input_keys("\M-u", false)
-    assert_byte_pointer_size('ABC DEF{BBB')
-    assert_cursor(11)
-    assert_cursor_max(15)
-    assert_line('ABC DEF{BBB}CCC')
-    input_keys("\M-u", false)
-    assert_byte_pointer_size('ABC DEF{BBB}CCC')
-    assert_cursor(15)
-    assert_cursor_max(15)
-    assert_line('ABC DEF{BBB}CCC')
-  end
-
-  def test_em_upper_case_with_complex_example
-    input_keys('{}#*    AaA!!!cCc   ')
-    input_keys("\C-a\M-u", false)
-    assert_byte_pointer_size('{}#*    AAA')
-    assert_cursor(11)
-    assert_cursor_max(20)
-    assert_line('{}#*    AAA!!!cCc   ')
-    input_keys("\M-u", false)
-    assert_byte_pointer_size('{}#*    AAA!!!CCC')
-    assert_cursor(17)
-    assert_cursor_max(20)
-    assert_line('{}#*    AAA!!!CCC   ')
-    input_keys("\M-u", false)
-    assert_byte_pointer_size('{}#*    AAA!!!CCC   ')
-    assert_cursor(20)
-    assert_cursor_max(20)
-    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_duplicated_list
-    @line_editor.completion_proc = proc { |word|
-      %w{
-        foo_foo
-        foo_foo
-        foo_bar
-      }.map { |i|
-        i.encode(@encoding)
-      }
-    }
-    input_keys('foo_')
-    assert_byte_pointer_size('foo_')
-    assert_cursor(4)
-    assert_cursor_max(4)
-    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(4)
-    assert_cursor_max(4)
-    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(4)
-    assert_cursor_max(4)
-    assert_line('foo_')
-    assert_equal(%w{foo_foo foo_bar}, @line_editor.instance_variable_get(:@menu_info).list)
-  end
-
-  def test_completion
-    @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(2)
-    assert_cursor_max(2)
-    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(4)
-    assert_cursor_max(4)
-    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(4)
-    assert_cursor_max(4)
-    assert_line('foo_')
-    assert_equal(%w{foo_foo foo_bar foo_baz}, @line_editor.instance_variable_get(:@menu_info).list)
-    input_keys('a')
-    input_keys("\C-i", false)
-    assert_byte_pointer_size('foo_a')
-    assert_cursor(5)
-    assert_cursor_max(5)
-    assert_line('foo_a')
-    input_keys("\C-h", false)
-    input_keys('b')
-    input_keys("\C-i", false)
-    assert_byte_pointer_size('foo_ba')
-    assert_cursor(6)
-    assert_cursor_max(6)
-    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{
-        "".foo_foo
-        "".foo_bar
-        "".foo_baz
-        "".qux
-      }.map { |i|
-        i.encode(@encoding)
-      }
-    }
-    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_')
-    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{
-        foo
-        foo_bar
-      }.map { |i|
-        i.encode(@encoding)
-      }
-    }
-    matched = nil
-    @line_editor.dig_perfect_match_proc = proc { |m|
-      matched = m
-    }
-    input_keys('fo')
-    assert_byte_pointer_size('fo')
-    assert_cursor(2)
-    assert_cursor_max(2)
-    assert_line('fo')
-    assert_equal(Reline::LineEditor::CompletionState::NORMAL, @line_editor.instance_variable_get(:@completion_state))
-    assert_equal(nil, matched)
-    input_keys("\C-i", false)
-    assert_byte_pointer_size('foo')
-    assert_cursor(3)
-    assert_cursor_max(3)
-    assert_line('foo')
-    assert_equal(Reline::LineEditor::CompletionState::MENU_WITH_PERFECT_MATCH, @line_editor.instance_variable_get(:@completion_state))
-    assert_equal(nil, matched)
-    input_keys("\C-i", false)
-    assert_byte_pointer_size('foo')
-    assert_cursor(3)
-    assert_cursor_max(3)
-    assert_line('foo')
-    assert_equal(Reline::LineEditor::CompletionState::PERFECT_MATCH, @line_editor.instance_variable_get(:@completion_state))
-    assert_equal(nil, matched)
-    input_keys("\C-i", false)
-    assert_byte_pointer_size('foo')
-    assert_cursor(3)
-    assert_cursor_max(3)
-    assert_line('foo')
-    assert_equal(Reline::LineEditor::CompletionState::PERFECT_MATCH, @line_editor.instance_variable_get(:@completion_state))
-    assert_equal('foo', matched)
-    matched = nil
-    input_keys('_')
-    input_keys("\C-i", false)
-    assert_byte_pointer_size('foo_bar')
-    assert_cursor(7)
-    assert_cursor_max(7)
-    assert_line('foo_bar')
-    assert_equal(Reline::LineEditor::CompletionState::MENU_WITH_PERFECT_MATCH, @line_editor.instance_variable_get(:@completion_state))
-    assert_equal(nil, matched)
-    input_keys("\C-i", false)
-    assert_byte_pointer_size('foo_bar')
-    assert_cursor(7)
-    assert_cursor_max(7)
-    assert_line('foo_bar')
-    assert_equal(Reline::LineEditor::CompletionState::PERFECT_MATCH, @line_editor.instance_variable_get(:@completion_state))
-    assert_equal(nil, matched)
-    input_keys("\C-i", false)
-    assert_byte_pointer_size('foo_bar')
-    assert_cursor(7)
-    assert_cursor_max(7)
-    assert_line('foo_bar')
-    assert_equal(Reline::LineEditor::CompletionState::PERFECT_MATCH, @line_editor.instance_variable_get(:@completion_state))
-    assert_equal('foo_bar', matched)
-  end
-
-  def test_completion_with_completion_ignore_case
-    @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(2)
-    assert_cursor_max(2)
-    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(4)
-    assert_cursor_max(4)
-    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(4)
-    assert_cursor_max(4)
-    assert_line('foo_')
-    assert_equal(%w{foo_foo foo_bar}, @line_editor.instance_variable_get(:@menu_info).list)
-    @config.completion_ignore_case = true
-    input_keys("\C-i", false)
-    assert_byte_pointer_size('foo_')
-    assert_cursor(4)
-    assert_cursor_max(4)
-    assert_line('foo_')
-    assert_equal(%w{foo_foo foo_bar Foo_baz}, @line_editor.instance_variable_get(:@menu_info).list)
-    input_keys('a')
-    input_keys("\C-i", false)
-    assert_byte_pointer_size('foo_a')
-    assert_cursor(5)
-    assert_cursor_max(5)
-    assert_line('foo_a')
-    input_keys("\C-h", false)
-    input_keys('b')
-    input_keys("\C-i", false)
-    assert_byte_pointer_size('foo_ba')
-    assert_cursor(6)
-    assert_cursor_max(6)
-    assert_line('foo_ba')
-  end
-
-  def test_completion_in_middle_of_line
-    @line_editor.completion_proc = proc { |word|
-      %w{
-        foo_foo
-        foo_bar
-        foo_baz
-        qux
-      }.map { |i|
-        i.encode(@encoding)
-      }
-    }
-    input_keys('abcde fo ABCDE')
-    assert_line('abcde fo ABCDE')
-    input_keys("\C-b" * 6 + "\C-i", false)
-    assert_byte_pointer_size('abcde foo_')
-    assert_cursor(10)
-    assert_cursor_max(16)
-    assert_line('abcde foo_ ABCDE')
-    input_keys("\C-b" * 2 + "\C-i", false)
-    assert_byte_pointer_size('abcde foo_')
-    assert_cursor(10)
-    assert_cursor_max(18)
-    assert_line('abcde foo_o_ ABCDE')
-  end
-
-  def test_completion_with_nil_value
-    @line_editor.completion_proc = proc { |word|
-      %w{
-        foo_foo
-        foo_bar
-        Foo_baz
-        qux
-      }.map { |i|
-        i.encode(@encoding)
-      }.prepend(nil)
-    }
-    @config.completion_ignore_case = true
-    input_keys('fo')
-    assert_byte_pointer_size('fo')
-    assert_cursor(2)
-    assert_cursor_max(2)
-    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(4)
-    assert_cursor_max(4)
-    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(4)
-    assert_cursor_max(4)
-    assert_line('foo_')
-    assert_equal(%w{foo_foo foo_bar Foo_baz}, @line_editor.instance_variable_get(:@menu_info).list)
-    input_keys('a')
-    input_keys("\C-i", false)
-    assert_byte_pointer_size('foo_a')
-    assert_cursor(5)
-    assert_cursor_max(5)
-    assert_line('foo_a')
-    input_keys("\C-h", false)
-    input_keys('b')
-    input_keys("\C-i", false)
-    assert_byte_pointer_size('foo_ba')
-    assert_cursor(6)
-    assert_cursor_max(6)
-    assert_line('foo_ba')
-  end
-
-  def test_em_kill_region
-    input_keys('abc   def{bbb}ccc   ddd   ')
-    assert_byte_pointer_size('abc   def{bbb}ccc   ddd   ')
-    assert_cursor(26)
-    assert_cursor_max(26)
-    assert_line('abc   def{bbb}ccc   ddd   ')
-    input_keys("\C-w", false)
-    assert_byte_pointer_size('abc   def{bbb}ccc   ')
-    assert_cursor(20)
-    assert_cursor_max(20)
-    assert_line('abc   def{bbb}ccc   ')
-    input_keys("\C-w", false)
-    assert_byte_pointer_size('abc   ')
-    assert_cursor(6)
-    assert_cursor_max(6)
-    assert_line('abc   ')
-    input_keys("\C-w", false)
-    assert_byte_pointer_size('')
-    assert_cursor(0)
-    assert_cursor_max(0)
-    assert_line('')
-    input_keys("\C-w", false)
-    assert_byte_pointer_size('')
-    assert_cursor(0)
-    assert_cursor_max(0)
-    assert_line('')
-  end
-
-  def test_em_kill_region_mbchar
-    input_keys('あ   い   う{う}う   ')
-    assert_byte_pointer_size('あ   い   う{う}う   ')
-    assert_cursor(21)
-    assert_cursor_max(21)
-    assert_line('あ   い   う{う}う   ')
-    input_keys("\C-w", false)
-    assert_byte_pointer_size('あ   い   ')
-    assert_cursor(10)
-    assert_cursor_max(10)
-    assert_line('あ   い   ')
-    input_keys("\C-w", false)
-    assert_byte_pointer_size('あ   ')
-    assert_cursor(5)
-    assert_cursor_max(5)
-    assert_line('あ   ')
-    input_keys("\C-w", false)
-    assert_byte_pointer_size('')
-    assert_cursor(0)
-    assert_cursor_max(0)
-    assert_line('')
-  end
-
-  def test_vi_search_prev
-    Reline::HISTORY.concat(%w{abc 123 AAA})
-    assert_line('')
-    assert_byte_pointer_size('')
-    assert_cursor(0)
-    assert_cursor_max(0)
-    input_keys("\C-ra\C-j")
-    assert_line('abc')
-    assert_byte_pointer_size('')
-    assert_cursor(0)
-    assert_cursor_max(3)
-  end
-
-  def test_larger_histories_than_history_size
-    history_size = @config.history_size
-    @config.history_size = 2
-    Reline::HISTORY.concat(%w{abc 123 AAA})
-    assert_line('')
-    assert_byte_pointer_size('')
-    assert_cursor(0)
-    assert_cursor_max(0)
-    input_keys("\C-p")
-    assert_line('AAA')
-    assert_byte_pointer_size('AAA')
-    assert_cursor(3)
-    assert_cursor_max(3)
-    input_keys("\C-p")
-    assert_line('123')
-    assert_byte_pointer_size('123')
-    assert_cursor(3)
-    assert_cursor_max(3)
-    input_keys("\C-p")
-    assert_line('123')
-    assert_byte_pointer_size('123')
-    assert_cursor(3)
-    assert_cursor_max(3)
-  ensure
-    @config.history_size = history_size
-  end
-
-  def test_search_history_to_back
-    Reline::HISTORY.concat([
-      '1235', # old
-      '12aa',
-      '1234' # new
-    ])
-    assert_line('')
-    assert_byte_pointer_size('')
-    assert_cursor(0)
-    assert_cursor_max(0)
-    input_keys("\C-r123")
-    assert_line('1234')
-    assert_byte_pointer_size('')
-    assert_cursor(0)
-    assert_cursor_max(0) # doesn't determine yet
-    input_keys("\C-ha")
-    assert_line('12aa')
-    assert_byte_pointer_size('')
-    assert_cursor(0)
-    assert_cursor_max(0)
-    input_keys("\C-h3")
-    assert_line('1235')
-    assert_byte_pointer_size('')
-    assert_cursor(0)
-    assert_cursor_max(0)
-  end
-
-  def test_search_history_to_front
-    Reline::HISTORY.concat([
-      '1235', # old
-      '12aa',
-      '1234' # new
-    ])
-    assert_line('')
-    assert_byte_pointer_size('')
-    assert_cursor(0)
-    assert_cursor_max(0)
-    input_keys("\C-s123")
-    assert_line('1235')
-    assert_byte_pointer_size('')
-    assert_cursor(0)
-    assert_cursor_max(0) # doesn't determine yet
-    input_keys("\C-ha")
-    assert_line('12aa')
-    assert_byte_pointer_size('')
-    assert_cursor(0)
-    assert_cursor_max(0)
-    input_keys("\C-h3")
-    assert_line('1234')
-    assert_byte_pointer_size('')
-    assert_cursor(0)
-    assert_cursor_max(0)
-  end
-
-  def test_search_history_front_and_back
-    Reline::HISTORY.concat([
-      '1235', # old
-      '12aa',
-      '1234' # new
-    ])
-    assert_line('')
-    assert_byte_pointer_size('')
-    assert_cursor(0)
-    assert_cursor_max(0)
-    input_keys("\C-s12")
-    assert_line('1235')
-    assert_byte_pointer_size('')
-    assert_cursor(0)
-    assert_cursor_max(0) # doesn't determine yet
-    input_keys("\C-s")
-    assert_line('12aa')
-    assert_byte_pointer_size('')
-    assert_cursor(0)
-    assert_cursor_max(0)
-    input_keys("\C-r")
-    assert_line('12aa')
-    assert_byte_pointer_size('')
-    assert_cursor(0)
-    assert_cursor_max(0)
-    input_keys("\C-r")
-    assert_line('1235')
-    assert_byte_pointer_size('')
-    assert_cursor(0)
-    assert_cursor_max(0)
-  end
-
-  def test_search_history_back_and_front
-    Reline::HISTORY.concat([
-      '1235', # old
-      '12aa',
-      '1234' # new
-    ])
-    assert_line('')
-    assert_byte_pointer_size('')
-    assert_cursor(0)
-    assert_cursor_max(0)
-    input_keys("\C-r12")
-    assert_line('1234')
-    assert_byte_pointer_size('')
-    assert_cursor(0)
-    assert_cursor_max(0) # doesn't determine yet
-    input_keys("\C-r")
-    assert_line('12aa')
-    assert_byte_pointer_size('')
-    assert_cursor(0)
-    assert_cursor_max(0)
-    input_keys("\C-s")
-    assert_line('12aa')
-    assert_byte_pointer_size('')
-    assert_cursor(0)
-    assert_cursor_max(0)
-    input_keys("\C-s")
-    assert_line('1234')
-    assert_byte_pointer_size('')
-    assert_cursor(0)
-    assert_cursor_max(0)
-  end
-
-  def test_search_history_to_back_in_the_middle_of_histories
-    Reline::HISTORY.concat([
-      '1235', # old
-      '12aa',
-      '1234' # new
-    ])
-    assert_line('')
-    assert_byte_pointer_size('')
-    assert_cursor(0)
-    assert_cursor_max(0)
-    input_keys("\C-p\C-p")
-    assert_line('12aa')
-    assert_byte_pointer_size('12aa')
-    assert_cursor(4)
-    assert_cursor_max(4)
-    input_keys("\C-r123")
-    assert_line('1235')
-    assert_byte_pointer_size('1235')
-    assert_cursor(4)
-    assert_cursor_max(4)
-  end
-
-  def test_search_history_twice
-    Reline::HISTORY.concat([
-      '1235', # old
-      '12aa',
-      '1234' # new
-    ])
-    assert_line('')
-    assert_byte_pointer_size('')
-    assert_cursor(0)
-    assert_cursor_max(0)
-    input_keys("\C-r123")
-    assert_line('1234')
-    assert_byte_pointer_size('')
-    assert_cursor(0)
-    assert_cursor_max(0) # doesn't determine yet
-    input_keys("\C-r")
-    assert_line('1235')
-    assert_byte_pointer_size('')
-    assert_cursor(0)
-    assert_cursor_max(0)
-  end
-
-  def test_search_history_by_last_determined
-    Reline::HISTORY.concat([
-      '1235', # old
-      '12aa',
-      '1234' # new
-    ])
-    assert_line('')
-    assert_byte_pointer_size('')
-    assert_cursor(0)
-    assert_cursor_max(0)
-    input_keys("\C-r123")
-    assert_line('1234')
-    assert_byte_pointer_size('')
-    assert_cursor(0)
-    assert_cursor_max(0) # doesn't determine yet
-    input_keys("\C-j")
-    assert_line('1234')
-    assert_byte_pointer_size('')
-    assert_cursor(0)
-    assert_cursor_max(4)
-    input_keys("\C-k") # delete
-    assert_line('')
-    assert_byte_pointer_size('')
-    assert_cursor(0)
-    assert_cursor_max(0)
-    input_keys("\C-r")
-    assert_line('')
-    assert_byte_pointer_size('')
-    assert_cursor(0)
-    assert_cursor_max(0)
-    input_keys("\C-r")
-    assert_line('1235')
-    assert_byte_pointer_size('')
-    assert_cursor(0)
-    assert_cursor_max(0)
-  end
-
-  def test_search_history_with_isearch_terminator
-    @config.read_lines(<<~LINES.split(/(?<=\n)/))
-      set isearch-terminators "XYZ"
-    LINES
-    Reline::HISTORY.concat([
-      '1235', # old
-      '12aa',
-      '1234' # new
-    ])
-    assert_line('')
-    assert_byte_pointer_size('')
-    assert_cursor(0)
-    assert_cursor_max(0)
-    input_keys("\C-r12a")
-    assert_line('12aa')
-    assert_byte_pointer_size('')
-    assert_cursor(0)
-    assert_cursor_max(0) # doesn't determine yet
-    input_keys('Y')
-    assert_line('12aa')
-    assert_byte_pointer_size('')
-    assert_cursor(0)
-    assert_cursor_max(4)
-    input_keys('x')
-    assert_line('x12aa')
-    assert_byte_pointer_size('x')
-    assert_cursor(1)
-    assert_cursor_max(5)
-  end
-
-  def test_em_set_mark_and_em_exchange_mark
-    input_keys('aaa bbb ccc ddd')
-    assert_byte_pointer_size('aaa bbb ccc ddd')
-    assert_cursor(15)
-    assert_cursor_max(15)
-    assert_line('aaa bbb ccc ddd')
-    input_keys("\C-a\M-F\M-F", false)
-    assert_byte_pointer_size('aaa bbb')
-    assert_cursor(7)
-    assert_cursor_max(15)
-    assert_line('aaa bbb ccc ddd')
-    assert_equal(nil, @line_editor.instance_variable_get(:@mark_pointer))
-    input_keys("\x00", false) # C-Space
-    assert_byte_pointer_size('aaa bbb')
-    assert_cursor(7)
-    assert_cursor_max(15)
-    assert_line('aaa bbb ccc ddd')
-    assert_equal([7, 0], @line_editor.instance_variable_get(:@mark_pointer))
-    input_keys("\C-a", false)
-    assert_byte_pointer_size('')
-    assert_cursor(0)
-    assert_cursor_max(15)
-    assert_line('aaa bbb ccc ddd')
-    assert_equal([7, 0], @line_editor.instance_variable_get(:@mark_pointer))
-    input_key_by_symbol(:em_exchange_mark)
-    assert_byte_pointer_size('aaa bbb')
-    assert_cursor(7)
-    assert_cursor_max(15)
-    assert_line('aaa bbb ccc ddd')
-    assert_equal([0, 0], @line_editor.instance_variable_get(:@mark_pointer))
-  end
-
-  def test_em_exchange_mark_without_mark
-    input_keys('aaa bbb ccc ddd')
-    assert_byte_pointer_size('aaa bbb ccc ddd')
-    assert_cursor(15)
-    assert_cursor_max(15)
-    assert_line('aaa bbb ccc ddd')
-    input_keys("\C-a\M-f", false)
-    assert_byte_pointer_size('aaa')
-    assert_cursor(3)
-    assert_cursor_max(15)
-    assert_line('aaa bbb ccc ddd')
-    assert_equal(nil, @line_editor.instance_variable_get(:@mark_pointer))
-    input_key_by_symbol(:em_exchange_mark)
-    assert_byte_pointer_size('aaa')
-    assert_cursor(3)
-    assert_cursor_max(15)
-    assert_line('aaa bbb ccc ddd')
-    assert_equal(nil, @line_editor.instance_variable_get(:@mark_pointer))
-  end
-
-  def test_modify_lines_with_wrong_rs
-    verbose, $VERBOSE = $VERBOSE, nil
-    original_global_slash = $/
-    $/ = 'b'
-    $VERBOSE = verbose
-    @line_editor.output_modifier_proc = proc { |output| Reline::Unicode.escape_for_print(output) }
-    input_keys("abcdef\n")
-    result = @line_editor.__send__(:modify_lines, @line_editor.whole_lines)
-    $/ = nil
-    assert_equal(['abcdef'], result)
-  ensure
-    $VERBOSE = nil
-    $/ = original_global_slash
-    $VERBOSE = verbose
-  end
-
-  def test_ed_search_prev_history
-    Reline::HISTORY.concat([
-      '12356', # old
-      '12aaa',
-      '12345' # new
-    ])
-    input_keys('123')
-    # The ed_search_prev_history doesn't have default binding
-    @line_editor.__send__(:ed_search_prev_history, "\C-p".ord)
-    assert_byte_pointer_size('123')
-    assert_cursor(3)
-    assert_cursor_max(5)
-    assert_line('12345')
-    @line_editor.__send__(:ed_search_prev_history, "\C-p".ord)
-    assert_byte_pointer_size('123')
-    assert_cursor(3)
-    assert_cursor_max(5)
-    assert_line('12356')
-    @line_editor.__send__(:ed_search_prev_history, "\C-p".ord)
-    assert_byte_pointer_size('123')
-    assert_cursor(3)
-    assert_cursor_max(5)
-    assert_line('12356')
-  end
-
-  def test_ed_search_prev_history_with_empty
-    Reline::HISTORY.concat([
-      '12356', # old
-      '12aaa',
-      '12345' # new
-    ])
-    # The ed_search_prev_history doesn't have default binding
-    @line_editor.__send__(:ed_search_prev_history, "\C-p".ord)
-    assert_byte_pointer_size('')
-    assert_cursor(0)
-    assert_cursor_max(5)
-    assert_line('12345')
-    @line_editor.__send__(:ed_search_prev_history, "\C-p".ord)
-    assert_byte_pointer_size('')
-    assert_cursor(0)
-    assert_cursor_max(5)
-    assert_line('12aaa')
-    @line_editor.__send__(:ed_search_prev_history, "\C-p".ord)
-    assert_byte_pointer_size('')
-    assert_cursor(0)
-    assert_cursor_max(5)
-    assert_line('12356')
-    @line_editor.__send__(:ed_search_prev_history, "\C-p".ord)
-    assert_byte_pointer_size('')
-    assert_cursor(0)
-    assert_cursor_max(5)
-    assert_line('12356')
-  end
-
-  def test_ed_search_prev_history_without_match
-    Reline::HISTORY.concat([
-      '12356', # old
-      '12aaa',
-      '12345' # new
-    ])
-    input_keys('ABC')
-    # The ed_search_prev_history doesn't have default binding
-    @line_editor.__send__(:ed_search_prev_history, "\C-p".ord)
-    assert_byte_pointer_size('ABC')
-    assert_cursor(3)
-    assert_cursor_max(3)
-    assert_line('ABC')
-  end
-
-  def test_ed_search_next_history
-    Reline::HISTORY.concat([
-      '12356', # old
-      '12aaa',
-      '12345' # new
-    ])
-    input_keys('123')
-    # The ed_search_prev_history and ed_search_next_history doesn't have default binding
-    @line_editor.__send__(:ed_search_prev_history, "\C-p".ord)
-    assert_byte_pointer_size('123')
-    assert_cursor(3)
-    assert_cursor_max(5)
-    assert_line('12345')
-    @line_editor.__send__(:ed_search_prev_history, "\C-p".ord)
-    assert_byte_pointer_size('123')
-    assert_cursor(3)
-    assert_cursor_max(5)
-    assert_line('12356')
-    @line_editor.__send__(:ed_search_prev_history, "\C-p".ord)
-    assert_byte_pointer_size('123')
-    assert_cursor(3)
-    assert_cursor_max(5)
-    assert_line('12356')
-    @line_editor.__send__(:ed_search_next_history, "\C-n".ord)
-    assert_byte_pointer_size('123')
-    assert_cursor(3)
-    assert_cursor_max(5)
-    assert_line('12345')
-    @line_editor.__send__(:ed_search_next_history, "\C-n".ord)
-    assert_byte_pointer_size('123')
-    assert_cursor(3)
-    assert_cursor_max(5)
-    assert_line('12345')
-  end
-
-  def test_ed_search_next_history_with_empty
-    Reline::HISTORY.concat([
-      '12356', # old
-      '12aaa',
-      '12345' # new
-    ])
-    # The ed_search_prev_history and ed_search_next_history doesn't have default binding
-    @line_editor.__send__(:ed_search_prev_history, "\C-p".ord)
-    assert_byte_pointer_size('')
-    assert_cursor(0)
-    assert_cursor_max(5)
-    assert_line('12345')
-    @line_editor.__send__(:ed_search_prev_history, "\C-p".ord)
-    assert_byte_pointer_size('')
-    assert_cursor(0)
-    assert_cursor_max(5)
-    assert_line('12aaa')
-    @line_editor.__send__(:ed_search_prev_history, "\C-p".ord)
-    assert_byte_pointer_size('')
-    assert_cursor(0)
-    assert_cursor_max(5)
-    assert_line('12356')
-    @line_editor.__send__(:ed_search_next_history, "\C-n".ord)
-    assert_byte_pointer_size('')
-    assert_cursor(0)
-    assert_cursor_max(5)
-    assert_line('12aaa')
-    @line_editor.__send__(:ed_search_next_history, "\C-n".ord)
-    assert_byte_pointer_size('')
-    assert_cursor(0)
-    assert_cursor_max(5)
-    assert_line('12345')
-    @line_editor.__send__(:ed_search_next_history, "\C-n".ord)
-    assert_byte_pointer_size('')
-    assert_cursor(0)
-    assert_cursor_max(0)
-    assert_line('')
-  end
-
-  # Unicode emoji test
-  def test_ed_insert_for_include_zwj_emoji
-    omit "This test is for UTF-8 but the locale is #{Reline.core.encoding}" if Reline.core.encoding != Encoding::UTF_8
-    # U+1F468 U+200D U+1F469 U+200D U+1F467 U+200D U+1F466 is family: man, woman, girl, boy "👨‍👩‍👧‍👦"
-    input_keys("\u{1F468}") # U+1F468 is man "👨"
-    assert_line("\u{1F468}")
-    assert_byte_pointer_size("\u{1F468}")
-    assert_cursor(2)
-    assert_cursor_max(2)
-    input_keys("\u200D") # U+200D is ZERO WIDTH JOINER
-    assert_line("\u{1F468 200D}")
-    assert_byte_pointer_size("\u{1F468 200D}")
-    assert_cursor(2)
-    assert_cursor_max(2)
-    input_keys("\u{1F469}") # U+1F469 is woman "👩"
-    assert_line("\u{1F468 200D 1F469}")
-    assert_byte_pointer_size("\u{1F468 200D 1F469}")
-    assert_cursor(2)
-    assert_cursor_max(2)
-    input_keys("\u200D") # U+200D is ZERO WIDTH JOINER
-    assert_line("\u{1F468 200D 1F469 200D}")
-    assert_byte_pointer_size("\u{1F468 200D 1F469 200D}")
-    assert_cursor(2)
-    assert_cursor_max(2)
-    input_keys("\u{1F467}") # U+1F467 is girl "👧"
-    assert_line("\u{1F468 200D 1F469 200D 1F467}")
-    assert_byte_pointer_size("\u{1F468 200D 1F469 200D 1F467}")
-    assert_cursor(2)
-    assert_cursor_max(2)
-    input_keys("\u200D") # U+200D is ZERO WIDTH JOINER
-    assert_line("\u{1F468 200D 1F469 200D 1F467 200D}")
-    assert_byte_pointer_size("\u{1F468 200D 1F469 200D 1F467 200D}")
-    assert_cursor(2)
-    assert_cursor_max(2)
-    input_keys("\u{1F466}") # U+1F466 is boy "👦"
-    assert_line("\u{1F468 200D 1F469 200D 1F467 200D 1F466}")
-    assert_byte_pointer_size("\u{1F468 200D 1F469 200D 1F467 200D 1F466}")
-    assert_cursor(2)
-    assert_cursor_max(2)
-    # U+1F468 U+200D U+1F469 U+200D U+1F467 U+200D U+1F466 is family: man, woman, girl, boy "👨‍👩‍👧‍👦"
-    input_keys("\u{1F468 200D 1F469 200D 1F467 200D 1F466}")
-    assert_line("\u{1F468 200D 1F469 200D 1F467 200D 1F466 1F468 200D 1F469 200D 1F467 200D 1F466}")
-    assert_byte_pointer_size("\u{1F468 200D 1F469 200D 1F467 200D 1F466 1F468 200D 1F469 200D 1F467 200D 1F466}")
-    assert_cursor(4)
-    assert_cursor_max(4)
-  end
-
-  def test_ed_insert_for_include_valiation_selector
-    omit "This test is for UTF-8 but the locale is #{Reline.core.encoding}" if Reline.core.encoding != Encoding::UTF_8
-    # U+0030 U+FE00 is DIGIT ZERO + VARIATION SELECTOR-1 "0︀"
-    input_keys("\u0030") # U+0030 is DIGIT ZERO
-    assert_line("\u0030")
-    assert_byte_pointer_size("\u0030")
-    assert_cursor(1)
-    assert_cursor_max(1)
-    input_keys("\uFE00") # U+FE00 is VARIATION SELECTOR-1
-    assert_line("\u{0030 FE00}")
-    assert_byte_pointer_size("\u{0030 FE00}")
-    assert_cursor(1)
-    assert_cursor_max(1)
-  end
-
-  def test_em_yank_pop
-    input_keys("def hoge\C-w\C-b\C-f\C-w", false)
-    assert_byte_pointer_size('')
-    assert_cursor(0)
-    assert_cursor_max(0)
-    assert_line('')
-    input_keys("\C-y", false)
-    assert_byte_pointer_size('def ')
-    assert_cursor(4)
-    assert_cursor_max(4)
-    assert_line('def ')
-    input_keys("\M-\C-y", false)
-    assert_byte_pointer_size('hoge')
-    assert_cursor(4)
-    assert_cursor_max(4)
-    assert_line('hoge')
-  end
-
-  def test_em_kill_region_with_kill_ring
-    input_keys("def hoge\C-b\C-b\C-b\C-b", false)
-    assert_byte_pointer_size('def ')
-    assert_cursor(4)
-    assert_cursor_max(8)
-    assert_line('def hoge')
-    input_keys("\C-k\C-w", false)
-    assert_byte_pointer_size('')
-    assert_cursor(0)
-    assert_cursor_max(0)
-    assert_line('')
-    input_keys("\C-y", false)
-    assert_byte_pointer_size('def hoge')
-    assert_cursor(8)
-    assert_cursor_max(8)
-    assert_line('def hoge')
-  end
-
-  def test_ed_search_prev_next_history_in_multibyte
-    Reline::HISTORY.concat([
-      "def hoge\n  67890\n  12345\nend", # old
-      "def aiu\n  0xDEADBEEF\nend",
-      "def foo\n  12345\nend" # new
-    ])
-    @line_editor.multiline_on
-    input_keys('  123')
-    # The ed_search_prev_history doesn't have default binding
-    @line_editor.__send__(:ed_search_prev_history, "\C-p".ord)
-    assert_whole_lines(['def foo', '  12345', 'end'])
-    assert_line_index(1)
-    assert_whole_lines(['def foo', '  12345', 'end'])
-    assert_byte_pointer_size('  123')
-    assert_cursor(5)
-    assert_cursor_max(7)
-    assert_line('  12345')
-    @line_editor.__send__(:ed_search_prev_history, "\C-p".ord)
-    assert_line_index(2)
-    assert_whole_lines(['def hoge', '  67890', '  12345', 'end'])
-    assert_byte_pointer_size('  123')
-    assert_cursor(5)
-    assert_cursor_max(7)
-    assert_line('  12345')
-    @line_editor.__send__(:ed_search_prev_history, "\C-p".ord)
-    assert_line_index(2)
-    assert_whole_lines(['def hoge', '  67890', '  12345', 'end'])
-    assert_byte_pointer_size('  123')
-    assert_cursor(5)
-    assert_cursor_max(7)
-    assert_line('  12345')
-    @line_editor.__send__(:ed_search_next_history, "\C-n".ord)
-    assert_line_index(1)
-    assert_whole_lines(['def foo', '  12345', 'end'])
-    assert_byte_pointer_size('  123')
-    assert_cursor(5)
-    assert_cursor_max(7)
-    assert_line('  12345')
-    @line_editor.__send__(:ed_search_next_history, "\C-n".ord)
-    assert_line_index(1)
-    assert_whole_lines(['def foo', '  12345', 'end'])
-    assert_byte_pointer_size('  123')
-    assert_cursor(5)
-    assert_cursor_max(7)
-    assert_line('  12345')
-  end
-
-  def test_ignore_NUL_by_ed_quoted_insert
-    input_keys(%Q{"\C-v\C-@"}, false)
-    assert_byte_pointer_size('""')
-    assert_cursor(2)
-    assert_cursor_max(2)
-  end
-
-  def test_ed_argument_digit_by_meta_num
-    input_keys('abcdef')
-    assert_byte_pointer_size('abcdef')
-    assert_cursor(6)
-    assert_cursor_max(6)
-    assert_line('abcdef')
-    input_keys("\M-2", false)
-    input_keys("\C-h", false)
-    assert_byte_pointer_size('abcd')
-    assert_cursor(4)
-    assert_cursor_max(4)
-    assert_line('abcd')
-  end
-
-  def test_halfwidth_kana_width_dakuten
-    input_raw_keys('ｶﾞｷﾞｹﾞｺﾞ')
-    assert_byte_pointer_size('ｶﾞｷﾞｹﾞｺﾞ')
-    assert_cursor(8)
-    assert_cursor_max(8)
-    input_keys("\C-b\C-b", false)
-    assert_byte_pointer_size('ｶﾞｷﾞ')
-    assert_cursor(4)
-    assert_cursor_max(8)
-    input_raw_keys('ｸﾞ', false)
-    assert_byte_pointer_size('ｶﾞｷﾞｸﾞ')
-    assert_cursor(6)
-    assert_cursor_max(10)
-    assert_line('ｶﾞｷﾞｸﾞｹﾞｺﾞ')
-  end
-
-  def test_input_unknown_char
-    input_keys('͸') # U+0378 (unassigned)
-    assert_line('͸')
-    assert_byte_pointer_size('͸')
-    assert_cursor(1)
-    assert_cursor_max(1)
-  end
-
-  def test_unix_line_discard
-    input_keys("\C-u", false)
-    assert_byte_pointer_size('')
-    assert_cursor(0)
-    assert_cursor_max(0)
-    assert_line('')
-    input_keys('abc')
-    assert_byte_pointer_size('abc')
-    assert_cursor(3)
-    assert_cursor_max(3)
-    input_keys("\C-b\C-u", false)
-    assert_byte_pointer_size('')
-    assert_cursor(0)
-    assert_cursor_max(1)
-    assert_line('c')
-    input_keys("\C-f\C-u", false)
-    assert_byte_pointer_size('')
-    assert_cursor(0)
-    assert_cursor_max(0)
-    assert_line('')
-  end
-end
diff --git a/test/reline/test_key_actor_vi.rb b/test/reline/test_key_actor_vi.rb
deleted file mode 100644
index 20630e5809783c..00000000000000
--- a/test/reline/test_key_actor_vi.rb
+++ /dev/null
@@ -1,1465 +0,0 @@
-require_relative 'helper'
-
-class Reline::KeyActor::ViInsert::Test < Reline::TestCase
-  def setup
-    Reline.send(:test_mode)
-    @prompt = '> '
-    @config = Reline::Config.new
-    @config.read_lines(<<~LINES.split(/(?<=\n)/))
-      set editing-mode vi
-    LINES
-    @encoding = Reline.core.encoding
-    @line_editor = Reline::LineEditor.new(@config, @encoding)
-    @line_editor.reset(@prompt, encoding: @encoding)
-  end
-
-  def teardown
-    Reline.test_reset
-  end
-
-  def test_vi_command_mode
-    input_keys("\C-[")
-    assert_instance_of(Reline::KeyActor::ViCommand, @config.editing_mode)
-  end
-
-  def test_vi_command_mode_with_input
-    input_keys("abc\C-[")
-    assert_instance_of(Reline::KeyActor::ViCommand, @config.editing_mode)
-    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_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')
-    assert_byte_pointer_size('a')
-    assert_cursor(1)
-    assert_cursor_max(1)
-  end
-
-  def test_ed_insert_two
-    input_keys('ab')
-    assert_line('ab')
-    assert_byte_pointer_size('ab')
-    assert_cursor(2)
-    assert_cursor_max(2)
-  end
-
-  def test_ed_insert_mbchar_one
-    input_keys('か')
-    assert_line('か')
-    assert_byte_pointer_size('か')
-    assert_cursor(2)
-    assert_cursor_max(2)
-  end
-
-  def test_ed_insert_mbchar_two
-    input_keys('かき')
-    assert_line('かき')
-    assert_byte_pointer_size('かき')
-    assert_cursor(4)
-    assert_cursor_max(4)
-  end
-
-  def test_ed_insert_for_mbchar_by_plural_code_points
-    input_keys("か\u3099")
-    assert_line("か\u3099")
-    assert_byte_pointer_size("か\u3099")
-    assert_cursor(2)
-    assert_cursor_max(2)
-  end
-
-  def test_ed_insert_for_plural_mbchar_by_plural_code_points
-    input_keys("か\u3099き\u3099")
-    assert_line("か\u3099き\u3099")
-    assert_byte_pointer_size("か\u3099き\u3099")
-    assert_cursor(4)
-    assert_cursor_max(4)
-  end
-
-  def test_ed_next_char
-    input_keys("abcdef\C-[0")
-    assert_line('abcdef')
-    assert_byte_pointer_size('')
-    assert_cursor(0)
-    assert_cursor_max(6)
-    input_keys('l')
-    assert_line('abcdef')
-    assert_byte_pointer_size('a')
-    assert_cursor(1)
-    assert_cursor_max(6)
-    input_keys('2l')
-    assert_line('abcdef')
-    assert_byte_pointer_size('abc')
-    assert_cursor(3)
-    assert_cursor_max(6)
-  end
-
-  def test_ed_prev_char
-    input_keys("abcdef\C-[")
-    assert_line('abcdef')
-    assert_byte_pointer_size('abcde')
-    assert_cursor(5)
-    assert_cursor_max(6)
-    input_keys('h')
-    assert_line('abcdef')
-    assert_byte_pointer_size('abcd')
-    assert_cursor(4)
-    assert_cursor_max(6)
-    input_keys('2h')
-    assert_line('abcdef')
-    assert_byte_pointer_size('ab')
-    assert_cursor(2)
-    assert_cursor_max(6)
-  end
-
-  def test_history
-    Reline::HISTORY.concat(%w{abc 123 AAA})
-    input_keys("\C-[")
-    assert_line('')
-    assert_byte_pointer_size('')
-    assert_cursor(0)
-    assert_cursor_max(0)
-    input_keys('k')
-    assert_line('AAA')
-    assert_byte_pointer_size('')
-    assert_cursor(0)
-    assert_cursor_max(3)
-    input_keys('2k')
-    assert_line('abc')
-    assert_byte_pointer_size('')
-    assert_cursor(0)
-    assert_cursor_max(3)
-    input_keys('j')
-    assert_line('123')
-    assert_byte_pointer_size('')
-    assert_cursor(0)
-    assert_cursor_max(3)
-    input_keys('2j')
-    assert_line('')
-    assert_byte_pointer_size('')
-    assert_cursor(0)
-    assert_cursor_max(0)
-  end
-
-  def test_vi_paste_prev
-    input_keys("abcde\C-[3h")
-    assert_line('abcde')
-    assert_byte_pointer_size('a')
-    assert_cursor(1)
-    assert_cursor_max(5)
-    input_keys('P')
-    assert_line('abcde')
-    assert_byte_pointer_size('a')
-    assert_cursor(1)
-    assert_cursor_max(5)
-    input_keys('d$')
-    assert_line('a')
-    assert_byte_pointer_size('')
-    assert_cursor(0)
-    assert_cursor_max(1)
-    input_keys('P')
-    assert_line('bcdea')
-    assert_byte_pointer_size('bcd')
-    assert_cursor(3)
-    assert_cursor_max(5)
-    input_keys('2P')
-    assert_line('bcdbcdbcdeeea')
-    assert_byte_pointer_size('bcdbcdbcd')
-    assert_cursor(9)
-    assert_cursor_max(13)
-  end
-
-  def test_vi_paste_next
-    input_keys("abcde\C-[3h")
-    assert_line('abcde')
-    assert_byte_pointer_size('a')
-    assert_cursor(1)
-    assert_cursor_max(5)
-    input_keys('p')
-    assert_line('abcde')
-    assert_byte_pointer_size('a')
-    assert_cursor(1)
-    assert_cursor_max(5)
-    input_keys('d$')
-    assert_line('a')
-    assert_byte_pointer_size('')
-    assert_cursor(0)
-    assert_cursor_max(1)
-    input_keys('p')
-    assert_line('abcde')
-    assert_byte_pointer_size('abcd')
-    assert_cursor(4)
-    assert_cursor_max(5)
-    input_keys('2p')
-    assert_line('abcdebcdebcde')
-    assert_byte_pointer_size('abcdebcdebcd')
-    assert_cursor(12)
-    assert_cursor_max(13)
-  end
-
-  def test_vi_paste_prev_for_mbchar
-    input_keys("あいうえお\C-[3h")
-    assert_line('あいうえお')
-    assert_byte_pointer_size('あ')
-    assert_cursor(2)
-    assert_cursor_max(10)
-    input_keys('P')
-    assert_line('あいうえお')
-    assert_byte_pointer_size('あ')
-    assert_cursor(2)
-    assert_cursor_max(10)
-    input_keys('d$')
-    assert_line('あ')
-    assert_byte_pointer_size('')
-    assert_cursor(0)
-    assert_cursor_max(2)
-    input_keys('P')
-    assert_line('いうえおあ')
-    assert_byte_pointer_size('いうえ')
-    assert_cursor(6)
-    assert_cursor_max(10)
-    input_keys('2P')
-    assert_line('いうえいうえいうえおおおあ')
-    assert_byte_pointer_size('いうえいうえいうえ')
-    assert_cursor(18)
-    assert_cursor_max(26)
-  end
-
-  def test_vi_paste_next_for_mbchar
-    input_keys("あいうえお\C-[3h")
-    assert_line('あいうえお')
-    assert_byte_pointer_size('あ')
-    assert_cursor(2)
-    assert_cursor_max(10)
-    input_keys('p')
-    assert_line('あいうえお')
-    assert_byte_pointer_size('あ')
-    assert_cursor(2)
-    assert_cursor_max(10)
-    input_keys('d$')
-    assert_line('あ')
-    assert_byte_pointer_size('')
-    assert_cursor(0)
-    assert_cursor_max(2)
-    input_keys('p')
-    assert_line('あいうえお')
-    assert_byte_pointer_size('あいうえ')
-    assert_cursor(8)
-    assert_cursor_max(10)
-    input_keys('2p')
-    assert_line('あいうえおいうえおいうえお')
-    assert_byte_pointer_size('あいうえおいうえおいうえ')
-    assert_cursor(24)
-    assert_cursor_max(26)
-  end
-
-  def test_vi_paste_prev_for_mbchar_by_plural_code_points
-    input_keys("か\u3099き\u3099く\u3099け\u3099こ\u3099\C-[3h")
-    assert_line("か\u3099き\u3099く\u3099け\u3099こ\u3099")
-    assert_byte_pointer_size("か\u3099")
-    assert_cursor(2)
-    assert_cursor_max(10)
-    input_keys('P')
-    assert_line("か\u3099き\u3099く\u3099け\u3099こ\u3099")
-    assert_byte_pointer_size("か\u3099")
-    assert_cursor(2)
-    assert_cursor_max(10)
-    input_keys('d$')
-    assert_line("か\u3099")
-    assert_byte_pointer_size('')
-    assert_cursor(0)
-    assert_cursor_max(2)
-    input_keys('P')
-    assert_line("き\u3099く\u3099け\u3099こ\u3099か\u3099")
-    assert_byte_pointer_size("き\u3099く\u3099け\u3099")
-    assert_cursor(6)
-    assert_cursor_max(10)
-    input_keys('2P')
-    assert_line("き\u3099く\u3099け\u3099き\u3099く\u3099け\u3099き\u3099く\u3099け\u3099こ\u3099こ\u3099こ\u3099か\u3099")
-    assert_byte_pointer_size("き\u3099く\u3099け\u3099き\u3099く\u3099け\u3099き\u3099く\u3099け\u3099")
-    assert_cursor(18)
-    assert_cursor_max(26)
-  end
-
-  def test_vi_paste_next_for_mbchar_by_plural_code_points
-    input_keys("か\u3099き\u3099く\u3099け\u3099こ\u3099\C-[3h")
-    assert_line("か\u3099き\u3099く\u3099け\u3099こ\u3099")
-    assert_byte_pointer_size("か\u3099")
-    assert_cursor(2)
-    assert_cursor_max(10)
-    input_keys('p')
-    assert_line("か\u3099き\u3099く\u3099け\u3099こ\u3099")
-    assert_byte_pointer_size("か\u3099")
-    assert_cursor(2)
-    assert_cursor_max(10)
-    input_keys('d$')
-    assert_line("か\u3099")
-    assert_byte_pointer_size('')
-    assert_cursor(0)
-    assert_cursor_max(2)
-    input_keys('p')
-    assert_line("か\u3099き\u3099く\u3099け\u3099こ\u3099")
-    assert_byte_pointer_size("か\u3099き\u3099く\u3099け\u3099")
-    assert_cursor(8)
-    assert_cursor_max(10)
-    input_keys('2p')
-    assert_line("か\u3099き\u3099く\u3099け\u3099こ\u3099き\u3099く\u3099け\u3099こ\u3099き\u3099く\u3099け\u3099こ\u3099")
-    assert_byte_pointer_size("か\u3099き\u3099く\u3099け\u3099こ\u3099き\u3099く\u3099け\u3099こ\u3099き\u3099く\u3099け\u3099")
-    assert_cursor(24)
-    assert_cursor_max(26)
-  end
-
-  def test_vi_prev_next_word
-    input_keys("aaa b{b}b ccc\C-[0")
-    assert_byte_pointer_size('')
-    assert_cursor(0)
-    assert_cursor_max(13)
-    input_keys('w')
-    assert_byte_pointer_size('aaa ')
-    assert_cursor(4)
-    assert_cursor_max(13)
-    input_keys('w')
-    assert_byte_pointer_size('aaa b')
-    assert_cursor(5)
-    assert_cursor_max(13)
-    input_keys('w')
-    assert_byte_pointer_size('aaa b{')
-    assert_cursor(6)
-    assert_cursor_max(13)
-    input_keys('w')
-    assert_byte_pointer_size('aaa b{b')
-    assert_cursor(7)
-    assert_cursor_max(13)
-    input_keys('w')
-    assert_byte_pointer_size('aaa b{b}')
-    assert_cursor(8)
-    assert_cursor_max(13)
-    input_keys('w')
-    assert_byte_pointer_size('aaa b{b}b ')
-    assert_cursor(10)
-    assert_cursor_max(13)
-    input_keys('w')
-    assert_byte_pointer_size('aaa b{b}b cc')
-    assert_cursor(12)
-    assert_cursor_max(13)
-    input_keys('b')
-    assert_byte_pointer_size('aaa b{b}b ')
-    assert_cursor(10)
-    assert_cursor_max(13)
-    input_keys('b')
-    assert_byte_pointer_size('aaa b{b}')
-    assert_cursor(8)
-    assert_cursor_max(13)
-    input_keys('b')
-    assert_byte_pointer_size('aaa b{b')
-    assert_cursor(7)
-    assert_cursor_max(13)
-    input_keys('b')
-    assert_byte_pointer_size('aaa b{')
-    assert_cursor(6)
-    assert_cursor_max(13)
-    input_keys('b')
-    assert_byte_pointer_size('aaa b')
-    assert_cursor(5)
-    assert_cursor_max(13)
-    input_keys('b')
-    assert_byte_pointer_size('aaa ')
-    assert_cursor(4)
-    assert_cursor_max(13)
-    input_keys('b')
-    assert_byte_pointer_size('')
-    assert_cursor(0)
-    assert_cursor_max(13)
-    input_keys('3w')
-    assert_byte_pointer_size('aaa b{')
-    assert_cursor(6)
-    assert_cursor_max(13)
-    input_keys('3w')
-    assert_byte_pointer_size('aaa b{b}b ')
-    assert_cursor(10)
-    assert_cursor_max(13)
-    input_keys('3w')
-    assert_byte_pointer_size('aaa b{b}b cc')
-    assert_cursor(12)
-    assert_cursor_max(13)
-    input_keys('3b')
-    assert_byte_pointer_size('aaa b{b')
-    assert_cursor(7)
-    assert_cursor_max(13)
-    input_keys('3b')
-    assert_byte_pointer_size('aaa ')
-    assert_cursor(4)
-    assert_cursor_max(13)
-    input_keys('3b')
-    assert_byte_pointer_size('')
-    assert_cursor(0)
-    assert_cursor_max(13)
-  end
-
-  def test_vi_end_word
-    input_keys("aaa   b{b}}}b   ccc\C-[0")
-    assert_byte_pointer_size('')
-    assert_cursor(0)
-    assert_cursor_max(19)
-    input_keys('e')
-    assert_byte_pointer_size('aa')
-    assert_cursor(2)
-    assert_cursor_max(19)
-    input_keys('e')
-    assert_byte_pointer_size('aaa   ')
-    assert_cursor(6)
-    assert_cursor_max(19)
-    input_keys('e')
-    assert_byte_pointer_size('aaa   b')
-    assert_cursor(7)
-    assert_cursor_max(19)
-    input_keys('e')
-    assert_byte_pointer_size('aaa   b{')
-    assert_cursor(8)
-    assert_cursor_max(19)
-    input_keys('e')
-    assert_byte_pointer_size('aaa   b{b}}')
-    assert_cursor(11)
-    assert_cursor_max(19)
-    input_keys('e')
-    assert_byte_pointer_size('aaa   b{b}}}')
-    assert_cursor(12)
-    assert_cursor_max(19)
-    input_keys('e')
-    assert_byte_pointer_size('aaa   b{b}}}b   cc')
-    assert_cursor(18)
-    assert_cursor_max(19)
-    input_keys('e')
-    assert_byte_pointer_size('aaa   b{b}}}b   cc')
-    assert_cursor(18)
-    assert_cursor_max(19)
-    input_keys('03e')
-    assert_byte_pointer_size('aaa   b')
-    assert_cursor(7)
-    assert_cursor_max(19)
-    input_keys('3e')
-    assert_byte_pointer_size('aaa   b{b}}}')
-    assert_cursor(12)
-    assert_cursor_max(19)
-    input_keys('3e')
-    assert_byte_pointer_size('aaa   b{b}}}b   cc')
-    assert_cursor(18)
-    assert_cursor_max(19)
-  end
-
-  def test_vi_prev_next_big_word
-    input_keys("aaa b{b}b ccc\C-[0")
-    assert_byte_pointer_size('')
-    assert_cursor(0)
-    assert_cursor_max(13)
-    input_keys('W')
-    assert_byte_pointer_size('aaa ')
-    assert_cursor(4)
-    assert_cursor_max(13)
-    input_keys('W')
-    assert_byte_pointer_size('aaa b{b}b ')
-    assert_cursor(10)
-    assert_cursor_max(13)
-    input_keys('W')
-    assert_byte_pointer_size('aaa b{b}b cc')
-    assert_cursor(12)
-    assert_cursor_max(13)
-    input_keys('B')
-    assert_byte_pointer_size('aaa b{b}b ')
-    assert_cursor(10)
-    assert_cursor_max(13)
-    input_keys('B')
-    assert_byte_pointer_size('aaa ')
-    assert_cursor(4)
-    assert_cursor_max(13)
-    input_keys('B')
-    assert_byte_pointer_size('')
-    assert_cursor(0)
-    assert_cursor_max(13)
-    input_keys('2W')
-    assert_byte_pointer_size('aaa b{b}b ')
-    assert_cursor(10)
-    assert_cursor_max(13)
-    input_keys('2W')
-    assert_byte_pointer_size('aaa b{b}b cc')
-    assert_cursor(12)
-    assert_cursor_max(13)
-    input_keys('2B')
-    assert_byte_pointer_size('aaa ')
-    assert_cursor(4)
-    assert_cursor_max(13)
-    input_keys('2B')
-    assert_byte_pointer_size('')
-    assert_cursor(0)
-    assert_cursor_max(13)
-  end
-
-  def test_vi_end_big_word
-    input_keys("aaa   b{b}}}b   ccc\C-[0")
-    assert_byte_pointer_size('')
-    assert_cursor(0)
-    assert_cursor_max(19)
-    input_keys('E')
-    assert_byte_pointer_size('aa')
-    assert_cursor(2)
-    assert_cursor_max(19)
-    input_keys('E')
-    assert_byte_pointer_size('aaa   b{b}}}')
-    assert_cursor(12)
-    assert_cursor_max(19)
-    input_keys('E')
-    assert_byte_pointer_size('aaa   b{b}}}b   cc')
-    assert_cursor(18)
-    assert_cursor_max(19)
-    input_keys('E')
-    assert_byte_pointer_size('aaa   b{b}}}b   cc')
-    assert_cursor(18)
-    assert_cursor_max(19)
-  end
-
-  def test_ed_quoted_insert
-    input_keys("ab\C-v\C-acd")
-    assert_line("ab\C-acd")
-    assert_byte_pointer_size("ab\C-acd")
-    assert_cursor(6)
-    assert_cursor_max(6)
-  end
-
-  def test_ed_quoted_insert_with_vi_arg
-    input_keys("ab\C-[3\C-v\C-aacd")
-    assert_line("a\C-a\C-a\C-abcd")
-    assert_byte_pointer_size("a\C-a\C-a\C-abcd")
-    assert_cursor(10)
-    assert_cursor_max(10)
-  end
-
-  def test_vi_replace_char
-    input_keys("abcdef\C-[03l")
-    assert_line('abcdef')
-    assert_byte_pointer_size('abc')
-    assert_cursor(3)
-    assert_cursor_max(6)
-    input_keys('rz')
-    assert_line('abczef')
-    assert_byte_pointer_size('abc')
-    assert_cursor(3)
-    assert_cursor_max(6)
-    input_keys('2rx')
-    assert_line('abcxxf')
-    assert_byte_pointer_size('abcxx')
-    assert_cursor(5)
-    assert_cursor_max(6)
-  end
-
-  def test_vi_replace_char_with_mbchar
-    input_keys("あいうえお\C-[0l")
-    assert_line('あいうえお')
-    assert_byte_pointer_size('あ')
-    assert_cursor(2)
-    assert_cursor_max(10)
-    input_keys('rx')
-    assert_line('あxうえお')
-    assert_byte_pointer_size('あ')
-    assert_cursor(2)
-    assert_cursor_max(9)
-    input_keys('l2ry')
-    assert_line('あxyyお')
-    assert_byte_pointer_size('あxyy')
-    assert_cursor(5)
-    assert_cursor_max(7)
-  end
-
-  def test_vi_next_char
-    input_keys("abcdef\C-[0")
-    assert_line('abcdef')
-    assert_byte_pointer_size('')
-    assert_cursor(0)
-    assert_cursor_max(6)
-    input_keys('fz')
-    assert_line('abcdef')
-    assert_byte_pointer_size('')
-    assert_cursor(0)
-    assert_cursor_max(6)
-    input_keys('fe')
-    assert_line('abcdef')
-    assert_byte_pointer_size('abcd')
-    assert_cursor(4)
-    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_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')
-    assert_cursor(1)
-    assert_cursor_max(3)
-    assert_line('abc')
-    input_keys('x')
-    assert_byte_pointer_size('a')
-    assert_cursor(1)
-    assert_cursor_max(2)
-    assert_line('ac')
-    input_keys('x')
-    assert_byte_pointer_size('')
-    assert_cursor(0)
-    assert_cursor_max(1)
-    assert_line('a')
-    input_keys('x')
-    assert_byte_pointer_size('')
-    assert_cursor(0)
-    assert_cursor_max(0)
-    assert_line('')
-    input_keys('x')
-    assert_byte_pointer_size('')
-    assert_cursor(0)
-    assert_cursor_max(0)
-    assert_line('')
-  end
-
-  def test_vi_delete_next_char_for_mbchar
-    input_keys("あいう\C-[h")
-    assert_byte_pointer_size('あ')
-    assert_cursor(2)
-    assert_cursor_max(6)
-    assert_line('あいう')
-    input_keys('x')
-    assert_byte_pointer_size('あ')
-    assert_cursor(2)
-    assert_cursor_max(4)
-    assert_line('あう')
-    input_keys('x')
-    assert_byte_pointer_size('')
-    assert_cursor(0)
-    assert_cursor_max(2)
-    assert_line('あ')
-    input_keys('x')
-    assert_byte_pointer_size('')
-    assert_cursor(0)
-    assert_cursor_max(0)
-    assert_line('')
-    input_keys('x')
-    assert_byte_pointer_size('')
-    assert_cursor(0)
-    assert_cursor_max(0)
-    assert_line('')
-  end
-
-  def test_vi_delete_next_char_for_mbchar_by_plural_code_points
-    input_keys("か\u3099き\u3099く\u3099\C-[h")
-    assert_byte_pointer_size("か\u3099")
-    assert_cursor(2)
-    assert_cursor_max(6)
-    assert_line("か\u3099き\u3099く\u3099")
-    input_keys('x')
-    assert_byte_pointer_size("か\u3099")
-    assert_cursor(2)
-    assert_cursor_max(4)
-    assert_line("か\u3099く\u3099")
-    input_keys('x')
-    assert_byte_pointer_size('')
-    assert_cursor(0)
-    assert_cursor_max(2)
-    assert_line("か\u3099")
-    input_keys('x')
-    assert_byte_pointer_size('')
-    assert_cursor(0)
-    assert_cursor_max(0)
-    assert_line('')
-    input_keys('x')
-    assert_byte_pointer_size('')
-    assert_cursor(0)
-    assert_cursor_max(0)
-    assert_line('')
-  end
-
-  def test_vi_delete_prev_char
-    input_keys('ab')
-    assert_byte_pointer_size('ab')
-    assert_cursor(2)
-    assert_cursor_max(2)
-    input_keys("\C-h")
-    assert_byte_pointer_size('a')
-    assert_cursor(1)
-    assert_cursor_max(1)
-    assert_line('a')
-  end
-
-  def test_vi_delete_prev_char_for_mbchar
-    input_keys('かき')
-    assert_byte_pointer_size('かき')
-    assert_cursor(4)
-    assert_cursor_max(4)
-    input_keys("\C-h")
-    assert_byte_pointer_size('か')
-    assert_cursor(2)
-    assert_cursor_max(2)
-    assert_line('か')
-  end
-
-  def test_vi_delete_prev_char_for_mbchar_by_plural_code_points
-    input_keys("か\u3099き\u3099")
-    assert_byte_pointer_size("か\u3099き\u3099")
-    assert_cursor(4)
-    assert_cursor_max(4)
-    input_keys("\C-h")
-    assert_byte_pointer_size("か\u3099")
-    assert_cursor(2)
-    assert_cursor_max(2)
-    assert_line("か\u3099")
-  end
-
-  def test_ed_delete_prev_char
-    input_keys("abcdefg\C-[h")
-    assert_byte_pointer_size('abcde')
-    assert_cursor(5)
-    assert_cursor_max(7)
-    assert_line('abcdefg')
-    input_keys('X')
-    assert_byte_pointer_size('abcd')
-    assert_cursor(4)
-    assert_cursor_max(6)
-    assert_line('abcdfg')
-    input_keys('3X')
-    assert_byte_pointer_size('a')
-    assert_cursor(1)
-    assert_cursor_max(3)
-    assert_line('afg')
-    input_keys('p')
-    assert_byte_pointer_size('abcd')
-    assert_cursor(4)
-    assert_cursor_max(6)
-    assert_line('afbcdg')
-  end
-
-  def test_ed_delete_prev_word
-    input_keys('abc def{bbb}ccc')
-    assert_byte_pointer_size('abc def{bbb}ccc')
-    assert_cursor(15)
-    assert_cursor_max(15)
-    input_keys("\C-w")
-    assert_byte_pointer_size('abc def{bbb}')
-    assert_cursor(12)
-    assert_cursor_max(12)
-    assert_line('abc def{bbb}')
-    input_keys("\C-w")
-    assert_byte_pointer_size('abc def{')
-    assert_cursor(8)
-    assert_cursor_max(8)
-    assert_line('abc def{')
-    input_keys("\C-w")
-    assert_byte_pointer_size('abc ')
-    assert_cursor(4)
-    assert_cursor_max(4)
-    assert_line('abc ')
-    input_keys("\C-w")
-    assert_byte_pointer_size('')
-    assert_cursor(0)
-    assert_cursor_max(0)
-    assert_line('')
-  end
-
-  def test_ed_delete_prev_word_for_mbchar
-    input_keys('あいう かきく{さしす}たちつ')
-    assert_byte_pointer_size('あいう かきく{さしす}たちつ')
-    assert_cursor(27)
-    assert_cursor_max(27)
-    input_keys("\C-w")
-    assert_byte_pointer_size('あいう かきく{さしす}')
-    assert_cursor(21)
-    assert_cursor_max(21)
-    assert_line('あいう かきく{さしす}')
-    input_keys("\C-w")
-    assert_byte_pointer_size('あいう かきく{')
-    assert_cursor(14)
-    assert_cursor_max(14)
-    assert_line('あいう かきく{')
-    input_keys("\C-w")
-    assert_byte_pointer_size('あいう ')
-    assert_cursor(7)
-    assert_cursor_max(7)
-    assert_line('あいう ')
-    input_keys("\C-w")
-    assert_byte_pointer_size('')
-    assert_cursor(0)
-    assert_cursor_max(0)
-    assert_line('')
-  end
-
-  def test_ed_delete_prev_word_for_mbchar_by_plural_code_points
-    input_keys("あいう か\u3099き\u3099く\u3099{さしす}たちつ")
-    assert_byte_pointer_size("あいう か\u3099き\u3099く\u3099{さしす}たちつ")
-    assert_cursor(27)
-    assert_cursor_max(27)
-    input_keys("\C-w")
-    assert_byte_pointer_size("あいう か\u3099き\u3099く\u3099{さしす}")
-    assert_cursor(21)
-    assert_cursor_max(21)
-    assert_line("あいう か\u3099き\u3099く\u3099{さしす}")
-    input_keys("\C-w")
-    assert_byte_pointer_size("あいう か\u3099き\u3099く\u3099{")
-    assert_cursor(14)
-    assert_cursor_max(14)
-    assert_line("あいう か\u3099き\u3099く\u3099{")
-    input_keys("\C-w")
-    assert_byte_pointer_size('あいう ')
-    assert_cursor(7)
-    assert_cursor_max(7)
-    assert_line('あいう ')
-    input_keys("\C-w")
-    assert_byte_pointer_size('')
-    assert_cursor(0)
-    assert_cursor_max(0)
-    assert_line('')
-  end
-
-  def test_ed_newline_with_cr
-    input_keys('ab')
-    assert_byte_pointer_size('ab')
-    assert_cursor(2)
-    assert_cursor_max(2)
-    refute(@line_editor.finished?)
-    input_keys("\C-m")
-    assert_line('ab')
-    assert(@line_editor.finished?)
-  end
-
-  def test_ed_newline_with_lf
-    input_keys('ab')
-    assert_byte_pointer_size('ab')
-    assert_cursor(2)
-    assert_cursor_max(2)
-    refute(@line_editor.finished?)
-    input_keys("\C-j")
-    assert_line('ab')
-    assert(@line_editor.finished?)
-  end
-
-  def test_vi_list_or_eof
-    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('ab')
-    assert(@line_editor.finished?)
-  end
-
-  def test_completion_journey
-    @line_editor.completion_proc = proc { |word|
-      %w{
-        foo_bar
-        foo_bar_baz
-      }.map { |i|
-        i.encode(@encoding)
-      }
-    }
-    input_keys('foo')
-    assert_byte_pointer_size('foo')
-    assert_cursor(3)
-    assert_cursor_max(3)
-    assert_line('foo')
-    input_keys("\C-n")
-    assert_byte_pointer_size('foo_bar')
-    assert_cursor(7)
-    assert_cursor_max(7)
-    assert_line('foo_bar')
-    input_keys("\C-n")
-    assert_byte_pointer_size('foo_bar_baz')
-    assert_cursor(11)
-    assert_cursor_max(11)
-    assert_line('foo_bar_baz')
-    input_keys("\C-n")
-    assert_byte_pointer_size('foo')
-    assert_cursor(3)
-    assert_cursor_max(3)
-    assert_line('foo')
-    input_keys("\C-n")
-    assert_byte_pointer_size('foo_bar')
-    assert_cursor(7)
-    assert_cursor_max(7)
-    assert_line('foo_bar')
-    input_keys("_\C-n")
-    assert_byte_pointer_size('foo_bar_baz')
-    assert_cursor(11)
-    assert_cursor_max(11)
-    assert_line('foo_bar_baz')
-    input_keys("\C-n")
-    assert_byte_pointer_size('foo_bar_')
-    assert_cursor(8)
-    assert_cursor_max(8)
-    assert_line('foo_bar_')
-  end
-
-  def test_completion_journey_reverse
-    @line_editor.completion_proc = proc { |word|
-      %w{
-        foo_bar
-        foo_bar_baz
-      }.map { |i|
-        i.encode(@encoding)
-      }
-    }
-    input_keys('foo')
-    assert_byte_pointer_size('foo')
-    assert_cursor(3)
-    assert_cursor_max(3)
-    assert_line('foo')
-    input_keys("\C-p")
-    assert_byte_pointer_size('foo_bar_baz')
-    assert_cursor(11)
-    assert_cursor_max(11)
-    assert_line('foo_bar_baz')
-    input_keys("\C-p")
-    assert_byte_pointer_size('foo_bar')
-    assert_cursor(7)
-    assert_cursor_max(7)
-    assert_line('foo_bar')
-    input_keys("\C-p")
-    assert_byte_pointer_size('foo')
-    assert_cursor(3)
-    assert_cursor_max(3)
-    assert_line('foo')
-    input_keys("\C-p")
-    assert_byte_pointer_size('foo_bar_baz')
-    assert_cursor(11)
-    assert_cursor_max(11)
-    assert_line('foo_bar_baz')
-    input_keys("\C-h\C-p")
-    assert_byte_pointer_size('foo_bar_baz')
-    assert_cursor(11)
-    assert_cursor_max(11)
-    assert_line('foo_bar_baz')
-    input_keys("\C-p")
-    assert_byte_pointer_size('foo_bar_ba')
-    assert_cursor(10)
-    assert_cursor_max(10)
-    assert_line('foo_bar_ba')
-  end
-
-  def test_completion_journey_in_middle_of_line
-    @line_editor.completion_proc = proc { |word|
-      %w{
-        foo_bar
-        foo_bar_baz
-      }.map { |i|
-        i.encode(@encoding)
-      }
-    }
-    input_keys('abcde fo ABCDE')
-    assert_line('abcde fo ABCDE')
-    input_keys("\C-[" + 'h' * 5 + "i\C-n")
-    assert_byte_pointer_size('abcde foo_bar')
-    assert_cursor(13)
-    assert_cursor_max(19)
-    assert_line('abcde foo_bar ABCDE')
-    input_keys("\C-n")
-    assert_byte_pointer_size('abcde foo_bar_baz')
-    assert_cursor(17)
-    assert_cursor_max(23)
-    assert_line('abcde foo_bar_baz ABCDE')
-    input_keys("\C-n")
-    assert_byte_pointer_size('abcde fo')
-    assert_cursor(8)
-    assert_cursor_max(14)
-    assert_line('abcde fo ABCDE')
-    input_keys("\C-n")
-    assert_byte_pointer_size('abcde foo_bar')
-    assert_cursor(13)
-    assert_cursor_max(19)
-    assert_line('abcde foo_bar ABCDE')
-    input_keys("_\C-n")
-    assert_byte_pointer_size('abcde foo_bar_baz')
-    assert_cursor(17)
-    assert_cursor_max(23)
-    assert_line('abcde foo_bar_baz ABCDE')
-    input_keys("\C-n")
-    assert_byte_pointer_size('abcde foo_bar_')
-    assert_cursor(14)
-    assert_cursor_max(20)
-    assert_line('abcde foo_bar_ ABCDE')
-    input_keys("\C-n")
-    assert_byte_pointer_size('abcde foo_bar_baz')
-    assert_cursor(17)
-    assert_cursor_max(23)
-    assert_line('abcde foo_bar_baz ABCDE')
-  end
-
-  def test_completion
-    @line_editor.completion_proc = proc { |word|
-      %w{
-        foo_bar
-        foo_bar_baz
-      }.map { |i|
-        i.encode(@encoding)
-      }
-    }
-    input_keys('foo')
-    assert_byte_pointer_size('foo')
-    assert_cursor(3)
-    assert_cursor_max(3)
-    assert_line('foo')
-    input_keys("\C-i")
-    assert_byte_pointer_size('foo_bar')
-    assert_cursor(7)
-    assert_cursor_max(7)
-    assert_line('foo_bar')
-  end
-
-  def test_completion_with_disable_completion
-    @config.disable_completion = true
-    @line_editor.completion_proc = proc { |word|
-      %w{
-        foo_bar
-        foo_bar_baz
-      }.map { |i|
-        i.encode(@encoding)
-      }
-    }
-    input_keys('foo')
-    assert_byte_pointer_size('foo')
-    assert_cursor(3)
-    assert_cursor_max(3)
-    assert_line('foo')
-    input_keys("\C-i")
-    assert_byte_pointer_size('foo')
-    assert_cursor(3)
-    assert_cursor_max(3)
-    assert_line('foo')
-  end
-
-  def test_vi_first_print
-    input_keys("abcde\C-[^")
-    assert_byte_pointer_size('')
-    assert_cursor(0)
-    assert_cursor_max(5)
-    input_keys("0\C-ki")
-    input_keys(" abcde\C-[^")
-    assert_byte_pointer_size(' ')
-    assert_cursor(1)
-    assert_cursor_max(6)
-    input_keys("0\C-ki")
-    input_keys("   abcde  ABCDE  \C-[^")
-    assert_byte_pointer_size('   ')
-    assert_cursor(3)
-    assert_cursor_max(17)
-  end
-
-  def test_ed_move_to_beg
-    input_keys("abcde\C-[0")
-    assert_byte_pointer_size('')
-    assert_cursor(0)
-    assert_cursor_max(5)
-    input_keys("0\C-ki")
-    input_keys(" abcde\C-[0")
-    assert_byte_pointer_size('')
-    assert_cursor(0)
-    assert_cursor_max(6)
-    input_keys("0\C-ki")
-    input_keys("   abcde  ABCDE  \C-[0")
-    assert_byte_pointer_size('')
-    assert_cursor(0)
-    assert_cursor_max(17)
-  end
-
-  def test_vi_delete_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('dw')
-    assert_byte_pointer_size('aaa bbb ')
-    assert_cursor(8)
-    assert_cursor_max(15)
-    assert_line('aaa bbb ddd eee')
-    input_keys('db')
-    assert_byte_pointer_size('aaa ')
-    assert_cursor(4)
-    assert_cursor_max(11)
-    assert_line('aaa ddd eee')
-  end
-
-  def test_vi_delete_meta_with_vi_next_word_at_eol
-    input_keys("foo bar\C-[0w")
-    assert_byte_pointer_size('foo ')
-    assert_cursor(4)
-    assert_cursor_max(7)
-    assert_line('foo bar')
-    input_keys('w')
-    assert_byte_pointer_size('foo ba')
-    assert_cursor(6)
-    assert_cursor_max(7)
-    assert_line('foo bar')
-    input_keys('0dw')
-    assert_byte_pointer_size('')
-    assert_cursor(0)
-    assert_cursor_max(3)
-    assert_line('bar')
-    input_keys('dw')
-    assert_byte_pointer_size('')
-    assert_cursor(0)
-    assert_cursor_max(0)
-    assert_line('')
-  end
-
-  def test_vi_delete_meta_with_vi_next_char
-    input_keys("aaa bbb ccc ___ ddd\C-[02w")
-    assert_byte_pointer_size('aaa bbb ')
-    assert_cursor(8)
-    assert_cursor_max(19)
-    assert_line('aaa bbb ccc ___ ddd')
-    input_keys('df_')
-    assert_byte_pointer_size('aaa bbb ')
-    assert_cursor(8)
-    assert_cursor_max(14)
-    assert_line('aaa bbb __ ddd')
-  end
-
-  def test_vi_delete_meta_with_arg
-    input_keys("aaa bbb ccc\C-[02w")
-    assert_byte_pointer_size('aaa bbb ')
-    assert_cursor(8)
-    assert_cursor_max(11)
-    assert_line('aaa bbb ccc')
-    input_keys('2dl')
-    assert_byte_pointer_size('aaa bbb ')
-    assert_cursor(8)
-    assert_cursor_max(9)
-    assert_line('aaa bbb c')
-  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(13)
-    assert_cursor_max(21)
-    assert_line('aaa bbb aiueo ddd eee')
-    input_keys("\C-[")
-    assert_byte_pointer_size('aaa bbb aiue')
-    assert_cursor(12)
-    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(17)
-    assert_line('aaa bbb o ddd eee')
-  end
-
-  def test_vi_change_meta_with_vi_next_word
-    input_keys("foo  bar  baz\C-[0w")
-    assert_byte_pointer_size('foo  ')
-    assert_cursor(5)
-    assert_cursor_max(13)
-    assert_line('foo  bar  baz')
-    input_keys('cwhoge')
-    assert_byte_pointer_size('foo  hoge')
-    assert_cursor(9)
-    assert_cursor_max(14)
-    assert_line('foo  hoge  baz')
-    input_keys("\C-[")
-    assert_byte_pointer_size('foo  hog')
-    assert_cursor(8)
-    assert_cursor_max(14)
-    assert_line('foo  hoge  baz')
-  end
-
-  def test_unimplemented_vi_command_should_be_no_op
-    input_keys("abc\C-[h")
-    assert_byte_pointer_size('a')
-    assert_cursor(1)
-    assert_cursor_max(3)
-    assert_line('abc')
-    input_keys('@')
-    assert_byte_pointer_size('a')
-    assert_cursor(1)
-    assert_cursor_max(3)
-    assert_line('abc')
-  end
-
-  def test_vi_yank
-    input_keys("foo bar\C-[0")
-    assert_line('foo bar')
-    assert_byte_pointer_size('')
-    assert_cursor(0)
-    assert_cursor_max(7)
-    input_keys('y3l')
-    assert_line('foo bar')
-    assert_byte_pointer_size('')
-    assert_cursor(0)
-    assert_cursor_max(7)
-    input_keys('P')
-    assert_line('foofoo bar')
-    assert_byte_pointer_size('fo')
-    assert_cursor(2)
-    assert_cursor_max(10)
-  end
-
-  def test_vi_end_word_with_operator
-    input_keys("foo bar\C-[0")
-    assert_line('foo bar')
-    assert_byte_pointer_size('')
-    assert_cursor(0)
-    assert_cursor_max(7)
-    input_keys('de')
-    assert_line(' bar')
-    assert_byte_pointer_size('')
-    assert_cursor(0)
-    assert_cursor_max(4)
-    input_keys('de')
-    assert_line('')
-    assert_byte_pointer_size('')
-    assert_cursor(0)
-    assert_cursor_max(0)
-    input_keys('de')
-    assert_line('')
-    assert_byte_pointer_size('')
-    assert_cursor(0)
-    assert_cursor_max(0)
-  end
-
-  def test_vi_end_big_word_with_operator
-    input_keys("aaa   b{b}}}b\C-[0")
-    assert_line('aaa   b{b}}}b')
-    assert_byte_pointer_size('')
-    assert_cursor(0)
-    assert_cursor_max(13)
-    input_keys('dE')
-    assert_line('   b{b}}}b')
-    assert_byte_pointer_size('')
-    assert_cursor(0)
-    assert_cursor_max(10)
-    input_keys('dE')
-    assert_line('')
-    assert_byte_pointer_size('')
-    assert_cursor(0)
-    assert_cursor_max(0)
-    input_keys('dE')
-    assert_line('')
-    assert_byte_pointer_size('')
-    assert_cursor(0)
-    assert_cursor_max(0)
-  end
-
-  def test_vi_next_char_with_operator
-    input_keys("foo bar\C-[0")
-    assert_line('foo bar')
-    assert_byte_pointer_size('')
-    assert_cursor(0)
-    assert_cursor_max(7)
-    input_keys('df ')
-    assert_line('bar')
-    assert_byte_pointer_size('')
-    assert_cursor(0)
-    assert_cursor_max(3)
-  end
-
-  def test_pasting
-    start_pasting
-    input_keys('ab')
-    finish_pasting
-    input_keys('c')
-    assert_line('abc')
-    assert_byte_pointer_size('abc')
-    assert_cursor(3)
-    assert_cursor_max(3)
-  end
-
-  def test_pasting_fullwidth
-    start_pasting
-    input_keys('あ')
-    finish_pasting
-    input_keys('い')
-    assert_line('あい')
-    assert_byte_pointer_size('あい')
-    assert_cursor(4)
-    assert_cursor_max(4)
-  end
-
-  def test_ed_delete_next_char_at_eol
-    input_keys('"あ"')
-    assert_line('"あ"')
-    assert_byte_pointer_size('"あ"')
-    assert_cursor(4)
-    assert_cursor_max(4)
-    input_keys("\C-[")
-    assert_line('"あ"')
-    assert_byte_pointer_size('"あ')
-    assert_cursor(3)
-    assert_cursor_max(4)
-    input_keys('xa"')
-    assert_line('"あ"')
-    assert_byte_pointer_size('"あ"')
-    assert_cursor(4)
-    assert_cursor_max(4)
-  end
-
-  def test_vi_kill_line_prev
-    input_keys("\C-u", false)
-    assert_byte_pointer_size('')
-    assert_cursor(0)
-    assert_cursor_max(0)
-    assert_line('')
-    input_keys('abc')
-    assert_byte_pointer_size('abc')
-    assert_cursor(3)
-    assert_cursor_max(3)
-    input_keys("\C-u", false)
-    assert_byte_pointer_size('')
-    assert_cursor(0)
-    assert_cursor_max(0)
-    assert_line('')
-    input_keys('abc')
-    input_keys("\C-[\C-u", false)
-    assert_byte_pointer_size('')
-    assert_cursor(0)
-    assert_cursor_max(1)
-    assert_line('c')
-    input_keys("\C-u", false)
-    assert_byte_pointer_size('')
-    assert_cursor(0)
-    assert_cursor_max(1)
-    assert_line('c')
-  end
-
-  def test_vi_motion_operators
-    assert_instance_of(Reline::KeyActor::ViInsert, @config.editing_mode)
-
-    assert_nothing_raised do
-      input_keys("test = { foo: bar }\C-[BBBldt}b")
-    end
-  end
-end
diff --git a/test/reline/test_key_stroke.rb b/test/reline/test_key_stroke.rb
deleted file mode 100644
index cd205c7d9e7171..00000000000000
--- a/test/reline/test_key_stroke.rb
+++ /dev/null
@@ -1,105 +0,0 @@
-require_relative 'helper'
-
-class Reline::KeyStroke::Test < Reline::TestCase
-  using Module.new {
-    refine Array do
-      def as_s
-        join
-      end
-
-      def to_keys
-        map{ |b| Reline::Key.new(b, b, false) }
-      end
-    end
-  }
-
-  def test_match_status
-    config = Reline::Config.new
-    {
-      'a' => 'xx',
-      'ab' => 'y',
-      'abc' => 'z',
-      'x' => 'rr'
-    }.each_pair do |key, func|
-      config.add_default_key_binding(key.bytes, func.bytes)
-    end
-    stroke = Reline::KeyStroke.new(config)
-    assert_equal(:matching, stroke.match_status("a".bytes))
-    assert_equal(:matching, stroke.match_status("ab".bytes))
-    assert_equal(:matched, stroke.match_status("abc".bytes))
-    assert_equal(:matched, stroke.match_status("abz".bytes))
-    assert_equal(:matched, stroke.match_status("abx".bytes))
-    assert_equal(:matched, stroke.match_status("ac".bytes))
-    assert_equal(:matched, stroke.match_status("aa".bytes))
-    assert_equal(:matched, stroke.match_status("x".bytes))
-    assert_equal(:unmatched, stroke.match_status("m".bytes))
-    assert_equal(:matched, stroke.match_status("abzwabk".bytes))
-  end
-
-  def test_match_unknown
-    config = Reline::Config.new
-    config.add_default_key_binding("\e[9abc".bytes, 'x')
-    stroke = Reline::KeyStroke.new(config)
-    sequences = [
-      "\e[9abc",
-      "\e[9d",
-      "\e[A", # Up
-      "\e[1;1R", # Cursor position report
-      "\e[15~", # F5
-      "\eOP", # F1
-      "\e\e[A" # Option+Up
-    ]
-    sequences.each do |seq|
-      assert_equal(:matched, stroke.match_status(seq.bytes))
-      (1...seq.size).each do |i|
-        assert_equal(:matching, stroke.match_status(seq.bytes.take(i)))
-      end
-    end
-  end
-
-  def test_expand
-    config = Reline::Config.new
-    {
-      'abc' => '123',
-    }.each_pair do |key, func|
-      config.add_default_key_binding(key.bytes, func.bytes)
-    end
-    stroke = Reline::KeyStroke.new(config)
-    assert_equal('123'.bytes, stroke.expand('abc'.bytes))
-    # CSI sequence
-    assert_equal([:ed_unassigned] + 'bc'.bytes, stroke.expand("\e[1;2;3;4;5abc".bytes))
-    assert_equal([:ed_unassigned] + 'BC'.bytes, stroke.expand("\e\e[ABC".bytes))
-    # SS3 sequence
-    assert_equal([:ed_unassigned] + 'QR'.bytes, stroke.expand("\eOPQR".bytes))
-  end
-
-  def test_oneshot_key_bindings
-    config = Reline::Config.new
-    {
-      'abc' => '123',
-    }.each_pair do |key, func|
-      config.add_default_key_binding(key.bytes, func.bytes)
-    end
-    stroke = Reline::KeyStroke.new(config)
-    assert_equal(:unmatched, stroke.match_status('zzz'.bytes))
-    assert_equal(:matched, stroke.match_status('abc'.bytes))
-  end
-
-  def test_with_reline_key
-    config = Reline::Config.new
-    {
-      [
-        Reline::Key.new(100, 228, true), # Alt+d
-        Reline::Key.new(97, 97, false) # a
-      ] => 'abc',
-      [195, 164] => 'def'
-    }.each_pair do |key, func|
-      config.add_oneshot_key_binding(key, func.bytes)
-    end
-    stroke = Reline::KeyStroke.new(config)
-    assert_equal(:unmatched, stroke.match_status('da'.bytes))
-    assert_equal(:matched, stroke.match_status("\M-da".bytes))
-    assert_equal(:unmatched, stroke.match_status([32, 195, 164]))
-    assert_equal(:matched, stroke.match_status([195, 164]))
-  end
-end
diff --git a/test/reline/test_kill_ring.rb b/test/reline/test_kill_ring.rb
deleted file mode 100644
index 9f6e0c3e74ec1b..00000000000000
--- a/test/reline/test_kill_ring.rb
+++ /dev/null
@@ -1,268 +0,0 @@
-require_relative 'helper'
-
-class Reline::KillRing::Test < Reline::TestCase
-  def setup
-    @prompt = '> '
-    @kill_ring = Reline::KillRing.new
-  end
-
-  def test_append_one
-    assert_equal(Reline::KillRing::State::FRESH, @kill_ring.instance_variable_get(:@state))
-    @kill_ring.append('a')
-    assert_equal(Reline::KillRing::State::CONTINUED, @kill_ring.instance_variable_get(:@state))
-    @kill_ring.process
-    assert_equal(Reline::KillRing::State::PROCESSED, @kill_ring.instance_variable_get(:@state))
-    assert_equal('a', @kill_ring.yank)
-    assert_equal(Reline::KillRing::State::YANK, @kill_ring.instance_variable_get(:@state))
-    assert_equal('a', @kill_ring.yank)
-    assert_equal(Reline::KillRing::State::YANK, @kill_ring.instance_variable_get(:@state))
-    assert_equal(['a', 'a'], @kill_ring.yank_pop)
-    assert_equal(Reline::KillRing::State::YANK, @kill_ring.instance_variable_get(:@state))
-    assert_equal(['a', 'a'], @kill_ring.yank_pop)
-    assert_equal(Reline::KillRing::State::YANK, @kill_ring.instance_variable_get(:@state))
-  end
-
-  def test_append_two
-    assert_equal(Reline::KillRing::State::FRESH, @kill_ring.instance_variable_get(:@state))
-    @kill_ring.append('a')
-    assert_equal(Reline::KillRing::State::CONTINUED, @kill_ring.instance_variable_get(:@state))
-    @kill_ring.process
-    assert_equal(Reline::KillRing::State::PROCESSED, @kill_ring.instance_variable_get(:@state))
-    @kill_ring.process
-    assert_equal(Reline::KillRing::State::FRESH, @kill_ring.instance_variable_get(:@state))
-    @kill_ring.append('b')
-    assert_equal(Reline::KillRing::State::CONTINUED, @kill_ring.instance_variable_get(:@state))
-    @kill_ring.process
-    assert_equal(Reline::KillRing::State::PROCESSED, @kill_ring.instance_variable_get(:@state))
-    assert_equal('b', @kill_ring.yank)
-    assert_equal(Reline::KillRing::State::YANK, @kill_ring.instance_variable_get(:@state))
-    assert_equal('b', @kill_ring.yank)
-    assert_equal(Reline::KillRing::State::YANK, @kill_ring.instance_variable_get(:@state))
-    assert_equal(['a', 'b'], @kill_ring.yank_pop)
-    assert_equal(Reline::KillRing::State::YANK, @kill_ring.instance_variable_get(:@state))
-    assert_equal(['b', 'a'], @kill_ring.yank_pop)
-    assert_equal(Reline::KillRing::State::YANK, @kill_ring.instance_variable_get(:@state))
-  end
-
-  def test_append_three
-    assert_equal(Reline::KillRing::State::FRESH, @kill_ring.instance_variable_get(:@state))
-    @kill_ring.append('a')
-    assert_equal(Reline::KillRing::State::CONTINUED, @kill_ring.instance_variable_get(:@state))
-    @kill_ring.process
-    assert_equal(Reline::KillRing::State::PROCESSED, @kill_ring.instance_variable_get(:@state))
-    @kill_ring.process
-    assert_equal(Reline::KillRing::State::FRESH, @kill_ring.instance_variable_get(:@state))
-    @kill_ring.append('b')
-    assert_equal(Reline::KillRing::State::CONTINUED, @kill_ring.instance_variable_get(:@state))
-    @kill_ring.process
-    assert_equal(Reline::KillRing::State::PROCESSED, @kill_ring.instance_variable_get(:@state))
-    @kill_ring.process
-    assert_equal(Reline::KillRing::State::FRESH, @kill_ring.instance_variable_get(:@state))
-    @kill_ring.append('c')
-    assert_equal(Reline::KillRing::State::CONTINUED, @kill_ring.instance_variable_get(:@state))
-    @kill_ring.process
-    assert_equal(Reline::KillRing::State::PROCESSED, @kill_ring.instance_variable_get(:@state))
-    assert_equal('c', @kill_ring.yank)
-    assert_equal(Reline::KillRing::State::YANK, @kill_ring.instance_variable_get(:@state))
-    assert_equal('c', @kill_ring.yank)
-    assert_equal(Reline::KillRing::State::YANK, @kill_ring.instance_variable_get(:@state))
-    assert_equal(['b', 'c'], @kill_ring.yank_pop)
-    assert_equal(Reline::KillRing::State::YANK, @kill_ring.instance_variable_get(:@state))
-    assert_equal(['a', 'b'], @kill_ring.yank_pop)
-    assert_equal(Reline::KillRing::State::YANK, @kill_ring.instance_variable_get(:@state))
-    assert_equal(['c', 'a'], @kill_ring.yank_pop)
-    assert_equal(Reline::KillRing::State::YANK, @kill_ring.instance_variable_get(:@state))
-  end
-
-  def test_append_three_with_max_two
-    @kill_ring = Reline::KillRing.new(2)
-    assert_equal(Reline::KillRing::State::FRESH, @kill_ring.instance_variable_get(:@state))
-    @kill_ring.append('a')
-    assert_equal(Reline::KillRing::State::CONTINUED, @kill_ring.instance_variable_get(:@state))
-    @kill_ring.process
-    assert_equal(Reline::KillRing::State::PROCESSED, @kill_ring.instance_variable_get(:@state))
-    @kill_ring.process
-    assert_equal(Reline::KillRing::State::FRESH, @kill_ring.instance_variable_get(:@state))
-    @kill_ring.append('b')
-    assert_equal(Reline::KillRing::State::CONTINUED, @kill_ring.instance_variable_get(:@state))
-    @kill_ring.process
-    assert_equal(Reline::KillRing::State::PROCESSED, @kill_ring.instance_variable_get(:@state))
-    @kill_ring.process
-    assert_equal(Reline::KillRing::State::FRESH, @kill_ring.instance_variable_get(:@state))
-    @kill_ring.append('c')
-    assert_equal(Reline::KillRing::State::CONTINUED, @kill_ring.instance_variable_get(:@state))
-    @kill_ring.process
-    assert_equal(Reline::KillRing::State::PROCESSED, @kill_ring.instance_variable_get(:@state))
-    assert_equal('c', @kill_ring.yank)
-    assert_equal(Reline::KillRing::State::YANK, @kill_ring.instance_variable_get(:@state))
-    assert_equal('c', @kill_ring.yank)
-    assert_equal(Reline::KillRing::State::YANK, @kill_ring.instance_variable_get(:@state))
-    assert_equal(['b', 'c'], @kill_ring.yank_pop)
-    assert_equal(Reline::KillRing::State::YANK, @kill_ring.instance_variable_get(:@state))
-    assert_equal(['c', 'b'], @kill_ring.yank_pop)
-    assert_equal(Reline::KillRing::State::YANK, @kill_ring.instance_variable_get(:@state))
-    assert_equal(['b', 'c'], @kill_ring.yank_pop)
-    assert_equal(Reline::KillRing::State::YANK, @kill_ring.instance_variable_get(:@state))
-  end
-
-  def test_append_four_with_max_two
-    @kill_ring = Reline::KillRing.new(2)
-    assert_equal(Reline::KillRing::State::FRESH, @kill_ring.instance_variable_get(:@state))
-    @kill_ring.append('a')
-    assert_equal(Reline::KillRing::State::CONTINUED, @kill_ring.instance_variable_get(:@state))
-    @kill_ring.process
-    assert_equal(Reline::KillRing::State::PROCESSED, @kill_ring.instance_variable_get(:@state))
-    @kill_ring.process
-    assert_equal(Reline::KillRing::State::FRESH, @kill_ring.instance_variable_get(:@state))
-    @kill_ring.append('b')
-    assert_equal(Reline::KillRing::State::CONTINUED, @kill_ring.instance_variable_get(:@state))
-    @kill_ring.process
-    assert_equal(Reline::KillRing::State::PROCESSED, @kill_ring.instance_variable_get(:@state))
-    @kill_ring.process
-    assert_equal(Reline::KillRing::State::FRESH, @kill_ring.instance_variable_get(:@state))
-    @kill_ring.append('c')
-    assert_equal(Reline::KillRing::State::CONTINUED, @kill_ring.instance_variable_get(:@state))
-    @kill_ring.process
-    assert_equal(Reline::KillRing::State::PROCESSED, @kill_ring.instance_variable_get(:@state))
-    @kill_ring.process
-    assert_equal(Reline::KillRing::State::FRESH, @kill_ring.instance_variable_get(:@state))
-    @kill_ring.append('d')
-    assert_equal(Reline::KillRing::State::CONTINUED, @kill_ring.instance_variable_get(:@state))
-    @kill_ring.process
-    assert_equal(Reline::KillRing::State::PROCESSED, @kill_ring.instance_variable_get(:@state))
-    assert_equal('d', @kill_ring.yank)
-    assert_equal(Reline::KillRing::State::YANK, @kill_ring.instance_variable_get(:@state))
-    assert_equal('d', @kill_ring.yank)
-    assert_equal(Reline::KillRing::State::YANK, @kill_ring.instance_variable_get(:@state))
-    assert_equal(['c', 'd'], @kill_ring.yank_pop)
-    assert_equal(Reline::KillRing::State::YANK, @kill_ring.instance_variable_get(:@state))
-    assert_equal(['d', 'c'], @kill_ring.yank_pop)
-    assert_equal(Reline::KillRing::State::YANK, @kill_ring.instance_variable_get(:@state))
-    assert_equal(['c', 'd'], @kill_ring.yank_pop)
-    assert_equal(Reline::KillRing::State::YANK, @kill_ring.instance_variable_get(:@state))
-  end
-
-  def test_append_after
-    assert_equal(Reline::KillRing::State::FRESH, @kill_ring.instance_variable_get(:@state))
-    @kill_ring.append('a')
-    assert_equal(Reline::KillRing::State::CONTINUED, @kill_ring.instance_variable_get(:@state))
-    @kill_ring.process
-    assert_equal(Reline::KillRing::State::PROCESSED, @kill_ring.instance_variable_get(:@state))
-    @kill_ring.append('b')
-    assert_equal(Reline::KillRing::State::CONTINUED, @kill_ring.instance_variable_get(:@state))
-    @kill_ring.process
-    assert_equal(Reline::KillRing::State::PROCESSED, @kill_ring.instance_variable_get(:@state))
-    assert_equal('ab', @kill_ring.yank)
-    assert_equal(Reline::KillRing::State::YANK, @kill_ring.instance_variable_get(:@state))
-    assert_equal('ab', @kill_ring.yank)
-    assert_equal(Reline::KillRing::State::YANK, @kill_ring.instance_variable_get(:@state))
-    assert_equal(['ab', 'ab'], @kill_ring.yank_pop)
-    assert_equal(Reline::KillRing::State::YANK, @kill_ring.instance_variable_get(:@state))
-    assert_equal(['ab', 'ab'], @kill_ring.yank_pop)
-    assert_equal(Reline::KillRing::State::YANK, @kill_ring.instance_variable_get(:@state))
-  end
-
-  def test_append_before
-    assert_equal(Reline::KillRing::State::FRESH, @kill_ring.instance_variable_get(:@state))
-    @kill_ring.append('a')
-    assert_equal(Reline::KillRing::State::CONTINUED, @kill_ring.instance_variable_get(:@state))
-    @kill_ring.process
-    assert_equal(Reline::KillRing::State::PROCESSED, @kill_ring.instance_variable_get(:@state))
-    @kill_ring.append('b', true)
-    assert_equal(Reline::KillRing::State::CONTINUED, @kill_ring.instance_variable_get(:@state))
-    @kill_ring.process
-    assert_equal(Reline::KillRing::State::PROCESSED, @kill_ring.instance_variable_get(:@state))
-    assert_equal('ba', @kill_ring.yank)
-    assert_equal(Reline::KillRing::State::YANK, @kill_ring.instance_variable_get(:@state))
-    assert_equal('ba', @kill_ring.yank)
-    assert_equal(Reline::KillRing::State::YANK, @kill_ring.instance_variable_get(:@state))
-    assert_equal(['ba', 'ba'], @kill_ring.yank_pop)
-    assert_equal(Reline::KillRing::State::YANK, @kill_ring.instance_variable_get(:@state))
-    assert_equal(['ba', 'ba'], @kill_ring.yank_pop)
-    assert_equal(Reline::KillRing::State::YANK, @kill_ring.instance_variable_get(:@state))
-  end
-
-  def test_append_chain_two
-    assert_equal(Reline::KillRing::State::FRESH, @kill_ring.instance_variable_get(:@state))
-    @kill_ring.append('a')
-    assert_equal(Reline::KillRing::State::CONTINUED, @kill_ring.instance_variable_get(:@state))
-    @kill_ring.process
-    assert_equal(Reline::KillRing::State::PROCESSED, @kill_ring.instance_variable_get(:@state))
-    @kill_ring.append('b')
-    assert_equal(Reline::KillRing::State::CONTINUED, @kill_ring.instance_variable_get(:@state))
-    @kill_ring.process
-    assert_equal(Reline::KillRing::State::PROCESSED, @kill_ring.instance_variable_get(:@state))
-    @kill_ring.process
-    assert_equal(Reline::KillRing::State::FRESH, @kill_ring.instance_variable_get(:@state))
-    @kill_ring.append('c')
-    assert_equal(Reline::KillRing::State::CONTINUED, @kill_ring.instance_variable_get(:@state))
-    @kill_ring.process
-    assert_equal(Reline::KillRing::State::PROCESSED, @kill_ring.instance_variable_get(:@state))
-    @kill_ring.append('d')
-    assert_equal(Reline::KillRing::State::CONTINUED, @kill_ring.instance_variable_get(:@state))
-    @kill_ring.process
-    assert_equal(Reline::KillRing::State::PROCESSED, @kill_ring.instance_variable_get(:@state))
-    assert_equal('cd', @kill_ring.yank)
-    assert_equal(Reline::KillRing::State::YANK, @kill_ring.instance_variable_get(:@state))
-    assert_equal('cd', @kill_ring.yank)
-    assert_equal(Reline::KillRing::State::YANK, @kill_ring.instance_variable_get(:@state))
-    assert_equal(['ab', 'cd'], @kill_ring.yank_pop)
-    assert_equal(Reline::KillRing::State::YANK, @kill_ring.instance_variable_get(:@state))
-    assert_equal(['cd', 'ab'], @kill_ring.yank_pop)
-    assert_equal(Reline::KillRing::State::YANK, @kill_ring.instance_variable_get(:@state))
-  end
-
-  def test_append_complex_chain
-    assert_equal(Reline::KillRing::State::FRESH, @kill_ring.instance_variable_get(:@state))
-    @kill_ring.append('c')
-    assert_equal(Reline::KillRing::State::CONTINUED, @kill_ring.instance_variable_get(:@state))
-    @kill_ring.process
-    assert_equal(Reline::KillRing::State::PROCESSED, @kill_ring.instance_variable_get(:@state))
-    @kill_ring.append('d')
-    assert_equal(Reline::KillRing::State::CONTINUED, @kill_ring.instance_variable_get(:@state))
-    @kill_ring.process
-    assert_equal(Reline::KillRing::State::PROCESSED, @kill_ring.instance_variable_get(:@state))
-    @kill_ring.append('b', true)
-    assert_equal(Reline::KillRing::State::CONTINUED, @kill_ring.instance_variable_get(:@state))
-    @kill_ring.process
-    assert_equal(Reline::KillRing::State::PROCESSED, @kill_ring.instance_variable_get(:@state))
-    @kill_ring.append('e')
-    assert_equal(Reline::KillRing::State::CONTINUED, @kill_ring.instance_variable_get(:@state))
-    @kill_ring.process
-    assert_equal(Reline::KillRing::State::PROCESSED, @kill_ring.instance_variable_get(:@state))
-    @kill_ring.append('a', true)
-    assert_equal(Reline::KillRing::State::CONTINUED, @kill_ring.instance_variable_get(:@state))
-    @kill_ring.process
-    assert_equal(Reline::KillRing::State::PROCESSED, @kill_ring.instance_variable_get(:@state))
-    @kill_ring.process
-    assert_equal(Reline::KillRing::State::FRESH, @kill_ring.instance_variable_get(:@state))
-    @kill_ring.append('A')
-    assert_equal(Reline::KillRing::State::CONTINUED, @kill_ring.instance_variable_get(:@state))
-    @kill_ring.process
-    assert_equal(Reline::KillRing::State::PROCESSED, @kill_ring.instance_variable_get(:@state))
-    @kill_ring.append('B')
-    assert_equal(Reline::KillRing::State::CONTINUED, @kill_ring.instance_variable_get(:@state))
-    @kill_ring.process
-    assert_equal(Reline::KillRing::State::PROCESSED, @kill_ring.instance_variable_get(:@state))
-    assert_equal('AB', @kill_ring.yank)
-    assert_equal(Reline::KillRing::State::YANK, @kill_ring.instance_variable_get(:@state))
-    assert_equal('AB', @kill_ring.yank)
-    assert_equal(Reline::KillRing::State::YANK, @kill_ring.instance_variable_get(:@state))
-    assert_equal(['abcde', 'AB'], @kill_ring.yank_pop)
-    assert_equal(Reline::KillRing::State::YANK, @kill_ring.instance_variable_get(:@state))
-    assert_equal(['AB', 'abcde'], @kill_ring.yank_pop)
-    assert_equal(Reline::KillRing::State::YANK, @kill_ring.instance_variable_get(:@state))
-  end
-
-  def test_enumerable
-    @kill_ring.append('a')
-    @kill_ring.process
-    @kill_ring.process
-    @kill_ring.append('b')
-    @kill_ring.process
-    @kill_ring.process
-    @kill_ring.append('c')
-    @kill_ring.process
-    assert_equal(%w{c b a}, @kill_ring.to_a)
-  end
-end
diff --git a/test/reline/test_line_editor.rb b/test/reline/test_line_editor.rb
deleted file mode 100644
index 8399e76e92bf76..00000000000000
--- a/test/reline/test_line_editor.rb
+++ /dev/null
@@ -1,13 +0,0 @@
-require_relative 'helper'
-require 'reline/line_editor'
-
-class Reline::LineEditor::Test < Reline::TestCase
-  def test_range_subtract
-    dummy_config = nil
-    editor = Reline::LineEditor.new(dummy_config, 'ascii-8bit')
-    base_ranges = [3...5, 4...10, 6...8, 12...15, 15...20]
-    subtract_ranges = [5...7, 8...9, 11...13, 17...18, 18...19]
-    expected_result = [3...5, 7...8, 9...10, 13...17, 19...20]
-    assert_equal expected_result, editor.send(:range_subtract, base_ranges, subtract_ranges)
-  end
-end
diff --git a/test/reline/test_macro.rb b/test/reline/test_macro.rb
deleted file mode 100644
index 3096930830ef96..00000000000000
--- a/test/reline/test_macro.rb
+++ /dev/null
@@ -1,41 +0,0 @@
-require_relative 'helper'
-
-class Reline::MacroTest < Reline::TestCase
-  def setup
-    Reline.send(:test_mode)
-    @config = Reline::Config.new
-    @encoding = Reline.core.encoding
-    @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
-
-  def teardown
-    @output.close
-    Reline.test_reset
-  end
-
-  def input_key(char, combined_char = char, with_meta = false)
-    @line_editor.input_key(Reline::Key.new(char, combined_char, with_meta))
-  end
-
-  def input(str)
-    str.each_byte {|c| input_key(c)}
-  end
-
-  def test_simple_input
-    input('abc')
-    assert_equal 'abc', @line_editor.line
-  end
-
-  def test_alias
-    class << @line_editor
-      alias delete_char ed_delete_prev_char
-    end
-    input('abc')
-    assert_nothing_raised(ArgumentError) {
-      input_key(:delete_char)
-    }
-    assert_equal 'ab', @line_editor.line
-  end
-end
diff --git a/test/reline/test_reline.rb b/test/reline/test_reline.rb
deleted file mode 100644
index 40c880c11f312c..00000000000000
--- a/test/reline/test_reline.rb
+++ /dev/null
@@ -1,390 +0,0 @@
-require_relative 'helper'
-require 'reline'
-require 'stringio'
-
-class Reline::Test < Reline::TestCase
-  class DummyCallbackObject
-    def call; end
-  end
-
-  def setup
-    Reline.send(:test_mode)
-    Reline.output_modifier_proc = nil
-    Reline.completion_proc = nil
-    Reline.prompt_proc = nil
-    Reline.auto_indent_proc = nil
-    Reline.pre_input_hook = nil
-    Reline.dig_perfect_match_proc = nil
-  end
-
-  def teardown
-    Reline.test_reset
-  end
-
-  def test_completion_append_character
-    completion_append_character = Reline.completion_append_character
-
-    assert_equal(nil, Reline.completion_append_character)
-
-    Reline.completion_append_character = ""
-    assert_equal(nil, Reline.completion_append_character)
-
-    Reline.completion_append_character = "a".encode(Encoding::ASCII)
-    assert_equal("a", Reline.completion_append_character)
-    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(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(get_reline_encoding, Reline.completion_append_character.encoding)
-
-    Reline.completion_append_character = nil
-    assert_equal(nil, Reline.completion_append_character)
-  ensure
-    Reline.completion_append_character = completion_append_character
-  end
-
-  def test_basic_word_break_characters
-    basic_word_break_characters = Reline.basic_word_break_characters
-
-    assert_equal(" \t\n`><=;|&{(", Reline.basic_word_break_characters)
-
-    Reline.basic_word_break_characters = "[".encode(Encoding::ASCII)
-    assert_equal("[", Reline.basic_word_break_characters)
-    assert_equal(get_reline_encoding, Reline.basic_word_break_characters.encoding)
-  ensure
-    Reline.basic_word_break_characters = basic_word_break_characters
-  end
-
-  def test_completer_word_break_characters
-    completer_word_break_characters = Reline.completer_word_break_characters
-
-    assert_equal(" \t\n`><=;|&{(", Reline.completer_word_break_characters)
-
-    Reline.completer_word_break_characters = "[".encode(Encoding::ASCII)
-    assert_equal("[", Reline.completer_word_break_characters)
-    assert_equal(get_reline_encoding, Reline.completer_word_break_characters.encoding)
-
-    assert_nothing_raised { Reline.completer_word_break_characters = '' }
-  ensure
-    Reline.completer_word_break_characters = completer_word_break_characters
-  end
-
-  def test_basic_quote_characters
-    basic_quote_characters = Reline.basic_quote_characters
-
-    assert_equal('"\'', Reline.basic_quote_characters)
-
-    Reline.basic_quote_characters = "`".encode(Encoding::ASCII)
-    assert_equal("`", Reline.basic_quote_characters)
-    assert_equal(get_reline_encoding, Reline.basic_quote_characters.encoding)
-  ensure
-    Reline.basic_quote_characters = basic_quote_characters
-  end
-
-  def test_completer_quote_characters
-    completer_quote_characters = Reline.completer_quote_characters
-
-    assert_equal('"\'', Reline.completer_quote_characters)
-
-    Reline.completer_quote_characters = "`".encode(Encoding::ASCII)
-    assert_equal("`", Reline.completer_quote_characters)
-    assert_equal(get_reline_encoding, Reline.completer_quote_characters.encoding)
-
-    assert_nothing_raised { Reline.completer_quote_characters = '' }
-  ensure
-    Reline.completer_quote_characters = completer_quote_characters
-  end
-
-  def test_filename_quote_characters
-    filename_quote_characters = Reline.filename_quote_characters
-
-    assert_equal('', Reline.filename_quote_characters)
-
-    Reline.filename_quote_characters = "\'".encode(Encoding::ASCII)
-    assert_equal("\'", Reline.filename_quote_characters)
-    assert_equal(get_reline_encoding, Reline.filename_quote_characters.encoding)
-  ensure
-    Reline.filename_quote_characters = filename_quote_characters
-  end
-
-  def test_special_prefixes
-    special_prefixes = Reline.special_prefixes
-
-    assert_equal('', Reline.special_prefixes)
-
-    Reline.special_prefixes = "\'".encode(Encoding::ASCII)
-    assert_equal("\'", Reline.special_prefixes)
-    assert_equal(get_reline_encoding, Reline.special_prefixes.encoding)
-  ensure
-    Reline.special_prefixes = special_prefixes
-  end
-
-  def test_completion_case_fold
-    completion_case_fold = Reline.completion_case_fold
-
-    assert_equal(nil, Reline.completion_case_fold)
-
-    Reline.completion_case_fold = true
-    assert_equal(true, Reline.completion_case_fold)
-
-    Reline.completion_case_fold = "hoge".encode(Encoding::ASCII)
-    assert_equal("hoge", Reline.completion_case_fold)
-  ensure
-    Reline.completion_case_fold = completion_case_fold
-  end
-
-  def test_completion_proc
-    omit unless Reline.completion_proc == nil
-    # Another test can set Reline.completion_proc
-
-    # assert_equal(nil, Reline.completion_proc)
-
-    dummy_proc = proc {}
-    Reline.completion_proc = dummy_proc
-    assert_equal(dummy_proc, Reline.completion_proc)
-
-    l = lambda {}
-    Reline.completion_proc = l
-    assert_equal(l, Reline.completion_proc)
-
-    assert_raise(ArgumentError) { Reline.completion_proc = 42 }
-    assert_raise(ArgumentError) { Reline.completion_proc = "hoge" }
-
-    dummy = DummyCallbackObject.new
-    Reline.completion_proc = dummy
-    assert_equal(dummy, Reline.completion_proc)
-  end
-
-  def test_output_modifier_proc
-    assert_equal(nil, Reline.output_modifier_proc)
-
-    dummy_proc = proc {}
-    Reline.output_modifier_proc = dummy_proc
-    assert_equal(dummy_proc, Reline.output_modifier_proc)
-
-    l = lambda {}
-    Reline.output_modifier_proc = l
-    assert_equal(l, Reline.output_modifier_proc)
-
-    assert_raise(ArgumentError) { Reline.output_modifier_proc = 42 }
-    assert_raise(ArgumentError) { Reline.output_modifier_proc = "hoge" }
-
-    dummy = DummyCallbackObject.new
-    Reline.output_modifier_proc = dummy
-    assert_equal(dummy, Reline.output_modifier_proc)
-  end
-
-  def test_prompt_proc
-    assert_equal(nil, Reline.prompt_proc)
-
-    dummy_proc = proc {}
-    Reline.prompt_proc = dummy_proc
-    assert_equal(dummy_proc, Reline.prompt_proc)
-
-    l = lambda {}
-    Reline.prompt_proc = l
-    assert_equal(l, Reline.prompt_proc)
-
-    assert_raise(ArgumentError) { Reline.prompt_proc = 42 }
-    assert_raise(ArgumentError) { Reline.prompt_proc = "hoge" }
-
-    dummy = DummyCallbackObject.new
-    Reline.prompt_proc = dummy
-    assert_equal(dummy, Reline.prompt_proc)
-  end
-
-  def test_auto_indent_proc
-    assert_equal(nil, Reline.auto_indent_proc)
-
-    dummy_proc = proc {}
-    Reline.auto_indent_proc = dummy_proc
-    assert_equal(dummy_proc, Reline.auto_indent_proc)
-
-    l = lambda {}
-    Reline.auto_indent_proc = l
-    assert_equal(l, Reline.auto_indent_proc)
-
-    assert_raise(ArgumentError) { Reline.auto_indent_proc = 42 }
-    assert_raise(ArgumentError) { Reline.auto_indent_proc = "hoge" }
-
-    dummy = DummyCallbackObject.new
-    Reline.auto_indent_proc = dummy
-    assert_equal(dummy, Reline.auto_indent_proc)
-  end
-
-  def test_pre_input_hook
-    assert_equal(nil, Reline.pre_input_hook)
-
-    dummy_proc = proc {}
-    Reline.pre_input_hook = dummy_proc
-    assert_equal(dummy_proc, Reline.pre_input_hook)
-
-    l = lambda {}
-    Reline.pre_input_hook = l
-    assert_equal(l, Reline.pre_input_hook)
-  end
-
-  def test_dig_perfect_match_proc
-    assert_equal(nil, Reline.dig_perfect_match_proc)
-
-    dummy_proc = proc {}
-    Reline.dig_perfect_match_proc = dummy_proc
-    assert_equal(dummy_proc, Reline.dig_perfect_match_proc)
-
-    l = lambda {}
-    Reline.dig_perfect_match_proc = l
-    assert_equal(l, Reline.dig_perfect_match_proc)
-
-    assert_raise(ArgumentError) { Reline.dig_perfect_match_proc = 42 }
-    assert_raise(ArgumentError) { Reline.dig_perfect_match_proc = "hoge" }
-
-    dummy = DummyCallbackObject.new
-    Reline.dig_perfect_match_proc = dummy
-    assert_equal(dummy, Reline.dig_perfect_match_proc)
-  end
-
-  def test_insert_text
-    assert_equal('', Reline.line_buffer)
-    assert_equal(0, Reline.point)
-    Reline.insert_text('abc')
-    assert_equal('abc', Reline.line_buffer)
-    assert_equal(3, Reline.point)
-  end
-
-  def test_delete_text
-    assert_equal('', Reline.line_buffer)
-    assert_equal(0, Reline.point)
-    Reline.insert_text('abc')
-    assert_equal('abc', Reline.line_buffer)
-    assert_equal(3, Reline.point)
-    Reline.delete_text()
-    assert_equal('', Reline.line_buffer)
-    assert_equal(0, Reline.point)
-    Reline.insert_text('abc')
-    Reline.delete_text(1)
-    assert_equal('a', Reline.line_buffer)
-    assert_equal(1, Reline.point)
-    Reline.insert_text('defghi')
-    Reline.delete_text(2, 2)
-    assert_equal('adghi', Reline.line_buffer)
-    assert_equal(5, Reline.point)
-  end
-
-  def test_set_input_and_output
-    assert_raise(TypeError) do
-      Reline.input = "This is not a file."
-    end
-    assert_raise(TypeError) do
-      Reline.output = "This is not a file."
-    end
-
-    input, to_write = IO.pipe
-    to_read, output = IO.pipe
-    unless Reline.__send__(:input=, input)
-      omit "Setting to input is not effective on #{Reline.core.io_gate}"
-    end
-    Reline.output = output
-
-    to_write.write "a\n"
-    result = Reline.readline
-    to_write.close
-    read_text = to_read.read_nonblock(100)
-    assert_equal('a', result)
-    refute(read_text.empty?)
-  ensure
-    input&.close
-    output&.close
-    to_read&.close
-  end
-
-  def test_vi_editing_mode
-    Reline.vi_editing_mode
-    assert_equal(Reline::KeyActor::ViInsert, Reline.core.config.editing_mode.class)
-  end
-
-  def test_emacs_editing_mode
-    Reline.emacs_editing_mode
-    assert_equal(Reline::KeyActor::Emacs, Reline.core.config.editing_mode.class)
-  end
-
-  def test_add_dialog_proc
-    dummy_proc = proc {}
-    Reline.add_dialog_proc(:test_proc, dummy_proc)
-    d = Reline.dialog_proc(:test_proc)
-    assert_equal(dummy_proc, d.dialog_proc)
-
-    dummy_proc_2 = proc {}
-    Reline.add_dialog_proc(:test_proc, dummy_proc_2)
-    d = Reline.dialog_proc(:test_proc)
-    assert_equal(dummy_proc_2, d.dialog_proc)
-
-    Reline.add_dialog_proc(:test_proc, nil)
-    assert_nil(Reline.dialog_proc(:test_proc))
-
-    l = lambda {}
-    Reline.add_dialog_proc(:test_lambda, l)
-    d = Reline.dialog_proc(:test_lambda)
-    assert_equal(l, d.dialog_proc)
-
-    assert_equal(nil, Reline.dialog_proc(:test_nothing))
-
-    assert_raise(ArgumentError) { Reline.add_dialog_proc(:error, 42) }
-    assert_raise(ArgumentError) { Reline.add_dialog_proc(:error, 'hoge') }
-    assert_raise(ArgumentError) { Reline.add_dialog_proc('error', proc {} ) }
-
-    dummy = DummyCallbackObject.new
-    Reline.add_dialog_proc(:dummy, dummy)
-    d = Reline.dialog_proc(:dummy)
-    assert_equal(dummy, d.dialog_proc)
-  end
-
-  def test_add_dialog_proc_with_context
-    dummy_proc = proc {}
-    array = Array.new
-    Reline.add_dialog_proc(:test_proc, dummy_proc, array)
-    d = Reline.dialog_proc(:test_proc)
-    assert_equal(dummy_proc, d.dialog_proc)
-    assert_equal(array, d.context)
-
-    Reline.add_dialog_proc(:test_proc, dummy_proc, nil)
-    d = Reline.dialog_proc(:test_proc)
-    assert_equal(dummy_proc, d.dialog_proc)
-    assert_equal(nil, d.context)
-  end
-
-  def test_readmultiline
-    # readmultiline is module function
-    assert_include(Reline.methods, :readmultiline)
-    assert_include(Reline.private_instance_methods, :readmultiline)
-  end
-
-  def test_readline
-    # readline is module function
-    assert_include(Reline.methods, :readline)
-    assert_include(Reline.private_instance_methods, :readline)
-  end
-
-  def test_read_io
-    # TODO in Reline::Core
-  end
-
-  def test_dumb_terminal
-    lib = File.expand_path("../../lib", __dir__)
-    out = IO.popen([{"TERM"=>"dumb"}, Reline.test_rubybin, "-I#{lib}", "-rreline", "-e", "p Reline.core.io_gate"], &:read)
-    assert_equal("Reline::GeneralIO", out.chomp)
-  end
-
-  def get_reline_encoding
-    if encoding = Reline.core.encoding
-      encoding
-    elsif RUBY_PLATFORM =~ /mswin|mingw/
-      Encoding::UTF_8
-    else
-      Encoding::default_external
-    end
-  end
-end
diff --git a/test/reline/test_reline_key.rb b/test/reline/test_reline_key.rb
deleted file mode 100644
index fb700a6f2eb1d8..00000000000000
--- a/test/reline/test_reline_key.rb
+++ /dev/null
@@ -1,53 +0,0 @@
-require_relative 'helper'
-require "reline"
-
-class Reline::TestKey < Reline::TestCase
-  def setup
-  end
-
-  def teardown
-    Reline.test_reset
-  end
-
-  def test_match_key
-    assert(Reline::Key.new(1, 2, false).match?(Reline::Key.new(1, 2, false)))
-    assert(Reline::Key.new(1, 2, false).match?(Reline::Key.new(nil, 2, false)))
-    assert(Reline::Key.new(1, 2, false).match?(Reline::Key.new(1, 2, nil)))
-
-    assert(Reline::Key.new(nil, 2, false).match?(Reline::Key.new(nil, 2, false)))
-    assert(Reline::Key.new(1, nil, false).match?(Reline::Key.new(1, nil, false)))
-    assert(Reline::Key.new(1, 2, nil).match?(Reline::Key.new(1, 2, nil)))
-
-    assert(Reline::Key.new(nil, 2, false).match?(Reline::Key.new(nil, 2, false)))
-    assert(Reline::Key.new(1, nil, false).match?(Reline::Key.new(1, nil, false)))
-    assert(Reline::Key.new(1, 2, nil).match?(Reline::Key.new(1, 2, nil)))
-
-    assert(!Reline::Key.new(1, 2, false).match?(Reline::Key.new(3, 1, false)))
-    assert(!Reline::Key.new(1, 2, false).match?(Reline::Key.new(1, 3, false)))
-    assert(!Reline::Key.new(1, 2, false).match?(Reline::Key.new(1, 3, true)))
-  end
-
-  def test_match_integer
-    assert(Reline::Key.new(1, 2, false).match?(2))
-    assert(Reline::Key.new(nil, 2, false).match?(2))
-    assert(Reline::Key.new(1, nil, false).match?(1))
-
-    assert(!Reline::Key.new(1, 2, false).match?(1))
-    assert(!Reline::Key.new(1, nil, false).match?(2))
-    assert(!Reline::Key.new(nil, nil, false).match?(1))
-  end
-
-  def test_match_symbol
-    assert(Reline::Key.new(:key1, :key2, false).match?(:key2))
-    assert(Reline::Key.new(:key1, nil, false).match?(:key1))
-
-    assert(!Reline::Key.new(:key1, :key2, false).match?(:key1))
-    assert(!Reline::Key.new(:key1, nil, false).match?(:key2))
-    assert(!Reline::Key.new(nil, nil, false).match?(:key1))
-  end
-
-  def test_match_other
-    assert(!Reline::Key.new(:key1, 2, false).match?("key1"))
-    assert(!Reline::Key.new(nil, nil, false).match?(nil))
-  end
-end
diff --git a/test/reline/test_string_processing.rb b/test/reline/test_string_processing.rb
deleted file mode 100644
index 2e5d27dc4fd193..00000000000000
--- a/test/reline/test_string_processing.rb
+++ /dev/null
@@ -1,81 +0,0 @@
-require_relative 'helper'
-
-class Reline::LineEditor::StringProcessingTest < Reline::TestCase
-  def setup
-    Reline.send(:test_mode)
-    @prompt = '> '
-    @config = Reline::Config.new
-    Reline::HISTORY.instance_variable_set(:@config, @config)
-    @encoding = Reline.core.encoding
-    @line_editor = Reline::LineEditor.new(@config, @encoding)
-    @line_editor.reset(@prompt, encoding: @encoding)
-  end
-
-  def teardown
-    Reline.test_reset
-  end
-
-  def test_calculate_width
-    width = @line_editor.send(:calculate_width, 'Ruby string')
-    assert_equal('Ruby string'.size, width)
-  end
-
-  def test_calculate_width_with_escape_sequence
-    width = @line_editor.send(:calculate_width, "\1\e[31m\2RubyColor\1\e[34m\2 default string \1\e[m\2>", true)
-    assert_equal('RubyColor default string >'.size, width)
-  end
-
-  def test_completion_proc_with_preposing_and_postposing
-    buf = ['def hoge', '  puts :aaa', 'end']
-
-    @line_editor.instance_variable_set(:@is_multiline, true)
-    @line_editor.instance_variable_set(:@buffer_of_lines, buf)
-    @line_editor.instance_variable_set(:@line, buf[1])
-    @line_editor.instance_variable_set(:@byte_pointer, 3)
-    @line_editor.instance_variable_set(:@cursor, 3)
-    @line_editor.instance_variable_set(:@cursor_max, 11)
-    @line_editor.instance_variable_set(:@line_index, 1)
-    @line_editor.instance_variable_set(:@completion_proc, proc { |target|
-      assert_equal('p', target)
-    })
-    @line_editor.__send__(:call_completion_proc)
-
-    @line_editor.instance_variable_set(:@is_multiline, true)
-    @line_editor.instance_variable_set(:@buffer_of_lines, buf)
-    @line_editor.instance_variable_set(:@line, buf[1])
-    @line_editor.instance_variable_set(:@byte_pointer, 6)
-    @line_editor.instance_variable_set(:@cursor, 6)
-    @line_editor.instance_variable_set(:@cursor_max, 11)
-    @line_editor.instance_variable_set(:@line_index, 1)
-    @line_editor.instance_variable_set(:@completion_proc, proc { |target, pre, post|
-      assert_equal('puts', target)
-      assert_equal("def hoge\n  ", pre)
-      assert_equal(" :aaa\nend", post)
-    })
-    @line_editor.__send__(:call_completion_proc)
-
-    @line_editor.instance_variable_set(:@line, buf[0])
-    @line_editor.instance_variable_set(:@byte_pointer, 6)
-    @line_editor.instance_variable_set(:@cursor, 6)
-    @line_editor.instance_variable_set(:@cursor_max, 8)
-    @line_editor.instance_variable_set(:@line_index, 0)
-    @line_editor.instance_variable_set(:@completion_proc, proc { |target, pre, post|
-      assert_equal('ho', target)
-      assert_equal('def ', pre)
-      assert_equal("ge\n  puts :aaa\nend", post)
-    })
-    @line_editor.__send__(:call_completion_proc)
-
-    @line_editor.instance_variable_set(:@line, buf[2])
-    @line_editor.instance_variable_set(:@byte_pointer, 1)
-    @line_editor.instance_variable_set(:@cursor, 1)
-    @line_editor.instance_variable_set(:@cursor_max, 3)
-    @line_editor.instance_variable_set(:@line_index, 2)
-    @line_editor.instance_variable_set(:@completion_proc, proc { |target, pre, post|
-      assert_equal('e', target)
-      assert_equal("def hoge\n  puts :aaa\n", pre)
-      assert_equal('nd', post)
-    })
-    @line_editor.__send__(:call_completion_proc)
-  end
-end
diff --git a/test/reline/test_terminfo.rb b/test/reline/test_terminfo.rb
deleted file mode 100644
index dda9b324954715..00000000000000
--- a/test/reline/test_terminfo.rb
+++ /dev/null
@@ -1,61 +0,0 @@
-require_relative 'helper'
-require "reline"
-
-class Reline::Terminfo::Test < Reline::TestCase
-  def setup
-    Reline::Terminfo.setupterm(0, 2)
-  end
-
-  def test_tigetstr
-    assert Reline::Terminfo.tigetstr('khome')
-  rescue Reline::Terminfo::TerminfoError => e
-    omit e.message
-  end
-
-  def test_tigetstr_with_error
-    assert_raise(Reline::Terminfo::TerminfoError) { Reline::Terminfo.tigetstr('unknown') }
-    assert_raise(Reline::Terminfo::TerminfoError) { Reline::Terminfo.tigetstr(nil) }
-  end
-
-  def test_tiparm
-    assert Reline::Terminfo.tigetstr('khome').tiparm
-  rescue Reline::Terminfo::TerminfoError => e
-    omit e.message
-  end
-
-  def test_tigetstr_with_param
-    assert Reline::Terminfo.tigetstr('cuu').include?('%p1%d')
-  rescue Reline::Terminfo::TerminfoError => e
-    omit e.message
-  end
-
-  def test_tiparm_with_param
-    assert Reline::Terminfo.tigetstr('cuu').tiparm(4649).include?('4649')
-  rescue Reline::Terminfo::TerminfoError => e
-    omit e.message
-  end
-
-  def test_tigetflag
-    assert_instance_of Integer, Reline::Terminfo.tigetflag('xenl')
-  rescue Reline::Terminfo::TerminfoError => e
-    omit e.message
-  end
-
-  def test_tigetflag_with_error
-    assert_raise(Reline::Terminfo::TerminfoError) { Reline::Terminfo.tigetflag('cuu') }
-    assert_raise(Reline::Terminfo::TerminfoError) { Reline::Terminfo.tigetflag('unknown') }
-    assert_raise(Reline::Terminfo::TerminfoError) { Reline::Terminfo.tigetflag(nil) }
-  end
-
-  def test_tigetnum
-    assert_instance_of Integer, Reline::Terminfo.tigetnum('colors')
-  rescue Reline::Terminfo::TerminfoError => e
-    omit e.message
-  end
-
-  def test_tigetnum_with_error
-    assert_raise(Reline::Terminfo::TerminfoError) { Reline::Terminfo.tigetnum('cuu') }
-    assert_raise(Reline::Terminfo::TerminfoError) { Reline::Terminfo.tigetnum('unknown') }
-    assert_raise(Reline::Terminfo::TerminfoError) { Reline::Terminfo.tigetnum(nil) }
-  end
-end if Reline::Terminfo.enabled?
diff --git a/test/reline/test_unicode.rb b/test/reline/test_unicode.rb
deleted file mode 100644
index 834f7114c46ddb..00000000000000
--- a/test/reline/test_unicode.rb
+++ /dev/null
@@ -1,65 +0,0 @@
-require_relative 'helper'
-require "reline/unicode"
-
-class Reline::Unicode::Test < Reline::TestCase
-  def setup
-    Reline.send(:test_mode)
-  end
-
-  def teardown
-    Reline.test_reset
-  end
-
-  def test_get_mbchar_width
-    assert_equal Reline.ambiguous_width, Reline::Unicode.get_mbchar_width('é')
-  end
-
-  def test_ambiguous_width
-    assert_equal 2, Reline::Unicode.calculate_width('√', true)
-  end
-
-  def test_csi_regexp
-    csi_sequences = ["\e[m", "\e[1m", "\e[12;34m", "\e[12;34H"]
-    assert_equal(csi_sequences, "text#{csi_sequences.join('text')}text".scan(Reline::Unicode::CSI_REGEXP))
-  end
-
-  def test_osc_regexp
-    osc_sequences = ["\e]1\a", "\e]0;OSC\a", "\e]1\e\\", "\e]0;OSC\e\\"]
-    separator = "text\atext"
-    assert_equal(osc_sequences, "#{separator}#{osc_sequences.join(separator)}#{separator}".scan(Reline::Unicode::OSC_REGEXP))
-  end
-
-  def test_split_by_width
-    assert_equal [['abc', nil, 'de'], 2], Reline::Unicode.split_by_width('abcde', 3)
-    assert_equal [['abc', nil, 'def', nil, ''], 3], Reline::Unicode.split_by_width('abcdef', 3)
-    assert_equal [['ab', nil, 'あd', nil, 'ef'], 3], Reline::Unicode.split_by_width('abあdef', 3)
-    assert_equal [["ab\1zero\2c", nil, 'def', nil, ''], 3], Reline::Unicode.split_by_width("ab\1zero\2cdef", 3)
-    assert_equal [["\e[31mabc", nil, "\e[31md\e[42mef", nil, "\e[31m\e[42mg"], 3], Reline::Unicode.split_by_width("\e[31mabcd\e[42mefg", 3)
-    assert_equal [["ab\e]0;1\ac", nil, "\e]0;1\ad"], 2], Reline::Unicode.split_by_width("ab\e]0;1\acd", 3)
-  end
-
-  def test_take_range
-    assert_equal 'cdef', Reline::Unicode.take_range('abcdefghi', 2, 4)
-    assert_equal 'あde', Reline::Unicode.take_range('abあdef', 2, 4)
-    assert_equal 'zerocdef', Reline::Unicode.take_range("ab\1zero\2cdef", 2, 4)
-    assert_equal 'bzerocde', Reline::Unicode.take_range("ab\1zero\2cdef", 1, 4)
-    assert_equal "\e[31mcd\e[42mef", Reline::Unicode.take_range("\e[31mabcd\e[42mefg", 2, 4)
-    assert_equal "\e]0;1\acd", Reline::Unicode.take_range("ab\e]0;1\acd", 2, 3)
-    assert_equal 'いう', Reline::Unicode.take_range('あいうえお', 2, 4)
-  end
-
-  def test_calculate_width
-    assert_equal 9, Reline::Unicode.calculate_width('abcdefghi')
-    assert_equal 9, Reline::Unicode.calculate_width('abcdefghi', true)
-    assert_equal 7, Reline::Unicode.calculate_width('abあdef')
-    assert_equal 7, Reline::Unicode.calculate_width('abあdef', true)
-    assert_equal 14, Reline::Unicode.calculate_width("ab\1zero\2cdef")
-    assert_equal 6, Reline::Unicode.calculate_width("ab\1zero\2cdef", true)
-    assert_equal 19, Reline::Unicode.calculate_width("\e[31mabcd\e[42mefg")
-    assert_equal 7, Reline::Unicode.calculate_width("\e[31mabcd\e[42mefg", true)
-    assert_equal 12, Reline::Unicode.calculate_width("ab\e]0;1\acd")
-    assert_equal 4, Reline::Unicode.calculate_width("ab\e]0;1\acd", true)
-    assert_equal 10, Reline::Unicode.calculate_width('あいうえお')
-    assert_equal 10, Reline::Unicode.calculate_width('あいうえお', true)
-  end
-end
diff --git a/test/reline/test_within_pipe.rb b/test/reline/test_within_pipe.rb
deleted file mode 100644
index a42ca755fce606..00000000000000
--- a/test/reline/test_within_pipe.rb
+++ /dev/null
@@ -1,78 +0,0 @@
-require_relative 'helper'
-
-class Reline::WithinPipeTest < Reline::TestCase
-  def setup
-    Reline.send(:test_mode)
-    @encoding = Reline.core.encoding
-    @input_reader, @writer = IO.pipe(@encoding)
-    Reline.input = @input_reader
-    @reader, @output_writer = IO.pipe(@encoding)
-    @output = Reline.output = @output_writer
-    @config = Reline.core.config
-    @config.keyseq_timeout *= 600 if defined?(RubyVM::RJIT) && RubyVM::RJIT.enabled? # for --jit-wait CI
-    @line_editor = Reline.core.line_editor
-  end
-
-  def teardown
-    Reline.input = STDIN
-    Reline.output = STDOUT
-    Reline.point = 0
-    Reline.delete_text
-    @input_reader.close
-    @writer.close
-    @reader.close
-    @output_writer.close
-    @config.reset
-    @config.reset_default_key_bindings
-    Reline.test_reset
-  end
-
-  def test_simple_input
-    @writer.write("abc\n")
-    assert_equal 'abc', Reline.readmultiline(&proc{ true })
-  end
-
-  def test_unknown_macro
-    @config.add_default_key_binding('abc'.bytes, :unknown_macro)
-    @writer.write("abcd\n")
-    assert_equal 'd', Reline.readmultiline(&proc{ true })
-  end
-
-  def test_macro_commands_for_moving
-    @config.add_default_key_binding("\C-x\C-a".bytes, :beginning_of_line)
-    @config.add_default_key_binding("\C-x\C-e".bytes, :end_of_line)
-    @config.add_default_key_binding("\C-x\C-f".bytes, :forward_char)
-    @config.add_default_key_binding("\C-x\C-b".bytes, :backward_char)
-    @config.add_default_key_binding("\C-x\M-f".bytes, :forward_word)
-    @config.add_default_key_binding("\C-x\M-b".bytes, :backward_word)
-    @writer.write(" def\C-x\C-aabc\C-x\C-e ghi\C-x\C-a\C-x\C-f\C-x\C-f_\C-x\C-b\C-x\C-b_\C-x\C-f\C-x\C-f\C-x\C-f\C-x\M-f_\C-x\M-b\n")
-    assert_equal 'a_b_c def_ ghi', Reline.readmultiline(&proc{ true })
-  end
-
-  def test_macro_commands_for_editing
-    @config.add_default_key_binding("\C-x\C-d".bytes, :delete_char)
-    @config.add_default_key_binding("\C-x\C-h".bytes, :backward_delete_char)
-    @config.add_default_key_binding("\C-x\C-v".bytes, :quoted_insert)
-    #@config.add_default_key_binding("\C-xa".bytes, :self_insert)
-    @config.add_default_key_binding("\C-x\C-t".bytes, :transpose_chars)
-    @config.add_default_key_binding("\C-x\M-t".bytes, :transpose_words)
-    @config.add_default_key_binding("\C-x\M-u".bytes, :upcase_word)
-    @config.add_default_key_binding("\C-x\M-l".bytes, :downcase_word)
-    @config.add_default_key_binding("\C-x\M-c".bytes, :capitalize_word)
-    @writer.write("abcde\C-b\C-b\C-b\C-x\C-d\C-x\C-h\C-x\C-v\C-a\C-f\C-f EF\C-x\C-t gh\C-x\M-t\C-b\C-b\C-b\C-b\C-b\C-b\C-b\C-b\C-x\M-u\C-x\M-l\C-x\M-c\n")
-    assert_equal "a\C-aDE gh Fe", Reline.readmultiline(&proc{ true })
-  end
-
-  def test_delete_text_in_multiline
-    @writer.write("abc\ndef\nxyz\n")
-    result = Reline.readmultiline(&proc{ |str|
-      if str.include?('xyz')
-        Reline.delete_text
-        true
-      else
-        false
-      end
-    })
-    assert_equal "abc\ndef", result
-  end
-end
diff --git a/test/reline/windows/test_key_event_record.rb b/test/reline/windows/test_key_event_record.rb
deleted file mode 100644
index a034d20fe44170..00000000000000
--- a/test/reline/windows/test_key_event_record.rb
+++ /dev/null
@@ -1,41 +0,0 @@
-require_relative '../helper'
-return unless Reline.const_defined?(:Windows)
-
-class Reline::Windows
-  class KeyEventRecord::Test < Reline::TestCase
-
-    def setup
-      # Ctrl+A
-      @key = Reline::Windows::KeyEventRecord.new(0x41, 1, Reline::Windows::LEFT_CTRL_PRESSED)
-    end
-
-    def test_matches__with_no_arguments_raises_error
-      assert_raise(ArgumentError) { @key.matches? }
-    end
-
-    def test_matches_char_code
-      assert @key.matches?(char_code: 0x1)
-    end
-
-    def test_matches_virtual_key_code
-      assert @key.matches?(virtual_key_code: 0x41)
-    end
-
-    def test_matches_control_keys
-      assert @key.matches?(control_keys: :CTRL)
-    end
-
-    def test_doesnt_match_alt
-      refute @key.matches?(control_keys: :ALT)
-    end
-
-    def test_doesnt_match_empty_control_key
-      refute @key.matches?(control_keys: [])
-    end
-
-    def test_matches_control_keys_and_virtual_key_code
-      assert @key.matches?(control_keys: :CTRL, virtual_key_code: 0x41)
-    end
-
-  end
-end
diff --git a/test/reline/yamatanooroti/multiline_repl b/test/reline/yamatanooroti/multiline_repl
deleted file mode 100755
index bdefc48faa3b55..00000000000000
--- a/test/reline/yamatanooroti/multiline_repl
+++ /dev/null
@@ -1,252 +0,0 @@
-#!/usr/bin/env ruby
-
-
-require 'bundler'
-Bundler.require
-
-require 'reline'
-require 'optparse'
-require_relative 'termination_checker'
-
-opt = OptionParser.new
-opt.on('--prompt-list-cache-timeout VAL') { |v|
-  Reline::LineEditor.__send__(:remove_const, :PROMPT_LIST_CACHE_TIMEOUT)
-  Reline::LineEditor::PROMPT_LIST_CACHE_TIMEOUT = v.to_f
-}
-opt.on('--dynamic-prompt') {
-  Reline.prompt_proc = proc { |lines|
-    lines.each_with_index.map { |l, i|
-      '[%04d]> ' % i
-    }
-  }
-}
-opt.on('--broken-dynamic-prompt') {
-  Reline.prompt_proc = proc { |lines|
-    range = lines.size > 1 ? (0..(lines.size - 2)) : (0..0)
-    lines[range].each_with_index.map { |l, i|
-      '[%04d]> ' % i
-    }
-  }
-}
-opt.on('--dynamic-prompt-returns-empty') {
-  Reline.prompt_proc = proc { |l| [] }
-}
-opt.on('--dynamic-prompt-with-newline') {
-  Reline.prompt_proc = proc { |lines|
-    range = lines.size > 1 ? (0..(lines.size - 2)) : (0..0)
-    lines[range].each_with_index.map { |l, i|
-      '[%04d\n]> ' % i
-    }
-  }
-}
-opt.on('--broken-dynamic-prompt-assert-no-escape-sequence') {
-  Reline.prompt_proc = proc { |lines|
-    has_escape_sequence = lines.join.include?("\e")
-    (lines.size + 1).times.map { |i|
-      has_escape_sequence ? 'error>' : '[%04d]> ' % i
-    }
-  }
-}
-opt.on('--color-bold') {
-  Reline.output_modifier_proc = ->(output, complete:){
-    output.gsub(/./) { |c| "\e[1m#{c}\e[0m" }
-  }
-}
-opt.on('--dynamic-prompt-show-line') {
-  Reline.prompt_proc = proc { |lines|
-    lines.map { |l|
-      '[%4.4s]> ' % l
-    }
-  }
-}
-
-def assert_auto_indent_params(lines, line_index, byte_pointer, is_newline)
-  raise 'Wrong lines type' unless lines.all?(String)
-
-  line = lines[line_index]
-  raise 'Wrong line_index value' unless line
-
-  # The condition `byte_pointer <= line.bytesize` is not satisfied. Maybe bug.
-  # Instead, loose constraint `byte_pointer <= line.bytesize + 1` seems to be satisfied when is_newline is false.
-  return if is_newline
-
-  raise 'byte_pointer out of bounds' unless byte_pointer <= line.bytesize + 1
-  raise 'Invalid byte_pointer' unless line.byteslice(0, byte_pointer).valid_encoding?
-end
-
-opt.on('--auto-indent') {
-  Reline.auto_indent_proc = lambda do |lines, line_index, byte_pointer, is_newline|
-    assert_auto_indent_params(lines, line_index, byte_pointer, is_newline)
-    AutoIndent.calculate_indent(lines, line_index, byte_pointer, is_newline)
-  end
-}
-opt.on('--dialog VAL') { |v|
-  Reline.add_dialog_proc(:simple_dialog, lambda {
-    return nil if v.include?('nil')
-    if v.include?('simple')
-      contents = <<~RUBY.split("\n")
-        Ruby is...
-        A dynamic, open source programming
-        language with a focus on simplicity
-        and productivity. It has an elegant
-        syntax that is natural to read and
-        easy to write.
-      RUBY
-    elsif v.include?('long')
-      contents = <<~RUBY.split("\n")
-        Ruby is...
-        A dynamic, open
-        source programming
-        language with a
-        focus on simplicity
-        and productivity.
-        It has an elegant
-        syntax that is
-        natural to read
-        and easy to write.
-      RUBY
-    elsif v.include?('fullwidth')
-      contents = <<~RUBY.split("\n")
-        Rubyとは...
-
-        オープンソースの動的なプログラミン
-        グ言語で、シンプルさと高い生産性を
-        備えています。エレガントな文法を持
-        ち、自然に読み書きができます。
-      RUBY
-    end
-    if v.include?('scrollkey')
-      dialog.trap_key = nil
-      if key and key.match?(dialog.name)
-        if dialog.pointer.nil?
-          dialog.pointer = 0
-        elsif dialog.pointer >= (contents.size - 1)
-          dialog.pointer = 0
-        else
-          dialog.pointer += 1
-        end
-      end
-      dialog.trap_key = [?j.ord]
-      height = 4
-    end
-    scrollbar = false
-    if v.include?('scrollbar')
-      scrollbar = true
-    end
-    if v.include?('alt-scrollbar')
-      scrollbar = true
-    end
-    Reline::DialogRenderInfo.new(pos: cursor_pos, contents: contents, height: height, scrollbar: scrollbar)
-  })
-  if v.include?('alt-scrollbar')
-    ENV['RELINE_ALT_SCROLLBAR'] = '1'
-  end
-}
-opt.on('--complete') {
-  Reline.completion_proc = lambda { |target, preposing = nil, postposing = nil|
-    %w{String ScriptError SyntaxError Signal}.select{ |c| c.start_with?(target) }
-  }
-}
-opt.on('--autocomplete') {
-  Reline.autocompletion = true
-  Reline.completion_proc = lambda { |target, preposing = nil, postposing = nil|
-    %w{String Struct Symbol ScriptError SyntaxError Signal}.select{ |c| c.start_with?(target) }
-  }
-}
-opt.on('--autocomplete-long') {
-  Reline.autocompletion = true
-  Reline.completion_proc = lambda { |target, preposing = nil, postposing = nil|
-    %w{
-      String
-      Struct
-      Symbol
-      StopIteration
-      SystemCallError
-      SystemExit
-      SystemStackError
-      ScriptError
-      SyntaxError
-      Signal
-      SizedQueue
-      Set
-      SecureRandom
-      Socket
-      StringIO
-      StringScanner
-      Shellwords
-      Syslog
-      Singleton
-      SDBM
-    }.select{ |c| c.start_with?(target) }
-  }
-}
-opt.on('--autocomplete-super-long') {
-  Reline.autocompletion = true
-  Reline.completion_proc = lambda { |target, preposing = nil, postposing = nil|
-    c = 'A'
-    2000.times.map{ s = "Str_#{c}"; c.succ!; s }.select{ |c| c.start_with?(target) }
-  }
-}
-
-opt.on('--autocomplete-width-long') {
-  Reline.autocompletion = true
-  Reline.completion_proc = lambda { |target, preposing = nil, postposing = nil|
-    %w{
-        remove_instance_variable
-        respond_to?
-        ruby2_keywords
-        rand
-        readline
-        readlines
-        require
-        require_relative
-        raise
-        respond_to_missing?
-        redo
-        rescue
-        retry
-        return
-    }.select{ |c| c.start_with?(target) }
-  }
-}
-opt.parse!(ARGV)
-
-begin
-  stty_save = `stty -g`.chomp
-rescue
-end
-
-begin
-  prompt = ENV['RELINE_TEST_PROMPT'] || 'prompt> '
-  puts 'Multiline REPL.'
-  while code = Reline.readmultiline(prompt, true) { |code| TerminationChecker.terminated?(code) }
-    case code.chomp
-    when 'exit', 'quit', 'q'
-      exit 0
-    when ''
-      # NOOP
-    else
-      begin
-        result = eval(code)
-        puts "=> #{result.inspect}"
-      rescue ScriptError, StandardError => e
-        puts "Traceback (most recent call last):"
-        e.backtrace.reverse_each do |f|
-          puts "        #{f}"
-        end
-        puts e.message
-      end
-    end
-  end
-rescue Interrupt
-  puts '^C'
-  `stty #{stty_save}` if stty_save
-  exit 0
-ensure
-  `stty #{stty_save}` if stty_save
-end
-begin
-  puts
-rescue Errno::EIO
-  # Maybe the I/O has been closed.
-end
diff --git a/test/reline/yamatanooroti/termination_checker.rb b/test/reline/yamatanooroti/termination_checker.rb
deleted file mode 100644
index b97c798c59318b..00000000000000
--- a/test/reline/yamatanooroti/termination_checker.rb
+++ /dev/null
@@ -1,26 +0,0 @@
-require 'ripper'
-
-module TerminationChecker
-  def self.terminated?(code)
-    Ripper.sexp(code) ? true : false
-  end
-end
-
-module AutoIndent
-  def self.calculate_indent(lines, line_index, byte_pointer, is_newline)
-    if is_newline
-      2 * nesting_level(lines[0..line_index - 1])
-    else
-      lines = lines.dup
-      lines[line_index] = lines[line_index]&.byteslice(0, byte_pointer)
-      prev_level = nesting_level(lines[0..line_index - 1])
-      level = nesting_level(lines[0..line_index])
-      2 * level if level < prev_level
-    end
-  end
-
-  def self.nesting_level(lines)
-    code = lines.join("\n")
-    code.scan(/if|def|\(|\[|\{/).size - code.scan(/end|\)|\]|\}/).size
-  end
-end
diff --git a/test/reline/yamatanooroti/test_rendering.rb b/test/reline/yamatanooroti/test_rendering.rb
deleted file mode 100644
index 8ac0c0c096ebe0..00000000000000
--- a/test/reline/yamatanooroti/test_rendering.rb
+++ /dev/null
@@ -1,1617 +0,0 @@
-require 'reline'
-
-begin
-  require 'yamatanooroti'
-
-  class Reline::RenderingTest < Yamatanooroti::TestCase
-    def setup
-      @pwd = Dir.pwd
-      suffix = '%010d' % Random.rand(0..65535)
-      @tmpdir = File.join(File.expand_path(Dir.tmpdir), "test_reline_config_#{$$}_#{suffix}")
-      begin
-        Dir.mkdir(@tmpdir)
-      rescue Errno::EEXIST
-        FileUtils.rm_rf(@tmpdir)
-        Dir.mkdir(@tmpdir)
-      end
-      @inputrc_backup = ENV['INPUTRC']
-      @inputrc_file = ENV['INPUTRC'] = File.join(@tmpdir, 'temporaty_inputrc')
-      File.unlink(@inputrc_file) if File.exist?(@inputrc_file)
-    end
-
-    def teardown
-      FileUtils.rm_rf(@tmpdir)
-      ENV['INPUTRC'] = @inputrc_backup
-      ENV.delete('RELINE_TEST_PROMPT') if ENV['RELINE_TEST_PROMPT']
-    end
-
-    def test_history_back
-      start_terminal(5, 30, %W{ruby -I#{@pwd}/lib #{@pwd}/test/reline/yamatanooroti/multiline_repl}, startup_message: 'Multiline REPL.')
-      write(":a\n")
-      write("\C-p")
-      close
-      assert_screen(<<~EOC)
-        Multiline REPL.
-        prompt> :a
-        => :a
-        prompt> :a
-      EOC
-    end
-
-    def test_backspace
-      start_terminal(5, 30, %W{ruby -I#{@pwd}/lib #{@pwd}/test/reline/yamatanooroti/multiline_repl}, startup_message: 'Multiline REPL.')
-      write(":abc\C-h\n")
-      close
-      assert_screen(<<~EOC)
-        Multiline REPL.
-        prompt> :ab
-        => :ab
-        prompt>
-      EOC
-    end
-
-    def test_autowrap
-      start_terminal(5, 30, %W{ruby -I#{@pwd}/lib #{@pwd}/test/reline/yamatanooroti/multiline_repl}, startup_message: 'Multiline REPL.')
-      write('01234567890123456789012')
-      close
-      assert_screen(<<~EOC)
-        Multiline REPL.
-        prompt> 0123456789012345678901
-        2
-      EOC
-    end
-
-    def test_fullwidth
-      start_terminal(5, 30, %W{ruby -I#{@pwd}/lib #{@pwd}/test/reline/yamatanooroti/multiline_repl}, startup_message: 'Multiline REPL.')
-      write(":あ\n")
-      close
-      assert_screen(<<~EOC)
-        Multiline REPL.
-        prompt> :あ
-        => :あ
-        prompt>
-      EOC
-    end
-
-    def test_two_fullwidth
-      start_terminal(5, 30, %W{ruby -I#{@pwd}/lib #{@pwd}/test/reline/yamatanooroti/multiline_repl}, startup_message: 'Multiline REPL.')
-      write(":あい\n")
-      close
-      assert_screen(<<~EOC)
-        Multiline REPL.
-        prompt> :あい
-        => :あい
-        prompt>
-      EOC
-    end
-
-    def test_finish_autowrapped_line
-      start_terminal(10, 40, %W{ruby -I#{@pwd}/lib #{@pwd}/test/reline/yamatanooroti/multiline_repl}, startup_message: 'Multiline REPL.')
-      write("[{'user'=>{'email'=>'a@a', 'id'=>'ABC'}, 'version'=>4, 'status'=>'succeeded'}]\n")
-      close
-      assert_screen(<<~EOC)
-        Multiline REPL.
-        prompt> [{'user'=>{'email'=>'a@a', 'id'=
-        >'ABC'}, 'version'=>4, 'status'=>'succee
-        ded'}]
-        => [{"user"=>{"email"=>"a@a", "id"=>"ABC
-        "}, "version"=>4, "status"=>"succeeded"}
-        ]
-        prompt>
-      EOC
-    end
-
-    def test_finish_autowrapped_line_in_the_middle_of_lines
-      start_terminal(20, 30, %W{ruby -I#{@pwd}/lib #{@pwd}/test/reline/yamatanooroti/multiline_repl}, startup_message: 'Multiline REPL.')
-      write("[{'user'=>{'email'=>'abcdef@abcdef', 'id'=>'ABC'}, 'version'=>4, 'status'=>'succeeded'}]#{"\C-b"*7}")
-      write("\n")
-      close
-      assert_screen(<<~EOC)
-        Multiline REPL.
-        prompt> [{'user'=>{'email'=>'a
-        bcdef@abcdef', 'id'=>'ABC'}, '
-        version'=>4, 'status'=>'succee
-        ded'}]
-        => [{"user"=>{"email"=>"abcdef
-        @abcdef", "id"=>"ABC"}, "versi
-        on"=>4, "status"=>"succeeded"}
-        ]
-        prompt>
-      EOC
-    end
-
-    def test_finish_autowrapped_line_in_the_middle_of_multilines
-      omit if RUBY_VERSION < '2.7'
-      start_terminal(30, 16, %W{ruby -I#{@pwd}/lib #{@pwd}/test/reline/yamatanooroti/multiline_repl}, startup_message: 'Multiline REPL.')
-      write("<<~EOM\n  ABCDEFG\nEOM\n")
-      close
-      assert_screen(<<~'EOC')
-        Multiline REPL.
-        prompt> <<~EOM
-        prompt>   ABCDEF
-        G
-        prompt> EOM
-        => "ABCDEFG\n"
-        prompt>
-      EOC
-    end
-
-    def test_prompt
-      write_inputrc <<~'LINES'
-        "abc": "123"
-      LINES
-      start_terminal(5, 30, %W{ruby -I#{@pwd}/lib #{@pwd}/test/reline/yamatanooroti/multiline_repl}, startup_message: 'Multiline REPL.')
-      write("abc\n")
-      close
-      assert_screen(<<~EOC)
-        Multiline REPL.
-        prompt> 123
-        => 123
-        prompt>
-      EOC
-    end
-
-    def test_mode_string_emacs
-      write_inputrc <<~LINES
-        set show-mode-in-prompt on
-      LINES
-      start_terminal(5, 30, %W{ruby -I#{@pwd}/lib #{@pwd}/test/reline/yamatanooroti/multiline_repl}, startup_message: 'Multiline REPL.')
-      close
-      assert_screen(<<~EOC)
-        Multiline REPL.
-        @prompt>
-      EOC
-    end
-
-    def test_mode_string_vi
-      write_inputrc <<~LINES
-        set editing-mode vi
-        set show-mode-in-prompt on
-      LINES
-      start_terminal(5, 30, %W{ruby -I#{@pwd}/lib #{@pwd}/test/reline/yamatanooroti/multiline_repl}, startup_message: 'Multiline REPL.')
-      write(":a\n\C-[k")
-      close
-      assert_screen(<<~EOC)
-        Multiline REPL.
-        (ins)prompt> :a
-        => :a
-        (cmd)prompt> :a
-      EOC
-    end
-
-    def test_original_mode_string_emacs
-      write_inputrc <<~LINES
-        set show-mode-in-prompt on
-        set emacs-mode-string [emacs]
-      LINES
-      start_terminal(5, 30, %W{ruby -I#{@pwd}/lib #{@pwd}/test/reline/yamatanooroti/multiline_repl}, startup_message: 'Multiline REPL.')
-      close
-      assert_screen(<<~EOC)
-        Multiline REPL.
-        [emacs]prompt>
-      EOC
-    end
-
-    def test_original_mode_string_with_quote
-      write_inputrc <<~LINES
-        set show-mode-in-prompt on
-        set emacs-mode-string "[emacs]"
-      LINES
-      start_terminal(5, 30, %W{ruby -I#{@pwd}/lib #{@pwd}/test/reline/yamatanooroti/multiline_repl}, startup_message: 'Multiline REPL.')
-      close
-      assert_screen(<<~EOC)
-        Multiline REPL.
-        [emacs]prompt>
-      EOC
-    end
-
-    def test_original_mode_string_vi
-      write_inputrc <<~LINES
-        set editing-mode vi
-        set show-mode-in-prompt on
-        set vi-ins-mode-string "{InS}"
-        set vi-cmd-mode-string "{CmD}"
-      LINES
-      start_terminal(5, 30, %W{ruby -I#{@pwd}/lib #{@pwd}/test/reline/yamatanooroti/multiline_repl}, startup_message: 'Multiline REPL.')
-      write(":a\n\C-[k")
-      close
-      assert_screen(<<~EOC)
-        Multiline REPL.
-        {InS}prompt> :a
-        => :a
-        {CmD}prompt> :a
-      EOC
-    end
-
-    def test_mode_string_vi_changing
-      write_inputrc <<~LINES
-        set editing-mode vi
-        set show-mode-in-prompt on
-      LINES
-      start_terminal(5, 30, %W{ruby -I#{@pwd}/lib #{@pwd}/test/reline/yamatanooroti/multiline_repl}, startup_message: 'Multiline REPL.')
-      write(":a\C-[ab\C-[ac\C-h\C-h\C-h\C-h:a")
-      close
-      assert_screen(<<~EOC)
-        Multiline REPL.
-        (ins)prompt> :a
-      EOC
-    end
-
-    def test_esc_input
-      omit if Reline::IOGate.win?
-      start_terminal(5, 20, %W{ruby -I#{@pwd}/lib #{@pwd}/test/reline/yamatanooroti/multiline_repl}, startup_message: 'Multiline REPL.')
-      write("def\C-aabc")
-      write("\e") # single ESC
-      sleep 1
-      write("A")
-      write("B\eAC") # ESC + A (M-A, specified ed_unassigned in Reline::KeyActor::Emacs)
-      close
-      assert_screen(<<~EOC)
-        Multiline REPL.
-        prompt> abcABCdef
-      EOC
-    end
-
-    def test_prompt_with_escape_sequence
-      ENV['RELINE_TEST_PROMPT'] = "\1\e[30m\2prompt> \1\e[m\2"
-      start_terminal(5, 20, %W{ruby -I#{@pwd}/lib #{@pwd}/test/reline/yamatanooroti/multiline_repl}, startup_message: 'Multiline REPL.')
-      write("123\n")
-      close
-      assert_screen(<<~EOC)
-        Multiline REPL.
-        prompt> 123
-        => 123
-        prompt>
-      EOC
-    end
-
-    def test_prompt_with_escape_sequence_and_autowrap
-      ENV['RELINE_TEST_PROMPT'] = "\1\e[30m\2prompt> \1\e[m\2"
-      start_terminal(5, 20, %W{ruby -I#{@pwd}/lib #{@pwd}/test/reline/yamatanooroti/multiline_repl}, startup_message: 'Multiline REPL.')
-      write("1234567890123\n")
-      close
-      assert_screen(<<~EOC)
-        Multiline REPL.
-        prompt> 123456789012
-        3
-        => 1234567890123
-        prompt>
-      EOC
-    end
-
-    def test_multiline_and_autowrap
-      start_terminal(10, 20, %W{ruby -I#{@pwd}/lib #{@pwd}/test/reline/yamatanooroti/multiline_repl}, startup_message: 'Multiline REPL.')
-      write("def aaaaaaaaaa\n  33333333\n           end\C-a\C-pputs\C-e\e\C-m888888888888888")
-      close
-      assert_screen(<<~EOC)
-        Multiline REPL.
-        prompt> def aaaaaaaa
-        aa
-        prompt> puts  333333
-        33
-        prompt> 888888888888
-        888
-        prompt>            e
-        nd
-      EOC
-    end
-
-    def test_multiline_add_new_line_and_autowrap
-      start_terminal(10, 20, %W{ruby -I#{@pwd}/lib #{@pwd}/test/reline/yamatanooroti/multiline_repl}, startup_message: 'Multiline REPL.')
-      write("def aaaaaaaaaa")
-      write("\n")
-      write("  bbbbbbbbbbbb")
-      write("\n")
-      close
-      assert_screen(<<~EOC)
-        Multiline REPL.
-        prompt> def aaaaaaaa
-        aa
-        prompt>   bbbbbbbbbb
-        bb
-        prompt>
-      EOC
-    end
-
-    def test_clear
-      start_terminal(10, 15, %W{ruby -I#{@pwd}/lib #{@pwd}/test/reline/yamatanooroti/multiline_repl}, startup_message: 'Multiline REPL.')
-      write("3\C-l")
-      close
-      assert_screen(<<~EOC)
-        prompt> 3
-      EOC
-    end
-
-    def test_clear_multiline_and_autowrap
-      start_terminal(10, 15, %W{ruby -I#{@pwd}/lib #{@pwd}/test/reline/yamatanooroti/multiline_repl}, startup_message: 'Multiline REPL.')
-      write("def aaaaaa\n  3\n\C-lend")
-      close
-      assert_screen(<<~EOC)
-        prompt> def aaa
-        aaa
-        prompt>   3
-        prompt> end
-      EOC
-    end
-
-    def test_nearest_cursor
-      start_terminal(10, 20, %W{ruby -I#{@pwd}/lib #{@pwd}/test/reline/yamatanooroti/multiline_repl}, startup_message: 'Multiline REPL.')
-      write("def ああ\n  :いい\nend\C-pbb\C-pcc")
-      close
-      assert_screen(<<~EOC)
-        Multiline REPL.
-        prompt> def ccああ
-        prompt>   :bbいい
-        prompt> end
-      EOC
-    end
-
-    def test_delete_line
-      start_terminal(10, 20, %W{ruby -I#{@pwd}/lib #{@pwd}/test/reline/yamatanooroti/multiline_repl}, startup_message: 'Multiline REPL.')
-      write("def a\n\nend\C-p\C-h")
-      close
-      assert_screen(<<~EOC)
-        Multiline REPL.
-        prompt> def a
-        prompt> end
-      EOC
-    end
-
-    def test_last_line_of_screen
-      start_terminal(5, 20, %W{ruby -I#{@pwd}/lib #{@pwd}/test/reline/yamatanooroti/multiline_repl}, startup_message: 'Multiline REPL.')
-      write("\n\n\n\n\ndef a\nend")
-      close
-      assert_screen(<<~EOC)
-        prompt>
-        prompt>
-        prompt>
-        prompt> def a
-        prompt> end
-      EOC
-    end
-
-    # c17a09b7454352e2aff5a7d8722e80afb73e454b
-    def test_autowrap_at_last_line_of_screen
-      start_terminal(5, 15, %W{ruby -I#{@pwd}/lib #{@pwd}/test/reline/yamatanooroti/multiline_repl}, startup_message: 'Multiline REPL.')
-      write("def a\nend\n\C-p")
-      close
-      assert_screen(<<~EOC)
-        prompt> def a
-        prompt> end
-        => :a
-        prompt> def a
-        prompt> end
-      EOC
-    end
-
-    # f002483b27cdb325c5edf9e0fe4fa4e1c71c4b0e
-    def test_insert_line_in_the_middle_of_line
-      start_terminal(5, 20, %W{ruby -I#{@pwd}/lib #{@pwd}/test/reline/yamatanooroti/multiline_repl}, startup_message: 'Multiline REPL.')
-      write("333\C-b\C-b\e\C-m8")
-      close
-      assert_screen(<<~EOC)
-        Multiline REPL.
-        prompt> 3
-        prompt> 833
-      EOC
-    end
-
-    # 9d8978961c5de5064f949d56d7e0286df9e18f43
-    def test_insert_line_in_the_middle_of_line_at_last_line_of_screen
-      start_terminal(3, 20, %W{ruby -I#{@pwd}/lib #{@pwd}/test/reline/yamatanooroti/multiline_repl}, startup_message: 'Multiline REPL.')
-      write("333333333333333\C-a\C-f\e\C-m")
-      close
-      assert_screen(<<~EOC)
-        prompt> 3
-        prompt> 333333333333
-        33
-      EOC
-    end
-
-    def test_insert_after_clear
-      start_terminal(10, 20, %W{ruby -I#{@pwd}/lib #{@pwd}/test/reline/yamatanooroti/multiline_repl}, startup_message: 'Multiline REPL.')
-      write("def a\n  01234\nend\C-l\C-p5678")
-      close
-      assert_screen(<<~EOC)
-        prompt> def a
-        prompt>   056781234
-        prompt> end
-      EOC
-    end
-
-    def test_foced_newline_insertion
-      start_terminal(10, 20, %W{ruby -I#{@pwd}/lib #{@pwd}/test/reline/yamatanooroti/multiline_repl}, startup_message: 'Multiline REPL.')
-      #write("def a\nend\C-p\C-e\e\C-m  3")
-      write("def a\nend\C-p\C-e\e\x0D")
-      close
-      assert_screen(<<~EOC)
-        Multiline REPL.
-        prompt> def a
-        prompt>
-        prompt> end
-      EOC
-    end
-
-    def test_multiline_incremental_search
-      start_terminal(6, 25, %W{ruby -I#{@pwd}/lib #{@pwd}/test/reline/yamatanooroti/multiline_repl}, startup_message: 'Multiline REPL.')
-      write("def a\n  8\nend\ndef b\n  3\nend\C-s8")
-      close
-      assert_screen(<<~EOC)
-        (i-search)`8'def a
-        (i-search)`8'  8
-        (i-search)`8'end
-      EOC
-    end
-
-    def test_multiline_incremental_search_finish
-      start_terminal(6, 25, %W{ruby -I#{@pwd}/lib #{@pwd}/test/reline/yamatanooroti/multiline_repl}, startup_message: 'Multiline REPL.')
-      write("def a\n  8\nend\ndef b\n  3\nend\C-r8\C-j")
-      close
-      assert_screen(<<~EOC)
-        prompt> def a
-        prompt>   8
-        prompt> end
-      EOC
-    end
-
-    def test_binding_for_vi_movement_mode
-      write_inputrc <<~LINES
-        set editing-mode vi
-        "\\C-a": vi-movement-mode
-      LINES
-      start_terminal(5, 30, %W{ruby -I#{@pwd}/lib #{@pwd}/test/reline/yamatanooroti/multiline_repl}, startup_message: 'Multiline REPL.')
-      write(":1234\C-ahhhi0")
-      close
-      assert_screen(<<~EOC)
-        Multiline REPL.
-        prompt> :01234
-      EOC
-    end
-
-    def test_prompt_list_caching
-      start_terminal(5, 30, %W{ruby -I#{@pwd}/lib #{@pwd}/test/reline/yamatanooroti/multiline_repl --prompt-list-cache-timeout 10 --dynamic-prompt}, startup_message: 'Multiline REPL.')
-      write("def hoge\n  3\nend")
-      close
-      assert_screen(<<~EOC)
-        Multiline REPL.
-        [0000]> def hoge
-        [0001]>   3
-        [0002]> end
-      EOC
-    end
-
-    def test_broken_prompt_list
-      start_terminal(5, 30, %W{ruby -I#{@pwd}/lib #{@pwd}/test/reline/yamatanooroti/multiline_repl --broken-dynamic-prompt}, startup_message: 'Multiline REPL.')
-      write("def hoge\n  3\nend")
-      close
-      assert_screen(<<~EOC)
-        Multiline REPL.
-        [0000]> def hoge
-        [0001]>   3
-        [0001]> end
-      EOC
-    end
-
-    def test_no_escape_sequence_passed_to_dynamic_prompt
-      start_terminal(10, 30, %W{ruby -I#{@pwd}/lib #{@pwd}/test/reline/yamatanooroti/multiline_repl  --autocomplete --color-bold --broken-dynamic-prompt-assert-no-escape-sequence}, startup_message: 'Multiline REPL.')
-      write("%[ S")
-      write("\n")
-      close
-      assert_screen(<<~EOC)
-        Multiline REPL.
-        [0000]> %[ S
-        [0001]>
-      EOC
-    end
-
-    def test_enable_bracketed_paste
-      omit if Reline.core.io_gate.win?
-      write_inputrc <<~LINES
-        set enable-bracketed-paste on
-      LINES
-      start_terminal(5, 30, %W{ruby -I#{@pwd}/lib #{@pwd}/test/reline/yamatanooroti/multiline_repl}, startup_message: 'Multiline REPL.')
-      write("\e[200~,")
-      write("def hoge\n  3\nend")
-      write("\e[200~.")
-      close
-      assert_screen(<<~EOC)
-        Multiline REPL.
-        prompt> def hoge
-        prompt>   3
-        prompt> end
-      EOC
-    end
-
-    def test_backspace_until_returns_to_initial
-      start_terminal(5, 30, %W{ruby -I#{@pwd}/lib #{@pwd}/test/reline/yamatanooroti/multiline_repl}, startup_message: 'Multiline REPL.')
-      write("ABC")
-      write("\C-h\C-h\C-h")
-      close
-      assert_screen(<<~EOC)
-        Multiline REPL.
-        prompt>
-      EOC
-    end
-
-    def test_longer_than_screen_height
-      start_terminal(5, 30, %W{ruby -I#{@pwd}/lib #{@pwd}/test/reline/yamatanooroti/multiline_repl}, startup_message: 'Multiline REPL.')
-      write(<<~EOC.chomp)
-        def each_top_level_statement
-          initialize_input
-          catch(:TERM_INPUT) do
-            loop do
-              begin
-                prompt
-                unless l = lex
-                  throw :TERM_INPUT if @line == ''
-                else
-                  @line_no += l.count("\n")
-                  next if l == "\n"
-                  @line.concat l
-                  if @code_block_open or @ltype or @continue or @indent > 0
-                    next
-                  end
-                end
-                if @line != "\n"
-                  @line.force_encoding(@io.encoding)
-                  yield @line, @exp_line_no
-                end
-                break if @io.eof?
-                @line = ''
-                @exp_line_no = @line_no
-                #
-                @indent = 0
-              rescue TerminateLineInput
-                initialize_input
-                prompt
-              end
-            end
-          end
-        end
-      EOC
-      sleep 1
-      close
-      assert_screen(<<~EOC)
-        prompt>         prompt
-        prompt>       end
-        prompt>     end
-        prompt>   end
-        prompt> end
-      EOC
-    end
-
-    def test_longer_than_screen_height_with_scroll_back
-      start_terminal(5, 30, %W{ruby -I#{@pwd}/lib #{@pwd}/test/reline/yamatanooroti/multiline_repl}, startup_message: 'Multiline REPL.')
-      write(<<~EOC.chomp)
-        def each_top_level_statement
-          initialize_input
-          catch(:TERM_INPUT) do
-            loop do
-              begin
-                prompt
-                unless l = lex
-                  throw :TERM_INPUT if @line == ''
-                else
-                  @line_no += l.count("\n")
-                  next if l == "\n"
-                  @line.concat l
-                  if @code_block_open or @ltype or @continue or @indent > 0
-                    next
-                  end
-                end
-                if @line != "\n"
-                  @line.force_encoding(@io.encoding)
-                  yield @line, @exp_line_no
-                end
-                break if @io.eof?
-                @line = ''
-                @exp_line_no = @line_no
-                #
-                @indent = 0
-              rescue TerminateLineInput
-                initialize_input
-                prompt
-              end
-            end
-          end
-        end
-      EOC
-      sleep 1
-      write("\C-p" * 6)
-      close
-      assert_screen(<<~EOC)
-        prompt>       rescue Terminate
-        LineInput
-        prompt>         initialize_inp
-        ut
-        prompt>         prompt
-      EOC
-    end
-
-    def test_longer_than_screen_height_with_complex_scroll_back
-      start_terminal(4, 30, %W{ruby -I#{@pwd}/lib #{@pwd}/test/reline/yamatanooroti/multiline_repl}, startup_message: 'Multiline REPL.')
-      write(<<~EOC.chomp)
-        def each_top_level_statement
-          initialize_input
-          catch(:TERM_INPUT) do
-            loop do
-              begin
-                prompt
-                unless l = lex
-                  throw :TERM_INPUT if @line == ''
-                else
-                  @line_no += l.count("\n")
-                  next if l == "\n"
-                  @line.concat l
-                  if @code_block_open or @ltype or @continue or @indent > 0
-                    next
-                  end
-                end
-                if @line != "\n"
-                  @line.force_encoding(@io.encoding)
-                  yield @line, @exp_line_no
-                end
-                break if @io.eof?
-                @line = ''
-                @exp_line_no = @line_no
-                #
-                @indent = 0
-              rescue TerminateLineInput
-                initialize_input
-                prompt
-              end
-            end
-          end
-        end
-      EOC
-      sleep 1
-      write("\C-p" * 5)
-      write("\C-n" * 3)
-      close
-      assert_screen(<<~EOC)
-        ut
-        prompt>         prompt
-        prompt>       end
-        prompt>     end
-      EOC
-    end
-
-    def test_longer_than_screen_height_nearest_cursor_with_scroll_back
-      start_terminal(5, 30, %W{ruby -I#{@pwd}/lib #{@pwd}/test/reline/yamatanooroti/multiline_repl}, startup_message: 'Multiline REPL.')
-      write(<<~EOC.chomp)
-        if 1
-          if 2
-            if 3
-              if 4
-                puts
-              end
-            end
-          end
-        end
-      EOC
-      write("\C-p" * 4 + "\C-e" + "\C-p" * 4)
-      write("2")
-      close
-      assert_screen(<<~EOC)
-        prompt> if 12
-        prompt>   if 2
-        prompt>     if 3
-        prompt>       if 4
-        prompt>         puts
-      EOC
-    end
-
-    def test_update_cursor_correctly_when_just_cursor_moving
-      start_terminal(5, 30, %W{ruby -I#{@pwd}/lib #{@pwd}/test/reline/yamatanooroti/multiline_repl}, startup_message: 'Multiline REPL.')
-      write("def hoge\n  01234678")
-      write("\C-p")
-      write("\C-b")
-      write("\C-n")
-      write('5')
-      write("\C-e")
-      write('9')
-      close
-      assert_screen(<<~EOC)
-        Multiline REPL.
-        prompt> def hoge
-        prompt>   0123456789
-      EOC
-    end
-
-    def test_auto_indent
-      start_terminal(10, 30, %W{ruby -I#{@pwd}/lib #{@pwd}/test/reline/yamatanooroti/multiline_repl --auto-indent}, startup_message: 'Multiline REPL.')
-      "def hoge\nputs(\n1,\n2\n)\nend".lines do |line|
-        write line
-      end
-      close
-      assert_screen(<<~EOC)
-        Multiline REPL.
-        prompt> def hoge
-        prompt>   puts(
-        prompt>     1,
-        prompt>     2
-        prompt>   )
-        prompt> end
-      EOC
-    end
-
-    def test_auto_indent_when_inserting_line
-      start_terminal(5, 30, %W{ruby -I#{@pwd}/lib #{@pwd}/test/reline/yamatanooroti/multiline_repl --auto-indent}, startup_message: 'Multiline REPL.')
-      write 'aa(bb(cc(dd(ee('
-      write "\C-b" * 5 + "\n"
-      close
-      assert_screen(<<~EOC)
-        Multiline REPL.
-        prompt> aa(bb(cc(d
-        prompt>       d(ee(
-      EOC
-    end
-
-    def test_auto_indent_multibyte_insert_line
-      start_terminal(10, 30, %W{ruby -I#{@pwd}/lib #{@pwd}/test/reline/yamatanooroti/multiline_repl --auto-indent}, startup_message: 'Multiline REPL.')
-      write "if true\n"
-      write "あいうえお\n"
-      4.times { write "\C-b\C-b\C-b\C-b\e\r" }
-      close
-      assert_screen(<<~EOC)
-        Multiline REPL.
-        prompt> if true
-        prompt>   あ
-        prompt>   い
-        prompt>   う
-        prompt>   え
-        prompt>   お
-        prompt>
-      EOC
-    end
-
-    def test_newline_after_wrong_indent
-      start_terminal(5, 30, %W{ruby -I#{@pwd}/lib #{@pwd}/test/reline/yamatanooroti/multiline_repl --auto-indent}, startup_message: 'Multiline REPL.')
-      write "if 1\n    aa"
-      write "\n"
-      close
-      assert_screen(<<~EOC)
-        Multiline REPL.
-        prompt> if 1
-        prompt>   aa
-        prompt>
-      EOC
-    end
-
-    def test_suppress_auto_indent_just_after_pasted
-      start_terminal(5, 30, %W{ruby -I#{@pwd}/lib #{@pwd}/test/reline/yamatanooroti/multiline_repl --auto-indent}, startup_message: 'Multiline REPL.')
-      write("def hoge\n  [[\n      3]]\ned")
-      write("\C-bn")
-      close
-      assert_screen(<<~EOC)
-        Multiline REPL.
-        prompt> def hoge
-        prompt>   [[
-        prompt>       3]]
-        prompt> end
-      EOC
-    end
-
-    def test_suppress_auto_indent_for_adding_newlines_in_pasting
-      start_terminal(5, 30, %W{ruby -I#{@pwd}/lib #{@pwd}/test/reline/yamatanooroti/multiline_repl --auto-indent}, startup_message: 'Multiline REPL.')
-      write("<<~Q\n")
-      write("{\n  #\n}")
-      write("#")
-      close
-      assert_screen(<<~EOC)
-        Multiline REPL.
-        prompt> <<~Q
-        prompt> {
-        prompt>   #
-        prompt> }#
-      EOC
-    end
-
-    def test_autowrap_in_the_middle_of_a_line
-      start_terminal(5, 20, %W{ruby -I#{@pwd}/lib #{@pwd}/test/reline/yamatanooroti/multiline_repl}, startup_message: 'Multiline REPL.')
-      write("def abcdefg; end\C-b\C-b\C-b\C-b\C-b")
-      %w{h i}.each do |c|
-        write(c)
-      end
-      close
-      assert_screen(<<~EOC)
-        Multiline REPL.
-        prompt> def abcdefgh
-        i; end
-      EOC
-    end
-
-    def test_terminate_in_the_middle_of_lines
-      start_terminal(5, 20, %W{ruby -I#{@pwd}/lib #{@pwd}/test/reline/yamatanooroti/multiline_repl}, startup_message: 'Multiline REPL.')
-      write("def hoge\n  1\n  2\n  3\n  4\nend\n")
-      write("\C-p\C-p\C-p\C-e\n")
-      close
-      assert_screen(<<~EOC)
-        prompt>   3
-        prompt>   4
-        prompt> end
-        => :hoge
-        prompt>
-      EOC
-    end
-
-    def test_dynamic_prompt_returns_empty
-      start_terminal(5, 20, %W{ruby -I#{@pwd}/lib #{@pwd}/test/reline/yamatanooroti/multiline_repl --dynamic-prompt-returns-empty}, startup_message: 'Multiline REPL.')
-      write("def hoge\nend\n")
-      close
-      assert_screen(<<~EOC)
-        Multiline REPL.
-        prompt> def hoge
-        prompt> end
-        => :hoge
-        prompt>
-      EOC
-    end
-
-    def test_reset_rest_height_when_clear_screen
-      start_terminal(5, 20, %W{ruby -I#{@pwd}/lib #{@pwd}/test/reline/yamatanooroti/multiline_repl}, startup_message: 'Multiline REPL.')
-      write("\n\n\n\C-l3\n")
-      close
-      assert_screen(<<~EOC)
-        prompt> 3
-        => 3
-        prompt>
-      EOC
-    end
-
-    def test_meta_key
-      start_terminal(30, 20, %W{ruby -I#{@pwd}/lib #{@pwd}/test/reline/yamatanooroti/multiline_repl}, startup_message: 'Multiline REPL.')
-      write("def ge\M-bho")
-      close
-      assert_screen(<<~EOC)
-        Multiline REPL.
-        prompt> def hoge
-      EOC
-    end
-
-    def test_not_meta_key
-      start_terminal(5, 30, %W{ruby -I#{@pwd}/lib #{@pwd}/test/reline/yamatanooroti/multiline_repl}, startup_message: 'Multiline REPL.')
-      write("おだんご") # "だ" in UTF-8 contains "\xA0"
-      close
-      assert_screen(<<~EOC)
-        Multiline REPL.
-        prompt> おだんご
-      EOC
-    end
-
-    def test_force_enter
-      start_terminal(30, 120, %W{ruby -I#{@pwd}/lib #{@pwd}/test/reline/yamatanooroti/multiline_repl}, startup_message: 'Multiline REPL.')
-      write("def hoge\nend\C-p\C-e")
-      write("\M-\x0D")
-      close
-      assert_screen(<<~EOC)
-        Multiline REPL.
-        prompt> def hoge
-        prompt>
-        prompt> end
-      EOC
-    end
-
-    def test_with_newline
-      omit if Reline.core.io_gate.win?
-      cmd = %Q{ruby -e 'print(%Q{abc def \\e\\r})' | ruby -I#{@pwd}/lib -rreline -e 'p Reline.readline(%{> })'}
-      start_terminal(40, 50, ['bash', '-c', cmd])
-      sleep 1
-      close
-      assert_screen(<<~'EOC')
-        > abc def
-        "abc def "
-      EOC
-    end
-
-    def test_em_set_mark_and_em_exchange_mark
-      start_terminal(10, 50, %W{ruby -I#{@pwd}/lib #{@pwd}/test/reline/yamatanooroti/multiline_repl}, startup_message: 'Multiline REPL.')
-      write("aaa bbb ccc ddd\M-b\M-b\M-\x20\M-b\C-x\C-xX\C-x\C-xY")
-      close
-      assert_screen(<<~'EOC')
-        Multiline REPL.
-        prompt> aaa Ybbb Xccc ddd
-      EOC
-    end
-
-    def test_multiline_completion
-      start_terminal(10, 50, %W{ruby -I#{@pwd}/lib #{@pwd}/test/reline/yamatanooroti/multiline_repl --complete}, startup_message: 'Multiline REPL.')
-      write("def hoge\n  St\n  St\C-p\t")
-      close
-      assert_screen(<<~'EOC')
-        Multiline REPL.
-        prompt> def hoge
-        prompt>   String
-        prompt>   St
-      EOC
-    end
-
-    def test_completion_journey_2nd_line
-      write_inputrc <<~LINES
-        set editing-mode vi
-      LINES
-      start_terminal(10, 50, %W{ruby -I#{@pwd}/lib #{@pwd}/test/reline/yamatanooroti/multiline_repl --complete}, startup_message: 'Multiline REPL.')
-      write("def hoge\n  S\C-n")
-      close
-      assert_screen(<<~'EOC')
-        Multiline REPL.
-        prompt> def hoge
-        prompt>   String
-      EOC
-    end
-
-    def test_completion_journey_with_empty_line
-      write_inputrc <<~LINES
-        set editing-mode vi
-      LINES
-      start_terminal(10, 50, %W{ruby -I#{@pwd}/lib #{@pwd}/test/reline/yamatanooroti/multiline_repl --complete}, startup_message: 'Multiline REPL.')
-      write("\C-n\C-p")
-      close
-      assert_screen(<<~'EOC')
-        Multiline REPL.
-        prompt>
-      EOC
-    end
-
-    def test_simple_dialog
-      start_terminal(20, 50, %W{ruby -I#{@pwd}/lib #{@pwd}/test/reline/yamatanooroti/multiline_repl --dialog simple}, startup_message: 'Multiline REPL.')
-      write('a')
-      write('b')
-      write('c')
-      write("\C-h")
-      close
-      assert_screen(<<~'EOC')
-        Multiline REPL.
-        prompt> ab
-                  Ruby is...
-                  A dynamic, open source programming
-                  language with a focus on simplicity
-                  and productivity. It has an elegant
-                  syntax that is natural to read and
-                  easy to write.
-      EOC
-    end
-
-    def test_simple_dialog_at_right_edge
-      start_terminal(20, 40, %W{ruby -I#{@pwd}/lib #{@pwd}/test/reline/yamatanooroti/multiline_repl --dialog simple}, startup_message: 'Multiline REPL.')
-      write('a')
-      write('b')
-      write('c')
-      write("\C-h")
-      close
-      assert_screen(<<~'EOC')
-        Multiline REPL.
-        prompt> ab
-             Ruby is...
-             A dynamic, open source programming
-             language with a focus on simplicity
-             and productivity. It has an elegant
-             syntax that is natural to read and
-             easy to write.
-      EOC
-    end
-
-    def test_dialog_scroll_pushup_condition
-      start_terminal(10, 50, %W{ruby -I#{@pwd}/lib #{@pwd}/test/reline/yamatanooroti/multiline_repl --autocomplete}, startup_message: 'Multiline REPL.')
-      write("\n" * 10)
-      write("if 1\n  sSt\nend")
-      write("\C-p\C-h\C-e")
-      close
-      assert_screen(<<~'EOC')
-        prompt>
-        prompt>
-        prompt>
-        prompt>
-        prompt>
-        prompt>
-        prompt> if 1
-        prompt>   St
-        prompt> enString
-                  Struct
-      EOC
-    end
-
-    def test_simple_dialog_with_scroll_screen
-      start_terminal(5, 50, %W{ruby -I#{@pwd}/lib #{@pwd}/test/reline/yamatanooroti/multiline_repl --dialog simple}, startup_message: 'Multiline REPL.')
-      write("if 1\n  2\n  3\n  4\n  5\n  6")
-      write("\C-p\C-n\C-p\C-p\C-p#")
-      close
-      assert_screen(<<~'EOC')
-        prompt>   2
-        prompt>   3#
-        prompt>   4
-        prompt>   5
-        prompt>   6 Ruby is...
-      EOC
-    end
-
-    def test_autocomplete_at_bottom
-      start_terminal(15, 50, %W{ruby -I#{@pwd}/lib #{@pwd}/test/reline/yamatanooroti/multiline_repl --autocomplete}, startup_message: 'Multiline REPL.')
-      write('def hoge' + "\C-m" * 10 + "end\C-p  ")
-      write('S')
-      close
-      assert_screen(<<~'EOC')
-        Multiline REPL.
-        prompt> def hoge
-        prompt>
-        prompt>
-        prompt>   String
-        prompt>   Struct
-        prompt>   Symbol
-        prompt>   ScriptError
-        prompt>   SyntaxError
-        prompt>   Signal
-        prompt>   S
-        prompt> end
-      EOC
-    end
-
-    def test_autocomplete_return_to_original
-      start_terminal(20, 20, %W{ruby -I#{@pwd}/lib #{@pwd}/test/reline/yamatanooroti/multiline_repl --autocomplete}, startup_message: 'Multiline REPL.')
-      write('S')
-      write('t')
-      write('r')
-      3.times{ write("\C-i") }
-      close
-      assert_screen(<<~'EOC')
-        Multiline REPL.
-        prompt> Str
-                String
-                Struct
-      EOC
-    end
-
-    def test_autocomplete_target_is_wrapped
-      start_terminal(20, 20, %W{ruby -I#{@pwd}/lib #{@pwd}/test/reline/yamatanooroti/multiline_repl --autocomplete}, startup_message: 'Multiline REPL.')
-      write('          ')
-      write('S')
-      write('t')
-      write('r')
-      close
-      assert_screen(<<~'EOC')
-        Multiline REPL.
-        prompt>           St
-        r             String
-                      Struct
-      EOC
-    end
-
-    def test_simple_dialog_with_scroll_key
-      start_terminal(20, 50, %W{ruby -I#{@pwd}/lib #{@pwd}/test/reline/yamatanooroti/multiline_repl --dialog long,scrollkey}, startup_message: 'Multiline REPL.')
-      write('a')
-      5.times{ write('j') }
-      close
-      assert_screen(<<~'EOC')
-        Multiline REPL.
-        prompt> a
-                 A dynamic, open
-                 source programming
-                 language with a
-                 focus on simplicity
-      EOC
-    end
-
-    def test_simple_dialog_scrollbar_with_moving_to_right
-      start_terminal(20, 50, %W{ruby -I#{@pwd}/lib #{@pwd}/test/reline/yamatanooroti/multiline_repl --dialog long,scrollkey,scrollbar}, startup_message: 'Multiline REPL.')
-      6.times{ write('j') }
-      write('a')
-      close
-      assert_screen(<<~'EOC')
-        Multiline REPL.
-        prompt> a
-                 source programming ▄
-                 language with a    █
-                 focus on simplicity
-                 and productivity.
-      EOC
-    end
-
-    def test_simple_dialog_scrollbar_with_moving_to_left
-      start_terminal(20, 50, %W{ruby -I#{@pwd}/lib #{@pwd}/test/reline/yamatanooroti/multiline_repl --dialog long,scrollkey,scrollbar}, startup_message: 'Multiline REPL.')
-      write('a')
-      6.times{ write('j') }
-      write("\C-h")
-      close
-      assert_screen(<<~'EOC')
-        Multiline REPL.
-        prompt>
-                source programming ▄
-                language with a    █
-                focus on simplicity
-                and productivity.
-      EOC
-    end
-
-    def test_dialog_with_fullwidth_chars
-      ENV['RELINE_TEST_PROMPT'] = '> '
-      start_terminal(20, 5, %W{ruby -I#{@pwd}/lib #{@pwd}/test/reline/yamatanooroti/multiline_repl --dialog fullwidth,scrollkey,scrollbar}, startup_message: 'Multiline REPL.')
-      6.times{ write('j') }
-      close
-      assert_screen(<<~'EOC')
-        Multi
-        line
-        REPL.
-        >
-        オー
-        グ言▄
-        備え█
-        ち、█
-      EOC
-    end
-
-    def test_dialog_with_fullwidth_chars_split
-      ENV['RELINE_TEST_PROMPT'] = '> '
-      start_terminal(20, 6, %W{ruby -I#{@pwd}/lib #{@pwd}/test/reline/yamatanooroti/multiline_repl --dialog fullwidth,scrollkey,scrollbar}, startup_message: 'Multiline REPL.')
-      6.times{ write('j') }
-      close
-      assert_screen(<<~'EOC')
-        Multil
-        ine RE
-        PL.
-        >
-        オー
-        グ言 ▄
-        備え █
-        ち、 █
-      EOC
-    end
-
-    def test_autocomplete_empty
-      start_terminal(20, 30, %W{ruby -I#{@pwd}/lib #{@pwd}/test/reline/yamatanooroti/multiline_repl --autocomplete}, startup_message: 'Multiline REPL.')
-      write('Street')
-      close
-      assert_screen(<<~'EOC')
-        Multiline REPL.
-        prompt> Street
-      EOC
-    end
-
-    def test_autocomplete
-      start_terminal(20, 30, %W{ruby -I#{@pwd}/lib #{@pwd}/test/reline/yamatanooroti/multiline_repl --autocomplete}, startup_message: 'Multiline REPL.')
-      write('Str')
-      close
-      assert_screen(<<~'EOC')
-        Multiline REPL.
-        prompt> Str
-                String
-                Struct
-      EOC
-    end
-
-    def test_autocomplete_after_2nd_line
-      start_terminal(20, 30, %W{ruby -I#{@pwd}/lib #{@pwd}/test/reline/yamatanooroti/multiline_repl --autocomplete}, startup_message: 'Multiline REPL.')
-      write("def hoge\n  Str")
-      close
-      assert_screen(<<~'EOC')
-        Multiline REPL.
-        prompt> def hoge
-        prompt>   Str
-                  String
-                  Struct
-      EOC
-    end
-
-    def test_autocomplete_rerender_under_dialog
-      start_terminal(20, 30, %W{ruby -I#{@pwd}/lib #{@pwd}/test/reline/yamatanooroti/multiline_repl --autocomplete}, startup_message: 'Multiline REPL.')
-      write("def hoge\n\n  123456\n  456789\nend\C-p\C-p\C-p  a = Str")
-      write('i')
-      close
-      assert_screen(<<~'EOC')
-        Multiline REPL.
-        prompt> def hoge
-        prompt>   a = Stri
-        prompt>   1234String
-        prompt>   456789
-        prompt> end
-      EOC
-    end
-
-    def test_rerender_multiple_dialog
-      start_terminal(20, 60, %W{ruby -I#{@pwd}/lib #{@pwd}/test/reline/yamatanooroti/multiline_repl --autocomplete --dialog simple}, startup_message: 'Multiline REPL.')
-      write("if\n  abcdef\n  123456\n  456789\nend\C-p\C-p\C-p\C-p Str")
-      write("\t")
-      close
-      assert_screen(<<~'EOC')
-        Multiline REPL.
-        prompt> if String
-        prompt>   aStringRuby is...
-        prompt>   1StructA dynamic, open source programming
-        prompt>   456789 language with a focus on simplicity
-        prompt> end      and productivity. It has an elegant
-                         syntax that is natural to read and
-                         easy to write.
-      EOC
-    end
-
-    def test_autocomplete_long_with_scrollbar
-      start_terminal(20, 30, %W{ruby -I#{@pwd}/lib #{@pwd}/test/reline/yamatanooroti/multiline_repl --autocomplete-long}, startup_message: 'Multiline REPL.')
-      write('S')
-      close
-      assert_screen(<<~'EOC')
-        Multiline REPL.
-        prompt> S
-                String          █
-                Struct          █
-                Symbol          █
-                StopIteration   █
-                SystemCallError █
-                SystemExit      █
-                SystemStackError█
-                ScriptError     █
-                SyntaxError     █
-                Signal          █
-                SizedQueue      █
-                Set
-                SecureRandom
-                Socket
-                StringIO
-      EOC
-    end
-
-    def test_autocomplete_long_with_scrollbar_scroll
-      start_terminal(20, 30, %W{ruby -I#{@pwd}/lib #{@pwd}/test/reline/yamatanooroti/multiline_repl --autocomplete-long}, startup_message: 'Multiline REPL.')
-      write('S' + "\C-i" * 16)
-      close
-      assert_screen(<<~'EOC')
-        Multiline REPL.
-        prompt> StringScanner
-                Struct          ▄
-                Symbol          █
-                StopIteration   █
-                SystemCallError █
-                SystemExit      █
-                SystemStackError█
-                ScriptError     █
-                SyntaxError     █
-                Signal          █
-                SizedQueue      █
-                Set             █
-                SecureRandom    ▀
-                Socket
-                StringIO
-                StringScanner
-      EOC
-    end
-
-    def test_autocomplete_super_long_scroll_to_bottom
-      start_terminal(20, 30, %W{ruby -I#{@pwd}/lib #{@pwd}/test/reline/yamatanooroti/multiline_repl --autocomplete-super-long}, startup_message: 'Multiline REPL.')
-      shift_tab = [27, 91, 90]
-      write('S' + shift_tab.map(&:chr).join)
-      close
-      assert_screen(<<~'EOC')
-        Multiline REPL.
-        prompt> Str_BXX
-                Str_BXJ
-                Str_BXK
-                Str_BXL
-                Str_BXM
-                Str_BXN
-                Str_BXO
-                Str_BXP
-                Str_BXQ
-                Str_BXR
-                Str_BXS
-                Str_BXT
-                Str_BXU
-                Str_BXV
-                Str_BXW
-                Str_BXX▄
-      EOC
-    end
-
-    def test_autocomplete_super_long_and_backspace
-      start_terminal(20, 30, %W{ruby -I#{@pwd}/lib #{@pwd}/test/reline/yamatanooroti/multiline_repl --autocomplete-super-long}, startup_message: 'Multiline REPL.')
-      shift_tab = [27, 91, 90]
-      write('S' + shift_tab.map(&:chr).join)
-      write("\C-h")
-      close
-      assert_screen(<<~'EOC')
-        Multiline REPL.
-        prompt> Str_BX
-                Str_BX █
-                Str_BXA█
-                Str_BXB█
-                Str_BXC█
-                Str_BXD█
-                Str_BXE█
-                Str_BXF█
-                Str_BXG█
-                Str_BXH█
-                Str_BXI
-                Str_BXJ
-                Str_BXK
-                Str_BXL
-                Str_BXM
-                Str_BXN
-      EOC
-    end
-
-    def test_dialog_callback_returns_nil
-      start_terminal(20, 30, %W{ruby -I#{@pwd}/lib #{@pwd}/test/reline/yamatanooroti/multiline_repl --dialog nil}, startup_message: 'Multiline REPL.')
-      write('a')
-      close
-      assert_screen(<<~'EOC')
-        Multiline REPL.
-        prompt> a
-      EOC
-    end
-
-    def test_dialog_narrower_than_screen
-      start_terminal(20, 11, %W{ruby -I#{@pwd}/lib #{@pwd}/test/reline/yamatanooroti/multiline_repl --dialog simple}, startup_message: 'Multiline REPL.')
-      close
-      assert_screen(<<~'EOC')
-        Multiline R
-        EPL.
-        prompt>
-        Ruby is...
-        A dynamic,
-        language wi
-        and product
-        syntax that
-        easy to wri
-      EOC
-    end
-
-    def test_dialog_narrower_than_screen_with_scrollbar
-      start_terminal(20, 11, %W{ruby -I#{@pwd}/lib #{@pwd}/test/reline/yamatanooroti/multiline_repl --autocomplete-long}, startup_message: 'Multiline REPL.')
-      write('S' + "\C-i" * 3)
-      close
-      assert_screen(<<~'EOC')
-        Multiline R
-        EPL.
-        prompt> Sym
-        String    █
-        Struct    █
-        Symbol    █
-        StopIterat█
-        SystemCall█
-        SystemExit█
-        SystemStac█
-        ScriptErro█
-        SyntaxErro█
-        Signal    █
-        SizedQueue█
-        Set
-        SecureRand
-        Socket
-        StringIO
-      EOC
-    end
-
-    def test_dialog_with_fullwidth_scrollbar
-      start_terminal(20, 40, %W{ruby -I#{@pwd}/lib #{@pwd}/test/reline/yamatanooroti/multiline_repl --dialog simple,scrollkey,alt-scrollbar}, startup_message: 'Multiline REPL.')
-      close
-      assert_screen(<<~'EOC')
-        Multiline REPL.
-        prompt>
-           Ruby is...                         ::
-           A dynamic, open source programming ::
-           language with a focus on simplicity''
-           and productivity. It has an elegant
-      EOC
-    end
-
-    def test_rerender_argument_prompt_after_pasting
-      start_terminal(20, 30, %W{ruby -I#{@pwd}/lib #{@pwd}/test/reline/yamatanooroti/multiline_repl}, startup_message: 'Multiline REPL.')
-      write('abcdef')
-      write("\M-3\C-h")
-      close
-      assert_screen(<<~'EOC')
-        Multiline REPL.
-        prompt> abc
-      EOC
-    end
-
-    def test_autocomplete_old_dialog_width_greater_than_dialog_width
-      start_terminal(40, 40, %W{ruby -I#{@pwd}/lib #{@pwd}/test/reline/yamatanooroti/multiline_repl --autocomplete-width-long}, startup_message: 'Multiline REPL.')
-      write("0+ \n12345678901234")
-      write("\C-p")
-      write("r")
-      write("a")
-      close
-      assert_screen(<<~'EOC')
-        Multiline REPL.
-        prompt> 0+ ra
-        prompt> 123rand 901234
-                   raise
-      EOC
-    end
-
-    def test_scroll_at_bottom_for_dialog
-      start_terminal(10, 40, %W{ruby -I#{@pwd}/lib #{@pwd}/test/reline/yamatanooroti/multiline_repl --autocomplete}, startup_message: 'Multiline REPL.')
-      write("\n\n\n\n\n\n\n\n\n\n\n")
-      write("def hoge\n\nend\C-p\C-e")
-      write("  S")
-      close
-      assert_screen(<<~'EOC')
-        prompt>
-        prompt>
-        prompt>
-        prompt>
-        prompt>
-        prompt> def hoge
-        prompt>   S
-        prompt> enString     █
-                  Struct     ▀
-                  Symbol
-      EOC
-    end
-
-    def test_clear_dialog_in_pasting
-      start_terminal(10, 40, %W{ruby -I#{@pwd}/lib #{@pwd}/test/reline/yamatanooroti/multiline_repl --autocomplete}, startup_message: 'Multiline REPL.')
-      write("S")
-      write("tring ")
-      close
-      assert_screen(<<~'EOC')
-        Multiline REPL.
-        prompt> String
-      EOC
-    end
-
-    def test_prompt_with_newline
-      ENV['RELINE_TEST_PROMPT'] = "::\n> "
-      start_terminal(5, 30, %W{ruby -I#{@pwd}/lib #{@pwd}/test/reline/yamatanooroti/multiline_repl}, startup_message: 'Multiline REPL.')
-      write("def hoge\n  3\nend")
-      close
-      assert_screen(<<~'EOC')
-        Multiline REPL.
-        ::\n> def hoge
-        ::\n>   3
-        ::\n> end
-      EOC
-    end
-
-    def test_dynamic_prompt_with_newline
-      start_terminal(5, 30, %W{ruby -I#{@pwd}/lib #{@pwd}/test/reline/yamatanooroti/multiline_repl --dynamic-prompt-with-newline}, startup_message: 'Multiline REPL.')
-      write("def hoge\n  3\nend")
-      close
-      assert_screen(<<~'EOC')
-        Multiline REPL.
-        [0000\n]> def hoge
-        [0001\n]>   3
-        [0001\n]> end
-      EOC
-    end
-
-    def test_lines_passed_to_dynamic_prompt
-      start_terminal(5, 30, %W{ruby -I#{@pwd}/lib #{@pwd}/test/reline/yamatanooroti/multiline_repl --dynamic-prompt-show-line}, startup_message: 'Multiline REPL.')
-      write("if true")
-      write("\n")
-      close
-      assert_screen(<<~EOC)
-        Multiline REPL.
-        [if t]> if true
-        [    ]>
-      EOC
-    end
-
-    def test_clear_dialog_when_just_move_cursor_at_last_line
-      start_terminal(10, 30, %W{ruby -I#{@pwd}/lib #{@pwd}/test/reline/yamatanooroti/multiline_repl --autocomplete}, startup_message: 'Multiline REPL.')
-      write("class A\n  3\nend\n\n\n")
-      write("\C-p\C-p\C-e; S")
-      write("\C-n")
-      write(";")
-      close
-      assert_screen(<<~'EOC')
-        prompt>   3
-        prompt> end
-        => 3
-        prompt>
-        prompt>
-        prompt> class A
-        prompt>   3; S
-        prompt> end;
-      EOC
-    end
-
-    def test_clear_dialog_when_adding_new_line_to_end_of_buffer
-      start_terminal(10, 30, %W{ruby -I#{@pwd}/lib #{@pwd}/test/reline/yamatanooroti/multiline_repl --autocomplete}, startup_message: 'Multiline REPL.')
-      write("class A\n  def a\n    3\n    3\n  end\nend")
-      write("\n")
-      write("class S")
-      write("\n")
-      write("  3")
-      close
-      assert_screen(<<~'EOC')
-        prompt>   def a
-        prompt>     3
-        prompt>     3
-        prompt>   end
-        prompt> end
-        => :a
-        prompt> class S
-        prompt>   3
-      EOC
-    end
-
-    def test_insert_newline_in_the_middle_of_buffer_just_after_dialog
-      start_terminal(10, 30, %W{ruby -I#{@pwd}/lib #{@pwd}/test/reline/yamatanooroti/multiline_repl --autocomplete}, startup_message: 'Multiline REPL.')
-      write("class A\n  def a\n    3\n  end\nend")
-      write("\n")
-      write("\C-p\C-p\C-p\C-p\C-p\C-e\C-hS")
-      write("\M-\x0D")
-      write("  3")
-      close
-      assert_screen(<<~'EOC')
-        prompt>     3
-        prompt>   end
-        prompt> end
-        => :a
-        prompt> class S
-        prompt>   3
-        prompt>   def a
-        prompt>     3
-        prompt>   end
-        prompt> end
-      EOC
-    end
-
-    def test_incremental_search_on_not_last_line
-      start_terminal(10, 40, %W{ruby -I#{@pwd}/lib #{@pwd}/test/reline/yamatanooroti/multiline_repl --autocomplete}, startup_message: 'Multiline REPL.')
-      write("def abc\nend\n")
-      write("def def\nend\n")
-      write("\C-p\C-p\C-e")
-      write("\C-r")
-      write("a")
-      write("\n\n")
-      close
-      assert_screen(<<~'EOC')
-        prompt> def abc
-        prompt> end
-        => :abc
-        prompt> def def
-        prompt> end
-        => :def
-        prompt> def abc
-        prompt> end
-        => :abc
-        prompt>
-      EOC
-    end
-
-    def test_bracket_newline_indent
-      start_terminal(5, 30, %W{ruby -I#{@pwd}/lib #{@pwd}/test/reline/yamatanooroti/multiline_repl --auto-indent}, startup_message: 'Multiline REPL.')
-      write("[\n")
-      write("1")
-      close
-      assert_screen(<<~EOC)
-        Multiline REPL.
-        prompt> [
-        prompt>   1
-      EOC
-    end
-
-    def test_repeated_input_delete
-      start_terminal(5, 30, %W{ruby -I#{@pwd}/lib #{@pwd}/test/reline/yamatanooroti/multiline_repl}, startup_message: 'Multiline REPL.')
-      write("a\C-h" * 4000)
-      close
-      assert_screen(<<~'EOC')
-        Multiline REPL.
-        prompt>
-      EOC
-    end
-
-    def test_exit_with_ctrl_d
-      start_terminal(5, 30, %W{ruby -I#{@pwd}/lib #{@pwd}/test/reline/yamatanooroti/multiline_repl --auto-indent}, startup_message: 'Multiline REPL.')
-      begin
-        write("\C-d")
-        close
-      rescue EOFError
-        # EOFError is raised when process terminated.
-      end
-      assert_screen(<<~EOC)
-        Multiline REPL.
-        prompt>
-      EOC
-    end
-
-    def write_inputrc(content)
-      File.open(@inputrc_file, 'w') do |f|
-        f.write content
-      end
-    end
-  end
-rescue LoadError, NameError
-  # On Ruby repository, this test suit doesn't run because Ruby repo doesn't
-  # have the yamatanooroti gem.
-end
diff --git a/test/resolv/test_dns.rb b/test/resolv/test_dns.rb
index 9d243bbf502b09..87b3bf9f37a927 100644
--- a/test/resolv/test_dns.rb
+++ b/test/resolv/test_dns.rb
@@ -44,6 +44,16 @@ def teardown
     BasicSocket.do_not_reverse_lookup = @save_do_not_reverse_lookup
   end
 
+  def with_tcp(host, port)
+    t = TCPServer.new(host, port)
+    begin
+      t.listen(1)
+      yield t
+    ensure
+      t.close
+    end
+  end
+
   def with_udp(host, port)
     u = UDPSocket.new
     begin
@@ -54,6 +64,46 @@ def with_udp(host, port)
     end
   end
 
+  def with_udp_and_tcp(host, port)
+    if port == 0
+      # Automatic port; we might need to retry until we find a port which is free on both UDP _and_ TCP.
+      retries_remaining = 10
+      ts = []
+      us = []
+      begin
+        begin
+          us << UDPSocket.new
+          us.last.bind(host, 0)
+          _, udp_port, _, _ = us.last.addr
+          ts << TCPServer.new(host, udp_port)
+          ts.last.listen(1)
+        rescue Errno::EADDRINUSE, Errno::EACCES
+          # ADDRINUSE is what should get thrown if we try and bind a port which is already bound on UNIXen,
+          # but windows can sometimes throw EACCESS.
+          # See: https://stackoverflow.com/questions/48478869/cannot-bind-to-some-ports-due-to-permission-denied
+          retries_remaining -= 1
+          retry if retries_remaining > 0
+          # Windows and MinGW CI can't bind to the same port with ten retries.
+          omit if /mswin|mingw/ =~ RUBY_PLATFORM
+          raise
+        end
+
+        # If we get to this point, we have a valid t & u socket
+        yield us.last, ts.last
+      ensure
+        ts.each(&:close)
+        us.each(&:close)
+      end
+    else
+      # Explicitly specified port, don't retry the bind.
+      with_udp(host, port) do |u|
+        with_tcp(host, port) do |t|
+          yield u, t
+        end
+      end
+    end
+  end
+
   # [ruby-core:65836]
   def test_resolve_with_2_ndots
     conf = Resolv::DNS::Config.new :nameserver => ['127.0.0.1'], :ndots => 2
@@ -157,6 +207,166 @@ def test_query_ipv4_address
     }
   end
 
+  def test_query_ipv4_address_truncated_tcp_fallback
+    begin
+      OpenSSL
+    rescue LoadError
+      skip 'autoload problem. see [ruby-dev:45021][Bug #5786]'
+    end if defined?(OpenSSL)
+
+    num_records = 50
+
+    with_udp_and_tcp('127.0.0.1', 0) {|u, t|
+      _, server_port, _, server_address = u.addr
+      client_thread = Thread.new {
+        Resolv::DNS.open(:nameserver_port => [[server_address, server_port]]) {|dns|
+          dns.getresources("foo.example.org", Resolv::DNS::Resource::IN::A)
+        }
+      }
+      udp_server_thread = Thread.new {
+        msg, (_, client_port, _, client_address) = Timeout.timeout(5) {u.recvfrom(4096)}
+        id, word2, qdcount, ancount, nscount, arcount = msg.unpack("nnnnnn")
+        qr =     (word2 & 0x8000) >> 15
+        opcode = (word2 & 0x7800) >> 11
+        aa =     (word2 & 0x0400) >> 10
+        tc =     (word2 & 0x0200) >> 9
+        rd =     (word2 & 0x0100) >> 8
+        ra =     (word2 & 0x0080) >> 7
+        z =      (word2 & 0x0070) >> 4
+        rcode =   word2 & 0x000f
+        rest = msg[12..-1]
+        assert_equal(0, qr) # 0:query 1:response
+        assert_equal(0, opcode) # 0:QUERY 1:IQUERY 2:STATUS
+        assert_equal(0, aa) # Authoritative Answer
+        assert_equal(0, tc) # TrunCation
+        assert_equal(1, rd) # Recursion Desired
+        assert_equal(0, ra) # Recursion Available
+        assert_equal(0, z) # Reserved for future use
+        assert_equal(0, rcode) # 0:No-error 1:Format-error 2:Server-failure 3:Name-Error 4:Not-Implemented 5:Refused
+        assert_equal(1, qdcount) # number of entries in the question section.
+        assert_equal(0, ancount) # number of entries in the answer section.
+        assert_equal(0, nscount) # number of entries in the authority records section.
+        assert_equal(0, arcount) # number of entries in the additional records section.
+        name = [3, "foo", 7, "example", 3, "org", 0].pack("Ca*Ca*Ca*C")
+        assert_operator(rest, :start_with?, name)
+        rest = rest[name.length..-1]
+        assert_equal(4, rest.length)
+        qtype, _ = rest.unpack("nn")
+        assert_equal(1, qtype) # A
+        assert_equal(1, qtype) # IN
+        id = id
+        qr = 1
+        opcode = opcode
+        aa = 0
+        tc = 1
+        rd = rd
+        ra = 1
+        z = 0
+        rcode = 0
+        qdcount = 0
+        ancount = num_records
+        nscount = 0
+        arcount = 0
+        word2 = (qr << 15) |
+                (opcode << 11) |
+                (aa << 10) |
+                (tc << 9) |
+                (rd << 8) |
+                (ra << 7) |
+                (z << 4) |
+                rcode
+        msg = [id, word2, qdcount, ancount, nscount, arcount].pack("nnnnnn")
+        type = 1
+        klass = 1
+        ttl = 3600
+        rdlength = 4
+        num_records.times do |i|
+          rdata = [192,0,2,i].pack("CCCC") # 192.0.2.x (TEST-NET address) RFC 3330
+          rr = [name, type, klass, ttl, rdlength, rdata].pack("a*nnNna*")
+          msg << rr
+        end
+        u.send(msg[0...512], 0, client_address, client_port)
+      }
+      tcp_server_thread = Thread.new {
+        ct = t.accept
+        msg = ct.recv(512)
+        msg.slice!(0..1) # Size (only for TCP)
+        id, word2, qdcount, ancount, nscount, arcount = msg.unpack("nnnnnn")
+        qr =     (word2 & 0x8000) >> 15
+        opcode = (word2 & 0x7800) >> 11
+        aa =     (word2 & 0x0400) >> 10
+        tc =     (word2 & 0x0200) >> 9
+        rd =     (word2 & 0x0100) >> 8
+        ra =     (word2 & 0x0080) >> 7
+        z =      (word2 & 0x0070) >> 4
+        rcode =   word2 & 0x000f
+        rest = msg[12..-1]
+        assert_equal(0, qr) # 0:query 1:response
+        assert_equal(0, opcode) # 0:QUERY 1:IQUERY 2:STATUS
+        assert_equal(0, aa) # Authoritative Answer
+        assert_equal(0, tc) # TrunCation
+        assert_equal(1, rd) # Recursion Desired
+        assert_equal(0, ra) # Recursion Available
+        assert_equal(0, z) # Reserved for future use
+        assert_equal(0, rcode) # 0:No-error 1:Format-error 2:Server-failure 3:Name-Error 4:Not-Implemented 5:Refused
+        assert_equal(1, qdcount) # number of entries in the question section.
+        assert_equal(0, ancount) # number of entries in the answer section.
+        assert_equal(0, nscount) # number of entries in the authority records section.
+        assert_equal(0, arcount) # number of entries in the additional records section.
+        name = [3, "foo", 7, "example", 3, "org", 0].pack("Ca*Ca*Ca*C")
+        assert_operator(rest, :start_with?, name)
+        rest = rest[name.length..-1]
+        assert_equal(4, rest.length)
+        qtype, _ = rest.unpack("nn")
+        assert_equal(1, qtype) # A
+        assert_equal(1, qtype) # IN
+        id = id
+        qr = 1
+        opcode = opcode
+        aa = 0
+        tc = 0
+        rd = rd
+        ra = 1
+        z = 0
+        rcode = 0
+        qdcount = 0
+        ancount = num_records
+        nscount = 0
+        arcount = 0
+        word2 = (qr << 15) |
+                (opcode << 11) |
+                (aa << 10) |
+                (tc << 9) |
+                (rd << 8) |
+                (ra << 7) |
+                (z << 4) |
+                rcode
+        msg = [id, word2, qdcount, ancount, nscount, arcount].pack("nnnnnn")
+        type = 1
+        klass = 1
+        ttl = 3600
+        rdlength = 4
+        num_records.times do |i|
+          rdata = [192,0,2,i].pack("CCCC") # 192.0.2.x (TEST-NET address) RFC 3330
+          rr = [name, type, klass, ttl, rdlength, rdata].pack("a*nnNna*")
+          msg << rr
+        end
+        msg = "#{[msg.bytesize].pack("n")}#{msg}" # Prefix with size
+        ct.send(msg, 0)
+        ct.close
+      }
+      result, _ = assert_join_threads([client_thread, udp_server_thread, tcp_server_thread])
+      assert_instance_of(Array, result)
+      assert_equal(50, result.length)
+      result.each_with_index do |rr, i|
+        assert_instance_of(Resolv::DNS::Resource::IN::A, rr)
+        assert_instance_of(Resolv::IPv4, rr.address)
+        assert_equal("192.0.2.#{i}", rr.address.to_s)
+        assert_equal(3600, rr.ttl)
+      end
+    }
+  end
+
   def test_query_ipv4_duplicate_responses
     begin
       OpenSSL
@@ -168,7 +378,7 @@ def test_query_ipv4_duplicate_responses
       _, server_port, _, server_address = u.addr
       begin
         client_thread = Thread.new {
-          Resolv::DNS.open(:nameserver_port => [[server_address, server_port]], :search => ['bad1.com', 'bad2.com', 'good.com'], ndots: 5) {|dns|
+          Resolv::DNS.open(:nameserver_port => [[server_address, server_port]], :search => ['bad1.com', 'bad2.com', 'good.com'], ndots: 5, use_ipv6: false) {|dns|
             dns.getaddress("example")
           }
         }
@@ -374,7 +584,8 @@ def test_ipv6_to_s
       ["2001:db8::1", "2001:db8::0:1"],
       ["::", "0:0:0:0:0:0:0:0"],
       ["2001::", "2001::0"],
-      ["2001:db8::1:1:1:1:1", "2001:db8:0:1:1:1:1:1"],
+      ["2001:db8:0:1:1:1:1:1", "2001:db8:0:1:1:1:1:1"], # RFC 5952 Section 4.2.2.
+      ["2001:db8::1:1:1:1", "2001:db8:0:0:1:1:1:1"],
       ["1::1:0:0:0:1", "1:0:0:1:0:0:0:1"],
       ["1::1:0:0:1", "1:0:0:0:1:0:0:1"],
     ]
@@ -416,6 +627,13 @@ def test_too_big_label_address
     assert_operator(2**14, :<, m.to_s.length)
   end
 
+  def test_too_long_address
+    too_long_address_message = [0, 0, 1, 0, 0, 0].pack("n*") + "\x01x" * 129 + [0, 0, 0].pack("cnn")
+    assert_raise_with_message(Resolv::DNS::DecodeError, /name label data exceed 255 octets/) do
+      Resolv::DNS::Message.decode too_long_address_message
+    end
+  end
+
   def assert_no_fd_leak
     socket = assert_throw(self) do |tag|
       Resolv::DNS.stub(:bind_random_port, ->(s, *) {throw(tag, s)}) do
@@ -457,4 +675,149 @@ def dns.each_resource(name, typeclass)
     end
     assert_raise(Resolv::ResolvError) { dns.each_name('example.com') }
   end
+
+  def test_unreachable_server
+    unreachable_ip = '127.0.0.1'
+    sock = UDPSocket.new
+    sock.connect(unreachable_ip, 53)
+    begin
+      sock.send('1', 0)
+    rescue Errno::ENETUNREACH, Errno::EHOSTUNREACH
+    else
+      omit('cannot test unreachable server, as IP used is reachable')
+    end
+
+    config = {
+      :nameserver => [unreachable_ip],
+      :search => ['lan'],
+      :ndots => 1
+    }
+    r = Resolv.new([Resolv::DNS.new(config)])
+    assert_equal([], r.getaddresses('www.google.com'))
+
+    config[:raise_timeout_errors] = true
+    r = Resolv.new([Resolv::DNS.new(config)])
+    assert_raise(Resolv::ResolvError) { r.getaddresses('www.google.com') }
+  ensure
+    sock&.close
+  end
+
+  def test_multiple_servers_with_timeout_and_truncated_tcp_fallback
+    begin
+      OpenSSL
+    rescue LoadError
+      skip 'autoload problem. see [ruby-dev:45021][Bug #5786]'
+    end if defined?(OpenSSL)
+
+    num_records = 50
+
+    with_udp_and_tcp('127.0.0.1', 0) do |u1, t1|
+      with_udp_and_tcp('127.0.0.1', 0) do |u2,t2|
+        u2.close # XXX: u2 UDP socket is not used, but using #with_udp_and_tcp to enable Windows EACCES workaround
+        _, server1_port, _, server1_address = u1.addr
+        _, server2_port, _, server2_address = t2.addr
+
+        client_thread = Thread.new do
+          Resolv::DNS.open(nameserver_port: [[server1_address, server1_port], [server2_address, server2_port]]) do |dns|
+            dns.timeouts = [0.1, 0.2]
+            dns.getresources('foo.example.org', Resolv::DNS::Resource::IN::A)
+          end
+        end
+
+        udp_server1_thread = Thread.new do
+          msg, (_, client_port, _, client_address) = Timeout.timeout(5) { u1.recvfrom(4096) }
+          id, word2, _qdcount, _ancount, _nscount, _arcount = msg.unpack('nnnnnn')
+          opcode = (word2 & 0x7800) >> 11
+          rd = (word2 & 0x0100) >> 8
+          name = [3, 'foo', 7, 'example', 3, 'org', 0].pack('Ca*Ca*Ca*C')
+          qr = 1
+          aa = 0
+          tc = 1
+          ra = 1
+          z = 0
+          rcode = 0
+          qdcount = 0
+          ancount = num_records
+          nscount = 0
+          arcount = 0
+          word2 = (qr << 15) |
+                  (opcode << 11) |
+                  (aa << 10) |
+                  (tc << 9) |
+                  (rd << 8) |
+                  (ra << 7) |
+                  (z << 4) |
+                  rcode
+          msg = [id, word2, qdcount, ancount, nscount, arcount].pack('nnnnnn')
+          type = 1
+          klass = 1
+          ttl = 3600
+          rdlength = 4
+          num_records.times do |i|
+            rdata = [192, 0, 2, i].pack('CCCC') # 192.0.2.x (TEST-NET address) RFC 3330
+            rr = [name, type, klass, ttl, rdlength, rdata].pack('a*nnNna*')
+            msg << rr
+          end
+          u1.send(msg[0...512], 0, client_address, client_port)
+        end
+
+        tcp_server1_thread = Thread.new do
+          # Keep this socket open so that the client experiences a timeout
+          t1.accept
+        end
+
+        tcp_server2_thread = Thread.new do
+          ct = t2.accept
+          msg = ct.recv(512)
+          msg.slice!(0..1) # Size (only for TCP)
+          id, word2, _qdcount, _ancount, _nscount, _arcount = msg.unpack('nnnnnn')
+          rd = (word2 & 0x0100) >> 8
+          opcode = (word2 & 0x7800) >> 11
+          name = [3, 'foo', 7, 'example', 3, 'org', 0].pack('Ca*Ca*Ca*C')
+          qr = 1
+          aa = 0
+          tc = 0
+          ra = 1
+          z = 0
+          rcode = 0
+          qdcount = 0
+          ancount = num_records
+          nscount = 0
+          arcount = 0
+          word2 = (qr << 15) |
+                  (opcode << 11) |
+                  (aa << 10) |
+                  (tc << 9) |
+                  (rd << 8) |
+                  (ra << 7) |
+                  (z << 4) |
+                  rcode
+          msg = [id, word2, qdcount, ancount, nscount, arcount].pack('nnnnnn')
+          type = 1
+          klass = 1
+          ttl = 3600
+          rdlength = 4
+          num_records.times do |i|
+            rdata = [192, 0, 2, i].pack('CCCC') # 192.0.2.x (TEST-NET address) RFC 3330
+            rr = [name, type, klass, ttl, rdlength, rdata].pack('a*nnNna*')
+            msg << rr
+          end
+          msg = "#{[msg.bytesize].pack('n')}#{msg}" # Prefix with size
+          ct.send(msg, 0)
+          ct.close
+        end
+        result, _, tcp_server1_socket, = assert_join_threads([client_thread, udp_server1_thread, tcp_server1_thread, tcp_server2_thread])
+        assert_instance_of(Array, result)
+        assert_equal(50, result.length)
+        result.each_with_index do |rr, i|
+          assert_instance_of(Resolv::DNS::Resource::IN::A, rr)
+          assert_instance_of(Resolv::IPv4, rr.address)
+          assert_equal("192.0.2.#{i}", rr.address.to_s)
+          assert_equal(3600, rr.ttl)
+        end
+      ensure
+        tcp_server1_socket&.close
+      end
+    end
+  end
 end
diff --git a/test/resolv/test_resource.rb b/test/resolv/test_resource.rb
index b688155dc243ef..434380236e6721 100644
--- a/test/resolv/test_resource.rb
+++ b/test/resolv/test_resource.rb
@@ -32,3 +32,71 @@ def test_srv_no_compress
     assert_equal "\x00\x00\x00\x00\x00\x00\x00\x01\x00\x00\x00\x00\x07example\x03com\x00\x00\x21\x00\x01\x00\x00\x00\x00\x00\x17\x00\x00\x00\x00\x00\x00\x03www\x07example\x03com\x00", m.encode, issue29
   end
 end
+
+class TestResolvResourceCAA < Test::Unit::TestCase
+  def test_caa_roundtrip
+    raw_msg = "\x00\x00\x00\x00\x00\x00\x00\x02\x00\x00\x00\x00\x03new\x07example\x03com\x00\x01\x01\x00\x01\x00\x00\x00\x00\x00\x16\x00\x05issueca1.example.net\xC0\x0C\x01\x01\x00\x01\x00\x00\x00\x00\x00\x0C\x80\x03tbsUnknown".b
+
+    m = Resolv::DNS::Message.new(0)
+    m.add_answer('new.example.com', 0, Resolv::DNS::Resource::IN::CAA.new(0, 'issue', 'ca1.example.net'))
+    m.add_answer('new.example.com', 0, Resolv::DNS::Resource::IN::CAA.new(128, 'tbs', 'Unknown'))
+    assert_equal raw_msg, m.encode
+
+    m = Resolv::DNS::Message.decode(raw_msg)
+    assert_equal 2, m.answer.size
+    _, _, caa0 = m.answer[0]
+    assert_equal 0, caa0.flags
+    assert_equal false, caa0.critical?
+    assert_equal 'issue', caa0.tag
+    assert_equal 'ca1.example.net', caa0.value
+    _, _, caa1 = m.answer[1]
+    assert_equal true, caa1.critical?
+    assert_equal 128, caa1.flags
+    assert_equal 'tbs', caa1.tag
+    assert_equal 'Unknown', caa1.value
+  end
+
+  def test_caa_stackoverflow
+    # gathered in the wild
+    raw_msg = "\x8D\x32\x81\x80\x00\x01\x00\x0B\x00\x00\x00\x00\x0Dstackoverflow\x03com\x00\x01\x01\x00\x01\xC0\x0C\x01\x01\x00\x01\x00\x00\x01\x2C\x00\x13\x00\x05issuecomodoca.com\xC0\x0C\x01\x01\x00\x01\x00\x00\x01\x2C\x00\x2D\x00\x05issuedigicert.com; cansignhttpexchanges=yes\xC0\x0C\x01\x01\x00\x01\x00\x00\x01\x2C\x00\x16\x00\x05issueletsencrypt.org\xC0\x0C\x01\x01\x00\x01\x00\x00\x01\x2C\x00\x29\x00\x05issuepki.goog; cansignhttpexchanges=yes\xC0\x0C\x01\x01\x00\x01\x00\x00\x01\x2C\x00\x12\x00\x05issuesectigo.com\xC0\x0C\x01\x01\x00\x01\x00\x00\x01\x2C\x00\x17\x00\x09issuewildcomodoca.com\xC0\x0C\x01\x01\x00\x01\x00\x00\x01\x2C\x00\x31\x00\x09issuewilddigicert.com; cansignhttpexchanges=yes\xC0\x0C\x01\x01\x00\x01\x00\x00\x01\x2C\x00\x1A\x00\x09issuewildletsencrypt.org\xC0\x0C\x01\x01\x00\x01\x00\x00\x01\x2C\x00\x2D\x00\x09issuewildpki.goog; cansignhttpexchanges=yes\xC0\x0C\x01\x01\x00\x01\x00\x00\x01\x2C\x00\x16\x00\x09issuewildsectigo.com\xC0\x0C\x01\x01\x00\x01\x00\x00\x01\x2C\x00\x2D\x80\x05iodefmailto:sysadmin-team@stackoverflow.com".b
+
+    m = Resolv::DNS::Message.decode(raw_msg)
+    assert_equal 11, m.answer.size
+    _, _, caa3 = m.answer[3]
+    assert_equal 0, caa3.flags
+    assert_equal 'issue', caa3.tag
+    assert_equal 'pki.goog; cansignhttpexchanges=yes', caa3.value
+    _, _, caa8 = m.answer[8]
+    assert_equal 0, caa8.flags
+    assert_equal 'issuewild', caa8.tag
+    assert_equal 'pki.goog; cansignhttpexchanges=yes', caa8.value
+    _, _, caa10 = m.answer[10]
+    assert_equal 128, caa10.flags
+    assert_equal 'iodef', caa10.tag
+    assert_equal 'mailto:sysadmin-team@stackoverflow.com', caa10.value
+  end
+
+  def test_caa_flags
+    assert_equal 255,
+      Resolv::DNS::Resource::IN::CAA.new(255, 'issue', 'ca1.example.net').flags
+    assert_raise(ArgumentError) do
+      Resolv::DNS::Resource::IN::CAA.new(256, 'issue', 'ca1.example.net')
+    end
+
+    assert_raise(ArgumentError) do
+      Resolv::DNS::Resource::IN::CAA.new(-1, 'issue', 'ca1.example.net')
+    end
+  end
+
+  def test_caa_tag
+    assert_raise(ArgumentError, 'Empty tag should be rejected') do
+      Resolv::DNS::Resource::IN::CAA.new(0, '', 'ca1.example.net')
+    end
+
+    assert_equal '123456789012345',
+      Resolv::DNS::Resource::IN::CAA.new(0, '123456789012345', 'ca1.example.net').tag
+    assert_raise(ArgumentError, 'Tag longer than 15 bytes should be rejected') do
+      Resolv::DNS::Resource::IN::CAA.new(0, '1234567890123456', 'ca1.example.net')
+    end
+  end
+end
diff --git a/test/resolv/test_svcb_https.rb b/test/resolv/test_svcb_https.rb
new file mode 100644
index 00000000000000..5dc3163d9e18fd
--- /dev/null
+++ b/test/resolv/test_svcb_https.rb
@@ -0,0 +1,231 @@
+# frozen_string_literal: false
+require 'test/unit'
+require 'resolv'
+
+class TestResolvSvcbHttps < Test::Unit::TestCase
+  # Wraps a RR in answer section
+  def wrap_rdata(rrtype, rrclass, rdata)
+    [
+      "\x00\x00\x00\x00",  # ID/FLAGS
+      [0, 1, 0, 0].pack('nnnn'),  # QDCOUNT/ANCOUNT/NSCOUNT/ARCOUNT
+      "\x07example\x03com\x00",  # NAME
+      [rrtype, rrclass, 0, rdata.bytesize].pack('nnNn'),  # TYPE/CLASS/TTL/RDLENGTH
+      rdata,
+    ].join.b
+  end
+
+  def test_svcparams
+    params = Resolv::DNS::SvcParams.new([Resolv::DNS::SvcParam::Mandatory.new([1])])
+
+    assert_equal 1, params.count
+
+    params.add Resolv::DNS::SvcParam::NoDefaultALPN.new
+    params.add Resolv::DNS::SvcParam::ALPN.new(%w[h2 h3])
+
+    assert_equal 3, params.count
+
+    assert_equal [1], params[:mandatory].keys
+    assert_equal [1], params[0].keys
+
+    assert_equal %w[h2 h3], params[:alpn].protocol_ids
+    assert_equal %w[h2 h3], params[1].protocol_ids
+
+    params.delete :mandatory
+    params.delete :alpn
+
+    assert_equal 1, params.count
+
+    assert_nil params[:mandatory]
+    assert_nil params[1]
+
+    ary = params.each.to_a
+
+    assert_instance_of Resolv::DNS::SvcParam::NoDefaultALPN, ary.first
+  end
+
+  def test_svcb
+    rr = Resolv::DNS::Resource::IN::SVCB.new(0, 'example.com.')
+
+    assert_equal 0, rr.priority
+    assert rr.alias_mode?
+    assert !rr.service_mode?
+    assert_equal Resolv::DNS::Name.create('example.com.'), rr.target
+    assert rr.params.empty?
+
+    rr = Resolv::DNS::Resource::IN::SVCB.new(16, 'example.com.', [
+      Resolv::DNS::SvcParam::ALPN.new(%w[h2 h3]),
+    ])
+
+    assert_equal 16, rr.priority
+    assert !rr.alias_mode?
+    assert rr.service_mode?
+
+    assert_equal 1, rr.params.count
+    assert_instance_of Resolv::DNS::SvcParam::ALPN, rr.params[:alpn]
+  end
+
+  def test_svcb_encode_order
+    msg = Resolv::DNS::Message.new(0)
+    msg.add_answer(
+      'example.com.', 0,
+      Resolv::DNS::Resource::IN::SVCB.new(16, 'foo.example.org.', [
+        Resolv::DNS::SvcParam::ALPN.new(%w[h2 h3-19]),
+        Resolv::DNS::SvcParam::Mandatory.new([4, 1]),
+        Resolv::DNS::SvcParam::IPv4Hint.new(['192.0.2.1']),
+      ])
+    )
+
+    expected = wrap_rdata 64, 1, "\x00\x10\x03foo\x07example\x03org\x00" +
+      "\x00\x00\x00\x04\x00\x01\x00\x04" +
+      "\x00\x01\x00\x09\x02h2\x05h3-19" +
+      "\x00\x04\x00\x04\xc0\x00\x02\x01"
+
+    assert_equal expected, msg.encode
+  end
+
+  ## Test vectors from [RFC9460]
+
+  def test_alias_mode
+    wire = wrap_rdata 65, 1, "\x00\x00\x03foo\x07example\x03com\x00"
+    msg = Resolv::DNS::Message.decode(wire)
+    _, _, rr = msg.answer.first
+
+    assert_equal 0, rr.priority
+    assert_equal Resolv::DNS::Name.create('foo.example.com.'), rr.target
+    assert_equal 0, rr.params.count
+
+    assert_equal wire, msg.encode
+  end
+
+  def test_target_name_is_root
+    wire = wrap_rdata 64, 1, "\x00\x01\x00"
+    msg = Resolv::DNS::Message.decode(wire)
+    _, _, rr = msg.answer.first
+
+    assert_equal 1, rr.priority
+    assert_equal Resolv::DNS::Name.create('.'), rr.target
+    assert_equal 0, rr.params.count
+
+    assert_equal wire, msg.encode
+  end
+
+  def test_specifies_port
+    wire = wrap_rdata 64, 1, "\x00\x10\x03foo\x07example\x03com\x00" +
+      "\x00\x03\x00\x02\x00\x35"
+    msg = Resolv::DNS::Message.decode(wire)
+    _, _, rr = msg.answer.first
+
+    assert_equal 16, rr.priority
+    assert_equal Resolv::DNS::Name.create('foo.example.com.'), rr.target
+    assert_equal 1, rr.params.count
+    assert_equal 53, rr.params[:port].port
+
+    assert_equal wire, msg.encode
+  end
+
+  def test_generic_key
+    wire = wrap_rdata 64, 1, "\x00\x01\x03foo\x07example\x03com\x00" +
+      "\x02\x9b\x00\x05hello"
+    msg = Resolv::DNS::Message.decode(wire)
+    _, _, rr = msg.answer.first
+
+    assert_equal 1, rr.priority
+    assert_equal Resolv::DNS::Name.create('foo.example.com.'), rr.target
+    assert_equal 1, rr.params.count
+    assert_equal 'hello', rr.params[:key667].value
+
+    assert_equal wire, msg.encode
+  end
+
+  def test_two_ipv6hints
+    wire = wrap_rdata 64, 1, "\x00\x01\x03foo\x07example\x03com\x00" +
+      "\x00\x06\x00\x20" +
+      ("\x20\x01\x0d\xb8\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01" +
+       "\x20\x01\x0d\xb8\x00\x00\x00\x00\x00\x00\x00\x00\x00\x53\x00\x01")
+    msg = Resolv::DNS::Message.decode(wire)
+    _, _, rr = msg.answer.first
+
+    assert_equal 1, rr.priority
+    assert_equal Resolv::DNS::Name.create('foo.example.com.'), rr.target
+    assert_equal 1, rr.params.count
+    assert_equal [Resolv::IPv6.create('2001:db8::1'), Resolv::IPv6.create('2001:db8::53:1')],
+      rr.params[:ipv6hint].addresses
+
+    assert_equal wire, msg.encode
+  end
+
+  def test_ipv6hint_embedded_ipv4
+    wire = wrap_rdata 64, 1, "\x00\x01\x07example\x03com\x00" +
+      "\x00\x06\x00\x10\x20\x01\x0d\xb8\x01\x22\x03\x44\x00\x00\x00\x00\xc0\x00\x02\x21"
+    msg = Resolv::DNS::Message.decode(wire)
+    _, _, rr = msg.answer.first
+
+    assert_equal 1, rr.priority
+    assert_equal Resolv::DNS::Name.create('example.com.'), rr.target
+    assert_equal 1, rr.params.count
+    assert_equal [Resolv::IPv6.create('2001:db8:122:344::192.0.2.33')],
+      rr.params[:ipv6hint].addresses
+
+    assert_equal wire, msg.encode
+  end
+
+  def test_mandatory_alpn_ipv4hint
+    wire = wrap_rdata 64, 1, "\x00\x10\x03foo\x07example\x03org\x00" +
+      "\x00\x00\x00\x04\x00\x01\x00\x04" +
+      "\x00\x01\x00\x09\x02h2\x05h3-19" +
+      "\x00\x04\x00\x04\xc0\x00\x02\x01"
+    msg = Resolv::DNS::Message.decode(wire)
+    _, _, rr = msg.answer.first
+
+    assert_equal 16, rr.priority
+    assert_equal Resolv::DNS::Name.create('foo.example.org.'), rr.target
+    assert_equal 3, rr.params.count
+    assert_equal [1, 4], rr.params[:mandatory].keys
+    assert_equal ['h2', 'h3-19'], rr.params[:alpn].protocol_ids
+    assert_equal [Resolv::IPv4.create('192.0.2.1')], rr.params[:ipv4hint].addresses
+
+    assert_equal wire, msg.encode
+  end
+
+  def test_alpn_comma_backslash
+    wire = wrap_rdata 64, 1, "\x00\x10\x03foo\x07example\x03org\x00" +
+      "\x00\x01\x00\x0c\x08f\\oo,bar\x02h2"
+    msg = Resolv::DNS::Message.decode(wire)
+    _, _, rr = msg.answer.first
+
+    assert_equal 16, rr.priority
+    assert_equal Resolv::DNS::Name.create('foo.example.org.'), rr.target
+    assert_equal 1, rr.params.count
+    assert_equal ['f\oo,bar', 'h2'], rr.params[:alpn].protocol_ids
+
+    assert_equal wire, msg.encode
+  end
+
+  ## For [RFC9461]
+
+  def test_dohpath
+    wire = wrap_rdata 64, 1, "\x00\x01\x03one\x03one\x03one\x03one\x00" +
+      "\x00\x01\x00\x03\x02h2" +
+      "\x00\x03\x00\x02\x01\xbb" +
+      "\x00\x04\x00\x08\x01\x01\x01\x01\x01\x00\x00\x01" +
+      "\x00\x06\x00\x20" +
+      ("\x26\x06\x47\x00\x47\x00\x00\x00\x00\x00\x00\x00\x00\x00\x11\x11" +
+       "\x26\x06\x47\x00\x47\x00\x00\x00\x00\x00\x00\x00\x00\x00\x10\x01") +
+      "\x00\x07\x00\x10/dns-query{?dns}"
+    msg = Resolv::DNS::Message.decode(wire)
+    _, _, rr = msg.answer.first
+
+    assert_equal 1, rr.priority
+    assert_equal Resolv::DNS::Name.create('one.one.one.one.'), rr.target
+    assert_equal 5, rr.params.count
+    assert_equal ['h2'], rr.params[:alpn].protocol_ids
+    assert_equal 443, rr.params[:port].port
+    assert_equal [Resolv::IPv4.create('1.1.1.1'), Resolv::IPv4.create('1.0.0.1')],
+      rr.params[:ipv4hint].addresses
+    assert_equal [Resolv::IPv6.create('2606:4700:4700::1111'), Resolv::IPv6.create('2606:4700:4700::1001')],
+      rr.params[:ipv6hint].addresses
+    assert_equal '/dns-query{?dns}', rr.params[:dohpath].template
+
+    assert_equal wire, msg.encode
+  end
+end
diff --git a/test/rinda/test_rinda.rb b/test/rinda/test_rinda.rb
deleted file mode 100644
index 00404e39df7aa8..00000000000000
--- a/test/rinda/test_rinda.rb
+++ /dev/null
@@ -1,912 +0,0 @@
-# frozen_string_literal: false
-require 'test/unit'
-require 'envutil'
-
-require 'drb/drb'
-require 'drb/eq'
-require 'rinda/ring'
-require 'rinda/tuplespace'
-require 'timeout'
-require 'singleton'
-
-module Rinda
-
-class MockClock
-  include Singleton
-
-  class MyTS < Rinda::TupleSpace
-    def keeper_thread
-      nil
-    end
-
-    def stop_keeper
-      if @keeper
-        @keeper.kill
-        @keeper.join
-        @keeper = nil
-      end
-    end
-  end
-
-  def initialize
-    @now = 2
-    @reso = 1
-    @ts = nil
-    @inf = 2**31 - 1
-  end
-
-  def start_keeper
-    @now = 2
-    @reso = 1
-    @ts&.stop_keeper
-    @ts = MyTS.new
-    @ts.write([2, :now])
-    @inf = 2**31 - 1
-  end
-
-  def stop_keeper
-    @ts.stop_keeper
-  end
-
-  def now
-    @now.to_f
-  end
-
-  def at(n)
-    n
-  end
-
-  def _forward(n=nil)
-    now ,= @ts.take([nil, :now])
-    @now = now + n
-    @ts.write([@now, :now])
-  end
-
-  def forward(n)
-    while n > 0
-      _forward(@reso)
-      n -= @reso
-      Thread.pass
-    end
-  end
-
-  def rewind
-    @ts.take([nil, :now])
-    @ts.write([@inf, :now])
-    @ts.take([nil, :now])
-    @now = 2
-    @ts.write([2, :now])
-  end
-
-  def sleep(n=nil)
-    now ,= @ts.read([nil, :now])
-    @ts.read([(now + n)..@inf, :now])
-    0
-  end
-end
-
-module Time
-  def sleep(n)
-    @m.sleep(n)
-  end
-  module_function :sleep
-
-  def at(n)
-    n
-  end
-  module_function :at
-
-  def now
-    defined?(@m) && @m ? @m.now : 2
-  end
-  module_function :now
-
-  def rewind
-    @m.rewind
-  end
-  module_function :rewind
-
-  def forward(n)
-    @m.forward(n)
-  end
-  module_function :forward
-
-  @m = MockClock.instance
-end
-
-class TupleSpace
-  def sleep(n)
-    Kernel.sleep(n * 0.01)
-  end
-end
-
-module TupleSpaceTestModule
-  def setup
-    MockClock.instance.start_keeper
-  end
-
-  def teardown
-    MockClock.instance.stop_keeper
-  end
-
-  def sleep(n)
-    if Thread.current == Thread.main
-      Time.forward(n)
-    else
-      Time.sleep(n)
-    end
-  end
-
-  def thread_join(th)
-    while th.alive?
-      Kernel.sleep(0.1)
-      sleep(1)
-    end
-    th.value
-  end
-
-  def test_00_tuple
-    tuple = Rinda::TupleEntry.new([1,2,3])
-    assert(!tuple.canceled?)
-    assert(!tuple.expired?)
-    assert(tuple.alive?)
-  end
-
-  def test_00_template
-    tmpl = Rinda::Template.new([1,2,3])
-    assert_equal(3, tmpl.size)
-    assert_equal(3, tmpl[2])
-    assert(tmpl.match([1,2,3]))
-    assert(!tmpl.match([1,nil,3]))
-
-    tmpl = Rinda::Template.new([/^rinda/i, nil, :hello])
-    assert_equal(3, tmpl.size)
-    assert(tmpl.match(['Rinda', 2, :hello]))
-    assert(!tmpl.match(['Rinda', 2, Symbol]))
-    assert(!tmpl.match([1, 2, :hello]))
-    assert(tmpl.match([/^rinda/i, 2, :hello]))
-
-    tmpl = Rinda::Template.new([Symbol])
-    assert_equal(1, tmpl.size)
-    assert(tmpl.match([:hello]))
-    assert(tmpl.match([Symbol]))
-    assert(!tmpl.match(['Symbol']))
-
-    tmpl = Rinda::Template.new({"message"=>String, "name"=>String})
-    assert_equal(2, tmpl.size)
-    assert(tmpl.match({"message"=>"Hello", "name"=>"Foo"}))
-    assert(!tmpl.match({"message"=>"Hello", "name"=>"Foo", "1"=>2}))
-    assert(!tmpl.match({"message"=>"Hi", "name"=>"Foo", "age"=>1}))
-    assert(!tmpl.match({"message"=>"Hello", "no_name"=>"Foo"}))
-
-    assert_raise(Rinda::InvalidHashTupleKey) do
-      Rinda::Template.new({:message=>String, "name"=>String})
-    end
-    tmpl = Rinda::Template.new({"name"=>String})
-    assert_equal(1, tmpl.size)
-    assert(tmpl.match({"name"=>"Foo"}))
-    assert(!tmpl.match({"message"=>"Hello", "name"=>"Foo"}))
-    assert(!tmpl.match({"message"=>:symbol, "name"=>"Foo", "1"=>2}))
-    assert(!tmpl.match({"message"=>"Hi", "name"=>"Foo", "age"=>1}))
-    assert(!tmpl.match({"message"=>"Hello", "no_name"=>"Foo"}))
-
-    tmpl = Rinda::Template.new({"message"=>String, "name"=>String})
-    assert_equal(2, tmpl.size)
-    assert(tmpl.match({"message"=>"Hello", "name"=>"Foo"}))
-    assert(!tmpl.match({"message"=>"Hello", "name"=>"Foo", "1"=>2}))
-    assert(!tmpl.match({"message"=>"Hi", "name"=>"Foo", "age"=>1}))
-    assert(!tmpl.match({"message"=>"Hello", "no_name"=>"Foo"}))
-
-    tmpl = Rinda::Template.new({"message"=>String})
-    assert_equal(1, tmpl.size)
-    assert(tmpl.match({"message"=>"Hello"}))
-    assert(!tmpl.match({"message"=>"Hello", "name"=>"Foo"}))
-    assert(!tmpl.match({"message"=>"Hello", "name"=>"Foo", "1"=>2}))
-    assert(!tmpl.match({"message"=>"Hi", "name"=>"Foo", "age"=>1}))
-    assert(!tmpl.match({"message"=>"Hello", "no_name"=>"Foo"}))
-
-    tmpl = Rinda::Template.new({"message"=>String, "name"=>nil})
-    assert_equal(2, tmpl.size)
-    assert(tmpl.match({"message"=>"Hello", "name"=>"Foo"}))
-    assert(!tmpl.match({"message"=>"Hello", "name"=>"Foo", "1"=>2}))
-    assert(!tmpl.match({"message"=>"Hi", "name"=>"Foo", "age"=>1}))
-    assert(!tmpl.match({"message"=>"Hello", "no_name"=>"Foo"}))
-
-    assert_raise(Rinda::InvalidHashTupleKey) do
-      @ts.write({:message=>String, "name"=>String})
-    end
-
-    @ts.write([1, 2, 3])
-    assert_equal([1, 2, 3], @ts.take([1, 2, 3]))
-
-    @ts.write({'1'=>1, '2'=>2, '3'=>3})
-    assert_equal({'1'=>1, '2'=>2, '3'=>3}, @ts.take({'1'=>1, '2'=>2, '3'=>3}))
-
-    entry = @ts.write(['1'=>1, '2'=>2, '3'=>3])
-    assert_raise(Rinda::RequestExpiredError) do
-      assert_equal({'1'=>1, '2'=>2, '3'=>3}, @ts.read({'1'=>1}, 0))
-    end
-    entry.cancel
-  end
-
-  def test_00_DRbObject
-    ro = DRbObject.new(nil, "druby://host:1234")
-    tmpl = Rinda::DRbObjectTemplate.new
-    assert(tmpl === ro)
-
-    tmpl = Rinda::DRbObjectTemplate.new("druby://host:1234")
-    assert(tmpl === ro)
-
-    tmpl = Rinda::DRbObjectTemplate.new("druby://host:12345")
-    assert(!(tmpl === ro))
-
-    tmpl = Rinda::DRbObjectTemplate.new(/^druby:\/\/host:/)
-    assert(tmpl === ro)
-
-    ro = DRbObject.new_with(12345, 1234)
-    assert(!(tmpl === ro))
-
-    ro = DRbObject.new_with("druby://foo:12345", 1234)
-    assert(!(tmpl === ro))
-
-    tmpl = Rinda::DRbObjectTemplate.new(/^druby:\/\/(foo|bar):/)
-    assert(tmpl === ro)
-
-    ro = DRbObject.new_with("druby://bar:12345", 1234)
-    assert(tmpl === ro)
-
-    ro = DRbObject.new_with("druby://baz:12345", 1234)
-    assert(!(tmpl === ro))
-  end
-
-  def test_inp_rdp
-    assert_raise(Rinda::RequestExpiredError) do
-      @ts.take([:empty], 0)
-    end
-
-    assert_raise(Rinda::RequestExpiredError) do
-      @ts.read([:empty], 0)
-    end
-  end
-
-  def test_ruby_talk_264062
-    th = Thread.new {
-      assert_raise(Rinda::RequestExpiredError) do
-        @ts.take([:empty], 1)
-      end
-    }
-    sleep(10)
-    thread_join(th)
-
-    th = Thread.new {
-      assert_raise(Rinda::RequestExpiredError) do
-        @ts.read([:empty], 1)
-      end
-    }
-    sleep(10)
-    thread_join(th)
-  end
-
-  def test_symbol_tuple
-    @ts.write([:symbol, :symbol])
-    @ts.write(['string', :string])
-    assert_equal([[:symbol, :symbol]], @ts.read_all([:symbol, nil]))
-    assert_equal([[:symbol, :symbol]], @ts.read_all([Symbol, nil]))
-    assert_equal([], @ts.read_all([:nil, nil]))
-  end
-
-  def test_core_01
-    5.times do
-      @ts.write([:req, 2])
-    end
-
-    assert_equal([[:req, 2], [:req, 2], [:req, 2], [:req, 2], [:req, 2]],
-		 @ts.read_all([nil, nil]))
-
-    taker = Thread.new(5) do |count|
-      s = 0
-      count.times do
-        tuple = @ts.take([:req, Integer])
-        assert_equal(2, tuple[1])
-        s += tuple[1]
-      end
-      @ts.write([:ans, s])
-      s
-    end
-
-    assert_equal(10, thread_join(taker))
-    assert_equal([:ans, 10], @ts.take([:ans, 10]))
-    assert_equal([], @ts.read_all([nil, nil]))
-  end
-
-  def test_core_02
-    taker = Thread.new(5) do |count|
-      s = 0
-      count.times do
-        tuple = @ts.take([:req, Integer])
-        assert_equal(2, tuple[1])
-        s += tuple[1]
-      end
-      @ts.write([:ans, s])
-      s
-    end
-
-    5.times do
-      @ts.write([:req, 2])
-    end
-
-    assert_equal(10, thread_join(taker))
-    assert_equal([:ans, 10], @ts.take([:ans, 10]))
-    assert_equal([], @ts.read_all([nil, nil]))
-  end
-
-  def test_core_03_notify
-    notify1 = @ts.notify(nil, [:req, Integer])
-    notify2 = @ts.notify(nil, {"message"=>String, "name"=>String})
-
-    5.times do
-      @ts.write([:req, 2])
-    end
-
-    5.times do
-      tuple = @ts.take([:req, Integer])
-      assert_equal(2, tuple[1])
-    end
-
-    5.times do
-      assert_equal(['write', [:req, 2]], notify1.pop)
-    end
-    5.times do
-      assert_equal(['take', [:req, 2]], notify1.pop)
-    end
-
-    @ts.write({"message"=>"first", "name"=>"3"})
-    @ts.write({"message"=>"second", "name"=>"1"})
-    @ts.write({"message"=>"third", "name"=>"0"})
-    @ts.take({"message"=>"third", "name"=>"0"})
-    @ts.take({"message"=>"first", "name"=>"3"})
-
-    assert_equal(["write", {"message"=>"first", "name"=>"3"}], notify2.pop)
-    assert_equal(["write", {"message"=>"second", "name"=>"1"}], notify2.pop)
-    assert_equal(["write", {"message"=>"third", "name"=>"0"}], notify2.pop)
-    assert_equal(["take", {"message"=>"third", "name"=>"0"}], notify2.pop)
-    assert_equal(["take", {"message"=>"first", "name"=>"3"}], notify2.pop)
-  end
-
-  def test_cancel_01
-    entry = @ts.write([:removeme, 1])
-    assert_equal([[:removeme, 1]], @ts.read_all([nil, nil]))
-    entry.cancel
-    assert_equal([], @ts.read_all([nil, nil]))
-
-    template = nil
-    taker = Thread.new do
-      assert_raise(Rinda::RequestCanceledError) do
-        @ts.take([:take, nil], 10) do |t|
-          template = t
-          Thread.new do
-            template.cancel
-          end
-        end
-      end
-    end
-
-    sleep(2)
-    thread_join(taker)
-
-    assert(template.canceled?)
-
-    @ts.write([:take, 1])
-
-    assert_equal([[:take, 1]], @ts.read_all([nil, nil]))
-  end
-
-  def test_cancel_02
-    omit 'this test is unstable with --jit-wait' if defined?(RubyVM::RJIT) && RubyVM::RJIT.enabled?
-    entry = @ts.write([:removeme, 1])
-    assert_equal([[:removeme, 1]], @ts.read_all([nil, nil]))
-    entry.cancel
-    assert_equal([], @ts.read_all([nil, nil]))
-
-    template = nil
-    reader = Thread.new do
-      assert_raise(Rinda::RequestCanceledError) do
-        @ts.read([:take, nil], 10) do |t|
-          template = t
-          Thread.new do
-            template.cancel
-          end
-        end
-      end
-    end
-
-    sleep(2)
-    thread_join(reader)
-
-    assert(template.canceled?)
-
-    @ts.write([:take, 1])
-
-    assert_equal([[:take, 1]], @ts.read_all([nil, nil]))
-  end
-
-  class SimpleRenewer
-    def initialize(sec, n = 1)
-      @sec = sec
-      @n = n
-    end
-
-    def renew
-      return -1 if @n <= 0
-      @n -= 1
-      return @sec
-    end
-  end
-
-  def test_00_renewer
-    tuple = Rinda::TupleEntry.new([1,2,3], true)
-    assert(!tuple.canceled?)
-    assert(tuple.expired?)
-    assert(!tuple.alive?)
-
-    tuple = Rinda::TupleEntry.new([1,2,3], 1)
-    assert(!tuple.canceled?)
-    assert(!tuple.expired?)
-    assert(tuple.alive?)
-    sleep(2)
-    assert(tuple.expired?)
-    assert(!tuple.alive?)
-
-    @renewer = SimpleRenewer.new(1,2)
-    tuple = Rinda::TupleEntry.new([1,2,3], @renewer)
-    assert(!tuple.canceled?)
-    assert(!tuple.expired?)
-    assert(tuple.alive?)
-    sleep(1)
-    assert(!tuple.canceled?)
-    assert(!tuple.expired?)
-    assert(tuple.alive?)
-    sleep(2)
-    assert(tuple.expired?)
-    assert(!tuple.alive?)
-  end
-end
-
-class TupleSpaceTest < Test::Unit::TestCase
-  include TupleSpaceTestModule
-
-  def setup
-    super
-    ThreadGroup.new.add(Thread.current)
-    @ts = Rinda::TupleSpace.new(1)
-  end
-  def teardown
-    # implementation-dependent
-    @ts.instance_eval{
-      if th = @keeper
-        th.kill
-        th.join
-      end
-    }
-    super
-  end
-end
-
-class TupleSpaceProxyTest < Test::Unit::TestCase
-  include TupleSpaceTestModule
-
-  def setup
-    if RUBY_PLATFORM.match?(/mingw/)
-      @omitted = true
-      omit 'This test seems to randomly hang on GitHub Actions MinGW'
-    end
-    super
-    ThreadGroup.new.add(Thread.current)
-    @ts_base = Rinda::TupleSpace.new(1)
-    @ts = Rinda::TupleSpaceProxy.new(@ts_base)
-    @server = DRb.start_service("druby://localhost:0")
-  end
-  def teardown
-    return if @omitted
-    @omitted = false
-
-    # implementation-dependent
-    @ts_base.instance_eval{
-      if th = @keeper
-        th.kill
-        th.join
-      end
-    }
-    @server.stop_service
-    DRb::DRbConn.stop_pool
-    super
-  end
-
-  def test_remote_array_and_hash
-    # Don't remove ary/hsh local variables.
-    # These are necessary to protect objects from GC.
-    ary = [1, 2, 3]
-    @ts.write(DRbObject.new(ary))
-    assert_equal([1, 2, 3], @ts.take([1, 2, 3], 0))
-    hsh = {'head' => 1, 'tail' => 2}
-    @ts.write(DRbObject.new(hsh))
-    assert_equal({'head' => 1, 'tail' => 2},
-                 @ts.take({'head' => 1, 'tail' => 2}, 0))
-  end
-
-  def test_take_bug_8215
-    omit "this test randomly fails on mswin" if /mswin/ =~ RUBY_PLATFORM
-    service = DRb.start_service("druby://localhost:0", @ts_base)
-
-    uri = service.uri
-
-    args = [EnvUtil.rubybin, *%W[-rdrb/drb -rdrb/eq -rrinda/ring -rrinda/tuplespace -e]]
-
-    take = spawn(*args, <<-'end;', uri)
-      uri = ARGV[0]
-      DRb.start_service("druby://localhost:0")
-      ro = DRbObject.new_with_uri(uri)
-      ts = Rinda::TupleSpaceProxy.new(ro)
-      th = Thread.new do
-        ts.take([:test_take, nil])
-      rescue Interrupt
-        # Expected
-      end
-      Kernel.sleep(0.1)
-      th.raise(Interrupt) # causes loss of the taken tuple
-      ts.write([:barrier, :continue])
-      Kernel.sleep
-    end;
-
-    @ts_base.take([:barrier, :continue])
-
-    write = spawn(*args, <<-'end;', uri)
-      uri = ARGV[0]
-      DRb.start_service("druby://localhost:0")
-      ro = DRbObject.new_with_uri(uri)
-      ts = Rinda::TupleSpaceProxy.new(ro)
-      ts.write([:test_take, 42])
-    end;
-
-    status = Process.wait(write)
-
-    assert_equal([[:test_take, 42]], @ts_base.read_all([:test_take, nil]),
-                 '[bug:8215] tuple lost')
-  ensure
-    service.stop_service if service
-    DRb::DRbConn.stop_pool
-    signal = /mswin|mingw/ =~ RUBY_PLATFORM ? "KILL" : "TERM"
-    Process.kill(signal, write) if write && status.nil?
-    Process.kill(signal, take)  if take
-    Process.wait(write) if write && status.nil?
-    Process.wait(take)  if take
-  end
-end
-
-module RingIPv4
-  def ipv4_mc(rf)
-    begin
-      v4mc = rf.make_socket('239.0.0.1')
-    rescue Errno::ENETUNREACH, Errno::ENOBUFS, Errno::ENODEV
-      omit 'IPv4 multicast not available'
-    end
-
-    begin
-      yield v4mc
-    ensure
-      v4mc.close
-    end
-  end
-end
-
-module RingIPv6
-  def prepare_ipv6(r)
-    begin
-      Socket.getifaddrs.each do |ifaddr|
-        next unless ifaddr.addr
-        next unless ifaddr.addr.ipv6_linklocal?
-        next if ifaddr.name[0, 2] == "lo"
-        r.multicast_interface = ifaddr.ifindex
-        return ifaddr
-      end
-    rescue NotImplementedError
-      # ifindex() function may not be implemented on Windows.
-      return if
-        Socket.ip_address_list.any? { |addrinfo| addrinfo.ipv6? && !addrinfo.ipv6_loopback? }
-    end
-    omit 'IPv6 not available'
-  end
-
-  def ipv6_mc(rf, hops = nil)
-    ifaddr = prepare_ipv6(rf)
-    rf.multicast_hops = hops if hops
-    begin
-      v6mc = rf.make_socket("ff02::1")
-    rescue Errno::EINVAL
-      # somehow Debian 6.0.7 needs ifname
-      v6mc = rf.make_socket("ff02::1%#{ifaddr.name}")
-    rescue Errno::EADDRNOTAVAIL
-      return # IPv6 address for multicast not available
-    rescue Errno::ENETDOWN
-      return # Network is down
-    rescue Errno::EHOSTUNREACH
-      return # Unreachable for some reason
-    end
-    begin
-      yield v6mc
-    ensure
-      v6mc.close
-    end
-  end
-end
-
-class TestRingServer < Test::Unit::TestCase
-  include RingIPv4
-
-  def setup
-    @port = Rinda::Ring_PORT
-
-    @ts = Rinda::TupleSpace.new
-    @rs = Rinda::RingServer.new(@ts, [], @port)
-    @server = DRb.start_service("druby://localhost:0")
-  end
-  def teardown
-    @rs.shutdown
-    # implementation-dependent
-    @ts.instance_eval{
-      if th = @keeper
-        th.kill
-        th.join
-      end
-    }
-    @server.stop_service
-    DRb::DRbConn.stop_pool
-  end
-
-  def test_do_reply
-    with_timeout(30) {_test_do_reply}
-  end
-
-  def _test_do_reply
-    called = nil
-
-    callback_orig = proc { |ts|
-      called = ts
-    }
-
-    callback = DRb::DRbObject.new callback_orig
-
-    @ts.write [:lookup_ring, callback]
-
-    @rs.do_reply
-
-    wait_for(30) {called}
-
-    assert_same @ts, called
-  end
-
-  def test_do_reply_local
-    omit 'timeout-based test becomes unstable with --jit-wait' if defined?(RubyVM::RJIT) && RubyVM::RJIT.enabled?
-    with_timeout(30) {_test_do_reply_local}
-  end
-
-  def _test_do_reply_local
-    called = nil
-
-    callback = proc { |ts|
-      called = ts
-    }
-
-    @ts.write [:lookup_ring, callback]
-
-    @rs.do_reply
-
-    wait_for(30) {called}
-
-    assert_same @ts, called
-  end
-
-  def test_make_socket_unicast
-    v4 = @rs.make_socket('127.0.0.1')
-
-    assert_equal('127.0.0.1', v4.local_address.ip_address)
-    assert_equal(@port,       v4.local_address.ip_port)
-  end
-
-  def test_make_socket_ipv4_multicast
-    ipv4_mc(@rs) do |v4mc|
-      begin
-        if Socket.const_defined?(:SO_REUSEPORT) then
-          assert(v4mc.getsockopt(:SOCKET, :SO_REUSEPORT).bool)
-        else
-          assert(v4mc.getsockopt(:SOCKET, :SO_REUSEADDR).bool)
-        end
-      rescue TypeError
-        if /aix/ =~ RUBY_PLATFORM
-          omit "Known bug in getsockopt(2) on AIX"
-        end
-        raise $!
-      end
-
-      assert_equal('0.0.0.0', v4mc.local_address.ip_address)
-      assert_equal(@port,     v4mc.local_address.ip_port)
-    end
-  end
-
-  def test_make_socket_ipv6_multicast
-    omit 'IPv6 not available' unless
-      Socket.ip_address_list.any? { |addrinfo| addrinfo.ipv6? && !addrinfo.ipv6_loopback? }
-
-    begin
-      v6mc = @rs.make_socket('ff02::1')
-    rescue Errno::EADDRNOTAVAIL
-      return # IPv6 address for multicast not available
-    rescue Errno::ENOBUFS => e
-      omit "Missing multicast support in OS: #{e.message}"
-    end
-
-    if Socket.const_defined?(:SO_REUSEPORT) then
-      assert v6mc.getsockopt(:SOCKET, :SO_REUSEPORT).bool
-    else
-      assert v6mc.getsockopt(:SOCKET, :SO_REUSEADDR).bool
-    end
-
-    assert_equal('::1', v6mc.local_address.ip_address)
-    assert_equal(@port, v6mc.local_address.ip_port)
-  end
-
-  def test_ring_server_ipv4_multicast
-    @rs.shutdown
-    begin
-      @rs = Rinda::RingServer.new(@ts, [['239.0.0.1', '0.0.0.0']], @port)
-    rescue Errno::ENOBUFS, Errno::ENODEV => e
-      omit "Missing multicast support in OS: #{e.message}"
-    end
-
-    v4mc = @rs.instance_variable_get('@sockets').first
-
-    begin
-      if Socket.const_defined?(:SO_REUSEPORT) then
-        assert(v4mc.getsockopt(:SOCKET, :SO_REUSEPORT).bool)
-      else
-        assert(v4mc.getsockopt(:SOCKET, :SO_REUSEADDR).bool)
-      end
-    rescue TypeError
-      if /aix/ =~ RUBY_PLATFORM
-        omit "Known bug in getsockopt(2) on AIX"
-      end
-      raise $!
-    end
-
-    assert_equal('0.0.0.0', v4mc.local_address.ip_address)
-    assert_equal(@port,     v4mc.local_address.ip_port)
-  end
-
-  def test_ring_server_ipv6_multicast
-    omit 'IPv6 not available' unless
-      Socket.ip_address_list.any? { |addrinfo| addrinfo.ipv6? && !addrinfo.ipv6_loopback? }
-
-    @rs.shutdown
-    begin
-      @rs = Rinda::RingServer.new(@ts, [['ff02::1', '::1', 0]], @port)
-    rescue Errno::EADDRNOTAVAIL
-      return # IPv6 address for multicast not available
-    end
-
-    v6mc = @rs.instance_variable_get('@sockets').first
-
-    if Socket.const_defined?(:SO_REUSEPORT) then
-      assert v6mc.getsockopt(:SOCKET, :SO_REUSEPORT).bool
-    else
-      assert v6mc.getsockopt(:SOCKET, :SO_REUSEADDR).bool
-    end
-
-    assert_equal('::1', v6mc.local_address.ip_address)
-    assert_equal(@port, v6mc.local_address.ip_port)
-  end
-
-  def test_shutdown
-    @rs.shutdown
-
-    assert_nil(@rs.do_reply, 'otherwise should hang forever')
-  end
-
-  private
-
-  def with_timeout(n)
-    aoe = Thread.abort_on_exception
-    Thread.abort_on_exception = true
-    tl0 = Thread.list
-    tl = nil
-    th = Thread.new(Thread.current) do |mth|
-      sleep n
-      (tl = Thread.list - tl0).each {|t|t.raise(Timeout::Error)}
-      mth.raise(Timeout::Error)
-    end
-    tl0 << th
-    yield
-  rescue Timeout::Error => e
-    $stderr.puts "TestRingServer#with_timeout: timeout in #{n}s:"
-    $stderr.puts caller
-    if tl
-      bt = e.backtrace
-      tl.each do |t|
-        begin
-          t.value
-        rescue Timeout::Error => e
-          bt.unshift("")
-          bt[0, 0] = e.backtrace
-        end
-      end
-    end
-    raise Timeout::Error, "timeout", bt
-  ensure
-    if th
-      th.kill
-      th.join
-    end
-    Thread.abort_on_exception = aoe
-  end
-
-  def wait_for(n)
-    t = n + Process.clock_gettime(Process::CLOCK_MONOTONIC, :second)
-    until yield
-      if t < Process.clock_gettime(Process::CLOCK_MONOTONIC, :second)
-        flunk "timeout during waiting call"
-      end
-      sleep 0.1
-    end
-  end
-end
-
-class TestRingFinger < Test::Unit::TestCase
-  include RingIPv6
-  include RingIPv4
-
-  def setup
-    @rf = Rinda::RingFinger.new
-  end
-
-  def test_make_socket_unicast
-    v4 = @rf.make_socket('127.0.0.1')
-
-    assert(v4.getsockopt(:SOL_SOCKET, :SO_BROADCAST).bool)
-  rescue TypeError
-    if /aix/ =~ RUBY_PLATFORM
-      omit "Known bug in getsockopt(2) on AIX"
-    end
-    raise $!
-  ensure
-    v4.close if v4
-  end
-
-  def test_make_socket_ipv4_multicast
-    ipv4_mc(@rf) do |v4mc|
-      assert_equal(1, v4mc.getsockopt(:IPPROTO_IP, :IP_MULTICAST_LOOP).ipv4_multicast_loop)
-      assert_equal(1, v4mc.getsockopt(:IPPROTO_IP, :IP_MULTICAST_TTL).ipv4_multicast_ttl)
-    end
-  end
-
-  def test_make_socket_ipv6_multicast
-    ipv6_mc(@rf) do |v6mc|
-      assert_equal(1, v6mc.getsockopt(:IPPROTO_IPV6, :IPV6_MULTICAST_LOOP).int)
-      assert_equal(1, v6mc.getsockopt(:IPPROTO_IPV6, :IPV6_MULTICAST_HOPS).int)
-    end
-  end
-
-  def test_make_socket_ipv4_multicast_hops
-    @rf.multicast_hops = 2
-    ipv4_mc(@rf) do |v4mc|
-      assert_equal(2, v4mc.getsockopt(:IPPROTO_IP, :IP_MULTICAST_TTL).ipv4_multicast_ttl)
-    end
-  end
-
-  def test_make_socket_ipv6_multicast_hops
-    ipv6_mc(@rf, 2) do |v6mc|
-      assert_equal(2, v6mc.getsockopt(:IPPROTO_IPV6, :IPV6_MULTICAST_HOPS).int)
-    end
-  end
-
-end
-
-end
diff --git a/test/rinda/test_tuplebag.rb b/test/rinda/test_tuplebag.rb
deleted file mode 100644
index ab17ca047cff30..00000000000000
--- a/test/rinda/test_tuplebag.rb
+++ /dev/null
@@ -1,173 +0,0 @@
-# frozen_string_literal: false
-require 'test/unit'
-require 'rinda/tuplespace'
-
-class TestTupleBag < Test::Unit::TestCase
-
-  def setup
-    @tb = Rinda::TupleBag.new
-  end
-
-  def test_delete
-    assert_nothing_raised do
-      val = @tb.delete tup(:val, 1)
-      assert_equal nil, val
-    end
-
-    t = tup(:val, 1)
-    @tb.push t
-
-    val = @tb.delete t
-
-    assert_equal t, val
-
-    assert_equal [], @tb.find_all(tem(:val, 1))
-
-    t1 = tup(:val, 1)
-    t2 = tup(:val, 1)
-    @tb.push t1
-    @tb.push t2
-
-    val = @tb.delete t1
-
-    assert_equal t1, val
-
-    assert_equal [t2], @tb.find_all(tem(:val, 1))
-  end
-
-  def test_delete_unless_alive
-    assert_equal [], @tb.delete_unless_alive
-
-    t1 = tup(:val, nil)
-    t2 = tup(:val, nil)
-
-    @tb.push t1
-    @tb.push t2
-
-    assert_equal [], @tb.delete_unless_alive
-
-    t1.cancel
-
-    assert_equal [t1], @tb.delete_unless_alive, 'canceled'
-
-    t2.renew Object.new
-
-    assert_equal [t2], @tb.delete_unless_alive, 'expired'
-  end
-
-  def test_find
-    template = tem(:val, nil)
-
-    assert_equal nil, @tb.find(template)
-
-    t1 = tup(:other, 1)
-    @tb.push t1
-
-    assert_equal nil, @tb.find(template)
-
-    t2 = tup(:val, 1)
-    @tb.push t2
-
-    assert_equal t2, @tb.find(template)
-
-    t2.cancel
-
-    assert_equal nil, @tb.find(template), 'canceled'
-
-    t3 = tup(:val, 3)
-    @tb.push t3
-
-    assert_equal t3, @tb.find(template)
-
-    t3.renew Object.new
-
-    assert_equal nil, @tb.find(template), 'expired'
-  end
-
-  def test_find_all
-    template = tem(:val, nil)
-
-    t1 = tup(:other, 1)
-    @tb.push t1
-
-    assert_equal [], @tb.find_all(template)
-
-    t2 = tup(:val, 2)
-    t3 = tup(:val, 3)
-
-    @tb.push t2
-    @tb.push t3
-
-    assert_equal [t2, t3], @tb.find_all(template)
-
-    t2.cancel
-
-    assert_equal [t3], @tb.find_all(template), 'canceled'
-
-    t3.renew Object.new
-
-    assert_equal [], @tb.find_all(template), 'expired'
-  end
-
-  def test_find_all_template
-    tuple = tup(:val, 1)
-
-    t1 = tem(:other, nil)
-    @tb.push t1
-
-    assert_equal [], @tb.find_all_template(tuple)
-
-    t2 = tem(:val, nil)
-    t3 = tem(:val, nil)
-
-    @tb.push t2
-    @tb.push t3
-
-    assert_equal [t2, t3], @tb.find_all_template(tuple)
-
-    t2.cancel
-
-    assert_equal [t3], @tb.find_all_template(tuple), 'canceled'
-
-    t3.renew Object.new
-
-    assert_equal [], @tb.find_all_template(tuple), 'expired'
-  end
-
-  def test_has_expires_eh
-    assert !@tb.has_expires?
-
-    t = tup(:val, 1)
-    @tb.push t
-
-    assert @tb.has_expires?
-
-    t.renew Object.new
-
-    assert !@tb.has_expires?
-  end
-
-  def test_push
-    t = tup(:val, 1)
-
-    @tb.push t
-
-    assert_equal t, @tb.find(tem(:val, 1))
-  end
-
-  ##
-  # Create a tuple with +ary+ for its contents
-
-  def tup(*ary)
-    Rinda::TupleEntry.new ary
-  end
-
-  ##
-  # Create a template with +ary+ for its contents
-
-  def tem(*ary)
-    Rinda::TemplateEntry.new ary
-  end
-
-end
-
diff --git a/test/ripper/dummyparser.rb b/test/ripper/dummyparser.rb
index fa834bd0f7b5a9..ef5ea49b1ffdfc 100644
--- a/test/ripper/dummyparser.rb
+++ b/test/ripper/dummyparser.rb
@@ -4,8 +4,9 @@
 #
 
 require 'ripper'
+module TestRipper; end
 
-class Node
+class TestRipper::Node
   def initialize(name, *nodes)
     @name = name
     @children = nodes
@@ -14,7 +15,7 @@ def initialize(name, *nodes)
   attr_reader :name, :children
 
   def to_s
-    "#{@name}(#{Node.trim_nil(@children).map {|n| n.to_s }.join(',')})"
+    "#{@name}(#{TestRipper::Node.trim_nil(@children).map {|n| n.to_s }.join(',')})"
   end
 
   def self.trim_nil(list)
@@ -36,7 +37,7 @@ def to_s
   end
 end
 
-class NodeList
+class TestRipper::NodeList
   def initialize(list = [])
     @list = list
   end
@@ -62,7 +63,7 @@ def to_s
   end
 end
 
-class DummyParser < Ripper
+class TestRipper::DummyParser < Ripper
   def hook(*names)
     class << self; self; end.class_eval do
       names.each do |name|
@@ -81,7 +82,7 @@ def on_program(stmts)
   end
 
   def on_stmts_new
-    NodeList.new
+    TestRipper::NodeList.new
   end
 
   def on_stmts_add(stmts, st)
@@ -90,23 +91,23 @@ def on_stmts_add(stmts, st)
   end
 
   def on_void_stmt
-    Node.new('void')
+    TestRipper::Node.new('void')
   end
 
   def on_var_ref(name)
-    Node.new('ref', name)
+    TestRipper::Node.new('ref', name)
   end
 
   def on_var_alias(a, b)
-    Node.new('valias', a, b)
+    TestRipper::Node.new('valias', a, b)
   end
 
   def on_assign_error(mesg = nil, a)
-    Node.new('assign_error', a)
+    TestRipper::Node.new('assign_error', a)
   end
 
   def on_alias_error(mesg = nil, a)
-    Node.new('aliaserr', a)
+    TestRipper::Node.new('aliaserr', a)
   end
 
   def on_arg_paren(args)
@@ -114,7 +115,7 @@ def on_arg_paren(args)
   end
 
   def on_args_new
-    NodeList.new
+    TestRipper::NodeList.new
   end
 
   def on_args_add(list, arg)
@@ -156,7 +157,7 @@ def on_paren(params)
   end
 
   def on_brace_block(params, code)
-    Node.new('block', params, code)
+    TestRipper::Node.new('block', params, code)
   end
 
   def on_block_var(params, shadow)
@@ -176,7 +177,7 @@ def on_blockarg(var)
   end
 
   def on_params(required, optional, rest, more, keyword, keyword_rest, block)
-    args = NodeList.new
+    args = TestRipper::NodeList.new
 
     required.each do |req|
       args.push(req)
@@ -197,15 +198,15 @@ def on_params(required, optional, rest, more, keyword, keyword_rest, block)
   end
 
   def on_assoc_new(a, b)
-    Node.new('assoc', a, b)
+    TestRipper::Node.new('assoc', a, b)
   end
 
   def on_bare_assoc_hash(assoc_list)
-    Node.new('assocs', *assoc_list)
+    TestRipper::Node.new('assocs', *assoc_list)
   end
 
   def on_assoclist_from_args(a)
-    Node.new('assocs', *a)
+    TestRipper::Node.new('assocs', *a)
   end
 
   def on_word_new
@@ -217,7 +218,7 @@ def on_word_add(word, w)
   end
 
   def on_words_new
-    NodeList.new
+    TestRipper::NodeList.new
   end
 
   def on_words_add(words, word)
@@ -225,7 +226,7 @@ def on_words_add(words, word)
   end
 
   def on_qwords_new
-    NodeList.new
+    TestRipper::NodeList.new
   end
 
   def on_qwords_add(words, word)
@@ -233,27 +234,27 @@ def on_qwords_add(words, word)
   end
 
   def on_symbols_new
-    NodeList.new
+    TestRipper::NodeList.new
   end
 
   def on_symbols_add(symbols, symbol)
-    symbols.push Node::Sym.new(symbol)
+    symbols.push TestRipper::Node::Sym.new(symbol)
   end
 
   def on_qsymbols_new
-    NodeList.new
+    TestRipper::NodeList.new
   end
 
   def on_qsymbols_add(symbols, symbol)
-    symbols.push Node::Sym.new(symbol)
+    symbols.push TestRipper::Node::Sym.new(symbol)
   end
 
   def on_mlhs_new
-    NodeList.new
+    TestRipper::NodeList.new
   end
 
   def on_mlhs_paren(list)
-    Node.new(:mlhs, list)
+    TestRipper::Node.new(:mlhs, list)
   end
 
   def on_mlhs_add(list, node)
@@ -277,12 +278,12 @@ def on_mlhs_add_post(list, post)
   end
 
   def on_rescue(exc, *rest)
-    Node.new('rescue', (exc && NodeList.new(exc)), *rest)
+    TestRipper::Node.new('rescue', (exc && TestRipper::NodeList.new(exc)), *rest)
   end
 
   (Ripper::PARSER_EVENTS.map(&:to_s) - instance_methods(false).map {|n|n.to_s.sub(/^on_/, '')}).each do |event|
     define_method(:"on_#{event}") do |*args|
-      Node.new(event, *args)
+      TestRipper::Node.new(event, *args)
     end
   end
 end
diff --git a/test/ripper/test_lexer.rb b/test/ripper/test_lexer.rb
index 92587ae4c0ba9b..7a2c22ff2d1dcb 100644
--- a/test/ripper/test_lexer.rb
+++ b/test/ripper/test_lexer.rb
@@ -171,7 +171,7 @@ def test_trailing_on_embexpr_end
   end
 
   BAD_CODE = [
-    [:parse_error,      'def req(true) end',         %r[unexpected `true'],         'true'],
+    [:parse_error,      'def req(true) end',         %r[unexpected 'true'],         'true'],
     [:parse_error,      'def req(a, a) end',         %r[duplicated argument name],  'a'],
     [:assign_error,     'begin; nil = 1; end',       %r[assign to nil],             'nil'],
     [:alias_error,      'begin; alias $x $1; end',   %r[number variables],          '$1'],
@@ -253,18 +253,31 @@ def test_tokenize_with_here_document
     assert_equal(code, Ripper.tokenize(code).join(""), bug)
   end
 
+  InvalidHeredocInsideBlockParam = <<~CODE
+    a do |b
+      <<-C
+      C
+      |
+    end
+  CODE
+
   def test_heredoc_inside_block_param
     bug = '[Bug #19399]'
-    code = <<~CODE
-      a do |b
-        <<-C
-        C
-        |
-      end
-    CODE
+    code = InvalidHeredocInsideBlockParam
     assert_equal(code, Ripper.tokenize(code).join(""), bug)
   end
 
+  def test_heredoc_no_memory_leak
+    assert_no_memory_leak([], "#{<<-"begin;"}", "#{<<-'end;'}", rss: true)
+    require "ripper"
+    source = "" #{InvalidHeredocInsideBlockParam.dump}
+    begin;
+      400_000.times do
+        Ripper.new(source).parse
+      end
+    end;
+  end
+
   def test_heredoc_unterminated_interpolation
     code = <<~'HEREDOC'
     <<A+1
@@ -273,4 +286,309 @@ def test_heredoc_unterminated_interpolation
 
     assert_include(Ripper.tokenize(code).join(""), "+1")
   end
+
+  def test_nested_heredoc
+    code = <<~'HEREDOC'
+    <<~H1
+      1
+      #{<<~H2}
+        2
+      H2
+      3
+    H1
+    HEREDOC
+
+    expected = [
+      [[1, 0], :on_heredoc_beg, "<<~H1", state(:EXPR_BEG)],
+      [[1, 5], :on_nl, "\n", state(:EXPR_BEG)],
+      [[2, 0], :on_ignored_sp, "  ", state(:EXPR_BEG)],
+      [[2, 2], :on_tstring_content, "1\n", state(:EXPR_BEG)],
+      [[3, 0], :on_ignored_sp, "  ", state(:EXPR_BEG)],
+      [[3, 2], :on_embexpr_beg, "\#{", state(:EXPR_BEG)],
+      [[3, 4], :on_heredoc_beg, "<<~H2", state(:EXPR_BEG)],
+      [[3, 9], :on_embexpr_end, "}", state(:EXPR_END)],
+      [[3, 10], :on_tstring_content, "\n", state(:EXPR_BEG)],
+      [[4, 0], :on_ignored_sp, "    ", state(:EXPR_BEG)],
+      [[4, 4], :on_tstring_content, "2\n", state(:EXPR_BEG)],
+      [[5, 0], :on_heredoc_end, "  H2\n", state(:EXPR_BEG)],
+      [[6, 0], :on_ignored_sp, "  ", state(:EXPR_BEG)],
+      [[6, 2], :on_tstring_content, "3\n", state(:EXPR_BEG)],
+      [[7, 0], :on_heredoc_end, "H1\n", state(:EXPR_BEG)],
+    ]
+
+    assert_lexer(expected, code)
+
+    code = <<~'HEREDOC'
+    <<-H1
+      1
+      #{<<~H2}
+        2
+      H2
+      3
+    H1
+    HEREDOC
+
+    expected = [
+      [[1, 0], :on_heredoc_beg, "<<-H1", state(:EXPR_BEG)],
+      [[1, 5], :on_nl, "\n", state(:EXPR_BEG)],
+      [[2, 0], :on_tstring_content, "  1\n  ", state(:EXPR_BEG)],
+      [[3, 2], :on_embexpr_beg, "\#{", state(:EXPR_BEG)],
+      [[3, 4], :on_heredoc_beg, "<<~H2", state(:EXPR_BEG)],
+      [[3, 9], :on_embexpr_end, "}", state(:EXPR_END)],
+      [[3, 10], :on_tstring_content, "\n", state(:EXPR_BEG)],
+      [[4, 0], :on_ignored_sp, "    ", state(:EXPR_BEG)],
+      [[4, 4], :on_tstring_content, "2\n", state(:EXPR_BEG)],
+      [[5, 0], :on_heredoc_end, "  H2\n", state(:EXPR_BEG)],
+      [[6, 0], :on_tstring_content, "  3\n", state(:EXPR_BEG)],
+      [[7, 0], :on_heredoc_end, "H1\n", state(:EXPR_BEG)],
+    ]
+
+    assert_lexer(expected, code)
+
+    code = <<~'HEREDOC'
+      <<H1
+      #{<<H2}a
+      H2
+      b
+    HEREDOC
+
+    expected = [
+      [[1, 0], :on_heredoc_beg, "<<H1", state(:EXPR_BEG)],
+      [[1, 4], :on_nl, "\n", state(:EXPR_BEG)],
+      [[2, 0], :on_embexpr_beg, "\#{", state(:EXPR_BEG)],
+      [[2, 2], :on_heredoc_beg, "<<H2", state(:EXPR_BEG)],
+      [[2, 6], :on_embexpr_end, "}", state(:EXPR_END)],
+      [[2, 7], :on_tstring_content, "a\n", state(:EXPR_BEG)],
+      [[3, 0], :on_heredoc_end, "H2\n", state(:EXPR_BEG)],
+      [[4, 0], :on_tstring_content, "b\n", state(:EXPR_BEG)]
+    ]
+
+    assert_lexer(expected, code)
+
+    code = <<~'HEREDOC'
+      <<H1
+      #{<<H2}a
+      H2
+      b
+      c
+    HEREDOC
+
+    expected = [
+      [[1, 0], :on_heredoc_beg, "<<H1", state(:EXPR_BEG)],
+      [[1, 4], :on_nl, "\n", state(:EXPR_BEG)],
+      [[2, 0], :on_embexpr_beg, "\#{", state(:EXPR_BEG)],
+      [[2, 2], :on_heredoc_beg, "<<H2", state(:EXPR_BEG)],
+      [[2, 6], :on_embexpr_end, "}", state(:EXPR_END)],
+      [[2, 7], :on_tstring_content, "a\n", state(:EXPR_BEG)],
+      [[3, 0], :on_heredoc_end, "H2\n", state(:EXPR_BEG)],
+      [[4, 0], :on_tstring_content, "b\nc\n", state(:EXPR_BEG)]
+    ]
+
+    assert_lexer(expected, code)
+  end
+
+  def test_invalid_escape_ctrl_mbchar
+    code = %["\\C-\u{3042}"]
+    expected = [
+      [[1, 0], :on_tstring_beg, '"', state(:EXPR_BEG)],
+      [[1, 1], :on_tstring_content, "\\C-\u{3042}", state(:EXPR_BEG)],
+      [[1, 7], :on_tstring_end, '"', state(:EXPR_END)],
+    ]
+
+    assert_lexer(expected, code)
+
+    code = %["\\C-\\\u{3042}"]
+    expected = [
+      [[1, 0], :on_tstring_beg, '"', state(:EXPR_BEG)],
+      [[1, 1], :on_tstring_content, "\\C-\\\u{3042}", state(:EXPR_BEG)],
+      [[1, 8], :on_tstring_end, '"', state(:EXPR_END)],
+    ]
+
+    assert_lexer(expected, code)
+  end
+
+  def test_invalid_escape_meta_mbchar
+    code = %["\\M-\u{3042}"]
+    expected = [
+      [[1, 0], :on_tstring_beg, '"', state(:EXPR_BEG)],
+      [[1, 1], :on_tstring_content, "\\M-\u{3042}", state(:EXPR_BEG)],
+      [[1, 7], :on_tstring_end, '"', state(:EXPR_END)],
+    ]
+
+    assert_lexer(expected, code)
+
+    code = %["\\M-\\\u{3042}"]
+    expected = [
+      [[1, 0], :on_tstring_beg, '"', state(:EXPR_BEG)],
+      [[1, 1], :on_tstring_content, "\\M-\\\u{3042}", state(:EXPR_BEG)],
+      [[1, 8], :on_tstring_end, '"', state(:EXPR_END)],
+    ]
+
+    assert_lexer(expected, code)
+  end
+
+  def test_invalid_escape_meta_ctrl_mbchar
+    code = %["\\M-\\C-\u{3042}"]
+    expected = [
+      [[1, 0], :on_tstring_beg, '"', state(:EXPR_BEG)],
+      [[1, 1], :on_tstring_content, "\\M-\\C-\u{3042}", state(:EXPR_BEG)],
+      [[1, 10], :on_tstring_end, '"', state(:EXPR_END)],
+    ]
+
+    assert_lexer(expected, code)
+
+    code = %["\\M-\\C-\\\u{3042}"]
+    expected = [
+      [[1, 0], :on_tstring_beg, '"', state(:EXPR_BEG)],
+      [[1, 1], :on_tstring_content, "\\M-\\C-\\\u{3042}", state(:EXPR_BEG)],
+      [[1, 11], :on_tstring_end, '"', state(:EXPR_END)],
+    ]
+
+    assert_lexer(expected, code)
+  end
+
+  def test_invalid_escape_ctrl_meta_mbchar
+    code = %["\\C-\\M-\u{3042}"]
+    expected = [
+      [[1, 0], :on_tstring_beg, '"', state(:EXPR_BEG)],
+      [[1, 1], :on_tstring_content, "\\C-\\M-\u{3042}", state(:EXPR_BEG)],
+      [[1, 10], :on_tstring_end, '"', state(:EXPR_END)],
+    ]
+
+    assert_lexer(expected, code)
+
+    code = %["\\C-\\M-\\\u{3042}"]
+    expected = [
+      [[1, 0], :on_tstring_beg, '"', state(:EXPR_BEG)],
+      [[1, 1], :on_tstring_content, "\\C-\\M-\\\u{3042}", state(:EXPR_BEG)],
+      [[1, 11], :on_tstring_end, '"', state(:EXPR_END)],
+    ]
+
+    assert_lexer(expected, code)
+  end
+
+  def test_invalid_escape_string
+    code = "\"hello\\x world"
+    expected = [
+      [[1, 0], :on_tstring_beg, "\"", state(:EXPR_BEG)],
+      [[1, 1], :on_tstring_content, "hello", state(:EXPR_BEG)],
+      [[1, 5], :on_tstring_content, "\\x", state(:EXPR_BEG)],
+      [[1, 7], :on_tstring_content, " world", state(:EXPR_BEG)],
+    ]
+
+    code = "\"\nhello\\x world"
+    expected = [
+      [[1, 0], :on_tstring_beg, "\"", state(:EXPR_BEG)],
+      [[1, 1], :on_tstring_content, "\n" "hello", state(:EXPR_BEG)],
+      [[2, 5], :on_tstring_content, "\\x", state(:EXPR_BEG)],
+      [[2, 7], :on_tstring_content, " world", state(:EXPR_BEG)],
+    ]
+    assert_lexer(expected, code)
+
+    code = "\"\n\\Cxx\""
+    expected = [
+      [[1, 0], :on_tstring_beg, "\"", state(:EXPR_BEG)],
+      [[1, 1], :on_tstring_content, "\n", state(:EXPR_BEG)],
+      [[2, 0], :on_tstring_content, "\\Cx", state(:EXPR_BEG)],
+      [[2, 3], :on_tstring_content, "x", state(:EXPR_BEG)],
+      [[2, 4], :on_tstring_end, "\"", state(:EXPR_END)],
+    ]
+    assert_lexer(expected, code)
+
+    code = "\"\n\\Mxx\""
+    expected = [
+      [[1, 0], :on_tstring_beg, "\"", state(:EXPR_BEG)],
+      [[1, 1], :on_tstring_content, "\n", state(:EXPR_BEG)],
+      [[2, 0], :on_tstring_content, "\\Mx", state(:EXPR_BEG)],
+      [[2, 3], :on_tstring_content, "x", state(:EXPR_BEG)],
+      [[2, 4], :on_tstring_end, "\"", state(:EXPR_END)],
+    ]
+    assert_lexer(expected, code)
+
+    code = "\"\n\\c\\cx\""
+    expected = [
+      [[1, 0], :on_tstring_beg, "\"", state(:EXPR_BEG)],
+      [[1, 1], :on_tstring_content, "\n", state(:EXPR_BEG)],
+      [[2, 0], :on_tstring_content, "\\c\\c", state(:EXPR_BEG)],
+      [[2, 4], :on_tstring_content, "x", state(:EXPR_BEG)],
+      [[2, 5], :on_tstring_end, "\"", state(:EXPR_END)],
+    ]
+    assert_lexer(expected, code)
+
+    code = "\"\n\\ux\""
+    expected = [
+      [[1, 0], :on_tstring_beg, "\"", state(:EXPR_BEG)],
+      [[1, 1], :on_tstring_content, "\n", state(:EXPR_BEG)],
+      [[2, 0], :on_tstring_content, "\\u", state(:EXPR_BEG)],
+      [[2, 2], :on_tstring_content, "x", state(:EXPR_BEG)],
+      [[2, 3], :on_tstring_end, "\"", state(:EXPR_END)],
+    ]
+    assert_lexer(expected, code)
+
+    code = "\"\n\\xx\""
+    expected = [
+      [[1, 0], :on_tstring_beg, "\"", state(:EXPR_BEG)],
+      [[1, 1], :on_tstring_content, "\n", state(:EXPR_BEG)],
+      [[2, 0], :on_tstring_content, "\\x", state(:EXPR_BEG)],
+      [[2, 2], :on_tstring_content, "x", state(:EXPR_BEG)],
+      [[2, 3], :on_tstring_end, "\"", state(:EXPR_END)],
+    ]
+    assert_lexer(expected, code)
+
+    code = "<<A\n\n\\xyz"
+    expected = [
+      [[1, 0], :on_heredoc_beg, "<<A", state(:EXPR_BEG)],
+      [[1, 3], :on_nl, "\n", state(:EXPR_BEG)],
+      [[2, 0], :on_tstring_content, "\n", state(:EXPR_BEG)],
+      [[3, 0], :on_tstring_content, "\\x", state(:EXPR_BEG)],
+      [[3, 2], :on_tstring_content, "yz", state(:EXPR_BEG)],
+    ]
+    assert_lexer(expected, code)
+
+    code = "%(\n\\xyz)"
+    expected = [
+      [[1, 0], :on_tstring_beg, "%(", state(:EXPR_BEG)],
+      [[1, 2], :on_tstring_content, "\n", state(:EXPR_BEG)],
+      [[2, 0], :on_tstring_content, "\\x", state(:EXPR_BEG)],
+      [[2, 2], :on_tstring_content, "yz", state(:EXPR_BEG)],
+      [[2, 4], :on_tstring_end, ")", state(:EXPR_END)],
+    ]
+    assert_lexer(expected, code)
+
+    code = "%Q(\n\\xyz)"
+    expected = [
+      [[1, 0], :on_tstring_beg, "%Q(", state(:EXPR_BEG)],
+      [[1, 3], :on_tstring_content, "\n", state(:EXPR_BEG)],
+      [[2, 0], :on_tstring_content, "\\x", state(:EXPR_BEG)],
+      [[2, 2], :on_tstring_content, "yz", state(:EXPR_BEG)],
+      [[2, 4], :on_tstring_end, ")", state(:EXPR_END)],
+    ]
+    assert_lexer(expected, code)
+
+    code = ":\"\n\\xyz\""
+    expected = [
+      [[1, 0], :on_symbeg, ":\"", state(:EXPR_FNAME)],
+      [[1, 2], :on_tstring_content, "\n", state(:EXPR_FNAME)],
+      [[2, 0], :on_tstring_content, "\\x", state(:EXPR_FNAME)],
+      [[2, 2], :on_tstring_content, "yz", state(:EXPR_FNAME)],
+      [[2, 4], :on_tstring_end, "\"", state(:EXPR_END)],
+    ]
+    assert_lexer(expected, code)
+  end
+
+  def test_spaces_at_eof
+    code = "1\n\t \t"
+    expected = [
+      [[1, 0], :on_int, "1", state(:EXPR_END)],
+      [[1, 1], :on_nl, "\n", state(:EXPR_BEG)],
+      [[2, 0], :on_sp, "\t \t", state(:EXPR_END)],
+    ]
+    assert_lexer(expected, code)
+  end
+
+  def assert_lexer(expected, code)
+    assert_equal(code, Ripper.tokenize(code).join(""))
+    assert_equal(expected, result = Ripper.lex(code),
+                 proc {expected.zip(result) {|e, r| break diff(e, r) unless e == r}})
+  end
 end
diff --git a/test/ripper/test_parser_events.rb b/test/ripper/test_parser_events.rb
index 39dfac6da00f8a..aa7434c083f2a2 100644
--- a/test/ripper/test_parser_events.rb
+++ b/test/ripper/test_parser_events.rb
@@ -16,7 +16,7 @@ def test_event_coverage
   end
 
   def parse(str, nm = nil, &bl)
-    dp = DummyParser.new(str)
+    dp = TestRipper::DummyParser.new(str)
     dp.hook(*nm, &bl) if nm
     dp.parse.to_s
   end
@@ -267,17 +267,29 @@ def test_assign_error
   end
 
   def test_assign_error_backref
-    thru_assign_error = false
+    errors = []
     result =
-      parse('$` = 1', :on_assign_error) {thru_assign_error = true}
-    assert_equal true, thru_assign_error
-    assert_equal '[assign(assign_error(var_field($`)),1)]', result
+      parse('$& = 1', %i[on_assign_error compile_error]) {|e, *| errors << e}
+    assert_equal %i[on_assign_error], errors
+    assert_equal '[assign(assign_error(var_field($&)),1)]', result
 
-    thru_assign_error = false
+    errors = []
     result =
-      parse('$`, _ = 1', :on_assign_error) {thru_assign_error = true}
-    assert_equal true, thru_assign_error
-    assert_equal '[massign([assign_error(var_field($`)),var_field(_)],1)]', result
+      parse('$&, _ = 1', %i[on_assign_error compile_error]) {|e, *| errors << e}
+    assert_equal %i[on_assign_error], errors
+    assert_equal '[massign([assign_error(var_field($&)),var_field(_)],1)]', result
+
+    errors = []
+    result =
+      parse('$& += 1', %i[on_assign_error compile_error]) {|e, *| errors << e}
+    assert_equal %i[on_assign_error], errors
+    assert_equal '[assign_error(opassign(var_field($&),+=,1))]', result
+
+    errors = []
+    result =
+      parse('$& += cmd 1, 2', %i[on_assign_error compile_error]) {|e, *| errors << e}
+    assert_equal %i[on_assign_error], errors
+    assert_equal '[assign_error(opassign(var_field($&),+=,command(cmd,[1,2])))]', result
   end
 
   def test_assign_error_const_qualified
@@ -513,7 +525,7 @@ def on_ident(name)
       end
     end
 
-    parser = DummyParser.new("a::b").extend(hook)
+    parser = TestRipper::DummyParser.new("a::b").extend(hook)
     assert_equal '[call(vcall((ident: "a")),(method: (op: "::")),(ident: "b"))]', parser.parse.to_s
   end
 
@@ -1644,20 +1656,20 @@ def test_unterminated_regexp
   end
 
   def test_invalid_instance_variable_name
-    assert_equal("`@1' is not allowed as an instance variable name", compile_error('proc{@1}'))
-    assert_equal("`@' without identifiers is not allowed as an instance variable name", compile_error('@%'))
-    assert_equal("`@' without identifiers is not allowed as an instance variable name", compile_error('@'))
+    assert_equal("'@1' is not allowed as an instance variable name", compile_error('proc{@1}'))
+    assert_equal("'@' without identifiers is not allowed as an instance variable name", compile_error('@%'))
+    assert_equal("'@' without identifiers is not allowed as an instance variable name", compile_error('@'))
   end
 
   def test_invalid_class_variable_name
-    assert_equal("`@@1' is not allowed as a class variable name", compile_error('@@1'))
-    assert_equal("`@@' without identifiers is not allowed as a class variable name", compile_error('@@%'))
-    assert_equal("`@@' without identifiers is not allowed as a class variable name", compile_error('@@'))
+    assert_equal("'@@1' is not allowed as a class variable name", compile_error('@@1'))
+    assert_equal("'@@' without identifiers is not allowed as a class variable name", compile_error('@@%'))
+    assert_equal("'@@' without identifiers is not allowed as a class variable name", compile_error('@@'))
   end
 
   def test_invalid_global_variable_name
-    assert_equal("`$%' is not allowed as a global variable name", compile_error('$%'))
-    assert_equal("`$' without identifiers is not allowed as a global variable name", compile_error('$'))
+    assert_equal("'$%' is not allowed as a global variable name", compile_error('$%'))
+    assert_equal("'$' without identifiers is not allowed as a global variable name", compile_error('$'))
   end
 
   def test_warning_ignored_magic_comment
@@ -1672,6 +1684,26 @@ def test_warning_invalid_magic_comment
     assert_equal(%w"frozen_string_literal nottrue", args)
   end
 
+  def test_warning_duplicated_when_clause
+    fmt, *args = warning(<<~STR)
+      a = 1
+      case a
+      when 1
+      when 1
+      when 2
+      else
+      end
+    STR
+    assert_match(/duplicates 'when' clause/, fmt)
+    assert_equal([4, 3], args)
+  end
+
+  def test_warn_duplicated_hash_keys
+    fmt, *args = warn("{ a: 1, a: 2 }")
+    assert_match(/is duplicated and overwritten on line/, fmt)
+    assert_equal([:a, 1], args)
+  end
+
   def test_warn_cr_in_middle
     fmt = nil
     assert_warn("") {fmt, = warn("\r;")}
@@ -1711,4 +1743,69 @@ def test_hshptn
     parse('case 0; in {a:}; end', :on_hshptn) {thru_hshptn = true}
     assert_equal true, thru_hshptn
   end
+
+  def test_return_out_of_compile_error_no_memory_leak
+    assert_no_memory_leak(%w(-rripper), "#{<<~'begin;'}", "#{<<~'end;'}", rss: true)
+      class MyRipper < Ripper
+        def initialize(src, &blk)
+          super(src)
+          @blk = blk
+        end
+
+        def compile_error(msg) = @blk.call(msg)
+      end
+
+      def call_parse = MyRipper.new("/") { |msg| return msg }.parse
+
+      # Check that call_parse does return a syntax error
+      raise "call_parse should return a syntax error" unless call_parse
+    begin;
+      100_000.times do
+        call_parse
+      end
+    end;
+  end
+
+  def test_return_out_of_warn_no_memory_leak
+    assert_no_memory_leak(%w(-rripper), "#{<<~'begin;'}", "#{<<~'end;'}", rss: true)
+      class MyRipper < Ripper
+        def initialize(src, &blk)
+          super(src)
+          @blk = blk
+        end
+
+        def warn(msg, *args) = @blk.call(msg)
+      end
+
+      def call_parse = MyRipper.new("{ a: 1, a: 2 }") { |msg| return msg }.parse
+
+      # Check that call_parse does warn
+      raise "call_parse should warn" unless call_parse
+    begin;
+      500_000.times do
+        call_parse
+      end
+    end;
+
+    assert_no_memory_leak(%w(-rripper), "#{<<~'begin;'}", "#{<<~'end;'}", rss: true)
+      class MyRipper < Ripper
+        def initialize(src, &blk)
+          super(src)
+          @blk = blk
+        end
+
+        def warn(msg, *args) = @blk.call(msg)
+      end
+
+      $VERBOSE = true
+      def call_parse = MyRipper.new("if true\n  end\n") { |msg| return msg }.parse
+
+      # Check that call_parse does warn
+      raise "call_parse should warn" unless call_parse
+    begin;
+      1_000_000.times do
+        call_parse
+      end
+    end;
+  end
 end if ripper_test
diff --git a/test/ripper/test_ripper.rb b/test/ripper/test_ripper.rb
index 9adfd97dfdd52c..2b3421d8270a8a 100644
--- a/test/ripper/test_ripper.rb
+++ b/test/ripper/test_ripper.rb
@@ -88,7 +88,7 @@ def test_yydebug_string
     ripper.yydebug = true
     ripper.debug_output = out
     ripper.parse
-    assert_include out.string[/.*"literal content".*/], 'woot'
+    assert_include out.string[/.*"literal content".*/], '1.1-1.5'
   end
 
   def test_regexp_with_option
@@ -148,6 +148,25 @@ def test_dedent_string
     assert_nothing_raised { Ripper.lex src }
   end
 
+  def test_assignable_in_regexp
+    assert_separately(%w(-rripper), "", "#{<<~"begin;"}\n#{<<~'end;'}")
+    begin;
+      assert_nil(Ripper.parse('/(?<_1>)/ =~ s'))
+    end;
+  end
+
+  def test_invalid_multibyte_character_in_regexp
+    lex = Ripper::Lexer.new(%q[/#{"\xcd"}/]).scan.map(&:to_a)
+    assert_equal([[1, 0], :on_regexp_beg, "/", state(:EXPR_BEG)], lex.shift)
+    assert_equal([[1, 1], :on_embexpr_beg, "\#{", state(:EXPR_BEG)], lex.shift)
+    assert_equal([[1, 3], :on_tstring_beg, "\"", state(:EXPR_BEG)], lex.shift)
+    assert_equal([[1, 4], :on_tstring_content, "\\xcd", state(:EXPR_BEG)], lex.shift)
+    assert_equal([[1, 8], :on_tstring_end, "\"", state(:EXPR_END)], lex.shift)
+    assert_equal([[1, 9], :on_embexpr_end, "}", state(:EXPR_END)], lex.shift)
+    assert_equal([[1, 10], :on_regexp_end, "/", state(:EXPR_BEG)], lex.shift)
+    assert_empty(lex)
+  end
+
   def test_no_memory_leak
     assert_no_memory_leak(%w(-rripper), "", "#{<<~'end;'}", rss: true)
       2_000_000.times do
@@ -168,6 +187,21 @@ def test_no_memory_leak
         Ripper.parse("-> {")
       end
     end;
+
+    # [Bug #21004]
+    assert_no_memory_leak(%w(-rripper), "", <<~RUBY, rss: true)
+      1_000_000.times do
+        Ripper.parse("-> do it end")
+      end
+    RUBY
+  end
+
+  def test_sexp_no_memory_leak
+    assert_no_memory_leak(%w(-rripper), "", "#{<<~'end;'}", rss: true)
+      1_000_000.times do
+        Ripper.sexp("")
+      end
+    end;
   end
 
   class TestInput < self
@@ -187,4 +221,7 @@ def test_invalid_gets
     end
   end
 
+  def state(name)
+    Ripper::Lexer::State.new(Ripper.const_get(name))
+  end
 end if ripper_test
diff --git a/test/ripper/test_scanner_events.rb b/test/ripper/test_scanner_events.rb
index 8434cc9c405dcb..ed291c4384ed4b 100644
--- a/test/ripper/test_scanner_events.rb
+++ b/test/ripper/test_scanner_events.rb
@@ -53,6 +53,8 @@ def test_tokenize
                  Ripper.tokenize("1  .foo\n")
     assert_equal ["1", "\n", "  ", ".", "foo", "\n"],
                  Ripper.tokenize("1\n  .foo\n")
+    assert_equal ["def", " ", "f", ";", " ", "(", "x", ")", "::", "A", " ", "="],
+                 Ripper.tokenize("def f; (x)::A =")
   end
 
   def test_lex
@@ -949,6 +951,10 @@ def test_CHAR
     assert_equal ["?\\u{41}"],
                  scan('CHAR', "?\\u{41}")
 
+    err = nil
+    assert_equal [], scan('CHAR', '?\\') {|*e| err = e}
+    assert_equal([:on_parse_error, "Invalid escape character syntax", "?\\"], err)
+
     err = nil
     assert_equal [], scan('CHAR', '?\\M ') {|*e| err = e}
     assert_equal([:on_parse_error, "Invalid escape character syntax", "?\\M "], err)
@@ -991,13 +997,21 @@ def test_invalid_char
     assert_equal("\e", err[2])
   end
 
-  def test_invalid_hex_escape
+  def test_invalid_escape
+    err = nil
+    assert_equal ["\\C-\u{3042}"], scan('tstring_content', %["\\C-\u{3042}"]) {|*e| err = e}
+    assert_equal [:on_parse_error, "Invalid escape character syntax", "\\C-\u{3042}"], err
+  end
+
+  def test_invalid_hex_escape_string
     err = nil
-    assert_equal ['U'], scan('tstring_content', '"\\xU"') {|*e| err = e}
+    assert_equal ['\\x', 'U'], scan('tstring_content', '"\\xU"') {|*e| err = e}
     assert_equal [:on_parse_error, "invalid hex escape", "\\x"], err
+  end
 
+  def test_invalid_hex_escape_regexp
     err = nil
-    assert_equal ['U'], scan('tstring_content', '/\\xU/') {|*e| err = e}
+    assert_equal ['\\x', 'U'], scan('tstring_content', '/\\xU/') {|*e| err = e}
     assert_equal [:on_parse_error, "invalid hex escape", "\\x"], err
   end
 
diff --git a/test/ripper/test_sexp.rb b/test/ripper/test_sexp.rb
index a1cf5e4f0ade50..3ebcf3062ee243 100644
--- a/test/ripper/test_sexp.rb
+++ b/test/ripper/test_sexp.rb
@@ -18,6 +18,11 @@ def test_compile_error
     assert_nil Ripper.sexp("/*")
     assert_nil Ripper.sexp("/*/")
     assert_nil Ripper.sexp("/+/")
+    assert_nil Ripper.sexp("m(&nil) {}"), '[Bug #10436]'
+    assert_nil Ripper.sexp("/(?<a>)/ =~ ''; x = a **a, **a if false"), '[Bug #18988]'
+    assert_nil Ripper.sexp("return + return"), '[Bug #20055]'
+    assert_nil Ripper.sexp("1 in [a, a]"), '[Bug #20055]'
+    assert_nil Ripper.sexp("1 + (1 => [a, a])"), '[Bug #20055]'
   end
 
   def test_regexp_content
@@ -34,6 +39,14 @@ def test_regexp_content
     assert_equal '(?<n>a(b|\g<n>))', search_sexp(:@tstring_content, search_sexp(:regexp_literal, sexp))[1]
   end
 
+  def test_regexp_named_capture
+    sexp = Ripper.sexp("/(?<a>)/ =~ ''; x = a **a, a if false")
+    assert_not_nil sexp, '[Bug #18988]'
+
+    sexp = Ripper.sexp("/(?<a>)/ =~ ''; a %(exit)")
+    assert_equal 'exit', search_sexp(:@ident, search_sexp(:paren, sexp))[1], '[Bug #18988]'
+  end
+
   def test_heredoc_content
     sexp = Ripper.sexp("<<E\nfoo\nE")
     assert_equal "foo\n", search_sexp(:@tstring_content, sexp)[1]
@@ -110,6 +123,21 @@ def test_named_with_default
     assert_equal(exp, named)
   end
 
+  def test_command
+    sexp = Ripper.sexp("a::C {}")
+    assert_equal(
+      [:program,
+        [
+          [:method_add_block,
+            [:command_call,
+              [:vcall, [:@ident, "a", [1, 0]]],
+              [:@op, "::", [1, 1]],
+              [:@const, "C", [1, 3]],
+              nil],
+          [:brace_block, nil, [[:void_stmt]]]]]],
+      sexp)
+  end
+
   def search_sexp(sym, sexp)
     return sexp if !sexp or sexp[0] == sym
     sexp.find do |e|
diff --git a/test/ruby/enc/test_case_comprehensive.rb b/test/ruby/enc/test_case_comprehensive.rb
index de18ac865c1df3..b812b88b832be2 100644
--- a/test/ruby/enc/test_case_comprehensive.rb
+++ b/test/ruby/enc/test_case_comprehensive.rb
@@ -161,15 +161,14 @@ def self.generate_unicode_case_mapping_tests(encoding)
     end
   end
 
-  def self.generate_case_mapping_tests(encoding)
+  def self.generate_single_byte_case_mapping_tests(encoding)
     all_tests
-    # preselect codepoints to speed up testing for small encodings
-    codepoints = @@codepoints.select do |code|
+    # precalculate codepoints to speed up testing for small encodings
+    codepoints = []
+    (0..255).each do |cp|
       begin
-        code.encode(encoding)
-        true
-      rescue Encoding::UndefinedConversionError
-        false
+        codepoints << cp.chr(encoding).encode('UTF-8')
+      rescue Encoding::UndefinedConversionError, RangeError
       end
     end
     all_tests.each do |test|
@@ -264,23 +263,23 @@ def self.generate_ascii_only_case_mapping_tests(encoding)
     end
   end
 
-  generate_case_mapping_tests 'US-ASCII'
-  generate_case_mapping_tests 'ASCII-8BIT'
-  generate_case_mapping_tests 'ISO-8859-1'
-  generate_case_mapping_tests 'ISO-8859-2'
-  generate_case_mapping_tests 'ISO-8859-3'
-  generate_case_mapping_tests 'ISO-8859-4'
-  generate_case_mapping_tests 'ISO-8859-5'
-  generate_case_mapping_tests 'ISO-8859-6'
-  generate_case_mapping_tests 'ISO-8859-7'
-  generate_case_mapping_tests 'ISO-8859-8'
-  generate_case_mapping_tests 'ISO-8859-9'
-  generate_case_mapping_tests 'ISO-8859-10'
-  generate_case_mapping_tests 'ISO-8859-11'
-  generate_case_mapping_tests 'ISO-8859-13'
-  generate_case_mapping_tests 'ISO-8859-14'
-  generate_case_mapping_tests 'ISO-8859-15'
-  generate_case_mapping_tests 'ISO-8859-16'
+  generate_single_byte_case_mapping_tests 'US-ASCII'
+  generate_single_byte_case_mapping_tests 'ASCII-8BIT'
+  generate_single_byte_case_mapping_tests 'ISO-8859-1'
+  generate_single_byte_case_mapping_tests 'ISO-8859-2'
+  generate_single_byte_case_mapping_tests 'ISO-8859-3'
+  generate_single_byte_case_mapping_tests 'ISO-8859-4'
+  generate_single_byte_case_mapping_tests 'ISO-8859-5'
+  generate_single_byte_case_mapping_tests 'ISO-8859-6'
+  generate_single_byte_case_mapping_tests 'ISO-8859-7'
+  generate_single_byte_case_mapping_tests 'ISO-8859-8'
+  generate_single_byte_case_mapping_tests 'ISO-8859-9'
+  generate_single_byte_case_mapping_tests 'ISO-8859-10'
+  generate_single_byte_case_mapping_tests 'ISO-8859-11'
+  generate_single_byte_case_mapping_tests 'ISO-8859-13'
+  generate_single_byte_case_mapping_tests 'ISO-8859-14'
+  generate_single_byte_case_mapping_tests 'ISO-8859-15'
+  generate_single_byte_case_mapping_tests 'ISO-8859-16'
   generate_ascii_only_case_mapping_tests 'KOI8-R'
   generate_ascii_only_case_mapping_tests 'KOI8-U'
   generate_ascii_only_case_mapping_tests 'Big5'
@@ -291,14 +290,14 @@ def self.generate_ascii_only_case_mapping_tests(encoding)
   generate_ascii_only_case_mapping_tests 'GBK'
   generate_ascii_only_case_mapping_tests 'Shift_JIS'
   generate_ascii_only_case_mapping_tests 'Windows-31J'
-  generate_case_mapping_tests 'Windows-1250'
-  generate_case_mapping_tests 'Windows-1251'
-  generate_case_mapping_tests 'Windows-1252'
-  generate_case_mapping_tests 'Windows-1253'
-  generate_case_mapping_tests 'Windows-1254'
-  generate_case_mapping_tests 'Windows-1255'
+  generate_single_byte_case_mapping_tests 'Windows-1250'
+  generate_single_byte_case_mapping_tests 'Windows-1251'
+  generate_single_byte_case_mapping_tests 'Windows-1252'
+  generate_single_byte_case_mapping_tests 'Windows-1253'
+  generate_single_byte_case_mapping_tests 'Windows-1254'
+  generate_single_byte_case_mapping_tests 'Windows-1255'
   generate_ascii_only_case_mapping_tests 'Windows-1256'
-  generate_case_mapping_tests 'Windows-1257'
+  generate_single_byte_case_mapping_tests 'Windows-1257'
   generate_unicode_case_mapping_tests 'UTF-8'
   generate_unicode_case_mapping_tests 'UTF-16BE'
   generate_unicode_case_mapping_tests 'UTF-16LE'
diff --git a/test/ruby/enc/test_case_mapping.rb b/test/ruby/enc/test_case_mapping.rb
index 31acdc4331c3e6..a7d1ed0d1663f8 100644
--- a/test/ruby/enc/test_case_mapping.rb
+++ b/test/ruby/enc/test_case_mapping.rb
@@ -47,7 +47,7 @@ def check_capitalize_suffixes(lower, upper)
   # different properties; careful: roundtrip isn't always guaranteed
   def check_swapcase_properties(expected, start, *flags)
     assert_equal expected, start.swapcase(*flags)
-    temp = start
+    temp = +start
     assert_equal expected, temp.swapcase!(*flags)
     assert_equal start, start.swapcase(*flags).swapcase(*flags)
     assert_equal expected, expected.swapcase(*flags).swapcase(*flags)
@@ -61,10 +61,10 @@ def test_ascii
   end
 
   def test_invalid
-    assert_raise(ArgumentError, "Should not be possible to upcase invalid string.") { "\xEB".force_encoding('UTF-8').upcase }
-    assert_raise(ArgumentError, "Should not be possible to downcase invalid string.") { "\xEB".force_encoding('UTF-8').downcase }
-    assert_raise(ArgumentError, "Should not be possible to capitalize invalid string.") { "\xEB".force_encoding('UTF-8').capitalize }
-    assert_raise(ArgumentError, "Should not be possible to swapcase invalid string.") { "\xEB".force_encoding('UTF-8').swapcase }
+    assert_raise(ArgumentError, "Should not be possible to upcase invalid string.") { "\xEB".dup.force_encoding('UTF-8').upcase }
+    assert_raise(ArgumentError, "Should not be possible to downcase invalid string.") { "\xEB".dup.force_encoding('UTF-8').downcase }
+    assert_raise(ArgumentError, "Should not be possible to capitalize invalid string.") { "\xEB".dup.force_encoding('UTF-8').capitalize }
+    assert_raise(ArgumentError, "Should not be possible to swapcase invalid string.") { "\xEB".dup.force_encoding('UTF-8').swapcase }
   end
 
   def test_general
diff --git a/test/ruby/enc/test_case_options.rb b/test/ruby/enc/test_case_options.rb
index e9bf50fcfcb603..e9c81d804eaa38 100644
--- a/test/ruby/enc/test_case_options.rb
+++ b/test/ruby/enc/test_case_options.rb
@@ -19,7 +19,7 @@ def assert_raise_bang_operations(arg, *options)
 
   def assert_raise_both_types(*options)
     assert_raise_functional_operations 'a', *options
-    assert_raise_bang_operations 'a', *options
+    assert_raise_bang_operations(+'a', *options)
     assert_raise_functional_operations :a, *options
   end
 
@@ -51,7 +51,7 @@ def assert_okay_bang_operations(arg, *options)
 
   def assert_okay_both_types(*options)
     assert_okay_functional_operations 'a', *options
-    assert_okay_bang_operations 'a', *options
+    assert_okay_bang_operations(+'a', *options)
     assert_okay_functional_operations :a, *options
   end
 
@@ -69,10 +69,10 @@ def test_operation_specific   # :fold option only allowed on downcase
     assert_raise(ArgumentError) { 'a'.upcase :fold }
     assert_raise(ArgumentError) { 'a'.capitalize :fold }
     assert_raise(ArgumentError) { 'a'.swapcase :fold }
-    assert_nothing_raised { 'a'.downcase! :fold }
-    assert_raise(ArgumentError) { 'a'.upcase! :fold }
-    assert_raise(ArgumentError) { 'a'.capitalize! :fold }
-    assert_raise(ArgumentError) { 'a'.swapcase! :fold }
+    assert_nothing_raised { 'a'.dup.downcase! :fold }
+    assert_raise(ArgumentError) { 'a'.dup.upcase! :fold }
+    assert_raise(ArgumentError) { 'a'.dup.capitalize! :fold }
+    assert_raise(ArgumentError) { 'a'.dup.swapcase! :fold }
     assert_nothing_raised { :a.downcase :fold }
     assert_raise(ArgumentError) { :a.upcase :fold }
     assert_raise(ArgumentError) { :a.capitalize :fold }
diff --git a/test/ruby/namespace/a.1_1_0.rb b/test/ruby/namespace/a.1_1_0.rb
new file mode 100644
index 00000000000000..bf64dbaa62264c
--- /dev/null
+++ b/test/ruby/namespace/a.1_1_0.rb
@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+class NS_A
+  VERSION = "1.1.0"
+
+  def yay
+    "yay #{VERSION}"
+  end
+end
+
+module NS_B
+  VERSION = "1.1.0"
+
+  def self.yay
+    "yay_b1"
+  end
+end
diff --git a/test/ruby/namespace/a.1_2_0.rb b/test/ruby/namespace/a.1_2_0.rb
new file mode 100644
index 00000000000000..6d25c0885dc2eb
--- /dev/null
+++ b/test/ruby/namespace/a.1_2_0.rb
@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+class NS_A
+  VERSION = "1.2.0"
+
+  def yay
+    "yay #{VERSION}"
+  end
+end
+
+module NS_B
+  VERSION = "1.2.0"
+
+  def self.yay
+    "yay_b1"
+  end
+end
diff --git a/test/ruby/namespace/a.rb b/test/ruby/namespace/a.rb
new file mode 100644
index 00000000000000..a6dcd9cd21ce25
--- /dev/null
+++ b/test/ruby/namespace/a.rb
@@ -0,0 +1,15 @@
+class NS_A
+  FOO = "foo_a1"
+
+  def yay
+    "yay_a1"
+  end
+end
+
+module NS_B
+  BAR = "bar_b1"
+
+  def self.yay
+    "yay_b1"
+  end
+end
diff --git a/test/ruby/namespace/autoloading.rb b/test/ruby/namespace/autoloading.rb
new file mode 100644
index 00000000000000..19ec00bcd5a15d
--- /dev/null
+++ b/test/ruby/namespace/autoloading.rb
@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+autoload :NS_A, File.join(__dir__, 'a.1_1_0')
+NS_A.new.yay
+
+module NS_B
+  autoload :BAR, File.join(__dir__, 'a')
+end
diff --git a/test/ruby/namespace/blank.rb b/test/ruby/namespace/blank.rb
new file mode 100644
index 00000000000000..6d201b09669618
--- /dev/null
+++ b/test/ruby/namespace/blank.rb
@@ -0,0 +1,2 @@
+module Blank1
+end
diff --git a/test/ruby/namespace/blank1.rb b/test/ruby/namespace/blank1.rb
new file mode 100644
index 00000000000000..6d201b09669618
--- /dev/null
+++ b/test/ruby/namespace/blank1.rb
@@ -0,0 +1,2 @@
+module Blank1
+end
diff --git a/test/ruby/namespace/blank2.rb b/test/ruby/namespace/blank2.rb
new file mode 100644
index 00000000000000..ba38c1d6dbe942
--- /dev/null
+++ b/test/ruby/namespace/blank2.rb
@@ -0,0 +1,2 @@
+module Blank2
+end
diff --git a/test/ruby/namespace/call_proc.rb b/test/ruby/namespace/call_proc.rb
new file mode 100644
index 00000000000000..8acf538fc18628
--- /dev/null
+++ b/test/ruby/namespace/call_proc.rb
@@ -0,0 +1,5 @@
+module Bar
+  def self.caller(proc_value)
+    proc_value.call
+  end
+end
diff --git a/test/ruby/namespace/call_toplevel.rb b/test/ruby/namespace/call_toplevel.rb
new file mode 100644
index 00000000000000..c311a37028d349
--- /dev/null
+++ b/test/ruby/namespace/call_toplevel.rb
@@ -0,0 +1,8 @@
+foo
+
+#### TODO: this code should be valid, but can't be for now
+# module Foo
+#   def self.wow
+#     foo
+#   end
+# end
diff --git a/test/ruby/namespace/consts.rb b/test/ruby/namespace/consts.rb
new file mode 100644
index 00000000000000..44a383111b7685
--- /dev/null
+++ b/test/ruby/namespace/consts.rb
@@ -0,0 +1,147 @@
+class String
+  STR_CONST1 = 111
+  STR_CONST2 = 222
+  STR_CONST3 = 333
+end
+
+class String
+  STR_CONST1 = 112
+
+  def self.set0(val)
+    const_set(:STR_CONST0, val)
+  end
+
+  def self.remove0
+    remove_const(:STR_CONST0)
+  end
+
+  def refer0
+    STR_CONST0
+  end
+
+  def refer1
+    STR_CONST1
+  end
+
+  def refer2
+    STR_CONST2
+  end
+
+  def refer3
+    STR_CONST3
+  end
+end
+
+module ForConsts
+  CONST1 = 111
+end
+
+TOP_CONST = 10
+
+module ForConsts
+  CONST1 = 112
+  CONST2 = 222
+  CONST3 = 333
+
+  def self.refer_all
+    ForConsts::CONST1
+    ForConsts::CONST2
+    ForConsts::CONST3
+    String::STR_CONST1
+    String::STR_CONST2
+    String::STR_CONST3
+  end
+
+  def self.refer1
+    CONST1
+  end
+
+  def self.get1
+    const_get(:CONST1)
+  end
+
+  def self.refer2
+    CONST2
+  end
+
+  def self.get2
+    const_get(:CONST2)
+  end
+
+  def self.refer3
+    CONST3
+  end
+
+  def self.get3
+    const_get(:CONST3)
+  end
+
+  def self.refer_top_const
+    TOP_CONST
+  end
+
+  # for String
+  class Proxy
+    def call_str_refer0
+      String.new.refer0
+    end
+
+    def call_str_get0
+      String.const_get(:STR_CONST0)
+    end
+
+    def call_str_set0(val)
+      String.set0(val)
+    end
+
+    def call_str_remove0
+      String.remove0
+    end
+
+    def call_str_refer1
+      String.new.refer1
+    end
+
+    def call_str_get1
+      String.const_get(:STR_CONST1)
+    end
+
+    String::STR_CONST2 = 223
+
+    def call_str_refer2
+      String.new.refer2
+    end
+
+    def call_str_get2
+      String.const_get(:STR_CONST2)
+    end
+
+    def call_str_set3
+      String.const_set(:STR_CONST3, 334)
+    end
+
+    def call_str_refer3
+      String.new.refer3
+    end
+
+    def call_str_get3
+      String.const_get(:STR_CONST3)
+    end
+
+    # for Integer
+    Integer::INT_CONST1 = 1
+
+    def refer_int_const1
+      Integer::INT_CONST1
+    end
+  end
+end
+
+# should not raise errors
+ForConsts.refer_all
+String::STR_CONST1
+Integer::INT_CONST1
+
+# If we execute this sentence once, the constant value will be cached on ISeq inline constant cache.
+# And it changes the behavior of ForConsts.refer_consts_directly called from global.
+# ForConsts.refer_consts_directly # should not raise errors too
diff --git a/test/ruby/namespace/current.rb b/test/ruby/namespace/current.rb
new file mode 100644
index 00000000000000..4af9a92ddc5d5b
--- /dev/null
+++ b/test/ruby/namespace/current.rb
@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+$ns_in_ns = ::Namespace.current
+
+module CurrentNamespace
+  def self.in_require
+    $ns_in_ns
+  end
+
+  def self.in_method_call
+    ::Namespace.current
+  end
+end
diff --git a/test/ruby/namespace/define_toplevel.rb b/test/ruby/namespace/define_toplevel.rb
new file mode 100644
index 00000000000000..aa77db3a135a20
--- /dev/null
+++ b/test/ruby/namespace/define_toplevel.rb
@@ -0,0 +1,5 @@
+def foo
+  "foooooooooo"
+end
+
+foo # should not raise errors
diff --git a/test/ruby/namespace/global_vars.rb b/test/ruby/namespace/global_vars.rb
new file mode 100644
index 00000000000000..3764eb0d19efc2
--- /dev/null
+++ b/test/ruby/namespace/global_vars.rb
@@ -0,0 +1,37 @@
+module LineSplitter
+  def self.read
+    $-0
+  end
+
+  def self.write(char)
+    $-0 = char
+  end
+end
+
+module FieldSplitter
+  def self.read
+    $,
+  end
+
+  def self.write(char)
+    $, = char
+  end
+end
+
+module UniqueGvar
+  def self.read
+    $used_only_in_ns
+  end
+
+  def self.write(val)
+    $used_only_in_ns = val
+  end
+
+  def self.write_only(val)
+    $write_only_var_in_ns = val
+  end
+
+  def self.gvars_in_ns
+    global_variables
+  end
+end
diff --git a/test/ruby/namespace/instance_variables.rb b/test/ruby/namespace/instance_variables.rb
new file mode 100644
index 00000000000000..1562ad5d450629
--- /dev/null
+++ b/test/ruby/namespace/instance_variables.rb
@@ -0,0 +1,21 @@
+class String
+  class << self
+    attr_reader :str_ivar1
+
+    def str_ivar2
+      @str_ivar2
+    end
+  end
+
+  @str_ivar1 = 111
+  @str_ivar2 = 222
+end
+
+class StringDelegator < BasicObject
+private
+  def method_missing(...)
+    ::String.public_send(...)
+  end
+end
+
+StringDelegatorObj = StringDelegator.new
diff --git a/test/ruby/namespace/line_splitter.rb b/test/ruby/namespace/line_splitter.rb
new file mode 100644
index 00000000000000..2596975ad7379c
--- /dev/null
+++ b/test/ruby/namespace/line_splitter.rb
@@ -0,0 +1,9 @@
+module LineSplitter
+  def self.read
+    $-0
+  end
+
+  def self.write(char)
+    $-0 = char
+  end
+end
diff --git a/test/ruby/namespace/load_path.rb b/test/ruby/namespace/load_path.rb
new file mode 100644
index 00000000000000..7e5a83ef96c0e0
--- /dev/null
+++ b/test/ruby/namespace/load_path.rb
@@ -0,0 +1,26 @@
+module LoadPathCheck
+  FIRST_LOAD_PATH = $LOAD_PATH.dup
+  FIRST_LOAD_PATH_RESPOND_TO_RESOLVE = $LOAD_PATH.respond_to?(:resolve_feature_path)
+  FIRST_LOADED_FEATURES = $LOADED_FEATURES.dup
+
+  HERE = File.dirname(__FILE__)
+
+  def self.current_load_path
+    $LOAD_PATH
+  end
+
+  def self.current_loaded_features
+    $LOADED_FEATURES
+  end
+
+  def self.require_blank1
+    $LOAD_PATH << HERE
+    require 'blank1'
+  end
+
+  def self.require_blank2
+    require 'blank2'
+  end
+end
+
+LoadPathCheck.require_blank1
diff --git a/test/ruby/namespace/ns.rb b/test/ruby/namespace/ns.rb
new file mode 100644
index 00000000000000..e947e3cdc830aa
--- /dev/null
+++ b/test/ruby/namespace/ns.rb
@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+NS1 = Namespace.new
+NS1.require_relative('a.1_1_0')
+
+def yay
+  NS1::NS_B::yay
+end
+
+yay
diff --git a/test/ruby/namespace/open_class_with_include.rb b/test/ruby/namespace/open_class_with_include.rb
new file mode 100644
index 00000000000000..ad8fd58ea03d08
--- /dev/null
+++ b/test/ruby/namespace/open_class_with_include.rb
@@ -0,0 +1,31 @@
+module StringExt
+  FOO = "foo 1"
+  def say_foo
+    "I'm saying " + FOO
+  end
+end
+
+class String
+  include StringExt
+  def say
+    say_foo
+  end
+end
+
+module OpenClassWithInclude
+  def self.say
+    String.new.say
+  end
+
+  def self.say_foo
+    String.new.say_foo
+  end
+
+  def self.say_with_obj(str)
+    str.say
+  end
+
+  def self.refer_foo
+    String::FOO
+  end
+end
diff --git a/test/ruby/namespace/proc_callee.rb b/test/ruby/namespace/proc_callee.rb
new file mode 100644
index 00000000000000..d30ab5d9f3b521
--- /dev/null
+++ b/test/ruby/namespace/proc_callee.rb
@@ -0,0 +1,14 @@
+module Target
+  def self.foo
+    "fooooo"
+  end
+end
+
+module Foo
+  def self.callee
+    lambda do
+      Target.foo
+    end
+  end
+end
+
diff --git a/test/ruby/namespace/proc_caller.rb b/test/ruby/namespace/proc_caller.rb
new file mode 100644
index 00000000000000..8acf538fc18628
--- /dev/null
+++ b/test/ruby/namespace/proc_caller.rb
@@ -0,0 +1,5 @@
+module Bar
+  def self.caller(proc_value)
+    proc_value.call
+  end
+end
diff --git a/test/ruby/namespace/procs.rb b/test/ruby/namespace/procs.rb
new file mode 100644
index 00000000000000..a7fe58ceb6ecc6
--- /dev/null
+++ b/test/ruby/namespace/procs.rb
@@ -0,0 +1,64 @@
+class String
+  FOO = "foo"
+  def yay
+    "yay"
+  end
+end
+
+module ProcLookupTestA
+  module B
+    VALUE = 222
+  end
+end
+
+module ProcInNS
+  def self.make_proc_from_block(&b)
+    b
+  end
+
+  def self.call_proc(proc_arg)
+    proc_arg.call
+  end
+
+  def self.make_str_proc(type)
+    case type
+    when :proc_new then Proc.new { String.new.yay }
+    when :proc_f   then proc { String.new.yay }
+    when :lambda_f then lambda { String.new.yay }
+    when :lambda_l then ->(){ String.new.yay }
+    when :block    then make_proc_from_block { String.new.yay }
+    else
+      raise "invalid type :#{type}"
+    end
+  end
+
+  def self.make_const_proc(type)
+    case type
+    when :proc_new then Proc.new { ProcLookupTestA::B::VALUE }
+    when :proc_f   then proc { ProcLookupTestA::B::VALUE }
+    when :lambda_f then lambda { ProcLookupTestA::B::VALUE }
+    when :lambda_l then ->(){ ProcLookupTestA::B::VALUE }
+    when :block    then make_proc_from_block { ProcLookupTestA::B::VALUE }
+    else
+      raise "invalid type :#{type}"
+    end
+  end
+
+  def self.make_str_const_proc(type)
+    case type
+    when :proc_new then Proc.new { String::FOO }
+    when :proc_f   then proc { String::FOO }
+    when :lambda_f then lambda { String::FOO }
+    when :lambda_l then ->(){ String::FOO }
+    when :block    then make_proc_from_block { String::FOO }
+    else
+      raise "invalid type :#{type}"
+    end
+  end
+
+  CONST_PROC_NEW = Proc.new { [String.new.yay, String::FOO, ProcLookupTestA::B::VALUE.to_s].join(',') }
+  CONST_PROC_F   = proc { [String.new.yay, String::FOO, ProcLookupTestA::B::VALUE.to_s].join(',') }
+  CONST_LAMBDA_F = lambda { [String.new.yay, String::FOO, ProcLookupTestA::B::VALUE.to_s].join(',') }
+  CONST_LAMBDA_L = ->() { [String.new.yay, String::FOO, ProcLookupTestA::B::VALUE.to_s].join(',') }
+  CONST_BLOCK    = make_proc_from_block { [String.new.yay, String::FOO, ProcLookupTestA::B::VALUE.to_s].join(',') }
+end
diff --git a/test/ruby/namespace/raise.rb b/test/ruby/namespace/raise.rb
new file mode 100644
index 00000000000000..efb67f85c5b78b
--- /dev/null
+++ b/test/ruby/namespace/raise.rb
@@ -0,0 +1,3 @@
+# frozen_string_literal: true
+
+raise "Yay!"
diff --git a/test/ruby/namespace/returns_proc.rb b/test/ruby/namespace/returns_proc.rb
new file mode 100644
index 00000000000000..bb816e5024d458
--- /dev/null
+++ b/test/ruby/namespace/returns_proc.rb
@@ -0,0 +1,12 @@
+module Foo
+  def self.foo
+    "fooooo"
+  end
+
+  def self.callee
+    lambda do
+      Foo.foo
+    end
+  end
+end
+
diff --git a/test/ruby/namespace/singleton_methods.rb b/test/ruby/namespace/singleton_methods.rb
new file mode 100644
index 00000000000000..05470932d2559e
--- /dev/null
+++ b/test/ruby/namespace/singleton_methods.rb
@@ -0,0 +1,65 @@
+class String
+  def self.greeting
+    "Good evening!"
+  end
+end
+
+class Integer
+  class << self
+    def answer
+      42
+    end
+  end
+end
+
+class Array
+  def a
+    size
+  end
+  def self.blank
+    []
+  end
+  def b
+    size
+  end
+end
+
+class Hash
+  def a
+    size
+  end
+  class << self
+    def http_200
+      {status: 200, body: 'OK'}
+    end
+  end
+  def b
+    size
+  end
+end
+
+module SingletonMethods
+  def self.string_greeing
+    String.greeting
+  end
+
+  def self.integer_answer
+    Integer.answer
+  end
+
+  def self.array_blank
+    Array.blank
+  end
+
+  def self.hash_http_200
+    Hash.http_200
+  end
+
+  def self.array_instance_methods_return_size(ary)
+    [ary.a, ary.b]
+  end
+
+  def self.hash_instance_methods_return_size(hash)
+    [hash.a, hash.b]
+  end
+end
diff --git a/test/ruby/namespace/string_ext.rb b/test/ruby/namespace/string_ext.rb
new file mode 100644
index 00000000000000..d8c5a3d661f935
--- /dev/null
+++ b/test/ruby/namespace/string_ext.rb
@@ -0,0 +1,13 @@
+class String
+  def yay
+    "yay"
+  end
+end
+
+String.new.yay # check this doesn't raise NoMethodError
+
+module Bar
+  def self.yay
+    String.new.yay
+  end
+end
diff --git a/test/ruby/namespace/string_ext_caller.rb b/test/ruby/namespace/string_ext_caller.rb
new file mode 100644
index 00000000000000..b8345d98edf11c
--- /dev/null
+++ b/test/ruby/namespace/string_ext_caller.rb
@@ -0,0 +1,5 @@
+module Foo
+  def self.yay
+    String.new.yay
+  end
+end
diff --git a/test/ruby/namespace/string_ext_calling.rb b/test/ruby/namespace/string_ext_calling.rb
new file mode 100644
index 00000000000000..6467b728dd98d5
--- /dev/null
+++ b/test/ruby/namespace/string_ext_calling.rb
@@ -0,0 +1 @@
+Foo.yay
diff --git a/test/ruby/namespace/string_ext_eval_caller.rb b/test/ruby/namespace/string_ext_eval_caller.rb
new file mode 100644
index 00000000000000..0e6b20c19f5d66
--- /dev/null
+++ b/test/ruby/namespace/string_ext_eval_caller.rb
@@ -0,0 +1,12 @@
+module Baz
+  def self.yay
+    eval 'String.new.yay'
+  end
+
+  def self.yay_with_binding
+    suffix = ", yay!"
+    eval 'String.new.yay + suffix', binding
+  end
+end
+
+Baz.yay # should not raise NeMethodError
diff --git a/test/ruby/namespace/top_level.rb b/test/ruby/namespace/top_level.rb
new file mode 100644
index 00000000000000..90df1455782ac0
--- /dev/null
+++ b/test/ruby/namespace/top_level.rb
@@ -0,0 +1,33 @@
+def yaaay
+  "yay!"
+end
+
+module Foo
+  def self.foo
+    yaaay
+  end
+end
+
+eval 'def foo; "foo"; end'
+
+Foo.foo # Should not raise NameError
+
+foo
+
+module Bar
+  def self.bar
+    foo
+  end
+end
+
+Bar.bar
+
+$def_retval_in_namespace = def boooo
+  "boo"
+end
+
+module Baz
+  def self.baz
+    raise "#{$def_retval_in_namespace}"
+  end
+end
diff --git a/test/ruby/rjit/test_assembler.rb b/test/ruby/rjit/test_assembler.rb
deleted file mode 100644
index a9ed6ce39e1d92..00000000000000
--- a/test/ruby/rjit/test_assembler.rb
+++ /dev/null
@@ -1,366 +0,0 @@
-require 'test/unit'
-require_relative '../../lib/jit_support'
-
-return unless JITSupport.rjit_supported?
-return unless RubyVM::RJIT.enabled?
-return unless RubyVM::RJIT::C.HAVE_LIBCAPSTONE
-
-require 'stringio'
-require 'ruby_vm/rjit/assembler'
-
-module RubyVM::RJIT
-  class TestAssembler < Test::Unit::TestCase
-    MEM_SIZE = 16 * 1024
-
-    def setup
-      @mem_block ||= C.mmap(MEM_SIZE)
-      @cb = CodeBlock.new(mem_block: @mem_block, mem_size: MEM_SIZE)
-    end
-
-    def test_add
-      asm = Assembler.new
-      asm.add([:rcx], 1)        # ADD r/m64, imm8 (Mod 00: [reg])
-      asm.add(:rax, 0x7f)       # ADD r/m64, imm8 (Mod 11: reg)
-      asm.add(:rbx, 0x7fffffff) # ADD r/m64 imm32 (Mod 11: reg)
-      asm.add(:rsi, :rdi)       # ADD r/m64, r64 (Mod 11: reg)
-      assert_compile(asm, <<~EOS)
-        0x0: add qword ptr [rcx], 1
-        0x4: add rax, 0x7f
-        0x8: add rbx, 0x7fffffff
-        0xf: add rsi, rdi
-      EOS
-    end
-
-    def test_and
-      asm = Assembler.new
-      asm.and(:rax, 0)          # AND r/m64, imm8 (Mod 11: reg)
-      asm.and(:rbx, 0x7fffffff) # AND r/m64, imm32 (Mod 11: reg)
-      asm.and(:rcx, [:rdi, 8])  # AND r64, r/m64 (Mod 01: [reg]+disp8)
-      assert_compile(asm, <<~EOS)
-        0x0: and rax, 0
-        0x4: and rbx, 0x7fffffff
-        0xb: and rcx, qword ptr [rdi + 8]
-      EOS
-    end
-
-    def test_call
-      asm = Assembler.new
-      asm.call(rel32(0xff)) # CALL rel32
-      asm.call(:rax)        # CALL r/m64 (Mod 11: reg)
-      assert_compile(asm, <<~EOS)
-        0x0: call 0xff
-        0x5: call rax
-      EOS
-    end
-
-    def test_cmove
-      asm = Assembler.new
-      asm.cmove(:rax, :rcx) # CMOVE r64, r/m64 (Mod 11: reg)
-      assert_compile(asm, <<~EOS)
-        0x0: cmove rax, rcx
-      EOS
-    end
-
-    def test_cmovg
-      asm = Assembler.new
-      asm.cmovg(:rbx, :rdi) # CMOVG r64, r/m64 (Mod 11: reg)
-      assert_compile(asm, <<~EOS)
-        0x0: cmovg rbx, rdi
-      EOS
-    end
-
-    def test_cmovge
-      asm = Assembler.new
-      asm.cmovge(:rsp, :rbp) # CMOVGE r64, r/m64 (Mod 11: reg)
-      assert_compile(asm, <<~EOS)
-        0x0: cmovge rsp, rbp
-      EOS
-    end
-
-    def test_cmovl
-      asm = Assembler.new
-      asm.cmovl(:rdx, :rsp) # CMOVL r64, r/m64 (Mod 11: reg)
-      assert_compile(asm, <<~EOS)
-        0x0: cmovl rdx, rsp
-      EOS
-    end
-
-    def test_cmovle
-      asm = Assembler.new
-      asm.cmovle(:rax, :rax) # CMOVLE r64, r/m64 (Mod 11: reg)
-      assert_compile(asm, <<~EOS)
-        0x0: cmovle rax, rax
-      EOS
-    end
-
-    def test_cmovne
-      asm = Assembler.new
-      asm.cmovne(:rax, :rbx) # CMOVNE r64, r/m64 (Mod 11: reg)
-      assert_compile(asm, <<~EOS) # cmovne == cmovnz
-        0x0: cmovne rax, rbx
-      EOS
-    end
-
-    def test_cmovnz
-      asm = Assembler.new
-      asm.cmovnz(:rax, :rbx) # CMOVNZ r64, r/m64 (Mod 11: reg)
-      assert_compile(asm, <<~EOS) # cmovne == cmovnz
-        0x0: cmovne rax, rbx
-      EOS
-    end
-
-    def test_cmovz
-      asm = Assembler.new
-      asm.cmovz(:rax, :rbx) # CMOVZ r64, r/m64 (Mod 11: reg)
-      assert_compile(asm, <<~EOS) # cmove == cmovz
-        0x0: cmove rax, rbx
-      EOS
-    end
-
-    def test_cmp
-      asm = Assembler.new
-      asm.cmp(BytePtr[:rax, 8], 8)      # CMP r/m8, imm8 (Mod 01: [reg]+disp8)
-      asm.cmp(DwordPtr[:rax, 8], 0x100) # CMP r/m32, imm32 (Mod 01: [reg]+disp8)
-      asm.cmp([:rax, 8], 8)             # CMP r/m64, imm8 (Mod 01: [reg]+disp8)
-      asm.cmp([:rax, 0x100], 8)         # CMP r/m64, imm8 (Mod 10: [reg]+disp32)
-      asm.cmp(:rax, 8)                  # CMP r/m64, imm8 (Mod 11: reg)
-      asm.cmp(:rax, 0x100)              # CMP r/m64, imm32 (Mod 11: reg)
-      asm.cmp([:rax, 8], :rbx)          # CMP r/m64, r64 (Mod 01: [reg]+disp8)
-      asm.cmp([:rax, -0x100], :rbx)     # CMP r/m64, r64 (Mod 10: [reg]+disp32)
-      asm.cmp(:rax, :rbx)               # CMP r/m64, r64 (Mod 11: reg)
-      assert_compile(asm, <<~EOS)
-        0x0: cmp byte ptr [rax + 8], 8
-        0x4: cmp dword ptr [rax + 8], 0x100
-        0xb: cmp qword ptr [rax + 8], 8
-        0x10: cmp qword ptr [rax + 0x100], 8
-        0x18: cmp rax, 8
-        0x1c: cmp rax, 0x100
-        0x23: cmp qword ptr [rax + 8], rbx
-        0x27: cmp qword ptr [rax - 0x100], rbx
-        0x2e: cmp rax, rbx
-      EOS
-    end
-
-    def test_jbe
-      asm = Assembler.new
-      asm.jbe(rel32(0xff)) # JBE rel32
-      assert_compile(asm, <<~EOS)
-        0x0: jbe 0xff
-      EOS
-    end
-
-    def test_je
-      asm = Assembler.new
-      asm.je(rel32(0xff)) # JE rel32
-      assert_compile(asm, <<~EOS)
-        0x0: je 0xff
-      EOS
-    end
-
-    def test_jl
-      asm = Assembler.new
-      asm.jl(rel32(0xff)) # JL rel32
-      assert_compile(asm, <<~EOS)
-        0x0: jl 0xff
-      EOS
-    end
-
-    def test_jmp
-      asm = Assembler.new
-      label = asm.new_label('label')
-      asm.jmp(label)       # JZ rel8
-      asm.write_label(label)
-      asm.jmp(rel32(0xff)) # JMP rel32
-      asm.jmp([:rax, 8])   # JMP r/m64 (Mod 01: [reg]+disp8)
-      asm.jmp(:rax)        # JMP r/m64 (Mod 11: reg)
-      assert_compile(asm, <<~EOS)
-        0x0: jmp 2
-        0x2: jmp 0xff
-        0x7: jmp qword ptr [rax + 8]
-        0xa: jmp rax
-      EOS
-    end
-
-    def test_jne
-      asm = Assembler.new
-      asm.jne(rel32(0xff)) # JNE rel32
-      assert_compile(asm, <<~EOS)
-        0x0: jne 0xff
-      EOS
-    end
-
-    def test_jnz
-      asm = Assembler.new
-      asm.jnz(rel32(0xff)) # JNZ rel32
-      assert_compile(asm, <<~EOS)
-        0x0: jne 0xff
-      EOS
-    end
-
-    def test_jo
-      asm = Assembler.new
-      asm.jo(rel32(0xff)) # JO rel32
-      assert_compile(asm, <<~EOS)
-        0x0: jo 0xff
-      EOS
-    end
-
-    def test_jz
-      asm = Assembler.new
-      asm.jz(rel32(0xff)) # JZ rel32
-      assert_compile(asm, <<~EOS)
-        0x0: je 0xff
-      EOS
-    end
-
-    def test_lea
-      asm = Assembler.new
-      asm.lea(:rax, [:rax, 8])      # LEA r64,m (Mod 01: [reg]+disp8)
-      asm.lea(:rax, [:rax, 0xffff]) # LEA r64,m (Mod 10: [reg]+disp32)
-      assert_compile(asm, <<~EOS)
-        0x0: lea rax, [rax + 8]
-        0x4: lea rax, [rax + 0xffff]
-      EOS
-    end
-
-    def test_mov
-      asm = Assembler.new
-      asm.mov(:eax, DwordPtr[:rbx, 8])  # MOV r32 r/m32 (Mod 01: [reg]+disp8)
-      asm.mov(:eax, 0x100)              # MOV r32, imm32 (Mod 11: reg)
-      asm.mov(:rax, [:rbx])             # MOV r64, r/m64 (Mod 00: [reg])
-      asm.mov(:rax, [:rbx, 8])          # MOV r64, r/m64 (Mod 01: [reg]+disp8)
-      asm.mov(:rax, [:rbx, 0x100])      # MOV r64, r/m64 (Mod 10: [reg]+disp32)
-      asm.mov(:rax, :rbx)               # MOV r64, r/m64 (Mod 11: reg)
-      asm.mov(:rax, 0x100)              # MOV r/m64, imm32 (Mod 11: reg)
-      asm.mov(:rax, 0x100000000)        # MOV r64, imm64
-      asm.mov(DwordPtr[:rax, 8], 0x100) # MOV r/m32, imm32 (Mod 01: [reg]+disp8)
-      asm.mov([:rax], 0x100)            # MOV r/m64, imm32 (Mod 00: [reg])
-      asm.mov([:rax], :rbx)             # MOV r/m64, r64 (Mod 00: [reg])
-      asm.mov([:rax, 8], 0x100)         # MOV r/m64, imm32 (Mod 01: [reg]+disp8)
-      asm.mov([:rax, 8], :rbx)          # MOV r/m64, r64 (Mod 01: [reg]+disp8)
-      asm.mov([:rax, 0x100], 0x100)     # MOV r/m64, imm32 (Mod 10: [reg]+disp32)
-      asm.mov([:rax, 0x100], :rbx)      # MOV r/m64, r64 (Mod 10: [reg]+disp32)
-      assert_compile(asm, <<~EOS)
-        0x0: mov eax, dword ptr [rbx + 8]
-        0x3: mov eax, 0x100
-        0x8: mov rax, qword ptr [rbx]
-        0xb: mov rax, qword ptr [rbx + 8]
-        0xf: mov rax, qword ptr [rbx + 0x100]
-        0x16: mov rax, rbx
-        0x19: mov rax, 0x100
-        0x20: movabs rax, 0x100000000
-        0x2a: mov dword ptr [rax + 8], 0x100
-        0x31: mov qword ptr [rax], 0x100
-        0x38: mov qword ptr [rax], rbx
-        0x3b: mov qword ptr [rax + 8], 0x100
-        0x43: mov qword ptr [rax + 8], rbx
-        0x47: mov qword ptr [rax + 0x100], 0x100
-        0x52: mov qword ptr [rax + 0x100], rbx
-      EOS
-    end
-
-    def test_or
-      asm = Assembler.new
-      asm.or(:rax, 0)         # OR r/m64, imm8 (Mod 11: reg)
-      asm.or(:rax, 0xffff)    # OR r/m64, imm32 (Mod 11: reg)
-      asm.or(:rax, [:rbx, 8]) # OR r64, r/m64 (Mod 01: [reg]+disp8)
-      assert_compile(asm, <<~EOS)
-        0x0: or rax, 0
-        0x4: or rax, 0xffff
-        0xb: or rax, qword ptr [rbx + 8]
-      EOS
-    end
-
-    def test_push
-      asm = Assembler.new
-      asm.push(:rax) # PUSH r64
-      assert_compile(asm, <<~EOS)
-        0x0: push rax
-      EOS
-    end
-
-    def test_pop
-      asm = Assembler.new
-      asm.pop(:rax) # POP r64
-      assert_compile(asm, <<~EOS)
-        0x0: pop rax
-      EOS
-    end
-
-    def test_ret
-      asm = Assembler.new
-      asm.ret # RET
-      assert_compile(asm, "0x0: ret \n")
-    end
-
-    def test_sar
-      asm = Assembler.new
-      asm.sar(:rax, 0) # SAR r/m64, imm8 (Mod 11: reg)
-      assert_compile(asm, <<~EOS)
-        0x0: sar rax, 0
-      EOS
-    end
-
-    def test_sub
-      asm = Assembler.new
-      asm.sub(:rax, 8)    # SUB r/m64, imm8 (Mod 11: reg)
-      asm.sub(:rax, :rbx) # SUB r/m64, r64 (Mod 11: reg)
-      assert_compile(asm, <<~EOS)
-        0x0: sub rax, 8
-        0x4: sub rax, rbx
-      EOS
-    end
-
-    def test_test
-      asm = Assembler.new
-      asm.test(BytePtr[:rax, 8], 16)   # TEST r/m8*, imm8 (Mod 01: [reg]+disp8)
-      asm.test([:rax, 8], 8)           # TEST r/m64, imm32 (Mod 01: [reg]+disp8)
-      asm.test([:rax, 0xffff], 0xffff) # TEST r/m64, imm32 (Mod 10: [reg]+disp32)
-      asm.test(:rax, 0xffff)           # TEST r/m64, imm32 (Mod 11: reg)
-      asm.test(:eax, :ebx)             # TEST r/m32, r32 (Mod 11: reg)
-      asm.test(:rax, :rbx)             # TEST r/m64, r64 (Mod 11: reg)
-      assert_compile(asm, <<~EOS)
-        0x0: test byte ptr [rax + 8], 0x10
-        0x4: test qword ptr [rax + 8], 8
-        0xc: test qword ptr [rax + 0xffff], 0xffff
-        0x17: test rax, 0xffff
-        0x1e: test eax, ebx
-        0x20: test rax, rbx
-      EOS
-    end
-
-    def test_xor
-      asm = Assembler.new
-      asm.xor(:rax, :rbx)
-      assert_compile(asm, <<~EOS)
-        0x0: xor rax, rbx
-      EOS
-    end
-
-    private
-
-    def rel32(offset)
-      @cb.write_addr + 0xff
-    end
-
-    def assert_compile(asm, expected)
-      actual = compile(asm)
-      assert_equal expected, actual, "---\n#{actual}---"
-    end
-
-    def compile(asm)
-      start_addr = @cb.write_addr
-      @cb.write(asm)
-      end_addr = @cb.write_addr
-
-      io = StringIO.new
-      @cb.dump_disasm(start_addr, end_addr, io:, color: false, test: true)
-      io.seek(0)
-      disasm = io.read
-
-      disasm.gsub!(/^  /, '')
-      disasm.sub!(/\n\z/, '')
-      disasm
-    end
-  end
-end
diff --git a/test/ruby/test_alias.rb b/test/ruby/test_alias.rb
index 0d33cb993cea4b..539cd4948878b3 100644
--- a/test/ruby/test_alias.rb
+++ b/test/ruby/test_alias.rb
@@ -292,4 +292,53 @@ class A
       end
     end;
   end
+
+  def test_alias_complemented_method
+    assert_in_out_err(%w[-w], "#{<<~"begin;"}\n#{<<~'end;'}")
+    begin;
+      module M
+        def foo = 1
+        self.extend M
+      end
+
+      3.times{|i|
+        module M
+          alias foo2 foo
+          remove_method :foo
+          def foo = 2
+        ensure
+          remove_method :foo
+          alias foo foo2
+          remove_method :foo2
+        end
+
+        M.foo
+
+        original_foo = M.method(:foo)
+
+        M.class_eval do
+          remove_method :foo
+          def foo = 3
+        end
+
+        M.class_eval do
+          remove_method :foo
+          define_method :foo, original_foo
+        end
+      }
+    end;
+  end
+
+  def test_undef_method_error_message_with_zsuper_method
+    modules = [
+      Module.new { private :class },
+      Module.new { prepend Module.new { private :class } },
+    ]
+    message = "undefined method 'class' for module '%s'"
+    modules.each do |mod|
+      assert_raise_with_message(NameError, message % mod) do
+        mod.alias_method :xyz, :class
+      end
+    end
+  end
 end
diff --git a/test/ruby/test_allocation.rb b/test/ruby/test_allocation.rb
new file mode 100644
index 00000000000000..a2ccd7bd659d0e
--- /dev/null
+++ b/test/ruby/test_allocation.rb
@@ -0,0 +1,906 @@
+# frozen_string_literal: false
+require 'test/unit'
+
+class TestAllocation < Test::Unit::TestCase
+  def setup
+    # The namespace changes on i686 platform triggers a bug to allocate objects unexpectedly.
+    # For now, skip these tests only on i686
+    pend if RUBY_PLATFORM =~ /^i686/
+  end
+
+  def munge_checks(checks)
+    checks
+  end
+
+  def check_allocations(checks)
+    dups = checks.split("\n").reject(&:empty?).tally.select{|_,v| v > 1}
+    raise "duplicate checks:\n#{dups.keys.join("\n")}" unless dups.empty?
+
+    checks = munge_checks(checks)
+
+    assert_separately([], <<~RUBY)
+      $allocations = [0, 0]
+      $counts = {}
+      failures = []
+
+      def self.num_allocations
+        ObjectSpace.count_objects($counts)
+        arrays = $counts[:T_ARRAY]
+        hashes = $counts[:T_HASH]
+        yield
+        ObjectSpace.count_objects($counts)
+        arrays -= $counts[:T_ARRAY]
+        hashes -= $counts[:T_HASH]
+        $allocations[0] = -arrays
+        $allocations[1] = -hashes
+      end
+
+      define_singleton_method(:check_allocations) do |num_arrays, num_hashes, check_code|
+        instance_eval <<~RB
+          empty_array = empty_array = []
+          empty_hash = empty_hash = {}
+          array1 = array1 = [1]
+          r2k_array = r2k_array = [Hash.ruby2_keywords_hash(a: 3)]
+          r2k_array1 = r2k_array1 = [1, Hash.ruby2_keywords_hash(a: 3)]
+          r2k_empty_array = r2k_empty_array = [Hash.ruby2_keywords_hash({})]
+          r2k_empty_array1 = r2k_empty_array1 = [1, Hash.ruby2_keywords_hash({})]
+          hash1 = hash1 = {a: 2}
+          nill = nill = nil
+          block = block = lambda{}
+
+          num_allocations do
+            \#{check_code}
+          end
+        RB
+
+        if num_arrays != $allocations[0]
+          failures << "Expected \#{num_arrays} array allocations for \#{check_code.inspect}, but \#{$allocations[0]} arrays allocated"
+        end
+        if num_hashes != $allocations[1]
+          failures << "Expected \#{num_hashes} hash allocations for \#{check_code.inspect}, but \#{$allocations[1]} hashes allocated"
+        end
+      end
+
+      GC.start
+      GC.disable
+
+      #{checks}
+
+      unless failures.empty?
+        assert_equal(true, false, failures.join("\n"))
+      end
+    RUBY
+  end
+
+  class Literal < self
+    def test_array_literal
+      check_allocations(<<~RUBY)
+        check_allocations(1, 0, "[]")
+        check_allocations(1, 0, "[1]")
+        check_allocations(1, 0, "[*empty_array]")
+        check_allocations(1, 0, "[*empty_array, 1, *empty_array]")
+        check_allocations(1, 0, "[*empty_array, *empty_array]")
+        check_allocations(1, 0, "[#{'1,'*100000}]")
+      RUBY
+    end
+
+    def test_hash_literal
+      check_allocations(<<~RUBY)
+        check_allocations(0, 1, "{}")
+        check_allocations(0, 1, "{a: 1}")
+        check_allocations(0, 1, "{**empty_hash}")
+        check_allocations(0, 1, "{**empty_hash, a: 1, **empty_hash}")
+        check_allocations(0, 1, "{**empty_hash, **empty_hash}")
+        check_allocations(0, 1, "{#{100000.times.map{|i| "a#{i}: 1"}.join(',')}}")
+      RUBY
+    end
+  end
+
+  class MethodCall < self
+    def block
+      ''
+    end
+    alias only_block block
+
+    def test_no_parameters
+      check_allocations(<<~RUBY)
+        def self.none(#{only_block}); end
+
+        check_allocations(0, 0, "none(#{only_block})")
+        check_allocations(0, 0, "none(*nil#{block})")
+        check_allocations(0, 0, "none(*empty_array#{block})")
+        check_allocations(0, 0, "none(**empty_hash#{block})")
+        check_allocations(0, 0, "none(*empty_array, **empty_hash#{block})")
+
+        check_allocations(1, 0, "none(*empty_array, *empty_array#{block})")
+        check_allocations(0, 1, "none(**empty_hash, **empty_hash#{block})")
+        check_allocations(1, 1, "none(*empty_array, *empty_array, **empty_hash, **empty_hash#{block})")
+
+        check_allocations(0, 0, "none(*r2k_empty_array#{block})")
+      RUBY
+    end
+
+    def test_required_parameter
+      check_allocations(<<~RUBY)
+        def self.required(x#{block}); end
+
+        check_allocations(0, 0, "required(1#{block})")
+        check_allocations(0, 0, "required(1, *empty_array#{block})")
+        check_allocations(0, 0, "required(1, **empty_hash#{block})")
+        check_allocations(0, 0, "required(1, *empty_array, **empty_hash#{block})")
+
+        check_allocations(0, 0, "required(*array1#{block})")
+        check_allocations(0, 1, "required(**hash1#{block})")
+
+        check_allocations(1, 0, "required(*array1, *empty_array#{block})")
+        check_allocations(0, 1, "required(**hash1, **empty_hash#{block})")
+        check_allocations(1, 0, "required(*array1, *empty_array, **empty_hash#{block})")
+
+        check_allocations(0, 0, "required(*r2k_empty_array1#{block})")
+        check_allocations(0, 1, "required(*r2k_array#{block})")
+
+        check_allocations(0, 1, "required(*empty_array, **hash1, **empty_hash#{block})")
+      RUBY
+    end
+
+    def test_optional_parameter
+      check_allocations(<<~RUBY)
+        def self.optional(x=nil#{block}); end
+
+        check_allocations(0, 0, "optional(1#{block})")
+        check_allocations(0, 0, "optional(1, *empty_array#{block})")
+        check_allocations(0, 0, "optional(1, **empty_hash#{block})")
+        check_allocations(0, 0, "optional(1, *empty_array, **empty_hash#{block})")
+
+        check_allocations(0, 0, "optional(*array1#{block})")
+        check_allocations(0, 1, "optional(**hash1#{block})")
+
+        check_allocations(1, 0, "optional(*array1, *empty_array#{block})")
+        check_allocations(0, 1, "optional(**hash1, **empty_hash#{block})")
+        check_allocations(1, 0, "optional(*array1, *empty_array, **empty_hash#{block})")
+
+        check_allocations(0, 0, "optional(*r2k_empty_array#{block})")
+        check_allocations(0, 0, "optional(*r2k_empty_array1#{block})")
+        check_allocations(0, 1, "optional(*r2k_array#{block})")
+
+        check_allocations(0, 0, "optional(*empty_array#{block})")
+        check_allocations(0, 0, "optional(*nil#{block})")
+        check_allocations(0, 0, "optional(#{only_block})")
+        check_allocations(0, 1, "optional(*empty_array, **hash1, **empty_hash#{block})")
+      RUBY
+    end
+
+    def test_positional_splat_parameter
+      check_allocations(<<~RUBY)
+        def self.splat(*x#{block}); end
+
+        check_allocations(1, 0, "splat(1#{block})")
+        check_allocations(1, 0, "splat(1, *empty_array#{block})")
+        check_allocations(1, 0, "splat(1, **empty_hash#{block})")
+        check_allocations(1, 0, "splat(1, *empty_array, **empty_hash#{block})")
+
+        check_allocations(1, 0, "splat(*array1#{block})")
+        check_allocations(1, 0, "splat(*array1, *empty_array#{block})")
+        check_allocations(1, 0, "splat(*array1, **empty_hash#{block})")
+        check_allocations(1, 0, "splat(*array1, *empty_array, **empty_hash#{block})")
+
+        check_allocations(1, 0, "splat(1, *array1#{block})")
+        check_allocations(1, 0, "splat(1, *array1, *empty_array#{block})")
+        check_allocations(1, 0, "splat(1, *array1, **empty_hash#{block})")
+        check_allocations(1, 0, "splat(1, *array1, *empty_array, **empty_hash#{block})")
+
+        check_allocations(1, 0, "splat(*nil#{block})")
+        check_allocations(1, 0, "splat(#{only_block})")
+        check_allocations(1, 1, "splat(**hash1#{block})")
+
+        check_allocations(1, 1, "splat(**hash1, **empty_hash#{block})")
+        check_allocations(1, 1, "splat(*empty_array, **hash1, **empty_hash#{block})")
+
+        check_allocations(1, 0, "splat(*r2k_empty_array#{block})")
+        check_allocations(1, 0, "splat(*r2k_empty_array1#{block})")
+        check_allocations(1, 1, "splat(*r2k_array#{block})")
+        check_allocations(1, 1, "splat(*r2k_array1#{block})")
+      RUBY
+    end
+
+    def test_required_and_positional_splat_parameters
+      check_allocations(<<~RUBY)
+        def self.req_splat(x, *y#{block}); end
+
+        check_allocations(1, 0, "req_splat(1#{block})")
+        check_allocations(1, 0, "req_splat(1, *nil#{block})")
+        check_allocations(1, 0, "req_splat(1, *empty_array#{block})")
+        check_allocations(1, 0, "req_splat(1, **empty_hash#{block})")
+        check_allocations(1, 0, "req_splat(1, *empty_array, **empty_hash#{block})")
+
+        check_allocations(1, 0, "req_splat(*array1#{block})")
+        check_allocations(1, 0, "req_splat(*array1, *empty_array#{block})")
+        check_allocations(1, 0, "req_splat(*array1, **empty_hash#{block})")
+        check_allocations(1, 0, "req_splat(*array1, *empty_array, **empty_hash#{block})")
+
+        check_allocations(1, 0, "req_splat(1, *array1#{block})")
+        check_allocations(1, 0, "req_splat(1, *array1, *empty_array#{block})")
+        check_allocations(1, 0, "req_splat(1, *array1, **empty_hash#{block})")
+        check_allocations(1, 0, "req_splat(1, *array1, *empty_array, **empty_hash#{block})")
+
+        check_allocations(1, 1, "req_splat(**hash1#{block})")
+
+        check_allocations(1, 1, "req_splat(**hash1, **empty_hash#{block})")
+        check_allocations(1, 1, "req_splat(*empty_array, **hash1, **empty_hash#{block})")
+
+        check_allocations(1, 0, "req_splat(*r2k_empty_array1#{block})")
+        check_allocations(1, 1, "req_splat(*r2k_array#{block})")
+        check_allocations(1, 1, "req_splat(*r2k_array1#{block})")
+      RUBY
+    end
+
+    def test_positional_splat_and_post_parameters
+      check_allocations(<<~RUBY)
+        def self.splat_post(*x, y#{block}); end
+
+        check_allocations(1, 0, "splat_post(1#{block})")
+        check_allocations(1, 0, "splat_post(1, *nil#{block})")
+        check_allocations(1, 0, "splat_post(1, *empty_array#{block})")
+        check_allocations(1, 0, "splat_post(1, **empty_hash#{block})")
+        check_allocations(1, 0, "splat_post(1, *empty_array, **empty_hash#{block})")
+
+        check_allocations(1, 0, "splat_post(*array1#{block})")
+        check_allocations(1, 0, "splat_post(*array1, *empty_array#{block})")
+        check_allocations(1, 0, "splat_post(*array1, **empty_hash#{block})")
+        check_allocations(1, 0, "splat_post(*array1, *empty_array, **empty_hash#{block})")
+
+        check_allocations(1, 0, "splat_post(1, *array1#{block})")
+        check_allocations(1, 0, "splat_post(1, *array1, *empty_array#{block})")
+        check_allocations(1, 0, "splat_post(1, *array1, **empty_hash#{block})")
+        check_allocations(1, 0, "splat_post(1, *array1, *empty_array, **empty_hash#{block})")
+
+        check_allocations(1, 1, "splat_post(**hash1#{block})")
+
+        check_allocations(1, 1, "splat_post(**hash1, **empty_hash#{block})")
+        check_allocations(1, 1, "splat_post(*empty_array, **hash1, **empty_hash#{block})")
+
+        check_allocations(1, 0, "splat_post(*r2k_empty_array1#{block})")
+        check_allocations(1, 1, "splat_post(*r2k_array#{block})")
+        check_allocations(1, 1, "splat_post(*r2k_array1#{block})")
+      RUBY
+    end
+
+    def test_keyword_parameter
+      check_allocations(<<~RUBY)
+        def self.keyword(a: nil#{block}); end
+
+        check_allocations(0, 0, "keyword(a: 2#{block})")
+        check_allocations(0, 0, "keyword(*empty_array, a: 2#{block})")
+        check_allocations(0, 1, "keyword(a:2, **empty_hash#{block})")
+        check_allocations(0, 1, "keyword(**empty_hash, a: 2#{block})")
+
+        check_allocations(0, 0, "keyword(**nil#{block})")
+        check_allocations(0, 0, "keyword(**empty_hash#{block})")
+        check_allocations(0, 0, "keyword(**hash1#{block})")
+        check_allocations(0, 0, "keyword(*empty_array, **hash1#{block})")
+        check_allocations(0, 1, "keyword(**hash1, **empty_hash#{block})")
+        check_allocations(0, 1, "keyword(**empty_hash, **hash1#{block})")
+
+        check_allocations(0, 0, "keyword(*nil#{block})")
+        check_allocations(0, 0, "keyword(*empty_array#{block})")
+        check_allocations(1, 0, "keyword(*empty_array, *empty_array, **empty_hash#{block})")
+
+        check_allocations(0, 0, "keyword(*r2k_empty_array#{block})")
+        check_allocations(0, 0, "keyword(*r2k_array#{block})")
+
+        check_allocations(0, 1, "keyword(*empty_array, a: 2, **empty_hash#{block})")
+        check_allocations(0, 1, "keyword(*empty_array, **hash1, **empty_hash#{block})")
+      RUBY
+    end
+
+    def test_keyword_splat_parameter
+      check_allocations(<<~RUBY)
+        def self.keyword_splat(**kw#{block}); end
+
+        check_allocations(0, 1, "keyword_splat(a: 2#{block})")
+        check_allocations(0, 1, "keyword_splat(*empty_array, a: 2#{block})")
+        check_allocations(0, 1, "keyword_splat(a:2, **empty_hash#{block})")
+        check_allocations(0, 1, "keyword_splat(**empty_hash, a: 2#{block})")
+
+        check_allocations(0, 1, "keyword_splat(**nil#{block})")
+        check_allocations(0, 1, "keyword_splat(**empty_hash#{block})")
+        check_allocations(0, 1, "keyword_splat(**hash1#{block})")
+        check_allocations(0, 1, "keyword_splat(*empty_array, **hash1#{block})")
+        check_allocations(0, 1, "keyword_splat(**hash1, **empty_hash#{block})")
+        check_allocations(0, 1, "keyword_splat(**empty_hash, **hash1#{block})")
+
+        check_allocations(0, 1, "keyword_splat(*nil#{block})")
+        check_allocations(0, 1, "keyword_splat(*empty_array#{block})")
+        check_allocations(1, 1, "keyword_splat(*empty_array, *empty_array, **empty_hash#{block})")
+
+        check_allocations(0, 1, "keyword_splat(*r2k_empty_array#{block})")
+        check_allocations(0, 1, "keyword_splat(*r2k_array#{block})")
+
+        check_allocations(0, 1, "keyword_splat(*empty_array, a: 2, **empty_hash#{block})")
+        check_allocations(0, 1, "keyword_splat(*empty_array, **hash1, **empty_hash#{block})")
+      RUBY
+    end
+
+    def test_keyword_and_keyword_splat_parameter
+      check_allocations(<<~RUBY)
+        def self.keyword_and_keyword_splat(a: 1, **kw#{block}); end
+
+        check_allocations(0, 1, "keyword_and_keyword_splat(a: 2#{block})")
+        check_allocations(0, 1, "keyword_and_keyword_splat(*empty_array, a: 2#{block})")
+        check_allocations(0, 1, "keyword_and_keyword_splat(a:2, **empty_hash#{block})")
+        check_allocations(0, 1, "keyword_and_keyword_splat(**empty_hash, a: 2#{block})")
+
+        check_allocations(0, 1, "keyword_and_keyword_splat(**nil#{block})")
+        check_allocations(0, 1, "keyword_and_keyword_splat(**empty_hash#{block})")
+        check_allocations(0, 1, "keyword_and_keyword_splat(**hash1#{block})")
+        check_allocations(0, 1, "keyword_and_keyword_splat(*empty_array, **hash1#{block})")
+        check_allocations(0, 1, "keyword_and_keyword_splat(**hash1, **empty_hash#{block})")
+        check_allocations(0, 1, "keyword_and_keyword_splat(**empty_hash, **hash1#{block})")
+
+        check_allocations(0, 1, "keyword_and_keyword_splat(*nil#{block})")
+        check_allocations(0, 1, "keyword_and_keyword_splat(*empty_array#{block})")
+        check_allocations(1, 1, "keyword_and_keyword_splat(*empty_array, *empty_array, **empty_hash#{block})")
+
+        check_allocations(0, 1, "keyword_and_keyword_splat(*r2k_empty_array#{block})")
+        check_allocations(0, 1, "keyword_and_keyword_splat(*r2k_array#{block})")
+
+        check_allocations(0, 1, "keyword_and_keyword_splat(*empty_array, a: 2, **empty_hash#{block})")
+        check_allocations(0, 1, "keyword_and_keyword_splat(*empty_array, **hash1, **empty_hash#{block})")
+      RUBY
+    end
+
+    def test_required_positional_and_keyword_parameter
+      check_allocations(<<~RUBY)
+        def self.required_and_keyword(b, a: nil#{block}); end
+
+        check_allocations(0, 0, "required_and_keyword(1, a: 2#{block})")
+        check_allocations(0, 0, "required_and_keyword(1, *empty_array, a: 2#{block})")
+        check_allocations(0, 1, "required_and_keyword(1, a:2, **empty_hash#{block})")
+        check_allocations(0, 1, "required_and_keyword(1, **empty_hash, a: 2#{block})")
+
+        check_allocations(0, 0, "required_and_keyword(1, **nil#{block})")
+        check_allocations(0, 0, "required_and_keyword(1, **empty_hash#{block})")
+        check_allocations(0, 0, "required_and_keyword(1, **hash1#{block})")
+        check_allocations(0, 0, "required_and_keyword(1, *empty_array, **hash1#{block})")
+        check_allocations(0, 1, "required_and_keyword(1, **hash1, **empty_hash#{block})")
+        check_allocations(0, 1, "required_and_keyword(1, **empty_hash, **hash1#{block})")
+
+        check_allocations(0, 0, "required_and_keyword(1, *nil#{block})")
+        check_allocations(0, 0, "required_and_keyword(1, *empty_array#{block})")
+        check_allocations(1, 0, "required_and_keyword(1, *empty_array, *empty_array, **empty_hash#{block})")
+
+        check_allocations(0, 0, "required_and_keyword(*array1, a: 2#{block})")
+
+        check_allocations(0, 0, "required_and_keyword(*array1, **nill#{block})")
+        check_allocations(0, 0, "required_and_keyword(*array1, **empty_hash#{block})")
+        check_allocations(0, 0, "required_and_keyword(*array1, **hash1#{block})")
+        check_allocations(1, 0, "required_and_keyword(*array1, *empty_array, **hash1#{block})")
+
+        check_allocations(1, 0, "required_and_keyword(*array1, *empty_array#{block})")
+        check_allocations(1, 0, "required_and_keyword(*array1, *empty_array, **empty_hash#{block})")
+
+        check_allocations(1, 1, "required_and_keyword(*array1, *empty_array, a: 2, **empty_hash#{block})")
+        check_allocations(1, 1, "required_and_keyword(*array1, *empty_array, **hash1, **empty_hash#{block})")
+
+        check_allocations(0, 0, "required_and_keyword(*r2k_empty_array1#{block})")
+        check_allocations(0, 0, "required_and_keyword(*r2k_array1#{block})")
+
+        check_allocations(0, 1, "required_and_keyword(1, *empty_array, a: 2, **empty_hash#{block})")
+        check_allocations(0, 1, "required_and_keyword(1, *empty_array, **hash1, **empty_hash#{block})")
+        check_allocations(0, 1, "required_and_keyword(*array1, **empty_hash, a: 2#{block})")
+        check_allocations(0, 1, "required_and_keyword(*array1, **hash1, **empty_hash#{block})")
+        check_allocations(0, 0, "required_and_keyword(*array1, **nil#{block})")
+      RUBY
+    end
+
+    def test_positional_splat_and_keyword_parameter
+      check_allocations(<<~RUBY)
+        def self.splat_and_keyword(*b, a: nil#{block}); end
+
+        check_allocations(1, 0, "splat_and_keyword(1, a: 2#{block})")
+        check_allocations(1, 0, "splat_and_keyword(1, *empty_array, a: 2#{block})")
+        check_allocations(1, 1, "splat_and_keyword(1, a:2, **empty_hash#{block})")
+        check_allocations(1, 1, "splat_and_keyword(1, **empty_hash, a: 2#{block})")
+
+        check_allocations(1, 0, "splat_and_keyword(1, **nil#{block})")
+        check_allocations(1, 0, "splat_and_keyword(1, **empty_hash#{block})")
+        check_allocations(1, 0, "splat_and_keyword(1, **hash1#{block})")
+        check_allocations(1, 0, "splat_and_keyword(1, *empty_array, **hash1#{block})")
+        check_allocations(1, 1, "splat_and_keyword(1, **hash1, **empty_hash#{block})")
+        check_allocations(1, 1, "splat_and_keyword(1, **empty_hash, **hash1#{block})")
+
+        check_allocations(1, 0, "splat_and_keyword(1, *nil#{block})")
+        check_allocations(1, 0, "splat_and_keyword(1, *empty_array#{block})")
+        check_allocations(1, 0, "splat_and_keyword(1, *empty_array, *empty_array, **empty_hash#{block})")
+
+        check_allocations(1, 0, "splat_and_keyword(*array1, a: 2#{block})")
+
+        check_allocations(1, 0, "splat_and_keyword(*array1, **nill#{block})")
+        check_allocations(1, 0, "splat_and_keyword(*array1, **empty_hash#{block})")
+        check_allocations(1, 0, "splat_and_keyword(*array1, **hash1#{block})")
+        check_allocations(1, 0, "splat_and_keyword(*array1, *empty_array, **hash1#{block})")
+
+        check_allocations(1, 0, "splat_and_keyword(*array1, *empty_array#{block})")
+        check_allocations(1, 0, "splat_and_keyword(*array1, *empty_array, **empty_hash#{block})")
+
+        check_allocations(1, 1, "splat_and_keyword(*array1, *empty_array, a: 2, **empty_hash#{block})")
+        check_allocations(1, 1, "splat_and_keyword(*array1, *empty_array, **hash1, **empty_hash#{block})")
+
+        check_allocations(1, 1, "splat_and_keyword(1, *empty_array, a: 2, **empty_hash#{block})")
+        check_allocations(1, 1, "splat_and_keyword(1, *empty_array, **hash1, **empty_hash#{block})")
+        check_allocations(1, 1, "splat_and_keyword(*array1, **empty_hash, a: 2#{block})")
+        check_allocations(1, 1, "splat_and_keyword(*array1, **hash1, **empty_hash#{block})")
+        check_allocations(1, 0, "splat_and_keyword(*array1, **nil#{block})")
+
+        check_allocations(1, 0, "splat_and_keyword(*r2k_empty_array#{block})")
+        check_allocations(1, 0, "splat_and_keyword(*r2k_array#{block})")
+        check_allocations(1, 0, "splat_and_keyword(*r2k_empty_array1#{block})")
+        check_allocations(1, 0, "splat_and_keyword(*r2k_array1#{block})")
+      RUBY
+    end
+
+    def test_required_and_keyword_splat_parameter
+      check_allocations(<<~RUBY)
+        def self.required_and_keyword_splat(b, **kw#{block}); end
+
+        check_allocations(0, 1, "required_and_keyword_splat(1, a: 2#{block})")
+        check_allocations(0, 1, "required_and_keyword_splat(1, *empty_array, a: 2#{block})")
+        check_allocations(0, 1, "required_and_keyword_splat(1, a:2, **empty_hash#{block})")
+        check_allocations(0, 1, "required_and_keyword_splat(1, **empty_hash, a: 2#{block})")
+
+        check_allocations(0, 1, "required_and_keyword_splat(1, **nil#{block})")
+        check_allocations(0, 1, "required_and_keyword_splat(1, **empty_hash#{block})")
+        check_allocations(0, 1, "required_and_keyword_splat(1, **hash1#{block})")
+        check_allocations(0, 1, "required_and_keyword_splat(1, *empty_array, **hash1#{block})")
+        check_allocations(0, 1, "required_and_keyword_splat(1, **hash1, **empty_hash#{block})")
+        check_allocations(0, 1, "required_and_keyword_splat(1, **empty_hash, **hash1#{block})")
+
+        check_allocations(0, 1, "required_and_keyword_splat(1, *nil#{block})")
+        check_allocations(0, 1, "required_and_keyword_splat(1, *empty_array#{block})")
+        check_allocations(1, 1, "required_and_keyword_splat(1, *empty_array, *empty_array, **empty_hash#{block})")
+
+        check_allocations(0, 1, "required_and_keyword_splat(*array1, a: 2#{block})")
+
+        check_allocations(0, 1, "required_and_keyword_splat(*array1, **nill#{block})")
+        check_allocations(0, 1, "required_and_keyword_splat(*array1, **empty_hash#{block})")
+        check_allocations(0, 1, "required_and_keyword_splat(*array1, **hash1#{block})")
+        check_allocations(1, 1, "required_and_keyword_splat(*array1, *empty_array, **hash1#{block})")
+
+        check_allocations(1, 1, "required_and_keyword_splat(*array1, *empty_array#{block})")
+        check_allocations(1, 1, "required_and_keyword_splat(*array1, *empty_array, **empty_hash#{block})")
+
+        check_allocations(1, 1, "required_and_keyword_splat(*array1, *empty_array, a: 2, **empty_hash#{block})")
+        check_allocations(1, 1, "required_and_keyword_splat(*array1, *empty_array, **hash1, **empty_hash#{block})")
+
+        check_allocations(0, 1, "required_and_keyword_splat(*r2k_empty_array1#{block})")
+        check_allocations(0, 1, "required_and_keyword_splat(*r2k_array1#{block})")
+
+        check_allocations(0, 1, "required_and_keyword_splat(1, *empty_array, a: 2, **empty_hash#{block})")
+        check_allocations(0, 1, "required_and_keyword_splat(1, *empty_array, **hash1, **empty_hash#{block})")
+        check_allocations(0, 1, "required_and_keyword_splat(*array1, **empty_hash, a: 2#{block})")
+        check_allocations(0, 1, "required_and_keyword_splat(*array1, **hash1, **empty_hash#{block})")
+        check_allocations(0, 1, "required_and_keyword_splat(*array1, **nil#{block})")
+      RUBY
+    end
+
+    def test_positional_splat_and_keyword_splat_parameter
+      check_allocations(<<~RUBY)
+        def self.splat_and_keyword_splat(*b, **kw#{block}); end
+
+        check_allocations(1, 1, "splat_and_keyword_splat(1, a: 2#{block})")
+        check_allocations(1, 1, "splat_and_keyword_splat(1, *empty_array, a: 2#{block})")
+        check_allocations(1, 1, "splat_and_keyword_splat(1, a:2, **empty_hash#{block})")
+        check_allocations(1, 1, "splat_and_keyword_splat(1, **empty_hash, a: 2#{block})")
+
+        check_allocations(1, 1, "splat_and_keyword_splat(1, **nil#{block})")
+        check_allocations(1, 1, "splat_and_keyword_splat(1, **empty_hash#{block})")
+        check_allocations(1, 1, "splat_and_keyword_splat(1, **hash1#{block})")
+        check_allocations(1, 1, "splat_and_keyword_splat(1, *empty_array, **hash1#{block})")
+        check_allocations(1, 1, "splat_and_keyword_splat(1, **hash1, **empty_hash#{block})")
+        check_allocations(1, 1, "splat_and_keyword_splat(1, **empty_hash, **hash1#{block})")
+
+        check_allocations(1, 1, "splat_and_keyword_splat(1, *nil#{block})")
+        check_allocations(1, 1, "splat_and_keyword_splat(1, *empty_array#{block})")
+        check_allocations(1, 1, "splat_and_keyword_splat(1, *empty_array, *empty_array, **empty_hash#{block})")
+
+        check_allocations(1, 1, "splat_and_keyword_splat(*array1, a: 2#{block})")
+
+        check_allocations(1, 1, "splat_and_keyword_splat(*array1, **nill#{block})")
+        check_allocations(1, 1, "splat_and_keyword_splat(*array1, **empty_hash#{block})")
+        check_allocations(1, 1, "splat_and_keyword_splat(*array1, **hash1#{block})")
+        check_allocations(1, 1, "splat_and_keyword_splat(*array1, *empty_array, **hash1#{block})")
+
+        check_allocations(1, 1, "splat_and_keyword_splat(*array1, *empty_array#{block})")
+        check_allocations(1, 1, "splat_and_keyword_splat(*array1, *empty_array, **empty_hash#{block})")
+
+        check_allocations(1, 1, "splat_and_keyword_splat(*array1, *empty_array, a: 2, **empty_hash#{block})")
+        check_allocations(1, 1, "splat_and_keyword_splat(*array1, *empty_array, **hash1, **empty_hash#{block})")
+
+        check_allocations(1, 1, "splat_and_keyword_splat(1, *empty_array, a: 2, **empty_hash#{block})")
+        check_allocations(1, 1, "splat_and_keyword_splat(1, *empty_array, **hash1, **empty_hash#{block})")
+        check_allocations(1, 1, "splat_and_keyword_splat(*array1, **empty_hash, a: 2#{block})")
+        check_allocations(1, 1, "splat_and_keyword_splat(*array1, **hash1, **empty_hash#{block})")
+        check_allocations(1, 1, "splat_and_keyword_splat(*array1, **nil#{block})")
+
+        check_allocations(1, 1, "splat_and_keyword_splat(*r2k_empty_array#{block})")
+        check_allocations(1, 1, "splat_and_keyword_splat(*r2k_array#{block})")
+        check_allocations(1, 1, "splat_and_keyword_splat(*r2k_empty_array1#{block})")
+        check_allocations(1, 1, "splat_and_keyword_splat(*r2k_array1#{block})")
+      RUBY
+    end
+
+    def test_anonymous_splat_and_anonymous_keyword_splat_parameters
+      only_block = block.empty? ? block : block[2..]
+      check_allocations(<<~RUBY)
+        def self.anon_splat_and_anon_keyword_splat(*, **#{block}); end
+
+        check_allocations(1, 1, "anon_splat_and_anon_keyword_splat(1, a: 2#{block})")
+        check_allocations(1, 0, "anon_splat_and_anon_keyword_splat(1, *empty_array, a: 2#{block})")
+        check_allocations(1, 1, "anon_splat_and_anon_keyword_splat(1, a:2, **empty_hash#{block})")
+        check_allocations(1, 1, "anon_splat_and_anon_keyword_splat(1, **empty_hash, a: 2#{block})")
+
+        check_allocations(1, 0, "anon_splat_and_anon_keyword_splat(1, **nil#{block})")
+        check_allocations(1, 0, "anon_splat_and_anon_keyword_splat(1, **empty_hash#{block})")
+        check_allocations(1, 0, "anon_splat_and_anon_keyword_splat(1, **hash1#{block})")
+        check_allocations(1, 0, "anon_splat_and_anon_keyword_splat(1, *empty_array, **hash1#{block})")
+        check_allocations(1, 1, "anon_splat_and_anon_keyword_splat(1, **hash1, **empty_hash#{block})")
+        check_allocations(1, 1, "anon_splat_and_anon_keyword_splat(1, **empty_hash, **hash1#{block})")
+
+        check_allocations(1, 0, "anon_splat_and_anon_keyword_splat(1, *empty_array#{block})")
+        check_allocations(1, 0, "anon_splat_and_anon_keyword_splat(1, *empty_array, *empty_array, **empty_hash#{block})")
+
+        check_allocations(0, 0, "anon_splat_and_anon_keyword_splat(*array1, a: 2#{block})")
+
+        check_allocations(0, 0, "anon_splat_and_anon_keyword_splat(*nil, **nill#{block})")
+        check_allocations(0, 0, "anon_splat_and_anon_keyword_splat(*array1, **nill#{block})")
+        check_allocations(0, 0, "anon_splat_and_anon_keyword_splat(*array1, **empty_hash#{block})")
+        check_allocations(0, 0, "anon_splat_and_anon_keyword_splat(*array1, **hash1#{block})")
+        check_allocations(1, 0, "anon_splat_and_anon_keyword_splat(*array1, *empty_array, **hash1#{block})")
+
+        check_allocations(1, 0, "anon_splat_and_anon_keyword_splat(*array1, *empty_array#{block})")
+        check_allocations(1, 0, "anon_splat_and_anon_keyword_splat(*array1, *empty_array, **empty_hash#{block})")
+
+        check_allocations(1, 1, "anon_splat_and_anon_keyword_splat(*array1, *empty_array, a: 2, **empty_hash#{block})")
+        check_allocations(1, 1, "anon_splat_and_anon_keyword_splat(*array1, *empty_array, **hash1, **empty_hash#{block})")
+
+        check_allocations(0, 0, "anon_splat_and_anon_keyword_splat(#{only_block})")
+        check_allocations(0, 1, "anon_splat_and_anon_keyword_splat(a: 2#{block})")
+        check_allocations(0, 0, "anon_splat_and_anon_keyword_splat(**empty_hash#{block})")
+
+        check_allocations(1, 1, "anon_splat_and_anon_keyword_splat(1, *empty_array, a: 2, **empty_hash#{block})")
+        check_allocations(1, 1, "anon_splat_and_anon_keyword_splat(1, *empty_array, **hash1, **empty_hash#{block})")
+        check_allocations(0, 1, "anon_splat_and_anon_keyword_splat(*array1, **empty_hash, a: 2#{block})")
+        check_allocations(0, 1, "anon_splat_and_anon_keyword_splat(*array1, **hash1, **empty_hash#{block})")
+        check_allocations(0, 0, "anon_splat_and_anon_keyword_splat(*array1, **nil#{block})")
+
+        check_allocations(1, 1, "anon_splat_and_anon_keyword_splat(*r2k_empty_array#{block})")
+        check_allocations(1, 1, "anon_splat_and_anon_keyword_splat(*r2k_array#{block})")
+        check_allocations(1, 1, "anon_splat_and_anon_keyword_splat(*r2k_empty_array1#{block})")
+        check_allocations(1, 1, "anon_splat_and_anon_keyword_splat(*r2k_array1#{block})")
+      RUBY
+    end
+
+    def test_nested_anonymous_splat_and_anonymous_keyword_splat_parameters
+      only_block = block.empty? ? block : block[2..]
+      check_allocations(<<~RUBY)
+        def self.t(*, **#{block}); end
+        def self.anon_splat_and_anon_keyword_splat(*, **#{block}); t(*, **) end
+
+        check_allocations(1, 1, "anon_splat_and_anon_keyword_splat(1, a: 2#{block})")
+        check_allocations(1, 0, "anon_splat_and_anon_keyword_splat(1, *empty_array, a: 2#{block})")
+        check_allocations(1, 1, "anon_splat_and_anon_keyword_splat(1, a:2, **empty_hash#{block})")
+        check_allocations(1, 1, "anon_splat_and_anon_keyword_splat(1, **empty_hash, a: 2#{block})")
+
+        check_allocations(1, 0, "anon_splat_and_anon_keyword_splat(1, **nil#{block})")
+        check_allocations(1, 0, "anon_splat_and_anon_keyword_splat(1, **empty_hash#{block})")
+        check_allocations(1, 0, "anon_splat_and_anon_keyword_splat(1, **hash1#{block})")
+        check_allocations(1, 0, "anon_splat_and_anon_keyword_splat(1, *empty_array, **hash1#{block})")
+        check_allocations(1, 1, "anon_splat_and_anon_keyword_splat(1, **hash1, **empty_hash#{block})")
+        check_allocations(1, 1, "anon_splat_and_anon_keyword_splat(1, **empty_hash, **hash1#{block})")
+
+        check_allocations(1, 0, "anon_splat_and_anon_keyword_splat(1, *empty_array#{block})")
+        check_allocations(1, 0, "anon_splat_and_anon_keyword_splat(1, *empty_array, *empty_array, **empty_hash#{block})")
+
+        check_allocations(0, 0, "anon_splat_and_anon_keyword_splat(*array1, a: 2#{block})")
+
+        check_allocations(0, 0, "anon_splat_and_anon_keyword_splat(*nil, **nill#{block})")
+        check_allocations(0, 0, "anon_splat_and_anon_keyword_splat(*array1, **nill#{block})")
+        check_allocations(0, 0, "anon_splat_and_anon_keyword_splat(*array1, **empty_hash#{block})")
+        check_allocations(0, 0, "anon_splat_and_anon_keyword_splat(*array1, **hash1#{block})")
+        check_allocations(1, 0, "anon_splat_and_anon_keyword_splat(*array1, *empty_array, **hash1#{block})")
+
+        check_allocations(1, 0, "anon_splat_and_anon_keyword_splat(*array1, *empty_array#{block})")
+        check_allocations(1, 0, "anon_splat_and_anon_keyword_splat(*array1, *empty_array, **empty_hash#{block})")
+
+        check_allocations(1, 1, "anon_splat_and_anon_keyword_splat(*array1, *empty_array, a: 2, **empty_hash#{block})")
+        check_allocations(1, 1, "anon_splat_and_anon_keyword_splat(*array1, *empty_array, **hash1, **empty_hash#{block})")
+
+        check_allocations(0, 0, "anon_splat_and_anon_keyword_splat(#{only_block})")
+        check_allocations(0, 1, "anon_splat_and_anon_keyword_splat(a: 2#{block})")
+        check_allocations(0, 0, "anon_splat_and_anon_keyword_splat(**empty_hash#{block})")
+
+        check_allocations(1, 1, "anon_splat_and_anon_keyword_splat(1, *empty_array, a: 2, **empty_hash#{block})")
+        check_allocations(1, 1, "anon_splat_and_anon_keyword_splat(1, *empty_array, **hash1, **empty_hash#{block})")
+        check_allocations(0, 1, "anon_splat_and_anon_keyword_splat(*array1, **empty_hash, a: 2#{block})")
+        check_allocations(0, 1, "anon_splat_and_anon_keyword_splat(*array1, **hash1, **empty_hash#{block})")
+        check_allocations(0, 0, "anon_splat_and_anon_keyword_splat(*array1, **nil#{block})")
+
+        check_allocations(1, 1, "anon_splat_and_anon_keyword_splat(*r2k_empty_array#{block})")
+        check_allocations(1, 1, "anon_splat_and_anon_keyword_splat(*r2k_array#{block})")
+        check_allocations(1, 1, "anon_splat_and_anon_keyword_splat(*r2k_empty_array1#{block})")
+        check_allocations(1, 1, "anon_splat_and_anon_keyword_splat(*r2k_array1#{block})")
+      RUBY
+    end
+
+    def test_argument_forwarding
+      check_allocations(<<~RUBY)
+        def self.argument_forwarding(...); end
+
+        check_allocations(0, 0, "argument_forwarding(1, a: 2#{block})")
+        check_allocations(0, 0, "argument_forwarding(1, *empty_array, a: 2#{block})")
+        check_allocations(0, 1, "argument_forwarding(1, a:2, **empty_hash#{block})")
+        check_allocations(0, 1, "argument_forwarding(1, **empty_hash, a: 2#{block})")
+
+        check_allocations(0, 0, "argument_forwarding(1, **nil#{block})")
+        check_allocations(0, 0, "argument_forwarding(1, **empty_hash#{block})")
+        check_allocations(0, 0, "argument_forwarding(1, **hash1#{block})")
+        check_allocations(0, 0, "argument_forwarding(1, *empty_array, **hash1#{block})")
+        check_allocations(0, 1, "argument_forwarding(1, **hash1, **empty_hash#{block})")
+        check_allocations(0, 1, "argument_forwarding(1, **empty_hash, **hash1#{block})")
+
+        check_allocations(0, 0, "argument_forwarding(1, *empty_array#{block})")
+        check_allocations(1, 0, "argument_forwarding(1, *empty_array, *empty_array, **empty_hash#{block})")
+
+        check_allocations(0, 0, "argument_forwarding(*array1, a: 2#{block})")
+
+        check_allocations(0, 0, "argument_forwarding(**nill#{block})")
+        check_allocations(0, 0, "argument_forwarding(*nil, **nill#{block})")
+        check_allocations(0, 0, "argument_forwarding(*array1, **nill#{block})")
+        check_allocations(0, 0, "argument_forwarding(*array1, **empty_hash#{block})")
+        check_allocations(0, 0, "argument_forwarding(*array1, **hash1#{block})")
+        check_allocations(1, 0, "argument_forwarding(*array1, *empty_array, **hash1#{block})")
+
+        check_allocations(1, 0, "argument_forwarding(*array1, *empty_array#{block})")
+        check_allocations(1, 0, "argument_forwarding(*array1, *empty_array, **empty_hash#{block})")
+
+        check_allocations(1, 1, "argument_forwarding(*array1, *empty_array, a: 2, **empty_hash#{block})")
+        check_allocations(1, 1, "argument_forwarding(*array1, *empty_array, **hash1, **empty_hash#{block})")
+
+        check_allocations(0, 1, "argument_forwarding(1, *empty_array, a: 2, **empty_hash#{block})")
+        check_allocations(0, 1, "argument_forwarding(1, *empty_array, **hash1, **empty_hash#{block})")
+        check_allocations(0, 1, "argument_forwarding(*array1, **empty_hash, a: 2#{block})")
+        check_allocations(0, 1, "argument_forwarding(*array1, **hash1, **empty_hash#{block})")
+        check_allocations(0, 0, "argument_forwarding(*array1, **nil#{block})")
+
+        check_allocations(0, 0, "argument_forwarding(*r2k_empty_array#{block})")
+        check_allocations(0, 0, "argument_forwarding(*r2k_array#{block})")
+        check_allocations(0, 0, "argument_forwarding(*r2k_empty_array1#{block})")
+        check_allocations(0, 0, "argument_forwarding(*r2k_array1#{block})")
+      RUBY
+    end
+
+    def test_nested_argument_forwarding
+      check_allocations(<<~RUBY)
+        def self.t(...) end
+        def self.argument_forwarding(...); t(...) end
+
+        check_allocations(0, 0, "argument_forwarding(1, a: 2#{block})")
+        check_allocations(0, 0, "argument_forwarding(1, *empty_array, a: 2#{block})")
+        check_allocations(0, 1, "argument_forwarding(1, a:2, **empty_hash#{block})")
+        check_allocations(0, 1, "argument_forwarding(1, **empty_hash, a: 2#{block})")
+
+        check_allocations(0, 0, "argument_forwarding(1, **nil#{block})")
+        check_allocations(0, 0, "argument_forwarding(1, **empty_hash#{block})")
+        check_allocations(0, 0, "argument_forwarding(1, **hash1#{block})")
+        check_allocations(0, 0, "argument_forwarding(1, *empty_array, **hash1#{block})")
+        check_allocations(0, 1, "argument_forwarding(1, **hash1, **empty_hash#{block})")
+        check_allocations(0, 1, "argument_forwarding(1, **empty_hash, **hash1#{block})")
+
+        check_allocations(0, 0, "argument_forwarding(1, *empty_array#{block})")
+        check_allocations(1, 0, "argument_forwarding(1, *empty_array, *empty_array, **empty_hash#{block})")
+
+        check_allocations(0, 0, "argument_forwarding(*array1, a: 2#{block})")
+
+        check_allocations(0, 0, "argument_forwarding(**nill#{block})")
+        check_allocations(0, 0, "argument_forwarding(*nil, **nill#{block})")
+        check_allocations(0, 0, "argument_forwarding(*array1, **nill#{block})")
+        check_allocations(0, 0, "argument_forwarding(*array1, **empty_hash#{block})")
+        check_allocations(0, 0, "argument_forwarding(*array1, **hash1#{block})")
+        check_allocations(1, 0, "argument_forwarding(*array1, *empty_array, **hash1#{block})")
+
+        check_allocations(1, 0, "argument_forwarding(*array1, *empty_array#{block})")
+        check_allocations(1, 0, "argument_forwarding(*array1, *empty_array, **empty_hash#{block})")
+
+        check_allocations(1, 1, "argument_forwarding(*array1, *empty_array, a: 2, **empty_hash#{block})")
+        check_allocations(1, 1, "argument_forwarding(*array1, *empty_array, **hash1, **empty_hash#{block})")
+
+        check_allocations(0, 1, "argument_forwarding(1, *empty_array, a: 2, **empty_hash#{block})")
+        check_allocations(0, 1, "argument_forwarding(1, *empty_array, **hash1, **empty_hash#{block})")
+        check_allocations(0, 1, "argument_forwarding(*array1, **empty_hash, a: 2#{block})")
+        check_allocations(0, 1, "argument_forwarding(*array1, **hash1, **empty_hash#{block})")
+        check_allocations(0, 0, "argument_forwarding(*array1, **nil#{block})")
+
+        check_allocations(0, 0, "argument_forwarding(*r2k_empty_array#{block})")
+        check_allocations(0, 0, "argument_forwarding(*r2k_array#{block})")
+        check_allocations(0, 0, "argument_forwarding(*r2k_empty_array1#{block})")
+        check_allocations(0, 0, "argument_forwarding(*r2k_array1#{block})")
+      RUBY
+    end
+
+    def test_ruby2_keywords
+      check_allocations(<<~RUBY)
+        def self.r2k(*a#{block}); end
+        singleton_class.send(:ruby2_keywords, :r2k)
+
+        check_allocations(1, 1, "r2k(1, a: 2#{block})")
+        check_allocations(1, 1, "r2k(1, *empty_array, a: 2#{block})")
+        check_allocations(1, 1, "r2k(1, a:2, **empty_hash#{block})")
+        check_allocations(1, 1, "r2k(1, **empty_hash, a: 2#{block})")
+
+        check_allocations(1, 0, "r2k(1, **nil#{block})")
+        check_allocations(1, 0, "r2k(1, **empty_hash#{block})")
+        check_allocations(1, 1, "r2k(1, **hash1#{block})")
+        check_allocations(1, 1, "r2k(1, *empty_array, **hash1#{block})")
+        check_allocations(1, 1, "r2k(1, **hash1, **empty_hash#{block})")
+        check_allocations(1, 1, "r2k(1, **empty_hash, **hash1#{block})")
+
+        check_allocations(1, 0, "r2k(1, *empty_array#{block})")
+        check_allocations(1, 0, "r2k(1, *empty_array, *empty_array, **empty_hash#{block})")
+
+        check_allocations(1, 1, "r2k(*array1, a: 2#{block})")
+
+        check_allocations(1, 0, "r2k(**nill#{block})")
+        check_allocations(1, 0, "r2k(*nil, **nill#{block})")
+        check_allocations(1, 0, "r2k(*array1, **nill#{block})")
+        check_allocations(1, 0, "r2k(*array1, **empty_hash#{block})")
+        check_allocations(1, 1, "r2k(*array1, **hash1#{block})")
+        check_allocations(1, 1, "r2k(*array1, *empty_array, **hash1#{block})")
+
+        check_allocations(1, 0, "r2k(*array1, *empty_array#{block})")
+        check_allocations(1, 0, "r2k(*array1, *empty_array, **empty_hash#{block})")
+
+        check_allocations(1, 1, "r2k(*array1, *empty_array, a: 2, **empty_hash#{block})")
+        check_allocations(1, 1, "r2k(*array1, *empty_array, **hash1, **empty_hash#{block})")
+
+        check_allocations(1, 1, "r2k(1, *empty_array, a: 2, **empty_hash#{block})")
+        check_allocations(1, 1, "r2k(1, *empty_array, **hash1, **empty_hash#{block})")
+        check_allocations(1, 1, "r2k(*array1, **empty_hash, a: 2#{block})")
+        check_allocations(1, 1, "r2k(*array1, **hash1, **empty_hash#{block})")
+        check_allocations(1, 0, "r2k(*array1, **nil#{block})")
+
+        check_allocations(1, 0, "r2k(*r2k_empty_array#{block})")
+        unless defined?(RubyVM::YJIT.enabled?) && RubyVM::YJIT.enabled?
+          # YJIT may or may not allocate depending on arch?
+          check_allocations(1, 1, "r2k(*r2k_array#{block})")
+          check_allocations(1, 0, "r2k(*r2k_empty_array1#{block})")
+          check_allocations(1, 1, "r2k(*r2k_array1#{block})")
+        end
+      RUBY
+    end
+
+    def test_no_array_allocation_with_splat_and_nonstatic_keywords
+      check_allocations(<<~RUBY)
+        def self.keyword(a: nil, b: nil#{block}); end
+        def self.Object; Object end
+
+        check_allocations(0, 1, "keyword(*nil, a: empty_array#{block})") # LVAR
+        check_allocations(0, 1, "keyword(*empty_array, a: empty_array#{block})") # LVAR
+        check_allocations(0, 1, "->{keyword(*empty_array, a: empty_array#{block})}.call") # DVAR
+        check_allocations(0, 1, "$x = empty_array;  keyword(*empty_array, a: $x#{block})") # GVAR
+        check_allocations(0, 1, "@x = empty_array; keyword(*empty_array, a: @x#{block})") # IVAR
+        check_allocations(0, 1, "self.class.const_set(:X, empty_array); keyword(*empty_array, a: X#{block})") # CONST
+        check_allocations(0, 1, "keyword(*empty_array, a: Object::X#{block})") # COLON2 - safe
+        check_allocations(1, 1, "keyword(*empty_array, a: Object()::X#{block})") # COLON2 - unsafe
+        check_allocations(0, 1, "keyword(*empty_array, a: ::X#{block})") # COLON3
+        check_allocations(0, 1, "T = self; #{'B = block' unless block.empty?}; class Object; @@x = X; T.keyword(*X, a: @@x#{', &B' unless block.empty?}) end") # CVAR
+        check_allocations(0, 1, "keyword(*empty_array, a: empty_array, b: 1#{block})") # INTEGER
+        check_allocations(0, 1, "keyword(*empty_array, a: empty_array, b: 1.0#{block})") # FLOAT
+        check_allocations(0, 1, "keyword(*empty_array, a: empty_array, b: 1.0r#{block})") # RATIONAL
+        check_allocations(0, 1, "keyword(*empty_array, a: empty_array, b: 1.0i#{block})") # IMAGINARY
+        check_allocations(0, 1, "keyword(*empty_array, a: empty_array, b: 'a'#{block})") # STR
+        check_allocations(0, 1, "keyword(*empty_array, a: empty_array, b: :b#{block})") # SYM
+        check_allocations(0, 1, "keyword(*empty_array, a: empty_array, b: /a/#{block})") # REGX
+        check_allocations(0, 1, "keyword(*empty_array, a: self#{block})") # SELF
+        check_allocations(0, 1, "keyword(*empty_array, a: empty_array, b: nil#{block})") # NIL
+        check_allocations(0, 1, "keyword(*empty_array, a: empty_array, b: true#{block})") # TRUE
+        check_allocations(0, 1, "keyword(*empty_array, a: empty_array, b: false#{block})") # FALSE
+        check_allocations(0, 1, "keyword(*empty_array, a: ->{}#{block})") # LAMBDA
+        check_allocations(0, 1, "keyword(*empty_array, a: $1#{block})") # NTH_REF
+        check_allocations(0, 1, "keyword(*empty_array, a: $`#{block})") # BACK_REF
+
+        # LIST: Only 1 array (literal [:c]), not 2 (one for [:c] and one for *empty_array)
+        check_allocations(1, 1, "keyword(*empty_array, a: empty_array, b: [:c]#{block})")
+        check_allocations(1, 1, "keyword(*empty_array, a: empty_array, b: [:c, $x]#{block})")
+        # LIST unsafe: 2 (one for [Object()] and one for *empty_array)
+        check_allocations(2, 1, "keyword(*empty_array, a: empty_array, b: [Object()]#{block})")
+        check_allocations(2, 1, "keyword(*empty_array, a: empty_array, b: [:c, $x, Object()]#{block})")
+      RUBY
+    end
+
+    class WithBlock < self
+      def block
+        ', &block'
+      end
+      def only_block
+        '&block'
+      end
+    end
+  end
+
+  class ProcCall < MethodCall
+    def munge_checks(checks)
+      return checks if @no_munge
+      sub = rep = nil
+      checks.split("\n").map do |line|
+        case line
+        when "singleton_class.send(:ruby2_keywords, :r2k)"
+          "r2k.ruby2_keywords"
+        when /\Adef self.([a-z0-9_]+)\((.*)\);(.*)end\z/
+          sub = $1 + '('
+          rep = $1 + '.('
+          "#{$1} = #{$1} = proc{ |#{$2}| #{$3} }"
+        when /check_allocations/
+          line.gsub(sub, rep)
+        else
+          line
+        end
+      end.join("\n")
+    end
+
+    # Generic argument forwarding not supported in proc definitions
+    undef_method :test_argument_forwarding
+    undef_method :test_nested_argument_forwarding
+
+    # Proc anonymous arguments cannot be used directly
+    undef_method :test_nested_anonymous_splat_and_anonymous_keyword_splat_parameters
+
+    def test_no_array_allocation_with_splat_and_nonstatic_keywords
+      @no_munge = true
+
+      check_allocations(<<~RUBY)
+        keyword = keyword = proc{ |a: nil, b: nil #{block}| }
+        def self.Object; Object end
+
+        check_allocations(0, 1, "keyword.(*empty_array, a: empty_array#{block})") # LVAR
+        check_allocations(0, 1, "->{keyword.(*empty_array, a: empty_array#{block})}.call") # DVAR
+        check_allocations(0, 1, "$x = empty_array;  keyword.(*empty_array, a: $x#{block})") # GVAR
+        check_allocations(0, 1, "@x = empty_array; keyword.(*empty_array, a: @x#{block})") # IVAR
+        check_allocations(0, 1, "self.class.const_set(:X, empty_array); keyword.(*empty_array, a: X#{block})") # CONST
+        check_allocations(0, 1, "keyword.(*empty_array, a: Object::X#{block})") # COLON2 - safe
+        check_allocations(1, 1, "keyword.(*empty_array, a: Object()::X#{block})") # COLON2 - unsafe
+        check_allocations(0, 1, "keyword.(*empty_array, a: ::X#{block})") # COLON3
+        check_allocations(0, 1, "T = keyword; #{'B = block' unless block.empty?}; class Object; @@x = X; T.(*X, a: @@x#{', &B' unless block.empty?}) end") # CVAR
+        check_allocations(0, 1, "keyword.(*empty_array, a: empty_array, b: 1#{block})") # INTEGER
+        check_allocations(0, 1, "keyword.(*empty_array, a: empty_array, b: 1.0#{block})") # FLOAT
+        check_allocations(0, 1, "keyword.(*empty_array, a: empty_array, b: 1.0r#{block})") # RATIONAL
+        check_allocations(0, 1, "keyword.(*empty_array, a: empty_array, b: 1.0i#{block})") # IMAGINARY
+        check_allocations(0, 1, "keyword.(*empty_array, a: empty_array, b: 'a'#{block})") # STR
+        check_allocations(0, 1, "keyword.(*empty_array, a: empty_array, b: :b#{block})") # SYM
+        check_allocations(0, 1, "keyword.(*empty_array, a: empty_array, b: /a/#{block})") # REGX
+        check_allocations(0, 1, "keyword.(*empty_array, a: self#{block})") # SELF
+        check_allocations(0, 1, "keyword.(*empty_array, a: empty_array, b: nil#{block})") # NIL
+        check_allocations(0, 1, "keyword.(*empty_array, a: empty_array, b: true#{block})") # TRUE
+        check_allocations(0, 1, "keyword.(*empty_array, a: empty_array, b: false#{block})") # FALSE
+        check_allocations(0, 1, "keyword.(*empty_array, a: ->{}#{block})") # LAMBDA
+        check_allocations(0, 1, "keyword.(*empty_array, a: $1#{block})") # NTH_REF
+        check_allocations(0, 1, "keyword.(*empty_array, a: $`#{block})") # BACK_REF
+
+        # LIST safe: Only 1 array (literal [:c]), not 2 (one for [:c] and one for *empty_array)
+        check_allocations(1, 1, "keyword.(*empty_array, a: empty_array, b: [:c]#{block})")
+        check_allocations(1, 1, "keyword.(*empty_array, a: empty_array, b: [:c, $x]#{block})")
+        # LIST unsafe: 2 (one for [:c] and one for *empty_array)
+        check_allocations(2, 1, "keyword.(*empty_array, a: empty_array, b: [Object()]#{block})")
+        check_allocations(2, 1, "keyword.(*empty_array, a: empty_array, b: [:c, $x, Object()]#{block})")
+      RUBY
+    end
+
+    class WithBlock < self
+      def block
+        ', &block'
+      end
+      def only_block
+        '&block'
+      end
+    end
+  end
+end
diff --git a/test/ruby/test_argf.rb b/test/ruby/test_argf.rb
index 12f7d6485a1193..55a06296aa7275 100644
--- a/test/ruby/test_argf.rb
+++ b/test/ruby/test_argf.rb
@@ -9,39 +9,23 @@ class TestArgf < Test::Unit::TestCase
   def setup
     @tmpdir = Dir.mktmpdir
     @tmp_count = 0
-    @t1 = make_tempfile0("argf-foo")
-    @t1.binmode
-    @t1.puts "1"
-    @t1.puts "2"
-    @t1.close
-    @t2 = make_tempfile0("argf-bar")
-    @t2.binmode
-    @t2.puts "3"
-    @t2.puts "4"
-    @t2.close
-    @t3 = make_tempfile0("argf-baz")
-    @t3.binmode
-    @t3.puts "5"
-    @t3.puts "6"
-    @t3.close
+    @t1 = make_tempfile("argf-foo", %w"1 2", binmode: true)
+    @t2 = make_tempfile("argf-bar", %w"3 4", binmode: true)
+    @t3 = make_tempfile("argf-baz", %w"5 6", binmode: true)
   end
 
   def teardown
     FileUtils.rmtree(@tmpdir)
   end
 
-  def make_tempfile0(basename)
+  def make_tempfile(basename = "argf-qux", data = %w[foo bar baz], binmode: false)
     @tmp_count += 1
-    open("#{@tmpdir}/#{basename}-#{@tmp_count}", "w")
-  end
-
-  def make_tempfile(basename = "argf-qux")
-    t = make_tempfile0(basename)
-    t.puts "foo"
-    t.puts "bar"
-    t.puts "baz"
-    t.close
-    t
+    path = "#{@tmpdir}/#{basename}-#{@tmp_count}"
+    File.open(path, "w") do |f|
+      f.binmode if binmode
+      f.puts(*data)
+      f
+    end
   end
 
   def ruby(*args, external_encoding: Encoding::UTF_8)
@@ -571,15 +555,11 @@ def test_eof
       end
     end
 
-    t1 = open("#{@tmpdir}/argf-hoge", "w")
-    t1.binmode
-    t1.puts "foo"
-    t1.close
-    t2 = open("#{@tmpdir}/argf-moge", "w")
-    t2.binmode
-    t2.puts "bar"
-    t2.close
-    ruby('-e', 'STDERR.reopen(STDOUT); ARGF.gets; ARGF.skip; p ARGF.eof?', t1.path, t2.path) do |f|
+    t1 = "#{@tmpdir}/argf-hoge"
+    t2 = "#{@tmpdir}/argf-moge"
+    File.binwrite(t1, "foo\n")
+    File.binwrite(t2, "bar\n")
+    ruby('-e', 'STDERR.reopen(STDOUT); ARGF.gets; ARGF.skip; p ARGF.eof?', t1, t2) do |f|
       assert_equal(%w(false), f.read.split(/\n/))
     end
   end
@@ -593,7 +573,7 @@ def test_read
   def test_read2
     ruby('-e', "#{<<~"{#"}\n#{<<~'};'}", @t1.path, @t2.path, @t3.path) do |f|
       {#
-        s = ""
+        s = +""
         ARGF.read(8, s)
         p s
       };
@@ -604,7 +584,7 @@ def test_read2
   def test_read2_with_not_empty_buffer
     ruby('-e', "#{<<~"{#"}\n#{<<~'};'}", @t1.path, @t2.path, @t3.path) do |f|
       {#
-        s = "0123456789"
+        s = +"0123456789"
         ARGF.read(8, s)
         p s
       };
@@ -617,7 +597,7 @@ def test_read3
       {#
         nil while ARGF.gets
         p ARGF.read
-        p ARGF.read(0, "")
+        p ARGF.read(0, +"")
       };
       assert_equal("nil\n\"\"\n", f.read)
     end
@@ -626,13 +606,13 @@ def test_read3
   def test_readpartial
     ruby('-e', "#{<<~"{#"}\n#{<<~'};'}", @t1.path, @t2.path, @t3.path) do |f|
       {#
-        s = ""
+        s = +""
         begin
           loop do
             s << ARGF.readpartial(1)
-            t = ""; ARGF.readpartial(1, t); s << t
+            t = +""; ARGF.readpartial(1, t); s << t
             # not empty buffer
-            u = "abcdef"; ARGF.readpartial(1, u); s << u
+            u = +"abcdef"; ARGF.readpartial(1, u); s << u
           end
         rescue EOFError
           puts s
@@ -645,11 +625,11 @@ def test_readpartial
   def test_readpartial2
     ruby('-e', "#{<<~"{#"}\n#{<<~'};'}") do |f|
       {#
-        s = ""
+        s = +""
         begin
           loop do
             s << ARGF.readpartial(1)
-            t = ""; ARGF.readpartial(1, t); s << t
+            t = +""; ARGF.readpartial(1, t); s << t
           end
         rescue EOFError
           $stdout.binmode
@@ -680,7 +660,7 @@ def test_readpartial_eof_twice
   def test_getc
     ruby('-e', "#{<<~"{#"}\n#{<<~'};'}", @t1.path, @t2.path, @t3.path) do |f|
       {#
-        s = ""
+        s = +""
         while c = ARGF.getc
           s << c
         end
@@ -706,7 +686,7 @@ def test_getbyte
   def test_readchar
     ruby('-e', "#{<<~"{#"}\n#{<<~'};'}", @t1.path, @t2.path, @t3.path) do |f|
       {#
-        s = ""
+        s = +""
         begin
           while c = ARGF.readchar
             s << c
@@ -784,7 +764,7 @@ def test_each_byte
   def test_each_char
     ruby('-e', "#{<<~"{#"}\n#{<<~'};'}", @t1.path, @t2.path, @t3.path) do |f|
       {#
-        s = ""
+        s = +""
         ARGF.each_char {|c| s << c }
         puts s
       };
@@ -854,7 +834,7 @@ def test_file
 
   def test_binmode
     bug5268 = '[ruby-core:39234]'
-    open(@t3.path, "wb") {|f| f.write "5\r\n6\r\n"}
+    File.binwrite(@t3.path, "5\r\n6\r\n")
     ruby('-e', "ARGF.binmode; STDOUT.binmode; puts ARGF.read", @t1.path, @t2.path, @t3.path) do |f|
       f.binmode
       assert_equal("1\n2\n3\n4\n5\r\n6\r\n", f.read, bug5268)
@@ -863,7 +843,7 @@ def test_binmode
 
   def test_textmode
     bug5268 = '[ruby-core:39234]'
-    open(@t3.path, "wb") {|f| f.write "5\r\n6\r\n"}
+    File.binwrite(@t3.path, "5\r\n6\r\n")
     ruby('-e', "STDOUT.binmode; puts ARGF.read", @t1.path, @t2.path, @t3.path) do |f|
       f.binmode
       assert_equal("1\n2\n3\n4\n5\n6\n", f.read, bug5268)
@@ -1073,7 +1053,7 @@ def test_read_nonblock
     ruby('-e', "#{<<~"{#"}\n#{<<~'};'}") do |f|
       {#
         $stdout.sync = true
-        :wait_readable == ARGF.read_nonblock(1, "", exception: false) or
+        :wait_readable == ARGF.read_nonblock(1, +"", exception: false) or
           abort "did not return :wait_readable"
 
         begin
@@ -1086,7 +1066,7 @@ def test_read_nonblock
         IO.select([ARGF]) == [[ARGF], [], []] or
           abort 'did not awaken for readability (before byte)'
 
-        buf = ''
+        buf = +''
         buf.object_id == ARGF.read_nonblock(1, buf).object_id or
           abort "read destination buffer failed"
         print buf
@@ -1140,4 +1120,34 @@ def test_sized_read
       argf.close
     end
   end
+
+  def test_putc
+    t = make_tempfile("argf-#{__method__}", 'bar')
+    ruby('-pi-', '-e', "print ARGF.putc('x')", t.path) do |f|
+    end
+    assert_equal("xxbar\n", File.read(t.path))
+  end
+
+  def test_puts
+    t = make_tempfile("argf-#{__method__}", 'bar')
+    err = "#{@tmpdir}/errout"
+    ruby('-pi-', '-W2', '-e', "print ARGF.puts('foo')", t.path, {err: err}) do |f|
+    end
+    assert_equal("foo\nbar\n", File.read(t.path))
+    assert_empty File.read(err)
+  end
+
+  def test_print
+    t = make_tempfile("argf-#{__method__}", 'bar')
+    ruby('-pi-', '-e', "print ARGF.print('foo')", t.path) do |f|
+    end
+    assert_equal("foobar\n", File.read(t.path))
+  end
+
+  def test_printf
+    t = make_tempfile("argf-#{__method__}", 'bar')
+    ruby('-pi-', '-e', "print ARGF.printf('%s', 'foo')", t.path) do |f|
+    end
+    assert_equal("foobar\n", File.read(t.path))
+  end
 end
diff --git a/test/ruby/test_array.rb b/test/ruby/test_array.rb
index 6c0db0832b93f1..19f79d236dce46 100644
--- a/test/ruby/test_array.rb
+++ b/test/ruby/test_array.rb
@@ -529,14 +529,19 @@ def test_append
   end
 
   def test_assoc
+    def (a4 = Object.new).to_ary
+      %w( pork porcine )
+    end
+
     a1 = @cls[*%w( cat feline )]
     a2 = @cls[*%w( dog canine )]
     a3 = @cls[*%w( mule asinine )]
 
-    a = @cls[ a1, a2, a3 ]
+    a = @cls[ a1, a2, a3, a4 ]
 
     assert_equal(a1, a.assoc('cat'))
     assert_equal(a3, a.assoc('mule'))
+    assert_equal(%w( pork porcine ), a.assoc("pork"))
     assert_equal(nil, a.assoc('asinine'))
     assert_equal(nil, a.assoc('wombat'))
     assert_equal(nil, a.assoc(1..2))
@@ -1109,6 +1114,33 @@ def test_include?
     assert_not_include(a, [1,2])
   end
 
+  def test_monkey_patch_include?
+    assert_separately([], "#{<<~"begin;"}\n#{<<~'end;'}", timeout: 30)
+    begin;
+      $-w = false
+      class Array
+        alias :old_include? :include?
+        def include? x
+          return true if x == :always
+          old_include?(x)
+        end
+      end
+      def test
+        a, c, always = :a, :c, :always
+        [
+          [:a, :b].include?(a),
+          [:a, :b].include?(c),
+          [:a, :b].include?(always),
+        ]
+      end
+      v = test
+      class Array
+        alias :include? :old_include?
+      end
+      assert_equal [true, false, true], v
+    end;
+  end
+
   def test_intersect?
     a = @cls[ 1, 2, 3]
     assert_send([a, :intersect?, [3]])
@@ -1210,6 +1242,17 @@ def test_map!
     assert_equal(@cls[], a)
   end
 
+  def test_pack_format_mutation
+    ary = [Object.new]
+    fmt = "c" * 0x20000
+    class << ary[0]; self end.send(:define_method, :to_int) {
+      fmt.replace ""
+      1
+    }
+    e = assert_raise(RuntimeError) { ary.pack(fmt) }
+    assert_equal "format string modified", e.message
+  end
+
   def test_pack
     a = @cls[*%w( cat wombat x yy)]
     assert_equal("catwomx  yy ", a.pack("A3A3A3A3"))
@@ -1329,13 +1372,17 @@ def test_push
   end
 
   def test_rassoc
+    def (a4 = Object.new).to_ary
+      %w( pork porcine )
+    end
     a1 = @cls[*%w( cat  feline )]
     a2 = @cls[*%w( dog  canine )]
     a3 = @cls[*%w( mule asinine )]
-    a  = @cls[ a1, a2, a3 ]
+    a  = @cls[ a1, a2, a3, a4 ]
 
     assert_equal(a1,  a.rassoc('feline'))
     assert_equal(a3,  a.rassoc('asinine'))
+    assert_equal(%w( pork porcine ), a.rassoc("porcine"))
     assert_equal(nil, a.rassoc('dog'))
     assert_equal(nil, a.rassoc('mule'))
     assert_equal(nil, a.rassoc(1..2))
@@ -1693,6 +1740,15 @@ def test_slice_out_of_range
     assert_equal([100], a.slice(-1, 1_000_000_000))
   end
 
+  def test_slice_gc_compact_stress
+    omit "compaction doesn't work well on s390x" if RUBY_PLATFORM =~ /s390x/ # https://github.com/ruby/ruby/pull/5077
+    EnvUtil.under_gc_compact_stress { assert_equal([1, 2, 3, 4, 5], (0..10).to_a[1, 5]) }
+    EnvUtil.under_gc_compact_stress do
+      a = [0, 1, 2, 3, 4, 5]
+      assert_equal([2, 1, 0], a.slice((2..).step(-1)))
+    end
+  end
+
   def test_slice!
     a = @cls[1, 2, 3, 4, 5]
     assert_equal(3, a.slice!(2))
@@ -2660,6 +2716,18 @@ def test_fetch
     assert_equal(2, [0, 1].fetch(2, 2))
   end
 
+  def test_fetch_values
+    ary = @cls[1, 2, 3]
+    assert_equal([], ary.fetch_values())
+    assert_equal([1], ary.fetch_values(0))
+    assert_equal([3, 1, 3], ary.fetch_values(2, 0, -1))
+    assert_raise(TypeError) {ary.fetch_values("")}
+    assert_raise(IndexError) {ary.fetch_values(10)}
+    assert_raise(IndexError) {ary.fetch_values(-20)}
+    assert_equal(["10 not found"], ary.fetch_values(10) {|i| "#{i} not found"})
+    assert_equal(["10 not found", 3], ary.fetch_values(10, 2) {|i| "#{i} not found"})
+  end
+
   def test_index2
     a = [0, 1, 2]
     assert_equal(a, a.index.to_a)
@@ -2976,13 +3044,12 @@ def test_shuffle
     end
   end
 
-  def test_shuffle_random
-    gen = proc do
-      10000000
-    end
-    class << gen
-      alias rand call
-    end
+  def test_shuffle_random_out_of_range
+    gen = random_generator {10000000}
+    assert_raise(RangeError) {
+      [*0..2].shuffle(random: gen)
+    }
+    gen = random_generator {-1}
     assert_raise(RangeError) {
       [*0..2].shuffle(random: gen)
     }
@@ -2990,27 +3057,16 @@ class << gen
 
   def test_shuffle_random_clobbering
     ary = (0...10000).to_a
-    gen = proc do
+    gen = random_generator do
       ary.replace([])
       0.5
     end
-    class << gen
-      alias rand call
-    end
     assert_raise(RuntimeError) {ary.shuffle!(random: gen)}
   end
 
   def test_shuffle_random_zero
-    zero = Object.new
-    def zero.to_int
-      0
-    end
-    gen_to_int = proc do |max|
-      zero
-    end
-    class << gen_to_int
-      alias rand call
-    end
+    zero = Struct.new(:to_int).new(0)
+    gen_to_int = random_generator {|max| zero}
     ary = (0...10000).to_a
     assert_equal(ary.rotate, ary.shuffle(random: gen_to_int))
   end
@@ -3078,19 +3134,11 @@ def test_sample_unknown_keyword
   def test_sample_random_generator
     ary = (0...10000).to_a
     assert_raise(ArgumentError) {ary.sample(1, 2, random: nil)}
-    gen0 = proc do |max|
-      max/2
-    end
-    class << gen0
-      alias rand call
-    end
-    gen1 = proc do |max|
+    gen0 = random_generator {|max| max/2}
+    gen1 = random_generator do |max|
       ary.replace([])
       max/2
     end
-    class << gen1
-      alias rand call
-    end
     assert_equal(5000, ary.sample(random: gen0))
     assert_nil(ary.sample(random: gen1))
     assert_equal([], ary)
@@ -3121,20 +3169,23 @@ class << gen1
   end
 
   def test_sample_random_generator_half
-    half = Object.new
-    def half.to_int
-      5000
-    end
-    gen_to_int = proc do |max|
-      half
-    end
-    class << gen_to_int
-      alias rand call
-    end
+    half = Struct.new(:to_int).new(5000)
+    gen_to_int = random_generator {|max| half}
     ary = (0...10000).to_a
     assert_equal(5000, ary.sample(random: gen_to_int))
   end
 
+  def test_sample_random_out_of_range
+    gen = random_generator {10000000}
+    assert_raise(RangeError) {
+      [*0..2].sample(random: gen)
+    }
+    gen = random_generator {-1}
+    assert_raise(RangeError) {
+      [*0..2].sample(random: gen)
+    }
+  end
+
   def test_sample_random_invalid_generator
     ary = (0..10).to_a
     assert_raise(NoMethodError) {
@@ -3464,6 +3515,17 @@ def assert_complex_equal(e, v, msg=nil)
     assert_typed_equal(e, v, Complex, msg)
   end
 
+  def test_shrink_shared_array
+    assert_normal_exit(<<~'RUBY', '[Feature #20589]')
+      array = []
+      # Make sure the array is allocated
+      10.times { |i| array << i }
+      # Simulate a C extension using OBJ_FREEZE
+      Object.instance_method(:freeze).bind_call(array)
+      array.dup
+    RUBY
+  end
+
   def test_sum
     assert_int_equal(0, [].sum)
     assert_int_equal(3, [3].sum)
@@ -3538,11 +3600,28 @@ def test_big_array_literal_with_kwsplat
     assert_equal(10000, eval(lit).size)
   end
 
+  def test_array_safely_modified_by_sort_block
+    var_0 = (1..70).to_a
+    var_0.sort! do |var_0_block_129, var_1_block_129|
+      var_0.pop
+      var_1_block_129 <=> var_0_block_129
+    end.shift(3)
+    assert_equal((1..67).to_a.reverse, var_0)
+  end
+
   private
   def need_continuation
     unless respond_to?(:callcc, true)
       EnvUtil.suppress_warning {require 'continuation'}
     end
+    omit 'requires callcc support' unless respond_to?(:callcc, true)
+  end
+
+  def random_generator(&block)
+    class << block
+      alias rand call
+    end
+    block
   end
 end
 
diff --git a/test/ruby/test_assignment.rb b/test/ruby/test_assignment.rb
index 3a8dafb7f0af00..3d0e773c825664 100644
--- a/test/ruby/test_assignment.rb
+++ b/test/ruby/test_assignment.rb
@@ -248,6 +248,16 @@ def test_massign_splat
     a,b,*c = *[*[1,2]]; assert_equal([1,2,[]], [a,b,c])
   end
 
+  def test_massign_optimized_literal_bug_21012
+    a = []
+    def a.[]=(*args)
+      push args
+    end
+    a["a", "b"], = 1
+    a["a", 10], = 2
+    assert_equal [["a", "b", 1], ["a", 10, 2]], a
+  end
+
   def test_assign_rescue
     a = raise rescue 2; assert_equal(2, a)
     a, b = raise rescue [3,4]; assert_equal([3, 4], [a, b])
diff --git a/test/ruby/test_ast.rb b/test/ruby/test_ast.rb
index b4bcc03cfe4db2..d22823470b41f5 100644
--- a/test/ruby/test_ast.rb
+++ b/test/ruby/test_ast.rb
@@ -2,6 +2,7 @@
 require 'test/unit'
 require 'tempfile'
 require 'pp'
+require_relative '../lib/parser_support'
 
 class RubyVM
   module AbstractSyntaxTree
@@ -214,7 +215,144 @@ def test_parse_file_raises_syntax_error
     end
   end
 
+  def assert_parse(code, warning: '')
+    node = assert_warning(warning) {RubyVM::AbstractSyntaxTree.parse(code)}
+    assert_kind_of(RubyVM::AbstractSyntaxTree::Node, node, code)
+  end
+
+  def assert_invalid_parse(msg, code)
+    assert_raise_with_message(SyntaxError, msg, code) do
+      RubyVM::AbstractSyntaxTree.parse(code)
+    end
+  end
+
+  def test_invalid_exit
+    [
+      "break",
+      "break true",
+      "next",
+      "next true",
+      "redo",
+    ].each do |code, *args|
+      msg = /Invalid #{code[/\A\w+/]}/
+      assert_parse("while false; #{code}; end")
+      assert_parse("until true; #{code}; end")
+      assert_parse("begin #{code}; end while false")
+      assert_parse("begin #{code}; end until true")
+      assert_parse("->{#{code}}")
+      assert_parse("->{class X; #{code}; end}")
+      assert_invalid_parse(msg, "#{code}")
+      assert_invalid_parse(msg, "def m; #{code}; end")
+      assert_invalid_parse(msg, "begin; #{code}; end")
+      assert_parse("END {#{code}}")
+
+      assert_parse("!defined?(#{code})")
+      assert_parse("def m; defined?(#{code}); end")
+      assert_parse("!begin; defined?(#{code}); end")
+
+      next if code.include?(" ")
+      assert_parse("!defined? #{code}")
+      assert_parse("def m; defined? #{code}; end")
+      assert_parse("!begin; defined? #{code}; end")
+    end
+  end
+
+  def test_invalid_retry
+    msg = /Invalid retry/
+    assert_invalid_parse(msg, "retry")
+    assert_invalid_parse(msg, "def m; retry; end")
+    assert_invalid_parse(msg, "begin retry; end")
+    assert_parse("begin rescue; retry; end")
+    assert_invalid_parse(msg, "begin rescue; else; retry; end")
+    assert_invalid_parse(msg, "begin rescue; ensure; retry; end")
+    assert_parse("nil rescue retry")
+    assert_invalid_parse(msg, "END {retry}")
+    assert_invalid_parse(msg, "begin rescue; END {retry}; end")
+
+    assert_parse("!defined?(retry)")
+    assert_parse("def m; defined?(retry); end")
+    assert_parse("!begin defined?(retry); end")
+    assert_parse("begin rescue; else; defined?(retry); end")
+    assert_parse("begin rescue; ensure; p defined?(retry); end")
+    assert_parse("END {defined?(retry)}")
+    assert_parse("begin rescue; END {defined?(retry)}; end")
+    assert_parse("!defined? retry")
+
+    assert_parse("def m; defined? retry; end")
+    assert_parse("!begin defined? retry; end")
+    assert_parse("begin rescue; else; defined? retry; end")
+    assert_parse("begin rescue; ensure; p defined? retry; end")
+    assert_parse("END {defined? retry}")
+    assert_parse("begin rescue; END {defined? retry}; end")
+
+    assert_parse("#{<<-"begin;"}\n#{<<-'end;'}")
+    begin;
+      def foo
+        begin
+          yield
+        rescue StandardError => e
+          begin
+            puts "hi"
+            retry
+          rescue
+            retry unless e
+            raise e
+          else
+            retry
+          ensure
+            retry
+          end
+        end
+      end
+    end;
+  end
+
+  def test_invalid_yield
+    msg = /Invalid yield/
+    assert_invalid_parse(msg, "yield")
+    assert_invalid_parse(msg, "class C; yield; end")
+    assert_invalid_parse(msg, "BEGIN {yield}")
+    assert_invalid_parse(msg, "END {yield}")
+    assert_invalid_parse(msg, "-> {yield}")
+
+    assert_invalid_parse(msg, "yield true")
+    assert_invalid_parse(msg, "class C; yield true; end")
+    assert_invalid_parse(msg, "BEGIN {yield true}")
+    assert_invalid_parse(msg, "END {yield true}")
+    assert_invalid_parse(msg, "-> {yield true}")
+
+    assert_parse("!defined?(yield)")
+    assert_parse("class C; defined?(yield); end")
+    assert_parse("BEGIN {defined?(yield)}")
+    assert_parse("END {defined?(yield)}")
+
+    assert_parse("!defined?(yield true)")
+    assert_parse("class C; defined?(yield true); end")
+    assert_parse("BEGIN {defined?(yield true)}")
+    assert_parse("END {defined?(yield true)}")
+
+    assert_parse("!defined? yield")
+    assert_parse("class C; defined? yield; end")
+    assert_parse("BEGIN {defined? yield}")
+    assert_parse("END {defined? yield}")
+  end
+
+  def test_invalid_yield_no_memory_leak
+    # [Bug #21383]
+    assert_no_memory_leak([], "#{<<-"begin;"}", "#{<<-'end;'}", rss: true)
+      code = proc do
+        eval("class C; yield; end")
+      rescue SyntaxError
+      end
+      1_000.times(&code)
+    begin;
+      100_000.times(&code)
+    end;
+  end
+
   def test_node_id_for_location
+    omit if ParserSupport.prism_enabled?
+
     exception = begin
                   raise
                 rescue => e
@@ -234,6 +372,8 @@ def test_node_id_for_backtrace_location_raises_argument_error
   end
 
   def test_of_proc_and_method
+    omit if ParserSupport.prism_enabled? || ParserSupport.prism_enabled_in_subprocess?
+
     proc = Proc.new { 1 + 2 }
     method = self.method(__method__)
 
@@ -263,6 +403,8 @@ def sample_backtrace_location
   end
 
   def test_of_backtrace_location
+    omit if ParserSupport.prism_enabled?
+
     backtrace_location, lineno = sample_backtrace_location
     node = RubyVM::AbstractSyntaxTree.of(backtrace_location)
     assert_instance_of(RubyVM::AbstractSyntaxTree::Node, node)
@@ -274,6 +416,8 @@ def test_of_error
   end
 
   def test_of_proc_and_method_under_eval
+    omit if ParserSupport.prism_enabled?
+
     keep_script_lines_back = RubyVM.keep_script_lines
     RubyVM.keep_script_lines = false
 
@@ -303,6 +447,7 @@ def test_of_proc_and_method_under_eval
   end
 
   def test_of_proc_and_method_under_eval_with_keep_script_lines
+    omit if ParserSupport.prism_enabled?
     pend if ENV['RUBY_ISEQ_DUMP_DEBUG'] # TODO
 
     keep_script_lines_back = RubyVM.keep_script_lines
@@ -334,6 +479,8 @@ def test_of_proc_and_method_under_eval_with_keep_script_lines
   end
 
   def test_of_backtrace_location_under_eval
+    omit if ParserSupport.prism_enabled?
+
     keep_script_lines_back = RubyVM.keep_script_lines
     RubyVM.keep_script_lines = false
 
@@ -352,6 +499,7 @@ def self.sample_backtrace_location
   end
 
   def test_of_backtrace_location_under_eval_with_keep_script_lines
+    omit if ParserSupport.prism_enabled?
     pend if ENV['RUBY_ISEQ_DUMP_DEBUG'] # TODO
 
     keep_script_lines_back = RubyVM.keep_script_lines
@@ -467,7 +615,7 @@ def test_dstr
     assert_equal("foo", head)
     assert_equal(:EVSTR, body.type)
     body, = body.children
-    assert_equal(:LIT, body.type)
+    assert_equal(:INTEGER, body.type)
     assert_equal([1], body.children)
   end
 
@@ -539,7 +687,7 @@ def test_argument_forwarding
       node ? [node.children[-4], node.children[-2]&.children, node.children[-1]] : []
     end
 
-    assert_equal([:*, nil, :&], forwarding.call('...'))
+    assert_equal([:*, [:**], :&], forwarding.call('...'))
   end
 
   def test_ranges_numbered_parameter
@@ -574,6 +722,37 @@ def test_args
     assert_equal(:a, args.children[rest])
   end
 
+  def test_return
+    assert_ast_eqaul(<<~STR, <<~EXP)
+      def m(a)
+        return a
+      end
+    STR
+      (SCOPE@1:0-3:3
+       tbl: []
+       args: nil
+       body:
+         (DEFN@1:0-3:3
+          mid: :m
+          body:
+            (SCOPE@1:0-3:3
+             tbl: [:a]
+             args:
+               (ARGS@1:6-1:7
+                pre_num: 1
+                pre_init: nil
+                opt: nil
+                first_post: nil
+                post_num: 0
+                post_init: nil
+                rest: nil
+                kw: nil
+                kwrest: nil
+                block: nil)
+             body: (RETURN@2:2-2:10 (LVAR@2:9-2:10 :a)))))
+    EXP
+  end
+
   def test_keep_script_lines_for_parse
     node = RubyVM::AbstractSyntaxTree.parse(<<~END, keep_script_lines: true)
 1.times do
@@ -614,6 +793,8 @@ def test_keep_script_lines_for_parse
   end
 
   def test_keep_script_lines_for_of
+    omit if ParserSupport.prism_enabled?
+
     proc = Proc.new { 1 + 2 }
     method = self.method(__method__)
 
@@ -624,6 +805,29 @@ def test_keep_script_lines_for_of
     assert_equal("def test_keep_script_lines_for_of\n", node_method.source.lines.first)
   end
 
+  def test_keep_script_lines_for_of_with_existing_SCRIPT_LINES__that_has__FILE__as_a_key
+    omit if ParserSupport.prism_enabled? || ParserSupport.prism_enabled_in_subprocess?
+
+    # This test confirms that the bug that previously occurred because of
+    # `AbstractSyntaxTree.of`s unnecessary dependence on SCRIPT_LINES__ does not reproduce.
+    # The bug occurred only if SCRIPT_LINES__ included __FILE__ as a key.
+    lines = [
+      "SCRIPT_LINES__ = {__FILE__ => []}",
+      "puts RubyVM::AbstractSyntaxTree.of(->{ 1 + 2 }, keep_script_lines: true).script_lines",
+      "p SCRIPT_LINES__"
+    ]
+    test_stdout = lines + ['{"-e" => []}']
+    assert_in_out_err(["-e", lines.join("\n")], "", test_stdout, [])
+  end
+
+  def test_source_with_multibyte_characters
+    ast = RubyVM::AbstractSyntaxTree.parse(%{a("\u00a7");b("\u00a9")}, keep_script_lines: true)
+    a_fcall, b_fcall = ast.children[2].children
+
+    assert_equal(%{a("\u00a7")}, a_fcall.source)
+    assert_equal(%{b("\u00a9")}, b_fcall.source)
+  end
+
   def test_keep_tokens_for_parse
     node = RubyVM::AbstractSyntaxTree.parse(<<~END, keep_tokens: true)
     1.times do
@@ -671,6 +875,8 @@ def test_encoding_with_keep_script_lines
   end
 
   def test_e_option
+    omit if ParserSupport.prism_enabled? || ParserSupport.prism_enabled_in_subprocess?
+
     assert_in_out_err(["-e", "def foo; end; pp RubyVM::AbstractSyntaxTree.of(method(:foo)).type"],
                       "", [":SCOPE"], [])
   end
@@ -755,7 +961,7 @@ def test_error_tolerant_end_is_short_for_begin
       begin
         a = 1
     STR
-      (SCOPE@1:0-2:7 tbl: [:a] args: nil body: (LASGN@2:2-2:7 :a (LIT@2:6-2:7 1)))
+      (SCOPE@1:0-2:7 tbl: [:a] args: nil body: (LASGN@2:2-2:7 :a (INTEGER@2:6-2:7 1)))
     EXP
   end
 
@@ -768,7 +974,8 @@ def test_error_tolerant_end_is_short_for_if
        tbl: [:a]
        args: nil
        body:
-         (IF@1:0-2:7 (VCALL@1:3-1:7 :cond) (LASGN@2:2-2:7 :a (LIT@2:6-2:7 1)) nil))
+         (IF@1:0-2:7 (VCALL@1:3-1:7 :cond) (LASGN@2:2-2:7 :a (INTEGER@2:6-2:7 1))
+            nil))
     EXP
 
     assert_error_tolerant(<<~STR, <<~EXP)
@@ -780,7 +987,7 @@ def test_error_tolerant_end_is_short_for_if
        tbl: [:a]
        args: nil
        body:
-         (IF@1:0-3:4 (VCALL@1:3-1:7 :cond) (LASGN@2:2-2:7 :a (LIT@2:6-2:7 1))
+         (IF@1:0-3:4 (VCALL@1:3-1:7 :cond) (LASGN@2:2-2:7 :a (INTEGER@2:6-2:7 1))
             (BEGIN@3:4-3:4 nil)))
     EXP
   end
@@ -794,7 +1001,7 @@ def test_error_tolerant_end_is_short_for_unless
        tbl: [:a]
        args: nil
        body:
-         (UNLESS@1:0-2:7 (VCALL@1:7-1:11 :cond) (LASGN@2:2-2:7 :a (LIT@2:6-2:7 1))
+         (UNLESS@1:0-2:7 (VCALL@1:7-1:11 :cond) (LASGN@2:2-2:7 :a (INTEGER@2:6-2:7 1))
             nil))
     EXP
 
@@ -807,7 +1014,7 @@ def test_error_tolerant_end_is_short_for_unless
        tbl: [:a]
        args: nil
        body:
-         (UNLESS@1:0-3:4 (VCALL@1:7-1:11 :cond) (LASGN@2:2-2:7 :a (LIT@2:6-2:7 1))
+         (UNLESS@1:0-3:4 (VCALL@1:7-1:11 :cond) (LASGN@2:2-2:7 :a (INTEGER@2:6-2:7 1))
             (BEGIN@3:4-3:4 nil)))
     EXP
   end
@@ -846,7 +1053,7 @@ def test_error_tolerant_end_is_short_for_case
        args: nil
        body:
          (CASE@1:0-2:6 (VCALL@1:5-1:6 :a)
-            (WHEN@2:0-2:6 (LIST@2:5-2:6 (LIT@2:5-2:6 1) nil) (BEGIN@2:6-2:6 nil)
+            (WHEN@2:0-2:6 (LIST@2:5-2:6 (INTEGER@2:5-2:6 1) nil) (BEGIN@2:6-2:6 nil)
                nil)))
     EXP
 
@@ -863,7 +1070,7 @@ def test_error_tolerant_end_is_short_for_case
             (WHEN@2:0-2:11
                (LIST@2:5-2:11
                   (OPCALL@2:5-2:11 (VCALL@2:5-2:6 :a) :==
-                     (LIST@2:10-2:11 (LIT@2:10-2:11 1) nil)) nil)
+                     (LIST@2:10-2:11 (INTEGER@2:10-2:11 1) nil)) nil)
                (BEGIN@2:11-2:11 nil) nil)))
     EXP
 
@@ -882,7 +1089,7 @@ def test_error_tolerant_end_is_short_for_case
                 const: nil
                 kw:
                   (HASH@2:4-2:13
-                     (LIST@2:4-2:13 (LIT@2:4-2:6 :a) (CONST@2:7-2:13 :String) nil))
+                     (LIST@2:4-2:13 (SYM@2:4-2:6 :a) (CONST@2:7-2:13 :String) nil))
                 kwrest: nil) (BEGIN@2:14-2:14 nil) nil)))
     EXP
   end
@@ -964,7 +1171,7 @@ def test_error_tolerant_end_is_short_for_do_block
        tbl: []
        args: nil
        body:
-         (ITER@1:0-2:3 (FCALL@1:0-1:3 :m (LIST@1:2-1:3 (LIT@1:2-1:3 1) nil))
+         (ITER@1:0-2:3 (FCALL@1:0-1:3 :m (LIST@1:2-1:3 (INTEGER@1:2-1:3 1) nil))
             (SCOPE@1:4-2:3 tbl: [] args: nil body: (VCALL@2:2-2:3 :a))))
     EXP
   end
@@ -1088,10 +1295,43 @@ def test_with_bom
     EXP
   end
 
+  def test_unused_block_local_variable
+    assert_warning('') do
+      RubyVM::AbstractSyntaxTree.parse(%{->(; foo) {}})
+    end
+  end
+
+  def test_memory_leak
+    assert_no_memory_leak([], "#{<<~"begin;"}", "\n#{<<~'end;'}", rss: true)
+    begin;
+      1_000_000.times do
+        eval("")
+      end
+    end;
+  end
+
+  def test_locations
+    begin
+      verbose_bak, $VERBOSE = $VERBOSE, false
+      node = RubyVM::AbstractSyntaxTree.parse("1 + 2")
+    ensure
+      $VERBOSE = verbose_bak
+    end
+    locations = node.locations
+
+    assert_equal(RubyVM::AbstractSyntaxTree::Location, locations[0].class)
+  end
+
+  private
+
   def assert_error_tolerant(src, expected, keep_tokens: false)
+    assert_ast_eqaul(src, expected, error_tolerant: true, keep_tokens: keep_tokens)
+  end
+
+  def assert_ast_eqaul(src, expected, **options)
     begin
       verbose_bak, $VERBOSE = $VERBOSE, false
-      node = RubyVM::AbstractSyntaxTree.parse(src, error_tolerant: true, keep_tokens: keep_tokens)
+      node = RubyVM::AbstractSyntaxTree.parse(src, **options)
     ensure
       $VERBOSE = verbose_bak
     end
@@ -1101,4 +1341,334 @@ def assert_error_tolerant(src, expected, keep_tokens: false)
     assert_equal(expected, str)
     node
   end
+
+  class TestLocation < Test::Unit::TestCase
+    def test_lineno_and_column
+      node = ast_parse("1 + 2")
+      assert_locations(node.locations, [[1, 0, 1, 5]])
+    end
+
+    def test_alias_locations
+      node = ast_parse("alias foo bar")
+      assert_locations(node.children[-1].locations, [[1, 0, 1, 13], [1, 0, 1, 5]])
+    end
+
+    def test_and_locations
+      node = ast_parse("1 and 2")
+      assert_locations(node.children[-1].locations, [[1, 0, 1, 7], [1, 2, 1, 5]])
+
+      node = ast_parse("1 && 2")
+      assert_locations(node.children[-1].locations, [[1, 0, 1, 6], [1, 2, 1, 4]])
+    end
+
+    def test_block_pass_locations
+      node = ast_parse("foo(&bar)")
+      assert_locations(node.children[-1].children[-1].locations, [[1, 4, 1, 8], [1, 4, 1, 5]])
+
+      node = ast_parse("def a(&); b(&) end")
+      assert_locations(node.children[-1].children[-1].children[-1].children[-1].children[-1].locations, [[1, 12, 1, 13], [1, 12, 1, 13]])
+    end
+
+    def test_break_locations
+      node = ast_parse("loop { break 1 }")
+      assert_locations(node.children[-1].children[-1].children[-1].locations, [[1, 7, 1, 14], [1, 7, 1, 12]])
+    end
+
+    def test_case_locations
+      node = ast_parse("case a; when 1; end")
+      assert_locations(node.children[-1].locations, [[1, 0, 1, 19], [1, 0, 1, 4], [1, 16, 1, 19]])
+    end
+
+    def test_case2_locations
+      node = ast_parse("case; when 1; end")
+      assert_locations(node.children[-1].locations, [[1, 0, 1, 17], [1, 0, 1, 4], [1, 14, 1, 17]])
+    end
+
+    def test_case3_locations
+      node = ast_parse("case a; in 1; end")
+      assert_locations(node.children[-1].locations, [[1, 0, 1, 17], [1, 0, 1, 4], [1, 14, 1, 17]])
+    end
+
+    def test_class_locations
+      node = ast_parse("class A end")
+      assert_locations(node.children[-1].locations, [[1, 0, 1, 11], [1, 0, 1, 5], nil, [1, 8, 1, 11]])
+
+      node = ast_parse("class A < B; end")
+      assert_locations(node.children[-1].locations, [[1, 0, 1, 16], [1, 0, 1, 5], [1, 8, 1, 9], [1, 13, 1, 16]])
+    end
+
+    def test_colon2_locations
+      node = ast_parse("A::B")
+      assert_locations(node.children[-1].locations, [[1, 0, 1, 4], [1, 1, 1, 3], [1, 3, 1, 4]])
+
+      node = ast_parse("A::B::C")
+      assert_locations(node.children[-1].locations, [[1, 0, 1, 7], [1, 4, 1, 6], [1, 6, 1, 7]])
+      assert_locations(node.children[-1].children[0].locations, [[1, 0, 1, 4], [1, 1, 1, 3], [1, 3, 1, 4]])
+    end
+
+    def test_colon3_locations
+      node = ast_parse("::A")
+      assert_locations(node.children[-1].locations, [[1, 0, 1, 3], [1, 0, 1, 2], [1, 2, 1, 3]])
+
+      node = ast_parse("::A::B")
+      assert_locations(node.children[-1].locations, [[1, 0, 1, 6], [1, 3, 1, 5], [1, 5, 1, 6]])
+      assert_locations(node.children[-1].children[0].locations, [[1, 0, 1, 3], [1, 0, 1, 2], [1, 2, 1, 3]])
+    end
+
+    def test_dot2_locations
+      node = ast_parse("1..2")
+      assert_locations(node.children[-1].locations, [[1, 0, 1, 4], [1, 1, 1, 3]])
+
+      node = ast_parse("foo(1..2)")
+      assert_locations(node.children[-1].children[-1].children[0].locations, [[1, 4, 1, 8], [1, 5, 1, 7]])
+
+      node = ast_parse("foo(1..2, 3)")
+      assert_locations(node.children[-1].children[-1].children[0].locations, [[1, 4, 1, 8], [1, 5, 1, 7]])
+
+      node = ast_parse("foo(..2)")
+      assert_locations(node.children[-1].children[-1].children[0].locations, [[1, 4, 1, 7], [1, 4, 1, 6]])
+    end
+
+    def test_dot3_locations
+      node = ast_parse("1...2")
+      assert_locations(node.children[-1].locations, [[1, 0, 1, 5], [1, 1, 1, 4]])
+
+      node = ast_parse("foo(1...2)")
+      assert_locations(node.children[-1].children[-1].children[0].locations, [[1, 4, 1, 9], [1, 5, 1, 8]])
+
+      node = ast_parse("foo(1...2, 3)")
+      assert_locations(node.children[-1].children[-1].children[0].locations, [[1, 4, 1, 9], [1, 5, 1, 8]])
+
+      node = ast_parse("foo(...2)")
+      assert_locations(node.children[-1].children[-1].children[0].locations, [[1, 4, 1, 8], [1, 4, 1, 7]])
+    end
+
+    def test_evstr_locations
+      node = ast_parse('"#{foo}"')
+      assert_locations(node.children[-1].children[1].locations, [[1, 0, 1, 8], [1, 1, 1, 3], [1, 6, 1, 7]])
+
+      node = ast_parse('"#$1"')
+      assert_locations(node.children[-1].children[1].locations, [[1, 0, 1, 5], [1, 1, 1, 2], nil])
+    end
+
+    def test_flip2_locations
+      node = ast_parse("if 'a'..'z'; foo; end")
+      assert_locations(node.children[-1].children[0].locations, [[1, 3, 1, 11], [1, 6, 1, 8]])
+
+      node = ast_parse('if 1..5; foo; end')
+      assert_locations(node.children[-1].children[0].locations, [[1, 3, 1, 7], [1, 4, 1, 6]])
+    end
+
+    def test_flip3_locations
+      node = ast_parse("if 'a'...('z'); foo; end")
+      assert_locations(node.children[-1].children[0].locations, [[1, 3, 1, 14], [1, 6, 1, 9]])
+
+      node = ast_parse('if 1...5; foo; end')
+      assert_locations(node.children[-1].children[0].locations, [[1, 3, 1, 8], [1, 4, 1, 7]])
+    end
+
+    def test_for_locations
+      node = ast_parse("for a in b; end")
+      assert_locations(node.children[-1].locations, [[1, 0, 1, 15], [1, 0, 1, 3], [1, 6, 1, 8], nil, [1, 12, 1, 15]])
+
+      node = ast_parse("for a in b do; end")
+      assert_locations(node.children[-1].locations, [[1, 0, 1, 18], [1, 0, 1, 3], [1, 6, 1, 8], [1, 11, 1, 13], [1, 15, 1, 18]])
+    end
+
+    def test_lambda_locations
+      node = ast_parse("-> (a, b) { foo }")
+      assert_locations(node.children[-1].locations, [[1, 0, 1, 17], [1, 0, 1, 2], [1, 10, 1, 11], [1, 16, 1, 17]])
+
+      node = ast_parse("-> (a, b) do foo end")
+      assert_locations(node.children[-1].locations, [[1, 0, 1, 20], [1, 0, 1, 2], [1, 10, 1, 12], [1, 17, 1, 20]])
+    end
+
+    def test_if_locations
+      node = ast_parse("if cond then 1 else 2 end")
+      assert_locations(node.children[-1].locations, [[1, 0, 1, 25], [1, 0, 1, 2], [1, 8, 1, 12], [1, 22, 1, 25]])
+
+      node = ast_parse("1 if 2")
+      assert_locations(node.children[-1].locations, [[1, 0, 1, 6], [1, 2, 1, 4], nil, nil])
+
+      node = ast_parse("if 1; elsif 2; else end")
+      assert_locations(node.children[-1].locations, [[1, 0, 1, 23], [1, 0, 1, 2], [1, 4, 1, 5], [1, 20, 1, 23]])
+      assert_locations(node.children[-1].children[-1].locations, [[1, 6, 1, 19], [1, 6, 1, 11], [1, 13, 1, 14], [1, 20, 1, 23]])
+
+      node = ast_parse("true ? 1 : 2")
+      assert_locations(node.children[-1].locations, [[1, 0, 1, 12], nil, [1, 9, 1, 10], nil])
+
+      node = ast_parse("case a; in b if c; end")
+      assert_locations(node.children[-1].children[1].children[0].locations, [[1, 11, 1, 17], [1, 13, 1, 15], nil, nil])
+    end
+
+    def test_next_locations
+      node = ast_parse("loop { next 1 }")
+      assert_locations(node.children[-1].children[-1].children[-1].locations, [[1, 7, 1, 13], [1, 7, 1, 11]])
+    end
+
+    def test_op_asgn1_locations
+      node = ast_parse("ary[1] += foo")
+      assert_locations(node.children[-1].locations, [[1, 0, 1, 13], nil, [1, 3, 1, 4], [1, 5, 1, 6], [1, 7, 1, 9]])
+
+      node = ast_parse("ary[1, 2] += foo")
+      assert_locations(node.children[-1].locations, [[1, 0, 1, 16], nil, [1, 3, 1, 4], [1, 8, 1, 9], [1, 10, 1, 12]])
+    end
+
+    def test_or_locations
+      node = ast_parse("1 or 2")
+      assert_locations(node.children[-1].locations, [[1, 0, 1, 6], [1, 2, 1, 4]])
+
+      node = ast_parse("1 || 2")
+      assert_locations(node.children[-1].locations, [[1, 0, 1, 6], [1, 2, 1, 4]])
+    end
+
+    def test_op_asgn2_locations
+      node = ast_parse("a.b += 1")
+      assert_locations(node.children[-1].locations, [[1, 0, 1, 8], [1, 1, 1, 2], [1, 2, 1, 3], [1, 4, 1, 6]])
+
+      node = ast_parse("A::B.c += d")
+      assert_locations(node.children[-1].locations, [[1, 0, 1, 11], [1, 4, 1, 5], [1, 5, 1, 6], [1, 7, 1, 9]])
+
+      node = ast_parse("a = b.c += d")
+      assert_locations(node.children[-1].children[-1].locations, [[1, 4, 1, 12], [1, 5, 1, 6], [1, 6, 1, 7], [1, 8, 1, 10]])
+
+      node = ast_parse("a = A::B.c += d")
+      assert_locations(node.children[-1].children[-1].locations, [[1, 4, 1, 15], [1, 8, 1, 9], [1, 9, 1, 10], [1, 11, 1, 13]])
+    end
+
+    def test_postexe_locations
+      node = ast_parse("END {  }")
+      assert_locations(node.children[-1].locations, [[1, 0, 1, 8], [1, 0, 1, 3], [1, 4, 1, 5], [1, 7, 1, 8]])
+
+      node = ast_parse("END { 1 }")
+      assert_locations(node.children[-1].locations, [[1, 0, 1, 9], [1, 0, 1, 3], [1, 4, 1, 5], [1, 8, 1, 9]])
+    end
+
+    def test_redo_locations
+      node = ast_parse("loop { redo }")
+      assert_locations(node.children[-1].children[-1].children[-1].locations, [[1, 7, 1, 11], [1, 7, 1, 11]])
+    end
+
+    def test_regx_locations
+      node = ast_parse("/foo/")
+      assert_locations(node.children[-1].locations, [[1, 0, 1, 5], [1, 0, 1, 1], [1, 1, 1, 4], [1, 4, 1, 5]])
+
+      node = ast_parse("/foo/i")
+      assert_locations(node.children[-1].locations, [[1, 0, 1, 6], [1, 0, 1, 1], [1, 1, 1, 4], [1, 4, 1, 6]])
+    end
+
+    def test_return_locations
+      node = ast_parse("return 1")
+      assert_locations(node.children[-1].locations, [[1, 0, 1, 8], [1, 0, 1, 6]])
+
+      node = ast_parse("return")
+      assert_locations(node.children[-1].locations, [[1, 0, 1, 6], [1, 0, 1, 6]])
+    end
+
+    def test_splat_locations
+      node = ast_parse("a = *1")
+      assert_locations(node.children[-1].children[1].locations, [[1, 4, 1, 6], [1, 4, 1, 5]])
+
+      node = ast_parse("a = *1, 2")
+      assert_locations(node.children[-1].children[1].children[0].locations, [[1, 4, 1, 6], [1, 4, 1, 5]])
+
+      node = ast_parse("case a; when *1; end")
+      assert_locations(node.children[-1].children[1].children[0].locations, [[1, 13, 1, 15], [1, 13, 1, 14]])
+
+      node = ast_parse("case a; when *1, 2; end")
+      assert_locations(node.children[-1].children[1].children[0].children[0].locations, [[1, 13, 1, 15], [1, 13, 1, 14]])
+    end
+
+    def test_super_locations
+      node = ast_parse("super 1")
+      assert_locations(node.children[-1].locations, [[1, 0, 1, 7], [1, 0, 1, 5], nil, nil])
+
+      node = ast_parse("super(1)")
+      assert_locations(node.children[-1].locations, [[1, 0, 1, 8], [1, 0, 1, 5], [1, 5, 1, 6], [1, 7, 1, 8]])
+    end
+
+    def test_unless_locations
+      node = ast_parse("unless cond then 1 else 2 end")
+      assert_locations(node.children[-1].locations, [[1, 0, 1, 29], [1, 0, 1, 6], [1, 12, 1, 16], [1, 26, 1, 29]])
+
+      node = ast_parse("1 unless 2")
+      assert_locations(node.children[-1].locations, [[1, 0, 1, 10], [1, 2, 1, 8], nil, nil])
+    end
+
+    def test_undef_locations
+      node = ast_parse("undef foo")
+      assert_locations(node.children[-1].locations, [[1, 0, 1, 9], [1, 0, 1, 5]])
+
+      node = ast_parse("undef foo, bar")
+      assert_locations(node.children[-1].locations, [[1, 0, 1, 14], [1, 0, 1, 5]])
+    end
+
+    def test_valias_locations
+      node = ast_parse("alias $foo $bar")
+      assert_locations(node.children[-1].locations, [[1, 0, 1, 15], [1, 0, 1, 5]])
+
+      node = ast_parse("alias $foo $&")
+      assert_locations(node.children[-1].locations, [[1, 0, 1, 13], [1, 0, 1, 5]])
+
+      node = ast_parse("alias $foo $`")
+      assert_locations(node.children[-1].locations, [[1, 0, 1, 13], [1, 0, 1, 5]])
+
+      node = ast_parse("alias $foo $'")
+      assert_locations(node.children[-1].locations, [[1, 0, 1, 13], [1, 0, 1, 5]])
+
+      node = ast_parse("alias $foo $+")
+      assert_locations(node.children[-1].locations, [[1, 0, 1, 13], [1, 0, 1, 5]])
+    end
+
+    def test_when_locations
+      node = ast_parse("case a; when 1 then 2; end")
+      assert_locations(node.children[-1].children[1].locations, [[1, 8, 1, 22], [1, 8, 1, 12], [1, 15, 1, 19]])
+    end
+
+    def test_while_locations
+      node = ast_parse("while cond do 1 end")
+      assert_locations(node.children[-1].locations, [[1, 0, 1, 19], [1, 0, 1, 5], [1, 16, 1, 19]])
+
+      node = ast_parse("1 while 2")
+      assert_locations(node.children[-1].locations, [[1, 0, 1, 9], [1, 2, 1, 7], nil])
+    end
+
+    def test_until_locations
+      node = ast_parse("until cond do 1 end")
+      assert_locations(node.children[-1].locations, [[1, 0, 1, 19], [1, 0, 1, 5], [1, 16, 1, 19]])
+
+      node = ast_parse("1 until 2")
+      assert_locations(node.children[-1].locations, [[1, 0, 1, 9], [1, 2, 1, 7], nil])
+    end
+
+    def test_yield_locations
+      node = ast_parse("def foo; yield end")
+      assert_locations(node.children[-1].children[-1].children[-1].locations, [[1, 9, 1, 14], [1, 9, 1, 14], nil, nil])
+
+      node = ast_parse("def foo; yield() end")
+      assert_locations(node.children[-1].children[-1].children[-1].locations, [[1, 9, 1, 16], [1, 9, 1, 14], [1, 14, 1, 15], [1, 15, 1, 16]])
+
+      node = ast_parse("def foo; yield 1, 2 end")
+      assert_locations(node.children[-1].children[-1].children[-1].locations, [[1, 9, 1, 19], [1, 9, 1, 14], nil, nil])
+
+      node = ast_parse("def foo; yield(1, 2) end")
+      assert_locations(node.children[-1].children[-1].children[-1].locations, [[1, 9, 1, 20], [1, 9, 1, 14], [1, 14, 1, 15], [1, 19, 1, 20]])
+    end
+
+    private
+    def ast_parse(src, **options)
+      begin
+        verbose_bak, $VERBOSE = $VERBOSE, nil
+        RubyVM::AbstractSyntaxTree.parse(src, **options)
+      ensure
+        $VERBOSE = verbose_bak
+      end
+    end
+
+    def assert_locations(locations, expected)
+      ary = locations.map {|loc| loc && [loc.first_lineno, loc.first_column, loc.last_lineno, loc.last_column] }
+
+      assert_equal(ary, expected)
+    end
+  end
 end
diff --git a/test/ruby/test_autoload.rb b/test/ruby/test_autoload.rb
index e475520321cb42..607f0e3355efe9 100644
--- a/test/ruby/test_autoload.rb
+++ b/test/ruby/test_autoload.rb
@@ -224,11 +224,18 @@ def ruby_impl_require
     Kernel.module_eval do
       alias old_require require
     end
+    Namespace.module_eval do
+      alias old_require require
+    end
     called_with = []
     Kernel.send :define_method, :require do |path|
       called_with << path
       old_require path
     end
+    Namespace.send :define_method, :require do |path|
+      called_with << path
+      old_require path
+    end
     yield called_with
   ensure
     Kernel.module_eval do
@@ -236,6 +243,11 @@ def ruby_impl_require
       alias require old_require
       undef old_require
     end
+    Namespace.module_eval do
+      undef require
+      alias require old_require
+      undef old_require
+    end
   end
 
   def test_require_implemented_in_ruby_is_called
@@ -249,7 +261,8 @@ def test_require_implemented_in_ruby_is_called
         ensure
           remove_autoload_constant
         end
-        assert_equal [file.path], called_with
+        # .dup to prevent breaking called_with by autoloading pp, etc
+        assert_equal [file.path], called_with.dup
       }
     end
   end
@@ -267,13 +280,18 @@ def test_autoload_while_autoloading
           ensure
             remove_autoload_constant
           end
-          assert_equal [a.path, b.path], called_with
+          # .dup to prevent breaking called_with by autoloading pp, etc
+          assert_equal [a.path, b.path], called_with.dup
         end
       end
     end
   end
 
   def test_bug_13526
+    # Skip this on macOS 10.13 because of the following error:
+    # http://rubyci.s3.amazonaws.com/osx1013/ruby-master/log/20231011T014505Z.fail.html.gz
+    require "rbconfig"
+
     script = File.join(__dir__, 'bug-13526.rb')
     assert_ruby_status([script], '', '[ruby-core:81016] [Bug #13526]')
   end
diff --git a/test/ruby/test_backtrace.rb b/test/ruby/test_backtrace.rb
index bb0562c0bb8e79..dad7dfcb558471 100644
--- a/test/ruby/test_backtrace.rb
+++ b/test/ruby/test_backtrace.rb
@@ -155,6 +155,10 @@ def test_caller_with_nil_length
   end
 
   def test_each_backtrace_location
+    assert_nil(Thread.each_caller_location {})
+
+    assert_raise(LocalJumpError) {Thread.each_caller_location}
+
     i = 0
     cl = caller_locations(1, 1)[0]; ecl = Thread.each_caller_location{|x| i+=1; break x if i == 1}
     assert_equal(cl.to_s, ecl.to_s)
@@ -181,6 +185,10 @@ def test_each_backtrace_location
     assert_raise(StopIteration) {
       ecl.next
     }
+
+    ary = []
+    cl = caller_locations(1, 2); Thread.each_caller_location(1, 2) {|x| ary << x}
+    assert_equal(cl.map(&:to_s), ary.map(&:to_s))
   end
 
   def test_caller_locations_first_label
@@ -215,15 +223,15 @@ def self.foo
       @res = caller_locations(2, 1).inspect
     end
     @line = __LINE__ + 1
-    1.times.map { 1.times.map { foo } }
-    assert_equal("[\"#{__FILE__}:#{@line}:in `times'\"]", @res)
+    [1].map.map { [1].map.map { foo } }
+    assert_equal("[\"#{__FILE__}:#{@line}:in 'Array#map'\"]", @res)
   end
 
   def test_caller_location_path_cfunc_iseq_no_pc
     def self.foo
       @res = caller_locations(2, 1)[0].path
     end
-    1.times.map { 1.times.map { foo } }
+    [1].map.map { [1].map.map { foo } }
     assert_equal(__FILE__, @res)
   end
 
@@ -292,13 +300,13 @@ def test_caller_locations_base_label
   end
 
   def test_caller_locations_label
-    assert_equal("#{__method__}", caller_locations(0, 1)[0].label)
+    assert_equal("TestBacktrace##{__method__}", caller_locations(0, 1)[0].label)
     loc, = tap {break caller_locations(0, 1)}
-    assert_equal("block in #{__method__}", loc.label)
+    assert_equal("block in TestBacktrace##{__method__}", loc.label)
     begin
       raise
     rescue
-      assert_equal("rescue in #{__method__}", caller_locations(0, 1)[0].label)
+      assert_equal("TestBacktrace##{__method__}", caller_locations(0, 1)[0].label)
     end
   end
 
@@ -378,17 +386,17 @@ class << obj
 
   def test_core_backtrace_hash_merge
     e = assert_raise(TypeError) do
-      {**nil}
+      {**1}
     end
     assert_not_match(/\Acore#/, e.backtrace_locations[0].base_label)
   end
 
   def test_notty_backtrace
-    err = ["-:1:in `<main>': unhandled exception"]
+    err = ["-:1:in '<main>': unhandled exception"]
     assert_in_out_err([], "raise", [], err)
 
-    err = ["-:2:in `foo': foo! (RuntimeError)",
-           "\tfrom -:4:in `<main>'"]
+    err = ["-:2:in 'Object#foo': foo! (RuntimeError)",
+           "\tfrom -:4:in '<main>'"]
     assert_in_out_err([], <<-"end;", [], err)
     def foo
       raise "foo!"
@@ -396,12 +404,11 @@ def foo
     foo
     end;
 
-    err = ["-:7:in `rescue in bar': bar! (RuntimeError)",
-           "\tfrom -:4:in `bar'",
-           "\tfrom -:9:in `<main>'",
-           "-:2:in `foo': foo! (RuntimeError)",
-           "\tfrom -:5:in `bar'",
-           "\tfrom -:9:in `<main>'"]
+    err = ["-:7:in 'Object#bar': bar! (RuntimeError)",
+           "\tfrom -:9:in '<main>'",
+           "-:2:in 'Object#foo': foo! (RuntimeError)",
+           "\tfrom -:5:in 'Object#bar'",
+           "\tfrom -:9:in '<main>'"]
     assert_in_out_err([], <<-"end;", [], err)
     def foo
       raise "foo!"
@@ -416,7 +423,7 @@ def bar
   end
 
   def test_caller_to_enum
-    err = ["-:3:in `foo': unhandled exception", "\tfrom -:in `each'"]
+    err = ["-:3:in 'Object#foo': unhandled exception", "\tfrom -:in 'Enumerator#each'"]
     assert_in_out_err([], <<-"end;", [], err, "[ruby-core:91911]")
       def foo
         return to_enum(__method__) unless block_given?
@@ -428,4 +435,35 @@ def foo
       enum.next
     end;
   end
+
+  def test_no_receiver_for_anonymous_class
+    err = ["-:2:in 'bar': unhandled exception", # Not '#<Class:0xXXX>.bar'
+           "\tfrom -:3:in '<main>'"]
+    assert_in_out_err([], <<-"end;", [], err)
+    foo = Class.new
+    def foo.bar = raise
+    foo.bar
+    end;
+
+    err = ["-:3:in 'baz': unhandled exception", # Not '#<Class:0xXXX>::Bar.baz'
+           "\tfrom -:4:in '<main>'"]
+    assert_in_out_err([], <<-"end;", [], err)
+    foo = Class.new
+    foo::Bar = Class.new
+    def (foo::Bar).baz = raise
+    foo::Bar.baz
+    end;
+  end
+
+  def test_backtrace_internal_frame
+    backtrace = tap { break caller_locations(0) }
+    assert_equal(__FILE__, backtrace[1].path) # not "<internal:kernel>"
+    assert_equal("Kernel#tap", backtrace[1].label)
+  end
+
+  def test_backtrace_on_argument_error
+    lineno = __LINE__; [1, 2].inject(:tap)
+  rescue ArgumentError
+    assert_equal("#{ __FILE__ }:#{ lineno }:in 'Kernel#tap'", $!.backtrace[0].to_s)
+  end
 end
diff --git a/test/ruby/test_beginendblock.rb b/test/ruby/test_beginendblock.rb
index 301a746f4ad80a..3706efab52dd0b 100644
--- a/test/ruby/test_beginendblock.rb
+++ b/test/ruby/test_beginendblock.rb
@@ -1,5 +1,6 @@
 # frozen_string_literal: false
 require 'test/unit'
+EnvUtil.suppress_warning {require 'continuation'}
 
 class TestBeginEndBlock < Test::Unit::TestCase
   DIR = File.dirname(File.expand_path(__FILE__))
@@ -67,7 +68,7 @@ def test_exitcode_in_at_exit
     bug8501 = '[ruby-core:55365] [Bug #8501]'
     args = ['-e', 'o = Object.new; def o.inspect; raise "[Bug #8501]"; end',
             '-e', 'at_exit{o.nope}']
-    status = assert_in_out_err(args, '', [], /undefined method `nope'/, bug8501)
+    status = assert_in_out_err(args, '', [], /undefined method 'nope'/, bug8501)
     assert_not_predicate(status, :success?, bug8501)
   end
 
@@ -131,6 +132,8 @@ def test_rescue_at_exit
   end
 
   def test_callcc_at_exit
+    omit 'requires callcc support' unless respond_to?(:callcc)
+
     bug9110 = '[ruby-core:58329][Bug #9110]'
     assert_ruby_status([], "#{<<~"begin;"}\n#{<<~'end;'}", bug9110)
     begin;
diff --git a/test/ruby/test_bignum.rb b/test/ruby/test_bignum.rb
index 065a9448530e05..beef33e2a60ff4 100644
--- a/test/ruby/test_bignum.rb
+++ b/test/ruby/test_bignum.rb
@@ -207,7 +207,7 @@ def test_very_big_str_to_inum
     assert_separately([], "#{<<~"begin;"}\n#{<<~'end;'}")
     begin;
       digits = [["3", 700], ["0", 2700], ["1", 1], ["0", 26599]]
-      num = digits.inject("") {|s,(c,n)|s << c*n}.to_i
+      num = digits.inject(+"") {|s,(c,n)|s << c*n}.to_i
       assert_equal digits.sum {|c,n|n}, num.to_s.size
     end;
   end
@@ -476,8 +476,8 @@ def test_quo
   def test_pow
     assert_equal(1.0, T32 ** 0.0)
     assert_equal(1.0 / T32, T32 ** -1)
-    assert_equal(1, assert_warning(/may be too big/) {T32 ** T32}.infinite?)
-    assert_equal(1, assert_warning(/may be too big/) {T32 ** (2**30-1)}.infinite?)
+    assert_raise(ArgumentError) { T32 ** T32 }
+    assert_raise(ArgumentError) { T32 ** (2**30-1) }
 
     ### rational changes the behavior of Bignum#**
     #assert_raise(TypeError) { T32**"foo" }
@@ -821,5 +821,11 @@ def test_infinite_p
     assert_nil(T1024P.infinite?)
     assert_nil((-T1024P).infinite?)
   end
+
+  def test_gmp_version
+    if RbConfig::CONFIG.fetch('configure_args').include?("'--with-gmp'")
+      assert_kind_of(String, Integer::GMP_VERSION)
+    end
+  end if ENV['GITHUB_WORKFLOW'] == 'Compilations'
 end
 end
diff --git a/test/ruby/test_call.rb b/test/ruby/test_call.rb
index 88a0df4388cb3f..7843f3b476e6c9 100644
--- a/test/ruby/test_call.rb
+++ b/test/ruby/test_call.rb
@@ -3,7 +3,24 @@
 require '-test-/iter'
 
 class TestCall < Test::Unit::TestCase
-  def aaa(a, b=100, *rest)
+  # These dummy method definitions prevent warnings "the block passed to 'a'..."
+  def a(&) = nil
+  def b(&) = nil
+  def c(&) = nil
+  def d(&) = nil
+  def e(&) = nil
+  def f(&) = nil
+  def g(&) = nil
+  def h(&) = nil
+  def i(&) = nil
+  def j(&) = nil
+  def k(&) = nil
+  def l(&) = nil
+  def m(&) = nil
+  def n(&) = nil
+  def o(&) = nil
+
+  def aaa(a, b=100, *rest, &)
     res = [a, b]
     res += rest if rest
     return res
@@ -100,6 +117,12 @@ def test_invalid_safe_call
     }
   end
 
+  def test_frozen_splat_and_keywords
+   a = [1, 2].freeze
+   def self.f(*a); a end
+   assert_equal([1, 2, {kw: 3}], f(*a, kw: 3))
+  end
+
   def test_call_bmethod_proc
     pr = proc{|sym| sym}
     define_singleton_method(:a, &pr)
@@ -115,7 +138,189 @@ def test_call_bmethod_proc_restarg
     assert_equal([10], a(10))
   end
 
-  def test_call_splat_order
+  def test_call_op_asgn_keywords
+    h = Class.new do
+      attr_reader :get, :set
+      def v; yield; [*@get, *@set] end
+      def [](*a, **b, &c) @get = [a, b, c]; @set = []; 3 end
+      def []=(*a, **b, &c) @set = [a, b, c] end
+    end.new
+
+    a = []
+    kw = {}
+    b = lambda{}
+
+    # Prevent "assigned but unused variable" warnings
+    _ = [h, a, kw, b]
+
+    message = /keyword arg given in index assignment/
+
+    # +=, without block, non-popped
+    assert_syntax_error(%q{h[**kw] += 1}, message)
+    assert_syntax_error(%q{h[0, **kw] += 1}, message)
+    assert_syntax_error(%q{h[0, *a, **kw] += 1}, message)
+    assert_syntax_error(%q{h[kw: 5] += 1}, message)
+    assert_syntax_error(%q{h[kw: 5, a: 2] += 1}, message)
+    assert_syntax_error(%q{h[kw: 5, a: 2] += 1}, message)
+    assert_syntax_error(%q{h[0, kw: 5, a: 2] += 1}, message)
+    assert_syntax_error(%q{h[0, *a, kw: 5, a: 2, nil: 3] += 1}, message)
+
+    # +=, with block, non-popped
+    assert_syntax_error(%q{h[**kw, &b] += 1}, message)
+    assert_syntax_error(%q{h[0, **kw, &b] += 1}, message)
+    assert_syntax_error(%q{h[0, *a, **kw, &b] += 1}, message)
+    assert_syntax_error(%q{h[kw: 5, &b] += 1}, message)
+    assert_syntax_error(%q{h[kw: 5, a: 2, &b] += 1}, message)
+    assert_syntax_error(%q{h[kw: 5, a: 2, &b] += 1}, message)
+    assert_syntax_error(%q{h[0, kw: 5, a: 2, &b] += 1}, message)
+    assert_syntax_error(%q{h[0, *a, kw: 5, a: 2, b: 3, &b] += 1}, message)
+
+    # +=, without block, popped
+    assert_syntax_error(%q{h[**kw] += 1; nil}, message)
+    assert_syntax_error(%q{h[0, **kw] += 1; nil}, message)
+    assert_syntax_error(%q{h[0, *a, **kw] += 1; nil}, message)
+    assert_syntax_error(%q{h[kw: 5] += 1; nil}, message)
+    assert_syntax_error(%q{h[kw: 5, a: 2] += 1; nil}, message)
+    assert_syntax_error(%q{h[kw: 5, a: 2] += 1; nil}, message)
+    assert_syntax_error(%q{h[0, kw: 5, a: 2] += 1; nil}, message)
+    assert_syntax_error(%q{h[0, *a, kw: 5, a: 2, nil: 3] += 1; nil}, message)
+
+    # +=, with block, popped
+    assert_syntax_error(%q{h[**kw, &b] += 1; nil}, message)
+    assert_syntax_error(%q{h[0, **kw, &b] += 1; nil}, message)
+    assert_syntax_error(%q{h[0, *a, **kw, &b] += 1; nil}, message)
+    assert_syntax_error(%q{h[kw: 5, &b] += 1; nil}, message)
+    assert_syntax_error(%q{h[kw: 5, a: 2, &b] += 1; nil}, message)
+    assert_syntax_error(%q{h[kw: 5, a: 2, &b] += 1; nil}, message)
+    assert_syntax_error(%q{h[0, kw: 5, a: 2, &b] += 1; nil}, message)
+    assert_syntax_error(%q{h[0, *a, kw: 5, a: 2, b: 3, &b] += 1; nil}, message)
+
+    # &&=, without block, non-popped
+    assert_syntax_error(%q{h[**kw] &&= 1}, message)
+    assert_syntax_error(%q{h[0, **kw] &&= 1}, message)
+    assert_syntax_error(%q{h[0, *a, **kw] &&= 1}, message)
+    assert_syntax_error(%q{h[kw: 5] &&= 1}, message)
+    assert_syntax_error(%q{h[kw: 5, a: 2] &&= 1}, message)
+    assert_syntax_error(%q{h[kw: 5, a: 2] &&= 1}, message)
+    assert_syntax_error(%q{h[0, kw: 5, a: 2] &&= 1}, message)
+    assert_syntax_error(%q{h[0, *a, kw: 5, a: 2, nil: 3] &&= 1}, message)
+
+    # &&=, with block, non-popped
+    assert_syntax_error(%q{h[**kw, &b] &&= 1}, message)
+    assert_syntax_error(%q{h[0, **kw, &b] &&= 1}, message)
+    assert_syntax_error(%q{h[0, *a, **kw, &b] &&= 1}, message)
+    assert_syntax_error(%q{h[kw: 5, &b] &&= 1}, message)
+    assert_syntax_error(%q{h[kw: 5, a: 2, &b] &&= 1}, message)
+    assert_syntax_error(%q{h[kw: 5, a: 2, &b] &&= 1}, message)
+    assert_syntax_error(%q{h[0, kw: 5, a: 2, &b] &&= 1}, message)
+    assert_syntax_error(%q{h[0, *a, kw: 5, a: 2, b: 3, &b] &&= 1}, message)
+
+    # &&=, without block, popped
+    assert_syntax_error(%q{h[**kw] &&= 1; nil}, message)
+    assert_syntax_error(%q{h[0, **kw] &&= 1; nil}, message)
+    assert_syntax_error(%q{h[0, *a, **kw] &&= 1; nil}, message)
+    assert_syntax_error(%q{h[kw: 5] &&= 1; nil}, message)
+    assert_syntax_error(%q{h[kw: 5, a: 2] &&= 1; nil}, message)
+    assert_syntax_error(%q{h[kw: 5, a: 2] &&= 1; nil}, message)
+    assert_syntax_error(%q{h[0, kw: 5, a: 2] &&= 1; nil}, message)
+    assert_syntax_error(%q{h[0, *a, kw: 5, a: 2, nil: 3] &&= 1; nil}, message)
+
+    # &&=, with block, popped
+    assert_syntax_error(%q{h[**kw, &b] &&= 1; nil}, message)
+    assert_syntax_error(%q{h[0, **kw, &b] &&= 1; nil}, message)
+    assert_syntax_error(%q{h[0, *a, **kw, &b] &&= 1; nil}, message)
+    assert_syntax_error(%q{h[kw: 5, &b] &&= 1; nil}, message)
+    assert_syntax_error(%q{h[kw: 5, a: 2, &b] &&= 1; nil}, message)
+    assert_syntax_error(%q{h[kw: 5, a: 2, &b] &&= 1; nil}, message)
+    assert_syntax_error(%q{h[0, kw: 5, a: 2, &b] &&= 1; nil}, message)
+    assert_syntax_error(%q{h[0, *a, kw: 5, a: 2, b: 3, &b] &&= 1; nil}, message)
+
+    # ||=, without block, non-popped
+    assert_syntax_error(%q{h[**kw] ||= 1}, message)
+    assert_syntax_error(%q{h[0, **kw] ||= 1}, message)
+    assert_syntax_error(%q{h[0, *a, **kw] ||= 1}, message)
+    assert_syntax_error(%q{h[kw: 5] ||= 1}, message)
+    assert_syntax_error(%q{h[kw: 5, a: 2] ||= 1}, message)
+    assert_syntax_error(%q{h[kw: 5, a: 2] ||= 1}, message)
+    assert_syntax_error(%q{h[0, kw: 5, a: 2] ||= 1}, message)
+    assert_syntax_error(%q{h[0, *a, kw: 5, a: 2, nil: 3] ||= 1}, message)
+
+    # ||=, with block, non-popped
+    assert_syntax_error(%q{h[**kw, &b] ||= 1}, message)
+    assert_syntax_error(%q{h[0, **kw, &b] ||= 1}, message)
+    assert_syntax_error(%q{h[0, *a, **kw, &b] ||= 1}, message)
+    assert_syntax_error(%q{h[kw: 5, &b] ||= 1}, message)
+    assert_syntax_error(%q{h[kw: 5, a: 2, &b] ||= 1}, message)
+    assert_syntax_error(%q{h[kw: 5, a: 2, &b] ||= 1}, message)
+    assert_syntax_error(%q{h[0, kw: 5, a: 2, &b] ||= 1}, message)
+    assert_syntax_error(%q{h[0, *a, kw: 5, a: 2, b: 3, &b] ||= 1}, message)
+
+    # ||=, without block, popped
+    assert_syntax_error(%q{h[**kw] ||= 1; nil}, message)
+    assert_syntax_error(%q{h[0, **kw] ||= 1; nil}, message)
+    assert_syntax_error(%q{h[0, *a, **kw] ||= 1; nil}, message)
+    assert_syntax_error(%q{h[kw: 5] ||= 1; nil}, message)
+    assert_syntax_error(%q{h[kw: 5, a: 2] ||= 1; nil}, message)
+    assert_syntax_error(%q{h[kw: 5, a: 2] ||= 1; nil}, message)
+    assert_syntax_error(%q{h[0, kw: 5, a: 2] ||= 1; nil}, message)
+    assert_syntax_error(%q{h[0, *a, kw: 5, a: 2, nil: 3] ||= 1; nil}, message)
+
+    # ||=, with block, popped
+    assert_syntax_error(%q{h[**kw, &b] ||= 1; nil}, message)
+    assert_syntax_error(%q{h[0, **kw, &b] ||= 1; nil}, message)
+    assert_syntax_error(%q{h[0, *a, **kw, &b] ||= 1; nil}, message)
+    assert_syntax_error(%q{h[kw: 5, &b] ||= 1; nil}, message)
+    assert_syntax_error(%q{h[kw: 5, a: 2, &b] ||= 1; nil}, message)
+    assert_syntax_error(%q{h[kw: 5, a: 2, &b] ||= 1; nil}, message)
+    assert_syntax_error(%q{h[0, kw: 5, a: 2, &b] ||= 1; nil}, message)
+    assert_syntax_error(%q{h[0, *a, kw: 5, a: 2, b: 3, &b] ||= 1; nil}, message)
+
+  end
+
+  def test_kwsplat_block_order_op_asgn
+    o = Object.new
+    ary = []
+    o.define_singleton_method(:to_a) {ary << :to_a; []}
+    o.define_singleton_method(:to_hash) {ary << :to_hash; {}}
+    o.define_singleton_method(:to_proc) {ary << :to_proc; lambda{}}
+
+    def o.[](...) 2 end
+    def o.[]=(...) end
+
+    message = /keyword arg given in index assignment/
+
+    assert_syntax_error(%q{o[kw: 1] += 1}, message)
+    assert_syntax_error(%q{o[**o] += 1}, message)
+    assert_syntax_error(%q{o[**o, &o] += 1}, message)
+    assert_syntax_error(%q{o[*o, **o, &o] += 1}, message)
+  end
+
+  def test_call_op_asgn_keywords_mutable
+    h = Class.new do
+      attr_reader :get, :set
+      def v; yield; [*@get, *@set] end
+      def [](*a, **b)
+        @get = [a.dup, b.dup]
+        a << :splat_modified
+        b[:kw_splat_modified] = true
+        @set = []
+        3
+      end
+      def []=(*a, **b) @set = [a, b] end
+    end.new
+
+    message = /keyword arg given in index assignment/
+
+    a = []
+    kw = {}
+
+    # Prevent "assigned but unused variable" warnings
+    _ = [h, a, kw]
+
+    assert_syntax_error(%q{h[*a, 2, b: 5, **kw] += 1}, message)
+  end
+
+  def test_call_splat_post_order
     bug12860 = '[ruby-core:77701] [Bug# 12860]'
     ary = [1, 2]
     assert_equal([1, 2, 1], aaa(*ary, ary.shift), bug12860)
@@ -123,7 +328,7 @@ def test_call_splat_order
     assert_equal([0, 1, 2, 1], aaa(0, *ary, ary.shift), bug12860)
   end
 
-  def test_call_block_order
+  def test_call_splat_block_order
     bug16504 = '[ruby-core:96769] [Bug# 16504]'
     b = proc{}
     ary = [1, 2, b]
@@ -132,6 +337,144 @@ def test_call_block_order
     assert_equal([0, 1, 2, b], aaa(0, *ary, &ary.pop), bug16504)
   end
 
+  def test_call_splat_kw_order
+    b = {}
+    ary = [1, 2, b]
+    assert_equal([1, 2, b, {a: b}], aaa(*ary, a: ary.pop))
+    ary = [1, 2, b]
+    assert_equal([0, 1, 2, b, {a: b}], aaa(0, *ary, a: ary.pop))
+  end
+
+  def test_call_splat_kw_splat_order
+    b = {}
+    ary = [1, 2, b]
+    assert_equal([1, 2, b], aaa(*ary, **ary.pop))
+    ary = [1, 2, b]
+    assert_equal([0, 1, 2, b], aaa(0, *ary, **ary.pop))
+  end
+
+  def test_call_args_splat_with_nonhash_keyword_splat
+    o = Object.new
+    def o.to_hash; {a: 1} end
+    def self.f(*a, **kw)
+      kw
+    end
+    assert_equal Hash, f(*[], **o).class
+  end
+
+  def test_call_args_splat_with_pos_arg_kw_splat_is_not_mutable
+    o = Object.new
+    def o.foo(a, **h)= h[:splat_modified] = true
+
+    a = []
+    b = {splat_modified: false}
+
+    o.foo(*a, :x, **b)
+
+    assert_equal({splat_modified: false}, b)
+  end
+
+  def test_anon_splat
+    r2kh = Hash.ruby2_keywords_hash(kw: 2)
+    r2kea = [r2kh]
+    r2ka = [1, r2kh]
+
+    def self.s(*) ->(*a){a}.call(*) end
+    assert_equal([], s)
+    assert_equal([1], s(1))
+    assert_equal([{kw: 2}], s(kw: 2))
+    assert_equal([{kw: 2}], s(**{kw: 2}))
+    assert_equal([1, {kw: 2}], s(1, kw: 2))
+    assert_equal([1, {kw: 2}], s(1, **{kw: 2}))
+    assert_equal([{kw: 2}], s(*r2kea))
+    assert_equal([1, {kw: 2}], s(*r2ka))
+
+    singleton_class.remove_method(:s)
+    def self.s(*, kw: 0) [*->(*a){a}.call(*), kw] end
+    assert_equal([0], s)
+    assert_equal([1, 0], s(1))
+    assert_equal([2], s(kw: 2))
+    assert_equal([2], s(**{kw: 2}))
+    assert_equal([1, 2], s(1, kw: 2))
+    assert_equal([1, 2], s(1, **{kw: 2}))
+    assert_equal([2], s(*r2kea))
+    assert_equal([1, 2], s(*r2ka))
+
+    singleton_class.remove_method(:s)
+    def self.s(*, **kw) [*->(*a){a}.call(*), kw] end
+    assert_equal([{}], s)
+    assert_equal([1, {}], s(1))
+    assert_equal([{kw: 2}], s(kw: 2))
+    assert_equal([{kw: 2}], s(**{kw: 2}))
+    assert_equal([1, {kw: 2}], s(1, kw: 2))
+    assert_equal([1, {kw: 2}], s(1, **{kw: 2}))
+    assert_equal([{kw: 2}], s(*r2kea))
+    assert_equal([1, {kw: 2}], s(*r2ka))
+
+    singleton_class.remove_method(:s)
+    def self.s(*, kw: 0, **kws) [*->(*a){a}.call(*), kw, kws] end
+    assert_equal([0, {}], s)
+    assert_equal([1, 0, {}], s(1))
+    assert_equal([2, {}], s(kw: 2))
+    assert_equal([2, {}], s(**{kw: 2}))
+    assert_equal([1, 2, {}], s(1, kw: 2))
+    assert_equal([1, 2, {}], s(1, **{kw: 2}))
+    assert_equal([2, {}], s(*r2kea))
+    assert_equal([1, 2, {}], s(*r2ka))
+  end
+
+  def test_kwsplat_block_eval_order
+    def self.t(**kw, &b) [kw, b] end
+
+    pr = ->{}
+    h = {a: pr}
+    a = []
+
+    ary = t(**h, &h.delete(:a))
+    assert_equal([{a: pr}, pr], ary)
+
+    h = {a: pr}
+    ary = t(*a, **h, &h.delete(:a))
+    assert_equal([{a: pr}, pr], ary)
+  end
+
+  def test_kwsplat_block_order
+    o = Object.new
+    ary = []
+    o.define_singleton_method(:to_a) {ary << :to_a; []}
+    o.define_singleton_method(:to_hash) {ary << :to_hash; {}}
+    o.define_singleton_method(:to_proc) {ary << :to_proc; lambda{}}
+
+    def self.t(...) end
+
+    t(**o, &o)
+    assert_equal([:to_hash, :to_proc], ary)
+
+    ary.clear
+    t(*o, **o, &o)
+    assert_equal([:to_a, :to_hash, :to_proc], ary)
+  end
+
+  def test_kwsplat_block_order_super
+    def self.t(splat)
+      o = Object.new
+      ary = []
+      o.define_singleton_method(:to_a) {ary << :to_a; []}
+      o.define_singleton_method(:to_hash) {ary << :to_hash; {}}
+      o.define_singleton_method(:to_proc) {ary << :to_proc; lambda{}}
+      if splat
+        super(*o, **o, &o)
+      else
+        super(**o, &o)
+      end
+      ary
+    end
+    extend Module.new{def t(...) end}
+
+    assert_equal([:to_hash, :to_proc], t(false))
+    assert_equal([:to_a, :to_hash, :to_proc], t(true))
+  end
+
   OVER_STACK_LEN = (ENV['RUBY_OVER_STACK_LEN'] || 150).to_i # Greater than VM_ARGC_STACK_MAX
   OVER_STACK_ARGV = OVER_STACK_LEN.times.to_a.freeze
 
diff --git a/test/ruby/test_case.rb b/test/ruby/test_case.rb
index 4a0f1bf78d0f44..9e8502fb275ab5 100644
--- a/test/ruby/test_case.rb
+++ b/test/ruby/test_case.rb
@@ -68,10 +68,13 @@ def test_case
       assert(false)
     end
 
-    assert_raise(NameError) do
-      case
-      when false, *x, false
+    begin
+      verbose_bak, $VERBOSE = $VERBOSE, nil
+      assert_raise(NameError) do
+        eval("case; when false, *x, false; end")
       end
+    ensure
+      $VERBOSE = verbose_bak
     end
   end
 
diff --git a/test/ruby/test_class.rb b/test/ruby/test_class.rb
index a8a019cee2d9e6..9a34a81334f5ba 100644
--- a/test/ruby/test_class.rb
+++ b/test/ruby/test_class.rb
@@ -283,12 +283,8 @@ def test_uninitialized
     assert_raise(TypeError, bug6863) { Class.new(Class.allocate) }
 
     allocator = Class.instance_method(:allocate)
-    assert_raise_with_message(TypeError, /prohibited/) {
-      allocator.bind(Rational).call
-    }
-    assert_raise_with_message(TypeError, /prohibited/) {
-      allocator.bind_call(Rational)
-    }
+    assert_nothing_raised { allocator.bind(Rational).call }
+    assert_nothing_raised { allocator.bind_call(Rational) }
   end
 
   def test_nonascii_name
@@ -316,6 +312,7 @@ def test_invalid_retry_from_class_definition
 
   def test_invalid_return_from_class_definition
     assert_syntax_error("class C; return; end", /Invalid return/)
+    assert_syntax_error("class << Object; return; end", /Invalid return/)
   end
 
   def test_invalid_yield_from_class_definition
@@ -720,9 +717,13 @@ def test_redefinition_mismatch
 
     assert_separately([], "#{<<~"begin;"}\n#{<<~"end;"}")
     begin;
-      Date = (class C\u{1f5ff}; self; end).new
+      module Bug
+        module Class
+          TestClassDefinedInC = (class C\u{1f5ff}; self; end).new
+        end
+      end
       assert_raise_with_message(TypeError, /C\u{1f5ff}/) {
-        require 'date'
+        require '-test-/class'
       }
     end;
   end
@@ -789,15 +790,15 @@ def test_attached_object
       c.attached_object
     end
 
-    assert_raise_with_message(TypeError, /`NilClass' is not a singleton class/) do
+    assert_raise_with_message(TypeError, /'NilClass' is not a singleton class/) do
       nil.singleton_class.attached_object
     end
 
-    assert_raise_with_message(TypeError, /`FalseClass' is not a singleton class/) do
+    assert_raise_with_message(TypeError, /'FalseClass' is not a singleton class/) do
       false.singleton_class.attached_object
     end
 
-    assert_raise_with_message(TypeError, /`TrueClass' is not a singleton class/) do
+    assert_raise_with_message(TypeError, /'TrueClass' is not a singleton class/) do
       true.singleton_class.attached_object
     end
   end
@@ -836,4 +837,12 @@ def test_instance_freeze_dont_freeze_the_class_bug_19164
     klass.define_method(:bar) {}
     assert_equal klass, klass.remove_method(:bar), '[Bug #19164]'
   end
+
+  def test_method_table_assignment_just_after_class_init
+    assert_normal_exit "#{<<~"begin;"}\n#{<<~'end;'}", 'm_tbl assignment should be done only when Class object is not promoted'
+    begin;
+      GC.stress = true
+      class C; end
+    end;
+  end
 end
diff --git a/test/ruby/test_clone.rb b/test/ruby/test_clone.rb
index 216eaa39d25b12..775c9ed8481703 100644
--- a/test/ruby/test_clone.rb
+++ b/test/ruby/test_clone.rb
@@ -73,6 +73,13 @@ def test_frozen_properties_and_ivars_retained_on_clone_with_ivar
     assert_equal(cloned_obj.instance_variable_get(:@a), 1)
   end
 
+  def test_proc_obj_id_flag_reset
+    # [Bug #20250]
+    proc = Proc.new { }
+    proc.object_id
+    proc.clone.object_id # Would crash with RUBY_DEBUG=1
+  end
+
   def test_user_flags
     assert_separately([], <<-EOS)
       #
diff --git a/test/ruby/test_comparable.rb b/test/ruby/test_comparable.rb
index 4a90d443bf9cc9..b689469d9e6327 100644
--- a/test/ruby/test_comparable.rb
+++ b/test/ruby/test_comparable.rb
@@ -85,6 +85,12 @@ def test_clamp
     assert_equal(1, @o.clamp(1, 1))
     assert_equal(@o, @o.clamp(0, 0))
 
+    assert_equal(@o, @o.clamp(nil, 2))
+    assert_equal(-2, @o.clamp(nil, -2))
+    assert_equal(@o, @o.clamp(-2, nil))
+    assert_equal(2, @o.clamp(2, nil))
+    assert_equal(@o, @o.clamp(nil, nil))
+
     assert_raise_with_message(ArgumentError, 'min argument must be less than or equal to max argument') {
       @o.clamp(2, 1)
     }
diff --git a/test/ruby/test_compile_prism.rb b/test/ruby/test_compile_prism.rb
new file mode 100644
index 00000000000000..86f7f0b14f1fb2
--- /dev/null
+++ b/test/ruby/test_compile_prism.rb
@@ -0,0 +1,2702 @@
+# frozen_string_literal: true
+
+# This file is organized to match itemization in https://github.com/ruby/prism/issues/1335
+module Prism
+  class TestCompilePrism < Test::Unit::TestCase
+    def test_iseq_has_node_id
+      code = "proc { <<END }\n hello\nEND"
+      iseq = RubyVM::InstructionSequence.compile_prism(code)
+      assert_operator iseq.to_a[4][:node_id], :>, -1
+    end
+
+    # Subclass is used for tests which need it
+    class Subclass; end
+    ############################################################################
+    # Literals                                                                 #
+    ############################################################################
+
+    def test_FalseNode
+      assert_prism_eval("false")
+    end
+
+    def test_FloatNode
+      assert_prism_eval("1.2")
+      assert_prism_eval("1.2e3")
+      assert_prism_eval("+1.2e+3")
+      assert_prism_eval("-1.2e-3")
+    end
+
+    def test_ImaginaryNode
+      assert_prism_eval("1i")
+      assert_prism_eval("+1.0i")
+      assert_prism_eval("1ri")
+    end
+
+    def test_IntegerNode
+      assert_prism_eval("1")
+      assert_prism_eval("+1")
+      assert_prism_eval("-1")
+      assert_prism_eval("0x10")
+      assert_prism_eval("0b10")
+      assert_prism_eval("0o10")
+      assert_prism_eval("010")
+      assert_prism_eval("(0o00)")
+    end
+
+    def test_NilNode
+      assert_prism_eval("nil")
+    end
+
+    def test_RationalNode
+      assert_prism_eval("1.2r")
+      assert_prism_eval("+1.2r")
+    end
+
+    def test_SelfNode
+      assert_prism_eval("self")
+    end
+
+    def test_SourceEncodingNode
+      assert_prism_eval("__ENCODING__")
+    end
+
+    def test_SourceFileNode
+      assert_prism_eval("__FILE__")
+    end
+
+    def test_SourceLineNode
+      assert_prism_eval("__LINE__", raw: true)
+    end
+
+    def test_TrueNode
+      assert_prism_eval("true")
+    end
+
+    ############################################################################
+    # Reads                                                                    #
+    ############################################################################
+
+    def test_BackReferenceReadNode
+      assert_prism_eval("$+")
+    end
+
+    def test_ClassVariableReadNode
+      assert_prism_eval("class Prism::TestCompilePrism; @@pit = 1; @@pit; end")
+    end
+
+    def test_ConstantPathNode
+      assert_prism_eval("Prism::TestCompilePrism")
+    end
+
+    def test_ConstantReadNode
+      assert_prism_eval("Prism")
+    end
+
+    Z = 1
+
+    def test_DefinedNode
+      assert_prism_eval("defined? nil")
+      assert_prism_eval("defined? self")
+      assert_prism_eval("defined? true")
+      assert_prism_eval("defined? false")
+      assert_prism_eval("defined? 1")
+      assert_prism_eval("defined? 1i")
+      assert_prism_eval("defined? 1.0")
+      assert_prism_eval("defined? 1..2")
+      assert_prism_eval("defined? [A, B, C]")
+      assert_prism_eval("defined? [1, 2, 3]")
+      assert_prism_eval("defined?({ a: 1 })")
+      assert_prism_eval("defined? 'str'")
+      assert_prism_eval('defined?("#{expr}")')
+      assert_prism_eval("defined? :sym")
+      assert_prism_eval("defined? /foo/")
+      assert_prism_eval('defined?(/#{1}/)')
+      assert_prism_eval("defined? -> { 1 + 1 }")
+      assert_prism_eval("defined? a && b")
+      assert_prism_eval("defined? a || b")
+      assert_prism_eval("defined? __ENCODING__")
+      assert_prism_eval("defined? __FILE__")
+      assert_prism_eval("defined? __LINE__")
+
+      assert_prism_eval("defined? %[1,2,3]")
+      assert_prism_eval("defined? %q[1,2,3]")
+      assert_prism_eval("defined? %Q[1,2,3]")
+      assert_prism_eval("defined? %r[1,2,3]")
+      assert_prism_eval("defined? %i[1,2,3]")
+      assert_prism_eval("defined? %I[1,2,3]")
+      assert_prism_eval("defined? %w[1,2,3]")
+      assert_prism_eval("defined? %W[1,2,3]")
+      assert_prism_eval("defined? %s[1,2,3]")
+      assert_prism_eval("defined? %x[1,2,3]")
+
+      assert_prism_eval("defined? [*b]")
+      assert_prism_eval("defined? [[*1..2], 3, *4..5]")
+      assert_prism_eval("defined? [a: [:b, :c]]")
+      assert_prism_eval("defined? 1 in 1")
+
+      assert_prism_eval("defined? @a")
+      assert_prism_eval("defined? $a")
+      assert_prism_eval("defined? @@a")
+      assert_prism_eval("defined? A")
+      assert_prism_eval("defined? ::A")
+      assert_prism_eval("defined? A::B")
+      assert_prism_eval("defined? A::B::C")
+      assert_prism_eval("defined? #{self.class.name}::Z::A")
+      assert_prism_eval("defined? yield")
+      assert_prism_eval("defined? super")
+
+      assert_prism_eval("defined? X = 1")
+      assert_prism_eval("defined? X *= 1")
+      assert_prism_eval("defined? X /= 1")
+      assert_prism_eval("defined? X &= 1")
+      assert_prism_eval("defined? X ||= 1")
+
+      assert_prism_eval("defined? $1")
+      assert_prism_eval("defined? $2")
+      assert_prism_eval("defined? $`")
+      assert_prism_eval("defined? $'")
+      assert_prism_eval("defined? $+")
+
+      assert_prism_eval("defined? $X = 1")
+      assert_prism_eval("defined? $X *= 1")
+      assert_prism_eval("defined? $X /= 1")
+      assert_prism_eval("defined? $X &= 1")
+      assert_prism_eval("defined? $X ||= 1")
+
+      assert_prism_eval("defined? @@X = 1")
+      assert_prism_eval("defined? @@X *= 1")
+      assert_prism_eval("defined? @@X /= 1")
+      assert_prism_eval("defined? @@X &= 1")
+      assert_prism_eval("defined? @@X ||= 1")
+
+      assert_prism_eval("defined? @X = 1")
+      assert_prism_eval("defined? @X *= 1")
+      assert_prism_eval("defined? @X /= 1")
+      assert_prism_eval("defined? @X &= 1")
+      assert_prism_eval("defined? @X ||= 1")
+
+      assert_prism_eval("x = 1; defined? x = 1")
+      assert_prism_eval("x = 1; defined? x *= 1")
+      assert_prism_eval("x = 1; defined? x /= 1")
+      assert_prism_eval("x = 1; defined? x &= 1")
+      assert_prism_eval("x = 1; defined? x ||= 1")
+
+      assert_prism_eval("if defined? A; end")
+
+      assert_prism_eval("defined?(())")
+      assert_prism_eval("defined?(('1'))")
+
+      # method chain starting with self that's truthy
+      assert_prism_eval("defined?(self.itself.itself.itself)")
+
+      # method chain starting with self that's false (exception swallowed)
+      assert_prism_eval("defined?(self.itself.itself.neat)")
+
+      # single self with method, truthy
+      assert_prism_eval("defined?(self.itself)")
+
+      # single self with method, false
+      assert_prism_eval("defined?(self.neat!)")
+
+      # method chain implicit self that's truthy
+      assert_prism_eval("defined?(itself.itself.itself)")
+
+      # method chain implicit self that's false
+      assert_prism_eval("defined?(itself.neat.itself)")
+
+      ## single method implicit self that's truthy
+      assert_prism_eval("defined?(itself)")
+
+      ## single method implicit self that's false
+      assert_prism_eval("defined?(neatneat)")
+
+      assert_prism_eval("defined?(a(itself))")
+      assert_prism_eval("defined?(itself(itself))")
+
+      # method chain with a block on the inside
+      assert_prism_eval("defined?(itself { 1 }.itself)")
+
+      # method chain with parenthesized receiver
+      assert_prism_eval("defined?((itself).itself)")
+
+      # Method chain on a constant
+      assert_prism_eval(<<~RUBY)
+        class PrismDefinedNode
+          def m1; end
+        end
+
+        defined?(PrismDefinedNode.new.m1)
+      RUBY
+
+      assert_prism_eval("defined?(next)")
+      assert_prism_eval("defined?(break)")
+      assert_prism_eval("defined?(redo)")
+      assert_prism_eval("defined?(retry)")
+
+      assert_prism_eval(<<~RUBY)
+        class PrismDefinedReturnNode
+          def self.m1; defined?(return) end
+        end
+
+        PrismDefinedReturnNode.m1
+      RUBY
+
+      assert_prism_eval("defined?(begin; 1; end)")
+
+      assert_prism_eval("defined?(defined?(a))")
+      assert_prism_eval('defined?(:"#{1}")')
+      assert_prism_eval("defined?(`echo #{1}`)")
+
+      assert_prism_eval("defined?(PrismTestSubclass.test_call_and_write_node &&= 1)")
+      assert_prism_eval("defined?(PrismTestSubclass.test_call_operator_write_node += 1)")
+      assert_prism_eval("defined?(PrismTestSubclass.test_call_or_write_node ||= 1)")
+      assert_prism_eval("defined?(Prism::CPAWN &&= 1)")
+      assert_prism_eval("defined?(Prism::CPOWN += 1)")
+      assert_prism_eval("defined?(Prism::CPOrWN ||= 1)")
+      assert_prism_eval("defined?(Prism::CPWN = 1)")
+      assert_prism_eval("defined?([0][0] &&= 1)")
+      assert_prism_eval("defined?([0][0] += 1)")
+      assert_prism_eval("defined?([0][0] ||= 1)")
+
+      assert_prism_eval("defined?(case :a; when :a; 1; else; 2; end)")
+      assert_prism_eval("defined?(case [1, 2, 3]; in [1, 2, 3]; 4; end)")
+      assert_prism_eval("defined?(class PrismClassA; end)")
+      assert_prism_eval("defined?(def prism_test_def_node; end)")
+      assert_prism_eval("defined?(for i in [1,2] do; i; end)")
+      assert_prism_eval("defined?(if true; 1; end)")
+      assert_prism_eval("defined?(/(?<foo>bar)/ =~ 'barbar')")
+      assert_prism_eval("defined?(1 => 1)")
+      assert_prism_eval("defined?(module M; end)")
+      assert_prism_eval("defined?(1.2r)")
+      assert_prism_eval("defined?(class << self; end)")
+      assert_prism_eval("defined?(while a != 1; end)")
+      assert_prism_eval("defined?(until a == 1; end)")
+      assert_prism_eval("defined?(unless true; 1; end)")
+    end
+
+    def test_GlobalVariableReadNode
+      assert_prism_eval("$pit = 1; $pit")
+    end
+
+    def test_InstanceVariableReadNode
+      assert_prism_eval("class Prism::TestCompilePrism; @pit = 1; @pit; end")
+    end
+
+    def test_LocalVariableReadNode
+      assert_prism_eval("pit = 1; pit")
+    end
+
+    def test_NumberedReferenceReadNode
+      assert_prism_eval("$1")
+      assert_prism_eval("$99999")
+    end
+
+    ############################################################################
+    # Writes                                                                   #
+    ############################################################################
+
+    def test_ClassVariableAndWriteNode
+      assert_prism_eval("class Prism::TestCompilePrism; @@pit = 0; @@pit &&= 1; end")
+    end
+
+    def test_ClassVariableOperatorWriteNode
+      assert_prism_eval("class Prism::TestCompilePrism; @@pit = 0; @@pit += 1; end")
+    end
+
+    def test_ClassVariableOrWriteNode
+      assert_prism_eval("class Prism::TestCompilePrism; @@pit = 1; @@pit ||= 0; end")
+      assert_prism_eval("class Prism::TestCompilePrism; @@pit = nil; @@pit ||= 1; end")
+    end
+
+    def test_ClassVariableWriteNode
+      assert_prism_eval("class Prism::TestCompilePrism; @@pit = 1; end")
+    end
+
+    def test_ConstantAndWriteNode
+      assert_prism_eval("Constant = 1; Constant &&= 1")
+    end
+
+    def test_ConstantOperatorWriteNode
+      assert_prism_eval("Constant = 1; Constant += 1")
+    end
+
+    def test_ConstantOrWriteNode
+      assert_prism_eval("Constant = 1; Constant ||= 1")
+    end
+
+    def test_ConstantWriteNode
+      # We don't call assert_prism_eval directly in this case because we
+      # don't want to assign the constant multiple times if we run
+      # with `--repeat-count`
+      # Instead, we eval manually here, and remove the constant to
+      constant_name = "YCT"
+      source = "#{constant_name} = 1"
+      prism_eval = RubyVM::InstructionSequence.compile_prism(source).eval
+      assert_equal prism_eval, 1
+      Object.send(:remove_const, constant_name)
+    end
+
+    def test_ConstantPathWriteNode
+      assert_prism_eval("Prism::CPWN = 1")
+      assert_prism_eval("::CPWN = 1")
+    end
+
+    def test_ConstantPathAndWriteNode
+      assert_prism_eval("Prism::CPAWN = 1; Prism::CPAWN &&= 2")
+      assert_prism_eval("Prism::CPAWN &&= 1")
+      assert_prism_eval("::CPAWN = 1; ::CPAWN &&= 2")
+    end
+
+    def test_ConstantPathOrWriteNode
+      assert_prism_eval("Prism::CPOrWN = nil; Prism::CPOrWN ||= 1")
+      assert_prism_eval("Prism::CPOrWN ||= 1")
+      assert_prism_eval("::CPOrWN = nil; ::CPOrWN ||= 1")
+    end
+
+    def test_ConstantPathOperatorWriteNode
+      assert_prism_eval("Prism::CPOWN = 0; Prism::CPOWN += 1")
+      assert_prism_eval("::CPOWN = 0; ::CPOWN += 1")
+    end
+
+    def test_GlobalVariableAndWriteNode
+      assert_prism_eval("$pit = 0; $pit &&= 1")
+    end
+
+    def test_GlobalVariableOperatorWriteNode
+      assert_prism_eval("$pit = 0; $pit += 1")
+    end
+
+    def test_GlobalVariableOrWriteNode
+      assert_prism_eval("$pit ||= 1")
+    end
+
+    def test_GlobalVariableWriteNode
+      assert_prism_eval("$pit = 1")
+    end
+
+    def test_InstanceVariableAndWriteNode
+      assert_prism_eval("@pit = 0; @pit &&= 1")
+    end
+
+    def test_InstanceVariableOperatorWriteNode
+      assert_prism_eval("@pit = 0; @pit += 1")
+    end
+
+    def test_InstanceVariableOrWriteNode
+      assert_prism_eval("@pit ||= 1")
+    end
+
+    def test_InstanceVariableWriteNode
+      assert_prism_eval("class Prism::TestCompilePrism; @pit = 1; end")
+    end
+
+    def test_LocalVariableAndWriteNode
+      assert_prism_eval("pit = 0; pit &&= 1")
+    end
+
+    def test_LocalVariableOperatorWriteNode
+      assert_prism_eval("pit = 0; pit += 1")
+    end
+
+    def test_LocalVariableOrWriteNode
+      assert_prism_eval("pit ||= 1")
+    end
+
+    def test_LocalVariableWriteNode
+      assert_prism_eval("pit = 1")
+      assert_prism_eval(<<-CODE)
+        a = 0
+        [].each do
+          a = 1
+        end
+        a
+      CODE
+
+      assert_prism_eval(<<-CODE)
+        a = 1
+        d = 1
+        [1].each do
+          b = 2
+          a = 2
+          [2].each do
+            c = 3
+            d = 4
+            a = 2
+          end
+        end
+        [a, d]
+      CODE
+    end
+
+    def test_MatchWriteNode
+      assert_prism_eval("/(?<foo>bar)(?<baz>bar>)/ =~ 'barbar'")
+      assert_prism_eval("/(?<foo>bar)/ =~ 'barbar'")
+    end
+
+    ############################################################################
+    # Multi-writes                                                             #
+    ############################################################################
+
+    def test_ClassVariableTargetNode
+      assert_prism_eval("class Prism::TestCompilePrism; @@pit, @@pit1 = 1; end")
+    end
+
+    def test_ConstantTargetNode
+      # We don't call assert_prism_eval directly in this case because we
+      # don't want to assign the constant multiple times if we run
+      # with `--repeat-count`
+      # Instead, we eval manually here, and remove the constant to
+      constant_names = ["YCT", "YCT2"]
+      source = "#{constant_names.join(",")} = 1"
+      prism_eval = RubyVM::InstructionSequence.compile_prism(source).eval
+      assert_equal prism_eval, 1
+      constant_names.map { |name|
+        Object.send(:remove_const, name)
+      }
+    end
+
+    def test_ConstantPathTargetNode
+      assert_separately([], <<~'RUBY')
+        verbose = $VERBOSE
+        # Create some temporary nested constants
+        Object.send(:const_set, "MyFoo", Object)
+        Object.const_get("MyFoo").send(:const_set, "Bar", Object)
+
+        constant_names = ["MyBar", "MyFoo::Bar", "MyFoo::Bar::Baz"]
+        source = "#{constant_names.join(",")} = Object"
+        iseq = RubyVM::InstructionSequence.compile_prism(source)
+        $VERBOSE = nil
+        prism_eval = iseq.eval
+        $VERBOSE = verbose
+        assert_equal prism_eval, Object
+      RUBY
+    end
+
+    def test_GlobalVariableTargetNode
+      assert_prism_eval("$pit, $pit1 = 1")
+    end
+
+    def test_InstanceVariableTargetNode
+      assert_prism_eval("class Prism::TestCompilePrism; @pit, @pit1 = 1; end")
+    end
+
+    def test_LocalVariableTargetNode
+      assert_prism_eval("pit, pit1 = 1")
+      assert_prism_eval(<<-CODE)
+        a = 1
+        [1].each do
+          c = 2
+          a, b = 2
+        end
+        a
+      CODE
+    end
+
+    def test_MultiTargetNode
+      assert_prism_eval("a, (b, c) = [1, 2, 3]")
+      assert_prism_eval("a, (b, c) = [1, 2, 3]; a")
+      assert_prism_eval("a, (b, c) = [1, 2, 3]; b")
+      assert_prism_eval("a, (b, c) = [1, 2, 3]; c")
+      assert_prism_eval("a, (b, c) = [1, [2, 3]]; c")
+      assert_prism_eval("a, (b, *c) = [1, [2, 3]]; c")
+      assert_prism_eval("a, (b, *c) = 1, [2, 3]; c")
+      assert_prism_eval("a, (b, *) = 1, [2, 3]; b")
+      assert_prism_eval("a, (b, *c, d) = 1, [2, 3, 4]; [a, b, c, d]")
+      assert_prism_eval("(a, (b, c, d, e), f, g), h = [1, [2, 3]], 4, 5, [6, 7]; c")
+    end
+
+    def test_MultiWriteNode
+      assert_prism_eval("foo, bar = [1, 2]")
+      assert_prism_eval("foo, = [1, 2]")
+      assert_prism_eval("foo, *, bar = [1, 2]")
+      assert_prism_eval("foo, bar = 1, 2")
+      assert_prism_eval("foo, *, bar = 1, 2")
+      assert_prism_eval("foo, *, bar = 1, 2, 3, 4")
+      assert_prism_eval("a, b, *, d = 1, 2, 3, 4")
+      assert_prism_eval("a, b, *, d = 1, 2")
+      assert_prism_eval("(a, b), *, c = [1, 3], 4, 5")
+      assert_prism_eval("(a, b), *, c = [1, 3], 4, 5; a")
+      assert_prism_eval("(a, b), *, c = [1, 3], 4, 5; b")
+      assert_prism_eval("(a, b), *, c = [1, 3], 4, 5; c")
+      assert_prism_eval("a, *, (c, d) = [1, 3], 4, 5; a")
+      assert_prism_eval("a, *, (c, d) = [1, 3], 4, 5; c")
+      assert_prism_eval("(a, b, c), *, (d, e) = [1, 3], 4, 5, [6, 7]")
+      assert_prism_eval("(a, b, c), *, (d, e) = [1, 3], 4, 5, [6, 7]; b")
+      assert_prism_eval("(a, b, c), *, (d, e) = [1, 3], 4, 5, [6, 7]; d")
+      assert_prism_eval("((a, *, b), *, (c, *, (d, *, e, f, g))), *, ((h, i, *, j), *, (k, l, m, *, n, o, p), q, r) = 1; a")
+      assert_prism_eval("*a = 1; a")
+      assert_prism_eval("_, {}[:foo] = 1")
+      assert_prism_eval("_, {}[:foo], _ = 1")
+      assert_prism_eval("_, {}[:foo], _ = 1")
+      assert_prism_eval("_,{}[:foo], _, {}[:bar] = 1")
+      assert_prism_eval("* = :foo")
+      assert_prism_eval("* = *[]")
+      assert_prism_eval("a, * = :foo")
+
+
+      assert_prism_eval(<<~CODE)
+        class Foo
+          def bar=(x); end
+          def baz=(c); end
+        end
+        foo = Foo.new
+        foo.bar, foo.baz = 1
+      CODE
+      assert_prism_eval(<<~CODE)
+        class Foo
+          def bar=(x); end
+          def baz=(c); end
+        end
+        foo = Foo.new
+        _, foo.bar, foo.baz = 1
+      CODE
+      assert_prism_eval(<<~CODE)
+        class Foo
+          def bar=(x); end
+          def baz=(c); end
+        end
+        foo = Foo.new
+        _, foo.bar, _, foo.baz = 1
+      CODE
+
+      # Test nested writes with method calls
+      assert_prism_eval(<<~RUBY)
+        class Foo
+          attr_accessor :bar
+        end
+
+        a = Foo.new
+
+        (a.bar, a.bar), b = [1], 2
+      RUBY
+      assert_prism_eval(<<~RUBY)
+        h = {}
+        (h[:foo], h[:bar]), a = [1], 2
+      RUBY
+    end
+
+    ############################################################################
+    # String-likes                                                             #
+    ############################################################################
+
+    def test_EmbeddedStatementsNode
+      assert_prism_eval('"foo #{to_s} baz"')
+    end
+
+    def test_EmbeddedVariableNode
+      assert_prism_eval('class Prism::TestCompilePrism; @pit = 1; "#@pit"; end')
+      assert_prism_eval('class Prism::TestCompilePrism; @@pit = 1; "#@@pit"; end')
+      assert_prism_eval('$pit = 1; "#$pit"')
+    end
+
+    def test_InterpolatedMatchLastLineNode
+      assert_prism_eval('$pit = ".oo"; if /"#{$pit}"/mix; end')
+    end
+
+    def test_InterpolatedRegularExpressionNode
+      assert_prism_eval('$pit = 1; /1 #$pit 1/')
+      assert_prism_eval('$pit = 1; /#$pit/i')
+      assert_prism_eval('/1 #{1 + 2} 1/')
+      assert_prism_eval('/1 #{"2"} #{1 + 2} 1/')
+    end
+
+    def test_InterpolatedStringNode
+      assert_prism_eval('$pit = 1; "1 #$pit 1"')
+      assert_prism_eval('"1 #{1 + 2} 1"')
+      assert_prism_eval('"Prism" "::" "TestCompilePrism"')
+      assert_prism_eval(<<-'RUBY')
+        # frozen_string_literal: true
+
+        !("a""b""#{1}").frozen?
+      RUBY
+      assert_prism_eval(<<-'RUBY')
+        # frozen_string_literal: true
+
+        !("a""#{1}""b").frozen?
+      RUBY
+
+      # Test encoding of interpolated strings
+      assert_prism_eval(<<~'RUBY')
+        "#{"foo"}s".encoding
+      RUBY
+      assert_prism_eval(<<~'RUBY')
+        a = "foo"
+        b = "#{a}" << "Bar"
+        [a, b, b.encoding]
+      RUBY
+    end
+
+    def test_concatenated_StringNode
+      assert_prism_eval('("a""b").frozen?')
+      assert_prism_eval(<<-CODE)
+        # frozen_string_literal: true
+
+        ("a""b").frozen?
+      CODE
+    end
+
+    def test_InterpolatedSymbolNode
+      assert_prism_eval('$pit = 1; :"1 #$pit 1"')
+      assert_prism_eval(':"1 #{1 + 2} 1"')
+    end
+
+    def test_InterpolatedXStringNode
+      assert_prism_eval(<<~RUBY)
+        def self.`(command) = command * 2
+        `echo \#{1}`
+      RUBY
+
+      assert_prism_eval(<<~RUBY)
+        def self.`(command) = command * 2
+        `echo \#{"100"}`
+      RUBY
+    end
+
+    def test_MatchLastLineNode
+      assert_prism_eval("if /foo/; end")
+      assert_prism_eval("if /foo/i; end")
+      assert_prism_eval("if /foo/x; end")
+      assert_prism_eval("if /foo/m; end")
+      assert_prism_eval("if /foo/im; end")
+      assert_prism_eval("if /foo/mx; end")
+      assert_prism_eval("if /foo/xi; end")
+      assert_prism_eval("if /foo/ixm; end")
+    end
+
+    def test_RegularExpressionNode
+      assert_prism_eval('/pit/')
+      assert_prism_eval('/pit/i')
+      assert_prism_eval('/pit/x')
+      assert_prism_eval('/pit/m')
+      assert_prism_eval('/pit/im')
+      assert_prism_eval('/pit/mx')
+      assert_prism_eval('/pit/xi')
+      assert_prism_eval('/pit/ixm')
+
+      assert_prism_eval('/pit/u')
+      assert_prism_eval('/pit/e')
+      assert_prism_eval('/pit/s')
+      assert_prism_eval('/pit/n')
+
+      assert_prism_eval('/pit/me')
+      assert_prism_eval('/pit/ne')
+
+      assert_prism_eval('2.times.map { /#{1}/o }')
+      assert_prism_eval('2.times.map { foo = 1; /#{foo}/o }')
+    end
+
+    def test_StringNode
+      assert_prism_eval('"pit"')
+      assert_prism_eval('"a".frozen?')
+    end
+
+    def test_StringNode_frozen_string_literal_true
+      [
+        # Test that string literal is frozen
+        <<~RUBY,
+          # frozen_string_literal: true
+          "a".frozen?
+        RUBY
+        # Test that two string literals with the same contents are the same string
+        <<~RUBY,
+          # frozen_string_literal: true
+          "hello".equal?("hello")
+        RUBY
+      ].each do |src|
+        assert_prism_eval(src, raw: true)
+      end
+    end
+
+    def test_StringNode_frozen_string_literal_false
+      [
+        # Test that string literal is frozen
+        <<~RUBY,
+          # frozen_string_literal: false
+          !"a".frozen?
+        RUBY
+        # Test that two string literals with the same contents are the same string
+        <<~RUBY,
+          # frozen_string_literal: false
+          !"hello".equal?("hello")
+        RUBY
+      ].each do |src|
+        assert_prism_eval(src, raw: true)
+      end
+    end
+
+    def test_StringNode_frozen_string_literal_default
+      # Test that string literal is chilled
+      assert_prism_eval('"a".frozen?')
+
+      # Test that two identical chilled string literals aren't the same object
+      assert_prism_eval('!"hello".equal?("hello")')
+    end
+
+    def test_SymbolNode
+      assert_prism_eval(":pit")
+
+      # Test UTF-8 symbol in a US-ASCII file
+      assert_prism_eval(<<~'RUBY', raw: true)
+        # -*- coding: us-ascii -*-
+        :"\u{e9}"
+      RUBY
+
+      # Test ASCII-8BIT symbol in a US-ASCII file
+      assert_prism_eval(<<~'RUBY', raw: true)
+        # -*- coding: us-ascii -*-
+        :"\xff"
+      RUBY
+
+      # Test US-ASCII symbol in a ASCII-8BIT file
+      assert_prism_eval(<<~'RUBY', raw: true)
+        # -*- coding: ascii-8bit -*-
+        :a
+      RUBY
+    end
+
+    def test_XStringNode
+      assert_prism_eval(<<~RUBY)
+        class Prism::TestCompilePrism
+          def self.`(command) = command * 2
+          `pit`
+        end
+      RUBY
+    end
+
+    ############################################################################
+    # Structures                                                               #
+    ############################################################################
+
+    def test_ArrayNode
+      assert_prism_eval("[]")
+      assert_prism_eval("[1, 2, 3]")
+      assert_prism_eval("%i[foo bar baz]")
+      assert_prism_eval("%w[foo bar baz]")
+      assert_prism_eval("[*1..2]")
+      assert_prism_eval("[*1..2, 3, 4, *5..6, 7, 8]")
+      assert_prism_eval("[*1..2, 3, 4, *5..6, 7, 8, *9..11]")
+      assert_prism_eval("[0, *1..2, 3, 4, *5..6, 7, 8, *9..11]")
+      assert_prism_eval("[-1, true, 0, *1..2, 3, 4, *5..6, 7, 8, *9..11]")
+      assert_prism_eval("a = [1,2]; [0, *a, 3, 4, *5..6, 7, 8, *9..11]")
+      assert_prism_eval("[[*1..2], 3, *4..5]")
+
+      elements = Array.new(64) { ":foo" }
+      assert_prism_eval("[#{elements.join(", ")}, bar: 1, baz: 2]")
+
+      # Test keyword splat inside of array
+      assert_prism_eval("[**{x: 'hello'}]")
+
+      # Test UTF-8 string array literal in a US-ASCII file
+      assert_prism_eval(<<~'RUBY', raw: true)
+        # -*- coding: us-ascii -*-
+        # frozen_string_literal: true
+        %W"\u{1f44b} \u{1f409}"
+      RUBY
+    end
+
+    def test_AssocNode
+      assert_prism_eval("{ foo: :bar }")
+    end
+
+    def test_AssocSplatNode
+      assert_prism_eval("foo = { a: 1 }; { **foo }")
+      assert_prism_eval("foo = { a: 1 }; bar = foo; { **foo, b: 2, **bar, c: 3 }")
+      assert_prism_eval("foo = { a: 1 }; { b: 2, **foo, c: 3}")
+
+      # Test anonymous AssocSplatNode
+      assert_prism_eval(<<~RUBY)
+        o = Object.new
+        def o.bar(**) = Hash(**)
+
+        o.bar(hello: "world")
+      RUBY
+
+      # Test that AssocSplatNode is evaluated before BlockArgumentNode using
+      # the splatkw instruction
+      assert_prism_eval(<<~RUBY)
+        o = Struct.new(:ary) do
+          def to_hash
+            ary << :to_hash
+            {}
+          end
+
+          def to_proc
+            ary << :to_proc
+            -> {}
+          end
+
+          def t(...); end
+        end.new
+        o.ary = []
+
+        o.t(**o, &o)
+        o.ary
+      RUBY
+    end
+
+    def test_HashNode
+      assert_prism_eval("{}")
+      assert_prism_eval("{ a: :a }")
+      assert_prism_eval("{ a: :a, b: :b }")
+      assert_prism_eval("a = 1; { a: a }")
+      assert_prism_eval("a = 1; { a: }")
+      assert_prism_eval("{ to_s: }")
+      assert_prism_eval("{ Prism: }")
+      assert_prism_eval("[ Prism: [:b, :c]]")
+      assert_prism_eval("{ [] => 1}")
+    end
+
+    def test_ImplicitNode
+      assert_prism_eval("{ to_s: }")
+    end
+
+    def test_RangeNode
+      assert_prism_eval("1..2")
+      assert_prism_eval("1...2")
+      assert_prism_eval("..2")
+      assert_prism_eval("...2")
+      assert_prism_eval("1..")
+      assert_prism_eval("1...")
+      assert_prism_eval("a1 = 1; a2 = 2; a1..a2")
+      assert_prism_eval("a1 = 1; a2 = 2; a1...a2")
+      assert_prism_eval("a2 = 2; ..a2")
+      assert_prism_eval("a2 = 2; ...a2")
+      assert_prism_eval("a1 = 1; a1..")
+      assert_prism_eval("a1 = 1; a1...")
+      assert_prism_eval("1..2; nil")
+      assert_prism_eval("1...2; nil")
+      assert_prism_eval("..2; nil")
+      assert_prism_eval("...2; nil")
+      assert_prism_eval("1..; nil")
+      assert_prism_eval("1...; nil")
+      assert_prism_eval("a1 = 1; a2 = 2; a1..a2; nil")
+      assert_prism_eval("a1 = 1; a2 = 2; a1...a2; nil")
+      assert_prism_eval("a2 = 2; ..a2; nil")
+      assert_prism_eval("a2 = 2; ...a2; nil")
+      assert_prism_eval("a1 = 1; a1..; nil")
+      assert_prism_eval("a1 = 1; a1...; nil")
+    end
+
+    def test_SplatNode
+      assert_prism_eval("*b = []; b")
+      assert_prism_eval("*b = [1, 2, 3]; b")
+      assert_prism_eval("a, *b = [1, 2, 3]; a")
+      assert_prism_eval("a, *b = [1, 2, 3]; b")
+      assert_prism_eval("a, *b, c = [1, 2, 3]; a")
+      assert_prism_eval("a, *b, c = [1, 2, 3]; b")
+      assert_prism_eval("a, *b, c = [1, 2, 3]; c")
+      assert_prism_eval("*b, c = [1, 2, 3]; b")
+      assert_prism_eval("*b, c = [1, 2, 3]; c")
+      assert_prism_eval("a, *, c = [1, 2, 3]; a")
+      assert_prism_eval("a, *, c = [1, 2, 3]; c")
+
+      # Test anonymous splat node
+      assert_prism_eval(<<~RUBY)
+        def self.bar(*) = Array(*)
+
+        bar([1, 2, 3])
+      RUBY
+    end
+
+    ############################################################################
+    # Jumps                                                                    #
+    ############################################################################
+
+    def test_AndNode
+      assert_prism_eval("true && 1")
+      assert_prism_eval("false && 1")
+    end
+
+    def test_CaseNode
+      assert_prism_eval("case :a; when :a; 1; else; 2; end")
+      assert_prism_eval("case :a; when :b; 1; else; 2; end")
+      assert_prism_eval("case :a; when :a; 1; else; 2; end")
+      assert_prism_eval("case :a; when :a; end")
+      assert_prism_eval("case :a; when :b, :c; end")
+      assert_prism_eval("case; when :a; end")
+      assert_prism_eval("case; when :a, :b; 1; else; 2 end")
+      assert_prism_eval("case :a; when :b; else; end")
+      assert_prism_eval("b = 1; case :a; when b; else; end")
+      assert_prism_eval(<<-CODE)
+        def self.prism_test_case_node
+          case :a
+          when :b
+          else
+            return 2
+          end
+          1
+        end
+        prism_test_case_node
+      CODE
+
+      # Test splat in when
+      assert_prism_eval(<<~RUBY)
+        ary = [1, 2]
+        case 1
+        when *ary
+          :ok
+        else
+          :ng
+        end
+      RUBY
+
+      # Test splat in when
+      assert_prism_eval(<<~RUBY)
+        ary = [1, 2]
+        case 1
+        when :foo, *ary
+          :ok
+        else
+          :ng
+        end
+      RUBY
+
+      # Test case without predicate
+      assert_prism_eval(<<~RUBY)
+        case
+        when 1 == 2
+          :ng
+        else
+          :ok
+        end
+      RUBY
+
+      # test splat with no predicate
+      assert_prism_eval(<<~RUBY)
+        case
+        when *[true]
+          :ok
+        else
+          :ng
+        end
+      RUBY
+    end
+
+    def test_ElseNode
+      assert_prism_eval("if false; 0; else; 1; end")
+      assert_prism_eval("if true; 0; else; 1; end")
+      assert_prism_eval("true ? 1 : 0")
+      assert_prism_eval("false ? 0 : 1")
+    end
+
+    def test_FlipFlopNode
+      assert_prism_eval("not (1 == 1) .. (2 == 2)")
+      assert_prism_eval("not (1 == 1) ... (2 == 2)")
+    end
+
+    def test_IfNode
+      assert_prism_eval("if true; 1; end")
+      assert_prism_eval("1 if true")
+      assert_prism_eval('a = b = 1; if a..b; end')
+      assert_prism_eval('if "a".."b"; end')
+      assert_prism_eval('if "a"..; end')
+      assert_prism_eval('if .."b"; end')
+      assert_prism_eval('if ..1; end')
+      assert_prism_eval('if 1..; end')
+      assert_prism_eval('if 1..2; end')
+      assert_prism_eval('if true or true; end');
+    end
+
+    def test_OrNode
+      assert_prism_eval("true || 1")
+      assert_prism_eval("false || 1")
+    end
+
+    def test_UnlessNode
+      assert_prism_eval("1 unless true")
+      assert_prism_eval("1 unless false")
+      assert_prism_eval("unless true; 1; end")
+      assert_prism_eval("unless false; 1; end")
+    end
+
+    def test_UntilNode
+      assert_prism_eval("a = 0; until a == 1; a = a + 1; end")
+
+      # Test UntilNode in rescue
+      assert_prism_eval(<<~RUBY)
+        o = Object.new
+        o.instance_variable_set(:@ret, [])
+        def o.foo = @ret << @ret.length
+        def o.bar = @ret.length > 3
+        begin
+          raise
+        rescue
+          o.foo until o.bar
+        end
+        o.instance_variable_get(:@ret)
+      RUBY
+    end
+
+    def test_WhileNode
+      assert_prism_eval("a = 0; while a != 1; a = a + 1; end")
+
+      # Test WhileNode in rescue
+      assert_prism_eval(<<~RUBY)
+        o = Object.new
+        o.instance_variable_set(:@ret, [])
+        def o.foo = @ret << @ret.length
+        def o.bar = @ret.length < 3
+        begin
+          raise
+        rescue
+          o.foo while o.bar
+        end
+        o.instance_variable_get(:@ret)
+      RUBY
+    end
+
+    def test_ForNode
+      assert_prism_eval("for i in [1,2] do; i; end")
+      assert_prism_eval("for @i in [1,2] do; @i; end")
+      assert_prism_eval("for $i in [1,2] do; $i; end")
+
+      assert_prism_eval("for foo, in  [1,2,3] do end")
+
+      assert_prism_eval("for i, j in {a: 'b'} do; i; j; end")
+
+      # Test splat node as index in for loop
+      assert_prism_eval("for *x in [[1,2], [3,4]] do; x; end")
+    end
+
+    ############################################################################
+    #  Throws                                                                  #
+    ############################################################################
+
+    def test_BeginNode
+      assert_prism_eval("begin; 1; end")
+      assert_prism_eval("begin; end; 1")
+    end
+
+    def test_BreakNode
+      assert_prism_eval("while true; break; end")
+      assert_prism_eval("while true; break 1; end")
+      assert_prism_eval("while true; break 1, 2; end")
+
+      assert_prism_eval("[].each { break }")
+      assert_prism_eval("[true].map { break }")
+    end
+
+    def test_ensure_in_methods
+      assert_prism_eval(<<-CODE)
+def self.m
+  a = []
+ensure
+  a << 5
+  return a
+end
+m
+      CODE
+    end
+
+    def test_break_runs_ensure
+      assert_prism_eval(<<-CODE)
+a = []
+while true
+  begin
+    break
+  ensure
+    a << 1
+  end
+end
+a
+      CODE
+    end
+
+    def test_EnsureNode
+      assert_prism_eval("begin; 1; ensure; 2; end")
+      assert_prism_eval("begin; 1; begin; 3; ensure; 4; end; ensure; 2; end")
+      assert_prism_eval(<<-CODE)
+        begin
+          a = 2
+        ensure
+        end
+      CODE
+      assert_prism_eval(<<-CODE)
+        begin
+          a = 2
+        ensure
+          a = 3
+        end
+        a
+      CODE
+
+      # Test that ensure block only evaluated once
+      assert_prism_eval(<<~RUBY)
+        res = []
+        begin
+          begin
+            raise
+          ensure
+            res << $!.to_s
+          end
+        rescue
+          res
+        end
+      RUBY
+
+      assert_prism_eval(<<-CODE)
+        a = 1
+        begin
+          a = 2
+        ensure
+          a = 3
+        end
+        a
+      CODE
+      assert_prism_eval(<<-CODE)
+        a = 1
+        begin
+          b = 2
+        ensure
+          c = 3
+        end
+        a + b + c
+      CODE
+      assert_prism_eval(<<~CODE)
+        foo = 1
+        begin
+        ensure
+          begin
+          ensure
+            foo.nil?
+          end
+        end
+      CODE
+      assert_prism_eval(<<~CODE)
+        def test
+        ensure
+          {}.each do |key, value|
+            {}[key] = value
+          end
+        end
+      CODE
+      assert_prism_eval(<<~CODE)
+        def test
+          a = 1
+        ensure
+          {}.each do |key, value|
+            {}[key] = a
+          end
+        end
+      CODE
+      assert_prism_eval(<<-CODE)
+        def self.prism_test_ensure_node
+          begin
+          ensure
+          end
+          return
+        end
+        prism_test_ensure_node
+      CODE
+
+      # Test empty ensure block
+      assert_prism_eval(<<~RUBY)
+        res = []
+
+        begin
+          begin
+            raise
+          ensure
+          end
+        rescue
+          res << "rescue"
+        end
+
+        res
+      RUBY
+
+      # Bug #21001
+      assert_prism_eval(<<~RUBY)
+        RUN_ARRAY = [1,2]
+
+        MAP_PROC = Proc.new do |&blk|
+          block_results = []
+          RUN_ARRAY.each do |value|
+            block_value = blk.call(value)
+            block_results.push block_value
+          end
+          block_results
+        ensure
+          next block_results
+        end
+
+        MAP_PROC.call do |value|
+          break if value > 1
+          next value
+        end
+      RUBY
+    end
+
+    def test_NextNode
+      assert_prism_eval("2.times do |i|; next if i == 1; end")
+
+      assert_prism_eval(<<-CODE)
+        res = []
+        i = 0
+        while i < 5
+          i += 1
+          next if i == 3
+          res << i
+        end
+        res
+      CODE
+
+      assert_prism_eval(<<-CODE)
+        res = []
+        (1..5).each do |i|
+          next if i.even?
+          res << i
+        end
+        res
+      CODE
+
+      assert_prism_eval(<<-CODE)
+        (1..5).map do |i|
+          next i, :even if i.even?
+          i
+        end
+      CODE
+
+      assert_prism_eval(<<-CODE)
+        res = []
+        i = 0
+        begin
+          i += 1
+          next if i == 3
+          res << i
+        end while i < 5
+        res
+      CODE
+
+      assert_prism_eval(<<-CODE)
+        while false
+          begin
+          ensure
+          end
+          next
+        end
+      CODE
+
+      assert_prism_eval(<<~CODE)
+        [].each do
+          begin
+          rescue
+            next
+          end
+        end
+      CODE
+    end
+
+    def test_RedoNode
+      assert_prism_eval(<<-CODE)
+        counter = 0
+
+        5.times do |i|
+          counter += 1
+          if i == 2 && counter < 3
+            redo
+          end
+        end
+      CODE
+
+      assert_prism_eval(<<-CODE)
+        for i in 1..5
+          if i == 3
+            i = 0
+            redo
+          end
+        end
+      CODE
+
+      assert_prism_eval(<<-CODE)
+        i = 0
+        begin
+          i += 1
+          redo if i == 3
+        end while i < 5
+      CODE
+    end
+
+    def test_RescueNode
+      assert_prism_eval("begin; 1; rescue; 2; end")
+      assert_prism_eval(<<~CODE)
+        begin
+         1
+        rescue SyntaxError
+        2
+        end
+      CODE
+      assert_prism_eval(<<~CODE)
+        begin
+          1
+          raise 'boom'
+        rescue StandardError
+          2
+        end
+      CODE
+      assert_prism_eval(<<~CODE)
+        begin
+          a = 1
+        rescue StandardError => e
+        end
+      CODE
+      assert_prism_eval(<<~CODE)
+        begin
+          raise StandardError
+        rescue StandardError => e
+        end
+      CODE
+      assert_prism_eval(<<~CODE)
+        begin
+          1
+        rescue StandardError => e
+          e
+        rescue SyntaxError => f
+          f
+        else
+          4
+        end
+      CODE
+      assert_prism_eval(<<-CODE)
+        begin
+          a = 2
+        rescue
+          a = 3
+        end
+        a
+      CODE
+      assert_prism_eval(<<-CODE)
+        a = 1
+        begin
+          a = 2
+        rescue
+          a = 3
+        end
+        a
+      CODE
+      assert_prism_eval(<<-CODE)
+        a = 1
+        begin
+          b = 2
+          raise "bang"
+        rescue
+          c = 3
+        end
+        a + b + c
+      CODE
+      assert_prism_eval("begin; rescue; end")
+
+      assert_prism_eval(<<~CODE)
+        begin
+        rescue
+          args.each do |key, value|
+            tmp[key] = 1
+          end
+        end
+      CODE
+      assert_prism_eval(<<~CODE)
+        10.times do
+          begin
+          rescue
+            break
+          end
+        end
+      CODE
+
+      # Test RescueNode with ElseNode
+      assert_prism_eval(<<~RUBY)
+        calls = []
+        begin
+          begin
+          rescue RuntimeError
+            calls << 1
+          else
+            calls << 2
+            raise RuntimeError
+          end
+        rescue RuntimeError
+        end
+
+        calls
+      RUBY
+    end
+
+    def test_RescueModifierNode
+      assert_prism_eval("1.nil? rescue false")
+      assert_prism_eval("1.nil? rescue 1")
+      assert_prism_eval("raise 'bang' rescue nil")
+      assert_prism_eval("raise 'bang' rescue a = 1; a.nil?")
+      assert_prism_eval("a = 0 rescue (a += 1 && retry if a <= 1)")
+    end
+
+    def test_RetryNode
+      assert_prism_eval(<<~CODE)
+        a = 1
+        begin
+          a
+          raise "boom"
+        rescue
+          a += 1
+          retry unless a > 1
+        ensure
+          a = 3
+        end
+      CODE
+
+      assert_prism_eval(<<~CODE)
+        begin
+        rescue
+          foo = 2
+          retry
+        end
+      CODE
+
+      assert_prism_eval(<<~CODE)
+        begin
+          a = 2
+        rescue
+          retry
+        end
+      CODE
+    end
+
+    def test_ReturnNode
+      assert_prism_eval(<<-CODE)
+        def self.prism_test_return_node
+          return 1
+        end
+        prism_test_return_node
+      CODE
+
+      assert_prism_eval(<<-CODE)
+        def self.prism_test_return_node
+          return 1, 2
+        end
+        prism_test_return_node
+      CODE
+
+      assert_prism_eval(<<-CODE)
+        def self.prism_test_return_node
+          [1].each do |e|
+            return true
+          end
+        end
+        prism_test_return_node
+      CODE
+
+      assert_prism_eval(<<-CODE)
+        def self.prism_test_return_node
+          [1].map do |i|
+            return i if i == 1
+            2
+          end
+        end
+        prism_test_return_node
+      CODE
+
+      assert_prism_eval(<<-CODE)
+        def self.prism_test_return_node(*args, **kwargs)
+          return *args, *args, **kwargs
+        end
+        prism_test_return_node(1, foo: 0)
+      CODE
+    end
+
+    ############################################################################
+    # Scopes/statements                                                        #
+    ############################################################################
+
+    def test_BlockNode
+      assert_prism_eval("[1, 2, 3].each { |num| num }")
+
+      assert_prism_eval("[].tap { _1 }")
+
+      assert_prism_eval("[].each { |a,| }")
+      assert_prism_eval("[[1, 2, 3]].map { |_, _, a| a }")
+      assert_prism_eval("[[1, 2, 3]].map { |_, a| a }")
+
+      assert_prism_eval("[[]].map { |a| a }")
+      assert_prism_eval("[[]].map { |a| a }")
+      assert_prism_eval("[[]].map { |a, &block| a }")
+      assert_prism_eval("[[]].map { |a, &block| a }")
+      assert_prism_eval("[{}].map { |a,| }")
+      assert_prism_eval("[[]].map { |a,b=1| a }")
+      assert_prism_eval("[{}].map { |a,| }")
+      assert_prism_eval("[{}].map { |a| a }")
+
+      # Test blocks with MultiTargetNode
+      assert_prism_eval("[[1, 2]].each.map { |(a), (b)| [a, b] }")
+    end
+
+    def test_ClassNode
+      assert_prism_eval("class PrismClassA; end")
+      assert_prism_eval("class PrismClassA; end; class PrismClassB < PrismClassA; end")
+      assert_prism_eval("class PrismClassA; end; class PrismClassA::PrismClassC; end")
+      assert_prism_eval(<<-HERE
+        class PrismClassA; end
+        class PrismClassA::PrismClassC; end
+        class PrismClassB; end
+        class PrismClassB::PrismClassD < PrismClassA::PrismClassC; end
+      HERE
+      )
+    end
+
+    # Many of these tests are versions of tests at bootstraptest/test_method.rb
+    def test_DefNode
+      assert_prism_eval("def prism_test_def_node; end")
+      assert_prism_eval("a = Object.new; def a.prism_singleton; :ok; end; a.prism_singleton")
+      assert_prism_eval("def self.prism_test_def_node() 1 end; prism_test_def_node()")
+      assert_prism_eval("def self.prism_test_def_node(a,b) [a, b] end; prism_test_def_node(1,2)")
+      assert_prism_eval("def self.prism_test_def_node(a,x=7,y=1) x end; prism_test_def_node(7,1)")
+      assert_prism_eval("def self.prism_test_def_node(a = 1); x = 2; end; prism_test_def_node")
+
+      # rest argument
+      assert_prism_eval("def self.prism_test_def_node(*a) a end; prism_test_def_node().inspect")
+      assert_prism_eval("def self.prism_test_def_node(*a) a end; prism_test_def_node(1).inspect")
+      assert_prism_eval("def self.prism_test_def_node(x,y,*a) a end; prism_test_def_node(7,7,1,2).inspect")
+      assert_prism_eval("def self.prism_test_def_node(x,y=7,*a) a end; prism_test_def_node(7).inspect")
+      assert_prism_eval("def self.prism_test_def_node(x,y,z=7,*a) a end; prism_test_def_node(7,7).inspect")
+      assert_prism_eval("def self.prism_test_def_node(x,y,z=7,zz=7,*a) a end; prism_test_def_node(7,7,7).inspect")
+
+      # keyword arguments
+      assert_prism_eval("def self.prism_test_def_node(a: 1, b: 2, c: 4) a + b + c; end; prism_test_def_node(a: 2)")
+      assert_prism_eval("def self.prism_test_def_node(a: 1, b: 2, c: 4) a + b + c; end; prism_test_def_node(b: 3)")
+      assert_prism_eval(<<-CODE)
+        def self.prism_test_def_node(x = 1, y, a: 8, b: 2, c: 4)
+          a + b + c + x + y
+        end
+        prism_test_def_node(10, b: 3)
+      CODE
+      assert_prism_eval(<<-CODE)
+        def self.prism_test_def_node(a: [])
+          a
+        end
+        prism_test_def_node
+      CODE
+
+      # block arguments
+      assert_prism_eval("def self.prism_test_def_node(&block) block end; prism_test_def_node{}.class")
+      assert_prism_eval("def self.prism_test_def_node(&block) block end; prism_test_def_node().inspect")
+      assert_prism_eval("def self.prism_test_def_node(a,b=7,*c,&block) b end; prism_test_def_node(7,1).inspect")
+      assert_prism_eval("def self.prism_test_def_node(a,b=7,*c,&block) c end; prism_test_def_node(7,7,1).inspect")
+
+      # splat
+      assert_prism_eval("def self.prism_test_def_node(a) a end; prism_test_def_node(*[1])")
+      assert_prism_eval("def self.prism_test_def_node(x,a) a end; prism_test_def_node(7,*[1])")
+      assert_prism_eval("def self.prism_test_def_node(x,y,a) a end; prism_test_def_node(7,7,*[1])")
+      assert_prism_eval("def self.prism_test_def_node(x,y,a,b,c) a end; prism_test_def_node(7,7,*[1,7,7])")
+
+      # recursive call
+      assert_prism_eval("def self.prism_test_def_node(n) n == 0 ? 1 : prism_test_def_node(n-1) end; prism_test_def_node(5)")
+
+      # instance method
+      assert_prism_eval("class PrismTestDefNode; def prism_test_def_node() 1 end end;  PrismTestDefNode.new.prism_test_def_node")
+      assert_prism_eval("class PrismTestDefNode; def prism_test_def_node(*a) a end end;  PrismTestDefNode.new.prism_test_def_node(1).inspect")
+
+      # block argument
+      assert_prism_eval(<<-CODE)
+        def self.prism_test_def_node(&block) prism_test_def_node2(&block) end
+        def self.prism_test_def_node2() yield 1 end
+        prism_test_def_node2 {|a| a }
+      CODE
+
+      # multi argument
+      assert_prism_eval(<<-CODE)
+        def self.prism_test_def_node(a, (b, *c, d))
+          [a, b, c, d]
+        end
+        prism_test_def_node("a", ["b", "c", "d"])
+      CODE
+      assert_prism_eval(<<-CODE)
+        def self.prism_test_def_node(a, (b, c, *))
+          [a, b, c]
+        end
+        prism_test_def_node("a", ["b", "c"])
+      CODE
+      assert_prism_eval(<<-CODE)
+        def self.prism_test_def_node(a, (*, b, c))
+          [a, b, c]
+        end
+        prism_test_def_node("a", ["b", "c"])
+      CODE
+
+      # recursive multis
+      assert_prism_eval(<<-CODE)
+        def self.prism_test_def_node(a, (b, *c, (d, *e, f)))
+          [a, b, c, d, d, e, f]
+        end
+        prism_test_def_node("a", ["b", "c", ["d", "e", "f"]])
+      CODE
+
+      # Many arguments
+      assert_prism_eval(<<-CODE)
+        def self.prism_test_def_node(a, (b, *c, d), e = 1, *f, g, (h, *i, j),  k:, l: 1, **m)
+          [a, b, c, d, e, f, g, h, i, j, k, l, m]
+        end
+        prism_test_def_node(
+          "a",
+          ["b", "c1", "c2", "d"],
+          "e",
+          "f1", "f2",
+          "g",
+          ["h", "i1", "i2", "j"],
+          k: "k",
+          l: "l",
+          m1: "m1",
+          m2: "m2"
+        )
+      CODE
+    end
+
+    def test_pow_parameters
+      assert_prism_eval("def self.m(a, **); end; method(:m).parameters")
+    end
+
+    def test_star_parameters
+      assert_prism_eval("def self.m(a, *, b); end; method(:m).parameters")
+    end
+
+    def test_repeated_block_params
+      assert_prism_eval("def self.x(&blk); blk; end; x { |_, _, _ = 1, *_, _:, _: 2, **_, &_| }.parameters")
+    end
+
+    def test_repeated_proc_params
+      assert_prism_eval("proc {|_, _, _ = 1, *_, _:, _: 2, **_, &_| }.parameters")
+    end
+
+    def test_forward_parameters_block
+      assert_prism_eval("def self.m(&); end; method(:m).parameters")
+    end
+
+    def test_forward_parameters
+      assert_prism_eval("def self.m(...); end; method(:m).parameters")
+    end
+
+    def test_repeated_block_underscore
+      assert_prism_eval("def self.m(_, **_, &_); _; end; method(:m).parameters")
+    end
+
+    def test_repeated_kw_rest_underscore
+      assert_prism_eval("def self.m(_, **_); _; end; method(:m).parameters")
+    end
+
+    def test_repeated_required_keyword_underscore
+      assert_prism_eval("def self.m(_, _, *_, _, _:); _; end; method(:m).parameters")
+      assert_prism_eval("def self.m(_, _, *_, _, _:, _: 2); _; end; method(:m).parameters")
+    end
+
+    def test_repeated_required_post_underscore
+      assert_prism_eval("def self.m(_, _, *_, _); _; end; method(:m).parameters")
+    end
+
+    def test_repeated_splat_underscore
+      assert_prism_eval("def self.m(_, _, _ = 1, _ = 2, *_); end; method(:m).parameters")
+    end
+
+    def test_repeated_optional_underscore
+      assert_prism_eval("def self.m(a, _, _, _ = 1, _ = 2, b); end; method(:m).parameters")
+    end
+
+    def test_repeated_required_underscore
+      assert_prism_eval("def self.m(a, _, _, b); end; method(:m).parameters")
+    end
+
+    def test_locals_in_parameters
+      assert_prism_eval("def self.m(a = b = c = 1); [a, b, c]; end; self.m")
+    end
+
+    def test_trailing_comma_on_block
+      assert_prism_eval("def self.m; yield [:ok]; end; m {|v0,| v0 }")
+    end
+
+    def test_complex_default_params
+      assert_prism_eval("def self.foo(a:, b: '2'.to_i); [a, b]; end; foo(a: 1)")
+      assert_prism_eval("def self.foo(a:, b: 2, c: '3'.to_i); [a, b, c]; end; foo(a: 1)")
+    end
+
+    def test_numbered_params
+      assert_prism_eval("[1, 2, 3].then { _3 }")
+      assert_prism_eval("1.then { one = 1; one + _1 }")
+    end
+
+    def test_rescue_with_ensure
+      assert_prism_eval(<<-CODE)
+begin
+  begin
+    raise "a"
+  rescue
+    raise "b"
+  ensure
+    raise "c"
+  end
+rescue => e
+  e.message
+end
+      CODE
+    end
+
+    def test_required_kwarg_ordering
+      assert_prism_eval("def self.foo(a: 1, b:); [a, b]; end; foo(b: 2)")
+    end
+
+    def test_trailing_keyword_method_params
+      # foo(1, b: 2, c: 3) # argc -> 3
+      assert_prism_eval("def self.foo(a, b:, c:); [a, b, c]; end; foo(1, b: 2, c: 3)")
+    end
+
+    def test_keyword_method_params_only
+      # foo(a: 1, b: 2) # argc -> 2
+      assert_prism_eval("def self.foo(a:, b:); [a, b]; end; foo(a: 1, b: 2)")
+    end
+
+    def test_keyword_method_params_with_splat
+      # foo(a: 1, **b) # argc -> 1
+      assert_prism_eval("def self.foo(a:, b:); [a, b]; end; b = { b: 2 }; foo(a: 1, **b)")
+    end
+
+    def test_positional_and_splat_keyword_method_params
+      # foo(a, **b) # argc -> 2
+      assert_prism_eval("def self.foo(a, b); [a, b]; end; b = { b: 2 }; foo(1, **b)")
+    end
+
+    def test_positional_and_splat_method_params
+      # foo(a, *b, c, *d, e) # argc -> 2
+      assert_prism_eval("def self.foo(a, b, c, d, e); [a, b, c, d, e]; end; b = [2]; d = [4]; foo(1, *b, 3, *d, 5)")
+    end
+
+    def test_positional_with_splat_and_splat_keyword_method_params
+      # foo(a, *b, c, *d, **e) # argc -> 3
+      assert_prism_eval("def self.foo(a, b, c, d, e); [a, b, c, d, e]; end; b = [2]; d = [4]; e = { e: 5 }; foo(1, *b, 3, *d, **e)")
+    end
+
+    def test_positional_with_splat_and_keyword_method_params
+      # foo(a, *b, c, *d, e:) # argc -> 3
+      assert_prism_eval("def self.foo(a, b, c, d, e:); [a, b, c, d, e]; end; b = [2]; d = [4]; foo(1, *b, 3, *d, e: 5)")
+    end
+
+    def test_leading_splat_and_keyword_method_params
+      # foo(*a, b:) # argc -> 2
+      assert_prism_eval("def self.foo(a, b:); [a, b]; end; a = [1]; foo(*a, b: 2)")
+    end
+
+    def test_repeated_method_params
+      assert_prism_eval("def self.foo(_a, _a); _a; end; foo(1, 2)")
+    end
+
+    def test_splat_params_with_no_lefties
+      assert_prism_eval("def self.foo(v, (*)); v; end; foo(1, [2, 3, 4])")
+    end
+
+    def test_method_parameters
+      assert_prism_eval(<<-CODE)
+        def self.prism_test_method_parameters(a, b=1, *c, d:, e: 2, **f, &g)
+        end
+
+        method(:prism_test_method_parameters).parameters
+      CODE
+
+      assert_prism_eval(<<-CODE)
+        def self.prism_test_method_parameters(d:, e: 2, **f, &g)
+        end
+
+        method(:prism_test_method_parameters).parameters
+      CODE
+
+      assert_prism_eval(<<-CODE)
+        def self.prism_test_method_parameters(**f, &g)
+        end
+
+        method(:prism_test_method_parameters).parameters
+      CODE
+
+      assert_prism_eval(<<-CODE)
+        def self.prism_test_method_parameters(&g)
+        end
+
+        method(:prism_test_method_parameters).parameters
+      CODE
+    end
+
+    def test_LambdaNode
+      assert_prism_eval("-> { to_s }.call")
+    end
+
+    def test_LambdaNode_with_multiline_args
+      assert_prism_eval(<<-CODE)
+        -> (a,
+            b) {
+              a + b
+            }.call(1, 2)
+      CODE
+    end
+
+    def test_ModuleNode
+      assert_prism_eval("module M; end")
+      assert_prism_eval("module M::N; end")
+      assert_prism_eval("module ::O; end")
+    end
+
+    def test_ParenthesesNode
+      assert_prism_eval("()")
+      assert_prism_eval("(1)")
+    end
+
+    def test_PreExecutionNode
+      assert_prism_eval("BEGIN { a = 1 }; 2", raw: true)
+      assert_prism_eval("b = 2; BEGIN { a = 1 }; a + b", raw: true)
+    end
+
+    def test_PostExecutionNode
+      assert_prism_eval("END { 1 }")
+      assert_prism_eval("END { @b }; @b = 1")
+      assert_prism_eval("END { @b; 0 }; @b = 1")
+      assert_prism_eval("foo = 1; END { foo.nil? }")
+      assert_prism_eval("foo = 1; END { END { foo.nil? }}")
+    end
+
+    def test_ProgramNode
+      assert_prism_eval("")
+      assert_prism_eval("1")
+    end
+
+    def test_SingletonClassNode
+      assert_prism_eval("class << self; end")
+    end
+
+    def test_StatementsNode
+      assert_prism_eval("1")
+    end
+
+    def test_YieldNode
+      assert_prism_eval("def prism_test_yield_node; yield; end")
+      assert_prism_eval("def prism_test_yield_node; yield 1, 2; end")
+      assert_prism_eval("def prism_test_yield_node; yield **kw if condition; end")
+
+      # Test case where there's a call directly after the yield call
+      assert_prism_eval("def prism_test_yield_node; yield; 1; end")
+      assert_prism_eval("def prism_test_yield_node; yield 1, 2; 1; end")
+    end
+
+    ############################################################################
+    #  Calls / arguments                                                       #
+    ############################################################################
+
+    def test_ArgumentsNode
+      # assert_prism_eval("[].push 1")
+    end
+
+    def test_BlockArgumentNode
+      assert_prism_eval("1.then(&:to_s)")
+
+      # Test anonymous block forwarding
+      assert_prism_eval(<<~RUBY)
+        o = Object.new
+        def o.foo(&) = yield
+        def o.bar(&) = foo(&)
+
+        o.bar { :ok }
+      RUBY
+    end
+
+    def test_BlockLocalVariableNode
+      assert_prism_eval(<<-CODE
+        pm_var = "outer scope variable"
+
+        1.times { |;pm_var| pm_var = "inner scope variable"; pm_var }
+      CODE
+      )
+
+      assert_prism_eval(<<-CODE
+        pm_var = "outer scope variable"
+
+        1.times { |;pm_var| pm_var = "inner scope variable"; pm_var }
+        pm_var
+      CODE
+      )
+    end
+
+    def test_CallNode
+      assert_prism_eval("to_s")
+
+      # with arguments
+      assert_prism_eval("eval '1'")
+
+      # with arguments and popped
+      assert_prism_eval("eval '1'; 1")
+
+      # With different types of calling arguments
+      assert_prism_eval(<<-CODE)
+        def self.prism_test_call_node_double_splat(**); end
+        prism_test_call_node_double_splat(b: 1, **{})
+      CODE
+      assert_prism_eval(<<-CODE)
+        prism_test_call_node_double_splat(:b => 1)
+      CODE
+
+      assert_prism_eval(<<-CODE)
+        def self.prism_test_call_node_splat(*); end
+        prism_test_call_node_splat(*[], 1)
+      CODE
+
+      assert_prism_eval("prism_test_call_node_splat(*[], 1, 2)")
+
+      assert_prism_eval(<<~RUBY)
+        def self.prism_test_call_node_splat_and_double_splat(a, b, **opts); end
+        prism_test_call_node_splat_and_double_splat(*[1], 2, **{})
+      RUBY
+
+      assert_prism_eval(<<-CODE)
+        class Foo
+          def []=(a, b)
+            1234
+          end
+        end
+
+        def self.foo(i, j)
+          tbl = Foo.new
+          tbl[i] = j
+        end
+        foo(1, 2)
+      CODE
+
+      assert_prism_eval(<<-CODE)
+        class Foo
+          def i=(a)
+            1234
+          end
+        end
+
+        def self.foo(j)
+          tbl = Foo.new
+          tbl.i = j
+        end
+        foo(1)
+      CODE
+
+      assert_prism_eval(<<-CODE)
+        foo = Object.new
+        def foo.[]=(k,v); 42; end
+        foo.[]=(1,2)
+      CODE
+
+      # With splat inside of []=
+      assert_prism_eval(<<~RUBY)
+        obj = Object.new
+        def obj.[]=(a, b); 10; end
+        obj[*[1]] = 3
+      RUBY
+
+      assert_prism_eval(<<-CODE)
+        def self.prism_opt_var_trail_hash(a = nil, *b, c, **d); end
+        prism_opt_var_trail_hash("a")
+        prism_opt_var_trail_hash("a", c: 1)
+        prism_opt_var_trail_hash("a", "b")
+        prism_opt_var_trail_hash("a", "b", "c")
+        prism_opt_var_trail_hash("a", "b", "c", c: 1)
+        prism_opt_var_trail_hash("a", "b", "c", "c" => 0, c: 1)
+      CODE
+
+      assert_prism_eval(<<-CODE)
+        def self.foo(*args, **kwargs) = [args, kwargs]
+
+        [
+          foo(2 => 3),
+          foo([] => 42),
+          foo(a: 42, b: 61),
+          foo(1, 2, 3, a: 42, "b" => 61),
+          foo(:a => 42, :b => 61),
+        ]
+      CODE
+
+      assert_prism_eval(<<-CODE)
+        class PrivateMethod
+          def initialize
+            self.instance_var
+          end
+          private
+          attr_accessor :instance_var
+        end
+        pm = PrivateMethod.new
+        pm.send(:instance_var)
+      CODE
+
+      # Testing safe navigation operator
+      assert_prism_eval(<<-CODE)
+        def self.test_prism_call_node
+          if [][0]&.first
+            1
+          end
+        end
+        test_prism_call_node
+      CODE
+
+      # Specialized instructions
+      assert_prism_eval(%{-"literal"})
+      assert_prism_eval(%{"literal".freeze})
+    end
+
+    def test_CallAndWriteNode
+      assert_prism_eval(<<-CODE
+        class PrismTestSubclass; end
+        def PrismTestSubclass.test_call_and_write_node; end;
+        PrismTestSubclass.test_call_and_write_node &&= 1
+      CODE
+      )
+
+      assert_prism_eval(<<-CODE
+        def PrismTestSubclass.test_call_and_write_node
+          "str"
+        end
+        def PrismTestSubclass.test_call_and_write_node=(val)
+          val
+        end
+        PrismTestSubclass.test_call_and_write_node &&= 1
+      CODE
+      )
+
+      assert_prism_eval(<<-CODE
+        def self.test_call_and_write_node; end;
+        self.test_call_and_write_node &&= 1
+      CODE
+      )
+
+      assert_prism_eval(<<-CODE
+        def self.test_call_and_write_node
+          "str"
+        end
+        def self.test_call_and_write_node=(val)
+          val
+        end
+        self.test_call_and_write_node &&= 1
+      CODE
+      )
+
+      assert_prism_eval(<<-CODE)
+        def self.test_prism_call_node; end
+        def self.test_prism_call_node=(val)
+          val
+        end
+        self&.test_prism_call_node &&= 1
+      CODE
+
+      assert_prism_eval(<<-CODE)
+        def self.test_prism_call_node
+          2
+        end
+        def self.test_prism_call_node=(val)
+          val
+        end
+        self&.test_prism_call_node &&= 1
+      CODE
+    end
+
+    def test_CallOrWriteNode
+      assert_prism_eval(<<-CODE
+        class PrismTestSubclass; end
+        def PrismTestSubclass.test_call_or_write_node; end;
+        def PrismTestSubclass.test_call_or_write_node=(val)
+          val
+        end
+        PrismTestSubclass.test_call_or_write_node ||= 1
+      CODE
+      )
+
+      assert_prism_eval(<<-CODE
+        def PrismTestSubclass.test_call_or_write_node
+          "str"
+        end
+        PrismTestSubclass.test_call_or_write_node ||= 1
+      CODE
+      )
+
+      assert_prism_eval(<<-CODE
+        def self.test_call_or_write_node; end;
+        def self.test_call_or_write_node=(val)
+          val
+        end
+        self.test_call_or_write_node ||= 1
+      CODE
+      )
+
+      assert_prism_eval(<<-CODE
+        def self.test_call_or_write_node
+          "str"
+        end
+        self.test_call_or_write_node ||= 1
+      CODE
+      )
+
+      assert_prism_eval(<<-CODE)
+        def self.test_prism_call_node
+          2
+        end
+        def self.test_prism_call_node=(val)
+          val
+        end
+        self&.test_prism_call_node ||= 1
+      CODE
+
+      assert_prism_eval(<<-CODE)
+        def self.test_prism_call_node; end
+        def self.test_prism_call_node=(val)
+          val
+        end
+        self&.test_prism_call_node ||= 1
+      CODE
+    end
+
+    def test_CallOperatorWriteNode
+      assert_prism_eval(<<-CODE
+        class PrismTestSubclass; end
+        def PrismTestSubclass.test_call_operator_write_node
+          2
+        end
+        def PrismTestSubclass.test_call_operator_write_node=(val)
+          val
+        end
+        PrismTestSubclass.test_call_operator_write_node += 1
+      CODE
+      )
+    end
+
+    def test_ForwardingArgumentsNode
+      assert_prism_eval(<<-CODE)
+        def prism_test_forwarding_arguments_node(...); end;
+        def prism_test_forwarding_arguments_node1(...)
+          prism_test_forwarding_arguments_node(...)
+        end
+      CODE
+
+      assert_prism_eval(<<-CODE)
+        def prism_test_forwarding_arguments_node(...); end;
+        def prism_test_forwarding_arguments_node1(a, ...)
+          prism_test_forwarding_arguments_node(1,2, 3, ...)
+        end
+      CODE
+
+      assert_prism_eval(<<~RUBY)
+        o = Object.new
+        def o.bar(a, b, c) = [a, b, c]
+        def o.foo(...) = 1.times { bar(...) }
+
+        o.foo(1, 2, 3)
+      RUBY
+    end
+
+    def test_ForwardingSuperNode
+      assert_prism_eval("class Forwarding; def to_s; super; end; end")
+      assert_prism_eval("class Forwarding; def eval(code); super { code }; end; end")
+      assert_prism_eval(<<-CODE)
+        class A
+          def initialize(a, b)
+          end
+        end
+
+        class B < A
+          attr_reader :res
+          def initialize(a, b, *)
+            super
+            @res = [a, b]
+          end
+        end
+
+        B.new(1, 2).res
+      CODE
+    end
+
+    def test_KeywordHashNode
+      assert_prism_eval("[a: [:b, :c]]")
+    end
+
+    def test_SuperNode
+      assert_prism_eval("def to_s; super 1; end")
+      assert_prism_eval("def to_s; super(); end")
+      assert_prism_eval("def to_s; super('a', :b, [1,2,3]); end")
+      assert_prism_eval("def to_s; super(1, 2, 3, &:foo); end")
+    end
+
+    ############################################################################
+    # Methods / parameters                                                     #
+    ############################################################################
+
+    def test_AliasGlobalVariableNode
+      assert_prism_eval("alias $prism_foo $prism_bar")
+    end
+
+    def test_AliasMethodNode
+      assert_prism_eval("alias :prism_a :to_s")
+    end
+
+    def test_BlockParameterNode
+      assert_prism_eval("def prism_test_block_parameter_node(&bar) end")
+      assert_prism_eval("->(b, c=1, *d, e, &f){}")
+
+      # Test BlockParameterNode with no name
+      assert_prism_eval("->(&){}")
+      assert_prism_eval("def prism_test_block_parameter_node(&); end")
+    end
+
+    def test_BlockParametersNode
+      assert_prism_eval("Object.tap { || }")
+      assert_prism_eval("[1].map { |num| num }")
+      assert_prism_eval("[1].map { |a; b| b = 2; a + b}")
+
+      # Test block parameters with multiple _
+      assert_prism_eval(<<~RUBY)
+        [[1, 2, 3, 4, 5, 6]].map { |(_, _, _, _, _, _)| _ }
+      RUBY
+    end
+
+    def test_FowardingParameterNode
+      assert_prism_eval("def prism_test_forwarding_parameter_node(...); end")
+    end
+
+    def test_KeywordRestParameterNode
+      assert_prism_eval("def prism_test_keyword_rest_parameter_node(a, **b); end")
+      assert_prism_eval("Object.tap { |**| }")
+
+      # Test that KeywordRestParameterNode creates a copy
+      assert_prism_eval(<<~RUBY)
+        hash = {}
+        o = Object.new
+        def o.foo(**a) = a[:foo] = 1
+
+        o.foo(**hash)
+        hash
+      RUBY
+    end
+
+    def test_NoKeywordsParameterNode
+      assert_prism_eval("def prism_test_no_keywords(**nil); end")
+      assert_prism_eval("def prism_test_no_keywords(a, b = 2, **nil); end")
+    end
+
+    def test_OptionalParameterNode
+      assert_prism_eval("def prism_test_optional_param_node(bar = nil); end")
+    end
+
+    def test_OptionalKeywordParameterNode
+      assert_prism_eval("def prism_test_optional_keyword_param_node(bar: nil); end")
+
+      # Test with optional argument and method call in OptionalKeywordParameterNode
+      assert_prism_eval(<<~RUBY)
+        o = Object.new
+        def o.foo = 1
+        def o.bar(a = nil, b: foo) = b
+        o.bar
+      RUBY
+    end
+
+    def test_ParametersNode
+      assert_prism_eval("def prism_test_parameters_node(bar, baz); end")
+      assert_prism_eval("def prism_test_parameters_node(a, b = 2); end")
+    end
+
+    def test_RequiredParameterNode
+      assert_prism_eval("def prism_test_required_param_node(bar); end")
+      assert_prism_eval("def prism_test_required_param_node(foo, bar); end")
+    end
+
+    def test_RequiredKeywordParameterNode
+      assert_prism_eval("def prism_test_required_param_node(bar:); end")
+      assert_prism_eval("def prism_test_required_param_node(foo:, bar:); end")
+      assert_prism_eval("-> a, b = 1, c:, d:, &e { a }")
+    end
+
+    def test_RestParameterNode
+      assert_prism_eval("def prism_test_rest_parameter_node(*a); end")
+    end
+
+    def test_UndefNode
+      assert_prism_eval("def prism_undef_node_1; end; undef prism_undef_node_1")
+      assert_prism_eval(<<-HERE
+        def prism_undef_node_2
+        end
+        def prism_undef_node_3
+        end
+        undef prism_undef_node_2, prism_undef_node_3
+      HERE
+      )
+      assert_prism_eval(<<-HERE
+        def prism_undef_node_4
+        end
+        undef :'prism_undef_node_#{4}'
+      HERE
+      )
+    end
+
+    ############################################################################
+    # Pattern matching                                                         #
+    ############################################################################
+
+    def test_AlternationPatternNode
+      assert_prism_eval("1 in 1 | 2")
+      assert_prism_eval("1 in 2 | 1")
+      assert_prism_eval("1 in 2 | 3 | 4 | 1")
+      assert_prism_eval("1 in 2 | 3")
+    end
+
+    def test_ArrayPatternNode
+      assert_prism_eval("[] => []")
+
+      ["in", "=>"].each do |operator|
+        ["", "Array"].each do |constant|
+          assert_prism_eval("[1, 2, 3] #{operator} #{constant}[1, 2, 3]")
+
+          assert_prism_eval("[1, 2, 3] #{operator} #{constant}[*]")
+          assert_prism_eval("[1, 2, 3] #{operator} #{constant}[1, *]")
+          assert_prism_eval("[1, 2, 3] #{operator} #{constant}[1, 2, *]")
+          assert_prism_eval("[1, 2, 3] #{operator} #{constant}[1, 2, 3, *]")
+
+          assert_prism_eval("[1, 2, 3] #{operator} #{constant}[*foo]")
+          assert_prism_eval("[1, 2, 3] #{operator} #{constant}[1, *foo]")
+          assert_prism_eval("[1, 2, 3] #{operator} #{constant}[1, 2, *foo]")
+          assert_prism_eval("[1, 2, 3] #{operator} #{constant}[1, 2, 3, *foo]")
+
+          assert_prism_eval("[1, 2, 3] #{operator} #{constant}[*, 3]")
+          assert_prism_eval("[1, 2, 3] #{operator} #{constant}[*, 2, 3]")
+          assert_prism_eval("[1, 2, 3] #{operator} #{constant}[*, 1, 2, 3]")
+
+          assert_prism_eval("[1, 2, 3] #{operator} #{constant}[*foo, 3]")
+          assert_prism_eval("[1, 2, 3] #{operator} #{constant}[*foo, 2, 3]")
+          assert_prism_eval("[1, 2, 3] #{operator} #{constant}[*foo, 1, 2, 3]")
+        end
+      end
+
+      assert_prism_eval("begin; Object.new => [1, 2, 3]; rescue NoMatchingPatternError; true; end")
+      assert_prism_eval("begin; [1, 2, 3] => Object[1, 2, 3]; rescue NoMatchingPatternError; true; end")
+    end
+
+    def test_CapturePatternNode
+      assert_prism_eval("[1] => [Integer => foo]")
+    end
+
+    def test_CaseMatchNode
+      assert_prism_eval(<<~RUBY)
+        case [1, 2, 3]
+        in [1, 2, 3]
+          4
+        end
+      RUBY
+
+      assert_prism_eval(<<~RUBY)
+        case { a: 5, b: 6 }
+        in [1, 2, 3]
+          4
+        in { a: 5, b: 6 }
+          7
+        end
+      RUBY
+
+      assert_prism_eval(<<~RUBY)
+        case [1, 2, 3, 4]
+        in [1, 2, 3]
+          4
+        in { a: 5, b: 6 }
+          7
+        else
+        end
+      RUBY
+
+      assert_prism_eval(<<~RUBY)
+        case [1, 2, 3, 4]
+        in [1, 2, 3]
+          4
+        in { a: 5, b: 6 }
+          7
+        else
+          8
+        end
+      RUBY
+
+      assert_prism_eval(<<~RUBY)
+        case [1, 2, 3]
+        in [1, 2, 3] unless to_s
+        in [1, 2, 3] if to_s.nil?
+        in [1, 2, 3]
+          true
+        end
+      RUBY
+    end
+
+    def test_FindPatternNode
+      ["in", "=>"].each do |operator|
+        ["", "Array"].each do |constant|
+          assert_prism_eval("[1, 2, 3, 4, 5] #{operator} #{constant}[*, 1, 2, 3, 4, 5, *]")
+
+          assert_prism_eval("[1, 2, 3, 4, 5] #{operator} #{constant}[*, 1, *]")
+          assert_prism_eval("[1, 2, 3, 4, 5] #{operator} #{constant}[*, 3, *]")
+          assert_prism_eval("[1, 2, 3, 4, 5] #{operator} #{constant}[*, 5, *]")
+
+          assert_prism_eval("[1, 2, 3, 4, 5] #{operator} #{constant}[*, 1, 2, *]")
+          assert_prism_eval("[1, 2, 3, 4, 5] #{operator} #{constant}[*, 2, 3, *]")
+          assert_prism_eval("[1, 2, 3, 4, 5] #{operator} #{constant}[*, 3, 4, *]")
+          assert_prism_eval("[1, 2, 3, 4, 5] #{operator} #{constant}[*, 4, 5, *]")
+
+          assert_prism_eval("[1, 2, 3, 4, 5] #{operator} #{constant}[*, 1, 2, 3, *]")
+          assert_prism_eval("[1, 2, 3, 4, 5] #{operator} #{constant}[*, 2, 3, 4, *]")
+          assert_prism_eval("[1, 2, 3, 4, 5] #{operator} #{constant}[*, 3, 4, 5, *]")
+
+          assert_prism_eval("[1, 2, 3, 4, 5] #{operator} #{constant}[*, 1, 2, 3, 4, *]")
+          assert_prism_eval("[1, 2, 3, 4, 5] #{operator} #{constant}[*, 2, 3, 4, 5, *]")
+
+          assert_prism_eval("[1, 2, 3, 4, 5] #{operator} #{constant}[*foo, 3, *]")
+          assert_prism_eval("[1, 2, 3, 4, 5] #{operator} #{constant}[*foo, 3, 4, *]")
+          assert_prism_eval("[1, 2, 3, 4, 5] #{operator} #{constant}[*foo, 3, 4, 5, *]")
+          assert_prism_eval("[1, 2, 3, 4, 5] #{operator} #{constant}[*foo, 1, 2, 3, 4, *]")
+
+          assert_prism_eval("[1, 2, 3, 4, 5] #{operator} #{constant}[*, 3, *foo]")
+          assert_prism_eval("[1, 2, 3, 4, 5] #{operator} #{constant}[*, 3, 4, *foo]")
+          assert_prism_eval("[1, 2, 3, 4, 5] #{operator} #{constant}[*, 3, 4, 5, *foo]")
+          assert_prism_eval("[1, 2, 3, 4, 5] #{operator} #{constant}[*, 1, 2, 3, 4, *foo]")
+
+          assert_prism_eval("[1, 2, 3, 4, 5] #{operator} #{constant}[*foo, 3, *bar]")
+          assert_prism_eval("[1, 2, 3, 4, 5] #{operator} #{constant}[*foo, 3, 4, *bar]")
+          assert_prism_eval("[1, 2, 3, 4, 5] #{operator} #{constant}[*foo, 3, 4, 5, *bar]")
+          assert_prism_eval("[1, 2, 3, 4, 5] #{operator} #{constant}[*foo, 1, 2, 3, 4, *bar]")
+        end
+      end
+
+      assert_prism_eval("[1, [2, [3, [4, [5]]]]] => [*, [*, [*, [*, [*]]]]]")
+      assert_prism_eval("[1, [2, [3, [4, [5]]]]] => [1, [2, [3, [4, [5]]]]]")
+
+      assert_prism_eval("begin; Object.new => [*, 2, *]; rescue NoMatchingPatternError; true; end")
+      assert_prism_eval("begin; [1, 2, 3] => Object[*, 2, *]; rescue NoMatchingPatternError; true; end")
+    end
+
+    def test_HashPatternNode
+      assert_prism_eval("{} => {}")
+
+      [["{ ", " }"], ["Hash[", "]"]].each do |(prefix, suffix)|
+        assert_prism_eval("{} => #{prefix} **nil #{suffix}")
+
+        assert_prism_eval("{ a: 1, b: 2, c: 3 } => #{prefix} a: 1 #{suffix}")
+        assert_prism_eval("{ a: 1, b: 2, c: 3 } => #{prefix} a: 1, b: 2 #{suffix}")
+        assert_prism_eval("{ a: 1, b: 2, c: 3 } => #{prefix} b: 2, c: 3 #{suffix}")
+        assert_prism_eval("{ a: 1, b: 2, c: 3 } => #{prefix} a: 1, b: 2, c: 3 #{suffix}")
+
+        assert_prism_eval("{ a: 1, b: 2, c: 3 } => #{prefix} ** #{suffix}")
+        assert_prism_eval("{ a: 1, b: 2, c: 3 } => #{prefix} a: 1, ** #{suffix}")
+        assert_prism_eval("{ a: 1, b: 2, c: 3 } => #{prefix} a: 1, b: 2, ** #{suffix}")
+        assert_prism_eval("{ a: 1, b: 2, c: 3 } => #{prefix} b: 2, c: 3, ** #{suffix}")
+        assert_prism_eval("{ a: 1, b: 2, c: 3 } => #{prefix} a: 1, b: 2, c: 3, ** #{suffix}")
+
+        assert_prism_eval("{ a: 1, b: 2, c: 3 } => #{prefix} **foo #{suffix}")
+        assert_prism_eval("{ a: 1, b: 2, c: 3 } => #{prefix} a: 1, **foo #{suffix}")
+        assert_prism_eval("{ a: 1, b: 2, c: 3 } => #{prefix} a: 1, b: 2, **foo #{suffix}")
+        assert_prism_eval("{ a: 1, b: 2, c: 3 } => #{prefix} b: 2, c: 3, **foo #{suffix}")
+        assert_prism_eval("{ a: 1, b: 2, c: 3 } => #{prefix} a: 1, b: 2, c: 3, **foo #{suffix}")
+
+        assert_prism_eval("{ a: 1 } => #{prefix} a: 1, **nil #{suffix}")
+        assert_prism_eval("{ a: 1, b: 2, c: 3 } => #{prefix} a: 1, b: 2, c: 3, **nil #{suffix}")
+      end
+
+      assert_prism_eval("{ a: { b: { c: 1 } } } => { a: { b: { c: 1 } } }")
+    end
+
+    def test_MatchPredicateNode
+      assert_prism_eval("1 in 1")
+      assert_prism_eval("1.0 in 1.0")
+      assert_prism_eval("1i in 1i")
+      assert_prism_eval("1r in 1r")
+
+      assert_prism_eval("\"foo\" in \"foo\"")
+      assert_prism_eval("\"foo \#{1}\" in \"foo \#{1}\"")
+
+      assert_prism_eval("false in false")
+      assert_prism_eval("nil in nil")
+      assert_prism_eval("self in self")
+      assert_prism_eval("true in true")
+
+      assert_prism_eval("5 in 0..10")
+      assert_prism_eval("5 in 0...10")
+
+      assert_prism_eval("[\"5\"] in %w[5]")
+
+      assert_prism_eval("Prism in Prism")
+      assert_prism_eval("Prism in ::Prism")
+
+      assert_prism_eval(":prism in :prism")
+      assert_prism_eval("%s[prism\#{1}] in %s[prism\#{1}]")
+      assert_prism_eval("\"foo\" in /.../")
+      assert_prism_eval("\"foo1\" in /...\#{1}/")
+      assert_prism_eval("4 in ->(v) { v.even? }")
+
+      assert_prism_eval("5 in foo")
+
+      assert_prism_eval("1 in 2")
+
+      # Bug: https://bugs.ruby-lang.org/issues/20956
+      assert_prism_eval("1 in [1 | [1]]")
+    end
+
+    def test_MatchRequiredNode
+      assert_prism_eval("1 => 1")
+      assert_prism_eval("1.0 => 1.0")
+      assert_prism_eval("1i => 1i")
+      assert_prism_eval("1r => 1r")
+
+      assert_prism_eval("\"foo\" => \"foo\"")
+      assert_prism_eval("\"foo \#{1}\" => \"foo \#{1}\"")
+
+      assert_prism_eval("false => false")
+      assert_prism_eval("nil => nil")
+      assert_prism_eval("true => true")
+
+      assert_prism_eval("5 => 0..10")
+      assert_prism_eval("5 => 0...10")
+
+      assert_prism_eval("[\"5\"] => %w[5]")
+
+      assert_prism_eval(":prism => :prism")
+      assert_prism_eval("%s[prism\#{1}] => %s[prism\#{1}]")
+      assert_prism_eval("\"foo\" => /.../")
+      assert_prism_eval("\"foo1\" => /...\#{1}/")
+      assert_prism_eval("4 => ->(v) { v.even? }")
+
+      assert_prism_eval("5 => foo")
+    end
+
+    def test_PinnedExpressionNode
+      assert_prism_eval("4 in ^(4)")
+    end
+
+    def test_PinnedVariableNode
+      assert_prism_eval("module Prism; @@prism = 1; 1 in ^@@prism; end")
+      assert_prism_eval("module Prism; @prism = 1; 1 in ^@prism; end")
+      assert_prism_eval("$prism = 1; 1 in ^$prism")
+      assert_prism_eval("prism = 1; 1 in ^prism")
+      assert_prism_eval("[1].each { 1 => ^it }")
+    end
+
+    ############################################################################
+    #  Miscellaneous                                                           #
+    ############################################################################
+
+    def test_eval
+      assert_prism_eval("eval('1 + 1')", raw: true)
+      assert_prism_eval("a = 1; eval('a + 1')", raw: true)
+
+      assert_prism_eval(<<~CODE, raw: true)
+        def prism_eval_splat(**bar)
+          eval("bar")
+        end
+        prism_eval_splat(bar: 10)
+      CODE
+
+      assert_prism_eval(<<~CODE, raw: true)
+        def prism_eval_keywords(baz:)
+          eval("baz")
+        end
+        prism_eval_keywords(baz: 10)
+      CODE
+
+      assert_prism_eval(<<~CODE, raw: true)
+        [1].each do |a|
+          [2].each do |b|
+            c = 3
+            eval("a + b + c")
+          end
+        end
+      CODE
+
+      assert_prism_eval(<<~CODE, raw: true)
+        def prism_eval_binding(b)
+          eval("bar", b)
+        end
+
+        bar = :ok
+        prism_eval_binding(binding)
+      CODE
+    end
+
+    def test_ScopeNode
+      assert_separately(%w[], <<~'RUBY')
+        def compare_eval(source)
+          ruby_eval = RubyVM::InstructionSequence.compile("module A; " + source + "; end").eval
+          prism_eval = RubyVM::InstructionSequence.compile_prism("module B; " + source + "; end").eval
+
+          assert_equal ruby_eval, prism_eval
+        end
+
+        def assert_prism_eval(source)
+          $VERBOSE, verbose_bak = nil, $VERBOSE
+
+          begin
+            compare_eval(source)
+
+            # Test "popped" functionality
+            compare_eval("#{source}; 1")
+          ensure
+            $VERBOSE = verbose_bak
+          end
+        end
+
+        assert_prism_eval("a = 1; 1.times do; { a: }; end")
+        assert_prism_eval("a = 1; def foo(a); a; end")
+      RUBY
+    end
+
+    ############################################################################
+    # Errors                                                                   #
+    ############################################################################
+
+    def test_MissingNode
+      # TODO
+    end
+
+    ############################################################################
+    #  Encoding                                                                #
+    ############################################################################
+
+    def test_encoding
+      assert_prism_eval('"però"')
+      assert_prism_eval(":però")
+    end
+
+    def test_parse_file
+      assert_nothing_raised do
+        RubyVM::InstructionSequence.compile_file_prism(__FILE__)
+      end
+
+      error = assert_raise Errno::ENOENT do
+        RubyVM::InstructionSequence.compile_file_prism("idontexist.rb")
+      end
+
+      assert_equal "No such file or directory - idontexist.rb", error.message
+
+      assert_raise TypeError do
+        RubyVM::InstructionSequence.compile_file_prism(nil)
+      end
+    end
+
+    private
+
+    def compare_eval(source, raw:, location:)
+      source = raw ? source : "class Prism::TestCompilePrism\n#{source}\nend"
+
+      ruby_eval = RubyVM::InstructionSequence.compile_parsey(source).eval
+      prism_eval = RubyVM::InstructionSequence.compile_prism(source).eval
+
+      if ruby_eval.is_a? Proc
+        assert_equal ruby_eval.class, prism_eval.class, "@#{location.path}:#{location.lineno}"
+      else
+        assert_equal ruby_eval, prism_eval, "@#{location.path}:#{location.lineno}"
+      end
+    end
+
+    def assert_prism_eval(source, raw: false)
+      location = caller_locations(1, 1).first
+      $VERBOSE, verbose_bak = nil, $VERBOSE
+
+      begin
+        compare_eval(source, raw:, location:)
+
+        # Test "popped" functionality
+        compare_eval("#{source}; 1", raw:, location:)
+      ensure
+        $VERBOSE = verbose_bak
+      end
+    end
+  end
+end
diff --git a/test/ruby/test_complex.rb b/test/ruby/test_complex.rb
index edbdffd069ff7b..bb131cee911e9a 100644
--- a/test/ruby/test_complex.rb
+++ b/test/ruby/test_complex.rb
@@ -526,6 +526,71 @@ def test_expt
     r = c ** Rational(-2,3)
     assert_in_delta(0.432, r.real, 0.001)
     assert_in_delta(-0.393, r.imag, 0.001)
+  end
+
+  def test_expt_for_special_angle
+    c = Complex(1, 0) ** 100000000000000000000000000000000
+    assert_equal(Complex(1, 0), c)
+
+    c = Complex(-1, 0) ** 10000000000000000000000000000000
+    assert_equal(Complex(1, 0), c)
+
+    c = Complex(-1, 0) ** 10000000000000000000000000000001
+    assert_equal(Complex(-1, 0), c)
+
+    c = Complex(0, 1) ** 100000000000000000000000000000000
+    assert_equal(Complex(1, 0), c)
+
+    c = Complex(0, 1) ** 100000000000000000000000000000001
+    assert_equal(Complex(0, 1), c)
+
+    c = Complex(0, 1) ** 100000000000000000000000000000002
+    assert_equal(Complex(-1, 0), c)
+
+    c = Complex(0, 1) ** 100000000000000000000000000000003
+    assert_equal(Complex(0, -1), c)
+
+    c = Complex(0, -1) ** 100000000000000000000000000000000
+    assert_equal(Complex(1, 0), c)
+
+    c = Complex(0, -1) ** 100000000000000000000000000000001
+    assert_equal(Complex(0, -1), c)
+
+    c = Complex(0, -1) ** 100000000000000000000000000000002
+    assert_equal(Complex(-1, 0), c)
+
+    c = Complex(0, -1) ** 100000000000000000000000000000003
+    assert_equal(Complex(0, 1), c)
+
+    c = Complex(1, 1) ** 1
+    assert_equal(Complex(1, 1), c)
+
+    c = Complex(1, 1) ** 2
+    assert_equal(Complex(0, 2), c)
+
+    c = Complex(1, 1) ** 3
+    assert_equal(Complex(-2, 2), c)
+
+    c = Complex(1, 1) ** 4
+    assert_equal(Complex(-4, 0), c)
+
+    c = Complex(1, 1) ** 5
+    assert_equal(Complex(-4, -4), c)
+
+    c = Complex(1, 1) ** 6
+    assert_equal(Complex(0, -8), c)
+
+    c = Complex(1, 1) ** 7
+    assert_equal(Complex(8, -8), c)
+
+    c = Complex(-2, -2) ** 3
+    assert_equal(Complex(16, -16), c)
+
+    c = Complex(2, -2) ** 3
+    assert_equal(Complex(-16, -16), c)
+
+    c = Complex(-2, 2) ** 3
+    assert_equal(Complex(16, 16), c)
 
     c = Complex(0.0, -888888888888888.0)**8888
     assert_not_predicate(c.real, :nan?)
@@ -676,6 +741,17 @@ def test_inspect
     assert_equal('(1+2i)', c.inspect)
   end
 
+  def test_inspect_to_s_frozen_bug_20337
+    assert_separately([], <<~'RUBY')
+      class Numeric
+        def inspect = super.freeze
+      end
+      c = Complex(Numeric.new, 1)
+      assert_match(/\A\(#<Numeric:/, c.inspect)
+      assert_match(/\A#<Numeric:/, c.to_s)
+    RUBY
+  end
+
   def test_marshal
     c = Complex(1,2)
 
@@ -915,31 +991,27 @@ def test_Complex_with_invalid_exception
     }
   end
 
-  def test_Complex_without_exception
-    assert_nothing_raised(ArgumentError){
-      assert_equal(nil, Complex('5x', exception: false))
-    }
-    assert_nothing_raised(ArgumentError){
-      assert_equal(nil, Complex(nil, exception: false))
-    }
-    assert_nothing_raised(ArgumentError){
-      assert_equal(nil, Complex(Object.new, exception: false))
-    }
-    assert_nothing_raised(ArgumentError){
-      assert_equal(nil, Complex(1, nil, exception: false))
-    }
-    assert_nothing_raised(ArgumentError){
-      assert_equal(nil, Complex(1, Object.new, exception: false))
-    }
+  def assert_complex_with_exception(error, *args, message: "")
+    assert_raise(error, message) do
+      Complex(*args, exception: true)
+    end
+    assert_nothing_raised(error, message) do
+      assert_nil(Complex(*args, exception: false))
+      assert_nil($!)
+    end
+  end
+
+  def test_Complex_with_exception
+    assert_complex_with_exception(ArgumentError, '5x')
+    assert_complex_with_exception(TypeError, nil)
+    assert_complex_with_exception(TypeError, Object.new)
+    assert_complex_with_exception(TypeError, 1, nil)
+    assert_complex_with_exception(TypeError, 1, Object.new)
 
     o = Object.new
     def o.to_c; raise; end
-    assert_nothing_raised(ArgumentError){
-      assert_equal(nil, Complex(o, exception: false))
-    }
-    assert_nothing_raised(ArgumentError){
-      assert_equal(nil, Complex(1, o, exception: false))
-    }
+    assert_complex_with_exception(RuntimeError, o)
+    assert_complex_with_exception(TypeError, 1, o)
   end
 
   def test_respond
@@ -993,6 +1065,29 @@ def test_to_r
     assert_raise(RangeError){Rational(Complex(3,2))}
   end
 
+  def test_to_r_with_float
+    assert_equal(Rational(3), Complex(3, 0.0).to_r)
+    assert_raise(RangeError){Complex(3, 1.0).to_r}
+  end
+
+  def test_to_r_with_numeric_obj
+    c = Class.new(Numeric)
+
+    num = 0
+    c.define_method(:to_s) { num.to_s }
+    c.define_method(:==) { num == it }
+    c.define_method(:<)  { num <  it }
+
+    o = c.new
+    assert_equal(Rational(3), Complex(3, o).to_r)
+
+    num = 1
+    assert_raise(RangeError){Complex(3, o).to_r}
+
+    c.define_method(:to_r) { 0r }
+    assert_equal(Rational(3), Complex(3, o).to_r)
+  end
+
   def test_to_c
     c = nil.to_c
     assert_equal([0,0], [c.real, c.imag])
diff --git a/test/ruby/test_continuation.rb b/test/ruby/test_continuation.rb
index 8c62d208402f1e..612dbf28c90eee 100644
--- a/test/ruby/test_continuation.rb
+++ b/test/ruby/test_continuation.rb
@@ -4,6 +4,10 @@
 require 'fiber'
 
 class TestContinuation < Test::Unit::TestCase
+  def setup
+    omit 'requires callcc support' unless respond_to?(:callcc)
+  end
+
   def test_create
     assert_equal(:ok, callcc{:ok})
     assert_equal(:ok, callcc{|c| c.call :ok})
diff --git a/test/ruby/test_data.rb b/test/ruby/test_data.rb
index b911776bde8dc6..dd698fdcc4a30e 100644
--- a/test/ruby/test_data.rb
+++ b/test/ruby/test_data.rb
@@ -117,14 +117,31 @@ def test_instance_behavior
     assert_equal({foo: 1, bar: 2}, test.to_h)
     assert_equal({"foo"=>"1", "bar"=>"2"}, test.to_h { [_1.to_s, _2.to_s] })
 
+    assert_equal([1, 2], test.deconstruct)
     assert_equal({foo: 1, bar: 2}, test.deconstruct_keys(nil))
     assert_equal({foo: 1}, test.deconstruct_keys(%i[foo]))
     assert_equal({foo: 1}, test.deconstruct_keys(%i[foo baz]))
+    assert_equal({}, test.deconstruct_keys(%i[foo bar baz]))
     assert_raise(TypeError) { test.deconstruct_keys(0) }
 
     assert_kind_of(Integer, test.hash)
   end
 
+  def test_hash
+    measure = Data.define(:amount, :unit)
+
+    assert_equal(measure[1, 'km'].hash, measure[1, 'km'].hash)
+    assert_not_equal(measure[1, 'km'].hash, measure[10, 'km'].hash)
+    assert_not_equal(measure[1, 'km'].hash, measure[1, 'm'].hash)
+    assert_not_equal(measure[1, 'km'].hash, measure[1.0, 'km'].hash)
+
+    # Structurally similar data class, but shouldn't be considered
+    # the same hash key
+    measurement = Data.define(:amount, :unit)
+
+    assert_not_equal(measure[1, 'km'].hash, measurement[1, 'km'].hash)
+  end
+
   def test_inspect
     klass = Data.define(:a)
     o = klass.new(1)
@@ -263,4 +280,10 @@ def test_marshal
     assert_not_same(test, loaded)
     assert_predicate(loaded, :frozen?)
   end
+
+  def test_frozen_subclass
+    test = Class.new(Data.define(:a)).freeze.new(a: 0)
+    assert_kind_of(Data, test)
+    assert_equal([:a], test.members)
+  end
 end
diff --git a/test/ruby/test_default_gems.rb b/test/ruby/test_default_gems.rb
index d8e8226253a146..b82e304cbdb1c6 100644
--- a/test/ruby/test_default_gems.rb
+++ b/test/ruby/test_default_gems.rb
@@ -5,9 +5,11 @@ class TestDefaultGems < Test::Unit::TestCase
   def self.load(file)
     code = File.read(file, mode: "r:UTF-8:-", &:read)
 
+    # These regex patterns are from load_gemspec method of rbinstall.rb.
     # - `git ls-files` is useless under ruby's repository
     # - `2>/dev/null` works only on Unix-like platforms
-    code.gsub!(/`git.*?`/, '""')
+    code.gsub!(/(?:`git[^\`]*`|%x\[git[^\]]*\])\.split\([^\)]*\)/m, '[]')
+    code.gsub!(/IO\.popen\(.*git.*?\)/, '[] || itself')
 
     eval(code, binding, file)
   end
diff --git a/test/ruby/test_defined.rb b/test/ruby/test_defined.rb
index b9bf9393944998..db1fdc8e25a3c5 100644
--- a/test/ruby/test_defined.rb
+++ b/test/ruby/test_defined.rb
@@ -127,6 +127,53 @@ def test_defined_matchdata
     assert_equal nil, defined?($2)
   end
 
+  def test_defined_assignment
+    assert_equal("assignment", defined?(a = 1))
+    assert_equal("assignment", defined?(a += 1))
+    assert_equal("assignment", defined?(a &&= 1))
+    assert_equal("assignment", eval('defined?(A = 1)'))
+    assert_equal("assignment", eval('defined?(A += 1)'))
+    assert_equal("assignment", eval('defined?(A &&= 1)'))
+    assert_equal("assignment", eval('defined?(A::B = 1)'))
+    assert_equal("assignment", eval('defined?(A::B += 1)'))
+    assert_equal("assignment", eval('defined?(A::B &&= 1)'))
+  end
+
+  def test_defined_splat
+    assert_nil(defined?([*a]))
+    assert_nil(defined?(itself(*a)))
+    assert_equal("expression", defined?([*itself]))
+    assert_equal("method", defined?(itself(*itself)))
+  end
+
+  def test_defined_hash
+    assert_nil(defined?({a: a}))
+    assert_nil(defined?({a => 1}))
+    assert_nil(defined?({a => a}))
+    assert_nil(defined?({**a}))
+    assert_nil(defined?(itself(a: a)))
+    assert_nil(defined?(itself(a => 1)))
+    assert_nil(defined?(itself(a => a)))
+    assert_nil(defined?(itself(**a)))
+    assert_nil(defined?(itself({a: a})))
+    assert_nil(defined?(itself({a => 1})))
+    assert_nil(defined?(itself({a => a})))
+    assert_nil(defined?(itself({**a})))
+
+    assert_equal("expression", defined?({a: itself}))
+    assert_equal("expression", defined?({itself => 1}))
+    assert_equal("expression", defined?({itself => itself}))
+    assert_equal("expression", defined?({**itself}))
+    assert_equal("method", defined?(itself(a: itself)))
+    assert_equal("method", defined?(itself(itself => 1)))
+    assert_equal("method", defined?(itself(itself => itself)))
+    assert_equal("method", defined?(itself(**itself)))
+    assert_equal("method", defined?(itself({a: itself})))
+    assert_equal("method", defined?(itself({itself => 1})))
+    assert_equal("method", defined?(itself({itself => itself})))
+    assert_equal("method", defined?(itself({**itself})))
+  end
+
   def test_defined_literal
     assert_equal("nil", defined?(nil))
     assert_equal("true", defined?(true))
@@ -196,6 +243,26 @@ def test_defined_empty_paren_arg
     assert_nil(defined?(p () + 1))
   end
 
+  def test_defined_paren_void_stmts
+    assert_equal("expression", defined? (;x))
+    assert_equal("expression", defined? (x;))
+    assert_nil(defined? (
+
+      x
+
+    ))
+
+    x = 1
+
+    assert_equal("expression", defined? (;x))
+    assert_equal("expression", defined? (x;))
+    assert_equal("local-variable", defined? (
+
+      x
+
+    ))
+  end
+
   def test_defined_impl_specific
     feature7035 = '[ruby-core:47558]' # not spec
     assert_predicate(defined?(Foo), :frozen?, feature7035)
diff --git a/test/ruby/test_dir.rb b/test/ruby/test_dir.rb
index 65803d0bc56dc1..edb5210af16313 100644
--- a/test/ruby/test_dir.rb
+++ b/test/ruby/test_dir.rb
@@ -104,22 +104,23 @@ def test_class_chdir
     assert_raise(ArgumentError) { Dir.chdir }
     ENV["HOME"] = pwd
     Dir.chdir do
-      assert_warning(/conflicting chdir during another chdir block/) { Dir.chdir(pwd) }
+      conflicting = /conflicting chdir during another chdir block\n^#{Regexp.quote(__FILE__)}:#{__LINE__-1}:/
+      assert_warning(conflicting) { Dir.chdir(pwd) }
 
-      assert_warning(/conflicting chdir during another chdir block/) { Dir.chdir(@root) }
+      assert_warning(conflicting) { Dir.chdir(@root) }
       assert_equal(@root, Dir.pwd)
 
-      assert_warning(/conflicting chdir during another chdir block/) { Dir.chdir(pwd) }
+      assert_warning(conflicting) { Dir.chdir(pwd) }
 
       assert_raise(RuntimeError) { Thread.new { Thread.current.report_on_exception = false; Dir.chdir(@root) }.join }
       assert_raise(RuntimeError) { Thread.new { Thread.current.report_on_exception = false; Dir.chdir(@root) { } }.join }
 
-      assert_warning(/conflicting chdir during another chdir block/) { Dir.chdir(pwd) }
+      assert_warning(conflicting) { Dir.chdir(pwd) }
 
-      assert_warning(/conflicting chdir during another chdir block/) { Dir.chdir(@root) }
+      assert_warning(conflicting) { Dir.chdir(@root) }
       assert_equal(@root, Dir.pwd)
 
-      assert_warning(/conflicting chdir during another chdir block/) { Dir.chdir(pwd) }
+      assert_warning(conflicting) { Dir.chdir(pwd) }
       Dir.chdir(@root) do
         assert_equal(@root, Dir.pwd)
       end
@@ -141,31 +142,59 @@ def test_instance_chdir
     setup_envs
 
     ENV["HOME"] = pwd
-    root_dir.chdir do
-      assert_warning(/conflicting chdir during another chdir block/) { dir.chdir }
-      assert_warning(/conflicting chdir during another chdir block/) { root_dir.chdir }
+    ret = root_dir.chdir do |*a|
+      conflicting = /conflicting chdir during another chdir block\n^#{Regexp.quote(__FILE__)}:#{__LINE__-1}:/
+
+      assert_empty(a)
+
+      assert_warning(conflicting) { dir.chdir }
+      assert_warning(conflicting) { root_dir.chdir }
 
       assert_equal(@root, Dir.pwd)
 
       assert_raise(RuntimeError) { Thread.new { Thread.current.report_on_exception = false; dir.chdir }.join }
       assert_raise(RuntimeError) { Thread.new { Thread.current.report_on_exception = false; dir.chdir{} }.join }
 
-      assert_warning(/conflicting chdir during another chdir block/) { dir.chdir }
+      assert_warning(conflicting) { dir.chdir }
       assert_equal(pwd, Dir.pwd)
 
-      assert_warning(/conflicting chdir during another chdir block/) { root_dir.chdir }
+      assert_warning(conflicting) { root_dir.chdir }
       assert_equal(@root, Dir.pwd)
 
-      assert_warning(/conflicting chdir during another chdir block/) { dir.chdir }
+      assert_warning(conflicting) { dir.chdir }
 
       root_dir.chdir do
         assert_equal(@root, Dir.pwd)
       end
       assert_equal(pwd, Dir.pwd)
+
+      42
     end
+
+    assert_separately(["-", @root], "#{<<~"begin;"}\n#{<<~'end;'}")
+    begin;
+      root = ARGV.shift
+
+      $dir_warnings = []
+
+      def Warning.warn(message)
+        $dir_warnings << message
+      end
+
+      line2 = line1 = __LINE__; Dir.chdir(root) do
+        line2 = __LINE__; Dir.chdir
+      end
+
+      message = $dir_warnings.shift
+      assert_include(message, "#{__FILE__}:#{line2}:")
+      assert_include(message, "#{__FILE__}:#{line1}:")
+      assert_empty($dir_warnings)
+    end;
+
+    assert_equal(42, ret)
   ensure
     begin
-      dir.chdir
+      assert_equal(0, dir.chdir)
     rescue
       abort("cannot return the original directory: #{ pwd }")
     end
@@ -227,7 +256,7 @@ def test_glob
       Dir.glob(@root, sort: nil)
     end
 
-    assert_equal(("a".."z").step(2).map {|f| File.join(File.join(@root, f), "") },
+    assert_equal(("a".."z").each_slice(2).map {|f,_| File.join(File.join(@root, f), "") },
                  Dir.glob(File.join(@root, "*/")))
     assert_equal([File.join(@root, '//a')], Dir.glob(@root + '//a'))
 
@@ -578,6 +607,55 @@ def test_home_windows
       ENV.delete('USERPROFILE')
       assert_equal("C:/ruby/homepath", Dir.home)
     end
+
+    def test_home_at_startup_windows
+      env = {'HOME' => "C:\\ruby\\home"}
+      args = [env]
+      assert_separately(args, "#{<<~"begin;"}\n#{<<~'end;'}")
+      begin;
+        assert_equal("C:/ruby/home", Dir.home)
+      end;
+
+      env['USERPROFILE'] = "C:\\ruby\\userprofile"
+      assert_separately(args, "#{<<~"begin;"}\n#{<<~'end;'}")
+      begin;
+        assert_equal("C:/ruby/home", Dir.home)
+      end;
+
+      env['HOME'] = nil
+      assert_separately(args, "#{<<~"begin;"}\n#{<<~'end;'}")
+      begin;
+        assert_equal("C:/ruby/userprofile", Dir.home)
+      end;
+
+      env['HOMEDRIVE'] = "C:"
+      env['HOMEPATH'] = "\\ruby\\homepath"
+      assert_separately(args, "#{<<~"begin;"}\n#{<<~'end;'}")
+      begin;
+        assert_equal("C:/ruby/userprofile", Dir.home)
+      end;
+
+      env['USERPROFILE'] = nil
+      assert_separately(args, "#{<<~"begin;"}\n#{<<~'end;'}")
+      begin;
+        assert_equal("C:/ruby/homepath", Dir.home)
+      end;
+    end
+
+    def test_children_long_name
+      Dir.mktmpdir do |dirname|
+        longest_possible_component = "b" * 255
+        long_path = File.join(dirname, longest_possible_component)
+        Dir.mkdir(long_path)
+        File.write("#{long_path}/c", "")
+        assert_equal(%w[c], Dir.children(long_path))
+      ensure
+        File.unlink("#{long_path}/c")
+        Dir.rmdir(long_path)
+      end
+    rescue Errno::ENOENT
+      omit "File system does not support long file name"
+    end
   end
 
   def test_home
@@ -647,7 +725,9 @@ def test_for_fd
         assert_equal(new_dir.chdir{Dir.pwd}, for_fd_dir.chdir{Dir.pwd})
       ensure
         new_dir&.close
-        for_fd_dir&.close
+        if for_fd_dir
+          assert_raise(Errno::EBADF) { for_fd_dir.close }
+        end
       end
     else
       assert_raise(NotImplementedError) { Dir.for_fd(0) }
diff --git a/test/ruby/test_dir_m17n.rb b/test/ruby/test_dir_m17n.rb
index 67bad8a514ea3e..cdf8b44ef2705c 100644
--- a/test/ruby/test_dir_m17n.rb
+++ b/test/ruby/test_dir_m17n.rb
@@ -56,7 +56,7 @@ def test_filename_extutf8_invalid
     return if Bug::File::Fs.fsname(Dir.tmpdir) == "apfs"
     with_tmpdir {|d|
       assert_separately(%w[-EASCII-8BIT], <<-'EOS', :chdir=>d)
-        filename = "\xff".force_encoding("ASCII-8BIT") # invalid byte sequence as UTF-8
+        filename = "\xff".dup.force_encoding("ASCII-8BIT") # invalid byte sequence as UTF-8
         File.open(filename, "w") {}
         opts = {:encoding => Encoding.default_external} if /mswin|mingw/ =~ RUBY_PLATFORM
         ents = Dir.entries(".", **(opts||{}))
@@ -64,7 +64,7 @@ def test_filename_extutf8_invalid
         assert_include(ents, filename)
       EOS
       assert_separately(%w[-EUTF-8], <<-'EOS', :chdir=>d)
-        filename = "\xff".force_encoding("UTF-8") # invalid byte sequence as UTF-8
+        filename = "\xff".dup.force_encoding("UTF-8") # invalid byte sequence as UTF-8
         File.open(filename, "w") {}
         opts = {:encoding => Encoding.default_external} if /mswin|mingw/ =~ RUBY_PLATFORM
         ents = Dir.entries(".", **(opts||{}))
@@ -77,7 +77,7 @@ def test_filename_extutf8_invalid
   def test_filename_as_bytes_extutf8
     with_tmpdir {|d|
       assert_separately(%w[-EUTF-8], <<-'EOS', :chdir=>d)
-        filename = "\xc2\xa1".force_encoding("utf-8")
+        filename = "\xc2\xa1".dup.force_encoding("utf-8")
         File.open(filename, "w") {}
         opts = {:encoding => Encoding.default_external} if /mswin|mingw/ =~ RUBY_PLATFORM
         ents = Dir.entries(".", **(opts||{}))
@@ -85,9 +85,9 @@ def test_filename_as_bytes_extutf8
       EOS
       assert_separately(%w[-EUTF-8], <<-'EOS', :chdir=>d)
         if /mswin|mingw|darwin/ =~ RUBY_PLATFORM
-          filename = "\x8f\xa2\xc2".force_encoding("euc-jp")
+          filename = "\x8f\xa2\xc2".dup.force_encoding("euc-jp")
         else
-          filename = "\xc2\xa1".force_encoding("euc-jp")
+          filename = "\xc2\xa1".dup.force_encoding("euc-jp")
         end
         assert_nothing_raised(Errno::ENOENT) do
           open(filename) {}
@@ -96,8 +96,8 @@ def test_filename_as_bytes_extutf8
       # no meaning test on windows
       unless /mswin|mingw|darwin/ =~ RUBY_PLATFORM
         assert_separately(%W[-EUTF-8], <<-'EOS', :chdir=>d)
-          filename1 = "\xc2\xa1".force_encoding("utf-8")
-          filename2 = "\xc2\xa1".force_encoding("euc-jp")
+          filename1 = "\xc2\xa1".dup.force_encoding("utf-8")
+          filename2 = "\xc2\xa1".dup.force_encoding("euc-jp")
           filename3 = filename1.encode("euc-jp")
           filename4 = filename2.encode("utf-8")
           assert_file.stat(filename1)
@@ -121,13 +121,13 @@ def test_filename_extutf8_inteucjp_representable
         assert_include(ents, filename)
       EOS
       assert_separately(%w[-EUTF-8:EUC-JP], <<-'EOS', :chdir=>d)
-        filename = "\xA4\xA2".force_encoding("euc-jp")
+        filename = "\xA4\xA2".dup.force_encoding("euc-jp")
         opts = {:encoding => Encoding.default_external} if /mswin|mingw/ =~ RUBY_PLATFORM
         ents = Dir.entries(".", **(opts||{}))
         assert_include(ents, filename)
       EOS
       assert_separately(%w[-EUTF-8:EUC-JP], <<-'EOS', :chdir=>d)
-        filename = "\xA4\xA2".force_encoding("euc-jp")
+        filename = "\xA4\xA2".dup.force_encoding("euc-jp")
         assert_nothing_raised(Errno::ENOENT) do
           open(filename) {}
         end
@@ -149,7 +149,7 @@ def test_filename_extutf8_inteucjp_unrepresentable
       EOS
       assert_separately(%w[-EUTF-8:EUC-JP], <<-'EOS', :chdir=>d)
         filename1 = "\u2661" # WHITE HEART SUIT which is not representable in EUC-JP
-        filename2 = "\xA4\xA2".force_encoding("euc-jp") # HIRAGANA LETTER A in EUC-JP
+        filename2 = "\xA4\xA2".dup.force_encoding("euc-jp") # HIRAGANA LETTER A in EUC-JP
         opts = {:encoding => Encoding.default_external} if /mswin|mingw/ =~ RUBY_PLATFORM
         ents = Dir.entries(".", **(opts||{}))
         assert_include(ents, filename1)
@@ -158,7 +158,7 @@ def test_filename_extutf8_inteucjp_unrepresentable
       assert_separately(%w[-EUTF-8:EUC-JP], <<-'EOS', :chdir=>d)
         filename1 = "\u2661" # WHITE HEART SUIT which is not representable in EUC-JP
         filename2 = "\u3042" # HIRAGANA LETTER A which is representable in EUC-JP
-        filename3 = "\xA4\xA2".force_encoding("euc-jp") # HIRAGANA LETTER A in EUC-JP
+        filename3 = "\xA4\xA2".dup.force_encoding("euc-jp") # HIRAGANA LETTER A in EUC-JP
         assert_file.stat(filename1)
         assert_file.stat(filename2)
         assert_file.stat(filename3)
@@ -172,7 +172,7 @@ def test_filename_bytes_euc_jp
     return if /cygwin/ =~ RUBY_PLATFORM
     with_tmpdir {|d|
       assert_separately(%w[-EEUC-JP], <<-'EOS', :chdir=>d)
-        filename = "\xA4\xA2".force_encoding("euc-jp")
+        filename = "\xA4\xA2".dup.force_encoding("euc-jp")
         File.open(filename, "w") {}
         opts = {:encoding => Encoding.default_external} if /mswin|mingw/ =~ RUBY_PLATFORM
         ents = Dir.entries(".", **(opts||{}))
@@ -189,7 +189,7 @@ def test_filename_euc_jp
     return if /cygwin/ =~ RUBY_PLATFORM
     with_tmpdir {|d|
       assert_separately(%w[-EEUC-JP], <<-'EOS', :chdir=>d)
-        filename = "\xA4\xA2".force_encoding("euc-jp")
+        filename = "\xA4\xA2".dup.force_encoding("euc-jp")
         File.open(filename, "w") {}
         ents = Dir.entries(".")
         if /darwin/ =~ RUBY_PLATFORM
@@ -200,7 +200,7 @@ def test_filename_euc_jp
         assert_include(ents, filename)
       EOS
       assert_separately(%w[-EASCII-8BIT], <<-'EOS', :chdir=>d)
-        filename = "\xA4\xA2".force_encoding('ASCII-8BIT')
+        filename = "\xA4\xA2".dup.force_encoding('ASCII-8BIT')
         ents = Dir.entries(".")
         unless ents.include?(filename)
           case RUBY_PLATFORM
@@ -231,7 +231,7 @@ def test_filename_ext_euc_jp_and_int_utf_8
     return if /cygwin/ =~ RUBY_PLATFORM
     with_tmpdir {|d|
       assert_separately(%w[-EEUC-JP], <<-'EOS', :chdir=>d)
-        filename = "\xA4\xA2".force_encoding("euc-jp")
+        filename = "\xA4\xA2".dup.force_encoding("euc-jp")
         File.open(filename, "w") {}
         opts = {:encoding => Encoding.default_external} if /mswin|mingw/ =~ RUBY_PLATFORM
         ents = Dir.entries(".", **(opts||{}))
@@ -241,7 +241,7 @@ def test_filename_ext_euc_jp_and_int_utf_8
         assert_include(ents, filename)
       EOS
       assert_separately(%w[-EEUC-JP:UTF-8], <<-'EOS', :chdir=>d)
-        filename = "\u3042"
+        filename = "\u3042".dup
         opts = {:encoding => Encoding.default_external} if /mswin|mingw/ =~ RUBY_PLATFORM
         ents = Dir.entries(".", **(opts||{}))
         if /darwin/ =~ RUBY_PLATFORM
@@ -318,7 +318,7 @@ def with_enc_path
 
   def test_glob_warning_opendir
     with_enc_path do |dir|
-      open("#{dir}/x", "w") {}
+      File.binwrite("#{dir}/x", "")
       File.chmod(0300, dir)
       next if File.readable?(dir)
       assert_warning(/#{dir}/) do
@@ -329,7 +329,7 @@ def test_glob_warning_opendir
 
   def test_glob_warning_match_all
     with_enc_path do |dir|
-      open("#{dir}/x", "w") {}
+      File.binwrite("#{dir}/x", "")
       File.chmod(0000, dir)
       next if File.readable?(dir)
       assert_warning(/#{dir}/) do
@@ -350,7 +350,7 @@ def test_glob_warning_match_dir
   end
 
   def test_glob_escape_multibyte
-    name = "\x81\\".force_encoding(Encoding::Shift_JIS)
+    name = "\x81\\".dup.force_encoding(Encoding::Shift_JIS)
     with_tmpdir do
       open(name, "w") {} rescue next
       match, = Dir.glob("#{name}*")
@@ -362,9 +362,9 @@ def test_glob_escape_multibyte
   def test_glob_encoding
     with_tmpdir do
       list = %W"file_one.ext file_two.ext \u{6587 4ef6}1.txt \u{6587 4ef6}2.txt"
-      list.each {|f| open(f, "w") {}}
-      a = "file_one*".force_encoding Encoding::IBM437
-      b = "file_two*".force_encoding Encoding::EUC_JP
+      list.each {|f| File.binwrite(f, "")}
+      a = "file_one*".dup.force_encoding Encoding::IBM437
+      b = "file_two*".dup.force_encoding Encoding::EUC_JP
       assert_equal([a, b].map(&:encoding), Dir[a, b].map(&:encoding))
       if Bug::File::Fs.fsname(Dir.pwd) == "apfs"
         # High Sierra's APFS cannot use filenames with undefined character
@@ -375,7 +375,7 @@ def test_glob_encoding
       Dir.mkdir(dir)
       list << dir
       bug12081 = '[ruby-core:73868] [Bug #12081]'
-      a = "*".force_encoding("us-ascii")
+      a = "*".dup.force_encoding("us-ascii")
       result = Dir[a].map {|n|
         if n.encoding == Encoding::ASCII_8BIT ||
             n.encoding == Encoding::ISO_8859_1 ||
diff --git a/test/ruby/test_encoding.rb b/test/ruby/test_encoding.rb
index f2c609a4cdda72..7ccbb31f503ea0 100644
--- a/test/ruby/test_encoding.rb
+++ b/test/ruby/test_encoding.rb
@@ -33,7 +33,7 @@ def test_singleton
     encodings.each do |e|
       assert_raise(TypeError) { e.dup }
       assert_raise(TypeError) { e.clone }
-      assert_equal(e.object_id, Marshal.load(Marshal.dump(e)).object_id)
+      assert_same(e, Marshal.load(Marshal.dump(e)))
     end
   end
 
@@ -126,4 +126,35 @@ def test_nonascii_library_path
       end
     end;
   end
+
+  def test_ractor_load_encoding
+    assert_ractor("#{<<~"begin;"}\n#{<<~'end;'}")
+    begin;
+      Ractor.new{}.join
+      $-w = nil
+      Encoding.default_external = Encoding::ISO8859_2
+      assert "[Bug #19562]"
+    end;
+  end
+
+  def test_ractor_lazy_load_encoding_concurrently
+    assert_ractor("#{<<~"begin;"}\n#{<<~'end;'}")
+    begin;
+      rs = []
+      autoload_encodings = Encoding.list.select { |e| e.inspect.include?("(autoload)") }.freeze
+      7.times do
+        rs << Ractor.new(autoload_encodings) do |encodings|
+          str = "abc".dup
+          encodings.each do |enc|
+            str.force_encoding(enc)
+          end
+        end
+      end
+      while rs.any?
+        r, _obj = Ractor.select(*rs)
+        rs.delete(r)
+      end
+      assert rs.empty?
+    end;
+  end
 end
diff --git a/test/ruby/test_enum.rb b/test/ruby/test_enum.rb
index f7c8f012d8c75b..237bdc8a4d0155 100644
--- a/test/ruby/test_enum.rb
+++ b/test/ruby/test_enum.rb
@@ -843,6 +843,8 @@ def test_cycle
   end
 
   def test_callcc
+    omit 'requires callcc support' unless respond_to?(:callcc)
+
     assert_raise(RuntimeError) do
       c = nil
       @obj.sort_by {|x| callcc {|c2| c ||= c2 }; x }
@@ -1346,4 +1348,12 @@ def each
     klass.new.grep(/(b.)/) { svars << $1 }
     assert_equal(["ba", "ba"], svars)
   end
+
+  def test_all_fast
+    data = { "key" => { "key2" => 1 } }
+    kk = vv = nil
+    data.all? { |(k, v)| kk, vv = k, v }
+    assert_equal(kk, "key")
+    assert_equal(vv, { "key2" => 1 })
+  end
 end
diff --git a/test/ruby/test_enumerator.rb b/test/ruby/test_enumerator.rb
index bbaa91b7031d37..cd62cd8acb7746 100644
--- a/test/ruby/test_enumerator.rb
+++ b/test/ruby/test_enumerator.rb
@@ -127,6 +127,17 @@ def test_with_index
     assert_equal([[1,5],[2,6],[3,7]], @obj.to_enum(:foo, 1, 2, 3).with_index(5).to_a)
   end
 
+  def test_with_index_under_gc_compact_stress
+    omit "compaction doesn't work well on s390x" if RUBY_PLATFORM =~ /s390x/ # https://github.com/ruby/ruby/pull/5077
+    EnvUtil.under_gc_compact_stress do
+      assert_equal([[1, 0], [2, 1], [3, 2]], @obj.to_enum(:foo, 1, 2, 3).with_index.to_a)
+      assert_equal([[1, 5], [2, 6], [3, 7]], @obj.to_enum(:foo, 1, 2, 3).with_index(5).to_a)
+
+      s = 1 << (8 * 1.size - 2)
+      assert_equal([[1, s], [2, s + 1], [3, s + 2]], @obj.to_enum(:foo, 1, 2, 3).with_index(s).to_a)
+    end
+  end
+
   def test_with_index_large_offset
     bug8010 = '[ruby-dev:47131] [Bug #8010]'
     s = 1 << (8*1.size-2)
@@ -852,6 +863,21 @@ def test_lazy_chain
     assert_equal(33, chain.next)
   end
 
+  def test_lazy_chain_under_gc_compact_stress
+    omit "compaction doesn't work well on s390x" if RUBY_PLATFORM =~ /s390x/ # https://github.com/ruby/ruby/pull/5077
+    EnvUtil.under_gc_compact_stress do
+      ea = (10..).lazy.select(&:even?).take(10)
+      ed = (20..).lazy.select(&:odd?)
+      chain = (ea + ed).select{|x| x % 3 == 0}
+      assert_equal(12, chain.next)
+      assert_equal(18, chain.next)
+      assert_equal(24, chain.next)
+      assert_equal(21, chain.next)
+      assert_equal(27, chain.next)
+      assert_equal(33, chain.next)
+    end
+  end
+
   def test_chain_undef_methods
     chain = [1].to_enum + [2].to_enum
     meths = (chain.methods & [:feed, :next, :next_values, :peek, :peek_values])
@@ -927,11 +953,7 @@ def each(&block)
     assert_equal(true, e.is_lambda)
   end
 
-  def test_product
-    ##
-    ## Enumerator::Product
-    ##
-
+  def test_product_new
     # 0-dimensional
     e = Enumerator::Product.new
     assert_instance_of(Enumerator::Product, e)
@@ -968,15 +990,16 @@ def test_product
     e.each { |x,| heads << x }
     assert_equal [1, 1, 2, 2, 3, 3], heads
 
+    # Any enumerable is 0 size
+    assert_equal(0, Enumerator::Product.new([], 1..).size)
+
     # Reject keyword arguments
     assert_raise(ArgumentError) {
       Enumerator::Product.new(1..3, foo: 1, bar: 2)
     }
+  end
 
-    ##
-    ## Enumerator.product
-    ##
-
+  def test_s_product
     # without a block
     e = Enumerator.product(1..3, %w[a b])
     assert_instance_of(Enumerator::Product, e)
@@ -1003,9 +1026,36 @@ def test_product
     assert_equal(nil, e.size)
     assert_equal [[1, "a"], [1, "b"], [2, "a"], [2, "b"]], e.take(4)
 
+    assert_equal(0, Enumerator.product([], 1..).size)
+
     # Reject keyword arguments
     assert_raise(ArgumentError) {
       Enumerator.product(1..3, foo: 1, bar: 2)
     }
   end
+
+  def test_freeze
+    e = 3.times.freeze
+    assert_raise(FrozenError) { e.next }
+    assert_raise(FrozenError) { e.next_values }
+    assert_raise(FrozenError) { e.peek }
+    assert_raise(FrozenError) { e.peek_values }
+    assert_raise(FrozenError) { e.feed 1 }
+    assert_raise(FrozenError) { e.rewind }
+  end
+
+  def test_sum_of_numeric
+    num = Class.new(Numeric) do
+      attr_reader :to_f
+      def initialize(val)
+        @to_f = Float(val)
+      end
+    end
+
+    ary = [5, 10, 20].map {|i| num.new(i)}
+
+    assert_equal(35.0, ary.sum)
+    enum = ary.each
+    assert_equal(35.0, enum.sum)
+  end
 end
diff --git a/test/ruby/test_env.rb b/test/ruby/test_env.rb
index cdadeac14886e8..2727620c198522 100644
--- a/test/ruby/test_env.rb
+++ b/test/ruby/test_env.rb
@@ -2,7 +2,9 @@
 require 'test/unit'
 
 class TestEnv < Test::Unit::TestCase
-  IGNORE_CASE = /bccwin|mswin|mingw/ =~ RUBY_PLATFORM
+  windows = /bccwin|mswin|mingw/ =~ RUBY_PLATFORM
+  IGNORE_CASE = windows
+  ENCODING = windows ? Encoding::UTF_8 : Encoding.find("locale")
   PATH_ENV = "PATH"
   INVALID_ENVVARS = [
     "foo\0bar",
@@ -345,12 +347,23 @@ def test_inspect
     ENV["foo"] = "bar"
     ENV["baz"] = "qux"
     s = ENV.inspect
+    expected = [%("foo" => "bar"), %("baz" => "qux")]
+    unless s.start_with?(/\{"foo"/i)
+      expected.reverse!
+    end
+    expected = '{' + expected.join(', ') + '}'
     if IGNORE_CASE
       s = s.upcase
-      assert(s == '{"FOO"=>"BAR", "BAZ"=>"QUX"}' || s == '{"BAZ"=>"QUX", "FOO"=>"BAR"}')
-    else
-      assert(s == '{"foo"=>"bar", "baz"=>"qux"}' || s == '{"baz"=>"qux", "foo"=>"bar"}')
+      expected = expected.upcase
     end
+    assert_equal(expected, s)
+  end
+
+  def test_inspect_encoding
+    ENV.clear
+    key = "VAR\u{e5 e1 e2 e4 e3 101 3042}"
+    ENV[key] = "foo"
+    assert_equal(%{{#{(key.encode(ENCODING) rescue key.b).inspect} => "foo"}}, ENV.inspect)
   end
 
   def test_to_a
@@ -359,12 +372,7 @@ def test_to_a
     ENV["baz"] = "qux"
     a = ENV.to_a
     assert_equal(2, a.size)
-    if IGNORE_CASE
-      a = a.map {|x| x.map {|y| y.upcase } }
-      assert(a == [%w(FOO BAR), %w(BAZ QUX)] || a == [%w(BAZ QUX), %w(FOO BAR)])
-    else
-      assert(a == [%w(foo bar), %w(baz qux)] || a == [%w(baz qux), %w(foo bar)])
-    end
+    check([%w(baz qux), %w(foo bar)], a)
   end
 
   def test_rehash
@@ -403,8 +411,7 @@ def test_assoc
       assert_equal("foo", v)
     end
     assert_invalid_env {|var| ENV.assoc(var)}
-    encoding = /mswin|mingw/ =~ RUBY_PLATFORM ? Encoding::UTF_8 : Encoding.find("locale")
-    assert_equal(encoding, v.encoding)
+    assert_equal(ENCODING, v.encoding)
   end
 
   def test_has_value2
@@ -450,13 +457,14 @@ def test_reject
     assert_equal(h1, h2)
   end
 
-  def check(as, bs)
+  def assert_equal_env(as, bs)
     if IGNORE_CASE
       as = as.map {|k, v| [k.upcase, v] }
       bs = bs.map {|k, v| [k.upcase, v] }
     end
     assert_equal(as.sort, bs.sort)
   end
+  alias check assert_equal_env
 
   def test_shift
     ENV.clear
@@ -517,7 +525,7 @@ def test_huge_value
     assert_equal(huge_value, ENV["foo"])
   end
 
-  if /mswin|mingw/ =~ RUBY_PLATFORM
+  if windows
     def windows_version
       @windows_version ||= %x[ver][/Version (\d+)/, 1].to_i
     end
@@ -593,13 +601,13 @@ def str_for_yielding_exception_class(code_str, exception_var: "raised_exception"
       rescue Exception => e
         #{exception_var} = e
       end
-      Ractor.yield #{exception_var}.class
+      port.send #{exception_var}.class
     end;
   end
 
   def str_for_assert_raise_on_yielded_exception_class(expected_error_class, ractor_var)
     <<-"end;"
-      error_class = #{ractor_var}.take
+      error_class = #{ractor_var}.receive
       assert_raise(#{expected_error_class}) do
         if error_class < Exception
           raise error_class
@@ -612,8 +620,8 @@ def str_to_yield_invalid_envvar_errors(var_name, code_str)
     <<-"end;"
       envvars_to_check = [
         "foo\0bar",
-        "#{'\xa1\xa1'}".force_encoding(Encoding::UTF_16LE),
-        "foo".force_encoding(Encoding::ISO_2022_JP),
+        "#{'\xa1\xa1'}".dup.force_encoding(Encoding::UTF_16LE),
+        "foo".dup.force_encoding(Encoding::ISO_2022_JP),
       ]
       envvars_to_check.each do |#{var_name}|
         #{str_for_yielding_exception_class(code_str)}
@@ -641,100 +649,101 @@ def check(as, bs)
 
   def test_bracket_in_ractor
     assert_ractor(<<-"end;")
-      r = Ractor.new do
-        Ractor.yield ENV['test']
-        Ractor.yield ENV['TEST']
+      Ractor.new port = Ractor::Port.new do |port|
+        port << ENV['test']
+        port << ENV['TEST']
         ENV['test'] = 'foo'
-        Ractor.yield ENV['test']
-        Ractor.yield ENV['TEST']
+        port << ENV['test']
+        port << ENV['TEST']
         ENV['TEST'] = 'bar'
-        Ractor.yield ENV['TEST']
-        Ractor.yield ENV['test']
+        port << ENV['TEST']
+        port << ENV['test']
         #{str_for_yielding_exception_class("ENV[1]")}
         #{str_for_yielding_exception_class("ENV[1] = 'foo'")}
         #{str_for_yielding_exception_class("ENV['test'] = 0")}
       end
-      assert_nil(r.take)
-      assert_nil(r.take)
-      assert_equal('foo', r.take)
+      assert_nil(port.receive)
+      assert_nil(port.receive)
+      assert_equal('foo', port.receive)
       if #{ignore_case_str}
-        assert_equal('foo', r.take)
+        assert_equal('foo', port.receive)
       else
-        assert_nil(r.take)
+        assert_nil(port.receive)
       end
-      assert_equal('bar', r.take)
+      assert_equal('bar', port.receive)
       if #{ignore_case_str}
-        assert_equal('bar', r.take)
+        assert_equal('bar', port.receive)
       else
-        assert_equal('foo', r.take)
+        assert_equal('foo', port.receive)
       end
       3.times do
-        #{str_for_assert_raise_on_yielded_exception_class(TypeError, "r")}
+        #{str_for_assert_raise_on_yielded_exception_class(TypeError, "port")}
       end
     end;
   end
 
   def test_dup_in_ractor
     assert_ractor(<<-"end;")
-      r = Ractor.new do
+      Ractor.new port = Ractor::Port.new do |port|
         #{str_for_yielding_exception_class("ENV.dup")}
       end
-      #{str_for_assert_raise_on_yielded_exception_class(TypeError, "r")}
+      #{str_for_assert_raise_on_yielded_exception_class(TypeError, "port")}
     end;
   end
 
   def test_has_value_in_ractor
     assert_ractor(<<-"end;")
-      r = Ractor.new do
+      port = Ractor::Port.new
+      Ractor.new port do |port|
         val = 'a'
         val.succ! while ENV.has_value?(val) || ENV.has_value?(val.upcase)
         ENV['test'] = val[0...-1]
-        Ractor.yield(ENV.has_value?(val))
-        Ractor.yield(ENV.has_value?(val.upcase))
+        port.send(ENV.has_value?(val))
+        port.send(ENV.has_value?(val.upcase))
         ENV['test'] = val
-        Ractor.yield(ENV.has_value?(val))
-        Ractor.yield(ENV.has_value?(val.upcase))
+        port.send(ENV.has_value?(val))
+        port.send(ENV.has_value?(val.upcase))
         ENV['test'] = val.upcase
-        Ractor.yield ENV.has_value?(val)
-        Ractor.yield ENV.has_value?(val.upcase)
-      end
-      assert_equal(false, r.take)
-      assert_equal(false, r.take)
-      assert_equal(true, r.take)
-      assert_equal(false, r.take)
-      assert_equal(false, r.take)
-      assert_equal(true, r.take)
+        port.send ENV.has_value?(val)
+        port.send ENV.has_value?(val.upcase)
+      end
+      assert_equal(false, port.receive)
+      assert_equal(false, port.receive)
+      assert_equal(true, port.receive)
+      assert_equal(false, port.receive)
+      assert_equal(false, port.receive)
+      assert_equal(true, port.receive)
     end;
   end
 
   def test_key_in_ractor
     assert_ractor(<<-"end;")
-      r = Ractor.new do
+      Ractor.new port = Ractor::Port.new do |port|
         val = 'a'
         val.succ! while ENV.has_value?(val) || ENV.has_value?(val.upcase)
         ENV['test'] = val[0...-1]
-        Ractor.yield ENV.key(val)
-        Ractor.yield ENV.key(val.upcase)
+        port.send ENV.key(val)
+        port.send ENV.key(val.upcase)
         ENV['test'] = val
-        Ractor.yield ENV.key(val)
-        Ractor.yield ENV.key(val.upcase)
+        port.send ENV.key(val)
+        port.send ENV.key(val.upcase)
         ENV['test'] = val.upcase
-        Ractor.yield ENV.key(val)
-        Ractor.yield ENV.key(val.upcase)
+        port.send ENV.key(val)
+        port.send ENV.key(val.upcase)
       end
-      assert_nil(r.take)
-      assert_nil(r.take)
+      assert_nil(port.receive)
+      assert_nil(port.receive)
       if #{ignore_case_str}
-        assert_equal('TEST', r.take.upcase)
+        assert_equal('TEST', port.receive.upcase)
       else
-        assert_equal('test', r.take)
+        assert_equal('test', port.receive)
       end
-      assert_nil(r.take)
-      assert_nil(r.take)
+      assert_nil(port.receive)
+      assert_nil(port.receive)
       if #{ignore_case_str}
-        assert_equal('TEST', r.take.upcase)
+        assert_equal('TEST', port.receive.upcase)
       else
-        assert_equal('test', r.take)
+        assert_equal('test', port.receive)
       end
     end;
 
@@ -742,87 +751,87 @@ def test_key_in_ractor
 
   def test_delete_in_ractor
     assert_ractor(<<-"end;")
-      r = Ractor.new do
+      Ractor.new port = Ractor::Port.new do |port|
         #{str_to_yield_invalid_envvar_errors("v", "ENV.delete(v)")}
-        Ractor.yield ENV.delete("TEST")
+        port.send ENV.delete("TEST")
         #{str_for_yielding_exception_class("ENV.delete('#{PATH_ENV}')")}
-        Ractor.yield(ENV.delete("TEST"){|name| "NO "+name})
+        port.send(ENV.delete("TEST"){|name| "NO "+name})
       end
-      #{str_to_receive_invalid_envvar_errors("r")}
-      assert_nil(r.take)
-      exception_class = r.take
+      #{str_to_receive_invalid_envvar_errors("port")}
+      assert_nil(port.receive)
+      exception_class = port.receive
       assert_equal(NilClass, exception_class)
-      assert_equal("NO TEST", r.take)
+      assert_equal("NO TEST", port.receive)
     end;
   end
 
   def test_getenv_in_ractor
     assert_ractor(<<-"end;")
-      r = Ractor.new do
+      Ractor.new port = Ractor::Port.new do |port|
         #{str_to_yield_invalid_envvar_errors("v", "ENV[v]")}
         ENV["#{PATH_ENV}"] = ""
-        Ractor.yield ENV["#{PATH_ENV}"]
-        Ractor.yield ENV[""]
+        port.send ENV["#{PATH_ENV}"]
+        port.send ENV[""]
       end
-      #{str_to_receive_invalid_envvar_errors("r")}
-      assert_equal("", r.take)
-      assert_nil(r.take)
+      #{str_to_receive_invalid_envvar_errors("port")}
+      assert_equal("", port.receive)
+      assert_nil(port.receive)
     end;
   end
 
   def test_fetch_in_ractor
     assert_ractor(<<-"end;")
-      r = Ractor.new do
+      Ractor.new port = Ractor::Port.new do |port|
         ENV["test"] = "foo"
-        Ractor.yield ENV.fetch("test")
+        port.send ENV.fetch("test")
         ENV.delete("test")
         #{str_for_yielding_exception_class("ENV.fetch('test')", exception_var: "ex")}
-        Ractor.yield ex.receiver.object_id
-        Ractor.yield ex.key
-        Ractor.yield ENV.fetch("test", "foo")
-        Ractor.yield(ENV.fetch("test"){"bar"})
+        port.send ex.receiver.object_id
+        port.send ex.key
+        port.send ENV.fetch("test", "foo")
+        port.send(ENV.fetch("test"){"bar"})
         #{str_to_yield_invalid_envvar_errors("v", "ENV.fetch(v)")}
         #{str_for_yielding_exception_class("ENV.fetch('#{PATH_ENV}', 'foo')")}
         ENV['#{PATH_ENV}'] = ""
-        Ractor.yield ENV.fetch('#{PATH_ENV}')
-      end
-      assert_equal("foo", r.take)
-      #{str_for_assert_raise_on_yielded_exception_class(KeyError, "r")}
-      assert_equal(ENV.object_id, r.take)
-      assert_equal("test", r.take)
-      assert_equal("foo", r.take)
-      assert_equal("bar", r.take)
-      #{str_to_receive_invalid_envvar_errors("r")}
-      exception_class = r.take
+        port.send ENV.fetch('#{PATH_ENV}')
+      end
+      assert_equal("foo", port.receive)
+      #{str_for_assert_raise_on_yielded_exception_class(KeyError, "port")}
+      assert_equal(ENV.object_id, port.receive)
+      assert_equal("test", port.receive)
+      assert_equal("foo", port.receive)
+      assert_equal("bar", port.receive)
+      #{str_to_receive_invalid_envvar_errors("port")}
+      exception_class = port.receive
       assert_equal(NilClass, exception_class)
-      assert_equal("", r.take)
+      assert_equal("", port.receive)
     end;
   end
 
   def test_aset_in_ractor
     assert_ractor(<<-"end;")
-      r = Ractor.new do
+      Ractor.new port = Ractor::Port.new do |port|
         #{str_for_yielding_exception_class("ENV['test'] = nil")}
         ENV["test"] = nil
-        Ractor.yield ENV["test"]
+        port.send ENV["test"]
         #{str_to_yield_invalid_envvar_errors("v", "ENV[v] = 'test'")}
         #{str_to_yield_invalid_envvar_errors("v", "ENV['test'] = v")}
       end
-      exception_class = r.take
+      exception_class = port.receive
       assert_equal(NilClass, exception_class)
-      assert_nil(r.take)
-      #{str_to_receive_invalid_envvar_errors("r")}
-      #{str_to_receive_invalid_envvar_errors("r")}
+      assert_nil(port.receive)
+      #{str_to_receive_invalid_envvar_errors("port")}
+      #{str_to_receive_invalid_envvar_errors("port")}
     end;
   end
 
   def test_keys_in_ractor
     assert_ractor(<<-"end;")
-      r = Ractor.new do
+      Ractor.new port = Ractor::Port.new do |port|
         a = ENV.keys
-        Ractor.yield a
+        port.send a
       end
-      a = r.take
+      a = port.receive
       assert_kind_of(Array, a)
       a.each {|k| assert_kind_of(String, k) }
     end;
@@ -831,11 +840,11 @@ def test_keys_in_ractor
 
   def test_each_key_in_ractor
     assert_ractor(<<-"end;")
-      r = Ractor.new do
-        ENV.each_key {|k| Ractor.yield(k)}
-        Ractor.yield "finished"
+      Ractor.new port = Ractor::Port.new do |port|
+        ENV.each_key {|k| port.send(k)}
+        port.send "finished"
       end
-      while((x=r.take) != "finished")
+      while((x=port.receive) != "finished")
         assert_kind_of(String, x)
       end
     end;
@@ -843,11 +852,11 @@ def test_each_key_in_ractor
 
   def test_values_in_ractor
     assert_ractor(<<-"end;")
-      r = Ractor.new do
+      Ractor.new port = Ractor::Port.new do |port|
         a = ENV.values
-        Ractor.yield a
+        port.send a
       end
-      a = r.take
+      a = port.receive
       assert_kind_of(Array, a)
       a.each {|k| assert_kind_of(String, k) }
     end;
@@ -855,11 +864,11 @@ def test_values_in_ractor
 
   def test_each_value_in_ractor
     assert_ractor(<<-"end;")
-      r = Ractor.new do
-        ENV.each_value {|k| Ractor.yield(k)}
-        Ractor.yield "finished"
+      Ractor.new port = Ractor::Port.new do |port|
+        ENV.each_value {|k| port.send(k)}
+        port.send "finished"
       end
-      while((x=r.take) != "finished")
+      while((x=port.receive) != "finished")
         assert_kind_of(String, x)
       end
     end;
@@ -867,11 +876,11 @@ def test_each_value_in_ractor
 
   def test_each_pair_in_ractor
     assert_ractor(<<-"end;")
-      r = Ractor.new do
-        ENV.each_pair {|k, v| Ractor.yield([k,v])}
-        Ractor.yield "finished"
+      Ractor.new port = Ractor::Port.new do |port|
+        ENV.each_pair {|k, v| port.send([k,v])}
+        port.send "finished"
       end
-      while((k,v=r.take) != "finished")
+      while((k,v=port.receive) != "finished")
         assert_kind_of(String, k)
         assert_kind_of(String, v)
       end
@@ -880,116 +889,116 @@ def test_each_pair_in_ractor
 
   def test_reject_bang_in_ractor
     assert_ractor(<<-"end;")
-      r = Ractor.new do
+      Ractor.new port = Ractor::Port.new do |port|
         h1 = {}
         ENV.each_pair {|k, v| h1[k] = v }
         ENV["test"] = "foo"
         ENV.reject! {|k, v| #{ignore_case_str} ? k.upcase == "TEST" : k == "test" }
         h2 = {}
         ENV.each_pair {|k, v| h2[k] = v }
-        Ractor.yield [h1, h2]
-        Ractor.yield(ENV.reject! {|k, v| #{ignore_case_str} ? k.upcase == "TEST" : k == "test" })
+        port.send [h1, h2]
+        port.send(ENV.reject! {|k, v| #{ignore_case_str} ? k.upcase == "TEST" : k == "test" })
       end
-      h1, h2 = r.take
+      h1, h2 = port.receive
       assert_equal(h1, h2)
-      assert_nil(r.take)
+      assert_nil(port.receive)
     end;
   end
 
   def test_delete_if_in_ractor
     assert_ractor(<<-"end;")
-      r = Ractor.new do
+      Ractor.new port = Ractor::Port.new do |port|
         h1 = {}
         ENV.each_pair {|k, v| h1[k] = v }
         ENV["test"] = "foo"
         ENV.delete_if {|k, v| #{ignore_case_str} ? k.upcase == "TEST" : k == "test" }
         h2 = {}
         ENV.each_pair {|k, v| h2[k] = v }
-        Ractor.yield [h1, h2]
-        Ractor.yield (ENV.delete_if {|k, v| #{ignore_case_str} ? k.upcase == "TEST" : k == "test" }).object_id
+        port.send [h1, h2]
+        port.send (ENV.delete_if {|k, v| #{ignore_case_str} ? k.upcase == "TEST" : k == "test" })
       end
-      h1, h2 = r.take
+      h1, h2 = port.receive
       assert_equal(h1, h2)
-      assert_equal(ENV.object_id, r.take)
+      assert_same(ENV, port.receive)
     end;
   end
 
   def test_select_bang_in_ractor
     assert_ractor(<<-"end;")
-      r = Ractor.new do
+      Ractor.new port = Ractor::Port.new do |port|
         h1 = {}
         ENV.each_pair {|k, v| h1[k] = v }
         ENV["test"] = "foo"
         ENV.select! {|k, v| #{ignore_case_str} ? k.upcase != "TEST" : k != "test" }
         h2 = {}
         ENV.each_pair {|k, v| h2[k] = v }
-        Ractor.yield [h1, h2]
-        Ractor.yield(ENV.select! {|k, v| #{ignore_case_str} ? k.upcase != "TEST" : k != "test" })
+        port.send [h1, h2]
+        port.send(ENV.select! {|k, v| #{ignore_case_str} ? k.upcase != "TEST" : k != "test" })
       end
-      h1, h2 = r.take
+      h1, h2 = port.receive
       assert_equal(h1, h2)
-      assert_nil(r.take)
+      assert_nil(port.receive)
     end;
   end
 
   def test_filter_bang_in_ractor
     assert_ractor(<<-"end;")
-      r = Ractor.new do
+      Ractor.new port = Ractor::Port.new do |port|
         h1 = {}
         ENV.each_pair {|k, v| h1[k] = v }
         ENV["test"] = "foo"
         ENV.filter! {|k, v| #{ignore_case_str} ? k.upcase != "TEST" : k != "test" }
         h2 = {}
         ENV.each_pair {|k, v| h2[k] = v }
-        Ractor.yield [h1, h2]
-        Ractor.yield(ENV.filter! {|k, v| #{ignore_case_str} ? k.upcase != "TEST" : k != "test" })
+        port.send [h1, h2]
+        port.send(ENV.filter! {|k, v| #{ignore_case_str} ? k.upcase != "TEST" : k != "test" })
       end
-      h1, h2 = r.take
+      h1, h2 = port.receive
       assert_equal(h1, h2)
-      assert_nil(r.take)
+      assert_nil(port.receive)
     end;
   end
 
   def test_keep_if_in_ractor
     assert_ractor(<<-"end;")
-      r = Ractor.new do
+      Ractor.new port = Ractor::Port.new do |port|
         h1 = {}
         ENV.each_pair {|k, v| h1[k] = v }
         ENV["test"] = "foo"
         ENV.keep_if {|k, v| #{ignore_case_str} ? k.upcase != "TEST" : k != "test" }
         h2 = {}
         ENV.each_pair {|k, v| h2[k] = v }
-        Ractor.yield [h1, h2]
-        Ractor.yield (ENV.keep_if {|k, v| #{ignore_case_str} ? k.upcase != "TEST" : k != "test" }).object_id
+        port.send [h1, h2]
+        port.send (ENV.keep_if {|k, v| #{ignore_case_str} ? k.upcase != "TEST" : k != "test" })
       end
-      h1, h2 = r.take
+      h1, h2 = port.receive
       assert_equal(h1, h2)
-      assert_equal(ENV.object_id, r.take)
+      assert_equal(ENV, port.receive)
     end;
   end
 
   def test_values_at_in_ractor
     assert_ractor(<<-"end;")
-      r = Ractor.new do
+      Ractor.new port = Ractor::Port.new do |port|
         ENV["test"] = "foo"
-        Ractor.yield ENV.values_at("test", "test")
+        port.send ENV.values_at("test", "test")
       end
-      assert_equal(["foo", "foo"], r.take)
+      assert_equal(["foo", "foo"], port.receive)
     end;
   end
 
   def test_select_in_ractor
     assert_ractor(<<-"end;")
-      r = Ractor.new do
+      Ractor.new port = Ractor::Port.new do |port|
         ENV["test"] = "foo"
         h = ENV.select {|k| #{ignore_case_str} ? k.upcase == "TEST" : k == "test" }
-        Ractor.yield h.size
+        port.send h.size
         k = h.keys.first
         v = h.values.first
-        Ractor.yield [k, v]
+        port.send [k, v]
       end
-      assert_equal(1, r.take)
-      k, v = r.take
+      assert_equal(1, port.receive)
+      k, v = port.receive
       if #{ignore_case_str}
         assert_equal("TEST", k.upcase)
         assert_equal("FOO", v.upcase)
@@ -1002,16 +1011,16 @@ def test_select_in_ractor
 
   def test_filter_in_ractor
     assert_ractor(<<-"end;")
-      r = Ractor.new do
+      Ractor.new port = Ractor::Port.new do |port|
         ENV["test"] = "foo"
         h = ENV.filter {|k| #{ignore_case_str} ? k.upcase == "TEST" : k == "test" }
-        Ractor.yield(h.size)
+        port.send(h.size)
         k = h.keys.first
         v = h.values.first
-        Ractor.yield [k, v]
+        port.send [k, v]
       end
-      assert_equal(1, r.take)
-      k, v = r.take
+      assert_equal(1, port.receive)
+      k, v = port.receive
       if #{ignore_case_str}
         assert_equal("TEST", k.upcase)
         assert_equal("FOO", v.upcase)
@@ -1024,49 +1033,49 @@ def test_filter_in_ractor
 
   def test_slice_in_ractor
     assert_ractor(<<-"end;")
-      r = Ractor.new do
+      Ractor.new port = Ractor::Port.new do |port|
         ENV.clear
         ENV["foo"] = "bar"
         ENV["baz"] = "qux"
         ENV["bar"] = "rab"
-        Ractor.yield(ENV.slice())
-        Ractor.yield(ENV.slice(""))
-        Ractor.yield(ENV.slice("unknown"))
-        Ractor.yield(ENV.slice("foo", "baz"))
-      end
-      assert_equal({}, r.take)
-      assert_equal({}, r.take)
-      assert_equal({}, r.take)
-      assert_equal({"foo"=>"bar", "baz"=>"qux"}, r.take)
+        port.send(ENV.slice())
+        port.send(ENV.slice(""))
+        port.send(ENV.slice("unknown"))
+        port.send(ENV.slice("foo", "baz"))
+      end
+      assert_equal({}, port.receive)
+      assert_equal({}, port.receive)
+      assert_equal({}, port.receive)
+      assert_equal({"foo"=>"bar", "baz"=>"qux"}, port.receive)
     end;
   end
 
   def test_except_in_ractor
     assert_ractor(<<-"end;")
-      r = Ractor.new do
+      Ractor.new port = Ractor::Port.new do |port|
         ENV.clear
         ENV["foo"] = "bar"
         ENV["baz"] = "qux"
         ENV["bar"] = "rab"
-        Ractor.yield ENV.except()
-        Ractor.yield ENV.except("")
-        Ractor.yield ENV.except("unknown")
-        Ractor.yield ENV.except("foo", "baz")
-      end
-      assert_equal({"bar"=>"rab", "baz"=>"qux", "foo"=>"bar"}, r.take)
-      assert_equal({"bar"=>"rab", "baz"=>"qux", "foo"=>"bar"}, r.take)
-      assert_equal({"bar"=>"rab", "baz"=>"qux", "foo"=>"bar"}, r.take)
-      assert_equal({"bar"=>"rab"}, r.take)
+        port.send ENV.except()
+        port.send ENV.except("")
+        port.send ENV.except("unknown")
+        port.send ENV.except("foo", "baz")
+      end
+      assert_equal({"bar"=>"rab", "baz"=>"qux", "foo"=>"bar"}, port.receive)
+      assert_equal({"bar"=>"rab", "baz"=>"qux", "foo"=>"bar"}, port.receive)
+      assert_equal({"bar"=>"rab", "baz"=>"qux", "foo"=>"bar"}, port.receive)
+      assert_equal({"bar"=>"rab"}, port.receive)
     end;
   end
 
   def test_clear_in_ractor
     assert_ractor(<<-"end;")
-      r = Ractor.new do
+      Ractor.new port = Ractor::Port.new do |port|
         ENV.clear
-        Ractor.yield ENV.size
+        port.send ENV.size
       end
-      assert_equal(0, r.take)
+      assert_equal(0, port.receive)
     end;
   end
 
@@ -1075,46 +1084,51 @@ def test_to_s_in_ractor
       r = Ractor.new do
         ENV.to_s
       end
-      assert_equal("ENV", r.take)
+      assert_equal("ENV", r.value)
     end;
   end
 
   def test_inspect_in_ractor
     assert_ractor(<<-"end;")
-      r = Ractor.new do
+      Ractor.new port = Ractor::Port.new do |port|
         ENV.clear
         ENV["foo"] = "bar"
         ENV["baz"] = "qux"
         s = ENV.inspect
-        Ractor.yield s
+        port.send s
+      end
+      s = port.receive
+      expected = ['"foo" => "bar"', '"baz" => "qux"']
+      unless s.start_with?(/\{"foo"/i)
+        expected.reverse!
       end
-      s = r.take
+      expected = "{" + expected.join(', ') + "}"
       if #{ignore_case_str}
         s = s.upcase
-        assert(s == '{"FOO"=>"BAR", "BAZ"=>"QUX"}' || s == '{"BAZ"=>"QUX", "FOO"=>"BAR"}')
-      else
-        assert(s == '{"foo"=>"bar", "baz"=>"qux"}' || s == '{"baz"=>"qux", "foo"=>"bar"}')
+        expected = expected.upcase
       end
+      assert_equal(expected, s)
     end;
   end
 
   def test_to_a_in_ractor
     assert_ractor(<<-"end;")
-      r = Ractor.new do
+      Ractor.new port = Ractor::Port.new do |port|
         ENV.clear
         ENV["foo"] = "bar"
         ENV["baz"] = "qux"
         a = ENV.to_a
-        Ractor.yield a
+        port.send a
       end
-      a = r.take
+      a = port.receive
       assert_equal(2, a.size)
+      expected = [%w(baz qux), %w(foo bar)]
       if #{ignore_case_str}
-        a = a.map {|x| x.map {|y| y.upcase } }
-        assert(a == [%w(FOO BAR), %w(BAZ QUX)] || a == [%w(BAZ QUX), %w(FOO BAR)])
-      else
-        assert(a == [%w(foo bar), %w(baz qux)] || a == [%w(baz qux), %w(foo bar)])
+        a = a.map {|x, y| [x.upcase, y]}
+        expected.map! {|x, y| [x.upcase, y]}
       end
+      a.sort!
+      assert_equal(expected, a)
     end;
   end
 
@@ -1123,59 +1137,59 @@ def test_rehash_in_ractor
       r = Ractor.new do
         ENV.rehash
       end
-      assert_nil(r.take)
+      assert_nil(r.value)
     end;
   end
 
   def test_size_in_ractor
     assert_ractor(<<-"end;")
-      r = Ractor.new do
+      Ractor.new port = Ractor::Port.new do |port|
         s = ENV.size
         ENV["test"] = "foo"
-        Ractor.yield [s, ENV.size]
+        port.send [s, ENV.size]
       end
-      s, s2 = r.take
+      s, s2 = port.receive
       assert_equal(s + 1, s2)
     end;
   end
 
   def test_empty_p_in_ractor
     assert_ractor(<<-"end;")
-      r = Ractor.new do
+      Ractor.new port = Ractor::Port.new do |port|
         ENV.clear
-        Ractor.yield ENV.empty?
+        port.send ENV.empty?
         ENV["test"] = "foo"
-        Ractor.yield ENV.empty?
+        port.send ENV.empty?
       end
-      assert r.take
-      assert !r.take
+      assert port.receive
+      assert !port.receive
     end;
   end
 
   def test_has_key_in_ractor
     assert_ractor(<<-"end;")
-      r = Ractor.new do
-        Ractor.yield ENV.has_key?("test")
+      Ractor.new port = Ractor::Port.new do |port|
+        port.send ENV.has_key?("test")
         ENV["test"] = "foo"
-        Ractor.yield ENV.has_key?("test")
+        port.send ENV.has_key?("test")
         #{str_to_yield_invalid_envvar_errors("v", "ENV.has_key?(v)")}
       end
-      assert !r.take
-      assert r.take
-      #{str_to_receive_invalid_envvar_errors("r")}
+      assert !port.receive
+      assert port.receive
+      #{str_to_receive_invalid_envvar_errors("port")}
     end;
   end
 
   def test_assoc_in_ractor
     assert_ractor(<<-"end;")
-      r = Ractor.new do
-        Ractor.yield ENV.assoc("test")
+      Ractor.new port = Ractor::Port.new do |port|
+        port.send ENV.assoc("test")
         ENV["test"] = "foo"
-        Ractor.yield ENV.assoc("test")
+        port.send ENV.assoc("test")
         #{str_to_yield_invalid_envvar_errors("v", "ENV.assoc(v)")}
       end
-      assert_nil(r.take)
-      k, v = r.take
+      assert_nil(port.receive)
+      k, v = port.receive
       if #{ignore_case_str}
         assert_equal("TEST", k.upcase)
         assert_equal("FOO", v.upcase)
@@ -1183,7 +1197,7 @@ def test_assoc_in_ractor
         assert_equal("test", k)
         assert_equal("foo", v)
       end
-      #{str_to_receive_invalid_envvar_errors("r")}
+      #{str_to_receive_invalid_envvar_errors("port")}
       encoding = /mswin|mingw/ =~ RUBY_PLATFORM ? Encoding::UTF_8 : Encoding.find("locale")
       assert_equal(encoding, v.encoding)
     end;
@@ -1191,29 +1205,29 @@ def test_assoc_in_ractor
 
   def test_has_value2_in_ractor
     assert_ractor(<<-"end;")
-      r = Ractor.new do
+      Ractor.new port = Ractor::Port.new do |port|
         ENV.clear
-        Ractor.yield ENV.has_value?("foo")
+        port.send ENV.has_value?("foo")
         ENV["test"] = "foo"
-        Ractor.yield ENV.has_value?("foo")
+        port.send ENV.has_value?("foo")
       end
-      assert !r.take
-      assert r.take
+      assert !port.receive
+      assert port.receive
     end;
   end
 
   def test_rassoc_in_ractor
     assert_ractor(<<-"end;")
-      r = Ractor.new do
+      Ractor.new port = Ractor::Port.new do |port|
         ENV.clear
-        Ractor.yield ENV.rassoc("foo")
+        port.send ENV.rassoc("foo")
         ENV["foo"] = "bar"
         ENV["test"] = "foo"
         ENV["baz"] = "qux"
-        Ractor.yield ENV.rassoc("foo")
+        port.send ENV.rassoc("foo")
       end
-      assert_nil(r.take)
-      k, v = r.take
+      assert_nil(port.receive)
+      k, v = port.receive
       if #{ignore_case_str}
         assert_equal("TEST", k.upcase)
         assert_equal("FOO", v.upcase)
@@ -1226,39 +1240,39 @@ def test_rassoc_in_ractor
 
   def test_to_hash_in_ractor
     assert_ractor(<<-"end;")
-      r = Ractor.new do
+      Ractor.new port = Ractor::Port.new do |port|
         h = {}
         ENV.each {|k, v| h[k] = v }
-        Ractor.yield [h, ENV.to_hash]
+        port.send [h, ENV.to_hash]
       end
-      h, h2 = r.take
+      h, h2 = port.receive
       assert_equal(h, h2)
     end;
   end
 
   def test_to_h_in_ractor
     assert_ractor(<<-"end;")
-      r = Ractor.new do
-        Ractor.yield [ENV.to_hash, ENV.to_h]
-        Ractor.yield [ENV.map {|k, v| ["$\#{k}", v.size]}.to_h, ENV.to_h {|k, v| ["$\#{k}", v.size]}]
+      Ractor.new port = Ractor::Port.new do |port|
+        port.send [ENV.to_hash, ENV.to_h]
+        port.send [ENV.map {|k, v| ["$\#{k}", v.size]}.to_h, ENV.to_h {|k, v| ["$\#{k}", v.size]}]
       end
-      a, b = r.take
+      a, b = port.receive
       assert_equal(a,b)
-      c, d = r.take
+      c, d = port.receive
       assert_equal(c,d)
     end;
   end
 
   def test_reject_in_ractor
     assert_ractor(<<-"end;")
-      r = Ractor.new do
+      Ractor.new port = Ractor::Port.new do |port|
         h1 = {}
         ENV.each_pair {|k, v| h1[k] = v }
         ENV["test"] = "foo"
         h2 = ENV.reject {|k, v| #{ignore_case_str} ? k.upcase == "TEST" : k == "test" }
-        Ractor.yield [h1, h2]
+        port.send [h1, h2]
       end
-      h1, h2 = r.take
+      h1, h2 = port.receive
       assert_equal(h1, h2)
     end;
   end
@@ -1266,86 +1280,86 @@ def test_reject_in_ractor
   def test_shift_in_ractor
     assert_ractor(<<-"end;")
       #{STR_DEFINITION_FOR_CHECK}
-      r = Ractor.new do
+      Ractor.new port = Ractor::Port.new do |port|
         ENV.clear
         ENV["foo"] = "bar"
         ENV["baz"] = "qux"
         a = ENV.shift
         b = ENV.shift
-        Ractor.yield [a,b]
-        Ractor.yield ENV.shift
+        port.send [a,b]
+        port.send ENV.shift
       end
-      a,b = r.take
+      a,b = port.receive
       check([a, b], [%w(foo bar), %w(baz qux)])
-      assert_nil(r.take)
+      assert_nil(port.receive)
     end;
   end
 
   def test_invert_in_ractor
     assert_ractor(<<-"end;")
       #{STR_DEFINITION_FOR_CHECK}
-      r = Ractor.new do
+      Ractor.new port = Ractor::Port.new do |port|
         ENV.clear
         ENV["foo"] = "bar"
         ENV["baz"] = "qux"
-        Ractor.yield(ENV.invert)
+        port.send(ENV.invert)
       end
-      check(r.take.to_a, [%w(bar foo), %w(qux baz)])
+      check(port.receive.to_a, [%w(bar foo), %w(qux baz)])
     end;
   end
 
   def test_replace_in_ractor
     assert_ractor(<<-"end;")
       #{STR_DEFINITION_FOR_CHECK}
-      r = Ractor.new do
+      Ractor.new port = Ractor::Port.new do |port|
         ENV["foo"] = "xxx"
         ENV.replace({"foo"=>"bar", "baz"=>"qux"})
-        Ractor.yield ENV.to_hash
+        port.send ENV.to_hash
         ENV.replace({"Foo"=>"Bar", "Baz"=>"Qux"})
-        Ractor.yield ENV.to_hash
+        port.send ENV.to_hash
       end
-      check(r.take.to_a, [%w(foo bar), %w(baz qux)])
-      check(r.take.to_a, [%w(Foo Bar), %w(Baz Qux)])
+      check(port.receive.to_a, [%w(foo bar), %w(baz qux)])
+      check(port.receive.to_a, [%w(Foo Bar), %w(Baz Qux)])
     end;
   end
 
   def test_update_in_ractor
     assert_ractor(<<-"end;")
       #{STR_DEFINITION_FOR_CHECK}
-      r = Ractor.new do
+      Ractor.new port = Ractor::Port.new do |port|
         ENV.clear
         ENV["foo"] = "bar"
         ENV["baz"] = "qux"
         ENV.update({"baz"=>"quux","a"=>"b"})
-        Ractor.yield ENV.to_hash
+        port.send ENV.to_hash
         ENV.clear
         ENV["foo"] = "bar"
         ENV["baz"] = "qux"
         ENV.update({"baz"=>"quux","a"=>"b"}) {|k, v1, v2| k + "_" + v1 + "_" + v2 }
-        Ractor.yield ENV.to_hash
+        port.send ENV.to_hash
       end
-      check(r.take.to_a, [%w(foo bar), %w(baz quux), %w(a b)])
-      check(r.take.to_a, [%w(foo bar), %w(baz baz_qux_quux), %w(a b)])
+      check(port.receive.to_a, [%w(foo bar), %w(baz quux), %w(a b)])
+      check(port.receive.to_a, [%w(foo bar), %w(baz baz_qux_quux), %w(a b)])
     end;
   end
 
   def test_huge_value_in_ractor
     assert_ractor(<<-"end;")
       huge_value = "bar" * 40960
-      r = Ractor.new huge_value do |v|
+      Ractor.new port = Ractor::Port.new, huge_value do |port, v|
         ENV["foo"] = "bar"
         #{str_for_yielding_exception_class("ENV['foo'] = v ")}
-        Ractor.yield ENV["foo"]
+        port.send ENV["foo"]
       end
 
       if /mswin|ucrt/ =~ RUBY_PLATFORM
-        #{str_for_assert_raise_on_yielded_exception_class(Errno::EINVAL, "r")}
-        result = r.take
+        #{str_for_assert_raise_on_yielded_exception_class(Errno::EINVAL, "port")}
+        result = port.receive
         assert_equal("bar", result)
       else
-        exception_class = r.take
+        exception_class = port.receive
         assert_equal(NilClass, exception_class)
-        result = r.take
+        result = port.receive
         assert_equal(huge_value, result)
       end
     end;
@@ -1353,34 +1367,34 @@ def test_huge_value_in_ractor
 
   def test_frozen_env_in_ractor
     assert_ractor(<<-"end;")
-      r = Ractor.new do
+      Ractor.new port = Ractor::Port.new do |port|
         #{str_for_yielding_exception_class("ENV.freeze")}
       end
-      #{str_for_assert_raise_on_yielded_exception_class(TypeError, "r")}
+      #{str_for_assert_raise_on_yielded_exception_class(TypeError, "port")}
     end;
   end
 
   def test_frozen_in_ractor
     assert_ractor(<<-"end;")
-      r = Ractor.new do
+      Ractor.new port = Ractor::Port.new do |port|
         ENV["#{PATH_ENV}"] = "/"
         ENV.each do |k, v|
-          Ractor.yield [k.frozen?]
-          Ractor.yield [v.frozen?]
+          port.send [k.frozen?]
+          port.send [v.frozen?]
         end
         ENV.each_key do |k|
-          Ractor.yield [k.frozen?]
+          port.send [k.frozen?]
         end
         ENV.each_value do |v|
-          Ractor.yield [v.frozen?]
+          port.send [v.frozen?]
         end
         ENV.each_key do |k|
-          Ractor.yield [ENV[k].frozen?, "[\#{k.dump}]"]
-          Ractor.yield [ENV.fetch(k).frozen?, "fetch(\#{k.dump})"]
+          port.send [ENV[k].frozen?, "[\#{k.dump}]"]
+          port.send [ENV.fetch(k).frozen?, "fetch(\#{k.dump})"]
         end
-        Ractor.yield "finished"
+        port.send "finished"
       end
-      while((params=r.take) != "finished")
+      while((params=port.receive) != "finished")
         assert(*params)
       end
     end;
@@ -1388,7 +1402,7 @@ def test_frozen_in_ractor
 
   def test_shared_substring_in_ractor
     assert_ractor(<<-"end;")
-      r = Ractor.new do
+      Ractor.new port = Ractor::Port.new do |port|
         bug12475 = '[ruby-dev:49655] [Bug #12475]'
         n = [*"0".."9"].join("")*3
         e0 = ENV[n0 = "E\#{n}"]
@@ -1398,9 +1412,9 @@ def test_shared_substring_in_ractor
         ENV[n1.chop] = "T\#{n}.".chop
         ENV[n0], e0 = e0, ENV[n0]
         ENV[n1], e1 = e1, ENV[n1]
-        Ractor.yield [n, e0, e1, bug12475]
+        port.send [n, e0, e1, bug12475]
       end
-      n, e0, e1, bug12475 = r.take
+      n, e0, e1, bug12475 = port.receive
       assert_equal("T\#{n}", e0, bug12475)
       assert_nil(e1, bug12475)
     end;
@@ -1416,7 +1430,7 @@ def test_ivar_in_env_should_not_be_access_from_non_main_ractors
     rescue Ractor::IsolationError => e
       e
     end
-    assert_equal Ractor::IsolationError, r_get.take.class
+    assert_equal Ractor::IsolationError, r_get.value.class
 
     r_get =  Ractor.new do
       ENV.instance_eval{ @a }
@@ -1424,7 +1438,7 @@ def test_ivar_in_env_should_not_be_access_from_non_main_ractors
       e
     end
 
-    assert_equal Ractor::IsolationError, r_get.take.class
+    assert_equal Ractor::IsolationError, r_get.value.class
 
     r_set = Ractor.new do
       ENV.instance_eval{ @b = "hello" }
@@ -1432,7 +1446,7 @@ def test_ivar_in_env_should_not_be_access_from_non_main_ractors
       e
     end
 
-    assert_equal Ractor::IsolationError, r_set.take.class
+    assert_equal Ractor::IsolationError, r_set.value.class
     RUBY
   end
 
@@ -1479,11 +1493,18 @@ def test_memory_leak_shift
 
     def test_utf8
       text = "testing \u{e5 e1 e2 e4 e3 101 3042}"
-      test = ENV["test"]
       ENV["test"] = text
       assert_equal text, ENV["test"]
-    ensure
-      ENV["test"] = test
+    end
+
+    def test_utf8_empty
+      key = "VAR\u{e5 e1 e2 e4 e3 101 3042}"
+      ENV[key] = "x"
+      assert_equal "x", ENV[key]
+      ENV[key] = ""
+      assert_equal "", ENV[key]
+      ENV[key] = nil
+      assert_nil ENV[key]
     end
   end
 end
diff --git a/test/ruby/test_eval.rb b/test/ruby/test_eval.rb
index 082d1dc03c9315..d2145bec5d9f13 100644
--- a/test/ruby/test_eval.rb
+++ b/test/ruby/test_eval.rb
@@ -535,6 +535,12 @@ def test_file_encoding
     assert_equal(fname, eval("__FILE__", nil, fname, 1))
   end
 
+  def test_eval_invalid_block_exit_bug_20597
+    assert_raise(SyntaxError){eval("break if false")}
+    assert_raise(SyntaxError){eval("next if false")}
+    assert_raise(SyntaxError){eval("redo if false")}
+  end
+
   def test_eval_location_fstring
     o = Object.new
     o.instance_eval "def foo() end", "generated code"
@@ -606,4 +612,44 @@ def test_return_in_eval_lambda
     x = orphan_lambda
     assert_equal(:ok, x.call)
   end
+
+  def test_syntax_error_no_memory_leak
+    assert_no_memory_leak([], "#{<<~'begin;'}", "#{<<~'end;'}", rss: true)
+    begin;
+      100_000.times do
+        eval("/[/=~s")
+      rescue SyntaxError
+      else
+        raise "Expected SyntaxError to be raised"
+      end
+    end;
+
+    assert_no_memory_leak([], "#{<<~'begin;'}", "#{<<~'end;'}", rss: true)
+    begin;
+      a = 1
+
+      100_000.times do
+        eval("if a in [0, 0] | [0, a]; end")
+      rescue SyntaxError
+      else
+        raise "Expected SyntaxError to be raised"
+      end
+    end;
+  end
+
+  def test_outer_local_variable_under_gc_compact_stress
+    omit "compaction is not supported on this platform" unless GC.respond_to?(:compact)
+    omit "compaction is not supported on s390x" if /s390x/ =~ RUBY_PLATFORM
+
+    assert_separately([], <<~RUBY)
+      o = Object.new
+      def o.m = 1
+
+      GC.verify_compaction_references(expand_heap: true, toward: :empty)
+
+      EnvUtil.under_gc_compact_stress do
+        assert_equal(1, eval("o.m"))
+      end
+    RUBY
+  end
 end
diff --git a/test/ruby/test_exception.rb b/test/ruby/test_exception.rb
index 07b39d1217e50f..84581180b60958 100644
--- a/test/ruby/test_exception.rb
+++ b/test/ruby/test_exception.rb
@@ -416,7 +416,7 @@ def test_errat
 
     assert_in_out_err([], "$@ = 1", [], /\$! not set \(ArgumentError\)$/)
 
-    assert_in_out_err([], <<-INPUT, [], /backtrace must be Array of String \(TypeError\)$/)
+    assert_in_out_err([], <<-INPUT, [], /backtrace must be an Array of String or an Array of Thread::Backtrace::Location \(TypeError\)$/)
       begin
         raise
       rescue
@@ -508,6 +508,16 @@ def test_set_backtrace
 
     assert_raise(TypeError) { e.set_backtrace(1) }
     assert_raise(TypeError) { e.set_backtrace([1]) }
+
+    error = assert_raise(TypeError) do
+      e.set_backtrace(caller_locations(1, 1) + ["foo"])
+    end
+    assert_include error.message, "backtrace must be an Array of String or an Array of Thread::Backtrace::Location"
+
+    error = assert_raise(TypeError) do
+      e.set_backtrace(["foo"] + caller_locations(1, 1))
+    end
+    assert_include error.message, "backtrace must be an Array of String or an Array of Thread::Backtrace::Location"
   end
 
   def test_exit_success_p
@@ -540,6 +550,14 @@ def test_errno
     assert_equal(Encoding.find("locale"), Errno::EINVAL.new.message.encoding)
   end
 
+  def test_errno_constants
+    assert_equal [:NOERROR], Errno.constants.grep_v(/\AE/)
+    all_assertions_foreach("should be a subclass of SystemCallError", *Errno.constants) do |c|
+      e = Errno.const_get(c)
+      assert_operator e, :<, SystemCallError, proc {e.ancestors.inspect}
+    end
+  end
+
   def test_too_many_args_in_eval
     bug5720 = '[ruby-core:41520]'
     arg_string = (0...140000).to_a.join(", ")
@@ -801,7 +819,7 @@ def test_cause_at_raised
   def test_cause_at_end
     errs = [
       /-: unexpected return\n/,
-      /.*undefined local variable or method `n'.*\n/,
+      /.*undefined local variable or method 'n'.*\n/,
     ]
     assert_in_out_err([], <<-'end;', [], errs)
       END{n}; END{return}
@@ -1037,7 +1055,7 @@ def test_method_missing_reason_clear
   end
 
   def test_message_of_name_error
-    assert_raise_with_message(NameError, /\Aundefined method `foo' for module `#<Module:.*>'$/) do
+    assert_raise_with_message(NameError, /\Aundefined method 'foo' for module '#<Module:.*>'$/) do
       Module.new do
         module_function :foo
       end
@@ -1046,8 +1064,7 @@ def test_message_of_name_error
 
   def capture_warning_warn(category: false)
     verbose = $VERBOSE
-    deprecated = Warning[:deprecated]
-    experimental = Warning[:experimental]
+    categories = Warning.categories.to_h {|cat| [cat, Warning[cat]]}
     warning = []
 
     ::Warning.class_eval do
@@ -1066,15 +1083,13 @@ def capture_warning_warn(category: false)
     end
 
     $VERBOSE = true
-    Warning[:deprecated] = true
-    Warning[:experimental] = true
+    Warning.categories.each {|cat| Warning[cat] = true}
     yield
 
     return warning
   ensure
     $VERBOSE = verbose
-    Warning[:deprecated] = deprecated
-    Warning[:experimental] = experimental
+    categories.each {|cat, flag| Warning[cat] = flag}
 
     ::Warning.class_eval do
       remove_method :warn
@@ -1085,7 +1100,7 @@ def capture_warning_warn(category: false)
 
   def test_warning_warn
     warning = capture_warning_warn {$asdfasdsda_test_warning_warn}
-    assert_match(/global variable `\$asdfasdsda_test_warning_warn' not initialized/, warning[0])
+    assert_match(/global variable '\$asdfasdsda_test_warning_warn' not initialized/, warning[0])
 
     assert_equal(["a\nz\n"], capture_warning_warn {warn "a\n", "z"})
     assert_equal([],         capture_warning_warn {warn})
@@ -1093,19 +1108,13 @@ def test_warning_warn
   end
 
   def test_warn_deprecated_backwards_compatibility_category
-    omit "no method to test"
-
-    warning = capture_warning_warn { }
-
-    assert_match(/deprecated/, warning[0])
-  end
-
-  def test_warn_deprecated_category
-    omit "no method to test"
-
-    warning = capture_warning_warn(category: true) { }
+    (message, category), = capture_warning_warn(category: true) do
+      $; = "www"
+      $; = nil
+    end
 
-    assert_equal :deprecated, warning[0][1]
+    assert_include message, 'deprecated'
+    assert_equal :deprecated, category
   end
 
   def test_kernel_warn_uplevel
@@ -1119,11 +1128,11 @@ 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_match(/test warning.*{:uplevel=>0}/m, warning[0])
+    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}, **{})}
-    assert_equal("test warning\n{:uplevel=>0}\n", warning[0])
+    assert_equal("test warning\n{uplevel: 0}\n", warning[0])
     assert_raise(ArgumentError) {warn("test warning", foo: 1)}
   end
 
@@ -1161,7 +1170,7 @@ def test_warning_warn_circular_require_backtrace
   end
 
   def test_warning_warn_super
-    assert_in_out_err(%[-W0], "#{<<~"{#"}\n#{<<~'};'}", [], /global variable `\$asdfiasdofa_test_warning_warn_super' not initialized/)
+    assert_in_out_err(%[-W0], "#{<<~"{#"}\n#{<<~'};'}", [], /global variable '\$asdfiasdofa_test_warning_warn_super' not initialized/)
     {#
       module Warning
         def warn(message)
@@ -1177,48 +1186,24 @@ def warn(message)
   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_warning_category_deprecated
-    warning = EnvUtil.verbose_warning do
-      deprecated = Warning[:deprecated]
-      Warning[:deprecated] = true
-      Warning.warn "deprecated feature", category: :deprecated
-    ensure
-      Warning[:deprecated] = deprecated
-    end
-    assert_equal "deprecated feature", warning
+    all_assertions_foreach("categories", *Warning.categories) do |cat|
+      value = Warning[cat]
+      assert_include([true, false], value)
 
-    warning = EnvUtil.verbose_warning do
-      deprecated = Warning[:deprecated]
-      Warning[:deprecated] = false
-      Warning.warn "deprecated feature", category: :deprecated
-    ensure
-      Warning[:deprecated] = deprecated
-    end
-    assert_empty warning
-  end
-
-  def test_warning_category_experimental
-    warning = EnvUtil.verbose_warning do
-      experimental = Warning[:experimental]
-      Warning[:experimental] = true
-      Warning.warn "experimental feature", category: :experimental
-    ensure
-      Warning[:experimental] = experimental
-    end
-    assert_equal "experimental feature", warning
-
-    warning = EnvUtil.verbose_warning do
-      experimental = Warning[:experimental]
-      Warning[:experimental] = false
-      Warning.warn "experimental feature", category: :experimental
+      enabled = EnvUtil.verbose_warning do
+        Warning[cat] = true
+        Warning.warn "#{cat} feature", category: cat
+      end
+      disabled = EnvUtil.verbose_warning do
+        Warning[cat] = false
+        Warning.warn "#{cat} feature", category: cat
+      end
     ensure
-      Warning[:experimental] = experimental
+      Warning[cat] = value
+      assert_equal "#{cat} feature", enabled
+      assert_empty disabled
     end
-    assert_empty warning
   end
 
   def test_undef_Warning_warn
@@ -1413,11 +1398,7 @@ def test_circular_cause_handle
   end
 
   def test_marshal_circular_cause
-    begin
-      raise RuntimeError, "err", [], cause: Exception.new
-    rescue => e
-    end
-    dump = Marshal.dump(e).sub(/o:\x0EException\x08;.0;.0;.0/, "@\x05")
+    dump = "\x04\bo:\x11RuntimeError\b:\tmesgI\"\berr\x06:\x06ET:\abt[\x00:\ncause@\x05"
     assert_raise_with_message(ArgumentError, /circular cause/, ->{dump.inspect}) do
       e = Marshal.load(dump)
       assert_same(e, e.cause)
@@ -1435,7 +1416,7 @@ def method_missing(name, *args, &block)
       end
 
       bug14670 = '[ruby-dev:50522] [Bug #14670]'
-      assert_raise_with_message(NoMethodError, /`foo'/, bug14670) do
+      assert_raise_with_message(NoMethodError, /'foo'/, bug14670) do
         Object.new.foo
       end
     end;
@@ -1459,6 +1440,15 @@ def test_detailed_message
     assert_equal("\e[1mRuntimeError (\e[1;4mRuntimeError\e[m\e[1m)\e[m", e.detailed_message(highlight: true))
   end
 
+  def test_detailed_message_under_gc_compact_stress
+    omit "compaction doesn't work well on s390x" if RUBY_PLATFORM =~ /s390x/ # https://github.com/ruby/ruby/pull/5077
+    EnvUtil.under_gc_compact_stress do
+      e = RuntimeError.new("foo\nbar\nbaz")
+      assert_equal("foo (RuntimeError)\nbar\nbaz", e.detailed_message)
+      assert_equal("\e[1mfoo (\e[1;4mRuntimeError\e[m\e[1m)\e[m\n\e[1mbar\e[m\n\e[1mbaz\e[m", e.detailed_message(highlight: true))
+    end
+  end
+
   def test_full_message_with_custom_detailed_message
     e = RuntimeError.new("message")
     opt_ = nil
@@ -1508,7 +1498,7 @@ def detailed_message(**)
         assert_not_empty(stderr.grep(pattern))
         error, = stderr.grep(/unexpected end-of-input/)
         assert_not_nil(error)
-        assert_match(/<.*unexpected end-of-input.*>/, error)
+        assert_match(/<.*unexpected end-of-input.*>|\^ unexpected end-of-input,/, error)
       end
     end
   end
diff --git a/test/ruby/test_fiber.rb b/test/ruby/test_fiber.rb
index cb6e846bc69df6..1f78307748bbbd 100644
--- a/test/ruby/test_fiber.rb
+++ b/test/ruby/test_fiber.rb
@@ -34,7 +34,6 @@ def test_term
   end
 
   def test_many_fibers
-    omit 'This is unstable on GitHub Actions --jit-wait. TODO: debug it' if defined?(RubyVM::RJIT) && RubyVM::RJIT.enabled?
     max = 1000
     assert_equal(max, max.times{
       Fiber.new{}
@@ -50,7 +49,7 @@ def test_many_fibers
   end
 
   def test_many_fibers_with_threads
-    assert_normal_exit <<-SRC, timeout: (/solaris/i =~ RUBY_PLATFORM ? 1000 : 60)
+    assert_normal_exit <<-SRC, timeout: 60
       max = 1000
       @cnt = 0
       (1..100).map{|ti|
@@ -82,12 +81,14 @@ def test_error
       f.resume
       f.resume
     }
-    assert_raise(RuntimeError){
-      Fiber.new{
-        @c = callcc{|c| @c = c}
-      }.resume
-      @c.call # cross fiber callcc
-    }
+    if respond_to?(:callcc)
+      assert_raise(RuntimeError){
+        Fiber.new{
+          @c = callcc{|c| @c = c}
+        }.resume
+        @c.call # cross fiber callcc
+      }
+    end
     assert_raise(RuntimeError){
       Fiber.new{
         raise
@@ -250,6 +251,18 @@ def tvar(var, val)
     assert_equal(nil, Thread.current[:v]);
   end
 
+  def test_fiber_variables
+    assert_equal "bar", Fiber.new {Fiber[:foo] = "bar"; Fiber[:foo]}.resume
+
+    key = :"#{self.class.name}#.#{self.object_id}"
+    Fiber[key] = 42
+    assert_equal 42, Fiber[key]
+
+    key = Object.new
+    def key.to_str; "foo"; end
+    assert_equal "Bar", Fiber.new {Fiber[key] = "Bar"; Fiber[key]}.resume
+  end
+
   def test_alive
     fib = Fiber.new{Fiber.yield}
     assert_equal(true, fib.alive?)
@@ -422,7 +435,7 @@ def test_exit_in_fiber
   end
 
   def test_fatal_in_fiber
-    assert_in_out_err(["-r-test-/fatal/rb_fatal", "-e", <<-EOS], "", [], /ok/)
+    assert_in_out_err(["-r-test-/fatal", "-e", <<-EOS], "", [], /ok/)
       Fiber.new{
         Bug.rb_fatal "ok"
       }.resume
diff --git a/test/ruby/test_file.rb b/test/ruby/test_file.rb
index 409d21fc4e3a09..a3d6221c0f924b 100644
--- a/test/ruby/test_file.rb
+++ b/test/ruby/test_file.rb
@@ -358,33 +358,58 @@ def test_utime
     assert_equal(mod_time_contents, stats.mtime, bug6385)
   end
 
+  def measure_time
+    log = []
+    30.times do
+      t1 = Process.clock_gettime(Process::CLOCK_REALTIME)
+      yield
+      t2 = Process.clock_gettime(Process::CLOCK_REALTIME)
+      log << (t2 - t1)
+      return (t1 + t2) / 2 if t2 - t1 < 1
+      sleep 1
+    end
+    omit "failed to setup; the machine is stupidly slow #{log.inspect}"
+  end
+
   def test_stat
-    tb = Process.clock_gettime(Process::CLOCK_REALTIME)
+    btime = Process.clock_gettime(Process::CLOCK_REALTIME)
     Tempfile.create("stat") {|file|
-      tb = (tb + Process.clock_gettime(Process::CLOCK_REALTIME)) / 2
+      btime = (btime + Process.clock_gettime(Process::CLOCK_REALTIME)) / 2
       file.close
       path = file.path
 
-      t0 = Process.clock_gettime(Process::CLOCK_REALTIME)
-      File.write(path, "foo")
+      measure_time do
+        File.write(path, "foo")
+      end
+
       sleep 2
-      File.write(path, "bar")
+
+      mtime = measure_time do
+        File.write(path, "bar")
+      end
+
       sleep 2
-      File.read(path)
-      File.chmod(0644, path)
+
+      ctime = measure_time do
+        File.chmod(0644, path)
+      end
+
       sleep 2
-      File.read(path)
+
+      atime = measure_time do
+        File.read(path)
+      end
 
       delta = 1
       stat = File.stat(path)
-      assert_in_delta tb,   stat.birthtime.to_f, delta
-      assert_in_delta t0+2, stat.mtime.to_f, delta
+      assert_in_delta btime, stat.birthtime.to_f, delta
+      assert_in_delta mtime, stat.mtime.to_f, delta
       if stat.birthtime != stat.ctime
-        assert_in_delta t0+4, stat.ctime.to_f, delta
+        assert_in_delta ctime, stat.ctime.to_f, delta
       end
       if /mswin|mingw/ !~ RUBY_PLATFORM && !Bug::File::Fs.noatime?(path)
         # Windows delays updating atime
-        assert_in_delta t0+6, stat.atime.to_f, delta
+        assert_in_delta atime, stat.atime.to_f, delta
       end
     }
   rescue NotImplementedError
@@ -460,6 +485,39 @@ def test_long_unc
     end
   end
 
+  def test_initialize
+    Dir.mktmpdir(__method__.to_s) do |tmpdir|
+      path = File.join(tmpdir, "foo")
+
+      assert_raise(Errno::ENOENT) {File.new(path)}
+      f = File.new(path, "w")
+      f.write("FOO\n")
+      f.close
+      f = File.new(path)
+      data = f.read
+      f.close
+      assert_equal("FOO\n", data)
+
+      f = File.new(path, File::WRONLY)
+      f.write("BAR\n")
+      f.close
+      f = File.new(path, File::RDONLY)
+      data = f.read
+      f.close
+      assert_equal("BAR\n", data)
+
+      data = File.open(path) {|file|
+        File.new(file.fileno, mode: File::RDONLY, autoclose: false).read
+      }
+      assert_equal("BAR\n", data)
+
+      data = File.open(path) {|file|
+        File.new(file.fileno, File::RDONLY, autoclose: false).read
+      }
+      assert_equal("BAR\n", data)
+    end
+  end
+
   def test_file_open_newline_option
     Dir.mktmpdir(__method__.to_s) do |tmpdir|
       path = File.join(tmpdir, "foo")
@@ -554,4 +612,250 @@ def test_absolute_path?
       assert_file.absolute_path?("/foo/bar\\baz")
     end
   end
+
+  class NewlineConvTests < Test::Unit::TestCase
+    TEST_STRING_WITH_CRLF = "line1\r\nline2\r\n".freeze
+    TEST_STRING_WITH_LF = "line1\nline2\n".freeze
+
+    def setup
+      @tmpdir = Dir.mktmpdir(self.class.name)
+      @read_path_with_crlf = File.join(@tmpdir, "read_path_with_crlf")
+      File.binwrite(@read_path_with_crlf, TEST_STRING_WITH_CRLF)
+      @read_path_with_lf = File.join(@tmpdir, "read_path_with_lf")
+      File.binwrite(@read_path_with_lf, TEST_STRING_WITH_LF)
+      @write_path = File.join(@tmpdir, "write_path")
+      File.binwrite(@write_path, '')
+    end
+
+    def teardown
+      FileUtils.rm_rf @tmpdir
+    end
+
+    def windows?
+      /cygwin|mswin|mingw/ =~ RUBY_PLATFORM
+    end
+
+    def open_file_with(method, filename, mode)
+      read_or_write = mode.include?('w') ? :write : :read
+      binary_or_text = mode.include?('b') ? :binary : :text
+
+      f = case method
+      when :ruby_file_open
+        File.open(filename, mode)
+      when :c_rb_file_open
+        Bug::File::NewlineConv.rb_file_open(filename, read_or_write, binary_or_text)
+      when :c_rb_io_fdopen
+        Bug::File::NewlineConv.rb_io_fdopen(filename, read_or_write, binary_or_text)
+      else
+        raise "Don't know how to open with #{method}"
+      end
+
+      begin
+        yield f
+      ensure
+        f.close
+      end
+    end
+
+    def assert_file_contents_has_lf(f)
+      assert_equal TEST_STRING_WITH_LF, f.read
+    end
+
+    def assert_file_contents_has_crlf(f)
+      assert_equal TEST_STRING_WITH_CRLF, f.read
+    end
+
+    def assert_file_contents_has_lf_on_windows(f)
+      if windows?
+        assert_file_contents_has_lf(f)
+      else
+        assert_file_contents_has_crlf(f)
+      end
+    end
+
+    def assert_file_contents_has_crlf_on_windows(f)
+      if windows?
+        assert_file_contents_has_crlf(f)
+      else
+        assert_file_contents_has_lf(f)
+      end
+    end
+
+    def test_ruby_file_open_text_mode_read_crlf
+      open_file_with(:ruby_file_open, @read_path_with_crlf, 'r') { |f| assert_file_contents_has_lf_on_windows(f) }
+    end
+
+    def test_ruby_file_open_bin_mode_read_crlf
+      open_file_with(:ruby_file_open, @read_path_with_crlf, 'rb') { |f| assert_file_contents_has_crlf(f) }
+    end
+
+    def test_ruby_file_open_text_mode_read_lf
+      open_file_with(:ruby_file_open, @read_path_with_lf, 'r') { |f| assert_file_contents_has_lf(f) }
+    end
+
+    def test_ruby_file_open_bin_mode_read_lf
+      open_file_with(:ruby_file_open, @read_path_with_lf, 'rb') { |f| assert_file_contents_has_lf(f) }
+    end
+
+    def test_ruby_file_open_text_mode_read_crlf_with_utf8_encoding
+      open_file_with(:ruby_file_open, @read_path_with_crlf, 'r') do |f|
+        f.set_encoding Encoding::UTF_8, '-'
+        assert_file_contents_has_lf_on_windows(f)
+      end
+    end
+
+    def test_ruby_file_open_bin_mode_read_crlf_with_utf8_encoding
+      open_file_with(:ruby_file_open, @read_path_with_crlf, 'rb') do |f|
+        f.set_encoding Encoding::UTF_8, '-'
+        assert_file_contents_has_crlf(f)
+      end
+    end
+
+    def test_ruby_file_open_text_mode_read_lf_with_utf8_encoding
+      open_file_with(:ruby_file_open, @read_path_with_lf, 'r') do |f|
+        f.set_encoding Encoding::UTF_8, '-'
+        assert_file_contents_has_lf(f)
+      end
+    end
+
+    def test_ruby_file_open_bin_mode_read_lf_with_utf8_encoding
+      open_file_with(:ruby_file_open, @read_path_with_lf, 'rb') do |f|
+        f.set_encoding Encoding::UTF_8, '-'
+        assert_file_contents_has_lf(f)
+      end
+    end
+
+    def test_ruby_file_open_text_mode_write_lf
+      open_file_with(:ruby_file_open, @write_path, 'w') { |f| f.write TEST_STRING_WITH_LF }
+      File.open(@write_path, 'rb') { |f| assert_file_contents_has_crlf_on_windows(f) }
+    end
+
+    def test_ruby_file_open_bin_mode_write_lf
+      open_file_with(:ruby_file_open, @write_path, 'wb') { |f| f.write TEST_STRING_WITH_LF }
+      File.open(@write_path, 'rb') { |f| assert_file_contents_has_lf(f) }
+    end
+
+    def test_ruby_file_open_bin_mode_write_crlf
+      open_file_with(:ruby_file_open, @write_path, 'wb') { |f| f.write TEST_STRING_WITH_CRLF }
+      File.open(@write_path, 'rb') { |f| assert_file_contents_has_crlf(f) }
+    end
+
+    def test_c_rb_file_open_text_mode_read_crlf
+      open_file_with(:c_rb_file_open, @read_path_with_crlf, 'r') { |f| assert_file_contents_has_lf_on_windows(f) }
+    end
+
+    def test_c_rb_file_open_bin_mode_read_crlf
+      open_file_with(:c_rb_file_open, @read_path_with_crlf, 'rb') { |f| assert_file_contents_has_crlf(f) }
+    end
+
+    def test_c_rb_file_open_text_mode_read_lf
+      open_file_with(:c_rb_file_open, @read_path_with_lf, 'r') { |f| assert_file_contents_has_lf(f) }
+    end
+
+    def test_c_rb_file_open_bin_mode_read_lf
+      open_file_with(:c_rb_file_open, @read_path_with_lf, 'rb') { |f| assert_file_contents_has_lf(f) }
+    end
+
+    def test_c_rb_file_open_text_mode_write_lf
+      open_file_with(:c_rb_file_open, @write_path, 'w') { |f| f.write TEST_STRING_WITH_LF }
+      File.open(@write_path, 'rb') { |f| assert_file_contents_has_crlf_on_windows(f) }
+    end
+
+    def test_c_rb_file_open_bin_mode_write_lf
+      open_file_with(:c_rb_file_open, @write_path, 'wb') { |f| f.write TEST_STRING_WITH_LF }
+      File.open(@write_path, 'rb') { |f| assert_file_contents_has_lf(f) }
+    end
+
+    def test_c_rb_file_open_bin_mode_write_crlf
+      open_file_with(:c_rb_file_open, @write_path, 'wb') { |f| f.write TEST_STRING_WITH_CRLF }
+      File.open(@write_path, 'rb') { |f| assert_file_contents_has_crlf(f) }
+    end
+
+    def test_c_rb_file_open_text_mode_read_crlf_with_utf8_encoding
+      open_file_with(:c_rb_file_open, @read_path_with_crlf, 'r') do |f|
+        f.set_encoding Encoding::UTF_8, '-'
+        assert_file_contents_has_lf_on_windows(f)
+      end
+    end
+
+    def test_c_rb_file_open_bin_mode_read_crlf_with_utf8_encoding
+      open_file_with(:c_rb_file_open, @read_path_with_crlf, 'rb') do |f|
+        f.set_encoding Encoding::UTF_8, '-'
+        assert_file_contents_has_crlf(f)
+      end
+    end
+
+    def test_c_rb_file_open_text_mode_read_lf_with_utf8_encoding
+      open_file_with(:c_rb_file_open, @read_path_with_lf, 'r') do |f|
+        f.set_encoding Encoding::UTF_8, '-'
+        assert_file_contents_has_lf(f)
+      end
+    end
+
+    def test_c_rb_file_open_bin_mode_read_lf_with_utf8_encoding
+      open_file_with(:c_rb_file_open, @read_path_with_lf, 'rb') do |f|
+        f.set_encoding Encoding::UTF_8, '-'
+        assert_file_contents_has_lf(f)
+      end
+    end
+
+    def test_c_rb_io_fdopen_text_mode_read_crlf
+      open_file_with(:c_rb_io_fdopen, @read_path_with_crlf, 'r') { |f| assert_file_contents_has_lf_on_windows(f) }
+    end
+
+    def test_c_rb_io_fdopen_bin_mode_read_crlf
+      open_file_with(:c_rb_io_fdopen, @read_path_with_crlf, 'rb') { |f| assert_file_contents_has_crlf(f) }
+    end
+
+    def test_c_rb_io_fdopen_text_mode_read_lf
+      open_file_with(:c_rb_io_fdopen, @read_path_with_lf, 'r') { |f| assert_file_contents_has_lf(f) }
+    end
+
+    def test_c_rb_io_fdopen_bin_mode_read_lf
+      open_file_with(:c_rb_io_fdopen, @read_path_with_lf, 'rb') { |f| assert_file_contents_has_lf(f) }
+    end
+
+    def test_c_rb_io_fdopen_text_mode_write_lf
+      open_file_with(:c_rb_io_fdopen, @write_path, 'w') { |f| f.write TEST_STRING_WITH_LF }
+      File.open(@write_path, 'rb') { |f| assert_file_contents_has_crlf_on_windows(f) }
+    end
+
+    def test_c_rb_io_fdopen_bin_mode_write_lf
+      open_file_with(:c_rb_io_fdopen, @write_path, 'wb') { |f| f.write TEST_STRING_WITH_LF }
+      File.open(@write_path, 'rb') { |f| assert_file_contents_has_lf(f) }
+    end
+
+    def test_c_rb_io_fdopen_bin_mode_write_crlf
+      open_file_with(:c_rb_io_fdopen, @write_path, 'wb') { |f| f.write TEST_STRING_WITH_CRLF }
+      File.open(@write_path, 'rb') { |f| assert_file_contents_has_crlf(f) }
+    end
+
+    def test_c_rb_io_fdopen_text_mode_read_crlf_with_utf8_encoding
+      open_file_with(:c_rb_io_fdopen, @read_path_with_crlf, 'r') do |f|
+        f.set_encoding Encoding::UTF_8, '-'
+        assert_file_contents_has_lf_on_windows(f)
+      end
+    end
+
+    def test_c_rb_io_fdopen_bin_mode_read_crlf_with_utf8_encoding
+      open_file_with(:c_rb_io_fdopen, @read_path_with_crlf, 'rb') do |f|
+        f.set_encoding Encoding::UTF_8, '-'
+        assert_file_contents_has_crlf(f)
+      end
+    end
+
+    def test_c_rb_io_fdopen_text_mode_read_lf_with_utf8_encoding
+      open_file_with(:c_rb_io_fdopen, @read_path_with_lf, 'r') do |f|
+        f.set_encoding Encoding::UTF_8, '-'
+        assert_file_contents_has_lf(f)
+      end
+    end
+
+    def test_c_rb_io_fdopen_bin_mode_read_lf_with_utf8_encoding
+      open_file_with(:c_rb_io_fdopen, @read_path_with_lf, 'rb') do |f|
+        f.set_encoding Encoding::UTF_8, '-'
+        assert_file_contents_has_lf(f)
+      end
+    end
+  end
 end
diff --git a/test/ruby/test_file_exhaustive.rb b/test/ruby/test_file_exhaustive.rb
index fbb18f07f9ab5f..bb64483a795203 100644
--- a/test/ruby/test_file_exhaustive.rb
+++ b/test/ruby/test_file_exhaustive.rb
@@ -6,7 +6,8 @@
 require '-test-/file'
 
 class TestFileExhaustive < Test::Unit::TestCase
-  DRIVE = Dir.pwd[%r'\A(?:[a-z]:|//[^/]+/[^/]+)'i]
+  ROOT_REGEXP = %r'\A(?:[a-z]:(?=(/))|//[^/]+/[^/]+)'i
+  DRIVE = Dir.pwd[ROOT_REGEXP]
   POSIX = /cygwin|mswin|bccwin|mingw|emx/ !~ RUBY_PLATFORM
   NTFS = !(/mingw|mswin|bccwin/ !~ RUBY_PLATFORM)
 
@@ -186,6 +187,12 @@ def blockdev
     @blockdev
   end
 
+  def root_without_capabilities?
+    return false unless Process.uid == 0
+    return false unless system('command', '-v', 'capsh', out: File::NULL)
+    !system('capsh', '--has-p=CAP_DAC_OVERRIDE', out: File::NULL, err: File::NULL)
+  end
+
   def test_path
     [regular_file, utf8_file].each do |file|
       assert_equal(file, File.open(file) {|f| f.path})
@@ -1272,9 +1279,10 @@ def test_dirname
     assert_equal(regular_file, File.dirname(regular_file, 0))
     assert_equal(@dir, File.dirname(regular_file, 1))
     assert_equal(File.dirname(@dir), File.dirname(regular_file, 2))
-    return if /mswin/ =~ RUBY_PLATFORM && ENV.key?('GITHUB_ACTIONS') # rootdir and tmpdir are in different drives
-    assert_equal(rootdir, File.dirname(regular_file, regular_file.count('/')))
     assert_raise(ArgumentError) {File.dirname(regular_file, -1)}
+    root = "#{@dir[ROOT_REGEXP]||?/}#{$1}"
+    assert_equal(root, File.dirname(regular_file, regular_file.count('/')))
+    assert_equal(root, File.dirname(regular_file, regular_file.count('/') + 100))
   end
 
   def test_dirname_encoding
@@ -1409,7 +1417,7 @@ def test_truncate
   def test_flock_exclusive
     omit "[Bug #18613]" if /freebsd/ =~ RUBY_PLATFORM
 
-    timeout = EnvUtil.apply_timeout_scale(0.1).to_s
+    timeout = EnvUtil.apply_timeout_scale(1).to_s
     File.open(regular_file, "r+") do |f|
       f.flock(File::LOCK_EX)
       assert_separately(["-rtimeout", "-", regular_file, timeout], "#{<<-"begin;"}\n#{<<-'end;'}")
@@ -1440,7 +1448,7 @@ def test_flock_exclusive
   def test_flock_shared
     omit "[Bug #18613]" if /freebsd/ =~ RUBY_PLATFORM
 
-    timeout = EnvUtil.apply_timeout_scale(0.1).to_s
+    timeout = EnvUtil.apply_timeout_scale(1).to_s
     File.open(regular_file, "r+") do |f|
       f.flock(File::LOCK_SH)
       assert_separately(["-rtimeout", "-", regular_file, timeout], "#{<<-"begin;"}\n#{<<-'end;'}")
@@ -1538,8 +1546,17 @@ def test_test
       assert_equal(stat.size?, File.size?(f), f)
       assert_bool_equal(stat.socket?, File.socket?(f), f)
       assert_bool_equal(stat.setuid?, File.setuid?(f), f)
-      assert_bool_equal(stat.writable?, File.writable?(f), f)
-      assert_bool_equal(stat.writable_real?, File.writable_real?(f), f)
+      # It's possible in Linux to be uid 0, but not to have the CAP_DAC_OVERRIDE
+      # capability that allows skipping file permissions checks (e.g. some kinds
+      # of "rootless" container setups). In these cases, stat.writable? will be
+      # true (because it always returns true if Process.uid == 0), but
+      # File.writeable? will be false (because it actually asks the kernel to do
+      # an access check).
+      # Skip these two assertions in that case.
+      unless root_without_capabilities?
+        assert_bool_equal(stat.writable?, File.writable?(f), f)
+        assert_bool_equal(stat.writable_real?, File.writable_real?(f), f)
+      end
       assert_bool_equal(stat.executable?, File.executable?(f), f)
       assert_bool_equal(stat.executable_real?, File.executable_real?(f), f)
       assert_bool_equal(stat.zero?, File.zero?(f), f)
diff --git a/test/ruby/test_float.rb b/test/ruby/test_float.rb
index b91b904d1e070c..b865d339a96341 100644
--- a/test/ruby/test_float.rb
+++ b/test/ruby/test_float.rb
@@ -129,9 +129,9 @@ def test_strtod
     assert_in_delta(a, 0, Float::EPSILON)
     a = Float("-.0")
     assert_in_delta(a, 0, Float::EPSILON)
-    assert_raise(ArgumentError){Float("0.")}
-    assert_raise(ArgumentError){Float("+0.")}
-    assert_raise(ArgumentError){Float("-0.")}
+    assert_equal(0.0, Float("0."))
+    assert_equal(0.0, Float("+0."))
+    assert_equal(0.0, Float("-0."))
     assert_raise(ArgumentError){Float(".")}
     assert_raise(ArgumentError){Float("+")}
     assert_raise(ArgumentError){Float("+.")}
@@ -139,12 +139,12 @@ def test_strtod
     assert_raise(ArgumentError){Float("-.")}
     assert_raise(ArgumentError){Float("1e")}
     assert_raise(ArgumentError){Float("1__1")}
-    assert_raise(ArgumentError){Float("1.")}
-    assert_raise(ArgumentError){Float("1.e+00")}
-    assert_raise(ArgumentError){Float("0x.1")}
-    assert_raise(ArgumentError){Float("0x1.")}
-    assert_raise(ArgumentError){Float("0x1.0")}
-    assert_raise(ArgumentError){Float("0x1.p+0")}
+    assert_equal(1.0, Float("1."))
+    assert_equal(1.0, Float("1.e+00"))
+    assert_equal(0.0625, Float("0x.1"))
+    assert_equal(1.0, Float("0x1."))
+    assert_equal(1.0, Float("0x1.0"))
+    assert_equal(1.0, Float("0x1.p+0"))
     # add expected behaviour here.
     assert_equal(10, Float("1_0"))
 
@@ -191,7 +191,7 @@ def test_strtod
         break
       end
     end
-    assert_nil(x, ->{"%a" % x})
+    assert_equal(1.0, x, ->{"%a" % x})
   end
 
   def test_divmod
@@ -530,6 +530,10 @@ def test_floor_with_precision
     assert_raise(TypeError) {1.0.floor(nil)}
     def (prec = Object.new).to_int; 2; end
     assert_equal(0.99, 0.998.floor(prec))
+
+    assert_equal(-10000000000, -1.0.floor(-10), "[Bug #20654]")
+    assert_equal(-100000000000000000000, -1.0.floor(-20), "[Bug #20654]")
+    assert_equal(-100000000000000000000000000000000000000000000000000, -1.0.floor(-50), "[Bug #20654]")
   end
 
   def test_ceil_with_precision
@@ -557,6 +561,10 @@ def test_ceil_with_precision
     assert_raise(TypeError) {1.0.ceil(nil)}
     def (prec = Object.new).to_int; 2; end
     assert_equal(0.99, 0.981.ceil(prec))
+
+    assert_equal(10000000000, 1.0.ceil(-10), "[Bug #20654]")
+    assert_equal(100000000000000000000, 1.0.ceil(-20), "[Bug #20654]")
+    assert_equal(100000000000000000000000000000000000000000000000000, 1.0.ceil(-50), "[Bug #20654]")
   end
 
   def test_truncate_with_precision
@@ -825,11 +833,15 @@ def test_Float
     assert_equal(15, Float('0xf'))
     assert_equal(15, Float('0xfp0'))
     assert_raise(ArgumentError) { Float('0xfp') }
-    assert_raise(ArgumentError) { Float('0xf.') }
+    assert_equal(15, Float('0xf.'))
     assert_raise(ArgumentError) { Float('0xf.p') }
-    assert_raise(ArgumentError) { Float('0xf.p0') }
-    assert_raise(ArgumentError) { Float('0xf.f') }
+    assert_equal(15, Float('0xf.p0'))
+    assert_equal(15.9375, Float('0xf.f'))
     assert_raise(ArgumentError) { Float('0xf.fp') }
+    assert_equal(0x10a, Float("0x1_0a"))
+    assert_equal(1.625, Float("0x1.a_0"))
+    assert_equal(3.25, Float("0x1.ap0_1"))
+    assert_raise(ArgumentError) { Float("0x1.ap0a") }
     begin
       verbose_bak, $VERBOSE = $VERBOSE, nil
       assert_equal(Float::INFINITY, Float('0xf.fp1000000000000000'))
@@ -842,6 +854,14 @@ def test_Float
     o = Object.new
     def o.to_f; inf = Float::INFINITY; inf/inf; end
     assert_predicate(Float(o), :nan?)
+
+    assert_raise(Encoding::CompatibilityError) {Float("0".encode("utf-16be"))}
+    assert_raise(Encoding::CompatibilityError) {Float("0".encode("utf-16le"))}
+    assert_raise(Encoding::CompatibilityError) {Float("0".encode("utf-32be"))}
+    assert_raise(Encoding::CompatibilityError) {Float("0".encode("utf-32le"))}
+    assert_raise(Encoding::CompatibilityError) {Float("0".encode("iso-2022-jp"))}
+
+    assert_raise_with_message(ArgumentError, /\u{1f4a1}/) {Float("\u{1f4a1}")}
   end
 
   def test_invalid_str
diff --git a/test/ruby/test_gc.rb b/test/ruby/test_gc.rb
index 0b4062e99f946c..85022cbc4d8924 100644
--- a/test/ruby/test_gc.rb
+++ b/test/ruby/test_gc.rb
@@ -40,16 +40,94 @@ def use_rgengc?
   end
 
   def test_enable_disable
+    EnvUtil.without_gc do
+      GC.enable
+      assert_equal(false, GC.enable)
+      assert_equal(false, GC.disable)
+      assert_equal(true, GC.disable)
+      assert_equal(true, GC.disable)
+      assert_nil(GC.start)
+      assert_equal(true, GC.enable)
+      assert_equal(false, GC.enable)
+    end
+  end
+
+  def test_gc_config_full_mark_by_default
+    config = GC.config
+    assert_not_empty(config)
+    assert_true(config[:rgengc_allow_full_mark])
+  end
+
+  def test_gc_config_invalid_args
+    assert_raise(ArgumentError) { GC.config(0) }
+  end
+
+  def test_gc_config_setting_returns_updated_config_hash
+    old_value = GC.config[:rgengc_allow_full_mark]
+    assert_true(old_value)
+
+    new_value = GC.config(rgengc_allow_full_mark: false)[:rgengc_allow_full_mark]
+    assert_false(new_value)
+    new_value = GC.config(rgengc_allow_full_mark: nil)[:rgengc_allow_full_mark]
+    assert_false(new_value)
+  ensure
+    GC.config(rgengc_allow_full_mark: old_value)
+    GC.start
+  end
+
+  def test_gc_config_setting_returns_nil_for_missing_keys
+    missing_value = GC.config(no_such_key: true)[:no_such_key]
+    assert_nil(missing_value)
+  ensure
+    GC.config(full_mark: true)
+    GC.start
+  end
+
+  def test_gc_config_disable_major
     GC.enable
-    assert_equal(false, GC.enable)
-    assert_equal(false, GC.disable)
-    assert_equal(true, GC.disable)
-    assert_equal(true, GC.disable)
+    GC.start
+
+    GC.config(rgengc_allow_full_mark: false)
+    major_count = GC.stat[:major_gc_count]
+    minor_count = GC.stat[:minor_gc_count]
+
+    arr = []
+    (GC.stat_heap[0][:heap_eden_slots] * 2).times do
+      arr << Object.new
+      Object.new
+    end
+
+    assert_equal(major_count, GC.stat[:major_gc_count])
+    assert_operator(minor_count, :<=, GC.stat[:minor_gc_count])
     assert_nil(GC.start)
-    assert_equal(true, GC.enable)
-    assert_equal(false, GC.enable)
   ensure
-    GC.enable
+    GC.config(rgengc_allow_full_mark: true)
+    GC.start
+  end
+
+  def test_gc_config_disable_major_gc_start_always_works
+    GC.config(full_mark: false)
+
+    major_count = GC.stat[:major_gc_count]
+    GC.start
+
+    assert_operator(major_count, :<, GC.stat[:major_gc_count])
+  ensure
+    GC.config(full_mark: true)
+    GC.start
+  end
+
+  def test_gc_config_implementation
+    omit unless /darwin|linux/.match(RUBY_PLATFORM)
+
+    gc_name = (ENV['RUBY_GC_LIBRARY'] || "default")
+    assert_equal gc_name, GC.config[:implementation]
+  end
+
+  def test_gc_config_implementation_is_readonly
+    omit unless /darwin|linux/.match(RUBY_PLATFORM)
+
+    assert_raise(ArgumentError) { GC.config(implementation: "somethingelse") }
   end
 
   def test_start_full_mark
@@ -131,10 +209,9 @@ def test_stat_constraints
     # marking_time + sweeping_time could differ from time by 1 because they're stored in nanoseconds
     assert_in_delta stat[:time], stat[:marking_time] + stat[:sweeping_time], 1
     assert_equal stat[:total_allocated_pages], stat[:heap_allocated_pages] + stat[:total_freed_pages]
-    assert_operator stat[:heap_sorted_length], :>=, stat[:heap_eden_pages] + stat[:heap_allocatable_pages], "stat is: " + stat.inspect
     assert_equal stat[:heap_available_slots], stat[:heap_live_slots] + stat[:heap_free_slots] + stat[:heap_final_slots]
     assert_equal stat[:heap_live_slots], stat[:total_allocated_objects] - stat[:total_freed_objects] - stat[:heap_final_slots]
-    assert_equal stat[:heap_allocated_pages], stat[:heap_eden_pages] + stat[:heap_tomb_pages]
+    assert_equal stat[:heap_allocated_pages], stat[:heap_eden_pages] + stat[:heap_empty_pages]
 
     if use_rgengc?
       assert_equal stat[:count], stat[:major_gc_count] + stat[:minor_gc_count]
@@ -150,18 +227,16 @@ def test_stat_heap
     GC.stat_heap(0, stat_heap)
     GC.stat(stat)
 
-    GC::INTERNAL_CONSTANTS[:SIZE_POOL_COUNT].times do |i|
-      GC.stat_heap(i, stat_heap)
-      GC.stat(stat)
+    GC::INTERNAL_CONSTANTS[:HEAP_COUNT].times do |i|
+      EnvUtil.without_gc do
+        GC.stat_heap(i, stat_heap)
+        GC.stat(stat)
+      end
 
-      assert_equal GC::INTERNAL_CONSTANTS[:RVALUE_SIZE] * (2**i), stat_heap[:slot_size]
-      assert_operator stat_heap[:heap_allocatable_pages], :<=, stat[:heap_allocatable_pages]
+      assert_equal (GC::INTERNAL_CONSTANTS[:BASE_SLOT_SIZE] + GC::INTERNAL_CONSTANTS[:RVALUE_OVERHEAD]) * (2**i), stat_heap[:slot_size]
       assert_operator stat_heap[:heap_eden_pages], :<=, stat[:heap_eden_pages]
       assert_operator stat_heap[:heap_eden_slots], :>=, 0
-      assert_operator stat_heap[:heap_tomb_pages], :<=, stat[:heap_tomb_pages]
-      assert_operator stat_heap[:heap_tomb_slots], :>=, 0
       assert_operator stat_heap[:total_allocated_pages], :>=, 0
-      assert_operator stat_heap[:total_freed_pages], :>=, 0
       assert_operator stat_heap[:force_major_gc_count], :>=, 0
       assert_operator stat_heap[:force_incremental_marking_finish_count], :>=, 0
       assert_operator stat_heap[:total_allocated_objects], :>=, 0
@@ -174,19 +249,18 @@ def test_stat_heap
     assert_equal stat_heap[:slot_size], GC.stat_heap(0)[:slot_size]
 
     assert_raise(ArgumentError) { GC.stat_heap(-1) }
-    assert_raise(ArgumentError) { GC.stat_heap(GC::INTERNAL_CONSTANTS[:SIZE_POOL_COUNT]) }
+    assert_raise(ArgumentError) { GC.stat_heap(GC::INTERNAL_CONSTANTS[:HEAP_COUNT]) }
   end
 
   def test_stat_heap_all
     stat_heap_all = {}
     stat_heap = {}
+    # Initialize to prevent GC in future calls
+    GC.stat_heap(0, stat_heap)
+    GC.stat_heap(nil, stat_heap_all)
 
-    2.times do
-      GC.stat_heap(0, stat_heap)
+    GC::INTERNAL_CONSTANTS[:HEAP_COUNT].times do |i|
       GC.stat_heap(nil, stat_heap_all)
-    end
-
-    GC::INTERNAL_CONSTANTS[:SIZE_POOL_COUNT].times do |i|
       GC.stat_heap(i, stat_heap)
 
       # Remove keys that can vary between invocations
@@ -215,22 +289,35 @@ def test_stat_heap_constraints
       hash.each { |k, v| stat_heap_sum[k] += v }
     end
 
-    assert_equal stat[:heap_allocatable_pages], stat_heap_sum[:heap_allocatable_pages]
     assert_equal stat[:heap_eden_pages], stat_heap_sum[:heap_eden_pages]
-    assert_equal stat[:heap_tomb_pages], stat_heap_sum[:heap_tomb_pages]
-    assert_equal stat[:heap_available_slots], stat_heap_sum[:heap_eden_slots] + stat_heap_sum[:heap_tomb_slots]
-    assert_equal stat[:total_allocated_pages], stat_heap_sum[:total_allocated_pages]
-    assert_equal stat[:total_freed_pages], stat_heap_sum[:total_freed_pages]
+    assert_equal stat[:heap_available_slots], stat_heap_sum[:heap_eden_slots]
     assert_equal stat[:total_allocated_objects], stat_heap_sum[:total_allocated_objects]
     assert_equal stat[:total_freed_objects], stat_heap_sum[:total_freed_objects]
   end
 
+  def test_measure_total_time
+    assert_separately([], __FILE__, __LINE__, <<~RUBY)
+      GC.measure_total_time = false
+
+      time_before = GC.stat(:time)
+
+      # Generate some garbage
+      Random.new.bytes(100 * 1024 * 1024)
+      GC.start
+
+      time_after = GC.stat(:time)
+
+      # If time measurement is disabled, the time stat should not change
+      assert_equal time_before, time_after
+    RUBY
+  end
+
   def test_latest_gc_info
     omit 'stress' if GC.stress
 
     assert_separately([], __FILE__, __LINE__, <<-'RUBY')
       GC.start
-      count = GC.stat(:heap_free_slots) + GC.stat(:heap_allocatable_pages) * GC::INTERNAL_CONSTANTS[:HEAP_PAGE_OBJ_LIMIT]
+      count = GC.stat(:heap_free_slots) + GC.stat(:heap_allocatable_slots)
       count.times{ "a" + "b" }
       assert_equal :newobj, GC.latest_gc_info[:gc_by]
     RUBY
@@ -269,25 +356,29 @@ def test_latest_gc_info_need_major_by
     3.times { GC.start }
     assert_nil GC.latest_gc_info(:need_major_by)
 
-    # allocate objects until need_major_by is set or major GC happens
-    objects = []
-    while GC.latest_gc_info(:need_major_by).nil?
-      objects.append(100.times.map { '*' })
-    end
+    EnvUtil.without_gc do
+      # allocate objects until need_major_by is set or major GC happens
+      objects = []
+      while GC.latest_gc_info(:need_major_by).nil?
+        objects.append(100.times.map { '*' })
+        GC.start(full_mark: false)
+      end
 
-    # We need to ensure that no GC gets ran before the call to GC.start since
-    # it would trigger a major GC. Assertions could allocate objects and
-    # trigger a GC so we don't run assertions until we perform the major GC.
-    need_major_by = GC.latest_gc_info(:need_major_by)
-    GC.start(full_mark: false) # should be upgraded to major
-    major_by = GC.latest_gc_info(:major_by)
+      # We need to ensure that no GC gets ran before the call to GC.start since
+      # it would trigger a major GC. Assertions could allocate objects and
+      # trigger a GC so we don't run assertions until we perform the major GC.
+      need_major_by = GC.latest_gc_info(:need_major_by)
+      GC.start(full_mark: false) # should be upgraded to major
+      major_by = GC.latest_gc_info(:major_by)
 
-    assert_not_nil(need_major_by)
-    assert_not_nil(major_by)
+      assert_not_nil(need_major_by)
+      assert_not_nil(major_by)
+    end
   end
 
   def test_latest_gc_info_weak_references_count
     assert_separately([], __FILE__, __LINE__, <<~RUBY)
+      GC.disable
       count = 10_000
       # Some weak references may be created, so allow some margin of error
       error_tolerance = 100
@@ -302,11 +393,10 @@ def test_latest_gc_info_weak_references_count
 
       # Create some objects and place it in a WeakMap
       wmap = ObjectSpace::WeakMap.new
-      ary = Array.new(count)
-      count.times do |i|
+      ary = Array.new(count) do |i|
         obj = Object.new
-        ary[i] = obj
         wmap[obj] = nil
+        obj
       end
 
       # Run full GC to collect stats about weak references
@@ -319,6 +409,8 @@ def test_latest_gc_info_weak_references_count
       before_weak_references_count = GC.latest_gc_info(:weak_references_count)
       before_retained_weak_references_count = GC.latest_gc_info(:retained_weak_references_count)
 
+      # Clear ary, so if ary itself is somewhere on the stack, it won't hold all references
+      ary.clear
       ary = nil
 
       # Free ary, which should empty out the wmap
@@ -326,7 +418,8 @@ def test_latest_gc_info_weak_references_count
       # Run full GC again to collect stats about weak references
       GC.start
 
-      assert_equal(0, wmap.size)
+      # Sometimes the WeakMap has a few elements, which might be held on by registers.
+      assert_operator(wmap.size, :<=, count / 1000)
 
       assert_operator(GC.latest_gc_info(:weak_references_count), :<=, before_weak_references_count - count + error_tolerance)
       assert_operator(GC.latest_gc_info(:retained_weak_references_count), :<=, before_retained_weak_references_count - count + error_tolerance)
@@ -440,114 +533,42 @@ def test_gc_parameter
   end
 
   def test_gc_parameter_init_slots
-    assert_separately([], __FILE__, __LINE__, <<~RUBY)
+    omit "[Bug #21203] This test is flaky and intermittently failing now"
+
+    assert_separately([], __FILE__, __LINE__, <<~RUBY, timeout: 60)
       # Constant from gc.c.
       GC_HEAP_INIT_SLOTS = 10_000
-      GC.stat_heap.each do |_, s|
-        multiple = s[:slot_size] / (GC::INTERNAL_CONSTANTS[:BASE_SLOT_SIZE] + GC::INTERNAL_CONSTANTS[:RVALUE_OVERHEAD])
-        # Allocatable pages are assumed to have lost 1 slot due to alignment.
-        slots_per_page = (GC::INTERNAL_CONSTANTS[:HEAP_PAGE_OBJ_LIMIT] / multiple) - 1
 
-        total_slots = s[:heap_eden_slots] + s[:heap_allocatable_pages] * slots_per_page
-        assert_operator(total_slots, :>=, GC_HEAP_INIT_SLOTS, s)
+      gc_count = GC.stat(:count)
+      # Fill up all of the size pools to the init slots
+      GC::INTERNAL_CONSTANTS[:HEAP_COUNT].times do |i|
+        capa = (GC.stat_heap(i, :slot_size) - GC::INTERNAL_CONSTANTS[:RVALUE_OVERHEAD] - (2 * RbConfig::SIZEOF["void*"])) / RbConfig::SIZEOF["void*"]
+        while GC.stat_heap(i, :heap_eden_slots) < GC_HEAP_INIT_SLOTS
+          Array.new(capa)
+        end
       end
+
+      assert_equal gc_count, GC.stat(:count)
     RUBY
 
     env = {}
-    # Make the heap big enough to ensure the heap never needs to grow.
-    sizes = GC.stat_heap.keys.reverse.map { |i| (i + 1) * 100_000 }
+    sizes = GC.stat_heap.keys.reverse.map { 20_000 }
     GC.stat_heap.keys.each do |heap|
       env["RUBY_GC_HEAP_#{heap}_INIT_SLOTS"] = sizes[heap].to_s
     end
-    assert_separately([env, "-W0"], __FILE__, __LINE__, <<~RUBY)
-      SIZES = #{sizes}
-      GC.stat_heap.each do |i, s|
-        multiple = s[:slot_size] / (GC::INTERNAL_CONSTANTS[:BASE_SLOT_SIZE] + GC::INTERNAL_CONSTANTS[:RVALUE_OVERHEAD])
-        # Allocatable pages are assumed to have lost 1 slot due to alignment.
-        slots_per_page = (GC::INTERNAL_CONSTANTS[:HEAP_PAGE_OBJ_LIMIT] / multiple) - 1
-
-        total_slots = s[:heap_eden_slots] + s[:heap_allocatable_pages] * slots_per_page
-
-        # The delta is calculated as follows:
-        #  - For allocated pages, each page can vary by 1 slot due to alignment.
-        #  - For allocatable pages, we can end up with at most 1 extra page of slots.
-        assert_in_delta(SIZES[i], total_slots, s[:heap_eden_pages] + slots_per_page, s)
-      end
-    RUBY
-
-    # Check that the configured sizes are "remembered" across GC invocations.
-    assert_separately([env, "-W0"], __FILE__, __LINE__, <<~RUBY)
-      SIZES = #{sizes}
-
-      # Fill size pool 0 with transient objects.
-      ary = []
-      while GC.stat_heap(0, :heap_allocatable_pages) != 0
-        ary << Object.new
-      end
-      ary.clear
-      ary = nil
-
-      # Clear all the objects that were allocated.
-      GC.start
-
-      # Check that we still have the same number of slots as initially configured.
-      GC.stat_heap.each do |i, s|
-        multiple = s[:slot_size] / (GC::INTERNAL_CONSTANTS[:BASE_SLOT_SIZE] + GC::INTERNAL_CONSTANTS[:RVALUE_OVERHEAD])
-        # Allocatable pages are assumed to have lost 1 slot due to alignment.
-        slots_per_page = (GC::INTERNAL_CONSTANTS[:HEAP_PAGE_OBJ_LIMIT] / multiple) - 1
-
-        total_slots = s[:heap_eden_slots] + s[:heap_allocatable_pages] * slots_per_page
-
-        # The delta is calculated as follows:
-        #  - For allocated pages, each page can vary by 1 slot due to alignment.
-        #  - For allocatable pages, we can end up with at most 1 extra page of slots.
-        assert_in_delta(SIZES[i], total_slots, s[:heap_eden_pages] + slots_per_page, s)
-      end
-    RUBY
-
-    # Check that we don't grow the heap in minor GC if we have alloctable pages.
-    env["RUBY_GC_HEAP_FREE_SLOTS_MIN_RATIO"] = "0.3"
-    env["RUBY_GC_HEAP_FREE_SLOTS_GOAL_RATIO"] = "0.99"
-    env["RUBY_GC_HEAP_FREE_SLOTS_MAX_RATIO"] = "1.0"
-    env["RUBY_GC_HEAP_OLDOBJECT_LIMIT_FACTOR"] = "100" # Large value to disable major GC
-    assert_separately([env, "-W0"], __FILE__, __LINE__, <<~RUBY)
+    assert_separately([env, "-W0"], __FILE__, __LINE__, <<~RUBY, timeout: 60)
       SIZES = #{sizes}
 
-      # Run a major GC to clear out dead objects.
-      GC.start
-
-      # Disable GC so we can control when GC is ran.
-      GC.disable
-
-      # Run minor GC enough times so that we don't grow the heap because we
-      # haven't yet ran RVALUE_OLD_AGE minor GC cycles.
-      GC::INTERNAL_CONSTANTS[:RVALUE_OLD_AGE].times { GC.start(full_mark: false) }
-
-      # Fill size pool 0 to over 50% full so that the number of allocatable
-      # pages that will be created will be over the number in heap_allocatable_pages
-      # (calculated using RUBY_GC_HEAP_FREE_SLOTS_MIN_RATIO).
-      # 70% was chosen here to guarantee that.
-      ary = []
-      while GC.stat_heap(0, :heap_allocatable_pages) >
-          (GC.stat_heap(0, :heap_allocatable_pages) + GC.stat_heap(0, :heap_eden_pages)) * 0.3
-        ary << Object.new
+      gc_count = GC.stat(:count)
+      # Fill up all of the size pools to the init slots
+      GC::INTERNAL_CONSTANTS[:HEAP_COUNT].times do |i|
+        capa = (GC.stat_heap(i, :slot_size) - GC::INTERNAL_CONSTANTS[:RVALUE_OVERHEAD] - (2 * RbConfig::SIZEOF["void*"])) / RbConfig::SIZEOF["void*"]
+        while GC.stat_heap(i, :heap_eden_slots) < SIZES[i]
+          Array.new(capa)
+        end
       end
 
-      GC.start(full_mark: false)
-
-      # Check that we still have the same number of slots as initially configured.
-      GC.stat_heap.each do |i, s|
-        multiple = s[:slot_size] / (GC::INTERNAL_CONSTANTS[:BASE_SLOT_SIZE] + GC::INTERNAL_CONSTANTS[:RVALUE_OVERHEAD])
-        # Allocatable pages are assumed to have lost 1 slot due to alignment.
-        slots_per_page = (GC::INTERNAL_CONSTANTS[:HEAP_PAGE_OBJ_LIMIT] / multiple) - 1
-
-        total_slots = s[:heap_eden_slots] + s[:heap_allocatable_pages] * slots_per_page
-
-        # The delta is calculated as follows:
-        #  - For allocated pages, each page can vary by 1 slot due to alignment.
-        #  - For allocatable pages, we can end up with at most 1 extra page of slots.
-        assert_in_delta(SIZES[i], total_slots, s[:heap_eden_pages] + slots_per_page, s)
-      end
+      assert_equal gc_count, GC.stat(:count)
     RUBY
   end
 
@@ -577,6 +598,14 @@ def test_profiler_clear
     RUBY
   end
 
+  def test_profiler_raw_data
+    GC::Profiler.enable
+    GC.start
+    assert GC::Profiler.raw_data
+  ensure
+    GC::Profiler.disable
+  end
+
   def test_profiler_total_time
     GC::Profiler.enable
     GC::Profiler.clear
@@ -615,15 +644,26 @@ def test_expand_heap
   def test_thrashing_for_young_objects
     # This test prevents bugs like [Bug #18929]
 
-    assert_separately([], __FILE__, __LINE__, <<-'RUBY')
+    assert_separately([], __FILE__, __LINE__, <<-'RUBY', timeout: 60)
       # Grow the heap
       @ary = 100_000.times.map { Object.new }
 
       # Warmup to make sure heap stabilizes
       1_000_000.times { Object.new }
 
-      before_stats = GC.stat
+      # We need to pre-allocate all the hashes for GC.stat calls, because
+      # otherwise the call to GC.stat/GC.stat_heap itself could cause a new
+      # page to be allocated and the before/after assertions will fail
+      before_stats = {}
+      after_stats = {}
+      # stat_heap needs a hash of hashes for each heap; easiest way to get the
+      # right shape for that is just to call stat_heap with no argument
       before_stat_heap = GC.stat_heap
+      after_stat_heap = GC.stat_heap
+
+      # Now collect the actual stats
+      GC.stat before_stats
+      GC.stat_heap nil, before_stat_heap
 
       1_000_000.times { Object.new }
 
@@ -631,24 +671,50 @@ def test_thrashing_for_young_objects
       # running a minor GC here will guarantee that GC will be complete
       GC.start(full_mark: false)
 
-      after_stats = GC.stat
-      after_stat_heap = GC.stat_heap
+      GC.stat after_stats
+      GC.stat_heap nil, after_stat_heap
 
       # Debugging output to for failures in trunk-repeat50@phosphorus-docker
       debug_msg = "before_stats: #{before_stats}\nbefore_stat_heap: #{before_stat_heap}\nafter_stats: #{after_stats}\nafter_stat_heap: #{after_stat_heap}"
 
       # Should not be thrashing in page creation
       assert_equal before_stats[:heap_allocated_pages], after_stats[:heap_allocated_pages], debug_msg
-      assert_equal 0, after_stats[:heap_tomb_pages], debug_msg
       assert_equal 0, after_stats[:total_freed_pages], debug_msg
       # Only young objects, so should not trigger major GC
       assert_equal before_stats[:major_gc_count], after_stats[:major_gc_count], debug_msg
     RUBY
   end
 
+  def test_heaps_grow_independently
+    # [Bug #21214]
+
+    assert_separately([], __FILE__, __LINE__, <<-'RUBY', timeout: 60)
+      COUNT = 1_000_000
+
+      def allocate_small_object = []
+      def allocate_large_object = Array.new(10)
+
+      @arys = Array.new(COUNT) do
+        # Allocate 10 small transient objects
+        10.times { allocate_small_object }
+        # Allocate 1 large object that is persistent
+        allocate_large_object
+      end
+
+      # Running GC here is required to prevent this test from being flaky because
+      # the heap for the small transient objects may not have been cleared by the
+      # GC causing heap_available_slots to be slightly over 2 * COUNT.
+      GC.start
+
+      heap_available_slots = GC.stat(:heap_available_slots)
+
+      assert_operator(heap_available_slots, :<, COUNT * 2, "GC.stat: #{GC.stat}\nGC.stat_heap: #{GC.stat_heap}")
+    RUBY
+  end
+
   def test_gc_internals
     assert_not_nil GC::INTERNAL_CONSTANTS[:HEAP_PAGE_OBJ_LIMIT]
-    assert_not_nil GC::INTERNAL_CONSTANTS[:RVALUE_SIZE]
+    assert_not_nil GC::INTERNAL_CONSTANTS[:BASE_SLOT_SIZE]
   end
 
   def test_sweep_in_finalizer
@@ -694,7 +760,7 @@ def test_interrupt_in_finalizer
         ObjectSpace.define_finalizer(Object.new, f)
       end
     end;
-    out, err, status = assert_in_out_err(["-e", src], "", [], [], bug10595, signal: :SEGV) do |*result|
+    out, err, status = assert_in_out_err(["-e", src], "", [], [], bug10595, signal: :SEGV, timeout: 100) do |*result|
       break result
     end
     unless /mswin|mingw/ =~ RUBY_PLATFORM
@@ -739,13 +805,17 @@ def test_gc_stress_at_startup
   end
 
   def test_gc_disabled_start
-    begin
-      disabled = GC.disable
+    EnvUtil.without_gc do
       c = GC.count
       GC.start
       assert_equal 1, GC.count - c
-    ensure
-      GC.enable unless disabled
+    end
+
+    EnvUtil.without_gc do
+      c = GC.count
+      GC.start(immediate_mark: false, immediate_sweep: false)
+      10_000.times { Object.new }
+      assert_equal 1, GC.count - c
     end
   end
 
@@ -794,6 +864,15 @@ def self.c2(x)
         obj = nil
       end
     end;
+
+    assert_normal_exit "#{<<~"begin;"}\n#{<<~'end;'}", '[Bug #20042]'
+    begin;
+      def (f = Object.new).call = nil # missing ID
+      o = Object.new
+      ObjectSpace.define_finalizer(o, f)
+      o = nil
+      GC.start
+    end;
   end
 
   def test_object_ids_never_repeat
@@ -811,28 +890,26 @@ def test_ast_node_buffer
   end
 
   def test_old_to_young_reference
-    original_gc_disabled = GC.disable
+    EnvUtil.without_gc do
+      require "objspace"
 
-    require "objspace"
+      old_obj = Object.new
+      4.times { GC.start }
 
-    old_obj = Object.new
-    4.times { GC.start }
+      assert_include ObjectSpace.dump(old_obj), '"old":true'
 
-    assert_include ObjectSpace.dump(old_obj), '"old":true'
+      young_obj = Object.new
+      old_obj.instance_variable_set(:@test, young_obj)
 
-    young_obj = Object.new
-    old_obj.instance_variable_set(:@test, young_obj)
+      # Not immediately promoted to old generation
+      3.times do
+        assert_not_include ObjectSpace.dump(young_obj), '"old":true'
+        GC.start
+      end
 
-    # Not immediately promoted to old generation
-    3.times do
-      assert_not_include ObjectSpace.dump(young_obj), '"old":true'
+      # Takes 4 GC to promote to old generation
       GC.start
+      assert_include ObjectSpace.dump(young_obj), '"old":true'
     end
-
-    # Takes 4 GC to promote to old generation
-    GC.start
-    assert_include ObjectSpace.dump(young_obj), '"old":true'
-  ensure
-    GC.enable if !original_gc_disabled
   end
 end
diff --git a/test/ruby/test_gc_compact.rb b/test/ruby/test_gc_compact.rb
index 8a3f1f145d5492..3eaa93dfaea0bb 100644
--- a/test/ruby/test_gc_compact.rb
+++ b/test/ruby/test_gc_compact.rb
@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 require 'test/unit'
-require 'fiddle'
-require 'etc'
 
 if RUBY_PLATFORM =~ /s390x/
   warn "Currently, it is known that the compaction does not work well on s390x; contribution is welcome https://github.com/ruby/ruby/pull/5077"
@@ -10,8 +8,8 @@
 
 class TestGCCompact < Test::Unit::TestCase
   module CompactionSupportInspector
-    def supports_auto_compact?
-      GC::OPTS.include?("GC_COMPACTION_SUPPORTED")
+    def supports_compact?
+      GC.respond_to?(:compact)
     end
   end
 
@@ -19,7 +17,7 @@ module OmitUnlessCompactSupported
     include CompactionSupportInspector
 
     def setup
-      omit "autocompact not supported on this platform" unless supports_auto_compact?
+      omit "GC compaction not supported on this platform" unless supports_compact?
       super
     end
   end
@@ -85,7 +83,7 @@ class CompactMethodsNotImplemented < Test::Unit::TestCase
     include CompactionSupportInspector
 
     def assert_not_implemented(method, *args)
-      omit "autocompact is supported on this platform" if supports_auto_compact?
+      omit "autocompact is supported on this platform" if supports_compact?
 
       assert_raise(NotImplementedError) { GC.send(method, *args) }
       refute(GC.respond_to?(method), "GC.#{method} should be defined as rb_f_notimplement")
@@ -112,10 +110,6 @@ def test_gc_verify_compaction_references_not_implemented
     end
   end
 
-  def os_page_size
-    return true unless defined?(Etc::SC_PAGE_SIZE)
-  end
-
   def test_gc_compact_stats
     list = []
 
@@ -130,10 +124,6 @@ def test_gc_compact_stats
     refute_predicate compact_stats[:moved], :empty?
   end
 
-  def memory_location(obj)
-    (Fiddle.dlwrap(obj) >> 1)
-  end
-
   def big_list(level = 10)
     if level > 0
       big_list(level - 1)
@@ -146,21 +136,6 @@ def big_list(level = 10)
     end
   end
 
-  # Find an object that's allocated in a slot that had a previous
-  # tenant, and that tenant moved and is still alive
-  def find_object_in_recycled_slot(addresses)
-    new_object = nil
-
-    100_000.times do
-      new_object = Object.new
-      if addresses.index memory_location(new_object)
-        break
-      end
-    end
-
-    new_object
-  end
-
   def test_complex_hash_keys
     list_of_objects = big_list
     hash = list_of_objects.hash
@@ -171,7 +146,7 @@ def test_complex_hash_keys
   end
 
   def test_ast_compacts
-    assert_separately([], "#{<<~"begin;"}\n#{<<~"end;"}", timeout: 10, signal: :SEGV)
+    assert_separately([], "#{<<~"begin;"}\n#{<<~"end;"}", timeout: 10)
     begin;
       def walk_ast ast
         children = ast.children.grep(RubyVM::AbstractSyntaxTree::Node)
@@ -210,7 +185,7 @@ def obj.tracee
   end
 
   def test_updating_references_for_heap_allocated_shared_arrays
-    assert_separately(%w[-robjspace], "#{<<~"begin;"}\n#{<<~"end;"}", timeout: 10, signal: :SEGV)
+    assert_separately(%w[-robjspace], "#{<<~"begin;"}\n#{<<~"end;"}", timeout: 10)
     begin;
       ary = []
       50.times { |i| ary << i }
@@ -234,7 +209,7 @@ def test_updating_references_for_heap_allocated_shared_arrays
   def test_updating_references_for_embed_shared_arrays
     omit if GC::INTERNAL_CONSTANTS[:SIZE_POOL_COUNT] == 1
 
-    assert_separately(%w[-robjspace], "#{<<~"begin;"}\n#{<<~"end;"}", timeout: 10, signal: :SEGV)
+    assert_separately(%w[-robjspace], "#{<<~"begin;"}\n#{<<~"end;"}", timeout: 10)
     begin;
       ary = Array.new(50)
       50.times { |i| ary[i] = i }
@@ -258,7 +233,7 @@ def test_updating_references_for_embed_shared_arrays
   end
 
   def test_updating_references_for_heap_allocated_frozen_shared_arrays
-    assert_separately(%w[-robjspace], "#{<<~"begin;"}\n#{<<~"end;"}", timeout: 10, signal: :SEGV)
+    assert_separately(%w[-robjspace], "#{<<~"begin;"}\n#{<<~"end;"}", timeout: 10)
     begin;
       ary = []
       50.times { |i| ary << i }
@@ -283,7 +258,7 @@ def test_updating_references_for_heap_allocated_frozen_shared_arrays
   def test_updating_references_for_embed_frozen_shared_arrays
     omit if GC::INTERNAL_CONSTANTS[:SIZE_POOL_COUNT] == 1
 
-    assert_separately(%w[-robjspace], "#{<<~"begin;"}\n#{<<~"end;"}", timeout: 10, signal: :SEGV)
+    assert_separately(%w[-robjspace], "#{<<~"begin;"}\n#{<<~"end;"}", timeout: 10)
     begin;
       ary = Array.new(50)
       50.times { |i| ary[i] = i }
@@ -308,53 +283,56 @@ def test_updating_references_for_embed_frozen_shared_arrays
     end;
   end
 
-  def test_moving_arrays_down_size_pools
+  def test_moving_arrays_down_heaps
     omit if GC::INTERNAL_CONSTANTS[:SIZE_POOL_COUNT] == 1
 
-    assert_separately(%w[-robjspace], "#{<<~"begin;"}\n#{<<~"end;"}", timeout: 10, signal: :SEGV)
+    assert_separately(%w[-robjspace], "#{<<~"begin;"}\n#{<<~"end;"}", timeout: 10)
     begin;
-      ARY_COUNT = 500
+      ARY_COUNT = 50000
 
       GC.verify_compaction_references(expand_heap: true, toward: :empty)
 
-      arys = ARY_COUNT.times.map do
-        ary = "abbbbbbbbbb".chars
-        ary.uniq!
-      end
+      Fiber.new {
+        $arys = ARY_COUNT.times.map do
+          ary = "abbbbbbbbbb".chars
+          ary.uniq!
+        end
+      }.resume
 
       stats = GC.verify_compaction_references(expand_heap: true, toward: :empty)
-      assert_operator(stats.dig(:moved_down, :T_ARRAY) || 0, :>=, ARY_COUNT)
-      refute_empty(arys.keep_if { |o| ObjectSpace.dump(o).include?('"embedded":true') })
+      assert_operator(stats.dig(:moved_down, :T_ARRAY) || 0, :>=, ARY_COUNT - 10)
+      refute_empty($arys.keep_if { |o| ObjectSpace.dump(o).include?('"embedded":true') })
     end;
   end
 
-  def test_moving_arrays_up_size_pools
+  def test_moving_arrays_up_heaps
     omit if GC::INTERNAL_CONSTANTS[:SIZE_POOL_COUNT] == 1
 
-    assert_separately(%w[-robjspace], "#{<<~"begin;"}\n#{<<~"end;"}", timeout: 10, signal: :SEGV)
+    assert_separately(%w[-robjspace], "#{<<~"begin;"}\n#{<<~"end;"}", timeout: 10)
     begin;
-      ARY_COUNT = 500
+      ARY_COUNT = 50000
 
       GC.verify_compaction_references(expand_heap: true, toward: :empty)
 
-      ary = "hello".chars
-      arys = ARY_COUNT.times.map do
-        x = []
-        ary.each { |e| x << e }
-        x
-      end
+      Fiber.new {
+        ary = "hello".chars
+        $arys = ARY_COUNT.times.map do
+          x = []
+          ary.each { |e| x << e }
+          x
+        end
+      }.resume
 
       stats = GC.verify_compaction_references(expand_heap: true, toward: :empty)
-      assert_operator(stats.dig(:moved_up, :T_ARRAY) || 0, :>=, ARY_COUNT)
-      refute_empty(arys.keep_if { |o| ObjectSpace.dump(o).include?('"embedded":true') })
+      assert_operator(stats.dig(:moved_up, :T_ARRAY) || 0, :>=, ARY_COUNT - 10)
+      refute_empty($arys.keep_if { |o| ObjectSpace.dump(o).include?('"embedded":true') })
     end;
   end
 
-  def test_moving_objects_between_size_pools
+  def test_moving_objects_between_heaps
     omit if GC::INTERNAL_CONSTANTS[:SIZE_POOL_COUNT] == 1
-    omit "Flaky on Solaris" if /solaris/i =~ RUBY_PLATFORM
 
-    assert_separately(%w[-robjspace], "#{<<~"begin;"}\n#{<<~"end;"}", timeout: 10, signal: :SEGV)
+    assert_separately(%w[-robjspace], "#{<<~"begin;"}\n#{<<~"end;"}", timeout: 60)
     begin;
       class Foo
         def add_ivars
@@ -364,86 +342,90 @@ def add_ivars
         end
       end
 
-      OBJ_COUNT = 500
+      OBJ_COUNT = 50000
 
       GC.verify_compaction_references(expand_heap: true, toward: :empty)
 
-      ary = OBJ_COUNT.times.map { Foo.new }
-      ary.each(&:add_ivars)
+      Fiber.new {
+        $ary = OBJ_COUNT.times.map { Foo.new }
+        $ary.each(&:add_ivars)
 
-      GC.start
-      Foo.new.add_ivars
+        GC.start
+        Foo.new.add_ivars
+      }.resume
 
       stats = GC.verify_compaction_references(expand_heap: true, toward: :empty)
 
-      assert_operator(stats.dig(:moved_up, :T_OBJECT) || 0, :>=, OBJ_COUNT)
-      refute_empty(ary.keep_if { |o| ObjectSpace.dump(o).include?('"embedded":true') })
+      assert_operator(stats.dig(:moved_up, :T_OBJECT) || 0, :>=, OBJ_COUNT - 10)
+      refute_empty($ary.keep_if { |o| ObjectSpace.dump(o).include?('"embedded":true') })
     end;
   end
 
-  def test_moving_strings_up_size_pools
+  def test_moving_strings_up_heaps
     omit if GC::INTERNAL_CONSTANTS[:SIZE_POOL_COUNT] == 1
 
-    assert_separately(%w[-robjspace], "#{<<~"begin;"}\n#{<<~"end;"}", timeout: 10, signal: :SEGV)
+    assert_separately(%w[-robjspace], "#{<<~"begin;"}\n#{<<~"end;"}", timeout: 30)
     begin;
-      STR_COUNT = 500
+      STR_COUNT = 50000
 
       GC.verify_compaction_references(expand_heap: true, toward: :empty)
 
-      str = "a" * GC::INTERNAL_CONSTANTS[:BASE_SLOT_SIZE]
-      ary = STR_COUNT.times.map { "" << str }
+      Fiber.new {
+        str = "a" * GC::INTERNAL_CONSTANTS[:BASE_SLOT_SIZE] * 4
+        $ary = STR_COUNT.times.map { +"" << str }
+      }.resume
 
       stats = GC.verify_compaction_references(expand_heap: true, toward: :empty)
 
-      assert_operator(stats[:moved_up][:T_STRING], :>=, STR_COUNT)
-      refute_empty(ary.keep_if { |o| ObjectSpace.dump(o).include?('"embedded":true') })
+      assert_operator(stats[:moved_up][:T_STRING], :>=, STR_COUNT - 10)
+      refute_empty($ary.keep_if { |o| ObjectSpace.dump(o).include?('"embedded":true') })
     end;
   end
 
-  def test_moving_strings_down_size_pools
+  def test_moving_strings_down_heaps
     omit if GC::INTERNAL_CONSTANTS[:SIZE_POOL_COUNT] == 1
 
-    assert_separately(%w[-robjspace], "#{<<~"begin;"}\n#{<<~"end;"}", timeout: 10, signal: :SEGV)
+    assert_separately(%w[-robjspace], "#{<<~"begin;"}\n#{<<~"end;"}", timeout: 30)
     begin;
-      STR_COUNT = 500
+      STR_COUNT = 50000
 
       GC.verify_compaction_references(expand_heap: true, toward: :empty)
 
-      ary = STR_COUNT.times.map { ("a" * GC::INTERNAL_CONSTANTS[:BASE_SLOT_SIZE]).squeeze! }
+      Fiber.new {
+        $ary = STR_COUNT.times.map { ("a" * GC::INTERNAL_CONSTANTS[:BASE_SLOT_SIZE] * 4).squeeze! }
+      }.resume
 
       stats = GC.verify_compaction_references(expand_heap: true, toward: :empty)
 
-      assert_operator(stats[:moved_down][:T_STRING], :>=, STR_COUNT)
-      refute_empty(ary.keep_if { |o| ObjectSpace.dump(o).include?('"embedded":true') })
+      assert_operator(stats[:moved_down][:T_STRING], :>=, STR_COUNT - 10)
+      refute_empty($ary.keep_if { |o| ObjectSpace.dump(o).include?('"embedded":true') })
     end;
   end
 
-  def test_moving_hashes_down_size_pools
+  def test_moving_hashes_down_heaps
     omit if GC::INTERNAL_CONSTANTS[:SIZE_POOL_COUNT] == 1
     # AR and ST hashes are in the same size pool on 32 bit
     omit unless RbConfig::SIZEOF["uint64_t"] <= RbConfig::SIZEOF["void*"]
-    # This test fails on Solaris SPARC with the following error and I can't figure out why:
-    #   TestGCCompact#test_moving_hashes_down_size_pools
-    #   Expected 499 to be >= 500.
-    omit if /sparc-solaris/ =~ RUBY_PLATFORM
 
-    assert_separately(%w[-robjspace], "#{<<~"begin;"}\n#{<<~"end;"}", timeout: 10, signal: :SEGV)
+    assert_separately(%w[-robjspace], "#{<<~"begin;"}\n#{<<~"end;"}", timeout: 30)
     begin;
-      HASH_COUNT = 500
+      HASH_COUNT = 50000
 
       GC.verify_compaction_references(expand_heap: true, toward: :empty)
 
-      base_hash = { a: 1, b: 2, c: 3, d: 4, e: 5, f: 6, g: 7, h: 8 }
-      ary = HASH_COUNT.times.map { base_hash.dup }
-      ary.each { |h| h[:i] = 9 }
+      Fiber.new {
+        base_hash = { a: 1, b: 2, c: 3, d: 4, e: 5, f: 6, g: 7, h: 8 }
+        $ary = HASH_COUNT.times.map { base_hash.dup }
+        $ary.each_with_index { |h, i| h[:i] = 9 }
+      }.resume
 
       stats = GC.verify_compaction_references(expand_heap: true, toward: :empty)
 
-      assert_operator(stats[:moved_down][:T_HASH], :>=, 500)
+      assert_operator(stats[:moved_down][:T_HASH], :>=, HASH_COUNT - 10)
     end;
   end
 
-  def test_moving_objects_between_size_pools_keeps_shape_frozen_status
+  def test_moving_objects_between_heaps_keeps_shape_frozen_status
     # [Bug #19536]
     assert_separately([], "#{<<~"begin;"}\n#{<<~"end;"}")
     begin;
@@ -470,4 +452,21 @@ def set_a
       assert_raise(FrozenError) { a.set_a }
     end;
   end
+
+  def test_moving_too_complex_generic_ivar
+    omit "not compiled with SHAPE_DEBUG" unless defined?(RubyVM::Shape)
+
+    assert_separately([], <<~RUBY)
+      RubyVM::Shape.exhaust_shapes
+
+      obj = []
+      obj.instance_variable_set(:@fixnum, 123)
+      obj.instance_variable_set(:@str, "hello")
+
+      GC.verify_compaction_references(expand_heap: true, toward: :empty)
+
+      assert_equal(123, obj.instance_variable_get(:@fixnum))
+      assert_equal("hello", obj.instance_variable_get(:@str))
+    RUBY
+  end
 end
diff --git a/test/ruby/test_hash.rb b/test/ruby/test_hash.rb
index 9121f3539eac72..dbf041a7321252 100644
--- a/test/ruby/test_hash.rb
+++ b/test/ruby/test_hash.rb
@@ -4,7 +4,6 @@
 EnvUtil.suppress_warning {require 'continuation'}
 
 class TestHash < Test::Unit::TestCase
-
   def test_hash
     x = @cls[1=>2, 2=>4, 3=>6]
     y = @cls[1=>2, 2=>4, 3=>6] # y = {1, 2, 2, 4, 3, 6} # 1.9 doesn't support
@@ -85,20 +84,9 @@ def setup
       self => 'self', true => 'true', nil => 'nil',
       'nil' => nil
     ]
-    @verbose = $VERBOSE
   end
 
   def teardown
-    $VERBOSE = @verbose
-  end
-
-  def test_bad_initialize_copy
-    h = Class.new(Hash) {
-      def initialize_copy(h)
-        super(Object.new)
-      end
-    }.new
-    assert_raise(TypeError) { h.dup }
   end
 
   def test_clear_initialize_copy
@@ -113,35 +101,6 @@ def test_self_initialize_copy
     assert_equal(2, h[1])
   end
 
-  def test_dup_will_not_rehash
-    assert_hash_does_not_rehash(&:dup)
-  end
-
-  def assert_hash_does_not_rehash
-    obj = Object.new
-    class << obj
-      attr_accessor :hash_calls
-      def hash
-        @hash_calls += 1
-        super
-      end
-    end
-    obj.hash_calls = 0
-    hash = {obj => 42}
-    assert_equal(1, obj.hash_calls)
-    yield hash
-    assert_equal(1, obj.hash_calls)
-  end
-
-  def test_select_reject_will_not_rehash
-    assert_hash_does_not_rehash do |hash|
-      hash.select { true }
-    end
-    assert_hash_does_not_rehash do |hash|
-      hash.reject { false }
-    end
-  end
-
   def test_s_AREF_from_hash
     h = @cls["a" => 100, "b" => 200]
     assert_equal(100, h['a'])
@@ -220,7 +179,8 @@ def test_s_new
   end
 
   def test_st_literal_memory_leak
-    assert_no_memory_leak([], "", "#{<<~'end;'}", rss: true)
+    assert_no_memory_leak([], "", "#{<<~"begin;"}\n#{<<~'end;'}", rss: true)
+    begin;
       1_000_000.times do
         # >8 element hashes are ST allocated rather than AR allocated
         {a: 1, b: 2, c: 3, d: 4, e: 5, f: 6, g: 7, h: 8, i: 9}
@@ -303,78 +263,6 @@ def test_ASET # '[]='
     assert_equal(256,     h[z])
   end
 
-  def test_AREF_fstring_key
-    # warmup ObjectSpace.count_objects
-    ObjectSpace.count_objects
-
-    h = {"abc" => 1}
-    before = ObjectSpace.count_objects[:T_STRING]
-    5.times{ h["abc"] }
-    assert_equal before, ObjectSpace.count_objects[:T_STRING]
-  end
-
-  def test_AREF_fstring_key_default_proc
-    assert_separately([], "#{<<~"begin;"}\n#{<<~'end;'}")
-    begin;
-      h = Hash.new do |h, k|
-        k.frozen?
-      end
-
-      str = "foo"
-      refute str.frozen? # assumes this file is frozen_string_literal: false
-      refute h[str]
-      refute h["foo"]
-    end;
-  end
-
-  def test_ASET_fstring_key
-    a, b = {}, {}
-    assert_equal 1, a["abc"] = 1
-    assert_equal 1, b["abc"] = 1
-    assert_same a.keys[0], b.keys[0]
-  end
-
-  def test_ASET_fstring_non_literal_key
-    underscore = "_"
-    non_literal_strings = Proc.new{ ["abc#{underscore}def", "abc" * 5, "abc" + "def", "" << "ghi" << "jkl"] }
-
-    a, b = {}, {}
-    non_literal_strings.call.each do |string|
-      assert_equal 1, a[string] = 1
-    end
-
-    non_literal_strings.call.each do |string|
-      assert_equal 1, b[string] = 1
-    end
-
-    [a.keys, b.keys].transpose.each do |key_a, key_b|
-      assert_same key_a, key_b
-    end
-  end
-
-  def test_hash_aset_fstring_identity
-    h = {}.compare_by_identity
-    h['abc'] = 1
-    h['abc'] = 2
-    assert_equal 2, h.size, '[ruby-core:78783] [Bug #12855]'
-  end
-
-  def test_hash_aref_fstring_identity
-    h = {}.compare_by_identity
-    h['abc'] = 1
-    assert_nil h['abc'], '[ruby-core:78783] [Bug #12855]'
-  end
-
-  def test_NEWHASH_fstring_key
-    a = {"ABC" => :t}
-    b = {"ABC" => :t}
-    assert_same a.keys[0], b.keys[0]
-    assert_same "ABC".freeze, a.keys[0]
-    var = +'ABC'
-    c = { var => :t }
-    assert_same "ABC".freeze, c.keys[0]
-  end
-
   def test_EQUAL # '=='
     h1 = @cls[ "a" => 1, "c" => 2 ]
     h2 = @cls[ "a" => 1, "c" => 2, 7 => 35 ]
@@ -481,6 +369,10 @@ def test_delete_if
       end
     end
     assert_equal(base.dup, h)
+
+    h = base.dup
+    assert_same h, h.delete_if {h.assoc(nil); true}
+    assert_empty h
   end
 
   def test_keep_if
@@ -851,24 +743,6 @@ def test_replace_bug9230
     assert_predicate(h, :compare_by_identity?)
   end
 
-  def test_replace_bug15358
-    h1 = {}
-    h2 = {a:1,b:2,c:3,d:4,e:5}
-    h2.replace(h1)
-    GC.start
-    assert(true)
-  end
-
-  def test_replace_st_with_ar
-    # ST hash
-    h1 = { a: 1, b: 2, c: 3, d: 4, e: 5, f: 6, g: 7, h: 8, i: 9 }
-    # AR hash
-    h2 = { a: 1, b: 2, c: 3, d: 4, e: 5, f: 6, g: 7 }
-    # Replace ST hash with AR hash
-    h1.replace(h2)
-    assert_equal(h2, h1)
-  end
-
   def test_shift
     h = @h.dup
 
@@ -984,13 +858,6 @@ def test_to_h_block
     assert_instance_of(Hash, h)
   end
 
-  def test_nil_to_h
-    h = nil.to_h
-    assert_equal({}, h)
-    assert_nil(h.default)
-    assert_nil(h.default_proc)
-  end
-
   def test_to_s
     h = @cls[ 1 => 2, "cat" => "dog", 1.5 => :fred ]
     assert_equal(h.inspect, h.to_s)
@@ -1002,6 +869,35 @@ def test_to_s
     $, = nil
   end
 
+  def test_inspect
+    no_quote = '{a: 1, a!: 1, a?: 1}'
+    quote0 = '{"": 1}'
+    quote1 = '{"0": 1, "!": 1, "%": 1, "&": 1, "*": 1, "+": 1, "-": 1, "/": 1, "<": 1, ">": 1, "^": 1, "`": 1, "|": 1, "~": 1}'
+    quote2 = '{"@a": 1, "$a": 1, "+@": 1, "a=": 1, "[]": 1}'
+    quote3 = '{"a\"b": 1, "@@a": 1, "<=>": 1, "===": 1, "[]=": 1}'
+    assert_equal(no_quote, eval(no_quote).inspect)
+    assert_equal(quote0, eval(quote0).inspect)
+    assert_equal(quote1, eval(quote1).inspect)
+    assert_equal(quote2, eval(quote2).inspect)
+    assert_equal(quote3, eval(quote3).inspect)
+    begin
+      verbose_bak, $VERBOSE = $VERBOSE, nil
+      enc = Encoding.default_external
+      Encoding.default_external = Encoding::ASCII
+      utf8_ascii_hash = '{"\\u3042": 1}'
+      assert_equal(eval(utf8_ascii_hash).inspect, utf8_ascii_hash)
+      Encoding.default_external = Encoding::UTF_8
+      utf8_hash = "{\u3042: 1}"
+      assert_equal(eval(utf8_hash).inspect, utf8_hash)
+      Encoding.default_external = Encoding::Windows_31J
+      sjis_hash = "{\x87]: 1}".force_encoding('sjis')
+      assert_equal(eval(sjis_hash).inspect, sjis_hash)
+    ensure
+      Encoding.default_external = enc
+      $VERBOSE = verbose_bak
+    end
+  end
+
   def test_update
     h1 = @cls[ 1 => 2, 2 => 3, 3 => 4 ]
     h2 = @cls[ 2 => 'two', 4 => 'four' ]
@@ -1037,12 +933,6 @@ def test_values
     assert_equal([], expected - vals)
   end
 
-  def test_initialize_wrong_arguments
-    assert_raise(ArgumentError) do
-      Hash.new(0) { }
-    end
-  end
-
   def test_create
     assert_equal({1=>2, 3=>4}, @cls[[[1,2],[3,4]]])
     assert_raise(ArgumentError) { @cls[0, 1, 2] }
@@ -1324,15 +1214,6 @@ def test_replace2
     assert_raise(FrozenError) { h2.replace(42) }
   end
 
-  def test_replace_memory_leak
-    assert_no_memory_leak([], "#{<<-"begin;"}", "#{<<-'end;'}", rss: true)
-    h = ("aa".."zz").each_with_index.to_h
-    10_000.times {h.dup}
-    begin;
-      500_000.times {h.dup.replace(h)}
-    end;
-  end
-
   def test_size2
     assert_equal(0, @cls[].size)
   end
@@ -1416,6 +1297,26 @@ def test_update5
     assert_equal(@cls[a: 10, b: 2, c: 3, d: 4, e: 5, f: 6, g: 7, h: 8, i: 9, j: 10], h)
   end
 
+  def test_update_modify_in_block
+    a = @cls[]
+    (1..1337).each {|k| a[k] = k}
+    b = {1=>1338}
+    assert_raise_with_message(RuntimeError, /rehash during iteration/) do
+      a.update(b) {|k, o, n|
+        a.rehash
+      }
+    end
+  end
+
+  def test_update_on_identhash
+    key = +'a'
+    i = @cls[].compare_by_identity
+    i[key] = 0
+    h = @cls[].update(i)
+    key.upcase!
+    assert_equal(0, h.fetch('a'))
+  end
+
   def test_merge
     h1 = @cls[1=>2, 3=>4]
     h2 = {1=>3, 5=>7}
@@ -1438,10 +1339,10 @@ def test_merge_on_identhash
     expected[7] = 8
     h2 = h.merge(7=>8)
     assert_equal(expected, h2)
-    assert_equal(true, h2.compare_by_identity?)
+    assert_predicate(h2, :compare_by_identity?)
     h2 = h.merge({})
     assert_equal(h, h2)
-    assert_equal(true, h2.compare_by_identity?)
+    assert_predicate(h2, :compare_by_identity?)
 
     h = @cls[]
     h.compare_by_identity
@@ -1449,10 +1350,10 @@ def test_merge_on_identhash
     h1.compare_by_identity
     h2 = h.merge(7=>8)
     assert_equal(h1, h2)
-    assert_equal(true, h2.compare_by_identity?)
+    assert_predicate(h2, :compare_by_identity?)
     h2 = h.merge({})
     assert_equal(h, h2)
-    assert_equal(true, h2.compare_by_identity?)
+    assert_predicate(h2, :compare_by_identity?)
   end
 
   def test_merge!
@@ -1507,6 +1408,8 @@ def test_flatten_arity
   end
 
   def test_callcc
+    omit 'requires callcc support' unless respond_to?(:callcc)
+
     h = @cls[1=>2]
     c = nil
     f = false
@@ -1527,6 +1430,8 @@ def test_callcc
   end
 
   def test_callcc_iter_level
+    omit 'requires callcc support' unless respond_to?(:callcc)
+
     bug9105 = '[ruby-dev:47803] [Bug #9105]'
     h = @cls[1=>2, 3=>4]
     c = nil
@@ -1545,6 +1450,8 @@ def test_callcc_iter_level
   end
 
   def test_callcc_escape
+    omit 'requires callcc support' unless respond_to?(:callcc)
+
     bug9105 = '[ruby-dev:47803] [Bug #9105]'
     assert_nothing_raised(RuntimeError, bug9105) do
       h=@cls[]
@@ -1559,6 +1466,8 @@ def test_callcc_escape
   end
 
   def test_callcc_reenter
+    omit 'requires callcc support' unless respond_to?(:callcc)
+
     bug9105 = '[ruby-dev:47803] [Bug #9105]'
     assert_nothing_raised(RuntimeError, bug9105) do
       h = @cls[1=>2,3=>4]
@@ -1575,17 +1484,6 @@ def test_callcc_reenter
     end
   end
 
-  def hash_iter_recursion(h, level)
-    return if level == 0
-    h.each_key {}
-    h.each_value { hash_iter_recursion(h, level - 1) }
-  end
-
-  def test_iterlevel_in_ivar_bug19589
-    h = { a: nil }
-    hash_iter_recursion(h, 200)
-  end
-
   def test_threaded_iter_level
     bug9105 = '[ruby-dev:47807] [Bug #9105]'
     h = @cls[1=>2]
@@ -1617,6 +1515,16 @@ def test_compare_by_identity
     assert_predicate(h.dup, :compare_by_identity?, bug8703)
   end
 
+  def test_compare_by_identy_memory_leak
+    assert_no_memory_leak([], "", "#{<<~"begin;"}\n#{<<~'end;'}", "[Bug #20145]", rss: true)
+    begin;
+      h = { 1 => 2 }.compare_by_identity
+      1_000_000.times do
+        h.select { false }
+      end
+    end;
+  end
+
   def test_same_key
     bug9646 = '[ruby-dev:48047] [Bug #9646] Infinite loop at Hash#each'
     h = @cls[a=[], 1]
@@ -1747,155 +1655,46 @@ def test_recursive_hash_value_hash_array
     end
   end
 
-  def test_exception_in_rehash_memory_leak
-    return unless @cls == Hash
-
-    bug9187 = '[ruby-core:58728] [Bug #9187]'
-
-    prepare = <<-EOS
-    class Foo
-      def initialize
-        @raise = false
-      end
-
-      def hash
-        raise if @raise
-        @raise = true
-        return 0
-      end
+  def test_dig
+    h = @cls[a: @cls[b: [1, 2, 3]], c: 4]
+    assert_equal(1, h.dig(:a, :b, 0))
+    assert_nil(h.dig(:b, 1))
+    assert_raise(TypeError) {h.dig(:c, 1)}
+    o = Object.new
+    def o.dig(*args)
+      {dug: args}
     end
-    h = {Foo.new => true}
-    EOS
+    h[:d] = o
+    assert_equal({dug: [:foo, :bar]}, h.dig(:d, :foo, :bar))
+  end
 
-    code = <<-EOS
-    10_0000.times do
-      h.rehash rescue nil
+  def test_dig_with_respond_to
+    bug12030 = '[ruby-core:73556] [Bug #12030]'
+    o = Object.new
+    def o.respond_to?(*args)
+      super
     end
-    GC.start
-    EOS
-
-    assert_no_memory_leak([], prepare, code, bug9187)
+    assert_raise(TypeError, bug12030) {@cls[foo: o].dig(:foo, :foo)}
   end
 
-  def test_wrapper
-    bug9381 = '[ruby-core:59638] [Bug #9381]'
+  def test_cmp
+    h1 = @cls[a:1, b:2]
+    h2 = @cls[a:1, b:2, c:3]
 
-    wrapper = Class.new do
-      def initialize(obj)
-        @obj = obj
-      end
+    assert_operator(h1, :<=, h1)
+    assert_operator(h1, :<=, h2)
+    assert_not_operator(h2, :<=, h1)
+    assert_operator(h2, :<=, h2)
 
-      def hash
-        @obj.hash
-      end
+    assert_operator(h1, :>=, h1)
+    assert_not_operator(h1, :>=, h2)
+    assert_operator(h2, :>=, h1)
+    assert_operator(h2, :>=, h2)
 
-      def eql?(other)
-        @obj.eql?(other)
-      end
-    end
-
-    bad = [
-      5, true, false, nil,
-      0.0, 1.72723e-77,
-      :foo, "dsym_#{self.object_id.to_s(16)}_#{Time.now.to_i.to_s(16)}".to_sym,
-      "str",
-    ].select do |x|
-      hash = {x => bug9381}
-      hash[wrapper.new(x)] != bug9381
-    end
-    assert_empty(bad, bug9381)
-  end
-
-  def assert_hash_random(obj, dump = obj.inspect)
-    a = [obj.hash.to_s]
-    3.times {
-      assert_in_out_err(["-e", "print (#{dump}).hash"], "") do |r, e|
-        a += r
-        assert_equal([], e)
-      end
-    }
-    assert_not_equal([obj.hash.to_s], a.uniq)
-    assert_operator(a.uniq.size, :>, 2, proc {a.inspect})
-  end
-
-  def test_string_hash_random
-    assert_hash_random('abc')
-  end
-
-  def test_symbol_hash_random
-    assert_hash_random(:-)
-    assert_hash_random(:foo)
-    assert_hash_random("dsym_#{self.object_id.to_s(16)}_#{Time.now.to_i.to_s(16)}".to_sym)
-  end
-
-  def test_integer_hash_random
-    assert_hash_random(0)
-    assert_hash_random(+1)
-    assert_hash_random(-1)
-    assert_hash_random(+(1<<100))
-    assert_hash_random(-(1<<100))
-  end
-
-  def test_float_hash_random
-    assert_hash_random(0.0)
-    assert_hash_random(+1.0)
-    assert_hash_random(-1.0)
-    assert_hash_random(1.72723e-77)
-    assert_hash_random(Float::INFINITY, "Float::INFINITY")
-  end
-
-  def test_label_syntax
-    return unless @cls == Hash
-
-    feature4935 = '[ruby-core:37553] [Feature #4935]'
-    x = 'world'
-    hash = assert_nothing_raised(SyntaxError, feature4935) do
-      break eval(%q({foo: 1, "foo-bar": 2, "hello-#{x}": 3, 'hello-#{x}': 4, 'bar': {}}))
-    end
-    assert_equal({:foo => 1, :'foo-bar' => 2, :'hello-world' => 3, :'hello-#{x}' => 4, :bar => {}}, hash, feature4935)
-    x = x
-  end
-
-  def test_dig
-    h = @cls[a: @cls[b: [1, 2, 3]], c: 4]
-    assert_equal(1, h.dig(:a, :b, 0))
-    assert_nil(h.dig(:b, 1))
-    assert_raise(TypeError) {h.dig(:c, 1)}
-    o = Object.new
-    def o.dig(*args)
-      {dug: args}
-    end
-    h[:d] = o
-    assert_equal({dug: [:foo, :bar]}, h.dig(:d, :foo, :bar))
-  end
-
-  def test_dig_with_respond_to
-    bug12030 = '[ruby-core:73556] [Bug #12030]'
-    o = Object.new
-    def o.respond_to?(*args)
-      super
-    end
-    assert_raise(TypeError, bug12030) {{foo: o}.dig(:foo, :foo)}
-  end
-
-  def test_cmp
-    h1 = {a:1, b:2}
-    h2 = {a:1, b:2, c:3}
-
-    assert_operator(h1, :<=, h1)
-    assert_operator(h1, :<=, h2)
-    assert_not_operator(h2, :<=, h1)
-    assert_operator(h2, :<=, h2)
-
-    assert_operator(h1, :>=, h1)
-    assert_not_operator(h1, :>=, h2)
-    assert_operator(h2, :>=, h1)
-    assert_operator(h2, :>=, h2)
-
-    assert_not_operator(h1, :<, h1)
-    assert_operator(h1, :<, h2)
-    assert_not_operator(h2, :<, h1)
-    assert_not_operator(h2, :<, h2)
+    assert_not_operator(h1, :<, h1)
+    assert_operator(h1, :<, h2)
+    assert_not_operator(h2, :<, h1)
+    assert_not_operator(h2, :<, h2)
 
     assert_not_operator(h1, :>, h1)
     assert_not_operator(h1, :>, h2)
@@ -1904,8 +1703,8 @@ def test_cmp
   end
 
   def test_cmp_samekeys
-    h1 = {a:1}
-    h2 = {a:2}
+    h1 = @cls[a:1]
+    h2 = @cls[a:2]
 
     assert_operator(h1, :<=, h1)
     assert_not_operator(h1, :<=, h2)
@@ -1929,15 +1728,15 @@ def test_cmp_samekeys
   end
 
   def test_to_proc
-    h = {
+    h = @cls[
       1 => 10,
       2 => 20,
       3 => 30,
-    }
+    ]
 
     assert_equal([10, 20, 30], [1, 2, 3].map(&h))
 
-    assert_equal(true, h.to_proc.lambda?)
+    assert_predicate(h.to_proc, :lambda?)
   end
 
   def test_transform_keys
@@ -2065,22 +1864,14 @@ def test_transform_values_bang
       end
     end
     assert_equal(@cls[a: 2, b: 2, c: 3, d: 4, e: 5, f: 6, g: 7, h: 8, i: 9, j: 10], x)
-  end
-
-  def test_broken_hash_value
-    bug14218 = '[ruby-core:84395] [Bug #14218]'
-
-    assert_equal(0, 1_000_000.times.count{a=Object.new.hash; b=Object.new.hash; a < 0 && b < 0 && a + b > 0}, bug14218)
-    assert_equal(0, 1_000_000.times.count{a=Object.new.hash; b=Object.new.hash; 0 + a + b != 0 + b + a}, bug14218)
-  end
 
-  def test_reserved_hash_val
-    s = Struct.new(:hash)
-    h = {}
-    keys = [*0..8]
-    keys.each {|i| h[s.new(i)]=true}
-    msg = proc {h.inspect}
-    assert_equal(keys, h.keys.map(&:hash), msg)
+    x = (1..1337).to_h {|k| [k, k]}
+    assert_raise_with_message(RuntimeError, /rehash during iteration/) do
+      x.transform_values! {|v|
+        x.rehash if v == 1337
+        v * 2
+      }
+    end
   end
 
   def hrec h, n, &b
@@ -2112,6 +1903,27 @@ def test_huge_iter_level
     # ignore
   end
 
+  # Previously this test would fail because rb_hash inside opt_aref would look
+  # at the current method name
+  def test_hash_recursion_independent_of_mid
+    o = Class.new do
+      def hash(h, k)
+        h[k]
+      end
+
+      def any_other_name(h, k)
+        h[k]
+      end
+    end.new
+
+    rec = []; rec << rec
+
+    h = @cls[]
+    h[rec] = 1
+    assert o.hash(h, rec)
+    assert o.any_other_name(h, rec)
+  end
+
   class TestSubHash < TestHash
     class SubHash < Hash
     end
@@ -2121,6 +1933,346 @@ def setup
       super
     end
   end
+end
+
+class TestHashOnly < Test::Unit::TestCase
+  def test_bad_initialize_copy
+    h = Class.new(Hash) {
+      def initialize_copy(h)
+        super(Object.new)
+      end
+    }.new
+    assert_raise(TypeError) { h.dup }
+  end
+
+  def test_dup_will_not_rehash
+    assert_hash_does_not_rehash(&:dup)
+  end
+
+  def assert_hash_does_not_rehash
+    obj = Object.new
+    class << obj
+      attr_accessor :hash_calls
+      def hash
+        @hash_calls += 1
+        super
+      end
+    end
+    obj.hash_calls = 0
+    hash = {obj => 42}
+    assert_equal(1, obj.hash_calls)
+    yield hash
+    assert_equal(1, obj.hash_calls)
+  end
+
+  def test_select_reject_will_not_rehash
+    assert_hash_does_not_rehash do |hash|
+      hash.select { true }
+    end
+    assert_hash_does_not_rehash do |hash|
+      hash.reject { false }
+    end
+  end
+
+  def test_st_literal_memory_leak
+    assert_no_memory_leak([], "", "#{<<~"begin;"}\n#{<<~'end;'}", rss: true)
+    begin;
+      1_000_000.times do
+        # >8 element hashes are ST allocated rather than AR allocated
+        {a: 1, b: 2, c: 3, d: 4, e: 5, f: 6, g: 7, h: 8, i: 9}
+      end
+    end;
+  end
+
+  def test_compare_by_id_memory_leak
+    assert_no_memory_leak([], "", <<~RUBY, rss: true)
+      1_000_000.times do
+        {a: 1, b: 2, c: 3, d: 4, e: 5, f: 6, g: 7, h: 8}.compare_by_identity
+      end
+    RUBY
+  end
+
+  def test_try_convert
+    assert_equal({1=>2}, Hash.try_convert({1=>2}))
+    assert_equal(nil, Hash.try_convert("1=>2"))
+    o = Object.new
+    def o.to_hash; {3=>4} end
+    assert_equal({3=>4}, Hash.try_convert(o))
+  end
+
+  def test_AREF_fstring_key
+    # warmup ObjectSpace.count_objects
+    ObjectSpace.count_objects
+
+    h = {"abc" => 1}
+
+    EnvUtil.without_gc do
+      before = ObjectSpace.count_objects[:T_STRING]
+      5.times{ h["abc"] }
+      assert_equal before, ObjectSpace.count_objects[:T_STRING]
+    end
+  end
+
+  def test_AREF_fstring_key_default_proc
+    assert_separately(['--disable-frozen-string-literal'], "#{<<~"begin;"}\n#{<<~'end;'}")
+    begin;
+      h = Hash.new do |h, k|
+        k.frozen?
+      end
+
+      str = "foo"
+      refute str.frozen?
+      refute h[str]
+      refute h["foo"]
+    end;
+  end
+
+  def test_ASET_fstring_key
+    a, b = {}, {}
+    assert_equal 1, a["abc"] = 1
+    assert_equal 1, b["abc"] = 1
+    assert_same a.keys[0], b.keys[0]
+  end
+
+  def test_ASET_fstring_non_literal_key
+    underscore = "_"
+    non_literal_strings = Proc.new{ ["abc#{underscore}def", "abc" * 5, "abc" + "def", "" << "ghi" << "jkl"] }
+
+    a, b = {}, {}
+    non_literal_strings.call.each do |string|
+      assert_equal 1, a[string] = 1
+    end
+
+    non_literal_strings.call.each do |string|
+      assert_equal 1, b[string] = 1
+    end
+
+    [a.keys, b.keys].transpose.each do |key_a, key_b|
+      assert_same key_a, key_b
+    end
+  end
+
+  def test_hash_aset_fstring_identity
+    h = {}.compare_by_identity
+    h['abc'] = 1
+    h['abc'] = 2
+    assert_equal 2, h.size, '[ruby-core:78783] [Bug #12855]'
+  end
+
+  def test_hash_aref_fstring_identity
+    h = {}.compare_by_identity
+    h['abc'] = 1
+    assert_nil h['abc'], '[ruby-core:78783] [Bug #12855]'
+  end
+
+  def test_NEWHASH_fstring_key
+    a = {"ABC" => :t}
+    b = {"ABC" => :t}
+    assert_same a.keys[0], b.keys[0]
+    assert_same "ABC".freeze, a.keys[0]
+    var = +'ABC'
+    c = { var => :t }
+    assert_same "ABC".freeze, c.keys[0]
+  end
+
+  def test_rehash_memory_leak
+    assert_no_memory_leak([], <<~PREP, <<~CODE, rss: true)
+      ar_hash = 1.times.map { |i| [i, i] }.to_h
+      st_hash = 10.times.map { |i| [i, i] }.to_h
+
+      code = proc do
+        ar_hash.rehash
+        st_hash.rehash
+      end
+      1_000.times(&code)
+    PREP
+      1_000_000.times(&code)
+    CODE
+  end
+
+  def test_replace_bug15358
+    h1 = {}
+    h2 = {a:1,b:2,c:3,d:4,e:5}
+    h2.replace(h1)
+    GC.start
+    assert(true)
+  end
+
+  def test_replace_st_with_ar
+    # ST hash
+    h1 = { a: 1, b: 2, c: 3, d: 4, e: 5, f: 6, g: 7, h: 8, i: 9 }
+    # AR hash
+    h2 = { a: 1, b: 2, c: 3, d: 4, e: 5, f: 6, g: 7 }
+    # Replace ST hash with AR hash
+    h1.replace(h2)
+    assert_equal(h2, h1)
+  end
+
+  def test_nil_to_h
+    h = nil.to_h
+    assert_equal({}, h)
+    assert_nil(h.default)
+    assert_nil(h.default_proc)
+  end
+
+  def test_initialize_wrong_arguments
+    assert_raise(ArgumentError) do
+      Hash.new(0) { }
+    end
+  end
+
+  def test_replace_memory_leak
+    assert_no_memory_leak([], "#{<<-"begin;"}", "#{<<-'end;'}", rss: true)
+    h = ("aa".."zz").each_with_index.to_h
+    10_000.times {h.dup}
+    begin;
+      500_000.times {h.dup.replace(h)}
+    end;
+  end
+
+  def hash_iter_recursion(h, level)
+    return if level == 0
+    h.each_key {}
+    h.each_value { hash_iter_recursion(h, level - 1) }
+  end
+
+  def test_iterlevel_in_ivar_bug19589
+    h = { a: nil }
+    # Recursion level should be over 127 to actually test iterlevel being set in an instance variable,
+    # but it should be under 131 not to overflow the stack under MN threads/ractors.
+    hash_iter_recursion(h, 130)
+    assert true
+  end
+
+  def test_exception_in_rehash_memory_leak
+    bug9187 = '[ruby-core:58728] [Bug #9187]'
+
+    prepare = <<-EOS
+    class Foo
+      def initialize
+        @raise = false
+      end
+
+      def hash
+        raise if @raise
+        @raise = true
+        return 0
+      end
+    end
+    h = {Foo.new => true}
+    EOS
+
+    code = <<-EOS
+    10_0000.times do
+      h.rehash rescue nil
+    end
+    GC.start
+    EOS
+
+    assert_no_memory_leak([], prepare, code, bug9187)
+  end
+
+  def test_memory_size_after_delete
+    require 'objspace'
+    h = {}
+    1000.times {|i| h[i] = true}
+    big = ObjectSpace.memsize_of(h)
+    1000.times {|i| h.delete(i)}
+    assert_operator ObjectSpace.memsize_of(h), :<, big/10
+  end
+
+  def test_wrapper
+    bug9381 = '[ruby-core:59638] [Bug #9381]'
+
+    wrapper = Class.new do
+      def initialize(obj)
+        @obj = obj
+      end
+
+      def hash
+        @obj.hash
+      end
+
+      def eql?(other)
+        @obj.eql?(other)
+      end
+    end
+
+    bad = [
+      5, true, false, nil,
+      0.0, 1.72723e-77,
+      :foo, "dsym_#{self.object_id.to_s(16)}_#{Time.now.to_i.to_s(16)}".to_sym,
+      "str",
+    ].select do |x|
+      hash = {x => bug9381}
+      hash[wrapper.new(x)] != bug9381
+    end
+    assert_empty(bad, bug9381)
+  end
+
+  def assert_hash_random(obj, dump = obj.inspect)
+    a = [obj.hash.to_s]
+    3.times {
+      assert_in_out_err(["-e", "print (#{dump}).hash"], "") do |r, e|
+        a += r
+        assert_equal([], e)
+      end
+    }
+    assert_not_equal([obj.hash.to_s], a.uniq)
+    assert_operator(a.uniq.size, :>, 2, proc {a.inspect})
+  end
+
+  def test_string_hash_random
+    assert_hash_random('abc')
+  end
+
+  def test_symbol_hash_random
+    assert_hash_random(:-)
+    assert_hash_random(:foo)
+    assert_hash_random("dsym_#{self.object_id.to_s(16)}_#{Time.now.to_i.to_s(16)}".to_sym)
+  end
+
+  def test_integer_hash_random
+    assert_hash_random(0)
+    assert_hash_random(+1)
+    assert_hash_random(-1)
+    assert_hash_random(+(1<<100))
+    assert_hash_random(-(1<<100))
+  end
+
+  def test_float_hash_random
+    assert_hash_random(0.0)
+    assert_hash_random(+1.0)
+    assert_hash_random(-1.0)
+    assert_hash_random(1.72723e-77)
+    assert_hash_random(Float::INFINITY, "Float::INFINITY")
+  end
+
+  def test_label_syntax
+    feature4935 = '[ruby-core:37553] [Feature #4935]'
+    x = 'world'
+    hash = assert_nothing_raised(SyntaxError, feature4935) do
+      break eval(%q({foo: 1, "foo-bar": 2, "hello-#{x}": 3, 'hello-#{x}': 4, 'bar': {}}))
+    end
+    assert_equal({:foo => 1, :'foo-bar' => 2, :'hello-world' => 3, :'hello-#{x}' => 4, :bar => {}}, hash, feature4935)
+    x = x
+  end
+
+  def test_broken_hash_value
+    bug14218 = '[ruby-core:84395] [Bug #14218]'
+
+    assert_equal(0, 1_000_000.times.count{a=Object.new.hash; b=Object.new.hash; a < 0 && b < 0 && a + b > 0}, bug14218)
+    assert_equal(0, 1_000_000.times.count{a=Object.new.hash; b=Object.new.hash; 0 + a + b != 0 + b + a}, bug14218)
+  end
+
+  def test_reserved_hash_val
+    s = Struct.new(:hash)
+    h = {}
+    keys = [*0..8]
+    keys.each {|i| h[s.new(i)]=true}
+    msg = proc {h.inspect}
+    assert_equal(keys, h.keys.map(&:hash), msg)
+  end
 
   ruby2_keywords def get_flagged_hash(*args)
     args.last
@@ -2146,23 +2298,11 @@ def test_ruby2_keywords_hash
     assert_raise(TypeError) { Hash.ruby2_keywords_hash(1) }
   end
 
-  def test_ar2st
-    # insert
-    obj = Object.new
-    obj.instance_variable_set(:@h, h = {})
-    def obj.hash
-      10.times{|i| @h[i] = i}
-      0
+  def ar2st_object
+    class << (obj = Object.new)
+      attr_reader :h
     end
-    def obj.inspect
-      'test'
-    end
-    h[obj] = true
-    assert_equal '{0=>0, 1=>1, 2=>2, 3=>3, 4=>4, 5=>5, 6=>6, 7=>7, 8=>8, 9=>9, test=>true}', h.inspect
-
-    # delete
-    obj = Object.new
-    obj.instance_variable_set(:@h, h = {})
+    obj.instance_variable_set(:@h, {})
     def obj.hash
       10.times{|i| @h[i] = i}
       0
@@ -2173,6 +2313,21 @@ def obj.inspect
     def obj.eql? other
       other.class == Object
     end
+    obj
+  end
+
+  def test_ar2st_insert
+    obj = ar2st_object
+    h = obj.h
+
+    h[obj] = true
+    assert_equal '{0 => 0, 1 => 1, 2 => 2, 3 => 3, 4 => 4, 5 => 5, 6 => 6, 7 => 7, 8 => 8, 9 => 9, test => true}', h.inspect
+  end
+
+  def test_ar2st_delete
+    obj = ar2st_object
+    h = obj.h
+
     obj2 = Object.new
     def obj2.hash
       0
@@ -2180,21 +2335,13 @@ def obj2.hash
 
     h[obj2] = true
     h.delete obj
-    assert_equal '{0=>0, 1=>1, 2=>2, 3=>3, 4=>4, 5=>5, 6=>6, 7=>7, 8=>8, 9=>9}', h.inspect
+    assert_equal '{0 => 0, 1 => 1, 2 => 2, 3 => 3, 4 => 4, 5 => 5, 6 => 6, 7 => 7, 8 => 8, 9 => 9}', h.inspect
+  end
+
+  def test_ar2st_lookup
+    obj = ar2st_object
+    h = obj.h
 
-    # lookup
-    obj = Object.new
-    obj.instance_variable_set(:@h, h = {})
-    def obj.hash
-      10.times{|i| @h[i] = i}
-      0
-    end
-    def obj.inspect
-      'test'
-    end
-    def obj.eql? other
-      other.class == Object
-    end
     obj2 = Object.new
     def obj2.hash
       0
@@ -2210,25 +2357,9 @@ def test_bug_12706
     end
   end
 
-  # Previously this test would fail because rb_hash inside opt_aref would look
-  # at the current method name
-  def test_hash_recursion_independent_of_mid
-    o = Class.new do
-      def hash(h, k)
-        h[k]
-      end
-
-      def any_other_name(h, k)
-        h[k]
-      end
-    end.new
-
-    rec = []; rec << rec
-
-    h = @cls[]
-    h[rec] = 1
-    assert o.hash(h, rec)
-    assert o.any_other_name(h, rec)
+  def test_bug_21357
+    h = {x: []}.merge(x: nil) { |_k, v1, _v2| v1 }
+    assert_equal({x: []}, h)
   end
 
   def test_any_hash_fixable
@@ -2256,4 +2387,49 @@ def test_any_hash_fixable
       end;
     end
   end
+
+  def test_compare_by_identity_during_iteration
+    h = { 1 => 1 }
+    h.each do
+      assert_raise(RuntimeError, "compare_by_identity during iteration") do
+        h.compare_by_identity
+      end
+    end
+  end
+
+  def test_ar_hash_to_st_hash
+    assert_normal_exit("#{<<~"begin;"}\n#{<<~'end;'}", 'https://bugs.ruby-lang.org/issues/20050#note-5')
+    begin;
+      srand(0)
+      class Foo
+        def to_a
+          []
+        end
+
+        def hash
+          $h.delete($h.keys.sample) if rand < 0.1
+          to_a.hash
+        end
+      end
+
+      1000.times do
+        $h = {}
+        (0..10).each {|i| $h[Foo.new] ||= {} }
+      end
+    end;
+  end
+
+  def test_ar_to_st_reserved_value
+    klass = Class.new do
+      attr_reader :hash
+      def initialize(val) = @hash = val
+    end
+
+    values = 0.downto(-16).to_a
+    hash = {}
+    values.each do |val|
+      hash[klass.new(val)] = val
+    end
+    assert_equal values, hash.values, "[ruby-core:121239] [Bug #21170]"
+  end
 end
diff --git a/test/ruby/test_integer.rb b/test/ruby/test_integer.rb
index 3e8d68702c0271..fb7aabba358b21 100644
--- a/test/ruby/test_integer.rb
+++ b/test/ruby/test_integer.rb
@@ -57,20 +57,19 @@ def test_pow
                           nil
                         end, "[ruby-dev:32084] [ruby-dev:34547]")
 
-    x = EnvUtil.suppress_warning {2 ** -0x4000000000000000}
-    assert_in_delta(0.0, (x / 2), Float::EPSILON)
+    assert_raise(ArgumentError) {2 ** -0x4000000000000000}
 
     <<~EXPRS.each_line.with_index(__LINE__+1) do |expr, line|
       crash01: 111r+11**-11111161111111
       crash02: 1118111111111**-1111111111111111**1+1==11111
-      crash03: -1111111**-1111*11 - -1111111** -111111111
+      crash03: -1111111**-1111*11 - -11** -1111111
       crash04: 1118111111111** -1111111111111111**1+11111111111**1 ===111
       crash05: 11** -111155555555555555  -55   !=5-555
       crash07: 1 + 111111111**-1111811111
       crash08: 18111111111**-1111111111111111**1 + 1111111111**-1111**1
       crash10: -7 - -1111111** -1111**11
       crash12: 1118111111111** -1111111111111111**1 + 1111 - -1111111** -1111*111111111119
-      crash13: 1.0i - -1111111** -111111111
+      crash13: 1.0i - -11** -1111111
       crash14: 11111**111111111**111111 * -11111111111111111111**-111111111111
       crash15: ~1**1111 + -~1**~1**111
       crash17: 11** -1111111**1111 /11i
@@ -80,7 +79,7 @@ def test_pow
       crash21: 11**-10111111119-1i -1r
     EXPRS
       name, expr = expr.split(':', 2)
-      assert_ruby_status(%w"-W0", expr, name)
+      assert_ruby_status(%w"-W0", "begin; #{ expr }; rescue ArgumentError; end", name)
     end
   end
 
@@ -282,31 +281,31 @@ def test_chr
 
   def test_upto
     a = []
-    1.upto(3) {|x| a << x }
+    assert_equal(1, 1.upto(3) {|x| a << x })
     assert_equal([1, 2, 3], a)
 
     a = []
-    1.upto(0) {|x| a << x }
+    assert_equal(1, 1.upto(0) {|x| a << x })
     assert_equal([], a)
 
     y = 2**30 - 1
     a = []
-    y.upto(y+2) {|x| a << x }
+    assert_equal(y, y.upto(y+2) {|x| a << x })
     assert_equal([y, y+1, y+2], a)
   end
 
   def test_downto
     a = []
-    -1.downto(-3) {|x| a << x }
+    assert_equal(-1, -1.downto(-3) {|x| a << x })
     assert_equal([-1, -2, -3], a)
 
     a = []
-    1.downto(2) {|x| a << x }
+    assert_equal(1, 1.downto(2) {|x| a << x })
     assert_equal([], a)
 
     y = -(2**30)
     a = []
-    y.downto(y-2) {|x| a << x }
+    assert_equal(y, y.downto(y-2) {|x| a << x })
     assert_equal([y, y-1, y-2], a)
   end
 
@@ -321,23 +320,34 @@ def test_times_bignum_redefine_plus_lt
     begin;
       called = false
       Integer.class_eval do
-        alias old_plus +
-        undef +
-        define_method(:+){|x| called = true; 1}
+        alias old_succ succ
+        undef succ
+        define_method(:succ){|x| called = true; x+1}
         alias old_lt <
         undef <
         define_method(:<){|x| called = true}
       end
+
+      fix = 1
+      fix.times{break 0}
+      fix_called = called
+
+      called = false
+
       big = 2**65
       big.times{break 0}
+      big_called = called
+
       Integer.class_eval do
-        undef +
-        alias + old_plus
+        undef succ
+        alias succ old_succ
         undef <
         alias < old_lt
       end
+
+      # Asssert that Fixnum and Bignum behave consistently
       bug18377 = "[ruby-core:106361]"
-      assert_equal(false, called, bug18377)
+      assert_equal(fix_called, big_called, bug18377)
     end;
   end
 
@@ -454,6 +464,10 @@ def test_floor
 
     assert_int_equal(1111_1111_1111_1111_1111_1111_1111_1111, 1111_1111_1111_1111_1111_1111_1111_1111.floor(1))
     assert_int_equal(10**400, (10**400).floor(1))
+
+    assert_int_equal(-10000000000, -1.floor(-10), "[Bug #20654]")
+    assert_int_equal(-100000000000000000000, -1.floor(-20), "[Bug #20654]")
+    assert_int_equal(-100000000000000000000000000000000000000000000000000, -1.floor(-50), "[Bug #20654]")
   end
 
   def test_ceil
@@ -482,6 +496,10 @@ def test_ceil
 
     assert_int_equal(1111_1111_1111_1111_1111_1111_1111_1111, 1111_1111_1111_1111_1111_1111_1111_1111.ceil(1))
     assert_int_equal(10**400, (10**400).ceil(1))
+
+    assert_int_equal(10000000000, 1.ceil(-10), "[Bug #20654]")
+    assert_int_equal(100000000000000000000, 1.ceil(-20), "[Bug #20654]")
+    assert_int_equal(100000000000000000000000000000000000000000000000000, 1.ceil(-50), "[Bug #20654]")
   end
 
   def test_truncate
@@ -690,9 +708,21 @@ def test_square_root
     assert_equal(x, Integer.sqrt(x ** 2), "[ruby-core:95453]")
   end
 
+  def test_bug_21217
+    assert_equal(0x10000 * 2**10, Integer.sqrt(0x100000008 * 2**20))
+  end
+
   def test_fdiv
     assert_equal(1.0, 1.fdiv(1))
     assert_equal(0.5, 1.fdiv(2))
+
+    m = 50 << Float::MANT_DIG
+    prev = 1.0
+    (1..100).each do |i|
+      val = (m + i).fdiv(m)
+      assert_operator val, :>=, prev, "1+epsilon*(#{i}/100)"
+      prev = val
+    end
   end
 
   def test_obj_fdiv
diff --git a/test/ruby/test_io.rb b/test/ruby/test_io.rb
index 7689b52e231fb6..3ec8726b5e45ce 100644
--- a/test/ruby/test_io.rb
+++ b/test/ruby/test_io.rb
@@ -350,6 +350,19 @@ def test_ungetc
     end)
   end
 
+  def test_ungetc_with_seek
+    make_tempfile {|t|
+      t.open
+      t.write('0123456789')
+      t.rewind
+
+      t.ungetc('a')
+      t.seek(2, :SET)
+
+      assert_equal('2', t.getc)
+    }
+  end
+
   def test_ungetbyte
     make_tempfile {|t|
       t.open
@@ -373,6 +386,19 @@ def test_ungetbyte
     }
   end
 
+  def test_ungetbyte_with_seek
+    make_tempfile {|t|
+      t.open
+      t.write('0123456789')
+      t.rewind
+
+      t.ungetbyte('a'.ord)
+      t.seek(2, :SET)
+
+      assert_equal('2'.ord, t.getbyte)
+    }
+  end
+
   def test_each_byte
     pipe(proc do |w|
       w << "abc def"
@@ -655,7 +681,6 @@ def test_copy_stream_file_to_pipe
 
   if have_nonblock?
     def test_copy_stream_no_busy_wait
-      omit "RJIT has busy wait on GC. This sometimes fails with --jit." if defined?(RubyVM::RJIT) && RubyVM::RJIT.enabled?
       omit "multiple threads already active" if Thread.list.size > 1
 
       msg = 'r58534 [ruby-core:80969] [Backport #13533]'
@@ -1116,6 +1141,34 @@ def test_copy_stream_pathname_to_pathname
     }
   end
 
+  def test_copy_stream_dup_buffer
+    bug21131 = '[ruby-core:120961] [Bug #21131]'
+    mkcdtmpdir do
+      dst_class = Class.new do
+        def initialize(&block)
+          @block = block
+        end
+
+        def write(data)
+          @block.call(data.dup)
+          data.bytesize
+        end
+      end
+
+      rng = Random.new(42)
+      body = Tempfile.new("ruby-bug", binmode: true)
+      body.write(rng.bytes(16_385))
+      body.rewind
+
+      payload = []
+      IO.copy_stream(body, dst_class.new{payload << it})
+      body.rewind
+      assert_equal(body.read, payload.join, bug21131)
+    ensure
+      body&.close
+    end
+  end
+
   def test_copy_stream_write_in_binmode
     bug8767 = '[ruby-core:56518] [Bug #8767]'
     mkcdtmpdir {
@@ -1679,7 +1732,6 @@ def test_read_nonblock_invalid_exception
   end if have_nonblock?
 
   def test_read_nonblock_no_exceptions
-    omit '[ruby-core:90895] RJIT worker may leave fd open in a forked child' if defined?(RubyVM::RJIT) && RubyVM::RJIT.enabled? # TODO: consider acquiring GVL from RJIT worker.
     with_pipe {|r, w|
       assert_equal :wait_readable, r.read_nonblock(4096, exception: false)
       w.puts "HI!"
@@ -1898,6 +1950,148 @@ def test_set_lineno_gets
     end)
   end
 
+  def test_readline_bad_param_raises
+    File.open(__FILE__) do |f|
+      assert_raise(TypeError) do
+        f.readline Object.new
+      end
+    end
+
+    File.open(__FILE__) do |f|
+      assert_raise(TypeError) do
+        f.readline 1, 2
+      end
+    end
+  end
+
+  def test_readline_raises
+    File.open(__FILE__) do |f|
+      assert_equal File.read(__FILE__), f.readline(nil)
+      assert_raise(EOFError) do
+        f.readline
+      end
+    end
+  end
+
+  def test_readline_separators
+    File.open(__FILE__) do |f|
+      line = f.readline("def")
+      assert_equal File.read(__FILE__)[/\A.*?def/m], line
+    end
+
+    File.open(__FILE__) do |f|
+      line = f.readline("def", chomp: true)
+      assert_equal File.read(__FILE__)[/\A.*?(?=def)/m], line
+    end
+  end
+
+  def test_readline_separators_limits
+    t = Tempfile.open("readline_limit")
+    str = "#" * 50
+    sep = "def"
+
+    t.write str
+    t.write sep
+    t.write str
+    t.flush
+
+    # over limit
+    File.open(t.path) do |f|
+      line = f.readline sep, str.bytesize
+      assert_equal(str, line)
+    end
+
+    # under limit
+    File.open(t.path) do |f|
+      line = f.readline(sep, str.bytesize + 5)
+      assert_equal(str + sep, line)
+    end
+
+    # under limit + chomp
+    File.open(t.path) do |f|
+      line = f.readline(sep, str.bytesize + 5, chomp: true)
+      assert_equal(str, line)
+    end
+  ensure
+    t&.close!
+  end
+
+  def test_readline_limit_without_separator
+    t = Tempfile.open("readline_limit")
+    str = "#" * 50
+    sep = "\n"
+
+    t.write str
+    t.write sep
+    t.write str
+    t.flush
+
+    # over limit
+    File.open(t.path) do |f|
+      line = f.readline str.bytesize
+      assert_equal(str, line)
+    end
+
+    # under limit
+    File.open(t.path) do |f|
+      line = f.readline(str.bytesize + 5)
+      assert_equal(str + sep, line)
+    end
+
+    # under limit + chomp
+    File.open(t.path) do |f|
+      line = f.readline(str.bytesize + 5, chomp: true)
+      assert_equal(str, line)
+    end
+  ensure
+    t&.close!
+  end
+
+  def test_readline_chomp_true
+    File.open(__FILE__) do |f|
+      line = f.readline(chomp: true)
+      assert_equal File.readlines(__FILE__).first.chomp, line
+    end
+  end
+
+  def test_readline_incompatible_rs
+    first_line = File.open(__FILE__, &:gets).encode("utf-32le")
+    File.open(__FILE__, encoding: "utf-8:utf-32le") {|f|
+      assert_equal first_line, f.readline
+      assert_raise(ArgumentError) {f.readline("\0")}
+    }
+  end
+
+  def test_readline_limit_nonascii
+    mkcdtmpdir do
+      i = 0
+
+      File.open("text#{i+=1}", "w+:utf-8") do |f|
+        f.write("Test\nok\u{bf}ok\n")
+        f.rewind
+
+        assert_equal("Test\nok\u{bf}", f.readline("\u{bf}"))
+        assert_equal("ok\n", f.readline("\u{bf}"))
+      end
+
+      File.open("text#{i+=1}", "w+b:utf-32le") do |f|
+        f.write("0123456789")
+        f.rewind
+
+        assert_equal(4, f.readline(4).bytesize)
+        assert_equal(4, f.readline(3).bytesize)
+      end
+
+      File.open("text#{i+=1}", "w+:utf-8:utf-32le") do |f|
+        f.write("0123456789")
+        f.rewind
+
+        assert_equal(4, f.readline(4).bytesize)
+        assert_equal(4, f.readline(3).bytesize)
+      end
+    end
+  end
+
   def test_set_lineno_readline
     pipe(proc do |w|
       w.puts "foo"
@@ -2347,10 +2541,6 @@ def test_autoclose
   end
 
   def test_autoclose_true_closed_by_finalizer
-    # http://ci.rvm.jp/results/trunk-rjit@silicon-docker/1465760
-    # http://ci.rvm.jp/results/trunk-rjit@silicon-docker/1469765
-    omit 'this randomly fails with RJIT' if defined?(RubyVM::RJIT) && RubyVM::RJIT.enabled?
-
     feature2250 = '[ruby-core:26222]'
     pre = 'ft2250'
     t = Tempfile.new(pre)
@@ -2439,7 +2629,7 @@ def test_read_command
     end
     assert_raise(Errno::ESPIPE) do
       assert_deprecated_warning(/IO process creation with a leading '\|'/) do # https://bugs.ruby-lang.org/issues/19630
-        IO.read("|echo foo", 1, 1)
+        IO.read("|#{EnvUtil.rubybin} -e 'puts :foo'", 1, 1)
       end
     end
   end
@@ -2543,6 +2733,17 @@ def test_reopen_opt
     }
   end
 
+  def test_reopen_binmode
+    f1 = File.open(__FILE__)
+    f2 = File.open(__FILE__)
+    f1.binmode
+    f1.reopen(f2)
+    assert_not_operator(f1, :binmode?)
+  ensure
+    f2.close
+    f1.close
+  end
+
   def make_tempfile_for_encoding
     t = make_tempfile
     open(t.path, "rb+:utf-8") {|f| f.puts "\u7d05\u7389bar\n"}
@@ -2573,6 +2774,16 @@ def test_reopen_encoding
     }
   end
 
+  def test_reopen_encoding_from_io
+    f1 = File.open(__FILE__, "rb:UTF-16LE")
+    f2 = File.open(__FILE__, "r:UTF-8")
+    f1.reopen(f2)
+    assert_equal(Encoding::UTF_8, f1.external_encoding)
+  ensure
+    f2.close
+    f1.close
+  end
+
   def test_reopen_opt_encoding
     feature7103 = '[ruby-core:47806]'
     make_tempfile_for_encoding {|t|
@@ -2825,6 +3036,15 @@ def test_initialize
       f.close
 
       assert_equal("FOO\n", File.read(t.path))
+
+      fd = IO.sysopen(t.path)
+      %w[w r+ w+ a+].each do |mode|
+        assert_raise(Errno::EINVAL, "#{mode} [ruby-dev:38571]") {IO.new(fd, mode)}
+      end
+      f = IO.new(fd, "r")
+      data = f.read
+      f.close
+      assert_equal("FOO\n", data)
     }
   end
 
@@ -3606,7 +3826,7 @@ def test_io_select_with_many_files
       end
 
       tempfiles = []
-      (0..fd_setsize+1).map {|i|
+      (0...fd_setsize).map {|i|
         tempfiles << Tempfile.create("test_io_select_with_many_files")
       }
 
@@ -3763,8 +3983,10 @@ def test_close_uninitialized
   end
 
   def test_open_fifo_does_not_block_other_threads
-    mkcdtmpdir {
+    mkcdtmpdir do
       File.mkfifo("fifo")
+    rescue NotImplementedError
+    else
       assert_separately([], <<-'EOS')
         t1 = Thread.new {
           open("fifo", "r") {|r|
@@ -3779,8 +4001,32 @@ def test_open_fifo_does_not_block_other_threads
         t1_value, _ = assert_join_threads([t1, t2])
         assert_equal("foo", t1_value)
       EOS
-    }
-  end if /mswin|mingw|bccwin|cygwin/ !~ RUBY_PLATFORM
+    end
+  end
+
+  def test_open_fifo_restart_at_signal_intterupt
+    mkcdtmpdir do
+      File.mkfifo("fifo")
+    rescue NotImplementedError
+    else
+      wait = EnvUtil.apply_timeout_scale(0.1)
+      data = "writing to fifo"
+
+      # Do not use assert_separately, because reading from stdin
+      # prevents to reproduce [Bug #20708]
+      assert_in_out_err(["-e", "#{<<~"begin;"}\n#{<<~'end;'}"], [], [data])
+      wait, data = #{wait}, #{data.dump}
+      ;
+      begin;
+        trap(:USR1) {}
+        Thread.new do
+          sleep wait; Process.kill(:USR1, $$)
+          sleep wait; File.write("fifo", data)
+        end
+        puts File.read("fifo")
+      end;
+    end
+  end if Signal.list[:USR1] # Pointless on platforms without signal
 
   def test_open_flag
     make_tempfile do |t|
@@ -4016,6 +4262,23 @@ def test_select_exceptfds
     end
   end if Socket.const_defined?(:MSG_OOB)
 
+  def test_select_timeout
+    assert_equal(nil, IO.select(nil,nil,nil,0))
+    assert_equal(nil, IO.select(nil,nil,nil,0.0))
+    assert_raise(TypeError) { IO.select(nil,nil,nil,"invalid-timeout") }
+    assert_raise(ArgumentError) { IO.select(nil,nil,nil,-1) }
+    assert_raise(ArgumentError) { IO.select(nil,nil,nil,-0.1) }
+    assert_raise(ArgumentError) { IO.select(nil,nil,nil,-Float::INFINITY) }
+    assert_raise(RangeError) { IO.select(nil,nil,nil,Float::NAN) }
+    IO.pipe {|r, w|
+      w << "x"
+      ret = [[r], [], []]
+      assert_equal(ret, IO.select([r],nil,nil,0.1))
+      assert_equal(ret, IO.select([r],nil,nil,1))
+      assert_equal(ret, IO.select([r],nil,nil,Float::INFINITY))
+    }
+  end
+
   def test_recycled_fd_close
     dot = -'.'
     IO.pipe do |sig_rd, sig_wr|
@@ -4127,4 +4390,55 @@ def test_stdout_to_closed_pipe
       end
     end
   end
+
+  def test_blocking_timeout
+    assert_separately([], <<~'RUBY')
+      IO.pipe do |r, w|
+        trap(:INT) do
+          w.puts "INT"
+        end
+
+        main = Thread.current
+        thread = Thread.new do
+          # Wait until the main thread has entered `$stdin.gets`:
+          Thread.pass until main.status == 'sleep'
+
+          # Cause an interrupt while handling `$stdin.gets`:
+          Process.kill :INT, $$
+        end
+
+        r.timeout = 1
+        assert_equal("INT", r.gets.chomp)
+      rescue IO::TimeoutError
+        # Ignore - some platforms don't support interrupting `gets`.
+      ensure
+        thread&.join
+      end
+    RUBY
+  end
+
+  def test_fork_close
+    omit "fork is not supported" unless Process.respond_to?(:fork)
+
+    assert_separately([], <<~'RUBY')
+      r, w = IO.pipe
+
+      thread = Thread.new do
+        r.read
+      end
+
+      Thread.pass until thread.status == "sleep"
+
+      pid = fork do
+        r.close
+      end
+
+      w.close
+
+      status = Process.wait2(pid).last
+      thread.join
+
+      assert_predicate(status, :success?)
+    RUBY
+  end
 end
diff --git a/test/ruby/test_io_buffer.rb b/test/ruby/test_io_buffer.rb
index 75ec4016fa6793..62c46678882a10 100644
--- a/test/ruby/test_io_buffer.rb
+++ b/test/ruby/test_io_buffer.rb
@@ -80,7 +80,7 @@ def test_file_mapped
   end
 
   def test_file_mapped_invalid
-    assert_raise NoMethodError do
+    assert_raise TypeError do
       IO::Buffer.map("foobar")
     end
   end
@@ -102,11 +102,6 @@ def test_string_mapped_mutable
     IO::Buffer.for(string) do |buffer|
       refute buffer.readonly?
 
-      # Cannot modify string as it's locked by the buffer:
-      assert_raise RuntimeError do
-        string[0] = "h"
-      end
-
       buffer.set_value(:U8, 0, "h".ord)
 
       # Buffer releases it's ownership of the string:
@@ -116,6 +111,26 @@ def test_string_mapped_mutable
     end
   end
 
+  def test_string_mapped_buffer_locked
+    string = "Hello World"
+    IO::Buffer.for(string) do |buffer|
+      # Cannot modify string as it's locked by the buffer:
+      assert_raise RuntimeError do
+        string[0] = "h"
+      end
+    end
+  end
+
+  def test_string_mapped_buffer_frozen
+    string = "Hello World".freeze
+    IO::Buffer.for(string) do |buffer|
+      assert_raise IO::Buffer::AccessError, "Buffer is not writable!" do
+        buffer.set_string("abc")
+      end
+      assert_equal "H".ord, buffer.get_value(:U8, 0)
+    end
+  end
+
   def test_non_string
     not_string = Object.new
 
@@ -194,6 +209,14 @@ def test_compare_different_size
     assert_positive buffer2 <=> buffer1
   end
 
+  def test_compare_zero_length
+    buffer1 = IO::Buffer.new(0)
+    buffer2 = IO::Buffer.new(1)
+
+    assert_negative buffer1 <=> buffer2
+    assert_positive buffer2 <=> buffer1
+  end
+
   def test_slice
     buffer = IO::Buffer.new(128)
     slice = buffer.slice(8, 32)
@@ -223,6 +246,43 @@ def test_slice_bounds_error
     end
   end
 
+  def test_slice_readonly
+    hello = %w"Hello World".join(" ").freeze
+    buffer = IO::Buffer.for(hello)
+    slice = buffer.slice
+    assert_predicate slice, :readonly?
+    assert_raise IO::Buffer::AccessError do
+      # This breaks the literal in string pool and many other tests in this file.
+      slice.set_string("Adios", 0, 5)
+    end
+    assert_equal "Hello World", hello
+  end
+
+  def test_transfer
+    hello = %w"Hello World".join(" ")
+    buffer = IO::Buffer.for(hello)
+    transferred = buffer.transfer
+    assert_equal "Hello World", transferred.get_string
+    assert_predicate buffer, :null?
+    assert_raise IO::Buffer::AccessError do
+      transferred.set_string("Goodbye")
+    end
+    assert_equal "Hello World", hello
+  end
+
+  def test_transfer_in_block
+    hello = %w"Hello World".join(" ")
+    buffer = IO::Buffer.for(hello, &:transfer)
+    assert_equal "Hello World", buffer.get_string
+    buffer.set_string("Ciao!")
+    assert_equal "Ciao! World", hello
+    hello.freeze
+    assert_raise IO::Buffer::AccessError do
+      buffer.set_string("Hola")
+    end
+    assert_equal "Ciao! World", hello
+  end
+
   def test_locked
     buffer = IO::Buffer.new(128, IO::Buffer::INTERNAL|IO::Buffer::LOCKED)
 
@@ -251,6 +311,26 @@ def test_get_string
 
     chunk = buffer.get_string(0, message.bytesize, Encoding::BINARY)
     assert_equal Encoding::BINARY, chunk.encoding
+
+    assert_raise_with_message(ArgumentError, /bigger than the buffer size/) do
+      buffer.get_string(0, 129)
+    end
+
+    assert_raise_with_message(ArgumentError, /bigger than the buffer size/) do
+      buffer.get_string(129)
+    end
+
+    assert_raise_with_message(ArgumentError, /Offset can't be negative/) do
+      buffer.get_string(-1)
+    end
+  end
+
+  def test_zero_length_get_string
+    buffer = IO::Buffer.new.slice(0, 0)
+    assert_equal "", buffer.get_string
+
+    buffer = IO::Buffer.new(0)
+    assert_equal "", buffer.get_string
   end
 
   # We check that values are correctly round tripped.
@@ -299,6 +379,13 @@ def test_get_set_values
     end
   end
 
+  def test_zero_length_get_set_values
+    buffer = IO::Buffer.new(0)
+
+    assert_equal [], buffer.get_values([], 0)
+    assert_equal 0, buffer.set_values([], 0, [])
+  end
+
   def test_values
     buffer = IO::Buffer.new(128)
 
@@ -323,6 +410,12 @@ def test_each
     end
   end
 
+  def test_zero_length_each
+    buffer = IO::Buffer.new(0)
+
+    assert_equal [], buffer.each(:U8).to_a
+  end
+
   def test_each_byte
     string = "The quick brown fox jumped over the lazy dog."
     buffer = IO::Buffer.for(string)
@@ -330,6 +423,12 @@ def test_each_byte
     assert_equal string.bytes, buffer.each_byte.to_a
   end
 
+  def test_zero_length_each_byte
+    buffer = IO::Buffer.new(0)
+
+    assert_equal [], buffer.each_byte.to_a
+  end
+
   def test_clear
     buffer = IO::Buffer.new(16)
     buffer.set_string("Hello World!")
@@ -361,9 +460,11 @@ def test_invalidation
     input.close
   end
 
-  def hello_world_tempfile
+  def hello_world_tempfile(repeats = 1)
     io = Tempfile.new
-    io.write("Hello World")
+    repeats.times do
+      io.write("Hello World")
+    end
     io.seek(0)
 
     yield io
@@ -395,6 +496,15 @@ def test_read_with_with_offset
     end
   end
 
+  def test_read_with_length_and_offset
+    hello_world_tempfile(100) do |io|
+      buffer = IO::Buffer.new(1024)
+      # Only read 24 bytes from the file, as we are starting at offset 1000 in the buffer.
+      assert_equal 24, buffer.read(io, 0, 1000)
+      assert_equal "Hello World", buffer.get_string(1000, 11)
+    end
+  end
+
   def test_write
     io = Tempfile.new
 
@@ -408,6 +518,19 @@ def test_write
     io.close!
   end
 
+  def test_write_with_length_and_offset
+    io = Tempfile.new
+
+    buffer = IO::Buffer.new(5)
+    buffer.set_string("Hello")
+    buffer.write(io, 4, 1)
+
+    io.seek(0)
+    assert_equal "ello", io.read(4)
+  ensure
+    io.close!
+  end
+
   def test_pread
     io = Tempfile.new
     io.write("Hello World")
@@ -500,4 +623,87 @@ def test_shared
   rescue NotImplementedError
     omit "Fork/shared memory is not supported."
   end
+
+  def test_private
+    Tempfile.create(%w"buffer .txt") do |file|
+      file.write("Hello World")
+
+      buffer = IO::Buffer.map(file, nil, 0, IO::Buffer::PRIVATE)
+      begin
+        assert buffer.private?
+        refute buffer.readonly?
+
+        buffer.set_string("J")
+
+        # It was not changed because the mapping was private:
+        file.seek(0)
+        assert_equal "Hello World", file.read
+      ensure
+        buffer&.free
+      end
+    end
+  end
+
+  def test_copy_overlapped_fwd
+    buf = IO::Buffer.for('0123456789').dup
+    buf.copy(buf, 3, 7)
+    assert_equal '0120123456', buf.get_string
+  end
+
+  def test_copy_overlapped_bwd
+    buf = IO::Buffer.for('0123456789').dup
+    buf.copy(buf, 0, 7, 3)
+    assert_equal '3456789789', buf.get_string
+  end
+
+  def test_copy_null_destination
+    buf = IO::Buffer.new(0)
+    assert_predicate buf, :null?
+    buf.copy(IO::Buffer.for('a'), 0, 0)
+    assert_predicate buf, :empty?
+  end
+
+  def test_copy_null_source
+    buf = IO::Buffer.for('a').dup
+    src = IO::Buffer.new(0)
+    assert_predicate src, :null?
+    buf.copy(src, 0, 0)
+    assert_equal 'a', buf.get_string
+  end
+
+  def test_set_string_overlapped_fwd
+    str = +'0123456789'
+    IO::Buffer.for(str) do |buf|
+      buf.set_string(str, 3, 7)
+    end
+    assert_equal '0120123456', str
+  end
+
+  def test_set_string_overlapped_bwd
+    str = +'0123456789'
+    IO::Buffer.for(str) do |buf|
+      buf.set_string(str, 0, 7, 3)
+    end
+    assert_equal '3456789789', str
+  end
+
+  def test_set_string_null_destination
+    buf = IO::Buffer.new(0)
+    assert_predicate buf, :null?
+    buf.set_string('a', 0, 0)
+    assert_predicate buf, :empty?
+  end
+
+  # https://bugs.ruby-lang.org/issues/21210
+  def test_bug_21210
+    omit "compaction is not supported on this platform" unless GC.respond_to?(:compact)
+
+    str = +"hello"
+    buf = IO::Buffer.for(str)
+    assert_predicate buf, :valid?
+
+    GC.verify_compaction_references(expand_heap: true, toward: :empty)
+
+    assert_predicate buf, :valid?
+  end
 end
diff --git a/test/ruby/test_iseq.rb b/test/ruby/test_iseq.rb
index 4ff808418ffa04..45223c89da5927 100644
--- a/test/ruby/test_iseq.rb
+++ b/test/ruby/test_iseq.rb
@@ -92,7 +92,17 @@ def test_cdhash_after_roundtrip
         42
       end
     EOF
-    assert_equal(42, ISeq.load_from_binary(iseq.to_binary).eval)
+    assert_equal(42, ISeq.load_from_binary(iseq_to_binary(iseq)).eval)
+  end
+
+  def test_forwardable
+    iseq = compile(<<~EOF, __LINE__+1)
+      Class.new {
+        def bar(a, b); a + b; end
+        def foo(...); bar(...); end
+      }
+    EOF
+    assert_equal(42, ISeq.load_from_binary(iseq_to_binary(iseq)).eval.new.foo(40, 2))
   end
 
   def test_super_with_block
@@ -102,7 +112,7 @@ def (Object.new).touch(*) # :nodoc:
       end
       42
     EOF
-    assert_equal(42, ISeq.load_from_binary(iseq.to_binary).eval)
+    assert_equal(42, ISeq.load_from_binary(iseq_to_binary(iseq)).eval)
   end
 
   def test_super_with_block_hash_0
@@ -113,7 +123,7 @@ def (Object.new).touch(req, *)
       end
       42
     EOF
-    assert_equal(42, ISeq.load_from_binary(iseq.to_binary).eval)
+    assert_equal(42, ISeq.load_from_binary(iseq_to_binary(iseq)).eval)
   end
 
   def test_super_with_block_and_kwrest
@@ -123,7 +133,7 @@ def (Object.new).touch(**) # :nodoc:
       end
       42
     EOF
-    assert_equal(42, ISeq.load_from_binary(iseq.to_binary).eval)
+    assert_equal(42, ISeq.load_from_binary(iseq_to_binary(iseq)).eval)
   end
 
   def test_lambda_with_ractor_roundtrip
@@ -133,7 +143,7 @@ def test_lambda_with_ractor_roundtrip
       Ractor.make_shareable(y)
       y.call
     EOF
-    assert_equal(42, ISeq.load_from_binary(iseq.to_binary).eval)
+    assert_equal(42, ISeq.load_from_binary(iseq_to_binary(iseq)).eval)
   end
 
   def test_super_with_anonymous_block
@@ -143,7 +153,7 @@ def (Object.new).touch(&) # :nodoc:
       end
       42
     EOF
-    assert_equal(42, ISeq.load_from_binary(iseq.to_binary).eval)
+    assert_equal(42, ISeq.load_from_binary(iseq_to_binary(iseq)).eval)
   end
 
   def test_ractor_unshareable_outer_variable
@@ -157,18 +167,26 @@ def test_ractor_unshareable_outer_variable
     y = nil.instance_eval do
       eval("proc {#{name} = []; proc {|x| #{name}}}").call
     end
-    assert_raise_with_message(Ractor::IsolationError, /`#{name}'/) do
+    assert_raise_with_message(Ractor::IsolationError, /'#{name}'/) do
       Ractor.make_shareable(y)
     end
     obj = Object.new
     def obj.foo(*) nil.instance_eval{ ->{super} } end
-    assert_raise_with_message(Ractor::IsolationError, /refer unshareable object \[\] from variable `\*'/) do
-      Ractor.make_shareable(obj.foo)
+    assert_raise_with_message(Ractor::IsolationError, /refer unshareable object \[\] from variable '\*'/) do
+      Ractor.make_shareable(obj.foo(*[]))
     end
   end
 
+  def test_ractor_shareable_value_frozen_core
+    iseq = RubyVM::InstructionSequence.compile(<<~'RUBY')
+      # shareable_constant_value: literal
+      REGEX = /#{}/ # [Bug #20569]
+    RUBY
+    assert_includes iseq_to_binary(iseq), "REGEX".b
+  end
+
   def test_disasm_encoding
-    src = "\u{3042} = 1; \u{3042}; \u{3043}"
+    src = +"\u{3042} = 1; \u{3042}; \u{3043}"
     asm = compile(src).disasm
     assert_equal(src.encoding, asm.encoding)
     assert_predicate(asm, :valid_encoding?)
@@ -279,6 +297,56 @@ def test_invalid_source
     assert_raise(TypeError, bug11159) {compile(1)}
   end
 
+  def test_invalid_source_no_memory_leak
+    # [Bug #21394]
+    assert_no_memory_leak(["-rtempfile"], "#{<<-"begin;"}", "#{<<-'end;'}", rss: true)
+      code = proc do |t|
+        RubyVM::InstructionSequence.new(nil)
+      rescue TypeError
+      else
+        raise "TypeError was not raised during RubyVM::InstructionSequence.new"
+      end
+
+      10.times(&code)
+    begin;
+      1_000_000.times(&code)
+    end;
+
+    # [Bug #21394]
+    # RubyVM::InstructionSequence.new calls rb_io_path, which dups the string
+    # and can leak memory if the dup raises
+    assert_no_memory_leak(["-rtempfile"], "#{<<-"begin;"}", "#{<<-'end;'}", rss: true)
+      MyError = Class.new(StandardError)
+      String.prepend(Module.new do
+        def initialize_dup(_)
+          if $raise_on_dup
+            raise MyError
+          else
+            super
+          end
+        end
+      end)
+
+      code = proc do |t|
+        Tempfile.create do |f|
+          $raise_on_dup = true
+          t.times do
+            RubyVM::InstructionSequence.new(f)
+          rescue MyError
+          else
+            raise "MyError was not raised during RubyVM::InstructionSequence.new"
+          end
+        ensure
+          $raise_on_dup = false
+        end
+      end
+
+      code.call(100)
+    begin;
+      code.call(1_000_000)
+    end;
+  end
+
   def test_frozen_string_literal_compile_option
     $f = 'f'
     line = __LINE__ + 2
@@ -347,11 +415,17 @@ def y@;end
       end
     end
     assert_equal([m1, e1.message], [m2, e2.message], feature11951)
-    message = e1.message.each_line
-    message.with_index(1) do |line, i|
-      next if /^ / =~ line
-      assert_send([line, :start_with?, __FILE__],
-                  proc {message.map {|l, j| (i == j ? ">" : " ") + l}.join("")})
+
+    if e1.message.lines[0] == "#{__FILE__}:#{line}: syntax errors found\n"
+      # Prism lays out the error messages in line with the source, so the
+      # following assertions do not make sense in that context.
+    else
+      message = e1.message.each_line
+      message.with_index(1) do |line, i|
+        next if /^ / =~ line
+        assert_send([line, :start_with?, __FILE__],
+                    proc {message.map {|l, j| (i == j ? ">" : " ") + l}.join("")})
+      end
     end
   end
 
@@ -367,7 +441,7 @@ def test_compile_file_error
       f.puts "end"
       f.close
       path = f.path
-      assert_in_out_err(%W[- #{path}], "#{<<-"begin;"}\n#{<<-"end;"}", /unexpected `end'/, [], success: true)
+      assert_in_out_err(%W[- #{path}], "#{<<-"begin;"}\n#{<<-"end;"}", /unexpected 'end'/, [], success: true)
       begin;
         path = ARGV[0]
         begin
@@ -463,7 +537,7 @@ def test_each_child
                   ["<class:C>@1",
                     ["bar@10", ["block in bar@11",
                             ["block (2 levels) in bar@12"]]],
-                    ["foo@2", ["ensure in foo@2"],
+                    ["foo@2", ["ensure in foo@7"],
                               ["rescue in foo@4"]]],
                   ["<class:D>@17"]]
 
@@ -496,7 +570,7 @@ def test_trace_points
                                   [4, :line],
                                   [7, :line],
                                   [9, :return]]],
-                       [["ensure in foo@2", [[7, :line]]]],
+                       [["ensure in foo@7", [[7, :line]]]],
                        [["rescue in foo@4", [[5, :line],
                                              [5, :rescue]]]]]],
                    [["<class:D>@17", [[17, :class],
@@ -542,16 +616,20 @@ def hexdump(bin)
     }
   end
 
+  def iseq_to_binary(iseq)
+    iseq.to_binary
+  rescue RuntimeError => e
+    omit e.message if /compile with coverage/ =~ e.message
+    raise
+  end
+
   def assert_iseq_to_binary(code, mesg = nil)
     iseq = RubyVM::InstructionSequence.compile(code)
     bin = assert_nothing_raised(mesg) do
-      iseq.to_binary
-    rescue RuntimeError => e
-      omit e.message if /compile with coverage/ =~ e.message
-      raise
+      iseq_to_binary(iseq)
     end
     10.times do
-      bin2 = iseq.to_binary
+      bin2 = iseq_to_binary(iseq)
       assert_equal(bin, bin2, message(mesg) {diff hexdump(bin), hexdump(bin2)})
     end
     iseq2 = RubyVM::InstructionSequence.load_from_binary(bin)
@@ -566,6 +644,23 @@ def assert_iseq_to_binary(code, mesg = nil)
     iseq2
   end
 
+  def test_to_binary_with_hidden_local_variables
+    assert_iseq_to_binary("for _foo in bar; end")
+
+    bin = iseq_to_binary(RubyVM::InstructionSequence.compile(<<-RUBY))
+      Object.new.instance_eval do
+        a = []
+        def self.bar; [1] end
+        for foo in bar
+          a << (foo * 2)
+        end
+        a
+      end
+    RUBY
+    v = RubyVM::InstructionSequence.load_from_binary(bin).eval
+    assert_equal([2], v)
+  end
+
   def test_to_binary_with_objects
     assert_iseq_to_binary("[]"+100.times.map{|i|"<</#{i}/"}.join)
     assert_iseq_to_binary("@x ||= (1..2)")
@@ -627,7 +722,7 @@ def self.foo
       end
     RUBY
 
-    iseq_bin = iseq.to_binary
+    iseq_bin = iseq_to_binary(iseq)
     iseq = ISeq.load_from_binary(iseq_bin)
     lines = []
     TracePoint.new(tracepoint_type){|tp|
@@ -685,18 +780,24 @@ def test_to_binary_b_return_tracepoint
   end
 
   def test_iseq_of
-    [proc{},
-     method(:test_iseq_of),
-     RubyVM::InstructionSequence.compile("p 1", __FILE__)].each{|src|
+    [
+      proc{},
+      method(:test_iseq_of),
+      RubyVM::InstructionSequence.compile("p 1", __FILE__),
+      begin; raise "error"; rescue => error; error.backtrace_locations[0]; end
+    ].each{|src|
       iseq = RubyVM::InstructionSequence.of(src)
       assert_equal __FILE__, iseq.path
     }
   end
 
   def test_iseq_of_twice_for_same_code
-    [proc{},
-     method(:test_iseq_of_twice_for_same_code),
-     RubyVM::InstructionSequence.compile("p 1")].each{|src|
+    [
+      proc{},
+      method(:test_iseq_of_twice_for_same_code),
+      RubyVM::InstructionSequence.compile("p 1"),
+      begin; raise "error"; rescue => error; error.backtrace_locations[0]; end
+    ].each{|src|
       iseq1 = RubyVM::InstructionSequence.of(src)
       iseq2 = RubyVM::InstructionSequence.of(src)
 
@@ -717,7 +818,7 @@ def test_iseq_builtin_to_a
   def test_iseq_builtin_load
     Tempfile.create(["builtin", ".iseq"]) do |f|
       f.binmode
-      f.write(RubyVM::InstructionSequence.of(1.method(:abs)).to_binary)
+      f.write(iseq_to_binary(RubyVM::InstructionSequence.of(1.method(:abs))))
       f.close
       assert_separately(["-", f.path], "#{<<~"begin;"}\n#{<<~'end;'}")
       begin;
@@ -757,7 +858,7 @@ def Float(n)
         GC.start
         Float(30)
       }
-      assert_equal :new, r.take
+      assert_equal :new, r.value
     RUBY
   end
 
@@ -770,4 +871,131 @@ def test_unreachable_syntax_error
     assert_syntax_error("false and break", mesg)
     assert_syntax_error("if false and break; end", mesg)
   end
+
+  def test_unreachable_pattern_matching
+    assert_in_out_err([], "true or 1 in 1")
+    assert_in_out_err([], "true or (case 1; in 1; 1; in 2; 2; end)")
+  end
+
+  def test_unreachable_pattern_matching_in_if_condition
+    assert_in_out_err([], "#{<<~"begin;"}\n#{<<~'end;'}", %w[1])
+    begin;
+      if true or {a: 0} in {a:}
+        p 1
+      else
+        p a
+      end
+    end;
+  end
+
+  def test_unreachable_next_in_block
+    bug20344 = '[ruby-core:117210] [Bug #20344]'
+    assert_nothing_raised(SyntaxError, bug20344) do
+      compile(<<~RUBY)
+        proc do
+          next
+
+          case nil
+          when "a"
+            next
+          when "b"
+          when "c"
+            proc {}
+          end
+
+          next
+        end
+      RUBY
+    end
+  end
+
+  def test_serialize_anonymous_outer_variables
+    iseq = RubyVM::InstructionSequence.compile(<<~'RUBY')
+      obj = Object.new
+      def obj.test
+        [1].each do
+          raise "Oops"
+        rescue
+          return it
+        end
+      end
+      obj
+    RUBY
+
+    binary = iseq.to_binary # [Bug # 21370]
+    roundtripped_iseq = RubyVM::InstructionSequence.load_from_binary(binary)
+    object = roundtripped_iseq.eval
+    assert_equal 1, object.test
+  end
+
+  def test_loading_kwargs_memory_leak
+    assert_no_memory_leak([], "#{<<~"begin;"}", "#{<<~'end;'}", rss: true)
+      a = RubyVM::InstructionSequence.compile("foo(bar: :baz)").to_binary
+    begin;
+      1_000_000.times do
+        RubyVM::InstructionSequence.load_from_binary(a)
+      end
+    end;
+  end
+
+  def test_ibf_bignum
+    iseq = RubyVM::InstructionSequence.compile("0x0"+"_0123_4567_89ab_cdef"*5)
+    expected = iseq.eval
+    result = RubyVM::InstructionSequence.load_from_binary(iseq_to_binary(iseq)).eval
+    assert_equal expected, result, proc {sprintf("expected: %x, result: %x", expected, result)}
+  end
+
+  def test_compile_prism_with_file
+    Tempfile.create(%w"test_iseq .rb") do |f|
+      f.puts "_name = 'Prism'; puts 'hello'"
+      f.close
+
+      assert_nothing_raised(TypeError) do
+        RubyVM::InstructionSequence.compile_prism(f)
+      end
+    end
+  end
+
+  def block_using_method
+    yield
+  end
+
+  def block_unused_method
+  end
+
+  def test_unused_param
+    a = RubyVM::InstructionSequence.of(method(:block_using_method)).to_a
+
+    assert_equal true, a.dig(11, :use_block)
+
+    b = RubyVM::InstructionSequence.of(method(:block_unused_method)).to_a
+    assert_equal nil, b.dig(11, :use_block)
+  end
+
+  def test_compile_prism_with_invalid_object_type
+    assert_raise(TypeError) do
+      RubyVM::InstructionSequence.compile_prism(Object.new)
+    end
+  end
+
+  def test_load_from_binary_only_accepts_string_param
+    assert_raise(TypeError) do
+      var_0 = 0
+      RubyVM::InstructionSequence.load_from_binary(var_0)
+    end
+  end
+
+  def test_while_in_until_condition
+    assert_in_out_err(["--dump=i", "-e", "until while 1; end; end"]) do |stdout, stderr, status|
+      assert_include(stdout.shift, "== disasm:")
+      assert_include(stdout.pop, "leave")
+      assert_predicate(status, :success?)
+    end
+  end
+
+  def test_compile_empty_under_gc_stress
+    EnvUtil.under_gc_stress do
+      RubyVM::InstructionSequence.compile_file(File::NULL)
+    end
+  end
 end
diff --git a/test/ruby/test_iterator.rb b/test/ruby/test_iterator.rb
index 820d5591c1d192..1bb655d52e3d86 100644
--- a/test/ruby/test_iterator.rb
+++ b/test/ruby/test_iterator.rb
@@ -175,10 +175,13 @@ def m2
   end
 
   def test_block_given
+    verbose_bak, $VERBOSE = $VERBOSE, nil
     assert(m1{p 'test'})
     assert(m2{p 'test'})
     assert(!m1())
     assert(!m2())
+  ensure
+    $VERBOSE = verbose_bak
   end
 
   def m3(var, &block)
@@ -308,7 +311,18 @@ def test_proc_return2
 
   def test_ljump
     assert_raise(LocalJumpError) {get_block{break}.call}
-    assert_raise(LocalJumpError) {proc_call2(get_block{break}){}}
+    begin
+      verbose_bak, $VERBOSE = $VERBOSE, nil
+      # See the commit https://github.com/ruby/ruby/commit/7d8a415bc2d08a1b5e9d1ea802493b6eeb99c219
+      # This block is not used but this is intentional.
+      #   |
+      #   +-----------------------------------------------------+
+      #                                                         |
+      #                                                         vv
+      assert_raise(LocalJumpError) {proc_call2(get_block{break}){}}
+    ensure
+      $VERBOSE = verbose_bak
+    end
 
     # cannot use assert_nothing_raised due to passing block.
     begin
diff --git a/test/ruby/test_keyword.rb b/test/ruby/test_keyword.rb
index ef594bd52e88a3..4563308fa2ec97 100644
--- a/test/ruby/test_keyword.rb
+++ b/test/ruby/test_keyword.rb
@@ -182,6 +182,52 @@ def test_method_parameters
                   [:keyrest, :kw], [:block, :b]], method(:f9).parameters)
   end
 
+  def test_keyword_with_anonymous_keyword_splat
+    def self.a(b: 1, **) [b, **] end
+    kw = {b: 2, c: 3}
+    assert_equal([2, {c: 3}], a(**kw))
+    assert_equal({b: 2, c: 3}, kw)
+  end
+
+  def test_keyword_splat_nil
+    # cfunc call
+    assert_equal(nil, p(**nil))
+
+    def self.a0(&); end
+    assert_equal(nil, a0(**nil))
+    assert_equal(nil, :a0.to_proc.call(self, **nil))
+    assert_equal(nil, a0(**nil, &:block))
+
+    def self.o(x=1); x end
+    assert_equal(1, o(**nil))
+    assert_equal(2, o(2, **nil))
+    assert_equal(1, o(*nil, **nil))
+    assert_equal(1, o(**nil, **nil))
+    assert_equal({a: 1}, o(a: 1, **nil))
+    assert_equal({a: 1}, o(**nil, a: 1))
+
+    # symproc call
+    assert_equal(1, :o.to_proc.call(self, **nil))
+
+    def self.s(*a); a end
+    assert_equal([], s(**nil))
+    assert_equal([1], s(1, **nil))
+    assert_equal([], s(*nil, **nil))
+
+    def self.kws(**a); a end
+    assert_equal({}, kws(**nil))
+    assert_equal({}, kws(*nil, **nil))
+
+    def self.skws(*a, **kw); [a, kw] end
+    assert_equal([[], {}], skws(**nil))
+    assert_equal([[1], {}], skws(1, **nil))
+    assert_equal([[], {}], skws(*nil, **nil))
+
+    assert_equal({}, {**nil})
+    assert_equal({a: 1}, {a: 1, **nil})
+    assert_equal({a: 1}, {**nil, a: 1})
+  end
+
   def test_lambda
     f = ->(str: "foo", num: 424242) { [str, num] }
     assert_equal(["foo", 424242], f[])
@@ -237,16 +283,16 @@ def kwargs(**kw)
     assert_equal(true, Hash.ruby2_keywords_hash?(marked))
   end
 
+  def assert_equal_not_same(kw, res)
+    assert_instance_of(Hash, res)
+    assert_equal(kw, res)
+    assert_not_same(kw, res)
+  end
+
   def test_keyword_splat_new
     kw = {}
     h = {a: 1}
 
-    def self.assert_equal_not_same(kw, res)
-      assert_instance_of(Hash, res)
-      assert_equal(kw, res)
-      assert_not_same(kw, res)
-    end
-
     def self.yo(**kw) kw end
     m = method(:yo)
     assert_equal(false, yo(**{}).frozen?)
@@ -459,6 +505,20 @@ def self.yo(opts) = opts
     assert_equal_not_same h, yo(*a, **h)
   end
 
+  def test_keyword_splat_to_non_keyword_method
+    h = {a: 1}.freeze
+
+    def self.yo(kw) kw end
+    assert_equal_not_same(h, yo(**h))
+    assert_equal_not_same(h, method(:yo).(**h))
+    assert_equal_not_same(h, :yo.to_proc.(self, **h))
+
+    def self.yoa(*kw) kw[0] end
+    assert_equal_not_same(h, yoa(**h))
+    assert_equal_not_same(h, method(:yoa).(**h))
+    assert_equal_not_same(h, :yoa.to_proc.(self, **h))
+  end
+
   def test_regular_kwsplat
     kw = {}
     h = {:a=>1}
@@ -2734,6 +2794,12 @@ def method_missing(*args)
       assert_nil(c.send(:ruby2_keywords, :bar))
     end
 
+    utf16_sym = "abcdef".encode("UTF-16LE").to_sym
+    c.send(:define_method, utf16_sym, c.instance_method(:itself))
+    assert_warn(/abcdef/) do
+      assert_nil(c.send(:ruby2_keywords, utf16_sym))
+    end
+
     o = Object.new
     class << o
       alias bar p
@@ -2757,8 +2823,53 @@ class << o
     assert_raise(FrozenError) { c.send(:ruby2_keywords, :baz) }
   end
 
+  def test_anon_splat_ruby2_keywords
+    singleton_class.class_exec do
+      def bar(*a, **kw)
+        [a, kw]
+      end
+
+      ruby2_keywords def bar_anon(*)
+        bar(*)
+      end
+    end
+
+    a = [1, 2]
+    kw = {a: 1}
+    assert_equal([[1, 2], {a: 1}], bar_anon(*a, **kw))
+    assert_equal([1, 2], a)
+    assert_equal({a: 1}, kw)
+  end
+
+  def test_anon_splat_ruby2_keywords_bug_20388
+    extend(Module.new{def process(action, ...) 1 end})
+    extend(Module.new do
+      def process(action, *args)
+        args.freeze
+        super
+      end
+      ruby2_keywords :process
+    end)
+
+    assert_equal(1, process(:foo, bar: :baz))
+  end
+
+  def test_ruby2_keywords_bug_20679
+    c = Class.new do
+       def self.get(_, _, h, &block)
+         h[1]
+       end
+
+      ruby2_keywords def get(*args, &block)
+        self.class.get(*args, &block)
+      end
+    end
+
+    assert_equal 2, c.new.get(true, {}, 1 => 2)
+  end
+
   def test_top_ruby2_keywords
-    assert_in_out_err([], <<-INPUT, ["[1, 2, 3]", "{:k=>1}"], [])
+    assert_in_out_err([], <<-INPUT, ["[1, 2, 3]", "{k: 1}"], [])
       def bar(*a, **kw)
         p a, kw
       end
@@ -3932,6 +4043,20 @@ def m(a: [])
     }, bug8964
   end
 
+  def test_large_kwsplat_to_method_taking_kw_and_kwsplat
+    assert_separately(['-'], "#{<<~"begin;"}\n#{<<~'end;'}")
+    begin;
+      n = 100000
+      x = Fiber.new do
+        h = {kw: 2}
+        n.times{|i| h[i.to_s.to_sym] = i}
+        def self.f(kw: 1, **kws) kws.size end
+        f(**h)
+      end.resume
+      assert_equal(n, x)
+    end;
+  end
+
   def test_dynamic_symbol_keyword
     bug10266 = '[ruby-dev:48564] [Bug #10266]'
     assert_separately(['-', bug10266], "#{<<~"begin;"}\n#{<<~'end;'}")
@@ -4418,6 +4543,24 @@ def test_value_omission
     assert_equal({one: 1, two: 2}, f.call(one:, two:))
   end
 
+  def m_bug20570(*a, **nil)
+    a
+  end
+
+  def test_splat_arg_with_prohibited_keyword
+    assert_equal([], m_bug20570(*[]))
+    assert_equal([1], m_bug20570(*[1]))
+    assert_equal([1, 2], m_bug20570(*[1, 2]))
+    h = nil
+    assert_equal([], m_bug20570(*[], **h))
+    assert_equal([1], m_bug20570(*[1], **h))
+    assert_equal([1, 2], m_bug20570(*[1, 2], **h))
+
+    assert_equal([], m_bug20570(*[], **nil))
+    assert_equal([1], m_bug20570(*[1], **nil))
+    assert_equal([1, 2], m_bug20570(*[1, 2], **nil))
+  end
+
   private def one
     1
   end
diff --git a/test/ruby/test_lambda.rb b/test/ruby/test_lambda.rb
index 9949fab8c76498..3cbb54306c8afa 100644
--- a/test/ruby/test_lambda.rb
+++ b/test/ruby/test_lambda.rb
@@ -177,32 +177,6 @@ def test_proc_inside_lambda_toplevel
     RUBY
   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
-    prev_warning, Warning[:deprecated] = Warning[:deprecated], false
-    f = pass_along {}
-    refute_predicate(f, :lambda?, '[Bug #15620]')
-    assert_nothing_raised(ArgumentError) { f.call(:extra_arg) }
-  ensure
-    Warning[:deprecated] = prev_warning
-  end
-
-  def test_create_non_lambda_for_proc_two_levels
-    prev_warning, Warning[:deprecated] = Warning[:deprecated], false
-    f = pass_along2 {}
-    refute_predicate(f, :lambda?, '[Bug #15620]')
-    assert_nothing_raised(ArgumentError) { f.call(:extra_arg) }
-  ensure
-    Warning[:deprecated] = prev_warning
-  end
-
   def test_instance_exec
     bug12568 = '[ruby-core:76300] [Bug #12568]'
     assert_nothing_raised(ArgumentError, bug12568) do
@@ -302,27 +276,27 @@ def test_break
   end
 
   def test_do_lambda_source_location
-    exp_lineno = __LINE__ + 3
+    exp = [__LINE__ + 1, 12, __LINE__ + 5, 7]
     lmd = ->(x,
              y,
              z) do
       #
     end
-    file, lineno = lmd.source_location
+    file, *loc = lmd.source_location
     assert_match(/^#{ Regexp.quote(__FILE__) }$/, file)
-    assert_equal(exp_lineno, lineno, "must be at the beginning of the block")
+    assert_equal(exp, loc)
   end
 
   def test_brace_lambda_source_location
-    exp_lineno = __LINE__ + 3
+    exp = [__LINE__ + 1, 12, __LINE__ + 5, 5]
     lmd = ->(x,
              y,
              z) {
       #
     }
-    file, lineno = lmd.source_location
+    file, *loc = lmd.source_location
     assert_match(/^#{ Regexp.quote(__FILE__) }$/, file)
-    assert_equal(exp_lineno, lineno, "must be at the beginning of the block")
+    assert_equal(exp, loc)
   end
 
   def test_not_orphan_return
diff --git a/test/ruby/test_lazy_enumerator.rb b/test/ruby/test_lazy_enumerator.rb
index 22127e903afc5e..4dddbab50c1775 100644
--- a/test/ruby/test_lazy_enumerator.rb
+++ b/test/ruby/test_lazy_enumerator.rb
@@ -489,6 +489,10 @@ def test_lazy_eager
     assert_equal [1, 2, 3], enum.map { |x| x / 2 }
   end
 
+  def test_lazy_zip_map_yield_arity_bug_20623
+    assert_equal([[1, 2]], [1].lazy.zip([2].lazy).map { |x| x }.force)
+  end
+
   def test_lazy_to_enum
     lazy = [1, 2, 3].lazy
     def lazy.foo(*args)
diff --git a/test/ruby/test_literal.rb b/test/ruby/test_literal.rb
index 99dd3a0c56a1ee..dbff3c4734275d 100644
--- a/test/ruby/test_literal.rb
+++ b/test/ruby/test_literal.rb
@@ -39,6 +39,8 @@ def test_self
   end
 
   def test_string
+    verbose_bak, $VERBOSE = $VERBOSE, nil # prevent syntax warnings
+
     assert_instance_of String, ?a
     assert_equal "a", ?a
     assert_instance_of String, ?A
@@ -94,6 +96,15 @@ def test_string
 
     assert_equal "ab", eval("?a 'b'")
     assert_equal "a\nb", eval("<<A 'b'\na\nA")
+
+    assert_raise(SyntaxError) {eval('"\C-' "\u3042" '"')}
+    assert_raise(SyntaxError) {eval('"\C-\\' "\u3042" '"')}
+    assert_raise(SyntaxError) {eval('"\M-' "\u3042" '"')}
+    assert_raise(SyntaxError) {eval('"\M-\\' "\u3042" '"')}
+
+    assert_equal "\x09 \xC9 \x89", eval('"\C-\111 \M-\111 \M-\C-\111"')
+  ensure
+    $VERBOSE = verbose_bak
   end
 
   def test_dstring
@@ -142,6 +153,8 @@ def test_xstring
   end
 
   def test_frozen_string
+    default = eval("'test'").frozen?
+
     all_assertions do |a|
       a.for("false with indicator") do
         str = eval("# -*- frozen-string-literal: false -*-\n""'foo'")
@@ -161,19 +174,19 @@ def test_frozen_string
       end
       a.for("false with preceding garbage") do
         str = eval("# x frozen-string-literal: false\n""'foo'")
-        assert_not_predicate(str, :frozen?)
+        assert_equal(default, str.frozen?)
       end
       a.for("true with preceding garbage") do
         str = eval("# x frozen-string-literal: true\n""'foo'")
-        assert_not_predicate(str, :frozen?)
+        assert_equal(default, str.frozen?)
       end
       a.for("false with succeeding garbage") do
         str = eval("# frozen-string-literal: false x\n""'foo'")
-        assert_not_predicate(str, :frozen?)
+        assert_equal(default, str.frozen?)
       end
       a.for("true with succeeding garbage") do
         str = eval("# frozen-string-literal: true x\n""'foo'")
-        assert_not_predicate(str, :frozen?)
+        assert_equal(default, str.frozen?)
       end
     end
   end
@@ -184,6 +197,11 @@ def test_frozen_string_in_array_literal
     list.each { |str| assert_predicate str, :frozen? }
   end
 
+  def test_string_in_hash_literal
+    hash = eval("# frozen-string-literal: false\n""{foo: 'foo'}")
+    assert_not_predicate(hash[:foo], :frozen?)
+  end
+
   if defined?(RubyVM::InstructionSequence.compile_option) and
     RubyVM::InstructionSequence.compile_option.key?(:debug_frozen_string_literal)
     def test_debug_frozen_string
@@ -234,8 +252,9 @@ def test_regexp
   def test_dregexp
     assert_instance_of Regexp, /re#{'ge'}xp/
     assert_equal(/regexp/, /re#{'ge'}xp/)
-    bug3903 = '[ruby-core:32682]'
-    assert_raise(SyntaxError, bug3903) {eval('/[#{"\x80"}]/')}
+
+    # [ruby-core:32682]
+    eval('/[#{"\x80"}]/')
   end
 
   def test_array
@@ -496,10 +515,11 @@ def test_hash_duplicated_key
       '1.0i',
       '1.72723e-77',
       '//',
+      '__LINE__',
+      '__FILE__',
+      '__ENCODING__',
     ) do |key|
-      assert_warning(/key #{Regexp.quote(eval(key).inspect)} is duplicated/) do
-        eval("{#{key} => :bar, #{key} => :foo}")
-      end
+      assert_warning(/key #{Regexp.quote(eval(key).inspect)} is duplicated/) { eval("{#{key} => :bar, #{key} => :foo}") }
     end
   end
 
@@ -582,6 +602,8 @@ def test__LINE__
   end
 
   def test_integer
+    verbose_bak, $VERBOSE = $VERBOSE, nil # prevent syntax warnings
+
     head = ['', '0x', '0o', '0b', '0d', '-', '+']
     chars = ['0', '1', '_', '9', 'f']
     head.each {|h|
@@ -611,9 +633,14 @@ def test_integer
         assert_syntax_error(h, /numeric literal without digits\Z/, "#{bug2407}: #{h.inspect}")
       end
     end
+
+  ensure
+    $VERBOSE = verbose_bak
   end
 
   def test_float
+    verbose_bak, $VERBOSE = $VERBOSE, nil # prevent syntax warnings
+
     head = ['', '-', '+']
     chars = ['0', '1', '_', '9', 'f', '.']
     head.each {|h|
@@ -632,15 +659,27 @@ def test_float
           end
           begin
             r2 = eval(s)
-          rescue NameError, SyntaxError
+          rescue ArgumentError
+            # Debug log for a random failure: ArgumentError: SyntaxError#path changed
+            $stderr.puts "TestRubyLiteral#test_float failed: %p" % s
+            raise
+          rescue SyntaxError => e
+            r2 = :err
+          rescue NameError
             r2 = :err
           end
           r2 = :err if Range === r2
-          assert_equal(r1, r2, "Float(#{s.inspect}) != eval(#{s.inspect})")
+          s = s.inspect
+          mesg = "Float(#{s}) != eval(#{s})"
+          mesg << ":" << e.message if e
+          assert_equal(r1, r2, mesg)
         }
       }
     }
     assert_equal(100.0, 0.0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100e100)
+
+  ensure
+    $VERBOSE = verbose_bak
   end
 
   def test_symbol_list
diff --git a/test/ruby/test_m17n.rb b/test/ruby/test_m17n.rb
index 907360b3a62c51..b0e2e9f849eeeb 100644
--- a/test/ruby/test_m17n.rb
+++ b/test/ruby/test_m17n.rb
@@ -69,15 +69,6 @@ def assert_regexp_fixed_utf8(r)
     assert_regexp_fixed_encoding(r)
   end
 
-  def assert_regexp_usascii_literal(r, enc, ex = nil)
-    code = "# -*- encoding: US-ASCII -*-\n#{r}.encoding"
-    if ex
-      assert_raise(ex) { eval(code) }
-    else
-      assert_equal(enc, eval(code))
-    end
-  end
-
   def encdump(str)
     d = str.dump
     if /\.force_encoding\("[A-Za-z0-9.:_+-]*"\)\z/ =~ d
@@ -1091,7 +1082,7 @@ def test_index
     assert_nil(e("\xa1\xa2\xa3\xa4").rindex(e("\xa3")))
     s = e("\xa3\xb0\xa3\xb1\xa3\xb2\xa3\xb3\xa3\xb4")
 
-    a_with_e = /EUC-JP and ASCII-8BIT/
+    a_with_e = /EUC-JP and BINARY \(ASCII-8BIT\)/
     assert_raise_with_message(Encoding::CompatibilityError, a_with_e) do
       s.index(a("\xb1\xa3"))
     end
@@ -1099,7 +1090,7 @@ def test_index
       s.rindex(a("\xb1\xa3"))
     end
 
-    a_with_e = /ASCII-8BIT regexp with EUC-JP string/
+    a_with_e = /BINARY \(ASCII-8BIT\) regexp with EUC-JP string/
     assert_raise_with_message(Encoding::CompatibilityError, a_with_e) do
       s.index(Regexp.new(a("\xb1\xa3")))
     end
@@ -1436,31 +1427,42 @@ def test_magic_comment_at_various_positions
   end
 
   def test_regexp_usascii
-    assert_regexp_usascii_literal('//', Encoding::US_ASCII)
-    assert_regexp_usascii_literal('/#{ }/', Encoding::US_ASCII)
-    assert_regexp_usascii_literal('/#{"a"}/', Encoding::US_ASCII)
-    assert_regexp_usascii_literal('/#{%q"\x80"}/', Encoding::ASCII_8BIT)
-    assert_regexp_usascii_literal('/#{"\x80"}/', nil, SyntaxError)
-
-    assert_regexp_usascii_literal('/a/', Encoding::US_ASCII)
-    assert_regexp_usascii_literal('/a#{ }/', Encoding::US_ASCII)
-    assert_regexp_usascii_literal('/a#{"a"}/', Encoding::US_ASCII)
-    assert_regexp_usascii_literal('/a#{%q"\x80"}/', Encoding::ASCII_8BIT)
-    assert_regexp_usascii_literal('/a#{"\x80"}/', nil, SyntaxError)
-
-    assert_regexp_usascii_literal('/\x80/', Encoding::ASCII_8BIT)
-    assert_regexp_usascii_literal('/\x80#{ }/', Encoding::ASCII_8BIT)
-    assert_regexp_usascii_literal('/\x80#{"a"}/', Encoding::ASCII_8BIT)
-    assert_regexp_usascii_literal('/\x80#{%q"\x80"}/', Encoding::ASCII_8BIT)
-    assert_regexp_usascii_literal('/\x80#{"\x80"}/', nil, SyntaxError)
-
-    assert_regexp_usascii_literal('/\u1234/', Encoding::UTF_8)
-    assert_regexp_usascii_literal('/\u1234#{ }/', Encoding::UTF_8)
-    assert_regexp_usascii_literal('/\u1234#{"a"}/', Encoding::UTF_8)
-    assert_regexp_usascii_literal('/\u1234#{%q"\x80"}/', nil, SyntaxError)
-    assert_regexp_usascii_literal('/\u1234#{"\x80"}/', nil, SyntaxError)
-    assert_regexp_usascii_literal('/\u1234\x80/', nil, SyntaxError)
-    assert_regexp_usascii_literal('/\u1234#{ }\x80/', nil, RegexpError)
+    tests = [
+      [__LINE__, '//', Encoding::US_ASCII],
+      [__LINE__, '/#{ }/', Encoding::US_ASCII],
+      [__LINE__, '/#{"a"}/', Encoding::US_ASCII],
+      [__LINE__, '/#{%q"\x80"}/', Encoding::US_ASCII],
+      [__LINE__, '/#{"\x80"}/', Encoding::ASCII_8BIT],
+
+      [__LINE__, '/a/', Encoding::US_ASCII],
+      [__LINE__, '/a#{ }/', Encoding::US_ASCII],
+      [__LINE__, '/a#{"a"}/', Encoding::US_ASCII],
+      [__LINE__, '/a#{%q"\x80"}/', Encoding::ASCII_8BIT],
+      [__LINE__, '/a#{"\x80"}/', Encoding::ASCII_8BIT],
+
+      [__LINE__, '/\x80/', Encoding::ASCII_8BIT],
+      [__LINE__, '/\x80#{ }/', Encoding::ASCII_8BIT],
+      [__LINE__, '/\x80#{"a"}/', Encoding::ASCII_8BIT],
+      [__LINE__, '/\x80#{%q"\x80"}/', Encoding::ASCII_8BIT],
+      [__LINE__, '/\x80#{"\x80"}/', Encoding::ASCII_8BIT],
+
+      [__LINE__, '/\u1234/', Encoding::UTF_8],
+      [__LINE__, '/\u1234#{ }/', Encoding::UTF_8],
+      [__LINE__, '/\u1234#{"a"}/', Encoding::UTF_8],
+
+      [__LINE__, '/\u1234#{%q"\x80"}/', nil, SyntaxError],
+      [__LINE__, '/\u1234#{"\x80"}/', nil, SyntaxError],
+      [__LINE__, '/\u1234\x80/', nil, SyntaxError],
+      [__LINE__, '/\u1234#{ }\x80/', nil, RegexpError],
+    ]
+    all_assertions_foreach(nil, *tests) do |line, r, enc, ex|
+      code = "# -*- encoding: US-ASCII -*-\n#{r}.encoding"
+      if ex
+        assert_raise(ex) {eval(code, nil, __FILE__, line-1)}
+      else
+        assert_equal(enc, eval(code, nil, __FILE__, line-1))
+      end
+    end
   end
 
   def test_gbk
@@ -1721,6 +1723,23 @@ def test_inspect_with_default_internal
     assert_equal(e("[\"\xB4\xC1\xBB\xFA\"]"), s, bug11787)
   end
 
+  def test_encoding_names_of_default_internal
+    # [Bug #20595] [Bug #20598]
+    [
+      "default_internal.names",
+      "name_list",
+      "aliases.keys"
+    ].each do |method|
+      assert_separately(%w(-W0), <<~RUBY)
+        exp_name = "int" + "ernal"
+        Encoding.default_internal = Encoding::ASCII_8BIT
+        name = Encoding.#{method}.find { |x| x == exp_name }
+        Encoding.default_internal = nil
+        assert_equal exp_name, name, "Encoding.#{method} [Bug #20595] [Bug #20598]"
+      RUBY
+    end
+  end
+
   def test_greek_capital_gap
     bug12204 = '[ruby-core:74478] [Bug #12204] GREEK CAPITAL RHO and SIGMA'
     assert_equal("\u03A3", "\u03A1".succ, bug12204)
diff --git a/test/ruby/test_marshal.rb b/test/ruby/test_marshal.rb
index 13645e3aa805f8..bfb4a9056eea0f 100644
--- a/test/ruby/test_marshal.rb
+++ b/test/ruby/test_marshal.rb
@@ -268,7 +268,11 @@ def test_symlink_in_ivar
   classISO8859_1.name
   ClassISO8859_1 = classISO8859_1
 
-  def test_class_nonascii
+  moduleUTF8 = const_set("C\u{30af 30e9 30b9}", Module.new)
+  moduleUTF8.name
+  ModuleUTF8 = moduleUTF8
+
+  def test_nonascii_class_instance
     a = ClassUTF8.new
     assert_instance_of(ClassUTF8, Marshal.load(Marshal.dump(a)), '[ruby-core:24790]')
 
@@ -301,6 +305,12 @@ def test_class_nonascii
     end
   end
 
+  def test_nonascii_class_module
+    assert_same(ClassUTF8, Marshal.load(Marshal.dump(ClassUTF8)))
+    assert_same(ClassISO8859_1, Marshal.load(Marshal.dump(ClassISO8859_1)))
+    assert_same(ModuleUTF8, Marshal.load(Marshal.dump(ModuleUTF8)))
+  end
+
   def test_regexp2
     assert_equal(/\\u/, Marshal.load("\004\b/\b\\\\u\000"))
     assert_equal(/u/, Marshal.load("\004\b/\a\\u\000"))
@@ -570,13 +580,19 @@ def test_marshal_load_ivar
   def test_class_ivar
     assert_raise(TypeError) {Marshal.load("\x04\x08Ic\x1bTestMarshal::TestClass\x06:\x0e@ivar_bug\"\x08bug")}
     assert_raise(TypeError) {Marshal.load("\x04\x08IM\x1bTestMarshal::TestClass\x06:\x0e@ivar_bug\"\x08bug")}
-    assert_not_operator(TestClass, :instance_variable_defined?, :@bug)
+    assert_not_operator(TestClass, :instance_variable_defined?, :@ivar_bug)
+
+    assert_raise(TypeError) {Marshal.load("\x04\x08[\x07c\x1bTestMarshal::TestClassI@\x06\x06:\x0e@ivar_bug\"\x08bug")}
+    assert_not_operator(TestClass, :instance_variable_defined?, :@ivar_bug)
   end
 
   def test_module_ivar
     assert_raise(TypeError) {Marshal.load("\x04\x08Im\x1cTestMarshal::TestModule\x06:\x0e@ivar_bug\"\x08bug")}
     assert_raise(TypeError) {Marshal.load("\x04\x08IM\x1cTestMarshal::TestModule\x06:\x0e@ivar_bug\"\x08bug")}
-    assert_not_operator(TestModule, :instance_variable_defined?, :@bug)
+    assert_not_operator(TestModule, :instance_variable_defined?, :@ivar_bug)
+
+    assert_raise(TypeError) {Marshal.load("\x04\x08[\x07m\x1cTestMarshal::TestModuleI@\x06\x06:\x0e@ivar_bug\"\x08bug")}
+    assert_not_operator(TestModule, :instance_variable_defined?, :@ivar_bug)
   end
 
   class TestForRespondToFalse
@@ -609,6 +625,8 @@ def marshal_load(v)
 
   def test_continuation
     EnvUtil.suppress_warning {require "continuation"}
+    omit 'requires callcc support' unless respond_to?(:callcc)
+
     c = Bug9523.new
     assert_raise_with_message(RuntimeError, /Marshal\.dump reentered at marshal_dump/) do
       Marshal.dump(c)
@@ -645,10 +663,10 @@ def test_unloadable_data
       Marshal.load(d)
     }
 
-    # cleanup
+  ensure
     self.class.class_eval do
       remove_const name
-    end
+    end if c
   end
 
   def test_unloadable_userdef
@@ -662,9 +680,17 @@ class << c
       Marshal.load(d)
     }
 
-    # cleanup
+  ensure
     self.class.class_eval do
       remove_const name
+    end if c
+  end
+
+  def test_recursive_userdef
+    t = Time.utc(0)
+    t.instance_eval {@v = t}
+    assert_raise_with_message(RuntimeError, /recursive\b.*\b_dump/) do
+      Marshal.dump(t)
     end
   end
 
diff --git a/test/ruby/test_math.rb b/test/ruby/test_math.rb
index bc2172d6805919..6e67099c6b063f 100644
--- a/test/ruby/test_math.rb
+++ b/test/ruby/test_math.rb
@@ -168,6 +168,7 @@ def test_log
     assert_nothing_raised { assert_nan(Math.log(1.0, Float::NAN)) }
     assert_nothing_raised { assert_infinity(-Math.log(0)) }
     assert_nothing_raised { assert_infinity(-Math.log(0, 2)) }
+    check(307.95368556425274, Math.log(2**1023, 10))
   end
 
   def test_log2
diff --git a/test/ruby/test_memory_view.rb b/test/ruby/test_memory_view.rb
index 5a39084d180062..d0122ddd5915a8 100644
--- a/test/ruby/test_memory_view.rb
+++ b/test/ruby/test_memory_view.rb
@@ -335,7 +335,7 @@ def test_ractor
         p mv[[0, 2]]
         mv[[1, 3]]
       end
-      p r.take
+      p r.value
     end;
   end
 end
diff --git a/test/ruby/test_method.rb b/test/ruby/test_method.rb
index 9f34164a774ef8..08f794fa0eab14 100644
--- a/test/ruby/test_method.rb
+++ b/test/ruby/test_method.rb
@@ -209,6 +209,27 @@ def o.foo; end
     assert_kind_of(String, o.method(:foo).hash.to_s)
   end
 
+  def test_hash_does_not_change_after_compaction
+    omit "compaction is not supported on this platform" unless GC.respond_to?(:compact)
+
+    # iseq backed method
+    assert_separately([], <<~RUBY)
+      def a; end
+
+      # Need this method here because otherwise the iseq may be on the C stack
+      # which would get pinned and not move during compaction
+      def get_hash
+        method(:a).hash
+      end
+
+      hash = get_hash
+
+      GC.verify_compaction_references(expand_heap: true, toward: :empty)
+
+      assert_equal(hash, get_hash)
+    RUBY
+  end
+
   def test_owner
     c = Class.new do
       def foo; end
@@ -450,6 +471,18 @@ def m.bar; :bar; end
     assert_equal(:bar, m.clone.bar)
   end
 
+  def test_clone_under_gc_compact_stress
+    omit "compaction doesn't work well on s390x" if RUBY_PLATFORM =~ /s390x/ # https://github.com/ruby/ruby/pull/5077
+    EnvUtil.under_gc_compact_stress do
+      o = Object.new
+      def o.foo; :foo; end
+      m = o.method(:foo)
+      def m.bar; :bar; end
+      assert_equal(:foo, m.clone.call)
+      assert_equal(:bar, m.clone.bar)
+    end
+  end
+
   def test_inspect
     o = Object.new
     def o.foo; end; line_no = __LINE__
@@ -928,6 +961,38 @@ class << o; prepend Module.new; end
     assert_raise(NameError, bug14658) {o.singleton_method(:bar)}
   end
 
+  def test_singleton_method_included_or_prepended_bug_20620
+    m = Module.new do
+      extend self
+      def foo = :foo
+    end
+    assert_equal(:foo, m.singleton_method(:foo).call)
+    assert_raise(NameError) {m.singleton_method(:puts)}
+
+    sc = Class.new do
+      def t = :t
+    end
+    c = Class.new(sc) do
+      singleton_class.prepend(Module.new do
+        def bar = :bar
+      end)
+      extend(Module.new do
+        def quux = :quux
+      end)
+      def self.baz = :baz
+    end
+    assert_equal(:bar, c.singleton_method(:bar).call)
+    assert_equal(:baz, c.singleton_method(:baz).call)
+    assert_equal(:quux, c.singleton_method(:quux).call)
+
+    assert_raise(NameError) {c.singleton_method(:t)}
+
+    c2 = Class.new(c)
+    assert_raise(NameError) {c2.singleton_method(:bar)}
+    assert_raise(NameError) {c2.singleton_method(:baz)}
+    assert_raise(NameError) {c2.singleton_method(:quux)}
+  end
+
   Feature9783 = '[ruby-core:62212] [Feature #9783]'
 
   def assert_curry_three_args(m)
@@ -1374,6 +1439,46 @@ class C
     def foo
       a = b = c = a = b = c = 12345
     end
+
+    def binding_noarg
+      a = a = 12345
+      binding
+    end
+
+    def binding_one_arg(x)
+      a = a = 12345
+      binding
+    end
+
+    def binding_optargs(x, y=42)
+      a = a = 12345
+      binding
+    end
+
+    def binding_anyargs(*x)
+      a = a = 12345
+      binding
+    end
+
+    def binding_keywords(x: 42)
+      a = a = 12345
+      binding
+    end
+
+    def binding_anykeywords(**x)
+      a = a = 12345
+      binding
+    end
+
+    def binding_forwarding(...)
+      a = a = 12345
+      binding
+    end
+
+    def binding_forwarding1(x, ...)
+      a = a = 12345
+      binding
+    end
   end
 
   def test_to_proc_binding
@@ -1392,6 +1497,66 @@ def test_to_proc_binding
     assert_equal([:bar, :foo], b.local_variables.sort, bug11012)
   end
 
+  def test_method_binding
+    c = C.new
+
+    b = c.binding_noarg
+    assert_equal(12345, b.local_variable_get(:a))
+
+    b = c.binding_one_arg(0)
+    assert_equal(12345, b.local_variable_get(:a))
+    assert_equal(0, b.local_variable_get(:x))
+
+    b = c.binding_anyargs()
+    assert_equal(12345, b.local_variable_get(:a))
+    assert_equal([], b.local_variable_get(:x))
+    b = c.binding_anyargs(0)
+    assert_equal(12345, b.local_variable_get(:a))
+    assert_equal([0], b.local_variable_get(:x))
+    b = c.binding_anyargs(0, 1)
+    assert_equal(12345, b.local_variable_get(:a))
+    assert_equal([0, 1], b.local_variable_get(:x))
+
+    b = c.binding_optargs(0)
+    assert_equal(12345, b.local_variable_get(:a))
+    assert_equal(0, b.local_variable_get(:x))
+    assert_equal(42, b.local_variable_get(:y))
+    b = c.binding_optargs(0, 1)
+    assert_equal(12345, b.local_variable_get(:a))
+    assert_equal(0, b.local_variable_get(:x))
+    assert_equal(1, b.local_variable_get(:y))
+
+    b = c.binding_keywords()
+    assert_equal(12345, b.local_variable_get(:a))
+    assert_equal(42, b.local_variable_get(:x))
+    b = c.binding_keywords(x: 102)
+    assert_equal(12345, b.local_variable_get(:a))
+    assert_equal(102, b.local_variable_get(:x))
+
+    b = c.binding_anykeywords()
+    assert_equal(12345, b.local_variable_get(:a))
+    assert_equal({}, b.local_variable_get(:x))
+    b = c.binding_anykeywords(foo: 999)
+    assert_equal(12345, b.local_variable_get(:a))
+    assert_equal({foo: 999}, b.local_variable_get(:x))
+
+    b = c.binding_forwarding()
+    assert_equal(12345, b.local_variable_get(:a))
+    b = c.binding_forwarding(0)
+    assert_equal(12345, b.local_variable_get(:a))
+    b = c.binding_forwarding(0, 1)
+    assert_equal(12345, b.local_variable_get(:a))
+    b = c.binding_forwarding(foo: 42)
+    assert_equal(12345, b.local_variable_get(:a))
+
+    b = c.binding_forwarding1(987)
+    assert_equal(12345, b.local_variable_get(:a))
+    assert_equal(987, b.local_variable_get(:x))
+    b = c.binding_forwarding1(987, 654)
+    assert_equal(12345, b.local_variable_get(:a))
+    assert_equal(987, b.local_variable_get(:x))
+  end
+
   MethodInMethodClass_Setup = -> do
     remove_const :MethodInMethodClass if defined? MethodInMethodClass
 
@@ -1442,12 +1607,12 @@ def test_argument_error_location
         begin
           $f.call(1)
         rescue ArgumentError => e
-          assert_equal "main.rb:#{$line_lambda}:in `block in <main>'", e.backtrace.first
+          assert_equal "main.rb:#{$line_lambda}:in 'block in <main>'", e.backtrace.first
         end
         begin
           foo(1)
         rescue ArgumentError => e
-          assert_equal "main.rb:#{$line_method}:in `foo'", e.backtrace.first
+          assert_equal "main.rb:#{$line_method}:in 'Object#foo'", e.backtrace.first
         end
       EOS
     END_OF_BODY
@@ -1603,4 +1768,121 @@ def test_method_list
   def test_invalidating_CC_ASAN
     assert_ruby_status(['-e', 'using Module.new'])
   end
+
+  def test_kwarg_eval_memory_leak
+    assert_no_memory_leak([], "", <<~RUBY, rss: true, limit: 1.2)
+      obj = Object.new
+      def obj.test(**kwargs) = nil
+
+      100_000.times do
+        eval("obj.test(foo: 123)")
+      end
+    RUBY
+  end
+
+  def test_super_with_splat
+    c = Class.new {
+      attr_reader :x
+
+      def initialize(*args)
+        @x, _ = args
+      end
+    }
+    b = Class.new(c) { def initialize(...) = super }
+    a = Class.new(b) { def initialize(*args) = super }
+    obj = a.new(1, 2, 3)
+    assert_equal 1, obj.x
+  end
+
+  def test_warn_unused_block
+    assert_in_out_err '-w', <<-'RUBY' do |_out, err, _status|
+      def foo = nil
+      foo{}          # warn
+      send(:foo){}   # don't warn because it uses send
+      b = Proc.new{}
+      foo(&b)        # warn
+    RUBY
+      errstr = err.join("\n")
+      assert_equal 2, err.size, errstr
+
+      assert_match(/-:2: warning/, errstr)
+      assert_match(/-:5: warning/, errstr)
+    end
+
+    assert_in_out_err '-w', <<-'RUBY' do |_out, err, _status|
+      def foo = nil
+      10.times{foo{}} # warn once
+    RUBY
+      assert_equal 1, err.size
+    end
+
+    assert_in_out_err '-w', <<-'RUBY' do |_out, err, _status|
+      def foo = nil; b = nil
+      foo(&b)       # no warning
+      1.object_id{} # no warning because it is written in C
+
+      class C
+        def initialize
+        end
+      end
+      C.new{} # no warning
+
+    RUBY
+      assert_equal 0, err.size
+    end
+
+    assert_in_out_err '-w', <<-'RUBY' do |_out, err, _status|
+      class C0
+        def f1 = nil
+        def f2 = nil
+        def f3 = nil
+        def f4 = nil
+        def f5 = nil
+        def f6 = nil
+      end
+
+      class C1 < C0
+        def f1 = super         # zsuper / use
+        def f2 = super()       # super  / use
+        def f3(&_) = super(&_) # super  / use
+        def f4 = super(&nil)   # super  / unuse
+        def f5 = super(){}     # super  / unuse
+        def f6 = super{}       # zsuper / unuse
+      end
+
+      C1.new.f1{} # no warning
+      C1.new.f2{} # no warning
+      C1.new.f3{} # no warning
+      C1.new.f4{} # warning
+      C1.new.f5{} # warning
+      C1.new.f6{} # warning
+    RUBY
+      assert_equal 3, err.size, err.join("\n")
+      assert_match(/-:22: warning.+f4/, err.join)
+      assert_match(/-:23: warning.+f5/, err.join)
+      assert_match(/-:24: warning.+f6/, err.join)
+    end
+
+    assert_in_out_err '-w', <<-'RUBY' do |_out, err, _status|
+      class C0
+        def f = yield
+      end
+
+      class C1 < C0
+        def f = nil
+      end
+
+      C1.new.f{} # do not warn on duck typing
+    RUBY
+      assert_equal 0, err.size, err.join("\n")
+    end
+
+    assert_in_out_err '-w', <<-'RUBY' do |_out, err, _status|
+      def foo(*, &block) = block
+      def bar(buz, ...) = foo(buz, ...)
+      bar(:test) {} # do not warn because of forwarding
+    RUBY
+      assert_equal 0, err.size, err.join("\n")
+    end
+  end
 end
diff --git a/test/ruby/test_mixed_unicode_escapes.rb b/test/ruby/test_mixed_unicode_escapes.rb
index f0b4cc691f02c8..a30b5c19f54cb4 100644
--- a/test/ruby/test_mixed_unicode_escapes.rb
+++ b/test/ruby/test_mixed_unicode_escapes.rb
@@ -18,12 +18,12 @@ def test_basic
     assert_raise(SyntaxError) { eval %q("\u{1234}�")}
 
     # also should not work for Regexp
-    assert_raise(SyntaxError) { eval %q(/#{"\u1234"}#{"�"}/)}
     assert_raise(RegexpError) { eval %q(/\u{1234}#{nil}�/)}
     assert_raise(RegexpError) { eval %q(/�#{nil}\u1234/)}
 
     # String interpolation turns into an expression and we get
     # a different kind of error, but we still can't mix these
+    assert_raise(Encoding::CompatibilityError) { eval %q(/#{"\u1234"}#{"�"}/)}
     assert_raise(Encoding::CompatibilityError) { eval %q("\u{1234}#{nil}�")}
     assert_raise(Encoding::CompatibilityError) { eval %q("�#{nil}\u1234")}
   end
diff --git a/test/ruby/test_module.rb b/test/ruby/test_module.rb
index 81c5345a5f541e..9a21113fe06741 100644
--- a/test/ruby/test_module.rb
+++ b/test/ruby/test_module.rb
@@ -253,6 +253,14 @@ def test_const_defined?
     assert_operator(Math, :const_defined?, "PI")
     assert_not_operator(Math, :const_defined?, :IP)
     assert_not_operator(Math, :const_defined?, "IP")
+
+    # Test invalid symbol name
+    # [Bug #20245]
+    EnvUtil.under_gc_stress do
+      assert_raise(EncodingError) do
+        Math.const_defined?("\xC3")
+      end
+    end
   end
 
   def each_bad_constants(m, &b)
@@ -776,6 +784,18 @@ def test_prepend_after_include
     assert_equal([:m1, :m0, :m, :sc, :m1, :m0, :c], sc.new.m)
   end
 
+  def test_include_into_module_after_prepend_bug_20871
+    bar = Module.new{def bar; 'bar'; end}
+    foo = Module.new{def foo; 'foo'; end}
+    m = Module.new
+    c = Class.new{include m}
+    m.prepend bar
+    Class.new{include m}
+    m.include foo
+    assert_include c.ancestors, foo
+    assert_equal "foo", c.new.foo
+  end
+
   def test_protected_include_into_included_module
     m1 = Module.new do
       def other_foo(other)
@@ -1468,8 +1488,8 @@ def test_undef
       class << o; self; end.instance_eval { undef_method(:foo) }
     end
 
-    %w(object_id __send__ initialize).each do |n|
-      assert_in_out_err([], <<-INPUT, [], %r"warning: undefining `#{n}' may cause serious problems$")
+    %w(object_id __id__ __send__ initialize).each do |n|
+      assert_in_out_err([], <<-INPUT, [], %r"warning: undefining '#{n}' may cause serious problems$")
         $VERBOSE = false
         Class.new.instance_eval { undef_method(:#{n}) }
       INPUT
@@ -2140,9 +2160,8 @@ def test_deprecate_constant
       Warning[:deprecated] = false
       Class.new(c)::FOO
     end
-    assert_warn('') do
-      Warning[:deprecated] = false
-      c.class_eval "FOO"
+    assert_warn(/deprecated/) do
+      c.class_eval {remove_const "FOO"}
     end
   end
 
@@ -3155,6 +3174,19 @@ class A
     end;
   end
 
+  def test_define_method_changes_visibility_with_existing_method_bug_19749
+    c = Class.new do
+      def a; end
+      private def b; end
+
+      define_method(:b, instance_method(:b))
+      private
+      define_method(:a, instance_method(:a))
+    end
+    assert_equal([:b], c.public_instance_methods(false))
+    assert_equal([:a], c.private_instance_methods(false))
+  end
+
   def test_define_method_with_unbound_method
     # Passing an UnboundMethod to define_method succeeds if it is from an ancestor
     assert_nothing_raised do
@@ -3175,7 +3207,6 @@ def test_define_method_with_unbound_method
   end
 
   def test_redefinition_mismatch
-    omit "Investigating trunk-rjit failure on ci.rvm.jp" if defined?(RubyVM::RJIT) && RubyVM::RJIT.enabled?
     m = Module.new
     m.module_eval "A = 1", __FILE__, line = __LINE__
     e = assert_raise_with_message(TypeError, /is not a module/) {
@@ -3292,6 +3323,94 @@ def test_iclass_memory_leak
     CODE
   end
 
+  def test_complemented_method_entry_memory_leak
+    # [Bug #19894] [Bug #19896]
+    assert_no_memory_leak([], <<~PREP, <<~CODE, rss: true)
+      code = proc do
+        $c = Class.new do
+          def foo; end
+        end
+
+        $m = Module.new do
+          refine $c do
+            def foo; end
+          end
+        end
+
+        Class.new do
+          using $m
+
+          def initialize
+            o = $c.new
+            o.method(:foo).unbind
+          end
+        end.new
+      end
+      1_000.times(&code)
+    PREP
+      300_000.times(&code)
+    CODE
+  end
+
+  def test_module_clone_memory_leak
+    # [Bug #19901]
+    assert_no_memory_leak([], <<~PREP, <<~CODE, rss: true)
+      code = proc do
+        Module.new.clone
+      end
+      1_000.times(&code)
+    PREP
+      1_000_000.times(&code)
+    CODE
+  end
+
+  def test_set_temporary_name
+    m = Module.new
+    assert_nil m.name
+
+    m.const_set(:N, Module.new)
+
+    assert_match(/\A#<Module:0x\h+>::N\z/, m::N.name)
+    m::N.set_temporary_name(name = "fake_name_under_M")
+    name.upcase!
+    assert_equal("fake_name_under_M", m::N.name)
+    assert_raise(FrozenError) {m::N.name.upcase!}
+    m::N.set_temporary_name(nil)
+    assert_nil(m::N.name)
+
+    m::N.const_set(:O, Module.new)
+    m.const_set(:Recursive, m)
+    m::N.const_set(:Recursive, m)
+    m.const_set(:A, 42)
+
+    m.set_temporary_name(name = "fake_name")
+    name.upcase!
+    assert_equal("fake_name", m.name)
+    assert_raise(FrozenError) {m.name.upcase!}
+    assert_equal("fake_name::N", m::N.name)
+    assert_equal("fake_name::N::O", m::N::O.name)
+
+    m.set_temporary_name(nil)
+    assert_nil m.name
+    assert_nil m::N.name
+    assert_nil m::N::O.name
+
+    assert_raise_with_message(ArgumentError, "empty class/module name") do
+      m.set_temporary_name("")
+    end
+    %w[A A::B ::A ::A::B].each do |name|
+      assert_raise_with_message(ArgumentError, /must not be a constant path/) do
+        m.set_temporary_name(name)
+      end
+    end
+
+    [Object, User, AClass].each do |mod|
+      assert_raise_with_message(RuntimeError, /permanent name/) do
+        mod.set_temporary_name("fake_name")
+      end
+    end
+  end
+
   private
 
   def assert_top_method_is_private(method)
@@ -3299,7 +3418,7 @@ def assert_top_method_is_private(method)
       methods = singleton_class.private_instance_methods(false)
       assert_include(methods, :#{method}, ":#{method} should be private")
 
-      assert_raise_with_message(NoMethodError, /^private method `#{method}' called for /) {
+      assert_raise_with_message(NoMethodError, /^private method '#{method}' called for /) {
         recv = self
         recv.#{method}
       }
diff --git a/test/ruby/test_namespace.rb b/test/ruby/test_namespace.rb
new file mode 100644
index 00000000000000..cd593068675de6
--- /dev/null
+++ b/test/ruby/test_namespace.rb
@@ -0,0 +1,618 @@
+# frozen_string_literal: true
+
+require 'test/unit'
+
+class TestNamespace < Test::Unit::TestCase
+  ENV_ENABLE_NAMESPACE = {'RUBY_NAMESPACE' => '1'}
+
+  def setup
+    @n = Namespace.new if Namespace.enabled?
+  end
+
+  def teardown
+    @n = nil
+  end
+
+  def test_namespace_availability
+    env_has_RUBY_NAMESPACE = (ENV['RUBY_NAMESPACE'].to_i == 1)
+    assert_equal env_has_RUBY_NAMESPACE, Namespace.enabled?
+  end
+
+  def test_current_namespace
+    pend unless Namespace.enabled?
+
+    main = Namespace.current
+    assert main.inspect.include?("main")
+
+    @n.require_relative('namespace/current')
+
+    assert_equal @n, @n::CurrentNamespace.in_require
+    assert_equal @n, @n::CurrentNamespace.in_method_call
+    assert_equal main, Namespace.current
+  end
+
+  def test_require_rb_separately
+    pend unless Namespace.enabled?
+
+    assert_raise(NameError) { NS_A }
+    assert_raise(NameError) { NS_B }
+
+    @n.require(File.join(__dir__, 'namespace', 'a.1_1_0'))
+
+    assert_not_nil @n::NS_A
+    assert_not_nil @n::NS_B
+    assert_equal "1.1.0", @n::NS_A::VERSION
+    assert_equal "yay 1.1.0", @n::NS_A.new.yay
+    assert_equal "1.1.0", @n::NS_B::VERSION
+    assert_equal "yay_b1", @n::NS_B.yay
+
+    assert_raise(NameError) { NS_A }
+    assert_raise(NameError) { NS_B }
+  end
+
+  def test_require_relative_rb_separately
+    pend unless Namespace.enabled?
+
+    assert_raise(NameError) { NS_A }
+    assert_raise(NameError) { NS_B }
+
+    @n.require_relative('namespace/a.1_1_0')
+
+    assert_not_nil @n::NS_A
+    assert_not_nil @n::NS_B
+    assert_equal "1.1.0", @n::NS_A::VERSION
+    assert_equal "yay 1.1.0", @n::NS_A.new.yay
+    assert_equal "1.1.0", @n::NS_B::VERSION
+    assert_equal "yay_b1", @n::NS_B.yay
+
+    assert_raise(NameError) { NS_A }
+    assert_raise(NameError) { NS_B }
+  end
+
+  def test_load_separately
+    pend unless Namespace.enabled?
+
+    assert_raise(NameError) { NS_A }
+    assert_raise(NameError) { NS_B }
+
+    @n.load(File.join(__dir__, 'namespace', 'a.1_1_0.rb'))
+
+    assert_not_nil @n::NS_A
+    assert_not_nil @n::NS_B
+    assert_equal "1.1.0", @n::NS_A::VERSION
+    assert_equal "yay 1.1.0", @n::NS_A.new.yay
+    assert_equal "1.1.0", @n::NS_B::VERSION
+    assert_equal "yay_b1", @n::NS_B.yay
+
+    assert_raise(NameError) { NS_A }
+    assert_raise(NameError) { NS_B }
+  end
+
+  def test_namespace_in_namespace
+    pend unless Namespace.enabled?
+
+    assert_raise(NameError) { NS1 }
+    assert_raise(NameError) { NS_A }
+    assert_raise(NameError) { NS_B }
+
+    @n.require_relative('namespace/ns')
+
+    assert_not_nil @n::NS1
+    assert_not_nil @n::NS1::NS_A
+    assert_not_nil @n::NS1::NS_B
+    assert_equal "1.1.0", @n::NS1::NS_A::VERSION
+    assert_equal "yay 1.1.0", @n::NS1::NS_A.new.yay
+    assert_equal "1.1.0", @n::NS1::NS_B::VERSION
+    assert_equal "yay_b1", @n::NS1::NS_B.yay
+
+    assert_raise(NameError) { NS1 }
+    assert_raise(NameError) { NS_A }
+    assert_raise(NameError) { NS_B }
+  end
+
+  def test_require_rb_2versions
+    pend unless Namespace.enabled?
+
+    assert_raise(NameError) { NS_A }
+
+    @n.require(File.join(__dir__, 'namespace', 'a.1_2_0'))
+    assert_equal "1.2.0", @n::NS_A::VERSION
+    assert_equal "yay 1.2.0", @n::NS_A.new.yay
+
+    n2 = Namespace.new
+    n2.require(File.join(__dir__, 'namespace', 'a.1_1_0'))
+    assert_equal "1.1.0", n2::NS_A::VERSION
+    assert_equal "yay 1.1.0", n2::NS_A.new.yay
+
+    # recheck @n is not affected by the following require
+    assert_equal "1.2.0", @n::NS_A::VERSION
+    assert_equal "yay 1.2.0", @n::NS_A.new.yay
+
+    assert_raise(NameError) { NS_A }
+  end
+
+  def test_raising_errors_in_require
+    pend unless Namespace.enabled?
+
+    assert_raise(RuntimeError, "Yay!") { @n.require(File.join(__dir__, 'namespace', 'raise')) }
+    assert Namespace.current.inspect.include?("main")
+  end
+
+  def test_autoload_in_namespace
+    pend unless Namespace.enabled?
+
+    assert_raise(NameError) { NS_A }
+
+    @n.require_relative('namespace/autoloading')
+    # autoloaded A is visible from global
+    assert_equal '1.1.0', @n::NS_A::VERSION
+
+    assert_raise(NameError) { NS_A }
+
+    # autoload trigger NS_B::BAR is valid even from global
+    assert_equal 'bar_b1', @n::NS_B::BAR
+
+    assert_raise(NameError) { NS_A }
+    assert_raise(NameError) { NS_B }
+  end
+
+  def test_continuous_top_level_method_in_a_namespace
+    pend unless Namespace.enabled?
+
+    @n.require_relative('namespace/define_toplevel')
+    @n.require_relative('namespace/call_toplevel')
+
+    assert_raise(NameError) { foo }
+  end
+
+  def test_top_level_methods_in_namespace
+    pend # TODO: fix loading/current namespace detection
+    pend unless Namespace.enabled?
+    @n.require_relative('namespace/top_level')
+    assert_equal "yay!", @n::Foo.foo
+    assert_raise(NameError) { yaaay }
+    assert_equal "foo", @n::Bar.bar
+    assert_raise_with_message(RuntimeError, "boooo") { @n::Baz.baz }
+  end
+
+  def test_proc_defined_in_namespace_refers_module_in_namespace
+    pend unless Namespace.enabled?
+
+    # require_relative dosn't work well in assert_separately even with __FILE__ and __LINE__
+    assert_separately([ENV_ENABLE_NAMESPACE], __FILE__, __LINE__, "here = '#{__dir__}'; #{<<~"begin;"}\n#{<<~'end;'}")
+    begin;
+      ns1 = Namespace.new
+      ns1.require(File.join("#{here}", 'namespace/proc_callee'))
+      proc_v = ns1::Foo.callee
+      assert_raise(NameError) { Target }
+      assert ns1::Target
+      assert_equal "fooooo", proc_v.call # refers Target in the namespace ns1
+      ns1.require(File.join("#{here}", 'namespace/proc_caller'))
+      assert_equal "fooooo", ns1::Bar.caller(proc_v)
+
+      ns2 = Namespace.new
+      ns2.require(File.join("#{here}", 'namespace/proc_caller'))
+      assert_raise(NameError) { ns2::Target }
+      assert_equal "fooooo", ns2::Bar.caller(proc_v) # refers Target in the namespace ns1
+    end;
+  end
+
+  def test_proc_defined_globally_refers_global_module
+    pend unless Namespace.enabled?
+
+    # require_relative dosn't work well in assert_separately even with __FILE__ and __LINE__
+    assert_separately([ENV_ENABLE_NAMESPACE], __FILE__, __LINE__, "here = '#{__dir__}'; #{<<~"begin;"}\n#{<<~'end;'}", ignore_stderr: true)
+    begin;
+      require(File.join("#{here}", 'namespace/proc_callee'))
+      def Target.foo
+        "yay"
+      end
+      proc_v = Foo.callee
+      assert Target
+      assert_equal "yay", proc_v.call # refers global Foo
+      ns1 = Namespace.new
+      ns1.require(File.join("#{here}", 'namespace/proc_caller'))
+      assert_equal "yay", ns1::Bar.caller(proc_v)
+
+      ns2 = Namespace.new
+      ns2.require(File.join("#{here}", 'namespace/proc_callee'))
+      ns2.require(File.join("#{here}", 'namespace/proc_caller'))
+      assert_equal "fooooo", ns2::Foo.callee.call
+      assert_equal "yay", ns2::Bar.caller(proc_v) # should refer the global Target, not Foo in ns2
+    end;
+  end
+
+  def test_instance_variable
+    pend unless Namespace.enabled?
+
+    @n.require_relative('namespace/instance_variables')
+
+    assert_equal [], String.instance_variables
+    assert_equal [:@str_ivar1, :@str_ivar2], @n::StringDelegatorObj.instance_variables
+    assert_equal 111, @n::StringDelegatorObj.str_ivar1
+    assert_equal 222, @n::StringDelegatorObj.str_ivar2
+    assert_equal 222, @n::StringDelegatorObj.instance_variable_get(:@str_ivar2)
+
+    @n::StringDelegatorObj.instance_variable_set(:@str_ivar3, 333)
+    assert_equal 333, @n::StringDelegatorObj.instance_variable_get(:@str_ivar3)
+    @n::StringDelegatorObj.remove_instance_variable(:@str_ivar1)
+    assert_nil @n::StringDelegatorObj.str_ivar1
+    assert_equal [:@str_ivar2, :@str_ivar3], @n::StringDelegatorObj.instance_variables
+
+    assert_equal [], String.instance_variables
+  end
+
+  def test_methods_added_in_namespace_are_invisible_globally
+    pend unless Namespace.enabled?
+
+    @n.require_relative('namespace/string_ext')
+
+    assert_equal "yay", @n::Bar.yay
+
+    assert_raise(NoMethodError){ String.new.yay }
+  end
+
+  def test_continuous_method_definitions_in_a_namespace
+    pend unless Namespace.enabled?
+
+    @n.require_relative('namespace/string_ext')
+    assert_equal "yay", @n::Bar.yay
+
+    @n.require_relative('namespace/string_ext_caller')
+    assert_equal "yay", @n::Foo.yay
+
+    @n.require_relative('namespace/string_ext_calling')
+  end
+
+  def test_methods_added_in_namespace_later_than_caller_code
+    pend unless Namespace.enabled?
+
+    @n.require_relative('namespace/string_ext_caller')
+    @n.require_relative('namespace/string_ext')
+
+    assert_equal "yay", @n::Bar.yay
+    assert_equal "yay", @n::Foo.yay
+  end
+
+  def test_method_added_in_namespace_are_available_on_eval
+    pend unless Namespace.enabled?
+
+    @n.require_relative('namespace/string_ext')
+    @n.require_relative('namespace/string_ext_eval_caller')
+
+    assert_equal "yay", @n::Baz.yay
+  end
+
+  def test_method_added_in_namespace_are_available_on_eval_with_binding
+    pend unless Namespace.enabled?
+
+    @n.require_relative('namespace/string_ext')
+    @n.require_relative('namespace/string_ext_eval_caller')
+
+    assert_equal "yay, yay!", @n::Baz.yay_with_binding
+  end
+
+  def test_methods_and_constants_added_by_include
+    pend unless Namespace.enabled?
+
+    @n.require_relative('namespace/open_class_with_include')
+
+    assert_equal "I'm saying foo 1", @n::OpenClassWithInclude.say
+    assert_equal "I'm saying foo 1", @n::OpenClassWithInclude.say_foo
+    assert_equal "I'm saying foo 1", @n::OpenClassWithInclude.say_with_obj("wow")
+
+    assert_raise(NameError) { String::FOO }
+
+    assert_equal "foo 1", @n::OpenClassWithInclude.refer_foo
+  end
+end
+
+module ProcLookupTestA
+  module B
+    VALUE = 111
+  end
+end
+
+class TestNamespace < Test::Unit::TestCase
+  def make_proc_from_block(&b)
+    b
+  end
+
+  def test_proc_from_main_works_with_global_definitions
+    pend unless Namespace.enabled?
+
+    @n.require_relative('namespace/procs')
+
+    proc_and_labels = [
+      [Proc.new { String.new.yay }, "Proc.new"],
+      [proc { String.new.yay }, "proc{}"],
+      [lambda { String.new.yay }, "lambda{}"],
+      [->(){ String.new.yay }, "->(){}"],
+      [make_proc_from_block { String.new.yay }, "make_proc_from_block"],
+      [@n::ProcInNS.make_proc_from_block { String.new.yay }, "make_proc_from_block in @n"],
+    ]
+
+    proc_and_labels.each do |str_pr|
+      pr, pr_label = str_pr
+      assert_raise(NoMethodError, "NoMethodError expected: #{pr_label}, called in main") { pr.call }
+      assert_raise(NoMethodError, "NoMethodError expected: #{pr_label}, called in @n") { @n::ProcInNS.call_proc(pr) }
+    end
+
+    const_and_labels = [
+      [Proc.new { ProcLookupTestA::B::VALUE }, "Proc.new"],
+      [proc { ProcLookupTestA::B::VALUE }, "proc{}"],
+      [lambda { ProcLookupTestA::B::VALUE }, "lambda{}"],
+      [->(){ ProcLookupTestA::B::VALUE }, "->(){}"],
+      [make_proc_from_block { ProcLookupTestA::B::VALUE }, "make_proc_from_block"],
+      [@n::ProcInNS.make_proc_from_block { ProcLookupTestA::B::VALUE }, "make_proc_from_block in @n"],
+    ]
+
+    const_and_labels.each do |const_pr|
+      pr, pr_label = const_pr
+      assert_equal 111, pr.call, "111 expected, #{pr_label} called in main"
+      assert_equal 111, @n::ProcInNS.call_proc(pr), "111 expected, #{pr_label} called in @n"
+    end
+  end
+
+  def test_proc_from_namespace_works_with_definitions_in_namespace
+    pend unless Namespace.enabled?
+
+    @n.require_relative('namespace/procs')
+
+    proc_types = [:proc_new, :proc_f, :lambda_f, :lambda_l, :block]
+
+    proc_types.each do |proc_type|
+      assert_equal 222, @n::ProcInNS.make_const_proc(proc_type).call, "ProcLookupTestA::B::VALUE should be 222 in @n"
+      assert_equal "foo", @n::ProcInNS.make_str_const_proc(proc_type).call, "String::FOO should be \"foo\" in @n"
+      assert_equal "yay", @n::ProcInNS.make_str_proc(proc_type).call, "String#yay should be callable in @n"
+      #
+      # TODO: method calls not-in-methods nor procs can't handle the current namespace correctly.
+      #
+      # assert_equal "yay,foo,222",
+      #              @n::ProcInNS.const_get(('CONST_' + proc_type.to_s.upcase).to_sym).call,
+      #              "Proc assigned to constants should refer constants correctly in @n"
+    end
+  end
+
+  def test_class_module_singleton_methods
+    pend unless Namespace.enabled?
+
+    @n.require_relative('namespace/singleton_methods')
+
+    assert_equal "Good evening!", @n::SingletonMethods.string_greeing # def self.greeting
+    assert_equal 42, @n::SingletonMethods.integer_answer # class << self; def answer
+    assert_equal([], @n::SingletonMethods.array_blank) # def self.blank w/ instance methods
+    assert_equal({status: 200, body: 'OK'}, @n::SingletonMethods.hash_http_200) # class << self; def ... w/ instance methods
+
+    assert_equal([4, 4], @n::SingletonMethods.array_instance_methods_return_size([1, 2, 3, 4]))
+    assert_equal([3, 3], @n::SingletonMethods.hash_instance_methods_return_size({a: 2, b: 4, c: 8}))
+
+    assert_raise(NoMethodError) { String.greeting }
+    assert_raise(NoMethodError) { Integer.answer }
+    assert_raise(NoMethodError) { Array.blank }
+    assert_raise(NoMethodError) { Hash.http_200 }
+  end
+
+  def test_add_constants_in_namespace
+    pend unless Namespace.enabled?
+
+    String.const_set(:STR_CONST0, 999)
+    assert_equal 999, String::STR_CONST0
+    assert_equal 999, String.const_get(:STR_CONST0)
+
+    assert_raise(NameError) { String.const_get(:STR_CONST1) }
+    assert_raise(NameError) { String::STR_CONST2 }
+    assert_raise(NameError) { String::STR_CONST3 }
+    assert_raise(NameError) { Integer.const_get(:INT_CONST1) }
+
+    EnvUtil.suppress_warning do
+      @n.require_relative('namespace/consts')
+    end
+    assert_equal 999, String::STR_CONST0
+    assert_raise(NameError) { String::STR_CONST1 }
+    assert_raise(NameError) { String::STR_CONST2 }
+    assert_raise(NameError) { Integer::INT_CONST1 }
+
+    assert_not_nil @n::ForConsts.refer_all
+
+    assert_equal 112, @n::ForConsts.refer1
+    assert_equal 112, @n::ForConsts.get1
+    assert_equal 112, @n::ForConsts::CONST1
+    assert_equal 222, @n::ForConsts.refer2
+    assert_equal 222, @n::ForConsts.get2
+    assert_equal 222, @n::ForConsts::CONST2
+    assert_equal 333, @n::ForConsts.refer3
+    assert_equal 333, @n::ForConsts.get3
+    assert_equal 333, @n::ForConsts::CONST3
+
+    EnvUtil.suppress_warning do
+      @n::ForConsts.const_set(:CONST3, 334)
+    end
+    assert_equal 334, @n::ForConsts::CONST3
+    assert_equal 334, @n::ForConsts.refer3
+    assert_equal 334, @n::ForConsts.get3
+
+    assert_equal 10, @n::ForConsts.refer_top_const
+
+    # use Proxy object to use usual methods instead of singleton methods
+    proxy = @n::ForConsts::Proxy.new
+
+    assert_raise(NameError){ proxy.call_str_refer0 }
+    assert_raise(NameError){ proxy.call_str_get0 }
+
+    proxy.call_str_set0(30)
+    assert_equal 30, proxy.call_str_refer0
+    assert_equal 30, proxy.call_str_get0
+    assert_equal 999, String::STR_CONST0
+
+    proxy.call_str_remove0
+    assert_raise(NameError){ proxy.call_str_refer0 }
+    assert_raise(NameError){ proxy.call_str_get0 }
+
+    assert_equal 112, proxy.call_str_refer1
+    assert_equal 112, proxy.call_str_get1
+    assert_equal 223, proxy.call_str_refer2
+    assert_equal 223, proxy.call_str_get2
+    assert_equal 333, proxy.call_str_refer3
+    assert_equal 333, proxy.call_str_get3
+
+    EnvUtil.suppress_warning do
+      proxy.call_str_set3
+    end
+    assert_equal 334, proxy.call_str_refer3
+    assert_equal 334, proxy.call_str_get3
+
+    assert_equal 1, proxy.refer_int_const1
+
+    assert_equal 999, String::STR_CONST0
+    assert_raise(NameError) { String::STR_CONST1 }
+    assert_raise(NameError) { String::STR_CONST2 }
+    assert_raise(NameError) { String::STR_CONST3 }
+    assert_raise(NameError) { Integer::INT_CONST1 }
+  end
+
+  def test_global_variables
+    default_l = $-0
+    default_f = $,
+
+    pend unless Namespace.enabled?
+
+    assert_equal "\n", $-0 # equal to $/, line splitter
+    assert_equal nil, $,   # field splitter
+
+    @n.require_relative('namespace/global_vars')
+
+    # read first
+    assert_equal "\n", @n::LineSplitter.read
+    @n::LineSplitter.write("\r\n")
+    assert_equal "\r\n", @n::LineSplitter.read
+    assert_equal "\n", $-0
+
+    # write first
+    @n::FieldSplitter.write(",")
+    assert_equal ",", @n::FieldSplitter.read
+    assert_equal nil, $,
+
+    # used only in ns
+    assert !global_variables.include?(:$used_only_in_ns)
+    @n::UniqueGvar.write(123)
+    assert_equal 123, @n::UniqueGvar.read
+    assert_nil $used_only_in_ns
+
+    # Kernel#global_variables returns the sum of all gvars.
+    global_gvars = global_variables.sort
+    assert_equal global_gvars, @n::UniqueGvar.gvars_in_ns.sort
+    @n::UniqueGvar.write_only(456)
+    assert_equal (global_gvars + [:$write_only_var_in_ns]).sort, @n::UniqueGvar.gvars_in_ns.sort
+    assert_equal (global_gvars + [:$write_only_var_in_ns]).sort, global_variables.sort
+  ensure
+    EnvUtil.suppress_warning do
+      $-0 = default_l
+      $, = default_f
+    end
+  end
+
+  def test_load_path_and_loaded_features
+    pend unless Namespace.enabled?
+
+    assert $LOAD_PATH.respond_to?(:resolve_feature_path)
+
+    @n.require_relative('namespace/load_path')
+
+    assert_not_equal $LOAD_PATH, @n::LoadPathCheck::FIRST_LOAD_PATH
+
+    assert @n::LoadPathCheck::FIRST_LOAD_PATH_RESPOND_TO_RESOLVE
+
+    namespace_dir = File.join(__dir__, 'namespace')
+    # TODO: $LOADED_FEATURES in method calls should refer the current namespace in addition to the loading namespace.
+    # assert @n::LoadPathCheck.current_loaded_features.include?(File.join(namespace_dir, 'blank1.rb'))
+    # assert !@n::LoadPathCheck.current_loaded_features.include?(File.join(namespace_dir, 'blank2.rb'))
+    # assert @n::LoadPathCheck.require_blank2
+    # assert @n::LoadPathCheck.current_loaded_features.include?(File.join(namespace_dir, 'blank2.rb'))
+
+    assert !$LOADED_FEATURES.include?(File.join(namespace_dir, 'blank1.rb'))
+    assert !$LOADED_FEATURES.include?(File.join(namespace_dir, 'blank2.rb'))
+  end
+
+  def test_eval_basic
+    pend unless Namespace.enabled?
+
+    # Test basic evaluation
+    result = @n.eval("1 + 1")
+    assert_equal 2, result
+
+    # Test string evaluation
+    result = @n.eval("'hello ' + 'world'")
+    assert_equal "hello world", result
+  end
+
+  def test_eval_with_constants
+    pend unless Namespace.enabled?
+
+    # Define a constant in the namespace via eval
+    @n.eval("TEST_CONST = 42")
+    assert_equal 42, @n::TEST_CONST
+
+    # Constant should not be visible in main namespace
+    assert_raise(NameError) { TEST_CONST }
+  end
+
+  def test_eval_with_classes
+    pend unless Namespace.enabled?
+
+    # Define a class in the namespace via eval
+    @n.eval("class TestClass; def hello; 'from namespace'; end; end")
+
+    # Class should be accessible in the namespace
+    instance = @n::TestClass.new
+    assert_equal "from namespace", instance.hello
+
+    # Class should not be visible in main namespace
+    assert_raise(NameError) { TestClass }
+  end
+
+  def test_eval_isolation
+    pend unless Namespace.enabled?
+
+    # Create another namespace
+    n2 = Namespace.new
+
+    # Define different constants in each namespace
+    @n.eval("ISOLATION_TEST = 'first'")
+    n2.eval("ISOLATION_TEST = 'second'")
+
+    # Each namespace should have its own constant
+    assert_equal "first", @n::ISOLATION_TEST
+    assert_equal "second", n2::ISOLATION_TEST
+
+    # Constants should not interfere with each other
+    assert_not_equal @n::ISOLATION_TEST, n2::ISOLATION_TEST
+  end
+
+  def test_eval_with_variables
+    pend unless Namespace.enabled?
+
+    # Test local variable access (should work within the eval context)
+    result = @n.eval("x = 10; y = 20; x + y")
+    assert_equal 30, result
+  end
+
+  def test_eval_error_handling
+    pend unless Namespace.enabled?
+
+    # Test syntax error
+    assert_raise(SyntaxError) { @n.eval("1 +") }
+
+    # Test name error
+    assert_raise(NameError) { @n.eval("undefined_variable") }
+
+    # Test that namespace is properly restored after error
+    begin
+      @n.eval("raise RuntimeError, 'test error'")
+    rescue RuntimeError
+      # Should be able to continue using the namespace
+      result = @n.eval("2 + 2")
+      assert_equal 4, result
+    end
+  end
+end
diff --git a/test/ruby/test_nomethod_error.rb b/test/ruby/test_nomethod_error.rb
index 03065359436444..6d413e63914f53 100644
--- a/test/ruby/test_nomethod_error.rb
+++ b/test/ruby/test_nomethod_error.rb
@@ -85,7 +85,7 @@ def test_message_encoding
     bug3237 = '[ruby-core:29948]'
     str = "\u2600"
     id = :"\u2604"
-    msg = "undefined method `#{id}' for an instance of String"
+    msg = "undefined method '#{id}' for an instance of String"
     assert_raise_with_message(NoMethodError, Regexp.compile(Regexp.quote(msg)), bug3237) do
       str.__send__(id)
     end
diff --git a/test/ruby/test_object.rb b/test/ruby/test_object.rb
index 3c5b6424ba125c..9074e54df5ed50 100644
--- a/test/ruby/test_object.rb
+++ b/test/ruby/test_object.rb
@@ -355,6 +355,41 @@ def test_remove_instance_variable
     end
   end
 
+  def test_remove_instance_variable_re_embed
+    require "objspace"
+
+    c = Class.new do
+      def a = @a
+
+      def b = @b
+
+      def c = @c
+    end
+
+    o1 = c.new
+    o2 = c.new
+
+    o1.instance_variable_set(:@foo, 5)
+    o1.instance_variable_set(:@a, 0)
+    o1.instance_variable_set(:@b, 1)
+    o1.instance_variable_set(:@c, 2)
+    refute_includes ObjectSpace.dump(o1), '"embedded":true'
+    o1.remove_instance_variable(:@foo)
+    assert_includes ObjectSpace.dump(o1), '"embedded":true'
+
+    o2.instance_variable_set(:@a, 0)
+    o2.instance_variable_set(:@b, 1)
+    o2.instance_variable_set(:@c, 2)
+    assert_includes ObjectSpace.dump(o2), '"embedded":true'
+
+    assert_equal(0, o1.a)
+    assert_equal(1, o1.b)
+    assert_equal(2, o1.c)
+    assert_equal(0, o2.a)
+    assert_equal(1, o2.b)
+    assert_equal(2, o2.c)
+  end
+
   def test_convert_string
     o = Object.new
     def o.to_s; 1; end
@@ -423,7 +458,7 @@ def test_check_to_integer
   end
 
   def test_max_shape_variation_with_performance_warnings
-    assert_in_out_err([], <<-INPUT, %w(), /Maximum shapes variations \(8\) reached by Foo, instance variables accesses will be slower\.$/)
+    assert_in_out_err([], <<-INPUT, %w(), /The class Foo reached 8 shape variations, instance variables accesses will be slower and memory usage increased/)
       $VERBOSE = false
       Warning[:performance] = true
 
@@ -445,15 +480,30 @@ def o.foo; 2; end
   end
 
   def test_redefine_method_which_may_case_serious_problem
-    assert_in_out_err([], <<-INPUT, [], %r"warning: redefining `object_id' may cause serious problems$")
-      $VERBOSE = false
-      def (Object.new).object_id; end
-    INPUT
+    %w(object_id __id__ __send__).each do |m|
+      assert_in_out_err([], <<-INPUT, [], %r"warning: redefining '#{m}' may cause serious problems$")
+        $VERBOSE = false
+        def (Object.new).#{m}; end
+      INPUT
 
-    assert_in_out_err([], <<-INPUT, [], %r"warning: redefining `__send__' may cause serious problems$")
-      $VERBOSE = false
-      def (Object.new).__send__; end
-    INPUT
+      assert_in_out_err([], <<-INPUT, [], %r"warning: redefining '#{m}' may cause serious problems$")
+        $VERBOSE = false
+        Class.new.define_method(:#{m}) {}
+      INPUT
+
+      assert_in_out_err([], <<-INPUT, [], %r"warning: redefining '#{m}' may cause serious problems$")
+        $VERBOSE = false
+        Class.new.attr_reader(:#{m})
+      INPUT
+
+      assert_in_out_err([], <<-INPUT, [], %r"warning: redefining '#{m}' may cause serious problems$")
+        $VERBOSE = false
+        Class.new do
+          def foo; end
+          alias #{m} foo
+        end
+      INPUT
+    end
 
     bug10421 = '[ruby-dev:48691] [Bug #10421]'
     assert_in_out_err([], <<-INPUT, ["1"], [], bug10421)
@@ -492,8 +542,8 @@ def meth1; "meth" end
     bug2202 = '[ruby-core:26074]'
     assert_raise(NoMethodError, bug2202) {o2.meth2}
 
-    %w(object_id __send__ initialize).each do |m|
-      assert_in_out_err([], <<-INPUT, %w(:ok), %r"warning: removing `#{m}' may cause serious problems$")
+    %w(object_id __id__ __send__ initialize).each do |m|
+      assert_in_out_err([], <<-INPUT, %w(:ok), %r"warning: removing '#{m}' may cause serious problems$")
         $VERBOSE = false
         begin
           Class.new.instance_eval { remove_method(:#{m}) }
@@ -900,6 +950,19 @@ def initialize
     assert_match(/\bInspect\u{3042}:.* @\u{3044}=42\b/, x.inspect)
     x.instance_variable_set("@\u{3046}".encode(Encoding::EUC_JP), 6)
     assert_match(/@\u{3046}=6\b/, x.inspect)
+
+    x = Object.new
+    x.singleton_class.class_eval do
+      private def instance_variables_to_inspect = [:@host, :@user]
+    end
+
+    x.instance_variable_set(:@host, "localhost")
+    x.instance_variable_set(:@user, "root")
+    x.instance_variable_set(:@password, "hunter2")
+    s = x.inspect
+    assert_include(s, "@host=\"localhost\"")
+    assert_include(s, "@user=\"root\"")
+    assert_not_include(s, "@password=")
   end
 
   def test_singleton_methods
diff --git a/test/ruby/test_object_id.rb b/test/ruby/test_object_id.rb
new file mode 100644
index 00000000000000..24434f8aba0ab8
--- /dev/null
+++ b/test/ruby/test_object_id.rb
@@ -0,0 +1,254 @@
+require 'test/unit'
+require "securerandom"
+
+class TestObjectId < Test::Unit::TestCase
+  def setup
+    @obj = Object.new
+  end
+
+  def test_dup_new_id
+    id = @obj.object_id
+    refute_equal id, @obj.dup.object_id
+  end
+
+  def test_dup_with_ivar_and_id
+    id = @obj.object_id
+    @obj.instance_variable_set(:@foo, 42)
+
+    copy = @obj.dup
+    refute_equal id, copy.object_id
+    assert_equal 42, copy.instance_variable_get(:@foo)
+  end
+
+  def test_dup_with_id_and_ivar
+    @obj.instance_variable_set(:@foo, 42)
+    id = @obj.object_id
+
+    copy = @obj.dup
+    refute_equal id, copy.object_id
+    assert_equal 42, copy.instance_variable_get(:@foo)
+  end
+
+  def test_dup_with_id_and_ivar_and_frozen
+    @obj.instance_variable_set(:@foo, 42)
+    @obj.freeze
+    id = @obj.object_id
+
+    copy = @obj.dup
+    refute_equal id, copy.object_id
+    assert_equal 42, copy.instance_variable_get(:@foo)
+    refute_predicate copy, :frozen?
+  end
+
+  def test_clone_new_id
+    id = @obj.object_id
+    refute_equal id, @obj.clone.object_id
+  end
+
+  def test_clone_with_ivar_and_id
+    id = @obj.object_id
+    @obj.instance_variable_set(:@foo, 42)
+
+    copy = @obj.clone
+    refute_equal id, copy.object_id
+    assert_equal 42, copy.instance_variable_get(:@foo)
+  end
+
+  def test_clone_with_id_and_ivar
+    @obj.instance_variable_set(:@foo, 42)
+    id = @obj.object_id
+
+    copy = @obj.clone
+    refute_equal id, copy.object_id
+    assert_equal 42, copy.instance_variable_get(:@foo)
+  end
+
+  def test_clone_with_id_and_ivar_and_frozen
+    @obj.instance_variable_set(:@foo, 42)
+    @obj.freeze
+    id = @obj.object_id
+
+    copy = @obj.clone
+    refute_equal id, copy.object_id
+    assert_equal 42, copy.instance_variable_get(:@foo)
+    assert_predicate copy, :frozen?
+  end
+
+  def test_marshal_new_id
+    return pass if @obj.is_a?(Module)
+
+    id = @obj.object_id
+    refute_equal id, Marshal.load(Marshal.dump(@obj)).object_id
+  end
+
+  def test_marshal_with_ivar_and_id
+    return pass if @obj.is_a?(Module)
+
+    id = @obj.object_id
+    @obj.instance_variable_set(:@foo, 42)
+
+    copy = Marshal.load(Marshal.dump(@obj))
+    refute_equal id, copy.object_id
+    assert_equal 42, copy.instance_variable_get(:@foo)
+  end
+
+  def test_marshal_with_id_and_ivar
+    return pass if @obj.is_a?(Module)
+
+    @obj.instance_variable_set(:@foo, 42)
+    id = @obj.object_id
+
+    copy = Marshal.load(Marshal.dump(@obj))
+    refute_equal id, copy.object_id
+    assert_equal 42, copy.instance_variable_get(:@foo)
+  end
+
+  def test_marshal_with_id_and_ivar_and_frozen
+    return pass if @obj.is_a?(Module)
+
+    @obj.instance_variable_set(:@foo, 42)
+    @obj.freeze
+    id = @obj.object_id
+
+    copy = Marshal.load(Marshal.dump(@obj))
+    refute_equal id, copy.object_id
+    assert_equal 42, copy.instance_variable_get(:@foo)
+    refute_predicate copy, :frozen?
+  end
+
+  def test_object_id_need_resize
+    (3 - @obj.instance_variables.size).times do |i|
+      @obj.instance_variable_set("@a_#{i}", "[Bug #21445]")
+    end
+    @obj.object_id
+    GC.start
+  end
+end
+
+class TestObjectIdClass < TestObjectId
+  def setup
+    @obj = Class.new
+  end
+end
+
+class TestObjectIdGeneric < TestObjectId
+  def setup
+    @obj = Array.new
+  end
+end
+
+class TestObjectIdTooComplex < TestObjectId
+  class TooComplex
+    def initialize
+      @too_complex_obj_id_test = 1
+    end
+  end
+
+  def setup
+    if defined?(RubyVM::Shape::SHAPE_MAX_VARIATIONS)
+      assert_equal 8, RubyVM::Shape::SHAPE_MAX_VARIATIONS
+    end
+    8.times do |i|
+      TooComplex.new.instance_variable_set("@TestObjectIdTooComplex#{i}", 1)
+    end
+    @obj = TooComplex.new
+    @obj.instance_variable_set("@a#{rand(10_000)}", 1)
+
+    if defined?(RubyVM::Shape)
+      assert_predicate(RubyVM::Shape.of(@obj), :too_complex?)
+    end
+  end
+end
+
+class TestObjectIdTooComplexClass < TestObjectId
+  class TooComplex < Module
+  end
+
+  def setup
+    if defined?(RubyVM::Shape::SHAPE_MAX_VARIATIONS)
+      assert_equal 8, RubyVM::Shape::SHAPE_MAX_VARIATIONS
+    end
+
+    @obj = TooComplex.new
+
+    @obj.instance_variable_set("@___#{SecureRandom.hex}", 1)
+
+    8.times do |i|
+      @obj.instance_variable_set("@TestObjectIdTooComplexClass#{i}", 1)
+      @obj.remove_instance_variable("@TestObjectIdTooComplexClass#{i}")
+    end
+
+    @obj.instance_variable_set("@test", 1)
+
+    if defined?(RubyVM::Shape)
+      assert_predicate(RubyVM::Shape.of(@obj), :too_complex?)
+    end
+  end
+end
+
+class TestObjectIdTooComplexGeneric < TestObjectId
+  class TooComplex < Array
+  end
+
+  def setup
+    if defined?(RubyVM::Shape::SHAPE_MAX_VARIATIONS)
+      assert_equal 8, RubyVM::Shape::SHAPE_MAX_VARIATIONS
+    end
+    8.times do |i|
+      TooComplex.new.instance_variable_set("@TestObjectIdTooComplexGeneric#{i}", 1)
+    end
+    @obj = TooComplex.new
+    @obj.instance_variable_set("@a#{rand(10_000)}", 1)
+    @obj.instance_variable_set("@a#{rand(10_000)}", 1)
+
+    if defined?(RubyVM::Shape)
+      assert_predicate(RubyVM::Shape.of(@obj), :too_complex?)
+    end
+  end
+end
+
+class TestObjectIdRactor < Test::Unit::TestCase
+  def test_object_id_race_free
+    assert_separately([], "#{<<~"begin;"}\n#{<<~'end;'}")
+    begin;
+      Warning[:experimental] = false
+      class MyClass
+        attr_reader :a, :b, :c
+        def initialize
+          @a = @b = @c = nil
+        end
+      end
+      N = 10_000
+      objs = Ractor.make_shareable(N.times.map { MyClass.new })
+      results = 4.times.map{
+        Ractor.new(objs) { |objs|
+          vars = []
+          ids = []
+          objs.each do |obj|
+            vars << obj.a << obj.b << obj.c
+            ids << obj.object_id
+          end
+          [vars, ids]
+        }
+      }.map(&:value)
+      assert_equal 1, results.uniq.size
+    end;
+  end
+
+  def test_external_object_id_ractor_move
+    assert_separately([], "#{<<~"begin;"}\n#{<<~'end;'}")
+    begin;
+      Warning[:experimental] = false
+      class MyClass
+        attr_reader :a, :b, :c
+        def initialize
+          @a = @b = @c = nil
+        end
+      end
+      obj = Ractor.make_shareable(MyClass.new)
+      object_id = obj.object_id
+      obj = Ractor.new { Ractor.receive }.send(obj, move: true).value
+      assert_equal object_id, obj.object_id
+    end;
+  end
+end
diff --git a/test/ruby/test_objectspace.rb b/test/ruby/test_objectspace.rb
index a7cfb064a87e10..f27f586ab79fca 100644
--- a/test/ruby/test_objectspace.rb
+++ b/test/ruby/test_objectspace.rb
@@ -8,7 +8,7 @@ def self.deftest_id2ref(obj)
     line = $1.to_i
     code = <<"End"
     define_method("test_id2ref_#{line}") {\
-      o = ObjectSpace._id2ref(obj.object_id);\
+      o = EnvUtil.suppress_warning { ObjectSpace._id2ref(obj.object_id) }
       assert_same(obj, o, "didn't round trip: \#{obj.inspect}");\
     }
 End
@@ -57,17 +57,20 @@ def test_id2ref_liveness
 
   def test_id2ref_invalid_argument
     msg = /no implicit conversion/
-    assert_raise_with_message(TypeError, msg) {ObjectSpace._id2ref(nil)}
-    assert_raise_with_message(TypeError, msg) {ObjectSpace._id2ref(false)}
-    assert_raise_with_message(TypeError, msg) {ObjectSpace._id2ref(true)}
-    assert_raise_with_message(TypeError, msg) {ObjectSpace._id2ref(:a)}
-    assert_raise_with_message(TypeError, msg) {ObjectSpace._id2ref("0")}
-    assert_raise_with_message(TypeError, msg) {ObjectSpace._id2ref(Object.new)}
+    assert_raise_with_message(TypeError, msg) { EnvUtil.suppress_warning { ObjectSpace._id2ref(nil) } }
+    assert_raise_with_message(TypeError, msg) { EnvUtil.suppress_warning { ObjectSpace._id2ref(false) } }
+    assert_raise_with_message(TypeError, msg) { EnvUtil.suppress_warning { ObjectSpace._id2ref(true) } }
+    assert_raise_with_message(TypeError, msg) { EnvUtil.suppress_warning { ObjectSpace._id2ref(:a) } }
+    assert_raise_with_message(TypeError, msg) { EnvUtil.suppress_warning { ObjectSpace._id2ref("0") } }
+    assert_raise_with_message(TypeError, msg) { EnvUtil.suppress_warning { ObjectSpace._id2ref(Object.new) } }
   end
 
   def test_id2ref_invalid_symbol_id
-    msg = /is not symbol id value/
-    assert_raise_with_message(RangeError, msg) { ObjectSpace._id2ref(:a.object_id + GC::INTERNAL_CONSTANTS[:RVALUE_SIZE]) }
+    # RB_STATIC_SYM_P checks for static symbols by checking that the bottom
+    # 8 bits of the object is equal to RUBY_SYMBOL_FLAG, so we need to make
+    # sure that the bottom 8 bits remain unchanged.
+    msg = /is not a symbol id value/
+    assert_raise_with_message(RangeError, msg) { EnvUtil.suppress_warning { ObjectSpace._id2ref(:a.object_id + 256) } }
   end
 
   def test_count_objects
@@ -91,13 +94,27 @@ def test_count_objects
   end
 
   def test_finalizer
-    assert_in_out_err(["-e", <<-END], "", %w(:ok :ok :ok :ok), [])
+    assert_in_out_err(["-e", <<-END], "", %w(:ok :ok :ok), [])
       a = []
       ObjectSpace.define_finalizer(a) { p :ok }
       b = a.dup
       ObjectSpace.define_finalizer(a) { p :ok }
       !b
     END
+
+    assert_in_out_err(["-e", <<~RUBY], "", %w(:ok :ok), [], timeout: 60)
+      a = Object.new
+      ObjectSpace.define_finalizer(a) { p :ok }
+
+      1_000_000.times do
+        o = Object.new
+        ObjectSpace.define_finalizer(o) { }
+      end
+
+      b = Object.new
+      ObjectSpace.define_finalizer(b) { p :ok }
+    RUBY
+
     assert_raise(ArgumentError) { ObjectSpace.define_finalizer([], Object.new) }
 
     code = proc do |priv|
@@ -120,6 +137,25 @@ class << fin
     }
   end
 
+  def test_finalizer_copy
+    assert_in_out_err(["-e", <<~'RUBY'], "", %w(:ok), [])
+      def fin
+        ids = Set.new
+        ->(id) { puts "object_id (#{id}) reused" unless ids.add?(id) }
+      end
+
+      OBJ = Object.new
+      ObjectSpace.define_finalizer(OBJ, fin)
+      OBJ.freeze
+
+      10.times do
+        OBJ.clone
+      end
+
+      p :ok
+    RUBY
+  end
+
   def test_finalizer_with_super
     assert_in_out_err(["-e", <<-END], "", %w(:ok), [])
       class A
@@ -174,30 +210,28 @@ def test_exception_in_finalizer
   end
 
   def test_finalizer_thread_raise
-    GC.disable
-    fzer = proc do |id|
-      sleep 0.2
-    end
-    2.times do
-      o = Object.new
-      ObjectSpace.define_finalizer(o, fzer)
-    end
+    EnvUtil.without_gc do
+      fzer = proc do |id|
+        sleep 0.2
+      end
+      2.times do
+        o = Object.new
+        ObjectSpace.define_finalizer(o, fzer)
+      end
 
-    my_error = Class.new(RuntimeError)
-    begin
-      main_th = Thread.current
-      Thread.new do
-        sleep 0.1
-        main_th.raise(my_error)
+      my_error = Class.new(RuntimeError)
+      begin
+        main_th = Thread.current
+        Thread.new do
+          sleep 0.1
+          main_th.raise(my_error)
+        end
+        GC.start
+        sleep(10)
+        assert(false)
+      rescue my_error
       end
-      GC.start
-      puts "After GC"
-      sleep(10)
-      assert(false)
-    rescue my_error
     end
-  ensure
-    GC.enable
   end
 
   def test_each_object
diff --git a/test/ruby/test_optimization.rb b/test/ruby/test_optimization.rb
index 8d669e502ccc61..e39eafa5e50bb9 100644
--- a/test/ruby/test_optimization.rb
+++ b/test/ruby/test_optimization.rb
@@ -16,6 +16,18 @@ def #{method}(*args)
     end;
   end
 
+  def assert_performance_warning(klass, method)
+    assert_in_out_err([], "#{<<-"begin;"}\n#{<<~"end;"}", [], ["-:4: warning: Redefining '#{klass}##{method}' disables interpreter and JIT optimizations"])
+    begin;
+      Warning[:performance] = true
+      class #{klass}
+        undef #{method}
+        def #{method}
+        end
+      end
+    end;
+  end
+
   def disasm(name)
     RubyVM::InstructionSequence.of(method(name)).disasm
   end
@@ -23,102 +35,122 @@ def disasm(name)
   def test_fixnum_plus
     assert_equal 21, 10 + 11
     assert_redefine_method('Integer', '+', 'assert_equal 11, 10 + 11')
+    assert_performance_warning('Integer', '+')
   end
 
   def test_fixnum_minus
     assert_equal 5, 8 - 3
     assert_redefine_method('Integer', '-', 'assert_equal 3, 8 - 3')
+    assert_performance_warning('Integer', '-')
   end
 
   def test_fixnum_mul
     assert_equal 15, 3 * 5
     assert_redefine_method('Integer', '*', 'assert_equal 5, 3 * 5')
+    assert_performance_warning('Integer', '*')
   end
 
   def test_fixnum_div
     assert_equal 3, 15 / 5
     assert_redefine_method('Integer', '/', 'assert_equal 5, 15 / 5')
+    assert_performance_warning('Integer', '/')
   end
 
   def test_fixnum_mod
     assert_equal 1, 8 % 7
     assert_redefine_method('Integer', '%', 'assert_equal 7, 8 % 7')
+    assert_performance_warning('Integer', '%')
   end
 
   def test_fixnum_lt
     assert_equal true, 1 < 2
     assert_redefine_method('Integer', '<', 'assert_equal 2, 1 < 2')
+    assert_performance_warning('Integer', '<')
   end
 
   def test_fixnum_le
     assert_equal true, 1 <= 2
     assert_redefine_method('Integer', '<=', 'assert_equal 2, 1 <= 2')
+    assert_performance_warning('Integer', '<=')
   end
 
   def test_fixnum_gt
     assert_equal false, 1 > 2
     assert_redefine_method('Integer', '>', 'assert_equal 2, 1 > 2')
+    assert_performance_warning('Integer', '>')
   end
 
   def test_fixnum_ge
     assert_equal false, 1 >= 2
     assert_redefine_method('Integer', '>=', 'assert_equal 2, 1 >= 2')
+    assert_performance_warning('Integer', '>=')
   end
 
   def test_float_plus
     assert_equal 4.0, 2.0 + 2.0
     assert_redefine_method('Float', '+', 'assert_equal 2.0, 2.0 + 2.0')
+    assert_performance_warning('Float', '+')
   end
 
   def test_float_minus
     assert_equal 4.0, 2.0 + 2.0
-    assert_redefine_method('Float', '+', 'assert_equal 2.0, 2.0 + 2.0')
+    assert_redefine_method('Float', '-', 'assert_equal 2.0, 4.0 - 2.0')
+    assert_performance_warning('Float', '-')
   end
 
   def test_float_mul
     assert_equal 29.25, 4.5 * 6.5
     assert_redefine_method('Float', '*', 'assert_equal 6.5, 4.5 * 6.5')
+    assert_performance_warning('Float', '*')
   end
 
   def test_float_div
     assert_in_delta 0.63063063063063063, 4.2 / 6.66
     assert_redefine_method('Float', '/', 'assert_equal 6.66, 4.2 / 6.66', "[Bug #9238]")
+    assert_performance_warning('Float', '/')
   end
 
   def test_float_lt
     assert_equal true, 1.1 < 2.2
     assert_redefine_method('Float', '<', 'assert_equal 2.2, 1.1 < 2.2')
+    assert_performance_warning('Float', '<')
   end
 
   def test_float_le
     assert_equal true, 1.1 <= 2.2
     assert_redefine_method('Float', '<=', 'assert_equal 2.2, 1.1 <= 2.2')
+    assert_performance_warning('Float', '<=')
   end
 
   def test_float_gt
     assert_equal false, 1.1 > 2.2
     assert_redefine_method('Float', '>', 'assert_equal 2.2, 1.1 > 2.2')
+    assert_performance_warning('Float', '>')
   end
 
   def test_float_ge
     assert_equal false, 1.1 >= 2.2
     assert_redefine_method('Float', '>=', 'assert_equal 2.2, 1.1 >= 2.2')
+    assert_performance_warning('Float', '>=')
   end
 
   def test_string_length
     assert_equal 6, "string".length
     assert_redefine_method('String', 'length', 'assert_nil "string".length')
+    assert_performance_warning('String', 'length')
   end
 
   def test_string_size
     assert_equal 6, "string".size
     assert_redefine_method('String', 'size', 'assert_nil "string".size')
+    assert_performance_warning('String', 'size')
   end
 
   def test_string_empty?
     assert_equal true, "".empty?
     assert_equal false, "string".empty?
     assert_redefine_method('String', 'empty?', 'assert_nil "string".empty?')
+    assert_performance_warning('String', 'empty?')
   end
 
   def test_string_plus
@@ -127,39 +159,50 @@ def test_string_plus
     assert_equal "x", "" + "x"
     assert_equal "ab", "a" + "b"
     assert_redefine_method('String', '+', 'assert_equal "b", "a" + "b"')
+    assert_performance_warning('String', '+')
   end
 
   def test_string_succ
     assert_equal 'b', 'a'.succ
     assert_equal 'B', 'A'.succ
+    assert_performance_warning('String', 'succ')
   end
 
   def test_string_format
     assert_equal '2', '%d' % 2
     assert_redefine_method('String', '%', 'assert_equal 2, "%d" % 2')
+    assert_performance_warning('String', '%')
   end
 
   def test_string_freeze
     assert_equal "foo", "foo".freeze
     assert_equal "foo".freeze.object_id, "foo".freeze.object_id
     assert_redefine_method('String', 'freeze', 'assert_nil "foo".freeze')
+    assert_performance_warning('String', 'freeze')
   end
 
   def test_string_uminus
     assert_same "foo".freeze, -"foo"
     assert_redefine_method('String', '-@', 'assert_nil(-"foo")')
+    assert_performance_warning('String', '-@')
   end
 
   def test_array_min
     assert_equal 1, [1, 2, 4].min
     assert_redefine_method('Array', 'min', 'assert_nil([1, 2, 4].min)')
     assert_redefine_method('Array', 'min', 'assert_nil([1 + 0, 2, 4].min)')
+    assert_performance_warning('Array', 'min')
   end
 
   def test_array_max
     assert_equal 4, [1, 2, 4].max
     assert_redefine_method('Array', 'max', 'assert_nil([1, 2, 4].max)')
     assert_redefine_method('Array', 'max', 'assert_nil([1 + 0, 2, 4].max)')
+    assert_performance_warning('Array', 'max')
+  end
+
+  def test_array_hash
+    assert_performance_warning('Array', 'hash')
   end
 
   def test_trace_optimized_methods
@@ -235,6 +278,8 @@ def test_string_eq_neq
         assert_equal :b, (b #{m} "b").to_sym
       end
     end
+
+    assert_performance_warning('String', '==')
   end
 
   def test_string_ltlt
@@ -243,50 +288,59 @@ def test_string_ltlt
     assert_equal "x", "" << "x"
     assert_equal "ab", "a" << "b"
     assert_redefine_method('String', '<<', 'assert_equal "b", "a" << "b"')
+    assert_performance_warning('String', '<<')
   end
 
   def test_fixnum_and
     assert_equal 1, 1&3
     assert_redefine_method('Integer', '&', 'assert_equal 3, 1&3')
+    assert_performance_warning('Integer', '&')
   end
 
   def test_fixnum_or
     assert_equal 3, 1|3
     assert_redefine_method('Integer', '|', 'assert_equal 1, 3|1')
+    assert_performance_warning('Integer', '|')
   end
 
   def test_array_plus
     assert_equal [1,2], [1]+[2]
     assert_redefine_method('Array', '+', 'assert_equal [2], [1]+[2]')
+    assert_performance_warning('Array', '+')
   end
 
   def test_array_minus
     assert_equal [2], [1,2] - [1]
     assert_redefine_method('Array', '-', 'assert_equal [1], [1,2]-[1]')
+    assert_performance_warning('Array', '-')
   end
 
   def test_array_length
     assert_equal 0, [].length
     assert_equal 3, [1,2,3].length
     assert_redefine_method('Array', 'length', 'assert_nil([].length); assert_nil([1,2,3].length)')
+    assert_performance_warning('Array', 'length')
   end
 
   def test_array_empty?
     assert_equal true, [].empty?
     assert_equal false, [1,2,3].empty?
     assert_redefine_method('Array', 'empty?', 'assert_nil([].empty?); assert_nil([1,2,3].empty?)')
+    assert_performance_warning('Array', 'empty?')
   end
 
   def test_hash_length
     assert_equal 0, {}.length
     assert_equal 1, {1=>1}.length
     assert_redefine_method('Hash', 'length', 'assert_nil({}.length); assert_nil({1=>1}.length)')
+    assert_performance_warning('Hash', 'length')
   end
 
   def test_hash_empty?
     assert_equal true, {}.empty?
     assert_equal false, {1=>1}.empty?
     assert_redefine_method('Hash', 'empty?', 'assert_nil({}.empty?); assert_nil({1=>1}.empty?)')
+    assert_performance_warning('Hash', 'empty?')
   end
 
   def test_hash_aref_with
@@ -297,6 +351,7 @@ def test_hash_aref_with
       h = { "foo" => 1 }
       assert_equal "foo", h["foo"]
     end;
+    assert_performance_warning('Hash', '[]')
   end
 
   def test_hash_aset_with
@@ -308,6 +363,7 @@ def test_hash_aset_with
       assert_equal 1, h["foo"] = 1, "assignment always returns value set"
       assert_nil h["foo"]
     end;
+    assert_performance_warning('Hash', '[]=')
   end
 
   class MyObj
@@ -451,6 +507,17 @@ def one_plus_two
     assert_equal(3, one_plus_two)
   end
 
+  def test_tailcall_and_post_arg
+    tailcall(<<~RUBY)
+      def ret_const = :ok
+
+      def post_arg(_a = 1, _b) = ret_const
+    RUBY
+
+    # YJIT probably uses a fallback on the call to post_arg
+    assert_equal(:ok, post_arg(0))
+  end
+
   def test_tailcall_interrupted_by_sigint
     bug12576 = 'ruby-core:76327'
     script = "#{<<-"begin;"}\n#{<<~'end;'}"
@@ -524,7 +591,6 @@ def run(current, final)
   end
 
   def test_tailcall_not_to_grow_stack
-    omit 'currently JIT-ed code always creates a new stack frame' if defined?(RubyVM::RJIT) && RubyVM::RJIT.enabled?
     bug16161 = '[ruby-core:94881]'
 
     tailcall("#{<<-"begin;"}\n#{<<~"end;"}")
@@ -566,7 +632,7 @@ def test_string_freeze_block
     begin;
       class String
         undef freeze
-        def freeze
+        def freeze(&)
           block_given?
         end
       end
@@ -628,6 +694,7 @@ def test_eqq
     [ nil, true, false, 0.1, :sym, 'str', 0xffffffffffffffff ].each do |v|
       k = v.class.to_s
       assert_redefine_method(k, '===', "assert_equal(#{v.inspect} === 0, 0)")
+      assert_performance_warning(k, '===')
     end
   end
 
@@ -681,6 +748,98 @@ def test_peephole_dstr
     end
   end
 
+  def test_peephole_array_freeze
+    code = "#{<<~'begin;'}\n#{<<~'end;'}"
+    begin;
+      [1].freeze
+    end;
+    iseq = RubyVM::InstructionSequence.compile(code)
+    insn = iseq.disasm
+    assert_match(/opt_ary_freeze/, insn)
+    assert_no_match(/duparray/, insn)
+    assert_no_match(/send/, insn)
+    assert_predicate([1].freeze, :frozen?)
+    assert_in_out_err([], <<~RUBY, [":ok"])
+      class Array
+        prepend Module.new {
+          def freeze
+            :ok
+          end
+        }
+      end
+      p [1].freeze
+    RUBY
+  end
+
+  def test_peephole_array_freeze_empty
+    code = "#{<<~'begin;'}\n#{<<~'end;'}"
+    begin;
+      [].freeze
+    end;
+    iseq = RubyVM::InstructionSequence.compile(code)
+    insn = iseq.disasm
+    assert_match(/opt_ary_freeze/, insn)
+    assert_no_match(/duparray/, insn)
+    assert_no_match(/send/, insn)
+    assert_predicate([].freeze, :frozen?)
+    assert_in_out_err([], <<~RUBY, [":ok"])
+      class Array
+        prepend Module.new {
+          def freeze
+            :ok
+          end
+        }
+      end
+      p [].freeze
+    RUBY
+  end
+
+  def test_peephole_hash_freeze
+    code = "#{<<~'begin;'}\n#{<<~'end;'}"
+    begin;
+      {a:1}.freeze
+    end;
+    iseq = RubyVM::InstructionSequence.compile(code)
+    insn = iseq.disasm
+    assert_match(/opt_hash_freeze/, insn)
+    assert_no_match(/duphash/, insn)
+    assert_no_match(/send/, insn)
+    assert_predicate([1].freeze, :frozen?)
+    assert_in_out_err([], <<~RUBY, [":ok"])
+      class Hash
+        prepend Module.new {
+          def freeze
+            :ok
+          end
+        }
+      end
+      p({a:1}.freeze)
+    RUBY
+  end
+
+  def test_peephole_hash_freeze_empty
+    code = "#{<<~'begin;'}\n#{<<~'end;'}"
+    begin;
+      {}.freeze
+    end;
+    iseq = RubyVM::InstructionSequence.compile(code)
+    insn = iseq.disasm
+    assert_match(/opt_hash_freeze/, insn)
+    assert_no_match(/duphash/, insn)
+    assert_no_match(/send/, insn)
+    assert_predicate([].freeze, :frozen?)
+    assert_in_out_err([], <<~RUBY, [":ok"])
+      class Hash
+        prepend Module.new {
+          def freeze
+            :ok
+          end
+        }
+      end
+      p({}.freeze)
+    RUBY
+  end
+
   def test_branch_condition_backquote
     bug = '[ruby-core:80740] [Bug #13444] redefined backquote should be called'
     class << self
@@ -947,4 +1106,164 @@ def test_objtostring
     def o.to_s; 1; end
     assert_match %r{\A#<Object:0x[0-9a-f]+>\z}, "#{o}"
   end
+
+  def test_opt_duparray_send_include_p
+    [
+      'x = :b; [:a, :b].include?(x)',
+      '@c = :b; [:a, :b].include?(@c)',
+      '@c = "b"; %i[a b].include?(@c.to_sym)',
+      '[:a, :b].include?(self) == false',
+    ].each do |code|
+      iseq = RubyVM::InstructionSequence.compile(code)
+      insn = iseq.disasm
+      assert_match(/opt_duparray_send/, insn)
+      assert_no_match(/\bduparray\b/, insn)
+      assert_equal(true, eval(code))
+    end
+
+    x, y = :b, :c
+    assert_equal(true,  [:a, :b].include?(x))
+    assert_equal(false, [:a, :b].include?(y))
+
+    assert_in_out_err([], <<~RUBY, ["1,2", "3,3", "1,2", "4,4"])
+      class Array
+        prepend(Module.new do
+          def include?(i)
+            puts self.join(",")
+            # Modify self to prove that we are operating on a copy.
+            map! { i }
+            puts self.join(",")
+          end
+        end)
+      end
+      def x(i)
+        [1, 2].include?(i)
+      end
+      x(3)
+      x(4)
+    RUBY
+
+    # Ensure raises happen correctly.
+    assert_in_out_err([], <<~RUBY, ["will raise", "int 1 not 3"])
+      class Integer
+        undef_method :==
+        def == x
+          raise "int \#{self} not \#{x}"
+        end
+      end
+      x = 3
+      puts "will raise"
+      begin
+        p [1, 2].include?(x)
+      rescue
+        puts $!
+      end
+    RUBY
+  end
+
+  def test_opt_newarray_send_include_p
+    [
+      'b = :b; [:a, b].include?(:b)',
+      # Use Object.new to ensure that we get newarray rather than duparray.
+      'value = 1; [Object.new, true, "true", 1].include?(value)',
+      'value = 1; [Object.new, "1"].include?(value.to_s)',
+      '[Object.new, "1"].include?(self) == false',
+    ].each do |code|
+      iseq = RubyVM::InstructionSequence.compile(code)
+      insn = iseq.disasm
+      assert_match(/opt_newarray_send/, insn)
+      assert_no_match(/\bnewarray\b/, insn)
+      assert_equal(true, eval(code))
+    end
+
+    x, y = :b, :c
+    assert_equal(true,  [:a, x].include?(x))
+    assert_equal(false, [:a, x].include?(y))
+
+    assert_in_out_err([], <<~RUBY, ["1,3", "3,3", "1,4", "4,4"])
+      class Array
+        prepend(Module.new do
+          def include?(i)
+            puts self.join(",")
+            # Modify self to prove that we are operating on a copy.
+            map! { i }
+            puts self.join(",")
+          end
+        end)
+      end
+      def x(i)
+        [1, i].include?(i)
+      end
+      x(3)
+      x(4)
+    RUBY
+
+    # Ensure raises happen correctly.
+    assert_in_out_err([], <<~RUBY, ["will raise", "int 1 not 3"])
+      class Integer
+        undef_method :==
+        def == x
+          raise "int \#{self} not \#{x}"
+        end
+      end
+      x = 3
+      puts "will raise"
+      begin
+        p [1, x].include?(x)
+      rescue
+        puts $!
+      end
+    RUBY
+  end
+
+  def test_opt_new_with_safe_navigation
+    payload = nil
+    assert_nil payload&.new
+  end
+
+  def test_opt_new
+    pos_initialize = "
+      def initialize a, b
+        @a = a
+        @b = b
+      end
+    "
+    kw_initialize = "
+      def initialize a:, b:
+        @a = a
+        @b = b
+      end
+    "
+    kw_hash_initialize = "
+      def initialize a, **kw
+        @a = a
+        @b = kw[:b]
+      end
+    "
+    pos_prelude = "class OptNewFoo; #{pos_initialize}; end;"
+    kw_prelude = "class OptNewFoo; #{kw_initialize}; end;"
+    kw_hash_prelude = "class OptNewFoo; #{kw_hash_initialize}; end;"
+    [
+      "#{pos_prelude} OptNewFoo.new 1, 2",
+      "#{pos_prelude} a = 1; b = 2; OptNewFoo.new a, b",
+      "#{pos_prelude} def optnew_foo(a, b) = OptNewFoo.new(a, b); optnew_foo 1, 2",
+      "#{pos_prelude} def optnew_foo(*a) = OptNewFoo.new(*a); optnew_foo 1, 2",
+      "#{pos_prelude} def optnew_foo(...) = OptNewFoo.new(...); optnew_foo 1, 2",
+      "#{kw_prelude} def optnew_foo(**a) = OptNewFoo.new(**a); optnew_foo a: 1, b: 2",
+      "#{kw_hash_prelude} def optnew_foo(*a, **b) = OptNewFoo.new(*a, **b); optnew_foo 1, b: 2",
+    ].each do |code|
+      iseq = RubyVM::InstructionSequence.compile(code)
+      insn = iseq.disasm
+      assert_match(/opt_new/, insn)
+      assert_match(/OptNewFoo:.+@a=1, @b=2/, iseq.eval.inspect)
+    end
+    [
+      'def optnew_foo(&) = OptNewFoo.new(&)',
+      'def optnew_foo(a, ...) = OptNewFoo.new(a, ...)',
+    ].each do |code|
+      iseq = RubyVM::InstructionSequence.compile(code)
+      insn = iseq.disasm
+      assert_no_match(/opt_new/, insn)
+    end
+  end
 end
diff --git a/test/ruby/test_pack.rb b/test/ruby/test_pack.rb
index 27573ef457be86..ca089f09c3dc4b 100644
--- a/test/ruby/test_pack.rb
+++ b/test/ruby/test_pack.rb
@@ -1,8 +1,13 @@
 # coding: US-ASCII
 # frozen_string_literal: false
 require 'test/unit'
+require 'rbconfig'
+require 'rbconfig/sizeof'
 
 class TestPack < Test::Unit::TestCase
+  # Note: the size of intptr_t and uintptr_t should be equal.
+  J_SIZE = RbConfig::SIZEOF['uintptr_t']
+
   def test_pack
     format = "c2x5CCxsdils_l_a6";
     # Need the expression in here to force ary[5] to be numeric.  This avoids
@@ -93,11 +98,11 @@ def _integer_big_endian(mod='')
     assert_equal("\x01\x02\x03\x04", [0x01020304].pack("L"+mod))
     assert_equal("\x01\x02\x03\x04\x05\x06\x07\x08", [0x0102030405060708].pack("q"+mod))
     assert_equal("\x01\x02\x03\x04\x05\x06\x07\x08", [0x0102030405060708].pack("Q"+mod))
-    psize = [nil].pack('p').bytesize
-    if psize == 4
+    case J_SIZE
+    when 4
       assert_equal("\x01\x02\x03\x04", [0x01020304].pack("j"+mod))
       assert_equal("\x01\x02\x03\x04", [0x01020304].pack("J"+mod))
-    elsif psize == 8
+    when 8
       assert_equal("\x01\x02\x03\x04\x05\x06\x07\x08", [0x0102030405060708].pack("j"+mod))
       assert_equal("\x01\x02\x03\x04\x05\x06\x07\x08", [0x0102030405060708].pack("J"+mod))
     end
@@ -109,10 +114,11 @@ def _integer_big_endian(mod='')
     assert_match(/\A\x00*\x01\x02\x03\x04\z/, [0x01020304].pack("I!"+mod))
     assert_match(/\A\x00*\x01\x02\x03\x04\z/, [0x01020304].pack("l!"+mod))
     assert_match(/\A\x00*\x01\x02\x03\x04\z/, [0x01020304].pack("L!"+mod))
-    if psize == 4
+    case J_SIZE
+    when 4
       assert_match(/\A\x00*\x01\x02\x03\x04\z/, [0x01020304].pack("j!"+mod))
       assert_match(/\A\x00*\x01\x02\x03\x04\z/, [0x01020304].pack("J!"+mod))
-    elsif psize == 8
+    when 8
       assert_match(/\A\x00*\x01\x02\x03\x04\x05\x06\x07\x08\z/, [0x0102030405060708].pack("j!"+mod))
       assert_match(/\A\x00*\x01\x02\x03\x04\x05\x06\x07\x08\z/, [0x0102030405060708].pack("J!"+mod))
     end
@@ -141,11 +147,11 @@ def _integer_little_endian(mod='')
     assert_equal("\x04\x03\x02\x01", [0x01020304].pack("L"+mod))
     assert_equal("\x08\x07\x06\x05\x04\x03\x02\x01", [0x0102030405060708].pack("q"+mod))
     assert_equal("\x08\x07\x06\x05\x04\x03\x02\x01", [0x0102030405060708].pack("Q"+mod))
-    psize = [nil].pack('p').bytesize
-    if psize == 4
+    case J_SIZE
+    when 4
       assert_equal("\x04\x03\x02\x01", [0x01020304].pack("j"+mod))
       assert_equal("\x04\x03\x02\x01", [0x01020304].pack("J"+mod))
-    elsif psize == 8
+    when 8
       assert_equal("\x08\x07\x06\x05\x04\x03\x02\x01", [0x0102030405060708].pack("j"+mod))
       assert_equal("\x08\x07\x06\x05\x04\x03\x02\x01", [0x0102030405060708].pack("J"+mod))
     end
@@ -157,10 +163,11 @@ def _integer_little_endian(mod='')
     assert_match(/\A\x04\x03\x02\x01\x00*\z/, [0x01020304].pack("I!"+mod))
     assert_match(/\A\x04\x03\x02\x01\x00*\z/, [0x01020304].pack("l!"+mod))
     assert_match(/\A\x04\x03\x02\x01\x00*\z/, [0x01020304].pack("L!"+mod))
-    if psize == 4
+    case J_SIZE
+    when 4
       assert_match(/\A\x04\x03\x02\x01\x00*\z/, [0x01020304].pack("j!"+mod))
       assert_match(/\A\x04\x03\x02\x01\x00*\z/, [0x01020304].pack("J!"+mod))
-    elsif psize == 8
+    when 8
       assert_match(/\A\x08\x07\x06\x05\x04\x03\x02\x01\x00*\z/, [0x0102030405060708].pack("j!"+mod))
       assert_match(/\A\x08\x07\x06\x05\x04\x03\x02\x01\x00*\z/, [0x0102030405060708].pack("J!"+mod))
     end
@@ -196,8 +203,8 @@ def test_integer_endian
   end
 
   def test_integer_endian_explicit
-      _integer_big_endian('>')
-      _integer_little_endian('<')
+    _integer_big_endian('>')
+    _integer_little_endian('<')
   end
 
   def test_pack_U
@@ -442,7 +449,6 @@ def test_pack_unpack_lL
     assert_operator(4, :<=, [1].pack("L!").bytesize)
   end
 
-  require 'rbconfig'
   def test_pack_unpack_qQ
     s1 = [578437695752307201, -506097522914230529].pack("q*")
     s2 = [578437695752307201, 17940646550795321087].pack("Q*")
@@ -465,10 +471,8 @@ def test_pack_unpack_qQ
   end if RbConfig::CONFIG['HAVE_LONG_LONG']
 
   def test_pack_unpack_jJ
-    # Note: we assume that the size of intptr_t and uintptr_t equals to the size
-    # of real pointer.
-    psize = [nil].pack("p").bytesize
-    if psize == 4
+    case J_SIZE
+    when 4
       s1 = [67305985, -50462977].pack("j*")
       s2 = [67305985, 4244504319].pack("J*")
       assert_equal(s1, s2)
@@ -482,7 +486,7 @@ def test_pack_unpack_jJ
 
       assert_equal(4, [1].pack("j").bytesize)
       assert_equal(4, [1].pack("J").bytesize)
-    elsif psize == 8
+    when 8
       s1 = [578437695752307201, -506097522914230529].pack("j*")
       s2 = [578437695752307201, 17940646550795321087].pack("J*")
       assert_equal(s1, s2)
@@ -891,4 +895,45 @@ def test_unpack_offset
     }
     assert_equal [nil], "a".unpack("C", offset: 1)
   end
+
+  def test_monkey_pack
+    assert_separately([], <<-'end;')
+      $-w = false
+      class Array
+        alias :old_pack :pack
+        def pack _; "oh no"; end
+      end
+
+      v = [2 ** 15].pack('n')
+
+      class Array
+        alias :pack :old_pack
+      end
+
+      assert_equal "oh no", v
+    end;
+  end
+
+  def test_monkey_pack_buffer
+    assert_separately([], <<-'end;')
+      $-w = false
+      class Array
+        alias :old_pack :pack
+        def pack _, buffer:; buffer << " no"; end
+      end
+
+      def test
+        b = +"oh"
+        [2 ** 15].pack('n', buffer: b)
+      end
+
+      v = test
+
+      class Array
+        alias :pack :old_pack
+      end
+
+      assert_equal "oh no", v
+    end;
+  end
 end
diff --git a/test/ruby/test_parse.rb b/test/ruby/test_parse.rb
index cf989d190b20f0..98e95b98afaf77 100644
--- a/test/ruby/test_parse.rb
+++ b/test/ruby/test_parse.rb
@@ -2,6 +2,7 @@
 # frozen_string_literal: false
 require 'test/unit'
 require 'stringio'
+require_relative '../lib/parser_support'
 
 class TestParse < Test::Unit::TestCase
   def setup
@@ -18,7 +19,7 @@ def test_error_line
   end
 
   def test_else_without_rescue
-    assert_syntax_error(<<-END, %r":#{__LINE__+2}: else without rescue"o, [__FILE__, __LINE__+1])
+    assert_syntax_error(<<-END, %r"(:#{__LINE__+2}:|#{__LINE__+2} \|.+?\n.+?\^~.+?;) else without rescue"o, [__FILE__, __LINE__+1])
       begin
       else
         42
@@ -185,6 +186,15 @@ def foo
       end;
     end
 
+    c = Class.new
+    c.freeze
+    assert_valid_syntax("#{<<~"begin;"}\n#{<<~'end;'}") do
+      begin;
+        c::FOO &= p 1
+        ::FOO &= p 1
+      end;
+    end
+
     assert_syntax_error("#{<<~"begin;"}\n#{<<~'end;'}", /Can't set variable/) do
       begin;
         $1 &= 1
@@ -378,10 +388,10 @@ def test_dsym
 
   def assert_disallowed_variable(type, noname, invalid)
     noname.each do |name|
-      assert_syntax_error("proc{a = #{name} }", "`#{noname[0]}' without identifiers is not allowed as #{type} variable name")
+      assert_syntax_error("proc{a = #{name} }", "'#{noname[0]}' without identifiers is not allowed as #{type} variable name")
     end
     invalid.each do |name|
-      assert_syntax_error("proc {a = #{name} }", "`#{name}' is not allowed as #{type} variable name")
+      assert_syntax_error("proc {a = #{name} }", "'#{name}' is not allowed as #{type} variable name")
     end
   end
 
@@ -453,10 +463,52 @@ def foo(a, a); end
   end
 
   def test_define_singleton_error
-    assert_syntax_error("#{<<~"begin;"}\n#{<<~'end;'}", /singleton method for literals/) do
-      begin;
-        def ("foo").foo; end
-      end;
+    msg = /singleton method for literals/
+    assert_parse_error(%q[def ("foo").foo; end], msg)
+    assert_parse_error(%q[def (1).foo; end], msg)
+    assert_parse_error(%q[def ((1;1)).foo; end], msg)
+    assert_parse_error(%q[def ((;1)).foo; end], msg)
+    assert_parse_error(%q[def ((1+1;1)).foo; end], msg)
+    assert_parse_error(%q[def ((%s();1)).foo; end], msg)
+    assert_parse_error(%q[def ((%w();1)).foo; end], msg)
+    assert_parse_error(%q[def ("#{42}").foo; end], msg)
+    assert_parse_error(%q[def (:"#{42}").foo; end], msg)
+    assert_parse_error(%q[def ([]).foo; end], msg)
+    assert_parse_error(%q[def ([1]).foo; end], msg)
+    assert_parse_error(%q[def (__FILE__).foo; end], msg)
+    assert_parse_error(%q[def (__LINE__).foo; end], msg)
+    assert_parse_error(%q[def (__ENCODING__).foo; end], msg)
+    assert_parse_error(%q[def __FILE__.foo; end], msg)
+    assert_parse_error(%q[def __LINE__.foo; end], msg)
+    assert_parse_error(%q[def __ENCODING__.foo; end], msg)
+  end
+
+  def test_flip_flop
+    all_assertions_foreach(nil,
+      ['(cond1..cond2)', true],
+      ['((cond1..cond2))', true],
+
+      # '(;;;cond1..cond2)', # don't care
+
+      '(1; cond1..cond2)',
+      '(%s(); cond1..cond2)',
+      '(%w(); cond1..cond2)',
+      '(1; (2; (3; 4; cond1..cond2)))',
+      '(1+1; cond1..cond2)',
+    ) do |code, pass|
+      code = code.sub("cond1", "n==4").sub("cond2", "n==5")
+      if pass
+        assert_equal([4,5], eval("(1..9).select {|n| true if #{code}}"))
+      else
+        assert_raise_with_message(ArgumentError, /bad value for range/, code) {
+          verbose_bak, $VERBOSE = $VERBOSE, nil # disable "warning: possibly useless use of a literal in void context"
+          begin
+            eval("[4].each {|n| true if #{code}}")
+          ensure
+            $VERBOSE = verbose_bak
+          end
+        }
+      end
     end
   end
 
@@ -464,6 +516,10 @@ def test_op_asgn1_with_block
     t = Object.new
     a = []
     blk = proc {|x| a << x }
+
+    # Prevent an "assigned but unused variable" warning
+    _ = blk
+
     def t.[](_)
       yield(:aref)
       nil
@@ -473,16 +529,16 @@ def t.[]=(_, _)
     end
     def t.dummy(_)
     end
-    eval <<-END, nil, __FILE__, __LINE__+1
+
+    assert_syntax_error("#{<<~"begin;"}\n#{<<~'end;'}", /block arg given in index assignment/)
+    begin;
       t[42, &blk] ||= 42
-    END
-    assert_equal([:aref, :aset], a)
-    a.clear
-    eval <<-END, nil, __FILE__, __LINE__+1
-    t[42, &blk] ||= t.dummy 42 # command_asgn test
-    END
-    assert_equal([:aref, :aset], a)
-    blk
+    end;
+
+    assert_syntax_error("#{<<~"begin;"}\n#{<<~'end;'}", /block arg given in index assignment/)
+    begin;
+      t[42, &blk] ||= t.dummy 42 # command_asgn test
+    end;
   end
 
   def test_backquote
@@ -493,7 +549,7 @@ def test_backquote
         def t.`(x); "foo" + x + "bar"; end
       END
     end
-    a = b = nil
+    a = b = c = nil
     assert_nothing_raised do
       eval <<-END, nil, __FILE__, __LINE__+1
         a = t.` "zzz"
@@ -501,10 +557,12 @@ def t.`(x); "foo" + x + "bar"; end
       END
       t.instance_eval <<-END, __FILE__, __LINE__+1
         b = `zzz`
+        c = %x(ccc)
       END
     end
     assert_equal("foozzzbar", a)
     assert_equal("foozzzbar", b)
+    assert_equal("foocccbar", c)
   end
 
   def test_carrige_return
@@ -515,34 +573,42 @@ def test_string
     mesg = 'from the backslash through the invalid char'
 
     e = assert_syntax_error('"\xg1"', /hex escape/)
-    assert_equal(' ^~'"\n", e.message.lines.last, mesg)
+    assert_match(/(^|\| ) \^~(?!~)/, e.message.lines.last, mesg)
 
     e = assert_syntax_error('"\u{1234"', 'unterminated Unicode escape')
-    assert_equal('        ^'"\n", e.message.lines.last, mesg)
+    assert_match(/(^|\| )        \^(?!~)/, e.message.lines.last, mesg)
 
     e = assert_syntax_error('"\u{xxxx}"', 'invalid Unicode escape')
-    assert_equal('    ^'"\n", e.message.lines.last, mesg)
+    assert_match(/(^|\| )    \^(?!~)/, e.message.lines.last, mesg)
 
     e = assert_syntax_error('"\u{xxxx', 'Unicode escape')
-    assert_pattern_list([
-                          /.*: invalid Unicode escape\n.*\n/,
-                          /    \^/,
-                          /\n/,
-                          /.*: unterminated Unicode escape\n.*\n/,
-                          /    \^/,
-                          /\n/,
-                          /.*: unterminated string.*\n.*\n/,
-                          /        \^\n/,
-                        ], e.message)
+    if e.message.lines.first == "#{__FILE__}:#{__LINE__ - 1}: syntax errors found\n"
+      assert_pattern_list([
+                            /\s+\| \^ unterminated string;.+\n/,
+                            /\s+\|     \^ unterminated Unicode escape\n/,
+                            /\s+\|     \^ invalid Unicode escape sequence\n/,
+                          ], e.message.lines[2..-1].join)
+    else
+      assert_pattern_list([
+                            /.*: invalid Unicode escape\n.*\n/,
+                            /    \^/,
+                            /\n/,
+                            /.*: unterminated Unicode escape\n.*\n/,
+                            /    \^/,
+                            /\n/,
+                            /.*: unterminated string.*\n.*\n/,
+                            /        \^\n/,
+                          ], e.message)
+    end
 
     e = assert_syntax_error('"\M1"', /escape character syntax/)
-    assert_equal(' ^~~'"\n", e.message.lines.last, mesg)
+    assert_match(/(^|\| ) \^~~(?!~)/, e.message.lines.last, mesg)
 
     e = assert_syntax_error('"\C1"', /escape character syntax/)
-    assert_equal(' ^~~'"\n", e.message.lines.last, mesg)
+    assert_match(/(^|\| ) \^~~(?!~)/, e.message.lines.last, mesg)
 
     src = '"\xD0\u{90'"\n""000000000000000000000000"
-    assert_syntax_error(src, /:#{__LINE__}: unterminated/o)
+    assert_syntax_error(src, /(:#{__LINE__}:|> #{__LINE__} \|.+) unterminated/om)
 
     assert_syntax_error('"\u{100000000}"', /invalid Unicode escape/)
     assert_equal("", eval('"\u{}"'))
@@ -565,19 +631,23 @@ def test_string
     assert_syntax_error("\"\\C-\\M-\x01\"", 'Invalid escape character syntax')
 
     e = assert_syntax_error('"\c\u0000"', 'Invalid escape character syntax')
-    assert_equal(' ^~~~'"\n", e.message.lines.last)
+    assert_match(/(^|\| ) \^~~~(?!~)/, e.message.lines.last)
     e = assert_syntax_error('"\c\U0000"', 'Invalid escape character syntax')
-    assert_equal(' ^~~~'"\n", e.message.lines.last)
+    assert_match(/(^|\| ) \^~~~(?!~)/, e.message.lines.last)
 
     e = assert_syntax_error('"\C-\u0000"', 'Invalid escape character syntax')
-    assert_equal(' ^~~~~'"\n", e.message.lines.last)
+    assert_match(/(^|\| ) \^~~~~(?!~)/, e.message.lines.last)
     e = assert_syntax_error('"\C-\U0000"', 'Invalid escape character syntax')
-    assert_equal(' ^~~~~'"\n", e.message.lines.last)
+    assert_match(/(^|\| ) \^~~~~(?!~)/, e.message.lines.last)
 
     e = assert_syntax_error('"\M-\u0000"', 'Invalid escape character syntax')
-    assert_equal(' ^~~~~'"\n", e.message.lines.last)
+    assert_match(/(^|\| ) \^~~~~(?!~)/, e.message.lines.last)
     e = assert_syntax_error('"\M-\U0000"', 'Invalid escape character syntax')
-    assert_equal(' ^~~~~'"\n", e.message.lines.last)
+    assert_match(/(^|\| ) \^~~~~(?!~)/, e.message.lines.last)
+
+    e = assert_syntax_error(%["\\C-\u3042"], 'Invalid escape character syntax')
+    assert_match(/(^|\|\s)\s \^(?# \\ ) ~(?# C ) ~(?# - ) ~+(?# U+3042 )($|\s)/x, e.message.lines.last)
+    assert_not_include(e.message, "invalid multibyte char")
   end
 
   def test_question
@@ -593,6 +663,8 @@ def test_question
     assert_equal("\u{1234}", eval('?\u{1234}'))
     assert_equal("\u{1234}", eval('?\u1234'))
     assert_syntax_error('?\u{41 42}', 'Multiple codepoints at single character literal')
+    assert_syntax_error("?and", /unexpected '\?'/)
+    assert_syntax_error("?\u1234and", /unexpected '\?'/)
     e = assert_syntax_error('"#{?\u123}"', 'invalid Unicode escape')
     assert_not_match(/end-of-input/, e.message)
 
@@ -608,6 +680,8 @@ def test_question
     assert_syntax_error("?\\M-\x01", 'Invalid escape character syntax')
     assert_syntax_error("?\\M-\\C-\x01", 'Invalid escape character syntax')
     assert_syntax_error("?\\C-\\M-\x01", 'Invalid escape character syntax')
+
+    assert_equal("\xff", eval("# encoding: ascii-8bit\n""?\\\xFF"))
   end
 
   def test_percent
@@ -641,6 +715,7 @@ def test_symbol
     assert_syntax_error(':@@1', /is not allowed/)
     assert_syntax_error(':@', /is not allowed/)
     assert_syntax_error(':@1', /is not allowed/)
+    assert_syntax_error(':$01234', /is not allowed/)
   end
 
   def test_parse_string
@@ -726,6 +801,54 @@ def test_magic_comment
       END
     end
     assert_equal(__ENCODING__, x)
+
+    assert_raise(ArgumentError) do
+      EnvUtil.with_default_external(Encoding::US_ASCII) {eval <<-END, nil, __FILE__, __LINE__+1}
+# coding = external
+x = __ENCODING__
+      END
+    end
+
+    assert_raise(ArgumentError) do
+      EnvUtil.with_default_internal(Encoding::US_ASCII) {eval <<-END, nil, __FILE__, __LINE__+1}
+# coding = internal
+x = __ENCODING__
+      END
+    end
+
+    assert_raise(ArgumentError) do
+      eval <<-END, nil, __FILE__, __LINE__+1
+# coding = filesystem
+x = __ENCODING__
+      END
+    end
+
+    assert_raise(ArgumentError) do
+      eval <<-END, nil, __FILE__, __LINE__+1
+# coding = locale
+x = __ENCODING__
+      END
+    end
+
+    e = assert_raise(ArgumentError) do
+      eval <<-END, nil, __FILE__, __LINE__+1
+# coding: foo
+      END
+    end
+
+    message = e.message.gsub(/\033\[.*?m/, "")
+    assert_include(message, "# coding: foo\n")
+    assert_include(message, "          ^")
+
+    e = assert_raise(ArgumentError) do
+      eval <<-END, nil, __FILE__, __LINE__+1
+# coding = foo
+      END
+    end
+
+    message = e.message.gsub(/\033\[.*?m/, "")
+    assert_include(message, "# coding = foo\n")
+    assert_include(message, "           ^")
   end
 
   def test_utf8_bom
@@ -769,7 +892,7 @@ def test_embedded_rd_error
 
   def test_float
     assert_predicate(assert_warning(/out of range/) {eval("1e10000")}, :infinite?)
-    assert_syntax_error('1_E', /trailing `_'/)
+    assert_syntax_error('1_E', /trailing '_'/)
     assert_syntax_error('1E1E1', /unexpected constant/)
   end
 
@@ -780,7 +903,8 @@ def test_global_variable
     $test_parse_foobarbazqux = nil
     assert_equal(nil, $&)
     assert_equal(nil, eval('alias $& $preserve_last_match'))
-    assert_syntax_error('a = $#', /as a global variable name\na = \$\#\n    \^~$/)
+    assert_syntax_error('a = $#', /as a global variable name/)
+    assert_syntax_error('a = $#', /a = \$\#\n(^|.+?\| )    \^~(?!~)/)
   end
 
   def test_invalid_instance_variable
@@ -797,7 +921,7 @@ def test_invalid_class_variable
 
   def test_invalid_char
     bug10117 = '[ruby-core:64243] [Bug #10117]'
-    invalid_char = /Invalid char `\\x01'/
+    invalid_char = /Invalid char '\\x01'/
     x = 1
     assert_in_out_err(%W"-e \x01x", "", [], invalid_char, bug10117)
     assert_syntax_error("\x01x", invalid_char, bug10117)
@@ -831,24 +955,9 @@ def test_set_backref
     assert_syntax_error("$& = 1", /Can't set variable/)
   end
 
-  def test_arg_concat
-    o = Object.new
-    class << o; self; end.instance_eval do
-      define_method(:[]=) {|*r, &b| b.call(r) }
-    end
-    r = nil
-    assert_nothing_raised do
-      eval <<-END, nil, __FILE__, __LINE__+1
-        o[&proc{|x| r = x }] = 1
-      END
-    end
-    assert_equal([1], r)
-  end
-
   def test_void_expr_stmts_value
     x = 1
     useless_use = /useless use/
-    unused = /unused/
     assert_nil assert_warning(useless_use) {eval("x; nil")}
     assert_nil assert_warning(useless_use) {eval("1+1; nil")}
     assert_nil assert_warning('') {eval("1.+(1); nil")}
@@ -856,24 +965,27 @@ def test_void_expr_stmts_value
     assert_nil assert_warning(useless_use) {eval("::TestParse; nil")}
     assert_nil assert_warning(useless_use) {eval("x..x; nil")}
     assert_nil assert_warning(useless_use) {eval("x...x; nil")}
-    assert_nil assert_warning(unused) {eval("self; nil")}
-    assert_nil assert_warning(unused) {eval("nil; nil")}
-    assert_nil assert_warning(unused) {eval("true; nil")}
-    assert_nil assert_warning(unused) {eval("false; nil")}
+    assert_nil assert_warning(useless_use) {eval("self; nil")}
+    assert_nil assert_warning(useless_use) {eval("nil; nil")}
+    assert_nil assert_warning(useless_use) {eval("true; nil")}
+    assert_nil assert_warning(useless_use) {eval("false; nil")}
     assert_nil assert_warning(useless_use) {eval("defined?(1); nil")}
+    assert_nil assert_warning(useless_use) {eval("begin; ensure; x; end")}
     assert_equal 1, x
 
     assert_syntax_error("1; next; 2", /Invalid next/)
   end
 
   def test_assign_in_conditional
-    assert_warning(/`= literal' in conditional/) do
+    # multiple assignment
+    assert_warning(/'= literal' in conditional/) do
       eval <<-END, nil, __FILE__, __LINE__+1
         (x, y = 1, 2) ? 1 : 2
       END
     end
 
-    assert_warning(/`= literal' in conditional/) do
+    # instance variable assignment
+    assert_warning(/'= literal' in conditional/) do
       eval <<-END, nil, __FILE__, __LINE__+1
         if @x = true
           1
@@ -882,6 +994,71 @@ def test_assign_in_conditional
         end
       END
     end
+
+    # local variable assignment
+    assert_warning(/'= literal' in conditional/) do
+      eval <<-END, nil, __FILE__, __LINE__+1
+        def m
+          if x = true
+            1
+          else
+            2
+          end
+        end
+      END
+    end
+
+    # global variable assignment
+    assert_separately([], <<-RUBY)
+      assert_warning(/'= literal' in conditional/) do
+        eval <<-END, nil, __FILE__, __LINE__+1
+          if $x = true
+            1
+          else
+            2
+          end
+        END
+      end
+    RUBY
+
+    # dynamic variable assignment
+    assert_warning(/'= literal' in conditional/) do
+      eval <<-END, nil, __FILE__, __LINE__+1
+        y = 1
+
+        1.times do
+          if y = true
+            1
+          else
+            2
+          end
+        end
+      END
+    end
+
+    # class variable assignment
+    assert_warning(/'= literal' in conditional/) do
+      eval <<-END, nil, __FILE__, __LINE__+1
+        c = Class.new
+        class << c
+          if @@a = 1
+          end
+        end
+      END
+    end
+
+    # constant declaration
+    assert_separately([], <<-RUBY)
+      assert_warning(/'= literal' in conditional/) do
+        eval <<-END, nil, __FILE__, __LINE__+1
+          if Const = true
+            1
+          else
+            2
+          end
+        END
+      end
+    RUBY
   end
 
   def test_literal_in_conditional
@@ -958,6 +1135,20 @@ def test_unused_variable
     assert_warning('') {o.instance_eval("def marg2((a)); nil; end")}
   end
 
+  def test_parsing_begin_statement_inside_method_definition
+    assert_equal :bug_20234, eval("def (begin;end).bug_20234; end")
+    NilClass.remove_method(:bug_20234)
+    assert_equal :bug_20234, eval("def (begin;rescue;end).bug_20234; end")
+    NilClass.remove_method(:bug_20234)
+    assert_equal :bug_20234, eval("def (begin;ensure;end).bug_20234; end")
+    NilClass.remove_method(:bug_20234)
+    assert_equal :bug_20234, eval("def (begin;rescue;else;end).bug_20234; end")
+    NilClass.remove_method(:bug_20234)
+
+    assert_raise(SyntaxError) { eval("def (begin;else;end).bug_20234; end") }
+    assert_raise(SyntaxError) { eval("def (begin;ensure;else;end).bug_20234; end") }
+  end
+
   def test_named_capture_conflict
     a = 1
     assert_warning('') {eval("a = 1; /(?<a>)/ =~ ''")}
@@ -965,6 +1156,30 @@ def test_named_capture_conflict
     assert_warning('') {eval("#{a} = 1; /(?<#{a}>)/ =~ ''")}
   end
 
+  def test_named_capture_in_block
+    all_assertions_foreach(nil,
+      '(/(?<a>.*)/)',
+      '(;/(?<a>.*)/)',
+      '(%s();/(?<a>.*)/)',
+      '(%w();/(?<a>.*)/)',
+      '(1; (2; 3; (4; /(?<a>.*)/)))',
+      '(1+1; /(?<a>.*)/)',
+      '/#{""}(?<a>.*)/',
+    ) do |code, pass|
+      token = Random.bytes(4).unpack1("H*")
+      if pass
+        assert_equal(token, eval("#{code} =~ #{token.dump}; a"))
+      else
+        verbose_bak, $VERBOSE = $VERBOSE, nil # disable "warning: possibly useless use of a literal in void context"
+        begin
+          assert_nil(eval("#{code} =~ #{token.dump}; defined?(a)"), code)
+        ensure
+          $VERBOSE = verbose_bak
+        end
+      end
+    end
+  end
+
   def test_rescue_in_command_assignment
     bug = '[ruby-core:75621] [Bug #12402]'
     all_assertions(bug) do |a|
@@ -1074,8 +1289,8 @@ def test_error_def_in_argument
       assert_syntax_error("def f r:def d; def f 0end", /unexpected/)
     end;
 
-    assert_syntax_error("def\nf(000)end", /^  \^~~/)
-    assert_syntax_error("def\nf(&0)end", /^   \^/)
+    assert_syntax_error("def\nf(000)end", /(^|\| )  \^~~/)
+    assert_syntax_error("def\nf(&0)end",  /(^|\| )   \^/)
   end
 
   def test_method_location_in_rescue
@@ -1151,17 +1366,21 @@ def test_unexpected_token_error
   end
 
   def test_unexpected_token_after_numeric
-    assert_syntax_error('0000xyz', /^    \^~~\Z/)
-    assert_syntax_error('1.2i1.1', /^    \^~~\Z/)
-    assert_syntax_error('1.2.3', /^   \^~\Z/)
+    assert_syntax_error('0000xyz', /(^|\| )    \^~~(?!~)/)
+    assert_syntax_error('1.2i1.1', /(^|\| )    \^~~(?!~)/)
+    assert_syntax_error('1.2.3', /(^|\| )   \^~(?!~)/)
     assert_syntax_error('1.', /unexpected end-of-input/)
     assert_syntax_error('1e', /expecting end-of-input/)
   end
 
   def test_truncated_source_line
-    e = assert_syntax_error("'0123456789012345678901234567890123456789' abcdefghijklmnopqrstuvwxyz0123456789 0123456789012345678901234567890123456789",
+    lineno = __LINE__ + 1
+    e = assert_syntax_error("'0123456789012345678901234567890123456789' abcdefghijklmnopqrstuvwxyz0123456789 123456789012345678901234567890123456789",
                             /unexpected local variable or method/)
+
     line = e.message.lines[1]
+    line.delete_prefix!("> #{lineno} | ") if line.start_with?(">")
+
     assert_operator(line, :start_with?, "...")
     assert_operator(line, :end_with?, "...\n")
   end
@@ -1205,11 +1424,11 @@ def test_eof_in_def
   end
 
   def test_unexpected_eof
-    assert_syntax_error('unless', /^      \^\Z/)
+    assert_syntax_error('unless', /(^|\| )      \^(?!~)/)
   end
 
   def test_location_of_invalid_token
-    assert_syntax_error('class xxx end', /^      \^~~\Z/)
+    assert_syntax_error('class xxx end', /(^|\| )      \^~~(?!~)/)
   end
 
   def test_whitespace_warning
@@ -1275,10 +1494,23 @@ def test_cdmarg_after_command_args_and_tlbrace_arg
 
   def test_void_value_in_rhs
     w = "void value expression"
-    ["x = return 1", "x = return, 1", "x = 1, return", "x, y = return"].each do |code|
+    [
+      "x = return 1", "x = return, 1", "x = 1, return", "x, y = return",
+      "x = begin return ensure end",
+      "x = begin ensure return end",
+      "x = begin return ensure return end",
+      "x = begin return; rescue; return end",
+      "x = begin return; rescue; return; else return end",
+    ].each do |code|
       ex = assert_syntax_error(code, w)
       assert_equal(1, ex.message.scan(w).size, ->{"same #{w.inspect} warning should be just once\n#{w.message}"})
     end
+    [
+      "x = begin return; rescue; end",
+      "x = begin return; rescue; return; else end",
+    ].each do |code|
+      assert_valid_syntax(code)
+    end
   end
 
   def eval_separately(code)
@@ -1342,6 +1574,39 @@ def test_shareable_constant_value_simple
     assert_not_ractor_shareable(obj)
     assert_equal obj, a
     assert !obj.equal?(a)
+
+    bug_20339 = '[ruby-core:117186] [Bug #20339]'
+    bug_20341 = '[ruby-core:117197] [Bug #20341]'
+    a, b = eval_separately(<<~'end;')
+      # shareable_constant_value: literal
+      foo = 1
+      bar = 2
+      A = { foo => bar }
+      B = [foo, bar]
+      [A, B]
+    end;
+
+    assert_ractor_shareable(a)
+    assert_ractor_shareable(b)
+    assert_equal([1], a.keys, bug_20339)
+    assert_equal([2], a.values, bug_20339)
+    assert_equal(1, b[0], bug_20341)
+    assert_equal(2, b[1], bug_20341)
+  end
+
+  def test_shareable_constant_value_literal_const_refs
+    a = eval_separately("#{<<~"begin;"}\n#{<<~'end;'}")
+    begin;
+      # shareable_constant_value: literal
+      # [Bug #20668]
+      SOME_CONST = {
+        'Object' => Object,
+        'String' => String,
+        'Array' => Array,
+      }
+      SOME_CONST
+    end;
+    assert_ractor_shareable(a)
   end
 
   def test_shareable_constant_value_nested
@@ -1362,13 +1627,89 @@ class X
     assert_ractor_shareable(a[0])
   end
 
+  def test_shareable_constant_value_hash_with_keyword_splat
+    a, b = eval_separately("#{<<~"begin;"}\n#{<<~'end;'}")
+    begin;
+      # shareable_constant_value: experimental_everything
+      # [Bug #20927]
+      x = { x: {} }
+      y = { y: {} }
+      A = { **x }
+      B = { x: {}, **y }
+      [A, B]
+    end;
+    assert_ractor_shareable(a)
+    assert_ractor_shareable(b)
+    assert_equal({ x: {}}, a)
+    assert_equal({ x: {}, y: {}}, b)
+  end
+
   def test_shareable_constant_value_unshareable_literal
-    assert_raise_separately(Ractor::IsolationError, /unshareable/,
+    assert_raise_separately(Ractor::IsolationError, /unshareable object to C/,
                             "#{<<~"begin;"}\n#{<<~'end;'}")
     begin;
       # shareable_constant_value: literal
       C = ["Not " + "shareable"]
     end;
+
+    assert_raise_separately(Ractor::IsolationError, /unshareable object to B::C/,
+                            "#{<<~"begin;"}\n#{<<~'end;'}")
+    begin;
+      # shareable_constant_value: literal
+      B = Class.new
+      B::C = ["Not " + "shareable"]
+    end;
+
+    assert_separately([], "#{<<~"begin;"}\n#{<<~'end;'}")
+    begin;
+      assert_raise_with_message(Ractor::IsolationError, /unshareable object to ::C/) do
+        # shareable_constant_value: literal
+        ::C = ["Not " + "shareable"]
+      end
+    end;
+
+    assert_separately([], "#{<<~"begin;"}\n#{<<~'end;'}")
+    begin;
+      assert_raise_with_message(Ractor::IsolationError, /unshareable object to ::B::C/) do
+        # shareable_constant_value: literal
+        ::B = Class.new
+        ::B::C = ["Not " + "shareable"]
+      end
+    end;
+
+    assert_separately([], "#{<<~"begin;"}\n#{<<~'end;'}")
+    begin;
+      assert_raise_with_message(Ractor::IsolationError, /unshareable object to ::C/) do
+        # shareable_constant_value: literal
+        ::C ||= ["Not " + "shareable"]
+      end
+    end;
+
+    assert_raise_separately(Ractor::IsolationError, /unshareable object to B::C/,
+                            "#{<<~"begin;"}\n#{<<~'end;'}")
+    begin;
+      # shareable_constant_value: literal
+      B = Class.new
+      B::C ||= ["Not " + "shareable"]
+    end;
+
+    assert_separately([], "#{<<~"begin;"}\n#{<<~'end;'}")
+    begin;
+      assert_raise_with_message(Ractor::IsolationError, /unshareable object to ::B::C/) do
+        # shareable_constant_value: literal
+        ::B = Class.new
+        ::B::C ||= ["Not " + "shareable"]
+      end
+    end;
+
+    assert_raise_separately(Ractor::IsolationError, /unshareable object to ...::C/,
+                            "#{<<~"begin;"}\n#{<<~'end;'}")
+    begin;
+      # shareable_constant_value: literal
+      B = Class.new
+      def self.expr; B; end
+      expr::C ||= ["Not " + "shareable"]
+    end;
   end
 
   def test_shareable_constant_value_nonliteral
@@ -1397,6 +1738,15 @@ def o.freeze; self; end
     end;
   end
 
+  def test_shareable_constant_value_massign
+    a = eval_separately("#{<<~"begin;"}\n#{<<~'end;'}")
+    begin;
+      # shareable_constant_value: experimental_everything
+      A, = 1
+    end;
+    assert_equal(1, a)
+  end
+
   def test_if_after_class
     assert_valid_syntax('module if true; Object end::Kernel; end')
     assert_valid_syntax('module while true; break Object end::Kernel; end')
@@ -1443,9 +1793,29 @@ def set(arg)
     assert_equal(expected, obj.arg)
   end
 
+  def test_ungettable_gvar
+    assert_syntax_error('$01234', /not allowed/)
+    assert_syntax_error('"#$01234"', /not allowed/)
+  end
+
 =begin
   def test_past_scope_variable
     assert_warning(/past scope/) {catch {|tag| eval("BEGIN{throw tag}; tap {a = 1}; a")}}
   end
 =end
+
+  def assert_parse(code)
+    assert_kind_of(RubyVM::AbstractSyntaxTree::Node, RubyVM::AbstractSyntaxTree.parse(code))
+  end
+
+  def assert_parse_error(code, message)
+    assert_raise_with_message(SyntaxError, message) do
+      $VERBOSE, verbose_bak = nil, $VERBOSE
+      begin
+        RubyVM::AbstractSyntaxTree.parse(code)
+      ensure
+        $VERBOSE = verbose_bak
+      end
+    end
+  end
 end
diff --git a/test/ruby/test_pattern_matching.rb b/test/ruby/test_pattern_matching.rb
index b761909913d0fa..92a3244fc2ae88 100644
--- a/test/ruby/test_pattern_matching.rb
+++ b/test/ruby/test_pattern_matching.rb
@@ -353,6 +353,14 @@ def test_literal_value_pattern
       end
     end
 
+    assert_block do
+      a = "abc"
+      case 'abc'
+      in /#{a}/o
+        true
+      end
+    end
+
     assert_block do
       case 0
       in ->(i) { i == 0 }
@@ -1161,7 +1169,7 @@ def test_hash_pattern
       end
     end
 
-    bug18890 = assert_warning(/(?:.*:[47]: warning: unused literal ignored\n){2}/) do
+    bug18890 = assert_warning(/(?:.*:[47]: warning: possibly useless use of a literal in void context\n){2}/) do
       eval("#{<<~';;;'}")
       proc do |i|
         case i
@@ -1323,7 +1331,7 @@ def test_deconstruct_keys
     end
 
     assert_block do
-      case {}
+      case C.new({})
       in {}
         C.keys == nil
       end
@@ -1656,7 +1664,7 @@ def test_single_pattern_error_hash_pattern
       raise a # suppress "unused variable: a" warning
     end
 
-    assert_raise_with_message(NoMatchingPatternKeyError, "{:a=>0}: key not found: :aa") do
+    assert_raise_with_message(NoMatchingPatternKeyError, "{a: 0}: key not found: :aa") do
       {a: 0} => {aa:}
       raise aa # suppress "unused variable: aa" warning
     rescue NoMatchingPatternKeyError => e
@@ -1665,7 +1673,7 @@ def test_single_pattern_error_hash_pattern
       raise e
     end
 
-    assert_raise_with_message(NoMatchingPatternKeyError, "{:a=>{:b=>0}}: key not found: :bb") do
+    assert_raise_with_message(NoMatchingPatternKeyError, "{a: {b: 0}}: key not found: :bb") do
       {a: {b: 0}} => {a: {bb:}}
       raise bb # suppress "unused variable: bb" warning
     rescue NoMatchingPatternKeyError => e
@@ -1674,15 +1682,15 @@ def test_single_pattern_error_hash_pattern
       raise e
     end
 
-    assert_raise_with_message(NoMatchingPatternError, "{:a=>0}: 1 === 0 does not return true") do
+    assert_raise_with_message(NoMatchingPatternError, "{a: 0}: 1 === 0 does not return true") do
       {a: 0} => {a: 1}
     end
 
-    assert_raise_with_message(NoMatchingPatternError, "{:a=>0}: {:a=>0} is not empty") do
+    assert_raise_with_message(NoMatchingPatternError, "{a: 0}: {a: 0} is not empty") do
       {a: 0} => {}
     end
 
-    assert_raise_with_message(NoMatchingPatternError, "[{:a=>0}]: rest of {:a=>0} is not empty") do
+    assert_raise_with_message(NoMatchingPatternError, "[{a: 0}]: rest of {a: 0} is not empty") do
       [{a: 0}] => [{**nil}]
     end
   end
diff --git a/test/ruby/test_proc.rb b/test/ruby/test_proc.rb
index 2b3590d4d0627d..f6b9e6d063324f 100644
--- a/test/ruby/test_proc.rb
+++ b/test/ruby/test_proc.rb
@@ -159,13 +159,65 @@ def test_eq
     assert_equal(*m_nest{}, "[ruby-core:84583] Feature #14627")
   end
 
-  def test_hash
+  def test_hash_equal
+    # iseq backed proc
+    p1 = proc {}
+    p2 = p1.dup
+
+    assert_equal p1.hash, p2.hash
+
+    # ifunc backed proc
+    p1 = {}.to_proc
+    p2 = p1.dup
+
+    assert_equal p1.hash, p2.hash
+
+    # symbol backed proc
+    p1 = :hello.to_proc
+    p2 = :hello.to_proc
+
+    assert_equal p1.hash, p2.hash
+  end
+
+  def test_hash_uniqueness
     def self.capture(&block)
       block
     end
 
-   procs = Array.new(1000){capture{:foo }}
-   assert_operator(procs.map(&:hash).uniq.size, :>=, 500)
+    procs = Array.new(1000){capture{:foo }}
+    assert_operator(procs.map(&:hash).uniq.size, :>=, 500)
+
+    # iseq backed proc
+    unique_hashes = 1000.times.map { proc {}.hash }.uniq
+    assert_operator(unique_hashes.size, :>=, 500)
+
+    # ifunc backed proc
+    unique_hashes = 1000.times.map { {}.to_proc.hash }.uniq
+    assert_operator(unique_hashes.size, :>=, 500)
+
+    # symbol backed proc
+    unique_hashes = 1000.times.map { |i| :"test#{i}".to_proc.hash }.uniq
+    assert_operator(unique_hashes.size, :>=, 500)
+  end
+
+  def test_hash_does_not_change_after_compaction
+    omit "compaction is not supported on this platform" unless GC.respond_to?(:compact)
+
+    # [Bug #20853]
+    [
+      "proc {}", # iseq backed proc
+      "{}.to_proc", # ifunc backed proc
+      ":hello.to_proc", # symbol backed proc
+    ].each do |proc|
+      assert_separately([], <<~RUBY)
+        p1 = #{proc}
+        hash = p1.hash
+
+        GC.verify_compaction_references(expand_heap: true, toward: :empty)
+
+        assert_equal(hash, p1.hash, "proc is `#{proc}`")
+      RUBY
+    end
   end
 
   def test_block_par
@@ -207,18 +259,24 @@ def test_method_to_proc
   end
 
   def test_block_given_method
+    verbose_bak, $VERBOSE = $VERBOSE, nil
     m = method(:m_block_given?)
     assert(!m.call, "without block")
     assert(m.call {}, "with block")
     assert(!m.call, "without block second")
+  ensure
+    $VERBOSE = verbose_bak
   end
 
   def test_block_given_method_to_proc
+    verbose_bak, $VERBOSE = $VERBOSE, nil
     bug8341 = '[Bug #8341]'
     m = method(:m_block_given?).to_proc
     assert(!m.call, "#{bug8341} without block")
     assert(m.call {}, "#{bug8341} with block")
     assert(!m.call, "#{bug8341} without block second")
+  ensure
+    $VERBOSE = verbose_bak
   end
 
   def test_block_persist_between_calls
@@ -289,7 +347,6 @@ def test_lambda?
     assert_equal(false, l.lambda?)
     assert_equal(false, l.curry.lambda?, '[ruby-core:24127]')
     assert_equal(false, proc(&l).lambda?)
-    assert_equal(false, assert_deprecated_warning {lambda(&l)}.lambda?)
     assert_equal(false, Proc.new(&l).lambda?)
     l = lambda {}
     assert_equal(true, l.lambda?)
@@ -299,47 +356,21 @@ def test_lambda?
     assert_equal(true, Proc.new(&l).lambda?)
   end
 
-  def self.helper_test_warn_lamda_with_passed_block &b
+  def helper_test_warn_lambda_with_passed_block &b
     lambda(&b)
   end
 
-  def self.def_lambda_warning name, warn
-    define_method(name, proc do
-      prev = Warning[:deprecated]
-      assert_warn warn do
-        Warning[:deprecated] = true
-        yield
-      end
-    ensure
-      Warning[:deprecated] = prev
-    end)
-  end
-
-  def_lambda_warning 'test_lambda_warning_normal', '' do
-    lambda{}
-  end
-
-  def_lambda_warning 'test_lambda_warning_pass_lambda', '' do
-    b = lambda{}
-    lambda(&b)
-  end
-
-  def_lambda_warning 'test_lambda_warning_pass_symbol_proc', '' do
-    lambda(&:to_s)
-  end
-
-  def_lambda_warning 'test_lambda_warning_pass_proc', /deprecated/ do
-    b = proc{}
-    lambda(&b)
-  end
-
-  def_lambda_warning 'test_lambda_warning_pass_block', /deprecated/ do
-    helper_test_warn_lamda_with_passed_block{}
+  def test_lambda_warning_pass_proc
+    assert_raise(ArgumentError) do
+      b = proc{}
+      lambda(&b)
+    end
   end
 
-  def_lambda_warning 'test_lambda_warning_pass_block_symbol_proc', '' do
-    # Symbol#to_proc returns lambda
-    helper_test_warn_lamda_with_passed_block(&:to_s)
+  def test_lambda_warning_pass_block
+    assert_raise(ArgumentError) do
+      helper_test_warn_lambda_with_passed_block{}
+    end
   end
 
   def test_curry_ski_fib
@@ -398,6 +429,7 @@ def obj.foo(a, b=42); end
   end
 
   def test_dup_clone
+    # iseq backed proc
     b = proc {|x| x + "bar" }
     class << b; attr_accessor :foo; end
 
@@ -410,11 +442,50 @@ class << b; attr_accessor :foo; end
     assert_equal("foobar", bc.call("foo"))
     bc.foo = :foo
     assert_equal(:foo, bc.foo)
+
+    # ifunc backed proc
+    b = {foo: "bar"}.to_proc
+
+    bd = b.dup
+    assert_equal("bar", bd.call(:foo))
+
+    bc = b.clone
+    assert_equal("bar", bc.call(:foo))
+
+    # symbol backed proc
+    b = :to_s.to_proc
+
+    bd = b.dup
+    assert_equal("testing", bd.call(:testing))
+
+    bc = b.clone
+    assert_equal("testing", bc.call(:testing))
   end
 
   def test_dup_subclass
     c1 = Class.new(Proc)
     assert_equal c1, c1.new{}.dup.class, '[Bug #17545]'
+    c1 = Class.new(Proc) {def initialize_dup(*) throw :initialize_dup; end}
+    assert_throw(:initialize_dup) {c1.new{}.dup}
+  end
+
+  def test_dup_ifunc_proc_bug_20950
+    assert_normal_exit(<<~RUBY, "[Bug #20950]")
+      p = { a: 1 }.to_proc
+      100.times do
+        p = p.dup
+        GC.start
+        p.call
+      rescue ArgumentError
+      end
+    RUBY
+  end
+
+  def test_clone_subclass
+    c1 = Class.new(Proc)
+    assert_equal c1, c1.new{}.clone.class, '[Bug #17545]'
+    c1 = Class.new(Proc) {def initialize_clone(*) throw :initialize_clone; end}
+    assert_throw(:initialize_clone) {c1.new{}.clone}
   end
 
   def test_binding
@@ -442,7 +513,7 @@ def test_binding_source_location
 
     file, lineno = method(:source_location_test).to_proc.binding.source_location
     assert_match(/^#{ Regexp.quote(__FILE__) }$/, file)
-    assert_equal(@@line_of_source_location_test, lineno, 'Bug #2427')
+    assert_equal(@@line_of_source_location_test[0], lineno, 'Bug #2427')
   end
 
   def test_binding_error_unless_ruby_frame
@@ -1311,7 +1382,8 @@ def test_parameters
     assert_equal([[:opt, :a], [:rest, :b], [:opt, :c]], proc {|a, *b, c|}.parameters)
     assert_equal([[:opt, :a], [:rest, :b], [:opt, :c], [:block, :d]], proc {|a, *b, c, &d|}.parameters)
     assert_equal([[:opt, :a], [:opt, :b], [:rest, :c], [:opt, :d], [:block, :e]], proc {|a, b=:b, *c, d, &e|}.parameters)
-    assert_equal([[:opt, nil], [:block, :b]], proc {|(a), &b|a}.parameters)
+    assert_equal([[:opt], [:block, :b]], proc {|(a), &b|a}.parameters)
+    assert_equal([[:opt], [:rest, :_], [:opt]], proc {|(a_), *_, (b_)|}.parameters)
     assert_equal([[:opt, :a], [:opt, :b], [:opt, :c], [:opt, :d], [:rest, :e], [:opt, :f], [:opt, :g], [:block, :h]], proc {|a,b,c=:c,d=:d,*e,f,g,&h|}.parameters)
 
     assert_equal([[:req]], method(:putc).parameters)
@@ -1319,6 +1391,8 @@ def test_parameters
 
     pr = eval("proc{|"+"(_),"*30+"|}")
     assert_empty(pr.parameters.map{|_,n|n}.compact)
+
+    assert_equal([[:opt]], proc { it }.parameters)
   end
 
   def test_proc_autosplat_with_multiple_args_with_ruby2_keywords_splat_bug_19759
@@ -1367,6 +1441,9 @@ def test_parameters_lambda
 
     assert_equal([[:opt, :a]], lambda {|a|}.parameters(lambda: false))
     assert_equal([[:opt, :a], [:opt, :b], [:opt, :c], [:opt, :d], [:rest, :e], [:opt, :f], [:opt, :g], [:block, :h]], lambda {|a,b,c=:c,d=:d,*e,f,g,&h|}.parameters(lambda: false))
+
+    assert_equal([[:req]], proc { it }.parameters(lambda: true))
+    assert_equal([[:opt]], lambda { it }.parameters(lambda: false))
   end
 
   def pm0() end
@@ -1422,15 +1499,19 @@ def test_to_s
     assert_include(EnvUtil.labeled_class(name, Proc).new {}.to_s, name)
   end
 
-  @@line_of_source_location_test = __LINE__ + 1
+  @@line_of_source_location_test = [__LINE__ + 1, 2, __LINE__ + 3, 5]
   def source_location_test a=1,
     b=2
   end
 
   def test_source_location
-    file, lineno = method(:source_location_test).source_location
+    file, *loc = method(:source_location_test).source_location
+    assert_match(/^#{ Regexp.quote(__FILE__) }$/, file)
+    assert_equal(@@line_of_source_location_test, loc, 'Bug #2427')
+
+    file, *loc = self.class.instance_method(:source_location_test).source_location
     assert_match(/^#{ Regexp.quote(__FILE__) }$/, file)
-    assert_equal(@@line_of_source_location_test, lineno, 'Bug #2427')
+    assert_equal(@@line_of_source_location_test, loc, 'Bug #2427')
   end
 
   @@line_of_attr_reader_source_location_test   = __LINE__ + 3
@@ -1463,13 +1544,13 @@ def block_source_location_test(*args, &block)
   end
 
   def test_block_source_location
-    exp_lineno = __LINE__ + 3
-    file, lineno = block_source_location_test(1,
+    exp_loc = [__LINE__ + 3, 49, __LINE__ + 4, 49]
+    file, *loc = block_source_location_test(1,
                                               2,
                                               3) do
                                               end
     assert_match(/^#{ Regexp.quote(__FILE__) }$/, file)
-    assert_equal(exp_lineno, lineno)
+    assert_equal(exp_loc, loc)
   end
 
   def test_splat_without_respond_to
@@ -1556,6 +1637,10 @@ def test_local_variable_get
     assert_equal(3, b.local_variable_get(:when))
     assert_equal(4, b.local_variable_get(:begin))
     assert_equal(5, b.local_variable_get(:end))
+
+    assert_raise_with_message(NameError, /local variable \Wdefault\W/) {
+      binding.local_variable_get(:default)
+    }
   end
 
   def test_local_variable_set
@@ -1568,6 +1653,71 @@ def test_local_variable_set
     assert_equal(20, b.eval("b"))
   end
 
+  def test_numparam_is_not_local_variables
+    "foo".tap do
+      _9
+      assert_equal([], binding.local_variables)
+      assert_raise(NameError) { binding.local_variable_get(:_9) }
+      assert_raise(NameError) { binding.local_variable_set(:_9, 1) }
+      "bar".tap do
+        assert_equal([], binding.local_variables)
+        assert_raise(NameError) { binding.local_variable_get(:_9) }
+        assert_raise(NameError) { binding.local_variable_set(:_9, 1) }
+      end
+      assert_equal([], binding.local_variables)
+      assert_raise(NameError) { binding.local_variable_get(:_9) }
+      assert_raise(NameError) { binding.local_variable_set(:_9, 1) }
+    end
+
+    "foo".tap do
+      assert_equal([], binding.local_variables)
+      assert_raise(NameError) { binding.local_variable_get(:_9) }
+      assert_raise(NameError) { binding.local_variable_set(:_9, 1) }
+      "bar".tap do
+        _9
+        assert_equal([], binding.local_variables)
+        assert_raise(NameError) { binding.local_variable_get(:_9) }
+        assert_raise(NameError) { binding.local_variable_set(:_9, 1) }
+      end
+      assert_equal([], binding.local_variables)
+      assert_raise(NameError) { binding.local_variable_get(:_9) }
+      assert_raise(NameError) { binding.local_variable_set(:_9, 1) }
+    end
+  end
+
+  def test_it_is_not_local_variable
+    "foo".tap do
+      it
+      assert_equal([], binding.local_variables)
+      assert_raise(NameError) { binding.local_variable_get(:it) }
+      "bar".tap do
+        assert_equal([], binding.local_variables)
+        assert_raise(NameError) { binding.local_variable_get(:it) }
+      end
+      assert_equal([], binding.local_variables)
+      assert_raise(NameError) { binding.local_variable_get(:it) }
+      "bar".tap do
+        it
+        assert_equal([], binding.local_variables)
+        assert_raise(NameError) { binding.local_variable_get(:it) }
+      end
+      assert_equal([], binding.local_variables)
+      assert_raise(NameError) { binding.local_variable_get(:it) }
+    end
+
+    "foo".tap do
+      assert_equal([], binding.local_variables)
+      assert_raise(NameError) { binding.local_variable_get(:it) }
+      "bar".tap do
+        it
+        assert_equal([], binding.local_variables)
+        assert_raise(NameError) { binding.local_variable_get(:it) }
+      end
+      assert_equal([], binding.local_variables)
+      assert_raise(NameError) { binding.local_variable_get(:it) }
+    end
+  end
+
   def test_local_variable_set_wb
     assert_ruby_status([], <<-'end;', '[Bug #13605]', timeout: 30)
       b = binding
@@ -1864,4 +2014,3 @@ def g.>>(f) to_proc >> f end
     assert_raise(ArgumentError) { (f >> g).call(**{})[:a] }
   end
 end
-
diff --git a/test/ruby/test_process.rb b/test/ruby/test_process.rb
index dc0ccd1f770cd6..5497b182f76b8a 100644
--- a/test/ruby/test_process.rb
+++ b/test/ruby/test_process.rb
@@ -23,12 +23,6 @@ def self.windows?
     return /mswin|mingw|bccwin/ =~ RUBY_PLATFORM
   end
 
-  def write_file(filename, content)
-    File.open(filename, "w") {|f|
-      f << content
-    }
-  end
-
   def with_tmpchdir
     Dir.mktmpdir {|d|
       d = File.realpath(d)
@@ -39,7 +33,7 @@ def with_tmpchdir
   end
 
   def run_in_child(str) # should be called in a temporary directory
-    write_file("test-script", str)
+    File.write("test-script", str)
     Process.wait spawn(RUBY, "test-script")
     $?
   end
@@ -65,7 +59,7 @@ def rlimit_exist?
   def test_rlimit_nofile
     return unless rlimit_exist?
     with_tmpchdir {
-      write_file 's', <<-"End"
+      File.write 's', <<-"End"
         # Too small RLIMIT_NOFILE, such as zero, causes problems.
         # [OpenBSD] Setting to zero freezes this test.
         # [GNU/Linux] EINVAL on poll().  EINVAL on ruby's internal poll() ruby with "[ASYNC BUG] thread_timer: select".
@@ -205,58 +199,67 @@ def test_execopts_rlimit
 
     max = Process.getrlimit(:CORE).last
 
+    # When running under ASAN, we need to set disable_coredump=0 for this test; by default
+    # the ASAN runtime library sets RLIMIT_CORE to 0, "to avoid dumping a 16T+ core file", and
+    # that inteferes with this test.
+    asan_options = ENV['ASAN_OPTIONS'] || ''
+    asan_options  << ':' unless asan_options.empty?
+    env = {
+      'ASAN_OPTIONS' => "#{asan_options}disable_coredump=0"
+    }
+
     n = max
-    IO.popen([RUBY, "-e",
+    IO.popen([env, RUBY, "-e",
              "puts Process.getrlimit(:CORE)", :rlimit_core=>n]) {|io|
       assert_equal("#{n}\n#{n}\n", io.read)
     }
 
     n = 0
-    IO.popen([RUBY, "-e",
+    IO.popen([env, RUBY, "-e",
              "puts Process.getrlimit(:CORE)", :rlimit_core=>n]) {|io|
       assert_equal("#{n}\n#{n}\n", io.read)
     }
 
     n = max
-    IO.popen([RUBY, "-e",
+    IO.popen([env, RUBY, "-e",
              "puts Process.getrlimit(:CORE)", :rlimit_core=>[n]]) {|io|
       assert_equal("#{n}\n#{n}\n", io.read)
     }
 
     m, n = 0, max
-    IO.popen([RUBY, "-e",
+    IO.popen([env, RUBY, "-e",
              "puts Process.getrlimit(:CORE)", :rlimit_core=>[m,n]]) {|io|
       assert_equal("#{m}\n#{n}\n", io.read)
     }
 
     m, n = 0, 0
-    IO.popen([RUBY, "-e",
+    IO.popen([env, RUBY, "-e",
              "puts Process.getrlimit(:CORE)", :rlimit_core=>[m,n]]) {|io|
       assert_equal("#{m}\n#{n}\n", io.read)
     }
 
     n = max
-    IO.popen([RUBY, "-e",
+    IO.popen([env, RUBY, "-e",
       "puts Process.getrlimit(:CORE), Process.getrlimit(:CPU)",
       :rlimit_core=>n, :rlimit_cpu=>3600]) {|io|
       assert_equal("#{n}\n#{n}\n""3600\n3600\n", io.read)
     }
 
     assert_raise(ArgumentError) do
-      system(RUBY, '-e', 'exit',  'rlimit_bogus'.to_sym => 123)
+      system(env, RUBY, '-e', 'exit',  'rlimit_bogus'.to_sym => 123)
     end
-    assert_separately([],"#{<<~"begin;"}\n#{<<~'end;'}", 'rlimit_cpu'.to_sym => 3600)
+    assert_separately([env],"#{<<~"begin;"}\n#{<<~'end;'}", 'rlimit_cpu'.to_sym => 3600)
     BUG = "[ruby-core:82033] [Bug #13744]"
     begin;
       assert_equal([3600,3600], Process.getrlimit(:CPU), BUG)
     end;
 
     assert_raise_with_message(ArgumentError, /bogus/) do
-      system(RUBY, '-e', 'exit', :rlimit_bogus => 123)
+      system(env, RUBY, '-e', 'exit', :rlimit_bogus => 123)
     end
 
     assert_raise_with_message(ArgumentError, /rlimit_cpu/) {
-      system(RUBY, '-e', 'exit', "rlimit_cpu\0".to_sym => 3600)
+      system(env, RUBY, '-e', 'exit', "rlimit_cpu\0".to_sym => 3600)
     }
   end
 
@@ -272,12 +275,12 @@ def test_overwrite_ENV
     end;
   end
 
-  MANDATORY_ENVS = %w[RUBYLIB RJIT_SEARCH_BUILD_DIR]
+  MANDATORY_ENVS = %w[RUBYLIB GEM_HOME GEM_PATH]
   case RbConfig::CONFIG['target_os']
   when /linux/
     MANDATORY_ENVS << 'LD_PRELOAD'
   when /mswin|mingw/
-    MANDATORY_ENVS.concat(%w[HOME USER TMPDIR])
+    MANDATORY_ENVS.concat(%w[HOME USER TMPDIR PROCESSOR_ARCHITECTURE])
   when /darwin/
     MANDATORY_ENVS.concat(ENV.keys.grep(/\A__CF_/))
   end
@@ -361,7 +364,7 @@ def test_execopts_env
   def test_execopt_env_path
     bug8004 = '[ruby-core:53103] [Bug #8004]'
     Dir.mktmpdir do |d|
-      open("#{d}/tmp_script.cmd", "w") {|f| f.puts ": ;"; f.chmod(0755)}
+      File.write("#{d}/tmp_script.cmd", ": ;\n", perm: 0o755)
       assert_not_nil(pid = Process.spawn({"PATH" => d}, "tmp_script.cmd"), bug8004)
       wpid, st = Process.waitpid2(pid)
       assert_equal([pid, true], [wpid, st.success?], bug8004)
@@ -399,7 +402,7 @@ def test_execopts_env_popen_vector
 
   def test_execopts_env_popen_string
     with_tmpchdir do |d|
-      open('test-script', 'w') do |f|
+      File.open('test-script', 'w') do |f|
         ENVCOMMAND.each_with_index do |cmd, i|
           next if i.zero? or cmd == "-e"
           f.puts cmd
@@ -411,16 +414,14 @@ def test_execopts_env_popen_string
 
   def test_execopts_preserve_env_on_exec_failure
     with_tmpchdir {|d|
-      write_file 's', <<-"End"
+      File.write 's', <<-"End"
         ENV["mgg"] = nil
         prog = "./nonexistent"
         begin
           Process.exec({"mgg" => "mggoo"}, [prog, prog])
         rescue Errno::ENOENT
         end
-        open('out', 'w') {|f|
-          f.print ENV["mgg"].inspect
-        }
+        File.write('out', ENV["mgg"].inspect)
       End
       system(RUBY, 's')
       assert_equal(nil.inspect, File.read('out'),
@@ -430,9 +431,7 @@ def test_execopts_preserve_env_on_exec_failure
 
   def test_execopts_env_single_word
     with_tmpchdir {|d|
-      open("test_execopts_env_single_word.rb", "w") {|f|
-        f.puts "print ENV['hgga']"
-      }
+      File.write("test_execopts_env_single_word.rb", "print ENV['hgga']\n")
       system({"hgga"=>"ugu"}, RUBY,
              :in => 'test_execopts_env_single_word.rb',
              :out => 'test_execopts_env_single_word.out')
@@ -554,7 +553,7 @@ def test_execopts_redirect_fd
       assert_equal("a", File.read("out").chomp)
       if windows?
         # currently telling to child the file modes is not supported.
-        open("out", "a") {|f| f.write "0\n"}
+        File.write("out", "0\n", mode: "a")
       else
         Process.wait Process.spawn(*ECHO["0"], STDOUT=>["out", File::WRONLY|File::CREAT|File::APPEND, 0644])
         assert_equal("a\n0\n", File.read("out"))
@@ -665,6 +664,7 @@ def test_execopts_redirect_open_fifo
   end unless windows? # does not support fifo
 
   def test_execopts_redirect_open_fifo_interrupt_raise
+    pid = nil
     with_tmpchdir {|d|
       begin
         File.mkfifo("fifo")
@@ -682,15 +682,21 @@ class E < StandardError; end
           puts "ok"
         end
       EOS
+        pid = io.pid
         assert_equal("start\n", io.gets)
         sleep 0.5
         Process.kill(:USR1, io.pid)
         assert_equal("ok\n", io.read)
       }
+      assert_equal(pid, $?.pid)
+      assert_predicate($?, :success?)
     }
+  ensure
+    assert_raise(Errno::ESRCH) {Process.kill(:KILL, pid)} if pid
   end unless windows? # does not support fifo
 
   def test_execopts_redirect_open_fifo_interrupt_print
+    pid = nil
     with_tmpchdir {|d|
       begin
         File.mkfifo("fifo")
@@ -703,14 +709,25 @@ def test_execopts_redirect_open_fifo_interrupt_print
         puts "start"
         system("cat", :in => "fifo")
       EOS
+        pid = io.pid
         assert_equal("start\n", io.gets)
         sleep 0.2 # wait for the child to stop at opening "fifo"
         Process.kill(:USR1, io.pid)
         assert_equal("trap\n", io.readpartial(8))
+        sleep 0.2 # wait for the child to return to opening "fifo".
+        # On arm64-darwin22, often deadlocks while the child is
+        # opening "fifo".  Not sure to where "ok" line being written
+        # at the next has gone.
         File.write("fifo", "ok\n")
         assert_equal("ok\n", io.read)
       }
+      assert_equal(pid, $?.pid)
+      assert_predicate($?, :success?)
     }
+  ensure
+    if pid
+      assert_raise(Errno::ESRCH) {Process.kill(:KILL, pid)}
+    end
   end unless windows? # does not support fifo
 
   def test_execopts_redirect_pipe
@@ -858,7 +875,7 @@ def test_execopts_redirect_dup2_child
 
   def test_execopts_exec
     with_tmpchdir {|d|
-      write_file("s", 'exec "echo aaa", STDOUT=>"foo"')
+      File.write("s", 'exec "echo aaa", STDOUT=>"foo"')
       pid = spawn RUBY, 's'
       Process.wait pid
       assert_equal("aaa\n", File.read("foo"))
@@ -905,15 +922,29 @@ def test_execopts_popen_extra_fd
     }
   end
 
-  def test_popen_fork
-    IO.popen("-") {|io|
-      if !io
-        puts "fooo"
-      else
-        assert_equal("fooo\n", io.read)
+  if Process.respond_to?(:fork)
+    def test_popen_fork
+      IO.popen("-") do |io|
+        if !io
+          puts "fooo"
+        else
+          assert_equal("fooo\n", io.read)
+        end
       end
-    }
-  rescue NotImplementedError
+    end
+
+    def test_popen_fork_ensure
+      IO.popen("-") do |io|
+        if !io
+          STDERR.reopen(STDOUT)
+          raise "fooo"
+        else
+          assert_empty io.read
+        end
+      end
+    rescue RuntimeError
+      abort "[Bug #20995] should not reach here"
+    end
   end
 
   def test_fd_inheritance
@@ -932,7 +963,7 @@ def test_fd_inheritance
     }
     with_pipe {|r, w|
       with_tmpchdir {|d|
-	write_file("s", <<-"End")
+	File.write("s", <<-"End")
 	  exec(#{RUBY.dump}, '-e',
 	       'IO.new(ARGV[0].to_i, "w").puts("bu") rescue nil',
 	       #{w.fileno.to_s.dump}, :close_others=>false)
@@ -986,7 +1017,7 @@ def test_execopts_close_others
         assert_equal("bi\n", r.read)
       }
       with_pipe {|r, w|
-	write_file("s", <<-"End")
+	File.write("s", <<-"End")
 	  exec(#{RUBY.dump}, '-e',
 	       'STDERR.reopen("err", "w"); IO.new(ARGV[0].to_i, "w").puts("mu")',
 	       #{w.fileno.to_s.dump},
@@ -1112,7 +1143,7 @@ def test_popen_noshell
 
   def test_exec_noshell
     with_tmpchdir {|d|
-      write_file("s", <<-"End")
+      File.write("s", <<-"End")
 	  str = "echo non existing command name which contains spaces"
 	  STDERR.reopen(STDOUT)
 	  begin
@@ -1128,7 +1159,7 @@ def test_exec_noshell
 
   def test_system_wordsplit
     with_tmpchdir {|d|
-      write_file("script", <<-'End')
+      File.write("script", <<-'End')
         File.open("result", "w") {|t| t << "haha pid=#{$$} ppid=#{Process.ppid}" }
         exit 5
       End
@@ -1144,7 +1175,7 @@ def test_system_wordsplit
 
   def test_spawn_wordsplit
     with_tmpchdir {|d|
-      write_file("script", <<-'End')
+      File.write("script", <<-'End')
         File.open("result", "w") {|t| t << "hihi pid=#{$$} ppid=#{Process.ppid}" }
         exit 6
       End
@@ -1161,7 +1192,7 @@ def test_spawn_wordsplit
 
   def test_popen_wordsplit
     with_tmpchdir {|d|
-      write_file("script", <<-'End')
+      File.write("script", <<-'End')
         print "fufu pid=#{$$} ppid=#{Process.ppid}"
         exit 7
       End
@@ -1180,7 +1211,7 @@ def test_popen_wordsplit
 
   def test_popen_wordsplit_beginning_and_trailing_spaces
     with_tmpchdir {|d|
-      write_file("script", <<-'End')
+      File.write("script", <<-'End')
         print "fufumm pid=#{$$} ppid=#{Process.ppid}"
         exit 7
       End
@@ -1199,7 +1230,7 @@ def test_popen_wordsplit_beginning_and_trailing_spaces
 
   def test_exec_wordsplit
     with_tmpchdir {|d|
-      write_file("script", <<-'End')
+      File.write("script", <<-'End')
         File.open("result", "w") {|t|
           if /mswin|bccwin|mingw/ =~ RUBY_PLATFORM
             t << "hehe ppid=#{Process.ppid}"
@@ -1209,7 +1240,7 @@ def test_exec_wordsplit
         }
         exit 6
       End
-      write_file("s", <<-"End")
+      File.write("s", <<-"End")
 	ruby = #{RUBY.dump}
 	exec "\#{ruby} script"
       End
@@ -1230,11 +1261,11 @@ def test_exec_wordsplit
 
   def test_system_shell
     with_tmpchdir {|d|
-      write_file("script1", <<-'End')
+      File.write("script1", <<-'End')
         File.open("result1", "w") {|t| t << "taka pid=#{$$} ppid=#{Process.ppid}" }
         exit 7
       End
-      write_file("script2", <<-'End')
+      File.write("script2", <<-'End')
         File.open("result2", "w") {|t| t << "taki pid=#{$$} ppid=#{Process.ppid}" }
         exit 8
       End
@@ -1250,7 +1281,7 @@ def test_system_shell
 
       if windows?
         Dir.mkdir(path = "path with space")
-        write_file(bat = path + "/bat test.bat", "@echo %1>out")
+        File.write(bat = path + "/bat test.bat", "@echo %1>out")
         system(bat, "foo 'bar'")
         assert_equal(%["foo 'bar'"\n], File.read("out"), '[ruby-core:22960]')
         system(%[#{bat.dump} "foo 'bar'"])
@@ -1261,11 +1292,11 @@ def test_system_shell
 
   def test_spawn_shell
     with_tmpchdir {|d|
-      write_file("script1", <<-'End')
+      File.write("script1", <<-'End')
         File.open("result1", "w") {|t| t << "taku pid=#{$$} ppid=#{Process.ppid}" }
         exit 7
       End
-      write_file("script2", <<-'End')
+      File.write("script2", <<-'End')
         File.open("result2", "w") {|t| t << "take pid=#{$$} ppid=#{Process.ppid}" }
         exit 8
       End
@@ -1282,7 +1313,7 @@ def test_spawn_shell
 
       if windows?
         Dir.mkdir(path = "path with space")
-        write_file(bat = path + "/bat test.bat", "@echo %1>out")
+        File.write(bat = path + "/bat test.bat", "@echo %1>out")
         pid = spawn(bat, "foo 'bar'")
         Process.wait pid
         status = $?
@@ -1301,11 +1332,11 @@ def test_spawn_shell
 
   def test_popen_shell
     with_tmpchdir {|d|
-      write_file("script1", <<-'End')
+      File.write("script1", <<-'End')
         puts "tako pid=#{$$} ppid=#{Process.ppid}"
         exit 7
       End
-      write_file("script2", <<-'End')
+      File.write("script2", <<-'End')
         puts "tika pid=#{$$} ppid=#{Process.ppid}"
         exit 8
       End
@@ -1320,7 +1351,7 @@ def test_popen_shell
 
       if windows?
         Dir.mkdir(path = "path with space")
-        write_file(bat = path + "/bat test.bat", "@echo %1")
+        File.write(bat = path + "/bat test.bat", "@echo %1")
         r = IO.popen([bat, "foo 'bar'"]) {|f| f.read}
         assert_equal(%["foo 'bar'"\n], r, '[ruby-core:22960]')
         r = IO.popen(%[#{bat.dump} "foo 'bar'"]) {|f| f.read}
@@ -1331,15 +1362,15 @@ def test_popen_shell
 
   def test_exec_shell
     with_tmpchdir {|d|
-      write_file("script1", <<-'End')
+      File.write("script1", <<-'End')
         File.open("result1", "w") {|t| t << "tiki pid=#{$$} ppid=#{Process.ppid}" }
         exit 7
       End
-      write_file("script2", <<-'End')
+      File.write("script2", <<-'End')
         File.open("result2", "w") {|t| t << "tiku pid=#{$$} ppid=#{Process.ppid}" }
         exit 8
       End
-      write_file("s", <<-"End")
+      File.write("s", <<-"End")
 	ruby = #{RUBY.dump}
 	exec("\#{ruby} script1 || \#{ruby} script2")
       End
@@ -1366,7 +1397,7 @@ def test_argv0
 
       assert_equal("1", IO.popen([[RUBY, "qwerty"], "-e", "print 1"]) {|f| f.read })
 
-      write_file("s", <<-"End")
+      File.write("s", <<-"End")
         exec([#{RUBY.dump}, "lkjh"], "-e", "exit 5")
       End
       pid = spawn RUBY, "s"
@@ -1376,7 +1407,7 @@ def test_argv0
   end
 
   def with_stdin(filename)
-    open(filename) {|f|
+    File.open(filename) {|f|
       begin
         old = STDIN.dup
         begin
@@ -1393,8 +1424,8 @@ def with_stdin(filename)
 
   def test_argv0_noarg
     with_tmpchdir {|d|
-      open("t", "w") {|f| f.print "exit true" }
-      open("f", "w") {|f| f.print "exit false" }
+      File.write("t", "exit true")
+      File.write("f",  "exit false")
 
       with_stdin("t") { assert_equal(true, system([RUBY, "qaz"])) }
       with_stdin("f") { assert_equal(false, system([RUBY, "wsx"])) }
@@ -1437,8 +1468,6 @@ def test_status
       assert_equal(s, s)
       assert_equal(s, s.to_i)
 
-      assert_equal(s.to_i & 0x55555555, s & 0x55555555)
-      assert_equal(s.to_i >> 1, s >> 1)
       assert_equal(false, s.stopped?)
       assert_equal(nil, s.stopsig)
 
@@ -1454,7 +1483,7 @@ def test_status_kill
     expected = Signal.list.include?("QUIT") ? [false, true, false, nil] : [true, false, false, true]
 
     with_tmpchdir do
-      write_file("foo", "Process.kill(:KILL, $$); exit(42)")
+      File.write("foo", "Process.kill(:KILL, $$); exit(42)")
       system(RUBY, "foo")
       s = $?
       assert_equal(expected,
@@ -1502,7 +1531,7 @@ def test_status_wait
 
   def test_wait_without_arg
     with_tmpchdir do
-      write_file("foo", "sleep 0.1")
+      File.write("foo", "sleep 0.1")
       pid = spawn(RUBY, "foo")
       assert_equal(pid, Process.wait)
     end
@@ -1510,7 +1539,7 @@ def test_wait_without_arg
 
   def test_wait2
     with_tmpchdir do
-      write_file("foo", "sleep 0.1")
+      File.write("foo", "sleep 0.1")
       pid = spawn(RUBY, "foo")
       assert_equal([pid, 0], Process.wait2)
     end
@@ -1518,7 +1547,7 @@ def test_wait2
 
   def test_waitall
     with_tmpchdir do
-      write_file("foo", "sleep 0.1")
+      File.write("foo", "sleep 0.1")
       ps = (0...3).map { spawn(RUBY, "foo") }.sort
       ss = Process.waitall.sort
       ps.zip(ss) do |p1, (p2, s)|
@@ -1560,7 +1589,7 @@ def test_abort
     with_tmpchdir do
       s = run_in_child("abort")
       assert_not_predicate(s, :success?)
-      write_file("test-script", "#{<<~"begin;"}\n#{<<~'end;'}")
+      File.write("test-script", "#{<<~"begin;"}\n#{<<~'end;'}")
       begin;
         STDERR.reopen(STDOUT)
         begin
@@ -1664,12 +1693,7 @@ def test_gid_from_name
       if g = Etc.getgrgid(Process.gid)
         assert_equal(Process.gid, Process::GID.from_name(g.name), g.name)
       end
-      expected_excs = [ArgumentError]
-      expected_excs << Errno::ENOENT if defined?(Errno::ENOENT)
-      expected_excs << Errno::ESRCH if defined?(Errno::ESRCH) # WSL 2 actually raises Errno::ESRCH
-      expected_excs << Errno::EBADF if defined?(Errno::EBADF)
-      expected_excs << Errno::EPERM if defined?(Errno::EPERM)
-      exc = assert_raise(*expected_excs) do
+      exc = assert_raise_kind_of(ArgumentError, SystemCallError) do
         Process::GID.from_name("\u{4e0d 5b58 5728}") # fu son zai ("absent" in Kanji)
       end
       assert_match(/\u{4e0d 5b58 5728}/, exc.message) if exc.is_a?(ArgumentError)
@@ -1708,22 +1732,23 @@ def test_wait_and_sigchild
         sig_w.write('?')
       end
       pid = nil
+      th = nil
       IO.pipe do |r, w|
         pid = fork { r.read(1); exit }
-        Thread.start {
+        th = Thread.start {
           Thread.current.report_on_exception = false
           raise
         }
         w.puts
       end
       Process.wait pid
+      begin
+        th.join
+      rescue Exception
+      end
       assert_send [sig_r, :wait_readable, 5], 'self-pipe not readable'
     end
-    if defined?(RubyVM::RJIT) && RubyVM::RJIT.enabled? # checking -DRJIT_FORCE_ENABLE. It may trigger extra SIGCHLD.
-      assert_equal [true], signal_received.uniq, "[ruby-core:19744]"
-    else
-      assert_equal [true], signal_received, "[ruby-core:19744]"
-    end
+    assert_equal [true], signal_received, "[ruby-core:19744]"
   rescue NotImplementedError, ArgumentError
   ensure
     begin
@@ -1733,15 +1758,12 @@ def test_wait_and_sigchild
   end
 
   def test_no_curdir
-    if /solaris/i =~ RUBY_PLATFORM
-      omit "Temporary omit to avoid CI failures after commit to use realpath on required files"
-    end
     with_tmpchdir {|d|
       Dir.mkdir("vd")
       status = nil
       Dir.chdir("vd") {
         dir = "#{d}/vd"
-        # OpenSolaris cannot remove the current directory.
+        # Windows cannot remove the current directory with permission issues.
         system(RUBY, "--disable-gems", "-e", "Dir.chdir '..'; Dir.rmdir #{dir.dump}", err: File::NULL)
         system({"RUBYLIB"=>nil}, RUBY, "--disable-gems", "-e", "exit true")
         status = $?
@@ -1753,16 +1775,16 @@ def test_no_curdir
   def test_fallback_to_sh
     feature = '[ruby-core:32745]'
     with_tmpchdir do |d|
-      open("tmp_script.#{$$}", "w") {|f| f.puts ": ;"; f.chmod(0755)}
+      File.write("tmp_script.#{$$}", ": ;\n", perm: 0o755)
       assert_not_nil(pid = Process.spawn("./tmp_script.#{$$}"), feature)
       wpid, st = Process.waitpid2(pid)
       assert_equal([pid, true], [wpid, st.success?], feature)
 
-      open("tmp_script.#{$$}", "w") {|f| f.puts "echo $#: $@"; f.chmod(0755)}
+      File.write("tmp_script.#{$$}", "echo $#: $@", perm: 0o755)
       result = IO.popen(["./tmp_script.#{$$}", "a b", "c"]) {|f| f.read}
       assert_equal("2: a b c\n", result, feature)
 
-      open("tmp_script.#{$$}", "w") {|f| f.puts "echo $hghg"; f.chmod(0755)}
+      File.write("tmp_script.#{$$}", "echo $hghg", perm: 0o755)
       result = IO.popen([{"hghg" => "mogomogo"}, "./tmp_script.#{$$}", "a b", "c"]) {|f| f.read}
       assert_equal("mogomogo\n", result, feature)
 
@@ -1775,9 +1797,6 @@ def test_spawn_too_long_path
   end
 
   def test_aspawn_too_long_path
-    if /solaris/i =~ RUBY_PLATFORM && !defined?(Process::RLIMIT_NPROC)
-      omit "Too exhaustive test on platforms without Process::RLIMIT_NPROC such as Solaris 10"
-    end
     bug4315 = '[ruby-core:34833] #7904 [ruby-core:52628] #11613'
     assert_fail_too_long_path(%w"echo |", bug4315)
   end
@@ -2145,7 +2164,7 @@ def test_exec_nonascii
       "c\u{1EE7}a",
     ].each do |arg|
       begin
-        arg = arg.encode(Encoding.find("locale"))
+        arg = arg.encode(Encoding.local_charmap)
       rescue
       else
         assert_in_out_err([], "#{<<-"begin;"}\n#{<<-"end;"}", [arg], [], bug12841)
@@ -2722,6 +2741,7 @@ def test_warmup_precompute_string_coderange
     require 'objspace'
     begin;
       obj = "a" * 12
+      obj.force_encoding(Encoding::UTF_16LE)
       obj.force_encoding(Encoding::BINARY)
       assert_include(ObjectSpace.dump(obj), '"coderange":"unknown"')
       Process.warmup
@@ -2734,7 +2754,7 @@ def test_warmup_frees_pages
     begin;
       GC.start
 
-      TIMES = 10_000
+      TIMES = 100_000
       ary = Array.new(TIMES)
       TIMES.times do |i|
         ary[i] = Object.new
@@ -2745,14 +2765,91 @@ def test_warmup_frees_pages
       # Disable GC so we can make sure GC only runs in Process.warmup
       GC.disable
 
-      total_pages_before = GC.stat(:heap_eden_pages) + GC.stat(:heap_allocatable_pages)
+      total_slots_before = GC.stat(:heap_available_slots) + GC.stat(:heap_allocatable_slots)
 
       Process.warmup
 
-      # Number of pages freed should cause equal increase in number of allocatable pages.
-      assert_equal(total_pages_before, GC.stat(:heap_eden_pages) + GC.stat(:heap_allocatable_pages))
-      assert_equal(0, GC.stat(:heap_tomb_pages), GC.stat)
+      # TODO: flaky
+      # assert_equal(total_slots_before, GC.stat(:heap_available_slots) + GC.stat(:heap_allocatable_slots))
+
+      assert_equal(0, GC.stat(:heap_empty_pages))
       assert_operator(GC.stat(:total_freed_pages), :>, 0)
     end;
   end
+
+  def test_concurrent_group_and_pid_wait
+    # Use a pair of pipes that will make long_pid exit when this test exits, to avoid
+    # leaking temp processes.
+    long_rpipe, long_wpipe = IO.pipe
+    short_rpipe, short_wpipe = IO.pipe
+    # This process should run forever
+    long_pid = fork do
+      [short_rpipe, short_wpipe, long_wpipe].each(&:close)
+      long_rpipe.read
+    end
+    # This process will exit
+    short_pid = fork do
+      [long_rpipe, long_wpipe, short_wpipe].each(&:close)
+      short_rpipe.read
+    end
+    t1, t2, t3 = nil
+    EnvUtil.timeout(5) do
+      t1 = Thread.new do
+        Process.waitpid long_pid
+      end
+      # Wait for us to be blocking in a call to waitpid2
+      Thread.pass until t1.stop?
+      short_wpipe.close # Make short_pid exit
+
+      # The short pid has exited, so -1 should pick that up.
+      assert_equal short_pid, Process.waitpid(-1)
+
+      # Terminate t1 for the next phase of the test.
+      t1.kill
+      t1.join
+
+      t2 = Thread.new do
+        Process.waitpid(-1)
+      rescue Errno::ECHILD
+        nil
+      end
+      Thread.pass until t2.stop?
+      t3 = Thread.new do
+        Process.waitpid long_pid
+      rescue Errno::ECHILD
+        nil
+      end
+      Thread.pass until t3.stop?
+
+      # it's actually nondeterministic which of t2 or t3 will receive the wait (this
+      # nondeterminism comes from the behaviour of the underlying system calls)
+      long_wpipe.close
+      assert_equal [long_pid], [t2, t3].map(&:value).compact
+    end
+  ensure
+    [t1, t2, t3].each { _1&.kill rescue nil }
+    [t1, t2, t3].each { _1&.join rescue nil }
+    [long_rpipe, long_wpipe, short_rpipe, short_wpipe].each { _1&.close rescue nil }
+  end if defined?(fork)
+
+  def test_handle_interrupt_with_fork
+    Thread.handle_interrupt(RuntimeError => :never) do
+      Thread.current.raise(RuntimeError, "Queued error")
+
+      assert_predicate Thread, :pending_interrupt?
+
+      pid = Process.fork do
+        if Thread.pending_interrupt?
+          exit 1
+        end
+      end
+
+      _, status = Process.waitpid2(pid)
+      assert_predicate status, :success?
+
+      assert_predicate Thread, :pending_interrupt?
+    end
+  rescue RuntimeError
+    # Ignore.
+  end if defined?(fork)
 end
diff --git a/test/ruby/test_ractor.rb b/test/ruby/test_ractor.rb
new file mode 100644
index 00000000000000..97af7e7413f44e
--- /dev/null
+++ b/test/ruby/test_ractor.rb
@@ -0,0 +1,160 @@
+# frozen_string_literal: false
+require 'test/unit'
+
+class TestRactor < Test::Unit::TestCase
+  def test_shareability_of_iseq_proc
+    y = nil.instance_eval do
+      foo = []
+      proc { foo }
+    end
+    assert_unshareable(y, /unshareable object \[\] from variable 'foo'/)
+
+    y = [].instance_eval { proc { self } }
+    assert_unshareable(y, /Proc's self is not shareable/)
+
+    y = [].freeze.instance_eval { proc { self } }
+    assert_make_shareable(y)
+  end
+
+  def test_shareability_of_curried_proc
+    x = nil.instance_eval do
+      foo = []
+      proc { foo }.curry
+    end
+    assert_unshareable(x, /unshareable object \[\] from variable 'foo'/)
+
+    x = nil.instance_eval do
+      foo = 123
+      proc { foo }.curry
+    end
+    assert_make_shareable(x)
+  end
+
+  def test_shareability_of_method_proc
+    str = +""
+
+    x = str.instance_exec { proc { to_s } }
+    assert_unshareable(x, /Proc's self is not shareable/)
+
+    x = str.instance_exec { method(:to_s) }
+    assert_unshareable(x, "can not make shareable object for #<Method: String#to_s()>", exception: Ractor::Error)
+
+    x = str.instance_exec { method(:to_s).to_proc }
+    assert_unshareable(x, "can not make shareable object for #<Method: String#to_s()>", exception: Ractor::Error)
+
+    x = str.instance_exec { method(:itself).to_proc }
+    assert_unshareable(x, "can not make shareable object for #<Method: String(Kernel)#itself()>", exception: Ractor::Error)
+
+    str.freeze
+
+    x = str.instance_exec { proc { to_s } }
+    assert_make_shareable(x)
+
+    x = str.instance_exec { method(:to_s) }
+    assert_unshareable(x, "can not make shareable object for #<Method: String#to_s()>", exception: Ractor::Error)
+
+    x = str.instance_exec { method(:to_s).to_proc }
+    assert_unshareable(x, "can not make shareable object for #<Method: String#to_s()>", exception: Ractor::Error)
+
+    x = str.instance_exec { method(:itself).to_proc }
+    assert_unshareable(x, "can not make shareable object for #<Method: String(Kernel)#itself()>", exception: Ractor::Error)
+  end
+
+  def test_shareability_error_uses_inspect
+    x = (+"").instance_exec { method(:to_s) }
+    def x.to_s
+      raise "this should not be called"
+    end
+    assert_unshareable(x, "can not make shareable object for #<Method: String#to_s()>", exception: Ractor::Error)
+  end
+
+  def test_default_thread_group
+    assert_separately([], "#{<<~"begin;"}\n#{<<~'end;'}")
+    begin;
+      Warning[:experimental] = false
+
+      main_ractor_id = Thread.current.group.object_id
+      ractor_id = Ractor.new { Thread.current.group.object_id }.value
+      refute_equal main_ractor_id, ractor_id
+    end;
+  end
+
+  def test_class_instance_variables
+    assert_ractor(<<~'RUBY')
+      # Once we're in multi-ractor mode, the codepaths
+      # for class instance variables are a bit different.
+      Ractor.new {}.value
+
+      class TestClass
+        @a = 1
+        @b = 2
+        @c = 3
+        @d = 4
+      end
+
+      assert_equal 4, TestClass.remove_instance_variable(:@d)
+      assert_nil TestClass.instance_variable_get(:@d)
+      assert_equal 4, TestClass.instance_variable_set(:@d, 4)
+      assert_equal 4, TestClass.instance_variable_get(:@d)
+    RUBY
+  end
+
+  def test_fork_raise_isolation_error
+    assert_ractor(<<~'RUBY')
+      ractor = Ractor.new do
+        Process.fork
+      rescue Ractor::IsolationError => e
+        e
+      end
+      assert_equal Ractor::IsolationError, ractor.value.class
+    RUBY
+  end if Process.respond_to?(:fork)
+
+  def test_require_raises_and_no_ractor_belonging_issue
+    assert_ractor(<<~'RUBY')
+      require "tempfile"
+      f = Tempfile.new(["file_to_require_from_ractor", ".rb"])
+      f.write("raise 'uh oh'")
+      f.flush
+      err_msg = Ractor.new(f.path) do |path|
+        begin
+          require path
+        rescue RuntimeError => e
+          e.message # had confirm belonging issue here
+        else
+          nil
+        end
+      end.value
+      assert_equal "uh oh", err_msg
+    RUBY
+  end
+
+  def test_require_non_string
+    assert_ractor(<<~'RUBY')
+      require "tempfile"
+      require "pathname"
+      f = Tempfile.new(["file_to_require_from_ractor", ".rb"])
+      f.write("")
+      f.flush
+      result = Ractor.new(f.path) do |path|
+        require Pathname.new(path)
+        "success"
+      end.value
+      assert_equal "success", result
+    RUBY
+  end
+
+  def assert_make_shareable(obj)
+    refute Ractor.shareable?(obj), "object was already shareable"
+    Ractor.make_shareable(obj)
+    assert Ractor.shareable?(obj), "object didn't become shareable"
+  end
+
+  def assert_unshareable(obj, msg=nil, exception: Ractor::IsolationError)
+    refute Ractor.shareable?(obj), "object is already shareable"
+    assert_raise_with_message(exception, msg) do
+      Ractor.make_shareable(obj)
+    end
+    refute Ractor.shareable?(obj), "despite raising, object became shareable"
+  end
+end
diff --git a/test/ruby/test_rand.rb b/test/ruby/test_rand.rb
index a4beffd689e7b3..f177664943ae9e 100644
--- a/test/ruby/test_rand.rb
+++ b/test/ruby/test_rand.rb
@@ -434,4 +434,9 @@ def test_new_seed
     # probability of failure <= 1/256**8
     assert_operator(size.fdiv(n), :>, 15)
   end
+
+  def test_broken_marshal
+    assert_raise(ArgumentError) { Marshal.load("\x04\bU:\vRandom" + Marshal.dump([1,0,1])[2..]) }
+    assert_raise(ArgumentError) { Marshal.load("\x04\bU:\vRandom" + Marshal.dump([1,-1,1])[2..]) }
+  end
 end
diff --git a/test/ruby/test_random_formatter.rb b/test/ruby/test_random_formatter.rb
index 2c01d99b3dbe78..784fbfc2b8e6d1 100644
--- a/test/ruby/test_random_formatter.rb
+++ b/test/ruby/test_random_formatter.rb
@@ -75,6 +75,47 @@ def test_uuid
       assert_match(/\A\h{8}-\h{4}-\h{4}-\h{4}-\h{12}\z/, uuid)
     end
 
+    def assert_uuid_v7(**opts)
+      t1 = current_uuid7_time(**opts)
+      uuid = @it.uuid_v7(**opts)
+      t3 = current_uuid7_time(**opts)
+
+      assert_match(/\A\h{8}-\h{4}-7\h{3}-[89ab]\h{3}-\h{12}\z/, uuid)
+
+      t2 = get_uuid7_time(uuid, **opts)
+      assert_operator(t1, :<=, t2)
+      assert_operator(t2, :<=, t3)
+    end
+
+    def test_uuid_v7
+      assert_uuid_v7
+      0.upto(12) do |extra_timestamp_bits|
+        assert_uuid_v7 extra_timestamp_bits: extra_timestamp_bits
+      end
+    end
+
+    # It would be nice to simply use Time#floor here.  But that is problematic
+    # due to the difference between decimal vs binary fractions.
+    def current_uuid7_time(extra_timestamp_bits: 0)
+      denominator = (1 << extra_timestamp_bits).to_r
+      Process.clock_gettime(Process::CLOCK_REALTIME, :nanosecond)
+        .then {|ns| ((ns / 1_000_000r) * denominator).floor / denominator }
+        .then {|ms| Time.at(ms / 1000r, in: "+00:00") }
+    end
+
+    def get_uuid7_time(uuid, extra_timestamp_bits: 0)
+      denominator     = (1 << extra_timestamp_bits) * 1000r
+      extra_chars     = extra_timestamp_bits / 4
+      last_char_bits  = extra_timestamp_bits % 4
+      extra_chars    += 1 if last_char_bits != 0
+      timestamp_re    = /\A(\h{8})-(\h{4})-7(\h{#{extra_chars}})/
+      timestamp_chars = uuid.match(timestamp_re).captures.join
+      timestamp       = timestamp_chars.to_i(16)
+      timestamp     >>= 4 - last_char_bits unless last_char_bits == 0
+      timestamp      /= denominator
+      Time.at timestamp, in: "+00:00"
+    end
+
     def test_alphanumeric
       65.times do |n|
         an = @it.alphanumeric(n)
@@ -124,6 +165,11 @@ class TestClassMethods < Test::Unit::TestCase
     def setup
       @it = Random
     end
+
+    def test_alphanumeric_frozen
+      assert_predicate @it::Formatter::ALPHANUMERIC, :frozen?
+      assert @it::Formatter::ALPHANUMERIC.all?(&:frozen?)
+    end
   end
 
   class TestInstanceMethods < Test::Unit::TestCase
diff --git a/test/ruby/test_range.rb b/test/ruby/test_range.rb
index 820ca9e9c23454..f875c0ab40c5e4 100644
--- a/test/ruby/test_range.rb
+++ b/test/ruby/test_range.rb
@@ -2,6 +2,7 @@
 require 'test/unit'
 require 'delegate'
 require 'timeout'
+require 'date'
 require 'rbconfig/sizeof'
 
 class TestRange < Test::Unit::TestCase
@@ -120,13 +121,15 @@ def test_max
 
     assert_equal([10,9,8], (0..10).max(3))
     assert_equal([9,8,7], (0...10).max(3))
+    assert_equal([10,9,8], (..10).max(3))
+    assert_equal([9,8,7], (...10).max(3))
     assert_raise(RangeError) { (1..).max(3) }
     assert_raise(RangeError) { (1...).max(3) }
 
     assert_raise(RangeError) { (..0).min {|a, b| a <=> b } }
 
     assert_equal(2, (..2).max)
-    assert_raise(TypeError) { (...2).max }
+    assert_equal(1, (...2).max)
     assert_raise(TypeError) { (...2.0).max }
 
     assert_equal(Float::INFINITY, (1..Float::INFINITY).max)
@@ -245,67 +248,138 @@ def test_hash
     assert_kind_of(String, (0..1).hash.to_s)
   end
 
-  def test_step
-    a = []
-    (0..10).step {|x| a << x }
-    assert_equal([0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10], a)
+  def test_step_numeric_range
+    # Fixnums, floats and all other numbers (like rationals) should behave exactly the same,
+    # but the behavior is implemented independently in 3 different branches of code,
+    # so we need to test each of them.
+    %i[to_i to_r to_f].each do |type|
+      conv = type.to_proc
 
-    a = []
-    (0..).step {|x| a << x; break if a.size == 10 }
-    assert_equal([0, 1, 2, 3, 4, 5, 6, 7, 8, 9], a)
+      from = conv.(0)
+      to = conv.(10)
+      step = conv.(2)
 
-    a = []
-    (0..10).step(2) {|x| a << x }
-    assert_equal([0, 2, 4, 6, 8, 10], a)
+      # finite
+      a = []
+      (from..to).step(step) {|x| a << x }
+      assert_equal([0, 2, 4, 6, 8, 10].map(&conv), a)
 
-    a = []
-    (0..).step(2) {|x| a << x; break if a.size == 10 }
-    assert_equal([0, 2, 4, 6, 8, 10, 12, 14, 16, 18], a)
-
-    assert_kind_of(Enumerator::ArithmeticSequence, (0..10).step)
-    assert_kind_of(Enumerator::ArithmeticSequence, (0..10).step(2))
-    assert_kind_of(Enumerator::ArithmeticSequence, (0..10).step(0.5))
-    assert_kind_of(Enumerator::ArithmeticSequence, (10..0).step(-1))
-    assert_kind_of(Enumerator::ArithmeticSequence, (..10).step(2))
-    assert_kind_of(Enumerator::ArithmeticSequence, (1..).step(2))
-
-    assert_raise(ArgumentError) { (0..10).step(-1) { } }
-    assert_raise(ArgumentError) { (0..10).step(0) }
-    assert_raise(ArgumentError) { (0..10).step(0) { } }
-    assert_raise(ArgumentError) { (0..).step(-1) { } }
-    assert_raise(ArgumentError) { (0..).step(0) }
-    assert_raise(ArgumentError) { (0..).step(0) { } }
+      a = []
+      (from...to).step(step) {|x| a << x }
+      assert_equal([0, 2, 4, 6, 8].map(&conv), a)
 
-    a = []
-    ("a" .. "z").step(2) {|x| a << x }
-    assert_equal(%w(a c e g i k m o q s u w y), a)
+      # Note: ArithmeticSequence behavior tested in its own test, but we also put it here
+      # to demonstrate the result is the same
+      assert_kind_of(Enumerator::ArithmeticSequence, (from..to).step(step))
+      assert_equal([0, 2, 4, 6, 8, 10].map(&conv), (from..to).step(step).to_a)
+      assert_kind_of(Enumerator::ArithmeticSequence, (from...to).step(step))
+      assert_equal([0, 2, 4, 6, 8].map(&conv), (from...to).step(step).to_a)
 
-    a = []
-    ("a" .. ).step(2) {|x| a << x; break if a.size == 13 }
-    assert_equal(%w(a c e g i k m o q s u w y), a)
+      # endless
+      a = []
+      (from..).step(step) {|x| a << x; break if a.size == 5 }
+      assert_equal([0, 2, 4, 6, 8].map(&conv), a)
 
-    a = []
-    ("a" .. "z").step(2**32) {|x| a << x }
-    assert_equal(["a"], a)
+      assert_kind_of(Enumerator::ArithmeticSequence, (from..).step(step))
+      assert_equal([0, 2, 4, 6, 8].map(&conv), (from..).step(step).take(5))
 
-    a = []
-    (:a .. :z).step(2) {|x| a << x }
-    assert_equal(%i(a c e g i k m o q s u w y), a)
+      # beginless
+      assert_raise(ArgumentError) { (..to).step(step) {} }
+      assert_kind_of(Enumerator::ArithmeticSequence, (..to).step(step))
+      # This is inconsistent, but so it is implemented by ArithmeticSequence
+      assert_raise(TypeError) { (..to).step(step).to_a }
 
-    a = []
-    (:a .. ).step(2) {|x| a << x; break if a.size == 13 }
-    assert_equal(%i(a c e g i k m o q s u w y), a)
+      # negative step
 
-    a = []
-    (:a .. :z).step(2**32) {|x| a << x }
-    assert_equal([:a], a)
+      a = []
+      (from..to).step(-step) {|x| a << x }
+      assert_equal([], a)
+
+      a = []
+      (from..-to).step(-step) {|x| a << x }
+      assert_equal([0, -2, -4, -6, -8, -10].map(&conv), a)
+
+      a = []
+      (from...-to).step(-step) {|x| a << x }
+      assert_equal([0, -2, -4, -6, -8].map(&conv), a)
+
+      a = []
+      (from...).step(-step) {|x| a << x; break if a.size == 5 }
+      assert_equal([0, -2, -4, -6, -8].map(&conv), a)
+
+      assert_kind_of(Enumerator::ArithmeticSequence, (from..to).step(-step))
+      assert_equal([], (from..to).step(-step).to_a)
+
+      assert_kind_of(Enumerator::ArithmeticSequence, (from..-to).step(-step))
+      assert_equal([0, -2, -4, -6, -8, -10].map(&conv), (from..-to).step(-step).to_a)
+
+      assert_kind_of(Enumerator::ArithmeticSequence, (from...-to).step(-step))
+      assert_equal([0, -2, -4, -6, -8].map(&conv), (from...-to).step(-step).to_a)
+
+      assert_kind_of(Enumerator::ArithmeticSequence, (from...).step(-step))
+      assert_equal([0, -2, -4, -6, -8].map(&conv), (from...).step(-step).take(5))
+
+      # zero step
+
+      assert_raise(ArgumentError) { (from..to).step(0) {} }
+      assert_raise(ArgumentError) { (from..to).step(0) }
+
+      # default step
+
+      a = []
+      (from..to).step {|x| a << x }
+      assert_equal([0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10].map(&conv), a)
+
+      assert_kind_of(Enumerator::ArithmeticSequence, (from..to).step)
+      assert_equal([0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10].map(&conv), (from..to).step.to_a)
+
+      # default + endless range
+      a = []
+      (from..).step {|x| a << x; break if a.size == 5 }
+      assert_equal([0, 1, 2, 3, 4].map(&conv), a)
+
+      assert_kind_of(Enumerator::ArithmeticSequence, (from..).step)
+      assert_equal([0, 1, 2, 3, 4].map(&conv), (from..).step.take(5))
 
+      # default + beginless range
+      assert_kind_of(Enumerator::ArithmeticSequence, (..to).step)
+
+      # step is not numeric
+
+      to = conv.(5)
+
+      val = Struct.new(:val)
+
+      a = []
+      assert_raise(TypeError) { (from..to).step(val.new(step)) {|x| a << x } }
+      assert_kind_of(Enumerator, (from..to).step(val.new(step)))
+      assert_raise(TypeError) { (from..to).step(val.new(step)).to_a }
+
+      # step is not numeric, but coercible
+      val = Struct.new(:val) do
+        def coerce(num) = [self.class.new(num), self]
+        def +(other) = self.class.new(val + other.val)
+        def <=>(other) = other.is_a?(self.class) ? val <=> other.val : val <=> other
+      end
+
+      a = []
+      (from..to).step(val.new(step)) {|x| a << x }
+      assert_equal([from, val.new(conv.(2)), val.new(conv.(4))], a)
+
+      assert_kind_of(Enumerator, (from..to).step(val.new(step)))
+      assert_equal([from, val.new(conv.(2)), val.new(conv.(4))], (from..to).step(val.new(step)).to_a)
+    end
+  end
+
+  def test_step_numeric_fixnum_boundary
     a = []
     (2**32-1 .. 2**32+1).step(2) {|x| a << x }
     assert_equal([4294967295, 4294967297], a)
+
     zero = (2**32).coerce(0).first
     assert_raise(ArgumentError) { (2**32-1 .. 2**32+1).step(zero) }
     assert_raise(ArgumentError) { (2**32-1 .. 2**32+1).step(zero) { } }
+
     a = []
     (2**32-1 .. ).step(2) {|x| a << x; break if a.size == 2 }
     assert_equal([4294967295, 4294967297], a)
@@ -314,58 +388,189 @@ def test_step
     a = []
     (max..).step {|x| a << x; break if a.size == 2 }
     assert_equal([max, max+1], a)
+
     a = []
     (max..).step(max) {|x| a << x; break if a.size == 4 }
     assert_equal([max, 2*max, 3*max, 4*max], a)
+  end
 
-    o1 = Object.new
-    o2 = Object.new
-    def o1.<=>(x); -1; end
-    def o2.<=>(x); 0; end
-    assert_raise(TypeError) { (o1..o2).step(1) { } }
-    assert_raise(TypeError) { (o1..).step(1) { } }
+  def test_step_big_float
+    a = []
+    (0x40000000..0x40000002).step(0.5) {|x| a << x }
+    assert_equal([1073741824, 1073741824.5, 1073741825.0, 1073741825.5, 1073741826], a)
+  end
 
-    class << o1; self; end.class_eval do
-      define_method(:succ) { o2 }
-    end
+  def test_step_non_numeric_range
+    # finite
     a = []
-    (o1..o2).step(1) {|x| a << x }
-    assert_equal([o1, o2], a)
+    ('a'..'aaaa').step('a') { a << _1 }
+    assert_equal(%w[a aa aaa aaaa], a)
+
+    assert_kind_of(Enumerator, ('a'..'aaaa').step('a'))
+    assert_equal(%w[a aa aaa aaaa], ('a'..'aaaa').step('a').to_a)
 
     a = []
-    (o1...o2).step(1) {|x| a << x }
-    assert_equal([o1], a)
+    ('a'...'aaaa').step('a') { a << _1 }
+    assert_equal(%w[a aa aaa], a)
 
-    assert_nothing_raised("[ruby-dev:34557]") { (0..2).step(0.5) {|x| } }
+    assert_kind_of(Enumerator, ('a'...'aaaa').step('a'))
+    assert_equal(%w[a aa aaa], ('a'...'aaaa').step('a').to_a)
 
+    # endless
     a = []
-    (0..2).step(0.5) {|x| a << x }
-    assert_equal([0, 0.5, 1.0, 1.5, 2.0], a)
+    ('a'...).step('a') { a << _1; break if a.size == 3 }
+    assert_equal(%w[a aa aaa], a)
+
+    assert_kind_of(Enumerator, ('a'...).step('a'))
+    assert_equal(%w[a aa aaa], ('a'...).step('a').take(3))
+
+    # beginless
+    assert_raise(ArgumentError) { (...'aaa').step('a') {} }
+    assert_raise(ArgumentError) { (...'aaa').step('a') }
 
+    # step is not provided
+    assert_raise(ArgumentError) { (Time.new(2022)...Time.new(2023)).step }
+
+    # step is incompatible
+    assert_raise(TypeError) { (Time.new(2022)...Time.new(2023)).step('a') {} }
+    assert_raise(TypeError) { (Time.new(2022)...Time.new(2023)).step('a').to_a }
+
+    # step is compatible, but shouldn't convert into numeric domain:
     a = []
-    (0..).step(0.5) {|x| a << x; break if a.size == 5 }
-    assert_equal([0, 0.5, 1.0, 1.5, 2.0], a)
+    (Time.utc(2022, 2, 24)...).step(1) { a << _1; break if a.size == 2 }
+    assert_equal([Time.utc(2022, 2, 24), Time.utc(2022, 2, 24, 0, 0, 1)], a)
 
     a = []
-    (0x40000000..0x40000002).step(0.5) {|x| a << x }
-    assert_equal([1073741824, 1073741824.5, 1073741825.0, 1073741825.5, 1073741826], a)
+    (Time.utc(2022, 2, 24)...).step(1.0) { a << _1; break if a.size == 2 }
+    assert_equal([Time.utc(2022, 2, 24), Time.utc(2022, 2, 24, 0, 0, 1)], a)
 
-    o = Object.new
-    def o.to_int() 1 end
-    assert_nothing_raised("[ruby-dev:34558]") { (0..2).step(o) {|x| } }
+    a = []
+    (Time.utc(2022, 2, 24)...).step(1r) { a << _1; break if a.size == 2 }
+    assert_equal([Time.utc(2022, 2, 24), Time.utc(2022, 2, 24, 0, 0, 1)], a)
 
-    o = Object.new
-    class << o
-      def to_str() "a" end
-      def <=>(other) to_str <=> other end
-    end
+    # step decreases the value
+    a = []
+    (Time.utc(2022, 2, 24)...).step(-1) { a << _1; break if a.size == 2 }
+    assert_equal([Time.utc(2022, 2, 24), Time.utc(2022, 2, 23, 23, 59, 59)], a)
 
     a = []
-    (o.."c").step(1) {|x| a << x}
-    assert_equal(["a", "b", "c"], a)
+    (Time.utc(2022, 2, 24)...Time.utc(2022, 2, 23, 23, 59, 57)).step(-1) { a << _1 }
+    assert_equal([Time.utc(2022, 2, 24), Time.utc(2022, 2, 23, 23, 59, 59),
+                  Time.utc(2022, 2, 23, 23, 59, 58)], a)
+
     a = []
-    (o..).step(1) {|x| a << x; break if a.size >= 3}
-    assert_equal(["a", "b", "c"], a)
+    (Time.utc(2022, 2, 24)..Time.utc(2022, 2, 23, 23, 59, 57)).step(-1) { a << _1 }
+    assert_equal([Time.utc(2022, 2, 24), Time.utc(2022, 2, 23, 23, 59, 59),
+                  Time.utc(2022, 2, 23, 23, 59, 58), Time.utc(2022, 2, 23, 23, 59, 57)], a)
+
+    # step decreases, but the range is forward-directed:
+    a = []
+    (Time.utc(2022, 2, 24)...Time.utc(2022, 2, 24, 01, 01, 03)).step(-1) { a << _1 }
+    assert_equal([], a)
+  end
+
+  def test_step_string_legacy
+    # finite
+    a = []
+    ('a'..'g').step(2) { a << _1 }
+    assert_equal(%w[a c e g], a)
+
+    assert_kind_of(Enumerator, ('a'..'g').step(2))
+    assert_equal(%w[a c e g], ('a'..'g').step(2).to_a)
+
+    a = []
+    ('a'...'g').step(2) { a << _1 }
+    assert_equal(%w[a c e], a)
+
+    assert_kind_of(Enumerator, ('a'...'g').step(2))
+    assert_equal(%w[a c e], ('a'...'g').step(2).to_a)
+
+    # endless
+    a = []
+    ('a'...).step(2) { a << _1; break if a.size == 3 }
+    assert_equal(%w[a c e], a)
+
+    assert_kind_of(Enumerator, ('a'...).step(2))
+    assert_equal(%w[a c e], ('a'...).step(2).take(3))
+
+    # beginless
+    assert_raise(ArgumentError) { (...'g').step(2) {} }
+    assert_raise(ArgumentError) { (...'g').step(2) }
+
+    # step is not provided
+    a = []
+    ('a'..'d').step { a << _1 }
+    assert_equal(%w[a b c d], a)
+
+    assert_kind_of(Enumerator, ('a'..'d').step)
+    assert_equal(%w[a b c d], ('a'..'d').step.to_a)
+
+    a = []
+    ('a'...'d').step { a << _1 }
+    assert_equal(%w[a b c], a)
+
+    assert_kind_of(Enumerator, ('a'...'d').step)
+    assert_equal(%w[a b c], ('a'...'d').step.to_a)
+
+    # endless
+    a = []
+    ('a'...).step { a << _1; break if a.size == 3 }
+    assert_equal(%w[a b c], a)
+
+    assert_kind_of(Enumerator, ('a'...).step)
+    assert_equal(%w[a b c], ('a'...).step.take(3))
+  end
+
+  def test_step_symbol_legacy
+    # finite
+    a = []
+    (:a..:g).step(2) { a << _1 }
+    assert_equal(%i[a c e g], a)
+
+    assert_kind_of(Enumerator, (:a..:g).step(2))
+    assert_equal(%i[a c e g], (:a..:g).step(2).to_a)
+
+    a = []
+    (:a...:g).step(2) { a << _1 }
+    assert_equal(%i[a c e], a)
+
+    assert_kind_of(Enumerator, (:a...:g).step(2))
+    assert_equal(%i[a c e], (:a...:g).step(2).to_a)
+
+    # endless
+    a = []
+    (:a...).step(2) { a << _1; break if a.size == 3 }
+    assert_equal(%i[a c e], a)
+
+    assert_kind_of(Enumerator, (:a...).step(2))
+    assert_equal(%i[a c e], (:a...).step(2).take(3))
+
+    # beginless
+    assert_raise(ArgumentError) { (...:g).step(2) {} }
+    assert_raise(ArgumentError) { (...:g).step(2) }
+
+    # step is not provided
+    a = []
+    (:a..:d).step { a << _1 }
+    assert_equal(%i[a b c d], a)
+
+    assert_kind_of(Enumerator, (:a..:d).step)
+    assert_equal(%i[a b c d], (:a..:d).step.to_a)
+
+    a = []
+    (:a...:d).step { a << _1 }
+    assert_equal(%i[a b c], a)
+
+    assert_kind_of(Enumerator, (:a...:d).step)
+    assert_equal(%i[a b c], (:a...:d).step.to_a)
+
+    # endless
+    a = []
+    (:a...).step { a << _1; break if a.size == 3 }
+    assert_equal(%i[a b c], a)
+
+    assert_kind_of(Enumerator, (:a...).step)
+    assert_equal(%i[a b c], (:a...).step.take(3))
   end
 
   def test_step_bug15537
@@ -391,24 +596,20 @@ def test_step_ruby_core_35753
     assert_equal(4, (1.0...5.6).step(1.5).to_a.size)
   end
 
-  def test_step_with_succ
-    c = Struct.new(:i) do
-      def succ; self.class.new(i+1); end
-      def <=>(other) i <=> other.i;end
-    end.new(0)
-
-    result = []
-    (c..c.succ).step(2) do |d|
-      result << d.i
+  def test_step_with_nonnumeric_endpoint
+    num = Data.define(:value) do
+      def coerce(o); [o, 100]; end
+      def <=>(o) value<=>o; end
+      def +(o) with(value: value + o) end
     end
-    assert_equal([0], result)
-
-    result = []
-    (c..).step(2) do |d|
-      result << d.i
-      break if d.i >= 4
-    end
-    assert_equal([0, 2, 4], result)
+    i = num.new(100)
+
+    assert_equal([100], (100..100).step(10).to_a)
+    assert_equal([], (100...100).step(10).to_a)
+    assert_equal([100], (100..i).step(10).to_a)
+    assert_equal([i], (i..100).step(10).to_a)
+    assert_equal([], (100...i).step(10).to_a)
+    assert_equal([], (i...100).step(10).to_a)
   end
 
   def test_each
@@ -495,6 +696,170 @@ def <=>(other) i <=> other.i;end
     assert_equal([0, 1, 2, 3, 4], result)
   end
 
+  def test_reverse_each
+    a = []
+    (1..3).reverse_each {|x| a << x }
+    assert_equal([3, 2, 1], a)
+
+    a = []
+    (1...3).reverse_each {|x| a << x }
+    assert_equal([2, 1], a)
+
+    fmax = RbConfig::LIMITS['FIXNUM_MAX']
+    fmin = RbConfig::LIMITS['FIXNUM_MIN']
+
+    a = []
+    (fmax+1..fmax+3).reverse_each {|x| a << x }
+    assert_equal([fmax+3, fmax+2, fmax+1], a)
+
+    a = []
+    (fmax+1...fmax+3).reverse_each {|x| a << x }
+    assert_equal([fmax+2, fmax+1], a)
+
+    a = []
+    (fmax-1..fmax+1).reverse_each {|x| a << x }
+    assert_equal([fmax+1, fmax, fmax-1], a)
+
+    a = []
+    (fmax-1...fmax+1).reverse_each {|x| a << x }
+    assert_equal([fmax, fmax-1], a)
+
+    a = []
+    (fmin-1..fmin+1).reverse_each{|x| a << x }
+    assert_equal([fmin+1, fmin, fmin-1], a)
+
+    a = []
+    (fmin-1...fmin+1).reverse_each{|x| a << x }
+    assert_equal([fmin, fmin-1], a)
+
+    a = []
+    (fmin-3..fmin-1).reverse_each{|x| a << x }
+    assert_equal([fmin-1, fmin-2, fmin-3], a)
+
+    a = []
+    (fmin-3...fmin-1).reverse_each{|x| a << x }
+    assert_equal([fmin-2, fmin-3], a)
+
+    a = []
+    ("a".."c").reverse_each {|x| a << x }
+    assert_equal(["c", "b", "a"], a)
+  end
+
+  def test_reverse_each_for_beginless_range
+    fmax = RbConfig::LIMITS['FIXNUM_MAX']
+    fmin = RbConfig::LIMITS['FIXNUM_MIN']
+
+    a = []
+    (..3).reverse_each {|x| a << x; break if x <= 0 }
+    assert_equal([3, 2, 1, 0], a)
+
+    a = []
+    (...3).reverse_each {|x| a << x; break if x <= 0 }
+    assert_equal([2, 1, 0], a)
+
+    a = []
+    (..fmax+1).reverse_each {|x| a << x; break if x <= fmax-1 }
+    assert_equal([fmax+1, fmax, fmax-1], a)
+
+    a = []
+    (...fmax+1).reverse_each {|x| a << x; break if x <= fmax-1 }
+    assert_equal([fmax, fmax-1], a)
+
+    a = []
+    (..fmin+1).reverse_each {|x| a << x; break if x <= fmin-1 }
+    assert_equal([fmin+1, fmin, fmin-1], a)
+
+    a = []
+    (...fmin+1).reverse_each {|x| a << x; break if x <= fmin-1 }
+    assert_equal([fmin, fmin-1], a)
+
+    a = []
+    (..fmin-1).reverse_each {|x| a << x; break if x <= fmin-3 }
+    assert_equal([fmin-1, fmin-2, fmin-3], a)
+
+    a = []
+    (...fmin-1).reverse_each {|x| a << x; break if x <= fmin-3 }
+    assert_equal([fmin-2, fmin-3], a)
+  end
+
+  def test_reverse_each_for_endless_range
+    assert_raise(TypeError) { (1..).reverse_each {} }
+
+    enum = nil
+    assert_nothing_raised { enum = (1..).reverse_each }
+    assert_raise(TypeError) { enum.each {} }
+  end
+
+  def test_reverse_each_for_single_point_range
+    fmin = RbConfig::LIMITS['FIXNUM_MIN']
+    fmax = RbConfig::LIMITS['FIXNUM_MAX']
+
+    values = [fmin*2, fmin-1, fmin, 0, fmax, fmax+1, fmax*2]
+
+    values.each do |b|
+      r = b..b
+      a = []
+      r.reverse_each {|x| a << x }
+      assert_equal([b], a, "failed on #{r}")
+
+      r = b...b+1
+      a = []
+      r.reverse_each {|x| a << x }
+      assert_equal([b], a, "failed on #{r}")
+    end
+  end
+
+  def test_reverse_each_for_empty_range
+    fmin = RbConfig::LIMITS['FIXNUM_MIN']
+    fmax = RbConfig::LIMITS['FIXNUM_MAX']
+
+    values = [fmin*2, fmin-1, fmin, 0, fmax, fmax+1, fmax*2]
+
+    values.each do |b|
+      r = b..b-1
+      a = []
+      r.reverse_each {|x| a << x }
+      assert_equal([], a, "failed on #{r}")
+    end
+
+    values.repeated_permutation(2).to_a.product([true, false]).each do |(b, e), excl|
+      next unless b > e || (b == e && excl)
+
+      r = Range.new(b, e, excl)
+      a = []
+      r.reverse_each {|x| a << x }
+      assert_equal([], a, "failed on #{r}")
+    end
+  end
+
+  def test_reverse_each_with_no_block
+    enum = (1..5).reverse_each
+    assert_equal 5, enum.size
+
+    a = []
+    enum.each {|x| a << x }
+    assert_equal [5, 4, 3, 2, 1], a
+  end
+
+  def test_reverse_each_size
+    assert_equal(3, (1..3).reverse_each.size)
+    assert_equal(3, (1..3.3).reverse_each.size)
+    assert_raise(TypeError) { (1..nil).reverse_each.size }
+    assert_raise(TypeError) { (1.1..3).reverse_each.size }
+    assert_raise(TypeError) { (1.1..3.3).reverse_each.size }
+    assert_raise(TypeError) { (1.1..nil).reverse_each.size }
+    assert_equal(Float::INFINITY, (..3).reverse_each.size)
+    assert_raise(TypeError) { (nil..3.3).reverse_each.size }
+    assert_raise(TypeError) { (nil..nil).reverse_each.size }
+
+    assert_equal(2, (1...3).reverse_each.size)
+    assert_equal(3, (1...3.3).reverse_each.size)
+
+    assert_equal(nil, ('a'..'z').reverse_each.size)
+    assert_raise(TypeError) { ('a'..).reverse_each.size }
+    assert_raise(TypeError) { (..'z').reverse_each.size }
+  end
+
   def test_begin_end
     assert_equal(0, (0..1).begin)
     assert_equal(1, (0..1).end)
@@ -507,16 +872,20 @@ def test_begin_end
   def test_first_last
     assert_equal([0, 1, 2], (0..10).first(3))
     assert_equal([8, 9, 10], (0..10).last(3))
+    assert_equal([8, 9, 10], (nil..10).last(3))
     assert_equal(0, (0..10).first)
     assert_equal(10, (0..10).last)
+    assert_equal(10, (nil..10).last)
     assert_equal("a", ("a".."c").first)
     assert_equal("c", ("a".."c").last)
     assert_equal(0, (2..0).last)
 
     assert_equal([0, 1, 2], (0...10).first(3))
     assert_equal([7, 8, 9], (0...10).last(3))
+    assert_equal([7, 8, 9], (nil...10).last(3))
     assert_equal(0, (0...10).first)
     assert_equal(10, (0...10).last)
+    assert_equal(10, (nil...10).last)
     assert_equal("a", ("a"..."c").first)
     assert_equal("c", ("a"..."c").last)
     assert_equal(0, (2...0).last)
@@ -580,6 +949,8 @@ def test_eqq
     assert_not_operator(5..nil, :===, 0)
     assert_operator(nil..10, :===, 0)
     assert_operator(nil..nil, :===, 0)
+    assert_operator(nil..nil, :===, Object.new)
+    assert_not_operator(0..10, :===, 0..10)
   end
 
   def test_eqq_string
@@ -587,7 +958,7 @@ def test_eqq_string
     assert_not_operator('A'..'Z', :===, 'ana')
     assert_operator('A'.., :===, 'ANA')
     assert_operator(..'Z', :===, 'ANA')
-    assert_raise(TypeError) {(nil..nil) === 'ANA'}
+    assert_operator(nil..nil, :===, 'ANA')
   end
 
   def test_eqq_time
@@ -624,6 +995,28 @@ def <=>(other)
     assert_operator(c.new(0)..c.new(10), :===, c.new(5), bug12003)
   end
 
+  def test_eqq_unbounded_ruby_bug_19864
+    t1 = Date.today
+    t2 = t1 + 1
+    assert_equal(true, (..t1) === t1)
+    assert_equal(false, (..t1) === t2)
+    assert_equal(true, (..t2) === t1)
+    assert_equal(true, (..t2) === t2)
+    assert_equal(false, (...t1) === t1)
+    assert_equal(false, (...t1) === t2)
+    assert_equal(true, (...t2) === t1)
+    assert_equal(false, (...t2) === t2)
+
+    assert_equal(true, (t1..) === t1)
+    assert_equal(true, (t1..) === t2)
+    assert_equal(false, (t2..) === t1)
+    assert_equal(true, (t2..) === t2)
+    assert_equal(true, (t1...) === t1)
+    assert_equal(true, (t1...) === t2)
+    assert_equal(false, (t2...) === t1)
+    assert_equal(true, (t2...) === t2)
+  end
+
   def test_eqq_non_iteratable
     k = Class.new do
       include Comparable
@@ -813,21 +1206,38 @@ def test_comparison_when_recursive
   end
 
   def test_size
-    assert_equal 42, (1..42).size
-    assert_equal 41, (1...42).size
-    assert_equal 6, (1...6.3).size
-    assert_equal 5, (1.1...6).size
-    assert_equal 42, (1..42).each.size
+    Enumerator.product([:to_i, :to_f, :to_r].repeated_permutation(2), [1, 10], [5, 5.5], [true, false]) do |(m1, m2), beg, ende, exclude_end|
+      r = Range.new(beg.send(m1), ende.send(m2), exclude_end)
+      iterable = true
+      yielded = []
+      begin
+        r.each { yielded << _1 }
+      rescue TypeError
+        iterable = false
+      end
+
+      if iterable
+        assert_equal(yielded.size, r.size, "failed on #{r}")
+        assert_equal(yielded.size, r.each.size, "failed on #{r}")
+      else
+        assert_raise(TypeError, "failed on #{r}") { r.size }
+        assert_raise(TypeError, "failed on #{r}") { r.each.size }
+      end
+    end
+
     assert_nil ("a"..."z").size
-    assert_nil ("a"...).size
-    assert_nil (..."z").size    # [Bug #18983]
-    assert_nil (nil...nil).size # [Bug #18983]
 
-    assert_equal Float::INFINITY, (1...).size
-    assert_equal Float::INFINITY, (1.0...).size
-    assert_equal Float::INFINITY, (...1).size
-    assert_equal Float::INFINITY, (...1.0).size
-    assert_nil ("a"...).size
+    assert_equal Float::INFINITY, (1..).size
+    assert_raise(TypeError) { (1.0..).size }
+    assert_raise(TypeError) { (1r..).size }
+    assert_nil ("a"..).size
+
+    assert_raise(TypeError) { (..1).size }
+    assert_raise(TypeError) { (..1.0).size }
+    assert_raise(TypeError) { (..1r).size }
+    assert_raise(TypeError) { (..'z').size }
+
+    assert_raise(TypeError) { (nil...nil).size }
   end
 
   def test_bsearch_typechecks_return_values
@@ -1024,7 +1434,10 @@ def test_bsearch_for_bignum
     assert_equal(nil, (bignum...bignum+ary.size).bsearch {|i| ary[i - bignum] >= 100 })
     assert_equal(bignum + 0, (bignum...bignum+ary.size).bsearch {|i| true })
     assert_equal(nil, (bignum...bignum+ary.size).bsearch {|i| false })
+
+    assert_equal(bignum * 2 + 1, (0...).bsearch {|i| i > bignum * 2 })
     assert_equal(bignum * 2 + 1, (bignum...).bsearch {|i| i > bignum * 2 })
+    assert_equal(-bignum * 2 + 1, (...0).bsearch {|i| i > -bignum * 2 })
     assert_equal(-bignum * 2 + 1, (...-bignum).bsearch {|i| i > -bignum * 2 })
 
     assert_raise(TypeError) { ("a".."z").bsearch {} }
@@ -1049,6 +1462,83 @@ def test_beginless_range_iteration
   end
 
   def test_count
+    assert_equal 42, (1..42).count
+    assert_equal 41, (1...42).count
+    assert_equal 0, (42..1).count
+    assert_equal 0, (42...1).count
+    assert_equal 2**100, (1..2**100).count
+    assert_equal 6, (1...6.3).count
+    assert_equal 4, ('a'..'d').count
+    assert_equal 3, ('a'...'d').count
+
     assert_equal(Float::INFINITY, (1..).count)
+    assert_equal(Float::INFINITY, (..1).count)
+  end
+
+  def test_overlap?
+    assert_not_operator(0..2, :overlap?, -2..-1)
+    assert_not_operator(0..2, :overlap?, -2...0)
+    assert_operator(0..2, :overlap?, -1..0)
+    assert_operator(0..2, :overlap?, 1..2)
+    assert_operator(0..2, :overlap?, 2..3)
+    assert_not_operator(0..2, :overlap?, 3..4)
+    assert_not_operator(0...2, :overlap?, 2..3)
+
+    assert_operator(..0, :overlap?, -1..0)
+    assert_operator(...0, :overlap?, -1..0)
+    assert_operator(..0, :overlap?, 0..1)
+    assert_operator(..0, :overlap?, ..1)
+    assert_not_operator(..0, :overlap?, 1..2)
+    assert_not_operator(...0, :overlap?, 0..1)
+
+    assert_not_operator(0.., :overlap?, -2..-1)
+    assert_not_operator(0.., :overlap?, ...0)
+    assert_operator(0.., :overlap?, -1..0)
+    assert_operator(0.., :overlap?, ..0)
+    assert_operator(0.., :overlap?, 0..1)
+    assert_operator(0.., :overlap?, 1..2)
+    assert_operator(0.., :overlap?, 1..)
+
+    assert_not_operator((1..3), :overlap?, ('a'..'d'))
+    assert_not_operator((1..), :overlap?, ('a'..))
+    assert_not_operator((..1), :overlap?, (..'a'))
+
+    assert_raise(TypeError) { (0..).overlap?(1) }
+    assert_raise(TypeError) { (0..).overlap?(nil) }
+
+    assert_operator((1..3), :overlap?, (2..4))
+    assert_operator((1...3), :overlap?, (2..3))
+    assert_operator((2..3), :overlap?, (1..2))
+    assert_operator((..3), :overlap?, (3..))
+    assert_operator((nil..nil), :overlap?, (3..))
+    assert_operator((nil...nil), :overlap?, (nil..))
+    assert_operator((nil..nil), :overlap?, (..3))
+    assert_operator((..3), :overlap?, (nil..nil))
+
+    assert_raise(TypeError) { (1..3).overlap?(1) }
+
+    assert_not_operator((1..2), :overlap?, (2...2))
+    assert_not_operator((2...2), :overlap?, (1..2))
+
+    assert_not_operator((4..1), :overlap?, (2..3))
+    assert_not_operator((4..1), :overlap?, (..3))
+    assert_not_operator((4..1), :overlap?, (2..))
+
+    assert_not_operator((1..4), :overlap?, (3..2))
+    assert_not_operator((..4), :overlap?, (3..2))
+    assert_not_operator((1..), :overlap?, (3..2))
+
+    assert_not_operator((4..5), :overlap?, (2..3))
+    assert_not_operator((4..5), :overlap?, (2...4))
+
+    assert_not_operator((1..2), :overlap?, (3..4))
+    assert_not_operator((1...3), :overlap?, (3..4))
+
+    assert_not_operator((4..5), :overlap?, (2..3))
+    assert_not_operator((4..5), :overlap?, (2...4))
+
+    assert_not_operator((1..2), :overlap?, (3..4))
+    assert_not_operator((1...3), :overlap?, (3..4))
+    assert_not_operator((...3), :overlap?, (3..))
   end
 end
diff --git a/test/ruby/test_rational.rb b/test/ruby/test_rational.rb
index a51ce3dc99ebc4..89bb7b20a8c696 100644
--- a/test/ruby/test_rational.rb
+++ b/test/ruby/test_rational.rb
@@ -1066,11 +1066,10 @@ def test_power_of_0
   end
 
   def test_power_overflow
-    bug = '[ruby-core:79686] [Bug #13242]: Infinity due to overflow'
-    x = EnvUtil.suppress_warning {4r**40000000}
-    assert_predicate x, :infinite?, bug
-    x = EnvUtil.suppress_warning {(1/4r)**40000000}
-    assert_equal 0, x, bug
+    assert_raise(ArgumentError) { 4r**400000000000000000000 }
+    exp = 4**40000000
+    assert_equal exp, 4r**40000000
+    assert_equal 1r/exp, (1/4r)**40000000
   end
 
   def test_positive_p
diff --git a/test/ruby/test_refinement.rb b/test/ruby/test_refinement.rb
index c078f6189558d8..6ce434790be13b 100644
--- a/test/ruby/test_refinement.rb
+++ b/test/ruby/test_refinement.rb
@@ -825,7 +825,7 @@ def test_prepend_after_refine_wb_miss
       GC.stress = true
       10.times{
         #{PrependAfterRefine_CODE}
-        undef PrependAfterRefine
+        Object.send(:remove_const, :PrependAfterRefine)
       }
     }, timeout: 60
   end
@@ -1044,7 +1044,7 @@ module Test
       end
       using Test
       def t
-        'Refinements are broken!'.chop!
+        'Refinements are broken!'.dup.chop!
       end
       t
       module Test
@@ -1606,18 +1606,35 @@ def m
       end
 
       using R
+      def m
+        C.new.m
+      end
+
       assert_equal(:foo, C.new.m)
+      assert_equal(:foo, m)
 
       module R
         refine C do
+
+          assert_equal(:foo, C.new.m)
+          assert_equal(:foo, m)
+
           alias m m
+
+          assert_equal(:foo, C.new.m)
+          assert_equal(:foo, m)
+
           def m
             :bar
           end
+
+          assert_equal(:bar, C.new.m, "[ruby-core:71423] [Bug #11672]")
+          assert_equal(:bar, m, "[Bug #20285]")
         end
       end
 
       assert_equal(:bar, C.new.m, "[ruby-core:71423] [Bug #11672]")
+      assert_equal(:bar, m, "[Bug #20285]")
     end;
   end
 
@@ -1807,13 +1824,7 @@ def test_target
       end
     }.refinements
     assert_equal(Integer, refinements[0].target)
-    assert_warn(/Refinement#refined_class is deprecated and will be removed in Ruby 3.4; use Refinement#target instead/) do
-      assert_equal(Integer, refinements[0].refined_class)
-    end
     assert_equal(String, refinements[1].target)
-    assert_warn(/Refinement#refined_class is deprecated and will be removed in Ruby 3.4; use Refinement#target instead/) do
-      assert_equal(String, refinements[1].refined_class)
-    end
   end
 
   def test_warn_setconst_in_refinmenet
@@ -2650,6 +2661,57 @@ def to_s = :R
     end;
   end
 
+  def test_inline_cache_invalidation
+    klass = Class.new do
+      def cached_foo_callsite = foo
+
+      def foo = :v1
+
+      host = self
+      @refinement = Module.new do
+        refine(host) do
+          def foo = :unused
+        end
+      end
+    end
+
+    obj = klass.new
+    obj.cached_foo_callsite # prime cache
+    klass.class_eval do
+      def foo = :v2 # invalidate
+    end
+    assert_equal(:v2, obj.cached_foo_callsite)
+  end
+
+  # [Bug #20302]
+  def test_multiple_refinements_for_same_module
+    assert_in_out_err([], <<-INPUT, %w(:f2 :f1), [])
+      module M1
+        refine(Kernel) do
+          def f1 = :f1
+        end
+      end
+
+      module M2
+        refine(Kernel) do
+          def f2 = :f2
+        end
+      end
+
+      class Foo
+        using M1
+        using M2
+
+        def test
+          p f2
+          p f1
+        end
+      end
+
+      Foo.new.test
+    INPUT
+  end
+
   private
 
   def eval_using(mod, s)
diff --git a/test/ruby/test_regexp.rb b/test/ruby/test_regexp.rb
index 0a72caba45f9df..7885acc87e6112 100644
--- a/test/ruby/test_regexp.rb
+++ b/test/ruby/test_regexp.rb
@@ -72,6 +72,19 @@ def test_to_s
     end
   end
 
+  def test_to_s_under_gc_compact_stress
+    omit "compaction doesn't work well on s390x" if RUBY_PLATFORM =~ /s390x/ # https://github.com/ruby/ruby/pull/5077
+    EnvUtil.under_gc_compact_stress do
+      str = "abcd\u3042"
+      [:UTF_16BE, :UTF_16LE, :UTF_32BE, :UTF_32LE].each do |es|
+        enc = Encoding.const_get(es)
+        rs = Regexp.new(str.encode(enc)).to_s
+        assert_equal("(?-mix:abcd\u3042)".encode(enc), rs)
+        assert_equal(enc, rs.encoding)
+      end
+    end
+  end
+
   def test_to_s_extended_subexp
     re = /#\g#{"\n"}/x
     re = /#{re}/
@@ -457,6 +470,13 @@ def test_inspect
     assert_equal('/\/\xF1\xF2\xF3/i', /\/#{s}/i.inspect)
   end
 
+  def test_inspect_under_gc_compact_stress
+    omit "compaction doesn't work well on s390x" if RUBY_PLATFORM =~ /s390x/ # https://github.com/ruby/ruby/pull/5077
+    EnvUtil.under_gc_compact_stress do
+      assert_equal('/(?-mix:\\/)|/', Regexp.union(/\//, "").inspect)
+    end
+  end
+
   def test_char_to_option
     assert_equal("BAR", "FOOBARBAZ"[/b../i])
     assert_equal("bar", "foobarbaz"[/  b  .  .  /x])
@@ -539,16 +559,26 @@ def test_match_byteoffset_begin_end
     assert_raise(IndexError) { m.byteoffset(2) }
     assert_raise(IndexError) { m.begin(2) }
     assert_raise(IndexError) { m.end(2) }
+    assert_raise(IndexError) { m.bytebegin(2) }
+    assert_raise(IndexError) { m.byteend(2) }
 
     m = /(?<x>q..)?/.match("foobarbaz")
     assert_equal([nil, nil], m.byteoffset("x"))
     assert_equal(nil, m.begin("x"))
     assert_equal(nil, m.end("x"))
+    assert_equal(nil, m.bytebegin("x"))
+    assert_equal(nil, m.byteend("x"))
 
     m = /\A\u3042(.)(.)?(.)\z/.match("\u3042\u3043\u3044")
     assert_equal([3, 6], m.byteoffset(1))
+    assert_equal(3, m.bytebegin(1))
+    assert_equal(6, m.byteend(1))
     assert_equal([nil, nil], m.byteoffset(2))
+    assert_equal(nil, m.bytebegin(2))
+    assert_equal(nil, m.byteend(2))
     assert_equal([6, 9], m.byteoffset(3))
+    assert_equal(6, m.bytebegin(3))
+    assert_equal(9, m.byteend(3))
   end
 
   def test_match_to_s
@@ -693,6 +723,18 @@ def test_match_data_deconstruct_keys
     }
   end
 
+  def test_match_no_match_no_matchdata
+    EnvUtil.without_gc do
+      h = {}
+      ObjectSpace.count_objects(h)
+      prev_matches = h[:T_MATCH] || 0
+      _md = /[A-Z]/.match('1') # no match
+      ObjectSpace.count_objects(h)
+      new_matches = h[:T_MATCH] || 0
+      assert_equal prev_matches, new_matches, "Bug [#20104]"
+    end
+  end
+
   def test_initialize
     assert_raise(ArgumentError) { Regexp.new }
     assert_equal(/foo/, assert_warning(/ignored/) {Regexp.new(/foo/, Regexp::IGNORECASE)})
@@ -723,6 +765,12 @@ def test_initialize
     assert_raise(RegexpError) { Regexp.new("((?<v>))\\g<0>") }
   end
 
+  def test_initialize_from_regex_memory_corruption
+    assert_ruby_status([], <<-'end;')
+      10_000.times { Regexp.new(Regexp.new("(?<name>)")) }
+    end;
+  end
+
   def test_initialize_bool_warning
     assert_warning(/expected true or false as ignorecase/) do
       Regexp.new("foo", :i)
@@ -854,6 +902,14 @@ def test_match
     $_ = nil; assert_nil(~/./)
   end
 
+  def test_match_under_gc_compact_stress
+    omit "compaction doesn't work well on s390x" if RUBY_PLATFORM =~ /s390x/ # https://github.com/ruby/ruby/pull/5077
+    EnvUtil.under_gc_compact_stress do
+      m = /(?<foo>.)(?<n>[^aeiou])?(?<bar>.+)/.match("hoge\u3042")
+      assert_equal("h", m.match(:foo))
+    end
+  end
+
   def test_match_p
     /backref/ =~ 'backref'
     # must match here, but not in a separate method, e.g., assert_send,
@@ -943,6 +999,18 @@ def test_regsub_K
     assert_equal('foobazquux/foobazquux', result, bug8856)
   end
 
+  def test_regsub_no_memory_leak
+    assert_no_memory_leak([], "#{<<~"begin;"}", "#{<<~"end;"}", rss: true)
+      code = proc do
+        "aaaaaaaaaaa".gsub(/a/, "")
+      end
+
+      1_000.times(&code)
+    begin;
+      100_000.times(&code)
+    end;
+  end
+
   def test_ignorecase
     v = assert_deprecated_warning(/variable \$= is no longer effective/) { $= }
     assert_equal(false, v)
@@ -1240,6 +1308,9 @@ def test_posix_bracket
     assert_match(/\A[[:space:]]+\z/, "\r\n\v\f\r\s\u0085")
     assert_match(/\A[[:ascii:]]+\z/, "\x00\x7F")
     assert_no_match(/[[:ascii:]]/, "\x80\xFF")
+
+    assert_match(/[[:word:]]/, "\u{200C}")
+    assert_match(/[[:word:]]/, "\u{200D}")
   end
 
   def test_cclass_R
@@ -1360,30 +1431,223 @@ def test_unicode
   end
 
   def test_unicode_age
-    assert_match(/^\p{Age=6.0}$/u, "\u261c")
-    assert_match(/^\p{Age=1.1}$/u, "\u261c")
-    assert_no_match(/^\P{age=6.0}$/u, "\u261c")
-
-    assert_match(/^\p{age=6.0}$/u, "\u31f6")
-    assert_match(/^\p{age=3.2}$/u, "\u31f6")
-    assert_no_match(/^\p{age=3.1}$/u, "\u31f6")
-    assert_no_match(/^\p{age=3.0}$/u, "\u31f6")
-    assert_no_match(/^\p{age=1.1}$/u, "\u31f6")
-
-    assert_match(/^\p{age=6.0}$/u, "\u2754")
-    assert_no_match(/^\p{age=5.0}$/u, "\u2754")
-    assert_no_match(/^\p{age=4.0}$/u, "\u2754")
-    assert_no_match(/^\p{age=3.0}$/u, "\u2754")
-    assert_no_match(/^\p{age=2.0}$/u, "\u2754")
-    assert_no_match(/^\p{age=1.1}$/u, "\u2754")
-
-    assert_no_match(/^\p{age=12.0}$/u, "\u32FF")
-    assert_match(/^\p{age=12.1}$/u, "\u32FF")
-    assert_no_match(/^\p{age=13.0}$/u, "\u{10570}")
-    assert_match(/^\p{age=14.0}$/u, "\u{10570}")
-    assert_match(/^\p{age=14.0}$/u, "\u9FFF")
-    assert_match(/^\p{age=14.0}$/u, "\u{2A6DF}")
-    assert_match(/^\p{age=14.0}$/u, "\u{2B738}")
+    assert_unicode_age("\u261c", matches: %w"6.0 1.1", unmatches: [])
+
+    assert_unicode_age("\u31f6", matches: %w"6.0 3.2", unmatches: %w"3.1 3.0 1.1")
+    assert_unicode_age("\u2754", matches: %w"6.0", unmatches: %w"5.0 4.0 3.0 2.0 1.1")
+
+    assert_unicode_age("\u32FF", matches: %w"12.1", unmatches: %w"12.0")
+  end
+
+  def test_unicode_age_14_0
+    @matches = %w"14.0"
+    @unmatches = %w"13.0"
+
+    assert_unicode_age("\u{10570}")
+    assert_unicode_age("\u9FFF")
+    assert_unicode_age("\u{2A6DF}")
+    assert_unicode_age("\u{2B738}")
+  end
+
+  def test_unicode_age_15_0
+    @matches = %w"15.0"
+    @unmatches = %w"14.0"
+
+    assert_unicode_age("\u{0CF3}",
+                       "KANNADA SIGN COMBINING ANUSVARA ABOVE RIGHT")
+    assert_unicode_age("\u{0ECE}", "LAO YAMAKKAN")
+    assert_unicode_age("\u{10EFD}".."\u{10EFF}",
+                       "ARABIC SMALL LOW WORD SAKTA..ARABIC SMALL LOW WORD MADDA")
+    assert_unicode_age("\u{1123F}".."\u{11241}",
+                       "KHOJKI LETTER QA..KHOJKI VOWEL SIGN VOCALIC R")
+    assert_unicode_age("\u{11B00}".."\u{11B09}",
+                       "DEVANAGARI HEAD MARK..DEVANAGARI SIGN MINDU")
+    assert_unicode_age("\u{11F00}".."\u{11F10}",
+                       "KAWI SIGN CANDRABINDU..KAWI LETTER O")
+    assert_unicode_age("\u{11F12}".."\u{11F3A}",
+                       "KAWI LETTER KA..KAWI VOWEL SIGN VOCALIC R")
+    assert_unicode_age("\u{11F3E}".."\u{11F59}",
+                       "KAWI VOWEL SIGN E..KAWI DIGIT NINE")
+    assert_unicode_age("\u{1342F}",
+                       "EGYPTIAN HIEROGLYPH V011D")
+    assert_unicode_age("\u{13439}".."\u{1343F}",
+                       "EGYPTIAN HIEROGLYPH INSERT AT MIDDLE..EGYPTIAN HIEROGLYPH END WALLED ENCLOSURE")
+    assert_unicode_age("\u{13440}".."\u{13455}",
+                       "EGYPTIAN HIEROGLYPH MIRROR HORIZONTALLY..EGYPTIAN HIEROGLYPH MODIFIER DAMAGED")
+    assert_unicode_age("\u{1B132}", "HIRAGANA LETTER SMALL KO")
+    assert_unicode_age("\u{1B155}", "KATAKANA LETTER SMALL KO")
+    assert_unicode_age("\u{1D2C0}".."\u{1D2D3}",
+                       "KAKTOVIK NUMERAL ZERO..KAKTOVIK NUMERAL NINETEEN")
+    assert_unicode_age("\u{1DF25}".."\u{1DF2A}",
+                       "LATIN SMALL LETTER D WITH MID-HEIGHT LEFT HOOK..LATIN SMALL LETTER T WITH MID-HEIGHT LEFT HOOK")
+    assert_unicode_age("\u{1E030}".."\u{1E06D}",
+                       "MODIFIER LETTER CYRILLIC SMALL A..MODIFIER LETTER CYRILLIC SMALL STRAIGHT U WITH STROKE")
+    assert_unicode_age("\u{1E08F}",
+                       "COMBINING CYRILLIC SMALL LETTER BYELORUSSIAN-UKRAINIAN I")
+    assert_unicode_age("\u{1E4D0}".."\u{1E4F9}",
+                       "NAG MUNDARI LETTER O..NAG MUNDARI DIGIT NINE")
+    assert_unicode_age("\u{1F6DC}", "WIRELESS")
+    assert_unicode_age("\u{1F774}".."\u{1F776}",
+                       "LOT OF FORTUNE..LUNAR ECLIPSE")
+    assert_unicode_age("\u{1F77B}".."\u{1F77F}",
+                       "HAUMEA..ORCUS")
+    assert_unicode_age("\u{1F7D9}", "NINE POINTED WHITE STAR")
+    assert_unicode_age("\u{1FA75}".."\u{1FA77}",
+                       "LIGHT BLUE HEART..PINK HEART")
+    assert_unicode_age("\u{1FA87}".."\u{1FA88}",
+                       "MARACAS..FLUTE")
+    assert_unicode_age("\u{1FAAD}".."\u{1FAAF}",
+                       "FOLDING HAND FAN..KHANDA")
+    assert_unicode_age("\u{1FABB}".."\u{1FABD}",
+                       "HYACINTH..WING")
+    assert_unicode_age("\u{1FABF}", "GOOSE")
+    assert_unicode_age("\u{1FACE}".."\u{1FACF}",
+                       "MOOSE..DONKEY")
+    assert_unicode_age("\u{1FADA}".."\u{1FADB}",
+                       "GINGER ROOT..PEA POD")
+    assert_unicode_age("\u{1FAE8}", "SHAKING FACE")
+    assert_unicode_age("\u{1FAF7}".."\u{1FAF8}",
+                       "LEFTWARDS PUSHING HAND..RIGHTWARDS PUSHING HAND")
+    assert_unicode_age("\u{2B739}",
+                       "CJK UNIFIED IDEOGRAPH-2B739")
+    assert_unicode_age("\u{31350}".."\u{323AF}",
+                       "CJK UNIFIED IDEOGRAPH-31350..CJK UNIFIED IDEOGRAPH-323AF")
+  end
+
+  def test_unicode_age_15_1
+    @matches   = %w"15.1"
+    @unmatches = %w"15.0"
+
+    # https://www.unicode.org/Public/15.1.0/ucd/DerivedAge.txt
+    assert_unicode_age("\u{2FFC}".."\u{2FFF}",
+                       "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM RIGHT..IDEOGRAPHIC DESCRIPTION CHARACTER ROTATION")
+    assert_unicode_age("\u{31EF}",
+                       "IDEOGRAPHIC DESCRIPTION CHARACTER SUBTRACTION")
+    assert_unicode_age("\u{2EBF0}".."\u{2EE5D}",
+                       "CJK UNIFIED IDEOGRAPH-2EBF0..CJK UNIFIED IDEOGRAPH-2EE5D")
+  end
+
+  def test_unicode_age_16_0
+    @matches   = %w"16.0"
+    @unmatches = %w"15.1"
+
+    # https://www.unicode.org/Public/16.0.0/ucd/DerivedAge.txt
+    assert_unicode_age("\u{0897}",
+                       "ARABIC PEPET")
+    assert_unicode_age("\u{1B4E}".."\u{1B4F}",
+                       "BALINESE INVERTED CARIK SIKI..BALINESE INVERTED CARIK PAREREN")
+    assert_unicode_age("\u{1B7F}",
+                       "BALINESE PANTI BAWAK")
+    assert_unicode_age("\u{1C89}".."\u{1C8A}",
+                       "CYRILLIC CAPITAL LETTER TJE..CYRILLIC SMALL LETTER TJE")
+    assert_unicode_age("\u{2427}".."\u{2429}",
+                       "SYMBOL FOR DELETE SQUARE CHECKER BOARD FORM..SYMBOL FOR DELETE MEDIUM SHADE FORM")
+    assert_unicode_age("\u{31E4}".."\u{31E5}",
+                       "CJK STROKE HXG..CJK STROKE SZP")
+    assert_unicode_age("\u{A7CB}".."\u{A7CD}",
+                       "LATIN CAPITAL LETTER RAMS HORN..LATIN SMALL LETTER S WITH DIAGONAL STROKE")
+    assert_unicode_age("\u{A7DA}".."\u{A7DC}",
+                       "LATIN CAPITAL LETTER LAMBDA..LATIN CAPITAL LETTER LAMBDA WITH STROKE")
+    assert_unicode_age("\u{105C0}".."\u{105F3}",
+                       "TODHRI LETTER A..TODHRI LETTER OO")
+    assert_unicode_age("\u{10D40}".."\u{10D65}",
+                       "GARAY DIGIT ZERO..GARAY CAPITAL LETTER OLD NA")
+    assert_unicode_age("\u{10D69}".."\u{10D85}",
+                       "GARAY VOWEL SIGN E..GARAY SMALL LETTER OLD NA")
+    assert_unicode_age("\u{10D8E}".."\u{10D8F}",
+                       "GARAY PLUS SIGN..GARAY MINUS SIGN")
+    assert_unicode_age("\u{10EC2}".."\u{10EC4}",
+                       "ARABIC LETTER DAL WITH TWO DOTS VERTICALLY BELOW..ARABIC LETTER KAF WITH TWO DOTS VERTICALLY BELOW")
+    assert_unicode_age("\u{10EFC}",
+                       "ARABIC COMBINING ALEF OVERLAY")
+    assert_unicode_age("\u{11380}".."\u{11389}",
+                       "TULU-TIGALARI LETTER A..TULU-TIGALARI LETTER VOCALIC LL")
+    assert_unicode_age("\u{1138B}",
+                       "TULU-TIGALARI LETTER EE")
+    assert_unicode_age("\u{1138E}",
+                       "TULU-TIGALARI LETTER AI")
+    assert_unicode_age("\u{11390}".."\u{113B5}",
+                       "TULU-TIGALARI LETTER OO..TULU-TIGALARI LETTER LLLA")
+    assert_unicode_age("\u{113B7}".."\u{113C0}",
+                       "TULU-TIGALARI SIGN AVAGRAHA..TULU-TIGALARI VOWEL SIGN VOCALIC LL")
+    assert_unicode_age("\u{113C2}",
+                       "TULU-TIGALARI VOWEL SIGN EE")
+    assert_unicode_age("\u{113C5}",
+                       "TULU-TIGALARI VOWEL SIGN AI")
+    assert_unicode_age("\u{113C7}".."\u{113CA}",
+                       "TULU-TIGALARI VOWEL SIGN OO..TULU-TIGALARI SIGN CANDRA ANUNASIKA")
+    assert_unicode_age("\u{113CC}".."\u{113D5}",
+                       "TULU-TIGALARI SIGN ANUSVARA..TULU-TIGALARI DOUBLE DANDA")
+    assert_unicode_age("\u{113D7}".."\u{113D8}",
+                       "TULU-TIGALARI SIGN OM PUSHPIKA..TULU-TIGALARI SIGN SHRII PUSHPIKA")
+    assert_unicode_age("\u{113E1}".."\u{113E2}",
+                       "TULU-TIGALARI VEDIC TONE SVARITA..TULU-TIGALARI VEDIC TONE ANUDATTA")
+    assert_unicode_age("\u{116D0}".."\u{116E3}",
+                       "MYANMAR PAO DIGIT ZERO..MYANMAR EASTERN PWO KAREN DIGIT NINE")
+    assert_unicode_age("\u{11BC0}".."\u{11BE1}",
+                       "SUNUWAR LETTER DEVI..SUNUWAR SIGN PVO")
+    assert_unicode_age("\u{11BF0}".."\u{11BF9}",
+                       "SUNUWAR DIGIT ZERO..SUNUWAR DIGIT NINE")
+    assert_unicode_age("\u{11F5A}",
+                       "KAWI SIGN NUKTA")
+    assert_unicode_age("\u{13460}".."\u{143FA}",
+                       "EGYPTIAN HIEROGLYPH-13460..EGYPTIAN HIEROGLYPH-143FA")
+    assert_unicode_age("\u{16100}".."\u{16139}",
+                       "GURUNG KHEMA LETTER A..GURUNG KHEMA DIGIT NINE")
+    assert_unicode_age("\u{16D40}".."\u{16D79}",
+                       "KIRAT RAI SIGN ANUSVARA..KIRAT RAI DIGIT NINE")
+    assert_unicode_age("\u{18CFF}",
+                       "KHITAN SMALL SCRIPT CHARACTER-18CFF")
+    assert_unicode_age("\u{1CC00}".."\u{1CCF9}",
+                       "UP-POINTING GO-KART..OUTLINED DIGIT NINE")
+    assert_unicode_age("\u{1CD00}".."\u{1CEB3}",
+                       "BLOCK OCTANT-3..BLACK RIGHT TRIANGLE CARET")
+    assert_unicode_age("\u{1E5D0}".."\u{1E5FA}",
+                       "OL ONAL LETTER O..OL ONAL DIGIT NINE")
+    assert_unicode_age("\u{1E5FF}",
+                       "OL ONAL ABBREVIATION SIGN")
+    assert_unicode_age("\u{1F8B2}".."\u{1F8BB}",
+                       "RIGHTWARDS ARROW WITH LOWER HOOK..SOUTH WEST ARROW FROM BAR")
+    assert_unicode_age("\u{1F8C0}".."\u{1F8C1}",
+                       "LEFTWARDS ARROW FROM DOWNWARDS ARROW..RIGHTWARDS ARROW FROM DOWNWARDS ARROW")
+    assert_unicode_age("\u{1FA89}",
+                       "HARP")
+    assert_unicode_age("\u{1FA8F}",
+                       "SHOVEL")
+    assert_unicode_age("\u{1FABE}",
+                       "LEAFLESS TREE")
+    assert_unicode_age("\u{1FAC6}",
+                       "FINGERPRINT")
+    assert_unicode_age("\u{1FADC}",
+                       "ROOT VEGETABLE")
+    assert_unicode_age("\u{1FADF}",
+                       "SPLATTER")
+    assert_unicode_age("\u{1FAE9}",
+                       "FACE WITH BAGS UNDER EYES")
+    assert_unicode_age("\u{1FBCB}".."\u{1FBEF}",
+                       "WHITE CROSS MARK..TOP LEFT JUSTIFIED LOWER RIGHT QUARTER BLACK CIRCLE")
+  end
+
+  UnicodeAgeRegexps = Hash.new do |h, age|
+    h[age] = [/\A\p{age=#{age}}+\z/u, /\A\P{age=#{age}}+\z/u].freeze
+  end
+
+  def assert_unicode_age(char, mesg = nil, matches: @matches, unmatches: @unmatches)
+    if Range === char
+      char = char.to_a.join("")
+    end
+
+    matches.each do |age|
+      pos, neg = UnicodeAgeRegexps[age]
+      assert_match(pos, char, mesg)
+      assert_not_match(neg, char, mesg)
+    end
+
+    unmatches.each do |age|
+      pos, neg = UnicodeAgeRegexps[age]
+      assert_not_match(pos, char, mesg)
+      assert_match(neg, char, mesg)
+    end
   end
 
   MatchData_A = eval("class MatchData_\u{3042} < MatchData; self; end")
@@ -1614,6 +1878,12 @@ def test_invalid_group
     end;
   end
 
+  def test_too_big_number_for_repeat_range
+    assert_raise_with_message(SyntaxError, /too big number for repeat range/) do
+      eval(%[/|{1000000}/])
+    end
+  end
+
   # This assertion is for porting x2() tests in testpy.py of Onigmo.
   def assert_match_at(re, str, positions, msg = nil)
     re = Regexp.new(re) unless re.is_a?(Regexp)
@@ -1658,7 +1928,7 @@ def test_s_timeout
       end
       t = Time.now - t
 
-      assert_in_delta(timeout, t, timeout / 2)
+      assert_operator(timeout, :<=, [timeout * 1.5, 1].max)
     end;
   end
 
@@ -1685,6 +1955,38 @@ def test_s_timeout_corner_cases
     end;
   end
 
+  def test_s_timeout_memory_leak
+    assert_no_memory_leak([], "#{<<~"begin;"}", "#{<<~"end;"}", "[Bug #20228]", rss: true)
+      Regexp.timeout = 0.001
+      regex = /^(a*)*$/
+      str = "a" * 1000000 + "x"
+
+      code = proc do
+        regex =~ str
+      rescue
+      end
+
+      10.times(&code)
+    begin;
+      1_000.times(&code)
+    end;
+  end
+
+  def test_bug_20453
+    re = Regexp.new("^(a*)x$", timeout: 0.001)
+
+    assert_raise(Regexp::TimeoutError) do
+      re =~ "a" * 1000000 + "x"
+    end
+  end
+
+  def test_bug_20886
+    re = Regexp.new("d()*+|a*a*bc", timeout: 0.02)
+    assert_raise(Regexp::TimeoutError) do
+      re === "b" + "a" * 1000
+    end
+  end
+
   def per_instance_redos_test(global_timeout, per_instance_timeout, expected_timeout)
     assert_separately([], "#{<<-"begin;"}\n#{<<-'end;'}")
       global_timeout = #{ EnvUtil.apply_timeout_scale(global_timeout).inspect }
@@ -1711,10 +2013,12 @@ def per_instance_redos_test(global_timeout, per_instance_timeout, expected_timeo
   end
 
   def test_timeout_shorter_than_global
-    per_instance_redos_test(10, 0.2, 0.2)
+    omit "timeout test is too unstable on s390x" if RUBY_PLATFORM =~ /s390x/
+    per_instance_redos_test(10, 0.5, 0.5)
   end
 
   def test_timeout_longer_than_global
+    omit "timeout test is too unstable on s390x" if RUBY_PLATFORM =~ /s390x/
     per_instance_redos_test(0.01, 0.5, 0.5)
   end
 
@@ -1740,12 +2044,27 @@ def test_timeout_corner_cases
     end;
   end
 
+  def test_timeout_memory_leak
+    assert_no_memory_leak([], "#{<<~"begin;"}", "#{<<~'end;'}", "[Bug #20650]", timeout: 100, rss: true)
+      regex = Regexp.new("^#{"(a*)" * 10_000}x$", timeout: 0.000001)
+      str = "a" * 1_000_000 + "x"
+
+      code = proc do
+        regex =~ str
+      rescue
+      end
+
+      10.times(&code)
+    begin;
+      1_000.times(&code)
+    end;
+  end
+
   def test_match_cache_exponential
     assert_separately([], "#{<<-"begin;"}\n#{<<-'end;'}")
       timeout = #{ EnvUtil.apply_timeout_scale(10).inspect }
     begin;
       Regexp.timeout = timeout
-
       assert_nil(/^(a*)*$/ =~ "a" * 1000000 + "x")
     end;
   end
@@ -1755,7 +2074,6 @@ def test_match_cache_square
       timeout = #{ EnvUtil.apply_timeout_scale(10).inspect }
     begin;
       Regexp.timeout = timeout
-
       assert_nil(/^a*b?a*$/ =~ "a" * 1000000 + "x")
     end;
   end
@@ -1765,8 +2083,70 @@ def test_match_cache_atomic
       timeout = #{ EnvUtil.apply_timeout_scale(10).inspect }
     begin;
       Regexp.timeout = timeout
+      assert_nil(/^a*?(?>a*a*)$/ =~ "a" * 1000000 + "x")
+    end;
+  end
+
+  def test_match_cache_atomic_complex
+    assert_separately([], "#{<<-"begin;"}\n#{<<-'end;'}")
+      timeout = #{ EnvUtil.apply_timeout_scale(10).inspect }
+    begin;
+      Regexp.timeout = timeout
+      assert_nil(/a*(?>a*)ab/ =~ "a" * 1000000 + "b")
+    end;
+  end
+
+  def test_match_cache_positive_look_ahead
+    assert_separately([], "#{<<-"begin;"}\n#{<<-'end;'}", timeout: 30)
+      timeout = #{ EnvUtil.apply_timeout_scale(10).inspect }
+    begin;
+       Regexp.timeout = timeout
+       assert_nil(/^a*?(?=a*a*)$/ =~ "a" * 1000000 + "x")
+    end;
+  end
+
+  def test_match_cache_positive_look_ahead_complex
+    assert_separately([], "#{<<-"begin;"}\n#{<<-'end;'}", timeout: 30)
+      timeout = #{ EnvUtil.apply_timeout_scale(10).inspect }
+    begin;
+       Regexp.timeout = timeout
+       assert_equal(/(?:(?=a*)a)*/ =~ "a" * 1000000, 0)
+    end;
+  end
+
+  def test_match_cache_negative_look_ahead
+    assert_separately([], "#{<<-"begin;"}\n#{<<-'end;'}")
+      timeout = #{ EnvUtil.apply_timeout_scale(10).inspect }
+    begin;
+      Regexp.timeout = timeout
+      assert_nil(/^a*?(?!a*a*)$/ =~ "a" * 1000000 + "x")
+    end;
+  end
+
+  def test_match_cache_positive_look_behind
+    assert_separately([], "#{<<-"begin;"}\n#{<<-'end;'}")
+      timeout = #{ EnvUtil.apply_timeout_scale(10).inspect }
+    begin;
+      Regexp.timeout = timeout
+      assert_nil(/(?<=abc|def)(a|a)*$/ =~ "abc" + "a" * 1000000 + "x")
+    end;
+  end
+
+  def test_match_cache_negative_look_behind
+    assert_separately([], "#{<<-"begin;"}\n#{<<-'end;'}")
+    timeout = #{ EnvUtil.apply_timeout_scale(10).inspect }
+    begin;
+      Regexp.timeout = timeout
+      assert_nil(/(?<!x)(a|a)*$/ =~ "a" * 1000000 + "x")
+    end;
+  end
 
-      assert_nil(/^(?>a?a?)(a|a)*$/ =~ "a" * 1000000 + "x")
+  def test_match_cache_with_peek_optimization
+    assert_separately([], "#{<<-"begin;"}\n#{<<-'end;'}")
+    timeout = #{ EnvUtil.apply_timeout_scale(10).inspect }
+    begin;
+      Regexp.timeout = timeout
+      assert_nil(/a+z/ =~ "a" * 1000000 + "xz")
     end;
   end
 
@@ -1783,7 +2163,7 @@ def test_bug_19273 # [Bug #19273]
     assert_equal("10:0:0".match(pattern)[0], "10:0:0")
   end
 
-  def test_bug_19467
+  def test_bug_19467 # [Bug #19467]
     assert_separately([], "#{<<-"begin;"}\n#{<<-'end;'}")
       timeout = #{ EnvUtil.apply_timeout_scale(10).inspect }
     begin;
@@ -1798,7 +2178,17 @@ def test_bug_19476 # [Bug #19476]
     assert_equal("123456789".match(/(?:x?\dx?){2,}/)[0], "123456789")
   end
 
-  def test_bug_19537
+  def test_encoding_flags_are_preserved_when_initialized_with_another_regexp
+    re = Regexp.new("\u2018hello\u2019".encode("UTF-8"))
+    str = "".encode("US-ASCII")
+
+    assert_nothing_raised do
+      str.match?(re)
+      str.match?(Regexp.new(re))
+    end
+  end
+
+  def test_bug_19537 # [Bug #19537]
     str = 'aac'
     re = '^([ab]{1,3})(a?)*$'
     100.times do
@@ -1806,6 +2196,39 @@ def test_bug_19537
     end
   end
 
+  def test_bug_20083 # [Bug #20083]
+    re = /([\s]*ABC)$/i
+    (1..100).each do |n|
+      text = "#{"0" * n}ABC"
+      assert text.match?(re)
+    end
+  end
+
+  def test_bug_20098 # [Bug #20098]
+    assert(/a((.|.)|bc){,4}z/.match? 'abcbcbcbcz')
+    assert(/a(b+?c*){4,5}z/.match? 'abbbccbbbccbcbcz')
+    assert(/a(b+?(.|.)){2,3}z/.match? 'abbbcbbbcbbbcz')
+    assert(/a(b*?(.|.)[bc]){2,5}z/.match? 'abcbbbcbcccbcz')
+    assert(/^(?:.+){2,4}?b|b/.match? "aaaabaa")
+  end
+
+  def test_bug_20207 # [Bug #20207]
+    assert(!'clan'.match?(/(?=.*a)(?!.*n)/))
+  end
+
+  def test_bug_20212 # [Bug #20212]
+    regex = Regexp.new(
+      /\A((?=.*?[a-z])(?!.*--)[a-z\d]+[a-z\d-]*[a-z\d]+).((?=.*?[a-z])(?!.*--)[a-z\d]+[a-z\d-]*[a-z\d]+).((?=.*?[a-z])(?!.*--)[a-z]+[a-z-]*[a-z]+).((?=.*?[a-z])(?!.*--)[a-z]+[a-z-]*[a-z]+)\Z/x
+    )
+    string = "www.google.com"
+    100.times.each { assert(regex.match?(string)) }
+  end
+
+  def test_bug_20246 # [Bug #20246]
+    assert_equal '1.2.3', '1.2.3'[/(\d+)(\.\g<1>){2}/]
+    assert_equal '1.2.3', '1.2.3'[/((?:\d|foo|bar)+)(\.\g<1>){2}/]
+  end
+
   def test_linear_time_p
     assert_send [Regexp, :linear_time?, /a/]
     assert_send [Regexp, :linear_time?, 'a']
@@ -1813,6 +2236,9 @@ def test_linear_time_p
     assert_not_send [Regexp, :linear_time?, /(a)\1/]
     assert_not_send [Regexp, :linear_time?, "(a)\\1"]
 
+    assert_not_send [Regexp, :linear_time?, /(?=(a))/]
+    assert_not_send [Regexp, :linear_time?, /(?!(a))/]
+
     assert_raise(TypeError) {Regexp.linear_time?(nil)}
     assert_raise(TypeError) {Regexp.linear_time?(Regexp.allocate)}
   end
@@ -1823,4 +2249,17 @@ def test_linear_performance
       re =~ s
     end
   end
+
+  def test_bug_16145_and_bug_21176_caseinsensitive_small # [Bug#16145] [Bug#21176]
+    encodings = [Encoding::UTF_8, Encoding::ISO_8859_1]
+    encodings.each do |enc|
+      o_acute_lower = "\u00F3".encode(enc)
+      o_acute_upper = "\u00D3".encode(enc)
+      assert_match(/[x#{o_acute_lower}]/i, "abc#{o_acute_upper}", "should match o acute case insensitive")
+
+      e_acute_lower = "\u00E9".encode(enc)
+      e_acute_upper = "\u00C9".encode(enc)
+      assert_match(/[x#{e_acute_lower}]/i, "CAF#{e_acute_upper}", "should match e acute case insensitive")
+    end
+  end
 end
diff --git a/test/ruby/test_require.rb b/test/ruby/test_require.rb
index cadab4f851ab3a..13e707639123e9 100644
--- a/test/ruby/test_require.rb
+++ b/test/ruby/test_require.rb
@@ -6,11 +6,27 @@
 
 class TestRequire < Test::Unit::TestCase
   def test_load_error_path
-    filename = "should_not_exist"
-    error = assert_raise(LoadError) do
-      require filename
-    end
-    assert_equal filename, error.path
+    Tempfile.create(["should_not_exist", ".rb"]) {|t|
+      filename = t.path
+      t.close
+      File.unlink(filename)
+
+      error = assert_raise(LoadError) do
+        require filename
+      end
+      assert_equal filename, error.path
+
+      # with --disable=gems
+      assert_separately(["-", filename], "#{<<~"begin;"}\n#{<<~'end;'}")
+      begin;
+        filename = ARGV[0]
+        path = Struct.new(:to_path).new(filename)
+        error = assert_raise(LoadError) do
+          require path
+        end
+        assert_equal filename, error.path
+      end;
+    }
   end
 
   def test_require_invalid_shared_object
@@ -354,6 +370,26 @@ def test_require_in_wrapped_load
     end
   end
 
+  def test_public_in_wrapped_load
+    Tempfile.create(["test_public_in_wrapped_load", ".rb"]) do |t|
+      t.puts "def foo; end", "public :foo"
+      t.close
+      assert_warning(/main\.public/) do
+        assert load(t.path, true)
+      end
+    end
+  end
+
+  def test_private_in_wrapped_load
+    Tempfile.create(["test_private_in_wrapped_load", ".rb"]) do |t|
+      t.puts "def foo; end", "private :foo"
+      t.close
+      assert_warning(/main\.private/) do
+        assert load(t.path, true)
+      end
+    end
+  end
+
   def test_load_scope
     bug1982 = '[ruby-core:25039] [Bug #1982]'
     Tempfile.create(["test_ruby_test_require", ".rb"]) {|t|
@@ -496,7 +532,7 @@ def test_relative_symlink_realpath
 
   def test_frozen_loaded_features
     bug3756 = '[ruby-core:31913]'
-    assert_in_out_err(['-e', '$LOADED_FEATURES.freeze; require "ostruct"'], "",
+    assert_in_out_err(['-e', '$LOADED_FEATURES.freeze; require "erb"'], "",
                       [], /\$LOADED_FEATURES is frozen; cannot append feature \(RuntimeError\)$/,
                       bug3756)
   end
@@ -811,7 +847,7 @@ def test_loading_fifo_threading_raise
       f.close
       File.unlink(f.path)
       File.mkfifo(f.path)
-      assert_separately(["-", f.path], "#{<<~"begin;"}\n#{<<~"end;"}", timeout: 3)
+      assert_separately(["-", f.path], "#{<<~"begin;"}\n#{<<~"end;"}", timeout: 10)
       begin;
         th = Thread.current
         Thread.start {begin sleep(0.001) end until th.stop?; th.raise(IOError)}
@@ -830,7 +866,7 @@ def test_loading_fifo_threading_success
       File.unlink(f.path)
       File.mkfifo(f.path)
 
-      assert_separately(["-", f.path], "#{<<~"begin;"}\n#{<<~"end;"}", timeout: 3)
+      assert_separately(["-", f.path], "#{<<~"begin;"}\n#{<<~"end;"}", timeout: 10)
       begin;
         path = ARGV[0]
         th = Thread.current
@@ -963,7 +999,7 @@ def test_resolve_feature_path_with_missing_feature
 
   def test_require_with_public_method_missing
     # [Bug #19793]
-    assert_separately(["-W0", "-rtempfile"], __FILE__, __LINE__, <<~RUBY)
+    assert_separately(["-W0", "-rtempfile"], __FILE__, __LINE__, <<~RUBY, timeout: 60)
       GC.stress = true
 
       class Object
diff --git a/test/ruby/test_require_lib.rb b/test/ruby/test_require_lib.rb
index 3615d88a1110dd..44dfbcf9ec27a5 100644
--- a/test/ruby/test_require_lib.rb
+++ b/test/ruby/test_require_lib.rb
@@ -1,25 +1,26 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 require 'test/unit'
 
 class TestRequireLib < Test::Unit::TestCase
-  TEST_RATIO = ENV["TEST_REQUIRE_THREAD_RATIO"]&.tap {|s|break s.to_f} || 0.05 # testing all files needs too long time...
+  libdir = __dir__ + '/../../lib'
 
-  Dir.glob(File.expand_path('../../lib/**/*.rb', __dir__)).each do |lib|
-    # skip some problems
-    next if %r!/lib/(?:bundler|rubygems)\b! =~ lib
-    next if %r!/lib/(?:debug|mkmf)\.rb\z! =~ lib
-    next if %r!/lib/irb/ext/tracer\.rb\z! =~ lib
-    # skip many files that almost use no threads
-    next if TEST_RATIO < rand(0.0..1.0)
+  # .rb files at lib
+  scripts = Dir.glob('*.rb', base: libdir).map {|f| f.chomp('.rb')}
+
+  # .rb files in subdirectories of lib without same name script
+  dirs = Dir.glob('*/', base: libdir).map {|d| d.chomp('/')}
+  dirs -= scripts
+  scripts.concat(Dir.glob(dirs.map {|d| d + '/*.rb'}, base: libdir).map {|f| f.chomp('.rb')})
+
+  # skip some problems
+  scripts -= %w[bundler bundled_gems rubygems mkmf set/sorted_set]
+
+  scripts.each do |lib|
     define_method "test_thread_size:#{lib}" do
-      assert_separately(['-W0'], "#{<<~"begin;"}\n#{<<~"end;"}")
+      assert_separately(['-W0'], "#{<<~"begin;"}\n#{<<~"end;"}", timeout: 60)
       begin;
         n = Thread.list.size
-        begin
-          require #{lib.dump}
-        rescue Exception
-          omit $!
-        end
+        require #{lib.dump}
         assert_equal n, Thread.list.size
       end;
     end
diff --git a/test/ruby/test_rubyoptions.rb b/test/ruby/test_rubyoptions.rb
index 20fa15604db9d1..54ad953ee9944e 100644
--- a/test/ruby/test_rubyoptions.rb
+++ b/test/ruby/test_rubyoptions.rb
@@ -5,15 +5,24 @@
 require 'tmpdir'
 require 'tempfile'
 require_relative '../lib/jit_support'
+require_relative '../lib/parser_support'
 
 class TestRubyOptions < Test::Unit::TestCase
-  def self.rjit_enabled? = defined?(RubyVM::RJIT) && RubyVM::RJIT.enabled?
-  def self.yjit_enabled? = defined?(RubyVM::YJIT.enabled?) && RubyVM::YJIT.enabled?
+  def self.yjit_enabled? = defined?(RubyVM::YJIT) && RubyVM::YJIT.enabled?
+
+  # Here we're defining our own RUBY_DESCRIPTION without "+PRISM". We do this
+  # here so that the various tests that reference RUBY_DESCRIPTION don't have to
+  # worry about it. The flag itself is tested in its own test.
+  RUBY_DESCRIPTION =
+    if ParserSupport.prism_enabled_in_subprocess?
+      ::RUBY_DESCRIPTION
+    else
+      ::RUBY_DESCRIPTION.sub(/\+PRISM /, '')
+    end
 
   NO_JIT_DESCRIPTION =
-    if rjit_enabled?
-      RUBY_DESCRIPTION.sub(/\+RJIT /, '')
-    elsif yjit_enabled?
+    case
+    when yjit_enabled?
       RUBY_DESCRIPTION.sub(/\+YJIT( (dev|dev_nodebug|stats))? /, '')
     else
       RUBY_DESCRIPTION
@@ -41,7 +50,7 @@ def test_source_file
   def test_usage
     assert_in_out_err(%w(-h)) do |r, e|
       assert_operator(r.size, :<=, 25)
-      longer = r[1..-1].select {|x| x.size > 80}
+      longer = r[1..-1].select {|x| x.size >= 80}
       assert_equal([], longer)
       assert_equal([], e)
     end
@@ -99,36 +108,44 @@ def test_backtrace_limit
   end
 
   def test_warning
-    save_rubyopt = ENV['RUBYOPT']
-    ENV['RUBYOPT'] = nil
+    save_rubyopt = ENV.delete('RUBYOPT')
     assert_in_out_err(%w(-W0 -e) + ['p $-W'], "", %w(0), [])
     assert_in_out_err(%w(-W1 -e) + ['p $-W'], "", %w(1), [])
     assert_in_out_err(%w(-Wx -e) + ['p $-W'], "", %w(2), [])
     assert_in_out_err(%w(-W -e) + ['p $-W'], "", %w(2), [])
     assert_in_out_err(%w(-We) + ['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: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 -e) + ['p Warning[:performance]'], "", %w(false), [])
-    assert_in_out_err(%w(-W:performance -e) + ['p Warning[:performance]'], "", %w(true), [])
-    assert_in_out_err(%w(-W:qux), "", [], /unknown warning category: `qux'/)
-    assert_in_out_err(%w(-w -e) + ['p Warning[:deprecated]'], "", %w(true), [])
-    assert_in_out_err(%w(-W -e) + ['p Warning[:deprecated]'], "", %w(true), [])
-    assert_in_out_err(%w(-We) + ['p Warning[:deprecated]'], "", %w(true), [])
-    assert_in_out_err(%w(-e) + ['p Warning[:deprecated]'], "", %w(false), [])
-    assert_in_out_err(%w(-w -e) + ['p Warning[:performance]'], "", %w(false), [])
-    assert_in_out_err(%w(-W -e) + ['p Warning[:performance]'], "", %w(false), [])
-    code = 'puts "#{$VERBOSE}:#{Warning[:deprecated]}:#{Warning[:experimental]}:#{Warning[:performance]}"'
+
+    categories = {deprecated: 1, experimental: 0, performance: 2, strict_unused_block: 3}
+    assert_equal categories.keys.sort, Warning.categories.sort
+
+    categories.each do |category, level|
+      assert_in_out_err(["-W:#{category}", "-e", "p Warning[:#{category}]"], "", %w(true), [])
+      assert_in_out_err(["-W:no-#{category}", "-e", "p Warning[:#{category}]"], "", %w(false), [])
+      assert_in_out_err(["-e", "p Warning[:#{category}]"], "", level > 0 ? %w(false) : %w(true), [])
+      assert_in_out_err(["-w", "-e", "p Warning[:#{category}]"], "", level > 1 ? %w(false) : %w(true), [])
+      assert_in_out_err(["-W", "-e", "p Warning[:#{category}]"], "", level > 1 ? %w(false) : %w(true), [])
+      assert_in_out_err(["-We", "p Warning[:#{category}]"], "", level > 1 ? %w(false) : %w(true), [])
+    end
+    assert_in_out_err(%w(-W:qux), "", [], /unknown warning category: 'qux'/)
+
+    def categories.expected(lev = 1, **warnings)
+      [
+        (lev > 1).to_s,
+        *map {|category, level| warnings.fetch(category, lev > level).to_s}
+      ].join(':')
+    end
+    code = ['#{$VERBOSE}', *categories.map {|category, | "\#{Warning[:#{category}]}"}].join(':')
+    code = %[puts "#{code}"]
     Tempfile.create(["test_ruby_test_rubyoption", ".rb"]) do |t|
       t.puts code
       t.close
-      assert_in_out_err(["-r#{t.path}", '-e', code], "", %w(false:false:true:false false:false:true:false), [])
-      assert_in_out_err(["-r#{t.path}", '-w', '-e', code], "", %w(true:true:true:false true:true:true:false), [])
-      assert_in_out_err(["-r#{t.path}", '-W:deprecated', '-e', code], "", %w(false:true:true:false false:true:true:false), [])
-      assert_in_out_err(["-r#{t.path}", '-W:no-experimental', '-e', code], "", %w(false:false:false:false false:false:false:false), [])
-      assert_in_out_err(["-r#{t.path}", '-W:performance', '-e', code], "", %w(false:false:true:true false:false:true:true), [])
+      assert_in_out_err(["-r#{t.path}", '-e', code], "", [categories.expected(1)]*2, [])
+      assert_in_out_err(["-r#{t.path}", '-w', '-e', code], "", [categories.expected(2)]*2, [])
+      categories.each do |category, |
+        assert_in_out_err(["-r#{t.path}", "-W:#{category}", '-e', code], "", [categories.expected(category => 'true')]*2, [])
+        assert_in_out_err(["-r#{t.path}", "-W:no-#{category}", '-e', code], "", [categories.expected(category => 'false')]*2, [])
+      end
     end
   ensure
     ENV['RUBYOPT'] = save_rubyopt
@@ -150,25 +167,14 @@ def test_debug
       /^jruby #{q[RUBY_ENGINE_VERSION]} \(#{q[RUBY_VERSION]}\).*? \[#{
         q[RbConfig::CONFIG["host_os"]]}-#{q[RbConfig::CONFIG["host_cpu"]]}\]$/
     else
-      /^ruby #{q[RUBY_VERSION]}(?:[p ]|dev|rc).*? \[#{q[RUBY_PLATFORM]}\]$/
+      /^ruby #{q[RUBY_VERSION]}(?:[p ]|dev|rc).*? (\+PRISM )?\[#{q[RUBY_PLATFORM]}\]$/
     end
   private_constant :VERSION_PATTERN
 
-  VERSION_PATTERN_WITH_RJIT =
-    case RUBY_ENGINE
-    when 'ruby'
-      /^ruby #{q[RUBY_VERSION]}(?:[p ]|dev|rc).*? \+RJIT \[#{q[RUBY_PLATFORM]}\]$/
-    else
-      VERSION_PATTERN
-    end
-  private_constant :VERSION_PATTERN_WITH_RJIT
-
   def test_verbose
     assert_in_out_err([{'RUBY_YJIT_ENABLE' => nil}, "-vve", ""]) do |r, e|
       assert_match(VERSION_PATTERN, r[0])
-      if self.class.rjit_enabled? && !JITSupport.rjit_force_enabled?
-        assert_equal(NO_JIT_DESCRIPTION, r[0])
-      elsif self.class.yjit_enabled? && !JITSupport.yjit_force_enabled?
+      if self.class.yjit_enabled? && !JITSupport.yjit_force_enabled?
         assert_equal(NO_JIT_DESCRIPTION, r[0])
       else
         assert_equal(RUBY_DESCRIPTION, r[0])
@@ -193,14 +199,9 @@ def test_enable
       assert_in_out_err(%w(--enable all -e) + [""], "", [], [])
       assert_in_out_err(%w(--enable-all -e) + [""], "", [], [])
       assert_in_out_err(%w(--enable=all -e) + [""], "", [], [])
-    elsif JITSupport.rjit_supported?
-      # Avoid failing tests by RJIT warnings
-      assert_in_out_err(%w(--enable all --disable rjit -e) + [""], "", [], [])
-      assert_in_out_err(%w(--enable-all --disable-rjit -e) + [""], "", [], [])
-      assert_in_out_err(%w(--enable=all --disable=rjit -e) + [""], "", [], [])
     end
     assert_in_out_err(%w(--enable foobarbazqux -e) + [""], "", [],
-                      /unknown argument for --enable: `foobarbazqux'/)
+                      /unknown argument for --enable: 'foobarbazqux'/)
     assert_in_out_err(%w(--enable), "", [], /missing argument for --enable/)
   end
 
@@ -209,7 +210,7 @@ def test_disable
     assert_in_out_err(%w(--disable-all -e) + [""], "", [], [])
     assert_in_out_err(%w(--disable=all -e) + [""], "", [], [])
     assert_in_out_err(%w(--disable foobarbazqux -e) + [""], "", [],
-                      /unknown argument for --disable: `foobarbazqux'/)
+                      /unknown argument for --disable: 'foobarbazqux'/)
     assert_in_out_err(%w(--disable), "", [], /missing argument for --disable/)
     assert_in_out_err(%w(-e) + ['p defined? Gem'], "", ["nil"], [])
     assert_in_out_err(%w(--disable-did_you_mean -e) + ['p defined? DidYouMean'], "", ["nil"], [])
@@ -218,7 +219,7 @@ def test_disable
 
   def test_kanji
     assert_in_out_err(%w(-KU), "p '\u3042'") do |r, e|
-      assert_equal("\"\u3042\"", r.join.force_encoding(Encoding::UTF_8))
+      assert_equal("\"\u3042\"", r.join('').force_encoding(Encoding::UTF_8))
     end
     line = '-eputs"\xc2\xa1".encoding'
     env = {'RUBYOPT' => nil}
@@ -239,7 +240,7 @@ def test_version
       assert_match(VERSION_PATTERN, r[0])
       if ENV['RUBY_YJIT_ENABLE'] == '1'
         assert_equal(NO_JIT_DESCRIPTION, r[0])
-      elsif self.class.rjit_enabled? || self.class.yjit_enabled? # checking -D(M|Y)JIT_FORCE_ENABLE
+      elsif self.class.yjit_enabled? # checking -DYJIT_FORCE_ENABLE
         assert_equal(EnvUtil.invoke_ruby(['-e', 'print RUBY_DESCRIPTION'], '', true).first, r[0])
       else
         assert_equal(RUBY_DESCRIPTION, r[0])
@@ -248,44 +249,28 @@ def test_version
     end
   end
 
-  def test_rjit_disabled_version
-    return unless JITSupport.rjit_supported?
-    return if JITSupport.yjit_force_enabled?
+  def test_enabled_gc
+    omit unless /linux|darwin/ =~ RUBY_PLATFORM
 
-    env = { 'RUBY_YJIT_ENABLE' => nil } # unset in children
-    [
-      %w(--version --rjit --disable=rjit),
-      %w(--version --enable=rjit --disable=rjit),
-      %w(--version --enable-rjit --disable-rjit),
-    ].each do |args|
-      assert_in_out_err([env] + args) do |r, e|
-        assert_match(VERSION_PATTERN, r[0])
-        assert_match(NO_JIT_DESCRIPTION, r[0])
-        assert_equal([], e)
-      end
+    if RbConfig::CONFIG['modular_gc_dir'].length > 0
+      assert_match(/\+GC/, RUBY_DESCRIPTION)
+    else
+      assert_no_match(/\+GC/, RUBY_DESCRIPTION)
     end
   end
 
-  def test_rjit_version
-    return unless JITSupport.rjit_supported?
-    return if JITSupport.yjit_force_enabled?
+  def test_parser_flag
+    omit if ENV["RUBYOPT"]&.include?("--parser=")
 
-    env = { 'RUBY_YJIT_ENABLE' => nil } # unset in children
-    [
-      %w(--version --rjit),
-      %w(--version --enable=rjit),
-      %w(--version --enable-rjit),
-    ].each do |args|
-      assert_in_out_err([env] + args) do |r, e|
-        assert_match(VERSION_PATTERN_WITH_RJIT, r[0])
-        if JITSupport.rjit_force_enabled?
-          assert_equal(RUBY_DESCRIPTION, r[0])
-        else
-          assert_equal(EnvUtil.invoke_ruby([env, '--rjit', '-e', 'print RUBY_DESCRIPTION'], '', true).first, r[0])
-        end
-        assert_equal([], e)
-      end
-    end
+    assert_in_out_err(%w(--parser=prism -e) + ["puts :hi"], "", %w(hi), [])
+    assert_in_out_err(%w(--parser=prism --dump=parsetree -e _=:hi), "", /"hi"/, [])
+
+    assert_in_out_err(%w(--parser=parse.y -e) + ["puts :hi"], "", %w(hi), [])
+    assert_norun_with_rflag('--parser=parse.y', '--version', "")
+
+    assert_in_out_err(%w(--parser=notreal -e) + ["puts :hi"], "", [], /unknown parser notreal/)
+
+    assert_in_out_err(%w(--parser=prism --version), "", /\+PRISM/, [])
   end
 
   def test_eval
@@ -331,12 +316,25 @@ def test_chdir
 
     d = Dir.tmpdir
     assert_in_out_err(["-C", d, "-e", "puts Dir.pwd"]) do |r, e|
-      assert_file.identical?(r.join, d)
+      assert_file.identical?(r.join(''), d)
       assert_equal([], e)
     end
+
+    Dir.mktmpdir(nil, d) do |base|
+      # "test" in Japanese and N'Ko
+      test = base + "/\u{30c6 30b9 30c8}_\u{7e1 7ca 7dd 7cc 7df 7cd 7eb}"
+      Dir.mkdir(test)
+      assert_in_out_err(["-C", base, "-C", File.basename(test), "-e", "puts Dir.pwd"]) do |r, e|
+        assert_file.identical?(r.join(''), test)
+        assert_equal([], e)
+      end
+      Dir.rmdir(test)
+    end
   end
 
   def test_yydebug
+    omit if ParserSupport.prism_enabled_in_subprocess?
+
     assert_in_out_err(["-ye", ""]) do |r, e|
       assert_not_equal([], r)
       assert_equal([], e)
@@ -354,22 +352,32 @@ def test_encoding
     assert_in_out_err(%w(--encoding test_ruby_test_rubyoptions_foobarbazqux), "", [],
                       /unknown encoding name - test_ruby_test_rubyoptions_foobarbazqux \(RuntimeError\)/)
 
-    if /mswin|mingw|aix|android/ =~ RUBY_PLATFORM &&
-      (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,
-      # which allows \u3042.
-      out, err = [str], []
-    else
-      out, err = [], /invalid multibyte char/
-    end
-    assert_in_out_err(%w(-Eutf-8), "puts '\u3042'", out, err)
-    assert_in_out_err(%w(--encoding utf-8), "puts '\u3042'", out, err)
+    assert_in_out_err(%w(-Eutf-8), 'puts Encoding::default_external', ["UTF-8"])
+    assert_in_out_err(%w(-Ecesu-8), 'puts Encoding::default_external', ["CESU-8"])
+    assert_in_out_err(%w(--encoding utf-8), 'puts Encoding::default_external', ["UTF-8"])
+    assert_in_out_err(%w(--encoding cesu-8), 'puts Encoding::default_external', ["CESU-8"])
   end
 
   def test_syntax_check
-    assert_in_out_err(%w(-c -e a=1+1 -e !a), "", ["Syntax OK"], [])
+    assert_in_out_err(%w(-cw -e a=1+1 -e !a), "", ["Syntax OK"], [])
+    assert_in_out_err(%w(-cw -e break), "", [], [:*, /(-e:1:|~) Invalid break/, :*])
+    assert_in_out_err(%w(-cw -e next), "", [], [:*, /(-e:1:|~) Invalid next/, :*])
+    assert_in_out_err(%w(-cw -e redo), "", [], [:*, /(-e:1:|~) Invalid redo/, :*])
+    assert_in_out_err(%w(-cw -e retry), "", [], [:*, /(-e:1:|~) Invalid retry/, :*])
+    assert_in_out_err(%w(-cw -e yield), "", [], [:*, /(-e:1:|~) Invalid yield/, :*])
+    assert_in_out_err(%w(-cw -e begin -e break -e end), "", [], [:*, /(-e:2:|~) Invalid break/, :*])
+    assert_in_out_err(%w(-cw -e begin -e next -e end), "", [], [:*, /(-e:2:|~) Invalid next/, :*])
+    assert_in_out_err(%w(-cw -e begin -e redo -e end), "", [], [:*, /(-e:2:|~) Invalid redo/, :*])
+    assert_in_out_err(%w(-cw -e begin -e retry -e end), "", [], [:*, /(-e:2:|~) Invalid retry/, :*])
+    assert_in_out_err(%w(-cw -e begin -e yield -e end), "", [], [:*, /(-e:2:|~) Invalid yield/, :*])
+    assert_in_out_err(%w(-cw -e !defined?(break)), "", ["Syntax OK"], [])
+    assert_in_out_err(%w(-cw -e !defined?(next)), "", ["Syntax OK"], [])
+    assert_in_out_err(%w(-cw -e !defined?(redo)), "", ["Syntax OK"], [])
+    assert_in_out_err(%w(-cw -e !defined?(retry)), "", ["Syntax OK"], [])
+    assert_in_out_err(%w(-cw -e !defined?(yield)), "", ["Syntax OK"], [])
+    assert_in_out_err(%w(-n -cw -e break), "", ["Syntax OK"], [])
+    assert_in_out_err(%w(-n -cw -e next), "", ["Syntax OK"], [])
+    assert_in_out_err(%w(-n -cw -e redo), "", ["Syntax OK"], [])
   end
 
   def test_invalid_option
@@ -377,11 +385,15 @@ def test_invalid_option
 
     assert_in_out_err(%W(-\r -e) + [""], "", [], [])
 
-    assert_in_out_err(%W(-\rx), "", [], /invalid option -[\r\n]  \(-h will show valid options\) \(RuntimeError\)/)
+    assert_in_out_err(%W(-\rx), "", [], /invalid option -\\r  \(-h will show valid options\) \(RuntimeError\)/)
 
-    assert_in_out_err(%W(-\x01), "", [], /invalid option -\x01  \(-h will show valid options\) \(RuntimeError\)/)
+    assert_in_out_err(%W(-\x01), "", [], /invalid option -\\x01  \(-h will show valid options\) \(RuntimeError\)/)
 
     assert_in_out_err(%w(-Z), "", [], /invalid option -Z  \(-h will show valid options\) \(RuntimeError\)/)
+
+    assert_in_out_err(%W(-\u{1f608}), "", [],
+                      /invalid option -(\\xf0|\u{1f608})  \(-h will show valid options\) \(RuntimeError\)/,
+                      encoding: Encoding::UTF_8)
   end
 
   def test_rubyopt
@@ -416,13 +428,12 @@ def test_rubyopt
     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'/)
+    assert_in_out_err(%w(), "", [], /unknown warning category: 'qux'/)
+
+    ENV['RUBYOPT'] = 'w'
+    assert_in_out_err(%w(), "p $VERBOSE", ["true"])
   ensure
-    if rubyopt_orig
-      ENV['RUBYOPT'] = rubyopt_orig
-    else
-      ENV.delete('RUBYOPT')
-    end
+    ENV['RUBYOPT'] = rubyopt_orig
   end
 
   def test_search
@@ -512,6 +523,16 @@ def test_sflag
                       /invalid name for global variable - -# \(NameError\)/)
   end
 
+  def test_option_missing_argument
+    assert_in_out_err(%w(-0 --enable), "", [], /missing argument for --enable/)
+    assert_in_out_err(%w(-0 --disable), "", [], /missing argument for --disable/)
+    assert_in_out_err(%w(-0 --dump), "", [], /missing argument for --dump/)
+    assert_in_out_err(%w(-0 --encoding), "", [], /missing argument for --encoding/)
+    assert_in_out_err(%w(-0 --external-encoding), "", [], /missing argument for --external-encoding/)
+    assert_in_out_err(%w(-0 --internal-encoding), "", [], /missing argument for --internal-encoding/)
+    assert_in_out_err(%w(-0 --backtrace-limit), "", [], /missing argument for --backtrace-limit/)
+  end
+
   def test_assignment_in_conditional
     Tempfile.create(["test_ruby_test_rubyoption", ".rb"]) {|t|
       t.puts "if a = 1"
@@ -522,7 +543,7 @@ def test_assignment_in_conditional
       t.puts "  end"
       t.puts "end"
       t.flush
-      warning = ' warning: found `= literal\' in conditional, should be =='
+      warning = ' warning: found \'= literal\' in conditional, should be =='
       err = ["#{t.path}:1:#{warning}",
              "#{t.path}:4:#{warning}",
             ]
@@ -539,16 +560,29 @@ def test_assignment_in_conditional
       t.puts "if a = {}; end"
       t.puts "if a = {1=>2}; end"
       t.puts "if a = {3=>a}; end"
+      t.puts "if a = :sym; end"
       t.flush
       err = ["#{t.path}:1:#{warning}",
              "#{t.path}:2:#{warning}",
              "#{t.path}:3:#{warning}",
              "#{t.path}:5:#{warning}",
              "#{t.path}:6:#{warning}",
+             "#{t.path}:8:#{warning}",
             ]
       feature4299 = '[ruby-dev:43083]'
       assert_in_out_err(["-w", t.path], "", [], err, feature4299)
       assert_in_out_err(["-wr", t.path, "-e", ""], "", [], err, feature4299)
+
+      t.rewind
+      t.truncate(0)
+      t.puts "if a = __LINE__; end"
+      t.puts "if a = __FILE__; end"
+      t.flush
+      err = ["#{t.path}:1:#{warning}",
+             "#{t.path}:2:#{warning}",
+            ]
+      assert_in_out_err(["-w", t.path], "", [], err)
+      assert_in_out_err(["-wr", t.path, "-e", ""], "", [], err)
     }
   end
 
@@ -753,14 +787,22 @@ module SEGVTest
     unless /mswin|mingw/ =~ RUBY_PLATFORM
       opts[:rlimit_core] = 0
     end
+    opts[:failed] = proc do |status, message = "", out = ""|
+      if (sig = status.termsig) && Signal.list["SEGV"] == sig
+        out = ""
+      end
+      Test::Unit::CoreAssertions::FailDesc[status, message]
+    end
     ExecOptions = opts.freeze
 
+    # The regexp list that should match the entire stderr output.
+    # see assert_pattern_list
     ExpectedStderrList = [
       %r(
-        -e:(?:1:)?\s\[BUG\]\sSegmentation\sfault.*\n
+        (?:-e:(?:1:)?\s)?\[BUG\]\sSegmentation\sfault.*\n
       )x,
       %r(
-        #{ Regexp.quote((TestRubyOptions.rjit_enabled? && !JITSupport.rjit_force_enabled?) ? NO_JIT_DESCRIPTION : RUBY_DESCRIPTION) }\n\n
+        #{ Regexp.quote(RUBY_DESCRIPTION) }\n\n
       )x,
       %r(
         (?:--\s(?:.+\n)*\n)?
@@ -771,8 +813,8 @@ module SEGVTest
       %r(
         (?:
         --\sRuby\slevel\sbacktrace\sinformation\s----------------------------------------\n
-        (?:-e:1:in\s\`(?:block\sin\s)?<main>\'\n)*
-        -e:1:in\s\`kill\'\n
+        (?:-e:1:in\s\'(?:block\sin\s)?<main>\'\n)*
+        -e:1:in\s\'kill\'\n
         \n
         )?
       )x,
@@ -795,35 +837,45 @@ module SEGVTest
         )?
       )x,
     ]
+
+    KILL_SELF = "Process.kill :SEGV, $$"
   end
 
-  def assert_segv(args, message=nil)
+  def assert_segv(args, message=nil, list: SEGVTest::ExpectedStderrList, **opt, &block)
     # We want YJIT to be enabled in the subprocess if it's enabled for us
     # so that the Ruby description matches.
+    env = Hash === args.first ? args.shift : {}
     args.unshift("--yjit") if self.class.yjit_enabled?
-    args.unshift({'RUBY_ON_BUG' => nil})
+    env.update({'RUBY_ON_BUG' => nil})
+    # ASAN registers a segv handler which prints out "AddressSanitizer: DEADLYSIGNAL" when
+    # catching sigsegv; we don't expect that output, so suppress it.
+    env.update({'ASAN_OPTIONS' => 'handle_segv=0'})
+    args.unshift(env)
 
     test_stdin = ""
-    opt = SEGVTest::ExecOptions.dup
-    list = SEGVTest::ExpectedStderrList
+    if !block
+      tests = [//, list, message]
+    elsif message
+      tests = [[], [], message]
+    end
 
-    assert_in_out_err(args, test_stdin, //, list, encoding: "ASCII-8BIT", **opt)
+    assert_in_out_err(args, test_stdin, *tests, encoding: "ASCII-8BIT",
+                      **SEGVTest::ExecOptions, **opt, &block)
   end
 
   def test_segv_test
-    assert_segv(["--disable-gems", "-e", "Process.kill :SEGV, $$"])
+    assert_segv(["--disable-gems", "-e", SEGVTest::KILL_SELF])
   end
 
   def test_segv_loaded_features
     bug7402 = '[ruby-core:49573]'
 
-    status = assert_segv(['-e', 'END {Process.kill :SEGV, $$}',
-                          '-e', 'class Bogus; def to_str; exit true; end; end',
-                          '-e', '$".clear',
-                          '-e', '$".unshift Bogus.new',
-                          '-e', '(p $"; abort) unless $".size == 1',
-                         ])
-    assert_not_predicate(status, :success?, "segv but success #{bug7402}")
+    assert_segv(['-e', "END {#{SEGVTest::KILL_SELF}}",
+                 '-e', 'class Bogus; def to_str; exit true; end; end',
+                 '-e', '$".clear',
+                 '-e', '$".unshift Bogus.new',
+                 '-e', '(p $"; abort) unless $".size == 1',
+                ], success: false)
   end
 
   def test_segv_setproctitle
@@ -831,10 +883,64 @@ def test_segv_setproctitle
     Tempfile.create(["test_ruby_test_bug7597", ".rb"]) {|t|
       t.write "f" * 100
       t.flush
-      assert_segv(["--disable-gems", "-e", "$0=ARGV[0]; Process.kill :SEGV, $$", t.path], bug7597)
+      assert_segv(["--disable-gems", "-e", "$0=ARGV[0]; #{SEGVTest::KILL_SELF}", t.path], bug7597)
     }
   end
 
+  def assert_crash_report(path, cmd = nil, &block)
+    Dir.mktmpdir("ruby_crash_report") do |dir|
+      list = SEGVTest::ExpectedStderrList
+      if cmd
+        FileUtils.mkpath(File.join(dir, File.dirname(cmd)))
+        File.write(File.join(dir, cmd), SEGVTest::KILL_SELF+"\n")
+        c = Regexp.quote(cmd)
+        list = list.map {|re| Regexp.new(re.source.gsub(/^\s*(\(\?:)?\K-e(?=:)/) {c}, re.options)}
+      else
+        cmd = ['-e', SEGVTest::KILL_SELF]
+      end
+      status = assert_segv([{"RUBY_CRASH_REPORT"=>path}, *cmd], list: [], chdir: dir, &block)
+      next if block
+      reports = Dir.glob("*.log", File::FNM_DOTMATCH, base: dir)
+      assert_equal(1, reports.size)
+      assert_pattern_list(list, File.read(File.join(dir, reports.first)))
+      break status, reports.first
+    end
+  end
+
+  def test_crash_report
+    status, report = assert_crash_report("%e.%f.%p.log")
+    assert_equal("#{File.basename(EnvUtil.rubybin)}.-e.#{status.pid}.log", report)
+  end
+
+  def test_crash_report_script
+    status, report = assert_crash_report("%e.%f.%p.log", "bug.rb")
+    assert_equal("#{File.basename(EnvUtil.rubybin)}.bug.rb.#{status.pid}.log", report)
+  end
+
+  def test_crash_report_executable_path
+    omit if EnvUtil.rubybin.size > 245
+    status, report = assert_crash_report("%E.%p.log")
+    path = EnvUtil.rubybin.sub(/\A\w\K:[\/\\]/, '!').tr_s('/', '!')
+    assert_equal("#{path}.#{status.pid}.log", report)
+  end
+
+  def test_crash_report_script_path
+    status, report = assert_crash_report("%F.%p.log", "test/bug.rb")
+    assert_equal("test!bug.rb.#{status.pid}.log", report)
+  end
+
+  def test_crash_report_pipe
+    if File.executable?(echo = "/bin/echo")
+    elsif /mswin|ming/ =~ RUBY_PLATFORM
+      echo = "echo"
+    else
+      omit "/bin/echo not found"
+    end
+    assert_crash_report("| #{echo} %e:%f:%p") do |stdin, stdout, status|
+      assert_equal(["#{File.basename(EnvUtil.rubybin)}:-e:#{status.pid}"], stdin)
+    end
+  end
+
   def test_DATA
     Tempfile.create(["test_ruby_test_rubyoption", ".rb"]) {|t|
       t.puts "puts DATA.read.inspect"
@@ -1017,17 +1123,17 @@ def test_pflag_sub
     assert_in_out_err(['-p', '-e', 'sub(/t.*/){"TEST"}'], %[test], %w[TEST], [], bug7157)
   end
 
-  def assert_norun_with_rflag(*opt)
+  def assert_norun_with_rflag(*opt, test_stderr: [])
     bug10435 = "[ruby-dev:48712] [Bug #10435]: should not run with #{opt} option"
     stderr = []
     Tempfile.create(%w"bug10435- .rb") do |script|
       dir, base = File.split(script.path)
       File.write(script, "abort ':run'\n")
       opts = ['-C', dir, '-r', "./#{base}", *opt]
-      _, e = assert_in_out_err([*opts, '-ep'], "", //)
+      _, e = assert_in_out_err([*opts, '-ep'], "", //, test_stderr)
       stderr.concat(e) if e
       stderr << "---"
-      _, e = assert_in_out_err([*opts, base], "", //)
+      _, e = assert_in_out_err([*opts, base], "", //, test_stderr)
       stderr.concat(e) if e
     end
     assert_not_include(stderr, ":run", bug10435)
@@ -1050,6 +1156,17 @@ def test_dump_parsetree_with_rflag
     assert_norun_with_rflag('--dump=parse+error_tolerant')
   end
 
+  def test_dump_parsetree_error_tolerant
+    omit if ParserSupport.prism_enabled_in_subprocess?
+
+    assert_in_out_err(['--dump=parse', '-e', 'begin'],
+                      "", [], /unexpected end-of-input/, success: false)
+    assert_in_out_err(['--dump=parse', '--dump=+error_tolerant', '-e', 'begin'],
+                      "", /^# @/, /unexpected end-of-input/, success: true)
+    assert_in_out_err(['--dump=+error_tolerant', '-e', 'begin p :run'],
+                      "", [], /unexpected end-of-input/, success: false)
+  end
+
   def test_dump_insns_with_rflag
     assert_norun_with_rflag('--dump=insns')
   end
@@ -1083,8 +1200,8 @@ def test_frozen_string_literal_debug
     frozen = [
       ["--enable-frozen-string-literal", true],
       ["--disable-frozen-string-literal", false],
-      [nil, false],
     ]
+
     debugs = [
       ["--debug-frozen-string-literal", true],
       ["--debug=frozen-string-literal", true],
@@ -1106,6 +1223,16 @@ def test_frozen_string_literal_debug
     end
   end
 
+  def test_frozen_string_literal_debug_chilled_strings
+    code = <<~RUBY
+      "foo" << "bar"
+    RUBY
+    assert_in_out_err(["-W:deprecated"], code, [], ["-:1: warning: literal string will be frozen in the future (run with --debug-frozen-string-literal for more information)"])
+    assert_in_out_err(["-W:deprecated", "--debug-frozen-string-literal"], code, [], ["-:1: warning: literal string will be frozen in the future", "-:1: info: the string was created here"])
+    assert_in_out_err(["-W:deprecated", "--disable-frozen-string-literal", "--debug-frozen-string-literal"], code, [], [])
+    assert_in_out_err(["-W:deprecated", "--enable-frozen-string-literal", "--debug-frozen-string-literal"], code, [], ["-:1:in '<main>': can't modify frozen String: \"foo\", created at -:1 (FrozenError)"])
+  end
+
   def test___dir__encoding
     lang = {"LC_ALL"=>ENV["LC_ALL"]||ENV["LANG"]}
     with_tmpchdir do
@@ -1148,4 +1275,14 @@ def test_null_script
     omit "#{IO::NULL} is not a character device" unless File.chardev?(IO::NULL)
     assert_in_out_err([IO::NULL], success: true)
   end
+
+  def test_free_at_exit_env_var
+    env = {"RUBY_FREE_AT_EXIT"=>"1"}
+    assert_ruby_status([env, "-e;"])
+    assert_in_out_err([env, "-W"], "", [], /Free at exit is experimental and may be unstable/)
+  end
+
+  def test_toplevel_ruby
+    assert_instance_of Module, ::Ruby
+  end
 end
diff --git a/test/ruby/test_rubyvm.rb b/test/ruby/test_rubyvm.rb
index d729aa5af8be5f..225cb45f33769f 100644
--- a/test/ruby/test_rubyvm.rb
+++ b/test/ruby/test_rubyvm.rb
@@ -1,5 +1,6 @@
 # frozen_string_literal: false
 require 'test/unit'
+require_relative '../lib/parser_support'
 
 class TestRubyVM < Test::Unit::TestCase
   def test_stat
@@ -32,6 +33,7 @@ def foo
   end
 
   def test_keep_script_lines
+    omit if ParserSupport.prism_enabled?
     pend if ENV['RUBY_ISEQ_DUMP_DEBUG'] # TODO
 
     prev_conf = RubyVM.keep_script_lines
diff --git a/test/set/test_set.rb b/test/ruby/test_set.rb
similarity index 89%
rename from test/set/test_set.rb
rename to test/ruby/test_set.rb
index 49dc58ef7b9bf2..87e1fd8d26e908 100644
--- a/test/set/test_set.rb
+++ b/test/ruby/test_set.rb
@@ -6,6 +6,32 @@ class TC_Set < Test::Unit::TestCase
   class Set2 < Set
   end
 
+  def test_marshal
+    set = Set[1, 2, 3]
+    mset = Marshal.load(Marshal.dump(set))
+    assert_equal(set, mset)
+    assert_equal(set.compare_by_identity?, mset.compare_by_identity?)
+
+    set.compare_by_identity
+    mset = Marshal.load(Marshal.dump(set))
+    assert_equal(set, mset)
+    assert_equal(set.compare_by_identity?, mset.compare_by_identity?)
+
+    set.instance_variable_set(:@a, 1)
+    mset = Marshal.load(Marshal.dump(set))
+    assert_equal(set, mset)
+    assert_equal(set.compare_by_identity?, mset.compare_by_identity?)
+    assert_equal(1, mset.instance_variable_get(:@a))
+
+    old_stdlib_set_data = "\x04\bo:\bSet\x06:\n@hash}\bi\x06Ti\aTi\bTF".b
+    set = Marshal.load(old_stdlib_set_data)
+    assert_equal(Set[1, 2, 3], set)
+
+    old_stdlib_set_cbi_data = "\x04\bo:\bSet\x06:\n@hashC:\tHash}\ai\x06Ti\aTF".b
+    set = Marshal.load(old_stdlib_set_cbi_data)
+    assert_equal(Set[1, 2].compare_by_identity, set)
+  end
+
   def test_aref
     assert_nothing_raised {
       Set[]
@@ -103,6 +129,12 @@ def test_replace
     assert_same(set, ret)
     assert_equal(Set['a','b','c'], set)
 
+    set = Set[1,2]
+    ret = set.replace(Set.new('a'..'c'))
+
+    assert_same(set, ret)
+    assert_equal(Set['a','b','c'], set)
+
     set = Set[1,2]
     assert_raise(ArgumentError) {
       set.replace(3)
@@ -606,6 +638,22 @@ def test_merge
     }
   end
 
+  def test_merge_mutating_hash_bug_21305
+    a = (1..100).to_a
+    o = Object.new
+    o.define_singleton_method(:hash) do
+      a.clear
+      0
+    end
+    a.unshift o
+    assert_equal([o], Set.new.merge(a).to_a)
+  end
+
+  def test_initialize_mutating_array_bug_21306
+    a = (1..100).to_a
+    assert_equal(Set[0], Set.new(a){a.clear; 0})
+  end
+
   def test_subtract
     set = Set[1,2,3]
 
@@ -643,6 +691,11 @@ def test_xor
     ret = set ^ [2,4,5,5]
     assert_not_same(set, ret)
     assert_equal(Set[1,3,5], ret)
+
+    set2 = Set2[1,2,3,4]
+    ret2 = set2 ^ [2,4,5,5]
+    assert_instance_of(Set2, ret2)
+    assert_equal(Set2[1,3,5], ret2)
   end
 
   def test_eq
@@ -728,6 +781,10 @@ def test_divide
     ret.each { |s| n += s.size }
     assert_equal(set.size, n)
     assert_equal(set, ret.flatten)
+
+    set = Set[2,12,9,11,13,4,10,15,3,8,5,0,1,7,14]
+    ret = set.divide { |a,b| (a - b).abs == 1 }
+    assert_equal(2, ret.size)
   end
 
   def test_freeze
@@ -782,24 +839,28 @@ def test_join
 
   def test_inspect
     set1 = Set[1, 2]
-    assert_equal('#<Set: {1, 2}>', set1.inspect)
+    assert_equal('Set[1, 2]', set1.inspect)
 
     set2 = Set[Set[0], 1, 2, set1]
-    assert_equal('#<Set: {#<Set: {0}>, 1, 2, #<Set: {1, 2}>}>', set2.inspect)
+    assert_equal('Set[Set[0], 1, 2, Set[1, 2]]', set2.inspect)
 
     set1.add(set2)
-    assert_equal('#<Set: {#<Set: {0}>, 1, 2, #<Set: {1, 2, #<Set: {...}>}>}>', set2.inspect)
+    assert_equal('Set[Set[0], 1, 2, Set[1, 2, Set[...]]]', set2.inspect)
+
+    c = Class.new(Set)
+    c.set_temporary_name("_MySet")
+    assert_equal('_MySet[1, 2]', c[1, 2].inspect)
   end
 
   def test_to_s
     set1 = Set[1, 2]
-    assert_equal('#<Set: {1, 2}>', set1.to_s)
+    assert_equal('Set[1, 2]', set1.to_s)
 
     set2 = Set[Set[0], 1, 2, set1]
-    assert_equal('#<Set: {#<Set: {0}>, 1, 2, #<Set: {1, 2}>}>', set2.to_s)
+    assert_equal('Set[Set[0], 1, 2, Set[1, 2]]', set2.to_s)
 
     set1.add(set2)
-    assert_equal('#<Set: {#<Set: {0}>, 1, 2, #<Set: {1, 2, #<Set: {...}>}>}>', set2.to_s)
+    assert_equal('Set[Set[0], 1, 2, Set[1, 2, Set[...]]]', set2.to_s)
   end
 
   def test_compare_by_identity
@@ -833,6 +894,22 @@ def test_reset
       assert_equal(klass.new([a]), set, klass.name)
     }
   end
+
+  def test_set_gc_compact_does_not_allocate
+    assert_in_out_err([], <<-"end;", [], [])
+    def x
+      s = Set.new
+      s << Object.new
+      s
+    end
+
+    x
+    begin
+      GC.compact
+    rescue NotImplementedError
+    end
+    end;
+  end
 end
 
 class TC_Enumerable < Test::Unit::TestCase
diff --git a/test/ruby/test_settracefunc.rb b/test/ruby/test_settracefunc.rb
index 3641bd091699d3..fac6dd818533d0 100644
--- a/test/ruby/test_settracefunc.rb
+++ b/test/ruby/test_settracefunc.rb
@@ -1,5 +1,6 @@
 # frozen_string_literal: false
 require 'test/unit'
+EnvUtil.suppress_warning {require 'continuation'}
 
 class TestSetTraceFunc < Test::Unit::TestCase
   def setup
@@ -93,6 +94,22 @@ def test_c_call_removed_method
     assert_equal([[:req]], parameters)
   end
 
+  def test_c_call_aliased_method
+    # [Bug #20915]
+    klass = Class.new do
+      alias_method :new_method, :method
+    end
+
+    instance = klass.new
+    parameters = nil
+
+    TracePoint.new(:c_call) do |tp|
+      parameters = tp.parameters
+    end.enable { instance.new_method(:to_s) }
+
+    assert_equal([[:req]], parameters)
+  end
+
   def test_call
     events = []
     name = "#{self.class}\##{__method__}"
@@ -231,7 +248,9 @@ def test_return # [ruby-dev:38701]
                  events.shift)
     assert_equal(["line", 5, :meth_return, self.class],
                  events.shift)
-    assert_equal(["return", 7, :meth_return, self.class],
+    assert_equal(["line", 6, :meth_return, self.class],
+                 events.shift)
+    assert_equal(["return", 6, :meth_return, self.class],
                  events.shift)
     assert_equal(["line", 10, :test_return, self.class],
                  events.shift)
@@ -270,7 +289,7 @@ def test_return2 # [ruby-core:24463]
                  events.shift)
     assert_equal(["line", 6, :meth_return2, self.class],
                  events.shift)
-    assert_equal(["return", 7, :meth_return2, self.class],
+    assert_equal(["return", 6, :meth_return2, self.class],
                  events.shift)
     assert_equal(["line", 9, :test_return2, self.class],
                  events.shift)
@@ -358,18 +377,18 @@ def test_raise_in_trace
 
   def test_thread_trace
     events = {:set => [], :add => []}
+    name = "#{self.class}\##{__method__}"
     prc = Proc.new { |event, file, lineno, mid, binding, klass|
-      events[:set] << [event, lineno, mid, klass, :set]
+      events[:set] << [event, lineno, mid, klass, :set] if file == name
     }
     prc = prc # suppress warning
     prc2 = Proc.new { |event, file, lineno, mid, binding, klass|
-      events[:add] << [event, lineno, mid, klass, :add]
+      events[:add] << [event, lineno, mid, klass, :add] if file == name
     }
     prc2 = prc2 # suppress warning
 
     th = Thread.new do
       th = Thread.current
-      name = "#{self.class}\##{__method__}"
       eval <<-EOF.gsub(/^.*?: /, ""), nil, name
        1: th.set_trace_func(prc)
        2: th.add_trace_func(prc2)
@@ -453,6 +472,9 @@ def test_remove_in_trace
     bug3921 = '[ruby-dev:42350]'
     ok = false
     func = lambda{|e, f, l, i, b, k|
+      # In parallel testing, unexpected events like IO operations may be traced,
+      # so we filter out events here.
+      next unless f == __FILE__
       set_trace_func(nil)
       ok = eval("self", b)
     }
@@ -504,7 +526,7 @@ def trace_by_tracepoint *trace_events
     1: trace = TracePoint.trace(*trace_events){|tp| next if !target_thread?
     2:   events << [tp.event, tp.lineno, tp.path, _defined_class.(tp), tp.method_id, tp.self, tp.binding&.eval("_local_var"), _get_data.(tp)] if tp.path == 'xyzzy'
     3: }
-    4: 1.times{|;_local_var| _local_var = :inner
+    4: [1].reverse_each{|;_local_var| _local_var = :inner
     5:   tap{}
     6: }
     7: class XYZZY
@@ -531,10 +553,10 @@ def trace_by_tracepoint *trace_events
     answer_events = [
      #
      [:line,     4, 'xyzzy', self.class,  method,           self,        :outer, :nothing],
-     [:c_call,   4, 'xyzzy', Integer,     :times,           1,           nil, :nothing],
+     [:c_call,   4, 'xyzzy', Array,       :reverse_each,    [1],         nil,    :nothing],
      [:line,     4, 'xyzzy', self.class,  method,           self,        nil,    :nothing],
      [:line,     5, 'xyzzy', self.class,  method,           self,        :inner, :nothing],
-     [:c_return, 4, "xyzzy", Integer,     :times,           1,           nil, 1],
+     [:c_return, 4, "xyzzy", Array,       :reverse_each,    [1],         nil, [1]],
      [:line,     7, 'xyzzy', self.class,  method,           self,        :outer, :nothing],
      [:c_call,   7, "xyzzy", Module,      :const_added,     TestSetTraceFunc, nil, :nothing],
      [:c_return, 7, "xyzzy", Module,      :const_added,     TestSetTraceFunc, nil, nil],
@@ -625,6 +647,19 @@ def test_tracepoint_memory_leak
 CODE
   end
 
+  def test_tracepoint_bmethod_memory_leak
+    assert_no_memory_leak([], '', "#{<<~"begin;"}\n#{<<~'end;'}", "[Bug #20194]", rss: true)
+      obj = Object.new
+      obj.define_singleton_method(:foo) {}
+      bmethod = obj.method(:foo)
+      tp = TracePoint.new(:return) {}
+    begin;
+      1_000_000.times do
+        tp.enable(target: bmethod) {}
+      end
+    end;
+  end
+
   def trace_by_set_trace_func
     events = []
     trace = nil
@@ -639,7 +674,7 @@ def trace_by_set_trace_func
     1: set_trace_func(lambda{|event, file, line, id, binding, klass|
     2:   events << [event, line, file, klass, id, binding&.eval('self'), binding&.eval("_local_var")] if file == 'xyzzy'
     3: })
-    4: 1.times{|;_local_var| _local_var = :inner
+    4: [1].map!{|;_local_var| _local_var = :inner
     5:   tap{}
     6: }
     7: class XYZZY
@@ -810,6 +845,9 @@ def test_tracepoint_disable
     args = nil
     trace = TracePoint.trace(:call){|tp|
       next if !target_thread?
+      # In parallel testing, unexpected events like IO operations may be traced,
+      # so we filter out events here.
+      next unless [TracePoint, TestSetTraceFunc].include?(tp.defined_class)
       ary << tp.method_id
     }
     foo
@@ -955,6 +993,55 @@ def test_tracepoint_attr
     assert_equal(expected*2, events)
   end
 
+  def test_tracepoint_struct
+    c = Struct.new(:x) do
+      alias y x
+      alias y= x=
+    end
+    obj = c.new
+
+    ar_meth = obj.method(:x)
+    aw_meth = obj.method(:x=)
+    aar_meth = obj.method(:y)
+    aaw_meth = obj.method(:y=)
+    events = []
+    trace = TracePoint.new(:c_call, :c_return){|tp|
+      next if !target_thread?
+      next if tp.path != __FILE__
+      next if tp.method_id == :call
+      case tp.event
+      when :c_call
+        assert_raise(RuntimeError) {tp.return_value}
+        events << [tp.event, tp.method_id, tp.callee_id]
+      when :c_return
+        events << [tp.event, tp.method_id, tp.callee_id, tp.return_value]
+      end
+    }
+    test_proc = proc do
+      obj.x = 1
+      obj.x
+      obj.y = 2
+      obj.y
+      aw_meth.call(1)
+      ar_meth.call
+      aaw_meth.call(2)
+      aar_meth.call
+    end
+    test_proc.call # populate call caches
+    trace.enable(&test_proc)
+    expected = [
+      [:c_call, :x=, :x=],
+      [:c_return, :x=, :x=, 1],
+      [:c_call, :x, :x],
+      [:c_return, :x, :x, 1],
+      [:c_call, :x=, :y=],
+      [:c_return, :x=, :y=, 2],
+      [:c_call, :x, :y],
+      [:c_return, :x, :y, 2],
+    ]
+    assert_equal(expected*2, events)
+  end
+
   class XYZZYException < Exception; end
   def method_test_tracepoint_raised_exception err
     raise err
@@ -994,7 +1081,7 @@ def test_tracepoint_block
         /return/ =~ tp.event ? tp.return_value : nil
       ]
     }.enable{
-      1.times{
+      [1].map!{
         3
       }
       method_for_test_tracepoint_block{
@@ -1004,10 +1091,10 @@ def test_tracepoint_block
     # pp events
     # expected_events =
     [[:b_call, :test_tracepoint_block, TestSetTraceFunc, TestSetTraceFunc, nil],
-     [:c_call, :times, Integer, Integer, nil],
+     [:c_call, :map!, Array, Array, nil],
      [:b_call, :test_tracepoint_block, TestSetTraceFunc, TestSetTraceFunc, nil],
      [:b_return, :test_tracepoint_block, TestSetTraceFunc, TestSetTraceFunc, 3],
-     [:c_return, :times, Integer, Integer, 1],
+     [:c_return, :map!, Array, Array, [3]],
      [:call, :method_for_test_tracepoint_block, TestSetTraceFunc, TestSetTraceFunc, nil],
      [:b_call, :test_tracepoint_block, TestSetTraceFunc, TestSetTraceFunc, nil],
      [:b_return, :test_tracepoint_block, TestSetTraceFunc, TestSetTraceFunc, 4],
@@ -1061,9 +1148,9 @@ def test_tracepoint_inspect
       when :line
         assert_match(/ in /, str)
       when :call, :c_call
-        assert_match(/call \`/, str) # #<TracePoint:c_call `inherited' ../trunk/test.rb:11>
+        assert_match(/call \'/, str) # #<TracePoint:c_call 'inherited' ../trunk/test.rb:11>
       when :return, :c_return
-        assert_match(/return \`/, str) # #<TracePoint:return `m' ../trunk/test.rb:3>
+        assert_match(/return \'/, str) # #<TracePoint:return 'm' ../trunk/test.rb:3>
       when /thread/
         assert_match(/\#<Thread:/, str) # #<TracePoint:thread_end of #<Thread:0x87076c0>>
       else
@@ -1196,15 +1283,17 @@ def each
       end
     }
     assert_normal_exit src % %q{obj.zip({}) {}}, bug7774
-    assert_normal_exit src % %q{
-      require 'continuation'
-      begin
-        c = nil
-        obj.sort_by {|x| callcc {|c2| c ||= c2 }; x }
-        c.call
-      rescue RuntimeError
-      end
-    }, bug7774
+    if respond_to?(:callcc)
+      assert_normal_exit src % %q{
+        require 'continuation'
+        begin
+          c = nil
+          obj.sort_by {|x| callcc {|c2| c ||= c2 }; x }
+          c.call
+        rescue RuntimeError
+        end
+      }, bug7774
+    end
 
     # TracePoint
     tp_b = nil
@@ -1306,11 +1395,13 @@ def test_isolated_raise_in_trace
 
   def test_a_call
     events = []
+    log = []
     TracePoint.new(:a_call){|tp|
       next if !target_thread?
       events << tp.event
+      log << "| event:#{ tp.event } method_id:#{ tp.method_id } #{ tp.path }:#{ tp.lineno }"
     }.enable{
-      1.times{
+      [1].map!{
         3
       }
       method_for_test_tracepoint_block{
@@ -1323,16 +1414,18 @@ def test_a_call
       :b_call,
       :call,
       :b_call,
-    ], events)
+    ], events, "TracePoint log:\n#{ log.join("\n") }\n")
   end
 
   def test_a_return
     events = []
+    log = []
     TracePoint.new(:a_return){|tp|
       next if !target_thread?
       events << tp.event
+      log << "| event:#{ tp.event } method_id:#{ tp.method_id } #{ tp.path }:#{ tp.lineno }"
     }.enable{
-      1.times{
+      [1].map!{
         3
       }
       method_for_test_tracepoint_block{
@@ -1345,7 +1438,7 @@ def test_a_return
       :b_return,
       :return,
       :b_return
-    ], events)
+    ], events, "TracePoint log:\n#{ log.join("\n") }\n")
   end
 
   def test_const_missing
@@ -1906,7 +1999,7 @@ def m
     TracePoint.new(:c_call, &capture_events).enable{
       c.new
     }
-    assert_equal [:c_call, :itself, :initialize], events[1]
+    assert_equal [:c_call, :itself, :initialize], events[0]
     events.clear
 
     o = Class.new{
@@ -1923,7 +2016,11 @@ def m
 
   def tp_return_value mid
     ary = []
-    TracePoint.new(:return, :b_return){|tp| next if !target_thread?; ary << [tp.event, tp.method_id, tp.return_value]}.enable{
+    TracePoint.new(:return, :b_return){|tp|
+      next if !target_thread?
+      next if tp.path != __FILE__
+      ary << [tp.event, tp.method_id, tp.return_value]
+    }.enable{
       send mid
     }
     ary.pop # last b_return event is not required.
@@ -2132,7 +2229,7 @@ def test_thread_add_trace_func
     q = Thread::Queue.new
     t = Thread.new{
       Thread.current.add_trace_func proc{|ev, file, line, *args|
-        events << [ev, line]
+        events << [ev, line] if file == __FILE__
       } # do not stop trace. They will be stopped at Thread termination.
       q.push 1
       _x = 1
@@ -2168,9 +2265,6 @@ def test_thread_add_trace_func
     }
     # it is dirty hack. usually we shouldn't use such technique
     Thread.pass until t.status == 'sleep'
-    # When RJIT thread exists, t.status becomes 'sleep' even if it does not reach m2t_q.pop.
-    # This sleep forces it to reach m2t_q.pop for --jit-wait.
-    sleep 1 if defined?(RubyVM::RJIT) && RubyVM::RJIT.enabled?
 
     t.add_trace_func proc{|ev, file, line, *args|
       if file == __FILE__
@@ -2229,7 +2323,7 @@ def method_for_enable_target2
     _c = a + b
   end
 
-  def check_with_events *trace_events
+  def check_with_events(trace_point_events, expected_events = trace_point_events)
     all_events = [[:call, :method_for_enable_target1],
                   [:line, :method_for_enable_target1],
                   [:line, :method_for_enable_target1],
@@ -2251,7 +2345,7 @@ def check_with_events *trace_events
                   [:return, :method_for_enable_target1],
                  ]
     events = []
-    TracePoint.new(*trace_events) do |tp|
+    TracePoint.new(*trace_point_events) do |tp|
       next unless target_thread?
       events << [tp.event, tp.method_id]
     end.enable(target: method(:method_for_enable_target1)) do
@@ -2259,15 +2353,22 @@ def check_with_events *trace_events
       method_for_enable_target2
       method_for_enable_target1
     end
-    assert_equal all_events.find_all{|(ev)| trace_events.include? ev}, events
+
+    assert_equal all_events.keep_if { |(ev)| expected_events.include? ev }, events
   end
 
   def test_tracepoint_enable_target
-    check_with_events :line
-    check_with_events :call, :return
-    check_with_events :line, :call, :return
-    check_with_events :call, :return, :b_call, :b_return
-    check_with_events :line, :call, :return, :b_call, :b_return
+    check_with_events([:line])
+    check_with_events([:call, :return])
+    check_with_events([:line, :call, :return])
+    check_with_events([:call, :return, :b_call, :b_return])
+    check_with_events([:line, :call, :return, :b_call, :b_return])
+
+    # No arguments passed into TracePoint.new enables all ISEQ_TRACE_EVENTS
+    check_with_events([], [:line, :class, :end, :call, :return, :c_call, :c_return, :b_call, :b_return, :rescue])
+
+    # Raise event should be ignored
+    check_with_events([:line, :raise])
   end
 
   def test_tracepoint_nested_enabled_with_target
@@ -2406,6 +2507,18 @@ def test_tracepoint_enable_with_target_line_two_times
     assert_equal [:tp1, 1, 2, :tp2, 3], events
   end
 
+  def test_multiple_enable
+    ary = []
+    trace = TracePoint.new(:call) do |tp|
+      ary << tp.method_id
+    end
+    trace.enable
+    trace.enable
+    foo
+    trace.disable
+    assert_equal(1, ary.count(:foo), '[Bug #19114]')
+  end
+
   def test_multiple_tracepoints_same_bmethod
     events = []
     tp1 = TracePoint.new(:return) do |tp|
@@ -2796,4 +2909,52 @@ def test_tp_rescue_event
     assert err.kind_of?(RuntimeError)
     assert_equal err.message.to_i + 3, line
   end
+
+  def test_tracepoint_thread_begin
+    target_thread = nil
+
+    trace = TracePoint.new(:thread_begin) do |tp|
+      target_thread = tp.self
+    end
+
+    trace.enable(target_thread: nil) do
+      Thread.new{}.join
+    end
+
+    assert_kind_of(Thread, target_thread)
+  end
+
+  def test_tracepoint_thread_end
+    target_thread = nil
+
+    trace = TracePoint.new(:thread_end) do |tp|
+      target_thread = tp.self
+    end
+
+    trace.enable(target_thread: nil) do
+      Thread.new{}.join
+    end
+
+    assert_kind_of(Thread, target_thread)
+  end
+
+  def test_tracepoint_thread_end_with_exception
+    target_thread = nil
+
+    trace = TracePoint.new(:thread_end) do |tp|
+      target_thread = tp.self
+    end
+
+    trace.enable(target_thread: nil) do
+      thread = Thread.new do
+        Thread.current.report_on_exception = false
+        raise
+      end
+
+      # Ignore the exception raised by the thread:
+      thread.join rescue nil
+    end
+
+    assert_kind_of(Thread, target_thread)
+  end
 end
diff --git a/test/ruby/test_shapes.rb b/test/ruby/test_shapes.rb
index ebc94a12d22425..a4cf23c6d5ae89 100644
--- a/test/ruby/test_shapes.rb
+++ b/test/ruby/test_shapes.rb
@@ -5,6 +5,8 @@
 
 # These test the functionality of object shapes
 class TestShapes < Test::Unit::TestCase
+  MANY_IVS = 80
+
   class IVOrder
     def expected_ivs
       %w{ @a @b @c @d @e @f @g @h @i @j @k }
@@ -90,15 +92,18 @@ def write_iv
   # RubyVM::Shape.of returns new instances of shape objects for
   # each call. This helper method allows us to define equality for
   # shapes
-  def assert_shape_equal(shape1, shape2)
-    assert_equal(shape1.id, shape2.id)
-    assert_equal(shape1.parent_id, shape2.parent_id)
-    assert_equal(shape1.depth, shape2.depth)
-    assert_equal(shape1.type, shape2.type)
+  def assert_shape_equal(e, a)
+    assert_equal(
+      {id: e.id, parent_id: e.parent_id, depth: e.depth, type: e.type},
+      {id: a.id, parent_id: a.parent_id, depth: a.depth, type: a.type},
+    )
   end
 
-  def refute_shape_equal(shape1, shape2)
-    refute_equal(shape1.id, shape2.id)
+  def refute_shape_equal(e, a)
+    refute_equal(
+      {id: e.id, parent_id: e.parent_id, depth: e.depth, type: e.type},
+      {id: a.id, parent_id: a.parent_id, depth: a.depth, type: a.type},
+    )
   end
 
   def test_iv_order_correct_on_complex_objects
@@ -126,19 +131,25 @@ def test_ordered_alloc_is_not_complex
   end
 
   def test_too_many_ivs_on_obj
-    obj = Object.new
+    assert_separately([], "#{<<~"begin;"}\n#{<<~'end;'}")
+    begin;
+      class Hi; end
 
-    (RubyVM::Shape::SHAPE_MAX_NUM_IVS + 1).times do
-      obj.instance_variable_set(:"@a#{_1}", 1)
-    end
+      RubyVM::Shape.exhaust_shapes(2)
 
-    assert_predicate RubyVM::Shape.of(obj), :too_complex?
+      obj = Hi.new
+      obj.instance_variable_set(:@b, 1)
+      obj.instance_variable_set(:@c, 1)
+      obj.instance_variable_set(:@d, 1)
+
+      assert_predicate RubyVM::Shape.of(obj), :too_complex?
+    end;
   end
 
   def test_too_many_ivs_on_class
     obj = Class.new
 
-    (RubyVM::Shape::SHAPE_MAX_NUM_IVS + 1).times do
+    (MANY_IVS + 1).times do
       obj.instance_variable_set(:"@a#{_1}", 1)
     end
 
@@ -148,10 +159,10 @@ def test_too_many_ivs_on_class
   def test_removing_when_too_many_ivs_on_class
     obj = Class.new
 
-    (RubyVM::Shape::SHAPE_MAX_NUM_IVS + 2).times do
+    (MANY_IVS + 2).times do
       obj.instance_variable_set(:"@a#{_1}", 1)
     end
-    (RubyVM::Shape::SHAPE_MAX_NUM_IVS + 2).times do
+    (MANY_IVS + 2).times do
       obj.remove_instance_variable(:"@a#{_1}")
     end
 
@@ -161,16 +172,416 @@ def test_removing_when_too_many_ivs_on_class
   def test_removing_when_too_many_ivs_on_module
     obj = Module.new
 
-    (RubyVM::Shape::SHAPE_MAX_NUM_IVS + 2).times do
+    (MANY_IVS + 2).times do
       obj.instance_variable_set(:"@a#{_1}", 1)
     end
-    (RubyVM::Shape::SHAPE_MAX_NUM_IVS + 2).times do
+    (MANY_IVS + 2).times do
       obj.remove_instance_variable(:"@a#{_1}")
     end
 
     assert_empty obj.instance_variables
   end
 
+  def test_too_complex_geniv
+    assert_separately([], "#{<<~"begin;"}\n#{<<~'end;'}")
+    begin;
+      class TooComplex < Hash
+        attr_reader :very_unique
+      end
+
+      RubyVM::Shape.exhaust_shapes
+
+      (RubyVM::Shape::SHAPE_MAX_VARIATIONS * 2).times do
+        TooComplex.new.instance_variable_set(:"@unique_#{_1}", 1)
+      end
+
+      tc = TooComplex.new
+      tc.instance_variable_set(:@very_unique, 3)
+      tc.instance_variable_set(:@very_unique2, 4)
+      assert_equal 3, tc.instance_variable_get(:@very_unique)
+      assert_equal 4, tc.instance_variable_get(:@very_unique2)
+
+      assert_equal [:@very_unique, :@very_unique2], tc.instance_variables
+    end;
+  end
+
+  def test_use_all_shapes_then_freeze
+    assert_separately([], "#{<<~"begin;"}\n#{<<~'end;'}")
+    begin;
+      class Hi; end
+      RubyVM::Shape.exhaust_shapes(3)
+
+      obj = Hi.new
+      i = 0
+      while RubyVM::Shape.shapes_available > 0
+        obj.instance_variable_set(:"@b#{i}", 1)
+        i += 1
+      end
+      obj.freeze
+
+      assert obj.frozen?
+    end;
+  end
+
+  def test_run_out_of_shape_for_object
+    assert_separately([], "#{<<~"begin;"}\n#{<<~'end;'}")
+    begin;
+      class A
+        def initialize
+          @a = 1
+        end
+      end
+      RubyVM::Shape.exhaust_shapes
+
+      A.new
+    end;
+  end
+
+  def test_run_out_of_shape_for_class_ivar
+    assert_separately([], "#{<<~"begin;"}\n#{<<~'end;'}")
+    begin;
+      RubyVM::Shape.exhaust_shapes
+
+      c = Class.new
+      c.instance_variable_set(:@a, 1)
+      assert_equal(1, c.instance_variable_get(:@a))
+
+      c.remove_instance_variable(:@a)
+      assert_nil(c.instance_variable_get(:@a))
+
+      assert_raise(NameError) do
+        c.remove_instance_variable(:@a)
+      end
+    end;
+  end
+
+  def test_evacuate_class_ivar_and_compaction
+    assert_separately([], "#{<<~"begin;"}\n#{<<~'end;'}")
+    begin;
+      count = 20
+
+      c = Class.new
+      count.times do |ivar|
+        c.instance_variable_set("@i#{ivar}", "ivar-#{ivar}")
+      end
+
+      RubyVM::Shape.exhaust_shapes
+
+      GC.auto_compact = true
+      GC.stress = true
+      # Cause evacuation
+      c.instance_variable_set(:@a, o = Object.new)
+      assert_equal(o, c.instance_variable_get(:@a))
+      GC.stress = false
+
+      count.times do |ivar|
+        assert_equal "ivar-#{ivar}", c.instance_variable_get("@i#{ivar}")
+      end
+    end;
+  end
+
+  def test_evacuate_generic_ivar_and_compaction
+    assert_separately([], "#{<<~"begin;"}\n#{<<~'end;'}")
+    begin;
+      count = 20
+
+      c = Hash.new
+      count.times do |ivar|
+        c.instance_variable_set("@i#{ivar}", "ivar-#{ivar}")
+      end
+
+      RubyVM::Shape.exhaust_shapes
+
+      GC.auto_compact = true
+      GC.stress = true
+
+      # Cause evacuation
+      c.instance_variable_set(:@a, o = Object.new)
+      assert_equal(o, c.instance_variable_get(:@a))
+
+      GC.stress = false
+
+      count.times do |ivar|
+        assert_equal "ivar-#{ivar}", c.instance_variable_get("@i#{ivar}")
+      end
+    end;
+  end
+
+  def test_evacuate_object_ivar_and_compaction
+    assert_separately([], "#{<<~"begin;"}\n#{<<~'end;'}")
+    begin;
+      count = 20
+
+      c = Object.new
+      count.times do |ivar|
+        c.instance_variable_set("@i#{ivar}", "ivar-#{ivar}")
+      end
+
+      RubyVM::Shape.exhaust_shapes
+
+      GC.auto_compact = true
+      GC.stress = true
+
+      # Cause evacuation
+      c.instance_variable_set(:@a, o = Object.new)
+      assert_equal(o, c.instance_variable_get(:@a))
+
+      GC.stress = false
+
+      count.times do |ivar|
+        assert_equal "ivar-#{ivar}", c.instance_variable_get("@i#{ivar}")
+      end
+    end;
+  end
+
+  def test_gc_stress_during_evacuate_generic_ivar
+    assert_separately([], "#{<<~"begin;"}\n#{<<~'end;'}")
+    begin;
+      [].instance_variable_set(:@a, 1)
+
+      RubyVM::Shape.exhaust_shapes
+
+      ary = 10.times.map { [] }
+
+      GC.stress = true
+      ary.each do |o|
+        o.instance_variable_set(:@a, 1)
+        o.instance_variable_set(:@b, 1)
+      end
+    end;
+  end
+
+  def test_run_out_of_shape_for_module_ivar
+    assert_separately([], "#{<<~"begin;"}\n#{<<~'end;'}")
+    begin;
+      RubyVM::Shape.exhaust_shapes
+
+      module Foo
+        @a = 1
+        @b = 2
+        assert_equal 1, @a
+        assert_equal 2, @b
+      end
+    end;
+  end
+
+  def test_run_out_of_shape_for_class_cvar
+    assert_separately([], "#{<<~"begin;"}\n#{<<~'end;'}")
+    begin;
+      RubyVM::Shape.exhaust_shapes
+
+      c = Class.new
+
+      c.class_variable_set(:@@a, 1)
+      assert_equal(1, c.class_variable_get(:@@a))
+
+      c.class_eval { remove_class_variable(:@@a) }
+      assert_false(c.class_variable_defined?(:@@a))
+
+      assert_raise(NameError) do
+        c.class_eval { remove_class_variable(:@@a) }
+      end
+    end;
+  end
+
+  def test_run_out_of_shape_generic_instance_variable_set
+    assert_separately([], "#{<<~"begin;"}\n#{<<~'end;'}")
+    begin;
+      class TooComplex < Hash
+      end
+
+      RubyVM::Shape.exhaust_shapes
+
+      tc = TooComplex.new
+      tc.instance_variable_set(:@a, 1)
+      tc.instance_variable_set(:@b, 2)
+
+      tc.remove_instance_variable(:@a)
+      assert_nil(tc.instance_variable_get(:@a))
+
+      assert_raise(NameError) do
+        tc.remove_instance_variable(:@a)
+      end
+    end;
+  end
+
+  def test_run_out_of_shape_generic_ivar_set
+    assert_separately([], "#{<<~"begin;"}\n#{<<~'end;'}")
+    begin;
+      class Hi < String
+        def initialize
+          8.times do |i|
+            instance_variable_set("@ivar_#{i}", i)
+          end
+        end
+
+        def transition
+          @hi_transition ||= 1
+        end
+      end
+
+      a = Hi.new
+
+      # Try to run out of shapes
+      RubyVM::Shape.exhaust_shapes
+
+      assert_equal 1, a.transition
+      assert_equal 1, a.transition
+    end;
+  end
+
+  def test_run_out_of_shape_instance_variable_defined
+    assert_separately([], "#{<<~"begin;"}\n#{<<~'end;'}")
+    begin;
+      class A
+        attr_reader :a, :b, :c, :d
+        def initialize
+          @a = @b = @c = @d = 1
+        end
+      end
+
+      RubyVM::Shape.exhaust_shapes
+
+      a = A.new
+      assert_equal true, a.instance_variable_defined?(:@a)
+    end;
+  end
+
+  def test_run_out_of_shape_instance_variable_defined_on_module
+    assert_separately([], "#{<<~"begin;"}\n#{<<~'end;'}")
+    begin;
+      RubyVM::Shape.exhaust_shapes
+
+      module A
+        @a = @b = @c = @d = 1
+      end
+
+      assert_equal true, A.instance_variable_defined?(:@a)
+    end;
+  end
+
+  def test_run_out_of_shape_during_remove_instance_variable
+    assert_separately([], "#{<<~"begin;"}\n#{<<~'end;'}")
+    begin;
+      o = Object.new
+      10.times { |i| o.instance_variable_set(:"@a#{i}", i) }
+
+      RubyVM::Shape.exhaust_shapes
+
+      o.remove_instance_variable(:@a0)
+      (1...10).each do |i|
+        assert_equal(i, o.instance_variable_get(:"@a#{i}"))
+      end
+    end;
+  end
+
+  def test_run_out_of_shape_remove_instance_variable
+    assert_separately([], "#{<<~"begin;"}\n#{<<~'end;'}")
+    begin;
+      class A
+        attr_reader :a, :b, :c, :d
+        def initialize
+          @a = @b = @c = @d = 1
+        end
+      end
+
+      a = A.new
+
+      RubyVM::Shape.exhaust_shapes
+
+      a.remove_instance_variable(:@b)
+      assert_nil a.b
+
+      a.remove_instance_variable(:@a)
+      assert_nil a.a
+
+      a.remove_instance_variable(:@c)
+      assert_nil a.c
+
+      assert_equal 1, a.d
+    end;
+  end
+
+  def test_run_out_of_shape_rb_obj_copy_ivar
+    assert_separately([], "#{<<~"begin;"}\n#{<<~'end;'}")
+    begin;
+      class A
+        def initialize
+          init # Avoid right sizing
+        end
+
+        def init
+          @a = @b = @c = @d = @e = @f = 1
+        end
+      end
+
+      a = A.new
+
+      RubyVM::Shape.exhaust_shapes
+
+      a.dup
+    end;
+  end
+
+  def test_evacuate_generic_ivar_memory_leak
+    assert_no_memory_leak([], "#{<<~'begin;'}", "#{<<~'end;'}", rss: true)
+      o = []
+      o.instance_variable_set(:@a, 1)
+
+      RubyVM::Shape.exhaust_shapes
+
+      ary = 1_000_000.times.map { [] }
+    begin;
+      ary.each do |o|
+        o.instance_variable_set(:@a, 1)
+        o.instance_variable_set(:@b, 1)
+      end
+      ary.clear
+      ary = nil
+      GC.start
+    end;
+  end
+
+  def test_use_all_shapes_module
+    assert_separately([], "#{<<~"begin;"}\n#{<<~'end;'}")
+    begin;
+      class Hi; end
+
+      RubyVM::Shape.exhaust_shapes(2)
+
+      obj = Module.new
+      3.times do
+        obj.instance_variable_set(:"@a#{_1}", _1)
+      end
+
+      ivs = 3.times.map do
+        obj.instance_variable_get(:"@a#{_1}")
+      end
+
+      assert_equal [0, 1, 2], ivs
+    end;
+  end
+
+  def test_complex_freeze_after_clone
+    assert_separately([], "#{<<~"begin;"}\n#{<<~'end;'}")
+    begin;
+      class Hi; end
+
+      RubyVM::Shape.exhaust_shapes(2)
+
+      obj = Object.new
+      i = 0
+      while RubyVM::Shape.shapes_available > 0
+        obj.instance_variable_set(:"@b#{i}", i)
+        i += 1
+      end
+
+      v = obj.clone(freeze: true)
+      assert_predicate v, :frozen?
+      assert_equal 0, v.instance_variable_get(:@b0)
+    end;
+  end
+
   def test_too_complex_ractor
     assert_separately([], "#{<<~"begin;"}\n#{<<~'end;'}")
     begin;
@@ -188,8 +599,8 @@ class TooComplex
 
       assert_predicate RubyVM::Shape.of(tc), :too_complex?
       assert_equal 3, tc.very_unique
-      assert_equal 3, Ractor.new(tc) { |x| Ractor.yield(x.very_unique) }.take
-      assert_equal tc.instance_variables.sort, Ractor.new(tc) { |x| Ractor.yield(x.instance_variables) }.take.sort
+      assert_equal 3, Ractor.new(tc) { |x| x.very_unique }.value
+      assert_equal tc.instance_variables.sort, Ractor.new(tc) { |x| x.instance_variables }.value.sort
     end;
   end
 
@@ -214,6 +625,125 @@ class TooComplex
     end;
   end
 
+  def test_too_complex_and_frozen
+    assert_separately([], "#{<<~"begin;"}\n#{<<~'end;'}")
+    begin;
+      $VERBOSE = nil
+      class TooComplex
+        attr_reader :very_unique
+      end
+
+      RubyVM::Shape::SHAPE_MAX_VARIATIONS.times do
+        TooComplex.new.instance_variable_set(:"@unique_#{_1}", Object.new)
+      end
+
+      tc = TooComplex.new
+      tc.instance_variable_set(:"@very_unique", 3)
+
+      shape = RubyVM::Shape.of(tc)
+      assert_predicate shape, :too_complex?
+      refute_predicate shape, :shape_frozen?
+      tc.freeze
+      frozen_shape = RubyVM::Shape.of(tc)
+      refute_equal shape.id, frozen_shape.id
+      assert_predicate frozen_shape, :too_complex?
+      assert_predicate frozen_shape, :shape_frozen?
+
+      assert_equal 3, tc.very_unique
+      assert_equal 3, Ractor.make_shareable(tc).very_unique
+    end;
+  end
+
+  def test_object_id_transition_too_complex
+    assert_separately([], "#{<<~"begin;"}\n#{<<~'end;'}")
+    begin;
+      class Hi; end
+      obj = Hi.new
+      obj.instance_variable_set(:@a, 1)
+      obj.instance_variable_set(:@b, 2)
+      old_id = obj.object_id
+
+      RubyVM::Shape.exhaust_shapes
+      obj.remove_instance_variable(:@a)
+
+      assert_equal old_id, obj.object_id
+    end;
+  end
+
+  def test_too_complex_and_frozen_and_object_id
+    assert_separately([], "#{<<~"begin;"}\n#{<<~'end;'}")
+    begin;
+      $VERBOSE = nil
+      class TooComplex
+        attr_reader :very_unique
+      end
+
+      RubyVM::Shape::SHAPE_MAX_VARIATIONS.times do
+        TooComplex.new.instance_variable_set(:"@unique_#{_1}", Object.new)
+      end
+
+      tc = TooComplex.new
+      tc.instance_variable_set(:"@very_unique", 3)
+
+      shape = RubyVM::Shape.of(tc)
+      assert_predicate shape, :too_complex?
+      refute_predicate shape, :shape_frozen?
+      tc.freeze
+      frozen_shape = RubyVM::Shape.of(tc)
+      refute_equal shape.id, frozen_shape.id
+      assert_predicate frozen_shape, :too_complex?
+      assert_predicate frozen_shape, :shape_frozen?
+      refute_predicate frozen_shape, :has_object_id?
+
+      assert_equal tc.object_id, tc.object_id
+
+      id_shape = RubyVM::Shape.of(tc)
+      refute_equal frozen_shape.id, id_shape.id
+      assert_predicate id_shape, :too_complex?
+      assert_predicate id_shape, :has_object_id?
+      assert_predicate id_shape, :shape_frozen?
+
+      assert_equal 3, tc.very_unique
+      assert_equal 3, Ractor.make_shareable(tc).very_unique
+    end;
+  end
+
+  def test_too_complex_obj_ivar_ractor_share
+    assert_separately([], "#{<<~"begin;"}\n#{<<~'end;'}")
+    begin;
+      $VERBOSE = nil
+
+      RubyVM::Shape.exhaust_shapes
+
+      r = Ractor.new do
+        o = Object.new
+        o.instance_variable_set(:@a, "hello")
+        o
+      end
+
+      o = r.value
+      assert_equal "hello", o.instance_variable_get(:@a)
+    end;
+  end
+
+  def test_too_complex_generic_ivar_ractor_share
+    assert_separately([], "#{<<~"begin;"}\n#{<<~'end;'}")
+    begin;
+      $VERBOSE = nil
+
+      RubyVM::Shape.exhaust_shapes
+
+      r = Ractor.new do
+        o = []
+        o.instance_variable_set(:@a, "hello")
+        o
+      end
+
+      o = r.value
+      assert_equal "hello", o.instance_variable_get(:@a)
+    end;
+  end
+
   def test_read_iv_after_complex
     ensure_complex
 
@@ -277,9 +807,42 @@ def test_delete_iv_after_complex
     assert_equal 3, tc.a3_m # make sure IV is initialized
     assert tc.instance_variable_defined?(:@a3)
     tc.remove_instance_variable(:@a3)
+    refute tc.instance_variable_defined?(:@a3)
     assert_nil tc.a3
   end
 
+  def test_delete_iv_after_complex_and_object_id
+    ensure_complex
+
+    tc = TooComplex.new
+    tc.send("a#{RubyVM::Shape::SHAPE_MAX_VARIATIONS}_m")
+    assert_predicate RubyVM::Shape.of(tc), :too_complex?
+
+    assert_equal 3, tc.a3_m # make sure IV is initialized
+    assert tc.instance_variable_defined?(:@a3)
+    tc.object_id
+    tc.remove_instance_variable(:@a3)
+    refute tc.instance_variable_defined?(:@a3)
+    assert_nil tc.a3
+  end
+
+  def test_delete_iv_after_complex_and_freeze
+    ensure_complex
+
+    tc = TooComplex.new
+    tc.send("a#{RubyVM::Shape::SHAPE_MAX_VARIATIONS}_m")
+    assert_predicate RubyVM::Shape.of(tc), :too_complex?
+
+    assert_equal 3, tc.a3_m # make sure IV is initialized
+    assert tc.instance_variable_defined?(:@a3)
+    tc.freeze
+    assert_raise FrozenError do
+      tc.remove_instance_variable(:@a3)
+    end
+    assert tc.instance_variable_defined?(:@a3)
+    assert_equal 3, tc.a3
+  end
+
   def test_delete_undefined_after_complex
     ensure_complex
 
@@ -294,6 +857,86 @@ def test_delete_undefined_after_complex
     assert_nil tc.a3
   end
 
+  def test_remove_instance_variable
+    ivars_count = 5
+    object = Object.new
+    ivars_count.times do |i|
+      object.instance_variable_set("@ivar_#{i}", i)
+    end
+
+    ivars = ivars_count.times.map do |i|
+      object.instance_variable_get("@ivar_#{i}")
+    end
+    assert_equal [0, 1, 2, 3, 4], ivars
+
+    object.remove_instance_variable(:@ivar_2)
+
+    ivars = ivars_count.times.map do |i|
+      object.instance_variable_get("@ivar_#{i}")
+    end
+    assert_equal [0, 1, nil, 3, 4], ivars
+  end
+
+  def test_remove_instance_variable_when_out_of_shapes
+    assert_separately([], "#{<<~"begin;"}\n#{<<~'end;'}")
+    begin;
+      ivars_count = 5
+      object = Object.new
+      ivars_count.times do |i|
+        object.instance_variable_set("@ivar_#{i}", i)
+      end
+
+      ivars = ivars_count.times.map do |i|
+        object.instance_variable_get("@ivar_#{i}")
+      end
+      assert_equal [0, 1, 2, 3, 4], ivars
+
+      RubyVM::Shape.exhaust_shapes
+
+      object.remove_instance_variable(:@ivar_2)
+
+      ivars = ivars_count.times.map do |i|
+        object.instance_variable_get("@ivar_#{i}")
+      end
+      assert_equal [0, 1, nil, 3, 4], ivars
+    end;
+  end
+
+  def test_remove_instance_variable_capacity_transition
+    assert_separately([], "#{<<~"begin;"}\n#{<<~'end;'}")
+    begin;
+
+      # a does not transition in capacity
+      a = Class.new.new
+      root_shape = RubyVM::Shape.of(a)
+
+      assert_equal(RubyVM::Shape::SHAPE_ROOT, root_shape.type)
+      initial_capacity = root_shape.capacity
+      refute_equal(0, initial_capacity)
+
+      initial_capacity.times do |i|
+        a.instance_variable_set(:"@ivar#{i + 1}", i)
+      end
+
+      # b transitions in capacity
+      b = Class.new.new
+      (initial_capacity + 1).times do |i|
+        b.instance_variable_set(:"@ivar#{i}", i)
+      end
+
+      assert_operator(RubyVM::Shape.of(a).capacity, :<, RubyVM::Shape.of(b).capacity)
+
+      # b will now have the same tree as a
+      b.remove_instance_variable(:@ivar0)
+
+      a.instance_variable_set(:@foo, 1)
+      a.instance_variable_set(:@bar, 1)
+
+      # Check that there is no heap corruption
+      GC.verify_internal_consistency
+    end;
+  end
+
   def test_freeze_after_complex
     ensure_complex
 
@@ -302,6 +945,8 @@ def test_freeze_after_complex
     assert_predicate RubyVM::Shape.of(tc), :too_complex?
     tc.freeze
     assert_raise(FrozenError) { tc.a3_m }
+    # doesn't transition to frozen shape in this case
+    assert_predicate RubyVM::Shape.of(tc), :too_complex?
   end
 
   def test_read_undefined_iv_after_complex
@@ -311,6 +956,7 @@ def test_read_undefined_iv_after_complex
     tc.send("a#{RubyVM::Shape::SHAPE_MAX_VARIATIONS}_m")
     assert_predicate RubyVM::Shape.of(tc), :too_complex?
     assert_equal nil, tc.iv_not_defined
+    assert_predicate RubyVM::Shape.of(tc), :too_complex?
   end
 
   def test_shape_order
@@ -327,13 +973,13 @@ def test_shape_order
   def test_iv_index
     example = RemoveAndAdd.new
     initial_shape = RubyVM::Shape.of(example)
-    assert_equal 0, initial_shape.next_iv_index
+    assert_equal 0, initial_shape.next_field_index
 
     example.add_foo # makes a transition
     add_foo_shape = RubyVM::Shape.of(example)
     assert_equal([:@foo], example.instance_variables)
-    assert_equal(initial_shape.id, add_foo_shape.parent.id)
-    assert_equal(1, add_foo_shape.next_iv_index)
+    assert_equal(initial_shape.raw_id, add_foo_shape.parent.raw_id)
+    assert_equal(1, add_foo_shape.next_field_index)
 
     example.remove_foo # makes a transition
     remove_foo_shape = RubyVM::Shape.of(example)
@@ -343,8 +989,8 @@ def test_iv_index
     example.add_bar # makes a transition
     bar_shape = RubyVM::Shape.of(example)
     assert_equal([:@bar], example.instance_variables)
-    assert_equal(initial_shape.id, bar_shape.parent_id)
-    assert_equal(1, bar_shape.next_iv_index)
+    assert_equal(initial_shape.raw_id, bar_shape.parent_id)
+    assert_equal(1, bar_shape.next_field_index)
   end
 
   def test_remove_then_add_again
@@ -361,7 +1007,10 @@ def test_remove_then_add_again
   class TestObject; end
 
   def test_new_obj_has_t_object_shape
-    assert_shape_equal(RubyVM::Shape.root_shape, RubyVM::Shape.of(TestObject.new).parent)
+    obj = TestObject.new
+    shape = RubyVM::Shape.of(obj)
+    assert_equal RubyVM::Shape::SHAPE_ROOT, shape.type
+    assert_nil shape.parent
   end
 
   def test_str_has_root_shape
@@ -372,14 +1021,6 @@ def test_array_has_root_shape
     assert_shape_equal(RubyVM::Shape.root_shape, RubyVM::Shape.of([]))
   end
 
-  def test_hash_has_correct_pool_shape
-    omit "SHAPE_IN_BASIC_FLAGS == 0" unless RbConfig::SIZEOF["uint64_t"] <= RbConfig::SIZEOF["void*"]
-
-    # All hashes are now allocated their own ar_table, so start in a
-    # larger pool, and have already transitioned once.
-    assert_shape_equal(RubyVM::Shape.root_shape, RubyVM::Shape.of({}).parent)
-  end
-
   def test_true_has_special_const_shape_id
     assert_equal(RubyVM::Shape::SPECIAL_CONST_SHAPE_ID, RubyVM::Shape.of(true).id)
   end
@@ -388,8 +1029,11 @@ def test_nil_has_special_const_shape_id
     assert_equal(RubyVM::Shape::SPECIAL_CONST_SHAPE_ID, RubyVM::Shape.of(nil).id)
   end
 
+  def test_root_shape_transition_to_special_const_on_frozen
+    assert_equal(RubyVM::Shape::SPECIAL_CONST_SHAPE_ID, RubyVM::Shape.of([].freeze).id)
+  end
+
   def test_basic_shape_transition
-    omit "Failing with RJIT for some reason" if defined?(RubyVM::RJIT) && RubyVM::RJIT.enabled?
     obj = Example.new
     shape = RubyVM::Shape.of(obj)
     refute_equal(RubyVM::Shape.root_shape, shape)
@@ -397,11 +1041,10 @@ def test_basic_shape_transition
     assert_equal RubyVM::Shape::SHAPE_IVAR, shape.type
 
     shape = shape.parent
-    assert_equal RubyVM::Shape::SHAPE_T_OBJECT, shape.type
+    assert_equal RubyVM::Shape::SHAPE_ROOT, shape.type
+    assert_nil shape.parent
 
-    shape = shape.parent
-    assert_equal(RubyVM::Shape.root_shape.id, shape.id)
-    assert_equal(obj.instance_variable_get(:@a), 1)
+    assert_equal(1, obj.instance_variable_get(:@a))
   end
 
   def test_different_objects_make_same_transition
@@ -418,13 +1061,27 @@ def test_duplicating_objects
     assert_shape_equal(RubyVM::Shape.of(obj), RubyVM::Shape.of(obj2))
   end
 
+  def test_duplicating_too_complex_objects_memory_leak
+    assert_no_memory_leak([], "#{<<~'begin;'}", "#{<<~'end;'}", "[Bug #20162]", rss: true)
+      RubyVM::Shape.exhaust_shapes
+
+      o = Object.new
+      o.instance_variable_set(:@a, 0)
+    begin;
+      1_000_000.times do
+        o.dup
+      end
+    end;
+  end
+
   def test_freezing_and_duplicating_object
     obj = Object.new.freeze
+    assert_predicate(RubyVM::Shape.of(obj), :shape_frozen?)
+
+    # dup'd objects shouldn't be frozen
     obj2 = obj.dup
     refute_predicate(obj2, :frozen?)
-    # dup'd objects shouldn't be frozen, and the shape should be the
-    # parent shape of the copied object
-    assert_equal(RubyVM::Shape.of(obj).parent.id, RubyVM::Shape.of(obj2).id)
+    refute_predicate(RubyVM::Shape.of(obj2), :shape_frozen?)
   end
 
   def test_freezing_and_duplicating_object_with_ivars
@@ -441,6 +1098,7 @@ def test_freezing_and_duplicating_string_with_ivars
     str.freeze
     str2 = str.dup
     refute_predicate(str2, :frozen?)
+
     refute_equal(RubyVM::Shape.of(str).id, RubyVM::Shape.of(str2).id)
     assert_equal(str2.instance_variable_get(:@a), 1)
   end
@@ -452,6 +1110,14 @@ def test_freezing_and_cloning_objects
     assert_shape_equal(RubyVM::Shape.of(obj), RubyVM::Shape.of(obj2))
   end
 
+  def test_cloning_with_freeze_option
+    obj = Object.new
+    obj2 = obj.clone(freeze: true)
+    assert_predicate(obj2, :frozen?)
+    refute_shape_equal(RubyVM::Shape.of(obj), RubyVM::Shape.of(obj2))
+    assert_predicate(RubyVM::Shape.of(obj2), :shape_frozen?)
+  end
+
   def test_freezing_and_cloning_object_with_ivars
     obj = Example.new.freeze
     obj2 = obj.clone(freeze: true)
@@ -461,7 +1127,7 @@ def test_freezing_and_cloning_object_with_ivars
   end
 
   def test_freezing_and_cloning_string
-    str = "str".freeze
+    str = ("str" + "str").freeze
     str2 = str.clone(freeze: true)
     assert_predicate(str2, :frozen?)
     assert_shape_equal(RubyVM::Shape.of(str), RubyVM::Shape.of(str2))
diff --git a/test/ruby/test_signal.rb b/test/ruby/test_signal.rb
index 7877a35129dc2e..a2bdf02b88522f 100644
--- a/test/ruby/test_signal.rb
+++ b/test/ruby/test_signal.rb
@@ -310,17 +310,25 @@ def test_signal_list_dedupe_keys
   end
 
   def test_self_stop
-    assert_ruby_status([], <<-'end;')
-      begin
-        fork{
-          sleep 1
-          Process.kill(:CONT, Process.ppid)
-        }
-        Process.kill(:STOP, Process.pid)
-      rescue NotImplementedError
-        # ok
-      end
-    end;
+    omit unless Process.respond_to?(:fork)
+    omit unless defined?(Process::WUNTRACED)
+
+    # Make a process that stops itself
+    child_pid = fork do
+      Process.kill(:STOP, Process.pid)
+    end
+
+    # The parent should be notified about the stop
+    _, status = Process.waitpid2(child_pid, Process::WUNTRACED)
+    assert status.stopped?
+
+    # It can be continued
+    Process.kill(:CONT, child_pid)
+
+    # And the child then runs to completion
+    _, status = Process.waitpid2(child_pid)
+    assert status.exited?
+    assert status.success?
   end
 
   def test_sigwait_fd_unused
diff --git a/test/ruby/test_sleep.rb b/test/ruby/test_sleep.rb
index 61002b8b1872d4..991b73ebd50757 100644
--- a/test/ruby/test_sleep.rb
+++ b/test/ruby/test_sleep.rb
@@ -4,14 +4,13 @@
 
 class TestSleep < Test::Unit::TestCase
   def test_sleep_5sec
-    GC.disable
-    start = Process.clock_gettime(Process::CLOCK_MONOTONIC)
-    sleep 5
-    slept = Process.clock_gettime(Process::CLOCK_MONOTONIC) - start
-    bottom = 5.0
-    assert_operator(slept, :>=, bottom)
-    assert_operator(slept, :<=, 6.0, "[ruby-core:18015]: longer than expected")
-  ensure
-    GC.enable
+    EnvUtil.without_gc do
+      start = Process.clock_gettime(Process::CLOCK_MONOTONIC)
+      sleep 5
+      slept = Process.clock_gettime(Process::CLOCK_MONOTONIC) - start
+      bottom = 5.0
+      assert_operator(slept, :>=, bottom)
+      assert_operator(slept, :<=, 6.0, "[ruby-core:18015]: longer than expected")
+    end
   end
 end
diff --git a/test/ruby/test_sprintf.rb b/test/ruby/test_sprintf.rb
index c453ecd350b9b4..1c7e89c2651a9d 100644
--- a/test/ruby/test_sprintf.rb
+++ b/test/ruby/test_sprintf.rb
@@ -227,6 +227,10 @@ def test_rational
 
     bug11766 = '[ruby-core:71806] [Bug #11766]'
     assert_equal("x"*10+"     1.0", sprintf("x"*10+"%8.1f", 1r), bug11766)
+
+    require 'rbconfig/sizeof'
+    fmin, fmax = RbConfig::LIMITS.values_at("FIXNUM_MIN", "FIXNUM_MAX")
+    assert_match(/\A-\d+\.\d+\z/, sprintf("%f", Rational(fmin, fmax)))
   end
 
   def test_rational_precision
@@ -235,7 +239,7 @@ def test_rational_precision
 
   def test_hash
     options = {:capture=>/\d+/}
-    assert_equal("with options {:capture=>/\\d+/}", sprintf("with options %p" % options))
+    assert_equal("with options #{options.inspect}", sprintf("with options %p" % options))
   end
 
   def test_inspect
@@ -266,8 +270,8 @@ def test_invalid
     # Specifying the precision multiple times with negative star arguments:
     assert_raise(ArgumentError, "[ruby-core:11570]") {sprintf("%.*.*.*.*f", -1, -1, -1, 5, 1)}
 
-    # Null bytes after percent signs are removed:
-    assert_equal("%\0x hello", sprintf("%\0x hello"), "[ruby-core:11571]")
+    assert_raise(ArgumentError) {sprintf("%\0x hello")}
+    assert_raise(ArgumentError) {sprintf("%\nx hello")}
 
     assert_raise(ArgumentError, "[ruby-core:11573]") {sprintf("%.25555555555555555555555555555555555555s", "hello")}
 
@@ -279,10 +283,9 @@ def test_invalid
     assert_raise_with_message(ArgumentError, /unnumbered\(1\) mixed with numbered/) { sprintf("%1$*d", 3) }
     assert_raise_with_message(ArgumentError, /unnumbered\(1\) mixed with numbered/) { sprintf("%1$.*d", 3) }
 
-    verbose, $VERBOSE = $VERBOSE, nil
-    assert_nothing_raised { sprintf("", 1) }
-  ensure
-    $VERBOSE = verbose
+    assert_warning(/too many arguments/) do
+      sprintf("", 1)
+    end
   end
 
   def test_float
@@ -543,4 +546,12 @@ def test_negative_width_overflow
       sprintf("%*s", RbConfig::LIMITS["INT_MIN"], "")
     end
   end
+
+  def test_binary_format_coderange
+    1.upto(500) do |i|
+      str = sprintf("%*s".b, i, "\xe2".b)
+      refute_predicate str, :ascii_only?
+      assert_equal i, str.bytesize
+    end
+  end
 end
diff --git a/test/ruby/test_string.rb b/test/ruby/test_string.rb
index 22bec09855f8c4..138756eac5fd61 100644
--- a/test/ruby/test_string.rb
+++ b/test/ruby/test_string.rb
@@ -9,9 +9,6 @@ class TestString < Test::Unit::TestCase
 
   def initialize(*args)
     @cls = String
-    @aref_re_nth = true
-    @aref_re_silent = false
-    @aref_slicebang_silent = true
     super
   end
 
@@ -80,6 +77,13 @@ def test_initialize
     assert_equal("mystring", str.__send__(:initialize, "mystring", capacity: 1000))
     str = S("mystring")
     assert_equal("mystring", str.__send__(:initialize, str, capacity: 1000))
+
+    if @cls == String
+      100.times {
+        "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa".
+          __send__(:initialize, capacity: -1)
+      }
+    end
   end
 
   def test_initialize_shared
@@ -146,14 +150,12 @@ def test_AREF # '[]'
     assert_equal(nil,      S("FooBar")[S("xyzzy")])
     assert_equal(nil,      S("FooBar")[S("plugh")])
 
-    if @aref_re_nth
-      assert_equal(S("Foo"), S("FooBar")[/([A-Z]..)([A-Z]..)/, 1])
-      assert_equal(S("Bar"), S("FooBar")[/([A-Z]..)([A-Z]..)/, 2])
-      assert_equal(nil,      S("FooBar")[/([A-Z]..)([A-Z]..)/, 3])
-      assert_equal(S("Bar"), S("FooBar")[/([A-Z]..)([A-Z]..)/, -1])
-      assert_equal(S("Foo"), S("FooBar")[/([A-Z]..)([A-Z]..)/, -2])
-      assert_equal(nil,      S("FooBar")[/([A-Z]..)([A-Z]..)/, -3])
-    end
+    assert_equal(S("Foo"), S("FooBar")[/([A-Z]..)([A-Z]..)/, 1])
+    assert_equal(S("Bar"), S("FooBar")[/([A-Z]..)([A-Z]..)/, 2])
+    assert_equal(nil,      S("FooBar")[/([A-Z]..)([A-Z]..)/, 3])
+    assert_equal(S("Bar"), S("FooBar")[/([A-Z]..)([A-Z]..)/, -1])
+    assert_equal(S("Foo"), S("FooBar")[/([A-Z]..)([A-Z]..)/, -2])
+    assert_equal(nil,      S("FooBar")[/([A-Z]..)([A-Z]..)/, -3])
 
     o = Object.new
     def o.to_int; 2; end
@@ -162,6 +164,15 @@ def o.to_int; 2; end
     assert_raise(ArgumentError) { "foo"[] }
   end
 
+  def test_AREF_underflow
+    require "rbconfig/sizeof"
+    assert_equal(nil, S("\u{3042 3044 3046}")[RbConfig::LIMITS["LONG_MIN"], 1])
+  end
+
+  def test_AREF_invalid_encoding
+    assert_equal(S("\x80"), S("A"*39+"\x80")[-1, 1])
+  end
+
   def test_ASET # '[]='
     s = S("FooBar")
     s[0] = S('A')
@@ -199,24 +210,18 @@ def test_ASET # '[]='
     assert_equal(S("BarBar"), s)
     s[/..r$/] = S("Foo")
     assert_equal(S("BarFoo"), s)
-    if @aref_re_silent
-      s[/xyzzy/] = S("None")
-      assert_equal(S("BarFoo"), s)
-    else
-      assert_raise(IndexError) { s[/xyzzy/] = S("None") }
-    end
-    if @aref_re_nth
-      s[/([A-Z]..)([A-Z]..)/, 1] = S("Foo")
-      assert_equal(S("FooFoo"), s)
-      s[/([A-Z]..)([A-Z]..)/, 2] = S("Bar")
-      assert_equal(S("FooBar"), s)
-      assert_raise(IndexError) { s[/([A-Z]..)([A-Z]..)/, 3] = "None" }
-      s[/([A-Z]..)([A-Z]..)/, -1] = S("Foo")
-      assert_equal(S("FooFoo"), s)
-      s[/([A-Z]..)([A-Z]..)/, -2] = S("Bar")
-      assert_equal(S("BarFoo"), s)
-      assert_raise(IndexError) { s[/([A-Z]..)([A-Z]..)/, -3] = "None" }
-    end
+    assert_raise(IndexError) { s[/xyzzy/] = S("None") }
+
+    s[/([A-Z]..)([A-Z]..)/, 1] = S("Foo")
+    assert_equal(S("FooFoo"), s)
+    s[/([A-Z]..)([A-Z]..)/, 2] = S("Bar")
+    assert_equal(S("FooBar"), s)
+    assert_raise(IndexError) { s[/([A-Z]..)([A-Z]..)/, 3] = "None" }
+    s[/([A-Z]..)([A-Z]..)/, -1] = S("Foo")
+    assert_equal(S("FooFoo"), s)
+    s[/([A-Z]..)([A-Z]..)/, -2] = S("Bar")
+    assert_equal(S("BarFoo"), s)
+    assert_raise(IndexError) { s[/([A-Z]..)([A-Z]..)/, -3] = "None" }
 
     s = S("FooBar")
     s[S("Foo")] = S("Bar")
@@ -301,6 +306,9 @@ def test_LSHIFT # '<<'
     assert_raise(RangeError, bug) {S("a".force_encoding(Encoding::UTF_8)) << -1}
     assert_raise(RangeError, bug) {S("a".force_encoding(Encoding::UTF_8)) << 0x81308130}
     assert_nothing_raised {S("a".force_encoding(Encoding::GB18030)) << 0x81308130}
+
+    s = "\x95".force_encoding(Encoding::SJIS).tap(&:valid_encoding?)
+    assert_predicate(s << 0x5c, :valid_encoding?)
   end
 
   def test_MATCH # '=~'
@@ -587,6 +595,8 @@ def o.to_str
     assert_equal("foo", s.chomp!("\n"))
     s = "foo\r"
     assert_equal("foo", s.chomp!("\n"))
+
+    assert_raise(ArgumentError) {String.new.chomp!("", "")}
   ensure
     $/ = save
     $VERBOSE = verbose
@@ -661,8 +671,8 @@ def test_concat_literals
     assert_equal(Encoding::UTF_8, "#{s}x".encoding)
   end
 
-  def test_string_interpolations_across_size_pools_get_embedded
-    omit if GC::INTERNAL_CONSTANTS[:SIZE_POOL_COUNT] == 1
+  def test_string_interpolations_across_heaps_get_embedded
+    omit if GC::INTERNAL_CONSTANTS[:HEAP_COUNT] == 1
 
     require 'objspace'
     base_slot_size = GC::INTERNAL_CONSTANTS[:BASE_SLOT_SIZE]
@@ -896,6 +906,18 @@ def test_undump
     }
   end
 
+  def test_undump_gc_compact_stress
+    omit "compaction doesn't work well on s390x" if RUBY_PLATFORM =~ /s390x/ # https://github.com/ruby/ruby/pull/5077
+    a = S("Test") << 1 << 2 << 3 << 9 << 13 << 10
+    EnvUtil.under_gc_compact_stress do
+      assert_equal(a, S('"Test\\x01\\x02\\x03\\t\\r\\n"').undump)
+    end
+
+    EnvUtil.under_gc_compact_stress do
+      assert_equal(S("\u{ABCDE 10ABCD}"), S('"\\u{ABCDE 10ABCD}"').undump)
+    end
+  end
+
   def test_dup
     for frozen in [ false, true ]
       a = S("hello")
@@ -1095,6 +1117,22 @@ def test_grapheme_clusters
     assert_equal("C", res[2])
   end
 
+  def test_grapheme_clusters_memory_leak
+    assert_no_memory_leak([], "", "#{<<~"begin;"}\n#{<<~'end;'}", "[Bug #todo]", rss: true)
+    begin;
+      str = "hello world".encode(Encoding::UTF_32LE)
+
+      10_000.times do
+        str.grapheme_clusters
+      end
+    end;
+  end
+
+  def test_byteslice_grapheme_clusters
+    string = "안녕"
+    assert_equal(["안"], string.byteslice(0,4).grapheme_clusters)
+  end
+
   def test_each_line
     verbose, $VERBOSE = $VERBOSE, nil
 
@@ -1249,6 +1287,11 @@ def test_gsub
     assert_raise(ArgumentError) { S("foo").gsub }
   end
 
+  def test_gsub_gc_compact_stress
+    omit "compaction doesn't work well on s390x" if RUBY_PLATFORM =~ /s390x/ # https://github.com/ruby/ruby/pull/5077
+    EnvUtil.under_gc_compact_stress { assert_equal(S("h<e>ll<o>"), S("hello").gsub(/([aeiou])/, S('<\1>'))) }
+  end
+
   def test_gsub_encoding
     a = S("hello world")
     a.force_encoding Encoding::UTF_8
@@ -1292,6 +1335,15 @@ def test_gsub!
     assert_nil(a.sub!(S('X'), S('Y')))
   end
 
+  def test_gsub_bang_gc_compact_stress
+    omit "compaction doesn't work well on s390x" if RUBY_PLATFORM =~ /s390x/ # https://github.com/ruby/ruby/pull/5077
+    EnvUtil.under_gc_compact_stress do
+      a = S("hello")
+      a.gsub!(/([aeiou])/, S('<\1>'))
+      assert_equal(S("h<e>ll<o>"), a)
+    end
+  end
+
   def test_sub_hash
     assert_equal('azc', S('abc').sub(/b/, "b" => "z"))
     assert_equal('ac', S('abc').sub(/b/, {}))
@@ -1319,6 +1371,9 @@ def test_hash
     assert_not_equal(S("a").hash, S("a\0").hash, bug4104)
     bug9172 = '[ruby-core:58658] [Bug #9172]'
     assert_not_equal(S("sub-setter").hash, S("discover").hash, bug9172)
+    assert_equal(S("").hash, S("".encode(Encoding::UTF_32BE)).hash)
+    h1, h2 = ["\x80", "\x81"].map {|c| c.b.hash ^ c.hash}
+    assert_not_equal(h1, h2)
   end
 
   def test_hex
@@ -1622,6 +1677,11 @@ def test_scan
     assert_equal(%w[1 2 3], S("a1 a2 a3").scan(/a\K./))
   end
 
+  def test_scan_gc_compact_stress
+    omit "compaction doesn't work well on s390x" if RUBY_PLATFORM =~ /s390x/ # https://github.com/ruby/ruby/pull/5077
+    EnvUtil.under_gc_compact_stress { assert_equal([["1a"], ["2b"], ["3c"]], S("1a2b3c").scan(/(\d.)/)) }
+  end
+
   def test_scan_segv
     bug19159 = '[Bug #19159]'
     assert_nothing_raised(Exception, bug19159) do
@@ -1682,20 +1742,11 @@ def test_slice!
     assert_equal(S("FooBa"), a)
 
     a = S("FooBar")
-    if @aref_slicebang_silent
-      assert_nil( a.slice!(6) )
-      assert_nil( a.slice!(6r) )
-    else
-      assert_raise(IndexError) { a.slice!(6) }
-      assert_raise(IndexError) { a.slice!(6r) }
-    end
+    assert_nil( a.slice!(6) )
+    assert_nil( a.slice!(6r) )
     assert_equal(S("FooBar"), a)
 
-    if @aref_slicebang_silent
-      assert_nil( a.slice!(-7) )
-    else
-      assert_raise(IndexError) { a.slice!(-7) }
-    end
+    assert_nil( a.slice!(-7) )
     assert_equal(S("FooBar"), a)
 
     a = S("FooBar")
@@ -1707,17 +1758,9 @@ def test_slice!
     assert_equal(S("Foo"), a)
 
     a=S("FooBar")
-    if @aref_slicebang_silent
     assert_nil(a.slice!(7,2))      # Maybe should be six?
-    else
-    assert_raise(IndexError) {a.slice!(7,2)}     # Maybe should be six?
-    end
     assert_equal(S("FooBar"), a)
-    if @aref_slicebang_silent
     assert_nil(a.slice!(-7,10))
-    else
-    assert_raise(IndexError) {a.slice!(-7,10)}
-    end
     assert_equal(S("FooBar"), a)
 
     a=S("FooBar")
@@ -1729,17 +1772,9 @@ def test_slice!
     assert_equal(S("Foo"), a)
 
     a=S("FooBar")
-    if @aref_slicebang_silent
     assert_equal(S(""), a.slice!(6..2))
-    else
-    assert_raise(RangeError) {a.slice!(6..2)}
-    end
     assert_equal(S("FooBar"), a)
-    if @aref_slicebang_silent
     assert_nil(a.slice!(-10..-7))
-    else
-    assert_raise(RangeError) {a.slice!(-10..-7)}
-    end
     assert_equal(S("FooBar"), a)
 
     a=S("FooBar")
@@ -1751,17 +1786,9 @@ def test_slice!
     assert_equal(S("Foo"), a)
 
     a=S("FooBar")
-    if @aref_slicebang_silent
-      assert_nil(a.slice!(/xyzzy/))
-    else
-      assert_raise(IndexError) {a.slice!(/xyzzy/)}
-    end
+    assert_nil(a.slice!(/xyzzy/))
     assert_equal(S("FooBar"), a)
-    if @aref_slicebang_silent
-      assert_nil(a.slice!(/plugh/))
-    else
-      assert_raise(IndexError) {a.slice!(/plugh/)}
-    end
+    assert_nil(a.slice!(/plugh/))
     assert_equal(S("FooBar"), a)
 
     a=S("FooBar")
@@ -1842,6 +1869,13 @@ def test_split_with_block
 
     result = []; S("aaa,bbb,ccc,ddd").split(/,/) {|s| result << s.gsub(/./, "A")}
     assert_equal(["AAA"]*4, result)
+
+    s = S("abc ") * 20
+    assert_raise(RuntimeError) {
+      10.times do
+        s.split {s.prepend("xxx" * 100)}
+      end
+    }
   ensure
     EnvUtil.suppress_warning {$; = fs}
   end
@@ -1953,6 +1987,22 @@ def test_start_with_regexp
     assert_nil($&)
   end
 
+  def test_start_with_timeout_memory_leak
+    assert_no_memory_leak([], "#{<<~"begin;"}", "#{<<~'end;'}", "[Bug #20653]", rss: true)
+      regex = Regexp.new("^#{"(a*)" * 10_000}x$", timeout: 0.000001)
+      str = "a" * 1_000_000 + "x"
+
+      code = proc do
+        str.start_with?(regex)
+      rescue
+      end
+
+      10.times(&code)
+    begin;
+      1_000.times(&code)
+    end;
+  end
+
   def test_strip
     assert_equal(S("x"), S("      x        ").strip)
     assert_equal(S("x"), S(" \n\r\t     x  \t\r\n\n      ").strip)
@@ -2049,6 +2099,16 @@ def o.to_s; self; end
     }
   end
 
+  def test_sub_gc_compact_stress
+    omit "compaction doesn't work well on s390x" if RUBY_PLATFORM =~ /s390x/ # https://github.com/ruby/ruby/pull/5077
+    EnvUtil.under_gc_compact_stress do
+      m = /&(?<foo>.*?);/.match(S("aaa &amp; yyy"))
+      assert_equal("amp", m["foo"])
+
+      assert_equal("aaa [amp] yyy", S("aaa &amp; yyy").sub(/&(?<foo>.*?);/, S('[\k<foo>]')))
+    end
+  end
+
   def test_sub!
     a = S("hello")
     b = a.dup
@@ -3328,7 +3388,11 @@ def test_uplus_minus
     assert_same(str, +str)
     assert_not_same(str, -str)
 
-    str = "bar".freeze
+    require 'objspace'
+
+    str = "test_uplus_minus_str".freeze
+    assert_includes ObjectSpace.dump(str), '"fstring":true'
+
     assert_predicate(str, :frozen?)
     assert_not_predicate(+str, :frozen?)
     assert_predicate(-str, :frozen?)
@@ -3336,8 +3400,14 @@ def test_uplus_minus
     assert_not_same(str, +str)
     assert_same(str, -str)
 
-    bar = %w(b a r).join('')
-    assert_same(str, -bar, "uminus deduplicates [Feature #13077]")
+    bar = -%w(test uplus minus str).join('_')
+    assert_same(str, bar, "uminus deduplicates [Feature #13077] str: #{ObjectSpace.dump(str)} bar: #{ObjectSpace.dump(bar)}")
+  end
+
+  def test_uminus_dedup_in_place
+    dynamic = "this string is unique and frozen #{rand}".freeze
+    assert_same dynamic, -dynamic
+    assert_same dynamic, -dynamic.dup
   end
 
   def test_uminus_frozen
@@ -3582,6 +3652,104 @@ def test_bytesplice
     assert_bytesplice_raise(ArgumentError, S("hello"), 0..-1, "bye", 0, 3)
   end
 
+  def test_append_bytes_into_binary
+    buf = S("".b)
+    assert_equal Encoding::BINARY, buf.encoding
+
+    buf.append_as_bytes(S("hello"))
+    assert_equal "hello".b, buf
+    assert_equal Encoding::BINARY, buf.encoding
+
+    buf.append_as_bytes(S("こんにちは"))
+    assert_equal S("helloこんにちは".b), buf
+    assert_equal Encoding::BINARY, buf.encoding
+  end
+
+  def test_append_bytes_into_utf8
+    buf = S("")
+    assert_equal Encoding::UTF_8, buf.encoding
+
+    buf.append_as_bytes(S("hello"))
+    assert_equal S("hello"), buf
+    assert_equal Encoding::UTF_8, buf.encoding
+    assert_predicate buf, :ascii_only?
+    assert_predicate buf, :valid_encoding?
+
+    buf.append_as_bytes(S("こんにちは"))
+    assert_equal S("helloこんにちは"), buf
+    assert_equal Encoding::UTF_8, buf.encoding
+    refute_predicate buf, :ascii_only?
+    assert_predicate buf, :valid_encoding?
+
+    buf.append_as_bytes(S("\xE2\x82".b))
+    assert_equal S("helloこんにちは\xE2\x82"), buf
+    assert_equal Encoding::UTF_8, buf.encoding
+    refute_predicate buf, :valid_encoding?
+
+    buf.append_as_bytes(S("\xAC".b))
+    assert_equal S("helloこんにちは€"), buf
+    assert_equal Encoding::UTF_8, buf.encoding
+    assert_predicate buf, :valid_encoding?
+  end
+
+  def test_append_bytes_into_utf32
+    buf = S("abc".encode(Encoding::UTF_32LE))
+    assert_equal Encoding::UTF_32LE, buf.encoding
+
+    buf.append_as_bytes("def")
+    assert_equal Encoding::UTF_32LE, buf.encoding
+    refute_predicate buf, :valid_encoding?
+  end
+
+  def test_chilled_string
+    chilled_string = eval('"chilled"')
+
+    assert_not_predicate chilled_string, :frozen?
+
+    assert_not_predicate chilled_string.dup, :frozen?
+    assert_not_predicate chilled_string.clone, :frozen?
+
+    # @+ treat the original string as frozen
+    assert_not_predicate(+chilled_string, :frozen?)
+    assert_not_same chilled_string, +chilled_string
+
+    # @- treat the original string as mutable
+    assert_predicate(-chilled_string, :frozen?)
+    assert_not_same chilled_string, -chilled_string
+  end
+
+  def test_chilled_string_setivar
+    deprecated = Warning[:deprecated]
+    Warning[:deprecated] = false
+
+    String.class_eval <<~RUBY, __FILE__, __LINE__ + 1
+      def setivar!
+        @ivar = 42
+        @ivar
+      end
+    RUBY
+    chilled_string = eval('"chilled"')
+    begin
+      assert_equal 42, chilled_string.setivar!
+    ensure
+      String.undef_method(:setivar!)
+    end
+  ensure
+    Warning[:deprecated] = deprecated
+  end
+
+  def test_chilled_string_substring
+    deprecated = Warning[:deprecated]
+    Warning[:deprecated] = false
+    chilled_string = eval('"a chilled string."')
+    substring = chilled_string[0..-1]
+    assert_equal("a chilled string.", substring)
+    chilled_string[0..-1] = "This string is defrosted."
+    assert_equal("a chilled string.", substring)
+  ensure
+    Warning[:deprecated] = deprecated
+  end
+
   private
 
   def assert_bytesplice_result(expected, s, *args)
diff --git a/test/ruby/test_string_memory.rb b/test/ruby/test_string_memory.rb
index 3b4694f36fb77e..a93a3bd54afcea 100644
--- a/test/ruby/test_string_memory.rb
+++ b/test/ruby/test_string_memory.rb
@@ -6,21 +6,31 @@ class TestStringMemory < Test::Unit::TestCase
   def capture_allocations(klass)
     allocations = []
 
-    GC.start
-    GC.disable
-    generation = GC.count
+    EnvUtil.without_gc do
+      GC.start
+      generation = GC.count
 
-    ObjectSpace.trace_object_allocations do
-      yield
+      ObjectSpace.trace_object_allocations do
+        yield
 
-      ObjectSpace.each_object(klass) do |instance|
-        allocations << instance if ObjectSpace.allocation_generation(instance) == generation
+        ObjectSpace.each_object(klass) do |instance|
+          allocations << instance if ObjectSpace.allocation_generation(instance) == generation
+        end
       end
-    end
 
-    return allocations
-  ensure
-    GC.enable
+      return allocations.map do |instance|
+        [
+          ObjectSpace.allocation_sourcefile(instance),
+          ObjectSpace.allocation_sourceline(instance),
+          instance.class,
+          instance,
+        ]
+      end.select do |path,|
+        # drop strings not created in this file
+        # (the parallel testing framework may create strings in a separate thread)
+        path == __FILE__
+      end
+    end
   end
 
   def test_byteslice_prefix
@@ -30,7 +40,7 @@ def test_byteslice_prefix
       string.byteslice(0, 50_000)
     end
 
-    assert_equal 1, allocations.size
+    assert_equal 1, allocations.size, "One object allocation is expected, but allocated: #{ allocations.inspect }"
   end
 
   def test_byteslice_postfix
@@ -40,7 +50,7 @@ def test_byteslice_postfix
       string.byteslice(50_000, 100_000)
     end
 
-    assert_equal 1, allocations.size
+    assert_equal 1, allocations.size, "One object allocation is expected, but allocated: #{ allocations.inspect }"
   end
 
   def test_byteslice_postfix_twice
@@ -50,6 +60,6 @@ def test_byteslice_postfix_twice
       string.byteslice(50_000, 100_000).byteslice(25_000, 50_000)
     end
 
-    assert_equal 2, allocations.size
+    assert_equal 2, allocations.size, "Two object allocations are expected, but allocated: #{ allocations.inspect }"
   end
 end
diff --git a/test/ruby/test_struct.rb b/test/ruby/test_struct.rb
index ed750b91f7b1ef..db591c306e556e 100644
--- a/test/ruby/test_struct.rb
+++ b/test/ruby/test_struct.rb
@@ -534,6 +534,28 @@ def test_parameters
     assert_equal [[:req, :_]], klass.instance_method(:c=).parameters
   end
 
+  def test_named_structs_are_not_rooted
+    omit 'skip on riscv64-linux CI machine. See https://github.com/ruby/ruby/pull/13422' if ENV['RUBY_DEBUG'] == 'ci' && /riscv64-linux/ =~ RUBY_DESCRIPTION
+
+    # [Bug #20311]
+    assert_no_memory_leak([], <<~PREP, <<~CODE, rss: true)
+      code = proc do
+        Struct.new("A")
+        Struct.send(:remove_const, :A)
+      end
+
+      1_000.times(&code)
+    PREP
+      50_000.times(&code)
+    CODE
+  end
+
+  def test_frozen_subclass
+    test = Class.new(@Struct.new(:a)).freeze.new(a: 0)
+    assert_kind_of(@Struct, test)
+    assert_equal([:a], test.members)
+  end
+
   class TopStruct < Test::Unit::TestCase
     include TestStruct
 
diff --git a/test/ruby/test_super.rb b/test/ruby/test_super.rb
index 6a575b88c5174d..8e973b0f7f4a08 100644
--- a/test/ruby/test_super.rb
+++ b/test/ruby/test_super.rb
@@ -8,6 +8,7 @@ def double(a, b) [a,b] end
     def array(*a) a end
     def optional(a = 0) a end
     def keyword(**a) a end
+    def forward(*a) a end
   end
   class Single1 < Base
     def single(*) super end
@@ -63,6 +64,16 @@ def keyword(foo: "keyword2")
       [x, y]
     end
   end
+  class Forward < Base
+    def forward(...)
+      w = super()
+      x = super
+      y = super(...)
+      a = 1
+      z = super(a, ...)
+      [w, x, y, z]
+    end
+  end
 
   def test_single1
     assert_equal(1, Single1.new.single(1))
@@ -133,6 +144,11 @@ def test_keyword1
   def test_keyword2
     assert_equal([{foo: "changed1"}, {foo: "changed2"}], Keyword2.new.keyword)
   end
+  def test_forwardable(...)
+    assert_equal([[],[],[],[1]], Forward.new.forward())
+    assert_equal([[],[1,2],[1,2],[1,1,2]], Forward.new.forward(1,2))
+    assert_equal([[],[:test],[:test],[1,:test]], Forward.new.forward(:test, ...))
+  end
 
   class A
     def tt(aa)
@@ -558,6 +574,18 @@ def danger!; end
     end
   end
 
+  def test_zsuper_kw_splat_not_mutable
+    extend(Module.new{def a(**k) k[:a] = 1 end})
+    extend(Module.new do
+      def a(**k)
+        before = k.dup
+        super
+        [before, k]
+      end
+    end)
+    assert_equal(*a)
+  end
+
   def test_from_eval
     bug10263 = '[ruby-core:65122] [Bug #10263a]'
     a = Class.new do
@@ -605,6 +633,40 @@ def test_public_zsuper_with_prepend
     }
   end
 
+  def test_super_with_included_prepended_module_method_caching_bug_20716
+    a = Module.new do
+      def test(*args)
+        super
+      end
+    end
+
+    b = Module.new do
+      def test(a)
+        a
+      end
+    end
+
+    c = Class.new
+
+    b.prepend(a)
+    c.include(b)
+
+    assert_equal(1, c.new.test(1))
+
+    b.class_eval do
+      begin
+        verbose_bak, $VERBOSE = $VERBOSE, nil
+        def test
+          :test
+        end
+      ensure
+        $VERBOSE = verbose_bak
+      end
+    end
+
+    assert_equal(:test, c.new.test)
+  end
+
   class TestFor_super_with_modified_rest_parameter_base
     def foo *args
       args
diff --git a/test/ruby/test_symbol.rb b/test/ruby/test_symbol.rb
index 1d2a18d734c8e2..c50febf5d1c6fa 100644
--- a/test/ruby/test_symbol.rb
+++ b/test/ruby/test_symbol.rb
@@ -90,12 +90,15 @@ def test_inspect_suboptimal
   end
 
   def test_inspect_dollar
+    verbose_bak, $VERBOSE = $VERBOSE, nil
     # 4) :$- always treats next character literally:
     assert_raise(SyntaxError) {eval ':$-'}
     assert_raise(SyntaxError) {eval ":$-\n"}
     assert_raise(SyntaxError) {eval ":$- "}
     assert_raise(SyntaxError) {eval ":$-#"}
     assert_raise(SyntaxError) {eval ':$-('}
+  ensure
+    $VERBOSE = verbose_bak
   end
 
   def test_inspect_number
@@ -118,6 +121,14 @@ def test_inspect
     end
   end
 
+  def test_inspect_under_gc_compact_stress
+    omit "compaction doesn't work well on s390x" if RUBY_PLATFORM =~ /s390x/ # https://github.com/ruby/ruby/pull/5077
+
+    EnvUtil.under_gc_compact_stress do
+      assert_inspect_evaled(':testing')
+    end
+  end
+
   def test_name
     assert_equal("foo", :foo.name)
     assert_same(:foo.name, :foo.name)
diff --git a/test/ruby/test_syntax.rb b/test/ruby/test_syntax.rb
index cda84c6368e383..b7e021a4ff4976 100644
--- a/test/ruby/test_syntax.rb
+++ b/test/ruby/test_syntax.rb
@@ -76,97 +76,120 @@ def test_script_lines_encoding
 
   def test_anonymous_block_forwarding
     assert_syntax_error("def b; c(&); end", /no anonymous block parameter/)
+    assert_syntax_error("def b(&) ->(&) {c(&)} end", /anonymous block parameter is also used/)
+    assert_valid_syntax("def b(&) ->() {c(&)} end")
     assert_separately([], "#{<<-"begin;"}\n#{<<-'end;'}")
     begin;
-        def b(&); c(&) end
-        def c(&); yield 1 end
-        a = nil
-        b{|c| a = c}
-        assert_equal(1, a)
-
-        def inner
-          yield
-        end
+      def b(&); c(&) end
+      def c(&); yield 1 end
+      a = nil
+      b{|c| a = c}
+      assert_equal(1, a)
+
+      def inner
+        yield
+      end
 
-        def block_only(&)
-          inner(&)
-        end
-        assert_equal(1, block_only{1})
+      def block_only(&)
+        inner(&)
+      end
+      assert_equal(1, block_only{1})
 
-        def pos(arg1, &)
-          inner(&)
-        end
-        assert_equal(2, pos(nil){2})
+      def pos(arg1, &)
+        inner(&)
+      end
+      assert_equal(2, pos(nil){2})
 
-        def pos_kwrest(arg1, **kw, &)
-          inner(&)
-        end
-        assert_equal(3, pos_kwrest(nil){3})
+      def pos_kwrest(arg1, **kw, &)
+        inner(&)
+      end
+      assert_equal(3, pos_kwrest(nil){3})
 
-        def no_kw(arg1, **nil, &)
-          inner(&)
-        end
-        assert_equal(4, no_kw(nil){4})
+      def no_kw(arg1, **nil, &)
+        inner(&)
+      end
+      assert_equal(4, no_kw(nil){4})
 
-        def rest_kw(*a, kwarg: 1, &)
-          inner(&)
-        end
-        assert_equal(5, rest_kw{5})
+      def rest_kw(*a, kwarg: 1, &)
+        inner(&)
+      end
+      assert_equal(5, rest_kw{5})
 
-        def kw(kwarg:1, &)
-          inner(&)
-        end
-        assert_equal(6, kw{6})
+      def kw(kwarg:1, &)
+        inner(&)
+      end
+      assert_equal(6, kw{6})
 
-        def pos_kw_kwrest(arg1, kwarg:1, **kw, &)
-          inner(&)
-        end
-        assert_equal(7, pos_kw_kwrest(nil){7})
+      def pos_kw_kwrest(arg1, kwarg:1, **kw, &)
+        inner(&)
+      end
+      assert_equal(7, pos_kw_kwrest(nil){7})
 
-        def pos_rkw(arg1, kwarg1:, &)
-          inner(&)
-        end
-        assert_equal(8, pos_rkw(nil, kwarg1: nil){8})
+      def pos_rkw(arg1, kwarg1:, &)
+        inner(&)
+      end
+      assert_equal(8, pos_rkw(nil, kwarg1: nil){8})
 
-        def all(arg1, arg2, *rest, post1, post2, kw1: 1, kw2: 2, okw1:, okw2:, &)
-          inner(&)
-        end
-        assert_equal(9, all(nil, nil, nil, nil, okw1: nil, okw2: nil){9})
+      def all(arg1, arg2, *rest, post1, post2, kw1: 1, kw2: 2, okw1:, okw2:, &)
+        inner(&)
+      end
+      assert_equal(9, all(nil, nil, nil, nil, okw1: nil, okw2: nil){9})
 
-        def all_kwrest(arg1, arg2, *rest, post1, post2, kw1: 1, kw2: 2, okw1:, okw2:, **kw, &)
-          inner(&)
-        end
-        assert_equal(10, all_kwrest(nil, nil, nil, nil, okw1: nil, okw2: nil){10})
+      def all_kwrest(arg1, arg2, *rest, post1, post2, kw1: 1, kw2: 2, okw1:, okw2:, **kw, &)
+        inner(&)
+      end
+      assert_equal(10, all_kwrest(nil, nil, nil, nil, okw1: nil, okw2: nil){10})
+
+      def evaled(&)
+        eval("inner(&)")
+      end
+      assert_equal(1, evaled{1})
     end;
   end
 
   def test_anonymous_rest_forwarding
     assert_syntax_error("def b; c(*); end", /no anonymous rest parameter/)
     assert_syntax_error("def b; c(1, *); end", /no anonymous rest parameter/)
+    assert_syntax_error("def b(*) ->(*) {c(*)} end", /anonymous rest parameter is also used/)
+    assert_syntax_error("def b(a, *) ->(*) {c(1, *)} end", /anonymous rest parameter is also used/)
+    assert_syntax_error("def b(*) ->(a, *) {c(*)} end", /anonymous rest parameter is also used/)
+    assert_valid_syntax("def b(*) ->() {c(*)} end")
+    assert_valid_syntax("def b(a, *) ->() {c(1, *)} end")
+    assert_valid_syntax("def b(*) ->(a) {c(*)} end")
     assert_separately([], "#{<<-"begin;"}\n#{<<-'end;'}")
     begin;
-        def b(*); c(*) end
-        def c(*a); a end
-        def d(*); b(*, *) end
-        assert_equal([1, 2], b(1, 2))
-        assert_equal([1, 2, 1, 2], d(1, 2))
+      def b(*); c(*) end
+      def c(*a); a end
+      def d(*); b(*, *) end
+      def e(*); eval("b(*)") end
+      assert_equal([1, 2], b(1, 2))
+      assert_equal([1, 2, 1, 2], d(1, 2))
+      assert_equal([1, 2], e(1, 2))
     end;
   end
 
   def test_anonymous_keyword_rest_forwarding
     assert_syntax_error("def b; c(**); end", /no anonymous keyword rest parameter/)
     assert_syntax_error("def b; c(k: 1, **); end", /no anonymous keyword rest parameter/)
+    assert_syntax_error("def b(**) ->(**) {c(**)} end", /anonymous keyword rest parameter is also used/)
+    assert_syntax_error("def b(k:, **) ->(**) {c(k: 1, **)} end", /anonymous keyword rest parameter is also used/)
+    assert_syntax_error("def b(**) ->(k:, **) {c(**)} end", /anonymous keyword rest parameter is also used/)
+    assert_valid_syntax("def b(**) ->() {c(**)} end")
+    assert_valid_syntax("def b(k:, **) ->() {c(k: 1, **)} end")
+    assert_valid_syntax("def b(**) ->(k:) {c(**)} end")
     assert_separately([], "#{<<-"begin;"}\n#{<<-'end;'}")
     begin;
-        def b(**); c(**) end
-        def c(**kw); kw end
-        def d(**); b(k: 1, **) end
-        def e(**); b(**, k: 1) end
-        def f(a: nil, **); b(**) end
-        assert_equal({a: 1, k: 3}, b(a: 1, k: 3))
-        assert_equal({a: 1, k: 3}, d(a: 1, k: 3))
-        assert_equal({a: 1, k: 1}, e(a: 1, k: 3))
-        assert_equal({k: 3}, f(a: 1, k: 3))
+      def b(**); c(**) end
+      def c(**kw); kw end
+      def d(**); b(k: 1, **) end
+      def e(**); b(**, k: 1) end
+      def f(a: nil, **); b(**) end
+      def g(**); eval("b(**)") end
+      assert_equal({a: 1, k: 3}, b(a: 1, k: 3))
+      assert_equal({a: 1, k: 3}, d(a: 1, k: 3))
+      assert_equal({a: 1, k: 1}, e(a: 1, k: 3))
+      assert_equal({k: 3}, f(a: 1, k: 3))
+      assert_equal({a: 1, k: 3}, g(a: 1, k: 3))
     end;
   end
 
@@ -176,6 +199,7 @@ def test_argument_forwarding_with_anon_rest_kwrest_and_block
     assert_syntax_error("def f(...); g(0, *); end", /no anonymous rest parameter/)
     assert_syntax_error("def f(...); g(**); end", /no anonymous keyword rest parameter/)
     assert_syntax_error("def f(...); g(x: 1, **); end", /no anonymous keyword rest parameter/)
+    assert_syntax_error("def f(...); g(&); end", /no anonymous block parameter/)
   end
 
   def test_newline_in_block_parameters
@@ -193,7 +217,7 @@ def test_newline_in_block_parameters
     blocks = [['do end', 'do'], ['{}', 'brace']],
     *|
     [%w'. dot', %w':: colon'].product(methods, blocks) do |(c, n1), (m, n2), (b, n3)|
-      m = m.tr_s('()', ' ').strip if n2 == 'do'
+      m = m.tr_s('()', ' ').strip if n3 == 'do'
       name = "test_#{n3}_block_after_blockcall_#{n1}_#{n2}_arg"
       code = "#{blockcall}#{c}#{m} #{b}"
       define_method(name) {assert_valid_syntax(code, bug6115)}
@@ -219,6 +243,7 @@ def test_hash_kwsplat_hash
   def test_array_kwsplat_hash
     kw = {}
     h = {a: 1}
+    a = []
     assert_equal([], [**{}])
     assert_equal([], [**kw])
     assert_equal([h], [**h])
@@ -233,6 +258,20 @@ def test_array_kwsplat_hash
     assert_equal([1, kw], [1, kw])
     assert_equal([1, h], [1, h])
 
+    assert_equal([], [*a, **{}])
+    assert_equal([], [*a, **kw])
+    assert_equal([h], [*a, **h])
+    assert_equal([{}], [*a, {}])
+    assert_equal([kw], [*a, kw])
+    assert_equal([h], [*a, h])
+
+    assert_equal([1], [1, *a, **{}])
+    assert_equal([1], [1, *a, **kw])
+    assert_equal([1, h], [1, *a, **h])
+    assert_equal([1, {}], [1, *a, {}])
+    assert_equal([1, kw], [1, *a, kw])
+    assert_equal([1, h], [1, *a, h])
+
     assert_equal([], [**kw, **kw])
     assert_equal([], [**kw, **{}, **kw])
     assert_equal([1], [1, **kw, **{}, **kw])
@@ -300,7 +339,12 @@ def test_keyword_duplicated_splat
     bug10315 = '[ruby-core:65368] [Bug #10315]'
 
     o = KW2.new
-    assert_equal([23, 2], o.kw(**{k1: 22}, **{k1: 23}), bug10315)
+    begin
+      verbose_bak, $VERBOSE = $VERBOSE, nil
+      assert_equal([23, 2], eval("o.kw(**{k1: 22}, **{k1: 23})"), bug10315)
+    ensure
+      $VERBOSE = verbose_bak
+    end
 
     h = {k3: 31}
     assert_raise(ArgumentError) {o.kw(**h)}
@@ -335,6 +379,12 @@ def b.f(k:) k; end
     assert_warn(/duplicated/) {r = eval("a.f(**{k: a.add(1), j: a.add(2), k: a.add(3), k: a.add(4)})")}
     assert_equal(4, r)
     assert_equal([1, 2, 3, 4], a)
+    a.clear
+    r = nil
+    _z = {}
+    assert_warn(/duplicated/) {r = eval("a.f(k: a.add(1), **_z, k: a.add(2))")}
+    assert_equal(2, r)
+    assert_equal([1, 2], a)
   end
 
   def test_keyword_empty_splat
@@ -356,11 +406,11 @@ def test_keyword_empty_splat
   end
 
   def test_keyword_self_reference
-    message = /circular argument reference - var/
-    assert_syntax_error("def foo(var: defined?(var)) var end", message)
-    assert_syntax_error("def foo(var: var) var end", message)
-    assert_syntax_error("def foo(var: bar(var)) var end", message)
-    assert_syntax_error("def foo(var: bar {var}) var end", message)
+    assert_valid_syntax("def foo(var: defined?(var)) var end")
+    assert_valid_syntax("def foo(var: var) var end")
+    assert_valid_syntax("def foo(var: bar(var)) var end")
+    assert_valid_syntax("def foo(var: bar {var}) var end")
+    assert_valid_syntax("def foo(var: (1 in ^var)); end")
 
     o = Object.new
     assert_warn("") do
@@ -386,6 +436,9 @@ def test_keyword_self_reference
     assert_warn("") do
       o.instance_eval("proc {|var: 1| var}")
     end
+
+    o = Object.new
+    assert_nil(o.instance_eval("def foo(bar: bar) = bar; foo"))
   end
 
   def test_keyword_invalid_name
@@ -419,13 +472,13 @@ def test_keywords_specified_and_not_accepted
   end
 
   def test_optional_self_reference
-    message = /circular argument reference - var/
-    assert_syntax_error("def foo(var = defined?(var)) var end", message)
-    assert_syntax_error("def foo(var = var) var end", message)
-    assert_syntax_error("def foo(var = bar(var)) var end", message)
-    assert_syntax_error("def foo(var = bar {var}) var end", message)
-    assert_syntax_error("def foo(var = (def bar;end; var)) var end", message)
-    assert_syntax_error("def foo(var = (def self.bar;end; var)) var end", message)
+    assert_valid_syntax("def foo(var = defined?(var)) var end")
+    assert_valid_syntax("def foo(var = var) var end")
+    assert_valid_syntax("def foo(var = bar(var)) var end")
+    assert_valid_syntax("def foo(var = bar {var}) var end")
+    assert_valid_syntax("def foo(var = (def bar;end; var)) var end")
+    assert_valid_syntax("def foo(var = (def self.bar;end; var)) var end")
+    assert_valid_syntax("def foo(var = (1 in ^var)); end")
 
     o = Object.new
     assert_warn("") do
@@ -451,6 +504,9 @@ def test_optional_self_reference
     assert_warn("") do
       o.instance_eval("proc {|var = 1| var}")
     end
+
+    o = Object.new
+    assert_nil(o.instance_eval("def foo(bar: bar) = bar; foo"))
   end
 
   def test_warn_grouped_expression
@@ -468,10 +524,6 @@ def test_warn_unreachable
   end
 
   def test_warn_balanced
-    warning = <<WARN
-test:1: warning: `%s' after local variable or literal is interpreted as binary operator
-test:1: warning: even though it seems like %s
-WARN
     [
      [:**, "argument prefix"],
      [:*, "argument prefix"],
@@ -485,7 +537,9 @@ def test_warn_balanced
       all_assertions do |a|
         ["puts 1 #{op}0", "puts :a #{op}0", "m = 1; puts m #{op}0"].each do |src|
           a.for(src) do
-            assert_warning(warning % [op, syn], src) do
+            warning = /'#{Regexp.escape(op)}' after local variable or literal is interpreted as binary operator.+?even though it seems like #{syn}/m
+
+            assert_warning(warning, src) do
               assert_valid_syntax(src, "test", verbose: true)
             end
           end
@@ -636,6 +690,8 @@ def test_duplicated_rest_kw
     assert_equal(42, obj.foo(42))
     assert_equal(42, obj.foo(2, _: 0))
     assert_equal(2, obj.foo(x: 2, _: 0))
+  ensure
+    self.class.remove_method(:foo)
   end
 
   def test_duplicated_opt_kw
@@ -675,8 +731,8 @@ def test_duplicated_opt_kwrest
   end
 
   def test_duplicated_when
-    w = 'warning: duplicated `when\' clause with line 3 is ignored'
-    assert_warning(/3: #{w}.+4: #{w}.+4: #{w}.+5: #{w}.+5: #{w}/m) {
+    w = ->(line) { "warning: 'when' clause on line #{line} duplicates 'when' clause on line 3 and is ignored" }
+    assert_warning(/#{w[3]}.+#{w[4]}.+#{w[4]}.+#{w[5]}.+#{w[5]}/m) {
       eval %q{
         case 1
         when 1, 1
@@ -685,7 +741,7 @@ def test_duplicated_when
         end
       }
     }
-    assert_warning(/#{w}/) {#/3: #{w}.+4: #{w}.+5: #{w}.+5: #{w}/m){
+    assert_warning(/#{w[3]}.+#{w[4]}.+#{w[5]}.+#{w[5]}/m) {
       a = a = 1
       eval %q{
         case 1
@@ -695,10 +751,28 @@ def test_duplicated_when
         end
       }
     }
+    assert_warning(/#{w[3]}/) {
+      eval %q{
+        case 1
+        when __LINE__, __LINE__
+        when 3, 3
+        when 3, 3
+        end
+      }
+    }
+    assert_warning(/#{w[3]}/) {
+      eval %q{
+        case 1
+        when __FILE__, __FILE__
+        when "filename", "filename"
+        when "filename", "filename"
+        end
+      }, binding, "filename"
+    }
   end
 
   def test_duplicated_when_check_option
-    w = /duplicated `when\' clause with line 3 is ignored/
+    w = /'when' clause on line 4 duplicates 'when' clause on line 3 and is ignored/
     assert_in_out_err(%[-wc], "#{<<~"begin;"}\n#{<<~'end;'}", ["Syntax OK"], w)
     begin;
       case 1
@@ -831,6 +905,16 @@ def test_dedented_heredoc_with_blank_more_indented_line
     assert_dedented_heredoc(expect, result)
   end
 
+  def test_dedented_heredoc_with_leading_blank_line
+    # the blank line has six leading spaces
+    result = "      \n" \
+             "    b\n"
+    expect = "  \n" \
+             "b\n"
+    assert_dedented_heredoc(expect, result)
+  end
+
+
   def test_dedented_heredoc_with_blank_more_indented_line_escaped
     result = "    a\n" \
              "\\ \\ \\ \\ \\ \\ \n" \
@@ -938,7 +1022,7 @@ def test_dedented_heredoc_invalid_identifer
   end
 
   def test_dedented_heredoc_concatenation
-    assert_equal("\n0\n1", eval("<<~0 '1'\n \n0\#{}\n0"))
+    assert_equal(" \n0\n1", eval("<<~0 '1'\n \n0\#{}\n0"))
   end
 
   def test_heredoc_mixed_encoding
@@ -977,6 +1061,14 @@ def test_heredoc_mixed_encoding
     assert_not_match(/end-of-input/, e.message)
   end
 
+  def test_invalid_regexp
+    bug20295 = '[ruby-core:116913] [Bug #20295]'
+
+    assert_syntax_error("/[/=~s", /premature end of char-class/, bug20295)
+    assert_syntax_error("/(?<>)/=~s", /group name is empty/, bug20295)
+    assert_syntax_error("/(?<a>[)/=~s", /premature end of char-class/, bug20295)
+  end
+
   def test_lineno_operation_brace_block
     expected = __LINE__ + 1
     actual = caller_lineno\
@@ -1172,6 +1264,20 @@ def test_safe_call_in_massign_lhs
     assert_syntax_error("a&.x,=0", /multiple assignment destination/)
   end
 
+  def test_safe_call_in_for_variable
+    assert_valid_syntax("for x&.bar in []; end")
+    assert_separately([], "#{<<~"begin;"}\n#{<<~'end;'}")
+    begin;
+      foo = nil
+      for foo&.bar in [1]; end
+      assert_nil(foo)
+
+      foo = Struct.new(:bar).new
+      for foo&.bar in [1]; end
+      assert_equal(1, foo.bar)
+    end;
+  end
+
   def test_no_warning_logop_literal
     assert_warning("") do
       eval("true||raise;nil")
@@ -1188,12 +1294,18 @@ def test_warning_literal_in_condition
     assert_warn(/string literal in condition/) do
       eval('1 if ""')
     end
+    assert_warning(/string literal in condition/) do
+      eval('1 if __FILE__')
+    end
     assert_warn(/regex literal in condition/) do
       eval('1 if //')
     end
     assert_warning(/literal in condition/) do
       eval('1 if 1')
     end
+    assert_warning(/literal in condition/) do
+      eval('1 if __LINE__')
+    end
     assert_warning(/symbol literal in condition/) do
       eval('1 if :foo')
     end
@@ -1267,7 +1379,7 @@ def test_undef_symbol
   end
 
   def test_parenthesised_statement_argument
-    assert_syntax_error("foo(bar rescue nil)", /unexpected `rescue' modifier/)
+    assert_syntax_error("foo(bar rescue nil)", /unexpected 'rescue' modifier/)
     assert_valid_syntax("foo (bar rescue nil)")
   end
 
@@ -1289,7 +1401,7 @@ def test_cmdarg_in_paren
 
   def test_block_after_cmdarg_in_paren
     bug11873 = '[ruby-core:72482] [Bug #11873]'
-    def bug11873.p(*);end;
+    def bug11873.p(*, &);end;
 
     assert_raise(LocalJumpError, bug11873) do
       bug11873.instance_eval do
@@ -1317,6 +1429,25 @@ def test_do_block_in_hash_brace
     assert_valid_syntax 'p :foo, {proc do end => proc do end, b: proc do end}', bug13073
   end
 
+  def test_invalid_encoding_symbol
+    assert_syntax_error('{"\xC3": 1}', "invalid symbol")
+  end
+
+  def test_invalid_symbol_in_hash_memory_leak
+    assert_no_memory_leak([], "#{<<-'begin;'}", "#{<<-'end;'}", rss: true)
+      str = '{"\xC3": 1}'.force_encoding("UTF-8")
+      code = proc do
+        eval(str)
+        raise "unreachable"
+      rescue SyntaxError
+      end
+
+      1_000.times(&code)
+    begin;
+      1_000_000.times(&code)
+    end;
+  end
+
   def test_do_after_local_variable
     obj = Object.new
     def obj.m; yield; end
@@ -1365,7 +1496,6 @@ def test_return_toplevel
       "#{return}"
       raise((return; "should not raise"))
       begin raise; ensure return; end; self
-      begin raise; ensure return; end and self
       nil&defined?0--begin e=no_method_error(); return; 0;end
       return puts('ignored') #=> ignored
       BEGIN {return}
@@ -1399,6 +1529,54 @@ def test_return_toplevel
     end
   end
 
+  def test_eval_return_toplevel
+    feature4840 = '[ruby-core:36785] [Feature #4840]'
+    line = __LINE__+2
+    code = "#{<<~"begin;"}#{<<~'end;'}"
+    begin;
+      eval "return"; raise
+      begin eval "return"; rescue SystemExit; exit false; end
+      begin eval "return"; ensure puts "ensured"; end #=> ensured
+      begin ensure eval "return"; end
+      begin raise; ensure; eval "return"; end
+      begin raise; rescue; eval "return"; end
+      eval "return false"; raise
+      eval "return 1"; raise
+      "#{eval "return"}"
+      raise((eval "return"; "should not raise"))
+      begin raise; ensure eval "return"; end; self
+      begin raise; ensure eval "return"; end and self
+      eval "return puts('ignored')" #=> ignored
+      BEGIN {eval "return"}
+    end;
+      .split(/\n/).map {|s|[(line+=1), *s.split(/#=> /, 2)]}
+    failed = proc do |n, s|
+      RubyVM::InstructionSequence.compile(s, __FILE__, nil, n).disasm
+    end
+    Tempfile.create(%w"test_return_ .rb") do |lib|
+      lib.close
+      args = %W[-W0 -r#{lib.path}]
+      all_assertions_foreach(feature4840, *[:main, :lib].product([:class, :top], code)) do |main, klass, (n, s, *ex)|
+        if klass == :class
+          s = "class X; #{s}; end"
+          if main == :main
+            assert_in_out_err(%[-W0], s, ex, /return/, proc {failed[n, s]}, success: false)
+          else
+            File.write(lib, s)
+            assert_in_out_err(args, "", ex, /return/, proc {failed[n, s]}, success: false)
+          end
+        else
+          if main == :main
+            assert_in_out_err(%[-W0], s, ex, [], proc {failed[n, s]}, success: true)
+          else
+            File.write(lib, s)
+            assert_in_out_err(args, "", ex, [], proc {failed[n, s]}, success: true)
+          end
+        end
+      end
+    end
+  end
+
   def test_return_toplevel_with_argument
     assert_warn(/argument of top-level return is ignored/) {eval("return 1")}
   end
@@ -1439,13 +1617,13 @@ def test_syntax_error_in_rescue
   end
 
   def test_syntax_error_at_newline
-    expected = "\n        ^"
+    expected = /(\n|\| )        \^/
     assert_syntax_error("%[abcdef", expected)
     assert_syntax_error("%[abcdef\n", expected)
   end
 
   def test_invalid_jump
-    assert_in_out_err(%w[-e redo], "", [], /^-e:1: /)
+    assert_in_out_err(%w[-e redo], "", [], /^-e:1: |~ Invalid redo/)
   end
 
   def test_keyword_not_parens
@@ -1617,8 +1795,8 @@ def test_methoddef_endless_command
     assert_equal("instance ok", k.new.rescued("ok"))
 
     # Current technical limitation: cannot prepend "private" or something for command endless def
-    error = /syntax error, unexpected string literal/
-    error2 = /syntax error, unexpected local variable or method/
+    error = /(syntax error,|\^~*) unexpected string literal/
+    error2 = /(syntax error,|\^~*) unexpected local variable or method/
     assert_syntax_error('private def foo = puts "Hello"', error)
     assert_syntax_error('private def foo() = puts "Hello"', error)
     assert_syntax_error('private def foo(x) = puts x', error2)
@@ -1665,6 +1843,10 @@ def test_command_semicolon_in_tlparen_at_the_first_arg
     assert_valid_syntax('a.b (;),(),()', bug19281)
   end
 
+  def test_command_do_block_call_with_empty_args_brace_block
+    assert_valid_syntax('cmd 1, 2 do end.m() { blk_body }')
+  end
+
   def test_numbered_parameter
     assert_valid_syntax('proc {_1}')
     assert_equal(3, eval('[1,2].then {_1+_2}'))
@@ -1693,7 +1875,7 @@ def test_numbered_parameter
     assert_syntax_error('def x(_4) end', /_4 is reserved for numbered parameter/)
     assert_syntax_error('def _5; end', /_5 is reserved for numbered parameter/)
     assert_syntax_error('def self._6; end', /_6 is reserved for numbered parameter/)
-    assert_raise_with_message(NameError, /undefined local variable or method `_1'/) {
+    assert_raise_with_message(NameError, /undefined local variable or method '_1'/) {
       eval('_1')
     }
     ['class C', 'class << C', 'module M', 'def m', 'def o.m'].each do |c|
@@ -1711,6 +1893,68 @@ def test_numbered_parameter
 
     assert_valid_syntax("proc {def foo(_);end;_1}")
     assert_valid_syntax("p { [_1 **2] }")
+    assert_valid_syntax("proc {_1;def foo();end;_1}")
+  end
+
+  def test_it
+    assert_valid_syntax('proc {it}')
+    assert_syntax_error('[1,2].then {it+_2}', /'it' is already used/)
+    assert_syntax_error('[1,2].then {_2+it}', /numbered parameter is already used/)
+    assert_equal([1, 2], eval('[1,2].then {it}'))
+    assert_syntax_error('[1,2].then {"#{it}#{_2}"}', /'it' is already used/)
+    assert_syntax_error('[1,2].then {"#{_2}#{it}"}', /numbered parameter is already used/)
+    assert_syntax_error('->{it+_2}.call(1,2)', /'it' is already used/)
+    assert_syntax_error('->{_2+it}.call(1,2)', /numbered parameter is already used/)
+    assert_equal(4, eval('->(a=->{it}){a}.call.call(4)'))
+    assert_equal(5, eval('-> a: ->{it} {a}.call.call(5)'))
+    assert_syntax_error('proc {|| it}', /ordinary parameter is defined/)
+    assert_syntax_error('proc {|;a| it}', /ordinary parameter is defined/)
+    assert_syntax_error("proc {|\n| it}", /ordinary parameter is defined/)
+    assert_syntax_error('proc {|x| it}', /ordinary parameter is defined/)
+    assert_equal([1, 2], eval('1.then {[it, 2.then {_1}]}'))
+    assert_equal([2, 1], eval('1.then {[2.then {_1}, it]}'))
+    assert_syntax_error('->(){it}', /ordinary parameter is defined/)
+    assert_syntax_error('->(x){it}', /ordinary parameter is defined/)
+    assert_syntax_error('->x{it}', /ordinary parameter is defined/)
+    assert_syntax_error('->x:_1{}', /ordinary parameter is defined/)
+    assert_syntax_error('->x=it{}', /ordinary parameter is defined/)
+    assert_valid_syntax('-> {it; -> {_2}}')
+    assert_valid_syntax('-> {-> {it}; _2}')
+    assert_equal([1, nil], eval('proc {that=it; it=nil; [that, it]}.call(1)'))
+    assert_equal(1, eval('proc {it = 1}.call'))
+    assert_warning(/1: warning: assigned but unused variable - it/) {
+      assert_equal(2, eval('a=Object.new; def a.foo; it = 2; end; a.foo'))
+    }
+    assert_equal(3, eval('proc {|it| it}.call(3)'))
+    assert_equal(4, eval('a=Object.new; def a.foo(it); it; end; a.foo(4)'))
+    assert_equal(5, eval('a=Object.new; def a.it; 5; end; a.it'))
+    assert_equal(6, eval('a=Class.new; a.class_eval{ def it; 6; end }; a.new.it'))
+    assert_equal([7, 8], eval('a=[]; [7].each { a << it; [8].each { a << it } }; a'))
+    assert_raise_with_message(NameError, /undefined local variable or method 'it'/) do
+      eval('it')
+    end
+    ['class C', 'class << C', 'module M', 'def m', 'def o.m'].each do |c|
+      assert_valid_syntax("->{#{c};->{it};end;it}\n")
+      assert_valid_syntax("->{it;#{c};->{it};end}\n")
+    end
+    1.times do
+      [
+        assert_equal(0, it),
+        assert_equal([:a], eval('[:a].map{it}')),
+        assert_raise(NameError) {eval('it')},
+      ]
+    end
+    assert_valid_syntax('proc {def foo(_);end;it}')
+    assert_syntax_error('p { [it **2] }', /unexpected \*\*/)
+    assert_equal(1, eval('1.then { raise rescue it }'))
+    assert_equal(2, eval('1.then { 2.then { raise rescue it } }'))
+    assert_equal(3, eval('3.then { begin; raise; rescue; it; end }'))
+    assert_equal(4, eval('4.tap { begin; raise ; rescue; raise rescue it; end; }'))
+    assert_equal(5, eval('a = 0; 5.then { begin; nil; ensure; a = it; end }; a'))
+    assert_equal(6, eval('a = 0; 6.then { begin; nil; rescue; ensure; a = it; end }; a'))
+    assert_equal(7, eval('a = 0; 7.then { begin; raise; ensure; a = it; end } rescue a'))
+    assert_equal(8, eval('a = 0; 8.then { begin; raise; rescue; ensure; a = it; end }; a'))
+    assert_equal(/9/, eval('9.then { /#{it}/o }'))
   end
 
   def test_value_expr_in_condition
@@ -1721,6 +1965,11 @@ def test_value_expr_in_condition
     assert_valid_syntax("tap {a = (break unless true)}")
   end
 
+  def test_value_expr_in_singleton
+    mesg = /void value expression/
+    assert_syntax_error("class << (return); end", mesg)
+  end
+
   def test_tautological_condition
     assert_valid_syntax("def f() return if false and invalid; nil end")
     assert_valid_syntax("def f() return unless true or invalid; nil end")
@@ -1738,16 +1987,23 @@ def test_argument_forwarding
     assert_valid_syntax("def foo b = 1, ...; bar(...); end")
     assert_valid_syntax("(def foo ...\n  bar(...)\nend)")
     assert_valid_syntax("(def foo ...; bar(...); end)")
+    assert_valid_syntax("def (1...).foo ...; bar(...); end")
+    assert_valid_syntax("def (tap{1...}).foo ...; bar(...); end")
     assert_valid_syntax('def ==(...) end')
     assert_valid_syntax('def [](...) end')
     assert_valid_syntax('def nil(...) end')
     assert_valid_syntax('def true(...) end')
     assert_valid_syntax('def false(...) end')
+    assert_valid_syntax('->a=1...{}')
     unexpected = /unexpected \.{3}/
     assert_syntax_error('iter do |...| end', /unexpected/)
     assert_syntax_error('iter {|...|}', /unexpected/)
     assert_syntax_error('->... {}', unexpected)
     assert_syntax_error('->(...) {}', unexpected)
+    assert_syntax_error('->a,... {}', unexpected)
+    assert_syntax_error('->(a,...) {}', unexpected)
+    assert_syntax_error('->a=1,... {}', unexpected)
+    assert_syntax_error('->(a=1,...) {}', unexpected)
     assert_syntax_error('def foo(x, y, z) bar(...); end', /unexpected/)
     assert_syntax_error('def foo(x, y, z) super(...); end', /unexpected/)
     assert_syntax_error('def foo(...) yield(...); end', /unexpected/)
@@ -1772,6 +2028,7 @@ def obj1.bar(*args, **kws, &block)
     obj4 = obj1.clone
     obj5 = obj1.clone
     obj1.instance_eval('def foo(...) bar(...) end', __FILE__, __LINE__)
+    obj1.instance_eval('def foo(...) eval("bar(...)") end', __FILE__, __LINE__)
     obj4.instance_eval("def foo ...\n  bar(...)\n""end", __FILE__, __LINE__)
     obj5.instance_eval("def foo ...; bar(...); end", __FILE__, __LINE__)
 
@@ -1960,6 +2217,27 @@ def obj.bar(*args, **kws, &block)
     assert_equal 0...1, exp.call(a: 0)
   end
 
+  def test_argument_forwarding_with_super
+    assert_valid_syntax('def foo(...) super {}; end')
+    assert_valid_syntax('def foo(...) super() {}; end')
+    assert_syntax_error('def foo(...) super(...) {}; end', /both block arg and actual block/)
+    assert_syntax_error('def foo(...) super(1, ...) {}; end', /both block arg and actual block/)
+  end
+
+  def test_argument_forwarding_with_super_memory_leak
+    assert_no_memory_leak([], "#{<<-'begin;'}", "#{<<-'end;'}", rss: true)
+      code = proc do
+        eval("def foo(...) super(...) {}; end")
+        raise "unreachable"
+      rescue SyntaxError
+      end
+
+      1_000.times(&code)
+    begin;
+      100_000.times(&code)
+    end;
+  end
+
   def test_class_module_Object_ancestors
     assert_separately([], <<-RUBY)
       m = Module.new
@@ -1990,6 +2268,43 @@ def test_cdhash
     RUBY
   end
 
+  def test_defined_in_short_circuit_if_condition
+    bug = '[ruby-core:20501]'
+    conds = [
+      "false && defined?(Some::CONSTANT)",
+      "true || defined?(Some::CONSTANT)",
+      "(false && defined?(Some::CONSTANT))", # parens exercise different code path
+      "(true || defined?(Some::CONSTANT))",
+      "@val && false && defined?(Some::CONSTANT)",
+      "@val || true || defined?(Some::CONSTANT)"
+    ]
+
+    conds.each do |cond|
+      code = %Q{
+        def my_method
+          var = "there"
+          if #{cond}
+            var = "here"
+          end
+          raise var
+        end
+        begin
+          my_method
+        rescue
+          print 'ok'
+        else
+          print 'ng'
+        end
+      }
+      # Invoke in a subprocess because the bug caused a segfault using the parse.y compiler.
+      # Don't use assert_separately because the bug was best reproducible in a clean slate,
+      # without test env loaded.
+      out, _err, status = EnvUtil.invoke_ruby(["--disable-gems"], code, true, false)
+      assert_predicate(status, :success?, bug)
+      assert_equal 'ok', out
+    end
+  end
+
   private
 
   def not_label(x) @result = x; @not_label ||= nil end
@@ -2024,7 +2339,7 @@ def with_script_lines
     end
   end
 
-  def caller_lineno(*)
+  def caller_lineno(*, &)
     caller_locations(1, 1)[0].lineno
   end
 end
diff --git a/test/ruby/test_thread.rb b/test/ruby/test_thread.rb
index 703373b11ea75a..12ba1165ed8817 100644
--- a/test/ruby/test_thread.rb
+++ b/test/ruby/test_thread.rb
@@ -243,6 +243,10 @@ def test_join2
 
   def test_join_argument_conversion
     t = Thread.new {}
+
+    # Make sure that the thread terminates
+    Thread.pass while t.status
+
     assert_raise(TypeError) {t.join(:foo)}
 
     limit = Struct.new(:to_f, :count).new(0.05)
@@ -323,7 +327,6 @@ def test_wakeup
       s += 1
     end
     Thread.pass until t.stop?
-    sleep 1 if defined?(RubyVM::RJIT) && RubyVM::RJIT.enabled? # t.stop? behaves unexpectedly with --jit-wait
     assert_equal(1, s)
     t.wakeup
     Thread.pass while t.alive?
@@ -1434,7 +1437,8 @@ def test_thread_native_thread_id
     Thread.pass until th1.stop?
 
     # After a thread starts (and execute `sleep`), it returns native_thread_id
-    assert_instance_of Integer, th1.native_thread_id
+    native_tid = th1.native_thread_id
+    assert_instance_of Integer, native_tid if native_tid # it can be nil
 
     th1.wakeup
     Thread.pass while th1.alive?
@@ -1443,12 +1447,41 @@ def test_thread_native_thread_id
     assert_nil th1.native_thread_id
   end
 
+  def test_thread_native_thread_id_across_fork_on_linux
+    begin
+      require '-test-/thread/id'
+    rescue LoadError
+      omit "this test is only for Linux"
+    else
+      extend Bug::ThreadID
+    end
+
+    parent_thread_id = Thread.main.native_thread_id
+    real_parent_thread_id = gettid
+
+    assert_equal real_parent_thread_id, parent_thread_id
+
+    child_lines = nil
+    IO.popen('-') do |pipe|
+      if pipe
+        # parent
+        child_lines = pipe.read.lines
+      else
+        # child
+        puts Thread.main.native_thread_id
+        puts gettid
+      end
+    end
+    child_thread_id = child_lines[0].chomp.to_i
+    real_child_thread_id = child_lines[1].chomp.to_i
+
+    assert_equal real_child_thread_id, child_thread_id
+    refute_equal parent_thread_id, child_thread_id
+  end
+
   def test_thread_interrupt_for_killed_thread
     opts = { timeout: 5, timeout_error: nil }
 
-    # prevent SIGABRT from slow shutdown with RJIT
-    opts[:reprieve] = 3 if defined?(RubyVM::RJIT) && RubyVM::RJIT.enabled?
-
     assert_normal_exit(<<-_end, '[Bug #8996]', **opts)
       Thread.report_on_exception = false
       trap(:TERM){exit}
@@ -1524,4 +1557,36 @@ def test_pending_interrupt?
     assert_equal(true, t.pending_interrupt?(Exception))
     assert_equal(false, t.pending_interrupt?(ArgumentError))
   end
+
+  def test_deadlock_backtrace
+    bug21127 = '[ruby-core:120930] [Bug #21127]'
+
+    expected_stderr = [
+      /-:12:in 'Thread#join': No live threads left. Deadlock\? \(fatal\)\n/,
+      /2 threads, 2 sleeps current:\w+ main thread:\w+\n/,
+      /\* #<Thread:\w+ sleep_forever>\n/,
+      :*,
+      /^\s*-:6:in 'Object#frame_for_deadlock_test_2'/,
+      :*,
+      /\* #<Thread:\w+ -:10 sleep_forever>\n/,
+      :*,
+      /^\s*-:2:in 'Object#frame_for_deadlock_test_1'/,
+      :*,
+    ]
+
+    assert_in_out_err([], <<-INPUT, [], expected_stderr, bug21127)
+      def frame_for_deadlock_test_1
+        yield
+      end
+
+      def frame_for_deadlock_test_2
+        yield
+      end
+
+      q = Thread::Queue.new
+      t = Thread.new { frame_for_deadlock_test_1 { q.pop } }
+
+      frame_for_deadlock_test_2 { t.join }
+    INPUT
+  end
 end
diff --git a/test/ruby/test_thread_queue.rb b/test/ruby/test_thread_queue.rb
index fd77853f0ec3ec..9485528977e599 100644
--- a/test/ruby/test_thread_queue.rb
+++ b/test/ruby/test_thread_queue.rb
@@ -19,6 +19,15 @@ def test_sized_queue_initialized
     }
   end
 
+  def test_freeze
+    assert_raise(TypeError) {
+      Queue.new.freeze
+    }
+    assert_raise(TypeError) {
+      SizedQueue.new(5).freeze
+    }
+  end
+
   def test_queue
     grind(5, 1000, 15, Queue)
   end
@@ -226,8 +235,14 @@ def test_thr_kill
           end
         _eom
       rescue Timeout::Error
+        # record load average:
+        uptime = `uptime` rescue nil
+        if uptime && /(load average: [\d.]+),/ =~ uptime
+          la = " (#{$1})"
+        end
+
         count = File.read("#{d}/test_thr_kill_count").to_i
-        flunk "only #{count}/#{total_count} done in #{timeout} seconds."
+        flunk "only #{count}/#{total_count} done in #{timeout} seconds.#{la}"
       end
     }
   end
diff --git a/test/ruby/test_time.rb b/test/ruby/test_time.rb
index 40b7ac79f8fa64..333edb80218a64 100644
--- a/test/ruby/test_time.rb
+++ b/test/ruby/test_time.rb
@@ -77,6 +77,7 @@ def test_new_from_string
 
     assert_equal(Time.new(2021), Time.new("2021"))
     assert_equal(Time.new(2021, 12, 25, in: "+09:00"), Time.new("2021-12-25+09:00"))
+    assert_equal(Time.new(2021, 12, 25, in: "+09:00"), Time.new("2021-12-25+09:00", in: "-01:00"))
 
     assert_equal(0.123456r, Time.new("2021-12-25 00:00:00.123456 +09:00").subsec)
     assert_equal(0.123456789r, Time.new("2021-12-25 00:00:00.123456789876 +09:00").subsec)
@@ -151,6 +152,18 @@ def test_new_from_string
     assert_raise_with_message(ArgumentError, /can't parse/) {
       Time.new("2020-12-02 00:00:00 ")
     }
+    assert_raise_with_message(ArgumentError, /utc_offset/) {
+      Time.new("2020-12-25 00:00:00 +0960")
+    }
+    assert_raise_with_message(ArgumentError, /utc_offset/) {
+      Time.new("2020-12-25 00:00:00 +09:60")
+    }
+    assert_raise_with_message(ArgumentError, /utc_offset/) {
+      Time.new("2020-12-25 00:00:00 +090060")
+    }
+    assert_raise_with_message(ArgumentError, /utc_offset/) {
+      Time.new("2020-12-25 00:00:00 +09:00:60")
+    }
   end
 
   def test_time_add()
@@ -1407,7 +1420,10 @@ def to_s; "Inexact"; end
   def test_memsize
     # Time objects are common in some code, try to keep them small
     omit "Time object size test" if /^(?:i.?86|x86_64)-linux/ !~ RUBY_PLATFORM
-    omit "GC is in debug" if GC::INTERNAL_CONSTANTS[:DEBUG]
+    omit "GC is in debug" if GC::INTERNAL_CONSTANTS[:RVALUE_OVERHEAD] > 0
+    omit "memsize is not accurate due to using malloc_usable_size" if GC::INTERNAL_CONSTANTS[:SIZE_POOL_COUNT] == 1
+    omit "Only run this test on 64-bit" if RbConfig::SIZEOF["void*"] != 8
+
     require 'objspace'
     t = Time.at(0)
     sizeof_timew =
@@ -1418,7 +1434,7 @@ def test_memsize
       end
     sizeof_vtm = RbConfig::SIZEOF["void*"] * 4 + 8
     expect = GC::INTERNAL_CONSTANTS[:BASE_SLOT_SIZE] + sizeof_timew + sizeof_vtm
-    assert_equal expect, ObjectSpace.memsize_of(t)
+    assert_operator ObjectSpace.memsize_of(t), :<=, expect
   rescue LoadError => e
     omit "failed to load objspace: #{e.message}"
   end
@@ -1440,4 +1456,63 @@ def test_deconstruct_keys
   def test_parse_zero_bigint
     assert_equal 0, Time.new("2020-10-28T16:48:07.000Z").nsec, '[Bug #19390]'
   end
+
+  def test_xmlschema_encode
+    [:xmlschema, :iso8601].each do |method|
+      bug6100 = '[ruby-core:42997]'
+
+      t = Time.utc(2001, 4, 17, 19, 23, 17, 300000)
+      assert_equal("2001-04-17T19:23:17Z", t.__send__(method))
+      assert_equal("2001-04-17T19:23:17.3Z", t.__send__(method, 1))
+      assert_equal("2001-04-17T19:23:17.300000Z", t.__send__(method, 6))
+      assert_equal("2001-04-17T19:23:17.3000000Z", t.__send__(method, 7))
+      assert_equal("2001-04-17T19:23:17.3Z", t.__send__(method, 1.9), bug6100)
+
+      t = Time.utc(2001, 4, 17, 19, 23, 17, 123456)
+      assert_equal("2001-04-17T19:23:17.1234560Z", t.__send__(method, 7))
+      assert_equal("2001-04-17T19:23:17.123456Z", t.__send__(method, 6))
+      assert_equal("2001-04-17T19:23:17.12345Z", t.__send__(method, 5))
+      assert_equal("2001-04-17T19:23:17.1Z", t.__send__(method, 1))
+      assert_equal("2001-04-17T19:23:17.1Z", t.__send__(method, 1.9), bug6100)
+
+      t = Time.at(2.quo(3)).getlocal("+09:00")
+      assert_equal("1970-01-01T09:00:00.666+09:00", t.__send__(method, 3))
+      assert_equal("1970-01-01T09:00:00.6666666666+09:00", t.__send__(method, 10))
+      assert_equal("1970-01-01T09:00:00.66666666666666666666+09:00", t.__send__(method, 20))
+      assert_equal("1970-01-01T09:00:00.6+09:00", t.__send__(method, 1.1), bug6100)
+      assert_equal("1970-01-01T09:00:00.666+09:00", t.__send__(method, 3.2), bug6100)
+
+      t = Time.at(123456789.quo(9999999999)).getlocal("+09:00")
+      assert_equal("1970-01-01T09:00:00.012+09:00", t.__send__(method, 3))
+      assert_equal("1970-01-01T09:00:00.012345678+09:00", t.__send__(method, 9))
+      assert_equal("1970-01-01T09:00:00.0123456789+09:00", t.__send__(method, 10))
+      assert_equal("1970-01-01T09:00:00.0123456789012345678+09:00", t.__send__(method, 19))
+      assert_equal("1970-01-01T09:00:00.01234567890123456789+09:00", t.__send__(method, 20))
+      assert_equal("1970-01-01T09:00:00.012+09:00", t.__send__(method, 3.8), bug6100)
+
+      t = Time.utc(1)
+      assert_equal("0001-01-01T00:00:00Z", t.__send__(method))
+
+      begin
+        Time.at(-1)
+      rescue ArgumentError
+        # ignore
+      else
+        t = Time.utc(1960, 12, 31, 23, 0, 0, 123456)
+        assert_equal("1960-12-31T23:00:00.123456Z", t.__send__(method, 6))
+      end
+
+      t = get_t2000.getlocal("-09:30") # Pacific/Marquesas
+      assert_equal("1999-12-31T14:30:00-09:30", t.__send__(method))
+
+      assert_equal("10000-01-01T00:00:00Z", Time.utc(10000).__send__(method))
+      assert_equal("9999-01-01T00:00:00Z", Time.utc(9999).__send__(method))
+      assert_equal("0001-01-01T00:00:00Z", Time.utc(1).__send__(method)) # 1 AD
+      assert_equal("0000-01-01T00:00:00Z", Time.utc(0).__send__(method)) # 1 BC
+      assert_equal("-0001-01-01T00:00:00Z", Time.utc(-1).__send__(method)) # 2 BC
+      assert_equal("-0004-01-01T00:00:00Z", Time.utc(-4).__send__(method)) # 5 BC
+      assert_equal("-9999-01-01T00:00:00Z", Time.utc(-9999).__send__(method))
+      assert_equal("-10000-01-01T00:00:00Z", Time.utc(-10000).__send__(method))
+    end
+  end
 end
diff --git a/test/ruby/test_time_tz.rb b/test/ruby/test_time_tz.rb
index 531d76b0407275..f66cd9bec2eedc 100644
--- a/test/ruby/test_time_tz.rb
+++ b/test/ruby/test_time_tz.rb
@@ -695,6 +695,13 @@ def subtest_marshal(time_class, tz, tzarg, tzname, abbr, utc_offset)
     assert_equal(t.dst?, t2.dst?)
   end
 
+  def subtest_fractional_second(time_class, tz, tzarg, tzname, abbr, utc_offset)
+    t = time_class.new(2024, 1, 1, 23, 59, 59.9r, tzarg)
+    assert_equal(utc_offset[t.dst? ? 1 : 0], t.utc_offset)
+    t = time_class.new(2024, 7, 1, 23, 59, 59.9r, tzarg)
+    assert_equal(utc_offset[t.dst? ? 1 : 0], t.utc_offset)
+  end
+
   def test_invalid_zone
     make_timezone("INVALID", "INV", 0)
   rescue => e
@@ -719,6 +726,7 @@ def nametest_marshal_compatibility(time_class, tzname, abbr, utc_offset)
     "Asia/Tokyo" => ["JST", +9*3600],
     "America/Los_Angeles" => ["PST", -8*3600, "PDT", -7*3600],
     "Africa/Ndjamena" => ["WAT", +1*3600],
+    "Etc/UTC" => ["UTC", 0],
   }
 
   def make_timezone(tzname, abbr, utc_offset, abbr2 = nil, utc_offset2 = nil)
diff --git a/test/ruby/test_transcode.rb b/test/ruby/test_transcode.rb
index 24ee9b9533c8a2..63d37f4ba4ff90 100644
--- a/test/ruby/test_transcode.rb
+++ b/test/ruby/test_transcode.rb
@@ -10,9 +10,9 @@ def test_errors
     assert_raise(Encoding::ConverterNotFoundError) { 'abc'.encode!('foo', 'bar') }
     assert_raise(Encoding::ConverterNotFoundError) { 'abc'.force_encoding('utf-8').encode('foo') }
     assert_raise(Encoding::ConverterNotFoundError) { 'abc'.force_encoding('utf-8').encode!('foo') }
-    assert_raise(Encoding::UndefinedConversionError) { "\x80".encode('utf-8','ASCII-8BIT') }
-    assert_raise(Encoding::InvalidByteSequenceError) { "\x80".encode('utf-8','US-ASCII') }
-    assert_raise(Encoding::UndefinedConversionError) { "\xA5".encode('utf-8','iso-8859-3') }
+    assert_undefined_in("\x80", 'ASCII-8BIT')
+    assert_invalid_in("\x80", 'US-ASCII')
+    assert_undefined_in("\xA5", 'iso-8859-3')
     assert_raise(FrozenError) { 'hello'.freeze.encode!('iso-8859-1') }
     assert_raise(FrozenError) { '\u3053\u3093\u306b\u3061\u306f'.freeze.encode!('iso-8859-1') } # こんにちは
   end
@@ -52,16 +52,6 @@ def test_length
     assert_equal("\u20AC"*200000, ("\xA4"*200000).encode!('utf-8', 'iso-8859-15'))
   end
 
-  def check_both_ways(utf8, raw, encoding)
-    assert_equal(utf8.force_encoding('utf-8'), raw.encode('utf-8', encoding),utf8.dump+raw.dump)
-    assert_equal(raw.force_encoding(encoding), utf8.encode(encoding, 'utf-8'))
-  end
-
-  def check_both_ways2(str1, enc1, str2, enc2)
-    assert_equal(str1.force_encoding(enc1), str2.encode(enc1, enc2))
-    assert_equal(str2.force_encoding(enc2), str1.encode(enc2, enc1))
-  end
-
   def test_encoding_of_ascii_originating_from_binary
     binary_string = [0x82, 0x74, 0x68, 0x69, 0x73, 0x20, 0x69, 0x73, 0x20,
                      0x61, 0x20, 0x76, 0x65, 0x72, 0x79, 0x20, 0x6c, 0x6f,
@@ -188,16 +178,16 @@ def test_all_bytes
 
   def test_windows_874
     check_both_ways("\u20AC", "\x80", 'windows-874') # €
-    assert_raise(Encoding::UndefinedConversionError) { "\x81".encode("utf-8", 'windows-874') }
-    assert_raise(Encoding::UndefinedConversionError) { "\x84".encode("utf-8", 'windows-874') }
+    assert_undefined_in("\x81", 'windows-874')
+    assert_undefined_in("\x84", 'windows-874')
     check_both_ways("\u2026", "\x85", 'windows-874') # …
-    assert_raise(Encoding::UndefinedConversionError) { "\x86".encode("utf-8", 'windows-874') }
-    assert_raise(Encoding::UndefinedConversionError) { "\x8F".encode("utf-8", 'windows-874') }
-    assert_raise(Encoding::UndefinedConversionError) { "\x90".encode("utf-8", 'windows-874') }
+    assert_undefined_in("\x86", 'windows-874')
+    assert_undefined_in("\x8F", 'windows-874')
+    assert_undefined_in("\x90", 'windows-874')
     check_both_ways("\u2018", "\x91", 'windows-874') # ‘
     check_both_ways("\u2014", "\x97", 'windows-874') # —
-    assert_raise(Encoding::UndefinedConversionError) { "\x98".encode("utf-8", 'windows-874') }
-    assert_raise(Encoding::UndefinedConversionError) { "\x9F".encode("utf-8", 'windows-874') }
+    assert_undefined_in("\x98", 'windows-874')
+    assert_undefined_in("\x9F", 'windows-874')
     check_both_ways("\u00A0", "\xA0", 'windows-874') # non-breaking space
     check_both_ways("\u0E0F", "\xAF", 'windows-874') # ฏ
     check_both_ways("\u0E10", "\xB0", 'windows-874') # ฐ
@@ -206,31 +196,31 @@ def test_windows_874
     check_both_ways("\u0E2F", "\xCF", 'windows-874') # ฯ
     check_both_ways("\u0E30", "\xD0", 'windows-874') # ะ
     check_both_ways("\u0E3A", "\xDA", 'windows-874') # ฺ
-    assert_raise(Encoding::UndefinedConversionError) { "\xDB".encode("utf-8", 'windows-874') }
-    assert_raise(Encoding::UndefinedConversionError) { "\xDE".encode("utf-8", 'windows-874') }
+    assert_undefined_in("\xDB", 'windows-874')
+    assert_undefined_in("\xDE", 'windows-874')
     check_both_ways("\u0E3F", "\xDF", 'windows-874') # ฿
     check_both_ways("\u0E40", "\xE0", 'windows-874') # เ
     check_both_ways("\u0E4F", "\xEF", 'windows-874') # ๏
     check_both_ways("\u0E50", "\xF0", 'windows-874') # ๐
     check_both_ways("\u0E5B", "\xFB", 'windows-874') # ๛
-    assert_raise(Encoding::UndefinedConversionError) { "\xFC".encode("utf-8", 'windows-874') }
-    assert_raise(Encoding::UndefinedConversionError) { "\xFF".encode("utf-8", 'windows-874') }
+    assert_undefined_in("\xFC", 'windows-874')
+    assert_undefined_in("\xFF", 'windows-874')
   end
 
   def test_windows_1250
     check_both_ways("\u20AC", "\x80", 'windows-1250') # €
-    assert_raise(Encoding::UndefinedConversionError) { "\x81".encode("utf-8", 'windows-1250') }
+    assert_undefined_in("\x81", 'windows-1250')
     check_both_ways("\u201A", "\x82", 'windows-1250') # ‚
-    assert_raise(Encoding::UndefinedConversionError) { "\x83".encode("utf-8", 'windows-1250') }
+    assert_undefined_in("\x83", 'windows-1250')
     check_both_ways("\u201E", "\x84", 'windows-1250') # „
     check_both_ways("\u2021", "\x87", 'windows-1250') # ‡
-    assert_raise(Encoding::UndefinedConversionError) { "\x88".encode("utf-8", 'windows-1250') }
+    assert_undefined_in("\x88", 'windows-1250')
     check_both_ways("\u2030", "\x89", 'windows-1250') # ‰
     check_both_ways("\u0179", "\x8F", 'windows-1250') # Ź
-    assert_raise(Encoding::UndefinedConversionError) { "\x90".encode("utf-8", 'windows-1250') }
+    assert_undefined_in("\x90", 'windows-1250')
     check_both_ways("\u2018", "\x91", 'windows-1250') # ‘
     check_both_ways("\u2014", "\x97", 'windows-1250') # —
-    assert_raise(Encoding::UndefinedConversionError) { "\x98".encode("utf-8", 'windows-1250') }
+    assert_undefined_in("\x98", 'windows-1250')
     check_both_ways("\u2122", "\x99", 'windows-1250') # ™
     check_both_ways("\u00A0", "\xA0", 'windows-1250') # non-breaking space
     check_both_ways("\u017B", "\xAF", 'windows-1250') # Ż
@@ -251,7 +241,7 @@ def test_windows_1251
     check_both_ways("\u20AC", "\x88", 'windows-1251') # €
     check_both_ways("\u040F", "\x8F", 'windows-1251') # Џ
     check_both_ways("\u0452", "\x90", 'windows-1251') # ђ
-    assert_raise(Encoding::UndefinedConversionError) { "\x98".encode("utf-8", 'windows-1251') }
+    assert_undefined_in("\x98", 'windows-1251')
     check_both_ways("\u045F", "\x9F", 'windows-1251') # џ
     check_both_ways("\u00A0", "\xA0", 'windows-1251') # non-breaking space
     check_both_ways("\u0407", "\xAF", 'windows-1251') # Ї
@@ -269,16 +259,16 @@ def test_windows_1251
 
   def test_windows_1252
     check_both_ways("\u20AC", "\x80", 'windows-1252') # €
-    assert_raise(Encoding::UndefinedConversionError) { "\x81".encode("utf-8", 'windows-1252') }
+    assert_undefined_in("\x81", 'windows-1252')
     check_both_ways("\u201A", "\x82", 'windows-1252') # ‚
     check_both_ways("\u0152", "\x8C", 'windows-1252') # >Œ
-    assert_raise(Encoding::UndefinedConversionError) { "\x8D".encode("utf-8", 'windows-1252') }
+    assert_undefined_in("\x8D", 'windows-1252')
     check_both_ways("\u017D", "\x8E", 'windows-1252') # Ž
-    assert_raise(Encoding::UndefinedConversionError) { "\x8F".encode("utf-8", 'windows-1252') }
-    assert_raise(Encoding::UndefinedConversionError) { "\x90".encode("utf-8", 'windows-1252') }
+    assert_undefined_in("\x8F", 'windows-1252')
+    assert_undefined_in("\x90", 'windows-1252')
     check_both_ways("\u2018", "\x91", 'windows-1252') #‘
     check_both_ways("\u0153", "\x9C", 'windows-1252') # œ
-    assert_raise(Encoding::UndefinedConversionError) { "\x9D".encode("utf-8", 'windows-1252') }
+    assert_undefined_in("\x9D", 'windows-1252')
     check_both_ways("\u017E", "\x9E", 'windows-1252') # ž
     check_both_ways("\u00A0", "\xA0", 'windows-1252') # non-breaking space
     check_both_ways("\u00AF", "\xAF", 'windows-1252') # ¯
@@ -296,24 +286,24 @@ def test_windows_1252
 
   def test_windows_1253
     check_both_ways("\u20AC", "\x80", 'windows-1253') # €
-    assert_raise(Encoding::UndefinedConversionError) { "\x81".encode("utf-8", 'windows-1253') }
+    assert_undefined_in("\x81", 'windows-1253')
     check_both_ways("\u201A", "\x82", 'windows-1253') # ‚
     check_both_ways("\u2021", "\x87", 'windows-1253') # ‡
-    assert_raise(Encoding::UndefinedConversionError) { "\x88".encode("utf-8", 'windows-1253') }
+    assert_undefined_in("\x88", 'windows-1253')
     check_both_ways("\u2030", "\x89", 'windows-1253') # ‰
-    assert_raise(Encoding::UndefinedConversionError) { "\x8A".encode("utf-8", 'windows-1253') }
+    assert_undefined_in("\x8A", 'windows-1253')
     check_both_ways("\u2039", "\x8B", 'windows-1253') # ‹
-    assert_raise(Encoding::UndefinedConversionError) { "\x8C".encode("utf-8", 'windows-1253') }
-    assert_raise(Encoding::UndefinedConversionError) { "\x8F".encode("utf-8", 'windows-1253') }
-    assert_raise(Encoding::UndefinedConversionError) { "\x90".encode("utf-8", 'windows-1253') }
+    assert_undefined_in("\x8C", 'windows-1253')
+    assert_undefined_in("\x8F", 'windows-1253')
+    assert_undefined_in("\x90", 'windows-1253')
     check_both_ways("\u2018", "\x91", 'windows-1253') # ‘
     check_both_ways("\u2014", "\x97", 'windows-1253') # —
-    assert_raise(Encoding::UndefinedConversionError) { "\x98".encode("utf-8", 'windows-1253') }
+    assert_undefined_in("\x98", 'windows-1253')
     check_both_ways("\u2122", "\x99", 'windows-1253') # ™
-    assert_raise(Encoding::UndefinedConversionError) { "\x9A".encode("utf-8", 'windows-1253') }
+    assert_undefined_in("\x9A", 'windows-1253')
     check_both_ways("\u203A", "\x9B", 'windows-1253') # ›
-    assert_raise(Encoding::UndefinedConversionError) { "\x9C".encode("utf-8", 'windows-1253') }
-    assert_raise(Encoding::UndefinedConversionError) { "\x9F".encode("utf-8", 'windows-1253') }
+    assert_undefined_in("\x9C", 'windows-1253')
+    assert_undefined_in("\x9F", 'windows-1253')
     check_both_ways("\u00A0", "\xA0", 'windows-1253') # non-breaking space
     check_both_ways("\u2015", "\xAF", 'windows-1253') # ―
     check_both_ways("\u00B0", "\xB0", 'windows-1253') # °
@@ -322,28 +312,28 @@ def test_windows_1253
     check_both_ways("\u039F", "\xCF", 'windows-1253') # Ο
     check_both_ways("\u03A0", "\xD0", 'windows-1253') # Π
     check_both_ways("\u03A1", "\xD1", 'windows-1253') # Ρ
-    assert_raise(Encoding::UndefinedConversionError) { "\xD2".encode("utf-8", 'windows-1253') }
+    assert_undefined_in("\xD2", 'windows-1253')
     check_both_ways("\u03A3", "\xD3", 'windows-1253') # Σ
     check_both_ways("\u03AF", "\xDF", 'windows-1253') # ί
     check_both_ways("\u03B0", "\xE0", 'windows-1253') # ΰ
     check_both_ways("\u03BF", "\xEF", 'windows-1253') # ο
     check_both_ways("\u03C0", "\xF0", 'windows-1253') # π
     check_both_ways("\u03CE", "\xFE", 'windows-1253') # ώ
-    assert_raise(Encoding::UndefinedConversionError) { "\xFF".encode("utf-8", 'windows-1253') }
+    assert_undefined_in("\xFF", 'windows-1253')
   end
 
   def test_windows_1254
     check_both_ways("\u20AC", "\x80", 'windows-1254') # €
-    assert_raise(Encoding::UndefinedConversionError) { "\x81".encode("utf-8", 'windows-1254') }
+    assert_undefined_in("\x81", 'windows-1254')
     check_both_ways("\u201A", "\x82", 'windows-1254') # ‚
     check_both_ways("\u0152", "\x8C", 'windows-1254') # Œ
-    assert_raise(Encoding::UndefinedConversionError) { "\x8D".encode("utf-8", 'windows-1254') }
-    assert_raise(Encoding::UndefinedConversionError) { "\x8F".encode("utf-8", 'windows-1254') }
-    assert_raise(Encoding::UndefinedConversionError) { "\x90".encode("utf-8", 'windows-1254') }
+    assert_undefined_in("\x8D", 'windows-1254')
+    assert_undefined_in("\x8F", 'windows-1254')
+    assert_undefined_in("\x90", 'windows-1254')
     check_both_ways("\u2018", "\x91", 'windows-1254') # ‘
     check_both_ways("\u0153", "\x9C", 'windows-1254') # œ
-    assert_raise(Encoding::UndefinedConversionError) { "\x9D".encode("utf-8", 'windows-1254') }
-    assert_raise(Encoding::UndefinedConversionError) { "\x9E".encode("utf-8", 'windows-1254') }
+    assert_undefined_in("\x9D", 'windows-1254')
+    assert_undefined_in("\x9E", 'windows-1254')
     check_both_ways("\u0178", "\x9F", 'windows-1254') # Ÿ
     check_both_ways("\u00A0", "\xA0", 'windows-1254') # non-breaking space
     check_both_ways("\u00AF", "\xAF", 'windows-1254') # ¯
@@ -361,20 +351,20 @@ def test_windows_1254
 
   def test_windows_1255
     check_both_ways("\u20AC", "\x80", 'windows-1255') # €
-    assert_raise(Encoding::UndefinedConversionError) { "\x81".encode("utf-8", 'windows-1255') }
+    assert_undefined_in("\x81", 'windows-1255')
     check_both_ways("\u201A", "\x82", 'windows-1255') # ‚
     check_both_ways("\u2030", "\x89", 'windows-1255') # ‰
-    assert_raise(Encoding::UndefinedConversionError) { "\x8A".encode("utf-8", 'windows-1255') }
+    assert_undefined_in("\x8A", 'windows-1255')
     check_both_ways("\u2039", "\x8B", 'windows-1255') # ‹
-    assert_raise(Encoding::UndefinedConversionError) { "\x8C".encode("utf-8", 'windows-1255') }
-    assert_raise(Encoding::UndefinedConversionError) { "\x8F".encode("utf-8", 'windows-1255') }
-    assert_raise(Encoding::UndefinedConversionError) { "\x90".encode("utf-8", 'windows-1255') }
+    assert_undefined_in("\x8C", 'windows-1255')
+    assert_undefined_in("\x8F", 'windows-1255')
+    assert_undefined_in("\x90", 'windows-1255')
     check_both_ways("\u2018", "\x91", 'windows-1255') # ‘
     check_both_ways("\u2122", "\x99", 'windows-1255') # ™
-    assert_raise(Encoding::UndefinedConversionError) { "\x9A".encode("utf-8", 'windows-1255') }
+    assert_undefined_in("\x9A", 'windows-1255')
     check_both_ways("\u203A", "\x9B", 'windows-1255') # ›
-    assert_raise(Encoding::UndefinedConversionError) { "\x9C".encode("utf-8", 'windows-1255') }
-    assert_raise(Encoding::UndefinedConversionError) { "\x9F".encode("utf-8", 'windows-1255') }
+    assert_undefined_in("\x9C", 'windows-1255')
+    assert_undefined_in("\x9F", 'windows-1255')
     check_both_ways("\u00A0", "\xA0", 'windows-1255') # non-breaking space
     check_both_ways("\u00A1", "\xA1", 'windows-1255') # ¡
     check_both_ways("\u00D7", "\xAA", 'windows-1255') # ×
@@ -391,17 +381,17 @@ def test_windows_1255
     check_both_ways("\u05C0", "\xD0", 'windows-1255') # ׀
     check_both_ways("\u05F3", "\xD7", 'windows-1255') # ׳
     check_both_ways("\u05F4", "\xD8", 'windows-1255') # ״
-    assert_raise(Encoding::UndefinedConversionError) { "\xD9".encode("utf-8", 'windows-1255') }
-    assert_raise(Encoding::UndefinedConversionError) { "\xDF".encode("utf-8", 'windows-1255') }
+    assert_undefined_in("\xD9", 'windows-1255')
+    assert_undefined_in("\xDF", 'windows-1255')
     check_both_ways("\u05D0", "\xE0", 'windows-1255') # א
     check_both_ways("\u05DF", "\xEF", 'windows-1255') # ן
     check_both_ways("\u05E0", "\xF0", 'windows-1255') # נ
     check_both_ways("\u05EA", "\xFA", 'windows-1255') # ת
-    assert_raise(Encoding::UndefinedConversionError) { "\xFB".encode("utf-8", 'windows-1255') }
-    assert_raise(Encoding::UndefinedConversionError) { "\xFC".encode("utf-8", 'windows-1255') }
+    assert_undefined_in("\xFB", 'windows-1255')
+    assert_undefined_in("\xFC", 'windows-1255')
     check_both_ways("\u200E", "\xFD", 'windows-1255') # left-to-right mark
     check_both_ways("\u200F", "\xFE", 'windows-1255') # right-to-left mark
-    assert_raise(Encoding::UndefinedConversionError) { "\xFF".encode("utf-8", 'windows-1255') }
+    assert_undefined_in("\xFF", 'windows-1255')
   end
 
   def test_windows_1256
@@ -429,35 +419,35 @@ def test_windows_1256
 
   def test_windows_1257
     check_both_ways("\u20AC", "\x80", 'windows-1257') # €
-    assert_raise(Encoding::UndefinedConversionError) { "\x81".encode("utf-8", 'windows-1257') }
+    assert_undefined_in("\x81", 'windows-1257')
     check_both_ways("\u201A", "\x82", 'windows-1257') # ‚
-    assert_raise(Encoding::UndefinedConversionError) { "\x83".encode("utf-8", 'windows-1257') }
+    assert_undefined_in("\x83", 'windows-1257')
     check_both_ways("\u201E", "\x84", 'windows-1257') # „
     check_both_ways("\u2021", "\x87", 'windows-1257') # ‡
-    assert_raise(Encoding::UndefinedConversionError) { "\x88".encode("utf-8", 'windows-1257') }
+    assert_undefined_in("\x88", 'windows-1257')
     check_both_ways("\u2030", "\x89", 'windows-1257') # ‰
-    assert_raise(Encoding::UndefinedConversionError) { "\x8A".encode("utf-8", 'windows-1257') }
+    assert_undefined_in("\x8A", 'windows-1257')
     check_both_ways("\u2039", "\x8B", 'windows-1257') # ‹
-    assert_raise(Encoding::UndefinedConversionError) { "\x8C".encode("utf-8", 'windows-1257') }
+    assert_undefined_in("\x8C", 'windows-1257')
     check_both_ways("\u00A8", "\x8D", 'windows-1257') # ¨
     check_both_ways("\u02C7", "\x8E", 'windows-1257') # ˇ
     check_both_ways("\u00B8", "\x8F", 'windows-1257') # ¸
-    assert_raise(Encoding::UndefinedConversionError) { "\x90".encode("utf-8", 'windows-1257') }
+    assert_undefined_in("\x90", 'windows-1257')
     check_both_ways("\u2018", "\x91", 'windows-1257') # ‘
     check_both_ways("\u2014", "\x97", 'windows-1257') # —
-    assert_raise(Encoding::UndefinedConversionError) { "\x98".encode("utf-8", 'windows-1257') }
+    assert_undefined_in("\x98", 'windows-1257')
     check_both_ways("\u2122", "\x99", 'windows-1257') # ™
-    assert_raise(Encoding::UndefinedConversionError) { "\x9A".encode("utf-8", 'windows-1257') }
+    assert_undefined_in("\x9A", 'windows-1257')
     check_both_ways("\u203A", "\x9B", 'windows-1257') # ›
-    assert_raise(Encoding::UndefinedConversionError) { "\x9C".encode("utf-8", 'windows-1257') }
+    assert_undefined_in("\x9C", 'windows-1257')
     check_both_ways("\u00AF", "\x9D", 'windows-1257') # ¯
     check_both_ways("\u02DB", "\x9E", 'windows-1257') # ˛
-    assert_raise(Encoding::UndefinedConversionError) { "\x9F".encode("utf-8", 'windows-1257') }
+    assert_undefined_in("\x9F", 'windows-1257')
     check_both_ways("\u00A0", "\xA0", 'windows-1257') # non-breaking space
-    assert_raise(Encoding::UndefinedConversionError) { "\xA1".encode("utf-8", 'windows-1257') }
+    assert_undefined_in("\xA1", 'windows-1257')
     check_both_ways("\u00A2", "\xA2", 'windows-1257') # ¢
     check_both_ways("\u00A4", "\xA4", 'windows-1257') # ¤
-    assert_raise(Encoding::UndefinedConversionError) { "\xA5".encode("utf-8", 'windows-1257') }
+    assert_undefined_in("\xA5", 'windows-1257')
     check_both_ways("\u00A6", "\xA6", 'windows-1257') # ¦
     check_both_ways("\u00C6", "\xAF", 'windows-1257') # Æ
     check_both_ways("\u00B0", "\xB0", 'windows-1257') # °
@@ -492,9 +482,9 @@ def test_IBM437
   end
 
   def test_IBM720
-    assert_raise(Encoding::UndefinedConversionError) { "\x80".encode("utf-8", 'IBM720') }
-    assert_raise(Encoding::UndefinedConversionError) { "\x8F".encode("utf-8", 'IBM720') }
-    assert_raise(Encoding::UndefinedConversionError) { "\x90".encode("utf-8", 'IBM720') }
+    assert_undefined_in("\x80", 'IBM720')
+    assert_undefined_in("\x8F", 'IBM720')
+    assert_undefined_in("\x90", 'IBM720')
     check_both_ways("\u0627", "\x9F", 'IBM720') # ا
     check_both_ways("\u0628", "\xA0", 'IBM720') # ب
     check_both_ways("\u00BB", "\xAF", 'IBM720') # »
@@ -580,17 +570,17 @@ def test_IBM857
     check_both_ways("\u00A4", "\xCF", 'IBM857') # ¤
     check_both_ways("\u00BA", "\xD0", 'IBM857') # º
     check_both_ways("\u00C8", "\xD4", 'IBM857') # È
-    assert_raise(Encoding::UndefinedConversionError) { "\xD5".encode("utf-8", 'IBM857') }
+    assert_undefined_in("\xD5", 'IBM857')
     check_both_ways("\u00CD", "\xD6", 'IBM857') # Í
     check_both_ways("\u2580", "\xDF", 'IBM857') # ▀
     check_both_ways("\u00D3", "\xE0", 'IBM857') # Ó
     check_both_ways("\u00B5", "\xE6", 'IBM857') # µ
-    assert_raise(Encoding::UndefinedConversionError) { "\xE7".encode("utf-8", 'IBM857') }
+    assert_undefined_in("\xE7", 'IBM857')
     check_both_ways("\u00D7", "\xE8", 'IBM857') # ×
     check_both_ways("\u00B4", "\xEF", 'IBM857') # ´
     check_both_ways("\u00AD", "\xF0", 'IBM857') # soft hyphen
     check_both_ways("\u00B1", "\xF1", 'IBM857') # ±
-    assert_raise(Encoding::UndefinedConversionError) { "\xF2".encode("utf-8", 'IBM857') }
+    assert_undefined_in("\xF2", 'IBM857')
     check_both_ways("\u00BE", "\xF3", 'IBM857') # ¾
     check_both_ways("\u00A0", "\xFF", 'IBM857') # non-breaking space
   end
@@ -671,6 +661,25 @@ def test_IBM863
     check_both_ways("\u00A0", "\xFF", 'IBM863') # non-breaking space
   end
 
+  def test_IBM864
+    check_both_ways("\u00B0", "\x80", 'IBM864') # °
+    check_both_ways("\u2518", "\x8F", 'IBM864') # ┘
+    check_both_ways("\u03B2", "\x90", 'IBM864') # β
+    check_both_ways("\uFE73", "\x9F", 'IBM864') # ﹳ
+    check_both_ways("\u00A0", "\xA0", 'IBM864') # non-breaking space
+    check_both_ways("\uFEA5", "\xAF", 'IBM864') # ﺥ
+    check_both_ways("\u0660", "\xB0", 'IBM864') # ٠
+    check_both_ways("\u061F", "\xBF", 'IBM864') # ؟
+    check_both_ways("\u00A2", "\xC0", 'IBM864') # ¢
+    check_both_ways("\uFEA9", "\xCF", 'IBM864') # ﺩ
+    check_both_ways("\uFEAB", "\xD0", 'IBM864') # ﺫ
+    check_both_ways("\uFEC9", "\xDF", 'IBM864') # ﻉ
+    check_both_ways("\u0640", "\xE0", 'IBM864') # ـ
+    check_both_ways("\uFEE1", "\xEF", 'IBM864') # ﻡ
+    check_both_ways("\uFE7D", "\xF0", 'IBM864') # ﹽ
+    check_both_ways("\u25A0", "\xFE", 'IBM864') # ■
+  end
+
   def test_IBM865
     check_both_ways("\u00C7", "\x80", 'IBM865') # Ç
     check_both_ways("\u00C5", "\x8F", 'IBM865') # Å
@@ -710,16 +719,16 @@ def test_IBM866
   end
 
   def test_IBM869
-    assert_raise(Encoding::UndefinedConversionError) { "\x80".encode("utf-8", 'IBM869') }
-    assert_raise(Encoding::UndefinedConversionError) { "\x85".encode("utf-8", 'IBM869') }
+    assert_undefined_in("\x80", 'IBM869')
+    assert_undefined_in("\x85", 'IBM869')
     check_both_ways("\u0386", "\x86", 'IBM869') # Ά
-    assert_raise(Encoding::UndefinedConversionError) { "\x87".encode("utf-8", 'IBM869') }
+    assert_undefined_in("\x87", 'IBM869')
     check_both_ways("\u00B7", "\x88", 'IBM869') # ·
     check_both_ways("\u0389", "\x8F", 'IBM869') # Ή
     check_both_ways("\u038A", "\x90", 'IBM869') # Ί
     check_both_ways("\u038C", "\x92", 'IBM869') # Ό
-    assert_raise(Encoding::UndefinedConversionError) { "\x93".encode("utf-8", 'IBM869') }
-    assert_raise(Encoding::UndefinedConversionError) { "\x94".encode("utf-8", 'IBM869') }
+    assert_undefined_in("\x93", 'IBM869')
+    assert_undefined_in("\x94", 'IBM869')
     check_both_ways("\u038E", "\x95", 'IBM869') # Ύ
     check_both_ways("\u03AF", "\x9F", 'IBM869') # ί
     check_both_ways("\u03CA", "\xA0", 'IBM869') # ϊ
@@ -808,7 +817,7 @@ def test_macGreek
     check_both_ways("\u03BF", "\xEF", 'macGreek') # ο
     check_both_ways("\u03C0", "\xF0", 'macGreek') # π
     check_both_ways("\u03B0", "\xFE", 'macGreek') # ΰ
-    assert_raise(Encoding::UndefinedConversionError) { "\xFF".encode("utf-8", 'macGreek') }
+    assert_undefined_in("\xFF", 'macGreek')
   end
 
   def test_macIceland
@@ -887,7 +896,7 @@ def test_macTurkish
     check_both_ways("\u00D4", "\xEF", 'macTurkish') # Ô
     #check_both_ways("\uF8FF", "\xF0", 'macTurkish') # Apple logo
     check_both_ways("\u00D9", "\xF4", 'macTurkish') # Ù
-    assert_raise(Encoding::UndefinedConversionError) { "\xF5".encode("utf-8", 'macTurkish') }
+    assert_undefined_in("\xF5", 'macTurkish')
     check_both_ways("\u02C6", "\xF6", 'macTurkish') # ˆ
     check_both_ways("\u02C7", "\xFF", 'macTurkish') # ˇ
   end
@@ -958,11 +967,11 @@ def test_koi8_r
   end
 
   def test_TIS_620
-    assert_raise(Encoding::UndefinedConversionError) { "\x80".encode("utf-8", 'TIS-620') }
-    assert_raise(Encoding::UndefinedConversionError) { "\x8F".encode("utf-8", 'TIS-620') }
-    assert_raise(Encoding::UndefinedConversionError) { "\x90".encode("utf-8", 'TIS-620') }
-    assert_raise(Encoding::UndefinedConversionError) { "\x9F".encode("utf-8", 'TIS-620') }
-    assert_raise(Encoding::UndefinedConversionError) { "\xA0".encode("utf-8", 'TIS-620') }
+    assert_undefined_in("\x80", 'TIS-620')
+    assert_undefined_in("\x8F", 'TIS-620')
+    assert_undefined_in("\x90", 'TIS-620')
+    assert_undefined_in("\x9F", 'TIS-620')
+    assert_undefined_in("\xA0", 'TIS-620')
     check_both_ways("\u0E01", "\xA1", 'TIS-620') # ก
     check_both_ways("\u0E0F", "\xAF", 'TIS-620') # ฏ
     check_both_ways("\u0E10", "\xB0", 'TIS-620') # ฐ
@@ -971,15 +980,15 @@ def test_TIS_620
     check_both_ways("\u0E2F", "\xCF", 'TIS-620') # ฯ
     check_both_ways("\u0E30", "\xD0", 'TIS-620') # ะ
     check_both_ways("\u0E3A", "\xDA", 'TIS-620') #  ฺ
-    assert_raise(Encoding::UndefinedConversionError) { "\xDB".encode("utf-8", 'TIS-620') }
-    assert_raise(Encoding::UndefinedConversionError) { "\xDE".encode("utf-8", 'TIS-620') }
+    assert_undefined_in("\xDB", 'TIS-620')
+    assert_undefined_in("\xDE", 'TIS-620')
     check_both_ways("\u0E3F", "\xDF", 'TIS-620') # ฿
     check_both_ways("\u0E40", "\xE0", 'TIS-620') # เ
     check_both_ways("\u0E4F", "\xEF", 'TIS-620') # ๏
     check_both_ways("\u0E50", "\xF0", 'TIS-620') # ๐
     check_both_ways("\u0E5B", "\xFB", 'TIS-620') # ๛
-    assert_raise(Encoding::UndefinedConversionError) { "\xFC".encode("utf-8", 'TIS-620') }
-    assert_raise(Encoding::UndefinedConversionError) { "\xFF".encode("utf-8", 'TIS-620') }
+    assert_undefined_in("\xFC", 'TIS-620')
+    assert_undefined_in("\xFF", 'TIS-620')
   end
 
   def test_CP850
@@ -1182,15 +1191,15 @@ def test_utf_16_bom
     expected = "\u{3042}\u{3044}\u{20bb7}"
     assert_equal(expected, %w/fffe4230443042d8b7df/.pack("H*").encode("UTF-8","UTF-16"))
     check_both_ways(expected, %w/feff30423044d842dfb7/.pack("H*"), "UTF-16")
-    assert_raise(Encoding::InvalidByteSequenceError){%w/feffdfb7/.pack("H*").encode("UTF-8","UTF-16")}
-    assert_raise(Encoding::InvalidByteSequenceError){%w/fffeb7df/.pack("H*").encode("UTF-8","UTF-16")}
+    assert_invalid_in(%w/feffdfb7/.pack("H*"), "UTF-16")
+    assert_invalid_in(%w/fffeb7df/.pack("H*"), "UTF-16")
   end
 
   def test_utf_32_bom
     expected = "\u{3042}\u{3044}\u{20bb7}"
     assert_equal(expected, %w/fffe00004230000044300000b70b0200/.pack("H*").encode("UTF-8","UTF-32"))
     check_both_ways(expected, %w/0000feff000030420000304400020bb7/.pack("H*"), "UTF-32")
-    assert_raise(Encoding::InvalidByteSequenceError){%w/0000feff00110000/.pack("H*").encode("UTF-8","UTF-32")}
+    assert_invalid_in(%w/0000feff00110000/.pack("H*"), "UTF-32")
   end
 
   def check_utf_32_both_ways(utf8, raw)
@@ -1372,24 +1381,24 @@ def test_shift_jis
     check_both_ways("\u71FC", "\xE0\x9E", 'shift_jis') # 燼
     check_both_ways("\u71F9", "\xE0\x9F", 'shift_jis') # 燹
     check_both_ways("\u73F1", "\xE0\xFC", 'shift_jis') # 珱
-    assert_raise(Encoding::UndefinedConversionError) { "\xEF\x40".encode("utf-8", 'shift_jis') }
-    assert_raise(Encoding::UndefinedConversionError) { "\xEF\x7E".encode("utf-8", 'shift_jis') }
-    assert_raise(Encoding::UndefinedConversionError) { "\xEF\x80".encode("utf-8", 'shift_jis') }
-    assert_raise(Encoding::UndefinedConversionError) { "\xEF\x9E".encode("utf-8", 'shift_jis') }
-    assert_raise(Encoding::UndefinedConversionError) { "\xEF\x9F".encode("utf-8", 'shift_jis') }
-    assert_raise(Encoding::UndefinedConversionError) { "\xEF\xFC".encode("utf-8", 'shift_jis') }
-    assert_raise(Encoding::UndefinedConversionError) { "\xF0\x40".encode("utf-8", 'shift_jis') }
-    assert_raise(Encoding::UndefinedConversionError) { "\xF0\x7E".encode("utf-8", 'shift_jis') }
-    assert_raise(Encoding::UndefinedConversionError) { "\xF0\x80".encode("utf-8", 'shift_jis') }
-    assert_raise(Encoding::UndefinedConversionError) { "\xF0\x9E".encode("utf-8", 'shift_jis') }
-    assert_raise(Encoding::UndefinedConversionError) { "\xF0\x9F".encode("utf-8", 'shift_jis') }
-    assert_raise(Encoding::UndefinedConversionError) { "\xF0\xFC".encode("utf-8", 'shift_jis') }
+    assert_undefined_in("\xEF\x40", 'shift_jis')
+    assert_undefined_in("\xEF\x7E", 'shift_jis')
+    assert_undefined_in("\xEF\x80", 'shift_jis')
+    assert_undefined_in("\xEF\x9E", 'shift_jis')
+    assert_undefined_in("\xEF\x9F", 'shift_jis')
+    assert_undefined_in("\xEF\xFC", 'shift_jis')
+    assert_undefined_in("\xF0\x40", 'shift_jis')
+    assert_undefined_in("\xF0\x7E", 'shift_jis')
+    assert_undefined_in("\xF0\x80", 'shift_jis')
+    assert_undefined_in("\xF0\x9E", 'shift_jis')
+    assert_undefined_in("\xF0\x9F", 'shift_jis')
+    assert_undefined_in("\xF0\xFC", 'shift_jis')
     #check_both_ways("\u9ADC", "\xFC\x40", 'shift_jis') # 髜 (IBM extended)
-    assert_raise(Encoding::UndefinedConversionError) { "\xFC\x7E".encode("utf-8", 'shift_jis') }
-    assert_raise(Encoding::UndefinedConversionError) { "\xFC\x80".encode("utf-8", 'shift_jis') }
-    assert_raise(Encoding::UndefinedConversionError) { "\xFC\x9E".encode("utf-8", 'shift_jis') }
-    assert_raise(Encoding::UndefinedConversionError) { "\xFC\x9F".encode("utf-8", 'shift_jis') }
-    assert_raise(Encoding::UndefinedConversionError) { "\xFC\xFC".encode("utf-8", 'shift_jis') }
+    assert_undefined_in("\xFC\x7E", 'shift_jis')
+    assert_undefined_in("\xFC\x80", 'shift_jis')
+    assert_undefined_in("\xFC\x9E", 'shift_jis')
+    assert_undefined_in("\xFC\x9F", 'shift_jis')
+    assert_undefined_in("\xFC\xFC", 'shift_jis')
     check_both_ways("\u677E\u672C\u884C\u5F18", "\x8f\xbc\x96\x7b\x8d\x73\x8d\x4f", 'shift_jis') # 松本行弘
     check_both_ways("\u9752\u5C71\u5B66\u9662\u5927\u5B66", "\x90\xC2\x8E\x52\x8A\x77\x89\x40\x91\xE5\x8A\x77", 'shift_jis') # 青山学院大学
     check_both_ways("\u795E\u6797\u7FA9\u535A", "\x90\x5F\x97\xD1\x8B\x60\x94\x8E", 'shift_jis') # 神林義博
@@ -1409,34 +1418,34 @@ def test_euc_jp
     check_both_ways("\u00F7", "\xA1\xE0", 'euc-jp') # ÷
     check_both_ways("\u25C7", "\xA1\xFE", 'euc-jp') # ◇
     check_both_ways("\u25C6", "\xA2\xA1", 'euc-jp') # ◆
-    assert_raise(Encoding::UndefinedConversionError) { "\xA2\xAF".encode("utf-8", 'euc-jp') }
-    assert_raise(Encoding::UndefinedConversionError) { "\xA2\xB9".encode("utf-8", 'euc-jp') }
-    assert_raise(Encoding::UndefinedConversionError) { "\xA2\xC2".encode("utf-8", 'euc-jp') }
-    assert_raise(Encoding::UndefinedConversionError) { "\xA2\xC9".encode("utf-8", 'euc-jp') }
-    assert_raise(Encoding::UndefinedConversionError) { "\xA2\xD1".encode("utf-8", 'euc-jp') }
-    assert_raise(Encoding::UndefinedConversionError) { "\xA2\xDB".encode("utf-8", 'euc-jp') }
-    assert_raise(Encoding::UndefinedConversionError) { "\xA2\xEB".encode("utf-8", 'euc-jp') }
-    assert_raise(Encoding::UndefinedConversionError) { "\xA2\xF1".encode("utf-8", 'euc-jp') }
-    assert_raise(Encoding::UndefinedConversionError) { "\xA2\xFA".encode("utf-8", 'euc-jp') }
-    assert_raise(Encoding::UndefinedConversionError) { "\xA2\xFD".encode("utf-8", 'euc-jp') }
+    assert_undefined_in("\xA2\xAF", 'euc-jp')
+    assert_undefined_in("\xA2\xB9", 'euc-jp')
+    assert_undefined_in("\xA2\xC2", 'euc-jp')
+    assert_undefined_in("\xA2\xC9", 'euc-jp')
+    assert_undefined_in("\xA2\xD1", 'euc-jp')
+    assert_undefined_in("\xA2\xDB", 'euc-jp')
+    assert_undefined_in("\xA2\xEB", 'euc-jp')
+    assert_undefined_in("\xA2\xF1", 'euc-jp')
+    assert_undefined_in("\xA2\xFA", 'euc-jp')
+    assert_undefined_in("\xA2\xFD", 'euc-jp')
     check_both_ways("\u25EF", "\xA2\xFE", 'euc-jp') # ◯
-    assert_raise(Encoding::UndefinedConversionError) { "\xA3\xAF".encode("utf-8", 'euc-jp') }
-    assert_raise(Encoding::UndefinedConversionError) { "\xA3\xBA".encode("utf-8", 'euc-jp') }
-    assert_raise(Encoding::UndefinedConversionError) { "\xA3\xC0".encode("utf-8", 'euc-jp') }
-    assert_raise(Encoding::UndefinedConversionError) { "\xA3\xDB".encode("utf-8", 'euc-jp') }
-    assert_raise(Encoding::UndefinedConversionError) { "\xA3\xE0".encode("utf-8", 'euc-jp') }
-    assert_raise(Encoding::UndefinedConversionError) { "\xA3\xFB".encode("utf-8", 'euc-jp') }
-    assert_raise(Encoding::UndefinedConversionError) { "\xA4\xF4".encode("utf-8", 'euc-jp') }
-    assert_raise(Encoding::UndefinedConversionError) { "\xA5\xF7".encode("utf-8", 'euc-jp') }
-    assert_raise(Encoding::UndefinedConversionError) { "\xA6\xB9".encode("utf-8", 'euc-jp') }
-    assert_raise(Encoding::UndefinedConversionError) { "\xA6\xC0".encode("utf-8", 'euc-jp') }
-    assert_raise(Encoding::UndefinedConversionError) { "\xA6\xD9".encode("utf-8", 'euc-jp') }
-    assert_raise(Encoding::UndefinedConversionError) { "\xA7\xC2".encode("utf-8", 'euc-jp') }
-    assert_raise(Encoding::UndefinedConversionError) { "\xA7\xD0".encode("utf-8", 'euc-jp') }
-    assert_raise(Encoding::UndefinedConversionError) { "\xA7\xF2".encode("utf-8", 'euc-jp') }
-    assert_raise(Encoding::UndefinedConversionError) { "\xA8\xC1".encode("utf-8", 'euc-jp') }
-    assert_raise(Encoding::UndefinedConversionError) { "\xCF\xD4".encode("utf-8", 'euc-jp') }
-    assert_raise(Encoding::UndefinedConversionError) { "\xCF\xFE".encode("utf-8", 'euc-jp') }
+    assert_undefined_in("\xA3\xAF", 'euc-jp')
+    assert_undefined_in("\xA3\xBA", 'euc-jp')
+    assert_undefined_in("\xA3\xC0", 'euc-jp')
+    assert_undefined_in("\xA3\xDB", 'euc-jp')
+    assert_undefined_in("\xA3\xE0", 'euc-jp')
+    assert_undefined_in("\xA3\xFB", 'euc-jp')
+    assert_undefined_in("\xA4\xF4", 'euc-jp')
+    assert_undefined_in("\xA5\xF7", 'euc-jp')
+    assert_undefined_in("\xA6\xB9", 'euc-jp')
+    assert_undefined_in("\xA6\xC0", 'euc-jp')
+    assert_undefined_in("\xA6\xD9", 'euc-jp')
+    assert_undefined_in("\xA7\xC2", 'euc-jp')
+    assert_undefined_in("\xA7\xD0", 'euc-jp')
+    assert_undefined_in("\xA7\xF2", 'euc-jp')
+    assert_undefined_in("\xA8\xC1", 'euc-jp')
+    assert_undefined_in("\xCF\xD4", 'euc-jp')
+    assert_undefined_in("\xCF\xFE", 'euc-jp')
     check_both_ways("\u6A97", "\xDD\xA1", 'euc-jp') # 檗
     check_both_ways("\u6BEF", "\xDD\xDF", 'euc-jp') # 毯
     check_both_ways("\u9EBE", "\xDD\xE0", 'euc-jp') # 麾
@@ -1449,7 +1458,7 @@ def test_euc_jp
     check_both_ways("\u71FC", "\xDF\xFE", 'euc-jp') # 燼
     check_both_ways("\u71F9", "\xE0\xA1", 'euc-jp') # 燹
     check_both_ways("\u73F1", "\xE0\xFE", 'euc-jp') # 珱
-    assert_raise(Encoding::UndefinedConversionError) { "\xF4\xA7".encode("utf-8", 'euc-jp') }
+    assert_undefined_in("\xF4\xA7", 'euc-jp')
     #check_both_ways("\u9ADC", "\xFC\xE3", 'euc-jp') # 髜 (IBM extended)
 
     check_both_ways("\u677E\u672C\u884C\u5F18", "\xBE\xBE\xCB\xDC\xB9\xD4\xB9\xB0", 'euc-jp') # 松本行弘
@@ -1481,7 +1490,7 @@ def test_euc_jis_2004
     check_both_ways("\u2127", "\xA3\xE0", 'euc-jis-2004') # ℧
     check_both_ways("\u30A0", "\xA3\xFB", 'euc-jis-2004') # ゠
     check_both_ways("\uFF54", "\xA3\xF4", 'euc-jis-2004') # ｔ
-    assert_raise(Encoding::UndefinedConversionError) { "\xA5\xF7".encode("utf-8", 'euc-jis-2004') }
+    assert_undefined_in("\xA5\xF7", 'euc-jis-2004')
     check_both_ways("\u2664", "\xA6\xB9", 'euc-jis-2004') # ♤
     check_both_ways("\u2663", "\xA6\xC0", 'euc-jis-2004') # ♣
     check_both_ways("\u03C2", "\xA6\xD9", 'euc-jis-2004') # ς
@@ -1566,33 +1575,33 @@ def test_eucjp_sjis_unassigned
   end
 
   def test_eucjp_sjis_undef
-    assert_raise(Encoding::UndefinedConversionError) { "\x8e\xe0".encode("Shift_JIS", "EUC-JP") }
-    assert_raise(Encoding::UndefinedConversionError) { "\x8e\xfe".encode("Shift_JIS", "EUC-JP") }
-    assert_raise(Encoding::UndefinedConversionError) { "\x8f\xa1\xa1".encode("Shift_JIS", "EUC-JP") }
-    assert_raise(Encoding::UndefinedConversionError) { "\x8f\xa1\xfe".encode("Shift_JIS", "EUC-JP") }
-    assert_raise(Encoding::UndefinedConversionError) { "\x8f\xfe\xa1".encode("Shift_JIS", "EUC-JP") }
-    assert_raise(Encoding::UndefinedConversionError) { "\x8f\xfe\xfe".encode("Shift_JIS", "EUC-JP") }
-
-    assert_raise(Encoding::UndefinedConversionError) { "\xf0\x40".encode("EUC-JP", "Shift_JIS") }
-    assert_raise(Encoding::UndefinedConversionError) { "\xf0\x7e".encode("EUC-JP", "Shift_JIS") }
-    assert_raise(Encoding::UndefinedConversionError) { "\xf0\x80".encode("EUC-JP", "Shift_JIS") }
-    assert_raise(Encoding::UndefinedConversionError) { "\xf0\xfc".encode("EUC-JP", "Shift_JIS") }
-    assert_raise(Encoding::UndefinedConversionError) { "\xfc\x40".encode("EUC-JP", "Shift_JIS") }
-    assert_raise(Encoding::UndefinedConversionError) { "\xfc\x7e".encode("EUC-JP", "Shift_JIS") }
-    assert_raise(Encoding::UndefinedConversionError) { "\xfc\x80".encode("EUC-JP", "Shift_JIS") }
-    assert_raise(Encoding::UndefinedConversionError) { "\xfc\xfc".encode("EUC-JP", "Shift_JIS") }
+    assert_undefined_conversion("\x8e\xe0", "Shift_JIS", "EUC-JP")
+    assert_undefined_conversion("\x8e\xfe", "Shift_JIS", "EUC-JP")
+    assert_undefined_conversion("\x8f\xa1\xa1", "Shift_JIS", "EUC-JP")
+    assert_undefined_conversion("\x8f\xa1\xfe", "Shift_JIS", "EUC-JP")
+    assert_undefined_conversion("\x8f\xfe\xa1", "Shift_JIS", "EUC-JP")
+    assert_undefined_conversion("\x8f\xfe\xfe", "Shift_JIS", "EUC-JP")
+
+    assert_undefined_conversion("\xf0\x40", "EUC-JP", "Shift_JIS")
+    assert_undefined_conversion("\xf0\x7e", "EUC-JP", "Shift_JIS")
+    assert_undefined_conversion("\xf0\x80", "EUC-JP", "Shift_JIS")
+    assert_undefined_conversion("\xf0\xfc", "EUC-JP", "Shift_JIS")
+    assert_undefined_conversion("\xfc\x40", "EUC-JP", "Shift_JIS")
+    assert_undefined_conversion("\xfc\x7e", "EUC-JP", "Shift_JIS")
+    assert_undefined_conversion("\xfc\x80", "EUC-JP", "Shift_JIS")
+    assert_undefined_conversion("\xfc\xfc", "EUC-JP", "Shift_JIS")
   end
 
   def test_iso_2022_jp
-    assert_raise(Encoding::InvalidByteSequenceError) { "\x1b(A".encode("utf-8", "iso-2022-jp") }
-    assert_raise(Encoding::InvalidByteSequenceError) { "\x1b$(A".encode("utf-8", "iso-2022-jp") }
-    assert_raise(Encoding::InvalidByteSequenceError) { "\x1b$C".encode("utf-8", "iso-2022-jp") }
-    assert_raise(Encoding::InvalidByteSequenceError) { "\x0e".encode("utf-8", "iso-2022-jp") }
-    assert_raise(Encoding::InvalidByteSequenceError) { "\x80".encode("utf-8", "iso-2022-jp") }
-    assert_raise(Encoding::InvalidByteSequenceError) { "\x1b$(Dd!\x1b(B".encode("utf-8", "iso-2022-jp") }
-    assert_raise(Encoding::UndefinedConversionError) { "\u9299".encode("iso-2022-jp") }
-    assert_raise(Encoding::UndefinedConversionError) { "\uff71\uff72\uff73\uff74\uff75".encode("iso-2022-jp") }
-    assert_raise(Encoding::InvalidByteSequenceError) { "\x1b(I12345\x1b(B".encode("utf-8", "iso-2022-jp") }
+    assert_invalid_in("\x1b(A", "iso-2022-jp")
+    assert_invalid_in("\x1b$(A", "iso-2022-jp")
+    assert_invalid_in("\x1b$C", "iso-2022-jp")
+    assert_invalid_in("\x0e", "iso-2022-jp")
+    assert_invalid_in("\x80", "iso-2022-jp")
+    assert_invalid_in("\x1b$(Dd!\x1b(B", "iso-2022-jp")
+    assert_undefined_conversion("\u9299", "iso-2022-jp")
+    assert_undefined_conversion("\uff71\uff72\uff73\uff74\uff75", "iso-2022-jp")
+    assert_invalid_in("\x1b(I12345\x1b(B", "iso-2022-jp")
     assert_equal("\xA1\xA1".force_encoding("euc-jp"),
                  "\e$B!!\e(B".encode("EUC-JP", "ISO-2022-JP"))
     assert_equal("\e$B!!\e(B".force_encoding("ISO-2022-JP"),
@@ -1625,6 +1634,8 @@ def test_to_cp50221
     assert_equal("\e$B%*!+%,%I%J!+%N!+%P%\\%^!+%Q%]%\"\e(B".force_encoding("cp50220"),
         "\xB5\xDE\xB6\xDE\xC4\xDE\xC5\xDE\xC9\xDE\xCA\xDE\xCE\xDE\xCF\xDE\xCA\xDF\xCE\xDF\xB1".
                  encode("cp50220", "sjis"))
+    assert_equal("\e$B\x21\x23\e(I\x7E\e(B".force_encoding("cp50220"),
+                 "\x8E\xA1\x8E\xFE".encode("cp50220", "cp51932"))
   end
 
   def test_iso_2022_jp_1
@@ -1655,11 +1666,11 @@ def test_yen_sign
     assert_equal("\u005C", "\e(J\x5C\e(B".encode("UTF-8", "ISO-2022-JP"))
     assert_equal("\u005C", "\x5C".encode("stateless-ISO-2022-JP", "ISO-2022-JP"))
     assert_equal("\u005C", "\e(J\x5C\e(B".encode("stateless-ISO-2022-JP", "ISO-2022-JP"))
-    assert_raise(Encoding::UndefinedConversionError) { "\u00A5".encode("Shift_JIS") }
-    assert_raise(Encoding::UndefinedConversionError) { "\u00A5".encode("Windows-31J") }
-    assert_raise(Encoding::UndefinedConversionError) { "\u00A5".encode("EUC-JP") }
-    assert_raise(Encoding::UndefinedConversionError) { "\u00A5".encode("eucJP-ms") }
-    assert_raise(Encoding::UndefinedConversionError) { "\u00A5".encode("CP51932") }
+    assert_undefined_conversion("\u00A5", "Shift_JIS")
+    assert_undefined_conversion("\u00A5", "Windows-31J")
+    assert_undefined_conversion("\u00A5", "EUC-JP")
+    assert_undefined_conversion("\u00A5", "eucJP-ms")
+    assert_undefined_conversion("\u00A5", "CP51932")
 
     # FULLWIDTH REVERSE SOLIDUS
     check_both_ways("\uFF3C", "\x81\x5F", "Shift_JIS")
@@ -1680,21 +1691,21 @@ def test_tilde_overline
     assert_equal("\u007E", "\e(J\x7E\e(B".encode("UTF-8", "ISO-2022-JP"))
     assert_equal("\u007E", "\x7E".encode("stateless-ISO-2022-JP", "ISO-2022-JP"))
     assert_equal("\u007E", "\e(J\x7E\e(B".encode("stateless-ISO-2022-JP", "ISO-2022-JP"))
-    assert_raise(Encoding::UndefinedConversionError) { "\u203E".encode("Shift_JIS") }
-    assert_raise(Encoding::UndefinedConversionError) { "\u203E".encode("Windows-31J") }
-    assert_raise(Encoding::UndefinedConversionError) { "\u203E".encode("EUC-JP") }
-    assert_raise(Encoding::UndefinedConversionError) { "\u203E".encode("eucJP-ms") }
-    assert_raise(Encoding::UndefinedConversionError) { "\u203E".encode("CP51932") }
+    assert_undefined_conversion("\u203E", "Shift_JIS")
+    assert_undefined_conversion("\u203E", "Windows-31J")
+    assert_undefined_conversion("\u203E", "EUC-JP")
+    assert_undefined_conversion("\u203E", "eucJP-ms")
+    assert_undefined_conversion("\u203E", "CP51932")
   end
 
   def test_gb2312
     check_both_ways("\u3000", "\xA1\xA1", 'GB2312') # full-width space
     check_both_ways("\u3013", "\xA1\xFE", 'GB2312') # 〓
-    assert_raise(Encoding::UndefinedConversionError) { "\xA2\xB0".encode("utf-8", 'GB2312') }
+    assert_undefined_in("\xA2\xB0", 'GB2312')
     check_both_ways("\u2488", "\xA2\xB1", 'GB2312') # ⒈
-    assert_raise(Encoding::UndefinedConversionError) { "\xA2\xE4".encode("utf-8", 'GB2312') }
+    assert_undefined_in("\xA2\xE4", 'GB2312')
     check_both_ways("\u3220", "\xA2\xE5", 'GB2312') # ㈠
-    assert_raise(Encoding::UndefinedConversionError) { "\xA2\xF0".encode("utf-8", 'GB2312') }
+    assert_undefined_in("\xA2\xF0", 'GB2312')
     check_both_ways("\u2160", "\xA2\xF1", 'GB2312') # Ⅰ
     check_both_ways("\uFF01", "\xA3\xA1", 'GB2312') # ！
     check_both_ways("\uFFE3", "\xA3\xFE", 'GB2312') # ￣
@@ -1705,9 +1716,9 @@ def test_gb2312
     check_both_ways("\u0410", "\xA7\xA1", 'GB2312') # А
     check_both_ways("\u0430", "\xA7\xD1", 'GB2312') # а
     check_both_ways("\u0101", "\xA8\xA1", 'GB2312') # ā
-    assert_raise(Encoding::UndefinedConversionError) { "\xA8\xC4".encode("utf-8", 'GB2312') }
+    assert_undefined_in("\xA8\xC4", 'GB2312')
     check_both_ways("\u3105", "\xA8\xC5", 'GB2312') # ㄅ
-    assert_raise(Encoding::UndefinedConversionError) { "\xA9\xA3".encode("utf-8", 'GB2312') }
+    assert_undefined_in("\xA9\xA3", 'GB2312')
     check_both_ways("\u2500", "\xA9\xA4", 'GB2312') # ─
     check_both_ways("\u554A", "\xB0\xA1", 'GB2312') # 啊
     check_both_ways("\u5265", "\xB0\xFE", 'GB2312') # 剥
@@ -1721,7 +1732,7 @@ def test_gb2312
     check_both_ways("\u7384", "\xD0\xFE", 'GB2312') # 玄
     check_both_ways("\u4F4F", "\xD7\xA1", 'GB2312') # 住
     check_both_ways("\u5EA7", "\xD7\xF9", 'GB2312') # 座
-    assert_raise(Encoding::UndefinedConversionError) { "\xD7\xFA".encode("utf-8", 'GB2312') }
+    assert_undefined_in("\xD7\xFA", 'GB2312')
     check_both_ways("\u647A", "\xDF\xA1", 'GB2312') # 摺
     check_both_ways("\u553C", "\xDF\xFE", 'GB2312') # 唼
     check_both_ways("\u5537", "\xE0\xA1", 'GB2312') # 唷
@@ -1759,48 +1770,48 @@ def test_gbk
     check_both_ways("\u3000", "\xA1\xA1", 'GBK') # full-width space
     check_both_ways("\u3001", "\xA1\xA2", 'GBK') # 、
     check_both_ways("\u3013", "\xA1\xFE", 'GBK') # 〓
-    assert_raise(Encoding::UndefinedConversionError) { "\xA2\xA0".encode("utf-8", 'GBK') }
+    assert_undefined_in("\xA2\xA0", 'GBK')
     check_both_ways("\u2170", "\xA2\xA1", 'GBK') # ⅰ
-    assert_raise(Encoding::UndefinedConversionError) { "\xA2\xB0".encode("utf-8", 'GBK') }
+    assert_undefined_in("\xA2\xB0", 'GBK')
     check_both_ways("\u2488", "\xA2\xB1", 'GBK') # ⒈
-    assert_raise(Encoding::UndefinedConversionError) { "\xA2\xE4".encode("utf-8", 'GBK') }
+    assert_undefined_in("\xA2\xE4", 'GBK')
     check_both_ways("\u3220", "\xA2\xE5", 'GBK') # ㈠
-    assert_raise(Encoding::UndefinedConversionError) { "\xA2\xF0".encode("utf-8", 'GBK') }
+    assert_undefined_in("\xA2\xF0", 'GBK')
     check_both_ways("\u2160", "\xA2\xF1", 'GBK') # Ⅰ
-    assert_raise(Encoding::UndefinedConversionError) { "\xA3\xA0".encode("utf-8", 'GBK') }
+    assert_undefined_in("\xA3\xA0", 'GBK')
     check_both_ways("\uFF01", "\xA3\xA1", 'GBK') # ！
     check_both_ways("\uFFE3", "\xA3\xFE", 'GBK') # ￣
-    assert_raise(Encoding::UndefinedConversionError) { "\xA4\xA0".encode("utf-8", 'GBK') }
+    assert_undefined_in("\xA4\xA0", 'GBK')
     check_both_ways("\u3041", "\xA4\xA1", 'GBK') # ぁ
-    assert_raise(Encoding::UndefinedConversionError) { "\xA5\xA0".encode("utf-8", 'GBK') }
+    assert_undefined_in("\xA5\xA0", 'GBK')
     check_both_ways("\u30A1", "\xA5\xA1", 'GBK') # ァ
     check_both_ways("\u0391", "\xA6\xA1", 'GBK') # Α
     check_both_ways("\u03B1", "\xA6\xC1", 'GBK') # α
-    assert_raise(Encoding::UndefinedConversionError) { "\xA6\xED".encode("utf-8", 'GBK') }
+    assert_undefined_in("\xA6\xED", 'GBK')
     check_both_ways("\uFE3B", "\xA6\xEE", 'GBK') # ︻
     check_both_ways("\u0410", "\xA7\xA1", 'GBK') # А
     check_both_ways("\u0430", "\xA7\xD1", 'GBK') # а
     check_both_ways("\u02CA", "\xA8\x40", 'GBK') # ˊ
     check_both_ways("\u2587", "\xA8\x7E", 'GBK') # ▇
-    assert_raise(Encoding::UndefinedConversionError) { "\xA8\x96".encode("utf-8", 'GBK') }
+    assert_undefined_in("\xA8\x96", 'GBK')
     check_both_ways("\u0101", "\xA8\xA1", 'GBK') # ā
-    assert_raise(Encoding::UndefinedConversionError) { "\xA8\xBC".encode("utf-8", 'GBK') }
-    assert_raise(Encoding::UndefinedConversionError) { "\xA8\xBF".encode("utf-8", 'GBK') }
-    assert_raise(Encoding::UndefinedConversionError) { "\xA8\xC4".encode("utf-8", 'GBK') }
+    assert_undefined_in("\xA8\xBC", 'GBK')
+    assert_undefined_in("\xA8\xBF", 'GBK')
+    assert_undefined_in("\xA8\xC4", 'GBK')
     check_both_ways("\u3105", "\xA8\xC5", 'GBK') # ㄅ
     check_both_ways("\u3021", "\xA9\x40", 'GBK') # 〡
-    assert_raise(Encoding::UndefinedConversionError) { "\xA9\x58".encode("utf-8", 'GBK') }
-    assert_raise(Encoding::UndefinedConversionError) { "\xA9\x5B".encode("utf-8", 'GBK') }
-    assert_raise(Encoding::UndefinedConversionError) { "\xA9\x5D".encode("utf-8", 'GBK') }
+    assert_undefined_in("\xA9\x58", 'GBK')
+    assert_undefined_in("\xA9\x5B", 'GBK')
+    assert_undefined_in("\xA9\x5D", 'GBK')
     check_both_ways("\u3007", "\xA9\x96", 'GBK') # 〇
-    assert_raise(Encoding::UndefinedConversionError) { "\xA9\xA3".encode("utf-8", 'GBK') }
+    assert_undefined_in("\xA9\xA3", 'GBK')
     check_both_ways("\u2500", "\xA9\xA4", 'GBK') # ─
-    assert_raise(Encoding::UndefinedConversionError) { "\xA9\xF0".encode("utf-8", 'GBK') }
+    assert_undefined_in("\xA9\xF0", 'GBK')
     check_both_ways("\u7588", "\xAF\x40", 'GBK') # 疈
     check_both_ways("\u7607", "\xAF\x7E", 'GBK') # 瘇
     check_both_ways("\u7608", "\xAF\x80", 'GBK') # 瘈
     check_both_ways("\u7644", "\xAF\xA0", 'GBK') # 癄
-    assert_raise(Encoding::UndefinedConversionError) { "\xAF\xA1".encode("utf-8", 'GBK') }
+    assert_undefined_in("\xAF\xA1", 'GBK')
     check_both_ways("\u7645", "\xB0\x40", 'GBK') # 癅
     check_both_ways("\u769B", "\xB0\x7E", 'GBK') # 皛
     check_both_ways("\u769C", "\xB0\x80", 'GBK') # 皜
@@ -1841,10 +1852,10 @@ def test_gbk
     check_both_ways("\u9F78", "\xFD\x7E", 'GBK') # 齸
     check_both_ways("\u9F79", "\xFD\x80", 'GBK') # 齹
     check_both_ways("\uF9F1", "\xFD\xA0", 'GBK') # 隣
-    assert_raise(Encoding::UndefinedConversionError) { "\xFD\xA1".encode("utf-8", 'GBK') }
+    assert_undefined_in("\xFD\xA1", 'GBK')
     check_both_ways("\uFA0C", "\xFE\x40", 'GBK') # 兀
     check_both_ways("\uFA29", "\xFE\x4F", 'GBK') # 﨩
-    assert_raise(Encoding::UndefinedConversionError) { "\xFE\x50".encode("utf-8", 'GBK') }
+    assert_undefined_in("\xFE\x50", 'GBK')
     check_both_ways("\u9752\u5C71\u5B66\u9662\u5927\u5B66", "\xC7\xE0\xC9\xBD\xD1\xA7\xD4\xBA\xB4\xF3\xD1\xA7", 'GBK') # 青山学院大学
     check_both_ways("\u795E\u6797\u7FA9\u535A", "\xC9\xF1\xC1\xD6\xC1\x78\xB2\xA9", 'GBK') # 神林義博
   end
@@ -1880,48 +1891,48 @@ def test_gb18030
     check_both_ways("\u3000", "\xA1\xA1", 'GB18030') # full-width space
     check_both_ways("\u3001", "\xA1\xA2", 'GB18030') #
     check_both_ways("\u3013", "\xA1\xFE", 'GB18030') #
-    #assert_raise(Encoding::UndefinedConversionError) { "\xA2\xA0".encode("utf-8", 'GB18030') }
+    #assert_undefined_in("\xA2\xA0", 'GB18030')
     check_both_ways("\u2170", "\xA2\xA1", 'GB18030') # ⅰ
-    #assert_raise(Encoding::UndefinedConversionError) { "\xA2\xB0".encode("utf-8", 'GB18030') }
+    #assert_undefined_in("\xA2\xB0", 'GB18030')
     check_both_ways("\u2488", "\xA2\xB1", 'GB18030') #
-    #assert_raise(Encoding::UndefinedConversionError) { "\xA2\xE4".encode("utf-8", 'GB18030') }
+    #assert_undefined_in("\xA2\xE4", 'GB18030')
     check_both_ways("\u3220", "\xA2\xE5", 'GB18030') # ㈠
-    #assert_raise(Encoding::UndefinedConversionError) { "\xA2\xF0".encode("utf-8", 'GB18030') }
+    #assert_undefined_in("\xA2\xF0", 'GB18030')
     check_both_ways("\u2160", "\xA2\xF1", 'GB18030') # Ⅰ
-    #assert_raise(Encoding::UndefinedConversionError) { "\xA3\xA0".encode("utf-8", 'GB18030') }
+    #assert_undefined_in("\xA3\xA0", 'GB18030')
     check_both_ways("\uFF01", "\xA3\xA1", 'GB18030') # E
     check_both_ways("\uFFE3", "\xA3\xFE", 'GB18030') # E
-    #assert_raise(Encoding::UndefinedConversionError) { "\xA4\xA0".encode("utf-8", 'GB18030') }
+    #assert_undefined_in("\xA4\xA0", 'GB18030')
     check_both_ways("\u3041", "\xA4\xA1", 'GB18030') #
-    #assert_raise(Encoding::UndefinedConversionError) { "\xA5\xA0".encode("utf-8", 'GB18030') }
+    #assert_undefined_in("\xA5\xA0", 'GB18030')
     check_both_ways("\u30A1", "\xA5\xA1", 'GB18030') # ァ
     check_both_ways("\u0391", "\xA6\xA1", 'GB18030') #
     check_both_ways("\u03B1", "\xA6\xC1", 'GB18030') # α
-    #assert_raise(Encoding::UndefinedConversionError) { "\xA6\xED".encode("utf-8", 'GB18030') }
+    #assert_undefined_in("\xA6\xED", 'GB18030')
     check_both_ways("\uFE3B", "\xA6\xEE", 'GB18030') # E
     check_both_ways("\u0410", "\xA7\xA1", 'GB18030') #
     check_both_ways("\u0430", "\xA7\xD1", 'GB18030') # а
     check_both_ways("\u02CA", "\xA8\x40", 'GB18030') #
     check_both_ways("\u2587", "\xA8\x7E", 'GB18030') #
-    #assert_raise(Encoding::UndefinedConversionError) { "\xA8\x96".encode("utf-8", 'GB18030') }
+    #assert_undefined_in("\xA8\x96", 'GB18030')
     check_both_ways("\u0101", "\xA8\xA1", 'GB18030') #
-    #assert_raise(Encoding::UndefinedConversionError) { "\xA8\xBC".encode("utf-8", 'GB18030') }
-    #assert_raise(Encoding::UndefinedConversionError) { "\xA8\xBF".encode("utf-8", 'GB18030') }
-    #assert_raise(Encoding::UndefinedConversionError) { "\xA8\xC4".encode("utf-8", 'GB18030') }
+    #assert_undefined_in("\xA8\xBC", 'GB18030')
+    #assert_undefined_in("\xA8\xBF", 'GB18030')
+    #assert_undefined_in("\xA8\xC4", 'GB18030')
     check_both_ways("\u3105", "\xA8\xC5", 'GB18030') #
     check_both_ways("\u3021", "\xA9\x40", 'GB18030') # 〡
-    #assert_raise(Encoding::UndefinedConversionError) { "\xA9\x58".encode("utf-8", 'GB18030') }
-    #assert_raise(Encoding::UndefinedConversionError) { "\xA9\x5B".encode("utf-8", 'GB18030') }
-    #assert_raise(Encoding::UndefinedConversionError) { "\xA9\x5D".encode("utf-8", 'GB18030') }
+    #assert_undefined_in("\xA9\x58", 'GB18030')
+    #assert_undefined_in("\xA9\x5B", 'GB18030')
+    #assert_undefined_in("\xA9\x5D", 'GB18030')
     check_both_ways("\u3007", "\xA9\x96", 'GB18030') #
-    #assert_raise(Encoding::UndefinedConversionError) { "\xA9\xA3".encode("utf-8", 'GB18030') }
+    #assert_undefined_in("\xA9\xA3", 'GB18030')
     check_both_ways("\u2500", "\xA9\xA4", 'GB18030') # ─
-    #assert_raise(Encoding::UndefinedConversionError) { "\xA9\xF0".encode("utf-8", 'GB18030') }
+    #assert_undefined_in("\xA9\xF0", 'GB18030')
     check_both_ways("\u7588", "\xAF\x40", 'GB18030') #
     check_both_ways("\u7607", "\xAF\x7E", 'GB18030') #
     check_both_ways("\u7608", "\xAF\x80", 'GB18030') #
     check_both_ways("\u7644", "\xAF\xA0", 'GB18030') #
-    #assert_raise(Encoding::UndefinedConversionError) { "\xAF\xA1".encode("utf-8", 'GB18030') }
+    #assert_undefined_in("\xAF\xA1", 'GB18030')
     check_both_ways("\u7645", "\xB0\x40", 'GB18030') #
     check_both_ways("\u769B", "\xB0\x7E", 'GB18030') #
     check_both_ways("\u769C", "\xB0\x80", 'GB18030') #
@@ -1962,10 +1973,10 @@ def test_gb18030
     check_both_ways("\u9F78", "\xFD\x7E", 'GB18030') # 齸
     check_both_ways("\u9F79", "\xFD\x80", 'GB18030') # 齹
     check_both_ways("\uF9F1", "\xFD\xA0", 'GB18030') # E
-    #assert_raise(Encoding::UndefinedConversionError) { "\xFD\xA1".encode("utf-8", 'GB18030') }
+    #assert_undefined_in("\xFD\xA1", 'GB18030')
     check_both_ways("\uFA0C", "\xFE\x40", 'GB18030') # E
     check_both_ways("\uFA29", "\xFE\x4F", 'GB18030') # E
-    #assert_raise(Encoding::UndefinedConversionError) { "\xFE\x50".encode("utf-8", 'GB18030') }
+    #assert_undefined_in("\xFE\x50", 'GB18030')
     check_both_ways("\u9752\u5C71\u5B66\u9662\u5927\u5B66", "\xC7\xE0\xC9\xBD\xD1\xA7\xD4\xBA\xB4\xF3\xD1\xA7", 'GB18030') # 青山学院大学
     check_both_ways("\u795E\u6797\u7FA9\u535A", "\xC9\xF1\xC1\xD6\xC1\x78\xB2\xA9", 'GB18030') # 神林義
 
@@ -2020,7 +2031,7 @@ def test_Big5
     check_both_ways("\u310F", "\xA3\x7E", 'Big5') # ㄏ
     check_both_ways("\u3110", "\xA3\xA1", 'Big5') # ㄐ
     check_both_ways("\u02CB", "\xA3\xBF", 'Big5') # ˋ
-    assert_raise(Encoding::UndefinedConversionError) { "\xA3\xC0".encode("utf-8", 'Big5') }
+    assert_undefined_in("\xA3\xC0", 'Big5')
     check_both_ways("\u6D6C", "\xAF\x40", 'Big5') # 浬
     check_both_ways("\u7837", "\xAF\x7E", 'Big5') # 砷
     check_both_ways("\u7825", "\xAF\xA1", 'Big5') # 砥
@@ -2039,9 +2050,9 @@ def test_Big5
     check_both_ways("\u77AC", "\xC0\xFE", 'Big5') # 瞬
     check_both_ways("\u8B96", "\xC6\x40", 'Big5') # 讖
     check_both_ways("\u7C72", "\xC6\x7E", 'Big5') # 籲
-    #assert_raise(Encoding::UndefinedConversionError) { "\xC6\xA1".encode("utf-8", 'Big5') }
-    #assert_raise(Encoding::UndefinedConversionError) { "\xC7\x40".encode("utf-8", 'Big5') }
-    #assert_raise(Encoding::UndefinedConversionError) { "\xC8\x40".encode("utf-8", 'Big5') }
+    #assert_undefined_in("\xC6\xA1", 'Big5')
+    #assert_undefined_in("\xC7\x40", 'Big5')
+    #assert_undefined_in("\xC8\x40", 'Big5')
     check_both_ways("\u4E42", "\xC9\x40", 'Big5') # 乂
     check_both_ways("\u6C15", "\xC9\x7E", 'Big5') # 氕
     check_both_ways("\u6C36", "\xC9\xA1", 'Big5') # 氶
@@ -2074,7 +2085,7 @@ def test_Big5
     check_both_ways("\u9F0A", "\xF9\x7E", 'Big5') # 鼊
     check_both_ways("\u9FA4", "\xF9\xA1", 'Big5') # 龤
     check_both_ways("\u9F98", "\xF9\xD5", 'Big5') # 龘
-    #assert_raise(Encoding::UndefinedConversionError) { "\xF9\xD6".encode("utf-8", 'Big5') }
+    #assert_undefined_in("\xF9\xD6", 'Big5')
     check_both_ways("\u795E\u6797\u7FA9\u535A", "\xAF\xAB\xAA\x4C\xB8\x71\xB3\xD5", 'Big5') # 神林義博
   end
 
@@ -2087,7 +2098,7 @@ def test_Big5_Hkscs
     check_both_ways("\u310F", "\xA3\x7E", 'Big5-HKSCS') # ㄏ
     check_both_ways("\u3110", "\xA3\xA1", 'Big5-HKSCS') # ㄐ
     check_both_ways("\u02CB", "\xA3\xBF", 'Big5-HKSCS') # ˋ
-    #assert_raise(Encoding::UndefinedConversionError) { "\xA3\xC0".encode("utf-8", 'Big5-HKSCS') }
+    #assert_undefined_in("\xA3\xC0", 'Big5-HKSCS')
     check_both_ways("\u6D6C", "\xAF\x40", 'Big5-HKSCS') # 浬
     check_both_ways("\u7837", "\xAF\x7E", 'Big5-HKSCS') # 砷
     check_both_ways("\u7825", "\xAF\xA1", 'Big5-HKSCS') # 砥
@@ -2106,9 +2117,9 @@ def test_Big5_Hkscs
     check_both_ways("\u77AC", "\xC0\xFE", 'Big5-HKSCS') # 瞬
     check_both_ways("\u8B96", "\xC6\x40", 'Big5-HKSCS') # 讖
     check_both_ways("\u7C72", "\xC6\x7E", 'Big5-HKSCS') # 籲
-    #assert_raise(Encoding::UndefinedConversionError) { "\xC6\xA1".encode("utf-8", 'Big5-HKSCS') }
-    #assert_raise(Encoding::UndefinedConversionError) { "\xC7\x40".encode("utf-8", 'Big5-HKSCS') }
-    #assert_raise(Encoding::UndefinedConversionError) { "\xC8\x40".encode("utf-8", 'Big5-HKSCS') }
+    #assert_undefined_in("\xC6\xA1", 'Big5-HKSCS')
+    #assert_undefined_in("\xC7\x40", 'Big5-HKSCS')
+    #assert_undefined_in("\xC8\x40", 'Big5-HKSCS')
     check_both_ways("\u4E42", "\xC9\x40", 'Big5-HKSCS') # 乂
     check_both_ways("\u6C15", "\xC9\x7E", 'Big5-HKSCS') # 氕
     check_both_ways("\u6C36", "\xC9\xA1", 'Big5-HKSCS') # 氶
@@ -2142,7 +2153,7 @@ def test_Big5_Hkscs
     check_both_ways("\u9FA4", "\xF9\xA1", 'Big5-HKSCS') # 龤
     check_both_ways("\u9F98", "\xF9\xD5", 'Big5-HKSCS') # 龘
     #check_both_ways("\u{23ED7}", "\x8E\x40", 'Big5-HKSCS') # 𣻗
-    #assert_raise(Encoding::UndefinedConversionError) { "\xF9\xD6".encode("utf-8", 'Big5-HKSCS') }
+    #assert_undefined_in("\xF9\xD6", 'Big5-HKSCS')
     check_both_ways("\u795E\u6797\u7FA9\u535A", "\xAF\xAB\xAA\x4C\xB8\x71\xB3\xD5", 'Big5-HKSCS') # 神林義博
   end
 
@@ -2275,7 +2286,7 @@ def test_loading_race
           result = th.map(&:value)
         end
       end
-      expected = "\xa4\xa2".force_encoding(Encoding::EUC_JP)
+      expected = "\xa4\xa2".dup.force_encoding(Encoding::EUC_JP)
       assert_equal([expected]*num, result, bug11277)
     end;
   end
@@ -2308,4 +2319,34 @@ def test_newline_options
     assert_equal("A\nB\nC", s.encode(usascii, lf_newline: true))
     assert_equal("A\nB\nC", s.encode(usascii, newline: :lf))
   end
+
+  private
+
+  def assert_conversion_both_ways_utf8(utf8, raw, encoding)
+    assert_conversion_both_ways(utf8, 'utf-8', raw, encoding)
+  end
+  alias check_both_ways assert_conversion_both_ways_utf8
+
+  def assert_conversion_both_ways(str1, enc1, str2, enc2)
+    message = str1.dump+str2.dump
+    assert_equal(str1.force_encoding(enc1), str2.encode(enc1, enc2), message)
+    assert_equal(str2.force_encoding(enc2), str1.encode(enc2, enc1), message)
+  end
+  alias check_both_ways2 assert_conversion_both_ways
+
+  def assert_undefined_conversion(str, to, from = nil)
+    assert_raise(Encoding::UndefinedConversionError) { str.encode(to, from) }
+  end
+
+  def assert_undefined_in(str, encoding)
+    assert_undefined_conversion(str, 'utf-8', encoding)
+  end
+
+  def assert_invalid_byte_sequence(str, to, from = nil)
+    assert_raise(Encoding::InvalidByteSequenceError) { str.encode(to, from) }
+  end
+
+  def assert_invalid_in(str, encoding)
+    assert_invalid_byte_sequence(str, 'utf-8', encoding)
+  end
 end
diff --git a/test/ruby/test_variable.rb b/test/ruby/test_variable.rb
index e50b681ce8232a..984045e05d0479 100644
--- a/test/ruby/test_variable.rb
+++ b/test/ruby/test_variable.rb
@@ -407,12 +407,45 @@ def test_external_ivars
     }
   end
 
+  def test_exivar_resize_with_compaction_stress
+    omit "compaction doesn't work well on s390x" if RUBY_PLATFORM =~ /s390x/ # https://github.com/ruby/ruby/pull/5077
+    objs = 10_000.times.map do
+      ExIvar.new
+    end
+    EnvUtil.under_gc_compact_stress do
+      10.times do
+        x = ExIvar.new
+        x.instance_variable_set(:@resize, 1)
+        x
+      end
+    end
+  end
+
   def test_local_variables_with_kwarg
     bug11674 = '[ruby-core:71437] [Bug #11674]'
     v = with_kwargs_11(v1:1,v2:2,v3:3,v4:4,v5:5,v6:6,v7:7,v8:8,v9:9,v10:10,v11:11)
     assert_equal(%i(v1 v2 v3 v4 v5 v6 v7 v8 v9 v10 v11), v, bug11674)
   end
 
+  def test_many_instance_variables
+    objects = [Object.new, Hash.new, Module.new]
+    objects.each do |obj|
+      1000.times do |i|
+        obj.instance_variable_set("@var#{i}", i)
+      end
+      1000.times do |i|
+        assert_equal(i, obj.instance_variable_get("@var#{i}"))
+      end
+    end
+  end
+
+  def test_local_variables_encoding
+    α = 1
+    b = binding
+    b.eval("".encode("us-ascii"))
+    assert_equal(%i[α b], b.local_variables)
+  end
+
   private
   def with_kwargs_11(v1:, v2:, v3:, v4:, v5:, v6:, v7:, v8:, v9:, v10:, v11:)
     local_variables
diff --git a/test/ruby/test_vm_dump.rb b/test/ruby/test_vm_dump.rb
index 9c06ec14fb2736..a3e7b69913b7d2 100644
--- a/test/ruby/test_vm_dump.rb
+++ b/test/ruby/test_vm_dump.rb
@@ -1,14 +1,15 @@
 # frozen_string_literal: true
 require 'test/unit'
 
+return unless /darwin/ =~ RUBY_PLATFORM
+
 class TestVMDump < Test::Unit::TestCase
-  def assert_darwin_vm_dump_works(args)
-    omit if RUBY_PLATFORM !~ /darwin/
-    assert_in_out_err(args, "", [], /^\[IMPORTANT\]/)
+  def assert_darwin_vm_dump_works(args, timeout=nil)
+    assert_in_out_err(args, "", [], /^\[IMPORTANT\]/, timeout: timeout || 300)
   end
 
   def test_darwin_invalid_call
-    assert_darwin_vm_dump_works(['-rfiddle', '-eFiddle::Function.new(Fiddle::Pointer.new(1), [], Fiddle::TYPE_VOID).call'])
+    assert_darwin_vm_dump_works(['-r-test-/fatal', '-eBug.invalid_call(1)'])
   end
 
   def test_darwin_segv_in_syscall
@@ -16,6 +17,6 @@ def test_darwin_segv_in_syscall
   end
 
   def test_darwin_invalid_access
-    assert_darwin_vm_dump_works(['-rfiddle', '-eFiddle.dlunwrap(100).inspect'])
+    assert_darwin_vm_dump_works(['-r-test-/fatal', '-eBug.invalid_access(100)'])
   end
 end
diff --git a/test/ruby/test_warning.rb b/test/ruby/test_warning.rb
new file mode 100644
index 00000000000000..cd220ff00f6234
--- /dev/null
+++ b/test/ruby/test_warning.rb
@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+require 'test/unit'
+
+class TestWarning < Test::Unit::TestCase
+  def test_warn_called_only_when_category_enabled
+    # Assert that warn is called when the category is enabled
+    assert_separately([], "#{<<~"begin;"}\n#{<<~'end;'}")
+      begin;
+        Warning[:deprecated] = true
+        $warnings = []
+        def Warning.warn(msg, category:)
+          $warnings << [msg, category]
+        end
+        assert_equal(0, $warnings.length)
+        "" << 12
+        assert_equal(1, $warnings.length)
+      end;
+
+    assert_separately([], "#{<<~"begin;"}\n#{<<~'end;'}")
+      begin;
+        Warning[:deprecated] = false
+        $warnings = []
+        def Warning.warn(msg, category:)
+          $warnings << [msg, category]
+        end
+        assert_equal(0, $warnings.length)
+        "" << 12
+        assert_equal(0, $warnings.length, $warnings.join)
+      end;
+  end
+end
diff --git a/test/ruby/test_weakkeymap.rb b/test/ruby/test_weakkeymap.rb
index be3e80cec46932..91c1538076f9f4 100644
--- a/test/ruby/test_weakkeymap.rb
+++ b/test/ruby/test_weakkeymap.rb
@@ -61,6 +61,20 @@ def test_clear
     refute @wm[k]
   end
 
+  def test_clear_bug_20691
+    assert_normal_exit(<<~RUBY)
+      map = ObjectSpace::WeakKeyMap.new
+
+      1_000.times do
+        1_000.times do
+          map[Object.new] = nil
+        end
+
+        map.clear
+      end
+    RUBY
+  end
+
   def test_inspect
     x = Object.new
     k = Object.new
@@ -87,7 +101,7 @@ def test_frozen_object
     assert_nothing_raised(FrozenError) {@wm['foo'] = o}
   end
 
-  def test_inconsistent_hash_key
+  def test_inconsistent_hash_key_memory_leak
     assert_no_memory_leak [], '', <<~RUBY
       class BadHash
         def initialize
@@ -123,6 +137,11 @@ def test_compaction
     end;
   end
 
+  def test_gc_compact_stress
+    omit "compaction doesn't work well on s390x" if RUBY_PLATFORM =~ /s390x/ # https://github.com/ruby/ruby/pull/5077
+    EnvUtil.under_gc_compact_stress { ObjectSpace::WeakKeyMap.new }
+  end
+
   private
 
   def assert_weak_include(m, k, n = 100)
diff --git a/test/ruby/test_weakmap.rb b/test/ruby/test_weakmap.rb
index a30004bce3be1c..a2904776bc905f 100644
--- a/test/ruby/test_weakmap.rb
+++ b/test/ruby/test_weakmap.rb
@@ -78,7 +78,7 @@ def test_inspect_garbage
       @wm[i] = Object.new
       @wm.inspect
     end
-    assert_match(/\A\#<#{@wm.class.name}:[^:]++:(?:\s\d+\s=>\s\#<(?:Object|collected):[^:<>]*+>(?:,|>\z))+/,
+    assert_match(/\A\#<#{@wm.class.name}:0x[\da-f]+(?::(?: \d+ => \#<(?:Object|collected):0x[\da-f]+>,?)+)?>\z/,
                  @wm.inspect)
   end
 
@@ -237,6 +237,11 @@ def test_compaction
     end;
   end
 
+  def test_gc_compact_stress
+    omit "compaction doesn't work well on s390x" if RUBY_PLATFORM =~ /s390x/ # https://github.com/ruby/ruby/pull/5077
+    EnvUtil.under_gc_compact_stress { ObjectSpace::WeakMap.new }
+  end
+
   def test_replaced_values_bug_19531
     a = "A".dup
     b = "B".dup
@@ -253,4 +258,11 @@ def test_replaced_values_bug_19531
 
     assert_equal b, @wm[1]
   end
+
+  def test_use_after_free_bug_20688
+    assert_normal_exit(<<~RUBY)
+      weakmap = ObjectSpace::WeakMap.new
+      10_000.times { weakmap[Object.new] = Object.new }
+    RUBY
+  end
 end
diff --git a/test/ruby/test_whileuntil.rb b/test/ruby/test_whileuntil.rb
index 121c44817df4a2..ff6d29ac4a9f89 100644
--- a/test/ruby/test_whileuntil.rb
+++ b/test/ruby/test_whileuntil.rb
@@ -73,6 +73,24 @@ def test_while
     }
   end
 
+  def test_begin_while
+    i = 0
+    sum = 0
+    begin
+      i += 1
+      sum += i
+    end while i < 10
+    assert_equal([10, 55], [i, sum])
+
+    i = 0
+    sum = 0
+    (
+      i += 1
+      sum += i
+    ) while false
+    assert_equal([0, 0], [i, sum])
+  end
+
   def test_until
     i = 0
     until i>4
diff --git a/test/ruby/test_yjit.rb b/test/ruby/test_yjit.rb
index cc9507aff490e4..25399d1e628f33 100644
--- a/test/ruby/test_yjit.rb
+++ b/test/ruby/test_yjit.rb
@@ -10,6 +10,8 @@
 
 return unless JITSupport.yjit_supported?
 
+require 'stringio'
+
 # Tests for YJIT with assertions on compilation and side exits
 # insipired by the RJIT tests in test/ruby/test_rjit.rb
 class TestYJIT < Test::Unit::TestCase
@@ -51,31 +53,127 @@ def test_command_line_switches
     #assert_in_out_err('--yjit-call-threshold=', '', [], /--yjit-call-threshold needs an argument/)
   end
 
-  def test_starting_paused
-    program = <<~RUBY
+  def test_yjit_enable
+    args = []
+    args << "--disable=yjit" if RubyVM::YJIT.enabled?
+    assert_separately(args, <<~'RUBY')
+      refute_predicate RubyVM::YJIT, :enabled?
+      refute_includes RUBY_DESCRIPTION, "+YJIT"
+
+      RubyVM::YJIT.enable
+
+      assert_predicate RubyVM::YJIT, :enabled?
+      assert_includes RUBY_DESCRIPTION, "+YJIT"
+    RUBY
+  end
+
+  def test_yjit_disable
+    assert_separately(["--yjit", "--yjit-disable"], <<~'RUBY')
+      refute_predicate RubyVM::YJIT, :enabled?
+      refute_includes RUBY_DESCRIPTION, "+YJIT"
+
+      RubyVM::YJIT.enable
+
+      assert_predicate RubyVM::YJIT, :enabled?
+      assert_includes RUBY_DESCRIPTION, "+YJIT"
+    RUBY
+  end
+
+  def test_yjit_enable_stats_false
+    assert_separately(["--yjit-disable", "--yjit-stats"], <<~RUBY, ignore_stderr: true)
+      assert_false RubyVM::YJIT.enabled?
+      assert_nil RubyVM::YJIT.runtime_stats
+
+      RubyVM::YJIT.enable
+
+      assert_true RubyVM::YJIT.enabled?
+      assert_true RubyVM::YJIT.runtime_stats[:all_stats]
+    RUBY
+  end
+
+  def test_yjit_enable_stats_true
+    args = []
+    args << "--disable=yjit" if RubyVM::YJIT.enabled?
+    assert_separately(args, <<~RUBY, ignore_stderr: true)
+      assert_false RubyVM::YJIT.enabled?
+      assert_nil RubyVM::YJIT.runtime_stats
+
+      RubyVM::YJIT.enable(stats: true)
+
+      assert_true RubyVM::YJIT.enabled?
+      assert_true RubyVM::YJIT.runtime_stats[:all_stats]
+    RUBY
+  end
+
+  def test_yjit_enable_stats_quiet
+    assert_in_out_err(['--yjit-disable', '-e', 'RubyVM::YJIT.enable(stats: true)']) do |_stdout, stderr, _status|
+      assert_not_empty stderr
+    end
+    assert_in_out_err(['--yjit-disable', '-e', 'RubyVM::YJIT.enable(stats: :quiet)']) do |_stdout, stderr, _status|
+      assert_empty stderr
+    end
+  end
+
+  def test_yjit_enable_with_call_threshold
+    assert_separately(%w[--yjit-disable --yjit-call-threshold=1], <<~RUBY)
       def not_compiled = nil
       def will_compile = nil
-      def compiled_counts = RubyVM::YJIT.runtime_stats[:compiled_iseq_count]
-      counts = []
+      def compiled_counts = RubyVM::YJIT.runtime_stats&.dig(:compiled_iseq_count)
+
       not_compiled
-      counts << compiled_counts
+      assert_nil compiled_counts
+      assert_false RubyVM::YJIT.enabled?
 
-      RubyVM::YJIT.resume
+      RubyVM::YJIT.enable
 
       will_compile
-      counts << compiled_counts
+      assert compiled_counts > 0
+      assert_true RubyVM::YJIT.enabled?
+    RUBY
+  end
 
-      if counts[0] == 0 && counts[1] > 0
-        p :ok
-      end
+  def test_yjit_enable_with_monkey_patch
+    assert_separately(%w[--yjit-disable], <<~RUBY)
+      # This lets rb_method_entry_at(rb_mKernel, ...) return NULL
+      Kernel.prepend(Module.new)
+
+      # This must not crash with "undefined optimized method!"
+      RubyVM::YJIT.enable
     RUBY
-    assert_in_out_err(%w[--yjit-pause --yjit-stats --yjit-call-threshold=1], program, success: true) do |stdout, stderr|
-      assert_equal([":ok"], stdout)
+  end
+
+  def test_yjit_enable_with_valid_runtime_call_threshold_option
+    assert_in_out_err(['--yjit-disable', '-e',
+                       'RubyVM::YJIT.enable(call_threshold: 1); puts RubyVM::YJIT.enabled?']) do |stdout, stderr, _status|
+      assert_empty stderr
+      assert_include stdout.join, "true"
+    end
+  end
+
+  def test_yjit_enable_with_invalid_runtime_call_threshold_option
+    assert_in_out_err(['--yjit-disable', '-e', 'RubyVM::YJIT.enable(mem_size: 0)']) do |stdout, stderr, status|
+      assert_not_empty stderr
+      assert_match(/ArgumentError/, stderr.join)
+      assert_equal 1, status.exitstatus
+    end
+  end
+
+  def test_yjit_enable_with_invalid_runtime_mem_size_option
+    assert_in_out_err(['--yjit-disable', '-e', 'RubyVM::YJIT.enable(mem_size: 0)']) do |stdout, stderr, status|
+      assert_not_empty stderr
+      assert_match(/ArgumentError/, stderr.join)
+      assert_equal 1, status.exitstatus
+    end
+  end
+
+  if JITSupport.zjit_supported?
+    def test_yjit_enable_with_zjit_enabled
+      assert_in_out_err(['--zjit'], 'puts RubyVM::YJIT.enable', ['false'], ['Only one JIT can be enabled at the same time.'])
     end
   end
 
   def test_yjit_stats_and_v_no_error
-    _stdout, stderr, _status = EnvUtil.invoke_ruby(%w(-v --yjit-stats), '', true, true)
+    _stdout, stderr, _status = invoke_ruby(%w(-v --yjit-stats), '', true, true)
     refute_includes(stderr, "NoMethodError")
   end
 
@@ -264,10 +362,10 @@ def test_compile_tostring
   end
 
   def test_compile_opt_aset
-    assert_compiles('[1,2,3][2] = 4', insns: %i[opt_aset])
-    assert_compiles('{}[:foo] = :bar', insns: %i[opt_aset])
-    assert_compiles('[1,2,3][0..-1] = []', insns: %i[opt_aset])
-    assert_compiles('"foo"[3] = "d"', insns: %i[opt_aset])
+    assert_compiles('[1,2,3][2] = 4', insns: %i[opt_aset], frozen_string_literal: false)
+    assert_compiles('{}[:foo] = :bar', insns: %i[opt_aset], frozen_string_literal: false)
+    assert_compiles('[1,2,3][0..-1] = []', insns: %i[opt_aset], frozen_string_literal: false)
+    assert_compiles('"foo"[3] = "d"', insns: %i[opt_aset], frozen_string_literal: false)
   end
 
   def test_compile_attr_set
@@ -476,6 +574,32 @@ class << A
     RUBY
   end
 
+  def test_opt_getconstant_path_general
+    assert_compiles(<<~RUBY, result: [1, 1])
+      module Base
+        Const = 1
+      end
+
+      class Sub
+        def const
+          _const = nil # make a non-entry block for opt_getconstant_path
+          Const
+        end
+
+        def self.const_missing(n)
+          Base.const_get(n)
+        end
+      end
+
+
+      sub = Sub.new
+      result = []
+      result << sub.const # generate the general case
+      result << sub.const # const_missing does not invalidate the block
+      result
+    RUBY
+  end
+
   def test_string_interpolation
     assert_compiles(<<~'RUBY', insns: %i[objtostring anytostring concatstrings], result: "foobar", call_threshold: 2)
       def make_str(foo, bar)
@@ -1011,8 +1135,57 @@ def test_on_stack_code_gc_twice
     RUBY
   end
 
+  def test_disable_code_gc_with_many_iseqs
+    assert_compiles(code_gc_helpers + <<~'RUBY', exits: :any, result: :ok, mem_size: 1, code_gc: false)
+      fiber = Fiber.new {
+        # Loop to call the same basic block again after Fiber.yield
+        while true
+          Fiber.yield(nil.to_i)
+        end
+      }
+
+      return :not_paged1 unless add_pages(250) # use some pages
+      return :broken_resume1 if fiber.resume != 0 # leave an on-stack code as well
+
+      add_pages(2000) # use a whole lot of pages to run out of 1MiB
+      return :broken_resume2 if fiber.resume != 0 # on-stack code should be callable
+
+      code_gc_count = RubyVM::YJIT.runtime_stats[:code_gc_count]
+      return :"code_gc_#{code_gc_count}" if code_gc_count != 0
+
+      :ok
+    RUBY
+  end
+
   def test_code_gc_with_many_iseqs
-    assert_compiles(code_gc_helpers + <<~'RUBY', exits: :any, result: :ok, mem_size: 1)
+    assert_compiles(code_gc_helpers + <<~'RUBY', exits: :any, result: :ok, mem_size: 1, code_gc: true)
+      fiber = Fiber.new {
+        # Loop to call the same basic block again after Fiber.yield
+        while true
+          Fiber.yield(nil.to_i)
+        end
+      }
+
+      return :not_paged1 unless add_pages(250) # use some pages
+      return :broken_resume1 if fiber.resume != 0 # leave an on-stack code as well
+
+      add_pages(2000) # use a whole lot of pages to run out of 1MiB
+      return :broken_resume2 if fiber.resume != 0 # on-stack code should be callable
+
+      code_gc_count = RubyVM::YJIT.runtime_stats[:code_gc_count]
+      return :"code_gc_#{code_gc_count}" if code_gc_count == 0
+
+      :ok
+    RUBY
+  end
+
+  def test_code_gc_with_auto_compact
+    omit "compaction is not supported on this platform" unless GC.respond_to?(:compact)
+
+    assert_compiles((code_gc_helpers + <<~'RUBY'), exits: :any, result: :ok, mem_size: 1, code_gc: true)
+      # Test ISEQ moves in the middle of code GC
+      GC.auto_compact = true
+
       fiber = Fiber.new {
         # Loop to call the same basic block again after Fiber.yield
         while true
@@ -1123,7 +1296,7 @@ def foo
   def test_bug_19316
     n = 2 ** 64
     # foo's extra param and the splats are relevant
-    assert_compiles(<<~'RUBY', result: [[n, -n], [n, -n]])
+    assert_compiles(<<~'RUBY', result: [[n, -n], [n, -n]], exits: :any)
       def foo(_, a, b, c)
         [a & b, ~c]
       end
@@ -1137,6 +1310,8 @@ def foo(_, a, b, c)
   end
 
   def test_gc_compact_cyclic_branch
+    omit "compaction is not supported on this platform" unless GC.respond_to?(:compact)
+
     assert_compiles(<<~'RUBY', result: 2)
       def foo
         i = 0
@@ -1153,7 +1328,7 @@ def foo
   end
 
   def test_invalidate_cyclic_branch
-    assert_compiles(<<~'RUBY', result: 2)
+    assert_compiles(<<~'RUBY', result: 2, exits: { opt_plus: 1 })
       def foo
         i = 0
         while i < 2
@@ -1171,7 +1346,7 @@ def +(x) = self - -x
   end
 
   def test_tracing_str_uplus
-    assert_compiles(<<~RUBY, frozen_string_literal: true, result: :ok)
+    assert_compiles(<<~RUBY, frozen_string_literal: true, result: :ok, exits: { putspecialobject: 1 })
       def str_uplus
         _ = 1
         _ = 2
@@ -1216,7 +1391,7 @@ def test(str)
 
   def test_return_to_invalidated_block
     # [Bug #19463]
-    assert_compiles(<<~RUBY, result: [1, 1, :ugokanai])
+    assert_compiles(<<~RUBY, result: [1, 1, :ugokanai], exits: { definesmethod: 1, getlocal_WC_0: 1 })
       klass = Class.new do
         def self.lookup(hash, key) = hash[key]
 
@@ -1255,6 +1430,36 @@ def freeze = :ugokanai
     RUBY
   end
 
+  def test_return_to_invalidated_frame
+    assert_compiles(code_gc_helpers + <<~RUBY, exits: :any, result: :ok)
+      def jump
+        [] # something not inlined
+      end
+
+      def entry(code_gc)
+        jit_exception(code_gc)
+        jump # faulty jump after code GC. #jit_exception should not come back.
+      end
+
+      def jit_exception(code_gc)
+        if code_gc
+          tap do
+            RubyVM::YJIT.code_gc
+            break # jit_exec_exception catches TAG_BREAK and re-enters JIT code
+          end
+        end
+      end
+
+      add_pages(100)
+      jump           # Compile #jump in a non-first page
+      add_pages(100)
+      entry(false)   # Compile #entry and its call to #jump in another page
+      entry(true)    # Free #jump but not #entry
+
+      :ok
+    RUBY
+  end
+
   def test_setivar_on_class
     # Bug in https://github.com/ruby/ruby/pull/8152
     assert_compiles(<<~RUBY, result: :ok)
@@ -1280,7 +1485,7 @@ class Child < Base
 
   def test_nested_send
     #[Bug #19464]
-    assert_compiles(<<~RUBY, result: [:ok, :ok])
+    assert_compiles(<<~RUBY, result: [:ok, :ok], exits: { defineclass: 1 })
       klass = Class.new do
         class << self
           alias_method :my_send, :send
@@ -1299,7 +1504,7 @@ def foo = bar
   end
 
   def test_str_concat_encoding_mismatch
-    assert_compiles(<<~'RUBY', result: "incompatible character encodings: ASCII-8BIT and EUC-JP")
+    assert_compiles(<<~'RUBY', result: "incompatible character encodings: BINARY (ASCII-8BIT) and EUC-JP")
       def bar(a, b)
         a << b
       rescue => e
@@ -1312,13 +1517,13 @@ def foo(a, b, h)
       end
 
       h = Hash.new { nil }
-      foo("\x80".b, "\xA1A1".force_encoding("EUC-JP"), h)
-      foo("\x80".b, "\xA1A1".force_encoding("EUC-JP"), h)
+      foo("\x80".b, "\xA1A1".dup.force_encoding("EUC-JP"), h)
+      foo("\x80".b, "\xA1A1".dup.force_encoding("EUC-JP"), h)
     RUBY
   end
 
   def test_io_reopen_clobbering_singleton_class
-    assert_compiles(<<~RUBY, result: [:ok, :ok])
+    assert_compiles(<<~RUBY, result: [:ok, :ok], exits: { definesmethod: 1, opt_eq: 2 })
       def $stderr.to_i = :i
 
       def test = $stderr.to_i
@@ -1330,7 +1535,7 @@ def test = $stderr.to_i
   end
 
   def test_opt_aref_with
-    assert_compiles(<<~RUBY, insns: %i[opt_aref_with], result: "bar")
+    assert_compiles(<<~RUBY, insns: %i[opt_aref_with], result: "bar", frozen_string_literal: false)
       h = {"foo" => "bar"}
 
       h["foo"]
@@ -1347,6 +1552,234 @@ def call(block_arg = nil) = yield_if_given(&block_arg)
     RUBY
   end
 
+  def test_opt_mult_overflow
+    assert_no_exits('0xfff_ffff_ffff_ffff * 0x10')
+  end
+
+  def test_disable_stats
+    assert_in_out_err(%w[--yjit-stats --yjit-disable])
+  end
+
+  def test_odd_calls_to_attr_reader
+    # Use of delegate from ActiveSupport use these kind of calls to getter methods.
+    assert_compiles(<<~RUBY, result: [1, 1, 1], no_send_fallbacks: true)
+      class One
+        attr_reader :one
+        def initialize
+          @one = 1
+        end
+      end
+
+      def calls(obj, empty, &)
+        [obj.one(*empty), obj.one(&), obj.one(*empty, &)]
+      end
+
+      calls(One.new, [])
+    RUBY
+  end
+
+  def test_kwrest
+    assert_compiles(<<~RUBY, result: true, no_send_fallbacks: true)
+      def req_rest(r1:, **kwrest) = [r1, kwrest]
+      def opt_rest(r1: 1.succ, **kwrest) = [r1, kwrest]
+      def kwrest(**kwrest) = kwrest
+
+      def calls
+        [
+          [1, {}] == req_rest(r1: 1),
+          [1, {:r2=>2, :r3=>3}] == req_rest(r1: 1, r2: 2, r3: 3),
+          [1, {:r2=>2, :r3=>3}] == req_rest(r2: 2, r1:1, r3: 3),
+          [1, {:r2=>2, :r3=>3}] == req_rest(r2: 2, r3: 3, r1: 1),
+
+          [2, {}] == opt_rest,
+          [2, { r2: 2, r3: 3 }] == opt_rest(r2: 2, r3: 3),
+          [0, { r2: 2, r3: 3 }] == opt_rest(r1: 0, r3: 3, r2: 2),
+          [0, { r2: 2, r3: 3 }] == opt_rest(r2: 2, r1: 0, r3: 3),
+          [1, { r2: 2, r3: 3 }] == opt_rest(r2: 2, r3: 3, r1: 1),
+
+          {} == kwrest,
+          { r0: 88, r1: 99 } == kwrest(r0: 88, r1: 99),
+        ]
+      end
+
+      calls.all?
+    RUBY
+  end
+
+  def test_send_polymorphic_method_name
+    assert_compiles(<<~'RUBY', result: %i[ok ok], no_send_fallbacks: true)
+      mid = "dynamic_mid_#{rand(100..200)}"
+      mid_dsym = mid.to_sym
+
+      define_method(mid) { :ok }
+
+      define_method(:send_site) { send(_1) }
+
+      [send_site(mid), send_site(mid_dsym)]
+    RUBY
+  end
+
+  def test_kw_splat_nil
+    assert_compiles(<<~'RUBY', result: %i[ok ok], no_send_fallbacks: true)
+      def id(x) = x
+      def kw_fw(arg, **) = id(arg, **)
+      def use = [kw_fw(:ok), :ok.itself(**nil)]
+
+      use
+    RUBY
+  end
+
+  def test_empty_splat
+    assert_compiles(<<~'RUBY', result: :ok, no_send_fallbacks: true)
+      def foo = :ok
+      def use(empty) = foo(*empty)
+
+      use([])
+    RUBY
+  end
+
+  def test_byteslice_sp_invalidation
+    assert_compiles(<<~'RUBY', result: 'ok', no_send_fallbacks: true)
+      "okng".itself.byteslice(0, 2)
+    RUBY
+  end
+
+  def test_leaf_builtin
+    assert_compiles(code_gc_helpers + <<~'RUBY', exits: :any, result: 1)
+      before = RubyVM::YJIT.runtime_stats[:num_send_iseq_leaf]
+      return 1 if before.nil?
+
+      def entry = self.class
+      entry
+
+      after = RubyVM::YJIT.runtime_stats[:num_send_iseq_leaf]
+      after - before
+    RUBY
+  end
+
+  def test_runtime_stats_types
+    assert_compiles(<<~'RUBY', exits: :any, result: true)
+      def test = :ok
+      3.times { test }
+
+      stats = RubyVM::YJIT.runtime_stats
+      return true unless stats[:all_stats]
+
+      [
+        stats[:object_shape_count].is_a?(Integer),
+        stats[:ratio_in_yjit].nil? || stats[:ratio_in_yjit].is_a?(Float),
+      ].all?
+    RUBY
+  end
+
+  def test_runtime_stats_key_arg
+    assert_compiles(<<~'RUBY', exits: :any, result: true)
+      def test = :ok
+      3.times { test }
+
+      # Collect single stat.
+      stat = RubyVM::YJIT.runtime_stats(:yjit_alloc_size)
+
+      # Ensure this invocation had stats.
+      return true unless RubyVM::YJIT.runtime_stats[:all_stats]
+
+      stat > 0.0
+    RUBY
+  end
+
+  def test_runtime_stats_arg_error
+    assert_compiles(<<~'RUBY', exits: :any, result: true)
+      begin
+        RubyVM::YJIT.runtime_stats(Object.new)
+        :no_error
+      rescue TypeError => e
+        e.message == "non-symbol given"
+      end
+    RUBY
+  end
+
+  def test_runtime_stats_unknown_key
+    assert_compiles(<<~'RUBY', exits: :any, result: true)
+      def test = :ok
+      3.times { test }
+
+      RubyVM::YJIT.runtime_stats(:some_key_unlikely_to_exist).nil?
+    RUBY
+  end
+
+  def test_yjit_option_uses_array_each_in_ruby
+    assert_separately(["--yjit"], <<~'RUBY')
+      # Array#each should be implemented in Ruby for YJIT
+      assert_equal "<internal:array>", Array.instance_method(:each).source_location.first
+
+      # The backtrace, however, should not be `from <internal:array>:XX:in 'Array#each'`
+      begin
+        [nil].each { raise }
+      rescue => e
+        assert_equal "-:11:in 'Array#each'", e.backtrace[1]
+      end
+    RUBY
+  end
+
+  def test_yjit_enable_replaces_array_each
+    assert_separately([*("--disable=yjit" if RubyVM::YJIT.enabled?)], <<~'RUBY')
+      # Array#each should be implemented in C for the interpreter
+      assert_nil Array.instance_method(:each).source_location
+
+      # The backtrace should not be `from <internal:array>:XX:in 'Array#each'`
+      begin
+        [nil].each { raise }
+      rescue => e
+        assert_equal "-:11:in 'Array#each'", e.backtrace[1]
+      end
+
+      RubyVM::YJIT.enable
+
+      # Array#each should be implemented in Ruby for YJIT
+      assert_equal "<internal:array>", Array.instance_method(:each).source_location.first
+
+      # However, the backtrace should still not be `from <internal:array>:XX:in 'Array#each'`
+      begin
+        [nil].each { raise }
+      rescue => e
+        assert_equal "-:23:in 'Array#each'", e.backtrace[1]
+      end
+    RUBY
+  end
+
+  def test_yjit_enable_preserves_array_each_monkey_patch
+    assert_separately([*("--disable=yjit" if RubyVM::YJIT.enabled?)], <<~'RUBY')
+      # Array#each should be implemented in C initially
+      assert_nil Array.instance_method(:each).source_location
+
+      # Override Array#each
+      $called = false
+      Array.prepend(Module.new {
+        def each
+          $called = true
+          super
+        end
+      })
+
+      RubyVM::YJIT.enable
+
+      # The monkey-patch should still be alive
+      [].each {}
+      assert_true $called
+
+      # YJIT should not replace Array#each with the "<internal:array>" one
+      assert_equal "-", Array.instance_method(:each).source_location.first
+    RUBY
+  end
+
+  def test_yield_kwargs
+    assert_compiles(<<~RUBY, result: 3, no_send_fallbacks: true)
+      def req2kws = yield a: 1, b: 2
+
+      req2kws { |a:, b:| a + b }
+    RUBY
+  end
+
   private
 
   def code_gc_helpers
@@ -1358,9 +1791,9 @@ def compiles(&block)
       end
 
       def add_pages(num_jits)
-        pages = RubyVM::YJIT.runtime_stats[:compiled_page_count]
+        pages = RubyVM::YJIT.runtime_stats[:live_page_count]
         num_jits.times { return false unless eval('compiles { nil.to_i }') }
-        pages.nil? || pages < RubyVM::YJIT.runtime_stats[:compiled_page_count]
+        pages.nil? || pages < RubyVM::YJIT.runtime_stats[:live_page_count]
       end
     RUBY
   end
@@ -1370,7 +1803,17 @@ def assert_no_exits(script)
   end
 
   ANY = Object.new
-  def assert_compiles(test_script, insns: [], call_threshold: 1, stdout: nil, exits: {}, result: ANY, frozen_string_literal: nil, mem_size: nil)
+  def assert_compiles(
+    test_script, insns: [],
+    call_threshold: 1,
+    stdout: nil,
+    exits: {},
+    result: ANY,
+    frozen_string_literal: nil,
+    mem_size: nil,
+    code_gc: false,
+    no_send_fallbacks: false
+  )
     reset_stats = <<~RUBY
       RubyVM::YJIT.runtime_stats
       RubyVM::YJIT.reset_stats!
@@ -1395,7 +1838,7 @@ def collect_insns(iseq)
     RUBY
 
     script = <<~RUBY
-      #{"# frozen_string_literal: true" if frozen_string_literal}
+      #{"# frozen_string_literal: " + frozen_string_literal.to_s unless frozen_string_literal.nil?}
       _test_proc = -> {
         #{test_script}
       }
@@ -1404,7 +1847,7 @@ def collect_insns(iseq)
       #{write_results}
     RUBY
 
-    status, out, err, stats = eval_with_jit(script, call_threshold:, mem_size:)
+    status, out, err, stats = eval_with_jit(script, call_threshold:, mem_size:, code_gc:)
 
     assert status.success?, "exited with status #{status.to_i}, stderr:\n#{err}"
 
@@ -1430,12 +1873,23 @@ def collect_insns(iseq)
       # barriers, cache misses.)
       if exits != :any &&
         exits != recorded_exits &&
-        !exits.all? { |k, v| v === recorded_exits[k] } # triple-equal checks range membership or integer equality
-        flunk "Expected #{exits.empty? ? "no" : exits.inspect} exits" \
-          ", but got\n#{recorded_exits.inspect}"
+        (exits.keys != recorded_exits.keys || !exits.all? { |k, v| v === recorded_exits[k] }) # triple-equal checks range membership or integer equality
+        stats_reasons = StringIO.new
+        ::RubyVM::YJIT.send(:_print_stats_reasons, runtime_stats, stats_reasons)
+        stats_reasons = stats_reasons.string
+        flunk <<~EOM
+          Expected #{exits.empty? ? "no" : exits.inspect} exits, but got:
+          #{recorded_exits.inspect}
+          Reasons:
+          #{stats_reasons}
+        EOM
       end
     end
 
+    if no_send_fallbacks
+      assert_equal(0, runtime_stats[:num_send_dynamic], "Expected no use of fallback implementation")
+    end
+
     # Only available when --enable-yjit=dev
     if runtime_stats[:all_stats]
       missed_insns = insns.dup
@@ -1458,13 +1912,14 @@ def script_shell_encode(s)
     s.chars.map { |c| c.ascii_only? ? c : "\\u%x" % c.codepoints[0] }.join
   end
 
-  def eval_with_jit(script, call_threshold: 1, timeout: 1000, mem_size: nil)
+  def eval_with_jit(script, call_threshold: 1, timeout: 1000, mem_size: nil, code_gc: false)
     args = [
       "--disable-gems",
       "--yjit-call-threshold=#{call_threshold}",
-      "--yjit-stats"
+      "--yjit-stats=quiet"
     ]
     args << "--yjit-exec-mem-size=#{mem_size}" if mem_size
+    args << "--yjit-code-gc" if code_gc
     args << "-e" << script_shell_encode(script)
     stats_r, stats_w = IO.pipe
     # Separate thread so we don't deadlock when
@@ -1474,9 +1929,7 @@ def eval_with_jit(script, call_threshold: 1, timeout: 1000, mem_size: nil)
       stats = stats_r.read
       stats_r.close
     end
-    out, err, status = EnvUtil.invoke_ruby(args,
-      '', true, true, timeout: timeout, ios: {3 => stats_w}
-    )
+    out, err, status = invoke_ruby(args, '', true, true, timeout: timeout, ios: { 3 => stats_w })
     stats_w.close
     stats_reader.join(timeout)
     stats = Marshal.load(stats) if !stats.empty?
@@ -1487,4 +1940,10 @@ def eval_with_jit(script, call_threshold: 1, timeout: 1000, mem_size: nil)
     stats_r&.close
     stats_w&.close
   end
+
+  # A wrapper of EnvUtil.invoke_ruby that uses RbConfig.ruby instead of EnvUtil.ruby
+  # that might use a wrong Ruby depending on your environment.
+  def invoke_ruby(*args, **kwargs)
+    EnvUtil.invoke_ruby(*args, rubybin: RbConfig.ruby, **kwargs)
+  end
 end
diff --git a/test/ruby/test_yjit_exit_locations.rb b/test/ruby/test_yjit_exit_locations.rb
index 851a582470a887..816ab457cee5d5 100644
--- a/test/ruby/test_yjit_exit_locations.rb
+++ b/test/ruby/test_yjit_exit_locations.rb
@@ -18,22 +18,8 @@ def test_yjit_trace_exits_and_v_no_error
     refute_includes(stderr, "NoMethodError")
   end
 
-  def test_trace_exits_setclassvariable
-    script = 'class Foo; def self.foo; @@foo = 1; end; end; Foo.foo'
-    assert_exit_locations(script)
-  end
-
-  def test_trace_exits_putobject
-    assert_exit_locations('true')
-    assert_exit_locations('123')
-    assert_exit_locations(':foo')
-  end
-
-  def test_trace_exits_opt_not
-    assert_exit_locations('!false')
-    assert_exit_locations('!nil')
-    assert_exit_locations('!true')
-    assert_exit_locations('![]')
+  def test_trace_exits_expandarray_splat
+    assert_exit_locations('*arr = []')
   end
 
   private
diff --git a/test/ruby/test_zjit.rb b/test/ruby/test_zjit.rb
new file mode 100644
index 00000000000000..f71509bc7cf808
--- /dev/null
+++ b/test/ruby/test_zjit.rb
@@ -0,0 +1,1295 @@
+# frozen_string_literal: true
+#
+# This set of tests can be run with:
+# make test-all TESTS=test/ruby/test_zjit.rb
+
+require 'test/unit'
+require 'envutil'
+require_relative '../lib/jit_support'
+return unless JITSupport.zjit_supported?
+
+class TestZJIT < Test::Unit::TestCase
+  def test_call_itself
+    assert_compiles '42', <<~RUBY, call_threshold: 2
+      def test = 42.itself
+      test
+      test
+    RUBY
+  end
+
+  def test_nil
+    assert_compiles 'nil', %q{
+      def test = nil
+      test
+    }
+  end
+
+  def test_putobject
+    assert_compiles '1', %q{
+      def test = 1
+      test
+    }
+  end
+
+  def test_putstring
+    assert_compiles '""', %q{
+      def test = "#{""}"
+      test
+    }, insns: [:putstring]
+  end
+
+  def test_putchilldedstring
+    assert_compiles '""', %q{
+      def test = ""
+      test
+    }, insns: [:putchilledstring]
+  end
+
+  def test_leave_param
+    assert_compiles '5', %q{
+      def test(n) = n
+      test(5)
+    }
+  end
+
+  def test_setlocal
+    assert_compiles '3', %q{
+      def test(n)
+        m = n
+        m
+      end
+      test(3)
+    }
+  end
+
+  def test_setlocal_on_eval
+    assert_compiles '1', %q{
+      @b = binding
+      eval('a = 1', @b)
+      eval('a', @b)
+    }
+  end
+
+  def test_setlocal_on_eval_with_spill
+    assert_compiles '1', %q{
+      @b = binding
+      eval('a = 1; itself', @b)
+      eval('a', @b)
+    }
+  end
+
+  def test_nested_local_access
+    assert_compiles '[1, 2, 3]', %q{
+      1.times do |l2|
+        1.times do |l1|
+          define_method(:test) do
+            l1 = 1
+            l2 = 2
+            l3 = 3
+            [l1, l2, l3]
+          end
+        end
+      end
+
+      test
+      test
+      test
+    }, call_threshold: 3, insns: [:getlocal, :setlocal, :getlocal_WC_0, :setlocal_WC_1]
+  end
+
+  def test_read_local_written_by_children_iseqs
+    omit "This test fails right now because Send doesn't compile."
+
+    assert_compiles '[1, 2]', %q{
+      def test
+        l1 = nil
+        l2 = nil
+        tap do |_|
+          l1 = 1
+          tap do |_|
+            l2 = 2
+          end
+        end
+
+        [l1, l2]
+      end
+
+      test
+      test
+    }, call_threshold: 2
+  end
+
+  def test_send_without_block
+    assert_compiles '[1, 2, 3]', %q{
+      def foo = 1
+      def bar(a) = a - 1
+      def baz(a, b) = a - b
+
+      def test1 = foo
+      def test2 = bar(3)
+      def test3 = baz(4, 1)
+
+      [test1, test2, test3]
+    }
+  end
+
+  def test_invokebuiltin
+    omit 'Test fails at the moment due to not handling optional parameters'
+    assert_compiles '["."]', %q{
+      def test = Dir.glob(".")
+      test
+    }
+  end
+
+  def test_invokebuiltin_delegate
+    assert_compiles '[[], true]', %q{
+      def test = [].clone(freeze: true)
+      r = test
+      [r, r.frozen?]
+    }
+  end
+
+  def test_opt_plus_const
+    assert_compiles '3', %q{
+      def test = 1 + 2
+      test # profile opt_plus
+      test
+    }, call_threshold: 2
+  end
+
+  def test_opt_plus_fixnum
+    assert_compiles '3', %q{
+      def test(a, b) = a + b
+      test(0, 1) # profile opt_plus
+      test(1, 2)
+    }, call_threshold: 2
+  end
+
+  def test_opt_plus_chain
+    assert_compiles '6', %q{
+      def test(a, b, c) = a + b + c
+      test(0, 1, 2) # profile opt_plus
+      test(1, 2, 3)
+    }, call_threshold: 2
+  end
+
+  def test_opt_plus_left_imm
+    assert_compiles '3', %q{
+      def test(a) = 1 + a
+      test(1) # profile opt_plus
+      test(2)
+    }, call_threshold: 2
+  end
+
+  def test_opt_plus_type_guard_exit
+    assert_compiles '[3, 3.0]', %q{
+      def test(a) = 1 + a
+      test(1) # profile opt_plus
+      [test(2), test(2.0)]
+    }, call_threshold: 2
+  end
+
+  def test_opt_plus_type_guard_exit_with_locals
+    assert_compiles '[6, 6.0]', %q{
+      def test(a)
+        local = 3
+        1 + a + local
+      end
+      test(1) # profile opt_plus
+      [test(2), test(2.0)]
+    }, call_threshold: 2
+  end
+
+  def test_opt_plus_type_guard_nested_exit
+    assert_compiles '[4, 4.0]', %q{
+      def side_exit(n) = 1 + n
+      def jit_frame(n) = 1 + side_exit(n)
+      def entry(n) = jit_frame(n)
+      entry(2) # profile send
+      [entry(2), entry(2.0)]
+    }, call_threshold: 2
+  end
+
+  def test_opt_plus_type_guard_nested_exit_with_locals
+    assert_compiles '[9, 9.0]', %q{
+      def side_exit(n)
+        local = 2
+        1 + n + local
+      end
+      def jit_frame(n)
+        local = 3
+        1 + side_exit(n) + local
+      end
+      def entry(n) = jit_frame(n)
+      entry(2) # profile send
+      [entry(2), entry(2.0)]
+    }, call_threshold: 2
+  end
+
+  # Test argument ordering
+  def test_opt_minus
+    assert_compiles '2', %q{
+      def test(a, b) = a - b
+      test(2, 1) # profile opt_minus
+      test(6, 4)
+    }, call_threshold: 2
+  end
+
+  def test_opt_mult
+    assert_compiles '6', %q{
+      def test(a, b) = a * b
+      test(1, 2) # profile opt_mult
+      test(2, 3)
+    }, call_threshold: 2
+  end
+
+  def test_opt_mult_overflow
+    assert_compiles '[6, -6, 9671406556917033397649408, -9671406556917033397649408, 21267647932558653966460912964485513216]', %q{
+      def test(a, b)
+        a * b
+      end
+      test(1, 1) # profile opt_mult
+
+      r1 = test(2, 3)
+      r2 = test(2, -3)
+      r3 = test(2 << 40, 2 << 41)
+      r4 = test(2 << 40, -2 << 41)
+      r5 = test(1 << 62, 1 << 62)
+
+      [r1, r2, r3, r4, r5]
+    }, call_threshold: 2
+  end
+
+  def test_opt_eq
+    assert_compiles '[true, false]', %q{
+      def test(a, b) = a == b
+      test(0, 2) # profile opt_eq
+      [test(1, 1), test(0, 1)]
+    }, insns: [:opt_eq], call_threshold: 2
+  end
+
+  def test_opt_neq_dynamic
+    # TODO(max): Don't split this test; instead, run all tests with and without
+    # profiling.
+    assert_compiles '[false, true]', %q{
+      def test(a, b) = a != b
+      test(0, 2) # profile opt_neq
+      [test(1, 1), test(0, 1)]
+    }, insns: [:opt_neq], call_threshold: 1
+  end
+
+  def test_opt_neq_fixnum
+    assert_compiles '[false, true]', %q{
+      def test(a, b) = a != b
+      test(0, 2) # profile opt_neq
+      [test(1, 1), test(0, 1)]
+    }, call_threshold: 2
+  end
+
+  def test_opt_lt
+    assert_compiles '[true, false, false]', %q{
+      def test(a, b) = a < b
+      test(2, 3) # profile opt_lt
+      [test(0, 1), test(0, 0), test(1, 0)]
+    }, insns: [:opt_lt], call_threshold: 2
+  end
+
+  def test_opt_lt_with_literal_lhs
+    assert_compiles '[false, false, true]', %q{
+      def test(n) = 2 < n
+      test(2) # profile opt_lt
+      [test(1), test(2), test(3)]
+    }, insns: [:opt_lt], call_threshold: 2
+  end
+
+  def test_opt_le
+    assert_compiles '[true, true, false]', %q{
+      def test(a, b) = a <= b
+      test(2, 3) # profile opt_le
+      [test(0, 1), test(0, 0), test(1, 0)]
+    }, insns: [:opt_le], call_threshold: 2
+  end
+
+  def test_opt_gt
+    assert_compiles '[false, false, true]', %q{
+      def test(a, b) = a > b
+      test(2, 3) # profile opt_gt
+      [test(0, 1), test(0, 0), test(1, 0)]
+    }, insns: [:opt_gt], call_threshold: 2
+  end
+
+  def test_opt_empty_p
+    assert_compiles('[false, false, true]', <<~RUBY, insns: [:opt_empty_p])
+      def test(x) = x.empty?
+      return test([1]), test("1"), test({})
+    RUBY
+  end
+
+  def test_opt_succ
+    assert_compiles('[0, "B"]', <<~RUBY, insns: [:opt_succ])
+      def test(obj) = obj.succ
+      return test(-1), test("A")
+    RUBY
+  end
+
+  def test_opt_and
+    assert_compiles('[1, [3, 2, 1]]', <<~RUBY, insns: [:opt_and])
+      def test(x, y) = x & y
+      return test(0b1101, 3), test([3, 2, 1, 4], [8, 1, 2, 3])
+    RUBY
+  end
+
+  def test_opt_or
+    assert_compiles('[11, [3, 2, 1]]', <<~RUBY, insns: [:opt_or])
+      def test(x, y) = x | y
+      return test(0b1000, 3), test([3, 2, 1], [1, 2, 3])
+    RUBY
+  end
+
+  def test_fixnum_and
+    assert_compiles '1', %q{
+      def test(a, b) = a & b
+      test(2, 2)
+      test(2, 2)
+      test(5, 3)
+    }, call_threshold: 2, insns: [:opt_and]
+  end
+
+  def test_fixnum_and_side_exit
+    assert_compiles 'false', %q{
+      def test(a, b) = a & b
+      test(2, 2)
+      test(2, 2)
+      test(true, false)
+    }, call_threshold: 2, insns: [:opt_and]
+  end
+
+  def test_fixnum_or
+    assert_compiles '3', %q{
+      def test(a, b) = a | b
+      test(5, 3)
+      test(5, 3)
+      test(1, 2)
+    }, call_threshold: 2, insns: [:opt_or]
+  end
+
+  def test_fixnum_or_side_exit
+    assert_compiles 'true', %q{
+      def test(a, b) = a | b
+      test(2, 2)
+      test(2, 2)
+      test(true, false)
+    }, call_threshold: 2, insns: [:opt_or]
+  end
+
+  def test_opt_not
+    assert_compiles('[true, true, false]', <<~RUBY, insns: [:opt_not])
+      def test(obj) = !obj
+      return test(nil), test(false), test(0)
+    RUBY
+  end
+
+  def test_opt_regexpmatch2
+    assert_compiles('[1, nil]', <<~RUBY, insns: [:opt_regexpmatch2])
+      def test(haystack) = /needle/ =~ haystack
+      return test("kneedle"), test("")
+    RUBY
+  end
+
+  def test_opt_ge
+    assert_compiles '[false, true, true]', %q{
+      def test(a, b) = a >= b
+      test(2, 3) # profile opt_ge
+      [test(0, 1), test(0, 0), test(1, 0)]
+    }, insns: [:opt_ge], call_threshold: 2
+  end
+
+  def test_opt_hash_freeze
+    assert_compiles '{}', <<~RUBY, insns: [:opt_hash_freeze]
+      def test = {}.freeze
+      test
+    RUBY
+  end
+
+  def test_opt_ary_freeze
+    assert_compiles '[]', <<~RUBY, insns: [:opt_ary_freeze]
+      def test = [].freeze
+      test
+    RUBY
+  end
+
+  def test_opt_str_freeze
+    assert_compiles '""', <<~RUBY, insns: [:opt_str_freeze]
+      def test = "".freeze
+      test
+    RUBY
+  end
+
+  def test_opt_str_uminus
+    assert_compiles '""', <<~RUBY, insns: [:opt_str_uminus]
+      def test = -""
+      test
+    RUBY
+  end
+
+  def test_new_array_empty
+    assert_compiles '[]', %q{
+      def test = []
+      test
+    }, insns: [:newarray]
+  end
+
+  def test_new_array_nonempty
+    assert_compiles '[5]', %q{
+      def a = 5
+      def test = [a]
+      test
+    }
+  end
+
+  def test_new_array_order
+    assert_compiles '[3, 2, 1]', %q{
+      def a = 3
+      def b = 2
+      def c = 1
+      def test = [a, b, c]
+      test
+    }
+  end
+
+  def test_array_dup
+    assert_compiles '[1, 2, 3]', %q{
+      def test = [1,2,3]
+      test
+    }
+  end
+
+  def test_new_range_inclusive
+    assert_compiles '1..5', %q{
+      def test(a, b) = a..b
+      test(1, 5)
+    }
+  end
+
+  def test_new_range_exclusive
+    assert_compiles '1...5', %q{
+      def test(a, b) = a...b
+      test(1, 5)
+    }
+  end
+
+  def test_new_range_with_literal
+    assert_compiles '3..10', %q{
+      def test(n) = n..10
+      test(3)
+    }
+  end
+
+  def test_if
+    assert_compiles '[0, nil]', %q{
+      def test(n)
+        if n < 5
+          0
+        end
+      end
+      [test(3), test(7)]
+    }
+  end
+
+  def test_if_else
+    assert_compiles '[0, 1]', %q{
+      def test(n)
+        if n < 5
+          0
+        else
+          1
+        end
+      end
+      [test(3), test(7)]
+    }
+  end
+
+  def test_if_else_params
+    assert_compiles '[1, 20]', %q{
+      def test(n, a, b)
+        if n < 5
+          a
+        else
+          b
+        end
+      end
+      [test(3, 1, 2), test(7, 10, 20)]
+    }
+  end
+
+  def test_if_else_nested
+    assert_compiles '[3, 8, 9, 14]', %q{
+      def test(a, b, c, d, e)
+        if 2 < a
+          if a < 4
+            b
+          else
+            c
+          end
+        else
+          if a < 0
+            d
+          else
+            e
+          end
+        end
+      end
+      [
+        test(-1,  1,  2,  3,  4),
+        test( 0,  5,  6,  7,  8),
+        test( 3,  9, 10, 11, 12),
+        test( 5, 13, 14, 15, 16),
+      ]
+    }
+  end
+
+  def test_if_else_chained
+    assert_compiles '[12, 11, 21]', %q{
+      def test(a)
+        (if 2 < a then 1 else 2 end) + (if a < 4 then 10 else 20 end)
+      end
+      [test(0), test(3), test(5)]
+    }
+  end
+
+  def test_if_elsif_else
+    assert_compiles '[0, 2, 1]', %q{
+      def test(n)
+        if n < 5
+          0
+        elsif 8 < n
+          1
+        else
+          2
+        end
+      end
+      [test(3), test(7), test(9)]
+    }
+  end
+
+  def test_ternary_operator
+    assert_compiles '[1, 20]', %q{
+      def test(n, a, b)
+        n < 5 ? a : b
+      end
+      [test(3, 1, 2), test(7, 10, 20)]
+    }
+  end
+
+  def test_ternary_operator_nested
+    assert_compiles '[2, 21]', %q{
+      def test(n, a, b)
+        (n < 5 ? a : b) + 1
+      end
+      [test(3, 1, 2), test(7, 10, 20)]
+    }
+  end
+
+  def test_while_loop
+    assert_compiles '10', %q{
+      def test(n)
+        i = 0
+        while i < n
+          i = i + 1
+        end
+        i
+      end
+      test(10)
+    }
+  end
+
+  def test_while_loop_chain
+    assert_compiles '[135, 270]', %q{
+      def test(n)
+        i = 0
+        while i < n
+          i = i + 1
+        end
+        while i < n * 10
+          i = i * 3
+        end
+        i
+      end
+      [test(5), test(10)]
+    }
+  end
+
+  def test_while_loop_nested
+    assert_compiles '[0, 4, 12]', %q{
+      def test(n, m)
+        i = 0
+        while i < n
+          j = 0
+          while j < m
+            j += 2
+          end
+          i += j
+        end
+        i
+      end
+      [test(0, 0), test(1, 3), test(10, 5)]
+    }
+  end
+
+  def test_while_loop_if_else
+    assert_compiles '[9, -1]', %q{
+      def test(n)
+        i = 0
+        while i < n
+          if n >= 10
+            return -1
+          else
+            i = i + 1
+          end
+        end
+        i
+      end
+      [test(9), test(10)]
+    }
+  end
+
+  def test_if_while_loop
+    assert_compiles '[9, 12]', %q{
+      def test(n)
+        i = 0
+        if n < 10
+          while i < n
+            i += 1
+          end
+        else
+          while i < n
+            i += 3
+          end
+        end
+        i
+      end
+      [test(9), test(10)]
+    }
+  end
+
+  def test_live_reg_past_ccall
+    assert_compiles '2', %q{
+      def callee = 1
+      def test = callee + callee
+      test
+    }
+  end
+
+  def test_method_call
+    assert_compiles '12', %q{
+      def callee(a, b)
+        a - b
+      end
+
+      def test
+        callee(4, 2) + 10
+      end
+
+      test # profile test
+      test
+    }, call_threshold: 2
+  end
+
+  def test_recursive_fact
+    assert_compiles '[1, 6, 720]', %q{
+      def fact(n)
+        if n == 0
+          return 1
+        end
+        return n * fact(n-1)
+      end
+      [fact(0), fact(3), fact(6)]
+    }
+  end
+
+  def test_profiled_fact
+    assert_compiles '[1, 6, 720]', %q{
+      def fact(n)
+        if n == 0
+          return 1
+        end
+        return n * fact(n-1)
+      end
+      fact(1) # profile fact
+      [fact(0), fact(3), fact(6)]
+    }, call_threshold: 3, num_profiles: 2
+  end
+
+  def test_recursive_fib
+    assert_compiles '[0, 2, 3]', %q{
+      def fib(n)
+        if n < 2
+          return n
+        end
+        return fib(n-1) + fib(n-2)
+      end
+      [fib(0), fib(3), fib(4)]
+    }
+  end
+
+  def test_profiled_fib
+    assert_compiles '[0, 2, 3]', %q{
+      def fib(n)
+        if n < 2
+          return n
+        end
+        return fib(n-1) + fib(n-2)
+      end
+      fib(3) # profile fib
+      [fib(0), fib(3), fib(4)]
+    }, call_threshold: 5, num_profiles: 3
+  end
+
+  def test_spilled_basic_block_args
+    assert_compiles '55', %q{
+      def test(n1, n2)
+        n3 = 3
+        n4 = 4
+        n5 = 5
+        n6 = 6
+        n7 = 7
+        n8 = 8
+        n9 = 9
+        n10 = 10
+        if n1 < n2
+          n1 + n2 + n3 + n4 + n5 + n6 + n7 + n8 + n9 + n10
+        end
+      end
+      test(1, 2)
+    }
+  end
+
+  def test_spilled_method_args
+    assert_runs '55', %q{
+      def foo(n1, n2, n3, n4, n5, n6, n7, n8, n9, n10)
+        n1 + n2 + n3 + n4 + n5 + n6 + n7 + n8 + n9 + n10
+      end
+
+      def test
+        foo(1, 2, 3, 4, 5, 6, 7, 8, 9, 10)
+      end
+
+      test
+    }
+  end
+
+  def test_opt_aref_with
+    assert_compiles ':ok', %q{
+      def aref_with(hash) = hash["key"]
+
+      aref_with({ "key" => :ok })
+    }
+  end
+
+  def test_putself
+    assert_compiles '3', %q{
+      class Integer
+        def minus(a)
+          self - a
+        end
+      end
+      5.minus(2)
+    }
+  end
+
+  def test_getinstancevariable
+    assert_compiles 'nil', %q{
+      def test() = @foo
+
+      test()
+    }
+    assert_compiles '3', %q{
+      @foo = 3
+      def test() = @foo
+
+      test()
+    }
+  end
+
+  def test_setinstancevariable
+    assert_compiles '1', %q{
+      def test() = @foo = 1
+
+      test()
+      @foo
+    }
+  end
+
+  def test_uncached_getconstant_path
+    assert_compiles RUBY_COPYRIGHT.dump, %q{
+      def test = RUBY_COPYRIGHT
+      test
+    }, call_threshold: 1, insns: [:opt_getconstant_path]
+  end
+
+  def test_getconstant_path_autoload
+    # A constant-referencing expression can run arbitrary code through Kernel#autoload.
+    Dir.mktmpdir('autoload') do |tmpdir|
+      autoload_path = File.join(tmpdir, 'test_getconstant_path_autoload.rb')
+      File.write(autoload_path, 'X = RUBY_COPYRIGHT')
+
+      assert_compiles RUBY_COPYRIGHT.dump, %Q{
+        Object.autoload(:X, #{File.realpath(autoload_path).inspect})
+        def test = X
+        test
+      }, call_threshold: 1, insns: [:opt_getconstant_path]
+    end
+  end
+
+  def test_dupn
+    assert_compiles '[[1], [1, 1], :rhs, [nil, :rhs]]', <<~RUBY, insns: [:dupn]
+      def test(array) = (array[1, 2] ||= :rhs)
+
+      one = [1, 1]
+      start_empty = []
+      [test(one), one, test(start_empty), start_empty]
+    RUBY
+  end
+
+  def test_send_backtrace
+    backtrace = [
+      "-e:2:in 'Object#jit_frame1'",
+      "-e:3:in 'Object#entry'",
+      "-e:5:in 'block in <main>'",
+      "-e:6:in '<main>'",
+    ]
+    assert_compiles backtrace.inspect, %q{
+      def jit_frame2 = caller     # 1
+      def jit_frame1 = jit_frame2 # 2
+      def entry = jit_frame1      # 3
+      entry # profile send        # 4
+      entry                       # 5
+    }, call_threshold: 2
+  end
+
+  def test_bop_invalidation
+    omit 'Invalidation on BOP redefinition is not implemented yet'
+    assert_compiles '', %q{
+      def test
+        eval(<<~RUBY)
+          class Integer
+            def +(_) = 100
+          end
+        RUBY
+        1 + 2
+      end
+      test
+    }
+  end
+
+  def test_defined_yield
+    assert_compiles "nil", "defined?(yield)"
+    assert_compiles '[nil, nil, "yield"]', %q{
+      def test = defined?(yield)
+      [test, test, test{}]
+    }, call_threshold: 2, insns: [:defined]
+  end
+
+  def test_defined_yield_from_block
+    # This will do some EP hopping to find the local EP,
+    # so it's slightly different than doing it outside of a block.
+
+    omit 'Test fails at the moment due to missing Send codegen'
+
+    assert_compiles '[nil, nil, "yield"]', %q{
+      def test
+        yield_self { yield_self { defined?(yield) } }
+      end
+
+      [test, test, test{}]
+    }, call_threshold: 2, insns: [:defined]
+  end
+
+  def test_invokeblock_without_block_after_jit_call
+    assert_compiles '"no block given (yield)"', %q{
+      def test(*arr, &b)
+        arr.class
+        yield
+      end
+      begin
+        test
+      rescue => e
+        e.message
+      end
+    }
+  end
+
+  def test_putspecialobject_vm_core_and_cbase
+    assert_compiles '10', %q{
+      def test
+        alias bar test
+        10
+      end
+
+      test
+      bar
+    }, insns: [:putspecialobject]
+  end
+
+  def test_putspecialobject_const_base
+    assert_compiles '1', %q{
+      Foo = 1
+
+      def test = Foo
+
+      # First call: populates the constant cache
+      test
+      # Second call: triggers ZJIT compilation with warm cache
+      # RubyVM::ZJIT.assert_compiles will panic if this fails to compile
+      test
+    }, call_threshold: 2
+  end
+
+  def test_branchnil
+    assert_compiles '[2, nil]', %q{
+      def test(x)
+        x&.succ
+      end
+      [test(1), test(nil)]
+    }, call_threshold: 1, insns: [:branchnil]
+  end
+
+  def test_nil_nil
+    assert_compiles 'true', %q{
+      def test = nil.nil?
+      test
+    }, insns: [:opt_nil_p]
+  end
+
+  def test_non_nil_nil
+    assert_compiles 'false', %q{
+      def test = 1.nil?
+      test
+    }, insns: [:opt_nil_p]
+  end
+
+  # tool/ruby_vm/views/*.erb relies on the zjit instructions a) being contiguous and
+  # b) being reliably ordered after all the other instructions.
+  def test_instruction_order
+    insn_names = RubyVM::INSTRUCTION_NAMES
+    zjit, others = insn_names.map.with_index.partition { |name, _| name.start_with?('zjit_') }
+    zjit_indexes = zjit.map(&:last)
+    other_indexes = others.map(&:last)
+    zjit_indexes.product(other_indexes).each do |zjit_index, other_index|
+      assert zjit_index > other_index, "'#{insn_names[zjit_index]}' at #{zjit_index} "\
+        "must be defined after '#{insn_names[other_index]}' at #{other_index}"
+    end
+  end
+
+  def test_require_rubygems
+    assert_runs 'true', %q{
+      require 'rubygems'
+    }, call_threshold: 2
+  end
+
+  def test_require_rubygems_with_auto_compact
+    assert_runs 'true', %q{
+      GC.auto_compact = true
+      require 'rubygems'
+    }, call_threshold: 2
+  end
+
+  def test_bop_redefinition
+    assert_runs '[3, :+, 100]', %q{
+      def test
+        1 + 2
+      end
+
+      test # profile opt_plus
+      [test, Integer.class_eval { def +(_) = 100 }, test]
+    }, call_threshold: 2
+  end
+
+  def test_bop_redefinition_with_adjacent_patch_points
+    assert_runs '[15, :+, 100]', %q{
+      def test
+        1 + 2 + 3 + 4 + 5
+      end
+
+      test # profile opt_plus
+      [test, Integer.class_eval { def +(_) = 100 }, test]
+    }, call_threshold: 2
+  end
+
+  def test_module_name_with_guard_passes
+    assert_compiles '"Integer"', %q{
+      def test(mod)
+        mod.name
+      end
+
+      test(String)
+      test(Integer)
+    }, call_threshold: 2
+  end
+
+  def test_module_name_with_guard_side_exit
+    # This test demonstrates that the guard side exit works correctly
+    # In this case, when we call with a non-Class object, it should fall back to interpreter
+    assert_compiles '["String", "Integer", "Bar"]', %q{
+      class MyClass
+        def name = "Bar"
+      end
+
+      def test(mod)
+        mod.name
+      end
+
+      results = []
+      results << test(String)
+      results << test(Integer)
+      results << test(MyClass.new)
+
+      results
+    }, call_threshold: 2
+  end
+
+  def test_string_bytesize_with_guard
+    assert_compiles '5', %q{
+      def test(str)
+        str.bytesize
+      end
+
+      test('hello')
+      test('world')
+    }, call_threshold: 2
+  end
+
+  def test_nil_value_nil_opt_with_guard
+    assert_compiles 'true', %q{
+      def test(val) = val.nil?
+
+      test(nil)
+      test(nil)
+    }, call_threshold: 2, insns: [:opt_nil_p]
+  end
+
+  def test_nil_value_nil_opt_with_guard_side_exit
+    assert_compiles 'false', %q{
+      def test(val) = val.nil?
+
+      test(nil)
+      test(nil)
+      test(1)
+    }, call_threshold: 2, insns: [:opt_nil_p]
+  end
+
+  def test_true_nil_opt_with_guard
+    assert_compiles 'false', %q{
+      def test(val) = val.nil?
+
+      test(true)
+      test(true)
+    }, call_threshold: 2, insns: [:opt_nil_p]
+  end
+
+  def test_true_nil_opt_with_guard_side_exit
+    assert_compiles 'true', %q{
+      def test(val) = val.nil?
+
+      test(true)
+      test(true)
+      test(nil)
+    }, call_threshold: 2, insns: [:opt_nil_p]
+  end
+
+  def test_false_nil_opt_with_guard
+    assert_compiles 'false', %q{
+      def test(val) = val.nil?
+
+      test(false)
+      test(false)
+    }, call_threshold: 2, insns: [:opt_nil_p]
+  end
+
+  def test_false_nil_opt_with_guard_side_exit
+    assert_compiles 'true', %q{
+      def test(val) = val.nil?
+
+      test(false)
+      test(false)
+      test(nil)
+    }, call_threshold: 2, insns: [:opt_nil_p]
+  end
+
+  def test_integer_nil_opt_with_guard
+    assert_compiles 'false', %q{
+      def test(val) = val.nil?
+
+      test(1)
+      test(2)
+    }, call_threshold: 2, insns: [:opt_nil_p]
+  end
+
+  def test_integer_nil_opt_with_guard_side_exit
+    assert_compiles 'true', %q{
+      def test(val) = val.nil?
+
+      test(1)
+      test(2)
+      test(nil)
+    }, call_threshold: 2, insns: [:opt_nil_p]
+  end
+
+  def test_float_nil_opt_with_guard
+    assert_compiles 'false', %q{
+      def test(val) = val.nil?
+
+      test(1.0)
+      test(2.0)
+    }, call_threshold: 2, insns: [:opt_nil_p]
+  end
+
+  def test_float_nil_opt_with_guard_side_exit
+    assert_compiles 'true', %q{
+      def test(val) = val.nil?
+
+      test(1.0)
+      test(2.0)
+      test(nil)
+    }, call_threshold: 2, insns: [:opt_nil_p]
+  end
+
+  def test_symbol_nil_opt_with_guard
+    assert_compiles 'false', %q{
+      def test(val) = val.nil?
+
+      test(:foo)
+      test(:bar)
+    }, call_threshold: 2, insns: [:opt_nil_p]
+  end
+
+  def test_symbol_nil_opt_with_guard_side_exit
+    assert_compiles 'true', %q{
+      def test(val) = val.nil?
+
+      test(:foo)
+      test(:bar)
+      test(nil)
+    }, call_threshold: 2, insns: [:opt_nil_p]
+  end
+
+  def test_class_nil_opt_with_guard
+    assert_compiles 'false', %q{
+      def test(val) = val.nil?
+
+      test(String)
+      test(Integer)
+    }, call_threshold: 2, insns: [:opt_nil_p]
+  end
+
+  def test_class_nil_opt_with_guard_side_exit
+    assert_compiles 'true', %q{
+      def test(val) = val.nil?
+
+      test(String)
+      test(Integer)
+      test(nil)
+    }, call_threshold: 2, insns: [:opt_nil_p]
+  end
+
+  def test_module_nil_opt_with_guard
+    assert_compiles 'false', %q{
+      def test(val) = val.nil?
+
+      test(Enumerable)
+      test(Kernel)
+    }, call_threshold: 2, insns: [:opt_nil_p]
+  end
+
+  def test_module_nil_opt_with_guard_side_exit
+    assert_compiles 'true', %q{
+      def test(val) = val.nil?
+
+      test(Enumerable)
+      test(Kernel)
+      test(nil)
+    }, call_threshold: 2, insns: [:opt_nil_p]
+  end
+
+  private
+
+  # Assert that every method call in `test_script` can be compiled by ZJIT
+  # at a given call_threshold
+  def assert_compiles(expected, test_script, insns: [], **opts)
+    assert_runs(expected, test_script, insns:, assert_compiles: true, **opts)
+  end
+
+  # Assert that `test_script` runs successfully with ZJIT enabled.
+  # Unlike `assert_compiles`, `assert_runs(assert_compiles: false)`
+  # allows ZJIT to skip compiling methods.
+  def assert_runs(expected, test_script, insns: [], assert_compiles: false, **opts)
+    pipe_fd = 3
+
+    script = <<~RUBY
+      ret_val = (_test_proc = -> { #{('RubyVM::ZJIT.assert_compiles; ' if assert_compiles)}#{test_script.lstrip} }).call
+      result = {
+        ret_val:,
+        #{ unless insns.empty?
+          'insns: RubyVM::InstructionSequence.of(method(:test)).to_a'
+        end}
+      }
+      IO.open(#{pipe_fd}).write(Marshal.dump(result))
+    RUBY
+
+    status, out, err, result = eval_with_jit(script, pipe_fd:, **opts)
+
+    message = "exited with status #{status.to_i}"
+    message << "\nstdout:\n```\n#{out}```\n" unless out.empty?
+    message << "\nstderr:\n```\n#{err}```\n" unless err.empty?
+    assert status.success?, message
+
+    result = Marshal.load(result)
+    assert_equal(expected, result.fetch(:ret_val).inspect)
+
+    unless insns.empty?
+      iseq = result.fetch(:insns)
+      assert_equal("YARVInstructionSequence/SimpleDataFormat", iseq.first, "failed to get iseq disassembly")
+      iseq_insns = iseq.last
+
+      expected_insns = Set.new(insns)
+      iseq_insns.each do
+        next unless it.is_a?(Array)
+        expected_insns.delete(it.first)
+      end
+      assert(expected_insns.empty?, -> { "Not present in ISeq: #{expected_insns.to_a}" })
+    end
+  end
+
+  # Run a Ruby process with ZJIT options and a pipe for writing test results
+  def eval_with_jit(script, call_threshold: 1, num_profiles: 1, timeout: 1000, pipe_fd:, debug: true)
+    args = [
+      "--disable-gems",
+      "--zjit-call-threshold=#{call_threshold}",
+      "--zjit-num-profiles=#{num_profiles}",
+    ]
+    args << "--zjit-debug" if debug
+    args << "-e" << script_shell_encode(script)
+    pipe_r, pipe_w = IO.pipe
+    # Separate thread so we don't deadlock when
+    # the child ruby blocks writing the output to pipe_fd
+    pipe_out = nil
+    pipe_reader = Thread.new do
+      pipe_out = pipe_r.read
+      pipe_r.close
+    end
+    out, err, status = EnvUtil.invoke_ruby(args, '', true, true, rubybin: RbConfig.ruby, timeout: timeout, ios: { pipe_fd => pipe_w })
+    pipe_w.close
+    pipe_reader.join(timeout)
+    [status, out, err, pipe_out]
+  ensure
+    pipe_reader&.kill
+    pipe_reader&.join(timeout)
+    pipe_r&.close
+    pipe_w&.close
+  end
+
+  def script_shell_encode(s)
+    # We can't pass utf-8-encoded characters directly in a shell arg. But we can use Ruby \u constants.
+    s.chars.map { |c| c.ascii_only? ? c : "\\u%x" % c.codepoints[0] }.join
+  end
+end
diff --git a/test/rubygems/bundler_test_gem.rb b/test/rubygems/bundler_test_gem.rb
index 78adfc94c56a3f..ca2980e04b519a 100644
--- a/test/rubygems/bundler_test_gem.rb
+++ b/test/rubygems/bundler_test_gem.rb
@@ -3,7 +3,7 @@
 require_relative "helper"
 
 class TestBundlerGem < Gem::TestCase
-  PROJECT_DIR = File.expand_path("../..", __dir__).tap(&Gem::UNTAINT)
+  PROJECT_DIR = File.expand_path("../..", __dir__)
 
   def test_self_use_gemdeps
     with_local_bundler_at(Gem.dir) do
@@ -131,9 +131,9 @@ def test_looks_for_gemdeps_files_automatically_from_binstubs
 
       install_specs a, b, c
 
-      install_gem a, :install_dir => path
-      install_gem b, :install_dir => path
-      install_gem c, :install_dir => path
+      install_gem a, install_dir: path
+      install_gem b, install_dir: path
+      install_gem c, install_dir: path
 
       ENV["GEM_PATH"] = path
 
@@ -183,9 +183,9 @@ def test_looks_for_gemdeps_files_automatically_from_binstubs_in_parent_dir
 
       install_specs a, b, c
 
-      install_gem a, :install_dir => path
-      install_gem b, :install_dir => path
-      install_gem c, :install_dir => path
+      install_gem a, install_dir: path
+      install_gem b, install_dir: path
+      install_gem c, install_dir: path
 
       ENV["GEM_PATH"] = path
 
@@ -201,7 +201,7 @@ def test_looks_for_gemdeps_files_automatically_from_binstubs_in_parent_dir
           f.puts "gem 'a'"
         end
         out0 = with_path_and_rubyopt(new_path, new_rubyopt) do
-          IO.popen("foo", :chdir => "sub1", &:read).split(/\n/)
+          IO.popen("foo", chdir: "sub1", &:read).split(/\n/)
         end
 
         File.open path, "a" do |f|
@@ -209,7 +209,7 @@ def test_looks_for_gemdeps_files_automatically_from_binstubs_in_parent_dir
           f.puts "gem 'c'"
         end
         out = with_path_and_rubyopt(new_path, new_rubyopt) do
-          IO.popen("foo", :chdir => "sub1", &:read).split(/\n/)
+          IO.popen("foo", chdir: "sub1", &:read).split(/\n/)
         end
 
         Dir.rmdir "sub1"
@@ -221,7 +221,7 @@ def test_looks_for_gemdeps_files_automatically_from_binstubs_in_parent_dir
 
   def test_use_gemdeps
     with_local_bundler_at(Gem.dir) do
-      gem_deps_file = "gem.deps.rb".tap(&Gem::UNTAINT)
+      gem_deps_file = "gem.deps.rb"
       spec = util_spec "a", 1
       install_specs spec
 
diff --git a/test/rubygems/helper.rb b/test/rubygems/helper.rb
index a9c143827270c7..af78bab724a4b5 100644
--- a/test/rubygems/helper.rb
+++ b/test/rubygems/helper.rb
@@ -9,17 +9,14 @@
 
 require "test/unit"
 
-ENV["JARS_SKIP"] = "true" if Gem.java_platform? # avoid unnecessary and noisy `jar-dependencies` post install hook
-
 require "fileutils"
 require "pathname"
 require "pp"
 require "rubygems/package"
 require "shellwords"
 require "tmpdir"
-require "uri"
+require "rubygems/vendor/uri/lib/uri"
 require "zlib"
-require "benchmark" # stdlib
 require_relative "mock_gem_ui"
 
 module Gem
@@ -105,39 +102,32 @@ def refute_directory_exists(path, msg = nil)
     refute File.directory?(path), msg
   end
 
-  # https://github.com/seattlerb/minitest/blob/21d9e804b63c619f602f3f4ece6c71b48974707a/lib/minitest/assertions.rb#L188
-  def _synchronize
-    yield
-  end
-
-  # https://github.com/seattlerb/minitest/blob/21d9e804b63c619f602f3f4ece6c71b48974707a/lib/minitest/assertions.rb#L546
+  # Originally copied from minitest/assertions.rb
   def capture_subprocess_io
-    _synchronize do
-      require "tempfile"
+    require "tempfile"
 
-      captured_stdout = Tempfile.new("out")
-      captured_stderr = Tempfile.new("err")
+    captured_stdout = Tempfile.new("out")
+    captured_stderr = Tempfile.new("err")
 
-      orig_stdout = $stdout.dup
-      orig_stderr = $stderr.dup
-      $stdout.reopen captured_stdout
-      $stderr.reopen captured_stderr
+    orig_stdout = $stdout.dup
+    orig_stderr = $stderr.dup
+    $stdout.reopen captured_stdout
+    $stderr.reopen captured_stderr
 
-      yield
+    yield
 
-      $stdout.rewind
-      $stderr.rewind
+    $stdout.rewind
+    $stderr.rewind
 
-      return captured_stdout.read, captured_stderr.read
-    ensure
-      $stdout.reopen orig_stdout
-      $stderr.reopen orig_stderr
+    [captured_stdout.read, captured_stderr.read]
+  ensure
+    $stdout.reopen orig_stdout
+    $stderr.reopen orig_stderr
 
-      orig_stdout.close
-      orig_stderr.close
-      captured_stdout.close!
-      captured_stderr.close!
-    end
+    orig_stdout.close
+    orig_stderr.close
+    captured_stdout.close!
+    captured_stderr.close!
   end
 
   ##
@@ -157,6 +147,14 @@ def enable_shared(value)
     end
   end
 
+  ##
+  # Overrides the Gem.install_extension_in_lib function and restores the
+  # original when the block ends
+  #
+  def extension_in_lib(value = true) # :nodoc:
+    Gem.stub(:install_extension_in_lib, value) { yield }
+  end
+
   ##
   # Sets the vendordir entry in RbConfig::CONFIG to +value+ and restores the
   # original value when the block ends
@@ -282,12 +280,14 @@ def assert_contains_make_command(target, output, msg = nil)
   def setup
     @orig_hooks = {}
     @orig_env = ENV.to_hash
-    @tmp = File.expand_path("tmp")
 
-    FileUtils.mkdir_p @tmp
+    top_srcdir = __dir__ + "/../.."
+    @tmp = File.expand_path(ENV.fetch("GEM_TEST_TMPDIR", "tmp"), top_srcdir)
+
+    FileUtils.mkdir_p(@tmp, mode: 0o700) # =rwx
+    @tmp = File.realpath(@tmp)
 
     @tempdir = Dir.mktmpdir("test_rubygems_", @tmp)
-    @tempdir.tap(&Gem::UNTAINT)
 
     ENV["GEM_VENDOR"] = nil
     ENV["GEMRC"] = nil
@@ -337,7 +337,6 @@ def setup
                       File.expand_path(s)
                     end
       if expand_path != s
-        expand_path.tap(&Gem::UNTAINT)
         if s.instance_variable_defined?(:@gem_prelude_index)
           expand_path.instance_variable_set(:@gem_prelude_index, expand_path)
         end
@@ -350,11 +349,16 @@ def setup
     Dir.chdir @tempdir
 
     ENV["HOME"] = @userhome
+    # Remove "RUBY_CODESIGN", which is used by mkmf-generated Makefile to
+    # sign extension bundles on macOS, to avoid trying to find the specified key
+    # from the fake $HOME/Library/Keychains directory.
+    ENV.delete "RUBY_CODESIGN"
     Gem.instance_variable_set :@config_file, nil
     Gem.instance_variable_set :@user_home, nil
     Gem.instance_variable_set :@config_home, nil
     Gem.instance_variable_set :@data_home, nil
     Gem.instance_variable_set :@state_home, @statehome
+    Gem.instance_variable_set :@state_file, nil
     Gem.instance_variable_set :@gemdeps, nil
     Gem.instance_variable_set :@env_requirements_by_name, nil
     Gem.send :remove_instance_variable, :@ruby_version if
@@ -364,7 +368,7 @@ def setup
 
     ENV["GEM_PRIVATE_KEY_PASSPHRASE"] = PRIVATE_KEY_PASSPHRASE
 
-    Gem.instance_variable_set(:@default_specifications_dir, nil)
+    Gem.instance_variable_set(:@default_specifications_dir, File.join(@gemhome, "specifications", "default"))
     if Gem.java_platform?
       @orig_default_gem_home = RbConfig::CONFIG["default_gem_home"]
       RbConfig::CONFIG["default_gem_home"] = @gemhome
@@ -396,7 +400,7 @@ def setup
     Gem::RemoteFetcher.fetcher = Gem::FakeFetcher.new
 
     @gem_repo = "http://gems.example.com/"
-    @uri = URI.parse @gem_repo
+    @uri = Gem::URI.parse @gem_repo
     Gem.sources.replace [@gem_repo]
 
     Gem.searcher = nil
@@ -414,6 +418,9 @@ def setup
       @orig_hooks[name] = Gem.send(name).dup
     end
 
+    Gem::Platform.const_get(:GENERIC_CACHE).clear
+    Gem::Platform.const_get(:GENERICS).each {|g| Gem::Platform.const_get(:GENERIC_CACHE)[g] = g }
+
     @marshal_version = "#{Marshal::MAJOR_VERSION}.#{Marshal::MINOR_VERSION}"
     @orig_loaded_features = $LOADED_FEATURES.dup
   end
@@ -442,9 +449,7 @@ def teardown
 
     Dir.chdir @current_dir
 
-    FileUtils.rm_rf @tempdir
-
-    restore_env
+    ENV.replace(@orig_env)
 
     Gem::ConfigFile.send :remove_const, :SYSTEM_WIDE_CONFIG_FILE
     Gem::ConfigFile.send :const_set, :SYSTEM_WIDE_CONFIG_FILE,
@@ -471,6 +476,10 @@ def teardown
     end
 
     @back_ui.close
+
+    FileUtils.rm_rf @tempdir
+
+    refute_directory_exists @tempdir, "#{@tempdir} used by test #{method_name} is still in use"
   end
 
   def credential_setup
@@ -525,6 +534,16 @@ def without_any_upwards_gemfiles
     ENV["BUNDLE_GEMFILE"] = File.join(@tempdir, "Gemfile")
   end
 
+  def with_env(overrides, &block)
+    orig_env = ENV.to_h
+    ENV.replace(overrides)
+    begin
+      block.call
+    ensure
+      ENV.replace(orig_env)
+    end
+  end
+
   ##
   # A git_gem is used with a gem dependencies file.  The gem created here
   # has no files, just a gem specification for the given +name+ and +version+.
@@ -576,7 +595,7 @@ def have_git?
   end
 
   def in_path?(executable) # :nodoc:
-    return true if %r{\A([A-Z]:|/)} =~ executable && File.exist?(executable)
+    return true if %r{\A([A-Z]:|/)}.match?(executable) && File.exist?(executable)
 
     ENV["PATH"].split(File::PATH_SEPARATOR).any? do |directory|
       File.exist? File.join directory, executable
@@ -598,17 +617,17 @@ def install_gem(spec, options = {})
         end
       end
 
-      gem = File.join(@tempdir, File.basename(gem)).tap(&Gem::UNTAINT)
+      gem = File.join(@tempdir, File.basename(gem))
     end
 
-    Gem::Installer.at(gem, options.merge({ :wrappers => true })).install
+    Gem::Installer.at(gem, options.merge({ wrappers: true })).install
   end
 
   ##
   # Builds and installs the Gem::Specification +spec+ into the user dir
 
   def install_gem_user(spec)
-    install_gem spec, :user_install => true
+    install_gem spec, user_install: true
   end
 
   ##
@@ -620,7 +639,7 @@ def uninstall_gem(spec)
       def ask_if_ok(spec)
         true
       end
-    end.new(spec.name, :executables => true, :user_install => true).uninstall
+    end.new(spec.name, executables: true, user_install: true).uninstall
   end
 
   ##
@@ -637,7 +656,7 @@ def mu_pp(obj)
   # Reads a Marshal file at +path+
 
   def read_cache(path)
-    File.open path.dup.tap(&Gem::UNTAINT), "rb" do |io|
+    File.open path.dup, "rb" do |io|
       Marshal.load io.read
     end
   end
@@ -664,6 +683,14 @@ def write_file(path)
     path
   end
 
+  def write_dummy_extconf(gem_name)
+    write_file File.join(@tempdir, "extconf.rb") do |io|
+      io.puts "require 'mkmf'"
+      yield io if block_given?
+      io.puts "create_makefile '#{gem_name}'"
+    end
+  end
+
   ##
   # Load a YAML string, the psych 3 way
 
@@ -772,7 +799,7 @@ def util_clear_gems
 
   def install_specs(*specs)
     specs.each do |spec|
-      Gem::Installer.for_spec(spec, :force => true).install
+      Gem::Installer.for_spec(spec, force: true).install
     end
 
     Gem.searcher = nil
@@ -783,7 +810,7 @@ def install_specs(*specs)
 
   def install_default_gems(*specs)
     specs.each do |spec|
-      installer = Gem::Installer.for_spec(spec, :install_as_default => true)
+      installer = Gem::Installer.for_spec(spec, install_as_default: true)
       installer.install
       Gem.register_default_spec(spec)
     end
@@ -797,9 +824,15 @@ def unresolved_names
     Gem::Specification.unresolved_deps.values.map(&:to_s).sort
   end
 
-  def new_default_spec(name, version, deps = nil, *files)
+  def new_default_spec(name, version, deps = nil, *files, executable: false)
     spec = util_spec name, version, deps
 
+    if executable
+      spec.executables = %w[executable]
+
+      write_file File.join(@tempdir, "bin", "executable")
+    end
+
     spec.loaded_from = File.join(@gemhome, "specifications", "default", spec.spec_name)
     spec.files = files
 
@@ -808,10 +841,8 @@ def new_default_spec(name, version, deps = nil, *files)
     Gem.instance_variable_set(:@default_gem_load_paths, [*Gem.send(:default_gem_load_paths), lib_dir])
     $LOAD_PATH.unshift(lib_dir)
     files.each do |file|
-      rb_path = File.join(lib_dir, file)
-      FileUtils.mkdir_p(File.dirname(rb_path))
-      File.open(rb_path, "w") do |rb|
-        rb << "# #{file}"
+      write_file File.join(lib_dir, file) do |io|
+        io.write "# #{file}"
       end
     end
 
@@ -1354,12 +1385,12 @@ def v(string)
   #
   # Yields the +specification+ to the block, if given
 
-  def vendor_gem(name = "a", version = 1)
+  def vendor_gem(name = "a", version = 1, &block)
     directory = File.join "vendor", name
 
     FileUtils.mkdir_p directory
 
-    save_gemspec name, version, directory
+    save_gemspec name, version, directory, &block
   end
 
   ##
@@ -1510,23 +1541,6 @@ def self.key_path(key_name)
     PUBLIC_KEY  = nil
     PUBLIC_CERT = nil
   end if Gem::HAVE_OPENSSL
-
-  private
-
-  def restore_env
-    unless Gem.win_platform?
-      ENV.replace(@orig_env)
-      return
-    end
-
-    # Fallback logic for Windows below to workaround
-    # https://bugs.ruby-lang.org/issues/16798. Can be dropped once all
-    # supported rubies include the fix for that.
-
-    ENV.clear
-
-    @orig_env.each {|k, v| ENV[k] = v }
-  end
 end
 
 # https://github.com/seattlerb/minitest/blob/13c48a03d84a2a87855a4de0c959f96800100357/lib/minitest/mock.rb#L192
diff --git a/test/rubygems/installer_test_case.rb b/test/rubygems/installer_test_case.rb
index 705de6804ed193..7a719843207c82 100644
--- a/test/rubygems/installer_test_case.rb
+++ b/test/rubygems/installer_test_case.rb
@@ -64,12 +64,6 @@ class Gem::Installer
 # A test case for Gem::Installer.
 
 class Gem::InstallerTestCase < Gem::TestCase
-  def setup
-    super
-
-    Gem::Installer.path_warning = false
-  end
-
   ##
   # The path where installed executables live
 
@@ -111,7 +105,7 @@ def util_make_exec(spec = @spec, shebang = "#!/usr/bin/ruby", bindir = "bin")
 
   def setup_base_installer(force = true)
     @gem = setup_base_gem
-    util_installer @spec, @gemhome, false, force
+    util_installer @spec, @gemhome, force
   end
 
   ##
@@ -163,7 +157,7 @@ def setup_base_user_installer
 
     @user_gem = @user_spec.cache_file
 
-    util_installer @user_spec, Gem.user_dir, :user
+    Gem::Installer.at @user_gem, user_install: true
   end
 
   ##
@@ -215,18 +209,33 @@ def util_setup_gem(ui = @ui, force = true)
       end
     end
 
-    Gem::Installer.at @gem, :force => force
+    Gem::Installer.at @gem, force: force
   end
 
   ##
-  # Creates an installer for +spec+ that will install into +gem_home+.  If
-  # +user+ is true a user-install will be performed.
+  # Creates an installer for +spec+ that will install into +gem_home+.
 
-  def util_installer(spec, gem_home, user=false, force=true)
+  def util_installer(spec, gem_home, force=true)
     Gem::Installer.at(spec.cache_file,
-                       :install_dir => gem_home,
-                       :user_install => user,
-                       :force => force)
+                       install_dir: gem_home,
+                       force: force)
+  end
+
+  def test_ensure_writable_dir_creates_missing_parent_directories
+    installer = setup_base_installer(false)
+
+    non_existent_parent = File.join(@tempdir, "non_existent_parent")
+    target_dir = File.join(non_existent_parent, "target_dir")
+
+    refute_directory_exists non_existent_parent, "Parent directory should not exist yet"
+    refute_directory_exists target_dir, "Target directory should not exist yet"
+
+    assert_nothing_raised do
+      installer.send(:ensure_writable_dir, target_dir)
+    end
+
+    assert_directory_exists non_existent_parent, "Parent directory should exist now"
+    assert_directory_exists target_dir, "Target directory should exist now"
   end
 
   @@symlink_supported = nil
diff --git a/test/rubygems/mock_gem_ui.rb b/test/rubygems/mock_gem_ui.rb
index 1ece78fde7545e..218d4b6965d1eb 100644
--- a/test/rubygems/mock_gem_ui.rb
+++ b/test/rubygems/mock_gem_ui.rb
@@ -16,7 +16,7 @@ def initialize(question)
     end
   end
 
-  class TermError < RuntimeError
+  class TermError < SystemExit
     attr_reader :exit_code
 
     def initialize(exit_code)
diff --git a/test/rubygems/rubygems/commands/ins_command.rb b/test/rubygems/rubygems/commands/ins_command.rb
new file mode 100644
index 00000000000000..8e2ac16f22e5a4
--- /dev/null
+++ b/test/rubygems/rubygems/commands/ins_command.rb
@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class Gem::Commands::InsCommand < Gem::Command
+  def initialize
+    super("ins", "Does something different from install", {})
+  end
+end
diff --git a/test/rubygems/rubygems/commands/interrupt_command.rb b/test/rubygems/rubygems/commands/interrupt_command.rb
new file mode 100644
index 00000000000000..88d2ef22e73f5c
--- /dev/null
+++ b/test/rubygems/rubygems/commands/interrupt_command.rb
@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+class Gem::Commands::InterruptCommand < Gem::Command
+  def initialize
+    super("interrupt", "Raises an Interrupt Exception", {})
+  end
+
+  def execute
+    raise Interrupt, "Interrupt exception"
+  end
+end
diff --git a/test/rubygems/rubygems_plugin.rb b/test/rubygems/rubygems_plugin.rb
index 949580f9043faa..f9f2a7d91182b3 100644
--- a/test/rubygems/rubygems_plugin.rb
+++ b/test/rubygems/rubygems_plugin.rb
@@ -2,23 +2,4 @@
 
 require "rubygems/command_manager"
 
-##
-# This is an example of exactly what NOT to do.
-#
-# DO NOT include code like this in your rubygems_plugin.rb
-
-module Gem::Commands
-  remove_const(:InterruptCommand) if defined?(InterruptCommand)
-end
-
-class Gem::Commands::InterruptCommand < Gem::Command
-  def initialize
-    super("interrupt", "Raises an Interrupt Exception", {})
-  end
-
-  def execute
-    raise Interrupt, "Interrupt exception"
-  end
-end
-
 Gem::CommandManager.instance.register_command :interrupt
diff --git a/test/rubygems/specifications/rubyforge-0.0.1.gemspec b/test/rubygems/specifications/rubyforge-0.0.1.gemspec
index 49619bf5691632..0421b675a0f974 100644
--- a/test/rubygems/specifications/rubyforge-0.0.1.gemspec
+++ b/test/rubygems/specifications/rubyforge-0.0.1.gemspec
@@ -1,14 +1,15 @@
 # frozen_string_literal: true
 
 Gem::Specification.new do |s|
-  s.name              = "rubyforge"
-  s.version           = "0.0.1"
-  s.platform          = "ruby"
-  s.require_paths     = ["lib"]
-  s.summary           = "A very bar gem"
-  s.authors           = ["unknown"]
-  s.license           = "MIT"
-  s.homepage          = "http://example.com"
-  s.files             = ["README.md"]
-  s.rubyforge_project = "abc"
+  s.name                  = "rubyforge"
+  s.version               = "0.0.1"
+  s.platform              = "ruby"
+  s.require_paths         = ["lib"]
+  s.summary               = "A very bar gem"
+  s.authors               = ["unknown"]
+  s.license               = "MIT"
+  s.homepage              = "http://example.com"
+  s.files                 = ["README.md"]
+  s.rubyforge_project     = "abc"
+  s.required_ruby_version = ">= 1.9.3"
 end
diff --git a/test/rubygems/test_bundled_ca.rb b/test/rubygems/test_bundled_ca.rb
index 47c1d34df5b2be..a737185681ee25 100644
--- a/test/rubygems/test_bundled_ca.rb
+++ b/test/rubygems/test_bundled_ca.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require_relative "helper"
-require "net/http"
+require "rubygems/vendored_net_http"
 require "rubygems/openssl"
 
 unless Gem::HAVE_OPENSSL
@@ -28,12 +28,12 @@ def bundled_certificate_store
 
   def assert_https(host)
     assert true
-    http = Net::HTTP.new(host, 443)
+    http = Gem::Net::HTTP.new(host, 443)
     http.use_ssl = true
     http.verify_mode = OpenSSL::SSL::VERIFY_PEER
     http.cert_store = bundled_certificate_store
     http.get("/")
-  rescue Errno::ENOENT, Errno::ETIMEDOUT, SocketError
+  rescue Errno::ENOENT, Errno::ETIMEDOUT, SocketError, Gem::Net::OpenTimeout
     pend "#{host} seems offline, I can't tell whether ssl would work."
   rescue OpenSSL::SSL::SSLError => e
     # Only fail for certificate verification errors
diff --git a/test/rubygems/test_gem.rb b/test/rubygems/test_gem.rb
index a7174cf689c2c2..cdc3479e3739d3 100644
--- a/test/rubygems/test_gem.rb
+++ b/test/rubygems/test_gem.rb
@@ -11,7 +11,7 @@
 class TestGem < Gem::TestCase
   PLUGINS_LOADED = [] # rubocop:disable Style/MutableConstant
 
-  PROJECT_DIR = File.expand_path("../..", __dir__).tap(&Gem::UNTAINT)
+  PROJECT_DIR = File.expand_path("../..", __dir__)
 
   def setup
     super
@@ -21,8 +21,6 @@ def setup
     common_installer_setup
 
     @additional = %w[a b].map {|d| File.join @tempdir, d }
-
-    util_remove_interrupt_command
   end
 
   def test_self_finish_resolve
@@ -96,7 +94,7 @@ def test_self_install
 
     gemhome2 = "#{@gemhome}2"
 
-    installed = Gem.install "a", "= 1", :install_dir => gemhome2
+    installed = Gem.install "a", "= 1", install_dir: gemhome2
 
     assert_equal %w[a-1], installed.map(&:full_name)
 
@@ -115,7 +113,7 @@ def test_self_install_in_rescue
       begin
         raise "Error"
       rescue StandardError
-        Gem.install "a", "= 1", :install_dir => gemhome2
+        Gem.install "a", "= 1", install_dir: gemhome2
       end
     assert_equal %w[a-1], installed.map(&:full_name)
   end
@@ -133,7 +131,7 @@ def test_self_install_permissions_umask_0
 
   def test_self_install_permissions_umask_077
     umask = File.umask(0o077)
-    assert_self_install_permissions
+    assert_self_install_permissions(data_mode: 0o600)
   ensure
     File.umask(umask)
   end
@@ -151,14 +149,14 @@ def test_self_install_permissions_with_format_executable_and_non_standard_ruby_i
     Gem::Installer.exec_format = nil
   end
 
-  def assert_self_install_permissions(format_executable: false)
+  def assert_self_install_permissions(format_executable: false, data_mode: 0o640)
     mask = Gem.win_platform? ? 0o700 : 0o777
     options = {
-      :dir_mode => 0o500,
-      :prog_mode => Gem.win_platform? ? 0o410 : 0o510,
-      :data_mode => 0o640,
-      :wrappers => true,
-      :format_executable => format_executable,
+      dir_mode: 0o500,
+      prog_mode: Gem.win_platform? ? 0o410 : 0o510,
+      data_mode: data_mode,
+      wrappers: true,
+      format_executable: format_executable,
     }
     Dir.chdir @tempdir do
       Dir.mkdir "bin"
@@ -201,7 +199,7 @@ def assert_self_install_permissions(format_executable: false)
     end
     assert_equal(expected, result)
   ensure
-    File.chmod(0o755, *Dir.glob(@gemhome + "/gems/**/").map {|path| path.tap(&Gem::UNTAINT) })
+    File.chmod(0o755, *Dir.glob(@gemhome + "/gems/**/"))
   end
 
   def test_require_missing
@@ -516,7 +514,10 @@ def test_self_clear_paths
 
     Gem.clear_paths
 
-    assert_nil Gem::Specification.send(:class_variable_get, :@@all)
+    with_env("GEM_HOME" => "foo", "GEM_PATH" => "bar") do
+      assert_equal("foo", Gem.dir)
+      assert_equal("bar", Gem.path.first)
+    end
   end
 
   def test_self_configuration
@@ -1025,6 +1026,20 @@ def test_self_refresh_keeps_loaded_specs_activated
     Gem.refresh
   end
 
+  def test_activated_specs_does_not_cause_duplicates_when_looping_through_specs
+    util_make_gems
+
+    s = Gem::Specification.first
+    s.activate
+
+    Gem.refresh
+
+    assert_equal 1, Gem::Specification.count {|spec| spec.full_name == s.full_name }
+
+    Gem.loaded_specs.delete(s)
+    Gem.refresh
+  end
+
   def test_self_ruby_escaping_spaces_in_path
     with_clean_path_to_ruby do
       with_rb_config_ruby("C:/Ruby 1.8/bin/ruby.exe") do
@@ -1281,7 +1296,6 @@ def test_self_try_activate_missing_prerelease
   def test_self_try_activate_missing_extensions
     spec = util_spec "ext", "1" do |s|
       s.extensions = %w[ext/extconf.rb]
-      s.mark_version
       s.installed_by_version = v("2.2")
     end
 
@@ -1522,8 +1536,6 @@ def test_load_env_plugins
       nil
     end
 
-    util_remove_interrupt_command
-
     # Should attempt to cause a StandardError
     with_plugin("standarderror") { Gem.load_env_plugins }
     begin
@@ -1532,8 +1544,6 @@ def test_load_env_plugins
       nil
     end
 
-    util_remove_interrupt_command
-
     # Should attempt to cause an Exception
     with_plugin("scripterror") { Gem.load_env_plugins }
     begin
@@ -1552,29 +1562,28 @@ def test_gem_path_ordering
     g = util_spec "g", "1", nil, "lib/g.rb"
     m = util_spec "m", "1", nil, "lib/m.rb"
 
-    install_gem g, :install_dir => Gem.dir
-    m0 = install_gem m, :install_dir => Gem.dir
-    m1 = install_gem m, :install_dir => Gem.user_dir
+    install_gem g, install_dir: Gem.dir
+    m0 = install_gem m, install_dir: Gem.dir
+    m1 = install_gem m, install_dir: Gem.user_dir
 
     assert_equal m0.gem_dir, File.join(Gem.dir, "gems", "m-1")
     assert_equal m1.gem_dir, File.join(Gem.user_dir, "gems", "m-1")
 
     tests = [
-      [:dir0, [Gem.dir, Gem.user_dir], m0],
-      [:dir1, [Gem.user_dir, Gem.dir], m1],
+      [:dir0, [Gem.dir, Gem.user_dir]],
+      [:dir1, [Gem.user_dir, Gem.dir]],
     ]
 
-    tests.each do |name, paths, expected|
+    tests.each do |name, paths|
       Gem.use_paths paths.first, paths
-      Gem::Specification.reset
       Gem.searcher = nil
 
       assert_equal Gem::Dependency.new("m","1").to_specs,
                    Gem::Dependency.new("m","1").to_specs.sort
 
       assert_equal \
-        [expected.gem_dir],
-        Gem::Dependency.new("m","1").to_specs.map(&:gem_dir).sort,
+        [m0.gem_dir, m1.gem_dir],
+        Gem::Dependency.new("m","1").to_specs.map(&:gem_dir).uniq.sort,
         "Wrong specs for #{name}"
 
       spec = Gem::Dependency.new("m","1").to_spec
@@ -1608,15 +1617,17 @@ def test_gem_path_ordering_short
     g = util_spec "g", "1", nil, "lib/g.rb"
     m = util_spec "m", "1", nil, "lib/m.rb"
 
-    install_gem g, :install_dir => Gem.dir
-    install_gem m, :install_dir => Gem.dir
-    install_gem m, :install_dir => Gem.user_dir
+    install_gem g, install_dir: Gem.dir
+    install_gem m, install_dir: Gem.dir
+    install_gem m, install_dir: Gem.user_dir
 
     Gem.use_paths Gem.dir, [Gem.dir, Gem.user_dir]
 
+    spec = Gem::Dependency.new("m", "1").to_spec
+
     assert_equal \
       File.join(Gem.dir, "gems", "m-1"),
-      Gem::Dependency.new("m","1").to_spec.gem_dir,
+      spec.gem_dir,
       "Wrong spec selected"
   end
 
@@ -1788,11 +1799,6 @@ def util_exec_gem
     spec
   end
 
-  def util_remove_interrupt_command
-    Gem::Commands.send :remove_const, :InterruptCommand if
-      Gem::Commands.const_defined? :InterruptCommand
-  end
-
   def util_cache_dir
     File.join Gem.dir, "cache"
   end
diff --git a/test/rubygems/test_gem_bundler_version_finder.rb b/test/rubygems/test_gem_bundler_version_finder.rb
index 6d888104933460..39255bc4e1d7cb 100644
--- a/test/rubygems/test_gem_bundler_version_finder.rb
+++ b/test/rubygems/test_gem_bundler_version_finder.rb
@@ -45,6 +45,8 @@ def test_bundler_version_with_bundle_update_bundler
     assert_equal v("1.1.1.1"), bvf.bundler_version
     ARGV.replace %w[update --bundler\ 1.1.1.2 --bundler --bundler 1.1.1.1 gem_name]
     assert_equal v("1.1.1.1"), bvf.bundler_version
+    $0 = "/foo/bar/bundler"
+    assert_equal v("1.1.1.1"), bvf.bundler_version
     $0 = "other"
     assert_nil bvf.bundler_version
   end
@@ -80,7 +82,7 @@ def test_bundler_version
 
   def test_deleted_directory
     pend "Cannot perform this test on windows" if Gem.win_platform?
-    pend "Cannot perform this test on Solaris" if RUBY_PLATFORM.include?("solaris")
+
     require "tmpdir"
 
     orig_dir = Dir.pwd
diff --git a/test/rubygems/test_gem_ci_detector.rb b/test/rubygems/test_gem_ci_detector.rb
new file mode 100644
index 00000000000000..a28ee49f4b2e55
--- /dev/null
+++ b/test/rubygems/test_gem_ci_detector.rb
@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+require_relative "helper"
+require "rubygems"
+
+class TestCiDetector < Gem::TestCase
+  def test_ci?
+    with_env("FOO" => "bar") { assert_equal(false, Gem::CIDetector.ci?) }
+    with_env("CI" => "true") { assert_equal(true, Gem::CIDetector.ci?) }
+    with_env("CONTINUOUS_INTEGRATION" => "1") { assert_equal(true, Gem::CIDetector.ci?) }
+    with_env("RUN_ID" => "0", "TASKCLUSTER_ROOT_URL" => "2") do
+      assert_equal(true, Gem::CIDetector.ci?)
+    end
+  end
+
+  def test_ci_strings
+    with_env("FOO" => "bar") { assert_empty(Gem::CIDetector.ci_strings) }
+    with_env("TRAVIS" => "true") { assert_equal(["travis"], Gem::CIDetector.ci_strings) }
+    with_env("CI" => "true", "CIRCLECI" => "true", "GITHUB_ACTIONS" => "true") do
+      assert_equal(["ci", "circle", "github"], Gem::CIDetector.ci_strings)
+    end
+    with_env("CI" => "true", "CI_NAME" => "MYCI") do
+      assert_equal(["ci", "myci"], Gem::CIDetector.ci_strings)
+    end
+    with_env("GITHUB_ACTIONS" => "true", "CI_NAME" => "github") do
+      assert_equal(["github"], Gem::CIDetector.ci_strings)
+    end
+    with_env("TASKCLUSTER_ROOT_URL" => "https://foo.bar", "DSARI" => "1", "CI_NAME" => "") do
+      assert_equal(["dsari", "taskcluster"], Gem::CIDetector.ci_strings)
+    end
+  end
+end
diff --git a/test/rubygems/test_gem_command.rb b/test/rubygems/test_gem_command.rb
index 3d0f04830e8bdf..3695f9488f340f 100644
--- a/test/rubygems/test_gem_command.rb
+++ b/test/rubygems/test_gem_command.rb
@@ -92,7 +92,7 @@ def test_defaults
       options[:help] = value
     end
 
-    @cmd.defaults = { :help => true }
+    @cmd.defaults = { help: true }
 
     @cmd.when_invoked do |options|
       assert options[:help], "Help options should default true"
diff --git a/test/rubygems/test_gem_command_manager.rb b/test/rubygems/test_gem_command_manager.rb
index fe7f3da1378823..e1c3512b6f9d04 100644
--- a/test/rubygems/test_gem_command_manager.rb
+++ b/test/rubygems/test_gem_command_manager.rb
@@ -4,7 +4,7 @@
 require "rubygems/command_manager"
 
 class TestGemCommandManager < Gem::TestCase
-  PROJECT_DIR = File.expand_path("../..", __dir__).tap(&Gem::UNTAINT)
+  PROJECT_DIR = File.expand_path("../..", __dir__)
 
   def setup
     super
@@ -43,23 +43,24 @@ def test_find_login_alias_command
     assert_kind_of Gem::Commands::SigninCommand, command
   end
 
-  def test_find_logout_alias_comamnd
+  def test_find_logout_alias_command
     command = @command_manager.find_command "logout"
 
     assert_kind_of Gem::Commands::SignoutCommand, command
   end
 
   def test_find_command_ambiguous_exact
-    ins_command = Class.new
-    Gem::Commands.send :const_set, :InsCommand, ins_command
+    old_load_path = $:.dup
+    $: << File.expand_path("test/rubygems", PROJECT_DIR)
 
     @command_manager.register_command :ins
 
     command = @command_manager.find_command "ins"
 
-    assert_kind_of ins_command, command
+    assert_kind_of Gem::Commands::InsCommand, command
   ensure
-    Gem::Commands.send :remove_const, :InsCommand
+    $:.replace old_load_path
+    @command_manager.unregister_command :ins
   end
 
   def test_find_command_unknown
diff --git a/test/rubygems/test_gem_commands_build_command.rb b/test/rubygems/test_gem_commands_build_command.rb
index 42715df8ea7b9c..d44126d2046a94 100644
--- a/test/rubygems/test_gem_commands_build_command.rb
+++ b/test/rubygems/test_gem_commands_build_command.rb
@@ -26,8 +26,9 @@ def setup
     end
 
     @gem = util_spec "some_gem" do |s|
-      s.license = "AGPL-3.0"
+      s.license = "AGPL-3.0-only"
       s.files = ["README.md"]
+      s.required_ruby_version = "2.3.0"
     end
 
     @cmd = Gem::Commands::BuildCommand.new
@@ -178,6 +179,7 @@ def test_execute_rubyforge_project_warning
   def test_execute_strict_with_warnings
     bad_gem = util_spec "some_bad_gem" do |s|
       s.files = ["README.md"]
+      s.required_ruby_version = ">= 1.9.3"
     end
 
     gemspec_file = File.join(@tempdir, bad_gem.spec_name)
@@ -198,8 +200,8 @@ def test_execute_strict_with_warnings
     end
 
     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:  licenses is empty, but is recommended. Use an license identifier from", error.shift
+    assert_equal "https://spdx.org/licenses or 'Nonstandard' for a nonstandard license,", error.shift
     assert_equal "or set it to nil if you don't want to specify a license.", error.shift
     assert_equal "WARNING:  See https://guides.rubygems.org/specification-reference/ for help", error.shift
     assert_equal [], error
diff --git a/test/rubygems/test_gem_commands_cleanup_command.rb b/test/rubygems/test_gem_commands_cleanup_command.rb
index 732b3288a5a555..bcb8871b572160 100644
--- a/test/rubygems/test_gem_commands_cleanup_command.rb
+++ b/test/rubygems/test_gem_commands_cleanup_command.rb
@@ -169,7 +169,7 @@ def test_execute_all_user_no_sudo
     FileUtils.chmod 0o555, @gemhome
 
     @a_1_1, = util_gem "a", "1.1"
-    @a_1_1 = install_gem @a_1_1, :user_install => true # pick up user install path
+    @a_1_1 = install_gem @a_1_1, user_install: true # pick up user install path
 
     Gem::Specification.dirs = [Gem.dir, Gem.user_dir]
 
@@ -243,11 +243,11 @@ def test_execute_remove_gem_home_only
     e_1, = util_gem "e", "1"
     e_2, = util_gem "e", "2"
 
-    c_1 = install_gem c_1, :user_install => true # pick up user install path
+    c_1 = install_gem c_1, user_install: true # pick up user install path
     c_2 = install_gem c_2
 
     d_1 = install_gem d_1
-    d_2 = install_gem d_2, :user_install => true # pick up user install path
+    d_2 = install_gem d_2, user_install: true # pick up user install path
 
     e_1 = install_gem e_1
     e_2 = install_gem e_2
@@ -270,8 +270,8 @@ def test_execute_user_install
     d_1, = util_gem "d", "1.0"
     d_2, = util_gem "d", "1.1"
 
-    c_1 = install_gem c_1, :user_install => true # pick up user install path
-    c_2 = install_gem c_2, :user_install => true # pick up user install path
+    c_1 = install_gem c_1, user_install: true # pick up user install path
+    c_2 = install_gem c_2, user_install: true # pick up user install path
 
     d_1 = install_gem d_1
     d_2 = install_gem d_2
diff --git a/test/rubygems/test_gem_commands_contents_command.rb b/test/rubygems/test_gem_commands_contents_command.rb
index d8e6ba3dec534b..049afe8a014ad1 100644
--- a/test/rubygems/test_gem_commands_contents_command.rb
+++ b/test/rubygems/test_gem_commands_contents_command.rb
@@ -227,7 +227,6 @@ def test_execute_default_gem
     default_gem_spec = new_default_spec("default", "2.0.0.0",
                                         nil, "default/gem.rb")
     default_gem_spec.executables = ["default_command"]
-    default_gem_spec.files += ["default_gem.so"]
     install_default_gems(default_gem_spec)
 
     @cmd.options[:args] = %w[default]
@@ -237,9 +236,8 @@ def test_execute_default_gem
     end
 
     expected = [
-      [RbConfig::CONFIG["bindir"], "default_command"],
-      [RbConfig::CONFIG["rubylibdir"], "default/gem.rb"],
-      [RbConfig::CONFIG["archdir"], "default_gem.so"],
+      [File.join(@gemhome, "bin"), "default_command"],
+      [File.join(@tempdir, "default_gems", "lib"), "default/gem.rb"],
     ].sort.map {|a|File.join a }.join "\n"
 
     assert_equal expected, @ui.output.chomp
diff --git a/test/rubygems/test_gem_commands_environment_command.rb b/test/rubygems/test_gem_commands_environment_command.rb
index f527574c070bf1..48252d84d4e49b 100644
--- a/test/rubygems/test_gem_commands_environment_command.rb
+++ b/test/rubygems/test_gem_commands_environment_command.rb
@@ -30,7 +30,7 @@ def test_execute
     assert_match(/USER INSTALLATION DIRECTORY: #{Regexp.escape Gem.user_dir}/,
                  @ui.output)
     assert_match(/RUBYGEMS PREFIX: /, @ui.output)
-    assert_match(/RUBY EXECUTABLE:.*#{RbConfig::CONFIG['ruby_install_name']}/,
+    assert_match(/RUBY EXECUTABLE:.*#{RbConfig::CONFIG["ruby_install_name"]}/,
                  @ui.output)
     assert_match(/GIT EXECUTABLE: #{@cmd.send(:git_path)}/, @ui.output)
     assert_match(/SYSTEM CONFIGURATION DIRECTORY:/, @ui.output)
diff --git a/test/rubygems/test_gem_commands_exec_command.rb b/test/rubygems/test_gem_commands_exec_command.rb
index e8bd354bc3ec9c..db738b5e9f58e0 100644
--- a/test/rubygems/test_gem_commands_exec_command.rb
+++ b/test/rubygems/test_gem_commands_exec_command.rb
@@ -71,10 +71,10 @@ def test_full_option_parsing
       assert_equal options, {
         args: ["install", "--no-color", "--help", "--verbose"],
         executable: "pod",
-        :explicit_prerelease => false,
+        explicit_prerelease: false,
         gem_name: "cocoapods",
         prerelease: false,
-        :version => Gem::Requirement.new(["> 1", "< 1.3"]),
+        version: Gem::Requirement.new(["> 1", "< 1.3"]),
         build_args: nil,
       }
     end
@@ -87,7 +87,7 @@ def test_single_arg_parsing
         args: [],
         executable: "rails",
         gem_name: "rails",
-        :version => Gem::Requirement.new([">= 0"]),
+        version: Gem::Requirement.new([">= 0"]),
         build_args: nil,
       }
     end
@@ -100,7 +100,7 @@ def test_single_arg_parsing_with_version
         args: [],
         executable: "rails",
         gem_name: "rails",
-        :version => Gem::Requirement.new(["= 7.1"]),
+        version: Gem::Requirement.new(["= 7.1"]),
         build_args: nil,
       }
     end
@@ -182,7 +182,7 @@ def test_gem_with_platform_dependencies
       fetcher.download "a", 2 do |s|
         s.executables = %w[a]
         s.files = %w[bin/a lib/a.rb]
-        s.add_runtime_dependency "with_platform"
+        s.add_dependency "with_platform"
 
         write_file File.join(*%W[gems #{s.original_name} bin a]) do |f|
           f << 'require "with_platform"' << "\n"
@@ -215,14 +215,14 @@ def test_gem_with_platform_dependencies
   end
 
   def test_gem_with_platform_and_platform_dependencies
-    pend "extensions don't quite work on jruby" if Gem.java_platform?
+    pend "needs investigation" if Gem.java_platform?
     pend "terminates on mswin" if vc_windows? && ruby_repo?
 
     spec_fetcher do |fetcher|
       fetcher.download "a", 2 do |s|
         s.executables = %w[a]
         s.files = %w[bin/a lib/a.rb]
-        s.add_runtime_dependency "with_platform"
+        s.add_dependency "with_platform"
         s.platform = Gem::Platform.local.to_s
 
         write_file File.join(*%W[gems #{s.original_name} bin a]) do |f|
@@ -234,7 +234,7 @@ def test_gem_with_platform_and_platform_dependencies
       fetcher.download "a", 2 do |s|
         s.executables = %w[a]
         s.files = %w[bin/a lib/a.rb extconf.rb]
-        s.add_runtime_dependency "with_platform"
+        s.add_dependency "with_platform"
 
         write_file File.join(*%W[gems #{s.original_name} bin a]) do |f|
           f << 'require "with_platform"' << "\n"
@@ -261,7 +261,7 @@ def test_gem_with_platform_and_platform_dependencies
 
       fetcher.download "with_platform", 2 do |s|
         s.files = %w[lib/with_platform.rb]
-        s.add_runtime_dependency "sometimes_used"
+        s.add_dependency "sometimes_used"
       end
 
       fetcher.download "sometimes_used", 2 do |s|
@@ -370,8 +370,11 @@ def test_gem_with_multiple_executables_no_match
     util_clear_gems
 
     use_ui @ui do
-      @cmd.invoke "a:2"
-      assert_equal "a-2 foo\n", @ui.output
+      e = assert_raise Gem::MockGemUi::TermError do
+        @cmd.invoke "a:2"
+      end
+      assert_equal 1, e.exit_code
+      assert_equal "ERROR:  Ambiguous which executable from gem `a` should be run: the options are [\"bar\", \"foo\"], specify one via COMMAND, and use `-g` and `-v` to specify gem and version\n", @ui.error
     end
   end
 
@@ -493,7 +496,6 @@ def test_version_mismatch
       assert_equal 2, e.exit_code
       assert_equal <<~ERR, @ui.error
         ERROR:  Could not find a valid gem 'a' (= 2) in any repository
-        ERROR:  Possible alternatives: a
       ERR
     end
   end
@@ -574,7 +576,6 @@ def test_conservative_missing_gem
       assert_include @ui.output, "a (= 2) not available locally"
       assert_equal <<~ERROR, @ui.error
         ERROR:  Could not find a valid gem 'a' (= 2) in any repository
-        ERROR:  Possible alternatives: a
       ERROR
     end
   end
@@ -677,7 +678,7 @@ def test_uses_newest_version_of_dependency
       fetcher.gem "a", 1 do |s|
         s.executables = %w[]
         s.files = %w[lib/a.rb]
-        s.add_runtime_dependency "b"
+        s.add_dependency "b"
       end
 
       fetcher.gem "b", 1 do |s|
@@ -711,7 +712,7 @@ def test_gem_exec_gem_uninstall
       fetcher.download "a", 2 do |s|
         s.executables = %w[a]
         s.files = %w[bin/a lib/a.rb]
-        s.add_runtime_dependency "b"
+        s.add_dependency "b"
 
         write_file File.join(*%W[gems #{s.original_name} bin a]) do |f|
           f << "Gem.ui.say #{s.original_name.dump}"
@@ -736,6 +737,8 @@ def test_gem_exec_gem_uninstall
       rescue StandardError
         nil
       end
+
+      assert_empty @ui.error
       refute_includes @ui.output, "running gem exec with"
       assert_includes @ui.output, "Successfully uninstalled a-2\n"
 
@@ -747,7 +750,7 @@ def test_gem_exec_gem_uninstall
       assert_match(/\A\s*\** LOCAL GEMS \**\s*\z/m, @ui.output)
 
       invoke "gem", "env", "GEM_HOME"
-      assert_equal "#{@gem_home}/gem_exec\n", @ui.output
+      assert_equal "#{@gem_home}\n", @ui.output
     end
   end
 
@@ -767,8 +770,7 @@ def test_only_prerelease_available
       assert_raise Gem::MockGemUi::TermError do
         invoke "a"
       end
-      assert_equal "ERROR:  Could not find a valid gem 'a' (>= 0) in any repository\n" \
-                   "ERROR:  Possible alternatives: a\n", @ui.error
+      assert_equal "ERROR:  Could not find a valid gem 'a' (>= 0) in any repository\n", @ui.error
       assert_empty @ui.output
       assert_empty @installed_specs
     end
diff --git a/test/rubygems/test_gem_commands_fetch_command.rb b/test/rubygems/test_gem_commands_fetch_command.rb
index e8710d3cd13028..84fad08fd6c628 100644
--- a/test/rubygems/test_gem_commands_fetch_command.rb
+++ b/test/rubygems/test_gem_commands_fetch_command.rb
@@ -21,11 +21,7 @@ def test_execute
 
     @cmd.options[:args] = %w[a]
 
-    use_ui @ui do
-      Dir.chdir @tempdir do
-        @cmd.execute
-      end
-    end
+    execute_with_exit_code
 
     a2 = specs["a-2"]
 
@@ -46,11 +42,7 @@ def test_execute_latest
     @cmd.options[:args] = %w[a]
     @cmd.options[:version] = req(">= 0.1")
 
-    use_ui @ui do
-      Dir.chdir @tempdir do
-        @cmd.execute
-      end
-    end
+    execute_with_exit_code
 
     a2 = specs["a-2"]
     assert_path_exist(File.join(@tempdir, a2.file_name),
@@ -68,11 +60,7 @@ def test_execute_prerelease
     @cmd.options[:args] = %w[a]
     @cmd.options[:prerelease] = true
 
-    use_ui @ui do
-      Dir.chdir @tempdir do
-        @cmd.execute
-      end
-    end
+    execute_with_exit_code
 
     a2 = specs["a-2"]
 
@@ -105,11 +93,7 @@ def test_execute_platform
     FileUtils.cp a2_universal_darwin, a2_universal_darwin_spec.cache_file
 
     util_set_arch "arm64-darwin20" do
-      use_ui @ui do
-        Dir.chdir @tempdir do
-          @cmd.execute
-        end
-      end
+      execute_with_exit_code
     end
 
     assert_path_exist(File.join(@tempdir, a2_universal_darwin_spec.file_name),
@@ -126,11 +110,7 @@ def test_execute_specific_prerelease
     @cmd.options[:prerelease] = true
     @cmd.options[:version] = "2.a"
 
-    use_ui @ui do
-      Dir.chdir @tempdir do
-        @cmd.execute
-      end
-    end
+    execute_with_exit_code
 
     a2_pre = specs["a-2.a"]
 
@@ -147,11 +127,7 @@ def test_execute_version
     @cmd.options[:args] = %w[a]
     @cmd.options[:version] = Gem::Requirement.new "1"
 
-    use_ui @ui do
-      Dir.chdir @tempdir do
-        @cmd.execute
-      end
-    end
+    execute_with_exit_code
 
     a1 = specs["a-1"]
 
@@ -166,11 +142,7 @@ def test_execute_version_specified_by_colon
 
     @cmd.options[:args] = %w[a:1]
 
-    use_ui @ui do
-      Dir.chdir @tempdir do
-        @cmd.execute
-      end
-    end
+    execute_with_exit_code
 
     a1 = specs["a-1"]
 
@@ -182,11 +154,7 @@ def test_execute_two_version
     @cmd.options[:args] = %w[a b]
     @cmd.options[:version] = Gem::Requirement.new "1"
 
-    use_ui @ui do
-      assert_raise Gem::MockGemUi::TermError, @ui.error do
-        @cmd.execute
-      end
-    end
+    execute_with_term_error
 
     msg = "ERROR:  Can't use --version with multiple gems. You can specify multiple gems with" \
       " version requirements using `gem fetch 'my_gem:1.0.0' 'my_other_gem:~>2.0.0'`"
@@ -203,11 +171,7 @@ def test_execute_two_version_specified_by_colon
 
     @cmd.options[:args] = %w[a:1 b:1]
 
-    use_ui @ui do
-      Dir.chdir @tempdir do
-        @cmd.execute
-      end
-    end
+    execute_with_exit_code
 
     a1 = specs["a-1"]
     b1 = specs["b-1"]
@@ -220,18 +184,16 @@ def test_execute_two_version_specified_by_colon
 
   def test_execute_version_nonexistent
     spec_fetcher do |fetcher|
-      fetcher.spec "foo", 1
+      fetcher.spec "foobar", 1
     end
 
-    @cmd.options[:args] = %w[foo:2]
+    @cmd.options[:args] = %w[foobar:2]
 
-    use_ui @ui do
-      @cmd.execute
-    end
+    execute_with_term_error
 
     expected = <<-EXPECTED
-ERROR:  Could not find a valid gem 'foo' (2) in any repository
-ERROR:  Possible alternatives: foo
+ERROR:  Could not find a valid gem 'foobar' (2) in any repository
+ERROR:  Possible alternatives: foobar
     EXPECTED
 
     assert_equal expected, @ui.error
@@ -239,20 +201,38 @@ def test_execute_version_nonexistent
 
   def test_execute_nonexistent_hint_disabled
     spec_fetcher do |fetcher|
-      fetcher.spec "foo", 1
+      fetcher.spec "foobar", 1
     end
 
-    @cmd.options[:args] = %w[foo:2]
+    @cmd.options[:args] = %w[foobar:2]
     @cmd.options[:suggest_alternate] = false
 
-    use_ui @ui do
-      @cmd.execute
-    end
+    execute_with_term_error
 
     expected = <<-EXPECTED
-ERROR:  Could not find a valid gem 'foo' (2) in any repository
+ERROR:  Could not find a valid gem 'foobar' (2) in any repository
     EXPECTED
 
     assert_equal expected, @ui.error
   end
+
+  private
+
+  def execute_with_term_error
+    use_ui @ui do
+      assert_raise Gem::MockGemUi::TermError, @ui.error do
+        @cmd.execute
+      end
+    end
+  end
+
+  def execute_with_exit_code
+    use_ui @ui do
+      Dir.chdir @tempdir do
+        assert_raise Gem::MockGemUi::SystemExitException, @ui.error do
+          @cmd.execute
+        end
+      end
+    end
+  end
 end
diff --git a/test/rubygems/test_gem_commands_generate_index_command.rb b/test/rubygems/test_gem_commands_generate_index_command.rb
deleted file mode 100644
index 7e719a5f60c214..00000000000000
--- a/test/rubygems/test_gem_commands_generate_index_command.rb
+++ /dev/null
@@ -1,81 +0,0 @@
-# frozen_string_literal: true
-
-require_relative "helper"
-require "rubygems/indexer"
-require "rubygems/commands/generate_index_command"
-
-class TestGemCommandsGenerateIndexCommand < Gem::TestCase
-  def setup
-    super
-
-    @cmd = Gem::Commands::GenerateIndexCommand.new
-    @cmd.options[:directory] = @gemhome
-  end
-
-  def test_execute
-    use_ui @ui do
-      @cmd.execute
-    end
-
-    specs = File.join @gemhome, "specs.4.8.gz"
-
-    assert File.exist?(specs), specs
-  end
-
-  def test_execute_no_modern
-    @cmd.options[:modern] = false
-
-    use_ui @ui do
-      @cmd.execute
-    end
-
-    specs = File.join @gemhome, "specs.4.8.gz"
-
-    assert File.exist?(specs), specs
-  end
-
-  def test_handle_options_directory
-    return if Gem.win_platform?
-    refute_equal "/nonexistent", @cmd.options[:directory]
-
-    @cmd.handle_options %w[--directory /nonexistent]
-
-    assert_equal "/nonexistent", @cmd.options[:directory]
-  end
-
-  def test_handle_options_directory_windows
-    return unless Gem.win_platform?
-
-    refute_equal "/nonexistent", @cmd.options[:directory]
-
-    @cmd.handle_options %w[--directory C:/nonexistent]
-
-    assert_equal "C:/nonexistent", @cmd.options[:directory]
-  end
-
-  def test_handle_options_update
-    @cmd.handle_options %w[--update]
-
-    assert @cmd.options[:update]
-  end
-
-  def test_handle_options_modern
-    use_ui @ui do
-      @cmd.handle_options %w[--modern]
-    end
-
-    assert_equal \
-      "WARNING:  The \"--modern\" option has been deprecated and will be removed in Rubygems 4.0. Modern indexes (specs, latest_specs, and prerelease_specs) are always generated, so this option is not needed.\n",
-      @ui.error
-  end
-
-  def test_handle_options_no_modern
-    use_ui @ui do
-      @cmd.handle_options %w[--no-modern]
-    end
-
-    assert_equal \
-      "WARNING:  The \"--no-modern\" option has been deprecated and will be removed in Rubygems 4.0. The `--no-modern` option is currently ignored. Modern indexes (specs, latest_specs, and prerelease_specs) are always generated.\n",
-      @ui.error
-  end
-end
diff --git a/test/rubygems/test_gem_commands_help_command.rb b/test/rubygems/test_gem_commands_help_command.rb
index 359da0a6d01146..01ab4aab2fe46d 100644
--- a/test/rubygems/test_gem_commands_help_command.rb
+++ b/test/rubygems/test_gem_commands_help_command.rb
@@ -11,8 +11,6 @@ def setup
     super
 
     @cmd = Gem::Commands::HelpCommand.new
-
-    load File.expand_path("rubygems_plugin.rb", __dir__) unless Gem::Commands.const_defined? :InterruptCommand
   end
 
   def test_gem_help_bad
diff --git a/test/rubygems/test_gem_commands_info_command.rb b/test/rubygems/test_gem_commands_info_command.rb
index 83e4c8a8967d94..f020d380d29630 100644
--- a/test/rubygems/test_gem_commands_info_command.rb
+++ b/test/rubygems/test_gem_commands_info_command.rb
@@ -54,17 +54,52 @@ def test_execute_with_version_flag
       @cmd.execute
     end
 
-    expected = <<-EOF
+    expected = <<~EOF
 
-*** REMOTE GEMS ***
+      *** REMOTE GEMS ***
 
-coolgem (1.0)
-    Author: A User
-    Homepage: http://example.com
+      coolgem (1.0)
+          Author: A User
+          Homepage: http://example.com
 
-    this is a summary
+          this is a summary
     EOF
 
     assert_equal expected, @ui.output
   end
+
+  def test_execute_with_default_gem
+    @gem = new_default_spec("foo", "1.0.0", nil, "default/gem.rb")
+
+    install_default_gems @gem
+
+    @cmd.handle_options %w[foo]
+
+    use_ui @ui do
+      @cmd.execute
+    end
+
+    assert_include(@ui.output, "#{@gem.name} (#{@gem.version})\n")
+    assert_include(@ui.output, "Installed at (default): #{@gem.base_dir}\n")
+    assert_match "", @ui.error
+  end
+
+  def test_execute_with_default_gem_and_regular_gem
+    @default = new_default_spec("foo", "1.0.1", nil, "default/gem.rb")
+
+    install_default_gems @default
+
+    @regular = gem "foo", "1.0.0"
+
+    @cmd.handle_options %w[foo]
+
+    use_ui @ui do
+      @cmd.execute
+    end
+
+    assert_include(@ui.output, "foo (1.0.1, 1.0.0)\n")
+    assert_include(@ui.output, "Installed at (1.0.1, default): #{@default.base_dir}\n")
+    assert_include(@ui.output, "             (1.0.0): #{@default.base_dir}\n")
+    assert_match "", @ui.error
+  end
 end
diff --git a/test/rubygems/test_gem_commands_install_command.rb b/test/rubygems/test_gem_commands_install_command.rb
index 90c030951e0cd5..92933bfb77d06d 100644
--- a/test/rubygems/test_gem_commands_install_command.rb
+++ b/test/rubygems/test_gem_commands_install_command.rb
@@ -16,8 +16,6 @@ def setup
     @cmd.options[:document] = []
 
     @gemdeps = "tmp_install_gemdeps"
-
-    common_installer_setup
   end
 
   def teardown
@@ -192,31 +190,26 @@ def test_execute_no_user_install
     pend "skipped on MS Windows (chmod has no effect)" if Gem.win_platform?
     pend "skipped in root privilege" if Process.uid.zero?
 
-    specs = spec_fetcher do |fetcher|
-      fetcher.gem "a", 2
+    spec_fetcher do |fetcher|
+      fetcher.download "a", 2
     end
 
     @cmd.options[:user_install] = false
 
-    FileUtils.mv specs["a-2"].cache_file, @tempdir
-
     @cmd.options[:args] = %w[a]
 
     use_ui @ui do
-      orig_dir = Dir.pwd
-      begin
-        FileUtils.chmod 0o755, @userhome
-        FileUtils.chmod 0o555, @gemhome
+      FileUtils.chmod 0o755, @userhome
+      FileUtils.chmod 0o555, @gemhome
 
-        Dir.chdir @tempdir
-        assert_raise Gem::FilePermissionError do
-          @cmd.execute
-        end
-      ensure
-        Dir.chdir orig_dir
-        FileUtils.chmod 0o755, @gemhome
+      assert_raise Gem::MockGemUi::SystemExitException, @ui.error do
+        @cmd.execute
       end
+    ensure
+      FileUtils.chmod 0o755, @gemhome
     end
+
+    assert_equal %w[a-2], @cmd.installed_specs.map(&:full_name).sort
   end
 
   def test_execute_local_missing
@@ -436,21 +429,6 @@ def test_execute_nonexistent_with_dashes
     assert_equal expected, output
   end
 
-  def test_execute_conflicting_install_options
-    @cmd.options[:user_install] = true
-    @cmd.options[:install_dir] = "whatever"
-
-    use_ui @ui do
-      assert_raise Gem::MockGemUi::TermError do
-        @cmd.execute
-      end
-    end
-
-    expected = "ERROR:  Use --install-dir or --user-install but not both\n"
-
-    assert_equal expected, @ui.error
-  end
-
   def test_execute_prerelease_skipped_when_no_flag_set
     spec_fetcher do |fetcher|
       fetcher.gem "a", 1
@@ -669,17 +647,10 @@ def test_execute_rdoc
     @cmd.options[:args] = %w[a]
 
     use_ui @ui do
-      # Don't use Dir.chdir with a block, it warnings a lot because
-      # of a downstream Dir.chdir with a block
-      old = Dir.getwd
-
-      begin
-        Dir.chdir @tempdir
+      Dir.chdir @tempdir do
         assert_raise Gem::MockGemUi::SystemExitException, @ui.error do
           @cmd.execute
         end
-      ensure
-        Dir.chdir old
       end
     end
 
@@ -687,7 +658,7 @@ def test_execute_rdoc
 
     assert_path_exist File.join(a2.doc_dir, "ri")
     assert_path_exist File.join(a2.doc_dir, "rdoc")
-  end
+  end if defined?(Gem::RDoc) && !Gem.rdoc_hooks_defined_via_plugin?
 
   def test_execute_rdoc_with_path
     specs = spec_fetcher do |fetcher|
@@ -706,24 +677,17 @@ def test_execute_rdoc_with_path
     @cmd.options[:args] = %w[a]
 
     use_ui @ui do
-      # Don't use Dir.chdir with a block, it warnings a lot because
-      # of a downstream Dir.chdir with a block
-      old = Dir.getwd
-
-      begin
-        Dir.chdir @tempdir
+      Dir.chdir @tempdir do
         assert_raise Gem::MockGemUi::SystemExitException, @ui.error do
           @cmd.execute
         end
-      ensure
-        Dir.chdir old
       end
     end
 
     wait_for_child_process_to_exit
 
     assert_path_exist "whatever/doc/a-2", "documentation not installed"
-  end
+  end if defined?(Gem::RDoc) && !Gem.rdoc_hooks_defined_via_plugin?
 
   def test_execute_saves_build_args
     specs = spec_fetcher do |fetcher|
@@ -742,17 +706,10 @@ def test_execute_saves_build_args
     @cmd.options[:args] = %w[a]
 
     use_ui @ui do
-      # Don't use Dir.chdir with a block, it warnings a lot because
-      # of a downstream Dir.chdir with a block
-      old = Dir.getwd
-
-      begin
-        Dir.chdir @tempdir
+      Dir.chdir @tempdir do
         assert_raise Gem::MockGemUi::SystemExitException, @ui.error do
           @cmd.execute
         end
-      ensure
-        Dir.chdir old
       end
     end
 
@@ -1027,6 +984,38 @@ def test_install_gem_ignore_dependencies_remote_platform_local
     assert_equal %W[a-3-#{local}], @cmd.installed_specs.map(&:full_name)
   end
 
+  def test_install_gem_platform_specificity_match
+    util_set_arch "arm64-darwin-20"
+
+    spec_fetcher do |fetcher|
+      %w[ruby universal-darwin universal-darwin-20 x64-darwin-20 arm64-darwin-20].each do |platform|
+        fetcher.download "a", 3 do |s|
+          s.platform = platform
+        end
+      end
+    end
+
+    @cmd.install_gem "a", ">= 0"
+
+    assert_equal %w[a-3-arm64-darwin-20], @cmd.installed_specs.map(&:full_name)
+  end
+
+  def test_install_gem_platform_specificity_match_reverse_order
+    util_set_arch "arm64-darwin-20"
+
+    spec_fetcher do |fetcher|
+      %w[ruby universal-darwin universal-darwin-20 x64-darwin-20 arm64-darwin-20].reverse_each do |platform|
+        fetcher.download "a", 3 do |s|
+          s.platform = platform
+        end
+      end
+    end
+
+    @cmd.install_gem "a", ">= 0"
+
+    assert_equal %w[a-3-arm64-darwin-20], @cmd.installed_specs.map(&:full_name)
+  end
+
   def test_install_gem_ignore_dependencies_specific_file
     spec = util_spec "a", 2
 
@@ -1236,6 +1225,30 @@ def test_execute_installs_from_a_gemdeps
     assert_match "Installing a (2)", @ui.output
   end
 
+  def test_execute_installs_from_a_gemdeps_with_prerelease
+    spec_fetcher do |fetcher|
+      fetcher.download "a", 1
+      fetcher.download "a", "2.a"
+    end
+
+    File.open @gemdeps, "w" do |f|
+      f << "gem 'a'"
+    end
+
+    @cmd.handle_options %w[--prerelease]
+    @cmd.options[:gemdeps] = @gemdeps
+
+    use_ui @ui do
+      assert_raise Gem::MockGemUi::SystemExitException, @ui.error do
+        @cmd.execute
+      end
+    end
+
+    assert_equal %w[a-2.a], @cmd.installed_specs.map(&:full_name)
+
+    assert_match "Installing a (2.a)", @ui.output
+  end
+
   def test_execute_installs_deps_a_gemdeps
     spec_fetcher do |fetcher|
       fetcher.download "q", "1.0"
@@ -1357,7 +1370,7 @@ def test_execute_uses_deps_a_gemdeps_with_a_path
       fetcher.gem "r", "2.0", "q" => nil
     end
 
-    i = Gem::Installer.at specs["q-1.0"].cache_file, :install_dir => "gf-path"
+    i = Gem::Installer.at specs["q-1.0"].cache_file, install_dir: "gf-path"
     i.install
 
     assert File.file?("gf-path/specifications/q-1.0.gemspec"), "not installed"
@@ -1554,7 +1567,7 @@ def test_explain_platform_ruby_ignore_dependencies
   end
 
   def test_suggest_update_if_enabled
-    TestUpdateSuggestion.with_eglible_environment(cmd: @cmd) do
+    TestUpdateSuggestion.with_eligible_environment(cmd: @cmd) do
       spec_fetcher do |fetcher|
         fetcher.gem "a", 2
       end
@@ -1570,4 +1583,31 @@ def test_suggest_update_if_enabled
       assert_includes @ui.output, "A new release of RubyGems is available: 1.2.3 → 2.0.0!"
     end
   end
+
+  def test_execute_bindir_with_nonexistent_parent_dirs
+    spec_fetcher do |fetcher|
+      fetcher.gem "a", 2 do |s|
+        s.executables = %w[a_bin]
+        s.files = %w[bin/a_bin]
+      end
+    end
+
+    @cmd.options[:args] = %w[a]
+
+    nested_bin_dir = File.join(@tempdir, "not", "exists")
+    refute_directory_exists nested_bin_dir, "Nested bin directory should not exist yet"
+
+    @cmd.options[:bin_dir] = nested_bin_dir
+
+    use_ui @ui do
+      assert_raise Gem::MockGemUi::SystemExitException, @ui.error do
+        @cmd.execute
+      end
+    end
+
+    assert_directory_exists nested_bin_dir, "Nested bin directory should exist now"
+    assert_path_exist File.join(nested_bin_dir, "a_bin")
+
+    assert_equal %w[a-2], @cmd.installed_specs.map(&:full_name)
+  end
 end
diff --git a/test/rubygems/test_gem_commands_list_command.rb b/test/rubygems/test_gem_commands_list_command.rb
index c83dd51b6729a7..0b52b54e774850 100644
--- a/test/rubygems/test_gem_commands_list_command.rb
+++ b/test/rubygems/test_gem_commands_list_command.rb
@@ -8,7 +8,9 @@ def setup
     super
 
     @cmd = Gem::Commands::ListCommand.new
+  end
 
+  def test_execute_installed
     spec_fetcher do |fetcher|
       fetcher.spec "c", 1
     end
@@ -16,9 +18,7 @@ def setup
     @fetcher.data["#{@gem_repo}Marshal.#{Gem.marshal_version}"] = proc do
       raise Gem::RemoteFetcher::FetchError
     end
-  end
 
-  def test_execute_installed
     @cmd.handle_options %w[c --installed]
 
     assert_raise Gem::MockGemUi::SystemExitException do
@@ -30,4 +30,29 @@ def test_execute_installed
     assert_equal "true\n", @ui.output
     assert_equal "", @ui.error
   end
+
+  def test_execute_normal_gem_shadowing_default_gem
+    c1_default = new_default_spec "c", 1
+    install_default_gems c1_default
+
+    c1 = util_spec("c", 1) {|s| s.date = "2024-01-01" }
+    install_gem c1
+
+    Gem::Specification.reset
+
+    @cmd.handle_options %w[c]
+
+    use_ui @ui do
+      @cmd.execute
+    end
+
+    expected = <<-EOF
+
+*** LOCAL GEMS ***
+
+c (1)
+EOF
+
+    assert_equal expected, @ui.output
+  end
 end
diff --git a/test/rubygems/test_gem_commands_lock_command.rb b/test/rubygems/test_gem_commands_lock_command.rb
index 6afe4f35c5d221..02a7103f89f89b 100644
--- a/test/rubygems/test_gem_commands_lock_command.rb
+++ b/test/rubygems/test_gem_commands_lock_command.rb
@@ -9,11 +9,11 @@ def setup
 
     @a1 = quick_gem "a", "1"
     @b1 = quick_gem "b", "1" do |s|
-      s.add_runtime_dependency "a"
+      s.add_dependency "a"
     end
 
     @d1 = quick_gem "d", "1" do |s|
-      s.add_runtime_dependency "z"
+      s.add_dependency "z"
     end
 
     @cmd = Gem::Commands::LockCommand.new
diff --git a/test/rubygems/test_gem_commands_open_command.rb b/test/rubygems/test_gem_commands_open_command.rb
index 2519a20883ebf6..d9e518048ca8e6 100644
--- a/test/rubygems/test_gem_commands_open_command.rb
+++ b/test/rubygems/test_gem_commands_open_command.rb
@@ -22,20 +22,23 @@ def gem(name, version = "1.0")
 
   def test_execute
     @cmd.options[:args] = %w[foo]
-    @cmd.options[:editor] = "#{ruby_with_rubygems_in_load_path} -eexit --"
+    @cmd.options[:editor] = (ruby_with_rubygems_in_load_path + ["-e", "puts(ARGV,Dir.pwd)", "--"]).join(" ")
 
     gem "foo", "1.0.0"
     spec = gem "foo", "1.0.1"
 
     assert_nothing_raised Gem::MockGemUi::TermError do
-      Dir.stub(:chdir, spec.full_gem_path) do
+      stdout, stderr = capture_subprocess_io do
         use_ui @ui do
           @cmd.execute
         end
       end
+      assert_equal [spec.full_gem_path, spec.full_gem_path], stdout.split("\n")
+      assert_equal "", stderr
     end
 
     assert_equal "", @ui.error
+    assert_equal "", @ui.output
   end
 
   def test_wrong_version
diff --git a/test/rubygems/test_gem_commands_owner_command.rb b/test/rubygems/test_gem_commands_owner_command.rb
index d35232df7ec179..80b1497c415ae9 100644
--- a/test/rubygems/test_gem_commands_owner_command.rb
+++ b/test/rubygems/test_gem_commands_owner_command.rb
@@ -44,7 +44,7 @@ def test_show_owners
       @cmd.show_owners("freewill")
     end
 
-    assert_equal Net::HTTP::Get, @stub_fetcher.last_request.class
+    assert_equal Gem::Net::HTTP::Get, @stub_fetcher.last_request.class
     assert_equal Gem.configuration.rubygems_api_key, @stub_fetcher.last_request["Authorization"]
 
     assert_match(/Owners for gem: freewill/, @stub_ui.output)
@@ -165,7 +165,7 @@ def test_add_owners
       @cmd.add_owners("freewill", ["user-new1@example.com"])
     end
 
-    assert_equal Net::HTTP::Post, @stub_fetcher.last_request.class
+    assert_equal Gem::Net::HTTP::Post, @stub_fetcher.last_request.class
     assert_equal Gem.configuration.rubygems_api_key, @stub_fetcher.last_request["Authorization"]
     assert_equal "email=user-new1%40example.com", @stub_fetcher.last_request.body
 
@@ -176,8 +176,10 @@ def test_add_owners_denied
     response = "You don't have permission to push to this gem"
     @stub_fetcher.data["#{Gem.host}/api/v1/gems/freewill/owners"] = HTTPResponseFactory.create(body: response, code: 403, msg: "Forbidden")
 
-    use_ui @stub_ui do
-      @cmd.add_owners("freewill", ["user-new1@example.com"])
+    assert_raise Gem::MockGemUi::TermError do
+      use_ui @stub_ui do
+        @cmd.add_owners("freewill", ["user-new1@example.com"])
+      end
     end
 
     assert_match response, @stub_ui.output
@@ -196,8 +198,10 @@ def test_add_owners_permanent_redirect
       headers: { "location" => redirected_uri }
     )
 
-    use_ui @stub_ui do
-      @cmd.add_owners("freewill", ["user-new1@example.com"])
+    assert_raise Gem::MockGemUi::TermError do
+      use_ui @stub_ui do
+        @cmd.add_owners("freewill", ["user-new1@example.com"])
+      end
     end
 
     response = "The request has redirected permanently to #{redirected_uri}. Please check your defined push host URL."
@@ -244,7 +248,7 @@ def test_remove_owners
       @cmd.remove_owners("freewill", ["user-remove1@example.com"])
     end
 
-    assert_equal Net::HTTP::Delete, @stub_fetcher.last_request.class
+    assert_equal Gem::Net::HTTP::Delete, @stub_fetcher.last_request.class
     assert_equal Gem.configuration.rubygems_api_key, @stub_fetcher.last_request["Authorization"]
     assert_equal "email=user-remove1%40example.com", @stub_fetcher.last_request.body
 
@@ -255,8 +259,10 @@ def test_remove_owners_denied
     response = "You don't have permission to push to this gem"
     @stub_fetcher.data["#{Gem.host}/api/v1/gems/freewill/owners"] = HTTPResponseFactory.create(body: response, code: 403, msg: "Forbidden")
 
-    use_ui @stub_ui do
-      @cmd.remove_owners("freewill", ["user-remove1@example.com"])
+    assert_raise Gem::MockGemUi::TermError do
+      use_ui @stub_ui do
+        @cmd.remove_owners("freewill", ["user-remove1@example.com"])
+      end
     end
 
     assert_match response, @stub_ui.output
@@ -274,8 +280,10 @@ def test_remove_owners_permanent_redirect
       headers: { "location" => redirected_uri }
     )
 
-    use_ui @stub_ui do
-      @cmd.remove_owners("freewill", ["user-remove1@example.com"])
+    assert_raise Gem::MockGemUi::TermError do
+      use_ui @stub_ui do
+        @cmd.remove_owners("freewill", ["user-remove1@example.com"])
+      end
     end
 
     response = "The request has redirected permanently to #{redirected_uri}. Please check your defined push host URL."
@@ -291,8 +299,10 @@ def test_remove_owners_permanent_redirect
       headers: { "location" => redirected_uri }
     )
 
-    use_ui @stub_ui do
-      @cmd.add_owners("freewill", ["user-new1@example.com"])
+    assert_raise Gem::MockGemUi::TermError do
+      use_ui @stub_ui do
+        @cmd.add_owners("freewill", ["user-new1@example.com"])
+      end
     end
 
     response = "The request has redirected permanently to #{redirected_uri}. Please check your defined push host URL."
@@ -317,8 +327,10 @@ def test_remove_owners_missing
     response = "Owner could not be found."
     @stub_fetcher.data["#{Gem.host}/api/v1/gems/freewill/owners"] = HTTPResponseFactory.create(body: response, code: 404, msg: "Not Found")
 
-    use_ui @stub_ui do
-      @cmd.remove_owners("freewill", ["missing@example"])
+    assert_raise Gem::MockGemUi::TermError do
+      use_ui @stub_ui do
+        @cmd.remove_owners("freewill", ["missing@example"])
+      end
     end
 
     assert_equal "Removing missing@example: #{response}\n", @stub_ui.output
@@ -346,8 +358,11 @@ def test_otp_verified_failure
       HTTPResponseFactory.create(body: "You don't have any security devices", code: 422, msg: "Unprocessable Entity")
 
     @otp_ui = Gem::MockGemUi.new "111111\n"
-    use_ui @otp_ui do
-      @cmd.add_owners("freewill", ["user-new1@example.com"])
+
+    assert_raise Gem::MockGemUi::TermError do
+      use_ui @otp_ui do
+        @cmd.add_owners("freewill", ["user-new1@example.com"])
+      end
     end
 
     assert_match response, @otp_ui.output
@@ -371,9 +386,10 @@ def test_with_webauthn_enabled_success
       end
     end
 
-    assert_match "You have enabled multi-factor authentication. Please visit #{@stub_fetcher.webauthn_url_with_port(server.port)} " \
+    assert_match "You have enabled multi-factor authentication. Please visit the following URL " \
       "to authenticate via security device. If you can't verify using WebAuthn but have OTP enabled, " \
       "you can re-run the gem signin command with the `--otp [your_code]` option.", @stub_ui.output
+    assert_match @stub_fetcher.webauthn_url_with_port(server.port), @stub_ui.output
     assert_match "You are verified with a security device. You may close the browser window.", @stub_ui.output
     assert_equal "Uvh6T57tkWuUnWYo", @stub_fetcher.last_request["OTP"]
     assert_match response_success, @stub_ui.output
@@ -389,16 +405,19 @@ def test_with_webauthn_enabled_failure
 
     TCPServer.stub(:new, server) do
       Gem::GemcutterUtilities::WebauthnListener.stub(:listener_thread, Thread.new { Thread.current[:error] = error }) do
-        use_ui @stub_ui do
-          @cmd.add_owners("freewill", ["user-new1@example.com"])
+        assert_raise Gem::MockGemUi::TermError do
+          use_ui @stub_ui do
+            @cmd.add_owners("freewill", ["user-new1@example.com"])
+          end
         end
       end
     end
 
     assert_match @stub_fetcher.last_request["Authorization"], Gem.configuration.rubygems_api_key
-    assert_match "You have enabled multi-factor authentication. Please visit #{@stub_fetcher.webauthn_url_with_port(server.port)} " \
+    assert_match "You have enabled multi-factor authentication. Please visit the following URL " \
       "to authenticate via security device. If you can't verify using WebAuthn but have OTP enabled, " \
       "you can re-run the gem signin command with the `--otp [your_code]` option.", @stub_ui.output
+    assert_match @stub_fetcher.webauthn_url_with_port(server.port), @stub_ui.output
     assert_match "ERROR:  Security device verification failed: Something went wrong", @stub_ui.error
     refute_match "You are verified with a security device. You may close the browser window.", @stub_ui.output
     refute_match response_success, @stub_ui.output
@@ -418,9 +437,10 @@ def test_with_webauthn_enabled_success_with_polling
       end
     end
 
-    assert_match "You have enabled multi-factor authentication. Please visit #{@stub_fetcher.webauthn_url_with_port(server.port)} " \
+    assert_match "You have enabled multi-factor authentication. Please visit the following URL " \
       "to authenticate via security device. If you can't verify using WebAuthn but have OTP enabled, you can re-run the gem signin " \
       "command with the `--otp [your_code]` option.", @stub_ui.output
+    assert_match @stub_fetcher.webauthn_url_with_port(server.port), @stub_ui.output
     assert_match "You are verified with a security device. You may close the browser window.", @stub_ui.output
     assert_equal "Uvh6T57tkWuUnWYo", @stub_fetcher.last_request["OTP"]
     assert_match response_success, @stub_ui.output
@@ -438,22 +458,25 @@ def test_with_webauthn_enabled_failure_with_polling
     @stub_fetcher.respond_with_webauthn_polling_failure
 
     TCPServer.stub(:new, server) do
-      use_ui @stub_ui do
-        @cmd.add_owners("freewill", ["user-new1@example.com"])
+      assert_raise Gem::MockGemUi::TermError do
+        use_ui @stub_ui do
+          @cmd.add_owners("freewill", ["user-new1@example.com"])
+        end
       end
     end
 
     assert_match @stub_fetcher.last_request["Authorization"], Gem.configuration.rubygems_api_key
-    assert_match "You have enabled multi-factor authentication. Please visit #{@stub_fetcher.webauthn_url_with_port(server.port)} " \
+    assert_match "You have enabled multi-factor authentication. Please visit the following URL " \
       "to authenticate via security device. If you can't verify using WebAuthn but have OTP enabled, you can re-run the gem signin " \
       "command with the `--otp [your_code]` option.", @stub_ui.output
+    assert_match @stub_fetcher.webauthn_url_with_port(server.port), @stub_ui.output
     assert_match "ERROR:  Security device verification failed: The token in the link you used has either expired " \
       "or been used already.", @stub_ui.error
     refute_match "You are verified with a security device. You may close the browser window.", @stub_ui.output
     refute_match response_success, @stub_ui.output
   end
 
-  def test_remove_owners_unathorized_api_key
+  def test_remove_owners_unauthorized_api_key
     response_forbidden = "The API key doesn't have access"
     response_success   = "Owner removed successfully."
 
@@ -471,13 +494,54 @@ def test_remove_owners_unathorized_api_key
 
     access_notice = "The existing key doesn't have access of remove_owner on RubyGems.org. Please sign in to update access."
     assert_match access_notice, @stub_ui.output
-    assert_match "Email:", @stub_ui.output
+    assert_match "Username/email:", @stub_ui.output
     assert_match "Password:", @stub_ui.output
     assert_match "Added remove_owner scope to the existing API key", @stub_ui.output
     assert_match response_success, @stub_ui.output
   end
 
-  def test_add_owners_unathorized_api_key
+  def test_add_owners_no_api_key_webauthn_enabled_does_not_reuse_otp_codes
+    response_profile = "mfa: ui_and_api\n"
+    response_mfa_enabled = "You have enabled multifactor authentication but no OTP code provided. Please fill it and retry."
+    response_not_found = "Owner could not be found."
+    Gem.configuration.rubygems_api_key = nil
+
+    path_token = "odow34b93t6aPCdY"
+    webauthn_url = "#{Gem.host}/webauthn_verification/#{path_token}"
+
+    @stub_fetcher.data["#{Gem.host}/api/v1/profile/me.yaml"] = HTTPResponseFactory.create(body: response_profile, code: 200, msg: "OK")
+    @stub_fetcher.data["#{Gem.host}/api/v1/api_key"] = [
+      HTTPResponseFactory.create(body: response_mfa_enabled, code: 401, msg: "Unauthorized"),
+      HTTPResponseFactory.create(body: "", code: 200, msg: "OK"),
+    ]
+    @stub_fetcher.data["#{Gem.host}/api/v1/webauthn_verification"] = Gem::HTTPResponseFactory.create(body: webauthn_url, code: 200, msg: "OK")
+    @stub_fetcher.data["#{Gem.host}/api/v1/webauthn_verification/#{path_token}/status.json"] = [
+      Gem::HTTPResponseFactory.create(body: { status: "success", code: "Uvh6T57tkWuUnWYo" }.to_json, code: 200, msg: "OK"),
+      Gem::HTTPResponseFactory.create(body: { status: "success", code: "Uvh6T57tkWuUnWYz" }.to_json, code: 200, msg: "OK"),
+    ]
+    @stub_fetcher.data["#{Gem.host}/api/v1/gems/freewill/owners"] = [
+      HTTPResponseFactory.create(body: response_mfa_enabled, code: 401, msg: "Unauthorized"),
+      HTTPResponseFactory.create(body: response_not_found, code: 404, msg: "Not Found"),
+    ]
+    @cmd.handle_options %W[--add some@example freewill]
+
+    @stub_ui = Gem::MockGemUi.new "some@mail.com\npass\n"
+
+    server = Gem::MockTCPServer.new
+
+    assert_raise Gem::MockGemUi::TermError do
+      TCPServer.stub(:new, server) do
+        use_ui @stub_ui do
+          @cmd.execute
+        end
+      end
+    end
+
+    reused_otp_codes = @stub_fetcher.requests.filter_map {|req| req["OTP"] }.tally.filter_map {|el, count| el if count > 1 }
+    assert_empty reused_otp_codes
+  end
+
+  def test_add_owners_unauthorized_api_key
     response_forbidden = "The API key doesn't have access"
     response_success   = "Owner added successfully."
 
@@ -495,7 +559,7 @@ def test_add_owners_unathorized_api_key
 
     access_notice = "The existing key doesn't have access of add_owner on RubyGems.org. Please sign in to update access."
     assert_match access_notice, @stub_ui.output
-    assert_match "Email:", @stub_ui.output
+    assert_match "Username/email:", @stub_ui.output
     assert_match "Password:", @stub_ui.output
     assert_match "Added add_owner scope to the existing API key", @stub_ui.output
     assert_match response_success, @stub_ui.output
diff --git a/test/rubygems/test_gem_commands_pristine_command.rb b/test/rubygems/test_gem_commands_pristine_command.rb
index ff5e6f166d85b3..e9c4d329450f88 100644
--- a/test/rubygems/test_gem_commands_pristine_command.rb
+++ b/test/rubygems/test_gem_commands_pristine_command.rb
@@ -96,7 +96,7 @@ def test_execute_user_install
     out = @ui.output.split("\n")
 
     assert_equal "Restoring gems to pristine condition...", out.shift
-    assert_equal "Restored #{a.full_name}", out.shift
+    assert_equal "Restored #{a.full_name} in #{Gem.user_dir}", out.shift
     assert_empty out, out.inspect
   ensure
     FileUtils.chmod(0o755, @gemhome)
@@ -125,8 +125,8 @@ def test_execute_all
       @cmd.execute
     end
 
-    assert File.exist?(gem_bin)
-    assert File.exist?(gem_stub)
+    assert_path_exist gem_bin
+    assert_path_exist gem_stub
 
     out = @ui.output.split "\n"
 
@@ -296,7 +296,7 @@ def test_execute_with_extension_with_build_args
 
     build_args = %w[--with-awesome=true --sweet]
 
-    install_gem a, :build_args => build_args
+    install_gem a, build_args: build_args
 
     @cmd.options[:args] = %w[a]
 
@@ -392,6 +392,9 @@ def test_execute_many_multi_repo
     b = util_spec "b"
     install_gem b
 
+    assert_path_exist File.join(gemhome2, "gems", "b-2")
+    assert_path_not_exist File.join(@gemhome, "gems", "b-2")
+
     @cmd.options[:args] = %w[a b]
 
     use_ui @ui do
@@ -401,7 +404,7 @@ def test_execute_many_multi_repo
     out = @ui.output.split "\n"
 
     assert_equal "Restoring gems to pristine condition...", out.shift
-    assert_equal "Restored #{a.full_name}", out.shift
+    assert_equal "Restored #{a.full_name} in #{@gemhome}", out.shift
     assert_equal "Restored #{b.full_name}", out.shift
     assert_empty out, out.inspect
 
@@ -473,8 +476,9 @@ def test_execute_missing_cache_gem_when_multi_repo
 
     [
       "Restoring gems to pristine condition...",
-      "Cached gem for a-1 not found, attempting to fetch...",
-      "Restored a-1",
+      "Cached gem for a-1 in #{@gemhome} not found, attempting to fetch...",
+      "Restored a-1 in #{@gemhome}",
+      "Restored b-1 in #{@gemhome}",
       "Cached gem for b-1 not found, attempting to fetch...",
       "Restored b-1",
     ].each do |line|
@@ -492,7 +496,7 @@ def test_execute_missing_cache_gem_when_multi_repo
     assert_path_exist File.join(gemhome2, "cache", "b-1.gem")
     assert_path_not_exist File.join(@gemhome, "cache", "b-2.gem")
     assert_path_exist File.join(gemhome2, "gems", "b-1")
-    assert_path_not_exist File.join(@gemhome, "gems", "b-1")
+    assert_path_exist File.join(@gemhome, "gems", "b-1")
   end
 
   def test_execute_no_gem
@@ -533,8 +537,8 @@ def test_execute_only_executables
       @cmd.execute
     end
 
-    assert File.exist? gem_exec
-    refute File.exist? gem_lib
+    assert_path_exist gem_exec
+    assert_path_not_exist gem_lib
   end
 
   def test_execute_only_plugins
@@ -568,9 +572,9 @@ def test_execute_only_plugins
       @cmd.execute
     end
 
-    refute File.exist? gem_exec
-    assert File.exist? gem_plugin
-    refute File.exist? gem_lib
+    assert_path_not_exist gem_exec
+    assert_path_exist gem_plugin
+    assert_path_not_exist gem_lib
   end
 
   def test_execute_bindir
@@ -602,8 +606,8 @@ def test_execute_bindir
       @cmd.execute
     end
 
-    refute File.exist? gem_exec
-    assert File.exist? gem_bindir
+    assert_path_not_exist gem_exec
+    assert_path_exist gem_bindir
   end
 
   def test_execute_unknown_gem_at_remote_source
@@ -626,8 +630,16 @@ def test_execute_unknown_gem_at_remote_source
 
   def test_execute_default_gem
     default_gem_spec = new_default_spec("default", "2.0.0.0",
-                                        nil, "default/gem.rb")
-    install_default_gems(default_gem_spec)
+                                        nil, "exe/executable")
+    default_gem_spec.executables = "executable"
+    install_default_gems default_gem_spec
+
+    exe = File.join @gemhome, "bin", "executable"
+
+    assert_path_exist exe, "default gem's executable not installed"
+
+    content_with_replaced_shebang = File.read(exe).gsub(/^#![^\n]+ruby/, "#!/usr/bin/env ruby_executable_hooks")
+    File.write(exe, content_with_replaced_shebang)
 
     @cmd.options[:args] = %w[default]
 
@@ -638,11 +650,49 @@ def test_execute_default_gem
     assert_equal(
       [
         "Restoring gems to pristine condition...",
-        "Skipped default-2.0.0.0, it is a default gem",
+        "Restored default-2.0.0.0",
       ],
       @ui.output.split("\n")
     )
     assert_empty(@ui.error)
+
+    refute_includes "ruby_executable_hooks", File.read(exe)
+  end
+
+  def test_execute_default_gem_and_regular_gem
+    a_default = new_default_spec("a", "1.2.0")
+
+    a = util_spec "a" do |s|
+      s.extensions << "ext/a/extconf.rb"
+    end
+
+    ext_path = File.join @tempdir, "ext", "a", "extconf.rb"
+    write_file ext_path do |io|
+      io.write <<-'RUBY'
+      File.open "Makefile", "w" do |f|
+        f.puts "clean:\n\techo cleaned\n"
+        f.puts "all:\n\techo built\n"
+        f.puts "install:\n\techo installed\n"
+      end
+      RUBY
+    end
+
+    install_default_gems a_default
+    install_gem a
+
+    # Remove the extension files for a
+    FileUtils.rm_rf a.gem_build_complete_path
+
+    @cmd.options[:args] = %w[a]
+
+    use_ui @ui do
+      @cmd.execute
+    end
+
+    assert_includes @ui.output, "Restored #{a.full_name}"
+
+    # Check extension files for a were restored
+    assert_path_exist a.gem_build_complete_path
   end
 
   def test_execute_multi_platform
diff --git a/test/rubygems/test_gem_commands_push_command.rb b/test/rubygems/test_gem_commands_push_command.rb
index bb0363da1a4b9a..1477a749471443 100644
--- a/test/rubygems/test_gem_commands_push_command.rb
+++ b/test/rubygems/test_gem_commands_push_command.rb
@@ -60,7 +60,7 @@ def send_battery
 
     assert_match(/Pushing gem to #{@host}.../, @ui.output)
 
-    assert_equal Net::HTTP::Post, @fetcher.last_request.class
+    assert_equal Gem::Net::HTTP::Post, @fetcher.last_request.class
     assert_equal Gem.read_binary(@path), @fetcher.last_request.body
     assert_equal File.size(@path), @fetcher.last_request["Content-Length"].to_i
     assert_equal "application/octet-stream", @fetcher.last_request["Content-Type"]
@@ -77,7 +77,7 @@ def test_execute
 
     @cmd.execute
 
-    assert_equal Net::HTTP::Post, @fetcher.last_request.class
+    assert_equal Gem::Net::HTTP::Post, @fetcher.last_request.class
     assert_equal Gem.read_binary(@path), @fetcher.last_request.body
     assert_equal "application/octet-stream",
                  @fetcher.last_request["Content-Type"]
@@ -96,12 +96,53 @@ def test_execute_host
 
     @cmd.execute
 
-    assert_equal Net::HTTP::Post, @fetcher.last_request.class
+    assert_equal Gem::Net::HTTP::Post, @fetcher.last_request.class
     assert_equal Gem.read_binary(@path), @fetcher.last_request.body
     assert_equal "application/octet-stream",
                  @fetcher.last_request["Content-Type"]
   end
 
+  def test_execute_attestation
+    @response = "Successfully registered gem: freewill (1.0.0)"
+    @fetcher.data["#{Gem.host}/api/v1/gems"] = HTTPResponseFactory.create(body: @response, code: 200, msg: "OK")
+
+    File.write("#{@path}.sigstore.json", "attestation")
+    @cmd.options[:args] = [@path]
+    @cmd.options[:attestations] = ["#{@path}.sigstore.json"]
+
+    @cmd.execute
+
+    assert_equal Gem::Net::HTTP::Post, @fetcher.last_request.class
+    content_length = @fetcher.last_request["Content-Length"].to_i
+    assert_equal content_length, @fetcher.last_request.body.length
+    assert_equal "multipart", @fetcher.last_request.main_type, @fetcher.last_request.content_type
+    assert_equal "form-data", @fetcher.last_request.sub_type
+    assert_include @fetcher.last_request.type_params, "boundary"
+    boundary = @fetcher.last_request.type_params["boundary"]
+
+    parts = @fetcher.last_request.body.split(/(?:\r\n|\A)--#{Regexp.quote(boundary)}(?:\r\n|--)/m)
+    refute_empty parts
+    assert_empty parts[0]
+    parts.shift # remove the first empty part
+
+    p1 = parts.shift
+    p2 = parts.shift
+    assert_equal "\r\n", parts.shift
+    assert_empty parts
+
+    assert_equal [
+      "Content-Disposition: form-data; name=\"gem\"; filename=\"#{@path}\"",
+      "Content-Type: application/octet-stream",
+      nil,
+      Gem.read_binary(@path),
+    ].join("\r\n").b, p1
+    assert_equal [
+      "Content-Disposition: form-data; name=\"attestations\"",
+      nil,
+      "[#{Gem.read_binary("#{@path}.sigstore.json")}]",
+    ].join("\r\n").b, p2
+  end
+
   def test_execute_allowed_push_host
     @spec, @path = util_gem "freebird", "1.0.1" do |spec|
       spec.metadata["allowed_push_host"] = "https://privategemserver.example"
@@ -116,7 +157,7 @@ def test_execute_allowed_push_host
 
     @cmd.execute
 
-    assert_equal Net::HTTP::Post, @fetcher.last_request.class
+    assert_equal Gem::Net::HTTP::Post, @fetcher.last_request.class
     assert_equal Gem.read_binary(@path), @fetcher.last_request.body
     assert_equal "application/octet-stream",
                  @fetcher.last_request["Content-Type"]
@@ -230,7 +271,7 @@ def test_sending_gem_to_allowed_push_host_with_basic_credentials
     @api_key = "DOESNTMATTER"
 
     keys = {
-      :rubygems_api_key => @api_key,
+      rubygems_api_key: @api_key,
     }
 
     File.open Gem.configuration.credentials_path, "w" do |f|
@@ -319,7 +360,7 @@ def test_sending_gem_defaulting_to_allowed_push_host
 
     assert_match(/Pushing gem to #{host}.../, @ui.output)
 
-    assert_equal Net::HTTP::Post, @fetcher.last_request.class
+    assert_equal Gem::Net::HTTP::Post, @fetcher.last_request.class
     assert_equal Gem.read_binary(@path), @fetcher.last_request.body
     assert_equal File.size(@path), @fetcher.last_request["Content-Length"].to_i
     assert_equal "application/octet-stream", @fetcher.last_request["Content-Type"]
@@ -436,9 +477,10 @@ def test_with_webauthn_enabled_success
       end
     end
 
-    assert_match "You have enabled multi-factor authentication. Please visit #{@fetcher.webauthn_url_with_port(server.port)} " \
+    assert_match "You have enabled multi-factor authentication. Please visit the following URL " \
       "to authenticate via security device. If you can't verify using WebAuthn but have OTP enabled, " \
       "you can re-run the gem signin command with the `--otp [your_code]` option.", @ui.output
+    assert_match @fetcher.webauthn_url_with_port(server.port), @ui.output
     assert_match "You are verified with a security device. You may close the browser window.", @ui.output
     assert_equal "Uvh6T57tkWuUnWYo", @fetcher.last_request["OTP"]
     assert_match response_success, @ui.output
@@ -464,9 +506,10 @@ def test_with_webauthn_enabled_failure
     assert_equal 1, error.exit_code
 
     assert_match @fetcher.last_request["Authorization"], Gem.configuration.rubygems_api_key
-    assert_match "You have enabled multi-factor authentication. Please visit #{@fetcher.webauthn_url_with_port(server.port)} " \
+    assert_match "You have enabled multi-factor authentication. Please visit the following URL " \
       "to authenticate via security device. If you can't verify using WebAuthn but have OTP enabled, " \
       "you can re-run the gem signin command with the `--otp [your_code]` option.", @ui.output
+    assert_match @fetcher.webauthn_url_with_port(server.port), @ui.output
     assert_match "ERROR:  Security device verification failed: Something went wrong", @ui.error
     refute_match "You are verified with a security device. You may close the browser window.", @ui.output
     refute_match response_success, @ui.output
@@ -486,9 +529,10 @@ def test_with_webauthn_enabled_success_with_polling
       end
     end
 
-    assert_match "You have enabled multi-factor authentication. Please visit #{@fetcher.webauthn_url_with_port(server.port)} " \
+    assert_match "You have enabled multi-factor authentication. Please visit the following URL " \
       "to authenticate via security device. If you can't verify using WebAuthn but have OTP enabled, " \
       "you can re-run the gem signin command with the `--otp [your_code]` option.", @ui.output
+    assert_match @fetcher.webauthn_url_with_port(server.port), @ui.output
     assert_match "You are verified with a security device. You may close the browser window.", @ui.output
     assert_equal "Uvh6T57tkWuUnWYo", @fetcher.last_request["OTP"]
     assert_match response_success, @ui.output
@@ -512,16 +556,17 @@ def test_with_webauthn_enabled_failure_with_polling
     assert_equal 1, error.exit_code
 
     assert_match @fetcher.last_request["Authorization"], Gem.configuration.rubygems_api_key
-    assert_match "You have enabled multi-factor authentication. Please visit #{@fetcher.webauthn_url_with_port(server.port)} " \
-      "to authenticate via security device. If you can't verify using WebAuthn but have OTP enabled, you can re-run the gem signin " \
-      "command with the `--otp [your_code]` option.", @ui.output
+    assert_match "You have enabled multi-factor authentication. Please visit the following URL " \
+      "to authenticate via security device. If you can't verify using WebAuthn but have OTP enabled, " \
+      "you can re-run the gem signin command with the `--otp [your_code]` option.", @ui.output
+    assert_match @fetcher.webauthn_url_with_port(server.port), @ui.output
     assert_match "ERROR:  Security device verification failed: The token in the link you used has either expired " \
       "or been used already.", @ui.error
     refute_match "You are verified with a security device. You may close the browser window.", @ui.output
     refute_match response_success, @ui.output
   end
 
-  def test_sending_gem_unathorized_api_key_with_mfa_enabled
+  def test_sending_gem_unauthorized_api_key_with_mfa_enabled
     response_mfa_enabled = "You have enabled multifactor authentication but your request doesn't have the correct OTP code. Please check it and retry."
     response_forbidden = "The API key doesn't have access"
     response_success   = "Successfully registered gem: freewill (1.0.0)"
@@ -547,7 +592,7 @@ def test_sending_gem_unathorized_api_key_with_mfa_enabled
     access_notice = "The existing key doesn't have access of push_rubygem on https://rubygems.example. Please sign in to update access."
     assert_match mfa_notice, @ui.output
     assert_match access_notice, @ui.output
-    assert_match "Email:", @ui.output
+    assert_match "Username/email:", @ui.output
     assert_match "Password:", @ui.output
     assert_match "Added push_rubygem scope to the existing API key", @ui.output
     assert_match response_success, @ui.output
@@ -588,7 +633,7 @@ def test_sending_gem_with_no_local_creds
     mfa_notice = "You have enabled multi-factor authentication. Please enter OTP code."
     assert_match mfa_notice, @ui.output
     assert_match "Enter your https://rubygems.example credentials.", @ui.output
-    assert_match "Email:", @ui.output
+    assert_match "Username/email:", @ui.output
     assert_match "Password:", @ui.output
     assert_match "Signed in with API key:", @ui.output
     assert_match response_success, @ui.output
diff --git a/test/rubygems/test_gem_commands_rebuild_command.rb b/test/rubygems/test_gem_commands_rebuild_command.rb
new file mode 100644
index 00000000000000..3b7927c44e0308
--- /dev/null
+++ b/test/rubygems/test_gem_commands_rebuild_command.rb
@@ -0,0 +1,154 @@
+# frozen_string_literal: true
+
+require_relative "helper"
+require "rubygems/commands/build_command"
+require "rubygems/commands/rebuild_command"
+require "rubygems/package"
+
+class TestGemCommandsRebuildCommand < Gem::TestCase
+  def setup
+    super
+
+    readme_file = File.join(@tempdir, "README.md")
+
+    begin
+      umask_orig = File.umask(2)
+      File.open readme_file, "w" do |f|
+        f.write "My awesome gem"
+      end
+    ensure
+      File.umask(umask_orig)
+    end
+
+    @gem_name = "rebuild_test_gem"
+    @gem_version = "1.0.0"
+    @gem = util_spec @gem_name do |s|
+      s.version = @gem_version
+      s.license = "AGPL-3.0"
+      s.files = ["README.md"]
+    end
+  end
+
+  def util_test_build_gem(gem, args)
+    @ui = Gem::MockGemUi.new
+
+    cmd = Gem::Commands::BuildCommand.new
+
+    cmd.options[:args] = args
+    cmd.options[:build_path] = @tempdir
+    use_ui @ui do
+      cmd.execute
+    end
+    gem_file = "#{@gem_name}-#{@gem_version}.gem"
+    output = @ui.output.split "\n"
+    assert_equal "  Successfully built RubyGem", output.shift
+    assert_equal "  Name: #{@gem_name}", output.shift
+    assert_equal "  Version: #{@gem_version}", output.shift
+    assert_equal "  File: #{gem_file}", output.shift
+    assert_equal [], output
+
+    gem_file = File.join(@tempdir, gem_file)
+    assert File.exist?(gem_file)
+
+    spec = Gem::Package.new(gem_file).spec
+
+    assert_equal @gem_name, spec.name
+    assert_equal "this is a summary", spec.summary
+    gem_file
+  end
+
+  def util_test_rebuild_gem(gem, args, original_gem_file, gemspec_file, timestamp)
+    @ui = Gem::MockGemUi.new
+
+    cmd = Gem::Commands::RebuildCommand.new
+
+    cmd.options[:args] = args
+    cmd.options[:original_gem_file] = original_gem_file
+    cmd.options[:build_path] = @tempdir
+    cmd.options[:gemspec_file] = gemspec_file
+    use_ui @ui do
+      cmd.execute
+    end
+    gem_file = "#{@gem_name}-#{@gem_version}.gem"
+    output = @ui.output.split "\n"
+
+    assert_equal "  Successfully built RubyGem", output.shift
+    assert_equal "  Name: #{@gem_name}", output.shift
+    assert_equal "  Version: #{@gem_version}", output.shift
+    assert_equal "  File: #{gem_file}", output.shift
+    assert_empty output.shift
+    assert_match(/^Built at: .+ \(#{timestamp}\)/, output.shift)
+    original_line = output.shift
+    original = original_line.split(" ")[-1]
+    assert_match(/^Original build saved to:   /, original_line)
+    reproduced_line = output.shift
+    reproduced = reproduced_line.split(" ")[-1]
+    assert_match(/^Reproduced build saved to: /, reproduced_line)
+    assert_equal "Working directory: #{@tempdir}", output.shift
+    assert_equal "", output.shift
+    assert_equal "Hash comparison:", output.shift
+    output.shift # "  #{old_hash}\t#{old_file}"
+    output.shift # "  #{new_hash}\t#{new_file}"
+    assert_empty output.shift
+    assert_equal "SUCCESS - original and rebuild hashes matched", output.shift
+    assert_equal [], output
+
+    assert File.exist?(original)
+    assert File.exist?(reproduced)
+
+    old_spec = Gem::Package.new(original).spec
+    new_spec = Gem::Package.new(reproduced).spec
+
+    assert_equal @gem_name, old_spec.name
+    assert_equal "this is a summary", old_spec.summary
+
+    assert_equal old_spec.name, new_spec.name
+    assert_equal old_spec.summary, new_spec.summary
+
+    [reproduced, original]
+  end
+
+  def test_build_is_reproducible
+    # Back up SOURCE_DATE_EPOCH to restore later.
+    epoch = ENV["SOURCE_DATE_EPOCH"]
+
+    gemspec_file = File.join(@tempdir, @gem.spec_name)
+
+    # Initial Build
+
+    # Set SOURCE_DATE_EPOCH to 2001-02-03 04:05:06 -0500.
+    ENV["SOURCE_DATE_EPOCH"] = timestamp = Time.new(2001, 2, 3, 4, 5, 6).to_i.to_s
+    File.write(gemspec_file, @gem.to_ruby)
+    gem_file = util_test_build_gem @gem, [gemspec_file]
+
+    build_contents = File.read(gem_file)
+
+    gem_file_dir = File.dirname(gem_file)
+    gem_file_name = File.basename(gem_file)
+    original_gem_file = File.join(gem_file_dir, "original-" + gem_file_name)
+    File.rename(gem_file, original_gem_file)
+
+    # Rebuild
+
+    # Set SOURCE_DATE_EPOCH to a different value, meaning we are
+    # also testing that `gem rebuild` overrides the value.
+    ENV["SOURCE_DATE_EPOCH"] = Time.new(2007, 8, 9, 10, 11, 12).to_s
+
+    rebuild_gem_file, saved_gem_file =
+      util_test_rebuild_gem(@gem, [@gem_name, @gem_version], original_gem_file, gemspec_file, timestamp)
+
+    rebuild_contents = File.read(rebuild_gem_file)
+
+    assert_equal build_contents, rebuild_contents
+  ensure
+    ENV["SOURCE_DATE_EPOCH"] = epoch
+    if rebuild_gem_file
+      File.unlink(rebuild_gem_file)
+      dir = File.dirname(rebuild_gem_file)
+      Dir.rmdir(dir)
+      File.unlink(saved_gem_file)
+      Dir.rmdir(File.dirname(saved_gem_file))
+      Dir.rmdir(File.dirname(dir))
+    end
+  end
+end
diff --git a/test/rubygems/test_gem_commands_setup_command.rb b/test/rubygems/test_gem_commands_setup_command.rb
index 6859d7a5cbf1c6..dfd951268dc962 100644
--- a/test/rubygems/test_gem_commands_setup_command.rb
+++ b/test/rubygems/test_gem_commands_setup_command.rb
@@ -4,13 +4,6 @@
 require "rubygems/commands/setup_command"
 
 class TestGemCommandsSetupCommand < Gem::TestCase
-  bundler_gemspec = File.expand_path("../../bundler/lib/bundler/version.rb", __dir__)
-  if File.exist?(bundler_gemspec)
-    BUNDLER_VERS = File.read(bundler_gemspec).match(/VERSION = "(#{Gem::Version::VERSION_PATTERN})"/)[1]
-  else
-    BUNDLER_VERS = "2.0.1"
-  end
-
   def setup
     super
 
@@ -31,12 +24,11 @@ def setup
       bundler/lib/bundler/man/gemfile.5
       bundler/lib/bundler/man/gemfile.5.ronn
       bundler/lib/bundler/templates/.circleci/config.yml
-      bundler/lib/bundler/templates/.travis.yml
     ]
 
     create_dummy_files(filelist)
 
-    gemspec = util_spec "bundler", BUNDLER_VERS do |s|
+    gemspec = util_spec "bundler", "9.9.9" do |s|
       s.bindir = "exe"
       s.executables = ["bundle", "bundler"]
     end
@@ -160,6 +152,23 @@ def test_destdir_flag_does_not_try_to_write_to_the_default_gem_home
     end
   end
 
+  def test_destdir_flag_regenerates_binstubs
+    # install to destdir
+    destdir = File.join(@tempdir, "foo")
+    gem_bin_path = gem_install "destdir-only-gem", install_dir: destdir
+
+    # change binstub manually
+    write_file gem_bin_path do |io|
+      io.puts "I changed it!"
+    end
+
+    @cmd.options[:destdir] = destdir
+    @cmd.options[:prefix] = "/"
+    @cmd.execute
+
+    assert_match(/\A#!/, File.read(gem_bin_path))
+  end
+
   def test_files_in
     assert_equal %w[rubygems.rb rubygems/requirement.rb rubygems/ssl_certs/rubygems.org/foo.pem],
                  @cmd.files_in("lib").sort
@@ -178,7 +187,6 @@ def test_install_lib
       assert_path_exist File.join(dir, "bundler/b.rb")
 
       assert_path_exist File.join(dir, "bundler/templates/.circleci/config.yml")
-      assert_path_exist File.join(dir, "bundler/templates/.travis.yml")
     end
   end
 
@@ -209,8 +217,10 @@ def test_install_default_bundler_gem
     # expect to remove normal gem that was same version. because it's promoted default gems.
     assert_path_not_exist File.join(Gem.dir, "specifications", "bundler-#{bundler_version}.gemspec")
 
+    # expect to remove the previous default version
+    assert_path_not_exist "#{Gem.dir}/gems/bundler-1.15.4"
+
     assert_path_exist "#{Gem.dir}/gems/bundler-#{bundler_version}"
-    assert_path_exist "#{Gem.dir}/gems/bundler-1.15.4"
     assert_path_exist "#{Gem.dir}/gems/bundler-audit-1.0.0"
   end
 
@@ -363,20 +373,22 @@ def test_show_release_notes
 
     File.open "CHANGELOG.md", "w" do |io|
       io.puts <<-HISTORY_TXT
-# #{Gem::VERSION} / 2013-03-26
+# Changelog
 
-## Bug fixes:
+## #{Gem::VERSION} / 2013-03-26
+
+### Bug fixes:
   * Fixed release note display for LANG=C when installing rubygems
   * π is tasty
 
-# 2.0.2 / 2013-03-06
+## 2.0.2 / 2013-03-06
 
-## Bug fixes:
+### Bug fixes:
   * Other bugs fixed
 
-# 2.0.1 / 2013-03-05
+## 2.0.1 / 2013-03-05
 
-## Bug fixes:
+### Bug fixes:
   * Yet more bugs fixed
       HISTORY_TXT
     end
@@ -386,9 +398,9 @@ def test_show_release_notes
     end
 
     expected = <<-EXPECTED
-# #{Gem::VERSION} / 2013-03-26
+## #{Gem::VERSION} / 2013-03-26
 
-## Bug fixes:
+### Bug fixes:
   * Fixed release note display for LANG=C when installing rubygems
   * π is tasty
 
@@ -414,7 +426,7 @@ def create_dummy_files(list)
     end
   end
 
-  def gem_install(name)
+  def gem_install(name, **options)
     gem = util_spec name do |s|
       s.executables = [name]
       s.files = %W[bin/#{name}]
@@ -422,8 +434,8 @@ def gem_install(name)
     write_file File.join @tempdir, "bin", name do |f|
       f.puts "#!/usr/bin/ruby"
     end
-    install_gem gem
-    File.join @gemhome, "bin", name
+    install_gem gem, **options
+    File.join options[:install_dir] || @gemhome, "bin", name
   end
 
   def gem_install_with_plugin(name)
diff --git a/test/rubygems/test_gem_commands_signin_command.rb b/test/rubygems/test_gem_commands_signin_command.rb
index fd4ffb414a3fba..e612288faf91ac 100644
--- a/test/rubygems/test_gem_commands_signin_command.rb
+++ b/test/rubygems/test_gem_commands_signin_command.rb
@@ -85,7 +85,7 @@ def test_execute_with_host_permanent_redirect
       headers: { "location" => redirected_uri }
     )
     Gem::RemoteFetcher.fetcher = fetcher
-    ui = Gem::MockGemUi.new("you@example.com\nsecret\n\n\n\n\n\n\n\n\n")
+    ui = Gem::MockGemUi.new("you@example.com\nsecret\n\n\n")
 
     assert_raise Gem::MockGemUi::TermError do
       use_ui ui do
@@ -106,51 +106,98 @@ def test_execute_with_valid_creds_set_for_default_host
     assert_equal api_key, credentials[:rubygems_api_key]
   end
 
-  def test_execute_with_key_name_and_scope
+  def test_execute_with_key_name_default_scope
     email     = "you@example.com"
     password  = "secret"
     api_key   = "1234abcd"
     fetcher   = Gem::RemoteFetcher.fetcher
 
-    key_name_ui = Gem::MockGemUi.new "#{email}\n#{password}\ntest-key\n\ny\n\n\n\n\n\n"
+    key_name_ui = Gem::MockGemUi.new "#{email}\n#{password}\ntest-key\n\n"
     util_capture(key_name_ui, nil, api_key, fetcher) { @cmd.execute }
 
     user = ENV["USER"] || ENV["USERNAME"]
 
     assert_match "API Key name [#{Socket.gethostname}-#{user}", key_name_ui.output
+    assert_match "The default access scope is:", key_name_ui.output
+    assert_match "index_rubygems: y", key_name_ui.output
+    assert_match "Do you want to customise scopes? [yN]", key_name_ui.output
+    assert_equal "name=test-key&index_rubygems=true&push_rubygem=true", fetcher.last_request.body
+
+    credentials = load_yaml_file Gem.configuration.credentials_path
+    assert_equal api_key, credentials[:rubygems_api_key]
+  end
+
+  def test_execute_with_key_name_and_custom_scope
+    email     = "you@example.com"
+    password  = "secret"
+    api_key   = "1234abcd"
+    fetcher   = Gem::RemoteFetcher.fetcher
+
+    key_name_ui = Gem::MockGemUi.new "#{email}\n#{password}\ntest-key\ny\n\n\ny\n\n\n\n\n\n\n"
+    util_capture(key_name_ui, nil, api_key, fetcher) { @cmd.execute }
+
+    user = ENV["USER"] || ENV["USERNAME"]
+
+    assert_match "API Key name [#{Socket.gethostname}-#{user}", key_name_ui.output
+    assert_match "The default access scope is:", key_name_ui.output
+    assert_match "Do you want to customise scopes? [yN]", key_name_ui.output
+    assert_match "show_dashboard (exclusive scope, answering yes will not prompt for other scopes) [yN]", key_name_ui.output
     assert_match "index_rubygems [yN]", key_name_ui.output
     assert_match "push_rubygem [yN]", key_name_ui.output
     assert_match "yank_rubygem [yN]", key_name_ui.output
     assert_match "add_owner [yN]", key_name_ui.output
     assert_match "remove_owner [yN]", key_name_ui.output
     assert_match "access_webhooks [yN]", key_name_ui.output
-    assert_match "show_dashboard [yN]", key_name_ui.output
     assert_equal "name=test-key&push_rubygem=true", fetcher.last_request.body
 
     credentials = load_yaml_file Gem.configuration.credentials_path
     assert_equal api_key, credentials[:rubygems_api_key]
   end
 
-  def test_execute_with_key_name_scope_and_mfa_level_of_ui_only
+  def test_execute_with_key_name_and_exclusive_scope
+    email     = "you@example.com"
+    password  = "secret"
+    api_key   = "1234abcd"
+    fetcher   = Gem::RemoteFetcher.fetcher
+
+    key_name_ui = Gem::MockGemUi.new "#{email}\n#{password}\ntest-key\ny\ny\n"
+    util_capture(key_name_ui, nil, api_key, fetcher) { @cmd.execute }
+
+    user = ENV["USER"] || ENV["USERNAME"]
+
+    assert_match "API Key name [#{Socket.gethostname}-#{user}", key_name_ui.output
+    assert_match "The default access scope is:", key_name_ui.output
+    assert_match "index_rubygems: y", key_name_ui.output
+    assert_match "Do you want to customise scopes? [yN]", key_name_ui.output
+    assert_match "show_dashboard (exclusive scope, answering yes will not prompt for other scopes) [yN]", key_name_ui.output
+    assert_equal "name=test-key&show_dashboard=true", fetcher.last_request.body
+
+    credentials = load_yaml_file Gem.configuration.credentials_path
+    assert_equal api_key, credentials[:rubygems_api_key]
+  end
+
+  def test_execute_with_key_name_custom_scope_and_mfa_level_of_ui_only
     email     = "you@example.com"
     password  = "secret"
     api_key   = "1234abcd"
     fetcher   = Gem::RemoteFetcher.fetcher
     mfa_level = "ui_only"
 
-    key_name_ui = Gem::MockGemUi.new "#{email}\n#{password}\ntest-key\n\ny\n\n\n\n\n\ny"
+    key_name_ui = Gem::MockGemUi.new "#{email}\n#{password}\ntest-key\ny\n\n\ny\n\n\n\n\n\n\ny"
     util_capture(key_name_ui, nil, api_key, fetcher, mfa_level) { @cmd.execute }
 
     user = ENV["USER"] || ENV["USERNAME"]
 
     assert_match "API Key name [#{Socket.gethostname}-#{user}", key_name_ui.output
+    assert_match "The default access scope is:", key_name_ui.output
+    assert_match "Do you want to customise scopes? [yN]", key_name_ui.output
+    assert_match "show_dashboard (exclusive scope, answering yes will not prompt for other scopes) [yN]", key_name_ui.output
     assert_match "index_rubygems [yN]", key_name_ui.output
     assert_match "push_rubygem [yN]", key_name_ui.output
     assert_match "yank_rubygem [yN]", key_name_ui.output
     assert_match "add_owner [yN]", key_name_ui.output
     assert_match "remove_owner [yN]", key_name_ui.output
     assert_match "access_webhooks [yN]", key_name_ui.output
-    assert_match "show_dashboard [yN]", key_name_ui.output
     assert_match "Would you like to enable MFA for this key? (strongly recommended) [yn]", key_name_ui.output
     assert_equal "name=test-key&push_rubygem=true&mfa=true", fetcher.last_request.body
 
@@ -158,26 +205,28 @@ def test_execute_with_key_name_scope_and_mfa_level_of_ui_only
     assert_equal api_key, credentials[:rubygems_api_key]
   end
 
-  def test_execute_with_key_name_scope_and_mfa_level_of_gem_signin
+  def test_execute_with_key_name_custom_scope_and_mfa_level_of_gem_signin
     email     = "you@example.com"
     password  = "secret"
     api_key   = "1234abcd"
     fetcher   = Gem::RemoteFetcher.fetcher
     mfa_level = "ui_and_gem_signin"
 
-    key_name_ui = Gem::MockGemUi.new "#{email}\n#{password}\ntest-key\n\ny\n\n\n\n\n\ny"
+    key_name_ui = Gem::MockGemUi.new "#{email}\n#{password}\ntest-key\ny\n\n\ny\n\n\n\n\n\n\ny"
     util_capture(key_name_ui, nil, api_key, fetcher, mfa_level) { @cmd.execute }
 
     user = ENV["USER"] || ENV["USERNAME"]
 
     assert_match "API Key name [#{Socket.gethostname}-#{user}", key_name_ui.output
+    assert_match "The default access scope is:", key_name_ui.output
+    assert_match "Do you want to customise scopes? [yN]", key_name_ui.output
+    assert_match "show_dashboard (exclusive scope, answering yes will not prompt for other scopes) [yN]", key_name_ui.output
     assert_match "index_rubygems [yN]", key_name_ui.output
     assert_match "push_rubygem [yN]", key_name_ui.output
     assert_match "yank_rubygem [yN]", key_name_ui.output
     assert_match "add_owner [yN]", key_name_ui.output
     assert_match "remove_owner [yN]", key_name_ui.output
     assert_match "access_webhooks [yN]", key_name_ui.output
-    assert_match "show_dashboard [yN]", key_name_ui.output
     assert_match "Would you like to enable MFA for this key? (strongly recommended) [yn]", key_name_ui.output
     assert_equal "name=test-key&push_rubygem=true&mfa=true", fetcher.last_request.body
 
@@ -207,7 +256,7 @@ def test_execute_on_gemserver_without_profile_me_endpoint
     api_key   = "1234abcd"
     fetcher   = Gem::RemoteFetcher.fetcher
 
-    key_name_ui = Gem::MockGemUi.new "#{email}\n#{password}\ntest-key\n\ny\n\n\n\n\n\ny"
+    key_name_ui = Gem::MockGemUi.new "#{email}\n#{password}\ntest-key\ny\n\n\ny\n\n\n\n\n\n\ny"
 
     # Set the expected response for the Web-API supplied
     ENV["RUBYGEMS_HOST"]       = host
@@ -221,13 +270,13 @@ def test_execute_on_gemserver_without_profile_me_endpoint
     user = ENV["USER"] || ENV["USERNAME"]
 
     assert_match "API Key name [#{Socket.gethostname}-#{user}", key_name_ui.output
+    assert_match "show_dashboard (exclusive scope, answering yes will not prompt for other scopes) [yN]", key_name_ui.output
     assert_match "index_rubygems [yN]", key_name_ui.output
     assert_match "push_rubygem [yN]", key_name_ui.output
     assert_match "yank_rubygem [yN]", key_name_ui.output
     assert_match "add_owner [yN]", key_name_ui.output
     assert_match "remove_owner [yN]", key_name_ui.output
     assert_match "access_webhooks [yN]", key_name_ui.output
-    assert_match "show_dashboard [yN]", key_name_ui.output
     assert_equal "name=test-key&push_rubygem=true", fetcher.last_request.body
   end
 
@@ -248,7 +297,7 @@ def util_capture(ui_stub = nil, host = nil, api_key = nil, fetcher = Gem::FakeFe
     fetcher.data[profile]      = profile_response
     Gem::RemoteFetcher.fetcher = fetcher
 
-    sign_in_ui = ui_stub || Gem::MockGemUi.new("#{email}\n#{password}\n\n\n\n\n\n\n\n\n")
+    sign_in_ui = ui_stub || Gem::MockGemUi.new("#{email}\n#{password}\n\n\n")
 
     use_ui sign_in_ui do
       yield
diff --git a/test/rubygems/test_gem_commands_stale_command.rb b/test/rubygems/test_gem_commands_stale_command.rb
index 1c224d07851ada..ea7493b418801c 100644
--- a/test/rubygems/test_gem_commands_stale_command.rb
+++ b/test/rubygems/test_gem_commands_stale_command.rb
@@ -25,11 +25,11 @@ def test_execute_sorts
     files.each do |file|
       filename = File.join(bar_baz.full_gem_path, file)
       FileUtils.mkdir_p File.dirname filename
-      FileUtils.touch(filename, :mtime => Time.now)
+      FileUtils.touch(filename, mtime: Time.now)
 
       filename = File.join(foo_bar.full_gem_path, file)
       FileUtils.mkdir_p File.dirname filename
-      FileUtils.touch(filename, :mtime => Time.now - 86_400)
+      FileUtils.touch(filename, mtime: Time.now - 86_400)
     end
 
     use_ui @stub_ui do
diff --git a/test/rubygems/test_gem_commands_uninstall_command.rb b/test/rubygems/test_gem_commands_uninstall_command.rb
index 48c5cadaed3201..32553d17300ce9 100644
--- a/test/rubygems/test_gem_commands_uninstall_command.rb
+++ b/test/rubygems/test_gem_commands_uninstall_command.rb
@@ -21,7 +21,7 @@ def test_execute_all_named
     gemhome2 = "#{@gemhome}2"
 
     a_4, = util_gem "a", 4
-    install_gem a_4, :install_dir => gemhome2
+    install_gem a_4, install_dir: gemhome2
 
     assert_gems_presence "a-1", "a-4", "b-2", "default-1", dirs: [@gemhome, gemhome2]
 
@@ -32,7 +32,7 @@ def test_execute_all_named
       @cmd.execute
     end
 
-    assert_equal %w[a_evil-9 b-2 c-1.2 default-1 dep_x-1 pl-1-x86-linux x-1],
+    assert_equal %w[a-4 a_evil-9 b-2 c-1.2 default-1 dep_x-1 pl-1-x86-linux x-1],
                  Gem::Specification.all_names.sort
   end
 
@@ -81,6 +81,61 @@ def test_execute_all_named_default_multiple
     assert_equal "Successfully uninstalled z-2", output.shift
   end
 
+  def test_execute_does_not_remove_default_gem_executables
+    z_1_default = new_default_spec "z", "1", executable: true
+    install_default_gems z_1_default
+
+    z_1, = util_gem "z", "1" do |spec|
+      util_make_exec spec
+    end
+    install_gem z_1, force: true
+
+    Gem::Specification.reset
+
+    @cmd.options[:all] = true
+    @cmd.options[:force] = true
+    @cmd.options[:executables] = true
+    @cmd.options[:args] = %w[z]
+
+    use_ui @ui do
+      @cmd.execute
+    end
+
+    assert File.exist? File.join(@gemhome, "bin", "executable")
+    assert File.exist? File.join(@gemhome, "gems", "z-1", "bin", "executable")
+
+    output = @ui.output.split "\n"
+
+    refute_includes output, "Removing executable"
+    assert_equal "Successfully uninstalled z-1", output.shift
+    assert_equal "There was both a regular copy and a default copy of z-1. The regular copy was successfully uninstalled, but the default copy was left around because default gems can't be removed.", output.shift
+  end
+
+  def test_execute_does_not_error_on_shadowed_default_gems
+    z_1_default = new_default_spec "z", "1"
+    install_default_gems z_1_default
+
+    z_1 = util_spec "z", "1" do |spec|
+      spec.date = "2024-01-01"
+    end
+    install_gem z_1
+
+    Gem::Specification.reset
+
+    @cmd.options[:args] = %w[z:1]
+
+    use_ui @ui do
+      @cmd.execute
+    end
+
+    output = @ui.output.split "\n"
+    assert_equal "Successfully uninstalled z-1", output.shift
+    assert_equal "There was both a regular copy and a default copy of z-1. The regular copy was successfully uninstalled, but the default copy was left around because default gems can't be removed.", output.shift
+
+    error = @ui.error.split "\n"
+    assert_empty error
+  end
+
   def test_execute_dependency_order
     initial_install
 
@@ -229,6 +284,26 @@ def test_execute_with_version_specified_as_colon
     assert File.exist? File.join(@gemhome, "bin", "executable")
   end
 
+  def test_execute_with_multiple_version_specified_as_colon
+    initial_install
+
+    ui = Gem::MockGemUi.new "y\n"
+
+    util_make_gems
+
+    assert_equal 3, Gem::Specification.find_all_by_name("a").length
+
+    @cmd.options[:force] = true
+    @cmd.options[:args] = ["a:1", "a:2"]
+
+    use_ui ui do
+      @cmd.execute
+    end
+
+    assert_equal 1, Gem::Specification.find_all_by_name("a").length
+    assert_equal Gem::Version.new("3.a"), Gem::Specification.find_by_name("a").version
+  end
+
   def test_uninstall_selection
     ui = Gem::MockGemUi.new "1\n"
 
@@ -361,7 +436,7 @@ def test_execute_outside_gem_home
     gemhome2 = "#{@gemhome}2"
 
     a_4, = util_gem "a", 4
-    install_gem a_4, :install_dir => gemhome2
+    install_gem a_4, install_dir: gemhome2
 
     assert_gems_presence "a-4", dirs: [@gemhome, gemhome2]
 
@@ -380,7 +455,7 @@ def test_execute_outside_gem_home_when_install_dir_given
     gemhome2 = "#{@gemhome}2"
 
     a_4, = util_gem "a", 4
-    install_gem a_4, :install_dir => gemhome2
+    install_gem a_4, install_dir: gemhome2
 
     assert_gems_presence "a-4", dirs: [@gemhome, gemhome2]
 
diff --git a/test/rubygems/test_gem_commands_update_command.rb b/test/rubygems/test_gem_commands_update_command.rb
index 02dd57f6609450..3b106e4581004f 100644
--- a/test/rubygems/test_gem_commands_update_command.rb
+++ b/test/rubygems/test_gem_commands_update_command.rb
@@ -79,7 +79,6 @@ def test_execute_system
     end
 
     out = @ui.output.split "\n"
-    assert_equal "Updating rubygems-update", out.shift
     assert_equal "Installing RubyGems 9", out.shift
     assert_equal "RubyGems system software updated", out.shift
 
@@ -123,7 +122,6 @@ def test_execute_system_when_latest_does_not_support_your_ruby
     end
 
     out = @ui.output.split "\n"
-    assert_equal "Updating rubygems-update", out.shift
     assert_empty out
 
     err = @ui.error.split "\n"
@@ -132,6 +130,34 @@ def test_execute_system_when_latest_does_not_support_your_ruby
     assert_empty err
   end
 
+  def test_execute_system_when_latest_does_not_support_your_ruby_but_previous_one_does
+    spec_fetcher do |fetcher|
+      fetcher.download "rubygems-update", 9 do |s|
+        s.files = %w[setup.rb]
+        s.required_ruby_version = "> 9"
+      end
+
+      fetcher.download "rubygems-update", 8 do |s|
+        s.files = %w[setup.rb]
+      end
+    end
+
+    @cmd.options[:args]          = []
+    @cmd.options[:system]        = true
+
+    use_ui @ui do
+      @cmd.execute
+    end
+
+    err = @ui.error.split "\n"
+    assert_empty err
+
+    out = @ui.output.split "\n"
+    assert_equal "Installing RubyGems 8", out.shift
+    assert_equal "RubyGems system software updated", out.shift
+    assert_empty out
+  end
+
   def test_execute_system_multiple
     spec_fetcher do |fetcher|
       fetcher.download "rubygems-update", 8 do |s|
@@ -151,7 +177,6 @@ def test_execute_system_multiple
     end
 
     out = @ui.output.split "\n"
-    assert_equal "Updating rubygems-update", out.shift
     assert_equal "Installing RubyGems 9", out.shift
     assert_equal "RubyGems system software updated", out.shift
 
@@ -185,7 +210,6 @@ def test_execute_system_update_installed
     end
 
     out = @ui.output.split "\n"
-    assert_equal "Updating rubygems-update", out.shift
     assert_equal "Installing RubyGems 9", out.shift
     assert_equal "RubyGems system software updated", out.shift
 
@@ -193,7 +217,15 @@ def test_execute_system_update_installed
   end
 
   def test_execute_system_update_installed_in_non_default_gem_path
-    rubygems_update_spec = quick_gem "rubygems-update", 9 do |s|
+    rubygems_update_spec = Gem::Specification.new do |s|
+      s.name        = "rubygems-update"
+      s.version     = "9"
+      s.author      = "A User"
+      s.email       = "example@example.com"
+      s.homepage    = "http://example.com"
+      s.summary     = "this is a summary"
+      s.description = "This is a test description"
+
       write_file File.join(@tempdir, "setup.rb")
 
       s.files += %w[setup.rb]
@@ -205,7 +237,7 @@ def test_execute_system_update_installed_in_non_default_gem_path
 
     gemhome2 = "#{@gemhome}2"
 
-    Gem::Installer.at(rubygems_update_package, :install_dir => gemhome2).install
+    Gem::Installer.at(rubygems_update_package, install_dir: gemhome2).install
 
     Gem.use_paths @gemhome, [gemhome2, @gemhome]
 
@@ -242,7 +274,6 @@ def test_execute_system_specific
     end
 
     out = @ui.output.split "\n"
-    assert_equal "Updating rubygems-update", out.shift
     assert_equal "Installing RubyGems 8", out.shift
     assert_equal "RubyGems system software updated", out.shift
 
@@ -353,7 +384,6 @@ def test_execute_system_specifically_to_latest_version
     end
 
     out = @ui.output.split "\n"
-    assert_equal "Updating rubygems-update", out.shift
     assert_equal "Installing RubyGems 9", out.shift
     assert_equal "RubyGems system software updated", out.shift
 
@@ -476,7 +506,7 @@ def test_execute_rdoc
     a2 = @specs["a-2"]
 
     assert_path_exist File.join(a2.doc_dir, "rdoc")
-  end
+  end if defined?(Gem::RDoc) && !Gem.rdoc_hooks_defined_via_plugin?
 
   def test_execute_named
     spec_fetcher do |fetcher|
@@ -670,10 +700,10 @@ def test_handle_options_system
     @cmd.handle_options %w[--system]
 
     expected = {
-      :args => [],
-      :document => %w[ri],
-      :force => false,
-      :system => true,
+      args: [],
+      document: %w[ri],
+      force: false,
+      system: true,
     }
 
     assert_equal expected, @cmd.options
@@ -689,10 +719,10 @@ def test_handle_options_system_specific
     @cmd.handle_options %w[--system 1.3.7]
 
     expected = {
-      :args => [],
-      :document => %w[ri],
-      :force => false,
-      :system => "1.3.7",
+      args: [],
+      document: %w[ri],
+      force: false,
+      system: "1.3.7",
     }
 
     assert_equal expected, @cmd.options
diff --git a/test/rubygems/test_gem_commands_yank_command.rb b/test/rubygems/test_gem_commands_yank_command.rb
index bfa0d6421fc25b..73fd1772432717 100644
--- a/test/rubygems/test_gem_commands_yank_command.rb
+++ b/test/rubygems/test_gem_commands_yank_command.rb
@@ -131,9 +131,10 @@ def test_with_webauthn_enabled_success
     end
 
     assert_match %r{Yanking gem from http://example}, @ui.output
-    assert_match "You have enabled multi-factor authentication. Please visit #{@fetcher.webauthn_url_with_port(server.port)} " \
+    assert_match "You have enabled multi-factor authentication. Please visit the following URL " \
       "to authenticate via security device. If you can't verify using WebAuthn but have OTP enabled, " \
       "you can re-run the gem signin command with the `--otp [your_code]` option.", @ui.output
+    assert_match @fetcher.webauthn_url_with_port(server.port), @ui.output
     assert_match "You are verified with a security device. You may close the browser window.", @ui.output
     assert_equal "Uvh6T57tkWuUnWYo", @fetcher.last_request["OTP"]
     assert_match "Successfully yanked", @ui.output
@@ -163,9 +164,10 @@ def test_with_webauthn_enabled_failure
 
     assert_match @fetcher.last_request["Authorization"], Gem.configuration.rubygems_api_key
     assert_match %r{Yanking gem from http://example}, @ui.output
-    assert_match "You have enabled multi-factor authentication. Please visit #{@fetcher.webauthn_url_with_port(server.port)} " \
+    assert_match "You have enabled multi-factor authentication. Please visit the following URL " \
       "to authenticate via security device. If you can't verify using WebAuthn but have OTP enabled, " \
       "you can re-run the gem signin command with the `--otp [your_code]` option.", @ui.output
+    assert_match @fetcher.webauthn_url_with_port(server.port), @ui.output
     assert_match "ERROR:  Security device verification failed: Something went wrong", @ui.error
     refute_match "You are verified with a security device. You may close the browser window.", @ui.output
     refute_match "Successfully yanked", @ui.output
@@ -189,9 +191,10 @@ def test_with_webauthn_enabled_success_with_polling
     end
 
     assert_match %r{Yanking gem from http://example}, @ui.output
-    assert_match "You have enabled multi-factor authentication. Please visit #{@fetcher.webauthn_url_with_port(server.port)} " \
+    assert_match "You have enabled multi-factor authentication. Please visit the following URL " \
       "to authenticate via security device. If you can't verify using WebAuthn but have OTP enabled, " \
       "you can re-run the gem signin command with the `--otp [your_code]` option.", @ui.output
+    assert_match @fetcher.webauthn_url_with_port(server.port), @ui.output
     assert_match "You are verified with a security device. You may close the browser window.", @ui.output
     assert_equal "Uvh6T57tkWuUnWYo", @fetcher.last_request["OTP"]
     assert_match "Successfully yanked", @ui.output
@@ -219,9 +222,10 @@ def test_with_webauthn_enabled_failure_with_polling
 
     assert_match @fetcher.last_request["Authorization"], Gem.configuration.rubygems_api_key
     assert_match %r{Yanking gem from http://example}, @ui.output
-    assert_match "You have enabled multi-factor authentication. Please visit #{@fetcher.webauthn_url_with_port(server.port)} " \
+    assert_match "You have enabled multi-factor authentication. Please visit the following URL " \
       "to authenticate via security device. If you can't verify using WebAuthn but have OTP enabled, " \
       "you can re-run the gem signin command with the `--otp [your_code]` option.", @ui.output
+    assert_match @fetcher.webauthn_url_with_port(server.port), @ui.output
     assert_match "ERROR:  Security device verification failed: The token in the link you used has either expired " \
       "or been used already.", @ui.error
     refute_match "You are verified with a security device. You may close the browser window.", @ui.output
@@ -267,7 +271,7 @@ def test_execute_host
     assert_equal [yank_uri], @fetcher.paths
   end
 
-  def test_yank_gem_unathorized_api_key
+  def test_yank_gem_unauthorized_api_key
     response_forbidden = "The API key doesn't have access"
     response_success   = "Successfully yanked"
     host               = "http://example"
@@ -291,7 +295,7 @@ def test_yank_gem_unathorized_api_key
 
     access_notice = "The existing key doesn't have access of yank_rubygem on http://example. Please sign in to update access."
     assert_match access_notice, @ui.output
-    assert_match "Email:", @ui.output
+    assert_match "Username/email:", @ui.output
     assert_match "Password:", @ui.output
     assert_match "Added yank_rubygem scope to the existing API key", @ui.output
     assert_match response_success, @ui.output
diff --git a/test/rubygems/test_gem_config_file.rb b/test/rubygems/test_gem_config_file.rb
index f53125cc0c8b92..4230eda4d399ff 100644
--- a/test/rubygems/test_gem_config_file.rb
+++ b/test/rubygems/test_gem_config_file.rb
@@ -58,6 +58,7 @@ def test_initialize
       fp.puts ":ssl_verify_mode: 0"
       fp.puts ":ssl_ca_cert: /etc/ssl/certs"
       fp.puts ":cert_expiration_length_days: 28"
+      fp.puts ":install_extension_in_lib: true"
       fp.puts ":ipv4_fallback_enabled: true"
     end
 
@@ -73,6 +74,7 @@ def test_initialize
     assert_equal 0, @cfg.ssl_verify_mode
     assert_equal "/etc/ssl/certs", @cfg.ssl_ca_cert
     assert_equal 28, @cfg.cert_expiration_length_days
+    assert_equal true, @cfg.install_extension_in_lib
     assert_equal true, @cfg.ipv4_fallback_enabled
   end
 
@@ -191,7 +193,7 @@ def test_api_keys
 
     util_config_file
 
-    assert_equal({ :rubygems => "701229f217cdf23b1344c7b4b54ca97" },
+    assert_equal({ rubygems: "701229f217cdf23b1344c7b4b54ca97" },
                  @cfg.api_keys)
   end
 
@@ -369,7 +371,7 @@ def test_rubygems_api_key_equals
     assert_equal "x", @cfg.rubygems_api_key
 
     expected = {
-      :rubygems_api_key => "x",
+      rubygems_api_key: "x",
     }
 
     assert_equal expected, load_yaml_file(@cfg.credentials_path)
@@ -393,7 +395,7 @@ def test_rubygems_api_key_equals_bad_permission
     end
 
     expected = {
-      :rubygems_api_key => "x",
+      rubygems_api_key: "x",
     }
 
     assert_equal expected, load_yaml_file(@cfg.credentials_path)
@@ -485,6 +487,16 @@ def test_ignore_invalid_config_file
     end
   end
 
+  def test_accept_string_key
+    File.open @temp_conf, "w" do |fp|
+      fp.puts "verbose: false"
+    end
+
+    util_config_file
+
+    assert_equal false, @cfg.verbose
+  end
+
   def test_load_ssl_verify_mode_from_config
     File.open @temp_conf, "w" do |fp|
       fp.puts ":ssl_verify_mode: 1"
@@ -509,8 +521,12 @@ def test_load_ssl_client_cert_from_config
     assert_equal("/home/me/mine.pem", @cfg.ssl_client_cert)
   end
 
-  def util_config_file(args = @cfg_args)
-    @cfg = Gem::ConfigFile.new args
+  def test_load_install_extension_in_lib_from_config
+    File.open @temp_conf, "w" do |fp|
+      fp.puts ":install_extension_in_lib: false"
+    end
+    util_config_file
+    assert_equal(false, @cfg.install_extension_in_lib)
   end
 
   def test_disable_default_gem_server
@@ -542,10 +558,95 @@ def test_load_with_rubygems_config_hash
   end
 
   def test_dump_with_rubygems_yaml
-    symbol_key_hash = { :foo => "bar" }
+    symbol_key_hash = { foo: "bar" }
 
     actual = Gem::ConfigFile.dump_with_rubygems_yaml(symbol_key_hash)
 
     assert_equal("---\n:foo: \"bar\"\n", actual)
   end
+
+  def test_handle_comment
+    yaml = <<~YAML
+      ---
+      :foo: bar # buzz
+      #:notkey: bar
+    YAML
+
+    actual = Gem::ConfigFile.load_with_rubygems_config_hash(yaml)
+    assert_equal("bar", actual[:foo])
+    assert_equal(false, actual.key?("#:notkey"))
+    assert_equal(false, actual.key?(:notkey))
+    assert_equal(1, actual.size)
+  end
+
+  def test_s3_source
+    yaml = <<~YAML
+      ---
+      :sources:
+      - s3://bucket1/
+      - s3://bucket2/
+      - s3://bucket3/path_to_gems_dir/
+      - s3://bucket4/
+      - https://rubygems.org/
+      :s3_source:
+        :bucket1:
+          :provider: env
+        :bucket2:
+          :provider: instance_profile
+          :region: us-west-2
+        :bucket3:
+          :id: AOUEAOEU123123AOEUAO
+          :secret: aodnuhtdao/saeuhto+19283oaehu/asoeu+123h
+          :region: us-east-2
+        :bucket4:
+          :id: AOUEAOEU123123AOEUAO
+          :secret: aodnuhtdao/saeuhto+19283oaehu/asoeu+123h
+          :security_token: AQoDYXdzEJr
+          :region: us-west-1
+    YAML
+
+    File.open @temp_conf, "w" do |fp|
+      fp.puts yaml
+    end
+    util_config_file
+
+    assert_equal(["s3://bucket1/", "s3://bucket2/", "s3://bucket3/path_to_gems_dir/", "s3://bucket4/", "https://rubygems.org/"], @cfg.sources)
+    expected_config = {
+      bucket1: { provider: "env" },
+      bucket2: { provider: "instance_profile", region: "us-west-2" },
+      bucket3: { id: "AOUEAOEU123123AOEUAO", secret: "aodnuhtdao/saeuhto+19283oaehu/asoeu+123h", region: "us-east-2" },
+      bucket4: { id: "AOUEAOEU123123AOEUAO", secret: "aodnuhtdao/saeuhto+19283oaehu/asoeu+123h", security_token: "AQoDYXdzEJr", region: "us-west-1" },
+    }
+    assert_equal(expected_config, @cfg[:s3_source])
+    assert_equal(expected_config[:bucket1], @cfg[:s3_source][:bucket1])
+    assert_equal(expected_config[:bucket2], @cfg[:s3_source][:bucket2])
+    assert_equal(expected_config[:bucket3], @cfg[:s3_source][:bucket3])
+    assert_equal(expected_config[:bucket4], @cfg[:s3_source][:bucket4])
+  end
+
+  def test_s3_source_with_config_without_lookahead
+    yaml = <<~YAML
+    :sources:
+    - s3://bucket1/
+    s3_source:
+      bucket1:
+        provider: env
+    YAML
+
+    File.open @temp_conf, "w" do |fp|
+      fp.puts yaml
+    end
+    util_config_file
+
+    assert_equal(["s3://bucket1/"], @cfg.sources)
+    expected_config = {
+      "bucket1" => { "provider" => "env" },
+    }
+    assert_equal(expected_config, @cfg[:s3_source])
+    assert_equal(expected_config[:bucket1], @cfg[:s3_source][:bucket1])
+  end
+
+  def util_config_file(args = @cfg_args)
+    @cfg = Gem::ConfigFile.new args
+  end
 end
diff --git a/test/rubygems/test_gem_console_ui.rb b/test/rubygems/test_gem_console_ui.rb
new file mode 100644
index 00000000000000..b8a619625fe099
--- /dev/null
+++ b/test/rubygems/test_gem_console_ui.rb
@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+require_relative "helper"
+require "rubygems/user_interaction"
+
+class TestGemConsoleUI < Gem::TestCase
+  def test_output_can_be_captured_by_test_unit
+    output = capture_output do
+      ui = Gem::ConsoleUI.new
+
+      ui.alert_error "test error"
+      ui.alert_warning "test warning"
+      ui.alert "test alert"
+    end
+
+    assert_equal "INFO:  test alert\n", output.first
+    assert_equal "ERROR:  test error\n" + "WARNING:  test warning\n", output.last
+  end
+end
diff --git a/test/rubygems/test_gem_dependency.rb b/test/rubygems/test_gem_dependency.rb
index 6ac03fc0e2ac71..a0bfee023936cb 100644
--- a/test/rubygems/test_gem_dependency.rb
+++ b/test/rubygems/test_gem_dependency.rb
@@ -22,7 +22,7 @@ def test_initialize_type_bad
       Gem::Dependency.new "monkey" => "1.0"
     end
 
-    assert_equal 'dependency name must be a String, was {"monkey"=>"1.0"}',
+    assert_equal "dependency name must be a String, was #{{ "monkey" => "1.0" }.inspect}",
                  e.message
   end
 
@@ -394,6 +394,16 @@ def test_to_specs_indicates_total_gem_set_size
     assert_match "Could not find 'b' (= 2.0) among 1 total gem(s)", e.message
   end
 
+  def test_to_spec_with_only_prereleases
+    a_2_a_1 = util_spec "a", "2.a1"
+    a_2_a_2 = util_spec "a", "2.a2"
+    install_specs a_2_a_1, a_2_a_2
+
+    a_dep = dep "a", ">= 1"
+
+    assert_equal a_2_a_2, a_dep.to_spec
+  end
+
   def test_identity
     assert_equal dep("a", "= 1").identity, :released
     assert_equal dep("a", "= 1.a").identity, :complete
diff --git a/test/rubygems/test_gem_dependency_installer.rb b/test/rubygems/test_gem_dependency_installer.rb
index f43c221a9d1306..f84881579a6b08 100644
--- a/test/rubygems/test_gem_dependency_installer.rb
+++ b/test/rubygems/test_gem_dependency_installer.rb
@@ -75,7 +75,7 @@ def test_install_prerelease
     @fetcher.data["http://gems.example.com/gems/a-10.a.gem"] = p1a_data
 
     dep = Gem::Dependency.new "a"
-    inst = Gem::DependencyInstaller.new :prerelease => true
+    inst = Gem::DependencyInstaller.new prerelease: true
     inst.install dep
 
     assert_equal %w[a-10.a], Gem::Specification.map(&:full_name)
@@ -97,7 +97,7 @@ def test_install_prerelease_bug_990
 
     dep = Gem::Dependency.new "a"
 
-    inst = Gem::DependencyInstaller.new :prerelease => true
+    inst = Gem::DependencyInstaller.new prerelease: true
     inst.install dep
 
     assert_equal %w[a-1.b b-1.b c-1.1.b], Gem::Specification.map(&:full_name)
@@ -132,7 +132,7 @@ def test_install_prerelease_skipped_when_normal_ver
     @fetcher.data["http://gems.example.com/gems/a-1.gem"] = p1a_data
 
     dep = Gem::Dependency.new "a"
-    inst = Gem::DependencyInstaller.new :prerelease => true
+    inst = Gem::DependencyInstaller.new prerelease: true
     inst.install dep
 
     assert_equal %w[a-1], Gem::Specification.map(&:full_name)
@@ -153,7 +153,7 @@ def test_install_all_dependencies
     inst = nil
 
     Dir.chdir @tempdir do
-      inst = Gem::DependencyInstaller.new :ignore_dependencies => true
+      inst = Gem::DependencyInstaller.new ignore_dependencies: true
       inst.install "b"
     end
 
@@ -178,7 +178,7 @@ def test_install_cache_dir
     inst = nil
 
     Dir.chdir dir do
-      inst = Gem::DependencyInstaller.new :cache_dir => @tempdir
+      inst = Gem::DependencyInstaller.new cache_dir: @tempdir
       inst.install "b"
     end
 
@@ -198,7 +198,7 @@ def test_install_dependencies_satisfied
     Gem::Specification.reset
 
     FileUtils.mv @a1_gem, @tempdir
-    FileUtils.mv  a2_gem, @tempdir # not in index
+    FileUtils.mv a2_gem, @tempdir # not in index
     FileUtils.mv @b1_gem, @tempdir
     inst = nil
 
@@ -237,7 +237,7 @@ def test_install_doesnt_upgrade_installed_dependencies
     Gem::Specification.reset
 
     FileUtils.mv @a1_gem, @tempdir
-    FileUtils.mv  a2_gem, @tempdir # not in index
+    FileUtils.mv a2_gem, @tempdir # not in index
     FileUtils.mv @b1_gem, @tempdir
     FileUtils.mv a3_gem, @tempdir
 
@@ -274,7 +274,7 @@ def test_install_dependency
     FileUtils.mv @b1_gem, @tempdir
 
     Dir.chdir @tempdir do
-      inst = Gem::DependencyInstaller.new(:build_docs_in_background => false)
+      inst = Gem::DependencyInstaller.new(build_docs_in_background: false)
       inst.install "b"
     end
 
@@ -294,7 +294,7 @@ def test_install_dependency_development
     inst = nil
 
     Dir.chdir @tempdir do
-      inst = Gem::DependencyInstaller.new(:development => true)
+      inst = Gem::DependencyInstaller.new(development: true)
       inst.install "b"
     end
 
@@ -314,7 +314,7 @@ def test_install_dependency_development_deep
     inst = nil
 
     Dir.chdir @tempdir do
-      inst = Gem::DependencyInstaller.new(:development => true)
+      inst = Gem::DependencyInstaller.new(development: true)
       inst.install "d"
     end
 
@@ -334,7 +334,7 @@ def test_install_dependency_development_shallow
     inst = nil
 
     Dir.chdir @tempdir do
-      inst = Gem::DependencyInstaller.new(:development => true, :dev_shallow => true)
+      inst = Gem::DependencyInstaller.new(development: true, dev_shallow: true)
       inst.install "d"
     end
 
@@ -382,13 +382,9 @@ def test_install_dependency_existing_extension
     FileUtils.mv f1_gem, @tempdir
     inst = nil
 
-    pwd = Dir.getwd
-    Dir.chdir @tempdir
-    begin
+    Dir.chdir @tempdir do
       inst = Gem::DependencyInstaller.new
       inst.install "f"
-    ensure
-      Dir.chdir pwd
     end
 
     assert_equal %w[f-1], inst.installed_gems.map(&:full_name)
@@ -421,7 +417,7 @@ def test_install_local
     inst = nil
 
     Dir.chdir @tempdir do
-      inst = Gem::DependencyInstaller.new :domain => :local
+      inst = Gem::DependencyInstaller.new domain: :local
       inst.install "a-1.gem"
     end
 
@@ -435,7 +431,7 @@ def test_install_local_prerelease
     inst = nil
 
     Dir.chdir @tempdir do
-      inst = Gem::DependencyInstaller.new :domain => :local
+      inst = Gem::DependencyInstaller.new domain: :local
       inst.install "a-1.a.gem"
     end
 
@@ -451,7 +447,7 @@ def test_install_local_dependency
     inst = nil
 
     Dir.chdir @tempdir do
-      inst = Gem::DependencyInstaller.new :domain => :local
+      inst = Gem::DependencyInstaller.new domain: :local
       inst.install "b-1.gem"
     end
 
@@ -469,7 +465,7 @@ def test_install_local_dependency_installed
     Dir.chdir @tempdir do
       Gem::Installer.at("a-1.gem").install
 
-      inst = Gem::DependencyInstaller.new :domain => :local
+      inst = Gem::DependencyInstaller.new domain: :local
       inst.install "b-1.gem"
     end
 
@@ -488,8 +484,8 @@ def test_install_local_dependency_no_network_for_target_gem
     @fetcher.data["http://gems.example.com/gems/a-1.gem"] = a1_data
 
     # compact index is available
-    compact_index_response = Net::HTTPResponse.new "1.1", 200, "OK"
-    compact_index_response.uri = URI("http://gems.example.com")
+    compact_index_response = Gem::Net::HTTPResponse.new "1.1", 200, "OK"
+    compact_index_response.uri = Gem::URI("http://gems.example.com")
     @fetcher.data["http://gems.example.com/"] = compact_index_response
 
     # but private local gem not present there
@@ -516,13 +512,65 @@ def test_install_local_subdir
     inst = nil
 
     Dir.chdir @tempdir do
-      inst = Gem::DependencyInstaller.new :domain => :local
+      inst = Gem::DependencyInstaller.new domain: :local
       inst.install "gems/a-1.gem"
     end
 
     assert_equal %w[a-1], inst.installed_gems.map(&:full_name)
   end
 
+  def test_install_local_with_extensions_already_installed
+    pend "needs investigation" if Gem.java_platform?
+    pend "ruby.h is not provided by ruby repo" if ruby_repo?
+
+    @spec = quick_gem "a" do |s|
+      s.extensions << "extconf.rb"
+      s.files += %w[extconf.rb a.c]
+    end
+
+    write_dummy_extconf "a"
+
+    c_source_path = File.join(@tempdir, "a.c")
+
+    write_file c_source_path do |io|
+      io.write <<-C
+        #include <ruby.h>
+        void Init_a() { }
+      C
+    end
+
+    package_path = Gem::Package.build @spec
+    installer = Gem::Installer.at(package_path)
+
+    # Make sure the gem is installed and backup the correct package
+
+    installer.install
+
+    package_bkp_path = "#{package_path}.bkp"
+    FileUtils.cp package_path, package_bkp_path
+
+    # Break the extension, rebuild it, and try to install it
+
+    write_file c_source_path do |io|
+      io.write "typo"
+    end
+
+    Gem::Package.build @spec
+
+    assert_raise Gem::Ext::BuildError do
+      installer.install
+    end
+
+    # Make sure installing the good package again still works
+
+    FileUtils.cp "#{package_path}.bkp", package_path
+
+    Dir.chdir @tempdir do
+      inst = Gem::DependencyInstaller.new domain: :local
+      inst.install package_path
+    end
+  end
+
   def test_install_minimal_deps
     util_setup_gems
 
@@ -542,7 +590,7 @@ def test_install_minimal_deps
     inst = nil
 
     Dir.chdir @tempdir do
-      inst = Gem::DependencyInstaller.new :ignore_dependencies => true
+      inst = Gem::DependencyInstaller.new ignore_dependencies: true
       inst.install "b", req("= 1")
     end
 
@@ -550,7 +598,7 @@ def test_install_minimal_deps
                  "sanity check"
 
     Dir.chdir @tempdir do
-      inst = Gem::DependencyInstaller.new :minimal_deps => true
+      inst = Gem::DependencyInstaller.new minimal_deps: true
       inst.install "e"
     end
 
@@ -576,7 +624,7 @@ def test_install_no_minimal_deps
     inst = nil
 
     Dir.chdir @tempdir do
-      inst = Gem::DependencyInstaller.new :ignore_dependencies => true
+      inst = Gem::DependencyInstaller.new ignore_dependencies: true
       inst.install "b", req("= 1")
     end
 
@@ -584,7 +632,7 @@ def test_install_no_minimal_deps
                  "sanity check"
 
     Dir.chdir @tempdir do
-      inst = Gem::DependencyInstaller.new :minimal_deps => false
+      inst = Gem::DependencyInstaller.new minimal_deps: false
       inst.install "e"
     end
 
@@ -601,7 +649,7 @@ def test_install_no_document
       assert_empty dep_installer.document
     end
 
-    inst = Gem::DependencyInstaller.new :domain => :local, :document => []
+    inst = Gem::DependencyInstaller.new domain: :local, document: []
 
     inst.install @a1_gem
 
@@ -615,13 +663,13 @@ def test_install_env_shebang
     inst = nil
 
     Dir.chdir @tempdir do
-      inst = Gem::DependencyInstaller.new :env_shebang => true, :wrappers => true, :format_executable => false
+      inst = Gem::DependencyInstaller.new env_shebang: true, wrappers: true, format_executable: false
       inst.install "a"
     end
 
     env = "/\\S+/env" unless Gem.win_platform?
 
-    assert_match(/\A#!#{env} #{RbConfig::CONFIG['ruby_install_name']}\n/,
+    assert_match(/\A#!#{env} #{RbConfig::CONFIG["ruby_install_name"]}\n/,
                  File.read(File.join(@gemhome, "bin", "a_bin")))
   end
 
@@ -634,7 +682,7 @@ def test_install_force
     inst = nil
 
     Dir.chdir @tempdir do
-      inst = Gem::DependencyInstaller.new :force => true
+      inst = Gem::DependencyInstaller.new force: true
       inst.install "b"
     end
 
@@ -649,7 +697,7 @@ def test_install_build_args
     build_args = %w[--a --b="c"]
 
     Dir.chdir @tempdir do
-      inst = Gem::DependencyInstaller.new(:build_args => build_args)
+      inst = Gem::DependencyInstaller.new(build_args: build_args)
       inst.install "a"
     end
 
@@ -663,7 +711,7 @@ def test_install_ignore_dependencies
     inst = nil
 
     Dir.chdir @tempdir do
-      inst = Gem::DependencyInstaller.new :ignore_dependencies => true
+      inst = Gem::DependencyInstaller.new ignore_dependencies: true
       inst.install "b"
     end
 
@@ -684,7 +732,7 @@ def test_install_install_dir
     inst = nil
 
     Dir.chdir @tempdir do
-      inst = Gem::DependencyInstaller.new :install_dir => gemhome2
+      inst = Gem::DependencyInstaller.new install_dir: gemhome2
       inst.install "b"
     end
 
@@ -708,7 +756,7 @@ def test_install_domain_both
     inst = nil
 
     Dir.chdir @tempdir do
-      inst = Gem::DependencyInstaller.new :domain => :both
+      inst = Gem::DependencyInstaller.new domain: :both
       inst.install "b"
     end
 
@@ -732,7 +780,7 @@ def test_install_domain_both_no_network
     inst = nil
 
     Dir.chdir @tempdir do
-      inst = Gem::DependencyInstaller.new :domain => :both
+      inst = Gem::DependencyInstaller.new domain: :both
       inst.install "b"
     end
 
@@ -747,7 +795,7 @@ def test_install_domain_local
 
     Dir.chdir @tempdir do
       e = assert_raise Gem::UnsatisfiableDependencyError do
-        inst = Gem::DependencyInstaller.new :domain => :local
+        inst = Gem::DependencyInstaller.new domain: :local
         inst.install "b"
       end
 
@@ -768,7 +816,7 @@ def test_install_domain_remote
 
     @fetcher.data["http://gems.example.com/gems/a-1.gem"] = a1_data
 
-    inst = Gem::DependencyInstaller.new :domain => :remote
+    inst = Gem::DependencyInstaller.new domain: :remote
     inst.install "a"
 
     assert_equal %w[a-1], inst.installed_gems.map(&:full_name)
@@ -784,7 +832,7 @@ def test_install_dual_repository
     gemhome2 = "#{@gemhome}2"
 
     Dir.chdir @tempdir do
-      inst = Gem::DependencyInstaller.new :install_dir => gemhome2
+      inst = Gem::DependencyInstaller.new install_dir: gemhome2
       inst.install "a"
     end
 
@@ -811,7 +859,7 @@ def test_install_reinstall
     inst = nil
 
     Dir.chdir @tempdir do
-      inst = Gem::DependencyInstaller.new :force => true
+      inst = Gem::DependencyInstaller.new force: true
       inst.install "a"
     end
 
@@ -819,6 +867,48 @@ def test_install_reinstall
     assert_equal %w[a-1], inst.installed_gems.map(&:full_name)
   end
 
+  def test_install_dual_repository_and_done_installing_hooks
+    util_setup_gems
+
+    FileUtils.mv @a1_gem, @tempdir
+    FileUtils.mv @b1_gem, @tempdir
+    inst = nil
+
+    # Make sure gem is installed to standard GEM_HOME
+
+    Dir.chdir @tempdir do
+      inst = Gem::DependencyInstaller.new install_dir: @gemhome
+      inst.install "b"
+    end
+
+    # and also to an additional GEM_PATH
+
+    gemhome2 = "#{@gemhome}2"
+
+    Dir.chdir @tempdir do
+      inst = Gem::DependencyInstaller.new install_dir: gemhome2
+      inst.install "b"
+    end
+
+    # Now install the local gem with the additional GEM_PATH
+
+    ENV["GEM_HOME"] = @gemhome
+    ENV["GEM_PATH"] = [@gemhome, gemhome2].join File::PATH_SEPARATOR
+    Gem.clear_paths
+
+    Gem.done_installing do |installer, specs|
+      refute_nil installer
+      assert_equal [@b1], specs
+    end
+
+    Dir.chdir @tempdir do
+      inst = Gem::DependencyInstaller.new
+      inst.install "b-1.gem"
+    end
+
+    assert_equal %w[b-1], inst.installed_gems.map(&:full_name)
+  end
+
   def test_install_remote
     util_setup_gems
 
@@ -885,7 +975,7 @@ def test_install_remote_platform_newer
     @fetcher.data["http://gems.example.com/gems/#{a2_o.file_name}"] =
       a2_o_data
 
-    inst = Gem::DependencyInstaller.new :domain => :remote
+    inst = Gem::DependencyInstaller.new domain: :remote
     inst.install "a"
 
     assert_equal %w[a-1], inst.installed_gems.map(&:full_name)
@@ -896,7 +986,7 @@ def test_install_platform_is_ignored_when_a_file_is_specified
       s.platform = Gem::Platform.new %w[cpu other_platform 1]
     end
 
-    inst = Gem::DependencyInstaller.new :domain => :local
+    inst = Gem::DependencyInstaller.new domain: :local
     inst.install a_gem
 
     assert_equal %w[a-1-cpu-other_platform-1], inst.installed_gems.map(&:full_name)
@@ -915,7 +1005,7 @@ def test_install_security_policy
       @fetcher.data["http://gems.example.com/gems/b-1.gem"] = data
 
       policy = Gem::Security::HighSecurity
-      inst = Gem::DependencyInstaller.new :security_policy => policy
+      inst = Gem::DependencyInstaller.new security_policy: policy
 
       e = assert_raise Gem::Security::Exception do
         inst.install "b"
@@ -935,7 +1025,7 @@ def test_install_no_wrappers
 
       @fetcher.data["http://gems.example.com/gems/a-1.gem"] = read_binary(@a1_gem)
 
-      inst = Gem::DependencyInstaller.new :wrappers => false, :format_executable => false
+      inst = Gem::DependencyInstaller.new wrappers: false, format_executable: false
       inst.install "a"
 
       refute_match(/This file was generated by RubyGems./,
@@ -1155,7 +1245,7 @@ def test_resolve_dependencies_ignore_dependencies
     FileUtils.mv @a1_gem, @tempdir
     FileUtils.mv @b1_gem, @tempdir
 
-    inst = Gem::DependencyInstaller.new :ignore_dependencies => true
+    inst = Gem::DependencyInstaller.new ignore_dependencies: true
     request_set = inst.resolve_dependencies "b", req(">= 0")
 
     requests = request_set.sorted_requests.map(&:full_name)
diff --git a/test/rubygems/test_gem_ext_builder.rb b/test/rubygems/test_gem_ext_builder.rb
index 14b470de97c632..34f85e6b756983 100644
--- a/test/rubygems/test_gem_ext_builder.rb
+++ b/test/rubygems/test_gem_ext_builder.rb
@@ -48,11 +48,11 @@ def test_class_make
 
     results = results.join("\n").b
 
-    assert_match(/DESTDIR\\=#{ENV['DESTDIR']} clean$/,   results)
-    assert_match(/DESTDIR\\=#{ENV['DESTDIR']}$/,         results)
-    assert_match(/DESTDIR\\=#{ENV['DESTDIR']} install$/, results)
+    assert_match(/DESTDIR\\=#{ENV["DESTDIR"]} clean$/,   results)
+    assert_match(/DESTDIR\\=#{ENV["DESTDIR"]}$/,         results)
+    assert_match(/DESTDIR\\=#{ENV["DESTDIR"]} install$/, results)
 
-    unless /nmake/.match?(results)
+    unless results.include?("nmake")
       assert_match(/^clean: destination$/,   results)
       assert_match(/^all: destination$/,     results)
       assert_match(/^install: destination$/, results)
@@ -77,12 +77,14 @@ def test_class_make_no_clean
 
     results = results.join("\n").b
 
-    assert_match(/DESTDIR\\=#{ENV['DESTDIR']} clean$/,   results)
-    assert_match(/DESTDIR\\=#{ENV['DESTDIR']}$/,         results)
-    assert_match(/DESTDIR\\=#{ENV['DESTDIR']} install$/, results)
+    assert_match(/DESTDIR\\=#{ENV["DESTDIR"]} clean$/,   results)
+    assert_match(/DESTDIR\\=#{ENV["DESTDIR"]}$/,         results)
+    assert_match(/DESTDIR\\=#{ENV["DESTDIR"]} install$/, results)
   end
 
   def test_custom_make_with_options
+    pend "native windows platform only provides nmake" if vc_windows?
+
     ENV["make"] = "make V=1"
     results = []
     File.open File.join(@ext, "Makefile"), "w" do |io|
@@ -106,38 +108,41 @@ def test_custom_make_with_options
 
   def test_build_extensions
     pend "terminates on mswin" if vc_windows? && ruby_repo?
-    @spec.extensions << "ext/extconf.rb"
 
-    ext_dir = File.join @spec.gem_dir, "ext"
+    extension_in_lib do
+      @spec.extensions << "ext/extconf.rb"
 
-    FileUtils.mkdir_p ext_dir
+      ext_dir = File.join @spec.gem_dir, "ext"
 
-    extconf_rb = File.join ext_dir, "extconf.rb"
+      FileUtils.mkdir_p ext_dir
 
-    File.open extconf_rb, "w" do |f|
-      f.write <<-'RUBY'
-        require 'mkmf'
+      extconf_rb = File.join ext_dir, "extconf.rb"
 
-        create_makefile 'a'
-      RUBY
-    end
+      File.open extconf_rb, "w" do |f|
+        f.write <<-'RUBY'
+          require 'mkmf'
 
-    ext_lib_dir = File.join ext_dir, "lib"
-    FileUtils.mkdir ext_lib_dir
-    FileUtils.touch File.join ext_lib_dir, "a.rb"
-    FileUtils.mkdir File.join ext_lib_dir, "a"
-    FileUtils.touch File.join ext_lib_dir, "a", "b.rb"
+          create_makefile 'a'
+        RUBY
+      end
 
-    use_ui @ui do
-      @builder.build_extensions
-    end
+      ext_lib_dir = File.join ext_dir, "lib"
+      FileUtils.mkdir ext_lib_dir
+      FileUtils.touch File.join ext_lib_dir, "a.rb"
+      FileUtils.mkdir File.join ext_lib_dir, "a"
+      FileUtils.touch File.join ext_lib_dir, "a", "b.rb"
 
-    assert_path_exist @spec.extension_dir
-    assert_path_exist @spec.gem_build_complete_path
-    assert_path_exist File.join @spec.extension_dir, "gem_make.out"
-    assert_path_exist File.join @spec.extension_dir, "a.rb"
-    assert_path_exist File.join @spec.gem_dir, "lib", "a.rb"
-    assert_path_exist File.join @spec.gem_dir, "lib", "a", "b.rb"
+      use_ui @ui do
+        @builder.build_extensions
+      end
+
+      assert_path_exist @spec.extension_dir
+      assert_path_exist @spec.gem_build_complete_path
+      assert_path_exist File.join @spec.extension_dir, "gem_make.out"
+      assert_path_exist File.join @spec.extension_dir, "a.rb"
+      assert_path_exist File.join @spec.gem_dir, "lib", "a.rb"
+      assert_path_exist File.join @spec.gem_dir, "lib", "a", "b.rb"
+    end
   end
 
   def test_build_extensions_with_gemhome_with_space
@@ -153,55 +158,47 @@ def test_build_extensions_with_gemhome_with_space
   end
 
   def test_build_extensions_install_ext_only
-    class << Gem
-      alias_method :orig_install_extension_in_lib, :install_extension_in_lib
-
-      remove_method :install_extension_in_lib
-
-      def Gem.install_extension_in_lib
-        false
-      end
-    end
     pend "terminates on mswin" if vc_windows? && ruby_repo?
 
-    @spec.extensions << "ext/extconf.rb"
+    extension_in_lib(false) do
+      @orig_install_extension_in_lib = Gem.configuration.install_extension_in_lib
+      Gem.configuration.install_extension_in_lib = false
 
-    ext_dir = File.join @spec.gem_dir, "ext"
+      @spec.extensions << "ext/extconf.rb"
 
-    FileUtils.mkdir_p ext_dir
+      ext_dir = File.join @spec.gem_dir, "ext"
 
-    extconf_rb = File.join ext_dir, "extconf.rb"
+      FileUtils.mkdir_p ext_dir
 
-    File.open extconf_rb, "w" do |f|
-      f.write <<-'RUBY'
-        require 'mkmf'
+      extconf_rb = File.join ext_dir, "extconf.rb"
 
-        create_makefile 'a'
-      RUBY
-    end
+      File.open extconf_rb, "w" do |f|
+        f.write <<-'RUBY'
+          require 'mkmf'
 
-    ext_lib_dir = File.join ext_dir, "lib"
-    FileUtils.mkdir ext_lib_dir
-    FileUtils.touch File.join ext_lib_dir, "a.rb"
-    FileUtils.mkdir File.join ext_lib_dir, "a"
-    FileUtils.touch File.join ext_lib_dir, "a", "b.rb"
+          create_makefile 'a'
+        RUBY
+      end
 
-    use_ui @ui do
-      @builder.build_extensions
-    end
+      ext_lib_dir = File.join ext_dir, "lib"
+      FileUtils.mkdir ext_lib_dir
+      FileUtils.touch File.join ext_lib_dir, "a.rb"
+      FileUtils.mkdir File.join ext_lib_dir, "a"
+      FileUtils.touch File.join ext_lib_dir, "a", "b.rb"
 
-    assert_path_exist @spec.extension_dir
-    assert_path_exist @spec.gem_build_complete_path
-    assert_path_exist File.join @spec.extension_dir, "gem_make.out"
-    assert_path_exist File.join @spec.extension_dir, "a.rb"
-    assert_path_not_exist File.join @spec.gem_dir, "lib", "a.rb"
-    assert_path_not_exist File.join @spec.gem_dir, "lib", "a", "b.rb"
-  ensure
-    class << Gem
-      remove_method :install_extension_in_lib
+      use_ui @ui do
+        @builder.build_extensions
+      end
 
-      alias_method :install_extension_in_lib, :orig_install_extension_in_lib
+      assert_path_exist @spec.extension_dir
+      assert_path_exist @spec.gem_build_complete_path
+      assert_path_exist File.join @spec.extension_dir, "gem_make.out"
+      assert_path_exist File.join @spec.extension_dir, "a.rb"
+      assert_path_not_exist File.join @spec.gem_dir, "lib", "a.rb"
+      assert_path_not_exist File.join @spec.gem_dir, "lib", "a", "b.rb"
     end
+  ensure
+    Gem.configuration.install_extension_in_lib = @orig_install_extension_in_lib
   end
 
   def test_build_extensions_none
@@ -313,6 +310,76 @@ def test_build_extensions_with_build_args
     assert_path_exist @spec.extension_dir
   end
 
+  def test_build_extensions_with_target_rbconfig
+    fake_rbconfig = File.join @tempdir, "fake_rbconfig.rb"
+    File.open fake_rbconfig, "w" do |f|
+      f.write <<~RUBY
+      module RbConfig
+        CONFIG = {}
+        MAKEFILE_CONFIG = {}
+
+        def self.fire_update!(key, value); end
+        def self.expand(val, config = CONFIG); val; end
+      end
+      RUBY
+      RbConfig::CONFIG.each do |k, v|
+        f.puts %(RbConfig::CONFIG[#{k.dump}] = #{v.dump})
+      end
+      RbConfig::MAKEFILE_CONFIG.each do |k, v|
+        f.puts %(RbConfig::MAKEFILE_CONFIG[#{k.dump}] = #{v.dump})
+      end
+      f.puts "RbConfig::CONFIG['host_os'] = 'fake_os'"
+      f.puts "RbConfig::CONFIG['arch'] = 'fake_arch'"
+      f.puts "RbConfig::CONFIG['platform'] = 'fake_platform'"
+    end
+
+    stdout, stderr = capture_subprocess_io do
+      system(Gem.ruby, "-rmkmf", "-e", "exit MakeMakefile::RbConfig::CONFIG['host_os'] == 'fake_os'",
+             "--", "--target-rbconfig=#{fake_rbconfig}")
+    end
+    unless $?.success?
+      assert_include(stderr, "uninitialized constant MakeMakefile::RbConfig")
+      pend "This version of mkmf does not support --target-rbconfig"
+    end
+    assert_empty(stdout)
+
+    @spec.extensions << "extconf.rb"
+    @builder = Gem::Ext::Builder.new @spec, "", Gem::TargetRbConfig.from_path(fake_rbconfig)
+
+    FileUtils.mkdir_p @spec.gem_dir
+    lib_dir = File.join(@spec.gem_dir, "lib")
+
+    FileUtils.mkdir lib_dir
+
+    File.open File.join(@spec.gem_dir, "extconf.rb"), "w" do |f|
+      f.write <<-'RUBY'
+        require 'mkmf'
+
+        extconf_args = File.join __dir__, 'rbconfig_dump'
+        File.open extconf_args, 'w' do |f|
+          ["host_os", "arch"].each do |k|
+            f.puts "#{k}=#{MakeMakefile::RbConfig::CONFIG[k]}"
+          end
+        end
+
+        create_makefile 'a'
+      RUBY
+    end
+
+    use_ui @ui do
+      @builder.build_extensions
+    end
+
+    path = File.join @spec.gem_dir, "rbconfig_dump"
+
+    assert_equal <<~DUMP, File.read(path)
+    host_os=fake_os
+    arch=fake_arch
+    DUMP
+    assert_path_exist @spec.extension_dir
+    assert_equal [], Dir.glob(File.join(lib_dir, "*"))
+  end
+
   def test_initialize
     build_info_dir = File.join @gemhome, "build_info"
 
diff --git a/test/rubygems/test_gem_ext_cargo_builder.rb b/test/rubygems/test_gem_ext_cargo_builder.rb
index 0d893f54242d3f..b970e442c25084 100644
--- a/test/rubygems/test_gem_ext_cargo_builder.rb
+++ b/test/rubygems/test_gem_ext_cargo_builder.rb
@@ -3,6 +3,10 @@
 require_relative "helper"
 require "rubygems/ext"
 require "open3"
+begin
+  require "fiddle"
+rescue LoadError
+end
 
 class TestGemExtCargoBuilder < Gem::TestCase
   def setup
@@ -137,6 +141,58 @@ def test_custom_name
     end
   end
 
+  def test_linker_args
+    orig_cc = RbConfig::MAKEFILE_CONFIG["CC"]
+    RbConfig::MAKEFILE_CONFIG["CC"] = "clang"
+
+    builder = Gem::Ext::CargoBuilder.new
+    args = builder.send(:linker_args)
+
+    assert args[1], "linker=clang"
+    assert_nil args[2]
+  ensure
+    RbConfig::MAKEFILE_CONFIG["CC"] = orig_cc
+  end
+
+  def test_linker_args_with_options
+    orig_cc = RbConfig::MAKEFILE_CONFIG["CC"]
+    RbConfig::MAKEFILE_CONFIG["CC"] = "gcc -Wl,--no-undefined"
+
+    builder = Gem::Ext::CargoBuilder.new
+    args = builder.send(:linker_args)
+
+    assert args[1], "linker=clang"
+    assert args[3], "link-args=-Wl,--no-undefined"
+  ensure
+    RbConfig::MAKEFILE_CONFIG["CC"] = orig_cc
+  end
+
+  def test_linker_args_with_cachetools
+    orig_cc = RbConfig::MAKEFILE_CONFIG["CC"]
+    RbConfig::MAKEFILE_CONFIG["CC"] = "sccache clang"
+
+    builder = Gem::Ext::CargoBuilder.new
+    args = builder.send(:linker_args)
+
+    assert args[1], "linker=clang"
+    assert_nil args[2]
+  ensure
+    RbConfig::MAKEFILE_CONFIG["CC"] = orig_cc
+  end
+
+  def test_linker_args_with_cachetools_and_options
+    orig_cc = RbConfig::MAKEFILE_CONFIG["CC"]
+    RbConfig::MAKEFILE_CONFIG["CC"] = "ccache gcc -Wl,--no-undefined"
+
+    builder = Gem::Ext::CargoBuilder.new
+    args = builder.send(:linker_args)
+
+    assert args[1], "linker=clang"
+    assert args[3], "link-args=-Wl,--no-undefined"
+  ensure
+    RbConfig::MAKEFILE_CONFIG["CC"] = orig_cc
+  end
+
   private
 
   def skip_unsupported_platforms!
@@ -149,15 +205,21 @@ def skip_unsupported_platforms!
   end
 
   def assert_ffi_handle(bundle, name)
-    require "fiddle"
+    return unless defined?(Fiddle)
+
     dylib_handle = Fiddle.dlopen bundle
     assert_nothing_raised { dylib_handle[name] }
+  ensure
+    dylib_handle&.close
   end
 
   def refute_ffi_handle(bundle, name)
-    require "fiddle"
+    return unless defined?(Fiddle)
+
     dylib_handle = Fiddle.dlopen bundle
     assert_raise { dylib_handle[name] }
+  ensure
+    dylib_handle&.close
   end
 
   def replace_in_rust_file(name, from, to)
diff --git a/test/rubygems/test_gem_ext_cargo_builder/custom_name/ext/custom_name_lib/Cargo.lock b/test/rubygems/test_gem_ext_cargo_builder/custom_name/ext/custom_name_lib/Cargo.lock
index 3953d5924ddba9..4851de09d075b2 100644
--- a/test/rubygems/test_gem_ext_cargo_builder/custom_name/ext/custom_name_lib/Cargo.lock
+++ b/test/rubygems/test_gem_ext_cargo_builder/custom_name/ext/custom_name_lib/Cargo.lock
@@ -1,6 +1,6 @@
 # This file is automatically @generated by Cargo.
 # It is not intended for manual editing.
-version = 3
+version = 4
 
 [[package]]
 name = "aho-corasick"
@@ -13,9 +13,9 @@ dependencies = [
 
 [[package]]
 name = "bindgen"
-version = "0.66.1"
+version = "0.69.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f2b84e06fc203107bfbad243f4aba2af864eb7db3b1cf46ea0a023b0b433d2a7"
+checksum = "9ffcebc3849946a7170a05992aac39da343a90676ab392c51a4280981d6379c2"
 dependencies = [
  "bitflags",
  "cexpr",
@@ -152,18 +152,18 @@ dependencies = [
 
 [[package]]
 name = "rb-sys"
-version = "0.9.81"
+version = "0.9.116"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a57240b308b155b09dce81e32829966a99f52d1088b45957e4283e526c5317a1"
+checksum = "7059846f68396df83155779c75336ca24567741cb95256e6308c9fcc370e8dad"
 dependencies = [
  "rb-sys-build",
 ]
 
 [[package]]
 name = "rb-sys-build"
-version = "0.9.81"
+version = "0.9.116"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f24ce877a4c5d07f06f6aa6fec3ac95e4b357b9f73b0f5445d8cbb7266d410e8"
+checksum = "ac217510df41b9ffc041573e68d7a02aaff770c49943c7494441c4b224b0ecd0"
 dependencies = [
  "bindgen",
  "lazy_static",
@@ -205,9 +205,9 @@ checksum = "24188a676b6ae68c3b2cb3a01be17fbf7240ce009799bb56d5b1409051e78fde"
 
 [[package]]
 name = "shlex"
-version = "1.1.0"
+version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43b2853a4d09f215c24cc5489c992ce46052d359b5109343cbafbf26bc62f8a3"
+checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
 
 [[package]]
 name = "syn"
diff --git a/test/rubygems/test_gem_ext_cargo_builder/custom_name/ext/custom_name_lib/Cargo.toml b/test/rubygems/test_gem_ext_cargo_builder/custom_name/ext/custom_name_lib/Cargo.toml
index a6dde068b2ade7..7cb12fa8a6c16c 100644
--- a/test/rubygems/test_gem_ext_cargo_builder/custom_name/ext/custom_name_lib/Cargo.toml
+++ b/test/rubygems/test_gem_ext_cargo_builder/custom_name/ext/custom_name_lib/Cargo.toml
@@ -7,4 +7,4 @@ edition = "2021"
 crate-type = ["cdylib"]
 
 [dependencies]
-rb-sys = "0.9.81"
+rb-sys = "0.9.116"
diff --git a/test/rubygems/test_gem_ext_cargo_builder/rust_ruby_example/Cargo.lock b/test/rubygems/test_gem_ext_cargo_builder/rust_ruby_example/Cargo.lock
index c3db0d95c2e58f..9740b435e7bb8f 100644
--- a/test/rubygems/test_gem_ext_cargo_builder/rust_ruby_example/Cargo.lock
+++ b/test/rubygems/test_gem_ext_cargo_builder/rust_ruby_example/Cargo.lock
@@ -1,6 +1,6 @@
 # This file is automatically @generated by Cargo.
 # It is not intended for manual editing.
-version = 3
+version = 4
 
 [[package]]
 name = "aho-corasick"
@@ -13,9 +13,9 @@ dependencies = [
 
 [[package]]
 name = "bindgen"
-version = "0.66.1"
+version = "0.69.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f2b84e06fc203107bfbad243f4aba2af864eb7db3b1cf46ea0a023b0b433d2a7"
+checksum = "9ffcebc3849946a7170a05992aac39da343a90676ab392c51a4280981d6379c2"
 dependencies = [
  "bitflags",
  "cexpr",
@@ -145,18 +145,18 @@ dependencies = [
 
 [[package]]
 name = "rb-sys"
-version = "0.9.81"
+version = "0.9.116"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a57240b308b155b09dce81e32829966a99f52d1088b45957e4283e526c5317a1"
+checksum = "7059846f68396df83155779c75336ca24567741cb95256e6308c9fcc370e8dad"
 dependencies = [
  "rb-sys-build",
 ]
 
 [[package]]
 name = "rb-sys-build"
-version = "0.9.81"
+version = "0.9.116"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f24ce877a4c5d07f06f6aa6fec3ac95e4b357b9f73b0f5445d8cbb7266d410e8"
+checksum = "ac217510df41b9ffc041573e68d7a02aaff770c49943c7494441c4b224b0ecd0"
 dependencies = [
  "bindgen",
  "lazy_static",
@@ -205,9 +205,9 @@ checksum = "24188a676b6ae68c3b2cb3a01be17fbf7240ce009799bb56d5b1409051e78fde"
 
 [[package]]
 name = "shlex"
-version = "1.1.0"
+version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43b2853a4d09f215c24cc5489c992ce46052d359b5109343cbafbf26bc62f8a3"
+checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
 
 [[package]]
 name = "syn"
diff --git a/test/rubygems/test_gem_ext_cargo_builder/rust_ruby_example/Cargo.toml b/test/rubygems/test_gem_ext_cargo_builder/rust_ruby_example/Cargo.toml
index ecdc1d2d5d508d..b389cff5425e5e 100644
--- a/test/rubygems/test_gem_ext_cargo_builder/rust_ruby_example/Cargo.toml
+++ b/test/rubygems/test_gem_ext_cargo_builder/rust_ruby_example/Cargo.toml
@@ -7,4 +7,4 @@ edition = "2021"
 crate-type = ["cdylib"]
 
 [dependencies]
-rb-sys = "0.9.81"
+rb-sys = "0.9.116"
diff --git a/test/rubygems/test_gem_ext_cmake_builder.rb b/test/rubygems/test_gem_ext_cmake_builder.rb
index 5f886af05fcae0..b4cf8a8443c99b 100644
--- a/test/rubygems/test_gem_ext_cmake_builder.rb
+++ b/test/rubygems/test_gem_ext_cmake_builder.rb
@@ -29,7 +29,7 @@ def setup
   def test_self_build
     File.open File.join(@ext, "CMakeLists.txt"), "w" do |cmakelists|
       cmakelists.write <<-EO_CMAKE
-cmake_minimum_required(VERSION 2.6)
+cmake_minimum_required(VERSION 3.5)
 project(self_build NONE)
 install (FILES test.txt DESTINATION bin)
       EO_CMAKE
diff --git a/test/rubygems/test_gem_gem_runner.rb b/test/rubygems/test_gem_gem_runner.rb
index c05e74c991e524..4fb205040c334a 100644
--- a/test/rubygems/test_gem_gem_runner.rb
+++ b/test/rubygems/test_gem_gem_runner.rb
@@ -54,6 +54,12 @@ def test_do_configuration
     assert_equal %w[--commands], Gem::Command.extra_args
   end
 
+  def test_validate_encoding
+    assert_raise Gem::OptionParser::InvalidArgument do
+      @runner.run(["install\xFF", "foo"])
+    end
+  end
+
   def test_extract_build_args
     args = %w[]
     assert_equal [], @runner.extract_build_args(args)
diff --git a/test/rubygems/test_gem_gemcutter_utilities.rb b/test/rubygems/test_gem_gemcutter_utilities.rb
index 6bd6cfd979b4df..9204dc5f20ec6f 100644
--- a/test/rubygems/test_gem_gemcutter_utilities.rb
+++ b/test/rubygems/test_gem_gemcutter_utilities.rb
@@ -53,7 +53,7 @@ def test_alternate_key_alternate_host
   end
 
   def test_api_key
-    keys = { :rubygems_api_key => "KEY" }
+    keys = { rubygems_api_key: "KEY" }
 
     File.open Gem.configuration.credentials_path, "w" do |f|
       f.write Gem::ConfigFile.dump_with_rubygems_yaml(keys)
@@ -65,7 +65,7 @@ def test_api_key
   end
 
   def test_api_key_override
-    keys = { :rubygems_api_key => "KEY", :other => "OTHER" }
+    keys = { rubygems_api_key: "KEY", other: "OTHER" }
 
     File.open Gem.configuration.credentials_path, "w" do |f|
       f.write Gem::ConfigFile.dump_with_rubygems_yaml(keys)
@@ -233,9 +233,10 @@ def test_sign_in_with_webauthn_enabled
       end
     end
 
-    assert_match "You have enabled multi-factor authentication. Please visit #{@fetcher.webauthn_url_with_port(server.port)} " \
+    assert_match "You have enabled multi-factor authentication. Please visit the following URL " \
       "to authenticate via security device. If you can't verify using WebAuthn but have OTP enabled, " \
       "you can re-run the gem signin command with the `--otp [your_code]` option.", @sign_in_ui.output
+    assert_match @fetcher.webauthn_url_with_port(server.port), @sign_in_ui.output
     assert_match "You are verified with a security device. You may close the browser window.", @sign_in_ui.output
     assert_equal "Uvh6T57tkWuUnWYo", @fetcher.last_request["OTP"]
   end
@@ -255,9 +256,10 @@ def test_sign_in_with_webauthn_enabled_with_error
     end
     assert_equal 1, error.exit_code
 
-    assert_match "You have enabled multi-factor authentication. Please visit #{@fetcher.webauthn_url_with_port(server.port)} " \
+    assert_match "You have enabled multi-factor authentication. Please visit the following URL " \
       "to authenticate via security device. If you can't verify using WebAuthn but have OTP enabled, " \
       "you can re-run the gem signin command with the `--otp [your_code]` option.", @sign_in_ui.output
+    assert_match @fetcher.webauthn_url_with_port(server.port), @sign_in_ui.output
     assert_match "ERROR:  Security device verification failed: Something went wrong", @sign_in_ui.error
     refute_match "You are verified with a security device. You may close the browser window.", @sign_in_ui.output
     refute_match "Signed in with API key:", @sign_in_ui.output
@@ -273,9 +275,10 @@ def test_sign_in_with_webauthn_enabled_with_polling
       util_sign_in
     end
 
-    assert_match "You have enabled multi-factor authentication. Please visit #{@fetcher.webauthn_url_with_port(server.port)} " \
+    assert_match "You have enabled multi-factor authentication. Please visit the following URL " \
       "to authenticate via security device. If you can't verify using WebAuthn but have OTP enabled, " \
       "you can re-run the gem signin command with the `--otp [your_code]` option.", @sign_in_ui.output
+    assert_match @fetcher.webauthn_url_with_port(server.port), @sign_in_ui.output
     assert_match "You are verified with a security device. You may close the browser window.", @sign_in_ui.output
     assert_equal "Uvh6T57tkWuUnWYo", @fetcher.last_request["OTP"]
   end
@@ -292,9 +295,10 @@ def test_sign_in_with_webauthn_enabled_with_polling_failure
       end
     end
 
-    assert_match "You have enabled multi-factor authentication. Please visit #{@fetcher.webauthn_url_with_port(server.port)} " \
+    assert_match "You have enabled multi-factor authentication. Please visit the following URL " \
       "to authenticate via security device. If you can't verify using WebAuthn but have OTP enabled, " \
       "you can re-run the gem signin command with the `--otp [your_code]` option.", @sign_in_ui.output
+    assert_match @fetcher.webauthn_url_with_port(server.port), @sign_in_ui.output
     assert_match "ERROR:  Security device verification failed: " \
       "The token in the link you used has either expired or been used already.", @sign_in_ui.error
   end
@@ -306,7 +310,7 @@ def util_sign_in(args: [], extra_input: "")
     ENV["RUBYGEMS_HOST"] = @fetcher.host
     Gem::RemoteFetcher.fetcher = @fetcher
 
-    @sign_in_ui = Gem::MockGemUi.new("#{email}\n#{password}\n\n\n\n\n\n\n\n\n" + extra_input)
+    @sign_in_ui = Gem::MockGemUi.new("#{email}\n#{password}\n\n\n" + extra_input)
 
     use_ui @sign_in_ui do
       if args.length > 0
@@ -318,7 +322,7 @@ def util_sign_in(args: [], extra_input: "")
   end
 
   def test_verify_api_key
-    keys = { :other => "a5fdbb6ba150cbb83aad2bb2fede64cf040453903" }
+    keys = { other: "a5fdbb6ba150cbb83aad2bb2fede64cf040453903" }
     File.open Gem.configuration.credentials_path, "w" do |f|
       f.write Gem::ConfigFile.dump_with_rubygems_yaml(keys)
     end
diff --git a/test/rubygems/test_gem_indexer.rb b/test/rubygems/test_gem_indexer.rb
deleted file mode 100644
index 56bf3d9264f8f4..00000000000000
--- a/test/rubygems/test_gem_indexer.rb
+++ /dev/null
@@ -1,380 +0,0 @@
-# frozen_string_literal: true
-
-require_relative "helper"
-require "rubygems/indexer"
-
-class TestGemIndexer < Gem::TestCase
-  def setup
-    super
-
-    util_make_gems
-
-    @d2_0 = util_spec "d", "2.0" do |s|
-      s.date = Gem::Specification::TODAY - 86_400 * 3
-    end
-    util_build_gem @d2_0
-
-    @d2_0_a = util_spec "d", "2.0.a"
-    util_build_gem @d2_0_a
-
-    @d2_0_b = util_spec "d", "2.0.b"
-    util_build_gem @d2_0_b
-
-    @default = new_default_spec "default", 2
-    install_default_gems @default
-
-    @indexerdir = File.join(@tempdir, "indexer")
-
-    gems = File.join(@indexerdir, "gems")
-    FileUtils.mkdir_p gems
-    FileUtils.mv Dir[File.join(@gemhome, "cache", "*.gem")], gems
-
-    @indexer = Gem::Indexer.new(@indexerdir)
-  end
-
-  def teardown
-    FileUtils.rm_rf(@indexer.directory)
-  ensure
-    super
-  end
-
-  def with_indexer(dir, **opts)
-    indexer = Gem::Indexer.new(dir, **opts)
-    build_directory = indexer.directory
-    yield indexer
-  ensure
-    FileUtils.rm_rf(build_directory) if build_directory
-  end
-
-  def test_initialize
-    assert_equal @indexerdir, @indexer.dest_directory
-    Dir.mktmpdir("gem_generate_index") do |tmpdir|
-      assert_match(%r{#{tmpdir.match(/.*-/)}}, @indexer.directory) # rubocop:disable Style/RegexpLiteral
-    end
-
-    with_indexer(@indexerdir) do |indexer|
-      assert_predicate indexer, :build_modern
-    end
-
-    with_indexer(@indexerdir, :build_modern => true) do |indexer|
-      assert_predicate indexer, :build_modern
-    end
-  end
-
-  def test_build_indices
-    @indexer.make_temp_directories
-
-    use_ui @ui do
-      @indexer.build_indices
-    end
-
-    specs_path = File.join @indexer.directory, "specs.#{@marshal_version}"
-    specs_dump = Gem.read_binary specs_path
-    specs = Marshal.load specs_dump
-
-    expected = [["a",      Gem::Version.new("1"),   "ruby"],
-                ["a",      Gem::Version.new("2"),   "ruby"],
-                ["a_evil", Gem::Version.new("9"),   "ruby"],
-                ["b",      Gem::Version.new("2"),   "ruby"],
-                ["c",      Gem::Version.new("1.2"), "ruby"],
-                ["d",      Gem::Version.new("2.0"), "ruby"],
-                ["dep_x",  Gem::Version.new("1"),   "ruby"],
-                ["pl",     Gem::Version.new("1"),   "i386-linux"],
-                ["x",      Gem::Version.new("1"),   "ruby"]]
-
-    assert_equal expected, specs
-
-    latest_specs_path = File.join(@indexer.directory,
-                                  "latest_specs.#{@marshal_version}")
-    latest_specs_dump = Gem.read_binary latest_specs_path
-    latest_specs = Marshal.load latest_specs_dump
-
-    expected = [["a",      Gem::Version.new("2"),   "ruby"],
-                ["a_evil", Gem::Version.new("9"),   "ruby"],
-                ["b",      Gem::Version.new("2"),   "ruby"],
-                ["c",      Gem::Version.new("1.2"), "ruby"],
-                ["d",      Gem::Version.new("2.0"), "ruby"],
-                ["dep_x",  Gem::Version.new("1"),   "ruby"],
-                ["pl",     Gem::Version.new("1"),   "i386-linux"],
-                ["x",      Gem::Version.new("1"),   "ruby"]]
-
-    assert_equal expected, latest_specs, "latest_specs"
-  end
-
-  def test_generate_index
-    use_ui @ui do
-      @indexer.generate_index
-    end
-
-    quickdir = File.join @indexerdir, "quick"
-    marshal_quickdir = File.join quickdir, "Marshal.#{@marshal_version}"
-
-    assert_directory_exists quickdir
-    assert_directory_exists marshal_quickdir
-
-    assert_indexed marshal_quickdir, "#{File.basename(@a1.spec_file)}.rz"
-    assert_indexed marshal_quickdir, "#{File.basename(@a2.spec_file)}.rz"
-
-    refute_indexed marshal_quickdir, File.basename(@c1_2.spec_file)
-
-    assert_indexed @indexerdir, "specs.#{@marshal_version}"
-    assert_indexed @indexerdir, "specs.#{@marshal_version}.gz"
-
-    assert_indexed @indexerdir, "latest_specs.#{@marshal_version}"
-    assert_indexed @indexerdir, "latest_specs.#{@marshal_version}.gz"
-
-    refute_directory_exists @indexer.directory
-  end
-
-  def test_generate_index_modern
-    @indexer.build_modern = true
-
-    use_ui @ui do
-      @indexer.generate_index
-    end
-
-    refute_indexed @indexerdir, "yaml"
-    refute_indexed @indexerdir, "yaml.Z"
-    refute_indexed @indexerdir, "Marshal.#{@marshal_version}"
-    refute_indexed @indexerdir, "Marshal.#{@marshal_version}.Z"
-
-    quickdir = File.join @indexerdir, "quick"
-    marshal_quickdir = File.join quickdir, "Marshal.#{@marshal_version}"
-
-    assert_directory_exists quickdir, "quickdir should be directory"
-    assert_directory_exists marshal_quickdir
-
-    refute_indexed quickdir, "index"
-    refute_indexed quickdir, "index.rz"
-
-    refute_indexed quickdir, "latest_index"
-    refute_indexed quickdir, "latest_index.rz"
-
-    refute_indexed quickdir, "#{File.basename(@a1.spec_file)}.rz"
-    refute_indexed quickdir, "#{File.basename(@a2.spec_file)}.rz"
-    refute_indexed quickdir, "#{File.basename(@b2.spec_file)}.rz"
-    refute_indexed quickdir, "#{File.basename(@c1_2.spec_file)}.rz"
-
-    refute_indexed quickdir, "#{@pl1.original_name}.gemspec.rz"
-    refute_indexed quickdir, "#{File.basename(@pl1.spec_file)}.rz"
-
-    assert_indexed marshal_quickdir, "#{File.basename(@a1.spec_file)}.rz"
-    assert_indexed marshal_quickdir, "#{File.basename(@a2.spec_file)}.rz"
-
-    refute_indexed quickdir, File.basename(@c1_2.spec_file).to_s
-    refute_indexed marshal_quickdir, File.basename(@c1_2.spec_file).to_s
-
-    assert_indexed @indexerdir, "specs.#{@marshal_version}"
-    assert_indexed @indexerdir, "specs.#{@marshal_version}.gz"
-
-    assert_indexed @indexerdir, "latest_specs.#{@marshal_version}"
-    assert_indexed @indexerdir, "latest_specs.#{@marshal_version}.gz"
-  end
-
-  def test_generate_index_modern_back_to_back
-    @indexer.build_modern = true
-
-    use_ui @ui do
-      @indexer.generate_index
-    end
-
-    with_indexer @indexerdir do |indexer|
-      indexer.build_modern = true
-
-      use_ui @ui do
-        indexer.generate_index
-      end
-      quickdir = File.join @indexerdir, "quick"
-      marshal_quickdir = File.join quickdir, "Marshal.#{@marshal_version}"
-
-      assert_directory_exists quickdir
-      assert_directory_exists marshal_quickdir
-
-      assert_indexed marshal_quickdir, "#{File.basename(@a1.spec_file)}.rz"
-      assert_indexed marshal_quickdir, "#{File.basename(@a2.spec_file)}.rz"
-
-      assert_indexed @indexerdir, "specs.#{@marshal_version}"
-      assert_indexed @indexerdir, "specs.#{@marshal_version}.gz"
-
-      assert_indexed @indexerdir, "latest_specs.#{@marshal_version}"
-      assert_indexed @indexerdir, "latest_specs.#{@marshal_version}.gz"
-    end
-  end
-
-  def test_generate_index_ui
-    use_ui @ui do
-      @indexer.generate_index
-    end
-
-    assert_match(/^\.\.\.\.\.\.\.\.\.\.\.\.$/, @ui.output)
-    assert_match(/^Generating Marshal quick index gemspecs for 12 gems$/, @ui.output)
-    assert_match(/^Complete$/, @ui.output)
-    assert_match(/^Generating specs index$/, @ui.output)
-    assert_match(/^Generating latest specs index$/, @ui.output)
-    assert_match(/^Generating prerelease specs index$/, @ui.output)
-    assert_match(/^Complete$/, @ui.output)
-    assert_match(/^Compressing indices$/, @ui.output)
-
-    assert_equal "", @ui.error
-  end
-
-  def test_generate_index_specs
-    use_ui @ui do
-      @indexer.generate_index
-    end
-
-    specs_path = File.join @indexerdir, "specs.#{@marshal_version}"
-
-    specs_dump = Gem.read_binary specs_path
-    specs = Marshal.load specs_dump
-
-    expected = [
-      ["a",      Gem::Version.new(1),     "ruby"],
-      ["a",      Gem::Version.new(2),     "ruby"],
-      ["a_evil", Gem::Version.new(9),     "ruby"],
-      ["b",      Gem::Version.new(2),     "ruby"],
-      ["c",      Gem::Version.new("1.2"), "ruby"],
-      ["d",      Gem::Version.new("2.0"), "ruby"],
-      ["dep_x",  Gem::Version.new(1),     "ruby"],
-      ["pl",     Gem::Version.new(1),     "i386-linux"],
-      ["x",      Gem::Version.new(1),     "ruby"],
-    ]
-
-    assert_equal expected, specs
-
-    assert_same specs[0].first, specs[1].first,
-                "identical names not identical"
-
-    assert_same specs[0][1],    specs[-1][1],
-                "identical versions not identical"
-
-    assert_same specs[0].last, specs[1].last,
-                "identical platforms not identical"
-
-    refute_same specs[1][1], specs[5][1],
-                "different versions not different"
-  end
-
-  def test_generate_index_latest_specs
-    use_ui @ui do
-      @indexer.generate_index
-    end
-
-    latest_specs_path = File.join @indexerdir, "latest_specs.#{@marshal_version}"
-
-    latest_specs_dump = Gem.read_binary latest_specs_path
-    latest_specs = Marshal.load latest_specs_dump
-
-    expected = [
-      ["a",      Gem::Version.new(2),     "ruby"],
-      ["a_evil", Gem::Version.new(9),     "ruby"],
-      ["b",      Gem::Version.new(2),     "ruby"],
-      ["c",      Gem::Version.new("1.2"), "ruby"],
-      ["d",      Gem::Version.new("2.0"), "ruby"],
-      ["dep_x",  Gem::Version.new(1),     "ruby"],
-      ["pl",     Gem::Version.new(1),     "i386-linux"],
-      ["x",      Gem::Version.new(1),     "ruby"],
-    ]
-
-    assert_equal expected, latest_specs
-
-    assert_same latest_specs[0][1],   latest_specs[2][1],
-                "identical versions not identical"
-
-    assert_same latest_specs[0].last, latest_specs[1].last,
-                "identical platforms not identical"
-  end
-
-  def test_generate_index_prerelease_specs
-    use_ui @ui do
-      @indexer.generate_index
-    end
-
-    prerelease_specs_path = File.join @indexerdir, "prerelease_specs.#{@marshal_version}"
-
-    prerelease_specs_dump = Gem.read_binary prerelease_specs_path
-    prerelease_specs = Marshal.load prerelease_specs_dump
-
-    assert_equal [["a", Gem::Version.new("3.a"),   "ruby"],
-                  ["d", Gem::Version.new("2.0.a"), "ruby"],
-                  ["d", Gem::Version.new("2.0.b"), "ruby"]],
-                 prerelease_specs
-  end
-
-  ##
-  # Emulate the starting state of Gem::Specification in a live environment,
-  # where it will carry the list of system gems
-  def with_system_gems
-    Gem::Specification.reset
-
-    sys_gem = util_spec "systemgem", "1.0"
-    util_build_gem sys_gem
-    install_default_gems sys_gem
-    yield
-    util_remove_gem sys_gem
-  end
-
-  def test_update_index
-    use_ui @ui do
-      @indexer.generate_index
-    end
-
-    quickdir = File.join @indexerdir, "quick"
-    marshal_quickdir = File.join quickdir, "Marshal.#{@marshal_version}"
-
-    assert_directory_exists quickdir
-    assert_directory_exists marshal_quickdir
-
-    @d2_1 = util_spec "d", "2.1"
-    util_build_gem @d2_1
-    @d2_1_tuple = [@d2_1.name, @d2_1.version, @d2_1.original_platform]
-
-    @d2_1_a = util_spec "d", "2.2.a"
-    util_build_gem @d2_1_a
-    @d2_1_a_tuple = [@d2_1_a.name, @d2_1_a.version, @d2_1_a.original_platform]
-
-    gems = File.join @indexerdir, "gems"
-
-    FileUtils.mv @d2_1.cache_file, gems
-    FileUtils.mv @d2_1_a.cache_file, gems
-
-    with_system_gems do
-      use_ui @ui do
-        @indexer.update_index
-      end
-
-      assert_indexed marshal_quickdir, "#{File.basename(@d2_1.spec_file)}.rz"
-
-      specs_index = Marshal.load Gem.read_binary(@indexer.dest_specs_index)
-
-      assert_includes specs_index, @d2_1_tuple
-      refute_includes specs_index, @d2_1_a_tuple
-
-      latest_specs_index = Marshal.load \
-        Gem.read_binary(@indexer.dest_latest_specs_index)
-
-      assert_includes latest_specs_index, @d2_1_tuple
-      assert_includes latest_specs_index,
-                      [@d2_0.name, @d2_0.version, @d2_0.original_platform]
-      refute_includes latest_specs_index, @d2_1_a_tuple
-
-      pre_specs_index = Marshal.load \
-        Gem.read_binary(@indexer.dest_prerelease_specs_index)
-
-      assert_includes pre_specs_index, @d2_1_a_tuple
-      refute_includes pre_specs_index, @d2_1_tuple
-
-      refute_directory_exists @indexer.directory
-    end
-  end
-
-  def assert_indexed(dir, name)
-    file = File.join dir, name
-    assert File.exist?(file), "#{file} does not exist"
-  end
-
-  def refute_indexed(dir, name)
-    file = File.join dir, name
-    refute File.exist?(file), "#{file} exists"
-  end
-end
diff --git a/test/rubygems/test_gem_install_update_options.rb b/test/rubygems/test_gem_install_update_options.rb
index f3bd1c6d5efd6d..8fd5d9c543babe 100644
--- a/test/rubygems/test_gem_install_update_options.rb
+++ b/test/rubygems/test_gem_install_update_options.rb
@@ -130,6 +130,9 @@ def test_user_install_enabled
   end
 
   def test_user_install_disabled_read_only
+    pend "skipped on MS Windows (chmod has no effect)" if Gem.win_platform?
+    pend "skipped in root privilege" if Process.uid.zero?
+
     @spec = quick_gem "a" do |spec|
       util_make_exec spec
     end
@@ -137,23 +140,17 @@ def test_user_install_disabled_read_only
     util_build_gem @spec
     @gem = @spec.cache_file
 
-    if Gem.win_platform?
-      pend("test_user_install_disabled_read_only test skipped on MS Windows")
-    elsif Process.uid.zero?
-      pend("test_user_install_disabled_read_only test skipped in root privilege")
-    else
-      @cmd.handle_options %w[--no-user-install]
+    @cmd.handle_options %w[--no-user-install]
 
-      refute @cmd.options[:user_install]
+    refute @cmd.options[:user_install]
 
-      FileUtils.chmod 0o755, @userhome
-      FileUtils.chmod 0o000, @gemhome
+    FileUtils.chmod 0o755, @userhome
+    FileUtils.chmod 0o000, @gemhome
 
-      Gem.use_paths @gemhome, @userhome
+    Gem.use_paths @gemhome, @userhome
 
-      assert_raise(Gem::FilePermissionError) do
-        Gem::Installer.at(@gem, @cmd.options).install
-      end
+    assert_raise(Gem::FilePermissionError) do
+      Gem::Installer.at(@gem, @cmd.options).install
     end
   ensure
     FileUtils.chmod 0o755, @gemhome
diff --git a/test/rubygems/test_gem_installer.rb b/test/rubygems/test_gem_installer.rb
index adda63cf22df4e..34415aa7dd7e1d 100644
--- a/test/rubygems/test_gem_installer.rb
+++ b/test/rubygems/test_gem_installer.rb
@@ -24,36 +24,35 @@ def test_app_script_text
 
       util_make_exec @spec, ""
 
-      expected = <<-EOF
-#!#{Gem.ruby}
-#
-# This file was generated by RubyGems.
-#
-# The application 'a' is installed as part of a gem, and
-# this file is here to facilitate running it.
-#
-
-require 'rubygems'
-
-Gem.use_gemdeps
-
-version = \">= 0.a\"
-
-str = ARGV.first
-if str
-  str = str.b[/\\A_(.*)_\\z/, 1]
-  if str and Gem::Version.correct?(str)
-    version = str
-    ARGV.shift
-  end
-end
+      expected = <<~EOF
+        #!#{Gem.ruby}
+        #
+        # This file was generated by RubyGems.
+        #
+        # The application 'a' is installed as part of a gem, and
+        # this file is here to facilitate running it.
+        #
+
+        require 'rubygems'
+
+        Gem.use_gemdeps
+
+        version = \">= 0.a\"
+
+        str = ARGV.first
+        if str
+          str = str.b[/\\A_(.*)_\\z/, 1]
+          if str and Gem::Version.correct?(str)
+            version = str
+            ARGV.shift
+          end
+        end
 
-if Gem.respond_to?(:activate_bin_path)
-load Gem.activate_bin_path('a', 'executable', version)
-else
-gem "a", version
-load Gem.bin_path("a", "executable", version)
-end
+        if Gem.respond_to?(:activate_and_load_bin_path)
+          Gem.activate_and_load_bin_path('a', 'executable', version)
+        else
+          load Gem.activate_bin_path('a', 'executable', version)
+        end
       EOF
 
       wrapper = installer.app_script_text "executable"
@@ -121,12 +120,12 @@ def test_check_executable_overwrite_format_executable
     end
 
     File.open File.join(util_inst_bindir, "executable"), "w" do |io|
-      io.write <<-EXEC
-#!/usr/local/bin/ruby
-#
-# This file was generated by RubyGems
+      io.write <<~EXEC
+        #!/usr/local/bin/ruby
+        #
+        # This file was generated by RubyGems
 
-gem 'other', version
+        gem 'other', version
      EXEC
     end
 
@@ -208,7 +207,7 @@ def test_check_that_user_bin_dir_is_in_path
     ENV["PATH"] = [ENV["PATH"], bin_dir].join(File::PATH_SEPARATOR)
 
     use_ui @ui do
-      installer.check_that_user_bin_dir_is_in_path
+      installer.check_that_user_bin_dir_is_in_path(["executable"])
     end
 
     assert_empty @ui.error
@@ -218,7 +217,7 @@ def test_check_that_user_bin_dir_is_in_path
     ENV["PATH"] = [orig_path, bin_dir.tr(File::SEPARATOR, File::ALT_SEPARATOR)].join(File::PATH_SEPARATOR)
 
     use_ui @ui do
-      installer.check_that_user_bin_dir_is_in_path
+      installer.check_that_user_bin_dir_is_in_path(["executable"])
     end
 
     assert_empty @ui.error
@@ -236,7 +235,7 @@ def test_check_that_user_bin_dir_is_in_path_tilde
     installer.bin_dir.replace File.join @userhome, "bin"
 
     use_ui @ui do
-      installer.check_that_user_bin_dir_is_in_path
+      installer.check_that_user_bin_dir_is_in_path(["executable"])
     end
 
     assert_empty @ui.error
@@ -248,7 +247,7 @@ def test_check_that_user_bin_dir_is_in_path_not_in_path
     installer = setup_base_installer
 
     use_ui @ui do
-      installer.check_that_user_bin_dir_is_in_path
+      installer.check_that_user_bin_dir_is_in_path(["executable"])
     end
 
     expected = installer.bin_dir
@@ -258,6 +257,7 @@ def test_check_that_user_bin_dir_is_in_path_not_in_path
     end
 
     assert_match expected, @ui.error
+    assert_match "(executable)", @ui.error
   end
 
   def test_ensure_dependency
@@ -299,7 +299,7 @@ def test_ensure_loadable_spec_security_policy
     end
 
     policy = Gem::Security::HighSecurity
-    installer = Gem::Installer.at a_gem, :security_policy => policy
+    installer = Gem::Installer.at a_gem, security_policy: policy
 
     assert_raise Gem::Security::Exception do
       installer.ensure_loadable_spec
@@ -352,16 +352,14 @@ def test_generate_bin_bindir_with_user_install_warning
     ENV["PATH"] = [ENV["PATH"], bin_dir].compact.join(File::PATH_SEPARATOR)
 
     options = {
-      :bin_dir => bin_dir,
-      :install_dir => "/non/existent",
+      bin_dir: bin_dir,
+      install_dir: "/non/existent",
     }
 
     inst = Gem::Installer.at "", options
 
-    Gem::Installer.path_warning = false
-
     use_ui @ui do
-      inst.check_that_user_bin_dir_is_in_path
+      inst.check_that_user_bin_dir_is_in_path(["executable"])
     end
 
     assert_equal "", @ui.error
@@ -749,8 +747,8 @@ def test_generate_bin_with_dangling_symlink
 
     installer = Gem::Installer.at(
       gem_with_dangling_symlink,
-      :user_install => false,
-      :force => true
+      user_install: false,
+      force: true
     )
 
     build_rake_in do
@@ -821,7 +819,7 @@ def test_generate_plugins_with_user_install
     File.chmod(0o555, Gem.plugindir)
     system_path = File.join(Gem.plugindir, "a_plugin.rb")
     user_path = File.join(Gem.plugindir(Gem.user_dir), "a_plugin.rb")
-    installer = util_installer spec, Gem.dir, :user
+    installer = Gem::Installer.at spec.cache_file, user_install: true, force: true
 
     assert_equal spec, installer.install
 
@@ -846,7 +844,7 @@ def test_generate_plugins_with_build_root
     build_root = File.join(@tempdir, "build_root")
     build_root_path = File.join(build_root, Gem.plugindir.gsub(/^[a-zA-Z]:/, ""), "a_plugin.rb")
 
-    installer = Gem::Installer.at spec.cache_file, :build_root => build_root
+    installer = Gem::Installer.at spec.cache_file, build_root: build_root
 
     assert_equal spec, installer.install
 
@@ -870,11 +868,11 @@ def test_use_plugin_immediately
       spec_version = spec.version
       plugin_path = File.join("lib", "rubygems_plugin.rb")
       write_file File.join(@tempdir, plugin_path) do |io|
-        io.write <<-PLUGIN
-#{self.class}.plugin_loaded = true
-Gem.post_install do
-  #{self.class}.post_install_is_called = true
-end
+        io.write <<~PLUGIN
+          #{self.class}.plugin_loaded = true
+          Gem.post_install do
+            #{self.class}.post_install_is_called = true
+          end
         PLUGIN
       end
       spec.files += [plugin_path]
@@ -953,7 +951,7 @@ def test_generates_plugins_dir_under_install_dir_if_not_there
 
     path = Gem::Package.build @spec
 
-    installer = Gem::Installer.at path, :install_dir => "#{@gemhome}3"
+    installer = Gem::Installer.at path, install_dir: "#{@gemhome}3"
     assert_equal @spec, installer.install
   end
 
@@ -977,7 +975,7 @@ def test_initialize
   def test_initialize_user_install
     @gem = setup_base_gem
 
-    installer = Gem::Installer.at @gem, :user_install => true
+    installer = Gem::Installer.at @gem, user_install: true
 
     assert_equal File.join(Gem.user_dir, "gems", @spec.full_name),
                  installer.gem_dir
@@ -988,13 +986,26 @@ def test_initialize_user_install_bin_dir
     @gem = setup_base_gem
 
     installer =
-      Gem::Installer.at @gem, :user_install => true, :bin_dir => @tempdir
+      Gem::Installer.at @gem, user_install: true, bin_dir: @tempdir
 
     assert_equal File.join(Gem.user_dir, "gems", @spec.full_name),
                  installer.gem_dir
     assert_equal @tempdir, installer.bin_dir
   end
 
+  def test_install_dir_takes_precedence_to_user_install
+    gemhome2 = "#{@gemhome}2"
+
+    @gem = setup_base_gem
+
+    installer =
+      Gem::Installer.at @gem, install_dir: gemhome2, user_install: true
+    installer.install
+
+    assert_path_exist File.join(gemhome2, "gems", @spec.full_name)
+    assert_path_not_exist File.join(Gem.user_dir, "gems", @spec.full_name)
+  end
+
   def test_install
     installer = util_setup_installer
 
@@ -1070,6 +1081,8 @@ def test_install_creates_working_binstub
     end
 
     assert_match(/ran executable/, e.message)
+
+    assert_path_not_exist(File.join(installer.bin_dir, "executable.lock"))
   end
 
   def test_conflicting_binstubs
@@ -1118,6 +1131,8 @@ def test_conflicting_binstubs
     # We expect the bin stub to activate the version that actually contains
     # the binstub.
     assert_match("I have an executable", e.message)
+
+    assert_path_not_exist(File.join(installer.bin_dir, "executable.lock"))
   end
 
   def test_install_creates_binstub_that_understand_version
@@ -1147,6 +1162,8 @@ def test_install_creates_binstub_that_understand_version
     end
 
     assert_includes(e.message, "can't find gem a (= 3.0)")
+
+    assert_path_not_exist(File.join(installer.bin_dir, "executable.lock"))
   end
 
   def test_install_creates_binstub_that_prefers_user_installed_gem_to_default
@@ -1179,6 +1196,8 @@ def test_install_creates_binstub_that_prefers_user_installed_gem_to_default
     end
 
     assert_equal(e.message, "ran executable")
+
+    assert_path_not_exist(File.join(installer.bin_dir, "executable.lock"))
   end
 
   def test_install_creates_binstub_that_dont_trust_encoding
@@ -1209,6 +1228,36 @@ def test_install_creates_binstub_that_dont_trust_encoding
     end
 
     assert_match(/ran executable/, e.message)
+
+    assert_path_not_exist(File.join(installer.bin_dir, "executable.lock"))
+  end
+
+  def test_install_does_not_leave_lockfile_for_binstub
+    installer = util_setup_installer
+
+    installer.wrappers = true
+
+    File.class_eval do
+      alias_method :original_chmod, :chmod
+      define_method(:chmod) do |mode|
+        original_chmod(mode)
+        raise Gem::Ext::BuildError if path.end_with?("/executable")
+      end
+    end
+
+    assert_raise(Gem::Ext::BuildError) do
+      build_rake_in { installer.install }
+    end
+
+    assert_path_not_exist(File.join(installer.bin_dir, "executable.lock"))
+    # TODO: remove already copied files at failures.
+    # assert_path_not_exist(File.join(installer.bin_dir, "executable"))
+  ensure
+    File.class_eval do
+      remove_method :chmod
+      alias_method :chmod, :original_chmod
+      remove_method :original_chmod
+    end
   end
 
   def test_install_with_no_prior_files
@@ -1237,7 +1286,7 @@ def test_install_with_no_prior_files
         Gem::Package.build @spec
       end
     end
-    installer = Gem::Installer.at @gem, :force => true
+    installer = Gem::Installer.at @gem, force: true
     build_rake_in do
       use_ui @ui do
         assert_equal @spec, installer.install
@@ -1255,7 +1304,7 @@ def test_install_force
     end
 
     use_ui @ui do
-      installer = Gem::Installer.at missing_dep_gem, :force => true
+      installer = Gem::Installer.at missing_dep_gem, force: true
       installer.install
     end
 
@@ -1267,9 +1316,29 @@ def test_install_build_root
     build_root = File.join(@tempdir, "build_root")
 
     @gem = setup_base_gem
-    installer = Gem::Installer.at @gem, :build_root => build_root
+    installer = Gem::Installer.at @gem, build_root: build_root
+
+    assert_equal @spec, installer.install
+  end
+
+  def test_install_build_root_when_gem_home_not_writable_does_not_fallback_to_user_install_inside_build_root
+    build_root = File.join(@tempdir, "build_root")
+
+    orig_gem_home = ENV.delete("GEM_HOME")
+
+    @gem = setup_base_gem
+
+    FileUtils.chmod "-w", @gemhome
+
+    installer = Gem::Installer.at @gem, build_root: build_root
 
     assert_equal @spec, installer.install
+
+    build_root_path = File.join(build_root, @gemhome.gsub(/^[a-zA-Z]:/, ""))
+    assert File.exist?(build_root_path), "gem not written to build_root"
+  ensure
+    FileUtils.chmod "+w", @gemhome
+    ENV["GEM_HOME"] = orig_gem_home
   end
 
   def test_install_missing_dirs
@@ -1396,7 +1465,7 @@ def test_install_with_skipped_message
     use_ui @ui do
       path = Gem::Package.build @spec
 
-      installer = Gem::Installer.at path, :post_install_message => false
+      installer = Gem::Installer.at path, post_install_message: false
       installer.install
     end
 
@@ -1408,19 +1477,14 @@ def test_install_extension_dir
 
     @spec = setup_base_spec
     @spec.extensions << "extconf.rb"
-    write_file File.join(@tempdir, "extconf.rb") do |io|
-      io.write <<-RUBY
-        require "mkmf"
-        create_makefile("#{@spec.name}")
-      RUBY
-    end
+    write_dummy_extconf @spec.name
 
     @spec.files += %w[extconf.rb]
 
     use_ui @ui do
       path = Gem::Package.build @spec
 
-      installer = Gem::Installer.at path, :install_dir => gemhome2
+      installer = Gem::Installer.at path, install_dir: gemhome2
       installer.install
     end
 
@@ -1433,12 +1497,7 @@ def test_install_extension_dir_is_removed_on_reinstall
     @spec = setup_base_spec
 
     @spec.extensions << "extconf.rb"
-    write_file File.join(@tempdir, "extconf.rb") do |io|
-      io.write <<-RUBY
-        require "mkmf"
-        create_makefile("#{@spec.name}")
-      RUBY
-    end
+    write_dummy_extconf @spec.name
 
     @spec.files += %w[extconf.rb]
 
@@ -1459,7 +1518,7 @@ def test_install_extension_dir_is_removed_on_reinstall
 
     # reinstall the gem, this is also the same as pristine
     use_ui @ui do
-      installer = Gem::Installer.at path, :force => true
+      installer = Gem::Installer.at path, force: true
       installer.install
     end
 
@@ -1469,12 +1528,7 @@ def test_install_extension_dir_is_removed_on_reinstall
   def test_install_user_extension_dir
     @spec = setup_base_spec
     @spec.extensions << "extconf.rb"
-    write_file File.join(@tempdir, "extconf.rb") do |io|
-      io.write <<-RUBY
-        require "mkmf"
-        create_makefile("#{@spec.name}")
-      RUBY
-    end
+    write_dummy_extconf @spec.name
 
     @spec.files += %w[extconf.rb]
 
@@ -1485,7 +1539,7 @@ def test_install_user_extension_dir
     use_ui @ui do
       path = Gem::Package.build @spec
 
-      installer = Gem::Installer.at path, :user_install => true
+      installer = Gem::Installer.at path, user_install: true
       installer.install
     end
 
@@ -1497,26 +1551,24 @@ def test_install_user_extension_dir
   end
 
   def test_find_lib_file_after_install
-    pend "extensions don't quite work on jruby" if Gem.java_platform?
+    pend "needs investigation" if Gem.java_platform?
 
     @spec = setup_base_spec
     @spec.extensions << "extconf.rb"
-    write_file File.join(@tempdir, "extconf.rb") do |io|
-      io.write <<-RUBY
-        require "mkmf"
+    write_dummy_extconf @spec.name do |io|
+      io.write <<~RUBY
 
         CONFIG['CC'] = '$(TOUCH) $@ ||'
         CONFIG['LDSHARED'] = '$(TOUCH) $@ ||'
         $ruby = '#{Gem.ruby}'
 
-        create_makefile("#{@spec.name}")
       RUBY
     end
 
     write_file File.join(@tempdir, "depend")
 
     write_file File.join(@tempdir, "a.c") do |io|
-      io.write <<-C
+      io.write <<~C
         #include <ruby.h>
         void Init_a() { }
       C
@@ -1548,17 +1600,12 @@ def test_install_extension_and_script
 
     @spec = setup_base_spec
     @spec.extensions << "extconf.rb"
-    write_file File.join(@tempdir, "extconf.rb") do |io|
-      io.write <<-RUBY
-        require "mkmf"
-        create_makefile("#{@spec.name}")
-      RUBY
-    end
+    write_dummy_extconf @spec.name
 
     rb = File.join("lib", "#{@spec.name}.rb")
     @spec.files += [rb]
     write_file File.join(@tempdir, rb) do |io|
-      io.write <<-RUBY
+      io.write <<~RUBY
         # #{@spec.name}.rb
       RUBY
     end
@@ -1567,7 +1614,7 @@ def test_install_extension_and_script
     rb2 = File.join("lib", @spec.name, "#{@spec.name}.rb")
     @spec.files << rb2
     write_file File.join(@tempdir, rb2) do |io|
-      io.write <<-RUBY
+      io.write <<~RUBY
         # #{@spec.name}/#{@spec.name}.rb
       RUBY
     end
@@ -1585,7 +1632,7 @@ def test_install_extension_and_script
   end
 
   def test_install_extension_flat
-    pend "extensions don't quite work on jruby" if Gem.java_platform?
+    pend "needs investigation" if Gem.java_platform?
 
     begin
       @spec = setup_base_spec
@@ -1593,15 +1640,13 @@ def test_install_extension_flat
 
       @spec.extensions << "extconf.rb"
 
-      write_file File.join(@tempdir, "extconf.rb") do |io|
-        io.write <<-RUBY
-          require "mkmf"
+      write_dummy_extconf @spec.name do |io|
+        io.write <<~RUBY
 
           CONFIG['CC'] = '$(TOUCH) $@ ||'
           CONFIG['LDSHARED'] = '$(TOUCH) $@ ||'
           $ruby = '#{Gem.ruby}'
 
-          create_makefile("#{@spec.name}")
         RUBY
       end
 
@@ -1619,35 +1664,22 @@ def test_install_extension_flat
         installer.install
       end
       assert_path_exist so
-    rescue StandardError
-      puts "-" * 78
-      puts File.read File.join(@gemhome, "gems", "a-2", "Makefile")
-      puts "-" * 78
-
-      path = File.join(@gemhome, "gems", "a-2", "gem_make.out")
-
-      if File.exist?(path)
-        puts File.read(path)
-        puts "-" * 78
-      end
-
-      raise
     end
   end
 
   def test_install_extension_clean_intermediate_files
-    pend "extensions don't quite work on jruby" if Gem.java_platform?
+    pend "needs investigation" if Gem.java_platform?
     @spec = setup_base_spec
     @spec.require_paths = ["."]
     @spec.extensions << "extconf.rb"
 
-    File.write File.join(@tempdir, "extconf.rb"), <<-RUBY
-      require "mkmf"
-      CONFIG['CC'] = '$(TOUCH) $@ ||'
-      CONFIG['LDSHARED'] = '$(TOUCH) $@ ||'
-      $ruby = '#{Gem.ruby}'
-      create_makefile("#{@spec.name}")
-    RUBY
+    write_dummy_extconf @spec.name do |io|
+      io.write <<~RUBY
+        CONFIG['CC'] = '$(TOUCH) $@ ||'
+        CONFIG['LDSHARED'] = '$(TOUCH) $@ ||'
+        $ruby = '#{Gem.ruby}'
+      RUBY
+    end
 
     # empty depend file for no auto dependencies
     @spec.files += %W[depend #{@spec.name}.c].each do |file|
@@ -1737,7 +1769,7 @@ def test_pre_install_checks_dependencies_install_dir
     # that it work everything out on it's own.
     Gem::Specification.reset
 
-    installer = Gem::Installer.at gem, :install_dir => gemhome2
+    installer = Gem::Installer.at gem, install_dir: gemhome2
 
     build_rake_in do
       use_ui @ui do
@@ -1881,13 +1913,13 @@ def spec.validate(*args); end
   end
 
   def test_pre_install_checks_malicious_platform_before_eval
-    gem_with_ill_formated_platform = File.expand_path("packages/ill-formatted-platform-1.0.0.10.gem", __dir__)
+    gem_with_ill_formatted_platform = File.expand_path("packages/ill-formatted-platform-1.0.0.10.gem", __dir__)
 
     installer = Gem::Installer.at(
-      gem_with_ill_formated_platform,
-      :install_dir => @gemhome,
-      :user_install => false,
-      :force => true
+      gem_with_ill_formatted_platform,
+      install_dir: @gemhome,
+      user_install: false,
+      force: true
     )
 
     use_ui @ui do
@@ -1927,7 +1959,7 @@ def test_process_options_build_root
     plugins_dir = File.join(build_root, @gemhome.gsub(/^[a-zA-Z]:/, ""), "plugins")
 
     @gem = setup_base_gem
-    installer = use_ui(@ui) { Gem::Installer.at @gem, :build_root => build_root }
+    installer = use_ui(@ui) { Gem::Installer.at @gem, build_root: build_root }
 
     assert_equal build_root, installer.build_root
     assert_equal bin_dir, installer.bin_dir
@@ -1942,6 +1974,48 @@ def test_process_options_build_root
     assert_equal "  Plugins dir: #{plugins_dir}", errors.shift
   end
 
+  def test_process_options_fallback_to_user_install_when_gem_home_not_writable
+    if Process.uid.zero?
+      pend("skipped in root privilege")
+      return
+    end
+
+    orig_gem_home = ENV.delete("GEM_HOME")
+
+    @gem = setup_base_gem
+
+    FileUtils.chmod 0o000, @gemhome
+
+    installer = use_ui(@ui) { Gem::Installer.at @gem }
+
+    assert_equal Gem.user_dir, installer.gem_home
+    assert_equal "Defaulting to user installation because default installation directory (#{@gemhome}) is not writable.", @ui.output.strip
+  ensure
+    FileUtils.chmod 0o755, @gemhome
+    ENV["GEM_HOME"] = orig_gem_home
+  end
+
+  def test_process_options_does_not_fallback_to_user_install_when_gem_home_not_writable_and_no_user_install
+    if Process.uid.zero?
+      pend("skipped in root privilege")
+      return
+    end
+
+    orig_gem_home = ENV.delete("GEM_HOME")
+
+    @gem = setup_base_gem
+
+    FileUtils.chmod 0o000, @gemhome
+
+    installer = use_ui(@ui) { Gem::Installer.at @gem, user_install: false }
+
+    assert_equal @gemhome, installer.gem_home
+    assert_empty @ui.output.strip
+  ensure
+    FileUtils.chmod 0o755, @gemhome
+    ENV["GEM_HOME"] = orig_gem_home
+  end
+
   def test_shebang_arguments
     load_relative "no" do
       installer = setup_base_installer
@@ -2248,7 +2322,7 @@ def test_write_build_info_file_empty
 
   def test_write_build_info_file_install_dir
     @gem = setup_base_gem
-    installer = Gem::Installer.at @gem, :install_dir => "#{@gemhome}2"
+    installer = Gem::Installer.at @gem, install_dir: "#{@gemhome}2"
 
     installer.build_args = %w[
       --with-libyaml-dir /usr/local/Cellar/libyaml/0.1.4
@@ -2324,10 +2398,10 @@ def test_leaves_no_empty_cached_spec_when_no_more_disk_space
     installer = Gem::Installer.for_spec @spec
     installer.gem_home = @gemhome
 
-    File.class_eval do
-      alias_method :original_write, :write
+    File.singleton_class.class_eval do
+      alias_method :original_binwrite, :binwrite
 
-      def write(data)
+      def binwrite(path, data)
         raise Errno::ENOSPC
       end
     end
@@ -2338,10 +2412,10 @@ def write(data)
 
     assert_path_not_exist @spec.spec_file
   ensure
-    File.class_eval do
-      remove_method :write
-      alias_method :write, :original_write
-      remove_method :original_write
+    File.singleton_class.class_eval do
+      remove_method :binwrite
+      alias_method :binwrite, :original_binwrite
+      remove_method :original_binwrite
     end
   end
 
@@ -2353,7 +2427,7 @@ def test_dir
 
   def test_default_gem_loaded_from
     spec = util_spec "a"
-    installer = Gem::Installer.for_spec spec, :install_as_default => true
+    installer = Gem::Installer.for_spec spec, install_as_default: true
     installer.install
     assert_predicate spec, :default_gem?
   end
@@ -2515,6 +2589,7 @@ def load_relative(value)
 
     yield
   ensure
-    RbConfig::CONFIG["LIBRUBY_RELATIVE"] = orig_libruby_relative
+    # RbConfig::CONFIG values are strings only, there should not be a nil.
+    RbConfig::CONFIG["LIBRUBY_RELATIVE"] = orig_libruby_relative if orig_libruby_relative
   end
 end
diff --git a/test/rubygems/test_gem_local_remote_options.rb b/test/rubygems/test_gem_local_remote_options.rb
index b84e70e8b88c44..cea9cde82b8551 100644
--- a/test/rubygems/test_gem_local_remote_options.rb
+++ b/test/rubygems/test_gem_local_remote_options.rb
@@ -34,7 +34,7 @@ def test_both_eh
   def test_clear_sources_option
     @cmd.add_local_remote_options
 
-    s = URI.parse "http://only-gems.example.com/"
+    s = Gem::URI.parse "http://only-gems.example.com/"
 
     @cmd.handle_options %W[--clear-sources --source #{s}]
     assert_equal [s.to_s], Gem.sources
@@ -76,10 +76,10 @@ def test_remote_eh
   def test_source_option
     @cmd.add_source_option
 
-    s1 = URI.parse "http://more-gems.example.com/"
-    s2 = URI.parse "http://even-more-gems.example.com/"
-    s3 = URI.parse "http://other-gems.example.com/some_subdir"
-    s4 = URI.parse "http://more-gems.example.com/" # Intentional duplicate
+    s1 = Gem::URI.parse "http://more-gems.example.com/"
+    s2 = Gem::URI.parse "http://even-more-gems.example.com/"
+    s3 = Gem::URI.parse "http://other-gems.example.com/some_subdir"
+    s4 = Gem::URI.parse "http://more-gems.example.com/" # Intentional duplicate
 
     original_sources = Gem.sources.dup
 
@@ -97,7 +97,7 @@ def test_short_source_option
 
     original_sources = Gem.sources.dup
 
-    source = URI.parse "http://more-gems.example.com/"
+    source = Gem::URI.parse "http://more-gems.example.com/"
     @cmd.handle_options %W[-s #{source}]
 
     original_sources << source
diff --git a/test/rubygems/test_gem_name_tuple.rb b/test/rubygems/test_gem_name_tuple.rb
index 75c0784d147ae5..bdb8181ce858ca 100644
--- a/test/rubygems/test_gem_name_tuple.rb
+++ b/test/rubygems/test_gem_name_tuple.rb
@@ -19,14 +19,31 @@ def test_full_name
   end
 
   def test_platform_normalization
-    n = Gem::NameTuple.new "a", Gem::Version.new(0), "ruby"
-    assert_equal "ruby", n.platform
-
-    n = Gem::NameTuple.new "a", Gem::Version.new(0), nil
-    assert_equal "ruby", n.platform
-
-    n = Gem::NameTuple.new "a", Gem::Version.new(0), ""
-    assert_equal "ruby", n.platform
+    a = Gem::NameTuple.new "a", Gem::Version.new(0), "ruby"
+    b = Gem::NameTuple.new "a", Gem::Version.new(0), Gem::Platform::RUBY
+    assert_equal a, b
+    assert_equal a.hash, b.hash
+
+    a = Gem::NameTuple.new "a", Gem::Version.new(0), nil
+    b = Gem::NameTuple.new "a", Gem::Version.new(0), Gem::Platform.new("ruby")
+    assert_equal a, b
+    assert_equal a.hash, b.hash
+
+    a = Gem::NameTuple.new "a", Gem::Version.new(0), ""
+    b = Gem::NameTuple.new "a", Gem::Version.new(0), Gem::Platform.new("ruby")
+    assert_equal a, b
+    assert_equal a.hash, b.hash
+
+    a = Gem::NameTuple.new "a", Gem::Version.new(0), "universal-darwin-23"
+    b = Gem::NameTuple.new "a", Gem::Version.new(0), Gem::Platform.new("universal-darwin-23")
+    assert_equal a, b
+    assert_equal a.hash, b.hash
+
+    # Gem::Platform does normalization so that these are equal (note the missing dash before 21)
+    a = Gem::NameTuple.new "a", Gem::Version.new(0), "universal-darwin-21"
+    b = Gem::NameTuple.new "a", Gem::Version.new(0), Gem::Platform.new("universal-darwin21")
+    assert_equal a, b
+    assert_equal a.hash, b.hash
   end
 
   def test_spec_name
diff --git a/test/rubygems/test_gem_package.rb b/test/rubygems/test_gem_package.rb
index 6161e81f62df75..8a9cc8558022b7 100644
--- a/test/rubygems/test_gem_package.rb
+++ b/test/rubygems/test_gem_package.rb
@@ -438,6 +438,33 @@ def test_build_signed_encrypted_key
     assert_equal %w[lib/code.rb], reader.contents
   end
 
+  def test_build_modified_platform
+    spec = quick_gem "a", "1" do |s|
+      s.files = %w[lib/code.rb]
+      s.platform = Gem::Platform.new "x86_64-linux"
+    end
+
+    spec.platform = Gem::Platform.new "java"
+
+    FileUtils.mkdir "lib"
+
+    File.open "lib/code.rb", "w" do |io|
+      io.write "# lib/code.rb"
+    end
+
+    package = Gem::Package.new spec.file_name
+    package.spec = spec
+
+    package.build
+
+    assert_path_exist spec.file_name
+
+    reader = Gem::Package.new spec.file_name
+    assert reader.verify
+
+    assert_equal spec, reader.spec
+  end
+
   def test_raw_spec
     data_tgz = util_tar_gz {}
 
@@ -574,6 +601,32 @@ def test_extract_tar_gz_symlink_relative_path
                  File.read(extracted)
   end
 
+  def test_extract_symlink_into_symlink_dir
+    package = Gem::Package.new @gem
+    tgz_io = util_tar_gz do |tar|
+      tar.mkdir       "lib", 0o755
+      tar.add_symlink "lib/link", "./inside.rb", 0o644
+      tar.add_file    "lib/inside.rb", 0o644 do |io|
+        io.write "hi"
+      end
+    end
+
+    destination_subdir = File.join @destination, "subdir"
+    FileUtils.mkdir_p destination_subdir
+
+    destination_linkdir = File.join @destination, "linkdir"
+    File.symlink(destination_subdir, destination_linkdir)
+
+    package.extract_tar_gz tgz_io, destination_linkdir
+
+    extracted = File.join destination_subdir, "lib/link"
+    assert_path_exist extracted
+    assert_equal "./inside.rb",
+                 File.readlink(extracted)
+    assert_equal "hi",
+                 File.read(extracted)
+  end
+
   def test_extract_tar_gz_symlink_broken_relative_path
     package = Gem::Package.new @gem
     package.verify
@@ -734,12 +787,10 @@ def test_install_location
     package = Gem::Package.new @gem
 
     file = "file.rb".dup
-    file.taint if RUBY_VERSION < "2.7"
 
     destination = package.install_location file, @destination
 
     assert_equal File.join(@destination, "file.rb"), destination
-    refute destination.tainted? if RUBY_VERSION < "2.7"
   end
 
   def test_install_location_absolute
@@ -773,12 +824,10 @@ def test_install_location_extra_slash
     package = Gem::Package.new @gem
 
     file = "foo//file.rb".dup
-    file.taint if RUBY_VERSION < "2.7"
 
     destination = package.install_location file, @destination
 
     assert_equal File.join(@destination, "foo", "file.rb"), destination
-    refute destination.tainted? if RUBY_VERSION < "2.7"
   end
 
   def test_install_location_relative
diff --git a/test/rubygems/test_gem_package_tar_header.rb b/test/rubygems/test_gem_package_tar_header.rb
index bbdf20c23cb19f..a3f95bb7704f91 100644
--- a/test/rubygems/test_gem_package_tar_header.rb
+++ b/test/rubygems/test_gem_package_tar_header.rb
@@ -8,19 +8,19 @@ def setup
     super
 
     header = {
-      :name => "x",
-      :mode => 0o644,
-      :uid => 1000,
-      :gid => 10_000,
-      :size => 100,
-      :mtime => 12_345,
-      :typeflag => "0",
-      :linkname => "link",
-      :uname => "user",
-      :gname => "group",
-      :devmajor => 1,
-      :devminor => 2,
-      :prefix => "y",
+      name: "x",
+      mode: 0o644,
+      uid: 1000,
+      gid: 10_000,
+      size: 100,
+      mtime: 12_345,
+      typeflag: "0",
+      linkname: "link",
+      uname: "user",
+      gname: "group",
+      devmajor: 1,
+      devminor: 2,
+      prefix: "y",
     }
 
     @tar_header = Gem::Package::TarHeader.new header
@@ -59,29 +59,29 @@ def test_initialize
 
   def test_initialize_bad
     assert_raise ArgumentError do
-      Gem::Package::TarHeader.new :name => "", :size => "", :mode => ""
+      Gem::Package::TarHeader.new name: "", size: "", mode: ""
     end
 
     assert_raise ArgumentError do
-      Gem::Package::TarHeader.new :name => "", :size => "", :prefix => ""
+      Gem::Package::TarHeader.new name: "", size: "", prefix: ""
     end
 
     assert_raise ArgumentError do
-      Gem::Package::TarHeader.new :name => "", :prefix => "", :mode => ""
+      Gem::Package::TarHeader.new name: "", prefix: "", mode: ""
     end
 
     assert_raise ArgumentError do
-      Gem::Package::TarHeader.new :prefix => "", :size => "", :mode => ""
+      Gem::Package::TarHeader.new prefix: "", size: "", mode: ""
     end
   end
 
   def test_initialize_typeflag
     header = {
-      :mode => "",
-      :name => "",
-      :prefix => "",
-      :size => "",
-      :typeflag => "",
+      mode: "",
+      name: "",
+      prefix: "",
+      size: "",
+      typeflag: "",
     }
 
     tar_header = Gem::Package::TarHeader.new header
@@ -92,13 +92,38 @@ def test_initialize_typeflag
   def test_empty_eh
     refute_empty @tar_header
 
-    @tar_header = Gem::Package::TarHeader.new :name => "x", :prefix => "",
-                                              :mode => 0, :size => 0,
-                                              :empty => true
+    @tar_header = Gem::Package::TarHeader.new name: "x", prefix: "",
+                                              mode: 0, size: 0,
+                                              empty: true
 
     assert_empty @tar_header
   end
 
+  def test_empty
+    @tar_header = Gem::Package::TarHeader.from(StringIO.new(Gem::Package::TarHeader::EMPTY_HEADER))
+
+    assert_empty @tar_header
+    assert_equal Gem::Package::TarHeader.new(
+      checksum: 0,
+      devmajor: 0,
+      devminor: 0,
+      empty: true,
+      gid: 0,
+      gname: "",
+      linkname: "",
+      magic: "",
+      mode: 0,
+      mtime: 0,
+      name: "",
+      prefix: "",
+      size: 0,
+      typeflag: "0",
+      uid: 0,
+      uname: "",
+      version: 0,
+    ), @tar_header
+  end
+
   def test_equals2
     assert_equal @tar_header, @tar_header
     assert_equal @tar_header, @tar_header.dup
diff --git a/test/rubygems/test_gem_package_tar_reader.rb b/test/rubygems/test_gem_package_tar_reader.rb
index 178e29c3d030ca..b2f7cc2d5c6d26 100644
--- a/test/rubygems/test_gem_package_tar_reader.rb
+++ b/test/rubygems/test_gem_package_tar_reader.rb
@@ -25,6 +25,21 @@ def test_each_entry
     io.close!
   end
 
+  def test_each_with_not_a_tar
+    text = "Hello, world!!?\n" * 256 # 4 KiB
+    io = TempIO.new text
+
+    Gem::Package::TarReader.new io do |tar|
+      assert_raise Gem::Package::TarInvalidError do
+        tar.each do
+          flunk "TarInvalidError was expected to occur, but an entry was found"
+        end
+      end
+    end
+  ensure
+    io.close!
+  end
+
   def test_rewind
     content = ("a".."z").to_a.join(" ")
 
diff --git a/test/rubygems/test_gem_package_tar_writer.rb b/test/rubygems/test_gem_package_tar_writer.rb
index 751ceaca81cb5b..cb9e0d26fab614 100644
--- a/test/rubygems/test_gem_package_tar_writer.rb
+++ b/test/rubygems/test_gem_package_tar_writer.rb
@@ -33,7 +33,7 @@ def test_add_file
         f.write "a" * 10
       end
 
-      assert_headers_equal(tar_file_header("x", "", 0o644, 10, Time.now),
+      assert_headers_equal(tar_file_header("x", "", 0o644, 10, Time.at(Gem::DEFAULT_SOURCE_DATE_EPOCH).utc),
                          @io.string[0, 512])
     end
     assert_equal "aaaaaaaaaa#{"\0" * 502}", @io.string[512, 512]
@@ -50,11 +50,24 @@ def test_add_file_source_date_epoch
     end
   end
 
+  def test_add_file_with_mtime
+    Time.stub :now, Time.at(1_458_518_157) do
+      mtime = Time.now
+
+      @tar_writer.add_file "x", 0o644, mtime do |f|
+        f.write "a" * 10
+      end
+
+      assert_headers_equal(tar_file_header("x", "", 0o644, 10, mtime),
+                         @io.string[0, 512])
+    end
+  end
+
   def test_add_symlink
     Time.stub :now, Time.at(1_458_518_157) do
       @tar_writer.add_symlink "x", "y", 0o644
 
-      assert_headers_equal(tar_symlink_header("x", "", 0o644, Time.now, "y"),
+      assert_headers_equal(tar_symlink_header("x", "", 0o644, Time.at(Gem::DEFAULT_SOURCE_DATE_EPOCH).utc, "y"),
                          @io.string[0, 512])
     end
     assert_equal 512, @io.pos
@@ -86,7 +99,7 @@ def test_add_file_digest
                    "e1cf14b0",
                    digests["SHA512"].hexdigest
 
-      assert_headers_equal(tar_file_header("x", "", 0o644, 10, Time.now),
+      assert_headers_equal(tar_file_header("x", "", 0o644, 10, Time.at(Gem::DEFAULT_SOURCE_DATE_EPOCH).utc),
                          @io.string[0, 512])
     end
     assert_equal "aaaaaaaaaa#{"\0" * 502}", @io.string[512, 512]
@@ -109,7 +122,7 @@ def test_add_file_digest_multiple
                    "e1cf14b0",
                    digests["SHA512"].hexdigest
 
-      assert_headers_equal(tar_file_header("x", "", 0o644, 10, Time.now),
+      assert_headers_equal(tar_file_header("x", "", 0o644, 10, Time.at(Gem::DEFAULT_SOURCE_DATE_EPOCH).utc),
                            @io.string[0, 512])
     end
     assert_equal "aaaaaaaaaa#{"\0" * 502}", @io.string[512, 512]
@@ -126,7 +139,7 @@ def test_add_file_signer
         io.write "a" * 10
       end
 
-      assert_headers_equal(tar_file_header("x", "", 0o644, 10, Time.now),
+      assert_headers_equal(tar_file_header("x", "", 0o644, 10, Time.at(Gem::DEFAULT_SOURCE_DATE_EPOCH).utc),
                            @io.string[0, 512])
 
       assert_equal "aaaaaaaaaa#{"\0" * 502}", @io.string[512, 512]
@@ -137,7 +150,7 @@ def test_add_file_signer
       signature = signer.sign digest.digest
 
       assert_headers_equal(tar_file_header("x.sig", "", 0o444, signature.length,
-                                           Time.now),
+                                           Time.at(Gem::DEFAULT_SOURCE_DATE_EPOCH).utc),
                            @io.string[1024, 512])
       assert_equal "#{signature}#{"\0" * (512 - signature.length)}",
                    @io.string[1536, 512]
@@ -154,7 +167,7 @@ def test_add_file_signer_empty
         io.write "a" * 10
       end
 
-      assert_headers_equal(tar_file_header("x", "", 0o644, 10, Time.now),
+      assert_headers_equal(tar_file_header("x", "", 0o644, 10, Time.at(Gem::DEFAULT_SOURCE_DATE_EPOCH).utc),
                            @io.string[0, 512])
     end
     assert_equal "aaaaaaaaaa#{"\0" * 502}", @io.string[512, 512]
@@ -168,7 +181,7 @@ def test_add_file_simple
         io.write "a" * 10
       end
 
-      assert_headers_equal(tar_file_header("x", "", 0o644, 10, Time.now),
+      assert_headers_equal(tar_file_header("x", "", 0o644, 10, Time.at(Gem::DEFAULT_SOURCE_DATE_EPOCH).utc),
                            @io.string[0, 512])
 
       assert_equal "aaaaaaaaaa#{"\0" * 502}", @io.string[512, 512]
@@ -192,7 +205,7 @@ def test_add_file_simple_padding
     Time.stub :now, Time.at(1_458_518_157) do
       @tar_writer.add_file_simple "x", 0, 100
 
-      assert_headers_equal tar_file_header("x", "", 0, 100, Time.now),
+      assert_headers_equal tar_file_header("x", "", 0, 100, Time.at(Gem::DEFAULT_SOURCE_DATE_EPOCH).utc),
         @io.string[0, 512]
     end
 
@@ -250,7 +263,7 @@ def test_mkdir
     Time.stub :now, Time.at(1_458_518_157) do
       @tar_writer.mkdir "foo", 0o644
 
-      assert_headers_equal tar_dir_header("foo", "", 0o644, Time.now),
+      assert_headers_equal tar_dir_header("foo", "", 0o644, Time.at(Gem::DEFAULT_SOURCE_DATE_EPOCH).utc),
                            @io.string[0, 512]
 
       assert_equal 512, @io.pos
diff --git a/test/rubygems/test_gem_package_task.rb b/test/rubygems/test_gem_package_task.rb
index f0aaa3f0820264..6f322ad61e16f5 100644
--- a/test/rubygems/test_gem_package_task.rb
+++ b/test/rubygems/test_gem_package_task.rb
@@ -9,10 +9,6 @@
   raise unless e.path == "rake/packagetask"
 end
 
-unless defined?(Rake::PackageTask)
-  warn "Skipping Gem::PackageTask tests.  rake not found."
-end
-
 class TestGemPackageTask < Gem::TestCase
   def test_gem_package
     original_rake_fileutils_verbosity = RakeFileUtils.verbose_flag
diff --git a/test/rubygems/test_gem_platform.rb b/test/rubygems/test_gem_platform.rb
index e4bf882317db35..a35332408a48d0 100644
--- a/test/rubygems/test_gem_platform.rb
+++ b/test/rubygems/test_gem_platform.rb
@@ -90,46 +90,46 @@ def test_initialize
       "java" => [nil, "java", nil],
       "jruby" => [nil, "java", nil],
       "universal-dotnet" => ["universal", "dotnet", nil],
-      "universal-dotnet2.0" => ["universal", "dotnet",  "2.0"],
-      "universal-dotnet4.0" => ["universal", "dotnet",  "4.0"],
+      "universal-dotnet2.0" => ["universal", "dotnet", "2.0"],
+      "universal-dotnet4.0" => ["universal", "dotnet", "4.0"],
       "powerpc-aix5.3.0.0" => ["powerpc", "aix", "5"],
-      "powerpc-darwin7" => ["powerpc",   "darwin",    "7"],
-      "powerpc-darwin8" => ["powerpc",   "darwin",    "8"],
+      "powerpc-darwin7" => ["powerpc", "darwin", "7"],
+      "powerpc-darwin8" => ["powerpc", "darwin", "8"],
       "powerpc-linux" => ["powerpc", "linux", nil],
       "powerpc64-linux" => ["powerpc64", "linux", nil],
       "sparc-solaris2.10" => ["sparc", "solaris", "2.10"],
-      "sparc-solaris2.8" => ["sparc",     "solaris",   "2.8"],
-      "sparc-solaris2.9" => ["sparc",     "solaris",   "2.9"],
-      "universal-darwin8" => ["universal", "darwin",    "8"],
-      "universal-darwin9" => ["universal", "darwin",    "9"],
-      "universal-macruby" => ["universal", "macruby",   nil],
-      "i386-cygwin" => ["x86",       "cygwin",    nil],
-      "i686-darwin" => ["x86",       "darwin",    nil],
-      "i686-darwin8.4.1" => ["x86",       "darwin",    "8"],
-      "i386-freebsd4.11" => ["x86",       "freebsd",   "4"],
-      "i386-freebsd5" => ["x86",       "freebsd",   "5"],
-      "i386-freebsd6" => ["x86",       "freebsd",   "6"],
-      "i386-freebsd7" => ["x86",       "freebsd",   "7"],
+      "sparc-solaris2.8" => ["sparc", "solaris", "2.8"],
+      "sparc-solaris2.9" => ["sparc", "solaris", "2.9"],
+      "universal-darwin8" => ["universal", "darwin", "8"],
+      "universal-darwin9" => ["universal", "darwin", "9"],
+      "universal-macruby" => ["universal", "macruby", nil],
+      "i386-cygwin" => ["x86", "cygwin", nil],
+      "i686-darwin" => ["x86", "darwin", nil],
+      "i686-darwin8.4.1" => ["x86", "darwin", "8"],
+      "i386-freebsd4.11" => ["x86", "freebsd", "4"],
+      "i386-freebsd5" => ["x86", "freebsd", "5"],
+      "i386-freebsd6" => ["x86", "freebsd", "6"],
+      "i386-freebsd7" => ["x86", "freebsd", "7"],
       "i386-freebsd" => ["x86", "freebsd", nil],
       "universal-freebsd" => ["universal", "freebsd", nil],
       "i386-java1.5" => ["x86", "java", "1.5"],
       "x86-java1.6" => ["x86", "java", "1.6"],
       "i386-java1.6" => ["x86", "java", "1.6"],
-      "i686-linux" => ["x86",       "linux",     nil],
-      "i586-linux" => ["x86",       "linux",     nil],
-      "i486-linux" => ["x86",       "linux",     nil],
-      "i386-linux" => ["x86",       "linux",     nil],
-      "i586-linux-gnu" => ["x86",       "linux",     "gnu"],
-      "i386-linux-gnu" => ["x86",       "linux",     "gnu"],
+      "i686-linux" => ["x86", "linux", nil],
+      "i586-linux" => ["x86", "linux", nil],
+      "i486-linux" => ["x86", "linux", nil],
+      "i386-linux" => ["x86", "linux", nil],
+      "i586-linux-gnu" => ["x86", "linux", "gnu"],
+      "i386-linux-gnu" => ["x86", "linux", "gnu"],
       "i386-mingw32" => ["x86", "mingw32", nil],
       "x64-mingw-ucrt" => ["x64", "mingw", "ucrt"],
       "i386-mswin32" => ["x86", "mswin32", nil],
-      "i386-mswin32_80" => ["x86",       "mswin32",   "80"],
-      "i386-mswin32-80" => ["x86",       "mswin32",   "80"],
+      "i386-mswin32_80" => ["x86", "mswin32", "80"],
+      "i386-mswin32-80" => ["x86", "mswin32", "80"],
       "x86-mswin32" => ["x86", "mswin32", nil],
-      "x86-mswin32_60" => ["x86",       "mswin32",   "60"],
-      "x86-mswin32-60" => ["x86",       "mswin32",   "60"],
-      "i386-netbsdelf" => ["x86",       "netbsdelf", nil],
+      "x86-mswin32_60" => ["x86", "mswin32", "60"],
+      "x86-mswin32-60" => ["x86", "mswin32", "60"],
+      "i386-netbsdelf" => ["x86", "netbsdelf", nil],
       "i386-openbsd4.0" => ["x86", "openbsd", "4.0"],
       "i386-solaris2.10" => ["x86", "solaris", "2.10"],
       "i386-solaris2.8" => ["x86", "solaris", "2.8"],
@@ -142,15 +142,33 @@ def test_initialize
       "arm-linux-gnueabi" => ["arm", "linux", "gnueabi"],
       "arm-linux-musleabi" => ["arm", "linux", "musleabi"],
       "arm-linux-uclibceabi" => ["arm", "linux", "uclibceabi"],
-      "x86_64-openbsd3.9" => ["x86_64",    "openbsd",   "3.9"],
-      "x86_64-openbsd4.0" => ["x86_64",    "openbsd",   "4.0"],
+      "x86_64-openbsd3.9" => ["x86_64", "openbsd", "3.9"],
+      "x86_64-openbsd4.0" => ["x86_64", "openbsd", "4.0"],
       "x86_64-openbsd" => ["x86_64", "openbsd", nil],
+      "wasm32-wasi" => ["wasm32", "wasi", nil],
+      "wasm32-wasip1" => ["wasm32", "wasi", nil],
+      "wasm32-wasip2" => ["wasm32", "wasi", nil],
+
+      "darwin-java-java" => ["darwin", "java", nil],
+      "linux-linux-linux" => ["linux", "linux", "linux"],
+      "linux-linux-linux1.0" => ["linux", "linux", "linux1"],
+      "x86x86-1x86x86x86x861linuxx86x86" => ["x86x86", "linux", "x86x86"],
+      "freebsd0" => [nil, "freebsd", "0"],
+      "darwin0" => [nil, "darwin", "0"],
+      "darwin0---" => [nil, "darwin", "0"],
+      "x86-linux-x8611.0l" => ["x86", "linux", "x8611"],
+      "0-x86linuxx86---" => ["0", "linux", "x86"],
+      "x86_64-macruby-x86" => ["x86_64", "macruby", nil],
+      "x86_64-dotnetx86" => ["x86_64", "dotnet", nil],
+      "x86_64-dalvik0" => ["x86_64", "dalvik", "0"],
+      "x86_64-dotnet1." => ["x86_64", "dotnet", "1"],
     }
 
     test_cases.each do |arch, expected|
       platform = Gem::Platform.new arch
       assert_equal expected, platform.to_a, arch.inspect
-      assert_equal expected, Gem::Platform.new(platform.to_s).to_a, arch.inspect
+      platform2 = Gem::Platform.new platform.to_s
+      assert_equal expected, platform2.to_a, "#{arch.inspect} => #{platform2.inspect}"
     end
   end
 
@@ -365,34 +383,36 @@ def test_equals3_cpu_arm
     arm   = Gem::Platform.new "arm-linux"
     armv5 = Gem::Platform.new "armv5-linux"
     armv7 = Gem::Platform.new "armv7-linux"
+    arm64 = Gem::Platform.new "arm64-linux"
 
     util_set_arch "armv5-linux"
     assert((arm   === Gem::Platform.local), "arm   === armv5")
     assert((armv5 === Gem::Platform.local), "armv5 === armv5")
     refute((armv7 === Gem::Platform.local), "armv7 === armv5")
+    refute((arm64 === Gem::Platform.local), "arm64 === armv5")
     refute((Gem::Platform.local === arm), "armv5 === arm")
 
     util_set_arch "armv7-linux"
     assert((arm   === Gem::Platform.local), "arm   === armv7")
     refute((armv5 === Gem::Platform.local), "armv5 === armv7")
     assert((armv7 === Gem::Platform.local), "armv7 === armv7")
+    refute((arm64 === Gem::Platform.local), "arm64 === armv7")
     refute((Gem::Platform.local === arm), "armv7 === arm")
+
+    util_set_arch "arm64-linux"
+    refute((arm   === Gem::Platform.local), "arm   === arm64")
+    refute((armv5 === Gem::Platform.local), "armv5 === arm64")
+    refute((armv7 === Gem::Platform.local), "armv7 === arm64")
+    assert((arm64 === Gem::Platform.local), "arm64 === arm64")
   end
 
   def test_equals3_universal_mingw
     uni_mingw  = Gem::Platform.new "universal-mingw"
-    mingw32    = Gem::Platform.new "x64-mingw32"
     mingw_ucrt = Gem::Platform.new "x64-mingw-ucrt"
 
-    util_set_arch "x64-mingw32"
-    assert((uni_mingw === Gem::Platform.local), "uni_mingw === mingw32")
-    assert((mingw32 === Gem::Platform.local), "mingw32 === mingw32")
-    refute((mingw_ucrt === Gem::Platform.local), "mingw32 === mingw_ucrt")
-
     util_set_arch "x64-mingw-ucrt"
-    assert((uni_mingw === Gem::Platform.local), "uni_mingw === mingw32")
+    assert((uni_mingw === Gem::Platform.local), "uni_mingw === mingw_ucrt")
     assert((mingw_ucrt === Gem::Platform.local), "mingw_ucrt === mingw_ucrt")
-    refute((mingw32 === Gem::Platform.local), "mingw32 === mingw_ucrt")
   end
 
   def test_equals3_version
@@ -489,6 +509,171 @@ def test_gem_platform_match_with_string_argument
     end
   end
 
+  def test_constants
+    assert_equal [nil, "java", nil], Gem::Platform::JAVA.to_a
+    assert_equal ["x86", "mswin32", nil], Gem::Platform::MSWIN.to_a
+    assert_equal [nil, "mswin64", nil], Gem::Platform::MSWIN64.to_a
+    assert_equal ["x86", "mingw32", nil], Gem::Platform::MINGW.to_a
+    assert_equal ["x64", "mingw", "ucrt"], Gem::Platform::X64_MINGW.to_a
+    assert_equal ["universal", "mingw", nil], Gem::Platform::UNIVERSAL_MINGW.to_a
+    assert_equal [["x86", "mswin32", nil], [nil, "mswin64", nil], ["universal", "mingw", nil]], Gem::Platform::WINDOWS.map(&:to_a)
+    assert_equal ["x86_64", "linux", nil], Gem::Platform::X64_LINUX.to_a
+    assert_equal ["x86_64", "linux", "musl"], Gem::Platform::X64_LINUX_MUSL.to_a
+  end
+
+  def test_generic
+    # converts non-windows platforms into ruby
+    assert_equal Gem::Platform::RUBY, Gem::Platform.generic(Gem::Platform.new("x86-darwin-10"))
+    assert_equal Gem::Platform::RUBY, Gem::Platform.generic(Gem::Platform::RUBY)
+
+    # converts java platform variants into java
+    assert_equal Gem::Platform::JAVA, Gem::Platform.generic(Gem::Platform.new("java"))
+    assert_equal Gem::Platform::JAVA, Gem::Platform.generic(Gem::Platform.new("universal-java-17"))
+
+    # converts mswin platform variants into x86-mswin32
+    assert_equal Gem::Platform::MSWIN, Gem::Platform.generic(Gem::Platform.new("mswin32"))
+    assert_equal Gem::Platform::MSWIN, Gem::Platform.generic(Gem::Platform.new("i386-mswin32"))
+    assert_equal Gem::Platform::MSWIN, Gem::Platform.generic(Gem::Platform.new("x86-mswin32"))
+
+    # converts 32-bit mingw platform variants into universal-mingw
+    assert_equal Gem::Platform::UNIVERSAL_MINGW, Gem::Platform.generic(Gem::Platform.new("i386-mingw32"))
+    assert_equal Gem::Platform::UNIVERSAL_MINGW, Gem::Platform.generic(Gem::Platform.new("x86-mingw32"))
+
+    # converts 64-bit mingw platform variants into universal-mingw
+    assert_equal Gem::Platform::UNIVERSAL_MINGW, Gem::Platform.generic(Gem::Platform.new("x64-mingw32"))
+
+    # converts x64 mingw UCRT platform variants into universal-mingw
+    assert_equal Gem::Platform::UNIVERSAL_MINGW, Gem::Platform.generic(Gem::Platform.new("x64-mingw-ucrt"))
+
+    # converts aarch64 mingw UCRT platform variants into universal-mingw
+    assert_equal Gem::Platform::UNIVERSAL_MINGW, Gem::Platform.generic(Gem::Platform.new("aarch64-mingw-ucrt"))
+
+    assert_equal Gem::Platform::RUBY, Gem::Platform.generic(Gem::Platform.new("unknown"))
+    assert_equal Gem::Platform::RUBY, Gem::Platform.generic(nil)
+    assert_equal Gem::Platform::MSWIN64, Gem::Platform.generic(Gem::Platform.new("mswin64"))
+  end
+
+  def test_platform_specificity_match
+    [
+      ["ruby", "ruby", -1, -1],
+      ["x86_64-linux-musl", "x86_64-linux-musl", -1, -1],
+      ["x86_64-linux", "x86_64-linux-musl", 100, 200],
+      ["universal-darwin", "x86-darwin", 10, 20],
+      ["universal-darwin-19", "x86-darwin", 210, 120],
+      ["universal-darwin-19", "universal-darwin-20", 200, 200],
+      ["arm-darwin-19", "arm64-darwin-19", 0, 20],
+    ].each do |spec_platform, user_platform, s1, s2|
+      spec_platform = Gem::Platform.new(spec_platform)
+      user_platform = Gem::Platform.new(user_platform)
+      assert_equal s1, Gem::Platform.platform_specificity_match(spec_platform, user_platform),
+        "Gem::Platform.platform_specificity_match(#{spec_platform.to_s.inspect}, #{user_platform.to_s.inspect})"
+      assert_equal s2, Gem::Platform.platform_specificity_match(user_platform, spec_platform),
+        "Gem::Platform.platform_specificity_match(#{user_platform.to_s.inspect}, #{spec_platform.to_s.inspect})"
+    end
+  end
+
+  def test_sort_and_filter_best_platform_match
+    a_1 = util_spec "a", "1"
+    a_1_java = util_spec "a", "1" do |s|
+      s.platform = Gem::Platform::JAVA
+    end
+    a_1_universal_darwin = util_spec "a", "1" do |s|
+      s.platform = Gem::Platform.new("universal-darwin")
+    end
+    a_1_universal_darwin_19 = util_spec "a", "1" do |s|
+      s.platform = Gem::Platform.new("universal-darwin-19")
+    end
+    a_1_universal_darwin_20 = util_spec "a", "1" do |s|
+      s.platform = Gem::Platform.new("universal-darwin-20")
+    end
+    a_1_arm_darwin_19 = util_spec "a", "1" do |s|
+      s.platform = Gem::Platform.new("arm64-darwin-19")
+    end
+    a_1_x86_darwin = util_spec "a", "1" do |s|
+      s.platform = Gem::Platform.new("x86-darwin")
+    end
+    specs = [a_1, a_1_java, a_1_universal_darwin, a_1_universal_darwin_19, a_1_universal_darwin_20, a_1_arm_darwin_19, a_1_x86_darwin]
+    assert_equal [a_1], Gem::Platform.sort_and_filter_best_platform_match(specs, "ruby")
+    assert_equal [a_1_java], Gem::Platform.sort_and_filter_best_platform_match(specs, Gem::Platform::JAVA)
+    assert_equal [a_1_arm_darwin_19], Gem::Platform.sort_and_filter_best_platform_match(specs, Gem::Platform.new("arm64-darwin-19"))
+    assert_equal [a_1_universal_darwin_20], Gem::Platform.sort_and_filter_best_platform_match(specs, Gem::Platform.new("arm64-darwin-20"))
+    assert_equal [a_1_universal_darwin_19], Gem::Platform.sort_and_filter_best_platform_match(specs, Gem::Platform.new("x86-darwin-19"))
+    assert_equal [a_1_universal_darwin_20], Gem::Platform.sort_and_filter_best_platform_match(specs, Gem::Platform.new("x86-darwin-20"))
+    assert_equal [a_1_x86_darwin], Gem::Platform.sort_and_filter_best_platform_match(specs, Gem::Platform.new("x86-darwin-21"))
+  end
+
+  def test_sort_best_platform_match
+    a_1 = util_spec "a", "1"
+    a_1_java = util_spec "a", "1" do |s|
+      s.platform = Gem::Platform::JAVA
+    end
+    a_1_universal_darwin = util_spec "a", "1" do |s|
+      s.platform = Gem::Platform.new("universal-darwin")
+    end
+    a_1_universal_darwin_19 = util_spec "a", "1" do |s|
+      s.platform = Gem::Platform.new("universal-darwin-19")
+    end
+    a_1_universal_darwin_20 = util_spec "a", "1" do |s|
+      s.platform = Gem::Platform.new("universal-darwin-20")
+    end
+    a_1_arm_darwin_19 = util_spec "a", "1" do |s|
+      s.platform = Gem::Platform.new("arm64-darwin-19")
+    end
+    a_1_x86_darwin = util_spec "a", "1" do |s|
+      s.platform = Gem::Platform.new("x86-darwin")
+    end
+    specs = [a_1, a_1_java, a_1_universal_darwin, a_1_universal_darwin_19, a_1_universal_darwin_20, a_1_arm_darwin_19, a_1_x86_darwin]
+    assert_equal ["ruby",
+                  "java",
+                  "universal-darwin",
+                  "universal-darwin-19",
+                  "universal-darwin-20",
+                  "arm64-darwin-19",
+                  "x86-darwin"], Gem::Platform.sort_best_platform_match(specs, "ruby").map {|s| s.platform.to_s }
+    assert_equal ["java",
+                  "universal-darwin",
+                  "x86-darwin",
+                  "universal-darwin-19",
+                  "universal-darwin-20",
+                  "arm64-darwin-19",
+                  "ruby"], Gem::Platform.sort_best_platform_match(specs, Gem::Platform::JAVA).map {|s| s.platform.to_s }
+    assert_equal ["arm64-darwin-19",
+                  "universal-darwin-19",
+                  "universal-darwin",
+                  "java",
+                  "x86-darwin",
+                  "universal-darwin-20",
+                  "ruby"], Gem::Platform.sort_best_platform_match(specs, Gem::Platform.new("arm64-darwin-19")).map {|s| s.platform.to_s }
+    assert_equal ["universal-darwin-20",
+                  "universal-darwin",
+                  "java",
+                  "x86-darwin",
+                  "arm64-darwin-19",
+                  "universal-darwin-19",
+                  "ruby"], Gem::Platform.sort_best_platform_match(specs, Gem::Platform.new("arm64-darwin-20")).map {|s| s.platform.to_s }
+    assert_equal ["universal-darwin-19",
+                  "arm64-darwin-19",
+                  "x86-darwin",
+                  "universal-darwin",
+                  "java",
+                  "universal-darwin-20",
+                  "ruby"], Gem::Platform.sort_best_platform_match(specs, Gem::Platform.new("x86-darwin-19")).map {|s| s.platform.to_s }
+    assert_equal ["universal-darwin-20",
+                  "x86-darwin",
+                  "universal-darwin",
+                  "java",
+                  "universal-darwin-19",
+                  "arm64-darwin-19",
+                  "ruby"], Gem::Platform.sort_best_platform_match(specs, Gem::Platform.new("x86-darwin-20")).map {|s| s.platform.to_s }
+    assert_equal ["x86-darwin",
+                  "universal-darwin",
+                  "java",
+                  "universal-darwin-19",
+                  "universal-darwin-20",
+                  "arm64-darwin-19",
+                  "ruby"], Gem::Platform.sort_best_platform_match(specs, Gem::Platform.new("x86-darwin-21")).map {|s| s.platform.to_s }
+  end
+
   def assert_local_match(name)
     assert_match Gem::Platform.local, name
   end
diff --git a/test/rubygems/test_gem_rdoc.rb b/test/rubygems/test_gem_rdoc.rb
index f9b1df6cd55aa1..9ecbb7d8c39b38 100644
--- a/test/rubygems/test_gem_rdoc.rb
+++ b/test/rubygems/test_gem_rdoc.rb
@@ -5,8 +5,6 @@
 require "rubygems/rdoc"
 
 class TestGemRDoc < Gem::TestCase
-  Gem::RDoc.load_rdoc
-
   def setup
     super
 
@@ -22,12 +20,6 @@ def setup
 
     @hook = Gem::RDoc.new @a
 
-    begin
-      Gem::RDoc.load_rdoc
-    rescue Gem::DocumentError => e
-      pend e.message
-    end
-
     Gem.configuration[:rdoc] = nil
   end
 
@@ -134,4 +126,4 @@ def test_setup_unwritable
       FileUtils.rm_r @a.doc_dir
     end
   end
-end
+end if defined?(Gem::RDoc)
diff --git a/test/rubygems/test_gem_remote_fetcher.rb b/test/rubygems/test_gem_remote_fetcher.rb
index 72df720825e549..ca858cfda5d33d 100644
--- a/test/rubygems/test_gem_remote_fetcher.rb
+++ b/test/rubygems/test_gem_remote_fetcher.rb
@@ -2,105 +2,14 @@
 
 require_relative "helper"
 
-require "webrick"
-require "webrick/https" if Gem::HAVE_OPENSSL
-
-unless Gem::HAVE_OPENSSL
-  warn "Skipping Gem::RemoteFetcher tests.  openssl not found."
-end
-
 require "rubygems/remote_fetcher"
 require "rubygems/package"
 
-# = Testing Proxy Settings
-#
-# These tests check the proper proxy server settings by running two
-# web servers.  The web server at http://localhost:#{SERVER_PORT}
-# represents the normal gem server and returns a gemspec with a rake
-# version of 0.4.11.  The web server at http://localhost:#{PROXY_PORT}
-# represents the proxy server and returns a different dataset where
-# rake has version 0.4.2.  This allows us to detect which server is
-# returning the data.
-#
-# Note that the proxy server is not a *real* proxy server.  But our
-# software doesn't really care, as long as we hit the proxy URL when a
-# proxy is configured.
-
 class TestGemRemoteFetcher < Gem::TestCase
   include Gem::DefaultUserInteraction
 
-  SERVER_DATA = <<-EOY
---- !ruby/object:Gem::Cache
-gems:
-  rake-0.4.11: !ruby/object:Gem::Specification
-    rubygems_version: "0.7"
-    specification_version: 1
-    name: rake
-    version: !ruby/object:Gem::Version
-      version: 0.4.11
-    date: 2004-11-12
-    summary: Ruby based make-like utility.
-    require_paths:
-      - lib
-    author: Jim Weirich
-    email: jim@weirichhouse.org
-    homepage: http://rake.rubyforge.org
-    description: Rake is a Make-like program implemented in Ruby. Tasks and dependencies are specified in standard Ruby syntax.
-    autorequire:
-    bindir: bin
-    has_rdoc: true
-    required_ruby_version: !ruby/object:Gem::Version::Requirement
-      requirements:
-        -
-          - ">"
-          - !ruby/object:Gem::Version
-            version: 0.0.0
-      version:
-    platform: ruby
-    files:
-      - README
-    test_files: []
-    library_stubs:
-    rdoc_options:
-    extra_rdoc_files:
-    executables:
-      - rake
-    extensions: []
-    requirements: []
-    dependencies: []
-  EOY
-
-  PROXY_DATA = SERVER_DATA.gsub(/0.4.11/, "0.4.2")
-
-  # Generated via:
-  #   x = OpenSSL::PKey::DH.new(2048) # wait a while...
-  #   x.to_s => pem
-  TEST_KEY_DH2048 = OpenSSL::PKey::DH.new <<-_END_OF_PEM_
------BEGIN DH PARAMETERS-----
-MIIBCAKCAQEA3Ze2EHSfYkZLUn557torAmjBgPsqzbodaRaGZtgK1gEU+9nNJaFV
-G1JKhmGUiEDyIW7idsBpe4sX/Wqjnp48Lr8IeI/SlEzLdoGpf05iRYXC8Cm9o8aM
-cfmVgoSEAo9YLBpzoji2jHkO7Q5IPt4zxbTdlmmGFLc/GO9q7LGHhC+rcMcNTGsM
-49AnILNn49pq4Y72jSwdmvq4psHZwwFBbPwLdw6bLUDDCN90jfqvYt18muwUxDiN
-NP0fuvVAIB158VnQ0liHSwcl6+9vE1mL0Jo/qEXQxl0+UdKDjaGfTsn6HIrwTnmJ
-PeIQQkFng2VVot/WAQbv3ePqWq07g1BBcwIBAg==
------END DH PARAMETERS-----
-    _END_OF_PEM_
-
   def setup
-    @proxies = %w[https_proxy http_proxy HTTP_PROXY http_proxy_user HTTP_PROXY_USER http_proxy_pass HTTP_PROXY_PASS no_proxy NO_PROXY]
-    @old_proxies = @proxies.map {|k| ENV[k] }
-    @proxies.each {|k| ENV[k] = nil }
-
     super
-    start_servers
-    self.enable_yaml = true
-    self.enable_zip = false
-
-    base_server_uri = "http://localhost:#{normal_server_port}"
-    @proxy_uri = "http://localhost:#{proxy_server_port}"
-
-    @server_uri = base_server_uri + "/yaml"
-    @server_z_uri = base_server_uri + "/yaml.Z"
 
     @cache_dir = File.join @gemhome, "cache"
 
@@ -116,14 +25,6 @@ def setup
     @fetcher = Gem::RemoteFetcher.fetcher
   end
 
-  def teardown
-    @fetcher.close_all
-    stop_servers
-    super
-    Gem.configuration[:http_proxy] = nil
-    @proxies.each_with_index {|k, i| ENV[k] = @old_proxies[i] }
-  end
-
   def test_self_fetcher
     fetcher = Gem::RemoteFetcher.fetcher
     refute_nil fetcher
@@ -140,6 +41,8 @@ def test_self_fetcher_with_proxy
     refute_nil fetcher
     assert_kind_of Gem::RemoteFetcher, fetcher
     assert_equal proxy_uri, fetcher.instance_variable_get(:@proxy).to_s
+  ensure
+    Gem.configuration[:http_proxy] = nil
   end
 
   def test_fetch_path_bad_uri
@@ -153,16 +56,8 @@ def test_fetch_path_bad_uri
     assert_equal "uri scheme is invalid: nil", e.message
   end
 
-  def test_no_proxy
-    use_ui @stub_ui do
-      assert_data_from_server @fetcher.fetch_path(@server_uri)
-      response = @fetcher.fetch_path(@server_uri, nil, true)
-      assert_equal SERVER_DATA.size, response["content-length"].to_i
-    end
-  end
-
   def test_cache_update_path
-    uri = URI "http://example/file"
+    uri = Gem::URI "http://example/file"
     path = File.join @tempdir, "file"
 
     fetcher = util_fuck_with_fetcher "hello"
@@ -176,7 +71,7 @@ def test_cache_update_path
 
   def test_cache_update_path_with_utf8_internal_encoding
     with_internal_encoding("UTF-8") do
-      uri = URI "http://example/file"
+      uri = Gem::URI "http://example/file"
       path = File.join @tempdir, "file"
       data = String.new("\xC8").force_encoding(Encoding::BINARY)
 
@@ -190,7 +85,7 @@ def test_cache_update_path_with_utf8_internal_encoding
   end
 
   def test_cache_update_path_no_update
-    uri = URI "http://example/file"
+    uri = Gem::URI "http://example/file"
     path = File.join @tempdir, "file"
 
     fetcher = util_fuck_with_fetcher "hello"
@@ -554,7 +449,7 @@ def test_fetch_path_timeout_error
     @fetcher = fetcher
 
     def fetcher.fetch_http(uri, mtime = nil, head = nil)
-      raise Timeout::Error, "timed out"
+      raise Gem::Timeout::Error, "timed out"
     end
 
     url = "http://example.com/uri"
@@ -563,7 +458,7 @@ def fetcher.fetch_http(uri, mtime = nil, head = nil)
       fetcher.fetch_path url
     end
 
-    assert_match(/Timeout::Error: timed out \(#{Regexp.escape url}\)\z/,
+    assert_match(/Gem::Timeout::Error: timed out \(#{Regexp.escape url}\)\z/,
                  e.message)
     assert_equal url, e.uri
   end
@@ -613,42 +508,7 @@ def fetcher.fetch_http(uri, mtime, head = nil)
       nil
     end
 
-    assert_nil fetcher.fetch_path(URI.parse(@gem_repo), Time.at(0))
-  end
-
-  def test_implicit_no_proxy
-    use_ui @stub_ui do
-      ENV["http_proxy"] = "http://fakeurl:12345"
-      fetcher = Gem::RemoteFetcher.new :no_proxy
-      @fetcher = fetcher
-      assert_data_from_server fetcher.fetch_path(@server_uri)
-    end
-  end
-
-  def test_implicit_proxy
-    use_ui @stub_ui do
-      ENV["http_proxy"] = @proxy_uri
-      fetcher = Gem::RemoteFetcher.new nil
-      @fetcher = fetcher
-      assert_data_from_proxy fetcher.fetch_path(@server_uri)
-    end
-  end
-
-  def test_implicit_upper_case_proxy
-    use_ui @stub_ui do
-      ENV["HTTP_PROXY"] = @proxy_uri
-      fetcher = Gem::RemoteFetcher.new nil
-      @fetcher = fetcher
-      assert_data_from_proxy fetcher.fetch_path(@server_uri)
-    end
-  end
-
-  def test_implicit_proxy_no_env
-    use_ui @stub_ui do
-      fetcher = Gem::RemoteFetcher.new nil
-      @fetcher = fetcher
-      assert_data_from_server fetcher.fetch_path(@server_uri)
-    end
+    assert_nil fetcher.fetch_path(Gem::URI.parse(@gem_repo), Time.at(0))
   end
 
   def test_fetch_http
@@ -659,19 +519,19 @@ def test_fetch_http
     def fetcher.request(uri, request_class, last_modified = nil)
       url = "http://gems.example.com/redirect"
       if defined? @requested
-        res = Net::HTTPOK.new nil, 200, nil
+        res = Gem::Net::HTTPOK.new nil, 200, nil
         def res.body
           "real_path"
         end
       else
         @requested = true
-        res = Net::HTTPMovedPermanently.new nil, 301, nil
+        res = Gem::Net::HTTPMovedPermanently.new nil, 301, nil
         res.add_field "Location", url
       end
       res
     end
 
-    data = fetcher.fetch_http URI.parse(url)
+    data = fetcher.fetch_http Gem::URI.parse(url)
 
     assert_equal "real_path", data
   end
@@ -683,13 +543,13 @@ def test_fetch_http_redirects
 
     def fetcher.request(uri, request_class, last_modified = nil)
       url = "http://gems.example.com/redirect"
-      res = Net::HTTPMovedPermanently.new nil, 301, nil
+      res = Gem::Net::HTTPMovedPermanently.new nil, 301, nil
       res.add_field "Location", url
       res
     end
 
     e = assert_raise Gem::RemoteFetcher::FetchError do
-      fetcher.fetch_http URI.parse(url)
+      fetcher.fetch_http Gem::URI.parse(url)
     end
 
     assert_equal "too many redirects (#{url})", e.message
@@ -701,265 +561,24 @@ def test_fetch_http_redirects_without_location
     url = "http://gems.example.com/redirect"
 
     def fetcher.request(uri, request_class, last_modified = nil)
-      res = Net::HTTPMovedPermanently.new nil, 301, nil
+      res = Gem::Net::HTTPMovedPermanently.new nil, 301, nil
       res
     end
 
     e = assert_raise Gem::RemoteFetcher::FetchError do
-      fetcher.fetch_http URI.parse(url)
+      fetcher.fetch_http Gem::URI.parse(url)
     end
 
     assert_equal "redirecting but no redirect location was given (#{url})", e.message
   end
 
-  def test_fetch_http_with_additional_headers
-    ENV["http_proxy"] = @proxy_uri
-    ENV["no_proxy"] = URI.parse(@server_uri).host
-    fetcher = Gem::RemoteFetcher.new nil, nil, { "X-Captain" => "murphy" }
-    @fetcher = fetcher
-    assert_equal "murphy", fetcher.fetch_path(@server_uri)
-  end
-
-  def assert_fetch_s3(url, signature, token=nil, region="us-east-1", instance_profile_json=nil)
-    fetcher = Gem::RemoteFetcher.new nil
-    @fetcher = fetcher
-    $fetched_uri = nil
-    $instance_profile = instance_profile_json
-
-    def fetcher.request(uri, request_class, last_modified = nil)
-      $fetched_uri = uri
-      res = Net::HTTPOK.new nil, 200, nil
-      def res.body
-        "success"
-      end
-      res
-    end
-
-    def fetcher.s3_uri_signer(uri)
-      require "json"
-      s3_uri_signer = Gem::S3URISigner.new(uri)
-      def s3_uri_signer.ec2_metadata_credentials_json
-        JSON.parse($instance_profile)
-      end
-      # Running sign operation to make sure uri.query is not mutated
-      s3_uri_signer.sign
-      raise "URI query is not empty: #{uri.query}" unless uri.query.nil?
-      s3_uri_signer
-    end
-
-    data = fetcher.fetch_s3 URI.parse(url)
-
-    assert_equal "https://my-bucket.s3.#{region}.amazonaws.com/gems/specs.4.8.gz?X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential=testuser%2F20190624%2F#{region}%2Fs3%2Faws4_request&X-Amz-Date=20190624T050641Z&X-Amz-Expires=86400#{token ? "&X-Amz-Security-Token=" + token : ""}&X-Amz-SignedHeaders=host&X-Amz-Signature=#{signature}", $fetched_uri.to_s
-    assert_equal "success", data
-  ensure
-    $fetched_uri = nil
-  end
-
-  def test_fetch_s3_config_creds
-    Gem.configuration[:s3_source] = {
-      "my-bucket" => { :id => "testuser", :secret => "testpass" },
-    }
-    url = "s3://my-bucket/gems/specs.4.8.gz"
-    Time.stub :now, Time.at(1_561_353_581) do
-      assert_fetch_s3 url, "20f974027db2f3cd6193565327a7c73457a138efb1a63ea248d185ce6827d41b"
-    end
-  ensure
-    Gem.configuration[:s3_source] = nil
-  end
-
-  def test_fetch_s3_config_creds_with_region
-    Gem.configuration[:s3_source] = {
-      "my-bucket" => { :id => "testuser", :secret => "testpass", :region => "us-west-2" },
-    }
-    url = "s3://my-bucket/gems/specs.4.8.gz"
-    Time.stub :now, Time.at(1_561_353_581) do
-      assert_fetch_s3 url, "4afc3010757f1fd143e769f1d1dabd406476a4fc7c120e9884fd02acbb8f26c9", nil, "us-west-2"
-    end
-  ensure
-    Gem.configuration[:s3_source] = nil
-  end
-
-  def test_fetch_s3_config_creds_with_token
-    Gem.configuration[:s3_source] = {
-      "my-bucket" => { :id => "testuser", :secret => "testpass", :security_token => "testtoken" },
-    }
-    url = "s3://my-bucket/gems/specs.4.8.gz"
-    Time.stub :now, Time.at(1_561_353_581) do
-      assert_fetch_s3 url, "935160a427ef97e7630f799232b8f208c4a4e49aad07d0540572a2ad5fe9f93c", "testtoken"
-    end
-  ensure
-    Gem.configuration[:s3_source] = nil
-  end
-
-  def test_fetch_s3_env_creds
-    ENV["AWS_ACCESS_KEY_ID"] = "testuser"
-    ENV["AWS_SECRET_ACCESS_KEY"] = "testpass"
-    ENV["AWS_SESSION_TOKEN"] = nil
-    Gem.configuration[:s3_source] = {
-      "my-bucket" => { :provider => "env" },
-    }
-    url = "s3://my-bucket/gems/specs.4.8.gz"
-    Time.stub :now, Time.at(1_561_353_581) do
-      assert_fetch_s3 url, "20f974027db2f3cd6193565327a7c73457a138efb1a63ea248d185ce6827d41b"
-    end
-  ensure
-    ENV.each_key {|key| ENV.delete(key) if key.start_with?("AWS") }
-    Gem.configuration[:s3_source] = nil
-  end
-
-  def test_fetch_s3_env_creds_with_region
-    ENV["AWS_ACCESS_KEY_ID"] = "testuser"
-    ENV["AWS_SECRET_ACCESS_KEY"] = "testpass"
-    ENV["AWS_SESSION_TOKEN"] = nil
-    Gem.configuration[:s3_source] = {
-      "my-bucket" => { :provider => "env", :region => "us-west-2" },
-    }
-    url = "s3://my-bucket/gems/specs.4.8.gz"
-    Time.stub :now, Time.at(1_561_353_581) do
-      assert_fetch_s3 url, "4afc3010757f1fd143e769f1d1dabd406476a4fc7c120e9884fd02acbb8f26c9", nil, "us-west-2"
-    end
-  ensure
-    ENV.each_key {|key| ENV.delete(key) if key.start_with?("AWS") }
-    Gem.configuration[:s3_source] = nil
-  end
-
-  def test_fetch_s3_env_creds_with_token
-    ENV["AWS_ACCESS_KEY_ID"] = "testuser"
-    ENV["AWS_SECRET_ACCESS_KEY"] = "testpass"
-    ENV["AWS_SESSION_TOKEN"] = "testtoken"
-    Gem.configuration[:s3_source] = {
-      "my-bucket" => { :provider => "env" },
-    }
-    url = "s3://my-bucket/gems/specs.4.8.gz"
-    Time.stub :now, Time.at(1_561_353_581) do
-      assert_fetch_s3 url, "935160a427ef97e7630f799232b8f208c4a4e49aad07d0540572a2ad5fe9f93c", "testtoken"
-    end
-  ensure
-    ENV.each_key {|key| ENV.delete(key) if key.start_with?("AWS") }
-    Gem.configuration[:s3_source] = nil
-  end
-
-  def test_fetch_s3_url_creds
-    url = "s3://testuser:testpass@my-bucket/gems/specs.4.8.gz"
-    Time.stub :now, Time.at(1_561_353_581) do
-      assert_fetch_s3 url, "20f974027db2f3cd6193565327a7c73457a138efb1a63ea248d185ce6827d41b"
-    end
-  end
-
-  def test_fetch_s3_instance_profile_creds
-    Gem.configuration[:s3_source] = {
-      "my-bucket" => { :provider => "instance_profile" },
-    }
-
-    url = "s3://my-bucket/gems/specs.4.8.gz"
-    Time.stub :now, Time.at(1_561_353_581) do
-      assert_fetch_s3 url, "20f974027db2f3cd6193565327a7c73457a138efb1a63ea248d185ce6827d41b", nil, "us-east-1",
-                      '{"AccessKeyId": "testuser", "SecretAccessKey": "testpass"}'
-    end
-  ensure
-    Gem.configuration[:s3_source] = nil
-  end
-
-  def test_fetch_s3_instance_profile_creds_with_region
-    Gem.configuration[:s3_source] = {
-      "my-bucket" => { :provider => "instance_profile", :region => "us-west-2" },
-    }
-
-    url = "s3://my-bucket/gems/specs.4.8.gz"
-    Time.stub :now, Time.at(1_561_353_581) do
-      assert_fetch_s3 url, "4afc3010757f1fd143e769f1d1dabd406476a4fc7c120e9884fd02acbb8f26c9", nil, "us-west-2",
-                      '{"AccessKeyId": "testuser", "SecretAccessKey": "testpass"}'
-    end
-  ensure
-    Gem.configuration[:s3_source] = nil
-  end
-
-  def test_fetch_s3_instance_profile_creds_with_token
-    Gem.configuration[:s3_source] = {
-      "my-bucket" => { :provider => "instance_profile" },
-    }
-
-    url = "s3://my-bucket/gems/specs.4.8.gz"
-    Time.stub :now, Time.at(1_561_353_581) do
-      assert_fetch_s3 url, "935160a427ef97e7630f799232b8f208c4a4e49aad07d0540572a2ad5fe9f93c", "testtoken", "us-east-1",
-                      '{"AccessKeyId": "testuser", "SecretAccessKey": "testpass", "Token": "testtoken"}'
-    end
-  ensure
-    Gem.configuration[:s3_source] = nil
-  end
-
-  def refute_fetch_s3(url, expected_message)
-    fetcher = Gem::RemoteFetcher.new nil
-    @fetcher = fetcher
-
-    e = assert_raise Gem::RemoteFetcher::FetchError do
-      fetcher.fetch_s3 URI.parse(url)
-    end
-
-    assert_match expected_message, e.message
-  end
-
-  def test_fetch_s3_no_source_key
-    url = "s3://my-bucket/gems/specs.4.8.gz"
-    refute_fetch_s3 url, "no s3_source key exists in .gemrc"
-  end
-
-  def test_fetch_s3_no_host
-    Gem.configuration[:s3_source] = {
-      "my-bucket" => { :id => "testuser", :secret => "testpass" },
-    }
-
-    url = "s3://other-bucket/gems/specs.4.8.gz"
-    refute_fetch_s3 url, "no key for host other-bucket in s3_source in .gemrc"
-  ensure
-    Gem.configuration[:s3_source] = nil
-  end
-
-  def test_fetch_s3_no_id
-    Gem.configuration[:s3_source] = { "my-bucket" => { :secret => "testpass" } }
-
-    url = "s3://my-bucket/gems/specs.4.8.gz"
-    refute_fetch_s3 url, "s3_source for my-bucket missing id or secret"
-  ensure
-    Gem.configuration[:s3_source] = nil
-  end
-
-  def test_fetch_s3_no_secret
-    Gem.configuration[:s3_source] = { "my-bucket" => { :id => "testuser" } }
-
-    url = "s3://my-bucket/gems/specs.4.8.gz"
-    refute_fetch_s3 url, "s3_source for my-bucket missing id or secret"
-  ensure
-    Gem.configuration[:s3_source] = nil
-  end
-
-  def test_observe_no_proxy_env_single_host
-    use_ui @stub_ui do
-      ENV["http_proxy"] = @proxy_uri
-      ENV["no_proxy"] = URI.parse(@server_uri).host
-      fetcher = Gem::RemoteFetcher.new nil
-      @fetcher = fetcher
-      assert_data_from_server fetcher.fetch_path(@server_uri)
-    end
-  end
-
-  def test_observe_no_proxy_env_list
-    use_ui @stub_ui do
-      ENV["http_proxy"] = @proxy_uri
-      ENV["no_proxy"] = "fakeurl.com, #{URI.parse(@server_uri).host}"
-      fetcher = Gem::RemoteFetcher.new nil
-      @fetcher = fetcher
-      assert_data_from_server fetcher.fetch_path(@server_uri)
-    end
-  end
-
   def test_request_block
     fetcher = Gem::RemoteFetcher.new nil
     @fetcher = fetcher
 
     assert_throws :block_called do
-      fetcher.request URI("http://example"), Net::HTTP::Get do |req|
-        assert_kind_of Net::HTTPGenericRequest, req
+      fetcher.request Gem::URI("http://example"), Gem::Net::HTTP::Get do |req|
+        assert_kind_of Gem::Net::HTTPGenericRequest, req
         throw :block_called
       end
     end
@@ -967,112 +586,12 @@ def test_request_block
 
   def test_yaml_error_on_size
     use_ui @stub_ui do
-      self.enable_yaml = false
       fetcher = Gem::RemoteFetcher.new nil
       @fetcher = fetcher
       assert_error { fetcher.size }
     end
   end
 
-  def test_ssl_connection
-    ssl_server = start_ssl_server
-    temp_ca_cert = File.join(__dir__, "ca_cert.pem")
-    with_configured_fetcher(":ssl_ca_cert: #{temp_ca_cert}") do |fetcher|
-      fetcher.fetch_path("https://localhost:#{ssl_server.config[:Port]}/yaml")
-    end
-  end
-
-  def test_ssl_client_cert_auth_connection
-    ssl_server = start_ssl_server(
-      { :SSLVerifyClient => OpenSSL::SSL::VERIFY_PEER | OpenSSL::SSL::VERIFY_FAIL_IF_NO_PEER_CERT }
-    )
-
-    temp_ca_cert = File.join(__dir__, "ca_cert.pem")
-    temp_client_cert = File.join(__dir__, "client.pem")
-
-    with_configured_fetcher(
-      ":ssl_ca_cert: #{temp_ca_cert}\n" \
-      ":ssl_client_cert: #{temp_client_cert}\n"
-    ) do |fetcher|
-      fetcher.fetch_path("https://localhost:#{ssl_server.config[:Port]}/yaml")
-    end
-  end
-
-  def test_do_not_allow_invalid_client_cert_auth_connection
-    ssl_server = start_ssl_server(
-      { :SSLVerifyClient => OpenSSL::SSL::VERIFY_PEER | OpenSSL::SSL::VERIFY_FAIL_IF_NO_PEER_CERT }
-    )
-
-    temp_ca_cert = File.join(__dir__, "ca_cert.pem")
-    temp_client_cert = File.join(__dir__, "invalid_client.pem")
-
-    with_configured_fetcher(
-      ":ssl_ca_cert: #{temp_ca_cert}\n" \
-      ":ssl_client_cert: #{temp_client_cert}\n"
-    ) do |fetcher|
-      assert_raise Gem::RemoteFetcher::FetchError do
-        fetcher.fetch_path("https://localhost:#{ssl_server.config[:Port]}/yaml")
-      end
-    end
-  end
-
-  def test_do_not_allow_insecure_ssl_connection_by_default
-    ssl_server = start_ssl_server
-    with_configured_fetcher do |fetcher|
-      assert_raise Gem::RemoteFetcher::FetchError do
-        fetcher.fetch_path("https://localhost:#{ssl_server.config[:Port]}/yaml")
-      end
-    end
-  end
-
-  def test_ssl_connection_allow_verify_none
-    ssl_server = start_ssl_server
-    with_configured_fetcher(":ssl_verify_mode: 0") do |fetcher|
-      fetcher.fetch_path("https://localhost:#{ssl_server.config[:Port]}/yaml")
-    end
-  end
-
-  def test_do_not_follow_insecure_redirect
-    ssl_server = start_ssl_server
-    temp_ca_cert = File.join(__dir__, "ca_cert.pem")
-    expected_error_message =
-      "redirecting to non-https resource: #{@server_uri} (https://localhost:#{ssl_server.config[:Port]}/insecure_redirect?to=#{@server_uri})"
-
-    with_configured_fetcher(":ssl_ca_cert: #{temp_ca_cert}") do |fetcher|
-      err = assert_raise Gem::RemoteFetcher::FetchError do
-        fetcher.fetch_path("https://localhost:#{ssl_server.config[:Port]}/insecure_redirect?to=#{@server_uri}")
-      end
-
-      assert_equal(err.message, expected_error_message)
-    end
-  end
-
-  def test_nil_ca_cert
-    ssl_server = start_ssl_server
-    temp_ca_cert = nil
-
-    with_configured_fetcher(":ssl_ca_cert: #{temp_ca_cert}") do |fetcher|
-      assert_raise Gem::RemoteFetcher::FetchError do
-        fetcher.fetch_path("https://localhost:#{ssl_server.config[:Port]}")
-      end
-    end
-  end
-
-  def with_configured_fetcher(config_str = nil, &block)
-    if config_str
-      temp_conf = File.join @tempdir, ".gemrc"
-      File.open temp_conf, "w" do |fp|
-        fp.puts config_str
-      end
-      Gem.configuration = Gem::ConfigFile.new %W[--config-file #{temp_conf}]
-    end
-    fetcher = Gem::RemoteFetcher.new
-    yield fetcher
-  ensure
-    fetcher.close_all
-    Gem.configuration = nil
-  end
-
   def assert_error(exception_class=Exception)
     got_exception = false
 
@@ -1084,153 +603,4 @@ def assert_error(exception_class=Exception)
 
     assert got_exception, "Expected exception conforming to #{exception_class}"
   end
-
-  def assert_data_from_server(data)
-    assert_match(/0\.4\.11/, data, "Data is not from server")
-  end
-
-  def assert_data_from_proxy(data)
-    assert_match(/0\.4\.2/, data, "Data is not from proxy")
-  end
-
-  class NilLog < WEBrick::Log
-    def log(level, data) # Do nothing
-    end
-  end
-
-  private
-
-  attr_reader :normal_server, :proxy_server
-  attr_accessor :enable_zip, :enable_yaml
-
-  def start_servers
-    @normal_server ||= start_server(SERVER_DATA)
-    @proxy_server  ||= start_server(PROXY_DATA)
-    @enable_yaml = true
-    @enable_zip = false
-    @ssl_server = nil
-    @ssl_server_thread = nil
-  end
-
-  def stop_servers
-    if @normal_server
-      @normal_server.kill.join
-      @normal_server = nil
-    end
-    if @proxy_server
-      @proxy_server.kill.join
-      @proxy_server = nil
-    end
-    if @ssl_server
-      @ssl_server.stop
-      @ssl_server = nil
-    end
-    if @ssl_server_thread
-      @ssl_server_thread.kill.join
-      @ssl_server_thread = nil
-    end
-    utils = WEBrick::Utils # TimeoutHandler is since 1.9
-    utils::TimeoutHandler.terminate if defined?(utils::TimeoutHandler.terminate)
-  end
-
-  def normal_server_port
-    @normal_server[:server].config[:Port]
-  end
-
-  def proxy_server_port
-    @proxy_server[:server].config[:Port]
-  end
-
-  def start_ssl_server(config = {})
-    pend "starting this test server fails randomly on jruby" if Gem.java_platform?
-
-    null_logger = NilLog.new
-    server = WEBrick::HTTPServer.new({
-      :Port => 0,
-      :Logger => null_logger,
-      :AccessLog => [],
-      :SSLEnable => true,
-      :SSLCACertificateFile => File.join(__dir__, "ca_cert.pem"),
-      :SSLCertificate => cert("ssl_cert.pem"),
-      :SSLPrivateKey => key("ssl_key.pem"),
-      :SSLVerifyClient => nil,
-      :SSLCertName => nil,
-    }.merge(config))
-    server.mount_proc("/yaml") do |_req, res|
-      res.body = "--- true\n"
-    end
-    server.mount_proc("/insecure_redirect") do |req, res|
-      res.set_redirect(WEBrick::HTTPStatus::MovedPermanently, req.query["to"])
-    end
-    server.ssl_context.tmp_dh_callback = proc { TEST_KEY_DH2048 }
-    t = Thread.new do
-      server.start
-    rescue StandardError => ex
-      puts "ERROR during server thread: #{ex.message}"
-      raise
-    ensure
-      server.shutdown
-    end
-    while server.status != :Running
-      sleep 0.1
-      unless t.alive?
-        t.join
-        raise
-      end
-    end
-    @ssl_server = server
-    @ssl_server_thread = t
-    server
-  end
-
-  def start_server(data)
-    null_logger = NilLog.new
-    s = WEBrick::HTTPServer.new(
-      :Port => 0,
-      :DocumentRoot => nil,
-      :Logger => null_logger,
-      :AccessLog => null_logger
-    )
-    s.mount_proc("/kill") {|_req, _res| s.shutdown }
-    s.mount_proc("/yaml") do |req, res|
-      if req["X-Captain"]
-        res.body = req["X-Captain"]
-      elsif @enable_yaml
-        res.body = data
-        res["Content-Type"] = "text/plain"
-        res["content-length"] = data.size
-      else
-        res.status = "404"
-        res.body = "<h1>NOT FOUND</h1>"
-        res["Content-Type"] = "text/html"
-      end
-    end
-    s.mount_proc("/yaml.Z") do |_req, res|
-      if @enable_zip
-        res.body = Zlib::Deflate.deflate(data)
-        res["Content-Type"] = "text/plain"
-      else
-        res.status = "404"
-        res.body = "<h1>NOT FOUND</h1>"
-        res["Content-Type"] = "text/html"
-      end
-    end
-    th = Thread.new do
-      s.start
-    rescue StandardError => ex
-      abort "ERROR during server thread: #{ex.message}"
-    ensure
-      s.shutdown
-    end
-    th[:server] = s
-    th
-  end
-
-  def cert(filename)
-    OpenSSL::X509::Certificate.new(File.read(File.join(__dir__, filename)))
-  end
-
-  def key(filename)
-    OpenSSL::PKey::RSA.new(File.read(File.join(__dir__, filename)))
-  end
-end if Gem::HAVE_OPENSSL
+end
diff --git a/test/rubygems/test_gem_remote_fetcher_local_server.rb b/test/rubygems/test_gem_remote_fetcher_local_server.rb
new file mode 100644
index 00000000000000..3d3e8b503b1a4b
--- /dev/null
+++ b/test/rubygems/test_gem_remote_fetcher_local_server.rb
@@ -0,0 +1,220 @@
+# frozen_string_literal: true
+
+require_relative "helper"
+
+require "socket"
+
+require "rubygems/remote_fetcher"
+require "rubygems/package"
+
+# = Testing Proxy Settings
+#
+# These tests check the proper proxy server settings by running two
+# web servers.  The web server at http://localhost:#{SERVER_PORT}
+# represents the normal gem server and returns a gemspec with a rake
+# version of 0.4.11.  The web server at http://localhost:#{PROXY_PORT}
+# represents the proxy server and returns a different dataset where
+# rake has version 0.4.2.  This allows us to detect which server is
+# returning the data.
+#
+# Note that the proxy server is not a *real* proxy server.  But our
+# software doesn't really care, as long as we hit the proxy URL when a
+# proxy is configured.
+
+class TestGemRemoteFetcherLocalServer < Gem::TestCase
+  include Gem::DefaultUserInteraction
+
+  SERVER_DATA = <<-EOY
+--- !ruby/object:Gem::Cache
+gems:
+  rake-0.4.11: !ruby/object:Gem::Specification
+    rubygems_version: "0.7"
+    specification_version: 1
+    name: rake
+    version: !ruby/object:Gem::Version
+      version: 0.4.11
+    date: 2004-11-12
+    summary: Ruby based make-like utility.
+    require_paths:
+      - lib
+    author: Jim Weirich
+    email: jim@weirichhouse.org
+    homepage: http://rake.rubyforge.org
+    description: Rake is a Make-like program implemented in Ruby. Tasks and dependencies are specified in standard Ruby syntax.
+    autorequire:
+    bindir: bin
+    has_rdoc: true
+    required_ruby_version: !ruby/object:Gem::Version::Requirement
+      requirements:
+        -
+          - ">"
+          - !ruby/object:Gem::Version
+            version: 0.0.0
+      version:
+    platform: ruby
+    files:
+      - README
+    test_files: []
+    library_stubs:
+    rdoc_options:
+    extra_rdoc_files:
+    executables:
+      - rake
+    extensions: []
+    requirements: []
+    dependencies: []
+  EOY
+
+  PROXY_DATA = SERVER_DATA.gsub(/0.4.11/, "0.4.2")
+
+  def setup
+    @proxies = %w[https_proxy http_proxy HTTP_PROXY http_proxy_user HTTP_PROXY_USER http_proxy_pass HTTP_PROXY_PASS no_proxy NO_PROXY]
+    @old_proxies = @proxies.map {|k| ENV[k] }
+    @proxies.each {|k| ENV[k] = nil }
+
+    super
+
+    @normal_server ||= start_server(SERVER_DATA)
+    @proxy_server  ||= start_server(PROXY_DATA)
+
+    @server_uri = "http://localhost:#{@normal_server[:server].addr[1]}" + "/yaml"
+    @proxy_uri = "http://localhost:#{@proxy_server[:server].addr[1]}"
+
+    Gem::RemoteFetcher.fetcher = nil
+    @stub_ui = Gem::MockGemUi.new
+    @fetcher = Gem::RemoteFetcher.fetcher
+  end
+
+  def teardown
+    @fetcher&.close_all
+
+    if @normal_server
+      @normal_server.kill.join
+      @normal_server[:server].close
+      @normal_server = nil
+    end
+    if @proxy_server
+      @proxy_server.kill.join
+      @proxy_server[:server].close
+      @proxy_server = nil
+    end
+
+    super
+    Gem.configuration[:http_proxy] = nil
+    @proxies.each_with_index {|k, i| ENV[k] = @old_proxies[i] }
+  end
+
+  def test_no_proxy
+    use_ui @stub_ui do
+      assert_data_from_server @fetcher.fetch_path(@server_uri)
+      response = @fetcher.fetch_path(@server_uri, nil, true)
+      assert_equal SERVER_DATA.size, response["content-length"].to_i
+    end
+  end
+
+  def test_implicit_no_proxy
+    use_ui @stub_ui do
+      ENV["http_proxy"] = "http://fakeurl:12345"
+      fetcher = Gem::RemoteFetcher.new :no_proxy
+      @fetcher = fetcher
+      assert_data_from_server fetcher.fetch_path(@server_uri)
+    end
+  end
+
+  def test_implicit_proxy
+    use_ui @stub_ui do
+      ENV["http_proxy"] = @proxy_uri
+      fetcher = Gem::RemoteFetcher.new nil
+      @fetcher = fetcher
+      assert_data_from_proxy fetcher.fetch_path(@server_uri)
+    end
+  end
+
+  def test_implicit_upper_case_proxy
+    use_ui @stub_ui do
+      ENV["HTTP_PROXY"] = @proxy_uri
+      fetcher = Gem::RemoteFetcher.new nil
+      @fetcher = fetcher
+      assert_data_from_proxy fetcher.fetch_path(@server_uri)
+    end
+  end
+
+  def test_implicit_proxy_no_env
+    use_ui @stub_ui do
+      fetcher = Gem::RemoteFetcher.new nil
+      @fetcher = fetcher
+      assert_data_from_server fetcher.fetch_path(@server_uri)
+    end
+  end
+
+  def test_fetch_http_with_additional_headers
+    ENV["http_proxy"] = @proxy_uri
+    ENV["no_proxy"] = Gem::URI.parse(@server_uri).host
+    fetcher = Gem::RemoteFetcher.new nil, nil, { "X-Captain" => "murphy" }
+    @fetcher = fetcher
+    assert_equal "murphy", fetcher.fetch_path(@server_uri)
+  end
+
+  def test_observe_no_proxy_env_single_host
+    use_ui @stub_ui do
+      ENV["http_proxy"] = @proxy_uri
+      ENV["no_proxy"] = Gem::URI.parse(@server_uri).host
+      fetcher = Gem::RemoteFetcher.new nil
+      @fetcher = fetcher
+      assert_data_from_server fetcher.fetch_path(@server_uri)
+    end
+  end
+
+  def test_observe_no_proxy_env_list
+    use_ui @stub_ui do
+      ENV["http_proxy"] = @proxy_uri
+      ENV["no_proxy"] = "fakeurl.com, #{Gem::URI.parse(@server_uri).host}"
+      fetcher = Gem::RemoteFetcher.new nil
+      @fetcher = fetcher
+      assert_data_from_server fetcher.fetch_path(@server_uri)
+    end
+  end
+
+  private
+
+  attr_reader :normal_server, :proxy_server
+
+  def assert_data_from_server(data)
+    assert_match(/0\.4\.11/, data, "Data is not from server")
+  end
+
+  def assert_data_from_proxy(data)
+    assert_match(/0\.4\.2/, data, "Data is not from proxy")
+  end
+
+  def start_server(data)
+    server = TCPServer.new("localhost", 0)
+    thread = Thread.new do
+      loop do
+        client = server.accept
+        handle_request(client, data)
+      end
+    end
+    thread[:server] = server
+    thread
+  end
+
+  def handle_request(client, data)
+    request_line = client.gets
+    headers = {}
+    while (line = client.gets) && line != "\r\n"
+      key, value = line.split(": ", 2)
+      headers[key] = value.strip
+    end
+
+    if request_line.start_with?("GET /yaml")
+      response = headers["X-Captain"] ? headers["X-Captain"] : data
+      client.print "HTTP/1.1 200 OK\r\nContent-Type: text/plain\r\nContent-Length: #{response.size}\r\n\r\n#{response}"
+    elsif request_line.start_with?("HEAD /yaml") || request_line.start_with?("GET http://") && request_line.include?("/yaml")
+      client.print "HTTP/1.1 200 OK\r\nContent-Type: text/plain\r\nContent-Length: #{data.size}\r\n\r\n#{data}"
+    else
+      client.print "HTTP/1.1 404 Not Found\r\nContent-Type: text/html\r\n\r\n<h1>NOT FOUND</h1>"
+    end
+    client.close
+  end
+end
diff --git a/test/rubygems/test_gem_remote_fetcher_local_ssl_server.rb b/test/rubygems/test_gem_remote_fetcher_local_ssl_server.rb
new file mode 100644
index 00000000000000..ad5be1a033b24f
--- /dev/null
+++ b/test/rubygems/test_gem_remote_fetcher_local_ssl_server.rb
@@ -0,0 +1,195 @@
+# frozen_string_literal: true
+
+require_relative "helper"
+require "socket"
+require "openssl"
+
+unless Gem::HAVE_OPENSSL
+  warn "Skipping Gem::RemoteFetcher tests.  openssl not found."
+end
+
+require "rubygems/remote_fetcher"
+require "rubygems/package"
+
+class TestGemRemoteFetcherLocalSSLServer < Gem::TestCase
+  include Gem::DefaultUserInteraction
+
+  # Generated via:
+  #   x = OpenSSL::PKey::DH.new(2048) # wait a while...
+  #   x.to_s => pem
+  TEST_KEY_DH2048 = OpenSSL::PKey::DH.new <<-_END_OF_PEM_
+-----BEGIN DH PARAMETERS-----
+MIIBCAKCAQEA3Ze2EHSfYkZLUn557torAmjBgPsqzbodaRaGZtgK1gEU+9nNJaFV
+G1JKhmGUiEDyIW7idsBpe4sX/Wqjnp48Lr8IeI/SlEzLdoGpf05iRYXC8Cm9o8aM
+cfmVgoSEAo9YLBpzoji2jHkO7Q5IPt4zxbTdlmmGFLc/GO9q7LGHhC+rcMcNTGsM
+49AnILNn49pq4Y72jSwdmvq4psHZwwFBbPwLdw6bLUDDCN90jfqvYt18muwUxDiN
+NP0fuvVAIB158VnQ0liHSwcl6+9vE1mL0Jo/qEXQxl0+UdKDjaGfTsn6HIrwTnmJ
+PeIQQkFng2VVot/WAQbv3ePqWq07g1BBcwIBAg==
+-----END DH PARAMETERS-----
+    _END_OF_PEM_
+
+  def setup
+    super
+    @ssl_server_thread = nil
+    @ssl_server = nil
+  end
+
+  def teardown
+    if @ssl_server_thread
+      @ssl_server_thread.kill.join
+      @ssl_server_thread = nil
+    end
+    if @ssl_server
+      @ssl_server.close
+      @ssl_server = nil
+    end
+    super
+  end
+
+  def test_ssl_connection
+    ssl_server = start_ssl_server
+    temp_ca_cert = File.join(__dir__, "ca_cert.pem")
+    with_configured_fetcher(":ssl_ca_cert: #{temp_ca_cert}") do |fetcher|
+      fetcher.fetch_path("https://localhost:#{ssl_server.addr[1]}/yaml")
+    end
+  end
+
+  def test_ssl_client_cert_auth_connection
+    ssl_server = start_ssl_server(
+      { verify_mode: OpenSSL::SSL::VERIFY_PEER | OpenSSL::SSL::VERIFY_FAIL_IF_NO_PEER_CERT }
+    )
+
+    temp_ca_cert = File.join(__dir__, "ca_cert.pem")
+    temp_client_cert = File.join(__dir__, "client.pem")
+
+    with_configured_fetcher(
+      ":ssl_ca_cert: #{temp_ca_cert}\n" \
+      ":ssl_client_cert: #{temp_client_cert}\n"
+    ) do |fetcher|
+      fetcher.fetch_path("https://localhost:#{ssl_server.addr[1]}/yaml")
+    end
+  end
+
+  def test_do_not_allow_invalid_client_cert_auth_connection
+    ssl_server = start_ssl_server(
+      { verify_mode: OpenSSL::SSL::VERIFY_PEER | OpenSSL::SSL::VERIFY_FAIL_IF_NO_PEER_CERT }
+    )
+
+    temp_ca_cert = File.join(__dir__, "ca_cert.pem")
+    temp_client_cert = File.join(__dir__, "invalid_client.pem")
+
+    with_configured_fetcher(
+      ":ssl_ca_cert: #{temp_ca_cert}\n" \
+      ":ssl_client_cert: #{temp_client_cert}\n"
+    ) do |fetcher|
+      assert_raise Gem::RemoteFetcher::FetchError do
+        fetcher.fetch_path("https://localhost:#{ssl_server.addr[1]}/yaml")
+      end
+    end
+  end
+
+  def test_do_not_allow_insecure_ssl_connection_by_default
+    ssl_server = start_ssl_server
+    with_configured_fetcher do |fetcher|
+      assert_raise Gem::RemoteFetcher::FetchError do
+        fetcher.fetch_path("https://localhost:#{ssl_server.addr[1]}/yaml")
+      end
+    end
+  end
+
+  def test_ssl_connection_allow_verify_none
+    ssl_server = start_ssl_server
+    with_configured_fetcher(":ssl_verify_mode: 0") do |fetcher|
+      fetcher.fetch_path("https://localhost:#{ssl_server.addr[1]}/yaml")
+    end
+  end
+
+  def test_do_not_follow_insecure_redirect
+    @server_uri = "http://example.com"
+    ssl_server = start_ssl_server
+    temp_ca_cert = File.join(__dir__, "ca_cert.pem")
+    expected_error_message =
+      "redirecting to non-https resource: #{@server_uri} (https://localhost:#{ssl_server.addr[1]}/insecure_redirect?to=#{@server_uri})"
+
+    with_configured_fetcher(":ssl_ca_cert: #{temp_ca_cert}") do |fetcher|
+      err = assert_raise Gem::RemoteFetcher::FetchError do
+        fetcher.fetch_path("https://localhost:#{ssl_server.addr[1]}/insecure_redirect?to=#{@server_uri}")
+      end
+
+      assert_equal(err.message, expected_error_message)
+    end
+  end
+
+  def test_nil_ca_cert
+    ssl_server = start_ssl_server
+    temp_ca_cert = nil
+
+    with_configured_fetcher(":ssl_ca_cert: #{temp_ca_cert}") do |fetcher|
+      assert_raise Gem::RemoteFetcher::FetchError do
+        fetcher.fetch_path("https://localhost:#{ssl_server.addr[1]}")
+      end
+    end
+  end
+
+  private
+
+  def with_configured_fetcher(config_str = nil, &block)
+    if config_str
+      temp_conf = File.join @tempdir, ".gemrc"
+      File.open temp_conf, "w" do |fp|
+        fp.puts config_str
+      end
+      Gem.configuration = Gem::ConfigFile.new %W[--config-file #{temp_conf}]
+    end
+    fetcher = Gem::RemoteFetcher.new
+    yield fetcher
+    sleep 0.5 unless RUBY_PLATFORM.match?(/mswin|mingw/)
+  ensure
+    fetcher.close_all
+    Gem.configuration = nil
+  end
+
+  def start_ssl_server(config = {})
+    server = TCPServer.new(0)
+    ctx = OpenSSL::SSL::SSLContext.new
+    ctx.cert = cert("ssl_cert.pem")
+    ctx.key = key("ssl_key.pem")
+    ctx.ca_file = File.join(__dir__, "ca_cert.pem")
+    ctx.tmp_dh_callback = proc { TEST_KEY_DH2048 }
+    ctx.verify_mode = config[:verify_mode] if config[:verify_mode]
+    @ssl_server = OpenSSL::SSL::SSLServer.new(server, ctx)
+    @ssl_server_thread = Thread.new do
+      loop do
+        ssl_client = @ssl_server.accept
+        Thread.new(ssl_client) do |client|
+          handle_request(client)
+        ensure
+          client.close
+        end
+      rescue OpenSSL::SSL::SSLError
+        # Ignore SSL errors because we're testing them implicitly
+      end
+    end
+    @ssl_server
+  end
+
+  def handle_request(client)
+    request = client.gets
+    if request.start_with?("GET /yaml")
+      client.print "HTTP/1.1 200 OK\r\nContent-Type: text/yaml\r\n\r\n--- true\n"
+    elsif request.start_with?("GET /insecure_redirect")
+      location = request.match(/to=([^ ]+)/)[1]
+      client.print "HTTP/1.1 301 Moved Permanently\r\nLocation: #{location}\r\n\r\n"
+    else
+      client.print "HTTP/1.1 404 Not Found\r\n\r\n"
+    end
+  end
+
+  def cert(filename)
+    OpenSSL::X509::Certificate.new(File.read(File.join(__dir__, filename)))
+  end
+
+  def key(filename)
+    OpenSSL::PKey::RSA.new(File.read(File.join(__dir__, filename)))
+  end
+end if Gem::HAVE_OPENSSL
diff --git a/test/rubygems/test_gem_remote_fetcher_s3.rb b/test/rubygems/test_gem_remote_fetcher_s3.rb
new file mode 100644
index 00000000000000..e3aaa7a691f0a4
--- /dev/null
+++ b/test/rubygems/test_gem_remote_fetcher_s3.rb
@@ -0,0 +1,253 @@
+# frozen_string_literal: true
+
+require_relative "helper"
+
+require "rubygems/remote_fetcher"
+require "rubygems/package"
+
+class TestGemRemoteFetcherS3 < Gem::TestCase
+  include Gem::DefaultUserInteraction
+
+  def setup
+    super
+
+    @a1, @a1_gem = util_gem "a", "1" do |s|
+      s.executables << "a_bin"
+    end
+
+    @a1.loaded_from = File.join(@gemhome, "specifications", @a1.full_name)
+  end
+
+  def assert_fetch_s3(url, signature, token=nil, region="us-east-1", instance_profile_json=nil, method="GET")
+    fetcher = Gem::RemoteFetcher.new nil
+    @fetcher = fetcher
+    $fetched_uri = nil
+    $instance_profile = instance_profile_json
+
+    def fetcher.request(uri, request_class, last_modified = nil)
+      $fetched_uri = uri
+      res = Gem::Net::HTTPOK.new nil, 200, nil
+      def res.body
+        "success"
+      end
+      res
+    end
+
+    def fetcher.s3_uri_signer(uri, method)
+      require "json"
+      s3_uri_signer = Gem::S3URISigner.new(uri, method)
+      def s3_uri_signer.ec2_metadata_credentials_json
+        JSON.parse($instance_profile)
+      end
+      # Running sign operation to make sure uri.query is not mutated
+      s3_uri_signer.sign
+      raise "URI query is not empty: #{uri.query}" unless uri.query.nil?
+      s3_uri_signer
+    end
+
+    res = fetcher.fetch_s3 Gem::URI.parse(url), nil, (method == "HEAD")
+
+    assert_equal "https://my-bucket.s3.#{region}.amazonaws.com/gems/specs.4.8.gz?X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential=testuser%2F20190624%2F#{region}%2Fs3%2Faws4_request&X-Amz-Date=20190624T051941Z&X-Amz-Expires=86400#{token ? "&X-Amz-Security-Token=" + token : ""}&X-Amz-SignedHeaders=host&X-Amz-Signature=#{signature}", $fetched_uri.to_s
+    if method == "HEAD"
+      assert_equal 200, res.code
+    else
+      assert_equal "success", res
+    end
+  ensure
+    $fetched_uri = nil
+  end
+
+  def test_fetch_s3_config_creds
+    Gem.configuration[:s3_source] = {
+      "my-bucket" => { id: "testuser", secret: "testpass" },
+    }
+    url = "s3://my-bucket/gems/specs.4.8.gz"
+    Time.stub :now, Time.at(1_561_353_581) do
+      assert_fetch_s3 url, "b5cb80c1301f7b1c50c4af54f1f6c034f80b56d32f000a855f0a903dc5a8413c"
+    end
+  ensure
+    Gem.configuration[:s3_source] = nil
+  end
+
+  def test_fetch_s3_head_request
+    Gem.configuration[:s3_source] = {
+      "my-bucket" => { id: "testuser", secret: "testpass" },
+    }
+    url = "s3://my-bucket/gems/specs.4.8.gz"
+    Time.stub :now, Time.at(1_561_353_581) do
+      token = nil
+      region = "us-east-1"
+      instance_profile_json = nil
+      method = "HEAD"
+      assert_fetch_s3 url, "a3c6cf9a2db62e85f4e57f8fc8ac8b5ff5c1fdd4aeef55935d05e05174d9c885", token, region, instance_profile_json, method
+    end
+  ensure
+    Gem.configuration[:s3_source] = nil
+  end
+
+  def test_fetch_s3_config_creds_with_region
+    Gem.configuration[:s3_source] = {
+      "my-bucket" => { id: "testuser", secret: "testpass", region: "us-west-2" },
+    }
+    url = "s3://my-bucket/gems/specs.4.8.gz"
+    Time.stub :now, Time.at(1_561_353_581) do
+      assert_fetch_s3 url, "ef07487bfd8e3ca594f8fc29775b70c0a0636f51318f95d4f12b2e6e1fd8c716", nil, "us-west-2"
+    end
+  ensure
+    Gem.configuration[:s3_source] = nil
+  end
+
+  def test_fetch_s3_config_creds_with_token
+    Gem.configuration[:s3_source] = {
+      "my-bucket" => { id: "testuser", secret: "testpass", security_token: "testtoken" },
+    }
+    url = "s3://my-bucket/gems/specs.4.8.gz"
+    Time.stub :now, Time.at(1_561_353_581) do
+      assert_fetch_s3 url, "e709338735f9077edf8f6b94b247171c266a9605975e08e4a519a123c3322625", "testtoken"
+    end
+  ensure
+    Gem.configuration[:s3_source] = nil
+  end
+
+  def test_fetch_s3_env_creds
+    ENV["AWS_ACCESS_KEY_ID"] = "testuser"
+    ENV["AWS_SECRET_ACCESS_KEY"] = "testpass"
+    ENV["AWS_SESSION_TOKEN"] = nil
+    Gem.configuration[:s3_source] = {
+      "my-bucket" => { provider: "env" },
+    }
+    url = "s3://my-bucket/gems/specs.4.8.gz"
+    Time.stub :now, Time.at(1_561_353_581) do
+      assert_fetch_s3 url, "b5cb80c1301f7b1c50c4af54f1f6c034f80b56d32f000a855f0a903dc5a8413c"
+    end
+  ensure
+    ENV.each_key {|key| ENV.delete(key) if key.start_with?("AWS") }
+    Gem.configuration[:s3_source] = nil
+  end
+
+  def test_fetch_s3_env_creds_with_region
+    ENV["AWS_ACCESS_KEY_ID"] = "testuser"
+    ENV["AWS_SECRET_ACCESS_KEY"] = "testpass"
+    ENV["AWS_SESSION_TOKEN"] = nil
+    Gem.configuration[:s3_source] = {
+      "my-bucket" => { provider: "env", region: "us-west-2" },
+    }
+    url = "s3://my-bucket/gems/specs.4.8.gz"
+    Time.stub :now, Time.at(1_561_353_581) do
+      assert_fetch_s3 url, "ef07487bfd8e3ca594f8fc29775b70c0a0636f51318f95d4f12b2e6e1fd8c716", nil, "us-west-2"
+    end
+  ensure
+    ENV.each_key {|key| ENV.delete(key) if key.start_with?("AWS") }
+    Gem.configuration[:s3_source] = nil
+  end
+
+  def test_fetch_s3_env_creds_with_token
+    ENV["AWS_ACCESS_KEY_ID"] = "testuser"
+    ENV["AWS_SECRET_ACCESS_KEY"] = "testpass"
+    ENV["AWS_SESSION_TOKEN"] = "testtoken"
+    Gem.configuration[:s3_source] = {
+      "my-bucket" => { provider: "env" },
+    }
+    url = "s3://my-bucket/gems/specs.4.8.gz"
+    Time.stub :now, Time.at(1_561_353_581) do
+      assert_fetch_s3 url, "e709338735f9077edf8f6b94b247171c266a9605975e08e4a519a123c3322625", "testtoken"
+    end
+  ensure
+    ENV.each_key {|key| ENV.delete(key) if key.start_with?("AWS") }
+    Gem.configuration[:s3_source] = nil
+  end
+
+  def test_fetch_s3_url_creds
+    url = "s3://testuser:testpass@my-bucket/gems/specs.4.8.gz"
+    Time.stub :now, Time.at(1_561_353_581) do
+      assert_fetch_s3 url, "b5cb80c1301f7b1c50c4af54f1f6c034f80b56d32f000a855f0a903dc5a8413c"
+    end
+  end
+
+  def test_fetch_s3_instance_profile_creds
+    Gem.configuration[:s3_source] = {
+      "my-bucket" => { provider: "instance_profile" },
+    }
+
+    url = "s3://my-bucket/gems/specs.4.8.gz"
+    Time.stub :now, Time.at(1_561_353_581) do
+      assert_fetch_s3 url, "b5cb80c1301f7b1c50c4af54f1f6c034f80b56d32f000a855f0a903dc5a8413c", nil, "us-east-1",
+                      '{"AccessKeyId": "testuser", "SecretAccessKey": "testpass"}'
+    end
+  ensure
+    Gem.configuration[:s3_source] = nil
+  end
+
+  def test_fetch_s3_instance_profile_creds_with_region
+    Gem.configuration[:s3_source] = {
+      "my-bucket" => { provider: "instance_profile", region: "us-west-2" },
+    }
+
+    url = "s3://my-bucket/gems/specs.4.8.gz"
+    Time.stub :now, Time.at(1_561_353_581) do
+      assert_fetch_s3 url, "ef07487bfd8e3ca594f8fc29775b70c0a0636f51318f95d4f12b2e6e1fd8c716", nil, "us-west-2",
+                      '{"AccessKeyId": "testuser", "SecretAccessKey": "testpass"}'
+    end
+  ensure
+    Gem.configuration[:s3_source] = nil
+  end
+
+  def test_fetch_s3_instance_profile_creds_with_token
+    Gem.configuration[:s3_source] = {
+      "my-bucket" => { provider: "instance_profile" },
+    }
+
+    url = "s3://my-bucket/gems/specs.4.8.gz"
+    Time.stub :now, Time.at(1_561_353_581) do
+      assert_fetch_s3 url, "e709338735f9077edf8f6b94b247171c266a9605975e08e4a519a123c3322625", "testtoken", "us-east-1",
+                      '{"AccessKeyId": "testuser", "SecretAccessKey": "testpass", "Token": "testtoken"}'
+    end
+  ensure
+    Gem.configuration[:s3_source] = nil
+  end
+
+  def refute_fetch_s3(url, expected_message)
+    fetcher = Gem::RemoteFetcher.new nil
+    @fetcher = fetcher
+
+    e = assert_raise Gem::RemoteFetcher::FetchError do
+      fetcher.fetch_s3 Gem::URI.parse(url)
+    end
+
+    assert_match expected_message, e.message
+  end
+
+  def test_fetch_s3_no_source_key
+    url = "s3://my-bucket/gems/specs.4.8.gz"
+    refute_fetch_s3 url, "no s3_source key exists in .gemrc"
+  end
+
+  def test_fetch_s3_no_host
+    Gem.configuration[:s3_source] = {
+      "my-bucket" => { id: "testuser", secret: "testpass" },
+    }
+
+    url = "s3://other-bucket/gems/specs.4.8.gz"
+    refute_fetch_s3 url, "no key for host other-bucket in s3_source in .gemrc"
+  ensure
+    Gem.configuration[:s3_source] = nil
+  end
+
+  def test_fetch_s3_no_id
+    Gem.configuration[:s3_source] = { "my-bucket" => { secret: "testpass" } }
+
+    url = "s3://my-bucket/gems/specs.4.8.gz"
+    refute_fetch_s3 url, "s3_source for my-bucket missing id or secret"
+  ensure
+    Gem.configuration[:s3_source] = nil
+  end
+
+  def test_fetch_s3_no_secret
+    Gem.configuration[:s3_source] = { "my-bucket" => { id: "testuser" } }
+
+    url = "s3://my-bucket/gems/specs.4.8.gz"
+    refute_fetch_s3 url, "s3_source for my-bucket missing id or secret"
+  ensure
+    Gem.configuration[:s3_source] = nil
+  end
+end
diff --git a/test/rubygems/test_gem_request.rb b/test/rubygems/test_gem_request.rb
index cfaa1cecbba069..eb15eed749ebf5 100644
--- a/test/rubygems/test_gem_request.rb
+++ b/test/rubygems/test_gem_request.rb
@@ -2,7 +2,6 @@
 
 require_relative "helper"
 require "rubygems/request"
-require "ostruct"
 
 unless Gem::HAVE_OPENSSL
   warn "Skipping Gem::Request tests.  openssl not found."
@@ -34,7 +33,7 @@ def setup
     super
 
     @proxy_uri = "http://localhost:1234"
-    @uri = URI("http://example")
+    @uri = Gem::URI("http://example")
 
     @request = make_request @uri, nil, nil, nil
   end
@@ -56,7 +55,7 @@ def test_initialize_proxy
   def test_initialize_proxy_URI
     proxy_uri = "http://proxy.example.com"
 
-    request = make_request @uri, nil, nil, URI(proxy_uri)
+    request = make_request @uri, nil, nil, Gem::URI(proxy_uri)
 
     assert_equal proxy_uri, request.proxy_uri.to_s
   end
@@ -77,18 +76,18 @@ def test_initialize_proxy_ENV
   def test_initialize_proxy_ENV_https
     ENV["https_proxy"] = @proxy_uri
 
-    request = make_request URI("https://example"), nil, nil, nil
+    request = make_request Gem::URI("https://example"), nil, nil, nil
 
     proxy = request.proxy_uri
 
-    assert_equal URI(@proxy_uri), proxy
+    assert_equal Gem::URI(@proxy_uri), proxy
   end
 
   def test_proxy_ENV
     ENV["http_proxy"] = "http://proxy"
     ENV["https_proxy"] = ""
 
-    request = make_request URI("https://example"), nil, nil, nil
+    request = make_request Gem::URI("https://example"), nil, nil, nil
 
     proxy = request.proxy_uri
 
@@ -96,13 +95,13 @@ def test_proxy_ENV
   end
 
   def test_configure_connection_for_https
-    connection = Net::HTTP.new "localhost", 443
+    connection = Gem::Net::HTTP.new "localhost", 443
 
     request = Class.new(Gem::Request) do
       def self.get_cert_files
         [TestGemRequest::PUBLIC_CERT_FILE]
       end
-    end.create_with_proxy URI("https://example"), nil, nil, nil
+    end.create_with_proxy Gem::URI("https://example"), nil, nil, nil
 
     Gem::Request.configure_connection_for_https connection, request.cert_files
 
@@ -115,13 +114,13 @@ def test_configure_connection_for_https_ssl_ca_cert
     ssl_ca_cert = Gem.configuration.ssl_ca_cert
     Gem.configuration.ssl_ca_cert = CA_CERT_FILE
 
-    connection = Net::HTTP.new "localhost", 443
+    connection = Gem::Net::HTTP.new "localhost", 443
 
     request = Class.new(Gem::Request) do
       def self.get_cert_files
         [TestGemRequest::PUBLIC_CERT_FILE]
       end
-    end.create_with_proxy URI("https://example"), nil, nil, nil
+    end.create_with_proxy Gem::URI("https://example"), nil, nil, nil
 
     Gem::Request.configure_connection_for_https connection, request.cert_files
 
@@ -138,17 +137,17 @@ def test_get_proxy_from_env_fallback
     request = make_request @uri, nil, nil, nil
     proxy = request.proxy_uri
 
-    assert_equal URI(@proxy_uri), proxy
+    assert_equal Gem::URI(@proxy_uri), proxy
   end
 
   def test_get_proxy_from_env_https
     ENV["https_proxy"] = @proxy_uri
-    uri = URI("https://example")
+    uri = Gem::URI("https://example")
     request = make_request uri, nil, nil, nil
 
     proxy = request.proxy_uri
 
-    assert_equal URI(@proxy_uri), proxy
+    assert_equal Gem::URI(@proxy_uri), proxy
   end
 
   def test_get_proxy_from_env_domain
@@ -191,9 +190,9 @@ def test_get_proxy_from_env_empty
   end
 
   def test_fetch
-    uri = Gem::Uri.new(URI.parse("#{@gem_repo}/specs.#{Gem.marshal_version}"))
-    response = util_stub_net_http(:body => :junk, :code => 200) do
-      @request = make_request(uri, Net::HTTP::Get, nil, nil)
+    uri = Gem::Uri.new(Gem::URI.parse("#{@gem_repo}/specs.#{Gem.marshal_version}"))
+    response = util_stub_net_http(body: :junk, code: 200) do
+      @request = make_request(uri, Gem::Net::HTTP::Get, nil, nil)
 
       @request.fetch
     end
@@ -204,10 +203,10 @@ def test_fetch
 
   def test_fetch_basic_auth
     Gem.configuration.verbose = :really
-    uri = Gem::Uri.new(URI.parse("https://user:pass@example.rubygems/specs.#{Gem.marshal_version}"))
-    conn = util_stub_net_http(:body => :junk, :code => 200) do |c|
+    uri = Gem::Uri.new(Gem::URI.parse("https://user:pass@example.rubygems/specs.#{Gem.marshal_version}"))
+    conn = util_stub_net_http(body: :junk, code: 200) do |c|
       use_ui @ui do
-        @request = make_request(uri, Net::HTTP::Get, nil, nil)
+        @request = make_request(uri, Gem::Net::HTTP::Get, nil, nil)
         @request.fetch
       end
       c
@@ -220,11 +219,11 @@ def test_fetch_basic_auth
 
   def test_fetch_basic_auth_encoded
     Gem.configuration.verbose = :really
-    uri = Gem::Uri.new(URI.parse("https://user:%7BDEScede%7Dpass@example.rubygems/specs.#{Gem.marshal_version}"))
+    uri = Gem::Uri.new(Gem::URI.parse("https://user:%7BDEScede%7Dpass@example.rubygems/specs.#{Gem.marshal_version}"))
 
-    conn = util_stub_net_http(:body => :junk, :code => 200) do |c|
+    conn = util_stub_net_http(body: :junk, code: 200) do |c|
       use_ui @ui do
-        @request = make_request(uri, Net::HTTP::Get, nil, nil)
+        @request = make_request(uri, Gem::Net::HTTP::Get, nil, nil)
         @request.fetch
       end
       c
@@ -237,11 +236,11 @@ def test_fetch_basic_auth_encoded
 
   def test_fetch_basic_oauth_encoded
     Gem.configuration.verbose = :really
-    uri = Gem::Uri.new(URI.parse("https://%7BDEScede%7Dpass:x-oauth-basic@example.rubygems/specs.#{Gem.marshal_version}"))
+    uri = Gem::Uri.new(Gem::URI.parse("https://%7BDEScede%7Dpass:x-oauth-basic@example.rubygems/specs.#{Gem.marshal_version}"))
 
-    conn = util_stub_net_http(:body => :junk, :code => 200) do |c|
+    conn = util_stub_net_http(body: :junk, code: 200) do |c|
       use_ui @ui do
-        @request = make_request(uri, Net::HTTP::Get, nil, nil)
+        @request = make_request(uri, Gem::Net::HTTP::Get, nil, nil)
         @request.fetch
       end
       c
@@ -253,9 +252,9 @@ def test_fetch_basic_oauth_encoded
   end
 
   def test_fetch_head
-    uri = Gem::Uri.new(URI.parse("#{@gem_repo}/specs.#{Gem.marshal_version}"))
-    response = util_stub_net_http(:body => "", :code => 200) do |_conn|
-      @request = make_request(uri, Net::HTTP::Get, nil, nil)
+    uri = Gem::Uri.new(Gem::URI.parse("#{@gem_repo}/specs.#{Gem.marshal_version}"))
+    response = util_stub_net_http(body: "", code: 200) do |_conn|
+      @request = make_request(uri, Gem::Net::HTTP::Get, nil, nil)
       @request.fetch
     end
 
@@ -264,10 +263,10 @@ def test_fetch_head
   end
 
   def test_fetch_unmodified
-    uri = Gem::Uri.new(URI.parse("#{@gem_repo}/specs.#{Gem.marshal_version}"))
+    uri = Gem::Uri.new(Gem::URI.parse("#{@gem_repo}/specs.#{Gem.marshal_version}"))
     t = Time.utc(2013, 1, 2, 3, 4, 5)
-    conn, response = util_stub_net_http(:body => "", :code => 304) do |c|
-      @request = make_request(uri, Net::HTTP::Get, t, nil)
+    conn, response = util_stub_net_http(body: "", code: 304) do |c|
+      @request = make_request(uri, Gem::Net::HTTP::Get, t, nil)
       [c, @request.fetch]
     end
 
@@ -501,13 +500,22 @@ def util_save_version
 
   def util_stub_net_http(hash)
     old_client = Gem::Request::ConnectionPools.client
-    conn = Conn.new OpenStruct.new(hash)
+    conn = Conn.new Response.new(hash)
     Gem::Request::ConnectionPools.client = conn
     yield conn
   ensure
     Gem::Request::ConnectionPools.client = old_client
   end
 
+  class Response
+    attr_reader :code, :body, :message
+
+    def initialize(hash)
+      @code = hash[:code]
+      @body = hash[:body]
+    end
+  end
+
   class Conn
     attr_accessor :payload
 
diff --git a/test/rubygems/test_gem_request_connection_pools.rb b/test/rubygems/test_gem_request_connection_pools.rb
index a3d9b79f35d452..966447bff64192 100644
--- a/test/rubygems/test_gem_request_connection_pools.rb
+++ b/test/rubygems/test_gem_request_connection_pools.rb
@@ -2,7 +2,7 @@
 
 require_relative "helper"
 require "rubygems/request"
-require "timeout"
+require "rubygems/vendored_timeout"
 
 class TestGemRequestConnectionPool < Gem::TestCase
   class FakeHttp
@@ -18,7 +18,7 @@ def setup
     @old_client = Gem::Request::ConnectionPools.client
     Gem::Request::ConnectionPools.client = FakeHttp
 
-    @proxy = URI "http://proxy.example"
+    @proxy = Gem::URI "http://proxy.example"
   end
 
   def teardown
@@ -49,7 +49,7 @@ def test_to_proxy_empty_string
   end
 
   def test_checkout_same_connection
-    uri = URI.parse("http://example/some_endpoint")
+    uri = Gem::URI.parse("http://example/some_endpoint")
 
     pools = Gem::Request::ConnectionPools.new nil, []
     pool = pools.pool_for uri
@@ -99,7 +99,7 @@ def test_to_proxy_eh_wildcard
   def test_net_http_args
     pools = Gem::Request::ConnectionPools.new nil, []
 
-    net_http_args = pools.send :net_http_args, URI("http://example"), nil
+    net_http_args = pools.send :net_http_args, Gem::URI("http://example"), nil
 
     assert_equal ["example", 80], net_http_args
   end
@@ -107,7 +107,7 @@ def test_net_http_args
   def test_net_http_args_ipv6
     pools = Gem::Request::ConnectionPools.new nil, []
 
-    net_http_args = pools.send :net_http_args, URI("http://[::1]"), nil
+    net_http_args = pools.send :net_http_args, Gem::URI("http://[::1]"), nil
 
     assert_equal ["::1", 80], net_http_args
   end
@@ -115,7 +115,7 @@ def test_net_http_args_ipv6
   def test_net_http_args_proxy
     pools = Gem::Request::ConnectionPools.new nil, []
 
-    net_http_args = pools.send :net_http_args, URI("http://example"), @proxy
+    net_http_args = pools.send :net_http_args, Gem::URI("http://example"), @proxy
 
     assert_equal ["example", 80, "proxy.example", 80, nil, nil], net_http_args
   end
@@ -126,7 +126,7 @@ def test_net_http_args_no_proxy
 
     pools = Gem::Request::ConnectionPools.new nil, []
 
-    net_http_args = pools.send :net_http_args, URI("http://example"), @proxy
+    net_http_args = pools.send :net_http_args, Gem::URI("http://example"), @proxy
 
     assert_equal ["example", 80, nil, nil], net_http_args
   ensure
@@ -134,15 +134,15 @@ def test_net_http_args_no_proxy
   end
 
   def test_thread_waits_for_connection
-    uri = URI.parse("http://example/some_endpoint")
+    uri = Gem::URI.parse("http://example/some_endpoint")
     pools = Gem::Request::ConnectionPools.new nil, []
     pool  = pools.pool_for uri
 
     pool.checkout
 
     Thread.new do
-      assert_raise(Timeout::Error) do
-        Timeout.timeout(1) do
+      assert_raise(Gem::Timeout::Error) do
+        Gem::Timeout.timeout(1) do
           pool.checkout
         end
       end
diff --git a/test/rubygems/test_gem_request_set.rb b/test/rubygems/test_gem_request_set.rb
index c8197676da8b34..9aa244892c6953 100644
--- a/test/rubygems/test_gem_request_set.rb
+++ b/test/rubygems/test_gem_request_set.rb
@@ -55,7 +55,7 @@ def test_install_from_gemdeps
       io.puts 'gem "a"'
       io.flush
 
-      result = rs.install_from_gemdeps :gemdeps => io.path do |req, _installer|
+      result = rs.install_from_gemdeps gemdeps: io.path do |req, _installer|
         installed << req.full_name
       end
 
@@ -87,7 +87,7 @@ def test_install_from_gemdeps_explain
       EXPECTED
 
       actual, _ = capture_output do
-        rs.install_from_gemdeps :gemdeps => io.path, :explain => true
+        rs.install_from_gemdeps gemdeps: io.path, explain: true
       end
       assert_equal(expected, actual)
     end
@@ -109,8 +109,8 @@ def test_install_from_gemdeps_install_dir
     end
 
     options = {
-      :gemdeps => "gem.deps.rb",
-      :install_dir => "#{@gemhome}2",
+      gemdeps: "gem.deps.rb",
+      install_dir: "#{@gemhome}2",
     }
 
     rs.install_from_gemdeps options do |req, _installer|
@@ -133,7 +133,7 @@ def test_install_from_gemdeps_local
       io.flush
 
       assert_raise Gem::UnsatisfiableDependencyError do
-        rs.install_from_gemdeps :gemdeps => io.path, :domain => :local
+        rs.install_from_gemdeps gemdeps: io.path, domain: :local
       end
     end
 
@@ -171,7 +171,7 @@ def test_install_from_gemdeps_lockfile
       io.puts 'gem "b"'
     end
 
-    rs.install_from_gemdeps :gemdeps => "gem.deps.rb" do |req, _installer|
+    rs.install_from_gemdeps gemdeps: "gem.deps.rb" do |req, _installer|
       installed << req.full_name
     end
 
@@ -225,7 +225,7 @@ def test_install_from_gemdeps_complex_dependencies
       io.puts("gemspec")
     end
 
-    rs.install_from_gemdeps :gemdeps => "Gemfile" do |req, _installer|
+    rs.install_from_gemdeps gemdeps: "Gemfile" do |req, _installer|
       installed << req.full_name
     end
 
@@ -250,7 +250,7 @@ def test_install_from_gemdeps_version_mismatch
 
       io.flush
 
-      rs.install_from_gemdeps :gemdeps => io.path do |req, _installer|
+      rs.install_from_gemdeps gemdeps: io.path do |req, _installer|
         installed << req.full_name
       end
     end
@@ -574,8 +574,8 @@ def test_install_into_development_shallow
     rs.resolve
 
     options = {
-      :development => true,
-      :development_shallow => true,
+      development: true,
+      development_shallow: true,
     }
 
     installed = rs.install_into @tempdir, true, options do
diff --git a/test/rubygems/test_gem_request_set_gem_dependency_api.rb b/test/rubygems/test_gem_request_set_gem_dependency_api.rb
index 876d695c4ef400..4b5eaa38eda8ef 100644
--- a/test/rubygems/test_gem_request_set_gem_dependency_api.rb
+++ b/test/rubygems/test_gem_request_set_gem_dependency_api.rb
@@ -44,7 +44,7 @@ def with_engine_version(name, version)
 
   def test_gempspec_with_multiple_runtime_deps
     save_gemspec "foo", "1.0" do |s|
-      s.add_runtime_dependency "bar", ">= 1.6.0", "< 1.6.4"
+      s.add_dependency "bar", ">= 1.6.0", "< 1.6.4"
     end
     @gda.gemspec
     assert_equal %w[foo bar].sort, @set.dependencies.map(&:name).sort
@@ -90,7 +90,7 @@ def test_gem_duplicate
   end
 
   def test_gem_git
-    @gda.gem "a", :git => "git/a"
+    @gda.gem "a", git: "git/a"
 
     assert_equal [dep("a")], @set.dependencies
 
@@ -102,7 +102,7 @@ def test_gem_git
   end
 
   def test_gem_bitbucket
-    @gda.gem "a", :bitbucket => "example/repository"
+    @gda.gem "a", bitbucket: "example/repository"
 
     assert_equal [dep("a")], @set.dependencies
 
@@ -115,7 +115,7 @@ def test_gem_bitbucket
   end
 
   def test_gem_bitbucket_expand_path
-    @gda.gem "a", :bitbucket => "example"
+    @gda.gem "a", bitbucket: "example"
 
     assert_equal [dep("a")], @set.dependencies
 
@@ -129,7 +129,7 @@ def test_gem_bitbucket_expand_path
 
   def test_gem_git_branch
     _, err = capture_output do
-      @gda.gem "a", :git => "git/a", :branch => "other", :tag => "v1"
+      @gda.gem "a", git: "git/a", branch: "other", tag: "v1"
     end
     expected = "Gem dependencies file gem.deps.rb includes git reference for both ref/branch and tag but only ref/branch is used."
     assert_match expected, err
@@ -140,7 +140,7 @@ def test_gem_git_branch
   end
 
   def test_gem_git_gist
-    @gda.gem "a", :gist => "a"
+    @gda.gem "a", gist: "a"
 
     assert_equal [dep("a")], @set.dependencies
 
@@ -150,7 +150,7 @@ def test_gem_git_gist
 
   def test_gem_git_ref
     _, err = capture_output do
-      @gda.gem "a", :git => "git/a", :ref => "abcd123", :branch => "other"
+      @gda.gem "a", git: "git/a", ref: "abcd123", branch: "other"
     end
     expected = "Gem dependencies file gem.deps.rb includes git reference for both ref and branch but only ref is used."
     assert_match expected, err
@@ -161,7 +161,7 @@ def test_gem_git_ref
   end
 
   def test_gem_git_submodules
-    @gda.gem "a", :git => "git/a", :submodules => true
+    @gda.gem "a", git: "git/a", submodules: true
 
     assert_equal [dep("a")], @set.dependencies
 
@@ -170,7 +170,7 @@ def test_gem_git_submodules
   end
 
   def test_gem_git_tag
-    @gda.gem "a", :git => "git/a", :tag => "v1"
+    @gda.gem "a", git: "git/a", tag: "v1"
 
     assert_equal [dep("a")], @set.dependencies
 
@@ -178,7 +178,7 @@ def test_gem_git_tag
   end
 
   def test_gem_github
-    @gda.gem "a", :github => "example/repository"
+    @gda.gem "a", github: "example/repository"
 
     assert_equal [dep("a")], @set.dependencies
 
@@ -191,7 +191,7 @@ def test_gem_github
   end
 
   def test_gem_github_expand_path
-    @gda.gem "a", :github => "example"
+    @gda.gem "a", github: "example"
 
     assert_equal [dep("a")], @set.dependencies
 
@@ -204,7 +204,7 @@ def test_gem_github_expand_path
   end
 
   def test_gem_group
-    @gda.gem "a", :group => :test
+    @gda.gem "a", group: :test
 
     assert_equal [dep("a")], @set.dependencies
   end
@@ -212,7 +212,7 @@ def test_gem_group
   def test_gem_group_without
     @gda.without_groups << :test
 
-    @gda.gem "a", :group => :test
+    @gda.gem "a", group: :test
 
     assert_empty @set.dependencies
 
@@ -222,7 +222,7 @@ def test_gem_group_without
   end
 
   def test_gem_groups
-    @gda.gem "a", :groups => [:test, :development]
+    @gda.gem "a", groups: [:test, :development]
 
     assert_equal [dep("a")], @set.dependencies
   end
@@ -230,7 +230,7 @@ def test_gem_groups
   def test_gem_path
     name, version, directory = vendor_gem
 
-    @gda.gem name, :path => directory
+    @gda.gem name, path: directory
 
     assert_equal [dep(name)], @set.dependencies
 
@@ -248,7 +248,7 @@ def test_gem_platforms
     Gem.win_platform = false
 
     with_engine_version "ruby", "2.0.0" do
-      @gda.gem "a", :platforms => :ruby
+      @gda.gem "a", platforms: :ruby
 
       refute_empty @set.dependencies
     end
@@ -263,7 +263,7 @@ def test_gem_platforms_bundler_ruby
     with_engine_version "ruby", "2.0.0" do
       set = Gem::RequestSet.new
       gda = Gem::RequestSet::GemDependencyAPI.new set, "gem.deps.rb"
-      gda.gem "a", :platforms => :ruby
+      gda.gem "a", platforms: :ruby
 
       refute_empty set.dependencies
     end
@@ -271,7 +271,7 @@ def test_gem_platforms_bundler_ruby
     with_engine_version "rbx", "2.0.0" do
       set = Gem::RequestSet.new
       gda = Gem::RequestSet::GemDependencyAPI.new set, "gem.deps.rb"
-      gda.gem "a", :platforms => :ruby
+      gda.gem "a", platforms: :ruby
 
       refute_empty set.dependencies
     end
@@ -279,7 +279,7 @@ def test_gem_platforms_bundler_ruby
     with_engine_version "truffleruby", "2.0.0" do
       set = Gem::RequestSet.new
       gda = Gem::RequestSet::GemDependencyAPI.new set, "gem.deps.rb"
-      gda.gem "a", :platforms => :ruby
+      gda.gem "a", platforms: :ruby
 
       refute_empty set.dependencies
     end
@@ -287,7 +287,7 @@ def test_gem_platforms_bundler_ruby
     with_engine_version "jruby", "1.7.6" do
       set = Gem::RequestSet.new
       gda = Gem::RequestSet::GemDependencyAPI.new set, "gem.deps.rb"
-      gda.gem "a", :platforms => :ruby
+      gda.gem "a", platforms: :ruby
 
       assert_empty set.dependencies
     end
@@ -297,7 +297,7 @@ def test_gem_platforms_bundler_ruby
     with_engine_version "ruby", "2.0.0" do
       set = Gem::RequestSet.new
       gda = Gem::RequestSet::GemDependencyAPI.new set, "gem.deps.rb"
-      gda.gem "a", :platforms => :ruby
+      gda.gem "a", platforms: :ruby
 
       assert_empty set.dependencies
     end
@@ -307,13 +307,13 @@ def test_gem_platforms_bundler_ruby
 
   def test_gem_platforms_engine
     with_engine_version "jruby", "1.7.6" do
-      @gda.gem "a", :platforms => :mri
+      @gda.gem "a", platforms: :mri
 
       assert_empty @set.dependencies
     end
 
     with_engine_version "truffleruby", "1.2.3" do
-      @gda.gem "a", :platforms => :mri
+      @gda.gem "a", platforms: :mri
 
       assert_empty @set.dependencies
     end
@@ -326,13 +326,13 @@ def test_gem_platforms_maglev
     with_engine_version "maglev", "1.0.0" do
       set = Gem::RequestSet.new
       gda = Gem::RequestSet::GemDependencyAPI.new set, "gem.deps.rb"
-      gda.gem "a", :platforms => :ruby
+      gda.gem "a", platforms: :ruby
 
       refute_empty set.dependencies
 
       set = Gem::RequestSet.new
       gda = Gem::RequestSet::GemDependencyAPI.new set, "gem.deps.rb"
-      gda.gem "a", :platforms => :maglev
+      gda.gem "a", platforms: :maglev
 
       refute_empty set.dependencies
     end
@@ -344,13 +344,13 @@ def test_gem_platforms_truffleruby
     with_engine_version "truffleruby", "1.0.0" do
       set = Gem::RequestSet.new
       gda = Gem::RequestSet::GemDependencyAPI.new set, "gem.deps.rb"
-      gda.gem "a", :platforms => :truffleruby
+      gda.gem "a", platforms: :truffleruby
 
       refute_empty set.dependencies
 
       set = Gem::RequestSet.new
       gda = Gem::RequestSet::GemDependencyAPI.new set, "gem.deps.rb"
-      gda.gem "a", :platforms => :maglev
+      gda.gem "a", platforms: :maglev
 
       assert_empty set.dependencies
     end
@@ -361,7 +361,7 @@ def test_gem_platforms_multiple
     Gem.win_platform = false
 
     with_engine_version "ruby", "2.0.0" do
-      @gda.gem "a", :platforms => [:mswin, :jruby]
+      @gda.gem "a", platforms: [:mswin, :jruby]
 
       assert_empty @set.dependencies
     end
@@ -374,7 +374,7 @@ def test_gem_platforms_platform
     Gem.win_platform = false
 
     with_engine_version "ruby", "2.0.0" do
-      @gda.gem "a", :platforms => :jruby, :platform => :ruby
+      @gda.gem "a", platforms: :jruby, platform: :ruby
 
       refute_empty @set.dependencies
     end
@@ -384,7 +384,7 @@ def test_gem_platforms_platform
 
   def test_gem_platforms_version
     with_engine_version "ruby", "2.0.0" do
-      @gda.gem "a", :platforms => :ruby_18
+      @gda.gem "a", platforms: :ruby_18
 
       assert_empty @set.dependencies
     end
@@ -392,15 +392,15 @@ def test_gem_platforms_version
 
   def test_gem_platforms_unknown
     e = assert_raise ArgumentError do
-      @gda.gem "a", :platforms => :unknown
+      @gda.gem "a", platforms: :unknown
     end
 
     assert_equal "unknown platform :unknown", e.message
   end
 
   def test_gem_requires
-    @gda.gem "a", :require => %w[b c]
-    @gda.gem "d", :require => "e"
+    @gda.gem "a", require: %w[b c]
+    @gda.gem "d", require: "e"
 
     assert_equal [dep("a"), dep("d")], @set.dependencies
 
@@ -409,7 +409,7 @@ def test_gem_requires
   end
 
   def test_gem_requires_false
-    @gda.gem "a", :require => false
+    @gda.gem "a", require: false
 
     assert_equal [dep("a")], @set.dependencies
 
@@ -419,7 +419,7 @@ def test_gem_requires_false
   def test_gem_requires_without_group
     @gda.without_groups << :test
 
-    @gda.gem "a", :group => :test
+    @gda.gem "a", group: :test
 
     assert_empty @set.dependencies
 
@@ -447,7 +447,7 @@ def test_gem_requirements
   end
 
   def test_gem_requirements_options
-    @gda.gem "c", :git => "https://example/c.git"
+    @gda.gem "c", git: "https://example/c.git"
 
     assert_equal [dep("c")], @set.dependencies
   end
@@ -459,7 +459,7 @@ def test_gem_source_mismatch
     gda.gem name
 
     e = assert_raise ArgumentError do
-      gda.gem name, :path => directory
+      gda.gem name, path: directory
     end
 
     assert_equal "duplicate source path: #{directory} for gem #{name}",
@@ -467,7 +467,7 @@ def test_gem_source_mismatch
 
     gda = Gem::RequestSet::GemDependencyAPI.new @set, nil
     gda.instance_variable_set :@vendor_set, @vendor_set
-    gda.gem name, :path => directory
+    gda.gem name, path: directory
 
     e = assert_raise ArgumentError do
       gda.gem name
@@ -489,7 +489,7 @@ def test_gem_group_method
     groups = []
 
     @gda.group :a do
-      groups = @gda.send :gem_group, "a", :group => :b, :groups => [:c, :d]
+      groups = @gda.send :gem_group, "a", group: :b, groups: [:c, :d]
     end
 
     assert_equal [:a, :b, :c, :d], groups.sort_by(&:to_s)
@@ -537,7 +537,7 @@ def test_gemspec_development_group
 
     @gda.without_groups << :other
 
-    @gda.gemspec :development_group => :other
+    @gda.gemspec development_group: :other
 
     assert_equal [dep("a", "= 1"), dep("b", "= 2")], @set.dependencies
 
@@ -569,7 +569,7 @@ def test_gemspec_name
       s.add_dependency "c", 3
     end
 
-    @gda.gemspec :name => "b"
+    @gda.gemspec name: "b"
 
     assert_equal [dep("b", "= 2"), dep("c", "= 3")], @set.dependencies
   end
@@ -599,7 +599,7 @@ def test_gemspec_path
       s.add_dependency "b", 2
     end
 
-    @gda.gemspec :path => "other"
+    @gda.gemspec path: "other"
 
     assert_equal [dep("a", "= 1"), dep("b", "= 2")], @set.dependencies
   end
@@ -621,7 +621,7 @@ def test_git_source
       "git://example/#{repo_name}.git"
     end
 
-    @gda.gem "a", :example => "repo"
+    @gda.gem "a", example: "repo"
 
     assert_equal ["git://example/repo.git", nil], @git_set.repositories["a"]
   end
@@ -762,19 +762,19 @@ def test_ruby
   def test_ruby_engine
     with_engine_version "jruby", "1.7.6" do
       assert @gda.ruby RUBY_VERSION,
-               :engine => "jruby", :engine_version => "1.7.6"
+               engine: "jruby", engine_version: "1.7.6"
     end
 
     with_engine_version "truffleruby", "1.0.0-rc11" do
       assert @gda.ruby RUBY_VERSION,
-               :engine => "truffleruby", :engine_version => "1.0.0-rc11"
+               engine: "truffleruby", engine_version: "1.0.0-rc11"
     end
   end
 
   def test_ruby_engine_mismatch_engine
     with_engine_version "ruby", "2.0.0" do
       e = assert_raise Gem::RubyVersionMismatch do
-        @gda.ruby RUBY_VERSION, :engine => "jruby", :engine_version => "1.7.4"
+        @gda.ruby RUBY_VERSION, engine: "jruby", engine_version: "1.7.4"
       end
 
       assert_equal "Your Ruby engine is ruby, but your gem.deps.rb requires jruby",
@@ -785,7 +785,7 @@ def test_ruby_engine_mismatch_engine
   def test_ruby_engine_mismatch_version
     with_engine_version "jruby", "1.7.6" do
       e = assert_raise Gem::RubyVersionMismatch do
-        @gda.ruby RUBY_VERSION, :engine => "jruby", :engine_version => "1.7.4"
+        @gda.ruby RUBY_VERSION, engine: "jruby", engine_version: "1.7.4"
       end
 
       assert_equal "Your Ruby engine version is jruby 1.7.6, but your gem.deps.rb requires jruby 1.7.4",
@@ -795,7 +795,7 @@ def test_ruby_engine_mismatch_version
 
   def test_ruby_engine_no_engine_version
     e = assert_raise ArgumentError do
-      @gda.ruby RUBY_VERSION, :engine => "jruby"
+      @gda.ruby RUBY_VERSION, engine: "jruby"
     end
 
     assert_equal "You must specify engine_version along with the Ruby engine",
diff --git a/test/rubygems/test_gem_requirement.rb b/test/rubygems/test_gem_requirement.rb
index 05931d651dbe75..de0d11ec00b6df 100644
--- a/test/rubygems/test_gem_requirement.rb
+++ b/test/rubygems/test_gem_requirement.rb
@@ -12,6 +12,14 @@ def test_concat
     assert_equal [[">=", v(1)], ["<", v(2)]], r.requirements
   end
 
+  def test_initialize_copy
+    r = req("= 1.2")
+    r2 = r.dup
+
+    assert_equal r.requirements, r2.requirements
+    refute_same r.requirements, r2.requirements
+  end
+
   def test_equals2
     r = req "= 1.2"
     assert_equal r, r.dup
@@ -437,19 +445,19 @@ def self.exploit(arg)
   end
 
   def test_marshal_load_attack
-    wa = Net::WriteAdapter.allocate
+    wa = Gem::Net::WriteAdapter.allocate
     wa.instance_variable_set(:@socket, self.class)
     wa.instance_variable_set(:@method_id, :exploit)
     request_set = Gem::RequestSet.allocate
     request_set.instance_variable_set(:@git_set, "id")
     request_set.instance_variable_set(:@sets, wa)
-    wa = Net::WriteAdapter.allocate
+    wa = Gem::Net::WriteAdapter.allocate
     wa.instance_variable_set(:@socket, request_set)
     wa.instance_variable_set(:@method_id, :resolve)
     ent = Gem::Package::TarReader::Entry.allocate
     ent.instance_variable_set(:@read, 0)
     ent.instance_variable_set(:@header, "aaa")
-    io = Net::BufferedIO.allocate
+    io = Gem::Net::BufferedIO.allocate
     io.instance_variable_set(:@io, ent)
     io.instance_variable_set(:@debug_output, wa)
     reader = Gem::Package::TarReader.allocate
diff --git a/test/rubygems/test_gem_resolver.rb b/test/rubygems/test_gem_resolver.rb
index c2bdc5332c821f..4990d5d2dd1339 100644
--- a/test/rubygems/test_gem_resolver.rb
+++ b/test/rubygems/test_gem_resolver.rb
@@ -8,7 +8,7 @@ def make_dep(name, *req)
   end
 
   def set(*specs)
-    source = Gem::Source.new URI @gem_repo
+    source = Gem::Source.new Gem::URI @gem_repo
 
     specs = specs.map do |spec|
       Gem::Resolver::SpecSpecification.new nil, spec, source
@@ -571,7 +571,7 @@ def test_raises_and_reports_a_toplevel_request_properly
 
   def test_raises_and_reports_an_implicit_request_properly
     a1 = util_spec "a", "1" do |s|
-      s.add_runtime_dependency "b", "= 2"
+      s.add_dependency "b", "= 2"
     end
 
     ad = make_dep "a", "= 1"
diff --git a/test/rubygems/test_gem_resolver_api_set.rb b/test/rubygems/test_gem_resolver_api_set.rb
index b82f00a190fdd2..b0b4943beafa97 100644
--- a/test/rubygems/test_gem_resolver_api_set.rb
+++ b/test/rubygems/test_gem_resolver_api_set.rb
@@ -6,40 +6,40 @@ class TestGemResolverAPISet < Gem::TestCase
   def setup
     super
 
-    @dep_uri = URI "#{@gem_repo}info/"
+    @dep_uri = Gem::URI "#{@gem_repo}info/"
   end
 
   def test_initialize
     set = Gem::Resolver::APISet.new
 
-    assert_equal URI("https://index.rubygems.org/info/"),            set.dep_uri
-    assert_equal URI("https://index.rubygems.org/"),                 set.uri
-    assert_equal Gem::Source.new(URI("https://index.rubygems.org")), set.source
+    assert_equal Gem::URI("https://index.rubygems.org/info/"),            set.dep_uri
+    assert_equal Gem::URI("https://index.rubygems.org/"),                 set.uri
+    assert_equal Gem::Source.new(Gem::URI("https://index.rubygems.org")), set.source
   end
 
   def test_initialize_deeper_uri
     set = Gem::Resolver::APISet.new "https://rubygemsserver.com/mygems/info"
 
-    assert_equal URI("https://rubygemsserver.com/mygems/info"),       set.dep_uri
-    assert_equal URI("https://rubygemsserver.com/"),                  set.uri
-    assert_equal Gem::Source.new(URI("https://rubygemsserver.com/")), set.source
+    assert_equal Gem::URI("https://rubygemsserver.com/mygems/info"),       set.dep_uri
+    assert_equal Gem::URI("https://rubygemsserver.com/"),                  set.uri
+    assert_equal Gem::Source.new(Gem::URI("https://rubygemsserver.com/")), set.source
   end
 
   def test_initialize_uri
     set = Gem::Resolver::APISet.new @dep_uri
 
-    assert_equal URI("#{@gem_repo}info/"), set.dep_uri
-    assert_equal URI(@gem_repo.to_s), set.uri
+    assert_equal Gem::URI("#{@gem_repo}info/"), set.dep_uri
+    assert_equal Gem::URI(@gem_repo.to_s), set.uri
   end
 
   def test_find_all
     spec_fetcher
 
     data = [
-      { :name => "a",
-        :number => "1",
-        :platform => "ruby",
-        :dependencies => [] },
+      { name: "a",
+        number: "1",
+        platform: "ruby",
+        dependencies: [] },
     ]
 
     @fetcher.data["#{@dep_uri}a"] = "---\n1  "
@@ -59,14 +59,14 @@ def test_find_all_prereleases
     spec_fetcher
 
     data = [
-      { :name => "a",
-        :number => "1",
-        :platform => "ruby",
-        :dependencies => [] },
-      { :name => "a",
-        :number => "2.a",
-        :platform => "ruby",
-        :dependencies => [] },
+      { name: "a",
+        number: "1",
+        platform: "ruby",
+        dependencies: [] },
+      { name: "a",
+        number: "2.a",
+        platform: "ruby",
+        dependencies: [] },
     ]
 
     @fetcher.data["#{@dep_uri}a"] = "---\n1\n2.a"
@@ -88,10 +88,10 @@ def test_find_all_cache
     spec_fetcher
 
     data = [
-      { :name => "a",
-        :number => "1",
-        :platform => "ruby",
-        :dependencies => [] },
+      { name: "a",
+        number: "1",
+        platform: "ruby",
+        dependencies: [] },
     ]
 
     @fetcher.data["#{@dep_uri}a"] = "---\n1  "
@@ -136,6 +136,25 @@ def test_find_all_missing
     assert_empty set.find_all(a_dep)
   end
 
+  def test_find_all_not_found
+    spec_fetcher
+
+    @fetcher.data["#{@dep_uri}/a"] =
+      proc do
+        raise Gem::RemoteFetcher::FetchError
+      end
+
+    set = Gem::Resolver::APISet.new @dep_uri
+
+    a_dep = Gem::Resolver::DependencyRequest.new dep("a"), nil
+
+    assert_empty set.find_all(a_dep)
+
+    @fetcher.data.delete "#{@dep_uri}a"
+
+    assert_empty set.find_all(a_dep)
+  end
+
   def test_prefetch
     spec_fetcher
 
diff --git a/test/rubygems/test_gem_resolver_api_specification.rb b/test/rubygems/test_gem_resolver_api_specification.rb
index 6ec0aa48fa7b2e..2119d734780b9e 100644
--- a/test/rubygems/test_gem_resolver_api_specification.rb
+++ b/test/rubygems/test_gem_resolver_api_specification.rb
@@ -6,10 +6,10 @@ class TestGemResolverAPISpecification < Gem::TestCase
   def test_initialize
     set = Gem::Resolver::APISet.new
     data = {
-      :name => "rails",
-      :number => "3.0.3",
-      :platform => Gem::Platform.local.to_s,
-      :dependencies => [
+      name: "rails",
+      number: "3.0.3",
+      platform: Gem::Platform.local.to_s,
+      dependencies: [
         ["bundler",  "~> 1.0"],
         ["railties", "= 3.0.3"],
       ],
@@ -45,10 +45,10 @@ def test_fetch_development_dependencies
     set = Gem::Resolver::APISet.new repo
 
     data = {
-      :name => "rails",
-      :number => "3.0.3",
-      :platform => "ruby",
-      :dependencies => [
+      name: "rails",
+      number: "3.0.3",
+      platform: "ruby",
+      dependencies: [
         ["bundler",  "~> 1.0"],
         ["railties", "= 3.0.3"],
       ],
@@ -72,10 +72,10 @@ def test_fetch_development_dependencies
   def test_installable_platform_eh
     set = Gem::Resolver::APISet.new
     data = {
-      :name => "a",
-      :number => "1",
-      :platform => "ruby",
-      :dependencies => [],
+      name: "a",
+      number: "1",
+      platform: "ruby",
+      dependencies: [],
     }
 
     a_spec = Gem::Resolver::APISpecification.new set, data
@@ -83,10 +83,10 @@ def test_installable_platform_eh
     assert a_spec.installable_platform?
 
     data = {
-      :name => "b",
-      :number => "1",
-      :platform => "cpu-other_platform-1",
-      :dependencies => [],
+      name: "b",
+      number: "1",
+      platform: "cpu-other_platform-1",
+      dependencies: [],
     }
 
     b_spec = Gem::Resolver::APISpecification.new set, data
@@ -94,10 +94,10 @@ def test_installable_platform_eh
     refute b_spec.installable_platform?
 
     data = {
-      :name => "c",
-      :number => "1",
-      :platform => Gem::Platform.local.to_s,
-      :dependencies => [],
+      name: "c",
+      number: "1",
+      platform: Gem::Platform.local.to_s,
+      dependencies: [],
     }
 
     c_spec = Gem::Resolver::APISpecification.new set, data
@@ -108,10 +108,10 @@ def test_installable_platform_eh
   def test_source
     set = Gem::Resolver::APISet.new
     data = {
-      :name => "a",
-      :number => "1",
-      :platform => "ruby",
-      :dependencies => [],
+      name: "a",
+      number: "1",
+      platform: "ruby",
+      dependencies: [],
     }
 
     api_spec = Gem::Resolver::APISpecification.new set, data
@@ -124,13 +124,13 @@ def test_spec
       fetcher.spec "a", 1
     end
 
-    dep_uri = URI(@gem_repo) + "info"
+    dep_uri = Gem::URI(@gem_repo) + "info"
     set = Gem::Resolver::APISet.new dep_uri
     data = {
-      :name => "a",
-      :number => "1",
-      :platform => "ruby",
-      :dependencies => [],
+      name: "a",
+      number: "1",
+      platform: "ruby",
+      dependencies: [],
     }
 
     api_spec = Gem::Resolver::APISpecification.new set, data
@@ -148,13 +148,13 @@ def test_spec_jruby_platform
       end
     end
 
-    dep_uri = URI(@gem_repo) + "info"
+    dep_uri = Gem::URI(@gem_repo) + "info"
     set = Gem::Resolver::APISet.new dep_uri
     data = {
-      :name => "j",
-      :number => "1",
-      :platform => "jruby",
-      :dependencies => [],
+      name: "j",
+      number: "1",
+      platform: "jruby",
+      dependencies: [],
     }
 
     api_spec = Gem::Resolver::APISpecification.new set, data
diff --git a/test/rubygems/test_gem_resolver_best_set.rb b/test/rubygems/test_gem_resolver_best_set.rb
index 80aa8833644ae2..ac186884d15b55 100644
--- a/test/rubygems/test_gem_resolver_best_set.rb
+++ b/test/rubygems/test_gem_resolver_best_set.rb
@@ -9,15 +9,19 @@ def test_initialize
     assert_empty set.sets
   end
 
-  def test_find_all_index
+  def test_find_all
     spec_fetcher do |fetcher|
       fetcher.spec "a", 1
-      fetcher.spec "a", 2
-      fetcher.spec "b", 1
     end
 
+    api_uri = Gem::URI "#{@gem_repo}info/"
+
+    @fetcher.data["#{api_uri}a"] = "---\n1  "
+
     set = Gem::Resolver::BestSet.new
 
+    set.sets << Gem::Resolver::APISet.new(api_uri)
+
     dependency = dep "a", "~> 1"
 
     req = Gem::Resolver::DependencyRequest.new dependency, nil
@@ -27,24 +31,18 @@ def test_find_all_index
     assert_equal %w[a-1], found.map(&:full_name)
   end
 
-  def test_find_all_fallback
-    spec_fetcher do |fetcher|
-      fetcher.spec "a", 1
-    end
-
+  def test_pick_sets_prerelease
     set = Gem::Resolver::BestSet.new
+    set.prerelease = true
 
-    api_uri = URI(@gem_repo)
-
-    set.sets << Gem::Resolver::APISet.new(api_uri)
-
-    dependency = dep "a", "~> 1"
+    set.pick_sets
 
-    req = Gem::Resolver::DependencyRequest.new dependency, nil
+    sets = set.sets
 
-    found = set.find_all req
+    assert_equal 1, sets.count
 
-    assert_equal %w[a-1], found.map(&:full_name)
+    source_set = sets.first
+    assert_equal true, source_set.prerelease
   end
 
   def test_find_all_local
@@ -90,64 +88,4 @@ def test_prefetch_local
 
     assert_empty set.sets
   end
-
-  def test_replace_failed_api_set
-    set = Gem::Resolver::BestSet.new
-
-    api_uri = URI(@gem_repo) + "./info/"
-    api_set = Gem::Resolver::APISet.new api_uri
-
-    set.sets << api_set
-
-    error_uri = api_uri + "a"
-
-    error = Gem::RemoteFetcher::FetchError.new "bogus", error_uri
-
-    set.replace_failed_api_set error
-
-    assert_equal 1, set.sets.size
-
-    refute_includes set.sets, api_set
-
-    assert_kind_of Gem::Resolver::IndexSet, set.sets.first
-  end
-
-  def test_replace_failed_api_set_no_api_set
-    set = Gem::Resolver::BestSet.new
-
-    index_set = Gem::Resolver::IndexSet.new Gem::Source.new @gem_repo
-
-    set.sets << index_set
-
-    error = Gem::RemoteFetcher::FetchError.new "bogus", @gem_repo
-
-    e = assert_raise Gem::RemoteFetcher::FetchError do
-      set.replace_failed_api_set error
-    end
-
-    assert_equal error, e
-  end
-
-  def test_replace_failed_api_set_uri_with_credentials
-    set = Gem::Resolver::BestSet.new
-
-    api_uri = URI(@gem_repo) + "./info/"
-    api_uri.user = "user"
-    api_uri.password = "pass"
-    api_set = Gem::Resolver::APISet.new api_uri
-
-    set.sets << api_set
-
-    error_uri = api_uri + "a"
-
-    error = Gem::RemoteFetcher::FetchError.new "bogus", error_uri
-
-    set.replace_failed_api_set error
-
-    assert_equal 1, set.sets.size
-
-    refute_includes set.sets, api_set
-
-    assert_kind_of Gem::Resolver::IndexSet, set.sets.first
-  end
 end
diff --git a/test/rubygems/test_gem_resolver_specification.rb b/test/rubygems/test_gem_resolver_specification.rb
index db7093e423b7e4..e2bbce0c0c0211 100644
--- a/test/rubygems/test_gem_resolver_specification.rb
+++ b/test/rubygems/test_gem_resolver_specification.rb
@@ -25,7 +25,7 @@ def test_install
     a_spec = TestSpec.new a
     a_spec.source = Gem::Source.new @gem_repo
 
-    a_spec.install :install_dir => gemhome
+    a_spec.install install_dir: gemhome
 
     assert_path_exist File.join gemhome, "gems", a.full_name
 
diff --git a/test/rubygems/test_gem_safe_marshal.rb b/test/rubygems/test_gem_safe_marshal.rb
new file mode 100644
index 00000000000000..bd15f4f796d1ce
--- /dev/null
+++ b/test/rubygems/test_gem_safe_marshal.rb
@@ -0,0 +1,516 @@
+# frozen_string_literal: true
+
+require_relative "helper"
+
+require "date"
+require "rubygems/safe_marshal"
+
+class TestGemSafeMarshal < Gem::TestCase
+  define_method("test_safe_load_marshal Date #<Date: 1994-12-09 ((2449696j,0s,0n),+0s,2299161j)>") { assert_safe_load_marshal "\x04\bU:\tDate[\vi\x00i\x03 a%i\x00i\x00i\x00f\f2299161" }
+  define_method("test_safe_load_marshal Float 0.0") { assert_safe_load_marshal "\x04\bf\x060" }
+  define_method("test_safe_load_marshal Float -0.0") { assert_safe_load_marshal "\x04\bf\a-0" }
+  define_method("test_safe_load_marshal Float Infinity") { assert_safe_load_marshal "\x04\bf\binf" }
+  define_method("test_safe_load_marshal Float -Infinity") { assert_safe_load_marshal "\x04\bf\t-inf" }
+  define_method("test_safe_load_marshal Float NaN") { assert_safe_load_marshal "\x04\bf\bnan", equality: false }
+  define_method("test_safe_load_marshal Float 1.1") { assert_safe_load_marshal "\x04\bf\b1.1" }
+  define_method("test_safe_load_marshal Float -1.1") { assert_safe_load_marshal "\x04\bf\t-1.1" }
+  define_method("test_safe_load_marshal Float 30000000.0") { assert_safe_load_marshal "\x04\bf\b3e7" }
+  define_method("test_safe_load_marshal Float -30000000.0") { assert_safe_load_marshal "\x04\bf\t-3e7" }
+  define_method("test_safe_load_marshal Gem::Version #<Gem::Version \"1.abc\">") { assert_safe_load_marshal "\x04\bU:\x11Gem::Version[\x06I\"\n1.abc\x06:\x06ET" }
+  define_method("test_safe_load_marshal Hash {} default value") { assert_safe_load_marshal "\x04\b}\x00[\x00", additional_methods: [:default] }
+  define_method("test_safe_load_marshal Hash {}") { assert_safe_load_marshal "\x04\b{\x00" }
+  define_method("test_safe_load_marshal Array {}") { assert_safe_load_marshal "\x04\b[\x00" }
+  define_method("test_safe_load_marshal Hash {:runtime=>:development}") { assert_safe_load_marshal "\x04\bI{\x06:\fruntime:\x10development\x06:\n@type[\x00", permitted_ivars: { "Hash" => %w[@type] } }
+  define_method("test_safe_load_marshal Integer -1") { assert_safe_load_marshal "\x04\bi\xFA" }
+  define_method("test_safe_load_marshal Integer -1048575") { assert_safe_load_marshal "\x04\bi\xFD\x01\x00\xF0" }
+  define_method("test_safe_load_marshal Integer -122") { assert_safe_load_marshal "\x04\bi\x81" }
+  define_method("test_safe_load_marshal Integer -123") { assert_safe_load_marshal "\x04\bi\x80" }
+  define_method("test_safe_load_marshal Integer -124") { assert_safe_load_marshal "\x04\bi\xFF\x84" }
+  define_method("test_safe_load_marshal Integer -127") { assert_safe_load_marshal "\x04\bi\xFF\x81" }
+  define_method("test_safe_load_marshal Integer -128") { assert_safe_load_marshal "\x04\bi\xFF\x80" }
+  define_method("test_safe_load_marshal Integer -2") { assert_safe_load_marshal "\x04\bi\xF9" }
+  define_method("test_safe_load_marshal Integer -255") { assert_safe_load_marshal "\x04\bi\xFF\x01" }
+  define_method("test_safe_load_marshal Integer -256") { assert_safe_load_marshal "\x04\bi\xFF\x00" }
+  define_method("test_safe_load_marshal Integer -257") { assert_safe_load_marshal "\x04\bi\xFE\xFF\xFE" }
+  define_method("test_safe_load_marshal Integer -268435455") { assert_safe_load_marshal "\x04\bi\xFC\x01\x00\x00\xF0" }
+  define_method("test_safe_load_marshal Integer -268435456") { assert_safe_load_marshal "\x04\bi\xFC\x00\x00\x00\xF0" }
+  define_method("test_safe_load_marshal Integer -3") { assert_safe_load_marshal "\x04\bi\xF8" }
+  define_method("test_safe_load_marshal Integer -4") { assert_safe_load_marshal "\x04\bi\xF7" }
+  define_method("test_safe_load_marshal Integer -4294967295") { assert_safe_load_marshal "\x04\bl-\a\xFF\xFF\xFF\xFF" }
+  define_method("test_safe_load_marshal Integer -4294967296") { assert_safe_load_marshal "\x04\bl-\b\x00\x00\x00\x00\x01\x00" }
+  define_method("test_safe_load_marshal Integer -5") { assert_safe_load_marshal "\x04\bi\xF6" }
+  define_method("test_safe_load_marshal Integer -6") { assert_safe_load_marshal "\x04\bi\xF5" }
+  define_method("test_safe_load_marshal Integer -65535") { assert_safe_load_marshal "\x04\bi\xFE\x01\x00" }
+  define_method("test_safe_load_marshal Integer -65536") { assert_safe_load_marshal "\x04\bi\xFE\x00\x00" }
+  define_method("test_safe_load_marshal Integer -9223372036854775807") { assert_safe_load_marshal "\x04\bl-\t\xFF\xFF\xFF\xFF\xFF\xFF\xFF\x7F" }
+  define_method("test_safe_load_marshal Integer -9223372036854775808") { assert_safe_load_marshal "\x04\bl-\t\x00\x00\x00\x00\x00\x00\x00\x80" }
+  define_method("test_safe_load_marshal Integer 0") { assert_safe_load_marshal "\x04\bi\x00" }
+  define_method("test_safe_load_marshal Integer 1") { assert_safe_load_marshal "\x04\bi\x06" }
+  define_method("test_safe_load_marshal Integer 1048574") { assert_safe_load_marshal "\x04\bi\x03\xFE\xFF\x0F" }
+  define_method("test_safe_load_marshal Integer 1048575") { assert_safe_load_marshal "\x04\bi\x03\xFF\xFF\x0F" }
+  define_method("test_safe_load_marshal Integer 1048576") { assert_safe_load_marshal "\x04\bi\x03\x00\x00\x10" }
+  define_method("test_safe_load_marshal Integer 121") { assert_safe_load_marshal "\x04\bi~" }
+  define_method("test_safe_load_marshal Integer 122") { assert_safe_load_marshal "\x04\bi\x7F" }
+  define_method("test_safe_load_marshal Integer 123") { assert_safe_load_marshal "\x04\bi\x01{" }
+  define_method("test_safe_load_marshal Integer 124") { assert_safe_load_marshal "\x04\bi\x01|" }
+  define_method("test_safe_load_marshal Integer 125") { assert_safe_load_marshal "\x04\bi\x01}" }
+  define_method("test_safe_load_marshal Integer 126") { assert_safe_load_marshal "\x04\bi\x01~" }
+  define_method("test_safe_load_marshal Integer 127") { assert_safe_load_marshal "\x04\bi\x01\x7F" }
+  define_method("test_safe_load_marshal Integer 128") { assert_safe_load_marshal "\x04\bi\x01\x80" }
+  define_method("test_safe_load_marshal Integer 129") { assert_safe_load_marshal "\x04\bi\x01\x81" }
+  define_method("test_safe_load_marshal Integer 2") { assert_safe_load_marshal "\x04\bi\a" }
+  define_method("test_safe_load_marshal Integer 254") { assert_safe_load_marshal "\x04\bi\x01\xFE" }
+  define_method("test_safe_load_marshal Integer 255") { assert_safe_load_marshal "\x04\bi\x01\xFF" }
+  define_method("test_safe_load_marshal Integer 256") { assert_safe_load_marshal "\x04\bi\x02\x00\x01" }
+  define_method("test_safe_load_marshal Integer 257") { assert_safe_load_marshal "\x04\bi\x02\x01\x01" }
+  define_method("test_safe_load_marshal Integer 258") { assert_safe_load_marshal "\x04\bi\x02\x02\x01" }
+  define_method("test_safe_load_marshal Integer 268435454") { assert_safe_load_marshal "\x04\bi\x04\xFE\xFF\xFF\x0F" }
+  define_method("test_safe_load_marshal Integer 268435455") { assert_safe_load_marshal "\x04\bi\x04\xFF\xFF\xFF\x0F" }
+  define_method("test_safe_load_marshal Integer 268435456") { assert_safe_load_marshal "\x04\bi\x04\x00\x00\x00\x10" }
+  define_method("test_safe_load_marshal Integer 268435457") { assert_safe_load_marshal "\x04\bi\x04\x01\x00\x00\x10" }
+  define_method("test_safe_load_marshal Integer 3") { assert_safe_load_marshal "\x04\bi\b" }
+  define_method("test_safe_load_marshal Integer 4") { assert_safe_load_marshal "\x04\bi\t" }
+  define_method("test_safe_load_marshal Integer 4294967294") { assert_safe_load_marshal "\x04\bl+\a\xFE\xFF\xFF\xFF" }
+  define_method("test_safe_load_marshal Integer 4294967295") { assert_safe_load_marshal "\x04\bl+\a\xFF\xFF\xFF\xFF" }
+  define_method("test_safe_load_marshal Integer 4294967296") { assert_safe_load_marshal "\x04\bl+\b\x00\x00\x00\x00\x01\x00" }
+  define_method("test_safe_load_marshal Integer 4294967297") { assert_safe_load_marshal "\x04\bl+\b\x01\x00\x00\x00\x01\x00" }
+  define_method("test_safe_load_marshal Integer 5") { assert_safe_load_marshal "\x04\bi\n" }
+  define_method("test_safe_load_marshal Integer 6") { assert_safe_load_marshal "\x04\bi\v" }
+  define_method("test_safe_load_marshal Integer 65534") { assert_safe_load_marshal "\x04\bi\x02\xFE\xFF" }
+  define_method("test_safe_load_marshal Integer 65535") { assert_safe_load_marshal "\x04\bi\x02\xFF\xFF" }
+  define_method("test_safe_load_marshal Integer 65536") { assert_safe_load_marshal "\x04\bi\x03\x00\x00\x01" }
+  define_method("test_safe_load_marshal Integer 65537") { assert_safe_load_marshal "\x04\bi\x03\x01\x00\x01" }
+  define_method("test_safe_load_marshal Integer 7") { assert_safe_load_marshal "\x04\bi\f" }
+  define_method("test_safe_load_marshal Integer 9223372036854775806") { assert_safe_load_marshal "\x04\bl+\t\xFE\xFF\xFF\xFF\xFF\xFF\xFF\x7F" }
+  define_method("test_safe_load_marshal Integer 9223372036854775807") { assert_safe_load_marshal "\x04\bl+\t\xFF\xFF\xFF\xFF\xFF\xFF\xFF\x7F" }
+  define_method("test_safe_load_marshal Integer 9223372036854775808") { assert_safe_load_marshal "\x04\bl+\t\x00\x00\x00\x00\x00\x00\x00\x80" }
+  define_method("test_safe_load_marshal Integer 9223372036854775809") { assert_safe_load_marshal "\x04\bl+\t\x01\x00\x00\x00\x00\x00\x00\x80" }
+  define_method("test_safe_load_marshal Rational (1/3)") { assert_safe_load_marshal "\x04\bU:\rRational[\ai\x06i\b" }
+  define_method("test_safe_load_marshal Array [[...]]") { assert_safe_load_marshal "\x04\b[\x06@\x00" }
+  define_method("test_safe_load_marshal String \"hello\" ivar") { assert_safe_load_marshal "\x04\bI\"\nhello\a:\x06ET:\n@type@\x00", additional_methods: [:instance_variables], permitted_ivars: { "String" => %w[@type E] } }
+  define_method("test_safe_load_marshal Array [\"hello\", [\"hello\"], \"hello\", [\"hello\"]]") { assert_safe_load_marshal "\x04\b[\tI\"\nhello\x06:\x06ET[\x06@\x06@\x06@\a" }
+  define_method("test_safe_load_marshal Array [\"hello\", \"hello\"]") { assert_safe_load_marshal "\x04\b[\aI\"\nhello\x06:\x06ET@\x06" }
+  define_method("test_safe_load_marshal Array [:development, :development]") { assert_safe_load_marshal "\x04\b[\a:\x10development;\x00" }
+  define_method("test_safe_load_marshal String \"abc\" ascii") { assert_safe_load_marshal "\x04\bI\"\babc\x06:\x06EF", additional_methods: [:encoding] }
+  define_method("test_safe_load_marshal Array [\"abc\", \"abc\"] ascii") { assert_safe_load_marshal "\x04\b[\aI\"\babc\x06:\x06EF@\x06", additional_methods: [->(x) { x.map(&:encoding) }] }
+  define_method("test_safe_load_marshal String \"abc\" utf8") { assert_safe_load_marshal "\x04\bI\"\babc\x06:\x06ET", additional_methods: [:encoding] }
+  define_method("test_safe_load_marshal Array [\"abc\", \"abc\"] utf8") { assert_safe_load_marshal "\x04\b[\aI\"\babc\x06:\x06ET@\x06", additional_methods: [->(x) { x.map(&:encoding) }] }
+  define_method("test_safe_load_marshal String \"abc\" Windows-1256") { assert_safe_load_marshal "\x04\bI\"\babc\x06:\rencoding\"\x11Windows-1256", additional_methods: [:encoding] }
+  define_method("test_safe_load_marshal Array [\"abc\", \"abc\"] Windows-1256") { assert_safe_load_marshal "\x04\b[\aI\"\babc\x06:\rencoding\"\x11Windows-1256@\x06", additional_methods: [->(x) { x.map(&:encoding) }] }
+  define_method("test_safe_load_marshal String \"abc\" binary") { assert_safe_load_marshal "\x04\b\"\babc", additional_methods: [:encoding] }
+  define_method("test_safe_load_marshal Array [\"abc\", \"abc\"] binary") { assert_safe_load_marshal "\x04\b[\a\"\babc@\x06", additional_methods: [->(x) { x.map(&:encoding) }] }
+  unless RUBY_ENGINE == "truffleruby" # Not supported
+    define_method("test_safe_load_marshal String \"\\x61\\x62\\x63\" utf32 with length not a multiple of 4") { assert_safe_load_marshal "\x04\bI\"\babc\x06:\rencoding\"\vUTF-32", additional_methods: [:encoding] }
+    define_method("test_safe_load_marshal Array [\"\\x61\\x62\\x63\", \"\\x61\\x62\\x63\"] utf32 with length not a multiple of 4)") { assert_safe_load_marshal "\x04\b[\aI\"\babc\x06:\rencoding\"\vUTF-32@\x06", additional_methods: [->(x) { x.map(&:encoding) }] }
+  end
+  define_method("test_safe_load_marshal String \"\\x61\\x62\\x63\\x64\" utf32") { assert_safe_load_marshal "\x04\bI\"\x09abcd\x06:\rencoding\"\vUTF-32", additional_methods: [:encoding] }
+  define_method("test_safe_load_marshal Array [\"\\x61\\x62\\x63\\x64\", \"\\x61\\x62\\x63\\x64\"] utf32") { assert_safe_load_marshal "\x04\b[\aI\"\x09abcd\x06:\rencoding\"\vUTF-32@\x06", additional_methods: [->(x) { x.map(&:encoding) }] }
+  define_method("test_safe_load_marshal String \"abc\" ivar") { assert_safe_load_marshal "\x04\bI\"\babc\a:\x06ET:\n@typeI\"\ttype\x06;\x00T", permitted_ivars: { "String" => %w[@type E] } }
+  define_method("test_safe_load_marshal String \"\"") { assert_safe_load_marshal "\x04\bI\"\babc\x06:\x06ET" }
+  define_method("test_safe_load_marshal Time 2000-12-31 20:07:59 -1152") { assert_safe_load_marshal "\x04\bIu:\tTime\r'@\x19\x80\x00\x00\xB0\xEF\a:\voffseti\xFE Y:\tzone0", additional_methods: [:ctime, :to_f, :to_r, :to_i, :zone, :subsec, :instance_variables, :dst?, :to_a] }
+  define_method("test_safe_load_marshal Time 2000-12-31 23:59:59 -0800") { assert_safe_load_marshal "\x04\bIu:\tTime\r'@\x19\x80\x00\x00\xB0\xEF\a:\voffseti\xFE\x80\x8F:\tzoneI\"\bPST\x06:\x06EF", additional_methods: [:ctime, :to_f, :to_r, :to_i, :zone, :subsec, :instance_variables, :dst?, :to_a] }
+  define_method("test_safe_load_marshal Time 2000-12-31 23:59:59 2254051613498933/2251799813685248000000000 -0800") { assert_safe_load_marshal "\x04\bIu:\tTime\r'@\x19\x80\x00\x00\xB0\xEF\n:\rnano_numl+\t5^\xBAI\f\x02\b\x00:\rnano_denl+\t\x00\x00\x00\x00\x00\x00\b\x00:\rsubmicro\"\a\x00\x10:\voffseti\xFE\x80\x8F:\tzoneI\"\bPST\x06:\x06EF", additional_methods: [:ctime, :to_f, :to_r, :to_i, :zone, :subsec, :instance_variables, :dst?, :to_a] }
+  define_method("test_safe_load_marshal Time 2000-12-31 23:59:59 2476979795053773/2251799813685248000 -0800") { assert_safe_load_marshal "\x04\bIu:\tTime\r'@\x19\x80L\x04\xB0\xEF\t:\rnano_numi\x025\f:\rnano_denl+\b\x00\x00\x00\x00\x00 :\voffseti\xFE\x80\x8F:\tzoneI\"\bPST\x06:\x06EF", additional_methods: [:ctime, :to_f, :to_r, :to_i, :zone, :subsec, :instance_variables, :dst?, :to_a] }
+  define_method("test_safe_load_marshal Time 2000-12-31 23:59:59 2476979795053773/2251799813685248000000 -0800") { assert_safe_load_marshal "\x04\bIu:\tTime\r'@\x19\x80\x01\x00\xB0\xEF\n:\rnano_numl+\t\x19\x00\x00\x00\x00\x00d\x00:\rnano_denl+\t\x00\x00\x00\x00\x00\x00\x01\x00:\rsubmicro\"\x06\x10:\voffseti\xFE\x80\x8F:\tzoneI\"\bPST\x06:\x06EF", additional_methods: [:ctime, :to_f, :to_r, :to_i, :zone, :subsec, :instance_variables, :dst?, :to_a] }
+  define_method("test_safe_load_marshal Time 2000-12-31 23:59:59 2476979795053773/2251799813685248000000000 -0800") { assert_safe_load_marshal "\x04\bIu:\tTime\r'@\x19\x80\x00\x00\xB0\xEF\n:\rnano_numl+\t\xCD\xCC\xCC\xCC\xCC\xCC\b\x00:\rnano_denl+\t\x00\x00\x00\x00\x00\x00\b\x00:\rsubmicro\"\a\x00\x10:\voffseti\xFE\x80\x8F:\tzoneI\"\bPST\x06:\x06EF", additional_methods: [:ctime, :to_f, :to_r, :to_i, :zone, :subsec, :instance_variables, :dst?, :to_a] }
+  define_method("test_safe_load_marshal Time 2000-12-31 23:59:59 450364466336677/450359962737049600000000 -0800") { assert_safe_load_marshal "\x04\bIu:\tTime\r'@\x19\x80\x00\x00\xB0\xEF\n:\rnano_numl+\t9b->\x05\x00\b\x00:\rnano_denl+\t\x00\x00\x00\x00\x00\x00\b\x00:\rsubmicro\"\a\x00\x10:\voffseti\xFE\x80\x8F:\tzoneI\"\bPST\x06:\x06EF", additional_methods: [:ctime, :to_f, :to_r, :to_i, :zone, :subsec, :instance_variables, :dst?, :to_a] }
+  define_method("test_safe_load_marshal Time 2000-12-31 23:59:59 4548635623644201/4503599627370496000 -0800") { assert_safe_load_marshal "\x04\bIu:\tTime\r'@\x19\x80\xF2\x03\xB0\xEF\t:\rnano_numi\x02q\x02:\rnano_denl+\b\x00\x00\x00\x00\x00@:\voffseti\xFE\x80\x8F:\tzoneI\"\bPST\x06:\x06EF", additional_methods: [:ctime, :to_f, :to_r, :to_i, :zone, :subsec, :instance_variables, :dst?, :to_a] }
+  define_method("test_safe_load_marshal Time 2000-12-31 23:59:59 4548635623644201/4503599627370496000000 -0800") { assert_safe_load_marshal "\x04\bIu:\tTime\r'@\x19\x80\x01\x00\xB0\xEF\n:\rnano_numl+\t\x05\x00\x00\x00\x00\x00\x14\x00:\rnano_denl+\t\x00\x00\x00\x00\x00\x00\x02\x00:\rsubmicro\"\x06\x01:\voffseti\xFE\x80\x8F:\tzoneI\"\bPST\x06:\x06EF", additional_methods: [:ctime, :to_f, :to_r, :to_i, :zone, :subsec, :instance_variables, :dst?, :to_a] }
+  define_method("test_safe_load_marshal Time 2000-12-31 23:59:59 4548635623644201/4503599627370496000000000 -0800") { assert_safe_load_marshal "\x04\bIu:\tTime\r'@\x19\x80\x00\x00\xB0\xEF\n:\rnano_numl+\t)\\\x8F\xC2\xF5(\x10\x00:\rnano_denl+\t\x00\x00\x00\x00\x00\x00\x10\x00:\rsubmicro\"\a\x00\x10:\voffseti\xFE\x80\x8F:\tzoneI\"\bPST\x06:\x06EF", additional_methods: [:ctime, :to_f, :to_r, :to_i, :zone, :subsec, :instance_variables, :dst?, :to_a] }
+  define_method("test_safe_load_marshal Time 2000-12-31 23:59:59.000000001 -0800") { assert_safe_load_marshal "\x04\bIu:\tTime\r'@\x19\x80\x00\x00\xB0\xEF\n:\rnano_numi\x06:\rnano_deni\x06:\rsubmicro\"\a\x00\x10:\voffseti\xFE\x80\x8F:\tzoneI\"\bPST\x06:\x06EF", additional_methods: [:ctime, :to_f, :to_r, :to_i, :zone, :subsec, :instance_variables, :dst?, :to_a] }
+  define_method("test_safe_load_marshal Time 2000-12-31 23:59:59.000001 -0800") { assert_safe_load_marshal "\x04\bIu:\tTime\r'@\x19\x80\x01\x00\xB0\xEF\a:\voffseti\xFE\x80\x8F:\tzoneI\"\bPST\x06:\x06EF", additional_methods: [:ctime, :to_f, :to_r, :to_i, :zone, :subsec, :instance_variables, :dst?, :to_a] }
+  define_method("test_safe_load_marshal Time 2000-12-31 23:59:59.001 -0800") { assert_safe_load_marshal "\x04\bIu:\tTime\r'@\x19\x80\xE8\x03\xB0\xEF\a:\voffseti\xFE\x80\x8F:\tzoneI\"\bPST\x06:\x06EF", additional_methods: [:ctime, :to_f, :to_r, :to_i, :zone, :subsec, :instance_variables, :dst?, :to_a] }
+  define_method("test_safe_load_marshal Time 2001-01-01 07:59:59 +0000") { assert_safe_load_marshal "\x04\bIu:\tTime\r'@\x19\x80\x00\x00\xB0\xEF\a:\voffseti\x00:\tzone0", additional_methods: [:ctime, :to_f, :to_r, :to_i, :zone, :subsec, :instance_variables, :dst?, :to_a] }
+  define_method("test_safe_load_marshal Time 2001-01-01 07:59:59 UTC") { assert_safe_load_marshal "\x04\bIu:\tTime\r'@\x19\xC0\x00\x00\xB0\xEF\x06:\tzoneI\"\bUTC\x06:\x06EF", additional_methods: [:ctime, :to_f, :to_r, :to_i, :zone, :subsec, :instance_variables, :dst?, :to_a] }
+  define_method("test_safe_load_marshal Time 2001-01-01 11:59:59 +0400") { assert_safe_load_marshal "\x04\bIu:\tTime\r'@\x19\x80\x00\x00\xB0\xEF\a:\voffseti\x02@8:\tzone0", additional_methods: [:ctime, :to_f, :to_r, :to_i, :zone, :subsec, :instance_variables, :dst?, :to_a] }
+  define_method("test_safe_load_marshal Time 2023-08-24 10:10:39.09565 -0700") { assert_safe_load_marshal "\x04\bIu:\tTime\r\x11\xDF\x1E\x80\xA2uq*\a:\voffseti\xFE\x90\x9D:\tzoneI\"\bPDT\x06:\x06EF" }
+  define_method("test_safe_load_marshal Time 2023-08-24 10:10:39.098453 -0700") { assert_safe_load_marshal "\x04\bIu:\tTime\r\x11\xDF\x1E\x80\x95\x80q*\b:\n@typeI\"\fruntime\x06:\x06ET:\voffseti\xFE\x90\x9D:\tzoneI\"\bPDT\x06;\aF", permitted_ivars: { "Time" => %w[@type offset zone], "String" => %w[E @debug_created_info] }, marshal_dump_equality: true }
+
+  def test_repeated_symbol
+    assert_safe_load_as [:development, :development]
+  end
+
+  def test_length_one_symbols
+    with_const(Gem::SafeMarshal, :PERMITTED_SYMBOLS, %w[E A b 0] << "") do
+      assert_safe_load_as [:A, :E, :E, :A, "".to_sym, "".to_sym], additional_methods: [:instance_variables]
+    end
+  end
+
+  def test_repeated_string
+    s = "hello"
+    a = [s]
+    assert_safe_load_as [s, a, s, a]
+    assert_safe_load_as [s, s]
+  end
+
+  def test_recursive_string
+    s = String.new("hello")
+    s.instance_variable_set(:@type, s)
+    with_const(Gem::SafeMarshal, :PERMITTED_IVARS, { "String" => %w[@type E] }) do
+      assert_safe_load_as s, additional_methods: [:instance_variables]
+    end
+  end
+
+  def test_recursive_array
+    a = []
+    a << a
+    assert_safe_load_as a
+  end
+
+  def test_time_loads
+    assert_safe_load_as Time.new
+  end
+
+  def test_string_with_encoding
+    [
+      String.new("abc", encoding: "US-ASCII"),
+      String.new("abc", encoding: "UTF-8"),
+      String.new("abc", encoding: "Windows-1256"),
+      String.new("abc", encoding: Encoding::BINARY),
+      String.new("abcd", encoding: "UTF-32"),
+      # TruffleRuby: Not supported since length of UTF-16 string must be a multiple of 2
+      (String.new("abc", encoding: "UTF-32") unless RUBY_ENGINE == "truffleruby"),
+
+      String.new("", encoding: "US-ASCII"),
+      String.new("", encoding: "UTF-8"),
+      String.new("", encoding: "Windows-1256"),
+      String.new("", encoding: Encoding::BINARY),
+      String.new("", encoding: "UTF-32"),
+    ].compact.each do |s|
+      assert_safe_load_as s, additional_methods: [:encoding]
+      assert_safe_load_as [s, s], additional_methods: [->(a) { a.map(&:encoding) }]
+    end
+  end
+
+  def test_string_with_ivar
+    str = String.new("abc")
+    str.instance_variable_set :@type, "type"
+    with_const(Gem::SafeMarshal, :PERMITTED_IVARS, { "String" => %w[@type E @debug_created_info] }) do
+      assert_safe_load_as str
+    end
+  end
+
+  def test_time_with_ivar
+    pend "Marshal.load of Time with ivars is broken on jruby, see https://github.com/jruby/jruby/issues/7902" if RUBY_ENGINE == "jruby"
+
+    with_const(Gem::SafeMarshal, :PERMITTED_IVARS, { "Time" => %w[@type offset zone nano_num nano_den submicro], "String" => %w[E @debug_created_info] }) do
+      assert_safe_load_as Time.new.tap {|t| t.instance_variable_set :@type, "runtime" }, marshal_dump_equality: true
+    end
+  end
+
+  secs = Time.new(2000, 12, 31, 23, 59, 59).to_i
+  [
+    Time.at(secs),
+    Time.at(secs, in: "+04:00"),
+    Time.at(secs, in: "-11:52"),
+    Time.at(secs, in: "+00:00"),
+    Time.at(secs, in: "-00:00"),
+    Time.at(secs, 1, :millisecond),
+    Time.at(secs, 1.1, :millisecond),
+    Time.at(secs, 1.01, :millisecond),
+    Time.at(secs, 1, :microsecond),
+    Time.at(secs, 1.1, :microsecond),
+    Time.at(secs, 1.01, :microsecond),
+    Time.at(secs, 1, :nanosecond),
+    Time.at(secs, 1.1, :nanosecond),
+    Time.at(secs, 1.01, :nanosecond),
+    Time.at(secs, 1.001, :nanosecond),
+    Time.at(secs, 1.00001, :nanosecond),
+    Time.at(secs, 1.00001, :nanosecond),
+    Time.at(secs, in: "UTC"),
+    Time.at(secs, in: "Z"),
+  ].each_with_index do |t, i|
+    define_method("test_time_#{i} #{t.inspect}") do
+      additional_methods = [:ctime, :to_f, :to_r, :to_i, :zone, :subsec, :instance_variables, :dst?, :to_a]
+      assert_safe_load_as t, additional_methods: additional_methods
+    end
+  end
+
+  def test_floats
+    [0.0, Float::INFINITY, Float::NAN, 1.1, 3e7].each do |f|
+      assert_safe_load_as f
+      assert_safe_load_as(-f)
+    end
+  end
+
+  def test_link_after_float
+    a = []
+    a << a
+    assert_safe_load_as [0.0, a, 1.0, a]
+  end
+
+  def test_hash_with_ivar
+    h = { runtime: :development }
+    h.instance_variable_set :@type, []
+    with_const(Gem::SafeMarshal, :PERMITTED_IVARS, { "Hash" => %w[@type] }) do
+      assert_safe_load_as(h)
+    end
+  end
+
+  def test_hash_with_default_value
+    assert_safe_load_as Hash.new([])
+  end
+
+  def test_hash_with_compare_by_identity
+    with_const(Gem::SafeMarshal, :PERMITTED_CLASSES, %w[Hash]) do
+      assert_safe_load_as Hash.new.compare_by_identity.tap {|h|
+                            h[+"a"] = 1
+                            h[+"a"] = 2 }, additional_methods: [:compare_by_identity?], equality: false
+      assert_safe_load_as Hash.new.compare_by_identity, additional_methods: [:compare_by_identity?]
+      assert_safe_load_as Hash.new(0).compare_by_identity.tap {|h|
+                            h[+"a"] = 1
+                            h[+"a"] = 2 }, additional_methods: [:compare_by_identity?, :default], equality: false
+    end
+  end
+
+  class UserMarshal
+    def marshal_load(*)
+      throw "#{self.class}#marshal_load called"
+    end
+
+    def marshal_dump
+    end
+  end
+
+  def test_time_user_marshal
+    payload = [
+      Marshal::MAJOR_VERSION.chr, Marshal::MINOR_VERSION.chr,
+      "I", # TYPE_IVAR
+      "u", # TYPE_USERDEF
+      Marshal.dump(:Time)[2..-1],
+      Marshal.dump(0xfb - 5)[3..-1],
+      Marshal.dump(1)[3..-1],
+      Marshal.dump(:zone)[2..-1],
+      Marshal.dump(UserMarshal.new)[2..-1],
+      ("\x00" * (236 - UserMarshal.name.bytesize))
+    ].join
+
+    assert_raise(Gem::SafeMarshal::Visitors::ToRuby::TimeTooLargeError, TypeError) { Gem::SafeMarshal.safe_load(payload) }
+  end
+
+  class StringSubclass < ::String
+  end
+
+  def test_string_subclass
+    with_const(Gem::SafeMarshal, :PERMITTED_CLASSES, [StringSubclass.name]) do
+      with_const(Gem::SafeMarshal, :PERMITTED_IVARS, { StringSubclass.name => %w[E] }) do
+        e = assert_raise(Gem::SafeMarshal::Visitors::ToRuby::UnsupportedError) do
+          Gem::SafeMarshal.safe_load Marshal.dump StringSubclass.new("abc")
+        end
+        assert_equal "Unsupported user class #{StringSubclass.name} in marshal stream @ root.object", e.message
+      end
+    end
+  end
+
+  class ArraySubclass < ::Array
+  end
+
+  def test_array_subclass
+    with_const(Gem::SafeMarshal, :PERMITTED_CLASSES, [ArraySubclass.name]) do
+      e = assert_raise(Gem::SafeMarshal::Visitors::ToRuby::UnsupportedError) do
+        Gem::SafeMarshal.safe_load(Marshal.dump(ArraySubclass.new << "abc"))
+      end
+      assert_equal "Unsupported user class #{ArraySubclass.name} in marshal stream @ root", e.message
+    end
+  end
+
+  def test_frozen_object
+    assert_safe_load_as Gem::Version.new("1.abc").freeze
+  end
+
+  def test_date
+    assert_safe_load_as Date.new(1994, 12, 9)
+  end
+
+  def test_rational
+    assert_safe_load_as Rational(1, 3)
+  end
+
+  [
+    0, 1, 2, 3, 4, 5, 6, 122, 123, 124, 127, 128, 255, 256, 257,
+    2**16, 2**16 - 1, 2**20 - 1,
+    2**28, 2**28 - 1,
+    2**32, 2**32 - 1,
+    2**63, 2**63 - 1
+  ].
+  each do |i|
+    define_method("test_int_ #{i}") do
+      assert_safe_load_as i
+      assert_safe_load_as(-i)
+      assert_safe_load_as(i + 1)
+      assert_safe_load_as(i - 1)
+    end
+  end
+
+  def test_gem_spec_unmarshall_license
+    spec = Gem::Specification.new do |s|
+      s.name = "hi"
+      s.version = "1.2.3"
+      s.license = "MIT"
+    end
+
+    unmarshalled_spec = Gem::SafeMarshal.safe_load(Marshal.dump(spec))
+
+    assert_equal ["MIT"], unmarshalled_spec.licenses
+    assert_equal "MIT", unmarshalled_spec.license
+
+    spec = Gem::Specification.new do |s|
+      s.name = "hi"
+      s.version = "1.2.3"
+      s.licenses = ["MIT", "GPL2"]
+    end
+
+    unmarshalled_spec = Gem::SafeMarshal.safe_load(Marshal.dump(spec))
+
+    assert_equal ["MIT", "GPL2"], unmarshalled_spec.licenses
+    assert_equal "MIT", unmarshalled_spec.license
+  end
+
+  def test_gem_spec_unmarshall_required_ruby_rubygems_version
+    spec = Gem::Specification.new do |s|
+      s.name = "hi"
+      s.version = "1.2.3"
+      s.license = "MIT"
+    end
+
+    assert_safe_load_marshal spec._dump(0), inspect: false, to_s: false
+    assert_safe_load_marshal Marshal.dump(spec), inspect: false, additional_methods: [:to_ruby, :required_ruby_version, :required_rubygems_version]
+
+    unmarshalled_spec = Gem::SafeMarshal.safe_load(Marshal.dump(spec))
+
+    assert_equal Gem::Requirement.new(">= 0"), unmarshalled_spec.required_ruby_version
+    assert_equal Gem::Requirement.new(">= 0"), unmarshalled_spec.required_rubygems_version
+  end
+
+  def test_gem_spec_disallowed_symbol
+    e = assert_raise(Gem::SafeMarshal::Visitors::ToRuby::UnpermittedSymbolError) do
+      spec = Gem::Specification.new do |s|
+        s.name = "hi"
+        s.version = "1.2.3"
+
+        s.dependencies << Gem::Dependency.new("rspec", Gem::Requirement.new([">= 1.2.3"]), :runtime).tap {|d| d.instance_variable_set(:@name, :rspec) }
+      end
+      Gem::SafeMarshal.safe_load(Marshal.dump(spec))
+    end
+
+    assert_equal e.message, "Attempting to load unpermitted symbol \"rspec\" @ root.[9].[0].@name"
+  end
+
+  def test_gem_spec_disallowed_ivar
+    e = assert_raise(Gem::SafeMarshal::Visitors::ToRuby::UnpermittedIvarError) do
+      spec = Gem::Specification.new do |s|
+        s.name = "hi"
+        s.version = "1.2.3"
+
+        s.metadata.instance_variable_set(:@foobar, "rspec")
+      end
+      Gem::SafeMarshal.safe_load(Marshal.dump(spec))
+    end
+
+    assert_equal e.message, "Attempting to set unpermitted ivar \"@foobar\" on object of class Hash @ root.[18].ivar_0"
+  end
+
+  def test_unexpected_eof
+    e = assert_raise(Gem::SafeMarshal::Reader::EOFError) do
+      Gem::SafeMarshal.safe_load("\x04\x08")
+    end
+    assert_equal e.message, "Unexpected EOF"
+
+    e = assert_raise(Gem::SafeMarshal::Reader::EOFError) do
+      Gem::SafeMarshal.safe_load("\x04\x08[")
+    end
+    assert_equal e.message, "Unexpected EOF"
+
+    e = assert_raise(Gem::SafeMarshal::Reader::EOFError) do
+      Gem::SafeMarshal.safe_load("\x04\x08[\x06")
+    end
+    assert_equal e.message, "Unexpected EOF"
+
+    e = assert_raise(Gem::SafeMarshal::Reader::EOFError) do
+      Gem::SafeMarshal.safe_load("\004\010:\012")
+    end
+    assert_equal e.message, "expected 5 bytes, got EOF"
+
+    e = assert_raise(Gem::SafeMarshal::Reader::EOFError) do
+      Gem::SafeMarshal.safe_load("\x04\x08i\x01")
+    end
+    assert_equal e.message, "Unexpected EOF"
+    e = assert_raise(Gem::SafeMarshal::Reader::EOFError) do
+      Gem::SafeMarshal.safe_load("\x04\x08\"\x06")
+    end
+    assert_equal e.message, "expected 1 bytes, got EOF"
+  end
+
+  def test_negative_length
+    assert_raise(Gem::SafeMarshal::Reader::NegativeLengthError) do
+      Gem::SafeMarshal.safe_load("\004\010}\325")
+    end
+    assert_raise(Gem::SafeMarshal::Reader::NegativeLengthError) do
+      Gem::SafeMarshal.safe_load("\004\010:\325")
+    end
+    assert_raise(Gem::SafeMarshal::Reader::NegativeLengthError) do
+      Gem::SafeMarshal.safe_load("\004\010\"\325")
+    end
+    assert_raise(IndexError) do
+      Gem::SafeMarshal.safe_load("\004\010;\325")
+    end
+    assert_raise(Gem::SafeMarshal::Reader::EOFError) do
+      Gem::SafeMarshal.safe_load("\004\010@\377")
+    end
+  end
+
+  def assert_safe_load_marshal(dumped, additional_methods: [], permitted_ivars: nil, equality: true, marshal_dump_equality: true,
+    inspect: true, to_s: true)
+    loaded = Marshal.load(dumped)
+    safe_loaded =
+      assert_nothing_raised("dumped: #{dumped.b.inspect} loaded: #{loaded.inspect}") do
+        if permitted_ivars
+          with_const(Gem::SafeMarshal, :PERMITTED_IVARS, permitted_ivars) do
+            Gem::SafeMarshal.safe_load(dumped)
+          end
+        else
+          Gem::SafeMarshal.safe_load(dumped)
+        end
+      end
+
+    # NaN != NaN, for example
+    if equality
+      assert_equal loaded, safe_loaded, "should equal what Marshal.load returns"
+    end
+
+    assert_equal loaded.to_s, safe_loaded.to_s, "should have equal to_s" if to_s
+    assert_equal loaded.inspect, safe_loaded.inspect, "should have equal inspect" if inspect
+    additional_methods.each do |m|
+      if m.is_a?(Proc)
+        call = m
+      else
+        call = ->(obj) { obj.__send__(m) }
+      end
+
+      assert_equal call[loaded], call[safe_loaded], "should have equal #{m}"
+    end
+    if marshal_dump_equality
+      assert_equal Marshal.dump(loaded).dump, Marshal.dump(safe_loaded).dump, "should Marshal.dump the same"
+    end
+  end
+
+  def assert_safe_load_as(x, **kwargs)
+    dumped = Marshal.dump(x)
+    equality = x == x # rubocop:disable Lint/BinaryOperatorWithIdenticalOperands
+    assert_safe_load_marshal(dumped, equality: equality, **kwargs)
+  end
+
+  def with_const(mod, name, new_value, &block)
+    orig = mod.const_get(name)
+    mod.send :remove_const, name
+    mod.const_set name, new_value
+
+    begin
+      yield
+    ensure
+      mod.send :remove_const, name
+      mod.const_set name, orig
+      mod.send :private_constant, name
+    end
+  end
+end
diff --git a/test/rubygems/test_gem_safe_yaml.rb b/test/rubygems/test_gem_safe_yaml.rb
new file mode 100644
index 00000000000000..02df9f97da58ac
--- /dev/null
+++ b/test/rubygems/test_gem_safe_yaml.rb
@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+require_relative "helper"
+
+Gem.load_yaml
+
+class TestGemSafeYAML < Gem::TestCase
+  def test_aliases_enabled_by_default
+    assert_predicate Gem::SafeYAML, :aliases_enabled?
+    assert_equal({ "a" => "a", "b" => "a" }, Gem::SafeYAML.safe_load("a: &a a\nb: *a\n"))
+  end
+
+  def test_aliases_disabled
+    aliases_enabled = Gem::SafeYAML.aliases_enabled?
+    Gem::SafeYAML.aliases_enabled = false
+    refute_predicate Gem::SafeYAML, :aliases_enabled?
+    expected_error = defined?(Psych::AliasesNotEnabled) ? Psych::AliasesNotEnabled : Psych::BadAlias
+    assert_raise expected_error do
+      Gem::SafeYAML.safe_load("a: &a\nb: *a\n")
+    end
+  ensure
+    Gem::SafeYAML.aliases_enabled = aliases_enabled
+  end
+end
diff --git a/test/rubygems/test_gem_security_policy.rb b/test/rubygems/test_gem_security_policy.rb
index 0c5c6214852d35..2f4fb1ce287597 100644
--- a/test/rubygems/test_gem_security_policy.rb
+++ b/test/rubygems/test_gem_security_policy.rb
@@ -43,22 +43,22 @@ def setup
 
     @chain = Gem::Security::Policy.new(
       "Chain",
-      :verify_data => true,
-      :verify_signer => true,
-      :verify_chain => true,
-      :verify_root => false,
-      :only_trusted => false,
-      :only_signed => false
+      verify_data: true,
+      verify_signer: true,
+      verify_chain: true,
+      verify_root: false,
+      only_trusted: false,
+      only_signed: false
     )
 
     @root = Gem::Security::Policy.new(
       "Root",
-      :verify_data => true,
-      :verify_signer => true,
-      :verify_chain => true,
-      :verify_root => true,
-      :only_trusted => false,
-      :only_signed => false
+      verify_data: true,
+      verify_signer: true,
+      verify_chain: true,
+      verify_root: true,
+      only_trusted: false,
+      only_signed: false
     )
   end
 
diff --git a/test/rubygems/test_gem_security_signer.rb b/test/rubygems/test_gem_security_signer.rb
index 5265678d299d42..f4799cbd46867e 100644
--- a/test/rubygems/test_gem_security_signer.rb
+++ b/test/rubygems/test_gem_security_signer.rb
@@ -144,7 +144,7 @@ def test_sign_expired
 
   def test_sign_expired_auto_update
     pend if Gem.java_platform?
-    FileUtils.mkdir_p File.join(Gem.user_home, ".gem"), :mode => 0o700
+    FileUtils.mkdir_p File.join(Gem.user_home, ".gem"), mode: 0o700
 
     private_key_path = File.join(Gem.user_home, ".gem", "gem-private_key.pem")
     Gem::Security.write PRIVATE_KEY, private_key_path
@@ -171,7 +171,7 @@ def test_sign_expired_auto_update
   end
 
   def test_sign_expired_auto_update_exists
-    FileUtils.mkdir_p File.join(Gem.user_home, ".gem"), :mode => 0o700
+    FileUtils.mkdir_p File.join(Gem.user_home, ".gem"), mode: 0o700
 
     expiry = EXPIRED_CERT.not_after.strftime "%Y%m%d%H%M%S"
     expired_path =
diff --git a/test/rubygems/test_gem_security_trust_dir.rb b/test/rubygems/test_gem_security_trust_dir.rb
index b7c9a6feb03820..cfde8e9d48a662 100644
--- a/test/rubygems/test_gem_security_trust_dir.rb
+++ b/test/rubygems/test_gem_security_trust_dir.rb
@@ -87,7 +87,7 @@ def test_verify_file
   end
 
   def test_verify_wrong_permissions
-    FileUtils.mkdir_p @dest_dir, :mode => 0o777
+    FileUtils.mkdir_p @dest_dir, mode: 0o777
 
     @trust_dir.verify
 
diff --git a/test/rubygems/test_gem_silent_ui.rb b/test/rubygems/test_gem_silent_ui.rb
index 94411f30b39a89..001a73eb513809 100644
--- a/test/rubygems/test_gem_silent_ui.rb
+++ b/test/rubygems/test_gem_silent_ui.rb
@@ -2,7 +2,6 @@
 
 require_relative "helper"
 require "rubygems/user_interaction"
-require "timeout"
 
 class TestGemSilentUI < Gem::TestCase
   def setup
diff --git a/test/rubygems/test_gem_source.rb b/test/rubygems/test_gem_source.rb
index 0372c6253cc3c4..423abd6dd20a37 100644
--- a/test/rubygems/test_gem_source.rb
+++ b/test/rubygems/test_gem_source.rb
@@ -2,7 +2,6 @@
 
 require_relative "helper"
 require "rubygems/source"
-require "rubygems/indexer"
 
 class TestGemSource < Gem::TestCase
   def tuple(*args)
@@ -23,7 +22,7 @@ def setup
   end
 
   def test_initialize_invalid_uri
-    assert_raise URI::InvalidURIError do
+    assert_raise Gem::URI::InvalidURIError do
       Gem::Source.new "git@example:a.git"
     end
   end
@@ -37,17 +36,17 @@ def test_initialize_git
   end
 
   def test_cache_dir_escapes_windows_paths
-    uri = URI.parse("file:///C:/WINDOWS/Temp/gem_repo")
+    uri = Gem::URI.parse("file:///C:/WINDOWS/Temp/gem_repo")
     root = Gem.spec_cache_dir
     cache_dir = @source.cache_dir(uri).gsub(root, "")
-    assert cache_dir !~ /:/, "#{cache_dir} should not contain a :"
+    assert !cache_dir.include?(":"), "#{cache_dir} should not contain a :"
   end
 
   def test_dependency_resolver_set_bundler_api
-    response = Net::HTTPResponse.new "1.1", 200, "OK"
-    response.uri = URI("http://example")
+    response = Gem::Net::HTTPResponse.new "1.1", 200, "OK"
+    response.uri = Gem::URI("http://example")
 
-    @fetcher.data[@gem_repo] = response
+    @fetcher.data["#{@gem_repo}versions"] = response
 
     set = @source.dependency_resolver_set
 
@@ -55,7 +54,9 @@ def test_dependency_resolver_set_bundler_api
   end
 
   def test_dependency_resolver_set_file_uri
-    Gem::Indexer.new(@tempdir).generate_index
+    empty_dump = Gem::Util.gzip("\x04\x08[\x05".b)
+    File.binwrite(File.join(@tempdir, "prerelease_specs.4.8.gz"), empty_dump)
+    File.binwrite(File.join(@tempdir, "specs.4.8.gz"), empty_dump)
 
     source = Gem::Source.new "file://#{@tempdir}/"
 
@@ -78,7 +79,7 @@ def test_fetch_spec
     spec = @source.fetch_spec tuple("a", Gem::Version.new(1), "ruby")
     assert_equal a1.full_name, spec.full_name
 
-    cache_dir = @source.cache_dir URI.parse(spec_uri)
+    cache_dir = @source.cache_dir Gem::URI.parse(spec_uri)
 
     cache_file = File.join cache_dir, a1.spec_name
 
@@ -91,7 +92,7 @@ def test_fetch_spec_cached
     spec_uri = "#{@gem_repo}/#{Gem::MARSHAL_SPEC_DIR}#{a1.spec_name}"
     @fetcher.data["#{spec_uri}.rz"] = nil
 
-    cache_dir = @source.cache_dir URI.parse(spec_uri)
+    cache_dir = @source.cache_dir Gem::URI.parse(spec_uri)
     FileUtils.mkdir_p cache_dir
 
     cache_file = File.join cache_dir, a1.spec_name
diff --git a/test/rubygems/test_gem_source_git.rb b/test/rubygems/test_gem_source_git.rb
index 18265bd814df2e..fef79a07438783 100644
--- a/test/rubygems/test_gem_source_git.rb
+++ b/test/rubygems/test_gem_source_git.rb
@@ -289,7 +289,11 @@ def test_specs_local
   end
 
   def test_uri
-    assert_equal URI(@repository), @source.uri
+    assert_equal Gem::URI(@repository), @source.uri
+  end
+
+  def test_pretty_print
+    assert_equal "#<Gem::Source::Git[Git: #{@repository} HEAD]>", @source.pretty_inspect.gsub(/\s+/, " ").strip
   end
 
   def test_uri_hash
diff --git a/test/rubygems/test_gem_source_installed.rb b/test/rubygems/test_gem_source_installed.rb
index 0d6171b0e52682..0c879e7bccae23 100644
--- a/test/rubygems/test_gem_source_installed.rb
+++ b/test/rubygems/test_gem_source_installed.rb
@@ -32,4 +32,9 @@ def test_spaceship
     assert_equal(1, vendor.<=>(installed), "vendor <=> installed")
     assert_equal(-1, installed.<=>(vendor), "installed <=> vendor")
   end
+
+  def test_pretty_print
+    local = Gem::Source::Installed.new
+    assert_equal "#<Gem::Source::Installed[Installed]>", local.pretty_inspect.gsub(/\s+/, " ").strip
+  end
 end
diff --git a/test/rubygems/test_gem_source_list.rb b/test/rubygems/test_gem_source_list.rb
index fc084830ba4243..64353f8f90df97 100644
--- a/test/rubygems/test_gem_source_list.rb
+++ b/test/rubygems/test_gem_source_list.rb
@@ -37,7 +37,7 @@ def test_append
 
     assert_kind_of Gem::Source, source
 
-    assert_kind_of URI, source.uri
+    assert_kind_of Gem::URI, source.uri
     assert_equal source.uri.to_s, @uri
 
     assert_equal [source], sl.sources
@@ -99,7 +99,7 @@ def test_to_a
 
   def test_include_eh
     assert @sl.include?(@uri), "string comparison not working"
-    assert @sl.include?(URI.parse(@uri)), "uri comparison not working"
+    assert @sl.include?(Gem::URI.parse(@uri)), "uri comparison not working"
   end
 
   def test_include_matches_a_source
diff --git a/test/rubygems/test_gem_source_local.rb b/test/rubygems/test_gem_source_local.rb
index c15e0e07c0a7f7..e9d7f454820a3e 100644
--- a/test/rubygems/test_gem_source_local.rb
+++ b/test/rubygems/test_gem_source_local.rb
@@ -104,4 +104,9 @@ def test_spaceship
     assert_equal(-1, specific.<=>(local), "specific <=> local")
     assert_equal(1, local.<=>(specific), "local <=> specific")
   end
+
+  def test_pretty_print
+    local = Gem::Source::Local.new
+    assert_equal "#<Gem::Source::Local[Local gems: ]>", local.pretty_inspect.gsub(/\s+/, " ").strip
+  end
 end
diff --git a/test/rubygems/test_gem_source_lock.rb b/test/rubygems/test_gem_source_lock.rb
index ece55581ecc26b..91ffee68f23e99 100644
--- a/test/rubygems/test_gem_source_lock.rb
+++ b/test/rubygems/test_gem_source_lock.rb
@@ -110,6 +110,6 @@ def test_uri
     remote = Gem::Source.new @gem_repo
     lock   = Gem::Source::Lock.new remote
 
-    assert_equal URI(@gem_repo), lock.uri
+    assert_equal Gem::URI(@gem_repo), lock.uri
   end
 end
diff --git a/test/rubygems/test_gem_source_specific_file.rb b/test/rubygems/test_gem_source_specific_file.rb
index 3bc1901ee19926..6d941a6630a966 100644
--- a/test/rubygems/test_gem_source_specific_file.rb
+++ b/test/rubygems/test_gem_source_specific_file.rb
@@ -73,4 +73,8 @@ def test_spaceship
     assert_equal(0, a1_source.<=>(a1_source), "a1_source <=> a1_source") # rubocop:disable Lint/BinaryOperatorWithIdenticalOperands
     assert_equal(1, a2_source.<=>(a1_source), "a2_source <=> a1_source")
   end
+
+  def test_pretty_print
+    assert_equal "#<Gem::Source::SpecificFile[SpecificFile: #{@sf.path}]>", @sf.pretty_inspect.gsub(/\s+/, " ").strip
+  end
 end
diff --git a/test/rubygems/test_gem_source_subpath_problem.rb b/test/rubygems/test_gem_source_subpath_problem.rb
index 0aa2085b3c01b4..ad11529f670572 100644
--- a/test/rubygems/test_gem_source_subpath_problem.rb
+++ b/test/rubygems/test_gem_source_subpath_problem.rb
@@ -21,10 +21,10 @@ def setup
   end
 
   def test_dependency_resolver_set
-    response = Net::HTTPResponse.new "1.1", 200, "OK"
-    response.uri = URI("http://example")
+    response = Gem::Net::HTTPResponse.new "1.1", 200, "OK"
+    response.uri = Gem::URI("http://example")
 
-    @fetcher.data["#{@gem_repo}/"] = response
+    @fetcher.data["#{@gem_repo}/versions"] = response
 
     set = @source.dependency_resolver_set
 
diff --git a/test/rubygems/test_gem_spec_fetcher.rb b/test/rubygems/test_gem_spec_fetcher.rb
index 0fca9f0c48e965..1f7b5984c33583 100644
--- a/test/rubygems/test_gem_spec_fetcher.rb
+++ b/test/rubygems/test_gem_spec_fetcher.rb
@@ -11,7 +11,7 @@ def tuple(*args)
   def setup
     super
 
-    @uri = URI.parse @gem_repo
+    @uri = Gem::URI.parse @gem_repo
     @source = Gem::Source.new(@uri)
 
     @sf = Gem::SpecFetcher.new
@@ -169,19 +169,24 @@ def test_suggest_gems_from_name_latest
     spec_fetcher do|fetcher|
       fetcher.spec "example", 1
       fetcher.spec "other-example", 1
+      fetcher.spec "an-example", 1
       fetcher.spec "examp", 1
     end
 
     suggestions = @sf.suggest_gems_from_name("examplw", :latest, 1)
     assert_equal ["example"], suggestions
 
-    suggestions = @sf.suggest_gems_from_name("other")
-    assert_equal ["other-example"], suggestions
+    suggestions = @sf.suggest_gems_from_name("anexample")
+    assert_equal ["an-example"], suggestions
+
+    suggestions = @sf.suggest_gems_from_name("xample")
+    assert_equal ["example"], suggestions
+
+    suggestions = @sf.suggest_gems_from_name("amp")
+    assert_equal [], suggestions
 
-    suggestions = @sf.suggest_gems_from_name("exam")
-    assert suggestions.any? { ["examp"] }
-    assert suggestions.any? { ["example"] }
-    assert suggestions.any? { ["other-example"] }
+    suggestions = @sf.suggest_gems_from_name("other-apple")
+    assert_equal ["other-example"], suggestions
   end
 
   def test_suggest_gems_from_name_prerelease
@@ -194,6 +199,33 @@ def test_suggest_gems_from_name_prerelease
     assert_equal ["example"], suggestions
   end
 
+  def test_suggest_gems_from_name_prefix_or_suffix
+    spec_fetcher do|fetcher|
+      fetcher.spec "example-one-ruby", 1
+      fetcher.spec "example-one-rrrr", 1
+      fetcher.spec "ruby-example-two", 1
+      fetcher.spec "rrrr-example-two", 1
+    end
+
+    suggestions = @sf.suggest_gems_from_name("example-one")
+    assert_equal ["example-one-ruby"], suggestions
+
+    suggestions = @sf.suggest_gems_from_name("example-two")
+    assert_equal ["ruby-example-two"], suggestions
+
+    suggestions = @sf.suggest_gems_from_name("exampleone")
+    assert_equal ["example-one-ruby"], suggestions
+
+    suggestions = @sf.suggest_gems_from_name("exampletwo")
+    assert_equal ["ruby-example-two"], suggestions
+
+    suggestions = @sf.suggest_gems_from_name("example---one")
+    assert_equal ["example-one-ruby"], suggestions
+
+    suggestions = @sf.suggest_gems_from_name("example---two")
+    assert_equal ["ruby-example-two"], suggestions
+  end
+
   def test_available_specs_latest
     spec_fetcher do |fetcher|
       fetcher.spec "a", 1
diff --git a/test/rubygems/test_gem_specification.rb b/test/rubygems/test_gem_specification.rb
index 25b72c587f05f8..af351f4d2e1fc0 100644
--- a/test/rubygems/test_gem_specification.rb
+++ b/test/rubygems/test_gem_specification.rb
@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require "benchmark"
 require_relative "helper"
 require "date"
 require "pathname"
@@ -17,7 +16,7 @@ class TestGemSpecification < Gem::TestCase
 name: keyedlist
 version: !ruby/object:Gem::Version
   version: 0.4.0
-date: 2004-03-28 15:37:49.828000 +02:00
+date: 1980-01-02 00:00:00 UTC
 platform:
 summary: A Hash which automatically computes keys.
 require_paths:
@@ -56,7 +55,6 @@ def make_spec_c1
       s.add_dependency "jabber4r", "> 0.0.0"
       s.add_dependency "pqa", ["> 0.4", "<= 0.6"]
 
-      s.mark_version
       s.files = %w[lib/code.rb]
     end
   end
@@ -69,7 +67,6 @@ def ext_spec(platform: Gem::Platform::RUBY)
       s.license = "MIT"
       s.platform = platform
 
-      s.mark_version
       s.files = %w[lib/code.rb]
       s.installed_by_version = v("2.2")
     end
@@ -78,7 +75,7 @@ def ext_spec(platform: Gem::Platform::RUBY)
   def assert_date(date)
     assert_kind_of Time, date
     assert_equal [0, 0, 0], [date.hour, date.min, date.sec]
-    assert_operator (Gem::Specification::TODAY..Time.now), :cover?, date
+    assert_equal Time.at(Gem::DEFAULT_SOURCE_DATE_EPOCH).utc, date
   end
 
   def setup
@@ -90,12 +87,12 @@ def setup
     Gem.instance_variable_set(:'@default_source_date_epoch', nil)
 
     @a1 = util_spec "a", "1" do |s|
+      s.required_ruby_version = ">= 2.3.0"
       s.executable = "exec"
       s.test_file = "test/suite.rb"
       s.requirements << "A working computer"
       s.license = "MIT"
 
-      s.mark_version
       s.files = %w[lib/code.rb]
     end
 
@@ -148,6 +145,12 @@ def test_self_activate_ambiguous_direct
   end
 
   def test_find_in_unresolved_tree_is_not_exponentiental
+    begin
+      require "benchmark"
+    rescue LoadError
+      pend "Benchmark is not available in this environment. Please install it with `gem install benchmark`."
+    end
+
     pend "currently slower in CI on TruffleRuby" if RUBY_ENGINE == "truffleruby"
     num_of_pkg = 7
     num_of_version_per_pkg = 3
@@ -561,7 +564,6 @@ def test_self_activate_unrelated
   #         [B] ~> 1.0
   #
   # and should resolve using b-1.0
-  # TODO: move these to specification
 
   def test_self_activate_over
     a = util_spec "a", "1.0", "b" => ">= 1.0", "c" => "= 1.0"
@@ -650,6 +652,17 @@ def test_self_activate_conflict
     end
   end
 
+  def test_self_activate_missing_deps_does_not_raise_nested_exceptions
+    a = util_spec "a", "1.0", "b" => ">= 1.0"
+    install_specs a
+
+    e = assert_raise Gem::MissingSpecError do
+      a.activate
+    end
+
+    refute e.cause
+  end
+
   def test_self_all_equals
     a = util_spec "foo", "1", nil, "lib/foo.rb"
 
@@ -797,28 +810,6 @@ def test_self_load_relative
     assert_equal File.join(@tempdir, "a-2.gemspec"), spec.loaded_from
   end
 
-  if RUBY_ENGINE == "ruby" && RUBY_VERSION < "2.7"
-    def test_self_load_tainted
-      full_path = @a2.spec_file
-      write_file full_path do |io|
-        io.write @a2.to_ruby_for_cache
-      end
-
-      full_path.taint
-      loader = Thread.new do
-        $SAFE = 1
-        Gem::Specification.load full_path
-      end
-      spec = loader.value
-
-      @a2.files.clear
-
-      assert_equal @a2, spec
-    ensure
-      $SAFE = 0
-    end
-  end
-
   def test_self_load_escape_curly
     @a2.name = 'a};raise "improper escaping";%q{'
 
@@ -991,7 +982,10 @@ def test_self_remove_spec_removed
 
   def test_self_stubs_for_lazy_loading
     Gem.loaded_specs.clear
-    Gem::Specification.class_variable_set(:@@stubs, nil)
+
+    specification_record = Gem::Specification.specification_record
+
+    specification_record.instance_variable_set(:@stubs, nil)
 
     dir_standard_specs = File.join Gem.dir, "specifications"
 
@@ -999,9 +993,9 @@ def test_self_stubs_for_lazy_loading
     save_gemspec("b-1", "1", dir_standard_specs) {|s| s.name = "b" }
 
     assert_equal ["a-1"], Gem::Specification.stubs_for("a").map(&:full_name)
-    assert_equal 1, Gem::Specification.class_variable_get(:@@stubs_by_name).length
+    assert_equal 1, specification_record.instance_variable_get(:@stubs_by_name).length
     assert_equal ["b-1"], Gem::Specification.stubs_for("b").map(&:full_name)
-    assert_equal 2, Gem::Specification.class_variable_get(:@@stubs_by_name).length
+    assert_equal 2, specification_record.instance_variable_get(:@stubs_by_name).length
 
     assert_equal(
       Gem::Specification.stubs_for("a").map(&:object_id),
@@ -1010,7 +1004,7 @@ def test_self_stubs_for_lazy_loading
 
     Gem.loaded_specs.delete "a"
     Gem.loaded_specs.delete "b"
-    Gem::Specification.class_variable_set(:@@stubs, nil)
+    specification_record.instance_variable_set(:@stubs, nil)
   end
 
   def test_self_stubs_for_no_lazy_loading_after_all_specs_setup
@@ -1035,7 +1029,7 @@ def test_self_stubs_for_mult_platforms
 
     gem = "mingw"
     v   = "1.1.1"
-    platforms = ["x86-mingw32", "x64-mingw32"]
+    platforms = ["x86-mingw32", "x64-mingw-ucrt"]
 
     # create specs
     platforms.each do |plat|
@@ -1216,10 +1210,13 @@ def test_initialize_copy
     assert_same spec.bindir, dup_spec.bindir
 
     assert_equal ">= 0", spec.required_ruby_version.to_s
-    assert_same spec.required_ruby_version, dup_spec.required_ruby_version
+    assert_equal spec.required_ruby_version, dup_spec.required_ruby_version
+    refute_same spec.required_ruby_version, dup_spec.required_ruby_version
 
     assert_equal ">= 0", spec.required_rubygems_version.to_s
-    assert_same spec.required_rubygems_version,
+    assert_equal spec.required_rubygems_version,
+                 dup_spec.required_rubygems_version
+    refute_same spec.required_rubygems_version,
                 dup_spec.required_rubygems_version
   end
 
@@ -1347,7 +1344,6 @@ def test_extra_rdoc_files_equals_nil
   end
 
   def test_build_args
-    pend "extensions don't quite work on jruby" if Gem.java_platform?
     ext_spec
 
     assert_empty @ext.build_args
@@ -1364,7 +1360,6 @@ def test_build_args
   end
 
   def test_build_extensions
-    pend "extensions don't quite work on jruby" if Gem.java_platform?
     ext_spec
 
     assert_path_not_exist @ext.extension_dir, "sanity check"
@@ -1400,7 +1395,6 @@ def test_default_spec_stub_is_marked_default
   end
 
   def test_build_extensions_built
-    pend "extensions don't quite work on jruby" if Gem.java_platform?
     ext_spec
 
     refute_empty @ext.extensions, "sanity check"
@@ -1439,7 +1433,6 @@ def test_build_extensions_default_gem
   end
 
   def test_build_extensions_error
-    pend "extensions don't quite work on jruby" if Gem.java_platform?
     ext_spec
 
     refute_empty @ext.extensions, "sanity check"
@@ -1453,7 +1446,7 @@ def test_build_extensions_extensions_dir_unwritable
     pend "chmod not supported" if Gem.win_platform?
     pend "skipped in root privilege" if Process.uid.zero?
 
-    pend "extensions don't quite work on jruby" if Gem.java_platform?
+    pend "needs investigation" if Gem.java_platform?
     ext_spec
 
     refute_empty @ext.extensions, "sanity check"
@@ -1486,7 +1479,6 @@ def test_build_extensions_extensions_dir_unwritable
 
   def test_build_extensions_no_extensions_dir_unwritable
     pend "chmod not supported" if Gem.win_platform?
-    pend "extensions don't quite work on jruby" if Gem.java_platform?
     ext_spec
 
     refute_empty @ext.extensions, "sanity check"
@@ -1525,7 +1517,6 @@ def test_build_extensions_none
   end
 
   def test_build_extensions_preview
-    pend "extensions don't quite work on jruby" if Gem.java_platform?
     ext_spec
 
     extconf_rb = File.join @ext.gem_dir, @ext.extensions.first
@@ -1560,7 +1551,6 @@ def test_contains_requirable_file_eh
   end
 
   def test_contains_requirable_file_eh_extension
-    pend "extensions don't quite work on jruby" if Gem.java_platform?
     ext_spec
 
     _, err = capture_output do
@@ -1583,6 +1573,17 @@ def test_contains_requirable_file_eh_extension_java_platform
     assert_empty err
   end
 
+  def test_contains_requirable_file_extension_soext
+    ext_spec
+    dlext = RbConfig::CONFIG["DLEXT"]
+    @ext.files += ["lib/ext.#{dlext}"]
+
+    FileUtils.mkdir_p @ext.extension_dir
+    FileUtils.touch File.join(@ext.extension_dir, "ext.#{dlext}")
+    FileUtils.touch File.join(@ext.extension_dir, "gem.build_complete")
+    assert @ext.contains_requirable_file? "ext.so"
+  end
+
   def test_date
     assert_date @a1.date
   end
@@ -1840,7 +1841,7 @@ def test_files_non_array_pathological
   end
 
   def test_for_cache
-    @a2.add_runtime_dependency "b", "1"
+    @a2.add_dependency "b", "1"
     @a2.dependencies.first.instance_variable_set :@type, nil
     @a2.required_rubygems_version = Gem::Requirement.new "> 0"
     @a2.test_files = %w[test/test_b.rb]
@@ -2027,12 +2028,6 @@ def test_platform_equals_legacy
     assert_equal Gem::Platform.new("ppc-darwin"), @a1.platform
   end
 
-  def test_prerelease_spec_adds_required_rubygems_version
-    @prerelease = util_spec("tardis", "2.2.0.a")
-    refute @prerelease.required_rubygems_version.satisfied_by?(Gem::Version.new("1.3.1"))
-    assert @prerelease.required_rubygems_version.satisfied_by?(Gem::Version.new("1.4.0"))
-  end
-
   def test_require_paths
     enable_shared "no" do
       ext_spec
@@ -2278,7 +2273,7 @@ def test_runtime_predicate_false
   end
 
   def test_to_ruby
-    @a2.add_runtime_dependency "b", "1"
+    @a2.add_dependency "b", "1"
     @a2.dependencies.first.instance_variable_set :@type, nil
     @a2.required_rubygems_version = Gem::Requirement.new "> 0"
     @a2.require_paths << "other"
@@ -2291,7 +2286,7 @@ def test_to_ruby
 
 Gem::Specification.new do |s|
   s.name = "a".freeze
-  s.version = "2"
+  s.version = "2".freeze
 
   s.required_rubygems_version = Gem::Requirement.new(\"> 0\".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze, "other".freeze]
@@ -2306,7 +2301,7 @@ def test_to_ruby
 
   s.specification_version = #{Gem::Specification::CURRENT_SPECIFICATION_VERSION}
 
-  s.add_runtime_dependency(%q<b>.freeze, [\"= 1\"])
+  s.add_runtime_dependency(%q<b>.freeze, [\"= 1\".freeze])
 end
     SPEC
 
@@ -2331,7 +2326,7 @@ def test_to_ruby_with_rsa_key
 
 Gem::Specification.new do |s|
   s.name = "a".freeze
-  s.version = "2"
+  s.version = "2".freeze
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]
@@ -2350,7 +2345,7 @@ def test_to_ruby_with_rsa_key
   end
 
   def test_to_ruby_for_cache
-    @a2.add_runtime_dependency "b", "1"
+    @a2.add_dependency "b", "1"
     @a2.dependencies.first.instance_variable_set :@type, nil
     @a2.required_rubygems_version = Gem::Requirement.new "> 0"
     @a2.installed_by_version = Gem.rubygems_version
@@ -2364,7 +2359,7 @@ def test_to_ruby_for_cache
 
 Gem::Specification.new do |s|
   s.name = "a".freeze
-  s.version = "2"
+  s.version = "2".freeze
 
   s.required_rubygems_version = Gem::Requirement.new(\"> 0\".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]
@@ -2376,11 +2371,11 @@ def test_to_ruby_for_cache
   s.rubygems_version = "#{Gem::VERSION}".freeze
   s.summary = "this is a summary".freeze
 
-  s.installed_by_version = "#{Gem::VERSION}" if s.respond_to? :installed_by_version
+  s.installed_by_version = "#{Gem::VERSION}".freeze
 
   s.specification_version = #{Gem::Specification::CURRENT_SPECIFICATION_VERSION}
 
-  s.add_runtime_dependency(%q<b>.freeze, [\"= 1\"])
+  s.add_runtime_dependency(%q<b>.freeze, ["= 1".freeze])
 end
     SPEC
 
@@ -2400,7 +2395,7 @@ def test_to_ruby_fancy
     ruby_code = @c1.to_ruby
 
     local = Gem::Platform.local
-    expected_platform = "[#{local.cpu.inspect}, #{local.os.inspect}, #{local.version.inspect}]"
+    expected_platform = "[#{local.cpu.inspect}.freeze, #{local.os.inspect}.freeze, #{local.version.inspect}.freeze]"
     stub_require_paths =
       @c1.instance_variable_get(:@require_paths).join "\u0000"
     extensions = @c1.extensions.join "\u0000"
@@ -2412,7 +2407,7 @@ def test_to_ruby_fancy
 
 Gem::Specification.new do |s|
   s.name = "a".freeze
-  s.version = "1"
+  s.version = "1".freeze
   s.platform = Gem::Platform.new(#{expected_platform})
 
   s.required_rubygems_version = Gem::Requirement.new(\">= 0\".freeze) if s.respond_to? :required_rubygems_version=
@@ -2433,9 +2428,9 @@ def test_to_ruby_fancy
 
   s.specification_version = 4
 
-  s.add_runtime_dependency(%q<rake>.freeze, [\"> 0.4\"])
-  s.add_runtime_dependency(%q<jabber4r>.freeze, [\"> 0.0.0\"])
-  s.add_runtime_dependency(%q<pqa>.freeze, [\"> 0.4\", \"<= 0.6\"])
+  s.add_runtime_dependency(%q<rake>.freeze, [\"> 0.4\".freeze])
+  s.add_runtime_dependency(%q<jabber4r>.freeze, [\"> 0.0.0\".freeze])
+  s.add_runtime_dependency(%q<pqa>.freeze, [\"> 0.4\".freeze, \"<= 0.6\".freeze])
 end
     SPEC
 
@@ -2451,7 +2446,7 @@ def test_to_ruby_keeps_requirements_as_originally_specified
       s.add_dependency "b", ["~> 1.0", ">= 1.0.0"]
     end
 
-    assert_includes spec.to_ruby, '"~> 1.0", ">= 1.0.0"'
+    assert_includes spec.to_ruby, '"~> 1.0".freeze, ">= 1.0.0".freeze'
   end
 
   def test_to_ruby_legacy
@@ -2507,7 +2502,31 @@ def test_to_yaml_fancy
     assert_equal @a1, same_spec
   end
 
-  def test_to_yaml_platform_empty_string
+  def test_to_yaml_platform
+    yaml_str = @a1.to_yaml
+
+    assert_match(/^platform: ruby$/, yaml_str)
+    refute_match(/^original_platform: /, yaml_str)
+  end
+
+  def test_to_yaml_platform_no_specific_platform
+    a = Gem::Specification.new do |s|
+      s.name        = "a"
+      s.version     = "1.0"
+      s.author      = "A User"
+      s.email       = "example@example.com"
+      s.homepage    = "http://example.com"
+      s.summary     = "this is a summary"
+      s.description = "This is a test description"
+    end
+
+    yaml_str = a.to_yaml
+
+    assert_match(/^platform: ruby$/, yaml_str)
+    refute_match(/^original_platform: /, yaml_str)
+  end
+
+  def test_to_yaml_platform_original_platform_empty_string
     @a1.instance_variable_set :@original_platform, ""
 
     assert_match(/^platform: ruby$/, @a1.to_yaml)
@@ -2525,12 +2544,32 @@ def test_to_yaml_platform_legacy
     assert_equal "powerpc-darwin7.9.0", same_spec.original_platform
   end
 
-  def test_to_yaml_platform_nil
+  def test_to_yaml_platform_original_platform_nil
     @a1.instance_variable_set :@original_platform, nil
 
     assert_match(/^platform: ruby$/, @a1.to_yaml)
   end
 
+  def test_to_yaml_no_autorequire
+    yaml_str = @a1.to_yaml
+
+    refute_match(/^autorequire:/, yaml_str)
+  end
+
+  def test_to_yaml_no_signing_key
+    @a1.signing_key = nil
+    yaml_str = @a1.to_yaml
+
+    refute_match(/^signing_key:/, yaml_str)
+  end
+
+  def test_to_yaml_no_post_install_message
+    @a1.post_install_message = nil
+    yaml_str = @a1.to_yaml
+
+    refute_match(/^post_install_message:/, yaml_str)
+  end
+
   def test_validate
     util_setup_validate
 
@@ -2701,12 +2740,59 @@ def test_validate_dependencies_allowed_duplicates
     end
   end
 
+  def test_validate_no_required_ruby_versions
+    util_setup_validate
+
+    Dir.chdir @tempdir do
+      use_ui @ui do
+        @a1.required_ruby_version = nil # reset
+        @a1.validate
+      end
+
+      assert_equal <<-EXPECTED, @ui.error
+#{w}:  make sure you specify the oldest ruby version constraint (like \">= 3.0\") that you want your gem to support by setting the `required_ruby_version` gemspec attribute
+#{w}:  See https://guides.rubygems.org/specification-reference/ for help
+      EXPECTED
+    end
+  end
+
+  def test_validate_open_required_ruby_versions
+    util_setup_validate
+
+    Dir.chdir @tempdir do
+      @a1.required_ruby_version = ">= 0"
+
+      use_ui @ui do
+        @a1.validate
+      end
+
+      assert_equal <<-EXPECTED, @ui.error
+#{w}:  make sure you specify the oldest ruby version constraint (like \">= 3.0\") that you want your gem to support by setting the `required_ruby_version` gemspec attribute
+#{w}:  See https://guides.rubygems.org/specification-reference/ for help
+      EXPECTED
+    end
+  end
+
+  def test_validate_valid_required_ruby_versions
+    util_setup_validate
+
+    Dir.chdir @tempdir do
+      @a1.required_ruby_version = ">= 2.3.0"
+
+      use_ui @ui do
+        @a1.validate
+      end
+
+      assert_equal "", @ui.error, "warning"
+    end
+  end
+
   def test_validate_prerelease_dependencies_with_prerelease_version
     util_setup_validate
 
     Dir.chdir @tempdir do
       @a1.version = "1.0.0.beta.1"
-      @a1.add_runtime_dependency "b", "~> 1.2.0.beta.1"
+      @a1.add_dependency "b", "~> 1.2.0.beta.1"
 
       use_ui @ui do
         @a1.validate
@@ -2720,7 +2806,7 @@ def test_validate_self_referencing_dependencies
     util_setup_validate
 
     Dir.chdir @tempdir do
-      @a1.add_runtime_dependency @a1.name, "1"
+      @a1.add_dependency @a1.name, "1"
 
       use_ui @ui do
         @a1.validate
@@ -2744,7 +2830,7 @@ def test_validate_rake_extension_have_rake_dependency_warning
         @a1.validate
       end
 
-      assert_match(/add rake as a dependency/, @ui.error)
+      assert_match(/add rake as a runtime dependency/, @ui.error)
     end
   end
 
@@ -2753,14 +2839,14 @@ def test_validate_rake_extension_have_rake_dependency_no_warning
 
     Dir.chdir @tempdir do
       @a1.extensions = ["Rakefile"]
-      @a1.add_runtime_dependency "rake"
+      @a1.add_dependency "rake"
       File.write File.join(@tempdir, "Rakefile"), ""
 
       use_ui @ui do
         @a1.validate
       end
 
-      refute_match(/add rake as a dependency/, @ui.error)
+      refute_match(/add rake as a runtime dependency/, @ui.error)
     end
   end
 
@@ -2924,19 +3010,27 @@ def test_validate_executables
   end
 
   def test_validate_empty_require_paths
-    if Gem.win_platform?
-      pend "test_validate_empty_require_paths skipped on MS Windows (symlink)"
-    else
-      util_setup_validate
+    util_setup_validate
 
-      @a1.require_paths = []
-      e = assert_raise Gem::InvalidSpecificationException do
-        @a1.validate
-      end
+    @a1.require_paths = []
+    e = assert_raise Gem::InvalidSpecificationException do
+      @a1.validate
+    end
+
+    assert_equal "specification must have at least one require_path",
+                 e.message
+  end
 
-      assert_equal "specification must have at least one require_path",
-                   e.message
+  def test_validate_require_paths_with_invalid_types
+    util_setup_validate
+
+    @a1.require_paths = [1, 2]
+    e = assert_raise Gem::InvalidSpecificationException do
+      @a1.validate
     end
+
+    assert_equal "require_paths must be an Array of String",
+                 e.message
   end
 
   def test_validate_files
@@ -2965,9 +3059,7 @@ def test_unresolved_specs
 
     set_orig specification
 
-    specification.define_singleton_method(:unresolved_deps) do
-      { b: Gem::Dependency.new("x","1") }
-    end
+    specification.instance_variable_set(:@unresolved_deps, { b: Gem::Dependency.new("x","1") })
 
     specification.define_singleton_method(:find_all_by_name) do |_dep_name|
       []
@@ -2985,6 +3077,7 @@ def test_unresolved_specs
     end
     assert_empty actual_stdout
     assert_equal(expected, actual_stderr)
+    assert_empty specification.unresolved_deps
   end
 
   def test_unresolved_specs_with_versions
@@ -2992,9 +3085,7 @@ def test_unresolved_specs_with_versions
 
     set_orig specification
 
-    specification.define_singleton_method(:unresolved_deps) do
-      { b: Gem::Dependency.new("x","1") }
-    end
+    specification.instance_variable_set(:@unresolved_deps, { b: Gem::Dependency.new("x","1") })
 
     specification.define_singleton_method(:find_all_by_name) do |_dep_name|
       [
@@ -3018,20 +3109,75 @@ def test_unresolved_specs_with_versions
     end
     assert_empty actual_stdout
     assert_equal(expected, actual_stderr)
+    assert_empty specification.unresolved_deps
+  end
+
+  def test_unresolved_specs_with_duplicated_versions
+    specification = Gem::Specification.clone
+
+    set_orig specification
+
+    specification.instance_variable_set(:@unresolved_deps, { b: Gem::Dependency.new("x","1") })
+
+    specification.define_singleton_method(:find_all_by_name) do |_dep_name|
+      [
+        specification.new {|s| s.name = "z", s.version = Gem::Version.new("1") }, # default copy
+        specification.new {|s| s.name = "z", s.version = Gem::Version.new("1") }, # regular copy
+        specification.new {|s| s.name = "z", s.version = Gem::Version.new("2") }, # regular copy
+      ]
+    end
+
+    expected = <<-EXPECTED
+WARN: Unresolved or ambiguous specs during Gem::Specification.reset:
+      x (= 1)
+      Available/installed versions of this gem:
+      - 1
+      - 2
+WARN: Clearing out unresolved specs. Try 'gem cleanup <gem>'
+Please report a bug if this causes problems.
+    EXPECTED
+
+    actual_stdout, actual_stderr = capture_output do
+      specification.reset
+    end
+    assert_empty actual_stdout
+    assert_equal(expected, actual_stderr)
+    assert_empty specification.unresolved_deps
+  end
+
+  def test_unresolved_specs_with_unrestricted_deps_on_default_gems
+    specification = Gem::Specification.clone
+
+    set_orig specification
+
+    spec = new_default_spec "stringio", "3.1.1"
+
+    specification.instance_variable_set(:@unresolved_deps, { stringio: Gem::Dependency.new("stringio", ">= 0") })
+
+    specification.define_singleton_method(:find_all_by_name) do |_dep_name|
+      [spec]
+    end
+
+    actual_stdout, actual_stderr = capture_output do
+      specification.reset
+    end
+    assert_empty actual_stdout
+    assert_empty actual_stderr
   end
 
   def test_duplicate_runtime_dependency
     expected = "WARNING: duplicated b dependency [\"~> 3.0\", \"~> 3.0\"]\n"
     out, err = capture_output do
-      @a1.add_runtime_dependency "b", "~> 3.0", "~> 3.0"
+      @a1.add_dependency "b", "~> 3.0", "~> 3.0"
     end
     assert_empty out
     assert_equal(expected, err)
   end
 
   def set_orig(cls)
+    assert_empty cls.unresolved_deps
+
     s_cls = cls.singleton_class
-    s_cls.send :alias_method, :orig_unresolved_deps, :unresolved_deps
     s_cls.send :alias_method, :orig_find_all_by_name, :find_all_by_name
   end
 
@@ -3104,8 +3250,8 @@ def test_validate_license
     end
 
     assert_match <<-WARNING, @ui.error
-WARNING:  licenses is empty, but is recommended.  Use a license identifier from
-http://spdx.org/licenses or 'Nonstandard' for a nonstandard license,
+WARNING:  licenses is empty, but is recommended. Use an license identifier from
+https://spdx.org/licenses or 'Nonstandard' for a nonstandard license,
 or set it to nil if you don't want to specify a license.
     WARNING
   end
@@ -3133,7 +3279,7 @@ def test_validate_license_in_a_non_packaging_context
   end
 
   def test_removed_methods
-    assert_equal Gem::Specification::REMOVED_METHODS, [:rubyforge_project=]
+    assert_equal Gem::Specification::REMOVED_METHODS, [:rubyforge_project=, :mark_version]
   end
 
   def test_validate_removed_rubyforge_project
@@ -3156,8 +3302,8 @@ def test_validate_license_values
     end
 
     assert_match <<-WARNING, @ui.error
-WARNING:  license value 'BSD' is invalid.  Use a license identifier from
-http://spdx.org/licenses or 'Nonstandard' for a nonstandard license,
+WARNING:  License identifier 'BSD' is invalid. Use an identifier from
+https://spdx.org/licenses or 'Nonstandard' for a nonstandard license,
 or set it to nil if you don't want to specify a license.
     WARNING
   end
@@ -3173,7 +3319,7 @@ def test_validate_license_ref
     assert_empty @ui.error
   end
 
-  def test_validate_license_values_plus
+  def test_validate_deprecated_license_values_plus
     util_setup_validate
 
     use_ui @ui do
@@ -3181,7 +3327,11 @@ def test_validate_license_values_plus
       @a1.validate
     end
 
-    assert_empty @ui.error
+    assert_match <<-WARNING, @ui.error
+WARNING:  License identifier 'GPL-2.0+' is deprecated. Use an identifier from
+https://spdx.org/licenses or 'Nonstandard' for a nonstandard license,
+or set it to nil if you don't want to specify a license.
+    WARNING
   end
 
   def test_validate_license_values_or_later
@@ -3199,7 +3349,7 @@ def test_validate_license_values_with
     util_setup_validate
 
     use_ui @ui do
-      @a1.licenses = ["GPL-2.0+ WITH Autoconf-exception-2.0"]
+      @a1.licenses = ["GPL-2.0-or-later WITH Autoconf-exception-2.0"]
       @a1.validate
     end
 
@@ -3215,13 +3365,13 @@ def test_validate_license_with_nonsense_suffix
     end
 
     assert_match <<-WARNING, @ui.error
-WARNING:  license value 'GPL-2.0+ FOO' is invalid.  Use a license identifier from
-http://spdx.org/licenses or 'Nonstandard' for a nonstandard license,
+WARNING:  License identifier 'GPL-2.0+ FOO' is invalid. Use an identifier from
+https://spdx.org/licenses or 'Nonstandard' for a nonstandard license,
 or set it to nil if you don't want to specify a license.
     WARNING
     assert_match <<-WARNING, @ui.error
-WARNING:  license value 'GPL-2.0 FOO' is invalid.  Use a license identifier from
-http://spdx.org/licenses or 'Nonstandard' for a nonstandard license,
+WARNING:  License identifier 'GPL-2.0+ FOO' is invalid. Use an identifier from
+https://spdx.org/licenses or 'Nonstandard' for a nonstandard license,
 or set it to nil if you don't want to specify a license.
     WARNING
   end
@@ -3230,13 +3380,28 @@ def test_validate_license_with_invalid_exception
     util_setup_validate
 
     use_ui @ui do
-      @a1.licenses = ["GPL-2.0+ WITH Autocofn-exception-2.0"]
+      @a1.licenses = ["GPL-2.0-only WITH Autocofn-exception-2.0"]
+      @a1.validate
+    end
+
+    assert_match <<-WARNING, @ui.error
+WARNING:  License identifier 'GPL-2.0-only WITH Autocofn-exception-2.0' is invalid. Use an identifier from
+https://spdx.org/licenses or 'Nonstandard' for a nonstandard license,
+or set it to nil if you don't want to specify a license.
+    WARNING
+  end
+
+  def test_validate_license_with_deprecated_exception
+    util_setup_validate
+
+    use_ui @ui do
+      @a1.licenses = ["GPL-2.0-only WITH Nokia-Qt-exception-1.1"]
       @a1.validate
     end
 
     assert_match <<-WARNING, @ui.error
-WARNING:  license value 'GPL-2.0+ WITH Autocofn-exception-2.0' is invalid.  Use a license identifier from
-http://spdx.org/licenses or 'Nonstandard' for a nonstandard license,
+WARNING:  Exception identifier at 'GPL-2.0-only WITH Nokia-Qt-exception-1.1' is deprecated. Use an identifier from
+https://spdx.org/licenses or 'Nonstandard' for a nonstandard license,
 or set it to nil if you don't want to specify a license.
     WARNING
   end
@@ -3250,8 +3415,8 @@ def test_validate_license_gives_suggestions
     end
 
     assert_match <<-WARNING, @ui.error
-WARNING:  license value 'ruby' is invalid.  Use a license identifier from
-http://spdx.org/licenses or 'Nonstandard' for a nonstandard license,
+WARNING:  License identifier 'ruby' is invalid. Use an identifier from
+https://spdx.org/licenses or 'Nonstandard' for a nonstandard license,
 or set it to nil if you don't want to specify a license.
 Did you mean 'Ruby'?
     WARNING
@@ -3407,12 +3572,17 @@ def test_validate_rubygems_version
     util_setup_validate
 
     @a1.rubygems_version = "3"
-    e = assert_raise Gem::InvalidSpecificationException do
+
+    use_ui @ui do
       @a1.validate
     end
 
-    assert_equal "expected RubyGems version #{Gem::VERSION}, was 3",
-                 e.message
+    expected = <<~EXPECTED
+      #{w}:  expected RubyGems version #{Gem::VERSION}, was 3
+      #{w}:  See https://guides.rubygems.org/specification-reference/ for help
+    EXPECTED
+
+    assert_equal expected, @ui.error
   end
 
   def test_validate_specification_version
@@ -3653,6 +3823,39 @@ def test_metadata_link_validation_fails
     end
   end
 
+  def test_metadata_link_validation_warns_for_duplicates
+    util_setup_validate
+
+    Dir.chdir @tempdir do
+      @m2 = quick_gem "m", "2" do |s|
+        s.required_ruby_version = ">= 2.3.0"
+        s.files = %w[lib/code.rb]
+        s.licenses = "BSD-2-Clause"
+        s.metadata = {
+          "source_code_uri" => "http://example.com",
+          "homepage_uri" => "http://example.com",
+          "changelog_uri" => "http://example.com/changelog",
+        }
+      end
+
+      use_ui @ui do
+        @m2.validate
+      end
+
+      expected = <<~EXPECTED
+        #{w}:  You have specified the uri:
+          http://example.com
+        for all of the following keys:
+          homepage_uri
+          source_code_uri
+        Only the first one will be shown on rubygems.org
+        #{w}:  See https://guides.rubygems.org/specification-reference/ for help
+      EXPECTED
+
+      assert_equal expected, @ui.error, "warning"
+    end
+  end
+
   def test_metadata_specs
     @m1 = quick_gem "m", "1" do |s|
       s.files = %w[lib/code.rb]
@@ -3665,7 +3868,7 @@ def test_metadata_specs
 
 Gem::Specification.new do |s|
   s.name = "m".freeze
-  s.version = "1"
+  s.version = "1".freeze
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.metadata = { "one" => "two", "two" => "three" } if s.respond_to? :metadata=
@@ -3685,7 +3888,6 @@ def test_metadata_specs
   end
 
   def test_missing_extensions_eh
-    pend "extensions don't quite work on jruby" if Gem.java_platform?
     ext_spec
 
     assert @ext.missing_extensions?
@@ -3764,6 +3966,13 @@ def test_find_by_name_with_only_prereleases
     assert Gem::Specification.find_by_name "q"
   end
 
+  def test_find_by_name_with_only_prereleases_with_requirements
+    q = util_spec "q", "2.a"
+    install_specs q
+
+    assert Gem::Specification.find_by_name "q", ">= 1"
+  end
+
   def test_find_by_name_prerelease
     b = util_spec "b", "2.a"
 
@@ -3833,6 +4042,40 @@ def test_load_default_gem
     assert_equal ["default-2.0.0.0"], Gem::Specification.map(&:full_name)
   end
 
+  def test_validate_for_resolution_validates_required_attributes
+    e = assert_raise Gem::InvalidSpecificationException do
+      @a1.name = nil
+      @a1.validate_for_resolution
+    end
+
+    assert_equal "missing value for attribute name", e.message
+  end
+
+  def test_validate_for_resolution_validates_name
+    e = assert_raise Gem::InvalidSpecificationException do
+      @a1.name = 123
+      @a1.validate_for_resolution
+    end
+
+    assert_equal 'invalid value for attribute name: "123" must be a string', e.message
+  end
+
+  def test_validate_for_resolution_validates_duplicate_dependencies
+    e = assert_raise Gem::InvalidSpecificationException do
+      @a1.add_dependency "foo", "1.2.3"
+      @a1.add_dependency "foo", "3.4.5"
+      @a1.validate_for_resolution
+    end
+
+    assert_match "duplicate dependency on foo", e.message
+  end
+
+  def test_validate_for_resolution_ignores_metadata
+    @a1.summary = "TODO: Invalid summary"
+    @a1.metadata["homepage_uri"] = "TODO: Invalid homepage URI"
+    @a1.validate_for_resolution
+  end
+
   def util_setup_deps
     @gem = util_spec "awesome", "1.0" do |awesome|
       awesome.add_runtime_dependency "bonobo", []
diff --git a/test/rubygems/test_gem_stream_ui.rb b/test/rubygems/test_gem_stream_ui.rb
index 00cc64629ad293..b1fcb3bc26d710 100644
--- a/test/rubygems/test_gem_stream_ui.rb
+++ b/test/rubygems/test_gem_stream_ui.rb
@@ -2,7 +2,7 @@
 
 require_relative "helper"
 require "rubygems/user_interaction"
-require "timeout"
+require "rubygems/vendored_timeout"
 
 class TestGemStreamUI < Gem::TestCase
   # increase timeout with RJIT for --jit-wait testing
@@ -40,7 +40,7 @@ def setup
   end
 
   def test_ask
-    Timeout.timeout(5) do
+    Gem::Timeout.timeout(5) do
       expected_answer = "Arthur, King of the Britons"
       @in.string = "#{expected_answer}\n"
       actual_answer = @sui.ask("What is your name?")
@@ -51,14 +51,14 @@ def test_ask
   def test_ask_no_tty
     @in.tty = false
 
-    Timeout.timeout(SHORT_TIMEOUT) do
+    Gem::Timeout.timeout(SHORT_TIMEOUT) do
       answer = @sui.ask("what is your favorite color?")
       assert_nil answer
     end
   end
 
   def test_ask_for_password
-    Timeout.timeout(5) do
+    Gem::Timeout.timeout(5) do
       expected_answer = "Arthur, King of the Britons"
       @in.string = "#{expected_answer}\n"
       actual_answer = @sui.ask_for_password("What is your name?")
@@ -69,7 +69,7 @@ def test_ask_for_password
   def test_ask_for_password_no_tty
     @in.tty = false
 
-    Timeout.timeout(SHORT_TIMEOUT) do
+    Gem::Timeout.timeout(SHORT_TIMEOUT) do
       answer = @sui.ask_for_password("what is the airspeed velocity of an unladen swallow?")
       assert_nil answer
     end
@@ -78,7 +78,7 @@ def test_ask_for_password_no_tty
   def test_ask_yes_no_no_tty_with_default
     @in.tty = false
 
-    Timeout.timeout(SHORT_TIMEOUT) do
+    Gem::Timeout.timeout(SHORT_TIMEOUT) do
       answer = @sui.ask_yes_no("do coconuts migrate?", false)
       assert_equal false, answer
 
@@ -90,7 +90,7 @@ def test_ask_yes_no_no_tty_with_default
   def test_ask_yes_no_no_tty_without_default
     @in.tty = false
 
-    Timeout.timeout(SHORT_TIMEOUT) do
+    Gem::Timeout.timeout(SHORT_TIMEOUT) do
       assert_raise(Gem::OperationNotSupportedError) do
         @sui.ask_yes_no("do coconuts migrate?")
       end
diff --git a/test/rubygems/test_gem_stub_specification.rb b/test/rubygems/test_gem_stub_specification.rb
index fe30a78c0b499f..4b2d4c570a137b 100644
--- a/test/rubygems/test_gem_stub_specification.rb
+++ b/test/rubygems/test_gem_stub_specification.rb
@@ -66,7 +66,6 @@ def test_contains_requirable_file_eh
   end
 
   def test_contains_requirable_file_eh_extension
-    pend "I guess making the stub match the running platform should work" if Gem.java_platform?
     stub_with_extension do |stub|
       _, err = capture_output do
         refute stub.contains_requirable_file? "nonexistent"
@@ -123,7 +122,6 @@ def test_matches_for_glob_with_bundler_inline
   end
 
   def test_missing_extensions_eh
-    pend "I guess making the stub match the running platform should work" if Gem.java_platform?
     stub = stub_with_extension do |s|
       extconf_rb = File.join s.gem_dir, s.extensions.first
       FileUtils.mkdir_p File.dirname extconf_rb
@@ -173,6 +171,35 @@ def test_to_spec
     assert_same real_foo, @foo.to_spec
   end
 
+  def test_to_spec_default
+    bar_default_spec = File.join(@gemhome, "specifications", "default", "bar-0.0.2.gemspec")
+    File.open bar_default_spec, "w" do |io|
+      io.write <<~STUB
+        # -*- encoding: utf-8 -*-
+        # stub: bar 0.0.2 ruby lib
+
+        Gem::Specification.new do |s|
+          s.name          = "bar"
+          s.version       = "0.0.2"
+          s.platform      = "ruby"
+          s.require_paths = ["lib"]
+          s.summary       = "A very bar gem"
+        end
+      STUB
+    end
+
+    bar = Gem::StubSpecification.gemspec_stub BAR, @base_dir, @gems_dir
+    bar_default = Gem::StubSpecification.default_gemspec_stub bar_default_spec, @base_dir, @gems_dir
+
+    real_bar = util_spec bar_default.name, bar_default.version
+    real_bar.activate
+
+    assert_equal bar.version, Gem.loaded_specs[bar.name].version,
+                 "sanity check"
+
+    refute_same real_bar, bar_default.to_spec
+  end
+
   def test_to_spec_with_other_specs_loaded_does_not_warn
     real_foo = util_spec @foo.name, @foo.version
     real_foo.activate
@@ -184,14 +211,14 @@ def test_to_spec_with_other_specs_loaded_does_not_warn
   def stub_with_version
     spec = File.join @gemhome, "specifications", "stub_e-2.gemspec"
     File.open spec, "w" do |io|
-      io.write <<-STUB
-# -*- encoding: utf-8 -*-
-# stub: stub_v 2 ruby lib
+      io.write <<~STUB
+        # -*- encoding: utf-8 -*-
+        # stub: stub_v 2 ruby lib
 
-Gem::Specification.new do |s|
-  s.name = 'stub_v'
-  s.version = Gem::Version.new '2'
-end
+        Gem::Specification.new do |s|
+          s.name = 'stub_v'
+          s.version = Gem::Version.new '2'
+        end
       STUB
 
       io.flush
@@ -207,14 +234,14 @@ def stub_with_version
   def stub_without_version
     spec = File.join @gemhome, "specifications", "stub-2.gemspec"
     File.open spec, "w" do |io|
-      io.write <<-STUB
-# -*- encoding: utf-8 -*-
-# stub: stub_v ruby lib
+      io.write <<~STUB
+        # -*- encoding: utf-8 -*-
+        # stub: stub_v ruby lib
 
-Gem::Specification.new do |s|
-  s.name = 'stub_v'
-  s.version = ""
-end
+        Gem::Specification.new do |s|
+          s.name = 'stub_v'
+          s.version = ""
+        end
       STUB
 
       io.flush
@@ -230,17 +257,17 @@ def stub_without_version
   def stub_with_extension
     spec = File.join @gemhome, "specifications", "stub_e-2.gemspec"
     File.open spec, "w" do |io|
-      io.write <<-STUB
-# -*- encoding: utf-8 -*-
-# stub: stub_e 2 ruby lib
-# stub: ext/stub_e/extconf.rb
-
-Gem::Specification.new do |s|
-  s.name = 'stub_e'
-  s.version = Gem::Version.new '2'
-  s.extensions = ['ext/stub_e/extconf.rb']
-  s.installed_by_version = '2.2'
-end
+      io.write <<~STUB
+        # -*- encoding: utf-8 -*-
+        # stub: stub_e 2 ruby lib
+        # stub: ext/stub_e/extconf.rb
+
+        Gem::Specification.new do |s|
+          s.name = 'stub_e'
+          s.version = Gem::Version.new '2'
+          s.extensions = ['ext/stub_e/extconf.rb']
+          s.installed_by_version = '2.2'
+        end
       STUB
 
       io.flush
@@ -256,14 +283,14 @@ def stub_with_extension
   def stub_without_extension
     spec = File.join @gemhome, "specifications", "stub-2.gemspec"
     File.open spec, "w" do |io|
-      io.write <<-STUB
-# -*- encoding: utf-8 -*-
-# stub: stub 2 ruby lib
+      io.write <<~STUB
+        # -*- encoding: utf-8 -*-
+        # stub: stub 2 ruby lib
 
-Gem::Specification.new do |s|
-  s.name = 'stub'
-  s.version = Gem::Version.new '2'
-end
+        Gem::Specification.new do |s|
+          s.name = 'stub'
+          s.version = Gem::Version.new '2'
+        end
       STUB
 
       io.flush
diff --git a/test/rubygems/test_gem_uninstaller.rb b/test/rubygems/test_gem_uninstaller.rb
index dfa01768bc349b..92ea01a3bca2dd 100644
--- a/test/rubygems/test_gem_uninstaller.rb
+++ b/test/rubygems/test_gem_uninstaller.rb
@@ -19,13 +19,11 @@ def setup
         @user_spec = @user_installer.spec
       end
     end
-
-    Gem::Specification.reset
   end
 
   def test_initialize_expand_path
     FileUtils.mkdir_p "foo/bar"
-    uninstaller = Gem::Uninstaller.new nil, :install_dir => "foo//bar"
+    uninstaller = Gem::Uninstaller.new nil, install_dir: "foo//bar"
 
     assert_match %r{foo/bar$}, uninstaller.instance_variable_get(:@gem_home)
   end
@@ -59,7 +57,7 @@ def test_remove_all
   end
 
   def test_remove_executables_force_keep
-    uninstaller = Gem::Uninstaller.new nil, :executables => false
+    uninstaller = Gem::Uninstaller.new nil, executables: false
 
     executable = File.join Gem.bindir(@user_spec.base_dir), "executable"
     assert File.exist?(executable), "executable not written"
@@ -74,7 +72,7 @@ def test_remove_executables_force_keep
   end
 
   def test_remove_executables_force_remove
-    uninstaller = Gem::Uninstaller.new nil, :executables => true
+    uninstaller = Gem::Uninstaller.new nil, executables: true
 
     executable = File.join Gem.bindir(@user_spec.base_dir), "executable"
     assert File.exist?(executable), "executable not written"
@@ -89,7 +87,7 @@ def test_remove_executables_force_remove
   end
 
   def test_remove_executables_user
-    uninstaller = Gem::Uninstaller.new nil, :executables => true
+    uninstaller = Gem::Uninstaller.new nil, executables: true
 
     use_ui @ui do
       uninstaller.remove_executables @user_spec
@@ -104,7 +102,7 @@ def test_remove_executables_user
   def test_remove_executables_user_format
     Gem::Installer.exec_format = "foo-%s-bar"
 
-    uninstaller = Gem::Uninstaller.new nil, :executables => true, :format_executable => true
+    uninstaller = Gem::Uninstaller.new nil, executables: true, format_executable: true
 
     use_ui @ui do
       uninstaller.remove_executables @user_spec
@@ -121,7 +119,7 @@ def test_remove_executables_user_format
   def test_remove_executables_user_format_disabled
     Gem::Installer.exec_format = "foo-%s-bar"
 
-    uninstaller = Gem::Uninstaller.new nil, :executables => true
+    uninstaller = Gem::Uninstaller.new nil, executables: true
 
     use_ui @ui do
       uninstaller.remove_executables @user_spec
@@ -137,7 +135,7 @@ def test_remove_executables_user_format_disabled
 
   def test_remove_not_in_home
     Dir.mkdir "#{@gemhome}2"
-    uninstaller = Gem::Uninstaller.new nil, :install_dir => "#{@gemhome}2"
+    uninstaller = Gem::Uninstaller.new nil, install_dir: "#{@gemhome}2"
 
     e = assert_raise Gem::GemNotInHomeException do
       use_ui ui do
@@ -161,7 +159,7 @@ def test_remove_symlinked_gem_home
 
       FileUtils.ln_s(@gemhome, dir)
 
-      uninstaller = Gem::Uninstaller.new nil, :install_dir => symlinked_gem_home
+      uninstaller = Gem::Uninstaller.new nil, install_dir: symlinked_gem_home
 
       use_ui ui do
         uninstaller.remove @spec
@@ -178,7 +176,7 @@ def test_remove_plugins
 
     @spec.files += %w[lib/rubygems_plugin.rb]
 
-    Gem::Installer.at(Gem::Package.build(@spec), :force => true).install
+    Gem::Installer.at(Gem::Package.build(@spec), force: true).install
 
     plugin_path = File.join Gem.plugindir, "a_plugin.rb"
     assert File.exist?(plugin_path), "plugin not written"
@@ -188,22 +186,81 @@ def test_remove_plugins
     refute File.exist?(plugin_path), "plugin not removed"
   end
 
-  def test_remove_plugins_with_install_dir
+  def test_uninstall_with_install_dir_removes_plugins
     write_file File.join(@tempdir, "lib", "rubygems_plugin.rb") do |io|
       io.write "# do nothing"
     end
 
     @spec.files += %w[lib/rubygems_plugin.rb]
 
-    Gem::Installer.at(Gem::Package.build(@spec), :force => true).install
+    package = Gem::Package.build(@spec)
+
+    Gem::Installer.at(package, force: true).install
 
     plugin_path = File.join Gem.plugindir, "a_plugin.rb"
     assert File.exist?(plugin_path), "plugin not written"
 
-    Dir.mkdir "#{@gemhome}2"
-    Gem::Uninstaller.new(nil, :install_dir => "#{@gemhome}2").remove_plugins @spec
+    install_dir = "#{@gemhome}2"
+
+    Gem::Installer.at(package, force: true, install_dir: install_dir).install
+
+    install_dir_plugin_path = File.join install_dir, "plugins/a_plugin.rb"
+    assert File.exist?(install_dir_plugin_path), "plugin not written"
+
+    Gem::Specification.dirs = [install_dir]
+    Gem::Uninstaller.new(@spec.name, executables: true, install_dir: install_dir).uninstall
 
     assert File.exist?(plugin_path), "plugin unintentionally removed"
+    refute File.exist?(install_dir_plugin_path), "plugin not removed"
+  end
+
+  def test_uninstall_with_install_dir_regenerates_plugins
+    write_file File.join(@tempdir, "lib", "rubygems_plugin.rb") do |io|
+      io.write "# do nothing"
+    end
+
+    @spec.files += %w[lib/rubygems_plugin.rb]
+
+    install_dir = "#{@gemhome}2"
+
+    package = Gem::Package.build(@spec)
+
+    spec_v9 = @spec.dup
+    spec_v9.version = "9"
+    package_v9 = Gem::Package.build(spec_v9)
+
+    Gem::Installer.at(package, force: true, install_dir: install_dir).install
+    Gem::Installer.at(package_v9, force: true, install_dir: install_dir).install
+
+    install_dir_plugin_path = File.join install_dir, "plugins/a_plugin.rb"
+    assert File.exist?(install_dir_plugin_path), "plugin not written"
+
+    Gem::Specification.dirs = [install_dir]
+    Gem::Uninstaller.new(@spec.name, version: "9", executables: true, install_dir: install_dir).uninstall
+    assert File.exist?(install_dir_plugin_path), "plugin unintentionally removed"
+
+    Gem::Specification.dirs = [install_dir]
+    Gem::Uninstaller.new(@spec.name, executables: true, install_dir: install_dir).uninstall
+    refute File.exist?(install_dir_plugin_path), "plugin not removed"
+  end
+
+  def test_remove_plugins_user_installed
+    write_file File.join(@tempdir, "lib", "rubygems_plugin.rb") do |io|
+      io.write "# do nothing"
+    end
+
+    @spec.files += %w[lib/rubygems_plugin.rb]
+
+    Gem::Installer.at(Gem::Package.build(@spec), force: true, user_install: true).install
+
+    plugin_path = File.join Gem.user_dir, "plugins/a_plugin.rb"
+    assert File.exist?(plugin_path), "plugin not written"
+
+    Gem::Specification.dirs = [Gem.dir, Gem.user_dir]
+
+    Gem::Uninstaller.new(@spec.name, executables: true, force: true, user_install: true).uninstall
+
+    refute File.exist?(plugin_path), "plugin not removed"
   end
 
   def test_regenerate_plugins_for
@@ -213,7 +270,7 @@ def test_regenerate_plugins_for
 
     @spec.files += %w[lib/rubygems_plugin.rb]
 
-    Gem::Installer.at(Gem::Package.build(@spec), :force => true).install
+    Gem::Installer.at(Gem::Package.build(@spec), force: true).install
 
     plugin_path = File.join Gem.plugindir, "a_plugin.rb"
     assert File.exist?(plugin_path), "plugin not written"
@@ -247,7 +304,7 @@ def test_path_ok_eh_user
   end
 
   def test_uninstall
-    uninstaller = Gem::Uninstaller.new @spec.name, :executables => true
+    uninstaller = Gem::Uninstaller.new @spec.name, executables: true
 
     gem_dir = File.join @gemhome, "gems", @spec.full_name
 
@@ -274,7 +331,7 @@ def test_uninstall_default_gem
 
     install_default_gems spec
 
-    uninstaller = Gem::Uninstaller.new spec.name, :executables => true
+    uninstaller = Gem::Uninstaller.new spec.name, executables: true
 
     use_ui @ui do
       uninstaller.uninstall
@@ -294,7 +351,7 @@ def test_uninstall_default_gem_with_same_version
 
     Gem::Specification.reset
 
-    uninstaller = Gem::Uninstaller.new spec.name, :executables => true
+    uninstaller = Gem::Uninstaller.new spec.name, executables: true
 
     ui = Gem::MockGemUi.new "1\ny\n"
     use_ui ui do
@@ -322,20 +379,20 @@ def test_uninstall_extension
     use_ui @ui do
       path = Gem::Package.build @spec
 
-      installer = Gem::Installer.at path, :force => true
+      installer = Gem::Installer.at path, force: true
       installer.install
     end
 
     assert_path_exist @spec.extension_dir, "sanity check"
 
-    uninstaller = Gem::Uninstaller.new @spec.name, :executables => true
+    uninstaller = Gem::Uninstaller.new @spec.name, executables: true
     uninstaller.uninstall
 
     assert_path_not_exist @spec.extension_dir
   end
 
   def test_uninstall_nonexistent
-    uninstaller = Gem::Uninstaller.new "bogus", :executables => true
+    uninstaller = Gem::Uninstaller.new "bogus", executables: true
 
     e = assert_raise Gem::InstallError do
       uninstaller.uninstall
@@ -346,7 +403,7 @@ def test_uninstall_nonexistent
 
   def test_uninstall_not_ok
     quick_gem "z" do |s|
-      s.add_runtime_dependency @spec.name
+      s.add_dependency @spec.name
     end
 
     uninstaller = Gem::Uninstaller.new @spec.name
@@ -370,11 +427,11 @@ def test_uninstall_not_ok
   end
 
   def test_uninstall_user_install
-    @user_spec = Gem::Specification.find_by_name "b"
+    Gem::Specification.dirs = [Gem.user_dir]
 
     uninstaller = Gem::Uninstaller.new(@user_spec.name,
-                                       :executables => true,
-                                       :user_install => true)
+                                       executables: true,
+                                       user_install: true)
 
     gem_dir = File.join @user_spec.gem_dir
 
@@ -394,11 +451,37 @@ def test_uninstall_user_install
     assert_same uninstaller, @post_uninstall_hook_arg
   end
 
+  def test_uninstall_user_install_with_symlinked_home
+    pend "Symlinks not supported or not enabled" unless symlink_supported?
+
+    Gem::Specification.dirs = [Gem.user_dir]
+
+    symlinked_home = File.join(@tempdir, "new-home")
+    FileUtils.ln_s(Gem.user_home, symlinked_home)
+
+    ENV["HOME"] = symlinked_home
+    Gem.instance_variable_set(:@user_home, nil)
+    Gem.instance_variable_set(:@data_home, nil)
+
+    uninstaller = Gem::Uninstaller.new(@user_spec.name,
+                                       executables: true,
+                                       user_install: true,
+                                       force: true)
+
+    gem_dir = File.join @user_spec.gem_dir
+
+    assert_path_exist gem_dir
+
+    uninstaller.uninstall
+
+    assert_path_not_exist gem_dir
+  end
+
   def test_uninstall_wrong_repo
     Dir.mkdir "#{@gemhome}2"
     Gem.use_paths "#{@gemhome}2", [@gemhome]
 
-    uninstaller = Gem::Uninstaller.new @spec.name, :executables => true
+    uninstaller = Gem::Uninstaller.new @spec.name, executables: true
 
     e = assert_raise Gem::InstallError do
       uninstaller.uninstall
@@ -487,7 +570,7 @@ def test_uninstall_only_lists_unsatisfied_deps
     quick_gem "q", "1.0"
     quick_gem "q", "1.1"
 
-    un = Gem::Uninstaller.new("q", :version => "1.0")
+    un = Gem::Uninstaller.new("q", version: "1.0")
     ui = Gem::MockGemUi.new("y\n")
 
     use_ui ui do
@@ -513,7 +596,7 @@ def test_uninstall_doesnt_prompt_when_other_gem_satisfies_requirement
     quick_gem "q", "1.0"
     quick_gem "q", "1.1"
 
-    un = Gem::Uninstaller.new("q", :version => "1.0")
+    un = Gem::Uninstaller.new("q", version: "1.0")
     ui = Gem::MockGemUi.new("y\n")
 
     use_ui ui do
@@ -532,7 +615,7 @@ def test_uninstall_doesnt_prompt_when_removing_a_dev_dep
 
     quick_gem "q", "1.0"
 
-    un = Gem::Uninstaller.new("q", :version => "1.0")
+    un = Gem::Uninstaller.new("q", version: "1.0")
     ui = Gem::MockGemUi.new("y\n")
 
     use_ui ui do
@@ -551,7 +634,7 @@ def test_uninstall_doesnt_prompt_and_raises_when_abort_on_dependent_set
 
     quick_gem "q", "1"
 
-    un = Gem::Uninstaller.new("q", :abort_on_dependent => true)
+    un = Gem::Uninstaller.new("q", abort_on_dependent: true)
     ui = Gem::MockGemUi.new("y\n")
 
     assert_raise Gem::DependencyRemovalException do
@@ -568,7 +651,7 @@ def test_uninstall_prompt_includes_dep_type
 
     quick_gem "q", "1"
 
-    un = Gem::Uninstaller.new("q", :check_dev => true)
+    un = Gem::Uninstaller.new("q", check_dev: true)
     ui = Gem::MockGemUi.new("y\n")
 
     use_ui ui do
@@ -597,7 +680,7 @@ def test_uninstall_prompt_only_lists_the_dependents_that_prevented_uninstallatio
 
     quick_gem "q", "1"
 
-    un = Gem::Uninstaller.new("q", :check_dev => false)
+    un = Gem::Uninstaller.new("q", check_dev: false)
     ui = Gem::MockGemUi.new("y\n")
 
     use_ui ui do
@@ -616,7 +699,7 @@ def test_uninstall_prompt_only_lists_the_dependents_that_prevented_uninstallatio
   end
 
   def test_uninstall_no_permission
-    uninstaller = Gem::Uninstaller.new @spec.name, :executables => true
+    uninstaller = Gem::Uninstaller.new @spec.name, executables: true
 
     stub_rm_r = lambda do |*args|
       _path = args.shift
@@ -641,34 +724,34 @@ def test_uninstall_keeps_plugins_up_to_date
     plugin_path = File.join Gem.plugindir, "a_plugin.rb"
 
     @spec.version = "1"
-    Gem::Installer.at(Gem::Package.build(@spec), :force => true).install
+    Gem::Installer.at(Gem::Package.build(@spec), force: true).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), :force => true).install
+    Gem::Installer.at(Gem::Package.build(@spec), force: true).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), :force => true).install
+    Gem::Installer.at(Gem::Package.build(@spec), force: true).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
+    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
+    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
+    Gem::Uninstaller.new("a", version: "2", executables: true).uninstall
 
     refute File.exist?(plugin_path), "last version uninstalled, but plugin still present"
   end
diff --git a/test/rubygems/test_gem_update_suggestion.rb b/test/rubygems/test_gem_update_suggestion.rb
index 2f9221ec2fcc00..8cb8ee57ff90be 100644
--- a/test/rubygems/test_gem_update_suggestion.rb
+++ b/test/rubygems/test_gem_update_suggestion.rb
@@ -15,13 +15,13 @@ def setup
     @week = 7 * 24 * @minute
   end
 
-  def with_eglible_environment(**params)
-    self.class.with_eglible_environment(**params) do
+  def with_eligible_environment(**params)
+    self.class.with_eligible_environment(**params) do
       yield
     end
   end
 
-  def self.with_eglible_environment(
+  def self.with_eligible_environment(
     tty: true,
     rubygems_version: Gem::Version.new("1.2.3"),
     latest_rubygems_version: Gem::Version.new("2.0.0"),
@@ -40,7 +40,7 @@ def self.with_eglible_environment(
     Gem.ui.stub :tty?, tty do
       Gem.stub :rubygems_version, rubygems_version do
         Gem.stub :latest_rubygems_version, latest_rubygems_version do
-          cmd.stub :ci?, ci do
+          Gem::CIDetector.stub :ci?, ci do
             yield
           end
         end
@@ -65,10 +65,10 @@ def test_update_suggestion
     end
   end
 
-  def test_eglible_for_update
-    with_eglible_environment(cmd: @cmd) do
+  def test_eligible_for_update
+    with_eligible_environment(cmd: @cmd) do
       Time.stub :now, 123_456_789 do
-        assert_predicate @cmd, :eglible_for_update?
+        assert_predicate @cmd, :eligible_for_update?
         assert_equal 123_456_789, Gem.configuration.last_update_check
 
         # test last check is written to config file
@@ -77,29 +77,29 @@ def test_eglible_for_update
     end
   end
 
-  def test_eglible_for_update_is_not_annoying_when_new_version_is_released
+  def test_eligible_for_update_is_not_annoying_when_new_version_is_released
     current_version = Gem::Version.new("1.2.0")
     latest_version = current_version
 
-    # checking for first time, it is not eglible since new version
+    # checking for first time, it is not eligible since new version
     # is not released yet and stored
-    with_eglible_environment(cmd: @cmd, rubygems_version: current_version, latest_rubygems_version: latest_version) do
+    with_eligible_environment(cmd: @cmd, rubygems_version: current_version, latest_rubygems_version: latest_version) do
       Time.stub :now, @start_time do
-        refute_predicate @cmd, :eglible_for_update?
+        refute_predicate @cmd, :eligible_for_update?
         assert_equal @start_time, Gem.configuration.last_update_check
       end
     end
 
-    # checking next week, it is not eglible since new version
+    # checking next week, it is not eligible since new version
     # is not released yet and timestamp is stored
-    with_eglible_environment(
+    with_eligible_environment(
       cmd: @cmd,
       rubygems_version: current_version,
       latest_rubygems_version: latest_version,
       reset_last_update_check: false
     ) do
       Time.stub :now, @start_time + @week do
-        refute_predicate @cmd, :eglible_for_update?
+        refute_predicate @cmd, :eligible_for_update?
         assert_equal @start_time + @week, Gem.configuration.last_update_check
       end
     end
@@ -107,103 +107,103 @@ def test_eglible_for_update_is_not_annoying_when_new_version_is_released
     # pretend new version is released
     latest_version = Gem::Version.new("1.3.0")
 
-    # checking later same next week, it is not eglible even new version
+    # checking later same next week, it is not eligible even new version
     # is released and timestamp is not stored
-    with_eglible_environment(
+    with_eligible_environment(
       cmd: @cmd,
       rubygems_version: current_version,
       latest_rubygems_version: latest_version,
       reset_last_update_check: false
     ) do
       Time.stub :now, @start_time + @week + @minute do
-        refute_predicate @cmd, :eglible_for_update?
+        refute_predicate @cmd, :eligible_for_update?
         assert_equal @start_time + @week, Gem.configuration.last_update_check
       end
     end
   end
 
-  def test_eglible_for_update_is_not_annoying_when_not_upgraded
-    with_eglible_environment(cmd: @cmd) do
-      # checking for first time, it is eglible and stored
+  def test_eligible_for_update_is_not_annoying_when_not_upgraded
+    with_eligible_environment(cmd: @cmd) do
+      # checking for first time, it is eligible and stored
       Time.stub :now, @start_time do
-        assert_predicate @cmd, :eglible_for_update?
+        assert_predicate @cmd, :eligible_for_update?
         assert_equal @start_time, Gem.configuration.last_update_check
       end
 
-      # checking minute later is not eglible and not stored
+      # checking minute later is not eligible and not stored
       Time.stub :now, @start_time + @minute do
-        refute_predicate @cmd, :eglible_for_update?
+        refute_predicate @cmd, :eligible_for_update?
         assert_equal @start_time, Gem.configuration.last_update_check
       end
 
-      # checking week later is eglible again and stored
+      # checking week later is eligible again and stored
       Time.stub :now, @start_time + @week do
-        assert_predicate @cmd, :eglible_for_update?
+        assert_predicate @cmd, :eligible_for_update?
         assert_equal @start_time + @week, Gem.configuration.last_update_check
       end
     end
   end
 
-  def test_eglible_for_update_prevent_config
-    with_eglible_environment(cmd: @cmd) do
+  def test_eligible_for_update_prevent_config
+    with_eligible_environment(cmd: @cmd) do
       original_config = Gem.configuration[:prevent_update_suggestion]
       Gem.configuration[:prevent_update_suggestion] = true
-      refute_predicate @cmd, :eglible_for_update?
+      refute_predicate @cmd, :eligible_for_update?
     ensure
       Gem.configuration[:prevent_update_suggestion] = original_config
     end
   end
 
-  def test_eglible_for_update_prevent_env
-    with_eglible_environment(cmd: @cmd) do
+  def test_eligible_for_update_prevent_env
+    with_eligible_environment(cmd: @cmd) do
       original_env = ENV["RUBYGEMS_PREVENT_UPDATE_SUGGESTION"]
       ENV["RUBYGEMS_PREVENT_UPDATE_SUGGESTION"] = "yes"
-      refute_predicate @cmd, :eglible_for_update?
+      refute_predicate @cmd, :eligible_for_update?
     ensure
       ENV["RUBYGEMS_PREVENT_UPDATE_SUGGESTION"] = original_env
     end
   end
 
-  def test_eglible_for_update_non_tty
-    with_eglible_environment(tty: false, cmd: @cmd) do
-      refute_predicate @cmd, :eglible_for_update?
+  def test_eligible_for_update_non_tty
+    with_eligible_environment(tty: false, cmd: @cmd) do
+      refute_predicate @cmd, :eligible_for_update?
     end
   end
 
-  def test_eglible_for_update_for_prerelease
-    with_eglible_environment(rubygems_version: Gem::Version.new("1.0.0-rc1"), cmd: @cmd) do
-      refute_predicate @cmd, :eglible_for_update?
+  def test_eligible_for_update_for_prerelease
+    with_eligible_environment(rubygems_version: Gem::Version.new("1.0.0-rc1"), cmd: @cmd) do
+      refute_predicate @cmd, :eligible_for_update?
     end
   end
 
-  def test_eglible_for_update_disabled_update
-    with_eglible_environment(cmd: @cmd) do
+  def test_eligible_for_update_disabled_update
+    with_eligible_environment(cmd: @cmd) do
       original_disable = Gem.disable_system_update_message
       Gem.disable_system_update_message = "disabled"
-      refute_predicate @cmd, :eglible_for_update?
+      refute_predicate @cmd, :eligible_for_update?
     ensure
       Gem.disable_system_update_message = original_disable
     end
   end
 
-  def test_eglible_for_update_on_ci
-    with_eglible_environment(ci: true, cmd: @cmd) do
-      refute_predicate @cmd, :eglible_for_update?
+  def test_eligible_for_update_on_ci
+    with_eligible_environment(ci: true, cmd: @cmd) do
+      refute_predicate @cmd, :eligible_for_update?
     end
   end
 
-  def test_eglible_for_update_unwrittable_config
-    with_eglible_environment(cmd: @cmd) do
+  def test_eligible_for_update_unwrittable_config
+    with_eligible_environment(cmd: @cmd) do
       Gem.configuration.stub :state_file_writable?, false do
-        refute_predicate @cmd, :eglible_for_update?
+        refute_predicate @cmd, :eligible_for_update?
       end
     end
   end
 
-  def test_eglible_for_update_notification_delay
-    with_eglible_environment(cmd: @cmd) do
+  def test_eligible_for_update_notification_delay
+    with_eligible_environment(cmd: @cmd) do
       Gem.configuration.last_update_check = Time.now.to_i
-      refute_predicate @cmd, :eglible_for_update?
+      refute_predicate @cmd, :eligible_for_update?
     end
   end
 end
diff --git a/test/rubygems/test_gem_version_option.rb b/test/rubygems/test_gem_version_option.rb
index b837b794db5385..8b6e14fc4263c4 100644
--- a/test/rubygems/test_gem_version_option.rb
+++ b/test/rubygems/test_gem_version_option.rb
@@ -82,10 +82,10 @@ def test_version_option
     @cmd.handle_options %w[--version >1]
 
     expected = {
-      :args => [],
-      :explicit_prerelease => false,
-      :prerelease => false,
-      :version => Gem::Requirement.new("> 1"),
+      args: [],
+      explicit_prerelease: false,
+      prerelease: false,
+      version: Gem::Requirement.new("> 1"),
     }
 
     assert_equal expected, @cmd.options
@@ -97,10 +97,10 @@ def test_version_option_compound
     @cmd.handle_options ["--version", "< 1, > 0.9"]
 
     expected = {
-      :args => [],
-      :explicit_prerelease => false,
-      :prerelease => false,
-      :version => Gem::Requirement.new("< 1", "> 0.9"),
+      args: [],
+      explicit_prerelease: false,
+      prerelease: false,
+      version: Gem::Requirement.new("< 1", "> 0.9"),
     }
 
     assert_equal expected, @cmd.options
@@ -112,10 +112,10 @@ def test_multiple_version_operator_option_compound
     @cmd.handle_options ["--version", "< 1", "--version", "> 0.9"]
 
     expected = {
-      :args => [],
-      :explicit_prerelease => false,
-      :prerelease => false,
-      :version => Gem::Requirement.new("< 1", "> 0.9"),
+      args: [],
+      explicit_prerelease: false,
+      prerelease: false,
+      version: Gem::Requirement.new("< 1", "> 0.9"),
     }
 
     assert_equal expected, @cmd.options
@@ -128,10 +128,10 @@ def test_version_option_explicit_prerelease
     @cmd.handle_options %w[--pre --version >1]
 
     expected = {
-      :args => [],
-      :explicit_prerelease => true,
-      :prerelease => true,
-      :version => Gem::Requirement.new("> 1"),
+      args: [],
+      explicit_prerelease: true,
+      prerelease: true,
+      version: Gem::Requirement.new("> 1"),
     }
 
     assert_equal expected, @cmd.options
@@ -143,10 +143,10 @@ def test_version_option_twice
     @cmd.handle_options %w[--version >1.a]
 
     expected = {
-      :args => [],
-      :explicit_prerelease => false,
-      :prerelease => true,
-      :version => Gem::Requirement.new("> 1.a"),
+      args: [],
+      explicit_prerelease: false,
+      prerelease: true,
+      version: Gem::Requirement.new("> 1.a"),
     }
 
     assert_equal expected, @cmd.options
@@ -154,10 +154,10 @@ def test_version_option_twice
     @cmd.handle_options %w[--version >1]
 
     expected = {
-      :args => [],
-      :explicit_prerelease => false,
-      :prerelease => false,
-      :version => Gem::Requirement.new("> 1"),
+      args: [],
+      explicit_prerelease: false,
+      prerelease: false,
+      version: Gem::Requirement.new("> 1"),
     }
 
     assert_equal expected, @cmd.options
diff --git a/test/rubygems/test_kernel.rb b/test/rubygems/test_kernel.rb
index 4c3d2d20c65cc9..d862b26fe98d2a 100644
--- a/test/rubygems/test_kernel.rb
+++ b/test/rubygems/test_kernel.rb
@@ -52,10 +52,20 @@ def test_gem_overlapping
     assert_equal 1, $:.count {|p| p.include?("a-1/lib") }
   end
 
-  def test_gem_prerelease
+  def test_gem_prerelease_is_the_only_available
     quick_gem "d", "1.1.a"
-    refute gem("d", ">= 1"),   "release requirement must not load prerelease"
-    assert gem("d", ">= 1.a"), "prerelease requirement may load prerelease"
+
+    assert gem("d", ">= 1"), "release requirement may load prerelease when sole option"
+    assert $:.one? {|p| p.include?("/d-1.1.a/lib") }
+  end
+
+  def test_release_favored_over_prerelease
+    quick_gem "d", "1.1.a"
+    quick_gem "d", "1.2"
+    gem("d", ">= 1")
+
+    refute $:.any? {|p| p.include?("/d-1.1.a/lib") }
+    assert $:.one? {|p| p.include?("/d-1.2/lib") }
   end
 
   def test_gem_env_req
diff --git a/test/rubygems/test_project_sanity.rb b/test/rubygems/test_project_sanity.rb
index 7a7b779b082c79..8f23b2d8c02944 100644
--- a/test/rubygems/test_project_sanity.rb
+++ b/test/rubygems/test_project_sanity.rb
@@ -12,25 +12,26 @@ def teardown
 
   def test_manifest_is_up_to_date
     pend unless File.exist?("#{root}/Rakefile")
+    rake = "#{root}/bin/rake"
 
-    _, status = Open3.capture2e("rake check_manifest")
+    _, status = Open3.capture2e(rake, "check_manifest")
 
     unless status.success?
       original_contents = File.read("#{root}/Manifest.txt")
 
       # Update the manifest to see if it fixes the problem
-      Open3.capture2e("rake update_manifest")
+      Open3.capture2e(rake, "update_manifest")
 
-      out, status = Open3.capture2e("rake check_manifest")
+      out, status = Open3.capture2e(rake, "check_manifest")
 
       # If `rake update_manifest` fixed the problem, that was the original
       # issue, otherwise it was an unknown error, so print the error output
       if status.success?
         File.write("#{root}/Manifest.txt", original_contents)
 
-        raise "Expected Manifest.txt to be up to date, but it's not. Run `rake update_manifest` to sync it."
+        raise "Expected Manifest.txt to be up to date, but it's not. Run `bin/rake update_manifest` to sync it."
       else
-        raise "There was an error running `rake check_manifest`: #{out}"
+        raise "There was an error running `bin/rake check_manifest`: #{out}"
       end
     end
   end
diff --git a/test/rubygems/test_require.rb b/test/rubygems/test_require.rb
index 95bae66e213d1e..f63c23c3159db5 100644
--- a/test/rubygems/test_require.rb
+++ b/test/rubygems/test_require.rb
@@ -130,7 +130,7 @@ def test_dash_i_beats_default_gems
   end
 
   def test_dash_i_respects_default_library_extension_priority
-    pend "extensions don't quite work on jruby" if Gem.java_platform?
+    pend "needs investigation" if Gem.java_platform?
     pend "not installed yet" unless RbConfig::TOPDIR
 
     dash_i_ext_arg = util_install_extension_file("a")
@@ -182,6 +182,22 @@ def test_require_is_not_lazy_with_exact_req
     assert_equal %w[a-1 b-1], loaded_spec_names
   end
 
+  def test_require_is_not_lazy_with_shadowed_default_gem
+    b1_default = new_default_spec("b", "1", nil, "foo.rb")
+    install_default_gems b1_default
+
+    a1 = util_spec "a", "1", { "b" => ">= 1" }, "lib/test_gem_require_a.rb"
+    b1 = util_spec("b", "1", nil, "lib/foo.rb")
+    install_specs b1, a1
+
+    # Load default ruby gems fresh as if we've just started a ruby script.
+    Gem::Specification.reset
+
+    assert_require "test_gem_require_a"
+    assert_equal %w[a-1 b-1], loaded_spec_names
+    assert_equal unresolved_names, []
+  end
+
   def test_require_is_lazy_with_inexact_req
     a1 = util_spec "a", "1", { "b" => ">= 1" }, "lib/test_gem_require_a.rb"
     b1 = util_spec "b", "1", nil, "lib/b/c.rb"
@@ -223,7 +239,7 @@ def test_require_can_use_a_pathname_object
 
   def test_activate_via_require_respects_loaded_files
     pend "Not sure what's going on. If another spec creates a 'a' gem before
-      this test, somehow require will load the benchmark in b, and ignore that the
+      this test, somehow require will load the erb in b, and ignore that the
       stdlib one is already in $LOADED_FEATURES?. Reproducible by running the
       spaceship_specific_file test before this one" if Gem.java_platform?
 
@@ -240,11 +256,11 @@ def test_activate_via_require_respects_loaded_files
       load_path_changed = true
     end
 
-    require "benchmark" # the stdlib
+    require "erb" # the stdlib
 
     a1 = util_spec "a", "1", { "b" => ">= 1" }, "lib/test_gem_require_a.rb"
-    b1 = util_spec "b", "1", nil, "lib/benchmark.rb"
-    b2 = util_spec "b", "2", nil, "lib/benchmark.rb"
+    b1 = util_spec "b", "1", nil, "lib/erb.rb"
+    b2 = util_spec "b", "2", nil, "lib/erb.rb"
 
     install_specs b1, b2, a1
 
@@ -257,12 +273,12 @@ def test_activate_via_require_respects_loaded_files
 
     assert_equal unresolved_names, ["b (>= 1)"]
 
-    # The require('benchmark') below will activate b-2. However, its
-    # lib/benchmark.rb won't ever be loaded. The reason is MRI sees that even
-    # though b-2 is earlier in $LOAD_PATH it already loaded a benchmark.rb file
+    # The require('erb') below will activate b-2. However, its
+    # lib/erb.rb won't ever be loaded. The reason is MRI sees that even
+    # though b-2 is earlier in $LOAD_PATH it already loaded a erb.rb file
     # and that still exists in $LOAD_PATH (further down),
     # and as a result #gem_original_require returns false.
-    refute require("benchmark"), "the benchmark stdlib should be recognized as already loaded"
+    refute require("erb"), "the erb stdlib should be recognized as already loaded"
 
     assert_includes $LOAD_PATH, b2.full_require_paths[0]
     assert_includes $LOAD_PATH, rubylibdir
@@ -273,7 +289,7 @@ def test_activate_via_require_respects_loaded_files
     assert_operator $LOAD_PATH.index(b2.full_require_paths[0]), :<, $LOAD_PATH.index(rubylibdir), message
 
     # We detected that we should activate b-2, so we did so, but
-    # then #gem_original_require decided "I've already got some benchmark.rb" loaded.
+    # then #gem_original_require decided "I've already got some erb.rb" loaded.
     # This case is fine because our lazy loading provided exactly
     # the same behavior as eager loading would have.
 
@@ -471,11 +487,11 @@ def test_realworld_upgraded_default_gem
     File.write(path, code)
 
     output = Gem::Util.popen({ "GEM_HOME" => @gemhome }, *ruby_with_rubygems_in_load_path, path).strip
-    assert $?.success?
     refute_empty output
     assert_equal "999.99.9", output.lines[0].chomp
     # Make sure only files from the newer json gem are loaded, and no files from the default json gem
     assert_equal ["#{@gemhome}/gems/json-999.99.9/lib/json.rb"], output.lines.grep(%r{/gems/json-}).map(&:chomp)
+    assert $?.success?
   end
 
   def test_default_gem_and_normal_gem
@@ -489,6 +505,33 @@ def test_default_gem_and_normal_gem
     assert_equal %w[default-3.0], loaded_spec_names
   end
 
+  def test_default_gem_and_normal_gem_same_version
+    default_gem_spec = new_default_spec("default", "3.0",
+                                        nil, "default/gem.rb")
+    install_default_gems(default_gem_spec)
+    normal_gem_spec = util_spec("default", "3.0", nil,
+                               "lib/default/gem.rb")
+    install_specs(normal_gem_spec)
+
+    # Load default ruby gems fresh as if we've just started a ruby script.
+    Gem::Specification.reset
+
+    assert_require "default/gem"
+    assert_equal %w[default-3.0], loaded_spec_names
+    refute Gem.loaded_specs["default"].default_gem?
+  end
+
+  def test_normal_gem_does_not_shadow_default_gem
+    default_gem_spec = new_default_spec("foo", "2.0", nil, "foo.rb")
+    install_default_gems(default_gem_spec)
+
+    normal_gem_spec = util_spec("fake-foo", "3.0", nil, "lib/foo.rb")
+    install_specs(normal_gem_spec)
+
+    assert_require "foo"
+    assert_equal %w[foo-2.0], loaded_spec_names
+  end
+
   def test_normal_gems_with_overridden_load_error_message
     normal_gem_spec = util_spec("normal", "3.0", nil, "lib/normal/gem.rb")
 
@@ -529,6 +572,65 @@ def test_default_gem_prerelease
     assert_equal %w[default-3.0.0.rc2], loaded_spec_names
   end
 
+  def test_default_gem_with_unresolved_gems_depending_on_it
+    my_http_old = util_spec "my-http", "0.1.1", nil, "lib/my/http.rb"
+    install_gem my_http_old
+
+    my_http_default = new_default_spec "my-http", "0.3.0", nil, "my/http.rb"
+    install_default_gems my_http_default
+
+    faraday_1 = util_spec "faraday", "1", { "my-http" => ">= 0" }
+    install_gem faraday_1
+
+    faraday_2 = util_spec "faraday", "2", { "my-http" => ">= 0" }
+    install_gem faraday_2
+
+    chef = util_spec "chef", "1", { "faraday" => [">= 1", "< 3"] }, "lib/chef.rb"
+    install_gem chef
+
+    assert_require "chef"
+    assert_require "my/http"
+  end
+
+  def test_default_gem_required_circulary_with_unresolved_gems_depending_on_it
+    my_http_old = util_spec "my-http", "0.1.1", nil, "lib/my/http.rb"
+    install_gem my_http_old
+
+    my_http_default = new_default_spec "my-http", "0.3.0", nil, "my/http.rb"
+    my_http_default_path = File.join(@tempdir, "default_gems", "lib", "my/http.rb")
+    install_default_gems my_http_default
+    File.write(my_http_default_path, 'require "my/http"')
+
+    faraday_1 = util_spec "faraday", "1", { "my-http" => ">= 0" }
+    install_gem faraday_1
+
+    faraday_2 = util_spec "faraday", "2", { "my-http" => ">= 0" }
+    install_gem faraday_2
+
+    chef = util_spec "chef", "1", { "faraday" => [">= 1", "< 3"] }, "lib/chef.rb"
+    install_gem chef
+
+    assert_require "chef"
+
+    out, err = capture_output do
+      assert_require "my/http"
+    end
+
+    assert_empty out
+
+    circular_require_warning = false
+
+    err_lines = err.split("\n").reject do |line|
+      if line.include?("circular require")
+        circular_require_warning = true
+      elsif circular_require_warning # ignore backtrace lines for circular require warning
+        circular_require_warning = line.start_with?(/[\s]/)
+      end
+    end
+
+    assert_empty err_lines
+  end
+
   def loaded_spec_names
     Gem.loaded_specs.values.map(&:full_name).sort
   end
@@ -619,11 +721,11 @@ def test_require_bundler
         _, err = capture_subprocess_io do
           system(*ruby_with_rubygems_in_load_path, "-w", "--disable=gems", "-C", dir, "main.rb")
         end
-        assert_match(/{:x=>1}\n{:y=>2}\n$/, err)
+        assert_match(/#{{ x: 1 }.inspect}\n#{{ y: 2 }.inspect}\n$/, err)
         _, err = capture_subprocess_io do
           system(*ruby_with_rubygems_in_load_path, "-w", "--enable=gems", "-C", dir, "main.rb")
         end
-        assert_match(/{:x=>1}\n{:y=>2}\n$/, err)
+        assert_match(/#{{ x: 1 }.inspect}\n#{{ y: 2 }.inspect}\n$/, err)
       end
     end
   end
diff --git a/test/rubygems/test_rubygems.rb b/test/rubygems/test_rubygems.rb
index ae8959c4edb9ae..ec195b65cd38a8 100644
--- a/test/rubygems/test_rubygems.rb
+++ b/test/rubygems/test_rubygems.rb
@@ -4,7 +4,7 @@
 
 class GemTest < Gem::TestCase
   def test_rubygems_normal_behaviour
-    _ = Gem::Util.popen(*ruby_with_rubygems_in_load_path, "-e", "'require \"rubygems\"'", { :err => [:child, :out] }).strip
+    _ = Gem::Util.popen(*ruby_with_rubygems_in_load_path, "-e", "'require \"rubygems\"'", { err: [:child, :out] }).strip
     assert $?.success?
   end
 
@@ -15,9 +15,9 @@ def test_operating_system_other_exceptions
       intentionally_not_implemented_method
     RUBY
 
-    output = Gem::Util.popen(*ruby_with_rubygems_and_fake_operating_system_in_load_path(path), "-e", "'require \"rubygems\"'", { :err => [:child, :out] }).strip
+    output = Gem::Util.popen(*ruby_with_rubygems_and_fake_operating_system_in_load_path(path), "-e", "'require \"rubygems\"'", { err: [:child, :out] }).strip
     assert !$?.success?
-    assert_includes output, "undefined local variable or method `intentionally_not_implemented_method'"
+    assert_match(/undefined local variable or method [`']intentionally_not_implemented_method'/, output)
     assert_includes output, "Loading the #{operating_system_rb_at(path)} file caused an error. " \
     "This file is owned by your OS, not by rubygems upstream. " \
     "Please find out which OS package this file belongs to and follow the guidelines from your OS to report " \
@@ -42,7 +42,7 @@ def self.default_dir
       *ruby_with_rubygems_and_fake_operating_system_in_load_path(path),
       "-e",
       "require \"rubygems\"; puts Gem::Specification.stubs.map(&:full_name)",
-      { :err => [:child, :out] }
+      { err: [:child, :out] }
     ).strip
     begin
       assert_empty output
diff --git a/test/rubygems/test_webauthn_listener.rb b/test/rubygems/test_webauthn_listener.rb
index 5e91064b49320c..ded41289285c5a 100644
--- a/test/rubygems/test_webauthn_listener.rb
+++ b/test/rubygems/test_webauthn_listener.rb
@@ -17,9 +17,9 @@ def teardown
     super
   end
 
-  def test_listener_thread_retreives_otp_code
+  def test_listener_thread_retrieves_otp_code
     thread = Gem::GemcutterUtilities::WebauthnListener.listener_thread(Gem.host, @server)
-    Gem::MockBrowser.get URI("http://localhost:#{@port}?code=xyz")
+    Gem::MockBrowser.get Gem::URI("http://localhost:#{@port}?code=xyz")
 
     thread.join
     assert_equal "xyz", thread[:otp]
@@ -27,7 +27,7 @@ def test_listener_thread_retreives_otp_code
 
   def test_listener_thread_sets_error
     thread = Gem::GemcutterUtilities::WebauthnListener.listener_thread(Gem.host, @server)
-    Gem::MockBrowser.post URI("http://localhost:#{@port}?code=xyz")
+    Gem::MockBrowser.post Gem::URI("http://localhost:#{@port}?code=xyz")
 
     thread.join
     assert_equal "Security device verification failed: Invalid HTTP method POST received.", thread[:error].message
@@ -35,15 +35,15 @@ def test_listener_thread_sets_error
 
   def test_wait_for_otp_code_get_follows_options
     wait_for_otp_code
-    assert Gem::MockBrowser.options(URI("http://localhost:#{@port}?code=xyz")).is_a? Net::HTTPNoContent
-    assert Gem::MockBrowser.get(URI("http://localhost:#{@port}?code=xyz")).is_a? Net::HTTPOK
+    assert Gem::MockBrowser.options(Gem::URI("http://localhost:#{@port}?code=xyz")).is_a? Gem::Net::HTTPNoContent
+    assert Gem::MockBrowser.get(Gem::URI("http://localhost:#{@port}?code=xyz")).is_a? Gem::Net::HTTPOK
   end
 
   def test_wait_for_otp_code_options_request
     wait_for_otp_code
-    response = Gem::MockBrowser.options URI("http://localhost:#{@port}?code=xyz")
+    response = Gem::MockBrowser.options Gem::URI("http://localhost:#{@port}?code=xyz")
 
-    assert response.is_a? Net::HTTPNoContent
+    assert response.is_a? Gem::Net::HTTPNoContent
     assert_equal Gem.host, response["access-control-allow-origin"]
     assert_equal "POST", response["access-control-allow-methods"]
     assert_equal "Content-Type, Authorization, x-csrf-token", response["access-control-allow-headers"]
@@ -52,9 +52,9 @@ def test_wait_for_otp_code_options_request
 
   def test_wait_for_otp_code_get_request
     wait_for_otp_code
-    response = Gem::MockBrowser.get URI("http://localhost:#{@port}?code=xyz")
+    response = Gem::MockBrowser.get Gem::URI("http://localhost:#{@port}?code=xyz")
 
-    assert response.is_a? Net::HTTPOK
+    assert response.is_a? Gem::Net::HTTPOK
     assert_equal "text/plain; charset=utf-8", response["Content-Type"]
     assert_equal "7", response["Content-Length"]
     assert_equal Gem.host, response["access-control-allow-origin"]
@@ -69,10 +69,10 @@ def test_wait_for_otp_code_get_request
 
   def test_wait_for_otp_code_invalid_post_req_method
     wait_for_otp_code_expect_error_with_message("Security device verification failed: Invalid HTTP method POST received.")
-    response = Gem::MockBrowser.post URI("http://localhost:#{@port}?code=xyz")
+    response = Gem::MockBrowser.post Gem::URI("http://localhost:#{@port}?code=xyz")
 
     assert response
-    assert response.is_a? Net::HTTPMethodNotAllowed
+    assert response.is_a? Gem::Net::HTTPMethodNotAllowed
     assert_equal "GET, OPTIONS", response["allow"]
     assert_equal "close", response["Connection"]
 
@@ -82,9 +82,9 @@ def test_wait_for_otp_code_invalid_post_req_method
 
   def test_wait_for_otp_code_incorrect_path
     wait_for_otp_code_expect_error_with_message("Security device verification failed: Page at /path not found.")
-    response = Gem::MockBrowser.post URI("http://localhost:#{@port}/path?code=xyz")
+    response = Gem::MockBrowser.post Gem::URI("http://localhost:#{@port}/path?code=xyz")
 
-    assert response.is_a? Net::HTTPNotFound
+    assert response.is_a? Gem::Net::HTTPNotFound
     assert_equal "close", response["Connection"]
 
     @thread.join
@@ -93,9 +93,9 @@ def test_wait_for_otp_code_incorrect_path
 
   def test_wait_for_otp_code_no_params_response
     wait_for_otp_code_expect_error_with_message("Security device verification failed: Did not receive OTP from https://rubygems.org.")
-    response = Gem::MockBrowser.get URI("http://localhost:#{@port}")
+    response = Gem::MockBrowser.get Gem::URI("http://localhost:#{@port}")
 
-    assert response.is_a? Net::HTTPBadRequest
+    assert response.is_a? Gem::Net::HTTPBadRequest
     assert_equal "text/plain; charset=utf-8", response["Content-Type"]
     assert_equal "22", response["Content-Length"]
     assert_equal "close", response["Connection"]
@@ -107,9 +107,9 @@ def test_wait_for_otp_code_no_params_response
 
   def test_wait_for_otp_code_incorrect_params
     wait_for_otp_code_expect_error_with_message("Security device verification failed: Did not receive OTP from https://rubygems.org.")
-    response = Gem::MockBrowser.get URI("http://localhost:#{@port}?param=xyz")
+    response = Gem::MockBrowser.get Gem::URI("http://localhost:#{@port}?param=xyz")
 
-    assert response.is_a? Net::HTTPBadRequest
+    assert response.is_a? Gem::Net::HTTPBadRequest
     assert_equal "text/plain; charset=utf-8", response["Content-Type"]
     assert_equal "22", response["Content-Length"]
     assert_equal "close", response["Connection"]
diff --git a/test/rubygems/test_webauthn_poller.rb b/test/rubygems/test_webauthn_poller.rb
index 23c24faa114c61..fd2408175861cb 100644
--- a/test/rubygems/test_webauthn_poller.rb
+++ b/test/rubygems/test_webauthn_poller.rb
@@ -13,7 +13,7 @@ def setup
     @fetcher = Gem::FakeFetcher.new
     Gem::RemoteFetcher.fetcher = @fetcher
     @credentials = {
-      email: "email@example.com",
+      identifier: "email@example.com",
       password: "password",
     }
   end
@@ -45,8 +45,8 @@ def test_poll_thread_webauthn_verification_error
   end
 
   def test_poll_thread_timeout_error
-    raise_error = ->(*_args) { raise Timeout::Error, "execution expired" }
-    Timeout.stub(:timeout, raise_error) do
+    raise_error = ->(*_args) { raise Gem::Timeout::Error, "execution expired" }
+    Gem::Timeout.stub(:timeout, raise_error) do
       thread = Gem::GemcutterUtilities::WebauthnPoller.poll_thread({}, @host, @webauthn_url, @credentials)
       thread.join
       assert_equal thread[:error].message, "execution expired"
@@ -72,8 +72,8 @@ def test_poll_for_otp_pending_sleeps
       msg: "OK"
     )
 
-    assert_raise Timeout::Error do
-      Timeout.timeout(0.1) do
+    assert_raise Gem::Timeout::Error do
+      Gem::Timeout.timeout(0.1) do
         Gem::GemcutterUtilities::WebauthnPoller.new({}, @host).poll_for_otp(@webauthn_url, @credentials)
       end
     end
@@ -121,4 +121,14 @@ def test_poll_for_otp_invalid_status
     assert_equal error.message,
       "Security device verification failed: The token in the link you used has either expired or been used already."
   end
+
+  def test_poll_for_otp_missing_credentials
+    @credentials = { password: "password" }
+
+    error = assert_raise Gem::WebauthnVerificationError do
+      Gem::GemcutterUtilities::WebauthnPoller.new({}, @host).poll_for_otp(@webauthn_url, @credentials)
+    end
+
+    assert_equal error.message, "Security device verification failed: Provided missing credentials"
+  end
 end
diff --git a/test/rubygems/utilities.rb b/test/rubygems/utilities.rb
index 63075e0e9cad86..bf601f6fac2dc9 100644
--- a/test/rubygems/utilities.rb
+++ b/test/rubygems/utilities.rb
@@ -30,26 +30,26 @@
 # See RubyGems' tests for more examples of FakeFetcher.
 
 class Gem::FakeFetcher
-  attr_reader :data
-  attr_reader :last_request
+  attr_reader :data, :requests
   attr_accessor :paths
 
   def initialize
     @data = {}
     @paths = []
+    @requests = []
   end
 
   def find_data(path)
-    return Gem.read_binary path.path if URI === path && path.scheme == "file"
+    return Gem.read_binary path.path if Gem::URI === path && path.scheme == "file"
 
-    if URI === path && "URI::#{path.scheme.upcase}" != path.class.name
+    if Gem::URI === path && "Gem::URI::#{path.scheme.upcase}" != path.class.name
       raise ArgumentError,
         "mismatch for scheme #{path.scheme} and class #{path.class}"
     end
 
     path = path.to_s
     @paths << path
-    raise ArgumentError, "need full URI" unless path.start_with?("https://", "http://")
+    raise ArgumentError, "need full Gem::URI" unless path.start_with?("https://", "http://")
 
     unless @data.key? path
       raise Gem::RemoteFetcher::FetchError.new("no data for #{path}", path)
@@ -65,7 +65,7 @@ def find_data(path)
   def create_response(uri)
     data = find_data(uri)
     response = data.respond_to?(:call) ? data.call : data
-    raise TypeError, "#{response.class} is not a type of Net::HTTPResponse" unless response.is_a?(Net::HTTPResponse)
+    raise TypeError, "#{response.class} is not a type of Gem::Net::HTTPResponse" unless response.is_a?(Gem::Net::HTTPResponse)
 
     response
   end
@@ -99,9 +99,25 @@ def open_uri_or_path(path)
     create_response(uri)
   end
 
+  def last_request
+    @requests.last
+  end
+
+  class FakeSocket < StringIO
+    def continue_timeout
+      1
+    end
+  end
+
   def request(uri, request_class, last_modified = nil)
-    @last_request = request_class.new uri.request_uri
-    yield @last_request if block_given?
+    @requests << request_class.new(uri.request_uri)
+    yield last_request if block_given?
+
+    # Ensure multipart request bodies are generated
+    socket = FakeSocket.new
+    last_request.content_type ||= "application/x-www-form-urlencoded"
+    last_request.exec socket.binmode, "1.1", last_request.path
+    _, last_request.body = socket.string.split("\r\n\r\n", 2)
 
     create_response(uri)
   end
@@ -164,7 +180,7 @@ def download_to_cache(dependency)
 end
 
 ##
-# The HTTPResponseFactory allows easy creation of Net::HTTPResponse instances in RubyGems tests:
+# The HTTPResponseFactory allows easy creation of Gem::Net::HTTPResponse instances in RubyGems tests:
 #
 # Example:
 #
@@ -178,7 +194,7 @@ def download_to_cache(dependency)
 
 class Gem::HTTPResponseFactory
   def self.create(body:, code:, msg:, headers: {})
-    response = Net::HTTPResponse.send(:response_class, code.to_s).new("1.0", code.to_s, msg)
+    response = Gem::Net::HTTPResponse.send(:response_class, code.to_s).new("1.0", code.to_s, msg)
     response.instance_variable_set(:@body, body)
     response.instance_variable_set(:@read, true)
     headers.each {|name, value| response[name] = value }
@@ -194,30 +210,30 @@ def self.create(body:, code:, msg:, headers: {})
 # Example:
 #
 #   # Sends a get request to http://localhost:5678
-#   Gem::MockBrowser.get URI("http://localhost:5678")
+#   Gem::MockBrowser.get Gem::URI("http://localhost:5678")
 #
 # See RubyGems' tests for more examples of MockBrowser.
 #
 
 class Gem::MockBrowser
   def self.options(uri)
-    options = Net::HTTP::Options.new(uri)
-    Net::HTTP.start(uri.hostname, uri.port) do |http|
+    options = Gem::Net::HTTP::Options.new(uri)
+    Gem::Net::HTTP.start(uri.hostname, uri.port) do |http|
       http.request(options)
     end
   end
 
   def self.get(uri)
-    get = Net::HTTP::Get.new(uri)
-    Net::HTTP.start(uri.hostname, uri.port) do |http|
+    get = Gem::Net::HTTP::Get.new(uri)
+    Gem::Net::HTTP.start(uri.hostname, uri.port) do |http|
       http.request(get)
     end
   end
 
   def self.post(uri, content_type: "application/x-www-form-urlencoded")
     headers = { "content-type" => content_type } if content_type
-    post = Net::HTTP::Post.new(uri, headers)
-    Net::HTTP.start(uri.hostname, uri.port) do |http|
+    post = Gem::Net::HTTP::Post.new(uri, headers)
+    Gem::Net::HTTP.start(uri.hostname, uri.port) do |http|
       http.request(post)
     end
   end
@@ -368,12 +384,12 @@ def setup_fetcher # :nodoc:
     begin
       gem_repo = @test.gem_repo
       @test.gem_repo = @repository
-      @test.uri = URI @repository
+      @test.uri = Gem::URI @repository
 
       @test.util_setup_spec_fetcher(*@downloaded)
     ensure
       @test.gem_repo = gem_repo
-      @test.uri = URI gem_repo
+      @test.uri = Gem::URI gem_repo
     end
 
     @gems.each do |spec, gem|
diff --git a/test/runner.rb b/test/runner.rb
index 2f3267f6c3da30..c34517cbf2f545 100644
--- a/test/runner.rb
+++ b/test/runner.rb
@@ -1,16 +1,5 @@
 # frozen_string_literal: true
 
-# Should be done in rubygems test files?
-ENV["GEM_SKIP"] = "".freeze
-ENV.delete("RUBY_CODESIGN")
-
-Warning[:experimental] = false
-
-gem_path = [
-  File.realdirpath(".bundle"),
-  File.realdirpath("../.bundle", __dir__),
-]
-ENV["GEM_PATH"] = gem_path.join(File::PATH_SEPARATOR)
-ENV["GEM_HOME"] = gem_path.first
+# NOTE: Do not add any settings here for test-all. Instead, please add it to ../tool/test/init.rb.
 
 require_relative '../tool/test/runner'
diff --git a/test/set/fixtures/fake_sorted_set_gem/sorted_set.rb b/test/set/fixtures/fake_sorted_set_gem/sorted_set.rb
deleted file mode 100644
index f45a7663037972..00000000000000
--- a/test/set/fixtures/fake_sorted_set_gem/sorted_set.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-Object.instance_exec do
-  # Remove the constant to cancel autoload that would be fired by
-  # `class SortedSet` and cause circular require.
-  remove_const :SortedSet if const_defined?(:SortedSet)
-end
-
-class SortedSet < Set
-  # ...
-end
diff --git a/test/set/test_sorted_set.rb b/test/set/test_sorted_set.rb
deleted file mode 100644
index f7ad7af29933ae..00000000000000
--- a/test/set/test_sorted_set.rb
+++ /dev/null
@@ -1,45 +0,0 @@
-# frozen_string_literal: false
-require 'test/unit'
-require 'set'
-
-class TC_SortedSet < Test::Unit::TestCase
-  def base_dir
-    "#{__dir__}/../lib"
-  end
-
-  def assert_runs(ruby, options: nil)
-    options = ['-I', base_dir, *options]
-    r = system(RbConfig.ruby, *options, '-e', ruby)
-    assert(r)
-  end
-
-  def test_error
-    assert_runs <<~RUBY
-      require "set"
-
-      r = begin
-        puts SortedSet.new
-      rescue Exception => e
-        e.message
-      end
-      raise r unless r.match?(/has been extracted/)
-    RUBY
-  end
-
-  def test_ok_with_gem
-    assert_runs <<~RUBY, options: ['-I', "#{__dir__}/fixtures/fake_sorted_set_gem"]
-      require "set"
-
-      var = SortedSet.new.to_s
-    RUBY
-  end
-
-  def test_ok_require
-    assert_runs <<~RUBY, options: ['-I', "#{__dir__}/fixtures/fake_sorted_set_gem"]
-      require "set"
-      require "sorted_set"
-
-      var = SortedSet.new.to_s
-    RUBY
-  end
-end
diff --git a/test/socket/test_addrinfo.rb b/test/socket/test_addrinfo.rb
index 832a1f8d05bcb9..0c9529090e4da3 100644
--- a/test/socket/test_addrinfo.rb
+++ b/test/socket/test_addrinfo.rb
@@ -103,7 +103,7 @@ def test_addrinfo_predicates
   end
 
   def test_error_message
-    e = assert_raise_with_message(SocketError, /getaddrinfo/) do
+    e = assert_raise_with_message(Socket::ResolutionError, /getaddrinfo/) do
       Addrinfo.ip("...")
     end
     m = e.message
@@ -357,7 +357,13 @@ def test_family_addrinfo
     ai = Addrinfo.unix("/testdir/sock").family_addrinfo("/testdir/sock2")
     assert_equal("/testdir/sock2", ai.unix_path)
     assert_equal(Socket::SOCK_STREAM, ai.socktype)
-    assert_raise(SocketError) { Addrinfo.tcp("0.0.0.0", 4649).family_addrinfo("::1", 80) }
+    assert_raise(Socket::ResolutionError) { Addrinfo.tcp("0.0.0.0", 4649).family_addrinfo("::1", 80) }
+  end
+
+  def test_ractor_shareable
+    assert_ractor(<<~'RUBY', require: 'socket', timeout: 60)
+      Ractor.make_shareable Addrinfo.new "\x10\x02\x14\xE9\xE0\x00\x00\xFB\x00\x00\x00\x00\x00\x00\x00\x00".b
+    RUBY
   end
 
   def random_port
diff --git a/test/socket/test_socket.rb b/test/socket/test_socket.rb
index ab4563dce244b0..4b85d432911b88 100644
--- a/test/socket/test_socket.rb
+++ b/test/socket/test_socket.rb
@@ -91,20 +91,20 @@ def test_bind
 
   def test_getaddrinfo
     # This should not send a DNS query because AF_UNIX.
-    assert_raise(SocketError) { Socket.getaddrinfo("www.kame.net", 80, "AF_UNIX") }
+    assert_raise(Socket::ResolutionError) { Socket.getaddrinfo("www.kame.net", 80, "AF_UNIX") }
   end
 
   def test_getaddrinfo_raises_no_errors_on_port_argument_of_0 # [ruby-core:29427]
     assert_nothing_raised('[ruby-core:29427]'){ Socket.getaddrinfo('localhost', 0, Socket::AF_INET, Socket::SOCK_STREAM, nil, Socket::AI_CANONNAME) }
     assert_nothing_raised('[ruby-core:29427]'){ Socket.getaddrinfo('localhost', '0', Socket::AF_INET, Socket::SOCK_STREAM, nil, Socket::AI_CANONNAME) }
     assert_nothing_raised('[ruby-core:29427]'){ Socket.getaddrinfo('localhost', '00', Socket::AF_INET, Socket::SOCK_STREAM, nil, Socket::AI_CANONNAME) }
-    assert_raise(SocketError, '[ruby-core:29427]'){ Socket.getaddrinfo(nil, nil, Socket::AF_INET, Socket::SOCK_STREAM, nil, Socket::AI_CANONNAME) }
+    assert_raise(Socket::ResolutionError, '[ruby-core:29427]'){ Socket.getaddrinfo(nil, nil, Socket::AF_INET, Socket::SOCK_STREAM, nil, Socket::AI_CANONNAME) }
     assert_nothing_raised('[ruby-core:29427]'){ TCPServer.open('localhost', 0) {} }
   end
 
 
   def test_getnameinfo
-    assert_raise(SocketError) { Socket.getnameinfo(["AF_UNIX", 80, "0.0.0.0"]) }
+    assert_raise(Socket::ResolutionError) { Socket.getnameinfo(["AF_UNIX", 80, "0.0.0.0"]) }
     assert_raise(ArgumentError) {Socket.getnameinfo(["AF_INET", "http\0", "example.net"])}
     assert_raise(ArgumentError) {Socket.getnameinfo(["AF_INET", "http", "example.net\0"])}
   end
@@ -447,13 +447,12 @@ def test_udp_server
         omit "UDP server is no response: #{$!}"
       ensure
         if th
-          if skipped
-            Thread.kill th unless th.join(10)
-          else
+          unless skipped
             Addrinfo.udp("127.0.0.1", port).connect {|s| s.sendmsg "exit" }
-            unless th.join(10)
-              Thread.kill th
-              th.join(10)
+          end
+          unless th.join(10)
+            th.kill.join(10)
+            unless skipped
               raise "thread killed"
             end
           end
@@ -490,13 +489,14 @@ def timestamp_retry_rw(s1, s2, t1, type)
         end while IO.select([r], nil, nil, 0.1).nil?
         n
       end
-      timeout = (defined?(RubyVM::RJIT) && RubyVM::RJIT.enabled? ? 120 : 30) # for --jit-wait
+      timeout = 30
       assert_equal([[s1],[],[]], IO.select([s1], nil, nil, timeout))
       msg, _, _, stamp = s1.recvmsg
       assert_equal("a", msg)
       assert(stamp.cmsg_is?(:SOCKET, type))
       w.close # stop th
       n = th.value
+      th = nil
       n > 1 and
         warn "UDP packet loss for #{type} over loopback, #{n} tries needed"
       t2 = Time.now.strftime("%Y-%m-%d")
@@ -505,11 +505,15 @@ def timestamp_retry_rw(s1, s2, t1, type)
       t = stamp.timestamp
       assert_match(pat, t.strftime("%Y-%m-%d"))
       stamp
+    ensure
+      if th and !th.join(10)
+        th.kill.join(10)
+      end
     end
   end
 
   def test_timestamp
-    return if /linux|freebsd|netbsd|openbsd|solaris|darwin/ !~ RUBY_PLATFORM
+    return if /linux|freebsd|netbsd|openbsd|darwin/ !~ RUBY_PLATFORM
     return if !defined?(Socket::AncillaryData) || !defined?(Socket::SO_TIMESTAMP)
     t1 = Time.now.strftime("%Y-%m-%d")
     stamp = nil
@@ -766,4 +770,330 @@ def test_udp_recvmsg_truncation
     s2.close
   end
 
+  def test_resolurion_error_error_code
+    begin
+      Socket.getaddrinfo("example.com", 80, "AF_UNIX")
+    rescue => e
+      assert_include([Socket::EAI_FAMILY, Socket::EAI_FAIL], e.error_code)
+    end
+  end
+
+  def test_tcp_socket_v6_hostname_resolved_earlier
+    opts = %w[-rsocket -W1]
+    assert_separately opts, <<~RUBY
+    begin
+      begin
+        # Verify that "localhost" can be resolved to an IPv6 address
+        Socket.getaddrinfo("localhost", 0, Socket::AF_INET6)
+        server = TCPServer.new("::1", 0)
+      rescue Socket::ResolutionError, Errno::EADDRNOTAVAIL # IPv6 is not supported
+        return
+      end
+
+      _, port, = server.addr
+      server_thread = Thread.new { server.accept }
+
+      Addrinfo.define_singleton_method(:getaddrinfo) do |_, _, family, *_|
+        case family
+        when Socket::AF_INET6 then [Addrinfo.tcp("::1", port)]
+        when Socket::AF_INET then sleep(10); [Addrinfo.tcp("127.0.0.1", port)]
+        end
+      end
+
+      socket = Socket.tcp("localhost", port)
+      assert_true(socket.remote_address.ipv6?)
+    ensure
+      server_thread&.value&.close
+      server&.close
+      socket&.close
+    end
+    RUBY
+  end
+
+  def test_tcp_socket_v4_hostname_resolved_earlier
+    opts = %w[-rsocket -W1]
+    assert_separately opts, <<~RUBY
+    begin
+      server = TCPServer.new("127.0.0.1", 0)
+      _, port, = server.addr
+      server_thread = Thread.new { server.accept }
+
+      Addrinfo.define_singleton_method(:getaddrinfo) do |_, _, family, *_|
+        case family
+        when Socket::AF_INET6 then sleep(10); [Addrinfo.tcp("::1", port)]
+        when Socket::AF_INET then [Addrinfo.tcp("127.0.0.1", port)]
+        end
+      end
+
+      socket = Socket.tcp("localhost", port)
+      assert_true(socket.remote_address.ipv4?)
+    ensure
+      server_thread&.value&.close
+      server&.close
+      socket&.close
+    end
+    RUBY
+  end
+
+  def test_tcp_socket_v6_hostname_resolved_in_resolution_delay
+    opts = %w[-rsocket -W1]
+    assert_separately opts, <<~RUBY
+    begin
+      begin
+        # Verify that "localhost" can be resolved to an IPv6 address
+        Socket.getaddrinfo("localhost", 0, Socket::AF_INET6)
+        server = TCPServer.new("::1", 0)
+      rescue Socket::ResolutionError, Errno::EADDRNOTAVAIL # IPv6 is not supported
+        return
+      end
+
+      _, port, = server.addr
+      server_thread = Thread.new { server.accept }
+
+      delay_time = 0.025 # Socket::RESOLUTION_DELAY (private) is 0.05
+
+      Addrinfo.define_singleton_method(:getaddrinfo) do |_, _, family, *_|
+        case family
+        when Socket::AF_INET6 then sleep(delay_time); [Addrinfo.tcp("::1", port)]
+        when Socket::AF_INET then [Addrinfo.tcp("127.0.0.1", port)]
+        end
+      end
+
+      socket = Socket.tcp("localhost", port)
+      assert_true(socket.remote_address.ipv6?)
+    ensure
+      server_thread&.value&.close
+      server&.close
+      socket&.close
+    end
+    RUBY
+  end
+
+  def test_tcp_socket_v6_hostname_resolved_earlier_and_v6_server_is_not_listening
+    opts = %w[-rsocket -W1]
+    assert_separately opts, <<~RUBY
+    begin
+      ipv4_address = "127.0.0.1"
+      server = Socket.new(Socket::AF_INET, :STREAM)
+      server.bind(Socket.pack_sockaddr_in(0, ipv4_address))
+      port = server.connect_address.ip_port
+      server_thread = Thread.new { server.listen(1); server.accept }
+
+      Addrinfo.define_singleton_method(:getaddrinfo) do |_, _, family, *_|
+        case family
+        when Socket::AF_INET6 then [Addrinfo.tcp("::1", port)]
+        when Socket::AF_INET then sleep(0.001); [Addrinfo.tcp(ipv4_address, port)]
+        end
+      end
+
+      socket = Socket.tcp("localhost", port)
+      assert_equal(ipv4_address, socket.remote_address.ip_address)
+    ensure
+      accepted, _ = server_thread&.value
+      accepted&.close
+      server&.close
+      socket&.close
+    end
+    RUBY
+  end
+
+  def test_tcp_socket_resolv_timeout
+    opts = %w[-rsocket -W1]
+    assert_separately opts, <<~RUBY
+    begin
+      server = TCPServer.new("localhost", 0)
+      _, port, = server.addr
+
+      Addrinfo.define_singleton_method(:getaddrinfo) { |*_| sleep }
+
+      assert_raise(Errno::ETIMEDOUT) do
+        Socket.tcp("localhost", port, resolv_timeout: 0.01)
+      end
+    ensure
+      server&.close
+    end
+    RUBY
+  end
+
+  def test_tcp_socket_resolv_timeout_with_connection_failure
+    opts = %w[-rsocket -W1]
+    assert_separately opts, <<~RUBY
+    server = TCPServer.new("127.0.0.1", 12345)
+    _, port, = server.addr
+
+    Addrinfo.define_singleton_method(:getaddrinfo) do |_, _, family, *_|
+      if family == Socket::AF_INET6
+        sleep
+      else
+        [Addrinfo.tcp("127.0.0.1", port)]
+      end
+    end
+
+    server.close
+
+    assert_raise(Errno::ETIMEDOUT) do
+      Socket.tcp("localhost", port, resolv_timeout: 0.01)
+    end
+    RUBY
+  end
+
+  def test_tcp_socket_open_timeout
+    opts = %w[-rsocket -W1]
+    assert_separately opts, <<~RUBY
+    Addrinfo.define_singleton_method(:getaddrinfo) do |_, _, family, *_|
+      if family == Socket::AF_INET6
+        sleep
+      else
+        [Addrinfo.tcp("127.0.0.1", 12345)]
+      end
+    end
+
+    assert_raise(Errno::ETIMEDOUT) do
+      Socket.tcp("localhost", 12345, open_timeout: 0.01)
+    end
+    RUBY
+  end
+
+  def test_tcp_socket_open_timeout_with_other_timeouts
+    opts = %w[-rsocket -W1]
+    assert_separately opts, <<~RUBY
+    assert_raise(ArgumentError) do
+      Socket.tcp("localhost", 12345, open_timeout: 0.01, resolv_timout: 0.01)
+    end
+    RUBY
+  end
+
+  def test_tcp_socket_one_hostname_resolution_succeeded_at_least
+    opts = %w[-rsocket -W1]
+    assert_separately opts, <<~RUBY
+    begin
+      begin
+        # Verify that "localhost" can be resolved to an IPv6 address
+        Socket.getaddrinfo("localhost", 0, Socket::AF_INET6)
+        server = TCPServer.new("::1", 0)
+      rescue Socket::ResolutionError, Errno::EADDRNOTAVAIL # IPv6 is not supported
+        return
+      end
+
+      _, port, = server.addr
+      server_thread = Thread.new { server.accept }
+
+      Addrinfo.define_singleton_method(:getaddrinfo) do |_, _, family, *_|
+        case family
+        when Socket::AF_INET6 then [Addrinfo.tcp("::1", port)]
+        when Socket::AF_INET then sleep(0.001); raise SocketError
+        end
+      end
+
+      socket = nil
+
+      assert_nothing_raised do
+        socket = Socket.tcp("localhost", port)
+      end
+    ensure
+      server_thread&.value&.close
+      server&.close
+      socket&.close
+    end
+    RUBY
+  end
+
+  def test_tcp_socket_all_hostname_resolution_failed
+    opts = %w[-rsocket -W1]
+    assert_separately opts, <<~RUBY
+    begin
+      server = TCPServer.new("localhost", 0)
+      _, port, = server.addr
+
+      Addrinfo.define_singleton_method(:getaddrinfo) do |_, _, family, *_|
+        case family
+        when Socket::AF_INET6 then raise SocketError
+        when Socket::AF_INET then sleep(0.001); raise SocketError, "Last hostname resolution error"
+        end
+      end
+
+      assert_raise_with_message(SocketError, "Last hostname resolution error") do
+        Socket.tcp("localhost", port)
+      end
+    ensure
+      server&.close
+    end
+    RUBY
+  end
+
+  def test_tcp_socket_hostname_resolution_failed_after_connection_failure
+    opts = %w[-rsocket -W1]
+    assert_separately opts, <<~RUBY
+    server = TCPServer.new("127.0.0.1", 0)
+    port = server.connect_address.ip_port
+
+    Addrinfo.define_singleton_method(:getaddrinfo) do |_, _, family, *_|
+      case family
+      when Socket::AF_INET6 then sleep(0.1); raise Socket::ResolutionError
+      when Socket::AF_INET then [Addrinfo.tcp("127.0.0.1", port)]
+      end
+    end
+
+    server.close
+
+    # SystemCallError is a workaround for Windows environment
+    assert_raise(Errno::ECONNREFUSED, SystemCallError) do
+      Socket.tcp("localhost", port)
+    end
+    RUBY
+  end
+
+  def test_tcp_socket_v6_address_passed
+    opts = %w[-rsocket -W1]
+    assert_separately opts, <<~RUBY
+    begin
+      begin
+        # Verify that "localhost" can be resolved to an IPv6 address
+        Socket.getaddrinfo("localhost", 0, Socket::AF_INET6)
+        server = TCPServer.new("::1", 0)
+      rescue Socket::ResolutionError, Errno::EADDRNOTAVAIL # IPv6 is not supported
+        return
+      end
+
+      _, port, = server.addr
+      server_thread = Thread.new { server.accept }
+
+      Addrinfo.define_singleton_method(:getaddrinfo) do |*_|
+        [Addrinfo.tcp("::1", port)]
+      end
+
+      socket = Socket.tcp("::1", port)
+      assert_true(socket.remote_address.ipv6?)
+    ensure
+      server_thread&.value&.close
+      server&.close
+      socket&.close
+    end
+    RUBY
+  end
+
+  def test_tcp_socket_fast_fallback_is_false
+    server = TCPServer.new("127.0.0.1", 0)
+    _, port, = server.addr
+    server_thread = Thread.new { server.accept }
+    socket = Socket.tcp("127.0.0.1", port, fast_fallback: false)
+    assert_true(socket.remote_address.ipv4?)
+  ensure
+    server_thread&.value&.close
+    server&.close
+    socket&.close
+  end
+
+  def test_tcp_fast_fallback
+    opts = %w[-rsocket -W1]
+    assert_separately opts, <<~RUBY
+    assert_true(Socket.tcp_fast_fallback)
+
+    Socket.tcp_fast_fallback = false
+    assert_false(Socket.tcp_fast_fallback)
+
+    Socket.tcp_fast_fallback = true
+    assert_true(Socket.tcp_fast_fallback)
+    RUBY
+  end
 end if defined?(Socket)
diff --git a/test/socket/test_tcp.rb b/test/socket/test_tcp.rb
index 83ebea1b7aa6f3..be6d59b31e7b0b 100644
--- a/test/socket/test_tcp.rb
+++ b/test/socket/test_tcp.rb
@@ -18,6 +18,12 @@ def test_inspect
   end
 
   def test_initialize_failure
+    assert_raise(Socket::ResolutionError) do
+      t = TCPSocket.open(nil, nil)
+    ensure
+      t&.close
+    end
+
     # These addresses are chosen from TEST-NET-1, TEST-NET-2, and TEST-NET-3.
     # [RFC 5737]
     # They are chosen because probably they are not used as a host address.
@@ -43,16 +49,14 @@ def test_initialize_failure
     server_addr = '127.0.0.1'
     server_port = 80
 
-    begin
+    e = assert_raise_kind_of(SystemCallError) do
       # Since client_addr is not an IP address of this host,
       # bind() in TCPSocket.new should fail as EADDRNOTAVAIL.
       t = TCPSocket.new(server_addr, server_port, client_addr, client_port)
-      flunk "expected SystemCallError"
-    rescue SystemCallError => e
-      assert_match "for \"#{client_addr}\" port #{client_port}", e.message
+    ensure
+      t&.close
     end
-  ensure
-    t.close if t && !t.closed?
+    assert_include e.message, "for \"#{client_addr}\" port #{client_port}"
   end
 
   def test_initialize_resolv_timeout
@@ -70,7 +74,7 @@ def test_initialize_resolv_timeout
   end
 
   def test_initialize_connect_timeout
-    assert_raise(IO::TimeoutError) do
+    assert_raise(IO::TimeoutError, Errno::ENETUNREACH, Errno::EACCES) do
       TCPSocket.new("192.0.2.1", 80, connect_timeout: 0)
     end
   end
@@ -140,4 +144,256 @@ def test_accept_multithread
       server_threads.each(&:join)
     end
   end
+
+  def test_initialize_v6_hostname_resolved_earlier
+    return if RUBY_PLATFORM =~ /mswin|mingw|cygwin/
+
+    begin
+      # Verify that "localhost" can be resolved to an IPv6 address
+      Socket.getaddrinfo("localhost", 0, Socket::AF_INET6)
+      server = TCPServer.new("::1", 0)
+    rescue Socket::ResolutionError, Errno::EADDRNOTAVAIL # IPv6 is not supported
+      return
+    end
+
+    server_thread = Thread.new { server.accept }
+    port = server.addr[1]
+
+    socket = TCPSocket.new(
+      "localhost",
+      port,
+      fast_fallback: true,
+      test_mode_settings: { delay: { ipv4: 1000 } }
+    )
+    assert_true(socket.remote_address.ipv6?)
+  ensure
+    server_thread&.value&.close
+    server&.close
+    socket&.close
+  end
+
+  def test_initialize_v4_hostname_resolved_earlier
+    return if RUBY_PLATFORM =~ /mswin|mingw|cygwin/
+
+    server = TCPServer.new("127.0.0.1", 0)
+    port = server.addr[1]
+
+    server_thread = Thread.new { server.accept }
+    socket = TCPSocket.new(
+      "localhost",
+      port,
+      fast_fallback: true,
+      test_mode_settings: { delay: { ipv6: 1000 } }
+    )
+    assert_true(socket.remote_address.ipv4?)
+  ensure
+    server_thread&.value&.close
+    server&.close
+    socket&.close
+  end
+
+  def test_initialize_v6_hostname_resolved_in_resolution_delay
+    return if RUBY_PLATFORM =~ /mswin|mingw|cygwin/
+
+    begin
+      # Verify that "localhost" can be resolved to an IPv6 address
+      Socket.getaddrinfo("localhost", 0, Socket::AF_INET6)
+      server = TCPServer.new("::1", 0)
+    rescue Socket::ResolutionError, Errno::EADDRNOTAVAIL # IPv6 is not supported
+      return
+    end
+
+    port = server.addr[1]
+    delay_time = 25 # Socket::RESOLUTION_DELAY (private) is 50ms
+
+    server_thread = Thread.new { server.accept }
+    socket = TCPSocket.new(
+      "localhost",
+      port,
+      fast_fallback: true,
+      test_mode_settings: { delay: { ipv6: delay_time } }
+    )
+    assert_true(socket.remote_address.ipv6?)
+  ensure
+    server_thread&.value&.close
+    server&.close
+    socket&.close
+  end
+
+  def test_initialize_v6_hostname_resolved_earlier_and_v6_server_is_not_listening
+    return if RUBY_PLATFORM =~ /mswin|mingw|cygwin/
+
+    ipv4_address = "127.0.0.1"
+    server = Socket.new(Socket::AF_INET, :STREAM)
+    server.bind(Socket.pack_sockaddr_in(0, ipv4_address))
+    port = server.connect_address.ip_port
+
+    server_thread = Thread.new { server.listen(1); server.accept }
+    socket = TCPSocket.new(
+      "localhost",
+      port,
+      fast_fallback: true,
+      test_mode_settings: { delay: { ipv4: 10 } }
+    )
+    assert_equal(ipv4_address, socket.remote_address.ip_address)
+  ensure
+    accepted, _ = server_thread&.value
+    accepted&.close
+    server&.close
+    socket&.close
+  end
+
+  def test_initialize_v6_hostname_resolved_later_and_v6_server_is_not_listening
+    return if RUBY_PLATFORM =~ /mswin|mingw|cygwin/
+
+    server = Socket.new(Socket::AF_INET, :STREAM)
+    server.bind(Socket.pack_sockaddr_in(0, "127.0.0.1"))
+    port = server.connect_address.ip_port
+
+    server_thread = Thread.new { server.listen(1); server.accept }
+    socket = TCPSocket.new(
+      "localhost",
+      port,
+      fast_fallback: true,
+      test_mode_settings: { delay: { ipv6: 25 } }
+    )
+    assert_true(socket.remote_address.ipv4?)
+  ensure
+    accepted, _ = server_thread&.value
+    accepted&.close
+    server&.close
+    socket&.close
+  end
+
+  def test_initialize_v6_hostname_resolution_failed_and_v4_hostname_resolution_is_success
+    return if RUBY_PLATFORM =~ /mswin|mingw|cygwin/
+
+    server = TCPServer.new("127.0.0.1", 0)
+    port = server.addr[1]
+
+    server_thread = Thread.new { server.accept }
+    socket = TCPSocket.new(
+      "localhost",
+      port,
+      fast_fallback: true,
+      test_mode_settings: { delay: { ipv4: 10 }, error: { ipv6: Socket::EAI_FAIL } }
+    )
+    assert_true(socket.remote_address.ipv4?)
+  ensure
+    server_thread&.value&.close
+    server&.close
+    socket&.close
+  end
+
+  def test_initialize_resolv_timeout_with_connection_failure
+    return if RUBY_PLATFORM =~ /mswin|mingw|cygwin/
+
+    begin
+      server = TCPServer.new("::1", 0)
+    rescue Errno::EADDRNOTAVAIL # IPv6 is not supported
+      return
+    end
+
+    port = server.connect_address.ip_port
+    server.close
+
+    assert_raise(Errno::ETIMEDOUT) do
+      TCPSocket.new(
+        "localhost",
+        port,
+        resolv_timeout: 0.01,
+        fast_fallback: true,
+        test_mode_settings: { delay: { ipv4: 1000 } }
+      )
+    end
+  end
+
+  def test_initialize_with_hostname_resolution_failure_after_connection_failure
+    return if RUBY_PLATFORM =~ /mswin|mingw|cygwin/
+
+    begin
+      server = TCPServer.new("::1", 0)
+    rescue Errno::EADDRNOTAVAIL # IPv6 is not supported
+      return
+    end
+
+    port = server.connect_address.ip_port
+    server.close
+
+    assert_raise(Errno::ECONNREFUSED) do
+      TCPSocket.new(
+        "localhost",
+        port,
+        fast_fallback: true,
+        test_mode_settings: { delay: { ipv4: 100 }, error: { ipv4: Socket::EAI_FAIL } }
+      )
+    end
+  end
+
+  def test_initialize_with_connection_failure_after_hostname_resolution_failure
+    return if RUBY_PLATFORM =~ /mswin|mingw|cygwin/
+
+    server = TCPServer.new("127.0.0.1", 0)
+    port = server.connect_address.ip_port
+    server.close
+
+    assert_raise(Errno::ECONNREFUSED) do
+      TCPSocket.new(
+        "localhost",
+        port,
+        fast_fallback: true,
+        test_mode_settings: { delay: { ipv4: 100 }, error: { ipv6: Socket::EAI_FAIL } }
+      )
+    end
+  end
+
+  def test_initialize_v6_connected_socket_with_v6_address
+    return if RUBY_PLATFORM =~ /mswin|mingw|cygwin/
+
+    begin
+      server = TCPServer.new("::1", 0)
+    rescue Errno::EADDRNOTAVAIL # IPv6 is not supported
+      return
+    end
+
+    server_thread = Thread.new { server.accept }
+    port = server.addr[1]
+
+    socket = TCPSocket.new("::1", port)
+    assert_true(socket.remote_address.ipv6?)
+  ensure
+    server_thread&.value&.close
+    server&.close
+    socket&.close
+  end
+
+  def test_initialize_v4_connected_socket_with_v4_address
+    return if RUBY_PLATFORM =~ /mswin|mingw|cygwin/
+
+    server = TCPServer.new("127.0.0.1", 0)
+    server_thread = Thread.new { server.accept }
+    port = server.addr[1]
+
+    socket = TCPSocket.new("127.0.0.1", port)
+    assert_true(socket.remote_address.ipv4?)
+  ensure
+    server_thread&.value&.close
+    server&.close
+    socket&.close
+  end
+
+  def test_initialize_fast_fallback_is_false
+    return if RUBY_PLATFORM =~ /mswin|mingw|cygwin/
+
+    server = TCPServer.new("127.0.0.1", 0)
+    _, port, = server.addr
+    server_thread = Thread.new { server.accept }
+
+    socket = TCPSocket.new("127.0.0.1", port, fast_fallback: false)
+    assert_true(socket.remote_address.ipv4?)
+  ensure
+    server_thread&.value&.close
+    server&.close
+    socket&.close
+  end
 end if defined?(TCPSocket)
diff --git a/test/socket/test_unix.rb b/test/socket/test_unix.rb
index b2da1e439dd019..3e7d85befcc1ad 100644
--- a/test/socket/test_unix.rb
+++ b/test/socket/test_unix.rb
@@ -152,7 +152,7 @@ def test_fd_passing_race_condition
     lock = Thread::Mutex.new
     nr = 0
     x = 2
-    y = 1000
+    y = 400
     begin
       s1.send_io(nil)
     rescue NotImplementedError
diff --git a/test/stringio/test_ractor.rb b/test/stringio/test_ractor.rb
index 1c334e2c3f9ae8..6acf53fb0a0b91 100644
--- a/test/stringio/test_ractor.rb
+++ b/test/stringio/test_ractor.rb
@@ -8,16 +8,20 @@ def setup
 
   def test_ractor
     assert_in_out_err([], <<-"end;", ["true"], [])
+      class Ractor
+        alias value take unless method_defined? :value # compat with Ruby 3.4 and olders
+      end
+
       require "stringio"
       $VERBOSE = nil
       r = Ractor.new do
-        io = StringIO.new("")
+        io = StringIO.new(+"")
         io.puts "abc"
         io.truncate(0)
         io.puts "def"
         "\0\0\0\0def\n" == io.string
       end
-      puts r.take
+      puts r.value
     end;
   end
 end
diff --git a/test/stringio/test_stringio.rb b/test/stringio/test_stringio.rb
index d2d96c5719a43c..002b946b6f1b58 100644
--- a/test/stringio/test_stringio.rb
+++ b/test/stringio/test_stringio.rb
@@ -14,6 +14,24 @@ def open_file(content)
 
   include TestEOF::Seek
 
+  def test_do_not_mutate_shared_buffers
+    # Ensure we have two strings that are not embedded but have the same shared
+    # string reference.
+    #
+    # In this case, we must use eval because we need two strings literals that
+    # are long enough they cannot be embedded, but also contain the same bytes.
+
+    a = eval("+"+("x" * 1024).dump)
+    b = eval("+"+("x" * 1024).dump)
+
+    s = StringIO.new(b)
+    s.getc
+    s.ungetc '#'
+
+    # We mutated b, so a should not be mutated
+    assert_equal("x", a[0])
+  end
+
   def test_version
     assert_kind_of(String, StringIO::VERSION)
   end
@@ -22,10 +40,11 @@ def test_initialize
     assert_kind_of StringIO, StringIO.new
     assert_kind_of StringIO, StringIO.new('str')
     assert_kind_of StringIO, StringIO.new('str', 'r+')
+    assert_kind_of StringIO, StringIO.new(nil)
     assert_raise(ArgumentError) { StringIO.new('', 'x') }
     assert_raise(ArgumentError) { StringIO.new('', 'rx') }
     assert_raise(ArgumentError) { StringIO.new('', 'rbt') }
-    assert_raise(TypeError) { StringIO.new(nil) }
+    assert_raise(TypeError) { StringIO.new(Object) }
 
     o = Object.new
     def o.to_str
@@ -40,6 +59,17 @@ def o.to_str
     assert_kind_of StringIO, StringIO.new(o)
   end
 
+  def test_null
+    io = StringIO.new(nil)
+    assert_nil io.gets
+    io.puts "abc"
+    assert_nil io.string
+
+    # Null device StringIO just drop ungot string
+    io.ungetc '#'
+    assert_nil io.getc
+  end
+
   def test_truncate
     io = StringIO.new("")
     io.puts "abc"
@@ -88,6 +118,14 @@ def test_gets
     assert_string("", Encoding::UTF_8, StringIO.new("foo").gets(0))
   end
 
+  def test_gets_utf_16
+    stringio = StringIO.new("line1\nline2\nline3\n".encode("utf-16le"))
+    assert_equal("line1\n".encode("utf-16le"), stringio.gets)
+    assert_equal("line2\n".encode("utf-16le"), stringio.gets)
+    assert_equal("line3\n".encode("utf-16le"), stringio.gets)
+    assert_nil(stringio.gets)
+  end
+
   def test_gets_chomp
     assert_equal(nil, StringIO.new("").gets(chomp: true))
     assert_equal("", StringIO.new("\n").gets(chomp: true))
@@ -229,7 +267,7 @@ def test_write_encoding_conversion
 
   def test_write_integer_overflow
     f = StringIO.new
-    f.pos = RbConfig::LIMITS["LONG_MAX"]
+    f.pos = StringIO::MAX_LENGTH
     assert_raise(ArgumentError) {
       f.write("pos + len overflows")
     }
@@ -449,6 +487,11 @@ def test_seek
     f.close unless f.closed?
   end
 
+  def test_seek_frozen_string
+    f = StringIO.new(-"1234")
+    assert_equal(0, f.seek(1))
+  end
+
   def test_each_byte
     f = StringIO.new("1234")
     a = []
@@ -684,6 +727,18 @@ def test_read
     s.force_encoding(Encoding::US_ASCII)
     assert_same(s, f.read(nil, s))
     assert_string("", Encoding::UTF_8, s, bug13806)
+
+    bug20418 = '[Bug #20418] ™€®'.b
+    f = StringIO.new(bug20418)
+    s = ""
+    assert_equal(Encoding::UTF_8, s.encoding, bug20418)
+    f.read(4, s)
+    assert_equal(Encoding::UTF_8, s.encoding, bug20418)
+
+    f.rewind
+    s = ""
+    f.read(nil, s)
+    assert_equal(Encoding::ASCII_8BIT, s.encoding, bug20418)
   end
 
   def test_readpartial
@@ -695,8 +750,8 @@ def test_readpartial
     assert_equal("\u3042\u3044".force_encoding(Encoding::ASCII_8BIT), f.readpartial(f.size))
     f.rewind
     # not empty buffer
-    s = '0123456789'
-    assert_equal("\u3042\u3044".force_encoding(Encoding::ASCII_8BIT), f.readpartial(f.size, s))
+    s = '0123456789'.b
+    assert_equal("\u3042\u3044".b, f.readpartial(f.size, s))
   end
 
   def test_read_nonblock
@@ -720,8 +775,8 @@ def test_read_nonblock_no_exceptions
     assert_equal("\u3042\u3044".force_encoding(Encoding::ASCII_8BIT), f.read_nonblock(f.size))
     f.rewind
     # not empty buffer
-    s = '0123456789'
-    assert_equal("\u3042\u3044".force_encoding(Encoding::ASCII_8BIT), f.read_nonblock(f.size, s))
+    s = '0123456789'.b
+    assert_equal("\u3042\u3044".b, f.read_nonblock(f.size, s))
   end
 
   def test_sysread
@@ -750,6 +805,13 @@ def test_pread
     assert_raise(EOFError) { f.pread(1, 5) }
     assert_raise(ArgumentError) { f.pread(-1, 0) }
     assert_raise(Errno::EINVAL) { f.pread(3, -1) }
+
+    assert_equal "".b, StringIO.new("").pread(0, 0)
+    assert_equal "".b, StringIO.new("").pread(0, -10)
+
+    buf = "stale".b
+    assert_equal "stale".b, StringIO.new("").pread(0, 0, buf)
+    assert_equal "stale".b, buf
   end
 
   def test_size
@@ -807,6 +869,17 @@ def test_ungetc_fill
     assert_match(/\Ab+\z/, s.string)
   end
 
+  def test_ungetc_same_string
+    s = StringIO.new("abc" * 30)
+    s.ungetc(s.string)
+    assert_match(/\A(?:abc){60}\z/, s.string)
+
+    s = StringIO.new("abc" * 30)
+    s.pos = 70 # ("abc".size * 30 - 70).divmod(3) == [6, 2]
+    s.ungetc(s.string)
+    assert_match(/\A(?:abc){30}bc(?:abc){6}\z/, s.string)
+  end
+
   def test_ungetbyte_pos
     b = '\\b00010001 \\B00010001 \\b1 \\B1 \\b000100011'
     s = StringIO.new( b )
@@ -841,6 +914,17 @@ def test_ungetbyte_fill
     assert_match(/\Ab+\z/, s.string)
   end
 
+  def test_ungetbyte_same_string
+    s = StringIO.new("abc" * 30)
+    s.ungetc(s.string)
+    assert_match(/\A(?:abc){60}\z/, s.string)
+
+    s = StringIO.new("abc" * 30)
+    s.pos = 70 # ("abc".size * 30 - 70).divmod(3) == [6, 2]
+    s.ungetbyte(s.string)
+    assert_match(/\A(?:abc){30}bc(?:abc){6}\z/, s.string)
+  end
+
   def test_frozen
     s = StringIO.new
     s.freeze
@@ -884,8 +968,9 @@ def test_new_block_warning
   end
 
   def test_overflow
-    return if RbConfig::SIZEOF["void*"] > RbConfig::SIZEOF["long"]
-    limit = RbConfig::LIMITS["INTPTR_MAX"] - 0x10
+    intptr_max = RbConfig::LIMITS["INTPTR_MAX"]
+    return if intptr_max > StringIO::MAX_LENGTH
+    limit = intptr_max - 0x10
     assert_separately(%w[-rstringio], "#{<<-"begin;"}\n#{<<-"end;"}")
     begin;
       limit = #{limit}
@@ -938,6 +1023,51 @@ def test_binary_encoding_read_and_default_internal
     $VERBOSE = verbose
   end
 
+  def test_coderange_after_overwrite
+    s = StringIO.new("".b)
+
+    s.write("a=b&c=d")
+    s.rewind
+    assert_predicate(s.string, :ascii_only?)
+    s.write "\u{431 43e 433 443 441}"
+    assert_not_predicate(s.string, :ascii_only?)
+
+    s = StringIO.new("\u{3042}")
+    s.rewind
+    assert_not_predicate(s.string, :ascii_only?)
+    s.write('aaaa')
+    assert_predicate(s.string, :ascii_only?)
+  end
+
+  require "objspace"
+  if ObjectSpace.respond_to?(:dump) && ObjectSpace.dump(eval(%{"test"})).include?('"chilled":true') # Ruby 3.4+ chilled strings
+    def test_chilled_string
+      chilled_string = eval(%{""})
+      io = StringIO.new(chilled_string)
+      assert_warning(/literal string will be frozen/) { io << "test" }
+      assert_equal("test", io.string)
+      assert_same(chilled_string, io.string)
+    end
+
+    def test_chilled_string_string_set
+      io = StringIO.new
+      chilled_string = eval(%{""})
+      io.string = chilled_string
+      assert_warning(/literal string will be frozen/) { io << "test" }
+      assert_equal("test", io.string)
+      assert_same(chilled_string, io.string)
+    end
+
+    def test_chilled_string_set_enocoding
+      chilled_string = eval(%{""})
+      io = StringIO.new(chilled_string)
+      assert_warning("") { io.set_encoding(Encoding::BINARY) }
+      assert_same(chilled_string, io.string)
+    end
+  end
+
+  private
+
   def assert_string(content, encoding, str, mesg = nil)
     assert_equal([content, encoding], [str, str.encoding], mesg)
   end
diff --git a/test/strscan/test_ractor.rb b/test/strscan/test_ractor.rb
index a5de7e56ed3348..a13fd8fd133b7c 100644
--- a/test/strscan/test_ractor.rb
+++ b/test/strscan/test_ractor.rb
@@ -3,11 +3,15 @@
 
 class TestStringScannerRactor < Test::Unit::TestCase
   def setup
-    omit "Ractor not defined" unless defined? Ractor
+    omit("Ractor not defined") unless defined? Ractor
   end
 
   def test_ractor
     assert_in_out_err([], <<-"end;", ["stra", " ", "strb", " ", "strc"], [])
+      class Ractor
+        alias value take unless method_defined? :value # compat with Ruby 3.4 and olders
+      end
+
       require "strscan"
       $VERBOSE = nil
       r = Ractor.new do
@@ -22,7 +26,7 @@ def test_ractor
           s.scan(/\\w+/)
         ]
       end
-      puts r.take.compact
+      puts r.value.compact
     end;
   end
 end
diff --git a/test/strscan/test_stringscanner.rb b/test/strscan/test_stringscanner.rb
index 2fce4c3e748cf9..085a9113132b75 100644
--- a/test/strscan/test_stringscanner.rb
+++ b/test/strscan/test_stringscanner.rb
@@ -8,29 +8,54 @@
 require 'test/unit'
 
 module StringScannerTests
+  def test_peek_byte
+    s = create_string_scanner('ab')
+    assert_equal(97, s.peek_byte)
+    assert_equal(97, s.scan_byte)
+    assert_equal(98, s.peek_byte)
+    assert_equal(98, s.scan_byte)
+    assert_nil(s.peek_byte)
+    assert_nil(s.scan_byte)
+  end
+
+  def test_scan_byte
+    s = create_string_scanner('ab')
+    assert_equal(2, s.match?(/(?<a>ab)/)) # set named_captures
+    assert_equal(97, s.scan_byte)
+    assert_equal({}, s.named_captures)
+    assert_equal(98, s.scan_byte)
+    assert_nil(s.scan_byte)
+
+    str = "\244\242".dup.force_encoding("euc-jp")
+    s = StringScanner.new(str)
+    assert_equal(str.getbyte(s.pos), s.scan_byte)
+    assert_equal(str.getbyte(s.pos), s.scan_byte)
+    assert_nil(s.scan_byte)
+  end
+
   def test_s_new
     s = create_string_scanner('test string')
-    assert_instance_of StringScanner, s
-    assert_equal false, s.eos?
+    assert_instance_of(StringScanner, s)
+    assert_equal(false, s.eos?)
 
     str = 'test string'.dup
     s = create_string_scanner(str, false)
-    assert_instance_of StringScanner, s
-    assert_equal false, s.eos?
-    assert_same str, s.string
+    assert_instance_of(StringScanner, s)
+    assert_equal(false, s.eos?)
+    assert_same(str, s.string)
   end
 
   UNINIT_ERROR = ArgumentError
 
   def test_s_allocate
     s = StringScanner.allocate
-    assert_equal '#<StringScanner (uninitialized)>', s.inspect.sub(/StringScanner_C/, 'StringScanner')
+    assert_equal('#<StringScanner (uninitialized)>', s.inspect.sub(/StringScanner_C/, 'StringScanner'))
     assert_raise(UNINIT_ERROR) { s.eos? }
     assert_raise(UNINIT_ERROR) { s.scan(/a/) }
     s.string = 'test'
-    assert_equal '#<StringScanner 0/4 @ "test">', s.inspect.sub(/StringScanner_C/, 'StringScanner')
+    assert_equal('#<StringScanner 0/4 @ "test">', s.inspect.sub(/StringScanner_C/, 'StringScanner'))
     assert_nothing_raised(UNINIT_ERROR) { s.eos? }
-    assert_equal false, s.eos?
+    assert_equal(false, s.eos?)
   end
 
   def test_s_mustc
@@ -42,170 +67,171 @@ def test_s_mustc
   def test_dup
     s = create_string_scanner('test string')
     d = s.dup
-    assert_equal s.inspect, d.inspect
-    assert_equal s.string, d.string
-    assert_equal s.pos, d.pos
-    assert_equal s.matched?, d.matched?
-    assert_equal s.eos?, d.eos?
+    assert_equal(s.inspect, d.inspect)
+    assert_equal(s.string, d.string)
+    assert_equal(s.pos, d.pos)
+    assert_equal(s.matched?, d.matched?)
+    assert_equal(s.eos?, d.eos?)
 
     s = create_string_scanner('test string')
     s.scan(/test/)
     d = s.dup
-    assert_equal s.inspect, d.inspect
-    assert_equal s.string, d.string
-    assert_equal s.pos, d.pos
-    assert_equal s.matched?, d.matched?
-    assert_equal s.eos?, d.eos?
+    assert_equal(s.inspect, d.inspect)
+    assert_equal(s.string, d.string)
+    assert_equal(s.pos, d.pos)
+    assert_equal(s.matched?, d.matched?)
+    assert_equal(s.eos?, d.eos?)
 
     s = create_string_scanner('test string')
     s.scan(/test/)
     s.scan(/NOT MATCH/)
     d = s.dup
-    assert_equal s.inspect, d.inspect
-    assert_equal s.string, d.string
-    assert_equal s.pos, d.pos
-    assert_equal s.matched?, d.matched?
-    assert_equal s.eos?, d.eos?
+    assert_equal(s.inspect, d.inspect)
+    assert_equal(s.string, d.string)
+    assert_equal(s.pos, d.pos)
+    assert_equal(s.matched?, d.matched?)
+    assert_equal(s.eos?, d.eos?)
 
     s = create_string_scanner('test string')
     s.terminate
     d = s.dup
-    assert_equal s.inspect, d.inspect
-    assert_equal s.string, d.string
-    assert_equal s.pos, d.pos
-    assert_equal s.matched?, d.matched?
-    assert_equal s.eos?, d.eos?
+    assert_equal(s.inspect, d.inspect)
+    assert_equal(s.string, d.string)
+    assert_equal(s.pos, d.pos)
+    assert_equal(s.matched?, d.matched?)
+    assert_equal(s.eos?, d.eos?)
   end
 
   def test_const_Version
-    assert_instance_of String, StringScanner::Version
-    assert_equal true, StringScanner::Version.frozen?
+    assert_instance_of(String, StringScanner::Version)
+    assert_equal(true, StringScanner::Version.frozen?)
   end
 
   def test_const_Id
-    assert_instance_of String, StringScanner::Id
-    assert_equal true, StringScanner::Id.frozen?
+    assert_instance_of(String, StringScanner::Id)
+    assert_equal(true, StringScanner::Id.frozen?)
   end
 
   def test_inspect
     str = 'test string'.dup
     s = create_string_scanner(str, false)
-    assert_instance_of String, s.inspect
-    assert_equal s.inspect, s.inspect
-    assert_equal '#<StringScanner 0/11 @ "test ...">', s.inspect.sub(/StringScanner_C/, 'StringScanner')
+    assert_instance_of(String, s.inspect)
+    assert_equal(s.inspect, s.inspect)
+    assert_equal('#<StringScanner 0/11 @ "test ...">', s.inspect.sub(/StringScanner_C/, 'StringScanner'))
     s.get_byte
-    assert_equal '#<StringScanner 1/11 "t" @ "est s...">', s.inspect.sub(/StringScanner_C/, 'StringScanner')
+    assert_equal('#<StringScanner 1/11 "t" @ "est s...">', s.inspect.sub(/StringScanner_C/, 'StringScanner'))
 
     s = create_string_scanner("\n")
-    assert_equal '#<StringScanner 0/1 @ "\n">', s.inspect
+    assert_equal('#<StringScanner 0/1 @ "\n">', s.inspect)
   end
 
   def test_eos?
     s = create_string_scanner('test string')
-    assert_equal false, s.eos?
-    assert_equal false, s.eos?
+    assert_equal(false, s.eos?)
+    assert_equal(false, s.eos?)
     s.scan(/\w+/)
-    assert_equal false, s.eos?
-    assert_equal false, s.eos?
+    assert_equal(false, s.eos?)
+    assert_equal(false, s.eos?)
     s.scan(/\s+/)
     s.scan(/\w+/)
-    assert_equal true, s.eos?
-    assert_equal true, s.eos?
+    assert_equal(true, s.eos?)
+    assert_equal(true, s.eos?)
     s.scan(/\w+/)
-    assert_equal true, s.eos?
+    assert_equal(true, s.eos?)
 
     s = create_string_scanner('test'.dup)
     s.scan(/te/)
-    s.string.replace ''
-    assert_equal true, s.eos?
+    s.string.replace('')
+    assert_equal(true, s.eos?)
   end
 
   def test_bol?
     s = create_string_scanner("a\nbbb\n\ncccc\nddd\r\neee")
-    assert_equal true, s.bol?
-    assert_equal true, s.bol?
+    assert_equal(true, s.bol?)
+    assert_equal(true, s.bol?)
     s.scan(/a/)
-    assert_equal false, s.bol?
-    assert_equal false, s.bol?
+    assert_equal(false, s.bol?)
+    assert_equal(false, s.bol?)
     s.scan(/\n/)
-    assert_equal true, s.bol?
+    assert_equal(true, s.bol?)
     s.scan(/b/)
-    assert_equal false, s.bol?
+    assert_equal(false, s.bol?)
     s.scan(/b/)
-    assert_equal false, s.bol?
+    assert_equal(false, s.bol?)
     s.scan(/b/)
-    assert_equal false, s.bol?
+    assert_equal(false, s.bol?)
     s.scan(/\n/)
-    assert_equal true, s.bol?
+    assert_equal(true, s.bol?)
     s.unscan
-    assert_equal false, s.bol?
+    assert_equal(false, s.bol?)
     s.scan(/\n/)
     s.scan(/\n/)
-    assert_equal true, s.bol?
+    assert_equal(true, s.bol?)
     s.scan(/c+\n/)
-    assert_equal true, s.bol?
+    assert_equal(true, s.bol?)
     s.scan(/d+\r\n/)
-    assert_equal true, s.bol?
+    assert_equal(true, s.bol?)
     s.scan(/e+/)
-    assert_equal false, s.bol?
+    assert_equal(false, s.bol?)
   end
 
   def test_string
     s = create_string_scanner('test string')
-    assert_equal 'test string', s.string
-    s.scan(/test/)
-    assert_equal 'test string', s.string
+    assert_equal('test string', s.string)
+    s.scan(/(?<t>test)/) # set named_captures
+    assert_equal('test string', s.string)
     s.string = 'a'
-    assert_equal 'a', s.string
+    assert_equal({}, s.named_captures)
+    assert_equal('a', s.string)
     s.scan(/a/)
     s.string = 'b'
-    assert_equal 0, s.pos
+    assert_equal(0, s.pos)
   end
 
   def test_string_set_is_equal
     name = 'tenderlove'
 
     s = create_string_scanner(name)
-    assert_equal name.object_id, s.string.object_id
+    assert_equal(name.object_id, s.string.object_id)
 
     s.string = name
-    assert_equal name.object_id, s.string.object_id
+    assert_equal(name.object_id, s.string.object_id)
   end
 
   def test_string_append
     s = create_string_scanner('tender'.dup)
     s << 'love'
-    assert_equal 'tenderlove', s.string
+    assert_equal('tenderlove', s.string)
 
     s.string = 'tender'.dup
     s << 'love'
-    assert_equal 'tenderlove', s.string
+    assert_equal('tenderlove', s.string)
   end
 
   def test_pos
     s = create_string_scanner('test string')
-    assert_equal 0, s.pos
+    assert_equal(0, s.pos)
     s.get_byte
-    assert_equal 1, s.pos
+    assert_equal(1, s.pos)
     s.get_byte
-    assert_equal 2, s.pos
+    assert_equal(2, s.pos)
     s.terminate
-    assert_equal 11, s.pos
+    assert_equal(11, s.pos)
   end
 
   def test_pos_unicode
     s = create_string_scanner("abcädeföghi")
-    assert_equal 0, s.charpos
-    assert_equal "abcä", s.scan_until(/ä/)
-    assert_equal 4, s.charpos
-    assert_equal "defö", s.scan_until(/ö/)
-    assert_equal 8, s.charpos
+    assert_equal(0, s.charpos)
+    assert_equal("abcä", s.scan_until(/ä/))
+    assert_equal(4, s.charpos)
+    assert_equal("defö", s.scan_until(/ö/))
+    assert_equal(8, s.charpos)
     s.terminate
-    assert_equal 11, s.charpos
+    assert_equal(11, s.charpos)
   end
 
   def test_charpos_not_use_string_methods
-    omit "not supported on TruffleRuby" if RUBY_ENGINE == "truffleruby"
+    omit("not supported on TruffleRuby") if RUBY_ENGINE == "truffleruby"
 
     string = +'abcädeföghi'
     scanner = create_string_scanner(string)
@@ -216,254 +242,300 @@ class << string
       end
     end
 
-    assert_equal 0, scanner.charpos
-    assert_equal "abcä", scanner.scan_until(/ä/)
-    assert_equal 4, scanner.charpos
-    assert_equal "defö", scanner.scan_until(/ö/)
-    assert_equal 8, scanner.charpos
+    assert_equal(0, scanner.charpos)
+    assert_equal("abcä", scanner.scan_until(/ä/))
+    assert_equal(4, scanner.charpos)
+    assert_equal("defö", scanner.scan_until(/ö/))
+    assert_equal(8, scanner.charpos)
   end
 
   def test_concat
     s = create_string_scanner('a'.dup)
     s.scan(/a/)
-    s.concat 'b'
-    assert_equal false, s.eos?
-    assert_equal 'b', s.scan(/b/)
-    assert_equal true, s.eos?
-    s.concat 'c'
-    assert_equal false, s.eos?
-    assert_equal 'c', s.scan(/c/)
-    assert_equal true, s.eos?
+    s.concat('b')
+    assert_equal(false, s.eos?)
+    assert_equal('b', s.scan(/b/))
+    assert_equal(true, s.eos?)
+    s.concat('c')
+    assert_equal(false, s.eos?)
+    assert_equal('c', s.scan(/c/))
+    assert_equal(true, s.eos?)
   end
 
   def test_scan
-    s = create_string_scanner('stra strb strc', true)
+    s = create_string_scanner("stra strb\0strc", true)
     tmp = s.scan(/\w+/)
-    assert_equal 'stra', tmp
+    assert_equal('stra', tmp)
 
     tmp = s.scan(/\s+/)
-    assert_equal ' ', tmp
+    assert_equal(' ', tmp)
 
-    assert_equal 'strb', s.scan(/\w+/)
-    assert_equal ' ',    s.scan(/\s+/)
+    assert_equal('strb', s.scan(/\w+/))
+    assert_equal("\u0000", s.scan(/\0/))
 
     tmp = s.scan(/\w+/)
-    assert_equal 'strc', tmp
+    assert_equal('strc', tmp)
 
-    assert_nil           s.scan(/\w+/)
-    assert_nil           s.scan(/\w+/)
+    assert_nil(s.scan(/\w+/))
+    assert_nil(s.scan(/\w+/))
 
 
     str = 'stra strb strc'.dup
     s = create_string_scanner(str, false)
     tmp = s.scan(/\w+/)
-    assert_equal 'stra', tmp
+    assert_equal('stra', tmp)
 
     tmp = s.scan(/\s+/)
-    assert_equal ' ', tmp
+    assert_equal(' ', tmp)
 
-    assert_equal 'strb', s.scan(/\w+/)
-    assert_equal ' ',    s.scan(/\s+/)
+    assert_equal('strb', s.scan(/\w+/))
+    assert_equal(' ',    s.scan(/\s+/))
 
     tmp = s.scan(/\w+/)
-    assert_equal 'strc', tmp
+    assert_equal('strc', tmp)
 
-    assert_nil           s.scan(/\w+/)
-    assert_nil           s.scan(/\w+/)
+    assert_nil(s.scan(/\w+/))
+    assert_nil(s.scan(/\w+/))
 
     s = create_string_scanner('test'.dup)
     s.scan(/te/)
     # This assumes #string does not duplicate string,
     # but it is implementation specific issue.
     # DO NOT RELY ON THIS FEATURE.
-    s.string.replace ''
-    # unspecified: assert_equal 2, s.pos
-    assert_equal nil, s.scan(/test/)
+    s.string.replace('')
+    # unspecified: assert_equal(2, s.pos
+    assert_equal(nil, s.scan(/test/))
 
     # [ruby-bugs:4361]
     s = create_string_scanner("")
-    assert_equal "", s.scan(//)
-    assert_equal "", s.scan(//)
+    assert_equal("", s.scan(//))
+    assert_equal("", s.scan(//))
   end
 
   def test_scan_string
-    s = create_string_scanner('stra strb strc')
-    assert_equal 'str', s.scan('str')
-    assert_equal 'str', s[0]
-    assert_equal 3, s.pos
-    assert_equal 'a ', s.scan('a ')
+    s = create_string_scanner("stra strb\0strc")
+    assert_equal('str', s.scan('str'))
+    assert_equal('str', s[0])
+    assert_equal(3, s.pos)
+    assert_equal('a ', s.scan('a '))
+    assert_equal('strb', s.scan('strb'))
+    assert_equal("\u0000", s.scan("\0"))
+    assert_equal('strc', s.scan('strc'))
 
     str = 'stra strb strc'.dup
     s = create_string_scanner(str, false)
     matched = s.scan('str')
-    assert_equal 'str', matched
+    assert_equal('str', matched)
+
+    s = create_string_scanner("str")
+    assert_equal(nil, s.scan("str\0\0"))
   end
 
   def test_skip
     s = create_string_scanner('stra strb strc', true)
-    assert_equal 4, s.skip(/\w+/)
-    assert_equal 1, s.skip(/\s+/)
-    assert_equal 4, s.skip(/\w+/)
-    assert_equal 1, s.skip(/\s+/)
-    assert_equal 4, s.skip(/\w+/)
-    assert_nil      s.skip(/\w+/)
-    assert_nil      s.skip(/\s+/)
-    assert_equal true, s.eos?
+    assert_equal(4, s.skip(/\w+/))
+    assert_equal(1, s.skip(/\s+/))
+    assert_equal(4, s.skip(/\w+/))
+    assert_equal(1, s.skip(/\s+/))
+    assert_equal(4, s.skip(/\w+/))
+    assert_nil(     s.skip(/\w+/))
+    assert_nil(     s.skip(/\s+/))
+    assert_equal(true, s.eos?)
 
     s = create_string_scanner('test'.dup)
     s.scan(/te/)
-    s.string.replace ''
-    assert_equal nil, s.skip(/./)
+    s.string.replace('')
+    assert_equal(nil, s.skip(/./))
 
     # [ruby-bugs:4361]
     s = create_string_scanner("")
-    assert_equal 0, s.skip(//)
-    assert_equal 0, s.skip(//)
+    assert_equal(0, s.skip(//))
+    assert_equal(0, s.skip(//))
   end
 
   def test_skip_with_begenning_of_string_anchor_match
     s = create_string_scanner("a\nb")
-    assert_equal 2, s.skip(/a\n/)
-    assert_equal 1, s.skip(/\Ab/)
+    assert_equal(2, s.skip(/a\n/))
+    assert_equal(1, s.skip(/\Ab/))
   end
 
   def test_skip_with_begenning_of_line_anchor_match
     s = create_string_scanner("a\nbc")
-    assert_equal 2, s.skip(/a\n/)
-    assert_equal 1, s.skip(/^b/)
-    assert_equal 1, s.skip(/^c/)
+    assert_equal(2, s.skip(/a\n/))
+    assert_equal(1, s.skip(/^b/))
+    assert_equal(1, s.skip(/^c/))
   end
 
   def test_getch
     s = create_string_scanner('abcde')
-    assert_equal 'a', s.getch
-    assert_equal 'b', s.getch
-    assert_equal 'c', s.getch
-    assert_equal 'd', s.getch
-    assert_equal 'e', s.getch
-    assert_nil        s.getch
+    assert_equal(3, s.match?(/(?<a>abc)/)) # set named_captures
+    assert_equal('a', s.getch)
+    assert_equal({}, s.named_captures)
+    assert_equal('b', s.getch)
+    assert_equal('c', s.getch)
+    assert_equal('d', s.getch)
+    assert_equal('e', s.getch)
+    assert_nil(       s.getch)
 
     s = create_string_scanner("\244\242".dup.force_encoding("euc-jp"))
-    assert_equal "\244\242".dup.force_encoding("euc-jp"), s.getch
-    assert_nil s.getch
+    assert_equal("\244\242".dup.force_encoding("euc-jp"), s.getch)
+    assert_nil(s.getch)
 
     s = create_string_scanner('test'.dup)
     s.scan(/te/)
-    s.string.replace ''
-    assert_equal nil, s.getch
+    s.string.replace('')
+    assert_equal(nil, s.getch)
   end
 
   def test_get_byte
     s = create_string_scanner('abcde')
-    assert_equal 'a', s.get_byte
-    assert_equal 'b', s.get_byte
-    assert_equal 'c', s.get_byte
-    assert_equal 'd', s.get_byte
-    assert_equal 'e', s.get_byte
-    assert_nil        s.get_byte
-    assert_nil        s.get_byte
+    assert_equal(3, s.match?(/(?<a>abc)/)) # set named_captures
+    assert_equal('a', s.get_byte)
+    assert_equal({}, s.named_captures)
+    assert_equal('b', s.get_byte)
+    assert_equal('c', s.get_byte)
+    assert_equal('d', s.get_byte)
+    assert_equal('e', s.get_byte)
+    assert_nil(       s.get_byte)
+    assert_nil(       s.get_byte)
 
     s = create_string_scanner("\244\242".dup.force_encoding("euc-jp"))
-    assert_equal "\244".dup.force_encoding("euc-jp"), s.get_byte
-    assert_equal "\242".dup.force_encoding("euc-jp"), s.get_byte
-    assert_nil s.get_byte
+    assert_equal("\244".dup.force_encoding("euc-jp"), s.get_byte)
+    assert_equal("\242".dup.force_encoding("euc-jp"), s.get_byte)
+    assert_nil(s.get_byte)
 
     s = create_string_scanner('test'.dup)
     s.scan(/te/)
-    s.string.replace ''
-    assert_equal nil, s.get_byte
+    s.string.replace('')
+    assert_equal(nil, s.get_byte)
   end
 
   def test_matched
     s = create_string_scanner('stra strb strc')
     s.scan(/\w+/)
-    assert_equal 'stra', s.matched
-    s.scan(/\s+/)
-    assert_equal ' ', s.matched
-    s.scan('st')
-    assert_equal 'st', s.matched
-    s.scan(/\w+/)
-    assert_equal 'rb', s.matched
+    assert_equal('stra', s.matched)
+    s.scan_until(/\w+/)
+    assert_equal('strb', s.matched)
     s.scan(/\s+/)
-    assert_equal ' ', s.matched
+    assert_equal(' ', s.matched)
     s.scan(/\w+/)
-    assert_equal 'strc', s.matched
+    assert_equal('strc', s.matched)
     s.scan(/\w+/)
-    assert_nil s.matched
+    assert_nil(s.matched)
     s.getch
-    assert_nil s.matched
+    assert_nil(s.matched)
 
     s = create_string_scanner('stra strb strc')
     s.getch
-    assert_equal 's', s.matched
+    assert_equal('s', s.matched)
     s.get_byte
-    assert_equal 't', s.matched
-    assert_equal 't', s.matched
+    assert_equal('t', s.matched)
+    assert_equal('t', s.matched)
+  end
+
+  def test_matched_string
+    s = create_string_scanner('stra strb strc')
+    s.scan('stra')
+    assert_equal('stra', s.matched)
+    s.scan_until('strb')
+    assert_equal('strb', s.matched)
+    s.scan(' ')
+    assert_equal(' ', s.matched)
+    s.scan('strc')
+    assert_equal('strc', s.matched)
+    s.scan('c')
+    assert_nil(s.matched)
+    s.getch
+    assert_nil(s.matched)
   end
 
   def test_AREF
     s = create_string_scanner('stra strb strc')
 
-    s.scan(/\w+/)
-    assert_nil           s[-2]
-    assert_equal 'stra', s[-1]
-    assert_equal 'stra', s[0]
-    assert_nil           s[1]
+    s.scan(/\s+/)
+    assert_nil(          s[-2])
+    assert_nil(          s[-1])
+    assert_nil(          s[0])
+    assert_nil(          s[1])
+    assert_nil(          s[:c])
+    assert_nil(          s['c'])
+
+    s.scan("not match")
+    assert_nil(          s[-2])
+    assert_nil(          s[-1])
+    assert_nil(          s[0])
+    assert_nil(          s[1])
+    assert_nil(          s[:c])
+    assert_nil(          s['c'])
+
+    s.check(/\w+/)
+    assert_nil(          s[-2])
+    assert_equal('stra', s[-1])
+    assert_equal('stra', s[0])
+    assert_nil(          s[1])
+    assert_raise(IndexError) { s[:c] }
+    assert_raise(IndexError) { s['c'] }
+
+    s.scan("stra")
+    assert_nil(          s[-2])
+    assert_equal('stra', s[-1])
+    assert_equal('stra', s[0])
+    assert_nil(          s[1])
     assert_raise(IndexError) { s[:c] }
     assert_raise(IndexError) { s['c'] }
 
     s.skip(/\s+/)
-    assert_nil           s[-2]
-    assert_equal ' ',    s[-1]
-    assert_equal ' ',    s[0]
-    assert_nil           s[1]
+    assert_nil(          s[-2])
+    assert_equal(' ',    s[-1])
+    assert_equal(' ',    s[0])
+    assert_nil(          s[1])
 
     s.scan(/(s)t(r)b/)
-    assert_nil           s[-100]
-    assert_nil           s[-4]
-    assert_equal 'strb', s[-3]
-    assert_equal 's',    s[-2]
-    assert_equal 'r',    s[-1]
-    assert_equal 'strb', s[0]
-    assert_equal 's',    s[1]
-    assert_equal 'r',    s[2]
-    assert_nil           s[3]
-    assert_nil           s[100]
+    assert_nil(          s[-100])
+    assert_nil(          s[-4])
+    assert_equal('strb', s[-3])
+    assert_equal('s',    s[-2])
+    assert_equal('r',    s[-1])
+    assert_equal('strb', s[0])
+    assert_equal('s',    s[1])
+    assert_equal('r',    s[2])
+    assert_nil(          s[3])
+    assert_nil(          s[100])
 
     s.scan(/\s+/)
 
     s.getch
-    assert_nil           s[-2]
-    assert_equal 's',    s[-1]
-    assert_equal 's',    s[0]
-    assert_nil           s[1]
+    assert_nil(          s[-2])
+    assert_equal('s',    s[-1])
+    assert_equal('s',    s[0])
+    assert_nil(          s[1])
 
     s.get_byte
-    assert_nil           s[-2]
-    assert_equal 't',    s[-1]
-    assert_equal 't',    s[0]
-    assert_nil           s[1]
+    assert_nil(          s[-2])
+    assert_equal('t',    s[-1])
+    assert_equal('t',    s[0])
+    assert_nil(          s[1])
 
     s.scan(/.*/)
     s.scan(/./)
-    assert_nil           s[0]
-    assert_nil           s[0]
+    assert_nil(          s[0])
+    assert_nil(          s[0])
 
 
     s = create_string_scanner("\244\242".dup.force_encoding("euc-jp"))
     s.getch
-    assert_equal "\244\242".dup.force_encoding("euc-jp"), s[0]
+    assert_equal("\244\242".dup.force_encoding("euc-jp"), s[0])
 
     s = create_string_scanner("foo bar baz")
     s.scan(/(?<a>\w+) (?<b>\w+) (\w+)/)
-    assert_equal 'foo', s[1]
-    assert_equal 'bar', s[2]
-    assert_nil s[3]
-    assert_equal 'foo', s[:a]
-    assert_equal 'bar', s[:b]
+    assert_equal('foo', s[1])
+    assert_equal('bar', s[2])
+    assert_nil(s[3])
+    assert_equal('foo', s[:a])
+    assert_equal('bar', s[:b])
     assert_raise(IndexError) { s[:c] }
-    assert_equal 'foo', s['a']
-    assert_equal 'bar', s['b']
+    assert_equal('foo', s['a'])
+    assert_equal('bar', s['b'])
     assert_raise(IndexError) { s['c'] }
     # see https://github.com/jruby/jruby/issues/7644
     unless RUBY_ENGINE == "jruby" && RbConfig::CONFIG['host_os'] =~ /mswin|win32|mingw/
@@ -474,88 +546,140 @@ def test_AREF
   def test_pre_match
     s = create_string_scanner('a b c d e')
     s.scan(/\w/)
-    assert_equal '', s.pre_match
+    assert_equal('', s.pre_match)
     s.skip(/\s/)
-    assert_equal 'a', s.pre_match
+    assert_equal('a', s.pre_match)
     s.scan('b')
-    assert_equal 'a ', s.pre_match
+    assert_equal('a ', s.pre_match)
     s.scan_until(/c/)
-    assert_equal 'a b ', s.pre_match
+    assert_equal('a b ', s.pre_match)
     s.getch
-    assert_equal 'a b c', s.pre_match
+    assert_equal('a b c', s.pre_match)
     s.get_byte
-    assert_equal 'a b c ', s.pre_match
+    assert_equal('a b c ', s.pre_match)
     s.get_byte
-    assert_equal 'a b c d', s.pre_match
+    assert_equal('a b c d', s.pre_match)
     s.scan(/never match/)
-    assert_nil s.pre_match
+    assert_nil(s.pre_match)
+  end
+
+  def test_pre_match_string
+    s = create_string_scanner('a b c d e')
+    s.scan('a')
+    assert_equal('', s.pre_match)
+    s.skip(' ')
+    assert_equal('a', s.pre_match)
+    s.scan('b')
+    assert_equal('a ', s.pre_match)
+    s.scan_until('c')
+    assert_equal('a b ', s.pre_match)
+    s.getch
+    assert_equal('a b c', s.pre_match)
+    s.get_byte
+    assert_equal('a b c ', s.pre_match)
+    s.get_byte
+    assert_equal('a b c d', s.pre_match)
+    s.scan('never match')
+    assert_nil(s.pre_match)
   end
 
   def test_post_match
     s = create_string_scanner('a b c d e')
     s.scan(/\w/)
-    assert_equal ' b c d e', s.post_match
+    assert_equal(' b c d e', s.post_match)
     s.skip(/\s/)
-    assert_equal 'b c d e', s.post_match
+    assert_equal('b c d e', s.post_match)
     s.scan('b')
-    assert_equal ' c d e', s.post_match
+    assert_equal(' c d e', s.post_match)
     s.scan_until(/c/)
-    assert_equal ' d e', s.post_match
+    assert_equal(' d e', s.post_match)
     s.getch
-    assert_equal 'd e', s.post_match
+    assert_equal('d e', s.post_match)
     s.get_byte
-    assert_equal ' e', s.post_match
+    assert_equal(' e', s.post_match)
     s.get_byte
-    assert_equal 'e', s.post_match
+    assert_equal('e', s.post_match)
     s.scan(/never match/)
-    assert_nil s.post_match
+    assert_nil(s.post_match)
     s.scan(/./)
-    assert_equal '', s.post_match
+    assert_equal('', s.post_match)
     s.scan(/./)
-    assert_nil s.post_match
+    assert_nil(s.post_match)
   end
 
-  def test_terminate
-    s = create_string_scanner('ssss')
+  def test_post_match_string
+    s = create_string_scanner('a b c d e')
+    s.scan('a')
+    assert_equal(' b c d e', s.post_match)
+    s.skip(' ')
+    assert_equal('b c d e', s.post_match)
+    s.scan('b')
+    assert_equal(' c d e', s.post_match)
+    s.scan_until('c')
+    assert_equal(' d e', s.post_match)
     s.getch
+    assert_equal('d e', s.post_match)
+    s.get_byte
+    assert_equal(' e', s.post_match)
+    s.get_byte
+    assert_equal('e', s.post_match)
+    s.scan('never match')
+    assert_nil(s.post_match)
+  end
+
+  def test_terminate
+    s = create_string_scanner('abcd')
+    s.scan(/(?<a>ab)/) # set named_captures
     s.terminate
-    assert_equal true, s.eos?
+    assert_equal({}, s.named_captures)
+    assert_equal(true, s.eos?)
     s.terminate
-    assert_equal true, s.eos?
+    assert_equal(true, s.eos?)
   end
 
   def test_reset
-    s = create_string_scanner('ssss')
-    s.getch
+    s = create_string_scanner('abcd')
+    s.scan(/(?<a>ab)/) # set named_captures
     s.reset
-    assert_equal 0, s.pos
+    assert_equal({}, s.named_captures)
+    assert_equal(0, s.pos)
     s.scan(/\w+/)
     s.reset
-    assert_equal 0, s.pos
+    assert_equal(0, s.pos)
     s.reset
-    assert_equal 0, s.pos
+    assert_equal(0, s.pos)
   end
 
   def test_matched_size
     s = create_string_scanner('test string')
-    assert_nil s.matched_size
+    assert_nil(s.matched_size)
     s.scan(/test/)
-    assert_equal 4, s.matched_size
-    assert_equal 4, s.matched_size
+    assert_equal(4, s.matched_size)
+    assert_equal(4, s.matched_size)
     s.scan(//)
-    assert_equal 0, s.matched_size
+    assert_equal(0, s.matched_size)
     s.scan(/x/)
-    assert_nil s.matched_size
-    assert_nil s.matched_size
+    assert_nil(s.matched_size)
+    assert_nil(s.matched_size)
     s.terminate
-    assert_nil s.matched_size
+    assert_nil(s.matched_size)
 
     s = create_string_scanner('test string')
-    assert_nil s.matched_size
+    assert_nil(s.matched_size)
     s.scan(/test/)
-    assert_equal 4, s.matched_size
+    assert_equal(4, s.matched_size)
     s.terminate
-    assert_nil s.matched_size
+    assert_nil(s.matched_size)
+  end
+
+  def test_empty_encoding_utf8
+    ss = create_string_scanner('')
+    assert_equal(Encoding::UTF_8, ss.rest.encoding)
+  end
+
+  def test_empty_encoding_ascii_8bit
+    ss = create_string_scanner(''.dup.force_encoding("ASCII-8BIT"))
+    assert_equal(Encoding::ASCII_8BIT, ss.rest.encoding)
   end
 
   def test_encoding
@@ -570,8 +694,6 @@ def test_encoding_string
   end
 
   def test_invalid_encoding_string
-    omit "no encoding check on TruffleRuby for scan(String)" if RUBY_ENGINE == "truffleruby"
-
     str = "\xA1\xA2".dup.force_encoding("euc-jp")
     ss = create_string_scanner(str)
     assert_raise(Encoding::CompatibilityError) do
@@ -633,13 +755,48 @@ def test_exist_p
     assert_equal(nil, s.exist?(/e/))
   end
 
-  def test_exist_p_string
+  def test_exist_p_invalid_argument
     s = create_string_scanner("test string")
     assert_raise(TypeError) do
-      s.exist?(" ")
+      s.exist?(1)
     end
   end
 
+  def test_exist_p_string
+    s = create_string_scanner("test string")
+    assert_equal(3, s.exist?("s"))
+    assert_equal(0, s.pos)
+    s.scan("test")
+    assert_equal(2, s.exist?("s"))
+    assert_equal(4, s.pos)
+    assert_equal(nil, s.exist?("e"))
+  end
+
+  def test_scan_until
+    s = create_string_scanner("Foo Bar\0Baz")
+    assert_equal("Foo", s.scan_until(/Foo/))
+    assert_equal(3, s.pos)
+    assert_equal(" Bar", s.scan_until(/Bar/))
+    assert_equal(7, s.pos)
+    assert_equal(nil, s.skip_until(/Qux/))
+    assert_equal("\u0000Baz", s.scan_until(/Baz/))
+    assert_equal(11, s.pos)
+  end
+
+  def test_scan_until_string
+    s = create_string_scanner("Foo Bar\0Baz")
+    assert_equal("Foo", s.scan_until("Foo"))
+    assert_equal(3, s.pos)
+    assert_equal(" Bar", s.scan_until("Bar"))
+    assert_equal(7, s.pos)
+    assert_equal(nil, s.skip_until("Qux"))
+    assert_equal("\u0000Baz", s.scan_until("Baz"))
+    assert_equal(11, s.pos)
+
+    s = create_string_scanner("str")
+    assert_equal(nil, s.scan_until("str\0\0"))
+  end
+
   def test_skip_until
     s = create_string_scanner("Foo Bar Baz")
     assert_equal(3, s.skip_until(/Foo/))
@@ -649,6 +806,15 @@ def test_skip_until
     assert_equal(nil, s.skip_until(/Qux/))
   end
 
+  def test_skip_until_string
+    s = create_string_scanner("Foo Bar Baz")
+    assert_equal(3, s.skip_until("Foo"))
+    assert_equal(3, s.pos)
+    assert_equal(4, s.skip_until("Bar"))
+    assert_equal(7, s.pos)
+    assert_equal(nil, s.skip_until("Qux"))
+  end
+
   def test_check_until
     s = create_string_scanner("Foo Bar Baz")
     assert_equal("Foo", s.check_until(/Foo/))
@@ -658,6 +824,15 @@ def test_check_until
     assert_equal(nil, s.check_until(/Qux/))
   end
 
+  def test_check_until_string
+    s = create_string_scanner("Foo Bar Baz")
+    assert_equal("Foo", s.check_until("Foo"))
+    assert_equal(0, s.pos)
+    assert_equal("Foo Bar", s.check_until("Bar"))
+    assert_equal(0, s.pos)
+    assert_equal(nil, s.check_until("Qux"))
+  end
+
   def test_search_full
     s = create_string_scanner("Foo Bar Baz")
     assert_equal(8, s.search_full(/Bar /, false, false))
@@ -670,6 +845,18 @@ def test_search_full
     assert_equal(11, s.pos)
   end
 
+  def test_search_full_string
+    s = create_string_scanner("Foo Bar Baz")
+    assert_equal(8, s.search_full("Bar ", false, false))
+    assert_equal(0, s.pos)
+    assert_equal("Foo Bar ", s.search_full("Bar ", false, true))
+    assert_equal(0, s.pos)
+    assert_equal(8, s.search_full("Bar ", true, false))
+    assert_equal(8, s.pos)
+    assert_equal("Baz", s.search_full("az", true, true))
+    assert_equal(11, s.pos)
+  end
+
   def test_peek
     s = create_string_scanner("test string")
     assert_equal("test st", s.peek(7))
@@ -683,8 +870,9 @@ def test_peek
 
   def test_unscan
     s = create_string_scanner('test string')
-    assert_equal("test", s.scan(/\w+/))
+    assert_equal(4, s.skip(/(?<t>test)/)) # set named_captures
     s.unscan
+    assert_equal({}, s.named_captures)
     assert_equal("te", s.scan(/../))
     assert_equal(nil, s.scan(/\d/))
     assert_raise(ScanError) { s.unscan }
@@ -717,15 +905,13 @@ def test_inspect2
   end
 
   def test_aref_without_regex
-    omit "#[:missing] always raises on TruffleRuby if matched" if RUBY_ENGINE == "truffleruby"
-
     s = create_string_scanner('abc')
     s.get_byte
-    assert_nil(s[:c])
-    assert_nil(s["c"])
+    assert_raise(IndexError) { s[:c] }
+    assert_raise(IndexError) { s['c'] }
     s.getch
-    assert_nil(s[:c])
-    assert_nil(s["c"])
+    assert_raise(IndexError) { s[:c] }
+    assert_raise(IndexError) { s['c'] }
   end
 
   def test_size
@@ -737,8 +923,8 @@ def test_size
   def test_captures
     s = create_string_scanner("Timestamp: Fri Dec 12 1975 14:39")
     s.scan("Timestamp: ")
-    s.scan(/(\w+) (\w+) (\d+) /)
-    assert_equal(["Fri", "Dec", "12"], s.captures)
+    s.scan(/(\w+) (\w+) (\d+) (1980)?/)
+    assert_equal(["Fri", "Dec", "12", nil], s.captures)
     s.scan(/(\w+) (\w+) (\d+) /)
     assert_nil(s.captures)
   end
@@ -754,30 +940,194 @@ def test_values_at
 
   def test_scan_aref_repeatedly
     s = StringScanner.new('test string')
-    assert_equal "test",   s.scan(/\w(\w)(\w*)/)
-    assert_equal "test",   s[0]
-    assert_equal "e",      s[1]
-    assert_equal "st",     s[2]
-    assert_nil             s.scan(/\w+/)
-    assert_nil             s[0]
-    assert_nil             s[1]
-    assert_nil             s[2]
-    assert_equal " ",      s.scan(/\s+/)
-    assert_equal " ",      s[0]
-    assert_nil             s[1]
-    assert_nil             s[2]
-    assert_equal "string", s.scan(/\w(\w)(\w*)/)
-    assert_equal "string", s[0]
-    assert_equal "t",      s[1]
-    assert_equal "ring",   s[2]
+    assert_equal("test",   s.scan(/\w(\w)(\w*)/))
+    assert_equal("test",   s[0])
+    assert_equal("e",      s[1])
+    assert_equal("st",     s[2])
+    assert_nil(            s.scan(/\w+/))
+    assert_nil(            s[0])
+    assert_nil(            s[1])
+    assert_nil(            s[2])
+    assert_equal(" ",      s.scan(/\s+/))
+    assert_equal(" ",      s[0])
+    assert_nil(            s[1])
+    assert_nil(            s[2])
+    assert_equal("string", s.scan(/\w(\w)(\w*)/))
+    assert_equal("string", s[0])
+    assert_equal("t",      s[1])
+    assert_equal("ring",   s[2])
   end
 
   def test_named_captures
-    omit("not implemented on TruffleRuby") if ["truffleruby"].include?(RUBY_ENGINE)
     scan = StringScanner.new("foobarbaz")
     assert_equal({}, scan.named_captures)
     assert_equal(9, scan.match?(/(?<f>foo)(?<r>bar)(?<z>baz)/))
     assert_equal({"f" => "foo", "r" => "bar", "z" => "baz"}, scan.named_captures)
+    assert_equal(9, scan.match?("foobarbaz"))
+    assert_equal({}, scan.named_captures)
+  end
+
+  def test_named_captures_same_name_union
+    scan = StringScanner.new("123")
+    assert_equal(1, scan.match?(/(?<number>0)|(?<number>1)|(?<number>2)/))
+    assert_equal({"number" => "1"}, scan.named_captures)
+  end
+
+  def test_scan_integer
+    s = create_string_scanner('abc')
+    assert_equal(3, s.match?(/(?<a>abc)/)) # set named_captures
+    assert_nil(s.scan_integer)
+    assert_equal({}, s.named_captures)
+    assert_equal(0, s.pos)
+    refute_predicate(s, :matched?)
+
+    s = create_string_scanner('123abc')
+    assert_equal(123, s.scan_integer)
+    assert_equal(3, s.pos)
+    assert_predicate(s, :matched?)
+
+    s = create_string_scanner('-123abc')
+    assert_equal(-123, s.scan_integer)
+    assert_equal(4, s.pos)
+    assert_predicate(s, :matched?)
+
+    s = create_string_scanner('+123')
+    assert_equal(123, s.scan_integer)
+    assert_equal(4, s.pos)
+    assert_predicate(s, :matched?)
+
+    s = create_string_scanner('-abc')
+    assert_nil(s.scan_integer)
+    assert_equal(0, s.pos)
+    refute_predicate(s, :matched?)
+
+    s = create_string_scanner('-')
+    assert_nil(s.scan_integer)
+    assert_equal(0, s.pos)
+    refute_predicate(s, :matched?)
+
+    s = create_string_scanner('+')
+    assert_nil(s.scan_integer)
+    assert_equal(0, s.pos)
+    refute_predicate(s, :matched?)
+
+    huge_integer = '1' * 2_000
+    s = create_string_scanner(huge_integer)
+    assert_equal(huge_integer.to_i, s.scan_integer)
+    assert_equal(2_000, s.pos)
+    assert_predicate(s, :matched?)
+
+    s = create_string_scanner('abc1')
+    s.pos = 3
+    assert_equal(1, s.scan_integer)
+    assert_equal(4, s.pos)
+    assert_predicate(s, :matched?)
+  end
+
+  def test_scan_integer_unmatch
+    s = create_string_scanner('123abc')
+    assert_equal(123, s.scan_integer)
+    assert_equal(3, s.pos)
+
+    s.unscan
+    assert_equal(0, s.pos)
+  end
+
+  def test_scan_integer_encoding
+    s = create_string_scanner('123abc'.encode(Encoding::UTF_32LE))
+    assert_raise(Encoding::CompatibilityError) do
+      s.scan_integer
+    end
+  end
+
+  def test_scan_integer_matched
+    s = create_string_scanner("42abc")
+    assert_equal(42, s.scan_integer)
+    assert_equal("42", s.matched)
+
+    s = create_string_scanner("42abc")
+    assert_equal(0x42abc, s.scan_integer(base: 16))
+    assert_equal("42abc", s.matched)
+  end
+
+  def test_scan_integer_base_16
+    s = create_string_scanner('0')
+    assert_equal(0x0, s.scan_integer(base: 16))
+    assert_equal(1, s.pos)
+    assert_predicate(s, :matched?)
+
+    s = create_string_scanner('abc')
+    assert_equal(3, s.match?(/(?<a>abc)/)) # set named_captures
+    assert_equal(0xabc, s.scan_integer(base: 16))
+    assert_equal({}, s.named_captures)
+    assert_equal(3, s.pos)
+    assert_predicate(s, :matched?)
+
+    s = create_string_scanner('123abc')
+    assert_equal(0x123abc, s.scan_integer(base: 16))
+    assert_equal(6, s.pos)
+    assert_predicate(s, :matched?)
+
+    s = create_string_scanner('0x123abc')
+    assert_equal(0x123abc, s.scan_integer(base: 16))
+    assert_equal(8, s.pos)
+    assert_predicate(s, :matched?)
+
+    s = create_string_scanner('0x123ABC')
+    assert_equal(0x123abc, s.scan_integer(base: 16))
+    assert_equal(8, s.pos)
+    assert_predicate(s, :matched?)
+
+    s = create_string_scanner('-0x123ABC')
+    assert_equal(-0x123abc, s.scan_integer(base: 16))
+    assert_equal(9, s.pos)
+    assert_predicate(s, :matched?)
+
+    s = create_string_scanner('+0x123ABC')
+    assert_equal(+0x123abc, s.scan_integer(base: 16))
+    assert_equal(9, s.pos)
+    assert_predicate(s, :matched?)
+
+    s = create_string_scanner('0x')
+    assert_equal(0, s.scan_integer(base: 16))
+    assert_equal(1, s.pos)
+    assert_predicate(s, :matched?)
+
+    s = create_string_scanner('0xyz')
+    assert_equal(0, s.scan_integer(base: 16))
+    assert_equal(1, s.pos)
+    assert_predicate(s, :matched?)
+
+    s = create_string_scanner('-0x')
+    assert_equal(0, s.scan_integer(base: 16))
+    assert_equal(2, s.pos)
+    assert_predicate(s, :matched?)
+
+    s = create_string_scanner('+0x')
+    assert_equal(0, s.scan_integer(base: 16))
+    assert_equal(2, s.pos)
+    assert_predicate(s, :matched?)
+
+    s = create_string_scanner('-123abc')
+    assert_equal(-0x123abc, s.scan_integer(base: 16))
+    assert_equal(7, s.pos)
+    assert_predicate(s, :matched?)
+
+    s = create_string_scanner('+123')
+    assert_equal(0x123, s.scan_integer(base: 16))
+    assert_equal(4, s.pos)
+    assert_predicate(s, :matched?)
+
+    s = create_string_scanner('-abc')
+    assert_equal(-0xabc, s.scan_integer(base: 16))
+    assert_equal(4, s.pos)
+    assert_predicate(s, :matched?)
+
+    huge_integer = 'F' * 2_000
+    s = create_string_scanner(huge_integer)
+    assert_equal(huge_integer.to_i(16), s.scan_integer(base: 16))
+    assert_equal(2_000, s.pos)
+    assert_predicate(s, :matched?)
   end
 end
 
@@ -811,24 +1161,32 @@ def create_string_scanner(string, *args)
 
   def test_skip_with_begenning_of_string_anchor_match
     s = create_string_scanner("a")
-    assert_equal 1, s.skip(/\Aa/)
+    assert_equal(1, s.skip(/\Aa/))
   end
 
   def test_skip_with_begenning_of_string_anchor_not_match
     s = create_string_scanner("a\nb")
-    assert_equal 2, s.skip(/a\n/)
-    assert_nil      s.skip(/\Ab/)
+    assert_equal(2, s.skip(/a\n/))
+    assert_nil(     s.skip(/\Ab/))
   end
 
   def test_skip_with_begenning_of_line_anchor_match
     s = create_string_scanner("a\nb")
-    assert_equal 2, s.skip(/a\n/)
-    assert_equal 1, s.skip(/^b/)
+    assert_equal(2, s.skip(/a\n/))
+    assert_equal(1, s.skip(/^b/))
   end
 
   def test_skip_with_begenning_of_line_anchor_not_match
     s = create_string_scanner("ab")
-    assert_equal 1, s.skip(/a/)
-    assert_nil      s.skip(/^b/)
+    assert_equal(1, s.skip(/a/))
+    assert_nil(     s.skip(/^b/))
+  end
+
+  # ruby/strscan#86
+  def test_scan_shared_string
+    s = "hellohello"[5..-1]
+    ss = StringScanner.new(s).scan(/hello/)
+
+    assert_equal("hello", ss)
   end
 end
diff --git a/test/syslog/test_syslog_logger.rb b/test/syslog/test_syslog_logger.rb
deleted file mode 100644
index d9ffae39017255..00000000000000
--- a/test/syslog/test_syslog_logger.rb
+++ /dev/null
@@ -1,588 +0,0 @@
-# coding: US-ASCII
-# frozen_string_literal: false
-require 'test/unit'
-require 'tempfile'
-begin
-  require 'syslog/logger'
-rescue LoadError
-  # skip.  see the bottom of this file.
-end
-
-# These tests ensure Syslog::Logger works like Logger
-
-class TestSyslogRootLogger < Test::Unit::TestCase
-
-  module MockSyslog
-
-    PRIMASK = Syslog::Level.constants.inject(0) { |mask, name| mask | Syslog::Level.const_get(name) }
-
-    LEVEL_LABEL_MAP = {
-      Syslog::LOG_ALERT   => 'ALERT',
-      Syslog::LOG_ERR     => 'ERR',
-      Syslog::LOG_WARNING => 'WARNING',
-      Syslog::LOG_NOTICE  => 'NOTICE',
-      Syslog::LOG_INFO    => 'INFO',
-      Syslog::LOG_DEBUG   => 'DEBUG'
-    }
-
-    @facility = Syslog::LOG_USER
-
-    class << self
-
-      attr_reader :facility
-      attr_reader :line
-      attr_reader :program_name
-
-      def log(priority, format, *args)
-        level = priority & PRIMASK
-        @line = "<#{priority}> #{LEVEL_LABEL_MAP[level]} - #{format % args}"
-      end
-
-      def open(program_name)
-        @program_name = program_name
-      end
-
-      def reset
-        @line = ''
-      end
-
-    end
-  end
-
-  Syslog::Logger.syslog = MockSyslog
-
-  LEVEL_LABEL_MAP = {
-    Logger::DEBUG => 'DEBUG',
-    Logger::INFO => 'INFO',
-    Logger::WARN => 'WARN',
-    Logger::ERROR => 'ERROR',
-    Logger::FATAL => 'FATAL',
-    Logger::UNKNOWN => 'ANY',
-  }
-
-  def setup
-    @logger = Logger.new(nil)
-  end
-
-  class Log
-    attr_reader :line, :label, :datetime, :pid, :severity, :progname, :msg
-    def initialize(line)
-      @line = line
-      /\A(\w+), \[([^#]*)#(\d+)\]\s+(\w+) -- (\w*): ([\x0-\xff]*)/ =~ @line
-      @label, @datetime, @pid, @severity, @progname, @msg = $1, $2, $3, $4, $5, $6
-    end
-  end
-
-  def log_add(severity, msg, progname = nil, &block)
-    log(:add, severity, msg, progname, &block)
-  end
-
-  def log(msg_id, *arg, &block)
-    Log.new(log_raw(msg_id, *arg, &block))
-  end
-
-  def log_raw(msg_id, *arg, &block)
-    Tempfile.create(File.basename(__FILE__) + '.log') {|logdev|
-      @logger.instance_eval { @logdev = Logger::LogDevice.new(logdev) }
-      assert_equal true, @logger.__send__(msg_id, *arg, &block)
-      logdev.rewind
-      logdev.read
-    }
-  end
-
-  def test_initialize
-    assert_equal Logger::DEBUG, @logger.level
-  end
-
-  def test_custom_formatter
-    @logger.formatter = Class.new {
-      def call severity, time, progname, msg
-        "hi mom!"
-      end
-    }.new
-
-    assert_match(/hi mom!/, log_raw(:fatal, 'fatal level message'))
-  end
-
-  def test_add
-    msg = log_add nil,           'unknown level message' # nil == unknown
-    assert_equal LEVEL_LABEL_MAP[Logger::UNKNOWN], msg.severity
-
-    msg = log_add Logger::FATAL, 'fatal level message'
-    assert_equal LEVEL_LABEL_MAP[Logger::FATAL],   msg.severity
-
-    msg = log_add Logger::ERROR, 'error level message'
-    assert_equal LEVEL_LABEL_MAP[Logger::ERROR],   msg.severity
-
-    msg = log_add Logger::WARN,  'warn level message'
-    assert_equal LEVEL_LABEL_MAP[Logger::WARN],    msg.severity
-
-    msg = log_add Logger::INFO,  'info level message'
-    assert_equal LEVEL_LABEL_MAP[Logger::INFO],    msg.severity
-
-    msg = log_add Logger::DEBUG, 'debug level message'
-    assert_equal LEVEL_LABEL_MAP[Logger::DEBUG],   msg.severity
-  end
-
-  def test_add_level_unknown
-    @logger.level = Logger::UNKNOWN
-
-    msg = log_add nil,           'unknown level message' # nil == unknown
-    assert_equal LEVEL_LABEL_MAP[Logger::UNKNOWN], msg.severity
-
-    msg = log_add Logger::FATAL, 'fatal level message'
-    assert_equal '', msg.line
-
-    msg = log_add Logger::ERROR, 'error level message'
-    assert_equal '', msg.line
-
-    msg = log_add Logger::WARN,  'warn level message'
-    assert_equal '', msg.line
-
-    msg = log_add Logger::INFO,  'info level message'
-    assert_equal '', msg.line
-
-    msg = log_add Logger::DEBUG, 'debug level message'
-    assert_equal '', msg.line
-  end
-
-  def test_add_level_fatal
-    @logger.level = Logger::FATAL
-
-    msg = log_add nil,           'unknown level message' # nil == unknown
-    assert_equal LEVEL_LABEL_MAP[Logger::UNKNOWN], msg.severity
-
-    msg = log_add Logger::FATAL, 'fatal level message'
-    assert_equal LEVEL_LABEL_MAP[Logger::FATAL],   msg.severity
-
-    msg = log_add Logger::ERROR, 'error level message'
-    assert_equal '', msg.line
-
-    msg = log_add Logger::WARN,  'warn level message'
-    assert_equal '', msg.line
-
-    msg = log_add Logger::INFO,  'info level message'
-    assert_equal '', msg.line
-
-    msg = log_add Logger::DEBUG, 'debug level message'
-    assert_equal '', msg.line
-  end
-
-  def test_add_level_error
-    @logger.level = Logger::ERROR
-
-    msg = log_add nil,           'unknown level message' # nil == unknown
-    assert_equal LEVEL_LABEL_MAP[Logger::UNKNOWN], msg.severity
-
-    msg = log_add Logger::FATAL, 'fatal level message'
-    assert_equal LEVEL_LABEL_MAP[Logger::FATAL],   msg.severity
-
-    msg = log_add Logger::ERROR, 'error level message'
-    assert_equal LEVEL_LABEL_MAP[Logger::ERROR],   msg.severity
-
-    msg = log_add Logger::WARN,  'warn level message'
-    assert_equal '', msg.line
-
-    msg = log_add Logger::INFO,  'info level message'
-    assert_equal '', msg.line
-
-    msg = log_add Logger::DEBUG, 'debug level message'
-    assert_equal '', msg.line
-  end
-
-  def test_add_level_warn
-    @logger.level = Logger::WARN
-
-    msg = log_add nil,           'unknown level message' # nil == unknown
-    assert_equal LEVEL_LABEL_MAP[Logger::UNKNOWN], msg.severity
-
-    msg = log_add Logger::FATAL, 'fatal level message'
-    assert_equal LEVEL_LABEL_MAP[Logger::FATAL],   msg.severity
-
-    msg = log_add Logger::ERROR, 'error level message'
-    assert_equal LEVEL_LABEL_MAP[Logger::ERROR],   msg.severity
-
-    msg = log_add Logger::WARN,  'warn level message'
-    assert_equal LEVEL_LABEL_MAP[Logger::WARN],   msg.severity
-
-    msg = log_add Logger::INFO,  'info level message'
-    assert_equal '', msg.line
-
-    msg = log_add Logger::DEBUG, 'debug level message'
-    assert_equal '', msg.line
-  end
-
-  def test_add_level_info
-    @logger.level = Logger::INFO
-
-    msg = log_add nil,           'unknown level message' # nil == unknown
-    assert_equal LEVEL_LABEL_MAP[Logger::UNKNOWN], msg.severity
-
-    msg = log_add Logger::FATAL, 'fatal level message'
-    assert_equal LEVEL_LABEL_MAP[Logger::FATAL],   msg.severity
-
-    msg = log_add Logger::ERROR, 'error level message'
-    assert_equal LEVEL_LABEL_MAP[Logger::ERROR],   msg.severity
-
-    msg = log_add Logger::WARN,  'warn level message'
-    assert_equal LEVEL_LABEL_MAP[Logger::WARN],    msg.severity
-
-    msg = log_add Logger::INFO,  'info level message'
-    assert_equal LEVEL_LABEL_MAP[Logger::INFO],    msg.severity
-
-    msg = log_add Logger::DEBUG, 'debug level message'
-    assert_equal '', msg.line
-  end
-
-  def test_add_level_debug
-    @logger.level = Logger::DEBUG
-
-    msg = log_add nil,           'unknown level message' # nil == unknown
-    assert_equal LEVEL_LABEL_MAP[Logger::UNKNOWN], msg.severity
-
-    msg = log_add Logger::FATAL, 'fatal level message'
-    assert_equal LEVEL_LABEL_MAP[Logger::FATAL],   msg.severity
-
-    msg = log_add Logger::ERROR, 'error level message'
-    assert_equal LEVEL_LABEL_MAP[Logger::ERROR],   msg.severity
-
-    msg = log_add Logger::WARN,  'warn level message'
-    assert_equal LEVEL_LABEL_MAP[Logger::WARN],    msg.severity
-
-    msg = log_add Logger::INFO,  'info level message'
-    assert_equal LEVEL_LABEL_MAP[Logger::INFO],    msg.severity
-
-    msg = log_add Logger::DEBUG, 'debug level message'
-    assert_equal LEVEL_LABEL_MAP[Logger::DEBUG],   msg.severity
-  end
-
-  def test_unknown
-    msg = log :unknown, 'unknown level message'
-    assert_equal LEVEL_LABEL_MAP[Logger::UNKNOWN], msg.severity
-
-    @logger.level = Logger::UNKNOWN
-    msg = log :unknown, 'unknown level message'
-    assert_equal LEVEL_LABEL_MAP[Logger::UNKNOWN], msg.severity
-
-    @logger.level = Logger::FATAL
-    msg = log :unknown, 'unknown level message'
-    assert_equal LEVEL_LABEL_MAP[Logger::UNKNOWN], msg.severity
-
-    @logger.level = Logger::ERROR
-    msg = log :unknown, 'unknown level message'
-    assert_equal LEVEL_LABEL_MAP[Logger::UNKNOWN], msg.severity
-
-    @logger.level = Logger::WARN
-    msg = log :unknown, 'unknown level message'
-    assert_equal LEVEL_LABEL_MAP[Logger::UNKNOWN], msg.severity
-
-    @logger.level = Logger::INFO
-    msg = log :unknown, 'unknown level message'
-    assert_equal LEVEL_LABEL_MAP[Logger::UNKNOWN], msg.severity
-
-    @logger.level = Logger::DEBUG
-    msg = log :unknown, 'unknown level message'
-    assert_equal LEVEL_LABEL_MAP[Logger::UNKNOWN], msg.severity
-  end
-
-  def test_fatal
-    msg = log :fatal, 'fatal level message'
-    assert_equal LEVEL_LABEL_MAP[Logger::FATAL], msg.severity
-
-    @logger.level = Logger::UNKNOWN
-    msg = log :fatal, 'fatal level message'
-    assert_equal '', msg.line
-
-    @logger.level = Logger::FATAL
-    msg = log :fatal, 'fatal level message'
-    assert_equal LEVEL_LABEL_MAP[Logger::FATAL], msg.severity
-
-    @logger.level = Logger::ERROR
-    msg = log :fatal, 'fatal level message'
-    assert_equal LEVEL_LABEL_MAP[Logger::FATAL], msg.severity
-
-    @logger.level = Logger::WARN
-    msg = log :fatal, 'fatal level message'
-    assert_equal LEVEL_LABEL_MAP[Logger::FATAL], msg.severity
-
-    @logger.level = Logger::INFO
-    msg = log :fatal, 'fatal level message'
-    assert_equal LEVEL_LABEL_MAP[Logger::FATAL], msg.severity
-
-    @logger.level = Logger::DEBUG
-    msg = log :fatal, 'fatal level message'
-    assert_equal LEVEL_LABEL_MAP[Logger::FATAL], msg.severity
-  end
-
-  def test_fatal_eh
-    @logger.level = Logger::FATAL
-    assert_equal true, @logger.fatal?
-
-    @logger.level = Logger::UNKNOWN
-    assert_equal false, @logger.fatal?
-  end
-
-  def test_error
-    msg = log :error, 'error level message'
-    assert_equal LEVEL_LABEL_MAP[Logger::ERROR], msg.severity
-
-    @logger.level = Logger::UNKNOWN
-    msg = log :error, 'error level message'
-    assert_equal '', msg.line
-
-    @logger.level = Logger::FATAL
-    msg = log :error, 'error level message'
-    assert_equal '', msg.line
-
-    @logger.level = Logger::ERROR
-    msg = log :error, 'error level message'
-    assert_equal LEVEL_LABEL_MAP[Logger::ERROR], msg.severity
-
-    @logger.level = Logger::WARN
-    msg = log :error, 'error level message'
-    assert_equal LEVEL_LABEL_MAP[Logger::ERROR], msg.severity
-
-    @logger.level = Logger::INFO
-    msg = log :error, 'error level message'
-    assert_equal LEVEL_LABEL_MAP[Logger::ERROR], msg.severity
-
-    @logger.level = Logger::DEBUG
-    msg = log :error, 'error level message'
-    assert_equal LEVEL_LABEL_MAP[Logger::ERROR], msg.severity
-  end
-
-  def test_error_eh
-    @logger.level = Logger::ERROR
-    assert_equal true, @logger.error?
-
-    @logger.level = Logger::FATAL
-    assert_equal false, @logger.error?
-  end
-
-  def test_warn
-    msg = log :warn, 'warn level message'
-    assert_equal LEVEL_LABEL_MAP[Logger::WARN], msg.severity
-
-    @logger.level = Logger::UNKNOWN
-    msg = log :warn, 'warn level message'
-    assert_equal '', msg.line
-
-    @logger.level = Logger::FATAL
-    msg = log :warn, 'warn level message'
-    assert_equal '', msg.line
-
-    @logger.level = Logger::ERROR
-    msg = log :warn, 'warn level message'
-    assert_equal '', msg.line
-
-    @logger.level = Logger::WARN
-    msg = log :warn, 'warn level message'
-    assert_equal LEVEL_LABEL_MAP[Logger::WARN], msg.severity
-
-    @logger.level = Logger::INFO
-    msg = log :warn, 'warn level message'
-    assert_equal LEVEL_LABEL_MAP[Logger::WARN], msg.severity
-
-    @logger.level = Logger::DEBUG
-    msg = log :warn, 'warn level message'
-    assert_equal LEVEL_LABEL_MAP[Logger::WARN], msg.severity
-  end
-
-  def test_warn_eh
-    @logger.level = Logger::WARN
-    assert_equal true, @logger.warn?
-
-    @logger.level = Logger::ERROR
-    assert_equal false, @logger.warn?
-  end
-
-  def test_info
-    msg = log :info, 'info level message'
-    assert_equal LEVEL_LABEL_MAP[Logger::INFO], msg.severity
-
-    @logger.level = Logger::UNKNOWN
-    msg = log :info, 'info level message'
-    assert_equal '', msg.line
-
-    @logger.level = Logger::FATAL
-    msg = log :info, 'info level message'
-    assert_equal '', msg.line
-
-    @logger.level = Logger::ERROR
-    msg = log :info, 'info level message'
-    assert_equal '', msg.line
-
-    @logger.level = Logger::WARN
-    msg = log :info, 'info level message'
-    assert_equal '', msg.line
-
-    @logger.level = Logger::INFO
-    msg = log :info, 'info level message'
-    assert_equal LEVEL_LABEL_MAP[Logger::INFO], msg.severity
-
-    @logger.level = Logger::DEBUG
-    msg = log :info, 'info level message'
-    assert_equal LEVEL_LABEL_MAP[Logger::INFO], msg.severity
-  end
-
-  def test_info_eh
-    @logger.level = Logger::INFO
-    assert_equal true, @logger.info?
-
-    @logger.level = Logger::WARN
-    assert_equal false, @logger.info?
-  end
-
-  def test_debug
-    msg = log :debug, 'debug level message'
-    assert_equal LEVEL_LABEL_MAP[Logger::DEBUG], msg.severity
-
-    @logger.level = Logger::UNKNOWN
-    msg = log :debug, 'debug level message'
-    assert_equal '', msg.line
-
-    @logger.level = Logger::FATAL
-    msg = log :debug, 'debug level message'
-    assert_equal '', msg.line
-
-    @logger.level = Logger::ERROR
-    msg = log :debug, 'debug level message'
-    assert_equal '', msg.line
-
-    @logger.level = Logger::WARN
-    msg = log :debug, 'debug level message'
-    assert_equal '', msg.line
-
-    @logger.level = Logger::INFO
-    msg = log :debug, 'debug level message'
-    assert_equal '', msg.line
-
-    @logger.level = Logger::DEBUG
-    msg = log :debug, 'debug level message'
-    assert_equal LEVEL_LABEL_MAP[Logger::DEBUG], msg.severity
-  end
-
-  def test_debug_eh
-    @logger.level = Logger::DEBUG
-    assert_equal true, @logger.debug?
-
-    @logger.level = Logger::INFO
-    assert_equal false, @logger.debug?
-  end
-
-end if defined?(Syslog)
-
-class TestSyslogLogger < TestSyslogRootLogger
-
-  @facility = Syslog::LOG_USER
-
-  def facility
-    self.class.instance_variable_get("@facility")
-  end
-
-  def setup
-    super
-    @logger = Syslog::Logger.new
-  end
-
-  SEVERITY_MAP = {}.tap { |map|
-    level2severity = Syslog::Logger::LEVEL_MAP.invert
-
-    MockSyslog::LEVEL_LABEL_MAP.each { |level, name|
-      map[name] = TestSyslogRootLogger::LEVEL_LABEL_MAP[level2severity[level]]
-    }
-  }
-
-  class Log
-    attr_reader :line, :label, :datetime, :pid, :severity, :progname, :msg, :priority
-    def initialize(line)
-      @line = line
-      return unless /\A<(\d+)> (\w+) - (.*)\Z/ =~ @line
-      priority, severity, @msg = $1, $2, $3
-      @severity = SEVERITY_MAP[severity]
-      @priority = priority.to_i
-    end
-  end
-
-  def log_add(severity, msg, progname = nil, &block)
-    log(:add, severity, msg, progname, &block)
-  end
-
-  def log(msg_id, *arg, &block)
-    Log.new(log_raw(msg_id, *arg, &block))
-  end
-
-  def log_raw(msg_id, *arg, &block)
-    assert_equal true, @logger.__send__(msg_id, *arg, &block)
-    msg = MockSyslog.line
-    MockSyslog.reset
-    return msg
-  end
-
-  def test_unknown_eh
-    @logger.level = Logger::UNKNOWN
-    assert_equal true, @logger.unknown?
-
-    @logger.level = Logger::UNKNOWN + 1
-    assert_equal false, @logger.unknown?
-  end
-
-  def test_facility
-    assert_equal facility, @logger.facility
-  end
-
-  def test_priority
-    msg = log_add nil,           'unknown level message' # nil == unknown
-    assert_equal facility|Syslog::LOG_ALERT,   msg.priority
-
-    msg = log_add Logger::FATAL, 'fatal level message'
-    assert_equal facility|Syslog::LOG_ERR,     msg.priority
-
-    msg = log_add Logger::ERROR, 'error level message'
-    assert_equal facility|Syslog::LOG_WARNING, msg.priority
-
-    msg = log_add Logger::WARN,  'warn level message'
-    assert_equal facility|Syslog::LOG_NOTICE,  msg.priority
-
-    msg = log_add Logger::INFO,  'info level message'
-    assert_equal facility|Syslog::LOG_INFO,    msg.priority
-
-    msg = log_add Logger::DEBUG, 'debug level message'
-    assert_equal facility|Syslog::LOG_DEBUG,   msg.priority
-  end
-
-  class CustomSyslogLogger < Syslog::Logger
-    def level
-      Logger::INFO
-    end
-  end
-
-  def test_overriding_level
-    @logger = CustomSyslogLogger.new
-    log = log_add Logger::INFO, 'msg'
-    assert_equal 'msg', log.msg
-
-    log = log_add Logger::DEBUG, 'msg'
-    assert_nil log.msg
-  end
-
-end if defined?(Syslog)
-
-
-# Create test class for each available facility
-
-Syslog::Facility.constants.each do |facility_symb|
-
-  test_syslog_class = Class.new(TestSyslogLogger) do
-
-    @facility = Syslog.const_get(facility_symb)
-
-    def setup
-      super
-      @logger.facility = facility
-    end
-
-  end
-  Object.const_set("TestSyslogLogger_#{facility_symb}", test_syslog_class)
-
-end if defined?(Syslog)
diff --git a/test/test_abbrev.rb b/test/test_abbrev.rb
deleted file mode 100644
index 67287138aa8f91..00000000000000
--- a/test/test_abbrev.rb
+++ /dev/null
@@ -1,55 +0,0 @@
-# frozen_string_literal: true
-require 'test/unit'
-require 'abbrev'
-
-class TestAbbrev < Test::Unit::TestCase
-  def test_abbrev
-    words = %w[summer winter win ruby rules]
-
-    assert_equal({
-        "rub"    => "ruby",
-        "ruby"   => "ruby",
-        "rul"    => "rules",
-        "rule"   => "rules",
-        "rules"  => "rules",
-        "s"      => "summer",
-        "su"     => "summer",
-        "sum"    => "summer",
-        "summ"   => "summer",
-        "summe"  => "summer",
-        "summer" => "summer",
-        "win"    => "win",
-        "wint"   => "winter",
-        "winte"  => "winter",
-        "winter" => "winter",
-      }, words.abbrev)
-
-    assert_equal({
-        "rub"    => "ruby",
-        "ruby"   => "ruby",
-        "rul"    => "rules",
-        "rule"   => "rules",
-        "rules"  => "rules",
-      }, words.abbrev('ru'))
-
-    assert_equal words.abbrev,       Abbrev.abbrev(words)
-    assert_equal words.abbrev('ru'), Abbrev.abbrev(words, 'ru')
-  end
-
-  def test_abbrev_lf
-    words = ["abc", "abc\nd", "de"]
-
-    assert_equal({
-        "abc"     => "abc",
-        "abc\n"   => "abc\nd",
-        "abc\nd"  => "abc\nd",
-        "d"       => "de",
-        "de"      => "de",
-      }, words.abbrev)
-
-    assert_equal({
-        "d"       => "de",
-        "de"      => "de",
-      }, words.abbrev('d'))
-  end
-end
diff --git a/test/test_bundled_gems.rb b/test/test_bundled_gems.rb
new file mode 100644
index 00000000000000..19546dd29606af
--- /dev/null
+++ b/test/test_bundled_gems.rb
@@ -0,0 +1,35 @@
+require_relative "rubygems/helper"
+require "rubygems"
+require "bundled_gems"
+
+class TestBundlerGem < Gem::TestCase
+  def setup
+    Gem::BUNDLED_GEMS::WARNED.clear
+  end
+
+  def teardown
+    Gem::BUNDLED_GEMS::WARNED.clear
+  end
+
+  def test_warning
+    assert Gem::BUNDLED_GEMS.warning?("csv", specs: {})
+    assert_nil Gem::BUNDLED_GEMS.warning?("csv", specs: {})
+  end
+
+  def test_no_warning_warning
+    assert_nil Gem::BUNDLED_GEMS.warning?("some_gem", specs: {})
+    assert_nil Gem::BUNDLED_GEMS.warning?("/path/to/some_gem.rb", specs: {})
+  end
+
+  def test_warning_libdir
+    path = File.join(::RbConfig::CONFIG.fetch("rubylibdir"), "csv.rb")
+    assert Gem::BUNDLED_GEMS.warning?(path, specs: {})
+    assert_nil Gem::BUNDLED_GEMS.warning?(path, specs: {})
+  end
+
+  def test_warning_archdir
+    path = File.join(::RbConfig::CONFIG.fetch("rubyarchdir"), "syslog.so")
+    assert Gem::BUNDLED_GEMS.warning?(path, specs: {})
+    assert_nil Gem::BUNDLED_GEMS.warning?(path, specs: {})
+  end
+end
diff --git a/test/test_delegate.rb b/test/test_delegate.rb
index 57480b18ea674c..ff7998ee43b372 100644
--- a/test/test_delegate.rb
+++ b/test/test_delegate.rb
@@ -3,14 +3,6 @@
 require 'delegate'
 
 class TestDelegateClass < Test::Unit::TestCase
-  module PP
-    def mu_pp(obj)
-      str = super
-      str = "#<#{obj.class}: #{str}>" if Delegator === obj
-      str
-    end
-  end
-
   module M
     attr_reader :m
   end
@@ -31,7 +23,7 @@ def test_delegate_class_block
 
   def test_systemcallerror_eq
     e = SystemCallError.new(0)
-    assert((SimpleDelegator.new(e) == e) == (e == SimpleDelegator.new(e)), "[ruby-dev:34808]")
+    assert_equal((SimpleDelegator.new(e) == e), (e == SimpleDelegator.new(e)), "[ruby-dev:34808]")
   end
 
   class Myclass < DelegateClass(Array);end
@@ -189,8 +181,8 @@ def test_copy_frozen
     assert_nothing_raised(bug2679) {d.dup[0] += 1}
     assert_raise(FrozenError) {d.clone[0] += 1}
     d.freeze
-    assert(d.clone.frozen?)
-    assert(!d.dup.frozen?)
+    assert_predicate(d.clone, :frozen?)
+    assert_not_predicate(d.dup, :frozen?)
   end
 
   def test_frozen
@@ -215,7 +207,6 @@ def s.bar; end
   end
 
   def test_eql?
-    extend PP
     s0 = SimpleDelegator.new("foo")
     s1 = SimpleDelegator.new("bar")
     s2 = SimpleDelegator.new("foo")
diff --git a/test/test_extlibs.rb b/test/test_extlibs.rb
index 38070f227a478b..8969c3c50fb4d7 100644
--- a/test/test_extlibs.rb
+++ b/test/test_extlibs.rb
@@ -34,14 +34,13 @@ def windows?
   end.flatten.compact
   excluded << '+' if excluded.empty?
   if windows?
-    excluded.map! {|i| i == '+' ? ['pty', 'syslog'] : i}
+    excluded.map! {|i| i == '+' ? ['pty'] : i}
     excluded.flatten!
   else
     excluded.map! {|i| i == '+' ? '*win32*' : i}
   end
   @excluded = excluded
 
-  check_existence "bigdecimal"
   check_existence "continuation"
   check_existence "coverage"
   check_existence "date"
@@ -54,12 +53,10 @@ def windows?
   check_existence "etc"
   check_existence "fcntl"
   check_existence "fiber"
-  check_existence "fiddle"
   check_existence "io/console"
   check_existence "io/nonblock"
   check_existence "io/wait"
   check_existence "json"
-  check_existence "nkf"
   check_existence "objspace"
   check_existence "openssl", "this may be false positive, but should assert because rubygems requires this"
   check_existence "pathname"
@@ -70,8 +67,6 @@ def windows?
   check_existence "socket"
   check_existence "stringio"
   check_existence "strscan"
-  check_existence "syslog"
   check_existence "thread"
-  check_existence "win32ole"
   check_existence "zlib", "this may be false positive, but should assert because rubygems requires this"
 end
diff --git a/test/test_forwardable.rb b/test/test_forwardable.rb
index deb0b5d5cfd16c..9ed330058a7145 100644
--- a/test/test_forwardable.rb
+++ b/test/test_forwardable.rb
@@ -306,7 +306,7 @@ class Foo2 < BasicObject
 
   def test_basicobject_subclass
     bug11616 = '[ruby-core:71176] [Bug #11616]'
-    assert_raise_with_message(NameError, /`bar'/, bug11616) {
+    assert_raise_with_message(NameError, /[`']bar'/, bug11616) {
       Foo2.new.baz
     }
   end
diff --git a/test/test_getoptlong.rb b/test/test_getoptlong.rb
deleted file mode 100644
index 0cd370b6c7556a..00000000000000
--- a/test/test_getoptlong.rb
+++ /dev/null
@@ -1,163 +0,0 @@
-require 'test/unit'
-require 'getoptlong'
-
-class TestGetoptLong < Test::Unit::TestCase
-
-  def verify(test_argv, expected_remaining_argv, expected_options)
-    # Save ARGV and replace it with a test ARGV.
-    argv_saved = ARGV.dup
-    ARGV.replace(test_argv)
-    # Define options.
-    opts = GetoptLong.new(
-      ['--xxx', '-x', '--aaa', '-a', GetoptLong::REQUIRED_ARGUMENT],
-      ['--yyy', '-y', '--bbb', '-b', GetoptLong::OPTIONAL_ARGUMENT],
-      ['--zzz', '-z', '--ccc', '-c', GetoptLong::NO_ARGUMENT]
-    )
-    opts.quiet = true
-    # Gather options.
-    actual_options = []
-    opts.each do |opt, arg|
-      actual_options << "#{opt}: #{arg}"
-    end
-    # Save remaining test ARGV and restore original ARGV.
-    actual_remaining_argv = ARGV.dup
-    ARGV.replace(argv_saved)
-    # Assert.
-    assert_equal(expected_remaining_argv, actual_remaining_argv, 'ARGV')
-    assert_equal(expected_options, actual_options, 'Options')
-  end
-
-  def test_no_options
-    expected_options = []
-    expected_argv = %w[foo bar]
-    argv = %w[foo bar]
-    verify(argv, expected_argv, expected_options)
-  end
-
-  def test_required_argument
-    expected_options = [
-      '--xxx: arg'
-    ]
-    expected_argv = %w[foo bar]
-    options = %w[--xxx --xx --x -x --aaa --aa --a -a]
-    options.each do |option|
-      argv = ['foo', option, 'arg', 'bar']
-      verify(argv, expected_argv, expected_options)
-    end
-  end
-
-  def test_required_argument_missing
-    options = %w[--xxx --xx --x -x --aaa --aa --a -a]
-    options.each do |option|
-      argv = [option]
-      e = assert_raise(GetoptLong::MissingArgument) do
-        verify(argv, [], [])
-      end
-      assert_match('requires an argument', e.message)
-    end
-  end
-
-  def test_optional_argument
-    expected_options = [
-      '--yyy: arg'
-    ]
-    expected_argv = %w[foo bar]
-    options = %w[--yyy --y --y -y --bbb --bb --b -b]
-    options.each do |option|
-      argv = ['foo', 'bar', option, 'arg']
-      verify(argv, expected_argv, expected_options)
-    end
-  end
-
-  def test_optional_argument_missing
-    expected_options = [
-      '--yyy: '
-    ]
-    expected_argv = %w[foo bar]
-    options = %w[--yyy --y --y -y --bbb --bb --b -b]
-    options.each do |option|
-      argv = ['foo', 'bar', option]
-      verify(argv, expected_argv, expected_options)
-    end
-  end
-
-  def test_no_argument
-    expected_options = [
-      '--zzz: '
-    ]
-    expected_argv = %w[foo bar]
-    options = %w[--zzz --zz --z -z --ccc --cc --c -c]
-    options.each do |option|
-      argv = ['foo', option, 'bar']
-      verify(argv, expected_argv, expected_options)
-    end
-  end
-
-  def test_new_with_empty_array
-    e = assert_raise(ArgumentError) do
-      GetoptLong.new([])
-    end
-    assert_match(/no argument-flag/, e.message)
-  end
-
-  def test_new_with_bad_array
-    e = assert_raise(ArgumentError) do
-      GetoptLong.new('foo')
-    end
-    assert_match(/option list contains non-Array argument/, e.message)
-  end
-
-  def test_new_with_empty_subarray
-    e = assert_raise(ArgumentError) do
-      GetoptLong.new([[]])
-    end
-    assert_match(/no argument-flag/, e.message)
-  end
-
-  def test_new_with_bad_subarray
-    e = assert_raise(ArgumentError) do
-      GetoptLong.new([1])
-    end
-    assert_match(/no option name/, e.message)
-  end
-
-  def test_new_with_invalid_option
-    invalid_options = %w[verbose -verbose -- +]
-    invalid_options.each do |invalid_option|
-      e = assert_raise(ArgumentError, invalid_option.to_s) do
-        arguments = [
-          [invalid_option, '-v', GetoptLong::NO_ARGUMENT]
-        ]
-        GetoptLong.new(*arguments)
-      end
-      assert_match(/invalid option/, e.message)
-    end
-  end
-
-  def test_new_with_invalid_alias
-    invalid_aliases = %w[v - -- +]
-    invalid_aliases.each do |invalid_alias|
-      e = assert_raise(ArgumentError, invalid_alias.to_s) do
-        arguments = [
-          ['--verbose', invalid_alias, GetoptLong::NO_ARGUMENT]
-        ]
-        GetoptLong.new(*arguments)
-      end
-      assert_match(/invalid option/, e.message)
-    end
-  end
-
-  def test_new_with_invalid_flag
-    invalid_flags = ['foo']
-    invalid_flags.each do |invalid_flag|
-      e = assert_raise(ArgumentError, invalid_flag.to_s) do
-        arguments = [
-          ['--verbose', '-v', invalid_flag]
-        ]
-        GetoptLong.new(*arguments)
-      end
-      assert_match(/no argument-flag/, e.message)
-    end
-  end
-
-end
diff --git a/test/test_ipaddr.rb b/test/test_ipaddr.rb
index 90a7fc352a096a..7ecd37e9a40419 100644
--- a/test/test_ipaddr.rb
+++ b/test/test_ipaddr.rb
@@ -20,18 +20,21 @@ def test_s_new
     a = IPAddr.new
     assert_equal("::", a.to_s)
     assert_equal("0000:0000:0000:0000:0000:0000:0000:0000", a.to_string)
+    assert_equal("::/128", a.cidr)
     assert_equal(Socket::AF_INET6, a.family)
     assert_equal(128, a.prefix)
 
     a = IPAddr.new("0123:4567:89ab:cdef:0ABC:DEF0:1234:5678")
     assert_equal("123:4567:89ab:cdef:abc:def0:1234:5678", a.to_s)
     assert_equal("0123:4567:89ab:cdef:0abc:def0:1234:5678", a.to_string)
+    assert_equal("123:4567:89ab:cdef:abc:def0:1234:5678/128", a.cidr)
     assert_equal(Socket::AF_INET6, a.family)
     assert_equal(128, a.prefix)
 
     a = IPAddr.new("3ffe:505:2::/48")
     assert_equal("3ffe:505:2::", a.to_s)
     assert_equal("3ffe:0505:0002:0000:0000:0000:0000:0000", a.to_string)
+    assert_equal("3ffe:505:2::/48", a.cidr)
     assert_equal(Socket::AF_INET6, a.family)
     assert_equal(false, a.ipv4?)
     assert_equal(true, a.ipv6?)
@@ -41,6 +44,7 @@ def test_s_new
     a = IPAddr.new("3ffe:505:2::/ffff:ffff:ffff::")
     assert_equal("3ffe:505:2::", a.to_s)
     assert_equal("3ffe:0505:0002:0000:0000:0000:0000:0000", a.to_string)
+    assert_equal("3ffe:505:2::/48", a.cidr)
     assert_equal(Socket::AF_INET6, a.family)
     assert_equal(48, a.prefix)
     assert_nil(a.zone_id)
@@ -58,12 +62,14 @@ def test_s_new
     a = IPAddr.new("0.0.0.0")
     assert_equal("0.0.0.0", a.to_s)
     assert_equal("0.0.0.0", a.to_string)
+    assert_equal("0.0.0.0/32", a.cidr)
     assert_equal(Socket::AF_INET, a.family)
     assert_equal(32, a.prefix)
 
     a = IPAddr.new("192.168.1.2")
     assert_equal("192.168.1.2", a.to_s)
     assert_equal("192.168.1.2", a.to_string)
+    assert_equal("192.168.1.2/32", a.cidr)
     assert_equal(Socket::AF_INET, a.family)
     assert_equal(true, a.ipv4?)
     assert_equal(false, a.ipv6?)
@@ -72,6 +78,7 @@ def test_s_new
     a = IPAddr.new("192.168.1.2/26")
     assert_equal("192.168.1.0", a.to_s)
     assert_equal("192.168.1.0", a.to_string)
+    assert_equal("192.168.1.0/26", a.cidr)
     assert_equal(Socket::AF_INET, a.family)
     assert_equal("#<IPAddr: IPv4:192.168.1.0/255.255.255.192>", a.inspect)
     assert_equal(26, a.prefix)
@@ -79,6 +86,7 @@ def test_s_new
     a = IPAddr.new("192.168.1.2/255.255.255.0")
     assert_equal("192.168.1.0", a.to_s)
     assert_equal("192.168.1.0", a.to_string)
+    assert_equal("192.168.1.0/24", a.cidr)
     assert_equal(Socket::AF_INET, a.family)
     assert_equal(24, a.prefix)
 
@@ -133,18 +141,37 @@ def test_s_new_ntoh
 
   def test_ntop
     # IPv4
-    assert_equal("192.168.1.1", IPAddr.ntop("\xC0\xA8\x01\x01"))
+    assert_equal("192.168.1.1", IPAddr.ntop("\xC0\xA8\x01\x01".b))
+    assert_equal("10.231.140.171", IPAddr.ntop("\x0A\xE7\x8C\xAB".b))
     # IPv6
     assert_equal("0000:0000:0000:0000:0000:0000:0000:0001",
-                 IPAddr.ntop("\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01"))
+                 IPAddr.ntop("\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01".b))
+    assert_equal("fe80:0000:0000:0000:f09f:9985:f09f:9986",
+                 IPAddr.ntop("\xFE\x80\x00\x00\x00\x00\x00\x00\xF0\x9F\x99\x85\xF0\x9F\x99\x86".b))
 
     # Invalid parameters
+    ## wrong length
     assert_raise(IPAddr::AddressFamilyError) {
-      IPAddr.ntop("192.168.1.1")
+      IPAddr.ntop("192.168.1.1".b)
     }
-
     assert_raise(IPAddr::AddressFamilyError) {
-      IPAddr.ntop("\xC0\xA8\x01\xFF1")
+      IPAddr.ntop("\xC0\xA8\x01\xFF1".b)
+    }
+    ## UTF-8
+    assert_raise(IPAddr::InvalidAddressError) {
+      IPAddr.ntop("192.168.1.1")
+    }
+    assert_raise(IPAddr::InvalidAddressError) {
+      IPAddr.ntop("\x0A\x0A\x0A\x0A")
+    }
+    assert_raise(IPAddr::InvalidAddressError) {
+      IPAddr.ntop("\x0A\xE7\x8C\xAB")
+    }
+    assert_raise(IPAddr::InvalidAddressError) {
+      IPAddr.ntop("\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01")
+    }
+    assert_raise(IPAddr::InvalidAddressError) {
+      IPAddr.ntop("\xFE\x80\x00\x00\x00\x00\x00\x00\xF0\x9F\x99\x85\xF0\x9F\x99\x86")
     }
   end
 
@@ -233,6 +260,20 @@ def test_to_s
     assert_equal("3ffe:505:2::1", IPAddr.new("3ffe:505:2::1").to_s)
   end
 
+  def test_as_json
+    assert_equal("192.168.1.2", IPAddr.new("192.168.1.2").as_json)
+    assert_equal("192.168.1.0/24", IPAddr.new("192.168.1.2/24").as_json)
+    assert_equal("2001:200:300::1", IPAddr.new("2001:200:300::1").as_json)
+    assert_equal("2001:200:300::/48", IPAddr.new("2001:200:300::/48").as_json)
+  end
+
+  def test_to_json
+    assert_equal("\"192.168.1.2\"", IPAddr.new("192.168.1.2").to_json)
+    assert_equal("\"192.168.1.0/24\"", IPAddr.new("192.168.1.2/24").to_json)
+    assert_equal("\"2001:200:300::1\"", IPAddr.new("2001:200:300::1").to_json)
+    assert_equal("\"2001:200:300::/48\"", IPAddr.new("2001:200:300::/48").to_json)
+  end
+
   def test_netmask
     a = IPAddr.new("192.168.1.2/8")
     assert_equal(a.netmask, "255.0.0.0")
@@ -244,6 +285,29 @@ def test_netmask
     assert_equal(a.netmask, "255.255.255.0")
   end
 
+  def test_wildcard_mask
+    a = IPAddr.new("192.168.1.2/1")
+    assert_equal(a.wildcard_mask, "127.255.255.255")
+
+    a = IPAddr.new("192.168.1.2/8")
+    assert_equal(a.wildcard_mask, "0.255.255.255")
+
+    a = IPAddr.new("192.168.1.2/16")
+    assert_equal(a.wildcard_mask, "0.0.255.255")
+
+    a = IPAddr.new("192.168.1.2/24")
+    assert_equal(a.wildcard_mask, "0.0.0.255")
+
+    a = IPAddr.new("192.168.1.2/32")
+    assert_equal(a.wildcard_mask, "0.0.0.0")
+
+    a = IPAddr.new("3ffe:505:2::/48")
+    assert_equal(a.wildcard_mask, "0000:0000:0000:ffff:ffff:ffff:ffff:ffff")
+
+    a = IPAddr.new("3ffe:505:2::/128")
+    assert_equal(a.wildcard_mask, "0000:0000:0000:0000:0000:0000:0000:0000")
+  end
+
   def test_zone_id
     a = IPAddr.new("192.168.1.2")
     assert_raise(IPAddr::InvalidAddressError) { a.zone_id = '%ab0' }
@@ -335,6 +399,46 @@ def test_carrot
     assert_equal("::", @in6_addr_any.to_s)
   end
 
+  def test_plus
+    a = IPAddr.new("192.168.1.10")
+    assert_equal("192.168.1.20", (a + 10).to_s)
+
+    a = IPAddr.new("0.0.0.0")
+    assert_equal("0.0.0.10", (a + 10).to_s)
+
+    a = IPAddr.new("255.255.255.255")
+    assert_raise(IPAddr::InvalidAddressError) { a + 10 }
+
+    a = IPAddr.new("3ffe:505:2::a")
+    assert_equal("3ffe:505:2::14", (a + 10).to_s)
+
+    a = IPAddr.new("::")
+    assert_equal("::a", (a + 10).to_s)
+
+    a = IPAddr.new("ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff")
+    assert_raise(IPAddr::InvalidAddressError) { a + 10 }
+  end
+
+  def test_minus
+    a = IPAddr.new("192.168.1.10")
+    assert_equal("192.168.1.0", (a - 10).to_s)
+
+    a = IPAddr.new("0.0.0.0")
+    assert_raise(IPAddr::InvalidAddressError) { a - 10 }
+
+    a = IPAddr.new("255.255.255.255")
+    assert_equal("255.255.255.245", (a - 10).to_s)
+
+    a = IPAddr.new("3ffe:505:2::a")
+    assert_equal("3ffe:505:2::", (a - 10).to_s)
+
+    a = IPAddr.new("::")
+    assert_raise(IPAddr::InvalidAddressError) { a - 10 }
+
+    a = IPAddr.new("ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff")
+    assert_equal("ffff:ffff:ffff:ffff:ffff:ffff:ffff:fff5", (a - 10).to_s)
+  end
+
   def test_equal
     assert_equal(true, @a == IPAddr.new("3FFE:505:2::"))
     assert_equal(true, @a == IPAddr.new("3ffe:0505:0002::"))
@@ -396,6 +500,12 @@ def test_loopback?
     assert_equal(true,  IPAddr.new('::1').loopback?)
     assert_equal(false, IPAddr.new('::').loopback?)
     assert_equal(false, IPAddr.new('3ffe:505:2::1').loopback?)
+
+    assert_equal(true,  IPAddr.new('::ffff:127.0.0.1').loopback?)
+    assert_equal(true,  IPAddr.new('::ffff:127.127.1.1').loopback?)
+    assert_equal(false, IPAddr.new('::ffff:0.0.0.0').loopback?)
+    assert_equal(false, IPAddr.new('::ffff:192.168.2.0').loopback?)
+    assert_equal(false, IPAddr.new('::ffff:255.0.0.0').loopback?)
   end
 
   def test_private?
@@ -463,6 +573,15 @@ def test_link_local?
     assert_equal(false, IPAddr.new('fb84:8bf7:e905::1').link_local?)
 
     assert_equal(true,  IPAddr.new('fe80::dead:beef:cafe:1234').link_local?)
+
+    assert_equal(false, IPAddr.new('::ffff:0.0.0.0').link_local?)
+    assert_equal(false, IPAddr.new('::ffff:127.0.0.1').link_local?)
+    assert_equal(false, IPAddr.new('::ffff:10.0.0.0').link_local?)
+    assert_equal(false, IPAddr.new('::ffff:172.16.0.0').link_local?)
+    assert_equal(false, IPAddr.new('::ffff:192.168.0.0').link_local?)
+
+    assert_equal(true,  IPAddr.new('::ffff:169.254.1.1').link_local?)
+    assert_equal(true,  IPAddr.new('::ffff:169.254.254.255').link_local?)
   end
 
   def test_hash
diff --git a/test/test_mutex_m.rb b/test/test_mutex_m.rb
deleted file mode 100644
index f938e7172993af..00000000000000
--- a/test/test_mutex_m.rb
+++ /dev/null
@@ -1,79 +0,0 @@
-# frozen_string_literal: false
-require 'test/unit'
-require 'mutex_m'
-
-class TestMutexM < Test::Unit::TestCase
-  def test_cv_wait
-    o = Object.new
-    o.instance_variable_set(:@foo, nil)
-    o.extend(Mutex_m)
-    c = Thread::ConditionVariable.new
-    t = Thread.start {
-      o.synchronize do
-        until foo = o.instance_variable_get(:@foo)
-          c.wait(o)
-        end
-        foo
-      end
-    }
-    sleep(0.0001)
-    o.synchronize do
-      o.instance_variable_set(:@foo, "abc")
-    end
-    c.signal
-    assert_equal "abc", t.value
-  end
-
-  class KeywordInitializeParent
-    def initialize(x:)
-    end
-  end
-
-  class KeywordInitializeChild < KeywordInitializeParent
-    include Mutex_m
-    def initialize
-      super(x: 1)
-    end
-  end
-
-  def test_initialize_with_keyword_arg
-    assert KeywordInitializeChild.new
-  end
-
-  class NoArgInitializeParent
-    def initialize
-    end
-  end
-
-  class NoArgInitializeChild < NoArgInitializeParent
-    include Mutex_m
-    def initialize
-      super()
-    end
-  end
-
-  def test_initialize_no_args
-    assert NoArgInitializeChild.new
-  end
-
-  def test_alias_extended_object
-    object = Object.new
-    object.extend(Mutex_m)
-
-    assert object.respond_to?(:locked?)
-    assert object.respond_to?(:lock)
-    assert object.respond_to?(:unlock)
-    assert object.respond_to?(:try_lock)
-    assert object.respond_to?(:synchronize)
-  end
-
-  def test_alias_included_class
-    object = NoArgInitializeChild.new
-
-    assert object.respond_to?(:locked?)
-    assert object.respond_to?(:lock)
-    assert object.respond_to?(:unlock)
-    assert object.respond_to?(:try_lock)
-    assert object.respond_to?(:synchronize)
-  end
-end
diff --git a/test/test_observer.rb b/test/test_observer.rb
deleted file mode 100644
index 8f8f24b3c59579..00000000000000
--- a/test/test_observer.rb
+++ /dev/null
@@ -1,66 +0,0 @@
-# frozen_string_literal: true
-require 'test/unit'
-require 'observer'
-
-class TestObserver < Test::Unit::TestCase
-  class TestObservable
-    include Observable
-
-    def notify(*args)
-      changed
-      notify_observers(*args)
-    end
-  end
-
-  class TestWatcher
-    def initialize(observable)
-      @notifications = []
-      observable.add_observer(self)
-    end
-
-    attr_reader :notifications
-
-    def update(*args)
-      @notifications << args
-    end
-  end
-
-  def test_observers
-    observable = TestObservable.new
-
-    assert_equal(0, observable.count_observers)
-
-    watcher1 = TestWatcher.new(observable)
-
-    assert_equal(1, observable.count_observers)
-
-    observable.notify("test", 123)
-
-    watcher2 = TestWatcher.new(observable)
-
-    assert_equal(2, observable.count_observers)
-
-    observable.notify(42)
-
-    assert_equal([["test", 123], [42]], watcher1.notifications)
-    assert_equal([[42]], watcher2.notifications)
-
-    observable.delete_observer(watcher1)
-
-    assert_equal(1, observable.count_observers)
-
-    observable.notify(:cats)
-
-    assert_equal([["test", 123], [42]], watcher1.notifications)
-    assert_equal([[42], [:cats]], watcher2.notifications)
-
-    observable.delete_observers
-
-    assert_equal(0, observable.count_observers)
-
-    observable.notify("nope")
-
-    assert_equal([["test", 123], [42]], watcher1.notifications)
-    assert_equal([[42], [:cats]], watcher2.notifications)
-  end
-end
diff --git a/test/test_pp.rb b/test/test_pp.rb
index bb2299a3fa07fa..c71445c9bc90ee 100644
--- a/test/test_pp.rb
+++ b/test/test_pp.rb
@@ -28,6 +28,17 @@ def o.method
     end
     assert_equal(%(""\n), PP.pp(o, "".dup))
   end
+
+  def test_range
+    assert_equal("0..1\n", PP.pp(0..1, "".dup))
+    assert_equal("0...1\n", PP.pp(0...1, "".dup))
+    assert_equal("0...\n", PP.pp(0..., "".dup))
+    assert_equal("...1\n", PP.pp(...1, "".dup))
+    assert_equal("..false\n", PP.pp(..false, "".dup))
+    assert_equal("false..\n", PP.pp(false.., "".dup))
+    assert_equal("false..false\n", PP.pp(false..false, "".dup))
+    assert_equal("nil..nil\n", PP.pp(nil..nil, "".dup))
+  end
 end
 
 class HasInspect
@@ -118,6 +129,11 @@ def a.to_s() "aaa" end
     result = PP.pp(a, ''.dup)
     assert_equal("#{a.inspect}\n", result)
   end
+
+  def test_basic_object
+    a = BasicObject.new
+    assert_match(/\A#<BasicObject:0x[\da-f]+>\n\z/, PP.pp(a, ''.dup))
+  end
 end
 
 class PPCycleTest < Test::Unit::TestCase
@@ -131,7 +147,6 @@ def test_array
   def test_hash
     a = {}
     a[0] = a
-    assert_equal("{0=>{...}}\n", PP.pp(a, ''.dup))
     assert_equal("#{a.inspect}\n", PP.pp(a, ''.dup))
   end
 
@@ -140,15 +155,34 @@ def test_struct
     a = S.new(1,2)
     a.b = a
     assert_equal("#<struct Struct::S a=1, b=#<struct Struct::S:...>>\n", PP.pp(a, ''.dup))
-    assert_equal("#{a.inspect}\n", PP.pp(a, ''.dup))
+    assert_equal("#{a.inspect}\n", PP.pp(a, ''.dup)) unless RUBY_ENGINE == "truffleruby"
   end
 
-  if "3.2" <= RUBY_VERSION
+  if defined?(Data.define)
     D = Data.define(:aaa, :bbb)
     def test_data
       a = D.new("aaa", "bbb")
       assert_equal("#<data PPTestModule::PPCycleTest::D\n aaa=\"aaa\",\n bbb=\"bbb\">\n", PP.pp(a, ''.dup, 20))
       assert_equal("#{a.inspect}\n", PP.pp(a, ''.dup))
+
+      b = Data.define(:a).new(42)
+      assert_equal("#{b.inspect}\n", PP.pp(b, ''.dup))
+    end
+
+    D2 = Data.define(:aaa, :bbb) do
+      private :aaa
+    end
+    def test_data_private_member
+      a = D2.new("aaa", "bbb")
+      assert_equal("#<data PPTestModule::PPCycleTest::D2\n aaa=\"aaa\",\n bbb=\"bbb\">\n", PP.pp(a, ''.dup, 20))
+    end
+
+    D3 = Data.define(:aaa, :bbb) do
+      remove_method :aaa
+    end
+    def test_data_removed_member
+      a = D3.new("aaa", "bbb")
+      assert_equal("#<data PPTestModule::PPCycleTest::D3\n bbb=\"bbb\">\n", PP.pp(a, ''.dup, 20))
     end
   end
 
@@ -164,7 +198,7 @@ def test_anonymous
   end
 
   def test_withinspect
-    omit if RUBY_ENGINE == "jruby"
+    omit if RUBY_ENGINE == "jruby" or RUBY_ENGINE == "truffleruby"
     a = []
     a << HasInspect.new(a)
     assert_equal("[<inspect:[...]>]\n", PP.pp(a, ''.dup))
@@ -184,15 +218,47 @@ def test_share_nil
 
 class PPSingleLineTest < Test::Unit::TestCase
   def test_hash
-    assert_equal("{1=>1}", PP.singleline_pp({ 1 => 1}, ''.dup)) # [ruby-core:02699]
+    assert_equal({1 => 1}.inspect, PP.singleline_pp({1 => 1}, ''.dup)) # [ruby-core:02699]
     assert_equal("[1#{', 1'*99}]", PP.singleline_pp([1]*100, ''.dup))
   end
 
+  def test_hash_symbol_colon_key
+    omit if RUBY_VERSION < "3.4."
+    no_quote = "{a: 1, a!: 1, a?: 1}"
+    unicode_quote = "{\u{3042}: 1}"
+    quote0 = '{"": 1}'
+    quote1 = '{"0": 1, "!": 1, "%": 1, "&": 1, "*": 1, "+": 1, "-": 1, "/": 1, "<": 1, ">": 1, "^": 1, "`": 1, "|": 1, "~": 1}'
+    quote2 = '{"@a": 1, "$a": 1, "+@": 1, "a=": 1, "[]": 1}'
+    quote3 = '{"a\"b": 1, "@@a": 1, "<=>": 1, "===": 1, "[]=": 1}'
+    assert_equal(no_quote, PP.singleline_pp(eval(no_quote), ''.dup))
+    assert_equal({ "\u3042": 1 }.inspect, PP.singleline_pp(eval(unicode_quote), ''.dup))
+    assert_equal(quote0, PP.singleline_pp(eval(quote0), ''.dup))
+    assert_equal(quote1, PP.singleline_pp(eval(quote1), ''.dup))
+    assert_equal(quote2, PP.singleline_pp(eval(quote2), ''.dup))
+    assert_equal(quote3, PP.singleline_pp(eval(quote3), ''.dup))
+  end
+
   def test_hash_in_array
     omit if RUBY_ENGINE == "jruby"
     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
+
+  def test_direct_pp
+    buffer = String.new
+
+    a = []
+    a << a
+
+    # Isolate the test from any existing Thread.current[:__recursive_key__][:inspect].
+    Thread.new do
+      q = PP::SingleLine.new(buffer)
+      q.pp(a)
+      q.flush
+    end.join
+
+    assert_equal("[[...]]", buffer)
+  end
 end
 
 class PPDelegateTest < Test::Unit::TestCase
@@ -228,10 +294,37 @@ class PPAbstractSyntaxTree < Test::Unit::TestCase
     AST = RubyVM::AbstractSyntaxTree
     def test_lasgn_literal
       ast = AST.parse("_=1")
-      expected = "(SCOPE@1:0-1:3 tbl: [:_] args: nil body: (LASGN@1:0-1:3 :_ (LIT@1:2-1:3 1)))"
+      integer = RUBY_VERSION >= "3.4." ? "INTEGER" : "LIT"
+      expected = "(SCOPE@1:0-1:3 tbl: [:_] args: nil body: (LASGN@1:0-1:3 :_ (#{integer}@1:2-1:3 1)))"
       assert_equal(expected, PP.singleline_pp(ast, ''.dup), ast)
     end
   end
 end
 
+class PPInheritedTest < Test::Unit::TestCase
+  class PPSymbolHash < PP
+    def pp_hash_pair(k, v)
+      case k
+      when Symbol
+        text k.inspect.delete_prefix(":").tr('"', "'")
+        text ":"
+        group(1) {
+          breakable
+          pp v
+        }
+      else
+        super
+      end
+    end
+  end
+
+  def test_hash_override
+    obj = {k: 1, "": :null, "0": :zero, 100 => :ten}
+    sep = RUBY_VERSION >= "3.4." ? " => " : "=>"
+    assert_equal <<~EXPECT, PPSymbolHash.pp(obj, "".dup)
+    {k: 1, '': :null, '0': :zero, 100#{sep}:ten}
+    EXPECT
+  end
+end
+
 end
diff --git a/test/test_pstore.rb b/test/test_pstore.rb
deleted file mode 100644
index 7dfbdca367a8f5..00000000000000
--- a/test/test_pstore.rb
+++ /dev/null
@@ -1,182 +0,0 @@
-# frozen_string_literal: true
-require 'test/unit'
-require 'pstore'
-require 'tmpdir'
-
-class PStoreTest < Test::Unit::TestCase
-  def setup
-    @pstore_file = File.join(Dir.tmpdir, "pstore.tmp.#{Process.pid}")
-    @pstore = PStore.new(@pstore_file)
-  end
-
-  def teardown
-    File.unlink(@pstore_file) rescue nil
-  end
-
-  def test_opening_new_file_in_readonly_mode_should_result_in_empty_values
-    @pstore.transaction(true) do
-      assert_nil @pstore[:foo]
-      assert_nil @pstore[:bar]
-    end
-  end
-
-  def test_opening_new_file_in_readwrite_mode_should_result_in_empty_values
-    @pstore.transaction do
-      assert_nil @pstore[:foo]
-      assert_nil @pstore[:bar]
-    end
-  end
-
-  def test_data_should_be_loaded_correctly_when_in_readonly_mode
-    @pstore.transaction do
-      @pstore[:foo] = "bar"
-    end
-    @pstore.transaction(true) do
-      assert_equal "bar", @pstore[:foo]
-    end
-  end
-
-  def test_data_should_be_loaded_correctly_when_in_readwrite_mode
-    @pstore.transaction do
-      @pstore[:foo] = "bar"
-    end
-    @pstore.transaction do
-      assert_equal "bar", @pstore[:foo]
-    end
-  end
-
-  def test_changes_after_commit_are_discarded
-    @pstore.transaction do
-      @pstore[:foo] = "bar"
-      @pstore.commit
-      @pstore[:foo] = "baz"
-    end
-    @pstore.transaction(true) do
-      assert_equal "bar", @pstore[:foo]
-    end
-  end
-
-  def test_changes_are_not_written_on_abort
-    @pstore.transaction do
-      @pstore[:foo] = "bar"
-      @pstore.abort
-    end
-    @pstore.transaction(true) do
-      assert_nil @pstore[:foo]
-    end
-  end
-
-  def test_writing_inside_readonly_transaction_raises_error
-    assert_raise(PStore::Error) do
-      @pstore.transaction(true) do
-        @pstore[:foo] = "bar"
-      end
-    end
-  end
-
-  def test_thread_safe
-    q1 = Thread::Queue.new
-    assert_raise(PStore::Error) do
-      th = Thread.new do
-        @pstore.transaction do
-          @pstore[:foo] = "bar"
-          q1.push true
-          sleep
-        end
-      end
-      begin
-        q1.pop
-        @pstore.transaction {}
-      ensure
-        th.kill
-        th.join
-      end
-    end
-    q2 = Thread::Queue.new
-    begin
-      pstore = PStore.new(second_file, true)
-      cur = Thread.current
-      th = Thread.new do
-        pstore.transaction do
-          pstore[:foo] = "bar"
-          q1.push true
-          q2.pop
-          # wait for cur to enter a transaction
-          sleep 0.1 until cur.stop?
-        end
-      end
-      begin
-        q1.pop
-        q2.push true
-        assert_equal("bar", pstore.transaction { pstore[:foo] })
-      ensure
-        th.join
-      end
-    end
-  ensure
-    File.unlink(second_file) rescue nil
-  end
-
-  def test_nested_transaction_raises_error
-    assert_raise(PStore::Error) do
-      @pstore.transaction { @pstore.transaction { } }
-    end
-    pstore = PStore.new(second_file, true)
-    assert_raise(PStore::Error) do
-      pstore.transaction { pstore.transaction { } }
-    end
-  ensure
-    File.unlink(second_file) rescue nil
-  end
-
-  # Test that PStore's file operations do not blow up when default encodings are set
-  def test_pstore_files_are_accessed_as_binary_files
-    bug5311 = '[ruby-core:39503]'
-    n = 128
-    assert_in_out_err(["-Eutf-8:utf-8", "-rpstore", "-", @pstore_file], <<-SRC, [bug5311], [], bug5311, timeout: 30)
-      @pstore = PStore.new(ARGV[0])
-      (1..#{n}).each do |i|
-        @pstore.transaction {@pstore["Key\#{i}"] = "value \#{i}"}
-      end
-      @pstore.transaction {@pstore["Bug5311"] = '#{bug5311}'}
-      puts @pstore.transaction {@pstore["Bug5311"]}
-    SRC
-    assert_equal(bug5311, @pstore.transaction {@pstore["Bug5311"]}, bug5311)
-  end
-
-  def test_key_p
-    [:key?, :root?].each do |method|
-      clear_store
-      @pstore.transaction do
-        @pstore[:foo] = 0
-        assert_equal(true, @pstore.send(method, :foo))
-        assert_equal(false, @pstore.send(method, :bar))
-      end
-    end
-  end
-
-  def test_keys
-    [:keys, :roots].each do |method|
-      clear_store
-      @pstore.transaction do
-        assert_equal([], @pstore.send(method))
-      end
-      @pstore.transaction do
-        @pstore[:foo] = 0
-        assert_equal([:foo], @pstore.send(method))
-      end
-    end
-  end
-
-  def clear_store
-    @pstore.transaction do
-      @pstore.keys.each do |key|
-        @pstore.delete(key)
-      end
-    end
-  end
-
-  def second_file
-    File.join(Dir.tmpdir, "pstore.tmp2.#{Process.pid}")
-  end
-end
diff --git a/test/test_pty.rb b/test/test_pty.rb
index 1c0c6fb3e87361..81b0d394ff2bef 100644
--- a/test/test_pty.rb
+++ b/test/test_pty.rb
@@ -12,7 +12,7 @@ class TestPTY < Test::Unit::TestCase
   RUBY = EnvUtil.rubybin
 
   def test_spawn_without_block
-    r, w, pid = PTY.spawn(RUBY, '-e', 'puts "a"')
+    r, w, pid = PTY.spawn(RUBY, '-e', 'puts "a"; sleep 0.1')
   rescue RuntimeError
     omit $!
   else
@@ -24,7 +24,7 @@ def test_spawn_without_block
   end
 
   def test_spawn_with_block
-    PTY.spawn(RUBY, '-e', 'puts "b"') {|r,w,pid|
+    PTY.spawn(RUBY, '-e', 'puts "b"; sleep 0.1') {|r,w,pid|
       begin
         assert_equal("b\r\n", r.gets)
       ensure
@@ -38,7 +38,7 @@ def test_spawn_with_block
   end
 
   def test_commandline
-    commandline = Shellwords.join([RUBY, '-e', 'puts "foo"'])
+    commandline = Shellwords.join([RUBY, '-e', 'puts "foo"; sleep 0.1'])
     PTY.spawn(commandline) {|r,w,pid|
       begin
         assert_equal("foo\r\n", r.gets)
@@ -53,7 +53,7 @@ def test_commandline
   end
 
   def test_argv0
-    PTY.spawn([RUBY, "argv0"], '-e', 'puts "bar"') {|r,w,pid|
+    PTY.spawn([RUBY, "argv0"], '-e', 'puts "bar"; sleep 0.1') {|r,w,pid|
       begin
         assert_equal("bar\r\n", r.gets)
       ensure
diff --git a/test/test_rbconfig.rb b/test/test_rbconfig.rb
index 1bbf01b9a6863c..e01264762daf5f 100644
--- a/test/test_rbconfig.rb
+++ b/test/test_rbconfig.rb
@@ -51,4 +51,19 @@ def test_vendorarchdirs
       assert_match(/\$\(sitearch|\$\(rubysitearchprefix\)/, val, "#{key} #{bug7823}")
     end
   end
+
+  def test_limits_and_sizeof_access_in_ractor
+    assert_separately(["-W0"], <<~'RUBY')
+      r = Ractor.new do
+        sizeof_int = RbConfig::SIZEOF["int"]
+        fixnum_max = RbConfig::LIMITS["FIXNUM_MAX"]
+        [sizeof_int, fixnum_max]
+      end
+
+      sizeof_int, fixnum_max = r.value
+
+      assert_kind_of Integer, sizeof_int, "RbConfig::SIZEOF['int'] should be an Integer"
+      assert_kind_of Integer, fixnum_max, "RbConfig::LIMITS['FIXNUM_MAX'] should be an Integer"
+    RUBY
+  end if defined?(Ractor)
 end
diff --git a/test/test_securerandom.rb b/test/test_securerandom.rb
index e4a0e17365e55a..765fbc9e0d1b58 100644
--- a/test/test_securerandom.rb
+++ b/test/test_securerandom.rb
@@ -1,20 +1,23 @@
 # frozen_string_literal: false
 require 'test/unit'
 require 'securerandom'
-require_relative 'ruby/test_random_formatter'
 
 # This testcase does NOT aim to test cryptographically strongness and randomness.
 class TestSecureRandom < Test::Unit::TestCase
-  include Random::Formatter::FormatterTest
-  include Random::Formatter::NotDefaultTest
 
   def setup
     @it = SecureRandom
   end
 
-# This test took 2 minutes on my machine.
-# And 65536 times loop could not be enough for forcing PID recycle.
-if false
+  def test_alphanumeric_with_chars
+    assert_nothing_raised(ArgumentError) do
+      @it.alphanumeric(1, chars: ("0".."9").to_a)
+    end
+  end
+
+  # This test took 2 minutes on my machine.
+  # And 65536 times loop could not be enough for forcing PID recycle.
+  # TODO: We should run this test only on GitHub Actions.
   def test_s_random_bytes_is_fork_safe
     begin
       require 'openssl'
@@ -24,7 +27,7 @@ def test_s_random_bytes_is_fork_safe
     SecureRandom.random_bytes(8)
     pid, v1 = forking_random_bytes
     assert(check_forking_random_bytes(pid, v1), 'Process ID not recycled?')
-  end
+  end if false # ENV["CI"] && RUBY_PLATFORM =~ /darwin/ && `sw_vers -productVersion`.to_i > 13 # for Apple Silicon
 
   def forking_random_bytes
     r, w = IO.pipe
@@ -41,7 +44,7 @@ def forking_random_bytes
   end
 
   def check_forking_random_bytes(target_pid, target)
-    65536.times do
+    (65536 * 1.5).to_i.times do
       pid = fork {
         if $$ == target_pid
           v2 = SecureRandom.random_bytes(8)
@@ -63,7 +66,6 @@ def check_forking_random_bytes(target_pid, target)
     end
     false # not recycled?
   end
-end
 
   def test_with_openssl
     begin
diff --git a/test/test_shellwords.rb b/test/test_shellwords.rb
index 86971b7237b46d..0020235fddb792 100644
--- a/test/test_shellwords.rb
+++ b/test/test_shellwords.rb
@@ -128,4 +128,13 @@ def test_multibyte_characters
     # used as shell meta-character that needs to be escaped.
     assert_equal "\\あ\\い", "あい".shellescape
   end
+
+  def test_nul_char
+    assert_raise(ArgumentError) do
+      shellescape("\0")
+    end
+    assert_raise(ArgumentError) do
+      shelljoin(["\0"])
+    end
+  end
 end
diff --git a/test/test_syslog.rb b/test/test_syslog.rb
deleted file mode 100644
index 842ae8df49f917..00000000000000
--- a/test/test_syslog.rb
+++ /dev/null
@@ -1,193 +0,0 @@
-# frozen_string_literal: false
-# Please only run this test on machines reasonable for testing.
-# If in doubt, ask your admin.
-
-require 'test/unit'
-
-begin
-  require 'syslog'
-rescue LoadError
-  # suppress error messages.
-end
-
-class TestSyslog < Test::Unit::TestCase
-  def test_new
-    assert_raise(NoMethodError) {
-      Syslog.new
-    }
-  end
-
-  def test_instance
-    sl1 = Syslog.instance
-    sl2 = Syslog.open
-    sl3 = Syslog.instance
-
-    assert_equal(Syslog, sl1)
-    assert_equal(Syslog, sl2)
-    assert_equal(Syslog, sl3)
-  ensure
-    Syslog.close if Syslog.opened?
-  end
-
-  def test_open
-    # default parameters
-    Syslog.open
-
-    assert_equal($0, Syslog.ident)
-    assert_equal(Syslog::LOG_PID | Syslog::LOG_CONS, Syslog.options)
-    assert_equal(Syslog::LOG_USER, Syslog.facility)
-
-    # open without close
-    assert_raise(RuntimeError) {
-      Syslog.open
-    }
-
-    Syslog.close
-
-    # given parameters
-    options = Syslog::LOG_NDELAY | Syslog::LOG_PID
-    Syslog.open("foo", options, Syslog::LOG_DAEMON)
-
-    assert_equal('foo', Syslog.ident)
-    assert_equal(options, Syslog.options)
-    assert_equal(Syslog::LOG_DAEMON, Syslog.facility)
-
-    Syslog.close
-
-    # default parameters again (after close)
-    Syslog.open
-    Syslog.close
-
-    assert_equal(nil, Syslog.ident)
-    assert_equal(nil, Syslog.options)
-    assert_equal(nil, Syslog.facility)
-
-    # block
-    param = nil
-    Syslog.open { |syslog|
-      param = syslog
-    }
-    assert_equal(Syslog, param)
-  ensure
-    Syslog.close if Syslog.opened?
-  end
-
-  def test_opened?
-    assert_equal(false, Syslog.opened?)
-
-    Syslog.open
-    assert_equal(true, Syslog.opened?)
-
-    Syslog.close
-    assert_equal(false, Syslog.opened?)
-
-    Syslog.open {
-      assert_equal(true, Syslog.opened?)
-    }
-
-    assert_equal(false, Syslog.opened?)
-  end
-
-  def test_close
-    assert_raise(RuntimeError) {
-      Syslog.close
-    }
-  end
-
-  def test_mask
-    assert_equal(nil, Syslog.mask)
-
-    Syslog.open
-
-    orig = Syslog.mask
-
-    Syslog.mask = Syslog.LOG_UPTO(Syslog::LOG_ERR)
-    assert_equal(Syslog.LOG_UPTO(Syslog::LOG_ERR), Syslog.mask)
-
-    Syslog.mask = Syslog.LOG_MASK(Syslog::LOG_CRIT)
-    assert_equal(Syslog.LOG_MASK(Syslog::LOG_CRIT), Syslog.mask)
-
-    Syslog.mask = orig
-  ensure
-    Syslog.close if Syslog.opened?
-  end
-
-  def syslog_line_regex(ident, message)
-    /(?:^| )#{Regexp.quote(ident)}(?:\[([1-9][0-9]*)\])?(?: | ([1-9][0-9]*) - - ||[: ].* )#{Regexp.quote(message)}$/
-  end
-
-  def test_log
-    IO.pipe {|stderr|
-      pid = fork {
-        stderr[0].close
-        STDERR.reopen(stderr[1])
-        stderr[1].close
-
-        options = Syslog::LOG_PERROR | Syslog::LOG_NDELAY
-
-        Syslog.open("syslog_test", options) { |sl|
-          sl.log(Syslog::LOG_NOTICE, "test1 - hello, %s!", "world")
-          sl.notice("test1 - hello, %s!", "world")
-        }
-
-        Syslog.open("syslog_test", options | Syslog::LOG_PID) { |sl|
-          sl.log(Syslog::LOG_CRIT, "test2 - pid")
-          sl.crit("test2 - pid")
-        }
-        exit!
-      }
-
-      stderr[1].close
-      Process.waitpid(pid)
-
-      # LOG_PERROR is not implemented on Cygwin or Solaris.  Only test
-      # these on systems that define it.
-      return unless Syslog.const_defined?(:LOG_PERROR)
-      # LOG_PERROR is defined but not supported yet on Android.
-      return if RUBY_PLATFORM =~ /android/
-
-      2.times {
-        re = syslog_line_regex("syslog_test", "test1 - hello, world!")
-        line = stderr[0].gets
-        # In AIX, each LOG_PERROR output line has an appended empty line.
-        if /aix/ =~ RUBY_PLATFORM && line =~ /^$/
-          line = stderr[0].gets
-        end
-        m = re.match(line)
-        assert_not_nil(m)
-        if m[1]
-          # pid is written regardless of LOG_PID on OS X 10.7+
-          assert_equal(pid, m[1].to_i)
-        end
-      }
-
-      2.times {
-        re = syslog_line_regex("syslog_test", "test2 - pid")
-        line = stderr[0].gets
-        # In AIX, each LOG_PERROR output line has an appended empty line.
-        if /aix/ =~ RUBY_PLATFORM && line =~ /^$/
-          line = stderr[0].gets
-        end
-        m = re.match(line)
-        assert_not_nil(m)
-        output_pid = m[1] || m[2]
-        assert_not_nil(output_pid)
-        assert_equal(pid, output_pid.to_i)
-      }
-    }
-  end
-
-  def test_inspect
-    Syslog.open { |sl|
-      assert_equal(format('<#%s: opened=true, ident="%s", options=%d, facility=%d, mask=%d>',
-          Syslog,
-          sl.ident,
-          sl.options,
-          sl.facility,
-          sl.mask),
-        sl.inspect)
-    }
-
-    assert_equal(format('<#%s: opened=false>', Syslog), Syslog.inspect)
-  end
-end if defined?(Syslog)
diff --git a/test/test_tempfile.rb b/test/test_tempfile.rb
index 87c1241df85f0f..8077cc3603f8b7 100644
--- a/test/test_tempfile.rb
+++ b/test/test_tempfile.rb
@@ -3,6 +3,8 @@
 require 'tempfile'
 
 class TestTempfile < Test::Unit::TestCase
+  LIB_TEMPFILE_RB_PATH = File.expand_path(__dir__ + "/../lib/tempfile.rb")
+
   def initialize(*)
     super
     @tempfile = nil
@@ -19,7 +21,7 @@ def teardown
     end
   end
 
-  def test_leackchecker
+  def test_leakchecker
     assert_instance_of(Tempfile, Tempfile.allocate)
   end
 
@@ -63,6 +65,22 @@ def test_basename_with_suffix
     assert_match(/\.txt$/, File.basename(t.path))
   end
 
+  def test_dup
+    t = tempfile
+    t2 = t.dup
+    t2.close
+    assert_equal true, t2.closed?
+    assert_equal false, t.closed?
+  end
+
+  def test_clone
+    t = tempfile
+    t2 = t.clone
+    t2.close
+    assert_equal true, t2.closed?
+    assert_equal false, t.closed?
+  end
+
   def test_unlink
     t = tempfile("foo")
     path = t.path
@@ -156,8 +174,40 @@ def test_close_bang_does_not_unlink_if_already_unlinked
     end
   end unless /mswin|mingw/ =~ RUBY_PLATFORM
 
+  def test_finalizer_removes_file
+    assert_in_out_err("-r#{LIB_TEMPFILE_RB_PATH}", <<~RUBY) do |(filename,*), (error,*)|
+      file = Tempfile.new("foo")
+      puts file.path
+    RUBY
+      assert_file.not_exist?(filename)
+      assert_nil error
+    end
+  end
+
+  def test_finalizer_removes_file_when_dup
+    assert_in_out_err("-r#{LIB_TEMPFILE_RB_PATH}", <<~RUBY) do |(filename,*), (error,*)|
+      file = Tempfile.new("foo")
+      file.dup
+      puts file.path
+    RUBY
+      assert_file.not_exist?(filename)
+      assert_nil error
+    end
+  end
+
+  def test_finalizer_removes_file_when_clone
+    assert_in_out_err("-r#{LIB_TEMPFILE_RB_PATH}", <<~RUBY) do |(filename,*), (error,*)|
+      file = Tempfile.new("foo")
+      file.clone
+      puts file.path
+    RUBY
+      assert_file.not_exist?(filename)
+      assert_nil error
+    end
+  end
+
   def test_finalizer_does_not_unlink_if_already_unlinked
-    assert_in_out_err('-rtempfile', <<-'EOS') do |(filename,*), (error,*)|
+    assert_in_out_err("-r#{LIB_TEMPFILE_RB_PATH}", <<-'EOS') do |(filename,*), (error,*)|
 file = Tempfile.new('foo')
 path = file.path
 puts path
@@ -169,7 +219,7 @@ def test_finalizer_does_not_unlink_if_already_unlinked
       assert_nil error
     end
 
-    assert_in_out_err('-rtempfile', <<-'EOS') do |(filename,*), (error,*)|
+    assert_in_out_err("-r#{LIB_TEMPFILE_RB_PATH}", <<-'EOS') do |(filename,*), (error,*)|
 file = Tempfile.new('foo')
 path = file.path
 file.unlink
@@ -199,7 +249,7 @@ def test_close_flushes_buffer
   end
 
   def test_tempfile_is_unlinked_when_ruby_exits
-    assert_in_out_err('-rtempfile', <<-'EOS') do |(filename), (error)|
+    assert_in_out_err("-r#{LIB_TEMPFILE_RB_PATH}", <<-'EOS') do |(filename), (error)|
 puts Tempfile.new('foo').path
     EOS
       assert_file.for("tempfile must not be exist after GC.").not_exist?(filename)
@@ -209,7 +259,7 @@ def test_tempfile_is_unlinked_when_ruby_exits
 
   def test_tempfile_finalizer_does_not_run_if_unlinked
     bug8768 = '[ruby-core:56521] [Bug #8768]'
-    assert_in_out_err(%w(-rtempfile), <<-'EOS') do |(filename), (error)|
+    assert_in_out_err("-r#{LIB_TEMPFILE_RB_PATH}", <<-'EOS') do |(filename), (error)|
       tmp = Tempfile.new('foo')
       puts tmp.path
       tmp.close
@@ -362,6 +412,14 @@ def test_create_default_basename
     assert_file.not_exist?(path)
   end
 
+  def test_open
+    Tempfile.open {|f|
+      file = f.open
+      assert_kind_of File, file
+      assert_equal f.to_i, file.to_i
+    }
+  end
+
   def test_open_traversal_dir
     assert_mktmpdir_traversal do |traversal_path|
       t = Tempfile.open([traversal_path, 'foo'])
@@ -401,4 +459,53 @@ def assert_mktmpdir_traversal
       assert_not_send([File.absolute_path(actual), :start_with?, target])
     end
   end
+
+  def test_create_anonymous_without_block
+    t = Tempfile.create(anonymous: true)
+    assert_equal(File, t.class)
+    assert_equal(0600, t.stat.mode & 0777) unless /mswin|mingw/ =~ RUBY_PLATFORM
+    t.puts "foo"
+    t.rewind
+    assert_equal("foo\n", t.read)
+    t.close
+  ensure
+    t.close if t
+  end
+
+  def test_create_anonymous_with_block
+    result = Tempfile.create(anonymous: true) {|t|
+      assert_equal(File, t.class)
+      assert_equal(0600, t.stat.mode & 0777) unless /mswin|mingw/ =~ RUBY_PLATFORM
+      t.puts "foo"
+      t.rewind
+      assert_equal("foo\n", t.read)
+      :result
+    }
+    assert_equal(:result, result)
+  end
+
+  def test_create_anonymous_removes_file
+    Dir.mktmpdir {|d|
+      t = Tempfile.create("", d, anonymous: true)
+      t.close
+      assert_equal([], Dir.children(d))
+    }
+  end
+
+  def test_create_anonymous_path
+    Dir.mktmpdir {|d|
+      begin
+        t = Tempfile.create("", d, anonymous: true)
+        assert_equal(File.join(d, ""), t.path)
+      ensure
+        t.close if t
+      end
+    }
+  end
+
+  def test_create_anonymous_autoclose
+    Tempfile.create(anonymous: true) {|t|
+      assert_equal(true, t.autoclose?)
+    }
+  end
 end
diff --git a/test/test_time.rb b/test/test_time.rb
index 23e8e104a165fc..55964d02fc1e78 100644
--- a/test/test_time.rb
+++ b/test/test_time.rb
@@ -74,7 +74,7 @@ def test_rfc2822_nonlinear
   if defined?(Ractor)
     def test_rfc2822_ractor
       assert_ractor(<<~RUBY, require: 'time')
-        actual = Ractor.new { Time.rfc2822("Fri, 21 Nov 1997 09:55:06 -0600") }.take
+        actual = Ractor.new { Time.rfc2822("Fri, 21 Nov 1997 09:55:06 -0600") }.value
         assert_equal(Time.utc(1997, 11, 21, 9, 55, 6) + 6 * 3600, actual)
       RUBY
     end
diff --git a/test/test_timeout.rb b/test/test_timeout.rb
index 0a8dc45cc3e4d7..01156867b05609 100644
--- a/test/test_timeout.rb
+++ b/test/test_timeout.rb
@@ -19,6 +19,24 @@ def test_non_timing_out_code_is_successful
     end
   end
 
+  def test_allows_zero_seconds
+    assert_nothing_raised do
+      assert_equal :ok, Timeout.timeout(0){:ok}
+    end
+  end
+
+  def test_allows_nil_seconds
+    assert_nothing_raised do
+      assert_equal :ok, Timeout.timeout(nil){:ok}
+    end
+  end
+
+  def test_raise_for_neg_second
+    assert_raise(ArgumentError) do
+      Timeout.timeout(-1) { sleep(0.01) }
+    end
+  end
+
   def test_included
     c = Class.new do
       include Timeout
@@ -54,7 +72,7 @@ def test_nested_timeout
     a = nil
     assert_raise(Timeout::Error) do
       Timeout.timeout(0.1) {
-        Timeout.timeout(1) {
+        Timeout.timeout(30) {
           nil while true
         }
         a = 1
@@ -63,10 +81,46 @@ def test_nested_timeout
     assert_nil a
   end
 
+  class MyNewErrorOuter < StandardError; end
+  class MyNewErrorInner < StandardError; end
+
+  # DOES NOT fail with
+  # -        raise new(message) if exc.equal?(e)
+  # +        raise new(message) if exc.class == e.class
+  def test_nested_timeout_error_identity
+    begin
+      Timeout.timeout(0.1, MyNewErrorOuter) {
+        Timeout.timeout(30, MyNewErrorInner) {
+          nil while true
+        }
+      }
+    rescue => e
+      assert e.class == MyNewErrorOuter
+    end
+  end
+
+  # DOES fail with
+  # -        raise new(message) if exc.equal?(e)
+  # +        raise new(message) if exc.class == e.class
+  def test_nested_timeout_which_error_bubbles_up
+    raised_exception = nil
+    begin
+      Timeout.timeout(0.1) {
+        Timeout.timeout(1) {
+          raise Timeout::ExitException.new("inner message")
+        }
+      }
+    rescue Exception => e
+      raised_exception = e
+    end
+
+    assert_equal 'inner message', raised_exception.message
+  end
+
   def test_cannot_convert_into_time_interval
     bug3168 = '[ruby-dev:41010]'
     def (n = Object.new).zero?; false; end
-    assert_raise(TypeError, bug3168) {Timeout.timeout(n) { sleep 0.1 }}
+    assert_raise(ArgumentError, bug3168) {Timeout.timeout(n) { sleep 0.1 }}
   end
 
   def test_skip_rescue_standarderror
diff --git a/test/test_tmpdir.rb b/test/test_tmpdir.rb
index 054ca15d7a7634..c91fc334ed73db 100644
--- a/test/test_tmpdir.rb
+++ b/test/test_tmpdir.rb
@@ -104,6 +104,22 @@ def test_mktmpdir_traversal_array
     end
   end
 
+  def test_mktmpdir_not_empty_parent
+    assert_raise(ArgumentError) do
+      Dir.mktmpdir("foo", "")
+    end
+
+    path = Struct.new(:to_path).new("")
+    assert_raise(ArgumentError) do
+      Dir.mktmpdir("foo", path)
+    end
+
+    Dir.mktmpdir do |d|
+      path = Struct.new(:to_path).new(d)
+      assert_operator(Dir.mktmpdir("prefix-", path), :start_with?, d + "/prefix-")
+    end
+  end
+
   def assert_mktmpdir_traversal
     Dir.mktmpdir do |target|
       target = target.chomp('/') + '/'
@@ -118,17 +134,32 @@ def assert_mktmpdir_traversal
 
   def test_ractor
     assert_ractor(<<~'end;', require: "tmpdir")
-      r = Ractor.new do
-        Dir.mktmpdir() do |d|
-          Ractor.yield d
-          Ractor.receive
+      if defined?(Ractor::Port)
+        port = Ractor::Port.new
+        r = Ractor.new port do |port|
+          Dir.mktmpdir() do |d|
+            port << d
+            Ractor.receive
+          end
+        end
+        dir = port.receive
+        assert_file.directory? dir
+        r.send true
+        r.join
+        assert_file.not_exist? dir
+      else
+        r = Ractor.new do
+          Dir.mktmpdir() do |d|
+            Ractor.yield d
+            Ractor.receive
+          end
         end
+        dir = r.take
+        assert_file.directory? dir
+        r.send true
+        r.take
+        assert_file.not_exist? dir
       end
-      dir = r.take
-      assert_file.directory? dir
-      r.send true
-      r.take
-      assert_file.not_exist? dir
     end;
   end
 end
diff --git a/test/test_trick.rb b/test/test_trick.rb
index 878d79e628b080..c5c19d079e7198 100644
--- a/test/test_trick.rb
+++ b/test/test_trick.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: false
+
 require "test/unit"
 require "ripper"
 require "envutil"
@@ -12,24 +14,24 @@ class TestTRICK2013 < Test::Unit::TestCase
   def test_kinaba
     src = File.join(__dir__, "../sample/trick2013/kinaba/entry.rb")
     expected = [*" ".."~"].join("") # all ASCII printables
-    assert_in_out_err(["-W0", src], "", [expected])
+    assert_in_out_err(["-W0", "--disable-frozen-string-literal", src], "", [expected])
     assert_equal(expected, File.read(src).chomp.chars.sort.join)
   end
 
   def test_mame
     src = File.join(__dir__, "../sample/trick2013/mame/entry.rb")
     ignore_dsp = "def open(_file, _mode); s = ''; def s.flush; self;end; yield s; end;"
-    assert_in_out_err(["-W0"], ignore_dsp + File.read(src), File.read(src).lines(chomp: true), timeout: 60)
+    assert_in_out_err(["-W0", "--disable-frozen-string-literal"], ignore_dsp + File.read(src), File.read(src).lines(chomp: true), timeout: 60)
   end
 
   def test_shinh
     src = File.join(__dir__, "../sample/trick2013/shinh/entry.rb")
-    assert_in_out_err(["-W0", src], "", [])
+    assert_in_out_err(["-W0", "--disable-frozen-string-literal", src], "", [])
   end
 
   def test_yhara
     src = File.join(__dir__, "../sample/trick2013/yhara/entry.rb")
-    assert_in_out_err(["-W0", src], "", ["JUST ANOTHER RUBY HACKER"])
+    assert_in_out_err(["-W0", "--disable-frozen-string-literal", src], "", ["JUST ANOTHER RUBY HACKER"])
   end
 end
 
@@ -45,7 +47,7 @@ def test_kinaba
     end
     pi = "3#{ a - b }"
 
-    assert_in_out_err(["-W0", src], "", [pi], timeout: 60)
+    assert_in_out_err(["-W0", "--disable-frozen-string-literal", src], "", [pi], timeout: 60)
     assert_equal(pi[0, 242], Ripper.tokenize(File.read(src)).grep(/\S/).map{|t|t.size%10}.join)
   end
 
@@ -60,7 +62,7 @@ def test_ksk_1
       s << n.to_s
     end
 
-    assert_in_out_err(["-W0", src, "27"], "", s)
+    assert_in_out_err(["-W0", "--disable-frozen-string-literal", src, "27"], "", s)
   end
 
   def test_monae
@@ -78,13 +80,13 @@ def test_monae
     end
     expected = /\A#{ expected.map {|s| "#{ Regexp.quote(s) }\s*\n" }.join }\z/
 
-    assert_in_out_err(["-W0", src], "", expected)
+    assert_in_out_err(["-W0", "--disable-frozen-string-literal", src], "", expected)
   end
 
   def test_eregon
     src = File.join(__dir__, "../sample/trick2015/eregon/entry.rb")
 
-    assert_in_out_err(["-W0", src], "", <<END.lines(chomp: true))
+    assert_in_out_err(["-W0", "--disable-frozen-string-literal", src], "", <<END.lines(chomp: true))
 1 9 4 2 3 8 7 6 5
 3 7 2 6 5 1 4 8 9
 8 5 6 7 4 9 2 3 1
@@ -123,7 +125,7 @@ def test_ksk_2
  1  3 0
 END
 
-    assert_in_out_err(["-W0", src], inp, ["s SATISFIABLE", "v 1 2 -3"])
+    assert_in_out_err(["-W0", "--disable-frozen-string-literal", src], inp, ["s SATISFIABLE", "v 1 2 -3"])
   end
 end
 
@@ -131,17 +133,17 @@ class TestTRICK2018 < Test::Unit::TestCase
   def test_01_kinaba
     src = File.join(__dir__, "../sample/trick2018/01-kinaba/entry.rb")
 
-    assert_in_out_err(["-W0", src], "", [])
+    assert_in_out_err(["-W0", "--disable-frozen-string-literal", src], "", [])
   end
 
   def test_02_mame
     src = File.join(__dir__, "../sample/trick2018/02-mame/entry.rb")
 
     ignore_sleep = "def sleep(_); end;"
-    assert_in_out_err(["-W0"], ignore_sleep + File.read(src)) do |stdout, _stderr, _status|
+    assert_in_out_err(["-W0", "--disable-frozen-string-literal"], ignore_sleep + File.read(src)) do |stdout, _stderr, _status|
       code = stdout.join("\n") + "\n"
       expected = code.lines(chomp: true)
-      assert_in_out_err(["-W0"], ignore_sleep + code, expected)
+      assert_in_out_err(["-W0", "--disable-frozen-string-literal"], ignore_sleep + code, expected)
     end
   end
 
@@ -149,7 +151,7 @@ def test_03_tompng
     src = File.join(__dir__, "../sample/trick2018/03-tompng/entry.rb")
 
     # only syntax check because it requires chunky_png
-    assert_in_out_err(["-W0", "-c", src], "", ["Syntax OK"])
+    assert_in_out_err(["-W0", "--disable-frozen-string-literal", "-c", src], "", ["Syntax OK"])
   end
 
   def test_04_colin
@@ -172,7 +174,7 @@ def test_04_colin
   end
 end
 END
-    assert_in_out_err(["-W0"], code, <<END.lines(chomp: true), encoding: "UTF-8")
+    assert_in_out_err(["-W0", "--disable-frozen-string-literal"], code, <<END.lines(chomp: true), encoding: "UTF-8")
 Math
     Addition
         One plus one equals two.
@@ -187,7 +189,7 @@ def test_05_tompng
     src = File.join(__dir__, "../sample/trick2018/05-tompng/entry.rb")
 
     # only syntax check because it generates 3D model data
-    assert_in_out_err(["-W0", "-c", src], "", ["Syntax OK"])
+    assert_in_out_err(["-W0", "--disable-frozen-string-literal", "-c", src], "", ["Syntax OK"])
   end
 end
 
@@ -196,21 +198,21 @@ def test_01_tompng
     src = File.join(__dir__, "../sample/trick2022/01-tompng/entry.rb")
 
     # only syntax check because it requires matrix
-    assert_in_out_err(["-W0", "-c", src], "", ["Syntax OK"])
+    assert_in_out_err(["-W0", "--disable-frozen-string-literal", "-c", src], "", ["Syntax OK"])
   end
 
   def test_02_tompng
     src = File.join(__dir__, "../sample/trick2022/02-tompng/entry.rb")
 
     # only syntax check because it works as a web server
-    assert_in_out_err(["-W0", "-c", src], "", ["Syntax OK"])
+    assert_in_out_err(["-W0", "--disable-frozen-string-literal", "-c", src], "", ["Syntax OK"])
   end
 
   def test_03_mame
     src = File.join(__dir__, "../sample/trick2022/03-mame/entry.rb")
 
     # TODO
-    assert_in_out_err(["-W0", "-c", src], "", ["Syntax OK"])
+    assert_in_out_err(["-W0", "--disable-frozen-string-literal", "-c", src], "", ["Syntax OK"])
   end
 end
 
diff --git a/test/uri/test_common.rb b/test/uri/test_common.rb
index 1df19e6968a384..12913669364cd9 100644
--- a/test/uri/test_common.rb
+++ b/test/uri/test_common.rb
@@ -10,6 +10,47 @@ def setup
   def teardown
   end
 
+  EnvUtil.suppress_warning do
+    class Foo
+      # Intentionally use `URI::REGEXP`, which is for the compatibility
+      include URI::REGEXP::PATTERN
+    end
+  end
+
+  def test_fallback_constants
+    EnvUtil.suppress_warning do
+      assert_raise(NameError) { URI::FOO }
+
+      assert_equal URI::ABS_URI, URI::RFC2396_PARSER.regexp[:ABS_URI]
+      assert_equal URI::PATTERN, URI::RFC2396_Parser::PATTERN
+      assert_equal URI::REGEXP, URI::RFC2396_REGEXP
+      assert_equal URI::REGEXP::PATTERN, URI::RFC2396_REGEXP::PATTERN
+      assert_equal Foo::IPV4ADDR, URI::RFC2396_REGEXP::PATTERN::IPV4ADDR
+    end
+  end
+
+  def test_parser_switch
+    assert_equal(URI::Parser, URI::RFC3986_Parser)
+    refute defined?(URI::REGEXP)
+    refute defined?(URI::PATTERN)
+
+    URI.parser = URI::RFC2396_PARSER
+
+    assert_equal(URI::Parser, URI::RFC2396_Parser)
+    assert defined?(URI::REGEXP)
+    assert defined?(URI::PATTERN)
+    assert defined?(URI::PATTERN::ESCAPED)
+    assert defined?(URI::REGEXP::PATTERN::IPV6ADDR)
+
+    URI.parser = URI::RFC3986_PARSER
+
+    assert_equal(URI::Parser, URI::RFC3986_Parser)
+    refute defined?(URI::REGEXP)
+    refute defined?(URI::PATTERN)
+  ensure
+    URI.parser = URI::RFC3986_PARSER
+  end
+
   def test_extract
     EnvUtil.suppress_warning do
       assert_equal(['http://example.com'],
@@ -34,7 +75,7 @@ def test_ractor
     return unless defined?(Ractor)
     assert_ractor(<<~RUBY, require: 'uri')
       r = Ractor.new { URI.parse("https://ruby-lang.org/").inspect }
-      assert_equal(URI.parse("https://ruby-lang.org/").inspect, r.take)
+      assert_equal(URI.parse("https://ruby-lang.org/").inspect, r.value)
     RUBY
   end
 
@@ -72,17 +113,18 @@ def test_register_scheme_lowercase
 
   def test_register_scheme_with_symbols
     # Valid schemes from https://www.iana.org/assignments/uri-schemes/uri-schemes.xhtml
-    some_uri_class = Class.new(URI::Generic)
-    assert_raise(NameError) { URI.register_scheme 'ms-search', some_uri_class }
-    assert_raise(NameError) { URI.register_scheme 'microsoft.windows.camera', some_uri_class }
-    assert_raise(NameError) { URI.register_scheme 'coaps+ws', some_uri_class }
+    list = []
+    %w[ms-search microsoft.windows.camera coaps+ws].each {|name|
+      list << [name, URI.register_scheme(name, Class.new(URI::Generic))]
+    }
 
-    ms_search_class = Class.new(URI::Generic)
-    URI.register_scheme 'MS_SEARCH', ms_search_class
-    begin
-      assert_equal URI::Generic, URI.parse('ms-search://localhost').class
-    ensure
-      URI.const_get(:Schemes).send(:remove_const, :MS_SEARCH)
+    list.each do |scheme, uri_class|
+      assert_equal uri_class, URI.parse("#{scheme}://localhost").class
+    end
+  ensure
+    schemes = URI.const_get(:Schemes)
+    list.each do |scheme, |
+      schemes.send(:remove_const, schemes.escape(scheme))
     end
   end
 
diff --git a/test/uri/test_ftp.rb b/test/uri/test_ftp.rb
index f45bb0667c7086..3ad7864490ee0c 100644
--- a/test/uri/test_ftp.rb
+++ b/test/uri/test_ftp.rb
@@ -33,11 +33,11 @@ def test_paths
     # If you think what's below is wrong, please read RubyForge bug 2055,
     # RFC 1738 section 3.2.2, and RFC 2396.
     u = URI.parse('ftp://ftp.example.com/foo/bar/file.ext')
-    assert(u.path == 'foo/bar/file.ext')
+    assert_equal('foo/bar/file.ext', u.path)
     u = URI.parse('ftp://ftp.example.com//foo/bar/file.ext')
-    assert(u.path == '/foo/bar/file.ext')
+    assert_equal('/foo/bar/file.ext', u.path)
     u = URI.parse('ftp://ftp.example.com/%2Ffoo/bar/file.ext')
-    assert(u.path == '/foo/bar/file.ext')
+    assert_equal('/foo/bar/file.ext', u.path)
   end
 
   def test_assemble
@@ -45,8 +45,8 @@ def test_assemble
     # assuming everyone else has implemented RFC 2396.
     uri = URI::FTP.build(['user:password', 'ftp.example.com', nil,
                          '/path/file.zip', 'i'])
-    assert(uri.to_s ==
-           'ftp://user:password@ftp.example.com/%2Fpath/file.zip;type=i')
+    assert_equal('ftp://user:password@ftp.example.com/%2Fpath/file.zip;type=i',
+                 uri.to_s)
   end
 
   def test_select
diff --git a/test/uri/test_generic.rb b/test/uri/test_generic.rb
index e6619373c65d4a..c725116e964e50 100644
--- a/test/uri/test_generic.rb
+++ b/test/uri/test_generic.rb
@@ -26,6 +26,17 @@ def test_to_s
     assert_equal "postgres:///foo", URI("postgres:///foo").to_s
     assert_equal "http:///foo", URI("http:///foo").to_s
     assert_equal "http:/foo", URI("http:/foo").to_s
+
+    uri = URI('rel_path')
+    assert_equal "rel_path", uri.to_s
+    uri.scheme = 'http'
+    assert_equal "http:rel_path", uri.to_s
+    uri.host = 'h'
+    assert_equal "http://h/rel_path", uri.to_s
+    uri.port = 8080
+    assert_equal "http://h:8080/rel_path", uri.to_s
+    uri.host = nil
+    assert_equal "http::8080/rel_path", uri.to_s
   end
 
   def test_parse
@@ -164,6 +175,17 @@ def test_parse
     # must be empty string to identify as path-abempty, not path-absolute
     assert_equal('', url.host)
     assert_equal('http:////example.com', url.to_s)
+
+    # sec-2957667
+    url = URI.parse('http://user:pass@example.com').merge('//example.net')
+    assert_equal('http://example.net', url.to_s)
+    assert_nil(url.userinfo)
+    url = URI.join('http://user:pass@example.com', '//example.net')
+    assert_equal('http://example.net', url.to_s)
+    assert_nil(url.userinfo)
+    url = URI.parse('http://user:pass@example.com') + '//example.net'
+    assert_equal('http://example.net', url.to_s)
+    assert_nil(url.userinfo)
   end
 
   def test_parse_scheme_with_symbols
@@ -218,9 +240,9 @@ def test_merge
     u = URI.parse('http://foo/bar/baz')
     assert_equal(nil, u.merge!(""))
     assert_equal(nil, u.merge!(u))
-    assert(nil != u.merge!("."))
+    refute_nil(u.merge!("."))
     assert_equal('http://foo/bar/', u.to_s)
-    assert(nil != u.merge!("../baz"))
+    refute_nil(u.merge!("../baz"))
     assert_equal('http://foo/baz', u.to_s)
 
     url = URI.parse('http://a/b//c') + 'd//e'
@@ -256,6 +278,13 @@ def test_merge
     assert_equal(u0, u1)
   end
 
+  def test_merge_authority
+    u = URI.parse('http://user:pass@example.com:8080')
+    u0 = URI.parse('http://new.example.org/path')
+    u1 = u.merge('//new.example.org/path')
+    assert_equal(u0, u1)
+  end
+
   def test_route
     url = URI.parse('http://hoge/a.html').route_to('http://hoge/b.html')
     assert_equal('b.html', url.to_s)
@@ -327,7 +356,7 @@ def test_rfc3986_examples
     assert_equal('http://a/b/c/g', url.to_s)
     url = @base_url.route_to('http://a/b/c/g')
     assert_kind_of(URI::Generic, url)
-    assert('./g' != url.to_s) # ok
+    refute_equal('./g', url.to_s) # ok
     assert_equal('g', url.to_s)
 
 #  http://a/b/c/d;p?q
@@ -346,7 +375,7 @@ def test_rfc3986_examples
     assert_equal('http://a/g', url.to_s)
     url = @base_url.route_to('http://a/g')
     assert_kind_of(URI::Generic, url)
-    assert('/g' != url.to_s) # ok
+    refute_equal('/g', url.to_s) # ok
     assert_equal('../../g', url.to_s)
 
 #  http://a/b/c/d;p?q
@@ -437,7 +466,7 @@ def test_rfc3986_examples
     assert_equal('http://a/b/c/', url.to_s)
     url = @base_url.route_to('http://a/b/c/')
     assert_kind_of(URI::Generic, url)
-    assert('.' != url.to_s) # ok
+    refute_equal('.', url.to_s) # ok
     assert_equal('./', url.to_s)
 
 #  http://a/b/c/d;p?q
@@ -456,7 +485,7 @@ def test_rfc3986_examples
     assert_equal('http://a/b/', url.to_s)
     url = @base_url.route_to('http://a/b/')
     assert_kind_of(URI::Generic, url)
-    assert('..' != url.to_s) # ok
+    refute_equal('..', url.to_s) # ok
     assert_equal('../', url.to_s)
 
 #  http://a/b/c/d;p?q
@@ -484,7 +513,7 @@ def test_rfc3986_examples
     assert_equal('http://a/', url.to_s)
     url = @base_url.route_to('http://a/')
     assert_kind_of(URI::Generic, url)
-    assert('../..' != url.to_s) # ok
+    refute_equal('../..', url.to_s) # ok
     assert_equal('../../', url.to_s)
 
 #  http://a/b/c/d;p?q
@@ -575,7 +604,7 @@ def test_rfc3986_examples
     assert_equal('http://a/g', url.to_s)
     url = @base_url.route_to('http://a/g')
     assert_kind_of(URI::Generic, url)
-    assert('../../../g' != url.to_s)  # ok? yes, it confuses you
+    refute_equal('../../../g', url.to_s)  # ok? yes, it confuses you
     assert_equal('../../g', url.to_s) # and it is clearly
 
 #  http://a/b/c/d;p?q
@@ -585,7 +614,7 @@ def test_rfc3986_examples
     assert_equal('http://a/g', url.to_s)
     url = @base_url.route_to('http://a/g')
     assert_kind_of(URI::Generic, url)
-    assert('../../../../g' != url.to_s) # ok? yes, it confuses you
+    refute_equal('../../../../g', url.to_s) # ok? yes, it confuses you
     assert_equal('../../g', url.to_s)   # and it is clearly
 
 #  http://a/b/c/d;p?q
@@ -595,7 +624,7 @@ def test_rfc3986_examples
     assert_equal('http://a/b/g', url.to_s)
     url = @base_url.route_to('http://a/b/g')
     assert_kind_of(URI::Generic, url)
-    assert('./../g' != url.to_s) # ok
+    refute_equal('./../g', url.to_s) # ok
     assert_equal('../g', url.to_s)
 
 #  http://a/b/c/d;p?q
@@ -605,7 +634,7 @@ def test_rfc3986_examples
     assert_equal('http://a/b/c/g/', url.to_s)
     url = @base_url.route_to('http://a/b/c/g/')
     assert_kind_of(URI::Generic, url)
-    assert('./g/.' != url.to_s) # ok
+    refute_equal('./g/.', url.to_s) # ok
     assert_equal('g/', url.to_s)
 
 #  http://a/b/c/d;p?q
@@ -615,7 +644,7 @@ def test_rfc3986_examples
     assert_equal('http://a/b/c/g/h', url.to_s)
     url = @base_url.route_to('http://a/b/c/g/h')
     assert_kind_of(URI::Generic, url)
-    assert('g/./h' != url.to_s) # ok
+    refute_equal('g/./h', url.to_s) # ok
     assert_equal('g/h', url.to_s)
 
 #  http://a/b/c/d;p?q
@@ -625,7 +654,7 @@ def test_rfc3986_examples
     assert_equal('http://a/b/c/h', url.to_s)
     url = @base_url.route_to('http://a/b/c/h')
     assert_kind_of(URI::Generic, url)
-    assert('g/../h' != url.to_s) # ok
+    refute_equal('g/../h', url.to_s) # ok
     assert_equal('h', url.to_s)
 
 #  http://a/b/c/d;p?q
@@ -635,7 +664,7 @@ def test_rfc3986_examples
     assert_equal('http://a/b/c/g;x=1/y', url.to_s)
     url = @base_url.route_to('http://a/b/c/g;x=1/y')
     assert_kind_of(URI::Generic, url)
-    assert('g;x=1/./y' != url.to_s) # ok
+    refute_equal('g;x=1/./y', url.to_s) # ok
     assert_equal('g;x=1/y', url.to_s)
 
 #  http://a/b/c/d;p?q
@@ -645,7 +674,7 @@ def test_rfc3986_examples
     assert_equal('http://a/b/c/y', url.to_s)
     url = @base_url.route_to('http://a/b/c/y')
     assert_kind_of(URI::Generic, url)
-    assert('g;x=1/../y' != url.to_s) # ok
+    refute_equal('g;x=1/../y', url.to_s) # ok
     assert_equal('y', url.to_s)
 
 #  http://a/b/c/d;p?q
@@ -793,18 +822,18 @@ def test_hierarchical
     hierarchical = URI.parse('http://a.b.c/example')
     opaque = URI.parse('mailto:mduerst@ifi.unizh.ch')
 
-    assert hierarchical.hierarchical?
-    refute opaque.hierarchical?
+    assert_predicate hierarchical, :hierarchical?
+    refute_predicate opaque, :hierarchical?
   end
 
   def test_absolute
     abs_uri = URI.parse('http://a.b.c/')
     not_abs = URI.parse('a.b.c')
 
-    refute not_abs.absolute?
+    refute_predicate not_abs, :absolute?
 
-    assert abs_uri.absolute
-    assert abs_uri.absolute?
+    assert_predicate abs_uri, :absolute
+    assert_predicate abs_uri, :absolute?
   end
 
   def test_ipv6
@@ -817,8 +846,10 @@ def test_ipv6
     assert_equal("http://[::1]/bar", u.to_s)
     u.hostname = "::1"
     assert_equal("http://[::1]/bar", u.to_s)
-    u.hostname = ""
-    assert_equal("http:///bar", u.to_s)
+
+    u = URI("file://foo/bar")
+    u.hostname = ''
+    assert_equal("file:///bar", u.to_s)
   end
 
   def test_build
@@ -839,6 +870,19 @@ def test_build
     assert_equal("http://[::1]/bar/baz", u.to_s)
     assert_equal("[::1]", u.host)
     assert_equal("::1", u.hostname)
+
+    assert_raise_with_message(ArgumentError, /URI::Generic/) {
+      URI::Generic.build(nil)
+    }
+
+    c = Class.new(URI::Generic) do
+      def self.component; raise; end
+    end
+    expected = /\(#{URI::Generic::COMPONENT.join(', ')}\)/
+    message = "fallback to URI::Generic::COMPONENT if component raised"
+    assert_raise_with_message(ArgumentError, expected, message) {
+      c.build(nil)
+    }
   end
 
   def test_build2
diff --git a/test/uri/test_http.rb b/test/uri/test_http.rb
index e937b1a26b1ea4..8816d20175883d 100644
--- a/test/uri/test_http.rb
+++ b/test/uri/test_http.rb
@@ -19,6 +19,10 @@ def test_build
     assert_kind_of(URI::HTTP, u)
   end
 
+  def test_build_empty_host
+    assert_raise(URI::InvalidComponentError) { URI::HTTP.build(host: '') }
+  end
+
   def test_parse
     u = URI.parse('http://a')
     assert_kind_of(URI::HTTP, u)
@@ -33,19 +37,19 @@ def test_normalize
     host = 'aBcD'
     u1 = URI.parse('http://' + host + '/eFg?HiJ')
     u2 = URI.parse('http://' + host.downcase + '/eFg?HiJ')
-    assert(u1.normalize.host == 'abcd')
-    assert(u1.normalize.path == u1.path)
-    assert(u1.normalize == u2.normalize)
-    assert(!u1.normalize.host.equal?(u1.host))
-    assert( u2.normalize.host.equal?(u2.host))
+    assert_equal('abcd', u1.normalize.host)
+    assert_equal(u1.path, u1.normalize.path)
+    assert_equal(u2.normalize, u1.normalize)
+    refute_same(u1.host, u1.normalize.host)
+    assert_same(u2.host, u2.normalize.host)
 
     assert_equal('http://abc/', URI.parse('http://abc').normalize.to_s)
   end
 
   def test_equal
-    assert(URI.parse('http://abc') == URI.parse('http://ABC'))
-    assert(URI.parse('http://abc/def') == URI.parse('http://ABC/def'))
-    assert(URI.parse('http://abc/def') != URI.parse('http://ABC/DEF'))
+    assert_equal(URI.parse('http://ABC'), URI.parse('http://abc'))
+    assert_equal(URI.parse('http://ABC/def'), URI.parse('http://abc/def'))
+    refute_equal(URI.parse('http://ABC/DEF'), URI.parse('http://abc/def'))
   end
 
   def test_request_uri
diff --git a/test/uri/test_mailto.rb b/test/uri/test_mailto.rb
index e7d314219824e1..59bb5ded09b9a9 100644
--- a/test/uri/test_mailto.rb
+++ b/test/uri/test_mailto.rb
@@ -141,6 +141,11 @@ def test_initializer
   def test_check_to
     u = URI::MailTo.build(['joe@example.com', 'subject=Ruby'])
 
+    # Valid emails
+    u.to = 'a@valid.com'
+    assert_equal(u.to, 'a@valid.com')
+
+    # Invalid emails
     assert_raise(URI::InvalidComponentError) do
       u.to = '#1@mail.com'
     end
@@ -148,6 +153,79 @@ def test_check_to
     assert_raise(URI::InvalidComponentError) do
       u.to = '@invalid.email'
     end
+
+    assert_raise(URI::InvalidComponentError) do
+      u.to = '.hello@invalid.email'
+    end
+
+    assert_raise(URI::InvalidComponentError) do
+      u.to = 'hello.@invalid.email'
+    end
+
+    assert_raise(URI::InvalidComponentError) do
+      u.to = 'n.@invalid.email'
+    end
+
+    assert_raise(URI::InvalidComponentError) do
+      u.to = 'n..t@invalid.email'
+    end
+
+    # Invalid host emails
+    assert_raise(URI::InvalidComponentError) do
+      u.to = 'a@.invalid.email'
+    end
+
+    assert_raise(URI::InvalidComponentError) do
+      u.to = 'a@invalid.email.'
+    end
+
+    assert_raise(URI::InvalidComponentError) do
+      u.to = 'a@invalid..email'
+    end
+
+    assert_raise(URI::InvalidComponentError) do
+      u.to = 'a@-invalid.email'
+    end
+
+    assert_raise(URI::InvalidComponentError) do
+      u.to = 'a@invalid-.email'
+    end
+
+    assert_raise(URI::InvalidComponentError) do
+      u.to = 'a@invalid.-email'
+    end
+
+    assert_raise(URI::InvalidComponentError) do
+      u.to = 'a@invalid.email-'
+    end
+
+    u.to = 'a@'+'invalid'.ljust(63, 'd')+'.email'
+    assert_raise(URI::InvalidComponentError) do
+      u.to = 'a@'+'invalid'.ljust(64, 'd')+'.email'
+    end
+
+    u.to = 'a@invalid.'+'email'.rjust(63, 'e')
+    assert_raise(URI::InvalidComponentError) do
+      u.to = 'a@invalid.'+'email'.rjust(64, 'e')
+    end
+  end
+
+  def test_email_regexp
+    re = URI::MailTo::EMAIL_REGEXP
+
+    repeat = 10
+    longlabel = '.' + 'invalid'.ljust(63, 'd')
+    endlabel = ''
+    seq = (1..3).map {|i| 10**i}
+    rehearsal = 10
+    pre = ->(n) {'a@invalid' + longlabel*(n) + endlabel}
+    assert_linear_performance(seq, rehearsal: rehearsal, pre: pre) do |to|
+      repeat.times {re =~ to or flunk}
+    end
+    endlabel = '.' + 'email'.rjust(64, 'd')
+    assert_linear_performance(seq, rehearsal: rehearsal, pre: pre) do |to|
+      repeat.times {re =~ to and flunk}
+    end
   end
 
   def test_to_s
diff --git a/test/uri/test_parser.rb b/test/uri/test_parser.rb
index 75c02fe65b3d02..c14824f5e84cc5 100644
--- a/test/uri/test_parser.rb
+++ b/test/uri/test_parser.rb
@@ -8,8 +8,8 @@ def uri_to_ary(uri)
   end
 
   def test_inspect
-    assert_match(/URI::RFC2396_Parser/, URI::Parser.new.inspect)
-    assert_match(/URI::RFC3986_Parser/, URI::RFC3986_Parser.new.inspect)
+    assert_match(/URI::RFC2396_Parser/, URI::RFC2396_Parser.new.inspect)
+    assert_match(/URI::RFC3986_Parser/, URI::Parser.new.inspect)
   end
 
   def test_compare
@@ -20,20 +20,22 @@ def test_compare
     u2 = p.parse(url)
     u3 = p.parse(url)
 
-    assert(u0 == u1)
-    assert(u0.eql?(u1))
-    assert(!u0.equal?(u1))
+    assert_equal(u1, u0)
+    assert_send([u0, :eql?, u1])
+    refute_same(u1, u0)
 
-    assert(u1 == u2)
-    assert(!u1.eql?(u2))
-    assert(!u1.equal?(u2))
+    assert_equal(u2, u1)
+    assert_not_send([u1, :eql?, u2])
+    refute_same(u1, u2)
 
-    assert(u2 == u3)
-    assert(u2.eql?(u3))
-    assert(!u2.equal?(u3))
+    assert_equal(u3, u2)
+    assert_send([u2, :eql?, u3])
+    refute_same(u3, u2)
   end
 
-  def test_parse
+  def test_parse_rfc2396_parser
+    URI.parser = URI::RFC2396_PARSER
+
     escaped = URI::REGEXP::PATTERN::ESCAPED
     hex = URI::REGEXP::PATTERN::HEX
     p1 = URI::Parser.new(:ESCAPED => "(?:#{escaped}|%u[#{hex}]{4})")
@@ -43,6 +45,8 @@ def test_parse
     u1.path = '/%uDCBA'
     assert_equal(['http', nil, 'a', URI::HTTP.default_port, '/%uDCBA', nil, nil],
 		 uri_to_ary(u1))
+  ensure
+    URI.parser = URI::DEFAULT_PARSER
   end
 
   def test_parse_query_pct_encoded
@@ -65,8 +69,8 @@ def test_raise_bad_uri_for_integer
     end
   end
 
-  def test_unescape
-    p1 = URI::Parser.new
+  def test_rfc2822_unescape
+    p1 = URI::RFC2396_Parser.new
     assert_equal("\xe3\x83\x90", p1.unescape("\xe3\x83\x90"))
     assert_equal("\xe3\x83\x90", p1.unescape('%e3%83%90'))
     assert_equal("\u3042", p1.unescape('%e3%81%82'.force_encoding(Encoding::US_ASCII)))
@@ -109,4 +113,12 @@ def test_rfc3986_port_check
       end
     end
   end
+
+  def test_rfc2822_make_regexp
+    parser = URI::RFC2396_Parser.new
+    regexp = parser.make_regexp("HTTP")
+    assert_match(regexp, "HTTP://EXAMPLE.COM/")
+    assert_match(regexp, "http://example.com/")
+    refute_match(regexp, "https://example.com/")
+  end
 end
diff --git a/test/uri/test_ws.rb b/test/uri/test_ws.rb
index f3918f617c44a6..d63ebd4a460513 100644
--- a/test/uri/test_ws.rb
+++ b/test/uri/test_ws.rb
@@ -31,19 +31,19 @@ def test_normalize
     host = 'aBcD'
     u1 = URI.parse('ws://' + host          + '/eFg?HiJ')
     u2 = URI.parse('ws://' + host.downcase + '/eFg?HiJ')
-    assert(u1.normalize.host == 'abcd')
-    assert(u1.normalize.path == u1.path)
-    assert(u1.normalize == u2.normalize)
-    assert(!u1.normalize.host.equal?(u1.host))
-    assert( u2.normalize.host.equal?(u2.host))
+    assert_equal('abcd', u1.normalize.host)
+    assert_equal(u1.path, u1.normalize.path)
+    assert_equal(u2.normalize, u1.normalize)
+    refute_same(u1.host, u1.normalize.host)
+    assert_same(u2.host, u2.normalize.host)
 
     assert_equal('ws://abc/', URI.parse('ws://abc').normalize.to_s)
   end
 
   def test_equal
-    assert(URI.parse('ws://abc') == URI.parse('ws://ABC'))
-    assert(URI.parse('ws://abc/def') == URI.parse('ws://ABC/def'))
-    assert(URI.parse('ws://abc/def') != URI.parse('ws://ABC/DEF'))
+    assert_equal(URI.parse('ws://ABC'), URI.parse('ws://abc'))
+    assert_equal(URI.parse('ws://ABC/def'), URI.parse('ws://abc/def'))
+    refute_equal(URI.parse('ws://ABC/DEF'), URI.parse('ws://abc/def'))
   end
 
   def test_request_uri
diff --git a/test/uri/test_wss.rb b/test/uri/test_wss.rb
index 13a258305912d1..cbef327cc65058 100644
--- a/test/uri/test_wss.rb
+++ b/test/uri/test_wss.rb
@@ -31,19 +31,19 @@ def test_normalize
     host = 'aBcD'
     u1 = URI.parse('wss://' + host          + '/eFg?HiJ')
     u2 = URI.parse('wss://' + host.downcase + '/eFg?HiJ')
-    assert(u1.normalize.host == 'abcd')
-    assert(u1.normalize.path == u1.path)
-    assert(u1.normalize == u2.normalize)
-    assert(!u1.normalize.host.equal?(u1.host))
-    assert( u2.normalize.host.equal?(u2.host))
+    assert_equal('abcd', u1.normalize.host)
+    assert_equal(u1.path, u1.normalize.path)
+    assert_equal(u2.normalize, u1.normalize)
+    refute_same(u1.host, u1.normalize.host)
+    assert_same(u2.host, u2.normalize.host)
 
     assert_equal('wss://abc/', URI.parse('wss://abc').normalize.to_s)
   end
 
   def test_equal
-    assert(URI.parse('wss://abc') == URI.parse('wss://ABC'))
-    assert(URI.parse('wss://abc/def') == URI.parse('wss://ABC/def'))
-    assert(URI.parse('wss://abc/def') != URI.parse('wss://ABC/DEF'))
+    assert_equal(URI.parse('wss://ABC'), URI.parse('wss://abc'))
+    assert_equal(URI.parse('wss://ABC/def'), URI.parse('wss://abc/def'))
+    refute_equal(URI.parse('wss://ABC/DEF'), URI.parse('wss://abc/def'))
   end
 
   def test_request_uri
diff --git a/test/win32/test_registry.rb b/test/win32/test_registry.rb
new file mode 100644
index 00000000000000..9a38d0d314cff9
--- /dev/null
+++ b/test/win32/test_registry.rb
@@ -0,0 +1,256 @@
+# frozen_string_literal: true
+
+require "rbconfig"
+
+if /mswin|mingw|cygwin/ =~ RbConfig::CONFIG['host_os']
+  begin
+    require 'win32/registry'
+  rescue LoadError
+  else
+    require 'test/unit'
+  end
+end
+
+if defined?(Win32::Registry)
+  class TestWin32Registry < Test::Unit::TestCase
+    COMPUTERNAME = 'SYSTEM\\CurrentControlSet\\Control\\ComputerName\\ComputerName'
+    TEST_REGISTRY_PATH = 'Volatile Environment'
+    TEST_REGISTRY_KEY = 'ruby-win32-registry-test-<RND>'
+
+    # Create a new registry key per test in an atomic way, which is deleted on teardown.
+    #
+    # Fills the following instance variables:
+    #
+    #   @test_registry_key - A registry path which is not yet created,
+    #                        but can be created without collisions even when running
+    #                        multiple test processes.
+    #   @test_registry_rnd - The part of the registry path with a random number.
+    #   @createopts        - Required parameters (desired, opt) for create method in
+    #                        the volatile environment of the registry.
+    def setup
+      @createopts = [Win32::Registry::KEY_ALL_ACCESS, Win32::Registry::REG_OPTION_VOLATILE]
+      100.times do |i|
+        k = TEST_REGISTRY_KEY.gsub("<RND>", i.to_s)
+        next unless Win32::Registry::HKEY_CURRENT_USER.create(
+          TEST_REGISTRY_PATH + "\\" + k,
+          *@createopts
+        ).created?
+        @test_registry_key = TEST_REGISTRY_PATH + "\\" + k + "\\" + "test\\"
+        @test_registry_rnd = k
+        break
+      end
+      omit "Unused registry subkey not found in #{TEST_REGISTRY_KEY}" unless @test_registry_key
+    end
+
+    def teardown
+      Win32::Registry::HKEY_CURRENT_USER.open(TEST_REGISTRY_PATH) do |reg|
+        reg.delete_key @test_registry_rnd, true
+      end
+    end
+
+    def test_predefined
+      assert_predefined_key Win32::Registry::HKEY_CLASSES_ROOT
+      assert_predefined_key Win32::Registry::HKEY_CURRENT_USER
+      assert_predefined_key Win32::Registry::HKEY_LOCAL_MACHINE
+      assert_predefined_key Win32::Registry::HKEY_USERS
+      assert_predefined_key Win32::Registry::HKEY_PERFORMANCE_DATA
+      assert_predefined_key Win32::Registry::HKEY_PERFORMANCE_TEXT
+      assert_predefined_key Win32::Registry::HKEY_PERFORMANCE_NLSTEXT
+      assert_predefined_key Win32::Registry::HKEY_CURRENT_CONFIG
+      assert_predefined_key Win32::Registry::HKEY_DYN_DATA
+    end
+
+    def test_open_no_block
+      Win32::Registry::HKEY_CURRENT_USER.create(@test_registry_key, *@createopts).close
+
+      reg = Win32::Registry::HKEY_CURRENT_USER.open(@test_registry_key, Win32::Registry::KEY_ALL_ACCESS)
+      assert_kind_of Win32::Registry, reg
+      assert_equal true, reg.open?
+      assert_equal false, reg.created?
+      reg["test"] = "abc"
+      reg.close
+      assert_raise(Win32::Registry::Error) do
+        reg["test"] = "abc"
+      end
+    end
+
+    def test_open_with_block
+      Win32::Registry::HKEY_CURRENT_USER.create(@test_registry_key, *@createopts).close
+
+      regs = []
+      Win32::Registry::HKEY_CURRENT_USER.open(@test_registry_key, Win32::Registry::KEY_ALL_ACCESS) do |reg|
+        regs << reg
+        assert_equal true, reg.open?
+        assert_equal false, reg.created?
+        reg["test"] = "abc"
+      end
+
+      assert_equal 1, regs.size
+      assert_kind_of Win32::Registry, regs[0]
+      assert_raise(Win32::Registry::Error) do
+        regs[0]["test"] = "abc"
+      end
+    end
+
+    def test_class_open
+      name1, keys1 = Win32::Registry.open(Win32::Registry::HKEY_LOCAL_MACHINE, "SYSTEM") do |reg|
+        assert_predicate reg, :open?
+        [reg.name, reg.keys]
+      end
+      name2, keys2 = Win32::Registry::HKEY_LOCAL_MACHINE.open("SYSTEM") do |reg|
+        assert_predicate reg, :open?
+        [reg.name, reg.keys]
+      end
+      assert_equal name1, name2
+      assert_equal keys1, keys2
+    end
+
+    def test_read
+      computername = ENV['COMPUTERNAME']
+      Win32::Registry::HKEY_LOCAL_MACHINE.open(COMPUTERNAME) do |reg|
+        assert_equal computername,  reg['ComputerName']
+        assert_equal [Win32::Registry::REG_SZ, computername], reg.read('ComputerName')
+        assert_raise(TypeError) {reg.read('ComputerName', Win32::Registry::REG_DWORD)}
+      end
+    end
+
+    def test_create_no_block
+      reg = Win32::Registry::HKEY_CURRENT_USER.create(@test_registry_key, *@createopts)
+      assert_kind_of Win32::Registry, reg
+      assert_equal true, reg.open?
+      assert_equal true, reg.created?
+      reg["test"] = "abc"
+      reg.close
+      assert_equal false, reg.open?
+      assert_raise(Win32::Registry::Error) do
+        reg["test"] = "abc"
+      end
+    end
+
+    def test_create_with_block
+      regs = []
+      Win32::Registry::HKEY_CURRENT_USER.create(@test_registry_key, *@createopts) do |reg|
+        regs << reg
+        reg["test"] = "abc"
+        assert_equal true, reg.open?
+        assert_equal true, reg.created?
+      end
+
+      assert_equal 1, regs.size
+      assert_kind_of Win32::Registry, regs[0]
+      assert_equal false, regs[0].open?
+      assert_raise(Win32::Registry::Error) do
+        regs[0]["test"] = "abc"
+      end
+    end
+
+    def test_write
+      Win32::Registry::HKEY_CURRENT_USER.create(@test_registry_key, *@createopts) do |reg|
+        reg.write_s("key1", "data")
+        assert_equal [Win32::Registry::REG_SZ, "data"], reg.read("key1")
+        reg.write_i("key2", 0x5fe79027)
+        assert_equal [Win32::Registry::REG_DWORD, 0x5fe79027], reg.read("key2")
+      end
+    end
+
+    def test_accessors
+      Win32::Registry::HKEY_CURRENT_USER.create(@test_registry_key, *@createopts) do |reg|
+        assert_kind_of Integer, reg.hkey
+        assert_kind_of Win32::Registry, reg.parent
+        assert_equal "HKEY_CURRENT_USER", reg.parent.name
+        assert_equal "Volatile Environment\\#{@test_registry_rnd}\\test\\", reg.keyname
+        assert_equal Win32::Registry::REG_CREATED_NEW_KEY, reg.disposition
+      end
+    end
+
+    def test_name
+      Win32::Registry::HKEY_CURRENT_USER.create(@test_registry_key, *@createopts) do |reg|
+        assert_equal "HKEY_CURRENT_USER\\Volatile Environment\\#{@test_registry_rnd}\\test\\", reg.name
+      end
+    end
+
+    def test_keys
+      Win32::Registry::HKEY_CURRENT_USER.create(@test_registry_key, *@createopts) do |reg|
+        reg.create("key1", *@createopts)
+        assert_equal ["key1"], reg.keys
+      end
+    end
+
+    def test_each_key
+      keys = []
+      Win32::Registry::HKEY_CURRENT_USER.create(@test_registry_key, *@createopts) do |reg|
+        reg.create("key1", *@createopts)
+        reg.each_key { |*a| keys << a }
+      end
+      assert_equal [2], keys.map(&:size)
+      assert_equal ["key1"], keys.map(&:first)
+      assert_in_delta Win32::Registry.time2wtime(Time.now), keys[0][1], 10_000_000_000, "wtime should roughly match Time.now"
+    end
+
+    def test_each_key_enum
+      keys = nil
+      Win32::Registry::HKEY_CURRENT_USER.create(@test_registry_key, *@createopts) do |reg|
+        reg.create("key1", *@createopts)
+        reg.create("key2", *@createopts)
+        reg.create("key3", *@createopts)
+        reg["value1"] = "abcd"
+        keys = reg.each_key.to_a
+      end
+      assert_equal 3, keys.size
+      assert_equal [2, 2, 2], keys.map(&:size)
+      assert_equal ["key1", "key2", "key3"], keys.map(&:first)
+    end
+
+    def test_values
+      Win32::Registry::HKEY_CURRENT_USER.create(@test_registry_key, *@createopts) do |reg|
+        reg.create("key1", *@createopts)
+        reg["value1"] = "abcd"
+        assert_equal ["abcd"], reg.values
+      end
+    end
+
+    def test_each_value
+      vals = []
+      Win32::Registry::HKEY_CURRENT_USER.create(@test_registry_key, *@createopts) do |reg|
+        reg.create("key1", *@createopts)
+        reg["value1"] = "abcd"
+        reg.each_value { |*a| vals << a }
+      end
+      assert_equal [["value1", Win32::Registry::REG_SZ, "abcd"]], vals
+    end
+
+    def test_each_value_enum
+      vals = nil
+      Win32::Registry::HKEY_CURRENT_USER.create(@test_registry_key, *@createopts) do |reg|
+        reg.create("key1", *@createopts)
+        reg["value1"] = "abcd"
+        reg["value2"] = 42
+        vals = reg.each_value.to_a
+      end
+      assert_equal [["value1", Win32::Registry::REG_SZ, "abcd"],
+                    ["value2", Win32::Registry::REG_DWORD, 42]], vals
+    end
+
+    def test_utf8_encoding
+      keys = []
+      Win32::Registry::HKEY_CURRENT_USER.create(@test_registry_key, *@createopts) do |reg|
+        reg.create("abc EUR", *@createopts)
+        reg.create("abc €", *@createopts)
+        reg.each_key do |subkey|
+          keys << subkey
+        end
+      end
+
+      assert_equal [Encoding::UTF_8] * 2, keys.map(&:encoding)
+      assert_equal ["abc EUR", "abc €"], keys
+    end
+
+    private
+
+    def assert_predefined_key(key)
+      assert_kind_of Win32::Registry, key
+      assert_predicate key, :open?
+      refute_predicate key, :created?
+    end
+  end
+end
diff --git a/test/win32ole/available_ole.rb b/test/win32ole/available_ole.rb
deleted file mode 100644
index ebc9baae66fc38..00000000000000
--- a/test/win32ole/available_ole.rb
+++ /dev/null
@@ -1,41 +0,0 @@
-begin
-  require 'win32ole'
-rescue LoadError
-end
-
-if defined?(WIN32OLE)
-  module AvailableOLE
-    module_function
-
-    def sysmon_available?
-      WIN32OLE_TYPE.new('System Monitor Control', 'SystemMonitor')
-      true
-    rescue
-      false
-    end
-
-    def ado_available?
-      WIN32OLE.new('ADODB.Connection')
-      true
-    rescue
-      false
-    end
-
-    def msxml_available?
-      !WIN32OLE_TYPELIB.typelibs.find { |t| t.name.start_with?('Microsoft XML') }.nil?
-    end
-
-    def event_param
-      method = if msxml_available?
-                 typelib = WIN32OLE_TYPELIB.typelibs.find { |t| t.name.start_with?('Microsoft XML') }
-                 ole_type = WIN32OLE_TYPE.new(typelib.name, 'IVBSAXContentHandler')
-                 WIN32OLE_METHOD.new(ole_type, 'startElement')
-               elsif ado_available?
-                 typelib = WIN32OLE.new('ADODB.Connection').ole_typelib
-                 ole_type = WIN32OLE_TYPE.new(typelib.name, 'Connection')
-                 WIN32OLE_METHOD.new(ole_type, 'WillConnect')
-               end
-      method && method.params[0]
-    end
-  end
-end
diff --git a/test/win32ole/err_in_callback.rb b/test/win32ole/err_in_callback.rb
deleted file mode 100644
index aa6c9c7e3a56e9..00000000000000
--- a/test/win32ole/err_in_callback.rb
+++ /dev/null
@@ -1,10 +0,0 @@
-# frozen_string_literal: false
-require 'win32ole'
-db = WIN32OLE.new('ADODB.Connection')
-db.connectionString = "Driver={Microsoft Text Driver (*.txt; *.csv)};DefaultDir=.;"
-ev = WIN32OLE_EVENT.new(db)
-ev.on_event('WillConnect') {|*args|
-  foo
-}
-db.open
-WIN32OLE_EVENT.message_loop
diff --git a/test/win32ole/orig_data.csv b/test/win32ole/orig_data.csv
deleted file mode 100644
index 3931c6ad1b9e0d..00000000000000
--- a/test/win32ole/orig_data.csv
+++ /dev/null
@@ -1,5 +0,0 @@
-ID,VALUE
-1,"A"
-2,"B"
-3,"C"
-4,"B"
diff --git a/test/win32ole/test_err_in_callback.rb b/test/win32ole/test_err_in_callback.rb
deleted file mode 100644
index 9ffaf9125fdc3e..00000000000000
--- a/test/win32ole/test_err_in_callback.rb
+++ /dev/null
@@ -1,56 +0,0 @@
-# frozen_string_literal: false
-#
-# test Win32OLE avoids cfp consistency error when the exception raised
-# in WIN32OLE_EVENT handler block. [ruby-dev:35450]
-#
-
-begin
-  require 'win32ole'
-rescue LoadError
-end
-if defined?(WIN32OLE)
-  require 'mkmf'
-  require 'pathname'
-  require 'test/unit'
-  require 'tmpdir'
-  class TestErrInCallBack < Test::Unit::TestCase
-    def setup
-      @ruby = nil
-      if File.exist?("./" + CONFIG["RUBY_INSTALL_NAME"] + CONFIG["EXEEXT"])
-        sep = File::ALT_SEPARATOR || "/"
-        @ruby = "." + sep + CONFIG["RUBY_INSTALL_NAME"]
-        cwd = Pathname.new(File.expand_path('.'))
-        @iopt = $:.map {|e|
-          " -I " + (Pathname.new(e).relative_path_from(cwd).to_s rescue e)
-        }.join("")
-        script = File.join(File.dirname(__FILE__), "err_in_callback.rb")
-        @script = Pathname.new(script).relative_path_from(cwd).to_s rescue script
-      end
-    end
-
-    def available_adodb?
-      begin
-        WIN32OLE.new('ADODB.Connection')
-      rescue WIN32OLERuntimeError
-        return false
-      end
-      return true
-    end
-
-    def test_err_in_callback
-      omit "'ADODB.Connection' is not available" unless available_adodb?
-      if @ruby
-        Dir.mktmpdir do |tmpdir|
-          logfile = File.join(tmpdir, "test_err_in_callback.log")
-          cmd = "#{@ruby} -v #{@iopt} #{@script} > #{logfile.gsub(%r(/), '\\')} 2>&1"
-          system(cmd)
-          str = ""
-          open(logfile) {|ifs|
-            str = ifs.read
-          }
-          assert_match(/NameError/, str)
-        end
-      end
-    end
-  end
-end
diff --git a/test/win32ole/test_folderitem2_invokeverb.rb b/test/win32ole/test_folderitem2_invokeverb.rb
deleted file mode 100644
index e11503ca2aae5a..00000000000000
--- a/test/win32ole/test_folderitem2_invokeverb.rb
+++ /dev/null
@@ -1,66 +0,0 @@
-# frozen_string_literal: false
-#
-# This script check that Win32OLE can execute InvokeVerb method of FolderItem2.
-#
-
-begin
-  require 'win32ole'
-rescue LoadError
-end
-require 'test/unit'
-
-if defined?(WIN32OLE)
-  class TestInvokeVerb < Test::Unit::TestCase
-    def setup
-      # make dummy file for InvokeVerb test.
-      @fso = WIN32OLE.new('Scripting.FileSystemObject')
-      dummy_file = @fso.GetTempName
-      @cfolder = @fso.getFolder(".")
-      f = @cfolder.CreateTextFile(dummy_file)
-      f.close
-      @dummy_path = @cfolder.path + "\\" + dummy_file
-
-      shell=WIN32OLE.new('Shell.Application')
-      @nsp = shell.NameSpace(@cfolder.path)
-      @fi2 = @nsp.parseName(dummy_file)
-    end
-
-    def find_link(path)
-      arlink = []
-      @cfolder.files.each do |f|
-        if /\.lnk$/ =~ f.path
-          linkinfo = @nsp.parseName(f.name).getLink
-          arlink.push f if linkinfo.path == path
-        end
-      end
-      arlink
-    end
-
-    def test_invokeverb
-      # in Windows Vista (not tested), Windows 7
-      # The verb must be in English.
-      # Creating Shortcut is "Link"
-      links = find_link(@dummy_path)
-      assert_equal(0, links.size)
-
-      # Now create shortcut to @dummy_path
-      arg = WIN32OLE_VARIANT.new("Link")
-      @fi2.InvokeVerb(arg)
-
-      # Now search shortcut to @dummy_path
-      links = find_link(@dummy_path)
-      assert_equal(1, links.size)
-      @lpath = links[0].path
-    end
-
-    def teardown
-      if @lpath
-        @fso.deleteFile(@lpath)
-      end
-      if @dummy_path
-        @fso.deleteFile(@dummy_path)
-      end
-    end
-
-  end
-end
diff --git a/test/win32ole/test_nil2vtempty.rb b/test/win32ole/test_nil2vtempty.rb
deleted file mode 100644
index 49757d61b397c2..00000000000000
--- a/test/win32ole/test_nil2vtempty.rb
+++ /dev/null
@@ -1,37 +0,0 @@
-# frozen_string_literal: false
-# This is test script to check that WIN32OLE should convert nil to VT_EMPTY in second try.
-# [ruby-talk:137054]
-begin
-  require 'win32ole'
-rescue LoadError
-end
-require 'test/unit'
-
-if defined?(WIN32OLE)
-  class TestNIL2VT_EMPTY < Test::Unit::TestCase
-    def setup
-      fs = WIN32OLE.new('Scripting.FileSystemObject')
-      @path = fs.GetFolder(".").path
-    end
-    def test_openSchema
-      con = nil
-      begin
-        con = WIN32OLE.new('ADODB.Connection')
-        con.connectionString = "Provider=MSDASQL;Extended Properties="
-        con.connectionString +="\"DRIVER={Microsoft Text Driver (*.txt; *.csv)};DBQ=#{@path}\""
-        con.open
-      rescue
-        con = nil
-      end
-      if con
-        rs = con.openSchema(4, [nil,nil,"DUMMY", "TABLE"])
-        assert(rs)
-        assert_equal("_Recordset", rs.ole_type.name)
-
-        rs = con.openSchema(4, [WIN32OLE_VARIANT::Empty, WIN32OLE_VARIANT::Empty, "DUMMY", "TABLE"])
-        assert(rs)
-        assert_equal("_Recordset", rs.ole_type.name)
-      end
-    end
-  end
-end
diff --git a/test/win32ole/test_ole_methods.rb b/test/win32ole/test_ole_methods.rb
deleted file mode 100644
index fbade04e48214e..00000000000000
--- a/test/win32ole/test_ole_methods.rb
+++ /dev/null
@@ -1,35 +0,0 @@
-# frozen_string_literal: false
-#
-# This is test for [ruby-talk:196897]
-#
-begin
-  require 'win32ole'
-rescue LoadError
-end
-require "test/unit"
-
-if defined?(WIN32OLE)
-  class TestWIN32OLE_FOR_PROPERTYPUTREF < Test::Unit::TestCase
-
-    def setup
-      @obj = WIN32OLE.new('Scripting.Dictionary')
-    end
-
-    def test_ole_methods
-      x = @obj.ole_methods.select {|m|
-        m.invoke_kind == 'PROPERTYPUTREF'
-      }
-      assert_equal(1, x.size)
-      assert_equal('Item', x[0].name)
-    end
-
-    def test_ole_put_methods
-      x = @obj.ole_put_methods.select {|m|
-        m.invoke_kind == 'PROPERTYPUTREF'
-      }
-      assert_equal(1, x.size)
-      assert_equal('Item', x[0].name)
-    end
-
-  end
-end
diff --git a/test/win32ole/test_propertyputref.rb b/test/win32ole/test_propertyputref.rb
deleted file mode 100644
index 93edb508351c95..00000000000000
--- a/test/win32ole/test_propertyputref.rb
+++ /dev/null
@@ -1,31 +0,0 @@
-# frozen_string_literal: false
-require 'test/unit'
-begin
-  require 'win32ole'
-rescue LoadError
-end
-
-if defined?(WIN32OLE)
-  class TestWIN32OLE_PROPERTYPUTREF < Test::Unit::TestCase
-    def setup
-      begin
-        @sapi = WIN32OLE.new('SAPI.SpVoice')
-        @sv = @sapi.voice
-      rescue WIN32OLERuntimeError
-        @sapi = nil
-      end
-    end
-    def test_sapi
-      if @sapi
-        new_id = @sapi.getvoices.item(0).Id
-        @sapi.voice = @sapi.getvoices.item(0)
-        assert_equal(new_id, @sapi.voice.Id)
-      end
-    end
-    def teardown
-      if @sapi
-        @sapi.voice = @sv
-      end
-    end
-  end
-end
diff --git a/test/win32ole/test_thread.rb b/test/win32ole/test_thread.rb
deleted file mode 100644
index cb34693064b7f8..00000000000000
--- a/test/win32ole/test_thread.rb
+++ /dev/null
@@ -1,34 +0,0 @@
-# frozen_string_literal: false
-begin
-  require 'win32ole'
-rescue LoadError
-end
-require 'test/unit'
-
-if defined?(WIN32OLE)
-  class TestWIN32OLE_THREAD < Test::Unit::TestCase
-    #
-    # test for Bug #2618(ruby-core:27634)
-    #
-    def assert_creating_win32ole_object_in_thread(meth)
-      t = Thread.__send__(meth) {
-        WIN32OLE.new('Scripting.Dictionary')
-      }
-      assert_nothing_raised(WIN32OLERuntimeError, "[Bug #2618] Thread.#{meth}") {
-        t.join
-      }
-    end
-
-    def test_creating_win32ole_object_in_thread_new
-      assert_creating_win32ole_object_in_thread(:new)
-    end
-
-    def test_creating_win32ole_object_in_thread_start
-      assert_creating_win32ole_object_in_thread(:start)
-    end
-
-    def test_creating_win32ole_object_in_thread_fork
-      assert_creating_win32ole_object_in_thread(:fork)
-    end
-  end
-end
diff --git a/test/win32ole/test_win32ole.rb b/test/win32ole/test_win32ole.rb
deleted file mode 100644
index 594830b8fad623..00000000000000
--- a/test/win32ole/test_win32ole.rb
+++ /dev/null
@@ -1,536 +0,0 @@
-# coding: us-ascii
-# frozen_string_literal: false
-
-begin
-  require 'win32ole'
-rescue LoadError
-end
-require 'test/unit'
-
-if defined?(WIN32OLE)
-  module CONST1
-  end
-  module CONST2
-  end
-
-  module TestCaseForDict
-    def test_convert_bignum
-      @dict1.add("a", 9999999999)
-      @dict1.add("b", 999999999)
-      @dict1.add("c", @dict1.item("b") * 10 + 9)
-      assert_equal(9999999999, @dict1.item("a"))
-      assert_equal(9999999999, @dict1.item("c"))
-    end
-    def test_add
-      @dict1.add("a", 1000)
-      assert_equal(1000, @dict1.item("a"))
-    end
-    def test_setproperty_equal_ended
-      @dict1.compareMode = 1
-      @dict1.add("one", 1)
-      assert_equal(1, @dict1.item("ONE"))
-      @dict2.add("one", 1)
-      assert_nil(@dict2.item("ONE"))
-      assert_equal(1, @dict2.item("one"))
-    end
-    def test_non_exist_property
-      assert_raise(WIN32OLERuntimeError) {
-        @dict1.unknown_property = 1
-      }
-    end
-
-    def test_raise_message
-      exc = assert_raise(WIN32OLERuntimeError) {
-        @dict1.add
-      }
-      assert_match(/^\(in OLE method `add': \)/, exc.message) #`
-
-      exc = assert_raise(WIN32OLERuntimeError) {
-        @dict1._invoke(1, [], [])
-      }
-      assert_match(/^\(in OLE method `<dispatch id:1>': \)/, exc.message) #`
-
-      exc = assert_raise(WIN32OLERuntimeError) {
-        @dict1.compareMode = -1
-      }
-      assert_match(/^\(in setting property `compareMode': \)/, exc.message) #`
-    end
-
-    def test_no_method_error
-      exc = assert_raise(NoMethodError) {
-        @dict1.non_exist_method
-      }
-      assert_match(/non_exist_method/, exc.message)
-      assert_kind_of(WIN32OLE, exc.receiver)
-    end
-
-    def test_ole_methods
-      methods = @dict1.ole_methods
-      mnames = methods.collect {|m|
-        m.name
-      }
-      assert_include(mnames, 'Add')
-    end
-
-    def test_methods
-      methods = @dict1.methods
-      assert_include(methods, :Add)
-    end
-
-    def test_ole_func_methods
-      methods = @dict1.ole_func_methods
-      mnames = methods.collect {|m|
-        m.name
-      }
-      assert_include(mnames, 'Add')
-    end
-
-    def test_ole_put_methods
-      methods = @dict1.ole_put_methods
-      mnames = methods.collect {|m|
-        m.name
-      }
-      assert_include(mnames, 'CompareMode')
-    end
-
-    def test_ole_get_methods
-      methods = @dict1.ole_get_methods
-      mnames = methods.collect {|m|
-        m.name
-      }
-      assert_include(mnames, 'Count')
-    end
-
-    def test_ole_method_help
-      minfo = @dict1.ole_method_help("Add")
-      assert_equal(2, minfo.size_params)
-    end
-
-    def test_ole_typelib
-      tlib = @dict1.ole_typelib
-      assert_equal("Microsoft Scripting Runtime", tlib.name);
-    end
-
-    def test_each
-      @dict1.add("one", 1)
-      @dict1.add("two", 2)
-      i = 0
-      @dict1.keys.each do |item|
-        i += 1
-      end
-      assert_equal(2, i)
-    end
-
-    def test_bracket
-      @dict1.add("foo", "FOO")
-      assert_equal("FOO", @dict1.item("foo"))
-      assert_equal("FOO", @dict1["foo"])
-    end
-
-    def test_bracket_equal
-      @dict1.add("foo", "FOO")
-      @dict1["foo"] = "BAR"
-      assert_equal("BAR", @dict1["foo"])
-    end
-
-    def test_bracket_with_numkey
-      @dict1.add(1, "ONE")
-      @dict1.add(2, "two")
-      assert_equal("ONE", @dict1[1])
-      @dict1[2] = "TWO"
-      assert_equal("TWO", @dict1[2])
-    end
-
-    def test_invoke_with_array
-      @dict1.add("ary1", [1,2,3])
-      assert_equal([1,2,3], @dict1["ary1"])
-
-      @dict1.add("ary2", [[1,2,"a"], [3,4,"b"]])
-      assert_equal([[1,2,"a"], [3,4,"b"]], @dict1["ary2"])
-
-      @dict1.add("ary3", [[[1]]])
-      assert_equal([[[1]]], @dict1["ary3"])
-
-      @dict1.add("ary4", [[[1], [2], [3]], [[4], [5], [6]]])
-      assert_equal([[[1],[2], [3]], [[4], [5], [6]]], @dict1["ary4"])
-    end
-  end
-
-  class TestWin32OLE < Test::Unit::TestCase
-    include TestCaseForDict
-    def setup
-      @dict1 = WIN32OLE.new('Scripting.Dictionary')
-      @dict2 = WIN32OLE.new('Scripting.Dictionary')
-    end
-    def test_s_new
-      assert_instance_of(WIN32OLE, @dict1)
-      assert_instance_of(WIN32OLE, @dict2)
-    end
-
-    def test_s_new_exc
-      assert_raise(TypeError) {
-        WIN32OLE.new(1)
-      }
-      assert_raise(TypeError) {
-        WIN32OLE.new("Scripting.Dictionary", 1)
-      }
-    end
-
-    def test_s_new_DCOM
-      rshell = WIN32OLE.new("Shell.Application")
-      assert_instance_of(WIN32OLE, rshell)
-    end
-
-    def test_s_new_from_clsid
-      shell = WIN32OLE.new("{13709620-C279-11CE-A49E-444553540000}")
-      assert_instance_of(WIN32OLE, shell)
-      exc = assert_raise(WIN32OLERuntimeError) {
-        WIN32OLE.new("{000}")
-      }
-      assert_match(/unknown OLE server: `\{000\}'/, exc.message) #`
-    end
-
-    def test_s_connect
-      obj = WIN32OLE.connect("winmgmts:")
-      assert_instance_of(WIN32OLE, obj)
-    end
-
-    def test_s_connect_exc
-      assert_raise(TypeError) {
-        WIN32OLE.connect(1)
-      }
-    end
-
-    def test_invoke_accept_symbol_hash_key
-      fso = WIN32OLE.new('Scripting.FileSystemObject')
-      afolder = fso.getFolder(".")
-      bfolder = fso.getFolder({"FolderPath" => "."})
-      cfolder = fso.getFolder({:FolderPath => "."})
-      assert_equal(afolder.path, bfolder.path)
-      assert_equal(afolder.path, cfolder.path)
-      fso = nil
-    end
-
-    def test_setproperty
-      installer = WIN32OLE.new("WindowsInstaller.Installer")
-      record = installer.CreateRecord(2)
-      # this is the way to set property with argument in Win32OLE.
-      record.setproperty( "StringData", 1, 'dddd')
-      assert_equal('dddd', record.StringData(1))
-    end
-
-    def test_ole_type
-      fso = WIN32OLE.new('Scripting.FileSystemObject')
-      tobj = fso.ole_type
-      assert_match(/^IFileSystem/, tobj.name)
-    end
-
-    def test_ole_obj_help
-      fso = WIN32OLE.new('Scripting.FileSystemObject')
-      tobj = fso.ole_obj_help
-      assert_match(/^IFileSystem/, tobj.name)
-    end
-
-
-    def test_invoke_hash_key_non_str_sym
-      fso = WIN32OLE.new('Scripting.FileSystemObject')
-      begin
-        fso.getFolder({1 => "."})
-        assert(false)
-      rescue TypeError
-        assert(true)
-      end
-      fso = nil
-    end
-
-    def test_get_win32ole_object
-      shell = WIN32OLE.new('Shell.Application')
-      folder = shell.nameSpace(0)
-      assert_instance_of(WIN32OLE, folder)
-    end
-
-    def test_invoke_accept_multi_hash_key
-      shell = WIN32OLE.new('Shell.Application')
-      folder = shell.nameSpace(0)
-      item = folder.items.item(0)
-      name = folder.getDetailsOf(item, 0)
-      assert_equal(item.name, name)
-      name = folder.getDetailsOf({:vItem => item, :iColumn => 0})
-      assert_equal(item.name, name)
-      name = folder.getDetailsOf({"vItem" => item, :iColumn => 0})
-      assert_equal(item.name, name)
-    end
-
-    def test_ole_invoke_with_named_arg_last
-      shell = WIN32OLE.new('Shell.Application')
-      folder = shell.nameSpace(0)
-      item = folder.items.item(0)
-      name = folder.getDetailsOf(item, {:iColumn => 0})
-      assert_equal(item.name, name)
-    end
-
-    def test__invoke
-      shell=WIN32OLE.new('Shell.Application')
-      assert_equal(shell.NameSpace(0).title, shell._invoke(0x60020002, [0], [WIN32OLE::VARIANT::VT_VARIANT]).title)
-    end
-
-    def test_ole_query_interface
-      shell=WIN32OLE.new('Shell.Application')
-      assert_raise(ArgumentError) {
-        shell.ole_query_interface
-      }
-      assert_raise(TypeError) {
-        shell.ole_query_interface(0x11223344)
-      }
-      shell2 = shell.ole_query_interface('{A4C6892C-3BA9-11D2-9DEA-00C04FB16162}')
-      assert_instance_of(WIN32OLE, shell2)
-    end
-
-    def test_ole_respond_to
-      fso = WIN32OLE.new('Scripting.FileSystemObject')
-      assert(fso.ole_respond_to?('getFolder'))
-      assert(fso.ole_respond_to?('GETFOLDER'))
-      assert(fso.ole_respond_to?(:getFolder))
-      assert(!fso.ole_respond_to?('XXXXX'))
-      assert_raise(TypeError) {
-        assert_raise(fso.ole_respond_to?(1))
-      }
-    end
-
-    def test_invoke
-      fso = WIN32OLE.new('Scripting.FileSystemObject')
-      assert(fso.invoke(:getFolder, "."))
-      assert(fso.invoke('getFolder', "."))
-    end
-
-    def test_s_const_load
-      assert(!defined?(CONST1::SsfWINDOWS))
-      shell=WIN32OLE.new('Shell.Application')
-      WIN32OLE.const_load(shell, CONST1)
-      assert_equal(36, CONST1::SsfWINDOWS)
-
-      assert(!defined?(CONST2::SsfWINDOWS))
-      WIN32OLE.const_load("Microsoft Shell Controls And Automation", CONST2)
-      assert_equal(36, CONST2::SsfWINDOWS)
-    end
-
-    def test_s_create_guid
-      guid = WIN32OLE.create_guid
-      assert_match(/^\{[A-Z0-9]{8}\-[A-Z0-9]{4}\-[A-Z0-9]{4}\-[A-Z0-9]{4}\-[A-Z0-9]{12}/,
-                   guid)
-    end
-
-    #
-    # WIN32OLE.codepage is initialized according to Encoding.default_external.
-    #
-    # def test_s_codepage
-    #   assert_equal(WIN32OLE::CP_ACP, WIN32OLE.codepage)
-    # end
-
-    def test_s_codepage_set
-      cp = WIN32OLE.codepage
-      WIN32OLE.codepage = WIN32OLE::CP_UTF8
-      assert_equal(WIN32OLE::CP_UTF8, WIN32OLE.codepage)
-      WIN32OLE.codepage = cp
-    end
-
-    def test_s_codepage_changed
-      omit if RUBY_PLATFORM.match("mswin")
-
-      cp = WIN32OLE.codepage
-      fso = WIN32OLE.new("Scripting.FileSystemObject")
-      fname = fso.getTempName
-      begin
-        obj = WIN32OLE_VARIANT.new([0x3042].pack("U*").force_encoding("UTF-8"))
-        WIN32OLE.codepage = WIN32OLE::CP_UTF8
-        assert_equal("\xE3\x81\x82".force_encoding("CP65001"), obj.value)
-
-        begin
-          WIN32OLE.codepage = 932 # Windows-31J
-        rescue WIN32OLERuntimeError
-        end
-        if (WIN32OLE.codepage == 932)
-          assert_equal("\x82\xA0".force_encoding("CP932"), obj.value)
-        end
-
-        begin
-          WIN32OLE.codepage = 20932 # MS EUC-JP
-        rescue WIN32OLERuntimeError
-        end
-        if (WIN32OLE.codepage == 20932)
-          assert_equal("\xA4\xA2".force_encoding("CP20932"), obj.value)
-        end
-
-        WIN32OLE.codepage = cp
-        file = fso.opentextfile(fname, 2, true)
-        test_str = [0x3042].pack("U*").encode("UTF-16LE")
-        begin
-          file.write test_str.force_encoding("UTF-16")
-        ensure
-          file.close
-        end
-        str = ""
-        open(fname, "r:ascii-8bit") {|ifs|
-          str = ifs.read
-        }
-        assert_equal(test_str.force_encoding("ascii-8bit"), str)
-
-        # This test fail if codepage 20932 (euc) is not installed.
-        begin
-          WIN32OLE.codepage = 20932
-        rescue WIN32OLERuntimeError
-        end
-        if (WIN32OLE.codepage == 20932)
-          WIN32OLE.codepage = cp
-          file = fso.opentextfile(fname, 2, true)
-          begin
-            file.write [164, 162].pack("c*").force_encoding("UTF-16")
-          ensure
-            file.close
-          end
-          open(fname, "r:ascii-8bit") {|ifs|
-            str = ifs.read
-          }
-          assert_equal("\244\242", str)
-        end
-
-      ensure
-        WIN32OLE.codepage = cp
-        if (File.exist?(fname))
-          File.unlink(fname)
-        end
-      end
-    end
-
-    def test_cp51932
-      cp = WIN32OLE.codepage
-      begin
-        obj = WIN32OLE_VARIANT.new([0x3042].pack("U*").force_encoding("UTF-8"))
-        begin
-          WIN32OLE.codepage = 51932
-        rescue
-        end
-        if WIN32OLE.codepage == 51932
-          assert_equal("\xA4\xA2".force_encoding("CP51932"), obj.value)
-        end
-      ensure
-        WIN32OLE.codepage = cp
-      end
-    end
-
-    def test_s_locale
-      assert_equal(WIN32OLE::LOCALE_SYSTEM_DEFAULT, WIN32OLE.locale)
-    end
-
-    def test_s_locale_set
-      begin
-        begin
-          WIN32OLE.locale = 1041
-        rescue WIN32OLERuntimeError
-          STDERR.puts("\n#{__FILE__}:#{__LINE__}:#{self.class.name}.test_s_locale_set is skipped(Japanese locale is not installed)")
-          return
-        end
-        assert_equal(1041, WIN32OLE.locale)
-        WIN32OLE.locale = WIN32OLE::LOCALE_SYSTEM_DEFAULT
-        assert_raise(WIN32OLERuntimeError) {
-          WIN32OLE.locale = 111
-        }
-        assert_equal(WIN32OLE::LOCALE_SYSTEM_DEFAULT, WIN32OLE.locale)
-      ensure
-        WIN32OLE.locale = WIN32OLE::LOCALE_SYSTEM_DEFAULT
-      end
-    end
-
-    def test_s_locale_change
-      begin
-        begin
-          WIN32OLE.locale = 0x0411
-        rescue WIN32OLERuntimeError
-        end
-        if WIN32OLE.locale == 0x0411
-          obj = WIN32OLE_VARIANT.new("\\100,000", WIN32OLE::VARIANT::VT_CY)
-          assert_equal("100000", obj.value)
-          assert_raise(WIN32OLERuntimeError) {
-            obj = WIN32OLE_VARIANT.new("$100.000", WIN32OLE::VARIANT::VT_CY)
-          }
-        else
-          STDERR.puts("\n#{__FILE__}:#{__LINE__}:#{self.class.name}.test_s_locale_change is skipped(Japanese locale is not installed)")
-        end
-
-        begin
-          WIN32OLE.locale = 1033
-        rescue WIN32OLERuntimeError
-        end
-        if WIN32OLE.locale == 1033
-          obj = WIN32OLE_VARIANT.new("$100,000", WIN32OLE::VARIANT::VT_CY)
-          assert_equal("100000", obj.value)
-        else
-          STDERR.puts("\n#{__FILE__}:#{__LINE__}:#{self.class.name}.test_s_locale_change is skipped(US English locale is not installed)")
-        end
-      ensure
-        WIN32OLE.locale = WIN32OLE::LOCALE_SYSTEM_DEFAULT
-      end
-    end
-
-    def test_const_CP_ACP
-      assert_equal(0, WIN32OLE::CP_ACP)
-    end
-
-    def test_const_CP_OEMCP
-      assert_equal(1, WIN32OLE::CP_OEMCP)
-    end
-
-    def test_const_CP_MACCP
-      assert_equal(2, WIN32OLE::CP_MACCP)
-    end
-
-    def test_const_CP_THREAD_ACP
-      assert_equal(3, WIN32OLE::CP_THREAD_ACP)
-    end
-
-    def test_const_CP_SYMBOL
-      assert_equal(42, WIN32OLE::CP_SYMBOL)
-    end
-
-    def test_const_CP_UTF7
-      assert_equal(65000, WIN32OLE::CP_UTF7)
-    end
-
-    def test_const_CP_UTF8
-      assert_equal(65001, WIN32OLE::CP_UTF8)
-    end
-
-    def test_const_LOCALE_SYSTEM_DEFAULT
-      assert_equal(0x0800, WIN32OLE::LOCALE_SYSTEM_DEFAULT);
-    end
-
-    def test_const_LOCALE_USER_DEFAULT
-      assert_equal(0x0400, WIN32OLE::LOCALE_USER_DEFAULT);
-    end
-
-    def test_method_missing
-      assert_raise(ArgumentError) {@dict1.method_missing}
-      assert_raise(TypeError) {@dict1.method_missing(1)}
-      assert_raise(ArgumentError) {@dict1.method_missing("foo=")}
-      assert_raise(ArgumentError) {@dict1.method_missing("foo=", 1, 2)}
-    end
-  end
-
-  # test of subclass of WIN32OLE
-  class MyDict < WIN32OLE
-    def MyDict.new
-      super('Scripting.Dictionary')
-    end
-  end
-  class TestMyDict < Test::Unit::TestCase
-    include TestCaseForDict
-    def setup
-      @dict1 = MyDict.new
-      @dict2 = MyDict.new
-    end
-    def test_s_new
-      assert_instance_of(MyDict, @dict1)
-      assert_instance_of(MyDict, @dict2)
-    end
-  end
-end
diff --git a/test/win32ole/test_win32ole_event.rb b/test/win32ole/test_win32ole_event.rb
deleted file mode 100644
index f02df53be7aef7..00000000000000
--- a/test/win32ole/test_win32ole_event.rb
+++ /dev/null
@@ -1,407 +0,0 @@
-# frozen_string_literal: false
-begin
-  require 'win32ole'
-rescue LoadError
-end
-require 'test/unit'
-
-ado_installed =
-  if defined?(WIN32OLE)
-    db = nil
-    begin
-      db = WIN32OLE.new('ADODB.Connection')
-      db.connectionString = "Driver={Microsoft Text Driver (*.txt; *.csv)};DefaultDir=.;"
-      db.open
-      db.close
-      db = nil
-      true
-    rescue
-    end
-  end
-
-swbemsink_available =
-  if defined?(WIN32OLE)
-    begin
-      WIN32OLE.new('WbemScripting.SWbemSink')
-      true
-    rescue
-    end
-  end
-
-if defined?(WIN32OLE_EVENT)
-  class TestWIN32OLE_EVENT < Test::Unit::TestCase
-    def test_s_new_exception
-      assert_raise(TypeError) {
-        WIN32OLE_EVENT.new("A")
-      }
-    end
-    def test_s_new_non_exist_event
-      dict = WIN32OLE.new('Scripting.Dictionary')
-      assert_raise(RuntimeError) {
-        WIN32OLE_EVENT.new(dict)
-      }
-    end
-  end
-
-  if swbemsink_available
-    class TestWIN32OLE_EVENT_SWbemSink < Test::Unit::TestCase
-      def setup
-        @wmi = WIN32OLE.connect('winmgmts://localhost/root/cimv2')
-        @sws = WIN32OLE.new('WbemScripting.SWbemSink')
-        @event = @event1 = @event2 = ""
-        @sql = "SELECT * FROM __InstanceModificationEvent WITHIN 1 WHERE TargetInstance ISA 'Win32_LocalTime'"
-      end
-
-      def message_loop(watch_ivar = nil)
-        if watch_ivar
-          orig_ivar = instance_variable_get(watch_ivar)
-        end
-
-        2.times do
-          WIN32OLE_EVENT.message_loop
-          sleep 1
-        end
-
-        if watch_ivar
-          # wait until event is proceeded
-          tries = 0
-          seconds = EnvUtil.apply_timeout_scale(1)
-          while tries < 5 && instance_variable_get(watch_ivar) == orig_ivar
-            $stderr.puts "test_win32ole_event.rb: retrying and sleeping #{seconds}s until #{watch_ivar} is changed from #{orig_ivar.inspect}..."
-            WIN32OLE_EVENT.message_loop
-            sleep(seconds)
-            tries += 1
-            seconds *= 2 # sleep at most 31s in total
-          end
-        end
-      end
-
-      def default_handler(event, *args)
-        @event += event
-      end
-
-      def handler1
-        @event1 = "handler1"
-      end
-
-      def test_s_new_non_exist_event
-        assert_raise(RuntimeError) {
-          WIN32OLE_EVENT.new(@sws, 'XXXXX')
-        }
-      end
-
-      def test_s_new
-        obj = WIN32OLE_EVENT.new(@sws, 'ISWbemSinkEvents')
-        assert_instance_of(WIN32OLE_EVENT, obj)
-        obj = WIN32OLE_EVENT.new(@sws)
-        assert_instance_of(WIN32OLE_EVENT, obj)
-      end
-
-      def test_s_new_loop
-        exec_notification_query_async
-        ev = WIN32OLE_EVENT.new(@sws)
-        ev.on_event {|*args| default_handler(*args)}
-        message_loop
-        10.times do |i|
-          WIN32OLE_EVENT.new(@sws)
-          message_loop
-          GC.start
-        end
-
-        # @event randomly becomes "OnCompleted" here. Try to wait until it matches.
-        # https://ci.appveyor.com/project/ruby/ruby/builds/19963142/job/8gaxepksa0i3b998
-        assert_match_with_retries(/OnObjectReady/, :@event)
-      end
-
-      def test_on_event
-        exec_notification_query_async
-        ev = WIN32OLE_EVENT.new(@sws, 'ISWbemSinkEvents')
-        ev.on_event {|*args| default_handler(*args)}
-        message_loop(:@event)
-        assert_match(/OnObjectReady/, @event)
-      end
-
-      def test_on_event_symbol
-        exec_notification_query_async
-        ev = WIN32OLE_EVENT.new(@sws)
-        ev.on_event(:OnObjectReady) {|*args|
-          handler1
-        }
-        message_loop(:@event1)
-        assert_equal("handler1", @event1)
-      end
-
-      private
-      def exec_notification_query_async
-        @wmi.ExecNotificationQueryAsync(@sws, @sql)
-      rescue => e
-        if /OLE error code:80041008 in SWbemServicesEx/ =~ e.message
-          omit "No administrator privilege?"
-        end
-        raise
-      end
-
-      def assert_match_with_retries(regexp, ivarname)
-        ivar = instance_variable_get(ivarname)
-
-        tries = 0
-        while tries < 6 && !ivar.match(regexp)
-          $stderr.puts "test_win32ole_event.rb: retrying until #{ivarname} (#{ivar}) matches #{regexp} (tries: #{tries})..."
-          sleep(2 ** tries) # sleep at most 63s in total
-          ivar = instance_variable_get(ivarname)
-          tries += 1
-        end
-
-        assert_match(regexp, ivar)
-      end
-    end
-  end
-
-  if ado_installed
-    class TestWIN32OLE_EVENT_ADO < Test::Unit::TestCase
-      CONNSTR="Driver={Microsoft Text Driver (*.txt; *.csv)};DefaultDir=.;"
-      module ADO
-      end
-      def message_loop
-        WIN32OLE_EVENT.message_loop
-      end
-
-      def default_handler(event, *args)
-        @event += event
-      end
-
-      def setup
-        @db = WIN32OLE.new('ADODB.Connection')
-        if !defined?(ADO::AdStateOpen)
-          WIN32OLE.const_load(@db, ADO)
-        end
-        @db.connectionString = CONNSTR
-        @event = ""
-        @event2 = ""
-        @event3 = ""
-      end
-
-      def test_on_event2
-        ev = WIN32OLE_EVENT.new(@db, 'ConnectionEvents')
-        ev.on_event('WillConnect') {|*args| handler1}
-        ev.on_event('WillConnect') {|*args| handler2}
-        @db.open
-        message_loop
-        assert_equal("handler2", @event2)
-      end
-
-      def test_on_event4
-        ev = WIN32OLE_EVENT.new(@db, 'ConnectionEvents')
-        ev.on_event{|*args| handler1}
-        ev.on_event{|*args| handler2}
-        ev.on_event('WillConnect'){|*args| handler3(*args)}
-        @db.open
-        message_loop
-        assert_equal(CONNSTR, @event3)
-        assert("handler2", @event2)
-      end
-
-      def test_on_event5
-        ev = WIN32OLE_EVENT.new(@db, 'ConnectionEvents')
-        ev.on_event {|*args| default_handler(*args)}
-        ev.on_event('WillConnect'){|*args| handler3(*args)}
-        @db.open
-        message_loop
-        assert_match(/ConnectComplete/, @event)
-        assert(/WillConnect/ !~ @event)
-        assert_equal(CONNSTR, @event3)
-      end
-
-      def test_unadvise
-        ev = WIN32OLE_EVENT.new(@db, 'ConnectionEvents')
-        ev.on_event {|*args| default_handler(*args)}
-        @db.open
-        message_loop
-        assert_match(/WillConnect/, @event)
-        ev.unadvise
-        @event = ""
-        @db.close
-        @db.open
-        message_loop
-        assert_equal("", @event);
-        assert_raise(WIN32OLERuntimeError) {
-          ev.on_event {|*args| default_handler(*args)}
-        }
-      end
-
-
-      def test_on_event_with_outargs
-        ev = WIN32OLE_EVENT.new(@db)
-        @db.connectionString = 'XXX' # set illegal connection string
-        assert_raise(WIN32OLERuntimeError) {
-          @db.open
-        }
-        ev.on_event_with_outargs('WillConnect'){|*args|
-          args.last[0] = CONNSTR # ConnectionString = CONNSTR
-        }
-        @db.open
-        message_loop
-        assert(true)
-      end
-
-      def test_on_event_hash_return
-        ev = WIN32OLE_EVENT.new(@db)
-        ev.on_event('WillConnect'){|*args|
-          {:return => 1, :ConnectionString => CONNSTR}
-        }
-        @db.connectionString = 'XXX'
-        @db.open
-        assert(true)
-      end
-
-      def test_on_event_hash_return2
-        ev = WIN32OLE_EVENT.new(@db)
-        ev.on_event('WillConnect'){|*args|
-          {:ConnectionString => CONNSTR}
-        }
-        @db.connectionString = 'XXX'
-        @db.open
-        assert(true)
-      end
-
-      def test_on_event_hash_return3
-        ev = WIN32OLE_EVENT.new(@db)
-        ev.on_event('WillConnect'){|*args|
-          {'ConnectionString' => CONNSTR}
-        }
-        @db.connectionString = 'XXX'
-        @db.open
-        assert(true)
-      end
-
-      def test_on_event_hash_return4
-        ev = WIN32OLE_EVENT.new(@db)
-        ev.on_event('WillConnect'){|*args|
-          {'return' => 1, 'ConnectionString' => CONNSTR}
-        }
-        @db.connectionString = 'XXX'
-        @db.open
-        assert(true)
-      end
-
-      def test_on_event_hash_return5
-        ev = WIN32OLE_EVENT.new(@db)
-        ev.on_event('WillConnect'){|*args|
-          {0 => CONNSTR}
-        }
-        @db.connectionString = 'XXX'
-        @db.open
-        assert(true)
-      end
-
-      def test_off_event
-        ev = WIN32OLE_EVENT.new(@db)
-        ev.on_event{handler1}
-        ev.off_event
-        @db.open
-        message_loop
-        assert_equal("", @event2)
-      end
-
-      def test_off_event_arg
-        ev = WIN32OLE_EVENT.new(@db)
-        ev.on_event('WillConnect'){handler1}
-        ev.off_event('WillConnect')
-        @db.open
-        message_loop
-        assert_equal("", @event2)
-      end
-
-      def test_off_event_arg2
-        ev = WIN32OLE_EVENT.new(@db)
-        ev.on_event('WillConnect'){handler1}
-        ev.on_event('ConnectComplete'){handler1}
-        ev.off_event('WillConnect')
-        @db.open
-        message_loop
-        assert_equal("handler1", @event2)
-      end
-
-      def test_off_event_sym_arg
-        ev = WIN32OLE_EVENT.new(@db)
-        ev.on_event('WillConnect'){handler1}
-        ev.off_event(:WillConnect)
-        @db.open
-        message_loop
-        assert_equal("", @event2)
-      end
-
-      def handler1
-        @event2 = "handler1"
-      end
-
-      def handler2
-        @event2 = "handler2"
-      end
-
-      def handler3(*arg)
-        @event3 += arg[0]
-      end
-
-      def teardown
-        if @db && @db.state == ADO::AdStateOpen
-          @db.close
-        end
-        message_loop
-        @db = nil
-      end
-
-      class Handler1
-        attr_reader :val1, :val2, :val3, :val4
-        def initialize
-          @val1 = nil
-          @val2 = nil
-          @val3 = nil
-          @val4 = nil
-        end
-        def onWillConnect(conn, uid, pwd, opts, stat, pconn)
-          @val1 = conn
-        end
-        def onConnectComplete(err, stat, pconn)
-          @val2 = err
-          @val3 = stat
-        end
-        def onInfoMessage(err, stat, pconn)
-          @val4 = stat
-        end
-      end
-
-      class Handler2
-        attr_reader :ev
-        def initialize
-          @ev = ""
-        end
-        def method_missing(ev, *arg)
-          @ev += ev
-        end
-      end
-
-      def test_handler1
-        ev = WIN32OLE_EVENT.new(@db)
-        h1 = Handler1.new
-        ev.handler = h1
-        @db.open
-        message_loop
-        assert_equal(CONNSTR, h1.val1)
-        assert_equal(h1.val1, ev.handler.val1)
-        assert_equal(nil, h1.val2)
-        assert_equal(ADO::AdStateOpen, h1.val3)
-        assert_equal(ADO::AdStateOpen, h1.val4)
-      end
-
-      def test_handler2
-        ev = WIN32OLE_EVENT.new(@db)
-        h2 = Handler2.new
-        ev.handler = h2
-        @db.open
-        message_loop
-        assert(h2.ev != "")
-      end
-    end
-  end
-end
diff --git a/test/win32ole/test_win32ole_method.rb b/test/win32ole/test_win32ole_method.rb
deleted file mode 100644
index a0e113e7f04556..00000000000000
--- a/test/win32ole/test_win32ole_method.rb
+++ /dev/null
@@ -1,134 +0,0 @@
-# frozen_string_literal: false
-begin
-  require 'win32ole'
-rescue LoadError
-end
-require "test/unit"
-
-if defined?(WIN32OLE_METHOD)
-  class TestWIN32OLE_METHOD < Test::Unit::TestCase
-
-    def setup
-      ole_type = WIN32OLE_TYPE.new("Microsoft Shell Controls And Automation", "Shell")
-      @m_open = WIN32OLE_METHOD.new(ole_type, "open")
-      @m_namespace = WIN32OLE_METHOD.new(ole_type, "namespace")
-      @m_parent = WIN32OLE_METHOD.new(ole_type, "parent")
-      @m_invoke = WIN32OLE_METHOD.new(ole_type, "invoke")
-      @m_browse_for_folder = WIN32OLE_METHOD.new(ole_type, "BrowseForFolder")
-
-      ole_type = WIN32OLE_TYPE.new("Microsoft Scripting Runtime", "File")
-      @m_file_name = WIN32OLE_METHOD.new(ole_type, "name")
-    end
-
-    def test_initialize
-      ole_type = WIN32OLE_TYPE.new("Microsoft Shell Controls And Automation", "Shell")
-      assert_raise(TypeError) {
-        WIN32OLE_METHOD.new(1, 2)
-      }
-      assert_raise(ArgumentError) {
-        WIN32OLE_METHOD.new("foo")
-      }
-      assert_raise(ArgumentError) {
-        WIN32OLE_METHOD.new(ole_type)
-      }
-      assert_raise(WIN32OLERuntimeError) {
-        WIN32OLE_METHOD.new(ole_type, "NonExistMethod")
-      }
-      assert_raise(TypeError) {
-        WIN32OLE_METHOD.new(ole_type, 1)
-      }
-      method  = WIN32OLE_METHOD.new(ole_type, "Open")
-      assert_instance_of(WIN32OLE_METHOD, method)
-      method  = WIN32OLE_METHOD.new(ole_type, "open")
-      assert_instance_of(WIN32OLE_METHOD, method)
-    end
-
-    def test_name
-      assert_equal("Open", @m_open.name)
-    end
-
-    def test_return_type
-      assert_equal("VOID", @m_open.return_type)
-      assert_equal("Folder", @m_namespace.return_type)
-    end
-
-    def test_return_vtype
-      assert_equal(24, @m_open.return_vtype)
-      assert_equal(26, @m_namespace.return_vtype)
-    end
-
-    def test_return_type_detail
-      assert_equal(['VOID'], @m_open.return_type_detail)
-      assert_equal(['PTR', 'USERDEFINED', 'Folder'], @m_namespace.return_type_detail)
-    end
-
-    def test_invoke_kind
-      assert_equal('FUNC', @m_open.invoke_kind)
-      assert_equal('FUNC', @m_namespace.invoke_kind)
-      assert_equal('PROPERTYGET', @m_parent.invoke_kind)
-    end
-
-    def test_invkind
-      assert_equal(1, @m_namespace.invkind)
-      assert_equal(2, @m_parent.invkind)
-    end
-
-    def test_visible?
-      assert(@m_namespace.visible?)
-      assert(!@m_invoke.visible?)
-    end
-
-    def test_helpstring
-      assert_equal("Get special folder from ShellSpecialFolderConstants", @m_namespace.helpstring)
-    end
-
-    def test_helpfile
-      assert_equal("", @m_namespace.helpfile)
-      assert_match(/VBENLR.*\.CHM$/i, @m_file_name.helpfile)
-    end
-
-    def test_helpcontext
-      assert_equal(0, @m_namespace.helpcontext)
-      assert_equal(2181996, @m_file_name.helpcontext)
-    end
-
-    def test_dispid
-      assert_equal(1610743810, @m_namespace.dispid)
-    end
-
-    def is_ruby64?
-      /mswin64|x64-mingw/ =~ RUBY_PLATFORM
-    end
-
-    def test_offset_vtbl
-      exp = is_ruby64? ? 48 : 24
-      assert_equal(exp, @m_invoke.offset_vtbl)
-    end
-
-    def test_size_params
-      assert_equal(1, @m_open.size_params)
-      assert_equal(4, @m_browse_for_folder.size_params)
-    end
-
-    def test_size_opt_params
-      assert_equal(0, @m_open.size_opt_params)
-      assert_equal(1, @m_browse_for_folder.size_opt_params)
-    end
-
-    def test_params
-      params = @m_browse_for_folder.params
-      assert_instance_of(Array, params)
-      assert_equal(4, params.size)
-      assert_instance_of(WIN32OLE_PARAM, params[0])
-    end
-
-    def test_to_s
-      assert_equal(@m_namespace.name, @m_namespace.to_s)
-    end
-
-    def test_inspect
-      assert_equal("#<WIN32OLE_METHOD:NameSpace>", @m_namespace.inspect)
-    end
-
-  end
-end
diff --git a/test/win32ole/test_win32ole_method_event.rb b/test/win32ole/test_win32ole_method_event.rb
deleted file mode 100644
index 77581688725da9..00000000000000
--- a/test/win32ole/test_win32ole_method_event.rb
+++ /dev/null
@@ -1,36 +0,0 @@
-begin
-  require 'win32ole'
-rescue LoadError
-end
-
-require 'test/unit'
-
-if defined?(WIN32OLE_METHOD)
-  require_relative 'available_ole'
-  class TestWIN32OLE_METHOD_EVENT < Test::Unit::TestCase
-    unless AvailableOLE.sysmon_available?
-      def test_dummy_for_skip_message
-        omit 'System Monitor Control is not available'
-      end
-    else
-      def setup
-        ole_type = WIN32OLE_TYPE.new('System Monitor Control', 'SystemMonitor')
-        @on_dbl_click = WIN32OLE_METHOD.new(ole_type, 'OnDblClick')
-        ole_type = WIN32OLE_TYPE.new('Microsoft Shell Controls And Automation', 'Shell')
-        @namespace = WIN32OLE_METHOD.new(ole_type, 'namespace')
-      end
-
-      def test_event?
-        assert(@on_dbl_click.event?)
-      end
-
-      def test_event_interface
-        assert('DISystemMonitorEvents', @on_dbl_click.event_interface)
-      end
-
-      def test_event_interface_is_nil
-        assert_equal(nil, @namespace.event_interface)
-      end
-    end
-  end
-end
diff --git a/test/win32ole/test_win32ole_param.rb b/test/win32ole/test_win32ole_param.rb
deleted file mode 100644
index 09452d19270d16..00000000000000
--- a/test/win32ole/test_win32ole_param.rb
+++ /dev/null
@@ -1,98 +0,0 @@
-# frozen_string_literal: false
-begin
-  require 'win32ole'
-rescue LoadError
-end
-require "test/unit"
-
-if defined?(WIN32OLE_PARAM)
-  class TestWIN32OLE_PARAM < Test::Unit::TestCase
-
-    def setup
-      ole_type = WIN32OLE_TYPE.new("Microsoft Shell Controls And Automation", "ShellLinkObject")
-      m_geticonlocation = WIN32OLE_METHOD.new(ole_type, "GetIconLocation")
-      @param_pbs = m_geticonlocation.params[0]
-
-      ole_type = WIN32OLE_TYPE.new("Microsoft HTML Object Library", "FontNames")
-      m_count = WIN32OLE_METHOD.new(ole_type, "Count")
-      @param_p = m_count.params[0]
-
-      ole_type = WIN32OLE_TYPE.new("Microsoft Scripting Runtime", "FileSystemObject")
-      m_copyfile = WIN32OLE_METHOD.new(ole_type, "CopyFile")
-      @param_source = m_copyfile.params[0]
-      @param_overwritefiles = m_copyfile.params[2]
-
-      ole_type = WIN32OLE_TYPE.new("Microsoft Scripting Runtime", "Dictionary")
-      m_add = WIN32OLE_METHOD.new(ole_type, "Add")
-      @param_key = m_add.params[0]
-    end
-
-    def test_s_new
-      assert_raise(ArgumentError) {
-        WIN32OLE_PARAM.new("hoge")
-      }
-      ole_type = WIN32OLE_TYPE.new("Microsoft Scripting Runtime", "FileSystemObject")
-      m_copyfile = WIN32OLE_METHOD.new(ole_type, "CopyFile")
-      assert_raise(IndexError) {
-        WIN32OLE_PARAM.new(m_copyfile, 4);
-      }
-      assert_raise(IndexError) {
-        WIN32OLE_PARAM.new(m_copyfile, 0);
-      }
-      param = WIN32OLE_PARAM.new(m_copyfile, 3)
-      assert_equal("OverWriteFiles", param.name)
-      assert_equal(WIN32OLE_PARAM, param.class)
-      assert_equal(true, param.default)
-      assert_equal("#<WIN32OLE_PARAM:OverWriteFiles=true>", param.inspect)
-    end
-
-    def test_name
-      assert_equal('Source', @param_source.name)
-      assert_equal('Key', @param_key.name)
-    end
-
-    def test_ole_type
-      assert_equal('BSTR', @param_source.ole_type)
-      assert_equal('VARIANT', @param_key.ole_type)
-    end
-
-    def test_ole_type_detail
-      assert_equal(['BSTR'], @param_source.ole_type_detail)
-      assert_equal(['PTR', 'VARIANT'], @param_key.ole_type_detail)
-    end
-
-    def test_input?
-      assert_equal(true, @param_source.input?)
-      assert_equal(false, @param_pbs.input?)
-    end
-
-    def test_output?
-      assert_equal(false, @param_source.output?)
-      assert_equal(true, @param_pbs.output?)
-    end
-
-    def test_optional?
-      assert_equal(false, @param_source.optional?)
-      assert_equal(true, @param_overwritefiles.optional?)
-    end
-
-    def test_retval?
-      assert_equal(false, @param_source.retval?)
-      assert_equal(true, @param_p.retval?)
-    end
-
-    def test_default
-      assert_equal(nil, @param_source.default)
-      assert_equal(true, @param_overwritefiles.default)
-    end
-
-    def test_to_s
-      assert_equal(@param_source.name, @param_source.to_s)
-    end
-
-    def test_inspect
-      assert_equal("#<WIN32OLE_PARAM:Source>", @param_source.inspect)
-      assert_equal("#<WIN32OLE_PARAM:OverWriteFiles=true>", @param_overwritefiles.inspect)
-    end
-  end
-end
diff --git a/test/win32ole/test_win32ole_param_event.rb b/test/win32ole/test_win32ole_param_event.rb
deleted file mode 100644
index a659a6d0f3e18f..00000000000000
--- a/test/win32ole/test_win32ole_param_event.rb
+++ /dev/null
@@ -1,30 +0,0 @@
-begin
-  require 'win32ole'
-rescue LoadError
-end
-
-require 'test/unit'
-
-if defined?(WIN32OLE_PARAM)
-  require_relative 'available_ole'
-
-  class TestWIN32OLE_PARAM_EVENT < Test::Unit::TestCase
-    if AvailableOLE.msxml_available? || AvailableOLE.ado_available?
-      def setup
-        @param = AvailableOLE.event_param
-      end
-
-      def test_input?
-        assert_equal(true, @param.input?)
-      end
-
-      def test_output?
-        assert_equal(true, @param.output?)
-      end
-    else
-      def test_dummy_for_skip_message
-        omit 'ActiveX Data Object Library and MS XML not found'
-      end
-    end
-  end
-end
diff --git a/test/win32ole/test_win32ole_record.rb b/test/win32ole/test_win32ole_record.rb
deleted file mode 100644
index 65fd5f6a3caaba..00000000000000
--- a/test/win32ole/test_win32ole_record.rb
+++ /dev/null
@@ -1,209 +0,0 @@
-# coding: us-ascii
-# frozen_string_literal: false
-
-begin
-  require 'win32ole'
-rescue LoadError
-end
-require 'test/unit'
-
-PROGID_RBCOMTEST='RbComTest.ComSrvTest'
-
-=begin
-RbComTest.ComSrvTest is following VB.NET COM server(RbComTest solution).
-(You must check COM interoperability.)
-
-Imports System.Runtime.InteropServices
-Public Class ComSrvTest
-    <StructLayout(LayoutKind.Sequential)> _
-    Public Structure Book
-        <MarshalAs(UnmanagedType.BStr)> _
-        Public title As String
-        Public cost As Integer
-    End Structure
-
-    Public Function getBook() As Book
-        Dim book As New Book
-        book.title = "The Ruby Book"
-        book.cost = 20
-        Return book
-    End Function
-
-    Public Function getBooks() As Book()
-        Dim book() As Book = {New Book, New Book}
-        book(0).title = "The CRuby Book"
-        book(0).cost = 30
-        book(1).title = "The JRuby Book"
-        book(1).cost = 40
-        Return book
-    End Function
-
-    Public Sub getBookByRefObject(ByRef obj As Object)
-        Dim book As New Book
-        book.title = "The Ruby Reference Book"
-        book.cost = 50
-        obj = book
-    End Sub
-
-    Public Function getVer2BookByValBook(<MarshalAs(UnmanagedType.Struct)> ByVal book As Book) As Book
-        Dim ret As New Book
-        ret.title = book.title + " ver2"
-        ret.cost = book.cost * 1.1
-        Return ret
-    End Function
-
-    Public Sub getBookByRefBook(<MarshalAs(UnmanagedType.LPStruct)> ByRef book As Book)
-        book.title = "The Ruby Reference Book2"
-        book.cost = 44
-    End Sub
-
-    Public Sub getVer3BookByRefBook(<MarshalAs(UnmanagedType.LPStruct)> ByRef book As Book)
-        book.title += " ver3"
-        book.cost *= 1.2
-    End Sub
-End Class
-=end
-
-
-if defined?(WIN32OLE_RECORD)
-  def rbcomtest_exist?
-    WIN32OLE.new(PROGID_RBCOMTEST)
-    true
-  rescue WIN32OLERuntimeError
-    false
-  end
-
-  class TestWIN32OLE_RECORD_BY_RBCOMTEST < Test::Unit::TestCase
-    unless rbcomtest_exist?
-      def test_dummy_for_skip_message
-        omit "#{PROGID_RBCOMTEST} for WIN32OLE_RECORD test is not installed"
-      end
-    else
-      def setup
-        @obj = WIN32OLE.new(PROGID_RBCOMTEST)
-      end
-
-      def test_s_new_from_win32ole
-        rec = WIN32OLE_RECORD.new('Book', @obj)
-        assert(rec)
-        assert_instance_of(WIN32OLE_RECORD, rec)
-      end
-
-      def test_s_new_from_win32ole_typelib
-        tlib = @obj.ole_typelib
-        rec = WIN32OLE_RECORD.new('Book', tlib)
-        assert(rec)
-        assert_instance_of(WIN32OLE_RECORD, rec)
-      end
-
-      def test_s_new_raise
-        assert_raise(WIN32OLERuntimeError) {
-          WIN32OLE_RECORD.new('NonExistRecordName', @obj)
-        }
-        assert_raise(ArgumentError) {
-          WIN32OLE_RECORD.new
-        }
-        assert_raise(ArgumentError) {
-          WIN32OLE_RECORD.new('NonExistRecordName')
-        }
-      end
-
-      def test_to_h
-        rec = WIN32OLE_RECORD.new('Book', @obj)
-        assert_equal({'title'=>nil, 'cost'=>nil}, rec.to_h)
-      end
-
-      def test_typename
-        rec = WIN32OLE_RECORD.new('Book', @obj)
-        assert_equal('Book', rec.typename)
-      end
-
-      def test_method_missing_getter
-        rec = WIN32OLE_RECORD.new('Book', @obj)
-        assert_equal(nil, rec.title)
-        assert_raise(KeyError) {
-          rec.non_exist_name
-        }
-      end
-
-      def test_method_missing_setter
-        rec = WIN32OLE_RECORD.new('Book', @obj)
-        rec.title = "Ruby Book"
-        assert_equal("Ruby Book", rec.title)
-      end
-
-      def test_get_record_from_comserver
-        rec = @obj.getBook
-        assert_instance_of(WIN32OLE_RECORD, rec)
-        assert_equal("The Ruby Book", rec.title)
-        assert_equal(20, rec.cost)
-      end
-
-      def test_get_record_array_from_comserver
-        rec = @obj.getBooks
-        assert_instance_of(Array, rec)
-        assert_equal(2, rec.size)
-        assert_instance_of(WIN32OLE_RECORD, rec[0])
-        assert_equal("The CRuby Book", rec[0].title)
-        assert_equal(30, rec[0].cost)
-        assert_instance_of(WIN32OLE_RECORD, rec[1])
-        assert_equal("The JRuby Book", rec[1].title)
-        assert_equal(40, rec[1].cost)
-      end
-
-      def test_pass_record_parameter
-        rec = WIN32OLE_RECORD.new('Book', @obj)
-        rec.title = "Ruby Book"
-        rec.cost = 60
-        book = @obj.getVer2BookByValBook(rec)
-        assert_equal("Ruby Book ver2", book.title)
-        assert_equal(66, book.cost)
-      end
-
-      def test_pass_variant_parameter_byref
-        obj = WIN32OLE_VARIANT.new(nil, WIN32OLE::VARIANT::VT_VARIANT|WIN32OLE::VARIANT::VT_BYREF)
-        @obj.getBookByRefBook(obj)
-        assert_instance_of(WIN32OLE_RECORD, obj.value)
-        book = obj.value
-        assert_equal("The Ruby Reference Book2", book.title)
-        assert_equal(44, book.cost)
-      end
-
-      def test_pass_record_parameter_byref
-        book = WIN32OLE_RECORD.new('Book', @obj)
-        @obj.getBookByRefBook(book)
-        assert_equal("The Ruby Reference Book2", book.title)
-        assert_equal(44, book.cost)
-      end
-
-      def test_pass_and_get_record_parameter_byref
-        book = WIN32OLE_RECORD.new('Book', @obj)
-        book.title = "Ruby Book"
-        book.cost = 60
-        @obj.getVer3BookByRefBook(book)
-        assert_equal("Ruby Book ver3", book.title)
-        assert_equal(72, book.cost)
-      end
-
-      def test_ole_instance_variable_get
-        obj = WIN32OLE_RECORD.new('Book', @obj)
-        assert_equal(nil, obj.ole_instance_variable_get(:title))
-        assert_equal(nil, obj.ole_instance_variable_get('title'))
-      end
-
-      def test_ole_instance_variable_set
-        book = WIN32OLE_RECORD.new('Book', @obj)
-        book.ole_instance_variable_set(:title, "Ruby Book")
-        assert_equal("Ruby Book", book.title)
-        book.ole_instance_variable_set('title', "Ruby Book2")
-        assert_equal("Ruby Book2", book.title)
-      end
-
-      def test_inspect
-        book = WIN32OLE_RECORD.new('Book', @obj)
-        assert_equal(%q[#<WIN32OLE_RECORD(Book) {"title"=>nil, "cost"=>nil}>], book.inspect)
-      end
-    end
-  end
-
-end
diff --git a/test/win32ole/test_win32ole_type.rb b/test/win32ole/test_win32ole_type.rb
deleted file mode 100644
index 485b390d5cc0bd..00000000000000
--- a/test/win32ole/test_win32ole_type.rb
+++ /dev/null
@@ -1,200 +0,0 @@
-# frozen_string_literal: false
-begin
-  require 'win32ole'
-rescue LoadError
-end
-require "test/unit"
-
-if defined?(WIN32OLE_TYPE)
-  class TestWIN32OLE_TYPE < Test::Unit::TestCase
-
-    def test_s_progids
-      progids = WIN32OLE_TYPE.progids
-      assert_instance_of(Array, progids)
-      assert(progids.size > 0)
-      assert_instance_of(String, progids[0])
-      assert(progids.include?("Shell.Application.1"))
-    end
-
-    def test_initialize
-      assert_raise(ArgumentError) {
-        WIN32OLE_TYPE.new
-      }
-      assert_raise(ArgumentError) {
-        WIN32OLE_TYPE.new("foo")
-      }
-      assert_raise(TypeError) {
-        WIN32OLE_TYPE.new(1, 2)
-      }
-      assert_raise(TypeError) {
-        WIN32OLE_TYPE.new("Microsoft Shell Controls And Automation", 1)
-      }
-      assert_raise(WIN32OLERuntimeError) {
-        WIN32OLE_TYPE.new("Microsoft Shell Controls And Automation", "foo")
-      }
-      assert_raise(WIN32OLERuntimeError) {
-        WIN32OLE_TYPE.new("Microsoft Shell Controls And Automation", "Application")
-      }
-      ole_type = WIN32OLE_TYPE.new("Microsoft Shell Controls And Automation", "Shell")
-      assert_instance_of(WIN32OLE_TYPE, ole_type)
-      assert_equal("Shell", ole_type.name)
-      assert_equal("Class", ole_type.ole_type)
-      assert_equal("{13709620-C279-11CE-A49E-444553540000}", ole_type.guid)
-      assert_equal("Shell.Application.1", ole_type.progid)
-      assert_equal(true, ole_type.visible?)
-      assert_equal("Shell", ole_type.to_s)
-      assert_equal(0, ole_type.major_version)
-      assert_equal(0, ole_type.minor_version)
-      assert_equal(5, ole_type.typekind)
-      assert_equal("Shell Object Type Information", ole_type.helpstring)
-      assert_equal(nil, ole_type.src_type)
-      assert_equal("", ole_type.helpfile)
-      assert_equal(0, ole_type.helpcontext)
-      assert_equal([], ole_type.variables)
-      assert(ole_type.ole_methods.select{|m|/NameSpace/i =~ m.name}.size > 0)
-
-      ole_type2 = WIN32OLE_TYPE.new("{13709620-C279-11CE-A49E-444553540000}", "Shell")
-      assert_instance_of(WIN32OLE_TYPE, ole_type)
-      assert_equal(ole_type.name, ole_type2.name)
-      assert_equal(ole_type.ole_type, ole_type2.ole_type)
-      assert_equal(ole_type.guid, ole_type2.guid)
-      assert_equal(ole_type.progid, ole_type2.progid)
-      assert_equal(ole_type.visible?, ole_type2.visible?)
-      assert_equal(ole_type.to_s, ole_type2.to_s)
-      assert_equal(ole_type.major_version, ole_type2.major_version)
-      assert_equal(ole_type.minor_version, ole_type2.minor_version)
-      assert_equal(ole_type.typekind, ole_type2.typekind)
-      assert_equal(ole_type.helpstring, ole_type2.helpstring)
-      assert_equal(ole_type.src_type, ole_type2.src_type)
-      assert_equal(ole_type.helpfile, ole_type2.helpfile)
-      assert_equal(ole_type.helpcontext, ole_type2.helpcontext)
-      assert_equal(ole_type.variables.size, ole_type2.variables.size)
-      assert_equal(ole_type.ole_methods[0].name, ole_type2.ole_methods[0].name)
-      assert_equal(ole_type.ole_typelib.name, ole_type2.ole_typelib.name)
-      assert_equal(ole_type.implemented_ole_types.size, ole_type2.implemented_ole_types.size)
-      assert_equal(ole_type.inspect, ole_type2.inspect)
-    end
-
-    def setup
-      @ole_type = WIN32OLE_TYPE.new("Microsoft Shell Controls And Automation", "Shell")
-    end
-
-    def test_name
-      assert_equal("Shell", @ole_type.name)
-    end
-
-    def test_ole_type
-      assert_equal("Class", @ole_type.ole_type)
-    end
-
-    def test_guid
-      assert_equal("{13709620-C279-11CE-A49E-444553540000}", @ole_type.guid)
-    end
-
-    def test_progid
-      assert_equal("Shell.Application.1", @ole_type.progid)
-    end
-
-    def test_visible?
-      assert(@ole_type.visible?)
-      ole_type = WIN32OLE_TYPE.new("Microsoft Shell Controls And Automation", "IShellDispatch")
-      assert(!ole_type.visible?)
-    end
-
-    def test_to_s
-      assert_equal(@ole_type.to_s, @ole_type.name)
-    end
-
-    def test_major_version
-      assert_equal(0, @ole_type.major_version)
-      # ole_type = WIN32OLE_TYPE.new("Microsoft Word 11.0 Object Library", "Documents")
-      # assert_equal(8, ole_type.major_version)
-    end
-
-    def test_minor_version
-      assert_equal(0, @ole_type.minor_version)
-      # ole_type = WIN32OLE_TYPE.new("Microsoft Word 11.0 Object Library", "Documents")
-      # assert_equal(3, ole_type.minor_version)
-    end
-
-    def test_typekind
-      assert_equal(5, @ole_type.typekind)
-    end
-
-    def test_helpstring
-      assert_equal("Shell Object Type Information", @ole_type.helpstring)
-    end
-
-    def test_src_type
-      ole_type = WIN32OLE_TYPE.new("Microsoft Scripting Runtime", "DriveTypeConst")
-      assert_match(/__MIDL___MIDL_itf_scrrun_/, ole_type.src_type)
-      assert_equal(nil, @ole_type.src_type)
-    end
-
-    def test_helpfile
-      assert_equal("", @ole_type.helpfile)
-      ole_type = WIN32OLE_TYPE.new("Microsoft Scripting Runtime", "Folders")
-      assert_match(/VBENLR98\.CHM$/i, ole_type.helpfile)
-    end
-
-    def test_helpcontext
-      assert_equal(0, @ole_type.helpcontext)
-      ole_type = WIN32OLE_TYPE.new("Microsoft Scripting Runtime", "Folders")
-      assert_equal(2181929, ole_type.helpcontext)
-    end
-
-    def test_variables
-      variables = @ole_type.variables
-      assert_instance_of(Array, variables)
-      assert(variables.size == 0)
-
-      ole_type = WIN32OLE_TYPE.new("Microsoft Shell Controls And Automation", "ShellSpecialFolderConstants")
-      variables = ole_type.variables
-      assert_instance_of(Array, variables)
-      assert(variables.size > 0)
-
-      assert_instance_of(WIN32OLE_VARIABLE, variables[0])
-    end
-
-    def test_ole_methods
-      methods = @ole_type.ole_methods
-      assert_instance_of(Array, methods)
-      assert(methods.size > 0)
-      assert_instance_of(WIN32OLE_METHOD, methods[0]);
-      assert(methods.collect{|m| m.name}.include?("Application"))
-    end
-
-    def test_ole_typelib
-      tlib = @ole_type.ole_typelib
-      assert_instance_of(WIN32OLE_TYPELIB, tlib)
-      assert_equal("Microsoft Shell Controls And Automation", tlib.name)
-    end
-
-    def test_implemented_ole_types
-      ole_types = @ole_type.implemented_ole_types
-      assert_instance_of(Array, ole_types)
-      assert_equal(1, ole_types.size)
-      assert_match(/^IShellDispatch\d{0,1}$/, ole_types[0].name)
-    end
-
-    def test_inspect
-      assert_equal("#<WIN32OLE_TYPE:Shell>", @ole_type.inspect)
-    end
-
-    # WIN32OLE_TYPE.typelibs will be obsoleted.
-    def test_s_typelibs
-      tlibs = WIN32OLE_TYPE.typelibs.sort
-      tlibs2 = WIN32OLE_TYPELIB.typelibs.collect{|t|t.name}.sort
-      assert_equal(tlibs2, tlibs)
-    end
-
-    # WIN32OLE_TYPE.ole_classes will be obsoleted.
-    def test_s_ole_classes
-      ots1 = WIN32OLE_TYPE.ole_classes("Microsoft Shell Controls And Automation")
-      ots2 = WIN32OLE_TYPELIB.new("Microsoft Shell Controls And Automation").ole_types
-      otns1 = ots1.collect{|t| t.name}.sort
-      otns2 = ots2.collect{|t| t.name}.sort
-      assert_equal(otns2, otns1)
-    end
-  end
-end
diff --git a/test/win32ole/test_win32ole_type_event.rb b/test/win32ole/test_win32ole_type_event.rb
deleted file mode 100644
index ec46245cae9589..00000000000000
--- a/test/win32ole/test_win32ole_type_event.rb
+++ /dev/null
@@ -1,44 +0,0 @@
-# frozen_string_literal: false
-begin
-  require 'win32ole'
-rescue LoadError
-end
-
-require 'test/unit'
-
-if defined?(WIN32OLE_TYPE)
-  require_relative 'available_ole'
-
-  class TestWIN32OLE_TYPE_EVENT < Test::Unit::TestCase
-    unless AvailableOLE.sysmon_available?
-      def test_dummy_for_skip_message
-        omit 'System Monitor Control is not available'
-      end
-    else
-
-      def setup
-        @ole_type = WIN32OLE_TYPE.new('System Monitor Control', 'SystemMonitor')
-      end
-
-      def test_implemented_ole_types
-        ole_types = @ole_type.implemented_ole_types.map(&:name).sort
-        assert_equal(['DISystemMonitor', 'DISystemMonitorEvents', 'ISystemMonitor'], ole_types)
-      end
-
-      def test_default_ole_types
-        ole_types = @ole_type.default_ole_types.map(&:name).sort
-        assert_equal(['DISystemMonitor', 'DISystemMonitorEvents'], ole_types)
-      end
-
-      def test_source_ole_types
-        ole_types = @ole_type.source_ole_types.map(&:name)
-        assert_equal(['DISystemMonitorEvents'], ole_types)
-      end
-
-      def test_default_event_sources
-        event_sources = @ole_type.default_event_sources.map(&:name)
-        assert_equal(['DISystemMonitorEvents'], event_sources)
-      end
-    end
-  end
-end
diff --git a/test/win32ole/test_win32ole_typelib.rb b/test/win32ole/test_win32ole_typelib.rb
deleted file mode 100644
index 321c019e53ee88..00000000000000
--- a/test/win32ole/test_win32ole_typelib.rb
+++ /dev/null
@@ -1,117 +0,0 @@
-# frozen_string_literal: false
-begin
-  require 'win32ole'
-rescue LoadError
-end
-require "test/unit"
-
-if defined?(WIN32OLE_TYPELIB)
-  class TestWIN32OLE_TYPELIB < Test::Unit::TestCase
-    def test_s_typelibs
-      tlibs = WIN32OLE_TYPELIB.typelibs
-      assert_instance_of(Array, tlibs)
-      assert(tlibs.size > 0)
-      tlib = tlibs.find {|t| t.name == "Microsoft Shell Controls And Automation"}
-      assert(tlib)
-    end
-
-    def test_initialize
-      assert_raise(ArgumentError) {
-        WIN32OLE_TYPELIB.new(1,2,3,4)
-      }
-
-      assert_raise(TypeError) {
-        WIN32OLE_TYPELIB.new(100)
-      }
-
-      tlib = WIN32OLE_TYPELIB.new("Microsoft Shell Controls And Automation")
-      assert_instance_of(WIN32OLE_TYPELIB, tlib)
-
-      tlib = WIN32OLE_TYPELIB.new("Microsoft Shell Controls And Automation", 1.0)
-      assert_instance_of(WIN32OLE_TYPELIB, tlib)
-
-      tlib = WIN32OLE_TYPELIB.new("Microsoft Shell Controls And Automation", 1, 0)
-      assert_instance_of(WIN32OLE_TYPELIB, tlib)
-      guid = tlib.guid
-
-      tlib_by_guid = WIN32OLE_TYPELIB.new(guid, 1, 0)
-      assert_instance_of(WIN32OLE_TYPELIB, tlib_by_guid)
-      assert_equal("Microsoft Shell Controls And Automation" , tlib_by_guid.name)
-
-      path = tlib.path
-      tlib_by_path =  WIN32OLE_TYPELIB.new(path)
-      assert_equal("Microsoft Shell Controls And Automation" , tlib_by_path.name)
-
-      assert_raise(WIN32OLERuntimeError) {
-        WIN32OLE_TYPELIB.new("Non Exist Type Library")
-      }
-    end
-
-    # #Bug:3907 [ruby-dev:42338]
-    def test_initialize_with_REG_EXPAND_SZ
-      tlib = WIN32OLE_TYPELIB.new("Disk Management Snap-In Object Library")
-      assert_instance_of(WIN32OLE_TYPELIB, tlib)
-    end
-
-    def test_guid
-      tlib = WIN32OLE_TYPELIB.new("Microsoft Shell Controls And Automation")
-      assert_equal("{50A7E9B0-70EF-11D1-B75A-00A0C90564FE}", tlib.guid)
-    end
-
-    def test_name
-      tlib = WIN32OLE_TYPELIB.new("Microsoft Shell Controls And Automation")
-      assert_equal("Microsoft Shell Controls And Automation", tlib.name)
-      tlib = WIN32OLE_TYPELIB.new("{50A7E9B0-70EF-11D1-B75A-00A0C90564FE}")
-      assert_equal("Microsoft Shell Controls And Automation", tlib.name)
-    end
-
-    def test_version
-      tlib = WIN32OLE_TYPELIB.new("Microsoft Shell Controls And Automation")
-      assert_equal("1.0", tlib.version)
-    end
-
-    def test_major_version
-      tlib = WIN32OLE_TYPELIB.new("Microsoft Shell Controls And Automation")
-      assert_equal(1, tlib.major_version)
-    end
-
-    def test_minor_version
-      tlib = WIN32OLE_TYPELIB.new("Microsoft Shell Controls And Automation")
-      assert_equal(0, tlib.minor_version)
-    end
-
-    def test_path
-      tlib = WIN32OLE_TYPELIB.new("Microsoft Shell Controls And Automation")
-      assert_match(/shell32\.dll$/i, tlib.path)
-    end
-
-    def test_visible?
-      tlib = WIN32OLE_TYPELIB.new("Microsoft Shell Controls And Automation")
-      assert(tlib.visible?)
-    end
-
-    def test_library_name
-      tlib = WIN32OLE_TYPELIB.new("Microsoft Shell Controls And Automation")
-      assert_equal("Shell32", tlib.library_name)
-    end
-
-    def test_to_s
-      tlib = WIN32OLE_TYPELIB.new("Microsoft Shell Controls And Automation")
-      assert_equal("Microsoft Shell Controls And Automation", tlib.to_s)
-    end
-
-    def test_ole_types
-      tlib = WIN32OLE_TYPELIB.new("Microsoft Shell Controls And Automation")
-      ole_types = tlib.ole_types
-      assert_instance_of(Array, ole_types)
-      assert(ole_types.size > 0)
-      assert_instance_of(WIN32OLE_TYPE, ole_types[0])
-    end
-
-    def test_inspect
-      tlib = WIN32OLE_TYPELIB.new("Microsoft Shell Controls And Automation")
-      assert_equal("#<WIN32OLE_TYPELIB:Microsoft Shell Controls And Automation>", tlib.inspect)
-    end
-
-  end
-end
diff --git a/test/win32ole/test_win32ole_variable.rb b/test/win32ole/test_win32ole_variable.rb
deleted file mode 100644
index 8af3f987a8fc7f..00000000000000
--- a/test/win32ole/test_win32ole_variable.rb
+++ /dev/null
@@ -1,66 +0,0 @@
-# frozen_string_literal: false
-begin
-  require 'win32ole'
-rescue LoadError
-end
-require "test/unit"
-
-if defined?(WIN32OLE_VARIABLE)
-  class TestWIN32OLE_VARIABLE < Test::Unit::TestCase
-
-    def setup
-      ole_type = WIN32OLE_TYPE.new("Microsoft Shell Controls And Automation", "ShellSpecialFolderConstants")
-      @var1 = ole_type.variables.find {|v| v.name == 'ssfDESKTOP'}
-
-      variables = WIN32OLE_TYPE.new("Microsoft Windows Installer Object Library", "Installer").variables
-      @var2 = variables.find {|v| v.name == 'UILevel'}
-    end
-
-    def test_initialize
-      assert_raise(TypeError) {WIN32OLE_VARIABLE.new}
-    end
-
-    def test_name
-      assert_equal('ssfDESKTOP', @var1.name)
-    end
-
-    def test_ole_type
-      assert_equal('INT', @var1.ole_type)
-      assert_equal('MsiUILevel', @var2.ole_type)
-    end
-
-    def test_ole_type_detail
-      assert_equal(['INT'], @var1.ole_type_detail)
-      assert_equal(['USERDEFINED', 'MsiUILevel'], @var2.ole_type_detail)
-    end
-
-    def test_ole_type_value
-      assert_equal(0, @var1.value)
-      assert_equal(nil, @var2.value)
-    end
-
-    def test_ole_type_visible?
-      assert(@var1.visible?)
-    end
-
-    def test_ole_type_variable_kind
-      assert_equal("CONSTANT", @var1.variable_kind)
-      assert_equal("DISPATCH", @var2.variable_kind)
-    end
-
-    def test_ole_type_varkind
-      assert_equal(2, @var1.varkind)
-      assert_equal(3, @var2.varkind)
-    end
-
-    def test_to_s
-      assert_equal(@var1.name, @var1.to_s)
-    end
-
-    def test_inspect
-      assert_equal("#<WIN32OLE_VARIABLE:ssfDESKTOP=0>",  @var1.inspect)
-      assert_equal("#<WIN32OLE_VARIABLE:UILevel=nil>", @var2.inspect)
-    end
-
-  end
-end
diff --git a/test/win32ole/test_win32ole_variant.rb b/test/win32ole/test_win32ole_variant.rb
deleted file mode 100644
index 1cedf55ef3b5b1..00000000000000
--- a/test/win32ole/test_win32ole_variant.rb
+++ /dev/null
@@ -1,722 +0,0 @@
-# frozen_string_literal: false
-begin
-  require 'win32ole'
-rescue LoadError
-end
-require "test/unit"
-
-if defined?(WIN32OLE_VARIANT)
-
-  class TestWIN32OLE_VARIANT < Test::Unit::TestCase
-    def setup
-      @orglocale = WIN32OLE.locale
-      WIN32OLE.locale = 0x0409 # set locale  US-Eng
-    end
-
-    def teardown
-      WIN32OLE.locale = @orglocale
-    end
-
-    def test_s_new
-      obj = WIN32OLE_VARIANT.new('foo')
-      assert_instance_of(WIN32OLE_VARIANT, obj)
-    end
-
-    def test_s_new_exc
-      assert_raise(TypeError) {
-        WIN32OLE_VARIANT.new(/foo/)
-      }
-    end
-
-    def test_s_new_ary
-      obj = WIN32OLE_VARIANT.new([1])
-      assert_instance_of(WIN32OLE_VARIANT, obj)
-      assert_raise(TypeError) {
-        WIN32OLE_VARIANT.new([/foo/])
-      }
-    end
-
-    def test_s_new_no_argument
-      pat = /wrong number of arguments \(.*\b0\b.* 1\.\.3\)/
-      assert_raise_with_message(ArgumentError, pat) do
-        WIN32OLE_VARIANT.new
-      end
-    end
-
-    def test_s_new_one_argument
-      ex = nil
-      begin
-        WIN32OLE_VARIANT.new('foo')
-      rescue
-        ex = $!
-      end
-      assert_equal(nil, ex);
-    end
-
-    def test_s_new_with_nil
-      obj = WIN32OLE_VARIANT.new(nil, WIN32OLE::VARIANT::VT_I2)
-      assert_equal(0, obj.value)
-      assert_equal(WIN32OLE::VARIANT::VT_I2, obj.vartype)
-
-      obj = WIN32OLE_VARIANT.new(nil, WIN32OLE::VARIANT::VT_I4)
-      assert_equal(0, obj.value)
-      assert_equal(WIN32OLE::VARIANT::VT_I4, obj.vartype)
-
-      obj = WIN32OLE_VARIANT.new(nil, WIN32OLE::VARIANT::VT_R4)
-      assert_equal(0, obj.value)
-      assert_equal(WIN32OLE::VARIANT::VT_R4, obj.vartype)
-
-      obj = WIN32OLE_VARIANT.new(nil, WIN32OLE::VARIANT::VT_R8)
-      assert_equal(0, obj.value)
-      assert_equal(WIN32OLE::VARIANT::VT_R8, obj.vartype)
-
-      obj = WIN32OLE_VARIANT.new(nil, WIN32OLE::VARIANT::VT_CY)
-      assert_equal("0", obj.value)
-      assert_equal(WIN32OLE::VARIANT::VT_CY, obj.vartype)
-
-      obj = WIN32OLE_VARIANT.new(nil, WIN32OLE::VARIANT::VT_DATE)
-      assert_equal(Time.new(1899,12,30), obj.value)
-      assert_equal(WIN32OLE::VARIANT::VT_DATE, obj.vartype)
-
-      obj = WIN32OLE_VARIANT.new(nil, WIN32OLE::VARIANT::VT_BSTR)
-      assert_equal("", obj.value)
-      assert_equal(WIN32OLE::VARIANT::VT_BSTR, obj.vartype)
-
-      obj = WIN32OLE_VARIANT.new(nil, WIN32OLE::VARIANT::VT_DISPATCH)
-      assert_nil(obj.value)
-      assert_equal(WIN32OLE::VARIANT::VT_DISPATCH, obj.vartype)
-
-      obj = WIN32OLE_VARIANT.new(nil, WIN32OLE::VARIANT::VT_BOOL)
-      assert_equal(false, obj.value)
-      assert_equal(WIN32OLE::VARIANT::VT_BOOL, obj.vartype)
-
-      obj = WIN32OLE_VARIANT.new(nil, WIN32OLE::VARIANT::VT_VARIANT)
-      assert_nil(obj.value)
-      assert_equal(WIN32OLE::VARIANT::VT_VARIANT, obj.vartype)
-
-      obj = WIN32OLE_VARIANT.new(nil, WIN32OLE::VARIANT::VT_I1)
-      assert_equal(0, obj.value)
-      assert_equal(WIN32OLE::VARIANT::VT_I1, obj.vartype)
-
-      obj = WIN32OLE_VARIANT.new(nil, WIN32OLE::VARIANT::VT_UI1)
-      assert_equal(0, obj.value)
-      assert_equal(WIN32OLE::VARIANT::VT_UI1, obj.vartype)
-
-      obj = WIN32OLE_VARIANT.new(nil, WIN32OLE::VARIANT::VT_UI2)
-      assert_equal(0, obj.value)
-      assert_equal(WIN32OLE::VARIANT::VT_UI2, obj.vartype)
-
-      obj = WIN32OLE_VARIANT.new(nil, WIN32OLE::VARIANT::VT_UI4)
-      assert_equal(0, obj.value)
-      assert_equal(WIN32OLE::VARIANT::VT_UI4, obj.vartype)
-
-
-      if defined?(WIN32OLE::VARIANT::VT_I8)
-        obj = WIN32OLE_VARIANT.new(nil, WIN32OLE::VARIANT::VT_I8)
-        assert_equal(0, obj.value)
-        assert_equal(WIN32OLE::VARIANT::VT_I8, obj.vartype)
-      end
-
-      if defined?(WIN32OLE::VARIANT::VT_UI8)
-        obj = WIN32OLE_VARIANT.new(nil, WIN32OLE::VARIANT::VT_UI8)
-        assert_equal(0, obj.value)
-        assert_equal(WIN32OLE::VARIANT::VT_UI8, obj.vartype)
-      end
-
-      obj = WIN32OLE_VARIANT.new(nil, WIN32OLE::VARIANT::VT_INT)
-      assert_equal(0, obj.value)
-      assert_equal(WIN32OLE::VARIANT::VT_INT, obj.vartype)
-
-      obj = WIN32OLE_VARIANT.new(nil, WIN32OLE::VARIANT::VT_UINT)
-      assert_equal(0, obj.value)
-      assert_equal(WIN32OLE::VARIANT::VT_UINT, obj.vartype)
-    end
-
-    def test_s_new_with_non_nil
-      obj = WIN32OLE_VARIANT.new(2, WIN32OLE::VARIANT::VT_I2)
-      assert_equal(2, obj.value)
-      assert_equal(WIN32OLE::VARIANT::VT_I2, obj.vartype)
-
-      obj = WIN32OLE_VARIANT.new(3, WIN32OLE::VARIANT::VT_I4)
-      assert_equal(3, obj.value)
-      assert_equal(WIN32OLE::VARIANT::VT_I4, obj.vartype)
-
-      obj = WIN32OLE_VARIANT.new(4.5, WIN32OLE::VARIANT::VT_R4)
-      assert_equal(4.5, obj.value)
-      assert_equal(WIN32OLE::VARIANT::VT_R4, obj.vartype)
-
-      obj = WIN32OLE_VARIANT.new(5.5, WIN32OLE::VARIANT::VT_R8)
-      assert_equal(5.5, obj.value)
-      assert_equal(WIN32OLE::VARIANT::VT_R8, obj.vartype)
-
-      obj = WIN32OLE_VARIANT.new(600, WIN32OLE::VARIANT::VT_CY)
-      assert_equal("600", obj.value)
-      assert_equal(WIN32OLE::VARIANT::VT_CY, obj.vartype)
-
-      obj = WIN32OLE_VARIANT.new("2001-06-15 12:17:34", WIN32OLE::VARIANT::VT_DATE)
-      assert_equal(Time.new(2001,06,15,12,17,34), obj.value)
-      assert_equal(WIN32OLE::VARIANT::VT_DATE, obj.vartype)
-
-      obj = WIN32OLE_VARIANT.new("foo", WIN32OLE::VARIANT::VT_BSTR)
-      assert_equal("foo", obj.value)
-      assert_equal(WIN32OLE::VARIANT::VT_BSTR, obj.vartype)
-
-      obj = WIN32OLE_VARIANT.new(true, WIN32OLE::VARIANT::VT_BOOL)
-      assert_equal(true, obj.value)
-      assert_equal(WIN32OLE::VARIANT::VT_BOOL, obj.vartype)
-
-      obj = WIN32OLE_VARIANT.new(2, WIN32OLE::VARIANT::VT_I1)
-      assert_equal(2, obj.value)
-      assert_equal(WIN32OLE::VARIANT::VT_I1, obj.vartype)
-
-      obj = WIN32OLE_VARIANT.new(3, WIN32OLE::VARIANT::VT_UI1)
-      assert_equal(3, obj.value)
-      assert_equal(WIN32OLE::VARIANT::VT_UI1, obj.vartype)
-
-      obj = WIN32OLE_VARIANT.new(4, WIN32OLE::VARIANT::VT_UI2)
-      assert_equal(4, obj.value)
-      assert_equal(WIN32OLE::VARIANT::VT_UI2, obj.vartype)
-
-      obj = WIN32OLE_VARIANT.new(5, WIN32OLE::VARIANT::VT_UI4)
-      assert_equal(5, obj.value)
-      assert_equal(WIN32OLE::VARIANT::VT_UI4, obj.vartype)
-
-      if defined?(WIN32OLE::VARIANT::VT_I8)
-        obj = WIN32OLE_VARIANT.new(-123456789012345, WIN32OLE::VARIANT::VT_I8)
-        assert_equal(-123456789012345, obj.value)
-        assert_equal(WIN32OLE::VARIANT::VT_I8, obj.vartype)
-      end
-
-      if defined?(WIN32OLE::VARIANT::VT_UI8)
-        obj = WIN32OLE_VARIANT.new(123456789012345, WIN32OLE::VARIANT::VT_UI8)
-        assert_equal(123456789012345, obj.value)
-        assert_equal(WIN32OLE::VARIANT::VT_UI8, obj.vartype)
-      end
-
-      obj = WIN32OLE_VARIANT.new(4, WIN32OLE::VARIANT::VT_INT)
-      assert_equal(4, obj.value)
-      assert_equal(WIN32OLE::VARIANT::VT_INT, obj.vartype)
-
-      obj = WIN32OLE_VARIANT.new(5, WIN32OLE::VARIANT::VT_UINT)
-      assert_equal(5, obj.value)
-      assert_equal(WIN32OLE::VARIANT::VT_UINT, obj.vartype)
-    end
-
-    def test_s_new_with_non_nil_byref
-      obj = WIN32OLE_VARIANT.new(2, WIN32OLE::VARIANT::VT_I2|WIN32OLE::VARIANT::VT_BYREF)
-      assert_equal(2, obj.value)
-      assert_equal(WIN32OLE::VARIANT::VT_I2|WIN32OLE::VARIANT::VT_BYREF, obj.vartype)
-
-      obj = WIN32OLE_VARIANT.new(3, WIN32OLE::VARIANT::VT_I4|WIN32OLE::VARIANT::VT_BYREF)
-      assert_equal(3, obj.value)
-      assert_equal(WIN32OLE::VARIANT::VT_I4|WIN32OLE::VARIANT::VT_BYREF, obj.vartype)
-
-      obj = WIN32OLE_VARIANT.new(4.5, WIN32OLE::VARIANT::VT_R4|WIN32OLE::VARIANT::VT_BYREF)
-      assert_equal(4.5, obj.value)
-      assert_equal(WIN32OLE::VARIANT::VT_R4|WIN32OLE::VARIANT::VT_BYREF, obj.vartype)
-
-      obj = WIN32OLE_VARIANT.new(5.5, WIN32OLE::VARIANT::VT_R8|WIN32OLE::VARIANT::VT_BYREF)
-      assert_equal(5.5, obj.value)
-      assert_equal(WIN32OLE::VARIANT::VT_R8|WIN32OLE::VARIANT::VT_BYREF, obj.vartype)
-
-      obj = WIN32OLE_VARIANT.new(600, WIN32OLE::VARIANT::VT_CY|WIN32OLE::VARIANT::VT_BYREF)
-      assert_equal("600", obj.value)
-      assert_equal(WIN32OLE::VARIANT::VT_CY|WIN32OLE::VARIANT::VT_BYREF, obj.vartype)
-
-      obj = WIN32OLE_VARIANT.new("2001-06-15 12:17:34", WIN32OLE::VARIANT::VT_DATE|WIN32OLE::VARIANT::VT_BYREF)
-      assert_equal(Time.new(2001,06,15,12,17,34), obj.value)
-      assert_equal(WIN32OLE::VARIANT::VT_DATE|WIN32OLE::VARIANT::VT_BYREF, obj.vartype)
-
-      obj = WIN32OLE_VARIANT.new("foo", WIN32OLE::VARIANT::VT_BSTR|WIN32OLE::VARIANT::VT_BYREF)
-      assert_equal("foo", obj.value)
-      assert_equal(WIN32OLE::VARIANT::VT_BSTR|WIN32OLE::VARIANT::VT_BYREF, obj.vartype)
-
-      obj = WIN32OLE_VARIANT.new(true, WIN32OLE::VARIANT::VT_BOOL|WIN32OLE::VARIANT::VT_BYREF)
-      assert_equal(true, obj.value)
-      assert_equal(WIN32OLE::VARIANT::VT_BOOL|WIN32OLE::VARIANT::VT_BYREF, obj.vartype)
-
-      obj = WIN32OLE_VARIANT.new(2, WIN32OLE::VARIANT::VT_I1|WIN32OLE::VARIANT::VT_BYREF)
-      assert_equal(2, obj.value)
-      assert_equal(WIN32OLE::VARIANT::VT_I1|WIN32OLE::VARIANT::VT_BYREF, obj.vartype)
-
-      obj = WIN32OLE_VARIANT.new(3, WIN32OLE::VARIANT::VT_UI1|WIN32OLE::VARIANT::VT_BYREF)
-      assert_equal(3, obj.value)
-      assert_equal(WIN32OLE::VARIANT::VT_UI1|WIN32OLE::VARIANT::VT_BYREF, obj.vartype)
-
-      obj = WIN32OLE_VARIANT.new(4, WIN32OLE::VARIANT::VT_UI2|WIN32OLE::VARIANT::VT_BYREF)
-      assert_equal(4, obj.value)
-      assert_equal(WIN32OLE::VARIANT::VT_UI2|WIN32OLE::VARIANT::VT_BYREF, obj.vartype)
-
-      obj = WIN32OLE_VARIANT.new(5, WIN32OLE::VARIANT::VT_UI4|WIN32OLE::VARIANT::VT_BYREF)
-      assert_equal(5, obj.value)
-      assert_equal(WIN32OLE::VARIANT::VT_UI4|WIN32OLE::VARIANT::VT_BYREF, obj.vartype)
-
-      obj = WIN32OLE_VARIANT.new(4, WIN32OLE::VARIANT::VT_INT|WIN32OLE::VARIANT::VT_BYREF)
-      assert_equal(4, obj.value)
-      assert_equal(WIN32OLE::VARIANT::VT_INT|WIN32OLE::VARIANT::VT_BYREF, obj.vartype)
-
-      obj = WIN32OLE_VARIANT.new(5, WIN32OLE::VARIANT::VT_UINT|WIN32OLE::VARIANT::VT_BYREF)
-      assert_equal(5, obj.value)
-      assert_equal(WIN32OLE::VARIANT::VT_UINT|WIN32OLE::VARIANT::VT_BYREF, obj.vartype)
-    end
-
-    def test_s_new_with_i8_byref
-      obj = WIN32OLE_VARIANT.new(-123456789012345, WIN32OLE::VARIANT::VT_I8|WIN32OLE::VARIANT::VT_BYREF)
-      assert_equal(-123456789012345, obj.value)
-      assert_equal(WIN32OLE::VARIANT::VT_I8|WIN32OLE::VARIANT::VT_BYREF, obj.vartype)
-    end
-
-    def test_s_new_with_ui8_byref
-      obj = WIN32OLE_VARIANT.new(123456789012345, WIN32OLE::VARIANT::VT_UI8|WIN32OLE::VARIANT::VT_BYREF)
-      assert_equal(123456789012345, obj.value)
-      assert_equal(WIN32OLE::VARIANT::VT_UI8|WIN32OLE::VARIANT::VT_BYREF, obj.vartype)
-    end
-
-    def test_value
-      obj = WIN32OLE_VARIANT.new('foo')
-      assert_equal('foo', obj.value)
-    end
-
-    def test_s_new_2_argument
-      obj = WIN32OLE_VARIANT.new('foo', WIN32OLE::VARIANT::VT_BSTR|WIN32OLE::VARIANT::VT_BYREF)
-      assert_equal('foo', obj.value);
-    end
-
-    def test_s_new_2_argument2
-      obj = WIN32OLE_VARIANT.new('foo', WIN32OLE::VARIANT::VT_BSTR)
-      assert_equal('foo', obj.value);
-    end
-
-    def test_s_new_dispatch_array
-      vt = WIN32OLE::VARIANT::VT_ARRAY|WIN32OLE::VARIANT::VT_DISPATCH
-      obj = WIN32OLE_VARIANT.new(nil, vt)
-      assert_equal(vt, obj.vartype)
-      assert_nil(obj.value)
-
-      vt = WIN32OLE::VARIANT::VT_ARRAY|WIN32OLE::VARIANT::VT_DISPATCH|WIN32OLE::VARIANT::VT_BYREF
-      obj = WIN32OLE_VARIANT.new(nil, vt)
-      assert_equal(vt, obj.vartype)
-      assert_nil(obj.value)
-    end
-
-    def test_s_new_array
-      # should not occur stack over flow
-      ar = (1..500000).to_a.map{|i| [i]}
-      ar2 = WIN32OLE_VARIANT.new(ar)
-      assert_equal(ar, ar2.value)
-    end
-
-    def test_s_new_vt_record_exc
-      # VT_RECORD (= 36) should not be allowed in WIN32OLE_VARIANT#new
-      assert_raise(ArgumentError) {
-        WIN32OLE_VARIANT.new(nil, 36)
-      }
-    end
-
-    def test_s_array
-      obj = WIN32OLE_VARIANT.array([2,3], WIN32OLE::VARIANT::VT_I4)
-      assert_instance_of(WIN32OLE_VARIANT, obj)
-      assert_equal(WIN32OLE::VARIANT::VT_I4|WIN32OLE::VARIANT::VT_ARRAY, obj.vartype)
-      assert_equal([[0, 0, 0],[0, 0, 0]], obj.value)
-
-      obj = WIN32OLE_VARIANT.array([2,3], WIN32OLE::VARIANT::VT_I4|WIN32OLE::VARIANT::VT_BYREF)
-      assert_equal(WIN32OLE::VARIANT::VT_I4|WIN32OLE::VARIANT::VT_BYREF|WIN32OLE::VARIANT::VT_ARRAY, obj.vartype)
-      assert_equal([[0, 0, 0],[0, 0, 0]], obj.value)
-
-      obj = WIN32OLE_VARIANT.array([2,3], WIN32OLE::VARIANT::VT_I4|WIN32OLE::VARIANT::VT_ARRAY)
-      assert_instance_of(WIN32OLE_VARIANT, obj)
-      assert_equal(WIN32OLE::VARIANT::VT_I4|WIN32OLE::VARIANT::VT_ARRAY, obj.vartype)
-      assert_equal([[0, 0, 0],[0, 0, 0]], obj.value)
-
-      assert_equal(0, obj[0,0])
-      obj[0,0] = 10
-      assert_equal([[10, 0, 0],[0, 0, 0]], obj.value)
-      obj[0,1] = "13.2"
-      assert_equal([[10, 13, 0],[0, 0, 0]], obj.value)
-
-      obj = WIN32OLE_VARIANT.array([3, 2], WIN32OLE::VARIANT::VT_VARIANT)
-      obj[0,0] = 10
-      obj[0,1] = "string"
-      obj[1,0] = 12.735
-      assert_equal([[10, "string"],[12.735, nil],[nil,nil]], obj.value)
-
-      obj = WIN32OLE_VARIANT.array([2,3], WIN32OLE::VARIANT::VT_DISPATCH)
-      assert_equal([[nil, nil, nil],[nil,nil,nil]], obj.value)
-
-    end
-
-    def test_s_array_exc
-      assert_raise(TypeError) {
-        WIN32OLE_VARIANT.array(2, WIN32OLE::VARIANT::VT_I4)
-      }
-    end
-
-    def test_conversion_num2str
-      obj = WIN32OLE_VARIANT.new(124, WIN32OLE::VARIANT::VT_BSTR)
-      assert_equal("124", obj.value);
-    end
-
-    def test_conversion_float2int
-      obj = WIN32OLE_VARIANT.new(12.345, WIN32OLE::VARIANT::VT_I4)
-      assert_equal(12, obj.value)
-      obj = WIN32OLE_VARIANT.new(12.345, WIN32OLE::VARIANT::VT_I4|WIN32OLE::VARIANT::VT_BYREF)
-      assert_equal(12, obj.value)
-    end
-
-    def test_conversion_str2num
-      obj = WIN32OLE_VARIANT.new("12.345", WIN32OLE::VARIANT::VT_R8)
-      assert_equal(12.345, obj.value)
-    end
-
-    def test_conversion_ole_variant2ole_variant
-      obj = WIN32OLE_VARIANT.new("12.345", WIN32OLE::VARIANT::VT_R4)
-      obj = WIN32OLE_VARIANT.new(obj, WIN32OLE::VARIANT::VT_I4)
-      assert_equal(12, obj.value)
-    end
-
-    def test_conversion_str2date
-      obj = WIN32OLE_VARIANT.new("2004-12-24 12:24:45", WIN32OLE::VARIANT::VT_DATE)
-      assert_equal(Time.new(2004,12,24,12,24,45), obj.value)
-    end
-
-    def test_conversion_time2date
-      dt = Time.mktime(2004, 12, 24, 12, 24, 45)
-      obj = WIN32OLE_VARIANT.new(dt, WIN32OLE::VARIANT::VT_DATE)
-      assert_equal(dt, obj.value)
-    end
-
-    def test_conversion_dbl2date_with_msec
-      # Date is "2014/8/27 12:34:56.789"
-      obj = WIN32OLE_VARIANT.new(41878.524268391200167, WIN32OLE::VARIANT::VT_DATE)
-      t = obj.value
-      assert_equal("2014-08-27 12:34:56", t.strftime('%Y-%m-%d %H:%M:%S'))
-      assert_in_delta(0.789, t.nsec / 1000000000.0, 0.001)
-    end
-
-    def test_conversion_time2date_with_msec
-      t0 = Time.new(2014, 8, 27, 12, 34, 56)
-      t0 += 0.789
-      t1 = WIN32OLE_VARIANT.new(t0).value
-
-      # The t0.nsec is 789000000 and t1.nsec is 789000465
-      # because of error range by conversion Time between VT_DATE Variant.
-      # So check t1 and t0 are in error by less than one millisecond.
-      msg = "Expected:#{t0.strftime('%Y-%m-%dT%H:%M:%S.%N')} but was:#{t1.strftime('%Y-%m-%dT%H:%M:%S.%N')}"
-      assert_in_delta(t0, t1, 0.001, msg)
-
-      t0 = Time.new(2014, 8, 27, 12, 34, 56)
-      t0 += 0.999999999
-      t1 = WIN32OLE_VARIANT.new(t0).value
-      msg = "Expected:#{t0.strftime('%Y-%m-%dT%H:%M:%S.%N')} but was:#{t1.strftime('%Y-%m-%dT%H:%M:%S.%N')}"
-
-      # The t0 is "2014/08/27 12:34.56.999999999" and
-      # the t1 is "2014/08/27 12:34:57.000000628"
-      assert_in_delta(t0, t1, 0.001, msg)
-
-      t0 = Time.now
-      t1 = WIN32OLE_VARIANT.new(t0).value
-      msg = "Expected:#{t0.strftime('%Y-%m-%dT%H:%M:%S.%N')} but was:#{t1.strftime('%Y-%m-%dT%H:%M:%S.%N')}"
-      assert_in_delta(t0, t1, 0.001, msg)
-    end
-
-    # this test failed because of VariantTimeToSystemTime
-    # and SystemTimeToVariantTime API ignores wMilliseconds
-    # member of SYSTEMTIME  struct.
-    #
-    # def test_conversion_time_nsec2date
-    #   dt = Time.new(2004, 12,24, 12, 24, 45)
-    #   dt += 0.1
-    #   obj = WIN32OLE_VARIANT.new(dt, WIN32OLE::VARIANT::VT_DATE)
-    #   assert_equal(dt, obj.value)
-    # end
-
-    def test_conversion_str2cy
-      begin
-        WIN32OLE.locale = 0x0411 # set locale Japanese
-      rescue WIN32OLERuntimeError
-        omit("Japanese locale is not installed")
-      end
-      if WIN32OLE.locale == 0x0411
-        obj = WIN32OLE_VARIANT.new("\\10,000", WIN32OLE::VARIANT::VT_CY)
-        assert_equal("10000", obj.value)
-      end
-    end
-
-    def test_create_vt_array
-      obj = WIN32OLE_VARIANT.new([1.2, 2.3], WIN32OLE::VARIANT::VT_ARRAY|WIN32OLE::VARIANT::VT_R8)
-      assert_equal([1.2, 2.3], obj.value)
-      assert_equal(WIN32OLE::VARIANT::VT_ARRAY|WIN32OLE::VARIANT::VT_R8, obj.vartype)
-
-      obj = WIN32OLE_VARIANT.new([1.2, 2.3], WIN32OLE::VARIANT::VT_ARRAY|WIN32OLE::VARIANT::VT_R8|WIN32OLE::VARIANT::VT_BYREF)
-      assert_equal([1.2, 2.3], obj.value)
-      assert_equal(WIN32OLE::VARIANT::VT_ARRAY|WIN32OLE::VARIANT::VT_R8|WIN32OLE::VARIANT::VT_BYREF, obj.vartype)
-    end
-
-    def test_create_vt_array2
-      obj = WIN32OLE_VARIANT.new([1.2, "a"], WIN32OLE::VARIANT::VT_ARRAY)
-      assert_equal([1.2, "a"], obj.value)
-      assert_equal(WIN32OLE::VARIANT::VT_ARRAY|WIN32OLE::VARIANT::VT_VARIANT, obj.vartype)
-
-      obj = WIN32OLE_VARIANT.new([1.2, "a"])
-      assert_equal([1.2, "a"], obj.value)
-      assert_equal(WIN32OLE::VARIANT::VT_ARRAY|WIN32OLE::VARIANT::VT_VARIANT, obj.vartype)
-    end
-
-
-    def test_create_vt_nested_array
-      obj = WIN32OLE_VARIANT.new([[1.2, "a", "b"], [3.4, "C", "D"]], WIN32OLE::VARIANT::VT_ARRAY)
-      assert_equal([[1.2, "a", "b"], [3.4, "C", "D"]], obj.value)
-
-      obj = WIN32OLE_VARIANT.new([[1.2, "a", "b"], [3.4, "C", "D"]])
-      assert_equal([[1.2, "a", "b"], [3.4, "C", "D"]], obj.value)
-
-      obj = WIN32OLE_VARIANT.new([[1.2, "a", "b"], [3.4, "C", "D"], [5.6, "E", "F"]])
-      assert_equal([[1.2, "a", "b"], [3.4, "C", "D"], [5.6, "E", "F"]], obj.value)
-
-      obj = WIN32OLE_VARIANT.new([[[1.2], [3.4]], [[5.6], [7.8]], [[9.1],[9.2]]])
-      assert_equal([[[1.2], [3.4]], [[5.6], [7.8]], [[9.1],[9.2]]], obj.value)
-    end
-
-    def test_create_vt_array3
-      obj = WIN32OLE_VARIANT.new([])
-      assert_equal([], obj.value)
-
-      obj = WIN32OLE_VARIANT.new([[]])
-      assert_equal([[]], obj.value)
-
-      obj = WIN32OLE_VARIANT.new([[],[]])
-      assert_equal([[],[]], obj.value)
-
-      obj = WIN32OLE_VARIANT.new([], WIN32OLE::VARIANT::VT_ARRAY|WIN32OLE::VARIANT::VT_BYREF)
-      assert_equal([], obj.value)
-
-      obj = WIN32OLE_VARIANT.new([[]], WIN32OLE::VARIANT::VT_ARRAY|WIN32OLE::VARIANT::VT_BYREF)
-      assert_equal([[]], obj.value)
-
-      obj = WIN32OLE_VARIANT.new([[],[]], WIN32OLE::VARIANT::VT_ARRAY|WIN32OLE::VARIANT::VT_BYREF)
-      assert_equal([[],[]], obj.value)
-    end
-
-    def test_create_vt_array_nil
-      vartype = WIN32OLE::VARIANT::VT_ARRAY|WIN32OLE::VARIANT::VT_DISPATCH|WIN32OLE::VARIANT::VT_BYREF
-      obj = WIN32OLE_VARIANT.new(nil, vartype)
-      assert_nil(obj.value)
-      assert_equal(vartype, obj.vartype)
-
-      vartype = WIN32OLE::VARIANT::VT_ARRAY|WIN32OLE::VARIANT::VT_DISPATCH
-      obj = WIN32OLE_VARIANT.new(nil, vartype)
-      assert_nil(obj.value)
-      assert_equal(vartype, obj.vartype)
-    end
-
-    def test_create_vt_array_str
-      vartype = WIN32OLE::VARIANT::VT_ARRAY|WIN32OLE::VARIANT::VT_BSTR
-      obj = WIN32OLE_VARIANT.new(["abc", "123"], vartype)
-      assert_equal(vartype, obj.vartype)
-      assert_equal(["abc", "123"], obj.value)
-
-      vartype = WIN32OLE::VARIANT::VT_ARRAY|WIN32OLE::VARIANT::VT_BYREF|WIN32OLE::VARIANT::VT_BSTR
-      obj = WIN32OLE_VARIANT.new(["abc", "123"], vartype)
-      assert_equal(vartype, obj.vartype)
-      assert_equal(["abc", "123"], obj.value)
-    end
-
-    def test_create_vt_array_exc
-      exc = assert_raise(TypeError) {
-        WIN32OLE_VARIANT.new("", WIN32OLE::VARIANT::VT_ARRAY)
-      }
-      assert_match(/wrong argument type String \(expected Array\)/, exc.message)
-    end
-
-    def test_create_vt_array_str2ui1array
-      obj = WIN32OLE_VARIANT.new("ABC", WIN32OLE::VARIANT::VT_ARRAY|WIN32OLE::VARIANT::VT_UI1)
-      assert_equal("ABC", obj.value)
-
-      obj.value = "DEF"
-      assert_equal("DEF", obj.value)
-      obj[0] = 71
-      assert_equal("GEF", obj.value)
-
-      obj = WIN32OLE_VARIANT.new([65, 0].pack("C*"), WIN32OLE::VARIANT::VT_ARRAY|WIN32OLE::VARIANT::VT_UI1)
-      assert_equal([65, 0].pack("C*"), obj.value)
-
-      obj = WIN32OLE_VARIANT.new("abc", WIN32OLE::VARIANT::VT_ARRAY|WIN32OLE::VARIANT::VT_UI1|WIN32OLE::VARIANT::VT_BYREF)
-      assert_equal("abc", obj.value)
-      obj.value = "DEF"
-      assert_equal("DEF", obj.value)
-      assert_equal(WIN32OLE::VARIANT::VT_ARRAY|WIN32OLE::VARIANT::VT_UI1|WIN32OLE::VARIANT::VT_BYREF, obj.vartype)
-      obj[1] = 71
-      assert_equal("DGF", obj.value)
-
-    end
-
-    def test_create_vt_array_int
-      obj = WIN32OLE_VARIANT.new([65, 0], WIN32OLE::VARIANT::VT_ARRAY|WIN32OLE::VARIANT::VT_UI1)
-      assert_equal([65, 0].pack("C*"), obj.value)
-
-      obj = WIN32OLE_VARIANT.new([65, 0])
-      assert_equal([65, 0], obj.value)
-
-      obj = WIN32OLE_VARIANT.new([65, 0], WIN32OLE::VARIANT::VT_I2|WIN32OLE::VARIANT::VT_ARRAY)
-      assert_equal([65, 0], obj.value)
-
-    end
-
-    def test_vt_array_bracket
-      obj = WIN32OLE_VARIANT.new([[1,2,3],[4,5,6]])
-      assert_equal(1, obj[0,0])
-      assert_equal(2, obj[0,1])
-      assert_equal(3, obj[0,2])
-      assert_equal(4, obj[1,0])
-      assert_equal(5, obj[1,1])
-      assert_equal(6, obj[1,2])
-
-      assert_raise(WIN32OLERuntimeError) {
-        obj[0,4]
-      }
-      assert_raise(WIN32OLERuntimeError) {
-        obj[0,-1]
-      }
-      assert_raise(ArgumentError) {
-        obj[0]
-      }
-
-      obj[0,0] = 7
-      obj[1,2] = 8
-      assert_equal([[7,2,3], [4,5,8]], obj.value)
-
-      assert_raise(WIN32OLERuntimeError) {
-        obj[0,4] = 9
-      }
-      assert_raise(WIN32OLERuntimeError) {
-        obj[0,-1] = 10
-      }
-      assert_raise(ArgumentError) {
-        obj[0] = 11
-      }
-    end
-
-    def test_conversion_vt_date
-      obj = WIN32OLE_VARIANT.new(-657434, WIN32OLE::VARIANT::VT_DATE)
-      assert_equal(Time.new(100,1,1), obj.value)
-
-      obj = WIN32OLE_VARIANT.new("1500/12/29 23:59:59", WIN32OLE::VARIANT::VT_DATE)
-      assert_equal(Time.new(1500,12,29,23,59,59), obj.value)
-
-      obj = WIN32OLE_VARIANT.new("1500/12/30 00:00:00", WIN32OLE::VARIANT::VT_DATE)
-      assert_equal(Time.new(1500,12,30), obj.value)
-
-      obj = WIN32OLE_VARIANT.new("1500/12/30 00:00:01", WIN32OLE::VARIANT::VT_DATE)
-      assert_equal(Time.new(1500,12,30,0,0,1), obj.value)
-
-      obj = WIN32OLE_VARIANT.new("1899/12/29 23:59:59", WIN32OLE::VARIANT::VT_DATE)
-      assert_equal(Time.new(1899,12,29,23,59,59), obj.value)
-
-      obj = WIN32OLE_VARIANT.new("1899/12/30 00:00:00", WIN32OLE::VARIANT::VT_DATE)
-      assert_equal(Time.new(1899,12,30), obj.value)
-
-      obj = WIN32OLE_VARIANT.new("1899/12/30 00:00:01", WIN32OLE::VARIANT::VT_DATE)
-      assert_equal(Time.new(1899,12,30,0,0,1), obj.value)
-
-      obj = WIN32OLE_VARIANT.new(0, WIN32OLE::VARIANT::VT_DATE)
-      assert_equal(Time.new(1899,12,30), obj.value)
-
-      obj = WIN32OLE_VARIANT.new("2008/12/29 23:59:59", WIN32OLE::VARIANT::VT_DATE)
-      assert_equal(Time.new(2008,12,29,23,59,59), obj.value)
-
-      obj = WIN32OLE_VARIANT.new("2008/12/30 00:00:00", WIN32OLE::VARIANT::VT_DATE)
-      assert_equal(Time.new(2008,12,30,0,0,0), obj.value)
-
-      obj = WIN32OLE_VARIANT.new("2008/12/30 00:00:01", WIN32OLE::VARIANT::VT_DATE)
-      assert_equal(Time.new(2008,12,30,0,0,1), obj.value)
-
-      obj = WIN32OLE_VARIANT.new("9999/12/31 23:59:59", WIN32OLE::VARIANT::VT_DATE)
-      assert_equal(Time.new(9999,12,31,23,59,59), obj.value)
-    end
-
-    def test_create_nil_dispatch
-      var = WIN32OLE_VARIANT.new(nil, WIN32OLE::VARIANT::VT_DISPATCH)
-      assert_nil(var.value)
-    end
-
-    def test_create_variant_byref
-      obj = WIN32OLE_VARIANT.new("Str", WIN32OLE::VARIANT::VT_VARIANT|WIN32OLE::VARIANT::VT_BYREF);
-      assert_equal("Str", obj.value);
-    end
-
-    def test_vartype
-      obj = WIN32OLE_VARIANT.new("Str")
-      assert_equal(WIN32OLE::VARIANT::VT_BSTR, obj.vartype)
-    end
-
-    def test_set_value
-      obj = WIN32OLE_VARIANT.new(10)
-      obj.value = 12
-      assert_equal(12, obj.value)
-      assert_equal(WIN32OLE::VARIANT::VT_I4, obj.vartype)
-      obj.value = "14"
-      assert_equal(14, obj.value)
-      assert_equal(WIN32OLE::VARIANT::VT_I4, obj.vartype)
-      obj.value = 11.2
-      assert_equal(11, obj.value)
-      assert_equal(WIN32OLE::VARIANT::VT_I4, obj.vartype)
-
-      obj = WIN32OLE_VARIANT.new([1,2])
-      assert_raise(WIN32OLERuntimeError) {
-        obj.value = [3,4]
-      }
-
-      obj = WIN32OLE_VARIANT.new("2007/01/01", WIN32OLE::VARIANT::VT_DATE)
-      assert_raise(WIN32OLERuntimeError) {
-        obj.value = "hogehoge"
-      }
-      assert_equal(Time.new(2007,1,1), obj.value)
-
-      obj2 = WIN32OLE_VARIANT.new("2006/01/01", WIN32OLE::VARIANT::VT_DATE)
-      obj.value = obj2
-      assert_equal(Time.new(2006,01,01), obj.value)
-    end
-
-    def test_c_nothing
-      assert_nil(WIN32OLE_VARIANT::Nothing.value)
-    end
-
-    def test_c_empty
-      assert_nil(WIN32OLE_VARIANT::Empty.value)
-    end
-
-    def test_c_null
-      assert_nil(WIN32OLE_VARIANT::Null.value)
-    end
-
-    def test_c_noparam
-      # DISP_E_PARAMNOTFOUND
-      assert_equal(-2147352572, WIN32OLE_VARIANT::NoParam.value)
-    end
-
-    def test_vt_error_noparam
-      v = WIN32OLE_VARIANT.new(-1, WIN32OLE::VARIANT::VT_ERROR)
-      assert_equal(-1, v.value)
-      fso = WIN32OLE.new("Scripting.FileSystemObject")
-      exc = assert_raise(WIN32OLERuntimeError) {
-        fso.openTextFile("NonExistingFile", v, false)
-      }
-      assert_match(/Type mismatch/i, exc.message)
-      exc = assert_raise(WIN32OLERuntimeError) {
-        fso.openTextFile("NonExistingFile", WIN32OLE_VARIANT::NoParam, false)
-      }
-      # 800A0035 is 'file not found' error.
-      assert_match(/800A0035/, exc.message)
-
-      # -2147352572 is DISP_E_PARAMNOTFOUND
-      v = WIN32OLE_VARIANT.new(-2147352572, WIN32OLE::VARIANT::VT_ERROR)
-      exc = assert_raise(WIN32OLERuntimeError) {
-        fso.openTextFile("NonExistingFile", WIN32OLE_VARIANT::NoParam, false)
-      }
-      # 800A0035 is 'file not found' error code.
-      assert_match(/800A0035/, exc.message)
-    end
-
-  end
-end
-
diff --git a/test/win32ole/test_win32ole_variant_m.rb b/test/win32ole/test_win32ole_variant_m.rb
deleted file mode 100644
index 25ad56cc21f976..00000000000000
--- a/test/win32ole/test_win32ole_variant_m.rb
+++ /dev/null
@@ -1,36 +0,0 @@
-# frozen_string_literal: false
-begin
-  require 'win32ole'
-rescue LoadError
-end
-require "test/unit"
-
-if defined?(WIN32OLE::VARIANT)
-  class TestWin32OLE_VARIANT_MODULE < Test::Unit::TestCase
-    include WIN32OLE::VARIANT
-    def test_variant
-      assert_equal(0, VT_EMPTY)
-      assert_equal(1, VT_NULL)
-      assert_equal(2, VT_I2)
-      assert_equal(3, VT_I4)
-      assert_equal(4, VT_R4)
-      assert_equal(5, VT_R8)
-      assert_equal(6, VT_CY)
-      assert_equal(7, VT_DATE)
-      assert_equal(8, VT_BSTR)
-      assert_equal(9, VT_DISPATCH)
-      assert_equal(10, VT_ERROR)
-      assert_equal(11, VT_BOOL)
-      assert_equal(12, VT_VARIANT)
-      assert_equal(13, VT_UNKNOWN)
-      assert_equal(16, VT_I1)
-      assert_equal(17, VT_UI1)
-      assert_equal(18, VT_UI2)
-      assert_equal(19, VT_UI4)
-      assert_equal(22, VT_INT)
-      assert_equal(23, VT_UINT)
-      assert_equal(0x2000, VT_ARRAY)
-      assert_equal(0x4000, VT_BYREF)
-    end
-  end
-end
diff --git a/test/win32ole/test_win32ole_variant_outarg.rb b/test/win32ole/test_win32ole_variant_outarg.rb
deleted file mode 100644
index f50b04aaf55d10..00000000000000
--- a/test/win32ole/test_win32ole_variant_outarg.rb
+++ /dev/null
@@ -1,69 +0,0 @@
-# frozen_string_literal: false
-begin
-  require 'win32ole'
-rescue LoadError
-end
-require 'test/unit'
-require 'fileutils'
-
-def ado_csv_installed?
-  installed = false
-  if defined?(WIN32OLE)
-    db = nil
-    begin
-      db = WIN32OLE.new('ADODB.Connection')
-      db.connectionString = "Driver={Microsoft Text Driver (*.txt; *.csv)};DefaultDir=.;"
-      db.open
-      db.close
-      db = nil
-      installed = true
-    rescue
-    end
-  end
-  installed
-end
-
-if defined?(WIN32OLE_VARIANT)
-    class TestWIN32OLE_VARIANT_OUTARG < Test::Unit::TestCase
-      module ADO
-      end
-      CONNSTR="Driver={Microsoft Text Driver (*.txt; *.csv)};DefaultDir=.;"
-      def setup
-        return if !ado_csv_installed?
-
-        FileUtils.cp(File.dirname(__FILE__) + '/orig_data.csv', './data.csv')
-        @db = WIN32OLE.new('ADODB.Connection')
-        if !defined?(ADO::AdStateOpen)
-          WIN32OLE.const_load(@db, ADO)
-        end
-        @db.connectionString = CONNSTR
-        @db.open
-      end
-
-      def test_variant_ref_and_argv
-        if !ado_csv_installed?
-          omit("ActiveX Data Object Library not found")
-        end
-        sql = "INSERT INTO data.csv VALUES (5, 'E')"
-        @db.execute(sql, -1)
-        c = WIN32OLE::ARGV[1]
-        assert_equal(1, c)
-        obj = WIN32OLE_VARIANT.new(nil, WIN32OLE::VARIANT::VT_VARIANT|WIN32OLE::VARIANT::VT_BYREF)
-        assert_equal(nil, obj.value)
-        @db.execute(sql , obj)
-        assert_equal(1, obj.value)
-        obj = WIN32OLE_VARIANT.new(-100, WIN32OLE::VARIANT::VT_VARIANT|WIN32OLE::VARIANT::VT_BYREF)
-        assert_equal(-100, obj.value)
-        @db.execute(sql, obj)
-        assert_equal(1, obj.value)
-      end
-
-      def teardown
-        return if !ado_csv_installed?
-        if @db && @db.state == ADO::AdStateOpen
-          @db.close
-        end
-        File.unlink("data.csv")
-      end
-    end
-end
diff --git a/test/win32ole/test_word.rb b/test/win32ole/test_word.rb
deleted file mode 100644
index a23757f62084e9..00000000000000
--- a/test/win32ole/test_word.rb
+++ /dev/null
@@ -1,73 +0,0 @@
-# frozen_string_literal: false
-#
-# This is test for [ruby-Bugs#3237]
-#
-begin
-  require 'win32ole'
-rescue LoadError
-end
-require "test/unit"
-
-if defined?(WIN32OLE)
-  module Word; end
-end
-
-def word_installed?
-  installed = false
-  w = nil
-  if defined?(WIN32OLE)
-    begin
-      w = WIN32OLE.new('Word.Application')
-      WIN32OLE.const_load(w, Word)
-      installed = true
-    rescue
-    ensure
-      if w
-        w.quit(Word::WdDoNotSaveChanges)
-        w = nil
-      end
-    end
-  end
-  return installed
-end
-
-if defined?(WIN32OLE)
-  class TestWIN32OLE_WITH_WORD < Test::Unit::TestCase
-    unless word_installed?
-      def test_dummy_for_skip_message
-        omit "Microsoft Word is not installed"
-      end
-    else
-      def setup
-        begin
-          @obj = WIN32OLE.new('Word.Application')
-        rescue WIN32OLERuntimeError
-          @obj = nil
-        end
-      end
-
-      def test_ole_methods
-        if @obj
-          @obj.visible = true
-          @obj.wordbasic.disableAutoMacros(true)
-          assert(true)
-        end
-      end
-
-      def test_s_connect
-        if @obj
-          obj2 = WIN32OLE.connect("Word.Application")
-          assert_instance_of(WIN32OLE, obj2)
-          obj2.visible = true
-        end
-      end
-
-      def teardown
-        if @obj
-          @obj.quit(Word::WdDoNotSaveChanges)
-          @obj = nil
-        end
-      end
-    end
-  end
-end
diff --git a/test/yaml/test_dbm.rb b/test/yaml/test_dbm.rb
new file mode 100644
index 00000000000000..cf50256298174c
--- /dev/null
+++ b/test/yaml/test_dbm.rb
@@ -0,0 +1,46 @@
+require "test/unit"
+require "yaml/dbm"
+
+class TestYAMLDBM < Test::Unit::TestCase
+  def setup
+    @dbm = YAML::DBM.new("test")
+  end
+
+  def teardown
+    @dbm.close
+    File.unlink("test.db")
+  end
+
+  def test_fetch
+    @dbm["key"] = "value"
+    assert_equal "value", @dbm["key"]
+    assert_equal "value", @dbm.fetch("key")
+  end
+
+  def test_delete
+    @dbm["key"] = "value"
+    assert_equal "value", @dbm.delete("key")
+    assert_nil @dbm["key"]
+  end
+
+  def test_each_value
+    @dbm["key1"] = "value1"
+    @dbm["key2"] = "value2"
+    @dbm.each_value do |value|
+      assert_match(/value[12]/, value)
+    end
+  end
+
+  def test_values
+    @dbm["key1"] = "value1"
+    @dbm["key2"] = "value2"
+    @dbm.values.each do |value|
+      assert_match(/value[12]/, value)
+    end
+  end
+
+  def test_shift
+    @dbm["key"] = "value"
+    assert_equal ["key", "value"], @dbm.shift
+  end
+end if defined?(YAML::DBM)
diff --git a/test/yaml/test_store.rb b/test/yaml/test_store.rb
index 74557db96486ff..d4eba251fdee7f 100644
--- a/test/yaml/test_store.rb
+++ b/test/yaml/test_store.rb
@@ -5,8 +5,12 @@
 
 class YAMLStoreTest < Test::Unit::TestCase
   def setup
-    @yaml_store_file = File.join(Dir.tmpdir, "yaml_store.tmp.#{Process.pid}")
-    @yaml_store = YAML::Store.new(@yaml_store_file)
+    if defined?(::PStore)
+      @yaml_store_file = File.join(Dir.tmpdir, "yaml_store.tmp.#{Process.pid}")
+      @yaml_store = YAML::Store.new(@yaml_store_file)
+    else
+      omit "PStore is not available"
+    end
   end
 
   def teardown
@@ -133,7 +137,7 @@ def test_nested_transaction_raises_error
   def test_yaml_store_files_are_accessed_as_binary_files
     bug5311 = '[ruby-core:39503]'
     n = 128
-    assert_in_out_err(["-Eutf-8:utf-8", "-ryaml/store", "-", @yaml_store_file], <<-SRC, [bug5311], [], bug5311, timeout: 60)
+    assert_in_out_err(["-Eutf-8:utf-8", "-rrubygems", "-ryaml/store", "-", @yaml_store_file], <<-SRC, [bug5311], [], bug5311, timeout: 60)
       @yaml_store = YAML::Store.new(ARGV[0])
       (1..#{n}).each do |i|
         @yaml_store.transaction {@yaml_store["Key\#{i}"] = "value \#{i}"}
diff --git a/test/yarp/comments_test.rb b/test/yarp/comments_test.rb
deleted file mode 100644
index ac91eab4ac5188..00000000000000
--- a/test/yarp/comments_test.rb
+++ /dev/null
@@ -1,68 +0,0 @@
-# frozen_string_literal: true
-
-require_relative "test_helper"
-
-module YARP
-  class CommentsTest < TestCase
-    def test_comment_inline
-      source = "# comment"
-
-      assert_comment source, :inline, 0..9
-      assert_equal [0], Debug.newlines(source)
-    end
-
-    def test_comment_inline_def
-      source = <<~RUBY
-      def foo
-        # a comment
-      end
-      RUBY
-
-      assert_comment source, :inline, 10..22
-    end
-
-    def test_comment___END__
-      source = <<~RUBY
-        __END__
-        comment
-      RUBY
-
-      assert_comment source, :__END__, 0..16
-    end
-
-    def test_comment___END__crlf
-      source = "__END__\r\ncomment\r\n"
-
-      assert_comment source, :__END__, 0..18
-    end
-
-    def test_comment_embedded_document
-      source = <<~RUBY
-        =begin
-        comment
-        =end
-      RUBY
-
-      assert_comment source, :embdoc, 0..20
-    end
-
-    def test_comment_embedded_document_with_content_on_same_line
-      source = <<~RUBY
-        =begin other stuff
-        =end
-      RUBY
-
-      assert_comment source, :embdoc, 0..24
-    end
-
-    private
-
-    def assert_comment(source, type, location)
-      result = YARP.parse(source)
-      assert result.errors.empty?, result.errors.map(&:message).join("\n")
-      assert_equal result.comments.first.type, type
-      assert_equal result.comments.first.location.start_offset, location.begin
-      assert_equal result.comments.first.location.end_offset, location.end
-    end
-  end
-end
diff --git a/test/yarp/compiler_test.rb b/test/yarp/compiler_test.rb
deleted file mode 100644
index d1cd7e33055476..00000000000000
--- a/test/yarp/compiler_test.rb
+++ /dev/null
@@ -1,227 +0,0 @@
-# frozen_string_literal: true
-
-module YARP
-  class CompilerTest < Test::Unit::TestCase
-    ############################################################################
-    # Literals                                                                 #
-    ############################################################################
-
-    def test_FalseNode
-      assert_equal false, compile("false")
-    end
-
-    def test_FloatNode
-      assert_equal 1.0, compile("1.0")
-      assert_equal 1.0e0, compile("1.0e0")
-      assert_equal(+1.0e+0, compile("+1.0e+0"))
-      assert_equal(-1.0e-0, compile("-1.0e-0"))
-    end
-
-    def test_ImaginaryNode
-      # assert_equal 1i, compile("1i")
-      # assert_equal +1.0i, compile("+1.0i")
-      # assert_equal 1ri, compile("1ri")
-    end
-
-    def test_IntegerNode
-      assert_equal 1, compile("1")
-      assert_equal(+1, compile("+1"))
-      assert_equal(-1, compile("-1"))
-      # assert_equal 0x10, compile("0x10")
-      # assert_equal 0b10, compile("0b10")
-      # assert_equal 0o10, compile("0o10")
-      # assert_equal 010, compile("010")
-    end
-
-    def test_NilNode
-      assert_nil compile("nil")
-    end
-
-    def test_SelfNode
-      assert_equal TOPLEVEL_BINDING.eval("self"), compile("self")
-    end
-
-    def test_TrueNode
-      assert_equal true, compile("true")
-    end
-
-    ############################################################################
-    # Reads                                                                    #
-    ############################################################################
-
-    def test_ClassVariableReadNode
-      assert_equal 1, compile("class YARP::CompilerTest; @@yct = 1; @@yct; end")
-    end
-
-    def test_ConstantPathNode
-      assert_equal YARP::CompilerTest, compile("YARP::CompilerTest")
-    end
-
-    def test_ConstantReadNode
-      assert_equal YARP, compile("YARP")
-    end
-
-    def test_GlobalVariableReadNode
-      assert_equal 1, compile("$yct = 1; $yct")
-    end
-
-    def test_InstanceVariableReadNode
-      assert_equal 1, compile("class YARP::CompilerTest; @yct = 1; @yct; end")
-    end
-
-    def test_LocalVariableReadNode
-      assert_equal 1, compile("yct = 1; yct")
-    end
-
-    ############################################################################
-    # Writes                                                                   #
-    ############################################################################
-
-    def test_ClassVariableWriteNode
-      assert_equal 1, compile("class YARP::CompilerTest; @@yct = 1; end")
-    end
-
-    def test_ClassVariableAndWriteNode
-      assert_equal 1, compile("class YARP::CompilerTest; @@yct = 0; @@yct &&= 1; end")
-    end
-
-    def test_ClassVariableOrWriteNode
-      assert_equal 1, compile("class YARP::CompilerTest; @@yct = 1; @@yct ||= 0; end")
-      assert_equal 1, compile("class YARP::CompilerTest; @@yct = nil; @@yct ||= 1; end")
-    end
-
-    def test_ClassVariableOperatorWriteNode
-      assert_equal 1, compile("class YARP::CompilerTest; @@yct = 0; @@yct += 1; end")
-    end
-
-    def test_ConstantWriteNode
-      constant_name = "YCT"
-      assert_equal 1, compile("#{constant_name} = 1")
-      # We remove the constant to avoid assigning it mutliple
-      # times if we run with `--repeat_count`
-      Object.send(:remove_const, constant_name)
-    end
-
-    def test_ConstantPathWriteNode
-      # assert_equal 1, compile("YARP::YCT = 1")
-    end
-
-    def test_GlobalVariableWriteNode
-      assert_equal 1, compile("$yct = 1")
-    end
-
-    def test_GlobalVariableAndWriteNode
-      assert_equal 1, compile("$yct = 0; $yct &&= 1")
-    end
-
-    def test_GlobalVariableOrWriteNode
-      assert_equal 1, compile("$yct ||= 1")
-    end
-
-    def test_GlobalVariableOperatorWriteNode
-      assert_equal 1, compile("$yct = 0; $yct += 1")
-    end
-
-    def test_InstanceVariableWriteNode
-      assert_equal 1, compile("class YARP::CompilerTest; @yct = 1; end")
-    end
-
-    def test_InstanceVariableAndWriteNode
-      assert_equal 1, compile("@yct = 0; @yct &&= 1")
-    end
-
-    def test_InstanceVariableOrWriteNode
-      assert_equal 1, compile("@yct ||= 1")
-    end
-
-    def test_InstanceVariableOperatorWriteNode
-      assert_equal 1, compile("@yct = 0; @yct += 1")
-    end
-
-    def test_LocalVariableWriteNode
-      assert_equal 1, compile("yct = 1")
-    end
-
-    def test_LocalVariableAndWriteNode
-      assert_equal 1, compile("yct = 0; yct &&= 1")
-    end
-
-    def test_LocalVariableOrWriteNode
-      assert_equal 1, compile("yct ||= 1")
-    end
-
-    def test_LocalVariableOperatorWriteNode
-      assert_equal 1, compile("yct = 0; yct += 1")
-    end
-
-    ############################################################################
-    # String-likes                                                             #
-    ############################################################################
-
-    def test_EmbeddedVariableNode
-      # assert_equal "1", compile('class YARP::CompilerTest; @yct = 1; "#@yct"; end')
-      # assert_equal "1", compile('class YARP::CompilerTest; @@yct = 1; "#@@yct"; end')
-      assert_equal "1", compile('$yct = 1; "#$yct"')
-    end
-
-    def test_InterpolatedStringNode
-      assert_equal "1 1 1", compile('$yct = 1; "1 #$yct 1"')
-      assert_equal "1 3 1", compile('"1 #{1 + 2} 1"')
-    end
-
-    def test_InterpolatedSymbolNode
-      assert_equal :"1 1 1", compile('$yct = 1; :"1 #$yct 1"')
-      assert_equal :"1 3 1", compile(':"1 #{1 + 2} 1"')
-    end
-
-    def test_StringConcatNode
-      # assert_equal "YARP::CompilerTest", compile('"YARP" "::" "CompilerTest"')
-    end
-
-    def test_StringNode
-      assert_equal "yct", compile('"yct"')
-    end
-
-    def test_SymbolNode
-      assert_equal :yct, compile(":yct")
-    end
-
-    def test_XStringNode
-      # assert_equal "yctyct", compile(<<~RUBY)
-      #   class YARP::CompilerTest
-      #     def self.`(command) = command * 2
-      #     `yct`
-      #   end
-      # RUBY
-    end
-
-    ############################################################################
-    # Jumps                                                                    #
-    ############################################################################
-
-    def test_AndNode
-      assert_equal 1, compile("true && 1")
-      assert_equal false, compile("false && 1")
-    end
-
-    def test_OrNode
-      assert_equal true, compile("true || 1")
-      assert_equal 1, compile("false || 1")
-    end
-
-    ############################################################################
-    # Scopes/statements                                                        #
-    ############################################################################
-
-    def test_ParenthesesNode
-      assert_equal (), compile("()")
-      assert_equal (1), compile("(1)")
-    end
-
-    private
-
-    def compile(source)
-      RubyVM::InstructionSequence.compile_yarp(source).eval
-    end
-  end
-end
diff --git a/test/yarp/desugar_visitor_test.rb b/test/yarp/desugar_visitor_test.rb
deleted file mode 100644
index 3966d7bfcb6078..00000000000000
--- a/test/yarp/desugar_visitor_test.rb
+++ /dev/null
@@ -1,86 +0,0 @@
-# frozen_string_literal: true
-
-require_relative "test_helper"
-
-module YARP
-  class DesugarVisitorTest < TestCase
-    def test_and_write
-      assert_desugars("(AndNode (ClassVariableReadNode) (ClassVariableWriteNode (CallNode)))", "@@foo &&= bar")
-      assert_not_desugared("Foo::Bar &&= baz", "Desugaring would execute Foo twice or need temporary variables")
-      assert_desugars("(AndNode (ConstantReadNode) (ConstantWriteNode (CallNode)))", "Foo &&= bar")
-      assert_desugars("(AndNode (GlobalVariableReadNode) (GlobalVariableWriteNode (CallNode)))", "$foo &&= bar")
-      assert_desugars("(AndNode (InstanceVariableReadNode) (InstanceVariableWriteNode (CallNode)))", "@foo &&= bar")
-      assert_desugars("(AndNode (LocalVariableReadNode) (LocalVariableWriteNode (CallNode)))", "foo &&= bar")
-      assert_desugars("(AndNode (LocalVariableReadNode) (LocalVariableWriteNode (CallNode)))", "foo = 1; foo &&= bar")
-    end
-
-    def test_or_write
-      assert_desugars("(IfNode (DefinedNode (ClassVariableReadNode)) (StatementsNode (ClassVariableReadNode)) (ElseNode (StatementsNode (ClassVariableWriteNode (CallNode)))))", "@@foo ||= bar")
-      assert_not_desugared("Foo::Bar ||= baz", "Desugaring would execute Foo twice or need temporary variables")
-      assert_desugars("(IfNode (DefinedNode (ConstantReadNode)) (StatementsNode (ConstantReadNode)) (ElseNode (StatementsNode (ConstantWriteNode (CallNode)))))", "Foo ||= bar")
-      assert_desugars("(IfNode (DefinedNode (GlobalVariableReadNode)) (StatementsNode (GlobalVariableReadNode)) (ElseNode (StatementsNode (GlobalVariableWriteNode (CallNode)))))", "$foo ||= bar")
-      assert_desugars("(OrNode (InstanceVariableReadNode) (InstanceVariableWriteNode (CallNode)))", "@foo ||= bar")
-      assert_desugars("(OrNode (LocalVariableReadNode) (LocalVariableWriteNode (CallNode)))", "foo ||= bar")
-      assert_desugars("(OrNode (LocalVariableReadNode) (LocalVariableWriteNode (CallNode)))", "foo = 1; foo ||= bar")
-    end
-
-    def test_operator_write
-      assert_desugars("(ClassVariableWriteNode (CallNode (ClassVariableReadNode) (ArgumentsNode (CallNode))))", "@@foo += bar")
-      assert_not_desugared("Foo::Bar += baz", "Desugaring would execute Foo twice or need temporary variables")
-      assert_desugars("(ConstantWriteNode (CallNode (ConstantReadNode) (ArgumentsNode (CallNode))))", "Foo += bar")
-      assert_desugars("(GlobalVariableWriteNode (CallNode (GlobalVariableReadNode) (ArgumentsNode (CallNode))))", "$foo += bar")
-      assert_desugars("(InstanceVariableWriteNode (CallNode (InstanceVariableReadNode) (ArgumentsNode (CallNode))))", "@foo += bar")
-      assert_desugars("(LocalVariableWriteNode (CallNode (LocalVariableReadNode) (ArgumentsNode (CallNode))))", "foo += bar")
-      assert_desugars("(LocalVariableWriteNode (CallNode (LocalVariableReadNode) (ArgumentsNode (CallNode))))", "foo = 1; foo += bar")
-    end
-
-    private
-
-    def ast_inspect(node)
-      parts = [node.class.name.split("::").last]
-
-      node.deconstruct_keys(nil).each do |_, value|
-        case value
-        when Node
-          parts << ast_inspect(value)
-        when Array
-          parts.concat(value.map { |element| ast_inspect(element) })
-        end
-      end
-
-      "(#{parts.join(" ")})"
-    end
-
-    # Ensure every node is only present once in the AST.
-    # If the same node is present twice it would most likely indicate it is executed twice, which is invalid semantically.
-    # This also acts as a sanity check that Node#child_nodes returns only nodes or nil (which caught a couple bugs).
-    class EnsureEveryNodeOnceInAST < Visitor
-      def initialize
-        @all_nodes = {}.compare_by_identity
-      end
-
-      def visit(node)
-        if node
-          if @all_nodes.include?(node)
-            raise "#{node.inspect} is present multiple times in the desugared AST and likely executed multiple times"
-          else
-            @all_nodes[node] = true
-          end
-        end
-        super(node)
-      end
-    end
-
-    def assert_desugars(expected, source)
-      ast = YARP.parse(source).value.accept(DesugarVisitor.new)
-      assert_equal expected, ast_inspect(ast.statements.body.last)
-
-      ast.accept(EnsureEveryNodeOnceInAST.new)
-    end
-
-    def assert_not_desugared(source, reason)
-      ast = YARP.parse(source).value
-      assert_equal_nodes(ast, ast.accept(DesugarVisitor.new))
-    end
-  end
-end
diff --git a/test/yarp/encoding_test.rb b/test/yarp/encoding_test.rb
deleted file mode 100644
index 8427bddcbefa58..00000000000000
--- a/test/yarp/encoding_test.rb
+++ /dev/null
@@ -1,106 +0,0 @@
-# frozen_string_literal: true
-
-require_relative "test_helper"
-
-module YARP
-  class EncodingTest < TestCase
-    %w[
-      ascii
-      ascii-8bit
-      big5
-      binary
-      euc-jp
-      gbk
-      iso-8859-1
-      iso-8859-2
-      iso-8859-3
-      iso-8859-4
-      iso-8859-5
-      iso-8859-6
-      iso-8859-7
-      iso-8859-8
-      iso-8859-9
-      iso-8859-10
-      iso-8859-11
-      iso-8859-13
-      iso-8859-14
-      iso-8859-15
-      iso-8859-16
-      koi8-r
-      shift_jis
-      sjis
-      us-ascii
-      utf-8
-      utf8-mac
-      windows-31j
-      windows-1251
-      windows-1252
-      CP1251
-      CP1252
-    ].each do |encoding|
-      define_method "test_encoding_#{encoding}" do
-        result = YARP.parse("# encoding: #{encoding}\nident")
-        actual = result.value.statements.body.first.name.encoding
-        assert_equal Encoding.find(encoding), actual
-      end
-    end
-
-    def test_coding
-      result = YARP.parse("# coding: utf-8\nident")
-      actual = result.value.statements.body.first.name.encoding
-      assert_equal Encoding.find("utf-8"), actual
-    end
-
-    def test_coding_with_whitespace
-      result = YARP.parse("# coding \t \r  \v   :     \t \v    \r   ascii-8bit \nident")
-      actual = result.value.statements.body.first.name.encoding
-      assert_equal Encoding.find("ascii-8bit"), actual
-    end
-
-
-    def test_emacs_style
-      result = YARP.parse("# -*- coding: utf-8 -*-\nident")
-      actual = result.value.statements.body.first.name.encoding
-      assert_equal Encoding.find("utf-8"), actual
-    end
-
-    # This test may be a little confusing. Basically when we use our strpbrk, it
-    # takes into account the encoding of the file.
-    def test_strpbrk_multibyte
-      result = YARP.parse(<<~RUBY)
-        # encoding: Shift_JIS
-        %w[\x81\x5c]
-      RUBY
-
-      assert(result.errors.empty?)
-      assert_equal(
-        (+"\x81\x5c").force_encoding(Encoding::Shift_JIS),
-        result.value.statements.body.first.elements.first.unescaped
-      )
-    end
-
-    def test_utf_8_variations
-      %w[
-        utf-8-unix
-        utf-8-dos
-        utf-8-mac
-        utf-8-*
-      ].each do |encoding|
-        result = YARP.parse("# coding: #{encoding}\nident")
-        actual = result.value.statements.body.first.name.encoding
-        assert_equal Encoding.find("utf-8"), actual
-      end
-    end
-
-    def test_first_lexed_token
-      encoding = YARP.lex("# encoding: ascii-8bit").value[0][0].value.encoding
-      assert_equal Encoding.find("ascii-8bit"), encoding
-    end
-
-    def test_slice_encoding
-      slice = YARP.parse("# encoding: Shift_JIS\nア").value.slice
-      assert_equal (+"ア").force_encoding(Encoding::SHIFT_JIS), slice
-      assert_equal Encoding::SHIFT_JIS, slice.encoding
-    end
-  end
-end
diff --git a/test/yarp/errors_test.rb b/test/yarp/errors_test.rb
deleted file mode 100644
index 6c03960ec3ed3e..00000000000000
--- a/test/yarp/errors_test.rb
+++ /dev/null
@@ -1,1151 +0,0 @@
-# frozen_string_literal: true
-
-require_relative "test_helper"
-
-module YARP
-  class ErrorsTest < TestCase
-    include DSL
-
-    def test_constant_path_with_invalid_token_after
-      assert_error_messages "A::$b", [
-        "Expected identifier or constant after '::'",
-        "Expected a newline or semicolon after statement."
-      ]
-    end
-
-    def test_module_name_recoverable
-      expected = ModuleNode(
-        [],
-        Location(),
-        ConstantReadNode(:Parent),
-        StatementsNode(
-          [ModuleNode([], Location(), MissingNode(), nil, Location(), :"", :"")]
-        ),
-        Location(),
-        :Parent,
-        :Parent
-      )
-
-      assert_errors expected, "module Parent module end", [
-        ["Expected to find a module name after `module`.", 20..20]
-      ]
-    end
-
-    def test_for_loops_index_missing
-      expected = ForNode(
-        MissingNode(),
-        expression("1..10"),
-        StatementsNode([expression("i")]),
-        Location(),
-        Location(),
-        nil,
-        Location()
-      )
-
-      assert_errors expected, "for in 1..10\ni\nend", [
-        ["Expected index after for.", 0..0]
-      ]
-    end
-
-    def test_for_loops_only_end
-      expected = ForNode(
-        MissingNode(),
-        MissingNode(),
-        nil,
-        Location(),
-        Location(),
-        nil,
-        Location()
-      )
-
-      assert_errors expected, "for end", [
-        ["Expected index after for.", 0..0],
-        ["Expected keyword in.", 3..3],
-        ["Expected collection.", 3..3]
-      ]
-    end
-
-    def test_pre_execution_missing_brace
-      expected = PreExecutionNode(
-        StatementsNode([expression("1")]),
-        Location(),
-        Location(),
-        Location()
-      )
-
-      assert_errors expected, "BEGIN 1 }", [
-        ["Expected '{' after 'BEGIN'.", 5..5]
-      ]
-    end
-
-    def test_pre_execution_context
-      expected = PreExecutionNode(
-        StatementsNode([
-          CallNode(
-            expression("1"),
-            nil,
-            Location(),
-            nil,
-            ArgumentsNode([MissingNode()]),
-            nil,
-            nil,
-            0,
-            "+"
-          )
-        ]),
-        Location(),
-        Location(),
-        Location()
-      )
-
-      assert_errors expected, "BEGIN { 1 + }", [
-        ["Expected a value after the operator.", 11..11]
-      ]
-    end
-
-    def test_unterminated_embdoc
-      assert_errors expression("1"), "1\n=begin\n", [
-        ["Unterminated embdoc", 2..9]
-      ]
-    end
-
-    def test_unterminated_i_list
-      assert_errors expression("%i["), "%i[", [
-        ["Expected a closing delimiter for a `%i` list.", 3..3]
-      ]
-    end
-
-    def test_unterminated_w_list
-      assert_errors expression("%w["), "%w[", [
-        ["Expected a closing delimiter for a `%w` list.", 3..3]
-      ]
-    end
-
-    def test_unterminated_W_list
-      assert_errors expression("%W["), "%W[", [
-        ["Expected a closing delimiter for a `%W` list.", 3..3]
-      ]
-    end
-
-    def test_unterminated_regular_expression
-      assert_errors expression("/hello"), "/hello", [
-        ["Expected a closing delimiter for a regular expression.", 1..1]
-      ]
-    end
-
-    def test_unterminated_regular_expression_with_heredoc
-      source = "<<-END + /b\nEND\n"
-
-      assert_errors expression(source), source, [
-        ["Expected a closing delimiter for a regular expression.", 10..10]
-      ]
-    end
-
-    def test_unterminated_xstring
-      assert_errors expression("`hello"), "`hello", [
-        ["Expected a closing delimiter for an xstring.", 1..1]
-      ]
-    end
-
-    def test_unterminated_string
-      assert_errors expression('"hello'), '"hello', [
-        ["Expected a closing delimiter for an interpolated string.", 1..1]
-      ]
-    end
-
-    def test_unterminated_s_symbol
-      assert_errors expression("%s[abc"), "%s[abc", [
-        ["Expected a closing delimiter for a dynamic symbol.", 3..3]
-      ]
-    end
-
-    def test_unterminated_parenthesized_expression
-      assert_errors expression('(1 + 2'), '(1 + 2', [
-        ["Expected to be able to parse an expression.", 6..6],
-        ["Expected a closing parenthesis.", 6..6]
-      ]
-    end
-
-    def test_unterminated_argument_expression
-      assert_errors expression('a %'), 'a %', [
-        ["Unexpected end of input", 2..3],
-        ["Expected a value after the operator.", 3..3],
-      ]
-    end
-
-    def test_cr_without_lf_in_percent_expression
-      assert_errors expression("%\r"), "%\r", [
-        ["Invalid %% token", 0..2],
-      ]
-    end
-
-    def test_1_2_3
-      assert_errors expression("(1, 2, 3)"), "(1, 2, 3)", [
-        ["Expected to be able to parse an expression.", 2..2],
-        ["Expected a closing parenthesis.", 2..2],
-        ["Expected a newline or semicolon after statement.", 2..2],
-        ["Expected to be able to parse an expression.", 2..2],
-        ["Expected a newline or semicolon after statement.", 5..5],
-        ["Expected to be able to parse an expression.", 5..5],
-        ["Expected a newline or semicolon after statement.", 8..8],
-        ["Expected to be able to parse an expression.", 8..8],
-      ]
-    end
-
-    def test_return_1_2_3
-      assert_error_messages "return(1, 2, 3)", [
-        "Expected to be able to parse an expression.",
-        "Expected a closing parenthesis.",
-        "Expected a newline or semicolon after statement.",
-        "Expected to be able to parse an expression."
-      ]
-    end
-
-    def test_return_1
-      assert_errors expression("return 1,;"), "return 1,;", [
-        ["Expected to be able to parse an argument.", 9..9]
-      ]
-    end
-
-    def test_next_1_2_3
-      assert_errors expression("next(1, 2, 3)"), "next(1, 2, 3)", [
-        ["Expected to be able to parse an expression.", 6..6],
-        ["Expected a closing parenthesis.", 6..6],
-        ["Expected a newline or semicolon after statement.", 12..12],
-        ["Expected to be able to parse an expression.", 12..12]
-      ]
-    end
-
-    def test_next_1
-      assert_errors expression("next 1,;"), "next 1,;", [
-        ["Expected to be able to parse an argument.", 7..7]
-      ]
-    end
-
-    def test_break_1_2_3
-      assert_errors expression("break(1, 2, 3)"), "break(1, 2, 3)", [
-        ["Expected to be able to parse an expression.", 7..7],
-        ["Expected a closing parenthesis.", 7..7],
-        ["Expected a newline or semicolon after statement.", 13..13],
-        ["Expected to be able to parse an expression.", 13..13],
-      ]
-    end
-
-    def test_break_1
-      assert_errors expression("break 1,;"), "break 1,;", [
-        ["Expected to be able to parse an argument.", 8..8]
-      ]
-    end
-
-    def test_argument_forwarding_when_parent_is_not_forwarding
-      assert_errors expression('def a(x, y, z); b(...); end'), 'def a(x, y, z); b(...); end', [
-        ["unexpected ... when parent method is not forwarding.", 18..21]
-      ]
-    end
-
-    def test_argument_forwarding_only_effects_its_own_internals
-      assert_errors expression('def a(...); b(...); end; def c(x, y, z); b(...); end'),
-        'def a(...); b(...); end; def c(x, y, z); b(...); end', [
-          ["unexpected ... when parent method is not forwarding.", 43..46]
-        ]
-    end
-
-    def test_top_level_constant_with_downcased_identifier
-      assert_error_messages "::foo", [
-        "Expected a constant after ::.",
-        "Expected a newline or semicolon after statement."
-      ]
-    end
-
-    def test_top_level_constant_starting_with_downcased_identifier
-      assert_error_messages "::foo::A", [
-        "Expected a constant after ::.",
-        "Expected a newline or semicolon after statement."
-      ]
-    end
-
-    def test_aliasing_global_variable_with_non_global_variable
-      assert_errors expression("alias $a b"), "alias $a b", [
-        ["Expected a global variable.", 9..10]
-      ]
-    end
-
-    def test_aliasing_non_global_variable_with_global_variable
-      assert_errors expression("alias a $b"), "alias a $b", [
-        ["Expected a bare word or symbol argument.", 8..10]
-      ]
-    end
-
-    def test_aliasing_global_variable_with_global_number_variable
-      assert_errors expression("alias $a $1"), "alias $a $1", [
-        ["Can't make alias for number variables.", 9..11]
-      ]
-    end
-
-    def test_def_with_expression_receiver_and_no_identifier
-      assert_errors expression("def (a); end"), "def (a); end", [
-        ["Expected '.' or '::' after receiver", 7..7]
-      ]
-    end
-
-    def test_def_with_multiple_statements_receiver
-      assert_errors expression("def (\na\nb\n).c; end"), "def (\na\nb\n).c; end", [
-        ["Expected closing ')' for receiver.", 7..7],
-        ["Expected '.' or '::' after receiver", 7..7],
-        ["Expected to be able to parse an expression.", 10..10],
-        ["Expected to be able to parse an expression.", 11..11]
-      ]
-    end
-
-    def test_def_with_empty_expression_receiver
-      assert_errors expression("def ().a; end"), "def ().a; end", [
-        ["Expected to be able to parse receiver.", 5..5]
-      ]
-    end
-
-    def test_block_beginning_with_brace_and_ending_with_end
-      assert_error_messages "x.each { x end", [
-        "Expected a newline or semicolon after statement.",
-        "Expected to be able to parse an expression.",
-        "Expected to be able to parse an expression.",
-        "Expected block beginning with '{' to end with '}'."
-      ]
-    end
-
-    def test_double_splat_followed_by_splat_argument
-      expected = CallNode(
-        nil,
-        nil,
-        Location(),
-        Location(),
-        ArgumentsNode([
-          KeywordHashNode([AssocSplatNode(expression("kwargs"), Location())]),
-          SplatNode(Location(), expression("args"))
-        ]),
-        Location(),
-        nil,
-        0,
-        "a"
-      )
-
-      assert_errors expected, "a(**kwargs, *args)", [
-        ["Unexpected splat argument after double splat.", 12..17]
-      ]
-    end
-
-    def test_arguments_after_block
-      expected = CallNode(
-        nil,
-        nil,
-        Location(),
-        Location(),
-        ArgumentsNode([
-          BlockArgumentNode(expression("block"), Location()),
-          expression("foo")
-        ]),
-        Location(),
-        nil,
-        0,
-        "a"
-      )
-
-      assert_errors expected, "a(&block, foo)", [
-        ["Unexpected argument after block argument.", 10..13]
-      ]
-    end
-
-    def test_arguments_binding_power_for_and
-      assert_error_messages "foo(*bar and baz)", [
-        "Expected a ')' to close the argument list.",
-        "Expected a newline or semicolon after statement.",
-        "Expected to be able to parse an expression."
-      ]
-    end
-
-    def test_splat_argument_after_keyword_argument
-      expected = CallNode(
-        nil,
-        nil,
-        Location(),
-        Location(),
-        ArgumentsNode([
-          KeywordHashNode(
-            [AssocNode(
-              SymbolNode(nil, Location(), Location(), "foo"),
-              expression("bar"),
-              nil
-            )]
-          ),
-          SplatNode(Location(), expression("args"))
-        ]),
-        Location(),
-        nil,
-        0,
-        "a"
-      )
-
-      assert_errors expected, "a(foo: bar, *args)", [
-        ["Unexpected splat argument after double splat.", 12..17]
-      ]
-    end
-
-    def test_module_definition_in_method_body
-      expected = DefNode(
-        Location(),
-        nil,
-        nil,
-        StatementsNode([ModuleNode([], Location(), ConstantReadNode(:A), nil, Location(), :A, :A)]),
-        [],
-        Location(),
-        nil,
-        nil,
-        nil,
-        nil,
-        Location()
-      )
-
-      assert_errors expected, "def foo;module A;end;end", [
-        ["Module definition in method body", 8..14]
-      ]
-    end
-
-    def test_module_definition_in_method_body_within_block
-      expected = DefNode(
-        Location(),
-        nil,
-        nil,
-        StatementsNode(
-          [CallNode(
-            nil,
-            nil,
-            Location(),
-            nil,
-            nil,
-            nil,
-            BlockNode(
-              [],
-              nil,
-              StatementsNode([ModuleNode([], Location(), ConstantReadNode(:Foo), nil, Location(), :Foo, :Foo)]),
-              Location(),
-              Location()
-            ),
-            0,
-            "bar"
-          )]
-        ),
-        [],
-        Location(),
-        nil,
-        nil,
-        nil,
-        nil,
-        Location()
-      )
-
-      assert_errors expected, <<~RUBY, [["Module definition in method body", 21..27]]
-        def foo
-          bar do
-            module Foo;end
-          end
-        end
-      RUBY
-    end
-
-    def test_class_definition_in_method_body
-      expected = DefNode(
-        Location(),
-        nil,
-        nil,
-        StatementsNode(
-          [ClassNode(
-            [],
-            Location(),
-            ConstantReadNode(:A),
-            nil,
-            nil,
-            nil,
-            Location(),
-            :A,
-            :A
-          )]
-        ),
-        [],
-        Location(),
-        nil,
-        nil,
-        nil,
-        nil,
-        Location()
-      )
-
-      assert_errors expected, "def foo;class A;end;end", [
-        ["Class definition in method body", 8..13]
-      ]
-    end
-
-    def test_bad_arguments
-      expected = DefNode(
-        Location(),
-        nil,
-        ParametersNode([
-          RequiredParameterNode(:A),
-          RequiredParameterNode(:@a),
-          RequiredParameterNode(:$A),
-          RequiredParameterNode(:@@a),
-        ], [], [], nil, [], nil, nil),
-        nil,
-        [:A, :@a, :$A, :@@a],
-        Location(),
-        nil,
-        Location(),
-        Location(),
-        nil,
-        Location()
-      )
-
-      assert_errors expected, "def foo(A, @a, $A, @@a);end", [
-        ["Formal argument cannot be a constant", 8..9],
-        ["Formal argument cannot be an instance variable", 11..13],
-        ["Formal argument cannot be a global variable", 15..17],
-        ["Formal argument cannot be a class variable", 19..22],
-      ]
-    end
-
-    def test_cannot_assign_to_a_reserved_numbered_parameter
-      expected = BeginNode(
-        Location(),
-        StatementsNode([
-          LocalVariableWriteNode(:_1, 0, Location(), SymbolNode(Location(), Location(), nil, "a"), Location()),
-          LocalVariableWriteNode(:_2, 0, Location(), SymbolNode(Location(), Location(), nil, "a"), Location()),
-          LocalVariableWriteNode(:_3, 0, Location(), SymbolNode(Location(), Location(), nil, "a"), Location()),
-          LocalVariableWriteNode(:_4, 0, Location(), SymbolNode(Location(), Location(), nil, "a"), Location()),
-          LocalVariableWriteNode(:_5, 0, Location(), SymbolNode(Location(), Location(), nil, "a"), Location()),
-          LocalVariableWriteNode(:_6, 0, Location(), SymbolNode(Location(), Location(), nil, "a"), Location()),
-          LocalVariableWriteNode(:_7, 0, Location(), SymbolNode(Location(), Location(), nil, "a"), Location()),
-          LocalVariableWriteNode(:_8, 0, Location(), SymbolNode(Location(), Location(), nil, "a"), Location()),
-          LocalVariableWriteNode(:_9, 0, Location(), SymbolNode(Location(), Location(), nil, "a"), Location()),
-          LocalVariableWriteNode(:_10, 0, Location(), SymbolNode(Location(), Location(), nil, "a"), Location())
-        ]),
-        nil,
-        nil,
-        nil,
-        Location()
-      )
-      source = <<~RUBY
-      begin
-        _1=:a;_2=:a;_3=:a;_4=:a;_5=:a
-        _6=:a;_7=:a;_8=:a;_9=:a;_10=:a
-      end
-      RUBY
-      assert_errors expected, source, [
-        ["reserved for numbered parameter", 8..10],
-        ["reserved for numbered parameter", 14..16],
-        ["reserved for numbered parameter", 20..22],
-        ["reserved for numbered parameter", 26..28],
-        ["reserved for numbered parameter", 32..34],
-        ["reserved for numbered parameter", 40..42],
-        ["reserved for numbered parameter", 46..48],
-        ["reserved for numbered parameter", 52..54],
-        ["reserved for numbered parameter", 58..60],
-      ]
-    end
-
-    def test_do_not_allow_trailing_commas_in_method_parameters
-      expected = DefNode(
-        Location(),
-        nil,
-        ParametersNode(
-          [RequiredParameterNode(:a), RequiredParameterNode(:b), RequiredParameterNode(:c)],
-          [],
-          [],
-          nil,
-          [],
-          nil,
-          nil
-        ),
-        nil,
-        [:a, :b, :c],
-        Location(),
-        nil,
-        Location(),
-        Location(),
-        nil,
-        Location()
-      )
-
-      assert_errors expected, "def foo(a,b,c,);end", [
-        ["Unexpected ','.", 13..14]
-      ]
-    end
-
-    def test_do_not_allow_trailing_commas_in_lambda_parameters
-      expected = LambdaNode(
-        [:a, :b],
-        Location(),
-        Location(),
-        Location(),
-        BlockParametersNode(
-          ParametersNode([RequiredParameterNode(:a), RequiredParameterNode(:b)], [], [], nil, [], nil, nil),
-          [],
-          Location(),
-          Location()
-        ),
-        nil
-      )
-      assert_errors expected, "-> (a, b, ) {}", [
-        ["Unexpected ','.", 8..9]
-      ]
-    end
-
-    def test_do_not_allow_multiple_codepoints_in_a_single_character_literal
-      expected = StringNode(Location(), Location(), nil, "\u0001\u0002")
-
-      assert_errors expected, '?\u{0001 0002}', [
-        ["Multiple codepoints at single character literal", 9..12]
-      ]
-    end
-
-    def test_invalid_hex_escape
-      assert_errors expression('"\\xx"'), '"\\xx"', [
-        ["Invalid hex escape.", 1..3],
-      ]
-    end
-
-    def test_do_not_allow_more_than_6_hexadecimal_digits_in_u_Unicode_character_notation
-      expected = StringNode(Location(), Location(), Location(), "\u0001")
-
-      assert_errors expected, '"\u{0000001}"', [
-        ["invalid Unicode escape.", 4..11],
-      ]
-    end
-
-    def test_do_not_allow_characters_other_than_0_9_a_f_and_A_F_in_u_Unicode_character_notation
-      expected = StringNode(Location(), Location(), Location(), "\u0000z}")
-
-      assert_errors expected, '"\u{000z}"', [
-        ["unterminated Unicode escape", 7..7],
-      ]
-    end
-
-    def test_unterminated_unicode_brackets_should_be_a_syntax_error
-      assert_errors expression('?\\u{3'), '?\\u{3', [
-        ["invalid Unicode escape.", 1..5],
-      ]
-    end
-
-    def test_method_parameters_after_block
-      expected = DefNode(
-        Location(),
-        nil,
-        ParametersNode(
-          [],
-          [],
-          [RequiredParameterNode(:a)],
-          nil,
-          [],
-          nil,
-          BlockParameterNode(:block, Location(), Location())
-        ),
-        nil,
-        [:block, :a],
-        Location(),
-        nil,
-        Location(),
-        Location(),
-        nil,
-        Location()
-      )
-      assert_errors expected, "def foo(&block, a)\nend", [
-        ["Unexpected parameter order", 16..17]
-      ]
-    end
-
-    def test_method_with_arguments_after_anonymous_block
-      expected = DefNode(
-        Location(),
-        nil,
-        ParametersNode([], [], [RequiredParameterNode(:a)], nil, [], nil, BlockParameterNode(nil, nil, Location())),
-        nil,
-        [:&, :a],
-        Location(),
-        nil,
-        Location(),
-        Location(),
-        nil,
-        Location()
-      )
-
-      assert_errors expected, "def foo(&, a)\nend", [
-        ["Unexpected parameter order", 11..12]
-      ]
-    end
-
-    def test_method_parameters_after_arguments_forwarding
-      expected = DefNode(
-        Location(),
-        nil,
-        ParametersNode(
-          [],
-          [],
-          [RequiredParameterNode(:a)],
-          nil,
-          [],
-          ForwardingParameterNode(),
-          nil
-        ),
-        nil,
-        [:"...", :a],
-        Location(),
-        nil,
-        Location(),
-        Location(),
-        nil,
-        Location()
-      )
-      assert_errors expected, "def foo(..., a)\nend", [
-        ["Unexpected parameter order", 13..14]
-      ]
-    end
-
-    def test_keywords_parameters_before_required_parameters
-      expected = DefNode(
-        Location(),
-        nil,
-        ParametersNode(
-          [],
-          [],
-          [RequiredParameterNode(:a)],
-          nil,
-          [KeywordParameterNode(Location(), nil)],
-          nil,
-          nil
-        ),
-        nil,
-        [:b, :a],
-        Location(),
-        nil,
-        Location(),
-        Location(),
-        nil,
-        Location()
-      )
-      assert_errors expected, "def foo(b:, a)\nend", [
-        ["Unexpected parameter order", 12..13]
-      ]
-    end
-
-    def test_rest_keywords_parameters_before_required_parameters
-      expected = DefNode(
-        Location(),
-        nil,
-        ParametersNode(
-          [],
-          [],
-          [],
-          nil,
-          [KeywordParameterNode(Location(), nil)],
-          KeywordRestParameterNode(Location(), Location()),
-          nil
-        ),
-        nil,
-        [:rest, :b],
-        Location(),
-        nil,
-        Location(),
-        Location(),
-        nil,
-        Location()
-      )
-      assert_errors expected, "def foo(**rest, b:)\nend", [
-        ["Unexpected parameter order", 16..18]
-      ]
-    end
-
-    def test_double_arguments_forwarding
-      expected = DefNode(
-        Location(),
-        nil,
-        ParametersNode([], [], [], nil, [], ForwardingParameterNode(), nil),
-        nil,
-        [:"..."],
-        Location(),
-        nil,
-        Location(),
-        Location(),
-        nil,
-        Location()
-      )
-
-      assert_errors expected, "def foo(..., ...)\nend", [
-        ["Unexpected parameter order", 13..16]
-      ]
-    end
-
-    def test_multiple_error_in_parameters_order
-      expected = DefNode(
-        Location(),
-        nil,
-        ParametersNode(
-          [],
-          [],
-          [RequiredParameterNode(:a)],
-          nil,
-          [KeywordParameterNode(Location(), nil)],
-          KeywordRestParameterNode(Location(), Location()),
-          nil
-        ),
-        nil,
-        [:args, :a, :b],
-        Location(),
-        nil,
-        Location(),
-        Location(),
-        nil,
-        Location()
-      )
-
-      assert_errors expected, "def foo(**args, a, b:)\nend", [
-        ["Unexpected parameter order", 16..17],
-        ["Unexpected parameter order", 19..21]
-      ]
-    end
-
-    def test_switching_to_optional_arguments_twice
-      expected = DefNode(
-        Location(),
-        nil,
-        ParametersNode(
-          [],
-          [],
-          [RequiredParameterNode(:a)],
-          nil,
-          [KeywordParameterNode(Location(), nil)],
-          KeywordRestParameterNode(Location(), Location()),
-          nil
-        ),
-        nil,
-        [:args, :a, :b],
-        Location(),
-        nil,
-        Location(),
-        Location(),
-        nil,
-        Location(),
-      )
-
-      assert_errors expected, "def foo(**args, a, b:)\nend", [
-        ["Unexpected parameter order", 16..17],
-        ["Unexpected parameter order", 19..21]
-      ]
-    end
-
-    def test_switching_to_named_arguments_twice
-      expected = DefNode(
-        Location(),
-        nil,
-        ParametersNode(
-          [],
-          [],
-          [RequiredParameterNode(:a)],
-          nil,
-          [KeywordParameterNode(Location(), nil)],
-          KeywordRestParameterNode(Location(), Location()),
-          nil
-        ),
-        nil,
-        [:args, :a, :b],
-        Location(),
-        nil,
-        Location(),
-        Location(),
-        nil,
-        Location(),
-      )
-
-      assert_errors expected, "def foo(**args, a, b:)\nend", [
-        ["Unexpected parameter order", 16..17],
-        ["Unexpected parameter order", 19..21]
-      ]
-    end
-
-    def test_returning_to_optional_parameters_multiple_times
-      expected = DefNode(
-        Location(),
-        nil,
-        ParametersNode(
-          [RequiredParameterNode(:a)],
-          [
-            OptionalParameterNode(:b, Location(), Location(), IntegerNode()),
-            OptionalParameterNode(:d, Location(), Location(), IntegerNode())
-          ],
-          [RequiredParameterNode(:c), RequiredParameterNode(:e)],
-          nil,
-          [],
-          nil,
-          nil
-        ),
-        nil,
-        [:a, :b, :c, :d, :e],
-        Location(),
-        nil,
-        Location(),
-        Location(),
-        nil,
-        Location(),
-      )
-
-      assert_errors expected, "def foo(a, b = 1, c, d = 2, e)\nend", [
-        ["Unexpected parameter order", 23..24]
-      ]
-    end
-
-    def test_case_without_when_clauses_errors_on_else_clause
-      expected = CaseNode(
-        SymbolNode(Location(), Location(), nil, "a"),
-        [],
-        ElseNode(Location(), nil, Location()),
-        Location(),
-        Location()
-      )
-
-      assert_errors expected, "case :a\nelse\nend", [
-        ["Unexpected else without no when clauses in case statement.", 8..12]
-      ]
-    end
-
-    def test_setter_method_cannot_be_defined_in_an_endless_method_definition
-      expected = DefNode(
-        Location(),
-        nil,
-        nil,
-        StatementsNode([IntegerNode()]),
-        [],
-        Location(),
-        nil,
-        Location(),
-        Location(),
-        Location(),
-        nil
-      )
-
-      assert_errors expected, "def a=() = 42", [
-        ["Setter method cannot be defined in an endless method definition", 4..6]
-      ]
-    end
-
-    def test_do_not_allow_forward_arguments_in_lambda_literals
-      expected = LambdaNode(
-        [:"..."],
-        Location(),
-        Location(),
-        Location(),
-        BlockParametersNode(ParametersNode([], [], [], nil, [], ForwardingParameterNode(), nil), [], Location(), Location()),
-        nil
-      )
-
-      assert_errors expected, "->(...) {}", [
-        ["Unexpected ...", 3..6]
-      ]
-    end
-
-    def test_do_not_allow_forward_arguments_in_blocks
-      expected = CallNode(
-        nil,
-        nil,
-        Location(),
-        nil,
-        nil,
-        nil,
-        BlockNode(
-          [:"..."],
-          BlockParametersNode(ParametersNode([], [], [], nil, [], ForwardingParameterNode(), nil), [], Location(), Location()),
-          nil,
-          Location(),
-          Location()
-        ),
-        0,
-        "a"
-      )
-
-      assert_errors expected, "a {|...|}", [
-        ["Unexpected ...", 4..7]
-      ]
-    end
-
-    def test_dont_allow_return_inside_class_body
-      expected = ClassNode(
-        [],
-        Location(),
-        ConstantReadNode(:A),
-        nil,
-        nil,
-        StatementsNode([ReturnNode(Location(), nil)]),
-        Location(),
-        :A,
-        :A
-      )
-
-      assert_errors expected, "class A; return; end", [
-        ["Invalid return in class/module body", 15..16]
-      ]
-    end
-
-    def test_dont_allow_return_inside_module_body
-      expected = ModuleNode(
-        [],
-        Location(),
-        ConstantReadNode(:A),
-        StatementsNode([ReturnNode(Location(), nil)]),
-        Location(),
-        :A,
-        :A
-      )
-
-      assert_errors expected, "module A; return; end", [
-        ["Invalid return in class/module body", 16..17]
-      ]
-    end
-
-    def test_dont_allow_setting_to_back_and_nth_reference
-      expected = BeginNode(
-        Location(),
-        StatementsNode([
-          GlobalVariableWriteNode(:$+, Location(), NilNode(), Location()),
-          GlobalVariableWriteNode(:$1466, Location(), NilNode(), Location())
-        ]),
-        nil,
-        nil,
-        nil,
-        Location()
-      )
-
-      assert_errors expected, "begin\n$+ = nil\n$1466 = nil\nend", [
-        ["Can't set variable", 6..8],
-        ["Can't set variable", 15..20]
-      ]
-    end
-
-    def test_duplicated_parameter_names
-      # For some reason, Ripper reports no error for Ruby 3.0 when you have
-      # duplicated parameter names for positional parameters.
-      unless RUBY_VERSION < "3.1.0"
-        expected = DefNode(
-          Location(),
-          nil,
-          ParametersNode([RequiredParameterNode(:a), RequiredParameterNode(:b), RequiredParameterNode(:a)], [], [], nil, [], nil, nil),
-          nil,
-          [:a, :b],
-          Location(),
-          nil,
-          Location(),
-          Location(),
-          nil,
-          Location()
-        )
-
-        assert_errors expected, "def foo(a,b,a);end", [
-          ["Duplicated parameter name.", 12..13]
-        ]
-      end
-
-      expected = DefNode(
-        Location(),
-        nil,
-        ParametersNode([RequiredParameterNode(:a), RequiredParameterNode(:b)], [], [], RestParameterNode(Location(), Location()), [], nil, nil),
-        nil,
-        [:a, :b],
-        Location(),
-        nil,
-        Location(),
-        Location(),
-        nil,
-        Location()
-      )
-
-      assert_errors expected, "def foo(a,b,*a);end", [
-        ["Duplicated parameter name.", 13..14]
-      ]
-
-      expected = DefNode(
-        Location(),
-        nil,
-        ParametersNode([RequiredParameterNode(:a), RequiredParameterNode(:b)], [], [], nil, [], KeywordRestParameterNode(Location(), Location()), nil),
-        nil,
-        [:a, :b],
-        Location(),
-        nil,
-        Location(),
-        Location(),
-        nil,
-        Location()
-      )
-
-      assert_errors expected, "def foo(a,b,**a);end", [
-        ["Duplicated parameter name.", 14..15]
-      ]
-
-      expected = DefNode(
-        Location(),
-        nil,
-        ParametersNode([RequiredParameterNode(:a), RequiredParameterNode(:b)], [], [], nil, [], nil, BlockParameterNode(:a, Location(), Location())),
-        nil,
-        [:a, :b],
-        Location(),
-        nil,
-        Location(),
-        Location(),
-        nil,
-        Location()
-      )
-
-      assert_errors expected, "def foo(a,b,&a);end", [
-        ["Duplicated parameter name.", 13..14]
-      ]
-
-      expected = DefNode(
-        Location(),
-        nil,
-        ParametersNode([], [OptionalParameterNode(:a, Location(), Location(), IntegerNode())], [RequiredParameterNode(:b)], RestParameterNode(Location(), Location()), [], nil, nil),
-        nil,
-        [:a, :b, :c],
-        Location(),
-        nil,
-        Location(),
-        Location(),
-        nil,
-        Location()
-      )
-
-      assert_errors expected, "def foo(a = 1,b,*c);end", [["Unexpected parameter *", 16..17]]
-    end
-
-    def test_unterminated_global_variable
-      assert_errors expression("$"), "$", [
-        ["Invalid global variable.", 0..1]
-      ]
-    end
-
-    private
-
-    def assert_errors(expected, source, errors)
-      # Ripper behaves differently on JRuby/TruffleRuby, so only check this on CRuby
-      assert_nil Ripper.sexp_raw(source) if RUBY_ENGINE == "ruby"
-
-      result = YARP.parse(source)
-      node = result.value.statements.body.last
-
-      assert_equal_nodes(expected, node, compare_location: false)
-      assert_equal(errors, result.errors.map { |e| [e.message, e.location.start_offset..e.location.end_offset] })
-    end
-
-    def assert_error_messages(source, errors)
-      assert_nil Ripper.sexp_raw(source)
-      result = YARP.parse(source)
-      assert_equal(errors, result.errors.map(&:message))
-    end
-
-    def expression(source)
-      YARP.parse(source).value.statements.body.last
-    end
-  end
-end
diff --git a/test/yarp/fixtures/arithmetic.txt b/test/yarp/fixtures/arithmetic.txt
deleted file mode 100644
index 6f86f92d47c95e..00000000000000
--- a/test/yarp/fixtures/arithmetic.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-foo !bar
-
--foo*bar
-
-+foo**bar
-
-foo ~bar
-
diff --git a/test/yarp/fixtures/arrays.txt b/test/yarp/fixtures/arrays.txt
deleted file mode 100644
index 057a73abf65a20..00000000000000
--- a/test/yarp/fixtures/arrays.txt
+++ /dev/null
@@ -1,82 +0,0 @@
-[*a]
-
-foo[bar, baz] = 1, 2, 3
-
-[a: [:b, :c]]
-
-
-
-[:a, :b,
-:c,1,
-
-
-
-:d,
-]
-
-
-[:a, :b,
-:c,1,
-
-
-
-:d
-
-
-]
-
-[foo => bar]
-
-foo[bar][baz] = qux
-
-foo[bar][baz]
-
-[
-]
-
-foo[bar, baz]
-
-foo[bar, baz] = qux
-
-foo[0], bar[0] = 1, 2
-
-foo[bar[baz] = qux]
-
-foo[bar]
-
-foo[bar] = baz
-
-[**{}]
-
-[**kw]
-
-[1, **kw]
-
-[1, **kw, **{}, **kw]
-
-[
-  foo => bar,
-]
-
-
-%i#one two three#
-
-%w#one two three#
-
-%x#one two three#
-
-
-%i@one two three@
-
-%w@one two three@
-
-%x@one two three@
-
-
-%i{one two three}
-
-%w{one two three}
-
-%x{one two three}
-
-%w[\C:]
diff --git a/test/yarp/fixtures/begin_rescue.txt b/test/yarp/fixtures/begin_rescue.txt
deleted file mode 100644
index 0a56fbef9f5c3b..00000000000000
--- a/test/yarp/fixtures/begin_rescue.txt
+++ /dev/null
@@ -1,79 +0,0 @@
-begin; a; rescue; b; else; c; end
-
-begin; a; rescue; b; else; c; ensure; d; end
-
-begin
-a
-end
-
-begin; a; end
-
-begin a
- end
-
-begin a; end
-
-begin
-a
-rescue
-b
-rescue
-c
-rescue
-d
-end
-
-begin
-  a
-rescue Exception => ex
-  b
-rescue AnotherException, OneMoreException => ex
-  c
-end
-
-begin
-  a
-rescue Exception => ex
-  b
-ensure
-  b
-end
-
-%!abc!
-
-begin
-a
-rescue
-b
-end
-
-begin;a;rescue;b;end
-
-begin
-a;rescue
-b;end
-
-begin
-a
-rescue Exception
-b
-end
-
-begin
-a
-rescue Exception, CustomException
-b
-end
-
-begin
-  a
-rescue Exception, CustomException => ex
-  b
-end
-
-begin
-  a
-rescue Exception => ex
-  b
-end
-
diff --git a/test/yarp/fixtures/break.txt b/test/yarp/fixtures/break.txt
deleted file mode 100644
index 61859d8a8a3f27..00000000000000
--- a/test/yarp/fixtures/break.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-break
-
-break (1), (2), (3)
-
-break 1
-
-break 1, 2,
-3
-
-break 1, 2, 3
-
-break [1, 2, 3]
-
-break(
-  1
-  2
-)
-
-break()
-
-break(1)
-
-foo { break 42 } == 42
-
-foo { |a| break } == 42
diff --git a/test/yarp/fixtures/case.txt b/test/yarp/fixtures/case.txt
deleted file mode 100644
index 76d11313ee0de1..00000000000000
--- a/test/yarp/fixtures/case.txt
+++ /dev/null
@@ -1,30 +0,0 @@
-case :hi
-when :hi
-end
-
-case true; when true; puts :hi; when false; puts :bye; end
-
-case; when *foo; end
-
-case :hi
-when :hi
-else
-:b
-end
-
-case this; when FooBar, BazBonk; end
-
-case
-when foo == bar
-end
-
-case
-when a
-else
-  # empty
-end
-
-case type;
-  ;when :b;
-  ;  else;
-   end
diff --git a/test/yarp/fixtures/defined.txt b/test/yarp/fixtures/defined.txt
deleted file mode 100644
index 9cf153a853ee1c..00000000000000
--- a/test/yarp/fixtures/defined.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-defined? 1 and defined? 2
-
-defined?(x %= 2)
-
-defined?(foo and bar)
-
-defined? 1
diff --git a/test/yarp/fixtures/hashes.txt b/test/yarp/fixtures/hashes.txt
deleted file mode 100644
index 42c430e43ed369..00000000000000
--- a/test/yarp/fixtures/hashes.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-{}
-
-{
-}
-
-{ a => b, c => d }
-
-{ a => b, **c }
-
-{
-      a: b,
-      c: d
-
-
-
-    }
-
-{ a: b, c: d, **e, f: g }
-
-{ "a": !b? }
diff --git a/test/yarp/fixtures/heredocs_nested.txt b/test/yarp/fixtures/heredocs_nested.txt
deleted file mode 100644
index eef7206d6930aa..00000000000000
--- a/test/yarp/fixtures/heredocs_nested.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-<<~RUBY
-pre
-#{
-<<RUBY
-  hello
-RUBY
-}
-post
-RUBY
diff --git a/test/yarp/fixtures/if.txt b/test/yarp/fixtures/if.txt
deleted file mode 100644
index c5281a66930d1a..00000000000000
--- a/test/yarp/fixtures/if.txt
+++ /dev/null
@@ -1,42 +0,0 @@
-if true; 1; end
-
-if true
-1 else 2 end
-
-if true then true elsif false then false elsif nil then nil else self end
-
-1 if true
-
-break if true
-
-next if true
-
-return if true
-
-if exit_loop then break 42 end
-
-if foo
-then bar
-end
-
-a if b if c
-
-if true
-  a b:
-else
-end
-
-if type in 1
-elsif type in B
-end
-
-if 1
-  lambda do |_|
-  end
-elsif 2
-  lambda do |_|
-  end
-else
-  lambda do |_|
-  end
-end
diff --git a/test/yarp/fixtures/keyword_method_names.txt b/test/yarp/fixtures/keyword_method_names.txt
deleted file mode 100644
index 91544694410a32..00000000000000
--- a/test/yarp/fixtures/keyword_method_names.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-def def
-end
-
-def self.ensure
-end
-
-private def foo
-  bar do
-  end
-end
-
-def m(a, **nil)
-end
-
-def __ENCODING__.a
-end
-
-%{abc}
-
-%"abc"
-
-def __FILE__.a
-end
-
-def __LINE__.a
-end
-
-def nil::a
-end
diff --git a/test/yarp/fixtures/keywords.txt b/test/yarp/fixtures/keywords.txt
deleted file mode 100644
index 90cdfb41c7214f..00000000000000
--- a/test/yarp/fixtures/keywords.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-redo
-
-retry
-
-self
-
-__ENCODING__
-
-__FILE__
-
-__LINE__
diff --git a/test/yarp/fixtures/lambda.txt b/test/yarp/fixtures/lambda.txt
deleted file mode 100644
index 5c21eafb24f993..00000000000000
--- a/test/yarp/fixtures/lambda.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-->(
-  foo
-) {}
-
-->(x: "b#{a}") { }
-
-->(a: b * 3) {}
-
--> foo = bar do end
-
--> foo: bar do end
diff --git a/test/yarp/fixtures/method_calls.txt b/test/yarp/fixtures/method_calls.txt
deleted file mode 100644
index 5d82abef2e34d6..00000000000000
--- a/test/yarp/fixtures/method_calls.txt
+++ /dev/null
@@ -1,147 +0,0 @@
-foo.bar %{baz}
-
-a.b(c, d)
-
-a.b()
-
-foo
-  .bar
-  &.baz
-
-a!
-
-a.()
-
-a.(1, 2, 3)
-
-a::b
-
-a::b c
-
-foo.bar = 1
-
-a?
-
-a(&block)
-
-a(**kwargs)
-
-a.b.c
-
-a(b, c)
-
-a()
-
-a(*args)
-
-a b, c
-
-a.b c, d
-
-foo.foo, bar.bar = 1, 2
-
-a&.b
-
-a&.()
-
-a&.b(c)
-
-a&.b()
-
-foo :a, :b if bar? or baz and qux
-
-foo(:a,
-
-	 :b
-)
-
-foo(*rest)
-
-foo(:a, :h => [:x, :y], :a => :b, &:bar)
-
-hi 123, { :there => :friend, **{}, whatup: :dog }
-
-foo :a, b: true do |a, b| puts a end
-
-hi there: :friend
-
-hi :there => :friend, **{}, whatup: :dog
-
-hi(:there => :friend, **{}, whatup: :dog)
-
-foo({ a: true, b: false, }, &:block)
-
-hi :there => :friend
-
-foo(:a,
-:b,
-)
-
-foo(
-:a,
-b: :c,
-)
-
-foo &:block
-
-foo a: true, b: false, &:block
-
-some_func 1, kwarg: 2
-
-Kernel.Integer(10)
-
-x.each { }
-
-foo.map { $& }
-
-A::B::C :foo
-
-A::B::C(:foo)
-
-A::B::C(:foo) { }
-
-foo("a": -1)
-
-foo bar: { baz: qux do end }
-
-foo bar: { **kw do end }
-
-foo "#{bar.map do "baz" end}" do end
-
-foo class Bar baz do end end
-
-foo module Bar baz do end end
-
-foo [baz do end]
-
-p begin 1.times do 1 end end
-
-foo :a,
-  if x
-    bar do |a|
-      a
-    end
-  end
-
-foo :a,
-  while x
-    bar do |a|
-      a
-    end
-  end,
-  until x
-    baz do
-    end
-  end
-
-{} + A {}
-
-{} + A { |a| a }
-
-A {} + A {}
-
-lst << A {}
-
-"#{ join (" ") }"
-
-"#{(v)}"
diff --git a/test/yarp/fixtures/methods.txt b/test/yarp/fixtures/methods.txt
deleted file mode 100644
index de17645bb553a1..00000000000000
--- a/test/yarp/fixtures/methods.txt
+++ /dev/null
@@ -1,165 +0,0 @@
-def foo((bar, baz))
-end
-
-def foo((bar, baz), optional = 1, (bin, bag))
-end
-
-
-def a; ensure; end
-
-def (b).a
-end
-
-def (a)::b
-end
-
-def false.a
-end
-
-def a(...)
-end
-
-def $var.a
-end
-
-def a.b
-end
-
-def @var.a
-end
-
-def a b:; end
-
-%,abc,
-
-def a(b:)
-end
-
-def a(**b)
-end
-
-def a(**)
-end
-
-a = 1; def a
-end
-
-def a b, c, d
-end
-
-def nil.a
-end
-
-def a b:, c: 1
-end
-
-def a(b:, c: 1)
-end
-
-def a(b:
-  1, c:)
-end
-
-%.abc.
-
-def a b = 1, c = 2
-end
-
-def a()
-end
-
-def a b, c = 2
-end
-
-def a b
-end
-
-def a; rescue; else; ensure; end
-
-def a *b
-end
-
-def a(*)
-end
-
-def a
-b = 1
-end
-
-def self.a
-end
-
-def true.a
-end
-
-def a
-end
-
-def hi
-return :hi if true
-:bye
-end
-
-def foo = 1
-def bar = 2
-
-def foo(bar) = 123
-
-def foo = 123
-
-def a(*); b(*); end
-
-def a(...); b(...); end
-
-def a(...); b(1, 2, ...); end
-
-def (c = b).a
-end
-
-def a &b
-end
-
-def a(&)
-end
-
-def @@var.a
-end
-
-def (a = b).C
-end
-
-def self.Array_function; end
-
-Const = 1; def Const.a
-end
-
-def a(...); "foo#{b(...)}"; end
-
-def foo
-  {}.merge **bar, **baz, **qux
-end
-
-def bar(a: (1...10))
-end
-
-def bar(a: (...10))
-end
-
-def bar(a: (1...))
-end
-
-def bar(a = (1...10))
-end
-
-def bar(a = (...10))
-end
-
-def bar(a = (1...))
-end
-
-def method(a)
-  item >> a {}
-end
-
-def foo(_a, _a, b, c)
-end
diff --git a/test/yarp/fixtures/next.txt b/test/yarp/fixtures/next.txt
deleted file mode 100644
index 476f17ffe3e3a8..00000000000000
--- a/test/yarp/fixtures/next.txt
+++ /dev/null
@@ -1,24 +0,0 @@
-next
-
-next (1), (2), (3)
-
-next 1
-
-next 1, 2,
-3
-
-next 1, 2, 3
-
-next [1, 2, 3]
-
-next(
-  1
-  2
-)
-
-next
-1
-
-next()
-
-next(1)
diff --git a/test/yarp/fixtures/numbers.txt b/test/yarp/fixtures/numbers.txt
deleted file mode 100644
index 3c8bf0780592ec..00000000000000
--- a/test/yarp/fixtures/numbers.txt
+++ /dev/null
@@ -1,63 +0,0 @@
-0
-
-1
-
-1.0
-
-2
-
-0b0
-
-0b1
-
-0b10
-
-0d0
-
-0d1
-
-0d2
-
-00
-
-01
-
-02
-
-0o0
-
-0o1
-
-0o2
-
-0x0
-
-0x1
-
-0x2
-
-1i
-
-1r
-
--1
-
-1ri
-
-1.2ri
-
--1ri
-
--1.2ri
-
-0o1r
-
-0o1i
-
-0o1ri
-
-0d1r
-
-0d1i
-
-0b1ri
diff --git a/test/yarp/fixtures/patterns.txt b/test/yarp/fixtures/patterns.txt
deleted file mode 100644
index e0c5f303cb59b4..00000000000000
--- a/test/yarp/fixtures/patterns.txt
+++ /dev/null
@@ -1,192 +0,0 @@
-foo => bar
-foo => 1
-foo => 1.0
-foo => 1i
-foo => 1r
-foo => :foo
-foo => %s[foo]
-foo => :"foo"
-foo => /foo/
-foo => `foo`
-foo => %x[foo]
-foo => %i[foo]
-foo => %I[foo]
-foo => %w[foo]
-foo => %W[foo]
-foo => %q[foo]
-foo => %Q[foo]
-foo => "foo"
-foo => nil
-foo => self
-foo => true
-foo => false
-foo => __FILE__
-foo => __LINE__
-foo => __ENCODING__
-foo => -> { bar }
-
-foo => 1 .. 1
-foo => 1.0 .. 1.0
-foo => 1i .. 1i
-foo => 1r .. 1r
-foo => :foo .. :foo
-foo => %s[foo] .. %s[foo]
-foo => :"foo" .. :"foo"
-foo => /foo/ .. /foo/
-foo => `foo` .. `foo`
-foo => %x[foo] .. %x[foo]
-foo => %i[foo] .. %i[foo]
-foo => %I[foo] .. %I[foo]
-foo => %w[foo] .. %w[foo]
-foo => %W[foo] .. %W[foo]
-foo => %q[foo] .. %q[foo]
-foo => %Q[foo] .. %Q[foo]
-foo => "foo" .. "foo"
-foo => nil .. nil
-foo => self .. self
-foo => true .. true
-foo => false .. false
-foo => __FILE__ .. __FILE__
-foo => __LINE__ .. __LINE__
-foo => __ENCODING__ .. __ENCODING__
-foo => -> { bar } .. -> { bar }
-
-foo => ^bar
-foo => ^@bar
-foo => ^@@bar
-foo => ^$bar
-
-foo => ^(1)
-foo => ^(nil)
-foo => ^("bar" + "baz")
-
-foo => Foo
-foo => Foo::Bar::Baz
-foo => ::Foo
-foo => ::Foo::Bar::Baz
-
-foo => Foo()
-foo => Foo(1)
-foo => Foo(1, 2, 3)
-foo => Foo(bar)
-foo => Foo(*bar, baz)
-foo => Foo(bar, *baz)
-foo => Foo(*bar, baz, *qux)
-
-foo => Foo[]
-foo => Foo[1]
-foo => Foo[1, 2, 3]
-foo => Foo[Foo[]]
-foo => Foo[bar]
-foo => Foo[*bar, baz]
-foo => Foo[bar, *baz]
-foo => Foo[*bar, baz, *qux]
-
-foo => *bar
-foo => *bar, baz, qux
-foo => bar, *baz, qux
-foo => bar, baz, *qux
-foo => *bar, baz, *qux
-
-foo => []
-foo => [[[[[]]]]]
-
-foo => [*bar]
-foo => [*bar, baz, qux]
-foo => [bar, *baz, qux]
-foo => [bar, baz, *qux]
-foo => [*bar, baz, *qux]
-
-foo in bar
-foo in 1
-foo in 1.0
-foo in 1i
-foo in 1r
-foo in :foo
-foo in %s[foo]
-foo in :"foo"
-foo in /foo/
-foo in `foo`
-foo in %x[foo]
-foo in %i[foo]
-foo in %I[foo]
-foo in %w[foo]
-foo in %W[foo]
-foo in %q[foo]
-foo in %Q[foo]
-foo in "foo"
-foo in nil
-foo in self
-foo in true
-foo in false
-foo in __FILE__
-foo in __LINE__
-foo in __ENCODING__
-foo in -> { bar }
-
-case foo; in bar then end
-case foo; in 1 then end
-case foo; in 1.0 then end
-case foo; in 1i then end
-case foo; in 1r then end
-case foo; in :foo then end
-case foo; in %s[foo] then end
-case foo; in :"foo" then end
-case foo; in /foo/ then end
-case foo; in `foo` then end
-case foo; in %x[foo] then end
-case foo; in %i[foo] then end
-case foo; in %I[foo] then end
-case foo; in %w[foo] then end
-case foo; in %W[foo] then end
-case foo; in %q[foo] then end
-case foo; in %Q[foo] then end
-case foo; in "foo" then end
-case foo; in nil then end
-case foo; in self then end
-case foo; in true then end
-case foo; in false then end
-case foo; in __FILE__ then end
-case foo; in __LINE__ then end
-case foo; in __ENCODING__ then end
-case foo; in -> { bar } then end
-
-case foo; in bar if baz then end
-case foo; in 1 if baz then end
-case foo; in 1.0 if baz then end
-case foo; in 1i if baz then end
-case foo; in 1r if baz then end
-case foo; in :foo if baz then end
-case foo; in %s[foo] if baz then end
-case foo; in :"foo" if baz then end
-case foo; in /foo/ if baz then end
-case foo; in `foo` if baz then end
-case foo; in %x[foo] if baz then end
-case foo; in %i[foo] if baz then end
-case foo; in %I[foo] if baz then end
-case foo; in %w[foo] if baz then end
-case foo; in %W[foo] if baz then end
-case foo; in %q[foo] if baz then end
-case foo; in %Q[foo] if baz then end
-case foo; in "foo" if baz then end
-case foo; in nil if baz then end
-case foo; in self if baz then end
-case foo; in true if baz then end
-case foo; in false if baz then end
-case foo; in __FILE__ if baz then end
-case foo; in __LINE__ if baz then end
-case foo; in __ENCODING__ if baz then end
-case foo; in -> { bar } if baz then end
-
-if a in []
-end
-
-a => [
-  b
-]
-
-foo in A[
-  bar: B[
-    value: a
-  ]
-]
diff --git a/test/yarp/fixtures/ranges.txt b/test/yarp/fixtures/ranges.txt
deleted file mode 100644
index 55c0ade965bc56..00000000000000
--- a/test/yarp/fixtures/ranges.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-(...2)
-
-(..2)
-
-1...2
-
-foo[...2]
-
-{ foo: ...bar }
-
-(1...)
-
-1..2
-
-{ foo: ..bar }
-
-(1..)
diff --git a/test/yarp/fixtures/regex.txt b/test/yarp/fixtures/regex.txt
deleted file mode 100644
index 1e917e7de7eb2b..00000000000000
--- a/test/yarp/fixtures/regex.txt
+++ /dev/null
@@ -1,30 +0,0 @@
-foo /bar/
-
-%r{abc}i
-
-/a\b/
-
-/aaa #$bbb/
-
-/aaa #{bbb} ccc/
-
-[/(?<foo>bar)/ =~ baz, foo]
-
-/abc/i
-
-%r/[a-z$._?][\w$.?#@~]*:/i
-
-%r/([a-z$._?][\w$.?#@~]*)(\s+)(equ)/i
-
-%r/[a-z$._?][\w$.?#@~]*/i
-
-%r(
-(?:[\w#$%_']|\(\)|\(,\)|\[\]|[0-9])*
-  (?:[\w#$%_']+)
-)
-
-/(?#\))/ =~ "hi"
-
-%r#pound#
-
-/aaa #{bbb}/o
diff --git a/test/yarp/fixtures/rescue.txt b/test/yarp/fixtures/rescue.txt
deleted file mode 100644
index 0d26fd2523f4a7..00000000000000
--- a/test/yarp/fixtures/rescue.txt
+++ /dev/null
@@ -1,31 +0,0 @@
-foo rescue nil
-
-foo rescue
-nil
-
-break rescue nil
-
-next rescue nil
-
-return rescue nil
-
-foo rescue nil || 1
-
-foo rescue nil ? 1 : 2
-
-begin; a; rescue *b; end
-
-foo do |x|
-  bar(y) rescue ArgumentError fail "baz"
-end
-
-if a = foo rescue nil
-  bar
-end
-
-def some_method = other_method 42 rescue nil
-
-def a
-  a b:
-rescue
-end
diff --git a/test/yarp/fixtures/seattlerb/README.rdoc b/test/yarp/fixtures/seattlerb/README.rdoc
deleted file mode 100644
index 649e4e4c2faa3b..00000000000000
--- a/test/yarp/fixtures/seattlerb/README.rdoc
+++ /dev/null
@@ -1,113 +0,0 @@
-= ruby_parser
-
-home :: https://github.com/seattlerb/ruby_parser
-bugs :: https://github.com/seattlerb/ruby_parser/issues
-rdoc :: http://docs.seattlerb.org/ruby_parser
-
-== DESCRIPTION:
-
-ruby_parser (RP) is a ruby parser written in pure ruby (utilizing
-racc--which does by default use a C extension). It outputs
-s-expressions which can be manipulated and converted back to ruby via
-the ruby2ruby gem.
-
-As an example:
-
-    def conditional1 arg1
-      return 1 if arg1 == 0
-      return 0
-    end
-
-becomes:
-
-    s(:defn, :conditional1, s(:args, :arg1),
-      s(:if,
-        s(:call, s(:lvar, :arg1), :==, s(:lit, 0)),
-        s(:return, s(:lit, 1)),
-        nil),
-      s(:return, s(:lit, 0)))
-
-Tested against 801,039 files from the latest of all rubygems (as of 2013-05):
-
-* 1.8 parser is at 99.9739% accuracy, 3.651 sigma
-* 1.9 parser is at 99.9940% accuracy, 4.013 sigma
-* 2.0 parser is at 99.9939% accuracy, 4.008 sigma
-* 2.6 parser is at 99.9972% accuracy, 4.191 sigma
-* 3.0 parser has a 100% parse rate.
-  * Tested against 2,672,412 unique ruby files across 167k gems.
-  * As do all the others now, basically.
-
-== FEATURES/PROBLEMS:
-
-* Pure ruby, no compiles.
-* Includes preceding comment data for defn/defs/class/module nodes!
-* Incredibly simple interface.
-* Output is 100% equivalent to ParseTree.
-  * Can utilize PT's SexpProcessor and UnifiedRuby for language processing.
-* Known Issue: Speed is now pretty good, but can always improve:
-  * RP parses a corpus of 3702 files in 125s (avg 108 Kb/s)
-  * MRI+PT parsed the same in 67.38s (avg 200.89 Kb/s)
-* Known Issue: Code is much better, but still has a long way to go.
-* Known Issue: Totally awesome.
-* Known Issue: line number values can be slightly off. Parsing LR sucks.
-
-== SYNOPSIS:
-
-  RubyParser.new.parse "1+1"
-  # => s(:call, s(:lit, 1), :+, s(:lit, 1))
-
-You can also use Ruby19Parser, Ruby18Parser, or RubyParser.for_current_ruby:
-
-  RubyParser.for_current_ruby.parse "1+1"
-  # => s(:call, s(:lit, 1), :+, s(:lit, 1))
-
-== DEVELOPER NOTES:
-
-To add a new version:
-
-* New parser should be generated from lib/ruby[3]_parser.yy.
-* Extend lib/ruby[3]_parser.yy with new class name.
-* Add new version number to V2/V3 in Rakefile for rule creation.
-* Add new `ruby_parse "x.y.z"` line to Rakefile for rake compare (line ~300).
-* Require generated parser in lib/ruby_parser.rb.
-* Add new V## = ::Ruby##Parser; end to ruby_parser.rb (bottom of file).
-* Add empty TestRubyParserShared##Plus module and TestRubyParserV## to test/test_ruby_parser.rb.
-* Extend Manifest.txt with generated file names.
-* Add new version number to sexp_processor's pt_testcase.rb in all_versions
-
-Until all of these are done, you won't have a clean test run.
-
-== REQUIREMENTS:
-
-* ruby. woot.
-* sexp_processor for Sexp and SexpProcessor classes, and testing.
-* racc full package for parser development (compiling .y to .rb).
-
-== INSTALL:
-
-* sudo gem install ruby_parser
-
-== LICENSE:
-
-(The MIT License)
-
-Copyright (c) Ryan Davis, seattle.rb
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-'Software'), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/test/yarp/fixtures/seattlerb/block_break.txt b/test/yarp/fixtures/seattlerb/block_break.txt
deleted file mode 100644
index 35eabee187b7c2..00000000000000
--- a/test/yarp/fixtures/seattlerb/block_break.txt
+++ /dev/null
@@ -1 +0,0 @@
-break foo arg do |bar| end
diff --git a/test/yarp/fixtures/seattlerb/block_next.txt b/test/yarp/fixtures/seattlerb/block_next.txt
deleted file mode 100644
index 760fcbf809825d..00000000000000
--- a/test/yarp/fixtures/seattlerb/block_next.txt
+++ /dev/null
@@ -1 +0,0 @@
-next foo arg do |bar| end
diff --git a/test/yarp/fixtures/seattlerb/dasgn_icky2.txt b/test/yarp/fixtures/seattlerb/dasgn_icky2.txt
deleted file mode 100644
index 2f50d323041e65..00000000000000
--- a/test/yarp/fixtures/seattlerb/dasgn_icky2.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-a do
-  v = nil
-  begin
-    yield
-  rescue Exception => v
-    break
-  end
-end
diff --git a/test/yarp/fixtures/seattlerb/yield_arg.txt b/test/yarp/fixtures/seattlerb/yield_arg.txt
deleted file mode 100644
index 7e752f62e2520e..00000000000000
--- a/test/yarp/fixtures/seattlerb/yield_arg.txt
+++ /dev/null
@@ -1 +0,0 @@
-yield 42
diff --git a/test/yarp/fixtures/seattlerb/yield_call_assocs.txt b/test/yarp/fixtures/seattlerb/yield_call_assocs.txt
deleted file mode 100644
index 95963dfcf9b242..00000000000000
--- a/test/yarp/fixtures/seattlerb/yield_call_assocs.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-yield 1, :z => 1
-
-yield 1, :z => 1, :w => 2
-
-yield y :z=>1
-
-yield y z:1
-
-yield y(z:1)
-
-yield y(z=>1)
diff --git a/test/yarp/fixtures/seattlerb/yield_empty_parens.txt b/test/yarp/fixtures/seattlerb/yield_empty_parens.txt
deleted file mode 100644
index cff86b243ad644..00000000000000
--- a/test/yarp/fixtures/seattlerb/yield_empty_parens.txt
+++ /dev/null
@@ -1 +0,0 @@
-yield()
diff --git a/test/yarp/fixtures/spanning_heredoc.txt b/test/yarp/fixtures/spanning_heredoc.txt
deleted file mode 100644
index a52a4c3c27b37a..00000000000000
--- a/test/yarp/fixtures/spanning_heredoc.txt
+++ /dev/null
@@ -1,51 +0,0 @@
-# test regex, string, and lists that span a heredoc thanks to an escaped newline
-
-# ripper incorrectly creates a "b\nb" token instead of two separate string tokens
-pp <<-A.gsub(/b\
-a
-A
-b/, "")
-
-# ripper incorrectly creates a "d\nd" token instead of two separate string tokens
-pp <<-A, "d\
-c
-A
-d"
-
-# ripper gets this right
-pp <<-A, %q[f\
-e
-A
-f]
-
-# ripper incorrectly creates a "h\nh" token instead of two separate string tokens
-pp <<-A, %Q[h\
-g
-A
-h]
-
-# ripper can't parse this successfully, though ruby runs it correctly
-pp <<-A, %w[j\
-i
-A
-j]
-
-# ripper can't parse this successfully, though ruby runs it correctly
-# TODO: yarp does not include the "\n" in "l\nl" in the AST like ruby does
-pp <<-A, %W[l\
-k
-A
-l]
-
-# ripper can't parse this successfully, though ruby runs it correctly
-pp <<-A, %i[n\
-m
-A
-n]
-
-# ripper gets this one wrong in the same way that YARP does ...
-# TODO: yarp does not include the "\n" in "p\np" in the AST like ruby does
-pp <<-A, %I[p\
-o
-A
-p]
diff --git a/test/yarp/fixtures/strings.txt b/test/yarp/fixtures/strings.txt
deleted file mode 100644
index 947c535aed53f5..00000000000000
--- a/test/yarp/fixtures/strings.txt
+++ /dev/null
@@ -1,99 +0,0 @@
-%%abc%
-
-%^abc^
-
-%&abc&
-
-%*abc*
-
-%_abc_
-
-%+abc+
-
-%-abc-
-
-%:abc:
-
-%;abc;
-
-%'abc'
-
-%~abc~
-
-%?abc?
-
-%w{    }
-
-%/abc/
-
-%`abc`
-
-"#@@foo"
-
-%\abc\
-
-%{aaa #{bbb} ccc}
-
-%[foo[]]
-
-"foo" +
-#
-"bar"
-
-%q{abc}
-
-%s[abc]
-
-%{abc}
-
-''
-
-"abc"
-
-"#@---"
-
-"aaa #{bbb} ccc"
-
-'abc'
-
-%w[a b c]
-
-%w[a[] b[[]] c[]]
-
-%w[foo\ bar \#{1}]
-
-%w[foo\ bar baz]
-
-%W[a b#{c}d e]
-
-%W[a b c]
-
-%w[
-  a
-  b
-  c
-]
-
-'\' foo \' bar'
-
-'\\ foo \\ bar'
-
-"#$foo"
-
-"#@foo"
-
-"\x7 \x23 \x61"
-
-"\7 \43 \141"
-
-%[abc]
-
-%(abc)
-
-%@abc@
-
-%$abc$
-
-?a
-
-%Q{abc}
diff --git a/test/yarp/fixtures/super.txt b/test/yarp/fixtures/super.txt
deleted file mode 100644
index b685035970262e..00000000000000
--- a/test/yarp/fixtures/super.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-super
-
-super()
-
-super(1)
-
-super(1, 2, 3)
diff --git a/test/yarp/fixtures/symbols.txt b/test/yarp/fixtures/symbols.txt
deleted file mode 100644
index 7563eb874f6e72..00000000000000
--- a/test/yarp/fixtures/symbols.txt
+++ /dev/null
@@ -1,93 +0,0 @@
-:'abc'
-
-:"#{var}"
-
-:"abc#{1}"
-
-[:Υ, :ά, :ŗ, :ρ]
-
-:-@
-
-:-
-
-:%
-
-:|
-
-:+@
-
-:+
-
-:/
-
-:**
-
-:*
-
-:~@
-
-[1, 1.0, 1r, 1i]
-
-:~
-
-:a
-
-%i[a b c]
-
-%i[a b#{1} #{2}c d#{3}f]
-
-%I[a b#{1} #{2}c d#{3}f]
-
-:@@a
-
-:👍
-
-%i[a\b]
-
-:$a
-
-:@a
-
-:do
-
-:&
-
-:`
-
-:!@
-
-:!~
-
-:!
-
-:[]
-
-:[]=
-
-:^
-
-:==
-
-:===
-
-:=~
-
-:>=
-
-:>>
-
-:>
-
-:<=>
-
-:<=
-
-:<<
-
-:<
-
-:__LINE__
-
-:__FILE__
-
-:__ENCODING__
diff --git a/test/yarp/fixtures/tilde_heredocs.txt b/test/yarp/fixtures/tilde_heredocs.txt
deleted file mode 100644
index 415d4d42c8c2b8..00000000000000
--- a/test/yarp/fixtures/tilde_heredocs.txt
+++ /dev/null
@@ -1,91 +0,0 @@
-<<~EOF
-  a
-EOF
-
-<<~EOF
-	a
-  b
-		c
-EOF
-
-<<~EOF
-  #{1} a
-EOF
-
-<<~EOF
-  a #{1}
-EOF
-
-<<~EOF
-  a
- #{1}
-EOF
-
-<<~EOF
-  a
-  #{1}
-EOF
-
-<<~EOF
-  a
-  b
-EOF
-
-<<~EOF
-  a
-   b
-EOF
-
-<<~EOF
-			a
-		b
-EOF
-
-<<~'EOF'
-  a #{1}
-EOF
-
-<<~EOF
-	a
-	 b
-EOF
-
-<<~EOF
-	 a
-	b
-EOF
-
-<<~EOF
-  	a
-        b
-EOF
-
-<<~EOF
-  a
-
-  b
-EOF
-
-<<~EOF
-  a
-
-  b
-EOF
-
-<<~EOF
-  a
-
-
-
-  b
-EOF
-
-<<~EOF
-
-  #{1}a
-    EOF
-
-<<~EOT
-  #{1}
-	b
-EOT
diff --git a/test/yarp/fixtures/unless.txt b/test/yarp/fixtures/unless.txt
deleted file mode 100644
index 410d460e6905a1..00000000000000
--- a/test/yarp/fixtures/unless.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-unless true; 1; end
-
-unless true
-1 else 2 end
-
-1 unless true
-
-break unless true
-
-next unless true
-
-return unless true
-
-foo :a, :b unless bar?
diff --git a/test/yarp/fixtures/unparser/corpus/literal/control.txt b/test/yarp/fixtures/unparser/corpus/literal/control.txt
deleted file mode 100644
index 648782bc9629bc..00000000000000
--- a/test/yarp/fixtures/unparser/corpus/literal/control.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-next
-return
-break
-retry
-redo
-return 1
-return 1, 2
-return true ? 1 : 2
-break true ? 1 : 2
-next true ? 1 : 2
-return true, if true
-  1
-else
-  2
-end
diff --git a/test/yarp/fixtures/unparser/corpus/literal/flipflop.txt b/test/yarp/fixtures/unparser/corpus/literal/flipflop.txt
deleted file mode 100644
index 8badd39d57332c..00000000000000
--- a/test/yarp/fixtures/unparser/corpus/literal/flipflop.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-if ((i == 4)..(i == 4))
-  foo
-end
-if ((i == 4)...(i == 4))
-  foo
-end
diff --git a/test/yarp/fixtures/unparser/corpus/literal/since/32.txt b/test/yarp/fixtures/unparser/corpus/literal/since/32.txt
deleted file mode 100644
index fa279f11cf81f3..00000000000000
--- a/test/yarp/fixtures/unparser/corpus/literal/since/32.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-def foo(argument, **)
-  bar(argument, **)
-end
-
-def foo(argument, *)
-  bar(argument, *)
-end
diff --git a/test/yarp/fixtures/unparser/corpus/literal/unary.txt b/test/yarp/fixtures/unparser/corpus/literal/unary.txt
deleted file mode 100644
index 77685cb71d080a..00000000000000
--- a/test/yarp/fixtures/unparser/corpus/literal/unary.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-!1
-!(!1)
-!(!(foo || bar))
-!(!1).baz
-~a
--a
-+a
--(-a).foo
diff --git a/test/yarp/fixtures/unparser/corpus/literal/yield.txt b/test/yarp/fixtures/unparser/corpus/literal/yield.txt
deleted file mode 100644
index c0b5820842435a..00000000000000
--- a/test/yarp/fixtures/unparser/corpus/literal/yield.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-yield
-yield(a)
-yield(a, b)
diff --git a/test/yarp/fixtures/until.txt b/test/yarp/fixtures/until.txt
deleted file mode 100644
index fa93819e253eaa..00000000000000
--- a/test/yarp/fixtures/until.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-until true; 1; end
-
-1 until true
-
-break until true
-
-next until true
-
-return until true
-
-foo :a, :b until bar?
diff --git a/test/yarp/fixtures/variables.txt b/test/yarp/fixtures/variables.txt
deleted file mode 100644
index 276dc3b3f1e47e..00000000000000
--- a/test/yarp/fixtures/variables.txt
+++ /dev/null
@@ -1,46 +0,0 @@
-@@abc
-
-@@abc = 1
-
-@@foo, @@bar = 1
-
-@@foo = 1, 2
-
-$abc = 1
-
-$abc
-
-@abc
-
-@abc = 1
-
-a
-
-abc = 1
-
-$foo, $bar = 1
-
-$foo = 1, 2
-
-@foo, @bar = 1
-
-@foo = 1, 2
-
-foo = 1; foo = 1, 2
-
-foo = 1, 2
-
-foo, * = 1, 2
-
-foo, = 1, 2
-
-foo, *bar = 1, 2
-
-foo, (bar, baz) = 1, [2, 3]
-
-foo = *bar
-
-Foo = 1, 2
-
-(a; b; c)
-
diff --git a/test/yarp/fixtures/while.txt b/test/yarp/fixtures/while.txt
deleted file mode 100644
index ed5ea0f45c0d20..00000000000000
--- a/test/yarp/fixtures/while.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-while true; 1; end
-
-1 while true
-
-break while true
-
-next while true
-
-return while true
-
-foo :a, :b while bar?
-
-while def self.foo a = tap do end; end; break; end
-
-while class Foo a = tap do end; end; break; end
-
-while class << self; tap do end; end; break; end
-
-while class << self; a = tap do end; end; break; end
diff --git a/test/yarp/fixtures/whitequark/args_assocs.txt b/test/yarp/fixtures/whitequark/args_assocs.txt
deleted file mode 100644
index b33e1311818776..00000000000000
--- a/test/yarp/fixtures/whitequark/args_assocs.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-fun(:foo => 1)
-
-fun(:foo => 1, &baz)
-
-self.[]= foo, :a => 1
-
-self[:bar => 1]
-
-super(:foo => 42)
-
-yield(:foo => 42)
diff --git a/test/yarp/fixtures/whitequark/args_assocs_legacy.txt b/test/yarp/fixtures/whitequark/args_assocs_legacy.txt
deleted file mode 100644
index b33e1311818776..00000000000000
--- a/test/yarp/fixtures/whitequark/args_assocs_legacy.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-fun(:foo => 1)
-
-fun(:foo => 1, &baz)
-
-self.[]= foo, :a => 1
-
-self[:bar => 1]
-
-super(:foo => 42)
-
-yield(:foo => 42)
diff --git a/test/yarp/fixtures/whitequark/break.txt b/test/yarp/fixtures/whitequark/break.txt
deleted file mode 100644
index da51ec7c31efbc..00000000000000
--- a/test/yarp/fixtures/whitequark/break.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-break
-
-break foo
-
-break()
-
-break(foo)
diff --git a/test/yarp/fixtures/whitequark/break_block.txt b/test/yarp/fixtures/whitequark/break_block.txt
deleted file mode 100644
index 4b58c58d5eaa69..00000000000000
--- a/test/yarp/fixtures/whitequark/break_block.txt
+++ /dev/null
@@ -1 +0,0 @@
-break fun foo do end
diff --git a/test/yarp/fixtures/whitequark/class_definition_in_while_cond.txt b/test/yarp/fixtures/whitequark/class_definition_in_while_cond.txt
deleted file mode 100644
index 10427314b592ed..00000000000000
--- a/test/yarp/fixtures/whitequark/class_definition_in_while_cond.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-while class << self; a = tap do end; end; break; end
-
-while class << self; tap do end; end; break; end
-
-while class Foo a = tap do end; end; break; end
-
-while class Foo; tap do end; end; break; end
diff --git a/test/yarp/fixtures/whitequark/if_while_after_class__since_32.txt b/test/yarp/fixtures/whitequark/if_while_after_class__since_32.txt
deleted file mode 100644
index 1552494d28ce77..00000000000000
--- a/test/yarp/fixtures/whitequark/if_while_after_class__since_32.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-class if true; Object end::Kernel; end
-
-class while true; break Object end::Kernel; end
-
-module if true; Object end::Kernel; end
-
-module while true; break Object end::Kernel; end
diff --git a/test/yarp/fixtures/whitequark/lvar_injecting_match.txt b/test/yarp/fixtures/whitequark/lvar_injecting_match.txt
deleted file mode 100644
index ba814a1088a82b..00000000000000
--- a/test/yarp/fixtures/whitequark/lvar_injecting_match.txt
+++ /dev/null
@@ -1 +0,0 @@
-/(?<match>bar)/ =~ 'bar'; match
diff --git a/test/yarp/fixtures/whitequark/next.txt b/test/yarp/fixtures/whitequark/next.txt
deleted file mode 100644
index 7556ac2b74b9b0..00000000000000
--- a/test/yarp/fixtures/whitequark/next.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-next
-
-next foo
-
-next()
-
-next(foo)
diff --git a/test/yarp/fixtures/whitequark/next_block.txt b/test/yarp/fixtures/whitequark/next_block.txt
deleted file mode 100644
index d3b51dfa2186d6..00000000000000
--- a/test/yarp/fixtures/whitequark/next_block.txt
+++ /dev/null
@@ -1 +0,0 @@
-next fun foo do end
diff --git a/test/yarp/fixtures/whitequark/redo.txt b/test/yarp/fixtures/whitequark/redo.txt
deleted file mode 100644
index f49789cbab8747..00000000000000
--- a/test/yarp/fixtures/whitequark/redo.txt
+++ /dev/null
@@ -1 +0,0 @@
-redo
diff --git a/test/yarp/fixtures/whitequark/retry.txt b/test/yarp/fixtures/whitequark/retry.txt
deleted file mode 100644
index 77428f7b73e572..00000000000000
--- a/test/yarp/fixtures/whitequark/retry.txt
+++ /dev/null
@@ -1 +0,0 @@
-retry
diff --git a/test/yarp/fixtures/whitequark/yield.txt b/test/yarp/fixtures/whitequark/yield.txt
deleted file mode 100644
index 0ecf6395891989..00000000000000
--- a/test/yarp/fixtures/whitequark/yield.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-yield
-
-yield foo
-
-yield()
-
-yield(foo)
diff --git a/test/yarp/fixtures/xstring.txt b/test/yarp/fixtures/xstring.txt
deleted file mode 100644
index 01bcc09fc5860b..00000000000000
--- a/test/yarp/fixtures/xstring.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-%x[foo]
-
-`foo #{bar} baz`
-
-`f\oo`
-
-`foo`
diff --git a/test/yarp/fixtures/yield.txt b/test/yarp/fixtures/yield.txt
deleted file mode 100644
index d75ab57a187eda..00000000000000
--- a/test/yarp/fixtures/yield.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-yield
-
-yield()
-
-yield(1)
-
-yield(1, 2, 3)
diff --git a/test/yarp/heredoc_dedent_test.rb b/test/yarp/heredoc_dedent_test.rb
deleted file mode 100644
index 975232889f488e..00000000000000
--- a/test/yarp/heredoc_dedent_test.rb
+++ /dev/null
@@ -1,18 +0,0 @@
-# frozen_string_literal: true
-
-require_relative "test_helper"
-
-module YARP
-  class HeredocDedentTest < TestCase
-    filepath = File.expand_path("fixtures/tilde_heredocs.txt", __dir__)
-
-    File.read(filepath).split(/(?=\n)\n(?=<)/).each_with_index do |heredoc, index|
-      define_method "test_heredoc_#{index}" do
-        parts = YARP.parse(heredoc).value.statements.body.first.parts
-        actual = parts.map { |part| part.is_a?(StringNode) ? part.unescaped : "1" }.join
-
-        assert_equal(eval(heredoc), actual, "Expected heredocs to match.")
-      end
-    end
-  end
-end
diff --git a/test/yarp/library_symbols_test.rb b/test/yarp/library_symbols_test.rb
deleted file mode 100644
index 53f56d9bfa6c73..00000000000000
--- a/test/yarp/library_symbols_test.rb
+++ /dev/null
@@ -1,103 +0,0 @@
-# frozen_string_literal: true
-
-require_relative "test_helper"
-
-return if RUBY_PLATFORM !~ /linux/
-
-module YARP
-  #
-  #  examine a yarp dll or static archive for expected external symbols.
-  #  these tests only work on a linux system right now.
-  #
-  class LibrarySymbolsTest < TestCase
-    def setup
-      super
-
-      @librubyparser_a = File.expand_path("../../build/librubyparser.a", __dir__)
-      @librubyparser_so = File.expand_path("../../build/librubyparser.so", __dir__)
-      @yarp_so = File.expand_path("../../lib/yarp/yarp.so", __dir__)
-    end
-
-    # objdump runner and helpers
-    def objdump(path)
-      assert_path_exist(path)
-      %x(objdump --section=.text --syms #{path}).split("\n")
-    end
-
-    def global_objdump_symbols(path)
-      objdump(path).select { |line| line[17] == "g" }
-    end
-
-    def hidden_global_objdump_symbols(path)
-      global_objdump_symbols(path).select { |line| line =~ / \.hidden / }
-    end
-
-    def visible_global_objdump_symbols(path)
-      global_objdump_symbols(path).reject { |line| line =~ / \.hidden / }
-    end
-
-    # nm runner and helpers
-    def nm(path)
-      assert_path_exist(path)
-      %x(nm #{path}).split("\n")
-    end
-
-    def global_nm_symbols(path)
-      nm(path).select { |line| line[17] == "T" }
-    end
-
-    def local_nm_symbols(path)
-      nm(path).select { |line| line[17] == "t" }
-    end
-
-    # dig the symbol name out of each line. works for both `objdump` and `nm` output.
-    def names(symbol_lines)
-      symbol_lines.map { |line| line.split(/\s+/).last }
-    end
-
-    #
-    #  static archive - librubyparser.a
-    #
-    def test_librubyparser_a_contains_nothing_globally_visible
-      omit("librubyparser.a is not built") unless File.exist?(@librubyparser_a)
-
-      assert_empty(names(visible_global_objdump_symbols(@librubyparser_a)))
-    end
-
-    def test_librubyparser_a_contains_hidden_yp_symbols
-      omit("librubyparser.a is not built") unless File.exist?(@librubyparser_a)
-
-      names(hidden_global_objdump_symbols(@librubyparser_a)).tap do |symbols|
-        assert_includes(symbols, "yp_parse")
-        assert_includes(symbols, "yp_version")
-      end
-    end
-
-    #
-    #  shared object - librubyparser.so
-    #
-    def test_librubyparser_so_exports_only_the_necessary_functions
-      omit("librubyparser.so is not built") unless File.exist?(@librubyparser_so)
-
-      names(global_nm_symbols(@librubyparser_so)).tap do |symbols|
-        assert_includes(symbols, "yp_parse")
-        assert_includes(symbols, "yp_version")
-      end
-      names(local_nm_symbols(@librubyparser_so)).tap do |symbols|
-        assert_includes(symbols, "yp_encoding_shift_jis_isupper_char")
-      end
-      # TODO: someone who uses this library needs to finish this test
-    end
-
-    #
-    #  shared object - yarp.so
-    #
-    def test_yarp_so_exports_only_the_C_extension_init_function
-      omit("yarp.so is not built") unless File.exist?(@yarp_so)
-
-      names(global_nm_symbols(@yarp_so)).tap do |symbols|
-        assert_equal(["Init_yarp"], symbols)
-      end
-    end
-  end
-end
diff --git a/test/yarp/locals_test.rb b/test/yarp/locals_test.rb
deleted file mode 100644
index 45aecdcaf7ef2e..00000000000000
--- a/test/yarp/locals_test.rb
+++ /dev/null
@@ -1,109 +0,0 @@
-# frozen_string_literal: true
-
-# This test is going to use the RubyVM::InstructionSequence class to compile
-# local tables and compare against them to ensure we have the same locals in the
-# same order. This is important to guarantee that we compile indices correctly
-# on CRuby (in terms of compatibility).
-#
-# There have also been changes made in other versions of Ruby, so we only want
-# to test on the most recent versions.
-return if !defined?(RubyVM::InstructionSequence) || RUBY_VERSION < "3.2"
-
-# Omit tests if running on a 32-bit machine because there is a bug with how
-# Ruby is handling large ISeqs on 32-bit machines
-return if RUBY_PLATFORM =~ /i686/
-
-require_relative "test_helper"
-
-module YARP
-  class LocalsTest < TestCase
-    invalid = []
-    todos = []
-
-    # Invalid break
-    invalid << "break.txt"
-    invalid << "if.txt"
-    invalid << "rescue.txt"
-    invalid << "seattlerb/block_break.txt"
-    invalid << "unless.txt"
-    invalid << "whitequark/break.txt"
-    invalid << "whitequark/break_block.txt"
-
-    # Invalid next
-    invalid << "next.txt"
-    invalid << "seattlerb/block_next.txt"
-    invalid << "unparser/corpus/literal/control.txt"
-    invalid << "whitequark/next.txt"
-    invalid << "whitequark/next_block.txt"
-
-    # Invalid redo
-    invalid << "keywords.txt"
-    invalid << "whitequark/redo.txt"
-
-    # Invalid retry
-    invalid << "whitequark/retry.txt"
-
-    # Invalid yield
-    invalid << "seattlerb/dasgn_icky2.txt"
-    invalid << "seattlerb/yield_arg.txt"
-    invalid << "seattlerb/yield_call_assocs.txt"
-    invalid << "seattlerb/yield_empty_parens.txt"
-    invalid << "unparser/corpus/literal/yield.txt"
-    invalid << "whitequark/args_assocs.txt"
-    invalid << "whitequark/args_assocs_legacy.txt"
-    invalid << "whitequark/yield.txt"
-    invalid << "yield.txt"
-
-    # Dead code eliminated
-    invalid << "whitequark/ruby_bug_10653.txt"
-
-    # case :a
-    # in Symbol(*lhs, x, *rhs)
-    # end
-    todos << "seattlerb/case_in.txt"
-
-    # <<~HERE
-    #   #{<<~THERE}
-    #   THERE
-    # HERE
-    todos << "seattlerb/heredoc_nested.txt"
-
-    base = File.join(__dir__, "fixtures")
-    skips = invalid | todos
-
-    Dir["**/*.txt", base: base].each do |relative|
-      next if skips.include?(relative)
-
-      filepath = File.join(base, relative)
-      define_method("test_#{relative}") { assert_locals(filepath) }
-    end
-
-    def setup
-      @previous_default_external = Encoding.default_external
-      ignore_warnings { Encoding.default_external = Encoding::UTF_8 }
-    end
-
-    def teardown
-      ignore_warnings { Encoding.default_external = @previous_default_external }
-    end
-
-    private
-
-    def assert_locals(filepath)
-      source = File.read(filepath)
-
-      expected = Debug.cruby_locals(source)
-      actual = Debug.yarp_locals(source)
-
-      assert_equal(expected, actual)
-    end
-
-    def ignore_warnings
-      previous_verbosity = $VERBOSE
-      $VERBOSE = nil
-      yield
-    ensure
-      $VERBOSE = previous_verbosity
-    end
-  end
-end
diff --git a/test/yarp/location_test.rb b/test/yarp/location_test.rb
deleted file mode 100644
index d86afb0b3bb1a4..00000000000000
--- a/test/yarp/location_test.rb
+++ /dev/null
@@ -1,833 +0,0 @@
-# frozen_string_literal: true
-
-require_relative "test_helper"
-
-module YARP
-  class LocationTest < TestCase
-    def test_AliasNode
-      assert_location(AliasNode, "alias foo bar")
-    end
-
-    def test_AlternationPatternNode
-      assert_location(AlternationPatternNode, "foo => bar | baz", 7...16, &:pattern)
-    end
-
-    def test_AndNode
-      assert_location(AndNode, "foo and bar")
-      assert_location(AndNode, "foo && bar")
-    end
-
-    def test_ArgumentsNode
-      assert_location(ArgumentsNode, "foo(bar, baz, qux)", 4...17, &:arguments)
-    end
-
-    def test_ArrayNode
-      assert_location(ArrayNode, "[foo, bar, baz]")
-      assert_location(ArrayNode, "%i[foo bar baz]")
-      assert_location(ArrayNode, "%I[foo bar baz]")
-      assert_location(ArrayNode, "%w[foo bar baz]")
-      assert_location(ArrayNode, "%W[foo bar baz]")
-    end
-
-    def test_ArrayPatternNode
-      assert_location(ArrayPatternNode, "foo => bar, baz", 7...15, &:pattern)
-      assert_location(ArrayPatternNode, "foo => [bar, baz]", 7...17, &:pattern)
-      assert_location(ArrayPatternNode, "foo => *bar", 7...11, &:pattern)
-      assert_location(ArrayPatternNode, "foo => []", 7...9, &:pattern)
-      assert_location(ArrayPatternNode, "foo => Foo[]", 7...12, &:pattern)
-      assert_location(ArrayPatternNode, "foo => Foo[bar]", 7...15, &:pattern)
-    end
-
-    def test_AssocNode
-      assert_location(AssocNode, "{ foo: :bar }", 2...11) { |node| node.elements.first }
-      assert_location(AssocNode, "{ :foo => :bar }", 2...14) { |node| node.elements.first }
-      assert_location(AssocNode, "foo(bar: :baz)", 4...13) { |node| node.arguments.arguments.first.elements.first }
-    end
-
-    def test_AssocSplatNode
-      assert_location(AssocSplatNode, "{ **foo }", 2...7) { |node| node.elements.first }
-      assert_location(AssocSplatNode, "foo(**bar)", 4...9) { |node| node.arguments.arguments.first.elements.first }
-    end
-
-    def test_BackReferenceReadNode
-      assert_location(BackReferenceReadNode, "$+")
-    end
-
-    def test_BeginNode
-      assert_location(BeginNode, "begin foo end")
-      assert_location(BeginNode, "begin foo rescue bar end")
-      assert_location(BeginNode, "begin foo; rescue bar\nelse baz end")
-      assert_location(BeginNode, "begin foo; rescue bar\nelse baz\nensure qux end")
-
-      assert_location(BeginNode, "class Foo\nrescue then end", 10..25, &:body)
-      assert_location(BeginNode, "module Foo\nrescue then end", 11..26, &:body)
-    end
-
-    def test_BlockArgumentNode
-      assert_location(BlockArgumentNode, "foo(&bar)", 4...8) { |node| node.arguments.arguments.last }
-    end
-
-    def test_BlockLocalVariableNode
-      assert_location(BlockLocalVariableNode, "foo { |;bar| }", 8...11) do |node|
-        node.block.parameters.locals.first
-      end
-    end
-
-    def test_BlockNode
-      assert_location(BlockNode, "foo {}", 4...6, &:block)
-      assert_location(BlockNode, "foo do end", 4...10, &:block)
-    end
-
-    def test_BlockParameterNode
-      assert_location(BlockParameterNode, "def foo(&bar) end", 8...12) { |node| node.parameters.block }
-    end
-
-    def test_BlockParametersNode
-      assert_location(BlockParametersNode, "foo { || }", 6...8) { |node| node.block.parameters }
-      assert_location(BlockParametersNode, "foo { |bar| baz }", 6...11) { |node| node.block.parameters }
-      assert_location(BlockParametersNode, "foo { |bar; baz| baz }", 6...16) { |node| node.block.parameters }
-
-      assert_location(BlockParametersNode, "-> () {}", 3...5, &:parameters)
-      assert_location(BlockParametersNode, "-> (bar) { baz }", 3...8, &:parameters)
-      assert_location(BlockParametersNode, "-> (bar; baz) { baz }", 3...13, &:parameters)
-    end
-
-    def test_BreakNode
-      assert_location(BreakNode, "break")
-      assert_location(BreakNode, "break foo")
-      assert_location(BreakNode, "break foo, bar")
-      assert_location(BreakNode, "break(foo)")
-    end
-
-    def test_CallNode
-      assert_location(CallNode, "foo")
-      assert_location(CallNode, "foo?")
-      assert_location(CallNode, "foo!")
-
-      assert_location(CallNode, "foo()")
-      assert_location(CallNode, "foo?()")
-      assert_location(CallNode, "foo!()")
-
-      assert_location(CallNode, "foo(bar)")
-      assert_location(CallNode, "foo?(bar)")
-      assert_location(CallNode, "foo!(bar)")
-
-      assert_location(CallNode, "!foo")
-      assert_location(CallNode, "~foo")
-      assert_location(CallNode, "+foo")
-      assert_location(CallNode, "-foo")
-
-      assert_location(CallNode, "not foo")
-      assert_location(CallNode, "not(foo)")
-      assert_location(CallNode, "not()")
-
-      assert_location(CallNode, "foo + bar")
-      assert_location(CallNode, "foo -\n  bar")
-
-      assert_location(CallNode, "Foo()")
-      assert_location(CallNode, "Foo(bar)")
-
-      assert_location(CallNode, "Foo::Bar()")
-      assert_location(CallNode, "Foo::Bar(baz)")
-
-      assert_location(CallNode, "Foo::bar")
-      assert_location(CallNode, "Foo::bar()")
-      assert_location(CallNode, "Foo::bar(baz)")
-
-      assert_location(CallNode, "Foo.bar")
-      assert_location(CallNode, "Foo.bar()")
-      assert_location(CallNode, "Foo.bar(baz)")
-
-      assert_location(CallNode, "foo::bar")
-      assert_location(CallNode, "foo::bar()")
-      assert_location(CallNode, "foo::bar(baz)")
-
-      assert_location(CallNode, "foo.bar")
-      assert_location(CallNode, "foo.bar()")
-      assert_location(CallNode, "foo.bar(baz)")
-
-      assert_location(CallNode, "foo&.bar")
-      assert_location(CallNode, "foo&.bar()")
-      assert_location(CallNode, "foo&.bar(baz)")
-
-      assert_location(CallNode, "foo[]")
-      assert_location(CallNode, "foo[bar]")
-      assert_location(CallNode, "foo[bar, baz]")
-
-      assert_location(CallNode, "foo[] = 1")
-      assert_location(CallNode, "foo[bar] = 1")
-      assert_location(CallNode, "foo[bar, baz] = 1")
-
-      assert_location(CallNode, "foo.()")
-      assert_location(CallNode, "foo.(bar)")
-
-      assert_location(CallNode, "foo&.()")
-      assert_location(CallNode, "foo&.(bar)")
-
-      assert_location(CallNode, "foo::()")
-      assert_location(CallNode, "foo::(bar)")
-      assert_location(CallNode, "foo::(bar, baz)")
-
-      assert_location(CallNode, "foo bar baz")
-      assert_location(CallNode, "foo bar('baz')")
-    end
-
-    def test_CallAndWriteNode
-      assert_location(CallAndWriteNode, "foo.foo &&= bar")
-      assert_location(CallAndWriteNode, "foo[foo] &&= bar")
-    end
-
-    def test_CallOperatorWriteNode
-      assert_location(CallOperatorWriteNode, "foo.foo += bar")
-      assert_location(CallOperatorWriteNode, "foo[foo] += bar")
-    end
-
-    def test_CallOrWriteNode
-      assert_location(CallOrWriteNode, "foo.foo ||= bar")
-      assert_location(CallOrWriteNode, "foo[foo] ||= bar")
-    end
-
-    def test_CapturePatternNode
-      assert_location(CapturePatternNode, "case foo; in bar => baz; end", 13...23) do |node|
-        node.conditions.first.pattern
-      end
-    end
-
-    def test_CaseNode
-      assert_location(CaseNode, "case foo; when bar; end")
-      assert_location(CaseNode, "case foo; when bar; else; end")
-      assert_location(CaseNode, "case foo; when bar; when baz; end")
-      assert_location(CaseNode, "case foo; when bar; when baz; else; end")
-    end
-
-    def test_ClassNode
-      assert_location(ClassNode, "class Foo end")
-      assert_location(ClassNode, "class Foo < Bar end")
-    end
-
-    def test_ClassVariableAndWriteNode
-      assert_location(ClassVariableAndWriteNode, "@@foo &&= bar")
-    end
-
-    def test_ClassVariableOperatorWriteNode
-      assert_location(ClassVariableOperatorWriteNode, "@@foo += bar")
-    end
-
-    def test_ClassVariableOrWriteNode
-      assert_location(ClassVariableOrWriteNode, "@@foo ||= bar")
-    end
-
-    def test_ClassVariableReadNode
-      assert_location(ClassVariableReadNode, "@@foo")
-    end
-
-    def test_ClassVariableTargetNode
-      assert_location(ClassVariableTargetNode, "@@foo, @@bar = baz", 0...5) do |node|
-        node.targets.first
-      end
-    end
-
-    def test_ClassVariableWriteNode
-      assert_location(ClassVariableWriteNode, "@@foo = bar")
-    end
-
-    def test_ConstantPathAndWriteNode
-      assert_location(ConstantPathAndWriteNode, "Parent::Child &&= bar")
-    end
-
-    def test_ConstantPathNode
-      assert_location(ConstantPathNode, "Foo::Bar")
-      assert_location(ConstantPathNode, "::Foo")
-      assert_location(ConstantPathNode, "::Foo::Bar")
-    end
-
-    def test_ConstantPathOperatorWriteNode
-      assert_location(ConstantPathOperatorWriteNode, "Parent::Child += bar")
-    end
-
-    def test_ConstantPathOrWriteNode
-      assert_location(ConstantPathOrWriteNode, "Parent::Child ||= bar")
-    end
-
-    def test_ConstantPathTargetNode
-      assert_location(ConstantPathTargetNode, "::Foo, ::Bar = baz", 0...5) do |node|
-        node.targets.first
-      end
-    end
-
-    def test_ConstantPathWriteNode
-      assert_location(ConstantPathWriteNode, "Foo::Bar = baz")
-      assert_location(ConstantPathWriteNode, "::Foo = bar")
-      assert_location(ConstantPathWriteNode, "::Foo::Bar = baz")
-    end
-
-    def test_ConstantAndWriteNode
-      assert_location(ConstantAndWriteNode, "Foo &&= bar")
-    end
-
-    def test_ConstantOperatorWriteNode
-      assert_location(ConstantOperatorWriteNode, "Foo += bar")
-    end
-
-    def test_ConstantOrWriteNode
-      assert_location(ConstantOrWriteNode, "Foo ||= bar")
-    end
-
-    def test_ConstantReadNode
-      assert_location(ConstantReadNode, "Foo")
-      assert_location(ConstantReadNode, "Foo::Bar", 5...8, &:child)
-    end
-
-    def test_ConstantTargetNode
-      assert_location(ConstantTargetNode, "Foo, Bar = baz", 0...3) do |node|
-        node.targets.first
-      end
-    end
-
-    def test_ConstantWriteNode
-      assert_location(ConstantWriteNode, "Foo = bar")
-    end
-
-    def test_DefNode
-      assert_location(DefNode, "def foo; bar; end")
-      assert_location(DefNode, "def foo = bar")
-      assert_location(DefNode, "def foo.bar; baz; end")
-      assert_location(DefNode, "def foo.bar = baz")
-    end
-
-    def test_DefinedNode
-      assert_location(DefinedNode, "defined? foo")
-      assert_location(DefinedNode, "defined?(foo)")
-    end
-
-    def test_ElseNode
-      assert_location(ElseNode, "if foo; bar; else; baz; end", 13...27, &:consequent)
-      assert_location(ElseNode, "foo ? bar : baz", 10...15, &:consequent)
-    end
-
-    def test_EmbeddedStatementsNode
-      assert_location(EmbeddedStatementsNode, '"foo #{bar} baz"', 5...11) { |node| node.parts[1] }
-    end
-
-    def test_EmbeddedVariableNode
-      assert_location(EmbeddedVariableNode, '"foo #@@bar baz"', 5...11) { |node| node.parts[1] }
-    end
-
-    def test_EnsureNode
-      assert_location(EnsureNode, "begin; foo; ensure; bar; end", 12...28, &:ensure_clause)
-    end
-
-    def test_FalseNode
-      assert_location(FalseNode, "false")
-    end
-
-    def test_FindPatternNode
-      assert_location(FindPatternNode, "case foo; in *, bar, *; end", 13...22) do |node|
-        node.conditions.first.pattern
-      end
-    end
-
-    def test_FlipFlopNode
-      assert_location(FlipFlopNode, "if foo..bar; end", 3..11, &:predicate)
-    end
-
-    def test_FloatNode
-      assert_location(FloatNode, "0.0")
-      assert_location(FloatNode, "1.0")
-      assert_location(FloatNode, "1.0e10")
-      assert_location(FloatNode, "1.0e-10")
-    end
-
-    def test_ForNode
-      assert_location(ForNode, "for foo in bar; end")
-      assert_location(ForNode, "for foo, bar in baz do end")
-    end
-
-    def test_ForwardingArgumentsNode
-      assert_location(ForwardingArgumentsNode, "def foo(...); bar(...); end", 18...21) do |node|
-        node.body.body.first.arguments.arguments.first
-      end
-    end
-
-    def test_ForwardingParameterNode
-      assert_location(ForwardingParameterNode, "def foo(...); end", 8...11) do |node|
-        node.parameters.keyword_rest
-      end
-    end
-
-    def test_ForwardingSuperNode
-      assert_location(ForwardingSuperNode, "super")
-      assert_location(ForwardingSuperNode, "super {}")
-    end
-
-    def test_GlobalVariableAndWriteNode
-      assert_location(GlobalVariableAndWriteNode, "$foo &&= bar")
-    end
-
-    def test_GlobalVariableOperatorWriteNode
-      assert_location(GlobalVariableOperatorWriteNode, "$foo += bar")
-    end
-
-    def test_GlobalVariableOrWriteNode
-      assert_location(GlobalVariableOrWriteNode, "$foo ||= bar")
-    end
-
-    def test_GlobalVariableReadNode
-      assert_location(GlobalVariableReadNode, "$foo")
-    end
-
-    def test_GlobalVariableTargetNode
-      assert_location(GlobalVariableTargetNode, "$foo, $bar = baz", 0...4) do |node|
-        node.targets.first
-      end
-    end
-
-    def test_GlobalVariableWriteNode
-      assert_location(GlobalVariableWriteNode, "$foo = bar")
-    end
-
-    def test_HashNode
-      assert_location(HashNode, "{ foo: 2 }")
-      assert_location(HashNode, "{ \nfoo: 2, \nbar: 3 \n}")
-    end
-
-    def test_HashPatternNode
-      assert_location(HashPatternNode, "case foo; in bar: baz; end", 13...21) do |node|
-        node.conditions.first.pattern
-      end
-    end
-
-    def test_IfNode
-      assert_location(IfNode, "if type in 1;elsif type in B;end")
-    end
-
-    def test_ImaginaryNode
-      assert_location(ImaginaryNode, "1i")
-      assert_location(ImaginaryNode, "1ri")
-    end
-
-    def test_InNode
-      assert_location(InNode, "case foo; in bar; end", 10...16) do |node|
-        node.conditions.first
-      end
-    end
-
-    def test_InstanceVariableAndWriteNode
-      assert_location(InstanceVariableAndWriteNode, "@foo &&= bar")
-    end
-
-    def test_InstanceVariableOperatorWriteNode
-      assert_location(InstanceVariableOperatorWriteNode, "@foo += bar")
-    end
-
-    def test_InstanceVariableOrWriteNode
-      assert_location(InstanceVariableOrWriteNode, "@foo ||= bar")
-    end
-
-    def test_InstanceVariableReadNode
-      assert_location(InstanceVariableReadNode, "@foo")
-    end
-
-    def test_InstanceVariableTargetNode
-      assert_location(InstanceVariableTargetNode, "@foo, @bar = baz", 0...4) do |node|
-        node.targets.first
-      end
-    end
-
-    def test_InstanceVariableWriteNode
-      assert_location(InstanceVariableWriteNode, "@foo = bar")
-    end
-
-    def test_IntegerNode
-      assert_location(IntegerNode, "0")
-      assert_location(IntegerNode, "1")
-      assert_location(IntegerNode, "1_000")
-      assert_location(IntegerNode, "0x1")
-      assert_location(IntegerNode, "0x1_000")
-      assert_location(IntegerNode, "0b1")
-      assert_location(IntegerNode, "0b1_000")
-      assert_location(IntegerNode, "0o1")
-      assert_location(IntegerNode, "0o1_000")
-    end
-
-    def test_InterpolatedRegularExpressionNode
-      assert_location(InterpolatedRegularExpressionNode, "/\#{foo}/")
-    end
-
-    def test_InterpolatedStringNode
-      assert_location(InterpolatedStringNode, "\"foo \#@bar baz\"")
-      assert_location(InterpolatedStringNode, "<<~A\nhello world\nA", 0...4)
-    end
-
-    def test_InterpolatedSymbolNode
-      assert_location(InterpolatedSymbolNode, ':"#{foo}bar"')
-    end
-
-    def test_InterpolatedXStringNode
-      assert_location(InterpolatedXStringNode, '`foo #{bar} baz`')
-    end
-
-    def test_KeywordHashNode
-      assert_location(KeywordHashNode, "foo(a, b: 1)", 7...11) { |node| node.arguments.arguments[1] }
-    end
-
-    def test_KeywordParameterNode
-      assert_location(KeywordParameterNode, "def foo(bar:); end", 8...12) do |node|
-        node.parameters.keywords.first
-      end
-
-      assert_location(KeywordParameterNode, "def foo(bar: nil); end", 8...16) do |node|
-        node.parameters.keywords.first
-      end
-    end
-
-    def test_KeywordRestParameterNode
-      assert_location(KeywordRestParameterNode, "def foo(**); end", 8...10) do |node|
-        node.parameters.keyword_rest
-      end
-
-      assert_location(KeywordRestParameterNode, "def foo(**bar); end", 8...13) do |node|
-        node.parameters.keyword_rest
-      end
-    end
-
-    def test_LambdaNode
-      assert_location(LambdaNode, "-> { foo }")
-      assert_location(LambdaNode, "-> do foo end")
-    end
-
-    def test_LocalVariableAndWriteNode
-      assert_location(LocalVariableAndWriteNode, "foo &&= bar")
-      assert_location(LocalVariableAndWriteNode, "foo = 1; foo &&= bar", 9...20)
-    end
-
-    def test_LocalVariableOperatorWriteNode
-      assert_location(LocalVariableOperatorWriteNode, "foo += bar")
-      assert_location(LocalVariableOperatorWriteNode, "foo = 1; foo += bar", 9...19)
-    end
-
-    def test_LocalVariableOrWriteNode
-      assert_location(LocalVariableOrWriteNode, "foo ||= bar")
-      assert_location(LocalVariableOrWriteNode, "foo = 1; foo ||= bar", 9...20)
-    end
-
-    def test_LocalVariableReadNode
-      assert_location(LocalVariableReadNode, "foo = 1; foo", 9...12)
-    end
-
-    def test_LocalVariableTargetNode
-      assert_location(LocalVariableTargetNode, "foo, bar = baz", 0...3) do |node|
-        node.targets.first
-      end
-    end
-
-    def test_LocalVariableWriteNode
-      assert_location(LocalVariableWriteNode, "foo = bar")
-    end
-
-    def test_MatchPredicateNode
-      assert_location(MatchPredicateNode, "foo in bar")
-    end
-
-    def test_MatchRequiredNode
-      assert_location(MatchRequiredNode, "foo => bar")
-    end
-
-    def test_ModuleNode
-      assert_location(ModuleNode, "module Foo end")
-    end
-
-    def test_MultiWriteNode
-      assert_location(MultiWriteNode, "foo, bar = baz")
-    end
-
-    def test_NextNode
-      assert_location(NextNode, "next")
-      assert_location(NextNode, "next foo")
-      assert_location(NextNode, "next foo, bar")
-      assert_location(NextNode, "next(foo)")
-    end
-
-    def test_NilNode
-      assert_location(NilNode, "nil")
-    end
-
-    def test_NoKeywordsParameterNode
-      assert_location(NoKeywordsParameterNode, "def foo(**nil); end", 8...13) { |node| node.parameters.keyword_rest }
-    end
-
-    def test_NumberedReferenceReadNode
-      assert_location(NumberedReferenceReadNode, "$1")
-    end
-
-    def test_OptionalParameterNode
-      assert_location(OptionalParameterNode, "def foo(bar = nil); end", 8...17) do |node|
-        node.parameters.optionals.first
-      end
-    end
-
-    def test_OrNode
-      assert_location(OrNode, "foo || bar")
-      assert_location(OrNode, "foo or bar")
-    end
-
-    def test_ParametersNode
-      assert_location(ParametersNode, "def foo(bar, baz); end", 8...16, &:parameters)
-    end
-
-    def test_ParenthesesNode
-      assert_location(ParenthesesNode, "()")
-      assert_location(ParenthesesNode, "(foo)")
-      assert_location(ParenthesesNode, "foo (bar), baz", 4...9) { |node| node.arguments.arguments.first }
-      assert_location(ParenthesesNode, "def (foo).bar; end", 4...9, &:receiver)
-    end
-
-    def test_PinnedExpressionNode
-      assert_location(PinnedExpressionNode, "foo in ^(bar)", 7...13, &:pattern)
-    end
-
-    def test_PinnedVariableNode
-      assert_location(PinnedVariableNode, "foo in ^bar", 7...11, &:pattern)
-    end
-
-    def test_PostExecutionNode
-      assert_location(PostExecutionNode, "END {}")
-      assert_location(PostExecutionNode, "END { foo }")
-    end
-
-    def test_PreExecutionNode
-      assert_location(PreExecutionNode, "BEGIN {}")
-      assert_location(PreExecutionNode, "BEGIN { foo }")
-    end
-
-    def test_RangeNode
-      assert_location(RangeNode, "1..2")
-      assert_location(RangeNode, "1...2")
-
-      assert_location(RangeNode, "..2")
-      assert_location(RangeNode, "...2")
-
-      assert_location(RangeNode, "1..")
-      assert_location(RangeNode, "1...")
-    end
-
-    def test_RationalNode
-      assert_location(RationalNode, "1r")
-      assert_location(RationalNode, "1.0r")
-    end
-
-    def test_RedoNode
-      assert_location(RedoNode, "redo")
-    end
-
-    def test_RegularExpressionNode
-      assert_location(RegularExpressionNode, "/foo/")
-    end
-
-    def test_RequiredParameterNode
-      assert_location(RequiredParameterNode, "def foo(bar); end", 8...11) do |node|
-        node.parameters.requireds.first
-      end
-    end
-
-    def test_RequiredDestructuredParameterNode
-      assert_location(RequiredDestructuredParameterNode, "def foo((bar)); end", 8...13) do |node|
-        node.parameters.requireds.first
-      end
-    end
-
-    def test_RescueNode
-      code = <<~RUBY
-      begin
-        body
-      rescue TypeError
-      rescue ArgumentError
-      end
-      RUBY
-      assert_location(RescueNode, code, 13...50) { |node| node.rescue_clause }
-      assert_location(RescueNode, code, 30...50) { |node| node.rescue_clause.consequent }
-    end
-
-    def test_RescueModifierNode
-      assert_location(RescueModifierNode, "foo rescue bar")
-    end
-
-    def test_RestParameterNode
-      assert_location(RestParameterNode, "def foo(*bar); end", 8...12) do |node|
-        node.parameters.rest
-      end
-    end
-
-    def test_RetryNode
-      assert_location(RetryNode, "retry")
-    end
-
-    def test_ReturnNode
-      assert_location(ReturnNode, "return")
-      assert_location(ReturnNode, "return foo")
-      assert_location(ReturnNode, "return foo, bar")
-      assert_location(ReturnNode, "return(foo)")
-    end
-
-    def test_SelfNode
-      assert_location(SelfNode, "self")
-    end
-
-    def test_SingletonClassNode
-      assert_location(SingletonClassNode, "class << self; end")
-    end
-
-    def test_SourceEncodingNode
-      assert_location(SourceEncodingNode, "__ENCODING__")
-    end
-
-    def test_SourceFileNode
-      assert_location(SourceFileNode, "__FILE__")
-    end
-
-    def test_SourceLineNode
-      assert_location(SourceLineNode, "__LINE__")
-    end
-
-    def test_SplatNode
-      assert_location(SplatNode, "*foo = bar", 0...4) { |node| node.targets.first }
-    end
-
-    def test_StatementsNode
-      assert_location(StatementsNode, "foo { 1 }", 6...7) { |node| node.block.body }
-
-      assert_location(StatementsNode, "(1)", 1...2, &:body)
-
-      assert_location(StatementsNode, "def foo; 1; end", 9...10, &:body)
-      assert_location(StatementsNode, "def foo = 1", 10...11, &:body)
-      assert_location(StatementsNode, "def foo; 1\n2; end", 9...12, &:body)
-
-      assert_location(StatementsNode, "if foo; bar; end", 8...11, &:statements)
-      assert_location(StatementsNode, "foo if bar", 0...3, &:statements)
-
-      assert_location(StatementsNode, "if foo; foo; elsif bar; bar; end", 24...27) { |node| node.consequent.statements }
-      assert_location(StatementsNode, "if foo; foo; else; bar; end", 19...22) { |node| node.consequent.statements }
-
-      assert_location(StatementsNode, "unless foo; bar; end", 12...15, &:statements)
-      assert_location(StatementsNode, "foo unless bar", 0...3, &:statements)
-
-      assert_location(StatementsNode, "case; when foo; bar; end", 16...19) { |node| node.conditions.first.statements }
-
-      assert_location(StatementsNode, "while foo; bar; end", 11...14, &:statements)
-      assert_location(StatementsNode, "foo while bar", 0...3, &:statements)
-
-      assert_location(StatementsNode, "until foo; bar; end", 11...14, &:statements)
-      assert_location(StatementsNode, "foo until bar", 0...3, &:statements)
-
-      assert_location(StatementsNode, "for foo in bar; baz; end", 16...19, &:statements)
-
-      assert_location(StatementsNode, "begin; foo; end", 7...10, &:statements)
-      assert_location(StatementsNode, "begin; rescue; foo; end", 15...18) { |node| node.rescue_clause.statements }
-      assert_location(StatementsNode, "begin; ensure; foo; end", 15...18) { |node| node.ensure_clause.statements }
-      assert_location(StatementsNode, "begin; rescue; else; foo; end", 21...24) { |node| node.else_clause.statements }
-
-      assert_location(StatementsNode, "class Foo; foo; end", 11...14, &:body)
-      assert_location(StatementsNode, "module Foo; foo; end", 12...15, &:body)
-      assert_location(StatementsNode, "class << self; foo; end", 15...18, &:body)
-
-      assert_location(StatementsNode, "-> { foo }", 5...8, &:body)
-      assert_location(StatementsNode, "BEGIN { foo }", 8...11, &:statements)
-      assert_location(StatementsNode, "END { foo }", 6...9, &:statements)
-
-      assert_location(StatementsNode, "\"\#{foo}\"", 3...6) { |node| node.parts.first.statements }
-    end
-
-    def test_StringConcatNode
-      assert_location(StringConcatNode, '"foo" "bar"')
-    end
-
-    def test_StringNode
-      assert_location(StringNode, '"foo"')
-      assert_location(StringNode, '%q[foo]')
-    end
-
-    def test_SuperNode
-      assert_location(SuperNode, "super foo")
-      assert_location(SuperNode, "super foo, bar")
-
-      assert_location(SuperNode, "super()")
-      assert_location(SuperNode, "super(foo)")
-      assert_location(SuperNode, "super(foo, bar)")
-
-      assert_location(SuperNode, "super() {}")
-    end
-
-    def test_SymbolNode
-      assert_location(SymbolNode, ":foo")
-    end
-
-    def test_TrueNode
-      assert_location(TrueNode, "true")
-    end
-
-    def test_UndefNode
-      assert_location(UndefNode, "undef foo")
-      assert_location(UndefNode, "undef foo, bar")
-    end
-
-    def test_UnlessNode
-      assert_location(UnlessNode, "foo unless bar")
-      assert_location(UnlessNode, "unless bar; foo; end")
-    end
-
-    def test_UntilNode
-      assert_location(UntilNode, "foo = bar until baz")
-      assert_location(UntilNode, "until bar;baz;end")
-    end
-
-    def test_WhenNode
-      assert_location(WhenNode, "case foo; when bar; end", 10...18) { |node| node.conditions.first }
-    end
-
-    def test_WhileNode
-      assert_location(WhileNode, "foo = bar while foo != baz")
-      assert_location(WhileNode, "while a;bar;baz;end")
-    end
-
-    def test_XStringNode
-      assert_location(XStringNode, "`foo`")
-      assert_location(XStringNode, "%x[foo]")
-    end
-
-    def test_YieldNode
-      assert_location(YieldNode, "yield")
-      assert_location(YieldNode, "yield foo")
-      assert_location(YieldNode, "yield foo, bar")
-      assert_location(YieldNode, "yield(foo)")
-    end
-
-    def test_all_tested
-      expected = YARP.constants.grep(/.Node$/).sort - %i[MissingNode ProgramNode]
-      actual = LocationTest.instance_methods(false).grep(/.Node$/).map { |name| name[5..].to_sym }.sort
-      assert_equal expected, actual
-    end
-
-    private
-
-    def assert_location(kind, source, expected = 0...source.length)
-      result = YARP.parse(source)
-      assert_equal [], result.comments
-      assert_equal [], result.errors
-
-      node = result.value.statements.body.last
-      node = yield node if block_given?
-
-      if expected.begin == 0
-        assert_equal 0, node.location.start_column
-      end
-
-      if expected.end == source.length
-        assert_equal source.split("\n").last.length, node.location.end_column
-      end
-
-      assert_kind_of kind, node
-      assert_equal expected.begin, node.location.start_offset
-      assert_equal expected.end, node.location.end_offset
-    end
-  end
-end
diff --git a/test/yarp/memsize_test.rb b/test/yarp/memsize_test.rb
deleted file mode 100644
index 07c85ce329504a..00000000000000
--- a/test/yarp/memsize_test.rb
+++ /dev/null
@@ -1,17 +0,0 @@
-# frozen_string_literal: true
-
-require_relative "test_helper"
-
-return if YARP::BACKEND == :FFI
-
-module YARP
-  class MemsizeTest < TestCase
-    def test_memsize
-      result = Debug.memsize("2 + 3")
-
-      assert_equal 5, result[:length]
-      assert_kind_of Integer, result[:memsize]
-      assert_equal 6, result[:node_count]
-    end
-  end
-end
diff --git a/test/yarp/newline_test.rb b/test/yarp/newline_test.rb
deleted file mode 100644
index 5a85f856f39f5f..00000000000000
--- a/test/yarp/newline_test.rb
+++ /dev/null
@@ -1,96 +0,0 @@
-# frozen_string_literal: true
-
-require_relative "test_helper"
-
-return unless defined?(RubyVM::InstructionSequence)
-
-module YARP
-  class NewlineTest < TestCase
-    class NewlineVisitor < Visitor
-      attr_reader :source, :newlines
-
-      def initialize(source)
-        @source = source
-        @newlines = []
-      end
-
-      def visit(node)
-        newlines << source.line(node.location.start_offset) if node&.newline?
-        super(node)
-      end
-    end
-
-    base = File.dirname(__dir__)
-    Dir["{lib,test}/**/*.rb", base: base].each do |relative|
-      define_method("test_newline_flags_#{relative}") do
-        assert_newlines(base, relative)
-      end
-    end
-
-    private
-
-    def assert_newlines(base, relative)
-      filepath = File.join(base, relative)
-      source = File.read(filepath, binmode: true, external_encoding: Encoding::UTF_8)
-      expected = rubyvm_lines(source)
-
-      result = YARP.parse_file(filepath)
-      assert_empty result.errors
-
-      result.mark_newlines
-      visitor = NewlineVisitor.new(result.source)
-
-      result.value.accept(visitor)
-      actual = visitor.newlines
-
-      source.each_line.with_index(1) do |line, line_number|
-        # Lines like `while (foo = bar)` result in two line flags in the
-        # bytecode but only one newline flag in the AST. We need to remove the
-        # extra line flag from the bytecode to make the test pass.
-        if line.match?(/while \(/)
-          index = expected.index(line_number)
-          expected.delete_at(index) if index
-        end
-
-        # Lines like `foo =` where the value is on the next line result in
-        # another line flag in the bytecode but only one newline flag in the
-        # AST.
-        if line.match?(/^\s+\w+ =$/)
-          if source.lines[line_number].match?(/^\s+case/)
-            actual[actual.index(line_number)] += 1
-          else
-            actual.delete_at(actual.index(line_number))
-          end
-        end
-
-        if line.match?(/^\s+\w+ = \[$/)
-          if !expected.include?(line_number) && !expected.include?(line_number + 2)
-            actual[actual.index(line_number)] += 1
-          end
-        end
-      end
-
-      assert_equal expected, actual
-    end
-
-    def ignore_warnings
-      previous_verbosity = $VERBOSE
-      $VERBOSE = nil
-      yield
-    ensure
-      $VERBOSE = previous_verbosity
-    end
-
-    def rubyvm_lines(source)
-      queue = [ignore_warnings { RubyVM::InstructionSequence.compile(source) }]
-      lines = []
-
-      while iseq = queue.shift
-        lines.concat(iseq.trace_points.filter_map { |line, event| line if event == :line })
-        iseq.each_child { |insn| queue << insn unless insn.label.start_with?("ensure in ") }
-      end
-
-      lines.sort
-    end
-  end
-end
diff --git a/test/yarp/parse_serialize_test.rb b/test/yarp/parse_serialize_test.rb
deleted file mode 100644
index 82a1c29d48a10f..00000000000000
--- a/test/yarp/parse_serialize_test.rb
+++ /dev/null
@@ -1,28 +0,0 @@
-# frozen_string_literal: true
-
-require_relative "test_helper"
-
-return if YARP::BACKEND == :FFI
-
-module YARP
-  class ParseSerializeTest < TestCase
-    def test_parse_serialize
-      dumped = Debug.parse_serialize_file(__FILE__)
-      result = YARP.load(File.read(__FILE__), dumped)
-
-      assert_kind_of ParseResult, result, "Expected the return value to be a ParseResult"
-      assert_equal __FILE__, find_file_node(result)&.filepath, "Expected the filepath to be set correctly"
-    end
-
-    private
-
-    def find_file_node(result)
-      queue = [result.value]
-
-      while (node = queue.shift)
-        return node if node.is_a?(SourceFileNode)
-        queue.concat(node.child_nodes.compact)
-      end
-    end
-  end
-end
diff --git a/test/yarp/parse_test.rb b/test/yarp/parse_test.rb
deleted file mode 100644
index 5299cfd7b11ed4..00000000000000
--- a/test/yarp/parse_test.rb
+++ /dev/null
@@ -1,222 +0,0 @@
-# frozen_string_literal: true
-
-require_relative "test_helper"
-
-module YARP
-  class ParseTest < TestCase
-    # When we pretty-print the trees to compare against the snapshots, we want to
-    # be certain that we print with the same external encoding. This is because
-    # methods like Symbol#inspect take into account external encoding and it could
-    # change how the snapshot is generated. On machines with certain settings
-    # (like LANG=C or -Eascii-8bit) this could have been changed. So here we're
-    # going to force it to be UTF-8 to keep the snapshots consistent.
-    def setup
-      @previous_default_external = Encoding.default_external
-      ignore_warnings { Encoding.default_external = Encoding::UTF_8 }
-    end
-
-    def teardown
-      ignore_warnings { Encoding.default_external = @previous_default_external }
-    end
-
-    def test_empty_string
-      result = YARP.parse("")
-      assert_equal [], result.value.statements.body
-    end
-
-    def test_parse_takes_file_path
-      filepath = "filepath.rb"
-      result = YARP.parse("def foo; __FILE__; end", filepath)
-
-      assert_equal filepath, find_source_file_node(result.value).filepath
-    end
-
-    def test_parse_lex
-      node, tokens = YARP.parse_lex("def foo; end").value
-
-      assert_kind_of ProgramNode, node
-      assert_equal 5, tokens.length
-    end
-
-    def test_parse_lex_file
-      node, tokens = YARP.parse_lex_file(__FILE__).value
-
-      assert_kind_of ProgramNode, node
-      refute_empty tokens
-    end
-
-    # To accurately compare against Ripper, we need to make sure that we're
-    # running on Ruby 3.2+.
-    ripper_enabled = RUBY_VERSION >= "3.2.0"
-
-    # The FOCUS environment variable allows you to specify one particular fixture
-    # to test, instead of all of them.
-    base = File.join(__dir__, "fixtures")
-    relatives = ENV["FOCUS"] ? [ENV["FOCUS"]] : Dir["**/*.txt", base: base]
-
-    relatives.each do |relative|
-      # These fail on TruffleRuby due to a difference in Symbol#inspect: :测试 vs :"测试"
-      next if RUBY_ENGINE == "truffleruby" and %w[seattlerb/bug202.txt seattlerb/magic_encoding_comment.txt].include?(relative)
-
-      filepath = File.join(base, relative)
-      snapshot = File.expand_path(File.join("snapshots", relative), __dir__)
-
-      directory = File.dirname(snapshot)
-      FileUtils.mkdir_p(directory) unless File.directory?(directory)
-
-      ripper_should_parse = ripper_should_match = ripper_enabled
-
-      # This file has changed behavior in Ripper in Ruby 3.3, so we skip it if
-      # we're on an earlier version.
-      ripper_should_match = false if relative == "seattlerb/pct_w_heredoc_interp_nested.txt" && RUBY_VERSION < "3.3.0"
-
-      # It seems like there are some oddities with nested heredocs and ripper.
-      # Waiting for feedback on https://bugs.ruby-lang.org/issues/19838.
-      ripper_should_match = false if relative == "seattlerb/heredoc_nested.txt"
-
-      # Ripper seems to have a bug that the regex portions before and after the heredoc are combined
-      # into a single token. See https://bugs.ruby-lang.org/issues/19838.
-      #
-      # Additionally, Ripper cannot parse the %w[] fixture in this file, so set ripper_should_parse to false.
-      ripper_should_parse = false if relative == "spanning_heredoc.txt"
-
-      define_method "test_filepath_#{relative}" do
-        # First, read the source from the filepath. Use binmode to avoid converting CRLF on Windows,
-        # and explicitly set the external encoding to UTF-8 to override the binmode default.
-        source = File.read(filepath, binmode: true, external_encoding: Encoding::UTF_8)
-
-        # Make sure that it can be correctly parsed by Ripper. If it can't, then we have a fixture
-        # that is invalid Ruby.
-        refute_nil(Ripper.sexp_raw(source), "Ripper failed to parse") if ripper_should_parse
-
-        # Next, assert that there were no errors during parsing.
-        result = YARP.parse(source, relative)
-        assert_empty result.errors
-
-        # Next, pretty print the source.
-        printed = PP.pp(result.value, +"", 79)
-
-        if File.exist?(snapshot)
-          saved = File.read(snapshot)
-
-          # If the snapshot file exists, but the printed value does not match the
-          # snapshot, then update the snapshot file.
-          if printed != saved
-            File.write(snapshot, printed)
-            warn("Updated snapshot at #{snapshot}.")
-          end
-
-          # If the snapshot file exists, then assert that the printed value
-          # matches the snapshot.
-          assert_equal(saved, printed)
-        else
-          # If the snapshot file does not yet exist, then write it out now.
-          File.write(snapshot, printed)
-          warn("Created snapshot at #{snapshot}.")
-        end
-
-        # Next, assert that the value can be serialized and deserialized without
-        # changing the shape of the tree.
-        assert_equal_nodes(result.value, YARP.load(source, YARP.dump(source, relative)).value)
-
-        # Next, check that the location ranges of each node in the tree are a
-        # superset of their respective child nodes.
-        assert_non_overlapping_locations(result.value)
-
-        # Next, assert that the newlines are in the expected places.
-        expected_newlines = [0]
-        source.b.scan("\n") { expected_newlines << $~.offset(0)[0] + 1 }
-
-        # If there's a __END__, then we should trip out those newlines because we
-        # don't actually scan them during parsing (because we don't need to).
-        if found = result.comments.find { |comment| comment.type == :__END__ }
-          expected_newlines = expected_newlines[...found.location.start_line]
-        end
-
-        assert_equal expected_newlines, Debug.newlines(source)
-
-        if ripper_should_parse && ripper_should_match
-          # Finally, assert that we can lex the source and get the same tokens as
-          # Ripper.
-          lex_result = YARP.lex_compat(source)
-          assert_equal [], lex_result.errors
-          tokens = lex_result.value
-
-          begin
-            YARP.lex_ripper(source).zip(tokens).each do |(ripper, yarp)|
-              assert_equal ripper, yarp
-            end
-          rescue SyntaxError
-            raise ArgumentError, "Test file has invalid syntax #{filepath}"
-          end
-        end
-      end
-    end
-
-    Dir["*.txt", base: base].each do |relative|
-      next if relative == "newline_terminated.txt"
-
-      # We test every snippet (separated by \n\n) in isolation
-      # to ensure the parser does not try to read bytes further than the end of each snippet
-      define_method "test_individual_snippets_#{relative}" do
-        filepath = File.join(base, relative)
-
-        # First, read the source from the filepath. Use binmode to avoid converting CRLF on Windows,
-        # and explicitly set the external encoding to UTF-8 to override the binmode default.
-        file_contents = File.read(filepath, binmode: true, external_encoding: Encoding::UTF_8)
-
-        file_contents.split(/(?<=\S)\n\n(?=\S)/).each do |snippet|
-          snippet = snippet.rstrip
-          result = YARP.parse(snippet, relative)
-          assert_empty result.errors
-
-          assert_equal_nodes(result.value, YARP.load(snippet, YARP.dump(snippet, relative)).value)
-        end
-      end
-    end
-
-    private
-
-    # Check that the location ranges of each node in the tree are a superset of
-    # their respective child nodes.
-    def assert_non_overlapping_locations(node)
-      queue = [node]
-
-      while (current = queue.shift)
-        # We only want to compare parent/child location overlap in the case that
-        # we are not looking at a heredoc. That's because heredoc locations are
-        # special in that they only use the declaration of the heredoc.
-        compare = !(current.is_a?(InterpolatedStringNode) || current.is_a?(InterpolatedXStringNode)) || !current.opening&.start_with?("<<")
-
-        current.child_nodes.each do |child|
-          # child_nodes can return nil values, so we need to skip those.
-          next unless child
-
-          # Now that we know we have a child node, add that to the queue.
-          queue << child
-
-          if compare
-            assert_operator current.location.start_offset, :<=, child.location.start_offset
-            assert_operator current.location.end_offset, :>=, child.location.end_offset
-          end
-        end
-      end
-    end
-
-    def find_source_file_node(program)
-      queue = [program]
-      while (node = queue.shift)
-        return node if node.is_a?(SourceFileNode)
-        queue.concat(node.child_nodes.compact)
-      end
-    end
-
-    def ignore_warnings
-      previous_verbosity = $VERBOSE
-      $VERBOSE = nil
-      yield
-    ensure
-      $VERBOSE = previous_verbosity
-    end
-  end
-end
diff --git a/test/yarp/regexp_test.rb b/test/yarp/regexp_test.rb
deleted file mode 100644
index 9863a54758aa1f..00000000000000
--- a/test/yarp/regexp_test.rb
+++ /dev/null
@@ -1,201 +0,0 @@
-# frozen_string_literal: true
-
-require_relative "test_helper"
-
-return if YARP::BACKEND == :FFI
-
-module YARP
-  class RegexpTest < TestCase
-    ##############################################################################
-    # These tests test the actual use case of extracting named capture groups
-    ##############################################################################
-
-    def test_named_captures_with_arrows
-      assert_equal(["foo"], named_captures("(?<foo>bar)"))
-    end
-
-    def test_named_captures_with_single_quotes
-      assert_equal(["foo"], named_captures("(?'foo'bar)"))
-    end
-
-    def test_nested_named_captures_with_arrows
-      assert_equal(["foo", "bar"], named_captures("(?<foo>(?<bar>baz))"))
-    end
-
-    def test_nested_named_captures_with_single_quotes
-      assert_equal(["foo", "bar"], named_captures("(?'foo'(?'bar'baz))"))
-    end
-
-    def test_allows_duplicate_named_captures
-      assert_equal(["foo", "foo"], named_captures("(?<foo>bar)(?<foo>baz)"))
-    end
-
-    def test_named_capture_inside_fake_range_quantifier
-      assert_equal(["foo"], named_captures("foo{1, (?<foo>2)}"))
-    end
-
-    ##############################################################################
-    # These tests test the rest of the AST. They are not exhaustive, but they
-    # should cover the most common cases. We test these to make sure we don't
-    # accidentally regress and stop being able to extract named captures.
-    ##############################################################################
-
-    def test_alternation
-      refute_nil(named_captures("foo|bar"))
-    end
-
-    def test_anchors
-      refute_nil(named_captures("^foo$"))
-    end
-
-    def test_any
-      refute_nil(named_captures("."))
-    end
-
-    def test_posix_character_classes
-      refute_nil(named_captures("[[:digit:]]"))
-    end
-
-    def test_negated_posix_character_classes
-      refute_nil(named_captures("[[:^digit:]]"))
-    end
-
-    def test_invalid_posix_character_classes_should_fall_back_to_regular_classes
-      refute_nil(named_captures("[[:foo]]"))
-    end
-
-    def test_character_sets
-      refute_nil(named_captures("[abc]"))
-    end
-
-    def test_nested_character_sets
-      refute_nil(named_captures("[[abc]]"))
-    end
-
-    def test_nested_character_sets_with_operators
-      refute_nil(named_captures("[[abc] && [def]]"))
-    end
-
-    def test_named_capture_inside_nested_character_set
-      assert_equal([], named_captures("[foo (?<foo>bar)]"))
-    end
-
-    def test_negated_character_sets
-      refute_nil(named_captures("[^abc]"))
-    end
-
-    def test_character_ranges
-      refute_nil(named_captures("[a-z]"))
-    end
-
-    def test_negated_character_ranges
-      refute_nil(named_captures("[^a-z]"))
-    end
-
-    def test_fake_named_captures_inside_character_sets
-      assert_equal([], named_captures("[a-z(?<foo>)]"))
-    end
-
-    def test_fake_named_capture_inside_character_set_with_escaped_ending
-      assert_equal([], named_captures("[a-z\\](?<foo>)]"))
-    end
-
-    def test_comments
-      refute_nil(named_captures("(?#foo)"))
-    end
-
-    def test_comments_with_escaped_parentheses
-      refute_nil(named_captures("(?#foo\\)\\))"))
-    end
-
-    def test_non_capturing_groups
-      refute_nil(named_captures("(?:foo)"))
-    end
-
-    def test_positive_lookaheads
-      refute_nil(named_captures("(?=foo)"))
-    end
-
-    def test_negative_lookaheads
-      refute_nil(named_captures("(?!foo)"))
-    end
-
-    def test_positive_lookbehinds
-      refute_nil(named_captures("(?<=foo)"))
-    end
-
-    def test_negative_lookbehinds
-      refute_nil(named_captures("(?<!foo)"))
-    end
-
-    def test_atomic_groups
-      refute_nil(named_captures("(?>foo)"))
-    end
-
-    def test_absence_operator
-      refute_nil(named_captures("(?~foo)"))
-    end
-
-    def test_conditional_expression_with_index
-      refute_nil(named_captures("(?(1)foo)"))
-    end
-
-    def test_conditional_expression_with_name
-      refute_nil(named_captures("(?(foo)bar)"))
-    end
-
-    def test_conditional_expression_with_group
-      refute_nil(named_captures("(?(<foo>)bar)"))
-    end
-
-    def test_options_on_groups
-      refute_nil(named_captures("(?imxdau:foo)"))
-    end
-
-    def test_options_on_groups_with_invalid_options
-      assert_nil(named_captures("(?z:bar)"))
-    end
-
-    def test_options_on_groups_getting_turned_off
-      refute_nil(named_captures("(?-imx:foo)"))
-    end
-
-    def test_options_on_groups_some_getting_turned_on_some_getting_turned_off
-      refute_nil(named_captures("(?im-x:foo)"))
-    end
-
-    def test_star_quantifier
-      refute_nil(named_captures("foo*"))
-    end
-
-    def test_plus_quantifier
-      refute_nil(named_captures("foo+"))
-    end
-
-    def test_question_mark_quantifier
-      refute_nil(named_captures("foo?"))
-    end
-
-    def test_endless_range_quantifier
-      refute_nil(named_captures("foo{1,}"))
-    end
-
-    def test_beginless_range_quantifier
-      refute_nil(named_captures("foo{,1}"))
-    end
-
-    def test_range_quantifier
-      refute_nil(named_captures("foo{1,2}"))
-    end
-
-    def test_fake_range_quantifier_because_of_spaces
-      refute_nil(named_captures("foo{1, 2}"))
-    end
-
-    private
-
-    def named_captures(source)
-      Debug.named_captures(source)
-    end
-  end
-end
diff --git a/test/yarp/ripper_compat_test.rb b/test/yarp/ripper_compat_test.rb
deleted file mode 100644
index 9fcdfe63c685ca..00000000000000
--- a/test/yarp/ripper_compat_test.rb
+++ /dev/null
@@ -1,21 +0,0 @@
-# frozen_string_literal: true
-
-require_relative "test_helper"
-
-module YARP
-  class RipperCompatTest < TestCase
-    def test_1_plus_2
-      assert_equivalent("1 + 2")
-    end
-
-    def test_2_minus_3
-      assert_equivalent("2 - 3")
-    end
-
-    private
-
-    def assert_equivalent(source)
-      assert_equal Ripper.sexp_raw(source), RipperCompat.sexp_raw(source)
-    end
-  end
-end
diff --git a/test/yarp/ruby_api_test.rb b/test/yarp/ruby_api_test.rb
deleted file mode 100644
index dc12012f44abf2..00000000000000
--- a/test/yarp/ruby_api_test.rb
+++ /dev/null
@@ -1,64 +0,0 @@
-# frozen_string_literal: true
-
-require_relative "test_helper"
-
-module YARP
-  class RubyAPITest < TestCase
-    def test_ruby_api
-      filepath = __FILE__
-      source = File.read(filepath, binmode: true, external_encoding: Encoding::UTF_8)
-
-      assert_equal YARP.lex(source, filepath).value, YARP.lex_file(filepath).value
-      assert_equal YARP.dump(source, filepath), YARP.dump_file(filepath)
-
-      serialized = YARP.dump(source, filepath)
-      ast1 = YARP.load(source, serialized).value
-      ast2 = YARP.parse(source, filepath).value
-      ast3 = YARP.parse_file(filepath).value
-
-      assert_equal_nodes ast1, ast2
-      assert_equal_nodes ast2, ast3
-    end
-
-    def test_literal_value_method
-      assert_equal 123, parse_expression("123").value
-      assert_equal 3.14, parse_expression("3.14").value
-      assert_equal 42i, parse_expression("42i").value
-      assert_equal 42.1ri, parse_expression("42.1ri").value
-      assert_equal 3.14i, parse_expression("3.14i").value
-      assert_equal 42r, parse_expression("42r").value
-      assert_equal 0.5r, parse_expression("0.5r").value
-      assert_equal 42ri, parse_expression("42ri").value
-      assert_equal 0.5ri, parse_expression("0.5ri").value
-    end
-
-    def test_location_join
-      recv, args_node, _ = parse_expression("1234 + 567").child_nodes
-      arg = args_node.arguments[0]
-
-      joined = recv.location.join(arg.location)
-      assert_equal 0, joined.start_offset
-      assert_equal 10, joined.length
-
-      assert_raise RuntimeError, "Incompatible locations" do
-        arg.location.join(recv.location)
-      end
-
-      other_arg = parse_expression("1234 + 567").arguments.arguments[0]
-
-      assert_raise RuntimeError, "Incompatible sources" do
-        other_arg.location.join(recv.location)
-      end
-
-      assert_raise RuntimeError, "Incompatible sources" do
-        recv.location.join(other_arg.location)
-      end
-    end
-
-    private
-
-    def parse_expression(source)
-      YARP.parse(source).value.statements.body.first
-    end
-  end
-end
diff --git a/test/yarp/snapshots/alias.txt b/test/yarp/snapshots/alias.txt
deleted file mode 100644
index 224c2069a58f35..00000000000000
--- a/test/yarp/snapshots/alias.txt
+++ /dev/null
@@ -1,74 +0,0 @@
-ProgramNode(0...199)(
-  [],
-  StatementsNode(0...199)(
-    [AliasNode(0...15)(
-       SymbolNode(6...10)((6...7), (7...10), nil, "foo"),
-       SymbolNode(11...15)((11...12), (12...15), nil, "bar"),
-       (0...5)
-     ),
-     AliasNode(17...38)(
-       SymbolNode(23...30)((23...26), (26...29), (29...30), "abc"),
-       SymbolNode(31...38)((31...34), (34...37), (37...38), "def"),
-       (17...22)
-     ),
-     AliasNode(40...59)(
-       SymbolNode(46...52)((46...48), (48...51), (51...52), "abc"),
-       SymbolNode(53...59)((53...55), (55...58), (58...59), "def"),
-       (40...45)
-     ),
-     AliasNode(61...84)(
-       InterpolatedSymbolNode(67...77)(
-         (67...69),
-         [StringNode(69...72)(nil, (69...72), nil, "abc"),
-          EmbeddedStatementsNode(72...76)(
-            (72...74),
-            StatementsNode(74...75)([IntegerNode(74...75)()]),
-            (75...76)
-          )],
-         (76...77)
-       ),
-       SymbolNode(78...84)((78...80), (80...83), (83...84), "def"),
-       (61...66)
-     ),
-     AliasNode(86...97)(
-       GlobalVariableReadNode(92...94)(:$a),
-       BackReferenceReadNode(95...97)(),
-       (86...91)
-     ),
-     AliasNode(99...112)(
-       SymbolNode(105...108)(nil, (105...108), nil, "foo"),
-       SymbolNode(109...112)(nil, (109...112), nil, "bar"),
-       (99...104)
-     ),
-     AliasNode(114...129)(
-       GlobalVariableReadNode(120...124)(:$foo),
-       GlobalVariableReadNode(125...129)(:$bar),
-       (114...119)
-     ),
-     AliasNode(131...143)(
-       SymbolNode(137...140)(nil, (137...140), nil, "foo"),
-       SymbolNode(141...143)(nil, (141...143), nil, "if"),
-       (131...136)
-     ),
-     AliasNode(145...158)(
-       SymbolNode(151...154)(nil, (151...154), nil, "foo"),
-       SymbolNode(155...158)(nil, (155...158), nil, "<=>"),
-       (145...150)
-     ),
-     AliasNode(160...175)(
-       SymbolNode(166...169)((166...167), (167...169), nil, "=="),
-       SymbolNode(170...175)((170...171), (171...175), nil, "eql?"),
-       (160...165)
-     ),
-     AliasNode(177...186)(
-       SymbolNode(183...184)(nil, (183...184), nil, "A"),
-       SymbolNode(185...186)(nil, (185...186), nil, "B"),
-       (177...182)
-     ),
-     AliasNode(188...199)(
-       SymbolNode(194...196)((194...195), (195...196), nil, "A"),
-       SymbolNode(197...199)((197...198), (198...199), nil, "B"),
-       (188...193)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/arithmetic.txt b/test/yarp/snapshots/arithmetic.txt
deleted file mode 100644
index c82760a7e39826..00000000000000
--- a/test/yarp/snapshots/arithmetic.txt
+++ /dev/null
@@ -1,107 +0,0 @@
-ProgramNode(0...39)(
-  [],
-  StatementsNode(0...39)(
-    [CallNode(0...8)(
-       nil,
-       nil,
-       (0...3),
-       nil,
-       ArgumentsNode(4...8)(
-         [CallNode(4...8)(
-            CallNode(5...8)(nil, nil, (5...8), nil, nil, nil, nil, 2, "bar"),
-            nil,
-            (4...5),
-            nil,
-            nil,
-            nil,
-            nil,
-            0,
-            "!"
-          )]
-       ),
-       nil,
-       nil,
-       0,
-       "foo"
-     ),
-     CallNode(10...18)(
-       CallNode(10...14)(
-         CallNode(11...14)(nil, nil, (11...14), nil, nil, nil, nil, 2, "foo"),
-         nil,
-         (10...11),
-         nil,
-         nil,
-         nil,
-         nil,
-         0,
-         "-@"
-       ),
-       nil,
-       (14...15),
-       nil,
-       ArgumentsNode(15...18)(
-         [CallNode(15...18)(nil, nil, (15...18), nil, nil, nil, nil, 2, "bar")]
-       ),
-       nil,
-       nil,
-       0,
-       "*"
-     ),
-     CallNode(20...29)(
-       CallNode(20...24)(
-         CallNode(21...24)(nil, nil, (21...24), nil, nil, nil, nil, 2, "foo"),
-         nil,
-         (20...21),
-         nil,
-         nil,
-         nil,
-         nil,
-         0,
-         "+@"
-       ),
-       nil,
-       (24...26),
-       nil,
-       ArgumentsNode(26...29)(
-         [CallNode(26...29)(nil, nil, (26...29), nil, nil, nil, nil, 2, "bar")]
-       ),
-       nil,
-       nil,
-       0,
-       "**"
-     ),
-     CallNode(31...39)(
-       nil,
-       nil,
-       (31...34),
-       nil,
-       ArgumentsNode(35...39)(
-         [CallNode(35...39)(
-            CallNode(36...39)(
-              nil,
-              nil,
-              (36...39),
-              nil,
-              nil,
-              nil,
-              nil,
-              2,
-              "bar"
-            ),
-            nil,
-            (35...36),
-            nil,
-            nil,
-            nil,
-            nil,
-            0,
-            "~"
-          )]
-       ),
-       nil,
-       nil,
-       0,
-       "foo"
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/arrays.txt b/test/yarp/snapshots/arrays.txt
deleted file mode 100644
index ec251f0827757d..00000000000000
--- a/test/yarp/snapshots/arrays.txt
+++ /dev/null
@@ -1,701 +0,0 @@
-ProgramNode(0...511)(
-  [],
-  StatementsNode(0...511)(
-    [ArrayNode(0...4)(
-       [SplatNode(1...3)(
-          (1...2),
-          CallNode(2...3)(nil, nil, (2...3), nil, nil, nil, nil, 2, "a")
-        )],
-       (0...1),
-       (3...4)
-     ),
-     CallNode(6...29)(
-       CallNode(6...9)(nil, nil, (6...9), nil, nil, nil, nil, 2, "foo"),
-       nil,
-       (9...19),
-       (9...10),
-       ArgumentsNode(10...29)(
-         [CallNode(10...13)(nil, nil, (10...13), nil, nil, nil, nil, 2, "bar"),
-          CallNode(15...18)(nil, nil, (15...18), nil, nil, nil, nil, 2, "baz"),
-          ArrayNode(22...29)(
-            [IntegerNode(22...23)(),
-             IntegerNode(25...26)(),
-             IntegerNode(28...29)()],
-            nil,
-            nil
-          )]
-       ),
-       (18...19),
-       nil,
-       0,
-       "[]="
-     ),
-     ArrayNode(31...44)(
-       [KeywordHashNode(32...43)(
-          [AssocNode(32...43)(
-             SymbolNode(32...34)(nil, (32...33), (33...34), "a"),
-             ArrayNode(35...43)(
-               [SymbolNode(36...38)((36...37), (37...38), nil, "b"),
-                SymbolNode(40...42)((40...41), (41...42), nil, "c")],
-               (35...36),
-               (42...43)
-             ),
-             nil
-           )]
-        )],
-       (31...32),
-       (43...44)
-     ),
-     ArrayNode(48...71)(
-       [SymbolNode(49...51)((49...50), (50...51), nil, "a"),
-        SymbolNode(53...55)((53...54), (54...55), nil, "b"),
-        SymbolNode(57...59)((57...58), (58...59), nil, "c"),
-        IntegerNode(60...61)(),
-        SymbolNode(66...68)((66...67), (67...68), nil, "d")],
-       (48...49),
-       (70...71)
-     ),
-     ArrayNode(74...98)(
-       [SymbolNode(75...77)((75...76), (76...77), nil, "a"),
-        SymbolNode(79...81)((79...80), (80...81), nil, "b"),
-        SymbolNode(83...85)((83...84), (84...85), nil, "c"),
-        IntegerNode(86...87)(),
-        SymbolNode(92...94)((92...93), (93...94), nil, "d")],
-       (74...75),
-       (97...98)
-     ),
-     ArrayNode(100...112)(
-       [KeywordHashNode(101...111)(
-          [AssocNode(101...111)(
-             CallNode(101...104)(
-               nil,
-               nil,
-               (101...104),
-               nil,
-               nil,
-               nil,
-               nil,
-               2,
-               "foo"
-             ),
-             CallNode(108...111)(
-               nil,
-               nil,
-               (108...111),
-               nil,
-               nil,
-               nil,
-               nil,
-               2,
-               "bar"
-             ),
-             (105...107)
-           )]
-        )],
-       (100...101),
-       (111...112)
-     ),
-     CallNode(114...133)(
-       CallNode(114...122)(
-         CallNode(114...117)(
-           nil,
-           nil,
-           (114...117),
-           nil,
-           nil,
-           nil,
-           nil,
-           2,
-           "foo"
-         ),
-         nil,
-         (117...122),
-         (117...118),
-         ArgumentsNode(118...121)(
-           [CallNode(118...121)(
-              nil,
-              nil,
-              (118...121),
-              nil,
-              nil,
-              nil,
-              nil,
-              2,
-              "bar"
-            )]
-         ),
-         (121...122),
-         nil,
-         0,
-         "[]"
-       ),
-       nil,
-       (122...127),
-       (122...123),
-       ArgumentsNode(123...133)(
-         [CallNode(123...126)(
-            nil,
-            nil,
-            (123...126),
-            nil,
-            nil,
-            nil,
-            nil,
-            2,
-            "baz"
-          ),
-          CallNode(130...133)(
-            nil,
-            nil,
-            (130...133),
-            nil,
-            nil,
-            nil,
-            nil,
-            2,
-            "qux"
-          )]
-       ),
-       (126...127),
-       nil,
-       0,
-       "[]="
-     ),
-     CallNode(135...148)(
-       CallNode(135...143)(
-         CallNode(135...138)(
-           nil,
-           nil,
-           (135...138),
-           nil,
-           nil,
-           nil,
-           nil,
-           2,
-           "foo"
-         ),
-         nil,
-         (138...143),
-         (138...139),
-         ArgumentsNode(139...142)(
-           [CallNode(139...142)(
-              nil,
-              nil,
-              (139...142),
-              nil,
-              nil,
-              nil,
-              nil,
-              2,
-              "bar"
-            )]
-         ),
-         (142...143),
-         nil,
-         0,
-         "[]"
-       ),
-       nil,
-       (143...148),
-       (143...144),
-       ArgumentsNode(144...147)(
-         [CallNode(144...147)(
-            nil,
-            nil,
-            (144...147),
-            nil,
-            nil,
-            nil,
-            nil,
-            2,
-            "baz"
-          )]
-       ),
-       (147...148),
-       nil,
-       0,
-       "[]"
-     ),
-     ArrayNode(150...153)([], (150...151), (152...153)),
-     CallNode(155...168)(
-       CallNode(155...158)(
-         nil,
-         nil,
-         (155...158),
-         nil,
-         nil,
-         nil,
-         nil,
-         2,
-         "foo"
-       ),
-       nil,
-       (158...168),
-       (158...159),
-       ArgumentsNode(159...167)(
-         [CallNode(159...162)(
-            nil,
-            nil,
-            (159...162),
-            nil,
-            nil,
-            nil,
-            nil,
-            2,
-            "bar"
-          ),
-          CallNode(164...167)(
-            nil,
-            nil,
-            (164...167),
-            nil,
-            nil,
-            nil,
-            nil,
-            2,
-            "baz"
-          )]
-       ),
-       (167...168),
-       nil,
-       0,
-       "[]"
-     ),
-     CallNode(170...189)(
-       CallNode(170...173)(
-         nil,
-         nil,
-         (170...173),
-         nil,
-         nil,
-         nil,
-         nil,
-         2,
-         "foo"
-       ),
-       nil,
-       (173...183),
-       (173...174),
-       ArgumentsNode(174...189)(
-         [CallNode(174...177)(
-            nil,
-            nil,
-            (174...177),
-            nil,
-            nil,
-            nil,
-            nil,
-            2,
-            "bar"
-          ),
-          CallNode(179...182)(
-            nil,
-            nil,
-            (179...182),
-            nil,
-            nil,
-            nil,
-            nil,
-            2,
-            "baz"
-          ),
-          CallNode(186...189)(
-            nil,
-            nil,
-            (186...189),
-            nil,
-            nil,
-            nil,
-            nil,
-            2,
-            "qux"
-          )]
-       ),
-       (182...183),
-       nil,
-       0,
-       "[]="
-     ),
-     MultiWriteNode(191...212)(
-       [CallNode(191...197)(
-          CallNode(191...194)(
-            nil,
-            nil,
-            (191...194),
-            nil,
-            nil,
-            nil,
-            nil,
-            2,
-            "foo"
-          ),
-          nil,
-          (194...197),
-          (194...195),
-          ArgumentsNode(195...196)([IntegerNode(195...196)()]),
-          (196...197),
-          nil,
-          0,
-          "[]="
-        ),
-        CallNode(199...205)(
-          CallNode(199...202)(
-            nil,
-            nil,
-            (199...202),
-            nil,
-            nil,
-            nil,
-            nil,
-            2,
-            "bar"
-          ),
-          nil,
-          (202...205),
-          (202...203),
-          ArgumentsNode(203...204)([IntegerNode(203...204)()]),
-          (204...205),
-          nil,
-          0,
-          "[]="
-        )],
-       (206...207),
-       ArrayNode(208...212)(
-         [IntegerNode(208...209)(), IntegerNode(211...212)()],
-         nil,
-         nil
-       ),
-       nil,
-       nil
-     ),
-     CallNode(214...233)(
-       CallNode(214...217)(
-         nil,
-         nil,
-         (214...217),
-         nil,
-         nil,
-         nil,
-         nil,
-         2,
-         "foo"
-       ),
-       nil,
-       (217...233),
-       (217...218),
-       ArgumentsNode(218...232)(
-         [CallNode(218...232)(
-            CallNode(218...221)(
-              nil,
-              nil,
-              (218...221),
-              nil,
-              nil,
-              nil,
-              nil,
-              2,
-              "bar"
-            ),
-            nil,
-            (221...226),
-            (221...222),
-            ArgumentsNode(222...232)(
-              [CallNode(222...225)(
-                 nil,
-                 nil,
-                 (222...225),
-                 nil,
-                 nil,
-                 nil,
-                 nil,
-                 2,
-                 "baz"
-               ),
-               CallNode(229...232)(
-                 nil,
-                 nil,
-                 (229...232),
-                 nil,
-                 nil,
-                 nil,
-                 nil,
-                 2,
-                 "qux"
-               )]
-            ),
-            (225...226),
-            nil,
-            0,
-            "[]="
-          )]
-       ),
-       (232...233),
-       nil,
-       0,
-       "[]"
-     ),
-     CallNode(235...243)(
-       CallNode(235...238)(
-         nil,
-         nil,
-         (235...238),
-         nil,
-         nil,
-         nil,
-         nil,
-         2,
-         "foo"
-       ),
-       nil,
-       (238...243),
-       (238...239),
-       ArgumentsNode(239...242)(
-         [CallNode(239...242)(
-            nil,
-            nil,
-            (239...242),
-            nil,
-            nil,
-            nil,
-            nil,
-            2,
-            "bar"
-          )]
-       ),
-       (242...243),
-       nil,
-       0,
-       "[]"
-     ),
-     CallNode(245...259)(
-       CallNode(245...248)(
-         nil,
-         nil,
-         (245...248),
-         nil,
-         nil,
-         nil,
-         nil,
-         2,
-         "foo"
-       ),
-       nil,
-       (248...253),
-       (248...249),
-       ArgumentsNode(249...259)(
-         [CallNode(249...252)(
-            nil,
-            nil,
-            (249...252),
-            nil,
-            nil,
-            nil,
-            nil,
-            2,
-            "bar"
-          ),
-          CallNode(256...259)(
-            nil,
-            nil,
-            (256...259),
-            nil,
-            nil,
-            nil,
-            nil,
-            2,
-            "baz"
-          )]
-       ),
-       (252...253),
-       nil,
-       0,
-       "[]="
-     ),
-     ArrayNode(261...267)(
-       [KeywordHashNode(262...266)(
-          [AssocSplatNode(262...266)(
-             HashNode(264...266)((264...265), [], (265...266)),
-             (262...264)
-           )]
-        )],
-       (261...262),
-       (266...267)
-     ),
-     ArrayNode(269...275)(
-       [KeywordHashNode(270...274)(
-          [AssocSplatNode(270...274)(
-             CallNode(272...274)(
-               nil,
-               nil,
-               (272...274),
-               nil,
-               nil,
-               nil,
-               nil,
-               2,
-               "kw"
-             ),
-             (270...272)
-           )]
-        )],
-       (269...270),
-       (274...275)
-     ),
-     ArrayNode(277...286)(
-       [IntegerNode(278...279)(),
-        KeywordHashNode(281...285)(
-          [AssocSplatNode(281...285)(
-             CallNode(283...285)(
-               nil,
-               nil,
-               (283...285),
-               nil,
-               nil,
-               nil,
-               nil,
-               2,
-               "kw"
-             ),
-             (281...283)
-           )]
-        )],
-       (277...278),
-       (285...286)
-     ),
-     ArrayNode(288...309)(
-       [IntegerNode(289...290)(),
-        KeywordHashNode(292...308)(
-          [AssocSplatNode(292...296)(
-             CallNode(294...296)(
-               nil,
-               nil,
-               (294...296),
-               nil,
-               nil,
-               nil,
-               nil,
-               2,
-               "kw"
-             ),
-             (292...294)
-           ),
-           AssocSplatNode(298...302)(
-             HashNode(300...302)((300...301), [], (301...302)),
-             (298...300)
-           ),
-           AssocSplatNode(304...308)(
-             CallNode(306...308)(
-               nil,
-               nil,
-               (306...308),
-               nil,
-               nil,
-               nil,
-               nil,
-               2,
-               "kw"
-             ),
-             (304...306)
-           )]
-        )],
-       (288...289),
-       (308...309)
-     ),
-     ArrayNode(311...328)(
-       [KeywordHashNode(315...325)(
-          [AssocNode(315...325)(
-             CallNode(315...318)(
-               nil,
-               nil,
-               (315...318),
-               nil,
-               nil,
-               nil,
-               nil,
-               2,
-               "foo"
-             ),
-             CallNode(322...325)(
-               nil,
-               nil,
-               (322...325),
-               nil,
-               nil,
-               nil,
-               nil,
-               2,
-               "bar"
-             ),
-             (319...321)
-           )]
-        )],
-       (311...312),
-       (327...328)
-     ),
-     ArrayNode(331...348)(
-       [SymbolNode(334...337)(nil, (334...337), nil, "one"),
-        SymbolNode(338...341)(nil, (338...341), nil, "two"),
-        SymbolNode(342...347)(nil, (342...347), nil, "three")],
-       (331...334),
-       (347...348)
-     ),
-     ArrayNode(350...367)(
-       [StringNode(353...356)(nil, (353...356), nil, "one"),
-        StringNode(357...360)(nil, (357...360), nil, "two"),
-        StringNode(361...366)(nil, (361...366), nil, "three")],
-       (350...353),
-       (366...367)
-     ),
-     XStringNode(369...386)(
-       (369...372),
-       (372...385),
-       (385...386),
-       "one two three"
-     ),
-     ArrayNode(389...406)(
-       [SymbolNode(392...395)(nil, (392...395), nil, "one"),
-        SymbolNode(396...399)(nil, (396...399), nil, "two"),
-        SymbolNode(400...405)(nil, (400...405), nil, "three")],
-       (389...392),
-       (405...406)
-     ),
-     ArrayNode(408...425)(
-       [StringNode(411...414)(nil, (411...414), nil, "one"),
-        StringNode(415...418)(nil, (415...418), nil, "two"),
-        StringNode(419...424)(nil, (419...424), nil, "three")],
-       (408...411),
-       (424...425)
-     ),
-     XStringNode(427...444)(
-       (427...430),
-       (430...443),
-       (443...444),
-       "one two three"
-     ),
-     ArrayNode(447...464)(
-       [SymbolNode(450...453)(nil, (450...453), nil, "one"),
-        SymbolNode(454...457)(nil, (454...457), nil, "two"),
-        SymbolNode(458...463)(nil, (458...463), nil, "three")],
-       (447...450),
-       (463...464)
-     ),
-     ArrayNode(466...483)(
-       [StringNode(469...472)(nil, (469...472), nil, "one"),
-        StringNode(473...476)(nil, (473...476), nil, "two"),
-        StringNode(477...482)(nil, (477...482), nil, "three")],
-       (466...469),
-       (482...483)
-     ),
-     XStringNode(485...502)(
-       (485...488),
-       (488...501),
-       (501...502),
-       "one two three"
-     ),
-     ArrayNode(504...511)(
-       [StringNode(507...510)(nil, (507...510), nil, "\\C:")],
-       (504...507),
-       (510...511)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/begin_ensure.txt b/test/yarp/snapshots/begin_ensure.txt
deleted file mode 100644
index a842d8f07ffef6..00000000000000
--- a/test/yarp/snapshots/begin_ensure.txt
+++ /dev/null
@@ -1,164 +0,0 @@
-ProgramNode(0...211)(
-  [],
-  StatementsNode(0...211)(
-    [BeginNode(0...20)(
-       (0...5),
-       StatementsNode(6...7)(
-         [CallNode(6...7)(nil, nil, (6...7), nil, nil, nil, nil, 2, "a")]
-       ),
-       nil,
-       nil,
-       EnsureNode(8...20)(
-         (8...14),
-         StatementsNode(15...16)(
-           [CallNode(15...16)(nil, nil, (15...16), nil, nil, nil, nil, 2, "b")]
-         ),
-         (17...20)
-       ),
-       (17...20)
-     ),
-     BeginNode(22...46)(
-       (22...27),
-       StatementsNode(29...30)(
-         [CallNode(29...30)(nil, nil, (29...30), nil, nil, nil, nil, 2, "a")]
-       ),
-       nil,
-       nil,
-       EnsureNode(32...46)(
-         (32...38),
-         StatementsNode(40...41)(
-           [CallNode(40...41)(nil, nil, (40...41), nil, nil, nil, nil, 2, "b")]
-         ),
-         (43...46)
-       ),
-       (43...46)
-     ),
-     BeginNode(48...70)(
-       (48...53),
-       StatementsNode(54...55)(
-         [CallNode(54...55)(nil, nil, (54...55), nil, nil, nil, nil, 2, "a")]
-       ),
-       nil,
-       nil,
-       EnsureNode(57...70)(
-         (57...63),
-         StatementsNode(64...65)(
-           [CallNode(64...65)(nil, nil, (64...65), nil, nil, nil, nil, 2, "b")]
-         ),
-         (67...70)
-       ),
-       (67...70)
-     ),
-     BeginNode(72...94)(
-       (72...77),
-       StatementsNode(78...79)(
-         [CallNode(78...79)(nil, nil, (78...79), nil, nil, nil, nil, 2, "a")]
-       ),
-       nil,
-       nil,
-       EnsureNode(81...94)(
-         (81...87),
-         StatementsNode(88...89)(
-           [CallNode(88...89)(nil, nil, (88...89), nil, nil, nil, nil, 2, "b")]
-         ),
-         (91...94)
-       ),
-       (91...94)
-     ),
-     BeginNode(96...211)(
-       (96...101),
-       StatementsNode(102...207)(
-         [BeginNode(102...207)(
-            (102...107),
-            StatementsNode(107...203)(
-              [CallNode(107...203)(
-                 SymbolNode(107...109)((107...108), (108...109), nil, "s"),
-                 (109...110),
-                 (110...111),
-                 nil,
-                 ArgumentsNode(112...203)(
-                   [BeginNode(112...203)(
-                      (112...117),
-                      nil,
-                      nil,
-                      nil,
-                      EnsureNode(118...203)(
-                        (118...124),
-                        StatementsNode(125...199)(
-                          [CallNode(125...199)(
-                             ConstantReadNode(125...131)(:Module),
-                             (131...132),
-                             (132...135),
-                             nil,
-                             nil,
-                             nil,
-                             BlockNode(136...199)(
-                               [],
-                               nil,
-                               StatementsNode(141...195)(
-                                 [BeginNode(141...195)(
-                                    (141...146),
-                                    StatementsNode(151...156)(
-                                      [BreakNode(151...156)(nil, (151...156))]
-                                    ),
-                                    nil,
-                                    nil,
-                                    EnsureNode(161...195)(
-                                      (161...167),
-                                      StatementsNode(168...189)(
-                                        [CallNode(168...189)(
-                                           ConstantReadNode(168...174)(
-                                             :Module
-                                           ),
-                                           (174...175),
-                                           (175...178),
-                                           nil,
-                                           nil,
-                                           nil,
-                                           BlockNode(179...189)(
-                                             [],
-                                             nil,
-                                             nil,
-                                             (179...181),
-                                             (186...189)
-                                           ),
-                                           0,
-                                           "new"
-                                         )]
-                                      ),
-                                      (192...195)
-                                    ),
-                                    (192...195)
-                                  )]
-                               ),
-                               (136...138),
-                               (196...199)
-                             ),
-                             0,
-                             "new"
-                           )]
-                        ),
-                        (200...203)
-                      ),
-                      (200...203)
-                    )]
-                 ),
-                 nil,
-                 nil,
-                 0,
-                 "l"
-               )]
-            ),
-            nil,
-            nil,
-            nil,
-            (204...207)
-          )]
-       ),
-       nil,
-       nil,
-       nil,
-       (208...211)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/begin_rescue.txt b/test/yarp/snapshots/begin_rescue.txt
deleted file mode 100644
index ac0592054a0c9d..00000000000000
--- a/test/yarp/snapshots/begin_rescue.txt
+++ /dev/null
@@ -1,598 +0,0 @@
-ProgramNode(0...578)(
-  [:ex],
-  StatementsNode(0...578)(
-    [BeginNode(0...33)(
-       (0...5),
-       StatementsNode(7...8)(
-         [CallNode(7...8)(nil, nil, (7...8), nil, nil, nil, nil, 2, "a")]
-       ),
-       RescueNode(10...19)(
-         (10...16),
-         [],
-         nil,
-         nil,
-         StatementsNode(18...19)(
-           [CallNode(18...19)(nil, nil, (18...19), nil, nil, nil, nil, 2, "b")]
-         ),
-         nil
-       ),
-       ElseNode(21...33)(
-         (21...25),
-         StatementsNode(27...28)(
-           [CallNode(27...28)(nil, nil, (27...28), nil, nil, nil, nil, 2, "c")]
-         ),
-         (30...33)
-       ),
-       nil,
-       (30...33)
-     ),
-     BeginNode(35...79)(
-       (35...40),
-       StatementsNode(42...43)(
-         [CallNode(42...43)(nil, nil, (42...43), nil, nil, nil, nil, 2, "a")]
-       ),
-       RescueNode(45...54)(
-         (45...51),
-         [],
-         nil,
-         nil,
-         StatementsNode(53...54)(
-           [CallNode(53...54)(nil, nil, (53...54), nil, nil, nil, nil, 2, "b")]
-         ),
-         nil
-       ),
-       ElseNode(56...71)(
-         (56...60),
-         StatementsNode(62...63)(
-           [CallNode(62...63)(nil, nil, (62...63), nil, nil, nil, nil, 2, "c")]
-         ),
-         (65...71)
-       ),
-       EnsureNode(65...79)(
-         (65...71),
-         StatementsNode(73...74)(
-           [CallNode(73...74)(nil, nil, (73...74), nil, nil, nil, nil, 2, "d")]
-         ),
-         (76...79)
-       ),
-       (76...79)
-     ),
-     BeginNode(81...92)(
-       (81...86),
-       StatementsNode(87...88)(
-         [CallNode(87...88)(nil, nil, (87...88), nil, nil, nil, nil, 2, "a")]
-       ),
-       nil,
-       nil,
-       nil,
-       (89...92)
-     ),
-     BeginNode(94...107)(
-       (94...99),
-       StatementsNode(101...102)(
-         [CallNode(101...102)(
-            nil,
-            nil,
-            (101...102),
-            nil,
-            nil,
-            nil,
-            nil,
-            2,
-            "a"
-          )]
-       ),
-       nil,
-       nil,
-       nil,
-       (104...107)
-     ),
-     BeginNode(109...121)(
-       (109...114),
-       StatementsNode(115...116)(
-         [CallNode(115...116)(
-            nil,
-            nil,
-            (115...116),
-            nil,
-            nil,
-            nil,
-            nil,
-            2,
-            "a"
-          )]
-       ),
-       nil,
-       nil,
-       nil,
-       (118...121)
-     ),
-     BeginNode(123...135)(
-       (123...128),
-       StatementsNode(129...130)(
-         [CallNode(129...130)(
-            nil,
-            nil,
-            (129...130),
-            nil,
-            nil,
-            nil,
-            nil,
-            2,
-            "a"
-          )]
-       ),
-       nil,
-       nil,
-       nil,
-       (132...135)
-     ),
-     BeginNode(137...175)(
-       (137...142),
-       StatementsNode(143...144)(
-         [CallNode(143...144)(
-            nil,
-            nil,
-            (143...144),
-            nil,
-            nil,
-            nil,
-            nil,
-            2,
-            "a"
-          )]
-       ),
-       RescueNode(145...171)(
-         (145...151),
-         [],
-         nil,
-         nil,
-         StatementsNode(152...153)(
-           [CallNode(152...153)(
-              nil,
-              nil,
-              (152...153),
-              nil,
-              nil,
-              nil,
-              nil,
-              2,
-              "b"
-            )]
-         ),
-         RescueNode(154...171)(
-           (154...160),
-           [],
-           nil,
-           nil,
-           StatementsNode(161...162)(
-             [CallNode(161...162)(
-                nil,
-                nil,
-                (161...162),
-                nil,
-                nil,
-                nil,
-                nil,
-                2,
-                "c"
-              )]
-           ),
-           RescueNode(163...171)(
-             (163...169),
-             [],
-             nil,
-             nil,
-             StatementsNode(170...171)(
-               [CallNode(170...171)(
-                  nil,
-                  nil,
-                  (170...171),
-                  nil,
-                  nil,
-                  nil,
-                  nil,
-                  2,
-                  "d"
-                )]
-             ),
-             nil
-           )
-         )
-       ),
-       nil,
-       nil,
-       (172...175)
-     ),
-     BeginNode(177...269)(
-       (177...182),
-       StatementsNode(185...186)(
-         [CallNode(185...186)(
-            nil,
-            nil,
-            (185...186),
-            nil,
-            nil,
-            nil,
-            nil,
-            2,
-            "a"
-          )]
-       ),
-       RescueNode(187...265)(
-         (187...193),
-         [ConstantReadNode(194...203)(:Exception)],
-         (204...206),
-         LocalVariableTargetNode(207...209)(:ex, 0),
-         StatementsNode(212...213)(
-           [CallNode(212...213)(
-              nil,
-              nil,
-              (212...213),
-              nil,
-              nil,
-              nil,
-              nil,
-              2,
-              "b"
-            )]
-         ),
-         RescueNode(214...265)(
-           (214...220),
-           [ConstantReadNode(221...237)(:AnotherException),
-            ConstantReadNode(239...255)(:OneMoreException)],
-           (256...258),
-           LocalVariableTargetNode(259...261)(:ex, 0),
-           StatementsNode(264...265)(
-             [CallNode(264...265)(
-                nil,
-                nil,
-                (264...265),
-                nil,
-                nil,
-                nil,
-                nil,
-                2,
-                "c"
-              )]
-           ),
-           nil
-         )
-       ),
-       nil,
-       nil,
-       (266...269)
-     ),
-     BeginNode(271...322)(
-       (271...276),
-       StatementsNode(279...280)(
-         [CallNode(279...280)(
-            nil,
-            nil,
-            (279...280),
-            nil,
-            nil,
-            nil,
-            nil,
-            2,
-            "a"
-          )]
-       ),
-       RescueNode(281...307)(
-         (281...287),
-         [ConstantReadNode(288...297)(:Exception)],
-         (298...300),
-         LocalVariableTargetNode(301...303)(:ex, 0),
-         StatementsNode(306...307)(
-           [CallNode(306...307)(
-              nil,
-              nil,
-              (306...307),
-              nil,
-              nil,
-              nil,
-              nil,
-              2,
-              "b"
-            )]
-         ),
-         nil
-       ),
-       nil,
-       EnsureNode(308...322)(
-         (308...314),
-         StatementsNode(317...318)(
-           [CallNode(317...318)(
-              nil,
-              nil,
-              (317...318),
-              nil,
-              nil,
-              nil,
-              nil,
-              2,
-              "b"
-            )]
-         ),
-         (319...322)
-       ),
-       (319...322)
-     ),
-     StringNode(324...330)((324...326), (326...329), (329...330), "abc"),
-     BeginNode(332...352)(
-       (332...337),
-       StatementsNode(338...339)(
-         [CallNode(338...339)(
-            nil,
-            nil,
-            (338...339),
-            nil,
-            nil,
-            nil,
-            nil,
-            2,
-            "a"
-          )]
-       ),
-       RescueNode(340...348)(
-         (340...346),
-         [],
-         nil,
-         nil,
-         StatementsNode(347...348)(
-           [CallNode(347...348)(
-              nil,
-              nil,
-              (347...348),
-              nil,
-              nil,
-              nil,
-              nil,
-              2,
-              "b"
-            )]
-         ),
-         nil
-       ),
-       nil,
-       nil,
-       (349...352)
-     ),
-     BeginNode(354...374)(
-       (354...359),
-       StatementsNode(360...361)(
-         [CallNode(360...361)(
-            nil,
-            nil,
-            (360...361),
-            nil,
-            nil,
-            nil,
-            nil,
-            2,
-            "a"
-          )]
-       ),
-       RescueNode(362...370)(
-         (362...368),
-         [],
-         nil,
-         nil,
-         StatementsNode(369...370)(
-           [CallNode(369...370)(
-              nil,
-              nil,
-              (369...370),
-              nil,
-              nil,
-              nil,
-              nil,
-              2,
-              "b"
-            )]
-         ),
-         nil
-       ),
-       nil,
-       nil,
-       (371...374)
-     ),
-     BeginNode(376...396)(
-       (376...381),
-       StatementsNode(382...383)(
-         [CallNode(382...383)(
-            nil,
-            nil,
-            (382...383),
-            nil,
-            nil,
-            nil,
-            nil,
-            2,
-            "a"
-          )]
-       ),
-       RescueNode(384...392)(
-         (384...390),
-         [],
-         nil,
-         nil,
-         StatementsNode(391...392)(
-           [CallNode(391...392)(
-              nil,
-              nil,
-              (391...392),
-              nil,
-              nil,
-              nil,
-              nil,
-              2,
-              "b"
-            )]
-         ),
-         nil
-       ),
-       nil,
-       nil,
-       (393...396)
-     ),
-     BeginNode(398...428)(
-       (398...403),
-       StatementsNode(404...405)(
-         [CallNode(404...405)(
-            nil,
-            nil,
-            (404...405),
-            nil,
-            nil,
-            nil,
-            nil,
-            2,
-            "a"
-          )]
-       ),
-       RescueNode(406...424)(
-         (406...412),
-         [ConstantReadNode(413...422)(:Exception)],
-         nil,
-         nil,
-         StatementsNode(423...424)(
-           [CallNode(423...424)(
-              nil,
-              nil,
-              (423...424),
-              nil,
-              nil,
-              nil,
-              nil,
-              2,
-              "b"
-            )]
-         ),
-         nil
-       ),
-       nil,
-       nil,
-       (425...428)
-     ),
-     BeginNode(430...477)(
-       (430...435),
-       StatementsNode(436...437)(
-         [CallNode(436...437)(
-            nil,
-            nil,
-            (436...437),
-            nil,
-            nil,
-            nil,
-            nil,
-            2,
-            "a"
-          )]
-       ),
-       RescueNode(438...473)(
-         (438...444),
-         [ConstantReadNode(445...454)(:Exception),
-          ConstantReadNode(456...471)(:CustomException)],
-         nil,
-         nil,
-         StatementsNode(472...473)(
-           [CallNode(472...473)(
-              nil,
-              nil,
-              (472...473),
-              nil,
-              nil,
-              nil,
-              nil,
-              2,
-              "b"
-            )]
-         ),
-         nil
-       ),
-       nil,
-       nil,
-       (474...477)
-     ),
-     BeginNode(479...536)(
-       (479...484),
-       StatementsNode(487...488)(
-         [CallNode(487...488)(
-            nil,
-            nil,
-            (487...488),
-            nil,
-            nil,
-            nil,
-            nil,
-            2,
-            "a"
-          )]
-       ),
-       RescueNode(489...532)(
-         (489...495),
-         [ConstantReadNode(496...505)(:Exception),
-          ConstantReadNode(507...522)(:CustomException)],
-         (523...525),
-         LocalVariableTargetNode(526...528)(:ex, 0),
-         StatementsNode(531...532)(
-           [CallNode(531...532)(
-              nil,
-              nil,
-              (531...532),
-              nil,
-              nil,
-              nil,
-              nil,
-              2,
-              "b"
-            )]
-         ),
-         nil
-       ),
-       nil,
-       nil,
-       (533...536)
-     ),
-     BeginNode(538...578)(
-       (538...543),
-       StatementsNode(546...547)(
-         [CallNode(546...547)(
-            nil,
-            nil,
-            (546...547),
-            nil,
-            nil,
-            nil,
-            nil,
-            2,
-            "a"
-          )]
-       ),
-       RescueNode(548...574)(
-         (548...554),
-         [ConstantReadNode(555...564)(:Exception)],
-         (565...567),
-         LocalVariableTargetNode(568...570)(:ex, 0),
-         StatementsNode(573...574)(
-           [CallNode(573...574)(
-              nil,
-              nil,
-              (573...574),
-              nil,
-              nil,
-              nil,
-              nil,
-              2,
-              "b"
-            )]
-         ),
-         nil
-       ),
-       nil,
-       nil,
-       (575...578)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/blocks.txt b/test/yarp/snapshots/blocks.txt
deleted file mode 100644
index 4a2c3f7585eeff..00000000000000
--- a/test/yarp/snapshots/blocks.txt
+++ /dev/null
@@ -1,622 +0,0 @@
-ProgramNode(0...402)(
-  [:fork],
-  StatementsNode(0...402)(
-    [CallNode(0...16)(
-       CallNode(0...3)(nil, nil, (0...3), nil, nil, nil, nil, 2, "foo"),
-       nil,
-       (3...8),
-       (3...4),
-       ArgumentsNode(4...7)(
-         [CallNode(4...7)(nil, nil, (4...7), nil, nil, nil, nil, 2, "bar")]
-       ),
-       (7...8),
-       BlockNode(9...16)(
-         [],
-         nil,
-         StatementsNode(11...14)(
-           [CallNode(11...14)(
-              nil,
-              nil,
-              (11...14),
-              nil,
-              nil,
-              nil,
-              nil,
-              2,
-              "baz"
-            )]
-         ),
-         (9...10),
-         (15...16)
-       ),
-       0,
-       "[]"
-     ),
-     CallNode(18...37)(
-       CallNode(18...21)(nil, nil, (18...21), nil, nil, nil, nil, 2, "foo"),
-       nil,
-       (21...26),
-       (21...22),
-       ArgumentsNode(22...25)(
-         [CallNode(22...25)(nil, nil, (22...25), nil, nil, nil, nil, 2, "bar")]
-       ),
-       (25...26),
-       BlockNode(27...37)(
-         [],
-         nil,
-         StatementsNode(30...33)(
-           [CallNode(30...33)(
-              nil,
-              nil,
-              (30...33),
-              nil,
-              nil,
-              nil,
-              nil,
-              2,
-              "baz"
-            )]
-         ),
-         (27...29),
-         (34...37)
-       ),
-       0,
-       "[]"
-     ),
-     CallNode(39...74)(
-       CallNode(39...40)(nil, nil, (39...40), nil, nil, nil, nil, 2, "x"),
-       (40...41),
-       (41...47),
-       (47...48),
-       ArgumentsNode(48...49)([IntegerNode(48...49)()]),
-       (49...50),
-       BlockNode(51...74)(
-         [:x, :memo],
-         BlockParametersNode(53...62)(
-           ParametersNode(54...61)(
-             [RequiredParameterNode(54...55)(:x),
-              RequiredParameterNode(57...61)(:memo)],
-             [],
-             [],
-             nil,
-             [],
-             nil,
-             nil
-           ),
-           [],
-           (53...54),
-           (61...62)
-         ),
-         StatementsNode(63...72)(
-           [LocalVariableOperatorWriteNode(63...72)(
-              (63...67),
-              (68...70),
-              LocalVariableReadNode(71...72)(:x, 0),
-              :memo,
-              :+,
-              0
-            )]
-         ),
-         (51...52),
-         (73...74)
-       ),
-       0,
-       "reduce"
-     ),
-     CallNode(76...86)(
-       nil,
-       nil,
-       (76...79),
-       nil,
-       nil,
-       nil,
-       BlockNode(80...86)([], nil, nil, (80...82), (83...86)),
-       0,
-       "foo"
-     ),
-     CallNode(88...109)(
-       nil,
-       nil,
-       (88...91),
-       nil,
-       ArgumentsNode(92...109)(
-         [CallNode(92...95)(nil, nil, (92...95), nil, nil, nil, nil, 2, "bar"),
-          ParenthesesNode(97...109)(
-            StatementsNode(98...108)(
-              [CallNode(98...108)(
-                 nil,
-                 nil,
-                 (98...101),
-                 nil,
-                 nil,
-                 nil,
-                 BlockNode(102...108)([], nil, nil, (102...104), (105...108)),
-                 0,
-                 "baz"
-               )]
-            ),
-            (97...98),
-            (108...109)
-          )]
-       ),
-       nil,
-       nil,
-       0,
-       "foo"
-     ),
-     CallNode(111...125)(
-       nil,
-       nil,
-       (111...114),
-       nil,
-       ArgumentsNode(115...118)(
-         [CallNode(115...118)(
-            nil,
-            nil,
-            (115...118),
-            nil,
-            nil,
-            nil,
-            nil,
-            2,
-            "bar"
-          )]
-       ),
-       nil,
-       BlockNode(119...125)([], nil, nil, (119...121), (122...125)),
-       0,
-       "foo"
-     ),
-     CallNode(127...145)(
-       nil,
-       nil,
-       (127...130),
-       nil,
-       ArgumentsNode(131...138)(
-         [CallNode(131...138)(
-            nil,
-            nil,
-            (131...134),
-            nil,
-            ArgumentsNode(135...138)(
-              [CallNode(135...138)(
-                 nil,
-                 nil,
-                 (135...138),
-                 nil,
-                 nil,
-                 nil,
-                 nil,
-                 2,
-                 "baz"
-               )]
-            ),
-            nil,
-            nil,
-            0,
-            "bar"
-          )]
-       ),
-       nil,
-       BlockNode(139...145)([], nil, nil, (139...141), (142...145)),
-       0,
-       "foo"
-     ),
-     CallNode(147...168)(
-       nil,
-       nil,
-       (147...150),
-       nil,
-       nil,
-       nil,
-       BlockNode(151...168)(
-         [:a],
-         BlockParametersNode(154...164)(
-           ParametersNode(155...163)(
-             [],
-             [OptionalParameterNode(155...163)(
-                :a,
-                (155...156),
-                (157...158),
-                CallNode(159...163)(
-                  CallNode(159...160)(
-                    nil,
-                    nil,
-                    (159...160),
-                    nil,
-                    nil,
-                    nil,
-                    nil,
-                    2,
-                    "b"
-                  ),
-                  nil,
-                  (160...163),
-                  (160...161),
-                  ArgumentsNode(161...162)([IntegerNode(161...162)()]),
-                  (162...163),
-                  nil,
-                  0,
-                  "[]"
-                )
-              )],
-             [],
-             nil,
-             [],
-             nil,
-             nil
-           ),
-           [],
-           (154...155),
-           (163...164)
-         ),
-         nil,
-         (151...153),
-         (165...168)
-       ),
-       0,
-       "foo"
-     ),
-     CallNode(170...187)(
-       nil,
-       nil,
-       (170...173),
-       nil,
-       nil,
-       nil,
-       BlockNode(174...187)(
-         [],
-         nil,
-         BeginNode(177...187)(
-           nil,
-           nil,
-           RescueNode(177...183)((177...183), [], nil, nil, nil, nil),
-           nil,
-           nil,
-           (184...187)
-         ),
-         (174...176),
-         (184...187)
-       ),
-       0,
-       "foo"
-     ),
-     CallNode(189...233)(
-       nil,
-       nil,
-       (189...192),
-       nil,
-       nil,
-       nil,
-       BlockNode(193...233)(
-         [],
-         nil,
-         StatementsNode(198...229)(
-           [CallNode(198...229)(
-              nil,
-              nil,
-              (198...201),
-              nil,
-              nil,
-              nil,
-              BlockNode(202...229)(
-                [],
-                nil,
-                StatementsNode(209...223)(
-                  [CallNode(209...223)(
-                     nil,
-                     nil,
-                     (209...212),
-                     nil,
-                     nil,
-                     nil,
-                     BlockNode(213...223)(
-                       [],
-                       nil,
-                       nil,
-                       (213...215),
-                       (220...223)
-                     ),
-                     0,
-                     "baz"
-                   )]
-                ),
-                (202...204),
-                (226...229)
-              ),
-              0,
-              "bar"
-            )]
-         ),
-         (193...195),
-         (230...233)
-       ),
-       0,
-       "foo"
-     ),
-     CallNode(235...251)(
-       CallNode(235...238)(
-         nil,
-         nil,
-         (235...238),
-         nil,
-         nil,
-         nil,
-         nil,
-         2,
-         "foo"
-       ),
-       nil,
-       (238...243),
-       (238...239),
-       ArgumentsNode(239...242)(
-         [CallNode(239...242)(
-            nil,
-            nil,
-            (239...242),
-            nil,
-            nil,
-            nil,
-            nil,
-            2,
-            "bar"
-          )]
-       ),
-       (242...243),
-       BlockNode(244...251)(
-         [],
-         nil,
-         StatementsNode(246...249)(
-           [CallNode(246...249)(
-              nil,
-              nil,
-              (246...249),
-              nil,
-              nil,
-              nil,
-              nil,
-              2,
-              "baz"
-            )]
-         ),
-         (244...245),
-         (250...251)
-       ),
-       0,
-       "[]"
-     ),
-     CallNode(253...277)(
-       nil,
-       nil,
-       (253...256),
-       nil,
-       nil,
-       nil,
-       BlockNode(257...277)(
-         [:x, :y, :z],
-         BlockParametersNode(259...273)(
-           ParametersNode(260...272)(
-             [RequiredParameterNode(260...261)(:x)],
-             [OptionalParameterNode(263...268)(
-                :y,
-                (263...264),
-                (265...266),
-                IntegerNode(267...268)()
-              )],
-             [],
-             nil,
-             [KeywordParameterNode(270...272)((270...272), nil)],
-             nil,
-             nil
-           ),
-           [],
-           (259...260),
-           (272...273)
-         ),
-         StatementsNode(274...275)([LocalVariableReadNode(274...275)(:x, 0)]),
-         (257...258),
-         (276...277)
-       ),
-       0,
-       "foo"
-     ),
-     CallNode(279...290)(
-       nil,
-       nil,
-       (279...282),
-       nil,
-       nil,
-       nil,
-       BlockNode(283...290)(
-         [:x],
-         BlockParametersNode(285...288)(
-           ParametersNode(286...287)(
-             [RequiredParameterNode(286...287)(:x)],
-             [],
-             [],
-             nil,
-             [],
-             nil,
-             nil
-           ),
-           [],
-           (285...286),
-           (287...288)
-         ),
-         nil,
-         (283...284),
-         (289...290)
-       ),
-       0,
-       "foo"
-     ),
-     LocalVariableWriteNode(292...300)(
-       :fork,
-       0,
-       (292...296),
-       IntegerNode(299...300)(),
-       (297...298)
-     ),
-     CallNode(301...316)(
-       nil,
-       nil,
-       (301...305),
-       nil,
-       nil,
-       nil,
-       BlockNode(306...316)(
-         [:a],
-         BlockParametersNode(309...312)(
-           ParametersNode(310...311)(
-             [RequiredParameterNode(310...311)(:a)],
-             [],
-             [],
-             nil,
-             [],
-             nil,
-             nil
-           ),
-           [],
-           (309...310),
-           (311...312)
-         ),
-         nil,
-         (306...308),
-         (313...316)
-       ),
-       0,
-       "fork"
-     ),
-     CallNode(318...330)(
-       nil,
-       nil,
-       (318...322),
-       nil,
-       nil,
-       nil,
-       BlockNode(323...330)(
-         [:a],
-         BlockParametersNode(325...328)(
-           ParametersNode(326...327)(
-             [RequiredParameterNode(326...327)(:a)],
-             [],
-             [],
-             nil,
-             [],
-             nil,
-             nil
-           ),
-           [],
-           (325...326),
-           (327...328)
-         ),
-         nil,
-         (323...324),
-         (329...330)
-       ),
-       0,
-       "fork"
-     ),
-     CallNode(332...340)(
-       nil,
-       nil,
-       (332...333),
-       nil,
-       nil,
-       nil,
-       BlockNode(334...340)([], nil, nil, (334...336), (337...340)),
-       0,
-       "C"
-     ),
-     CallNode(342...346)(
-       nil,
-       nil,
-       (342...343),
-       nil,
-       nil,
-       nil,
-       BlockNode(344...346)([], nil, nil, (344...345), (345...346)),
-       0,
-       "C"
-     ),
-     CallNode(348...383)(
-       nil,
-       nil,
-       (348...351),
-       nil,
-       ArgumentsNode(352...383)(
-         [CallNode(352...383)(
-            nil,
-            nil,
-            (352...358),
-            nil,
-            nil,
-            nil,
-            BlockNode(359...383)(
-              [:a, :b],
-              BlockParametersNode(361...381)(
-                ParametersNode(365...377)(
-                  [],
-                  [],
-                  [],
-                  nil,
-                  [KeywordParameterNode(365...369)(
-                     (365...367),
-                     IntegerNode(368...369)()
-                   ),
-                   KeywordParameterNode(373...377)(
-                     (373...375),
-                     IntegerNode(376...377)()
-                   )],
-                  nil,
-                  nil
-                ),
-                [],
-                (361...362),
-                (380...381)
-              ),
-              nil,
-              (359...360),
-              (382...383)
-            ),
-            0,
-            "lambda"
-          )]
-       ),
-       nil,
-       nil,
-       0,
-       "foo"
-     ),
-     CallNode(385...402)(
-       nil,
-       nil,
-       (385...388),
-       nil,
-       nil,
-       nil,
-       BlockNode(389...402)(
-         [:bar],
-         BlockParametersNode(392...398)(
-           ParametersNode(393...397)(
-             [RequiredParameterNode(393...396)(:bar)],
-             [],
-             [],
-             RestParameterNode(396...397)((396...397), nil),
-             [],
-             nil,
-             nil
-           ),
-           [],
-           (392...393),
-           (397...398)
-         ),
-         nil,
-         (389...391),
-         (399...402)
-       ),
-       0,
-       "foo"
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/boolean_operators.txt b/test/yarp/snapshots/boolean_operators.txt
deleted file mode 100644
index f1fc5cd4b29472..00000000000000
--- a/test/yarp/snapshots/boolean_operators.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-ProgramNode(0...24)(
-  [:a],
-  StatementsNode(0...24)(
-    [LocalVariableAndWriteNode(0...7)(
-       (0...1),
-       (2...5),
-       CallNode(6...7)(nil, nil, (6...7), nil, nil, nil, nil, 2, "b"),
-       :a,
-       0
-     ),
-     LocalVariableOperatorWriteNode(9...15)(
-       (9...10),
-       (11...13),
-       CallNode(14...15)(nil, nil, (14...15), nil, nil, nil, nil, 2, "b"),
-       :a,
-       :+,
-       0
-     ),
-     LocalVariableOrWriteNode(17...24)(
-       (17...18),
-       (19...22),
-       CallNode(23...24)(nil, nil, (23...24), nil, nil, nil, nil, 2, "b"),
-       :a,
-       0
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/booleans.txt b/test/yarp/snapshots/booleans.txt
deleted file mode 100644
index f4e609652c3c57..00000000000000
--- a/test/yarp/snapshots/booleans.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-ProgramNode(0...11)(
-  [],
-  StatementsNode(0...11)([FalseNode(0...5)(), TrueNode(7...11)()])
-)
diff --git a/test/yarp/snapshots/break.txt b/test/yarp/snapshots/break.txt
deleted file mode 100644
index b8ae8ffe815edb..00000000000000
--- a/test/yarp/snapshots/break.txt
+++ /dev/null
@@ -1,158 +0,0 @@
-ProgramNode(0...168)(
-  [],
-  StatementsNode(0...168)(
-    [BreakNode(0...5)(nil, (0...5)),
-     BreakNode(7...26)(
-       ArgumentsNode(13...26)(
-         [ParenthesesNode(13...16)(
-            StatementsNode(14...15)([IntegerNode(14...15)()]),
-            (13...14),
-            (15...16)
-          ),
-          ParenthesesNode(18...21)(
-            StatementsNode(19...20)([IntegerNode(19...20)()]),
-            (18...19),
-            (20...21)
-          ),
-          ParenthesesNode(23...26)(
-            StatementsNode(24...25)([IntegerNode(24...25)()]),
-            (23...24),
-            (25...26)
-          )]
-       ),
-       (7...12)
-     ),
-     BreakNode(28...35)(
-       ArgumentsNode(34...35)([IntegerNode(34...35)()]),
-       (28...33)
-     ),
-     BreakNode(37...50)(
-       ArgumentsNode(43...50)(
-         [IntegerNode(43...44)(),
-          IntegerNode(46...47)(),
-          IntegerNode(49...50)()]
-       ),
-       (37...42)
-     ),
-     BreakNode(52...65)(
-       ArgumentsNode(58...65)(
-         [IntegerNode(58...59)(),
-          IntegerNode(61...62)(),
-          IntegerNode(64...65)()]
-       ),
-       (52...57)
-     ),
-     BreakNode(67...82)(
-       ArgumentsNode(73...82)(
-         [ArrayNode(73...82)(
-            [IntegerNode(74...75)(),
-             IntegerNode(77...78)(),
-             IntegerNode(80...81)()],
-            (73...74),
-            (81...82)
-          )]
-       ),
-       (67...72)
-     ),
-     BreakNode(84...100)(
-       ArgumentsNode(89...100)(
-         [ParenthesesNode(89...100)(
-            StatementsNode(93...98)(
-              [IntegerNode(93...94)(), IntegerNode(97...98)()]
-            ),
-            (89...90),
-            (99...100)
-          )]
-       ),
-       (84...89)
-     ),
-     BreakNode(102...109)(
-       ArgumentsNode(107...109)(
-         [ParenthesesNode(107...109)(nil, (107...108), (108...109))]
-       ),
-       (102...107)
-     ),
-     BreakNode(111...119)(
-       ArgumentsNode(116...119)(
-         [ParenthesesNode(116...119)(
-            StatementsNode(117...118)([IntegerNode(117...118)()]),
-            (116...117),
-            (118...119)
-          )]
-       ),
-       (111...116)
-     ),
-     CallNode(121...143)(
-       CallNode(121...137)(
-         nil,
-         nil,
-         (121...124),
-         nil,
-         nil,
-         nil,
-         BlockNode(125...137)(
-           [],
-           nil,
-           StatementsNode(127...135)(
-             [BreakNode(127...135)(
-                ArgumentsNode(133...135)([IntegerNode(133...135)()]),
-                (127...132)
-              )]
-           ),
-           (125...126),
-           (136...137)
-         ),
-         0,
-         "foo"
-       ),
-       nil,
-       (138...140),
-       nil,
-       ArgumentsNode(141...143)([IntegerNode(141...143)()]),
-       nil,
-       nil,
-       0,
-       "=="
-     ),
-     CallNode(145...168)(
-       CallNode(145...162)(
-         nil,
-         nil,
-         (145...148),
-         nil,
-         nil,
-         nil,
-         BlockNode(149...162)(
-           [:a],
-           BlockParametersNode(151...154)(
-             ParametersNode(152...153)(
-               [RequiredParameterNode(152...153)(:a)],
-               [],
-               [],
-               nil,
-               [],
-               nil,
-               nil
-             ),
-             [],
-             (151...152),
-             (153...154)
-           ),
-           StatementsNode(155...160)([BreakNode(155...160)(nil, (155...160))]),
-           (149...150),
-           (161...162)
-         ),
-         0,
-         "foo"
-       ),
-       nil,
-       (163...165),
-       nil,
-       ArgumentsNode(166...168)([IntegerNode(166...168)()]),
-       nil,
-       nil,
-       0,
-       "=="
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/case.txt b/test/yarp/snapshots/case.txt
deleted file mode 100644
index 346b466a5e2d37..00000000000000
--- a/test/yarp/snapshots/case.txt
+++ /dev/null
@@ -1,208 +0,0 @@
-ProgramNode(0...272)(
-  [],
-  StatementsNode(0...272)(
-    [CaseNode(0...21)(
-       SymbolNode(5...8)((5...6), (6...8), nil, "hi"),
-       [WhenNode(9...17)(
-          (9...13),
-          [SymbolNode(14...17)((14...15), (15...17), nil, "hi")],
-          nil
-        )],
-       nil,
-       (0...4),
-       (18...21)
-     ),
-     CaseNode(23...81)(
-       TrueNode(28...32)(),
-       [WhenNode(34...53)(
-          (34...38),
-          [TrueNode(39...43)()],
-          StatementsNode(45...53)(
-            [CallNode(45...53)(
-               nil,
-               nil,
-               (45...49),
-               nil,
-               ArgumentsNode(50...53)(
-                 [SymbolNode(50...53)((50...51), (51...53), nil, "hi")]
-               ),
-               nil,
-               nil,
-               0,
-               "puts"
-             )]
-          )
-        ),
-        WhenNode(55...76)(
-          (55...59),
-          [FalseNode(60...65)()],
-          StatementsNode(67...76)(
-            [CallNode(67...76)(
-               nil,
-               nil,
-               (67...71),
-               nil,
-               ArgumentsNode(72...76)(
-                 [SymbolNode(72...76)((72...73), (73...76), nil, "bye")]
-               ),
-               nil,
-               nil,
-               0,
-               "puts"
-             )]
-          )
-        )],
-       nil,
-       (23...27),
-       (78...81)
-     ),
-     CaseNode(83...103)(
-       nil,
-       [WhenNode(89...98)(
-          (89...93),
-          [SplatNode(94...98)(
-             (94...95),
-             CallNode(95...98)(
-               nil,
-               nil,
-               (95...98),
-               nil,
-               nil,
-               nil,
-               nil,
-               2,
-               "foo"
-             )
-           )],
-          nil
-        )],
-       nil,
-       (83...87),
-       (100...103)
-     ),
-     CaseNode(105...134)(
-       SymbolNode(110...113)((110...111), (111...113), nil, "hi"),
-       [WhenNode(114...122)(
-          (114...118),
-          [SymbolNode(119...122)((119...120), (120...122), nil, "hi")],
-          nil
-        )],
-       ElseNode(123...134)(
-         (123...127),
-         StatementsNode(128...130)(
-           [SymbolNode(128...130)((128...129), (129...130), nil, "b")]
-         ),
-         (131...134)
-       ),
-       (105...109),
-       (131...134)
-     ),
-     CaseNode(136...172)(
-       CallNode(141...145)(
-         nil,
-         nil,
-         (141...145),
-         nil,
-         nil,
-         nil,
-         nil,
-         2,
-         "this"
-       ),
-       [WhenNode(147...167)(
-          (147...151),
-          [ConstantReadNode(152...158)(:FooBar),
-           ConstantReadNode(160...167)(:BazBonk)],
-          nil
-        )],
-       nil,
-       (136...140),
-       (169...172)
-     ),
-     CaseNode(174...198)(
-       nil,
-       [WhenNode(179...194)(
-          (179...183),
-          [CallNode(184...194)(
-             CallNode(184...187)(
-               nil,
-               nil,
-               (184...187),
-               nil,
-               nil,
-               nil,
-               nil,
-               2,
-               "foo"
-             ),
-             nil,
-             (188...190),
-             nil,
-             ArgumentsNode(191...194)(
-               [CallNode(191...194)(
-                  nil,
-                  nil,
-                  (191...194),
-                  nil,
-                  nil,
-                  nil,
-                  nil,
-                  2,
-                  "bar"
-                )]
-             ),
-             nil,
-             nil,
-             0,
-             "=="
-           )],
-          nil
-        )],
-       nil,
-       (174...178),
-       (195...198)
-     ),
-     CaseNode(200...230)(
-       nil,
-       [WhenNode(205...211)(
-          (205...209),
-          [CallNode(210...211)(
-             nil,
-             nil,
-             (210...211),
-             nil,
-             nil,
-             nil,
-             nil,
-             2,
-             "a"
-           )],
-          nil
-        )],
-       ElseNode(212...230)((212...216), nil, (227...230)),
-       (200...204),
-       (227...230)
-     ),
-     CaseNode(232...272)(
-       CallNode(237...241)(
-         nil,
-         nil,
-         (237...241),
-         nil,
-         nil,
-         nil,
-         nil,
-         2,
-         "type"
-       ),
-       [WhenNode(246...253)(
-          (246...250),
-          [SymbolNode(251...253)((251...252), (252...253), nil, "b")],
-          nil
-        )],
-       ElseNode(260...272)((260...264), nil, (269...272)),
-       (232...236),
-       (269...272)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/classes.txt b/test/yarp/snapshots/classes.txt
deleted file mode 100644
index 43c0d24ab9817b..00000000000000
--- a/test/yarp/snapshots/classes.txt
+++ /dev/null
@@ -1,294 +0,0 @@
-ProgramNode(0...370)(
-  [],
-  StatementsNode(0...370)(
-    [ClassNode(0...17)(
-       [:a],
-       (0...5),
-       ConstantReadNode(6...7)(:A),
-       nil,
-       nil,
-       StatementsNode(8...13)(
-         [LocalVariableWriteNode(8...13)(
-            :a,
-            0,
-            (8...9),
-            IntegerNode(12...13)(),
-            (10...11)
-          )]
-       ),
-       (14...17),
-       :A,
-       :A
-     ),
-     ClassNode(19...39)(
-       [],
-       (19...24),
-       ConstantReadNode(25...26)(:A),
-       nil,
-       nil,
-       BeginNode(28...39)(
-         nil,
-         nil,
-         nil,
-         nil,
-         EnsureNode(28...39)((28...34), nil, (36...39)),
-         (36...39)
-       ),
-       (36...39),
-       :A,
-       :A
-     ),
-     ClassNode(41...75)(
-       [],
-       (41...46),
-       ConstantReadNode(47...48)(:A),
-       nil,
-       nil,
-       BeginNode(50...75)(
-         nil,
-         nil,
-         RescueNode(50...56)((50...56), [], nil, nil, nil, nil),
-         ElseNode(58...70)((58...62), nil, (64...70)),
-         EnsureNode(64...75)((64...70), nil, (72...75)),
-         (72...75)
-       ),
-       (72...75),
-       :A,
-       :A
-     ),
-     ClassNode(77...98)(
-       [:a],
-       (77...82),
-       ConstantReadNode(83...84)(:A),
-       (85...86),
-       ConstantReadNode(87...88)(:B),
-       StatementsNode(89...94)(
-         [LocalVariableWriteNode(89...94)(
-            :a,
-            0,
-            (89...90),
-            IntegerNode(93...94)(),
-            (91...92)
-          )]
-       ),
-       (95...98),
-       :A,
-       :A
-     ),
-     SingletonClassNode(100...120)(
-       [],
-       (100...105),
-       (106...108),
-       CallNode(109...116)(
-         CallNode(113...116)(
-           nil,
-           nil,
-           (113...116),
-           nil,
-           nil,
-           nil,
-           nil,
-           2,
-           "foo"
-         ),
-         nil,
-         (109...112),
-         nil,
-         nil,
-         nil,
-         nil,
-         0,
-         "!"
-       ),
-       nil,
-       (117...120)
-     ),
-     ClassNode(122...162)(
-       [],
-       (122...127),
-       ConstantReadNode(128...129)(:A),
-       nil,
-       nil,
-       StatementsNode(131...157)(
-         [SingletonClassNode(131...157)(
-            [],
-            (131...136),
-            (137...139),
-            SelfNode(140...144)(),
-            BeginNode(146...157)(
-              nil,
-              nil,
-              nil,
-              nil,
-              EnsureNode(146...157)((146...152), nil, (154...157)),
-              (154...157)
-            ),
-            (154...157)
-          )]
-       ),
-       (159...162),
-       :A,
-       :A
-     ),
-     ClassNode(164...218)(
-       [],
-       (164...169),
-       ConstantReadNode(170...171)(:A),
-       nil,
-       nil,
-       StatementsNode(173...213)(
-         [SingletonClassNode(173...213)(
-            [],
-            (173...178),
-            (179...181),
-            SelfNode(182...186)(),
-            BeginNode(188...213)(
-              nil,
-              nil,
-              RescueNode(188...194)((188...194), [], nil, nil, nil, nil),
-              ElseNode(196...208)((196...200), nil, (202...208)),
-              EnsureNode(202...213)((202...208), nil, (210...213)),
-              (210...213)
-            ),
-            (210...213)
-          )]
-       ),
-       (215...218),
-       :A,
-       :A
-     ),
-     SingletonClassNode(220...240)(
-       [],
-       (220...225),
-       (226...228),
-       CallNode(229...236)(
-         CallNode(229...232)(
-           nil,
-           nil,
-           (229...232),
-           nil,
-           nil,
-           nil,
-           nil,
-           2,
-           "foo"
-         ),
-         (232...233),
-         (233...236),
-         nil,
-         nil,
-         nil,
-         nil,
-         0,
-         "bar"
-       ),
-       nil,
-       (237...240)
-     ),
-     SingletonClassNode(242...262)(
-       [],
-       (242...247),
-       (248...250),
-       CallNode(251...258)(
-         CallNode(251...254)(
-           nil,
-           nil,
-           (251...254),
-           nil,
-           nil,
-           nil,
-           nil,
-           2,
-           "foo"
-         ),
-         (254...255),
-         (255...258),
-         nil,
-         nil,
-         nil,
-         nil,
-         0,
-         "bar"
-       ),
-       nil,
-       (259...262)
-     ),
-     SingletonClassNode(264...281)(
-       [],
-       (264...269),
-       (270...272),
-       SelfNode(273...277)(),
-       nil,
-       (278...281)
-     ),
-     SingletonClassNode(283...300)(
-       [],
-       (283...288),
-       (289...291),
-       SelfNode(292...296)(),
-       nil,
-       (297...300)
-     ),
-     SingletonClassNode(302...325)(
-       [],
-       (302...307),
-       (308...310),
-       SelfNode(311...315)(),
-       StatementsNode(316...321)(
-         [CallNode(316...321)(
-            IntegerNode(316...317)(),
-            nil,
-            (318...319),
-            nil,
-            ArgumentsNode(320...321)([IntegerNode(320...321)()]),
-            nil,
-            nil,
-            0,
-            "+"
-          )]
-       ),
-       (322...325)
-     ),
-     SingletonClassNode(327...350)(
-       [],
-       (327...332),
-       (333...335),
-       SelfNode(336...340)(),
-       StatementsNode(341...346)(
-         [CallNode(341...346)(
-            IntegerNode(341...342)(),
-            nil,
-            (343...344),
-            nil,
-            ArgumentsNode(345...346)([IntegerNode(345...346)()]),
-            nil,
-            nil,
-            0,
-            "+"
-          )]
-       ),
-       (347...350)
-     ),
-     ClassNode(352...370)(
-       [],
-       (352...357),
-       ConstantReadNode(358...359)(:A),
-       (360...361),
-       CallNode(362...366)(
-         ConstantReadNode(362...363)(:B),
-         nil,
-         (363...366),
-         (363...364),
-         ArgumentsNode(364...365)([IntegerNode(364...365)()]),
-         (365...366),
-         nil,
-         0,
-         "[]"
-       ),
-       nil,
-       (367...370),
-       :A,
-       :A
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/comments.txt b/test/yarp/snapshots/comments.txt
deleted file mode 100644
index e24df47bc83170..00000000000000
--- a/test/yarp/snapshots/comments.txt
+++ /dev/null
@@ -1,64 +0,0 @@
-ProgramNode(0...118)(
-  [],
-  StatementsNode(0...118)(
-    [CallNode(0...1)(nil, nil, (0...1), nil, nil, nil, nil, 2, "a"),
-     CallNode(13...14)(nil, nil, (13...14), nil, nil, nil, nil, 2, "b"),
-     CallNode(16...17)(nil, nil, (16...17), nil, nil, nil, nil, 2, "c"),
-     CallNode(28...29)(nil, nil, (28...29), nil, nil, nil, nil, 2, "d"),
-     CallNode(31...47)(
-       CallNode(31...32)(nil, nil, (31...32), nil, nil, nil, nil, 2, "e"),
-       (45...46),
-       (46...47),
-       nil,
-       nil,
-       nil,
-       nil,
-       0,
-       "f"
-     ),
-     CallNode(49...64)(
-       CallNode(49...50)(nil, nil, (49...50), nil, nil, nil, nil, 2, "g"),
-       (62...63),
-       (63...64),
-       nil,
-       nil,
-       nil,
-       nil,
-       0,
-       "h"
-     ),
-     CallNode(66...80)(
-       CallNode(66...67)(nil, nil, (66...67), nil, nil, nil, nil, 2, "i"),
-       (78...79),
-       (79...80),
-       nil,
-       nil,
-       nil,
-       nil,
-       0,
-       "j"
-     ),
-     CallNode(82...98)(
-       CallNode(82...83)(nil, nil, (82...83), nil, nil, nil, nil, 2, "k"),
-       (96...97),
-       (97...98),
-       nil,
-       nil,
-       nil,
-       nil,
-       0,
-       "l"
-     ),
-     CallNode(100...118)(
-       CallNode(100...101)(nil, nil, (100...101), nil, nil, nil, nil, 2, "m"),
-       (115...117),
-       (117...118),
-       nil,
-       nil,
-       nil,
-       nil,
-       1,
-       "n"
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/constants.txt b/test/yarp/snapshots/constants.txt
deleted file mode 100644
index bf4564c46d02fa..00000000000000
--- a/test/yarp/snapshots/constants.txt
+++ /dev/null
@@ -1,1095 +0,0 @@
-ProgramNode(0...792)(
-  [],
-  StatementsNode(0...792)(
-    [ConstantPathNode(0...4)(
-       ConstantReadNode(0...1)(:A),
-       ConstantReadNode(3...4)(:B),
-       (1...3)
-     ),
-     ConstantPathNode(6...13)(
-       ConstantPathNode(6...10)(
-         ConstantReadNode(6...7)(:A),
-         ConstantReadNode(9...10)(:B),
-         (7...9)
-       ),
-       ConstantReadNode(12...13)(:C),
-       (10...12)
-     ),
-     ConstantPathNode(15...19)(
-       CallNode(15...16)(nil, nil, (15...16), nil, nil, nil, nil, 2, "a"),
-       ConstantReadNode(18...19)(:B),
-       (16...18)
-     ),
-     ConstantPathWriteNode(21...29)(
-       ConstantPathNode(21...25)(
-         ConstantReadNode(21...22)(:A),
-         ConstantReadNode(24...25)(:B),
-         (22...24)
-       ),
-       (26...27),
-       IntegerNode(28...29)()
-     ),
-     ConstantWriteNode(31...36)(
-       :A,
-       (31...32),
-       IntegerNode(35...36)(),
-       (33...34)
-     ),
-     ConstantReadNode(38...41)(:ABC),
-     CallNode(43...48)(
-       nil,
-       nil,
-       (43...46),
-       nil,
-       ArgumentsNode(47...48)([IntegerNode(47...48)()]),
-       nil,
-       nil,
-       0,
-       "Foo"
-     ),
-     CallNode(50...58)(
-       nil,
-       nil,
-       (50...53),
-       nil,
-       ArgumentsNode(54...58)(
-         [SplatNode(54...58)(
-            (54...55),
-            CallNode(55...58)(
-              nil,
-              nil,
-              (55...58),
-              nil,
-              nil,
-              nil,
-              nil,
-              2,
-              "bar"
-            )
-          )]
-       ),
-       nil,
-       nil,
-       0,
-       "Foo"
-     ),
-     CallNode(60...69)(
-       nil,
-       nil,
-       (60...63),
-       nil,
-       ArgumentsNode(64...69)(
-         [KeywordHashNode(64...69)(
-            [AssocSplatNode(64...69)(
-               CallNode(66...69)(
-                 nil,
-                 nil,
-                 (66...69),
-                 nil,
-                 nil,
-                 nil,
-                 nil,
-                 2,
-                 "bar"
-               ),
-               (64...66)
-             )]
-          )]
-       ),
-       nil,
-       nil,
-       0,
-       "Foo"
-     ),
-     CallNode(71...79)(
-       nil,
-       nil,
-       (71...74),
-       nil,
-       ArgumentsNode(75...79)(
-         [BlockArgumentNode(75...79)(
-            CallNode(76...79)(
-              nil,
-              nil,
-              (76...79),
-              nil,
-              nil,
-              nil,
-              nil,
-              2,
-              "bar"
-            ),
-            (75...76)
-          )]
-       ),
-       nil,
-       nil,
-       0,
-       "Foo"
-     ),
-     CallNode(81...94)(
-       ConstantReadNode(81...84)(:Foo),
-       (84...86),
-       (86...89),
-       nil,
-       ArgumentsNode(90...94)(
-         [SplatNode(90...94)(
-            (90...91),
-            CallNode(91...94)(
-              nil,
-              nil,
-              (91...94),
-              nil,
-              nil,
-              nil,
-              nil,
-              2,
-              "baz"
-            )
-          )]
-       ),
-       nil,
-       nil,
-       0,
-       "Bar"
-     ),
-     CallNode(96...110)(
-       ConstantReadNode(96...99)(:Foo),
-       (99...101),
-       (101...104),
-       nil,
-       ArgumentsNode(105...110)(
-         [KeywordHashNode(105...110)(
-            [AssocSplatNode(105...110)(
-               CallNode(107...110)(
-                 nil,
-                 nil,
-                 (107...110),
-                 nil,
-                 nil,
-                 nil,
-                 nil,
-                 2,
-                 "baz"
-               ),
-               (105...107)
-             )]
-          )]
-       ),
-       nil,
-       nil,
-       0,
-       "Bar"
-     ),
-     CallNode(112...125)(
-       ConstantReadNode(112...115)(:Foo),
-       (115...117),
-       (117...120),
-       nil,
-       ArgumentsNode(121...125)(
-         [BlockArgumentNode(121...125)(
-            CallNode(122...125)(
-              nil,
-              nil,
-              (122...125),
-              nil,
-              nil,
-              nil,
-              nil,
-              2,
-              "baz"
-            ),
-            (121...122)
-          )]
-       ),
-       nil,
-       nil,
-       0,
-       "Bar"
-     ),
-     CallNode(127...135)(
-       ConstantPathNode(127...130)(
-         nil,
-         ConstantReadNode(129...130)(:A),
-         (127...129)
-       ),
-       (130...132),
-       (132...135),
-       nil,
-       nil,
-       nil,
-       nil,
-       0,
-       "foo"
-     ),
-     ConstantPathWriteNode(137...144)(
-       ConstantPathNode(137...140)(
-         nil,
-         ConstantReadNode(139...140)(:A),
-         (137...139)
-       ),
-       (141...142),
-       IntegerNode(143...144)()
-     ),
-     ConstantPathWriteNode(146...156)(
-       ConstantPathNode(146...152)(
-         ConstantPathNode(146...149)(
-           nil,
-           ConstantReadNode(148...149)(:A),
-           (146...148)
-         ),
-         ConstantReadNode(151...152)(:B),
-         (149...151)
-       ),
-       (153...154),
-       IntegerNode(155...156)()
-     ),
-     ConstantPathNode(158...164)(
-       ConstantPathNode(158...161)(
-         nil,
-         ConstantReadNode(160...161)(:A),
-         (158...160)
-       ),
-       ConstantReadNode(163...164)(:B),
-       (161...163)
-     ),
-     ConstantPathNode(166...169)(
-       nil,
-       ConstantReadNode(168...169)(:A),
-       (166...168)
-     ),
-     CallNode(171...179)(
-       ConstantReadNode(171...172)(:A),
-       (172...174),
-       (174...179),
-       nil,
-       nil,
-       nil,
-       nil,
-       0,
-       "false"
-     ),
-     CallNode(181...191)(
-       ConstantPathNode(181...185)(
-         ConstantReadNode(181...182)(:A),
-         ConstantReadNode(184...185)(:B),
-         (182...184)
-       ),
-       (185...187),
-       (187...191),
-       nil,
-       nil,
-       nil,
-       nil,
-       0,
-       "true"
-     ),
-     CallNode(193...197)(
-       ConstantReadNode(193...194)(:A),
-       (194...196),
-       (196...197),
-       nil,
-       nil,
-       nil,
-       nil,
-       0,
-       "&"
-     ),
-     CallNode(199...203)(
-       ConstantReadNode(199...200)(:A),
-       (200...202),
-       (202...203),
-       nil,
-       nil,
-       nil,
-       nil,
-       0,
-       "`"
-     ),
-     CallNode(205...209)(
-       ConstantReadNode(205...206)(:A),
-       (206...208),
-       (208...209),
-       nil,
-       nil,
-       nil,
-       nil,
-       0,
-       "!"
-     ),
-     CallNode(211...216)(
-       ConstantReadNode(211...212)(:A),
-       (212...214),
-       (214...216),
-       nil,
-       nil,
-       nil,
-       nil,
-       0,
-       "!="
-     ),
-     CallNode(218...222)(
-       ConstantReadNode(218...219)(:A),
-       (219...221),
-       (221...222),
-       nil,
-       nil,
-       nil,
-       nil,
-       0,
-       "^"
-     ),
-     CallNode(224...229)(
-       ConstantReadNode(224...225)(:A),
-       (225...227),
-       (227...229),
-       nil,
-       nil,
-       nil,
-       nil,
-       0,
-       "=="
-     ),
-     CallNode(231...237)(
-       ConstantReadNode(231...232)(:A),
-       (232...234),
-       (234...237),
-       nil,
-       nil,
-       nil,
-       nil,
-       0,
-       "==="
-     ),
-     CallNode(239...244)(
-       ConstantReadNode(239...240)(:A),
-       (240...242),
-       (242...244),
-       nil,
-       nil,
-       nil,
-       nil,
-       0,
-       "=~"
-     ),
-     CallNode(246...250)(
-       ConstantReadNode(246...247)(:A),
-       (247...249),
-       (249...250),
-       nil,
-       nil,
-       nil,
-       nil,
-       0,
-       ">"
-     ),
-     CallNode(252...257)(
-       ConstantReadNode(252...253)(:A),
-       (253...255),
-       (255...257),
-       nil,
-       nil,
-       nil,
-       nil,
-       0,
-       ">="
-     ),
-     CallNode(259...264)(
-       ConstantReadNode(259...260)(:A),
-       (260...262),
-       (262...264),
-       nil,
-       nil,
-       nil,
-       nil,
-       0,
-       ">>"
-     ),
-     CallNode(266...271)(
-       ConstantReadNode(266...267)(:A),
-       (267...269),
-       (269...271),
-       nil,
-       nil,
-       nil,
-       nil,
-       0,
-       "<<"
-     ),
-     ConstantPathNode(273...281)(
-       ConstantReadNode(273...274)(:A),
-       ConstantReadNode(280...281)(:C),
-       (274...276)
-     ),
-     CallNode(283...291)(
-       ConstantReadNode(283...284)(:A),
-       (284...286),
-       (286...291),
-       nil,
-       nil,
-       nil,
-       nil,
-       0,
-       "alias"
-     ),
-     CallNode(293...299)(
-       ConstantReadNode(293...294)(:A),
-       (294...296),
-       (296...299),
-       nil,
-       nil,
-       nil,
-       nil,
-       0,
-       "and"
-     ),
-     CallNode(301...309)(
-       ConstantReadNode(301...302)(:A),
-       (302...304),
-       (304...309),
-       nil,
-       nil,
-       nil,
-       nil,
-       0,
-       "begin"
-     ),
-     ConstantPathNode(311...319)(
-       ConstantReadNode(311...312)(:A),
-       ConstantReadNode(314...319)(:BEGIN),
-       (312...314)
-     ),
-     CallNode(321...329)(
-       ConstantReadNode(321...322)(:A),
-       (322...324),
-       (324...329),
-       nil,
-       nil,
-       nil,
-       nil,
-       0,
-       "break"
-     ),
-     CallNode(331...339)(
-       ConstantReadNode(331...332)(:A),
-       (332...334),
-       (334...339),
-       nil,
-       nil,
-       nil,
-       nil,
-       0,
-       "class"
-     ),
-     CallNode(341...347)(
-       ConstantReadNode(341...342)(:A),
-       (342...344),
-       (344...347),
-       nil,
-       nil,
-       nil,
-       nil,
-       0,
-       "def"
-     ),
-     CallNode(349...359)(
-       ConstantReadNode(349...350)(:A),
-       (350...352),
-       (352...359),
-       nil,
-       nil,
-       nil,
-       nil,
-       0,
-       "defined"
-     ),
-     CallNode(361...366)(
-       ConstantReadNode(361...362)(:A),
-       (362...364),
-       (364...366),
-       nil,
-       nil,
-       nil,
-       nil,
-       0,
-       "do"
-     ),
-     CallNode(368...375)(
-       ConstantReadNode(368...369)(:A),
-       (369...371),
-       (371...375),
-       nil,
-       nil,
-       nil,
-       nil,
-       0,
-       "else"
-     ),
-     CallNode(377...385)(
-       ConstantReadNode(377...378)(:A),
-       (378...380),
-       (380...385),
-       nil,
-       nil,
-       nil,
-       nil,
-       0,
-       "elsif"
-     ),
-     CallNode(387...393)(
-       ConstantReadNode(387...388)(:A),
-       (388...390),
-       (390...393),
-       nil,
-       nil,
-       nil,
-       nil,
-       0,
-       "end"
-     ),
-     ConstantPathNode(395...401)(
-       ConstantReadNode(395...396)(:A),
-       ConstantReadNode(398...401)(:END),
-       (396...398)
-     ),
-     CallNode(403...412)(
-       ConstantReadNode(403...404)(:A),
-       (404...406),
-       (406...412),
-       nil,
-       nil,
-       nil,
-       nil,
-       0,
-       "ensure"
-     ),
-     CallNode(414...422)(
-       ConstantReadNode(414...415)(:A),
-       (415...417),
-       (417...422),
-       nil,
-       nil,
-       nil,
-       nil,
-       0,
-       "false"
-     ),
-     CallNode(424...430)(
-       ConstantReadNode(424...425)(:A),
-       (425...427),
-       (427...430),
-       nil,
-       nil,
-       nil,
-       nil,
-       0,
-       "for"
-     ),
-     CallNode(432...437)(
-       ConstantReadNode(432...433)(:A),
-       (433...435),
-       (435...437),
-       nil,
-       nil,
-       nil,
-       nil,
-       0,
-       "if"
-     ),
-     CallNode(439...444)(
-       ConstantReadNode(439...440)(:A),
-       (440...442),
-       (442...444),
-       nil,
-       nil,
-       nil,
-       nil,
-       0,
-       "in"
-     ),
-     CallNode(446...453)(
-       ConstantReadNode(446...447)(:A),
-       (447...449),
-       (449...453),
-       nil,
-       nil,
-       nil,
-       nil,
-       0,
-       "next"
-     ),
-     CallNode(455...461)(
-       ConstantReadNode(455...456)(:A),
-       (456...458),
-       (458...461),
-       nil,
-       nil,
-       nil,
-       nil,
-       0,
-       "nil"
-     ),
-     CallNode(463...469)(
-       ConstantReadNode(463...464)(:A),
-       (464...466),
-       (466...469),
-       nil,
-       nil,
-       nil,
-       nil,
-       0,
-       "not"
-     ),
-     CallNode(471...476)(
-       ConstantReadNode(471...472)(:A),
-       (472...474),
-       (474...476),
-       nil,
-       nil,
-       nil,
-       nil,
-       0,
-       "or"
-     ),
-     CallNode(478...485)(
-       ConstantReadNode(478...479)(:A),
-       (479...481),
-       (481...485),
-       nil,
-       nil,
-       nil,
-       nil,
-       0,
-       "redo"
-     ),
-     CallNode(487...496)(
-       ConstantReadNode(487...488)(:A),
-       (488...490),
-       (490...496),
-       nil,
-       nil,
-       nil,
-       nil,
-       0,
-       "rescue"
-     ),
-     CallNode(498...506)(
-       ConstantReadNode(498...499)(:A),
-       (499...501),
-       (501...506),
-       nil,
-       nil,
-       nil,
-       nil,
-       0,
-       "retry"
-     ),
-     CallNode(508...517)(
-       ConstantReadNode(508...509)(:A),
-       (509...511),
-       (511...517),
-       nil,
-       nil,
-       nil,
-       nil,
-       0,
-       "return"
-     ),
-     CallNode(519...526)(
-       ConstantReadNode(519...520)(:A),
-       (520...522),
-       (522...526),
-       nil,
-       nil,
-       nil,
-       nil,
-       0,
-       "self"
-     ),
-     CallNode(528...536)(
-       ConstantReadNode(528...529)(:A),
-       (529...531),
-       (531...536),
-       nil,
-       nil,
-       nil,
-       nil,
-       0,
-       "super"
-     ),
-     CallNode(538...545)(
-       ConstantReadNode(538...539)(:A),
-       (539...541),
-       (541...545),
-       nil,
-       nil,
-       nil,
-       nil,
-       0,
-       "then"
-     ),
-     CallNode(547...554)(
-       ConstantReadNode(547...548)(:A),
-       (548...550),
-       (550...554),
-       nil,
-       nil,
-       nil,
-       nil,
-       0,
-       "true"
-     ),
-     CallNode(556...564)(
-       ConstantReadNode(556...557)(:A),
-       (557...559),
-       (559...564),
-       nil,
-       nil,
-       nil,
-       nil,
-       0,
-       "undef"
-     ),
-     CallNode(566...575)(
-       ConstantReadNode(566...567)(:A),
-       (567...569),
-       (569...575),
-       nil,
-       nil,
-       nil,
-       nil,
-       0,
-       "unless"
-     ),
-     CallNode(577...585)(
-       ConstantReadNode(577...578)(:A),
-       (578...580),
-       (580...585),
-       nil,
-       nil,
-       nil,
-       nil,
-       0,
-       "until"
-     ),
-     CallNode(587...594)(
-       ConstantReadNode(587...588)(:A),
-       (588...590),
-       (590...594),
-       nil,
-       nil,
-       nil,
-       nil,
-       0,
-       "when"
-     ),
-     CallNode(596...604)(
-       ConstantReadNode(596...597)(:A),
-       (597...599),
-       (599...604),
-       nil,
-       nil,
-       nil,
-       nil,
-       0,
-       "while"
-     ),
-     CallNode(606...614)(
-       ConstantReadNode(606...607)(:A),
-       (607...609),
-       (609...614),
-       nil,
-       nil,
-       nil,
-       nil,
-       0,
-       "yield"
-     ),
-     CallNode(616...631)(
-       ConstantReadNode(616...617)(:A),
-       (617...619),
-       (619...631),
-       nil,
-       nil,
-       nil,
-       nil,
-       0,
-       "__ENCODING__"
-     ),
-     CallNode(633...644)(
-       ConstantReadNode(633...634)(:A),
-       (634...636),
-       (636...644),
-       nil,
-       nil,
-       nil,
-       nil,
-       0,
-       "__FILE__"
-     ),
-     CallNode(646...657)(
-       ConstantReadNode(646...647)(:A),
-       (647...649),
-       (649...657),
-       nil,
-       nil,
-       nil,
-       nil,
-       0,
-       "__LINE__"
-     ),
-     CallNode(659...663)(
-       ConstantReadNode(659...660)(:A),
-       (660...662),
-       (662...663),
-       nil,
-       nil,
-       nil,
-       nil,
-       0,
-       "<"
-     ),
-     CallNode(665...671)(
-       ConstantReadNode(665...666)(:A),
-       (666...668),
-       (668...671),
-       nil,
-       nil,
-       nil,
-       nil,
-       0,
-       "<=>"
-     ),
-     CallNode(673...678)(
-       ConstantReadNode(673...674)(:A),
-       (674...676),
-       (676...678),
-       nil,
-       nil,
-       nil,
-       nil,
-       0,
-       "<<"
-     ),
-     CallNode(680...684)(
-       ConstantReadNode(680...681)(:A),
-       (681...683),
-       (683...684),
-       nil,
-       nil,
-       nil,
-       nil,
-       0,
-       "-"
-     ),
-     CallNode(686...690)(
-       ConstantReadNode(686...687)(:A),
-       (687...689),
-       (689...690),
-       nil,
-       nil,
-       nil,
-       nil,
-       0,
-       "%"
-     ),
-     CallNode(692...697)(
-       ConstantReadNode(692...693)(:A),
-       (693...695),
-       (695...696),
-       nil,
-       ArgumentsNode(696...697)(
-         [CallNode(696...697)(
-            nil,
-            nil,
-            (696...697),
-            nil,
-            nil,
-            nil,
-            nil,
-            2,
-            "i"
-          )]
-       ),
-       nil,
-       nil,
-       0,
-       "%"
-     ),
-     CallNode(699...704)(
-       ConstantReadNode(699...700)(:A),
-       (700...702),
-       (702...703),
-       nil,
-       ArgumentsNode(703...704)(
-         [CallNode(703...704)(
-            nil,
-            nil,
-            (703...704),
-            nil,
-            nil,
-            nil,
-            nil,
-            2,
-            "w"
-          )]
-       ),
-       nil,
-       nil,
-       0,
-       "%"
-     ),
-     CallNode(706...711)(
-       ConstantReadNode(706...707)(:A),
-       (707...709),
-       (709...710),
-       nil,
-       ArgumentsNode(710...711)(
-         [CallNode(710...711)(
-            nil,
-            nil,
-            (710...711),
-            nil,
-            nil,
-            nil,
-            nil,
-            2,
-            "x"
-          )]
-       ),
-       nil,
-       nil,
-       0,
-       "%"
-     ),
-     CallNode(713...718)(
-       ConstantReadNode(713...714)(:A),
-       (714...716),
-       (716...717),
-       nil,
-       ArgumentsNode(717...718)([ConstantReadNode(717...718)(:I)]),
-       nil,
-       nil,
-       0,
-       "%"
-     ),
-     CallNode(720...725)(
-       ConstantReadNode(720...721)(:A),
-       (721...723),
-       (723...724),
-       nil,
-       ArgumentsNode(724...725)([ConstantReadNode(724...725)(:W)]),
-       nil,
-       nil,
-       0,
-       "%"
-     ),
-     CallNode(727...731)(
-       ConstantReadNode(727...728)(:A),
-       (728...730),
-       (730...731),
-       nil,
-       nil,
-       nil,
-       nil,
-       0,
-       "|"
-     ),
-     CallNode(733...737)(
-       ConstantReadNode(733...734)(:A),
-       (734...736),
-       (736...737),
-       nil,
-       nil,
-       nil,
-       nil,
-       0,
-       "+"
-     ),
-     CallNode(739...743)(
-       ConstantReadNode(739...740)(:A),
-       (740...742),
-       (742...743),
-       nil,
-       nil,
-       nil,
-       nil,
-       0,
-       "/"
-     ),
-     CallNode(745...749)(
-       ConstantReadNode(745...746)(:A),
-       (746...748),
-       (748...749),
-       nil,
-       nil,
-       nil,
-       nil,
-       0,
-       "*"
-     ),
-     CallNode(751...756)(
-       ConstantReadNode(751...752)(:A),
-       (752...754),
-       (754...756),
-       nil,
-       nil,
-       nil,
-       nil,
-       0,
-       "**"
-     ),
-     CallNode(758...762)(
-       ConstantReadNode(758...759)(:A),
-       (759...761),
-       (761...762),
-       nil,
-       nil,
-       nil,
-       nil,
-       0,
-       "~"
-     ),
-     ConstantPathNode(764...772)(
-       CallNode(764...768)(
-         ConstantReadNode(764...765)(:A),
-         (765...767),
-         (767...768),
-         nil,
-         nil,
-         nil,
-         nil,
-         0,
-         "_"
-       ),
-       ConstantReadNode(771...772)(:C),
-       (768...770)
-     ),
-     RangeNode(774...792)(
-       CallNode(774...778)(
-         ConstantReadNode(774...775)(:A),
-         (775...777),
-         (777...778),
-         nil,
-         nil,
-         nil,
-         nil,
-         0,
-         "_"
-       ),
-       CallNode(782...792)(
-         ConstantReadNode(782...783)(:A),
-         (783...785),
-         (785...792),
-         nil,
-         nil,
-         nil,
-         nil,
-         0,
-         "__END__"
-       ),
-       (778...780),
-       0
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/dash_heredocs.txt b/test/yarp/snapshots/dash_heredocs.txt
deleted file mode 100644
index e2eea3c2a53666..00000000000000
--- a/test/yarp/snapshots/dash_heredocs.txt
+++ /dev/null
@@ -1,176 +0,0 @@
-ProgramNode(0...278)(
-  [],
-  StatementsNode(0...278)(
-    [InterpolatedStringNode(0...6)(
-       (0...6),
-       [StringNode(7...11)(nil, (7...11), nil, "  a\n")],
-       (11...15)
-     ),
-     CallNode(16...36)(
-       InterpolatedStringNode(16...24)(
-         (16...24),
-         [StringNode(37...41)(nil, (37...41), nil, "  a\n")],
-         (41...47)
-       ),
-       nil,
-       (25...26),
-       nil,
-       ArgumentsNode(27...36)(
-         [InterpolatedStringNode(27...36)(
-            (27...36),
-            [StringNode(47...51)(nil, (47...51), nil, "  b\n")],
-            (51...58)
-          )]
-       ),
-       nil,
-       nil,
-       0,
-       "+"
-     ),
-     InterpolatedXStringNode(59...67)(
-       (59...67),
-       [StringNode(68...72)(nil, (68...72), nil, "  a\n"),
-        EmbeddedStatementsNode(72...76)(
-          (72...74),
-          StatementsNode(74...75)(
-            [CallNode(74...75)(
-               nil,
-               nil,
-               (74...75),
-               nil,
-               nil,
-               nil,
-               nil,
-               2,
-               "b"
-             )]
-          ),
-          (75...76)
-        ),
-        StringNode(76...77)(nil, (76...77), nil, "\n")],
-       (77...81)
-     ),
-     InterpolatedStringNode(82...88)(
-       (82...88),
-       [StringNode(98...102)(nil, (98...102), nil, "  a\n")],
-       (102...106)
-     ),
-     InterpolatedStringNode(107...113)(
-       (107...113),
-       [StringNode(114...122)(nil, (114...122), nil, "  a\n" + "  b\n")],
-       (122...128)
-     ),
-     InterpolatedStringNode(129...137)(
-       (129...137),
-       [StringNode(138...142)(nil, (138...142), nil, "  a\n"),
-        EmbeddedStatementsNode(142...146)(
-          (142...144),
-          StatementsNode(144...145)(
-            [CallNode(144...145)(
-               nil,
-               nil,
-               (144...145),
-               nil,
-               nil,
-               nil,
-               nil,
-               2,
-               "b"
-             )]
-          ),
-          (145...146)
-        ),
-        StringNode(146...147)(nil, (146...147), nil, "\n")],
-       (147...151)
-     ),
-     InterpolatedStringNode(152...158)(
-       (152...158),
-       [StringNode(159...163)(nil, (159...163), nil, "  a\n"),
-        EmbeddedStatementsNode(163...167)(
-          (163...165),
-          StatementsNode(165...166)(
-            [CallNode(165...166)(
-               nil,
-               nil,
-               (165...166),
-               nil,
-               nil,
-               nil,
-               nil,
-               2,
-               "b"
-             )]
-          ),
-          (166...167)
-        ),
-        StringNode(167...168)(nil, (167...168), nil, "\n")],
-       (168...172)
-     ),
-     StringNode(173...179)((173...175), (175...178), (178...179), "abc"),
-     InterpolatedStringNode(181...187)(
-       (181...187),
-       [StringNode(188...196)(nil, (188...196), nil, "  a\n" + "  b\n")],
-       (196...200)
-     ),
-     InterpolatedStringNode(201...206)((201...206), [], (207...208)),
-     InterpolatedStringNode(209...217)(
-       (209...217),
-       [StringNode(218...227)(nil, (218...227), nil, "  a \#{1}\n")],
-       (227...231)
-     ),
-     CallNode(232...243)(
-       InterpolatedStringNode(232...236)(
-         (232...236),
-         [StringNode(244...248)(nil, (244...248), nil, "  a\n")],
-         (248...250)
-       ),
-       nil,
-       (237...238),
-       nil,
-       ArgumentsNode(239...243)(
-         [InterpolatedStringNode(239...243)(
-            (239...243),
-            [StringNode(250...256)(nil, (250...256), nil, "  b\n" + "  "),
-             EmbeddedStatementsNode(256...263)(
-               (256...258),
-               StatementsNode(258...259)([IntegerNode(258...259)()]),
-               (262...263)
-             ),
-             StringNode(263...264)(nil, (263...264), nil, "\n")],
-            (264...266)
-          )]
-       ),
-       nil,
-       nil,
-       0,
-       "+"
-     ),
-     CallNode(267...278)(
-       InterpolatedStringNode(267...271)(
-         (267...271),
-         [StringNode(279...283)(nil, (279...283), nil, "  a\n")],
-         (283...285)
-       ),
-       nil,
-       (272...273),
-       nil,
-       ArgumentsNode(274...278)(
-         [InterpolatedStringNode(274...278)(
-            (274...278),
-            [StringNode(285...291)(nil, (285...291), nil, "  b\n" + "  "),
-             EmbeddedStatementsNode(291...298)(
-               (291...293),
-               StatementsNode(296...297)([IntegerNode(296...297)()]),
-               (297...298)
-             ),
-             StringNode(298...299)(nil, (298...299), nil, "\n")],
-            (299...301)
-          )]
-       ),
-       nil,
-       nil,
-       0,
-       "+"
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/defined.txt b/test/yarp/snapshots/defined.txt
deleted file mode 100644
index 1d4b5a5502e876..00000000000000
--- a/test/yarp/snapshots/defined.txt
+++ /dev/null
@@ -1,34 +0,0 @@
-ProgramNode(0...78)(
-  [:x],
-  StatementsNode(0...78)(
-    [AndNode(0...25)(
-       DefinedNode(0...10)(nil, IntegerNode(9...10)(), nil, (0...8)),
-       DefinedNode(15...25)(nil, IntegerNode(24...25)(), nil, (15...23)),
-       (11...14)
-     ),
-     DefinedNode(27...43)(
-       (35...36),
-       LocalVariableOperatorWriteNode(36...42)(
-         (36...37),
-         (38...40),
-         IntegerNode(41...42)(),
-         :x,
-         :%,
-         0
-       ),
-       (42...43),
-       (27...35)
-     ),
-     DefinedNode(45...66)(
-       (53...54),
-       AndNode(54...65)(
-         CallNode(54...57)(nil, nil, (54...57), nil, nil, nil, nil, 2, "foo"),
-         CallNode(62...65)(nil, nil, (62...65), nil, nil, nil, nil, 2, "bar"),
-         (58...61)
-       ),
-       (65...66),
-       (45...53)
-     ),
-     DefinedNode(68...78)(nil, IntegerNode(77...78)(), nil, (68...76))]
-  )
-)
diff --git a/test/yarp/snapshots/dos_endings.txt b/test/yarp/snapshots/dos_endings.txt
deleted file mode 100644
index 7048028b2a193b..00000000000000
--- a/test/yarp/snapshots/dos_endings.txt
+++ /dev/null
@@ -1,81 +0,0 @@
-ProgramNode(0...108)(
-  [:x, :a],
-  StatementsNode(0...108)(
-    [CallNode(0...24)(
-       nil,
-       nil,
-       (0...4),
-       nil,
-       ArgumentsNode(5...24)(
-         [StringConcatNode(5...24)(
-            StringNode(5...9)((5...6), (6...8), (8...9), "hi"),
-            StringNode(17...24)((17...18), (18...23), (23...24), "there")
-          )]
-       ),
-       nil,
-       nil,
-       0,
-       "puts"
-     ),
-     ArrayNode(28...37)(
-       [SymbolNode(31...36)(nil, (31...36), nil, "ab")],
-       (28...31),
-       (36...37)
-     ),
-     InterpolatedStringNode(41...45)(
-       (41...45),
-       [StringNode(47...70)(
-          nil,
-          (47...70),
-          nil,
-          "    1     2\r\n" + "    3\r\n"
-        )],
-       (70...73)
-     ),
-     LocalVariableWriteNode(75...84)(
-       :x,
-       0,
-       (75...76),
-       StringNode(79...84)((79...82), (82...82), (82...84), ""),
-       (77...78)
-     ),
-     LocalVariableWriteNode(88...108)(
-       :a,
-       0,
-       (88...89),
-       CallNode(92...108)(
-         nil,
-         nil,
-         (92...95),
-         (95...96),
-         ArgumentsNode(96...107)(
-           [CallNode(96...107)(
-              InterpolatedStringNode(96...102)(
-                (96...102),
-                [StringNode(110...121)(
-                   nil,
-                   (110...121),
-                   nil,
-                   "\n" + "baz\r\n"
-                 )],
-                (121...128)
-              ),
-              (102...103),
-              (103...107),
-              nil,
-              nil,
-              nil,
-              nil,
-              0,
-              "chop"
-            )]
-         ),
-         (107...108),
-         nil,
-         0,
-         "foo"
-       ),
-       (90...91)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/embdoc_no_newline_at_end.txt b/test/yarp/snapshots/embdoc_no_newline_at_end.txt
deleted file mode 100644
index bd3eaf5ff49bc2..00000000000000
--- a/test/yarp/snapshots/embdoc_no_newline_at_end.txt
+++ /dev/null
@@ -1 +0,0 @@
-ProgramNode(0...0)([], StatementsNode(0...0)([]))
diff --git a/test/yarp/snapshots/endless_methods.txt b/test/yarp/snapshots/endless_methods.txt
deleted file mode 100644
index 2e67d9d76f58a0..00000000000000
--- a/test/yarp/snapshots/endless_methods.txt
+++ /dev/null
@@ -1,80 +0,0 @@
-ProgramNode(0...51)(
-  [],
-  StatementsNode(0...51)(
-    [DefNode(0...11)(
-       (4...7),
-       nil,
-       nil,
-       StatementsNode(10...11)([IntegerNode(10...11)()]),
-       [],
-       (0...3),
-       nil,
-       nil,
-       nil,
-       (8...9),
-       nil
-     ),
-     DefNode(13...27)(
-       (17...20),
-       nil,
-       nil,
-       StatementsNode(23...27)(
-         [CallNode(23...27)(
-            nil,
-            nil,
-            (23...24),
-            nil,
-            ArgumentsNode(25...27)(
-              [StringNode(25...27)((25...26), (26...26), (26...27), "")]
-            ),
-            nil,
-            nil,
-            0,
-            "A"
-          )]
-       ),
-       [],
-       (13...16),
-       nil,
-       nil,
-       nil,
-       (21...22),
-       nil
-     ),
-     DefNode(29...51)(
-       (33...39),
-       nil,
-       nil,
-       StatementsNode(42...51)(
-         [CallNode(42...51)(
-            CallNode(42...47)(
-              IntegerNode(42...43)(),
-              nil,
-              (44...45),
-              nil,
-              ArgumentsNode(46...47)([IntegerNode(46...47)()]),
-              nil,
-              nil,
-              0,
-              "+"
-            ),
-            nil,
-            (48...49),
-            nil,
-            ArgumentsNode(50...51)([IntegerNode(50...51)()]),
-            nil,
-            nil,
-            0,
-            "+"
-          )]
-       ),
-       [],
-       (29...32),
-       nil,
-       nil,
-       nil,
-       (40...41),
-       nil
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/endless_range_in_conditional.txt b/test/yarp/snapshots/endless_range_in_conditional.txt
deleted file mode 100644
index 4360818e40de56..00000000000000
--- a/test/yarp/snapshots/endless_range_in_conditional.txt
+++ /dev/null
@@ -1,31 +0,0 @@
-ProgramNode(0...39)(
-  [],
-  StatementsNode(0...39)(
-    [IfNode(0...13)(
-       (0...2),
-       FlipFlopNode(3...7)(
-         IntegerNode(3...4)(),
-         IntegerNode(6...7)(),
-         (4...6),
-         0
-       ),
-       nil,
-       nil,
-       (10...13)
-     ),
-     IfNode(14...26)(
-       (14...16),
-       FlipFlopNode(17...20)(nil, IntegerNode(19...20)(), (17...19), 0),
-       nil,
-       nil,
-       (23...26)
-     ),
-     IfNode(27...39)(
-       (27...29),
-       FlipFlopNode(30...33)(IntegerNode(30...31)(), nil, (31...33), 0),
-       nil,
-       nil,
-       (36...39)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/for.txt b/test/yarp/snapshots/for.txt
deleted file mode 100644
index 53eb1caf581484..00000000000000
--- a/test/yarp/snapshots/for.txt
+++ /dev/null
@@ -1,128 +0,0 @@
-ProgramNode(0...143)(
-  [:i, :j, :k],
-  StatementsNode(0...143)(
-    [ForNode(0...20)(
-       MultiWriteNode(4...5)(
-         [LocalVariableTargetNode(4...5)(:i, 0)],
-         nil,
-         nil,
-         nil,
-         nil
-       ),
-       RangeNode(9...14)(
-         IntegerNode(9...10)(),
-         IntegerNode(12...14)(),
-         (10...12),
-         0
-       ),
-       StatementsNode(15...16)([LocalVariableReadNode(15...16)(:i, 0)]),
-       (0...3),
-       (6...8),
-       nil,
-       (17...20)
-     ),
-     ForNode(22...44)(
-       MultiWriteNode(26...27)(
-         [LocalVariableTargetNode(26...27)(:i, 0)],
-         nil,
-         nil,
-         nil,
-         nil
-       ),
-       RangeNode(31...36)(
-         IntegerNode(31...32)(),
-         IntegerNode(34...36)(),
-         (32...34),
-         0
-       ),
-       StatementsNode(38...39)([LocalVariableReadNode(38...39)(:i, 0)]),
-       (22...25),
-       (28...30),
-       nil,
-       (41...44)
-     ),
-     ForNode(46...68)(
-       MultiWriteNode(50...53)(
-         [LocalVariableTargetNode(50...51)(:i, 0),
-          LocalVariableTargetNode(52...53)(:j, 0)],
-         nil,
-         nil,
-         nil,
-         nil
-       ),
-       RangeNode(57...62)(
-         IntegerNode(57...58)(),
-         IntegerNode(60...62)(),
-         (58...60),
-         0
-       ),
-       StatementsNode(63...64)([LocalVariableReadNode(63...64)(:i, 0)]),
-       (46...49),
-       (54...56),
-       nil,
-       (65...68)
-     ),
-     ForNode(70...94)(
-       MultiWriteNode(74...79)(
-         [LocalVariableTargetNode(74...75)(:i, 0),
-          LocalVariableTargetNode(76...77)(:j, 0),
-          LocalVariableTargetNode(78...79)(:k, 0)],
-         nil,
-         nil,
-         nil,
-         nil
-       ),
-       RangeNode(83...88)(
-         IntegerNode(83...84)(),
-         IntegerNode(86...88)(),
-         (84...86),
-         0
-       ),
-       StatementsNode(89...90)([LocalVariableReadNode(89...90)(:i, 0)]),
-       (70...73),
-       (80...82),
-       nil,
-       (91...94)
-     ),
-     ForNode(96...119)(
-       MultiWriteNode(100...101)(
-         [LocalVariableTargetNode(100...101)(:i, 0)],
-         nil,
-         nil,
-         nil,
-         nil
-       ),
-       RangeNode(105...110)(
-         IntegerNode(105...106)(),
-         IntegerNode(108...110)(),
-         (106...108),
-         0
-       ),
-       StatementsNode(114...115)([LocalVariableReadNode(114...115)(:i, 0)]),
-       (96...99),
-       (102...104),
-       (111...113),
-       (116...119)
-     ),
-     ForNode(121...143)(
-       MultiWriteNode(125...126)(
-         [LocalVariableTargetNode(125...126)(:i, 0)],
-         nil,
-         nil,
-         nil,
-         nil
-       ),
-       RangeNode(130...135)(
-         IntegerNode(130...131)(),
-         IntegerNode(133...135)(),
-         (131...133),
-         0
-       ),
-       StatementsNode(137...138)([LocalVariableReadNode(137...138)(:i, 0)]),
-       (121...124),
-       (127...129),
-       nil,
-       (140...143)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/global_variables.txt b/test/yarp/snapshots/global_variables.txt
deleted file mode 100644
index 578f02e9b81519..00000000000000
--- a/test/yarp/snapshots/global_variables.txt
+++ /dev/null
@@ -1,52 +0,0 @@
-ProgramNode(0...349)(
-  [],
-  StatementsNode(0...349)(
-    [GlobalVariableReadNode(0...16)(:$global_variable),
-     GlobalVariableReadNode(18...20)(:$_),
-     GlobalVariableReadNode(22...25)(:$-w),
-     GlobalVariableReadNode(27...37)(:$LOAD_PATH),
-     GlobalVariableReadNode(39...45)(:$stdin),
-     GlobalVariableReadNode(47...54)(:$stdout),
-     GlobalVariableReadNode(56...63)(:$stderr),
-     GlobalVariableReadNode(65...67)(:$!),
-     GlobalVariableReadNode(69...71)(:$?),
-     GlobalVariableReadNode(73...75)(:$~),
-     BackReferenceReadNode(77...79)(),
-     BackReferenceReadNode(81...83)(),
-     BackReferenceReadNode(85...87)(),
-     BackReferenceReadNode(89...91)(),
-     GlobalVariableReadNode(93...95)(:$:),
-     GlobalVariableReadNode(97...99)(:$;),
-     GlobalVariableReadNode(101...103)(:$,),
-     GlobalVariableReadNode(105...111)(:$DEBUG),
-     GlobalVariableReadNode(113...122)(:$FILENAME),
-     GlobalVariableReadNode(124...126)(:$0),
-     GlobalVariableReadNode(128...131)(:$-0),
-     GlobalVariableReadNode(133...149)(:$LOADED_FEATURES),
-     GlobalVariableReadNode(151...159)(:$VERBOSE),
-     GlobalVariableReadNode(161...164)(:$-K),
-     SymbolNode(166...183)((166...167), (167...183), nil, "$global_variable"),
-     SymbolNode(185...188)((185...186), (186...188), nil, "$_"),
-     SymbolNode(190...194)((190...191), (191...194), nil, "$-w"),
-     SymbolNode(196...207)((196...197), (197...207), nil, "$LOAD_PATH"),
-     SymbolNode(209...216)((209...210), (210...216), nil, "$stdin"),
-     SymbolNode(218...226)((218...219), (219...226), nil, "$stdout"),
-     SymbolNode(228...236)((228...229), (229...236), nil, "$stderr"),
-     SymbolNode(238...241)((238...239), (239...241), nil, "$!"),
-     SymbolNode(243...246)((243...244), (244...246), nil, "$?"),
-     SymbolNode(248...251)((248...249), (249...251), nil, "$~"),
-     SymbolNode(253...256)((253...254), (254...256), nil, "$&"),
-     SymbolNode(258...261)((258...259), (259...261), nil, "$`"),
-     SymbolNode(263...266)((263...264), (264...266), nil, "$'"),
-     SymbolNode(268...271)((268...269), (269...271), nil, "$+"),
-     SymbolNode(273...276)((273...274), (274...276), nil, "$:"),
-     SymbolNode(278...281)((278...279), (279...281), nil, "$;"),
-     SymbolNode(283...290)((283...284), (284...290), nil, "$DEBUG"),
-     SymbolNode(292...302)((292...293), (293...302), nil, "$FILENAME"),
-     SymbolNode(304...307)((304...305), (305...307), nil, "$0"),
-     SymbolNode(309...313)((309...310), (310...313), nil, "$-0"),
-     SymbolNode(315...332)((315...316), (316...332), nil, "$LOADED_FEATURES"),
-     SymbolNode(334...343)((334...335), (335...343), nil, "$VERBOSE"),
-     SymbolNode(345...349)((345...346), (346...349), nil, "$-K")]
-  )
-)
diff --git a/test/yarp/snapshots/hashes.txt b/test/yarp/snapshots/hashes.txt
deleted file mode 100644
index cfd3e04f163653..00000000000000
--- a/test/yarp/snapshots/hashes.txt
+++ /dev/null
@@ -1,110 +0,0 @@
-ProgramNode(0...120)(
-  [],
-  StatementsNode(0...120)(
-    [HashNode(0...2)((0...1), [], (1...2)),
-     HashNode(4...7)((4...5), [], (6...7)),
-     HashNode(9...27)(
-       (9...10),
-       [AssocNode(11...17)(
-          CallNode(11...12)(nil, nil, (11...12), nil, nil, nil, nil, 2, "a"),
-          CallNode(16...17)(nil, nil, (16...17), nil, nil, nil, nil, 2, "b"),
-          (13...15)
-        ),
-        AssocNode(19...25)(
-          CallNode(19...20)(nil, nil, (19...20), nil, nil, nil, nil, 2, "c"),
-          CallNode(24...25)(nil, nil, (24...25), nil, nil, nil, nil, 2, "d"),
-          (21...23)
-        )],
-       (26...27)
-     ),
-     HashNode(29...44)(
-       (29...30),
-       [AssocNode(31...37)(
-          CallNode(31...32)(nil, nil, (31...32), nil, nil, nil, nil, 2, "a"),
-          CallNode(36...37)(nil, nil, (36...37), nil, nil, nil, nil, 2, "b"),
-          (33...35)
-        ),
-        AssocSplatNode(39...42)(
-          CallNode(41...42)(nil, nil, (41...42), nil, nil, nil, nil, 2, "c"),
-          (39...41)
-        )],
-       (43...44)
-     ),
-     HashNode(46...79)(
-       (46...47),
-       [AssocNode(54...58)(
-          SymbolNode(54...56)(nil, (54...55), (55...56), "a"),
-          CallNode(57...58)(nil, nil, (57...58), nil, nil, nil, nil, 2, "b"),
-          nil
-        ),
-        AssocNode(66...70)(
-          SymbolNode(66...68)(nil, (66...67), (67...68), "c"),
-          CallNode(69...70)(nil, nil, (69...70), nil, nil, nil, nil, 2, "d"),
-          nil
-        )],
-       (78...79)
-     ),
-     HashNode(81...106)(
-       (81...82),
-       [AssocNode(83...87)(
-          SymbolNode(83...85)(nil, (83...84), (84...85), "a"),
-          CallNode(86...87)(nil, nil, (86...87), nil, nil, nil, nil, 2, "b"),
-          nil
-        ),
-        AssocNode(89...93)(
-          SymbolNode(89...91)(nil, (89...90), (90...91), "c"),
-          CallNode(92...93)(nil, nil, (92...93), nil, nil, nil, nil, 2, "d"),
-          nil
-        ),
-        AssocSplatNode(95...98)(
-          CallNode(97...98)(nil, nil, (97...98), nil, nil, nil, nil, 2, "e"),
-          (95...97)
-        ),
-        AssocNode(100...104)(
-          SymbolNode(100...102)(nil, (100...101), (101...102), "f"),
-          CallNode(103...104)(
-            nil,
-            nil,
-            (103...104),
-            nil,
-            nil,
-            nil,
-            nil,
-            2,
-            "g"
-          ),
-          nil
-        )],
-       (105...106)
-     ),
-     HashNode(108...120)(
-       (108...109),
-       [AssocNode(110...118)(
-          SymbolNode(110...114)((110...111), (111...112), (112...114), "a"),
-          CallNode(115...118)(
-            CallNode(116...118)(
-              nil,
-              nil,
-              (116...118),
-              nil,
-              nil,
-              nil,
-              nil,
-              0,
-              "b?"
-            ),
-            nil,
-            (115...116),
-            nil,
-            nil,
-            nil,
-            nil,
-            0,
-            "!"
-          ),
-          nil
-        )],
-       (119...120)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/heredoc_with_escaped_newline_at_start.txt b/test/yarp/snapshots/heredoc_with_escaped_newline_at_start.txt
deleted file mode 100644
index 43fa751526de80..00000000000000
--- a/test/yarp/snapshots/heredoc_with_escaped_newline_at_start.txt
+++ /dev/null
@@ -1,45 +0,0 @@
-ProgramNode(0...62)(
-  [],
-  StatementsNode(0...62)(
-    [CallNode(0...25)(
-       InterpolatedStringNode(0...9)((0...9), [], (27...34)),
-       (9...10),
-       (10...14),
-       nil,
-       ArgumentsNode(15...25)(
-         [RegularExpressionNode(15...21)(
-            (15...16),
-            (16...20),
-            (20...21),
-            "^ {",
-            0
-          ),
-          StringNode(23...25)((23...24), (24...24), (24...25), "")]
-       ),
-       nil,
-       nil,
-       0,
-       "gsub"
-     ),
-     CallNode(37...62)(
-       InterpolatedStringNode(37...46)((37...46), [], (65...73)),
-       (46...47),
-       (47...51),
-       nil,
-       ArgumentsNode(52...62)(
-         [RegularExpressionNode(52...58)(
-            (52...53),
-            (53...57),
-            (57...58),
-            "^ {",
-            0
-          ),
-          StringNode(60...62)((60...61), (61...61), (61...62), "")]
-       ),
-       nil,
-       nil,
-       0,
-       "gsub"
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/heredoc_with_trailing_newline.txt b/test/yarp/snapshots/heredoc_with_trailing_newline.txt
deleted file mode 100644
index adaa524dda59f7..00000000000000
--- a/test/yarp/snapshots/heredoc_with_trailing_newline.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-ProgramNode(0...6)(
-  [],
-  StatementsNode(0...6)([InterpolatedStringNode(0...6)((0...6), [], (7...10))])
-)
diff --git a/test/yarp/snapshots/heredocs_nested.txt b/test/yarp/snapshots/heredocs_nested.txt
deleted file mode 100644
index 750e5e4473fa36..00000000000000
--- a/test/yarp/snapshots/heredocs_nested.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-ProgramNode(0...7)(
-  [],
-  StatementsNode(0...7)(
-    [InterpolatedStringNode(0...7)(
-       (0...7),
-       [StringNode(8...12)(nil, (8...12), nil, "pre\n"),
-        EmbeddedStatementsNode(12...36)(
-          (12...14),
-          StatementsNode(15...21)(
-            [InterpolatedStringNode(15...21)(
-               (15...21),
-               [StringNode(22...30)(nil, (22...30), nil, "  hello\n")],
-               (30...35)
-             )]
-          ),
-          (35...36)
-        ),
-        StringNode(36...42)(nil, (36...42), nil, "\n" + "post\n")],
-       (42...47)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/heredocs_with_ignored_newlines.txt b/test/yarp/snapshots/heredocs_with_ignored_newlines.txt
deleted file mode 100644
index 3fd8c7accb8386..00000000000000
--- a/test/yarp/snapshots/heredocs_with_ignored_newlines.txt
+++ /dev/null
@@ -1,23 +0,0 @@
-ProgramNode(0...23)(
-  [],
-  StatementsNode(0...23)(
-    [InterpolatedStringNode(0...7)((0...7), [], (9...14)),
-     InterpolatedStringNode(15...23)(
-       (15...23),
-       [StringNode(25...100)(
-          nil,
-          (25...100),
-          nil,
-          "way over\n" +
-          "<<HERE\n" +
-          "  not here\n" +
-          "HERE\n" +
-          "\n" +
-          "<<~BUT  but\n" +
-          "BUT\n" +
-          "  there\n"
-        )],
-       (100...106)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/heredocs_with_ignored_newlines_and_non_empty.txt b/test/yarp/snapshots/heredocs_with_ignored_newlines_and_non_empty.txt
deleted file mode 100644
index 876c64a2192a35..00000000000000
--- a/test/yarp/snapshots/heredocs_with_ignored_newlines_and_non_empty.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-ProgramNode(0...6)(
-  [],
-  StatementsNode(0...6)(
-    [InterpolatedStringNode(0...6)(
-       (0...6),
-       [StringNode(7...23)(nil, (7...23), nil, " some\n" + " heredocs\n")],
-       (23...26)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/if.txt b/test/yarp/snapshots/if.txt
deleted file mode 100644
index 07c8f714a33030..00000000000000
--- a/test/yarp/snapshots/if.txt
+++ /dev/null
@@ -1,340 +0,0 @@
-ProgramNode(0...382)(
-  [],
-  StatementsNode(0...382)(
-    [IfNode(0...15)(
-       (0...2),
-       TrueNode(3...7)(),
-       StatementsNode(9...10)([IntegerNode(9...10)()]),
-       nil,
-       (12...15)
-     ),
-     IfNode(17...37)(
-       (17...19),
-       TrueNode(20...24)(),
-       StatementsNode(25...26)([IntegerNode(25...26)()]),
-       ElseNode(27...37)(
-         (27...31),
-         StatementsNode(32...33)([IntegerNode(32...33)()]),
-         (34...37)
-       ),
-       (34...37)
-     ),
-     IfNode(39...112)(
-       (39...41),
-       TrueNode(42...46)(),
-       StatementsNode(52...56)([TrueNode(52...56)()]),
-       IfNode(57...112)(
-         (57...62),
-         FalseNode(63...68)(),
-         StatementsNode(74...79)([FalseNode(74...79)()]),
-         IfNode(80...112)(
-           (80...85),
-           NilNode(86...89)(),
-           StatementsNode(95...98)([NilNode(95...98)()]),
-           ElseNode(99...112)(
-             (99...103),
-             StatementsNode(104...108)([SelfNode(104...108)()]),
-             (109...112)
-           ),
-           (109...112)
-         ),
-         (109...112)
-       ),
-       (109...112)
-     ),
-     IfNode(114...123)(
-       (116...118),
-       TrueNode(119...123)(),
-       StatementsNode(114...115)([IntegerNode(114...115)()]),
-       nil,
-       nil
-     ),
-     IfNode(125...138)(
-       (131...133),
-       TrueNode(134...138)(),
-       StatementsNode(125...130)([BreakNode(125...130)(nil, (125...130))]),
-       nil,
-       nil
-     ),
-     IfNode(140...152)(
-       (145...147),
-       TrueNode(148...152)(),
-       StatementsNode(140...144)([NextNode(140...144)(nil, (140...144))]),
-       nil,
-       nil
-     ),
-     IfNode(154...168)(
-       (161...163),
-       TrueNode(164...168)(),
-       StatementsNode(154...160)([ReturnNode(154...160)((154...160), nil)]),
-       nil,
-       nil
-     ),
-     IfNode(170...200)(
-       (170...172),
-       CallNode(173...182)(
-         nil,
-         nil,
-         (173...182),
-         nil,
-         nil,
-         nil,
-         nil,
-         2,
-         "exit_loop"
-       ),
-       StatementsNode(188...196)(
-         [BreakNode(188...196)(
-            ArgumentsNode(194...196)([IntegerNode(194...196)()]),
-            (188...193)
-          )]
-       ),
-       nil,
-       (197...200)
-     ),
-     IfNode(202...221)(
-       (202...204),
-       CallNode(205...208)(
-         nil,
-         nil,
-         (205...208),
-         nil,
-         nil,
-         nil,
-         nil,
-         2,
-         "foo"
-       ),
-       StatementsNode(214...217)(
-         [CallNode(214...217)(
-            nil,
-            nil,
-            (214...217),
-            nil,
-            nil,
-            nil,
-            nil,
-            2,
-            "bar"
-          )]
-       ),
-       nil,
-       (218...221)
-     ),
-     IfNode(223...234)(
-       (230...232),
-       CallNode(233...234)(nil, nil, (233...234), nil, nil, nil, nil, 2, "c"),
-       StatementsNode(223...229)(
-         [IfNode(223...229)(
-            (225...227),
-            CallNode(228...229)(
-              nil,
-              nil,
-              (228...229),
-              nil,
-              nil,
-              nil,
-              nil,
-              2,
-              "b"
-            ),
-            StatementsNode(223...224)(
-              [CallNode(223...224)(
-                 nil,
-                 nil,
-                 (223...224),
-                 nil,
-                 nil,
-                 nil,
-                 nil,
-                 2,
-                 "a"
-               )]
-            ),
-            nil,
-            nil
-          )]
-       ),
-       nil,
-       nil
-     ),
-     IfNode(236...259)(
-       (236...238),
-       TrueNode(239...243)(),
-       StatementsNode(246...250)(
-         [CallNode(246...250)(
-            nil,
-            nil,
-            (246...247),
-            nil,
-            ArgumentsNode(248...250)(
-              [KeywordHashNode(248...250)(
-                 [AssocNode(248...250)(
-                    SymbolNode(248...250)(nil, (248...249), (249...250), "b"),
-                    nil,
-                    nil
-                  )]
-               )]
-            ),
-            nil,
-            nil,
-            0,
-            "a"
-          )]
-       ),
-       ElseNode(251...259)((251...255), nil, (256...259)),
-       (256...259)
-     ),
-     IfNode(261...293)(
-       (261...263),
-       MatchPredicateNode(264...273)(
-         CallNode(264...268)(
-           nil,
-           nil,
-           (264...268),
-           nil,
-           nil,
-           nil,
-           nil,
-           2,
-           "type"
-         ),
-         IntegerNode(272...273)(),
-         (269...271)
-       ),
-       nil,
-       IfNode(274...293)(
-         (274...279),
-         MatchPredicateNode(280...289)(
-           CallNode(280...284)(
-             nil,
-             nil,
-             (280...284),
-             nil,
-             nil,
-             nil,
-             nil,
-             2,
-             "type"
-           ),
-           ConstantReadNode(288...289)(:B),
-           (285...287)
-         ),
-         nil,
-         nil,
-         (290...293)
-       ),
-       (290...293)
-     ),
-     IfNode(295...382)(
-       (295...297),
-       IntegerNode(298...299)(),
-       StatementsNode(302...321)(
-         [CallNode(302...321)(
-            nil,
-            nil,
-            (302...308),
-            nil,
-            nil,
-            nil,
-            BlockNode(309...321)(
-              [:_],
-              BlockParametersNode(312...315)(
-                ParametersNode(313...314)(
-                  [RequiredParameterNode(313...314)(:_)],
-                  [],
-                  [],
-                  nil,
-                  [],
-                  nil,
-                  nil
-                ),
-                [],
-                (312...313),
-                (314...315)
-              ),
-              nil,
-              (309...311),
-              (318...321)
-            ),
-            0,
-            "lambda"
-          )]
-       ),
-       IfNode(322...382)(
-         (322...327),
-         IntegerNode(328...329)(),
-         StatementsNode(332...351)(
-           [CallNode(332...351)(
-              nil,
-              nil,
-              (332...338),
-              nil,
-              nil,
-              nil,
-              BlockNode(339...351)(
-                [:_],
-                BlockParametersNode(342...345)(
-                  ParametersNode(343...344)(
-                    [RequiredParameterNode(343...344)(:_)],
-                    [],
-                    [],
-                    nil,
-                    [],
-                    nil,
-                    nil
-                  ),
-                  [],
-                  (342...343),
-                  (344...345)
-                ),
-                nil,
-                (339...341),
-                (348...351)
-              ),
-              0,
-              "lambda"
-            )]
-         ),
-         ElseNode(352...382)(
-           (352...356),
-           StatementsNode(359...378)(
-             [CallNode(359...378)(
-                nil,
-                nil,
-                (359...365),
-                nil,
-                nil,
-                nil,
-                BlockNode(366...378)(
-                  [:_],
-                  BlockParametersNode(369...372)(
-                    ParametersNode(370...371)(
-                      [RequiredParameterNode(370...371)(:_)],
-                      [],
-                      [],
-                      nil,
-                      [],
-                      nil,
-                      nil
-                    ),
-                    [],
-                    (369...370),
-                    (371...372)
-                  ),
-                  nil,
-                  (366...368),
-                  (375...378)
-                ),
-                0,
-                "lambda"
-              )]
-           ),
-           (379...382)
-         ),
-         (379...382)
-       ),
-       (379...382)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/indented_file_end.txt b/test/yarp/snapshots/indented_file_end.txt
deleted file mode 100644
index 513a7ab0f5ba48..00000000000000
--- a/test/yarp/snapshots/indented_file_end.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-ProgramNode(4...23)(
-  [],
-  StatementsNode(4...23)(
-    [DefNode(4...23)(
-       (8...10),
-       nil,
-       nil,
-       nil,
-       [],
-       (4...7),
-       nil,
-       nil,
-       nil,
-       nil,
-       (20...23)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/integer_operations.txt b/test/yarp/snapshots/integer_operations.txt
deleted file mode 100644
index 5cade8a7d5bde8..00000000000000
--- a/test/yarp/snapshots/integer_operations.txt
+++ /dev/null
@@ -1,383 +0,0 @@
-ProgramNode(0...247)(
-  [],
-  StatementsNode(0...247)(
-    [CallNode(0...2)(
-       IntegerNode(1...2)(),
-       nil,
-       (0...1),
-       nil,
-       nil,
-       nil,
-       nil,
-       0,
-       "!"
-     ),
-     CallNode(4...6)(
-       IntegerNode(5...6)(),
-       nil,
-       (4...5),
-       nil,
-       nil,
-       nil,
-       nil,
-       0,
-       "~"
-     ),
-     CallNode(8...14)(
-       IntegerNode(8...9)(),
-       nil,
-       (10...12),
-       nil,
-       ArgumentsNode(13...14)([IntegerNode(13...14)()]),
-       nil,
-       nil,
-       0,
-       "!="
-     ),
-     CallNode(16...22)(
-       IntegerNode(16...17)(),
-       nil,
-       (18...20),
-       nil,
-       ArgumentsNode(21...22)([IntegerNode(21...22)()]),
-       nil,
-       nil,
-       0,
-       "!~"
-     ),
-     CallNode(24...29)(
-       IntegerNode(24...25)(),
-       nil,
-       (26...27),
-       nil,
-       ArgumentsNode(28...29)([IntegerNode(28...29)()]),
-       nil,
-       nil,
-       0,
-       "%"
-     ),
-     CallNode(31...36)(
-       IntegerNode(31...32)(),
-       nil,
-       (33...34),
-       nil,
-       ArgumentsNode(35...36)([IntegerNode(35...36)()]),
-       nil,
-       nil,
-       0,
-       "&"
-     ),
-     CallNode(38...43)(
-       IntegerNode(38...39)(),
-       nil,
-       (40...41),
-       nil,
-       ArgumentsNode(42...43)([IntegerNode(42...43)()]),
-       nil,
-       nil,
-       0,
-       "*"
-     ),
-     CallNode(45...49)(
-       IntegerNode(45...46)(),
-       nil,
-       (46...48),
-       nil,
-       ArgumentsNode(48...49)([IntegerNode(48...49)()]),
-       nil,
-       nil,
-       0,
-       "**"
-     ),
-     CallNode(51...56)(
-       IntegerNode(51...52)(),
-       nil,
-       (53...54),
-       nil,
-       ArgumentsNode(55...56)([IntegerNode(55...56)()]),
-       nil,
-       nil,
-       0,
-       "+"
-     ),
-     CallNode(58...63)(
-       IntegerNode(58...59)(),
-       nil,
-       (60...61),
-       nil,
-       ArgumentsNode(62...63)([IntegerNode(62...63)()]),
-       nil,
-       nil,
-       0,
-       "-"
-     ),
-     CallNode(65...70)(
-       IntegerNode(65...66)(),
-       nil,
-       (67...68),
-       nil,
-       ArgumentsNode(69...70)([IntegerNode(69...70)()]),
-       nil,
-       nil,
-       0,
-       "/"
-     ),
-     CallNode(72...77)(
-       CallNode(72...75)(
-         IntegerNode(72...73)(),
-         nil,
-         (73...74),
-         nil,
-         ArgumentsNode(74...75)([IntegerNode(74...75)()]),
-         nil,
-         nil,
-         0,
-         "/"
-       ),
-       nil,
-       (75...76),
-       nil,
-       ArgumentsNode(76...77)([IntegerNode(76...77)()]),
-       nil,
-       nil,
-       0,
-       "/"
-     ),
-     CallNode(79...84)(
-       IntegerNode(79...80)(),
-       nil,
-       (81...82),
-       nil,
-       ArgumentsNode(83...84)([IntegerNode(83...84)()]),
-       nil,
-       nil,
-       0,
-       "<"
-     ),
-     CallNode(86...92)(
-       IntegerNode(86...87)(),
-       nil,
-       (88...90),
-       nil,
-       ArgumentsNode(91...92)([IntegerNode(91...92)()]),
-       nil,
-       nil,
-       0,
-       "<<"
-     ),
-     CallNode(94...100)(
-       IntegerNode(94...95)(),
-       nil,
-       (96...98),
-       nil,
-       ArgumentsNode(99...100)([IntegerNode(99...100)()]),
-       nil,
-       nil,
-       0,
-       "<="
-     ),
-     CallNode(102...109)(
-       IntegerNode(102...103)(),
-       nil,
-       (104...107),
-       nil,
-       ArgumentsNode(108...109)([IntegerNode(108...109)()]),
-       nil,
-       nil,
-       0,
-       "<=>"
-     ),
-     CallNode(111...117)(
-       IntegerNode(111...112)(),
-       nil,
-       (113...115),
-       nil,
-       ArgumentsNode(116...117)([IntegerNode(116...117)()]),
-       nil,
-       nil,
-       0,
-       "=="
-     ),
-     CallNode(119...126)(
-       IntegerNode(119...120)(),
-       nil,
-       (121...124),
-       nil,
-       ArgumentsNode(125...126)([IntegerNode(125...126)()]),
-       nil,
-       nil,
-       0,
-       "==="
-     ),
-     CallNode(128...134)(
-       IntegerNode(128...129)(),
-       nil,
-       (130...132),
-       nil,
-       ArgumentsNode(133...134)([IntegerNode(133...134)()]),
-       nil,
-       nil,
-       0,
-       "=~"
-     ),
-     CallNode(136...141)(
-       IntegerNode(136...137)(),
-       nil,
-       (138...139),
-       nil,
-       ArgumentsNode(140...141)([IntegerNode(140...141)()]),
-       nil,
-       nil,
-       0,
-       ">"
-     ),
-     CallNode(143...149)(
-       IntegerNode(143...144)(),
-       nil,
-       (145...147),
-       nil,
-       ArgumentsNode(148...149)([IntegerNode(148...149)()]),
-       nil,
-       nil,
-       0,
-       ">="
-     ),
-     CallNode(151...157)(
-       IntegerNode(151...152)(),
-       nil,
-       (153...155),
-       nil,
-       ArgumentsNode(156...157)([IntegerNode(156...157)()]),
-       nil,
-       nil,
-       0,
-       ">>"
-     ),
-     CallNode(159...164)(
-       IntegerNode(159...160)(),
-       nil,
-       (161...162),
-       nil,
-       ArgumentsNode(163...164)([IntegerNode(163...164)()]),
-       nil,
-       nil,
-       0,
-       "^"
-     ),
-     CallNode(166...171)(
-       IntegerNode(166...167)(),
-       nil,
-       (168...169),
-       nil,
-       ArgumentsNode(170...171)([IntegerNode(170...171)()]),
-       nil,
-       nil,
-       0,
-       "|"
-     ),
-     AndNode(173...179)(
-       IntegerNode(173...174)(),
-       IntegerNode(178...179)(),
-       (175...177)
-     ),
-     AndNode(181...188)(
-       IntegerNode(181...182)(),
-       IntegerNode(187...188)(),
-       (183...186)
-     ),
-     CallNode(190...200)(
-       IntegerNode(190...191)(),
-       nil,
-       (192...193),
-       nil,
-       ArgumentsNode(194...200)(
-         [CallNode(194...200)(
-            IntegerNode(194...195)(),
-            nil,
-            (196...198),
-            nil,
-            ArgumentsNode(199...200)([IntegerNode(199...200)()]),
-            nil,
-            nil,
-            0,
-            "**"
-          )]
-       ),
-       nil,
-       nil,
-       0,
-       "*"
-     ),
-     CallNode(202...211)(
-       CallNode(202...207)(
-         IntegerNode(202...203)(),
-         nil,
-         (204...205),
-         nil,
-         ArgumentsNode(206...207)([IntegerNode(206...207)()]),
-         nil,
-         nil,
-         0,
-         "*"
-       ),
-       nil,
-       (208...209),
-       nil,
-       ArgumentsNode(210...211)([IntegerNode(210...211)()]),
-       nil,
-       nil,
-       0,
-       "+"
-     ),
-     OrNode(213...219)(
-       IntegerNode(213...214)(),
-       IntegerNode(218...219)(),
-       (215...217)
-     ),
-     OrNode(221...227)(
-       IntegerNode(221...222)(),
-       IntegerNode(226...227)(),
-       (223...225)
-     ),
-     CallNode(229...238)(
-       IntegerNode(229...230)(),
-       nil,
-       (231...232),
-       nil,
-       ArgumentsNode(233...238)(
-         [CallNode(233...238)(
-            IntegerNode(233...234)(),
-            nil,
-            (235...236),
-            nil,
-            ArgumentsNode(237...238)([IntegerNode(237...238)()]),
-            nil,
-            nil,
-            0,
-            "*"
-          )]
-       ),
-       nil,
-       nil,
-       0,
-       "+"
-     ),
-     ParenthesesNode(240...247)(
-       StatementsNode(241...246)(
-         [CallNode(241...246)(
-            IntegerNode(241...242)(),
-            nil,
-            (243...244),
-            nil,
-            ArgumentsNode(245...246)([IntegerNode(245...246)()]),
-            nil,
-            nil,
-            0,
-            "+"
-          )]
-       ),
-       (240...241),
-       (246...247)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/keyword_method_names.txt b/test/yarp/snapshots/keyword_method_names.txt
deleted file mode 100644
index 37fc09d0affd6e..00000000000000
--- a/test/yarp/snapshots/keyword_method_names.txt
+++ /dev/null
@@ -1,143 +0,0 @@
-ProgramNode(0...185)(
-  [],
-  StatementsNode(0...185)(
-    [DefNode(0...11)(
-       (4...7),
-       nil,
-       nil,
-       nil,
-       [],
-       (0...3),
-       nil,
-       nil,
-       nil,
-       nil,
-       (8...11)
-     ),
-     DefNode(13...32)(
-       (22...28),
-       SelfNode(17...21)(),
-       nil,
-       nil,
-       [],
-       (13...16),
-       (21...22),
-       nil,
-       nil,
-       nil,
-       (29...32)
-     ),
-     CallNode(34...68)(
-       nil,
-       nil,
-       (34...41),
-       nil,
-       ArgumentsNode(42...68)(
-         [DefNode(42...68)(
-            (46...49),
-            nil,
-            nil,
-            StatementsNode(52...64)(
-              [CallNode(52...64)(
-                 nil,
-                 nil,
-                 (52...55),
-                 nil,
-                 nil,
-                 nil,
-                 BlockNode(56...64)([], nil, nil, (56...58), (61...64)),
-                 0,
-                 "bar"
-               )]
-            ),
-            [],
-            (42...45),
-            nil,
-            nil,
-            nil,
-            nil,
-            (65...68)
-          )]
-       ),
-       nil,
-       nil,
-       0,
-       "private"
-     ),
-     DefNode(70...89)(
-       (74...75),
-       nil,
-       ParametersNode(76...84)(
-         [RequiredParameterNode(76...77)(:a)],
-         [],
-         [],
-         nil,
-         [],
-         NoKeywordsParameterNode(79...84)((79...81), (81...84)),
-         nil
-       ),
-       nil,
-       [:a],
-       (70...73),
-       nil,
-       (75...76),
-       (84...85),
-       nil,
-       (86...89)
-     ),
-     DefNode(91...113)(
-       (108...109),
-       SourceEncodingNode(95...107)(),
-       nil,
-       nil,
-       [],
-       (91...94),
-       (107...108),
-       nil,
-       nil,
-       nil,
-       (110...113)
-     ),
-     StringNode(115...121)((115...117), (117...120), (120...121), "abc"),
-     StringNode(123...129)((123...125), (125...128), (128...129), "abc"),
-     DefNode(131...149)(
-       (144...145),
-       SourceFileNode(135...143)("keyword_method_names.txt"),
-       nil,
-       nil,
-       [],
-       (131...134),
-       (143...144),
-       nil,
-       nil,
-       nil,
-       (146...149)
-     ),
-     DefNode(151...169)(
-       (164...165),
-       SourceLineNode(155...163)(),
-       nil,
-       nil,
-       [],
-       (151...154),
-       (163...164),
-       nil,
-       nil,
-       nil,
-       (166...169)
-     ),
-     DefNode(171...185)(
-       (180...181),
-       NilNode(175...178)(),
-       nil,
-       nil,
-       [],
-       (171...174),
-       (178...180),
-       nil,
-       nil,
-       nil,
-       (182...185)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/keywords.txt b/test/yarp/snapshots/keywords.txt
deleted file mode 100644
index c949b291aa2d9b..00000000000000
--- a/test/yarp/snapshots/keywords.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-ProgramNode(0...51)(
-  [],
-  StatementsNode(0...51)(
-    [RedoNode(0...4)(),
-     RetryNode(6...11)(),
-     SelfNode(13...17)(),
-     SourceEncodingNode(19...31)(),
-     SourceFileNode(33...41)("keywords.txt"),
-     SourceLineNode(43...51)()]
-  )
-)
diff --git a/test/yarp/snapshots/lambda.txt b/test/yarp/snapshots/lambda.txt
deleted file mode 100644
index 6640b585c32140..00000000000000
--- a/test/yarp/snapshots/lambda.txt
+++ /dev/null
@@ -1,185 +0,0 @@
-ProgramNode(0...92)(
-  [],
-  StatementsNode(0...92)(
-    [LambdaNode(0...14)(
-       [:foo],
-       (0...2),
-       (12...13),
-       (13...14),
-       BlockParametersNode(2...11)(
-         ParametersNode(6...9)(
-           [RequiredParameterNode(6...9)(:foo)],
-           [],
-           [],
-           nil,
-           [],
-           nil,
-           nil
-         ),
-         [],
-         (2...3),
-         (10...11)
-       ),
-       nil
-     ),
-     LambdaNode(16...34)(
-       [:x],
-       (16...18),
-       (31...32),
-       (33...34),
-       BlockParametersNode(18...30)(
-         ParametersNode(19...29)(
-           [],
-           [],
-           [],
-           nil,
-           [KeywordParameterNode(19...29)(
-              (19...21),
-              InterpolatedStringNode(22...29)(
-                (22...23),
-                [StringNode(23...24)(nil, (23...24), nil, "b"),
-                 EmbeddedStatementsNode(24...28)(
-                   (24...26),
-                   StatementsNode(26...27)(
-                     [CallNode(26...27)(
-                        nil,
-                        nil,
-                        (26...27),
-                        nil,
-                        nil,
-                        nil,
-                        nil,
-                        2,
-                        "a"
-                      )]
-                   ),
-                   (27...28)
-                 )],
-                (28...29)
-              )
-            )],
-           nil,
-           nil
-         ),
-         [],
-         (18...19),
-         (29...30)
-       ),
-       nil
-     ),
-     LambdaNode(36...51)(
-       [:a],
-       (36...38),
-       (49...50),
-       (50...51),
-       BlockParametersNode(38...48)(
-         ParametersNode(39...47)(
-           [],
-           [],
-           [],
-           nil,
-           [KeywordParameterNode(39...47)(
-              (39...41),
-              CallNode(42...47)(
-                CallNode(42...43)(
-                  nil,
-                  nil,
-                  (42...43),
-                  nil,
-                  nil,
-                  nil,
-                  nil,
-                  2,
-                  "b"
-                ),
-                nil,
-                (44...45),
-                nil,
-                ArgumentsNode(46...47)([IntegerNode(46...47)()]),
-                nil,
-                nil,
-                0,
-                "*"
-              )
-            )],
-           nil,
-           nil
-         ),
-         [],
-         (38...39),
-         (47...48)
-       ),
-       nil
-     ),
-     LambdaNode(53...72)(
-       [:foo],
-       (53...55),
-       (66...68),
-       (69...72),
-       BlockParametersNode(56...65)(
-         ParametersNode(56...65)(
-           [],
-           [OptionalParameterNode(56...65)(
-              :foo,
-              (56...59),
-              (60...61),
-              CallNode(62...65)(
-                nil,
-                nil,
-                (62...65),
-                nil,
-                nil,
-                nil,
-                nil,
-                2,
-                "bar"
-              )
-            )],
-           [],
-           nil,
-           [],
-           nil,
-           nil
-         ),
-         [],
-         nil,
-         nil
-       ),
-       nil
-     ),
-     LambdaNode(74...92)(
-       [:foo],
-       (74...76),
-       (86...88),
-       (89...92),
-       BlockParametersNode(77...85)(
-         ParametersNode(77...85)(
-           [],
-           [],
-           [],
-           nil,
-           [KeywordParameterNode(77...85)(
-              (77...81),
-              CallNode(82...85)(
-                nil,
-                nil,
-                (82...85),
-                nil,
-                nil,
-                nil,
-                nil,
-                2,
-                "bar"
-              )
-            )],
-           nil,
-           nil
-         ),
-         [],
-         nil,
-         nil
-       ),
-       nil
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/method_calls.txt b/test/yarp/snapshots/method_calls.txt
deleted file mode 100644
index f320ab86feed20..00000000000000
--- a/test/yarp/snapshots/method_calls.txt
+++ /dev/null
@@ -1,1658 +0,0 @@
-ProgramNode(0...1237)(
-  [],
-  StatementsNode(0...1237)(
-    [CallNode(0...14)(
-       CallNode(0...3)(nil, nil, (0...3), nil, nil, nil, nil, 2, "foo"),
-       (3...4),
-       (4...7),
-       nil,
-       ArgumentsNode(8...14)(
-         [StringNode(8...14)((8...10), (10...13), (13...14), "baz")]
-       ),
-       nil,
-       nil,
-       0,
-       "bar"
-     ),
-     CallNode(16...25)(
-       CallNode(16...17)(nil, nil, (16...17), nil, nil, nil, nil, 2, "a"),
-       (17...18),
-       (18...19),
-       (19...20),
-       ArgumentsNode(20...24)(
-         [CallNode(20...21)(nil, nil, (20...21), nil, nil, nil, nil, 2, "c"),
-          CallNode(23...24)(nil, nil, (23...24), nil, nil, nil, nil, 2, "d")]
-       ),
-       (24...25),
-       nil,
-       0,
-       "b"
-     ),
-     CallNode(27...32)(
-       CallNode(27...28)(nil, nil, (27...28), nil, nil, nil, nil, 2, "a"),
-       (28...29),
-       (29...30),
-       (30...31),
-       nil,
-       (31...32),
-       nil,
-       0,
-       "b"
-     ),
-     CallNode(34...52)(
-       CallNode(34...44)(
-         CallNode(34...37)(nil, nil, (34...37), nil, nil, nil, nil, 2, "foo"),
-         (40...41),
-         (41...44),
-         nil,
-         nil,
-         nil,
-         nil,
-         0,
-         "bar"
-       ),
-       (47...49),
-       (49...52),
-       nil,
-       nil,
-       nil,
-       nil,
-       1,
-       "baz"
-     ),
-     CallNode(54...56)(nil, nil, (54...56), nil, nil, nil, nil, 0, "a!"),
-     CallNode(58...62)(
-       CallNode(58...59)(nil, nil, (58...59), nil, nil, nil, nil, 2, "a"),
-       (59...60),
-       nil,
-       (60...61),
-       nil,
-       (61...62),
-       nil,
-       0,
-       "call"
-     ),
-     CallNode(64...75)(
-       CallNode(64...65)(nil, nil, (64...65), nil, nil, nil, nil, 2, "a"),
-       (65...66),
-       nil,
-       (66...67),
-       ArgumentsNode(67...74)(
-         [IntegerNode(67...68)(),
-          IntegerNode(70...71)(),
-          IntegerNode(73...74)()]
-       ),
-       (74...75),
-       nil,
-       0,
-       "call"
-     ),
-     CallNode(77...81)(
-       CallNode(77...78)(nil, nil, (77...78), nil, nil, nil, nil, 2, "a"),
-       (78...80),
-       (80...81),
-       nil,
-       nil,
-       nil,
-       nil,
-       0,
-       "b"
-     ),
-     CallNode(83...89)(
-       CallNode(83...84)(nil, nil, (83...84), nil, nil, nil, nil, 2, "a"),
-       (84...86),
-       (86...87),
-       nil,
-       ArgumentsNode(88...89)(
-         [CallNode(88...89)(nil, nil, (88...89), nil, nil, nil, nil, 2, "c")]
-       ),
-       nil,
-       nil,
-       0,
-       "b"
-     ),
-     CallNode(91...102)(
-       CallNode(91...94)(nil, nil, (91...94), nil, nil, nil, nil, 2, "foo"),
-       (94...95),
-       (95...98),
-       nil,
-       ArgumentsNode(101...102)([IntegerNode(101...102)()]),
-       nil,
-       nil,
-       0,
-       "bar="
-     ),
-     CallNode(104...106)(nil, nil, (104...106), nil, nil, nil, nil, 0, "a?"),
-     CallNode(108...117)(
-       nil,
-       nil,
-       (108...109),
-       (109...110),
-       ArgumentsNode(110...116)(
-         [BlockArgumentNode(110...116)(
-            CallNode(111...116)(
-              nil,
-              nil,
-              (111...116),
-              nil,
-              nil,
-              nil,
-              nil,
-              2,
-              "block"
-            ),
-            (110...111)
-          )]
-       ),
-       (116...117),
-       nil,
-       0,
-       "a"
-     ),
-     CallNode(119...130)(
-       nil,
-       nil,
-       (119...120),
-       (120...121),
-       ArgumentsNode(121...129)(
-         [KeywordHashNode(121...129)(
-            [AssocSplatNode(121...129)(
-               CallNode(123...129)(
-                 nil,
-                 nil,
-                 (123...129),
-                 nil,
-                 nil,
-                 nil,
-                 nil,
-                 2,
-                 "kwargs"
-               ),
-               (121...123)
-             )]
-          )]
-       ),
-       (129...130),
-       nil,
-       0,
-       "a"
-     ),
-     CallNode(132...137)(
-       CallNode(132...135)(
-         CallNode(132...133)(
-           nil,
-           nil,
-           (132...133),
-           nil,
-           nil,
-           nil,
-           nil,
-           2,
-           "a"
-         ),
-         (133...134),
-         (134...135),
-         nil,
-         nil,
-         nil,
-         nil,
-         0,
-         "b"
-       ),
-       (135...136),
-       (136...137),
-       nil,
-       nil,
-       nil,
-       nil,
-       0,
-       "c"
-     ),
-     CallNode(139...146)(
-       nil,
-       nil,
-       (139...140),
-       (140...141),
-       ArgumentsNode(141...145)(
-         [CallNode(141...142)(
-            nil,
-            nil,
-            (141...142),
-            nil,
-            nil,
-            nil,
-            nil,
-            2,
-            "b"
-          ),
-          CallNode(144...145)(
-            nil,
-            nil,
-            (144...145),
-            nil,
-            nil,
-            nil,
-            nil,
-            2,
-            "c"
-          )]
-       ),
-       (145...146),
-       nil,
-       0,
-       "a"
-     ),
-     CallNode(148...151)(
-       nil,
-       nil,
-       (148...149),
-       (149...150),
-       nil,
-       (150...151),
-       nil,
-       0,
-       "a"
-     ),
-     CallNode(153...161)(
-       nil,
-       nil,
-       (153...154),
-       (154...155),
-       ArgumentsNode(155...160)(
-         [SplatNode(155...160)(
-            (155...156),
-            CallNode(156...160)(
-              nil,
-              nil,
-              (156...160),
-              nil,
-              nil,
-              nil,
-              nil,
-              2,
-              "args"
-            )
-          )]
-       ),
-       (160...161),
-       nil,
-       0,
-       "a"
-     ),
-     CallNode(163...169)(
-       nil,
-       nil,
-       (163...164),
-       nil,
-       ArgumentsNode(165...169)(
-         [CallNode(165...166)(
-            nil,
-            nil,
-            (165...166),
-            nil,
-            nil,
-            nil,
-            nil,
-            2,
-            "b"
-          ),
-          CallNode(168...169)(
-            nil,
-            nil,
-            (168...169),
-            nil,
-            nil,
-            nil,
-            nil,
-            2,
-            "c"
-          )]
-       ),
-       nil,
-       nil,
-       0,
-       "a"
-     ),
-     CallNode(171...179)(
-       CallNode(171...172)(nil, nil, (171...172), nil, nil, nil, nil, 2, "a"),
-       (172...173),
-       (173...174),
-       nil,
-       ArgumentsNode(175...179)(
-         [CallNode(175...176)(
-            nil,
-            nil,
-            (175...176),
-            nil,
-            nil,
-            nil,
-            nil,
-            2,
-            "c"
-          ),
-          CallNode(178...179)(
-            nil,
-            nil,
-            (178...179),
-            nil,
-            nil,
-            nil,
-            nil,
-            2,
-            "d"
-          )]
-       ),
-       nil,
-       nil,
-       0,
-       "b"
-     ),
-     MultiWriteNode(181...204)(
-       [CallNode(181...188)(
-          CallNode(181...184)(
-            nil,
-            nil,
-            (181...184),
-            nil,
-            nil,
-            nil,
-            nil,
-            2,
-            "foo"
-          ),
-          (184...185),
-          (185...188),
-          nil,
-          nil,
-          nil,
-          nil,
-          0,
-          "foo="
-        ),
-        CallNode(190...197)(
-          CallNode(190...193)(
-            nil,
-            nil,
-            (190...193),
-            nil,
-            nil,
-            nil,
-            nil,
-            2,
-            "bar"
-          ),
-          (193...194),
-          (194...197),
-          nil,
-          nil,
-          nil,
-          nil,
-          0,
-          "bar="
-        )],
-       (198...199),
-       ArrayNode(200...204)(
-         [IntegerNode(200...201)(), IntegerNode(203...204)()],
-         nil,
-         nil
-       ),
-       nil,
-       nil
-     ),
-     CallNode(206...210)(
-       CallNode(206...207)(nil, nil, (206...207), nil, nil, nil, nil, 2, "a"),
-       (207...209),
-       (209...210),
-       nil,
-       nil,
-       nil,
-       nil,
-       1,
-       "b"
-     ),
-     CallNode(212...217)(
-       CallNode(212...213)(nil, nil, (212...213), nil, nil, nil, nil, 2, "a"),
-       (213...215),
-       nil,
-       (215...216),
-       nil,
-       (216...217),
-       nil,
-       1,
-       "call"
-     ),
-     CallNode(219...226)(
-       CallNode(219...220)(nil, nil, (219...220), nil, nil, nil, nil, 2, "a"),
-       (220...222),
-       (222...223),
-       (223...224),
-       ArgumentsNode(224...225)(
-         [CallNode(224...225)(
-            nil,
-            nil,
-            (224...225),
-            nil,
-            nil,
-            nil,
-            nil,
-            2,
-            "c"
-          )]
-       ),
-       (225...226),
-       nil,
-       1,
-       "b"
-     ),
-     CallNode(228...234)(
-       CallNode(228...229)(nil, nil, (228...229), nil, nil, nil, nil, 2, "a"),
-       (229...231),
-       (231...232),
-       (232...233),
-       nil,
-       (233...234),
-       nil,
-       1,
-       "b"
-     ),
-     IfNode(236...269)(
-       (247...249),
-       AndNode(250...269)(
-         OrNode(250...261)(
-           CallNode(250...254)(
-             nil,
-             nil,
-             (250...254),
-             nil,
-             nil,
-             nil,
-             nil,
-             0,
-             "bar?"
-           ),
-           CallNode(258...261)(
-             nil,
-             nil,
-             (258...261),
-             nil,
-             nil,
-             nil,
-             nil,
-             2,
-             "baz"
-           ),
-           (255...257)
-         ),
-         CallNode(266...269)(
-           nil,
-           nil,
-           (266...269),
-           nil,
-           nil,
-           nil,
-           nil,
-           2,
-           "qux"
-         ),
-         (262...265)
-       ),
-       StatementsNode(236...246)(
-         [CallNode(236...246)(
-            nil,
-            nil,
-            (236...239),
-            nil,
-            ArgumentsNode(240...246)(
-              [SymbolNode(240...242)((240...241), (241...242), nil, "a"),
-               SymbolNode(244...246)((244...245), (245...246), nil, "b")]
-            ),
-            nil,
-            nil,
-            0,
-            "foo"
-          )]
-       ),
-       nil,
-       nil
-     ),
-     CallNode(271...286)(
-       nil,
-       nil,
-       (271...274),
-       (274...275),
-       ArgumentsNode(275...284)(
-         [SymbolNode(275...277)((275...276), (276...277), nil, "a"),
-          SymbolNode(282...284)((282...283), (283...284), nil, "b")]
-       ),
-       (285...286),
-       nil,
-       0,
-       "foo"
-     ),
-     CallNode(288...298)(
-       nil,
-       nil,
-       (288...291),
-       (291...292),
-       ArgumentsNode(292...297)(
-         [SplatNode(292...297)(
-            (292...293),
-            CallNode(293...297)(
-              nil,
-              nil,
-              (293...297),
-              nil,
-              nil,
-              nil,
-              nil,
-              2,
-              "rest"
-            )
-          )]
-       ),
-       (297...298),
-       nil,
-       0,
-       "foo"
-     ),
-     CallNode(300...340)(
-       nil,
-       nil,
-       (300...303),
-       (303...304),
-       ArgumentsNode(304...339)(
-         [SymbolNode(304...306)((304...305), (305...306), nil, "a"),
-          KeywordHashNode(308...332)(
-            [AssocNode(308...322)(
-               SymbolNode(308...310)((308...309), (309...310), nil, "h"),
-               ArrayNode(314...322)(
-                 [SymbolNode(315...317)((315...316), (316...317), nil, "x"),
-                  SymbolNode(319...321)((319...320), (320...321), nil, "y")],
-                 (314...315),
-                 (321...322)
-               ),
-               (311...313)
-             ),
-             AssocNode(324...332)(
-               SymbolNode(324...326)((324...325), (325...326), nil, "a"),
-               SymbolNode(330...332)((330...331), (331...332), nil, "b"),
-               (327...329)
-             )]
-          ),
-          BlockArgumentNode(334...339)(
-            SymbolNode(335...339)((335...336), (336...339), nil, "bar"),
-            (334...335)
-          )]
-       ),
-       (339...340),
-       nil,
-       0,
-       "foo"
-     ),
-     CallNode(342...391)(
-       nil,
-       nil,
-       (342...344),
-       nil,
-       ArgumentsNode(345...391)(
-         [IntegerNode(345...348)(),
-          HashNode(350...391)(
-            (350...351),
-            [AssocNode(352...369)(
-               SymbolNode(352...358)((352...353), (353...358), nil, "there"),
-               SymbolNode(362...369)((362...363), (363...369), nil, "friend"),
-               (359...361)
-             ),
-             AssocSplatNode(371...375)(
-               HashNode(373...375)((373...374), [], (374...375)),
-               (371...373)
-             ),
-             AssocNode(377...389)(
-               SymbolNode(377...384)(nil, (377...383), (383...384), "whatup"),
-               SymbolNode(385...389)((385...386), (386...389), nil, "dog"),
-               nil
-             )],
-            (390...391)
-          )]
-       ),
-       nil,
-       nil,
-       0,
-       "hi"
-     ),
-     CallNode(393...429)(
-       nil,
-       nil,
-       (393...396),
-       nil,
-       ArgumentsNode(397...408)(
-         [SymbolNode(397...399)((397...398), (398...399), nil, "a"),
-          KeywordHashNode(401...408)(
-            [AssocNode(401...408)(
-               SymbolNode(401...403)(nil, (401...402), (402...403), "b"),
-               TrueNode(404...408)(),
-               nil
-             )]
-          )]
-       ),
-       nil,
-       BlockNode(409...429)(
-         [:a, :b],
-         BlockParametersNode(412...418)(
-           ParametersNode(413...417)(
-             [RequiredParameterNode(413...414)(:a),
-              RequiredParameterNode(416...417)(:b)],
-             [],
-             [],
-             nil,
-             [],
-             nil,
-             nil
-           ),
-           [],
-           (412...413),
-           (417...418)
-         ),
-         StatementsNode(419...425)(
-           [CallNode(419...425)(
-              nil,
-              nil,
-              (419...423),
-              nil,
-              ArgumentsNode(424...425)(
-                [LocalVariableReadNode(424...425)(:a, 0)]
-              ),
-              nil,
-              nil,
-              0,
-              "puts"
-            )]
-         ),
-         (409...411),
-         (426...429)
-       ),
-       0,
-       "foo"
-     ),
-     CallNode(431...448)(
-       nil,
-       nil,
-       (431...433),
-       nil,
-       ArgumentsNode(434...448)(
-         [KeywordHashNode(434...448)(
-            [AssocNode(434...448)(
-               SymbolNode(434...440)(nil, (434...439), (439...440), "there"),
-               SymbolNode(441...448)((441...442), (442...448), nil, "friend"),
-               nil
-             )]
-          )]
-       ),
-       nil,
-       nil,
-       0,
-       "hi"
-     ),
-     CallNode(450...490)(
-       nil,
-       nil,
-       (450...452),
-       nil,
-       ArgumentsNode(453...490)(
-         [KeywordHashNode(453...490)(
-            [AssocNode(453...470)(
-               SymbolNode(453...459)((453...454), (454...459), nil, "there"),
-               SymbolNode(463...470)((463...464), (464...470), nil, "friend"),
-               (460...462)
-             ),
-             AssocSplatNode(472...476)(
-               HashNode(474...476)((474...475), [], (475...476)),
-               (472...474)
-             ),
-             AssocNode(478...490)(
-               SymbolNode(478...485)(nil, (478...484), (484...485), "whatup"),
-               SymbolNode(486...490)((486...487), (487...490), nil, "dog"),
-               nil
-             )]
-          )]
-       ),
-       nil,
-       nil,
-       0,
-       "hi"
-     ),
-     CallNode(492...533)(
-       nil,
-       nil,
-       (492...494),
-       (494...495),
-       ArgumentsNode(495...532)(
-         [KeywordHashNode(495...532)(
-            [AssocNode(495...512)(
-               SymbolNode(495...501)((495...496), (496...501), nil, "there"),
-               SymbolNode(505...512)((505...506), (506...512), nil, "friend"),
-               (502...504)
-             ),
-             AssocSplatNode(514...518)(
-               HashNode(516...518)((516...517), [], (517...518)),
-               (514...516)
-             ),
-             AssocNode(520...532)(
-               SymbolNode(520...527)(nil, (520...526), (526...527), "whatup"),
-               SymbolNode(528...532)((528...529), (529...532), nil, "dog"),
-               nil
-             )]
-          )]
-       ),
-       (532...533),
-       nil,
-       0,
-       "hi"
-     ),
-     CallNode(535...571)(
-       nil,
-       nil,
-       (535...538),
-       (538...539),
-       ArgumentsNode(539...570)(
-         [HashNode(539...561)(
-            (539...540),
-            [AssocNode(541...548)(
-               SymbolNode(541...543)(nil, (541...542), (542...543), "a"),
-               TrueNode(544...548)(),
-               nil
-             ),
-             AssocNode(550...558)(
-               SymbolNode(550...552)(nil, (550...551), (551...552), "b"),
-               FalseNode(553...558)(),
-               nil
-             )],
-            (560...561)
-          ),
-          BlockArgumentNode(563...570)(
-            SymbolNode(564...570)((564...565), (565...570), nil, "block"),
-            (563...564)
-          )]
-       ),
-       (570...571),
-       nil,
-       0,
-       "foo"
-     ),
-     CallNode(573...593)(
-       nil,
-       nil,
-       (573...575),
-       nil,
-       ArgumentsNode(576...593)(
-         [KeywordHashNode(576...593)(
-            [AssocNode(576...593)(
-               SymbolNode(576...582)((576...577), (577...582), nil, "there"),
-               SymbolNode(586...593)((586...587), (587...593), nil, "friend"),
-               (583...585)
-             )]
-          )]
-       ),
-       nil,
-       nil,
-       0,
-       "hi"
-     ),
-     CallNode(595...608)(
-       nil,
-       nil,
-       (595...598),
-       (598...599),
-       ArgumentsNode(599...605)(
-         [SymbolNode(599...601)((599...600), (600...601), nil, "a"),
-          SymbolNode(603...605)((603...604), (604...605), nil, "b")]
-       ),
-       (607...608),
-       nil,
-       0,
-       "foo"
-     ),
-     CallNode(610...627)(
-       nil,
-       nil,
-       (610...613),
-       (613...614),
-       ArgumentsNode(615...624)(
-         [SymbolNode(615...617)((615...616), (616...617), nil, "a"),
-          KeywordHashNode(619...624)(
-            [AssocNode(619...624)(
-               SymbolNode(619...621)(nil, (619...620), (620...621), "b"),
-               SymbolNode(622...624)((622...623), (623...624), nil, "c"),
-               nil
-             )]
-          )]
-       ),
-       (626...627),
-       nil,
-       0,
-       "foo"
-     ),
-     CallNode(629...640)(
-       nil,
-       nil,
-       (629...632),
-       nil,
-       ArgumentsNode(633...640)(
-         [BlockArgumentNode(633...640)(
-            SymbolNode(634...640)((634...635), (635...640), nil, "block"),
-            (633...634)
-          )]
-       ),
-       nil,
-       nil,
-       0,
-       "foo"
-     ),
-     CallNode(642...672)(
-       nil,
-       nil,
-       (642...645),
-       nil,
-       ArgumentsNode(646...672)(
-         [KeywordHashNode(646...663)(
-            [AssocNode(646...653)(
-               SymbolNode(646...648)(nil, (646...647), (647...648), "a"),
-               TrueNode(649...653)(),
-               nil
-             ),
-             AssocNode(655...663)(
-               SymbolNode(655...657)(nil, (655...656), (656...657), "b"),
-               FalseNode(658...663)(),
-               nil
-             )]
-          ),
-          BlockArgumentNode(665...672)(
-            SymbolNode(666...672)((666...667), (667...672), nil, "block"),
-            (665...666)
-          )]
-       ),
-       nil,
-       nil,
-       0,
-       "foo"
-     ),
-     CallNode(674...695)(
-       nil,
-       nil,
-       (674...683),
-       nil,
-       ArgumentsNode(684...695)(
-         [IntegerNode(684...685)(),
-          KeywordHashNode(687...695)(
-            [AssocNode(687...695)(
-               SymbolNode(687...693)(nil, (687...692), (692...693), "kwarg"),
-               IntegerNode(694...695)(),
-               nil
-             )]
-          )]
-       ),
-       nil,
-       nil,
-       0,
-       "some_func"
-     ),
-     CallNode(697...715)(
-       ConstantReadNode(697...703)(:Kernel),
-       (703...704),
-       (704...711),
-       (711...712),
-       ArgumentsNode(712...714)([IntegerNode(712...714)()]),
-       (714...715),
-       nil,
-       0,
-       "Integer"
-     ),
-     CallNode(717...727)(
-       CallNode(717...718)(nil, nil, (717...718), nil, nil, nil, nil, 2, "x"),
-       (718...719),
-       (719...723),
-       nil,
-       nil,
-       nil,
-       BlockNode(724...727)([], nil, nil, (724...725), (726...727)),
-       0,
-       "each"
-     ),
-     CallNode(729...743)(
-       CallNode(729...732)(
-         nil,
-         nil,
-         (729...732),
-         nil,
-         nil,
-         nil,
-         nil,
-         2,
-         "foo"
-       ),
-       (732...733),
-       (733...736),
-       nil,
-       nil,
-       nil,
-       BlockNode(737...743)(
-         [],
-         nil,
-         StatementsNode(739...741)([BackReferenceReadNode(739...741)()]),
-         (737...738),
-         (742...743)
-       ),
-       0,
-       "map"
-     ),
-     CallNode(745...757)(
-       ConstantPathNode(745...749)(
-         ConstantReadNode(745...746)(:A),
-         ConstantReadNode(748...749)(:B),
-         (746...748)
-       ),
-       (749...751),
-       (751...752),
-       nil,
-       ArgumentsNode(753...757)(
-         [SymbolNode(753...757)((753...754), (754...757), nil, "foo")]
-       ),
-       nil,
-       nil,
-       0,
-       "C"
-     ),
-     CallNode(759...772)(
-       ConstantPathNode(759...763)(
-         ConstantReadNode(759...760)(:A),
-         ConstantReadNode(762...763)(:B),
-         (760...762)
-       ),
-       (763...765),
-       (765...766),
-       (766...767),
-       ArgumentsNode(767...771)(
-         [SymbolNode(767...771)((767...768), (768...771), nil, "foo")]
-       ),
-       (771...772),
-       nil,
-       0,
-       "C"
-     ),
-     CallNode(774...791)(
-       ConstantPathNode(774...778)(
-         ConstantReadNode(774...775)(:A),
-         ConstantReadNode(777...778)(:B),
-         (775...777)
-       ),
-       (778...780),
-       (780...781),
-       (781...782),
-       ArgumentsNode(782...786)(
-         [SymbolNode(782...786)((782...783), (783...786), nil, "foo")]
-       ),
-       (786...787),
-       BlockNode(788...791)([], nil, nil, (788...789), (790...791)),
-       0,
-       "C"
-     ),
-     CallNode(793...805)(
-       nil,
-       nil,
-       (793...796),
-       (796...797),
-       ArgumentsNode(797...804)(
-         [KeywordHashNode(797...804)(
-            [AssocNode(797...804)(
-               SymbolNode(797...801)(
-                 (797...798),
-                 (798...799),
-                 (799...801),
-                 "a"
-               ),
-               IntegerNode(802...804)(),
-               nil
-             )]
-          )]
-       ),
-       (804...805),
-       nil,
-       0,
-       "foo"
-     ),
-     CallNode(807...835)(
-       nil,
-       nil,
-       (807...810),
-       nil,
-       ArgumentsNode(811...835)(
-         [KeywordHashNode(811...835)(
-            [AssocNode(811...835)(
-               SymbolNode(811...815)(nil, (811...814), (814...815), "bar"),
-               HashNode(816...835)(
-                 (816...817),
-                 [AssocNode(818...833)(
-                    SymbolNode(818...822)(
-                      nil,
-                      (818...821),
-                      (821...822),
-                      "baz"
-                    ),
-                    CallNode(823...833)(
-                      nil,
-                      nil,
-                      (823...826),
-                      nil,
-                      nil,
-                      nil,
-                      BlockNode(827...833)(
-                        [],
-                        nil,
-                        nil,
-                        (827...829),
-                        (830...833)
-                      ),
-                      0,
-                      "qux"
-                    ),
-                    nil
-                  )],
-                 (834...835)
-               ),
-               nil
-             )]
-          )]
-       ),
-       nil,
-       nil,
-       0,
-       "foo"
-     ),
-     CallNode(837...861)(
-       nil,
-       nil,
-       (837...840),
-       nil,
-       ArgumentsNode(841...861)(
-         [KeywordHashNode(841...861)(
-            [AssocNode(841...861)(
-               SymbolNode(841...845)(nil, (841...844), (844...845), "bar"),
-               HashNode(846...861)(
-                 (846...847),
-                 [AssocSplatNode(848...859)(
-                    CallNode(850...859)(
-                      nil,
-                      nil,
-                      (850...852),
-                      nil,
-                      nil,
-                      nil,
-                      BlockNode(853...859)(
-                        [],
-                        nil,
-                        nil,
-                        (853...855),
-                        (856...859)
-                      ),
-                      0,
-                      "kw"
-                    ),
-                    (848...850)
-                  )],
-                 (860...861)
-               ),
-               nil
-             )]
-          )]
-       ),
-       nil,
-       nil,
-       0,
-       "foo"
-     ),
-     CallNode(863...899)(
-       nil,
-       nil,
-       (863...866),
-       nil,
-       ArgumentsNode(867...892)(
-         [InterpolatedStringNode(867...892)(
-            (867...868),
-            [EmbeddedStatementsNode(868...891)(
-               (868...870),
-               StatementsNode(870...890)(
-                 [CallNode(870...890)(
-                    CallNode(870...873)(
-                      nil,
-                      nil,
-                      (870...873),
-                      nil,
-                      nil,
-                      nil,
-                      nil,
-                      2,
-                      "bar"
-                    ),
-                    (873...874),
-                    (874...877),
-                    nil,
-                    nil,
-                    nil,
-                    BlockNode(878...890)(
-                      [],
-                      nil,
-                      StatementsNode(881...886)(
-                        [StringNode(881...886)(
-                           (881...882),
-                           (882...885),
-                           (885...886),
-                           "baz"
-                         )]
-                      ),
-                      (878...880),
-                      (887...890)
-                    ),
-                    0,
-                    "map"
-                  )]
-               ),
-               (890...891)
-             )],
-            (891...892)
-          )]
-       ),
-       nil,
-       BlockNode(893...899)([], nil, nil, (893...895), (896...899)),
-       0,
-       "foo"
-     ),
-     CallNode(901...929)(
-       nil,
-       nil,
-       (901...904),
-       nil,
-       ArgumentsNode(905...929)(
-         [ClassNode(905...929)(
-            [],
-            (905...910),
-            ConstantReadNode(911...914)(:Bar),
-            nil,
-            nil,
-            StatementsNode(915...925)(
-              [CallNode(915...925)(
-                 nil,
-                 nil,
-                 (915...918),
-                 nil,
-                 nil,
-                 nil,
-                 BlockNode(919...925)([], nil, nil, (919...921), (922...925)),
-                 0,
-                 "baz"
-               )]
-            ),
-            (926...929),
-            :Bar,
-            :Bar
-          )]
-       ),
-       nil,
-       nil,
-       0,
-       "foo"
-     ),
-     CallNode(931...960)(
-       nil,
-       nil,
-       (931...934),
-       nil,
-       ArgumentsNode(935...960)(
-         [ModuleNode(935...960)(
-            [],
-            (935...941),
-            ConstantReadNode(942...945)(:Bar),
-            StatementsNode(946...956)(
-              [CallNode(946...956)(
-                 nil,
-                 nil,
-                 (946...949),
-                 nil,
-                 nil,
-                 nil,
-                 BlockNode(950...956)([], nil, nil, (950...952), (953...956)),
-                 0,
-                 "baz"
-               )]
-            ),
-            (957...960),
-            :Bar,
-            :Bar
-          )]
-       ),
-       nil,
-       nil,
-       0,
-       "foo"
-     ),
-     CallNode(962...978)(
-       nil,
-       nil,
-       (962...965),
-       nil,
-       ArgumentsNode(966...978)(
-         [ArrayNode(966...978)(
-            [CallNode(967...977)(
-               nil,
-               nil,
-               (967...970),
-               nil,
-               nil,
-               nil,
-               BlockNode(971...977)([], nil, nil, (971...973), (974...977)),
-               0,
-               "baz"
-             )],
-            (966...967),
-            (977...978)
-          )]
-       ),
-       nil,
-       nil,
-       0,
-       "foo"
-     ),
-     CallNode(980...1008)(
-       nil,
-       nil,
-       (980...981),
-       nil,
-       ArgumentsNode(982...1008)(
-         [BeginNode(982...1008)(
-            (982...987),
-            StatementsNode(988...1004)(
-              [CallNode(988...1004)(
-                 IntegerNode(988...989)(),
-                 (989...990),
-                 (990...995),
-                 nil,
-                 nil,
-                 nil,
-                 BlockNode(996...1004)(
-                   [],
-                   nil,
-                   StatementsNode(999...1000)([IntegerNode(999...1000)()]),
-                   (996...998),
-                   (1001...1004)
-                 ),
-                 0,
-                 "times"
-               )]
-            ),
-            nil,
-            nil,
-            nil,
-            (1005...1008)
-          )]
-       ),
-       nil,
-       nil,
-       0,
-       "p"
-     ),
-     CallNode(1010...1061)(
-       nil,
-       nil,
-       (1010...1013),
-       nil,
-       ArgumentsNode(1014...1061)(
-         [SymbolNode(1014...1016)((1014...1015), (1015...1016), nil, "a"),
-          IfNode(1020...1061)(
-            (1020...1022),
-            CallNode(1023...1024)(
-              nil,
-              nil,
-              (1023...1024),
-              nil,
-              nil,
-              nil,
-              nil,
-              2,
-              "x"
-            ),
-            StatementsNode(1029...1055)(
-              [CallNode(1029...1055)(
-                 nil,
-                 nil,
-                 (1029...1032),
-                 nil,
-                 nil,
-                 nil,
-                 BlockNode(1033...1055)(
-                   [:a],
-                   BlockParametersNode(1036...1039)(
-                     ParametersNode(1037...1038)(
-                       [RequiredParameterNode(1037...1038)(:a)],
-                       [],
-                       [],
-                       nil,
-                       [],
-                       nil,
-                       nil
-                     ),
-                     [],
-                     (1036...1037),
-                     (1038...1039)
-                   ),
-                   StatementsNode(1046...1047)(
-                     [LocalVariableReadNode(1046...1047)(:a, 0)]
-                   ),
-                   (1033...1035),
-                   (1052...1055)
-                 ),
-                 0,
-                 "bar"
-               )]
-            ),
-            nil,
-            (1058...1061)
-          )]
-       ),
-       nil,
-       nil,
-       0,
-       "foo"
-     ),
-     CallNode(1063...1153)(
-       nil,
-       nil,
-       (1063...1066),
-       nil,
-       ArgumentsNode(1067...1153)(
-         [SymbolNode(1067...1069)((1067...1068), (1068...1069), nil, "a"),
-          WhileNode(1073...1117)(
-            (1073...1078),
-            (1114...1117),
-            CallNode(1079...1080)(
-              nil,
-              nil,
-              (1079...1080),
-              nil,
-              nil,
-              nil,
-              nil,
-              2,
-              "x"
-            ),
-            StatementsNode(1085...1111)(
-              [CallNode(1085...1111)(
-                 nil,
-                 nil,
-                 (1085...1088),
-                 nil,
-                 nil,
-                 nil,
-                 BlockNode(1089...1111)(
-                   [:a],
-                   BlockParametersNode(1092...1095)(
-                     ParametersNode(1093...1094)(
-                       [RequiredParameterNode(1093...1094)(:a)],
-                       [],
-                       [],
-                       nil,
-                       [],
-                       nil,
-                       nil
-                     ),
-                     [],
-                     (1092...1093),
-                     (1094...1095)
-                   ),
-                   StatementsNode(1102...1103)(
-                     [LocalVariableReadNode(1102...1103)(:a, 0)]
-                   ),
-                   (1089...1091),
-                   (1108...1111)
-                 ),
-                 0,
-                 "bar"
-               )]
-            ),
-            0
-          ),
-          UntilNode(1121...1153)(
-            (1121...1126),
-            (1150...1153),
-            CallNode(1127...1128)(
-              nil,
-              nil,
-              (1127...1128),
-              nil,
-              nil,
-              nil,
-              nil,
-              2,
-              "x"
-            ),
-            StatementsNode(1133...1147)(
-              [CallNode(1133...1147)(
-                 nil,
-                 nil,
-                 (1133...1136),
-                 nil,
-                 nil,
-                 nil,
-                 BlockNode(1137...1147)(
-                   [],
-                   nil,
-                   nil,
-                   (1137...1139),
-                   (1144...1147)
-                 ),
-                 0,
-                 "baz"
-               )]
-            ),
-            0
-          )]
-       ),
-       nil,
-       nil,
-       0,
-       "foo"
-     ),
-     CallNode(1155...1164)(
-       HashNode(1155...1157)((1155...1156), [], (1156...1157)),
-       nil,
-       (1158...1159),
-       nil,
-       ArgumentsNode(1160...1164)(
-         [CallNode(1160...1164)(
-            nil,
-            nil,
-            (1160...1161),
-            nil,
-            nil,
-            nil,
-            BlockNode(1162...1164)([], nil, nil, (1162...1163), (1163...1164)),
-            0,
-            "A"
-          )]
-       ),
-       nil,
-       nil,
-       0,
-       "+"
-     ),
-     CallNode(1166...1182)(
-       HashNode(1166...1168)((1166...1167), [], (1167...1168)),
-       nil,
-       (1169...1170),
-       nil,
-       ArgumentsNode(1171...1182)(
-         [CallNode(1171...1182)(
-            nil,
-            nil,
-            (1171...1172),
-            nil,
-            nil,
-            nil,
-            BlockNode(1173...1182)(
-              [:a],
-              BlockParametersNode(1175...1178)(
-                ParametersNode(1176...1177)(
-                  [RequiredParameterNode(1176...1177)(:a)],
-                  [],
-                  [],
-                  nil,
-                  [],
-                  nil,
-                  nil
-                ),
-                [],
-                (1175...1176),
-                (1177...1178)
-              ),
-              StatementsNode(1179...1180)(
-                [LocalVariableReadNode(1179...1180)(:a, 0)]
-              ),
-              (1173...1174),
-              (1181...1182)
-            ),
-            0,
-            "A"
-          )]
-       ),
-       nil,
-       nil,
-       0,
-       "+"
-     ),
-     CallNode(1184...1195)(
-       CallNode(1184...1188)(
-         nil,
-         nil,
-         (1184...1185),
-         nil,
-         nil,
-         nil,
-         BlockNode(1186...1188)([], nil, nil, (1186...1187), (1187...1188)),
-         0,
-         "A"
-       ),
-       nil,
-       (1189...1190),
-       nil,
-       ArgumentsNode(1191...1195)(
-         [CallNode(1191...1195)(
-            nil,
-            nil,
-            (1191...1192),
-            nil,
-            nil,
-            nil,
-            BlockNode(1193...1195)([], nil, nil, (1193...1194), (1194...1195)),
-            0,
-            "A"
-          )]
-       ),
-       nil,
-       nil,
-       0,
-       "+"
-     ),
-     CallNode(1197...1208)(
-       CallNode(1197...1200)(
-         nil,
-         nil,
-         (1197...1200),
-         nil,
-         nil,
-         nil,
-         nil,
-         2,
-         "lst"
-       ),
-       nil,
-       (1201...1203),
-       nil,
-       ArgumentsNode(1204...1208)(
-         [CallNode(1204...1208)(
-            nil,
-            nil,
-            (1204...1205),
-            nil,
-            nil,
-            nil,
-            BlockNode(1206...1208)([], nil, nil, (1206...1207), (1207...1208)),
-            0,
-            "A"
-          )]
-       ),
-       nil,
-       nil,
-       0,
-       "<<"
-     ),
-     InterpolatedStringNode(1210...1227)(
-       (1210...1211),
-       [EmbeddedStatementsNode(1211...1226)(
-          (1211...1213),
-          StatementsNode(1214...1224)(
-            [CallNode(1214...1224)(
-               nil,
-               nil,
-               (1214...1218),
-               nil,
-               ArgumentsNode(1219...1224)(
-                 [ParenthesesNode(1219...1224)(
-                    StatementsNode(1220...1223)(
-                      [StringNode(1220...1223)(
-                         (1220...1221),
-                         (1221...1222),
-                         (1222...1223),
-                         " "
-                       )]
-                    ),
-                    (1219...1220),
-                    (1223...1224)
-                  )]
-               ),
-               nil,
-               nil,
-               0,
-               "join"
-             )]
-          ),
-          (1225...1226)
-        )],
-       (1226...1227)
-     ),
-     InterpolatedStringNode(1229...1237)(
-       (1229...1230),
-       [EmbeddedStatementsNode(1230...1236)(
-          (1230...1232),
-          StatementsNode(1232...1235)(
-            [ParenthesesNode(1232...1235)(
-               StatementsNode(1233...1234)(
-                 [CallNode(1233...1234)(
-                    nil,
-                    nil,
-                    (1233...1234),
-                    nil,
-                    nil,
-                    nil,
-                    nil,
-                    2,
-                    "v"
-                  )]
-               ),
-               (1232...1233),
-               (1234...1235)
-             )]
-          ),
-          (1235...1236)
-        )],
-       (1236...1237)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/methods.txt b/test/yarp/snapshots/methods.txt
deleted file mode 100644
index 13a81d15cda623..00000000000000
--- a/test/yarp/snapshots/methods.txt
+++ /dev/null
@@ -1,1407 +0,0 @@
-ProgramNode(0...1194)(
-  [:a, :c],
-  StatementsNode(0...1194)(
-    [DefNode(0...23)(
-       (4...7),
-       nil,
-       ParametersNode(8...18)(
-         [RequiredDestructuredParameterNode(8...18)(
-            [RequiredParameterNode(9...12)(:bar),
-             RequiredParameterNode(14...17)(:baz)],
-            (8...9),
-            (17...18)
-          )],
-         [],
-         [],
-         nil,
-         [],
-         nil,
-         nil
-       ),
-       nil,
-       [:bar, :baz],
-       (0...3),
-       nil,
-       (7...8),
-       (18...19),
-       nil,
-       (20...23)
-     ),
-     DefNode(25...74)(
-       (29...32),
-       nil,
-       ParametersNode(33...69)(
-         [RequiredDestructuredParameterNode(33...43)(
-            [RequiredParameterNode(34...37)(:bar),
-             RequiredParameterNode(39...42)(:baz)],
-            (33...34),
-            (42...43)
-          )],
-         [OptionalParameterNode(45...57)(
-            :optional,
-            (45...53),
-            (54...55),
-            IntegerNode(56...57)()
-          )],
-         [RequiredDestructuredParameterNode(59...69)(
-            [RequiredParameterNode(60...63)(:bin),
-             RequiredParameterNode(65...68)(:bag)],
-            (59...60),
-            (68...69)
-          )],
-         nil,
-         [],
-         nil,
-         nil
-       ),
-       nil,
-       [:bar, :baz, :optional, :bin, :bag],
-       (25...28),
-       nil,
-       (32...33),
-       (69...70),
-       nil,
-       (71...74)
-     ),
-     DefNode(77...95)(
-       (81...82),
-       nil,
-       nil,
-       BeginNode(84...95)(
-         nil,
-         nil,
-         nil,
-         nil,
-         EnsureNode(84...95)((84...90), nil, (92...95)),
-         (92...95)
-       ),
-       [],
-       (77...80),
-       nil,
-       nil,
-       nil,
-       nil,
-       (92...95)
-     ),
-     DefNode(97...110)(
-       (105...106),
-       ParenthesesNode(101...104)(
-         CallNode(102...103)(
-           nil,
-           nil,
-           (102...103),
-           nil,
-           nil,
-           nil,
-           nil,
-           2,
-           "b"
-         ),
-         (101...102),
-         (103...104)
-       ),
-       nil,
-       nil,
-       [],
-       (97...100),
-       (104...105),
-       nil,
-       nil,
-       nil,
-       (107...110)
-     ),
-     DefNode(112...126)(
-       (121...122),
-       ParenthesesNode(116...119)(
-         CallNode(117...118)(
-           nil,
-           nil,
-           (117...118),
-           nil,
-           nil,
-           nil,
-           nil,
-           2,
-           "a"
-         ),
-         (116...117),
-         (118...119)
-       ),
-       nil,
-       nil,
-       [],
-       (112...115),
-       (119...121),
-       nil,
-       nil,
-       nil,
-       (123...126)
-     ),
-     DefNode(128...143)(
-       (138...139),
-       FalseNode(132...137)(),
-       nil,
-       nil,
-       [],
-       (128...131),
-       (137...138),
-       nil,
-       nil,
-       nil,
-       (140...143)
-     ),
-     DefNode(145...159)(
-       (149...150),
-       nil,
-       ParametersNode(151...154)(
-         [],
-         [],
-         [],
-         nil,
-         [],
-         ForwardingParameterNode(151...154)(),
-         nil
-       ),
-       nil,
-       [:"..."],
-       (145...148),
-       nil,
-       (150...151),
-       (154...155),
-       nil,
-       (156...159)
-     ),
-     DefNode(161...175)(
-       (170...171),
-       GlobalVariableReadNode(165...169)(:$var),
-       nil,
-       nil,
-       [],
-       (161...164),
-       (169...170),
-       nil,
-       nil,
-       nil,
-       (172...175)
-     ),
-     DefNode(177...188)(
-       (183...184),
-       CallNode(181...182)(nil, nil, (181...182), nil, nil, nil, nil, 2, "a"),
-       nil,
-       nil,
-       [],
-       (177...180),
-       (182...183),
-       nil,
-       nil,
-       nil,
-       (185...188)
-     ),
-     DefNode(190...204)(
-       (199...200),
-       InstanceVariableReadNode(194...198)(:@var),
-       nil,
-       nil,
-       [],
-       (190...193),
-       (198...199),
-       nil,
-       nil,
-       nil,
-       (201...204)
-     ),
-     DefNode(206...219)(
-       (210...211),
-       nil,
-       ParametersNode(212...214)(
-         [],
-         [],
-         [],
-         nil,
-         [KeywordParameterNode(212...214)((212...214), nil)],
-         nil,
-         nil
-       ),
-       nil,
-       [:b],
-       (206...209),
-       nil,
-       nil,
-       nil,
-       nil,
-       (216...219)
-     ),
-     StringNode(221...227)((221...223), (223...226), (226...227), "abc"),
-     DefNode(229...242)(
-       (233...234),
-       nil,
-       ParametersNode(235...237)(
-         [],
-         [],
-         [],
-         nil,
-         [KeywordParameterNode(235...237)((235...237), nil)],
-         nil,
-         nil
-       ),
-       nil,
-       [:b],
-       (229...232),
-       nil,
-       (234...235),
-       (237...238),
-       nil,
-       (239...242)
-     ),
-     DefNode(244...258)(
-       (248...249),
-       nil,
-       ParametersNode(250...253)(
-         [],
-         [],
-         [],
-         nil,
-         [],
-         KeywordRestParameterNode(250...253)((250...252), (252...253)),
-         nil
-       ),
-       nil,
-       [:b],
-       (244...247),
-       nil,
-       (249...250),
-       (253...254),
-       nil,
-       (255...258)
-     ),
-     DefNode(260...273)(
-       (264...265),
-       nil,
-       ParametersNode(266...268)(
-         [],
-         [],
-         [],
-         nil,
-         [],
-         KeywordRestParameterNode(266...268)((266...268), nil),
-         nil
-       ),
-       nil,
-       [:**],
-       (260...263),
-       nil,
-       (265...266),
-       (268...269),
-       nil,
-       (270...273)
-     ),
-     LocalVariableWriteNode(275...280)(
-       :a,
-       0,
-       (275...276),
-       IntegerNode(279...280)(),
-       (277...278)
-     ),
-     DefNode(282...291)(
-       (286...287),
-       nil,
-       nil,
-       nil,
-       [],
-       (282...285),
-       nil,
-       nil,
-       nil,
-       nil,
-       (288...291)
-     ),
-     DefNode(293...310)(
-       (297...298),
-       nil,
-       ParametersNode(299...306)(
-         [RequiredParameterNode(299...300)(:b),
-          RequiredParameterNode(302...303)(:c),
-          RequiredParameterNode(305...306)(:d)],
-         [],
-         [],
-         nil,
-         [],
-         nil,
-         nil
-       ),
-       nil,
-       [:b, :c, :d],
-       (293...296),
-       nil,
-       nil,
-       nil,
-       nil,
-       (307...310)
-     ),
-     DefNode(312...325)(
-       (320...321),
-       NilNode(316...319)(),
-       nil,
-       nil,
-       [],
-       (312...315),
-       (319...320),
-       nil,
-       nil,
-       nil,
-       (322...325)
-     ),
-     DefNode(327...345)(
-       (331...332),
-       nil,
-       ParametersNode(333...341)(
-         [],
-         [],
-         [],
-         nil,
-         [KeywordParameterNode(333...335)((333...335), nil),
-          KeywordParameterNode(337...341)(
-            (337...339),
-            IntegerNode(340...341)()
-          )],
-         nil,
-         nil
-       ),
-       nil,
-       [:b, :c],
-       (327...330),
-       nil,
-       nil,
-       nil,
-       nil,
-       (342...345)
-     ),
-     DefNode(347...366)(
-       (351...352),
-       nil,
-       ParametersNode(353...361)(
-         [],
-         [],
-         [],
-         nil,
-         [KeywordParameterNode(353...355)((353...355), nil),
-          KeywordParameterNode(357...361)(
-            (357...359),
-            IntegerNode(360...361)()
-          )],
-         nil,
-         nil
-       ),
-       nil,
-       [:b, :c],
-       (347...350),
-       nil,
-       (352...353),
-       (361...362),
-       nil,
-       (363...366)
-     ),
-     DefNode(368...389)(
-       (372...373),
-       nil,
-       ParametersNode(374...384)(
-         [],
-         [],
-         [],
-         nil,
-         [KeywordParameterNode(374...380)(
-            (374...376),
-            IntegerNode(379...380)()
-          ),
-          KeywordParameterNode(382...384)((382...384), nil)],
-         nil,
-         nil
-       ),
-       nil,
-       [:b, :c],
-       (368...371),
-       nil,
-       (373...374),
-       (384...385),
-       nil,
-       (386...389)
-     ),
-     StringNode(391...397)((391...393), (393...396), (396...397), "abc"),
-     DefNode(399...421)(
-       (403...404),
-       nil,
-       ParametersNode(405...417)(
-         [],
-         [OptionalParameterNode(405...410)(
-            :b,
-            (405...406),
-            (407...408),
-            IntegerNode(409...410)()
-          ),
-          OptionalParameterNode(412...417)(
-            :c,
-            (412...413),
-            (414...415),
-            IntegerNode(416...417)()
-          )],
-         [],
-         nil,
-         [],
-         nil,
-         nil
-       ),
-       nil,
-       [:b, :c],
-       (399...402),
-       nil,
-       nil,
-       nil,
-       nil,
-       (418...421)
-     ),
-     DefNode(423...434)(
-       (427...428),
-       nil,
-       nil,
-       nil,
-       [],
-       (423...426),
-       nil,
-       (428...429),
-       (429...430),
-       nil,
-       (431...434)
-     ),
-     DefNode(436...454)(
-       (440...441),
-       nil,
-       ParametersNode(442...450)(
-         [RequiredParameterNode(442...443)(:b)],
-         [OptionalParameterNode(445...450)(
-            :c,
-            (445...446),
-            (447...448),
-            IntegerNode(449...450)()
-          )],
-         [],
-         nil,
-         [],
-         nil,
-         nil
-       ),
-       nil,
-       [:b, :c],
-       (436...439),
-       nil,
-       nil,
-       nil,
-       nil,
-       (451...454)
-     ),
-     DefNode(456...467)(
-       (460...461),
-       nil,
-       ParametersNode(462...463)(
-         [RequiredParameterNode(462...463)(:b)],
-         [],
-         [],
-         nil,
-         [],
-         nil,
-         nil
-       ),
-       nil,
-       [:b],
-       (456...459),
-       nil,
-       nil,
-       nil,
-       nil,
-       (464...467)
-     ),
-     DefNode(469...501)(
-       (473...474),
-       nil,
-       nil,
-       BeginNode(476...501)(
-         nil,
-         nil,
-         RescueNode(476...482)((476...482), [], nil, nil, nil, nil),
-         ElseNode(484...496)((484...488), nil, (490...496)),
-         EnsureNode(490...501)((490...496), nil, (498...501)),
-         (498...501)
-       ),
-       [],
-       (469...472),
-       nil,
-       nil,
-       nil,
-       nil,
-       (498...501)
-     ),
-     DefNode(503...515)(
-       (507...508),
-       nil,
-       ParametersNode(509...511)(
-         [],
-         [],
-         [],
-         RestParameterNode(509...511)((509...510), (510...511)),
-         [],
-         nil,
-         nil
-       ),
-       nil,
-       [:b],
-       (503...506),
-       nil,
-       nil,
-       nil,
-       nil,
-       (512...515)
-     ),
-     DefNode(517...529)(
-       (521...522),
-       nil,
-       ParametersNode(523...524)(
-         [],
-         [],
-         [],
-         RestParameterNode(523...524)((523...524), nil),
-         [],
-         nil,
-         nil
-       ),
-       nil,
-       [:*],
-       (517...520),
-       nil,
-       (522...523),
-       (524...525),
-       nil,
-       (526...529)
-     ),
-     DefNode(531...546)(
-       (535...536),
-       nil,
-       nil,
-       StatementsNode(537...542)(
-         [LocalVariableWriteNode(537...542)(
-            :b,
-            0,
-            (537...538),
-            IntegerNode(541...542)(),
-            (539...540)
-          )]
-       ),
-       [:b],
-       (531...534),
-       nil,
-       nil,
-       nil,
-       nil,
-       (543...546)
-     ),
-     DefNode(548...562)(
-       (557...558),
-       SelfNode(552...556)(),
-       nil,
-       nil,
-       [],
-       (548...551),
-       (556...557),
-       nil,
-       nil,
-       nil,
-       (559...562)
-     ),
-     DefNode(564...578)(
-       (573...574),
-       TrueNode(568...572)(),
-       nil,
-       nil,
-       [],
-       (564...567),
-       (572...573),
-       nil,
-       nil,
-       nil,
-       (575...578)
-     ),
-     DefNode(580...589)(
-       (584...585),
-       nil,
-       nil,
-       nil,
-       [],
-       (580...583),
-       nil,
-       nil,
-       nil,
-       nil,
-       (586...589)
-     ),
-     DefNode(591...625)(
-       (595...597),
-       nil,
-       nil,
-       StatementsNode(598...621)(
-         [IfNode(598...616)(
-            (609...611),
-            TrueNode(612...616)(),
-            StatementsNode(598...608)(
-              [ReturnNode(598...608)(
-                 (598...604),
-                 ArgumentsNode(605...608)(
-                   [SymbolNode(605...608)((605...606), (606...608), nil, "hi")]
-                 )
-               )]
-            ),
-            nil,
-            nil
-          ),
-          SymbolNode(617...621)((617...618), (618...621), nil, "bye")]
-       ),
-       [],
-       (591...594),
-       nil,
-       nil,
-       nil,
-       nil,
-       (622...625)
-     ),
-     DefNode(627...638)(
-       (631...634),
-       nil,
-       nil,
-       StatementsNode(637...638)([IntegerNode(637...638)()]),
-       [],
-       (627...630),
-       nil,
-       nil,
-       nil,
-       (635...636),
-       nil
-     ),
-     DefNode(639...650)(
-       (643...646),
-       nil,
-       nil,
-       StatementsNode(649...650)([IntegerNode(649...650)()]),
-       [],
-       (639...642),
-       nil,
-       nil,
-       nil,
-       (647...648),
-       nil
-     ),
-     DefNode(652...670)(
-       (656...659),
-       nil,
-       ParametersNode(660...663)(
-         [RequiredParameterNode(660...663)(:bar)],
-         [],
-         [],
-         nil,
-         [],
-         nil,
-         nil
-       ),
-       StatementsNode(667...670)([IntegerNode(667...670)()]),
-       [:bar],
-       (652...655),
-       nil,
-       (659...660),
-       (663...664),
-       (665...666),
-       nil
-     ),
-     DefNode(672...685)(
-       (676...679),
-       nil,
-       nil,
-       StatementsNode(682...685)([IntegerNode(682...685)()]),
-       [],
-       (672...675),
-       nil,
-       nil,
-       nil,
-       (680...681),
-       nil
-     ),
-     DefNode(687...706)(
-       (691...692),
-       nil,
-       ParametersNode(693...694)(
-         [],
-         [],
-         [],
-         RestParameterNode(693...694)((693...694), nil),
-         [],
-         nil,
-         nil
-       ),
-       StatementsNode(697...701)(
-         [CallNode(697...701)(
-            nil,
-            nil,
-            (697...698),
-            (698...699),
-            ArgumentsNode(699...700)([SplatNode(699...700)((699...700), nil)]),
-            (700...701),
-            nil,
-            0,
-            "b"
-          )]
-       ),
-       [:*],
-       (687...690),
-       nil,
-       (692...693),
-       (694...695),
-       nil,
-       (703...706)
-     ),
-     DefNode(708...731)(
-       (712...713),
-       nil,
-       ParametersNode(714...717)(
-         [],
-         [],
-         [],
-         nil,
-         [],
-         ForwardingParameterNode(714...717)(),
-         nil
-       ),
-       StatementsNode(720...726)(
-         [CallNode(720...726)(
-            nil,
-            nil,
-            (720...721),
-            (721...722),
-            ArgumentsNode(722...725)([ForwardingArgumentsNode(722...725)()]),
-            (725...726),
-            nil,
-            0,
-            "b"
-          )]
-       ),
-       [:"..."],
-       (708...711),
-       nil,
-       (713...714),
-       (717...718),
-       nil,
-       (728...731)
-     ),
-     DefNode(733...762)(
-       (737...738),
-       nil,
-       ParametersNode(739...742)(
-         [],
-         [],
-         [],
-         nil,
-         [],
-         ForwardingParameterNode(739...742)(),
-         nil
-       ),
-       StatementsNode(745...757)(
-         [CallNode(745...757)(
-            nil,
-            nil,
-            (745...746),
-            (746...747),
-            ArgumentsNode(747...756)(
-              [IntegerNode(747...748)(),
-               IntegerNode(750...751)(),
-               ForwardingArgumentsNode(753...756)()]
-            ),
-            (756...757),
-            nil,
-            0,
-            "b"
-          )]
-       ),
-       [:"..."],
-       (733...736),
-       nil,
-       (738...739),
-       (742...743),
-       nil,
-       (759...762)
-     ),
-     DefNode(764...781)(
-       (776...777),
-       ParenthesesNode(768...775)(
-         LocalVariableWriteNode(769...774)(
-           :c,
-           0,
-           (769...770),
-           CallNode(773...774)(
-             nil,
-             nil,
-             (773...774),
-             nil,
-             nil,
-             nil,
-             nil,
-             2,
-             "b"
-           ),
-           (771...772)
-         ),
-         (768...769),
-         (774...775)
-       ),
-       nil,
-       nil,
-       [],
-       (764...767),
-       (775...776),
-       nil,
-       nil,
-       nil,
-       (778...781)
-     ),
-     DefNode(783...795)(
-       (787...788),
-       nil,
-       ParametersNode(789...791)(
-         [],
-         [],
-         [],
-         nil,
-         [],
-         nil,
-         BlockParameterNode(789...791)(:b, (790...791), (789...790))
-       ),
-       nil,
-       [:b],
-       (783...786),
-       nil,
-       nil,
-       nil,
-       nil,
-       (792...795)
-     ),
-     DefNode(797...809)(
-       (801...802),
-       nil,
-       ParametersNode(803...804)(
-         [],
-         [],
-         [],
-         nil,
-         [],
-         nil,
-         BlockParameterNode(803...804)(nil, nil, (803...804))
-       ),
-       nil,
-       [:&],
-       (797...800),
-       nil,
-       (802...803),
-       (804...805),
-       nil,
-       (806...809)
-     ),
-     DefNode(811...826)(
-       (821...822),
-       ClassVariableReadNode(815...820)(:@@var),
-       nil,
-       nil,
-       [],
-       (811...814),
-       (820...821),
-       nil,
-       nil,
-       nil,
-       (823...826)
-     ),
-     DefNode(828...845)(
-       (840...841),
-       ParenthesesNode(832...839)(
-         LocalVariableWriteNode(833...838)(
-           :a,
-           0,
-           (833...834),
-           CallNode(837...838)(
-             nil,
-             nil,
-             (837...838),
-             nil,
-             nil,
-             nil,
-             nil,
-             2,
-             "b"
-           ),
-           (835...836)
-         ),
-         (832...833),
-         (838...839)
-       ),
-       nil,
-       nil,
-       [],
-       (828...831),
-       (839...840),
-       nil,
-       nil,
-       nil,
-       (842...845)
-     ),
-     DefNode(847...875)(
-       (856...870),
-       SelfNode(851...855)(),
-       nil,
-       nil,
-       [],
-       (847...850),
-       (855...856),
-       nil,
-       nil,
-       nil,
-       (872...875)
-     ),
-     ConstantWriteNode(877...886)(
-       :Const,
-       (877...882),
-       IntegerNode(885...886)(),
-       (883...884)
-     ),
-     DefNode(888...903)(
-       (898...899),
-       ConstantReadNode(892...897)(:Const),
-       nil,
-       nil,
-       [],
-       (888...891),
-       (897...898),
-       nil,
-       nil,
-       nil,
-       (900...903)
-     ),
-     DefNode(905...936)(
-       (909...910),
-       nil,
-       ParametersNode(911...914)(
-         [],
-         [],
-         [],
-         nil,
-         [],
-         ForwardingParameterNode(911...914)(),
-         nil
-       ),
-       StatementsNode(917...931)(
-         [InterpolatedStringNode(917...931)(
-            (917...918),
-            [StringNode(918...921)(nil, (918...921), nil, "foo"),
-             EmbeddedStatementsNode(921...930)(
-               (921...923),
-               StatementsNode(923...929)(
-                 [CallNode(923...929)(
-                    nil,
-                    nil,
-                    (923...924),
-                    (924...925),
-                    ArgumentsNode(925...928)(
-                      [ForwardingArgumentsNode(925...928)()]
-                    ),
-                    (928...929),
-                    nil,
-                    0,
-                    "b"
-                  )]
-               ),
-               (929...930)
-             )],
-            (930...931)
-          )]
-       ),
-       [:"..."],
-       (905...908),
-       nil,
-       (910...911),
-       (914...915),
-       nil,
-       (933...936)
-     ),
-     DefNode(938...980)(
-       (942...945),
-       nil,
-       nil,
-       StatementsNode(948...976)(
-         [CallNode(948...976)(
-            HashNode(948...950)((948...949), [], (949...950)),
-            (950...951),
-            (951...956),
-            nil,
-            ArgumentsNode(957...976)(
-              [KeywordHashNode(957...976)(
-                 [AssocSplatNode(957...962)(
-                    CallNode(959...962)(
-                      nil,
-                      nil,
-                      (959...962),
-                      nil,
-                      nil,
-                      nil,
-                      nil,
-                      2,
-                      "bar"
-                    ),
-                    (957...959)
-                  ),
-                  AssocSplatNode(964...969)(
-                    CallNode(966...969)(
-                      nil,
-                      nil,
-                      (966...969),
-                      nil,
-                      nil,
-                      nil,
-                      nil,
-                      2,
-                      "baz"
-                    ),
-                    (964...966)
-                  ),
-                  AssocSplatNode(971...976)(
-                    CallNode(973...976)(
-                      nil,
-                      nil,
-                      (973...976),
-                      nil,
-                      nil,
-                      nil,
-                      nil,
-                      2,
-                      "qux"
-                    ),
-                    (971...973)
-                  )]
-               )]
-            ),
-            nil,
-            nil,
-            0,
-            "merge"
-          )]
-       ),
-       [],
-       (938...941),
-       nil,
-       nil,
-       nil,
-       nil,
-       (977...980)
-     ),
-     DefNode(982...1006)(
-       (986...989),
-       nil,
-       ParametersNode(990...1001)(
-         [],
-         [],
-         [],
-         nil,
-         [KeywordParameterNode(990...1001)(
-            (990...992),
-            ParenthesesNode(993...1001)(
-              StatementsNode(994...1000)(
-                [RangeNode(994...1000)(
-                   IntegerNode(994...995)(),
-                   IntegerNode(998...1000)(),
-                   (995...998),
-                   1
-                 )]
-              ),
-              (993...994),
-              (1000...1001)
-            )
-          )],
-         nil,
-         nil
-       ),
-       nil,
-       [:a],
-       (982...985),
-       nil,
-       (989...990),
-       (1001...1002),
-       nil,
-       (1003...1006)
-     ),
-     DefNode(1008...1031)(
-       (1012...1015),
-       nil,
-       ParametersNode(1016...1026)(
-         [],
-         [],
-         [],
-         nil,
-         [KeywordParameterNode(1016...1026)(
-            (1016...1018),
-            ParenthesesNode(1019...1026)(
-              StatementsNode(1020...1025)(
-                [RangeNode(1020...1025)(
-                   nil,
-                   IntegerNode(1023...1025)(),
-                   (1020...1023),
-                   1
-                 )]
-              ),
-              (1019...1020),
-              (1025...1026)
-            )
-          )],
-         nil,
-         nil
-       ),
-       nil,
-       [:a],
-       (1008...1011),
-       nil,
-       (1015...1016),
-       (1026...1027),
-       nil,
-       (1028...1031)
-     ),
-     DefNode(1033...1055)(
-       (1037...1040),
-       nil,
-       ParametersNode(1041...1050)(
-         [],
-         [],
-         [],
-         nil,
-         [KeywordParameterNode(1041...1050)(
-            (1041...1043),
-            ParenthesesNode(1044...1050)(
-              StatementsNode(1045...1049)(
-                [RangeNode(1045...1049)(
-                   IntegerNode(1045...1046)(),
-                   nil,
-                   (1046...1049),
-                   1
-                 )]
-              ),
-              (1044...1045),
-              (1049...1050)
-            )
-          )],
-         nil,
-         nil
-       ),
-       nil,
-       [:a],
-       (1033...1036),
-       nil,
-       (1040...1041),
-       (1050...1051),
-       nil,
-       (1052...1055)
-     ),
-     DefNode(1057...1082)(
-       (1061...1064),
-       nil,
-       ParametersNode(1065...1077)(
-         [],
-         [OptionalParameterNode(1065...1077)(
-            :a,
-            (1065...1066),
-            (1067...1068),
-            ParenthesesNode(1069...1077)(
-              StatementsNode(1070...1076)(
-                [RangeNode(1070...1076)(
-                   IntegerNode(1070...1071)(),
-                   IntegerNode(1074...1076)(),
-                   (1071...1074),
-                   1
-                 )]
-              ),
-              (1069...1070),
-              (1076...1077)
-            )
-          )],
-         [],
-         nil,
-         [],
-         nil,
-         nil
-       ),
-       nil,
-       [:a],
-       (1057...1060),
-       nil,
-       (1064...1065),
-       (1077...1078),
-       nil,
-       (1079...1082)
-     ),
-     DefNode(1084...1108)(
-       (1088...1091),
-       nil,
-       ParametersNode(1092...1103)(
-         [],
-         [OptionalParameterNode(1092...1103)(
-            :a,
-            (1092...1093),
-            (1094...1095),
-            ParenthesesNode(1096...1103)(
-              StatementsNode(1097...1102)(
-                [RangeNode(1097...1102)(
-                   nil,
-                   IntegerNode(1100...1102)(),
-                   (1097...1100),
-                   1
-                 )]
-              ),
-              (1096...1097),
-              (1102...1103)
-            )
-          )],
-         [],
-         nil,
-         [],
-         nil,
-         nil
-       ),
-       nil,
-       [:a],
-       (1084...1087),
-       nil,
-       (1091...1092),
-       (1103...1104),
-       nil,
-       (1105...1108)
-     ),
-     DefNode(1110...1133)(
-       (1114...1117),
-       nil,
-       ParametersNode(1118...1128)(
-         [],
-         [OptionalParameterNode(1118...1128)(
-            :a,
-            (1118...1119),
-            (1120...1121),
-            ParenthesesNode(1122...1128)(
-              StatementsNode(1123...1127)(
-                [RangeNode(1123...1127)(
-                   IntegerNode(1123...1124)(),
-                   nil,
-                   (1124...1127),
-                   1
-                 )]
-              ),
-              (1122...1123),
-              (1127...1128)
-            )
-          )],
-         [],
-         nil,
-         [],
-         nil,
-         nil
-       ),
-       nil,
-       [:a],
-       (1110...1113),
-       nil,
-       (1117...1118),
-       (1128...1129),
-       nil,
-       (1130...1133)
-     ),
-     DefNode(1135...1167)(
-       (1139...1145),
-       nil,
-       ParametersNode(1146...1147)(
-         [RequiredParameterNode(1146...1147)(:a)],
-         [],
-         [],
-         nil,
-         [],
-         nil,
-         nil
-       ),
-       StatementsNode(1151...1163)(
-         [CallNode(1151...1163)(
-            CallNode(1151...1155)(
-              nil,
-              nil,
-              (1151...1155),
-              nil,
-              nil,
-              nil,
-              nil,
-              2,
-              "item"
-            ),
-            nil,
-            (1156...1158),
-            nil,
-            ArgumentsNode(1159...1163)(
-              [CallNode(1159...1163)(
-                 nil,
-                 nil,
-                 (1159...1160),
-                 nil,
-                 nil,
-                 nil,
-                 BlockNode(1161...1163)(
-                   [],
-                   nil,
-                   nil,
-                   (1161...1162),
-                   (1162...1163)
-                 ),
-                 0,
-                 "a"
-               )]
-            ),
-            nil,
-            nil,
-            0,
-            ">>"
-          )]
-       ),
-       [:a],
-       (1135...1138),
-       nil,
-       (1145...1146),
-       (1147...1148),
-       nil,
-       (1164...1167)
-     ),
-     DefNode(1169...1194)(
-       (1173...1176),
-       nil,
-       ParametersNode(1177...1189)(
-         [RequiredParameterNode(1177...1179)(:_a),
-          RequiredParameterNode(1181...1183)(:_a),
-          RequiredParameterNode(1185...1186)(:b),
-          RequiredParameterNode(1188...1189)(:c)],
-         [],
-         [],
-         nil,
-         [],
-         nil,
-         nil
-       ),
-       nil,
-       [:_a, :b, :c],
-       (1169...1172),
-       nil,
-       (1176...1177),
-       (1189...1190),
-       nil,
-       (1191...1194)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/modules.txt b/test/yarp/snapshots/modules.txt
deleted file mode 100644
index 306e7db3e34c30..00000000000000
--- a/test/yarp/snapshots/modules.txt
+++ /dev/null
@@ -1,141 +0,0 @@
-ProgramNode(0...140)(
-  [],
-  StatementsNode(0...140)(
-    [ModuleNode(0...18)(
-       [:a],
-       (0...6),
-       ConstantReadNode(7...8)(:A),
-       StatementsNode(9...14)(
-         [LocalVariableWriteNode(9...14)(
-            :a,
-            0,
-            (9...10),
-            IntegerNode(13...14)(),
-            (11...12)
-          )]
-       ),
-       (15...18),
-       :A,
-       :A
-     ),
-     InterpolatedStringNode(20...38)(
-       (20...23),
-       [StringNode(23...27)(nil, (23...27), nil, "aaa "),
-        EmbeddedStatementsNode(27...33)(
-          (27...29),
-          StatementsNode(29...32)(
-            [CallNode(29...32)(
-               nil,
-               nil,
-               (29...32),
-               nil,
-               nil,
-               nil,
-               nil,
-               2,
-               "bbb"
-             )]
-          ),
-          (32...33)
-        ),
-        StringNode(33...37)(nil, (33...37), nil, " ccc")],
-       (37...38)
-     ),
-     ModuleNode(40...55)(
-       [],
-       (40...46),
-       ConstantPathNode(47...51)(
-         CallNode(47...48)(nil, nil, (47...48), nil, nil, nil, nil, 2, "m"),
-         ConstantReadNode(50...51)(:M),
-         (48...50)
-       ),
-       nil,
-       (52...55),
-       :M,
-       :M
-     ),
-     ModuleNode(57...85)(
-       [:x],
-       (57...63),
-       ConstantReadNode(64...65)(:A),
-       BeginNode(67...85)(
-         nil,
-         StatementsNode(67...72)(
-           [LocalVariableWriteNode(67...72)(
-              :x,
-              0,
-              (67...68),
-              IntegerNode(71...72)(),
-              (69...70)
-            )]
-         ),
-         RescueNode(74...80)((74...80), [], nil, nil, nil, nil),
-         nil,
-         nil,
-         (82...85)
-       ),
-       (82...85),
-       :A,
-       :A
-     ),
-     ModuleNode(87...101)(
-       [],
-       (87...93),
-       ConstantPathNode(94...97)(
-         nil,
-         ConstantReadNode(96...97)(:A),
-         (94...96)
-       ),
-       nil,
-       (98...101),
-       :A,
-       :A
-     ),
-     ModuleNode(103...120)(
-       [],
-       (103...109),
-       ConstantPathNode(110...116)(
-         CallNode(110...113)(
-           ConstantReadNode(110...111)(:A),
-           nil,
-           (111...113),
-           (111...112),
-           nil,
-           (112...113),
-           nil,
-           0,
-           "[]"
-         ),
-         ConstantReadNode(115...116)(:B),
-         (113...115)
-       ),
-       nil,
-       (117...120),
-       :B,
-       :B
-     ),
-     ModuleNode(122...140)(
-       [],
-       (122...128),
-       ConstantPathNode(129...136)(
-         CallNode(129...133)(
-           ConstantReadNode(129...130)(:A),
-           nil,
-           (130...133),
-           (130...131),
-           ArgumentsNode(131...132)([IntegerNode(131...132)()]),
-           (132...133),
-           nil,
-           0,
-           "[]"
-         ),
-         ConstantReadNode(135...136)(:B),
-         (133...135)
-       ),
-       nil,
-       (137...140),
-       :B,
-       :B
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/newline_terminated.txt b/test/yarp/snapshots/newline_terminated.txt
deleted file mode 100644
index 06ad6a989eead8..00000000000000
--- a/test/yarp/snapshots/newline_terminated.txt
+++ /dev/null
@@ -1,28 +0,0 @@
-ProgramNode(76...212)(
-  [],
-  StatementsNode(76...212)(
-    [StringNode(76...82)((76...78), (78...81), (81...82), "abc"),
-     StringNode(84...90)((84...86), (86...89), (89...90), "abc"),
-     StringNode(92...98)((92...94), (94...97), (97...98), "abc"),
-     StringNode(100...106)((100...102), (102...105), (105...106), "abc"),
-     StringNode(108...114)((108...110), (110...113), (113...114), "abc"),
-     StringNode(116...122)((116...118), (118...121), (121...122), "abc"),
-     StringNode(124...130)((124...126), (126...129), (129...130), "abc"),
-     StringNode(132...139)((132...134), (134...138), (138...139), "\rabc"),
-     StringNode(142...149)((142...144), (144...148), (148...149), "\rabc"),
-     StringNode(151...157)((151...153), (153...156), (156...157), "abc"),
-     StringNode(159...165)((159...161), (161...164), (164...165), "abc"),
-     StringNode(167...173)((167...169), (169...172), (172...173), "abc"),
-     StringNode(175...181)((175...177), (177...180), (180...181), "abc"),
-     StringNode(182...188)((182...184), (184...187), (187...188), "foo"),
-     StringNode(189...196)((189...192), (192...195), (195...196), "foo"),
-     StringNode(197...204)((197...200), (200...203), (203...204), "foo"),
-     RegularExpressionNode(205...212)(
-       (205...208),
-       (208...211),
-       (211...212),
-       "foo",
-       0
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/next.txt b/test/yarp/snapshots/next.txt
deleted file mode 100644
index 533cf33bb8f7da..00000000000000
--- a/test/yarp/snapshots/next.txt
+++ /dev/null
@@ -1,88 +0,0 @@
-ProgramNode(0...118)(
-  [],
-  StatementsNode(0...118)(
-    [NextNode(0...4)(nil, (0...4)),
-     NextNode(6...24)(
-       ArgumentsNode(11...24)(
-         [ParenthesesNode(11...14)(
-            StatementsNode(12...13)([IntegerNode(12...13)()]),
-            (11...12),
-            (13...14)
-          ),
-          ParenthesesNode(16...19)(
-            StatementsNode(17...18)([IntegerNode(17...18)()]),
-            (16...17),
-            (18...19)
-          ),
-          ParenthesesNode(21...24)(
-            StatementsNode(22...23)([IntegerNode(22...23)()]),
-            (21...22),
-            (23...24)
-          )]
-       ),
-       (6...10)
-     ),
-     NextNode(26...32)(
-       ArgumentsNode(31...32)([IntegerNode(31...32)()]),
-       (26...30)
-     ),
-     NextNode(34...46)(
-       ArgumentsNode(39...46)(
-         [IntegerNode(39...40)(),
-          IntegerNode(42...43)(),
-          IntegerNode(45...46)()]
-       ),
-       (34...38)
-     ),
-     NextNode(48...60)(
-       ArgumentsNode(53...60)(
-         [IntegerNode(53...54)(),
-          IntegerNode(56...57)(),
-          IntegerNode(59...60)()]
-       ),
-       (48...52)
-     ),
-     NextNode(62...76)(
-       ArgumentsNode(67...76)(
-         [ArrayNode(67...76)(
-            [IntegerNode(68...69)(),
-             IntegerNode(71...72)(),
-             IntegerNode(74...75)()],
-            (67...68),
-            (75...76)
-          )]
-       ),
-       (62...66)
-     ),
-     NextNode(78...93)(
-       ArgumentsNode(82...93)(
-         [ParenthesesNode(82...93)(
-            StatementsNode(86...91)(
-              [IntegerNode(86...87)(), IntegerNode(90...91)()]
-            ),
-            (82...83),
-            (92...93)
-          )]
-       ),
-       (78...82)
-     ),
-     NextNode(95...99)(nil, (95...99)),
-     IntegerNode(100...101)(),
-     NextNode(103...109)(
-       ArgumentsNode(107...109)(
-         [ParenthesesNode(107...109)(nil, (107...108), (108...109))]
-       ),
-       (103...107)
-     ),
-     NextNode(111...118)(
-       ArgumentsNode(115...118)(
-         [ParenthesesNode(115...118)(
-            StatementsNode(116...117)([IntegerNode(116...117)()]),
-            (115...116),
-            (117...118)
-          )]
-       ),
-       (111...115)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/nils.txt b/test/yarp/snapshots/nils.txt
deleted file mode 100644
index daf9168e7ea35c..00000000000000
--- a/test/yarp/snapshots/nils.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-ProgramNode(0...40)(
-  [],
-  StatementsNode(0...40)(
-    [NilNode(0...3)(),
-     ParenthesesNode(5...7)(nil, (5...6), (6...7)),
-     ParenthesesNode(9...16)(nil, (9...10), (15...16)),
-     PostExecutionNode(18...27)(
-       StatementsNode(24...25)([IntegerNode(24...25)()]),
-       (18...21),
-       (22...23),
-       (26...27)
-     ),
-     PreExecutionNode(29...40)(
-       StatementsNode(37...38)([IntegerNode(37...38)()]),
-       (29...34),
-       (35...36),
-       (39...40)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/non_alphanumeric_methods.txt b/test/yarp/snapshots/non_alphanumeric_methods.txt
deleted file mode 100644
index a8e9cd798fb465..00000000000000
--- a/test/yarp/snapshots/non_alphanumeric_methods.txt
+++ /dev/null
@@ -1,477 +0,0 @@
-ProgramNode(0...434)(
-  [],
-  StatementsNode(0...434)(
-    [DefNode(0...9)(
-       (4...5),
-       nil,
-       nil,
-       nil,
-       [],
-       (0...3),
-       nil,
-       nil,
-       nil,
-       nil,
-       (6...9)
-     ),
-     DefNode(11...21)(
-       (15...17),
-       nil,
-       nil,
-       nil,
-       [],
-       (11...14),
-       nil,
-       nil,
-       nil,
-       nil,
-       (18...21)
-     ),
-     DefNode(23...33)(
-       (27...29),
-       nil,
-       nil,
-       nil,
-       [],
-       (23...26),
-       nil,
-       nil,
-       nil,
-       nil,
-       (30...33)
-     ),
-     DefNode(35...44)(
-       (39...40),
-       nil,
-       nil,
-       nil,
-       [],
-       (35...38),
-       nil,
-       nil,
-       nil,
-       nil,
-       (41...44)
-     ),
-     DefNode(46...60)(
-       (55...56),
-       SelfNode(50...54)(),
-       nil,
-       nil,
-       [],
-       (46...49),
-       (54...55),
-       nil,
-       nil,
-       nil,
-       (57...60)
-     ),
-     DefNode(62...71)(
-       (66...67),
-       nil,
-       nil,
-       nil,
-       [],
-       (62...65),
-       nil,
-       nil,
-       nil,
-       nil,
-       (68...71)
-     ),
-     DefNode(73...82)(
-       (77...78),
-       nil,
-       nil,
-       nil,
-       [],
-       (73...76),
-       nil,
-       nil,
-       nil,
-       nil,
-       (79...82)
-     ),
-     DefNode(84...94)(
-       (88...90),
-       nil,
-       nil,
-       nil,
-       [],
-       (84...87),
-       nil,
-       nil,
-       nil,
-       nil,
-       (91...94)
-     ),
-     StringNode(96...102)((96...98), (98...101), (101...102), "abc"),
-     DefNode(104...117)(
-       (108...109),
-       nil,
-       ParametersNode(110...113)(
-         [],
-         [],
-         [],
-         nil,
-         [],
-         KeywordRestParameterNode(110...113)((110...112), (112...113)),
-         nil
-       ),
-       nil,
-       [:b],
-       (104...107),
-       nil,
-       nil,
-       nil,
-       nil,
-       (114...117)
-     ),
-     DefNode(119...130)(
-       (123...124),
-       nil,
-       nil,
-       nil,
-       [],
-       (119...122),
-       nil,
-       (124...125),
-       (125...126),
-       nil,
-       (127...130)
-     ),
-     DefNode(132...143)(
-       (136...137),
-       nil,
-       ParametersNode(138...139)(
-         [RequiredParameterNode(138...139)(:b)],
-         [],
-         [],
-         nil,
-         [],
-         nil,
-         nil
-       ),
-       nil,
-       [:b],
-       (132...135),
-       nil,
-       nil,
-       nil,
-       nil,
-       (140...143)
-     ),
-     DefNode(145...159)(
-       (154...155),
-       SelfNode(149...153)(),
-       nil,
-       nil,
-       [],
-       (145...148),
-       (153...154),
-       nil,
-       nil,
-       nil,
-       (156...159)
-     ),
-     DefNode(161...170)(
-       (165...166),
-       nil,
-       nil,
-       nil,
-       [],
-       (161...164),
-       nil,
-       nil,
-       nil,
-       nil,
-       (167...170)
-     ),
-     DefNode(172...182)(
-       (176...178),
-       nil,
-       nil,
-       nil,
-       [],
-       (172...175),
-       nil,
-       nil,
-       nil,
-       nil,
-       (179...182)
-     ),
-     DefNode(184...193)(
-       (188...189),
-       nil,
-       nil,
-       nil,
-       [],
-       (184...187),
-       nil,
-       nil,
-       nil,
-       nil,
-       (190...193)
-     ),
-     DefNode(195...206)(
-       (201...202),
-       CallNode(199...200)(nil, nil, (199...200), nil, nil, nil, nil, 2, "a"),
-       nil,
-       nil,
-       [],
-       (195...198),
-       (200...201),
-       nil,
-       nil,
-       nil,
-       (203...206)
-     ),
-     DefNode(208...218)(
-       (212...214),
-       nil,
-       nil,
-       nil,
-       [],
-       (208...211),
-       nil,
-       nil,
-       nil,
-       nil,
-       (215...218)
-     ),
-     DefNode(220...229)(
-       (224...225),
-       nil,
-       nil,
-       nil,
-       [],
-       (220...223),
-       nil,
-       nil,
-       nil,
-       nil,
-       (226...229)
-     ),
-     DefNode(231...240)(
-       (235...236),
-       nil,
-       nil,
-       nil,
-       [],
-       (231...234),
-       nil,
-       nil,
-       nil,
-       nil,
-       (237...240)
-     ),
-     DefNode(242...252)(
-       (246...248),
-       nil,
-       nil,
-       nil,
-       [],
-       (242...245),
-       nil,
-       nil,
-       nil,
-       nil,
-       (249...252)
-     ),
-     DefNode(254...264)(
-       (258...260),
-       nil,
-       nil,
-       nil,
-       [],
-       (254...257),
-       nil,
-       nil,
-       nil,
-       nil,
-       (261...264)
-     ),
-     DefNode(266...277)(
-       (270...273),
-       nil,
-       nil,
-       nil,
-       [],
-       (266...269),
-       nil,
-       nil,
-       nil,
-       nil,
-       (274...277)
-     ),
-     DefNode(279...289)(
-       (283...285),
-       nil,
-       nil,
-       nil,
-       [],
-       (279...282),
-       nil,
-       nil,
-       nil,
-       nil,
-       (286...289)
-     ),
-     DefNode(291...302)(
-       (295...298),
-       nil,
-       nil,
-       nil,
-       [],
-       (291...294),
-       nil,
-       nil,
-       nil,
-       nil,
-       (299...302)
-     ),
-     DefNode(304...314)(
-       (308...310),
-       nil,
-       nil,
-       nil,
-       [],
-       (304...307),
-       nil,
-       nil,
-       nil,
-       nil,
-       (311...314)
-     ),
-     DefNode(316...325)(
-       (320...321),
-       nil,
-       nil,
-       nil,
-       [],
-       (316...319),
-       nil,
-       nil,
-       nil,
-       nil,
-       (322...325)
-     ),
-     DefNode(327...337)(
-       (331...333),
-       nil,
-       nil,
-       nil,
-       [],
-       (327...330),
-       nil,
-       nil,
-       nil,
-       nil,
-       (334...337)
-     ),
-     DefNode(339...349)(
-       (343...345),
-       nil,
-       nil,
-       nil,
-       [],
-       (339...342),
-       nil,
-       nil,
-       nil,
-       nil,
-       (346...349)
-     ),
-     DefNode(351...361)(
-       (355...357),
-       nil,
-       nil,
-       nil,
-       [],
-       (351...354),
-       nil,
-       nil,
-       nil,
-       nil,
-       (358...361)
-     ),
-     DefNode(363...374)(
-       (367...370),
-       nil,
-       nil,
-       nil,
-       [],
-       (363...366),
-       nil,
-       nil,
-       nil,
-       nil,
-       (371...374)
-     ),
-     DefNode(376...385)(
-       (380...381),
-       nil,
-       nil,
-       nil,
-       [],
-       (376...379),
-       nil,
-       nil,
-       nil,
-       nil,
-       (382...385)
-     ),
-     DefNode(387...396)(
-       (391...392),
-       nil,
-       nil,
-       nil,
-       [],
-       (387...390),
-       nil,
-       nil,
-       nil,
-       nil,
-       (393...396)
-     ),
-     DefNode(398...412)(
-       (407...408),
-       SelfNode(402...406)(),
-       nil,
-       nil,
-       [],
-       (398...401),
-       (406...407),
-       nil,
-       nil,
-       nil,
-       (409...412)
-     ),
-     DefNode(414...423)(
-       (418...419),
-       nil,
-       nil,
-       nil,
-       [],
-       (414...417),
-       nil,
-       nil,
-       nil,
-       nil,
-       (420...423)
-     ),
-     DefNode(425...434)(
-       (429...430),
-       nil,
-       nil,
-       nil,
-       [],
-       (425...428),
-       nil,
-       nil,
-       nil,
-       nil,
-       (431...434)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/not.txt b/test/yarp/snapshots/not.txt
deleted file mode 100644
index 5a9889bf6aa5cd..00000000000000
--- a/test/yarp/snapshots/not.txt
+++ /dev/null
@@ -1,271 +0,0 @@
-ProgramNode(0...190)(
-  [],
-  StatementsNode(0...190)(
-    [AndNode(0...19)(
-       CallNode(0...7)(
-         CallNode(4...7)(nil, nil, (4...7), nil, nil, nil, nil, 2, "foo"),
-         nil,
-         (0...3),
-         nil,
-         nil,
-         nil,
-         nil,
-         0,
-         "!"
-       ),
-       CallNode(12...19)(
-         CallNode(16...19)(nil, nil, (16...19), nil, nil, nil, nil, 2, "bar"),
-         nil,
-         (12...15),
-         nil,
-         nil,
-         nil,
-         nil,
-         0,
-         "!"
-       ),
-       (8...11)
-     ),
-     CallNode(21...37)(
-       AndNode(25...36)(
-         CallNode(25...28)(nil, nil, (25...28), nil, nil, nil, nil, 2, "foo"),
-         CallNode(33...36)(nil, nil, (33...36), nil, nil, nil, nil, 2, "bar"),
-         (29...32)
-       ),
-       nil,
-       (21...24),
-       (24...25),
-       nil,
-       (36...37),
-       nil,
-       0,
-       "!"
-     ),
-     CallNode(39...46)(
-       CallNode(43...46)(nil, nil, (43...46), nil, nil, nil, nil, 2, "foo"),
-       nil,
-       (39...42),
-       nil,
-       nil,
-       nil,
-       nil,
-       0,
-       "!"
-     ),
-     AndNode(48...69)(
-       CallNode(48...55)(
-         CallNode(52...55)(nil, nil, (52...55), nil, nil, nil, nil, 2, "foo"),
-         nil,
-         (48...51),
-         nil,
-         nil,
-         nil,
-         nil,
-         0,
-         "!"
-       ),
-       CallNode(60...69)(
-         CallNode(66...69)(nil, nil, (66...69), nil, nil, nil, nil, 2, "bar"),
-         nil,
-         (60...63),
-         nil,
-         nil,
-         nil,
-         nil,
-         0,
-         "!"
-       ),
-       (56...59)
-     ),
-     AndNode(72...97)(
-       CallNode(72...79)(
-         CallNode(76...79)(nil, nil, (76...79), nil, nil, nil, nil, 2, "foo"),
-         nil,
-         (72...75),
-         nil,
-         nil,
-         nil,
-         nil,
-         0,
-         "!"
-       ),
-       CallNode(88...97)(
-         CallNode(94...97)(nil, nil, (94...97), nil, nil, nil, nil, 2, "bar"),
-         nil,
-         (88...91),
-         nil,
-         nil,
-         nil,
-         nil,
-         0,
-         "!"
-       ),
-       (80...83)
-     ),
-     AndNode(100...125)(
-       CallNode(100...107)(
-         CallNode(104...107)(
-           nil,
-           nil,
-           (104...107),
-           nil,
-           nil,
-           nil,
-           nil,
-           2,
-           "foo"
-         ),
-         nil,
-         (100...103),
-         nil,
-         nil,
-         nil,
-         nil,
-         0,
-         "!"
-       ),
-       CallNode(114...125)(
-         CallNode(122...125)(
-           nil,
-           nil,
-           (122...125),
-           nil,
-           nil,
-           nil,
-           nil,
-           2,
-           "bar"
-         ),
-         nil,
-         (114...117),
-         nil,
-         nil,
-         nil,
-         nil,
-         0,
-         "!"
-       ),
-       (108...111)
-     ),
-     CallNode(127...138)(
-       CallNode(131...134)(
-         nil,
-         nil,
-         (131...134),
-         nil,
-         nil,
-         nil,
-         nil,
-         2,
-         "foo"
-       ),
-       nil,
-       (127...130),
-       (130...131),
-       nil,
-       (137...138),
-       nil,
-       0,
-       "!"
-     ),
-     CallNode(140...156)(
-       CallNode(147...150)(
-         nil,
-         nil,
-         (147...150),
-         nil,
-         nil,
-         nil,
-         nil,
-         2,
-         "foo"
-       ),
-       nil,
-       (140...143),
-       (143...144),
-       nil,
-       (155...156),
-       nil,
-       0,
-       "!"
-     ),
-     CallNode(158...172)(
-       FlipFlopNode(162...172)(
-         CallNode(162...165)(
-           nil,
-           nil,
-           (162...165),
-           nil,
-           nil,
-           nil,
-           nil,
-           2,
-           "foo"
-         ),
-         CallNode(169...172)(
-           nil,
-           nil,
-           (169...172),
-           nil,
-           nil,
-           nil,
-           nil,
-           2,
-           "bar"
-         ),
-         (166...168),
-         0
-       ),
-       nil,
-       (158...161),
-       nil,
-       nil,
-       nil,
-       nil,
-       0,
-       "!"
-     ),
-     CallNode(174...190)(
-       ParenthesesNode(178...190)(
-         StatementsNode(179...189)(
-           [FlipFlopNode(179...189)(
-              CallNode(179...182)(
-                nil,
-                nil,
-                (179...182),
-                nil,
-                nil,
-                nil,
-                nil,
-                2,
-                "foo"
-              ),
-              CallNode(186...189)(
-                nil,
-                nil,
-                (186...189),
-                nil,
-                nil,
-                nil,
-                nil,
-                2,
-                "bar"
-              ),
-              (183...185),
-              0
-            )]
-         ),
-         (178...179),
-         (189...190)
-       ),
-       nil,
-       (174...177),
-       nil,
-       nil,
-       nil,
-       nil,
-       0,
-       "!"
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/numbers.txt b/test/yarp/snapshots/numbers.txt
deleted file mode 100644
index 72fb895125d250..00000000000000
--- a/test/yarp/snapshots/numbers.txt
+++ /dev/null
@@ -1,43 +0,0 @@
-ProgramNode(0...161)(
-  [],
-  StatementsNode(0...161)(
-    [IntegerNode(0...1)(),
-     IntegerNode(3...4)(),
-     FloatNode(6...9)(),
-     IntegerNode(11...12)(),
-     IntegerNode(14...17)(),
-     IntegerNode(19...22)(),
-     IntegerNode(24...28)(),
-     IntegerNode(30...33)(),
-     IntegerNode(35...38)(),
-     IntegerNode(40...43)(),
-     IntegerNode(45...47)(),
-     IntegerNode(49...51)(),
-     IntegerNode(53...55)(),
-     IntegerNode(57...60)(),
-     IntegerNode(62...65)(),
-     IntegerNode(67...70)(),
-     IntegerNode(72...75)(),
-     IntegerNode(77...80)(),
-     IntegerNode(82...85)(),
-     ImaginaryNode(87...89)(IntegerNode(87...88)()),
-     RationalNode(91...93)(IntegerNode(91...92)()),
-     IntegerNode(95...97)(),
-     ImaginaryNode(99...102)(RationalNode(99...101)(IntegerNode(99...100)())),
-     ImaginaryNode(104...109)(RationalNode(104...108)(FloatNode(104...107)())),
-     ImaginaryNode(111...115)(
-       RationalNode(111...114)(IntegerNode(111...113)())
-     ),
-     ImaginaryNode(117...123)(RationalNode(117...122)(FloatNode(117...121)())),
-     RationalNode(125...129)(IntegerNode(125...128)()),
-     ImaginaryNode(131...135)(IntegerNode(131...134)()),
-     ImaginaryNode(137...142)(
-       RationalNode(137...141)(IntegerNode(137...140)())
-     ),
-     RationalNode(144...148)(IntegerNode(144...147)()),
-     ImaginaryNode(150...154)(IntegerNode(150...153)()),
-     ImaginaryNode(156...161)(
-       RationalNode(156...160)(IntegerNode(156...159)())
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/patterns.txt b/test/yarp/snapshots/patterns.txt
deleted file mode 100644
index b2f03f6b6836df..00000000000000
--- a/test/yarp/snapshots/patterns.txt
+++ /dev/null
@@ -1,3850 +0,0 @@
-ProgramNode(0...3743)(
-  [:bar, :baz, :qux, :b, :a],
-  StatementsNode(0...3743)(
-    [MatchRequiredNode(0...10)(
-       CallNode(0...3)(nil, nil, (0...3), nil, nil, nil, nil, 2, "foo"),
-       LocalVariableTargetNode(7...10)(:bar, 0),
-       (4...6)
-     ),
-     MatchRequiredNode(11...19)(
-       CallNode(11...14)(nil, nil, (11...14), nil, nil, nil, nil, 2, "foo"),
-       IntegerNode(18...19)(),
-       (15...17)
-     ),
-     MatchRequiredNode(20...30)(
-       CallNode(20...23)(nil, nil, (20...23), nil, nil, nil, nil, 2, "foo"),
-       FloatNode(27...30)(),
-       (24...26)
-     ),
-     MatchRequiredNode(31...40)(
-       CallNode(31...34)(nil, nil, (31...34), nil, nil, nil, nil, 2, "foo"),
-       ImaginaryNode(38...40)(IntegerNode(38...39)()),
-       (35...37)
-     ),
-     MatchRequiredNode(41...50)(
-       CallNode(41...44)(nil, nil, (41...44), nil, nil, nil, nil, 2, "foo"),
-       RationalNode(48...50)(IntegerNode(48...49)()),
-       (45...47)
-     ),
-     MatchRequiredNode(51...62)(
-       CallNode(51...54)(nil, nil, (51...54), nil, nil, nil, nil, 2, "foo"),
-       SymbolNode(58...62)((58...59), (59...62), nil, "foo"),
-       (55...57)
-     ),
-     MatchRequiredNode(63...77)(
-       CallNode(63...66)(nil, nil, (63...66), nil, nil, nil, nil, 2, "foo"),
-       SymbolNode(70...77)((70...73), (73...76), (76...77), "foo"),
-       (67...69)
-     ),
-     MatchRequiredNode(78...91)(
-       CallNode(78...81)(nil, nil, (78...81), nil, nil, nil, nil, 2, "foo"),
-       SymbolNode(85...91)((85...87), (87...90), (90...91), "foo"),
-       (82...84)
-     ),
-     MatchRequiredNode(92...104)(
-       CallNode(92...95)(nil, nil, (92...95), nil, nil, nil, nil, 2, "foo"),
-       RegularExpressionNode(99...104)(
-         (99...100),
-         (100...103),
-         (103...104),
-         "foo",
-         0
-       ),
-       (96...98)
-     ),
-     MatchRequiredNode(105...117)(
-       CallNode(105...108)(
-         nil,
-         nil,
-         (105...108),
-         nil,
-         nil,
-         nil,
-         nil,
-         2,
-         "foo"
-       ),
-       XStringNode(112...117)((112...113), (113...116), (116...117), "foo"),
-       (109...111)
-     ),
-     MatchRequiredNode(118...132)(
-       CallNode(118...121)(
-         nil,
-         nil,
-         (118...121),
-         nil,
-         nil,
-         nil,
-         nil,
-         2,
-         "foo"
-       ),
-       XStringNode(125...132)((125...128), (128...131), (131...132), "foo"),
-       (122...124)
-     ),
-     MatchRequiredNode(133...147)(
-       CallNode(133...136)(
-         nil,
-         nil,
-         (133...136),
-         nil,
-         nil,
-         nil,
-         nil,
-         2,
-         "foo"
-       ),
-       ArrayNode(140...147)(
-         [SymbolNode(143...146)(nil, (143...146), nil, "foo")],
-         (140...143),
-         (146...147)
-       ),
-       (137...139)
-     ),
-     MatchRequiredNode(148...162)(
-       CallNode(148...151)(
-         nil,
-         nil,
-         (148...151),
-         nil,
-         nil,
-         nil,
-         nil,
-         2,
-         "foo"
-       ),
-       ArrayNode(155...162)(
-         [SymbolNode(158...161)(nil, (158...161), nil, "foo")],
-         (155...158),
-         (161...162)
-       ),
-       (152...154)
-     ),
-     MatchRequiredNode(163...177)(
-       CallNode(163...166)(
-         nil,
-         nil,
-         (163...166),
-         nil,
-         nil,
-         nil,
-         nil,
-         2,
-         "foo"
-       ),
-       ArrayNode(170...177)(
-         [StringNode(173...176)(nil, (173...176), nil, "foo")],
-         (170...173),
-         (176...177)
-       ),
-       (167...169)
-     ),
-     MatchRequiredNode(178...192)(
-       CallNode(178...181)(
-         nil,
-         nil,
-         (178...181),
-         nil,
-         nil,
-         nil,
-         nil,
-         2,
-         "foo"
-       ),
-       ArrayNode(185...192)(
-         [StringNode(188...191)(nil, (188...191), nil, "foo")],
-         (185...188),
-         (191...192)
-       ),
-       (182...184)
-     ),
-     MatchRequiredNode(193...207)(
-       CallNode(193...196)(
-         nil,
-         nil,
-         (193...196),
-         nil,
-         nil,
-         nil,
-         nil,
-         2,
-         "foo"
-       ),
-       StringNode(200...207)((200...203), (203...206), (206...207), "foo"),
-       (197...199)
-     ),
-     MatchRequiredNode(208...222)(
-       CallNode(208...211)(
-         nil,
-         nil,
-         (208...211),
-         nil,
-         nil,
-         nil,
-         nil,
-         2,
-         "foo"
-       ),
-       StringNode(215...222)((215...218), (218...221), (221...222), "foo"),
-       (212...214)
-     ),
-     MatchRequiredNode(223...235)(
-       CallNode(223...226)(
-         nil,
-         nil,
-         (223...226),
-         nil,
-         nil,
-         nil,
-         nil,
-         2,
-         "foo"
-       ),
-       StringNode(230...235)((230...231), (231...234), (234...235), "foo"),
-       (227...229)
-     ),
-     MatchRequiredNode(236...246)(
-       CallNode(236...239)(
-         nil,
-         nil,
-         (236...239),
-         nil,
-         nil,
-         nil,
-         nil,
-         2,
-         "foo"
-       ),
-       NilNode(243...246)(),
-       (240...242)
-     ),
-     MatchRequiredNode(247...258)(
-       CallNode(247...250)(
-         nil,
-         nil,
-         (247...250),
-         nil,
-         nil,
-         nil,
-         nil,
-         2,
-         "foo"
-       ),
-       SelfNode(254...258)(),
-       (251...253)
-     ),
-     MatchRequiredNode(259...270)(
-       CallNode(259...262)(
-         nil,
-         nil,
-         (259...262),
-         nil,
-         nil,
-         nil,
-         nil,
-         2,
-         "foo"
-       ),
-       TrueNode(266...270)(),
-       (263...265)
-     ),
-     MatchRequiredNode(271...283)(
-       CallNode(271...274)(
-         nil,
-         nil,
-         (271...274),
-         nil,
-         nil,
-         nil,
-         nil,
-         2,
-         "foo"
-       ),
-       FalseNode(278...283)(),
-       (275...277)
-     ),
-     MatchRequiredNode(284...299)(
-       CallNode(284...287)(
-         nil,
-         nil,
-         (284...287),
-         nil,
-         nil,
-         nil,
-         nil,
-         2,
-         "foo"
-       ),
-       SourceFileNode(291...299)("patterns.txt"),
-       (288...290)
-     ),
-     MatchRequiredNode(300...315)(
-       CallNode(300...303)(
-         nil,
-         nil,
-         (300...303),
-         nil,
-         nil,
-         nil,
-         nil,
-         2,
-         "foo"
-       ),
-       SourceLineNode(307...315)(),
-       (304...306)
-     ),
-     MatchRequiredNode(316...335)(
-       CallNode(316...319)(
-         nil,
-         nil,
-         (316...319),
-         nil,
-         nil,
-         nil,
-         nil,
-         2,
-         "foo"
-       ),
-       SourceEncodingNode(323...335)(),
-       (320...322)
-     ),
-     MatchRequiredNode(336...353)(
-       CallNode(336...339)(
-         nil,
-         nil,
-         (336...339),
-         nil,
-         nil,
-         nil,
-         nil,
-         2,
-         "foo"
-       ),
-       LambdaNode(343...353)(
-         [],
-         (343...345),
-         (346...347),
-         (352...353),
-         nil,
-         StatementsNode(348...351)([LocalVariableReadNode(348...351)(:bar, 1)])
-       ),
-       (340...342)
-     ),
-     MatchRequiredNode(355...368)(
-       CallNode(355...358)(
-         nil,
-         nil,
-         (355...358),
-         nil,
-         nil,
-         nil,
-         nil,
-         2,
-         "foo"
-       ),
-       RangeNode(362...368)(
-         IntegerNode(362...363)(),
-         IntegerNode(367...368)(),
-         (364...366),
-         0
-       ),
-       (359...361)
-     ),
-     MatchRequiredNode(369...386)(
-       CallNode(369...372)(
-         nil,
-         nil,
-         (369...372),
-         nil,
-         nil,
-         nil,
-         nil,
-         2,
-         "foo"
-       ),
-       RangeNode(376...386)(
-         FloatNode(376...379)(),
-         FloatNode(383...386)(),
-         (380...382),
-         0
-       ),
-       (373...375)
-     ),
-     MatchRequiredNode(387...402)(
-       CallNode(387...390)(
-         nil,
-         nil,
-         (387...390),
-         nil,
-         nil,
-         nil,
-         nil,
-         2,
-         "foo"
-       ),
-       RangeNode(394...402)(
-         ImaginaryNode(394...396)(IntegerNode(394...395)()),
-         ImaginaryNode(400...402)(IntegerNode(400...401)()),
-         (397...399),
-         0
-       ),
-       (391...393)
-     ),
-     MatchRequiredNode(403...418)(
-       CallNode(403...406)(
-         nil,
-         nil,
-         (403...406),
-         nil,
-         nil,
-         nil,
-         nil,
-         2,
-         "foo"
-       ),
-       RangeNode(410...418)(
-         RationalNode(410...412)(IntegerNode(410...411)()),
-         RationalNode(416...418)(IntegerNode(416...417)()),
-         (413...415),
-         0
-       ),
-       (407...409)
-     ),
-     MatchRequiredNode(419...438)(
-       CallNode(419...422)(
-         nil,
-         nil,
-         (419...422),
-         nil,
-         nil,
-         nil,
-         nil,
-         2,
-         "foo"
-       ),
-       RangeNode(426...438)(
-         SymbolNode(426...430)((426...427), (427...430), nil, "foo"),
-         SymbolNode(434...438)((434...435), (435...438), nil, "foo"),
-         (431...433),
-         0
-       ),
-       (423...425)
-     ),
-     MatchRequiredNode(439...464)(
-       CallNode(439...442)(
-         nil,
-         nil,
-         (439...442),
-         nil,
-         nil,
-         nil,
-         nil,
-         2,
-         "foo"
-       ),
-       RangeNode(446...464)(
-         SymbolNode(446...453)((446...449), (449...452), (452...453), "foo"),
-         SymbolNode(457...464)((457...460), (460...463), (463...464), "foo"),
-         (454...456),
-         0
-       ),
-       (443...445)
-     ),
-     MatchRequiredNode(465...488)(
-       CallNode(465...468)(
-         nil,
-         nil,
-         (465...468),
-         nil,
-         nil,
-         nil,
-         nil,
-         2,
-         "foo"
-       ),
-       RangeNode(472...488)(
-         SymbolNode(472...478)((472...474), (474...477), (477...478), "foo"),
-         SymbolNode(482...488)((482...484), (484...487), (487...488), "foo"),
-         (479...481),
-         0
-       ),
-       (469...471)
-     ),
-     MatchRequiredNode(489...510)(
-       CallNode(489...492)(
-         nil,
-         nil,
-         (489...492),
-         nil,
-         nil,
-         nil,
-         nil,
-         2,
-         "foo"
-       ),
-       RangeNode(496...510)(
-         RegularExpressionNode(496...501)(
-           (496...497),
-           (497...500),
-           (500...501),
-           "foo",
-           0
-         ),
-         RegularExpressionNode(505...510)(
-           (505...506),
-           (506...509),
-           (509...510),
-           "foo",
-           0
-         ),
-         (502...504),
-         0
-       ),
-       (493...495)
-     ),
-     MatchRequiredNode(511...532)(
-       CallNode(511...514)(
-         nil,
-         nil,
-         (511...514),
-         nil,
-         nil,
-         nil,
-         nil,
-         2,
-         "foo"
-       ),
-       RangeNode(518...532)(
-         XStringNode(518...523)((518...519), (519...522), (522...523), "foo"),
-         XStringNode(527...532)((527...528), (528...531), (531...532), "foo"),
-         (524...526),
-         0
-       ),
-       (515...517)
-     ),
-     MatchRequiredNode(533...558)(
-       CallNode(533...536)(
-         nil,
-         nil,
-         (533...536),
-         nil,
-         nil,
-         nil,
-         nil,
-         2,
-         "foo"
-       ),
-       RangeNode(540...558)(
-         XStringNode(540...547)((540...543), (543...546), (546...547), "foo"),
-         XStringNode(551...558)((551...554), (554...557), (557...558), "foo"),
-         (548...550),
-         0
-       ),
-       (537...539)
-     ),
-     MatchRequiredNode(559...584)(
-       CallNode(559...562)(
-         nil,
-         nil,
-         (559...562),
-         nil,
-         nil,
-         nil,
-         nil,
-         2,
-         "foo"
-       ),
-       RangeNode(566...584)(
-         ArrayNode(566...573)(
-           [SymbolNode(569...572)(nil, (569...572), nil, "foo")],
-           (566...569),
-           (572...573)
-         ),
-         ArrayNode(577...584)(
-           [SymbolNode(580...583)(nil, (580...583), nil, "foo")],
-           (577...580),
-           (583...584)
-         ),
-         (574...576),
-         0
-       ),
-       (563...565)
-     ),
-     MatchRequiredNode(585...610)(
-       CallNode(585...588)(
-         nil,
-         nil,
-         (585...588),
-         nil,
-         nil,
-         nil,
-         nil,
-         2,
-         "foo"
-       ),
-       RangeNode(592...610)(
-         ArrayNode(592...599)(
-           [SymbolNode(595...598)(nil, (595...598), nil, "foo")],
-           (592...595),
-           (598...599)
-         ),
-         ArrayNode(603...610)(
-           [SymbolNode(606...609)(nil, (606...609), nil, "foo")],
-           (603...606),
-           (609...610)
-         ),
-         (600...602),
-         0
-       ),
-       (589...591)
-     ),
-     MatchRequiredNode(611...636)(
-       CallNode(611...614)(
-         nil,
-         nil,
-         (611...614),
-         nil,
-         nil,
-         nil,
-         nil,
-         2,
-         "foo"
-       ),
-       RangeNode(618...636)(
-         ArrayNode(618...625)(
-           [StringNode(621...624)(nil, (621...624), nil, "foo")],
-           (618...621),
-           (624...625)
-         ),
-         ArrayNode(629...636)(
-           [StringNode(632...635)(nil, (632...635), nil, "foo")],
-           (629...632),
-           (635...636)
-         ),
-         (626...628),
-         0
-       ),
-       (615...617)
-     ),
-     MatchRequiredNode(637...662)(
-       CallNode(637...640)(
-         nil,
-         nil,
-         (637...640),
-         nil,
-         nil,
-         nil,
-         nil,
-         2,
-         "foo"
-       ),
-       RangeNode(644...662)(
-         ArrayNode(644...651)(
-           [StringNode(647...650)(nil, (647...650), nil, "foo")],
-           (644...647),
-           (650...651)
-         ),
-         ArrayNode(655...662)(
-           [StringNode(658...661)(nil, (658...661), nil, "foo")],
-           (655...658),
-           (661...662)
-         ),
-         (652...654),
-         0
-       ),
-       (641...643)
-     ),
-     MatchRequiredNode(663...688)(
-       CallNode(663...666)(
-         nil,
-         nil,
-         (663...666),
-         nil,
-         nil,
-         nil,
-         nil,
-         2,
-         "foo"
-       ),
-       RangeNode(670...688)(
-         StringNode(670...677)((670...673), (673...676), (676...677), "foo"),
-         StringNode(681...688)((681...684), (684...687), (687...688), "foo"),
-         (678...680),
-         0
-       ),
-       (667...669)
-     ),
-     MatchRequiredNode(689...714)(
-       CallNode(689...692)(
-         nil,
-         nil,
-         (689...692),
-         nil,
-         nil,
-         nil,
-         nil,
-         2,
-         "foo"
-       ),
-       RangeNode(696...714)(
-         StringNode(696...703)((696...699), (699...702), (702...703), "foo"),
-         StringNode(707...714)((707...710), (710...713), (713...714), "foo"),
-         (704...706),
-         0
-       ),
-       (693...695)
-     ),
-     MatchRequiredNode(715...736)(
-       CallNode(715...718)(
-         nil,
-         nil,
-         (715...718),
-         nil,
-         nil,
-         nil,
-         nil,
-         2,
-         "foo"
-       ),
-       RangeNode(722...736)(
-         StringNode(722...727)((722...723), (723...726), (726...727), "foo"),
-         StringNode(731...736)((731...732), (732...735), (735...736), "foo"),
-         (728...730),
-         0
-       ),
-       (719...721)
-     ),
-     MatchRequiredNode(737...754)(
-       CallNode(737...740)(
-         nil,
-         nil,
-         (737...740),
-         nil,
-         nil,
-         nil,
-         nil,
-         2,
-         "foo"
-       ),
-       RangeNode(744...754)(
-         NilNode(744...747)(),
-         NilNode(751...754)(),
-         (748...750),
-         0
-       ),
-       (741...743)
-     ),
-     MatchRequiredNode(755...774)(
-       CallNode(755...758)(
-         nil,
-         nil,
-         (755...758),
-         nil,
-         nil,
-         nil,
-         nil,
-         2,
-         "foo"
-       ),
-       RangeNode(762...774)(
-         SelfNode(762...766)(),
-         SelfNode(770...774)(),
-         (767...769),
-         0
-       ),
-       (759...761)
-     ),
-     MatchRequiredNode(775...794)(
-       CallNode(775...778)(
-         nil,
-         nil,
-         (775...778),
-         nil,
-         nil,
-         nil,
-         nil,
-         2,
-         "foo"
-       ),
-       RangeNode(782...794)(
-         TrueNode(782...786)(),
-         TrueNode(790...794)(),
-         (787...789),
-         0
-       ),
-       (779...781)
-     ),
-     MatchRequiredNode(795...816)(
-       CallNode(795...798)(
-         nil,
-         nil,
-         (795...798),
-         nil,
-         nil,
-         nil,
-         nil,
-         2,
-         "foo"
-       ),
-       RangeNode(802...816)(
-         FalseNode(802...807)(),
-         FalseNode(811...816)(),
-         (808...810),
-         0
-       ),
-       (799...801)
-     ),
-     MatchRequiredNode(817...844)(
-       CallNode(817...820)(
-         nil,
-         nil,
-         (817...820),
-         nil,
-         nil,
-         nil,
-         nil,
-         2,
-         "foo"
-       ),
-       RangeNode(824...844)(
-         SourceFileNode(824...832)("patterns.txt"),
-         SourceFileNode(836...844)("patterns.txt"),
-         (833...835),
-         0
-       ),
-       (821...823)
-     ),
-     MatchRequiredNode(845...872)(
-       CallNode(845...848)(
-         nil,
-         nil,
-         (845...848),
-         nil,
-         nil,
-         nil,
-         nil,
-         2,
-         "foo"
-       ),
-       RangeNode(852...872)(
-         SourceLineNode(852...860)(),
-         SourceLineNode(864...872)(),
-         (861...863),
-         0
-       ),
-       (849...851)
-     ),
-     MatchRequiredNode(873...908)(
-       CallNode(873...876)(
-         nil,
-         nil,
-         (873...876),
-         nil,
-         nil,
-         nil,
-         nil,
-         2,
-         "foo"
-       ),
-       RangeNode(880...908)(
-         SourceEncodingNode(880...892)(),
-         SourceEncodingNode(896...908)(),
-         (893...895),
-         0
-       ),
-       (877...879)
-     ),
-     MatchRequiredNode(909...940)(
-       CallNode(909...912)(
-         nil,
-         nil,
-         (909...912),
-         nil,
-         nil,
-         nil,
-         nil,
-         2,
-         "foo"
-       ),
-       RangeNode(916...940)(
-         LambdaNode(916...926)(
-           [],
-           (916...918),
-           (919...920),
-           (925...926),
-           nil,
-           StatementsNode(921...924)(
-             [LocalVariableReadNode(921...924)(:bar, 1)]
-           )
-         ),
-         LambdaNode(930...940)(
-           [],
-           (930...932),
-           (933...934),
-           (939...940),
-           nil,
-           StatementsNode(935...938)(
-             [LocalVariableReadNode(935...938)(:bar, 1)]
-           )
-         ),
-         (927...929),
-         0
-       ),
-       (913...915)
-     ),
-     MatchRequiredNode(942...953)(
-       CallNode(942...945)(
-         nil,
-         nil,
-         (942...945),
-         nil,
-         nil,
-         nil,
-         nil,
-         2,
-         "foo"
-       ),
-       PinnedVariableNode(949...953)(
-         LocalVariableReadNode(950...953)(:bar, 0),
-         (949...950)
-       ),
-       (946...948)
-     ),
-     MatchRequiredNode(954...966)(
-       CallNode(954...957)(
-         nil,
-         nil,
-         (954...957),
-         nil,
-         nil,
-         nil,
-         nil,
-         2,
-         "foo"
-       ),
-       PinnedVariableNode(961...966)(
-         InstanceVariableReadNode(962...966)(:@bar),
-         (961...962)
-       ),
-       (958...960)
-     ),
-     MatchRequiredNode(967...980)(
-       CallNode(967...970)(
-         nil,
-         nil,
-         (967...970),
-         nil,
-         nil,
-         nil,
-         nil,
-         2,
-         "foo"
-       ),
-       PinnedVariableNode(974...980)(
-         ClassVariableReadNode(975...980)(:@@bar),
-         (974...975)
-       ),
-       (971...973)
-     ),
-     MatchRequiredNode(981...993)(
-       CallNode(981...984)(
-         nil,
-         nil,
-         (981...984),
-         nil,
-         nil,
-         nil,
-         nil,
-         2,
-         "foo"
-       ),
-       PinnedVariableNode(988...993)(
-         GlobalVariableReadNode(989...993)(:$bar),
-         (988...989)
-       ),
-       (985...987)
-     ),
-     MatchRequiredNode(995...1006)(
-       CallNode(995...998)(
-         nil,
-         nil,
-         (995...998),
-         nil,
-         nil,
-         nil,
-         nil,
-         2,
-         "foo"
-       ),
-       PinnedExpressionNode(1002...1006)(
-         IntegerNode(1004...1005)(),
-         (1002...1003),
-         (1003...1004),
-         (1005...1006)
-       ),
-       (999...1001)
-     ),
-     MatchRequiredNode(1007...1020)(
-       CallNode(1007...1010)(
-         nil,
-         nil,
-         (1007...1010),
-         nil,
-         nil,
-         nil,
-         nil,
-         2,
-         "foo"
-       ),
-       PinnedExpressionNode(1014...1020)(
-         NilNode(1016...1019)(),
-         (1014...1015),
-         (1015...1016),
-         (1019...1020)
-       ),
-       (1011...1013)
-     ),
-     MatchRequiredNode(1021...1044)(
-       CallNode(1021...1024)(
-         nil,
-         nil,
-         (1021...1024),
-         nil,
-         nil,
-         nil,
-         nil,
-         2,
-         "foo"
-       ),
-       PinnedExpressionNode(1028...1044)(
-         CallNode(1030...1043)(
-           StringNode(1030...1035)(
-             (1030...1031),
-             (1031...1034),
-             (1034...1035),
-             "bar"
-           ),
-           nil,
-           (1036...1037),
-           nil,
-           ArgumentsNode(1038...1043)(
-             [StringNode(1038...1043)(
-                (1038...1039),
-                (1039...1042),
-                (1042...1043),
-                "baz"
-              )]
-           ),
-           nil,
-           nil,
-           0,
-           "+"
-         ),
-         (1028...1029),
-         (1029...1030),
-         (1043...1044)
-       ),
-       (1025...1027)
-     ),
-     MatchRequiredNode(1046...1056)(
-       CallNode(1046...1049)(
-         nil,
-         nil,
-         (1046...1049),
-         nil,
-         nil,
-         nil,
-         nil,
-         2,
-         "foo"
-       ),
-       ConstantReadNode(1053...1056)(:Foo),
-       (1050...1052)
-     ),
-     MatchRequiredNode(1057...1077)(
-       CallNode(1057...1060)(
-         nil,
-         nil,
-         (1057...1060),
-         nil,
-         nil,
-         nil,
-         nil,
-         2,
-         "foo"
-       ),
-       ConstantPathNode(1064...1077)(
-         ConstantPathNode(1064...1072)(
-           ConstantReadNode(1064...1067)(:Foo),
-           ConstantReadNode(1069...1072)(:Bar),
-           (1067...1069)
-         ),
-         ConstantReadNode(1074...1077)(:Baz),
-         (1072...1074)
-       ),
-       (1061...1063)
-     ),
-     MatchRequiredNode(1078...1090)(
-       CallNode(1078...1081)(
-         nil,
-         nil,
-         (1078...1081),
-         nil,
-         nil,
-         nil,
-         nil,
-         2,
-         "foo"
-       ),
-       ConstantPathNode(1085...1090)(
-         nil,
-         ConstantReadNode(1087...1090)(:Foo),
-         (1085...1087)
-       ),
-       (1082...1084)
-     ),
-     MatchRequiredNode(1091...1113)(
-       CallNode(1091...1094)(
-         nil,
-         nil,
-         (1091...1094),
-         nil,
-         nil,
-         nil,
-         nil,
-         2,
-         "foo"
-       ),
-       ConstantPathNode(1098...1113)(
-         ConstantPathNode(1098...1108)(
-           ConstantPathNode(1098...1103)(
-             nil,
-             ConstantReadNode(1100...1103)(:Foo),
-             (1098...1100)
-           ),
-           ConstantReadNode(1105...1108)(:Bar),
-           (1103...1105)
-         ),
-         ConstantReadNode(1110...1113)(:Baz),
-         (1108...1110)
-       ),
-       (1095...1097)
-     ),
-     MatchRequiredNode(1115...1127)(
-       CallNode(1115...1118)(
-         nil,
-         nil,
-         (1115...1118),
-         nil,
-         nil,
-         nil,
-         nil,
-         2,
-         "foo"
-       ),
-       ArrayPatternNode(1122...1127)(
-         ConstantReadNode(1122...1125)(:Foo),
-         [],
-         nil,
-         [],
-         (1125...1126),
-         (1126...1127)
-       ),
-       (1119...1121)
-     ),
-     MatchRequiredNode(1128...1141)(
-       CallNode(1128...1131)(
-         nil,
-         nil,
-         (1128...1131),
-         nil,
-         nil,
-         nil,
-         nil,
-         2,
-         "foo"
-       ),
-       ArrayPatternNode(1135...1141)(
-         ConstantReadNode(1135...1138)(:Foo),
-         [IntegerNode(1139...1140)()],
-         nil,
-         [],
-         (1138...1139),
-         (1140...1141)
-       ),
-       (1132...1134)
-     ),
-     MatchRequiredNode(1142...1161)(
-       CallNode(1142...1145)(
-         nil,
-         nil,
-         (1142...1145),
-         nil,
-         nil,
-         nil,
-         nil,
-         2,
-         "foo"
-       ),
-       ArrayPatternNode(1149...1161)(
-         ConstantReadNode(1149...1152)(:Foo),
-         [IntegerNode(1153...1154)(),
-          IntegerNode(1156...1157)(),
-          IntegerNode(1159...1160)()],
-         nil,
-         [],
-         (1152...1153),
-         (1160...1161)
-       ),
-       (1146...1148)
-     ),
-     MatchRequiredNode(1162...1177)(
-       CallNode(1162...1165)(
-         nil,
-         nil,
-         (1162...1165),
-         nil,
-         nil,
-         nil,
-         nil,
-         2,
-         "foo"
-       ),
-       ArrayPatternNode(1169...1177)(
-         ConstantReadNode(1169...1172)(:Foo),
-         [LocalVariableTargetNode(1173...1176)(:bar, 0)],
-         nil,
-         [],
-         (1172...1173),
-         (1176...1177)
-       ),
-       (1166...1168)
-     ),
-     MatchRequiredNode(1178...1199)(
-       CallNode(1178...1181)(
-         nil,
-         nil,
-         (1178...1181),
-         nil,
-         nil,
-         nil,
-         nil,
-         2,
-         "foo"
-       ),
-       ArrayPatternNode(1185...1199)(
-         ConstantReadNode(1185...1188)(:Foo),
-         [],
-         SplatNode(1189...1193)(
-           (1189...1190),
-           LocalVariableTargetNode(1190...1193)(:bar, 0)
-         ),
-         [LocalVariableTargetNode(1195...1198)(:baz, 0)],
-         (1188...1189),
-         (1198...1199)
-       ),
-       (1182...1184)
-     ),
-     MatchRequiredNode(1200...1221)(
-       CallNode(1200...1203)(
-         nil,
-         nil,
-         (1200...1203),
-         nil,
-         nil,
-         nil,
-         nil,
-         2,
-         "foo"
-       ),
-       ArrayPatternNode(1207...1221)(
-         ConstantReadNode(1207...1210)(:Foo),
-         [LocalVariableTargetNode(1211...1214)(:bar, 0)],
-         SplatNode(1216...1220)(
-           (1216...1217),
-           LocalVariableTargetNode(1217...1220)(:baz, 0)
-         ),
-         [],
-         (1210...1211),
-         (1220...1221)
-       ),
-       (1204...1206)
-     ),
-     MatchRequiredNode(1222...1249)(
-       CallNode(1222...1225)(
-         nil,
-         nil,
-         (1222...1225),
-         nil,
-         nil,
-         nil,
-         nil,
-         2,
-         "foo"
-       ),
-       FindPatternNode(1229...1249)(
-         ConstantReadNode(1229...1232)(:Foo),
-         SplatNode(1233...1237)(
-           (1233...1234),
-           LocalVariableTargetNode(1234...1237)(:bar, 0)
-         ),
-         [LocalVariableTargetNode(1239...1242)(:baz, 0)],
-         SplatNode(1244...1248)(
-           (1244...1245),
-           LocalVariableTargetNode(1245...1248)(:qux, 0)
-         ),
-         (1232...1233),
-         (1248...1249)
-       ),
-       (1226...1228)
-     ),
-     MatchRequiredNode(1251...1263)(
-       CallNode(1251...1254)(
-         nil,
-         nil,
-         (1251...1254),
-         nil,
-         nil,
-         nil,
-         nil,
-         2,
-         "foo"
-       ),
-       ArrayPatternNode(1258...1263)(
-         ConstantReadNode(1258...1261)(:Foo),
-         [],
-         nil,
-         [],
-         (1261...1262),
-         (1262...1263)
-       ),
-       (1255...1257)
-     ),
-     MatchRequiredNode(1264...1277)(
-       CallNode(1264...1267)(
-         nil,
-         nil,
-         (1264...1267),
-         nil,
-         nil,
-         nil,
-         nil,
-         2,
-         "foo"
-       ),
-       ArrayPatternNode(1271...1277)(
-         ConstantReadNode(1271...1274)(:Foo),
-         [IntegerNode(1275...1276)()],
-         nil,
-         [],
-         (1274...1275),
-         (1276...1277)
-       ),
-       (1268...1270)
-     ),
-     MatchRequiredNode(1278...1297)(
-       CallNode(1278...1281)(
-         nil,
-         nil,
-         (1278...1281),
-         nil,
-         nil,
-         nil,
-         nil,
-         2,
-         "foo"
-       ),
-       ArrayPatternNode(1285...1297)(
-         ConstantReadNode(1285...1288)(:Foo),
-         [IntegerNode(1289...1290)(),
-          IntegerNode(1292...1293)(),
-          IntegerNode(1295...1296)()],
-         nil,
-         [],
-         (1288...1289),
-         (1296...1297)
-       ),
-       (1282...1284)
-     ),
-     MatchRequiredNode(1298...1315)(
-       CallNode(1298...1301)(
-         nil,
-         nil,
-         (1298...1301),
-         nil,
-         nil,
-         nil,
-         nil,
-         2,
-         "foo"
-       ),
-       ArrayPatternNode(1305...1315)(
-         ConstantReadNode(1305...1308)(:Foo),
-         [ArrayPatternNode(1309...1314)(
-            ConstantReadNode(1309...1312)(:Foo),
-            [],
-            nil,
-            [],
-            (1312...1313),
-            (1313...1314)
-          )],
-         nil,
-         [],
-         (1308...1309),
-         (1314...1315)
-       ),
-       (1302...1304)
-     ),
-     MatchRequiredNode(1316...1331)(
-       CallNode(1316...1319)(
-         nil,
-         nil,
-         (1316...1319),
-         nil,
-         nil,
-         nil,
-         nil,
-         2,
-         "foo"
-       ),
-       ArrayPatternNode(1323...1331)(
-         ConstantReadNode(1323...1326)(:Foo),
-         [LocalVariableTargetNode(1327...1330)(:bar, 0)],
-         nil,
-         [],
-         (1326...1327),
-         (1330...1331)
-       ),
-       (1320...1322)
-     ),
-     MatchRequiredNode(1332...1353)(
-       CallNode(1332...1335)(
-         nil,
-         nil,
-         (1332...1335),
-         nil,
-         nil,
-         nil,
-         nil,
-         2,
-         "foo"
-       ),
-       ArrayPatternNode(1339...1353)(
-         ConstantReadNode(1339...1342)(:Foo),
-         [],
-         SplatNode(1343...1347)(
-           (1343...1344),
-           LocalVariableTargetNode(1344...1347)(:bar, 0)
-         ),
-         [LocalVariableTargetNode(1349...1352)(:baz, 0)],
-         (1342...1343),
-         (1352...1353)
-       ),
-       (1336...1338)
-     ),
-     MatchRequiredNode(1354...1375)(
-       CallNode(1354...1357)(
-         nil,
-         nil,
-         (1354...1357),
-         nil,
-         nil,
-         nil,
-         nil,
-         2,
-         "foo"
-       ),
-       ArrayPatternNode(1361...1375)(
-         ConstantReadNode(1361...1364)(:Foo),
-         [LocalVariableTargetNode(1365...1368)(:bar, 0)],
-         SplatNode(1370...1374)(
-           (1370...1371),
-           LocalVariableTargetNode(1371...1374)(:baz, 0)
-         ),
-         [],
-         (1364...1365),
-         (1374...1375)
-       ),
-       (1358...1360)
-     ),
-     MatchRequiredNode(1376...1403)(
-       CallNode(1376...1379)(
-         nil,
-         nil,
-         (1376...1379),
-         nil,
-         nil,
-         nil,
-         nil,
-         2,
-         "foo"
-       ),
-       FindPatternNode(1383...1403)(
-         ConstantReadNode(1383...1386)(:Foo),
-         SplatNode(1387...1391)(
-           (1387...1388),
-           LocalVariableTargetNode(1388...1391)(:bar, 0)
-         ),
-         [LocalVariableTargetNode(1393...1396)(:baz, 0)],
-         SplatNode(1398...1402)(
-           (1398...1399),
-           LocalVariableTargetNode(1399...1402)(:qux, 0)
-         ),
-         (1386...1387),
-         (1402...1403)
-       ),
-       (1380...1382)
-     ),
-     MatchRequiredNode(1405...1416)(
-       CallNode(1405...1408)(
-         nil,
-         nil,
-         (1405...1408),
-         nil,
-         nil,
-         nil,
-         nil,
-         2,
-         "foo"
-       ),
-       ArrayPatternNode(1412...1416)(
-         nil,
-         [],
-         SplatNode(1412...1416)(
-           (1412...1413),
-           LocalVariableTargetNode(1413...1416)(:bar, 0)
-         ),
-         [],
-         nil,
-         nil
-       ),
-       (1409...1411)
-     ),
-     MatchRequiredNode(1417...1438)(
-       CallNode(1417...1420)(
-         nil,
-         nil,
-         (1417...1420),
-         nil,
-         nil,
-         nil,
-         nil,
-         2,
-         "foo"
-       ),
-       ArrayPatternNode(1424...1438)(
-         nil,
-         [],
-         SplatNode(1424...1428)(
-           (1424...1425),
-           LocalVariableTargetNode(1425...1428)(:bar, 0)
-         ),
-         [LocalVariableTargetNode(1430...1433)(:baz, 0),
-          LocalVariableTargetNode(1435...1438)(:qux, 0)],
-         nil,
-         nil
-       ),
-       (1421...1423)
-     ),
-     MatchRequiredNode(1439...1460)(
-       CallNode(1439...1442)(
-         nil,
-         nil,
-         (1439...1442),
-         nil,
-         nil,
-         nil,
-         nil,
-         2,
-         "foo"
-       ),
-       ArrayPatternNode(1446...1460)(
-         nil,
-         [LocalVariableTargetNode(1446...1449)(:bar, 0)],
-         SplatNode(1451...1455)(
-           (1451...1452),
-           LocalVariableTargetNode(1452...1455)(:baz, 0)
-         ),
-         [LocalVariableTargetNode(1457...1460)(:qux, 0)],
-         nil,
-         nil
-       ),
-       (1443...1445)
-     ),
-     MatchRequiredNode(1461...1482)(
-       CallNode(1461...1464)(
-         nil,
-         nil,
-         (1461...1464),
-         nil,
-         nil,
-         nil,
-         nil,
-         2,
-         "foo"
-       ),
-       ArrayPatternNode(1468...1482)(
-         nil,
-         [LocalVariableTargetNode(1468...1471)(:bar, 0),
-          LocalVariableTargetNode(1473...1476)(:baz, 0)],
-         SplatNode(1478...1482)(
-           (1478...1479),
-           LocalVariableTargetNode(1479...1482)(:qux, 0)
-         ),
-         [],
-         nil,
-         nil
-       ),
-       (1465...1467)
-     ),
-     MatchRequiredNode(1483...1505)(
-       CallNode(1483...1486)(
-         nil,
-         nil,
-         (1483...1486),
-         nil,
-         nil,
-         nil,
-         nil,
-         2,
-         "foo"
-       ),
-       FindPatternNode(1490...1505)(
-         nil,
-         SplatNode(1490...1494)(
-           (1490...1491),
-           LocalVariableTargetNode(1491...1494)(:bar, 0)
-         ),
-         [LocalVariableTargetNode(1496...1499)(:baz, 0)],
-         SplatNode(1501...1505)(
-           (1501...1502),
-           LocalVariableTargetNode(1502...1505)(:qux, 0)
-         ),
-         nil,
-         nil
-       ),
-       (1487...1489)
-     ),
-     MatchRequiredNode(1507...1516)(
-       CallNode(1507...1510)(
-         nil,
-         nil,
-         (1507...1510),
-         nil,
-         nil,
-         nil,
-         nil,
-         2,
-         "foo"
-       ),
-       ArrayPatternNode(1514...1516)(
-         nil,
-         [],
-         nil,
-         [],
-         (1514...1515),
-         (1515...1516)
-       ),
-       (1511...1513)
-     ),
-     MatchRequiredNode(1517...1534)(
-       CallNode(1517...1520)(
-         nil,
-         nil,
-         (1517...1520),
-         nil,
-         nil,
-         nil,
-         nil,
-         2,
-         "foo"
-       ),
-       ArrayPatternNode(1524...1534)(
-         nil,
-         [ArrayPatternNode(1525...1533)(
-            nil,
-            [ArrayPatternNode(1526...1532)(
-               nil,
-               [ArrayPatternNode(1527...1531)(
-                  nil,
-                  [ArrayPatternNode(1528...1530)(
-                     nil,
-                     [],
-                     nil,
-                     [],
-                     (1528...1529),
-                     (1529...1530)
-                   )],
-                  nil,
-                  [],
-                  (1527...1528),
-                  (1530...1531)
-                )],
-               nil,
-               [],
-               (1526...1527),
-               (1531...1532)
-             )],
-            nil,
-            [],
-            (1525...1526),
-            (1532...1533)
-          )],
-         nil,
-         [],
-         (1524...1525),
-         (1533...1534)
-       ),
-       (1521...1523)
-     ),
-     MatchRequiredNode(1536...1549)(
-       CallNode(1536...1539)(
-         nil,
-         nil,
-         (1536...1539),
-         nil,
-         nil,
-         nil,
-         nil,
-         2,
-         "foo"
-       ),
-       ArrayPatternNode(1543...1549)(
-         nil,
-         [],
-         SplatNode(1544...1548)(
-           (1544...1545),
-           LocalVariableTargetNode(1545...1548)(:bar, 0)
-         ),
-         [],
-         (1543...1544),
-         (1548...1549)
-       ),
-       (1540...1542)
-     ),
-     MatchRequiredNode(1550...1573)(
-       CallNode(1550...1553)(
-         nil,
-         nil,
-         (1550...1553),
-         nil,
-         nil,
-         nil,
-         nil,
-         2,
-         "foo"
-       ),
-       ArrayPatternNode(1557...1573)(
-         nil,
-         [],
-         SplatNode(1558...1562)(
-           (1558...1559),
-           LocalVariableTargetNode(1559...1562)(:bar, 0)
-         ),
-         [LocalVariableTargetNode(1564...1567)(:baz, 0),
-          LocalVariableTargetNode(1569...1572)(:qux, 0)],
-         (1557...1558),
-         (1572...1573)
-       ),
-       (1554...1556)
-     ),
-     MatchRequiredNode(1574...1597)(
-       CallNode(1574...1577)(
-         nil,
-         nil,
-         (1574...1577),
-         nil,
-         nil,
-         nil,
-         nil,
-         2,
-         "foo"
-       ),
-       ArrayPatternNode(1581...1597)(
-         nil,
-         [LocalVariableTargetNode(1582...1585)(:bar, 0)],
-         SplatNode(1587...1591)(
-           (1587...1588),
-           LocalVariableTargetNode(1588...1591)(:baz, 0)
-         ),
-         [LocalVariableTargetNode(1593...1596)(:qux, 0)],
-         (1581...1582),
-         (1596...1597)
-       ),
-       (1578...1580)
-     ),
-     MatchRequiredNode(1598...1621)(
-       CallNode(1598...1601)(
-         nil,
-         nil,
-         (1598...1601),
-         nil,
-         nil,
-         nil,
-         nil,
-         2,
-         "foo"
-       ),
-       ArrayPatternNode(1605...1621)(
-         nil,
-         [LocalVariableTargetNode(1606...1609)(:bar, 0),
-          LocalVariableTargetNode(1611...1614)(:baz, 0)],
-         SplatNode(1616...1620)(
-           (1616...1617),
-           LocalVariableTargetNode(1617...1620)(:qux, 0)
-         ),
-         [],
-         (1605...1606),
-         (1620...1621)
-       ),
-       (1602...1604)
-     ),
-     MatchRequiredNode(1622...1646)(
-       CallNode(1622...1625)(
-         nil,
-         nil,
-         (1622...1625),
-         nil,
-         nil,
-         nil,
-         nil,
-         2,
-         "foo"
-       ),
-       FindPatternNode(1629...1646)(
-         nil,
-         SplatNode(1630...1634)(
-           (1630...1631),
-           LocalVariableTargetNode(1631...1634)(:bar, 0)
-         ),
-         [LocalVariableTargetNode(1636...1639)(:baz, 0)],
-         SplatNode(1641...1645)(
-           (1641...1642),
-           LocalVariableTargetNode(1642...1645)(:qux, 0)
-         ),
-         (1629...1630),
-         (1645...1646)
-       ),
-       (1626...1628)
-     ),
-     MatchPredicateNode(1648...1658)(
-       CallNode(1648...1651)(
-         nil,
-         nil,
-         (1648...1651),
-         nil,
-         nil,
-         nil,
-         nil,
-         2,
-         "foo"
-       ),
-       LocalVariableTargetNode(1655...1658)(:bar, 0),
-       (1652...1654)
-     ),
-     MatchPredicateNode(1659...1667)(
-       CallNode(1659...1662)(
-         nil,
-         nil,
-         (1659...1662),
-         nil,
-         nil,
-         nil,
-         nil,
-         2,
-         "foo"
-       ),
-       IntegerNode(1666...1667)(),
-       (1663...1665)
-     ),
-     MatchPredicateNode(1668...1678)(
-       CallNode(1668...1671)(
-         nil,
-         nil,
-         (1668...1671),
-         nil,
-         nil,
-         nil,
-         nil,
-         2,
-         "foo"
-       ),
-       FloatNode(1675...1678)(),
-       (1672...1674)
-     ),
-     MatchPredicateNode(1679...1688)(
-       CallNode(1679...1682)(
-         nil,
-         nil,
-         (1679...1682),
-         nil,
-         nil,
-         nil,
-         nil,
-         2,
-         "foo"
-       ),
-       ImaginaryNode(1686...1688)(IntegerNode(1686...1687)()),
-       (1683...1685)
-     ),
-     MatchPredicateNode(1689...1698)(
-       CallNode(1689...1692)(
-         nil,
-         nil,
-         (1689...1692),
-         nil,
-         nil,
-         nil,
-         nil,
-         2,
-         "foo"
-       ),
-       RationalNode(1696...1698)(IntegerNode(1696...1697)()),
-       (1693...1695)
-     ),
-     MatchPredicateNode(1699...1710)(
-       CallNode(1699...1702)(
-         nil,
-         nil,
-         (1699...1702),
-         nil,
-         nil,
-         nil,
-         nil,
-         2,
-         "foo"
-       ),
-       SymbolNode(1706...1710)((1706...1707), (1707...1710), nil, "foo"),
-       (1703...1705)
-     ),
-     MatchPredicateNode(1711...1725)(
-       CallNode(1711...1714)(
-         nil,
-         nil,
-         (1711...1714),
-         nil,
-         nil,
-         nil,
-         nil,
-         2,
-         "foo"
-       ),
-       SymbolNode(1718...1725)(
-         (1718...1721),
-         (1721...1724),
-         (1724...1725),
-         "foo"
-       ),
-       (1715...1717)
-     ),
-     MatchPredicateNode(1726...1739)(
-       CallNode(1726...1729)(
-         nil,
-         nil,
-         (1726...1729),
-         nil,
-         nil,
-         nil,
-         nil,
-         2,
-         "foo"
-       ),
-       SymbolNode(1733...1739)(
-         (1733...1735),
-         (1735...1738),
-         (1738...1739),
-         "foo"
-       ),
-       (1730...1732)
-     ),
-     MatchPredicateNode(1740...1752)(
-       CallNode(1740...1743)(
-         nil,
-         nil,
-         (1740...1743),
-         nil,
-         nil,
-         nil,
-         nil,
-         2,
-         "foo"
-       ),
-       RegularExpressionNode(1747...1752)(
-         (1747...1748),
-         (1748...1751),
-         (1751...1752),
-         "foo",
-         0
-       ),
-       (1744...1746)
-     ),
-     MatchPredicateNode(1753...1765)(
-       CallNode(1753...1756)(
-         nil,
-         nil,
-         (1753...1756),
-         nil,
-         nil,
-         nil,
-         nil,
-         2,
-         "foo"
-       ),
-       XStringNode(1760...1765)(
-         (1760...1761),
-         (1761...1764),
-         (1764...1765),
-         "foo"
-       ),
-       (1757...1759)
-     ),
-     MatchPredicateNode(1766...1780)(
-       CallNode(1766...1769)(
-         nil,
-         nil,
-         (1766...1769),
-         nil,
-         nil,
-         nil,
-         nil,
-         2,
-         "foo"
-       ),
-       XStringNode(1773...1780)(
-         (1773...1776),
-         (1776...1779),
-         (1779...1780),
-         "foo"
-       ),
-       (1770...1772)
-     ),
-     MatchPredicateNode(1781...1795)(
-       CallNode(1781...1784)(
-         nil,
-         nil,
-         (1781...1784),
-         nil,
-         nil,
-         nil,
-         nil,
-         2,
-         "foo"
-       ),
-       ArrayNode(1788...1795)(
-         [SymbolNode(1791...1794)(nil, (1791...1794), nil, "foo")],
-         (1788...1791),
-         (1794...1795)
-       ),
-       (1785...1787)
-     ),
-     MatchPredicateNode(1796...1810)(
-       CallNode(1796...1799)(
-         nil,
-         nil,
-         (1796...1799),
-         nil,
-         nil,
-         nil,
-         nil,
-         2,
-         "foo"
-       ),
-       ArrayNode(1803...1810)(
-         [SymbolNode(1806...1809)(nil, (1806...1809), nil, "foo")],
-         (1803...1806),
-         (1809...1810)
-       ),
-       (1800...1802)
-     ),
-     MatchPredicateNode(1811...1825)(
-       CallNode(1811...1814)(
-         nil,
-         nil,
-         (1811...1814),
-         nil,
-         nil,
-         nil,
-         nil,
-         2,
-         "foo"
-       ),
-       ArrayNode(1818...1825)(
-         [StringNode(1821...1824)(nil, (1821...1824), nil, "foo")],
-         (1818...1821),
-         (1824...1825)
-       ),
-       (1815...1817)
-     ),
-     MatchPredicateNode(1826...1840)(
-       CallNode(1826...1829)(
-         nil,
-         nil,
-         (1826...1829),
-         nil,
-         nil,
-         nil,
-         nil,
-         2,
-         "foo"
-       ),
-       ArrayNode(1833...1840)(
-         [StringNode(1836...1839)(nil, (1836...1839), nil, "foo")],
-         (1833...1836),
-         (1839...1840)
-       ),
-       (1830...1832)
-     ),
-     MatchPredicateNode(1841...1855)(
-       CallNode(1841...1844)(
-         nil,
-         nil,
-         (1841...1844),
-         nil,
-         nil,
-         nil,
-         nil,
-         2,
-         "foo"
-       ),
-       StringNode(1848...1855)(
-         (1848...1851),
-         (1851...1854),
-         (1854...1855),
-         "foo"
-       ),
-       (1845...1847)
-     ),
-     MatchPredicateNode(1856...1870)(
-       CallNode(1856...1859)(
-         nil,
-         nil,
-         (1856...1859),
-         nil,
-         nil,
-         nil,
-         nil,
-         2,
-         "foo"
-       ),
-       StringNode(1863...1870)(
-         (1863...1866),
-         (1866...1869),
-         (1869...1870),
-         "foo"
-       ),
-       (1860...1862)
-     ),
-     MatchPredicateNode(1871...1883)(
-       CallNode(1871...1874)(
-         nil,
-         nil,
-         (1871...1874),
-         nil,
-         nil,
-         nil,
-         nil,
-         2,
-         "foo"
-       ),
-       StringNode(1878...1883)(
-         (1878...1879),
-         (1879...1882),
-         (1882...1883),
-         "foo"
-       ),
-       (1875...1877)
-     ),
-     MatchPredicateNode(1884...1894)(
-       CallNode(1884...1887)(
-         nil,
-         nil,
-         (1884...1887),
-         nil,
-         nil,
-         nil,
-         nil,
-         2,
-         "foo"
-       ),
-       NilNode(1891...1894)(),
-       (1888...1890)
-     ),
-     MatchPredicateNode(1895...1906)(
-       CallNode(1895...1898)(
-         nil,
-         nil,
-         (1895...1898),
-         nil,
-         nil,
-         nil,
-         nil,
-         2,
-         "foo"
-       ),
-       SelfNode(1902...1906)(),
-       (1899...1901)
-     ),
-     MatchPredicateNode(1907...1918)(
-       CallNode(1907...1910)(
-         nil,
-         nil,
-         (1907...1910),
-         nil,
-         nil,
-         nil,
-         nil,
-         2,
-         "foo"
-       ),
-       TrueNode(1914...1918)(),
-       (1911...1913)
-     ),
-     MatchPredicateNode(1919...1931)(
-       CallNode(1919...1922)(
-         nil,
-         nil,
-         (1919...1922),
-         nil,
-         nil,
-         nil,
-         nil,
-         2,
-         "foo"
-       ),
-       FalseNode(1926...1931)(),
-       (1923...1925)
-     ),
-     MatchPredicateNode(1932...1947)(
-       CallNode(1932...1935)(
-         nil,
-         nil,
-         (1932...1935),
-         nil,
-         nil,
-         nil,
-         nil,
-         2,
-         "foo"
-       ),
-       SourceFileNode(1939...1947)("patterns.txt"),
-       (1936...1938)
-     ),
-     MatchPredicateNode(1948...1963)(
-       CallNode(1948...1951)(
-         nil,
-         nil,
-         (1948...1951),
-         nil,
-         nil,
-         nil,
-         nil,
-         2,
-         "foo"
-       ),
-       SourceLineNode(1955...1963)(),
-       (1952...1954)
-     ),
-     MatchPredicateNode(1964...1983)(
-       CallNode(1964...1967)(
-         nil,
-         nil,
-         (1964...1967),
-         nil,
-         nil,
-         nil,
-         nil,
-         2,
-         "foo"
-       ),
-       SourceEncodingNode(1971...1983)(),
-       (1968...1970)
-     ),
-     MatchPredicateNode(1984...2001)(
-       CallNode(1984...1987)(
-         nil,
-         nil,
-         (1984...1987),
-         nil,
-         nil,
-         nil,
-         nil,
-         2,
-         "foo"
-       ),
-       LambdaNode(1991...2001)(
-         [],
-         (1991...1993),
-         (1994...1995),
-         (2000...2001),
-         nil,
-         StatementsNode(1996...1999)(
-           [LocalVariableReadNode(1996...1999)(:bar, 1)]
-         )
-       ),
-       (1988...1990)
-     ),
-     CaseNode(2003...2028)(
-       CallNode(2008...2011)(
-         nil,
-         nil,
-         (2008...2011),
-         nil,
-         nil,
-         nil,
-         nil,
-         2,
-         "foo"
-       ),
-       [InNode(2013...2024)(
-          LocalVariableTargetNode(2016...2019)(:bar, 0),
-          nil,
-          (2013...2015),
-          (2020...2024)
-        )],
-       nil,
-       (2003...2007),
-       (2025...2028)
-     ),
-     CaseNode(2029...2052)(
-       CallNode(2034...2037)(
-         nil,
-         nil,
-         (2034...2037),
-         nil,
-         nil,
-         nil,
-         nil,
-         2,
-         "foo"
-       ),
-       [InNode(2039...2048)(
-          IntegerNode(2042...2043)(),
-          nil,
-          (2039...2041),
-          (2044...2048)
-        )],
-       nil,
-       (2029...2033),
-       (2049...2052)
-     ),
-     CaseNode(2053...2078)(
-       CallNode(2058...2061)(
-         nil,
-         nil,
-         (2058...2061),
-         nil,
-         nil,
-         nil,
-         nil,
-         2,
-         "foo"
-       ),
-       [InNode(2063...2074)(
-          FloatNode(2066...2069)(),
-          nil,
-          (2063...2065),
-          (2070...2074)
-        )],
-       nil,
-       (2053...2057),
-       (2075...2078)
-     ),
-     CaseNode(2079...2103)(
-       CallNode(2084...2087)(
-         nil,
-         nil,
-         (2084...2087),
-         nil,
-         nil,
-         nil,
-         nil,
-         2,
-         "foo"
-       ),
-       [InNode(2089...2099)(
-          ImaginaryNode(2092...2094)(IntegerNode(2092...2093)()),
-          nil,
-          (2089...2091),
-          (2095...2099)
-        )],
-       nil,
-       (2079...2083),
-       (2100...2103)
-     ),
-     CaseNode(2104...2128)(
-       CallNode(2109...2112)(
-         nil,
-         nil,
-         (2109...2112),
-         nil,
-         nil,
-         nil,
-         nil,
-         2,
-         "foo"
-       ),
-       [InNode(2114...2124)(
-          RationalNode(2117...2119)(IntegerNode(2117...2118)()),
-          nil,
-          (2114...2116),
-          (2120...2124)
-        )],
-       nil,
-       (2104...2108),
-       (2125...2128)
-     ),
-     CaseNode(2129...2155)(
-       CallNode(2134...2137)(
-         nil,
-         nil,
-         (2134...2137),
-         nil,
-         nil,
-         nil,
-         nil,
-         2,
-         "foo"
-       ),
-       [InNode(2139...2151)(
-          SymbolNode(2142...2146)((2142...2143), (2143...2146), nil, "foo"),
-          nil,
-          (2139...2141),
-          (2147...2151)
-        )],
-       nil,
-       (2129...2133),
-       (2152...2155)
-     ),
-     CaseNode(2156...2185)(
-       CallNode(2161...2164)(
-         nil,
-         nil,
-         (2161...2164),
-         nil,
-         nil,
-         nil,
-         nil,
-         2,
-         "foo"
-       ),
-       [InNode(2166...2181)(
-          SymbolNode(2169...2176)(
-            (2169...2172),
-            (2172...2175),
-            (2175...2176),
-            "foo"
-          ),
-          nil,
-          (2166...2168),
-          (2177...2181)
-        )],
-       nil,
-       (2156...2160),
-       (2182...2185)
-     ),
-     CaseNode(2186...2214)(
-       CallNode(2191...2194)(
-         nil,
-         nil,
-         (2191...2194),
-         nil,
-         nil,
-         nil,
-         nil,
-         2,
-         "foo"
-       ),
-       [InNode(2196...2210)(
-          SymbolNode(2199...2205)(
-            (2199...2201),
-            (2201...2204),
-            (2204...2205),
-            "foo"
-          ),
-          nil,
-          (2196...2198),
-          (2206...2210)
-        )],
-       nil,
-       (2186...2190),
-       (2211...2214)
-     ),
-     CaseNode(2215...2242)(
-       CallNode(2220...2223)(
-         nil,
-         nil,
-         (2220...2223),
-         nil,
-         nil,
-         nil,
-         nil,
-         2,
-         "foo"
-       ),
-       [InNode(2225...2238)(
-          RegularExpressionNode(2228...2233)(
-            (2228...2229),
-            (2229...2232),
-            (2232...2233),
-            "foo",
-            0
-          ),
-          nil,
-          (2225...2227),
-          (2234...2238)
-        )],
-       nil,
-       (2215...2219),
-       (2239...2242)
-     ),
-     CaseNode(2243...2270)(
-       CallNode(2248...2251)(
-         nil,
-         nil,
-         (2248...2251),
-         nil,
-         nil,
-         nil,
-         nil,
-         2,
-         "foo"
-       ),
-       [InNode(2253...2266)(
-          XStringNode(2256...2261)(
-            (2256...2257),
-            (2257...2260),
-            (2260...2261),
-            "foo"
-          ),
-          nil,
-          (2253...2255),
-          (2262...2266)
-        )],
-       nil,
-       (2243...2247),
-       (2267...2270)
-     ),
-     CaseNode(2271...2300)(
-       CallNode(2276...2279)(
-         nil,
-         nil,
-         (2276...2279),
-         nil,
-         nil,
-         nil,
-         nil,
-         2,
-         "foo"
-       ),
-       [InNode(2281...2296)(
-          XStringNode(2284...2291)(
-            (2284...2287),
-            (2287...2290),
-            (2290...2291),
-            "foo"
-          ),
-          nil,
-          (2281...2283),
-          (2292...2296)
-        )],
-       nil,
-       (2271...2275),
-       (2297...2300)
-     ),
-     CaseNode(2301...2330)(
-       CallNode(2306...2309)(
-         nil,
-         nil,
-         (2306...2309),
-         nil,
-         nil,
-         nil,
-         nil,
-         2,
-         "foo"
-       ),
-       [InNode(2311...2326)(
-          ArrayNode(2314...2321)(
-            [SymbolNode(2317...2320)(nil, (2317...2320), nil, "foo")],
-            (2314...2317),
-            (2320...2321)
-          ),
-          nil,
-          (2311...2313),
-          (2322...2326)
-        )],
-       nil,
-       (2301...2305),
-       (2327...2330)
-     ),
-     CaseNode(2331...2360)(
-       CallNode(2336...2339)(
-         nil,
-         nil,
-         (2336...2339),
-         nil,
-         nil,
-         nil,
-         nil,
-         2,
-         "foo"
-       ),
-       [InNode(2341...2356)(
-          ArrayNode(2344...2351)(
-            [SymbolNode(2347...2350)(nil, (2347...2350), nil, "foo")],
-            (2344...2347),
-            (2350...2351)
-          ),
-          nil,
-          (2341...2343),
-          (2352...2356)
-        )],
-       nil,
-       (2331...2335),
-       (2357...2360)
-     ),
-     CaseNode(2361...2390)(
-       CallNode(2366...2369)(
-         nil,
-         nil,
-         (2366...2369),
-         nil,
-         nil,
-         nil,
-         nil,
-         2,
-         "foo"
-       ),
-       [InNode(2371...2386)(
-          ArrayNode(2374...2381)(
-            [StringNode(2377...2380)(nil, (2377...2380), nil, "foo")],
-            (2374...2377),
-            (2380...2381)
-          ),
-          nil,
-          (2371...2373),
-          (2382...2386)
-        )],
-       nil,
-       (2361...2365),
-       (2387...2390)
-     ),
-     CaseNode(2391...2420)(
-       CallNode(2396...2399)(
-         nil,
-         nil,
-         (2396...2399),
-         nil,
-         nil,
-         nil,
-         nil,
-         2,
-         "foo"
-       ),
-       [InNode(2401...2416)(
-          ArrayNode(2404...2411)(
-            [StringNode(2407...2410)(nil, (2407...2410), nil, "foo")],
-            (2404...2407),
-            (2410...2411)
-          ),
-          nil,
-          (2401...2403),
-          (2412...2416)
-        )],
-       nil,
-       (2391...2395),
-       (2417...2420)
-     ),
-     CaseNode(2421...2450)(
-       CallNode(2426...2429)(
-         nil,
-         nil,
-         (2426...2429),
-         nil,
-         nil,
-         nil,
-         nil,
-         2,
-         "foo"
-       ),
-       [InNode(2431...2446)(
-          StringNode(2434...2441)(
-            (2434...2437),
-            (2437...2440),
-            (2440...2441),
-            "foo"
-          ),
-          nil,
-          (2431...2433),
-          (2442...2446)
-        )],
-       nil,
-       (2421...2425),
-       (2447...2450)
-     ),
-     CaseNode(2451...2480)(
-       CallNode(2456...2459)(
-         nil,
-         nil,
-         (2456...2459),
-         nil,
-         nil,
-         nil,
-         nil,
-         2,
-         "foo"
-       ),
-       [InNode(2461...2476)(
-          StringNode(2464...2471)(
-            (2464...2467),
-            (2467...2470),
-            (2470...2471),
-            "foo"
-          ),
-          nil,
-          (2461...2463),
-          (2472...2476)
-        )],
-       nil,
-       (2451...2455),
-       (2477...2480)
-     ),
-     CaseNode(2481...2508)(
-       CallNode(2486...2489)(
-         nil,
-         nil,
-         (2486...2489),
-         nil,
-         nil,
-         nil,
-         nil,
-         2,
-         "foo"
-       ),
-       [InNode(2491...2504)(
-          StringNode(2494...2499)(
-            (2494...2495),
-            (2495...2498),
-            (2498...2499),
-            "foo"
-          ),
-          nil,
-          (2491...2493),
-          (2500...2504)
-        )],
-       nil,
-       (2481...2485),
-       (2505...2508)
-     ),
-     CaseNode(2509...2534)(
-       CallNode(2514...2517)(
-         nil,
-         nil,
-         (2514...2517),
-         nil,
-         nil,
-         nil,
-         nil,
-         2,
-         "foo"
-       ),
-       [InNode(2519...2530)(
-          NilNode(2522...2525)(),
-          nil,
-          (2519...2521),
-          (2526...2530)
-        )],
-       nil,
-       (2509...2513),
-       (2531...2534)
-     ),
-     CaseNode(2535...2561)(
-       CallNode(2540...2543)(
-         nil,
-         nil,
-         (2540...2543),
-         nil,
-         nil,
-         nil,
-         nil,
-         2,
-         "foo"
-       ),
-       [InNode(2545...2557)(
-          SelfNode(2548...2552)(),
-          nil,
-          (2545...2547),
-          (2553...2557)
-        )],
-       nil,
-       (2535...2539),
-       (2558...2561)
-     ),
-     CaseNode(2562...2588)(
-       CallNode(2567...2570)(
-         nil,
-         nil,
-         (2567...2570),
-         nil,
-         nil,
-         nil,
-         nil,
-         2,
-         "foo"
-       ),
-       [InNode(2572...2584)(
-          TrueNode(2575...2579)(),
-          nil,
-          (2572...2574),
-          (2580...2584)
-        )],
-       nil,
-       (2562...2566),
-       (2585...2588)
-     ),
-     CaseNode(2589...2616)(
-       CallNode(2594...2597)(
-         nil,
-         nil,
-         (2594...2597),
-         nil,
-         nil,
-         nil,
-         nil,
-         2,
-         "foo"
-       ),
-       [InNode(2599...2612)(
-          FalseNode(2602...2607)(),
-          nil,
-          (2599...2601),
-          (2608...2612)
-        )],
-       nil,
-       (2589...2593),
-       (2613...2616)
-     ),
-     CaseNode(2617...2647)(
-       CallNode(2622...2625)(
-         nil,
-         nil,
-         (2622...2625),
-         nil,
-         nil,
-         nil,
-         nil,
-         2,
-         "foo"
-       ),
-       [InNode(2627...2643)(
-          SourceFileNode(2630...2638)("patterns.txt"),
-          nil,
-          (2627...2629),
-          (2639...2643)
-        )],
-       nil,
-       (2617...2621),
-       (2644...2647)
-     ),
-     CaseNode(2648...2678)(
-       CallNode(2653...2656)(
-         nil,
-         nil,
-         (2653...2656),
-         nil,
-         nil,
-         nil,
-         nil,
-         2,
-         "foo"
-       ),
-       [InNode(2658...2674)(
-          SourceLineNode(2661...2669)(),
-          nil,
-          (2658...2660),
-          (2670...2674)
-        )],
-       nil,
-       (2648...2652),
-       (2675...2678)
-     ),
-     CaseNode(2679...2713)(
-       CallNode(2684...2687)(
-         nil,
-         nil,
-         (2684...2687),
-         nil,
-         nil,
-         nil,
-         nil,
-         2,
-         "foo"
-       ),
-       [InNode(2689...2709)(
-          SourceEncodingNode(2692...2704)(),
-          nil,
-          (2689...2691),
-          (2705...2709)
-        )],
-       nil,
-       (2679...2683),
-       (2710...2713)
-     ),
-     CaseNode(2714...2746)(
-       CallNode(2719...2722)(
-         nil,
-         nil,
-         (2719...2722),
-         nil,
-         nil,
-         nil,
-         nil,
-         2,
-         "foo"
-       ),
-       [InNode(2724...2742)(
-          LambdaNode(2727...2737)(
-            [],
-            (2727...2729),
-            (2730...2731),
-            (2736...2737),
-            nil,
-            StatementsNode(2732...2735)(
-              [LocalVariableReadNode(2732...2735)(:bar, 1)]
-            )
-          ),
-          nil,
-          (2724...2726),
-          (2738...2742)
-        )],
-       nil,
-       (2714...2718),
-       (2743...2746)
-     ),
-     CaseNode(2748...2780)(
-       CallNode(2753...2756)(
-         nil,
-         nil,
-         (2753...2756),
-         nil,
-         nil,
-         nil,
-         nil,
-         2,
-         "foo"
-       ),
-       [InNode(2758...2776)(
-          IfNode(2761...2771)(
-            (2765...2767),
-            LocalVariableReadNode(2768...2771)(:baz, 0),
-            StatementsNode(2761...2764)(
-              [LocalVariableTargetNode(2761...2764)(:bar, 0)]
-            ),
-            nil,
-            nil
-          ),
-          nil,
-          (2758...2760),
-          (2772...2776)
-        )],
-       nil,
-       (2748...2752),
-       (2777...2780)
-     ),
-     CaseNode(2781...2811)(
-       CallNode(2786...2789)(
-         nil,
-         nil,
-         (2786...2789),
-         nil,
-         nil,
-         nil,
-         nil,
-         2,
-         "foo"
-       ),
-       [InNode(2791...2807)(
-          IfNode(2794...2802)(
-            (2796...2798),
-            LocalVariableReadNode(2799...2802)(:baz, 0),
-            StatementsNode(2794...2795)([IntegerNode(2794...2795)()]),
-            nil,
-            nil
-          ),
-          nil,
-          (2791...2793),
-          (2803...2807)
-        )],
-       nil,
-       (2781...2785),
-       (2808...2811)
-     ),
-     CaseNode(2812...2844)(
-       CallNode(2817...2820)(
-         nil,
-         nil,
-         (2817...2820),
-         nil,
-         nil,
-         nil,
-         nil,
-         2,
-         "foo"
-       ),
-       [InNode(2822...2840)(
-          IfNode(2825...2835)(
-            (2829...2831),
-            LocalVariableReadNode(2832...2835)(:baz, 0),
-            StatementsNode(2825...2828)([FloatNode(2825...2828)()]),
-            nil,
-            nil
-          ),
-          nil,
-          (2822...2824),
-          (2836...2840)
-        )],
-       nil,
-       (2812...2816),
-       (2841...2844)
-     ),
-     CaseNode(2845...2876)(
-       CallNode(2850...2853)(
-         nil,
-         nil,
-         (2850...2853),
-         nil,
-         nil,
-         nil,
-         nil,
-         2,
-         "foo"
-       ),
-       [InNode(2855...2872)(
-          IfNode(2858...2867)(
-            (2861...2863),
-            LocalVariableReadNode(2864...2867)(:baz, 0),
-            StatementsNode(2858...2860)(
-              [ImaginaryNode(2858...2860)(IntegerNode(2858...2859)())]
-            ),
-            nil,
-            nil
-          ),
-          nil,
-          (2855...2857),
-          (2868...2872)
-        )],
-       nil,
-       (2845...2849),
-       (2873...2876)
-     ),
-     CaseNode(2877...2908)(
-       CallNode(2882...2885)(
-         nil,
-         nil,
-         (2882...2885),
-         nil,
-         nil,
-         nil,
-         nil,
-         2,
-         "foo"
-       ),
-       [InNode(2887...2904)(
-          IfNode(2890...2899)(
-            (2893...2895),
-            LocalVariableReadNode(2896...2899)(:baz, 0),
-            StatementsNode(2890...2892)(
-              [RationalNode(2890...2892)(IntegerNode(2890...2891)())]
-            ),
-            nil,
-            nil
-          ),
-          nil,
-          (2887...2889),
-          (2900...2904)
-        )],
-       nil,
-       (2877...2881),
-       (2905...2908)
-     ),
-     CaseNode(2909...2942)(
-       CallNode(2914...2917)(
-         nil,
-         nil,
-         (2914...2917),
-         nil,
-         nil,
-         nil,
-         nil,
-         2,
-         "foo"
-       ),
-       [InNode(2919...2938)(
-          IfNode(2922...2933)(
-            (2927...2929),
-            LocalVariableReadNode(2930...2933)(:baz, 0),
-            StatementsNode(2922...2926)(
-              [SymbolNode(2922...2926)(
-                 (2922...2923),
-                 (2923...2926),
-                 nil,
-                 "foo"
-               )]
-            ),
-            nil,
-            nil
-          ),
-          nil,
-          (2919...2921),
-          (2934...2938)
-        )],
-       nil,
-       (2909...2913),
-       (2939...2942)
-     ),
-     CaseNode(2943...2979)(
-       CallNode(2948...2951)(
-         nil,
-         nil,
-         (2948...2951),
-         nil,
-         nil,
-         nil,
-         nil,
-         2,
-         "foo"
-       ),
-       [InNode(2953...2975)(
-          IfNode(2956...2970)(
-            (2964...2966),
-            LocalVariableReadNode(2967...2970)(:baz, 0),
-            StatementsNode(2956...2963)(
-              [SymbolNode(2956...2963)(
-                 (2956...2959),
-                 (2959...2962),
-                 (2962...2963),
-                 "foo"
-               )]
-            ),
-            nil,
-            nil
-          ),
-          nil,
-          (2953...2955),
-          (2971...2975)
-        )],
-       nil,
-       (2943...2947),
-       (2976...2979)
-     ),
-     CaseNode(2980...3015)(
-       CallNode(2985...2988)(
-         nil,
-         nil,
-         (2985...2988),
-         nil,
-         nil,
-         nil,
-         nil,
-         2,
-         "foo"
-       ),
-       [InNode(2990...3011)(
-          IfNode(2993...3006)(
-            (3000...3002),
-            LocalVariableReadNode(3003...3006)(:baz, 0),
-            StatementsNode(2993...2999)(
-              [SymbolNode(2993...2999)(
-                 (2993...2995),
-                 (2995...2998),
-                 (2998...2999),
-                 "foo"
-               )]
-            ),
-            nil,
-            nil
-          ),
-          nil,
-          (2990...2992),
-          (3007...3011)
-        )],
-       nil,
-       (2980...2984),
-       (3012...3015)
-     ),
-     CaseNode(3016...3050)(
-       CallNode(3021...3024)(
-         nil,
-         nil,
-         (3021...3024),
-         nil,
-         nil,
-         nil,
-         nil,
-         2,
-         "foo"
-       ),
-       [InNode(3026...3046)(
-          IfNode(3029...3041)(
-            (3035...3037),
-            LocalVariableReadNode(3038...3041)(:baz, 0),
-            StatementsNode(3029...3034)(
-              [RegularExpressionNode(3029...3034)(
-                 (3029...3030),
-                 (3030...3033),
-                 (3033...3034),
-                 "foo",
-                 0
-               )]
-            ),
-            nil,
-            nil
-          ),
-          nil,
-          (3026...3028),
-          (3042...3046)
-        )],
-       nil,
-       (3016...3020),
-       (3047...3050)
-     ),
-     CaseNode(3051...3085)(
-       CallNode(3056...3059)(
-         nil,
-         nil,
-         (3056...3059),
-         nil,
-         nil,
-         nil,
-         nil,
-         2,
-         "foo"
-       ),
-       [InNode(3061...3081)(
-          IfNode(3064...3076)(
-            (3070...3072),
-            LocalVariableReadNode(3073...3076)(:baz, 0),
-            StatementsNode(3064...3069)(
-              [XStringNode(3064...3069)(
-                 (3064...3065),
-                 (3065...3068),
-                 (3068...3069),
-                 "foo"
-               )]
-            ),
-            nil,
-            nil
-          ),
-          nil,
-          (3061...3063),
-          (3077...3081)
-        )],
-       nil,
-       (3051...3055),
-       (3082...3085)
-     ),
-     CaseNode(3086...3122)(
-       CallNode(3091...3094)(
-         nil,
-         nil,
-         (3091...3094),
-         nil,
-         nil,
-         nil,
-         nil,
-         2,
-         "foo"
-       ),
-       [InNode(3096...3118)(
-          IfNode(3099...3113)(
-            (3107...3109),
-            LocalVariableReadNode(3110...3113)(:baz, 0),
-            StatementsNode(3099...3106)(
-              [XStringNode(3099...3106)(
-                 (3099...3102),
-                 (3102...3105),
-                 (3105...3106),
-                 "foo"
-               )]
-            ),
-            nil,
-            nil
-          ),
-          nil,
-          (3096...3098),
-          (3114...3118)
-        )],
-       nil,
-       (3086...3090),
-       (3119...3122)
-     ),
-     CaseNode(3123...3159)(
-       CallNode(3128...3131)(
-         nil,
-         nil,
-         (3128...3131),
-         nil,
-         nil,
-         nil,
-         nil,
-         2,
-         "foo"
-       ),
-       [InNode(3133...3155)(
-          IfNode(3136...3150)(
-            (3144...3146),
-            LocalVariableReadNode(3147...3150)(:baz, 0),
-            StatementsNode(3136...3143)(
-              [ArrayNode(3136...3143)(
-                 [SymbolNode(3139...3142)(nil, (3139...3142), nil, "foo")],
-                 (3136...3139),
-                 (3142...3143)
-               )]
-            ),
-            nil,
-            nil
-          ),
-          nil,
-          (3133...3135),
-          (3151...3155)
-        )],
-       nil,
-       (3123...3127),
-       (3156...3159)
-     ),
-     CaseNode(3160...3196)(
-       CallNode(3165...3168)(
-         nil,
-         nil,
-         (3165...3168),
-         nil,
-         nil,
-         nil,
-         nil,
-         2,
-         "foo"
-       ),
-       [InNode(3170...3192)(
-          IfNode(3173...3187)(
-            (3181...3183),
-            LocalVariableReadNode(3184...3187)(:baz, 0),
-            StatementsNode(3173...3180)(
-              [ArrayNode(3173...3180)(
-                 [SymbolNode(3176...3179)(nil, (3176...3179), nil, "foo")],
-                 (3173...3176),
-                 (3179...3180)
-               )]
-            ),
-            nil,
-            nil
-          ),
-          nil,
-          (3170...3172),
-          (3188...3192)
-        )],
-       nil,
-       (3160...3164),
-       (3193...3196)
-     ),
-     CaseNode(3197...3233)(
-       CallNode(3202...3205)(
-         nil,
-         nil,
-         (3202...3205),
-         nil,
-         nil,
-         nil,
-         nil,
-         2,
-         "foo"
-       ),
-       [InNode(3207...3229)(
-          IfNode(3210...3224)(
-            (3218...3220),
-            LocalVariableReadNode(3221...3224)(:baz, 0),
-            StatementsNode(3210...3217)(
-              [ArrayNode(3210...3217)(
-                 [StringNode(3213...3216)(nil, (3213...3216), nil, "foo")],
-                 (3210...3213),
-                 (3216...3217)
-               )]
-            ),
-            nil,
-            nil
-          ),
-          nil,
-          (3207...3209),
-          (3225...3229)
-        )],
-       nil,
-       (3197...3201),
-       (3230...3233)
-     ),
-     CaseNode(3234...3270)(
-       CallNode(3239...3242)(
-         nil,
-         nil,
-         (3239...3242),
-         nil,
-         nil,
-         nil,
-         nil,
-         2,
-         "foo"
-       ),
-       [InNode(3244...3266)(
-          IfNode(3247...3261)(
-            (3255...3257),
-            LocalVariableReadNode(3258...3261)(:baz, 0),
-            StatementsNode(3247...3254)(
-              [ArrayNode(3247...3254)(
-                 [StringNode(3250...3253)(nil, (3250...3253), nil, "foo")],
-                 (3247...3250),
-                 (3253...3254)
-               )]
-            ),
-            nil,
-            nil
-          ),
-          nil,
-          (3244...3246),
-          (3262...3266)
-        )],
-       nil,
-       (3234...3238),
-       (3267...3270)
-     ),
-     CaseNode(3271...3307)(
-       CallNode(3276...3279)(
-         nil,
-         nil,
-         (3276...3279),
-         nil,
-         nil,
-         nil,
-         nil,
-         2,
-         "foo"
-       ),
-       [InNode(3281...3303)(
-          IfNode(3284...3298)(
-            (3292...3294),
-            LocalVariableReadNode(3295...3298)(:baz, 0),
-            StatementsNode(3284...3291)(
-              [StringNode(3284...3291)(
-                 (3284...3287),
-                 (3287...3290),
-                 (3290...3291),
-                 "foo"
-               )]
-            ),
-            nil,
-            nil
-          ),
-          nil,
-          (3281...3283),
-          (3299...3303)
-        )],
-       nil,
-       (3271...3275),
-       (3304...3307)
-     ),
-     CaseNode(3308...3344)(
-       CallNode(3313...3316)(
-         nil,
-         nil,
-         (3313...3316),
-         nil,
-         nil,
-         nil,
-         nil,
-         2,
-         "foo"
-       ),
-       [InNode(3318...3340)(
-          IfNode(3321...3335)(
-            (3329...3331),
-            LocalVariableReadNode(3332...3335)(:baz, 0),
-            StatementsNode(3321...3328)(
-              [StringNode(3321...3328)(
-                 (3321...3324),
-                 (3324...3327),
-                 (3327...3328),
-                 "foo"
-               )]
-            ),
-            nil,
-            nil
-          ),
-          nil,
-          (3318...3320),
-          (3336...3340)
-        )],
-       nil,
-       (3308...3312),
-       (3341...3344)
-     ),
-     CaseNode(3345...3379)(
-       CallNode(3350...3353)(
-         nil,
-         nil,
-         (3350...3353),
-         nil,
-         nil,
-         nil,
-         nil,
-         2,
-         "foo"
-       ),
-       [InNode(3355...3375)(
-          IfNode(3358...3370)(
-            (3364...3366),
-            LocalVariableReadNode(3367...3370)(:baz, 0),
-            StatementsNode(3358...3363)(
-              [StringNode(3358...3363)(
-                 (3358...3359),
-                 (3359...3362),
-                 (3362...3363),
-                 "foo"
-               )]
-            ),
-            nil,
-            nil
-          ),
-          nil,
-          (3355...3357),
-          (3371...3375)
-        )],
-       nil,
-       (3345...3349),
-       (3376...3379)
-     ),
-     CaseNode(3380...3412)(
-       CallNode(3385...3388)(
-         nil,
-         nil,
-         (3385...3388),
-         nil,
-         nil,
-         nil,
-         nil,
-         2,
-         "foo"
-       ),
-       [InNode(3390...3408)(
-          IfNode(3393...3403)(
-            (3397...3399),
-            LocalVariableReadNode(3400...3403)(:baz, 0),
-            StatementsNode(3393...3396)([NilNode(3393...3396)()]),
-            nil,
-            nil
-          ),
-          nil,
-          (3390...3392),
-          (3404...3408)
-        )],
-       nil,
-       (3380...3384),
-       (3409...3412)
-     ),
-     CaseNode(3413...3446)(
-       CallNode(3418...3421)(
-         nil,
-         nil,
-         (3418...3421),
-         nil,
-         nil,
-         nil,
-         nil,
-         2,
-         "foo"
-       ),
-       [InNode(3423...3442)(
-          IfNode(3426...3437)(
-            (3431...3433),
-            LocalVariableReadNode(3434...3437)(:baz, 0),
-            StatementsNode(3426...3430)([SelfNode(3426...3430)()]),
-            nil,
-            nil
-          ),
-          nil,
-          (3423...3425),
-          (3438...3442)
-        )],
-       nil,
-       (3413...3417),
-       (3443...3446)
-     ),
-     CaseNode(3447...3480)(
-       CallNode(3452...3455)(
-         nil,
-         nil,
-         (3452...3455),
-         nil,
-         nil,
-         nil,
-         nil,
-         2,
-         "foo"
-       ),
-       [InNode(3457...3476)(
-          IfNode(3460...3471)(
-            (3465...3467),
-            LocalVariableReadNode(3468...3471)(:baz, 0),
-            StatementsNode(3460...3464)([TrueNode(3460...3464)()]),
-            nil,
-            nil
-          ),
-          nil,
-          (3457...3459),
-          (3472...3476)
-        )],
-       nil,
-       (3447...3451),
-       (3477...3480)
-     ),
-     CaseNode(3481...3515)(
-       CallNode(3486...3489)(
-         nil,
-         nil,
-         (3486...3489),
-         nil,
-         nil,
-         nil,
-         nil,
-         2,
-         "foo"
-       ),
-       [InNode(3491...3511)(
-          IfNode(3494...3506)(
-            (3500...3502),
-            LocalVariableReadNode(3503...3506)(:baz, 0),
-            StatementsNode(3494...3499)([FalseNode(3494...3499)()]),
-            nil,
-            nil
-          ),
-          nil,
-          (3491...3493),
-          (3507...3511)
-        )],
-       nil,
-       (3481...3485),
-       (3512...3515)
-     ),
-     CaseNode(3516...3553)(
-       CallNode(3521...3524)(
-         nil,
-         nil,
-         (3521...3524),
-         nil,
-         nil,
-         nil,
-         nil,
-         2,
-         "foo"
-       ),
-       [InNode(3526...3549)(
-          IfNode(3529...3544)(
-            (3538...3540),
-            LocalVariableReadNode(3541...3544)(:baz, 0),
-            StatementsNode(3529...3537)(
-              [SourceFileNode(3529...3537)("patterns.txt")]
-            ),
-            nil,
-            nil
-          ),
-          nil,
-          (3526...3528),
-          (3545...3549)
-        )],
-       nil,
-       (3516...3520),
-       (3550...3553)
-     ),
-     CaseNode(3554...3591)(
-       CallNode(3559...3562)(
-         nil,
-         nil,
-         (3559...3562),
-         nil,
-         nil,
-         nil,
-         nil,
-         2,
-         "foo"
-       ),
-       [InNode(3564...3587)(
-          IfNode(3567...3582)(
-            (3576...3578),
-            LocalVariableReadNode(3579...3582)(:baz, 0),
-            StatementsNode(3567...3575)([SourceLineNode(3567...3575)()]),
-            nil,
-            nil
-          ),
-          nil,
-          (3564...3566),
-          (3583...3587)
-        )],
-       nil,
-       (3554...3558),
-       (3588...3591)
-     ),
-     CaseNode(3592...3633)(
-       CallNode(3597...3600)(
-         nil,
-         nil,
-         (3597...3600),
-         nil,
-         nil,
-         nil,
-         nil,
-         2,
-         "foo"
-       ),
-       [InNode(3602...3629)(
-          IfNode(3605...3624)(
-            (3618...3620),
-            LocalVariableReadNode(3621...3624)(:baz, 0),
-            StatementsNode(3605...3617)([SourceEncodingNode(3605...3617)()]),
-            nil,
-            nil
-          ),
-          nil,
-          (3602...3604),
-          (3625...3629)
-        )],
-       nil,
-       (3592...3596),
-       (3630...3633)
-     ),
-     CaseNode(3634...3673)(
-       CallNode(3639...3642)(
-         nil,
-         nil,
-         (3639...3642),
-         nil,
-         nil,
-         nil,
-         nil,
-         2,
-         "foo"
-       ),
-       [InNode(3644...3669)(
-          IfNode(3647...3664)(
-            (3658...3660),
-            LocalVariableReadNode(3661...3664)(:baz, 0),
-            StatementsNode(3647...3657)(
-              [LambdaNode(3647...3657)(
-                 [],
-                 (3647...3649),
-                 (3650...3651),
-                 (3656...3657),
-                 nil,
-                 StatementsNode(3652...3655)(
-                   [LocalVariableReadNode(3652...3655)(:bar, 1)]
-                 )
-               )]
-            ),
-            nil,
-            nil
-          ),
-          nil,
-          (3644...3646),
-          (3665...3669)
-        )],
-       nil,
-       (3634...3638),
-       (3670...3673)
-     ),
-     IfNode(3675...3689)(
-       (3675...3677),
-       MatchPredicateNode(3678...3685)(
-         CallNode(3678...3679)(
-           nil,
-           nil,
-           (3678...3679),
-           nil,
-           nil,
-           nil,
-           nil,
-           2,
-           "a"
-         ),
-         ArrayPatternNode(3683...3685)(
-           nil,
-           [],
-           nil,
-           [],
-           (3683...3684),
-           (3684...3685)
-         ),
-         (3680...3682)
-       ),
-       nil,
-       nil,
-       (3686...3689)
-     ),
-     MatchRequiredNode(3691...3703)(
-       CallNode(3691...3692)(
-         nil,
-         nil,
-         (3691...3692),
-         nil,
-         nil,
-         nil,
-         nil,
-         2,
-         "a"
-       ),
-       ArrayPatternNode(3696...3703)(
-         nil,
-         [LocalVariableTargetNode(3700...3701)(:b, 0)],
-         nil,
-         [],
-         (3696...3697),
-         (3702...3703)
-       ),
-       (3693...3695)
-     ),
-     MatchPredicateNode(3705...3743)(
-       CallNode(3705...3708)(
-         nil,
-         nil,
-         (3705...3708),
-         nil,
-         nil,
-         nil,
-         nil,
-         2,
-         "foo"
-       ),
-       HashPatternNode(3712...3743)(
-         ConstantReadNode(3712...3713)(:A),
-         [AssocNode(3717...3741)(
-            SymbolNode(3717...3721)(nil, (3717...3720), (3720...3721), "bar"),
-            HashPatternNode(3722...3741)(
-              ConstantReadNode(3722...3723)(:B),
-              [AssocNode(3729...3737)(
-                 SymbolNode(3729...3735)(
-                   nil,
-                   (3729...3734),
-                   (3734...3735),
-                   "value"
-                 ),
-                 LocalVariableTargetNode(3736...3737)(:a, 0),
-                 nil
-               )],
-              nil,
-              (3723...3724),
-              (3740...3741)
-            ),
-            nil
-          )],
-         nil,
-         (3713...3714),
-         (3742...3743)
-       ),
-       (3709...3711)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/procs.txt b/test/yarp/snapshots/procs.txt
deleted file mode 100644
index 64ad900220fa5f..00000000000000
--- a/test/yarp/snapshots/procs.txt
+++ /dev/null
@@ -1,242 +0,0 @@
-ProgramNode(0...266)(
-  [],
-  StatementsNode(0...266)(
-    [LambdaNode(0...21)(
-       [:a, :b, :c, :d],
-       (0...2),
-       (16...17),
-       (20...21),
-       BlockParametersNode(3...15)(
-         ParametersNode(4...5)(
-           [RequiredParameterNode(4...5)(:a)],
-           [],
-           [],
-           nil,
-           [],
-           nil,
-           nil
-         ),
-         [BlockLocalVariableNode(7...8)(:b),
-          BlockLocalVariableNode(10...11)(:c),
-          BlockLocalVariableNode(13...14)(:d)],
-         (3...4),
-         (14...15)
-       ),
-       StatementsNode(18...19)([LocalVariableReadNode(18...19)(:b, 0)])
-     ),
-     LambdaNode(23...39)(
-       [],
-       (23...25),
-       (26...28),
-       (36...39),
-       nil,
-       BeginNode(29...39)(
-         nil,
-         nil,
-         nil,
-         nil,
-         EnsureNode(29...39)((29...35), nil, (36...39)),
-         (36...39)
-       )
-     ),
-     LambdaNode(41...69)(
-       [],
-       (41...43),
-       (44...46),
-       (66...69),
-       nil,
-       BeginNode(47...69)(
-         nil,
-         nil,
-         RescueNode(47...53)((47...53), [], nil, nil, nil, nil),
-         ElseNode(54...65)((54...58), nil, (59...65)),
-         EnsureNode(59...69)((59...65), nil, (66...69)),
-         (66...69)
-       )
-     ),
-     LambdaNode(71...81)(
-       [],
-       (71...73),
-       (74...75),
-       (80...81),
-       nil,
-       StatementsNode(76...79)(
-         [CallNode(76...79)(nil, nil, (76...79), nil, nil, nil, nil, 2, "foo")]
-       )
-     ),
-     LambdaNode(83...98)(
-       [],
-       (83...85),
-       (86...88),
-       (95...98),
-       nil,
-       StatementsNode(90...93)(
-         [CallNode(90...93)(nil, nil, (90...93), nil, nil, nil, nil, 2, "foo")]
-       )
-     ),
-     LambdaNode(100...129)(
-       [:a, :b, :c, :d, :e],
-       (100...102),
-       (124...125),
-       (128...129),
-       BlockParametersNode(103...123)(
-         ParametersNode(103...123)(
-           [RequiredParameterNode(103...104)(:a)],
-           [OptionalParameterNode(106...111)(
-              :b,
-              (106...107),
-              (108...109),
-              IntegerNode(110...111)()
-            )],
-           [],
-           nil,
-           [KeywordParameterNode(113...115)((113...115), nil),
-            KeywordParameterNode(117...119)((117...119), nil)],
-           nil,
-           BlockParameterNode(121...123)(:e, (122...123), (121...122))
-         ),
-         [],
-         nil,
-         nil
-       ),
-       StatementsNode(126...127)([LocalVariableReadNode(126...127)(:a, 0)])
-     ),
-     LambdaNode(131...171)(
-       [:a, :b, :c, :d, :e, :f, :g],
-       (131...133),
-       (166...167),
-       (170...171),
-       BlockParametersNode(134...165)(
-         ParametersNode(135...164)(
-           [RequiredParameterNode(135...136)(:a)],
-           [OptionalParameterNode(138...143)(
-              :b,
-              (138...139),
-              (140...141),
-              IntegerNode(142...143)()
-            )],
-           [],
-           RestParameterNode(145...147)((145...146), (146...147)),
-           [KeywordParameterNode(149...151)((149...151), nil),
-            KeywordParameterNode(153...155)((153...155), nil)],
-           KeywordRestParameterNode(157...160)((157...159), (159...160)),
-           BlockParameterNode(162...164)(:g, (163...164), (162...163))
-         ),
-         [],
-         (134...135),
-         (164...165)
-       ),
-       StatementsNode(168...169)([LocalVariableReadNode(168...169)(:a, 0)])
-     ),
-     LambdaNode(173...218)(
-       [:a, :b, :c, :d, :e, :f, :g],
-       (173...175),
-       (208...210),
-       (215...218),
-       BlockParametersNode(176...207)(
-         ParametersNode(177...206)(
-           [RequiredParameterNode(177...178)(:a)],
-           [OptionalParameterNode(180...185)(
-              :b,
-              (180...181),
-              (182...183),
-              IntegerNode(184...185)()
-            )],
-           [],
-           RestParameterNode(187...189)((187...188), (188...189)),
-           [KeywordParameterNode(191...193)((191...193), nil),
-            KeywordParameterNode(195...197)((195...197), nil)],
-           KeywordRestParameterNode(199...202)((199...201), (201...202)),
-           BlockParameterNode(204...206)(:g, (205...206), (204...205))
-         ),
-         [],
-         (176...177),
-         (206...207)
-       ),
-       StatementsNode(213...214)([LocalVariableReadNode(213...214)(:a, 0)])
-     ),
-     LambdaNode(220...245)(
-       [:a],
-       (220...222),
-       (227...228),
-       (244...245),
-       BlockParametersNode(223...226)(
-         ParametersNode(224...225)(
-           [RequiredParameterNode(224...225)(:a)],
-           [],
-           [],
-           nil,
-           [],
-           nil,
-           nil
-         ),
-         [],
-         (223...224),
-         (225...226)
-       ),
-       StatementsNode(229...243)(
-         [LambdaNode(229...243)(
-            [:b],
-            (229...231),
-            (234...235),
-            (242...243),
-            BlockParametersNode(232...233)(
-              ParametersNode(232...233)(
-                [RequiredParameterNode(232...233)(:b)],
-                [],
-                [],
-                nil,
-                [],
-                nil,
-                nil
-              ),
-              [],
-              nil,
-              nil
-            ),
-            StatementsNode(236...241)(
-              [CallNode(236...241)(
-                 LocalVariableReadNode(236...237)(:a, 1),
-                 nil,
-                 (238...239),
-                 nil,
-                 ArgumentsNode(240...241)(
-                   [LocalVariableReadNode(240...241)(:b, 0)]
-                 ),
-                 nil,
-                 nil,
-                 0,
-                 "*"
-               )]
-            )
-          )]
-       )
-     ),
-     LambdaNode(247...266)(
-       [:a, :b, :c],
-       (247...249),
-       (263...264),
-       (265...266),
-       BlockParametersNode(250...262)(
-         ParametersNode(251...261)(
-           [RequiredDestructuredParameterNode(251...257)(
-              [RequiredParameterNode(252...253)(:a),
-               RequiredParameterNode(255...256)(:b)],
-              (251...252),
-              (256...257)
-            )],
-           [],
-           [],
-           RestParameterNode(259...261)((259...260), (260...261)),
-           [],
-           nil,
-           nil
-         ),
-         [],
-         (250...251),
-         (261...262)
-       ),
-       nil
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/range_begin_open_exclusive.txt b/test/yarp/snapshots/range_begin_open_exclusive.txt
deleted file mode 100644
index 50a6593c4662de..00000000000000
--- a/test/yarp/snapshots/range_begin_open_exclusive.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-ProgramNode(0...4)(
-  [],
-  StatementsNode(0...4)(
-    [RangeNode(0...4)(nil, IntegerNode(3...4)(), (0...3), 1)]
-  )
-)
diff --git a/test/yarp/snapshots/range_begin_open_inclusive.txt b/test/yarp/snapshots/range_begin_open_inclusive.txt
deleted file mode 100644
index 7d09381f30c31e..00000000000000
--- a/test/yarp/snapshots/range_begin_open_inclusive.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-ProgramNode(0...3)(
-  [],
-  StatementsNode(0...3)(
-    [RangeNode(0...3)(nil, IntegerNode(2...3)(), (0...2), 0)]
-  )
-)
diff --git a/test/yarp/snapshots/range_end_open_exclusive.txt b/test/yarp/snapshots/range_end_open_exclusive.txt
deleted file mode 100644
index 3da37b123ce306..00000000000000
--- a/test/yarp/snapshots/range_end_open_exclusive.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-ProgramNode(0...4)(
-  [],
-  StatementsNode(0...4)(
-    [RangeNode(0...4)(IntegerNode(0...1)(), nil, (1...4), 1)]
-  )
-)
diff --git a/test/yarp/snapshots/range_end_open_inclusive.txt b/test/yarp/snapshots/range_end_open_inclusive.txt
deleted file mode 100644
index e1b90bdffcfad1..00000000000000
--- a/test/yarp/snapshots/range_end_open_inclusive.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-ProgramNode(0...3)(
-  [],
-  StatementsNode(0...3)(
-    [RangeNode(0...3)(IntegerNode(0...1)(), nil, (1...3), 0)]
-  )
-)
diff --git a/test/yarp/snapshots/ranges.txt b/test/yarp/snapshots/ranges.txt
deleted file mode 100644
index 8873f61b0a9d68..00000000000000
--- a/test/yarp/snapshots/ranges.txt
+++ /dev/null
@@ -1,106 +0,0 @@
-ProgramNode(0...85)(
-  [],
-  StatementsNode(0...85)(
-    [ParenthesesNode(0...6)(
-       StatementsNode(1...5)(
-         [RangeNode(1...5)(nil, IntegerNode(4...5)(), (1...4), 1)]
-       ),
-       (0...1),
-       (5...6)
-     ),
-     ParenthesesNode(8...13)(
-       StatementsNode(9...12)(
-         [RangeNode(9...12)(nil, IntegerNode(11...12)(), (9...11), 0)]
-       ),
-       (8...9),
-       (12...13)
-     ),
-     RangeNode(15...20)(
-       IntegerNode(15...16)(),
-       IntegerNode(19...20)(),
-       (16...19),
-       1
-     ),
-     CallNode(22...31)(
-       CallNode(22...25)(nil, nil, (22...25), nil, nil, nil, nil, 2, "foo"),
-       nil,
-       (25...31),
-       (25...26),
-       ArgumentsNode(26...30)(
-         [RangeNode(26...30)(nil, IntegerNode(29...30)(), (26...29), 1)]
-       ),
-       (30...31),
-       nil,
-       0,
-       "[]"
-     ),
-     HashNode(33...48)(
-       (33...34),
-       [AssocNode(35...46)(
-          SymbolNode(35...39)(nil, (35...38), (38...39), "foo"),
-          RangeNode(40...46)(
-            nil,
-            CallNode(43...46)(
-              nil,
-              nil,
-              (43...46),
-              nil,
-              nil,
-              nil,
-              nil,
-              2,
-              "bar"
-            ),
-            (40...43),
-            1
-          ),
-          nil
-        )],
-       (47...48)
-     ),
-     ParenthesesNode(50...56)(
-       StatementsNode(51...55)(
-         [RangeNode(51...55)(IntegerNode(51...52)(), nil, (52...55), 1)]
-       ),
-       (50...51),
-       (55...56)
-     ),
-     RangeNode(58...62)(
-       IntegerNode(58...59)(),
-       IntegerNode(61...62)(),
-       (59...61),
-       0
-     ),
-     HashNode(64...78)(
-       (64...65),
-       [AssocNode(66...76)(
-          SymbolNode(66...70)(nil, (66...69), (69...70), "foo"),
-          RangeNode(71...76)(
-            nil,
-            CallNode(73...76)(
-              nil,
-              nil,
-              (73...76),
-              nil,
-              nil,
-              nil,
-              nil,
-              2,
-              "bar"
-            ),
-            (71...73),
-            0
-          ),
-          nil
-        )],
-       (77...78)
-     ),
-     ParenthesesNode(80...85)(
-       StatementsNode(81...84)(
-         [RangeNode(81...84)(IntegerNode(81...82)(), nil, (82...84), 0)]
-       ),
-       (80...81),
-       (84...85)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/regex.txt b/test/yarp/snapshots/regex.txt
deleted file mode 100644
index 37e32c4dd86f78..00000000000000
--- a/test/yarp/snapshots/regex.txt
+++ /dev/null
@@ -1,166 +0,0 @@
-ProgramNode(0...293)(
-  [:foo],
-  StatementsNode(0...293)(
-    [CallNode(0...9)(
-       nil,
-       nil,
-       (0...3),
-       nil,
-       ArgumentsNode(4...9)(
-         [RegularExpressionNode(4...9)((4...5), (5...8), (8...9), "bar", 0)]
-       ),
-       nil,
-       nil,
-       0,
-       "foo"
-     ),
-     RegularExpressionNode(11...19)((11...14), (14...17), (17...19), "abc", 1),
-     RegularExpressionNode(21...26)((21...22), (22...25), (25...26), "a\b", 0),
-     InterpolatedRegularExpressionNode(28...39)(
-       (28...29),
-       [StringNode(29...33)(nil, (29...33), nil, "aaa "),
-        EmbeddedVariableNode(33...38)(
-          (33...34),
-          GlobalVariableReadNode(34...38)(:$bbb)
-        )],
-       (38...39),
-       0
-     ),
-     InterpolatedRegularExpressionNode(41...57)(
-       (41...42),
-       [StringNode(42...46)(nil, (42...46), nil, "aaa "),
-        EmbeddedStatementsNode(46...52)(
-          (46...48),
-          StatementsNode(48...51)(
-            [CallNode(48...51)(
-               nil,
-               nil,
-               (48...51),
-               nil,
-               nil,
-               nil,
-               nil,
-               2,
-               "bbb"
-             )]
-          ),
-          (51...52)
-        ),
-        StringNode(52...56)(nil, (52...56), nil, " ccc")],
-       (56...57),
-       0
-     ),
-     ArrayNode(59...86)(
-       [CallNode(60...80)(
-          RegularExpressionNode(60...73)(
-            (60...61),
-            (61...72),
-            (72...73),
-            "(?<foo>bar)",
-            0
-          ),
-          nil,
-          (74...76),
-          nil,
-          ArgumentsNode(77...80)(
-            [CallNode(77...80)(
-               nil,
-               nil,
-               (77...80),
-               nil,
-               nil,
-               nil,
-               nil,
-               2,
-               "baz"
-             )]
-          ),
-          nil,
-          nil,
-          0,
-          "=~"
-        ),
-        LocalVariableReadNode(82...85)(:foo, 0)],
-       (59...60),
-       (85...86)
-     ),
-     RegularExpressionNode(88...94)((88...89), (89...92), (92...94), "abc", 1),
-     RegularExpressionNode(96...122)(
-       (96...99),
-       (99...120),
-       (120...122),
-       "[a-z$._?][w$.?\#@~]*:",
-       1
-     ),
-     RegularExpressionNode(124...161)(
-       (124...127),
-       (127...159),
-       (159...161),
-       "([a-z$._?][w$.?\#@~]*)( +)(equ)",
-       1
-     ),
-     RegularExpressionNode(163...188)(
-       (163...166),
-       (166...186),
-       (186...188),
-       "[a-z$._?][w$.?\#@~]*",
-       1
-     ),
-     RegularExpressionNode(190...249)(
-       (190...193),
-       (193...248),
-       (248...249),
-       "\n" + "(?:[w\#$%_']|()|(,)|[]|[0-9])*\n" + "  (?:[w\#$%_']+)\n",
-       0
-     ),
-     CallNode(251...267)(
-       RegularExpressionNode(251...259)(
-         (251...252),
-         (252...258),
-         (258...259),
-         "(?#))",
-         0
-       ),
-       nil,
-       (260...262),
-       nil,
-       ArgumentsNode(263...267)(
-         [StringNode(263...267)((263...264), (264...266), (266...267), "hi")]
-       ),
-       nil,
-       nil,
-       0,
-       "=~"
-     ),
-     RegularExpressionNode(269...278)(
-       (269...272),
-       (272...277),
-       (277...278),
-       "pound",
-       0
-     ),
-     InterpolatedRegularExpressionNode(280...293)(
-       (280...281),
-       [StringNode(281...285)(nil, (281...285), nil, "aaa "),
-        EmbeddedStatementsNode(285...291)(
-          (285...287),
-          StatementsNode(287...290)(
-            [CallNode(287...290)(
-               nil,
-               nil,
-               (287...290),
-               nil,
-               nil,
-               nil,
-               nil,
-               2,
-               "bbb"
-             )]
-          ),
-          (290...291)
-        )],
-       (291...293),
-       128
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/rescue.txt b/test/yarp/snapshots/rescue.txt
deleted file mode 100644
index c52a261fceee6f..00000000000000
--- a/test/yarp/snapshots/rescue.txt
+++ /dev/null
@@ -1,306 +0,0 @@
-ProgramNode(0...316)(
-  [:a],
-  StatementsNode(0...316)(
-    [RescueModifierNode(0...14)(
-       CallNode(0...3)(nil, nil, (0...3), nil, nil, nil, nil, 2, "foo"),
-       (4...10),
-       NilNode(11...14)()
-     ),
-     RescueModifierNode(16...30)(
-       CallNode(16...19)(nil, nil, (16...19), nil, nil, nil, nil, 2, "foo"),
-       (20...26),
-       NilNode(27...30)()
-     ),
-     RescueModifierNode(32...48)(
-       BreakNode(32...37)(nil, (32...37)),
-       (38...44),
-       NilNode(45...48)()
-     ),
-     RescueModifierNode(50...65)(
-       NextNode(50...54)(nil, (50...54)),
-       (55...61),
-       NilNode(62...65)()
-     ),
-     RescueModifierNode(67...84)(
-       ReturnNode(67...73)((67...73), nil),
-       (74...80),
-       NilNode(81...84)()
-     ),
-     RescueModifierNode(86...105)(
-       CallNode(86...89)(nil, nil, (86...89), nil, nil, nil, nil, 2, "foo"),
-       (90...96),
-       OrNode(97...105)(
-         NilNode(97...100)(),
-         IntegerNode(104...105)(),
-         (101...103)
-       )
-     ),
-     RescueModifierNode(107...129)(
-       CallNode(107...110)(
-         nil,
-         nil,
-         (107...110),
-         nil,
-         nil,
-         nil,
-         nil,
-         2,
-         "foo"
-       ),
-       (111...117),
-       IfNode(118...129)(
-         nil,
-         NilNode(118...121)(),
-         StatementsNode(124...125)([IntegerNode(124...125)()]),
-         ElseNode(126...129)(
-           (126...127),
-           StatementsNode(128...129)([IntegerNode(128...129)()]),
-           nil
-         ),
-         nil
-       )
-     ),
-     BeginNode(131...155)(
-       (131...136),
-       StatementsNode(138...139)(
-         [CallNode(138...139)(
-            nil,
-            nil,
-            (138...139),
-            nil,
-            nil,
-            nil,
-            nil,
-            2,
-            "a"
-          )]
-       ),
-       RescueNode(141...150)(
-         (141...147),
-         [SplatNode(148...150)(
-            (148...149),
-            CallNode(149...150)(
-              nil,
-              nil,
-              (149...150),
-              nil,
-              nil,
-              nil,
-              nil,
-              2,
-              "b"
-            )
-          )],
-         nil,
-         nil,
-         nil,
-         nil
-       ),
-       nil,
-       nil,
-       (152...155)
-     ),
-     CallNode(157...212)(
-       nil,
-       nil,
-       (157...160),
-       nil,
-       nil,
-       nil,
-       BlockNode(161...212)(
-         [:x],
-         BlockParametersNode(164...167)(
-           ParametersNode(165...166)(
-             [RequiredParameterNode(165...166)(:x)],
-             [],
-             [],
-             nil,
-             [],
-             nil,
-             nil
-           ),
-           [],
-           (164...165),
-           (166...167)
-         ),
-         StatementsNode(170...208)(
-           [RescueModifierNode(170...208)(
-              CallNode(170...176)(
-                nil,
-                nil,
-                (170...173),
-                (173...174),
-                ArgumentsNode(174...175)(
-                  [CallNode(174...175)(
-                     nil,
-                     nil,
-                     (174...175),
-                     nil,
-                     nil,
-                     nil,
-                     nil,
-                     2,
-                     "y"
-                   )]
-                ),
-                (175...176),
-                nil,
-                0,
-                "bar"
-              ),
-              (177...183),
-              CallNode(184...208)(
-                nil,
-                nil,
-                (184...197),
-                nil,
-                ArgumentsNode(198...208)(
-                  [CallNode(198...208)(
-                     nil,
-                     nil,
-                     (198...202),
-                     nil,
-                     ArgumentsNode(203...208)(
-                       [StringNode(203...208)(
-                          (203...204),
-                          (204...207),
-                          (207...208),
-                          "baz"
-                        )]
-                     ),
-                     nil,
-                     nil,
-                     0,
-                     "fail"
-                   )]
-                ),
-                nil,
-                nil,
-                0,
-                "ArgumentError"
-              )
-            )]
-         ),
-         (161...163),
-         (209...212)
-       ),
-       0,
-       "foo"
-     ),
-     IfNode(214...245)(
-       (214...216),
-       LocalVariableWriteNode(217...235)(
-         :a,
-         0,
-         (217...218),
-         RescueModifierNode(221...235)(
-           CallNode(221...224)(
-             nil,
-             nil,
-             (221...224),
-             nil,
-             nil,
-             nil,
-             nil,
-             2,
-             "foo"
-           ),
-           (225...231),
-           NilNode(232...235)()
-         ),
-         (219...220)
-       ),
-       StatementsNode(238...241)(
-         [CallNode(238...241)(
-            nil,
-            nil,
-            (238...241),
-            nil,
-            nil,
-            nil,
-            nil,
-            2,
-            "bar"
-          )]
-       ),
-       nil,
-       (242...245)
-     ),
-     DefNode(247...291)(
-       (251...262),
-       nil,
-       nil,
-       StatementsNode(265...291)(
-         [CallNode(265...291)(
-            nil,
-            nil,
-            (265...277),
-            nil,
-            ArgumentsNode(278...291)(
-              [RescueModifierNode(278...291)(
-                 IntegerNode(278...280)(),
-                 (281...287),
-                 NilNode(288...291)()
-               )]
-            ),
-            nil,
-            nil,
-            0,
-            "other_method"
-          )]
-       ),
-       [],
-       (247...250),
-       nil,
-       nil,
-       nil,
-       (263...264),
-       nil
-     ),
-     DefNode(293...316)(
-       (297...298),
-       nil,
-       nil,
-       BeginNode(301...316)(
-         nil,
-         StatementsNode(301...305)(
-           [CallNode(301...305)(
-              nil,
-              nil,
-              (301...302),
-              nil,
-              ArgumentsNode(303...305)(
-                [KeywordHashNode(303...305)(
-                   [AssocNode(303...305)(
-                      SymbolNode(303...305)(
-                        nil,
-                        (303...304),
-                        (304...305),
-                        "b"
-                      ),
-                      nil,
-                      nil
-                    )]
-                 )]
-              ),
-              nil,
-              nil,
-              0,
-              "a"
-            )]
-         ),
-         RescueNode(306...312)((306...312), [], nil, nil, nil, nil),
-         nil,
-         nil,
-         (313...316)
-       ),
-       [],
-       (293...296),
-       nil,
-       nil,
-       nil,
-       nil,
-       (313...316)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/return.txt b/test/yarp/snapshots/return.txt
deleted file mode 100644
index bbb4b63af22185..00000000000000
--- a/test/yarp/snapshots/return.txt
+++ /dev/null
@@ -1,92 +0,0 @@
-ProgramNode(0...139)(
-  [],
-  StatementsNode(0...139)(
-    [ReturnNode(0...6)((0...6), nil),
-     ReturnNode(8...28)(
-       (8...14),
-       ArgumentsNode(15...28)(
-         [ParenthesesNode(15...18)(
-            StatementsNode(16...17)([IntegerNode(16...17)()]),
-            (15...16),
-            (17...18)
-          ),
-          ParenthesesNode(20...23)(
-            StatementsNode(21...22)([IntegerNode(21...22)()]),
-            (20...21),
-            (22...23)
-          ),
-          ParenthesesNode(25...28)(
-            StatementsNode(26...27)([IntegerNode(26...27)()]),
-            (25...26),
-            (27...28)
-          )]
-       )
-     ),
-     ReturnNode(30...39)(
-       (30...36),
-       ArgumentsNode(37...39)(
-         [SplatNode(37...39)((37...38), IntegerNode(38...39)())]
-       )
-     ),
-     ReturnNode(41...49)(
-       (41...47),
-       ArgumentsNode(48...49)([IntegerNode(48...49)()])
-     ),
-     ReturnNode(51...65)(
-       (51...57),
-       ArgumentsNode(58...65)(
-         [IntegerNode(58...59)(),
-          IntegerNode(61...62)(),
-          IntegerNode(64...65)()]
-       )
-     ),
-     ReturnNode(67...81)(
-       (67...73),
-       ArgumentsNode(74...81)(
-         [IntegerNode(74...75)(),
-          IntegerNode(77...78)(),
-          IntegerNode(80...81)()]
-       )
-     ),
-     ReturnNode(83...99)(
-       (83...89),
-       ArgumentsNode(90...99)(
-         [ArrayNode(90...99)(
-            [IntegerNode(91...92)(),
-             IntegerNode(94...95)(),
-             IntegerNode(97...98)()],
-            (90...91),
-            (98...99)
-          )]
-       )
-     ),
-     ReturnNode(101...118)(
-       (101...107),
-       ArgumentsNode(107...118)(
-         [ParenthesesNode(107...118)(
-            StatementsNode(111...116)(
-              [IntegerNode(111...112)(), IntegerNode(115...116)()]
-            ),
-            (107...108),
-            (117...118)
-          )]
-       )
-     ),
-     ReturnNode(120...128)(
-       (120...126),
-       ArgumentsNode(126...128)(
-         [ParenthesesNode(126...128)(nil, (126...127), (127...128))]
-       )
-     ),
-     ReturnNode(130...139)(
-       (130...136),
-       ArgumentsNode(136...139)(
-         [ParenthesesNode(136...139)(
-            StatementsNode(137...138)([IntegerNode(137...138)()]),
-            (136...137),
-            (138...139)
-          )]
-       )
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/BEGIN.txt b/test/yarp/snapshots/seattlerb/BEGIN.txt
deleted file mode 100644
index f3366c5610f4af..00000000000000
--- a/test/yarp/snapshots/seattlerb/BEGIN.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-ProgramNode(0...12)(
-  [],
-  StatementsNode(0...12)(
-    [PreExecutionNode(0...12)(
-       StatementsNode(8...10)([IntegerNode(8...10)()]),
-       (0...5),
-       (6...7),
-       (11...12)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/TestRubyParserShared.txt b/test/yarp/snapshots/seattlerb/TestRubyParserShared.txt
deleted file mode 100644
index 6ae8ed6d031f7d..00000000000000
--- a/test/yarp/snapshots/seattlerb/TestRubyParserShared.txt
+++ /dev/null
@@ -1,233 +0,0 @@
-ProgramNode(0...689)(
-  [],
-  StatementsNode(0...689)(
-    [ArrayNode(0...7)([], (0...3), (6...7)),
-     ArrayNode(9...26)(
-       [SymbolNode(13...18)(nil, (13...18), nil, "line2"),
-        SymbolNode(19...24)(nil, (19...24), nil, "line3")],
-       (9...12),
-       (25...26)
-     ),
-     ArrayNode(28...35)([], (28...31), (34...35)),
-     ArrayNode(37...54)(
-       [StringNode(41...46)(nil, (41...46), nil, "line2"),
-        StringNode(47...52)(nil, (47...52), nil, "line3")],
-       (37...40),
-       (53...54)
-     ),
-     ArrayNode(56...63)([], (56...59), (62...63)),
-     ArrayNode(65...82)(
-       [SymbolNode(69...74)(nil, (69...74), nil, "line2"),
-        SymbolNode(75...80)(nil, (75...80), nil, "line3")],
-       (65...68),
-       (81...82)
-     ),
-     RegularExpressionNode(84...91)(
-       (84...87),
-       (87...90),
-       (90...91),
-       "\n" + "\n" + "\n",
-       0
-     ),
-     ArrayNode(93...100)([], (93...96), (99...100)),
-     ArrayNode(102...119)(
-       [StringNode(106...111)(nil, (106...111), nil, "line2"),
-        StringNode(112...117)(nil, (112...117), nil, "line3")],
-       (102...105),
-       (118...119)
-     ),
-     ArrayNode(121...139)(
-       [SymbolNode(123...129)((123...124), (124...129), nil, "line2"),
-        SymbolNode(131...137)((131...132), (132...137), nil, "line3")],
-       (121...122),
-       (138...139)
-     ),
-     ClassNode(141...269)(
-       [],
-       (141...146),
-       ConstantReadNode(147...148)(:X),
-       nil,
-       nil,
-       StatementsNode(168...246)(
-         [DefNode(168...246)(
-            (177...178),
-            SelfNode(172...176)(),
-            ParametersNode(179...200)(
-              [RequiredParameterNode(179...180)(:a),
-               RequiredParameterNode(199...200)(:b)],
-              [],
-              [],
-              nil,
-              [],
-              nil,
-              nil
-            ),
-            StatementsNode(220...225)(
-              [CallNode(220...225)(
-                 LocalVariableReadNode(220...221)(:a, 0),
-                 nil,
-                 (222...223),
-                 nil,
-                 ArgumentsNode(224...225)(
-                   [LocalVariableReadNode(224...225)(:b, 0)]
-                 ),
-                 nil,
-                 nil,
-                 0,
-                 "+"
-               )]
-            ),
-            [:a, :b],
-            (168...171),
-            (176...177),
-            (178...179),
-            (200...201),
-            nil,
-            (243...246)
-          )]
-       ),
-       (266...269),
-       :X,
-       :X
-     ),
-     ClassNode(293...376)(
-       [],
-       (293...298),
-       ConstantReadNode(299...300)(:X),
-       nil,
-       nil,
-       StatementsNode(315...358)(
-         [ClassNode(315...358)(
-            [],
-            (315...320),
-            ConstantReadNode(321...322)(:Y),
-            nil,
-            nil,
-            StatementsNode(337...343)(
-              [ConstantWriteNode(337...343)(
-                 :Z,
-                 (337...338),
-                 IntegerNode(341...343)(),
-                 (339...340)
-               )]
-            ),
-            (355...358),
-            :Y,
-            :Y
-          )]
-       ),
-       (373...376),
-       :X,
-       :X
-     ),
-     ClassNode(395...498)(
-       [],
-       (395...400),
-       ConstantReadNode(401...402)(:X),
-       nil,
-       nil,
-       StatementsNode(417...480)(
-         [DefNode(417...480)(
-            (421...422),
-            nil,
-            ParametersNode(423...444)(
-              [RequiredParameterNode(423...424)(:a),
-               RequiredParameterNode(443...444)(:b)],
-              [],
-              [],
-              nil,
-              [],
-              nil,
-              nil
-            ),
-            StatementsNode(459...464)(
-              [CallNode(459...464)(
-                 LocalVariableReadNode(459...460)(:a, 0),
-                 nil,
-                 (461...462),
-                 nil,
-                 ArgumentsNode(463...464)(
-                   [LocalVariableReadNode(463...464)(:b, 0)]
-                 ),
-                 nil,
-                 nil,
-                 0,
-                 "+"
-               )]
-            ),
-            [:a, :b],
-            (417...420),
-            nil,
-            (422...423),
-            (444...445),
-            nil,
-            (477...480)
-          )]
-       ),
-       (495...498),
-       :X,
-       :X
-     ),
-     ModuleNode(517...565)(
-       [],
-       (517...523),
-       ConstantReadNode(524...525)(:X),
-       StatementsNode(528...561)(
-         [ConstantWriteNode(528...561)(
-            :X,
-            (528...529),
-            ArrayNode(532...561)(
-              [SymbolNode(538...544)((538...539), (539...544), nil, "line3"),
-               SymbolNode(550...556)((550...551), (551...556), nil, "line4")],
-              (532...533),
-              (560...561)
-            ),
-            (530...531)
-          )]
-       ),
-       (562...565),
-       :X,
-       :X
-     ),
-     ModuleNode(568...651)(
-       [],
-       (568...574),
-       ConstantReadNode(575...576)(:X),
-       StatementsNode(590...633)(
-         [ModuleNode(590...633)(
-            [],
-            (590...596),
-            ConstantReadNode(597...598)(:Y),
-            StatementsNode(612...618)(
-              [ConstantWriteNode(612...618)(
-                 :Z,
-                 (612...613),
-                 IntegerNode(616...618)(),
-                 (614...615)
-               )]
-            ),
-            (630...633),
-            :Y,
-            :Y
-          )]
-       ),
-       (648...651),
-       :X,
-       :X
-     ),
-     CallNode(670...689)(
-       nil,
-       nil,
-       (670...671),
-       (671...672),
-       ArgumentsNode(673...687)(
-         [SymbolNode(673...679)((673...674), (674...679), nil, "line2"),
-          SymbolNode(681...687)((681...682), (682...687), nil, "line3")]
-       ),
-       (688...689),
-       nil,
-       0,
-       "x"
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/__ENCODING__.txt b/test/yarp/snapshots/seattlerb/__ENCODING__.txt
deleted file mode 100644
index 2f5aaa5dfce1b2..00000000000000
--- a/test/yarp/snapshots/seattlerb/__ENCODING__.txt
+++ /dev/null
@@ -1 +0,0 @@
-ProgramNode(0...12)([], StatementsNode(0...12)([SourceEncodingNode(0...12)()]))
diff --git a/test/yarp/snapshots/seattlerb/alias_gvar_backref.txt b/test/yarp/snapshots/seattlerb/alias_gvar_backref.txt
deleted file mode 100644
index d4890ed587a599..00000000000000
--- a/test/yarp/snapshots/seattlerb/alias_gvar_backref.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-ProgramNode(0...15)(
-  [],
-  StatementsNode(0...15)(
-    [AliasNode(0...15)(
-       GlobalVariableReadNode(6...12)(:$MATCH),
-       BackReferenceReadNode(13...15)(),
-       (0...5)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/alias_resword.txt b/test/yarp/snapshots/seattlerb/alias_resword.txt
deleted file mode 100644
index 8452f548260b64..00000000000000
--- a/test/yarp/snapshots/seattlerb/alias_resword.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-ProgramNode(0...12)(
-  [],
-  StatementsNode(0...12)(
-    [AliasNode(0...12)(
-       SymbolNode(6...8)(nil, (6...8), nil, "in"),
-       SymbolNode(9...12)(nil, (9...12), nil, "out"),
-       (0...5)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/and_multi.txt b/test/yarp/snapshots/seattlerb/and_multi.txt
deleted file mode 100644
index 2db7d7ceddf45b..00000000000000
--- a/test/yarp/snapshots/seattlerb/and_multi.txt
+++ /dev/null
@@ -1,24 +0,0 @@
-ProgramNode(0...27)(
-  [],
-  StatementsNode(0...27)(
-    [AndNode(0...27)(
-       AndNode(0...18)(
-         TrueNode(0...4)(),
-         CallNode(9...18)(
-           FalseNode(13...18)(),
-           nil,
-           (9...12),
-           nil,
-           nil,
-           nil,
-           nil,
-           0,
-           "!"
-         ),
-         (5...8)
-       ),
-       TrueNode(23...27)(),
-       (19...22)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/aref_args_assocs.txt b/test/yarp/snapshots/seattlerb/aref_args_assocs.txt
deleted file mode 100644
index aac10a67634d38..00000000000000
--- a/test/yarp/snapshots/seattlerb/aref_args_assocs.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-ProgramNode(0...8)(
-  [],
-  StatementsNode(0...8)(
-    [ArrayNode(0...8)(
-       [KeywordHashNode(1...7)(
-          [AssocNode(1...7)(
-             IntegerNode(1...2)(),
-             IntegerNode(6...7)(),
-             (3...5)
-           )]
-        )],
-       (0...1),
-       (7...8)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/aref_args_lit_assocs.txt b/test/yarp/snapshots/seattlerb/aref_args_lit_assocs.txt
deleted file mode 100644
index 24857076d01fdb..00000000000000
--- a/test/yarp/snapshots/seattlerb/aref_args_lit_assocs.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-ProgramNode(0...11)(
-  [],
-  StatementsNode(0...11)(
-    [ArrayNode(0...11)(
-       [IntegerNode(1...2)(),
-        KeywordHashNode(4...10)(
-          [AssocNode(4...10)(
-             IntegerNode(4...5)(),
-             IntegerNode(9...10)(),
-             (6...8)
-           )]
-        )],
-       (0...1),
-       (10...11)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/args_kw_block.txt b/test/yarp/snapshots/seattlerb/args_kw_block.txt
deleted file mode 100644
index c11a1590702c09..00000000000000
--- a/test/yarp/snapshots/seattlerb/args_kw_block.txt
+++ /dev/null
@@ -1,26 +0,0 @@
-ProgramNode(0...20)(
-  [],
-  StatementsNode(0...20)(
-    [DefNode(0...20)(
-       (4...5),
-       nil,
-       ParametersNode(6...14)(
-         [],
-         [],
-         [],
-         nil,
-         [KeywordParameterNode(6...10)((6...8), IntegerNode(9...10)())],
-         nil,
-         BlockParameterNode(12...14)(:b, (13...14), (12...13))
-       ),
-       nil,
-       [:a, :b],
-       (0...3),
-       nil,
-       (5...6),
-       (14...15),
-       nil,
-       (17...20)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/array_line_breaks.txt b/test/yarp/snapshots/seattlerb/array_line_breaks.txt
deleted file mode 100644
index 4d5224564b6371..00000000000000
--- a/test/yarp/snapshots/seattlerb/array_line_breaks.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-ProgramNode(0...13)(
-  [],
-  StatementsNode(0...13)(
-    [ArrayNode(0...11)(
-       [StringNode(2...5)((2...3), (3...4), (4...5), "a"),
-        StringNode(7...10)((7...8), (8...9), (9...10), "b")],
-       (0...1),
-       (10...11)
-     ),
-     IntegerNode(12...13)()]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/array_lits_trailing_calls.txt b/test/yarp/snapshots/seattlerb/array_lits_trailing_calls.txt
deleted file mode 100644
index 8e9c1318467a9d..00000000000000
--- a/test/yarp/snapshots/seattlerb/array_lits_trailing_calls.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-ProgramNode(0...12)(
-  [],
-  StatementsNode(0...12)(
-    [CallNode(0...6)(
-       ArrayNode(0...4)([], (0...3), (3...4)),
-       (4...5),
-       (5...6),
-       nil,
-       nil,
-       nil,
-       nil,
-       0,
-       "b"
-     ),
-     CallNode(8...12)(
-       ArrayNode(8...10)([], (8...9), (9...10)),
-       (10...11),
-       (11...12),
-       nil,
-       nil,
-       nil,
-       nil,
-       0,
-       "b"
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/assoc__bare.txt b/test/yarp/snapshots/seattlerb/assoc__bare.txt
deleted file mode 100644
index ddefbd1f62eb9c..00000000000000
--- a/test/yarp/snapshots/seattlerb/assoc__bare.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-ProgramNode(0...6)(
-  [],
-  StatementsNode(0...6)(
-    [HashNode(0...6)(
-       (0...1),
-       [AssocNode(2...4)(
-          SymbolNode(2...4)(nil, (2...3), (3...4), "y"),
-          nil,
-          nil
-        )],
-       (5...6)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/assoc_label.txt b/test/yarp/snapshots/seattlerb/assoc_label.txt
deleted file mode 100644
index 4fa881d1914a79..00000000000000
--- a/test/yarp/snapshots/seattlerb/assoc_label.txt
+++ /dev/null
@@ -1,24 +0,0 @@
-ProgramNode(0...6)(
-  [],
-  StatementsNode(0...6)(
-    [CallNode(0...6)(
-       nil,
-       nil,
-       (0...1),
-       (1...2),
-       ArgumentsNode(2...5)(
-         [KeywordHashNode(2...5)(
-            [AssocNode(2...5)(
-               SymbolNode(2...4)(nil, (2...3), (3...4), "b"),
-               IntegerNode(4...5)(),
-               nil
-             )]
-          )]
-       ),
-       (5...6),
-       nil,
-       0,
-       "a"
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/attr_asgn_colon_id.txt b/test/yarp/snapshots/seattlerb/attr_asgn_colon_id.txt
deleted file mode 100644
index b9f459e5f1e192..00000000000000
--- a/test/yarp/snapshots/seattlerb/attr_asgn_colon_id.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-ProgramNode(0...8)(
-  [],
-  StatementsNode(0...8)(
-    [CallNode(0...8)(
-       ConstantReadNode(0...1)(:A),
-       (1...3),
-       (3...4),
-       nil,
-       ArgumentsNode(7...8)([IntegerNode(7...8)()]),
-       nil,
-       nil,
-       0,
-       "b="
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/attrasgn_array_arg.txt b/test/yarp/snapshots/seattlerb/attrasgn_array_arg.txt
deleted file mode 100644
index b9a116975a9bbb..00000000000000
--- a/test/yarp/snapshots/seattlerb/attrasgn_array_arg.txt
+++ /dev/null
@@ -1,23 +0,0 @@
-ProgramNode(0...13)(
-  [],
-  StatementsNode(0...13)(
-    [CallNode(0...13)(
-       CallNode(0...1)(nil, nil, (0...1), nil, nil, nil, nil, 2, "a"),
-       nil,
-       (1...9),
-       (1...2),
-       ArgumentsNode(2...13)(
-         [ArrayNode(2...8)(
-            [IntegerNode(3...4)(), IntegerNode(6...7)()],
-            (2...3),
-            (7...8)
-          ),
-          IntegerNode(12...13)()]
-       ),
-       (8...9),
-       nil,
-       0,
-       "[]="
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/attrasgn_array_lhs.txt b/test/yarp/snapshots/seattlerb/attrasgn_array_lhs.txt
deleted file mode 100644
index 666f9e34765e2b..00000000000000
--- a/test/yarp/snapshots/seattlerb/attrasgn_array_lhs.txt
+++ /dev/null
@@ -1,57 +0,0 @@
-ProgramNode(0...42)(
-  [],
-  StatementsNode(0...42)(
-    [CallNode(0...42)(
-       ArrayNode(0...12)(
-         [IntegerNode(1...2)(),
-          IntegerNode(4...5)(),
-          IntegerNode(7...8)(),
-          IntegerNode(10...11)()],
-         (0...1),
-         (11...12)
-       ),
-       nil,
-       (12...24),
-       (12...13),
-       ArgumentsNode(13...42)(
-         [RangeNode(13...23)(
-            CallNode(13...17)(
-              nil,
-              nil,
-              (13...17),
-              nil,
-              nil,
-              nil,
-              nil,
-              2,
-              "from"
-            ),
-            CallNode(21...23)(
-              nil,
-              nil,
-              (21...23),
-              nil,
-              nil,
-              nil,
-              nil,
-              2,
-              "to"
-            ),
-            (18...20),
-            0
-          ),
-          ArrayNode(27...42)(
-            [StringNode(28...31)((28...29), (29...30), (30...31), "a"),
-             StringNode(33...36)((33...34), (34...35), (35...36), "b"),
-             StringNode(38...41)((38...39), (39...40), (40...41), "c")],
-            (27...28),
-            (41...42)
-          )]
-       ),
-       (23...24),
-       nil,
-       0,
-       "[]="
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/attrasgn_primary_dot_constant.txt b/test/yarp/snapshots/seattlerb/attrasgn_primary_dot_constant.txt
deleted file mode 100644
index f9d549a27bee7a..00000000000000
--- a/test/yarp/snapshots/seattlerb/attrasgn_primary_dot_constant.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-ProgramNode(0...7)(
-  [],
-  StatementsNode(0...7)(
-    [CallNode(0...7)(
-       CallNode(0...1)(nil, nil, (0...1), nil, nil, nil, nil, 2, "a"),
-       (1...2),
-       (2...3),
-       nil,
-       ArgumentsNode(6...7)([IntegerNode(6...7)()]),
-       nil,
-       nil,
-       0,
-       "B="
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/backticks_interpolation_line.txt b/test/yarp/snapshots/seattlerb/backticks_interpolation_line.txt
deleted file mode 100644
index 86c78947fa9591..00000000000000
--- a/test/yarp/snapshots/seattlerb/backticks_interpolation_line.txt
+++ /dev/null
@@ -1,38 +0,0 @@
-ProgramNode(0...8)(
-  [],
-  StatementsNode(0...8)(
-    [CallNode(0...8)(
-       nil,
-       nil,
-       (0...1),
-       nil,
-       ArgumentsNode(2...8)(
-         [InterpolatedXStringNode(2...8)(
-            (2...3),
-            [EmbeddedStatementsNode(3...7)(
-               (3...5),
-               StatementsNode(5...6)(
-                 [CallNode(5...6)(
-                    nil,
-                    nil,
-                    (5...6),
-                    nil,
-                    nil,
-                    nil,
-                    nil,
-                    2,
-                    "y"
-                  )]
-               ),
-               (6...7)
-             )],
-            (7...8)
-          )]
-       ),
-       nil,
-       nil,
-       0,
-       "x"
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/bang_eq.txt b/test/yarp/snapshots/seattlerb/bang_eq.txt
deleted file mode 100644
index 3a04d4603a9f2b..00000000000000
--- a/test/yarp/snapshots/seattlerb/bang_eq.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-ProgramNode(0...6)(
-  [],
-  StatementsNode(0...6)(
-    [CallNode(0...6)(
-       IntegerNode(0...1)(),
-       nil,
-       (2...4),
-       nil,
-       ArgumentsNode(5...6)([IntegerNode(5...6)()]),
-       nil,
-       nil,
-       0,
-       "!="
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/bdot2.txt b/test/yarp/snapshots/seattlerb/bdot2.txt
deleted file mode 100644
index ff960bce8eb784..00000000000000
--- a/test/yarp/snapshots/seattlerb/bdot2.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-ProgramNode(0...14)(
-  [],
-  StatementsNode(0...14)(
-    [RangeNode(0...4)(nil, IntegerNode(2...4)(), (0...2), 0),
-     RangeNode(7...10)(
-       nil,
-       CallNode(9...10)(nil, nil, (9...10), nil, nil, nil, nil, 2, "a"),
-       (7...9),
-       0
-     ),
-     CallNode(13...14)(nil, nil, (13...14), nil, nil, nil, nil, 2, "c")]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/bdot3.txt b/test/yarp/snapshots/seattlerb/bdot3.txt
deleted file mode 100644
index abc8a679f1c0fe..00000000000000
--- a/test/yarp/snapshots/seattlerb/bdot3.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-ProgramNode(0...16)(
-  [],
-  StatementsNode(0...16)(
-    [RangeNode(0...5)(nil, IntegerNode(3...5)(), (0...3), 1),
-     RangeNode(8...12)(
-       nil,
-       CallNode(11...12)(nil, nil, (11...12), nil, nil, nil, nil, 2, "a"),
-       (8...11),
-       1
-     ),
-     CallNode(15...16)(nil, nil, (15...16), nil, nil, nil, nil, 2, "c")]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/begin_ensure_no_bodies.txt b/test/yarp/snapshots/seattlerb/begin_ensure_no_bodies.txt
deleted file mode 100644
index 39ac8bfea17660..00000000000000
--- a/test/yarp/snapshots/seattlerb/begin_ensure_no_bodies.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-ProgramNode(0...16)(
-  [],
-  StatementsNode(0...16)(
-    [BeginNode(0...16)(
-       (0...5),
-       nil,
-       nil,
-       nil,
-       EnsureNode(6...16)((6...12), nil, (13...16)),
-       (13...16)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/begin_rescue_else_ensure_bodies.txt b/test/yarp/snapshots/seattlerb/begin_rescue_else_ensure_bodies.txt
deleted file mode 100644
index 4ad22bbc28e69d..00000000000000
--- a/test/yarp/snapshots/seattlerb/begin_rescue_else_ensure_bodies.txt
+++ /dev/null
@@ -1,28 +0,0 @@
-ProgramNode(0...44)(
-  [],
-  StatementsNode(0...44)(
-    [BeginNode(0...44)(
-       (0...5),
-       StatementsNode(8...9)([IntegerNode(8...9)()]),
-       RescueNode(10...20)(
-         (10...16),
-         [],
-         nil,
-         nil,
-         StatementsNode(19...20)([IntegerNode(19...20)()]),
-         nil
-       ),
-       ElseNode(21...36)(
-         (21...25),
-         StatementsNode(28...29)([IntegerNode(28...29)()]),
-         (30...36)
-       ),
-       EnsureNode(30...44)(
-         (30...36),
-         StatementsNode(39...40)([IntegerNode(39...40)()]),
-         (41...44)
-       ),
-       (41...44)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/begin_rescue_else_ensure_no_bodies.txt b/test/yarp/snapshots/seattlerb/begin_rescue_else_ensure_no_bodies.txt
deleted file mode 100644
index f8cc5345e309bb..00000000000000
--- a/test/yarp/snapshots/seattlerb/begin_rescue_else_ensure_no_bodies.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-ProgramNode(0...32)(
-  [],
-  StatementsNode(0...32)(
-    [BeginNode(0...32)(
-       (0...5),
-       nil,
-       RescueNode(7...13)((7...13), [], nil, nil, nil, nil),
-       ElseNode(15...27)((15...19), nil, (21...27)),
-       EnsureNode(21...32)((21...27), nil, (29...32)),
-       (29...32)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/begin_rescue_ensure_no_bodies.txt b/test/yarp/snapshots/seattlerb/begin_rescue_ensure_no_bodies.txt
deleted file mode 100644
index 1152a0cddfbabc..00000000000000
--- a/test/yarp/snapshots/seattlerb/begin_rescue_ensure_no_bodies.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-ProgramNode(0...23)(
-  [],
-  StatementsNode(0...23)(
-    [BeginNode(0...23)(
-       (0...5),
-       nil,
-       RescueNode(6...12)((6...12), [], nil, nil, nil, nil),
-       nil,
-       EnsureNode(13...23)((13...19), nil, (20...23)),
-       (20...23)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/block_arg__bare.txt b/test/yarp/snapshots/seattlerb/block_arg__bare.txt
deleted file mode 100644
index c660aeb54e725e..00000000000000
--- a/test/yarp/snapshots/seattlerb/block_arg__bare.txt
+++ /dev/null
@@ -1,26 +0,0 @@
-ProgramNode(0...13)(
-  [],
-  StatementsNode(0...13)(
-    [DefNode(0...13)(
-       (4...5),
-       nil,
-       ParametersNode(6...7)(
-         [],
-         [],
-         [],
-         nil,
-         [],
-         nil,
-         BlockParameterNode(6...7)(nil, nil, (6...7))
-       ),
-       nil,
-       [:&],
-       (0...3),
-       nil,
-       (5...6),
-       (7...8),
-       nil,
-       (10...13)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/block_arg_kwsplat.txt b/test/yarp/snapshots/seattlerb/block_arg_kwsplat.txt
deleted file mode 100644
index 36b7c9f83cced4..00000000000000
--- a/test/yarp/snapshots/seattlerb/block_arg_kwsplat.txt
+++ /dev/null
@@ -1,35 +0,0 @@
-ProgramNode(0...11)(
-  [],
-  StatementsNode(0...11)(
-    [CallNode(0...11)(
-       nil,
-       nil,
-       (0...1),
-       nil,
-       nil,
-       nil,
-       BlockNode(2...11)(
-         [:b],
-         BlockParametersNode(4...9)(
-           ParametersNode(5...8)(
-             [],
-             [],
-             [],
-             nil,
-             [],
-             KeywordRestParameterNode(5...8)((5...7), (7...8)),
-             nil
-           ),
-           [],
-           (4...5),
-           (8...9)
-         ),
-         nil,
-         (2...3),
-         (10...11)
-       ),
-       0,
-       "a"
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/block_arg_opt_arg_block.txt b/test/yarp/snapshots/seattlerb/block_arg_opt_arg_block.txt
deleted file mode 100644
index dd24630442aa5a..00000000000000
--- a/test/yarp/snapshots/seattlerb/block_arg_opt_arg_block.txt
+++ /dev/null
@@ -1,40 +0,0 @@
-ProgramNode(0...21)(
-  [],
-  StatementsNode(0...21)(
-    [CallNode(0...21)(
-       nil,
-       nil,
-       (0...1),
-       nil,
-       nil,
-       nil,
-       BlockNode(2...21)(
-         [:b, :c, :d, :e],
-         BlockParametersNode(4...19)(
-           ParametersNode(5...18)(
-             [RequiredParameterNode(5...6)(:b)],
-             [OptionalParameterNode(8...11)(
-                :c,
-                (8...9),
-                (9...10),
-                IntegerNode(10...11)()
-              )],
-             [RequiredParameterNode(13...14)(:d)],
-             nil,
-             [],
-             nil,
-             BlockParameterNode(16...18)(:e, (17...18), (16...17))
-           ),
-           [],
-           (4...5),
-           (18...19)
-         ),
-         nil,
-         (2...3),
-         (20...21)
-       ),
-       0,
-       "a"
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/block_arg_opt_splat.txt b/test/yarp/snapshots/seattlerb/block_arg_opt_splat.txt
deleted file mode 100644
index 096a00092d8fa0..00000000000000
--- a/test/yarp/snapshots/seattlerb/block_arg_opt_splat.txt
+++ /dev/null
@@ -1,40 +0,0 @@
-ProgramNode(0...20)(
-  [],
-  StatementsNode(0...20)(
-    [CallNode(0...20)(
-       nil,
-       nil,
-       (0...1),
-       nil,
-       nil,
-       nil,
-       BlockNode(2...20)(
-         [:b, :c, :d],
-         BlockParametersNode(4...18)(
-           ParametersNode(5...17)(
-             [RequiredParameterNode(5...6)(:b)],
-             [OptionalParameterNode(8...13)(
-                :c,
-                (8...9),
-                (10...11),
-                IntegerNode(12...13)()
-              )],
-             [],
-             RestParameterNode(15...17)((15...16), (16...17)),
-             [],
-             nil,
-             nil
-           ),
-           [],
-           (4...5),
-           (17...18)
-         ),
-         nil,
-         (2...3),
-         (19...20)
-       ),
-       0,
-       "a"
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/block_arg_opt_splat_arg_block_omfg.txt b/test/yarp/snapshots/seattlerb/block_arg_opt_splat_arg_block_omfg.txt
deleted file mode 100644
index dc7500ce920e53..00000000000000
--- a/test/yarp/snapshots/seattlerb/block_arg_opt_splat_arg_block_omfg.txt
+++ /dev/null
@@ -1,40 +0,0 @@
-ProgramNode(0...25)(
-  [],
-  StatementsNode(0...25)(
-    [CallNode(0...25)(
-       nil,
-       nil,
-       (0...1),
-       nil,
-       nil,
-       nil,
-       BlockNode(2...25)(
-         [:b, :c, :d, :e, :f],
-         BlockParametersNode(4...23)(
-           ParametersNode(5...22)(
-             [RequiredParameterNode(5...6)(:b)],
-             [OptionalParameterNode(8...11)(
-                :c,
-                (8...9),
-                (9...10),
-                IntegerNode(10...11)()
-              )],
-             [RequiredParameterNode(17...18)(:e)],
-             RestParameterNode(13...15)((13...14), (14...15)),
-             [],
-             nil,
-             BlockParameterNode(20...22)(:f, (21...22), (20...21))
-           ),
-           [],
-           (4...5),
-           (22...23)
-         ),
-         nil,
-         (2...3),
-         (24...25)
-       ),
-       0,
-       "a"
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/block_arg_optional.txt b/test/yarp/snapshots/seattlerb/block_arg_optional.txt
deleted file mode 100644
index cb71821778a06e..00000000000000
--- a/test/yarp/snapshots/seattlerb/block_arg_optional.txt
+++ /dev/null
@@ -1,40 +0,0 @@
-ProgramNode(0...13)(
-  [],
-  StatementsNode(0...13)(
-    [CallNode(0...13)(
-       nil,
-       nil,
-       (0...1),
-       nil,
-       nil,
-       nil,
-       BlockNode(2...13)(
-         [:b],
-         BlockParametersNode(4...11)(
-           ParametersNode(5...10)(
-             [],
-             [OptionalParameterNode(5...10)(
-                :b,
-                (5...6),
-                (7...8),
-                IntegerNode(9...10)()
-              )],
-             [],
-             nil,
-             [],
-             nil,
-             nil
-           ),
-           [],
-           (4...5),
-           (10...11)
-         ),
-         nil,
-         (2...3),
-         (12...13)
-       ),
-       0,
-       "a"
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/block_arg_scope.txt b/test/yarp/snapshots/seattlerb/block_arg_scope.txt
deleted file mode 100644
index be99e78eecc891..00000000000000
--- a/test/yarp/snapshots/seattlerb/block_arg_scope.txt
+++ /dev/null
@@ -1,35 +0,0 @@
-ProgramNode(0...12)(
-  [],
-  StatementsNode(0...12)(
-    [CallNode(0...12)(
-       nil,
-       nil,
-       (0...1),
-       nil,
-       nil,
-       nil,
-       BlockNode(2...12)(
-         [:b, :c],
-         BlockParametersNode(4...10)(
-           ParametersNode(5...6)(
-             [RequiredParameterNode(5...6)(:b)],
-             [],
-             [],
-             nil,
-             [],
-             nil,
-             nil
-           ),
-           [BlockLocalVariableNode(8...9)(:c)],
-           (4...5),
-           (9...10)
-         ),
-         nil,
-         (2...3),
-         (11...12)
-       ),
-       0,
-       "a"
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/block_arg_scope2.txt b/test/yarp/snapshots/seattlerb/block_arg_scope2.txt
deleted file mode 100644
index fcee4898aa00a2..00000000000000
--- a/test/yarp/snapshots/seattlerb/block_arg_scope2.txt
+++ /dev/null
@@ -1,36 +0,0 @@
-ProgramNode(0...14)(
-  [],
-  StatementsNode(0...14)(
-    [CallNode(0...14)(
-       nil,
-       nil,
-       (0...1),
-       nil,
-       nil,
-       nil,
-       BlockNode(2...14)(
-         [:b, :c, :d],
-         BlockParametersNode(3...12)(
-           ParametersNode(4...5)(
-             [RequiredParameterNode(4...5)(:b)],
-             [],
-             [],
-             nil,
-             [],
-             nil,
-             nil
-           ),
-           [BlockLocalVariableNode(7...8)(:c),
-            BlockLocalVariableNode(10...11)(:d)],
-           (3...4),
-           (11...12)
-         ),
-         nil,
-         (2...3),
-         (13...14)
-       ),
-       0,
-       "a"
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/block_arg_splat_arg.txt b/test/yarp/snapshots/seattlerb/block_arg_splat_arg.txt
deleted file mode 100644
index 01732f748e2652..00000000000000
--- a/test/yarp/snapshots/seattlerb/block_arg_splat_arg.txt
+++ /dev/null
@@ -1,35 +0,0 @@
-ProgramNode(0...16)(
-  [],
-  StatementsNode(0...16)(
-    [CallNode(0...16)(
-       nil,
-       nil,
-       (0...1),
-       nil,
-       nil,
-       nil,
-       BlockNode(2...16)(
-         [:b, :c, :d],
-         BlockParametersNode(4...14)(
-           ParametersNode(5...13)(
-             [RequiredParameterNode(5...6)(:b)],
-             [],
-             [RequiredParameterNode(12...13)(:d)],
-             RestParameterNode(8...10)((8...9), (9...10)),
-             [],
-             nil,
-             nil
-           ),
-           [],
-           (4...5),
-           (13...14)
-         ),
-         nil,
-         (2...3),
-         (15...16)
-       ),
-       0,
-       "a"
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/block_args_kwargs.txt b/test/yarp/snapshots/seattlerb/block_args_kwargs.txt
deleted file mode 100644
index f54b1bc55f5efe..00000000000000
--- a/test/yarp/snapshots/seattlerb/block_args_kwargs.txt
+++ /dev/null
@@ -1,35 +0,0 @@
-ProgramNode(0...23)(
-  [],
-  StatementsNode(0...23)(
-    [CallNode(0...23)(
-       nil,
-       nil,
-       (0...1),
-       nil,
-       nil,
-       nil,
-       BlockNode(2...23)(
-         [:kwargs],
-         BlockParametersNode(4...14)(
-           ParametersNode(5...13)(
-             [],
-             [],
-             [],
-             nil,
-             [],
-             KeywordRestParameterNode(5...13)((5...7), (7...13)),
-             nil
-           ),
-           [],
-           (4...5),
-           (13...14)
-         ),
-         StatementsNode(15...21)([LocalVariableReadNode(15...21)(:kwargs, 0)]),
-         (2...3),
-         (22...23)
-       ),
-       0,
-       "f"
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/block_args_no_kwargs.txt b/test/yarp/snapshots/seattlerb/block_args_no_kwargs.txt
deleted file mode 100644
index 7e4fa1e9f8bba3..00000000000000
--- a/test/yarp/snapshots/seattlerb/block_args_no_kwargs.txt
+++ /dev/null
@@ -1,35 +0,0 @@
-ProgramNode(0...13)(
-  [],
-  StatementsNode(0...13)(
-    [CallNode(0...13)(
-       nil,
-       nil,
-       (0...1),
-       nil,
-       nil,
-       nil,
-       BlockNode(2...13)(
-         [],
-         BlockParametersNode(4...11)(
-           ParametersNode(5...10)(
-             [],
-             [],
-             [],
-             nil,
-             [],
-             NoKeywordsParameterNode(5...10)((5...7), (7...10)),
-             nil
-           ),
-           [],
-           (4...5),
-           (10...11)
-         ),
-         nil,
-         (2...3),
-         (12...13)
-       ),
-       0,
-       "f"
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/block_args_opt1.txt b/test/yarp/snapshots/seattlerb/block_args_opt1.txt
deleted file mode 100644
index 271638e3d8eff7..00000000000000
--- a/test/yarp/snapshots/seattlerb/block_args_opt1.txt
+++ /dev/null
@@ -1,47 +0,0 @@
-ProgramNode(0...24)(
-  [],
-  StatementsNode(0...24)(
-    [CallNode(0...24)(
-       nil,
-       nil,
-       (0...1),
-       nil,
-       nil,
-       nil,
-       BlockNode(2...24)(
-         [:a, :b],
-         BlockParametersNode(4...15)(
-           ParametersNode(5...14)(
-             [RequiredParameterNode(5...6)(:a)],
-             [OptionalParameterNode(8...14)(
-                :b,
-                (8...9),
-                (10...11),
-                IntegerNode(12...14)()
-              )],
-             [],
-             nil,
-             [],
-             nil,
-             nil
-           ),
-           [],
-           (4...5),
-           (14...15)
-         ),
-         StatementsNode(16...22)(
-           [ArrayNode(16...22)(
-              [LocalVariableReadNode(17...18)(:a, 0),
-               LocalVariableReadNode(20...21)(:b, 0)],
-              (16...17),
-              (21...22)
-            )]
-         ),
-         (2...3),
-         (23...24)
-       ),
-       0,
-       "f"
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/block_args_opt2.txt b/test/yarp/snapshots/seattlerb/block_args_opt2.txt
deleted file mode 100644
index 6b98d4f75cdde6..00000000000000
--- a/test/yarp/snapshots/seattlerb/block_args_opt2.txt
+++ /dev/null
@@ -1,46 +0,0 @@
-ProgramNode(0...18)(
-  [],
-  StatementsNode(0...18)(
-    [CallNode(0...18)(
-       nil,
-       nil,
-       (0...1),
-       nil,
-       nil,
-       nil,
-       BlockNode(2...18)(
-         [:b, :c],
-         BlockParametersNode(4...16)(
-           ParametersNode(6...14)(
-             [],
-             [OptionalParameterNode(6...9)(
-                :b,
-                (6...7),
-                (7...8),
-                IntegerNode(8...9)()
-              ),
-              OptionalParameterNode(11...14)(
-                :c,
-                (11...12),
-                (12...13),
-                IntegerNode(13...14)()
-              )],
-             [],
-             nil,
-             [],
-             nil,
-             nil
-           ),
-           [],
-           (4...5),
-           (15...16)
-         ),
-         nil,
-         (2...3),
-         (17...18)
-       ),
-       0,
-       "a"
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/block_args_opt2_2.txt b/test/yarp/snapshots/seattlerb/block_args_opt2_2.txt
deleted file mode 100644
index cdda0997df38bf..00000000000000
--- a/test/yarp/snapshots/seattlerb/block_args_opt2_2.txt
+++ /dev/null
@@ -1,54 +0,0 @@
-ProgramNode(0...35)(
-  [],
-  StatementsNode(0...35)(
-    [CallNode(0...35)(
-       nil,
-       nil,
-       (0...1),
-       nil,
-       nil,
-       nil,
-       BlockNode(2...35)(
-         [:a, :b, :c],
-         BlockParametersNode(4...23)(
-           ParametersNode(5...22)(
-             [RequiredParameterNode(5...6)(:a)],
-             [OptionalParameterNode(8...14)(
-                :b,
-                (8...9),
-                (10...11),
-                IntegerNode(12...14)()
-              ),
-              OptionalParameterNode(16...22)(
-                :c,
-                (16...17),
-                (18...19),
-                IntegerNode(20...22)()
-              )],
-             [],
-             nil,
-             [],
-             nil,
-             nil
-           ),
-           [],
-           (4...5),
-           (22...23)
-         ),
-         StatementsNode(24...33)(
-           [ArrayNode(24...33)(
-              [LocalVariableReadNode(25...26)(:a, 0),
-               LocalVariableReadNode(28...29)(:b, 0),
-               LocalVariableReadNode(31...32)(:c, 0)],
-              (24...25),
-              (32...33)
-            )]
-         ),
-         (2...3),
-         (34...35)
-       ),
-       0,
-       "f"
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/block_args_opt3.txt b/test/yarp/snapshots/seattlerb/block_args_opt3.txt
deleted file mode 100644
index 6d4e26c8eda195..00000000000000
--- a/test/yarp/snapshots/seattlerb/block_args_opt3.txt
+++ /dev/null
@@ -1,55 +0,0 @@
-ProgramNode(0...42)(
-  [],
-  StatementsNode(0...42)(
-    [CallNode(0...42)(
-       nil,
-       nil,
-       (0...1),
-       nil,
-       nil,
-       nil,
-       BlockNode(2...42)(
-         [:a, :b, :c, :d],
-         BlockParametersNode(4...27)(
-           ParametersNode(5...26)(
-             [RequiredParameterNode(5...6)(:a)],
-             [OptionalParameterNode(8...14)(
-                :b,
-                (8...9),
-                (10...11),
-                IntegerNode(12...14)()
-              ),
-              OptionalParameterNode(16...22)(
-                :c,
-                (16...17),
-                (18...19),
-                IntegerNode(20...22)()
-              )],
-             [],
-             nil,
-             [],
-             nil,
-             BlockParameterNode(24...26)(:d, (25...26), (24...25))
-           ),
-           [],
-           (4...5),
-           (26...27)
-         ),
-         StatementsNode(28...40)(
-           [ArrayNode(28...40)(
-              [LocalVariableReadNode(29...30)(:a, 0),
-               LocalVariableReadNode(32...33)(:b, 0),
-               LocalVariableReadNode(35...36)(:c, 0),
-               LocalVariableReadNode(38...39)(:d, 0)],
-              (28...29),
-              (39...40)
-            )]
-         ),
-         (2...3),
-         (41...42)
-       ),
-       0,
-       "f"
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/block_break.txt b/test/yarp/snapshots/seattlerb/block_break.txt
deleted file mode 100644
index 9ebe2b1488f2b7..00000000000000
--- a/test/yarp/snapshots/seattlerb/block_break.txt
+++ /dev/null
@@ -1,52 +0,0 @@
-ProgramNode(0...26)(
-  [],
-  StatementsNode(0...26)(
-    [BreakNode(0...26)(
-       ArgumentsNode(6...26)(
-         [CallNode(6...26)(
-            nil,
-            nil,
-            (6...9),
-            nil,
-            ArgumentsNode(10...13)(
-              [CallNode(10...13)(
-                 nil,
-                 nil,
-                 (10...13),
-                 nil,
-                 nil,
-                 nil,
-                 nil,
-                 2,
-                 "arg"
-               )]
-            ),
-            nil,
-            BlockNode(14...26)(
-              [:bar],
-              BlockParametersNode(17...22)(
-                ParametersNode(18...21)(
-                  [RequiredParameterNode(18...21)(:bar)],
-                  [],
-                  [],
-                  nil,
-                  [],
-                  nil,
-                  nil
-                ),
-                [],
-                (17...18),
-                (21...22)
-              ),
-              nil,
-              (14...16),
-              (23...26)
-            ),
-            0,
-            "foo"
-          )]
-       ),
-       (0...5)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/block_call_defn_call_block_call.txt b/test/yarp/snapshots/seattlerb/block_call_defn_call_block_call.txt
deleted file mode 100644
index 46b55171fab0af..00000000000000
--- a/test/yarp/snapshots/seattlerb/block_call_defn_call_block_call.txt
+++ /dev/null
@@ -1,61 +0,0 @@
-ProgramNode(0...30)(
-  [],
-  StatementsNode(0...30)(
-    [CallNode(0...18)(
-       nil,
-       nil,
-       (0...1),
-       nil,
-       ArgumentsNode(2...18)(
-         [DefNode(2...18)(
-            (6...7),
-            nil,
-            ParametersNode(8...9)(
-              [RequiredParameterNode(8...9)(:c)],
-              [],
-              [],
-              nil,
-              [],
-              nil,
-              nil
-            ),
-            StatementsNode(12...13)(
-              [CallNode(12...13)(
-                 nil,
-                 nil,
-                 (12...13),
-                 nil,
-                 nil,
-                 nil,
-                 nil,
-                 2,
-                 "d"
-               )]
-            ),
-            [:c],
-            (2...5),
-            nil,
-            (7...8),
-            (9...10),
-            nil,
-            (15...18)
-          )]
-       ),
-       nil,
-       nil,
-       0,
-       "a"
-     ),
-     CallNode(20...30)(
-       CallNode(20...21)(nil, nil, (20...21), nil, nil, nil, nil, 2, "e"),
-       (21...22),
-       (22...23),
-       nil,
-       nil,
-       nil,
-       BlockNode(24...30)([], nil, nil, (24...26), (27...30)),
-       0,
-       "f"
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/block_call_dot_op2_brace_block.txt b/test/yarp/snapshots/seattlerb/block_call_dot_op2_brace_block.txt
deleted file mode 100644
index 60c529a4253913..00000000000000
--- a/test/yarp/snapshots/seattlerb/block_call_dot_op2_brace_block.txt
+++ /dev/null
@@ -1,77 +0,0 @@
-ProgramNode(0...31)(
-  [],
-  StatementsNode(0...31)(
-    [CallNode(0...31)(
-       CallNode(0...16)(
-         CallNode(0...1)(nil, nil, (0...1), nil, nil, nil, nil, 2, "a"),
-         (1...2),
-         (2...3),
-         nil,
-         ArgumentsNode(4...7)(
-           [CallNode(4...7)(
-              nil,
-              nil,
-              (4...5),
-              (5...6),
-              nil,
-              (6...7),
-              nil,
-              0,
-              "c"
-            )]
-         ),
-         nil,
-         BlockNode(8...16)(
-           [],
-           nil,
-           StatementsNode(11...12)(
-             [CallNode(11...12)(
-                nil,
-                nil,
-                (11...12),
-                nil,
-                nil,
-                nil,
-                nil,
-                2,
-                "d"
-              )]
-           ),
-           (8...10),
-           (13...16)
-         ),
-         0,
-         "b"
-       ),
-       (16...17),
-       (17...18),
-       nil,
-       nil,
-       nil,
-       BlockNode(19...31)(
-         [:f],
-         BlockParametersNode(22...25)(
-           ParametersNode(23...24)(
-             [RequiredParameterNode(23...24)(:f)],
-             [],
-             [],
-             nil,
-             [],
-             nil,
-             nil
-           ),
-           [],
-           (22...23),
-           (24...25)
-         ),
-         StatementsNode(26...27)(
-           [CallNode(26...27)(nil, nil, (26...27), nil, nil, nil, nil, 2, "g")]
-         ),
-         (19...21),
-         (28...31)
-       ),
-       0,
-       "e"
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/block_call_dot_op2_cmd_args_do_block.txt b/test/yarp/snapshots/seattlerb/block_call_dot_op2_cmd_args_do_block.txt
deleted file mode 100644
index c41a55f13fe948..00000000000000
--- a/test/yarp/snapshots/seattlerb/block_call_dot_op2_cmd_args_do_block.txt
+++ /dev/null
@@ -1,79 +0,0 @@
-ProgramNode(0...33)(
-  [],
-  StatementsNode(0...33)(
-    [CallNode(0...33)(
-       CallNode(0...16)(
-         CallNode(0...1)(nil, nil, (0...1), nil, nil, nil, nil, 2, "a"),
-         (1...2),
-         (2...3),
-         nil,
-         ArgumentsNode(4...7)(
-           [CallNode(4...7)(
-              nil,
-              nil,
-              (4...5),
-              (5...6),
-              nil,
-              (6...7),
-              nil,
-              0,
-              "c"
-            )]
-         ),
-         nil,
-         BlockNode(8...16)(
-           [],
-           nil,
-           StatementsNode(11...12)(
-             [CallNode(11...12)(
-                nil,
-                nil,
-                (11...12),
-                nil,
-                nil,
-                nil,
-                nil,
-                2,
-                "d"
-              )]
-           ),
-           (8...10),
-           (13...16)
-         ),
-         0,
-         "b"
-       ),
-       (16...17),
-       (17...18),
-       nil,
-       ArgumentsNode(19...20)(
-         [CallNode(19...20)(nil, nil, (19...20), nil, nil, nil, nil, 2, "f")]
-       ),
-       nil,
-       BlockNode(21...33)(
-         [:g],
-         BlockParametersNode(24...27)(
-           ParametersNode(25...26)(
-             [RequiredParameterNode(25...26)(:g)],
-             [],
-             [],
-             nil,
-             [],
-             nil,
-             nil
-           ),
-           [],
-           (24...25),
-           (26...27)
-         ),
-         StatementsNode(28...29)(
-           [CallNode(28...29)(nil, nil, (28...29), nil, nil, nil, nil, 2, "h")]
-         ),
-         (21...23),
-         (30...33)
-       ),
-       0,
-       "e"
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/block_call_operation_colon.txt b/test/yarp/snapshots/seattlerb/block_call_operation_colon.txt
deleted file mode 100644
index 348e82f706c1a8..00000000000000
--- a/test/yarp/snapshots/seattlerb/block_call_operation_colon.txt
+++ /dev/null
@@ -1,28 +0,0 @@
-ProgramNode(0...15)(
-  [],
-  StatementsNode(0...15)(
-    [CallNode(0...15)(
-       CallNode(0...12)(
-         CallNode(0...1)(nil, nil, (0...1), nil, nil, nil, nil, 2, "a"),
-         (1...2),
-         (2...3),
-         nil,
-         ArgumentsNode(4...5)(
-           [CallNode(4...5)(nil, nil, (4...5), nil, nil, nil, nil, 2, "c")]
-         ),
-         nil,
-         BlockNode(6...12)([], nil, nil, (6...8), (9...12)),
-         0,
-         "b"
-       ),
-       (12...14),
-       (14...15),
-       nil,
-       nil,
-       nil,
-       nil,
-       0,
-       "d"
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/block_call_operation_dot.txt b/test/yarp/snapshots/seattlerb/block_call_operation_dot.txt
deleted file mode 100644
index 05edca98a44f6a..00000000000000
--- a/test/yarp/snapshots/seattlerb/block_call_operation_dot.txt
+++ /dev/null
@@ -1,28 +0,0 @@
-ProgramNode(0...14)(
-  [],
-  StatementsNode(0...14)(
-    [CallNode(0...14)(
-       CallNode(0...12)(
-         CallNode(0...1)(nil, nil, (0...1), nil, nil, nil, nil, 2, "a"),
-         (1...2),
-         (2...3),
-         nil,
-         ArgumentsNode(4...5)(
-           [CallNode(4...5)(nil, nil, (4...5), nil, nil, nil, nil, 2, "c")]
-         ),
-         nil,
-         BlockNode(6...12)([], nil, nil, (6...8), (9...12)),
-         0,
-         "b"
-       ),
-       (12...13),
-       (13...14),
-       nil,
-       nil,
-       nil,
-       nil,
-       0,
-       "d"
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/block_call_paren_call_block_call.txt b/test/yarp/snapshots/seattlerb/block_call_paren_call_block_call.txt
deleted file mode 100644
index 4b7916f0e6b8d1..00000000000000
--- a/test/yarp/snapshots/seattlerb/block_call_paren_call_block_call.txt
+++ /dev/null
@@ -1,35 +0,0 @@
-ProgramNode(0...16)(
-  [],
-  StatementsNode(0...16)(
-    [CallNode(0...5)(
-       nil,
-       nil,
-       (0...1),
-       nil,
-       ArgumentsNode(2...5)(
-         [ParenthesesNode(2...5)(
-            StatementsNode(3...4)(
-              [CallNode(3...4)(nil, nil, (3...4), nil, nil, nil, nil, 2, "b")]
-            ),
-            (2...3),
-            (4...5)
-          )]
-       ),
-       nil,
-       nil,
-       0,
-       "a"
-     ),
-     CallNode(6...16)(
-       CallNode(6...7)(nil, nil, (6...7), nil, nil, nil, nil, 2, "c"),
-       (7...8),
-       (8...9),
-       nil,
-       nil,
-       nil,
-       BlockNode(10...16)([], nil, nil, (10...12), (13...16)),
-       0,
-       "d"
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/block_command_operation_colon.txt b/test/yarp/snapshots/seattlerb/block_command_operation_colon.txt
deleted file mode 100644
index afac178321bfd0..00000000000000
--- a/test/yarp/snapshots/seattlerb/block_command_operation_colon.txt
+++ /dev/null
@@ -1,28 +0,0 @@
-ProgramNode(0...17)(
-  [],
-  StatementsNode(0...17)(
-    [CallNode(0...17)(
-       CallNode(0...11)(
-         nil,
-         nil,
-         (0...1),
-         nil,
-         ArgumentsNode(2...4)([SymbolNode(2...4)((2...3), (3...4), nil, "b")]),
-         nil,
-         BlockNode(5...11)([], nil, nil, (5...7), (8...11)),
-         0,
-         "a"
-       ),
-       (11...13),
-       (13...14),
-       nil,
-       ArgumentsNode(15...17)(
-         [SymbolNode(15...17)((15...16), (16...17), nil, "d")]
-       ),
-       nil,
-       nil,
-       0,
-       "c"
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/block_command_operation_dot.txt b/test/yarp/snapshots/seattlerb/block_command_operation_dot.txt
deleted file mode 100644
index 8225ce403f25b6..00000000000000
--- a/test/yarp/snapshots/seattlerb/block_command_operation_dot.txt
+++ /dev/null
@@ -1,28 +0,0 @@
-ProgramNode(0...16)(
-  [],
-  StatementsNode(0...16)(
-    [CallNode(0...16)(
-       CallNode(0...11)(
-         nil,
-         nil,
-         (0...1),
-         nil,
-         ArgumentsNode(2...4)([SymbolNode(2...4)((2...3), (3...4), nil, "b")]),
-         nil,
-         BlockNode(5...11)([], nil, nil, (5...7), (8...11)),
-         0,
-         "a"
-       ),
-       (11...12),
-       (12...13),
-       nil,
-       ArgumentsNode(14...16)(
-         [SymbolNode(14...16)((14...15), (15...16), nil, "d")]
-       ),
-       nil,
-       nil,
-       0,
-       "c"
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/block_decomp_anon_splat_arg.txt b/test/yarp/snapshots/seattlerb/block_decomp_anon_splat_arg.txt
deleted file mode 100644
index f5bee5b9260d3d..00000000000000
--- a/test/yarp/snapshots/seattlerb/block_decomp_anon_splat_arg.txt
+++ /dev/null
@@ -1,40 +0,0 @@
-ProgramNode(0...14)(
-  [],
-  StatementsNode(0...14)(
-    [CallNode(0...14)(
-       nil,
-       nil,
-       (0...1),
-       nil,
-       nil,
-       nil,
-       BlockNode(2...14)(
-         [:a],
-         BlockParametersNode(4...12)(
-           ParametersNode(5...11)(
-             [RequiredDestructuredParameterNode(5...11)(
-                [SplatNode(6...7)((6...7), nil),
-                 RequiredParameterNode(9...10)(:a)],
-                (5...6),
-                (10...11)
-              )],
-             [],
-             [],
-             nil,
-             [],
-             nil,
-             nil
-           ),
-           [],
-           (4...5),
-           (11...12)
-         ),
-         nil,
-         (2...3),
-         (13...14)
-       ),
-       0,
-       "f"
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/block_decomp_arg_splat.txt b/test/yarp/snapshots/seattlerb/block_decomp_arg_splat.txt
deleted file mode 100644
index b1c8e2e9b8f239..00000000000000
--- a/test/yarp/snapshots/seattlerb/block_decomp_arg_splat.txt
+++ /dev/null
@@ -1,40 +0,0 @@
-ProgramNode(0...14)(
-  [],
-  StatementsNode(0...14)(
-    [CallNode(0...14)(
-       nil,
-       nil,
-       (0...1),
-       nil,
-       nil,
-       nil,
-       BlockNode(2...14)(
-         [:b],
-         BlockParametersNode(4...12)(
-           ParametersNode(5...11)(
-             [RequiredDestructuredParameterNode(5...11)(
-                [RequiredParameterNode(6...7)(:b),
-                 SplatNode(9...10)((9...10), nil)],
-                (5...6),
-                (10...11)
-              )],
-             [],
-             [],
-             nil,
-             [],
-             nil,
-             nil
-           ),
-           [],
-           (4...5),
-           (11...12)
-         ),
-         nil,
-         (2...3),
-         (13...14)
-       ),
-       0,
-       "a"
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/block_decomp_arg_splat_arg.txt b/test/yarp/snapshots/seattlerb/block_decomp_arg_splat_arg.txt
deleted file mode 100644
index f66bef6ccb9926..00000000000000
--- a/test/yarp/snapshots/seattlerb/block_decomp_arg_splat_arg.txt
+++ /dev/null
@@ -1,44 +0,0 @@
-ProgramNode(0...18)(
-  [],
-  StatementsNode(0...18)(
-    [CallNode(0...18)(
-       nil,
-       nil,
-       (0...1),
-       nil,
-       nil,
-       nil,
-       BlockNode(2...18)(
-         [:a, :b, :c],
-         BlockParametersNode(4...16)(
-           ParametersNode(5...15)(
-             [RequiredDestructuredParameterNode(5...15)(
-                [RequiredParameterNode(6...7)(:a),
-                 SplatNode(9...11)(
-                   (9...10),
-                   RequiredParameterNode(10...11)(:b)
-                 ),
-                 RequiredParameterNode(13...14)(:c)],
-                (5...6),
-                (14...15)
-              )],
-             [],
-             [],
-             nil,
-             [],
-             nil,
-             nil
-           ),
-           [],
-           (4...5),
-           (15...16)
-         ),
-         nil,
-         (2...3),
-         (17...18)
-       ),
-       0,
-       "f"
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/block_decomp_splat.txt b/test/yarp/snapshots/seattlerb/block_decomp_splat.txt
deleted file mode 100644
index c78fd82317ee6d..00000000000000
--- a/test/yarp/snapshots/seattlerb/block_decomp_splat.txt
+++ /dev/null
@@ -1,39 +0,0 @@
-ProgramNode(0...12)(
-  [],
-  StatementsNode(0...12)(
-    [CallNode(0...12)(
-       nil,
-       nil,
-       (0...1),
-       nil,
-       nil,
-       nil,
-       BlockNode(2...12)(
-         [:a],
-         BlockParametersNode(4...10)(
-           ParametersNode(5...9)(
-             [RequiredDestructuredParameterNode(5...9)(
-                [SplatNode(6...8)((6...7), RequiredParameterNode(7...8)(:a))],
-                (5...6),
-                (8...9)
-              )],
-             [],
-             [],
-             nil,
-             [],
-             nil,
-             nil
-           ),
-           [],
-           (4...5),
-           (9...10)
-         ),
-         nil,
-         (2...3),
-         (11...12)
-       ),
-       0,
-       "f"
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/block_kw.txt b/test/yarp/snapshots/seattlerb/block_kw.txt
deleted file mode 100644
index b8f61d8e30a84f..00000000000000
--- a/test/yarp/snapshots/seattlerb/block_kw.txt
+++ /dev/null
@@ -1,35 +0,0 @@
-ProgramNode(0...15)(
-  [],
-  StatementsNode(0...15)(
-    [CallNode(0...15)(
-       nil,
-       nil,
-       (0...4),
-       nil,
-       nil,
-       nil,
-       BlockNode(5...15)(
-         [:k],
-         BlockParametersNode(7...13)(
-           ParametersNode(8...12)(
-             [],
-             [],
-             [],
-             nil,
-             [KeywordParameterNode(8...12)((8...10), IntegerNode(10...12)())],
-             nil,
-             nil
-           ),
-           [],
-           (7...8),
-           (12...13)
-         ),
-         nil,
-         (5...6),
-         (14...15)
-       ),
-       0,
-       "blah"
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/block_kw__required.txt b/test/yarp/snapshots/seattlerb/block_kw__required.txt
deleted file mode 100644
index cb7b2912371f4e..00000000000000
--- a/test/yarp/snapshots/seattlerb/block_kw__required.txt
+++ /dev/null
@@ -1,35 +0,0 @@
-ProgramNode(0...16)(
-  [],
-  StatementsNode(0...16)(
-    [CallNode(0...16)(
-       nil,
-       nil,
-       (0...4),
-       nil,
-       nil,
-       nil,
-       BlockNode(5...16)(
-         [:k],
-         BlockParametersNode(8...12)(
-           ParametersNode(9...11)(
-             [],
-             [],
-             [],
-             nil,
-             [KeywordParameterNode(9...11)((9...11), nil)],
-             nil,
-             nil
-           ),
-           [],
-           (8...9),
-           (11...12)
-         ),
-         nil,
-         (5...7),
-         (13...16)
-       ),
-       0,
-       "blah"
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/block_kwarg_lvar.txt b/test/yarp/snapshots/seattlerb/block_kwarg_lvar.txt
deleted file mode 100644
index dd1df1b7ad87ee..00000000000000
--- a/test/yarp/snapshots/seattlerb/block_kwarg_lvar.txt
+++ /dev/null
@@ -1,38 +0,0 @@
-ProgramNode(0...20)(
-  [],
-  StatementsNode(0...20)(
-    [CallNode(0...20)(
-       nil,
-       nil,
-       (0...2),
-       nil,
-       nil,
-       nil,
-       BlockNode(3...20)(
-         [:kw],
-         BlockParametersNode(5...15)(
-           ParametersNode(6...14)(
-             [],
-             [],
-             [],
-             nil,
-             [KeywordParameterNode(6...14)(
-                (6...9),
-                SymbolNode(10...14)((10...11), (11...14), nil, "val")
-              )],
-             nil,
-             nil
-           ),
-           [],
-           (5...6),
-           (14...15)
-         ),
-         StatementsNode(16...18)([LocalVariableReadNode(16...18)(:kw, 0)]),
-         (3...4),
-         (19...20)
-       ),
-       0,
-       "bl"
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/block_kwarg_lvar_multiple.txt b/test/yarp/snapshots/seattlerb/block_kwarg_lvar_multiple.txt
deleted file mode 100644
index ae561f5de395d4..00000000000000
--- a/test/yarp/snapshots/seattlerb/block_kwarg_lvar_multiple.txt
+++ /dev/null
@@ -1,42 +0,0 @@
-ProgramNode(0...33)(
-  [],
-  StatementsNode(0...33)(
-    [CallNode(0...33)(
-       nil,
-       nil,
-       (0...2),
-       nil,
-       nil,
-       nil,
-       BlockNode(3...33)(
-         [:kw, :kw2],
-         BlockParametersNode(5...28)(
-           ParametersNode(6...26)(
-             [],
-             [],
-             [],
-             nil,
-             [KeywordParameterNode(6...14)(
-                (6...9),
-                SymbolNode(10...14)((10...11), (11...14), nil, "val")
-              ),
-              KeywordParameterNode(16...26)(
-                (16...20),
-                SymbolNode(21...26)((21...22), (22...26), nil, "val2")
-              )],
-             nil,
-             nil
-           ),
-           [],
-           (5...6),
-           (27...28)
-         ),
-         StatementsNode(29...31)([LocalVariableReadNode(29...31)(:kw, 0)]),
-         (3...4),
-         (32...33)
-       ),
-       0,
-       "bl"
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/block_next.txt b/test/yarp/snapshots/seattlerb/block_next.txt
deleted file mode 100644
index 021f2ed15c55bd..00000000000000
--- a/test/yarp/snapshots/seattlerb/block_next.txt
+++ /dev/null
@@ -1,52 +0,0 @@
-ProgramNode(0...25)(
-  [],
-  StatementsNode(0...25)(
-    [NextNode(0...25)(
-       ArgumentsNode(5...25)(
-         [CallNode(5...25)(
-            nil,
-            nil,
-            (5...8),
-            nil,
-            ArgumentsNode(9...12)(
-              [CallNode(9...12)(
-                 nil,
-                 nil,
-                 (9...12),
-                 nil,
-                 nil,
-                 nil,
-                 nil,
-                 2,
-                 "arg"
-               )]
-            ),
-            nil,
-            BlockNode(13...25)(
-              [:bar],
-              BlockParametersNode(16...21)(
-                ParametersNode(17...20)(
-                  [RequiredParameterNode(17...20)(:bar)],
-                  [],
-                  [],
-                  nil,
-                  [],
-                  nil,
-                  nil
-                ),
-                [],
-                (16...17),
-                (20...21)
-              ),
-              nil,
-              (13...15),
-              (22...25)
-            ),
-            0,
-            "foo"
-          )]
-       ),
-       (0...4)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/block_opt_arg.txt b/test/yarp/snapshots/seattlerb/block_opt_arg.txt
deleted file mode 100644
index 09279538183fbd..00000000000000
--- a/test/yarp/snapshots/seattlerb/block_opt_arg.txt
+++ /dev/null
@@ -1,40 +0,0 @@
-ProgramNode(0...14)(
-  [],
-  StatementsNode(0...14)(
-    [CallNode(0...14)(
-       nil,
-       nil,
-       (0...1),
-       nil,
-       nil,
-       nil,
-       BlockNode(2...14)(
-         [:b, :c],
-         BlockParametersNode(4...12)(
-           ParametersNode(5...11)(
-             [],
-             [OptionalParameterNode(5...8)(
-                :b,
-                (5...6),
-                (6...7),
-                IntegerNode(7...8)()
-              )],
-             [RequiredParameterNode(10...11)(:c)],
-             nil,
-             [],
-             nil,
-             nil
-           ),
-           [],
-           (4...5),
-           (11...12)
-         ),
-         nil,
-         (2...3),
-         (13...14)
-       ),
-       0,
-       "a"
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/block_opt_splat.txt b/test/yarp/snapshots/seattlerb/block_opt_splat.txt
deleted file mode 100644
index 59b1a79e409c5b..00000000000000
--- a/test/yarp/snapshots/seattlerb/block_opt_splat.txt
+++ /dev/null
@@ -1,40 +0,0 @@
-ProgramNode(0...17)(
-  [],
-  StatementsNode(0...17)(
-    [CallNode(0...17)(
-       nil,
-       nil,
-       (0...1),
-       nil,
-       nil,
-       nil,
-       BlockNode(2...17)(
-         [:b, :c],
-         BlockParametersNode(4...15)(
-           ParametersNode(5...14)(
-             [],
-             [OptionalParameterNode(5...10)(
-                :b,
-                (5...6),
-                (7...8),
-                IntegerNode(9...10)()
-              )],
-             [],
-             RestParameterNode(12...14)((12...13), (13...14)),
-             [],
-             nil,
-             nil
-           ),
-           [],
-           (4...5),
-           (14...15)
-         ),
-         nil,
-         (2...3),
-         (16...17)
-       ),
-       0,
-       "a"
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/block_opt_splat_arg_block_omfg.txt b/test/yarp/snapshots/seattlerb/block_opt_splat_arg_block_omfg.txt
deleted file mode 100644
index 0efcade2290767..00000000000000
--- a/test/yarp/snapshots/seattlerb/block_opt_splat_arg_block_omfg.txt
+++ /dev/null
@@ -1,40 +0,0 @@
-ProgramNode(0...22)(
-  [],
-  StatementsNode(0...22)(
-    [CallNode(0...22)(
-       nil,
-       nil,
-       (0...1),
-       nil,
-       nil,
-       nil,
-       BlockNode(2...22)(
-         [:b, :c, :d, :e],
-         BlockParametersNode(4...20)(
-           ParametersNode(5...19)(
-             [],
-             [OptionalParameterNode(5...8)(
-                :b,
-                (5...6),
-                (6...7),
-                IntegerNode(7...8)()
-              )],
-             [RequiredParameterNode(14...15)(:d)],
-             RestParameterNode(10...12)((10...11), (11...12)),
-             [],
-             nil,
-             BlockParameterNode(17...19)(:e, (18...19), (17...18))
-           ),
-           [],
-           (4...5),
-           (19...20)
-         ),
-         nil,
-         (2...3),
-         (21...22)
-       ),
-       0,
-       "a"
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/block_optarg.txt b/test/yarp/snapshots/seattlerb/block_optarg.txt
deleted file mode 100644
index faaaf22e0ed189..00000000000000
--- a/test/yarp/snapshots/seattlerb/block_optarg.txt
+++ /dev/null
@@ -1,40 +0,0 @@
-ProgramNode(0...14)(
-  [],
-  StatementsNode(0...14)(
-    [CallNode(0...14)(
-       nil,
-       nil,
-       (0...1),
-       nil,
-       nil,
-       nil,
-       BlockNode(2...14)(
-         [:b],
-         BlockParametersNode(4...12)(
-           ParametersNode(5...11)(
-             [],
-             [OptionalParameterNode(5...11)(
-                :b,
-                (5...6),
-                (7...8),
-                SymbolNode(9...11)((9...10), (10...11), nil, "c")
-              )],
-             [],
-             nil,
-             [],
-             nil,
-             nil
-           ),
-           [],
-           (4...5),
-           (11...12)
-         ),
-         nil,
-         (2...3),
-         (13...14)
-       ),
-       0,
-       "a"
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/block_paren_splat.txt b/test/yarp/snapshots/seattlerb/block_paren_splat.txt
deleted file mode 100644
index 74a59ed1de5041..00000000000000
--- a/test/yarp/snapshots/seattlerb/block_paren_splat.txt
+++ /dev/null
@@ -1,43 +0,0 @@
-ProgramNode(0...15)(
-  [],
-  StatementsNode(0...15)(
-    [CallNode(0...15)(
-       nil,
-       nil,
-       (0...1),
-       nil,
-       nil,
-       nil,
-       BlockNode(2...15)(
-         [:b, :c],
-         BlockParametersNode(4...13)(
-           ParametersNode(5...12)(
-             [RequiredDestructuredParameterNode(5...12)(
-                [RequiredParameterNode(6...7)(:b),
-                 SplatNode(9...11)(
-                   (9...10),
-                   RequiredParameterNode(10...11)(:c)
-                 )],
-                (5...6),
-                (11...12)
-              )],
-             [],
-             [],
-             nil,
-             [],
-             nil,
-             nil
-           ),
-           [],
-           (4...5),
-           (12...13)
-         ),
-         nil,
-         (2...3),
-         (14...15)
-       ),
-       0,
-       "a"
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/block_reg_optarg.txt b/test/yarp/snapshots/seattlerb/block_reg_optarg.txt
deleted file mode 100644
index c6cbc623e07f89..00000000000000
--- a/test/yarp/snapshots/seattlerb/block_reg_optarg.txt
+++ /dev/null
@@ -1,40 +0,0 @@
-ProgramNode(0...17)(
-  [],
-  StatementsNode(0...17)(
-    [CallNode(0...17)(
-       nil,
-       nil,
-       (0...1),
-       nil,
-       nil,
-       nil,
-       BlockNode(2...17)(
-         [:b, :c],
-         BlockParametersNode(4...15)(
-           ParametersNode(5...14)(
-             [RequiredParameterNode(5...6)(:b)],
-             [OptionalParameterNode(8...14)(
-                :c,
-                (8...9),
-                (10...11),
-                SymbolNode(12...14)((12...13), (13...14), nil, "d")
-              )],
-             [],
-             nil,
-             [],
-             nil,
-             nil
-           ),
-           [],
-           (4...5),
-           (14...15)
-         ),
-         nil,
-         (2...3),
-         (16...17)
-       ),
-       0,
-       "a"
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/block_return.txt b/test/yarp/snapshots/seattlerb/block_return.txt
deleted file mode 100644
index 97fab8c51438ef..00000000000000
--- a/test/yarp/snapshots/seattlerb/block_return.txt
+++ /dev/null
@@ -1,52 +0,0 @@
-ProgramNode(0...27)(
-  [],
-  StatementsNode(0...27)(
-    [ReturnNode(0...27)(
-       (0...6),
-       ArgumentsNode(7...27)(
-         [CallNode(7...27)(
-            nil,
-            nil,
-            (7...10),
-            nil,
-            ArgumentsNode(11...14)(
-              [CallNode(11...14)(
-                 nil,
-                 nil,
-                 (11...14),
-                 nil,
-                 nil,
-                 nil,
-                 nil,
-                 2,
-                 "arg"
-               )]
-            ),
-            nil,
-            BlockNode(15...27)(
-              [:bar],
-              BlockParametersNode(18...23)(
-                ParametersNode(19...22)(
-                  [RequiredParameterNode(19...22)(:bar)],
-                  [],
-                  [],
-                  nil,
-                  [],
-                  nil,
-                  nil
-                ),
-                [],
-                (18...19),
-                (22...23)
-              ),
-              nil,
-              (15...17),
-              (24...27)
-            ),
-            0,
-            "foo"
-          )]
-       )
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/block_scope.txt b/test/yarp/snapshots/seattlerb/block_scope.txt
deleted file mode 100644
index bcdb26caa70706..00000000000000
--- a/test/yarp/snapshots/seattlerb/block_scope.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-ProgramNode(0...10)(
-  [],
-  StatementsNode(0...10)(
-    [CallNode(0...10)(
-       nil,
-       nil,
-       (0...1),
-       nil,
-       nil,
-       nil,
-       BlockNode(2...10)(
-         [:b],
-         BlockParametersNode(4...8)(
-           nil,
-           [BlockLocalVariableNode(6...7)(:b)],
-           (4...5),
-           (7...8)
-         ),
-         nil,
-         (2...3),
-         (9...10)
-       ),
-       0,
-       "a"
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/block_splat_reg.txt b/test/yarp/snapshots/seattlerb/block_splat_reg.txt
deleted file mode 100644
index 85011bd7819cc7..00000000000000
--- a/test/yarp/snapshots/seattlerb/block_splat_reg.txt
+++ /dev/null
@@ -1,35 +0,0 @@
-ProgramNode(0...13)(
-  [],
-  StatementsNode(0...13)(
-    [CallNode(0...13)(
-       nil,
-       nil,
-       (0...1),
-       nil,
-       nil,
-       nil,
-       BlockNode(2...13)(
-         [:b, :c],
-         BlockParametersNode(4...11)(
-           ParametersNode(5...10)(
-             [],
-             [],
-             [RequiredParameterNode(9...10)(:c)],
-             RestParameterNode(5...7)((5...6), (6...7)),
-             [],
-             nil,
-             nil
-           ),
-           [],
-           (4...5),
-           (10...11)
-         ),
-         nil,
-         (2...3),
-         (12...13)
-       ),
-       0,
-       "a"
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/bug169.txt b/test/yarp/snapshots/seattlerb/bug169.txt
deleted file mode 100644
index d6b75f5369712d..00000000000000
--- a/test/yarp/snapshots/seattlerb/bug169.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-ProgramNode(0...7)(
-  [],
-  StatementsNode(0...7)(
-    [CallNode(0...7)(
-       nil,
-       nil,
-       (0...1),
-       nil,
-       ArgumentsNode(2...4)([ParenthesesNode(2...4)(nil, (2...3), (3...4))]),
-       nil,
-       BlockNode(5...7)([], nil, nil, (5...6), (6...7)),
-       0,
-       "m"
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/bug179.txt b/test/yarp/snapshots/seattlerb/bug179.txt
deleted file mode 100644
index 9dc2331c9397b3..00000000000000
--- a/test/yarp/snapshots/seattlerb/bug179.txt
+++ /dev/null
@@ -1,23 +0,0 @@
-ProgramNode(0...9)(
-  [],
-  StatementsNode(0...9)(
-    [CallNode(0...9)(
-       nil,
-       nil,
-       (0...1),
-       nil,
-       ArgumentsNode(2...9)(
-         [RangeNode(2...9)(
-            ParenthesesNode(2...4)(nil, (2...3), (3...4)),
-            NilNode(6...9)(),
-            (4...6),
-            0
-          )]
-       ),
-       nil,
-       nil,
-       0,
-       "p"
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/bug190.txt b/test/yarp/snapshots/seattlerb/bug190.txt
deleted file mode 100644
index 1ad483ada994be..00000000000000
--- a/test/yarp/snapshots/seattlerb/bug190.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-ProgramNode(0...6)(
-  [],
-  StatementsNode(0...6)(
-    [RegularExpressionNode(0...6)((0...3), (3...5), (5...6), "'", 0)]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/bug191.txt b/test/yarp/snapshots/seattlerb/bug191.txt
deleted file mode 100644
index 46d5ed6d7408f9..00000000000000
--- a/test/yarp/snapshots/seattlerb/bug191.txt
+++ /dev/null
@@ -1,35 +0,0 @@
-ProgramNode(0...20)(
-  [],
-  StatementsNode(0...20)(
-    [IfNode(0...9)(
-       nil,
-       CallNode(0...1)(nil, nil, (0...1), nil, nil, nil, nil, 2, "a"),
-       StatementsNode(4...6)(
-         [StringNode(4...6)((4...5), (5...5), (5...6), "")]
-       ),
-       ElseNode(6...9)(
-         (6...7),
-         StatementsNode(8...9)(
-           [CallNode(8...9)(nil, nil, (8...9), nil, nil, nil, nil, 2, "b")]
-         ),
-         nil
-       ),
-       nil
-     ),
-     IfNode(11...20)(
-       nil,
-       CallNode(11...12)(nil, nil, (11...12), nil, nil, nil, nil, 2, "a"),
-       StatementsNode(15...17)(
-         [StringNode(15...17)((15...16), (16...16), (16...17), "")]
-       ),
-       ElseNode(17...20)(
-         (17...18),
-         StatementsNode(19...20)(
-           [CallNode(19...20)(nil, nil, (19...20), nil, nil, nil, nil, 2, "b")]
-         ),
-         nil
-       ),
-       nil
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/bug202.txt b/test/yarp/snapshots/seattlerb/bug202.txt
deleted file mode 100644
index 08bcfd6b7d3395..00000000000000
--- a/test/yarp/snapshots/seattlerb/bug202.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-ProgramNode(0...22)(
-  [:测试],
-  StatementsNode(0...22)(
-    [GlobalVariableWriteNode(0...11)(
-       :$测试,
-       (0...7),
-       IntegerNode(10...11)(),
-       (8...9)
-     ),
-     LocalVariableWriteNode(12...22)(
-       :测试,
-       0,
-       (12...18),
-       IntegerNode(21...22)(),
-       (19...20)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/bug236.txt b/test/yarp/snapshots/seattlerb/bug236.txt
deleted file mode 100644
index bf6b4298023775..00000000000000
--- a/test/yarp/snapshots/seattlerb/bug236.txt
+++ /dev/null
@@ -1,65 +0,0 @@
-ProgramNode(0...15)(
-  [],
-  StatementsNode(0...15)(
-    [CallNode(0...7)(
-       nil,
-       nil,
-       (0...1),
-       nil,
-       nil,
-       nil,
-       BlockNode(1...7)(
-         [:a],
-         BlockParametersNode(2...6)(
-           ParametersNode(3...5)(
-             [RequiredParameterNode(3...4)(:a)],
-             [],
-             [],
-             RestParameterNode(4...5)((4...5), nil),
-             [],
-             nil,
-             nil
-           ),
-           [],
-           (2...3),
-           (5...6)
-         ),
-         nil,
-         (1...2),
-         (6...7)
-       ),
-       0,
-       "x"
-     ),
-     CallNode(9...15)(
-       nil,
-       nil,
-       (9...10),
-       nil,
-       nil,
-       nil,
-       BlockNode(10...15)(
-         [:a],
-         BlockParametersNode(11...14)(
-           ParametersNode(12...13)(
-             [RequiredParameterNode(12...13)(:a)],
-             [],
-             [],
-             nil,
-             [],
-             nil,
-             nil
-           ),
-           [],
-           (11...12),
-           (13...14)
-         ),
-         nil,
-         (10...11),
-         (14...15)
-       ),
-       0,
-       "x"
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/bug290.txt b/test/yarp/snapshots/seattlerb/bug290.txt
deleted file mode 100644
index 30d5780f5059f2..00000000000000
--- a/test/yarp/snapshots/seattlerb/bug290.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-ProgramNode(0...15)(
-  [],
-  StatementsNode(0...15)(
-    [BeginNode(0...15)(
-       (0...5),
-       StatementsNode(8...11)(
-         [CallNode(8...11)(nil, nil, (8...11), nil, nil, nil, nil, 2, "foo")]
-       ),
-       nil,
-       nil,
-       nil,
-       (12...15)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/bug_187.txt b/test/yarp/snapshots/seattlerb/bug_187.txt
deleted file mode 100644
index f4ca89ff6d9066..00000000000000
--- a/test/yarp/snapshots/seattlerb/bug_187.txt
+++ /dev/null
@@ -1,52 +0,0 @@
-ProgramNode(0...28)(
-  [],
-  StatementsNode(0...28)(
-    [CallNode(0...28)(
-       nil,
-       nil,
-       (0...7),
-       nil,
-       ArgumentsNode(8...28)(
-         [DefNode(8...28)(
-            (12...13),
-            nil,
-            nil,
-            StatementsNode(14...24)(
-              [CallNode(14...24)(
-                 CallNode(14...15)(
-                   nil,
-                   nil,
-                   (14...15),
-                   nil,
-                   nil,
-                   nil,
-                   nil,
-                   2,
-                   "a"
-                 ),
-                 (15...16),
-                 (16...17),
-                 nil,
-                 nil,
-                 nil,
-                 BlockNode(18...24)([], nil, nil, (18...20), (21...24)),
-                 0,
-                 "b"
-               )]
-            ),
-            [],
-            (8...11),
-            nil,
-            nil,
-            nil,
-            nil,
-            (25...28)
-          )]
-       ),
-       nil,
-       nil,
-       0,
-       "private"
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/bug_215.txt b/test/yarp/snapshots/seattlerb/bug_215.txt
deleted file mode 100644
index 16a2ca3be19070..00000000000000
--- a/test/yarp/snapshots/seattlerb/bug_215.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-ProgramNode(0...13)(
-  [],
-  StatementsNode(0...13)(
-    [UndefNode(0...13)(
-       [SymbolNode(6...13)((6...9), (9...12), (12...13), "foo")],
-       (0...5)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/bug_249.txt b/test/yarp/snapshots/seattlerb/bug_249.txt
deleted file mode 100644
index 26e918c4f7a857..00000000000000
--- a/test/yarp/snapshots/seattlerb/bug_249.txt
+++ /dev/null
@@ -1,76 +0,0 @@
-ProgramNode(0...67)(
-  [],
-  StatementsNode(0...67)(
-    [CallNode(0...67)(
-       nil,
-       nil,
-       (0...5),
-       nil,
-       ArgumentsNode(6...67)(
-         [CallNode(6...48)(
-            ParenthesesNode(6...44)(
-              StatementsNode(7...43)(
-                [CallNode(7...43)(
-                   ConstantReadNode(7...12)(:Class),
-                   (12...13),
-                   (13...16),
-                   nil,
-                   nil,
-                   nil,
-                   BlockNode(17...43)(
-                     [],
-                     nil,
-                     StatementsNode(20...38)(
-                       [DefNode(20...38)(
-                          (24...34),
-                          nil,
-                          nil,
-                          nil,
-                          [],
-                          (20...23),
-                          nil,
-                          nil,
-                          nil,
-                          nil,
-                          (35...38)
-                        )]
-                     ),
-                     (17...19),
-                     (40...43)
-                   ),
-                   0,
-                   "new"
-                 )]
-              ),
-              (6...7),
-              (43...44)
-            ),
-            (44...45),
-            (45...48),
-            nil,
-            nil,
-            nil,
-            nil,
-            0,
-            "new"
-          ),
-          KeywordHashNode(50...67)(
-            [AssocNode(50...67)(
-               SymbolNode(50...53)((50...51), (51...53), nil, "at"),
-               StringNode(57...67)(
-                 (57...58),
-                 (58...66),
-                 (66...67),
-                 "endpoint"
-               ),
-               (54...56)
-             )]
-          )]
-       ),
-       nil,
-       nil,
-       0,
-       "mount"
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/bug_and.txt b/test/yarp/snapshots/seattlerb/bug_and.txt
deleted file mode 100644
index b81ddb4d87200d..00000000000000
--- a/test/yarp/snapshots/seattlerb/bug_and.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-ProgramNode(0...26)(
-  [],
-  StatementsNode(0...26)(
-    [AndNode(0...13)(TrueNode(0...4)(), TrueNode(9...13)(), (5...8)),
-     AndNode(15...26)(
-       TrueNode(15...19)(),
-       ArrayNode(24...26)([], (24...25), (25...26)),
-       (20...23)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/bug_args__19.txt b/test/yarp/snapshots/seattlerb/bug_args__19.txt
deleted file mode 100644
index eba3f72951a957..00000000000000
--- a/test/yarp/snapshots/seattlerb/bug_args__19.txt
+++ /dev/null
@@ -1,42 +0,0 @@
-ProgramNode(0...16)(
-  [],
-  StatementsNode(0...16)(
-    [CallNode(0...16)(
-       nil,
-       nil,
-       (0...1),
-       nil,
-       nil,
-       nil,
-       BlockNode(2...16)(
-         [:a, :b],
-         BlockParametersNode(4...12)(
-           ParametersNode(5...11)(
-             [RequiredDestructuredParameterNode(5...11)(
-                [RequiredParameterNode(6...7)(:a),
-                 RequiredParameterNode(9...10)(:b)],
-                (5...6),
-                (10...11)
-              )],
-             [],
-             [],
-             nil,
-             [],
-             nil,
-             nil
-           ),
-           [],
-           (4...5),
-           (11...12)
-         ),
-         StatementsNode(13...14)(
-           [CallNode(13...14)(nil, nil, (13...14), nil, nil, nil, nil, 2, "d")]
-         ),
-         (2...3),
-         (15...16)
-       ),
-       0,
-       "f"
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/bug_args_masgn.txt b/test/yarp/snapshots/seattlerb/bug_args_masgn.txt
deleted file mode 100644
index 5a79af6c92745a..00000000000000
--- a/test/yarp/snapshots/seattlerb/bug_args_masgn.txt
+++ /dev/null
@@ -1,41 +0,0 @@
-ProgramNode(0...17)(
-  [],
-  StatementsNode(0...17)(
-    [CallNode(0...17)(
-       nil,
-       nil,
-       (0...1),
-       nil,
-       nil,
-       nil,
-       BlockNode(2...17)(
-         [:a, :b, :c],
-         BlockParametersNode(4...15)(
-           ParametersNode(5...14)(
-             [RequiredDestructuredParameterNode(5...11)(
-                [RequiredParameterNode(6...7)(:a),
-                 RequiredParameterNode(9...10)(:b)],
-                (5...6),
-                (10...11)
-              ),
-              RequiredParameterNode(13...14)(:c)],
-             [],
-             [],
-             nil,
-             [],
-             nil,
-             nil
-           ),
-           [],
-           (4...5),
-           (14...15)
-         ),
-         nil,
-         (2...3),
-         (16...17)
-       ),
-       0,
-       "f"
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/bug_args_masgn2.txt b/test/yarp/snapshots/seattlerb/bug_args_masgn2.txt
deleted file mode 100644
index 410d5f7ebd771e..00000000000000
--- a/test/yarp/snapshots/seattlerb/bug_args_masgn2.txt
+++ /dev/null
@@ -1,46 +0,0 @@
-ProgramNode(0...22)(
-  [],
-  StatementsNode(0...22)(
-    [CallNode(0...22)(
-       nil,
-       nil,
-       (0...1),
-       nil,
-       nil,
-       nil,
-       BlockNode(2...22)(
-         [:a, :b, :c, :d],
-         BlockParametersNode(4...20)(
-           ParametersNode(5...19)(
-             [RequiredDestructuredParameterNode(5...16)(
-                [RequiredDestructuredParameterNode(6...12)(
-                   [RequiredParameterNode(7...8)(:a),
-                    RequiredParameterNode(10...11)(:b)],
-                   (6...7),
-                   (11...12)
-                 ),
-                 RequiredParameterNode(14...15)(:c)],
-                (5...6),
-                (15...16)
-              ),
-              RequiredParameterNode(18...19)(:d)],
-             [],
-             [],
-             nil,
-             [],
-             nil,
-             nil
-           ),
-           [],
-           (4...5),
-           (19...20)
-         ),
-         nil,
-         (2...3),
-         (21...22)
-       ),
-       0,
-       "f"
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/bug_args_masgn_outer_parens__19.txt b/test/yarp/snapshots/seattlerb/bug_args_masgn_outer_parens__19.txt
deleted file mode 100644
index c0b97dce6b1fb9..00000000000000
--- a/test/yarp/snapshots/seattlerb/bug_args_masgn_outer_parens__19.txt
+++ /dev/null
@@ -1,45 +0,0 @@
-ProgramNode(0...19)(
-  [],
-  StatementsNode(0...19)(
-    [CallNode(0...19)(
-       nil,
-       nil,
-       (0...1),
-       nil,
-       nil,
-       nil,
-       BlockNode(2...19)(
-         [:k, :v, :i],
-         BlockParametersNode(4...17)(
-           ParametersNode(5...16)(
-             [RequiredDestructuredParameterNode(5...16)(
-                [RequiredDestructuredParameterNode(6...12)(
-                   [RequiredParameterNode(7...8)(:k),
-                    RequiredParameterNode(10...11)(:v)],
-                   (6...7),
-                   (11...12)
-                 ),
-                 RequiredParameterNode(14...15)(:i)],
-                (5...6),
-                (15...16)
-              )],
-             [],
-             [],
-             nil,
-             [],
-             nil,
-             nil
-           ),
-           [],
-           (4...5),
-           (16...17)
-         ),
-         nil,
-         (2...3),
-         (18...19)
-       ),
-       0,
-       "f"
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/bug_call_arglist_parens.txt b/test/yarp/snapshots/seattlerb/bug_call_arglist_parens.txt
deleted file mode 100644
index 61193bb0a631cb..00000000000000
--- a/test/yarp/snapshots/seattlerb/bug_call_arglist_parens.txt
+++ /dev/null
@@ -1,87 +0,0 @@
-ProgramNode(6...94)(
-  [],
-  StatementsNode(6...94)(
-    [DefNode(6...39)(
-       (10...11),
-       nil,
-       nil,
-       StatementsNode(20...29)(
-         [CallNode(20...29)(
-            nil,
-            nil,
-            (20...21),
-            nil,
-            ArgumentsNode(22...29)(
-              [ParenthesesNode(22...26)(
-                 StatementsNode(24...25)([IntegerNode(24...25)()]),
-                 (22...23),
-                 (25...26)
-               ),
-               IntegerNode(28...29)()]
-            ),
-            nil,
-            nil,
-            0,
-            "g"
-          )]
-       ),
-       [],
-       (6...9),
-       nil,
-       nil,
-       nil,
-       nil,
-       (36...39)
-     ),
-     DefNode(48...82)(
-       (52...53),
-       nil,
-       nil,
-       StatementsNode(64...72)(
-         [CallNode(64...72)(
-            nil,
-            nil,
-            (64...65),
-            nil,
-            ArgumentsNode(66...72)(
-              [ParenthesesNode(66...69)(
-                 StatementsNode(67...68)([IntegerNode(67...68)()]),
-                 (66...67),
-                 (68...69)
-               ),
-               IntegerNode(71...72)()]
-            ),
-            nil,
-            nil,
-            0,
-            "g"
-          )]
-       ),
-       [],
-       (48...51),
-       nil,
-       (53...54),
-       (54...55),
-       nil,
-       (79...82)
-     ),
-     CallNode(85...94)(
-       nil,
-       nil,
-       (85...86),
-       nil,
-       ArgumentsNode(87...94)(
-         [ParenthesesNode(87...91)(
-            StatementsNode(89...90)([IntegerNode(89...90)()]),
-            (87...88),
-            (90...91)
-          ),
-          IntegerNode(93...94)()]
-       ),
-       nil,
-       nil,
-       0,
-       "g"
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/bug_case_when_regexp.txt b/test/yarp/snapshots/seattlerb/bug_case_when_regexp.txt
deleted file mode 100644
index 0b898fd52362d9..00000000000000
--- a/test/yarp/snapshots/seattlerb/bug_case_when_regexp.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-ProgramNode(0...26)(
-  [],
-  StatementsNode(0...26)(
-    [CaseNode(0...26)(
-       SymbolNode(5...7)((5...6), (6...7), nil, "x"),
-       [WhenNode(9...17)(
-          (9...13),
-          [RegularExpressionNode(14...17)(
-             (14...15),
-             (15...16),
-             (16...17),
-             "x",
-             0
-           )],
-          nil
-        )],
-       nil,
-       (0...4),
-       (23...26)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/bug_comma.txt b/test/yarp/snapshots/seattlerb/bug_comma.txt
deleted file mode 100644
index a6dd7516aebf8e..00000000000000
--- a/test/yarp/snapshots/seattlerb/bug_comma.txt
+++ /dev/null
@@ -1,35 +0,0 @@
-ProgramNode(0...24)(
-  [],
-  StatementsNode(0...24)(
-    [IfNode(0...24)(
-       (0...2),
-       CallNode(3...15)(
-         nil,
-         nil,
-         (3...7),
-         nil,
-         ArgumentsNode(8...15)(
-           [StringNode(8...10)((8...9), (9...10), nil, "d"),
-            CallNode(12...15)(
-              nil,
-              nil,
-              (12...15),
-              nil,
-              nil,
-              nil,
-              nil,
-              2,
-              "dir"
-            )]
-         ),
-         nil,
-         nil,
-         0,
-         "test"
-       ),
-       nil,
-       nil,
-       (21...24)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/bug_cond_pct.txt b/test/yarp/snapshots/seattlerb/bug_cond_pct.txt
deleted file mode 100644
index 6a73ca7493ae04..00000000000000
--- a/test/yarp/snapshots/seattlerb/bug_cond_pct.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-ProgramNode(0...28)(
-  [],
-  StatementsNode(0...28)(
-    [CaseNode(0...28)(
-       nil,
-       [WhenNode(6...23)(
-          (6...10),
-          [RegularExpressionNode(11...23)(
-             (11...14),
-             (14...22),
-             (22...23),
-             "blahblah",
-             0
-           )],
-          nil
-        )],
-       nil,
-       (0...4),
-       (25...28)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/bug_hash_args.txt b/test/yarp/snapshots/seattlerb/bug_hash_args.txt
deleted file mode 100644
index 1eec48e9302d14..00000000000000
--- a/test/yarp/snapshots/seattlerb/bug_hash_args.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-ProgramNode(0...19)(
-  [],
-  StatementsNode(0...19)(
-    [CallNode(0...19)(
-       nil,
-       nil,
-       (0...3),
-       (3...4),
-       ArgumentsNode(4...18)(
-         [SymbolNode(4...8)((4...5), (5...8), nil, "bar"),
-          KeywordHashNode(10...18)(
-            [AssocNode(10...18)(
-               SymbolNode(10...14)(nil, (10...13), (13...14), "baz"),
-               NilNode(15...18)(),
-               nil
-             )]
-          )]
-       ),
-       (18...19),
-       nil,
-       0,
-       "foo"
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/bug_hash_args_trailing_comma.txt b/test/yarp/snapshots/seattlerb/bug_hash_args_trailing_comma.txt
deleted file mode 100644
index 3801df91bfeb77..00000000000000
--- a/test/yarp/snapshots/seattlerb/bug_hash_args_trailing_comma.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-ProgramNode(0...20)(
-  [],
-  StatementsNode(0...20)(
-    [CallNode(0...20)(
-       nil,
-       nil,
-       (0...3),
-       (3...4),
-       ArgumentsNode(4...18)(
-         [SymbolNode(4...8)((4...5), (5...8), nil, "bar"),
-          KeywordHashNode(10...18)(
-            [AssocNode(10...18)(
-               SymbolNode(10...14)(nil, (10...13), (13...14), "baz"),
-               NilNode(15...18)(),
-               nil
-             )]
-          )]
-       ),
-       (19...20),
-       nil,
-       0,
-       "foo"
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/bug_hash_interp_array.txt b/test/yarp/snapshots/seattlerb/bug_hash_interp_array.txt
deleted file mode 100644
index fff5c3bfb64f44..00000000000000
--- a/test/yarp/snapshots/seattlerb/bug_hash_interp_array.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-ProgramNode(0...13)(
-  [],
-  StatementsNode(0...13)(
-    [HashNode(0...13)(
-       (0...1),
-       [AssocNode(2...11)(
-          InterpolatedSymbolNode(2...8)(
-            (2...3),
-            [EmbeddedStatementsNode(3...6)((3...5), nil, (5...6))],
-            (6...8)
-          ),
-          ArrayNode(9...11)([], (9...10), (10...11)),
-          nil
-        )],
-       (12...13)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/bug_masgn_right.txt b/test/yarp/snapshots/seattlerb/bug_masgn_right.txt
deleted file mode 100644
index beee1f79905413..00000000000000
--- a/test/yarp/snapshots/seattlerb/bug_masgn_right.txt
+++ /dev/null
@@ -1,41 +0,0 @@
-ProgramNode(0...17)(
-  [],
-  StatementsNode(0...17)(
-    [CallNode(0...17)(
-       nil,
-       nil,
-       (0...1),
-       nil,
-       nil,
-       nil,
-       BlockNode(2...17)(
-         [:a, :b, :c],
-         BlockParametersNode(4...15)(
-           ParametersNode(5...14)(
-             [RequiredParameterNode(5...6)(:a),
-              RequiredDestructuredParameterNode(8...14)(
-                [RequiredParameterNode(9...10)(:b),
-                 RequiredParameterNode(12...13)(:c)],
-                (8...9),
-                (13...14)
-              )],
-             [],
-             [],
-             nil,
-             [],
-             nil,
-             nil
-           ),
-           [],
-           (4...5),
-           (14...15)
-         ),
-         nil,
-         (2...3),
-         (16...17)
-       ),
-       0,
-       "f"
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/bug_not_parens.txt b/test/yarp/snapshots/seattlerb/bug_not_parens.txt
deleted file mode 100644
index e4a01de3f48a92..00000000000000
--- a/test/yarp/snapshots/seattlerb/bug_not_parens.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-ProgramNode(0...6)(
-  [],
-  StatementsNode(0...6)(
-    [CallNode(0...6)(
-       CallNode(4...5)(nil, nil, (4...5), nil, nil, nil, nil, 2, "a"),
-       nil,
-       (0...3),
-       (3...4),
-       nil,
-       (5...6),
-       nil,
-       0,
-       "!"
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/bug_op_asgn_rescue.txt b/test/yarp/snapshots/seattlerb/bug_op_asgn_rescue.txt
deleted file mode 100644
index 2bd4f430e3549f..00000000000000
--- a/test/yarp/snapshots/seattlerb/bug_op_asgn_rescue.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-ProgramNode(0...18)(
-  [:a],
-  StatementsNode(0...18)(
-    [LocalVariableOrWriteNode(0...18)(
-       (0...1),
-       (2...5),
-       RescueModifierNode(6...18)(
-         CallNode(6...7)(nil, nil, (6...7), nil, nil, nil, nil, 2, "b"),
-         (8...14),
-         NilNode(15...18)()
-       ),
-       :a,
-       0
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/call_and.txt b/test/yarp/snapshots/seattlerb/call_and.txt
deleted file mode 100644
index d6b4d8d6ce1f33..00000000000000
--- a/test/yarp/snapshots/seattlerb/call_and.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-ProgramNode(0...5)(
-  [],
-  StatementsNode(0...5)(
-    [CallNode(0...5)(
-       IntegerNode(0...1)(),
-       nil,
-       (2...3),
-       nil,
-       ArgumentsNode(4...5)([IntegerNode(4...5)()]),
-       nil,
-       nil,
-       0,
-       "&"
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/call_arg_assoc.txt b/test/yarp/snapshots/seattlerb/call_arg_assoc.txt
deleted file mode 100644
index e6c88afdf05318..00000000000000
--- a/test/yarp/snapshots/seattlerb/call_arg_assoc.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-ProgramNode(0...10)(
-  [],
-  StatementsNode(0...10)(
-    [CallNode(0...10)(
-       nil,
-       nil,
-       (0...1),
-       (1...2),
-       ArgumentsNode(2...9)(
-         [IntegerNode(2...3)(),
-          KeywordHashNode(5...9)(
-            [AssocNode(5...9)(
-               IntegerNode(5...6)(),
-               IntegerNode(8...9)(),
-               (6...8)
-             )]
-          )]
-       ),
-       (9...10),
-       nil,
-       0,
-       "f"
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/call_arg_assoc_kwsplat.txt b/test/yarp/snapshots/seattlerb/call_arg_assoc_kwsplat.txt
deleted file mode 100644
index 076fe7a8b222bc..00000000000000
--- a/test/yarp/snapshots/seattlerb/call_arg_assoc_kwsplat.txt
+++ /dev/null
@@ -1,26 +0,0 @@
-ProgramNode(0...16)(
-  [],
-  StatementsNode(0...16)(
-    [CallNode(0...16)(
-       nil,
-       nil,
-       (0...1),
-       (1...2),
-       ArgumentsNode(2...15)(
-         [IntegerNode(2...3)(),
-          KeywordHashNode(5...15)(
-            [AssocNode(5...10)(
-               SymbolNode(5...8)(nil, (5...7), (7...8), "kw"),
-               IntegerNode(9...10)(),
-               nil
-             ),
-             AssocSplatNode(12...15)(IntegerNode(14...15)(), (12...14))]
-          )]
-       ),
-       (15...16),
-       nil,
-       0,
-       "f"
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/call_arg_kwsplat.txt b/test/yarp/snapshots/seattlerb/call_arg_kwsplat.txt
deleted file mode 100644
index 6a98d992d3c9fc..00000000000000
--- a/test/yarp/snapshots/seattlerb/call_arg_kwsplat.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-ProgramNode(0...9)(
-  [],
-  StatementsNode(0...9)(
-    [CallNode(0...9)(
-       nil,
-       nil,
-       (0...1),
-       (1...2),
-       ArgumentsNode(2...8)(
-         [CallNode(2...3)(nil, nil, (2...3), nil, nil, nil, nil, 2, "b"),
-          KeywordHashNode(5...8)(
-            [AssocSplatNode(5...8)(IntegerNode(7...8)(), (5...7))]
-          )]
-       ),
-       (8...9),
-       nil,
-       0,
-       "a"
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/call_args_assoc_quoted.txt b/test/yarp/snapshots/seattlerb/call_args_assoc_quoted.txt
deleted file mode 100644
index b632adc6ba5016..00000000000000
--- a/test/yarp/snapshots/seattlerb/call_args_assoc_quoted.txt
+++ /dev/null
@@ -1,82 +0,0 @@
-ProgramNode(0...31)(
-  [],
-  StatementsNode(0...31)(
-    [CallNode(0...11)(
-       nil,
-       nil,
-       (0...1),
-       nil,
-       ArgumentsNode(2...11)(
-         [KeywordHashNode(2...11)(
-            [AssocNode(2...11)(
-               InterpolatedSymbolNode(2...9)(
-                 (2...3),
-                 [EmbeddedStatementsNode(3...7)(
-                    (3...5),
-                    StatementsNode(5...6)(
-                      [CallNode(5...6)(
-                         nil,
-                         nil,
-                         (5...6),
-                         nil,
-                         nil,
-                         nil,
-                         nil,
-                         2,
-                         "k"
-                       )]
-                    ),
-                    (6...7)
-                  )],
-                 (7...9)
-               ),
-               IntegerNode(9...11)(),
-               nil
-             )]
-          )]
-       ),
-       nil,
-       nil,
-       0,
-       "x"
-     ),
-     CallNode(13...21)(
-       nil,
-       nil,
-       (13...14),
-       nil,
-       ArgumentsNode(15...21)(
-         [KeywordHashNode(15...21)(
-            [AssocNode(15...21)(
-               SymbolNode(15...19)((15...16), (16...17), (17...19), "k"),
-               IntegerNode(19...21)(),
-               nil
-             )]
-          )]
-       ),
-       nil,
-       nil,
-       0,
-       "x"
-     ),
-     CallNode(23...31)(
-       nil,
-       nil,
-       (23...24),
-       nil,
-       ArgumentsNode(25...31)(
-         [KeywordHashNode(25...31)(
-            [AssocNode(25...31)(
-               SymbolNode(25...29)((25...26), (26...27), (27...29), "k"),
-               IntegerNode(29...31)(),
-               nil
-             )]
-          )]
-       ),
-       nil,
-       nil,
-       0,
-       "x"
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/call_args_assoc_trailing_comma.txt b/test/yarp/snapshots/seattlerb/call_args_assoc_trailing_comma.txt
deleted file mode 100644
index 432a7c0a44be29..00000000000000
--- a/test/yarp/snapshots/seattlerb/call_args_assoc_trailing_comma.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-ProgramNode(0...11)(
-  [],
-  StatementsNode(0...11)(
-    [CallNode(0...11)(
-       nil,
-       nil,
-       (0...1),
-       (1...2),
-       ArgumentsNode(2...9)(
-         [IntegerNode(2...3)(),
-          KeywordHashNode(5...9)(
-            [AssocNode(5...9)(
-               IntegerNode(5...6)(),
-               IntegerNode(8...9)(),
-               (6...8)
-             )]
-          )]
-       ),
-       (10...11),
-       nil,
-       0,
-       "f"
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/call_args_command.txt b/test/yarp/snapshots/seattlerb/call_args_command.txt
deleted file mode 100644
index fa5c35b8680781..00000000000000
--- a/test/yarp/snapshots/seattlerb/call_args_command.txt
+++ /dev/null
@@ -1,28 +0,0 @@
-ProgramNode(0...9)(
-  [],
-  StatementsNode(0...9)(
-    [CallNode(0...9)(
-       CallNode(0...1)(nil, nil, (0...1), nil, nil, nil, nil, 2, "a"),
-       (1...2),
-       (2...3),
-       nil,
-       ArgumentsNode(4...9)(
-         [CallNode(4...9)(
-            CallNode(4...5)(nil, nil, (4...5), nil, nil, nil, nil, 2, "c"),
-            (5...6),
-            (6...7),
-            nil,
-            ArgumentsNode(8...9)([IntegerNode(8...9)()]),
-            nil,
-            nil,
-            0,
-            "d"
-          )]
-       ),
-       nil,
-       nil,
-       0,
-       "b"
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/call_array_arg.txt b/test/yarp/snapshots/seattlerb/call_array_arg.txt
deleted file mode 100644
index ade225a9e63e8c..00000000000000
--- a/test/yarp/snapshots/seattlerb/call_array_arg.txt
+++ /dev/null
@@ -1,23 +0,0 @@
-ProgramNode(0...13)(
-  [],
-  StatementsNode(0...13)(
-    [CallNode(0...13)(
-       IntegerNode(0...1)(),
-       nil,
-       (2...4),
-       nil,
-       ArgumentsNode(5...13)(
-         [ArrayNode(5...13)(
-            [SymbolNode(6...8)((6...7), (7...8), nil, "b"),
-             SymbolNode(10...12)((10...11), (11...12), nil, "c")],
-            (5...6),
-            (12...13)
-          )]
-       ),
-       nil,
-       nil,
-       0,
-       "=="
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/call_array_block_call.txt b/test/yarp/snapshots/seattlerb/call_array_block_call.txt
deleted file mode 100644
index 460621a13148b7..00000000000000
--- a/test/yarp/snapshots/seattlerb/call_array_block_call.txt
+++ /dev/null
@@ -1,33 +0,0 @@
-ProgramNode(0...19)(
-  [],
-  StatementsNode(0...19)(
-    [CallNode(0...19)(
-       nil,
-       nil,
-       (0...1),
-       nil,
-       ArgumentsNode(2...19)(
-         [ArrayNode(2...19)(
-            [NilNode(4...7)(),
-             CallNode(9...17)(
-               nil,
-               nil,
-               (9...10),
-               nil,
-               nil,
-               nil,
-               BlockNode(11...17)([], nil, nil, (11...13), (14...17)),
-               0,
-               "b"
-             )],
-            (2...3),
-            (18...19)
-          )]
-       ),
-       nil,
-       nil,
-       0,
-       "a"
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/call_array_lambda_block_call.txt b/test/yarp/snapshots/seattlerb/call_array_lambda_block_call.txt
deleted file mode 100644
index c83adb235f72be..00000000000000
--- a/test/yarp/snapshots/seattlerb/call_array_lambda_block_call.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-ProgramNode(0...18)(
-  [],
-  StatementsNode(0...18)(
-    [CallNode(0...18)(
-       nil,
-       nil,
-       (0...1),
-       nil,
-       ArgumentsNode(2...11)(
-         [ArrayNode(2...11)(
-            [LambdaNode(3...10)(
-               [],
-               (3...5),
-               (8...9),
-               (9...10),
-               BlockParametersNode(5...7)(nil, [], (5...6), (6...7)),
-               nil
-             )],
-            (2...3),
-            (10...11)
-          )]
-       ),
-       nil,
-       BlockNode(12...18)([], nil, nil, (12...14), (15...18)),
-       0,
-       "a"
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/call_array_lit_inline_hash.txt b/test/yarp/snapshots/seattlerb/call_array_lit_inline_hash.txt
deleted file mode 100644
index ef336c5a153d13..00000000000000
--- a/test/yarp/snapshots/seattlerb/call_array_lit_inline_hash.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-ProgramNode(0...16)(
-  [],
-  StatementsNode(0...16)(
-    [CallNode(0...16)(
-       nil,
-       nil,
-       (0...1),
-       (1...2),
-       ArgumentsNode(2...15)(
-         [ArrayNode(2...15)(
-            [SymbolNode(3...5)((3...4), (4...5), nil, "b"),
-             KeywordHashNode(7...14)(
-               [AssocNode(7...14)(
-                  SymbolNode(7...9)((7...8), (8...9), nil, "c"),
-                  IntegerNode(13...14)(),
-                  (10...12)
-                )]
-             )],
-            (2...3),
-            (14...15)
-          )]
-       ),
-       (15...16),
-       nil,
-       0,
-       "a"
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/call_assoc.txt b/test/yarp/snapshots/seattlerb/call_assoc.txt
deleted file mode 100644
index bd6a6e286c2a15..00000000000000
--- a/test/yarp/snapshots/seattlerb/call_assoc.txt
+++ /dev/null
@@ -1,24 +0,0 @@
-ProgramNode(0...7)(
-  [],
-  StatementsNode(0...7)(
-    [CallNode(0...7)(
-       nil,
-       nil,
-       (0...1),
-       (1...2),
-       ArgumentsNode(2...6)(
-         [KeywordHashNode(2...6)(
-            [AssocNode(2...6)(
-               IntegerNode(2...3)(),
-               IntegerNode(5...6)(),
-               (3...5)
-             )]
-          )]
-       ),
-       (6...7),
-       nil,
-       0,
-       "f"
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/call_assoc_new.txt b/test/yarp/snapshots/seattlerb/call_assoc_new.txt
deleted file mode 100644
index 525b3b1472b66b..00000000000000
--- a/test/yarp/snapshots/seattlerb/call_assoc_new.txt
+++ /dev/null
@@ -1,24 +0,0 @@
-ProgramNode(0...6)(
-  [],
-  StatementsNode(0...6)(
-    [CallNode(0...6)(
-       nil,
-       nil,
-       (0...1),
-       (1...2),
-       ArgumentsNode(2...5)(
-         [KeywordHashNode(2...5)(
-            [AssocNode(2...5)(
-               SymbolNode(2...4)(nil, (2...3), (3...4), "a"),
-               IntegerNode(4...5)(),
-               nil
-             )]
-          )]
-       ),
-       (5...6),
-       nil,
-       0,
-       "f"
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/call_assoc_new_if_multiline.txt b/test/yarp/snapshots/seattlerb/call_assoc_new_if_multiline.txt
deleted file mode 100644
index 5bfb5a08877745..00000000000000
--- a/test/yarp/snapshots/seattlerb/call_assoc_new_if_multiline.txt
+++ /dev/null
@@ -1,34 +0,0 @@
-ProgramNode(0...24)(
-  [],
-  StatementsNode(0...24)(
-    [CallNode(0...24)(
-       nil,
-       nil,
-       (0...1),
-       (1...2),
-       ArgumentsNode(2...23)(
-         [KeywordHashNode(2...23)(
-            [AssocNode(2...23)(
-               SymbolNode(2...4)(nil, (2...3), (3...4), "b"),
-               IfNode(5...23)(
-                 (5...7),
-                 SymbolNode(8...10)((8...9), (9...10), nil, "c"),
-                 StatementsNode(11...12)([IntegerNode(11...12)()]),
-                 ElseNode(13...23)(
-                   (13...17),
-                   StatementsNode(18...19)([IntegerNode(18...19)()]),
-                   (20...23)
-                 ),
-                 (20...23)
-               ),
-               nil
-             )]
-          )]
-       ),
-       (23...24),
-       nil,
-       0,
-       "a"
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/call_assoc_trailing_comma.txt b/test/yarp/snapshots/seattlerb/call_assoc_trailing_comma.txt
deleted file mode 100644
index 0f68852c190e55..00000000000000
--- a/test/yarp/snapshots/seattlerb/call_assoc_trailing_comma.txt
+++ /dev/null
@@ -1,24 +0,0 @@
-ProgramNode(0...8)(
-  [],
-  StatementsNode(0...8)(
-    [CallNode(0...8)(
-       nil,
-       nil,
-       (0...1),
-       (1...2),
-       ArgumentsNode(2...6)(
-         [KeywordHashNode(2...6)(
-            [AssocNode(2...6)(
-               IntegerNode(2...3)(),
-               IntegerNode(5...6)(),
-               (3...5)
-             )]
-          )]
-       ),
-       (7...8),
-       nil,
-       0,
-       "f"
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/call_bang_command_call.txt b/test/yarp/snapshots/seattlerb/call_bang_command_call.txt
deleted file mode 100644
index 104d90d1c2a1a1..00000000000000
--- a/test/yarp/snapshots/seattlerb/call_bang_command_call.txt
+++ /dev/null
@@ -1,26 +0,0 @@
-ProgramNode(0...7)(
-  [],
-  StatementsNode(0...7)(
-    [CallNode(0...7)(
-       CallNode(2...7)(
-         CallNode(2...3)(nil, nil, (2...3), nil, nil, nil, nil, 2, "a"),
-         (3...4),
-         (4...5),
-         nil,
-         ArgumentsNode(6...7)([IntegerNode(6...7)()]),
-         nil,
-         nil,
-         0,
-         "b"
-       ),
-       nil,
-       (0...1),
-       nil,
-       nil,
-       nil,
-       nil,
-       0,
-       "!"
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/call_bang_squiggle.txt b/test/yarp/snapshots/seattlerb/call_bang_squiggle.txt
deleted file mode 100644
index 56146957714899..00000000000000
--- a/test/yarp/snapshots/seattlerb/call_bang_squiggle.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-ProgramNode(0...6)(
-  [],
-  StatementsNode(0...6)(
-    [CallNode(0...6)(
-       IntegerNode(0...1)(),
-       nil,
-       (2...4),
-       nil,
-       ArgumentsNode(5...6)([IntegerNode(5...6)()]),
-       nil,
-       nil,
-       0,
-       "!~"
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/call_begin_call_block_call.txt b/test/yarp/snapshots/seattlerb/call_begin_call_block_call.txt
deleted file mode 100644
index 9b60d515f0c75e..00000000000000
--- a/test/yarp/snapshots/seattlerb/call_begin_call_block_call.txt
+++ /dev/null
@@ -1,47 +0,0 @@
-ProgramNode(0...22)(
-  [],
-  StatementsNode(0...22)(
-    [CallNode(0...22)(
-       nil,
-       nil,
-       (0...1),
-       nil,
-       ArgumentsNode(2...22)(
-         [BeginNode(2...22)(
-            (2...7),
-            StatementsNode(8...18)(
-              [CallNode(8...18)(
-                 CallNode(8...9)(
-                   nil,
-                   nil,
-                   (8...9),
-                   nil,
-                   nil,
-                   nil,
-                   nil,
-                   2,
-                   "b"
-                 ),
-                 (9...10),
-                 (10...11),
-                 nil,
-                 nil,
-                 nil,
-                 BlockNode(12...18)([], nil, nil, (12...14), (15...18)),
-                 0,
-                 "c"
-               )]
-            ),
-            nil,
-            nil,
-            nil,
-            (19...22)
-          )]
-       ),
-       nil,
-       nil,
-       0,
-       "a"
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/call_block_arg_named.txt b/test/yarp/snapshots/seattlerb/call_block_arg_named.txt
deleted file mode 100644
index f24da1bcd504c1..00000000000000
--- a/test/yarp/snapshots/seattlerb/call_block_arg_named.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-ProgramNode(0...7)(
-  [],
-  StatementsNode(0...7)(
-    [CallNode(0...7)(
-       nil,
-       nil,
-       (0...1),
-       (1...2),
-       ArgumentsNode(2...6)(
-         [BlockArgumentNode(2...6)(
-            CallNode(3...6)(nil, nil, (3...6), nil, nil, nil, nil, 2, "blk"),
-            (2...3)
-          )]
-       ),
-       (6...7),
-       nil,
-       0,
-       "x"
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/call_carat.txt b/test/yarp/snapshots/seattlerb/call_carat.txt
deleted file mode 100644
index bea1ff7c6808f7..00000000000000
--- a/test/yarp/snapshots/seattlerb/call_carat.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-ProgramNode(0...5)(
-  [],
-  StatementsNode(0...5)(
-    [CallNode(0...5)(
-       IntegerNode(0...1)(),
-       nil,
-       (2...3),
-       nil,
-       ArgumentsNode(4...5)([IntegerNode(4...5)()]),
-       nil,
-       nil,
-       0,
-       "^"
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/call_colon2.txt b/test/yarp/snapshots/seattlerb/call_colon2.txt
deleted file mode 100644
index 66b8a4a0177982..00000000000000
--- a/test/yarp/snapshots/seattlerb/call_colon2.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-ProgramNode(0...4)(
-  [],
-  StatementsNode(0...4)(
-    [CallNode(0...4)(
-       ConstantReadNode(0...1)(:A),
-       (1...3),
-       (3...4),
-       nil,
-       nil,
-       nil,
-       nil,
-       0,
-       "b"
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/call_colon_parens.txt b/test/yarp/snapshots/seattlerb/call_colon_parens.txt
deleted file mode 100644
index 14c7247bcd47cb..00000000000000
--- a/test/yarp/snapshots/seattlerb/call_colon_parens.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-ProgramNode(0...5)(
-  [],
-  StatementsNode(0...5)(
-    [CallNode(0...5)(
-       IntegerNode(0...1)(),
-       (1...3),
-       nil,
-       (3...4),
-       nil,
-       (4...5),
-       nil,
-       0,
-       "call"
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/call_div.txt b/test/yarp/snapshots/seattlerb/call_div.txt
deleted file mode 100644
index f7caf104146425..00000000000000
--- a/test/yarp/snapshots/seattlerb/call_div.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-ProgramNode(0...5)(
-  [],
-  StatementsNode(0...5)(
-    [CallNode(0...5)(
-       IntegerNode(0...1)(),
-       nil,
-       (2...3),
-       nil,
-       ArgumentsNode(4...5)([IntegerNode(4...5)()]),
-       nil,
-       nil,
-       0,
-       "/"
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/call_dot_parens.txt b/test/yarp/snapshots/seattlerb/call_dot_parens.txt
deleted file mode 100644
index 073336ed48525b..00000000000000
--- a/test/yarp/snapshots/seattlerb/call_dot_parens.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-ProgramNode(0...4)(
-  [],
-  StatementsNode(0...4)(
-    [CallNode(0...4)(
-       IntegerNode(0...1)(),
-       (1...2),
-       nil,
-       (2...3),
-       nil,
-       (3...4),
-       nil,
-       0,
-       "call"
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/call_env.txt b/test/yarp/snapshots/seattlerb/call_env.txt
deleted file mode 100644
index 8af975cdce7ef6..00000000000000
--- a/test/yarp/snapshots/seattlerb/call_env.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-ProgramNode(0...7)(
-  [],
-  StatementsNode(0...7)(
-    [CallNode(0...7)(
-       CallNode(0...1)(nil, nil, (0...1), nil, nil, nil, nil, 2, "a"),
-       (1...2),
-       (2...7),
-       nil,
-       nil,
-       nil,
-       nil,
-       0,
-       "happy"
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/call_eq3.txt b/test/yarp/snapshots/seattlerb/call_eq3.txt
deleted file mode 100644
index 192a3c97c5dfd1..00000000000000
--- a/test/yarp/snapshots/seattlerb/call_eq3.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-ProgramNode(0...7)(
-  [],
-  StatementsNode(0...7)(
-    [CallNode(0...7)(
-       IntegerNode(0...1)(),
-       nil,
-       (2...5),
-       nil,
-       ArgumentsNode(6...7)([IntegerNode(6...7)()]),
-       nil,
-       nil,
-       0,
-       "==="
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/call_gt.txt b/test/yarp/snapshots/seattlerb/call_gt.txt
deleted file mode 100644
index 9eadb5ee2f0f5f..00000000000000
--- a/test/yarp/snapshots/seattlerb/call_gt.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-ProgramNode(0...5)(
-  [],
-  StatementsNode(0...5)(
-    [CallNode(0...5)(
-       IntegerNode(0...1)(),
-       nil,
-       (2...3),
-       nil,
-       ArgumentsNode(4...5)([IntegerNode(4...5)()]),
-       nil,
-       nil,
-       0,
-       ">"
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/call_kwsplat.txt b/test/yarp/snapshots/seattlerb/call_kwsplat.txt
deleted file mode 100644
index c5b45b9cb2796a..00000000000000
--- a/test/yarp/snapshots/seattlerb/call_kwsplat.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-ProgramNode(0...6)(
-  [],
-  StatementsNode(0...6)(
-    [CallNode(0...6)(
-       nil,
-       nil,
-       (0...1),
-       (1...2),
-       ArgumentsNode(2...5)(
-         [KeywordHashNode(2...5)(
-            [AssocSplatNode(2...5)(IntegerNode(4...5)(), (2...4))]
-          )]
-       ),
-       (5...6),
-       nil,
-       0,
-       "a"
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/call_leading_dots.txt b/test/yarp/snapshots/seattlerb/call_leading_dots.txt
deleted file mode 100644
index bc418635a105f8..00000000000000
--- a/test/yarp/snapshots/seattlerb/call_leading_dots.txt
+++ /dev/null
@@ -1,26 +0,0 @@
-ProgramNode(0...7)(
-  [],
-  StatementsNode(0...7)(
-    [CallNode(0...7)(
-       CallNode(0...4)(
-         CallNode(0...1)(nil, nil, (0...1), nil, nil, nil, nil, 2, "a"),
-         (2...3),
-         (3...4),
-         nil,
-         nil,
-         nil,
-         nil,
-         0,
-         "b"
-       ),
-       (5...6),
-       (6...7),
-       nil,
-       nil,
-       nil,
-       nil,
-       0,
-       "c"
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/call_leading_dots_comment.txt b/test/yarp/snapshots/seattlerb/call_leading_dots_comment.txt
deleted file mode 100644
index e9a88d05d4b850..00000000000000
--- a/test/yarp/snapshots/seattlerb/call_leading_dots_comment.txt
+++ /dev/null
@@ -1,26 +0,0 @@
-ProgramNode(0...11)(
-  [],
-  StatementsNode(0...11)(
-    [CallNode(0...11)(
-       CallNode(0...4)(
-         CallNode(0...1)(nil, nil, (0...1), nil, nil, nil, nil, 2, "a"),
-         (2...3),
-         (3...4),
-         nil,
-         nil,
-         nil,
-         nil,
-         0,
-         "b"
-       ),
-       (9...10),
-       (10...11),
-       nil,
-       nil,
-       nil,
-       nil,
-       0,
-       "d"
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/call_lt.txt b/test/yarp/snapshots/seattlerb/call_lt.txt
deleted file mode 100644
index 11fcd8c44ff9af..00000000000000
--- a/test/yarp/snapshots/seattlerb/call_lt.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-ProgramNode(0...5)(
-  [],
-  StatementsNode(0...5)(
-    [CallNode(0...5)(
-       IntegerNode(0...1)(),
-       nil,
-       (2...3),
-       nil,
-       ArgumentsNode(4...5)([IntegerNode(4...5)()]),
-       nil,
-       nil,
-       0,
-       "<"
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/call_lte.txt b/test/yarp/snapshots/seattlerb/call_lte.txt
deleted file mode 100644
index 5ad45cbf0e4e64..00000000000000
--- a/test/yarp/snapshots/seattlerb/call_lte.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-ProgramNode(0...6)(
-  [],
-  StatementsNode(0...6)(
-    [CallNode(0...6)(
-       IntegerNode(0...1)(),
-       nil,
-       (2...4),
-       nil,
-       ArgumentsNode(5...6)([IntegerNode(5...6)()]),
-       nil,
-       nil,
-       0,
-       "<="
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/call_not.txt b/test/yarp/snapshots/seattlerb/call_not.txt
deleted file mode 100644
index d42b852ead670e..00000000000000
--- a/test/yarp/snapshots/seattlerb/call_not.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-ProgramNode(0...6)(
-  [],
-  StatementsNode(0...6)(
-    [CallNode(0...6)(
-       IntegerNode(4...6)(),
-       nil,
-       (0...3),
-       nil,
-       nil,
-       nil,
-       nil,
-       0,
-       "!"
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/call_pipe.txt b/test/yarp/snapshots/seattlerb/call_pipe.txt
deleted file mode 100644
index e372fce6e52089..00000000000000
--- a/test/yarp/snapshots/seattlerb/call_pipe.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-ProgramNode(0...5)(
-  [],
-  StatementsNode(0...5)(
-    [CallNode(0...5)(
-       IntegerNode(0...1)(),
-       nil,
-       (2...3),
-       nil,
-       ArgumentsNode(4...5)([IntegerNode(4...5)()]),
-       nil,
-       nil,
-       0,
-       "|"
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/call_rshift.txt b/test/yarp/snapshots/seattlerb/call_rshift.txt
deleted file mode 100644
index 9a523669eb4aa0..00000000000000
--- a/test/yarp/snapshots/seattlerb/call_rshift.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-ProgramNode(0...6)(
-  [],
-  StatementsNode(0...6)(
-    [CallNode(0...6)(
-       IntegerNode(0...1)(),
-       nil,
-       (2...4),
-       nil,
-       ArgumentsNode(5...6)([IntegerNode(5...6)()]),
-       nil,
-       nil,
-       0,
-       ">>"
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/call_self_brackets.txt b/test/yarp/snapshots/seattlerb/call_self_brackets.txt
deleted file mode 100644
index 7dfe5a50be0f25..00000000000000
--- a/test/yarp/snapshots/seattlerb/call_self_brackets.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-ProgramNode(0...7)(
-  [],
-  StatementsNode(0...7)(
-    [CallNode(0...7)(
-       SelfNode(0...4)(),
-       nil,
-       (4...7),
-       (4...5),
-       ArgumentsNode(5...6)([IntegerNode(5...6)()]),
-       (6...7),
-       nil,
-       0,
-       "[]"
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/call_spaceship.txt b/test/yarp/snapshots/seattlerb/call_spaceship.txt
deleted file mode 100644
index a7ee86597819ea..00000000000000
--- a/test/yarp/snapshots/seattlerb/call_spaceship.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-ProgramNode(0...7)(
-  [],
-  StatementsNode(0...7)(
-    [CallNode(0...7)(
-       IntegerNode(0...1)(),
-       nil,
-       (2...5),
-       nil,
-       ArgumentsNode(6...7)([IntegerNode(6...7)()]),
-       nil,
-       nil,
-       0,
-       "<=>"
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/call_stabby_do_end_with_block.txt b/test/yarp/snapshots/seattlerb/call_stabby_do_end_with_block.txt
deleted file mode 100644
index f541c529851ce2..00000000000000
--- a/test/yarp/snapshots/seattlerb/call_stabby_do_end_with_block.txt
+++ /dev/null
@@ -1,31 +0,0 @@
-ProgramNode(0...22)(
-  [],
-  StatementsNode(0...22)(
-    [CallNode(0...22)(
-       nil,
-       nil,
-       (0...1),
-       nil,
-       ArgumentsNode(2...13)(
-         [LambdaNode(2...13)(
-            [],
-            (2...4),
-            (5...7),
-            (10...13),
-            nil,
-            StatementsNode(8...9)([IntegerNode(8...9)()])
-          )]
-       ),
-       nil,
-       BlockNode(14...22)(
-         [],
-         nil,
-         StatementsNode(17...18)([IntegerNode(17...18)()]),
-         (14...16),
-         (19...22)
-       ),
-       0,
-       "a"
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/call_stabby_with_braces_block.txt b/test/yarp/snapshots/seattlerb/call_stabby_with_braces_block.txt
deleted file mode 100644
index 83c62571fd7c44..00000000000000
--- a/test/yarp/snapshots/seattlerb/call_stabby_with_braces_block.txt
+++ /dev/null
@@ -1,31 +0,0 @@
-ProgramNode(0...19)(
-  [],
-  StatementsNode(0...19)(
-    [CallNode(0...19)(
-       nil,
-       nil,
-       (0...1),
-       nil,
-       ArgumentsNode(2...10)(
-         [LambdaNode(2...10)(
-            [],
-            (2...4),
-            (5...6),
-            (9...10),
-            nil,
-            StatementsNode(7...8)([IntegerNode(7...8)()])
-          )]
-       ),
-       nil,
-       BlockNode(11...19)(
-         [],
-         nil,
-         StatementsNode(14...15)([IntegerNode(14...15)()]),
-         (11...13),
-         (16...19)
-       ),
-       0,
-       "a"
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/call_star.txt b/test/yarp/snapshots/seattlerb/call_star.txt
deleted file mode 100644
index 1e4683a882bf47..00000000000000
--- a/test/yarp/snapshots/seattlerb/call_star.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-ProgramNode(0...5)(
-  [],
-  StatementsNode(0...5)(
-    [CallNode(0...5)(
-       IntegerNode(0...1)(),
-       nil,
-       (2...3),
-       nil,
-       ArgumentsNode(4...5)([IntegerNode(4...5)()]),
-       nil,
-       nil,
-       0,
-       "*"
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/call_star2.txt b/test/yarp/snapshots/seattlerb/call_star2.txt
deleted file mode 100644
index d051c4a3136266..00000000000000
--- a/test/yarp/snapshots/seattlerb/call_star2.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-ProgramNode(0...6)(
-  [],
-  StatementsNode(0...6)(
-    [CallNode(0...6)(
-       IntegerNode(0...1)(),
-       nil,
-       (2...4),
-       nil,
-       ArgumentsNode(5...6)([IntegerNode(5...6)()]),
-       nil,
-       nil,
-       0,
-       "**"
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/call_trailing_comma.txt b/test/yarp/snapshots/seattlerb/call_trailing_comma.txt
deleted file mode 100644
index da971880af3e5e..00000000000000
--- a/test/yarp/snapshots/seattlerb/call_trailing_comma.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-ProgramNode(0...5)(
-  [],
-  StatementsNode(0...5)(
-    [CallNode(0...5)(
-       nil,
-       nil,
-       (0...1),
-       (1...2),
-       ArgumentsNode(2...3)([IntegerNode(2...3)()]),
-       (4...5),
-       nil,
-       0,
-       "f"
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/call_trailing_dots.txt b/test/yarp/snapshots/seattlerb/call_trailing_dots.txt
deleted file mode 100644
index a2ccf8addde234..00000000000000
--- a/test/yarp/snapshots/seattlerb/call_trailing_dots.txt
+++ /dev/null
@@ -1,26 +0,0 @@
-ProgramNode(0...7)(
-  [],
-  StatementsNode(0...7)(
-    [CallNode(0...7)(
-       CallNode(0...4)(
-         CallNode(0...1)(nil, nil, (0...1), nil, nil, nil, nil, 2, "a"),
-         (1...2),
-         (3...4),
-         nil,
-         nil,
-         nil,
-         nil,
-         0,
-         "b"
-       ),
-       (4...5),
-       (6...7),
-       nil,
-       nil,
-       nil,
-       nil,
-       0,
-       "c"
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/call_unary_bang.txt b/test/yarp/snapshots/seattlerb/call_unary_bang.txt
deleted file mode 100644
index e0de2a924f5799..00000000000000
--- a/test/yarp/snapshots/seattlerb/call_unary_bang.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-ProgramNode(0...2)(
-  [],
-  StatementsNode(0...2)(
-    [CallNode(0...2)(
-       IntegerNode(1...2)(),
-       nil,
-       (0...1),
-       nil,
-       nil,
-       nil,
-       nil,
-       0,
-       "!"
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/case_in.txt b/test/yarp/snapshots/seattlerb/case_in.txt
deleted file mode 100644
index a1e26410133a8f..00000000000000
--- a/test/yarp/snapshots/seattlerb/case_in.txt
+++ /dev/null
@@ -1,597 +0,0 @@
-ProgramNode(0...747)(
-  [:b, :_, :lhs, :x, :rhs, :c, :e],
-  StatementsNode(0...747)(
-    [CaseNode(0...21)(
-       SymbolNode(5...7)((5...6), (6...7), nil, "a"),
-       [InNode(8...16)(
-          HashPatternNode(12...16)(
-            nil,
-            [AssocNode(12...16)(
-               SymbolNode(12...16)((12...13), (13...14), (14...16), "b"),
-               nil,
-               nil
-             )],
-            nil,
-            nil,
-            nil
-          ),
-          nil,
-          (8...10),
-          nil
-        )],
-       nil,
-       (0...4),
-       (18...21)
-     ),
-     CaseNode(23...45)(
-       SymbolNode(28...30)((28...29), (29...30), nil, "a"),
-       [InNode(31...41)(
-          ArrayNode(34...41)(
-            [SymbolNode(37...38)(nil, (37...38), nil, "a"),
-             SymbolNode(39...40)(nil, (39...40), nil, "b")],
-            (34...37),
-            (40...41)
-          ),
-          nil,
-          (31...33),
-          nil
-        )],
-       nil,
-       (23...27),
-       (42...45)
-     ),
-     CaseNode(47...69)(
-       SymbolNode(52...54)((52...53), (53...54), nil, "a"),
-       [InNode(55...65)(
-          ArrayNode(58...65)(
-            [StringNode(61...62)(nil, (61...62), nil, "a"),
-             StringNode(63...64)(nil, (63...64), nil, "b")],
-            (58...61),
-            (64...65)
-          ),
-          nil,
-          (55...57),
-          nil
-        )],
-       nil,
-       (47...51),
-       (66...69)
-     ),
-     CaseNode(71...93)(
-       SymbolNode(76...78)((76...77), (77...78), nil, "a"),
-       [InNode(79...89)(
-          ArrayNode(82...89)(
-            [SymbolNode(85...86)(nil, (85...86), nil, "a"),
-             SymbolNode(87...88)(nil, (87...88), nil, "b")],
-            (82...85),
-            (88...89)
-          ),
-          nil,
-          (79...81),
-          nil
-        )],
-       nil,
-       (71...75),
-       (90...93)
-     ),
-     CaseNode(95...117)(
-       SymbolNode(100...102)((100...101), (101...102), nil, "a"),
-       [InNode(103...113)(
-          ArrayNode(106...113)(
-            [StringNode(109...110)(nil, (109...110), nil, "a"),
-             StringNode(111...112)(nil, (111...112), nil, "b")],
-            (106...109),
-            (112...113)
-          ),
-          nil,
-          (103...105),
-          nil
-        )],
-       nil,
-       (95...99),
-       (114...117)
-     ),
-     CaseNode(119...141)(
-       SymbolNode(124...126)((124...125), (125...126), nil, "a"),
-       [InNode(127...136)(
-          RangeNode(131...136)(nil, IntegerNode(134...136)(), (131...134), 1),
-          nil,
-          (127...129),
-          nil
-        )],
-       nil,
-       (119...123),
-       (138...141)
-     ),
-     CaseNode(143...164)(
-       SymbolNode(148...150)((148...149), (149...150), nil, "a"),
-       [InNode(151...159)(
-          RangeNode(155...159)(nil, IntegerNode(157...159)(), (155...157), 0),
-          nil,
-          (151...153),
-          nil
-        )],
-       nil,
-       (143...147),
-       (161...164)
-     ),
-     CaseNode(166...187)(
-       SymbolNode(171...173)((171...172), (172...173), nil, "a"),
-       [InNode(174...182)(
-          RangeNode(178...182)(IntegerNode(178...179)(), nil, (179...182), 1),
-          nil,
-          (174...176),
-          nil
-        )],
-       nil,
-       (166...170),
-       (184...187)
-     ),
-     CaseNode(189...211)(
-       SymbolNode(194...196)((194...195), (195...196), nil, "a"),
-       [InNode(197...206)(
-          RangeNode(201...206)(
-            IntegerNode(201...202)(),
-            IntegerNode(205...206)(),
-            (202...205),
-            1
-          ),
-          nil,
-          (197...199),
-          nil
-        )],
-       nil,
-       (189...193),
-       (208...211)
-     ),
-     CaseNode(213...232)(
-       SymbolNode(218...220)((218...219), (219...220), nil, "a"),
-       [InNode(221...227)(IntegerNode(225...227)(), nil, (221...223), nil)],
-       nil,
-       (213...217),
-       (229...232)
-     ),
-     CaseNode(234...254)(
-       SymbolNode(239...241)((239...240), (240...241), nil, "a"),
-       [InNode(242...250)(
-          HashPatternNode(245...250)(
-            nil,
-            [NoKeywordsParameterNode(245...250)((245...247), (247...250))],
-            nil,
-            nil,
-            nil
-          ),
-          nil,
-          (242...244),
-          nil
-        )],
-       nil,
-       (234...238),
-       (251...254)
-     ),
-     CaseNode(256...279)(
-       SymbolNode(261...263)((261...262), (262...263), nil, "a"),
-       [InNode(264...275)(
-          RegularExpressionNode(267...275)(
-            (267...268),
-            (268...274),
-            (274...275),
-            "regexp",
-            0
-          ),
-          nil,
-          (264...266),
-          nil
-        )],
-       nil,
-       (256...260),
-       (276...279)
-     ),
-     CaseNode(281...306)(
-       SymbolNode(286...288)((286...287), (287...288), nil, "a"),
-       [InNode(289...302)(
-          ArrayPatternNode(292...302)(
-            nil,
-            [SymbolNode(292...294)((292...293), (293...294), nil, "b")],
-            SplatNode(296...298)(
-              (296...297),
-              LocalVariableTargetNode(297...298)(:_, 0)
-            ),
-            [SymbolNode(300...302)((300...301), (301...302), nil, "c")],
-            nil,
-            nil
-          ),
-          nil,
-          (289...291),
-          nil
-        )],
-       nil,
-       (281...285),
-       (303...306)
-     ),
-     CaseNode(308...331)(
-       SymbolNode(313...315)((313...314), (314...315), nil, "a"),
-       [InNode(316...327)(
-          ArrayPatternNode(319...327)(
-            nil,
-            [SymbolNode(319...321)((319...320), (320...321), nil, "b"),
-             ArrayPatternNode(323...327)(
-               nil,
-               [SymbolNode(324...326)((324...325), (325...326), nil, "c")],
-               nil,
-               [],
-               (323...324),
-               (326...327)
-             )],
-            nil,
-            [],
-            nil,
-            nil
-          ),
-          nil,
-          (316...318),
-          nil
-        )],
-       nil,
-       (308...312),
-       (328...331)
-     ),
-     CaseNode(333...356)(
-       SymbolNode(338...340)((338...339), (339...340), nil, "a"),
-       [InNode(341...352)(
-          ArrayPatternNode(344...352)(
-            ConstantReadNode(344...350)(:Symbol),
-            [],
-            nil,
-            [],
-            (350...351),
-            (351...352)
-          ),
-          nil,
-          (341...343),
-          nil
-        )],
-       nil,
-       (333...337),
-       (353...356)
-     ),
-     CaseNode(358...394)(
-       SymbolNode(363...365)((363...364), (364...365), nil, "a"),
-       [InNode(366...390)(
-          FindPatternNode(369...390)(
-            ConstantReadNode(369...375)(:Symbol),
-            SplatNode(376...380)(
-              (376...377),
-              LocalVariableTargetNode(377...380)(:lhs, 0)
-            ),
-            [LocalVariableTargetNode(382...383)(:x, 0)],
-            SplatNode(385...389)(
-              (385...386),
-              LocalVariableTargetNode(386...389)(:rhs, 0)
-            ),
-            (375...376),
-            (389...390)
-          ),
-          nil,
-          (366...368),
-          nil
-        )],
-       nil,
-       (358...362),
-       (391...394)
-     ),
-     CaseNode(396...432)(
-       SymbolNode(401...403)((401...402), (402...403), nil, "a"),
-       [InNode(404...428)(
-          FindPatternNode(407...428)(
-            ConstantReadNode(407...413)(:Symbol),
-            SplatNode(414...418)(
-              (414...415),
-              LocalVariableTargetNode(415...418)(:lhs, 0)
-            ),
-            [LocalVariableTargetNode(420...421)(:x, 0)],
-            SplatNode(423...427)(
-              (423...424),
-              LocalVariableTargetNode(424...427)(:rhs, 0)
-            ),
-            (413...414),
-            (427...428)
-          ),
-          nil,
-          (404...406),
-          nil
-        )],
-       nil,
-       (396...400),
-       (429...432)
-     ),
-     CaseNode(434...468)(
-       SymbolNode(439...441)((439...440), (440...441), nil, "a"),
-       [InNode(442...464)(
-          ArrayPatternNode(445...464)(
-            nil,
-            [LambdaNode(446...460)(
-               [:b],
-               (446...448),
-               (452...453),
-               (459...460),
-               BlockParametersNode(448...451)(
-                 ParametersNode(449...450)(
-                   [RequiredParameterNode(449...450)(:b)],
-                   [],
-                   [],
-                   nil,
-                   [],
-                   nil,
-                   nil
-                 ),
-                 [],
-                 (448...449),
-                 (450...451)
-               ),
-               StatementsNode(454...458)([TrueNode(454...458)()])
-             ),
-             LocalVariableTargetNode(462...463)(:c, 0)],
-            nil,
-            [],
-            (445...446),
-            (463...464)
-          ),
-          nil,
-          (442...444),
-          nil
-        )],
-       nil,
-       (434...438),
-       (465...468)
-     ),
-     CaseNode(470...510)(
-       SymbolNode(475...477)((475...476), (476...477), nil, "a"),
-       [InNode(478...506)(
-          ArrayPatternNode(481...506)(
-            nil,
-            [SymbolNode(482...484)((482...483), (483...484), nil, "a"),
-             LocalVariableTargetNode(486...487)(:b, 0),
-             LocalVariableTargetNode(489...490)(:c, 0),
-             ArrayPatternNode(492...505)(
-               nil,
-               [SymbolNode(493...495)((493...494), (494...495), nil, "d")],
-               SplatNode(497...499)(
-                 (497...498),
-                 LocalVariableTargetNode(498...499)(:e, 0)
-               ),
-               [NilNode(501...504)()],
-               (492...493),
-               (504...505)
-             )],
-            nil,
-            [],
-            (481...482),
-            (505...506)
-          ),
-          nil,
-          (478...480),
-          nil
-        )],
-       nil,
-       (470...474),
-       (507...510)
-     ),
-     CaseNode(512...536)(
-       SymbolNode(517...519)((517...518), (518...519), nil, "a"),
-       [InNode(520...532)(
-          ArrayPatternNode(523...532)(
-            nil,
-            [ConstantReadNode(524...525)(:A)],
-            SplatNode(527...528)((527...528), nil),
-            [ConstantReadNode(530...531)(:B)],
-            (523...524),
-            (531...532)
-          ),
-          nil,
-          (520...522),
-          nil
-        )],
-       nil,
-       (512...516),
-       (533...536)
-     ),
-     CaseNode(538...572)(
-       SymbolNode(543...545)((543...544), (544...545), nil, "a"),
-       [InNode(546...568)(
-          ArrayPatternNode(549...568)(
-            nil,
-            [ArrayPatternNode(550...557)(
-               nil,
-               [SymbolNode(551...553)((551...552), (552...553), nil, "b"),
-                LocalVariableTargetNode(555...556)(:c, 0)],
-               nil,
-               [],
-               (550...551),
-               (556...557)
-             ),
-             ArrayPatternNode(559...567)(
-               nil,
-               [SymbolNode(560...562)((560...561), (561...562), nil, "d"),
-                PinnedVariableNode(564...566)(
-                  LocalVariableReadNode(565...566)(:e, 0),
-                  (564...565)
-                )],
-               nil,
-               [],
-               (559...560),
-               (566...567)
-             )],
-            nil,
-            [],
-            (549...550),
-            (567...568)
-          ),
-          nil,
-          (546...548),
-          nil
-        )],
-       nil,
-       (538...542),
-       (569...572)
-     ),
-     CaseNode(574...591)(
-       SymbolNode(579...581)((579...580), (580...581), nil, "a"),
-       [InNode(582...587)(
-          ArrayPatternNode(585...587)(
-            nil,
-            [],
-            nil,
-            [],
-            (585...586),
-            (586...587)
-          ),
-          nil,
-          (582...584),
-          nil
-        )],
-       nil,
-       (574...578),
-       (588...591)
-     ),
-     CaseNode(593...614)(
-       SymbolNode(598...600)((598...599), (599...600), nil, "a"),
-       [InNode(601...610)(
-          ArrayPatternNode(604...610)(
-            nil,
-            [PinnedExpressionNode(605...609)(
-               CallNode(607...608)(
-                 nil,
-                 nil,
-                 (607...608),
-                 nil,
-                 nil,
-                 nil,
-                 nil,
-                 2,
-                 "a"
-               ),
-               (605...606),
-               (606...607),
-               (608...609)
-             )],
-            nil,
-            [],
-            (604...605),
-            (609...610)
-          ),
-          nil,
-          (601...603),
-          nil
-        )],
-       nil,
-       (593...597),
-       (611...614)
-     ),
-     CaseNode(616...647)(
-       SymbolNode(621...623)((621...622), (622...623), nil, "a"),
-       [InNode(624...643)(
-          ArrayPatternNode(627...643)(
-            nil,
-            [PinnedVariableNode(628...631)(
-               InstanceVariableReadNode(629...631)(:@a),
-               (628...629)
-             ),
-             PinnedVariableNode(633...636)(
-               GlobalVariableReadNode(634...636)(:$b),
-               (633...634)
-             ),
-             PinnedVariableNode(638...642)(
-               ClassVariableReadNode(639...642)(:@@c),
-               (638...639)
-             )],
-            nil,
-            [],
-            (627...628),
-            (642...643)
-          ),
-          nil,
-          (624...626),
-          nil
-        )],
-       nil,
-       (616...620),
-       (644...647)
-     ),
-     CaseNode(649...673)(
-       SymbolNode(654...656)((654...655), (655...656), nil, "a"),
-       [InNode(657...669)(
-          XStringNode(660...669)(
-            (660...661),
-            (661...668),
-            (668...669),
-            "echo hi"
-          ),
-          nil,
-          (657...659),
-          nil
-        )],
-       nil,
-       (649...653),
-       (670...673)
-     ),
-     CaseNode(675...703)(
-       SymbolNode(680...682)((680...681), (681...682), nil, "a"),
-       [InNode(683...699)(
-          ArrayPatternNode(686...699)(
-            nil,
-            [NilNode(686...689)(), NilNode(691...694)(), NilNode(696...699)()],
-            nil,
-            [],
-            nil,
-            nil
-          ),
-          nil,
-          (683...685),
-          nil
-        )],
-       nil,
-       (675...679),
-       (700...703)
-     ),
-     CaseNode(705...728)(
-       SymbolNode(710...712)((710...711), (711...712), nil, "a"),
-       [InNode(713...724)(
-          HashPatternNode(716...724)(
-            nil,
-            [AssocNode(718...722)(
-               SymbolNode(718...722)(
-                 (718...719),
-                 (719...720),
-                 (720...722),
-                 "b"
-               ),
-               nil,
-               nil
-             )],
-            nil,
-            (716...717),
-            (723...724)
-          ),
-          nil,
-          (713...715),
-          nil
-        )],
-       nil,
-       (705...709),
-       (725...728)
-     ),
-     CaseNode(730...747)(
-       SymbolNode(735...737)((735...736), (736...737), nil, "a"),
-       [InNode(738...743)(
-          HashPatternNode(741...743)(nil, [], nil, (741...742), (742...743)),
-          nil,
-          (738...740),
-          nil
-        )],
-       nil,
-       (730...734),
-       (744...747)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/case_in_31.txt b/test/yarp/snapshots/seattlerb/case_in_31.txt
deleted file mode 100644
index c34b271b848e76..00000000000000
--- a/test/yarp/snapshots/seattlerb/case_in_31.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-ProgramNode(0...28)(
-  [:c],
-  StatementsNode(0...28)(
-    [CaseNode(0...28)(
-       SymbolNode(5...7)((5...6), (6...7), nil, "a"),
-       [InNode(8...24)(
-          ArrayPatternNode(11...19)(
-            nil,
-            [SymbolNode(12...14)((12...13), (13...14), nil, "b")],
-            SplatNode(16...18)(
-              (16...17),
-              LocalVariableTargetNode(17...18)(:c, 0)
-            ),
-            [],
-            (11...12),
-            (18...19)
-          ),
-          StatementsNode(22...24)(
-            [SymbolNode(22...24)((22...23), (23...24), nil, "d")]
-          ),
-          (8...10),
-          nil
-        )],
-       nil,
-       (0...4),
-       (25...28)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/case_in_37.txt b/test/yarp/snapshots/seattlerb/case_in_37.txt
deleted file mode 100644
index 47137d795d177e..00000000000000
--- a/test/yarp/snapshots/seattlerb/case_in_37.txt
+++ /dev/null
@@ -1,36 +0,0 @@
-ProgramNode(0...36)(
-  [],
-  StatementsNode(0...36)(
-    [CaseNode(0...36)(
-       SymbolNode(5...7)((5...6), (6...7), nil, "a"),
-       [InNode(8...32)(
-          HashPatternNode(11...27)(
-            nil,
-            [AssocNode(13...25)(
-               SymbolNode(13...15)(nil, (13...14), (14...15), "b"),
-               ArrayPatternNode(16...25)(
-                 nil,
-                 [ConstantReadNode(17...21)(:Hash)],
-                 SplatNode(23...24)((23...24), nil),
-                 [],
-                 (16...17),
-                 (24...25)
-               ),
-               nil
-             )],
-            nil,
-            (11...12),
-            (26...27)
-          ),
-          StatementsNode(30...32)(
-            [SymbolNode(30...32)((30...31), (31...32), nil, "c")]
-          ),
-          (8...10),
-          nil
-        )],
-       nil,
-       (0...4),
-       (33...36)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/case_in_42.txt b/test/yarp/snapshots/seattlerb/case_in_42.txt
deleted file mode 100644
index b98fd9f4b78f60..00000000000000
--- a/test/yarp/snapshots/seattlerb/case_in_42.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-ProgramNode(0...30)(
-  [:_],
-  StatementsNode(0...30)(
-    [CaseNode(0...30)(
-       SymbolNode(5...7)((5...6), (6...7), nil, "a"),
-       [InNode(8...26)(
-          ArrayPatternNode(11...17)(
-            nil,
-            [SymbolNode(11...13)((11...12), (12...13), nil, "b")],
-            SplatNode(15...17)(
-              (15...16),
-              LocalVariableTargetNode(16...17)(:_, 0)
-            ),
-            [],
-            nil,
-            nil
-          ),
-          StatementsNode(23...26)([NilNode(23...26)()]),
-          (8...10),
-          (18...22)
-        )],
-       nil,
-       (0...4),
-       (27...30)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/case_in_42_2.txt b/test/yarp/snapshots/seattlerb/case_in_42_2.txt
deleted file mode 100644
index 5d7fc68646462a..00000000000000
--- a/test/yarp/snapshots/seattlerb/case_in_42_2.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-ProgramNode(0...32)(
-  [:list],
-  StatementsNode(0...32)(
-    [CaseNode(0...32)(
-       SymbolNode(5...7)((5...6), (6...7), nil, "a"),
-       [InNode(8...28)(
-          ArrayPatternNode(11...19)(
-            ConstantReadNode(11...12)(:A),
-            [],
-            SplatNode(13...18)(
-              (13...14),
-              LocalVariableTargetNode(14...18)(:list, 0)
-            ),
-            [],
-            (12...13),
-            (18...19)
-          ),
-          StatementsNode(25...28)([NilNode(25...28)()]),
-          (8...10),
-          (20...24)
-        )],
-       nil,
-       (0...4),
-       (29...32)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/case_in_47.txt b/test/yarp/snapshots/seattlerb/case_in_47.txt
deleted file mode 100644
index 727efebddee0ab..00000000000000
--- a/test/yarp/snapshots/seattlerb/case_in_47.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-ProgramNode(0...31)(
-  [],
-  StatementsNode(0...31)(
-    [CaseNode(0...31)(
-       SymbolNode(5...7)((5...6), (6...7), nil, "a"),
-       [InNode(8...27)(
-          ArrayPatternNode(11...22)(
-            nil,
-            [],
-            SplatNode(12...13)((12...13), nil),
-            [SymbolNode(15...17)((15...16), (16...17), nil, "b"),
-             SymbolNode(19...21)((19...20), (20...21), nil, "c")],
-            (11...12),
-            (21...22)
-          ),
-          StatementsNode(25...27)(
-            [SymbolNode(25...27)((25...26), (26...27), nil, "d")]
-          ),
-          (8...10),
-          nil
-        )],
-       nil,
-       (0...4),
-       (28...31)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/case_in_67.txt b/test/yarp/snapshots/seattlerb/case_in_67.txt
deleted file mode 100644
index 094d6711aa37b6..00000000000000
--- a/test/yarp/snapshots/seattlerb/case_in_67.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-ProgramNode(0...27)(
-  [],
-  StatementsNode(0...27)(
-    [CaseNode(0...27)(
-       SymbolNode(5...7)((5...6), (6...7), nil, "a"),
-       [InNode(8...23)(
-          RangeNode(11...14)(IntegerNode(11...12)(), nil, (12...14), 0),
-          StatementsNode(20...23)([NilNode(20...23)()]),
-          (8...10),
-          (15...19)
-        )],
-       nil,
-       (0...4),
-       (24...27)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/case_in_86.txt b/test/yarp/snapshots/seattlerb/case_in_86.txt
deleted file mode 100644
index c6287b9c3efb60..00000000000000
--- a/test/yarp/snapshots/seattlerb/case_in_86.txt
+++ /dev/null
@@ -1,33 +0,0 @@
-ProgramNode(0...43)(
-  [],
-  StatementsNode(0...43)(
-    [CaseNode(0...43)(
-       ArrayNode(5...13)(
-         [SymbolNode(6...8)((6...7), (7...8), nil, "a"),
-          SymbolNode(10...12)((10...11), (11...12), nil, "b")],
-         (5...6),
-         (12...13)
-       ),
-       [InNode(14...39)(
-          ArrayPatternNode(17...30)(
-            nil,
-            [ConstantPathNode(17...27)(
-               nil,
-               ConstantReadNode(19...27)(:NilClass),
-               (17...19)
-             )],
-            SplatNode(29...30)((29...30), nil),
-            [],
-            nil,
-            nil
-          ),
-          StatementsNode(36...39)([NilNode(36...39)()]),
-          (14...16),
-          (31...35)
-        )],
-       nil,
-       (0...4),
-       (40...43)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/case_in_86_2.txt b/test/yarp/snapshots/seattlerb/case_in_86_2.txt
deleted file mode 100644
index 16fdad3d3c8c31..00000000000000
--- a/test/yarp/snapshots/seattlerb/case_in_86_2.txt
+++ /dev/null
@@ -1,33 +0,0 @@
-ProgramNode(0...43)(
-  [],
-  StatementsNode(0...43)(
-    [CaseNode(0...43)(
-       ArrayNode(5...13)(
-         [SymbolNode(6...8)((6...7), (7...8), nil, "a"),
-          SymbolNode(10...12)((10...11), (11...12), nil, "b")],
-         (5...6),
-         (12...13)
-       ),
-       [InNode(14...39)(
-          ArrayPatternNode(17...30)(
-            nil,
-            [],
-            SplatNode(17...18)((17...18), nil),
-            [ConstantPathNode(20...30)(
-               nil,
-               ConstantReadNode(22...30)(:NilClass),
-               (20...22)
-             )],
-            nil,
-            nil
-          ),
-          StatementsNode(36...39)([NilNode(36...39)()]),
-          (14...16),
-          (31...35)
-        )],
-       nil,
-       (0...4),
-       (40...43)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/case_in_array_pat_const.txt b/test/yarp/snapshots/seattlerb/case_in_array_pat_const.txt
deleted file mode 100644
index bf332c3d5d3ae6..00000000000000
--- a/test/yarp/snapshots/seattlerb/case_in_array_pat_const.txt
+++ /dev/null
@@ -1,26 +0,0 @@
-ProgramNode(0...24)(
-  [:c],
-  StatementsNode(0...24)(
-    [CaseNode(0...24)(
-       SymbolNode(5...7)((5...6), (6...7), nil, "a"),
-       [InNode(8...20)(
-          ArrayPatternNode(11...15)(
-            ConstantReadNode(11...12)(:B),
-            [LocalVariableTargetNode(13...14)(:c, 0)],
-            nil,
-            [],
-            (12...13),
-            (14...15)
-          ),
-          StatementsNode(18...20)(
-            [SymbolNode(18...20)((18...19), (19...20), nil, "d")]
-          ),
-          (8...10),
-          nil
-        )],
-       nil,
-       (0...4),
-       (21...24)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/case_in_array_pat_const2.txt b/test/yarp/snapshots/seattlerb/case_in_array_pat_const2.txt
deleted file mode 100644
index 382db335d54664..00000000000000
--- a/test/yarp/snapshots/seattlerb/case_in_array_pat_const2.txt
+++ /dev/null
@@ -1,30 +0,0 @@
-ProgramNode(0...27)(
-  [:d],
-  StatementsNode(0...27)(
-    [CaseNode(0...27)(
-       SymbolNode(5...7)((5...6), (6...7), nil, "a"),
-       [InNode(8...23)(
-          ArrayPatternNode(11...18)(
-            ConstantPathNode(11...15)(
-              ConstantReadNode(11...12)(:B),
-              ConstantReadNode(14...15)(:C),
-              (12...14)
-            ),
-            [LocalVariableTargetNode(16...17)(:d, 0)],
-            nil,
-            [],
-            (15...16),
-            (17...18)
-          ),
-          StatementsNode(21...23)(
-            [SymbolNode(21...23)((21...22), (22...23), nil, "e")]
-          ),
-          (8...10),
-          nil
-        )],
-       nil,
-       (0...4),
-       (24...27)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/case_in_array_pat_paren_assign.txt b/test/yarp/snapshots/seattlerb/case_in_array_pat_paren_assign.txt
deleted file mode 100644
index c2a74beaabb08c..00000000000000
--- a/test/yarp/snapshots/seattlerb/case_in_array_pat_paren_assign.txt
+++ /dev/null
@@ -1,30 +0,0 @@
-ProgramNode(0...29)(
-  [:d],
-  StatementsNode(0...29)(
-    [CaseNode(0...29)(
-       SymbolNode(5...7)((5...6), (6...7), nil, "a"),
-       [InNode(8...25)(
-          ArrayPatternNode(11...20)(
-            ConstantReadNode(11...12)(:B),
-            [CapturePatternNode(13...19)(
-               ConstantReadNode(13...14)(:C),
-               LocalVariableTargetNode(18...19)(:d, 0),
-               (15...17)
-             )],
-            nil,
-            [],
-            (12...13),
-            (19...20)
-          ),
-          StatementsNode(23...25)(
-            [SymbolNode(23...25)((23...24), (24...25), nil, "d")]
-          ),
-          (8...10),
-          nil
-        )],
-       nil,
-       (0...4),
-       (26...29)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/case_in_const.txt b/test/yarp/snapshots/seattlerb/case_in_const.txt
deleted file mode 100644
index b2312a5d7ad67f..00000000000000
--- a/test/yarp/snapshots/seattlerb/case_in_const.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-ProgramNode(0...28)(
-  [],
-  StatementsNode(0...28)(
-    [CaseNode(0...28)(
-       ConstantReadNode(5...10)(:Array),
-       [InNode(11...24)(
-          ConstantReadNode(14...19)(:Class),
-          StatementsNode(22...24)(
-            [SymbolNode(22...24)((22...23), (23...24), nil, "b")]
-          ),
-          (11...13),
-          nil
-        )],
-       nil,
-       (0...4),
-       (25...28)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/case_in_else.txt b/test/yarp/snapshots/seattlerb/case_in_else.txt
deleted file mode 100644
index edbcff9af85694..00000000000000
--- a/test/yarp/snapshots/seattlerb/case_in_else.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-ProgramNode(0...38)(
-  [],
-  StatementsNode(0...38)(
-    [CaseNode(0...38)(
-       ConstantReadNode(5...10)(:Array),
-       [InNode(11...24)(
-          ConstantReadNode(14...19)(:Class),
-          StatementsNode(22...24)(
-            [SymbolNode(22...24)((22...23), (23...24), nil, "b")]
-          ),
-          (11...13),
-          nil
-        )],
-       ElseNode(25...38)(
-         (25...29),
-         StatementsNode(32...34)(
-           [SymbolNode(32...34)((32...33), (33...34), nil, "c")]
-         ),
-         (35...38)
-       ),
-       (0...4),
-       (35...38)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/case_in_find.txt b/test/yarp/snapshots/seattlerb/case_in_find.txt
deleted file mode 100644
index 3c8e6442448236..00000000000000
--- a/test/yarp/snapshots/seattlerb/case_in_find.txt
+++ /dev/null
@@ -1,30 +0,0 @@
-ProgramNode(0...27)(
-  [:a, :b],
-  StatementsNode(0...27)(
-    [CaseNode(0...27)(
-       SymbolNode(5...7)((5...6), (6...7), nil, "a"),
-       [InNode(10...23)(
-          FindPatternNode(13...23)(
-            nil,
-            SplatNode(13...15)(
-              (13...14),
-              LocalVariableTargetNode(14...15)(:a, 0)
-            ),
-            [SymbolNode(17...19)((17...18), (18...19), nil, "+")],
-            SplatNode(21...23)(
-              (21...22),
-              LocalVariableTargetNode(22...23)(:b, 0)
-            ),
-            nil,
-            nil
-          ),
-          nil,
-          (10...12),
-          nil
-        )],
-       nil,
-       (0...4),
-       (24...27)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/case_in_find_array.txt b/test/yarp/snapshots/seattlerb/case_in_find_array.txt
deleted file mode 100644
index 616c8f864bc634..00000000000000
--- a/test/yarp/snapshots/seattlerb/case_in_find_array.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-ProgramNode(0...28)(
-  [:c],
-  StatementsNode(0...28)(
-    [CaseNode(0...28)(
-       SymbolNode(5...7)((5...6), (6...7), nil, "a"),
-       [InNode(8...24)(
-          FindPatternNode(11...24)(
-            nil,
-            SplatNode(12...13)((12...13), nil),
-            [SymbolNode(15...17)((15...16), (16...17), nil, "b"),
-             LocalVariableTargetNode(19...20)(:c, 0)],
-            SplatNode(22...23)((22...23), nil),
-            (11...12),
-            (23...24)
-          ),
-          nil,
-          (8...10),
-          nil
-        )],
-       nil,
-       (0...4),
-       (25...28)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/case_in_hash_pat.txt b/test/yarp/snapshots/seattlerb/case_in_hash_pat.txt
deleted file mode 100644
index b7c8e7eb823bf0..00000000000000
--- a/test/yarp/snapshots/seattlerb/case_in_hash_pat.txt
+++ /dev/null
@@ -1,34 +0,0 @@
-ProgramNode(0...43)(
-  [],
-  StatementsNode(0...43)(
-    [CaseNode(0...43)(
-       SymbolNode(5...7)((5...6), (6...7), nil, "a"),
-       [InNode(8...39)(
-          HashPatternNode(11...29)(
-            nil,
-            [AssocNode(13...19)(
-               SymbolNode(13...15)(nil, (13...14), (14...15), "b"),
-               StringNode(16...19)((16...17), (17...18), (18...19), "c"),
-               nil
-             ),
-             AssocNode(21...27)(
-               SymbolNode(21...23)(nil, (21...22), (22...23), "d"),
-               StringNode(24...27)((24...25), (25...26), (26...27), "e"),
-               nil
-             )],
-            nil,
-            (11...12),
-            (28...29)
-          ),
-          StatementsNode(37...39)(
-            [SymbolNode(37...39)((37...38), (38...39), nil, "f")]
-          ),
-          (8...10),
-          (30...34)
-        )],
-       nil,
-       (0...4),
-       (40...43)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/case_in_hash_pat_assign.txt b/test/yarp/snapshots/seattlerb/case_in_hash_pat_assign.txt
deleted file mode 100644
index bac4076d27c9db..00000000000000
--- a/test/yarp/snapshots/seattlerb/case_in_hash_pat_assign.txt
+++ /dev/null
@@ -1,43 +0,0 @@
-ProgramNode(0...56)(
-  [:x, :f],
-  StatementsNode(0...56)(
-    [CaseNode(0...56)(
-       SymbolNode(5...7)((5...6), (6...7), nil, "a"),
-       [InNode(8...52)(
-          HashPatternNode(11...42)(
-            nil,
-            [AssocNode(13...28)(
-               SymbolNode(13...15)(nil, (13...14), (14...15), "b"),
-               CapturePatternNode(16...28)(
-                 ConstantReadNode(16...23)(:Integer),
-                 LocalVariableTargetNode(27...28)(:x, 0),
-                 (24...26)
-               ),
-               nil
-             ),
-             AssocNode(30...36)(
-               SymbolNode(30...32)(nil, (30...31), (31...32), "d"),
-               StringNode(33...36)((33...34), (34...35), (35...36), "e"),
-               nil
-             ),
-             AssocNode(38...40)(
-               SymbolNode(38...40)(nil, (38...39), (39...40), "f"),
-               nil,
-               nil
-             )],
-            nil,
-            (11...12),
-            (41...42)
-          ),
-          StatementsNode(50...52)(
-            [SymbolNode(50...52)((50...51), (51...52), nil, "g")]
-          ),
-          (8...10),
-          (43...47)
-        )],
-       nil,
-       (0...4),
-       (53...56)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/case_in_hash_pat_paren_assign.txt b/test/yarp/snapshots/seattlerb/case_in_hash_pat_paren_assign.txt
deleted file mode 100644
index 352da8ab8bb602..00000000000000
--- a/test/yarp/snapshots/seattlerb/case_in_hash_pat_paren_assign.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-ProgramNode(0...28)(
-  [],
-  StatementsNode(0...28)(
-    [CaseNode(0...28)(
-       SymbolNode(5...7)((5...6), (6...7), nil, "a"),
-       [InNode(8...24)(
-          HashPatternNode(11...19)(
-            ConstantReadNode(11...12)(:B),
-            [AssocNode(13...18)(
-               SymbolNode(13...15)(nil, (13...14), (14...15), "a"),
-               IntegerNode(16...18)(),
-               nil
-             )],
-            nil,
-            (12...13),
-            (18...19)
-          ),
-          StatementsNode(22...24)(
-            [SymbolNode(22...24)((22...23), (23...24), nil, "d")]
-          ),
-          (8...10),
-          nil
-        )],
-       nil,
-       (0...4),
-       (25...28)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/case_in_hash_pat_paren_true.txt b/test/yarp/snapshots/seattlerb/case_in_hash_pat_paren_true.txt
deleted file mode 100644
index c1bc104eff00e7..00000000000000
--- a/test/yarp/snapshots/seattlerb/case_in_hash_pat_paren_true.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-ProgramNode(0...32)(
-  [],
-  StatementsNode(0...32)(
-    [CaseNode(0...32)(
-       SymbolNode(5...7)((5...6), (6...7), nil, "a"),
-       [InNode(8...28)(
-          HashPatternNode(11...18)(
-            nil,
-            [AssocNode(11...18)(
-               SymbolNode(11...13)(nil, (11...12), (12...13), "b"),
-               TrueNode(14...18)(),
-               nil
-             )],
-            nil,
-            nil,
-            nil
-          ),
-          StatementsNode(26...28)(
-            [SymbolNode(26...28)((26...27), (27...28), nil, "c")]
-          ),
-          (8...10),
-          (19...23)
-        )],
-       nil,
-       (0...4),
-       (29...32)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/case_in_hash_pat_rest.txt b/test/yarp/snapshots/seattlerb/case_in_hash_pat_rest.txt
deleted file mode 100644
index 9998de3cfe6b15..00000000000000
--- a/test/yarp/snapshots/seattlerb/case_in_hash_pat_rest.txt
+++ /dev/null
@@ -1,33 +0,0 @@
-ProgramNode(0...35)(
-  [:c, :rest],
-  StatementsNode(0...35)(
-    [CaseNode(0...35)(
-       SymbolNode(5...7)((5...6), (6...7), nil, "a"),
-       [InNode(8...31)(
-          HashPatternNode(11...23)(
-            nil,
-            [AssocNode(11...15)(
-               SymbolNode(11...13)(nil, (11...12), (12...13), "b"),
-               LocalVariableTargetNode(14...15)(:c, 0),
-               nil
-             ),
-             AssocSplatNode(17...23)(
-               LocalVariableTargetNode(19...23)(:rest, 0),
-               (17...19)
-             )],
-            nil,
-            nil,
-            nil
-          ),
-          StatementsNode(29...31)(
-            [SymbolNode(29...31)((29...30), (30...31), nil, "d")]
-          ),
-          (8...10),
-          (24...28)
-        )],
-       nil,
-       (0...4),
-       (32...35)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/case_in_hash_pat_rest_solo.txt b/test/yarp/snapshots/seattlerb/case_in_hash_pat_rest_solo.txt
deleted file mode 100644
index 7d6634c7f8d3d6..00000000000000
--- a/test/yarp/snapshots/seattlerb/case_in_hash_pat_rest_solo.txt
+++ /dev/null
@@ -1,28 +0,0 @@
-ProgramNode(0...29)(
-  [:rest],
-  StatementsNode(0...29)(
-    [CaseNode(0...29)(
-       SymbolNode(5...7)((5...6), (6...7), nil, "a"),
-       [InNode(8...25)(
-          HashPatternNode(11...17)(
-            nil,
-            [AssocSplatNode(11...17)(
-               LocalVariableTargetNode(13...17)(:rest, 0),
-               (11...13)
-             )],
-            nil,
-            nil,
-            nil
-          ),
-          StatementsNode(23...25)(
-            [SymbolNode(23...25)((23...24), (24...25), nil, "d")]
-          ),
-          (8...10),
-          (18...22)
-        )],
-       nil,
-       (0...4),
-       (26...29)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/case_in_if_unless_post_mod.txt b/test/yarp/snapshots/seattlerb/case_in_if_unless_post_mod.txt
deleted file mode 100644
index d4869db8ede315..00000000000000
--- a/test/yarp/snapshots/seattlerb/case_in_if_unless_post_mod.txt
+++ /dev/null
@@ -1,39 +0,0 @@
-ProgramNode(0...52)(
-  [],
-  StatementsNode(0...52)(
-    [CaseNode(0...52)(
-       SymbolNode(5...7)((5...6), (6...7), nil, "a"),
-       [InNode(8...25)(
-          IfNode(11...20)(
-            (13...15),
-            TrueNode(16...20)(),
-            StatementsNode(11...12)([ConstantReadNode(11...12)(:A)]),
-            nil,
-            nil
-          ),
-          StatementsNode(23...25)(
-            [SymbolNode(23...25)((23...24), (24...25), nil, "C")]
-          ),
-          (8...10),
-          nil
-        ),
-        InNode(26...48)(
-          UnlessNode(29...43)(
-            (31...37),
-            FalseNode(38...43)(),
-            StatementsNode(29...30)([ConstantReadNode(29...30)(:D)]),
-            nil,
-            nil
-          ),
-          StatementsNode(46...48)(
-            [SymbolNode(46...48)((46...47), (47...48), nil, "E")]
-          ),
-          (26...28),
-          nil
-        )],
-       nil,
-       (0...4),
-       (49...52)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/case_in_multiple.txt b/test/yarp/snapshots/seattlerb/case_in_multiple.txt
deleted file mode 100644
index 2210570cb9eb37..00000000000000
--- a/test/yarp/snapshots/seattlerb/case_in_multiple.txt
+++ /dev/null
@@ -1,35 +0,0 @@
-ProgramNode(0...37)(
-  [],
-  StatementsNode(0...37)(
-    [CaseNode(0...37)(
-       SymbolNode(5...7)((5...6), (6...7), nil, "a"),
-       [InNode(8...20)(
-          ConstantPathNode(11...15)(
-            ConstantReadNode(11...12)(:A),
-            ConstantReadNode(14...15)(:B),
-            (12...14)
-          ),
-          StatementsNode(18...20)(
-            [SymbolNode(18...20)((18...19), (19...20), nil, "C")]
-          ),
-          (8...10),
-          nil
-        ),
-        InNode(21...33)(
-          ConstantPathNode(24...28)(
-            ConstantReadNode(24...25)(:D),
-            ConstantReadNode(27...28)(:E),
-            (25...27)
-          ),
-          StatementsNode(31...33)(
-            [SymbolNode(31...33)((31...32), (32...33), nil, "F")]
-          ),
-          (21...23),
-          nil
-        )],
-       nil,
-       (0...4),
-       (34...37)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/case_in_or.txt b/test/yarp/snapshots/seattlerb/case_in_or.txt
deleted file mode 100644
index 2a5ec39441819f..00000000000000
--- a/test/yarp/snapshots/seattlerb/case_in_or.txt
+++ /dev/null
@@ -1,23 +0,0 @@
-ProgramNode(0...25)(
-  [],
-  StatementsNode(0...25)(
-    [CaseNode(0...25)(
-       SymbolNode(5...7)((5...6), (6...7), nil, "a"),
-       [InNode(8...21)(
-          AlternationPatternNode(11...16)(
-            ConstantReadNode(11...12)(:B),
-            ConstantReadNode(15...16)(:C),
-            (13...14)
-          ),
-          StatementsNode(19...21)(
-            [SymbolNode(19...21)((19...20), (20...21), nil, "d")]
-          ),
-          (8...10),
-          nil
-        )],
-       nil,
-       (0...4),
-       (22...25)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/class_comments.txt b/test/yarp/snapshots/seattlerb/class_comments.txt
deleted file mode 100644
index 905c5914a2f19b..00000000000000
--- a/test/yarp/snapshots/seattlerb/class_comments.txt
+++ /dev/null
@@ -1,30 +0,0 @@
-ProgramNode(19...71)(
-  [],
-  StatementsNode(19...71)(
-    [ClassNode(19...71)(
-       [],
-       (19...24),
-       ConstantReadNode(25...26)(:X),
-       nil,
-       nil,
-       StatementsNode(40...67)(
-         [DefNode(40...67)(
-            (44...48),
-            nil,
-            nil,
-            nil,
-            [],
-            (40...43),
-            nil,
-            nil,
-            nil,
-            nil,
-            (64...67)
-          )]
-       ),
-       (68...71),
-       :X,
-       :X
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/cond_unary_minus.txt b/test/yarp/snapshots/seattlerb/cond_unary_minus.txt
deleted file mode 100644
index d4453066740ebd..00000000000000
--- a/test/yarp/snapshots/seattlerb/cond_unary_minus.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-ProgramNode(0...10)(
-  [],
-  StatementsNode(0...10)(
-    [IfNode(0...10)((0...2), IntegerNode(3...5)(), nil, nil, (7...10))]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/const_2_op_asgn_or2.txt b/test/yarp/snapshots/seattlerb/const_2_op_asgn_or2.txt
deleted file mode 100644
index ea0d0bc196524b..00000000000000
--- a/test/yarp/snapshots/seattlerb/const_2_op_asgn_or2.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-ProgramNode(0...12)(
-  [],
-  StatementsNode(0...12)(
-    [ConstantPathOrWriteNode(0...12)(
-       ConstantPathNode(0...6)(
-         ConstantPathNode(0...3)(nil, ConstantReadNode(2...3)(:X), (0...2)),
-         ConstantReadNode(5...6)(:Y),
-         (3...5)
-       ),
-       (7...10),
-       IntegerNode(11...12)()
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/const_3_op_asgn_or.txt b/test/yarp/snapshots/seattlerb/const_3_op_asgn_or.txt
deleted file mode 100644
index 99bbb930cf882d..00000000000000
--- a/test/yarp/snapshots/seattlerb/const_3_op_asgn_or.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-ProgramNode(0...9)(
-  [],
-  StatementsNode(0...9)(
-    [ConstantPathOrWriteNode(0...9)(
-       ConstantPathNode(0...3)(nil, ConstantReadNode(2...3)(:X), (0...2)),
-       (4...7),
-       IntegerNode(8...9)()
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/const_op_asgn_and1.txt b/test/yarp/snapshots/seattlerb/const_op_asgn_and1.txt
deleted file mode 100644
index 53fed283e1d288..00000000000000
--- a/test/yarp/snapshots/seattlerb/const_op_asgn_and1.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-ProgramNode(0...8)(
-  [],
-  StatementsNode(0...8)(
-    [ConstantPathOperatorWriteNode(0...8)(
-       ConstantPathNode(0...3)(nil, ConstantReadNode(2...3)(:X), (0...2)),
-       (4...6),
-       IntegerNode(7...8)(),
-       :&
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/const_op_asgn_and2.txt b/test/yarp/snapshots/seattlerb/const_op_asgn_and2.txt
deleted file mode 100644
index cd13c1f5a73e13..00000000000000
--- a/test/yarp/snapshots/seattlerb/const_op_asgn_and2.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-ProgramNode(0...9)(
-  [],
-  StatementsNode(0...9)(
-    [ConstantPathAndWriteNode(0...9)(
-       ConstantPathNode(0...3)(nil, ConstantReadNode(2...3)(:X), (0...2)),
-       (4...7),
-       IntegerNode(8...9)()
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/const_op_asgn_or.txt b/test/yarp/snapshots/seattlerb/const_op_asgn_or.txt
deleted file mode 100644
index 1b8fdf986e5710..00000000000000
--- a/test/yarp/snapshots/seattlerb/const_op_asgn_or.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-ProgramNode(0...10)(
-  [],
-  StatementsNode(0...10)(
-    [ConstantPathOrWriteNode(0...10)(
-       ConstantPathNode(0...4)(
-         ConstantReadNode(0...1)(:X),
-         ConstantReadNode(3...4)(:Y),
-         (1...3)
-       ),
-       (5...8),
-       IntegerNode(9...10)()
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/dasgn_icky2.txt b/test/yarp/snapshots/seattlerb/dasgn_icky2.txt
deleted file mode 100644
index d37ac900b2630f..00000000000000
--- a/test/yarp/snapshots/seattlerb/dasgn_icky2.txt
+++ /dev/null
@@ -1,47 +0,0 @@
-ProgramNode(0...76)(
-  [],
-  StatementsNode(0...76)(
-    [CallNode(0...76)(
-       nil,
-       nil,
-       (0...1),
-       nil,
-       nil,
-       nil,
-       BlockNode(2...76)(
-         [:v],
-         nil,
-         StatementsNode(7...72)(
-           [LocalVariableWriteNode(7...14)(
-              :v,
-              0,
-              (7...8),
-              NilNode(11...14)(),
-              (9...10)
-            ),
-            BeginNode(17...72)(
-              (17...22),
-              StatementsNode(27...32)(
-                [YieldNode(27...32)((27...32), nil, nil, nil)]
-              ),
-              RescueNode(35...66)(
-                (35...41),
-                [ConstantReadNode(42...51)(:Exception)],
-                (52...54),
-                LocalVariableTargetNode(55...56)(:v, 0),
-                StatementsNode(61...66)([BreakNode(61...66)(nil, (61...66))]),
-                nil
-              ),
-              nil,
-              nil,
-              (69...72)
-            )]
-         ),
-         (2...4),
-         (73...76)
-       ),
-       0,
-       "a"
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/defined_eh_parens.txt b/test/yarp/snapshots/seattlerb/defined_eh_parens.txt
deleted file mode 100644
index 5aedca1fbb5c68..00000000000000
--- a/test/yarp/snapshots/seattlerb/defined_eh_parens.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-ProgramNode(0...12)(
-  [],
-  StatementsNode(0...12)(
-    [DefinedNode(0...12)((8...9), IntegerNode(9...11)(), (11...12), (0...8))]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/defn_arg_asplat_arg.txt b/test/yarp/snapshots/seattlerb/defn_arg_asplat_arg.txt
deleted file mode 100644
index 6e7e9478f14181..00000000000000
--- a/test/yarp/snapshots/seattlerb/defn_arg_asplat_arg.txt
+++ /dev/null
@@ -1,26 +0,0 @@
-ProgramNode(0...29)(
-  [],
-  StatementsNode(0...29)(
-    [DefNode(0...29)(
-       (4...8),
-       nil,
-       ParametersNode(9...24)(
-         [RequiredParameterNode(9...15)(:interp)],
-         [],
-         [RequiredParameterNode(20...24)(:args)],
-         RestParameterNode(17...18)((17...18), nil),
-         [],
-         nil,
-         nil
-       ),
-       nil,
-       [:interp, :*, :args],
-       (0...3),
-       nil,
-       (8...9),
-       (24...25),
-       nil,
-       (26...29)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/defn_arg_forward_args.txt b/test/yarp/snapshots/seattlerb/defn_arg_forward_args.txt
deleted file mode 100644
index c3e8e7d010e494..00000000000000
--- a/test/yarp/snapshots/seattlerb/defn_arg_forward_args.txt
+++ /dev/null
@@ -1,41 +0,0 @@
-ProgramNode(0...29)(
-  [],
-  StatementsNode(0...29)(
-    [DefNode(0...29)(
-       (4...5),
-       nil,
-       ParametersNode(6...12)(
-         [RequiredParameterNode(6...7)(:x)],
-         [],
-         [],
-         nil,
-         [],
-         ForwardingParameterNode(9...12)(),
-         nil
-       ),
-       StatementsNode(15...24)(
-         [CallNode(15...24)(
-            nil,
-            nil,
-            (15...16),
-            (16...17),
-            ArgumentsNode(17...23)(
-              [LocalVariableReadNode(17...18)(:x, 0),
-               ForwardingArgumentsNode(20...23)()]
-            ),
-            (23...24),
-            nil,
-            0,
-            "b"
-          )]
-       ),
-       [:x, :"..."],
-       (0...3),
-       nil,
-       (5...6),
-       (12...13),
-       nil,
-       (26...29)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/defn_args_forward_args.txt b/test/yarp/snapshots/seattlerb/defn_args_forward_args.txt
deleted file mode 100644
index c14a1868edcdfe..00000000000000
--- a/test/yarp/snapshots/seattlerb/defn_args_forward_args.txt
+++ /dev/null
@@ -1,44 +0,0 @@
-ProgramNode(0...41)(
-  [],
-  StatementsNode(0...41)(
-    [DefNode(0...41)(
-       (4...5),
-       nil,
-       ParametersNode(6...18)(
-         [RequiredParameterNode(6...7)(:x),
-          RequiredParameterNode(9...10)(:y),
-          RequiredParameterNode(12...13)(:z)],
-         [],
-         [],
-         nil,
-         [],
-         ForwardingParameterNode(15...18)(),
-         nil
-       ),
-       StatementsNode(21...36)(
-         [CallNode(21...36)(
-            nil,
-            nil,
-            (21...22),
-            (22...23),
-            ArgumentsNode(23...35)(
-              [SymbolNode(23...27)((23...24), (24...27), nil, "get"),
-               LocalVariableReadNode(29...30)(:z, 0),
-               ForwardingArgumentsNode(32...35)()]
-            ),
-            (35...36),
-            nil,
-            0,
-            "b"
-          )]
-       ),
-       [:x, :y, :z, :"..."],
-       (0...3),
-       nil,
-       (5...6),
-       (18...19),
-       nil,
-       (38...41)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/defn_comments.txt b/test/yarp/snapshots/seattlerb/defn_comments.txt
deleted file mode 100644
index 1ff1c127bd0550..00000000000000
--- a/test/yarp/snapshots/seattlerb/defn_comments.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-ProgramNode(19...31)(
-  [],
-  StatementsNode(19...31)(
-    [DefNode(19...31)(
-       (23...27),
-       nil,
-       nil,
-       nil,
-       [],
-       (19...22),
-       nil,
-       nil,
-       nil,
-       nil,
-       (28...31)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/defn_endless_command.txt b/test/yarp/snapshots/seattlerb/defn_endless_command.txt
deleted file mode 100644
index 7e1989cf6fbc1c..00000000000000
--- a/test/yarp/snapshots/seattlerb/defn_endless_command.txt
+++ /dev/null
@@ -1,30 +0,0 @@
-ProgramNode(0...33)(
-  [],
-  StatementsNode(0...33)(
-    [DefNode(0...33)(
-       (4...15),
-       nil,
-       nil,
-       StatementsNode(18...33)(
-         [CallNode(18...33)(
-            nil,
-            nil,
-            (18...30),
-            nil,
-            ArgumentsNode(31...33)([IntegerNode(31...33)()]),
-            nil,
-            nil,
-            0,
-            "other_method"
-          )]
-       ),
-       [],
-       (0...3),
-       nil,
-       nil,
-       nil,
-       (16...17),
-       nil
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/defn_endless_command_rescue.txt b/test/yarp/snapshots/seattlerb/defn_endless_command_rescue.txt
deleted file mode 100644
index bed7b31b5a41b4..00000000000000
--- a/test/yarp/snapshots/seattlerb/defn_endless_command_rescue.txt
+++ /dev/null
@@ -1,36 +0,0 @@
-ProgramNode(0...43)(
-  [],
-  StatementsNode(0...43)(
-    [DefNode(0...43)(
-       (4...15),
-       nil,
-       nil,
-       StatementsNode(18...43)(
-         [CallNode(18...43)(
-            nil,
-            nil,
-            (18...30),
-            nil,
-            ArgumentsNode(31...43)(
-              [RescueModifierNode(31...43)(
-                 IntegerNode(31...33)(),
-                 (34...40),
-                 IntegerNode(41...43)()
-               )]
-            ),
-            nil,
-            nil,
-            0,
-            "other_method"
-          )]
-       ),
-       [],
-       (0...3),
-       nil,
-       nil,
-       nil,
-       (16...17),
-       nil
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/defn_forward_args.txt b/test/yarp/snapshots/seattlerb/defn_forward_args.txt
deleted file mode 100644
index 0fbe6f0d709460..00000000000000
--- a/test/yarp/snapshots/seattlerb/defn_forward_args.txt
+++ /dev/null
@@ -1,38 +0,0 @@
-ProgramNode(0...23)(
-  [],
-  StatementsNode(0...23)(
-    [DefNode(0...23)(
-       (4...5),
-       nil,
-       ParametersNode(6...9)(
-         [],
-         [],
-         [],
-         nil,
-         [],
-         ForwardingParameterNode(6...9)(),
-         nil
-       ),
-       StatementsNode(12...18)(
-         [CallNode(12...18)(
-            nil,
-            nil,
-            (12...13),
-            (13...14),
-            ArgumentsNode(14...17)([ForwardingArgumentsNode(14...17)()]),
-            (17...18),
-            nil,
-            0,
-            "b"
-          )]
-       ),
-       [:"..."],
-       (0...3),
-       nil,
-       (5...6),
-       (9...10),
-       nil,
-       (20...23)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/defn_forward_args__no_parens.txt b/test/yarp/snapshots/seattlerb/defn_forward_args__no_parens.txt
deleted file mode 100644
index 14d94bc244a9cc..00000000000000
--- a/test/yarp/snapshots/seattlerb/defn_forward_args__no_parens.txt
+++ /dev/null
@@ -1,38 +0,0 @@
-ProgramNode(0...22)(
-  [],
-  StatementsNode(0...22)(
-    [DefNode(0...22)(
-       (4...5),
-       nil,
-       ParametersNode(6...9)(
-         [],
-         [],
-         [],
-         nil,
-         [],
-         ForwardingParameterNode(6...9)(),
-         nil
-       ),
-       StatementsNode(12...18)(
-         [CallNode(12...18)(
-            nil,
-            nil,
-            (12...13),
-            (13...14),
-            ArgumentsNode(14...17)([ForwardingArgumentsNode(14...17)()]),
-            (17...18),
-            nil,
-            0,
-            "m"
-          )]
-       ),
-       [:"..."],
-       (0...3),
-       nil,
-       nil,
-       nil,
-       nil,
-       (19...22)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/defn_kwarg_env.txt b/test/yarp/snapshots/seattlerb/defn_kwarg_env.txt
deleted file mode 100644
index 5872579ee6ef8b..00000000000000
--- a/test/yarp/snapshots/seattlerb/defn_kwarg_env.txt
+++ /dev/null
@@ -1,45 +0,0 @@
-ProgramNode(0...45)(
-  [],
-  StatementsNode(0...45)(
-    [DefNode(0...45)(
-       (4...8),
-       nil,
-       ParametersNode(9...18)(
-         [],
-         [],
-         [],
-         nil,
-         [],
-         KeywordRestParameterNode(9...18)((9...11), (11...18)),
-         nil
-       ),
-       StatementsNode(20...41)(
-         [CallNode(20...41)(
-            nil,
-            nil,
-            (20...30),
-            (30...31),
-            ArgumentsNode(31...40)(
-              [KeywordHashNode(31...40)(
-                 [AssocSplatNode(31...40)(
-                    LocalVariableReadNode(33...40)(:testing, 0),
-                    (31...33)
-                  )]
-               )]
-            ),
-            (40...41),
-            nil,
-            0,
-            "test_splat"
-          )]
-       ),
-       [:testing],
-       (0...3),
-       nil,
-       (8...9),
-       (18...19),
-       nil,
-       (42...45)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/defn_kwarg_kwarg.txt b/test/yarp/snapshots/seattlerb/defn_kwarg_kwarg.txt
deleted file mode 100644
index 6dcd4aaf2bd2f7..00000000000000
--- a/test/yarp/snapshots/seattlerb/defn_kwarg_kwarg.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-ProgramNode(0...24)(
-  [],
-  StatementsNode(0...24)(
-    [DefNode(0...24)(
-       (4...5),
-       nil,
-       ParametersNode(6...19)(
-         [RequiredParameterNode(6...7)(:a)],
-         [],
-         [],
-         nil,
-         [KeywordParameterNode(9...13)((9...11), IntegerNode(12...13)()),
-          KeywordParameterNode(15...19)((15...17), IntegerNode(18...19)())],
-         nil,
-         nil
-       ),
-       nil,
-       [:a, :b, :c],
-       (0...3),
-       nil,
-       (5...6),
-       (19...20),
-       nil,
-       (21...24)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/defn_kwarg_kwsplat.txt b/test/yarp/snapshots/seattlerb/defn_kwarg_kwsplat.txt
deleted file mode 100644
index 5bc6490a6f62d1..00000000000000
--- a/test/yarp/snapshots/seattlerb/defn_kwarg_kwsplat.txt
+++ /dev/null
@@ -1,26 +0,0 @@
-ProgramNode(0...20)(
-  [],
-  StatementsNode(0...20)(
-    [DefNode(0...20)(
-       (4...5),
-       nil,
-       ParametersNode(6...15)(
-         [],
-         [],
-         [],
-         nil,
-         [KeywordParameterNode(6...10)((6...8), IntegerNode(9...10)())],
-         KeywordRestParameterNode(12...15)((12...14), (14...15)),
-         nil
-       ),
-       nil,
-       [:b, :c],
-       (0...3),
-       nil,
-       (5...6),
-       (15...16),
-       nil,
-       (17...20)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/defn_kwarg_kwsplat_anon.txt b/test/yarp/snapshots/seattlerb/defn_kwarg_kwsplat_anon.txt
deleted file mode 100644
index 3dfb42f6d7525a..00000000000000
--- a/test/yarp/snapshots/seattlerb/defn_kwarg_kwsplat_anon.txt
+++ /dev/null
@@ -1,26 +0,0 @@
-ProgramNode(0...19)(
-  [],
-  StatementsNode(0...19)(
-    [DefNode(0...19)(
-       (4...5),
-       nil,
-       ParametersNode(6...14)(
-         [],
-         [],
-         [],
-         nil,
-         [KeywordParameterNode(6...10)((6...8), IntegerNode(9...10)())],
-         KeywordRestParameterNode(12...14)((12...14), nil),
-         nil
-       ),
-       nil,
-       [:b, :**],
-       (0...3),
-       nil,
-       (5...6),
-       (14...15),
-       nil,
-       (16...19)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/defn_kwarg_lvar.txt b/test/yarp/snapshots/seattlerb/defn_kwarg_lvar.txt
deleted file mode 100644
index f4f6964c58327a..00000000000000
--- a/test/yarp/snapshots/seattlerb/defn_kwarg_lvar.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-ProgramNode(0...26)(
-  [],
-  StatementsNode(0...26)(
-    [DefNode(0...26)(
-       (4...7),
-       nil,
-       ParametersNode(8...16)(
-         [],
-         [],
-         [],
-         nil,
-         [KeywordParameterNode(8...16)(
-            (8...11),
-            SymbolNode(12...16)((12...13), (13...16), nil, "val")
-          )],
-         nil,
-         nil
-       ),
-       StatementsNode(19...21)([LocalVariableReadNode(19...21)(:kw, 0)]),
-       [:kw],
-       (0...3),
-       nil,
-       (7...8),
-       (16...17),
-       nil,
-       (23...26)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/defn_kwarg_no_parens.txt b/test/yarp/snapshots/seattlerb/defn_kwarg_no_parens.txt
deleted file mode 100644
index b0649973accb64..00000000000000
--- a/test/yarp/snapshots/seattlerb/defn_kwarg_no_parens.txt
+++ /dev/null
@@ -1,26 +0,0 @@
-ProgramNode(0...14)(
-  [],
-  StatementsNode(0...14)(
-    [DefNode(0...14)(
-       (4...5),
-       nil,
-       ParametersNode(6...10)(
-         [],
-         [],
-         [],
-         nil,
-         [KeywordParameterNode(6...10)((6...8), IntegerNode(9...10)())],
-         nil,
-         nil
-       ),
-       nil,
-       [:a],
-       (0...3),
-       nil,
-       nil,
-       nil,
-       nil,
-       (11...14)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/defn_kwarg_val.txt b/test/yarp/snapshots/seattlerb/defn_kwarg_val.txt
deleted file mode 100644
index dfa99b70664770..00000000000000
--- a/test/yarp/snapshots/seattlerb/defn_kwarg_val.txt
+++ /dev/null
@@ -1,26 +0,0 @@
-ProgramNode(0...17)(
-  [],
-  StatementsNode(0...17)(
-    [DefNode(0...17)(
-       (4...5),
-       nil,
-       ParametersNode(6...12)(
-         [RequiredParameterNode(6...7)(:a)],
-         [],
-         [],
-         nil,
-         [KeywordParameterNode(9...12)((9...11), IntegerNode(11...12)())],
-         nil,
-         nil
-       ),
-       nil,
-       [:a, :b],
-       (0...3),
-       nil,
-       (5...6),
-       (12...13),
-       nil,
-       (14...17)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/defn_no_kwargs.txt b/test/yarp/snapshots/seattlerb/defn_no_kwargs.txt
deleted file mode 100644
index a5046e04e41b66..00000000000000
--- a/test/yarp/snapshots/seattlerb/defn_no_kwargs.txt
+++ /dev/null
@@ -1,26 +0,0 @@
-ProgramNode(0...17)(
-  [],
-  StatementsNode(0...17)(
-    [DefNode(0...17)(
-       (4...5),
-       nil,
-       ParametersNode(6...11)(
-         [],
-         [],
-         [],
-         nil,
-         [],
-         NoKeywordsParameterNode(6...11)((6...8), (8...11)),
-         nil
-       ),
-       nil,
-       [],
-       (0...3),
-       nil,
-       (5...6),
-       (11...12),
-       nil,
-       (14...17)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/defn_oneliner.txt b/test/yarp/snapshots/seattlerb/defn_oneliner.txt
deleted file mode 100644
index 053400c564c6e2..00000000000000
--- a/test/yarp/snapshots/seattlerb/defn_oneliner.txt
+++ /dev/null
@@ -1,38 +0,0 @@
-ProgramNode(0...27)(
-  [],
-  StatementsNode(0...27)(
-    [DefNode(0...27)(
-       (4...8),
-       nil,
-       ParametersNode(9...12)(
-         [RequiredParameterNode(9...12)(:cmd)],
-         [],
-         [],
-         nil,
-         [],
-         nil,
-         nil
-       ),
-       StatementsNode(16...27)(
-         [CallNode(16...27)(
-            nil,
-            nil,
-            (16...22),
-            (22...23),
-            ArgumentsNode(23...26)([LocalVariableReadNode(23...26)(:cmd, 0)]),
-            (26...27),
-            nil,
-            0,
-            "system"
-          )]
-       ),
-       [:cmd],
-       (0...3),
-       nil,
-       (8...9),
-       (12...13),
-       (14...15),
-       nil
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/defn_oneliner_eq2.txt b/test/yarp/snapshots/seattlerb/defn_oneliner_eq2.txt
deleted file mode 100644
index bbbdc17368d7b9..00000000000000
--- a/test/yarp/snapshots/seattlerb/defn_oneliner_eq2.txt
+++ /dev/null
@@ -1,38 +0,0 @@
-ProgramNode(0...28)(
-  [],
-  StatementsNode(0...28)(
-    [ClassNode(0...28)(
-       [],
-       (0...5),
-       ConstantReadNode(6...7)(:X),
-       nil,
-       nil,
-       StatementsNode(10...24)(
-         [DefNode(10...24)(
-            (14...16),
-            nil,
-            ParametersNode(17...18)(
-              [RequiredParameterNode(17...18)(:o)],
-              [],
-              [],
-              nil,
-              [],
-              nil,
-              nil
-            ),
-            StatementsNode(22...24)([IntegerNode(22...24)()]),
-            [:o],
-            (10...13),
-            nil,
-            (16...17),
-            (18...19),
-            (20...21),
-            nil
-          )]
-       ),
-       (25...28),
-       :X,
-       :X
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/defn_oneliner_noargs.txt b/test/yarp/snapshots/seattlerb/defn_oneliner_noargs.txt
deleted file mode 100644
index 683c405b1853f0..00000000000000
--- a/test/yarp/snapshots/seattlerb/defn_oneliner_noargs.txt
+++ /dev/null
@@ -1,30 +0,0 @@
-ProgramNode(0...17)(
-  [],
-  StatementsNode(0...17)(
-    [DefNode(0...17)(
-       (4...8),
-       nil,
-       nil,
-       StatementsNode(11...17)(
-         [CallNode(11...17)(
-            nil,
-            nil,
-            (11...17),
-            nil,
-            nil,
-            nil,
-            nil,
-            2,
-            "system"
-          )]
-       ),
-       [],
-       (0...3),
-       nil,
-       nil,
-       nil,
-       (9...10),
-       nil
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/defn_oneliner_noargs_parentheses.txt b/test/yarp/snapshots/seattlerb/defn_oneliner_noargs_parentheses.txt
deleted file mode 100644
index bbf7fd2dcaebd9..00000000000000
--- a/test/yarp/snapshots/seattlerb/defn_oneliner_noargs_parentheses.txt
+++ /dev/null
@@ -1,30 +0,0 @@
-ProgramNode(0...19)(
-  [],
-  StatementsNode(0...19)(
-    [DefNode(0...19)(
-       (4...8),
-       nil,
-       nil,
-       StatementsNode(13...19)(
-         [CallNode(13...19)(
-            nil,
-            nil,
-            (13...19),
-            nil,
-            nil,
-            nil,
-            nil,
-            2,
-            "system"
-          )]
-       ),
-       [],
-       (0...3),
-       nil,
-       (8...9),
-       (9...10),
-       (11...12),
-       nil
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/defn_oneliner_rescue.txt b/test/yarp/snapshots/seattlerb/defn_oneliner_rescue.txt
deleted file mode 100644
index 5032c52203f98c..00000000000000
--- a/test/yarp/snapshots/seattlerb/defn_oneliner_rescue.txt
+++ /dev/null
@@ -1,132 +0,0 @@
-ProgramNode(0...130)(
-  [],
-  StatementsNode(0...130)(
-    [DefNode(0...44)(
-       (4...8),
-       nil,
-       ParametersNode(9...12)(
-         [RequiredParameterNode(9...12)(:cmd)],
-         [],
-         [],
-         nil,
-         [],
-         nil,
-         nil
-       ),
-       BeginNode(16...44)(
-         nil,
-         StatementsNode(16...27)(
-           [CallNode(16...27)(
-              nil,
-              nil,
-              (16...22),
-              (22...23),
-              ArgumentsNode(23...26)(
-                [LocalVariableReadNode(23...26)(:cmd, 0)]
-              ),
-              (26...27),
-              nil,
-              0,
-              "system"
-            )]
-         ),
-         RescueNode(28...40)(
-           (28...34),
-           [],
-           nil,
-           nil,
-           StatementsNode(37...40)([NilNode(37...40)()]),
-           nil
-         ),
-         nil,
-         nil,
-         (41...44)
-       ),
-       [:cmd],
-       (0...3),
-       nil,
-       (8...9),
-       (12...13),
-       nil,
-       (41...44)
-     ),
-     DefNode(47...89)(
-       (51...55),
-       nil,
-       ParametersNode(56...59)(
-         [RequiredParameterNode(56...59)(:cmd)],
-         [],
-         [],
-         nil,
-         [],
-         nil,
-         nil
-       ),
-       StatementsNode(63...85)(
-         [RescueModifierNode(63...85)(
-            CallNode(63...74)(
-              nil,
-              nil,
-              (63...69),
-              (69...70),
-              ArgumentsNode(70...73)(
-                [LocalVariableReadNode(70...73)(:cmd, 0)]
-              ),
-              (73...74),
-              nil,
-              0,
-              "system"
-            ),
-            (75...81),
-            NilNode(82...85)()
-          )]
-       ),
-       [:cmd],
-       (47...50),
-       nil,
-       (55...56),
-       (59...60),
-       nil,
-       (86...89)
-     ),
-     DefNode(92...130)(
-       (96...100),
-       nil,
-       ParametersNode(101...104)(
-         [RequiredParameterNode(101...104)(:cmd)],
-         [],
-         [],
-         nil,
-         [],
-         nil,
-         nil
-       ),
-       StatementsNode(108...130)(
-         [RescueModifierNode(108...130)(
-            CallNode(108...119)(
-              nil,
-              nil,
-              (108...114),
-              (114...115),
-              ArgumentsNode(115...118)(
-                [LocalVariableReadNode(115...118)(:cmd, 0)]
-              ),
-              (118...119),
-              nil,
-              0,
-              "system"
-            ),
-            (120...126),
-            NilNode(127...130)()
-          )]
-       ),
-       [:cmd],
-       (92...95),
-       nil,
-       (100...101),
-       (104...105),
-       (106...107),
-       nil
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/defn_opt_last_arg.txt b/test/yarp/snapshots/seattlerb/defn_opt_last_arg.txt
deleted file mode 100644
index d4064d0f345026..00000000000000
--- a/test/yarp/snapshots/seattlerb/defn_opt_last_arg.txt
+++ /dev/null
@@ -1,31 +0,0 @@
-ProgramNode(0...21)(
-  [],
-  StatementsNode(0...21)(
-    [DefNode(0...21)(
-       (4...5),
-       nil,
-       ParametersNode(6...17)(
-         [],
-         [OptionalParameterNode(6...17)(
-            :arg,
-            (6...9),
-            (10...11),
-            FalseNode(12...17)()
-          )],
-         [],
-         nil,
-         [],
-         nil,
-         nil
-       ),
-       nil,
-       [:arg],
-       (0...3),
-       nil,
-       nil,
-       nil,
-       nil,
-       (18...21)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/defn_opt_reg.txt b/test/yarp/snapshots/seattlerb/defn_opt_reg.txt
deleted file mode 100644
index 5796adf1e9011c..00000000000000
--- a/test/yarp/snapshots/seattlerb/defn_opt_reg.txt
+++ /dev/null
@@ -1,31 +0,0 @@
-ProgramNode(0...19)(
-  [],
-  StatementsNode(0...19)(
-    [DefNode(0...19)(
-       (4...5),
-       nil,
-       ParametersNode(6...14)(
-         [],
-         [OptionalParameterNode(6...11)(
-            :a,
-            (6...7),
-            (7...8),
-            NilNode(8...11)()
-          )],
-         [RequiredParameterNode(13...14)(:b)],
-         nil,
-         [],
-         nil,
-         nil
-       ),
-       nil,
-       [:a, :b],
-       (0...3),
-       nil,
-       (5...6),
-       (14...15),
-       nil,
-       (16...19)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/defn_opt_splat_arg.txt b/test/yarp/snapshots/seattlerb/defn_opt_splat_arg.txt
deleted file mode 100644
index cd181b55b3aa0a..00000000000000
--- a/test/yarp/snapshots/seattlerb/defn_opt_splat_arg.txt
+++ /dev/null
@@ -1,31 +0,0 @@
-ProgramNode(0...24)(
-  [],
-  StatementsNode(0...24)(
-    [DefNode(0...24)(
-       (4...5),
-       nil,
-       ParametersNode(7...19)(
-         [],
-         [OptionalParameterNode(7...12)(
-            :a,
-            (7...8),
-            (9...10),
-            IntegerNode(11...12)()
-          )],
-         [RequiredParameterNode(18...19)(:c)],
-         RestParameterNode(14...16)((14...15), (15...16)),
-         [],
-         nil,
-         nil
-       ),
-       nil,
-       [:a, :b, :c],
-       (0...3),
-       nil,
-       (6...7),
-       (19...20),
-       nil,
-       (21...24)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/defn_powarg.txt b/test/yarp/snapshots/seattlerb/defn_powarg.txt
deleted file mode 100644
index a6d63f56cb44e9..00000000000000
--- a/test/yarp/snapshots/seattlerb/defn_powarg.txt
+++ /dev/null
@@ -1,26 +0,0 @@
-ProgramNode(0...17)(
-  [],
-  StatementsNode(0...17)(
-    [DefNode(0...17)(
-       (4...5),
-       nil,
-       ParametersNode(6...12)(
-         [],
-         [],
-         [],
-         nil,
-         [],
-         KeywordRestParameterNode(6...12)((6...8), (8...12)),
-         nil
-       ),
-       nil,
-       [:opts],
-       (0...3),
-       nil,
-       (5...6),
-       (12...13),
-       nil,
-       (14...17)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/defn_reg_opt_reg.txt b/test/yarp/snapshots/seattlerb/defn_reg_opt_reg.txt
deleted file mode 100644
index c7e9c640872efc..00000000000000
--- a/test/yarp/snapshots/seattlerb/defn_reg_opt_reg.txt
+++ /dev/null
@@ -1,31 +0,0 @@
-ProgramNode(0...23)(
-  [],
-  StatementsNode(0...23)(
-    [DefNode(0...23)(
-       (4...5),
-       nil,
-       ParametersNode(6...18)(
-         [RequiredParameterNode(6...7)(:a)],
-         [OptionalParameterNode(9...15)(
-            :b,
-            (9...10),
-            (11...12),
-            SymbolNode(13...15)((13...14), (14...15), nil, "c")
-          )],
-         [RequiredParameterNode(17...18)(:d)],
-         nil,
-         [],
-         nil,
-         nil
-       ),
-       nil,
-       [:a, :b, :d],
-       (0...3),
-       nil,
-       (5...6),
-       (18...19),
-       nil,
-       (20...23)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/defn_splat_arg.txt b/test/yarp/snapshots/seattlerb/defn_splat_arg.txt
deleted file mode 100644
index 0fb8bb01c157d9..00000000000000
--- a/test/yarp/snapshots/seattlerb/defn_splat_arg.txt
+++ /dev/null
@@ -1,26 +0,0 @@
-ProgramNode(0...15)(
-  [],
-  StatementsNode(0...15)(
-    [DefNode(0...15)(
-       (4...5),
-       nil,
-       ParametersNode(6...10)(
-         [],
-         [],
-         [RequiredParameterNode(9...10)(:a)],
-         RestParameterNode(6...7)((6...7), nil),
-         [],
-         nil,
-         nil
-       ),
-       nil,
-       [:*, :a],
-       (0...3),
-       nil,
-       (5...6),
-       (10...11),
-       nil,
-       (12...15)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/defn_unary_not.txt b/test/yarp/snapshots/seattlerb/defn_unary_not.txt
deleted file mode 100644
index 9fbee1764f425a..00000000000000
--- a/test/yarp/snapshots/seattlerb/defn_unary_not.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-ProgramNode(0...17)(
-  [],
-  StatementsNode(0...17)(
-    [DefNode(0...17)(
-       (4...6),
-       nil,
-       nil,
-       StatementsNode(8...12)([TrueNode(8...12)()]),
-       [],
-       (0...3),
-       nil,
-       nil,
-       nil,
-       nil,
-       (14...17)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/defns_reserved.txt b/test/yarp/snapshots/seattlerb/defns_reserved.txt
deleted file mode 100644
index 07b165898eb927..00000000000000
--- a/test/yarp/snapshots/seattlerb/defns_reserved.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-ProgramNode(0...20)(
-  [],
-  StatementsNode(0...20)(
-    [DefNode(0...20)(
-       (9...15),
-       SelfNode(4...8)(),
-       nil,
-       nil,
-       [],
-       (0...3),
-       (8...9),
-       nil,
-       nil,
-       nil,
-       (17...20)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/defs_as_arg_with_do_block_inside.txt b/test/yarp/snapshots/seattlerb/defs_as_arg_with_do_block_inside.txt
deleted file mode 100644
index d223e069137481..00000000000000
--- a/test/yarp/snapshots/seattlerb/defs_as_arg_with_do_block_inside.txt
+++ /dev/null
@@ -1,52 +0,0 @@
-ProgramNode(0...30)(
-  [],
-  StatementsNode(0...30)(
-    [CallNode(0...30)(
-       nil,
-       nil,
-       (0...1),
-       nil,
-       ArgumentsNode(2...30)(
-         [DefNode(2...30)(
-            (11...12),
-            SelfNode(6...10)(),
-            nil,
-            StatementsNode(14...25)(
-              [CallNode(14...25)(
-                 CallNode(14...15)(
-                   nil,
-                   nil,
-                   (14...15),
-                   nil,
-                   nil,
-                   nil,
-                   nil,
-                   2,
-                   "x"
-                 ),
-                 (15...16),
-                 (16...17),
-                 nil,
-                 nil,
-                 nil,
-                 BlockNode(18...25)([], nil, nil, (18...20), (22...25)),
-                 0,
-                 "y"
-               )]
-            ),
-            [],
-            (2...5),
-            (10...11),
-            nil,
-            nil,
-            nil,
-            (27...30)
-          )]
-       ),
-       nil,
-       nil,
-       0,
-       "p"
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/defs_comments.txt b/test/yarp/snapshots/seattlerb/defs_comments.txt
deleted file mode 100644
index 55a3054373ffd8..00000000000000
--- a/test/yarp/snapshots/seattlerb/defs_comments.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-ProgramNode(19...36)(
-  [],
-  StatementsNode(19...36)(
-    [DefNode(19...36)(
-       (28...32),
-       SelfNode(23...27)(),
-       nil,
-       nil,
-       [],
-       (19...22),
-       (27...28),
-       nil,
-       nil,
-       nil,
-       (33...36)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/defs_endless_command.txt b/test/yarp/snapshots/seattlerb/defs_endless_command.txt
deleted file mode 100644
index 3675f26ddffe77..00000000000000
--- a/test/yarp/snapshots/seattlerb/defs_endless_command.txt
+++ /dev/null
@@ -1,30 +0,0 @@
-ProgramNode(0...35)(
-  [],
-  StatementsNode(0...35)(
-    [DefNode(0...35)(
-       (6...17),
-       CallNode(4...5)(nil, nil, (4...5), nil, nil, nil, nil, 2, "x"),
-       nil,
-       StatementsNode(20...35)(
-         [CallNode(20...35)(
-            nil,
-            nil,
-            (20...32),
-            nil,
-            ArgumentsNode(33...35)([IntegerNode(33...35)()]),
-            nil,
-            nil,
-            0,
-            "other_method"
-          )]
-       ),
-       [],
-       (0...3),
-       (5...6),
-       nil,
-       nil,
-       (18...19),
-       nil
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/defs_endless_command_rescue.txt b/test/yarp/snapshots/seattlerb/defs_endless_command_rescue.txt
deleted file mode 100644
index e032fff9a6b45f..00000000000000
--- a/test/yarp/snapshots/seattlerb/defs_endless_command_rescue.txt
+++ /dev/null
@@ -1,36 +0,0 @@
-ProgramNode(0...45)(
-  [],
-  StatementsNode(0...45)(
-    [DefNode(0...45)(
-       (6...17),
-       CallNode(4...5)(nil, nil, (4...5), nil, nil, nil, nil, 2, "x"),
-       nil,
-       StatementsNode(20...45)(
-         [CallNode(20...45)(
-            nil,
-            nil,
-            (20...32),
-            nil,
-            ArgumentsNode(33...45)(
-              [RescueModifierNode(33...45)(
-                 IntegerNode(33...35)(),
-                 (36...42),
-                 IntegerNode(43...45)()
-               )]
-            ),
-            nil,
-            nil,
-            0,
-            "other_method"
-          )]
-       ),
-       [],
-       (0...3),
-       (5...6),
-       nil,
-       nil,
-       (18...19),
-       nil
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/defs_kwarg.txt b/test/yarp/snapshots/seattlerb/defs_kwarg.txt
deleted file mode 100644
index 0309161b8e4fab..00000000000000
--- a/test/yarp/snapshots/seattlerb/defs_kwarg.txt
+++ /dev/null
@@ -1,26 +0,0 @@
-ProgramNode(0...19)(
-  [],
-  StatementsNode(0...19)(
-    [DefNode(0...19)(
-       (9...10),
-       SelfNode(4...8)(),
-       ParametersNode(11...15)(
-         [],
-         [],
-         [],
-         nil,
-         [KeywordParameterNode(11...15)((11...13), IntegerNode(14...15)())],
-         nil,
-         nil
-       ),
-       nil,
-       [:b],
-       (0...3),
-       (8...9),
-       nil,
-       nil,
-       nil,
-       (16...19)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/defs_oneliner.txt b/test/yarp/snapshots/seattlerb/defs_oneliner.txt
deleted file mode 100644
index 60ea01092f7caa..00000000000000
--- a/test/yarp/snapshots/seattlerb/defs_oneliner.txt
+++ /dev/null
@@ -1,38 +0,0 @@
-ProgramNode(0...32)(
-  [],
-  StatementsNode(0...32)(
-    [DefNode(0...32)(
-       (9...13),
-       SelfNode(4...8)(),
-       ParametersNode(14...17)(
-         [RequiredParameterNode(14...17)(:cmd)],
-         [],
-         [],
-         nil,
-         [],
-         nil,
-         nil
-       ),
-       StatementsNode(21...32)(
-         [CallNode(21...32)(
-            nil,
-            nil,
-            (21...27),
-            (27...28),
-            ArgumentsNode(28...31)([LocalVariableReadNode(28...31)(:cmd, 0)]),
-            (31...32),
-            nil,
-            0,
-            "system"
-          )]
-       ),
-       [:cmd],
-       (0...3),
-       (8...9),
-       (13...14),
-       (17...18),
-       (19...20),
-       nil
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/defs_oneliner_eq2.txt b/test/yarp/snapshots/seattlerb/defs_oneliner_eq2.txt
deleted file mode 100644
index 1a88fffa507e10..00000000000000
--- a/test/yarp/snapshots/seattlerb/defs_oneliner_eq2.txt
+++ /dev/null
@@ -1,38 +0,0 @@
-ProgramNode(0...33)(
-  [],
-  StatementsNode(0...33)(
-    [ClassNode(0...33)(
-       [],
-       (0...5),
-       ConstantReadNode(6...7)(:X),
-       nil,
-       nil,
-       StatementsNode(10...29)(
-         [DefNode(10...29)(
-            (19...21),
-            SelfNode(14...18)(),
-            ParametersNode(22...23)(
-              [RequiredParameterNode(22...23)(:o)],
-              [],
-              [],
-              nil,
-              [],
-              nil,
-              nil
-            ),
-            StatementsNode(27...29)([IntegerNode(27...29)()]),
-            [:o],
-            (10...13),
-            (18...19),
-            (21...22),
-            (23...24),
-            (25...26),
-            nil
-          )]
-       ),
-       (30...33),
-       :X,
-       :X
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/defs_oneliner_rescue.txt b/test/yarp/snapshots/seattlerb/defs_oneliner_rescue.txt
deleted file mode 100644
index 90269cc14aa8c4..00000000000000
--- a/test/yarp/snapshots/seattlerb/defs_oneliner_rescue.txt
+++ /dev/null
@@ -1,132 +0,0 @@
-ProgramNode(0...145)(
-  [],
-  StatementsNode(0...145)(
-    [DefNode(0...49)(
-       (9...13),
-       SelfNode(4...8)(),
-       ParametersNode(14...17)(
-         [RequiredParameterNode(14...17)(:cmd)],
-         [],
-         [],
-         nil,
-         [],
-         nil,
-         nil
-       ),
-       BeginNode(21...49)(
-         nil,
-         StatementsNode(21...32)(
-           [CallNode(21...32)(
-              nil,
-              nil,
-              (21...27),
-              (27...28),
-              ArgumentsNode(28...31)(
-                [LocalVariableReadNode(28...31)(:cmd, 0)]
-              ),
-              (31...32),
-              nil,
-              0,
-              "system"
-            )]
-         ),
-         RescueNode(33...45)(
-           (33...39),
-           [],
-           nil,
-           nil,
-           StatementsNode(42...45)([NilNode(42...45)()]),
-           nil
-         ),
-         nil,
-         nil,
-         (46...49)
-       ),
-       [:cmd],
-       (0...3),
-       (8...9),
-       (13...14),
-       (17...18),
-       nil,
-       (46...49)
-     ),
-     DefNode(52...99)(
-       (61...65),
-       SelfNode(56...60)(),
-       ParametersNode(66...69)(
-         [RequiredParameterNode(66...69)(:cmd)],
-         [],
-         [],
-         nil,
-         [],
-         nil,
-         nil
-       ),
-       StatementsNode(73...95)(
-         [RescueModifierNode(73...95)(
-            CallNode(73...84)(
-              nil,
-              nil,
-              (73...79),
-              (79...80),
-              ArgumentsNode(80...83)(
-                [LocalVariableReadNode(80...83)(:cmd, 0)]
-              ),
-              (83...84),
-              nil,
-              0,
-              "system"
-            ),
-            (85...91),
-            NilNode(92...95)()
-          )]
-       ),
-       [:cmd],
-       (52...55),
-       (60...61),
-       (65...66),
-       (69...70),
-       nil,
-       (96...99)
-     ),
-     DefNode(102...145)(
-       (111...115),
-       SelfNode(106...110)(),
-       ParametersNode(116...119)(
-         [RequiredParameterNode(116...119)(:cmd)],
-         [],
-         [],
-         nil,
-         [],
-         nil,
-         nil
-       ),
-       StatementsNode(123...145)(
-         [RescueModifierNode(123...145)(
-            CallNode(123...134)(
-              nil,
-              nil,
-              (123...129),
-              (129...130),
-              ArgumentsNode(130...133)(
-                [LocalVariableReadNode(130...133)(:cmd, 0)]
-              ),
-              (133...134),
-              nil,
-              0,
-              "system"
-            ),
-            (135...141),
-            NilNode(142...145)()
-          )]
-       ),
-       [:cmd],
-       (102...105),
-       (110...111),
-       (115...116),
-       (119...120),
-       (121...122),
-       nil
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/difficult0_.txt b/test/yarp/snapshots/seattlerb/difficult0_.txt
deleted file mode 100644
index c68a126eb09b46..00000000000000
--- a/test/yarp/snapshots/seattlerb/difficult0_.txt
+++ /dev/null
@@ -1,51 +0,0 @@
-ProgramNode(0...30)(
-  [],
-  StatementsNode(0...30)(
-    [CallNode(0...30)(
-       nil,
-       nil,
-       (0...1),
-       nil,
-       ArgumentsNode(2...30)(
-         [CallNode(2...30)(
-            CallNode(2...26)(
-              InterpolatedStringNode(2...8)(
-                (2...8),
-                [StringNode(12...16)(nil, (12...16), nil, "  a\n")],
-                (16...22)
-              ),
-              nil,
-              (8...9),
-              nil,
-              ArgumentsNode(9...26)(
-                [InterpolatedStringNode(9...26)(
-                   (9...10),
-                   [StringNode(10...12)(nil, (10...12), nil, "b\n"),
-                    StringNode(22...25)(nil, (22...25), nil, "  c")],
-                   (25...26)
-                 )]
-              ),
-              nil,
-              nil,
-              0,
-              "+"
-            ),
-            nil,
-            (26...27),
-            nil,
-            ArgumentsNode(27...30)(
-              [StringNode(27...30)((27...28), (28...29), (29...30), "d")]
-            ),
-            nil,
-            nil,
-            0,
-            "+"
-          )]
-       ),
-       nil,
-       nil,
-       0,
-       "p"
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/difficult1_line_numbers.txt b/test/yarp/snapshots/seattlerb/difficult1_line_numbers.txt
deleted file mode 100644
index 69736976411983..00000000000000
--- a/test/yarp/snapshots/seattlerb/difficult1_line_numbers.txt
+++ /dev/null
@@ -1,131 +0,0 @@
-ProgramNode(0...104)(
-  [],
-  StatementsNode(0...104)(
-    [IfNode(0...104)(
-       (0...2),
-       TrueNode(3...7)(),
-       StatementsNode(10...100)(
-         [CallNode(10...13)(
-            nil,
-            nil,
-            (10...11),
-            nil,
-            ArgumentsNode(12...13)([IntegerNode(12...13)()]),
-            nil,
-            nil,
-            0,
-            "p"
-          ),
-          CallNode(16...21)(
-            CallNode(16...17)(nil, nil, (16...17), nil, nil, nil, nil, 2, "a"),
-            (17...18),
-            (18...19),
-            nil,
-            ArgumentsNode(20...21)([IntegerNode(20...21)()]),
-            nil,
-            nil,
-            0,
-            "b"
-          ),
-          CallNode(24...32)(
-            CallNode(24...25)(nil, nil, (24...25), nil, nil, nil, nil, 2, "c"),
-            (25...26),
-            (26...27),
-            nil,
-            ArgumentsNode(28...32)(
-              [IntegerNode(28...29)(), IntegerNode(31...32)()]
-            ),
-            nil,
-            nil,
-            0,
-            "d"
-          ),
-          CallNode(35...40)(
-            CallNode(35...36)(nil, nil, (35...36), nil, nil, nil, nil, 2, "e"),
-            (36...37),
-            (37...38),
-            nil,
-            ArgumentsNode(39...40)([IntegerNode(39...40)()]),
-            nil,
-            nil,
-            0,
-            "f"
-          ),
-          CallNode(43...51)(
-            CallNode(43...44)(nil, nil, (43...44), nil, nil, nil, nil, 2, "g"),
-            (44...45),
-            (45...46),
-            nil,
-            ArgumentsNode(47...51)(
-              [IntegerNode(47...48)(), IntegerNode(50...51)()]
-            ),
-            nil,
-            nil,
-            0,
-            "h"
-          ),
-          CallNode(54...58)(
-            nil,
-            nil,
-            (54...55),
-            (55...56),
-            ArgumentsNode(56...57)([IntegerNode(56...57)()]),
-            (57...58),
-            nil,
-            0,
-            "p"
-          ),
-          CallNode(61...67)(
-            CallNode(61...62)(nil, nil, (61...62), nil, nil, nil, nil, 2, "a"),
-            (62...63),
-            (63...64),
-            (64...65),
-            ArgumentsNode(65...66)([IntegerNode(65...66)()]),
-            (66...67),
-            nil,
-            0,
-            "b"
-          ),
-          CallNode(70...79)(
-            CallNode(70...71)(nil, nil, (70...71), nil, nil, nil, nil, 2, "c"),
-            (71...72),
-            (72...73),
-            (73...74),
-            ArgumentsNode(74...78)(
-              [IntegerNode(74...75)(), IntegerNode(77...78)()]
-            ),
-            (78...79),
-            nil,
-            0,
-            "d"
-          ),
-          CallNode(82...88)(
-            CallNode(82...83)(nil, nil, (82...83), nil, nil, nil, nil, 2, "e"),
-            (83...84),
-            (84...85),
-            (85...86),
-            ArgumentsNode(86...87)([IntegerNode(86...87)()]),
-            (87...88),
-            nil,
-            0,
-            "f"
-          ),
-          CallNode(91...100)(
-            CallNode(91...92)(nil, nil, (91...92), nil, nil, nil, nil, 2, "g"),
-            (92...93),
-            (93...94),
-            (94...95),
-            ArgumentsNode(95...99)(
-              [IntegerNode(95...96)(), IntegerNode(98...99)()]
-            ),
-            (99...100),
-            nil,
-            0,
-            "h"
-          )]
-       ),
-       nil,
-       (101...104)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/difficult1_line_numbers2.txt b/test/yarp/snapshots/seattlerb/difficult1_line_numbers2.txt
deleted file mode 100644
index d19d6d817b6e7d..00000000000000
--- a/test/yarp/snapshots/seattlerb/difficult1_line_numbers2.txt
+++ /dev/null
@@ -1,52 +0,0 @@
-ProgramNode(0...48)(
-  [:b, :c],
-  StatementsNode(0...48)(
-    [IfNode(0...46)(
-       (0...2),
-       TrueNode(3...7)(),
-       StatementsNode(15...42)(
-         [CallNode(15...21)(
-            nil,
-            nil,
-            (15...16),
-            (16...17),
-            ArgumentsNode(17...20)(
-              [StringNode(17...20)((17...18), (18...19), (19...20), "a")]
-            ),
-            (20...21),
-            nil,
-            0,
-            "p"
-          ),
-          LocalVariableWriteNode(24...29)(
-            :b,
-            0,
-            (24...25),
-            IntegerNode(28...29)(),
-            (26...27)
-          ),
-          CallNode(32...35)(
-            nil,
-            nil,
-            (32...33),
-            nil,
-            ArgumentsNode(34...35)([LocalVariableReadNode(34...35)(:b, 0)]),
-            nil,
-            nil,
-            0,
-            "p"
-          ),
-          LocalVariableWriteNode(38...42)(
-            :c,
-            0,
-            (38...39),
-            IntegerNode(41...42)(),
-            (40...41)
-          )]
-       ),
-       nil,
-       (43...46)
-     ),
-     CallNode(47...48)(nil, nil, (47...48), nil, nil, nil, nil, 2, "a")]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/difficult2_.txt b/test/yarp/snapshots/seattlerb/difficult2_.txt
deleted file mode 100644
index 78772ca20d1b18..00000000000000
--- a/test/yarp/snapshots/seattlerb/difficult2_.txt
+++ /dev/null
@@ -1,49 +0,0 @@
-ProgramNode(0...20)(
-  [],
-  StatementsNode(0...20)(
-    [IfNode(0...13)(
-       nil,
-       IntegerNode(0...1)(),
-       StatementsNode(4...9)(
-         [CallNode(4...9)(
-            nil,
-            nil,
-            (4...5),
-            (5...6),
-            ArgumentsNode(6...8)(
-              [StringNode(6...8)((6...7), (7...7), (7...8), "")]
-            ),
-            (8...9),
-            nil,
-            0,
-            "b"
-          )]
-       ),
-       ElseNode(10...13)(
-         (10...11),
-         StatementsNode(12...13)([IntegerNode(12...13)()]),
-         nil
-       ),
-       nil
-     ),
-     CallNode(14...20)(
-       nil,
-       nil,
-       (14...15),
-       nil,
-       ArgumentsNode(16...20)(
-         [KeywordHashNode(16...20)(
-            [AssocNode(16...20)(
-               SymbolNode(16...18)(nil, (16...17), (17...18), "d"),
-               IntegerNode(19...20)(),
-               nil
-             )]
-          )]
-       ),
-       nil,
-       nil,
-       0,
-       "a"
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/difficult3_.txt b/test/yarp/snapshots/seattlerb/difficult3_.txt
deleted file mode 100644
index ba5d6c3aeda680..00000000000000
--- a/test/yarp/snapshots/seattlerb/difficult3_.txt
+++ /dev/null
@@ -1,44 +0,0 @@
-ProgramNode(0...18)(
-  [],
-  StatementsNode(0...18)(
-    [CallNode(0...18)(
-       nil,
-       nil,
-       (0...1),
-       nil,
-       nil,
-       nil,
-       BlockNode(2...18)(
-         [:a, :b, :c],
-         BlockParametersNode(4...16)(
-           ParametersNode(5...15)(
-             [RequiredParameterNode(5...6)(:a),
-              RequiredDestructuredParameterNode(8...15)(
-                [RequiredParameterNode(9...10)(:b),
-                 SplatNode(12...14)(
-                   (12...13),
-                   RequiredParameterNode(13...14)(:c)
-                 )],
-                (8...9),
-                (14...15)
-              )],
-             [],
-             [],
-             nil,
-             [],
-             nil,
-             nil
-           ),
-           [],
-           (4...5),
-           (15...16)
-         ),
-         nil,
-         (2...3),
-         (17...18)
-       ),
-       0,
-       "f"
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/difficult3_2.txt b/test/yarp/snapshots/seattlerb/difficult3_2.txt
deleted file mode 100644
index 39819370668a22..00000000000000
--- a/test/yarp/snapshots/seattlerb/difficult3_2.txt
+++ /dev/null
@@ -1,35 +0,0 @@
-ProgramNode(0...13)(
-  [],
-  StatementsNode(0...13)(
-    [CallNode(0...13)(
-       nil,
-       nil,
-       (0...1),
-       nil,
-       nil,
-       nil,
-       BlockNode(2...13)(
-         [:a, :b],
-         BlockParametersNode(4...11)(
-           ParametersNode(5...10)(
-             [],
-             [],
-             [RequiredParameterNode(9...10)(:b)],
-             RestParameterNode(5...7)((5...6), (6...7)),
-             [],
-             nil,
-             nil
-           ),
-           [],
-           (4...5),
-           (10...11)
-         ),
-         nil,
-         (2...3),
-         (12...13)
-       ),
-       0,
-       "f"
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/difficult3_3.txt b/test/yarp/snapshots/seattlerb/difficult3_3.txt
deleted file mode 100644
index 5b1e1ca29d00b1..00000000000000
--- a/test/yarp/snapshots/seattlerb/difficult3_3.txt
+++ /dev/null
@@ -1,35 +0,0 @@
-ProgramNode(0...17)(
-  [],
-  StatementsNode(0...17)(
-    [CallNode(0...17)(
-       nil,
-       nil,
-       (0...1),
-       nil,
-       nil,
-       nil,
-       BlockNode(2...17)(
-         [:a, :b, :c],
-         BlockParametersNode(4...15)(
-           ParametersNode(5...14)(
-             [],
-             [],
-             [RequiredParameterNode(9...10)(:b)],
-             RestParameterNode(5...7)((5...6), (6...7)),
-             [],
-             nil,
-             BlockParameterNode(12...14)(:c, (13...14), (12...13))
-           ),
-           [],
-           (4...5),
-           (14...15)
-         ),
-         nil,
-         (2...3),
-         (16...17)
-       ),
-       0,
-       "f"
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/difficult3_4.txt b/test/yarp/snapshots/seattlerb/difficult3_4.txt
deleted file mode 100644
index 40ebfca6612174..00000000000000
--- a/test/yarp/snapshots/seattlerb/difficult3_4.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-ProgramNode(0...17)(
-  [:a],
-  StatementsNode(0...17)(
-    [LocalVariableWriteNode(0...17)(
-       :a,
-       0,
-       (0...1),
-       IfNode(2...17)(
-         nil,
-         CallNode(2...3)(nil, nil, (2...3), nil, nil, nil, nil, 2, "b"),
-         StatementsNode(6...10)([TrueNode(6...10)()]),
-         ElseNode(10...17)(
-           (10...11),
-           StatementsNode(12...17)([FalseNode(12...17)()]),
-           nil
-         ),
-         nil
-       ),
-       (1...2)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/difficult3_5.txt b/test/yarp/snapshots/seattlerb/difficult3_5.txt
deleted file mode 100644
index 746786b8a5fb10..00000000000000
--- a/test/yarp/snapshots/seattlerb/difficult3_5.txt
+++ /dev/null
@@ -1,37 +0,0 @@
-ProgramNode(0...19)(
-  [],
-  StatementsNode(0...19)(
-    [CallNode(0...19)(
-       nil,
-       nil,
-       (0...1),
-       nil,
-       ArgumentsNode(2...19)(
-         [LambdaNode(2...19)(
-            [],
-            (2...4),
-            (7...8),
-            (18...19),
-            BlockParametersNode(4...6)(nil, [], (4...5), (5...6)),
-            StatementsNode(9...17)(
-              [CallNode(9...17)(
-                 nil,
-                 nil,
-                 (9...10),
-                 nil,
-                 nil,
-                 nil,
-                 BlockNode(11...17)([], nil, nil, (11...13), (14...17)),
-                 0,
-                 "g"
-               )]
-            )
-          )]
-       ),
-       nil,
-       nil,
-       0,
-       "f"
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/difficult3__10.txt b/test/yarp/snapshots/seattlerb/difficult3__10.txt
deleted file mode 100644
index 7b7dc6f41b3cba..00000000000000
--- a/test/yarp/snapshots/seattlerb/difficult3__10.txt
+++ /dev/null
@@ -1,44 +0,0 @@
-ProgramNode(0...18)(
-  [],
-  StatementsNode(0...18)(
-    [CallNode(0...18)(
-       nil,
-       nil,
-       (0...1),
-       nil,
-       nil,
-       nil,
-       BlockNode(2...18)(
-         [:a, :b, :c],
-         BlockParametersNode(4...16)(
-           ParametersNode(5...15)(
-             [RequiredParameterNode(5...6)(:a),
-              RequiredDestructuredParameterNode(8...15)(
-                [SplatNode(9...11)(
-                   (9...10),
-                   RequiredParameterNode(10...11)(:b)
-                 ),
-                 RequiredParameterNode(13...14)(:c)],
-                (8...9),
-                (14...15)
-              )],
-             [],
-             [],
-             nil,
-             [],
-             nil,
-             nil
-           ),
-           [],
-           (4...5),
-           (15...16)
-         ),
-         nil,
-         (2...3),
-         (17...18)
-       ),
-       0,
-       "f"
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/difficult3__11.txt b/test/yarp/snapshots/seattlerb/difficult3__11.txt
deleted file mode 100644
index c5b8b81b18bef1..00000000000000
--- a/test/yarp/snapshots/seattlerb/difficult3__11.txt
+++ /dev/null
@@ -1,40 +0,0 @@
-ProgramNode(0...14)(
-  [],
-  StatementsNode(0...14)(
-    [CallNode(0...14)(
-       nil,
-       nil,
-       (0...1),
-       nil,
-       nil,
-       nil,
-       BlockNode(2...14)(
-         [:a],
-         BlockParametersNode(4...12)(
-           ParametersNode(5...11)(
-             [RequiredParameterNode(5...6)(:a),
-              RequiredDestructuredParameterNode(8...11)(
-                [SplatNode(9...10)((9...10), nil)],
-                (8...9),
-                (10...11)
-              )],
-             [],
-             [],
-             nil,
-             [],
-             nil,
-             nil
-           ),
-           [],
-           (4...5),
-           (11...12)
-         ),
-         nil,
-         (2...3),
-         (13...14)
-       ),
-       0,
-       "f"
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/difficult3__12.txt b/test/yarp/snapshots/seattlerb/difficult3__12.txt
deleted file mode 100644
index 87dd280a9e0c59..00000000000000
--- a/test/yarp/snapshots/seattlerb/difficult3__12.txt
+++ /dev/null
@@ -1,41 +0,0 @@
-ProgramNode(0...17)(
-  [],
-  StatementsNode(0...17)(
-    [CallNode(0...17)(
-       nil,
-       nil,
-       (0...1),
-       nil,
-       nil,
-       nil,
-       BlockNode(2...17)(
-         [:a, :b],
-         BlockParametersNode(4...15)(
-           ParametersNode(5...14)(
-             [RequiredParameterNode(5...6)(:a),
-              RequiredDestructuredParameterNode(8...14)(
-                [SplatNode(9...10)((9...10), nil),
-                 RequiredParameterNode(12...13)(:b)],
-                (8...9),
-                (13...14)
-              )],
-             [],
-             [],
-             nil,
-             [],
-             nil,
-             nil
-           ),
-           [],
-           (4...5),
-           (14...15)
-         ),
-         nil,
-         (2...3),
-         (16...17)
-       ),
-       0,
-       "f"
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/difficult3__6.txt b/test/yarp/snapshots/seattlerb/difficult3__6.txt
deleted file mode 100644
index 578a22e843e2e2..00000000000000
--- a/test/yarp/snapshots/seattlerb/difficult3__6.txt
+++ /dev/null
@@ -1,45 +0,0 @@
-ProgramNode(0...21)(
-  [],
-  StatementsNode(0...21)(
-    [CallNode(0...21)(
-       nil,
-       nil,
-       (0...1),
-       nil,
-       nil,
-       nil,
-       BlockNode(2...21)(
-         [:a, :b, :c, :d],
-         BlockParametersNode(4...19)(
-           ParametersNode(5...18)(
-             [RequiredParameterNode(5...6)(:a),
-              RequiredDestructuredParameterNode(8...18)(
-                [RequiredParameterNode(9...10)(:b),
-                 SplatNode(12...14)(
-                   (12...13),
-                   RequiredParameterNode(13...14)(:c)
-                 ),
-                 RequiredParameterNode(16...17)(:d)],
-                (8...9),
-                (17...18)
-              )],
-             [],
-             [],
-             nil,
-             [],
-             nil,
-             nil
-           ),
-           [],
-           (4...5),
-           (18...19)
-         ),
-         nil,
-         (2...3),
-         (20...21)
-       ),
-       0,
-       "f"
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/difficult3__7.txt b/test/yarp/snapshots/seattlerb/difficult3__7.txt
deleted file mode 100644
index a306b1f895aa00..00000000000000
--- a/test/yarp/snapshots/seattlerb/difficult3__7.txt
+++ /dev/null
@@ -1,41 +0,0 @@
-ProgramNode(0...17)(
-  [],
-  StatementsNode(0...17)(
-    [CallNode(0...17)(
-       nil,
-       nil,
-       (0...1),
-       nil,
-       nil,
-       nil,
-       BlockNode(2...17)(
-         [:a, :b],
-         BlockParametersNode(4...15)(
-           ParametersNode(5...14)(
-             [RequiredParameterNode(5...6)(:a),
-              RequiredDestructuredParameterNode(8...14)(
-                [RequiredParameterNode(9...10)(:b),
-                 SplatNode(12...13)((12...13), nil)],
-                (8...9),
-                (13...14)
-              )],
-             [],
-             [],
-             nil,
-             [],
-             nil,
-             nil
-           ),
-           [],
-           (4...5),
-           (14...15)
-         ),
-         nil,
-         (2...3),
-         (16...17)
-       ),
-       0,
-       "f"
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/difficult3__8.txt b/test/yarp/snapshots/seattlerb/difficult3__8.txt
deleted file mode 100644
index 9d0eb813574130..00000000000000
--- a/test/yarp/snapshots/seattlerb/difficult3__8.txt
+++ /dev/null
@@ -1,42 +0,0 @@
-ProgramNode(0...20)(
-  [],
-  StatementsNode(0...20)(
-    [CallNode(0...20)(
-       nil,
-       nil,
-       (0...1),
-       nil,
-       nil,
-       nil,
-       BlockNode(2...20)(
-         [:a, :b, :c],
-         BlockParametersNode(4...18)(
-           ParametersNode(5...17)(
-             [RequiredParameterNode(5...6)(:a),
-              RequiredDestructuredParameterNode(8...17)(
-                [RequiredParameterNode(9...10)(:b),
-                 SplatNode(12...13)((12...13), nil),
-                 RequiredParameterNode(15...16)(:c)],
-                (8...9),
-                (16...17)
-              )],
-             [],
-             [],
-             nil,
-             [],
-             nil,
-             nil
-           ),
-           [],
-           (4...5),
-           (17...18)
-         ),
-         nil,
-         (2...3),
-         (19...20)
-       ),
-       0,
-       "f"
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/difficult3__9.txt b/test/yarp/snapshots/seattlerb/difficult3__9.txt
deleted file mode 100644
index a3a5ccd89d7081..00000000000000
--- a/test/yarp/snapshots/seattlerb/difficult3__9.txt
+++ /dev/null
@@ -1,43 +0,0 @@
-ProgramNode(0...15)(
-  [],
-  StatementsNode(0...15)(
-    [CallNode(0...15)(
-       nil,
-       nil,
-       (0...1),
-       nil,
-       nil,
-       nil,
-       BlockNode(2...15)(
-         [:a, :b],
-         BlockParametersNode(4...13)(
-           ParametersNode(5...12)(
-             [RequiredParameterNode(5...6)(:a),
-              RequiredDestructuredParameterNode(8...12)(
-                [SplatNode(9...11)(
-                   (9...10),
-                   RequiredParameterNode(10...11)(:b)
-                 )],
-                (8...9),
-                (11...12)
-              )],
-             [],
-             [],
-             nil,
-             [],
-             nil,
-             nil
-           ),
-           [],
-           (4...5),
-           (12...13)
-         ),
-         nil,
-         (2...3),
-         (14...15)
-       ),
-       0,
-       "f"
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/difficult4__leading_dots.txt b/test/yarp/snapshots/seattlerb/difficult4__leading_dots.txt
deleted file mode 100644
index 881cc6d5a873fe..00000000000000
--- a/test/yarp/snapshots/seattlerb/difficult4__leading_dots.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-ProgramNode(0...4)(
-  [],
-  StatementsNode(0...4)(
-    [CallNode(0...4)(
-       CallNode(0...1)(nil, nil, (0...1), nil, nil, nil, nil, 2, "a"),
-       (2...3),
-       (3...4),
-       nil,
-       nil,
-       nil,
-       nil,
-       0,
-       "b"
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/difficult4__leading_dots2.txt b/test/yarp/snapshots/seattlerb/difficult4__leading_dots2.txt
deleted file mode 100644
index 8a246f58271b15..00000000000000
--- a/test/yarp/snapshots/seattlerb/difficult4__leading_dots2.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-ProgramNode(0...5)(
-  [],
-  StatementsNode(0...5)(
-    [IntegerNode(0...1)(),
-     RangeNode(2...5)(nil, IntegerNode(4...5)(), (2...4), 0)]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/difficult6_.txt b/test/yarp/snapshots/seattlerb/difficult6_.txt
deleted file mode 100644
index 2d1677e108f7e9..00000000000000
--- a/test/yarp/snapshots/seattlerb/difficult6_.txt
+++ /dev/null
@@ -1,50 +0,0 @@
-ProgramNode(0...25)(
-  [],
-  StatementsNode(0...25)(
-    [LambdaNode(0...25)(
-       [:a, :b],
-       (0...2),
-       (13...14),
-       (24...25),
-       BlockParametersNode(2...12)(
-         ParametersNode(3...11)(
-           [RequiredParameterNode(3...4)(:a)],
-           [OptionalParameterNode(6...11)(
-              :b,
-              (6...7),
-              (7...8),
-              NilNode(8...11)()
-            )],
-           [],
-           nil,
-           [],
-           nil,
-           nil
-         ),
-         [],
-         (2...3),
-         (11...12)
-       ),
-       StatementsNode(15...23)(
-         [CallNode(15...23)(
-            nil,
-            nil,
-            (15...16),
-            nil,
-            ArgumentsNode(17...23)(
-              [ArrayNode(17...23)(
-                 [LocalVariableReadNode(18...19)(:a, 0),
-                  LocalVariableReadNode(21...22)(:b, 0)],
-                 (17...18),
-                 (22...23)
-               )]
-            ),
-            nil,
-            nil,
-            0,
-            "p"
-          )]
-       )
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/difficult6__7.txt b/test/yarp/snapshots/seattlerb/difficult6__7.txt
deleted file mode 100644
index 60b902f4d232ea..00000000000000
--- a/test/yarp/snapshots/seattlerb/difficult6__7.txt
+++ /dev/null
@@ -1,30 +0,0 @@
-ProgramNode(0...11)(
-  [],
-  StatementsNode(0...11)(
-    [CallNode(0...11)(
-       CallNode(0...1)(nil, nil, (0...1), nil, nil, nil, nil, 2, "a"),
-       (1...2),
-       (2...3),
-       nil,
-       ArgumentsNode(4...7)(
-         [ParenthesesNode(4...7)(
-            StatementsNode(5...6)([IntegerNode(5...6)()]),
-            (4...5),
-            (6...7)
-          )]
-       ),
-       nil,
-       BlockNode(8...11)(
-         [],
-         nil,
-         StatementsNode(9...10)(
-           [CallNode(9...10)(nil, nil, (9...10), nil, nil, nil, nil, 2, "c")]
-         ),
-         (8...9),
-         (10...11)
-       ),
-       0,
-       "b"
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/difficult6__8.txt b/test/yarp/snapshots/seattlerb/difficult6__8.txt
deleted file mode 100644
index ed7a53a89a85b2..00000000000000
--- a/test/yarp/snapshots/seattlerb/difficult6__8.txt
+++ /dev/null
@@ -1,30 +0,0 @@
-ProgramNode(0...12)(
-  [],
-  StatementsNode(0...12)(
-    [CallNode(0...12)(
-       CallNode(0...1)(nil, nil, (0...1), nil, nil, nil, nil, 2, "a"),
-       (1...3),
-       (3...4),
-       nil,
-       ArgumentsNode(5...8)(
-         [ParenthesesNode(5...8)(
-            StatementsNode(6...7)([IntegerNode(6...7)()]),
-            (5...6),
-            (7...8)
-          )]
-       ),
-       nil,
-       BlockNode(9...12)(
-         [],
-         nil,
-         StatementsNode(10...11)(
-           [CallNode(10...11)(nil, nil, (10...11), nil, nil, nil, nil, 2, "c")]
-         ),
-         (9...10),
-         (11...12)
-       ),
-       0,
-       "b"
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/difficult7_.txt b/test/yarp/snapshots/seattlerb/difficult7_.txt
deleted file mode 100644
index 44a67b33775e27..00000000000000
--- a/test/yarp/snapshots/seattlerb/difficult7_.txt
+++ /dev/null
@@ -1,81 +0,0 @@
-ProgramNode(6...66)(
-  [],
-  StatementsNode(6...66)(
-    [HashNode(6...66)(
-       (6...7),
-       [AssocNode(16...41)(
-          SymbolNode(16...18)(nil, (16...17), (17...18), "a"),
-          CallNode(19...41)(
-            nil,
-            nil,
-            (19...25),
-            nil,
-            nil,
-            nil,
-            BlockNode(26...41)(
-              [],
-              nil,
-              StatementsNode(28...39)(
-                [IfNode(28...39)(
-                   nil,
-                   CallNode(28...29)(
-                     nil,
-                     nil,
-                     (28...29),
-                     nil,
-                     nil,
-                     nil,
-                     nil,
-                     2,
-                     "b"
-                   ),
-                   StatementsNode(32...35)(
-                     [CallNode(32...35)(
-                        nil,
-                        nil,
-                        (32...33),
-                        (33...34),
-                        nil,
-                        (34...35),
-                        nil,
-                        0,
-                        "c"
-                      )]
-                   ),
-                   ElseNode(36...39)(
-                     (36...37),
-                     StatementsNode(38...39)(
-                       [CallNode(38...39)(
-                          nil,
-                          nil,
-                          (38...39),
-                          nil,
-                          nil,
-                          nil,
-                          nil,
-                          2,
-                          "d"
-                        )]
-                     ),
-                     nil
-                   ),
-                   nil
-                 )]
-              ),
-              (26...27),
-              (40...41)
-            ),
-            0,
-            "lambda"
-          ),
-          nil
-        ),
-        AssocNode(51...57)(
-          SymbolNode(51...53)(nil, (51...52), (52...53), "e"),
-          NilNode(54...57)(),
-          nil
-        )],
-       (65...66)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/do_bug.txt b/test/yarp/snapshots/seattlerb/do_bug.txt
deleted file mode 100644
index 269d349519a6ce..00000000000000
--- a/test/yarp/snapshots/seattlerb/do_bug.txt
+++ /dev/null
@@ -1,46 +0,0 @@
-ProgramNode(0...33)(
-  [],
-  StatementsNode(0...33)(
-    [CallNode(0...3)(
-       nil,
-       nil,
-       (0...1),
-       nil,
-       ArgumentsNode(2...3)([IntegerNode(2...3)()]),
-       nil,
-       nil,
-       0,
-       "a"
-     ),
-     CallNode(4...33)(
-       CallNode(4...5)(nil, nil, (4...5), nil, nil, nil, nil, 2, "a"),
-       (5...6),
-       (6...7),
-       nil,
-       nil,
-       nil,
-       BlockNode(8...33)(
-         [:c],
-         BlockParametersNode(11...14)(
-           ParametersNode(12...13)(
-             [RequiredParameterNode(12...13)(:c)],
-             [],
-             [],
-             nil,
-             [],
-             nil,
-             nil
-           ),
-           [],
-           (11...12),
-           (13...14)
-         ),
-         nil,
-         (8...10),
-         (30...33)
-       ),
-       0,
-       "b"
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/do_lambda.txt b/test/yarp/snapshots/seattlerb/do_lambda.txt
deleted file mode 100644
index a7eb211623e8fe..00000000000000
--- a/test/yarp/snapshots/seattlerb/do_lambda.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-ProgramNode(0...11)(
-  [],
-  StatementsNode(0...11)(
-    [LambdaNode(0...11)(
-       [],
-       (0...2),
-       (5...7),
-       (8...11),
-       BlockParametersNode(2...4)(nil, [], (2...3), (3...4)),
-       nil
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/dot2_nil__26.txt b/test/yarp/snapshots/seattlerb/dot2_nil__26.txt
deleted file mode 100644
index 38e8dfd9c0f009..00000000000000
--- a/test/yarp/snapshots/seattlerb/dot2_nil__26.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-ProgramNode(0...3)(
-  [],
-  StatementsNode(0...3)(
-    [RangeNode(0...3)(
-       CallNode(0...1)(nil, nil, (0...1), nil, nil, nil, nil, 2, "a"),
-       nil,
-       (1...3),
-       0
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/dot3_nil__26.txt b/test/yarp/snapshots/seattlerb/dot3_nil__26.txt
deleted file mode 100644
index 91cf903a9a2d54..00000000000000
--- a/test/yarp/snapshots/seattlerb/dot3_nil__26.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-ProgramNode(0...4)(
-  [],
-  StatementsNode(0...4)(
-    [RangeNode(0...4)(
-       CallNode(0...1)(nil, nil, (0...1), nil, nil, nil, nil, 2, "a"),
-       nil,
-       (1...4),
-       1
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/dstr_evstr.txt b/test/yarp/snapshots/seattlerb/dstr_evstr.txt
deleted file mode 100644
index 75377e9c7faaf9..00000000000000
--- a/test/yarp/snapshots/seattlerb/dstr_evstr.txt
+++ /dev/null
@@ -1,23 +0,0 @@
-ProgramNode(0...12)(
-  [],
-  StatementsNode(0...12)(
-    [InterpolatedStringNode(0...12)(
-       (0...1),
-       [EmbeddedStatementsNode(1...7)(
-          (1...3),
-          StatementsNode(3...6)(
-            [StringNode(3...6)((3...4), (4...5), (5...6), "a")]
-          ),
-          (6...7)
-        ),
-        EmbeddedStatementsNode(7...11)(
-          (7...9),
-          StatementsNode(9...10)(
-            [CallNode(9...10)(nil, nil, (9...10), nil, nil, nil, nil, 2, "b")]
-          ),
-          (10...11)
-        )],
-       (11...12)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/dstr_evstr_empty_end.txt b/test/yarp/snapshots/seattlerb/dstr_evstr_empty_end.txt
deleted file mode 100644
index e4a9c81b8854c1..00000000000000
--- a/test/yarp/snapshots/seattlerb/dstr_evstr_empty_end.txt
+++ /dev/null
@@ -1,26 +0,0 @@
-ProgramNode(0...11)(
-  [],
-  StatementsNode(0...11)(
-    [InterpolatedSymbolNode(0...11)(
-       (0...2),
-       [EmbeddedStatementsNode(2...10)(
-          (2...4),
-          StatementsNode(4...9)(
-            [CallNode(4...9)(
-               nil,
-               nil,
-               (4...9),
-               nil,
-               nil,
-               nil,
-               nil,
-               2,
-               "field"
-             )]
-          ),
-          (9...10)
-        )],
-       (10...11)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/dstr_lex_state.txt b/test/yarp/snapshots/seattlerb/dstr_lex_state.txt
deleted file mode 100644
index 50e327ab9c00a9..00000000000000
--- a/test/yarp/snapshots/seattlerb/dstr_lex_state.txt
+++ /dev/null
@@ -1,28 +0,0 @@
-ProgramNode(0...8)(
-  [],
-  StatementsNode(0...8)(
-    [InterpolatedStringNode(0...8)(
-       (0...1),
-       [EmbeddedStatementsNode(1...7)(
-          (1...3),
-          StatementsNode(3...6)(
-            [CallNode(3...6)(
-               nil,
-               nil,
-               (3...4),
-               nil,
-               ArgumentsNode(4...6)(
-                 [SymbolNode(4...6)((4...5), (5...6), nil, "a")]
-               ),
-               nil,
-               nil,
-               0,
-               "p"
-             )]
-          ),
-          (6...7)
-        )],
-       (7...8)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/dstr_str.txt b/test/yarp/snapshots/seattlerb/dstr_str.txt
deleted file mode 100644
index e17b035d2f02f9..00000000000000
--- a/test/yarp/snapshots/seattlerb/dstr_str.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-ProgramNode(0...10)(
-  [],
-  StatementsNode(0...10)(
-    [InterpolatedStringNode(0...10)(
-       (0...1),
-       [EmbeddedStatementsNode(1...7)(
-          (1...3),
-          StatementsNode(3...6)(
-            [StringNode(3...6)((3...4), (4...5), (5...6), "a")]
-          ),
-          (6...7)
-        ),
-        StringNode(7...9)(nil, (7...9), nil, " b")],
-       (9...10)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/dsym_esc_to_sym.txt b/test/yarp/snapshots/seattlerb/dsym_esc_to_sym.txt
deleted file mode 100644
index 4f6697237b1a70..00000000000000
--- a/test/yarp/snapshots/seattlerb/dsym_esc_to_sym.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-ProgramNode(0...17)(
-  [],
-  StatementsNode(0...17)(
-    [SymbolNode(0...17)((0...2), (2...16), (16...17), "Varietà")]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/dsym_to_sym.txt b/test/yarp/snapshots/seattlerb/dsym_to_sym.txt
deleted file mode 100644
index d383b67184c1dc..00000000000000
--- a/test/yarp/snapshots/seattlerb/dsym_to_sym.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-ProgramNode(0...32)(
-  [],
-  StatementsNode(0...32)(
-    [AliasNode(0...17)(
-       SymbolNode(6...11)((6...8), (8...10), (10...11), "<<"),
-       SymbolNode(12...17)((12...14), (14...16), (16...17), ">>"),
-       (0...5)
-     ),
-     AliasNode(19...32)(
-       SymbolNode(25...28)((25...26), (26...28), nil, "<<"),
-       SymbolNode(29...32)((29...30), (30...32), nil, ">>"),
-       (19...24)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/eq_begin_line_numbers.txt b/test/yarp/snapshots/seattlerb/eq_begin_line_numbers.txt
deleted file mode 100644
index 46a167a8def379..00000000000000
--- a/test/yarp/snapshots/seattlerb/eq_begin_line_numbers.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-ProgramNode(0...31)(
-  [],
-  StatementsNode(0...31)([IntegerNode(0...1)(), IntegerNode(30...31)()])
-)
diff --git a/test/yarp/snapshots/seattlerb/eq_begin_why_wont_people_use_their_spacebar.txt b/test/yarp/snapshots/seattlerb/eq_begin_why_wont_people_use_their_spacebar.txt
deleted file mode 100644
index e277d15a349438..00000000000000
--- a/test/yarp/snapshots/seattlerb/eq_begin_why_wont_people_use_their_spacebar.txt
+++ /dev/null
@@ -1,26 +0,0 @@
-ProgramNode(0...29)(
-  [],
-  StatementsNode(0...29)(
-    [CallNode(0...29)(
-       CallNode(0...1)(nil, nil, (0...1), nil, nil, nil, nil, 2, "h"),
-       nil,
-       (1...4),
-       (1...2),
-       ArgumentsNode(2...29)(
-         [CallNode(2...3)(nil, nil, (2...3), nil, nil, nil, nil, 2, "k"),
-          BeginNode(5...29)(
-            (5...10),
-            StatementsNode(18...20)([IntegerNode(18...20)()]),
-            nil,
-            nil,
-            nil,
-            (26...29)
-          )]
-       ),
-       (3...4),
-       nil,
-       0,
-       "[]="
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/evstr_evstr.txt b/test/yarp/snapshots/seattlerb/evstr_evstr.txt
deleted file mode 100644
index f194b1b94a968e..00000000000000
--- a/test/yarp/snapshots/seattlerb/evstr_evstr.txt
+++ /dev/null
@@ -1,23 +0,0 @@
-ProgramNode(0...10)(
-  [],
-  StatementsNode(0...10)(
-    [InterpolatedStringNode(0...10)(
-       (0...1),
-       [EmbeddedStatementsNode(1...5)(
-          (1...3),
-          StatementsNode(3...4)(
-            [CallNode(3...4)(nil, nil, (3...4), nil, nil, nil, nil, 2, "a")]
-          ),
-          (4...5)
-        ),
-        EmbeddedStatementsNode(5...9)(
-          (5...7),
-          StatementsNode(7...8)(
-            [CallNode(7...8)(nil, nil, (7...8), nil, nil, nil, nil, 2, "b")]
-          ),
-          (8...9)
-        )],
-       (9...10)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/evstr_str.txt b/test/yarp/snapshots/seattlerb/evstr_str.txt
deleted file mode 100644
index 2ebd4e46398021..00000000000000
--- a/test/yarp/snapshots/seattlerb/evstr_str.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-ProgramNode(0...8)(
-  [],
-  StatementsNode(0...8)(
-    [InterpolatedStringNode(0...8)(
-       (0...1),
-       [EmbeddedStatementsNode(1...5)(
-          (1...3),
-          StatementsNode(3...4)(
-            [CallNode(3...4)(nil, nil, (3...4), nil, nil, nil, nil, 2, "a")]
-          ),
-          (4...5)
-        ),
-        StringNode(5...7)(nil, (5...7), nil, " b")],
-       (7...8)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/expr_not_bang.txt b/test/yarp/snapshots/seattlerb/expr_not_bang.txt
deleted file mode 100644
index 43e47cb03b4987..00000000000000
--- a/test/yarp/snapshots/seattlerb/expr_not_bang.txt
+++ /dev/null
@@ -1,28 +0,0 @@
-ProgramNode(0...5)(
-  [],
-  StatementsNode(0...5)(
-    [CallNode(0...5)(
-       CallNode(2...5)(
-         nil,
-         nil,
-         (2...3),
-         nil,
-         ArgumentsNode(4...5)(
-           [CallNode(4...5)(nil, nil, (4...5), nil, nil, nil, nil, 2, "b")]
-         ),
-         nil,
-         nil,
-         0,
-         "a"
-       ),
-       nil,
-       (0...1),
-       nil,
-       nil,
-       nil,
-       nil,
-       0,
-       "!"
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/f_kw.txt b/test/yarp/snapshots/seattlerb/f_kw.txt
deleted file mode 100644
index ace0997f9e1378..00000000000000
--- a/test/yarp/snapshots/seattlerb/f_kw.txt
+++ /dev/null
@@ -1,26 +0,0 @@
-ProgramNode(0...15)(
-  [],
-  StatementsNode(0...15)(
-    [DefNode(0...15)(
-       (4...5),
-       nil,
-       ParametersNode(6...10)(
-         [],
-         [],
-         [],
-         nil,
-         [KeywordParameterNode(6...10)((6...8), IntegerNode(8...10)())],
-         nil,
-         nil
-       ),
-       nil,
-       [:k],
-       (0...3),
-       nil,
-       nil,
-       nil,
-       nil,
-       (12...15)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/f_kw__required.txt b/test/yarp/snapshots/seattlerb/f_kw__required.txt
deleted file mode 100644
index 38d564599ffc39..00000000000000
--- a/test/yarp/snapshots/seattlerb/f_kw__required.txt
+++ /dev/null
@@ -1,26 +0,0 @@
-ProgramNode(0...13)(
-  [],
-  StatementsNode(0...13)(
-    [DefNode(0...13)(
-       (4...5),
-       nil,
-       ParametersNode(6...8)(
-         [],
-         [],
-         [],
-         nil,
-         [KeywordParameterNode(6...8)((6...8), nil)],
-         nil,
-         nil
-       ),
-       nil,
-       [:k],
-       (0...3),
-       nil,
-       nil,
-       nil,
-       nil,
-       (10...13)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/flip2_env_lvar.txt b/test/yarp/snapshots/seattlerb/flip2_env_lvar.txt
deleted file mode 100644
index bca1426fc13fe5..00000000000000
--- a/test/yarp/snapshots/seattlerb/flip2_env_lvar.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-ProgramNode(0...16)(
-  [],
-  StatementsNode(0...16)(
-    [IfNode(0...16)(
-       (0...2),
-       FlipFlopNode(3...7)(
-         CallNode(3...4)(nil, nil, (3...4), nil, nil, nil, nil, 2, "a"),
-         CallNode(6...7)(nil, nil, (6...7), nil, nil, nil, nil, 2, "b"),
-         (4...6),
-         0
-       ),
-       nil,
-       nil,
-       (13...16)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/float_with_if_modifier.txt b/test/yarp/snapshots/seattlerb/float_with_if_modifier.txt
deleted file mode 100644
index c27a5bfe3b2cfc..00000000000000
--- a/test/yarp/snapshots/seattlerb/float_with_if_modifier.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-ProgramNode(0...10)(
-  [],
-  StatementsNode(0...10)(
-    [IfNode(0...10)(
-       (3...5),
-       TrueNode(6...10)(),
-       StatementsNode(0...3)([FloatNode(0...3)()]),
-       nil,
-       nil
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/heredoc__backslash_dos_format.txt b/test/yarp/snapshots/seattlerb/heredoc__backslash_dos_format.txt
deleted file mode 100644
index befdff81ee76ce..00000000000000
--- a/test/yarp/snapshots/seattlerb/heredoc__backslash_dos_format.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-ProgramNode(0...12)(
-  [:str],
-  StatementsNode(0...12)(
-    [LocalVariableWriteNode(0...12)(
-       :str,
-       0,
-       (0...3),
-       InterpolatedStringNode(6...12)(
-         (6...12),
-         [StringNode(14...30)(nil, (14...30), nil, "beforeafter\r\n")],
-         (30...35)
-       ),
-       (4...5)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/heredoc_backslash_nl.txt b/test/yarp/snapshots/seattlerb/heredoc_backslash_nl.txt
deleted file mode 100644
index 532b1fe9e7e84d..00000000000000
--- a/test/yarp/snapshots/seattlerb/heredoc_backslash_nl.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-ProgramNode(0...49)(
-  [],
-  StatementsNode(0...49)(
-    [StringNode(0...40)(
-       (0...1),
-       (1...39),
-       (39...40),
-       "  why would someone do this?   blah\n"
-     ),
-     InterpolatedStringNode(42...49)(
-       (42...49),
-       [StringNode(50...88)(
-          nil,
-          (50...88),
-          nil,
-          "  why would someone do this?   blah\n"
-        )],
-       (88...93)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/heredoc_bad_hex_escape.txt b/test/yarp/snapshots/seattlerb/heredoc_bad_hex_escape.txt
deleted file mode 100644
index 842da16d1d52f6..00000000000000
--- a/test/yarp/snapshots/seattlerb/heredoc_bad_hex_escape.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-ProgramNode(0...9)(
-  [:s],
-  StatementsNode(0...9)(
-    [LocalVariableWriteNode(0...9)(
-       :s,
-       0,
-       (0...1),
-       InterpolatedStringNode(4...9)(
-         (4...9),
-         [StringNode(10...17)(nil, (10...17), nil, "a\xE9b\n")],
-         (17...21)
-       ),
-       (2...3)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/heredoc_bad_oct_escape.txt b/test/yarp/snapshots/seattlerb/heredoc_bad_oct_escape.txt
deleted file mode 100644
index 14c02bdfb33c37..00000000000000
--- a/test/yarp/snapshots/seattlerb/heredoc_bad_oct_escape.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-ProgramNode(0...10)(
-  [:s],
-  StatementsNode(0...10)(
-    [LocalVariableWriteNode(0...10)(
-       :s,
-       0,
-       (0...1),
-       InterpolatedStringNode(4...10)(
-         (4...10),
-         [StringNode(11...23)(nil, (11...23), nil, "a\xA7b\n" + "cöd\n")],
-         (23...27)
-       ),
-       (2...3)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/heredoc_comma_arg.txt b/test/yarp/snapshots/seattlerb/heredoc_comma_arg.txt
deleted file mode 100644
index bbded2484ec43f..00000000000000
--- a/test/yarp/snapshots/seattlerb/heredoc_comma_arg.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-ProgramNode(0...47)(
-  [],
-  StatementsNode(0...47)(
-    [ArrayNode(0...17)(
-       [StringNode(1...15)((1...2), (2...14), (14...15), "  some text\n")],
-       (0...1),
-       (16...17)
-     ),
-     ArrayNode(19...47)(
-       [InterpolatedStringNode(20...27)(
-          (20...27),
-          [StringNode(29...41)(nil, (29...41), nil, "  some text\n")],
-          (41...46)
-        )],
-       (19...20),
-       (46...47)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/heredoc_lineno.txt b/test/yarp/snapshots/seattlerb/heredoc_lineno.txt
deleted file mode 100644
index 9bbc817c20f30d..00000000000000
--- a/test/yarp/snapshots/seattlerb/heredoc_lineno.txt
+++ /dev/null
@@ -1,28 +0,0 @@
-ProgramNode(0...41)(
-  [:c, :d],
-  StatementsNode(0...41)(
-    [LocalVariableWriteNode(0...11)(
-       :c,
-       0,
-       (0...1),
-       InterpolatedStringNode(4...11)(
-         (4...11),
-         [StringNode(12...30)(
-            nil,
-            (12...30),
-            nil,
-            "line2\n" + "line3\n" + "line4\n"
-          )],
-         (30...34)
-       ),
-       (2...3)
-     ),
-     LocalVariableWriteNode(35...41)(
-       :d,
-       0,
-       (35...36),
-       IntegerNode(39...41)(),
-       (37...38)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/heredoc_nested.txt b/test/yarp/snapshots/seattlerb/heredoc_nested.txt
deleted file mode 100644
index 3c3d30d958aa6d..00000000000000
--- a/test/yarp/snapshots/seattlerb/heredoc_nested.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-ProgramNode(0...23)(
-  [],
-  StatementsNode(0...23)(
-    [ArrayNode(0...23)(
-       [InterpolatedStringNode(1...4)(
-          (1...4),
-          [EmbeddedStatementsNode(6...12)(
-             (6...8),
-             StatementsNode(8...11)(
-               [InterpolatedStringNode(8...11)(
-                  (8...11),
-                  [StringNode(13...15)(nil, (13...15), nil, "b\n")],
-                  (15...17)
-                )]
-             ),
-             (11...12)
-           ),
-           StringNode(12...13)(nil, (12...13), nil, "\n"),
-           StringNode(17...19)(nil, (17...19), nil, "a\n")],
-          (19...21)
-        ),
-        IntegerNode(21...22)()],
-       (0...1),
-       (22...23)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/heredoc_squiggly.txt b/test/yarp/snapshots/seattlerb/heredoc_squiggly.txt
deleted file mode 100644
index 6491c86c04c5aa..00000000000000
--- a/test/yarp/snapshots/seattlerb/heredoc_squiggly.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-ProgramNode(0...12)(
-  [:a],
-  StatementsNode(0...12)(
-    [LocalVariableWriteNode(0...12)(
-       :a,
-       0,
-       (0...1),
-       InterpolatedStringNode(4...12)(
-         (4...12),
-         [StringNode(13...25)(nil, (13...25), nil, "x\n" + "y\n" + "z\n")],
-         (25...31)
-       ),
-       (2...3)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/heredoc_squiggly_blank_line_plus_interpolation.txt b/test/yarp/snapshots/seattlerb/heredoc_squiggly_blank_line_plus_interpolation.txt
deleted file mode 100644
index f2c3c1b1a902b9..00000000000000
--- a/test/yarp/snapshots/seattlerb/heredoc_squiggly_blank_line_plus_interpolation.txt
+++ /dev/null
@@ -1,56 +0,0 @@
-ProgramNode(0...20)(
-  [:a],
-  StatementsNode(0...20)(
-    [LocalVariableWriteNode(0...20)(
-       :a,
-       0,
-       (0...1),
-       CallNode(4...20)(
-         nil,
-         nil,
-         (4...7),
-         (7...8),
-         ArgumentsNode(8...19)(
-           [CallNode(8...19)(
-              InterpolatedStringNode(8...14)(
-                (8...14),
-                [StringNode(21...26)(nil, (21...26), nil, "\n"),
-                 EmbeddedStatementsNode(26...32)(
-                   (26...28),
-                   StatementsNode(28...31)(
-                     [CallNode(28...31)(
-                        nil,
-                        nil,
-                        (28...31),
-                        nil,
-                        nil,
-                        nil,
-                        nil,
-                        2,
-                        "bar"
-                      )]
-                   ),
-                   (31...32)
-                 ),
-                 StringNode(32...36)(nil, (32...36), nil, "baz\n")],
-                (36...42)
-              ),
-              (14...15),
-              (15...19),
-              nil,
-              nil,
-              nil,
-              nil,
-              0,
-              "chop"
-            )]
-         ),
-         (19...20),
-         nil,
-         0,
-         "foo"
-       ),
-       (2...3)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/heredoc_squiggly_blank_lines.txt b/test/yarp/snapshots/seattlerb/heredoc_squiggly_blank_lines.txt
deleted file mode 100644
index 4b59c352461881..00000000000000
--- a/test/yarp/snapshots/seattlerb/heredoc_squiggly_blank_lines.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-ProgramNode(0...10)(
-  [:a],
-  StatementsNode(0...10)(
-    [LocalVariableWriteNode(0...10)(
-       :a,
-       0,
-       (0...1),
-       InterpolatedStringNode(4...10)(
-         (4...10),
-         [StringNode(11...20)(nil, (11...20), nil, "x\n" + "\n" + "z\n")],
-         (20...24)
-       ),
-       (2...3)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/heredoc_squiggly_empty.txt b/test/yarp/snapshots/seattlerb/heredoc_squiggly_empty.txt
deleted file mode 100644
index 7303a5ee71cb35..00000000000000
--- a/test/yarp/snapshots/seattlerb/heredoc_squiggly_empty.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-ProgramNode(0...4)(
-  [],
-  StatementsNode(0...4)([InterpolatedStringNode(0...4)((0...4), [], (5...7))])
-)
diff --git a/test/yarp/snapshots/seattlerb/heredoc_squiggly_interp.txt b/test/yarp/snapshots/seattlerb/heredoc_squiggly_interp.txt
deleted file mode 100644
index e03304a7d147b0..00000000000000
--- a/test/yarp/snapshots/seattlerb/heredoc_squiggly_interp.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-ProgramNode(0...10)(
-  [:a],
-  StatementsNode(0...10)(
-    [LocalVariableWriteNode(0...10)(
-       :a,
-       0,
-       (0...1),
-       InterpolatedStringNode(4...10)(
-         (4...10),
-         [StringNode(11...22)(nil, (11...22), nil, "    w\n" + "x"),
-          EmbeddedStatementsNode(22...27)(
-            (22...24),
-            StatementsNode(24...26)([IntegerNode(24...26)()]),
-            (26...27)
-          ),
-          StringNode(27...36)(nil, (27...36), nil, " y\n" + "  z\n")],
-         (36...42)
-       ),
-       (2...3)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/heredoc_squiggly_no_indent.txt b/test/yarp/snapshots/seattlerb/heredoc_squiggly_no_indent.txt
deleted file mode 100644
index 47a116dab26f12..00000000000000
--- a/test/yarp/snapshots/seattlerb/heredoc_squiggly_no_indent.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-ProgramNode(0...4)(
-  [],
-  StatementsNode(0...4)(
-    [InterpolatedStringNode(0...4)(
-       (0...4),
-       [StringNode(5...7)(nil, (5...7), nil, "a\n")],
-       (7...9)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/heredoc_squiggly_tabs.txt b/test/yarp/snapshots/seattlerb/heredoc_squiggly_tabs.txt
deleted file mode 100644
index 1592d1310476e9..00000000000000
--- a/test/yarp/snapshots/seattlerb/heredoc_squiggly_tabs.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-ProgramNode(0...12)(
-  [:a],
-  StatementsNode(0...12)(
-    [LocalVariableWriteNode(0...12)(
-       :a,
-       0,
-       (0...1),
-       InterpolatedStringNode(4...12)(
-         (4...12),
-         [StringNode(13...43)(
-            nil,
-            (13...43),
-            nil,
-            "blah blah\n" + " blah blah\n"
-          )],
-         (43...49)
-       ),
-       (2...3)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/heredoc_squiggly_tabs_extra.txt b/test/yarp/snapshots/seattlerb/heredoc_squiggly_tabs_extra.txt
deleted file mode 100644
index 63ff5887c9e25e..00000000000000
--- a/test/yarp/snapshots/seattlerb/heredoc_squiggly_tabs_extra.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-ProgramNode(0...12)(
-  [:a],
-  StatementsNode(0...12)(
-    [LocalVariableWriteNode(0...12)(
-       :a,
-       0,
-       (0...1),
-       InterpolatedStringNode(4...12)(
-         (4...12),
-         [StringNode(13...37)(
-            nil,
-            (13...37),
-            nil,
-            "blah blah\n" + "\tblah blah\n"
-          )],
-         (37...43)
-       ),
-       (2...3)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/heredoc_squiggly_visually_blank_lines.txt b/test/yarp/snapshots/seattlerb/heredoc_squiggly_visually_blank_lines.txt
deleted file mode 100644
index 866c5fac084cd5..00000000000000
--- a/test/yarp/snapshots/seattlerb/heredoc_squiggly_visually_blank_lines.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-ProgramNode(0...10)(
-  [:a],
-  StatementsNode(0...10)(
-    [LocalVariableWriteNode(0...10)(
-       :a,
-       0,
-       (0...1),
-       InterpolatedStringNode(4...10)(
-         (4...10),
-         [StringNode(11...21)(nil, (11...21), nil, "x\n" + "\n" + "z\n")],
-         (21...25)
-       ),
-       (2...3)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/heredoc_trailing_slash_continued_call.txt b/test/yarp/snapshots/seattlerb/heredoc_trailing_slash_continued_call.txt
deleted file mode 100644
index b672fceefca2dd..00000000000000
--- a/test/yarp/snapshots/seattlerb/heredoc_trailing_slash_continued_call.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-ProgramNode(0...22)(
-  [],
-  StatementsNode(0...22)(
-    [CallNode(0...22)(
-       InterpolatedStringNode(0...5)(
-         (0...5),
-         [StringNode(7...12)(nil, (7...12), nil, "blah\n")],
-         (12...16)
-       ),
-       (16...17),
-       (17...22),
-       nil,
-       nil,
-       nil,
-       nil,
-       0,
-       "strip"
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/heredoc_unicode.txt b/test/yarp/snapshots/seattlerb/heredoc_unicode.txt
deleted file mode 100644
index 42e475b08a0528..00000000000000
--- a/test/yarp/snapshots/seattlerb/heredoc_unicode.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-ProgramNode(0...9)(
-  [],
-  StatementsNode(0...9)(
-    [InterpolatedStringNode(0...9)(
-       (0...9),
-       [StringNode(10...12)(nil, (10...12), nil, ".\n")],
-       (12...20)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/heredoc_with_carriage_return_escapes.txt b/test/yarp/snapshots/seattlerb/heredoc_with_carriage_return_escapes.txt
deleted file mode 100644
index f3a7cdd423acf8..00000000000000
--- a/test/yarp/snapshots/seattlerb/heredoc_with_carriage_return_escapes.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-ProgramNode(0...5)(
-  [],
-  StatementsNode(0...5)(
-    [InterpolatedStringNode(0...5)(
-       (0...5),
-       [StringNode(6...21)(nil, (6...21), nil, "foo\rbar\n" + "baz\r\n")],
-       (21...25)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/heredoc_with_carriage_return_escapes_windows.txt b/test/yarp/snapshots/seattlerb/heredoc_with_carriage_return_escapes_windows.txt
deleted file mode 100644
index e206ee78a9c8dd..00000000000000
--- a/test/yarp/snapshots/seattlerb/heredoc_with_carriage_return_escapes_windows.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-ProgramNode(0...5)(
-  [],
-  StatementsNode(0...5)(
-    [InterpolatedStringNode(0...5)(
-       (0...5),
-       [StringNode(7...24)(nil, (7...24), nil, "foo\rbar\r\n" + "baz\r\r\n")],
-       (24...29)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/heredoc_with_extra_carriage_horrible_mix.txt b/test/yarp/snapshots/seattlerb/heredoc_with_extra_carriage_horrible_mix.txt
deleted file mode 100644
index 2c5d16dcabc667..00000000000000
--- a/test/yarp/snapshots/seattlerb/heredoc_with_extra_carriage_horrible_mix.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-ProgramNode(0...7)(
-  [],
-  StatementsNode(0...7)(
-    [InterpolatedStringNode(0...7)(
-       (0...7),
-       [StringNode(9...15)(nil, (9...15), nil, "body\r\n")],
-       (15...19)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/heredoc_with_extra_carriage_returns.txt b/test/yarp/snapshots/seattlerb/heredoc_with_extra_carriage_returns.txt
deleted file mode 100644
index 35583e32899ba5..00000000000000
--- a/test/yarp/snapshots/seattlerb/heredoc_with_extra_carriage_returns.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-ProgramNode(0...5)(
-  [],
-  StatementsNode(0...5)(
-    [InterpolatedStringNode(0...5)(
-       (0...5),
-       [StringNode(6...19)(nil, (6...19), nil, "foo\rbar\r\n" + "baz\n")],
-       (19...23)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/heredoc_with_extra_carriage_returns_windows.txt b/test/yarp/snapshots/seattlerb/heredoc_with_extra_carriage_returns_windows.txt
deleted file mode 100644
index c36008cfcebcc8..00000000000000
--- a/test/yarp/snapshots/seattlerb/heredoc_with_extra_carriage_returns_windows.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-ProgramNode(0...5)(
-  [],
-  StatementsNode(0...5)(
-    [InterpolatedStringNode(0...5)(
-       (0...5),
-       [StringNode(7...22)(nil, (7...22), nil, "foo\rbar\r\r\n" + "baz\r\n")],
-       (22...27)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/heredoc_with_interpolation_and_carriage_return_escapes.txt b/test/yarp/snapshots/seattlerb/heredoc_with_interpolation_and_carriage_return_escapes.txt
deleted file mode 100644
index 452e5b605b8ef5..00000000000000
--- a/test/yarp/snapshots/seattlerb/heredoc_with_interpolation_and_carriage_return_escapes.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-ProgramNode(0...5)(
-  [],
-  StatementsNode(0...5)(
-    [InterpolatedStringNode(0...5)(
-       (0...5),
-       [StringNode(6...11)(nil, (6...11), nil, "foo\r"),
-        EmbeddedVariableNode(11...16)(
-          (11...12),
-          InstanceVariableReadNode(12...16)(:@bar)
-        ),
-        StringNode(16...17)(nil, (16...17), nil, "\n")],
-       (17...21)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/heredoc_with_interpolation_and_carriage_return_escapes_windows.txt b/test/yarp/snapshots/seattlerb/heredoc_with_interpolation_and_carriage_return_escapes_windows.txt
deleted file mode 100644
index 99b42f6122a97e..00000000000000
--- a/test/yarp/snapshots/seattlerb/heredoc_with_interpolation_and_carriage_return_escapes_windows.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-ProgramNode(0...5)(
-  [],
-  StatementsNode(0...5)(
-    [InterpolatedStringNode(0...5)(
-       (0...5),
-       [StringNode(7...12)(nil, (7...12), nil, "foo\r"),
-        EmbeddedVariableNode(12...17)(
-          (12...13),
-          InstanceVariableReadNode(13...17)(:@bar)
-        ),
-        StringNode(17...19)(nil, (17...19), nil, "\r\n")],
-       (19...24)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/heredoc_with_not_global_interpolation.txt b/test/yarp/snapshots/seattlerb/heredoc_with_not_global_interpolation.txt
deleted file mode 100644
index be3f48e171bbdb..00000000000000
--- a/test/yarp/snapshots/seattlerb/heredoc_with_not_global_interpolation.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-ProgramNode(0...10)(
-  [],
-  StatementsNode(0...10)(
-    [InterpolatedStringNode(0...10)(
-       (0...10),
-       [StringNode(11...15)(nil, (11...15), nil, "\#${\n")],
-       (15...23)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/heredoc_with_only_carriage_returns.txt b/test/yarp/snapshots/seattlerb/heredoc_with_only_carriage_returns.txt
deleted file mode 100644
index f4a65965f68fc1..00000000000000
--- a/test/yarp/snapshots/seattlerb/heredoc_with_only_carriage_returns.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-ProgramNode(0...5)(
-  [],
-  StatementsNode(0...5)(
-    [InterpolatedStringNode(0...5)(
-       (0...5),
-       [StringNode(6...14)(nil, (6...14), nil, "\r\n" + "\r\r\n" + "\r\n")],
-       (14...18)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/heredoc_with_only_carriage_returns_windows.txt b/test/yarp/snapshots/seattlerb/heredoc_with_only_carriage_returns_windows.txt
deleted file mode 100644
index e3fbb71b7f4b2a..00000000000000
--- a/test/yarp/snapshots/seattlerb/heredoc_with_only_carriage_returns_windows.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-ProgramNode(0...5)(
-  [],
-  StatementsNode(0...5)(
-    [InterpolatedStringNode(0...5)(
-       (0...5),
-       [StringNode(7...18)(
-          nil,
-          (7...18),
-          nil,
-          "\r\r\n" + "\r\r\r\n" + "\r\r\n"
-        )],
-       (18...23)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/if_elsif.txt b/test/yarp/snapshots/seattlerb/if_elsif.txt
deleted file mode 100644
index 51c89a9a32b540..00000000000000
--- a/test/yarp/snapshots/seattlerb/if_elsif.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-ProgramNode(0...18)(
-  [],
-  StatementsNode(0...18)(
-    [IfNode(0...18)(
-       (0...2),
-       IntegerNode(3...4)(),
-       nil,
-       IfNode(6...18)((6...11), IntegerNode(12...13)(), nil, nil, (15...18)),
-       (15...18)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/if_symbol.txt b/test/yarp/snapshots/seattlerb/if_symbol.txt
deleted file mode 100644
index 4e4fdcefcef611..00000000000000
--- a/test/yarp/snapshots/seattlerb/if_symbol.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-ProgramNode(0...12)(
-  [],
-  StatementsNode(0...12)(
-    [IfNode(0...12)(
-       (0...2),
-       CallNode(3...7)(
-         nil,
-         nil,
-         (3...4),
-         nil,
-         ArgumentsNode(5...7)([SymbolNode(5...7)((5...6), (6...7), nil, "x")]),
-         nil,
-         nil,
-         0,
-         "f"
-       ),
-       nil,
-       nil,
-       (9...12)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/in_expr_no_case.txt b/test/yarp/snapshots/seattlerb/in_expr_no_case.txt
deleted file mode 100644
index a4249f6414c37a..00000000000000
--- a/test/yarp/snapshots/seattlerb/in_expr_no_case.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-ProgramNode(0...16)(
-  [],
-  StatementsNode(0...16)(
-    [MatchPredicateNode(0...16)(
-       StringNode(0...6)((0...1), (1...5), (5...6), "woot"),
-       ConstantReadNode(10...16)(:String),
-       (7...9)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/index_0.txt b/test/yarp/snapshots/seattlerb/index_0.txt
deleted file mode 100644
index 42a7239752988d..00000000000000
--- a/test/yarp/snapshots/seattlerb/index_0.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-ProgramNode(0...7)(
-  [],
-  StatementsNode(0...7)(
-    [CallNode(0...7)(
-       CallNode(0...1)(nil, nil, (0...1), nil, nil, nil, nil, 2, "a"),
-       nil,
-       (1...3),
-       (1...2),
-       ArgumentsNode(6...7)(
-         [CallNode(6...7)(nil, nil, (6...7), nil, nil, nil, nil, 2, "b")]
-       ),
-       (2...3),
-       nil,
-       0,
-       "[]="
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/index_0_opasgn.txt b/test/yarp/snapshots/seattlerb/index_0_opasgn.txt
deleted file mode 100644
index 60c76d0d005ecb..00000000000000
--- a/test/yarp/snapshots/seattlerb/index_0_opasgn.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-ProgramNode(0...8)(
-  [],
-  StatementsNode(0...8)(
-    [CallOperatorWriteNode(0...8)(
-       CallNode(0...1)(nil, nil, (0...1), nil, nil, nil, nil, 2, "a"),
-       nil,
-       (1...3),
-       (1...2),
-       nil,
-       (2...3),
-       0,
-       "[]",
-       "[]=",
-       :+,
-       (4...6),
-       CallNode(7...8)(nil, nil, (7...8), nil, nil, nil, nil, 2, "b")
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/integer_with_if_modifier.txt b/test/yarp/snapshots/seattlerb/integer_with_if_modifier.txt
deleted file mode 100644
index f57ed6c4229648..00000000000000
--- a/test/yarp/snapshots/seattlerb/integer_with_if_modifier.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-ProgramNode(0...12)(
-  [],
-  StatementsNode(0...12)(
-    [IfNode(0...12)(
-       (5...7),
-       TrueNode(8...12)(),
-       StatementsNode(0...5)([IntegerNode(0...5)()]),
-       nil,
-       nil
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/interpolated_symbol_array_line_breaks.txt b/test/yarp/snapshots/seattlerb/interpolated_symbol_array_line_breaks.txt
deleted file mode 100644
index 0a779610a699c8..00000000000000
--- a/test/yarp/snapshots/seattlerb/interpolated_symbol_array_line_breaks.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-ProgramNode(0...11)(
-  [],
-  StatementsNode(0...11)(
-    [ArrayNode(0...9)(
-       [SymbolNode(4...5)(nil, (4...5), nil, "a"),
-        SymbolNode(6...7)(nil, (6...7), nil, "b")],
-       (0...3),
-       (8...9)
-     ),
-     IntegerNode(10...11)()]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/interpolated_word_array_line_breaks.txt b/test/yarp/snapshots/seattlerb/interpolated_word_array_line_breaks.txt
deleted file mode 100644
index 901575f9a8dde8..00000000000000
--- a/test/yarp/snapshots/seattlerb/interpolated_word_array_line_breaks.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-ProgramNode(0...11)(
-  [],
-  StatementsNode(0...11)(
-    [ArrayNode(0...9)(
-       [StringNode(4...5)(nil, (4...5), nil, "a"),
-        StringNode(6...7)(nil, (6...7), nil, "b")],
-       (0...3),
-       (8...9)
-     ),
-     IntegerNode(10...11)()]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/iter_args_1.txt b/test/yarp/snapshots/seattlerb/iter_args_1.txt
deleted file mode 100644
index 9fdbf688181966..00000000000000
--- a/test/yarp/snapshots/seattlerb/iter_args_1.txt
+++ /dev/null
@@ -1,36 +0,0 @@
-ProgramNode(0...11)(
-  [],
-  StatementsNode(0...11)(
-    [CallNode(0...11)(
-       nil,
-       nil,
-       (0...1),
-       nil,
-       nil,
-       nil,
-       BlockNode(2...11)(
-         [:a, :b],
-         BlockParametersNode(4...9)(
-           ParametersNode(5...8)(
-             [RequiredParameterNode(5...6)(:a),
-              RequiredParameterNode(7...8)(:b)],
-             [],
-             [],
-             nil,
-             [],
-             nil,
-             nil
-           ),
-           [],
-           (4...5),
-           (8...9)
-         ),
-         nil,
-         (2...3),
-         (10...11)
-       ),
-       0,
-       "f"
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/iter_args_10_1.txt b/test/yarp/snapshots/seattlerb/iter_args_10_1.txt
deleted file mode 100644
index 5da1b5260a54bc..00000000000000
--- a/test/yarp/snapshots/seattlerb/iter_args_10_1.txt
+++ /dev/null
@@ -1,40 +0,0 @@
-ProgramNode(0...21)(
-  [],
-  StatementsNode(0...21)(
-    [CallNode(0...21)(
-       nil,
-       nil,
-       (0...1),
-       nil,
-       nil,
-       nil,
-       BlockNode(2...21)(
-         [:a, :b, :c],
-         BlockParametersNode(4...19)(
-           ParametersNode(5...18)(
-             [RequiredParameterNode(5...6)(:a)],
-             [OptionalParameterNode(8...14)(
-                :b,
-                (8...9),
-                (10...11),
-                IntegerNode(12...14)()
-              )],
-             [],
-             RestParameterNode(16...18)((16...17), (17...18)),
-             [],
-             nil,
-             nil
-           ),
-           [],
-           (4...5),
-           (18...19)
-         ),
-         nil,
-         (2...3),
-         (20...21)
-       ),
-       0,
-       "f"
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/iter_args_10_2.txt b/test/yarp/snapshots/seattlerb/iter_args_10_2.txt
deleted file mode 100644
index f847bcc0317ea2..00000000000000
--- a/test/yarp/snapshots/seattlerb/iter_args_10_2.txt
+++ /dev/null
@@ -1,40 +0,0 @@
-ProgramNode(0...25)(
-  [],
-  StatementsNode(0...25)(
-    [CallNode(0...25)(
-       nil,
-       nil,
-       (0...1),
-       nil,
-       nil,
-       nil,
-       BlockNode(2...25)(
-         [:a, :b, :c, :d],
-         BlockParametersNode(4...23)(
-           ParametersNode(5...22)(
-             [RequiredParameterNode(5...6)(:a)],
-             [OptionalParameterNode(8...14)(
-                :b,
-                (8...9),
-                (10...11),
-                IntegerNode(12...14)()
-              )],
-             [],
-             RestParameterNode(16...18)((16...17), (17...18)),
-             [],
-             nil,
-             BlockParameterNode(20...22)(:d, (21...22), (20...21))
-           ),
-           [],
-           (4...5),
-           (22...23)
-         ),
-         nil,
-         (2...3),
-         (24...25)
-       ),
-       0,
-       "f"
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/iter_args_11_1.txt b/test/yarp/snapshots/seattlerb/iter_args_11_1.txt
deleted file mode 100644
index 83f48569dc8a91..00000000000000
--- a/test/yarp/snapshots/seattlerb/iter_args_11_1.txt
+++ /dev/null
@@ -1,40 +0,0 @@
-ProgramNode(0...24)(
-  [],
-  StatementsNode(0...24)(
-    [CallNode(0...24)(
-       nil,
-       nil,
-       (0...1),
-       nil,
-       nil,
-       nil,
-       BlockNode(2...24)(
-         [:a, :b, :c, :d],
-         BlockParametersNode(4...22)(
-           ParametersNode(5...21)(
-             [RequiredParameterNode(5...6)(:a)],
-             [OptionalParameterNode(8...14)(
-                :b,
-                (8...9),
-                (10...11),
-                IntegerNode(12...14)()
-              )],
-             [RequiredParameterNode(20...21)(:d)],
-             RestParameterNode(16...18)((16...17), (17...18)),
-             [],
-             nil,
-             nil
-           ),
-           [],
-           (4...5),
-           (21...22)
-         ),
-         nil,
-         (2...3),
-         (23...24)
-       ),
-       0,
-       "f"
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/iter_args_11_2.txt b/test/yarp/snapshots/seattlerb/iter_args_11_2.txt
deleted file mode 100644
index bfd864e20e2649..00000000000000
--- a/test/yarp/snapshots/seattlerb/iter_args_11_2.txt
+++ /dev/null
@@ -1,40 +0,0 @@
-ProgramNode(0...28)(
-  [],
-  StatementsNode(0...28)(
-    [CallNode(0...28)(
-       nil,
-       nil,
-       (0...1),
-       nil,
-       nil,
-       nil,
-       BlockNode(2...28)(
-         [:a, :b, :c, :d, :e],
-         BlockParametersNode(4...26)(
-           ParametersNode(5...25)(
-             [RequiredParameterNode(5...6)(:a)],
-             [OptionalParameterNode(8...14)(
-                :b,
-                (8...9),
-                (10...11),
-                IntegerNode(12...14)()
-              )],
-             [RequiredParameterNode(20...21)(:d)],
-             RestParameterNode(16...18)((16...17), (17...18)),
-             [],
-             nil,
-             BlockParameterNode(23...25)(:e, (24...25), (23...24))
-           ),
-           [],
-           (4...5),
-           (25...26)
-         ),
-         nil,
-         (2...3),
-         (27...28)
-       ),
-       0,
-       "f"
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/iter_args_2__19.txt b/test/yarp/snapshots/seattlerb/iter_args_2__19.txt
deleted file mode 100644
index e9e94d3d6e172b..00000000000000
--- a/test/yarp/snapshots/seattlerb/iter_args_2__19.txt
+++ /dev/null
@@ -1,40 +0,0 @@
-ProgramNode(0...14)(
-  [],
-  StatementsNode(0...14)(
-    [CallNode(0...14)(
-       nil,
-       nil,
-       (0...1),
-       nil,
-       nil,
-       nil,
-       BlockNode(2...14)(
-         [:a, :b],
-         BlockParametersNode(4...12)(
-           ParametersNode(5...11)(
-             [RequiredDestructuredParameterNode(5...11)(
-                [RequiredParameterNode(6...7)(:a),
-                 RequiredParameterNode(9...10)(:b)],
-                (5...6),
-                (10...11)
-              )],
-             [],
-             [],
-             nil,
-             [],
-             nil,
-             nil
-           ),
-           [],
-           (4...5),
-           (11...12)
-         ),
-         nil,
-         (2...3),
-         (13...14)
-       ),
-       0,
-       "f"
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/iter_args_3.txt b/test/yarp/snapshots/seattlerb/iter_args_3.txt
deleted file mode 100644
index 8d191cc2e5bd36..00000000000000
--- a/test/yarp/snapshots/seattlerb/iter_args_3.txt
+++ /dev/null
@@ -1,42 +0,0 @@
-ProgramNode(0...20)(
-  [],
-  StatementsNode(0...20)(
-    [CallNode(0...20)(
-       nil,
-       nil,
-       (0...1),
-       nil,
-       nil,
-       nil,
-       BlockNode(2...20)(
-         [:a, :b, :c, :d],
-         BlockParametersNode(4...18)(
-           ParametersNode(5...17)(
-             [RequiredParameterNode(5...6)(:a),
-              RequiredDestructuredParameterNode(8...14)(
-                [RequiredParameterNode(9...10)(:b),
-                 RequiredParameterNode(12...13)(:c)],
-                (8...9),
-                (13...14)
-              ),
-              RequiredParameterNode(16...17)(:d)],
-             [],
-             [],
-             nil,
-             [],
-             nil,
-             nil
-           ),
-           [],
-           (4...5),
-           (17...18)
-         ),
-         nil,
-         (2...3),
-         (19...20)
-       ),
-       0,
-       "f"
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/iter_args_4.txt b/test/yarp/snapshots/seattlerb/iter_args_4.txt
deleted file mode 100644
index eaa140a522d62c..00000000000000
--- a/test/yarp/snapshots/seattlerb/iter_args_4.txt
+++ /dev/null
@@ -1,35 +0,0 @@
-ProgramNode(0...16)(
-  [],
-  StatementsNode(0...16)(
-    [CallNode(0...16)(
-       nil,
-       nil,
-       (0...1),
-       nil,
-       nil,
-       nil,
-       BlockNode(2...16)(
-         [:a, :b, :c],
-         BlockParametersNode(4...14)(
-           ParametersNode(5...13)(
-             [RequiredParameterNode(5...6)(:a)],
-             [],
-             [RequiredParameterNode(12...13)(:c)],
-             RestParameterNode(8...10)((8...9), (9...10)),
-             [],
-             nil,
-             nil
-           ),
-           [],
-           (4...5),
-           (13...14)
-         ),
-         nil,
-         (2...3),
-         (15...16)
-       ),
-       0,
-       "f"
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/iter_args_5.txt b/test/yarp/snapshots/seattlerb/iter_args_5.txt
deleted file mode 100644
index 224bdc0bf9b14d..00000000000000
--- a/test/yarp/snapshots/seattlerb/iter_args_5.txt
+++ /dev/null
@@ -1,35 +0,0 @@
-ProgramNode(0...13)(
-  [],
-  StatementsNode(0...13)(
-    [CallNode(0...13)(
-       nil,
-       nil,
-       (0...1),
-       nil,
-       nil,
-       nil,
-       BlockNode(2...13)(
-         [:a, :b],
-         BlockParametersNode(4...11)(
-           ParametersNode(5...10)(
-             [RequiredParameterNode(5...6)(:a)],
-             [],
-             [],
-             nil,
-             [],
-             nil,
-             BlockParameterNode(8...10)(:b, (9...10), (8...9))
-           ),
-           [],
-           (4...5),
-           (10...11)
-         ),
-         nil,
-         (2...3),
-         (12...13)
-       ),
-       0,
-       "f"
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/iter_args_6.txt b/test/yarp/snapshots/seattlerb/iter_args_6.txt
deleted file mode 100644
index 8a69456b62e231..00000000000000
--- a/test/yarp/snapshots/seattlerb/iter_args_6.txt
+++ /dev/null
@@ -1,40 +0,0 @@
-ProgramNode(0...18)(
-  [],
-  StatementsNode(0...18)(
-    [CallNode(0...18)(
-       nil,
-       nil,
-       (0...1),
-       nil,
-       nil,
-       nil,
-       BlockNode(2...18)(
-         [:a, :b, :c],
-         BlockParametersNode(4...16)(
-           ParametersNode(5...15)(
-             [RequiredParameterNode(5...6)(:a)],
-             [OptionalParameterNode(8...12)(
-                :b,
-                (8...9),
-                (9...10),
-                IntegerNode(10...12)()
-              )],
-             [RequiredParameterNode(14...15)(:c)],
-             nil,
-             [],
-             nil,
-             nil
-           ),
-           [],
-           (4...5),
-           (15...16)
-         ),
-         nil,
-         (2...3),
-         (17...18)
-       ),
-       0,
-       "f"
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/iter_args_7_1.txt b/test/yarp/snapshots/seattlerb/iter_args_7_1.txt
deleted file mode 100644
index ad285d8cadee8d..00000000000000
--- a/test/yarp/snapshots/seattlerb/iter_args_7_1.txt
+++ /dev/null
@@ -1,40 +0,0 @@
-ProgramNode(0...18)(
-  [],
-  StatementsNode(0...18)(
-    [CallNode(0...18)(
-       nil,
-       nil,
-       (0...1),
-       nil,
-       nil,
-       nil,
-       BlockNode(2...18)(
-         [:a, :b],
-         BlockParametersNode(4...16)(
-           ParametersNode(5...15)(
-             [],
-             [OptionalParameterNode(5...11)(
-                :a,
-                (5...6),
-                (7...8),
-                IntegerNode(9...11)()
-              )],
-             [],
-             RestParameterNode(13...15)((13...14), (14...15)),
-             [],
-             nil,
-             nil
-           ),
-           [],
-           (4...5),
-           (15...16)
-         ),
-         nil,
-         (2...3),
-         (17...18)
-       ),
-       0,
-       "f"
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/iter_args_7_2.txt b/test/yarp/snapshots/seattlerb/iter_args_7_2.txt
deleted file mode 100644
index 3ce974e279027f..00000000000000
--- a/test/yarp/snapshots/seattlerb/iter_args_7_2.txt
+++ /dev/null
@@ -1,40 +0,0 @@
-ProgramNode(0...22)(
-  [],
-  StatementsNode(0...22)(
-    [CallNode(0...22)(
-       nil,
-       nil,
-       (0...1),
-       nil,
-       nil,
-       nil,
-       BlockNode(2...22)(
-         [:a, :b, :c],
-         BlockParametersNode(4...20)(
-           ParametersNode(5...19)(
-             [],
-             [OptionalParameterNode(5...11)(
-                :a,
-                (5...6),
-                (7...8),
-                IntegerNode(9...11)()
-              )],
-             [],
-             RestParameterNode(13...15)((13...14), (14...15)),
-             [],
-             nil,
-             BlockParameterNode(17...19)(:c, (18...19), (17...18))
-           ),
-           [],
-           (4...5),
-           (19...20)
-         ),
-         nil,
-         (2...3),
-         (21...22)
-       ),
-       0,
-       "f"
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/iter_args_8_1.txt b/test/yarp/snapshots/seattlerb/iter_args_8_1.txt
deleted file mode 100644
index 1a4ed0f5994266..00000000000000
--- a/test/yarp/snapshots/seattlerb/iter_args_8_1.txt
+++ /dev/null
@@ -1,40 +0,0 @@
-ProgramNode(0...21)(
-  [],
-  StatementsNode(0...21)(
-    [CallNode(0...21)(
-       nil,
-       nil,
-       (0...1),
-       nil,
-       nil,
-       nil,
-       BlockNode(2...21)(
-         [:a, :b, :c],
-         BlockParametersNode(4...19)(
-           ParametersNode(5...18)(
-             [],
-             [OptionalParameterNode(5...11)(
-                :a,
-                (5...6),
-                (7...8),
-                IntegerNode(9...11)()
-              )],
-             [RequiredParameterNode(17...18)(:c)],
-             RestParameterNode(13...15)((13...14), (14...15)),
-             [],
-             nil,
-             nil
-           ),
-           [],
-           (4...5),
-           (18...19)
-         ),
-         nil,
-         (2...3),
-         (20...21)
-       ),
-       0,
-       "f"
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/iter_args_8_2.txt b/test/yarp/snapshots/seattlerb/iter_args_8_2.txt
deleted file mode 100644
index 8b2b3f2b85c46e..00000000000000
--- a/test/yarp/snapshots/seattlerb/iter_args_8_2.txt
+++ /dev/null
@@ -1,40 +0,0 @@
-ProgramNode(0...25)(
-  [],
-  StatementsNode(0...25)(
-    [CallNode(0...25)(
-       nil,
-       nil,
-       (0...1),
-       nil,
-       nil,
-       nil,
-       BlockNode(2...25)(
-         [:a, :b, :c, :d],
-         BlockParametersNode(4...23)(
-           ParametersNode(5...22)(
-             [],
-             [OptionalParameterNode(5...11)(
-                :a,
-                (5...6),
-                (7...8),
-                IntegerNode(9...11)()
-              )],
-             [RequiredParameterNode(17...18)(:c)],
-             RestParameterNode(13...15)((13...14), (14...15)),
-             [],
-             nil,
-             BlockParameterNode(20...22)(:d, (21...22), (20...21))
-           ),
-           [],
-           (4...5),
-           (22...23)
-         ),
-         nil,
-         (2...3),
-         (24...25)
-       ),
-       0,
-       "f"
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/iter_args_9_1.txt b/test/yarp/snapshots/seattlerb/iter_args_9_1.txt
deleted file mode 100644
index 68d1fe93388cf3..00000000000000
--- a/test/yarp/snapshots/seattlerb/iter_args_9_1.txt
+++ /dev/null
@@ -1,40 +0,0 @@
-ProgramNode(0...17)(
-  [],
-  StatementsNode(0...17)(
-    [CallNode(0...17)(
-       nil,
-       nil,
-       (0...1),
-       nil,
-       nil,
-       nil,
-       BlockNode(2...17)(
-         [:a, :b],
-         BlockParametersNode(4...15)(
-           ParametersNode(5...14)(
-             [],
-             [OptionalParameterNode(5...11)(
-                :a,
-                (5...6),
-                (7...8),
-                IntegerNode(9...11)()
-              )],
-             [RequiredParameterNode(13...14)(:b)],
-             nil,
-             [],
-             nil,
-             nil
-           ),
-           [],
-           (4...5),
-           (14...15)
-         ),
-         nil,
-         (2...3),
-         (16...17)
-       ),
-       0,
-       "f"
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/iter_args_9_2.txt b/test/yarp/snapshots/seattlerb/iter_args_9_2.txt
deleted file mode 100644
index 904d13e7e160a7..00000000000000
--- a/test/yarp/snapshots/seattlerb/iter_args_9_2.txt
+++ /dev/null
@@ -1,40 +0,0 @@
-ProgramNode(0...21)(
-  [],
-  StatementsNode(0...21)(
-    [CallNode(0...21)(
-       nil,
-       nil,
-       (0...1),
-       nil,
-       nil,
-       nil,
-       BlockNode(2...21)(
-         [:a, :b, :c],
-         BlockParametersNode(4...19)(
-           ParametersNode(5...18)(
-             [],
-             [OptionalParameterNode(5...11)(
-                :a,
-                (5...6),
-                (7...8),
-                IntegerNode(9...11)()
-              )],
-             [RequiredParameterNode(13...14)(:b)],
-             nil,
-             [],
-             nil,
-             BlockParameterNode(16...18)(:c, (17...18), (16...17))
-           ),
-           [],
-           (4...5),
-           (18...19)
-         ),
-         nil,
-         (2...3),
-         (20...21)
-       ),
-       0,
-       "f"
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/iter_kwarg.txt b/test/yarp/snapshots/seattlerb/iter_kwarg.txt
deleted file mode 100644
index a3984ee42f5047..00000000000000
--- a/test/yarp/snapshots/seattlerb/iter_kwarg.txt
+++ /dev/null
@@ -1,35 +0,0 @@
-ProgramNode(0...12)(
-  [],
-  StatementsNode(0...12)(
-    [CallNode(0...12)(
-       nil,
-       nil,
-       (0...1),
-       nil,
-       nil,
-       nil,
-       BlockNode(2...12)(
-         [:b],
-         BlockParametersNode(4...10)(
-           ParametersNode(5...9)(
-             [],
-             [],
-             [],
-             nil,
-             [KeywordParameterNode(5...9)((5...7), IntegerNode(8...9)())],
-             nil,
-             nil
-           ),
-           [],
-           (4...5),
-           (9...10)
-         ),
-         nil,
-         (2...3),
-         (11...12)
-       ),
-       0,
-       "a"
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/iter_kwarg_kwsplat.txt b/test/yarp/snapshots/seattlerb/iter_kwarg_kwsplat.txt
deleted file mode 100644
index 39dce0cca39f15..00000000000000
--- a/test/yarp/snapshots/seattlerb/iter_kwarg_kwsplat.txt
+++ /dev/null
@@ -1,35 +0,0 @@
-ProgramNode(0...17)(
-  [],
-  StatementsNode(0...17)(
-    [CallNode(0...17)(
-       nil,
-       nil,
-       (0...1),
-       nil,
-       nil,
-       nil,
-       BlockNode(2...17)(
-         [:b, :c],
-         BlockParametersNode(4...15)(
-           ParametersNode(5...14)(
-             [],
-             [],
-             [],
-             nil,
-             [KeywordParameterNode(5...9)((5...7), IntegerNode(8...9)())],
-             KeywordRestParameterNode(11...14)((11...13), (13...14)),
-             nil
-           ),
-           [],
-           (4...5),
-           (14...15)
-         ),
-         nil,
-         (2...3),
-         (16...17)
-       ),
-       0,
-       "a"
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/label_vs_string.txt b/test/yarp/snapshots/seattlerb/label_vs_string.txt
deleted file mode 100644
index f647e6da0e4859..00000000000000
--- a/test/yarp/snapshots/seattlerb/label_vs_string.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-ProgramNode(0...12)(
-  [],
-  StatementsNode(0...12)(
-    [CallNode(0...12)(
-       CallNode(0...4)(nil, nil, (0...4), nil, nil, nil, nil, 2, "_buf"),
-       nil,
-       (5...7),
-       nil,
-       ArgumentsNode(8...12)(
-         [StringNode(8...12)((8...9), (9...11), (11...12), ":\n")]
-       ),
-       nil,
-       nil,
-       0,
-       "<<"
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/lambda_do_vs_brace.txt b/test/yarp/snapshots/seattlerb/lambda_do_vs_brace.txt
deleted file mode 100644
index c7f83a9b512023..00000000000000
--- a/test/yarp/snapshots/seattlerb/lambda_do_vs_brace.txt
+++ /dev/null
@@ -1,71 +0,0 @@
-ProgramNode(0...46)(
-  [],
-  StatementsNode(0...46)(
-    [CallNode(0...11)(
-       nil,
-       nil,
-       (0...1),
-       nil,
-       ArgumentsNode(2...11)(
-         [LambdaNode(2...11)([], (2...4), (5...7), (8...11), nil, nil)]
-       ),
-       nil,
-       nil,
-       0,
-       "f"
-     ),
-     CallNode(13...20)(
-       nil,
-       nil,
-       (13...14),
-       nil,
-       ArgumentsNode(15...20)(
-         [LambdaNode(15...20)([], (15...17), (18...19), (19...20), nil, nil)]
-       ),
-       nil,
-       nil,
-       0,
-       "f"
-     ),
-     CallNode(22...35)(
-       nil,
-       nil,
-       (22...23),
-       nil,
-       ArgumentsNode(24...35)(
-         [LambdaNode(24...35)(
-            [],
-            (24...26),
-            (29...31),
-            (32...35),
-            BlockParametersNode(26...28)(nil, [], (26...27), (27...28)),
-            nil
-          )]
-       ),
-       nil,
-       nil,
-       0,
-       "f"
-     ),
-     CallNode(37...46)(
-       nil,
-       nil,
-       (37...38),
-       nil,
-       ArgumentsNode(39...46)(
-         [LambdaNode(39...46)(
-            [],
-            (39...41),
-            (44...45),
-            (45...46),
-            BlockParametersNode(41...43)(nil, [], (41...42), (42...43)),
-            nil
-          )]
-       ),
-       nil,
-       nil,
-       0,
-       "f"
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/lasgn_arg_rescue_arg.txt b/test/yarp/snapshots/seattlerb/lasgn_arg_rescue_arg.txt
deleted file mode 100644
index ad36a5edb4eab8..00000000000000
--- a/test/yarp/snapshots/seattlerb/lasgn_arg_rescue_arg.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-ProgramNode(0...14)(
-  [:a],
-  StatementsNode(0...14)(
-    [LocalVariableWriteNode(0...14)(
-       :a,
-       0,
-       (0...1),
-       RescueModifierNode(4...14)(
-         IntegerNode(4...5)(),
-         (6...12),
-         IntegerNode(13...14)()
-       ),
-       (2...3)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/lasgn_call_bracket_rescue_arg.txt b/test/yarp/snapshots/seattlerb/lasgn_call_bracket_rescue_arg.txt
deleted file mode 100644
index 86469f1c9129e5..00000000000000
--- a/test/yarp/snapshots/seattlerb/lasgn_call_bracket_rescue_arg.txt
+++ /dev/null
@@ -1,26 +0,0 @@
-ProgramNode(0...17)(
-  [:a],
-  StatementsNode(0...17)(
-    [LocalVariableWriteNode(0...17)(
-       :a,
-       0,
-       (0...1),
-       RescueModifierNode(4...17)(
-         CallNode(4...8)(
-           nil,
-           nil,
-           (4...5),
-           (5...6),
-           ArgumentsNode(6...7)([IntegerNode(6...7)()]),
-           (7...8),
-           nil,
-           0,
-           "b"
-         ),
-         (9...15),
-         IntegerNode(16...17)()
-       ),
-       (2...3)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/lasgn_call_nobracket_rescue_arg.txt b/test/yarp/snapshots/seattlerb/lasgn_call_nobracket_rescue_arg.txt
deleted file mode 100644
index 72e54e010160ce..00000000000000
--- a/test/yarp/snapshots/seattlerb/lasgn_call_nobracket_rescue_arg.txt
+++ /dev/null
@@ -1,28 +0,0 @@
-ProgramNode(0...16)(
-  [:a],
-  StatementsNode(0...16)(
-    [LocalVariableWriteNode(0...16)(
-       :a,
-       0,
-       (0...1),
-       CallNode(4...16)(
-         nil,
-         nil,
-         (4...5),
-         nil,
-         ArgumentsNode(6...16)(
-           [RescueModifierNode(6...16)(
-              IntegerNode(6...7)(),
-              (8...14),
-              IntegerNode(15...16)()
-            )]
-         ),
-         nil,
-         nil,
-         0,
-         "b"
-       ),
-       (2...3)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/lasgn_command.txt b/test/yarp/snapshots/seattlerb/lasgn_command.txt
deleted file mode 100644
index b1912a7c6d22cf..00000000000000
--- a/test/yarp/snapshots/seattlerb/lasgn_command.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-ProgramNode(0...9)(
-  [:a],
-  StatementsNode(0...9)(
-    [LocalVariableWriteNode(0...9)(
-       :a,
-       0,
-       (0...1),
-       CallNode(4...9)(
-         CallNode(4...5)(nil, nil, (4...5), nil, nil, nil, nil, 2, "b"),
-         (5...6),
-         (6...7),
-         nil,
-         ArgumentsNode(8...9)([IntegerNode(8...9)()]),
-         nil,
-         nil,
-         0,
-         "c"
-       ),
-       (2...3)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/lasgn_env.txt b/test/yarp/snapshots/seattlerb/lasgn_env.txt
deleted file mode 100644
index cfd276b1b28557..00000000000000
--- a/test/yarp/snapshots/seattlerb/lasgn_env.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-ProgramNode(0...6)(
-  [:a],
-  StatementsNode(0...6)(
-    [LocalVariableWriteNode(0...6)(
-       :a,
-       0,
-       (0...1),
-       IntegerNode(4...6)(),
-       (2...3)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/lasgn_ivar_env.txt b/test/yarp/snapshots/seattlerb/lasgn_ivar_env.txt
deleted file mode 100644
index cf47f6dc7e5ded..00000000000000
--- a/test/yarp/snapshots/seattlerb/lasgn_ivar_env.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-ProgramNode(0...7)(
-  [],
-  StatementsNode(0...7)(
-    [InstanceVariableWriteNode(0...7)(
-       :@a,
-       (0...2),
-       IntegerNode(5...7)(),
-       (3...4)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/lasgn_lasgn_command_call.txt b/test/yarp/snapshots/seattlerb/lasgn_lasgn_command_call.txt
deleted file mode 100644
index 49f22eeb4311b1..00000000000000
--- a/test/yarp/snapshots/seattlerb/lasgn_lasgn_command_call.txt
+++ /dev/null
@@ -1,28 +0,0 @@
-ProgramNode(0...11)(
-  [:a, :b],
-  StatementsNode(0...11)(
-    [LocalVariableWriteNode(0...11)(
-       :a,
-       0,
-       (0...1),
-       LocalVariableWriteNode(4...11)(
-         :b,
-         0,
-         (4...5),
-         CallNode(8...11)(
-           nil,
-           nil,
-           (8...9),
-           nil,
-           ArgumentsNode(10...11)([IntegerNode(10...11)()]),
-           nil,
-           nil,
-           0,
-           "c"
-         ),
-         (6...7)
-       ),
-       (2...3)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/lasgn_middle_splat.txt b/test/yarp/snapshots/seattlerb/lasgn_middle_splat.txt
deleted file mode 100644
index acb6c844673f99..00000000000000
--- a/test/yarp/snapshots/seattlerb/lasgn_middle_splat.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-ProgramNode(0...12)(
-  [:a],
-  StatementsNode(0...12)(
-    [LocalVariableWriteNode(0...12)(
-       :a,
-       0,
-       (0...1),
-       ArrayNode(4...12)(
-         [CallNode(4...5)(nil, nil, (4...5), nil, nil, nil, nil, 2, "b"),
-          SplatNode(7...9)(
-            (7...8),
-            CallNode(8...9)(nil, nil, (8...9), nil, nil, nil, nil, 2, "c")
-          ),
-          CallNode(11...12)(nil, nil, (11...12), nil, nil, nil, nil, 2, "d")],
-         nil,
-         nil
-       ),
-       (2...3)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/magic_encoding_comment.txt b/test/yarp/snapshots/seattlerb/magic_encoding_comment.txt
deleted file mode 100644
index 77efd6f4160317..00000000000000
--- a/test/yarp/snapshots/seattlerb/magic_encoding_comment.txt
+++ /dev/null
@@ -1,38 +0,0 @@
-ProgramNode(18...90)(
-  [],
-  StatementsNode(18...90)(
-    [ClassNode(18...90)(
-       [],
-       (18...23),
-       ConstantReadNode(24...52)(:ExampleUTF8ClassNameVarietà),
-       nil,
-       nil,
-       StatementsNode(54...86)(
-         [DefNode(54...86)(
-            (63...65),
-            SelfNode(58...62)(),
-            nil,
-            StatementsNode(67...81)(
-              [LocalVariableWriteNode(67...81)(
-                 :così,
-                 0,
-                 (67...72),
-                 SymbolNode(75...81)((75...76), (76...81), nil, "però"),
-                 (73...74)
-               )]
-            ),
-            [:così],
-            (54...57),
-            (62...63),
-            nil,
-            nil,
-            nil,
-            (83...86)
-          )]
-       ),
-       (87...90),
-       :ExampleUTF8ClassNameVarietà,
-       :ExampleUTF8ClassNameVarietà
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/masgn_anon_splat_arg.txt b/test/yarp/snapshots/seattlerb/masgn_anon_splat_arg.txt
deleted file mode 100644
index c57ea8778fa388..00000000000000
--- a/test/yarp/snapshots/seattlerb/masgn_anon_splat_arg.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-ProgramNode(0...8)(
-  [:a],
-  StatementsNode(0...8)(
-    [MultiWriteNode(0...8)(
-       [MultiWriteNode(0...1)(
-          [SplatNode(0...1)((0...1), nil)],
-          nil,
-          nil,
-          nil,
-          nil
-        ),
-        LocalVariableTargetNode(3...4)(:a, 0)],
-       (5...6),
-       CallNode(7...8)(nil, nil, (7...8), nil, nil, nil, nil, 2, "b"),
-       nil,
-       nil
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/masgn_arg_colon_arg.txt b/test/yarp/snapshots/seattlerb/masgn_arg_colon_arg.txt
deleted file mode 100644
index 1a8275332e534b..00000000000000
--- a/test/yarp/snapshots/seattlerb/masgn_arg_colon_arg.txt
+++ /dev/null
@@ -1,23 +0,0 @@
-ProgramNode(0...11)(
-  [:a],
-  StatementsNode(0...11)(
-    [MultiWriteNode(0...11)(
-       [LocalVariableTargetNode(0...1)(:a, 0),
-        CallNode(3...7)(
-          CallNode(3...4)(nil, nil, (3...4), nil, nil, nil, nil, 2, "b"),
-          (4...6),
-          (6...7),
-          nil,
-          nil,
-          nil,
-          nil,
-          0,
-          "c="
-        )],
-       (8...9),
-       CallNode(10...11)(nil, nil, (10...11), nil, nil, nil, nil, 2, "d"),
-       nil,
-       nil
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/masgn_arg_ident.txt b/test/yarp/snapshots/seattlerb/masgn_arg_ident.txt
deleted file mode 100644
index da590680c034a3..00000000000000
--- a/test/yarp/snapshots/seattlerb/masgn_arg_ident.txt
+++ /dev/null
@@ -1,23 +0,0 @@
-ProgramNode(0...10)(
-  [:a],
-  StatementsNode(0...10)(
-    [MultiWriteNode(0...10)(
-       [LocalVariableTargetNode(0...1)(:a, 0),
-        CallNode(3...6)(
-          CallNode(3...4)(nil, nil, (3...4), nil, nil, nil, nil, 2, "b"),
-          (4...5),
-          (5...6),
-          nil,
-          nil,
-          nil,
-          nil,
-          0,
-          "C="
-        )],
-       (7...8),
-       CallNode(9...10)(nil, nil, (9...10), nil, nil, nil, nil, 2, "d"),
-       nil,
-       nil
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/masgn_arg_splat_arg.txt b/test/yarp/snapshots/seattlerb/masgn_arg_splat_arg.txt
deleted file mode 100644
index c22781a5d01f29..00000000000000
--- a/test/yarp/snapshots/seattlerb/masgn_arg_splat_arg.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-ProgramNode(0...12)(
-  [:a, :b, :c],
-  StatementsNode(0...12)(
-    [MultiWriteNode(0...12)(
-       [LocalVariableTargetNode(0...1)(:a, 0),
-        SplatNode(3...5)((3...4), LocalVariableTargetNode(4...5)(:b, 0)),
-        LocalVariableTargetNode(7...8)(:c, 0)],
-       (9...10),
-       CallNode(11...12)(nil, nil, (11...12), nil, nil, nil, nil, 2, "d"),
-       nil,
-       nil
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/masgn_colon2.txt b/test/yarp/snapshots/seattlerb/masgn_colon2.txt
deleted file mode 100644
index cf85e7d1ed0540..00000000000000
--- a/test/yarp/snapshots/seattlerb/masgn_colon2.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-ProgramNode(0...14)(
-  [:a],
-  StatementsNode(0...14)(
-    [MultiWriteNode(0...14)(
-       [LocalVariableTargetNode(0...1)(:a, 0),
-        ConstantPathTargetNode(3...7)(
-          CallNode(3...4)(nil, nil, (3...4), nil, nil, nil, nil, 2, "b"),
-          ConstantReadNode(6...7)(:C),
-          (4...6)
-        )],
-       (8...9),
-       ArrayNode(10...14)(
-         [IntegerNode(10...11)(), IntegerNode(13...14)()],
-         nil,
-         nil
-       ),
-       nil,
-       nil
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/masgn_colon3.txt b/test/yarp/snapshots/seattlerb/masgn_colon3.txt
deleted file mode 100644
index 9dab8dc0484108..00000000000000
--- a/test/yarp/snapshots/seattlerb/masgn_colon3.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-ProgramNode(0...15)(
-  [],
-  StatementsNode(0...15)(
-    [MultiWriteNode(0...15)(
-       [ConstantPathTargetNode(0...3)(
-          nil,
-          ConstantReadNode(2...3)(:A),
-          (0...2)
-        ),
-        ConstantPathTargetNode(5...8)(
-          nil,
-          ConstantReadNode(7...8)(:B),
-          (5...7)
-        )],
-       (9...10),
-       ArrayNode(11...15)(
-         [IntegerNode(11...12)(), IntegerNode(14...15)()],
-         nil,
-         nil
-       ),
-       nil,
-       nil
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/masgn_command_call.txt b/test/yarp/snapshots/seattlerb/masgn_command_call.txt
deleted file mode 100644
index edb11e8dc07c49..00000000000000
--- a/test/yarp/snapshots/seattlerb/masgn_command_call.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-ProgramNode(0...10)(
-  [:a],
-  StatementsNode(0...10)(
-    [MultiWriteNode(0...10)(
-       [LocalVariableTargetNode(0...1)(:a, 0), SplatNode(1...2)((1...2), nil)],
-       (3...4),
-       CallNode(5...10)(
-         CallNode(5...6)(nil, nil, (5...6), nil, nil, nil, nil, 2, "b"),
-         (6...7),
-         (7...8),
-         nil,
-         ArgumentsNode(9...10)([IntegerNode(9...10)()]),
-         nil,
-         nil,
-         0,
-         "c"
-       ),
-       nil,
-       nil
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/masgn_double_paren.txt b/test/yarp/snapshots/seattlerb/masgn_double_paren.txt
deleted file mode 100644
index 3d0c2cf7ab6fbd..00000000000000
--- a/test/yarp/snapshots/seattlerb/masgn_double_paren.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-ProgramNode(0...9)(
-  [:a, :b],
-  StatementsNode(0...9)(
-    [MultiWriteNode(0...9)(
-       [MultiWriteNode(1...6)(
-          [LocalVariableTargetNode(2...3)(:a, 0),
-           LocalVariableTargetNode(4...5)(:b, 0)],
-          nil,
-          nil,
-          (1...2),
-          (5...6)
-        )],
-       (7...8),
-       CallNode(8...9)(nil, nil, (8...9), nil, nil, nil, nil, 2, "c"),
-       (0...1),
-       (6...7)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/masgn_lhs_splat.txt b/test/yarp/snapshots/seattlerb/masgn_lhs_splat.txt
deleted file mode 100644
index 0fe5b400fae43b..00000000000000
--- a/test/yarp/snapshots/seattlerb/masgn_lhs_splat.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-ProgramNode(0...12)(
-  [:a],
-  StatementsNode(0...12)(
-    [MultiWriteNode(0...12)(
-       [SplatNode(0...2)((0...1), LocalVariableTargetNode(1...2)(:a, 0))],
-       (3...4),
-       ArrayNode(5...12)(
-         [IntegerNode(5...6)(), IntegerNode(8...9)(), IntegerNode(11...12)()],
-         nil,
-         nil
-       ),
-       nil,
-       nil
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/masgn_paren.txt b/test/yarp/snapshots/seattlerb/masgn_paren.txt
deleted file mode 100644
index 91dd386d8c4a35..00000000000000
--- a/test/yarp/snapshots/seattlerb/masgn_paren.txt
+++ /dev/null
@@ -1,23 +0,0 @@
-ProgramNode(0...12)(
-  [:a, :b],
-  StatementsNode(0...12)(
-    [MultiWriteNode(0...12)(
-       [LocalVariableTargetNode(1...2)(:a, 0),
-        LocalVariableTargetNode(4...5)(:b, 0)],
-       (7...8),
-       CallNode(9...12)(
-         CallNode(9...10)(nil, nil, (9...10), nil, nil, nil, nil, 2, "c"),
-         (10...11),
-         (11...12),
-         nil,
-         nil,
-         nil,
-         nil,
-         0,
-         "d"
-       ),
-       (0...1),
-       (5...6)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/masgn_splat_arg.txt b/test/yarp/snapshots/seattlerb/masgn_splat_arg.txt
deleted file mode 100644
index 2832f367da1d7f..00000000000000
--- a/test/yarp/snapshots/seattlerb/masgn_splat_arg.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-ProgramNode(0...9)(
-  [:a, :b],
-  StatementsNode(0...9)(
-    [MultiWriteNode(0...9)(
-       [MultiWriteNode(0...2)(
-          [SplatNode(0...2)((0...1), LocalVariableTargetNode(1...2)(:a, 0))],
-          nil,
-          nil,
-          nil,
-          nil
-        ),
-        LocalVariableTargetNode(4...5)(:b, 0)],
-       (6...7),
-       CallNode(8...9)(nil, nil, (8...9), nil, nil, nil, nil, 2, "c"),
-       nil,
-       nil
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/masgn_splat_arg_arg.txt b/test/yarp/snapshots/seattlerb/masgn_splat_arg_arg.txt
deleted file mode 100644
index 9046d08d2bb091..00000000000000
--- a/test/yarp/snapshots/seattlerb/masgn_splat_arg_arg.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-ProgramNode(0...12)(
-  [:a, :b, :c],
-  StatementsNode(0...12)(
-    [MultiWriteNode(0...12)(
-       [MultiWriteNode(0...2)(
-          [SplatNode(0...2)((0...1), LocalVariableTargetNode(1...2)(:a, 0))],
-          nil,
-          nil,
-          nil,
-          nil
-        ),
-        LocalVariableTargetNode(4...5)(:b, 0),
-        LocalVariableTargetNode(7...8)(:c, 0)],
-       (9...10),
-       CallNode(11...12)(nil, nil, (11...12), nil, nil, nil, nil, 2, "d"),
-       nil,
-       nil
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/masgn_star.txt b/test/yarp/snapshots/seattlerb/masgn_star.txt
deleted file mode 100644
index 8b7cb8e266e96e..00000000000000
--- a/test/yarp/snapshots/seattlerb/masgn_star.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-ProgramNode(0...5)(
-  [],
-  StatementsNode(0...5)(
-    [MultiWriteNode(0...5)(
-       [SplatNode(0...1)((0...1), nil)],
-       (2...3),
-       IntegerNode(4...5)(),
-       nil,
-       nil
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/masgn_var_star_var.txt b/test/yarp/snapshots/seattlerb/masgn_var_star_var.txt
deleted file mode 100644
index 64d21d637316be..00000000000000
--- a/test/yarp/snapshots/seattlerb/masgn_var_star_var.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-ProgramNode(0...11)(
-  [:a, :b],
-  StatementsNode(0...11)(
-    [MultiWriteNode(0...11)(
-       [LocalVariableTargetNode(0...1)(:a, 0),
-        SplatNode(3...4)((3...4), nil),
-        LocalVariableTargetNode(6...7)(:b, 0)],
-       (8...9),
-       CallNode(10...11)(nil, nil, (10...11), nil, nil, nil, nil, 2, "c"),
-       nil,
-       nil
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/messy_op_asgn_lineno.txt b/test/yarp/snapshots/seattlerb/messy_op_asgn_lineno.txt
deleted file mode 100644
index 74da38dee6310c..00000000000000
--- a/test/yarp/snapshots/seattlerb/messy_op_asgn_lineno.txt
+++ /dev/null
@@ -1,55 +0,0 @@
-ProgramNode(0...15)(
-  [],
-  StatementsNode(0...15)(
-    [CallNode(0...15)(
-       nil,
-       nil,
-       (0...1),
-       nil,
-       ArgumentsNode(2...15)(
-         [ParenthesesNode(2...15)(
-            StatementsNode(3...14)(
-              [ConstantPathOperatorWriteNode(3...14)(
-                 ConstantPathNode(3...7)(
-                   ConstantReadNode(3...4)(:B),
-                   ConstantReadNode(6...7)(:C),
-                   (4...6)
-                 ),
-                 (8...10),
-                 CallNode(11...14)(
-                   nil,
-                   nil,
-                   (11...12),
-                   nil,
-                   ArgumentsNode(13...14)(
-                     [CallNode(13...14)(
-                        nil,
-                        nil,
-                        (13...14),
-                        nil,
-                        nil,
-                        nil,
-                        nil,
-                        2,
-                        "e"
-                      )]
-                   ),
-                   nil,
-                   nil,
-                   0,
-                   "d"
-                 ),
-                 :*
-               )]
-            ),
-            (2...3),
-            (14...15)
-          )]
-       ),
-       nil,
-       nil,
-       0,
-       "a"
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/method_call_assoc_trailing_comma.txt b/test/yarp/snapshots/seattlerb/method_call_assoc_trailing_comma.txt
deleted file mode 100644
index 1c0c544e85d5da..00000000000000
--- a/test/yarp/snapshots/seattlerb/method_call_assoc_trailing_comma.txt
+++ /dev/null
@@ -1,24 +0,0 @@
-ProgramNode(0...10)(
-  [],
-  StatementsNode(0...10)(
-    [CallNode(0...10)(
-       CallNode(0...1)(nil, nil, (0...1), nil, nil, nil, nil, 2, "a"),
-       (1...2),
-       (2...3),
-       (3...4),
-       ArgumentsNode(4...8)(
-         [KeywordHashNode(4...8)(
-            [AssocNode(4...8)(
-               IntegerNode(4...5)(),
-               IntegerNode(7...8)(),
-               (5...7)
-             )]
-          )]
-       ),
-       (9...10),
-       nil,
-       0,
-       "f"
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/method_call_trailing_comma.txt b/test/yarp/snapshots/seattlerb/method_call_trailing_comma.txt
deleted file mode 100644
index 18089701db8f01..00000000000000
--- a/test/yarp/snapshots/seattlerb/method_call_trailing_comma.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-ProgramNode(0...7)(
-  [],
-  StatementsNode(0...7)(
-    [CallNode(0...7)(
-       CallNode(0...1)(nil, nil, (0...1), nil, nil, nil, nil, 2, "a"),
-       (1...2),
-       (2...3),
-       (3...4),
-       ArgumentsNode(4...5)([IntegerNode(4...5)()]),
-       (6...7),
-       nil,
-       0,
-       "f"
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/mlhs_back_anonsplat.txt b/test/yarp/snapshots/seattlerb/mlhs_back_anonsplat.txt
deleted file mode 100644
index ba484f89b0374a..00000000000000
--- a/test/yarp/snapshots/seattlerb/mlhs_back_anonsplat.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-ProgramNode(0...14)(
-  [:a, :b, :c],
-  StatementsNode(0...14)(
-    [MultiWriteNode(0...14)(
-       [LocalVariableTargetNode(0...1)(:a, 0),
-        LocalVariableTargetNode(3...4)(:b, 0),
-        LocalVariableTargetNode(6...7)(:c, 0),
-        SplatNode(9...10)((9...10), nil)],
-       (11...12),
-       CallNode(13...14)(nil, nil, (13...14), nil, nil, nil, nil, 2, "f"),
-       nil,
-       nil
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/mlhs_back_splat.txt b/test/yarp/snapshots/seattlerb/mlhs_back_splat.txt
deleted file mode 100644
index 9578258257e340..00000000000000
--- a/test/yarp/snapshots/seattlerb/mlhs_back_splat.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-ProgramNode(0...15)(
-  [:a, :b, :c, :s],
-  StatementsNode(0...15)(
-    [MultiWriteNode(0...15)(
-       [LocalVariableTargetNode(0...1)(:a, 0),
-        LocalVariableTargetNode(3...4)(:b, 0),
-        LocalVariableTargetNode(6...7)(:c, 0),
-        SplatNode(9...11)((9...10), LocalVariableTargetNode(10...11)(:s, 0))],
-       (12...13),
-       CallNode(14...15)(nil, nil, (14...15), nil, nil, nil, nil, 2, "f"),
-       nil,
-       nil
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/mlhs_front_anonsplat.txt b/test/yarp/snapshots/seattlerb/mlhs_front_anonsplat.txt
deleted file mode 100644
index 8ed6e38ebdac89..00000000000000
--- a/test/yarp/snapshots/seattlerb/mlhs_front_anonsplat.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-ProgramNode(0...14)(
-  [:x, :y, :z],
-  StatementsNode(0...14)(
-    [MultiWriteNode(0...14)(
-       [MultiWriteNode(0...1)(
-          [SplatNode(0...1)((0...1), nil)],
-          nil,
-          nil,
-          nil,
-          nil
-        ),
-        LocalVariableTargetNode(3...4)(:x, 0),
-        LocalVariableTargetNode(6...7)(:y, 0),
-        LocalVariableTargetNode(9...10)(:z, 0)],
-       (11...12),
-       CallNode(13...14)(nil, nil, (13...14), nil, nil, nil, nil, 2, "f"),
-       nil,
-       nil
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/mlhs_front_splat.txt b/test/yarp/snapshots/seattlerb/mlhs_front_splat.txt
deleted file mode 100644
index 07866df9edc139..00000000000000
--- a/test/yarp/snapshots/seattlerb/mlhs_front_splat.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-ProgramNode(0...15)(
-  [:s, :x, :y, :z],
-  StatementsNode(0...15)(
-    [MultiWriteNode(0...15)(
-       [MultiWriteNode(0...2)(
-          [SplatNode(0...2)((0...1), LocalVariableTargetNode(1...2)(:s, 0))],
-          nil,
-          nil,
-          nil,
-          nil
-        ),
-        LocalVariableTargetNode(4...5)(:x, 0),
-        LocalVariableTargetNode(7...8)(:y, 0),
-        LocalVariableTargetNode(10...11)(:z, 0)],
-       (12...13),
-       CallNode(14...15)(nil, nil, (14...15), nil, nil, nil, nil, 2, "f"),
-       nil,
-       nil
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/mlhs_keyword.txt b/test/yarp/snapshots/seattlerb/mlhs_keyword.txt
deleted file mode 100644
index 8910c8b5d1a990..00000000000000
--- a/test/yarp/snapshots/seattlerb/mlhs_keyword.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-ProgramNode(0...16)(
-  [],
-  StatementsNode(0...16)(
-    [CallNode(0...16)(
-       CallNode(0...1)(nil, nil, (0...1), nil, nil, nil, nil, 2, "a"),
-       (1...2),
-       (2...4),
-       (4...5),
-       ArgumentsNode(5...15)([TrueNode(5...9)(), TrueNode(11...15)()]),
-       (15...16),
-       nil,
-       0,
-       "!="
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/mlhs_mid_anonsplat.txt b/test/yarp/snapshots/seattlerb/mlhs_mid_anonsplat.txt
deleted file mode 100644
index ce114d05287340..00000000000000
--- a/test/yarp/snapshots/seattlerb/mlhs_mid_anonsplat.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-ProgramNode(0...23)(
-  [:a, :b, :c, :x, :y, :z],
-  StatementsNode(0...23)(
-    [MultiWriteNode(0...23)(
-       [LocalVariableTargetNode(0...1)(:a, 0),
-        LocalVariableTargetNode(3...4)(:b, 0),
-        LocalVariableTargetNode(6...7)(:c, 0),
-        SplatNode(9...10)((9...10), nil),
-        LocalVariableTargetNode(12...13)(:x, 0),
-        LocalVariableTargetNode(15...16)(:y, 0),
-        LocalVariableTargetNode(18...19)(:z, 0)],
-       (20...21),
-       CallNode(22...23)(nil, nil, (22...23), nil, nil, nil, nil, 2, "f"),
-       nil,
-       nil
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/mlhs_mid_splat.txt b/test/yarp/snapshots/seattlerb/mlhs_mid_splat.txt
deleted file mode 100644
index 672de03089e4be..00000000000000
--- a/test/yarp/snapshots/seattlerb/mlhs_mid_splat.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-ProgramNode(0...24)(
-  [:a, :b, :c, :s, :x, :y, :z],
-  StatementsNode(0...24)(
-    [MultiWriteNode(0...24)(
-       [LocalVariableTargetNode(0...1)(:a, 0),
-        LocalVariableTargetNode(3...4)(:b, 0),
-        LocalVariableTargetNode(6...7)(:c, 0),
-        SplatNode(9...11)((9...10), LocalVariableTargetNode(10...11)(:s, 0)),
-        LocalVariableTargetNode(13...14)(:x, 0),
-        LocalVariableTargetNode(16...17)(:y, 0),
-        LocalVariableTargetNode(19...20)(:z, 0)],
-       (21...22),
-       CallNode(23...24)(nil, nil, (23...24), nil, nil, nil, nil, 2, "f"),
-       nil,
-       nil
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/mlhs_rescue.txt b/test/yarp/snapshots/seattlerb/mlhs_rescue.txt
deleted file mode 100644
index 3e1cd57291d87b..00000000000000
--- a/test/yarp/snapshots/seattlerb/mlhs_rescue.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-ProgramNode(0...18)(
-  [:a, :b],
-  StatementsNode(0...18)(
-    [MultiWriteNode(0...18)(
-       [LocalVariableTargetNode(0...1)(:a, 0),
-        LocalVariableTargetNode(3...4)(:b, 0)],
-       (5...6),
-       RescueModifierNode(7...18)(
-         CallNode(7...8)(nil, nil, (7...8), nil, nil, nil, nil, 2, "f"),
-         (9...15),
-         IntegerNode(16...18)()
-       ),
-       nil,
-       nil
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/module_comments.txt b/test/yarp/snapshots/seattlerb/module_comments.txt
deleted file mode 100644
index 152697f4022a1d..00000000000000
--- a/test/yarp/snapshots/seattlerb/module_comments.txt
+++ /dev/null
@@ -1,28 +0,0 @@
-ProgramNode(24...77)(
-  [],
-  StatementsNode(24...77)(
-    [ModuleNode(24...77)(
-       [],
-       (24...30),
-       ConstantReadNode(31...32)(:X),
-       StatementsNode(46...73)(
-         [DefNode(46...73)(
-            (50...54),
-            nil,
-            nil,
-            nil,
-            [],
-            (46...49),
-            nil,
-            nil,
-            nil,
-            nil,
-            (70...73)
-          )]
-       ),
-       (74...77),
-       :X,
-       :X
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/multiline_hash_declaration.txt b/test/yarp/snapshots/seattlerb/multiline_hash_declaration.txt
deleted file mode 100644
index e6e341fc7ce1f1..00000000000000
--- a/test/yarp/snapshots/seattlerb/multiline_hash_declaration.txt
+++ /dev/null
@@ -1,62 +0,0 @@
-ProgramNode(0...43)(
-  [],
-  StatementsNode(0...43)(
-    [CallNode(0...14)(
-       nil,
-       nil,
-       (0...1),
-       (1...2),
-       ArgumentsNode(2...13)(
-         [KeywordHashNode(2...13)(
-            [AssocNode(2...13)(
-               SymbolNode(2...8)(nil, (2...7), (7...8), "state"),
-               HashNode(10...13)((10...11), [], (12...13)),
-               nil
-             )]
-          )]
-       ),
-       (13...14),
-       nil,
-       0,
-       "f"
-     ),
-     CallNode(16...29)(
-       nil,
-       nil,
-       (16...17),
-       (17...18),
-       ArgumentsNode(18...28)(
-         [KeywordHashNode(18...28)(
-            [AssocNode(18...28)(
-               SymbolNode(18...24)(nil, (18...23), (23...24), "state"),
-               HashNode(25...28)((25...26), [], (27...28)),
-               nil
-             )]
-          )]
-       ),
-       (28...29),
-       nil,
-       0,
-       "f"
-     ),
-     CallNode(31...43)(
-       nil,
-       nil,
-       (31...32),
-       (32...33),
-       ArgumentsNode(33...42)(
-         [KeywordHashNode(33...42)(
-            [AssocNode(33...42)(
-               SymbolNode(33...39)(nil, (33...38), (38...39), "state"),
-               HashNode(40...42)((40...41), [], (41...42)),
-               nil
-             )]
-          )]
-       ),
-       (42...43),
-       nil,
-       0,
-       "f"
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/non_interpolated_symbol_array_line_breaks.txt b/test/yarp/snapshots/seattlerb/non_interpolated_symbol_array_line_breaks.txt
deleted file mode 100644
index 0a779610a699c8..00000000000000
--- a/test/yarp/snapshots/seattlerb/non_interpolated_symbol_array_line_breaks.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-ProgramNode(0...11)(
-  [],
-  StatementsNode(0...11)(
-    [ArrayNode(0...9)(
-       [SymbolNode(4...5)(nil, (4...5), nil, "a"),
-        SymbolNode(6...7)(nil, (6...7), nil, "b")],
-       (0...3),
-       (8...9)
-     ),
-     IntegerNode(10...11)()]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/non_interpolated_word_array_line_breaks.txt b/test/yarp/snapshots/seattlerb/non_interpolated_word_array_line_breaks.txt
deleted file mode 100644
index 901575f9a8dde8..00000000000000
--- a/test/yarp/snapshots/seattlerb/non_interpolated_word_array_line_breaks.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-ProgramNode(0...11)(
-  [],
-  StatementsNode(0...11)(
-    [ArrayNode(0...9)(
-       [StringNode(4...5)(nil, (4...5), nil, "a"),
-        StringNode(6...7)(nil, (6...7), nil, "b")],
-       (0...3),
-       (8...9)
-     ),
-     IntegerNode(10...11)()]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/op_asgn_command_call.txt b/test/yarp/snapshots/seattlerb/op_asgn_command_call.txt
deleted file mode 100644
index cf092dd5de2cfc..00000000000000
--- a/test/yarp/snapshots/seattlerb/op_asgn_command_call.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-ProgramNode(0...11)(
-  [:a],
-  StatementsNode(0...11)(
-    [LocalVariableOrWriteNode(0...11)(
-       (0...1),
-       (2...5),
-       CallNode(6...11)(
-         CallNode(6...7)(nil, nil, (6...7), nil, nil, nil, nil, 2, "b"),
-         (7...8),
-         (8...9),
-         nil,
-         ArgumentsNode(10...11)([IntegerNode(10...11)()]),
-         nil,
-         nil,
-         0,
-         "c"
-       ),
-       :a,
-       0
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/op_asgn_dot_ident_command_call.txt b/test/yarp/snapshots/seattlerb/op_asgn_dot_ident_command_call.txt
deleted file mode 100644
index 00aa4338642209..00000000000000
--- a/test/yarp/snapshots/seattlerb/op_asgn_dot_ident_command_call.txt
+++ /dev/null
@@ -1,28 +0,0 @@
-ProgramNode(0...11)(
-  [],
-  StatementsNode(0...11)(
-    [CallOrWriteNode(0...11)(
-       ConstantReadNode(0...1)(:A),
-       (1...2),
-       (2...3),
-       nil,
-       nil,
-       nil,
-       0,
-       "B",
-       "B=",
-       (4...7),
-       CallNode(8...11)(
-         nil,
-         nil,
-         (8...9),
-         nil,
-         ArgumentsNode(10...11)([IntegerNode(10...11)()]),
-         nil,
-         nil,
-         0,
-         "c"
-       )
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/op_asgn_index_command_call.txt b/test/yarp/snapshots/seattlerb/op_asgn_index_command_call.txt
deleted file mode 100644
index e166f958a4f78c..00000000000000
--- a/test/yarp/snapshots/seattlerb/op_asgn_index_command_call.txt
+++ /dev/null
@@ -1,30 +0,0 @@
-ProgramNode(0...16)(
-  [],
-  StatementsNode(0...16)(
-    [CallOrWriteNode(0...16)(
-       CallNode(0...1)(nil, nil, (0...1), nil, nil, nil, nil, 2, "a"),
-       nil,
-       (1...5),
-       (1...2),
-       ArgumentsNode(2...4)([SymbolNode(2...4)((2...3), (3...4), nil, "b")]),
-       (4...5),
-       0,
-       "[]",
-       "[]=",
-       (6...9),
-       CallNode(10...16)(
-         nil,
-         nil,
-         (10...11),
-         nil,
-         ArgumentsNode(12...16)(
-           [IntegerNode(12...13)(), IntegerNode(15...16)()]
-         ),
-         nil,
-         nil,
-         0,
-         "c"
-       )
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/op_asgn_primary_colon_const_command_call.txt b/test/yarp/snapshots/seattlerb/op_asgn_primary_colon_const_command_call.txt
deleted file mode 100644
index 9459bf5ce52bc2..00000000000000
--- a/test/yarp/snapshots/seattlerb/op_asgn_primary_colon_const_command_call.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-ProgramNode(0...11)(
-  [],
-  StatementsNode(0...11)(
-    [ConstantPathOperatorWriteNode(0...11)(
-       ConstantPathNode(0...4)(
-         ConstantReadNode(0...1)(:A),
-         ConstantReadNode(3...4)(:B),
-         (1...3)
-       ),
-       (5...7),
-       CallNode(8...11)(
-         nil,
-         nil,
-         (8...9),
-         nil,
-         ArgumentsNode(10...11)(
-           [CallNode(10...11)(nil, nil, (10...11), nil, nil, nil, nil, 2, "d")]
-         ),
-         nil,
-         nil,
-         0,
-         "c"
-       ),
-       :*
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/op_asgn_primary_colon_identifier1.txt b/test/yarp/snapshots/seattlerb/op_asgn_primary_colon_identifier1.txt
deleted file mode 100644
index d2703a3e48d8d0..00000000000000
--- a/test/yarp/snapshots/seattlerb/op_asgn_primary_colon_identifier1.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-ProgramNode(0...9)(
-  [],
-  StatementsNode(0...9)(
-    [CallOperatorWriteNode(0...9)(
-       ConstantReadNode(0...1)(:A),
-       (1...3),
-       (3...4),
-       nil,
-       nil,
-       nil,
-       0,
-       "b",
-       "b=",
-       :+,
-       (5...7),
-       IntegerNode(8...9)()
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/op_asgn_primary_colon_identifier_command_call.txt b/test/yarp/snapshots/seattlerb/op_asgn_primary_colon_identifier_command_call.txt
deleted file mode 100644
index 845e0c30a0c2ad..00000000000000
--- a/test/yarp/snapshots/seattlerb/op_asgn_primary_colon_identifier_command_call.txt
+++ /dev/null
@@ -1,31 +0,0 @@
-ProgramNode(0...11)(
-  [],
-  StatementsNode(0...11)(
-    [CallOperatorWriteNode(0...11)(
-       ConstantReadNode(0...1)(:A),
-       (1...3),
-       (3...4),
-       nil,
-       nil,
-       nil,
-       0,
-       "b",
-       "b=",
-       :*,
-       (5...7),
-       CallNode(8...11)(
-         nil,
-         nil,
-         (8...9),
-         nil,
-         ArgumentsNode(10...11)(
-           [CallNode(10...11)(nil, nil, (10...11), nil, nil, nil, nil, 2, "d")]
-         ),
-         nil,
-         nil,
-         0,
-         "c"
-       )
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/op_asgn_val_dot_ident_command_call.txt b/test/yarp/snapshots/seattlerb/op_asgn_val_dot_ident_command_call.txt
deleted file mode 100644
index f075b4bb95f0ff..00000000000000
--- a/test/yarp/snapshots/seattlerb/op_asgn_val_dot_ident_command_call.txt
+++ /dev/null
@@ -1,28 +0,0 @@
-ProgramNode(0...11)(
-  [],
-  StatementsNode(0...11)(
-    [CallOrWriteNode(0...11)(
-       CallNode(0...1)(nil, nil, (0...1), nil, nil, nil, nil, 2, "a"),
-       (1...2),
-       (2...3),
-       nil,
-       nil,
-       nil,
-       0,
-       "b",
-       "b=",
-       (4...7),
-       CallNode(8...11)(
-         nil,
-         nil,
-         (8...9),
-         nil,
-         ArgumentsNode(10...11)([IntegerNode(10...11)()]),
-         nil,
-         nil,
-         0,
-         "c"
-       )
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/parse_def_special_name.txt b/test/yarp/snapshots/seattlerb/parse_def_special_name.txt
deleted file mode 100644
index a266ddf0946237..00000000000000
--- a/test/yarp/snapshots/seattlerb/parse_def_special_name.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-ProgramNode(0...13)(
-  [],
-  StatementsNode(0...13)(
-    [DefNode(0...13)(
-       (4...8),
-       nil,
-       nil,
-       nil,
-       [],
-       (0...3),
-       nil,
-       nil,
-       nil,
-       nil,
-       (10...13)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/parse_if_not_canonical.txt b/test/yarp/snapshots/seattlerb/parse_if_not_canonical.txt
deleted file mode 100644
index 223ede6af85291..00000000000000
--- a/test/yarp/snapshots/seattlerb/parse_if_not_canonical.txt
+++ /dev/null
@@ -1,40 +0,0 @@
-ProgramNode(0...41)(
-  [],
-  StatementsNode(0...41)(
-    [IfNode(0...41)(
-       (0...2),
-       CallNode(3...15)(
-         CallNode(7...15)(
-           CallNode(7...10)(nil, nil, (7...10), nil, nil, nil, nil, 2, "var"),
-           (10...11),
-           (11...15),
-           nil,
-           nil,
-           nil,
-           nil,
-           0,
-           "nil?"
-         ),
-         nil,
-         (3...6),
-         nil,
-         nil,
-         nil,
-         nil,
-         0,
-         "!"
-       ),
-       StatementsNode(21...26)(
-         [StringNode(21...26)((21...22), (22...25), (25...26), "foo")]
-       ),
-       ElseNode(27...41)(
-         (27...31),
-         StatementsNode(32...37)(
-           [StringNode(32...37)((32...33), (33...36), (36...37), "bar")]
-         ),
-         (38...41)
-       ),
-       (38...41)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/parse_if_not_noncanonical.txt b/test/yarp/snapshots/seattlerb/parse_if_not_noncanonical.txt
deleted file mode 100644
index 223ede6af85291..00000000000000
--- a/test/yarp/snapshots/seattlerb/parse_if_not_noncanonical.txt
+++ /dev/null
@@ -1,40 +0,0 @@
-ProgramNode(0...41)(
-  [],
-  StatementsNode(0...41)(
-    [IfNode(0...41)(
-       (0...2),
-       CallNode(3...15)(
-         CallNode(7...15)(
-           CallNode(7...10)(nil, nil, (7...10), nil, nil, nil, nil, 2, "var"),
-           (10...11),
-           (11...15),
-           nil,
-           nil,
-           nil,
-           nil,
-           0,
-           "nil?"
-         ),
-         nil,
-         (3...6),
-         nil,
-         nil,
-         nil,
-         nil,
-         0,
-         "!"
-       ),
-       StatementsNode(21...26)(
-         [StringNode(21...26)((21...22), (22...25), (25...26), "foo")]
-       ),
-       ElseNode(27...41)(
-         (27...31),
-         StatementsNode(32...37)(
-           [StringNode(32...37)((32...33), (33...36), (36...37), "bar")]
-         ),
-         (38...41)
-       ),
-       (38...41)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/parse_line_block.txt b/test/yarp/snapshots/seattlerb/parse_line_block.txt
deleted file mode 100644
index 7ca169a86b5cec..00000000000000
--- a/test/yarp/snapshots/seattlerb/parse_line_block.txt
+++ /dev/null
@@ -1,23 +0,0 @@
-ProgramNode(0...10)(
-  [:a],
-  StatementsNode(0...10)(
-    [LocalVariableWriteNode(0...6)(
-       :a,
-       0,
-       (0...1),
-       IntegerNode(4...6)(),
-       (2...3)
-     ),
-     CallNode(7...10)(
-       nil,
-       nil,
-       (7...8),
-       nil,
-       ArgumentsNode(9...10)([LocalVariableReadNode(9...10)(:a, 0)]),
-       nil,
-       nil,
-       0,
-       "p"
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/parse_line_block_inline_comment.txt b/test/yarp/snapshots/seattlerb/parse_line_block_inline_comment.txt
deleted file mode 100644
index f6f0333e91df56..00000000000000
--- a/test/yarp/snapshots/seattlerb/parse_line_block_inline_comment.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-ProgramNode(0...15)(
-  [],
-  StatementsNode(0...15)(
-    [CallNode(0...1)(nil, nil, (0...1), nil, nil, nil, nil, 2, "a"),
-     CallNode(2...3)(nil, nil, (2...3), nil, nil, nil, nil, 2, "b"),
-     CallNode(14...15)(nil, nil, (14...15), nil, nil, nil, nil, 2, "c")]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/parse_line_block_inline_comment_leading_newlines.txt b/test/yarp/snapshots/seattlerb/parse_line_block_inline_comment_leading_newlines.txt
deleted file mode 100644
index 2650fb5c12a1b9..00000000000000
--- a/test/yarp/snapshots/seattlerb/parse_line_block_inline_comment_leading_newlines.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-ProgramNode(3...36)(
-  [],
-  StatementsNode(3...36)(
-    [CallNode(3...4)(nil, nil, (3...4), nil, nil, nil, nil, 2, "a"),
-     CallNode(5...6)(nil, nil, (5...6), nil, nil, nil, nil, 2, "b"),
-     CallNode(35...36)(nil, nil, (35...36), nil, nil, nil, nil, 2, "c")]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/parse_line_block_inline_multiline_comment.txt b/test/yarp/snapshots/seattlerb/parse_line_block_inline_multiline_comment.txt
deleted file mode 100644
index 0a01c627fbb74a..00000000000000
--- a/test/yarp/snapshots/seattlerb/parse_line_block_inline_multiline_comment.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-ProgramNode(0...33)(
-  [],
-  StatementsNode(0...33)(
-    [CallNode(0...1)(nil, nil, (0...1), nil, nil, nil, nil, 2, "a"),
-     CallNode(2...3)(nil, nil, (2...3), nil, nil, nil, nil, 2, "b"),
-     CallNode(32...33)(nil, nil, (32...33), nil, nil, nil, nil, 2, "c")]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/parse_line_call_ivar_arg_no_parens_line_break.txt b/test/yarp/snapshots/seattlerb/parse_line_call_ivar_arg_no_parens_line_break.txt
deleted file mode 100644
index 84ee2d450bd7aa..00000000000000
--- a/test/yarp/snapshots/seattlerb/parse_line_call_ivar_arg_no_parens_line_break.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-ProgramNode(0...4)(
-  [],
-  StatementsNode(0...4)(
-    [CallNode(0...4)(
-       nil,
-       nil,
-       (0...1),
-       nil,
-       ArgumentsNode(2...4)([InstanceVariableReadNode(2...4)(:@b)]),
-       nil,
-       nil,
-       0,
-       "a"
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/parse_line_call_ivar_line_break_paren.txt b/test/yarp/snapshots/seattlerb/parse_line_call_ivar_line_break_paren.txt
deleted file mode 100644
index 1f9d067c76bf7d..00000000000000
--- a/test/yarp/snapshots/seattlerb/parse_line_call_ivar_line_break_paren.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-ProgramNode(0...6)(
-  [],
-  StatementsNode(0...6)(
-    [CallNode(0...6)(
-       nil,
-       nil,
-       (0...1),
-       (1...2),
-       ArgumentsNode(2...4)([InstanceVariableReadNode(2...4)(:@b)]),
-       (5...6),
-       nil,
-       0,
-       "a"
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/parse_line_call_no_args.txt b/test/yarp/snapshots/seattlerb/parse_line_call_no_args.txt
deleted file mode 100644
index 229bfdaa9fa284..00000000000000
--- a/test/yarp/snapshots/seattlerb/parse_line_call_no_args.txt
+++ /dev/null
@@ -1,48 +0,0 @@
-ProgramNode(0...23)(
-  [],
-  StatementsNode(0...23)(
-    [CallNode(0...23)(
-       nil,
-       nil,
-       (0...1),
-       nil,
-       nil,
-       nil,
-       BlockNode(2...23)(
-         [:x, :y],
-         BlockParametersNode(5...11)(
-           ParametersNode(6...10)(
-             [RequiredParameterNode(6...7)(:x),
-              RequiredParameterNode(9...10)(:y)],
-             [],
-             [],
-             nil,
-             [],
-             nil,
-             nil
-           ),
-           [],
-           (5...6),
-           (10...11)
-         ),
-         StatementsNode(14...19)(
-           [CallNode(14...19)(
-              LocalVariableReadNode(14...15)(:x, 0),
-              nil,
-              (16...17),
-              nil,
-              ArgumentsNode(18...19)([LocalVariableReadNode(18...19)(:y, 0)]),
-              nil,
-              nil,
-              0,
-              "+"
-            )]
-         ),
-         (2...4),
-         (20...23)
-       ),
-       0,
-       "f"
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/parse_line_defn_complex.txt b/test/yarp/snapshots/seattlerb/parse_line_defn_complex.txt
deleted file mode 100644
index 170b9bc81e321e..00000000000000
--- a/test/yarp/snapshots/seattlerb/parse_line_defn_complex.txt
+++ /dev/null
@@ -1,50 +0,0 @@
-ProgramNode(0...40)(
-  [],
-  StatementsNode(0...40)(
-    [DefNode(0...40)(
-       (4...5),
-       nil,
-       ParametersNode(6...7)(
-         [RequiredParameterNode(6...7)(:y)],
-         [],
-         [],
-         nil,
-         [],
-         nil,
-         nil
-       ),
-       StatementsNode(11...35)(
-         [CallNode(11...15)(
-            nil,
-            nil,
-            (11...12),
-            (12...13),
-            ArgumentsNode(13...14)([LocalVariableReadNode(13...14)(:y, 0)]),
-            (14...15),
-            nil,
-            0,
-            "p"
-          ),
-          LocalVariableOperatorWriteNode(18...24)(
-            (18...19),
-            (20...22),
-            IntegerNode(23...24)(),
-            :y,
-            :*,
-            0
-          ),
-          ReturnNode(27...35)(
-            (27...33),
-            ArgumentsNode(34...35)([LocalVariableReadNode(34...35)(:y, 0)])
-          )]
-       ),
-       [:y],
-       (0...3),
-       nil,
-       (5...6),
-       (7...8),
-       nil,
-       (37...40)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/parse_line_defn_no_parens.txt b/test/yarp/snapshots/seattlerb/parse_line_defn_no_parens.txt
deleted file mode 100644
index ff61047cbb848e..00000000000000
--- a/test/yarp/snapshots/seattlerb/parse_line_defn_no_parens.txt
+++ /dev/null
@@ -1,31 +0,0 @@
-ProgramNode(0...21)(
-  [],
-  StatementsNode(0...21)(
-    [DefNode(0...10)(
-       (4...5),
-       nil,
-       nil,
-       nil,
-       [],
-       (0...3),
-       nil,
-       nil,
-       nil,
-       nil,
-       (7...10)
-     ),
-     DefNode(12...21)(
-       (16...17),
-       nil,
-       nil,
-       nil,
-       [],
-       (12...15),
-       nil,
-       nil,
-       nil,
-       nil,
-       (18...21)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/parse_line_defn_no_parens_args.txt b/test/yarp/snapshots/seattlerb/parse_line_defn_no_parens_args.txt
deleted file mode 100644
index eec5acfcd7d062..00000000000000
--- a/test/yarp/snapshots/seattlerb/parse_line_defn_no_parens_args.txt
+++ /dev/null
@@ -1,26 +0,0 @@
-ProgramNode(0...11)(
-  [],
-  StatementsNode(0...11)(
-    [DefNode(0...11)(
-       (4...5),
-       nil,
-       ParametersNode(6...7)(
-         [RequiredParameterNode(6...7)(:a)],
-         [],
-         [],
-         nil,
-         [],
-         nil,
-         nil
-       ),
-       nil,
-       [:a],
-       (0...3),
-       nil,
-       nil,
-       nil,
-       nil,
-       (8...11)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/parse_line_dot2.txt b/test/yarp/snapshots/seattlerb/parse_line_dot2.txt
deleted file mode 100644
index 04d53e2c51759d..00000000000000
--- a/test/yarp/snapshots/seattlerb/parse_line_dot2.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-ProgramNode(0...13)(
-  [],
-  StatementsNode(0...13)(
-    [RangeNode(0...5)(IntegerNode(0...1)(), IntegerNode(4...5)(), (1...3), 0),
-     RangeNode(6...11)(
-       CallNode(6...7)(nil, nil, (6...7), nil, nil, nil, nil, 2, "a"),
-       CallNode(10...11)(nil, nil, (10...11), nil, nil, nil, nil, 2, "b"),
-       (7...9),
-       0
-     ),
-     CallNode(12...13)(nil, nil, (12...13), nil, nil, nil, nil, 2, "c")]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/parse_line_dot2_open.txt b/test/yarp/snapshots/seattlerb/parse_line_dot2_open.txt
deleted file mode 100644
index 35faa728edc321..00000000000000
--- a/test/yarp/snapshots/seattlerb/parse_line_dot2_open.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-ProgramNode(0...13)(
-  [],
-  StatementsNode(0...13)(
-    [RangeNode(0...3)(IntegerNode(0...1)(), nil, (1...3), 0),
-     RangeNode(6...9)(
-       CallNode(6...7)(nil, nil, (6...7), nil, nil, nil, nil, 2, "a"),
-       nil,
-       (7...9),
-       0
-     ),
-     CallNode(12...13)(nil, nil, (12...13), nil, nil, nil, nil, 2, "c")]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/parse_line_dot3.txt b/test/yarp/snapshots/seattlerb/parse_line_dot3.txt
deleted file mode 100644
index 109bbadc623cf4..00000000000000
--- a/test/yarp/snapshots/seattlerb/parse_line_dot3.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-ProgramNode(0...15)(
-  [],
-  StatementsNode(0...15)(
-    [RangeNode(0...6)(IntegerNode(0...1)(), IntegerNode(5...6)(), (1...4), 1),
-     RangeNode(7...13)(
-       CallNode(7...8)(nil, nil, (7...8), nil, nil, nil, nil, 2, "a"),
-       CallNode(12...13)(nil, nil, (12...13), nil, nil, nil, nil, 2, "b"),
-       (8...11),
-       1
-     ),
-     CallNode(14...15)(nil, nil, (14...15), nil, nil, nil, nil, 2, "c")]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/parse_line_dot3_open.txt b/test/yarp/snapshots/seattlerb/parse_line_dot3_open.txt
deleted file mode 100644
index 558c430b6a69fa..00000000000000
--- a/test/yarp/snapshots/seattlerb/parse_line_dot3_open.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-ProgramNode(0...15)(
-  [],
-  StatementsNode(0...15)(
-    [RangeNode(0...4)(IntegerNode(0...1)(), nil, (1...4), 1),
-     RangeNode(7...11)(
-       CallNode(7...8)(nil, nil, (7...8), nil, nil, nil, nil, 2, "a"),
-       nil,
-       (8...11),
-       1
-     ),
-     CallNode(14...15)(nil, nil, (14...15), nil, nil, nil, nil, 2, "c")]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/parse_line_dstr_escaped_newline.txt b/test/yarp/snapshots/seattlerb/parse_line_dstr_escaped_newline.txt
deleted file mode 100644
index b6f92191b6ed37..00000000000000
--- a/test/yarp/snapshots/seattlerb/parse_line_dstr_escaped_newline.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-ProgramNode(0...14)(
-  [],
-  StatementsNode(0...14)(
-    [InterpolatedStringNode(0...9)(
-       (0...1),
-       [StringNode(1...4)(nil, (1...4), nil, "a\n"),
-        EmbeddedStatementsNode(4...8)((4...6), nil, (7...8))],
-       (8...9)
-     ),
-     TrueNode(10...14)()]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/parse_line_dstr_soft_newline.txt b/test/yarp/snapshots/seattlerb/parse_line_dstr_soft_newline.txt
deleted file mode 100644
index a22199b3acd36d..00000000000000
--- a/test/yarp/snapshots/seattlerb/parse_line_dstr_soft_newline.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-ProgramNode(0...13)(
-  [],
-  StatementsNode(0...13)(
-    [InterpolatedStringNode(0...8)(
-       (0...1),
-       [StringNode(1...3)(nil, (1...3), nil, "a\n"),
-        EmbeddedStatementsNode(3...7)((3...5), nil, (6...7))],
-       (7...8)
-     ),
-     TrueNode(9...13)()]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/parse_line_evstr_after_break.txt b/test/yarp/snapshots/seattlerb/parse_line_evstr_after_break.txt
deleted file mode 100644
index ac4be36fcca71b..00000000000000
--- a/test/yarp/snapshots/seattlerb/parse_line_evstr_after_break.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-ProgramNode(0...11)(
-  [],
-  StatementsNode(0...11)(
-    [StringConcatNode(0...11)(
-       StringNode(0...3)((0...1), (1...2), (2...3), "a"),
-       InterpolatedStringNode(5...11)(
-         (5...6),
-         [EmbeddedStatementsNode(6...10)(
-            (6...8),
-            StatementsNode(8...9)(
-              [CallNode(8...9)(nil, nil, (8...9), nil, nil, nil, nil, 2, "b")]
-            ),
-            (9...10)
-          )],
-         (10...11)
-       )
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/parse_line_hash_lit.txt b/test/yarp/snapshots/seattlerb/parse_line_hash_lit.txt
deleted file mode 100644
index a7dd5a1f7b1216..00000000000000
--- a/test/yarp/snapshots/seattlerb/parse_line_hash_lit.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-ProgramNode(0...13)(
-  [],
-  StatementsNode(0...13)(
-    [HashNode(0...13)(
-       (0...1),
-       [AssocNode(2...10)(
-          SymbolNode(2...5)((2...3), (3...5), nil, "s1"),
-          IntegerNode(9...10)(),
-          (6...8)
-        )],
-       (12...13)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/parse_line_heredoc.txt b/test/yarp/snapshots/seattlerb/parse_line_heredoc.txt
deleted file mode 100644
index 955d94e98fb289..00000000000000
--- a/test/yarp/snapshots/seattlerb/parse_line_heredoc.txt
+++ /dev/null
@@ -1,42 +0,0 @@
-ProgramNode(6...88)(
-  [:string],
-  StatementsNode(6...88)(
-    [LocalVariableWriteNode(6...31)(
-       :string,
-       0,
-       (6...12),
-       CallNode(15...31)(
-         InterpolatedStringNode(15...25)(
-           (15...25),
-           [StringNode(32...57)(
-              nil,
-              (32...57),
-              nil,
-              "        very long string\n"
-            )],
-           (57...71)
-         ),
-         (25...26),
-         (26...31),
-         nil,
-         nil,
-         nil,
-         nil,
-         0,
-         "strip"
-       ),
-       (13...14)
-     ),
-     CallNode(77...88)(
-       nil,
-       nil,
-       (77...81),
-       nil,
-       ArgumentsNode(82...88)([LocalVariableReadNode(82...88)(:string, 0)]),
-       nil,
-       nil,
-       0,
-       "puts"
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/parse_line_heredoc_evstr.txt b/test/yarp/snapshots/seattlerb/parse_line_heredoc_evstr.txt
deleted file mode 100644
index 8b95196e2d741d..00000000000000
--- a/test/yarp/snapshots/seattlerb/parse_line_heredoc_evstr.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-ProgramNode(0...4)(
-  [],
-  StatementsNode(0...4)(
-    [InterpolatedStringNode(0...4)(
-       (0...4),
-       [StringNode(5...7)(nil, (5...7), nil, "a\n"),
-        EmbeddedStatementsNode(7...11)(
-          (7...9),
-          StatementsNode(9...10)(
-            [CallNode(9...10)(nil, nil, (9...10), nil, nil, nil, nil, 2, "b")]
-          ),
-          (10...11)
-        ),
-        StringNode(11...12)(nil, (11...12), nil, "\n")],
-       (12...14)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/parse_line_heredoc_hardnewline.txt b/test/yarp/snapshots/seattlerb/parse_line_heredoc_hardnewline.txt
deleted file mode 100644
index 623eb3aabf840b..00000000000000
--- a/test/yarp/snapshots/seattlerb/parse_line_heredoc_hardnewline.txt
+++ /dev/null
@@ -1,26 +0,0 @@
-ProgramNode(0...48)(
-  [],
-  StatementsNode(0...48)(
-    [InterpolatedStringNode(0...8)(
-       (0...8),
-       [StringNode(9...28)(
-          nil,
-          (9...28),
-          nil,
-          "\n" + "\n" + "\n" + "\n" + "\n" + "\n" + "\n" + "\n" + "\n" + "\n"
-        )],
-       (28...34)
-     ),
-     ClassNode(35...48)(
-       [],
-       (35...40),
-       ConstantReadNode(41...44)(:Foo),
-       nil,
-       nil,
-       nil,
-       (45...48),
-       :Foo,
-       :Foo
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/parse_line_heredoc_regexp_chars.txt b/test/yarp/snapshots/seattlerb/parse_line_heredoc_regexp_chars.txt
deleted file mode 100644
index 3d52fcbff0cec7..00000000000000
--- a/test/yarp/snapshots/seattlerb/parse_line_heredoc_regexp_chars.txt
+++ /dev/null
@@ -1,32 +0,0 @@
-ProgramNode(6...74)(
-  [:string],
-  StatementsNode(6...74)(
-    [LocalVariableWriteNode(6...22)(
-       :string,
-       0,
-       (6...12),
-       InterpolatedStringNode(15...22)(
-         (15...22),
-         [StringNode(23...48)(
-            nil,
-            (23...48),
-            nil,
-            "        very long string\n"
-          )],
-         (48...57)
-       ),
-       (13...14)
-     ),
-     CallNode(63...74)(
-       nil,
-       nil,
-       (63...67),
-       nil,
-       ArgumentsNode(68...74)([LocalVariableReadNode(68...74)(:string, 0)]),
-       nil,
-       nil,
-       0,
-       "puts"
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/parse_line_iter_call_no_parens.txt b/test/yarp/snapshots/seattlerb/parse_line_iter_call_no_parens.txt
deleted file mode 100644
index 82dd3ce64f627e..00000000000000
--- a/test/yarp/snapshots/seattlerb/parse_line_iter_call_no_parens.txt
+++ /dev/null
@@ -1,50 +0,0 @@
-ProgramNode(0...25)(
-  [],
-  StatementsNode(0...25)(
-    [CallNode(0...25)(
-       nil,
-       nil,
-       (0...1),
-       nil,
-       ArgumentsNode(2...3)(
-         [CallNode(2...3)(nil, nil, (2...3), nil, nil, nil, nil, 2, "a")]
-       ),
-       nil,
-       BlockNode(4...25)(
-         [:x, :y],
-         BlockParametersNode(7...13)(
-           ParametersNode(8...12)(
-             [RequiredParameterNode(8...9)(:x),
-              RequiredParameterNode(11...12)(:y)],
-             [],
-             [],
-             nil,
-             [],
-             nil,
-             nil
-           ),
-           [],
-           (7...8),
-           (12...13)
-         ),
-         StatementsNode(16...21)(
-           [CallNode(16...21)(
-              LocalVariableReadNode(16...17)(:x, 0),
-              nil,
-              (18...19),
-              nil,
-              ArgumentsNode(20...21)([LocalVariableReadNode(20...21)(:y, 0)]),
-              nil,
-              nil,
-              0,
-              "+"
-            )]
-         ),
-         (4...6),
-         (22...25)
-       ),
-       0,
-       "f"
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/parse_line_iter_call_parens.txt b/test/yarp/snapshots/seattlerb/parse_line_iter_call_parens.txt
deleted file mode 100644
index db09ae12d0bf4c..00000000000000
--- a/test/yarp/snapshots/seattlerb/parse_line_iter_call_parens.txt
+++ /dev/null
@@ -1,50 +0,0 @@
-ProgramNode(0...26)(
-  [],
-  StatementsNode(0...26)(
-    [CallNode(0...26)(
-       nil,
-       nil,
-       (0...1),
-       (1...2),
-       ArgumentsNode(2...3)(
-         [CallNode(2...3)(nil, nil, (2...3), nil, nil, nil, nil, 2, "a")]
-       ),
-       (3...4),
-       BlockNode(5...26)(
-         [:x, :y],
-         BlockParametersNode(8...14)(
-           ParametersNode(9...13)(
-             [RequiredParameterNode(9...10)(:x),
-              RequiredParameterNode(12...13)(:y)],
-             [],
-             [],
-             nil,
-             [],
-             nil,
-             nil
-           ),
-           [],
-           (8...9),
-           (13...14)
-         ),
-         StatementsNode(17...22)(
-           [CallNode(17...22)(
-              LocalVariableReadNode(17...18)(:x, 0),
-              nil,
-              (19...20),
-              nil,
-              ArgumentsNode(21...22)([LocalVariableReadNode(21...22)(:y, 0)]),
-              nil,
-              nil,
-              0,
-              "+"
-            )]
-         ),
-         (5...7),
-         (23...26)
-       ),
-       0,
-       "f"
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/parse_line_multiline_str.txt b/test/yarp/snapshots/seattlerb/parse_line_multiline_str.txt
deleted file mode 100644
index e12f68cfb22197..00000000000000
--- a/test/yarp/snapshots/seattlerb/parse_line_multiline_str.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-ProgramNode(0...7)(
-  [],
-  StatementsNode(0...7)(
-    [StringNode(0...5)((0...1), (1...4), (4...5), "a\n" + "b"),
-     IntegerNode(6...7)()]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/parse_line_multiline_str_literal_n.txt b/test/yarp/snapshots/seattlerb/parse_line_multiline_str_literal_n.txt
deleted file mode 100644
index 92a7b9fed1d809..00000000000000
--- a/test/yarp/snapshots/seattlerb/parse_line_multiline_str_literal_n.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-ProgramNode(0...8)(
-  [],
-  StatementsNode(0...8)(
-    [StringNode(0...6)((0...1), (1...5), (5...6), "a\n" + "b"),
-     IntegerNode(7...8)()]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/parse_line_newlines.txt b/test/yarp/snapshots/seattlerb/parse_line_newlines.txt
deleted file mode 100644
index 14b0c8cecccd16..00000000000000
--- a/test/yarp/snapshots/seattlerb/parse_line_newlines.txt
+++ /dev/null
@@ -1 +0,0 @@
-ProgramNode(0...4)([], StatementsNode(0...4)([TrueNode(0...4)()]))
diff --git a/test/yarp/snapshots/seattlerb/parse_line_op_asgn.txt b/test/yarp/snapshots/seattlerb/parse_line_op_asgn.txt
deleted file mode 100644
index d3aa84c9869457..00000000000000
--- a/test/yarp/snapshots/seattlerb/parse_line_op_asgn.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-ProgramNode(6...34)(
-  [:foo],
-  StatementsNode(6...34)(
-    [LocalVariableOperatorWriteNode(6...24)(
-       (6...9),
-       (10...12),
-       CallNode(21...24)(nil, nil, (21...24), nil, nil, nil, nil, 2, "bar"),
-       :foo,
-       :+,
-       0
-     ),
-     CallNode(31...34)(nil, nil, (31...34), nil, nil, nil, nil, 2, "baz")]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/parse_line_postexe.txt b/test/yarp/snapshots/seattlerb/parse_line_postexe.txt
deleted file mode 100644
index 9e527ea587c932..00000000000000
--- a/test/yarp/snapshots/seattlerb/parse_line_postexe.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-ProgramNode(0...11)(
-  [],
-  StatementsNode(0...11)(
-    [PostExecutionNode(0...11)(
-       StatementsNode(6...9)(
-         [CallNode(6...9)(nil, nil, (6...9), nil, nil, nil, nil, 2, "foo")]
-       ),
-       (0...3),
-       (4...5),
-       (10...11)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/parse_line_preexe.txt b/test/yarp/snapshots/seattlerb/parse_line_preexe.txt
deleted file mode 100644
index 49f485c79fc3e1..00000000000000
--- a/test/yarp/snapshots/seattlerb/parse_line_preexe.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-ProgramNode(0...13)(
-  [],
-  StatementsNode(0...13)(
-    [PreExecutionNode(0...13)(
-       StatementsNode(8...11)(
-         [CallNode(8...11)(nil, nil, (8...11), nil, nil, nil, nil, 2, "foo")]
-       ),
-       (0...5),
-       (6...7),
-       (12...13)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/parse_line_rescue.txt b/test/yarp/snapshots/seattlerb/parse_line_rescue.txt
deleted file mode 100644
index 02704b5790fb32..00000000000000
--- a/test/yarp/snapshots/seattlerb/parse_line_rescue.txt
+++ /dev/null
@@ -1,43 +0,0 @@
-ProgramNode(0...35)(
-  [],
-  StatementsNode(0...35)(
-    [BeginNode(0...35)(
-       (0...5),
-       StatementsNode(8...9)(
-         [CallNode(8...9)(nil, nil, (8...9), nil, nil, nil, nil, 2, "a")]
-       ),
-       RescueNode(10...31)(
-         (10...16),
-         [],
-         nil,
-         nil,
-         StatementsNode(19...20)(
-           [CallNode(19...20)(nil, nil, (19...20), nil, nil, nil, nil, 2, "b")]
-         ),
-         RescueNode(21...31)(
-           (21...27),
-           [],
-           nil,
-           nil,
-           StatementsNode(30...31)(
-             [CallNode(30...31)(
-                nil,
-                nil,
-                (30...31),
-                nil,
-                nil,
-                nil,
-                nil,
-                2,
-                "c"
-              )]
-           ),
-           nil
-         )
-       ),
-       nil,
-       nil,
-       (32...35)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/parse_line_return.txt b/test/yarp/snapshots/seattlerb/parse_line_return.txt
deleted file mode 100644
index 17ba7af0a5a7ec..00000000000000
--- a/test/yarp/snapshots/seattlerb/parse_line_return.txt
+++ /dev/null
@@ -1,31 +0,0 @@
-ProgramNode(6...77)(
-  [],
-  StatementsNode(6...77)(
-    [DefNode(6...77)(
-       (10...14),
-       nil,
-       nil,
-       StatementsNode(23...67)(
-         [IfNode(23...67)(
-            (23...25),
-            TrueNode(26...30)(),
-            StatementsNode(46...55)(
-              [ReturnNode(46...55)(
-                 (46...52),
-                 ArgumentsNode(53...55)([IntegerNode(53...55)()])
-               )]
-            ),
-            nil,
-            (64...67)
-          )]
-       ),
-       [],
-       (6...9),
-       nil,
-       nil,
-       nil,
-       nil,
-       (74...77)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/parse_line_str_with_newline_escape.txt b/test/yarp/snapshots/seattlerb/parse_line_str_with_newline_escape.txt
deleted file mode 100644
index e75463a0e3073d..00000000000000
--- a/test/yarp/snapshots/seattlerb/parse_line_str_with_newline_escape.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-ProgramNode(0...13)(
-  [],
-  StatementsNode(0...13)(
-    [CallNode(0...13)(
-       nil,
-       nil,
-       (0...1),
-       (1...2),
-       ArgumentsNode(2...12)(
-         [StringNode(2...6)((2...3), (3...5), (5...6), "\n"),
-          TrueNode(8...12)()]
-       ),
-       (12...13),
-       nil,
-       0,
-       "a"
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/parse_line_to_ary.txt b/test/yarp/snapshots/seattlerb/parse_line_to_ary.txt
deleted file mode 100644
index 7f0a75913c6395..00000000000000
--- a/test/yarp/snapshots/seattlerb/parse_line_to_ary.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-ProgramNode(0...10)(
-  [:a, :b],
-  StatementsNode(0...10)(
-    [MultiWriteNode(0...8)(
-       [LocalVariableTargetNode(0...1)(:a, 0),
-        LocalVariableTargetNode(3...4)(:b, 0)],
-       (5...6),
-       CallNode(7...8)(nil, nil, (7...8), nil, nil, nil, nil, 2, "c"),
-       nil,
-       nil
-     ),
-     CallNode(9...10)(nil, nil, (9...10), nil, nil, nil, nil, 2, "d")]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/parse_line_trailing_newlines.txt b/test/yarp/snapshots/seattlerb/parse_line_trailing_newlines.txt
deleted file mode 100644
index 7617e15479c07b..00000000000000
--- a/test/yarp/snapshots/seattlerb/parse_line_trailing_newlines.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-ProgramNode(0...4)(
-  [],
-  StatementsNode(0...4)(
-    [CallNode(0...1)(nil, nil, (0...1), nil, nil, nil, nil, 2, "a"),
-     CallNode(3...4)(nil, nil, (3...4), nil, nil, nil, nil, 2, "b")]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/parse_opt_call_args_assocs_comma.txt b/test/yarp/snapshots/seattlerb/parse_opt_call_args_assocs_comma.txt
deleted file mode 100644
index 9a84d358bca42c..00000000000000
--- a/test/yarp/snapshots/seattlerb/parse_opt_call_args_assocs_comma.txt
+++ /dev/null
@@ -1,24 +0,0 @@
-ProgramNode(0...8)(
-  [],
-  StatementsNode(0...8)(
-    [CallNode(0...8)(
-       IntegerNode(0...1)(),
-       nil,
-       (1...8),
-       (1...2),
-       ArgumentsNode(2...6)(
-         [KeywordHashNode(2...6)(
-            [AssocNode(2...6)(
-               IntegerNode(2...3)(),
-               IntegerNode(5...6)(),
-               (3...5)
-             )]
-          )]
-       ),
-       (7...8),
-       nil,
-       0,
-       "[]"
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/parse_opt_call_args_lit_comma.txt b/test/yarp/snapshots/seattlerb/parse_opt_call_args_lit_comma.txt
deleted file mode 100644
index a058d012841102..00000000000000
--- a/test/yarp/snapshots/seattlerb/parse_opt_call_args_lit_comma.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-ProgramNode(0...5)(
-  [],
-  StatementsNode(0...5)(
-    [CallNode(0...5)(
-       IntegerNode(0...1)(),
-       nil,
-       (1...5),
-       (1...2),
-       ArgumentsNode(2...3)([IntegerNode(2...3)()]),
-       (4...5),
-       nil,
-       0,
-       "[]"
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/parse_pattern_019.txt b/test/yarp/snapshots/seattlerb/parse_pattern_019.txt
deleted file mode 100644
index d6f5d2977abd8a..00000000000000
--- a/test/yarp/snapshots/seattlerb/parse_pattern_019.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-ProgramNode(0...26)(
-  [],
-  StatementsNode(0...26)(
-    [CaseNode(0...26)(
-       IntegerNode(5...6)(),
-       [InNode(7...22)(
-          RangeNode(10...15)(
-            IntegerNode(10...12)(),
-            IntegerNode(14...15)(),
-            (12...14),
-            0
-          ),
-          StatementsNode(18...22)([TrueNode(18...22)()]),
-          (7...9),
-          nil
-        )],
-       nil,
-       (0...4),
-       (23...26)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/parse_pattern_044.txt b/test/yarp/snapshots/seattlerb/parse_pattern_044.txt
deleted file mode 100644
index 09d0143eff5561..00000000000000
--- a/test/yarp/snapshots/seattlerb/parse_pattern_044.txt
+++ /dev/null
@@ -1,24 +0,0 @@
-ProgramNode(0...31)(
-  [],
-  StatementsNode(0...31)(
-    [CaseNode(0...31)(
-       CallNode(5...8)(nil, nil, (5...8), nil, nil, nil, nil, 2, "obj"),
-       [InNode(9...27)(
-          ArrayPatternNode(12...20)(
-            ConstantReadNode(12...18)(:Object),
-            [],
-            nil,
-            [],
-            (18...19),
-            (19...20)
-          ),
-          StatementsNode(23...27)([TrueNode(23...27)()]),
-          (9...11),
-          nil
-        )],
-       nil,
-       (0...4),
-       (28...31)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/parse_pattern_051.txt b/test/yarp/snapshots/seattlerb/parse_pattern_051.txt
deleted file mode 100644
index 7f2410212d0abb..00000000000000
--- a/test/yarp/snapshots/seattlerb/parse_pattern_051.txt
+++ /dev/null
@@ -1,28 +0,0 @@
-ProgramNode(0...36)(
-  [],
-  StatementsNode(0...36)(
-    [CaseNode(0...36)(
-       ArrayNode(5...14)(
-         [IntegerNode(6...7)(), IntegerNode(9...10)(), IntegerNode(12...13)()],
-         (5...6),
-         (13...14)
-       ),
-       [InNode(15...32)(
-          ArrayPatternNode(18...25)(
-            nil,
-            [IntegerNode(19...20)(), IntegerNode(22...23)()],
-            nil,
-            [],
-            (18...19),
-            (24...25)
-          ),
-          StatementsNode(28...32)([TrueNode(28...32)()]),
-          (15...17),
-          nil
-        )],
-       nil,
-       (0...4),
-       (33...36)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/parse_pattern_058.txt b/test/yarp/snapshots/seattlerb/parse_pattern_058.txt
deleted file mode 100644
index d9416d4a61c613..00000000000000
--- a/test/yarp/snapshots/seattlerb/parse_pattern_058.txt
+++ /dev/null
@@ -1,46 +0,0 @@
-ProgramNode(0...43)(
-  [:a, :rest],
-  StatementsNode(0...43)(
-    [CaseNode(0...43)(
-       HashNode(5...11)(
-         (5...6),
-         [AssocNode(6...10)(
-            SymbolNode(6...8)(nil, (6...7), (7...8), "a"),
-            IntegerNode(9...10)(),
-            nil
-          )],
-         (10...11)
-       ),
-       [InNode(12...39)(
-          HashPatternNode(15...27)(
-            nil,
-            [AssocNode(16...18)(
-               SymbolNode(16...18)(nil, (16...17), (17...18), "a"),
-               nil,
-               nil
-             ),
-             AssocSplatNode(20...26)(
-               LocalVariableTargetNode(22...26)(:rest, 0),
-               (20...22)
-             )],
-            nil,
-            (15...16),
-            (26...27)
-          ),
-          StatementsNode(30...39)(
-            [ArrayNode(30...39)(
-               [LocalVariableReadNode(31...32)(:a, 0),
-                LocalVariableReadNode(34...38)(:rest, 0)],
-               (30...31),
-               (38...39)
-             )]
-          ),
-          (12...14),
-          nil
-        )],
-       nil,
-       (0...4),
-       (40...43)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/parse_pattern_058_2.txt b/test/yarp/snapshots/seattlerb/parse_pattern_058_2.txt
deleted file mode 100644
index c1ba037a626cfd..00000000000000
--- a/test/yarp/snapshots/seattlerb/parse_pattern_058_2.txt
+++ /dev/null
@@ -1,42 +0,0 @@
-ProgramNode(0...33)(
-  [:a],
-  StatementsNode(0...33)(
-    [CaseNode(0...33)(
-       HashNode(5...11)(
-         (5...6),
-         [AssocNode(6...10)(
-            SymbolNode(6...8)(nil, (6...7), (7...8), "a"),
-            IntegerNode(9...10)(),
-            nil
-          )],
-         (10...11)
-       ),
-       [InNode(12...29)(
-          HashPatternNode(15...23)(
-            nil,
-            [AssocNode(16...18)(
-               SymbolNode(16...18)(nil, (16...17), (17...18), "a"),
-               nil,
-               nil
-             ),
-             AssocSplatNode(20...22)(nil, (20...22))],
-            nil,
-            (15...16),
-            (22...23)
-          ),
-          StatementsNode(26...29)(
-            [ArrayNode(26...29)(
-               [LocalVariableReadNode(27...28)(:a, 0)],
-               (26...27),
-               (28...29)
-             )]
-          ),
-          (12...14),
-          nil
-        )],
-       nil,
-       (0...4),
-       (30...33)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/parse_pattern_069.txt b/test/yarp/snapshots/seattlerb/parse_pattern_069.txt
deleted file mode 100644
index b704851937c9fd..00000000000000
--- a/test/yarp/snapshots/seattlerb/parse_pattern_069.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-ProgramNode(0...31)(
-  [],
-  StatementsNode(0...31)(
-    [CaseNode(0...31)(
-       SymbolNode(5...7)((5...6), (6...7), nil, "a"),
-       [InNode(8...27)(
-          HashPatternNode(11...23)(
-            ConstantReadNode(11...17)(:Object),
-            [AssocNode(18...22)(
-               SymbolNode(18...20)(nil, (18...19), (19...20), "b"),
-               IntegerNode(21...22)(),
-               nil
-             )],
-            nil,
-            (17...18),
-            (22...23)
-          ),
-          StatementsNode(26...27)([IntegerNode(26...27)()]),
-          (8...10),
-          nil
-        )],
-       nil,
-       (0...4),
-       (28...31)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/parse_pattern_076.txt b/test/yarp/snapshots/seattlerb/parse_pattern_076.txt
deleted file mode 100644
index 493223169b11fd..00000000000000
--- a/test/yarp/snapshots/seattlerb/parse_pattern_076.txt
+++ /dev/null
@@ -1,36 +0,0 @@
-ProgramNode(0...39)(
-  [],
-  StatementsNode(0...39)(
-    [CaseNode(0...39)(
-       HashNode(5...11)(
-         (5...6),
-         [AssocNode(6...10)(
-            SymbolNode(6...8)(nil, (6...7), (7...8), "a"),
-            IntegerNode(9...10)(),
-            nil
-          )],
-         (10...11)
-       ),
-       [InNode(12...35)(
-          HashPatternNode(15...28)(
-            nil,
-            [AssocNode(16...20)(
-               SymbolNode(16...18)(nil, (16...17), (17...18), "a"),
-               IntegerNode(19...20)(),
-               nil
-             ),
-             NoKeywordsParameterNode(22...27)((22...24), (24...27))],
-            nil,
-            (15...16),
-            (27...28)
-          ),
-          StatementsNode(31...35)([TrueNode(31...35)()]),
-          (12...14),
-          nil
-        )],
-       nil,
-       (0...4),
-       (36...39)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/parse_until_not_canonical.txt b/test/yarp/snapshots/seattlerb/parse_until_not_canonical.txt
deleted file mode 100644
index e84c4bf8a92476..00000000000000
--- a/test/yarp/snapshots/seattlerb/parse_until_not_canonical.txt
+++ /dev/null
@@ -1,44 +0,0 @@
-ProgramNode(0...30)(
-  [],
-  StatementsNode(0...30)(
-    [UntilNode(0...30)(
-       (0...5),
-       (27...30),
-       CallNode(6...18)(
-         CallNode(10...18)(
-           CallNode(10...13)(
-             nil,
-             nil,
-             (10...13),
-             nil,
-             nil,
-             nil,
-             nil,
-             2,
-             "var"
-           ),
-           (13...14),
-           (14...18),
-           nil,
-           nil,
-           nil,
-           nil,
-           0,
-           "nil?"
-         ),
-         nil,
-         (6...9),
-         nil,
-         nil,
-         nil,
-         nil,
-         0,
-         "!"
-       ),
-       StatementsNode(21...26)(
-         [StringNode(21...26)((21...22), (22...25), (25...26), "foo")]
-       ),
-       0
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/parse_until_not_noncanonical.txt b/test/yarp/snapshots/seattlerb/parse_until_not_noncanonical.txt
deleted file mode 100644
index e84c4bf8a92476..00000000000000
--- a/test/yarp/snapshots/seattlerb/parse_until_not_noncanonical.txt
+++ /dev/null
@@ -1,44 +0,0 @@
-ProgramNode(0...30)(
-  [],
-  StatementsNode(0...30)(
-    [UntilNode(0...30)(
-       (0...5),
-       (27...30),
-       CallNode(6...18)(
-         CallNode(10...18)(
-           CallNode(10...13)(
-             nil,
-             nil,
-             (10...13),
-             nil,
-             nil,
-             nil,
-             nil,
-             2,
-             "var"
-           ),
-           (13...14),
-           (14...18),
-           nil,
-           nil,
-           nil,
-           nil,
-           0,
-           "nil?"
-         ),
-         nil,
-         (6...9),
-         nil,
-         nil,
-         nil,
-         nil,
-         0,
-         "!"
-       ),
-       StatementsNode(21...26)(
-         [StringNode(21...26)((21...22), (22...25), (25...26), "foo")]
-       ),
-       0
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/parse_while_not_canonical.txt b/test/yarp/snapshots/seattlerb/parse_while_not_canonical.txt
deleted file mode 100644
index 8d152ba76ec6f6..00000000000000
--- a/test/yarp/snapshots/seattlerb/parse_while_not_canonical.txt
+++ /dev/null
@@ -1,44 +0,0 @@
-ProgramNode(0...30)(
-  [],
-  StatementsNode(0...30)(
-    [WhileNode(0...30)(
-       (0...5),
-       (27...30),
-       CallNode(6...18)(
-         CallNode(10...18)(
-           CallNode(10...13)(
-             nil,
-             nil,
-             (10...13),
-             nil,
-             nil,
-             nil,
-             nil,
-             2,
-             "var"
-           ),
-           (13...14),
-           (14...18),
-           nil,
-           nil,
-           nil,
-           nil,
-           0,
-           "nil?"
-         ),
-         nil,
-         (6...9),
-         nil,
-         nil,
-         nil,
-         nil,
-         0,
-         "!"
-       ),
-       StatementsNode(21...26)(
-         [StringNode(21...26)((21...22), (22...25), (25...26), "foo")]
-       ),
-       0
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/parse_while_not_noncanonical.txt b/test/yarp/snapshots/seattlerb/parse_while_not_noncanonical.txt
deleted file mode 100644
index 8d152ba76ec6f6..00000000000000
--- a/test/yarp/snapshots/seattlerb/parse_while_not_noncanonical.txt
+++ /dev/null
@@ -1,44 +0,0 @@
-ProgramNode(0...30)(
-  [],
-  StatementsNode(0...30)(
-    [WhileNode(0...30)(
-       (0...5),
-       (27...30),
-       CallNode(6...18)(
-         CallNode(10...18)(
-           CallNode(10...13)(
-             nil,
-             nil,
-             (10...13),
-             nil,
-             nil,
-             nil,
-             nil,
-             2,
-             "var"
-           ),
-           (13...14),
-           (14...18),
-           nil,
-           nil,
-           nil,
-           nil,
-           0,
-           "nil?"
-         ),
-         nil,
-         (6...9),
-         nil,
-         nil,
-         nil,
-         nil,
-         0,
-         "!"
-       ),
-       StatementsNode(21...26)(
-         [StringNode(21...26)((21...22), (22...25), (25...26), "foo")]
-       ),
-       0
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/pctW_lineno.txt b/test/yarp/snapshots/seattlerb/pctW_lineno.txt
deleted file mode 100644
index d03e41c0f2f4a8..00000000000000
--- a/test/yarp/snapshots/seattlerb/pctW_lineno.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-ProgramNode(0...28)(
-  [],
-  StatementsNode(0...28)(
-    [ArrayNode(0...28)(
-       [StringNode(3...7)(nil, (3...7), nil, "a\n" + "b"),
-        StringNode(8...9)(nil, (8...9), nil, "c"),
-        StringNode(10...11)(nil, (10...11), nil, "d"),
-        StringNode(12...16)(nil, (12...16), nil, "ef"),
-        StringNode(17...19)(nil, (17...19), nil, "gy"),
-        StringNode(20...23)(nil, (20...23), nil, "hy"),
-        StringNode(24...27)(nil, (24...27), nil, "iy")],
-       (0...3),
-       (27...28)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/pct_Q_backslash_nl.txt b/test/yarp/snapshots/seattlerb/pct_Q_backslash_nl.txt
deleted file mode 100644
index 0725aaee499427..00000000000000
--- a/test/yarp/snapshots/seattlerb/pct_Q_backslash_nl.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-ProgramNode(0...7)(
-  [],
-  StatementsNode(0...7)(
-    [StringNode(0...7)((0...3), (3...6), (6...7), " \\\n")]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/pct_nl.txt b/test/yarp/snapshots/seattlerb/pct_nl.txt
deleted file mode 100644
index 4cdba9d6d621ee..00000000000000
--- a/test/yarp/snapshots/seattlerb/pct_nl.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-ProgramNode(0...7)(
-  [:x],
-  StatementsNode(0...7)(
-    [LocalVariableWriteNode(0...7)(
-       :x,
-       0,
-       (0...1),
-       StringNode(4...7)((4...6), (6...6), (6...7), ""),
-       (2...3)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/pct_w_heredoc_interp_nested.txt b/test/yarp/snapshots/seattlerb/pct_w_heredoc_interp_nested.txt
deleted file mode 100644
index 8c9604e40d9c85..00000000000000
--- a/test/yarp/snapshots/seattlerb/pct_w_heredoc_interp_nested.txt
+++ /dev/null
@@ -1,28 +0,0 @@
-ProgramNode(0...30)(
-  [],
-  StatementsNode(0...30)(
-    [ArrayNode(0...30)(
-       [StringNode(4...5)(nil, (4...5), nil, "1"),
-        InterpolatedStringNode(6...12)(
-          nil,
-          [EmbeddedStatementsNode(6...12)(
-             (6...8),
-             StatementsNode(8...11)(
-               [InterpolatedStringNode(8...11)(
-                  (8...11),
-                  [StringNode(15...17)(nil, (15...17), nil, "2\n")],
-                  (17...19)
-                )]
-             ),
-             (11...12)
-           )],
-          nil
-        ),
-        StringNode(13...14)(nil, (13...14), nil, "3"),
-        StringNode(25...26)(nil, (25...26), nil, "4"),
-        StringNode(27...28)(nil, (27...28), nil, "5")],
-       (0...3),
-       (29...30)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/pipe_semicolon.txt b/test/yarp/snapshots/seattlerb/pipe_semicolon.txt
deleted file mode 100644
index 14dc672e1c2339..00000000000000
--- a/test/yarp/snapshots/seattlerb/pipe_semicolon.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-ProgramNode(0...18)(
-  [],
-  StatementsNode(0...18)(
-    [CallNode(0...18)(
-       CallNode(0...1)(nil, nil, (0...1), nil, nil, nil, nil, 2, "a"),
-       (1...2),
-       (2...3),
-       nil,
-       nil,
-       nil,
-       BlockNode(4...18)(
-         [:c],
-         BlockParametersNode(7...14)(
-           nil,
-           [BlockLocalVariableNode(11...12)(:c)],
-           (7...8),
-           (13...14)
-         ),
-         nil,
-         (4...6),
-         (15...18)
-       ),
-       0,
-       "b"
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/pipe_space.txt b/test/yarp/snapshots/seattlerb/pipe_space.txt
deleted file mode 100644
index 8c66905d04c8a8..00000000000000
--- a/test/yarp/snapshots/seattlerb/pipe_space.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-ProgramNode(0...14)(
-  [],
-  StatementsNode(0...14)(
-    [CallNode(0...14)(
-       CallNode(0...1)(nil, nil, (0...1), nil, nil, nil, nil, 2, "a"),
-       (1...2),
-       (2...3),
-       nil,
-       nil,
-       nil,
-       BlockNode(4...14)(
-         [],
-         BlockParametersNode(7...10)(nil, [], (7...8), (9...10)),
-         nil,
-         (4...6),
-         (11...14)
-       ),
-       0,
-       "b"
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/qWords_space.txt b/test/yarp/snapshots/seattlerb/qWords_space.txt
deleted file mode 100644
index 6713c4ba71612f..00000000000000
--- a/test/yarp/snapshots/seattlerb/qWords_space.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-ProgramNode(0...5)(
-  [],
-  StatementsNode(0...5)([ArrayNode(0...5)([], (0...3), (4...5))])
-)
diff --git a/test/yarp/snapshots/seattlerb/qsymbols.txt b/test/yarp/snapshots/seattlerb/qsymbols.txt
deleted file mode 100644
index 7cf54611c2b5aa..00000000000000
--- a/test/yarp/snapshots/seattlerb/qsymbols.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-ProgramNode(0...9)(
-  [],
-  StatementsNode(0...9)(
-    [ArrayNode(0...9)(
-       [SymbolNode(3...4)(nil, (3...4), nil, "a"),
-        SymbolNode(5...6)(nil, (5...6), nil, "b"),
-        SymbolNode(7...8)(nil, (7...8), nil, "c")],
-       (0...3),
-       (8...9)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/qsymbols_empty.txt b/test/yarp/snapshots/seattlerb/qsymbols_empty.txt
deleted file mode 100644
index cad298895b68c9..00000000000000
--- a/test/yarp/snapshots/seattlerb/qsymbols_empty.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-ProgramNode(0...4)(
-  [],
-  StatementsNode(0...4)([ArrayNode(0...4)([], (0...3), (3...4))])
-)
diff --git a/test/yarp/snapshots/seattlerb/qsymbols_empty_space.txt b/test/yarp/snapshots/seattlerb/qsymbols_empty_space.txt
deleted file mode 100644
index 6713c4ba71612f..00000000000000
--- a/test/yarp/snapshots/seattlerb/qsymbols_empty_space.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-ProgramNode(0...5)(
-  [],
-  StatementsNode(0...5)([ArrayNode(0...5)([], (0...3), (4...5))])
-)
diff --git a/test/yarp/snapshots/seattlerb/qsymbols_interp.txt b/test/yarp/snapshots/seattlerb/qsymbols_interp.txt
deleted file mode 100644
index 2f4a44fc233a56..00000000000000
--- a/test/yarp/snapshots/seattlerb/qsymbols_interp.txt
+++ /dev/null
@@ -1,33 +0,0 @@
-ProgramNode(0...15)(
-  [],
-  StatementsNode(0...15)(
-    [ArrayNode(0...15)(
-       [SymbolNode(3...4)(nil, (3...4), nil, "a"),
-        InterpolatedSymbolNode(5...12)(
-          nil,
-          [StringNode(5...6)(nil, (5...6), nil, "b"),
-           EmbeddedStatementsNode(6...12)(
-             (6...8),
-             StatementsNode(8...11)(
-               [CallNode(8...11)(
-                  IntegerNode(8...9)(),
-                  nil,
-                  (9...10),
-                  nil,
-                  ArgumentsNode(10...11)([IntegerNode(10...11)()]),
-                  nil,
-                  nil,
-                  0,
-                  "+"
-                )]
-             ),
-             (11...12)
-           )],
-          nil
-        ),
-        SymbolNode(13...14)(nil, (13...14), nil, "c")],
-       (0...3),
-       (14...15)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/quoted_symbol_hash_arg.txt b/test/yarp/snapshots/seattlerb/quoted_symbol_hash_arg.txt
deleted file mode 100644
index 861fcaa6a2b1bd..00000000000000
--- a/test/yarp/snapshots/seattlerb/quoted_symbol_hash_arg.txt
+++ /dev/null
@@ -1,24 +0,0 @@
-ProgramNode(0...12)(
-  [],
-  StatementsNode(0...12)(
-    [CallNode(0...12)(
-       nil,
-       nil,
-       (0...4),
-       nil,
-       ArgumentsNode(5...12)(
-         [KeywordHashNode(5...12)(
-            [AssocNode(5...12)(
-               SymbolNode(5...9)((5...6), (6...7), (7...9), "a"),
-               HashNode(10...12)((10...11), [], (11...12)),
-               nil
-             )]
-          )]
-       ),
-       nil,
-       nil,
-       0,
-       "puts"
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/quoted_symbol_keys.txt b/test/yarp/snapshots/seattlerb/quoted_symbol_keys.txt
deleted file mode 100644
index 59b2b5d62d92f2..00000000000000
--- a/test/yarp/snapshots/seattlerb/quoted_symbol_keys.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-ProgramNode(0...11)(
-  [],
-  StatementsNode(0...11)(
-    [HashNode(0...11)(
-       (0...1),
-       [AssocNode(2...9)(
-          SymbolNode(2...6)((2...3), (3...4), (4...6), "a"),
-          SymbolNode(7...9)((7...8), (8...9), nil, "b"),
-          nil
-        )],
-       (10...11)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/qw_escape.txt b/test/yarp/snapshots/seattlerb/qw_escape.txt
deleted file mode 100644
index 0bf3fd8d8b730e..00000000000000
--- a/test/yarp/snapshots/seattlerb/qw_escape.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-ProgramNode(0...7)(
-  [],
-  StatementsNode(0...7)(
-    [StringNode(0...7)((0...3), (3...6), (6...7), "\u0001'")]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/qw_escape_term.txt b/test/yarp/snapshots/seattlerb/qw_escape_term.txt
deleted file mode 100644
index 2c9eb48c3d8b2c..00000000000000
--- a/test/yarp/snapshots/seattlerb/qw_escape_term.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-ProgramNode(0...26)(
-  [],
-  StatementsNode(0...26)(
-    [StringNode(0...26)(
-       (0...3),
-       (3...25),
-       (25...26),
-       "blah blah \\| blah blah"
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/qwords_empty.txt b/test/yarp/snapshots/seattlerb/qwords_empty.txt
deleted file mode 100644
index cad298895b68c9..00000000000000
--- a/test/yarp/snapshots/seattlerb/qwords_empty.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-ProgramNode(0...4)(
-  [],
-  StatementsNode(0...4)([ArrayNode(0...4)([], (0...3), (3...4))])
-)
diff --git a/test/yarp/snapshots/seattlerb/read_escape_unicode_curlies.txt b/test/yarp/snapshots/seattlerb/read_escape_unicode_curlies.txt
deleted file mode 100644
index 26583c05a1b447..00000000000000
--- a/test/yarp/snapshots/seattlerb/read_escape_unicode_curlies.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-ProgramNode(0...9)(
-  [],
-  StatementsNode(0...9)([StringNode(0...9)((0...1), (1...9), nil, " ")])
-)
diff --git a/test/yarp/snapshots/seattlerb/read_escape_unicode_h4.txt b/test/yarp/snapshots/seattlerb/read_escape_unicode_h4.txt
deleted file mode 100644
index b17128c620ed5a..00000000000000
--- a/test/yarp/snapshots/seattlerb/read_escape_unicode_h4.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-ProgramNode(0...7)(
-  [],
-  StatementsNode(0...7)([StringNode(0...7)((0...1), (1...7), nil, " ")])
-)
diff --git a/test/yarp/snapshots/seattlerb/regexp.txt b/test/yarp/snapshots/seattlerb/regexp.txt
deleted file mode 100644
index 122d26a249fcc4..00000000000000
--- a/test/yarp/snapshots/seattlerb/regexp.txt
+++ /dev/null
@@ -1,28 +0,0 @@
-ProgramNode(0...45)(
-  [],
-  StatementsNode(0...45)(
-    [RegularExpressionNode(0...5)((0...1), (1...4), (4...5), "wtf", 0),
-     RegularExpressionNode(7...13)((7...8), (8...11), (11...13), "wtf", 2),
-     RegularExpressionNode(15...21)(
-       (15...16),
-       (16...19),
-       (19...21),
-       "wtf",
-       16
-     ),
-     RegularExpressionNode(23...30)(
-       (23...24),
-       (24...27),
-       (27...30),
-       "wtf",
-       18
-     ),
-     RegularExpressionNode(32...45)(
-       (32...33),
-       (33...36),
-       (36...45),
-       "wtf",
-       18
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/regexp_esc_C_slash.txt b/test/yarp/snapshots/seattlerb/regexp_esc_C_slash.txt
deleted file mode 100644
index 2605080304bc4c..00000000000000
--- a/test/yarp/snapshots/seattlerb/regexp_esc_C_slash.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-ProgramNode(0...7)(
-  [],
-  StatementsNode(0...7)(
-    [RegularExpressionNode(0...7)((0...1), (1...6), (6...7), "\u0003d", 0)]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/regexp_esc_u.txt b/test/yarp/snapshots/seattlerb/regexp_esc_u.txt
deleted file mode 100644
index 8b13368704f3cd..00000000000000
--- a/test/yarp/snapshots/seattlerb/regexp_esc_u.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-ProgramNode(0...17)(
-  [],
-  StatementsNode(0...17)(
-    [RegularExpressionNode(0...17)((0...1), (1...16), (16...17), "[!-']", 0)]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/regexp_escape_extended.txt b/test/yarp/snapshots/seattlerb/regexp_escape_extended.txt
deleted file mode 100644
index 699de5a196957f..00000000000000
--- a/test/yarp/snapshots/seattlerb/regexp_escape_extended.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-ProgramNode(0...6)(
-  [],
-  StatementsNode(0...6)(
-    [RegularExpressionNode(0...6)((0...1), (1...5), (5...6), "“", 0)]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/regexp_unicode_curlies.txt b/test/yarp/snapshots/seattlerb/regexp_unicode_curlies.txt
deleted file mode 100644
index e4502db3f74f31..00000000000000
--- a/test/yarp/snapshots/seattlerb/regexp_unicode_curlies.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-ProgramNode(0...25)(
-  [],
-  StatementsNode(0...25)(
-    [RegularExpressionNode(0...15)((0...1), (1...14), (14...15), "샞몾", 0),
-     RegularExpressionNode(17...25)((17...18), (18...24), (24...25), "ß", 0)]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/required_kwarg_no_value.txt b/test/yarp/snapshots/seattlerb/required_kwarg_no_value.txt
deleted file mode 100644
index 95cf0e279a730e..00000000000000
--- a/test/yarp/snapshots/seattlerb/required_kwarg_no_value.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-ProgramNode(0...16)(
-  [],
-  StatementsNode(0...16)(
-    [DefNode(0...16)(
-       (4...5),
-       nil,
-       ParametersNode(6...12)(
-         [],
-         [],
-         [],
-         nil,
-         [KeywordParameterNode(6...8)((6...8), nil),
-          KeywordParameterNode(10...12)((10...12), nil)],
-         nil,
-         nil
-       ),
-       nil,
-       [:a, :b],
-       (0...3),
-       nil,
-       nil,
-       nil,
-       nil,
-       (13...16)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/rescue_do_end_ensure_result.txt b/test/yarp/snapshots/seattlerb/rescue_do_end_ensure_result.txt
deleted file mode 100644
index 52721053a8249a..00000000000000
--- a/test/yarp/snapshots/seattlerb/rescue_do_end_ensure_result.txt
+++ /dev/null
@@ -1,47 +0,0 @@
-ProgramNode(0...42)(
-  [],
-  StatementsNode(0...42)(
-    [CallNode(0...42)(
-       CallNode(0...37)(
-         nil,
-         nil,
-         (0...4),
-         nil,
-         nil,
-         nil,
-         BlockNode(5...37)(
-           [],
-           nil,
-           BeginNode(10...37)(
-             nil,
-             StatementsNode(10...16)(
-               [SymbolNode(10...16)((10...11), (11...16), nil, "begin")]
-             ),
-             nil,
-             nil,
-             EnsureNode(17...37)(
-               (17...23),
-               StatementsNode(26...33)(
-                 [SymbolNode(26...33)((26...27), (27...33), nil, "ensure")]
-               ),
-               (34...37)
-             ),
-             (34...37)
-           ),
-           (5...7),
-           (34...37)
-         ),
-         0,
-         "proc"
-       ),
-       (37...38),
-       (38...42),
-       nil,
-       nil,
-       nil,
-       nil,
-       0,
-       "call"
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/rescue_do_end_no_raise.txt b/test/yarp/snapshots/seattlerb/rescue_do_end_no_raise.txt
deleted file mode 100644
index c4d46c2f7a9533..00000000000000
--- a/test/yarp/snapshots/seattlerb/rescue_do_end_no_raise.txt
+++ /dev/null
@@ -1,52 +0,0 @@
-ProgramNode(0...66)(
-  [],
-  StatementsNode(0...66)(
-    [CallNode(0...66)(
-       nil,
-       nil,
-       (0...3),
-       nil,
-       nil,
-       nil,
-       BlockNode(4...66)(
-         [],
-         nil,
-         BeginNode(9...66)(
-           nil,
-           StatementsNode(9...15)(
-             [SymbolNode(9...15)((9...10), (10...15), nil, "begin")]
-           ),
-           RescueNode(16...32)(
-             (16...22),
-             [],
-             nil,
-             nil,
-             StatementsNode(25...32)(
-               [SymbolNode(25...32)((25...26), (26...32), nil, "rescue")]
-             ),
-             nil
-           ),
-           ElseNode(33...52)(
-             (33...37),
-             StatementsNode(40...45)(
-               [SymbolNode(40...45)((40...41), (41...45), nil, "else")]
-             ),
-             (46...52)
-           ),
-           EnsureNode(46...66)(
-             (46...52),
-             StatementsNode(55...62)(
-               [SymbolNode(55...62)((55...56), (56...62), nil, "ensure")]
-             ),
-             (63...66)
-           ),
-           (63...66)
-         ),
-         (4...6),
-         (63...66)
-       ),
-       0,
-       "tap"
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/rescue_do_end_raised.txt b/test/yarp/snapshots/seattlerb/rescue_do_end_raised.txt
deleted file mode 100644
index f4e4cda3ee3261..00000000000000
--- a/test/yarp/snapshots/seattlerb/rescue_do_end_raised.txt
+++ /dev/null
@@ -1,47 +0,0 @@
-ProgramNode(0...35)(
-  [],
-  StatementsNode(0...35)(
-    [CallNode(0...35)(
-       nil,
-       nil,
-       (0...3),
-       nil,
-       nil,
-       nil,
-       BlockNode(4...35)(
-         [],
-         nil,
-         BeginNode(9...35)(
-           nil,
-           StatementsNode(9...14)(
-             [CallNode(9...14)(
-                nil,
-                nil,
-                (9...14),
-                nil,
-                nil,
-                nil,
-                nil,
-                2,
-                "raise"
-              )]
-           ),
-           nil,
-           nil,
-           EnsureNode(15...35)(
-             (15...21),
-             StatementsNode(24...31)(
-               [SymbolNode(24...31)((24...25), (25...31), nil, "ensure")]
-             ),
-             (32...35)
-           ),
-           (32...35)
-         ),
-         (4...6),
-         (32...35)
-       ),
-       0,
-       "tap"
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/rescue_do_end_rescued.txt b/test/yarp/snapshots/seattlerb/rescue_do_end_rescued.txt
deleted file mode 100644
index 5376935a827006..00000000000000
--- a/test/yarp/snapshots/seattlerb/rescue_do_end_rescued.txt
+++ /dev/null
@@ -1,62 +0,0 @@
-ProgramNode(0...65)(
-  [],
-  StatementsNode(0...65)(
-    [CallNode(0...65)(
-       nil,
-       nil,
-       (0...3),
-       nil,
-       nil,
-       nil,
-       BlockNode(4...65)(
-         [],
-         nil,
-         BeginNode(9...65)(
-           nil,
-           StatementsNode(9...14)(
-             [CallNode(9...14)(
-                nil,
-                nil,
-                (9...14),
-                nil,
-                nil,
-                nil,
-                nil,
-                2,
-                "raise"
-              )]
-           ),
-           RescueNode(15...31)(
-             (15...21),
-             [],
-             nil,
-             nil,
-             StatementsNode(24...31)(
-               [SymbolNode(24...31)((24...25), (25...31), nil, "rescue")]
-             ),
-             nil
-           ),
-           ElseNode(32...51)(
-             (32...36),
-             StatementsNode(39...44)(
-               [SymbolNode(39...44)((39...40), (40...44), nil, "else")]
-             ),
-             (45...51)
-           ),
-           EnsureNode(45...65)(
-             (45...51),
-             StatementsNode(54...61)(
-               [SymbolNode(54...61)((54...55), (55...61), nil, "ensure")]
-             ),
-             (62...65)
-           ),
-           (62...65)
-         ),
-         (4...6),
-         (62...65)
-       ),
-       0,
-       "tap"
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/rescue_in_block.txt b/test/yarp/snapshots/seattlerb/rescue_in_block.txt
deleted file mode 100644
index 2f096cdf741b7b..00000000000000
--- a/test/yarp/snapshots/seattlerb/rescue_in_block.txt
+++ /dev/null
@@ -1,48 +0,0 @@
-ProgramNode(0...26)(
-  [],
-  StatementsNode(0...26)(
-    [CallNode(0...26)(
-       nil,
-       nil,
-       (0...4),
-       nil,
-       nil,
-       nil,
-       BlockNode(5...26)(
-         [],
-         nil,
-         BeginNode(8...26)(
-           nil,
-           nil,
-           RescueNode(8...22)(
-             (8...14),
-             [],
-             nil,
-             nil,
-             StatementsNode(17...22)(
-               [CallNode(17...22)(
-                  nil,
-                  nil,
-                  (17...22),
-                  nil,
-                  nil,
-                  nil,
-                  nil,
-                  2,
-                  "stuff"
-                )]
-             ),
-             nil
-           ),
-           nil,
-           nil,
-           (23...26)
-         ),
-         (5...7),
-         (23...26)
-       ),
-       0,
-       "blah"
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/rescue_parens.txt b/test/yarp/snapshots/seattlerb/rescue_parens.txt
deleted file mode 100644
index c672e59e6f65d9..00000000000000
--- a/test/yarp/snapshots/seattlerb/rescue_parens.txt
+++ /dev/null
@@ -1,48 +0,0 @@
-ProgramNode(0...14)(
-  [],
-  StatementsNode(0...14)(
-    [CallNode(0...14)(
-       nil,
-       nil,
-       (0...1),
-       nil,
-       ArgumentsNode(2...14)(
-         [ParenthesesNode(2...14)(
-            StatementsNode(3...13)(
-              [RescueModifierNode(3...13)(
-                 CallNode(3...4)(
-                   nil,
-                   nil,
-                   (3...4),
-                   nil,
-                   nil,
-                   nil,
-                   nil,
-                   2,
-                   "b"
-                 ),
-                 (5...11),
-                 CallNode(12...13)(
-                   nil,
-                   nil,
-                   (12...13),
-                   nil,
-                   nil,
-                   nil,
-                   nil,
-                   2,
-                   "c"
-                 )
-               )]
-            ),
-            (2...3),
-            (13...14)
-          )]
-       ),
-       nil,
-       nil,
-       0,
-       "a"
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/return_call_assocs.txt b/test/yarp/snapshots/seattlerb/return_call_assocs.txt
deleted file mode 100644
index 9698080b5e9918..00000000000000
--- a/test/yarp/snapshots/seattlerb/return_call_assocs.txt
+++ /dev/null
@@ -1,142 +0,0 @@
-ProgramNode(0...106)(
-  [],
-  StatementsNode(0...106)(
-    [ReturnNode(0...17)(
-       (0...6),
-       ArgumentsNode(7...17)(
-         [IntegerNode(7...8)(),
-          KeywordHashNode(10...17)(
-            [AssocNode(10...17)(
-               SymbolNode(10...12)((10...11), (11...12), nil, "z"),
-               IntegerNode(16...17)(),
-               (13...15)
-             )]
-          )]
-       )
-     ),
-     ReturnNode(19...45)(
-       (19...25),
-       ArgumentsNode(26...45)(
-         [IntegerNode(26...27)(),
-          KeywordHashNode(29...45)(
-            [AssocNode(29...36)(
-               SymbolNode(29...31)((29...30), (30...31), nil, "z"),
-               IntegerNode(35...36)(),
-               (32...34)
-             ),
-             AssocNode(38...45)(
-               SymbolNode(38...40)((38...39), (39...40), nil, "w"),
-               IntegerNode(44...45)(),
-               (41...43)
-             )]
-          )]
-       )
-     ),
-     ReturnNode(47...61)(
-       (47...53),
-       ArgumentsNode(54...61)(
-         [CallNode(54...61)(
-            nil,
-            nil,
-            (54...55),
-            nil,
-            ArgumentsNode(56...61)(
-              [KeywordHashNode(56...61)(
-                 [AssocNode(56...61)(
-                    SymbolNode(56...58)((56...57), (57...58), nil, "z"),
-                    IntegerNode(60...61)(),
-                    (58...60)
-                  )]
-               )]
-            ),
-            nil,
-            nil,
-            0,
-            "y"
-          )]
-       )
-     ),
-     ReturnNode(63...75)(
-       (63...69),
-       ArgumentsNode(70...75)(
-         [CallNode(70...75)(
-            nil,
-            nil,
-            (70...71),
-            nil,
-            ArgumentsNode(72...75)(
-              [KeywordHashNode(72...75)(
-                 [AssocNode(72...75)(
-                    SymbolNode(72...74)(nil, (72...73), (73...74), "z"),
-                    IntegerNode(74...75)(),
-                    nil
-                  )]
-               )]
-            ),
-            nil,
-            nil,
-            0,
-            "y"
-          )]
-       )
-     ),
-     ReturnNode(77...90)(
-       (77...83),
-       ArgumentsNode(84...90)(
-         [CallNode(84...90)(
-            nil,
-            nil,
-            (84...85),
-            (85...86),
-            ArgumentsNode(86...89)(
-              [KeywordHashNode(86...89)(
-                 [AssocNode(86...89)(
-                    SymbolNode(86...88)(nil, (86...87), (87...88), "z"),
-                    IntegerNode(88...89)(),
-                    nil
-                  )]
-               )]
-            ),
-            (89...90),
-            nil,
-            0,
-            "y"
-          )]
-       )
-     ),
-     ReturnNode(92...106)(
-       (92...98),
-       ArgumentsNode(99...106)(
-         [CallNode(99...106)(
-            nil,
-            nil,
-            (99...100),
-            (100...101),
-            ArgumentsNode(101...105)(
-              [KeywordHashNode(101...105)(
-                 [AssocNode(101...105)(
-                    CallNode(101...102)(
-                      nil,
-                      nil,
-                      (101...102),
-                      nil,
-                      nil,
-                      nil,
-                      nil,
-                      2,
-                      "z"
-                    ),
-                    IntegerNode(104...105)(),
-                    (102...104)
-                  )]
-               )]
-            ),
-            (105...106),
-            nil,
-            0,
-            "y"
-          )]
-       )
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/rhs_asgn.txt b/test/yarp/snapshots/seattlerb/rhs_asgn.txt
deleted file mode 100644
index 604a14667b1e6d..00000000000000
--- a/test/yarp/snapshots/seattlerb/rhs_asgn.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-ProgramNode(0...7)(
-  [:n],
-  StatementsNode(0...7)(
-    [MatchRequiredNode(0...7)(
-       IntegerNode(0...2)(),
-       LocalVariableTargetNode(6...7)(:n, 0),
-       (3...5)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/ruby21_numbers.txt b/test/yarp/snapshots/seattlerb/ruby21_numbers.txt
deleted file mode 100644
index f250397d152d72..00000000000000
--- a/test/yarp/snapshots/seattlerb/ruby21_numbers.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-ProgramNode(0...13)(
-  [],
-  StatementsNode(0...13)(
-    [ArrayNode(0...13)(
-       [ImaginaryNode(1...3)(IntegerNode(1...2)()),
-        RationalNode(5...7)(IntegerNode(5...6)()),
-        ImaginaryNode(9...12)(RationalNode(9...11)(IntegerNode(9...10)()))],
-       (0...1),
-       (12...13)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/safe_attrasgn.txt b/test/yarp/snapshots/seattlerb/safe_attrasgn.txt
deleted file mode 100644
index a48f189f41a122..00000000000000
--- a/test/yarp/snapshots/seattlerb/safe_attrasgn.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-ProgramNode(0...8)(
-  [],
-  StatementsNode(0...8)(
-    [CallNode(0...8)(
-       CallNode(0...1)(nil, nil, (0...1), nil, nil, nil, nil, 2, "a"),
-       (1...3),
-       (3...4),
-       nil,
-       ArgumentsNode(7...8)([IntegerNode(7...8)()]),
-       nil,
-       nil,
-       1,
-       "b="
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/safe_attrasgn_constant.txt b/test/yarp/snapshots/seattlerb/safe_attrasgn_constant.txt
deleted file mode 100644
index 8f51d308631869..00000000000000
--- a/test/yarp/snapshots/seattlerb/safe_attrasgn_constant.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-ProgramNode(0...8)(
-  [],
-  StatementsNode(0...8)(
-    [CallNode(0...8)(
-       CallNode(0...1)(nil, nil, (0...1), nil, nil, nil, nil, 2, "a"),
-       (1...3),
-       (3...4),
-       nil,
-       ArgumentsNode(7...8)([IntegerNode(7...8)()]),
-       nil,
-       nil,
-       1,
-       "B="
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/safe_call.txt b/test/yarp/snapshots/seattlerb/safe_call.txt
deleted file mode 100644
index d170db0f559f59..00000000000000
--- a/test/yarp/snapshots/seattlerb/safe_call.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-ProgramNode(0...4)(
-  [],
-  StatementsNode(0...4)(
-    [CallNode(0...4)(
-       CallNode(0...1)(nil, nil, (0...1), nil, nil, nil, nil, 2, "a"),
-       (1...3),
-       (3...4),
-       nil,
-       nil,
-       nil,
-       nil,
-       1,
-       "b"
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/safe_call_after_newline.txt b/test/yarp/snapshots/seattlerb/safe_call_after_newline.txt
deleted file mode 100644
index 0f48cd9867ac30..00000000000000
--- a/test/yarp/snapshots/seattlerb/safe_call_after_newline.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-ProgramNode(0...5)(
-  [],
-  StatementsNode(0...5)(
-    [CallNode(0...5)(
-       CallNode(0...1)(nil, nil, (0...1), nil, nil, nil, nil, 2, "a"),
-       (2...4),
-       (4...5),
-       nil,
-       nil,
-       nil,
-       nil,
-       1,
-       "b"
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/safe_call_dot_parens.txt b/test/yarp/snapshots/seattlerb/safe_call_dot_parens.txt
deleted file mode 100644
index 5800090fbbb9d5..00000000000000
--- a/test/yarp/snapshots/seattlerb/safe_call_dot_parens.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-ProgramNode(0...5)(
-  [],
-  StatementsNode(0...5)(
-    [CallNode(0...5)(
-       CallNode(0...1)(nil, nil, (0...1), nil, nil, nil, nil, 2, "a"),
-       (1...3),
-       nil,
-       (3...4),
-       nil,
-       (4...5),
-       nil,
-       1,
-       "call"
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/safe_call_newline.txt b/test/yarp/snapshots/seattlerb/safe_call_newline.txt
deleted file mode 100644
index d170db0f559f59..00000000000000
--- a/test/yarp/snapshots/seattlerb/safe_call_newline.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-ProgramNode(0...4)(
-  [],
-  StatementsNode(0...4)(
-    [CallNode(0...4)(
-       CallNode(0...1)(nil, nil, (0...1), nil, nil, nil, nil, 2, "a"),
-       (1...3),
-       (3...4),
-       nil,
-       nil,
-       nil,
-       nil,
-       1,
-       "b"
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/safe_call_operator.txt b/test/yarp/snapshots/seattlerb/safe_call_operator.txt
deleted file mode 100644
index 58df15db4ae8e1..00000000000000
--- a/test/yarp/snapshots/seattlerb/safe_call_operator.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-ProgramNode(0...6)(
-  [],
-  StatementsNode(0...6)(
-    [CallNode(0...6)(
-       CallNode(0...1)(nil, nil, (0...1), nil, nil, nil, nil, 2, "a"),
-       (1...3),
-       (3...4),
-       nil,
-       ArgumentsNode(5...6)([IntegerNode(5...6)()]),
-       nil,
-       nil,
-       1,
-       ">"
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/safe_call_rhs_newline.txt b/test/yarp/snapshots/seattlerb/safe_call_rhs_newline.txt
deleted file mode 100644
index 7785c7921ece14..00000000000000
--- a/test/yarp/snapshots/seattlerb/safe_call_rhs_newline.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-ProgramNode(0...8)(
-  [:c],
-  StatementsNode(0...8)(
-    [LocalVariableWriteNode(0...8)(
-       :c,
-       0,
-       (0...1),
-       CallNode(4...8)(
-         CallNode(4...5)(nil, nil, (4...5), nil, nil, nil, nil, 2, "a"),
-         (5...7),
-         (7...8),
-         nil,
-         nil,
-         nil,
-         nil,
-         1,
-         "b"
-       ),
-       (2...3)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/safe_calls.txt b/test/yarp/snapshots/seattlerb/safe_calls.txt
deleted file mode 100644
index 400667a3544a28..00000000000000
--- a/test/yarp/snapshots/seattlerb/safe_calls.txt
+++ /dev/null
@@ -1,26 +0,0 @@
-ProgramNode(0...10)(
-  [],
-  StatementsNode(0...10)(
-    [CallNode(0...10)(
-       CallNode(0...4)(
-         CallNode(0...1)(nil, nil, (0...1), nil, nil, nil, nil, 2, "a"),
-         (1...3),
-         (3...4),
-         nil,
-         nil,
-         nil,
-         nil,
-         1,
-         "b"
-       ),
-       (4...6),
-       (6...7),
-       (7...8),
-       ArgumentsNode(8...9)([IntegerNode(8...9)()]),
-       (9...10),
-       nil,
-       1,
-       "c"
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/safe_op_asgn.txt b/test/yarp/snapshots/seattlerb/safe_op_asgn.txt
deleted file mode 100644
index e5bc617610354b..00000000000000
--- a/test/yarp/snapshots/seattlerb/safe_op_asgn.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-ProgramNode(0...11)(
-  [],
-  StatementsNode(0...11)(
-    [CallOperatorWriteNode(0...11)(
-       CallNode(0...1)(nil, nil, (0...1), nil, nil, nil, nil, 2, "a"),
-       (1...3),
-       (3...4),
-       nil,
-       nil,
-       nil,
-       1,
-       "b",
-       "b=",
-       :+,
-       (5...7),
-       CallNode(8...11)(
-         nil,
-         nil,
-         (8...9),
-         nil,
-         ArgumentsNode(10...11)([IntegerNode(10...11)()]),
-         nil,
-         nil,
-         0,
-         "x"
-       )
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/safe_op_asgn2.txt b/test/yarp/snapshots/seattlerb/safe_op_asgn2.txt
deleted file mode 100644
index c1175989aec8bd..00000000000000
--- a/test/yarp/snapshots/seattlerb/safe_op_asgn2.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-ProgramNode(0...10)(
-  [],
-  StatementsNode(0...10)(
-    [CallOrWriteNode(0...10)(
-       CallNode(0...1)(nil, nil, (0...1), nil, nil, nil, nil, 2, "a"),
-       (1...3),
-       (3...4),
-       nil,
-       nil,
-       nil,
-       1,
-       "b",
-       "b=",
-       (5...8),
-       CallNode(9...10)(nil, nil, (9...10), nil, nil, nil, nil, 2, "x")
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/slashy_newlines_within_string.txt b/test/yarp/snapshots/seattlerb/slashy_newlines_within_string.txt
deleted file mode 100644
index 1ef9123f4c8f5d..00000000000000
--- a/test/yarp/snapshots/seattlerb/slashy_newlines_within_string.txt
+++ /dev/null
@@ -1,36 +0,0 @@
-ProgramNode(0...40)(
-  [],
-  StatementsNode(0...40)(
-    [CallNode(0...33)(
-       nil,
-       nil,
-       (0...4),
-       nil,
-       ArgumentsNode(5...33)(
-         [StringNode(5...33)(
-            (5...6),
-            (6...32),
-            (32...33),
-            "hello my dear friend"
-          )]
-       ),
-       nil,
-       nil,
-       0,
-       "puts"
-     ),
-     CallNode(35...40)(
-       CallNode(35...36)(nil, nil, (35...36), nil, nil, nil, nil, 2, "a"),
-       nil,
-       (37...38),
-       nil,
-       ArgumentsNode(39...40)(
-         [CallNode(39...40)(nil, nil, (39...40), nil, nil, nil, nil, 2, "b")]
-       ),
-       nil,
-       nil,
-       0,
-       "+"
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/stabby_arg_no_paren.txt b/test/yarp/snapshots/seattlerb/stabby_arg_no_paren.txt
deleted file mode 100644
index d999e4ea4729ba..00000000000000
--- a/test/yarp/snapshots/seattlerb/stabby_arg_no_paren.txt
+++ /dev/null
@@ -1,26 +0,0 @@
-ProgramNode(0...5)(
-  [],
-  StatementsNode(0...5)(
-    [LambdaNode(0...5)(
-       [:a],
-       (0...2),
-       (3...4),
-       (4...5),
-       BlockParametersNode(2...3)(
-         ParametersNode(2...3)(
-           [RequiredParameterNode(2...3)(:a)],
-           [],
-           [],
-           nil,
-           [],
-           nil,
-           nil
-         ),
-         [],
-         nil,
-         nil
-       ),
-       nil
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/stabby_arg_opt_splat_arg_block_omfg.txt b/test/yarp/snapshots/seattlerb/stabby_arg_opt_splat_arg_block_omfg.txt
deleted file mode 100644
index 4b16ebf090eb02..00000000000000
--- a/test/yarp/snapshots/seattlerb/stabby_arg_opt_splat_arg_block_omfg.txt
+++ /dev/null
@@ -1,31 +0,0 @@
-ProgramNode(0...23)(
-  [],
-  StatementsNode(0...23)(
-    [LambdaNode(0...23)(
-       [:b, :c, :d, :e, :f],
-       (0...2),
-       (21...22),
-       (22...23),
-       BlockParametersNode(2...21)(
-         ParametersNode(3...20)(
-           [RequiredParameterNode(3...4)(:b)],
-           [OptionalParameterNode(6...9)(
-              :c,
-              (6...7),
-              (7...8),
-              IntegerNode(8...9)()
-            )],
-           [RequiredParameterNode(15...16)(:e)],
-           RestParameterNode(11...13)((11...12), (12...13)),
-           [],
-           nil,
-           BlockParameterNode(18...20)(:f, (19...20), (18...19))
-         ),
-         [],
-         (2...3),
-         (20...21)
-       ),
-       nil
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/stabby_block_iter_call.txt b/test/yarp/snapshots/seattlerb/stabby_block_iter_call.txt
deleted file mode 100644
index 719c895b99b89c..00000000000000
--- a/test/yarp/snapshots/seattlerb/stabby_block_iter_call.txt
+++ /dev/null
@@ -1,47 +0,0 @@
-ProgramNode(0...25)(
-  [],
-  StatementsNode(0...25)(
-    [CallNode(0...25)(
-       nil,
-       nil,
-       (0...1),
-       nil,
-       ArgumentsNode(2...25)(
-         [LambdaNode(2...25)(
-            [],
-            (2...4),
-            (8...10),
-            (22...25),
-            BlockParametersNode(5...7)(nil, [], (5...6), (6...7)),
-            StatementsNode(11...21)(
-              [CallNode(11...21)(
-                 CallNode(11...12)(
-                   nil,
-                   nil,
-                   (11...12),
-                   nil,
-                   nil,
-                   nil,
-                   nil,
-                   2,
-                   "a"
-                 ),
-                 (12...13),
-                 (13...14),
-                 nil,
-                 nil,
-                 nil,
-                 BlockNode(15...21)([], nil, nil, (15...17), (18...21)),
-                 0,
-                 "b"
-               )]
-            )
-          )]
-       ),
-       nil,
-       nil,
-       0,
-       "x"
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/stabby_block_iter_call_no_target_with_arg.txt b/test/yarp/snapshots/seattlerb/stabby_block_iter_call_no_target_with_arg.txt
deleted file mode 100644
index 14b7a3eb982ed5..00000000000000
--- a/test/yarp/snapshots/seattlerb/stabby_block_iter_call_no_target_with_arg.txt
+++ /dev/null
@@ -1,37 +0,0 @@
-ProgramNode(0...26)(
-  [],
-  StatementsNode(0...26)(
-    [CallNode(0...26)(
-       nil,
-       nil,
-       (0...1),
-       nil,
-       ArgumentsNode(2...26)(
-         [LambdaNode(2...26)(
-            [],
-            (2...4),
-            (8...10),
-            (23...26),
-            BlockParametersNode(5...7)(nil, [], (5...6), (6...7)),
-            StatementsNode(11...22)(
-              [CallNode(11...22)(
-                 nil,
-                 nil,
-                 (11...12),
-                 (12...13),
-                 ArgumentsNode(13...14)([IntegerNode(13...14)()]),
-                 (14...15),
-                 BlockNode(16...22)([], nil, nil, (16...18), (19...22)),
-                 0,
-                 "a"
-               )]
-            )
-          )]
-       ),
-       nil,
-       nil,
-       0,
-       "x"
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/stabby_block_kw.txt b/test/yarp/snapshots/seattlerb/stabby_block_kw.txt
deleted file mode 100644
index 8df95715c9f04e..00000000000000
--- a/test/yarp/snapshots/seattlerb/stabby_block_kw.txt
+++ /dev/null
@@ -1,26 +0,0 @@
-ProgramNode(0...13)(
-  [],
-  StatementsNode(0...13)(
-    [LambdaNode(0...13)(
-       [:k],
-       (0...2),
-       (10...11),
-       (12...13),
-       BlockParametersNode(3...9)(
-         ParametersNode(4...8)(
-           [],
-           [],
-           [],
-           nil,
-           [KeywordParameterNode(4...8)((4...6), IntegerNode(6...8)())],
-           nil,
-           nil
-         ),
-         [],
-         (3...4),
-         (8...9)
-       ),
-       nil
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/stabby_block_kw__required.txt b/test/yarp/snapshots/seattlerb/stabby_block_kw__required.txt
deleted file mode 100644
index 8d3e73af8b7766..00000000000000
--- a/test/yarp/snapshots/seattlerb/stabby_block_kw__required.txt
+++ /dev/null
@@ -1,26 +0,0 @@
-ProgramNode(0...11)(
-  [],
-  StatementsNode(0...11)(
-    [LambdaNode(0...11)(
-       [:k],
-       (0...2),
-       (8...9),
-       (10...11),
-       BlockParametersNode(3...7)(
-         ParametersNode(4...6)(
-           [],
-           [],
-           [],
-           nil,
-           [KeywordParameterNode(4...6)((4...6), nil)],
-           nil,
-           nil
-         ),
-         [],
-         (3...4),
-         (6...7)
-       ),
-       nil
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/stabby_proc_scope.txt b/test/yarp/snapshots/seattlerb/stabby_proc_scope.txt
deleted file mode 100644
index d8e06afa0fadec..00000000000000
--- a/test/yarp/snapshots/seattlerb/stabby_proc_scope.txt
+++ /dev/null
@@ -1,26 +0,0 @@
-ProgramNode(0...11)(
-  [],
-  StatementsNode(0...11)(
-    [LambdaNode(0...11)(
-       [:a, :b],
-       (0...2),
-       (9...10),
-       (10...11),
-       BlockParametersNode(2...8)(
-         ParametersNode(3...4)(
-           [RequiredParameterNode(3...4)(:a)],
-           [],
-           [],
-           nil,
-           [],
-           nil,
-           nil
-         ),
-         [BlockLocalVariableNode(6...7)(:b)],
-         (2...3),
-         (7...8)
-       ),
-       nil
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/str_backslashes.txt b/test/yarp/snapshots/seattlerb/str_backslashes.txt
deleted file mode 100644
index 8ad69066113f76..00000000000000
--- a/test/yarp/snapshots/seattlerb/str_backslashes.txt
+++ /dev/null
@@ -1,23 +0,0 @@
-ProgramNode(0...204)(
-  [],
-  StatementsNode(0...204)(
-    [CallNode(0...204)(
-       nil,
-       nil,
-       (0...1),
-       nil,
-       ArgumentsNode(2...204)(
-         [StringNode(2...204)(
-            (2...3),
-            (3...203),
-            (203...204),
-            "\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n"
-          )]
-       ),
-       nil,
-       nil,
-       0,
-       "x"
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/str_double_double_escaped_newline.txt b/test/yarp/snapshots/seattlerb/str_double_double_escaped_newline.txt
deleted file mode 100644
index 2be5ea34e95522..00000000000000
--- a/test/yarp/snapshots/seattlerb/str_double_double_escaped_newline.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-ProgramNode(0...9)(
-  [],
-  StatementsNode(0...9)(
-    [CallNode(0...7)(
-       nil,
-       nil,
-       (0...1),
-       nil,
-       ArgumentsNode(2...7)(
-         [StringNode(2...7)((2...3), (3...6), (6...7), "\\n")]
-       ),
-       nil,
-       nil,
-       0,
-       "a"
-     ),
-     CallNode(8...9)(nil, nil, (8...9), nil, nil, nil, nil, 2, "b")]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/str_double_escaped_newline.txt b/test/yarp/snapshots/seattlerb/str_double_escaped_newline.txt
deleted file mode 100644
index 7b724c6b80e167..00000000000000
--- a/test/yarp/snapshots/seattlerb/str_double_escaped_newline.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-ProgramNode(0...8)(
-  [],
-  StatementsNode(0...8)(
-    [CallNode(0...6)(
-       nil,
-       nil,
-       (0...1),
-       nil,
-       ArgumentsNode(2...6)(
-         [StringNode(2...6)((2...3), (3...5), (5...6), "\n")]
-       ),
-       nil,
-       nil,
-       0,
-       "a"
-     ),
-     CallNode(7...8)(nil, nil, (7...8), nil, nil, nil, nil, 2, "b")]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/str_double_newline.txt b/test/yarp/snapshots/seattlerb/str_double_newline.txt
deleted file mode 100644
index 6b7a3afb32542c..00000000000000
--- a/test/yarp/snapshots/seattlerb/str_double_newline.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-ProgramNode(0...7)(
-  [],
-  StatementsNode(0...7)(
-    [CallNode(0...5)(
-       nil,
-       nil,
-       (0...1),
-       nil,
-       ArgumentsNode(2...5)(
-         [StringNode(2...5)((2...3), (3...4), (4...5), "\n")]
-       ),
-       nil,
-       nil,
-       0,
-       "a"
-     ),
-     CallNode(6...7)(nil, nil, (6...7), nil, nil, nil, nil, 2, "b")]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/str_evstr.txt b/test/yarp/snapshots/seattlerb/str_evstr.txt
deleted file mode 100644
index 18d41a9b6aa79f..00000000000000
--- a/test/yarp/snapshots/seattlerb/str_evstr.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-ProgramNode(0...8)(
-  [],
-  StatementsNode(0...8)(
-    [InterpolatedStringNode(0...8)(
-       (0...1),
-       [StringNode(1...3)(nil, (1...3), nil, "a "),
-        EmbeddedStatementsNode(3...7)(
-          (3...5),
-          StatementsNode(5...6)(
-            [CallNode(5...6)(nil, nil, (5...6), nil, nil, nil, nil, 2, "b")]
-          ),
-          (6...7)
-        )],
-       (7...8)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/str_evstr_escape.txt b/test/yarp/snapshots/seattlerb/str_evstr_escape.txt
deleted file mode 100644
index e95335e227861d..00000000000000
--- a/test/yarp/snapshots/seattlerb/str_evstr_escape.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-ProgramNode(0...16)(
-  [],
-  StatementsNode(0...16)(
-    [InterpolatedStringNode(0...16)(
-       (0...1),
-       [StringNode(1...3)(nil, (1...3), nil, "a "),
-        EmbeddedStatementsNode(3...7)(
-          (3...5),
-          StatementsNode(5...6)(
-            [CallNode(5...6)(nil, nil, (5...6), nil, nil, nil, nil, 2, "b")]
-          ),
-          (6...7)
-        ),
-        StringNode(7...15)(nil, (7...15), nil, "½")],
-       (15...16)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/str_heredoc_interp.txt b/test/yarp/snapshots/seattlerb/str_heredoc_interp.txt
deleted file mode 100644
index 22f5a96755a83f..00000000000000
--- a/test/yarp/snapshots/seattlerb/str_heredoc_interp.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-ProgramNode(0...4)(
-  [],
-  StatementsNode(0...4)(
-    [InterpolatedStringNode(0...4)(
-       (0...4),
-       [EmbeddedStatementsNode(5...9)(
-          (5...7),
-          StatementsNode(7...8)(
-            [CallNode(7...8)(nil, nil, (7...8), nil, nil, nil, nil, 2, "x")]
-          ),
-          (8...9)
-        ),
-        StringNode(9...16)(nil, (9...16), nil, "\n" + "blah2\n")],
-       (16...17)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/str_interp_ternary_or_label.txt b/test/yarp/snapshots/seattlerb/str_interp_ternary_or_label.txt
deleted file mode 100644
index d2ec64657fbd61..00000000000000
--- a/test/yarp/snapshots/seattlerb/str_interp_ternary_or_label.txt
+++ /dev/null
@@ -1,89 +0,0 @@
-ProgramNode(0...23)(
-  [],
-  StatementsNode(0...23)(
-    [InterpolatedStringNode(0...23)(
-       (0...1),
-       [EmbeddedStatementsNode(1...22)(
-          (1...3),
-          StatementsNode(3...21)(
-            [IfNode(3...21)(
-               nil,
-               CallNode(3...7)(
-                 CallNode(3...4)(
-                   nil,
-                   nil,
-                   (3...4),
-                   nil,
-                   nil,
-                   nil,
-                   nil,
-                   2,
-                   "a"
-                 ),
-                 (4...5),
-                 (5...7),
-                 nil,
-                 nil,
-                 nil,
-                 nil,
-                 0,
-                 "b?"
-               ),
-               StatementsNode(10...17)(
-                 [CallNode(10...17)(
-                    CallNode(10...14)(
-                      StringNode(10...12)((10...11), (11...11), (11...12), ""),
-                      nil,
-                      (12...13),
-                      nil,
-                      ArgumentsNode(13...14)(
-                        [CallNode(13...14)(
-                           nil,
-                           nil,
-                           (13...14),
-                           nil,
-                           nil,
-                           nil,
-                           nil,
-                           2,
-                           "a"
-                         )]
-                      ),
-                      nil,
-                      nil,
-                      0,
-                      "+"
-                    ),
-                    nil,
-                    (14...15),
-                    nil,
-                    ArgumentsNode(15...17)(
-                      [StringNode(15...17)(
-                         (15...16),
-                         (16...16),
-                         (16...17),
-                         ""
-                       )]
-                    ),
-                    nil,
-                    nil,
-                    0,
-                    "+"
-                  )]
-               ),
-               ElseNode(17...21)(
-                 (17...18),
-                 StatementsNode(19...21)(
-                   [StringNode(19...21)((19...20), (20...20), (20...21), "")]
-                 ),
-                 nil
-               ),
-               nil
-             )]
-          ),
-          (21...22)
-        )],
-       (22...23)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/str_lit_concat_bad_encodings.txt b/test/yarp/snapshots/seattlerb/str_lit_concat_bad_encodings.txt
deleted file mode 100644
index 350cc6b6b9f3e7..00000000000000
--- a/test/yarp/snapshots/seattlerb/str_lit_concat_bad_encodings.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-ProgramNode(0...131)(
-  [],
-  StatementsNode(0...131)(
-    [StringConcatNode(0...131)(
-       StringNode(0...62)(
-         (0...1),
-         (1...61),
-         (61...62),
-         "\xE3Ӌー\x83\xE3\x83コ\xA3\x82\x99"
-       ),
-       StringNode(73...131)(
-         (73...74),
-         (74...130),
-         (130...131),
-         "ンパý;foo@bar.com"
-       )
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/str_newline_hash_line_number.txt b/test/yarp/snapshots/seattlerb/str_newline_hash_line_number.txt
deleted file mode 100644
index e56d74eed79790..00000000000000
--- a/test/yarp/snapshots/seattlerb/str_newline_hash_line_number.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-ProgramNode(0...13)(
-  [],
-  StatementsNode(0...13)(
-    [StringNode(0...11)(
-       (0...1),
-       (1...10),
-       (10...11),
-       "\n" + "\n" + "\n" + "\n" + "#"
-     ),
-     IntegerNode(12...13)()]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/str_pct_Q_nested.txt b/test/yarp/snapshots/seattlerb/str_pct_Q_nested.txt
deleted file mode 100644
index 613e85a088a0d9..00000000000000
--- a/test/yarp/snapshots/seattlerb/str_pct_Q_nested.txt
+++ /dev/null
@@ -1,28 +0,0 @@
-ProgramNode(0...26)(
-  [],
-  StatementsNode(0...26)(
-    [InterpolatedStringNode(0...26)(
-       (0...3),
-       [StringNode(3...11)(nil, (3...11), nil, "before ["),
-        EmbeddedStatementsNode(11...18)(
-          (11...13),
-          StatementsNode(13...17)(
-            [CallNode(13...17)(
-               nil,
-               nil,
-               (13...17),
-               nil,
-               nil,
-               nil,
-               nil,
-               2,
-               "nest"
-             )]
-          ),
-          (17...18)
-        ),
-        StringNode(18...25)(nil, (18...25), nil, "] after")],
-       (25...26)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/str_pct_nested_nested.txt b/test/yarp/snapshots/seattlerb/str_pct_nested_nested.txt
deleted file mode 100644
index b615b691cc2e7a..00000000000000
--- a/test/yarp/snapshots/seattlerb/str_pct_nested_nested.txt
+++ /dev/null
@@ -1,26 +0,0 @@
-ProgramNode(0...20)(
-  [],
-  StatementsNode(0...20)(
-    [InterpolatedStringNode(0...20)(
-       (0...2),
-       [StringNode(2...5)(nil, (2...5), nil, " { "),
-        EmbeddedStatementsNode(5...16)(
-          (5...7),
-          StatementsNode(8...14)(
-            [InterpolatedStringNode(8...14)(
-               (8...9),
-               [EmbeddedStatementsNode(9...13)(
-                  (9...11),
-                  StatementsNode(11...12)([IntegerNode(11...12)()]),
-                  (12...13)
-                )],
-               (13...14)
-             )]
-          ),
-          (15...16)
-        ),
-        StringNode(16...19)(nil, (16...19), nil, " } ")],
-       (19...20)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/str_pct_q.txt b/test/yarp/snapshots/seattlerb/str_pct_q.txt
deleted file mode 100644
index be3f92365cbc9e..00000000000000
--- a/test/yarp/snapshots/seattlerb/str_pct_q.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-ProgramNode(0...9)(
-  [],
-  StatementsNode(0...9)(
-    [StringNode(0...9)((0...3), (3...8), (8...9), "a b c")]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/str_single_double_escaped_newline.txt b/test/yarp/snapshots/seattlerb/str_single_double_escaped_newline.txt
deleted file mode 100644
index 2be5ea34e95522..00000000000000
--- a/test/yarp/snapshots/seattlerb/str_single_double_escaped_newline.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-ProgramNode(0...9)(
-  [],
-  StatementsNode(0...9)(
-    [CallNode(0...7)(
-       nil,
-       nil,
-       (0...1),
-       nil,
-       ArgumentsNode(2...7)(
-         [StringNode(2...7)((2...3), (3...6), (6...7), "\\n")]
-       ),
-       nil,
-       nil,
-       0,
-       "a"
-     ),
-     CallNode(8...9)(nil, nil, (8...9), nil, nil, nil, nil, 2, "b")]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/str_single_escaped_newline.txt b/test/yarp/snapshots/seattlerb/str_single_escaped_newline.txt
deleted file mode 100644
index d97f1ce0169ef4..00000000000000
--- a/test/yarp/snapshots/seattlerb/str_single_escaped_newline.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-ProgramNode(0...8)(
-  [],
-  StatementsNode(0...8)(
-    [CallNode(0...6)(
-       nil,
-       nil,
-       (0...1),
-       nil,
-       ArgumentsNode(2...6)(
-         [StringNode(2...6)((2...3), (3...5), (5...6), "\\n")]
-       ),
-       nil,
-       nil,
-       0,
-       "a"
-     ),
-     CallNode(7...8)(nil, nil, (7...8), nil, nil, nil, nil, 2, "b")]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/str_single_newline.txt b/test/yarp/snapshots/seattlerb/str_single_newline.txt
deleted file mode 100644
index 6b7a3afb32542c..00000000000000
--- a/test/yarp/snapshots/seattlerb/str_single_newline.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-ProgramNode(0...7)(
-  [],
-  StatementsNode(0...7)(
-    [CallNode(0...5)(
-       nil,
-       nil,
-       (0...1),
-       nil,
-       ArgumentsNode(2...5)(
-         [StringNode(2...5)((2...3), (3...4), (4...5), "\n")]
-       ),
-       nil,
-       nil,
-       0,
-       "a"
-     ),
-     CallNode(6...7)(nil, nil, (6...7), nil, nil, nil, nil, 2, "b")]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/str_str.txt b/test/yarp/snapshots/seattlerb/str_str.txt
deleted file mode 100644
index 964ac52f5ff7a6..00000000000000
--- a/test/yarp/snapshots/seattlerb/str_str.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-ProgramNode(0...10)(
-  [],
-  StatementsNode(0...10)(
-    [InterpolatedStringNode(0...10)(
-       (0...1),
-       [StringNode(1...3)(nil, (1...3), nil, "a "),
-        EmbeddedStatementsNode(3...9)(
-          (3...5),
-          StatementsNode(5...8)(
-            [StringNode(5...8)((5...6), (6...7), (7...8), "b")]
-          ),
-          (8...9)
-        )],
-       (9...10)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/str_str_str.txt b/test/yarp/snapshots/seattlerb/str_str_str.txt
deleted file mode 100644
index f7ca61b9503491..00000000000000
--- a/test/yarp/snapshots/seattlerb/str_str_str.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-ProgramNode(0...12)(
-  [],
-  StatementsNode(0...12)(
-    [InterpolatedStringNode(0...12)(
-       (0...1),
-       [StringNode(1...3)(nil, (1...3), nil, "a "),
-        EmbeddedStatementsNode(3...9)(
-          (3...5),
-          StatementsNode(5...8)(
-            [StringNode(5...8)((5...6), (6...7), (7...8), "b")]
-          ),
-          (8...9)
-        ),
-        StringNode(9...11)(nil, (9...11), nil, " c")],
-       (11...12)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/super_arg.txt b/test/yarp/snapshots/seattlerb/super_arg.txt
deleted file mode 100644
index 3885dbac1450fc..00000000000000
--- a/test/yarp/snapshots/seattlerb/super_arg.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-ProgramNode(0...8)(
-  [],
-  StatementsNode(0...8)(
-    [SuperNode(0...8)(
-       (0...5),
-       nil,
-       ArgumentsNode(6...8)([IntegerNode(6...8)()]),
-       nil,
-       nil
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/symbol_empty.txt b/test/yarp/snapshots/seattlerb/symbol_empty.txt
deleted file mode 100644
index f299d176420194..00000000000000
--- a/test/yarp/snapshots/seattlerb/symbol_empty.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-ProgramNode(0...3)(
-  [],
-  StatementsNode(0...3)([SymbolNode(0...3)((0...2), (2...2), (2...3), "")])
-)
diff --git a/test/yarp/snapshots/seattlerb/symbol_list.txt b/test/yarp/snapshots/seattlerb/symbol_list.txt
deleted file mode 100644
index 386ac609dffd7f..00000000000000
--- a/test/yarp/snapshots/seattlerb/symbol_list.txt
+++ /dev/null
@@ -1,41 +0,0 @@
-ProgramNode(0...13)(
-  [],
-  StatementsNode(0...13)(
-    [ArrayNode(0...13)(
-       [InterpolatedSymbolNode(3...7)(
-          nil,
-          [EmbeddedStatementsNode(3...7)(
-             (3...5),
-             StatementsNode(5...6)(
-               [CallNode(5...6)(nil, nil, (5...6), nil, nil, nil, nil, 2, "a")]
-             ),
-             (6...7)
-           )],
-          nil
-        ),
-        InterpolatedSymbolNode(8...12)(
-          nil,
-          [EmbeddedStatementsNode(8...12)(
-             (8...10),
-             StatementsNode(10...11)(
-               [CallNode(10...11)(
-                  nil,
-                  nil,
-                  (10...11),
-                  nil,
-                  nil,
-                  nil,
-                  nil,
-                  2,
-                  "b"
-                )]
-             ),
-             (11...12)
-           )],
-          nil
-        )],
-       (0...3),
-       (12...13)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/symbols.txt b/test/yarp/snapshots/seattlerb/symbols.txt
deleted file mode 100644
index 7cf54611c2b5aa..00000000000000
--- a/test/yarp/snapshots/seattlerb/symbols.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-ProgramNode(0...9)(
-  [],
-  StatementsNode(0...9)(
-    [ArrayNode(0...9)(
-       [SymbolNode(3...4)(nil, (3...4), nil, "a"),
-        SymbolNode(5...6)(nil, (5...6), nil, "b"),
-        SymbolNode(7...8)(nil, (7...8), nil, "c")],
-       (0...3),
-       (8...9)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/symbols_empty.txt b/test/yarp/snapshots/seattlerb/symbols_empty.txt
deleted file mode 100644
index cad298895b68c9..00000000000000
--- a/test/yarp/snapshots/seattlerb/symbols_empty.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-ProgramNode(0...4)(
-  [],
-  StatementsNode(0...4)([ArrayNode(0...4)([], (0...3), (3...4))])
-)
diff --git a/test/yarp/snapshots/seattlerb/symbols_empty_space.txt b/test/yarp/snapshots/seattlerb/symbols_empty_space.txt
deleted file mode 100644
index 6713c4ba71612f..00000000000000
--- a/test/yarp/snapshots/seattlerb/symbols_empty_space.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-ProgramNode(0...5)(
-  [],
-  StatementsNode(0...5)([ArrayNode(0...5)([], (0...3), (4...5))])
-)
diff --git a/test/yarp/snapshots/seattlerb/symbols_interp.txt b/test/yarp/snapshots/seattlerb/symbols_interp.txt
deleted file mode 100644
index 2aa29143120faa..00000000000000
--- a/test/yarp/snapshots/seattlerb/symbols_interp.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-ProgramNode(0...15)(
-  [],
-  StatementsNode(0...15)(
-    [ArrayNode(0...15)(
-       [SymbolNode(3...4)(nil, (3...4), nil, "a"),
-        SymbolNode(5...12)(nil, (5...12), nil, "b\#{1+1}"),
-        SymbolNode(13...14)(nil, (13...14), nil, "c")],
-       (0...3),
-       (14...15)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/thingy.txt b/test/yarp/snapshots/seattlerb/thingy.txt
deleted file mode 100644
index 929dd9fd96899e..00000000000000
--- a/test/yarp/snapshots/seattlerb/thingy.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-ProgramNode(0...15)(
-  [],
-  StatementsNode(0...15)(
-    [CallNode(0...6)(
-       CallNode(0...1)(nil, nil, (0...1), nil, nil, nil, nil, 2, "f"),
-       (1...2),
-       nil,
-       (2...3),
-       ArgumentsNode(3...5)([IntegerNode(3...5)()]),
-       (5...6),
-       nil,
-       0,
-       "call"
-     ),
-     CallNode(8...15)(
-       CallNode(8...9)(nil, nil, (8...9), nil, nil, nil, nil, 2, "f"),
-       (9...11),
-       nil,
-       (11...12),
-       ArgumentsNode(12...14)([IntegerNode(12...14)()]),
-       (14...15),
-       nil,
-       0,
-       "call"
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/uminus_float.txt b/test/yarp/snapshots/seattlerb/uminus_float.txt
deleted file mode 100644
index fe6bbc4150ff47..00000000000000
--- a/test/yarp/snapshots/seattlerb/uminus_float.txt
+++ /dev/null
@@ -1 +0,0 @@
-ProgramNode(0...4)([], StatementsNode(0...4)([FloatNode(0...4)()]))
diff --git a/test/yarp/snapshots/seattlerb/unary_minus.txt b/test/yarp/snapshots/seattlerb/unary_minus.txt
deleted file mode 100644
index 8f5ed5003ca9d1..00000000000000
--- a/test/yarp/snapshots/seattlerb/unary_minus.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-ProgramNode(0...2)(
-  [],
-  StatementsNode(0...2)(
-    [CallNode(0...2)(
-       CallNode(1...2)(nil, nil, (1...2), nil, nil, nil, nil, 2, "a"),
-       nil,
-       (0...1),
-       nil,
-       nil,
-       nil,
-       nil,
-       0,
-       "-@"
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/unary_plus.txt b/test/yarp/snapshots/seattlerb/unary_plus.txt
deleted file mode 100644
index 6d74a2b362c4ae..00000000000000
--- a/test/yarp/snapshots/seattlerb/unary_plus.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-ProgramNode(0...2)(
-  [],
-  StatementsNode(0...2)(
-    [CallNode(0...2)(
-       CallNode(1...2)(nil, nil, (1...2), nil, nil, nil, nil, 2, "a"),
-       nil,
-       (0...1),
-       nil,
-       nil,
-       nil,
-       nil,
-       0,
-       "+@"
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/unary_plus_on_literal.txt b/test/yarp/snapshots/seattlerb/unary_plus_on_literal.txt
deleted file mode 100644
index 08370e47e931f7..00000000000000
--- a/test/yarp/snapshots/seattlerb/unary_plus_on_literal.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-ProgramNode(0...3)(
-  [],
-  StatementsNode(0...3)(
-    [CallNode(0...3)(
-       SymbolNode(1...3)((1...2), (2...3), nil, "a"),
-       nil,
-       (0...1),
-       nil,
-       nil,
-       nil,
-       nil,
-       0,
-       "+@"
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/unary_tilde.txt b/test/yarp/snapshots/seattlerb/unary_tilde.txt
deleted file mode 100644
index 8ec6e9145f434c..00000000000000
--- a/test/yarp/snapshots/seattlerb/unary_tilde.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-ProgramNode(0...2)(
-  [],
-  StatementsNode(0...2)(
-    [CallNode(0...2)(
-       CallNode(1...2)(nil, nil, (1...2), nil, nil, nil, nil, 2, "a"),
-       nil,
-       (0...1),
-       nil,
-       nil,
-       nil,
-       nil,
-       0,
-       "~"
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/utf8_bom.txt b/test/yarp/snapshots/seattlerb/utf8_bom.txt
deleted file mode 100644
index 81f12276885164..00000000000000
--- a/test/yarp/snapshots/seattlerb/utf8_bom.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-ProgramNode(26...29)(
-  [],
-  StatementsNode(26...29)(
-    [CallNode(26...29)(
-       nil,
-       nil,
-       (26...27),
-       nil,
-       ArgumentsNode(28...29)([IntegerNode(28...29)()]),
-       nil,
-       nil,
-       0,
-       "p"
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/when_splat.txt b/test/yarp/snapshots/seattlerb/when_splat.txt
deleted file mode 100644
index 75e44cd75df0bf..00000000000000
--- a/test/yarp/snapshots/seattlerb/when_splat.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-ProgramNode(0...25)(
-  [],
-  StatementsNode(0...25)(
-    [CaseNode(0...25)(
-       CallNode(5...6)(nil, nil, (5...6), nil, nil, nil, nil, 2, "a"),
-       [WhenNode(8...15)(
-          (8...12),
-          [SplatNode(13...15)(
-             (13...14),
-             CallNode(14...15)(nil, nil, (14...15), nil, nil, nil, nil, 2, "b")
-           )],
-          nil
-        )],
-       nil,
-       (0...4),
-       (22...25)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/words_interp.txt b/test/yarp/snapshots/seattlerb/words_interp.txt
deleted file mode 100644
index 982de5f8069958..00000000000000
--- a/test/yarp/snapshots/seattlerb/words_interp.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-ProgramNode(0...9)(
-  [],
-  StatementsNode(0...9)(
-    [ArrayNode(0...9)(
-       [InterpolatedStringNode(3...8)(
-          nil,
-          [EmbeddedStatementsNode(3...7)(
-             (3...5),
-             StatementsNode(5...6)([IntegerNode(5...6)()]),
-             (6...7)
-           ),
-           StringNode(7...8)(nil, (7...8), nil, "b")],
-          nil
-        )],
-       (0...3),
-       (8...9)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/yield_arg.txt b/test/yarp/snapshots/seattlerb/yield_arg.txt
deleted file mode 100644
index 8fa353561709d4..00000000000000
--- a/test/yarp/snapshots/seattlerb/yield_arg.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-ProgramNode(0...8)(
-  [],
-  StatementsNode(0...8)(
-    [YieldNode(0...8)(
-       (0...5),
-       nil,
-       ArgumentsNode(6...8)([IntegerNode(6...8)()]),
-       nil
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/yield_call_assocs.txt b/test/yarp/snapshots/seattlerb/yield_call_assocs.txt
deleted file mode 100644
index 820afa6c08d37f..00000000000000
--- a/test/yarp/snapshots/seattlerb/yield_call_assocs.txt
+++ /dev/null
@@ -1,154 +0,0 @@
-ProgramNode(0...100)(
-  [],
-  StatementsNode(0...100)(
-    [YieldNode(0...16)(
-       (0...5),
-       nil,
-       ArgumentsNode(6...16)(
-         [IntegerNode(6...7)(),
-          KeywordHashNode(9...16)(
-            [AssocNode(9...16)(
-               SymbolNode(9...11)((9...10), (10...11), nil, "z"),
-               IntegerNode(15...16)(),
-               (12...14)
-             )]
-          )]
-       ),
-       nil
-     ),
-     YieldNode(18...43)(
-       (18...23),
-       nil,
-       ArgumentsNode(24...43)(
-         [IntegerNode(24...25)(),
-          KeywordHashNode(27...43)(
-            [AssocNode(27...34)(
-               SymbolNode(27...29)((27...28), (28...29), nil, "z"),
-               IntegerNode(33...34)(),
-               (30...32)
-             ),
-             AssocNode(36...43)(
-               SymbolNode(36...38)((36...37), (37...38), nil, "w"),
-               IntegerNode(42...43)(),
-               (39...41)
-             )]
-          )]
-       ),
-       nil
-     ),
-     YieldNode(45...58)(
-       (45...50),
-       nil,
-       ArgumentsNode(51...58)(
-         [CallNode(51...58)(
-            nil,
-            nil,
-            (51...52),
-            nil,
-            ArgumentsNode(53...58)(
-              [KeywordHashNode(53...58)(
-                 [AssocNode(53...58)(
-                    SymbolNode(53...55)((53...54), (54...55), nil, "z"),
-                    IntegerNode(57...58)(),
-                    (55...57)
-                  )]
-               )]
-            ),
-            nil,
-            nil,
-            0,
-            "y"
-          )]
-       ),
-       nil
-     ),
-     YieldNode(60...71)(
-       (60...65),
-       nil,
-       ArgumentsNode(66...71)(
-         [CallNode(66...71)(
-            nil,
-            nil,
-            (66...67),
-            nil,
-            ArgumentsNode(68...71)(
-              [KeywordHashNode(68...71)(
-                 [AssocNode(68...71)(
-                    SymbolNode(68...70)(nil, (68...69), (69...70), "z"),
-                    IntegerNode(70...71)(),
-                    nil
-                  )]
-               )]
-            ),
-            nil,
-            nil,
-            0,
-            "y"
-          )]
-       ),
-       nil
-     ),
-     YieldNode(73...85)(
-       (73...78),
-       nil,
-       ArgumentsNode(79...85)(
-         [CallNode(79...85)(
-            nil,
-            nil,
-            (79...80),
-            (80...81),
-            ArgumentsNode(81...84)(
-              [KeywordHashNode(81...84)(
-                 [AssocNode(81...84)(
-                    SymbolNode(81...83)(nil, (81...82), (82...83), "z"),
-                    IntegerNode(83...84)(),
-                    nil
-                  )]
-               )]
-            ),
-            (84...85),
-            nil,
-            0,
-            "y"
-          )]
-       ),
-       nil
-     ),
-     YieldNode(87...100)(
-       (87...92),
-       nil,
-       ArgumentsNode(93...100)(
-         [CallNode(93...100)(
-            nil,
-            nil,
-            (93...94),
-            (94...95),
-            ArgumentsNode(95...99)(
-              [KeywordHashNode(95...99)(
-                 [AssocNode(95...99)(
-                    CallNode(95...96)(
-                      nil,
-                      nil,
-                      (95...96),
-                      nil,
-                      nil,
-                      nil,
-                      nil,
-                      2,
-                      "z"
-                    ),
-                    IntegerNode(98...99)(),
-                    (96...98)
-                  )]
-               )]
-            ),
-            (99...100),
-            nil,
-            0,
-            "y"
-          )]
-       ),
-       nil
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/seattlerb/yield_empty_parens.txt b/test/yarp/snapshots/seattlerb/yield_empty_parens.txt
deleted file mode 100644
index 14871f50e77680..00000000000000
--- a/test/yarp/snapshots/seattlerb/yield_empty_parens.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-ProgramNode(0...7)(
-  [],
-  StatementsNode(0...7)([YieldNode(0...7)((0...5), (5...6), nil, (6...7))])
-)
diff --git a/test/yarp/snapshots/single_quote_heredocs.txt b/test/yarp/snapshots/single_quote_heredocs.txt
deleted file mode 100644
index 13e0f12fac5dc0..00000000000000
--- a/test/yarp/snapshots/single_quote_heredocs.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-ProgramNode(0...8)(
-  [],
-  StatementsNode(0...8)(
-    [InterpolatedStringNode(0...8)(
-       (0...8),
-       [StringNode(9...44)(
-          nil,
-          (9...44),
-          nil,
-          "    cd L:\\Work\\MG3710IQPro\\Develop\n"
-        )],
-       (44...48)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/spanning_heredoc.txt b/test/yarp/snapshots/spanning_heredoc.txt
deleted file mode 100644
index 301c70adf2a67c..00000000000000
--- a/test/yarp/snapshots/spanning_heredoc.txt
+++ /dev/null
@@ -1,215 +0,0 @@
-ProgramNode(164...964)(
-  [],
-  StatementsNode(164...964)(
-    [CallNode(164...192)(
-       nil,
-       nil,
-       (164...166),
-       nil,
-       ArgumentsNode(167...192)(
-         [CallNode(167...192)(
-            InterpolatedStringNode(167...171)(
-              (167...171),
-              [StringNode(181...183)(nil, (181...183), nil, "a\n")],
-              (183...185)
-            ),
-            (171...172),
-            (172...176),
-            (176...177),
-            ArgumentsNode(177...191)(
-              [InterpolatedRegularExpressionNode(177...187)(
-                 (177...178),
-                 [StringNode(178...181)(nil, (178...181), nil, "b"),
-                  StringNode(185...186)(nil, (185...186), nil, "b")],
-                 (186...187),
-                 0
-               ),
-               StringNode(189...191)(
-                 (189...190),
-                 (190...190),
-                 (190...191),
-                 ""
-               )]
-            ),
-            (191...192),
-            nil,
-            0,
-            "gsub"
-          )]
-       ),
-       nil,
-       nil,
-       0,
-       "pp"
-     ),
-     CallNode(276...295)(
-       nil,
-       nil,
-       (276...278),
-       nil,
-       ArgumentsNode(279...295)(
-         [InterpolatedStringNode(279...283)(
-            (279...283),
-            [StringNode(289...291)(nil, (289...291), nil, "c\n")],
-            (291...293)
-          ),
-          InterpolatedStringNode(285...295)(
-            (285...286),
-            [StringNode(286...289)(nil, (286...289), nil, "d"),
-             StringNode(293...294)(nil, (293...294), nil, "d")],
-            (294...295)
-          )]
-       ),
-       nil,
-       nil,
-       0,
-       "pp"
-     ),
-     CallNode(322...343)(
-       nil,
-       nil,
-       (322...324),
-       nil,
-       ArgumentsNode(325...343)(
-         [InterpolatedStringNode(325...329)(
-            (325...329),
-            [StringNode(337...339)(nil, (337...339), nil, "e\n")],
-            (339...341)
-          ),
-          InterpolatedStringNode(331...343)(
-            (331...334),
-            [StringNode(334...337)(nil, (334...337), nil, "f\\\n"),
-             StringNode(341...342)(nil, (341...342), nil, "f")],
-            (342...343)
-          )]
-       ),
-       nil,
-       nil,
-       0,
-       "pp"
-     ),
-     CallNode(427...448)(
-       nil,
-       nil,
-       (427...429),
-       nil,
-       ArgumentsNode(430...448)(
-         [InterpolatedStringNode(430...434)(
-            (430...434),
-            [StringNode(442...444)(nil, (442...444), nil, "g\n")],
-            (444...446)
-          ),
-          InterpolatedStringNode(436...448)(
-            (436...439),
-            [StringNode(439...442)(nil, (439...442), nil, "h"),
-             StringNode(446...447)(nil, (446...447), nil, "h")],
-            (447...448)
-          )]
-       ),
-       nil,
-       nil,
-       0,
-       "pp"
-     ),
-     CallNode(520...541)(
-       nil,
-       nil,
-       (520...522),
-       nil,
-       ArgumentsNode(523...541)(
-         [InterpolatedStringNode(523...527)(
-            (523...527),
-            [StringNode(535...537)(nil, (535...537), nil, "i\n")],
-            (537...539)
-          ),
-          ArrayNode(529...541)(
-            [StringNode(532...535)(nil, (532...535), nil, "j\\\n"),
-             StringNode(539...540)(nil, (539...540), nil, "j")],
-            (529...532),
-            (540...541)
-          )]
-       ),
-       nil,
-       nil,
-       0,
-       "pp"
-     ),
-     CallNode(688...709)(
-       nil,
-       nil,
-       (688...690),
-       nil,
-       ArgumentsNode(691...709)(
-         [InterpolatedStringNode(691...695)(
-            (691...695),
-            [StringNode(703...705)(nil, (703...705), nil, "k\n")],
-            (705...707)
-          ),
-          ArrayNode(697...709)(
-            [InterpolatedStringNode(700...708)(
-               nil,
-               [StringNode(700...703)(nil, (700...703), nil, "l"),
-                StringNode(707...708)(nil, (707...708), nil, "l")],
-               nil
-             )],
-            (697...700),
-            (708...709)
-          )]
-       ),
-       nil,
-       nil,
-       0,
-       "pp"
-     ),
-     CallNode(781...802)(
-       nil,
-       nil,
-       (781...783),
-       nil,
-       ArgumentsNode(784...802)(
-         [InterpolatedStringNode(784...788)(
-            (784...788),
-            [StringNode(796...798)(nil, (796...798), nil, "m\n")],
-            (798...800)
-          ),
-          ArrayNode(790...802)(
-            [SymbolNode(793...796)(nil, (793...796), nil, "n\\\n"),
-             SymbolNode(800...801)(nil, (800...801), nil, "n")],
-            (790...793),
-            (801...802)
-          )]
-       ),
-       nil,
-       nil,
-       0,
-       "pp"
-     ),
-     CallNode(943...964)(
-       nil,
-       nil,
-       (943...945),
-       nil,
-       ArgumentsNode(946...964)(
-         [InterpolatedStringNode(946...950)(
-            (946...950),
-            [StringNode(958...960)(nil, (958...960), nil, "o\n")],
-            (960...962)
-          ),
-          ArrayNode(952...964)(
-            [InterpolatedSymbolNode(955...963)(
-               nil,
-               [SymbolNode(955...958)(nil, (955...958), nil, "p"),
-                StringNode(962...963)(nil, (962...963), nil, "p")],
-               nil
-             )],
-            (952...955),
-            (963...964)
-          )]
-       ),
-       nil,
-       nil,
-       0,
-       "pp"
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/strings.txt b/test/yarp/snapshots/strings.txt
deleted file mode 100644
index ca98151c140183..00000000000000
--- a/test/yarp/snapshots/strings.txt
+++ /dev/null
@@ -1,201 +0,0 @@
-ProgramNode(0...498)(
-  [],
-  StatementsNode(0...498)(
-    [StringNode(0...6)((0...2), (2...5), (5...6), "abc"),
-     StringNode(8...14)((8...10), (10...13), (13...14), "abc"),
-     StringNode(16...22)((16...18), (18...21), (21...22), "abc"),
-     StringNode(24...30)((24...26), (26...29), (29...30), "abc"),
-     StringNode(32...38)((32...34), (34...37), (37...38), "abc"),
-     StringNode(40...46)((40...42), (42...45), (45...46), "abc"),
-     StringNode(48...54)((48...50), (50...53), (53...54), "abc"),
-     StringNode(56...62)((56...58), (58...61), (61...62), "abc"),
-     StringNode(64...70)((64...66), (66...69), (69...70), "abc"),
-     StringNode(72...78)((72...74), (74...77), (77...78), "abc"),
-     StringNode(80...86)((80...82), (82...85), (85...86), "abc"),
-     StringNode(88...94)((88...90), (90...93), (93...94), "abc"),
-     ArrayNode(96...104)([], (96...99), (103...104)),
-     StringNode(106...112)((106...108), (108...111), (111...112), "abc"),
-     StringNode(114...120)((114...116), (116...119), (119...120), "abc"),
-     InterpolatedStringNode(122...130)(
-       (122...123),
-       [EmbeddedVariableNode(123...129)(
-          (123...124),
-          ClassVariableReadNode(124...129)(:@@foo)
-        )],
-       (129...130)
-     ),
-     StringNode(132...138)((132...134), (134...137), (137...138), "abc"),
-     InterpolatedStringNode(140...157)(
-       (140...142),
-       [StringNode(142...146)(nil, (142...146), nil, "aaa "),
-        EmbeddedStatementsNode(146...152)(
-          (146...148),
-          StatementsNode(148...151)(
-            [CallNode(148...151)(
-               nil,
-               nil,
-               (148...151),
-               nil,
-               nil,
-               nil,
-               nil,
-               2,
-               "bbb"
-             )]
-          ),
-          (151...152)
-        ),
-        StringNode(152...156)(nil, (152...156), nil, " ccc")],
-       (156...157)
-     ),
-     StringNode(159...167)((159...161), (161...166), (166...167), "foo[]"),
-     CallNode(169...184)(
-       StringNode(169...174)((169...170), (170...173), (173...174), "foo"),
-       nil,
-       (175...176),
-       nil,
-       ArgumentsNode(179...184)(
-         [StringNode(179...184)((179...180), (180...183), (183...184), "bar")]
-       ),
-       nil,
-       nil,
-       0,
-       "+"
-     ),
-     StringNode(186...193)((186...189), (189...192), (192...193), "abc"),
-     SymbolNode(195...202)((195...198), (198...201), (201...202), "abc"),
-     StringNode(204...210)((204...206), (206...209), (209...210), "abc"),
-     StringNode(212...214)((212...213), (213...213), (213...214), ""),
-     StringNode(216...221)((216...217), (217...220), (220...221), "abc"),
-     StringNode(223...230)((223...224), (224...229), (229...230), "\#@---"),
-     InterpolatedStringNode(232...248)(
-       (232...233),
-       [StringNode(233...237)(nil, (233...237), nil, "aaa "),
-        EmbeddedStatementsNode(237...243)(
-          (237...239),
-          StatementsNode(239...242)(
-            [CallNode(239...242)(
-               nil,
-               nil,
-               (239...242),
-               nil,
-               nil,
-               nil,
-               nil,
-               2,
-               "bbb"
-             )]
-          ),
-          (242...243)
-        ),
-        StringNode(243...247)(nil, (243...247), nil, " ccc")],
-       (247...248)
-     ),
-     StringNode(250...255)((250...251), (251...254), (254...255), "abc"),
-     ArrayNode(257...266)(
-       [StringNode(260...261)(nil, (260...261), nil, "a"),
-        StringNode(262...263)(nil, (262...263), nil, "b"),
-        StringNode(264...265)(nil, (264...265), nil, "c")],
-       (257...260),
-       (265...266)
-     ),
-     ArrayNode(268...285)(
-       [StringNode(271...274)(nil, (271...274), nil, "a[]"),
-        StringNode(275...280)(nil, (275...280), nil, "b[[]]"),
-        StringNode(281...284)(nil, (281...284), nil, "c[]")],
-       (268...271),
-       (284...285)
-     ),
-     ArrayNode(287...305)(
-       [StringNode(290...298)(nil, (290...298), nil, "foo\\ bar"),
-        StringNode(299...304)(nil, (299...304), nil, "\\\#{1}")],
-       (287...290),
-       (304...305)
-     ),
-     ArrayNode(307...323)(
-       [StringNode(310...318)(nil, (310...318), nil, "foo\\ bar"),
-        StringNode(319...322)(nil, (319...322), nil, "baz")],
-       (307...310),
-       (322...323)
-     ),
-     ArrayNode(325...339)(
-       [StringNode(328...329)(nil, (328...329), nil, "a"),
-        InterpolatedStringNode(330...336)(
-          nil,
-          [StringNode(330...331)(nil, (330...331), nil, "b"),
-           EmbeddedStatementsNode(331...335)(
-             (331...333),
-             StatementsNode(333...334)(
-               [CallNode(333...334)(
-                  nil,
-                  nil,
-                  (333...334),
-                  nil,
-                  nil,
-                  nil,
-                  nil,
-                  2,
-                  "c"
-                )]
-             ),
-             (334...335)
-           ),
-           StringNode(335...336)(nil, (335...336), nil, "d")],
-          nil
-        ),
-        StringNode(337...338)(nil, (337...338), nil, "e")],
-       (325...328),
-       (338...339)
-     ),
-     ArrayNode(341...350)(
-       [StringNode(344...345)(nil, (344...345), nil, "a"),
-        StringNode(346...347)(nil, (346...347), nil, "b"),
-        StringNode(348...349)(nil, (348...349), nil, "c")],
-       (341...344),
-       (349...350)
-     ),
-     ArrayNode(352...369)(
-       [StringNode(358...359)(nil, (358...359), nil, "a"),
-        StringNode(362...363)(nil, (362...363), nil, "b"),
-        StringNode(366...367)(nil, (366...367), nil, "c")],
-       (352...355),
-       (368...369)
-     ),
-     StringNode(371...386)(
-       (371...372),
-       (372...385),
-       (385...386),
-       "' foo ' bar"
-     ),
-     StringNode(388...403)(
-       (388...389),
-       (389...402),
-       (402...403),
-       "\\ foo \\ bar"
-     ),
-     InterpolatedStringNode(405...412)(
-       (405...406),
-       [EmbeddedVariableNode(406...411)(
-          (406...407),
-          GlobalVariableReadNode(407...411)(:$foo)
-        )],
-       (411...412)
-     ),
-     InterpolatedStringNode(414...421)(
-       (414...415),
-       [EmbeddedVariableNode(415...420)(
-          (415...416),
-          InstanceVariableReadNode(416...420)(:@foo)
-        )],
-       (420...421)
-     ),
-     StringNode(423...438)((423...424), (424...437), (437...438), "\a # a"),
-     StringNode(440...453)((440...441), (441...452), (452...453), "\a # a"),
-     StringNode(455...461)((455...457), (457...460), (460...461), "abc"),
-     StringNode(463...469)((463...465), (465...468), (468...469), "abc"),
-     StringNode(471...477)((471...473), (473...476), (476...477), "abc"),
-     StringNode(479...485)((479...481), (481...484), (484...485), "abc"),
-     StringNode(487...489)((487...488), (488...489), nil, "a"),
-     StringNode(491...498)((491...494), (494...497), (497...498), "abc")]
-  )
-)
diff --git a/test/yarp/snapshots/super.txt b/test/yarp/snapshots/super.txt
deleted file mode 100644
index e9d32d14bdc6bc..00000000000000
--- a/test/yarp/snapshots/super.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-ProgramNode(0...40)(
-  [],
-  StatementsNode(0...40)(
-    [ForwardingSuperNode(0...5)(nil),
-     SuperNode(7...14)((7...12), (12...13), nil, (13...14), nil),
-     SuperNode(16...24)(
-       (16...21),
-       (21...22),
-       ArgumentsNode(22...23)([IntegerNode(22...23)()]),
-       (23...24),
-       nil
-     ),
-     SuperNode(26...40)(
-       (26...31),
-       (31...32),
-       ArgumentsNode(32...39)(
-         [IntegerNode(32...33)(),
-          IntegerNode(35...36)(),
-          IntegerNode(38...39)()]
-       ),
-       (39...40),
-       nil
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/symbols.txt b/test/yarp/snapshots/symbols.txt
deleted file mode 100644
index f53a208bcec752..00000000000000
--- a/test/yarp/snapshots/symbols.txt
+++ /dev/null
@@ -1,147 +0,0 @@
-ProgramNode(0...345)(
-  [],
-  StatementsNode(0...345)(
-    [SymbolNode(0...6)((0...2), (2...5), (5...6), "abc"),
-     InterpolatedSymbolNode(8...17)(
-       (8...10),
-       [EmbeddedStatementsNode(10...16)(
-          (10...12),
-          StatementsNode(12...15)(
-            [CallNode(12...15)(
-               nil,
-               nil,
-               (12...15),
-               nil,
-               nil,
-               nil,
-               nil,
-               2,
-               "var"
-             )]
-          ),
-          (15...16)
-        )],
-       (16...17)
-     ),
-     InterpolatedSymbolNode(19...29)(
-       (19...21),
-       [StringNode(21...24)(nil, (21...24), nil, "abc"),
-        EmbeddedStatementsNode(24...28)(
-          (24...26),
-          StatementsNode(26...27)([IntegerNode(26...27)()]),
-          (27...28)
-        )],
-       (28...29)
-     ),
-     ArrayNode(31...51)(
-       [SymbolNode(32...35)((32...33), (33...35), nil, "Υ"),
-        SymbolNode(37...40)((37...38), (38...40), nil, "ά"),
-        SymbolNode(42...45)((42...43), (43...45), nil, "ŗ"),
-        SymbolNode(47...50)((47...48), (48...50), nil, "ρ")],
-       (31...32),
-       (50...51)
-     ),
-     SymbolNode(53...56)((53...54), (54...56), nil, "-@"),
-     SymbolNode(58...60)((58...59), (59...60), nil, "-"),
-     SymbolNode(62...64)((62...63), (63...64), nil, "%"),
-     SymbolNode(66...68)((66...67), (67...68), nil, "|"),
-     SymbolNode(70...73)((70...71), (71...73), nil, "+@"),
-     SymbolNode(75...77)((75...76), (76...77), nil, "+"),
-     SymbolNode(79...81)((79...80), (80...81), nil, "/"),
-     SymbolNode(83...86)((83...84), (84...86), nil, "**"),
-     SymbolNode(88...90)((88...89), (89...90), nil, "*"),
-     SymbolNode(92...95)((92...93), (93...95), nil, "~@"),
-     ArrayNode(97...113)(
-       [IntegerNode(98...99)(),
-        FloatNode(101...104)(),
-        RationalNode(106...108)(IntegerNode(106...107)()),
-        ImaginaryNode(110...112)(IntegerNode(110...111)())],
-       (97...98),
-       (112...113)
-     ),
-     SymbolNode(115...117)((115...116), (116...117), nil, "~"),
-     SymbolNode(119...121)((119...120), (120...121), nil, "a"),
-     ArrayNode(123...132)(
-       [SymbolNode(126...127)(nil, (126...127), nil, "a"),
-        SymbolNode(128...129)(nil, (128...129), nil, "b"),
-        SymbolNode(130...131)(nil, (130...131), nil, "c")],
-       (123...126),
-       (131...132)
-     ),
-     ArrayNode(134...158)(
-       [SymbolNode(137...138)(nil, (137...138), nil, "a"),
-        SymbolNode(139...144)(nil, (139...144), nil, "b\#{1}"),
-        SymbolNode(145...150)(nil, (145...150), nil, "\#{2}c"),
-        SymbolNode(151...157)(nil, (151...157), nil, "d\#{3}f")],
-       (134...137),
-       (157...158)
-     ),
-     ArrayNode(160...184)(
-       [SymbolNode(163...164)(nil, (163...164), nil, "a"),
-        InterpolatedSymbolNode(165...170)(
-          nil,
-          [StringNode(165...166)(nil, (165...166), nil, "b"),
-           EmbeddedStatementsNode(166...170)(
-             (166...168),
-             StatementsNode(168...169)([IntegerNode(168...169)()]),
-             (169...170)
-           )],
-          nil
-        ),
-        InterpolatedSymbolNode(171...176)(
-          nil,
-          [EmbeddedStatementsNode(171...175)(
-             (171...173),
-             StatementsNode(173...174)([IntegerNode(173...174)()]),
-             (174...175)
-           ),
-           StringNode(175...176)(nil, (175...176), nil, "c")],
-          nil
-        ),
-        InterpolatedSymbolNode(177...183)(
-          nil,
-          [StringNode(177...178)(nil, (177...178), nil, "d"),
-           EmbeddedStatementsNode(178...182)(
-             (178...180),
-             StatementsNode(180...181)([IntegerNode(180...181)()]),
-             (181...182)
-           ),
-           StringNode(182...183)(nil, (182...183), nil, "f")],
-          nil
-        )],
-       (160...163),
-       (183...184)
-     ),
-     SymbolNode(186...190)((186...187), (187...190), nil, "@@a"),
-     SymbolNode(192...197)((192...193), (193...197), nil, "👍"),
-     ArrayNode(199...206)(
-       [SymbolNode(202...205)(nil, (202...205), nil, "a\\b")],
-       (199...202),
-       (205...206)
-     ),
-     SymbolNode(208...211)((208...209), (209...211), nil, "$a"),
-     SymbolNode(213...216)((213...214), (214...216), nil, "@a"),
-     SymbolNode(218...221)((218...219), (219...221), nil, "do"),
-     SymbolNode(223...225)((223...224), (224...225), nil, "&"),
-     SymbolNode(227...229)((227...228), (228...229), nil, "`"),
-     SymbolNode(231...234)((231...232), (232...234), nil, "!@"),
-     SymbolNode(236...239)((236...237), (237...239), nil, "!~"),
-     SymbolNode(241...243)((241...242), (242...243), nil, "!"),
-     SymbolNode(245...248)((245...246), (246...248), nil, "[]"),
-     SymbolNode(250...254)((250...251), (251...254), nil, "[]="),
-     SymbolNode(256...258)((256...257), (257...258), nil, "^"),
-     SymbolNode(260...263)((260...261), (261...263), nil, "=="),
-     SymbolNode(265...269)((265...266), (266...269), nil, "==="),
-     SymbolNode(271...274)((271...272), (272...274), nil, "=~"),
-     SymbolNode(276...279)((276...277), (277...279), nil, ">="),
-     SymbolNode(281...284)((281...282), (282...284), nil, ">>"),
-     SymbolNode(286...288)((286...287), (287...288), nil, ">"),
-     SymbolNode(290...294)((290...291), (291...294), nil, "<=>"),
-     SymbolNode(296...299)((296...297), (297...299), nil, "<="),
-     SymbolNode(301...304)((301...302), (302...304), nil, "<<"),
-     SymbolNode(306...308)((306...307), (307...308), nil, "<"),
-     SymbolNode(310...319)((310...311), (311...319), nil, "__LINE__"),
-     SymbolNode(321...330)((321...322), (322...330), nil, "__FILE__"),
-     SymbolNode(332...345)((332...333), (333...345), nil, "__ENCODING__")]
-  )
-)
diff --git a/test/yarp/snapshots/ternary_operator.txt b/test/yarp/snapshots/ternary_operator.txt
deleted file mode 100644
index 9751d53a317c21..00000000000000
--- a/test/yarp/snapshots/ternary_operator.txt
+++ /dev/null
@@ -1,163 +0,0 @@
-ProgramNode(0...131)(
-  [:_a],
-  StatementsNode(0...131)(
-    [IfNode(0...9)(
-       nil,
-       CallNode(0...1)(nil, nil, (0...1), nil, nil, nil, nil, 2, "a"),
-       StatementsNode(4...5)(
-         [CallNode(4...5)(nil, nil, (4...5), nil, nil, nil, nil, 2, "b")]
-       ),
-       ElseNode(6...9)(
-         (6...7),
-         StatementsNode(8...9)(
-           [CallNode(8...9)(nil, nil, (8...9), nil, nil, nil, nil, 2, "c")]
-         ),
-         nil
-       ),
-       nil
-     ),
-     IfNode(11...38)(
-       nil,
-       CallNode(11...12)(nil, nil, (11...12), nil, nil, nil, nil, 2, "a"),
-       StatementsNode(15...25)(
-         [DefinedNode(15...25)(
-            nil,
-            CallNode(24...25)(nil, nil, (24...25), nil, nil, nil, nil, 2, "b"),
-            nil,
-            (15...23)
-          )]
-       ),
-       ElseNode(26...38)(
-         (26...27),
-         StatementsNode(28...38)(
-           [DefinedNode(28...38)(
-              nil,
-              CallNode(37...38)(
-                nil,
-                nil,
-                (37...38),
-                nil,
-                nil,
-                nil,
-                nil,
-                2,
-                "c"
-              ),
-              nil,
-              (28...36)
-            )]
-         ),
-         nil
-       ),
-       nil
-     ),
-     IfNode(40...55)(
-       nil,
-       CallNode(40...46)(nil, nil, (40...46), nil, nil, nil, nil, 0, "empty?"),
-       StatementsNode(47...51)([TrueNode(47...51)()]),
-       ElseNode(51...55)(
-         (51...52),
-         StatementsNode(52...55)([NilNode(52...55)()]),
-         nil
-       ),
-       nil
-     ),
-     IfNode(57...73)(
-       nil,
-       CallNode(57...63)(nil, nil, (57...63), nil, nil, nil, nil, 0, "empty?"),
-       StatementsNode(64...69)([FalseNode(64...69)()]),
-       ElseNode(69...73)(
-         (69...70),
-         StatementsNode(70...73)([NilNode(70...73)()]),
-         nil
-       ),
-       nil
-     ),
-     IfNode(75...89)(
-       nil,
-       CallNode(75...81)(nil, nil, (75...81), nil, nil, nil, nil, 0, "empty?"),
-       StatementsNode(82...85)([NilNode(82...85)()]),
-       ElseNode(85...89)(
-         (85...86),
-         StatementsNode(86...89)([NilNode(86...89)()]),
-         nil
-       ),
-       nil
-     ),
-     IfNode(91...101)(
-       nil,
-       CallNode(91...93)(nil, nil, (91...93), nil, nil, nil, nil, 0, "a?"),
-       StatementsNode(94...97)([NilNode(94...97)()]),
-       ElseNode(97...101)(
-         (97...98),
-         StatementsNode(98...101)([NilNode(98...101)()]),
-         nil
-       ),
-       nil
-     ),
-     IfNode(103...117)(
-       nil,
-       CallNode(103...104)(nil, nil, (103...104), nil, nil, nil, nil, 2, "a"),
-       StatementsNode(106...110)(
-         [CallNode(106...110)(
-            nil,
-            nil,
-            (106...110),
-            nil,
-            nil,
-            nil,
-            nil,
-            2,
-            "var1"
-          )]
-       ),
-       ElseNode(111...117)(
-         (111...112),
-         StatementsNode(113...117)(
-           [CallNode(113...117)(
-              nil,
-              nil,
-              (113...117),
-              nil,
-              nil,
-              nil,
-              nil,
-              2,
-              "var2"
-            )]
-         ),
-         nil
-       ),
-       nil
-     ),
-     IfNode(119...131)(
-       nil,
-       CallNode(119...123)(
-         nil,
-         nil,
-         (119...123),
-         nil,
-         nil,
-         nil,
-         nil,
-         0,
-         "nil?"
-       ),
-       StatementsNode(124...129)(
-         [LocalVariableWriteNode(124...129)(
-            :_a,
-            0,
-            (124...126),
-            IntegerNode(128...129)(),
-            (127...128)
-          )]
-       ),
-       ElseNode(129...131)(
-         (129...130),
-         StatementsNode(130...131)([IntegerNode(130...131)()]),
-         nil
-       ),
-       nil
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/tilde_heredocs.txt b/test/yarp/snapshots/tilde_heredocs.txt
deleted file mode 100644
index 864ea645b3de30..00000000000000
--- a/test/yarp/snapshots/tilde_heredocs.txt
+++ /dev/null
@@ -1,134 +0,0 @@
-ProgramNode(0...372)(
-  [],
-  StatementsNode(0...372)(
-    [InterpolatedStringNode(0...6)(
-       (0...6),
-       [StringNode(7...11)(nil, (7...11), nil, "a\n")],
-       (11...15)
-     ),
-     InterpolatedStringNode(16...22)(
-       (16...22),
-       [StringNode(23...34)(nil, (23...34), nil, "\ta\n" + "b\n" + "\t\tc\n")],
-       (34...38)
-     ),
-     InterpolatedStringNode(39...45)(
-       (39...45),
-       [EmbeddedStatementsNode(48...52)(
-          (48...50),
-          StatementsNode(50...51)([IntegerNode(50...51)()]),
-          (51...52)
-        ),
-        StringNode(52...55)(nil, (52...55), nil, " a\n")],
-       (55...59)
-     ),
-     InterpolatedStringNode(60...66)(
-       (60...66),
-       [StringNode(67...71)(nil, (67...71), nil, "a "),
-        EmbeddedStatementsNode(71...75)(
-          (71...73),
-          StatementsNode(73...74)([IntegerNode(73...74)()]),
-          (74...75)
-        ),
-        StringNode(75...76)(nil, (75...76), nil, "\n")],
-       (76...80)
-     ),
-     InterpolatedStringNode(81...87)(
-       (81...87),
-       [StringNode(88...93)(nil, (88...93), nil, " a\n"),
-        EmbeddedStatementsNode(93...97)(
-          (93...95),
-          StatementsNode(95...96)([IntegerNode(95...96)()]),
-          (96...97)
-        ),
-        StringNode(97...98)(nil, (97...98), nil, "\n")],
-       (98...102)
-     ),
-     InterpolatedStringNode(103...109)(
-       (103...109),
-       [StringNode(110...116)(nil, (110...116), nil, "a\n"),
-        EmbeddedStatementsNode(116...120)(
-          (116...118),
-          StatementsNode(118...119)([IntegerNode(118...119)()]),
-          (119...120)
-        ),
-        StringNode(120...121)(nil, (120...121), nil, "\n")],
-       (121...125)
-     ),
-     InterpolatedStringNode(126...132)(
-       (126...132),
-       [StringNode(133...141)(nil, (133...141), nil, "a\n" + "b\n")],
-       (141...145)
-     ),
-     InterpolatedStringNode(146...152)(
-       (146...152),
-       [StringNode(153...162)(nil, (153...162), nil, "a\n" + " b\n")],
-       (162...166)
-     ),
-     InterpolatedStringNode(167...173)(
-       (167...173),
-       [StringNode(174...183)(nil, (174...183), nil, "\ta\n" + "b\n")],
-       (183...187)
-     ),
-     InterpolatedStringNode(188...196)(
-       (188...196),
-       [StringNode(197...206)(nil, (197...206), nil, "a \#{1}\n")],
-       (206...210)
-     ),
-     InterpolatedStringNode(211...217)(
-       (211...217),
-       [StringNode(218...225)(nil, (218...225), nil, "a\n" + " b\n")],
-       (225...229)
-     ),
-     InterpolatedStringNode(230...236)(
-       (230...236),
-       [StringNode(237...244)(nil, (237...244), nil, " a\n" + "b\n")],
-       (244...248)
-     ),
-     InterpolatedStringNode(249...255)(
-       (249...255),
-       [StringNode(256...271)(nil, (256...271), nil, "a\n" + "b\n")],
-       (271...275)
-     ),
-     InterpolatedStringNode(276...282)(
-       (276...282),
-       [StringNode(283...292)(nil, (283...292), nil, "a\n" + "\n" + "b\n")],
-       (292...296)
-     ),
-     InterpolatedStringNode(297...303)(
-       (297...303),
-       [StringNode(304...313)(nil, (304...313), nil, "a\n" + "\n" + "b\n")],
-       (313...317)
-     ),
-     InterpolatedStringNode(318...324)(
-       (318...324),
-       [StringNode(325...336)(
-          nil,
-          (325...336),
-          nil,
-          "a\n" + "\n" + "\n" + "\n" + "b\n"
-        )],
-       (336...340)
-     ),
-     InterpolatedStringNode(341...347)(
-       (341...347),
-       [StringNode(348...351)(nil, (348...351), nil, "\n"),
-        EmbeddedStatementsNode(351...355)(
-          (351...353),
-          StatementsNode(353...354)([IntegerNode(353...354)()]),
-          (354...355)
-        ),
-        StringNode(355...357)(nil, (355...357), nil, "a\n")],
-       (357...365)
-     ),
-     InterpolatedStringNode(366...372)(
-       (366...372),
-       [EmbeddedStatementsNode(375...379)(
-          (375...377),
-          StatementsNode(377...378)([IntegerNode(377...378)()]),
-          (378...379)
-        ),
-        StringNode(379...383)(nil, (379...383), nil, "\n" + "\tb\n")],
-       (383...387)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/undef.txt b/test/yarp/snapshots/undef.txt
deleted file mode 100644
index d3173a3f1c7be7..00000000000000
--- a/test/yarp/snapshots/undef.txt
+++ /dev/null
@@ -1,50 +0,0 @@
-ProgramNode(0...116)(
-  [],
-  StatementsNode(0...116)(
-    [UndefNode(0...7)([SymbolNode(6...7)(nil, (6...7), nil, "a")], (0...5)),
-     UndefNode(9...19)(
-       [SymbolNode(15...16)(nil, (15...16), nil, "a"),
-        SymbolNode(18...19)(nil, (18...19), nil, "b")],
-       (9...14)
-     ),
-     UndefNode(21...29)(
-       [SymbolNode(27...29)(nil, (27...29), nil, "if")],
-       (21...26)
-     ),
-     UndefNode(31...40)(
-       [SymbolNode(37...40)(nil, (37...40), nil, "<=>")],
-       (31...36)
-     ),
-     UndefNode(42...50)(
-       [SymbolNode(48...50)((48...49), (49...50), nil, "a")],
-       (42...47)
-     ),
-     UndefNode(52...68)(
-       [SymbolNode(58...60)((58...59), (59...60), nil, "a"),
-        SymbolNode(62...64)((62...63), (63...64), nil, "b"),
-        SymbolNode(66...68)((66...67), (67...68), nil, "c")],
-       (52...57)
-     ),
-     UndefNode(70...82)(
-       [SymbolNode(76...82)((76...78), (78...81), (81...82), "abc")],
-       (70...75)
-     ),
-     UndefNode(84...100)(
-       [InterpolatedSymbolNode(90...100)(
-          (90...92),
-          [StringNode(92...95)(nil, (92...95), nil, "abc"),
-           EmbeddedStatementsNode(95...99)(
-             (95...97),
-             StatementsNode(97...98)([IntegerNode(97...98)()]),
-             (98...99)
-           )],
-          (99...100)
-        )],
-       (84...89)
-     ),
-     UndefNode(102...116)(
-       [SymbolNode(108...116)(nil, (108...116), nil, "Constant")],
-       (102...107)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/unescaping.txt b/test/yarp/snapshots/unescaping.txt
deleted file mode 100644
index 17387dbc6cdf7c..00000000000000
--- a/test/yarp/snapshots/unescaping.txt
+++ /dev/null
@@ -1,23 +0,0 @@
-ProgramNode(0...39)(
-  [],
-  StatementsNode(0...39)(
-    [ArrayNode(0...10)(
-       [StringNode(1...9)((1...2), (2...8), (8...9), "\u0003{1}")],
-       (0...1),
-       (9...10)
-     ),
-     RegularExpressionNode(12...20)(
-       (12...13),
-       (13...19),
-       (19...20),
-       "\u0003{1}",
-       0
-     ),
-     StringNode(22...30)((22...23), (23...29), (29...30), "\u0003{1}"),
-     InterpolatedStringNode(32...39)(
-       (32...39),
-       [StringNode(40...50)(nil, (40...50), nil, "\u0003{1}\n")],
-       (50...55)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/unless.txt b/test/yarp/snapshots/unless.txt
deleted file mode 100644
index 66d61a7307380d..00000000000000
--- a/test/yarp/snapshots/unless.txt
+++ /dev/null
@@ -1,83 +0,0 @@
-ProgramNode(0...141)(
-  [],
-  StatementsNode(0...141)(
-    [UnlessNode(0...19)(
-       (0...6),
-       TrueNode(7...11)(),
-       StatementsNode(13...14)([IntegerNode(13...14)()]),
-       nil,
-       (16...19)
-     ),
-     UnlessNode(21...45)(
-       (21...27),
-       TrueNode(28...32)(),
-       StatementsNode(33...34)([IntegerNode(33...34)()]),
-       ElseNode(35...45)(
-         (35...39),
-         StatementsNode(40...41)([IntegerNode(40...41)()]),
-         (42...45)
-       ),
-       (42...45)
-     ),
-     UnlessNode(47...60)(
-       (49...55),
-       TrueNode(56...60)(),
-       StatementsNode(47...48)([IntegerNode(47...48)()]),
-       nil,
-       nil
-     ),
-     UnlessNode(62...79)(
-       (68...74),
-       TrueNode(75...79)(),
-       StatementsNode(62...67)([BreakNode(62...67)(nil, (62...67))]),
-       nil,
-       nil
-     ),
-     UnlessNode(81...97)(
-       (86...92),
-       TrueNode(93...97)(),
-       StatementsNode(81...85)([NextNode(81...85)(nil, (81...85))]),
-       nil,
-       nil
-     ),
-     UnlessNode(99...117)(
-       (106...112),
-       TrueNode(113...117)(),
-       StatementsNode(99...105)([ReturnNode(99...105)((99...105), nil)]),
-       nil,
-       nil
-     ),
-     UnlessNode(119...141)(
-       (130...136),
-       CallNode(137...141)(
-         nil,
-         nil,
-         (137...141),
-         nil,
-         nil,
-         nil,
-         nil,
-         0,
-         "bar?"
-       ),
-       StatementsNode(119...129)(
-         [CallNode(119...129)(
-            nil,
-            nil,
-            (119...122),
-            nil,
-            ArgumentsNode(123...129)(
-              [SymbolNode(123...125)((123...124), (124...125), nil, "a"),
-               SymbolNode(127...129)((127...128), (128...129), nil, "b")]
-            ),
-            nil,
-            nil,
-            0,
-            "foo"
-          )]
-       ),
-       nil,
-       nil
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/unparser/corpus/literal/alias.txt b/test/yarp/snapshots/unparser/corpus/literal/alias.txt
deleted file mode 100644
index 18e16e1dd949d5..00000000000000
--- a/test/yarp/snapshots/unparser/corpus/literal/alias.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-ProgramNode(0...31)(
-  [],
-  StatementsNode(0...31)(
-    [AliasNode(0...15)(
-       GlobalVariableReadNode(6...10)(:$foo),
-       GlobalVariableReadNode(11...15)(:$bar),
-       (0...5)
-     ),
-     AliasNode(16...31)(
-       SymbolNode(22...26)((22...23), (23...26), nil, "foo"),
-       SymbolNode(27...31)((27...28), (28...31), nil, "bar"),
-       (16...21)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/unparser/corpus/literal/assignment.txt b/test/yarp/snapshots/unparser/corpus/literal/assignment.txt
deleted file mode 100644
index 38c06a29bc928c..00000000000000
--- a/test/yarp/snapshots/unparser/corpus/literal/assignment.txt
+++ /dev/null
@@ -1,694 +0,0 @@
-ProgramNode(0...704)(
-  [:a, :b, :foo, :c, :x],
-  StatementsNode(0...704)(
-    [GlobalVariableWriteNode(0...6)(
-       :$a,
-       (0...2),
-       IntegerNode(5...6)(),
-       (3...4)
-     ),
-     MultiWriteNode(7...24)(
-       [GlobalVariableTargetNode(8...10)(:$a),
-        GlobalVariableTargetNode(12...14)(:$b)],
-       (16...17),
-       ArrayNode(18...24)(
-         [IntegerNode(19...20)(), IntegerNode(22...23)()],
-         (18...19),
-         (23...24)
-       ),
-       (7...8),
-       (14...15)
-     ),
-     MultiWriteNode(25...38)(
-       [MultiWriteNode(26...30)(
-          [LocalVariableTargetNode(27...28)(:a, 0),
-           SplatNode(28...29)((28...29), nil)],
-          nil,
-          nil,
-          (26...27),
-          (29...30)
-        ),
-        LocalVariableTargetNode(32...33)(:b, 0)],
-       (35...36),
-       IntegerNode(37...38)(),
-       (25...26),
-       (33...34)
-     ),
-     MultiWriteNode(39...48)(
-       [SplatNode(40...42)(
-          (40...41),
-          LocalVariableTargetNode(41...42)(:a, 0)
-        )],
-       (44...45),
-       ArrayNode(46...48)([], (46...47), (47...48)),
-       (39...40),
-       (42...43)
-     ),
-     MultiWriteNode(49...64)(
-       [SplatNode(50...54)(
-          (50...51),
-          LocalVariableTargetNode(51...54)(:foo, 0)
-        )],
-       (56...57),
-       ArrayNode(58...64)(
-         [IntegerNode(59...60)(), IntegerNode(62...63)()],
-         (58...59),
-         (63...64)
-       ),
-       (49...50),
-       (54...55)
-     ),
-     MultiWriteNode(65...84)(
-       [ClassVariableTargetNode(66...69)(:@@a),
-        ClassVariableTargetNode(71...74)(:@@b)],
-       (76...77),
-       ArrayNode(78...84)(
-         [IntegerNode(79...80)(), IntegerNode(82...83)()],
-         (78...79),
-         (83...84)
-       ),
-       (65...66),
-       (74...75)
-     ),
-     MultiWriteNode(85...102)(
-       [InstanceVariableTargetNode(86...88)(:@a),
-        InstanceVariableTargetNode(90...92)(:@b)],
-       (94...95),
-       ArrayNode(96...102)(
-         [IntegerNode(97...98)(), IntegerNode(100...101)()],
-         (96...97),
-         (101...102)
-       ),
-       (85...86),
-       (92...93)
-     ),
-     MultiWriteNode(103...128)(
-       [LocalVariableTargetNode(104...105)(:a, 0),
-        MultiWriteNode(107...113)(
-          [LocalVariableTargetNode(108...109)(:b, 0),
-           LocalVariableTargetNode(111...112)(:c, 0)],
-          nil,
-          nil,
-          (107...108),
-          (112...113)
-        )],
-       (115...116),
-       ArrayNode(117...128)(
-         [IntegerNode(118...119)(),
-          ArrayNode(121...127)(
-            [IntegerNode(122...123)(), IntegerNode(125...126)()],
-            (121...122),
-            (126...127)
-          )],
-         (117...118),
-         (127...128)
-       ),
-       (103...104),
-       (113...114)
-     ),
-     MultiWriteNode(129...144)(
-       [LocalVariableTargetNode(130...131)(:a, 0),
-        SplatNode(133...134)((133...134), nil)],
-       (136...137),
-       ArrayNode(138...144)(
-         [IntegerNode(139...140)(), IntegerNode(142...143)()],
-         (138...139),
-         (143...144)
-       ),
-       (129...130),
-       (134...135)
-     ),
-     MultiWriteNode(145...163)(
-       [LocalVariableTargetNode(146...147)(:a, 0),
-        SplatNode(149...153)(
-          (149...150),
-          LocalVariableTargetNode(150...153)(:foo, 0)
-        )],
-       (155...156),
-       ArrayNode(157...163)(
-         [IntegerNode(158...159)(), IntegerNode(161...162)()],
-         (157...158),
-         (162...163)
-       ),
-       (145...146),
-       (153...154)
-     ),
-     MultiWriteNode(164...179)(
-       [LocalVariableTargetNode(165...166)(:a, 0),
-        LocalVariableTargetNode(168...169)(:b, 0)],
-       (171...172),
-       ArrayNode(173...179)(
-         [IntegerNode(174...175)(), IntegerNode(177...178)()],
-         (173...174),
-         (178...179)
-       ),
-       (164...165),
-       (169...170)
-     ),
-     MultiWriteNode(180...192)(
-       [LocalVariableTargetNode(181...182)(:a, 0),
-        LocalVariableTargetNode(184...185)(:b, 0)],
-       (187...188),
-       LocalVariableReadNode(189...192)(:foo, 0),
-       (180...181),
-       (185...186)
-     ),
-     MultiWriteNode(193...203)(
-       [LocalVariableTargetNode(194...195)(:a, 0),
-        SplatNode(195...196)((195...196), nil)],
-       (198...199),
-       LocalVariableReadNode(200...203)(:foo, 0),
-       (193...194),
-       (196...197)
-     ),
-     MultiWriteNode(204...227)(
-       [CallNode(205...210)(
-          LocalVariableReadNode(205...206)(:a, 0),
-          (206...207),
-          (207...210),
-          nil,
-          nil,
-          nil,
-          nil,
-          0,
-          "foo="
-        ),
-        CallNode(212...217)(
-          LocalVariableReadNode(212...213)(:a, 0),
-          (213...214),
-          (214...217),
-          nil,
-          nil,
-          nil,
-          nil,
-          0,
-          "bar="
-        )],
-       (219...220),
-       ArrayNode(221...227)(
-         [IntegerNode(222...223)(), IntegerNode(225...226)()],
-         (221...222),
-         (226...227)
-       ),
-       (204...205),
-       (217...218)
-     ),
-     MultiWriteNode(228...252)(
-       [CallNode(229...236)(
-          LocalVariableReadNode(229...230)(:a, 0),
-          nil,
-          (230...236),
-          (230...231),
-          ArgumentsNode(231...235)(
-            [SplatNode(231...235)(
-               (231...232),
-               LocalVariableReadNode(232...235)(:foo, 0)
-             )]
-          ),
-          (235...236),
-          nil,
-          0,
-          "[]="
-        ),
-        CallNode(238...242)(
-          LocalVariableReadNode(238...239)(:a, 0),
-          nil,
-          (239...242),
-          (239...240),
-          ArgumentsNode(240...241)([IntegerNode(240...241)()]),
-          (241...242),
-          nil,
-          0,
-          "[]="
-        )],
-       (244...245),
-       ArrayNode(246...252)(
-         [IntegerNode(247...248)(), IntegerNode(250...251)()],
-         (246...247),
-         (251...252)
-       ),
-       (228...229),
-       (242...243)
-     ),
-     MultiWriteNode(253...274)(
-       [CallNode(254...258)(
-          LocalVariableReadNode(254...255)(:a, 0),
-          nil,
-          (255...258),
-          (255...256),
-          ArgumentsNode(256...257)([IntegerNode(256...257)()]),
-          (257...258),
-          nil,
-          0,
-          "[]="
-        ),
-        CallNode(260...264)(
-          LocalVariableReadNode(260...261)(:a, 0),
-          nil,
-          (261...264),
-          (261...262),
-          ArgumentsNode(262...263)([IntegerNode(262...263)()]),
-          (263...264),
-          nil,
-          0,
-          "[]="
-        )],
-       (266...267),
-       ArrayNode(268...274)(
-         [IntegerNode(269...270)(), IntegerNode(272...273)()],
-         (268...269),
-         (273...274)
-       ),
-       (253...254),
-       (264...265)
-     ),
-     MultiWriteNode(275...287)(
-       [SplatNode(276...282)(
-          (276...277),
-          CallNode(277...282)(
-            LocalVariableReadNode(277...278)(:c, 0),
-            (278...279),
-            (279...282),
-            nil,
-            nil,
-            nil,
-            nil,
-            0,
-            "foo="
-          )
-        )],
-       (284...285),
-       IntegerNode(286...287)(),
-       (275...276),
-       (282...283)
-     ),
-     ConstantPathWriteNode(288...301)(
-       ConstantPathNode(288...293)(
-         nil,
-         ConstantReadNode(290...293)(:Foo),
-         (288...290)
-       ),
-       (294...295),
-       ConstantPathNode(296...301)(
-         nil,
-         ConstantReadNode(298...301)(:Bar),
-         (296...298)
-       )
-     ),
-     ClassVariableWriteNode(302...309)(
-       :@@a,
-       (302...305),
-       IntegerNode(308...309)(),
-       (306...307)
-     ),
-     InstanceVariableWriteNode(310...316)(
-       :@a,
-       (310...312),
-       IntegerNode(315...316)(),
-       (313...314)
-     ),
-     ConstantWriteNode(317...326)(
-       :CONST,
-       (317...322),
-       IntegerNode(325...326)(),
-       (323...324)
-     ),
-     ConstantPathWriteNode(327...350)(
-       ConstantPathNode(327...346)(
-         ConstantPathNode(327...339)(
-           ConstantReadNode(327...331)(:Name),
-           ConstantReadNode(333...339)(:Spaced),
-           (331...333)
-         ),
-         ConstantReadNode(341...346)(:CONST),
-         (339...341)
-       ),
-       (347...348),
-       IntegerNode(349...350)()
-     ),
-     LocalVariableWriteNode(351...367)(
-       :a,
-       0,
-       (351...352),
-       ParenthesesNode(355...367)(
-         StatementsNode(356...366)(
-           [MultiWriteNode(356...366)(
-              [LocalVariableTargetNode(357...358)(:b, 0),
-               LocalVariableTargetNode(360...361)(:c, 0)],
-              (363...364),
-              IntegerNode(365...366)(),
-              (356...357),
-              (361...362)
-            )]
-         ),
-         (355...356),
-         (366...367)
-       ),
-       (353...354)
-     ),
-     LocalVariableWriteNode(368...373)(
-       :a,
-       0,
-       (368...369),
-       IntegerNode(372...373)(),
-       (370...371)
-     ),
-     LocalVariableWriteNode(374...385)(
-       :foo,
-       0,
-       (374...377),
-       CallNode(380...385)(
-         nil,
-         nil,
-         (380...383),
-         (383...384),
-         nil,
-         (384...385),
-         nil,
-         0,
-         "foo"
-       ),
-       (378...379)
-     ),
-     CallNode(386...395)(
-       LocalVariableReadNode(386...389)(:foo, 0),
-       (389...390),
-       (390...393),
-       (393...394),
-       nil,
-       (394...395),
-       nil,
-       0,
-       "[]="
-     ),
-     CallNode(396...409)(
-       LocalVariableReadNode(396...399)(:foo, 0),
-       (399...400),
-       (400...403),
-       (403...404),
-       ArgumentsNode(404...408)(
-         [IntegerNode(404...405)(), IntegerNode(407...408)()]
-       ),
-       (408...409),
-       nil,
-       0,
-       "[]="
-     ),
-     CallNode(410...421)(
-       LocalVariableReadNode(410...413)(:foo, 0),
-       (413...414),
-       (414...417),
-       nil,
-       ArgumentsNode(417...421)([TrueNode(417...421)()]),
-       nil,
-       nil,
-       0,
-       "[]="
-     ),
-     CallNode(422...441)(
-       LocalVariableReadNode(422...425)(:foo, 0),
-       nil,
-       (425...433),
-       (425...426),
-       ArgumentsNode(426...441)(
-         [SplatNode(426...432)(
-            (426...427),
-            CallNode(427...432)(
-              nil,
-              nil,
-              (427...432),
-              nil,
-              nil,
-              nil,
-              nil,
-              2,
-              "index"
-            )
-          ),
-          CallNode(436...441)(
-            nil,
-            nil,
-            (436...441),
-            nil,
-            nil,
-            nil,
-            nil,
-            2,
-            "value"
-          )]
-       ),
-       (432...433),
-       nil,
-       0,
-       "[]="
-     ),
-     CallNode(442...459)(
-       LocalVariableReadNode(442...445)(:foo, 0),
-       nil,
-       (445...451),
-       (445...446),
-       ArgumentsNode(446...459)(
-         [RangeNode(446...450)(
-            IntegerNode(446...447)(),
-            IntegerNode(449...450)(),
-            (447...449),
-            0
-          ),
-          CallNode(454...459)(
-            nil,
-            nil,
-            (454...459),
-            nil,
-            nil,
-            nil,
-            nil,
-            2,
-            "value"
-          )]
-       ),
-       (450...451),
-       nil,
-       0,
-       "[]="
-     ),
-     CallNode(460...469)(
-       LocalVariableReadNode(460...463)(:foo, 0),
-       nil,
-       (463...465),
-       (463...464),
-       ArgumentsNode(468...469)([IntegerNode(468...469)()]),
-       (464...465),
-       nil,
-       0,
-       "[]="
-     ),
-     CallNode(470...487)(
-       LocalVariableReadNode(470...473)(:foo, 0),
-       nil,
-       (473...479),
-       (473...474),
-       ArgumentsNode(474...487)(
-         [LocalVariableReadNode(474...475)(:a, 0),
-          LocalVariableReadNode(477...478)(:b, 0),
-          CallNode(482...487)(
-            nil,
-            nil,
-            (482...487),
-            nil,
-            nil,
-            nil,
-            nil,
-            2,
-            "value"
-          )]
-       ),
-       (478...479),
-       nil,
-       0,
-       "[]="
-     ),
-     CallNode(488...506)(
-       LocalVariableReadNode(488...491)(:foo, 0),
-       nil,
-       (491...498),
-       (491...492),
-       ArgumentsNode(492...506)(
-         [CallNode(492...497)(
-            nil,
-            nil,
-            (492...497),
-            nil,
-            nil,
-            nil,
-            nil,
-            2,
-            "index"
-          ),
-          CallNode(501...506)(
-            nil,
-            nil,
-            (501...506),
-            nil,
-            nil,
-            nil,
-            nil,
-            2,
-            "value"
-          )]
-       ),
-       (497...498),
-       nil,
-       0,
-       "[]="
-     ),
-     LocalVariableWriteNode(507...514)(
-       :x,
-       0,
-       (507...508),
-       StringNode(511...514)((511...513), (513...513), (513...514), ""),
-       (509...510)
-     ),
-     CallNode(515...522)(
-       LocalVariableReadNode(515...516)(:x, 0),
-       (516...517),
-       (517...518),
-       nil,
-       ArgumentsNode(519...522)(
-         [StringNode(519...522)((519...521), (521...521), (521...522), "")]
-       ),
-       nil,
-       nil,
-       0,
-       "x="
-     ),
-     CallNode(523...535)(
-       LocalVariableReadNode(523...524)(:x, 0),
-       nil,
-       (524...529),
-       (524...525),
-       ArgumentsNode(525...535)(
-         [StringNode(525...528)((525...527), (527...527), (527...528), ""),
-          CallNode(532...535)(
-            nil,
-            nil,
-            (532...535),
-            nil,
-            nil,
-            nil,
-            nil,
-            2,
-            "bar"
-          )]
-       ),
-       (528...529),
-       nil,
-       0,
-       "[]="
-     ),
-     CallOrWriteNode(536...550)(
-       LocalVariableReadNode(536...537)(:a, 0),
-       nil,
-       (537...542),
-       (537...538),
-       ArgumentsNode(538...541)(
-         [StringNode(538...541)((538...540), (540...540), (540...541), "")]
-       ),
-       (541...542),
-       0,
-       "[]",
-       "[]=",
-       (543...546),
-       CallNode(547...550)(nil, nil, (547...550), nil, nil, nil, nil, 2, "bar")
-     ),
-     InstanceVariableOrWriteNode(551...561)(
-       :@a,
-       (551...553),
-       (554...557),
-       StringNode(558...561)((558...560), (560...560), (560...561), "")
-     ),
-     LocalVariableWriteNode(562...576)(
-       :x,
-       0,
-       (562...563),
-       InterpolatedStringNode(566...576)(
-         (566...576),
-         [StringNode(577...579)(nil, (577...579), nil, "  "),
-          EmbeddedStatementsNode(579...582)((579...581), nil, (581...582)),
-          StringNode(582...583)(nil, (582...583), nil, "\n")],
-         (583...591)
-       ),
-       (564...565)
-     ),
-     CallNode(591...605)(
-       LocalVariableReadNode(591...592)(:x, 0),
-       (592...593),
-       (593...594),
-       nil,
-       ArgumentsNode(595...605)(
-         [InterpolatedStringNode(595...605)(
-            (595...605),
-            [StringNode(606...608)(nil, (606...608), nil, "  "),
-             EmbeddedStatementsNode(608...611)((608...610), nil, (610...611)),
-             StringNode(611...612)(nil, (611...612), nil, "\n")],
-            (612...620)
-          )]
-       ),
-       nil,
-       nil,
-       0,
-       "x="
-     ),
-     CallNode(620...636)(
-       LocalVariableReadNode(620...621)(:x, 0),
-       nil,
-       (621...623),
-       (621...622),
-       ArgumentsNode(626...636)(
-         [InterpolatedStringNode(626...636)(
-            (626...636),
-            [StringNode(637...639)(nil, (637...639), nil, "  "),
-             EmbeddedStatementsNode(639...642)((639...641), nil, (641...642)),
-             StringNode(642...643)(nil, (642...643), nil, "\n")],
-            (643...651)
-          )]
-       ),
-       (622...623),
-       nil,
-       0,
-       "[]="
-     ),
-     CallOrWriteNode(651...672)(
-       LocalVariableReadNode(651...652)(:a, 0),
-       nil,
-       (652...664),
-       (652...653),
-       ArgumentsNode(653...663)(
-         [InterpolatedStringNode(653...663)(
-            (653...663),
-            [StringNode(673...675)(nil, (673...675), nil, "  "),
-             EmbeddedStatementsNode(675...678)((675...677), nil, (677...678)),
-             StringNode(678...679)(nil, (678...679), nil, "\n")],
-            (679...687)
-          )]
-       ),
-       (663...664),
-       0,
-       "[]",
-       "[]=",
-       (665...668),
-       CallNode(669...672)(nil, nil, (669...672), nil, nil, nil, nil, 2, "bar")
-     ),
-     InstanceVariableOrWriteNode(687...704)(
-       :@a,
-       (687...689),
-       (690...693),
-       InterpolatedStringNode(694...704)(
-         (694...704),
-         [StringNode(705...707)(nil, (705...707), nil, "  "),
-          EmbeddedStatementsNode(707...710)((707...709), nil, (709...710)),
-          StringNode(710...711)(nil, (710...711), nil, "\n")],
-         (711...719)
-       )
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/unparser/corpus/literal/block.txt b/test/yarp/snapshots/unparser/corpus/literal/block.txt
deleted file mode 100644
index 514ce627600655..00000000000000
--- a/test/yarp/snapshots/unparser/corpus/literal/block.txt
+++ /dev/null
@@ -1,1275 +0,0 @@
-ProgramNode(0...737)(
-  [],
-  StatementsNode(0...737)(
-    [CallNode(0...7)(
-       nil,
-       nil,
-       (0...3),
-       nil,
-       nil,
-       nil,
-       BlockNode(4...7)([], nil, nil, (4...5), (6...7)),
-       0,
-       "foo"
-     ),
-     CallNode(8...19)(
-       nil,
-       nil,
-       (8...11),
-       nil,
-       nil,
-       nil,
-       BlockNode(12...19)(
-         [:a],
-         BlockParametersNode(14...17)(
-           ParametersNode(15...16)(
-             [RequiredParameterNode(15...16)(:a)],
-             [],
-             [],
-             nil,
-             [],
-             nil,
-             nil
-           ),
-           [],
-           (14...15),
-           (16...17)
-         ),
-         nil,
-         (12...13),
-         (18...19)
-       ),
-       0,
-       "foo"
-     ),
-     CallNode(20...32)(
-       nil,
-       nil,
-       (20...23),
-       nil,
-       nil,
-       nil,
-       BlockNode(24...32)(
-         [:a],
-         BlockParametersNode(26...30)(
-           ParametersNode(27...29)(
-             [RequiredParameterNode(27...28)(:a)],
-             [],
-             [],
-             RestParameterNode(28...29)((28...29), nil),
-             [],
-             nil,
-             nil
-           ),
-           [],
-           (26...27),
-           (29...30)
-         ),
-         nil,
-         (24...25),
-         (31...32)
-       ),
-       0,
-       "foo"
-     ),
-     CallNode(33...48)(
-       nil,
-       nil,
-       (33...36),
-       nil,
-       nil,
-       nil,
-       BlockNode(37...48)(
-         [:a, :x],
-         BlockParametersNode(39...46)(
-           ParametersNode(40...42)(
-             [RequiredParameterNode(40...41)(:a)],
-             [],
-             [],
-             RestParameterNode(41...42)((41...42), nil),
-             [],
-             nil,
-             nil
-           ),
-           [BlockLocalVariableNode(44...45)(:x)],
-           (39...40),
-           (45...46)
-         ),
-         nil,
-         (37...38),
-         (47...48)
-       ),
-       0,
-       "foo"
-     ),
-     CallNode(49...63)(
-       nil,
-       nil,
-       (49...52),
-       nil,
-       nil,
-       nil,
-       BlockNode(53...63)(
-         [:a, :b],
-         BlockParametersNode(55...61)(
-           ParametersNode(56...60)(
-             [RequiredParameterNode(56...57)(:a),
-              RequiredParameterNode(59...60)(:b)],
-             [],
-             [],
-             nil,
-             [],
-             nil,
-             nil
-           ),
-           [],
-           (55...56),
-           (60...61)
-         ),
-         nil,
-         (53...54),
-         (62...63)
-       ),
-       0,
-       "foo"
-     ),
-     CallNode(64...80)(
-       nil,
-       nil,
-       (64...67),
-       (67...68),
-       ArgumentsNode(68...69)([IntegerNode(68...69)()]),
-       (69...70),
-       BlockNode(71...80)(
-         [],
-         nil,
-         StatementsNode(75...78)([NilNode(75...78)()]),
-         (71...72),
-         (79...80)
-       ),
-       0,
-       "foo"
-     ),
-     CallNode(81...102)(
-       nil,
-       nil,
-       (81...84),
-       nil,
-       nil,
-       nil,
-       BlockNode(85...102)(
-         [:a, :b],
-         BlockParametersNode(87...94)(
-           ParametersNode(88...93)(
-             [RequiredParameterNode(88...89)(:a)],
-             [],
-             [],
-             RestParameterNode(91...93)((91...92), (92...93)),
-             [],
-             nil,
-             nil
-           ),
-           [],
-           (87...88),
-           (93...94)
-         ),
-         StatementsNode(97...100)([NilNode(97...100)()]),
-         (85...86),
-         (101...102)
-       ),
-       0,
-       "foo"
-     ),
-     CallNode(103...123)(
-       nil,
-       nil,
-       (103...106),
-       nil,
-       nil,
-       nil,
-       BlockNode(107...123)(
-         [:a, :*],
-         BlockParametersNode(109...115)(
-           ParametersNode(110...114)(
-             [RequiredParameterNode(110...111)(:a)],
-             [],
-             [],
-             RestParameterNode(113...114)((113...114), nil),
-             [],
-             nil,
-             nil
-           ),
-           [],
-           (109...110),
-           (114...115)
-         ),
-         StatementsNode(118...121)([NilNode(118...121)()]),
-         (107...108),
-         (122...123)
-       ),
-       0,
-       "foo"
-     ),
-     CallNode(124...137)(
-       nil,
-       nil,
-       (124...127),
-       nil,
-       nil,
-       nil,
-       BlockNode(128...137)(
-         [],
-         nil,
-         StatementsNode(132...135)(
-           [CallNode(132...135)(
-              nil,
-              nil,
-              (132...135),
-              nil,
-              nil,
-              nil,
-              nil,
-              2,
-              "bar"
-            )]
-         ),
-         (128...129),
-         (136...137)
-       ),
-       0,
-       "foo"
-     ),
-     CallNode(138...165)(
-       CallNode(138...141)(
-         nil,
-         nil,
-         (138...141),
-         nil,
-         nil,
-         nil,
-         nil,
-         2,
-         "foo"
-       ),
-       (141...142),
-       (142...145),
-       nil,
-       nil,
-       nil,
-       BlockNode(146...165)(
-         [:a, :b, :c],
-         BlockParametersNode(148...159)(
-           ParametersNode(149...158)(
-             [RequiredDestructuredParameterNode(149...155)(
-                [RequiredParameterNode(150...151)(:a),
-                 RequiredParameterNode(153...154)(:b)],
-                (149...150),
-                (154...155)
-              ),
-              RequiredParameterNode(157...158)(:c)],
-             [],
-             [],
-             nil,
-             [],
-             nil,
-             nil
-           ),
-           [],
-           (148...149),
-           (158...159)
-         ),
-         StatementsNode(162...163)(
-           [CallNode(162...163)(
-              nil,
-              nil,
-              (162...163),
-              nil,
-              nil,
-              nil,
-              nil,
-              2,
-              "d"
-            )]
-         ),
-         (146...147),
-         (164...165)
-       ),
-       0,
-       "bar"
-     ),
-     CallNode(166...185)(
-       CallNode(166...169)(
-         nil,
-         nil,
-         (166...169),
-         nil,
-         nil,
-         nil,
-         nil,
-         2,
-         "foo"
-       ),
-       (169...170),
-       (170...173),
-       nil,
-       nil,
-       nil,
-       BlockNode(174...185)(
-         [:a, :b],
-         BlockParametersNode(176...183)(
-           ParametersNode(177...179)(
-             [],
-             [],
-             [],
-             RestParameterNode(177...179)((177...178), (178...179)),
-             [],
-             nil,
-             nil
-           ),
-           [BlockLocalVariableNode(181...182)(:b)],
-           (176...177),
-           (182...183)
-         ),
-         nil,
-         (174...175),
-         (184...185)
-       ),
-       0,
-       "bar"
-     ),
-     CallNode(186...204)(
-       CallNode(186...189)(
-         nil,
-         nil,
-         (186...189),
-         nil,
-         nil,
-         nil,
-         nil,
-         2,
-         "foo"
-       ),
-       (189...190),
-       (190...193),
-       nil,
-       nil,
-       nil,
-       BlockNode(194...204)(
-         [:a, :b],
-         BlockParametersNode(196...202)(
-           ParametersNode(197...198)(
-             [RequiredParameterNode(197...198)(:a)],
-             [],
-             [],
-             nil,
-             [],
-             nil,
-             nil
-           ),
-           [BlockLocalVariableNode(200...201)(:b)],
-           (196...197),
-           (201...202)
-         ),
-         nil,
-         (194...195),
-         (203...204)
-       ),
-       0,
-       "bar"
-     ),
-     CallNode(205...225)(
-       CallNode(205...208)(
-         nil,
-         nil,
-         (205...208),
-         nil,
-         nil,
-         nil,
-         nil,
-         2,
-         "foo"
-       ),
-       (208...209),
-       (209...212),
-       nil,
-       nil,
-       nil,
-       BlockNode(213...225)(
-         [:a, :b],
-         BlockParametersNode(215...223)(
-           nil,
-           [BlockLocalVariableNode(218...219)(:a),
-            BlockLocalVariableNode(221...222)(:b)],
-           (215...216),
-           (222...223)
-         ),
-         nil,
-         (213...214),
-         (224...225)
-       ),
-       0,
-       "bar"
-     ),
-     CallNode(226...245)(
-       CallNode(226...229)(
-         nil,
-         nil,
-         (226...229),
-         nil,
-         nil,
-         nil,
-         nil,
-         2,
-         "foo"
-       ),
-       (229...230),
-       (230...233),
-       nil,
-       nil,
-       nil,
-       BlockNode(234...245)(
-         [:*],
-         BlockParametersNode(236...239)(
-           ParametersNode(237...238)(
-             [],
-             [],
-             [],
-             RestParameterNode(237...238)((237...238), nil),
-             [],
-             nil,
-             nil
-           ),
-           [],
-           (236...237),
-           (238...239)
-         ),
-         StatementsNode(242...243)(
-           [CallNode(242...243)(
-              nil,
-              nil,
-              (242...243),
-              nil,
-              nil,
-              nil,
-              nil,
-              2,
-              "d"
-            )]
-         ),
-         (234...235),
-         (244...245)
-       ),
-       0,
-       "bar"
-     ),
-     CallNode(246...267)(
-       CallNode(246...249)(
-         nil,
-         nil,
-         (246...249),
-         nil,
-         nil,
-         nil,
-         nil,
-         2,
-         "foo"
-       ),
-       (249...250),
-       (250...253),
-       nil,
-       nil,
-       nil,
-       BlockNode(254...267)(
-         [],
-         BlockParametersNode(256...261)(
-           ParametersNode(257...260)(
-             [RequiredDestructuredParameterNode(257...260)(
-                [SplatNode(258...259)((258...259), nil)],
-                (257...258),
-                (259...260)
-              )],
-             [],
-             [],
-             nil,
-             [],
-             nil,
-             nil
-           ),
-           [],
-           (256...257),
-           (260...261)
-         ),
-         StatementsNode(264...265)(
-           [CallNode(264...265)(
-              nil,
-              nil,
-              (264...265),
-              nil,
-              nil,
-              nil,
-              nil,
-              2,
-              "d"
-            )]
-         ),
-         (254...255),
-         (266...267)
-       ),
-       0,
-       "bar"
-     ),
-     CallNode(268...291)(
-       CallNode(268...271)(
-         nil,
-         nil,
-         (268...271),
-         nil,
-         nil,
-         nil,
-         nil,
-         2,
-         "foo"
-       ),
-       (271...272),
-       (272...275),
-       nil,
-       nil,
-       nil,
-       BlockNode(276...291)(
-         [],
-         BlockParametersNode(278...285)(
-           ParametersNode(279...284)(
-             [RequiredDestructuredParameterNode(279...284)(
-                [RequiredDestructuredParameterNode(280...283)(
-                   [SplatNode(281...282)((281...282), nil)],
-                   (280...281),
-                   (282...283)
-                 )],
-                (279...280),
-                (283...284)
-              )],
-             [],
-             [],
-             nil,
-             [],
-             nil,
-             nil
-           ),
-           [],
-           (278...279),
-           (284...285)
-         ),
-         StatementsNode(288...289)(
-           [CallNode(288...289)(
-              nil,
-              nil,
-              (288...289),
-              nil,
-              nil,
-              nil,
-              nil,
-              2,
-              "d"
-            )]
-         ),
-         (276...277),
-         (290...291)
-       ),
-       0,
-       "bar"
-     ),
-     CallNode(292...318)(
-       CallNode(292...295)(
-         nil,
-         nil,
-         (292...295),
-         nil,
-         nil,
-         nil,
-         nil,
-         2,
-         "foo"
-       ),
-       (295...296),
-       (296...299),
-       nil,
-       nil,
-       nil,
-       BlockNode(300...318)(
-         [:a],
-         BlockParametersNode(302...312)(
-           ParametersNode(303...311)(
-             [RequiredDestructuredParameterNode(303...311)(
-                [RequiredParameterNode(304...305)(:a),
-                 RequiredDestructuredParameterNode(307...310)(
-                   [SplatNode(308...309)((308...309), nil)],
-                   (307...308),
-                   (309...310)
-                 )],
-                (303...304),
-                (310...311)
-              )],
-             [],
-             [],
-             nil,
-             [],
-             nil,
-             nil
-           ),
-           [],
-           (302...303),
-           (311...312)
-         ),
-         StatementsNode(315...316)(
-           [CallNode(315...316)(
-              nil,
-              nil,
-              (315...316),
-              nil,
-              nil,
-              nil,
-              nil,
-              2,
-              "d"
-            )]
-         ),
-         (300...301),
-         (317...318)
-       ),
-       0,
-       "bar"
-     ),
-     CallNode(319...343)(
-       CallNode(319...322)(
-         nil,
-         nil,
-         (319...322),
-         nil,
-         nil,
-         nil,
-         nil,
-         2,
-         "foo"
-       ),
-       (322...323),
-       (323...326),
-       nil,
-       nil,
-       nil,
-       BlockNode(327...343)(
-         [:a, :b],
-         BlockParametersNode(329...337)(
-           ParametersNode(330...336)(
-             [RequiredDestructuredParameterNode(330...336)(
-                [RequiredParameterNode(331...332)(:a),
-                 RequiredParameterNode(334...335)(:b)],
-                (330...331),
-                (335...336)
-              )],
-             [],
-             [],
-             nil,
-             [],
-             nil,
-             nil
-           ),
-           [],
-           (329...330),
-           (336...337)
-         ),
-         StatementsNode(340...341)(
-           [CallNode(340...341)(
-              nil,
-              nil,
-              (340...341),
-              nil,
-              nil,
-              nil,
-              nil,
-              2,
-              "d"
-            )]
-         ),
-         (327...328),
-         (342...343)
-       ),
-       0,
-       "bar"
-     ),
-     CallNode(344...359)(
-       CallNode(344...355)(
-         CallNode(344...347)(
-           nil,
-           nil,
-           (344...347),
-           nil,
-           nil,
-           nil,
-           nil,
-           2,
-           "foo"
-         ),
-         (347...348),
-         (348...351),
-         nil,
-         nil,
-         nil,
-         BlockNode(352...355)([], nil, nil, (352...353), (354...355)),
-         0,
-         "bar"
-       ),
-       (355...356),
-       (356...359),
-       nil,
-       nil,
-       nil,
-       nil,
-       0,
-       "baz"
-     ),
-     CallNode(360...390)(
-       nil,
-       nil,
-       (360...361),
-       nil,
-       nil,
-       nil,
-       BlockNode(362...390)(
-         [:e],
-         nil,
-         BeginNode(365...390)(
-           nil,
-           nil,
-           RescueNode(365...386)(
-             (365...371),
-             [ConstantReadNode(372...381)(:Exception)],
-             (382...384),
-             LocalVariableTargetNode(385...386)(:e, 0),
-             nil,
-             nil
-           ),
-           nil,
-           nil,
-           (387...390)
-         ),
-         (362...364),
-         (387...390)
-       ),
-       0,
-       "m"
-     ),
-     CallNode(391...435)(
-       nil,
-       nil,
-       (391...392),
-       nil,
-       nil,
-       nil,
-       BlockNode(393...435)(
-         [:bar],
-         nil,
-         BeginNode(398...435)(
-           nil,
-           StatementsNode(398...401)(
-             [CallNode(398...401)(
-                nil,
-                nil,
-                (398...401),
-                nil,
-                nil,
-                nil,
-                nil,
-                2,
-                "foo"
-              )]
-           ),
-           RescueNode(402...431)(
-             (402...408),
-             [ConstantReadNode(409...418)(:Exception)],
-             (419...421),
-             LocalVariableTargetNode(422...425)(:bar, 0),
-             StatementsNode(428...431)(
-               [LocalVariableReadNode(428...431)(:bar, 0)]
-             ),
-             nil
-           ),
-           nil,
-           nil,
-           (432...435)
-         ),
-         (393...395),
-         (432...435)
-       ),
-       0,
-       "m"
-     ),
-     CallNode(436...479)(
-       nil,
-       nil,
-       (436...437),
-       nil,
-       nil,
-       nil,
-       BlockNode(438...479)(
-         [],
-         nil,
-         BeginNode(443...479)(
-           nil,
-           StatementsNode(443...446)(
-             [CallNode(443...446)(
-                nil,
-                nil,
-                (443...446),
-                nil,
-                nil,
-                nil,
-                nil,
-                2,
-                "bar"
-              )]
-           ),
-           RescueNode(447...475)(
-             (447...453),
-             [ConstantReadNode(454...463)(:SomeError),
-              SplatNode(465...469)(
-                (465...466),
-                CallNode(466...469)(
-                  nil,
-                  nil,
-                  (466...469),
-                  nil,
-                  nil,
-                  nil,
-                  nil,
-                  2,
-                  "bar"
-                )
-              )],
-             nil,
-             nil,
-             StatementsNode(472...475)(
-               [CallNode(472...475)(
-                  nil,
-                  nil,
-                  (472...475),
-                  nil,
-                  nil,
-                  nil,
-                  nil,
-                  2,
-                  "baz"
-                )]
-             ),
-             nil
-           ),
-           nil,
-           nil,
-           (476...479)
-         ),
-         (438...440),
-         (476...479)
-       ),
-       0,
-       "m"
-     ),
-     CallNode(480...536)(
-       nil,
-       nil,
-       (480...481),
-       nil,
-       nil,
-       nil,
-       BlockNode(482...536)(
-         [:exception],
-         nil,
-         BeginNode(487...536)(
-           nil,
-           StatementsNode(487...490)(
-             [CallNode(487...490)(
-                nil,
-                nil,
-                (487...490),
-                nil,
-                nil,
-                nil,
-                nil,
-                2,
-                "bar"
-              )]
-           ),
-           RescueNode(491...532)(
-             (491...497),
-             [ConstantReadNode(498...507)(:SomeError),
-              SplatNode(509...513)(
-                (509...510),
-                CallNode(510...513)(
-                  nil,
-                  nil,
-                  (510...513),
-                  nil,
-                  nil,
-                  nil,
-                  nil,
-                  2,
-                  "bar"
-                )
-              )],
-             (514...516),
-             LocalVariableTargetNode(517...526)(:exception, 0),
-             StatementsNode(529...532)(
-               [CallNode(529...532)(
-                  nil,
-                  nil,
-                  (529...532),
-                  nil,
-                  nil,
-                  nil,
-                  nil,
-                  2,
-                  "baz"
-                )]
-             ),
-             nil
-           ),
-           nil,
-           nil,
-           (533...536)
-         ),
-         (482...484),
-         (533...536)
-       ),
-       0,
-       "m"
-     ),
-     CallNode(537...569)(
-       nil,
-       nil,
-       (537...538),
-       nil,
-       nil,
-       nil,
-       BlockNode(539...569)(
-         [],
-         nil,
-         BeginNode(544...569)(
-           nil,
-           StatementsNode(544...547)(
-             [CallNode(544...547)(
-                nil,
-                nil,
-                (544...547),
-                nil,
-                nil,
-                nil,
-                nil,
-                2,
-                "bar"
-              )]
-           ),
-           RescueNode(548...565)(
-             (548...554),
-             [SplatNode(555...559)(
-                (555...556),
-                CallNode(556...559)(
-                  nil,
-                  nil,
-                  (556...559),
-                  nil,
-                  nil,
-                  nil,
-                  nil,
-                  2,
-                  "bar"
-                )
-              )],
-             nil,
-             nil,
-             StatementsNode(562...565)(
-               [CallNode(562...565)(
-                  nil,
-                  nil,
-                  (562...565),
-                  nil,
-                  nil,
-                  nil,
-                  nil,
-                  2,
-                  "baz"
-                )]
-             ),
-             nil
-           ),
-           nil,
-           nil,
-           (566...569)
-         ),
-         (539...541),
-         (566...569)
-       ),
-       0,
-       "m"
-     ),
-     CallNode(570...601)(
-       nil,
-       nil,
-       (570...571),
-       nil,
-       nil,
-       nil,
-       BlockNode(572...601)(
-         [],
-         nil,
-         BeginNode(577...601)(
-           nil,
-           StatementsNode(577...580)(
-             [CallNode(577...580)(
-                nil,
-                nil,
-                (577...580),
-                nil,
-                nil,
-                nil,
-                nil,
-                2,
-                "bar"
-              )]
-           ),
-           RescueNode(581...597)(
-             (581...587),
-             [ConstantReadNode(588...597)(:LoadError)],
-             nil,
-             nil,
-             nil,
-             nil
-           ),
-           nil,
-           nil,
-           (598...601)
-         ),
-         (572...574),
-         (598...601)
-       ),
-       0,
-       "m"
-     ),
-     CallNode(602...634)(
-       nil,
-       nil,
-       (602...603),
-       nil,
-       nil,
-       nil,
-       BlockNode(604...634)(
-         [],
-         nil,
-         BeginNode(609...634)(
-           nil,
-           StatementsNode(609...612)(
-             [CallNode(609...612)(
-                nil,
-                nil,
-                (609...612),
-                nil,
-                nil,
-                nil,
-                nil,
-                2,
-                "bar"
-              )]
-           ),
-           RescueNode(613...619)((613...619), [], nil, nil, nil, nil),
-           ElseNode(620...634)(
-             (620...624),
-             StatementsNode(627...630)(
-               [CallNode(627...630)(
-                  nil,
-                  nil,
-                  (627...630),
-                  nil,
-                  nil,
-                  nil,
-                  nil,
-                  2,
-                  "baz"
-                )]
-             ),
-             (631...634)
-           ),
-           nil,
-           (631...634)
-         ),
-         (604...606),
-         (631...634)
-       ),
-       0,
-       "m"
-     ),
-     CallNode(635...680)(
-       nil,
-       nil,
-       (635...636),
-       nil,
-       nil,
-       nil,
-       BlockNode(637...680)(
-         [:exception],
-         nil,
-         BeginNode(642...680)(
-           nil,
-           StatementsNode(642...645)(
-             [CallNode(642...645)(
-                nil,
-                nil,
-                (642...645),
-                nil,
-                nil,
-                nil,
-                nil,
-                2,
-                "bar"
-              )]
-           ),
-           RescueNode(646...676)(
-             (646...652),
-             [SplatNode(653...657)(
-                (653...654),
-                CallNode(654...657)(
-                  nil,
-                  nil,
-                  (654...657),
-                  nil,
-                  nil,
-                  nil,
-                  nil,
-                  2,
-                  "bar"
-                )
-              )],
-             (658...660),
-             LocalVariableTargetNode(661...670)(:exception, 0),
-             StatementsNode(673...676)(
-               [CallNode(673...676)(
-                  nil,
-                  nil,
-                  (673...676),
-                  nil,
-                  nil,
-                  nil,
-                  nil,
-                  2,
-                  "baz"
-                )]
-             ),
-             nil
-           ),
-           nil,
-           nil,
-           (677...680)
-         ),
-         (637...639),
-         (677...680)
-       ),
-       0,
-       "m"
-     ),
-     CallNode(681...696)(
-       nil,
-       nil,
-       (681...682),
-       nil,
-       nil,
-       nil,
-       BlockNode(683...696)(
-         [],
-         nil,
-         BeginNode(686...696)(
-           nil,
-           nil,
-           nil,
-           nil,
-           EnsureNode(686...696)((686...692), nil, (693...696)),
-           (693...696)
-         ),
-         (683...685),
-         (693...696)
-       ),
-       0,
-       "m"
-     ),
-     CallNode(697...719)(
-       nil,
-       nil,
-       (697...698),
-       nil,
-       nil,
-       nil,
-       BlockNode(699...719)(
-         [],
-         nil,
-         BeginNode(702...719)(
-           nil,
-           nil,
-           RescueNode(702...708)((702...708), [], nil, nil, nil, nil),
-           nil,
-           EnsureNode(709...719)((709...715), nil, (716...719)),
-           (716...719)
-         ),
-         (699...701),
-         (716...719)
-       ),
-       0,
-       "m"
-     ),
-     CallNode(720...737)(
-       nil,
-       nil,
-       (720...723),
-       nil,
-       nil,
-       nil,
-       BlockNode(724...737)(
-         [],
-         nil,
-         StatementsNode(728...735)(
-           [CallNode(728...735)(
-              CallNode(728...730)(
-                nil,
-                nil,
-                (728...730),
-                nil,
-                nil,
-                nil,
-                nil,
-                2,
-                "_1"
-              ),
-              nil,
-              (731...732),
-              nil,
-              ArgumentsNode(733...735)(
-                [CallNode(733...735)(
-                   nil,
-                   nil,
-                   (733...735),
-                   nil,
-                   nil,
-                   nil,
-                   nil,
-                   2,
-                   "_2"
-                 )]
-              ),
-              nil,
-              nil,
-              0,
-              "+"
-            )]
-         ),
-         (724...725),
-         (736...737)
-       ),
-       0,
-       "bar"
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/unparser/corpus/literal/case.txt b/test/yarp/snapshots/unparser/corpus/literal/case.txt
deleted file mode 100644
index 8470bd39aaf631..00000000000000
--- a/test/yarp/snapshots/unparser/corpus/literal/case.txt
+++ /dev/null
@@ -1,402 +0,0 @@
-ProgramNode(0...284)(
-  [],
-  StatementsNode(0...284)(
-    [CaseNode(0...38)(
-       nil,
-       [WhenNode(5...19)(
-          (5...9),
-          [CallNode(10...13)(
-             nil,
-             nil,
-             (10...13),
-             nil,
-             nil,
-             nil,
-             nil,
-             2,
-             "bar"
-           )],
-          StatementsNode(16...19)(
-            [CallNode(16...19)(
-               nil,
-               nil,
-               (16...19),
-               nil,
-               nil,
-               nil,
-               nil,
-               2,
-               "baz"
-             )]
-          )
-        ),
-        WhenNode(20...34)(
-          (20...24),
-          [CallNode(25...28)(
-             nil,
-             nil,
-             (25...28),
-             nil,
-             nil,
-             nil,
-             nil,
-             2,
-             "baz"
-           )],
-          StatementsNode(31...34)(
-            [CallNode(31...34)(
-               nil,
-               nil,
-               (31...34),
-               nil,
-               nil,
-               nil,
-               nil,
-               2,
-               "bar"
-             )]
-          )
-        )],
-       nil,
-       (0...4),
-       (35...38)
-     ),
-     CaseNode(39...75)(
-       CallNode(44...47)(nil, nil, (44...47), nil, nil, nil, nil, 2, "foo"),
-       [WhenNode(48...56)(
-          (48...52),
-          [CallNode(53...56)(
-             nil,
-             nil,
-             (53...56),
-             nil,
-             nil,
-             nil,
-             nil,
-             2,
-             "bar"
-           )],
-          nil
-        ),
-        WhenNode(57...71)(
-          (57...61),
-          [CallNode(62...65)(
-             nil,
-             nil,
-             (62...65),
-             nil,
-             nil,
-             nil,
-             nil,
-             2,
-             "baz"
-           )],
-          StatementsNode(68...71)(
-            [CallNode(68...71)(
-               nil,
-               nil,
-               (68...71),
-               nil,
-               nil,
-               nil,
-               nil,
-               2,
-               "bar"
-             )]
-          )
-        )],
-       nil,
-       (39...43),
-       (72...75)
-     ),
-     CaseNode(76...118)(
-       CallNode(81...84)(nil, nil, (81...84), nil, nil, nil, nil, 2, "foo"),
-       [WhenNode(85...99)(
-          (85...89),
-          [CallNode(90...93)(
-             nil,
-             nil,
-             (90...93),
-             nil,
-             nil,
-             nil,
-             nil,
-             2,
-             "bar"
-           )],
-          StatementsNode(96...99)(
-            [CallNode(96...99)(
-               nil,
-               nil,
-               (96...99),
-               nil,
-               nil,
-               nil,
-               nil,
-               2,
-               "baz"
-             )]
-          )
-        ),
-        WhenNode(100...114)(
-          (100...104),
-          [CallNode(105...108)(
-             nil,
-             nil,
-             (105...108),
-             nil,
-             nil,
-             nil,
-             nil,
-             2,
-             "baz"
-           )],
-          StatementsNode(111...114)(
-            [CallNode(111...114)(
-               nil,
-               nil,
-               (111...114),
-               nil,
-               nil,
-               nil,
-               nil,
-               2,
-               "bar"
-             )]
-          )
-        )],
-       nil,
-       (76...80),
-       (115...118)
-     ),
-     CaseNode(119...154)(
-       CallNode(124...127)(
-         nil,
-         nil,
-         (124...127),
-         nil,
-         nil,
-         nil,
-         nil,
-         2,
-         "foo"
-       ),
-       [WhenNode(128...150)(
-          (128...132),
-          [CallNode(133...136)(
-             nil,
-             nil,
-             (133...136),
-             nil,
-             nil,
-             nil,
-             nil,
-             2,
-             "bar"
-           ),
-           CallNode(138...141)(
-             nil,
-             nil,
-             (138...141),
-             nil,
-             nil,
-             nil,
-             nil,
-             2,
-             "baz"
-           )],
-          StatementsNode(144...150)(
-            [SymbolNode(144...150)((144...145), (145...150), nil, "other")]
-          )
-        )],
-       nil,
-       (119...123),
-       (151...154)
-     ),
-     CaseNode(155...186)(
-       CallNode(160...163)(
-         nil,
-         nil,
-         (160...163),
-         nil,
-         nil,
-         nil,
-         nil,
-         2,
-         "foo"
-       ),
-       [WhenNode(164...182)(
-          (164...168),
-          [SplatNode(169...173)(
-             (169...170),
-             CallNode(170...173)(
-               nil,
-               nil,
-               (170...173),
-               nil,
-               nil,
-               nil,
-               nil,
-               2,
-               "bar"
-             )
-           )],
-          StatementsNode(176...182)(
-            [SymbolNode(176...182)((176...177), (177...182), nil, "value")]
-          )
-        )],
-       nil,
-       (155...159),
-       (183...186)
-     ),
-     CaseNode(187...226)(
-       CallNode(192...195)(
-         nil,
-         nil,
-         (192...195),
-         nil,
-         nil,
-         nil,
-         nil,
-         2,
-         "foo"
-       ),
-       [WhenNode(196...210)(
-          (196...200),
-          [CallNode(201...204)(
-             nil,
-             nil,
-             (201...204),
-             nil,
-             nil,
-             nil,
-             nil,
-             2,
-             "bar"
-           )],
-          StatementsNode(207...210)(
-            [CallNode(207...210)(
-               nil,
-               nil,
-               (207...210),
-               nil,
-               nil,
-               nil,
-               nil,
-               2,
-               "baz"
-             )]
-          )
-        )],
-       ElseNode(211...226)(
-         (211...215),
-         StatementsNode(218...222)(
-           [SymbolNode(218...222)((218...219), (219...222), nil, "foo")]
-         ),
-         (223...226)
-       ),
-       (187...191),
-       (223...226)
-     ),
-     CaseNode(227...255)(
-       CallNode(232...235)(
-         nil,
-         nil,
-         (232...235),
-         nil,
-         nil,
-         nil,
-         nil,
-         2,
-         "foo"
-       ),
-       [WhenNode(236...251)(
-          (236...240),
-          [SplatNode(241...251)(
-             (241...242),
-             CallNode(242...251)(
-               CallNode(242...245)(
-                 nil,
-                 nil,
-                 (242...245),
-                 nil,
-                 nil,
-                 nil,
-                 nil,
-                 2,
-                 "bar"
-               ),
-               nil,
-               (246...247),
-               nil,
-               ArgumentsNode(248...251)(
-                 [CallNode(248...251)(
-                    nil,
-                    nil,
-                    (248...251),
-                    nil,
-                    nil,
-                    nil,
-                    nil,
-                    2,
-                    "baz"
-                  )]
-               ),
-               nil,
-               nil,
-               0,
-               "|"
-             )
-           )],
-          nil
-        )],
-       nil,
-       (227...231),
-       (252...255)
-     ),
-     CaseNode(256...284)(
-       CallNode(261...264)(
-         nil,
-         nil,
-         (261...264),
-         nil,
-         nil,
-         nil,
-         nil,
-         2,
-         "foo"
-       ),
-       [WhenNode(265...280)(
-          (265...269),
-          [SplatNode(270...280)(
-             (270...271),
-             CallNode(271...280)(
-               CallNode(271...274)(
-                 nil,
-                 nil,
-                 (271...274),
-                 nil,
-                 nil,
-                 nil,
-                 nil,
-                 2,
-                 "bar"
-               ),
-               (274...275),
-               (275...278),
-               nil,
-               ArgumentsNode(279...280)([IntegerNode(279...280)()]),
-               nil,
-               nil,
-               0,
-               "baz="
-             )
-           )],
-          nil
-        )],
-       nil,
-       (256...260),
-       (281...284)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/unparser/corpus/literal/class.txt b/test/yarp/snapshots/unparser/corpus/literal/class.txt
deleted file mode 100644
index cb49848ae35d70..00000000000000
--- a/test/yarp/snapshots/unparser/corpus/literal/class.txt
+++ /dev/null
@@ -1,178 +0,0 @@
-ProgramNode(0...213)(
-  [],
-  StatementsNode(0...213)(
-    [ClassNode(0...11)(
-       [],
-       (0...5),
-       ConstantReadNode(6...7)(:A),
-       nil,
-       nil,
-       nil,
-       (8...11),
-       :A,
-       :A
-     ),
-     SingletonClassNode(13...27)(
-       [],
-       (13...18),
-       (19...21),
-       CallNode(22...23)(nil, nil, (22...23), nil, nil, nil, nil, 2, "a"),
-       nil,
-       (24...27)
-     ),
-     SingletonClassNode(29...47)(
-       [],
-       (29...34),
-       (35...37),
-       CallNode(38...39)(nil, nil, (38...39), nil, nil, nil, nil, 2, "a"),
-       StatementsNode(42...43)(
-         [CallNode(42...43)(nil, nil, (42...43), nil, nil, nil, nil, 2, "b")]
-       ),
-       (44...47)
-     ),
-     ClassNode(49...63)(
-       [],
-       (49...54),
-       ConstantPathNode(55...59)(
-         ConstantReadNode(55...56)(:A),
-         ConstantReadNode(58...59)(:B),
-         (56...58)
-       ),
-       nil,
-       nil,
-       nil,
-       (60...63),
-       :B,
-       :B
-     ),
-     ClassNode(65...82)(
-       [],
-       (65...70),
-       ConstantPathNode(71...78)(
-         ConstantPathNode(71...75)(
-           ConstantReadNode(71...72)(:A),
-           ConstantReadNode(74...75)(:B),
-           (72...74)
-         ),
-         ConstantReadNode(77...78)(:C),
-         (75...77)
-       ),
-       nil,
-       nil,
-       nil,
-       (79...82),
-       :C,
-       :C
-     ),
-     ClassNode(84...99)(
-       [],
-       (84...89),
-       ConstantReadNode(90...91)(:A),
-       (92...93),
-       ConstantReadNode(94...95)(:B),
-       nil,
-       (96...99),
-       :A,
-       :A
-     ),
-     ClassNode(101...119)(
-       [],
-       (101...106),
-       ConstantReadNode(107...108)(:A),
-       (109...110),
-       ConstantPathNode(111...115)(
-         ConstantReadNode(111...112)(:B),
-         ConstantReadNode(114...115)(:C),
-         (112...114)
-       ),
-       nil,
-       (116...119),
-       :A,
-       :A
-     ),
-     ClassNode(121...142)(
-       [],
-       (121...126),
-       ConstantPathNode(127...131)(
-         ConstantReadNode(127...128)(:A),
-         ConstantReadNode(130...131)(:B),
-         (128...130)
-       ),
-       (132...133),
-       ConstantPathNode(134...138)(
-         ConstantReadNode(134...135)(:C),
-         ConstantReadNode(137...138)(:D),
-         (135...137)
-       ),
-       nil,
-       (139...142),
-       :B,
-       :B
-     ),
-     ClassNode(144...198)(
-       [],
-       (144...149),
-       ConstantReadNode(150...151)(:A),
-       nil,
-       nil,
-       StatementsNode(154...194)(
-         [CallNode(154...168)(
-            nil,
-            nil,
-            (154...161),
-            (161...162),
-            ArgumentsNode(162...167)(
-              [CallNode(162...167)(
-                 ConstantReadNode(162...163)(:B),
-                 (163...164),
-                 (164...167),
-                 nil,
-                 nil,
-                 nil,
-                 nil,
-                 0,
-                 "new"
-               )]
-            ),
-            (167...168),
-            nil,
-            0,
-            "include"
-          ),
-          DefNode(172...194)(
-            (176...179),
-            nil,
-            nil,
-            StatementsNode(184...188)(
-              [SymbolNode(184...188)((184...185), (185...188), nil, "bar")]
-            ),
-            [],
-            (172...175),
-            nil,
-            nil,
-            nil,
-            nil,
-            (191...194)
-          )]
-       ),
-       (195...198),
-       :A,
-       :A
-     ),
-     ClassNode(200...213)(
-       [],
-       (200...205),
-       ConstantPathNode(206...209)(
-         nil,
-         ConstantReadNode(208...209)(:A),
-         (206...208)
-       ),
-       nil,
-       nil,
-       nil,
-       (210...213),
-       :A,
-       :A
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/unparser/corpus/literal/control.txt b/test/yarp/snapshots/unparser/corpus/literal/control.txt
deleted file mode 100644
index 182bddab6002ee..00000000000000
--- a/test/yarp/snapshots/unparser/corpus/literal/control.txt
+++ /dev/null
@@ -1,83 +0,0 @@
-ProgramNode(0...144)(
-  [],
-  StatementsNode(0...144)(
-    [NextNode(0...4)(nil, (0...4)),
-     ReturnNode(5...11)((5...11), nil),
-     BreakNode(12...17)(nil, (12...17)),
-     RetryNode(18...23)(),
-     RedoNode(24...28)(),
-     ReturnNode(29...37)(
-       (29...35),
-       ArgumentsNode(36...37)([IntegerNode(36...37)()])
-     ),
-     ReturnNode(38...49)(
-       (38...44),
-       ArgumentsNode(45...49)([IntegerNode(45...46)(), IntegerNode(48...49)()])
-     ),
-     ReturnNode(50...69)(
-       (50...56),
-       ArgumentsNode(57...69)(
-         [IfNode(57...69)(
-            nil,
-            TrueNode(57...61)(),
-            StatementsNode(64...65)([IntegerNode(64...65)()]),
-            ElseNode(66...69)(
-              (66...67),
-              StatementsNode(68...69)([IntegerNode(68...69)()]),
-              nil
-            ),
-            nil
-          )]
-       )
-     ),
-     BreakNode(70...88)(
-       ArgumentsNode(76...88)(
-         [IfNode(76...88)(
-            nil,
-            TrueNode(76...80)(),
-            StatementsNode(83...84)([IntegerNode(83...84)()]),
-            ElseNode(85...88)(
-              (85...86),
-              StatementsNode(87...88)([IntegerNode(87...88)()]),
-              nil
-            ),
-            nil
-          )]
-       ),
-       (70...75)
-     ),
-     NextNode(89...106)(
-       ArgumentsNode(94...106)(
-         [IfNode(94...106)(
-            nil,
-            TrueNode(94...98)(),
-            StatementsNode(101...102)([IntegerNode(101...102)()]),
-            ElseNode(103...106)(
-              (103...104),
-              StatementsNode(105...106)([IntegerNode(105...106)()]),
-              nil
-            ),
-            nil
-          )]
-       ),
-       (89...93)
-     ),
-     ReturnNode(107...144)(
-       (107...113),
-       ArgumentsNode(114...144)(
-         [TrueNode(114...118)(),
-          IfNode(120...144)(
-            (120...122),
-            TrueNode(123...127)(),
-            StatementsNode(130...131)([IntegerNode(130...131)()]),
-            ElseNode(132...144)(
-              (132...136),
-              StatementsNode(139...140)([IntegerNode(139...140)()]),
-              (141...144)
-            ),
-            (141...144)
-          )]
-       )
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/unparser/corpus/literal/def.txt b/test/yarp/snapshots/unparser/corpus/literal/def.txt
deleted file mode 100644
index f458483791f2a4..00000000000000
--- a/test/yarp/snapshots/unparser/corpus/literal/def.txt
+++ /dev/null
@@ -1,1019 +0,0 @@
-ProgramNode(0...913)(
-  [],
-  StatementsNode(0...913)(
-    [DefNode(0...46)(
-       (4...7),
-       nil,
-       nil,
-       BeginNode(10...46)(
-         nil,
-         StatementsNode(10...11)(
-           [CallNode(10...11)(nil, nil, (10...11), nil, nil, nil, nil, 2, "a")]
-         ),
-         RescueNode(12...22)(
-           (12...18),
-           [],
-           nil,
-           nil,
-           StatementsNode(21...22)(
-             [CallNode(21...22)(
-                nil,
-                nil,
-                (21...22),
-                nil,
-                nil,
-                nil,
-                nil,
-                2,
-                "b"
-              )]
-           ),
-           nil
-         ),
-         ElseNode(23...38)(
-           (23...27),
-           StatementsNode(30...31)(
-             [CallNode(30...31)(
-                nil,
-                nil,
-                (30...31),
-                nil,
-                nil,
-                nil,
-                nil,
-                2,
-                "c"
-              )]
-           ),
-           (32...38)
-         ),
-         EnsureNode(32...46)(
-           (32...38),
-           StatementsNode(41...42)(
-             [CallNode(41...42)(
-                nil,
-                nil,
-                (41...42),
-                nil,
-                nil,
-                nil,
-                nil,
-                2,
-                "d"
-              )]
-           ),
-           (43...46)
-         ),
-         (43...46)
-       ),
-       [],
-       (0...3),
-       nil,
-       nil,
-       nil,
-       nil,
-       (43...46)
-     ),
-     DefNode(48...103)(
-       (52...55),
-       nil,
-       nil,
-       BeginNode(58...103)(
-         nil,
-         StatementsNode(58...68)(
-           [RescueModifierNode(58...68)(
-              CallNode(58...59)(
-                nil,
-                nil,
-                (58...59),
-                nil,
-                nil,
-                nil,
-                nil,
-                2,
-                "a"
-              ),
-              (60...66),
-              CallNode(67...68)(
-                nil,
-                nil,
-                (67...68),
-                nil,
-                nil,
-                nil,
-                nil,
-                2,
-                "b"
-              )
-            )]
-         ),
-         RescueNode(69...79)(
-           (69...75),
-           [],
-           nil,
-           nil,
-           StatementsNode(78...79)(
-             [CallNode(78...79)(
-                nil,
-                nil,
-                (78...79),
-                nil,
-                nil,
-                nil,
-                nil,
-                2,
-                "b"
-              )]
-           ),
-           nil
-         ),
-         ElseNode(80...95)(
-           (80...84),
-           StatementsNode(87...88)(
-             [CallNode(87...88)(
-                nil,
-                nil,
-                (87...88),
-                nil,
-                nil,
-                nil,
-                nil,
-                2,
-                "c"
-              )]
-           ),
-           (89...95)
-         ),
-         EnsureNode(89...103)(
-           (89...95),
-           StatementsNode(98...99)(
-             [CallNode(98...99)(
-                nil,
-                nil,
-                (98...99),
-                nil,
-                nil,
-                nil,
-                nil,
-                2,
-                "d"
-              )]
-           ),
-           (100...103)
-         ),
-         (100...103)
-       ),
-       [],
-       (48...51),
-       nil,
-       nil,
-       nil,
-       nil,
-       (100...103)
-     ),
-     DefNode(105...128)(
-       (109...112),
-       nil,
-       ParametersNode(113...123)(
-         [],
-         [],
-         [],
-         nil,
-         [KeywordParameterNode(113...117)((113...117), nil),
-          KeywordParameterNode(119...123)((119...123), nil)],
-         nil,
-         nil
-       ),
-       nil,
-       [:bar, :baz],
-       (105...108),
-       nil,
-       (112...113),
-       (123...124),
-       nil,
-       (125...128)
-     ),
-     DefNode(130...141)(
-       (134...137),
-       nil,
-       nil,
-       nil,
-       [],
-       (130...133),
-       nil,
-       nil,
-       nil,
-       nil,
-       (138...141)
-     ),
-     DefNode(143...160)(
-       (147...150),
-       nil,
-       nil,
-       StatementsNode(153...156)(
-         [CallNode(153...156)(
-            nil,
-            nil,
-            (153...156),
-            nil,
-            nil,
-            nil,
-            nil,
-            2,
-            "bar"
-          )]
-       ),
-       [],
-       (143...146),
-       nil,
-       nil,
-       nil,
-       nil,
-       (157...160)
-     ),
-     DefNode(162...205)(
-       (166...169),
-       nil,
-       nil,
-       BeginNode(172...205)(
-         nil,
-         StatementsNode(172...175)(
-           [CallNode(172...175)(
-              nil,
-              nil,
-              (172...175),
-              nil,
-              nil,
-              nil,
-              nil,
-              2,
-              "foo"
-            )]
-         ),
-         RescueNode(176...188)(
-           (176...182),
-           [],
-           nil,
-           nil,
-           StatementsNode(185...188)(
-             [CallNode(185...188)(
-                nil,
-                nil,
-                (185...188),
-                nil,
-                nil,
-                nil,
-                nil,
-                2,
-                "bar"
-              )]
-           ),
-           nil
-         ),
-         nil,
-         EnsureNode(189...205)(
-           (189...195),
-           StatementsNode(198...201)(
-             [CallNode(198...201)(
-                nil,
-                nil,
-                (198...201),
-                nil,
-                nil,
-                nil,
-                nil,
-                2,
-                "baz"
-              )]
-           ),
-           (202...205)
-         ),
-         (202...205)
-       ),
-       [],
-       (162...165),
-       nil,
-       nil,
-       nil,
-       nil,
-       (202...205)
-     ),
-     DefNode(207...237)(
-       (211...214),
-       nil,
-       nil,
-       BeginNode(217...237)(
-         nil,
-         StatementsNode(217...220)(
-           [CallNode(217...220)(
-              nil,
-              nil,
-              (217...220),
-              nil,
-              nil,
-              nil,
-              nil,
-              2,
-              "bar"
-            )]
-         ),
-         nil,
-         nil,
-         EnsureNode(221...237)(
-           (221...227),
-           StatementsNode(230...233)(
-             [CallNode(230...233)(
-                nil,
-                nil,
-                (230...233),
-                nil,
-                nil,
-                nil,
-                nil,
-                2,
-                "baz"
-              )]
-           ),
-           (234...237)
-         ),
-         (234...237)
-       ),
-       [],
-       (207...210),
-       nil,
-       nil,
-       nil,
-       nil,
-       (234...237)
-     ),
-     DefNode(239...269)(
-       (243...246),
-       nil,
-       nil,
-       BeginNode(249...269)(
-         nil,
-         StatementsNode(249...252)(
-           [CallNode(249...252)(
-              nil,
-              nil,
-              (249...252),
-              nil,
-              nil,
-              nil,
-              nil,
-              2,
-              "bar"
-            )]
-         ),
-         RescueNode(253...265)(
-           (253...259),
-           [],
-           nil,
-           nil,
-           StatementsNode(262...265)(
-             [CallNode(262...265)(
-                nil,
-                nil,
-                (262...265),
-                nil,
-                nil,
-                nil,
-                nil,
-                2,
-                "baz"
-              )]
-           ),
-           nil
-         ),
-         nil,
-         nil,
-         (266...269)
-       ),
-       [],
-       (239...242),
-       nil,
-       nil,
-       nil,
-       nil,
-       (266...269)
-     ),
-     DefNode(271...293)(
-       (275...278),
-       nil,
-       ParametersNode(279...282)(
-         [RequiredParameterNode(279...282)(:bar)],
-         [],
-         [],
-         nil,
-         [],
-         nil,
-         nil
-       ),
-       StatementsNode(286...289)([LocalVariableReadNode(286...289)(:bar, 0)]),
-       [:bar],
-       (271...274),
-       nil,
-       (278...279),
-       (282...283),
-       nil,
-       (290...293)
-     ),
-     DefNode(295...322)(
-       (299...302),
-       nil,
-       ParametersNode(303...311)(
-         [RequiredParameterNode(303...306)(:bar),
-          RequiredParameterNode(308...311)(:baz)],
-         [],
-         [],
-         nil,
-         [],
-         nil,
-         nil
-       ),
-       StatementsNode(315...318)([LocalVariableReadNode(315...318)(:bar, 0)]),
-       [:bar, :baz],
-       (295...298),
-       nil,
-       (302...303),
-       (311...312),
-       nil,
-       (319...322)
-     ),
-     DefNode(324...351)(
-       (328...331),
-       nil,
-       ParametersNode(332...340)(
-         [],
-         [OptionalParameterNode(332...340)(
-            :bar,
-            (332...335),
-            (336...337),
-            ParenthesesNode(338...340)(nil, (338...339), (339...340))
-          )],
-         [],
-         nil,
-         [],
-         nil,
-         nil
-       ),
-       StatementsNode(344...347)([LocalVariableReadNode(344...347)(:bar, 0)]),
-       [:bar],
-       (324...327),
-       nil,
-       (331...332),
-       (340...341),
-       nil,
-       (348...351)
-     ),
-     DefNode(353...382)(
-       (357...360),
-       nil,
-       ParametersNode(361...377)(
-         [],
-         [OptionalParameterNode(361...377)(
-            :bar,
-            (361...364),
-            (365...366),
-            ParenthesesNode(367...377)(
-              StatementsNode(368...376)(
-                [CallNode(368...371)(
-                   nil,
-                   nil,
-                   (368...371),
-                   nil,
-                   nil,
-                   nil,
-                   nil,
-                   2,
-                   "baz"
-                 ),
-                 NilNode(373...376)()]
-              ),
-              (367...368),
-              (376...377)
-            )
-          )],
-         [],
-         nil,
-         [],
-         nil,
-         nil
-       ),
-       nil,
-       [:bar],
-       (353...356),
-       nil,
-       (360...361),
-       (377...378),
-       nil,
-       (379...382)
-     ),
-     DefNode(384...413)(
-       (388...391),
-       nil,
-       ParametersNode(392...402)(
-         [],
-         [OptionalParameterNode(392...402)(
-            :bar,
-            (392...395),
-            (396...397),
-            TrueNode(398...402)()
-          )],
-         [],
-         nil,
-         [],
-         nil,
-         nil
-       ),
-       StatementsNode(406...409)([LocalVariableReadNode(406...409)(:bar, 0)]),
-       [:bar],
-       (384...387),
-       nil,
-       (391...392),
-       (402...403),
-       nil,
-       (410...413)
-     ),
-     DefNode(415...449)(
-       (419...422),
-       nil,
-       ParametersNode(423...438)(
-         [RequiredParameterNode(423...426)(:bar)],
-         [OptionalParameterNode(428...438)(
-            :baz,
-            (428...431),
-            (432...433),
-            TrueNode(434...438)()
-          )],
-         [],
-         nil,
-         [],
-         nil,
-         nil
-       ),
-       StatementsNode(442...445)([LocalVariableReadNode(442...445)(:bar, 0)]),
-       [:bar, :baz],
-       (415...418),
-       nil,
-       (422...423),
-       (438...439),
-       nil,
-       (446...449)
-     ),
-     DefNode(451...470)(
-       (455...458),
-       nil,
-       ParametersNode(459...465)(
-         [],
-         [],
-         [],
-         nil,
-         [KeywordParameterNode(459...465)(
-            (459...463),
-            IntegerNode(464...465)()
-          )],
-         nil,
-         nil
-       ),
-       nil,
-       [:bar],
-       (451...454),
-       nil,
-       (458...459),
-       (465...466),
-       nil,
-       (467...470)
-     ),
-     DefNode(472...493)(
-       (476...479),
-       nil,
-       ParametersNode(480...488)(
-         [],
-         [],
-         [],
-         nil,
-         [KeywordParameterNode(480...488)(
-            (480...484),
-            CallNode(485...488)(
-              nil,
-              nil,
-              (485...488),
-              nil,
-              nil,
-              nil,
-              nil,
-              2,
-              "baz"
-            )
-          )],
-         nil,
-         nil
-       ),
-       nil,
-       [:bar],
-       (472...475),
-       nil,
-       (479...480),
-       (488...489),
-       nil,
-       (490...493)
-     ),
-     DefNode(495...518)(
-       (499...502),
-       nil,
-       ParametersNode(503...513)(
-         [],
-         [],
-         [],
-         nil,
-         [KeywordParameterNode(503...513)(
-            (503...507),
-            CallNode(508...513)(
-              nil,
-              nil,
-              (508...511),
-              (511...512),
-              nil,
-              (512...513),
-              nil,
-              0,
-              "bar"
-            )
-          )],
-         nil,
-         nil
-       ),
-       nil,
-       [:bar],
-       (495...498),
-       nil,
-       (502...503),
-       (513...514),
-       nil,
-       (515...518)
-     ),
-     DefNode(520...540)(
-       (524...527),
-       nil,
-       ParametersNode(528...529)(
-         [],
-         [],
-         [],
-         RestParameterNode(528...529)((528...529), nil),
-         [],
-         nil,
-         nil
-       ),
-       StatementsNode(533...536)(
-         [CallNode(533...536)(
-            nil,
-            nil,
-            (533...536),
-            nil,
-            nil,
-            nil,
-            nil,
-            2,
-            "bar"
-          )]
-       ),
-       [:*],
-       (520...523),
-       nil,
-       (527...528),
-       (529...530),
-       nil,
-       (537...540)
-     ),
-     DefNode(542...565)(
-       (546...549),
-       nil,
-       ParametersNode(550...554)(
-         [],
-         [],
-         [],
-         RestParameterNode(550...554)((550...551), (551...554)),
-         [],
-         nil,
-         nil
-       ),
-       StatementsNode(558...561)([LocalVariableReadNode(558...561)(:bar, 0)]),
-       [:bar],
-       (542...545),
-       nil,
-       (549...550),
-       (554...555),
-       nil,
-       (562...565)
-     ),
-     DefNode(567...595)(
-       (571...574),
-       nil,
-       ParametersNode(575...584)(
-         [RequiredParameterNode(575...578)(:bar)],
-         [],
-         [],
-         RestParameterNode(580...584)((580...581), (581...584)),
-         [],
-         nil,
-         nil
-       ),
-       StatementsNode(588...591)([LocalVariableReadNode(588...591)(:bar, 0)]),
-       [:bar, :baz],
-       (567...570),
-       nil,
-       (574...575),
-       (584...585),
-       nil,
-       (592...595)
-     ),
-     DefNode(597...632)(
-       (601...604),
-       nil,
-       ParametersNode(605...621)(
-         [],
-         [OptionalParameterNode(605...615)(
-            :baz,
-            (605...608),
-            (609...610),
-            TrueNode(611...615)()
-          )],
-         [],
-         RestParameterNode(617...621)((617...618), (618...621)),
-         [],
-         nil,
-         nil
-       ),
-       StatementsNode(625...628)(
-         [CallNode(625...628)(
-            nil,
-            nil,
-            (625...628),
-            nil,
-            nil,
-            nil,
-            nil,
-            2,
-            "bar"
-          )]
-       ),
-       [:baz, :bor],
-       (597...600),
-       nil,
-       (604...605),
-       (621...622),
-       nil,
-       (629...632)
-     ),
-     DefNode(634...677)(
-       (638...641),
-       nil,
-       ParametersNode(642...666)(
-         [],
-         [OptionalParameterNode(642...652)(
-            :baz,
-            (642...645),
-            (646...647),
-            TrueNode(648...652)()
-          )],
-         [],
-         RestParameterNode(654...658)((654...655), (655...658)),
-         [],
-         nil,
-         BlockParameterNode(660...666)(:block, (661...666), (660...661))
-       ),
-       StatementsNode(670...673)(
-         [CallNode(670...673)(
-            nil,
-            nil,
-            (670...673),
-            nil,
-            nil,
-            nil,
-            nil,
-            2,
-            "bar"
-          )]
-       ),
-       [:baz, :bor, :block],
-       (634...637),
-       nil,
-       (641...642),
-       (666...667),
-       nil,
-       (674...677)
-     ),
-     DefNode(679...719)(
-       (683...686),
-       nil,
-       ParametersNode(687...708)(
-         [RequiredParameterNode(687...690)(:bar)],
-         [OptionalParameterNode(692...702)(
-            :baz,
-            (692...695),
-            (696...697),
-            TrueNode(698...702)()
-          )],
-         [],
-         RestParameterNode(704...708)((704...705), (705...708)),
-         [],
-         nil,
-         nil
-       ),
-       StatementsNode(712...715)([LocalVariableReadNode(712...715)(:bar, 0)]),
-       [:bar, :baz, :bor],
-       (679...682),
-       nil,
-       (686...687),
-       (708...709),
-       nil,
-       (716...719)
-     ),
-     DefNode(721...746)(
-       (725...728),
-       nil,
-       ParametersNode(729...735)(
-         [],
-         [],
-         [],
-         nil,
-         [],
-         nil,
-         BlockParameterNode(729...735)(:block, (730...735), (729...730))
-       ),
-       StatementsNode(739...742)(
-         [CallNode(739...742)(
-            nil,
-            nil,
-            (739...742),
-            nil,
-            nil,
-            nil,
-            nil,
-            2,
-            "bar"
-          )]
-       ),
-       [:block],
-       (721...724),
-       nil,
-       (728...729),
-       (735...736),
-       nil,
-       (743...746)
-     ),
-     DefNode(748...778)(
-       (752...755),
-       nil,
-       ParametersNode(756...767)(
-         [RequiredParameterNode(756...759)(:bar)],
-         [],
-         [],
-         nil,
-         [],
-         nil,
-         BlockParameterNode(761...767)(:block, (762...767), (761...762))
-       ),
-       StatementsNode(771...774)([LocalVariableReadNode(771...774)(:bar, 0)]),
-       [:bar, :block],
-       (748...751),
-       nil,
-       (755...756),
-       (767...768),
-       nil,
-       (775...778)
-     ),
-     DefNode(780...803)(
-       (784...787),
-       nil,
-       nil,
-       StatementsNode(790...799)(
-         [CallNode(790...793)(
-            nil,
-            nil,
-            (790...793),
-            nil,
-            nil,
-            nil,
-            nil,
-            2,
-            "bar"
-          ),
-          CallNode(796...799)(
-            nil,
-            nil,
-            (796...799),
-            nil,
-            nil,
-            nil,
-            nil,
-            2,
-            "baz"
-          )]
-       ),
-       [],
-       (780...783),
-       nil,
-       nil,
-       nil,
-       nil,
-       (800...803)
-     ),
-     DefNode(805...821)(
-       (809...810),
-       nil,
-       ParametersNode(811...816)(
-         [RequiredDestructuredParameterNode(811...816)(
-            [RequiredDestructuredParameterNode(812...815)(
-               [RequiredParameterNode(813...814)(:a)],
-               (812...813),
-               (814...815)
-             )],
-            (811...812),
-            (815...816)
-          )],
-         [],
-         [],
-         nil,
-         [],
-         nil,
-         nil
-       ),
-       nil,
-       [:a],
-       (805...808),
-       nil,
-       (810...811),
-       (816...817),
-       nil,
-       (818...821)
-     ),
-     DefNode(823...854)(
-       (827...830),
-       nil,
-       ParametersNode(831...849)(
-         [],
-         [],
-         [],
-         nil,
-         [KeywordParameterNode(831...835)((831...835), nil),
-          KeywordParameterNode(837...849)(
-            (837...841),
-            StringNode(842...849)(
-              (842...843),
-              (843...848),
-              (848...849),
-              "value"
-            )
-          )],
-         nil,
-         nil
-       ),
-       nil,
-       [:bar, :baz],
-       (823...826),
-       nil,
-       (830...831),
-       (849...850),
-       nil,
-       (851...854)
-     ),
-     DefNode(856...896)(
-       (860...861),
-       nil,
-       nil,
-       StatementsNode(864...874)(
-         [InterpolatedStringNode(864...874)(
-            (864...874),
-            [StringNode(875...879)(nil, (875...879), nil, "    "),
-             EmbeddedStatementsNode(879...882)((879...881), nil, (881...882)),
-             StringNode(882...883)(nil, (882...883), nil, "\n")],
-            (883...893)
-          )]
-       ),
-       [],
-       (856...859),
-       nil,
-       nil,
-       nil,
-       nil,
-       (893...896)
-     ),
-     DefNode(898...913)(
-       (902...903),
-       nil,
-       nil,
-       StatementsNode(906...909)(
-         [StringNode(906...909)((906...908), (908...908), (908...909), "")]
-       ),
-       [],
-       (898...901),
-       nil,
-       nil,
-       nil,
-       nil,
-       (910...913)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/unparser/corpus/literal/defined.txt b/test/yarp/snapshots/unparser/corpus/literal/defined.txt
deleted file mode 100644
index 8e77e8e5df9a68..00000000000000
--- a/test/yarp/snapshots/unparser/corpus/literal/defined.txt
+++ /dev/null
@@ -1,40 +0,0 @@
-ProgramNode(0...56)(
-  [:a, :b],
-  StatementsNode(0...56)(
-    [DefinedNode(0...14)(
-       (8...9),
-       InstanceVariableReadNode(9...13)(:@foo),
-       (13...14),
-       (0...8)
-     ),
-     DefinedNode(15...28)(
-       (23...24),
-       ConstantReadNode(24...27)(:Foo),
-       (27...28),
-       (15...23)
-     ),
-     DefinedNode(29...56)(
-       (37...38),
-       ParenthesesNode(38...55)(
-         StatementsNode(39...54)(
-           [MultiWriteNode(39...54)(
-              [LocalVariableTargetNode(40...41)(:a, 0),
-               LocalVariableTargetNode(43...44)(:b, 0)],
-              (46...47),
-              ArrayNode(48...54)(
-                [IntegerNode(49...50)(), IntegerNode(52...53)()],
-                (48...49),
-                (53...54)
-              ),
-              (39...40),
-              (44...45)
-            )]
-         ),
-         (38...39),
-         (54...55)
-       ),
-       (55...56),
-       (29...37)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/unparser/corpus/literal/defs.txt b/test/yarp/snapshots/unparser/corpus/literal/defs.txt
deleted file mode 100644
index 0d18f430af83f9..00000000000000
--- a/test/yarp/snapshots/unparser/corpus/literal/defs.txt
+++ /dev/null
@@ -1,297 +0,0 @@
-ProgramNode(0...266)(
-  [],
-  StatementsNode(0...266)(
-    [DefNode(0...16)(
-       (9...12),
-       SelfNode(4...8)(),
-       nil,
-       nil,
-       [],
-       (0...3),
-       (8...9),
-       nil,
-       nil,
-       nil,
-       (13...16)
-     ),
-     DefNode(18...40)(
-       (27...30),
-       SelfNode(22...26)(),
-       nil,
-       StatementsNode(33...36)(
-         [CallNode(33...36)(nil, nil, (33...36), nil, nil, nil, nil, 2, "bar")]
-       ),
-       [],
-       (18...21),
-       (26...27),
-       nil,
-       nil,
-       nil,
-       (37...40)
-     ),
-     DefNode(42...70)(
-       (51...54),
-       SelfNode(46...50)(),
-       nil,
-       StatementsNode(57...66)(
-         [CallNode(57...60)(nil, nil, (57...60), nil, nil, nil, nil, 2, "bar"),
-          CallNode(63...66)(nil, nil, (63...66), nil, nil, nil, nil, 2, "baz")]
-       ),
-       [],
-       (42...45),
-       (50...51),
-       nil,
-       nil,
-       nil,
-       (67...70)
-     ),
-     DefNode(72...93)(
-       (80...83),
-       ConstantReadNode(76...79)(:Foo),
-       nil,
-       StatementsNode(86...89)(
-         [CallNode(86...89)(nil, nil, (86...89), nil, nil, nil, nil, 2, "bar")]
-       ),
-       [],
-       (72...75),
-       (79...80),
-       nil,
-       nil,
-       nil,
-       (90...93)
-     ),
-     DefNode(95...128)(
-       (115...118),
-       ParenthesesNode(99...114)(
-         CallNode(100...113)(
-           nil,
-           nil,
-           (100...103),
-           nil,
-           nil,
-           nil,
-           BlockNode(104...113)(
-             [:bar],
-             BlockParametersNode(106...111)(
-               ParametersNode(107...110)(
-                 [RequiredParameterNode(107...110)(:bar)],
-                 [],
-                 [],
-                 nil,
-                 [],
-                 nil,
-                 nil
-               ),
-               [],
-               (106...107),
-               (110...111)
-             ),
-             nil,
-             (104...105),
-             (112...113)
-           ),
-           0,
-           "foo"
-         ),
-         (99...100),
-         (113...114)
-       ),
-       nil,
-       StatementsNode(121...124)(
-         [CallNode(121...124)(
-            nil,
-            nil,
-            (121...124),
-            nil,
-            nil,
-            nil,
-            nil,
-            2,
-            "bar"
-          )]
-       ),
-       [],
-       (95...98),
-       (114...115),
-       nil,
-       nil,
-       nil,
-       (125...128)
-     ),
-     DefNode(130...156)(
-       (143...146),
-       ParenthesesNode(134...142)(
-         CallNode(135...141)(
-           nil,
-           nil,
-           (135...138),
-           (138...139),
-           ArgumentsNode(139...140)([IntegerNode(139...140)()]),
-           (140...141),
-           nil,
-           0,
-           "foo"
-         ),
-         (134...135),
-         (141...142)
-       ),
-       nil,
-       StatementsNode(149...152)(
-         [CallNode(149...152)(
-            nil,
-            nil,
-            (149...152),
-            nil,
-            nil,
-            nil,
-            nil,
-            2,
-            "bar"
-          )]
-       ),
-       [],
-       (130...133),
-       (142...143),
-       nil,
-       nil,
-       nil,
-       (153...156)
-     ),
-     DefNode(158...190)(
-       (177...180),
-       ParenthesesNode(162...176)(
-         CallNode(163...175)(
-           ConstantPathNode(163...171)(
-             ConstantReadNode(163...166)(:Foo),
-             ConstantReadNode(168...171)(:Bar),
-             (166...168)
-           ),
-           (171...172),
-           (172...175),
-           nil,
-           nil,
-           nil,
-           nil,
-           0,
-           "baz"
-         ),
-         (162...163),
-         (175...176)
-       ),
-       nil,
-       StatementsNode(183...186)(
-         [CallNode(183...186)(
-            nil,
-            nil,
-            (183...186),
-            nil,
-            nil,
-            nil,
-            nil,
-            2,
-            "baz"
-          )]
-       ),
-       [],
-       (158...161),
-       (176...177),
-       nil,
-       nil,
-       nil,
-       (187...190)
-     ),
-     DefNode(192...220)(
-       (207...210),
-       ParenthesesNode(196...206)(
-         ConstantPathNode(197...205)(
-           ConstantReadNode(197...200)(:Foo),
-           ConstantReadNode(202...205)(:Bar),
-           (200...202)
-         ),
-         (196...197),
-         (205...206)
-       ),
-       nil,
-       StatementsNode(213...216)(
-         [CallNode(213...216)(
-            nil,
-            nil,
-            (213...216),
-            nil,
-            nil,
-            nil,
-            nil,
-            2,
-            "baz"
-          )]
-       ),
-       [],
-       (192...195),
-       (206...207),
-       nil,
-       nil,
-       nil,
-       (217...220)
-     ),
-     DefNode(222...243)(
-       (230...233),
-       ConstantReadNode(226...229)(:Foo),
-       nil,
-       StatementsNode(236...239)(
-         [CallNode(236...239)(
-            nil,
-            nil,
-            (236...239),
-            nil,
-            nil,
-            nil,
-            nil,
-            2,
-            "baz"
-          )]
-       ),
-       [],
-       (222...225),
-       (229...230),
-       nil,
-       nil,
-       nil,
-       (240...243)
-     ),
-     DefNode(245...266)(
-       (253...256),
-       CallNode(249...252)(
-         nil,
-         nil,
-         (249...252),
-         nil,
-         nil,
-         nil,
-         nil,
-         2,
-         "foo"
-       ),
-       nil,
-       StatementsNode(259...262)(
-         [CallNode(259...262)(
-            nil,
-            nil,
-            (259...262),
-            nil,
-            nil,
-            nil,
-            nil,
-            2,
-            "baz"
-          )]
-       ),
-       [],
-       (245...248),
-       (252...253),
-       nil,
-       nil,
-       nil,
-       (263...266)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/unparser/corpus/literal/dstr.txt b/test/yarp/snapshots/unparser/corpus/literal/dstr.txt
deleted file mode 100644
index 369e1491e524b0..00000000000000
--- a/test/yarp/snapshots/unparser/corpus/literal/dstr.txt
+++ /dev/null
@@ -1,205 +0,0 @@
-ProgramNode(0...299)(
-  [],
-  StatementsNode(0...299)(
-    [IfNode(0...20)(
-       (0...2),
-       TrueNode(3...7)(),
-       StatementsNode(10...16)(
-         [InterpolatedStringNode(10...16)(
-            (10...11),
-            [EmbeddedStatementsNode(11...14)((11...13), nil, (13...14)),
-             StringNode(14...15)(nil, (14...15), nil, "a")],
-            (15...16)
-          )]
-       ),
-       nil,
-       (17...20)
-     ),
-     IfNode(21...68)(
-       (21...23),
-       TrueNode(24...28)(),
-       StatementsNode(31...64)(
-         [InterpolatedStringNode(31...41)(
-            (31...41),
-            [StringNode(42...44)(nil, (42...44), nil, "a\n"),
-             EmbeddedStatementsNode(44...47)((44...46), nil, (46...47)),
-             StringNode(47...51)(nil, (47...51), nil, "a\n" + "b\n")],
-            (51...61)
-          ),
-          CallNode(63...64)(nil, nil, (63...64), nil, nil, nil, nil, 2, "x")]
-       ),
-       nil,
-       (65...68)
-     ),
-     InterpolatedStringNode(69...79)(
-       (69...79),
-       [StringNode(80...89)(nil, (80...89), nil, "\#{}\#{}\n"),
-        EmbeddedStatementsNode(89...92)((89...91), nil, (91...92)),
-        StringNode(92...93)(nil, (92...93), nil, "\n"),
-        EmbeddedStatementsNode(93...96)((93...95), nil, (95...96)),
-        StringNode(96...97)(nil, (96...97), nil, "\n"),
-        EmbeddedStatementsNode(97...100)((97...99), nil, (99...100)),
-        StringNode(100...101)(nil, (100...101), nil, "\n")],
-       (101...109)
-     ),
-     RescueModifierNode(109...130)(
-       InterpolatedStringNode(109...119)(
-         (109...119),
-         [EmbeddedStatementsNode(131...134)((131...133), nil, (133...134)),
-          StringNode(134...137)(nil, (134...137), nil, "\n" + "a\n")],
-         (137...145)
-       ),
-       (120...126),
-       NilNode(127...130)()
-     ),
-     InterpolatedStringNode(145...151)(
-       (145...146),
-       [StringNode(146...147)(nil, (146...147), nil, "a"),
-        EmbeddedVariableNode(147...150)(
-          (147...148),
-          NumberedReferenceReadNode(148...150)(1)
-        )],
-       (150...151)
-     ),
-     InterpolatedStringNode(152...158)(
-       (152...153),
-       [StringNode(153...154)(nil, (153...154), nil, "a"),
-        EmbeddedVariableNode(154...157)(
-          (154...155),
-          GlobalVariableReadNode(155...157)(:$a)
-        )],
-       (157...158)
-     ),
-     InterpolatedStringNode(159...165)(
-       (159...160),
-       [StringNode(160...161)(nil, (160...161), nil, "a"),
-        EmbeddedVariableNode(161...164)(
-          (161...162),
-          InstanceVariableReadNode(162...164)(:@a)
-        )],
-       (164...165)
-     ),
-     InterpolatedStringNode(166...173)(
-       (166...167),
-       [StringNode(167...168)(nil, (167...168), nil, "a"),
-        EmbeddedVariableNode(168...172)(
-          (168...169),
-          ClassVariableReadNode(169...172)(:@@a)
-        )],
-       (172...173)
-     ),
-     IfNode(174...225)(
-       (174...176),
-       TrueNode(177...181)(),
-       StatementsNode(184...201)(
-         [ReturnNode(184...201)(
-            (184...190),
-            ArgumentsNode(191...201)(
-              [InterpolatedStringNode(191...201)(
-                 (191...201),
-                 [StringNode(202...206)(nil, (202...206), nil, "    "),
-                  EmbeddedStatementsNode(206...211)(
-                    (206...208),
-                    StatementsNode(208...210)([IntegerNode(208...210)()]),
-                    (210...211)
-                  ),
-                  StringNode(211...212)(nil, (211...212), nil, "\n")],
-                 (212...222)
-               )]
-            )
-          )]
-       ),
-       nil,
-       (222...225)
-     ),
-     CallNode(226...241)(
-       nil,
-       nil,
-       (226...229),
-       (229...230),
-       ArgumentsNode(230...240)(
-         [InterpolatedStringNode(230...240)(
-            (230...240),
-            [StringNode(242...244)(nil, (242...244), nil, "  "),
-             EmbeddedStatementsNode(244...250)(
-               (244...246),
-               StatementsNode(246...249)(
-                 [CallNode(246...249)(
-                    nil,
-                    nil,
-                    (246...249),
-                    nil,
-                    nil,
-                    nil,
-                    nil,
-                    2,
-                    "bar"
-                  )]
-               ),
-               (249...250)
-             ),
-             StringNode(250...251)(nil, (250...251), nil, "\n")],
-            (251...259)
-          )]
-       ),
-       (240...241),
-       nil,
-       0,
-       "foo"
-     ),
-     CallNode(259...299)(
-       nil,
-       nil,
-       (259...262),
-       (262...263),
-       ArgumentsNode(263...273)(
-         [InterpolatedStringNode(263...273)(
-            (263...273),
-            [StringNode(281...283)(nil, (281...283), nil, "  "),
-             EmbeddedStatementsNode(283...289)(
-               (283...285),
-               StatementsNode(285...288)(
-                 [CallNode(285...288)(
-                    nil,
-                    nil,
-                    (285...288),
-                    nil,
-                    nil,
-                    nil,
-                    nil,
-                    2,
-                    "bar"
-                  )]
-               ),
-               (288...289)
-             ),
-             StringNode(289...290)(nil, (289...290), nil, "\n")],
-            (290...298)
-          )]
-       ),
-       (273...274),
-       BlockNode(275...299)(
-         [:x],
-         BlockParametersNode(277...280)(
-           ParametersNode(278...279)(
-             [RequiredParameterNode(278...279)(:x)],
-             [],
-             [],
-             nil,
-             [],
-             nil,
-             nil
-           ),
-           [],
-           (277...278),
-           (279...280)
-         ),
-         nil,
-         (275...276),
-         (298...299)
-       ),
-       0,
-       "foo"
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/unparser/corpus/literal/empty.txt b/test/yarp/snapshots/unparser/corpus/literal/empty.txt
deleted file mode 100644
index bd3eaf5ff49bc2..00000000000000
--- a/test/yarp/snapshots/unparser/corpus/literal/empty.txt
+++ /dev/null
@@ -1 +0,0 @@
-ProgramNode(0...0)([], StatementsNode(0...0)([]))
diff --git a/test/yarp/snapshots/unparser/corpus/literal/empty_begin.txt b/test/yarp/snapshots/unparser/corpus/literal/empty_begin.txt
deleted file mode 100644
index d998f704cfd2c5..00000000000000
--- a/test/yarp/snapshots/unparser/corpus/literal/empty_begin.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-ProgramNode(0...2)(
-  [],
-  StatementsNode(0...2)([ParenthesesNode(0...2)(nil, (0...1), (1...2))])
-)
diff --git a/test/yarp/snapshots/unparser/corpus/literal/flipflop.txt b/test/yarp/snapshots/unparser/corpus/literal/flipflop.txt
deleted file mode 100644
index b08835a4c37ad1..00000000000000
--- a/test/yarp/snapshots/unparser/corpus/literal/flipflop.txt
+++ /dev/null
@@ -1,149 +0,0 @@
-ProgramNode(0...68)(
-  [],
-  StatementsNode(0...68)(
-    [IfNode(0...33)(
-       (0...2),
-       ParenthesesNode(3...23)(
-         StatementsNode(4...22)(
-           [FlipFlopNode(4...22)(
-              ParenthesesNode(4...12)(
-                StatementsNode(5...11)(
-                  [CallNode(5...11)(
-                     CallNode(5...6)(
-                       nil,
-                       nil,
-                       (5...6),
-                       nil,
-                       nil,
-                       nil,
-                       nil,
-                       2,
-                       "i"
-                     ),
-                     nil,
-                     (7...9),
-                     nil,
-                     ArgumentsNode(10...11)([IntegerNode(10...11)()]),
-                     nil,
-                     nil,
-                     0,
-                     "=="
-                   )]
-                ),
-                (4...5),
-                (11...12)
-              ),
-              ParenthesesNode(14...22)(
-                StatementsNode(15...21)(
-                  [CallNode(15...21)(
-                     CallNode(15...16)(
-                       nil,
-                       nil,
-                       (15...16),
-                       nil,
-                       nil,
-                       nil,
-                       nil,
-                       2,
-                       "i"
-                     ),
-                     nil,
-                     (17...19),
-                     nil,
-                     ArgumentsNode(20...21)([IntegerNode(20...21)()]),
-                     nil,
-                     nil,
-                     0,
-                     "=="
-                   )]
-                ),
-                (14...15),
-                (21...22)
-              ),
-              (12...14),
-              0
-            )]
-         ),
-         (3...4),
-         (22...23)
-       ),
-       StatementsNode(26...29)(
-         [CallNode(26...29)(nil, nil, (26...29), nil, nil, nil, nil, 2, "foo")]
-       ),
-       nil,
-       (30...33)
-     ),
-     IfNode(34...68)(
-       (34...36),
-       ParenthesesNode(37...58)(
-         StatementsNode(38...57)(
-           [FlipFlopNode(38...57)(
-              ParenthesesNode(38...46)(
-                StatementsNode(39...45)(
-                  [CallNode(39...45)(
-                     CallNode(39...40)(
-                       nil,
-                       nil,
-                       (39...40),
-                       nil,
-                       nil,
-                       nil,
-                       nil,
-                       2,
-                       "i"
-                     ),
-                     nil,
-                     (41...43),
-                     nil,
-                     ArgumentsNode(44...45)([IntegerNode(44...45)()]),
-                     nil,
-                     nil,
-                     0,
-                     "=="
-                   )]
-                ),
-                (38...39),
-                (45...46)
-              ),
-              ParenthesesNode(49...57)(
-                StatementsNode(50...56)(
-                  [CallNode(50...56)(
-                     CallNode(50...51)(
-                       nil,
-                       nil,
-                       (50...51),
-                       nil,
-                       nil,
-                       nil,
-                       nil,
-                       2,
-                       "i"
-                     ),
-                     nil,
-                     (52...54),
-                     nil,
-                     ArgumentsNode(55...56)([IntegerNode(55...56)()]),
-                     nil,
-                     nil,
-                     0,
-                     "=="
-                   )]
-                ),
-                (49...50),
-                (56...57)
-              ),
-              (46...49),
-              1
-            )]
-         ),
-         (37...38),
-         (57...58)
-       ),
-       StatementsNode(61...64)(
-         [CallNode(61...64)(nil, nil, (61...64), nil, nil, nil, nil, 2, "foo")]
-       ),
-       nil,
-       (65...68)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/unparser/corpus/literal/for.txt b/test/yarp/snapshots/unparser/corpus/literal/for.txt
deleted file mode 100644
index d7a916867674f3..00000000000000
--- a/test/yarp/snapshots/unparser/corpus/literal/for.txt
+++ /dev/null
@@ -1,130 +0,0 @@
-ProgramNode(0...119)(
-  [:a, :b],
-  StatementsNode(0...119)(
-    [CallNode(0...30)(
-       nil,
-       nil,
-       (0...3),
-       (3...4),
-       ArgumentsNode(4...29)(
-         [ForNode(4...29)(
-            MultiWriteNode(8...9)(
-              [LocalVariableTargetNode(8...9)(:a, 0)],
-              nil,
-              nil,
-              nil,
-              nil
-            ),
-            CallNode(13...16)(
-              nil,
-              nil,
-              (13...16),
-              nil,
-              nil,
-              nil,
-              nil,
-              2,
-              "bar"
-            ),
-            StatementsNode(22...25)(
-              [CallNode(22...25)(
-                 nil,
-                 nil,
-                 (22...25),
-                 nil,
-                 nil,
-                 nil,
-                 nil,
-                 2,
-                 "baz"
-               )]
-            ),
-            (4...7),
-            (10...12),
-            (17...19),
-            (26...29)
-          )]
-       ),
-       (29...30),
-       nil,
-       0,
-       "bar"
-     ),
-     ForNode(31...56)(
-       MultiWriteNode(35...36)(
-         [LocalVariableTargetNode(35...36)(:a, 0)],
-         nil,
-         nil,
-         nil,
-         nil
-       ),
-       CallNode(40...43)(nil, nil, (40...43), nil, nil, nil, nil, 2, "bar"),
-       StatementsNode(49...52)(
-         [CallNode(49...52)(nil, nil, (49...52), nil, nil, nil, nil, 2, "baz")]
-       ),
-       (31...34),
-       (37...39),
-       (44...46),
-       (53...56)
-     ),
-     ForNode(57...88)(
-       MultiWriteNode(61...68)(
-         [LocalVariableTargetNode(62...63)(:a, 0),
-          SplatNode(65...67)(
-            (65...66),
-            LocalVariableTargetNode(66...67)(:b, 0)
-          )],
-         nil,
-         nil,
-         (61...62),
-         (67...68)
-       ),
-       CallNode(72...75)(nil, nil, (72...75), nil, nil, nil, nil, 2, "bar"),
-       StatementsNode(81...84)(
-         [CallNode(81...84)(nil, nil, (81...84), nil, nil, nil, nil, 2, "baz")]
-       ),
-       (57...60),
-       (69...71),
-       (76...78),
-       (85...88)
-     ),
-     ForNode(89...119)(
-       MultiWriteNode(93...99)(
-         [LocalVariableTargetNode(94...95)(:a, 0),
-          LocalVariableTargetNode(97...98)(:b, 0)],
-         nil,
-         nil,
-         (93...94),
-         (98...99)
-       ),
-       CallNode(103...106)(
-         nil,
-         nil,
-         (103...106),
-         nil,
-         nil,
-         nil,
-         nil,
-         2,
-         "bar"
-       ),
-       StatementsNode(112...115)(
-         [CallNode(112...115)(
-            nil,
-            nil,
-            (112...115),
-            nil,
-            nil,
-            nil,
-            nil,
-            2,
-            "baz"
-          )]
-       ),
-       (89...92),
-       (100...102),
-       (107...109),
-       (116...119)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/unparser/corpus/literal/hookexe.txt b/test/yarp/snapshots/unparser/corpus/literal/hookexe.txt
deleted file mode 100644
index b97bd65ad1722e..00000000000000
--- a/test/yarp/snapshots/unparser/corpus/literal/hookexe.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-ProgramNode(0...33)(
-  [],
-  StatementsNode(0...33)(
-    [PreExecutionNode(0...15)(
-       StatementsNode(10...13)(
-         [CallNode(10...13)(nil, nil, (10...13), nil, nil, nil, nil, 2, "foo")]
-       ),
-       (0...5),
-       (6...7),
-       (14...15)
-     ),
-     CallNode(16...19)(nil, nil, (16...19), nil, nil, nil, nil, 2, "bar"),
-     PostExecutionNode(20...33)(
-       StatementsNode(28...31)(
-         [CallNode(28...31)(nil, nil, (28...31), nil, nil, nil, nil, 2, "baz")]
-       ),
-       (20...23),
-       (24...25),
-       (32...33)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/unparser/corpus/literal/if.txt b/test/yarp/snapshots/unparser/corpus/literal/if.txt
deleted file mode 100644
index 455db66af842f4..00000000000000
--- a/test/yarp/snapshots/unparser/corpus/literal/if.txt
+++ /dev/null
@@ -1,205 +0,0 @@
-ProgramNode(0...246)(
-  [:foo, :pair],
-  StatementsNode(0...246)(
-    [IfNode(0...18)(
-       (0...2),
-       RegularExpressionNode(3...8)((3...4), (4...7), (7...8), "foo", 0),
-       StatementsNode(11...14)(
-         [CallNode(11...14)(nil, nil, (11...14), nil, nil, nil, nil, 2, "bar")]
-       ),
-       nil,
-       (15...18)
-     ),
-     IfNode(19...31)(
-       (19...21),
-       IntegerNode(22...23)(),
-       StatementsNode(26...27)([IntegerNode(26...27)()]),
-       nil,
-       (28...31)
-     ),
-     IfNode(32...53)(
-       (32...34),
-       IntegerNode(35...36)(),
-       StatementsNode(39...40)([IntegerNode(39...40)()]),
-       ElseNode(41...53)(
-         (41...45),
-         StatementsNode(48...49)([IntegerNode(48...49)()]),
-         (50...53)
-       ),
-       (50...53)
-     ),
-     UnlessNode(54...72)(
-       (54...60),
-       IntegerNode(61...62)(),
-       StatementsNode(65...68)([NilNode(65...68)()]),
-       nil,
-       (69...72)
-     ),
-     UnlessNode(73...89)(
-       (73...79),
-       IntegerNode(80...81)(),
-       StatementsNode(84...85)([IntegerNode(84...85)()]),
-       nil,
-       (86...89)
-     ),
-     IfNode(90...100)(
-       (90...92),
-       CallNode(93...96)(nil, nil, (93...96), nil, nil, nil, nil, 2, "foo"),
-       nil,
-       nil,
-       (97...100)
-     ),
-     ModuleNode(102...133)(
-       [:foo],
-       (102...108),
-       ConstantReadNode(109...110)(:A),
-       StatementsNode(113...129)(
-         [IfNode(113...129)(
-            (123...125),
-            LocalVariableReadNode(126...129)(:foo, 0),
-            StatementsNode(113...122)(
-              [LocalVariableWriteNode(113...122)(
-                 :foo,
-                 0,
-                 (113...116),
-                 CallNode(119...122)(
-                   nil,
-                   nil,
-                   (119...122),
-                   nil,
-                   nil,
-                   nil,
-                   nil,
-                   2,
-                   "bar"
-                 ),
-                 (117...118)
-               )]
-            ),
-            nil,
-            nil
-          )]
-       ),
-       (130...133),
-       :A,
-       :A
-     ),
-     ModuleNode(135...170)(
-       [:foo],
-       (135...141),
-       ConstantReadNode(142...143)(:B),
-       StatementsNode(146...166)(
-         [UnlessNode(146...166)(
-            (156...162),
-            LocalVariableReadNode(163...166)(:foo, 0),
-            StatementsNode(146...155)(
-              [LocalVariableWriteNode(146...155)(
-                 :foo,
-                 0,
-                 (146...149),
-                 CallNode(152...155)(
-                   nil,
-                   nil,
-                   (152...155),
-                   nil,
-                   nil,
-                   nil,
-                   nil,
-                   2,
-                   "bar"
-                 ),
-                 (150...151)
-               )]
-            ),
-            nil,
-            nil
-          )]
-       ),
-       (167...170),
-       :B,
-       :B
-     ),
-     UnlessNode(171...197)(
-       (171...177),
-       CallNode(178...181)(
-         nil,
-         nil,
-         (178...181),
-         nil,
-         nil,
-         nil,
-         nil,
-         2,
-         "foo"
-       ),
-       StatementsNode(184...193)(
-         [LocalVariableWriteNode(184...193)(
-            :foo,
-            0,
-            (184...187),
-            CallNode(190...193)(
-              nil,
-              nil,
-              (190...193),
-              nil,
-              nil,
-              nil,
-              nil,
-              2,
-              "bar"
-            ),
-            (188...189)
-          )]
-       ),
-       nil,
-       (194...197)
-     ),
-     IfNode(198...246)(
-       (198...200),
-       CallNode(201...222)(
-         nil,
-         nil,
-         (201...204),
-         nil,
-         nil,
-         nil,
-         BlockNode(205...222)(
-           [:pair],
-           BlockParametersNode(207...213)(
-             ParametersNode(208...212)(
-               [RequiredParameterNode(208...212)(:pair)],
-               [],
-               [],
-               nil,
-               [],
-               nil,
-               nil
-             ),
-             [],
-             (207...208),
-             (212...213)
-           ),
-           StatementsNode(216...220)(
-             [LocalVariableReadNode(216...220)(:pair, 0)]
-           ),
-           (205...206),
-           (221...222)
-         ),
-         0,
-         "foo"
-       ),
-       StatementsNode(225...242)(
-         [LocalVariableWriteNode(225...236)(
-            :pair,
-            0,
-            (225...229),
-            SymbolNode(232...236)((232...233), (233...236), nil, "foo"),
-            (230...231)
-          ),
-          LocalVariableReadNode(239...242)(:foo, 0)]
-       ),
-       nil,
-       (243...246)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/unparser/corpus/literal/kwbegin.txt b/test/yarp/snapshots/unparser/corpus/literal/kwbegin.txt
deleted file mode 100644
index 79f4c36be646ee..00000000000000
--- a/test/yarp/snapshots/unparser/corpus/literal/kwbegin.txt
+++ /dev/null
@@ -1,376 +0,0 @@
-ProgramNode(0...530)(
-  [:foo, :bar, :exception],
-  StatementsNode(0...530)(
-    [BeginNode(0...16)(
-       (0...5),
-       nil,
-       RescueNode(6...12)((6...12), [], nil, nil, nil, nil),
-       nil,
-       nil,
-       (13...16)
-     ),
-     BeginNode(18...34)(
-       (18...23),
-       nil,
-       nil,
-       nil,
-       EnsureNode(24...34)((24...30), nil, (31...34)),
-       (31...34)
-     ),
-     BeginNode(36...49)(
-       (36...41),
-       StatementsNode(44...45)(
-         [CallNode(44...45)(nil, nil, (44...45), nil, nil, nil, nil, 2, "a")]
-       ),
-       nil,
-       nil,
-       nil,
-       (46...49)
-     ),
-     BeginNode(51...75)(
-       (51...56),
-       StatementsNode(59...60)(
-         [CallNode(59...60)(nil, nil, (59...60), nil, nil, nil, nil, 2, "a")]
-       ),
-       RescueNode(61...71)(
-         (61...67),
-         [],
-         nil,
-         nil,
-         StatementsNode(70...71)(
-           [CallNode(70...71)(nil, nil, (70...71), nil, nil, nil, nil, 2, "b")]
-         ),
-         nil
-       ),
-       nil,
-       nil,
-       (72...75)
-     ),
-     BeginNode(77...105)(
-       (77...82),
-       StatementsNode(85...90)(
-         [CallNode(85...86)(nil, nil, (85...86), nil, nil, nil, nil, 2, "a"),
-          CallNode(89...90)(nil, nil, (89...90), nil, nil, nil, nil, 2, "b")]
-       ),
-       RescueNode(91...101)(
-         (91...97),
-         [],
-         nil,
-         nil,
-         StatementsNode(100...101)(
-           [CallNode(100...101)(
-              nil,
-              nil,
-              (100...101),
-              nil,
-              nil,
-              nil,
-              nil,
-              2,
-              "b"
-            )]
-         ),
-         nil
-       ),
-       nil,
-       nil,
-       (102...105)
-     ),
-     BeginNode(107...125)(
-       (107...112),
-       nil,
-       RescueNode(113...121)(
-         (113...119),
-         [ConstantReadNode(120...121)(:A)],
-         nil,
-         nil,
-         nil,
-         nil
-       ),
-       nil,
-       nil,
-       (122...125)
-     ),
-     BeginNode(127...152)(
-       (127...132),
-       nil,
-       RescueNode(133...148)(
-         (133...139),
-         [ConstantReadNode(140...141)(:A)],
-         (142...144),
-         LocalVariableTargetNode(145...148)(:foo, 0),
-         nil,
-         nil
-       ),
-       nil,
-       nil,
-       (149...152)
-     ),
-     BeginNode(154...204)(
-       (154...159),
-       StatementsNode(162...163)(
-         [CallNode(162...163)(
-            nil,
-            nil,
-            (162...163),
-            nil,
-            nil,
-            nil,
-            nil,
-            2,
-            "a"
-          )]
-       ),
-       RescueNode(164...189)(
-         (164...170),
-         [ConstantReadNode(171...172)(:A)],
-         nil,
-         nil,
-         StatementsNode(175...176)(
-           [CallNode(175...176)(
-              nil,
-              nil,
-              (175...176),
-              nil,
-              nil,
-              nil,
-              nil,
-              2,
-              "b"
-            )]
-         ),
-         RescueNode(177...189)(
-           (177...183),
-           [ConstantReadNode(184...185)(:B)],
-           nil,
-           nil,
-           StatementsNode(188...189)(
-             [CallNode(188...189)(
-                nil,
-                nil,
-                (188...189),
-                nil,
-                nil,
-                nil,
-                nil,
-                2,
-                "c"
-              )]
-           ),
-           nil
-         )
-       ),
-       nil,
-       EnsureNode(190...204)(
-         (190...196),
-         StatementsNode(199...200)(
-           [CallNode(199...200)(
-              nil,
-              nil,
-              (199...200),
-              nil,
-              nil,
-              nil,
-              nil,
-              2,
-              "d"
-            )]
-         ),
-         (201...204)
-       ),
-       (201...204)
-     ),
-     BeginNode(206...273)(
-       (206...211),
-       StatementsNode(214...250)(
-         [BeginNode(214...250)(
-            (214...219),
-            StatementsNode(224...235)(
-              [LocalVariableReadNode(224...227)(:foo, 0),
-               CallNode(232...235)(
-                 nil,
-                 nil,
-                 (232...235),
-                 nil,
-                 nil,
-                 nil,
-                 nil,
-                 2,
-                 "bar"
-               )]
-            ),
-            RescueNode(238...244)((238...244), [], nil, nil, nil, nil),
-            nil,
-            nil,
-            (247...250)
-          )]
-       ),
-       RescueNode(251...269)(
-         (251...257),
-         [],
-         nil,
-         nil,
-         StatementsNode(260...269)(
-           [CallNode(260...263)(
-              nil,
-              nil,
-              (260...263),
-              nil,
-              nil,
-              nil,
-              nil,
-              2,
-              "baz"
-            ),
-            CallNode(266...269)(
-              nil,
-              nil,
-              (266...269),
-              nil,
-              nil,
-              nil,
-              nil,
-              2,
-              "bar"
-            )]
-         ),
-         nil
-       ),
-       nil,
-       nil,
-       (270...273)
-     ),
-     BeginNode(275...337)(
-       (275...280),
-       StatementsNode(283...316)(
-         [RescueModifierNode(283...316)(
-            CallNode(283...299)(
-              nil,
-              nil,
-              (283...288),
-              (288...289),
-              ArgumentsNode(289...298)(
-                [ConstantReadNode(289...298)(:Exception)]
-              ),
-              (298...299),
-              nil,
-              0,
-              "raise"
-            ),
-            (300...306),
-            LocalVariableWriteNode(307...316)(
-              :foo,
-              0,
-              (307...310),
-              CallNode(313...316)(
-                nil,
-                nil,
-                (313...316),
-                nil,
-                nil,
-                nil,
-                nil,
-                2,
-                "bar"
-              ),
-              (311...312)
-            )
-          )]
-       ),
-       RescueNode(317...333)(
-         (317...323),
-         [ConstantReadNode(324...333)(:Exception)],
-         nil,
-         nil,
-         nil,
-         nil
-       ),
-       nil,
-       nil,
-       (334...337)
-     ),
-     BeginNode(339...374)(
-       (339...344),
-       StatementsNode(347...350)([LocalVariableReadNode(347...350)(:foo, 0)]),
-       RescueNode(351...370)(
-         (351...357),
-         [],
-         (358...360),
-         LocalVariableTargetNode(361...364)(:bar, 0),
-         StatementsNode(367...370)(
-           [LocalVariableReadNode(367...370)(:bar, 0)]
-         ),
-         nil
-       ),
-       nil,
-       nil,
-       (371...374)
-     ),
-     BeginNode(376...428)(
-       (376...381),
-       StatementsNode(384...387)([LocalVariableReadNode(384...387)(:foo, 0)]),
-       RescueNode(388...424)(
-         (388...394),
-         [ConstantReadNode(395...404)(:Exception),
-          ConstantReadNode(406...411)(:Other)],
-         (412...414),
-         LocalVariableTargetNode(415...418)(:bar, 0),
-         StatementsNode(421...424)(
-           [LocalVariableReadNode(421...424)(:bar, 0)]
-         ),
-         nil
-       ),
-       nil,
-       nil,
-       (425...428)
-     ),
-     BeginNode(430...487)(
-       (430...435),
-       StatementsNode(438...441)([LocalVariableReadNode(438...441)(:bar, 0)]),
-       RescueNode(442...483)(
-         (442...448),
-         [ConstantReadNode(449...458)(:SomeError),
-          SplatNode(460...464)(
-            (460...461),
-            LocalVariableReadNode(461...464)(:bar, 0)
-          )],
-         (465...467),
-         LocalVariableTargetNode(468...477)(:exception, 0),
-         StatementsNode(480...483)(
-           [CallNode(480...483)(
-              nil,
-              nil,
-              (480...483),
-              nil,
-              nil,
-              nil,
-              nil,
-              2,
-              "baz"
-            )]
-         ),
-         nil
-       ),
-       nil,
-       nil,
-       (484...487)
-     ),
-     SingletonClassNode(489...530)(
-       [],
-       (489...494),
-       (495...497),
-       SelfNode(498...502)(),
-       StatementsNode(505...526)(
-         [RescueModifierNode(505...526)(
-            UndefNode(505...515)(
-              [SymbolNode(511...515)((511...512), (512...515), nil, "bar")],
-              (505...510)
-            ),
-            (516...522),
-            NilNode(523...526)()
-          )]
-       ),
-       (527...530)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/unparser/corpus/literal/lambda.txt b/test/yarp/snapshots/unparser/corpus/literal/lambda.txt
deleted file mode 100644
index 8c036bd70dfe60..00000000000000
--- a/test/yarp/snapshots/unparser/corpus/literal/lambda.txt
+++ /dev/null
@@ -1,120 +0,0 @@
-ProgramNode(0...80)(
-  [],
-  StatementsNode(0...80)(
-    [CallNode(0...10)(
-       nil,
-       nil,
-       (0...6),
-       nil,
-       nil,
-       nil,
-       BlockNode(7...10)([], nil, nil, (7...8), (9...10)),
-       0,
-       "lambda"
-     ),
-     CallNode(11...32)(
-       nil,
-       nil,
-       (11...17),
-       nil,
-       nil,
-       nil,
-       BlockNode(18...32)(
-         [:a, :b],
-         BlockParametersNode(20...26)(
-           ParametersNode(21...25)(
-             [RequiredParameterNode(21...22)(:a),
-              RequiredParameterNode(24...25)(:b)],
-             [],
-             [],
-             nil,
-             [],
-             nil,
-             nil
-           ),
-           [],
-           (20...21),
-           (25...26)
-         ),
-         StatementsNode(29...30)([LocalVariableReadNode(29...30)(:a, 0)]),
-         (18...19),
-         (31...32)
-       ),
-       0,
-       "lambda"
-     ),
-     LambdaNode(33...41)(
-       [],
-       (33...35),
-       (38...39),
-       (40...41),
-       BlockParametersNode(35...37)(nil, [], (35...36), (36...37)),
-       nil
-     ),
-     LambdaNode(42...51)(
-       [:a],
-       (42...44),
-       (48...49),
-       (50...51),
-       BlockParametersNode(44...47)(
-         ParametersNode(45...46)(
-           [RequiredParameterNode(45...46)(:a)],
-           [],
-           [],
-           nil,
-           [],
-           nil,
-           nil
-         ),
-         [],
-         (44...45),
-         (46...47)
-       ),
-       nil
-     ),
-     LambdaNode(52...64)(
-       [:a, :b],
-       (52...54),
-       (61...62),
-       (63...64),
-       BlockParametersNode(54...60)(
-         ParametersNode(55...59)(
-           [RequiredParameterNode(55...56)(:a),
-            RequiredParameterNode(58...59)(:b)],
-           [],
-           [],
-           nil,
-           [],
-           nil,
-           nil
-         ),
-         [],
-         (54...55),
-         (59...60)
-       ),
-       nil
-     ),
-     LambdaNode(65...80)(
-       [:a, :b, :c],
-       (65...67),
-       (77...78),
-       (79...80),
-       BlockParametersNode(67...76)(
-         ParametersNode(68...72)(
-           [RequiredParameterNode(68...69)(:a),
-            RequiredParameterNode(71...72)(:b)],
-           [],
-           [],
-           nil,
-           [],
-           nil,
-           nil
-         ),
-         [BlockLocalVariableNode(74...75)(:c)],
-         (67...68),
-         (75...76)
-       ),
-       nil
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/unparser/corpus/literal/literal.txt b/test/yarp/snapshots/unparser/corpus/literal/literal.txt
deleted file mode 100644
index 8af9ea3c5e0dce..00000000000000
--- a/test/yarp/snapshots/unparser/corpus/literal/literal.txt
+++ /dev/null
@@ -1,716 +0,0 @@
-ProgramNode(0...916)(
-  [],
-  StatementsNode(0...916)(
-    [HashNode(0...38)(
-       (0...1),
-       [AssocNode(2...21)(
-          StringNode(2...7)((2...3), (3...6), (6...7), "foo"),
-          InterpolatedStringNode(11...21)(
-            (11...21),
-            [StringNode(39...41)(nil, (39...41), nil, "  "),
-             EmbeddedStatementsNode(41...44)((41...43), nil, (43...44)),
-             StringNode(44...45)(nil, (44...45), nil, "\n")],
-            (45...53)
-          ),
-          (8...10)
-        ),
-        AssocNode(23...36)(
-          StringNode(23...28)((23...24), (24...27), (27...28), "bar"),
-          SymbolNode(32...36)((32...33), (33...36), nil, "baz"),
-          (29...31)
-        )],
-       (37...38)
-     ),
-     HashNode(53...84)(
-       (53...54),
-       [AssocNode(55...67)(
-          StringNode(55...60)((55...56), (56...59), (59...60), "foo"),
-          StringNode(64...67)((64...66), (66...66), (66...67), ""),
-          (61...63)
-        ),
-        AssocNode(69...82)(
-          StringNode(69...74)((69...70), (70...73), (73...74), "bar"),
-          SymbolNode(78...82)((78...79), (79...82), nil, "baz"),
-          (75...77)
-        )],
-       (83...84)
-     ),
-     ArrayNode(85...97)(
-       [StringNode(86...91)((86...87), (87...90), (90...91), "foo"),
-        StringNode(93...96)((93...95), (95...95), (95...96), "")],
-       (85...86),
-       (96...97)
-     ),
-     CallNode(98...113)(
-       CallNode(98...111)(
-         nil,
-         nil,
-         (98...99),
-         (99...100),
-         ArgumentsNode(100...110)(
-           [InterpolatedStringNode(100...110)(
-              (100...110),
-              [StringNode(114...116)(nil, (114...116), nil, "  "),
-               EmbeddedStatementsNode(116...119)(
-                 (116...118),
-                 nil,
-                 (118...119)
-               ),
-               StringNode(119...120)(nil, (119...120), nil, "\n")],
-              (120...128)
-            )]
-         ),
-         (110...111),
-         nil,
-         0,
-         "a"
-       ),
-       (111...112),
-       (112...113),
-       nil,
-       nil,
-       nil,
-       nil,
-       0,
-       "a"
-     ),
-     CallNode(128...136)(
-       CallNode(128...134)(
-         nil,
-         nil,
-         (128...129),
-         (129...130),
-         ArgumentsNode(130...133)(
-           [StringNode(130...133)((130...132), (132...132), (132...133), "")]
-         ),
-         (133...134),
-         nil,
-         0,
-         "a"
-       ),
-       (134...135),
-       (135...136),
-       nil,
-       nil,
-       nil,
-       nil,
-       0,
-       "a"
-     ),
-     HashNode(137...167)(
-       (137...138),
-       [AssocNode(139...158)(
-          StringNode(139...144)((139...140), (140...143), (143...144), "foo"),
-          InterpolatedStringNode(148...158)(
-            (148...158),
-            [StringNode(168...170)(nil, (168...170), nil, "  "),
-             EmbeddedStatementsNode(170...173)((170...172), nil, (172...173)),
-             StringNode(173...174)(nil, (173...174), nil, "\n")],
-            (174...182)
-          ),
-          (145...147)
-        ),
-        AssocSplatNode(160...165)(
-          CallNode(162...165)(
-            nil,
-            nil,
-            (162...165),
-            nil,
-            nil,
-            nil,
-            nil,
-            2,
-            "baz"
-          ),
-          (160...162)
-        )],
-       (166...167)
-     ),
-     HashNode(182...205)(
-       (182...183),
-       [AssocNode(184...196)(
-          StringNode(184...189)((184...185), (185...188), (188...189), "foo"),
-          StringNode(193...196)((193...195), (195...195), (195...196), ""),
-          (190...192)
-        ),
-        AssocSplatNode(198...203)(
-          CallNode(200...203)(
-            nil,
-            nil,
-            (200...203),
-            nil,
-            nil,
-            nil,
-            nil,
-            2,
-            "baz"
-          ),
-          (198...200)
-        )],
-       (204...205)
-     ),
-     InterpolatedStringNode(206...220)(
-       (206...207),
-       [EmbeddedVariableNode(207...210)(
-          (207...208),
-          InstanceVariableReadNode(208...210)(:@a)
-        ),
-        StringNode(210...211)(nil, (210...211), nil, " "),
-        EmbeddedVariableNode(211...215)(
-          (211...212),
-          ClassVariableReadNode(212...215)(:@@a)
-        ),
-        StringNode(215...216)(nil, (215...216), nil, " "),
-        EmbeddedVariableNode(216...219)(
-          (216...217),
-          GlobalVariableReadNode(217...219)(:$a)
-        )],
-       (219...220)
-     ),
-     IntegerNode(221...222)(),
-     CallNode(223...226)(
-       IntegerNode(224...226)(),
-       nil,
-       (223...224),
-       nil,
-       nil,
-       nil,
-       nil,
-       0,
-       "+@"
-     ),
-     IntegerNode(227...228)(),
-     IntegerNode(229...230)(),
-     RationalNode(231...233)(IntegerNode(231...232)()),
-     RationalNode(234...238)(FloatNode(234...237)()),
-     RationalNode(239...243)(FloatNode(239...242)()),
-     ImaginaryNode(244...246)(IntegerNode(244...245)()),
-     ImaginaryNode(247...250)(IntegerNode(247...249)()),
-     ImaginaryNode(251...255)(FloatNode(251...254)()),
-     ImaginaryNode(256...261)(FloatNode(256...260)()),
-     ImaginaryNode(262...294)(IntegerNode(262...293)()),
-     ImaginaryNode(295...298)(
-       RationalNode(295...297)(IntegerNode(295...296)())
-     ),
-     StringConcatNode(299...310)(
-       StringNode(299...304)((299...300), (300...303), (303...304), "foo"),
-       StringNode(305...310)((305...306), (306...309), (309...310), "bar")
-     ),
-     InterpolatedStringNode(311...326)(
-       (311...312),
-       [StringNode(312...319)(nil, (312...319), nil, "foobar "),
-        EmbeddedStatementsNode(319...325)(
-          (319...321),
-          StatementsNode(321...324)(
-            [CallNode(321...324)(
-               nil,
-               nil,
-               (321...324),
-               nil,
-               nil,
-               nil,
-               nil,
-               2,
-               "baz"
-             )]
-          ),
-          (324...325)
-        )],
-       (325...326)
-     ),
-     InterpolatedStringNode(327...339)(
-       (327...328),
-       [StringNode(328...331)(nil, (328...331), nil, "foo"),
-        EmbeddedStatementsNode(331...335)(
-          (331...333),
-          StatementsNode(333...334)([IntegerNode(333...334)()]),
-          (334...335)
-        ),
-        StringNode(335...338)(nil, (335...338), nil, "bar")],
-       (338...339)
-     ),
-     InterpolatedStringNode(340...349)(
-       (340...341),
-       [StringNode(341...345)(nil, (341...345), nil, "\\\\"),
-        EmbeddedStatementsNode(345...348)((345...347), nil, (347...348))],
-       (348...349)
-     ),
-     InterpolatedStringNode(350...359)(
-       (350...351),
-       [EmbeddedStatementsNode(351...354)((351...353), nil, (353...354)),
-        StringNode(354...358)(nil, (354...358), nil, "\#{}")],
-       (358...359)
-     ),
-     InterpolatedStringNode(360...369)(
-       (360...361),
-       [StringNode(361...365)(nil, (361...365), nil, "\#{}"),
-        EmbeddedStatementsNode(365...368)((365...367), nil, (367...368))],
-       (368...369)
-     ),
-     StringNode(370...385)(
-       (370...371),
-       (371...384),
-       (384...385),
-       "foo\\\#{@bar}"
-     ),
-     StringNode(386...390)((386...387), (387...389), (389...390), "\""),
-     StringNode(391...400)((391...392), (392...399), (399...400), "foo bar"),
-     StringNode(401...411)(
-       (401...402),
-       (402...410),
-       (410...411),
-       "foo\n" + "bar"
-     ),
-     XStringNode(412...417)((412...413), (413...416), (416...417), "foo"),
-     InterpolatedXStringNode(418...430)(
-       (418...419),
-       [StringNode(419...422)(nil, (419...422), nil, "foo"),
-        EmbeddedStatementsNode(422...429)(
-          (422...424),
-          StatementsNode(424...428)(
-            [InstanceVariableReadNode(424...428)(:@bar)]
-          ),
-          (428...429)
-        )],
-       (429...430)
-     ),
-     XStringNode(431...434)((431...432), (432...433), (433...434), ")"),
-     XStringNode(435...439)((435...436), (436...438), (438...439), "`"),
-     XStringNode(440...443)((440...441), (441...442), (442...443), "\""),
-     SymbolNode(444...448)((444...445), (445...448), nil, "foo"),
-     SymbolNode(449...455)((449...451), (451...454), (454...455), "A B"),
-     SymbolNode(456...460)((456...457), (457...460), nil, "foo"),
-     SymbolNode(461...467)((461...463), (463...466), (466...467), "A B"),
-     SymbolNode(468...475)((468...470), (470...474), (474...475), "A\"B"),
-     SymbolNode(476...479)((476...478), (0...0), (478...479), ""),
-     RegularExpressionNode(480...485)(
-       (480...481),
-       (481...484),
-       (484...485),
-       "foo",
-       0
-     ),
-     RegularExpressionNode(486...514)(
-       (486...487),
-       (487...513),
-       (513...514),
-       "[^-+',./:@[:alnum:][]]+",
-       0
-     ),
-     InterpolatedRegularExpressionNode(515...527)(
-       (515...516),
-       [StringNode(516...519)(nil, (516...519), nil, "foo"),
-        EmbeddedStatementsNode(519...526)(
-          (519...521),
-          StatementsNode(521...525)(
-            [InstanceVariableReadNode(521...525)(:@bar)]
-          ),
-          (525...526)
-        )],
-       (526...527),
-       0
-     ),
-     InterpolatedRegularExpressionNode(528...543)(
-       (528...529),
-       [StringNode(529...532)(nil, (529...532), nil, "foo"),
-        EmbeddedStatementsNode(532...539)(
-          (532...534),
-          StatementsNode(534...538)(
-            [InstanceVariableReadNode(534...538)(:@bar)]
-          ),
-          (538...539)
-        )],
-       (539...543),
-       7
-     ),
-     InterpolatedRegularExpressionNode(544...557)(
-       (544...545),
-       [EmbeddedStatementsNode(545...556)(
-          (545...547),
-          StatementsNode(547...555)(
-            [StringNode(547...555)(
-               (547...548),
-               (548...554),
-               (554...555),
-               "\u0000"
-             )]
-          ),
-          (555...556)
-        )],
-       (556...557),
-       0
-     ),
-     RegularExpressionNode(558...562)(
-       (558...559),
-       (559...561),
-       (561...562),
-       "\n",
-       0
-     ),
-     RegularExpressionNode(563...567)(
-       (563...564),
-       (564...566),
-       (566...567),
-       "\n",
-       0
-     ),
-     RegularExpressionNode(568...573)(
-       (568...569),
-       (569...571),
-       (571...573),
-       "\n",
-       4
-     ),
-     RegularExpressionNode(574...581)(
-       (574...575),
-       (575...579),
-       (579...581),
-       "//",
-       4
-     ),
-     InterpolatedSymbolNode(582...597)(
-       (582...584),
-       [StringNode(584...587)(nil, (584...587), nil, "foo"),
-        EmbeddedStatementsNode(587...593)(
-          (587...589),
-          StatementsNode(589...592)(
-            [CallNode(589...592)(
-               nil,
-               nil,
-               (589...592),
-               nil,
-               nil,
-               nil,
-               nil,
-               2,
-               "bar"
-             )]
-          ),
-          (592...593)
-        ),
-        StringNode(593...596)(nil, (593...596), nil, "baz")],
-       (596...597)
-     ),
-     InterpolatedSymbolNode(598...609)(
-       (598...600),
-       [EmbeddedStatementsNode(600...608)(
-          (600...602),
-          StatementsNode(602...607)(
-            [StringNode(602...607)(
-               (602...603),
-               (603...606),
-               (606...607),
-               "foo"
-             )]
-          ),
-          (607...608)
-        )],
-       (608...609)
-     ),
-     RangeNode(610...624)(
-       ParenthesesNode(610...621)(
-         StatementsNode(611...620)(
-           [CallNode(611...620)(
-              FloatNode(611...614)(),
-              nil,
-              (615...616),
-              nil,
-              ArgumentsNode(617...620)([FloatNode(617...620)()]),
-              nil,
-              nil,
-              0,
-              "/"
-            )]
-         ),
-         (610...611),
-         (620...621)
-       ),
-       IntegerNode(623...624)(),
-       (621...623),
-       0
-     ),
-     RangeNode(625...639)(
-       IntegerNode(625...626)(),
-       ParenthesesNode(628...639)(
-         StatementsNode(629...638)(
-           [CallNode(629...638)(
-              FloatNode(629...632)(),
-              nil,
-              (633...634),
-              nil,
-              ArgumentsNode(635...638)([FloatNode(635...638)()]),
-              nil,
-              nil,
-              0,
-              "/"
-            )]
-         ),
-         (628...629),
-         (638...639)
-       ),
-       (626...628),
-       0
-     ),
-     RangeNode(640...656)(
-       ParenthesesNode(640...651)(
-         StatementsNode(641...650)(
-           [CallNode(641...650)(
-              FloatNode(641...644)(),
-              nil,
-              (645...646),
-              nil,
-              ArgumentsNode(647...650)([FloatNode(647...650)()]),
-              nil,
-              nil,
-              0,
-              "/"
-            )]
-         ),
-         (640...641),
-         (650...651)
-       ),
-       IntegerNode(653...656)(),
-       (651...653),
-       0
-     ),
-     FloatNode(657...661)(),
-     FloatNode(662...665)(),
-     ArrayNode(666...672)(
-       [IntegerNode(667...668)(), IntegerNode(670...671)()],
-       (666...667),
-       (671...672)
-     ),
-     ArrayNode(673...684)(
-       [IntegerNode(674...675)(),
-        ParenthesesNode(677...679)(nil, (677...678), (678...679)),
-        CallNode(681...683)(
-          nil,
-          nil,
-          (681...683),
-          nil,
-          nil,
-          nil,
-          nil,
-          2,
-          "n2"
-        )],
-       (673...674),
-       (683...684)
-     ),
-     ArrayNode(685...688)(
-       [IntegerNode(686...687)()],
-       (685...686),
-       (687...688)
-     ),
-     ArrayNode(689...691)([], (689...690), (690...691)),
-     ArrayNode(692...702)(
-       [IntegerNode(693...694)(),
-        SplatNode(696...701)(
-          (696...697),
-          InstanceVariableReadNode(697...701)(:@foo)
-        )],
-       (692...693),
-       (701...702)
-     ),
-     ArrayNode(703...713)(
-       [SplatNode(704...709)(
-          (704...705),
-          InstanceVariableReadNode(705...709)(:@foo)
-        ),
-        IntegerNode(711...712)()],
-       (703...704),
-       (712...713)
-     ),
-     ArrayNode(714...728)(
-       [SplatNode(715...720)(
-          (715...716),
-          InstanceVariableReadNode(716...720)(:@foo)
-        ),
-        SplatNode(722...727)(
-          (722...723),
-          InstanceVariableReadNode(723...727)(:@baz)
-        )],
-       (714...715),
-       (727...728)
-     ),
-     HashNode(729...731)((729...730), [], (730...731)),
-     HashNode(732...744)(
-       (732...733),
-       [AssocNode(734...742)(
-          ParenthesesNode(734...736)(nil, (734...735), (735...736)),
-          ParenthesesNode(740...742)(nil, (740...741), (741...742)),
-          (737...739)
-        )],
-       (743...744)
-     ),
-     HashNode(745...755)(
-       (745...746),
-       [AssocNode(747...753)(
-          IntegerNode(747...748)(),
-          IntegerNode(752...753)(),
-          (749...751)
-        )],
-       (754...755)
-     ),
-     HashNode(756...774)(
-       (756...757),
-       [AssocNode(758...764)(
-          IntegerNode(758...759)(),
-          IntegerNode(763...764)(),
-          (760...762)
-        ),
-        AssocNode(766...772)(
-          IntegerNode(766...767)(),
-          IntegerNode(771...772)(),
-          (768...770)
-        )],
-       (773...774)
-     ),
-     HashNode(775...802)(
-       (775...776),
-       [AssocNode(777...794)(
-          SymbolNode(777...779)(nil, (777...778), (778...779), "a"),
-          ParenthesesNode(780...794)(
-            StatementsNode(781...793)(
-              [RescueModifierNode(781...793)(
-                 IntegerNode(781...782)(),
-                 (783...789),
-                 CallNode(790...793)(
-                   nil,
-                   nil,
-                   (790...793),
-                   nil,
-                   nil,
-                   nil,
-                   nil,
-                   2,
-                   "foo"
-                 )
-               )]
-            ),
-            (780...781),
-            (793...794)
-          ),
-          nil
-        ),
-        AssocNode(796...800)(
-          SymbolNode(796...798)(nil, (796...797), (797...798), "b"),
-          IntegerNode(799...800)(),
-          nil
-        )],
-       (801...802)
-     ),
-     HashNode(803...817)(
-       (803...804),
-       [AssocNode(805...809)(
-          SymbolNode(805...807)(nil, (805...806), (806...807), "a"),
-          IntegerNode(808...809)(),
-          nil
-        ),
-        AssocNode(811...815)(
-          SymbolNode(811...813)(nil, (811...812), (812...813), "b"),
-          IntegerNode(814...815)(),
-          nil
-        )],
-       (816...817)
-     ),
-     HashNode(818...827)(
-       (818...819),
-       [AssocNode(820...825)(
-          SymbolNode(820...822)(nil, (820...821), (821...822), "a"),
-          SymbolNode(823...825)((823...824), (824...825), nil, "a"),
-          nil
-        )],
-       (826...827)
-     ),
-     HashNode(828...843)(
-       (828...829),
-       [AssocNode(830...841)(
-          SymbolNode(830...836)((830...832), (832...835), (835...836), "a b"),
-          IntegerNode(840...841)(),
-          (837...839)
-        )],
-       (842...843)
-     ),
-     HashNode(844...856)(
-       (844...845),
-       [AssocNode(846...854)(
-          SymbolNode(846...849)((846...847), (847...849), nil, "-@"),
-          IntegerNode(853...854)(),
-          (850...852)
-        )],
-       (855...856)
-     ),
-     InterpolatedStringNode(857...869)(
-       (857...858),
-       [EmbeddedStatementsNode(858...861)((858...860), nil, (860...861)),
-        StringNode(861...862)(nil, (861...862), nil, "\n"),
-        EmbeddedStatementsNode(862...865)((862...864), nil, (864...865)),
-        StringNode(865...868)(nil, (865...868), nil, "\n" + "a")],
-       (868...869)
-     ),
-     CallNode(870...892)(
-       nil,
-       nil,
-       (870...873),
-       nil,
-       nil,
-       nil,
-       BlockNode(874...892)(
-         [],
-         nil,
-         StatementsNode(878...890)(
-           [InterpolatedStringNode(878...890)(
-              (878...879),
-              [EmbeddedStatementsNode(879...882)(
-                 (879...881),
-                 nil,
-                 (881...882)
-               ),
-               StringNode(882...883)(nil, (882...883), nil, "\n"),
-               EmbeddedStatementsNode(883...886)(
-                 (883...885),
-                 nil,
-                 (885...886)
-               ),
-               StringNode(886...889)(nil, (886...889), nil, "\n" + "a")],
-              (889...890)
-            )]
-         ),
-         (874...875),
-         (891...892)
-       ),
-       0,
-       "foo"
-     ),
-     SymbolNode(893...901)(
-       (893...895),
-       (895...900),
-       (900...901),
-       "a\\\n" + "b"
-     ),
-     InterpolatedXStringNode(902...916)(
-       (902...903),
-       [StringNode(903...907)(nil, (903...907), nil, "  x\n"),
-        EmbeddedStatementsNode(907...913)(
-          (907...909),
-          StatementsNode(909...912)(
-            [CallNode(909...912)(
-               nil,
-               nil,
-               (909...912),
-               nil,
-               nil,
-               nil,
-               nil,
-               2,
-               "foo"
-             )]
-          ),
-          (912...913)
-        ),
-        StringNode(913...915)(nil, (913...915), nil, "\n" + "#")],
-       (915...916)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/unparser/corpus/literal/module.txt b/test/yarp/snapshots/unparser/corpus/literal/module.txt
deleted file mode 100644
index 28de3bfa3bc00d..00000000000000
--- a/test/yarp/snapshots/unparser/corpus/literal/module.txt
+++ /dev/null
@@ -1,92 +0,0 @@
-ProgramNode(0...106)(
-  [],
-  StatementsNode(0...106)(
-    [ModuleNode(0...12)(
-       [],
-       (0...6),
-       ConstantReadNode(7...8)(:A),
-       nil,
-       (9...12),
-       :A,
-       :A
-     ),
-     ModuleNode(14...29)(
-       [],
-       (14...20),
-       ConstantPathNode(21...25)(
-         ConstantReadNode(21...22)(:A),
-         ConstantReadNode(24...25)(:B),
-         (22...24)
-       ),
-       nil,
-       (26...29),
-       :B,
-       :B
-     ),
-     ModuleNode(31...49)(
-       [],
-       (31...37),
-       ConstantPathNode(38...45)(
-         ConstantPathNode(38...42)(
-           ConstantReadNode(38...39)(:A),
-           ConstantReadNode(41...42)(:B),
-           (39...41)
-         ),
-         ConstantReadNode(44...45)(:C),
-         (42...44)
-       ),
-       nil,
-       (46...49),
-       :C,
-       :C
-     ),
-     ModuleNode(51...106)(
-       [],
-       (51...57),
-       ConstantReadNode(58...59)(:A),
-       StatementsNode(62...102)(
-         [CallNode(62...76)(
-            nil,
-            nil,
-            (62...69),
-            (69...70),
-            ArgumentsNode(70...75)(
-              [CallNode(70...75)(
-                 ConstantReadNode(70...71)(:B),
-                 (71...72),
-                 (72...75),
-                 nil,
-                 nil,
-                 nil,
-                 nil,
-                 0,
-                 "new"
-               )]
-            ),
-            (75...76),
-            nil,
-            0,
-            "include"
-          ),
-          DefNode(80...102)(
-            (84...87),
-            nil,
-            nil,
-            StatementsNode(92...96)(
-              [SymbolNode(92...96)((92...93), (93...96), nil, "bar")]
-            ),
-            [],
-            (80...83),
-            nil,
-            nil,
-            nil,
-            nil,
-            (99...102)
-          )]
-       ),
-       (103...106),
-       :A,
-       :A
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/unparser/corpus/literal/opasgn.txt b/test/yarp/snapshots/unparser/corpus/literal/opasgn.txt
deleted file mode 100644
index 149bbc8b04f029..00000000000000
--- a/test/yarp/snapshots/unparser/corpus/literal/opasgn.txt
+++ /dev/null
@@ -1,408 +0,0 @@
-ProgramNode(0...233)(
-  [:a, :h],
-  StatementsNode(0...233)(
-    [LocalVariableOperatorWriteNode(0...6)(
-       (0...1),
-       (2...4),
-       IntegerNode(5...6)(),
-       :a,
-       :+,
-       0
-     ),
-     LocalVariableOperatorWriteNode(7...13)(
-       (7...8),
-       (9...11),
-       IntegerNode(12...13)(),
-       :a,
-       :-,
-       0
-     ),
-     LocalVariableOperatorWriteNode(14...21)(
-       (14...15),
-       (16...19),
-       IntegerNode(20...21)(),
-       :a,
-       :**,
-       0
-     ),
-     LocalVariableOperatorWriteNode(22...28)(
-       (22...23),
-       (24...26),
-       IntegerNode(27...28)(),
-       :a,
-       :*,
-       0
-     ),
-     LocalVariableOperatorWriteNode(29...35)(
-       (29...30),
-       (31...33),
-       IntegerNode(34...35)(),
-       :a,
-       :/,
-       0
-     ),
-     LocalVariableAndWriteNode(36...43)(
-       (36...37),
-       (38...41),
-       CallNode(42...43)(nil, nil, (42...43), nil, nil, nil, nil, 2, "b"),
-       :a,
-       0
-     ),
-     LocalVariableOrWriteNode(44...51)(
-       (44...45),
-       (46...49),
-       IntegerNode(50...51)(),
-       :a,
-       0
-     ),
-     CallNode(52...65)(
-       ParenthesesNode(52...61)(
-         StatementsNode(53...60)(
-           [LocalVariableOrWriteNode(53...60)(
-              (53...54),
-              (55...58),
-              IntegerNode(59...60)(),
-              :a,
-              0
-            )]
-         ),
-         (52...53),
-         (60...61)
-       ),
-       (61...62),
-       (62...65),
-       nil,
-       nil,
-       nil,
-       nil,
-       0,
-       "bar"
-     ),
-     CallNode(66...83)(
-       ParenthesesNode(66...76)(
-         StatementsNode(67...75)(
-           [LocalVariableOrWriteNode(67...75)(
-              (67...68),
-              (69...72),
-              HashNode(73...75)((73...74), [], (74...75)),
-              :h,
-              0
-            )]
-         ),
-         (66...67),
-         (75...76)
-       ),
-       nil,
-       (76...79),
-       (76...77),
-       ArgumentsNode(77...83)(
-         [CallNode(77...78)(nil, nil, (77...78), nil, nil, nil, nil, 2, "k"),
-          CallNode(82...83)(nil, nil, (82...83), nil, nil, nil, nil, 2, "v")]
-       ),
-       (78...79),
-       nil,
-       0,
-       "[]="
-     ),
-     CallOperatorWriteNode(84...92)(
-       LocalVariableReadNode(84...85)(:a, 0),
-       (85...86),
-       (86...87),
-       nil,
-       nil,
-       nil,
-       0,
-       "b",
-       "b=",
-       :+,
-       (88...90),
-       IntegerNode(91...92)()
-     ),
-     CallOperatorWriteNode(93...101)(
-       LocalVariableReadNode(93...94)(:a, 0),
-       (94...95),
-       (95...96),
-       nil,
-       nil,
-       nil,
-       0,
-       "b",
-       "b=",
-       :-,
-       (97...99),
-       IntegerNode(100...101)()
-     ),
-     CallOperatorWriteNode(102...111)(
-       LocalVariableReadNode(102...103)(:a, 0),
-       (103...104),
-       (104...105),
-       nil,
-       nil,
-       nil,
-       0,
-       "b",
-       "b=",
-       :**,
-       (106...109),
-       IntegerNode(110...111)()
-     ),
-     CallOperatorWriteNode(112...120)(
-       LocalVariableReadNode(112...113)(:a, 0),
-       (113...114),
-       (114...115),
-       nil,
-       nil,
-       nil,
-       0,
-       "b",
-       "b=",
-       :*,
-       (116...118),
-       IntegerNode(119...120)()
-     ),
-     CallOperatorWriteNode(121...129)(
-       LocalVariableReadNode(121...122)(:a, 0),
-       (122...123),
-       (123...124),
-       nil,
-       nil,
-       nil,
-       0,
-       "b",
-       "b=",
-       :/,
-       (125...127),
-       IntegerNode(128...129)()
-     ),
-     CallAndWriteNode(130...139)(
-       LocalVariableReadNode(130...131)(:a, 0),
-       (131...132),
-       (132...133),
-       nil,
-       nil,
-       nil,
-       0,
-       "b",
-       "b=",
-       (134...137),
-       CallNode(138...139)(nil, nil, (138...139), nil, nil, nil, nil, 2, "b")
-     ),
-     CallOrWriteNode(140...149)(
-       LocalVariableReadNode(140...141)(:a, 0),
-       (141...142),
-       (142...143),
-       nil,
-       nil,
-       nil,
-       0,
-       "b",
-       "b=",
-       (144...147),
-       IntegerNode(148...149)()
-     ),
-     CallOperatorWriteNode(150...159)(
-       LocalVariableReadNode(150...151)(:a, 0),
-       nil,
-       (151...154),
-       (151...152),
-       ArgumentsNode(152...153)(
-         [CallNode(152...153)(
-            nil,
-            nil,
-            (152...153),
-            nil,
-            nil,
-            nil,
-            nil,
-            2,
-            "b"
-          )]
-       ),
-       (153...154),
-       0,
-       "[]",
-       "[]=",
-       :+,
-       (155...157),
-       IntegerNode(158...159)()
-     ),
-     CallOperatorWriteNode(160...169)(
-       LocalVariableReadNode(160...161)(:a, 0),
-       nil,
-       (161...164),
-       (161...162),
-       ArgumentsNode(162...163)(
-         [CallNode(162...163)(
-            nil,
-            nil,
-            (162...163),
-            nil,
-            nil,
-            nil,
-            nil,
-            2,
-            "b"
-          )]
-       ),
-       (163...164),
-       0,
-       "[]",
-       "[]=",
-       :-,
-       (165...167),
-       IntegerNode(168...169)()
-     ),
-     CallOperatorWriteNode(170...180)(
-       LocalVariableReadNode(170...171)(:a, 0),
-       nil,
-       (171...174),
-       (171...172),
-       ArgumentsNode(172...173)(
-         [CallNode(172...173)(
-            nil,
-            nil,
-            (172...173),
-            nil,
-            nil,
-            nil,
-            nil,
-            2,
-            "b"
-          )]
-       ),
-       (173...174),
-       0,
-       "[]",
-       "[]=",
-       :**,
-       (175...178),
-       IntegerNode(179...180)()
-     ),
-     CallOperatorWriteNode(181...190)(
-       LocalVariableReadNode(181...182)(:a, 0),
-       nil,
-       (182...185),
-       (182...183),
-       ArgumentsNode(183...184)(
-         [CallNode(183...184)(
-            nil,
-            nil,
-            (183...184),
-            nil,
-            nil,
-            nil,
-            nil,
-            2,
-            "b"
-          )]
-       ),
-       (184...185),
-       0,
-       "[]",
-       "[]=",
-       :*,
-       (186...188),
-       IntegerNode(189...190)()
-     ),
-     CallOperatorWriteNode(191...200)(
-       LocalVariableReadNode(191...192)(:a, 0),
-       nil,
-       (192...195),
-       (192...193),
-       ArgumentsNode(193...194)(
-         [CallNode(193...194)(
-            nil,
-            nil,
-            (193...194),
-            nil,
-            nil,
-            nil,
-            nil,
-            2,
-            "b"
-          )]
-       ),
-       (194...195),
-       0,
-       "[]",
-       "[]=",
-       :/,
-       (196...198),
-       IntegerNode(199...200)()
-     ),
-     CallAndWriteNode(201...211)(
-       LocalVariableReadNode(201...202)(:a, 0),
-       nil,
-       (202...205),
-       (202...203),
-       ArgumentsNode(203...204)(
-         [CallNode(203...204)(
-            nil,
-            nil,
-            (203...204),
-            nil,
-            nil,
-            nil,
-            nil,
-            2,
-            "b"
-          )]
-       ),
-       (204...205),
-       0,
-       "[]",
-       "[]=",
-       (206...209),
-       CallNode(210...211)(nil, nil, (210...211), nil, nil, nil, nil, 2, "b")
-     ),
-     CallOrWriteNode(212...222)(
-       LocalVariableReadNode(212...213)(:a, 0),
-       nil,
-       (213...216),
-       (213...214),
-       ArgumentsNode(214...215)(
-         [CallNode(214...215)(
-            nil,
-            nil,
-            (214...215),
-            nil,
-            nil,
-            nil,
-            nil,
-            2,
-            "b"
-          )]
-       ),
-       (215...216),
-       0,
-       "[]",
-       "[]=",
-       (217...220),
-       IntegerNode(221...222)()
-     ),
-     CallOperatorWriteNode(223...233)(
-       CallNode(223...226)(
-         nil,
-         nil,
-         (223...226),
-         nil,
-         nil,
-         nil,
-         nil,
-         2,
-         "foo"
-       ),
-       (226...227),
-       (227...228),
-       nil,
-       nil,
-       nil,
-       0,
-       "A",
-       "A=",
-       :+,
-       (229...231),
-       IntegerNode(232...233)()
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/unparser/corpus/literal/pattern.txt b/test/yarp/snapshots/unparser/corpus/literal/pattern.txt
deleted file mode 100644
index 2d6ec772f44e8f..00000000000000
--- a/test/yarp/snapshots/unparser/corpus/literal/pattern.txt
+++ /dev/null
@@ -1,291 +0,0 @@
-ProgramNode(0...408)(
-  [:a, :x, :y],
-  StatementsNode(0...408)(
-    [CaseNode(0...345)(
-       CallNode(5...8)(nil, nil, (5...8), nil, nil, nil, nil, 2, "foo"),
-       [InNode(9...38)(
-          ArrayPatternNode(12...26)(
-            ConstantReadNode(12...13)(:A),
-            [IntegerNode(14...15)(), IntegerNode(17...18)()],
-            SplatNode(20...22)(
-              (20...21),
-              LocalVariableTargetNode(21...22)(:a, 0)
-            ),
-            [IntegerNode(24...25)()],
-            (13...14),
-            (25...26)
-          ),
-          StatementsNode(34...38)([TrueNode(34...38)()]),
-          (9...11),
-          (27...31)
-        ),
-        InNode(39...59)(
-          ArrayPatternNode(42...50)(
-            nil,
-            [IntegerNode(43...44)(), IntegerNode(46...47)()],
-            nil,
-            [],
-            (42...43),
-            (49...50)
-          ),
-          StatementsNode(58...59)(
-            [CallNode(58...59)(
-               nil,
-               nil,
-               (58...59),
-               nil,
-               nil,
-               nil,
-               nil,
-               2,
-               "y"
-             )]
-          ),
-          (39...41),
-          (51...55)
-        ),
-        InNode(60...80)(
-          HashPatternNode(63...68)(
-            ConstantReadNode(63...64)(:A),
-            [AssocNode(65...67)(
-               SymbolNode(65...67)(nil, (65...66), (66...67), "x"),
-               nil,
-               nil
-             )],
-            nil,
-            (64...65),
-            (67...68)
-          ),
-          StatementsNode(76...80)([TrueNode(76...80)()]),
-          (60...62),
-          (69...73)
-        ),
-        InNode(81...101)(
-          HashPatternNode(84...89)(
-            nil,
-            [AssocNode(85...88)(
-               AssocSplatNode(85...88)(
-                 LocalVariableTargetNode(87...88)(:a, 0),
-                 (85...87)
-               ),
-               nil,
-               nil
-             )],
-            nil,
-            (84...85),
-            (88...89)
-          ),
-          StatementsNode(97...101)([TrueNode(97...101)()]),
-          (81...83),
-          (90...94)
-        ),
-        InNode(102...127)(
-          IfNode(105...115)(
-            (108...110),
-            TrueNode(111...115)(),
-            StatementsNode(105...107)(
-              [HashPatternNode(105...107)(
-                 nil,
-                 [],
-                 nil,
-                 (105...106),
-                 (106...107)
-               )]
-            ),
-            nil,
-            nil
-          ),
-          StatementsNode(123...127)([TrueNode(123...127)()]),
-          (102...104),
-          (116...120)
-        ),
-        InNode(128...152)(
-          ArrayPatternNode(131...140)(
-            nil,
-            [LocalVariableTargetNode(132...133)(:x, 0),
-             LocalVariableTargetNode(135...136)(:y, 0)],
-            SplatNode(138...139)((138...139), nil),
-            [],
-            (131...132),
-            (139...140)
-          ),
-          StatementsNode(148...152)([TrueNode(148...152)()]),
-          (128...130),
-          (141...145)
-        ),
-        InNode(153...181)(
-          HashPatternNode(156...169)(
-            nil,
-            [AssocNode(157...161)(
-               SymbolNode(157...159)(nil, (157...158), (158...159), "a"),
-               IntegerNode(160...161)(),
-               nil
-             ),
-             AssocNode(163...168)(
-               SymbolNode(163...166)(nil, (163...165), (165...166), "aa"),
-               IntegerNode(167...168)(),
-               nil
-             )],
-            nil,
-            (156...157),
-            (168...169)
-          ),
-          StatementsNode(177...181)([TrueNode(177...181)()]),
-          (153...155),
-          (170...174)
-        ),
-        InNode(182...199)(
-          HashPatternNode(185...187)(nil, [], nil, (185...186), (186...187)),
-          StatementsNode(195...199)([TrueNode(195...199)()]),
-          (182...184),
-          (188...192)
-        ),
-        InNode(200...222)(
-          HashPatternNode(203...210)(
-            nil,
-            [AssocNode(204...209)(
-               NoKeywordsParameterNode(204...209)((204...206), (206...209)),
-               nil,
-               nil
-             )],
-            nil,
-            (203...204),
-            (209...210)
-          ),
-          StatementsNode(218...222)([TrueNode(218...222)()]),
-          (200...202),
-          (211...215)
-        ),
-        InNode(223...246)(
-          HashPatternNode(226...234)(
-            nil,
-            [AssocNode(227...233)(
-               SymbolNode(227...231)(
-                 (227...228),
-                 (228...229),
-                 (229...231),
-                 "a"
-               ),
-               IntegerNode(232...233)(),
-               nil
-             )],
-            nil,
-            (226...227),
-            (233...234)
-          ),
-          StatementsNode(242...246)([TrueNode(242...246)()]),
-          (223...225),
-          (235...239)
-        ),
-        InNode(247...267)(
-          AlternationPatternNode(250...255)(
-            IntegerNode(250...251)(),
-            IntegerNode(254...255)(),
-            (252...253)
-          ),
-          StatementsNode(263...267)([TrueNode(263...267)()]),
-          (247...249),
-          (256...260)
-        ),
-        InNode(268...289)(
-          CapturePatternNode(271...277)(
-            IntegerNode(271...272)(),
-            LocalVariableTargetNode(276...277)(:a, 0),
-            (273...275)
-          ),
-          StatementsNode(285...289)([TrueNode(285...289)()]),
-          (268...270),
-          (278...282)
-        ),
-        InNode(290...307)(
-          PinnedVariableNode(293...295)(
-            LocalVariableReadNode(294...295)(:x, 0),
-            (293...294)
-          ),
-          StatementsNode(303...307)([TrueNode(303...307)()]),
-          (290...292),
-          (296...300)
-        ),
-        InNode(308...312)(IntegerNode(311...312)(), nil, (308...310), nil),
-        InNode(313...329)(
-          IntegerNode(316...317)(),
-          StatementsNode(325...329)([TrueNode(325...329)()]),
-          (313...315),
-          (318...322)
-        )],
-       ElseNode(330...345)(
-         (330...334),
-         StatementsNode(337...341)([TrueNode(337...341)()]),
-         (342...345)
-       ),
-       (0...4),
-       (342...345)
-     ),
-     CaseNode(346...376)(
-       CallNode(351...354)(
-         nil,
-         nil,
-         (351...354),
-         nil,
-         nil,
-         nil,
-         nil,
-         2,
-         "foo"
-       ),
-       [InNode(355...372)(
-          ArrayPatternNode(358...372)(
-            ConstantReadNode(358...359)(:A),
-            [IntegerNode(360...361)(), IntegerNode(363...364)()],
-            SplatNode(366...368)(
-              (366...367),
-              LocalVariableTargetNode(367...368)(:a, 0)
-            ),
-            [IntegerNode(370...371)()],
-            (359...360),
-            (371...372)
-          ),
-          nil,
-          (355...357),
-          nil
-        )],
-       nil,
-       (346...350),
-       (373...376)
-     ),
-     CaseNode(377...399)(
-       CallNode(382...385)(
-         nil,
-         nil,
-         (382...385),
-         nil,
-         nil,
-         nil,
-         nil,
-         2,
-         "foo"
-       ),
-       [InNode(386...390)(
-          ConstantReadNode(389...390)(:A),
-          nil,
-          (386...388),
-          nil
-        )],
-       ElseNode(391...399)((391...395), nil, (396...399)),
-       (377...381),
-       (396...399)
-     ),
-     MatchPredicateNode(400...408)(
-       IntegerNode(400...401)(),
-       ArrayPatternNode(405...408)(
-         nil,
-         [LocalVariableTargetNode(406...407)(:a, 0)],
-         nil,
-         [],
-         (405...406),
-         (407...408)
-       ),
-       (402...404)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/unparser/corpus/literal/pragma.txt b/test/yarp/snapshots/unparser/corpus/literal/pragma.txt
deleted file mode 100644
index 86c13274335adf..00000000000000
--- a/test/yarp/snapshots/unparser/corpus/literal/pragma.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-ProgramNode(0...38)(
-  [],
-  StatementsNode(0...38)(
-    [SourceEncodingNode(0...12)(),
-     SourceFileNode(13...21)("unparser/corpus/literal/pragma.txt"),
-     SourceLineNode(22...30)(),
-     CallNode(31...38)(nil, nil, (31...38), nil, nil, nil, nil, 2, "__dir__")]
-  )
-)
diff --git a/test/yarp/snapshots/unparser/corpus/literal/range.txt b/test/yarp/snapshots/unparser/corpus/literal/range.txt
deleted file mode 100644
index ea2b362a32eb29..00000000000000
--- a/test/yarp/snapshots/unparser/corpus/literal/range.txt
+++ /dev/null
@@ -1,31 +0,0 @@
-ProgramNode(0...23)(
-  [],
-  StatementsNode(0...23)(
-    [ParenthesesNode(0...5)(
-       StatementsNode(1...4)(
-         [RangeNode(1...4)(IntegerNode(1...2)(), nil, (2...4), 0)]
-       ),
-       (0...1),
-       (4...5)
-     ),
-     RangeNode(6...10)(
-       IntegerNode(6...7)(),
-       IntegerNode(9...10)(),
-       (7...9),
-       0
-     ),
-     ParenthesesNode(11...17)(
-       StatementsNode(12...16)(
-         [RangeNode(12...16)(IntegerNode(12...13)(), nil, (13...16), 1)]
-       ),
-       (11...12),
-       (16...17)
-     ),
-     RangeNode(18...23)(
-       IntegerNode(18...19)(),
-       IntegerNode(22...23)(),
-       (19...22),
-       1
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/unparser/corpus/literal/rescue.txt b/test/yarp/snapshots/unparser/corpus/literal/rescue.txt
deleted file mode 100644
index 8898a6e1a0db24..00000000000000
--- a/test/yarp/snapshots/unparser/corpus/literal/rescue.txt
+++ /dev/null
@@ -1,72 +0,0 @@
-ProgramNode(0...64)(
-  [:x],
-  StatementsNode(0...64)(
-    [RescueModifierNode(0...14)(
-       CallNode(0...3)(nil, nil, (0...3), nil, nil, nil, nil, 2, "foo"),
-       (4...10),
-       CallNode(11...14)(nil, nil, (11...14), nil, nil, nil, nil, 2, "bar")
-     ),
-     RescueModifierNode(15...36)(
-       CallNode(15...18)(nil, nil, (15...18), nil, nil, nil, nil, 2, "foo"),
-       (19...25),
-       ReturnNode(26...36)(
-         (26...32),
-         ArgumentsNode(33...36)(
-           [CallNode(33...36)(
-              nil,
-              nil,
-              (33...36),
-              nil,
-              nil,
-              nil,
-              nil,
-              2,
-              "bar"
-            )]
-         )
-       )
-     ),
-     LocalVariableWriteNode(37...64)(
-       :x,
-       0,
-       (37...38),
-       ParenthesesNode(41...64)(
-         StatementsNode(42...63)(
-           [RescueModifierNode(42...63)(
-              CallNode(42...45)(
-                nil,
-                nil,
-                (42...45),
-                nil,
-                nil,
-                nil,
-                nil,
-                2,
-                "foo"
-              ),
-              (46...52),
-              ReturnNode(53...63)(
-                (53...59),
-                ArgumentsNode(60...63)(
-                  [CallNode(60...63)(
-                     nil,
-                     nil,
-                     (60...63),
-                     nil,
-                     nil,
-                     nil,
-                     nil,
-                     2,
-                     "bar"
-                   )]
-                )
-              )
-            )]
-         ),
-         (41...42),
-         (63...64)
-       ),
-       (39...40)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/unparser/corpus/literal/send.txt b/test/yarp/snapshots/unparser/corpus/literal/send.txt
deleted file mode 100644
index fccb137c0932b0..00000000000000
--- a/test/yarp/snapshots/unparser/corpus/literal/send.txt
+++ /dev/null
@@ -1,2053 +0,0 @@
-ProgramNode(0...999)(
-  [],
-  StatementsNode(0...999)(
-    [ModuleNode(0...35)(
-       [:foo, :a, :_],
-       (0...6),
-       ConstantReadNode(7...8)(:A),
-       StatementsNode(11...31)(
-         [LocalVariableOrWriteNode(11...31)(
-            (11...14),
-            (15...18),
-            ParenthesesNode(19...31)(
-              StatementsNode(20...30)(
-                [MultiWriteNode(20...30)(
-                   [LocalVariableTargetNode(21...22)(:a, 0),
-                    LocalVariableTargetNode(24...25)(:_, 0)],
-                   (27...28),
-                   CallNode(29...30)(
-                     nil,
-                     nil,
-                     (29...30),
-                     nil,
-                     nil,
-                     nil,
-                     nil,
-                     2,
-                     "b"
-                   ),
-                   (20...21),
-                   (25...26)
-                 )]
-              ),
-              (19...20),
-              (30...31)
-            ),
-            :foo,
-            0
-          )]
-       ),
-       (32...35),
-       :A,
-       :A
-     ),
-     ModuleNode(37...73)(
-       [:local],
-       (37...43),
-       ConstantReadNode(44...45)(:A),
-       StatementsNode(48...69)(
-         [LocalVariableWriteNode(48...57)(
-            :local,
-            0,
-            (48...53),
-            IntegerNode(56...57)(),
-            (54...55)
-          ),
-          CallNode(60...69)(
-            LocalVariableReadNode(60...65)(:local, 0),
-            (65...66),
-            (66...69),
-            nil,
-            nil,
-            nil,
-            nil,
-            0,
-            "bar"
-          )]
-       ),
-       (70...73),
-       :A,
-       :A
-     ),
-     CallNode(74...89)(
-       ClassNode(74...85)(
-         [],
-         (74...79),
-         ConstantReadNode(80...81)(:A),
-         nil,
-         nil,
-         nil,
-         (82...85),
-         :A,
-         :A
-       ),
-       (85...86),
-       (86...89),
-       nil,
-       nil,
-       nil,
-       nil,
-       0,
-       "bar"
-     ),
-     CallNode(90...106)(
-       ModuleNode(90...102)(
-         [],
-         (90...96),
-         ConstantReadNode(97...98)(:A),
-         nil,
-         (99...102),
-         :A,
-         :A
-       ),
-       (102...103),
-       (103...106),
-       nil,
-       nil,
-       nil,
-       nil,
-       0,
-       "bar"
-     ),
-     CallNode(107...127)(
-       BeginNode(107...123)(
-         (107...112),
-         nil,
-         RescueNode(113...119)((113...119), [], nil, nil, nil, nil),
-         nil,
-         nil,
-         (120...123)
-       ),
-       (123...124),
-       (124...127),
-       nil,
-       nil,
-       nil,
-       nil,
-       0,
-       "bar"
-     ),
-     CallNode(128...169)(
-       CaseNode(128...165)(
-         ParenthesesNode(133...152)(
-           StatementsNode(134...151)(
-             [DefNode(134...145)(
-                (138...141),
-                nil,
-                nil,
-                nil,
-                [],
-                (134...137),
-                nil,
-                nil,
-                nil,
-                nil,
-                (142...145)
-              ),
-              SymbolNode(147...151)((147...148), (148...151), nil, "bar")]
-           ),
-           (133...134),
-           (151...152)
-         ),
-         [WhenNode(153...161)(
-            (153...157),
-            [CallNode(158...161)(
-               nil,
-               nil,
-               (158...161),
-               nil,
-               nil,
-               nil,
-               nil,
-               2,
-               "bar"
-             )],
-            nil
-          )],
-         nil,
-         (128...132),
-         (162...165)
-       ),
-       (165...166),
-       (166...169),
-       nil,
-       nil,
-       nil,
-       nil,
-       0,
-       "baz"
-     ),
-     CallNode(170...195)(
-       CaseNode(170...191)(
-         CallNode(175...178)(
-           nil,
-           nil,
-           (175...178),
-           nil,
-           nil,
-           nil,
-           nil,
-           2,
-           "foo"
-         ),
-         [WhenNode(179...187)(
-            (179...183),
-            [CallNode(184...187)(
-               nil,
-               nil,
-               (184...187),
-               nil,
-               nil,
-               nil,
-               nil,
-               2,
-               "bar"
-             )],
-            nil
-          )],
-         nil,
-         (170...174),
-         (188...191)
-       ),
-       (191...192),
-       (192...195),
-       nil,
-       nil,
-       nil,
-       nil,
-       0,
-       "baz"
-     ),
-     CallNode(196...217)(
-       SingletonClassNode(196...213)(
-         [],
-         (196...201),
-         (202...204),
-         SelfNode(205...209)(),
-         nil,
-         (210...213)
-       ),
-       (213...214),
-       (214...217),
-       nil,
-       nil,
-       nil,
-       nil,
-       0,
-       "bar"
-     ),
-     CallNode(218...238)(
-       DefNode(218...234)(
-         (227...230),
-         SelfNode(222...226)(),
-         nil,
-         nil,
-         [],
-         (218...221),
-         (226...227),
-         nil,
-         nil,
-         nil,
-         (231...234)
-       ),
-       (234...235),
-       (235...238),
-       nil,
-       nil,
-       nil,
-       nil,
-       0,
-       "bar"
-     ),
-     CallNode(239...254)(
-       DefNode(239...250)(
-         (243...246),
-         nil,
-         nil,
-         nil,
-         [],
-         (239...242),
-         nil,
-         nil,
-         nil,
-         nil,
-         (247...250)
-       ),
-       (250...251),
-       (251...254),
-       nil,
-       nil,
-       nil,
-       nil,
-       0,
-       "bar"
-     ),
-     CallNode(255...272)(
-       UntilNode(255...268)(
-         (255...260),
-         (265...268),
-         CallNode(261...264)(
-           nil,
-           nil,
-           (261...264),
-           nil,
-           nil,
-           nil,
-           nil,
-           2,
-           "foo"
-         ),
-         nil,
-         0
-       ),
-       (268...269),
-       (269...272),
-       nil,
-       nil,
-       nil,
-       nil,
-       0,
-       "bar"
-     ),
-     CallNode(273...290)(
-       WhileNode(273...286)(
-         (273...278),
-         (283...286),
-         CallNode(279...282)(
-           nil,
-           nil,
-           (279...282),
-           nil,
-           nil,
-           nil,
-           nil,
-           2,
-           "foo"
-         ),
-         nil,
-         0
-       ),
-       (286...287),
-       (287...290),
-       nil,
-       nil,
-       nil,
-       nil,
-       0,
-       "bar"
-     ),
-     CallNode(291...303)(
-       CallNode(291...299)(
-         nil,
-         nil,
-         (291...295),
-         nil,
-         nil,
-         nil,
-         BlockNode(296...299)([], nil, nil, (296...297), (298...299)),
-         0,
-         "loop"
-       ),
-       (299...300),
-       (300...303),
-       nil,
-       nil,
-       nil,
-       nil,
-       0,
-       "bar"
-     ),
-     CallNode(304...318)(
-       IfNode(304...314)(
-         (304...306),
-         CallNode(307...310)(
-           nil,
-           nil,
-           (307...310),
-           nil,
-           nil,
-           nil,
-           nil,
-           2,
-           "foo"
-         ),
-         nil,
-         nil,
-         (311...314)
-       ),
-       (314...315),
-       (315...318),
-       nil,
-       nil,
-       nil,
-       nil,
-       0,
-       "baz"
-     ),
-     CallNode(319...338)(
-       ParenthesesNode(319...334)(
-         StatementsNode(320...333)(
-           [CallNode(320...333)(
-              RegularExpressionNode(320...325)(
-                (320...321),
-                (321...324),
-                (324...325),
-                "bar",
-                0
-              ),
-              nil,
-              (326...328),
-              nil,
-              ArgumentsNode(329...333)(
-                [SymbolNode(329...333)((329...330), (330...333), nil, "foo")]
-              ),
-              nil,
-              nil,
-              0,
-              "=~"
-            )]
-         ),
-         (319...320),
-         (333...334)
-       ),
-       (334...335),
-       (335...338),
-       nil,
-       nil,
-       nil,
-       nil,
-       0,
-       "foo"
-     ),
-     CallNode(339...349)(
-       ParenthesesNode(339...345)(
-         StatementsNode(340...344)(
-           [RangeNode(340...344)(
-              IntegerNode(340...341)(),
-              IntegerNode(343...344)(),
-              (341...343),
-              0
-            )]
-         ),
-         (339...340),
-         (344...345)
-       ),
-       (345...346),
-       (346...349),
-       nil,
-       nil,
-       nil,
-       nil,
-       0,
-       "max"
-     ),
-     CallNode(350...368)(
-       ParenthesesNode(350...364)(
-         StatementsNode(351...363)(
-           [CallNode(351...363)(
-              CallNode(351...354)(
-                nil,
-                nil,
-                (351...354),
-                nil,
-                nil,
-                nil,
-                nil,
-                2,
-                "foo"
-              ),
-              nil,
-              (355...357),
-              nil,
-              ArgumentsNode(358...363)(
-                [RegularExpressionNode(358...363)(
-                   (358...359),
-                   (359...362),
-                   (362...363),
-                   "bar",
-                   0
-                 )]
-              ),
-              nil,
-              nil,
-              0,
-              "=~"
-            )]
-         ),
-         (350...351),
-         (363...364)
-       ),
-       (364...365),
-       (365...368),
-       nil,
-       nil,
-       nil,
-       nil,
-       0,
-       "foo"
-     ),
-     CallNode(369...382)(
-       RegularExpressionNode(369...374)(
-         (369...370),
-         (370...373),
-         (373...374),
-         "bar",
-         0
-       ),
-       nil,
-       (375...377),
-       nil,
-       ArgumentsNode(378...382)(
-         [SymbolNode(378...382)((378...379), (379...382), nil, "foo")]
-       ),
-       nil,
-       nil,
-       0,
-       "=~"
-     ),
-     CallNode(383...395)(
-       RegularExpressionNode(383...388)(
-         (383...384),
-         (384...387),
-         (387...388),
-         "bar",
-         0
-       ),
-       nil,
-       (389...391),
-       nil,
-       ArgumentsNode(392...395)(
-         [CallNode(392...395)(
-            nil,
-            nil,
-            (392...395),
-            nil,
-            nil,
-            nil,
-            nil,
-            2,
-            "foo"
-          )]
-       ),
-       nil,
-       nil,
-       0,
-       "=~"
-     ),
-     RangeNode(396...404)(
-       IntegerNode(396...397)(),
-       CallNode(399...404)(
-         IntegerNode(399...400)(),
-         (400...401),
-         (401...404),
-         nil,
-         nil,
-         nil,
-         nil,
-         0,
-         "max"
-       ),
-       (397...399),
-       0
-     ),
-     CallNode(405...410)(
-       ConstantReadNode(405...406)(:A),
-       (406...407),
-       (407...410),
-       nil,
-       nil,
-       nil,
-       nil,
-       0,
-       "foo"
-     ),
-     CallNode(411...416)(
-       nil,
-       nil,
-       (411...414),
-       (414...415),
-       nil,
-       (415...416),
-       nil,
-       0,
-       "FOO"
-     ),
-     CallNode(417...421)(
-       CallNode(417...418)(nil, nil, (417...418), nil, nil, nil, nil, 2, "a"),
-       (418...420),
-       (420...421),
-       nil,
-       nil,
-       nil,
-       nil,
-       1,
-       "b"
-     ),
-     CallNode(422...427)(
-       CallNode(422...423)(nil, nil, (422...423), nil, nil, nil, nil, 2, "a"),
-       (423...424),
-       (424...427),
-       nil,
-       nil,
-       nil,
-       nil,
-       0,
-       "foo"
-     ),
-     CallNode(428...431)(nil, nil, (428...431), nil, nil, nil, nil, 2, "foo"),
-     CallNode(432...450)(
-       CallNode(432...435)(
-         nil,
-         nil,
-         (432...435),
-         nil,
-         nil,
-         nil,
-         nil,
-         2,
-         "foo"
-       ),
-       nil,
-       (436...438),
-       nil,
-       ArgumentsNode(439...450)(
-         [ParenthesesNode(439...450)(
-            StatementsNode(440...449)(
-              [CallNode(440...449)(
-                 CallNode(440...443)(
-                   nil,
-                   nil,
-                   (440...443),
-                   nil,
-                   nil,
-                   nil,
-                   nil,
-                   2,
-                   "bar"
-                 ),
-                 nil,
-                 (444...445),
-                 nil,
-                 ArgumentsNode(446...449)(
-                   [CallNode(446...449)(
-                      nil,
-                      nil,
-                      (446...449),
-                      nil,
-                      nil,
-                      nil,
-                      nil,
-                      2,
-                      "baz"
-                    )]
-                 ),
-                 nil,
-                 nil,
-                 0,
-                 "*"
-               )]
-            ),
-            (439...440),
-            (449...450)
-          )]
-       ),
-       nil,
-       nil,
-       0,
-       "<<"
-     ),
-     CallNode(451...463)(
-       CallNode(451...454)(
-         nil,
-         nil,
-         (451...454),
-         nil,
-         nil,
-         nil,
-         nil,
-         2,
-         "foo"
-       ),
-       nil,
-       (455...457),
-       nil,
-       ArgumentsNode(458...463)(
-         [RegularExpressionNode(458...463)(
-            (458...459),
-            (459...462),
-            (462...463),
-            "bar",
-            0
-          )]
-       ),
-       nil,
-       nil,
-       0,
-       "=~"
-     ),
-     CallNode(464...482)(
-       nil,
-       nil,
-       (464...467),
-       (467...468),
-       ArgumentsNode(468...481)(
-         [BlockArgumentNode(468...481)(
-            ParenthesesNode(469...481)(
-              StatementsNode(470...480)(
-                [OrNode(470...480)(
-                   CallNode(470...473)(
-                     nil,
-                     nil,
-                     (470...473),
-                     nil,
-                     nil,
-                     nil,
-                     nil,
-                     2,
-                     "foo"
-                   ),
-                   CallNode(477...480)(
-                     nil,
-                     nil,
-                     (477...480),
-                     nil,
-                     nil,
-                     nil,
-                     nil,
-                     2,
-                     "bar"
-                   ),
-                   (474...476)
-                 )]
-              ),
-              (469...470),
-              (480...481)
-            ),
-            (468...469)
-          )]
-       ),
-       (481...482),
-       nil,
-       0,
-       "foo"
-     ),
-     CallNode(483...494)(
-       nil,
-       nil,
-       (483...486),
-       (486...487),
-       ArgumentsNode(487...493)(
-         [BlockArgumentNode(487...493)(
-            CallNode(488...493)(
-              nil,
-              nil,
-              (488...493),
-              nil,
-              nil,
-              nil,
-              nil,
-              2,
-              "block"
-            ),
-            (487...488)
-          )]
-       ),
-       (493...494),
-       nil,
-       0,
-       "foo"
-     ),
-     CallNode(495...513)(
-       nil,
-       nil,
-       (495...498),
-       (498...499),
-       ArgumentsNode(499...512)(
-         [SplatNode(499...504)(
-            (499...500),
-            CallNode(500...504)(
-              nil,
-              nil,
-              (500...504),
-              nil,
-              nil,
-              nil,
-              nil,
-              2,
-              "args"
-            )
-          ),
-          BlockArgumentNode(506...512)(
-            CallNode(507...512)(
-              nil,
-              nil,
-              (507...512),
-              nil,
-              nil,
-              nil,
-              nil,
-              2,
-              "block"
-            ),
-            (506...507)
-          )]
-       ),
-       (512...513),
-       nil,
-       0,
-       "foo"
-     ),
-     CallNode(514...529)(
-       nil,
-       nil,
-       (514...517),
-       (517...518),
-       ArgumentsNode(518...528)(
-         [SplatNode(518...528)(
-            (518...519),
-            CallNode(519...528)(
-              nil,
-              nil,
-              (519...528),
-              nil,
-              nil,
-              nil,
-              nil,
-              2,
-              "arguments"
-            )
-          )]
-       ),
-       (528...529),
-       nil,
-       0,
-       "foo"
-     ),
-     CallNode(530...539)(
-       nil,
-       nil,
-       (530...533),
-       (533...534),
-       ArgumentsNode(534...538)(
-         [IntegerNode(534...535)(), IntegerNode(537...538)()]
-       ),
-       (538...539),
-       nil,
-       0,
-       "foo"
-     ),
-     CallNode(540...548)(
-       nil,
-       nil,
-       (540...543),
-       (543...544),
-       ArgumentsNode(544...547)(
-         [CallNode(544...547)(
-            nil,
-            nil,
-            (544...547),
-            nil,
-            nil,
-            nil,
-            nil,
-            2,
-            "bar"
-          )]
-       ),
-       (547...548),
-       nil,
-       0,
-       "foo"
-     ),
-     CallNode(549...564)(
-       nil,
-       nil,
-       (549...552),
-       (552...553),
-       ArgumentsNode(553...563)(
-         [CallNode(553...556)(
-            nil,
-            nil,
-            (553...556),
-            nil,
-            nil,
-            nil,
-            nil,
-            2,
-            "bar"
-          ),
-          SplatNode(558...563)(
-            (558...559),
-            CallNode(559...563)(
-              nil,
-              nil,
-              (559...563),
-              nil,
-              nil,
-              nil,
-              nil,
-              2,
-              "args"
-            )
-          )]
-       ),
-       (563...564),
-       nil,
-       0,
-       "foo"
-     ),
-     CallNode(565...582)(
-       nil,
-       nil,
-       (565...568),
-       (568...569),
-       ArgumentsNode(569...581)(
-         [CallNode(569...581)(
-            CallNode(569...572)(
-              nil,
-              nil,
-              (569...572),
-              nil,
-              nil,
-              nil,
-              nil,
-              2,
-              "foo"
-            ),
-            nil,
-            (573...575),
-            nil,
-            ArgumentsNode(576...581)(
-              [RegularExpressionNode(576...581)(
-                 (576...577),
-                 (577...580),
-                 (580...581),
-                 "bar",
-                 0
-               )]
-            ),
-            nil,
-            nil,
-            0,
-            "=~"
-          )]
-       ),
-       (581...582),
-       nil,
-       0,
-       "foo"
-     ),
-     CallNode(583...596)(
-       CallNode(583...586)(
-         nil,
-         nil,
-         (583...586),
-         nil,
-         nil,
-         nil,
-         nil,
-         2,
-         "foo"
-       ),
-       (586...587),
-       (587...590),
-       (590...591),
-       ArgumentsNode(591...595)(
-         [BlockArgumentNode(591...595)(
-            CallNode(592...595)(
-              nil,
-              nil,
-              (592...595),
-              nil,
-              nil,
-              nil,
-              nil,
-              2,
-              "baz"
-            ),
-            (591...592)
-          )]
-       ),
-       (595...596),
-       nil,
-       0,
-       "bar"
-     ),
-     CallNode(597...623)(
-       CallNode(597...600)(
-         nil,
-         nil,
-         (597...600),
-         nil,
-         nil,
-         nil,
-         nil,
-         2,
-         "foo"
-       ),
-       (600...601),
-       (601...604),
-       (604...605),
-       ArgumentsNode(605...622)(
-         [SplatNode(605...610)(
-            (605...606),
-            CallNode(606...610)(
-              nil,
-              nil,
-              (606...610),
-              nil,
-              nil,
-              nil,
-              nil,
-              2,
-              "arga"
-            )
-          ),
-          CallNode(612...615)(
-            nil,
-            nil,
-            (612...615),
-            nil,
-            nil,
-            nil,
-            nil,
-            2,
-            "foo"
-          ),
-          SplatNode(617...622)(
-            (617...618),
-            CallNode(618...622)(
-              nil,
-              nil,
-              (618...622),
-              nil,
-              nil,
-              nil,
-              nil,
-              2,
-              "argb"
-            )
-          )]
-       ),
-       (622...623),
-       nil,
-       0,
-       "bar"
-     ),
-     CallNode(624...638)(
-       CallNode(624...627)(
-         nil,
-         nil,
-         (624...627),
-         nil,
-         nil,
-         nil,
-         nil,
-         2,
-         "foo"
-       ),
-       (627...628),
-       (628...631),
-       (631...632),
-       ArgumentsNode(632...637)(
-         [SplatNode(632...637)(
-            (632...633),
-            CallNode(633...637)(
-              nil,
-              nil,
-              (633...637),
-              nil,
-              nil,
-              nil,
-              nil,
-              2,
-              "args"
-            )
-          )]
-       ),
-       (637...638),
-       nil,
-       0,
-       "bar"
-     ),
-     CallNode(639...658)(
-       CallNode(639...642)(
-         nil,
-         nil,
-         (639...642),
-         nil,
-         nil,
-         nil,
-         nil,
-         2,
-         "foo"
-       ),
-       (642...643),
-       (643...646),
-       (646...647),
-       ArgumentsNode(647...657)(
-         [SplatNode(647...652)(
-            (647...648),
-            CallNode(648...652)(
-              nil,
-              nil,
-              (648...652),
-              nil,
-              nil,
-              nil,
-              nil,
-              2,
-              "args"
-            )
-          ),
-          CallNode(654...657)(
-            nil,
-            nil,
-            (654...657),
-            nil,
-            nil,
-            nil,
-            nil,
-            2,
-            "foo"
-          )]
-       ),
-       (657...658),
-       nil,
-       0,
-       "bar"
-     ),
-     CallNode(659...678)(
-       CallNode(659...662)(
-         nil,
-         nil,
-         (659...662),
-         nil,
-         nil,
-         nil,
-         nil,
-         2,
-         "foo"
-       ),
-       (662...663),
-       (663...666),
-       (666...667),
-       ArgumentsNode(667...677)(
-         [SymbolNode(667...671)((667...668), (668...671), nil, "baz"),
-          BlockArgumentNode(673...677)(
-            CallNode(674...677)(
-              nil,
-              nil,
-              (674...677),
-              nil,
-              nil,
-              nil,
-              nil,
-              2,
-              "baz"
-            ),
-            (673...674)
-          )]
-       ),
-       (677...678),
-       nil,
-       0,
-       "bar"
-     ),
-     CallNode(679...696)(
-       CallNode(679...682)(
-         nil,
-         nil,
-         (679...682),
-         nil,
-         nil,
-         nil,
-         nil,
-         2,
-         "foo"
-       ),
-       (682...683),
-       (683...686),
-       (686...687),
-       ArgumentsNode(687...695)(
-         [KeywordHashNode(687...695)(
-            [AssocNode(687...695)(
-               SymbolNode(687...691)(nil, (687...690), (690...691), "baz"),
-               CallNode(692...695)(
-                 nil,
-                 nil,
-                 (692...695),
-                 nil,
-                 nil,
-                 nil,
-                 nil,
-                 2,
-                 "boz"
-               ),
-               nil
-             )]
-          )]
-       ),
-       (695...696),
-       nil,
-       0,
-       "bar"
-     ),
-     CallNode(697...723)(
-       CallNode(697...700)(
-         nil,
-         nil,
-         (697...700),
-         nil,
-         nil,
-         nil,
-         nil,
-         2,
-         "foo"
-       ),
-       (700...701),
-       (701...704),
-       (704...705),
-       ArgumentsNode(705...722)(
-         [CallNode(705...708)(
-            nil,
-            nil,
-            (705...708),
-            nil,
-            nil,
-            nil,
-            nil,
-            2,
-            "foo"
-          ),
-          KeywordHashNode(710...722)(
-            [AssocNode(710...722)(
-               StringNode(710...715)(
-                 (710...711),
-                 (711...714),
-                 (714...715),
-                 "baz"
-               ),
-               CallNode(719...722)(
-                 nil,
-                 nil,
-                 (719...722),
-                 nil,
-                 nil,
-                 nil,
-                 nil,
-                 2,
-                 "boz"
-               ),
-               (716...718)
-             )]
-          )]
-       ),
-       (722...723),
-       nil,
-       0,
-       "bar"
-     ),
-     CallNode(724...743)(
-       CallNode(724...727)(
-         nil,
-         nil,
-         (724...727),
-         nil,
-         nil,
-         nil,
-         nil,
-         2,
-         "foo"
-       ),
-       (727...728),
-       (728...731),
-       (731...732),
-       ArgumentsNode(732...742)(
-         [CallNode(732...735)(
-            nil,
-            nil,
-            (732...735),
-            nil,
-            nil,
-            nil,
-            nil,
-            2,
-            "foo"
-          ),
-          SplatNode(737...742)(
-            (737...738),
-            CallNode(738...742)(
-              nil,
-              nil,
-              (738...742),
-              nil,
-              nil,
-              nil,
-              nil,
-              2,
-              "args"
-            )
-          )]
-       ),
-       (742...743),
-       nil,
-       0,
-       "bar"
-     ),
-     CallNode(744...771)(
-       CallNode(744...747)(
-         nil,
-         nil,
-         (744...747),
-         nil,
-         nil,
-         nil,
-         nil,
-         2,
-         "foo"
-       ),
-       (747...748),
-       (748...751),
-       (751...752),
-       ArgumentsNode(752...770)(
-         [CallNode(752...755)(
-            nil,
-            nil,
-            (752...755),
-            nil,
-            nil,
-            nil,
-            nil,
-            2,
-            "foo"
-          ),
-          SplatNode(757...762)(
-            (757...758),
-            CallNode(758...762)(
-              nil,
-              nil,
-              (758...762),
-              nil,
-              nil,
-              nil,
-              nil,
-              2,
-              "args"
-            )
-          ),
-          BlockArgumentNode(764...770)(
-            CallNode(765...770)(
-              nil,
-              nil,
-              (765...770),
-              nil,
-              nil,
-              nil,
-              nil,
-              2,
-              "block"
-            ),
-            (764...765)
-          )]
-       ),
-       (770...771),
-       nil,
-       0,
-       "bar"
-     ),
-     CallNode(772...788)(
-       CallNode(772...775)(
-         nil,
-         nil,
-         (772...775),
-         nil,
-         nil,
-         nil,
-         nil,
-         2,
-         "foo"
-       ),
-       (775...776),
-       (776...779),
-       (779...780),
-       ArgumentsNode(780...787)(
-         [CallNode(780...783)(
-            nil,
-            nil,
-            (780...783),
-            nil,
-            nil,
-            nil,
-            nil,
-            2,
-            "foo"
-          ),
-          HashNode(785...787)((785...786), [], (786...787))]
-       ),
-       (787...788),
-       nil,
-       0,
-       "bar"
-     ),
-     CallNode(789...815)(
-       CallNode(789...792)(
-         nil,
-         nil,
-         (789...792),
-         nil,
-         nil,
-         nil,
-         nil,
-         2,
-         "foo"
-       ),
-       (792...793),
-       (793...796),
-       (796...797),
-       ArgumentsNode(797...814)(
-         [HashNode(797...809)(
-            (797...798),
-            [AssocNode(799...807)(
-               SymbolNode(799...803)(nil, (799...802), (802...803), "foo"),
-               CallNode(804...807)(
-                 nil,
-                 nil,
-                 (804...807),
-                 nil,
-                 nil,
-                 nil,
-                 nil,
-                 2,
-                 "boz"
-               ),
-               nil
-             )],
-            (808...809)
-          ),
-          CallNode(811...814)(
-            nil,
-            nil,
-            (811...814),
-            nil,
-            nil,
-            nil,
-            nil,
-            2,
-            "boz"
-          )]
-       ),
-       (814...815),
-       nil,
-       0,
-       "bar"
-     ),
-     CallNode(816...828)(
-       CallNode(816...819)(
-         nil,
-         nil,
-         (816...819),
-         nil,
-         nil,
-         nil,
-         nil,
-         2,
-         "foo"
-       ),
-       (819...820),
-       (820...823),
-       nil,
-       ArgumentsNode(824...828)(
-         [SymbolNode(824...828)((824...825), (825...828), nil, "baz")]
-       ),
-       nil,
-       nil,
-       0,
-       "bar="
-     ),
-     CallNode(829...838)(
-       nil,
-       nil,
-       (829...832),
-       (832...833),
-       ArgumentsNode(833...837)(
-         [KeywordHashNode(833...837)(
-            [AssocNode(833...837)(
-               SymbolNode(833...835)(nil, (833...834), (834...835), "a"),
-               CallNode(836...837)(
-                 nil,
-                 nil,
-                 (836...837),
-                 nil,
-                 nil,
-                 nil,
-                 nil,
-                 2,
-                 "b"
-               ),
-               nil
-             )]
-          )]
-       ),
-       (837...838),
-       nil,
-       0,
-       "foo"
-     ),
-     CallNode(839...850)(
-       CallNode(839...842)(
-         nil,
-         nil,
-         (839...842),
-         nil,
-         nil,
-         nil,
-         nil,
-         2,
-         "foo"
-       ),
-       (842...843),
-       (843...844),
-       (844...845),
-       ArgumentsNode(845...849)(
-         [KeywordHashNode(845...849)(
-            [AssocNode(845...849)(
-               SymbolNode(845...847)(nil, (845...846), (846...847), "a"),
-               CallNode(848...849)(
-                 nil,
-                 nil,
-                 (848...849),
-                 nil,
-                 nil,
-                 nil,
-                 nil,
-                 2,
-                 "b"
-               ),
-               nil
-             )]
-          )]
-       ),
-       (849...850),
-       nil,
-       0,
-       "&"
-     ),
-     CallNode(851...861)(
-       CallNode(851...854)(
-         nil,
-         nil,
-         (851...854),
-         nil,
-         nil,
-         nil,
-         nil,
-         2,
-         "foo"
-       ),
-       (854...855),
-       (855...856),
-       (856...857),
-       ArgumentsNode(857...860)(
-         [KeywordHashNode(857...860)(
-            [AssocSplatNode(857...860)(
-               CallNode(859...860)(
-                 nil,
-                 nil,
-                 (859...860),
-                 nil,
-                 nil,
-                 nil,
-                 nil,
-                 2,
-                 "a"
-               ),
-               (857...859)
-             )]
-          )]
-       ),
-       (860...861),
-       nil,
-       0,
-       "&"
-     ),
-     CallNode(862...871)(
-       CallNode(862...865)(
-         nil,
-         nil,
-         (862...865),
-         nil,
-         nil,
-         nil,
-         nil,
-         2,
-         "foo"
-       ),
-       nil,
-       (865...871),
-       (865...866),
-       ArgumentsNode(866...870)(
-         [SplatNode(866...870)(
-            (866...867),
-            CallNode(867...870)(
-              nil,
-              nil,
-              (867...870),
-              nil,
-              nil,
-              nil,
-              nil,
-              2,
-              "baz"
-            )
-          )]
-       ),
-       (870...871),
-       nil,
-       0,
-       "[]"
-     ),
-     CallNode(872...881)(
-       CallNode(872...875)(
-         nil,
-         nil,
-         (872...875),
-         nil,
-         nil,
-         nil,
-         nil,
-         2,
-         "foo"
-       ),
-       nil,
-       (875...881),
-       (875...876),
-       ArgumentsNode(876...880)(
-         [IntegerNode(876...877)(), IntegerNode(879...880)()]
-       ),
-       (880...881),
-       nil,
-       0,
-       "[]"
-     ),
-     CallNode(882...887)(
-       CallNode(882...885)(
-         nil,
-         nil,
-         (882...885),
-         nil,
-         nil,
-         nil,
-         nil,
-         2,
-         "foo"
-       ),
-       nil,
-       (885...887),
-       (885...886),
-       nil,
-       (886...887),
-       nil,
-       0,
-       "[]"
-     ),
-     CallNode(888...896)(
-       SelfNode(888...892)(),
-       (892...893),
-       (893...896),
-       nil,
-       nil,
-       nil,
-       nil,
-       0,
-       "foo"
-     ),
-     CallNode(897...910)(
-       SelfNode(897...901)(),
-       (901...902),
-       (902...905),
-       nil,
-       ArgumentsNode(906...910)(
-         [SymbolNode(906...910)((906...907), (907...910), nil, "bar")]
-       ),
-       nil,
-       nil,
-       0,
-       "foo="
-     ),
-     CallNode(911...928)(
-       ParenthesesNode(911...918)(
-         StatementsNode(912...917)(
-           [CallNode(912...917)(
-              CallNode(912...913)(
-                nil,
-                nil,
-                (912...913),
-                nil,
-                nil,
-                nil,
-                nil,
-                2,
-                "a"
-              ),
-              nil,
-              (914...915),
-              nil,
-              ArgumentsNode(916...917)(
-                [CallNode(916...917)(
-                   nil,
-                   nil,
-                   (916...917),
-                   nil,
-                   nil,
-                   nil,
-                   nil,
-                   2,
-                   "b"
-                 )]
-              ),
-              nil,
-              nil,
-              0,
-              "+"
-            )]
-         ),
-         (911...912),
-         (917...918)
-       ),
-       nil,
-       (919...920),
-       nil,
-       ArgumentsNode(921...928)(
-         [ParenthesesNode(921...928)(
-            StatementsNode(922...927)(
-              [CallNode(922...927)(
-                 CallNode(922...923)(
-                   nil,
-                   nil,
-                   (922...923),
-                   nil,
-                   nil,
-                   nil,
-                   nil,
-                   2,
-                   "c"
-                 ),
-                 nil,
-                 (924...925),
-                 nil,
-                 ArgumentsNode(926...927)(
-                   [CallNode(926...927)(
-                      nil,
-                      nil,
-                      (926...927),
-                      nil,
-                      nil,
-                      nil,
-                      nil,
-                      2,
-                      "d"
-                    )]
-                 ),
-                 nil,
-                 nil,
-                 0,
-                 "-"
-               )]
-            ),
-            (921...922),
-            (927...928)
-          )]
-       ),
-       nil,
-       nil,
-       0,
-       "/"
-     ),
-     CallNode(929...948)(
-       ParenthesesNode(929...936)(
-         StatementsNode(930...935)(
-           [CallNode(930...935)(
-              CallNode(930...931)(
-                nil,
-                nil,
-                (930...931),
-                nil,
-                nil,
-                nil,
-                nil,
-                2,
-                "a"
-              ),
-              nil,
-              (932...933),
-              nil,
-              ArgumentsNode(934...935)(
-                [CallNode(934...935)(
-                   nil,
-                   nil,
-                   (934...935),
-                   nil,
-                   nil,
-                   nil,
-                   nil,
-                   2,
-                   "b"
-                 )]
-              ),
-              nil,
-              nil,
-              0,
-              "+"
-            )]
-         ),
-         (929...930),
-         (935...936)
-       ),
-       nil,
-       (937...938),
-       nil,
-       ArgumentsNode(939...948)(
-         [CallNode(939...948)(
-            CallNode(939...940)(
-              nil,
-              nil,
-              (939...940),
-              nil,
-              nil,
-              nil,
-              nil,
-              2,
-              "c"
-            ),
-            (940...941),
-            (941...942),
-            (942...943),
-            ArgumentsNode(943...947)(
-              [CallNode(943...944)(
-                 nil,
-                 nil,
-                 (943...944),
-                 nil,
-                 nil,
-                 nil,
-                 nil,
-                 2,
-                 "e"
-               ),
-               CallNode(946...947)(
-                 nil,
-                 nil,
-                 (946...947),
-                 nil,
-                 nil,
-                 nil,
-                 nil,
-                 2,
-                 "f"
-               )]
-            ),
-            (947...948),
-            nil,
-            0,
-            "-"
-          )]
-       ),
-       nil,
-       nil,
-       0,
-       "/"
-     ),
-     CallNode(949...966)(
-       ParenthesesNode(949...956)(
-         StatementsNode(950...955)(
-           [CallNode(950...955)(
-              CallNode(950...951)(
-                nil,
-                nil,
-                (950...951),
-                nil,
-                nil,
-                nil,
-                nil,
-                2,
-                "a"
-              ),
-              nil,
-              (952...953),
-              nil,
-              ArgumentsNode(954...955)(
-                [CallNode(954...955)(
-                   nil,
-                   nil,
-                   (954...955),
-                   nil,
-                   nil,
-                   nil,
-                   nil,
-                   2,
-                   "b"
-                 )]
-              ),
-              nil,
-              nil,
-              0,
-              "+"
-            )]
-         ),
-         (949...950),
-         (955...956)
-       ),
-       nil,
-       (957...958),
-       nil,
-       ArgumentsNode(959...966)(
-         [CallNode(959...966)(
-            CallNode(959...960)(
-              nil,
-              nil,
-              (959...960),
-              nil,
-              nil,
-              nil,
-              nil,
-              2,
-              "c"
-            ),
-            (960...961),
-            (961...962),
-            (962...963),
-            ArgumentsNode(963...965)(
-              [SplatNode(963...965)(
-                 (963...964),
-                 CallNode(964...965)(
-                   nil,
-                   nil,
-                   (964...965),
-                   nil,
-                   nil,
-                   nil,
-                   nil,
-                   2,
-                   "f"
-                 )
-               )]
-            ),
-            (965...966),
-            nil,
-            0,
-            "-"
-          )]
-       ),
-       nil,
-       nil,
-       0,
-       "/"
-     ),
-     CallNode(967...975)(
-       nil,
-       nil,
-       (967...968),
-       (968...969),
-       ArgumentsNode(969...974)(
-         [KeywordHashNode(969...974)(
-            [AssocSplatNode(969...974)(
-               CallNode(971...974)(
-                 nil,
-                 nil,
-                 (971...974),
-                 nil,
-                 nil,
-                 nil,
-                 nil,
-                 2,
-                 "foo"
-               ),
-               (969...971)
-             )]
-          )]
-       ),
-       (974...975),
-       nil,
-       0,
-       "x"
-     ),
-     CallNode(976...982)(
-       CallNode(976...979)(
-         nil,
-         nil,
-         (976...979),
-         nil,
-         nil,
-         nil,
-         nil,
-         2,
-         "foo"
-       ),
-       (979...981),
-       (981...982),
-       nil,
-       nil,
-       nil,
-       nil,
-       1,
-       "!"
-     ),
-     CallNode(983...991)(
-       CallNode(983...986)(
-         nil,
-         nil,
-         (983...986),
-         nil,
-         nil,
-         nil,
-         nil,
-         2,
-         "foo"
-       ),
-       (986...987),
-       (987...988),
-       (988...989),
-       ArgumentsNode(989...990)(
-         [CallNode(989...990)(
-            nil,
-            nil,
-            (989...990),
-            nil,
-            nil,
-            nil,
-            nil,
-            2,
-            "b"
-          )]
-       ),
-       (990...991),
-       nil,
-       0,
-       "~"
-     ),
-     CallNode(992...999)(
-       CallNode(992...993)(nil, nil, (992...993), nil, nil, nil, nil, 2, "a"),
-       (993...995),
-       (995...996),
-       (996...997),
-       ArgumentsNode(997...998)(
-         [CallNode(997...998)(
-            nil,
-            nil,
-            (997...998),
-            nil,
-            nil,
-            nil,
-            nil,
-            2,
-            "b"
-          )]
-       ),
-       (998...999),
-       nil,
-       1,
-       "+"
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/unparser/corpus/literal/since/27.txt b/test/yarp/snapshots/unparser/corpus/literal/since/27.txt
deleted file mode 100644
index f8709ae21af282..00000000000000
--- a/test/yarp/snapshots/unparser/corpus/literal/since/27.txt
+++ /dev/null
@@ -1,44 +0,0 @@
-ProgramNode(0...22)(
-  [],
-  StatementsNode(0...22)(
-    [LambdaNode(0...16)(
-       [],
-       (0...2),
-       (3...4),
-       (15...16),
-       nil,
-       StatementsNode(7...14)(
-         [CallNode(7...14)(
-            CallNode(7...9)(nil, nil, (7...9), nil, nil, nil, nil, 2, "_1"),
-            nil,
-            (10...11),
-            nil,
-            ArgumentsNode(12...14)(
-              [CallNode(12...14)(
-                 nil,
-                 nil,
-                 (12...14),
-                 nil,
-                 nil,
-                 nil,
-                 nil,
-                 2,
-                 "_2"
-               )]
-            ),
-            nil,
-            nil,
-            0,
-            "+"
-          )]
-       )
-     ),
-     ParenthesesNode(17...22)(
-       StatementsNode(18...21)(
-         [RangeNode(18...21)(nil, IntegerNode(20...21)(), (18...20), 0)]
-       ),
-       (17...18),
-       (21...22)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/unparser/corpus/literal/since/30.txt b/test/yarp/snapshots/unparser/corpus/literal/since/30.txt
deleted file mode 100644
index 4aba7677950132..00000000000000
--- a/test/yarp/snapshots/unparser/corpus/literal/since/30.txt
+++ /dev/null
@@ -1,56 +0,0 @@
-ProgramNode(0...51)(
-  [:a, :foo],
-  StatementsNode(0...51)(
-    [MatchRequiredNode(0...8)(
-       IntegerNode(0...1)(),
-       ArrayPatternNode(5...8)(
-         nil,
-         [LocalVariableTargetNode(6...7)(:a, 0)],
-         nil,
-         [],
-         (5...6),
-         (7...8)
-       ),
-       (2...4)
-     ),
-     MatchRequiredNode(9...17)(
-       IntegerNode(9...10)(),
-       ArrayPatternNode(14...17)(
-         nil,
-         [],
-         SplatNode(15...16)((15...16), nil),
-         [],
-         (14...15),
-         (16...17)
-       ),
-       (11...13)
-     ),
-     MatchPredicateNode(18...33)(
-       IntegerNode(18...19)(),
-       FindPatternNode(23...33)(
-         nil,
-         SplatNode(24...25)((24...25), nil),
-         [IntegerNode(27...29)()],
-         SplatNode(31...32)((31...32), nil),
-         (23...24),
-         (32...33)
-       ),
-       (20...22)
-     ),
-     MatchPredicateNode(34...51)(
-       IntegerNode(34...35)(),
-       FindPatternNode(39...51)(
-         nil,
-         SplatNode(40...41)((40...41), nil),
-         [LocalVariableTargetNode(43...44)(:a, 0)],
-         SplatNode(46...50)(
-           (46...47),
-           LocalVariableTargetNode(47...50)(:foo, 0)
-         ),
-         (39...40),
-         (50...51)
-       ),
-       (36...38)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/unparser/corpus/literal/since/31.txt b/test/yarp/snapshots/unparser/corpus/literal/since/31.txt
deleted file mode 100644
index f21bf30e0473d2..00000000000000
--- a/test/yarp/snapshots/unparser/corpus/literal/since/31.txt
+++ /dev/null
@@ -1,75 +0,0 @@
-ProgramNode(0...51)(
-  [],
-  StatementsNode(0...51)(
-    [DefNode(0...23)(
-       (4...7),
-       nil,
-       ParametersNode(8...9)(
-         [],
-         [],
-         [],
-         nil,
-         [],
-         nil,
-         BlockParameterNode(8...9)(nil, nil, (8...9))
-       ),
-       StatementsNode(13...19)(
-         [CallNode(13...19)(
-            nil,
-            nil,
-            (13...16),
-            (16...17),
-            ArgumentsNode(17...18)(
-              [BlockArgumentNode(17...18)(nil, (17...18))]
-            ),
-            (18...19),
-            nil,
-            0,
-            "bar"
-          )]
-       ),
-       [:&],
-       (0...3),
-       nil,
-       (7...8),
-       (9...10),
-       nil,
-       (20...23)
-     ),
-     DefNode(25...51)(
-       (29...32),
-       nil,
-       ParametersNode(33...37)(
-         [RequiredParameterNode(33...34)(:a)],
-         [],
-         [],
-         nil,
-         [],
-         nil,
-         BlockParameterNode(36...37)(nil, nil, (36...37))
-       ),
-       StatementsNode(41...47)(
-         [CallNode(41...47)(
-            nil,
-            nil,
-            (41...44),
-            (44...45),
-            ArgumentsNode(45...46)(
-              [BlockArgumentNode(45...46)(nil, (45...46))]
-            ),
-            (46...47),
-            nil,
-            0,
-            "bar"
-          )]
-       ),
-       [:a, :&],
-       (25...28),
-       nil,
-       (32...33),
-       (37...38),
-       nil,
-       (48...51)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/unparser/corpus/literal/since/32.txt b/test/yarp/snapshots/unparser/corpus/literal/since/32.txt
deleted file mode 100644
index 31397bf46874e3..00000000000000
--- a/test/yarp/snapshots/unparser/corpus/literal/since/32.txt
+++ /dev/null
@@ -1,79 +0,0 @@
-ProgramNode(0...90)(
-  [],
-  StatementsNode(0...90)(
-    [DefNode(0...45)(
-       (4...7),
-       nil,
-       ParametersNode(8...20)(
-         [RequiredParameterNode(8...16)(:argument)],
-         [],
-         [],
-         nil,
-         [],
-         KeywordRestParameterNode(18...20)((18...20), nil),
-         nil
-       ),
-       StatementsNode(24...41)(
-         [CallNode(24...41)(
-            nil,
-            nil,
-            (24...27),
-            (27...28),
-            ArgumentsNode(28...40)(
-              [LocalVariableReadNode(28...36)(:argument, 0),
-               KeywordHashNode(38...40)(
-                 [AssocSplatNode(38...40)(nil, (38...40))]
-               )]
-            ),
-            (40...41),
-            nil,
-            0,
-            "bar"
-          )]
-       ),
-       [:argument, :**],
-       (0...3),
-       nil,
-       (7...8),
-       (20...21),
-       nil,
-       (42...45)
-     ),
-     DefNode(47...90)(
-       (51...54),
-       nil,
-       ParametersNode(55...66)(
-         [RequiredParameterNode(55...63)(:argument)],
-         [],
-         [],
-         RestParameterNode(65...66)((65...66), nil),
-         [],
-         nil,
-         nil
-       ),
-       StatementsNode(70...86)(
-         [CallNode(70...86)(
-            nil,
-            nil,
-            (70...73),
-            (73...74),
-            ArgumentsNode(74...85)(
-              [LocalVariableReadNode(74...82)(:argument, 0),
-               SplatNode(84...85)((84...85), nil)]
-            ),
-            (85...86),
-            nil,
-            0,
-            "bar"
-          )]
-       ),
-       [:argument, :*],
-       (47...50),
-       nil,
-       (54...55),
-       (66...67),
-       nil,
-       (87...90)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/unparser/corpus/literal/singletons.txt b/test/yarp/snapshots/unparser/corpus/literal/singletons.txt
deleted file mode 100644
index 53cc92e636b95c..00000000000000
--- a/test/yarp/snapshots/unparser/corpus/literal/singletons.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-ProgramNode(0...19)(
-  [],
-  StatementsNode(0...19)(
-    [FalseNode(0...5)(),
-     NilNode(6...9)(),
-     SelfNode(10...14)(),
-     TrueNode(15...19)()]
-  )
-)
diff --git a/test/yarp/snapshots/unparser/corpus/literal/super.txt b/test/yarp/snapshots/unparser/corpus/literal/super.txt
deleted file mode 100644
index 191e0a5b918bfd..00000000000000
--- a/test/yarp/snapshots/unparser/corpus/literal/super.txt
+++ /dev/null
@@ -1,239 +0,0 @@
-ProgramNode(0...159)(
-  [],
-  StatementsNode(0...159)(
-    [ForwardingSuperNode(0...5)(nil),
-     SuperNode(6...13)((6...11), (11...12), nil, (12...13), nil),
-     SuperNode(14...22)(
-       (14...19),
-       (19...20),
-       ArgumentsNode(20...21)(
-         [CallNode(20...21)(nil, nil, (20...21), nil, nil, nil, nil, 2, "a")]
-       ),
-       (21...22),
-       nil
-     ),
-     SuperNode(23...34)(
-       (23...28),
-       (28...29),
-       ArgumentsNode(29...33)(
-         [CallNode(29...30)(nil, nil, (29...30), nil, nil, nil, nil, 2, "a"),
-          CallNode(32...33)(nil, nil, (32...33), nil, nil, nil, nil, 2, "b")]
-       ),
-       (33...34),
-       nil
-     ),
-     SuperNode(35...48)(
-       (35...40),
-       (40...41),
-       ArgumentsNode(41...47)(
-         [BlockArgumentNode(41...47)(
-            CallNode(42...47)(
-              nil,
-              nil,
-              (42...47),
-              nil,
-              nil,
-              nil,
-              nil,
-              2,
-              "block"
-            ),
-            (41...42)
-          )]
-       ),
-       (47...48),
-       nil
-     ),
-     SuperNode(49...65)(
-       (49...54),
-       (54...55),
-       ArgumentsNode(55...64)(
-         [CallNode(55...56)(nil, nil, (55...56), nil, nil, nil, nil, 2, "a"),
-          BlockArgumentNode(58...64)(
-            CallNode(59...64)(
-              nil,
-              nil,
-              (59...64),
-              nil,
-              nil,
-              nil,
-              nil,
-              2,
-              "block"
-            ),
-            (58...59)
-          )]
-       ),
-       (64...65),
-       nil
-     ),
-     SuperNode(66...84)(
-       (66...71),
-       (71...72),
-       ArgumentsNode(72...83)(
-         [CallNode(72...83)(
-            nil,
-            nil,
-            (72...73),
-            nil,
-            nil,
-            nil,
-            BlockNode(74...83)(
-              [],
-              nil,
-              StatementsNode(78...81)(
-                [CallNode(78...81)(
-                   nil,
-                   nil,
-                   (78...81),
-                   nil,
-                   nil,
-                   nil,
-                   nil,
-                   2,
-                   "foo"
-                 )]
-              ),
-              (74...75),
-              (82...83)
-            ),
-            0,
-            "a"
-          )]
-       ),
-       (83...84),
-       nil
-     ),
-     ForwardingSuperNode(85...100)(
-       BlockNode(91...100)(
-         [],
-         nil,
-         StatementsNode(95...98)(
-           [CallNode(95...98)(
-              nil,
-              nil,
-              (95...98),
-              nil,
-              nil,
-              nil,
-              nil,
-              2,
-              "foo"
-            )]
-         ),
-         (91...92),
-         (99...100)
-       )
-     ),
-     SuperNode(101...119)(
-       (101...106),
-       (106...107),
-       ArgumentsNode(107...108)(
-         [CallNode(107...108)(
-            nil,
-            nil,
-            (107...108),
-            nil,
-            nil,
-            nil,
-            nil,
-            2,
-            "a"
-          )]
-       ),
-       (108...109),
-       BlockNode(110...119)(
-         [],
-         nil,
-         StatementsNode(114...117)(
-           [CallNode(114...117)(
-              nil,
-              nil,
-              (114...117),
-              nil,
-              nil,
-              nil,
-              nil,
-              2,
-              "foo"
-            )]
-         ),
-         (110...111),
-         (118...119)
-       )
-     ),
-     SuperNode(120...137)(
-       (120...125),
-       (125...126),
-       nil,
-       (126...127),
-       BlockNode(128...137)(
-         [],
-         nil,
-         StatementsNode(132...135)(
-           [CallNode(132...135)(
-              nil,
-              nil,
-              (132...135),
-              nil,
-              nil,
-              nil,
-              nil,
-              2,
-              "foo"
-            )]
-         ),
-         (128...129),
-         (136...137)
-       )
-     ),
-     SuperNode(138...159)(
-       (138...143),
-       (143...144),
-       ArgumentsNode(144...148)(
-         [CallNode(144...145)(
-            nil,
-            nil,
-            (144...145),
-            nil,
-            nil,
-            nil,
-            nil,
-            2,
-            "a"
-          ),
-          CallNode(147...148)(
-            nil,
-            nil,
-            (147...148),
-            nil,
-            nil,
-            nil,
-            nil,
-            2,
-            "b"
-          )]
-       ),
-       (148...149),
-       BlockNode(150...159)(
-         [],
-         nil,
-         StatementsNode(154...157)(
-           [CallNode(154...157)(
-              nil,
-              nil,
-              (154...157),
-              nil,
-              nil,
-              nil,
-              nil,
-              2,
-              "foo"
-            )]
-         ),
-         (150...151),
-         (158...159)
-       )
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/unparser/corpus/literal/unary.txt b/test/yarp/snapshots/unparser/corpus/literal/unary.txt
deleted file mode 100644
index d4279a42221f46..00000000000000
--- a/test/yarp/snapshots/unparser/corpus/literal/unary.txt
+++ /dev/null
@@ -1,217 +0,0 @@
-ProgramNode(0...54)(
-  [],
-  StatementsNode(0...54)(
-    [CallNode(0...2)(
-       IntegerNode(1...2)(),
-       nil,
-       (0...1),
-       nil,
-       nil,
-       nil,
-       nil,
-       0,
-       "!"
-     ),
-     CallNode(3...8)(
-       ParenthesesNode(4...8)(
-         StatementsNode(5...7)(
-           [CallNode(5...7)(
-              IntegerNode(6...7)(),
-              nil,
-              (5...6),
-              nil,
-              nil,
-              nil,
-              nil,
-              0,
-              "!"
-            )]
-         ),
-         (4...5),
-         (7...8)
-       ),
-       nil,
-       (3...4),
-       nil,
-       nil,
-       nil,
-       nil,
-       0,
-       "!"
-     ),
-     CallNode(9...25)(
-       ParenthesesNode(10...25)(
-         StatementsNode(11...24)(
-           [CallNode(11...24)(
-              ParenthesesNode(12...24)(
-                StatementsNode(13...23)(
-                  [OrNode(13...23)(
-                     CallNode(13...16)(
-                       nil,
-                       nil,
-                       (13...16),
-                       nil,
-                       nil,
-                       nil,
-                       nil,
-                       2,
-                       "foo"
-                     ),
-                     CallNode(20...23)(
-                       nil,
-                       nil,
-                       (20...23),
-                       nil,
-                       nil,
-                       nil,
-                       nil,
-                       2,
-                       "bar"
-                     ),
-                     (17...19)
-                   )]
-                ),
-                (12...13),
-                (23...24)
-              ),
-              nil,
-              (11...12),
-              nil,
-              nil,
-              nil,
-              nil,
-              0,
-              "!"
-            )]
-         ),
-         (10...11),
-         (24...25)
-       ),
-       nil,
-       (9...10),
-       nil,
-       nil,
-       nil,
-       nil,
-       0,
-       "!"
-     ),
-     CallNode(26...35)(
-       CallNode(27...35)(
-         ParenthesesNode(27...31)(
-           StatementsNode(28...30)(
-             [CallNode(28...30)(
-                IntegerNode(29...30)(),
-                nil,
-                (28...29),
-                nil,
-                nil,
-                nil,
-                nil,
-                0,
-                "!"
-              )]
-           ),
-           (27...28),
-           (30...31)
-         ),
-         (31...32),
-         (32...35),
-         nil,
-         nil,
-         nil,
-         nil,
-         0,
-         "baz"
-       ),
-       nil,
-       (26...27),
-       nil,
-       nil,
-       nil,
-       nil,
-       0,
-       "!"
-     ),
-     CallNode(36...38)(
-       CallNode(37...38)(nil, nil, (37...38), nil, nil, nil, nil, 2, "a"),
-       nil,
-       (36...37),
-       nil,
-       nil,
-       nil,
-       nil,
-       0,
-       "~"
-     ),
-     CallNode(39...41)(
-       CallNode(40...41)(nil, nil, (40...41), nil, nil, nil, nil, 2, "a"),
-       nil,
-       (39...40),
-       nil,
-       nil,
-       nil,
-       nil,
-       0,
-       "-@"
-     ),
-     CallNode(42...44)(
-       CallNode(43...44)(nil, nil, (43...44), nil, nil, nil, nil, 2, "a"),
-       nil,
-       (42...43),
-       nil,
-       nil,
-       nil,
-       nil,
-       0,
-       "+@"
-     ),
-     CallNode(45...54)(
-       CallNode(46...54)(
-         ParenthesesNode(46...50)(
-           StatementsNode(47...49)(
-             [CallNode(47...49)(
-                CallNode(48...49)(
-                  nil,
-                  nil,
-                  (48...49),
-                  nil,
-                  nil,
-                  nil,
-                  nil,
-                  2,
-                  "a"
-                ),
-                nil,
-                (47...48),
-                nil,
-                nil,
-                nil,
-                nil,
-                0,
-                "-@"
-              )]
-           ),
-           (46...47),
-           (49...50)
-         ),
-         (50...51),
-         (51...54),
-         nil,
-         nil,
-         nil,
-         nil,
-         0,
-         "foo"
-       ),
-       nil,
-       (45...46),
-       nil,
-       nil,
-       nil,
-       nil,
-       0,
-       "-@"
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/unparser/corpus/literal/undef.txt b/test/yarp/snapshots/unparser/corpus/literal/undef.txt
deleted file mode 100644
index 30e513d19e9fbd..00000000000000
--- a/test/yarp/snapshots/unparser/corpus/literal/undef.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-ProgramNode(0...27)(
-  [],
-  StatementsNode(0...27)(
-    [UndefNode(0...10)(
-       [SymbolNode(6...10)((6...7), (7...10), nil, "foo")],
-       (0...5)
-     ),
-     UndefNode(11...27)(
-       [SymbolNode(17...21)((17...18), (18...21), nil, "foo"),
-        SymbolNode(23...27)((23...24), (24...27), nil, "bar")],
-       (11...16)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/unparser/corpus/literal/variables.txt b/test/yarp/snapshots/unparser/corpus/literal/variables.txt
deleted file mode 100644
index f012dc900c2890..00000000000000
--- a/test/yarp/snapshots/unparser/corpus/literal/variables.txt
+++ /dev/null
@@ -1,31 +0,0 @@
-ProgramNode(0...66)(
-  [],
-  StatementsNode(0...66)(
-    [CallNode(0...1)(nil, nil, (0...1), nil, nil, nil, nil, 2, "a"),
-     InstanceVariableReadNode(2...4)(:@a),
-     ClassVariableReadNode(5...8)(:@@a),
-     GlobalVariableReadNode(9...11)(:$a),
-     NumberedReferenceReadNode(12...14)(1),
-     BackReferenceReadNode(15...17)(),
-     ConstantReadNode(18...23)(:CONST),
-     ConstantPathNode(24...37)(
-       ConstantReadNode(24...30)(:SCOPED),
-       ConstantReadNode(32...37)(:CONST),
-       (30...32)
-     ),
-     ConstantPathNode(38...48)(
-       nil,
-       ConstantReadNode(40...48)(:TOPLEVEL),
-       (38...40)
-     ),
-     ConstantPathNode(49...66)(
-       ConstantPathNode(49...59)(
-         nil,
-         ConstantReadNode(51...59)(:TOPLEVEL),
-         (49...51)
-       ),
-       ConstantReadNode(61...66)(:CONST),
-       (59...61)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/unparser/corpus/literal/while.txt b/test/yarp/snapshots/unparser/corpus/literal/while.txt
deleted file mode 100644
index 4d924f0d3df9fa..00000000000000
--- a/test/yarp/snapshots/unparser/corpus/literal/while.txt
+++ /dev/null
@@ -1,653 +0,0 @@
-ProgramNode(0...620)(
-  [:x],
-  StatementsNode(0...620)(
-    [ModuleNode(0...68)(
-       [],
-       (0...6),
-       ConstantReadNode(7...8)(:A),
-       StatementsNode(11...64)(
-         [CallNode(11...64)(
-            nil,
-            nil,
-            (11...14),
-            nil,
-            nil,
-            nil,
-            BlockNode(15...64)(
-              [:bar, :foo],
-              BlockParametersNode(17...22)(
-                ParametersNode(18...21)(
-                  [RequiredParameterNode(18...21)(:bar)],
-                  [],
-                  [],
-                  nil,
-                  [],
-                  nil,
-                  nil
-                ),
-                [],
-                (17...18),
-                (21...22)
-              ),
-              StatementsNode(27...60)(
-                [WhileNode(27...60)(
-                   (27...32),
-                   (57...60),
-                   CallNode(33...36)(
-                     nil,
-                     nil,
-                     (33...36),
-                     nil,
-                     nil,
-                     nil,
-                     nil,
-                     2,
-                     "foo"
-                   ),
-                   StatementsNode(43...52)(
-                     [LocalVariableWriteNode(43...52)(
-                        :foo,
-                        0,
-                        (43...46),
-                        LocalVariableReadNode(49...52)(:bar, 0),
-                        (47...48)
-                      )]
-                   ),
-                   0
-                 )]
-              ),
-              (15...16),
-              (63...64)
-            ),
-            0,
-            "foo"
-          )]
-       ),
-       (65...68),
-       :A,
-       :A
-     ),
-     DefNode(70...110)(
-       (74...77),
-       nil,
-       nil,
-       StatementsNode(80...106)(
-         [WhileNode(80...106)(
-            (90...95),
-            nil,
-            CallNode(96...106)(
-              LocalVariableReadNode(96...99)(:foo, 0),
-              nil,
-              (100...102),
-              nil,
-              ArgumentsNode(103...106)(
-                [CallNode(103...106)(
-                   nil,
-                   nil,
-                   (103...106),
-                   nil,
-                   nil,
-                   nil,
-                   nil,
-                   2,
-                   "baz"
-                 )]
-              ),
-              nil,
-              nil,
-              0,
-              "!="
-            ),
-            StatementsNode(80...89)(
-              [LocalVariableWriteNode(80...89)(
-                 :foo,
-                 0,
-                 (80...83),
-                 CallNode(86...89)(
-                   nil,
-                   nil,
-                   (86...89),
-                   nil,
-                   nil,
-                   nil,
-                   nil,
-                   2,
-                   "bar"
-                 ),
-                 (84...85)
-               )]
-            ),
-            0
-          )]
-       ),
-       [:foo],
-       (70...73),
-       nil,
-       nil,
-       nil,
-       nil,
-       (107...110)
-     ),
-     ModuleNode(112...146)(
-       [:foo],
-       (112...118),
-       ConstantReadNode(119...120)(:A),
-       StatementsNode(123...142)(
-         [WhileNode(123...142)(
-            (133...138),
-            nil,
-            LocalVariableReadNode(139...142)(:foo, 0),
-            StatementsNode(123...132)(
-              [LocalVariableWriteNode(123...132)(
-                 :foo,
-                 0,
-                 (123...126),
-                 CallNode(129...132)(
-                   nil,
-                   nil,
-                   (129...132),
-                   nil,
-                   nil,
-                   nil,
-                   nil,
-                   2,
-                   "bar"
-                 ),
-                 (127...128)
-               )]
-            ),
-            0
-          )]
-       ),
-       (143...146),
-       :A,
-       :A
-     ),
-     ModuleNode(148...182)(
-       [:foo],
-       (148...154),
-       ConstantReadNode(155...156)(:A),
-       StatementsNode(159...178)(
-         [UntilNode(159...178)(
-            (169...174),
-            nil,
-            LocalVariableReadNode(175...178)(:foo, 0),
-            StatementsNode(159...168)(
-              [LocalVariableWriteNode(159...168)(
-                 :foo,
-                 0,
-                 (159...162),
-                 CallNode(165...168)(
-                   nil,
-                   nil,
-                   (165...168),
-                   nil,
-                   nil,
-                   nil,
-                   nil,
-                   2,
-                   "bar"
-                 ),
-                 (163...164)
-               )]
-            ),
-            0
-          )]
-       ),
-       (179...182),
-       :A,
-       :A
-     ),
-     ModuleNode(184...228)(
-       [:foo],
-       (184...190),
-       ConstantReadNode(191...192)(:A),
-       StatementsNode(195...224)(
-         [WhileNode(195...224)(
-            (195...200),
-            (221...224),
-            CallNode(201...204)(
-              nil,
-              nil,
-              (201...204),
-              nil,
-              nil,
-              nil,
-              nil,
-              2,
-              "foo"
-            ),
-            StatementsNode(209...218)(
-              [LocalVariableWriteNode(209...218)(
-                 :foo,
-                 0,
-                 (209...212),
-                 CallNode(215...218)(
-                   nil,
-                   nil,
-                   (215...218),
-                   nil,
-                   nil,
-                   nil,
-                   nil,
-                   2,
-                   "bar"
-                 ),
-                 (213...214)
-               )]
-            ),
-            0
-          )]
-       ),
-       (225...228),
-       :A,
-       :A
-     ),
-     ModuleNode(230...299)(
-       [],
-       (230...236),
-       ConstantReadNode(237...238)(:A),
-       StatementsNode(241...295)(
-         [CallNode(241...295)(
-            nil,
-            nil,
-            (241...245),
-            nil,
-            nil,
-            nil,
-            BlockNode(246...295)(
-              [:baz, :foo],
-              BlockParametersNode(248...253)(
-                ParametersNode(249...252)(
-                  [RequiredParameterNode(249...252)(:baz)],
-                  [],
-                  [],
-                  nil,
-                  [],
-                  nil,
-                  nil
-                ),
-                [],
-                (248...249),
-                (252...253)
-              ),
-              StatementsNode(258...291)(
-                [WhileNode(258...291)(
-                   (258...263),
-                   (288...291),
-                   CallNode(264...267)(
-                     nil,
-                     nil,
-                     (264...267),
-                     nil,
-                     nil,
-                     nil,
-                     nil,
-                     2,
-                     "foo"
-                   ),
-                   StatementsNode(274...283)(
-                     [LocalVariableWriteNode(274...283)(
-                        :foo,
-                        0,
-                        (274...277),
-                        CallNode(280...283)(
-                          nil,
-                          nil,
-                          (280...283),
-                          nil,
-                          nil,
-                          nil,
-                          nil,
-                          2,
-                          "bar"
-                        ),
-                        (278...279)
-                      )]
-                   ),
-                   0
-                 )]
-              ),
-              (246...247),
-              (294...295)
-            ),
-            0,
-            "each"
-          )]
-       ),
-       (296...299),
-       :A,
-       :A
-     ),
-     ModuleNode(301...370)(
-       [],
-       (301...307),
-       ConstantReadNode(308...309)(:A),
-       StatementsNode(312...366)(
-         [CallNode(312...366)(
-            nil,
-            nil,
-            (312...316),
-            nil,
-            nil,
-            nil,
-            BlockNode(317...366)(
-              [:foo],
-              BlockParametersNode(319...324)(
-                ParametersNode(320...323)(
-                  [RequiredParameterNode(320...323)(:foo)],
-                  [],
-                  [],
-                  nil,
-                  [],
-                  nil,
-                  nil
-                ),
-                [],
-                (319...320),
-                (323...324)
-              ),
-              StatementsNode(329...362)(
-                [WhileNode(329...362)(
-                   (329...334),
-                   (359...362),
-                   LocalVariableReadNode(335...338)(:foo, 0),
-                   StatementsNode(345...354)(
-                     [LocalVariableWriteNode(345...354)(
-                        :foo,
-                        0,
-                        (345...348),
-                        CallNode(351...354)(
-                          nil,
-                          nil,
-                          (351...354),
-                          nil,
-                          nil,
-                          nil,
-                          nil,
-                          2,
-                          "bar"
-                        ),
-                        (349...350)
-                      )]
-                   ),
-                   0
-                 )]
-              ),
-              (317...318),
-              (365...366)
-            ),
-            0,
-            "each"
-          )]
-       ),
-       (367...370),
-       :A,
-       :A
-     ),
-     LocalVariableWriteNode(371...402)(
-       :x,
-       0,
-       (371...372),
-       ParenthesesNode(375...402)(
-         StatementsNode(376...401)(
-           [WhileNode(376...401)(
-              (392...397),
-              nil,
-              CallNode(398...401)(
-                nil,
-                nil,
-                (398...401),
-                nil,
-                nil,
-                nil,
-                nil,
-                2,
-                "baz"
-              ),
-              StatementsNode(376...391)(
-                [BeginNode(376...391)(
-                   (376...381),
-                   StatementsNode(384...387)(
-                     [CallNode(384...387)(
-                        nil,
-                        nil,
-                        (384...387),
-                        nil,
-                        nil,
-                        nil,
-                        nil,
-                        2,
-                        "foo"
-                      )]
-                   ),
-                   nil,
-                   nil,
-                   nil,
-                   (388...391)
-                 )]
-              ),
-              1
-            )]
-         ),
-         (375...376),
-         (401...402)
-       ),
-       (373...374)
-     ),
-     WhileNode(403...428)(
-       (419...424),
-       nil,
-       CallNode(425...428)(
-         nil,
-         nil,
-         (425...428),
-         nil,
-         nil,
-         nil,
-         nil,
-         2,
-         "baz"
-       ),
-       StatementsNode(403...418)(
-         [BeginNode(403...418)(
-            (403...408),
-            StatementsNode(411...414)(
-              [CallNode(411...414)(
-                 nil,
-                 nil,
-                 (411...414),
-                 nil,
-                 nil,
-                 nil,
-                 nil,
-                 2,
-                 "foo"
-               )]
-            ),
-            nil,
-            nil,
-            nil,
-            (415...418)
-          )]
-       ),
-       1
-     ),
-     UntilNode(429...460)(
-       (451...456),
-       nil,
-       CallNode(457...460)(
-         nil,
-         nil,
-         (457...460),
-         nil,
-         nil,
-         nil,
-         nil,
-         2,
-         "baz"
-       ),
-       StatementsNode(429...450)(
-         [BeginNode(429...450)(
-            (429...434),
-            StatementsNode(437...446)(
-              [CallNode(437...440)(
-                 nil,
-                 nil,
-                 (437...440),
-                 nil,
-                 nil,
-                 nil,
-                 nil,
-                 2,
-                 "foo"
-               ),
-               CallNode(443...446)(
-                 nil,
-                 nil,
-                 (443...446),
-                 nil,
-                 nil,
-                 nil,
-                 nil,
-                 2,
-                 "bar"
-               )]
-            ),
-            nil,
-            nil,
-            nil,
-            (447...450)
-          )]
-       ),
-       1
-     ),
-     WhileNode(461...492)(
-       (483...488),
-       nil,
-       CallNode(489...492)(
-         nil,
-         nil,
-         (489...492),
-         nil,
-         nil,
-         nil,
-         nil,
-         2,
-         "baz"
-       ),
-       StatementsNode(461...482)(
-         [BeginNode(461...482)(
-            (461...466),
-            StatementsNode(469...478)(
-              [CallNode(469...472)(
-                 nil,
-                 nil,
-                 (469...472),
-                 nil,
-                 nil,
-                 nil,
-                 nil,
-                 2,
-                 "foo"
-               ),
-               CallNode(475...478)(
-                 nil,
-                 nil,
-                 (475...478),
-                 nil,
-                 nil,
-                 nil,
-                 nil,
-                 2,
-                 "bar"
-               )]
-            ),
-            nil,
-            nil,
-            nil,
-            (479...482)
-          )]
-       ),
-       1
-     ),
-     WhileNode(493...508)(
-       (493...498),
-       (505...508),
-       FalseNode(499...504)(),
-       nil,
-       0
-     ),
-     WhileNode(509...528)(
-       (509...514),
-       (525...528),
-       FalseNode(515...520)(),
-       StatementsNode(523...524)([IntegerNode(523...524)()]),
-       0
-     ),
-     WhileNode(529...556)(
-       (529...534),
-       (553...556),
-       ParenthesesNode(535...544)(
-         StatementsNode(536...543)(
-           [CallNode(536...543)(
-              nil,
-              nil,
-              (536...539),
-              nil,
-              nil,
-              nil,
-              BlockNode(540...543)([], nil, nil, (540...541), (542...543)),
-              0,
-              "foo"
-            )]
-         ),
-         (535...536),
-         (543...544)
-       ),
-       StatementsNode(547...552)(
-         [SymbolNode(547...552)((547...548), (548...552), nil, "body")]
-       ),
-       0
-     ),
-     UntilNode(557...572)(
-       (557...562),
-       (569...572),
-       FalseNode(563...568)(),
-       nil,
-       0
-     ),
-     UntilNode(573...592)(
-       (573...578),
-       (589...592),
-       FalseNode(579...584)(),
-       StatementsNode(587...588)([IntegerNode(587...588)()]),
-       0
-     ),
-     UntilNode(593...620)(
-       (593...598),
-       (617...620),
-       ParenthesesNode(599...608)(
-         StatementsNode(600...607)(
-           [CallNode(600...607)(
-              nil,
-              nil,
-              (600...603),
-              nil,
-              nil,
-              nil,
-              BlockNode(604...607)([], nil, nil, (604...605), (606...607)),
-              0,
-              "foo"
-            )]
-         ),
-         (599...600),
-         (607...608)
-       ),
-       StatementsNode(611...616)(
-         [SymbolNode(611...616)((611...612), (612...616), nil, "body")]
-       ),
-       0
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/unparser/corpus/literal/yield.txt b/test/yarp/snapshots/unparser/corpus/literal/yield.txt
deleted file mode 100644
index 4ccd79e2dd1c22..00000000000000
--- a/test/yarp/snapshots/unparser/corpus/literal/yield.txt
+++ /dev/null
@@ -1,23 +0,0 @@
-ProgramNode(0...26)(
-  [],
-  StatementsNode(0...26)(
-    [YieldNode(0...5)((0...5), nil, nil, nil),
-     YieldNode(6...14)(
-       (6...11),
-       (11...12),
-       ArgumentsNode(12...13)(
-         [CallNode(12...13)(nil, nil, (12...13), nil, nil, nil, nil, 2, "a")]
-       ),
-       (13...14)
-     ),
-     YieldNode(15...26)(
-       (15...20),
-       (20...21),
-       ArgumentsNode(21...25)(
-         [CallNode(21...22)(nil, nil, (21...22), nil, nil, nil, nil, 2, "a"),
-          CallNode(24...25)(nil, nil, (24...25), nil, nil, nil, nil, 2, "b")]
-       ),
-       (25...26)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/unparser/corpus/semantic/and.txt b/test/yarp/snapshots/unparser/corpus/semantic/and.txt
deleted file mode 100644
index de40267054e840..00000000000000
--- a/test/yarp/snapshots/unparser/corpus/semantic/and.txt
+++ /dev/null
@@ -1,77 +0,0 @@
-ProgramNode(0...77)(
-  [],
-  StatementsNode(0...77)(
-    [OrNode(0...14)(
-       RangeNode(0...5)(
-         CallNode(0...1)(nil, nil, (0...1), nil, nil, nil, nil, 2, "a"),
-         CallNode(4...5)(nil, nil, (4...5), nil, nil, nil, nil, 2, "b"),
-         (1...4),
-         1
-       ),
-       RangeNode(9...14)(
-         CallNode(9...10)(nil, nil, (9...10), nil, nil, nil, nil, 2, "c"),
-         CallNode(13...14)(nil, nil, (13...14), nil, nil, nil, nil, 2, "d"),
-         (10...13),
-         1
-       ),
-       (6...8)
-     ),
-     AndNode(15...30)(
-       RangeNode(15...20)(
-         CallNode(15...16)(nil, nil, (15...16), nil, nil, nil, nil, 2, "a"),
-         CallNode(19...20)(nil, nil, (19...20), nil, nil, nil, nil, 2, "b"),
-         (16...19),
-         1
-       ),
-       RangeNode(25...30)(
-         CallNode(25...26)(nil, nil, (25...26), nil, nil, nil, nil, 2, "c"),
-         CallNode(29...30)(nil, nil, (29...30), nil, nil, nil, nil, 2, "d"),
-         (26...29),
-         1
-       ),
-       (21...24)
-     ),
-     IfNode(32...53)(
-       (32...34),
-       OrNode(35...49)(
-         FlipFlopNode(35...40)(
-           CallNode(35...36)(nil, nil, (35...36), nil, nil, nil, nil, 2, "a"),
-           CallNode(39...40)(nil, nil, (39...40), nil, nil, nil, nil, 2, "b"),
-           (36...39),
-           1
-         ),
-         FlipFlopNode(44...49)(
-           CallNode(44...45)(nil, nil, (44...45), nil, nil, nil, nil, 2, "c"),
-           CallNode(48...49)(nil, nil, (48...49), nil, nil, nil, nil, 2, "d"),
-           (45...48),
-           1
-         ),
-         (41...43)
-       ),
-       nil,
-       nil,
-       (50...53)
-     ),
-     IfNode(55...77)(
-       (55...57),
-       AndNode(58...73)(
-         FlipFlopNode(58...63)(
-           CallNode(58...59)(nil, nil, (58...59), nil, nil, nil, nil, 2, "a"),
-           CallNode(62...63)(nil, nil, (62...63), nil, nil, nil, nil, 2, "b"),
-           (59...62),
-           1
-         ),
-         FlipFlopNode(68...73)(
-           CallNode(68...69)(nil, nil, (68...69), nil, nil, nil, nil, 2, "c"),
-           CallNode(72...73)(nil, nil, (72...73), nil, nil, nil, nil, 2, "d"),
-           (69...72),
-           1
-         ),
-         (64...67)
-       ),
-       nil,
-       nil,
-       (74...77)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/unparser/corpus/semantic/block.txt b/test/yarp/snapshots/unparser/corpus/semantic/block.txt
deleted file mode 100644
index 16524948974d20..00000000000000
--- a/test/yarp/snapshots/unparser/corpus/semantic/block.txt
+++ /dev/null
@@ -1,165 +0,0 @@
-ProgramNode(0...148)(
-  [],
-  StatementsNode(0...148)(
-    [CallNode(0...10)(
-       nil,
-       nil,
-       (0...3),
-       nil,
-       nil,
-       nil,
-       BlockNode(4...10)([], nil, nil, (4...6), (7...10)),
-       0,
-       "foo"
-     ),
-     CallNode(12...29)(
-       nil,
-       nil,
-       (12...15),
-       nil,
-       nil,
-       nil,
-       BlockNode(16...29)(
-         [],
-         nil,
-         BeginNode(19...29)(
-           nil,
-           nil,
-           RescueNode(19...25)((19...25), [], nil, nil, nil, nil),
-           nil,
-           nil,
-           (26...29)
-         ),
-         (16...18),
-         (26...29)
-       ),
-       0,
-       "foo"
-     ),
-     CallNode(31...64)(
-       nil,
-       nil,
-       (31...34),
-       nil,
-       nil,
-       nil,
-       BlockNode(35...64)(
-         [],
-         nil,
-         StatementsNode(40...60)(
-           [RescueModifierNode(40...54)(
-              NilNode(40...43)(),
-              (44...50),
-              NilNode(51...54)()
-            ),
-            NilNode(57...60)()]
-         ),
-         (35...37),
-         (61...64)
-       ),
-       0,
-       "foo"
-     ),
-     CallNode(66...80)(
-       nil,
-       nil,
-       (66...69),
-       nil,
-       nil,
-       nil,
-       BlockNode(70...80)(
-         [:a],
-         BlockParametersNode(73...76)(
-           ParametersNode(74...75)(
-             [RequiredParameterNode(74...75)(:a)],
-             [],
-             [],
-             nil,
-             [],
-             nil,
-             nil
-           ),
-           [],
-           (73...74),
-           (75...76)
-         ),
-         nil,
-         (70...72),
-         (77...80)
-       ),
-       0,
-       "foo"
-     ),
-     CallNode(82...116)(
-       nil,
-       nil,
-       (82...85),
-       (85...86),
-       ArgumentsNode(86...92)(
-         [InterpolatedStringNode(86...92)(
-            (86...92),
-            [StringNode(101...105)(nil, (101...105), nil, "  b\n")],
-            (105...109)
-          )]
-       ),
-       (92...93),
-       BlockNode(94...116)(
-         [:a],
-         BlockParametersNode(97...100)(
-           ParametersNode(98...99)(
-             [RequiredParameterNode(98...99)(:a)],
-             [],
-             [],
-             nil,
-             [],
-             nil,
-             nil
-           ),
-           [],
-           (97...98),
-           (99...100)
-         ),
-         StatementsNode(111...112)([LocalVariableReadNode(111...112)(:a, 0)]),
-         (94...96),
-         (113...116)
-       ),
-       0,
-       "foo"
-     ),
-     CallNode(118...148)(
-       nil,
-       nil,
-       (118...121),
-       (121...122),
-       ArgumentsNode(122...128)(
-         [InterpolatedStringNode(122...128)(
-            (122...128),
-            [StringNode(133...137)(nil, (133...137), nil, "  b\n")],
-            (137...141)
-          )]
-       ),
-       (128...129),
-       BlockNode(130...148)(
-         [],
-         nil,
-         StatementsNode(143...144)(
-           [CallNode(143...144)(
-              nil,
-              nil,
-              (143...144),
-              nil,
-              nil,
-              nil,
-              nil,
-              2,
-              "a"
-            )]
-         ),
-         (130...132),
-         (145...148)
-       ),
-       0,
-       "foo"
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/unparser/corpus/semantic/def.txt b/test/yarp/snapshots/unparser/corpus/semantic/def.txt
deleted file mode 100644
index 46c69936a44504..00000000000000
--- a/test/yarp/snapshots/unparser/corpus/semantic/def.txt
+++ /dev/null
@@ -1,77 +0,0 @@
-ProgramNode(0...55)(
-  [],
-  StatementsNode(0...55)(
-    [DefNode(0...21)(
-       (4...7),
-       nil,
-       nil,
-       StatementsNode(10...17)(
-         [ParenthesesNode(10...17)(
-            StatementsNode(11...16)(
-              [CallNode(11...16)(
-                 CallNode(11...12)(
-                   nil,
-                   nil,
-                   (11...12),
-                   nil,
-                   nil,
-                   nil,
-                   nil,
-                   2,
-                   "a"
-                 ),
-                 nil,
-                 (13...14),
-                 nil,
-                 ArgumentsNode(15...16)(
-                   [CallNode(15...16)(
-                      nil,
-                      nil,
-                      (15...16),
-                      nil,
-                      nil,
-                      nil,
-                      nil,
-                      2,
-                      "b"
-                    )]
-                 ),
-                 nil,
-                 nil,
-                 0,
-                 "-"
-               )]
-            ),
-            (10...11),
-            (16...17)
-          )]
-       ),
-       [],
-       (0...3),
-       nil,
-       nil,
-       nil,
-       nil,
-       (18...21)
-     ),
-     DefNode(23...55)(
-       (27...30),
-       nil,
-       nil,
-       StatementsNode(33...51)(
-         [RescueModifierNode(33...51)(
-            CallNode(33...34)(nil, nil, (33...34), nil, nil, nil, nil, 2, "a"),
-            (35...41),
-            ConstantReadNode(42...51)(:Exception)
-          )]
-       ),
-       [],
-       (23...26),
-       nil,
-       nil,
-       nil,
-       nil,
-       (52...55)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/unparser/corpus/semantic/dstr.txt b/test/yarp/snapshots/unparser/corpus/semantic/dstr.txt
deleted file mode 100644
index 8edb0134b1c58f..00000000000000
--- a/test/yarp/snapshots/unparser/corpus/semantic/dstr.txt
+++ /dev/null
@@ -1,256 +0,0 @@
-ProgramNode(0...608)(
-  [],
-  StatementsNode(0...608)(
-    [InterpolatedStringNode(0...5)((0...5), [], (6...10)),
-     InterpolatedStringNode(11...18)((11...18), [], (19...23)),
-     InterpolatedStringNode(24...30)((24...30), [], (31...35)),
-     InterpolatedStringNode(36...44)((36...44), [], (45...49)),
-     InterpolatedStringNode(50...55)(
-       (50...55),
-       [StringNode(56...60)(nil, (56...60), nil, "  a\n")],
-       (60...64)
-     ),
-     InterpolatedStringNode(65...72)(
-       (65...72),
-       [StringNode(73...77)(nil, (73...77), nil, "  a\n")],
-       (77...81)
-     ),
-     InterpolatedStringNode(82...87)(
-       (82...87),
-       [StringNode(88...94)(nil, (88...94), nil, "  a\n" + "  "),
-        EmbeddedStatementsNode(94...97)((94...96), nil, (96...97)),
-        StringNode(97...98)(nil, (97...98), nil, "\n")],
-       (98...102)
-     ),
-     InterpolatedStringNode(103...109)(
-       (103...109),
-       [StringNode(110...116)(nil, (110...116), nil, "a\n"),
-        EmbeddedStatementsNode(116...119)((116...118), nil, (118...119)),
-        StringNode(119...120)(nil, (119...120), nil, "\n")],
-       (120...124)
-     ),
-     InterpolatedStringNode(125...131)(
-       (125...131),
-       [StringNode(132...138)(nil, (132...138), nil, "a\n"),
-        EmbeddedStatementsNode(138...141)((138...140), nil, (140...141)),
-        StringNode(141...146)(nil, (141...146), nil, "\n" + "b\n")],
-       (146...150)
-     ),
-     InterpolatedStringNode(151...157)(
-       (151...157),
-       [StringNode(158...168)(nil, (158...168), nil, "a\n" + "  b\n")],
-       (168...172)
-     ),
-     InterpolatedStringNode(173...180)(
-       (173...180),
-       [StringNode(181...186)(nil, (181...186), nil, "a\n" + "\n" + "b\n")],
-       (186...190)
-     ),
-     InterpolatedStringNode(191...198)(
-       (191...198),
-       [StringNode(199...206)(nil, (199...206), nil, " a\n" + "\n" + " b\n")],
-       (206...210)
-     ),
-     InterpolatedStringNode(211...218)(
-       (211...218),
-       [StringNode(219...225)(nil, (219...225), nil, " a\\nb\n")],
-       (225...229)
-     ),
-     InterpolatedStringNode(230...235)(
-       (230...235),
-       [EmbeddedStatementsNode(236...239)((236...238), nil, (238...239)),
-        StringNode(239...242)(nil, (239...242), nil, "a\n" + " "),
-        EmbeddedStatementsNode(242...245)((242...244), nil, (244...245)),
-        StringNode(245...247)(nil, (245...247), nil, "a\n")],
-       (247...251)
-     ),
-     InterpolatedStringNode(252...257)(
-       (252...257),
-       [StringNode(258...260)(nil, (258...260), nil, "  "),
-        EmbeddedStatementsNode(260...263)((260...262), nil, (262...263)),
-        StringNode(263...271)(nil, (263...271), nil, "\n" + "  \#{}\n")],
-       (271...275)
-     ),
-     InterpolatedStringNode(276...281)(
-       (276...281),
-       [StringNode(282...284)(nil, (282...284), nil, " a"),
-        EmbeddedStatementsNode(284...287)((284...286), nil, (286...287)),
-        StringNode(287...292)(nil, (287...292), nil, "b\n" + " c\n")],
-       (292...296)
-     ),
-     InterpolatedStringNode(297...303)(
-       (297...303),
-       [EmbeddedStatementsNode(306...309)((306...308), nil, (308...309)),
-        StringNode(309...310)(nil, (309...310), nil, "\n")],
-       (310...314)
-     ),
-     IfNode(315...349)(
-       (315...317),
-       TrueNode(318...322)(),
-       StatementsNode(325...331)(
-         [InterpolatedStringNode(325...331)(
-            (325...331),
-            [EmbeddedStatementsNode(336...339)((336...338), nil, (338...339)),
-             StringNode(339...340)(nil, (339...340), nil, "\n")],
-            (340...346)
-          )]
-       ),
-       nil,
-       (346...349)
-     ),
-     IfNode(351...386)(
-       (351...353),
-       TrueNode(354...358)(),
-       StatementsNode(361...367)(
-         [InterpolatedStringNode(361...367)(
-            (361...367),
-            [StringNode(368...373)(nil, (368...373), nil, "b"),
-             EmbeddedStatementsNode(373...376)((373...375), nil, (375...376)),
-             StringNode(376...377)(nil, (376...377), nil, "\n")],
-            (377...383)
-          )]
-       ),
-       nil,
-       (383...386)
-     ),
-     IfNode(388...423)(
-       (388...390),
-       TrueNode(391...395)(),
-       StatementsNode(398...404)(
-         [InterpolatedStringNode(398...404)(
-            (398...404),
-            [EmbeddedStatementsNode(409...412)((409...411), nil, (411...412)),
-             StringNode(412...414)(nil, (412...414), nil, "a\n")],
-            (414...420)
-          )]
-       ),
-       nil,
-       (420...423)
-     ),
-     IfNode(425...464)(
-       (425...427),
-       TrueNode(428...432)(),
-       StatementsNode(435...443)(
-         [InterpolatedStringNode(435...443)(
-            (435...443),
-            [StringNode(444...455)(
-               nil,
-               (444...455),
-               nil,
-               "   a\n" + "\n" + "   b\n"
-             )],
-            (455...461)
-          )]
-       ),
-       nil,
-       (461...464)
-     ),
-     InterpolatedStringNode(466...472)(
-       (466...467),
-       [EmbeddedStatementsNode(467...470)((467...469), nil, (469...470)),
-        StringNode(470...471)(nil, (470...471), nil, "a")],
-       (471...472)
-     ),
-     InterpolatedStringNode(474...486)(
-       (474...476),
-       [StringNode(476...479)(nil, (476...479), nil, "\n" + "\""),
-        EmbeddedStatementsNode(479...482)((479...481), nil, (481...482)),
-        StringNode(482...485)(nil, (482...485), nil, "\"\n")],
-       (485...486)
-     ),
-     InterpolatedStringNode(488...502)(
-       (488...491),
-       [StringNode(491...495)(nil, (491...495), nil, "-\n" + "\""),
-        EmbeddedStatementsNode(495...498)((495...497), nil, (497...498)),
-        StringNode(498...501)(nil, (498...501), nil, "\"\n")],
-       (501...502)
-     ),
-     InterpolatedStringNode(504...513)(
-       (504...505),
-       [StringNode(505...507)(nil, (505...507), nil, "a\n"),
-        EmbeddedStatementsNode(507...510)((507...509), nil, (509...510)),
-        StringNode(510...512)(nil, (510...512), nil, "\n" + "b")],
-       (512...513)
-     ),
-     InterpolatedStringNode(515...525)(
-       (515...516),
-       [StringNode(516...519)(nil, (516...519), nil, "a\n"),
-        EmbeddedStatementsNode(519...522)((519...521), nil, (521...522)),
-        StringNode(522...524)(nil, (522...524), nil, "\n" + "b")],
-       (524...525)
-     ),
-     InterpolatedStringNode(527...537)(
-       (527...528),
-       [StringNode(528...530)(nil, (528...530), nil, "a\n"),
-        EmbeddedStatementsNode(530...533)((530...532), nil, (532...533)),
-        StringNode(533...536)(nil, (533...536), nil, "\n" + "b")],
-       (536...537)
-     ),
-     StringConcatNode(539...550)(
-       StringNode(539...542)((539...540), (540...541), (541...542), "a"),
-       InterpolatedStringNode(545...550)(
-         (545...546),
-         [EmbeddedStatementsNode(546...549)((546...548), nil, (548...549))],
-         (549...550)
-       )
-     ),
-     StringConcatNode(552...560)(
-       StringConcatNode(552...557)(
-         StringNode(552...554)((552...553), (553...553), (553...554), ""),
-         StringNode(555...557)((555...556), (556...556), (556...557), "")
-       ),
-       StringNode(558...560)((558...559), (559...559), (559...560), "")
-     ),
-     StringConcatNode(562...574)(
-       InterpolatedStringNode(562...570)(
-         (562...563),
-         [StringNode(563...564)(nil, (563...564), nil, "a"),
-          EmbeddedStatementsNode(564...569)(
-            (564...566),
-            StatementsNode(566...568)(
-              [InstanceVariableReadNode(566...568)(:@a)]
-            ),
-            (568...569)
-          )],
-         (569...570)
-       ),
-       StringNode(571...574)((571...572), (572...573), (573...574), "b")
-     ),
-     StringConcatNode(575...585)(
-       InterpolatedStringNode(575...581)(
-         (575...576),
-         [StringNode(576...577)(nil, (576...577), nil, "a"),
-          EmbeddedVariableNode(577...580)(
-            (577...578),
-            InstanceVariableReadNode(578...580)(:@a)
-          )],
-         (580...581)
-       ),
-       StringNode(582...585)((582...583), (583...584), (584...585), "b")
-     ),
-     StringConcatNode(586...596)(
-       InterpolatedStringNode(586...592)(
-         (586...587),
-         [StringNode(587...588)(nil, (587...588), nil, "a"),
-          EmbeddedVariableNode(588...591)(
-            (588...589),
-            GlobalVariableReadNode(589...591)(:$a)
-          )],
-         (591...592)
-       ),
-       StringNode(593...596)((593...594), (594...595), (595...596), "b")
-     ),
-     StringConcatNode(597...608)(
-       InterpolatedStringNode(597...604)(
-         (597...598),
-         [StringNode(598...599)(nil, (598...599), nil, "a"),
-          EmbeddedVariableNode(599...603)(
-            (599...600),
-            ClassVariableReadNode(600...603)(:@@a)
-          )],
-         (603...604)
-       ),
-       StringNode(605...608)((605...606), (606...607), (607...608), "b")
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/unparser/corpus/semantic/kwbegin.txt b/test/yarp/snapshots/unparser/corpus/semantic/kwbegin.txt
deleted file mode 100644
index 231ed767cf4ed8..00000000000000
--- a/test/yarp/snapshots/unparser/corpus/semantic/kwbegin.txt
+++ /dev/null
@@ -1,184 +0,0 @@
-ProgramNode(0...215)(
-  [],
-  StatementsNode(0...215)(
-    [BeginNode(0...16)(
-       (0...5),
-       nil,
-       RescueNode(6...12)((6...12), [], nil, nil, nil, nil),
-       nil,
-       nil,
-       (13...16)
-     ),
-     BeginNode(18...39)(
-       (18...23),
-       nil,
-       RescueNode(24...30)((24...30), [], nil, nil, nil, nil),
-       ElseNode(31...39)((31...35), nil, (36...39)),
-       nil,
-       (36...39)
-     ),
-     BeginNode(41...54)(
-       (41...46),
-       StatementsNode(49...50)(
-         [CallNode(49...50)(nil, nil, (49...50), nil, nil, nil, nil, 2, "a")]
-       ),
-       nil,
-       nil,
-       nil,
-       (51...54)
-     ),
-     BeginNode(56...80)(
-       (56...61),
-       StatementsNode(64...65)(
-         [CallNode(64...65)(nil, nil, (64...65), nil, nil, nil, nil, 2, "a")]
-       ),
-       RescueNode(66...76)(
-         (66...72),
-         [],
-         nil,
-         nil,
-         StatementsNode(75...76)(
-           [CallNode(75...76)(nil, nil, (75...76), nil, nil, nil, nil, 2, "b")]
-         ),
-         nil
-       ),
-       nil,
-       nil,
-       (77...80)
-     ),
-     BeginNode(82...110)(
-       (82...87),
-       StatementsNode(90...95)(
-         [CallNode(90...91)(nil, nil, (90...91), nil, nil, nil, nil, 2, "a"),
-          CallNode(94...95)(nil, nil, (94...95), nil, nil, nil, nil, 2, "b")]
-       ),
-       RescueNode(96...106)(
-         (96...102),
-         [],
-         nil,
-         nil,
-         StatementsNode(105...106)(
-           [CallNode(105...106)(
-              nil,
-              nil,
-              (105...106),
-              nil,
-              nil,
-              nil,
-              nil,
-              2,
-              "b"
-            )]
-         ),
-         nil
-       ),
-       nil,
-       nil,
-       (107...110)
-     ),
-     BeginNode(112...135)(
-       (112...117),
-       nil,
-       RescueNode(118...126)(
-         (118...124),
-         [ConstantReadNode(125...126)(:A)],
-         nil,
-         nil,
-         nil,
-         nil
-       ),
-       ElseNode(127...135)((127...131), nil, (132...135)),
-       nil,
-       (132...135)
-     ),
-     BeginNode(137...163)(
-       (137...142),
-       nil,
-       RescueNode(144...152)(
-         (144...150),
-         [ConstantReadNode(151...152)(:A)],
-         nil,
-         nil,
-         nil,
-         nil
-       ),
-       ElseNode(154...163)((154...158), nil, (160...163)),
-       nil,
-       (160...163)
-     ),
-     BeginNode(165...215)(
-       (165...170),
-       StatementsNode(173...174)(
-         [CallNode(173...174)(
-            nil,
-            nil,
-            (173...174),
-            nil,
-            nil,
-            nil,
-            nil,
-            2,
-            "a"
-          )]
-       ),
-       RescueNode(175...200)(
-         (175...181),
-         [ConstantReadNode(182...183)(:A)],
-         nil,
-         nil,
-         StatementsNode(186...187)(
-           [CallNode(186...187)(
-              nil,
-              nil,
-              (186...187),
-              nil,
-              nil,
-              nil,
-              nil,
-              2,
-              "b"
-            )]
-         ),
-         RescueNode(188...200)(
-           (188...194),
-           [ConstantReadNode(195...196)(:B)],
-           nil,
-           nil,
-           StatementsNode(199...200)(
-             [CallNode(199...200)(
-                nil,
-                nil,
-                (199...200),
-                nil,
-                nil,
-                nil,
-                nil,
-                2,
-                "c"
-              )]
-           ),
-           nil
-         )
-       ),
-       nil,
-       EnsureNode(201...215)(
-         (201...207),
-         StatementsNode(210...211)(
-           [CallNode(210...211)(
-              nil,
-              nil,
-              (210...211),
-              nil,
-              nil,
-              nil,
-              nil,
-              2,
-              "d"
-            )]
-         ),
-         (212...215)
-       ),
-       (212...215)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/unparser/corpus/semantic/literal.txt b/test/yarp/snapshots/unparser/corpus/semantic/literal.txt
deleted file mode 100644
index 5e18c54da412a6..00000000000000
--- a/test/yarp/snapshots/unparser/corpus/semantic/literal.txt
+++ /dev/null
@@ -1,63 +0,0 @@
-ProgramNode(0...131)(
-  [],
-  StatementsNode(0...131)(
-    [RationalNode(0...4)(FloatNode(0...3)()),
-     RationalNode(5...8)(IntegerNode(5...7)()),
-     IntegerNode(9...12)(),
-     IntegerNode(13...18)(),
-     FloatNode(19...23)(),
-     FloatNode(24...38)(),
-     FloatNode(39...54)(),
-     StringNode(55...57)((55...56), (56...57), nil, "c"),
-     RegularExpressionNode(58...63)((58...61), (61...62), (62...63), "/", 0),
-     RegularExpressionNode(64...70)((64...67), (67...69), (69...70), ")", 0),
-     InterpolatedRegularExpressionNode(71...85)(
-       (71...74),
-       [EmbeddedStatementsNode(74...81)(
-          (74...76),
-          StatementsNode(76...80)([InstanceVariableReadNode(76...80)(:@bar)]),
-          (80...81)
-        ),
-        StringNode(81...84)(nil, (81...84), nil, "baz")],
-       (84...85),
-       0
-     ),
-     FloatNode(86...102)(),
-     FloatNode(103...120)(),
-     CallNode(121...131)(
-       nil,
-       nil,
-       (121...122),
-       (122...123),
-       ArgumentsNode(123...130)(
-         [CallNode(123...130)(
-            nil,
-            nil,
-            (123...126),
-            nil,
-            ArgumentsNode(127...130)(
-              [CallNode(127...130)(
-                 nil,
-                 nil,
-                 (127...130),
-                 nil,
-                 nil,
-                 nil,
-                 nil,
-                 2,
-                 "bar"
-               )]
-            ),
-            nil,
-            nil,
-            0,
-            "foo"
-          )]
-       ),
-       (130...131),
-       nil,
-       0,
-       "w"
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/unparser/corpus/semantic/send.txt b/test/yarp/snapshots/unparser/corpus/semantic/send.txt
deleted file mode 100644
index b584fa06cf94ca..00000000000000
--- a/test/yarp/snapshots/unparser/corpus/semantic/send.txt
+++ /dev/null
@@ -1,117 +0,0 @@
-ProgramNode(0...44)(
-  [],
-  StatementsNode(0...44)(
-    [CallNode(0...3)(nil, nil, (0...3), nil, nil, nil, nil, 2, "foo"),
-     CallNode(4...10)(
-       nil,
-       nil,
-       (4...7),
-       (7...8),
-       ArgumentsNode(8...9)([IntegerNode(8...9)()]),
-       (9...10),
-       nil,
-       0,
-       "foo"
-     ),
-     CallNode(12...27)(
-       CallNode(12...22)(
-         CallNode(12...20)(
-           CallNode(12...13)(nil, nil, (12...13), nil, nil, nil, nil, 2, "a"),
-           (13...14),
-           (14...17),
-           (17...18),
-           ArgumentsNode(18...19)(
-             [CallNode(18...19)(
-                nil,
-                nil,
-                (18...19),
-                nil,
-                nil,
-                nil,
-                nil,
-                2,
-                "b"
-              )]
-           ),
-           (19...20),
-           nil,
-           0,
-           "==="
-         ),
-         (20...21),
-         (21...22),
-         nil,
-         nil,
-         nil,
-         nil,
-         0,
-         "c"
-       ),
-       nil,
-       (23...25),
-       nil,
-       ArgumentsNode(26...27)(
-         [CallNode(26...27)(nil, nil, (26...27), nil, nil, nil, nil, 2, "d")]
-       ),
-       nil,
-       nil,
-       0,
-       "=="
-     ),
-     CallNode(29...44)(
-       CallNode(29...30)(nil, nil, (29...30), nil, nil, nil, nil, 2, "a"),
-       nil,
-       (31...33),
-       nil,
-       ArgumentsNode(34...44)(
-         [CallNode(34...44)(
-            CallNode(34...37)(
-              CallNode(34...35)(
-                nil,
-                nil,
-                (34...35),
-                nil,
-                nil,
-                nil,
-                nil,
-                2,
-                "d"
-              ),
-              (35...36),
-              (36...37),
-              nil,
-              nil,
-              nil,
-              nil,
-              0,
-              "c"
-            ),
-            (37...38),
-            (38...41),
-            (41...42),
-            ArgumentsNode(42...43)(
-              [CallNode(42...43)(
-                 nil,
-                 nil,
-                 (42...43),
-                 nil,
-                 nil,
-                 nil,
-                 nil,
-                 2,
-                 "c"
-               )]
-            ),
-            (43...44),
-            nil,
-            0,
-            "==="
-          )]
-       ),
-       nil,
-       nil,
-       0,
-       "=="
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/unparser/corpus/semantic/undef.txt b/test/yarp/snapshots/unparser/corpus/semantic/undef.txt
deleted file mode 100644
index 429e9044819668..00000000000000
--- a/test/yarp/snapshots/unparser/corpus/semantic/undef.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-ProgramNode(0...24)(
-  [],
-  StatementsNode(0...24)(
-    [UndefNode(0...9)([SymbolNode(6...9)(nil, (6...9), nil, "foo")], (0...5)),
-     UndefNode(10...24)(
-       [SymbolNode(16...19)(nil, (16...19), nil, "foo"),
-        SymbolNode(21...24)(nil, (21...24), nil, "bar")],
-       (10...15)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/unparser/corpus/semantic/while.txt b/test/yarp/snapshots/unparser/corpus/semantic/while.txt
deleted file mode 100644
index 3e6ef668a1cfc0..00000000000000
--- a/test/yarp/snapshots/unparser/corpus/semantic/while.txt
+++ /dev/null
@@ -1,193 +0,0 @@
-ProgramNode(0...188)(
-  [:foo, :a],
-  StatementsNode(0...188)(
-    [UntilNode(0...13)(
-       (2...7),
-       nil,
-       CallNode(8...13)(
-         nil,
-         nil,
-         (8...10),
-         nil,
-         nil,
-         nil,
-         BlockNode(11...13)([], nil, nil, (11...12), (12...13)),
-         0,
-         "b?"
-       ),
-       StatementsNode(0...1)(
-         [CallNode(0...1)(nil, nil, (0...1), nil, nil, nil, nil, 2, "a")]
-       ),
-       0
-     ),
-     UntilNode(15...34)(
-       (15...20),
-       (31...34),
-       CallNode(21...26)(
-         nil,
-         nil,
-         (21...23),
-         nil,
-         nil,
-         nil,
-         BlockNode(24...26)([], nil, nil, (24...25), (25...26)),
-         0,
-         "b?"
-       ),
-       StatementsNode(29...30)(
-         [CallNode(29...30)(nil, nil, (29...30), nil, nil, nil, nil, 2, "a")]
-       ),
-       0
-     ),
-     WhileNode(36...55)(
-       (46...51),
-       nil,
-       LocalVariableReadNode(52...55)(:foo, 0),
-       StatementsNode(36...45)(
-         [LocalVariableWriteNode(36...45)(
-            :foo,
-            0,
-            (36...39),
-            CallNode(42...45)(
-              nil,
-              nil,
-              (42...45),
-              nil,
-              nil,
-              nil,
-              nil,
-              2,
-              "bar"
-            ),
-            (40...41)
-          )]
-       ),
-       0
-     ),
-     UntilNode(57...75)(
-       (59...64),
-       nil,
-       AndNode(65...75)(
-         CallNode(65...66)(nil, nil, (65...66), nil, nil, nil, nil, 2, "b"),
-         CallNode(70...75)(
-           nil,
-           nil,
-           (70...71),
-           nil,
-           nil,
-           nil,
-           BlockNode(72...75)([], nil, nil, (72...73), (74...75)),
-           0,
-           "a"
-         ),
-         (67...69)
-       ),
-       StatementsNode(57...58)(
-         [CallNode(57...58)(nil, nil, (57...58), nil, nil, nil, nil, 2, "a")]
-       ),
-       0
-     ),
-     WhileNode(77...96)(
-       (77...82),
-       (93...96),
-       LocalVariableWriteNode(83...88)(
-         :a,
-         0,
-         (83...84),
-         CallNode(87...88)(nil, nil, (87...88), nil, nil, nil, nil, 2, "b"),
-         (85...86)
-       ),
-       StatementsNode(91...92)([LocalVariableReadNode(91...92)(:a, 0)]),
-       0
-     ),
-     UntilNode(98...130)(
-       (100...105),
-       nil,
-       CallNode(106...130)(
-         nil,
-         nil,
-         (106...107),
-         (107...108),
-         ArgumentsNode(108...114)(
-           [InterpolatedStringNode(108...114)((108...114), [], (119...123))]
-         ),
-         (114...115),
-         BlockNode(116...130)(
-           [],
-           nil,
-           StatementsNode(125...126)(
-             [CallNode(125...126)(
-                nil,
-                nil,
-                (125...126),
-                nil,
-                nil,
-                nil,
-                nil,
-                2,
-                "c"
-              )]
-           ),
-           (116...118),
-           (127...130)
-         ),
-         0,
-         "b"
-       ),
-       StatementsNode(98...99)([LocalVariableReadNode(98...99)(:a, 0)]),
-       0
-     ),
-     ModuleNode(132...188)(
-       [:foo],
-       (132...138),
-       ConstantReadNode(139...140)(:A),
-       StatementsNode(143...184)(
-         [LocalVariableWriteNode(143...152)(
-            :foo,
-            0,
-            (143...146),
-            CallNode(149...152)(
-              nil,
-              nil,
-              (149...152),
-              nil,
-              nil,
-              nil,
-              nil,
-              2,
-              "exp"
-            ),
-            (147...148)
-          ),
-          WhileNode(155...184)(
-            (155...160),
-            (181...184),
-            LocalVariableReadNode(161...164)(:foo, 0),
-            StatementsNode(169...178)(
-              [LocalVariableWriteNode(169...178)(
-                 :foo,
-                 0,
-                 (169...172),
-                 CallNode(175...178)(
-                   nil,
-                   nil,
-                   (175...178),
-                   nil,
-                   nil,
-                   nil,
-                   nil,
-                   2,
-                   "bar"
-                 ),
-                 (173...174)
-               )]
-            ),
-            0
-          )]
-       ),
-       (185...188),
-       :A,
-       :A
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/until.txt b/test/yarp/snapshots/until.txt
deleted file mode 100644
index 6a93708e5b6da2..00000000000000
--- a/test/yarp/snapshots/until.txt
+++ /dev/null
@@ -1,72 +0,0 @@
-ProgramNode(0...109)(
-  [],
-  StatementsNode(0...109)(
-    [UntilNode(0...18)(
-       (0...5),
-       (15...18),
-       TrueNode(6...10)(),
-       StatementsNode(12...13)([IntegerNode(12...13)()]),
-       0
-     ),
-     UntilNode(20...32)(
-       (22...27),
-       nil,
-       TrueNode(28...32)(),
-       StatementsNode(20...21)([IntegerNode(20...21)()]),
-       0
-     ),
-     UntilNode(34...50)(
-       (40...45),
-       nil,
-       TrueNode(46...50)(),
-       StatementsNode(34...39)([BreakNode(34...39)(nil, (34...39))]),
-       0
-     ),
-     UntilNode(52...67)(
-       (57...62),
-       nil,
-       TrueNode(63...67)(),
-       StatementsNode(52...56)([NextNode(52...56)(nil, (52...56))]),
-       0
-     ),
-     UntilNode(69...86)(
-       (76...81),
-       nil,
-       TrueNode(82...86)(),
-       StatementsNode(69...75)([ReturnNode(69...75)((69...75), nil)]),
-       0
-     ),
-     UntilNode(88...109)(
-       (99...104),
-       nil,
-       CallNode(105...109)(
-         nil,
-         nil,
-         (105...109),
-         nil,
-         nil,
-         nil,
-         nil,
-         0,
-         "bar?"
-       ),
-       StatementsNode(88...98)(
-         [CallNode(88...98)(
-            nil,
-            nil,
-            (88...91),
-            nil,
-            ArgumentsNode(92...98)(
-              [SymbolNode(92...94)((92...93), (93...94), nil, "a"),
-               SymbolNode(96...98)((96...97), (97...98), nil, "b")]
-            ),
-            nil,
-            nil,
-            0,
-            "foo"
-          )]
-       ),
-       0
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/variables.txt b/test/yarp/snapshots/variables.txt
deleted file mode 100644
index 4d50fa0db398d2..00000000000000
--- a/test/yarp/snapshots/variables.txt
+++ /dev/null
@@ -1,243 +0,0 @@
-ProgramNode(0...293)(
-  [:abc, :foo, :bar, :baz],
-  StatementsNode(0...293)(
-    [ClassVariableReadNode(0...5)(:@@abc),
-     ClassVariableWriteNode(7...16)(
-       :@@abc,
-       (7...12),
-       IntegerNode(15...16)(),
-       (13...14)
-     ),
-     MultiWriteNode(18...34)(
-       [ClassVariableTargetNode(18...23)(:@@foo),
-        ClassVariableTargetNode(25...30)(:@@bar)],
-       (31...32),
-       IntegerNode(33...34)(),
-       nil,
-       nil
-     ),
-     ClassVariableWriteNode(36...48)(
-       :@@foo,
-       (36...41),
-       ArrayNode(44...48)(
-         [IntegerNode(44...45)(), IntegerNode(47...48)()],
-         nil,
-         nil
-       ),
-       (42...43)
-     ),
-     GlobalVariableWriteNode(50...58)(
-       :$abc,
-       (50...54),
-       IntegerNode(57...58)(),
-       (55...56)
-     ),
-     GlobalVariableReadNode(60...64)(:$abc),
-     InstanceVariableReadNode(66...70)(:@abc),
-     InstanceVariableWriteNode(72...80)(
-       :@abc,
-       (72...76),
-       IntegerNode(79...80)(),
-       (77...78)
-     ),
-     CallNode(82...83)(nil, nil, (82...83), nil, nil, nil, nil, 2, "a"),
-     LocalVariableWriteNode(85...92)(
-       :abc,
-       0,
-       (85...88),
-       IntegerNode(91...92)(),
-       (89...90)
-     ),
-     MultiWriteNode(94...108)(
-       [GlobalVariableTargetNode(94...98)(:$foo),
-        GlobalVariableTargetNode(100...104)(:$bar)],
-       (105...106),
-       IntegerNode(107...108)(),
-       nil,
-       nil
-     ),
-     GlobalVariableWriteNode(110...121)(
-       :$foo,
-       (110...114),
-       ArrayNode(117...121)(
-         [IntegerNode(117...118)(), IntegerNode(120...121)()],
-         nil,
-         nil
-       ),
-       (115...116)
-     ),
-     MultiWriteNode(123...137)(
-       [InstanceVariableTargetNode(123...127)(:@foo),
-        InstanceVariableTargetNode(129...133)(:@bar)],
-       (134...135),
-       IntegerNode(136...137)(),
-       nil,
-       nil
-     ),
-     InstanceVariableWriteNode(139...150)(
-       :@foo,
-       (139...143),
-       ArrayNode(146...150)(
-         [IntegerNode(146...147)(), IntegerNode(149...150)()],
-         nil,
-         nil
-       ),
-       (144...145)
-     ),
-     LocalVariableWriteNode(152...159)(
-       :foo,
-       0,
-       (152...155),
-       IntegerNode(158...159)(),
-       (156...157)
-     ),
-     LocalVariableWriteNode(161...171)(
-       :foo,
-       0,
-       (161...164),
-       ArrayNode(167...171)(
-         [IntegerNode(167...168)(), IntegerNode(170...171)()],
-         nil,
-         nil
-       ),
-       (165...166)
-     ),
-     LocalVariableWriteNode(173...183)(
-       :foo,
-       0,
-       (173...176),
-       ArrayNode(179...183)(
-         [IntegerNode(179...180)(), IntegerNode(182...183)()],
-         nil,
-         nil
-       ),
-       (177...178)
-     ),
-     MultiWriteNode(185...198)(
-       [LocalVariableTargetNode(185...188)(:foo, 0),
-        SplatNode(190...191)((190...191), nil)],
-       (192...193),
-       ArrayNode(194...198)(
-         [IntegerNode(194...195)(), IntegerNode(197...198)()],
-         nil,
-         nil
-       ),
-       nil,
-       nil
-     ),
-     MultiWriteNode(200...211)(
-       [LocalVariableTargetNode(200...203)(:foo, 0),
-        SplatNode(203...204)((203...204), nil)],
-       (205...206),
-       ArrayNode(207...211)(
-         [IntegerNode(207...208)(), IntegerNode(210...211)()],
-         nil,
-         nil
-       ),
-       nil,
-       nil
-     ),
-     MultiWriteNode(213...229)(
-       [LocalVariableTargetNode(213...216)(:foo, 0),
-        SplatNode(218...222)(
-          (218...219),
-          LocalVariableTargetNode(219...222)(:bar, 0)
-        )],
-       (223...224),
-       ArrayNode(225...229)(
-         [IntegerNode(225...226)(), IntegerNode(228...229)()],
-         nil,
-         nil
-       ),
-       nil,
-       nil
-     ),
-     MultiWriteNode(231...258)(
-       [LocalVariableTargetNode(231...234)(:foo, 0),
-        MultiWriteNode(236...246)(
-          [LocalVariableTargetNode(237...240)(:bar, 0),
-           LocalVariableTargetNode(242...245)(:baz, 0)],
-          nil,
-          nil,
-          (236...237),
-          (245...246)
-        )],
-       (247...248),
-       ArrayNode(249...258)(
-         [IntegerNode(249...250)(),
-          ArrayNode(252...258)(
-            [IntegerNode(253...254)(), IntegerNode(256...257)()],
-            (252...253),
-            (257...258)
-          )],
-         nil,
-         nil
-       ),
-       nil,
-       nil
-     ),
-     LocalVariableWriteNode(260...270)(
-       :foo,
-       0,
-       (260...263),
-       ArrayNode(266...270)(
-         [SplatNode(266...270)(
-            (266...267),
-            LocalVariableReadNode(267...270)(:bar, 0)
-          )],
-         nil,
-         nil
-       ),
-       (264...265)
-     ),
-     ConstantWriteNode(272...282)(
-       :Foo,
-       (272...275),
-       ArrayNode(278...282)(
-         [IntegerNode(278...279)(), IntegerNode(281...282)()],
-         nil,
-         nil
-       ),
-       (276...277)
-     ),
-     ParenthesesNode(284...293)(
-       StatementsNode(285...292)(
-         [CallNode(285...286)(
-            nil,
-            nil,
-            (285...286),
-            nil,
-            nil,
-            nil,
-            nil,
-            2,
-            "a"
-          ),
-          CallNode(288...289)(
-            nil,
-            nil,
-            (288...289),
-            nil,
-            nil,
-            nil,
-            nil,
-            2,
-            "b"
-          ),
-          CallNode(291...292)(
-            nil,
-            nil,
-            (291...292),
-            nil,
-            nil,
-            nil,
-            nil,
-            2,
-            "c"
-          )]
-       ),
-       (284...285),
-       (292...293)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/while.txt b/test/yarp/snapshots/while.txt
deleted file mode 100644
index 843db1e147fb2b..00000000000000
--- a/test/yarp/snapshots/while.txt
+++ /dev/null
@@ -1,207 +0,0 @@
-ProgramNode(0...314)(
-  [],
-  StatementsNode(0...314)(
-    [WhileNode(0...18)(
-       (0...5),
-       (15...18),
-       TrueNode(6...10)(),
-       StatementsNode(12...13)([IntegerNode(12...13)()]),
-       0
-     ),
-     WhileNode(20...32)(
-       (22...27),
-       nil,
-       TrueNode(28...32)(),
-       StatementsNode(20...21)([IntegerNode(20...21)()]),
-       0
-     ),
-     WhileNode(34...50)(
-       (40...45),
-       nil,
-       TrueNode(46...50)(),
-       StatementsNode(34...39)([BreakNode(34...39)(nil, (34...39))]),
-       0
-     ),
-     WhileNode(52...67)(
-       (57...62),
-       nil,
-       TrueNode(63...67)(),
-       StatementsNode(52...56)([NextNode(52...56)(nil, (52...56))]),
-       0
-     ),
-     WhileNode(69...86)(
-       (76...81),
-       nil,
-       TrueNode(82...86)(),
-       StatementsNode(69...75)([ReturnNode(69...75)((69...75), nil)]),
-       0
-     ),
-     WhileNode(88...109)(
-       (99...104),
-       nil,
-       CallNode(105...109)(
-         nil,
-         nil,
-         (105...109),
-         nil,
-         nil,
-         nil,
-         nil,
-         0,
-         "bar?"
-       ),
-       StatementsNode(88...98)(
-         [CallNode(88...98)(
-            nil,
-            nil,
-            (88...91),
-            nil,
-            ArgumentsNode(92...98)(
-              [SymbolNode(92...94)((92...93), (93...94), nil, "a"),
-               SymbolNode(96...98)((96...97), (97...98), nil, "b")]
-            ),
-            nil,
-            nil,
-            0,
-            "foo"
-          )]
-       ),
-       0
-     ),
-     WhileNode(111...161)(
-       (111...116),
-       (158...161),
-       DefNode(117...149)(
-         (126...129),
-         SelfNode(121...125)(),
-         ParametersNode(130...144)(
-           [],
-           [OptionalParameterNode(130...144)(
-              :a,
-              (130...131),
-              (132...133),
-              CallNode(134...144)(
-                nil,
-                nil,
-                (134...137),
-                nil,
-                nil,
-                nil,
-                BlockNode(138...144)([], nil, nil, (138...140), (141...144)),
-                0,
-                "tap"
-              )
-            )],
-           [],
-           nil,
-           [],
-           nil,
-           nil
-         ),
-         nil,
-         [:a],
-         (117...120),
-         (125...126),
-         nil,
-         nil,
-         nil,
-         (146...149)
-       ),
-       StatementsNode(151...156)([BreakNode(151...156)(nil, (151...156))]),
-       0
-     ),
-     WhileNode(163...210)(
-       (163...168),
-       (207...210),
-       ClassNode(169...198)(
-         [:a],
-         (169...174),
-         ConstantReadNode(175...178)(:Foo),
-         nil,
-         nil,
-         StatementsNode(179...193)(
-           [LocalVariableWriteNode(179...193)(
-              :a,
-              0,
-              (179...180),
-              CallNode(183...193)(
-                nil,
-                nil,
-                (183...186),
-                nil,
-                nil,
-                nil,
-                BlockNode(187...193)([], nil, nil, (187...189), (190...193)),
-                0,
-                "tap"
-              ),
-              (181...182)
-            )]
-         ),
-         (195...198),
-         :Foo,
-         :Foo
-       ),
-       StatementsNode(200...205)([BreakNode(200...205)(nil, (200...205))]),
-       0
-     ),
-     WhileNode(212...260)(
-       (212...217),
-       (257...260),
-       SingletonClassNode(218...248)(
-         [],
-         (218...223),
-         (224...226),
-         SelfNode(227...231)(),
-         StatementsNode(233...243)(
-           [CallNode(233...243)(
-              nil,
-              nil,
-              (233...236),
-              nil,
-              nil,
-              nil,
-              BlockNode(237...243)([], nil, nil, (237...239), (240...243)),
-              0,
-              "tap"
-            )]
-         ),
-         (245...248)
-       ),
-       StatementsNode(250...255)([BreakNode(250...255)(nil, (250...255))]),
-       0
-     ),
-     WhileNode(262...314)(
-       (262...267),
-       (311...314),
-       SingletonClassNode(268...302)(
-         [:a],
-         (268...273),
-         (274...276),
-         SelfNode(277...281)(),
-         StatementsNode(283...297)(
-           [LocalVariableWriteNode(283...297)(
-              :a,
-              0,
-              (283...284),
-              CallNode(287...297)(
-                nil,
-                nil,
-                (287...290),
-                nil,
-                nil,
-                nil,
-                BlockNode(291...297)([], nil, nil, (291...293), (294...297)),
-                0,
-                "tap"
-              ),
-              (285...286)
-            )]
-         ),
-         (299...302)
-       ),
-       StatementsNode(304...309)([BreakNode(304...309)(nil, (304...309))]),
-       0
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/whitequark/__ENCODING__.txt b/test/yarp/snapshots/whitequark/__ENCODING__.txt
deleted file mode 100644
index 2f5aaa5dfce1b2..00000000000000
--- a/test/yarp/snapshots/whitequark/__ENCODING__.txt
+++ /dev/null
@@ -1 +0,0 @@
-ProgramNode(0...12)([], StatementsNode(0...12)([SourceEncodingNode(0...12)()]))
diff --git a/test/yarp/snapshots/whitequark/__ENCODING___legacy_.txt b/test/yarp/snapshots/whitequark/__ENCODING___legacy_.txt
deleted file mode 100644
index 2f5aaa5dfce1b2..00000000000000
--- a/test/yarp/snapshots/whitequark/__ENCODING___legacy_.txt
+++ /dev/null
@@ -1 +0,0 @@
-ProgramNode(0...12)([], StatementsNode(0...12)([SourceEncodingNode(0...12)()]))
diff --git a/test/yarp/snapshots/whitequark/alias.txt b/test/yarp/snapshots/whitequark/alias.txt
deleted file mode 100644
index 3960bea48aeb90..00000000000000
--- a/test/yarp/snapshots/whitequark/alias.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-ProgramNode(0...14)(
-  [],
-  StatementsNode(0...14)(
-    [AliasNode(0...14)(
-       SymbolNode(6...10)((6...7), (7...10), nil, "foo"),
-       SymbolNode(11...14)(nil, (11...14), nil, "bar"),
-       (0...5)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/whitequark/alias_gvar.txt b/test/yarp/snapshots/whitequark/alias_gvar.txt
deleted file mode 100644
index 06482181f4b10e..00000000000000
--- a/test/yarp/snapshots/whitequark/alias_gvar.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-ProgramNode(0...24)(
-  [],
-  StatementsNode(0...24)(
-    [AliasNode(0...11)(
-       GlobalVariableReadNode(6...8)(:$a),
-       BackReferenceReadNode(9...11)(),
-       (0...5)
-     ),
-     AliasNode(13...24)(
-       GlobalVariableReadNode(19...21)(:$a),
-       GlobalVariableReadNode(22...24)(:$b),
-       (13...18)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/whitequark/ambiuous_quoted_label_in_ternary_operator.txt b/test/yarp/snapshots/whitequark/ambiuous_quoted_label_in_ternary_operator.txt
deleted file mode 100644
index 5fc3ec49db1c6c..00000000000000
--- a/test/yarp/snapshots/whitequark/ambiuous_quoted_label_in_ternary_operator.txt
+++ /dev/null
@@ -1,30 +0,0 @@
-ProgramNode(0...15)(
-  [],
-  StatementsNode(0...15)(
-    [IfNode(0...15)(
-       nil,
-       CallNode(0...1)(nil, nil, (0...1), nil, nil, nil, nil, 2, "a"),
-       StatementsNode(4...10)(
-         [CallNode(4...10)(
-            CallNode(4...5)(nil, nil, (4...5), nil, nil, nil, nil, 2, "b"),
-            nil,
-            (6...7),
-            nil,
-            ArgumentsNode(8...10)(
-              [StringNode(8...10)((8...9), (9...9), (9...10), "")]
-            ),
-            nil,
-            nil,
-            0,
-            "&"
-          )]
-       ),
-       ElseNode(10...15)(
-         (10...11),
-         StatementsNode(12...15)([NilNode(12...15)()]),
-         nil
-       ),
-       nil
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/whitequark/and.txt b/test/yarp/snapshots/whitequark/and.txt
deleted file mode 100644
index c6641a692b991b..00000000000000
--- a/test/yarp/snapshots/whitequark/and.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-ProgramNode(0...23)(
-  [],
-  StatementsNode(0...23)(
-    [AndNode(0...10)(
-       CallNode(0...3)(nil, nil, (0...3), nil, nil, nil, nil, 2, "foo"),
-       CallNode(7...10)(nil, nil, (7...10), nil, nil, nil, nil, 2, "bar"),
-       (4...6)
-     ),
-     AndNode(12...23)(
-       CallNode(12...15)(nil, nil, (12...15), nil, nil, nil, nil, 2, "foo"),
-       CallNode(20...23)(nil, nil, (20...23), nil, nil, nil, nil, 2, "bar"),
-       (16...19)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/whitequark/and_asgn.txt b/test/yarp/snapshots/whitequark/and_asgn.txt
deleted file mode 100644
index fab12349c28e75..00000000000000
--- a/test/yarp/snapshots/whitequark/and_asgn.txt
+++ /dev/null
@@ -1,33 +0,0 @@
-ProgramNode(0...28)(
-  [],
-  StatementsNode(0...28)(
-    [CallAndWriteNode(0...11)(
-       CallNode(0...3)(nil, nil, (0...3), nil, nil, nil, nil, 2, "foo"),
-       (3...4),
-       (4...5),
-       nil,
-       nil,
-       nil,
-       0,
-       "a",
-       "a=",
-       (6...9),
-       IntegerNode(10...11)()
-     ),
-     CallAndWriteNode(13...28)(
-       CallNode(13...16)(nil, nil, (13...16), nil, nil, nil, nil, 2, "foo"),
-       nil,
-       (16...22),
-       (16...17),
-       ArgumentsNode(17...21)(
-         [IntegerNode(17...18)(), IntegerNode(20...21)()]
-       ),
-       (21...22),
-       0,
-       "[]",
-       "[]=",
-       (23...26),
-       IntegerNode(27...28)()
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/whitequark/and_or_masgn.txt b/test/yarp/snapshots/whitequark/and_or_masgn.txt
deleted file mode 100644
index bc64788ca43665..00000000000000
--- a/test/yarp/snapshots/whitequark/and_or_masgn.txt
+++ /dev/null
@@ -1,61 +0,0 @@
-ProgramNode(0...40)(
-  [:a, :b],
-  StatementsNode(0...40)(
-    [AndNode(0...19)(
-       CallNode(0...3)(nil, nil, (0...3), nil, nil, nil, nil, 2, "foo"),
-       ParenthesesNode(7...19)(
-         StatementsNode(8...18)(
-           [MultiWriteNode(8...18)(
-              [LocalVariableTargetNode(8...9)(:a, 0),
-               LocalVariableTargetNode(11...12)(:b, 0)],
-              (13...14),
-              CallNode(15...18)(
-                nil,
-                nil,
-                (15...18),
-                nil,
-                nil,
-                nil,
-                nil,
-                2,
-                "bar"
-              ),
-              nil,
-              nil
-            )]
-         ),
-         (7...8),
-         (18...19)
-       ),
-       (4...6)
-     ),
-     OrNode(21...40)(
-       CallNode(21...24)(nil, nil, (21...24), nil, nil, nil, nil, 2, "foo"),
-       ParenthesesNode(28...40)(
-         StatementsNode(29...39)(
-           [MultiWriteNode(29...39)(
-              [LocalVariableTargetNode(29...30)(:a, 0),
-               LocalVariableTargetNode(32...33)(:b, 0)],
-              (34...35),
-              CallNode(36...39)(
-                nil,
-                nil,
-                (36...39),
-                nil,
-                nil,
-                nil,
-                nil,
-                2,
-                "bar"
-              ),
-              nil,
-              nil
-            )]
-         ),
-         (28...29),
-         (39...40)
-       ),
-       (25...27)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/whitequark/anonymous_blockarg.txt b/test/yarp/snapshots/whitequark/anonymous_blockarg.txt
deleted file mode 100644
index d5c7ef56dd86ea..00000000000000
--- a/test/yarp/snapshots/whitequark/anonymous_blockarg.txt
+++ /dev/null
@@ -1,40 +0,0 @@
-ProgramNode(0...23)(
-  [],
-  StatementsNode(0...23)(
-    [DefNode(0...23)(
-       (4...7),
-       nil,
-       ParametersNode(8...9)(
-         [],
-         [],
-         [],
-         nil,
-         [],
-         nil,
-         BlockParameterNode(8...9)(nil, nil, (8...9))
-       ),
-       StatementsNode(12...18)(
-         [CallNode(12...18)(
-            nil,
-            nil,
-            (12...15),
-            (15...16),
-            ArgumentsNode(16...17)(
-              [BlockArgumentNode(16...17)(nil, (16...17))]
-            ),
-            (17...18),
-            nil,
-            0,
-            "bar"
-          )]
-       ),
-       [:&],
-       (0...3),
-       nil,
-       (7...8),
-       (9...10),
-       nil,
-       (20...23)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/whitequark/arg.txt b/test/yarp/snapshots/whitequark/arg.txt
deleted file mode 100644
index 403c382cb7b180..00000000000000
--- a/test/yarp/snapshots/whitequark/arg.txt
+++ /dev/null
@@ -1,48 +0,0 @@
-ProgramNode(0...37)(
-  [],
-  StatementsNode(0...37)(
-    [DefNode(0...15)(
-       (4...5),
-       nil,
-       ParametersNode(6...9)(
-         [RequiredParameterNode(6...9)(:foo)],
-         [],
-         [],
-         nil,
-         [],
-         nil,
-         nil
-       ),
-       nil,
-       [:foo],
-       (0...3),
-       nil,
-       (5...6),
-       (9...10),
-       nil,
-       (12...15)
-     ),
-     DefNode(17...37)(
-       (21...22),
-       nil,
-       ParametersNode(23...31)(
-         [RequiredParameterNode(23...26)(:foo),
-          RequiredParameterNode(28...31)(:bar)],
-         [],
-         [],
-         nil,
-         [],
-         nil,
-         nil
-       ),
-       nil,
-       [:foo, :bar],
-       (17...20),
-       nil,
-       (22...23),
-       (31...32),
-       nil,
-       (34...37)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/whitequark/arg_duplicate_ignored.txt b/test/yarp/snapshots/whitequark/arg_duplicate_ignored.txt
deleted file mode 100644
index 5c88c71d506105..00000000000000
--- a/test/yarp/snapshots/whitequark/arg_duplicate_ignored.txt
+++ /dev/null
@@ -1,49 +0,0 @@
-ProgramNode(0...40)(
-  [],
-  StatementsNode(0...40)(
-    [DefNode(0...18)(
-       (4...7),
-       nil,
-       ParametersNode(8...12)(
-         [RequiredParameterNode(8...9)(:_),
-          RequiredParameterNode(11...12)(:_)],
-         [],
-         [],
-         nil,
-         [],
-         nil,
-         nil
-       ),
-       nil,
-       [:_],
-       (0...3),
-       nil,
-       (7...8),
-       (12...13),
-       nil,
-       (15...18)
-     ),
-     DefNode(20...40)(
-       (24...27),
-       nil,
-       ParametersNode(28...34)(
-         [RequiredParameterNode(28...30)(:_a),
-          RequiredParameterNode(32...34)(:_a)],
-         [],
-         [],
-         nil,
-         [],
-         nil,
-         nil
-       ),
-       nil,
-       [:_a],
-       (20...23),
-       nil,
-       (27...28),
-       (34...35),
-       nil,
-       (37...40)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/whitequark/arg_label.txt b/test/yarp/snapshots/whitequark/arg_label.txt
deleted file mode 100644
index cfa55d0124f8b5..00000000000000
--- a/test/yarp/snapshots/whitequark/arg_label.txt
+++ /dev/null
@@ -1,90 +0,0 @@
-ProgramNode(0...49)(
-  [],
-  StatementsNode(0...49)(
-    [DefNode(0...16)(
-       (4...7),
-       nil,
-       nil,
-       StatementsNode(9...12)(
-         [CallNode(9...12)(
-            nil,
-            nil,
-            (9...10),
-            nil,
-            ArgumentsNode(10...12)(
-              [SymbolNode(10...12)((10...11), (11...12), nil, "b")]
-            ),
-            nil,
-            nil,
-            0,
-            "a"
-          )]
-       ),
-       [],
-       (0...3),
-       nil,
-       nil,
-       nil,
-       nil,
-       (13...16)
-     ),
-     DefNode(18...35)(
-       (22...25),
-       nil,
-       nil,
-       StatementsNode(28...31)(
-         [CallNode(28...31)(
-            nil,
-            nil,
-            (28...29),
-            nil,
-            ArgumentsNode(29...31)(
-              [SymbolNode(29...31)((29...30), (30...31), nil, "b")]
-            ),
-            nil,
-            nil,
-            0,
-            "a"
-          )]
-       ),
-       [],
-       (18...21),
-       nil,
-       (25...26),
-       (26...27),
-       nil,
-       (32...35)
-     ),
-     CallNode(37...49)(
-       nil,
-       nil,
-       (37...38),
-       nil,
-       nil,
-       nil,
-       BlockNode(39...49)(
-         [],
-         BlockParametersNode(41...43)(nil, [], (41...42), (42...43)),
-         StatementsNode(44...47)(
-           [CallNode(44...47)(
-              nil,
-              nil,
-              (44...45),
-              nil,
-              ArgumentsNode(45...47)(
-                [SymbolNode(45...47)((45...46), (46...47), nil, "b")]
-              ),
-              nil,
-              nil,
-              0,
-              "a"
-            )]
-         ),
-         (39...40),
-         (48...49)
-       ),
-       0,
-       "f"
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/whitequark/arg_scope.txt b/test/yarp/snapshots/whitequark/arg_scope.txt
deleted file mode 100644
index baa33596becad9..00000000000000
--- a/test/yarp/snapshots/whitequark/arg_scope.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-ProgramNode(0...13)(
-  [],
-  StatementsNode(0...13)(
-    [CallNode(0...13)(
-       nil,
-       nil,
-       (0...6),
-       nil,
-       nil,
-       nil,
-       BlockNode(6...13)(
-         [:a],
-         BlockParametersNode(7...11)(
-           nil,
-           [BlockLocalVariableNode(9...10)(:a)],
-           (7...8),
-           (10...11)
-         ),
-         StatementsNode(11...12)([LocalVariableReadNode(11...12)(:a, 0)]),
-         (6...7),
-         (12...13)
-       ),
-       0,
-       "lambda"
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/whitequark/args.txt b/test/yarp/snapshots/whitequark/args.txt
deleted file mode 100644
index faa2ee445925f6..00000000000000
--- a/test/yarp/snapshots/whitequark/args.txt
+++ /dev/null
@@ -1,766 +0,0 @@
-ProgramNode(0...690)(
-  [],
-  StatementsNode(0...690)(
-    [DefNode(0...13)(
-       (4...5),
-       nil,
-       ParametersNode(6...8)(
-         [],
-         [],
-         [],
-         nil,
-         [],
-         nil,
-         BlockParameterNode(6...8)(:b, (7...8), (6...7))
-       ),
-       nil,
-       [:b],
-       (0...3),
-       nil,
-       nil,
-       nil,
-       nil,
-       (10...13)
-     ),
-     DefNode(15...33)(
-       (19...20),
-       nil,
-       ParametersNode(22...27)(
-         [RequiredDestructuredParameterNode(22...27)(
-            [RequiredDestructuredParameterNode(23...26)(
-               [RequiredParameterNode(24...25)(:a)],
-               (23...24),
-               (25...26)
-             )],
-            (22...23),
-            (26...27)
-          )],
-         [],
-         [],
-         nil,
-         [],
-         nil,
-         nil
-       ),
-       nil,
-       [:a],
-       (15...18),
-       nil,
-       (21...22),
-       (27...28),
-       nil,
-       (30...33)
-     ),
-     DefNode(35...51)(
-       (39...40),
-       nil,
-       ParametersNode(42...45)(
-         [RequiredDestructuredParameterNode(42...45)(
-            [SplatNode(43...44)((43...44), nil)],
-            (42...43),
-            (44...45)
-          )],
-         [],
-         [],
-         nil,
-         [],
-         nil,
-         nil
-       ),
-       nil,
-       [],
-       (35...38),
-       nil,
-       (41...42),
-       (45...46),
-       nil,
-       (48...51)
-     ),
-     DefNode(53...72)(
-       (57...58),
-       nil,
-       ParametersNode(60...66)(
-         [RequiredDestructuredParameterNode(60...66)(
-            [SplatNode(61...62)((61...62), nil),
-             RequiredParameterNode(64...65)(:p)],
-            (60...61),
-            (65...66)
-          )],
-         [],
-         [],
-         nil,
-         [],
-         nil,
-         nil
-       ),
-       nil,
-       [:p],
-       (53...56),
-       nil,
-       (59...60),
-       (66...67),
-       nil,
-       (69...72)
-     ),
-     DefNode(74...91)(
-       (78...79),
-       nil,
-       ParametersNode(81...85)(
-         [RequiredDestructuredParameterNode(81...85)(
-            [SplatNode(82...84)(
-               (82...83),
-               RequiredParameterNode(83...84)(:r)
-             )],
-            (81...82),
-            (84...85)
-          )],
-         [],
-         [],
-         nil,
-         [],
-         nil,
-         nil
-       ),
-       nil,
-       [:r],
-       (74...77),
-       nil,
-       (80...81),
-       (85...86),
-       nil,
-       (88...91)
-     ),
-     DefNode(93...113)(
-       (97...98),
-       nil,
-       ParametersNode(100...107)(
-         [RequiredDestructuredParameterNode(100...107)(
-            [SplatNode(101...103)(
-               (101...102),
-               RequiredParameterNode(102...103)(:r)
-             ),
-             RequiredParameterNode(105...106)(:p)],
-            (100...101),
-            (106...107)
-          )],
-         [],
-         [],
-         nil,
-         [],
-         nil,
-         nil
-       ),
-       nil,
-       [:r, :p],
-       (93...96),
-       nil,
-       (99...100),
-       (107...108),
-       nil,
-       (110...113)
-     ),
-     DefNode(115...134)(
-       (119...120),
-       nil,
-       ParametersNode(122...128)(
-         [RequiredDestructuredParameterNode(122...128)(
-            [RequiredParameterNode(123...124)(:a),
-             SplatNode(126...127)((126...127), nil)],
-            (122...123),
-            (127...128)
-          )],
-         [],
-         [],
-         nil,
-         [],
-         nil,
-         nil
-       ),
-       nil,
-       [:a],
-       (115...118),
-       nil,
-       (121...122),
-       (128...129),
-       nil,
-       (131...134)
-     ),
-     DefNode(136...158)(
-       (140...141),
-       nil,
-       ParametersNode(143...152)(
-         [RequiredDestructuredParameterNode(143...152)(
-            [RequiredParameterNode(144...145)(:a),
-             SplatNode(147...148)((147...148), nil),
-             RequiredParameterNode(150...151)(:p)],
-            (143...144),
-            (151...152)
-          )],
-         [],
-         [],
-         nil,
-         [],
-         nil,
-         nil
-       ),
-       nil,
-       [:a, :p],
-       (136...139),
-       nil,
-       (142...143),
-       (152...153),
-       nil,
-       (155...158)
-     ),
-     DefNode(160...180)(
-       (164...165),
-       nil,
-       ParametersNode(167...174)(
-         [RequiredDestructuredParameterNode(167...174)(
-            [RequiredParameterNode(168...169)(:a),
-             SplatNode(171...173)(
-               (171...172),
-               RequiredParameterNode(172...173)(:r)
-             )],
-            (167...168),
-            (173...174)
-          )],
-         [],
-         [],
-         nil,
-         [],
-         nil,
-         nil
-       ),
-       nil,
-       [:a, :r],
-       (160...163),
-       nil,
-       (166...167),
-       (174...175),
-       nil,
-       (177...180)
-     ),
-     DefNode(182...205)(
-       (186...187),
-       nil,
-       ParametersNode(189...199)(
-         [RequiredDestructuredParameterNode(189...199)(
-            [RequiredParameterNode(190...191)(:a),
-             SplatNode(193...195)(
-               (193...194),
-               RequiredParameterNode(194...195)(:r)
-             ),
-             RequiredParameterNode(197...198)(:p)],
-            (189...190),
-            (198...199)
-          )],
-         [],
-         [],
-         nil,
-         [],
-         nil,
-         nil
-       ),
-       nil,
-       [:a, :r, :p],
-       (182...185),
-       nil,
-       (188...189),
-       (199...200),
-       nil,
-       (202...205)
-     ),
-     DefNode(207...227)(
-       (211...212),
-       nil,
-       ParametersNode(214...221)(
-         [RequiredDestructuredParameterNode(214...221)(
-            [RequiredParameterNode(215...216)(:a),
-             RequiredParameterNode(218...220)(:a1)],
-            (214...215),
-            (220...221)
-          )],
-         [],
-         [],
-         nil,
-         [],
-         nil,
-         nil
-       ),
-       nil,
-       [:a, :a1],
-       (207...210),
-       nil,
-       (213...214),
-       (221...222),
-       nil,
-       (224...227)
-     ),
-     DefNode(229...252)(
-       (233...234),
-       nil,
-       ParametersNode(236...246)(
-         [],
-         [],
-         [],
-         nil,
-         [KeywordParameterNode(236...242)(
-            (236...240),
-            IntegerNode(241...242)()
-          )],
-         nil,
-         BlockParameterNode(244...246)(:b, (245...246), (244...245))
-       ),
-       nil,
-       [:foo, :b],
-       (229...232),
-       nil,
-       (235...236),
-       (246...247),
-       nil,
-       (249...252)
-     ),
-     DefNode(254...292)(
-       (258...259),
-       nil,
-       ParametersNode(261...286)(
-         [],
-         [],
-         [],
-         nil,
-         [KeywordParameterNode(261...267)(
-            (261...265),
-            IntegerNode(266...267)()
-          ),
-          KeywordParameterNode(269...275)(
-            (269...273),
-            IntegerNode(274...275)()
-          )],
-         KeywordRestParameterNode(277...282)((277...279), (279...282)),
-         BlockParameterNode(284...286)(:b, (285...286), (284...285))
-       ),
-       nil,
-       [:foo, :bar, :baz, :b],
-       (254...257),
-       nil,
-       (260...261),
-       (286...287),
-       nil,
-       (289...292)
-     ),
-     DefNode(294...314)(
-       (298...299),
-       nil,
-       ParametersNode(300...309)(
-         [],
-         [],
-         [],
-         nil,
-         [],
-         KeywordRestParameterNode(300...305)((300...302), (302...305)),
-         BlockParameterNode(307...309)(:b, (308...309), (307...308))
-       ),
-       nil,
-       [:baz, :b],
-       (294...297),
-       nil,
-       nil,
-       nil,
-       nil,
-       (311...314)
-     ),
-     DefNode(316...332)(
-       (320...321),
-       nil,
-       ParametersNode(322...327)(
-         [],
-         [],
-         [],
-         RestParameterNode(322...323)((322...323), nil),
-         [],
-         KeywordRestParameterNode(325...327)((325...327), nil),
-         nil
-       ),
-       nil,
-       [:*, :**],
-       (316...319),
-       nil,
-       nil,
-       nil,
-       nil,
-       (329...332)
-     ),
-     DefNode(334...351)(
-       (338...339),
-       nil,
-       ParametersNode(340...346)(
-         [],
-         [],
-         [],
-         RestParameterNode(340...342)((340...341), (341...342)),
-         [],
-         nil,
-         BlockParameterNode(344...346)(:b, (345...346), (344...345))
-       ),
-       nil,
-       [:r, :b],
-       (334...337),
-       nil,
-       nil,
-       nil,
-       nil,
-       (348...351)
-     ),
-     DefNode(353...373)(
-       (357...358),
-       nil,
-       ParametersNode(359...368)(
-         [],
-         [],
-         [RequiredParameterNode(363...364)(:p)],
-         RestParameterNode(359...361)((359...360), (360...361)),
-         [],
-         nil,
-         BlockParameterNode(366...368)(:b, (367...368), (366...367))
-       ),
-       nil,
-       [:r, :p, :b],
-       (353...356),
-       nil,
-       nil,
-       nil,
-       nil,
-       (370...373)
-     ),
-     DefNode(375...386)(
-       (379...380),
-       nil,
-       nil,
-       nil,
-       [],
-       (375...378),
-       nil,
-       nil,
-       nil,
-       nil,
-       (383...386)
-     ),
-     DefNode(388...404)(
-       (392...393),
-       nil,
-       ParametersNode(394...399)(
-         [RequiredParameterNode(394...395)(:a)],
-         [],
-         [],
-         nil,
-         [],
-         nil,
-         BlockParameterNode(397...399)(:b, (398...399), (397...398))
-       ),
-       nil,
-       [:a, :b],
-       (388...391),
-       nil,
-       nil,
-       nil,
-       nil,
-       (401...404)
-     ),
-     DefNode(406...426)(
-       (410...411),
-       nil,
-       ParametersNode(412...421)(
-         [RequiredParameterNode(412...413)(:a)],
-         [],
-         [],
-         RestParameterNode(415...417)((415...416), (416...417)),
-         [],
-         nil,
-         BlockParameterNode(419...421)(:b, (420...421), (419...420))
-       ),
-       nil,
-       [:a, :r, :b],
-       (406...409),
-       nil,
-       nil,
-       nil,
-       nil,
-       (423...426)
-     ),
-     DefNode(428...451)(
-       (432...433),
-       nil,
-       ParametersNode(434...446)(
-         [RequiredParameterNode(434...435)(:a)],
-         [],
-         [RequiredParameterNode(441...442)(:p)],
-         RestParameterNode(437...439)((437...438), (438...439)),
-         [],
-         nil,
-         BlockParameterNode(444...446)(:b, (445...446), (444...445))
-       ),
-       nil,
-       [:a, :r, :p, :b],
-       (428...431),
-       nil,
-       nil,
-       nil,
-       nil,
-       (448...451)
-     ),
-     DefNode(453...474)(
-       (457...458),
-       nil,
-       ParametersNode(459...469)(
-         [RequiredParameterNode(459...460)(:a)],
-         [OptionalParameterNode(462...465)(
-            :o,
-            (462...463),
-            (463...464),
-            IntegerNode(464...465)()
-          )],
-         [],
-         nil,
-         [],
-         nil,
-         BlockParameterNode(467...469)(:b, (468...469), (467...468))
-       ),
-       nil,
-       [:a, :o, :b],
-       (453...456),
-       nil,
-       nil,
-       nil,
-       nil,
-       (471...474)
-     ),
-     DefNode(476...501)(
-       (480...481),
-       nil,
-       ParametersNode(482...496)(
-         [RequiredParameterNode(482...483)(:a)],
-         [OptionalParameterNode(485...488)(
-            :o,
-            (485...486),
-            (486...487),
-            IntegerNode(487...488)()
-          )],
-         [],
-         RestParameterNode(490...492)((490...491), (491...492)),
-         [],
-         nil,
-         BlockParameterNode(494...496)(:b, (495...496), (494...495))
-       ),
-       nil,
-       [:a, :o, :r, :b],
-       (476...479),
-       nil,
-       nil,
-       nil,
-       nil,
-       (498...501)
-     ),
-     DefNode(503...531)(
-       (507...508),
-       nil,
-       ParametersNode(509...526)(
-         [RequiredParameterNode(509...510)(:a)],
-         [OptionalParameterNode(512...515)(
-            :o,
-            (512...513),
-            (513...514),
-            IntegerNode(514...515)()
-          )],
-         [RequiredParameterNode(521...522)(:p)],
-         RestParameterNode(517...519)((517...518), (518...519)),
-         [],
-         nil,
-         BlockParameterNode(524...526)(:b, (525...526), (524...525))
-       ),
-       nil,
-       [:a, :o, :r, :p, :b],
-       (503...506),
-       nil,
-       nil,
-       nil,
-       nil,
-       (528...531)
-     ),
-     DefNode(533...557)(
-       (537...538),
-       nil,
-       ParametersNode(539...552)(
-         [RequiredParameterNode(539...540)(:a)],
-         [OptionalParameterNode(542...545)(
-            :o,
-            (542...543),
-            (543...544),
-            IntegerNode(544...545)()
-          )],
-         [RequiredParameterNode(547...548)(:p)],
-         nil,
-         [],
-         nil,
-         BlockParameterNode(550...552)(:b, (551...552), (550...551))
-       ),
-       nil,
-       [:a, :o, :p, :b],
-       (533...536),
-       nil,
-       nil,
-       nil,
-       nil,
-       (554...557)
-     ),
-     DefNode(559...575)(
-       (563...564),
-       nil,
-       ParametersNode(565...569)(
-         [],
-         [],
-         [],
-         nil,
-         [KeywordParameterNode(565...569)((565...569), nil)],
-         nil,
-         nil
-       ),
-       nil,
-       [:foo],
-       (559...562),
-       nil,
-       nil,
-       nil,
-       nil,
-       (572...575)
-     ),
-     DefNode(577...596)(
-       (581...582),
-       nil,
-       ParametersNode(583...590)(
-         [],
-         [],
-         [],
-         nil,
-         [KeywordParameterNode(583...590)(
-            (583...587),
-            IntegerNode(588...590)()
-          )],
-         nil,
-         nil
-       ),
-       nil,
-       [:foo],
-       (577...580),
-       nil,
-       nil,
-       nil,
-       nil,
-       (593...596)
-     ),
-     DefNode(598...616)(
-       (602...603),
-       nil,
-       ParametersNode(604...611)(
-         [],
-         [OptionalParameterNode(604...607)(
-            :o,
-            (604...605),
-            (605...606),
-            IntegerNode(606...607)()
-          )],
-         [],
-         nil,
-         [],
-         nil,
-         BlockParameterNode(609...611)(:b, (610...611), (609...610))
-       ),
-       nil,
-       [:o, :b],
-       (598...601),
-       nil,
-       nil,
-       nil,
-       nil,
-       (613...616)
-     ),
-     DefNode(618...640)(
-       (622...623),
-       nil,
-       ParametersNode(624...635)(
-         [],
-         [OptionalParameterNode(624...627)(
-            :o,
-            (624...625),
-            (625...626),
-            IntegerNode(626...627)()
-          )],
-         [],
-         RestParameterNode(629...631)((629...630), (630...631)),
-         [],
-         nil,
-         BlockParameterNode(633...635)(:b, (634...635), (633...634))
-       ),
-       nil,
-       [:o, :r, :b],
-       (618...621),
-       nil,
-       nil,
-       nil,
-       nil,
-       (637...640)
-     ),
-     DefNode(642...667)(
-       (646...647),
-       nil,
-       ParametersNode(648...662)(
-         [],
-         [OptionalParameterNode(648...651)(
-            :o,
-            (648...649),
-            (649...650),
-            IntegerNode(650...651)()
-          )],
-         [RequiredParameterNode(657...658)(:p)],
-         RestParameterNode(653...655)((653...654), (654...655)),
-         [],
-         nil,
-         BlockParameterNode(660...662)(:b, (661...662), (660...661))
-       ),
-       nil,
-       [:o, :r, :p, :b],
-       (642...645),
-       nil,
-       nil,
-       nil,
-       nil,
-       (664...667)
-     ),
-     DefNode(669...690)(
-       (673...674),
-       nil,
-       ParametersNode(675...685)(
-         [],
-         [OptionalParameterNode(675...678)(
-            :o,
-            (675...676),
-            (676...677),
-            IntegerNode(677...678)()
-          )],
-         [RequiredParameterNode(680...681)(:p)],
-         nil,
-         [],
-         nil,
-         BlockParameterNode(683...685)(:b, (684...685), (683...684))
-       ),
-       nil,
-       [:o, :p, :b],
-       (669...672),
-       nil,
-       nil,
-       nil,
-       nil,
-       (687...690)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/whitequark/args_args_assocs.txt b/test/yarp/snapshots/whitequark/args_args_assocs.txt
deleted file mode 100644
index 5363d6780d032d..00000000000000
--- a/test/yarp/snapshots/whitequark/args_args_assocs.txt
+++ /dev/null
@@ -1,59 +0,0 @@
-ProgramNode(0...46)(
-  [],
-  StatementsNode(0...46)(
-    [CallNode(0...19)(
-       nil,
-       nil,
-       (0...3),
-       (3...4),
-       ArgumentsNode(4...18)(
-         [CallNode(4...7)(nil, nil, (4...7), nil, nil, nil, nil, 2, "foo"),
-          KeywordHashNode(9...18)(
-            [AssocNode(9...18)(
-               SymbolNode(9...13)((9...10), (10...13), nil, "foo"),
-               IntegerNode(17...18)(),
-               (14...16)
-             )]
-          )]
-       ),
-       (18...19),
-       nil,
-       0,
-       "fun"
-     ),
-     CallNode(21...46)(
-       nil,
-       nil,
-       (21...24),
-       (24...25),
-       ArgumentsNode(25...45)(
-         [CallNode(25...28)(nil, nil, (25...28), nil, nil, nil, nil, 2, "foo"),
-          KeywordHashNode(30...39)(
-            [AssocNode(30...39)(
-               SymbolNode(30...34)((30...31), (31...34), nil, "foo"),
-               IntegerNode(38...39)(),
-               (35...37)
-             )]
-          ),
-          BlockArgumentNode(41...45)(
-            CallNode(42...45)(
-              nil,
-              nil,
-              (42...45),
-              nil,
-              nil,
-              nil,
-              nil,
-              2,
-              "baz"
-            ),
-            (41...42)
-          )]
-       ),
-       (45...46),
-       nil,
-       0,
-       "fun"
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/whitequark/args_args_assocs_comma.txt b/test/yarp/snapshots/whitequark/args_args_assocs_comma.txt
deleted file mode 100644
index da9ea1bd810fd6..00000000000000
--- a/test/yarp/snapshots/whitequark/args_args_assocs_comma.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-ProgramNode(0...20)(
-  [],
-  StatementsNode(0...20)(
-    [CallNode(0...20)(
-       CallNode(0...3)(nil, nil, (0...3), nil, nil, nil, nil, 2, "foo"),
-       nil,
-       (3...20),
-       (3...4),
-       ArgumentsNode(4...18)(
-         [CallNode(4...7)(nil, nil, (4...7), nil, nil, nil, nil, 2, "bar"),
-          KeywordHashNode(9...18)(
-            [AssocNode(9...18)(
-               SymbolNode(9...13)((9...10), (10...13), nil, "baz"),
-               IntegerNode(17...18)(),
-               (14...16)
-             )]
-          )]
-       ),
-       (19...20),
-       nil,
-       0,
-       "[]"
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/whitequark/args_args_comma.txt b/test/yarp/snapshots/whitequark/args_args_comma.txt
deleted file mode 100644
index a6014eebc427f3..00000000000000
--- a/test/yarp/snapshots/whitequark/args_args_comma.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-ProgramNode(0...9)(
-  [],
-  StatementsNode(0...9)(
-    [CallNode(0...9)(
-       CallNode(0...3)(nil, nil, (0...3), nil, nil, nil, nil, 2, "foo"),
-       nil,
-       (3...9),
-       (3...4),
-       ArgumentsNode(4...7)(
-         [CallNode(4...7)(nil, nil, (4...7), nil, nil, nil, nil, 2, "bar")]
-       ),
-       (8...9),
-       nil,
-       0,
-       "[]"
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/whitequark/args_args_star.txt b/test/yarp/snapshots/whitequark/args_args_star.txt
deleted file mode 100644
index ed007cfa5afccd..00000000000000
--- a/test/yarp/snapshots/whitequark/args_args_star.txt
+++ /dev/null
@@ -1,73 +0,0 @@
-ProgramNode(0...36)(
-  [],
-  StatementsNode(0...36)(
-    [CallNode(0...14)(
-       nil,
-       nil,
-       (0...3),
-       (3...4),
-       ArgumentsNode(4...13)(
-         [CallNode(4...7)(nil, nil, (4...7), nil, nil, nil, nil, 2, "foo"),
-          SplatNode(9...13)(
-            (9...10),
-            CallNode(10...13)(
-              nil,
-              nil,
-              (10...13),
-              nil,
-              nil,
-              nil,
-              nil,
-              2,
-              "bar"
-            )
-          )]
-       ),
-       (13...14),
-       nil,
-       0,
-       "fun"
-     ),
-     CallNode(16...36)(
-       nil,
-       nil,
-       (16...19),
-       (19...20),
-       ArgumentsNode(20...35)(
-         [CallNode(20...23)(nil, nil, (20...23), nil, nil, nil, nil, 2, "foo"),
-          SplatNode(25...29)(
-            (25...26),
-            CallNode(26...29)(
-              nil,
-              nil,
-              (26...29),
-              nil,
-              nil,
-              nil,
-              nil,
-              2,
-              "bar"
-            )
-          ),
-          BlockArgumentNode(31...35)(
-            CallNode(32...35)(
-              nil,
-              nil,
-              (32...35),
-              nil,
-              nil,
-              nil,
-              nil,
-              2,
-              "baz"
-            ),
-            (31...32)
-          )]
-       ),
-       (35...36),
-       nil,
-       0,
-       "fun"
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/whitequark/args_assocs.txt b/test/yarp/snapshots/whitequark/args_assocs.txt
deleted file mode 100644
index 8fa24ab4795964..00000000000000
--- a/test/yarp/snapshots/whitequark/args_assocs.txt
+++ /dev/null
@@ -1,125 +0,0 @@
-ProgramNode(0...114)(
-  [],
-  StatementsNode(0...114)(
-    [CallNode(0...14)(
-       nil,
-       nil,
-       (0...3),
-       (3...4),
-       ArgumentsNode(4...13)(
-         [KeywordHashNode(4...13)(
-            [AssocNode(4...13)(
-               SymbolNode(4...8)((4...5), (5...8), nil, "foo"),
-               IntegerNode(12...13)(),
-               (9...11)
-             )]
-          )]
-       ),
-       (13...14),
-       nil,
-       0,
-       "fun"
-     ),
-     CallNode(16...36)(
-       nil,
-       nil,
-       (16...19),
-       (19...20),
-       ArgumentsNode(20...35)(
-         [KeywordHashNode(20...29)(
-            [AssocNode(20...29)(
-               SymbolNode(20...24)((20...21), (21...24), nil, "foo"),
-               IntegerNode(28...29)(),
-               (25...27)
-             )]
-          ),
-          BlockArgumentNode(31...35)(
-            CallNode(32...35)(
-              nil,
-              nil,
-              (32...35),
-              nil,
-              nil,
-              nil,
-              nil,
-              2,
-              "baz"
-            ),
-            (31...32)
-          )]
-       ),
-       (35...36),
-       nil,
-       0,
-       "fun"
-     ),
-     CallNode(38...59)(
-       SelfNode(38...42)(),
-       (42...43),
-       (43...46),
-       nil,
-       ArgumentsNode(47...59)(
-         [CallNode(47...50)(nil, nil, (47...50), nil, nil, nil, nil, 2, "foo"),
-          KeywordHashNode(52...59)(
-            [AssocNode(52...59)(
-               SymbolNode(52...54)((52...53), (53...54), nil, "a"),
-               IntegerNode(58...59)(),
-               (55...57)
-             )]
-          )]
-       ),
-       nil,
-       nil,
-       0,
-       "[]="
-     ),
-     CallNode(61...76)(
-       SelfNode(61...65)(),
-       nil,
-       (65...76),
-       (65...66),
-       ArgumentsNode(66...75)(
-         [KeywordHashNode(66...75)(
-            [AssocNode(66...75)(
-               SymbolNode(66...70)((66...67), (67...70), nil, "bar"),
-               IntegerNode(74...75)(),
-               (71...73)
-             )]
-          )]
-       ),
-       (75...76),
-       nil,
-       0,
-       "[]"
-     ),
-     SuperNode(78...95)(
-       (78...83),
-       (83...84),
-       ArgumentsNode(84...94)(
-         [KeywordHashNode(84...94)(
-            [AssocNode(84...94)(
-               SymbolNode(84...88)((84...85), (85...88), nil, "foo"),
-               IntegerNode(92...94)(),
-               (89...91)
-             )]
-          )]
-       ),
-       (94...95),
-       nil
-     ),
-     YieldNode(97...114)(
-       (97...102),
-       (102...103),
-       ArgumentsNode(103...113)(
-         [KeywordHashNode(103...113)(
-            [AssocNode(103...113)(
-               SymbolNode(103...107)((103...104), (104...107), nil, "foo"),
-               IntegerNode(111...113)(),
-               (108...110)
-             )]
-          )]
-       ),
-       (113...114)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/whitequark/args_assocs_comma.txt b/test/yarp/snapshots/whitequark/args_assocs_comma.txt
deleted file mode 100644
index 97de8d44ef9541..00000000000000
--- a/test/yarp/snapshots/whitequark/args_assocs_comma.txt
+++ /dev/null
@@ -1,24 +0,0 @@
-ProgramNode(0...15)(
-  [],
-  StatementsNode(0...15)(
-    [CallNode(0...15)(
-       CallNode(0...3)(nil, nil, (0...3), nil, nil, nil, nil, 2, "foo"),
-       nil,
-       (3...15),
-       (3...4),
-       ArgumentsNode(4...13)(
-         [KeywordHashNode(4...13)(
-            [AssocNode(4...13)(
-               SymbolNode(4...8)((4...5), (5...8), nil, "baz"),
-               IntegerNode(12...13)(),
-               (9...11)
-             )]
-          )]
-       ),
-       (14...15),
-       nil,
-       0,
-       "[]"
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/whitequark/args_assocs_legacy.txt b/test/yarp/snapshots/whitequark/args_assocs_legacy.txt
deleted file mode 100644
index 8fa24ab4795964..00000000000000
--- a/test/yarp/snapshots/whitequark/args_assocs_legacy.txt
+++ /dev/null
@@ -1,125 +0,0 @@
-ProgramNode(0...114)(
-  [],
-  StatementsNode(0...114)(
-    [CallNode(0...14)(
-       nil,
-       nil,
-       (0...3),
-       (3...4),
-       ArgumentsNode(4...13)(
-         [KeywordHashNode(4...13)(
-            [AssocNode(4...13)(
-               SymbolNode(4...8)((4...5), (5...8), nil, "foo"),
-               IntegerNode(12...13)(),
-               (9...11)
-             )]
-          )]
-       ),
-       (13...14),
-       nil,
-       0,
-       "fun"
-     ),
-     CallNode(16...36)(
-       nil,
-       nil,
-       (16...19),
-       (19...20),
-       ArgumentsNode(20...35)(
-         [KeywordHashNode(20...29)(
-            [AssocNode(20...29)(
-               SymbolNode(20...24)((20...21), (21...24), nil, "foo"),
-               IntegerNode(28...29)(),
-               (25...27)
-             )]
-          ),
-          BlockArgumentNode(31...35)(
-            CallNode(32...35)(
-              nil,
-              nil,
-              (32...35),
-              nil,
-              nil,
-              nil,
-              nil,
-              2,
-              "baz"
-            ),
-            (31...32)
-          )]
-       ),
-       (35...36),
-       nil,
-       0,
-       "fun"
-     ),
-     CallNode(38...59)(
-       SelfNode(38...42)(),
-       (42...43),
-       (43...46),
-       nil,
-       ArgumentsNode(47...59)(
-         [CallNode(47...50)(nil, nil, (47...50), nil, nil, nil, nil, 2, "foo"),
-          KeywordHashNode(52...59)(
-            [AssocNode(52...59)(
-               SymbolNode(52...54)((52...53), (53...54), nil, "a"),
-               IntegerNode(58...59)(),
-               (55...57)
-             )]
-          )]
-       ),
-       nil,
-       nil,
-       0,
-       "[]="
-     ),
-     CallNode(61...76)(
-       SelfNode(61...65)(),
-       nil,
-       (65...76),
-       (65...66),
-       ArgumentsNode(66...75)(
-         [KeywordHashNode(66...75)(
-            [AssocNode(66...75)(
-               SymbolNode(66...70)((66...67), (67...70), nil, "bar"),
-               IntegerNode(74...75)(),
-               (71...73)
-             )]
-          )]
-       ),
-       (75...76),
-       nil,
-       0,
-       "[]"
-     ),
-     SuperNode(78...95)(
-       (78...83),
-       (83...84),
-       ArgumentsNode(84...94)(
-         [KeywordHashNode(84...94)(
-            [AssocNode(84...94)(
-               SymbolNode(84...88)((84...85), (85...88), nil, "foo"),
-               IntegerNode(92...94)(),
-               (89...91)
-             )]
-          )]
-       ),
-       (94...95),
-       nil
-     ),
-     YieldNode(97...114)(
-       (97...102),
-       (102...103),
-       ArgumentsNode(103...113)(
-         [KeywordHashNode(103...113)(
-            [AssocNode(103...113)(
-               SymbolNode(103...107)((103...104), (104...107), nil, "foo"),
-               IntegerNode(111...113)(),
-               (108...110)
-             )]
-          )]
-       ),
-       (113...114)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/whitequark/args_block_pass.txt b/test/yarp/snapshots/whitequark/args_block_pass.txt
deleted file mode 100644
index 50c51ba7b3cc56..00000000000000
--- a/test/yarp/snapshots/whitequark/args_block_pass.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-ProgramNode(0...9)(
-  [],
-  StatementsNode(0...9)(
-    [CallNode(0...9)(
-       nil,
-       nil,
-       (0...3),
-       (3...4),
-       ArgumentsNode(4...8)(
-         [BlockArgumentNode(4...8)(
-            CallNode(5...8)(nil, nil, (5...8), nil, nil, nil, nil, 2, "bar"),
-            (4...5)
-          )]
-       ),
-       (8...9),
-       nil,
-       0,
-       "fun"
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/whitequark/args_cmd.txt b/test/yarp/snapshots/whitequark/args_cmd.txt
deleted file mode 100644
index 9b0cfedb006b29..00000000000000
--- a/test/yarp/snapshots/whitequark/args_cmd.txt
+++ /dev/null
@@ -1,40 +0,0 @@
-ProgramNode(0...10)(
-  [],
-  StatementsNode(0...10)(
-    [CallNode(0...10)(
-       nil,
-       nil,
-       (0...3),
-       (3...4),
-       ArgumentsNode(4...9)(
-         [CallNode(4...9)(
-            nil,
-            nil,
-            (4...5),
-            nil,
-            ArgumentsNode(6...9)(
-              [CallNode(6...9)(
-                 nil,
-                 nil,
-                 (6...9),
-                 nil,
-                 nil,
-                 nil,
-                 nil,
-                 2,
-                 "bar"
-               )]
-            ),
-            nil,
-            nil,
-            0,
-            "f"
-          )]
-       ),
-       (9...10),
-       nil,
-       0,
-       "fun"
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/whitequark/args_star.txt b/test/yarp/snapshots/whitequark/args_star.txt
deleted file mode 100644
index eaffafdd3d428f..00000000000000
--- a/test/yarp/snapshots/whitequark/args_star.txt
+++ /dev/null
@@ -1,61 +0,0 @@
-ProgramNode(0...26)(
-  [],
-  StatementsNode(0...26)(
-    [CallNode(0...9)(
-       nil,
-       nil,
-       (0...3),
-       (3...4),
-       ArgumentsNode(4...8)(
-         [SplatNode(4...8)(
-            (4...5),
-            CallNode(5...8)(nil, nil, (5...8), nil, nil, nil, nil, 2, "bar")
-          )]
-       ),
-       (8...9),
-       nil,
-       0,
-       "fun"
-     ),
-     CallNode(11...26)(
-       nil,
-       nil,
-       (11...14),
-       (14...15),
-       ArgumentsNode(15...25)(
-         [SplatNode(15...19)(
-            (15...16),
-            CallNode(16...19)(
-              nil,
-              nil,
-              (16...19),
-              nil,
-              nil,
-              nil,
-              nil,
-              2,
-              "bar"
-            )
-          ),
-          BlockArgumentNode(21...25)(
-            CallNode(22...25)(
-              nil,
-              nil,
-              (22...25),
-              nil,
-              nil,
-              nil,
-              nil,
-              2,
-              "baz"
-            ),
-            (21...22)
-          )]
-       ),
-       (25...26),
-       nil,
-       0,
-       "fun"
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/whitequark/array_assocs.txt b/test/yarp/snapshots/whitequark/array_assocs.txt
deleted file mode 100644
index 6dc20662ca196c..00000000000000
--- a/test/yarp/snapshots/whitequark/array_assocs.txt
+++ /dev/null
@@ -1,28 +0,0 @@
-ProgramNode(0...25)(
-  [],
-  StatementsNode(0...25)(
-    [ArrayNode(0...10)(
-       [KeywordHashNode(2...8)(
-          [AssocNode(2...8)(
-             IntegerNode(2...3)(),
-             IntegerNode(7...8)(),
-             (4...6)
-           )]
-        )],
-       (0...1),
-       (9...10)
-     ),
-     ArrayNode(12...25)(
-       [IntegerNode(14...15)(),
-        KeywordHashNode(17...23)(
-          [AssocNode(17...23)(
-             IntegerNode(17...18)(),
-             IntegerNode(22...23)(),
-             (19...21)
-           )]
-        )],
-       (12...13),
-       (24...25)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/whitequark/array_plain.txt b/test/yarp/snapshots/whitequark/array_plain.txt
deleted file mode 100644
index d8c89ba8b9f3e7..00000000000000
--- a/test/yarp/snapshots/whitequark/array_plain.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-ProgramNode(0...6)(
-  [],
-  StatementsNode(0...6)(
-    [ArrayNode(0...6)(
-       [IntegerNode(1...2)(), IntegerNode(4...5)()],
-       (0...1),
-       (5...6)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/whitequark/array_splat.txt b/test/yarp/snapshots/whitequark/array_splat.txt
deleted file mode 100644
index 770e42e8143280..00000000000000
--- a/test/yarp/snapshots/whitequark/array_splat.txt
+++ /dev/null
@@ -1,32 +0,0 @@
-ProgramNode(0...31)(
-  [],
-  StatementsNode(0...31)(
-    [ArrayNode(0...6)(
-       [SplatNode(1...5)(
-          (1...2),
-          CallNode(2...5)(nil, nil, (2...5), nil, nil, nil, nil, 2, "foo")
-        )],
-       (0...1),
-       (5...6)
-     ),
-     ArrayNode(8...20)(
-       [IntegerNode(9...10)(),
-        SplatNode(12...16)(
-          (12...13),
-          CallNode(13...16)(nil, nil, (13...16), nil, nil, nil, nil, 2, "foo")
-        ),
-        IntegerNode(18...19)()],
-       (8...9),
-       (19...20)
-     ),
-     ArrayNode(22...31)(
-       [IntegerNode(23...24)(),
-        SplatNode(26...30)(
-          (26...27),
-          CallNode(27...30)(nil, nil, (27...30), nil, nil, nil, nil, 2, "foo")
-        )],
-       (22...23),
-       (30...31)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/whitequark/array_symbols.txt b/test/yarp/snapshots/whitequark/array_symbols.txt
deleted file mode 100644
index 9d036af7cf9b32..00000000000000
--- a/test/yarp/snapshots/whitequark/array_symbols.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-ProgramNode(0...11)(
-  [],
-  StatementsNode(0...11)(
-    [ArrayNode(0...11)(
-       [SymbolNode(3...6)(nil, (3...6), nil, "foo"),
-        SymbolNode(7...10)(nil, (7...10), nil, "bar")],
-       (0...3),
-       (10...11)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/whitequark/array_symbols_empty.txt b/test/yarp/snapshots/whitequark/array_symbols_empty.txt
deleted file mode 100644
index ce2b82c914aadd..00000000000000
--- a/test/yarp/snapshots/whitequark/array_symbols_empty.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-ProgramNode(0...10)(
-  [],
-  StatementsNode(0...10)(
-    [ArrayNode(0...4)([], (0...3), (3...4)),
-     ArrayNode(6...10)([], (6...9), (9...10))]
-  )
-)
diff --git a/test/yarp/snapshots/whitequark/array_symbols_interp.txt b/test/yarp/snapshots/whitequark/array_symbols_interp.txt
deleted file mode 100644
index 8488e7e9c233cb..00000000000000
--- a/test/yarp/snapshots/whitequark/array_symbols_interp.txt
+++ /dev/null
@@ -1,57 +0,0 @@
-ProgramNode(0...29)(
-  [],
-  StatementsNode(0...29)(
-    [ArrayNode(0...14)(
-       [SymbolNode(3...6)(nil, (3...6), nil, "foo"),
-        InterpolatedSymbolNode(7...13)(
-          nil,
-          [EmbeddedStatementsNode(7...13)(
-             (7...9),
-             StatementsNode(9...12)(
-               [CallNode(9...12)(
-                  nil,
-                  nil,
-                  (9...12),
-                  nil,
-                  nil,
-                  nil,
-                  nil,
-                  2,
-                  "bar"
-                )]
-             ),
-             (12...13)
-           )],
-          nil
-        )],
-       (0...3),
-       (13...14)
-     ),
-     ArrayNode(16...29)(
-       [InterpolatedSymbolNode(19...28)(
-          nil,
-          [StringNode(19...22)(nil, (19...22), nil, "foo"),
-           EmbeddedStatementsNode(22...28)(
-             (22...24),
-             StatementsNode(24...27)(
-               [CallNode(24...27)(
-                  nil,
-                  nil,
-                  (24...27),
-                  nil,
-                  nil,
-                  nil,
-                  nil,
-                  2,
-                  "bar"
-                )]
-             ),
-             (27...28)
-           )],
-          nil
-        )],
-       (16...19),
-       (28...29)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/whitequark/array_words.txt b/test/yarp/snapshots/whitequark/array_words.txt
deleted file mode 100644
index 3308b6b7f27eda..00000000000000
--- a/test/yarp/snapshots/whitequark/array_words.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-ProgramNode(0...11)(
-  [],
-  StatementsNode(0...11)(
-    [ArrayNode(0...11)(
-       [StringNode(3...6)(nil, (3...6), nil, "foo"),
-        StringNode(7...10)(nil, (7...10), nil, "bar")],
-       (0...3),
-       (10...11)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/whitequark/array_words_empty.txt b/test/yarp/snapshots/whitequark/array_words_empty.txt
deleted file mode 100644
index ce2b82c914aadd..00000000000000
--- a/test/yarp/snapshots/whitequark/array_words_empty.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-ProgramNode(0...10)(
-  [],
-  StatementsNode(0...10)(
-    [ArrayNode(0...4)([], (0...3), (3...4)),
-     ArrayNode(6...10)([], (6...9), (9...10))]
-  )
-)
diff --git a/test/yarp/snapshots/whitequark/array_words_interp.txt b/test/yarp/snapshots/whitequark/array_words_interp.txt
deleted file mode 100644
index d4bc9292e6ea64..00000000000000
--- a/test/yarp/snapshots/whitequark/array_words_interp.txt
+++ /dev/null
@@ -1,62 +0,0 @@
-ProgramNode(0...38)(
-  [],
-  StatementsNode(0...38)(
-    [ArrayNode(0...14)(
-       [StringNode(3...6)(nil, (3...6), nil, "foo"),
-        InterpolatedStringNode(7...13)(
-          nil,
-          [EmbeddedStatementsNode(7...13)(
-             (7...9),
-             StatementsNode(9...12)(
-               [CallNode(9...12)(
-                  nil,
-                  nil,
-                  (9...12),
-                  nil,
-                  nil,
-                  nil,
-                  nil,
-                  2,
-                  "bar"
-                )]
-             ),
-             (12...13)
-           )],
-          nil
-        )],
-       (0...3),
-       (13...14)
-     ),
-     ArrayNode(16...38)(
-       [StringNode(19...22)(nil, (19...22), nil, "foo"),
-        InterpolatedStringNode(23...37)(
-          nil,
-          [EmbeddedStatementsNode(23...29)(
-             (23...25),
-             StatementsNode(25...28)(
-               [CallNode(25...28)(
-                  nil,
-                  nil,
-                  (25...28),
-                  nil,
-                  nil,
-                  nil,
-                  nil,
-                  2,
-                  "bar"
-                )]
-             ),
-             (28...29)
-           ),
-           StringNode(29...32)(nil, (29...32), nil, "foo"),
-           EmbeddedVariableNode(32...37)(
-             (32...33),
-             InstanceVariableReadNode(33...37)(:@baz)
-           )],
-          nil
-        )],
-       (16...19),
-       (37...38)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/whitequark/asgn_cmd.txt b/test/yarp/snapshots/whitequark/asgn_cmd.txt
deleted file mode 100644
index ef24cc0477f9e8..00000000000000
--- a/test/yarp/snapshots/whitequark/asgn_cmd.txt
+++ /dev/null
@@ -1,45 +0,0 @@
-ProgramNode(0...30)(
-  [:foo, :bar],
-  StatementsNode(0...30)(
-    [LocalVariableWriteNode(0...17)(
-       :foo,
-       0,
-       (0...3),
-       LocalVariableWriteNode(6...17)(
-         :bar,
-         0,
-         (6...9),
-         CallNode(12...17)(
-           nil,
-           nil,
-           (12...13),
-           nil,
-           ArgumentsNode(14...17)([LocalVariableReadNode(14...17)(:foo, 0)]),
-           nil,
-           nil,
-           0,
-           "m"
-         ),
-         (10...11)
-       ),
-       (4...5)
-     ),
-     LocalVariableWriteNode(19...30)(
-       :foo,
-       0,
-       (19...22),
-       CallNode(25...30)(
-         nil,
-         nil,
-         (25...26),
-         nil,
-         ArgumentsNode(27...30)([LocalVariableReadNode(27...30)(:foo, 0)]),
-         nil,
-         nil,
-         0,
-         "m"
-       ),
-       (23...24)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/whitequark/asgn_mrhs.txt b/test/yarp/snapshots/whitequark/asgn_mrhs.txt
deleted file mode 100644
index aaf2bedb6f340c..00000000000000
--- a/test/yarp/snapshots/whitequark/asgn_mrhs.txt
+++ /dev/null
@@ -1,56 +0,0 @@
-ProgramNode(0...41)(
-  [:foo],
-  StatementsNode(0...41)(
-    [LocalVariableWriteNode(0...10)(
-       :foo,
-       0,
-       (0...3),
-       ArrayNode(6...10)(
-         [SplatNode(6...10)(
-            (6...7),
-            CallNode(7...10)(nil, nil, (7...10), nil, nil, nil, nil, 2, "bar")
-          )],
-         nil,
-         nil
-       ),
-       (4...5)
-     ),
-     LocalVariableWriteNode(12...24)(
-       :foo,
-       0,
-       (12...15),
-       ArrayNode(18...24)(
-         [CallNode(18...21)(nil, nil, (18...21), nil, nil, nil, nil, 2, "bar"),
-          IntegerNode(23...24)()],
-         nil,
-         nil
-       ),
-       (16...17)
-     ),
-     LocalVariableWriteNode(26...41)(
-       :foo,
-       0,
-       (26...29),
-       ArrayNode(32...41)(
-         [CallNode(32...35)(nil, nil, (32...35), nil, nil, nil, nil, 2, "baz"),
-          SplatNode(37...41)(
-            (37...38),
-            CallNode(38...41)(
-              nil,
-              nil,
-              (38...41),
-              nil,
-              nil,
-              nil,
-              nil,
-              2,
-              "bar"
-            )
-          )],
-         nil,
-         nil
-       ),
-       (30...31)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/whitequark/back_ref.txt b/test/yarp/snapshots/whitequark/back_ref.txt
deleted file mode 100644
index d072409376ba7a..00000000000000
--- a/test/yarp/snapshots/whitequark/back_ref.txt
+++ /dev/null
@@ -1 +0,0 @@
-ProgramNode(0...2)([], StatementsNode(0...2)([BackReferenceReadNode(0...2)()]))
diff --git a/test/yarp/snapshots/whitequark/bang.txt b/test/yarp/snapshots/whitequark/bang.txt
deleted file mode 100644
index 65ea29dfd39010..00000000000000
--- a/test/yarp/snapshots/whitequark/bang.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-ProgramNode(0...4)(
-  [],
-  StatementsNode(0...4)(
-    [CallNode(0...4)(
-       CallNode(1...4)(nil, nil, (1...4), nil, nil, nil, nil, 2, "foo"),
-       nil,
-       (0...1),
-       nil,
-       nil,
-       nil,
-       nil,
-       0,
-       "!"
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/whitequark/bang_cmd.txt b/test/yarp/snapshots/whitequark/bang_cmd.txt
deleted file mode 100644
index 23921cc1b3400d..00000000000000
--- a/test/yarp/snapshots/whitequark/bang_cmd.txt
+++ /dev/null
@@ -1,28 +0,0 @@
-ProgramNode(0...6)(
-  [],
-  StatementsNode(0...6)(
-    [CallNode(0...6)(
-       CallNode(1...6)(
-         nil,
-         nil,
-         (1...2),
-         nil,
-         ArgumentsNode(3...6)(
-           [CallNode(3...6)(nil, nil, (3...6), nil, nil, nil, nil, 2, "foo")]
-         ),
-         nil,
-         nil,
-         0,
-         "m"
-       ),
-       nil,
-       (0...1),
-       nil,
-       nil,
-       nil,
-       nil,
-       0,
-       "!"
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/whitequark/begin_cmdarg.txt b/test/yarp/snapshots/whitequark/begin_cmdarg.txt
deleted file mode 100644
index 2d1d4e53e5fbe3..00000000000000
--- a/test/yarp/snapshots/whitequark/begin_cmdarg.txt
+++ /dev/null
@@ -1,43 +0,0 @@
-ProgramNode(0...28)(
-  [],
-  StatementsNode(0...28)(
-    [CallNode(0...28)(
-       nil,
-       nil,
-       (0...1),
-       nil,
-       ArgumentsNode(2...28)(
-         [BeginNode(2...28)(
-            (2...7),
-            StatementsNode(8...24)(
-              [CallNode(8...24)(
-                 IntegerNode(8...9)(),
-                 (9...10),
-                 (10...15),
-                 nil,
-                 nil,
-                 nil,
-                 BlockNode(16...24)(
-                   [],
-                   nil,
-                   StatementsNode(19...20)([IntegerNode(19...20)()]),
-                   (16...18),
-                   (21...24)
-                 ),
-                 0,
-                 "times"
-               )]
-            ),
-            nil,
-            nil,
-            nil,
-            (25...28)
-          )]
-       ),
-       nil,
-       nil,
-       0,
-       "p"
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/whitequark/beginless_erange_after_newline.txt b/test/yarp/snapshots/whitequark/beginless_erange_after_newline.txt
deleted file mode 100644
index dbe6e585a28e36..00000000000000
--- a/test/yarp/snapshots/whitequark/beginless_erange_after_newline.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-ProgramNode(0...10)(
-  [],
-  StatementsNode(0...10)(
-    [CallNode(0...3)(nil, nil, (0...3), nil, nil, nil, nil, 2, "foo"),
-     RangeNode(4...10)(nil, IntegerNode(7...10)(), (4...7), 1)]
-  )
-)
diff --git a/test/yarp/snapshots/whitequark/beginless_irange_after_newline.txt b/test/yarp/snapshots/whitequark/beginless_irange_after_newline.txt
deleted file mode 100644
index f784561012d3e0..00000000000000
--- a/test/yarp/snapshots/whitequark/beginless_irange_after_newline.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-ProgramNode(0...9)(
-  [],
-  StatementsNode(0...9)(
-    [CallNode(0...3)(nil, nil, (0...3), nil, nil, nil, nil, 2, "foo"),
-     RangeNode(4...9)(nil, IntegerNode(6...9)(), (4...6), 0)]
-  )
-)
diff --git a/test/yarp/snapshots/whitequark/beginless_range.txt b/test/yarp/snapshots/whitequark/beginless_range.txt
deleted file mode 100644
index 37505086297a06..00000000000000
--- a/test/yarp/snapshots/whitequark/beginless_range.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-ProgramNode(0...13)(
-  [],
-  StatementsNode(0...13)(
-    [RangeNode(0...6)(nil, IntegerNode(3...6)(), (0...3), 1),
-     RangeNode(8...13)(nil, IntegerNode(10...13)(), (8...10), 0)]
-  )
-)
diff --git a/test/yarp/snapshots/whitequark/blockarg.txt b/test/yarp/snapshots/whitequark/blockarg.txt
deleted file mode 100644
index 4e31eac3d8bf36..00000000000000
--- a/test/yarp/snapshots/whitequark/blockarg.txt
+++ /dev/null
@@ -1,26 +0,0 @@
-ProgramNode(0...18)(
-  [],
-  StatementsNode(0...18)(
-    [DefNode(0...18)(
-       (4...5),
-       nil,
-       ParametersNode(6...12)(
-         [],
-         [],
-         [],
-         nil,
-         [],
-         nil,
-         BlockParameterNode(6...12)(:block, (7...12), (6...7))
-       ),
-       nil,
-       [:block],
-       (0...3),
-       nil,
-       (5...6),
-       (12...13),
-       nil,
-       (15...18)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/whitequark/blockargs.txt b/test/yarp/snapshots/whitequark/blockargs.txt
deleted file mode 100644
index d716003643385c..00000000000000
--- a/test/yarp/snapshots/whitequark/blockargs.txt
+++ /dev/null
@@ -1,1052 +0,0 @@
-ProgramNode(0...550)(
-  [],
-  StatementsNode(0...550)(
-    [CallNode(0...5)(
-       nil,
-       nil,
-       (0...1),
-       nil,
-       nil,
-       nil,
-       BlockNode(1...5)([], nil, nil, (1...2), (4...5)),
-       0,
-       "f"
-     ),
-     CallNode(7...15)(
-       nil,
-       nil,
-       (7...8),
-       nil,
-       nil,
-       nil,
-       BlockNode(8...15)(
-         [],
-         BlockParametersNode(10...13)(nil, [], (10...11), (12...13)),
-         nil,
-         (8...9),
-         (14...15)
-       ),
-       0,
-       "f"
-     ),
-     CallNode(17...26)(
-       nil,
-       nil,
-       (17...18),
-       nil,
-       nil,
-       nil,
-       BlockNode(18...26)(
-         [:b],
-         BlockParametersNode(20...24)(
-           ParametersNode(21...23)(
-             [],
-             [],
-             [],
-             nil,
-             [],
-             nil,
-             BlockParameterNode(21...23)(:b, (22...23), (21...22))
-           ),
-           [],
-           (20...21),
-           (23...24)
-         ),
-         nil,
-         (18...19),
-         (25...26)
-       ),
-       0,
-       "f"
-     ),
-     CallNode(28...44)(
-       nil,
-       nil,
-       (28...29),
-       nil,
-       nil,
-       nil,
-       BlockNode(29...44)(
-         [:baz, :b],
-         BlockParametersNode(31...42)(
-           ParametersNode(32...41)(
-             [],
-             [],
-             [],
-             nil,
-             [],
-             KeywordRestParameterNode(32...37)((32...34), (34...37)),
-             BlockParameterNode(39...41)(:b, (40...41), (39...40))
-           ),
-           [],
-           (31...32),
-           (41...42)
-         ),
-         nil,
-         (29...30),
-         (43...44)
-       ),
-       0,
-       "f"
-     ),
-     CallNode(46...58)(
-       nil,
-       nil,
-       (46...47),
-       nil,
-       nil,
-       nil,
-       BlockNode(47...58)(
-         [:*, :b],
-         BlockParametersNode(49...56)(
-           ParametersNode(50...55)(
-             [],
-             [],
-             [],
-             RestParameterNode(50...51)((50...51), nil),
-             [],
-             nil,
-             BlockParameterNode(53...55)(:b, (54...55), (53...54))
-           ),
-           [],
-           (49...50),
-           (55...56)
-         ),
-         nil,
-         (47...48),
-         (57...58)
-       ),
-       0,
-       "f"
-     ),
-     CallNode(60...76)(
-       nil,
-       nil,
-       (60...61),
-       nil,
-       nil,
-       nil,
-       BlockNode(61...76)(
-         [:r, :p, :b],
-         BlockParametersNode(63...74)(
-           ParametersNode(64...73)(
-             [],
-             [],
-             [RequiredParameterNode(68...69)(:p)],
-             RestParameterNode(64...66)((64...65), (65...66)),
-             [],
-             nil,
-             BlockParameterNode(71...73)(:b, (72...73), (71...72))
-           ),
-           [],
-           (63...64),
-           (73...74)
-         ),
-         nil,
-         (61...62),
-         (75...76)
-       ),
-       0,
-       "f"
-     ),
-     CallNode(78...91)(
-       nil,
-       nil,
-       (78...79),
-       nil,
-       nil,
-       nil,
-       BlockNode(79...91)(
-         [:s, :b],
-         BlockParametersNode(81...89)(
-           ParametersNode(82...88)(
-             [],
-             [],
-             [],
-             RestParameterNode(82...84)((82...83), (83...84)),
-             [],
-             nil,
-             BlockParameterNode(86...88)(:b, (87...88), (86...87))
-           ),
-           [],
-           (81...82),
-           (88...89)
-         ),
-         nil,
-         (79...80),
-         (90...91)
-       ),
-       0,
-       "f"
-     ),
-     CallNode(93...102)(
-       nil,
-       nil,
-       (93...94),
-       nil,
-       nil,
-       nil,
-       BlockNode(94...102)(
-         [:s],
-         BlockParametersNode(96...100)(
-           ParametersNode(97...99)(
-             [],
-             [],
-             [],
-             RestParameterNode(97...99)((97...98), (98...99)),
-             [],
-             nil,
-             nil
-           ),
-           [],
-           (96...97),
-           (99...100)
-         ),
-         nil,
-         (94...95),
-         (101...102)
-       ),
-       0,
-       "f"
-     ),
-     CallNode(104...112)(
-       nil,
-       nil,
-       (104...105),
-       nil,
-       nil,
-       nil,
-       BlockNode(105...112)(
-         [:*],
-         BlockParametersNode(107...110)(
-           ParametersNode(108...109)(
-             [],
-             [],
-             [],
-             RestParameterNode(108...109)((108...109), nil),
-             [],
-             nil,
-             nil
-           ),
-           [],
-           (107...108),
-           (109...110)
-         ),
-         nil,
-         (105...106),
-         (111...112)
-       ),
-       0,
-       "f"
-     ),
-     CallNode(114...125)(
-       nil,
-       nil,
-       (114...115),
-       nil,
-       nil,
-       nil,
-       BlockNode(115...125)(
-         [:a],
-         BlockParametersNode(117...123)(
-           nil,
-           [BlockLocalVariableNode(120...121)(:a)],
-           (117...118),
-           (122...123)
-         ),
-         nil,
-         (115...116),
-         (124...125)
-       ),
-       0,
-       "f"
-     ),
-     CallNode(127...136)(
-       nil,
-       nil,
-       (127...128),
-       nil,
-       nil,
-       nil,
-       BlockNode(128...136)(
-         [:a],
-         BlockParametersNode(130...134)(
-           nil,
-           [BlockLocalVariableNode(132...133)(:a)],
-           (130...131),
-           (133...134)
-         ),
-         nil,
-         (128...129),
-         (135...136)
-       ),
-       0,
-       "f"
-     ),
-     CallNode(138...150)(
-       nil,
-       nil,
-       (138...139),
-       nil,
-       nil,
-       nil,
-       BlockNode(139...150)(
-         [:a, :b],
-         BlockParametersNode(141...148)(
-           ParametersNode(142...147)(
-             [RequiredParameterNode(142...143)(:a)],
-             [],
-             [],
-             nil,
-             [],
-             nil,
-             BlockParameterNode(145...147)(:b, (146...147), (145...146))
-           ),
-           [],
-           (141...142),
-           (147...148)
-         ),
-         nil,
-         (139...140),
-         (149...150)
-       ),
-       0,
-       "f"
-     ),
-     CallNode(152...167)(
-       nil,
-       nil,
-       (152...153),
-       nil,
-       nil,
-       nil,
-       BlockNode(153...167)(
-         [:a, :*, :b],
-         BlockParametersNode(155...165)(
-           ParametersNode(156...164)(
-             [RequiredParameterNode(156...157)(:a)],
-             [],
-             [],
-             RestParameterNode(159...160)((159...160), nil),
-             [],
-             nil,
-             BlockParameterNode(162...164)(:b, (163...164), (162...163))
-           ),
-           [],
-           (155...156),
-           (164...165)
-         ),
-         nil,
-         (153...154),
-         (166...167)
-       ),
-       0,
-       "f"
-     ),
-     CallNode(169...188)(
-       nil,
-       nil,
-       (169...170),
-       nil,
-       nil,
-       nil,
-       BlockNode(170...188)(
-         [:a, :r, :p, :b],
-         BlockParametersNode(172...186)(
-           ParametersNode(173...185)(
-             [RequiredParameterNode(173...174)(:a)],
-             [],
-             [RequiredParameterNode(180...181)(:p)],
-             RestParameterNode(176...178)((176...177), (177...178)),
-             [],
-             nil,
-             BlockParameterNode(183...185)(:b, (184...185), (183...184))
-           ),
-           [],
-           (172...173),
-           (185...186)
-         ),
-         nil,
-         (170...171),
-         (187...188)
-       ),
-       0,
-       "f"
-     ),
-     CallNode(190...206)(
-       nil,
-       nil,
-       (190...191),
-       nil,
-       nil,
-       nil,
-       BlockNode(191...206)(
-         [:a, :s, :b],
-         BlockParametersNode(193...204)(
-           ParametersNode(194...203)(
-             [RequiredParameterNode(194...195)(:a)],
-             [],
-             [],
-             RestParameterNode(197...199)((197...198), (198...199)),
-             [],
-             nil,
-             BlockParameterNode(201...203)(:b, (202...203), (201...202))
-           ),
-           [],
-           (193...194),
-           (203...204)
-         ),
-         nil,
-         (191...192),
-         (205...206)
-       ),
-       0,
-       "f"
-     ),
-     CallNode(208...220)(
-       nil,
-       nil,
-       (208...209),
-       nil,
-       nil,
-       nil,
-       BlockNode(209...220)(
-         [:a, :s],
-         BlockParametersNode(211...218)(
-           ParametersNode(212...217)(
-             [RequiredParameterNode(212...213)(:a)],
-             [],
-             [],
-             RestParameterNode(215...217)((215...216), (216...217)),
-             [],
-             nil,
-             nil
-           ),
-           [],
-           (211...212),
-           (217...218)
-         ),
-         nil,
-         (209...210),
-         (219...220)
-       ),
-       0,
-       "f"
-     ),
-     CallNode(222...233)(
-       nil,
-       nil,
-       (222...223),
-       nil,
-       nil,
-       nil,
-       BlockNode(223...233)(
-         [:a, :*],
-         BlockParametersNode(225...231)(
-           ParametersNode(226...230)(
-             [RequiredParameterNode(226...227)(:a)],
-             [],
-             [],
-             RestParameterNode(229...230)((229...230), nil),
-             [],
-             nil,
-             nil
-           ),
-           [],
-           (225...226),
-           (230...231)
-         ),
-         nil,
-         (223...224),
-         (232...233)
-       ),
-       0,
-       "f"
-     ),
-     CallNode(235...247)(
-       nil,
-       nil,
-       (235...236),
-       nil,
-       nil,
-       nil,
-       BlockNode(236...247)(
-         [:a, :b],
-         BlockParametersNode(238...245)(
-           ParametersNode(239...244)(
-             [RequiredParameterNode(239...240)(:a),
-              RequiredParameterNode(242...243)(:b)],
-             [],
-             [],
-             RestParameterNode(243...244)((243...244), nil),
-             [],
-             nil,
-             nil
-           ),
-           [],
-           (238...239),
-           (244...245)
-         ),
-         nil,
-         (236...237),
-         (246...247)
-       ),
-       0,
-       "f"
-     ),
-     CallNode(249...260)(
-       nil,
-       nil,
-       (249...250),
-       nil,
-       nil,
-       nil,
-       BlockNode(250...260)(
-         [:a, :c],
-         BlockParametersNode(252...258)(
-           ParametersNode(253...257)(
-             [RequiredParameterNode(253...254)(:a),
-              RequiredParameterNode(256...257)(:c)],
-             [],
-             [],
-             nil,
-             [],
-             nil,
-             nil
-           ),
-           [],
-           (252...253),
-           (257...258)
-         ),
-         nil,
-         (250...251),
-         (259...260)
-       ),
-       0,
-       "f"
-     ),
-     CallNode(262...279)(
-       nil,
-       nil,
-       (262...263),
-       nil,
-       nil,
-       nil,
-       BlockNode(263...279)(
-         [:a, :o, :b],
-         BlockParametersNode(265...277)(
-           ParametersNode(266...276)(
-             [RequiredParameterNode(266...267)(:a)],
-             [OptionalParameterNode(269...272)(
-                :o,
-                (269...270),
-                (270...271),
-                IntegerNode(271...272)()
-              )],
-             [],
-             nil,
-             [],
-             nil,
-             BlockParameterNode(274...276)(:b, (275...276), (274...275))
-           ),
-           [],
-           (265...266),
-           (276...277)
-         ),
-         nil,
-         (263...264),
-         (278...279)
-       ),
-       0,
-       "f"
-     ),
-     CallNode(281...305)(
-       nil,
-       nil,
-       (281...282),
-       nil,
-       nil,
-       nil,
-       BlockNode(282...305)(
-         [:a, :o, :r, :p, :b],
-         BlockParametersNode(284...303)(
-           ParametersNode(285...302)(
-             [RequiredParameterNode(285...286)(:a)],
-             [OptionalParameterNode(288...291)(
-                :o,
-                (288...289),
-                (289...290),
-                IntegerNode(290...291)()
-              )],
-             [RequiredParameterNode(297...298)(:p)],
-             RestParameterNode(293...295)((293...294), (294...295)),
-             [],
-             nil,
-             BlockParameterNode(300...302)(:b, (301...302), (300...301))
-           ),
-           [],
-           (284...285),
-           (302...303)
-         ),
-         nil,
-         (282...283),
-         (304...305)
-       ),
-       0,
-       "f"
-     ),
-     CallNode(307...334)(
-       nil,
-       nil,
-       (307...308),
-       nil,
-       nil,
-       nil,
-       BlockNode(308...334)(
-         [:a, :o, :o1, :r, :b],
-         BlockParametersNode(310...332)(
-           ParametersNode(311...331)(
-             [RequiredParameterNode(311...312)(:a)],
-             [OptionalParameterNode(314...317)(
-                :o,
-                (314...315),
-                (315...316),
-                IntegerNode(316...317)()
-              ),
-              OptionalParameterNode(319...323)(
-                :o1,
-                (319...321),
-                (321...322),
-                IntegerNode(322...323)()
-              )],
-             [],
-             RestParameterNode(325...327)((325...326), (326...327)),
-             [],
-             nil,
-             BlockParameterNode(329...331)(:b, (330...331), (329...330))
-           ),
-           [],
-           (310...311),
-           (331...332)
-         ),
-         nil,
-         (308...309),
-         (333...334)
-       ),
-       0,
-       "f"
-     ),
-     CallNode(336...356)(
-       nil,
-       nil,
-       (336...337),
-       nil,
-       nil,
-       nil,
-       BlockNode(337...356)(
-         [:a, :o, :p, :b],
-         BlockParametersNode(339...354)(
-           ParametersNode(340...353)(
-             [RequiredParameterNode(340...341)(:a)],
-             [OptionalParameterNode(343...346)(
-                :o,
-                (343...344),
-                (344...345),
-                IntegerNode(345...346)()
-              )],
-             [RequiredParameterNode(348...349)(:p)],
-             nil,
-             [],
-             nil,
-             BlockParameterNode(351...353)(:b, (352...353), (351...352))
-           ),
-           [],
-           (339...340),
-           (353...354)
-         ),
-         nil,
-         (337...338),
-         (355...356)
-       ),
-       0,
-       "f"
-     ),
-     CallNode(358...367)(
-       nil,
-       nil,
-       (358...359),
-       nil,
-       nil,
-       nil,
-       BlockNode(359...367)(
-         [:a],
-         BlockParametersNode(361...365)(
-           ParametersNode(362...364)(
-             [RequiredParameterNode(362...363)(:a)],
-             [],
-             [],
-             RestParameterNode(363...364)((363...364), nil),
-             [],
-             nil,
-             nil
-           ),
-           [],
-           (361...362),
-           (364...365)
-         ),
-         nil,
-         (359...360),
-         (366...367)
-       ),
-       0,
-       "f"
-     ),
-     CallNode(369...377)(
-       nil,
-       nil,
-       (369...370),
-       nil,
-       nil,
-       nil,
-       BlockNode(370...377)(
-         [:a],
-         BlockParametersNode(372...375)(
-           ParametersNode(373...374)(
-             [RequiredParameterNode(373...374)(:a)],
-             [],
-             [],
-             nil,
-             [],
-             nil,
-             nil
-           ),
-           [],
-           (372...373),
-           (374...375)
-         ),
-         nil,
-         (370...371),
-         (376...377)
-       ),
-       0,
-       "f"
-     ),
-     CallNode(379...387)(
-       nil,
-       nil,
-       (379...380),
-       nil,
-       nil,
-       nil,
-       BlockNode(380...387)(
-         [:a],
-         BlockParametersNode(382...385)(
-           ParametersNode(383...384)(
-             [RequiredParameterNode(383...384)(:a)],
-             [],
-             [],
-             nil,
-             [],
-             nil,
-             nil
-           ),
-           [],
-           (382...383),
-           (384...385)
-         ),
-         nil,
-         (380...381),
-         (386...387)
-       ),
-       0,
-       "f"
-     ),
-     CallNode(389...397)(
-       nil,
-       nil,
-       (389...390),
-       nil,
-       nil,
-       nil,
-       BlockNode(390...397)(
-         [:a],
-         BlockParametersNode(392...395)(
-           ParametersNode(393...394)(
-             [RequiredParameterNode(393...394)(:a)],
-             [],
-             [],
-             nil,
-             [],
-             nil,
-             nil
-           ),
-           [],
-           (392...393),
-           (394...395)
-         ),
-         nil,
-         (390...391),
-         (396...397)
-       ),
-       0,
-       "f"
-     ),
-     CallNode(399...416)(
-       nil,
-       nil,
-       (399...400),
-       nil,
-       nil,
-       nil,
-       BlockNode(400...416)(
-         [:foo, :b],
-         BlockParametersNode(402...414)(
-           ParametersNode(403...413)(
-             [],
-             [],
-             [],
-             nil,
-             [KeywordParameterNode(403...409)(
-                (403...407),
-                IntegerNode(408...409)()
-              )],
-             nil,
-             BlockParameterNode(411...413)(:b, (412...413), (411...412))
-           ),
-           [],
-           (402...403),
-           (413...414)
-         ),
-         nil,
-         (400...401),
-         (415...416)
-       ),
-       0,
-       "f"
-     ),
-     CallNode(418...450)(
-       nil,
-       nil,
-       (418...419),
-       nil,
-       nil,
-       nil,
-       BlockNode(419...450)(
-         [:foo, :bar, :baz, :b],
-         BlockParametersNode(421...448)(
-           ParametersNode(422...447)(
-             [],
-             [],
-             [],
-             nil,
-             [KeywordParameterNode(422...428)(
-                (422...426),
-                IntegerNode(427...428)()
-              ),
-              KeywordParameterNode(430...436)(
-                (430...434),
-                IntegerNode(435...436)()
-              )],
-             KeywordRestParameterNode(438...443)((438...440), (440...443)),
-             BlockParameterNode(445...447)(:b, (446...447), (445...446))
-           ),
-           [],
-           (421...422),
-           (447...448)
-         ),
-         nil,
-         (419...420),
-         (449...450)
-       ),
-       0,
-       "f"
-     ),
-     CallNode(452...463)(
-       nil,
-       nil,
-       (452...453),
-       nil,
-       nil,
-       nil,
-       BlockNode(453...463)(
-         [:foo],
-         BlockParametersNode(455...461)(
-           ParametersNode(456...460)(
-             [],
-             [],
-             [],
-             nil,
-             [KeywordParameterNode(456...460)((456...460), nil)],
-             nil,
-             nil
-           ),
-           [],
-           (455...456),
-           (460...461)
-         ),
-         nil,
-         (453...454),
-         (462...463)
-       ),
-       0,
-       "f"
-     ),
-     CallNode(465...479)(
-       nil,
-       nil,
-       (465...466),
-       nil,
-       nil,
-       nil,
-       BlockNode(466...479)(
-         [:o, :b],
-         BlockParametersNode(468...477)(
-           ParametersNode(469...476)(
-             [],
-             [OptionalParameterNode(469...472)(
-                :o,
-                (469...470),
-                (470...471),
-                IntegerNode(471...472)()
-              )],
-             [],
-             nil,
-             [],
-             nil,
-             BlockParameterNode(474...476)(:b, (475...476), (474...475))
-           ),
-           [],
-           (468...469),
-           (476...477)
-         ),
-         nil,
-         (466...467),
-         (478...479)
-       ),
-       0,
-       "f"
-     ),
-     CallNode(481...499)(
-       nil,
-       nil,
-       (481...482),
-       nil,
-       nil,
-       nil,
-       BlockNode(482...499)(
-         [:o, :r, :b],
-         BlockParametersNode(484...497)(
-           ParametersNode(485...496)(
-             [],
-             [OptionalParameterNode(485...488)(
-                :o,
-                (485...486),
-                (486...487),
-                IntegerNode(487...488)()
-              )],
-             [],
-             RestParameterNode(490...492)((490...491), (491...492)),
-             [],
-             nil,
-             BlockParameterNode(494...496)(:b, (495...496), (494...495))
-           ),
-           [],
-           (484...485),
-           (496...497)
-         ),
-         nil,
-         (482...483),
-         (498...499)
-       ),
-       0,
-       "f"
-     ),
-     CallNode(501...522)(
-       nil,
-       nil,
-       (501...502),
-       nil,
-       nil,
-       nil,
-       BlockNode(502...522)(
-         [:o, :r, :p, :b],
-         BlockParametersNode(504...520)(
-           ParametersNode(505...519)(
-             [],
-             [OptionalParameterNode(505...508)(
-                :o,
-                (505...506),
-                (506...507),
-                IntegerNode(507...508)()
-              )],
-             [RequiredParameterNode(514...515)(:p)],
-             RestParameterNode(510...512)((510...511), (511...512)),
-             [],
-             nil,
-             BlockParameterNode(517...519)(:b, (518...519), (517...518))
-           ),
-           [],
-           (504...505),
-           (519...520)
-         ),
-         nil,
-         (502...503),
-         (521...522)
-       ),
-       0,
-       "f"
-     ),
-     CallNode(524...541)(
-       nil,
-       nil,
-       (524...525),
-       nil,
-       nil,
-       nil,
-       BlockNode(525...541)(
-         [:o, :p, :b],
-         BlockParametersNode(527...539)(
-           ParametersNode(528...538)(
-             [],
-             [OptionalParameterNode(528...531)(
-                :o,
-                (528...529),
-                (529...530),
-                IntegerNode(530...531)()
-              )],
-             [RequiredParameterNode(533...534)(:p)],
-             nil,
-             [],
-             nil,
-             BlockParameterNode(536...538)(:b, (537...538), (536...537))
-           ),
-           [],
-           (527...528),
-           (538...539)
-         ),
-         nil,
-         (525...526),
-         (540...541)
-       ),
-       0,
-       "f"
-     ),
-     CallNode(543...550)(
-       nil,
-       nil,
-       (543...544),
-       nil,
-       nil,
-       nil,
-       BlockNode(544...550)(
-         [],
-         BlockParametersNode(546...548)(nil, [], (546...547), (547...548)),
-         nil,
-         (544...545),
-         (549...550)
-       ),
-       0,
-       "f"
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/whitequark/break.txt b/test/yarp/snapshots/whitequark/break.txt
deleted file mode 100644
index 46d3b6a5703cf3..00000000000000
--- a/test/yarp/snapshots/whitequark/break.txt
+++ /dev/null
@@ -1,40 +0,0 @@
-ProgramNode(0...37)(
-  [],
-  StatementsNode(0...37)(
-    [BreakNode(0...5)(nil, (0...5)),
-     BreakNode(7...16)(
-       ArgumentsNode(13...16)(
-         [CallNode(13...16)(nil, nil, (13...16), nil, nil, nil, nil, 2, "foo")]
-       ),
-       (7...12)
-     ),
-     BreakNode(18...25)(
-       ArgumentsNode(23...25)(
-         [ParenthesesNode(23...25)(nil, (23...24), (24...25))]
-       ),
-       (18...23)
-     ),
-     BreakNode(27...37)(
-       ArgumentsNode(32...37)(
-         [ParenthesesNode(32...37)(
-            StatementsNode(33...36)(
-              [CallNode(33...36)(
-                 nil,
-                 nil,
-                 (33...36),
-                 nil,
-                 nil,
-                 nil,
-                 nil,
-                 2,
-                 "foo"
-               )]
-            ),
-            (32...33),
-            (36...37)
-          )]
-       ),
-       (27...32)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/whitequark/break_block.txt b/test/yarp/snapshots/whitequark/break_block.txt
deleted file mode 100644
index ad81bcf1637c9e..00000000000000
--- a/test/yarp/snapshots/whitequark/break_block.txt
+++ /dev/null
@@ -1,33 +0,0 @@
-ProgramNode(0...20)(
-  [],
-  StatementsNode(0...20)(
-    [BreakNode(0...20)(
-       ArgumentsNode(6...20)(
-         [CallNode(6...20)(
-            nil,
-            nil,
-            (6...9),
-            nil,
-            ArgumentsNode(10...13)(
-              [CallNode(10...13)(
-                 nil,
-                 nil,
-                 (10...13),
-                 nil,
-                 nil,
-                 nil,
-                 nil,
-                 2,
-                 "foo"
-               )]
-            ),
-            nil,
-            BlockNode(14...20)([], nil, nil, (14...16), (17...20)),
-            0,
-            "fun"
-          )]
-       ),
-       (0...5)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/whitequark/bug_435.txt b/test/yarp/snapshots/whitequark/bug_435.txt
deleted file mode 100644
index 7d74c8c8a2af64..00000000000000
--- a/test/yarp/snapshots/whitequark/bug_435.txt
+++ /dev/null
@@ -1,36 +0,0 @@
-ProgramNode(0...14)(
-  [],
-  StatementsNode(0...14)(
-    [InterpolatedStringNode(0...14)(
-       (0...1),
-       [EmbeddedStatementsNode(1...13)(
-          (1...3),
-          StatementsNode(3...12)(
-            [LambdaNode(3...12)(
-               [:foo],
-               (3...5),
-               (10...11),
-               (11...12),
-               BlockParametersNode(6...9)(
-                 ParametersNode(6...9)(
-                   [RequiredParameterNode(6...9)(:foo)],
-                   [],
-                   [],
-                   nil,
-                   [],
-                   nil,
-                   nil
-                 ),
-                 [],
-                 nil,
-                 nil
-               ),
-               nil
-             )]
-          ),
-          (12...13)
-        )],
-       (13...14)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/whitequark/bug_447.txt b/test/yarp/snapshots/whitequark/bug_447.txt
deleted file mode 100644
index 3903748ceccfe2..00000000000000
--- a/test/yarp/snapshots/whitequark/bug_447.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-ProgramNode(0...27)(
-  [],
-  StatementsNode(0...27)(
-    [CallNode(0...11)(
-       nil,
-       nil,
-       (0...1),
-       nil,
-       ArgumentsNode(2...4)([ArrayNode(2...4)([], (2...3), (3...4))]),
-       nil,
-       BlockNode(5...11)([], nil, nil, (5...7), (8...11)),
-       0,
-       "m"
-     ),
-     CallNode(13...27)(
-       nil,
-       nil,
-       (13...14),
-       nil,
-       ArgumentsNode(15...20)(
-         [ArrayNode(15...17)([], (15...16), (16...17)), IntegerNode(19...20)()]
-       ),
-       nil,
-       BlockNode(21...27)([], nil, nil, (21...23), (24...27)),
-       0,
-       "m"
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/whitequark/bug_452.txt b/test/yarp/snapshots/whitequark/bug_452.txt
deleted file mode 100644
index 31cf38cfc2e774..00000000000000
--- a/test/yarp/snapshots/whitequark/bug_452.txt
+++ /dev/null
@@ -1,43 +0,0 @@
-ProgramNode(0...37)(
-  [],
-  StatementsNode(0...37)(
-    [CallNode(0...21)(
-       nil,
-       nil,
-       (0...2),
-       nil,
-       ArgumentsNode(3...21)(
-         [CallNode(3...21)(
-            ParenthesesNode(3...10)(
-              StatementsNode(4...9)([IntegerNode(4...9)()]),
-              (3...4),
-              (9...10)
-            ),
-            (10...11),
-            (11...19),
-            (19...20),
-            nil,
-            (20...21),
-            nil,
-            0,
-            "toString"
-          )]
-       ),
-       nil,
-       nil,
-       0,
-       "td"
-     ),
-     CallNode(23...37)(
-       CallNode(23...25)(nil, nil, (23...25), nil, nil, nil, nil, 2, "td"),
-       (25...26),
-       (26...29),
-       nil,
-       nil,
-       nil,
-       BlockNode(30...37)([], nil, nil, (30...32), (34...37)),
-       0,
-       "num"
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/whitequark/bug_466.txt b/test/yarp/snapshots/whitequark/bug_466.txt
deleted file mode 100644
index 3b153e4995312a..00000000000000
--- a/test/yarp/snapshots/whitequark/bug_466.txt
+++ /dev/null
@@ -1,54 +0,0 @@
-ProgramNode(0...27)(
-  [],
-  StatementsNode(0...27)(
-    [CallNode(0...27)(
-       nil,
-       nil,
-       (0...3),
-       nil,
-       ArgumentsNode(4...19)(
-         [InterpolatedStringNode(4...19)(
-            (4...5),
-            [EmbeddedStatementsNode(5...18)(
-               (5...7),
-               StatementsNode(7...17)(
-                 [CallNode(7...17)(
-                    ParenthesesNode(7...12)(
-                      StatementsNode(8...11)(
-                        [CallNode(8...11)(
-                           IntegerNode(8...9)(),
-                           nil,
-                           (9...10),
-                           nil,
-                           ArgumentsNode(10...11)([IntegerNode(10...11)()]),
-                           nil,
-                           nil,
-                           0,
-                           "+"
-                         )]
-                      ),
-                      (7...8),
-                      (11...12)
-                    ),
-                    (12...13),
-                    (13...17),
-                    nil,
-                    nil,
-                    nil,
-                    nil,
-                    0,
-                    "to_i"
-                  )]
-               ),
-               (17...18)
-             )],
-            (18...19)
-          )]
-       ),
-       nil,
-       BlockNode(20...27)([], nil, nil, (20...22), (24...27)),
-       0,
-       "foo"
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/whitequark/bug_473.txt b/test/yarp/snapshots/whitequark/bug_473.txt
deleted file mode 100644
index a9978db50d24bf..00000000000000
--- a/test/yarp/snapshots/whitequark/bug_473.txt
+++ /dev/null
@@ -1,26 +0,0 @@
-ProgramNode(0...9)(
-  [],
-  StatementsNode(0...9)(
-    [CallNode(0...9)(
-       nil,
-       nil,
-       (0...1),
-       nil,
-       ArgumentsNode(2...9)(
-         [InterpolatedStringNode(2...9)(
-            (2...3),
-            [EmbeddedStatementsNode(3...8)(
-               (3...5),
-               StatementsNode(5...7)([ArrayNode(5...7)([], (5...6), (6...7))]),
-               (7...8)
-             )],
-            (8...9)
-          )]
-       ),
-       nil,
-       nil,
-       0,
-       "m"
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/whitequark/bug_480.txt b/test/yarp/snapshots/whitequark/bug_480.txt
deleted file mode 100644
index 8457cefa86f9b3..00000000000000
--- a/test/yarp/snapshots/whitequark/bug_480.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-ProgramNode(0...12)(
-  [],
-  StatementsNode(0...12)(
-    [CallNode(0...12)(
-       nil,
-       nil,
-       (0...1),
-       nil,
-       ArgumentsNode(2...12)(
-         [InterpolatedStringNode(2...12)(
-            (2...3),
-            [EmbeddedStatementsNode(3...6)((3...5), nil, (5...6)),
-             EmbeddedStatementsNode(6...11)(
-               (6...8),
-               StatementsNode(8...10)(
-                 [ParenthesesNode(8...10)(nil, (8...9), (9...10))]
-               ),
-               (10...11)
-             )],
-            (11...12)
-          )]
-       ),
-       nil,
-       nil,
-       0,
-       "m"
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/whitequark/bug_481.txt b/test/yarp/snapshots/whitequark/bug_481.txt
deleted file mode 100644
index 1bd74e12353bfe..00000000000000
--- a/test/yarp/snapshots/whitequark/bug_481.txt
+++ /dev/null
@@ -1,41 +0,0 @@
-ProgramNode(0...28)(
-  [],
-  StatementsNode(0...28)(
-    [CallNode(0...14)(
-       nil,
-       nil,
-       (0...1),
-       nil,
-       ArgumentsNode(2...14)(
-         [DefNode(2...14)(
-            (6...7),
-            nil,
-            nil,
-            nil,
-            [],
-            (2...5),
-            nil,
-            (7...8),
-            (8...9),
-            nil,
-            (11...14)
-          )]
-       ),
-       nil,
-       nil,
-       0,
-       "m"
-     ),
-     CallNode(16...28)(
-       IntegerNode(16...17)(),
-       (17...18),
-       (18...21),
-       nil,
-       nil,
-       nil,
-       BlockNode(22...28)([], nil, nil, (22...24), (25...28)),
-       0,
-       "tap"
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/whitequark/bug_ascii_8bit_in_literal.txt b/test/yarp/snapshots/whitequark/bug_ascii_8bit_in_literal.txt
deleted file mode 100644
index 40251879fc8492..00000000000000
--- a/test/yarp/snapshots/whitequark/bug_ascii_8bit_in_literal.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-ProgramNode(24...90)(
-  [],
-  StatementsNode(24...90)(
-    [StringNode(24...90)((24...25), (25...89), (89...90), "проверка")]
-  )
-)
diff --git a/test/yarp/snapshots/whitequark/bug_cmd_string_lookahead.txt b/test/yarp/snapshots/whitequark/bug_cmd_string_lookahead.txt
deleted file mode 100644
index 0004e1a758bb09..00000000000000
--- a/test/yarp/snapshots/whitequark/bug_cmd_string_lookahead.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-ProgramNode(0...17)(
-  [],
-  StatementsNode(0...17)(
-    [CallNode(0...17)(
-       nil,
-       nil,
-       (0...4),
-       nil,
-       ArgumentsNode(5...10)(
-         [StringNode(5...10)((5...6), (6...9), (9...10), "foo")]
-       ),
-       nil,
-       BlockNode(11...17)([], nil, nil, (11...13), (14...17)),
-       0,
-       "desc"
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/whitequark/bug_cmdarg.txt b/test/yarp/snapshots/whitequark/bug_cmdarg.txt
deleted file mode 100644
index b3f79aafd460fc..00000000000000
--- a/test/yarp/snapshots/whitequark/bug_cmdarg.txt
+++ /dev/null
@@ -1,85 +0,0 @@
-ProgramNode(0...56)(
-  [],
-  StatementsNode(0...56)(
-    [CallNode(0...15)(
-       nil,
-       nil,
-       (0...6),
-       nil,
-       ArgumentsNode(7...15)(
-         [KeywordHashNode(7...15)(
-            [AssocNode(7...15)(
-               SymbolNode(7...10)(nil, (7...9), (9...10), "do"),
-               TrueNode(11...15)(),
-               nil
-             )]
-          )]
-       ),
-       nil,
-       nil,
-       0,
-       "assert"
-     ),
-     CallNode(17...28)(
-       nil,
-       nil,
-       (17...23),
-       nil,
-       ArgumentsNode(24...28)(
-         [CallNode(24...28)(
-            nil,
-            nil,
-            (24...28),
-            nil,
-            nil,
-            nil,
-            nil,
-            2,
-            "dogs"
-          )]
-       ),
-       nil,
-       nil,
-       0,
-       "assert"
-     ),
-     CallNode(30...56)(
-       nil,
-       nil,
-       (30...31),
-       nil,
-       ArgumentsNode(32...56)(
-         [KeywordHashNode(32...56)(
-            [AssocNode(32...56)(
-               SymbolNode(32...34)(nil, (32...33), (33...34), "x"),
-               LambdaNode(35...56)(
-                 [],
-                 (35...37),
-                 (38...40),
-                 (53...56),
-                 nil,
-                 StatementsNode(41...52)(
-                   [CallNode(41...52)(
-                      nil,
-                      nil,
-                      (41...45),
-                      nil,
-                      nil,
-                      nil,
-                      BlockNode(46...52)([], nil, nil, (46...48), (49...52)),
-                      0,
-                      "meth"
-                    )]
-                 )
-               ),
-               nil
-             )]
-          )]
-       ),
-       nil,
-       nil,
-       0,
-       "f"
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/whitequark/bug_def_no_paren_eql_begin.txt b/test/yarp/snapshots/whitequark/bug_def_no_paren_eql_begin.txt
deleted file mode 100644
index 12efa14109cf3b..00000000000000
--- a/test/yarp/snapshots/whitequark/bug_def_no_paren_eql_begin.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-ProgramNode(0...23)(
-  [],
-  StatementsNode(0...23)(
-    [DefNode(0...23)(
-       (4...7),
-       nil,
-       nil,
-       nil,
-       [],
-       (0...3),
-       nil,
-       nil,
-       nil,
-       nil,
-       (20...23)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/whitequark/bug_do_block_in_call_args.txt b/test/yarp/snapshots/whitequark/bug_do_block_in_call_args.txt
deleted file mode 100644
index 555819dfbd0584..00000000000000
--- a/test/yarp/snapshots/whitequark/bug_do_block_in_call_args.txt
+++ /dev/null
@@ -1,42 +0,0 @@
-ProgramNode(0...33)(
-  [],
-  StatementsNode(0...33)(
-    [CallNode(0...33)(
-       nil,
-       nil,
-       (0...3),
-       nil,
-       ArgumentsNode(4...33)(
-         [DefNode(4...33)(
-            (8...11),
-            nil,
-            nil,
-            StatementsNode(13...29)(
-              [CallNode(13...29)(
-                 SelfNode(13...17)(),
-                 (17...18),
-                 (18...22),
-                 nil,
-                 nil,
-                 nil,
-                 BlockNode(23...29)([], nil, nil, (23...25), (26...29)),
-                 0,
-                 "each"
-               )]
-            ),
-            [],
-            (4...7),
-            nil,
-            nil,
-            nil,
-            nil,
-            (30...33)
-          )]
-       ),
-       nil,
-       nil,
-       0,
-       "bar"
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/whitequark/bug_do_block_in_cmdarg.txt b/test/yarp/snapshots/whitequark/bug_do_block_in_cmdarg.txt
deleted file mode 100644
index 81fa1d3609c415..00000000000000
--- a/test/yarp/snapshots/whitequark/bug_do_block_in_cmdarg.txt
+++ /dev/null
@@ -1,34 +0,0 @@
-ProgramNode(0...17)(
-  [],
-  StatementsNode(0...17)(
-    [CallNode(0...17)(
-       nil,
-       nil,
-       (0...3),
-       nil,
-       ArgumentsNode(4...17)(
-         [ParenthesesNode(4...17)(
-            StatementsNode(5...16)(
-              [CallNode(5...16)(
-                 nil,
-                 nil,
-                 (5...9),
-                 nil,
-                 nil,
-                 nil,
-                 BlockNode(10...16)([], nil, nil, (10...12), (13...16)),
-                 0,
-                 "proc"
-               )]
-            ),
-            (4...5),
-            (16...17)
-          )]
-       ),
-       nil,
-       nil,
-       0,
-       "tap"
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/whitequark/bug_do_block_in_hash_brace.txt b/test/yarp/snapshots/whitequark/bug_do_block_in_hash_brace.txt
deleted file mode 100644
index bce92ea25b7d61..00000000000000
--- a/test/yarp/snapshots/whitequark/bug_do_block_in_hash_brace.txt
+++ /dev/null
@@ -1,249 +0,0 @@
-ProgramNode(0...225)(
-  [],
-  StatementsNode(0...225)(
-    [CallNode(0...42)(
-       nil,
-       nil,
-       (0...1),
-       nil,
-       ArgumentsNode(2...42)(
-         [SymbolNode(2...6)((2...3), (3...6), nil, "foo"),
-          HashNode(8...42)(
-            (8...9),
-            [AssocNode(9...25)(
-               SymbolNode(9...13)((9...10), (10...11), (11...13), "a"),
-               CallNode(14...25)(
-                 nil,
-                 nil,
-                 (14...18),
-                 nil,
-                 nil,
-                 nil,
-                 BlockNode(19...25)([], nil, nil, (19...21), (22...25)),
-                 0,
-                 "proc"
-               ),
-               nil
-             ),
-             AssocNode(27...41)(
-               SymbolNode(27...29)(nil, (27...28), (28...29), "b"),
-               CallNode(30...41)(
-                 nil,
-                 nil,
-                 (30...34),
-                 nil,
-                 nil,
-                 nil,
-                 BlockNode(35...41)([], nil, nil, (35...37), (38...41)),
-                 0,
-                 "proc"
-               ),
-               nil
-             )],
-            (41...42)
-          )]
-       ),
-       nil,
-       nil,
-       0,
-       "p"
-     ),
-     CallNode(44...84)(
-       nil,
-       nil,
-       (44...45),
-       nil,
-       ArgumentsNode(46...84)(
-         [SymbolNode(46...50)((46...47), (47...50), nil, "foo"),
-          HashNode(52...84)(
-            (52...53),
-            [AssocSplatNode(53...67)(
-               CallNode(56...67)(
-                 nil,
-                 nil,
-                 (56...60),
-                 nil,
-                 nil,
-                 nil,
-                 BlockNode(61...67)([], nil, nil, (61...63), (64...67)),
-                 0,
-                 "proc"
-               ),
-               (53...55)
-             ),
-             AssocNode(69...83)(
-               SymbolNode(69...71)(nil, (69...70), (70...71), "b"),
-               CallNode(72...83)(
-                 nil,
-                 nil,
-                 (72...76),
-                 nil,
-                 nil,
-                 nil,
-                 BlockNode(77...83)([], nil, nil, (77...79), (80...83)),
-                 0,
-                 "proc"
-               ),
-               nil
-             )],
-            (83...84)
-          )]
-       ),
-       nil,
-       nil,
-       0,
-       "p"
-     ),
-     CallNode(86...129)(
-       nil,
-       nil,
-       (86...87),
-       nil,
-       ArgumentsNode(88...129)(
-         [SymbolNode(88...92)((88...89), (89...92), nil, "foo"),
-          HashNode(94...129)(
-            (94...95),
-            [AssocNode(95...112)(
-               SymbolNode(95...97)((95...96), (96...97), nil, "a"),
-               CallNode(101...112)(
-                 nil,
-                 nil,
-                 (101...105),
-                 nil,
-                 nil,
-                 nil,
-                 BlockNode(106...112)([], nil, nil, (106...108), (109...112)),
-                 0,
-                 "proc"
-               ),
-               (98...100)
-             ),
-             AssocNode(114...128)(
-               SymbolNode(114...116)(nil, (114...115), (115...116), "b"),
-               CallNode(117...128)(
-                 nil,
-                 nil,
-                 (117...121),
-                 nil,
-                 nil,
-                 nil,
-                 BlockNode(122...128)([], nil, nil, (122...124), (125...128)),
-                 0,
-                 "proc"
-               ),
-               nil
-             )],
-            (128...129)
-          )]
-       ),
-       nil,
-       nil,
-       0,
-       "p"
-     ),
-     CallNode(131...171)(
-       nil,
-       nil,
-       (131...132),
-       nil,
-       ArgumentsNode(133...171)(
-         [SymbolNode(133...137)((133...134), (134...137), nil, "foo"),
-          HashNode(139...171)(
-            (139...140),
-            [AssocNode(140...154)(
-               SymbolNode(140...142)(nil, (140...141), (141...142), "a"),
-               CallNode(143...154)(
-                 nil,
-                 nil,
-                 (143...147),
-                 nil,
-                 nil,
-                 nil,
-                 BlockNode(148...154)([], nil, nil, (148...150), (151...154)),
-                 0,
-                 "proc"
-               ),
-               nil
-             ),
-             AssocNode(156...170)(
-               SymbolNode(156...158)(nil, (156...157), (157...158), "b"),
-               CallNode(159...170)(
-                 nil,
-                 nil,
-                 (159...163),
-                 nil,
-                 nil,
-                 nil,
-                 BlockNode(164...170)([], nil, nil, (164...166), (167...170)),
-                 0,
-                 "proc"
-               ),
-               nil
-             )],
-            (170...171)
-          )]
-       ),
-       nil,
-       nil,
-       0,
-       "p"
-     ),
-     CallNode(173...225)(
-       nil,
-       nil,
-       (173...174),
-       nil,
-       ArgumentsNode(175...225)(
-         [SymbolNode(175...179)((175...176), (176...179), nil, "foo"),
-          HashNode(181...225)(
-            (181...182),
-            [AssocNode(182...208)(
-               CallNode(182...193)(
-                 nil,
-                 nil,
-                 (182...186),
-                 nil,
-                 nil,
-                 nil,
-                 BlockNode(187...193)([], nil, nil, (187...189), (190...193)),
-                 0,
-                 "proc"
-               ),
-               CallNode(197...208)(
-                 nil,
-                 nil,
-                 (197...201),
-                 nil,
-                 nil,
-                 nil,
-                 BlockNode(202...208)([], nil, nil, (202...204), (205...208)),
-                 0,
-                 "proc"
-               ),
-               (194...196)
-             ),
-             AssocNode(210...224)(
-               SymbolNode(210...212)(nil, (210...211), (211...212), "b"),
-               CallNode(213...224)(
-                 nil,
-                 nil,
-                 (213...217),
-                 nil,
-                 nil,
-                 nil,
-                 BlockNode(218...224)([], nil, nil, (218...220), (221...224)),
-                 0,
-                 "proc"
-               ),
-               nil
-             )],
-            (224...225)
-          )]
-       ),
-       nil,
-       nil,
-       0,
-       "p"
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/whitequark/bug_heredoc_do.txt b/test/yarp/snapshots/whitequark/bug_heredoc_do.txt
deleted file mode 100644
index 947af0ece7d74c..00000000000000
--- a/test/yarp/snapshots/whitequark/bug_heredoc_do.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-ProgramNode(0...23)(
-  [],
-  StatementsNode(0...23)(
-    [CallNode(0...23)(
-       nil,
-       nil,
-       (0...1),
-       nil,
-       ArgumentsNode(2...10)(
-         [InterpolatedStringNode(2...10)((2...10), [], (14...20))]
-       ),
-       nil,
-       BlockNode(11...23)([], nil, nil, (11...13), (20...23)),
-       0,
-       "f"
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/whitequark/bug_interp_single.txt b/test/yarp/snapshots/whitequark/bug_interp_single.txt
deleted file mode 100644
index bd56c9998ae95e..00000000000000
--- a/test/yarp/snapshots/whitequark/bug_interp_single.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-ProgramNode(0...16)(
-  [],
-  StatementsNode(0...16)(
-    [InterpolatedStringNode(0...6)(
-       (0...1),
-       [EmbeddedStatementsNode(1...5)(
-          (1...3),
-          StatementsNode(3...4)([IntegerNode(3...4)()]),
-          (4...5)
-        )],
-       (5...6)
-     ),
-     ArrayNode(8...16)(
-       [InterpolatedStringNode(11...15)(
-          nil,
-          [EmbeddedStatementsNode(11...15)(
-             (11...13),
-             StatementsNode(13...14)([IntegerNode(13...14)()]),
-             (14...15)
-           )],
-          nil
-        )],
-       (8...11),
-       (15...16)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/whitequark/bug_lambda_leakage.txt b/test/yarp/snapshots/whitequark/bug_lambda_leakage.txt
deleted file mode 100644
index 7792fa495af6ce..00000000000000
--- a/test/yarp/snapshots/whitequark/bug_lambda_leakage.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-ProgramNode(0...19)(
-  [],
-  StatementsNode(0...19)(
-    [LambdaNode(0...12)(
-       [:scope],
-       (0...2),
-       (10...11),
-       (11...12),
-       BlockParametersNode(2...9)(
-         ParametersNode(3...8)(
-           [RequiredParameterNode(3...8)(:scope)],
-           [],
-           [],
-           nil,
-           [],
-           nil,
-           nil
-         ),
-         [],
-         (2...3),
-         (8...9)
-       ),
-       nil
-     ),
-     CallNode(14...19)(nil, nil, (14...19), nil, nil, nil, nil, 2, "scope")]
-  )
-)
diff --git a/test/yarp/snapshots/whitequark/bug_regex_verification.txt b/test/yarp/snapshots/whitequark/bug_regex_verification.txt
deleted file mode 100644
index e1fc0ec0e69e0d..00000000000000
--- a/test/yarp/snapshots/whitequark/bug_regex_verification.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-ProgramNode(0...5)(
-  [],
-  StatementsNode(0...5)(
-    [RegularExpressionNode(0...5)((0...1), (1...3), (3...5), "#)", 4)]
-  )
-)
diff --git a/test/yarp/snapshots/whitequark/bug_rescue_empty_else.txt b/test/yarp/snapshots/whitequark/bug_rescue_empty_else.txt
deleted file mode 100644
index 02c4736f8c6814..00000000000000
--- a/test/yarp/snapshots/whitequark/bug_rescue_empty_else.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-ProgramNode(0...34)(
-  [],
-  StatementsNode(0...34)(
-    [BeginNode(0...34)(
-       (0...5),
-       nil,
-       RescueNode(7...23)(
-         (7...13),
-         [ConstantReadNode(14...23)(:LoadError)],
-         nil,
-         nil,
-         nil,
-         nil
-       ),
-       ElseNode(25...34)((25...29), nil, (31...34)),
-       nil,
-       (31...34)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/whitequark/bug_while_not_parens_do.txt b/test/yarp/snapshots/whitequark/bug_while_not_parens_do.txt
deleted file mode 100644
index f5e086059a86c3..00000000000000
--- a/test/yarp/snapshots/whitequark/bug_while_not_parens_do.txt
+++ /dev/null
@@ -1,26 +0,0 @@
-ProgramNode(0...23)(
-  [],
-  StatementsNode(0...23)(
-    [WhileNode(0...23)(
-       (0...5),
-       (20...23),
-       CallNode(6...16)(
-         ParenthesesNode(10...16)(
-           StatementsNode(11...15)([TrueNode(11...15)()]),
-           (10...11),
-           (15...16)
-         ),
-         nil,
-         (6...9),
-         nil,
-         nil,
-         nil,
-         nil,
-         0,
-         "!"
-       ),
-       nil,
-       0
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/whitequark/case_cond.txt b/test/yarp/snapshots/whitequark/case_cond.txt
deleted file mode 100644
index 207fbe9a48596f..00000000000000
--- a/test/yarp/snapshots/whitequark/case_cond.txt
+++ /dev/null
@@ -1,28 +0,0 @@
-ProgramNode(0...26)(
-  [],
-  StatementsNode(0...26)(
-    [CaseNode(0...26)(
-       nil,
-       [WhenNode(6...21)(
-          (6...10),
-          [CallNode(11...14)(
-             nil,
-             nil,
-             (11...14),
-             nil,
-             nil,
-             nil,
-             nil,
-             2,
-             "foo"
-           )],
-          StatementsNode(16...21)(
-            [StringNode(16...21)((16...17), (17...20), (20...21), "foo")]
-          )
-        )],
-       nil,
-       (0...4),
-       (23...26)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/whitequark/case_cond_else.txt b/test/yarp/snapshots/whitequark/case_cond_else.txt
deleted file mode 100644
index 263c4d3a0812d3..00000000000000
--- a/test/yarp/snapshots/whitequark/case_cond_else.txt
+++ /dev/null
@@ -1,34 +0,0 @@
-ProgramNode(0...38)(
-  [],
-  StatementsNode(0...38)(
-    [CaseNode(0...38)(
-       nil,
-       [WhenNode(6...21)(
-          (6...10),
-          [CallNode(11...14)(
-             nil,
-             nil,
-             (11...14),
-             nil,
-             nil,
-             nil,
-             nil,
-             2,
-             "foo"
-           )],
-          StatementsNode(16...21)(
-            [StringNode(16...21)((16...17), (17...20), (20...21), "foo")]
-          )
-        )],
-       ElseNode(23...38)(
-         (23...27),
-         StatementsNode(28...33)(
-           [StringNode(28...33)((28...29), (29...32), (32...33), "bar")]
-         ),
-         (35...38)
-       ),
-       (0...4),
-       (35...38)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/whitequark/case_expr.txt b/test/yarp/snapshots/whitequark/case_expr.txt
deleted file mode 100644
index 8b01d8f81a5e22..00000000000000
--- a/test/yarp/snapshots/whitequark/case_expr.txt
+++ /dev/null
@@ -1,28 +0,0 @@
-ProgramNode(0...30)(
-  [],
-  StatementsNode(0...30)(
-    [CaseNode(0...30)(
-       CallNode(5...8)(nil, nil, (5...8), nil, nil, nil, nil, 2, "foo"),
-       [WhenNode(10...25)(
-          (10...14),
-          [StringNode(15...20)((15...16), (16...19), (19...20), "bar")],
-          StatementsNode(22...25)(
-            [CallNode(22...25)(
-               nil,
-               nil,
-               (22...25),
-               nil,
-               nil,
-               nil,
-               nil,
-               2,
-               "bar"
-             )]
-          )
-        )],
-       nil,
-       (0...4),
-       (27...30)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/whitequark/case_expr_else.txt b/test/yarp/snapshots/whitequark/case_expr_else.txt
deleted file mode 100644
index 79356e6cf3990b..00000000000000
--- a/test/yarp/snapshots/whitequark/case_expr_else.txt
+++ /dev/null
@@ -1,44 +0,0 @@
-ProgramNode(0...40)(
-  [],
-  StatementsNode(0...40)(
-    [CaseNode(0...40)(
-       CallNode(5...8)(nil, nil, (5...8), nil, nil, nil, nil, 2, "foo"),
-       [WhenNode(10...25)(
-          (10...14),
-          [StringNode(15...20)((15...16), (16...19), (19...20), "bar")],
-          StatementsNode(22...25)(
-            [CallNode(22...25)(
-               nil,
-               nil,
-               (22...25),
-               nil,
-               nil,
-               nil,
-               nil,
-               2,
-               "bar"
-             )]
-          )
-        )],
-       ElseNode(27...40)(
-         (27...31),
-         StatementsNode(32...35)(
-           [CallNode(32...35)(
-              nil,
-              nil,
-              (32...35),
-              nil,
-              nil,
-              nil,
-              nil,
-              2,
-              "baz"
-            )]
-         ),
-         (37...40)
-       ),
-       (0...4),
-       (37...40)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/whitequark/casgn_scoped.txt b/test/yarp/snapshots/whitequark/casgn_scoped.txt
deleted file mode 100644
index b5e719abfc667c..00000000000000
--- a/test/yarp/snapshots/whitequark/casgn_scoped.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-ProgramNode(0...13)(
-  [],
-  StatementsNode(0...13)(
-    [ConstantPathWriteNode(0...13)(
-       ConstantPathNode(0...8)(
-         ConstantReadNode(0...3)(:Bar),
-         ConstantReadNode(5...8)(:Foo),
-         (3...5)
-       ),
-       (9...10),
-       IntegerNode(11...13)()
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/whitequark/casgn_toplevel.txt b/test/yarp/snapshots/whitequark/casgn_toplevel.txt
deleted file mode 100644
index 7fff870f8a2bd5..00000000000000
--- a/test/yarp/snapshots/whitequark/casgn_toplevel.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-ProgramNode(0...10)(
-  [],
-  StatementsNode(0...10)(
-    [ConstantPathWriteNode(0...10)(
-       ConstantPathNode(0...5)(nil, ConstantReadNode(2...5)(:Foo), (0...2)),
-       (6...7),
-       IntegerNode(8...10)()
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/whitequark/casgn_unscoped.txt b/test/yarp/snapshots/whitequark/casgn_unscoped.txt
deleted file mode 100644
index 7e778015b15334..00000000000000
--- a/test/yarp/snapshots/whitequark/casgn_unscoped.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-ProgramNode(0...8)(
-  [],
-  StatementsNode(0...8)(
-    [ConstantWriteNode(0...8)(:Foo, (0...3), IntegerNode(6...8)(), (4...5))]
-  )
-)
diff --git a/test/yarp/snapshots/whitequark/character.txt b/test/yarp/snapshots/whitequark/character.txt
deleted file mode 100644
index 7865df42fab3c4..00000000000000
--- a/test/yarp/snapshots/whitequark/character.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-ProgramNode(0...2)(
-  [],
-  StatementsNode(0...2)([StringNode(0...2)((0...1), (1...2), nil, "a")])
-)
diff --git a/test/yarp/snapshots/whitequark/class.txt b/test/yarp/snapshots/whitequark/class.txt
deleted file mode 100644
index 84ab3a72ef0ace..00000000000000
--- a/test/yarp/snapshots/whitequark/class.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-ProgramNode(0...29)(
-  [],
-  StatementsNode(0...29)(
-    [ClassNode(0...13)(
-       [],
-       (0...5),
-       ConstantReadNode(6...9)(:Foo),
-       nil,
-       nil,
-       nil,
-       (10...13),
-       :Foo,
-       :Foo
-     ),
-     ClassNode(15...29)(
-       [],
-       (15...20),
-       ConstantReadNode(21...24)(:Foo),
-       nil,
-       nil,
-       nil,
-       (26...29),
-       :Foo,
-       :Foo
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/whitequark/class_definition_in_while_cond.txt b/test/yarp/snapshots/whitequark/class_definition_in_while_cond.txt
deleted file mode 100644
index cec17515f12d46..00000000000000
--- a/test/yarp/snapshots/whitequark/class_definition_in_while_cond.txt
+++ /dev/null
@@ -1,127 +0,0 @@
-ProgramNode(0...197)(
-  [],
-  StatementsNode(0...197)(
-    [WhileNode(0...52)(
-       (0...5),
-       (49...52),
-       SingletonClassNode(6...40)(
-         [:a],
-         (6...11),
-         (12...14),
-         SelfNode(15...19)(),
-         StatementsNode(21...35)(
-           [LocalVariableWriteNode(21...35)(
-              :a,
-              0,
-              (21...22),
-              CallNode(25...35)(
-                nil,
-                nil,
-                (25...28),
-                nil,
-                nil,
-                nil,
-                BlockNode(29...35)([], nil, nil, (29...31), (32...35)),
-                0,
-                "tap"
-              ),
-              (23...24)
-            )]
-         ),
-         (37...40)
-       ),
-       StatementsNode(42...47)([BreakNode(42...47)(nil, (42...47))]),
-       0
-     ),
-     WhileNode(54...102)(
-       (54...59),
-       (99...102),
-       SingletonClassNode(60...90)(
-         [],
-         (60...65),
-         (66...68),
-         SelfNode(69...73)(),
-         StatementsNode(75...85)(
-           [CallNode(75...85)(
-              nil,
-              nil,
-              (75...78),
-              nil,
-              nil,
-              nil,
-              BlockNode(79...85)([], nil, nil, (79...81), (82...85)),
-              0,
-              "tap"
-            )]
-         ),
-         (87...90)
-       ),
-       StatementsNode(92...97)([BreakNode(92...97)(nil, (92...97))]),
-       0
-     ),
-     WhileNode(104...151)(
-       (104...109),
-       (148...151),
-       ClassNode(110...139)(
-         [:a],
-         (110...115),
-         ConstantReadNode(116...119)(:Foo),
-         nil,
-         nil,
-         StatementsNode(120...134)(
-           [LocalVariableWriteNode(120...134)(
-              :a,
-              0,
-              (120...121),
-              CallNode(124...134)(
-                nil,
-                nil,
-                (124...127),
-                nil,
-                nil,
-                nil,
-                BlockNode(128...134)([], nil, nil, (128...130), (131...134)),
-                0,
-                "tap"
-              ),
-              (122...123)
-            )]
-         ),
-         (136...139),
-         :Foo,
-         :Foo
-       ),
-       StatementsNode(141...146)([BreakNode(141...146)(nil, (141...146))]),
-       0
-     ),
-     WhileNode(153...197)(
-       (153...158),
-       (194...197),
-       ClassNode(159...185)(
-         [],
-         (159...164),
-         ConstantReadNode(165...168)(:Foo),
-         nil,
-         nil,
-         StatementsNode(170...180)(
-           [CallNode(170...180)(
-              nil,
-              nil,
-              (170...173),
-              nil,
-              nil,
-              nil,
-              BlockNode(174...180)([], nil, nil, (174...176), (177...180)),
-              0,
-              "tap"
-            )]
-         ),
-         (182...185),
-         :Foo,
-         :Foo
-       ),
-       StatementsNode(187...192)([BreakNode(187...192)(nil, (187...192))]),
-       0
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/whitequark/class_super.txt b/test/yarp/snapshots/whitequark/class_super.txt
deleted file mode 100644
index ec400beb09de74..00000000000000
--- a/test/yarp/snapshots/whitequark/class_super.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-ProgramNode(0...20)(
-  [],
-  StatementsNode(0...20)(
-    [ClassNode(0...20)(
-       [],
-       (0...5),
-       ConstantReadNode(6...9)(:Foo),
-       (10...11),
-       ConstantReadNode(12...15)(:Bar),
-       nil,
-       (17...20),
-       :Foo,
-       :Foo
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/whitequark/class_super_label.txt b/test/yarp/snapshots/whitequark/class_super_label.txt
deleted file mode 100644
index 8ebba419a27333..00000000000000
--- a/test/yarp/snapshots/whitequark/class_super_label.txt
+++ /dev/null
@@ -1,28 +0,0 @@
-ProgramNode(0...20)(
-  [],
-  StatementsNode(0...20)(
-    [ClassNode(0...20)(
-       [],
-       (0...5),
-       ConstantReadNode(6...9)(:Foo),
-       (10...11),
-       CallNode(12...15)(
-         nil,
-         nil,
-         (12...13),
-         nil,
-         ArgumentsNode(13...15)(
-           [SymbolNode(13...15)((13...14), (14...15), nil, "b")]
-         ),
-         nil,
-         nil,
-         0,
-         "a"
-       ),
-       nil,
-       (17...20),
-       :Foo,
-       :Foo
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/whitequark/comments_before_leading_dot__27.txt b/test/yarp/snapshots/whitequark/comments_before_leading_dot__27.txt
deleted file mode 100644
index b01a481eca0a5d..00000000000000
--- a/test/yarp/snapshots/whitequark/comments_before_leading_dot__27.txt
+++ /dev/null
@@ -1,49 +0,0 @@
-ProgramNode(0...55)(
-  [],
-  StatementsNode(0...55)(
-    [CallNode(0...13)(
-       CallNode(0...1)(nil, nil, (0...1), nil, nil, nil, nil, 2, "a"),
-       (8...10),
-       (10...13),
-       nil,
-       nil,
-       nil,
-       nil,
-       1,
-       "foo"
-     ),
-     CallNode(16...28)(
-       CallNode(16...17)(nil, nil, (16...17), nil, nil, nil, nil, 2, "a"),
-       (24...25),
-       (25...28),
-       nil,
-       nil,
-       nil,
-       nil,
-       0,
-       "foo"
-     ),
-     CallNode(31...42)(
-       CallNode(31...32)(nil, nil, (31...32), nil, nil, nil, nil, 2, "a"),
-       (37...39),
-       (39...42),
-       nil,
-       nil,
-       nil,
-       nil,
-       1,
-       "foo"
-     ),
-     CallNode(45...55)(
-       CallNode(45...46)(nil, nil, (45...46), nil, nil, nil, nil, 2, "a"),
-       (51...52),
-       (52...55),
-       nil,
-       nil,
-       nil,
-       nil,
-       0,
-       "foo"
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/whitequark/complex.txt b/test/yarp/snapshots/whitequark/complex.txt
deleted file mode 100644
index f8273f3806e41f..00000000000000
--- a/test/yarp/snapshots/whitequark/complex.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-ProgramNode(0...24)(
-  [],
-  StatementsNode(0...24)(
-    [ImaginaryNode(0...5)(FloatNode(0...4)()),
-     ImaginaryNode(7...13)(RationalNode(7...12)(FloatNode(7...11)())),
-     ImaginaryNode(15...18)(IntegerNode(15...17)()),
-     ImaginaryNode(20...24)(RationalNode(20...23)(IntegerNode(20...22)()))]
-  )
-)
diff --git a/test/yarp/snapshots/whitequark/cond_begin.txt b/test/yarp/snapshots/whitequark/cond_begin.txt
deleted file mode 100644
index e3e3650e484993..00000000000000
--- a/test/yarp/snapshots/whitequark/cond_begin.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-ProgramNode(0...18)(
-  [],
-  StatementsNode(0...18)(
-    [IfNode(0...18)(
-       (0...2),
-       ParenthesesNode(3...8)(
-         StatementsNode(4...7)(
-           [CallNode(4...7)(nil, nil, (4...7), nil, nil, nil, nil, 2, "bar")]
-         ),
-         (3...4),
-         (7...8)
-       ),
-       StatementsNode(10...13)(
-         [CallNode(10...13)(nil, nil, (10...13), nil, nil, nil, nil, 2, "foo")]
-       ),
-       nil,
-       (15...18)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/whitequark/cond_begin_masgn.txt b/test/yarp/snapshots/whitequark/cond_begin_masgn.txt
deleted file mode 100644
index 8114bd1cb4491d..00000000000000
--- a/test/yarp/snapshots/whitequark/cond_begin_masgn.txt
+++ /dev/null
@@ -1,36 +0,0 @@
-ProgramNode(0...25)(
-  [:a, :b],
-  StatementsNode(0...25)(
-    [IfNode(0...25)(
-       (0...2),
-       ParenthesesNode(3...20)(
-         StatementsNode(4...19)(
-           [CallNode(4...7)(nil, nil, (4...7), nil, nil, nil, nil, 2, "bar"),
-            MultiWriteNode(9...19)(
-              [LocalVariableTargetNode(9...10)(:a, 0),
-               LocalVariableTargetNode(12...13)(:b, 0)],
-              (14...15),
-              CallNode(16...19)(
-                nil,
-                nil,
-                (16...19),
-                nil,
-                nil,
-                nil,
-                nil,
-                2,
-                "foo"
-              ),
-              nil,
-              nil
-            )]
-         ),
-         (3...4),
-         (19...20)
-       ),
-       nil,
-       nil,
-       (22...25)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/whitequark/cond_eflipflop.txt b/test/yarp/snapshots/whitequark/cond_eflipflop.txt
deleted file mode 100644
index 31ef52f1e95730..00000000000000
--- a/test/yarp/snapshots/whitequark/cond_eflipflop.txt
+++ /dev/null
@@ -1,49 +0,0 @@
-ProgramNode(0...31)(
-  [],
-  StatementsNode(0...31)(
-    [CallNode(0...12)(
-       ParenthesesNode(1...12)(
-         StatementsNode(2...11)(
-           [FlipFlopNode(2...11)(
-              CallNode(2...5)(nil, nil, (2...5), nil, nil, nil, nil, 2, "foo"),
-              CallNode(8...11)(
-                nil,
-                nil,
-                (8...11),
-                nil,
-                nil,
-                nil,
-                nil,
-                2,
-                "bar"
-              ),
-              (5...8),
-              1
-            )]
-         ),
-         (1...2),
-         (11...12)
-       ),
-       nil,
-       (0...1),
-       nil,
-       nil,
-       nil,
-       nil,
-       0,
-       "!"
-     ),
-     IfNode(14...31)(
-       (14...16),
-       FlipFlopNode(17...26)(
-         CallNode(17...20)(nil, nil, (17...20), nil, nil, nil, nil, 2, "foo"),
-         CallNode(23...26)(nil, nil, (23...26), nil, nil, nil, nil, 2, "bar"),
-         (20...23),
-         1
-       ),
-       nil,
-       nil,
-       (28...31)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/whitequark/cond_iflipflop.txt b/test/yarp/snapshots/whitequark/cond_iflipflop.txt
deleted file mode 100644
index 4d1d42ed82092d..00000000000000
--- a/test/yarp/snapshots/whitequark/cond_iflipflop.txt
+++ /dev/null
@@ -1,49 +0,0 @@
-ProgramNode(0...29)(
-  [],
-  StatementsNode(0...29)(
-    [CallNode(0...11)(
-       ParenthesesNode(1...11)(
-         StatementsNode(2...10)(
-           [FlipFlopNode(2...10)(
-              CallNode(2...5)(nil, nil, (2...5), nil, nil, nil, nil, 2, "foo"),
-              CallNode(7...10)(
-                nil,
-                nil,
-                (7...10),
-                nil,
-                nil,
-                nil,
-                nil,
-                2,
-                "bar"
-              ),
-              (5...7),
-              0
-            )]
-         ),
-         (1...2),
-         (10...11)
-       ),
-       nil,
-       (0...1),
-       nil,
-       nil,
-       nil,
-       nil,
-       0,
-       "!"
-     ),
-     IfNode(13...29)(
-       (13...15),
-       FlipFlopNode(16...24)(
-         CallNode(16...19)(nil, nil, (16...19), nil, nil, nil, nil, 2, "foo"),
-         CallNode(21...24)(nil, nil, (21...24), nil, nil, nil, nil, 2, "bar"),
-         (19...21),
-         0
-       ),
-       nil,
-       nil,
-       (26...29)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/whitequark/cond_match_current_line.txt b/test/yarp/snapshots/whitequark/cond_match_current_line.txt
deleted file mode 100644
index 02bceef3d7a3b3..00000000000000
--- a/test/yarp/snapshots/whitequark/cond_match_current_line.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-ProgramNode(0...21)(
-  [],
-  StatementsNode(0...21)(
-    [CallNode(0...6)(
-       RegularExpressionNode(1...6)((1...2), (2...5), (5...6), "wat", 0),
-       nil,
-       (0...1),
-       nil,
-       nil,
-       nil,
-       nil,
-       0,
-       "!"
-     ),
-     IfNode(8...21)(
-       (8...10),
-       RegularExpressionNode(11...16)(
-         (11...12),
-         (12...15),
-         (15...16),
-         "wat",
-         0
-       ),
-       nil,
-       nil,
-       (18...21)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/whitequark/const_op_asgn.txt b/test/yarp/snapshots/whitequark/const_op_asgn.txt
deleted file mode 100644
index d417c5d1c915a0..00000000000000
--- a/test/yarp/snapshots/whitequark/const_op_asgn.txt
+++ /dev/null
@@ -1,74 +0,0 @@
-ProgramNode(0...77)(
-  [],
-  StatementsNode(0...77)(
-    [ConstantPathOperatorWriteNode(0...8)(
-       ConstantPathNode(0...3)(nil, ConstantReadNode(2...3)(:A), (0...2)),
-       (4...6),
-       IntegerNode(7...8)(),
-       :+
-     ),
-     ConstantOperatorWriteNode(10...16)(
-       :A,
-       (10...11),
-       (12...14),
-       IntegerNode(15...16)(),
-       :+
-     ),
-     ConstantPathOperatorWriteNode(18...27)(
-       ConstantPathNode(18...22)(
-         ConstantReadNode(18...19)(:B),
-         ConstantReadNode(21...22)(:A),
-         (19...21)
-       ),
-       (23...25),
-       IntegerNode(26...27)(),
-       :+
-     ),
-     DefNode(29...50)(
-       (33...34),
-       nil,
-       nil,
-       StatementsNode(36...45)(
-         [ConstantPathOrWriteNode(36...45)(
-            ConstantPathNode(36...39)(
-              nil,
-              ConstantReadNode(38...39)(:A),
-              (36...38)
-            ),
-            (40...43),
-            IntegerNode(44...45)()
-          )]
-       ),
-       [],
-       (29...32),
-       nil,
-       nil,
-       nil,
-       nil,
-       (47...50)
-     ),
-     DefNode(52...77)(
-       (56...57),
-       nil,
-       nil,
-       StatementsNode(59...72)(
-         [ConstantPathOrWriteNode(59...72)(
-            ConstantPathNode(59...66)(
-              SelfNode(59...63)(),
-              ConstantReadNode(65...66)(:A),
-              (63...65)
-            ),
-            (67...70),
-            IntegerNode(71...72)()
-          )]
-       ),
-       [],
-       (52...55),
-       nil,
-       nil,
-       nil,
-       nil,
-       (74...77)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/whitequark/const_scoped.txt b/test/yarp/snapshots/whitequark/const_scoped.txt
deleted file mode 100644
index 2404bd05290faf..00000000000000
--- a/test/yarp/snapshots/whitequark/const_scoped.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-ProgramNode(0...8)(
-  [],
-  StatementsNode(0...8)(
-    [ConstantPathNode(0...8)(
-       ConstantReadNode(0...3)(:Bar),
-       ConstantReadNode(5...8)(:Foo),
-       (3...5)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/whitequark/const_toplevel.txt b/test/yarp/snapshots/whitequark/const_toplevel.txt
deleted file mode 100644
index 14647d31be8545..00000000000000
--- a/test/yarp/snapshots/whitequark/const_toplevel.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-ProgramNode(0...5)(
-  [],
-  StatementsNode(0...5)(
-    [ConstantPathNode(0...5)(nil, ConstantReadNode(2...5)(:Foo), (0...2))]
-  )
-)
diff --git a/test/yarp/snapshots/whitequark/const_unscoped.txt b/test/yarp/snapshots/whitequark/const_unscoped.txt
deleted file mode 100644
index 716cbf524973b9..00000000000000
--- a/test/yarp/snapshots/whitequark/const_unscoped.txt
+++ /dev/null
@@ -1 +0,0 @@
-ProgramNode(0...3)([], StatementsNode(0...3)([ConstantReadNode(0...3)(:Foo)]))
diff --git a/test/yarp/snapshots/whitequark/cpath.txt b/test/yarp/snapshots/whitequark/cpath.txt
deleted file mode 100644
index b557da7e7fc522..00000000000000
--- a/test/yarp/snapshots/whitequark/cpath.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-ProgramNode(0...39)(
-  [],
-  StatementsNode(0...39)(
-    [ModuleNode(0...17)(
-       [],
-       (0...6),
-       ConstantPathNode(7...12)(nil, ConstantReadNode(9...12)(:Foo), (7...9)),
-       nil,
-       (14...17),
-       :Foo,
-       :Foo
-     ),
-     ModuleNode(19...39)(
-       [],
-       (19...25),
-       ConstantPathNode(26...34)(
-         ConstantReadNode(26...29)(:Bar),
-         ConstantReadNode(31...34)(:Foo),
-         (29...31)
-       ),
-       nil,
-       (36...39),
-       :Foo,
-       :Foo
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/whitequark/cvar.txt b/test/yarp/snapshots/whitequark/cvar.txt
deleted file mode 100644
index 6a1f2e50f48566..00000000000000
--- a/test/yarp/snapshots/whitequark/cvar.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-ProgramNode(0...5)(
-  [],
-  StatementsNode(0...5)([ClassVariableReadNode(0...5)(:@@foo)])
-)
diff --git a/test/yarp/snapshots/whitequark/cvasgn.txt b/test/yarp/snapshots/whitequark/cvasgn.txt
deleted file mode 100644
index 7e07810eb6cc0f..00000000000000
--- a/test/yarp/snapshots/whitequark/cvasgn.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-ProgramNode(0...10)(
-  [],
-  StatementsNode(0...10)(
-    [ClassVariableWriteNode(0...10)(
-       :@@var,
-       (0...5),
-       IntegerNode(8...10)(),
-       (6...7)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/whitequark/dedenting_heredoc.txt b/test/yarp/snapshots/whitequark/dedenting_heredoc.txt
deleted file mode 100644
index d74deb09b08f56..00000000000000
--- a/test/yarp/snapshots/whitequark/dedenting_heredoc.txt
+++ /dev/null
@@ -1,323 +0,0 @@
-ProgramNode(0...313)(
-  [],
-  StatementsNode(0...313)(
-    [CallNode(0...8)(
-       nil,
-       nil,
-       (0...1),
-       nil,
-       ArgumentsNode(2...8)(
-         [InterpolatedStringNode(2...8)(
-            (2...8),
-            [StringNode(9...17)(nil, (9...17), nil, "  x\n"),
-             EmbeddedStatementsNode(17...25)(
-               (17...19),
-               StatementsNode(19...24)(
-                 [StringNode(19...24)((19...20), (20...23), (23...24), "  y")]
-               ),
-               (24...25)
-             ),
-             StringNode(25...26)(nil, (25...26), nil, "\n")],
-            (26...28)
-          )]
-       ),
-       nil,
-       nil,
-       0,
-       "p"
-     ),
-     CallNode(29...37)(
-       nil,
-       nil,
-       (29...30),
-       nil,
-       ArgumentsNode(31...37)(
-         [InterpolatedStringNode(31...37)(
-            (31...37),
-            [StringNode(38...46)(nil, (38...46), nil, "  x\n"),
-             EmbeddedStatementsNode(46...52)(
-               (46...48),
-               StatementsNode(48...51)(
-                 [CallNode(48...51)(
-                    nil,
-                    nil,
-                    (48...51),
-                    nil,
-                    nil,
-                    nil,
-                    nil,
-                    2,
-                    "foo"
-                  )]
-               ),
-               (51...52)
-             ),
-             StringNode(52...53)(nil, (52...53), nil, "\n")],
-            (53...55)
-          )]
-       ),
-       nil,
-       nil,
-       0,
-       "p"
-     ),
-     CallNode(56...62)(
-       nil,
-       nil,
-       (56...57),
-       nil,
-       ArgumentsNode(58...62)(
-         [InterpolatedStringNode(58...62)(
-            (58...62),
-            [StringNode(63...76)(nil, (63...76), nil, "x\n" + "y\n")],
-            (76...78)
-          )]
-       ),
-       nil,
-       nil,
-       0,
-       "p"
-     ),
-     CallNode(79...85)(
-       nil,
-       nil,
-       (79...80),
-       nil,
-       ArgumentsNode(81...85)(
-         [InterpolatedStringNode(81...85)(
-            (81...85),
-            [StringNode(86...95)(nil, (86...95), nil, "\tx\n" + "y\n")],
-            (95...97)
-          )]
-       ),
-       nil,
-       nil,
-       0,
-       "p"
-     ),
-     CallNode(98...104)(
-       nil,
-       nil,
-       (98...99),
-       nil,
-       ArgumentsNode(100...104)(
-         [InterpolatedStringNode(100...104)(
-            (100...104),
-            [StringNode(105...122)(nil, (105...122), nil, "x\n" + "y\n")],
-            (122...124)
-          )]
-       ),
-       nil,
-       nil,
-       0,
-       "p"
-     ),
-     CallNode(125...131)(
-       nil,
-       nil,
-       (125...126),
-       nil,
-       ArgumentsNode(127...131)(
-         [InterpolatedStringNode(127...131)(
-            (127...131),
-            [StringNode(132...146)(nil, (132...146), nil, "\tx\n" + "y\n")],
-            (146...148)
-          )]
-       ),
-       nil,
-       nil,
-       0,
-       "p"
-     ),
-     CallNode(149...155)(
-       nil,
-       nil,
-       (149...150),
-       nil,
-       ArgumentsNode(151...155)(
-         [InterpolatedStringNode(151...155)(
-            (151...155),
-            [StringNode(156...168)(nil, (156...168), nil, "  x\n" + "\ty\n")],
-            (168...170)
-          )]
-       ),
-       nil,
-       nil,
-       0,
-       "p"
-     ),
-     CallNode(171...177)(
-       nil,
-       nil,
-       (171...172),
-       nil,
-       ArgumentsNode(173...177)(
-         [InterpolatedStringNode(173...177)(
-            (173...177),
-            [StringNode(178...191)(nil, (178...191), nil, "  x\n" + "  y\n")],
-            (191...193)
-          )]
-       ),
-       nil,
-       nil,
-       0,
-       "p"
-     ),
-     CallNode(194...200)(
-       nil,
-       nil,
-       (194...195),
-       nil,
-       ArgumentsNode(196...200)(
-         [InterpolatedStringNode(196...200)((196...200), [], (201...205))]
-       ),
-       nil,
-       nil,
-       0,
-       "p"
-     ),
-     CallNode(206...212)(
-       nil,
-       nil,
-       (206...207),
-       nil,
-       ArgumentsNode(208...212)(
-         [InterpolatedStringNode(208...212)(
-            (208...212),
-            [StringNode(213...220)(
-               nil,
-               (213...220),
-               nil,
-               "  x\n" + "\n" + "y\n"
-             )],
-            (220...222)
-          )]
-       ),
-       nil,
-       nil,
-       0,
-       "p"
-     ),
-     CallNode(223...229)(
-       nil,
-       nil,
-       (223...224),
-       nil,
-       ArgumentsNode(225...229)(
-         [InterpolatedStringNode(225...229)(
-            (225...229),
-            [StringNode(230...243)(
-               nil,
-               (230...243),
-               nil,
-               "x\n" + "  \n" + "y\n"
-             )],
-            (243...245)
-          )]
-       ),
-       nil,
-       nil,
-       0,
-       "p"
-     ),
-     CallNode(246...252)(
-       nil,
-       nil,
-       (246...247),
-       nil,
-       ArgumentsNode(248...252)(
-         [InterpolatedStringNode(248...252)(
-            (248...252),
-            [StringNode(253...263)(nil, (253...263), nil, "x\n" + "  y\n")],
-            (263...265)
-          )]
-       ),
-       nil,
-       nil,
-       0,
-       "p"
-     ),
-     CallNode(266...272)(
-       nil,
-       nil,
-       (266...267),
-       nil,
-       ArgumentsNode(268...272)(
-         [InterpolatedStringNode(268...272)(
-            (268...272),
-            [StringNode(273...277)(nil, (273...277), nil, "x\n")],
-            (277...279)
-          )]
-       ),
-       nil,
-       nil,
-       0,
-       "p"
-     ),
-     CallNode(280...286)(
-       nil,
-       nil,
-       (280...281),
-       nil,
-       ArgumentsNode(282...286)(
-         [InterpolatedStringNode(282...286)(
-            (282...286),
-            [StringNode(287...292)(nil, (287...292), nil, "ð\n")],
-            (292...294)
-          )]
-       ),
-       nil,
-       nil,
-       0,
-       "p"
-     ),
-     CallNode(295...301)(
-       nil,
-       nil,
-       (295...296),
-       nil,
-       ArgumentsNode(297...301)(
-         [InterpolatedStringNode(297...301)((297...301), [], (302...304))]
-       ),
-       nil,
-       nil,
-       0,
-       "p"
-     ),
-     CallNode(305...313)(
-       nil,
-       nil,
-       (305...306),
-       nil,
-       ArgumentsNode(307...313)(
-         [InterpolatedXStringNode(307...313)(
-            (307...313),
-            [StringNode(314...322)(nil, (314...322), nil, "  x\n"),
-             EmbeddedStatementsNode(322...328)(
-               (322...324),
-               StatementsNode(324...327)(
-                 [CallNode(324...327)(
-                    nil,
-                    nil,
-                    (324...327),
-                    nil,
-                    nil,
-                    nil,
-                    nil,
-                    2,
-                    "foo"
-                  )]
-               ),
-               (327...328)
-             ),
-             StringNode(328...329)(nil, (328...329), nil, "\n")],
-            (329...331)
-          )]
-       ),
-       nil,
-       nil,
-       0,
-       "p"
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/whitequark/dedenting_interpolating_heredoc_fake_line_continuation.txt b/test/yarp/snapshots/whitequark/dedenting_interpolating_heredoc_fake_line_continuation.txt
deleted file mode 100644
index f076eed1fec25a..00000000000000
--- a/test/yarp/snapshots/whitequark/dedenting_interpolating_heredoc_fake_line_continuation.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-ProgramNode(0...8)(
-  [],
-  StatementsNode(0...8)(
-    [InterpolatedStringNode(0...8)(
-       (0...8),
-       [StringNode(9...23)(nil, (9...23), nil, "baz\\\n" + "qux\n")],
-       (23...27)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/whitequark/dedenting_non_interpolating_heredoc_line_continuation.txt b/test/yarp/snapshots/whitequark/dedenting_non_interpolating_heredoc_line_continuation.txt
deleted file mode 100644
index ce1617b1ad3026..00000000000000
--- a/test/yarp/snapshots/whitequark/dedenting_non_interpolating_heredoc_line_continuation.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-ProgramNode(0...8)(
-  [],
-  StatementsNode(0...8)(
-    [InterpolatedStringNode(0...8)(
-       (0...8),
-       [StringNode(9...22)(nil, (9...22), nil, "baz\\\n" + "qux\n")],
-       (22...26)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/whitequark/def.txt b/test/yarp/snapshots/whitequark/def.txt
deleted file mode 100644
index f7454765332967..00000000000000
--- a/test/yarp/snapshots/whitequark/def.txt
+++ /dev/null
@@ -1,83 +0,0 @@
-ProgramNode(0...93)(
-  [],
-  StatementsNode(0...93)(
-    [DefNode(0...14)(
-       (4...9),
-       nil,
-       nil,
-       nil,
-       [],
-       (0...3),
-       nil,
-       nil,
-       nil,
-       nil,
-       (11...14)
-     ),
-     DefNode(16...28)(
-       (20...23),
-       nil,
-       nil,
-       nil,
-       [],
-       (16...19),
-       nil,
-       nil,
-       nil,
-       nil,
-       (25...28)
-     ),
-     DefNode(30...45)(
-       (34...40),
-       nil,
-       nil,
-       nil,
-       [],
-       (30...33),
-       nil,
-       nil,
-       nil,
-       nil,
-       (42...45)
-     ),
-     DefNode(47...63)(
-       (51...58),
-       nil,
-       nil,
-       nil,
-       [],
-       (47...50),
-       nil,
-       nil,
-       nil,
-       nil,
-       (60...63)
-     ),
-     DefNode(65...77)(
-       (69...72),
-       nil,
-       nil,
-       nil,
-       [],
-       (65...68),
-       nil,
-       nil,
-       nil,
-       nil,
-       (74...77)
-     ),
-     DefNode(79...93)(
-       (83...88),
-       nil,
-       nil,
-       nil,
-       [],
-       (79...82),
-       nil,
-       nil,
-       nil,
-       nil,
-       (90...93)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/whitequark/defined.txt b/test/yarp/snapshots/whitequark/defined.txt
deleted file mode 100644
index 3ddfdd84bbf5ea..00000000000000
--- a/test/yarp/snapshots/whitequark/defined.txt
+++ /dev/null
@@ -1,23 +0,0 @@
-ProgramNode(0...42)(
-  [],
-  StatementsNode(0...42)(
-    [DefinedNode(0...13)(
-       nil,
-       InstanceVariableReadNode(9...13)(:@foo),
-       nil,
-       (0...8)
-     ),
-     DefinedNode(15...27)(
-       nil,
-       CallNode(24...27)(nil, nil, (24...27), nil, nil, nil, nil, 2, "foo"),
-       nil,
-       (15...23)
-     ),
-     DefinedNode(29...42)(
-       (37...38),
-       CallNode(38...41)(nil, nil, (38...41), nil, nil, nil, nil, 2, "foo"),
-       (41...42),
-       (29...37)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/whitequark/defs.txt b/test/yarp/snapshots/whitequark/defs.txt
deleted file mode 100644
index 372edbfdcd0eee..00000000000000
--- a/test/yarp/snapshots/whitequark/defs.txt
+++ /dev/null
@@ -1,74 +0,0 @@
-ProgramNode(0...100)(
-  [],
-  StatementsNode(0...100)(
-    [DefNode(0...18)(
-       (10...13),
-       ParenthesesNode(4...9)(
-         CallNode(5...8)(nil, nil, (5...8), nil, nil, nil, nil, 2, "foo"),
-         (4...5),
-         (8...9)
-       ),
-       nil,
-       nil,
-       [],
-       (0...3),
-       (9...10),
-       nil,
-       nil,
-       nil,
-       (15...18)
-     ),
-     DefNode(20...39)(
-       (31...34),
-       ConstantReadNode(24...30)(:String),
-       nil,
-       nil,
-       [],
-       (20...23),
-       (30...31),
-       nil,
-       nil,
-       nil,
-       (36...39)
-     ),
-     DefNode(41...61)(
-       (53...56),
-       ConstantReadNode(45...51)(:String),
-       nil,
-       nil,
-       [],
-       (41...44),
-       (51...53),
-       nil,
-       nil,
-       nil,
-       (58...61)
-     ),
-     DefNode(63...80)(
-       (72...75),
-       SelfNode(67...71)(),
-       nil,
-       nil,
-       [],
-       (63...66),
-       (71...72),
-       nil,
-       nil,
-       nil,
-       (77...80)
-     ),
-     DefNode(82...100)(
-       (92...95),
-       SelfNode(86...90)(),
-       nil,
-       nil,
-       [],
-       (82...85),
-       (90...92),
-       nil,
-       nil,
-       nil,
-       (97...100)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/whitequark/empty_stmt.txt b/test/yarp/snapshots/whitequark/empty_stmt.txt
deleted file mode 100644
index bd3eaf5ff49bc2..00000000000000
--- a/test/yarp/snapshots/whitequark/empty_stmt.txt
+++ /dev/null
@@ -1 +0,0 @@
-ProgramNode(0...0)([], StatementsNode(0...0)([]))
diff --git a/test/yarp/snapshots/whitequark/endless_comparison_method.txt b/test/yarp/snapshots/whitequark/endless_comparison_method.txt
deleted file mode 100644
index fa83705659563d..00000000000000
--- a/test/yarp/snapshots/whitequark/endless_comparison_method.txt
+++ /dev/null
@@ -1,203 +0,0 @@
-ProgramNode(0...179)(
-  [],
-  StatementsNode(0...179)(
-    [DefNode(0...28)(
-       (4...6),
-       nil,
-       ParametersNode(7...12)(
-         [RequiredParameterNode(7...12)(:other)],
-         [],
-         [],
-         nil,
-         [],
-         nil,
-         nil
-       ),
-       StatementsNode(16...28)(
-         [CallNode(16...28)(
-            nil,
-            nil,
-            (16...28),
-            nil,
-            nil,
-            nil,
-            nil,
-            2,
-            "do_something"
-          )]
-       ),
-       [:other],
-       (0...3),
-       nil,
-       (6...7),
-       (12...13),
-       (14...15),
-       nil
-     ),
-     DefNode(30...58)(
-       (34...36),
-       nil,
-       ParametersNode(37...42)(
-         [RequiredParameterNode(37...42)(:other)],
-         [],
-         [],
-         nil,
-         [],
-         nil,
-         nil
-       ),
-       StatementsNode(46...58)(
-         [CallNode(46...58)(
-            nil,
-            nil,
-            (46...58),
-            nil,
-            nil,
-            nil,
-            nil,
-            2,
-            "do_something"
-          )]
-       ),
-       [:other],
-       (30...33),
-       nil,
-       (36...37),
-       (42...43),
-       (44...45),
-       nil
-     ),
-     DefNode(60...88)(
-       (64...66),
-       nil,
-       ParametersNode(67...72)(
-         [RequiredParameterNode(67...72)(:other)],
-         [],
-         [],
-         nil,
-         [],
-         nil,
-         nil
-       ),
-       StatementsNode(76...88)(
-         [CallNode(76...88)(
-            nil,
-            nil,
-            (76...88),
-            nil,
-            nil,
-            nil,
-            nil,
-            2,
-            "do_something"
-          )]
-       ),
-       [:other],
-       (60...63),
-       nil,
-       (66...67),
-       (72...73),
-       (74...75),
-       nil
-     ),
-     DefNode(90...118)(
-       (94...96),
-       nil,
-       ParametersNode(97...102)(
-         [RequiredParameterNode(97...102)(:other)],
-         [],
-         [],
-         nil,
-         [],
-         nil,
-         nil
-       ),
-       StatementsNode(106...118)(
-         [CallNode(106...118)(
-            nil,
-            nil,
-            (106...118),
-            nil,
-            nil,
-            nil,
-            nil,
-            2,
-            "do_something"
-          )]
-       ),
-       [:other],
-       (90...93),
-       nil,
-       (96...97),
-       (102...103),
-       (104...105),
-       nil
-     ),
-     DefNode(120...149)(
-       (124...127),
-       nil,
-       ParametersNode(128...133)(
-         [RequiredParameterNode(128...133)(:other)],
-         [],
-         [],
-         nil,
-         [],
-         nil,
-         nil
-       ),
-       StatementsNode(137...149)(
-         [CallNode(137...149)(
-            nil,
-            nil,
-            (137...149),
-            nil,
-            nil,
-            nil,
-            nil,
-            2,
-            "do_something"
-          )]
-       ),
-       [:other],
-       (120...123),
-       nil,
-       (127...128),
-       (133...134),
-       (135...136),
-       nil
-     ),
-     DefNode(151...179)(
-       (155...157),
-       nil,
-       ParametersNode(158...163)(
-         [RequiredParameterNode(158...163)(:other)],
-         [],
-         [],
-         nil,
-         [],
-         nil,
-         nil
-       ),
-       StatementsNode(167...179)(
-         [CallNode(167...179)(
-            nil,
-            nil,
-            (167...179),
-            nil,
-            nil,
-            nil,
-            nil,
-            2,
-            "do_something"
-          )]
-       ),
-       [:other],
-       (151...154),
-       nil,
-       (157...158),
-       (163...164),
-       (165...166),
-       nil
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/whitequark/endless_method.txt b/test/yarp/snapshots/whitequark/endless_method.txt
deleted file mode 100644
index a80e6b57db8414..00000000000000
--- a/test/yarp/snapshots/whitequark/endless_method.txt
+++ /dev/null
@@ -1,97 +0,0 @@
-ProgramNode(0...78)(
-  [],
-  StatementsNode(0...78)(
-    [DefNode(0...14)(
-       (4...7),
-       nil,
-       nil,
-       StatementsNode(12...14)([IntegerNode(12...14)()]),
-       [],
-       (0...3),
-       nil,
-       (7...8),
-       (8...9),
-       (10...11),
-       nil
-     ),
-     DefNode(16...34)(
-       (20...23),
-       nil,
-       ParametersNode(24...25)(
-         [RequiredParameterNode(24...25)(:x)],
-         [],
-         [],
-         nil,
-         [],
-         nil,
-         nil
-       ),
-       StatementsNode(29...34)(
-         [CallNode(29...34)(
-            LocalVariableReadNode(29...30)(:x, 0),
-            nil,
-            (31...32),
-            nil,
-            ArgumentsNode(33...34)([IntegerNode(33...34)()]),
-            nil,
-            nil,
-            0,
-            "+"
-          )]
-       ),
-       [:x],
-       (16...19),
-       nil,
-       (23...24),
-       (25...26),
-       (27...28),
-       nil
-     ),
-     DefNode(36...54)(
-       (44...47),
-       CallNode(40...43)(nil, nil, (40...43), nil, nil, nil, nil, 2, "obj"),
-       nil,
-       StatementsNode(52...54)([IntegerNode(52...54)()]),
-       [],
-       (36...39),
-       (43...44),
-       (47...48),
-       (48...49),
-       (50...51),
-       nil
-     ),
-     DefNode(56...78)(
-       (64...67),
-       CallNode(60...63)(nil, nil, (60...63), nil, nil, nil, nil, 2, "obj"),
-       ParametersNode(68...69)(
-         [RequiredParameterNode(68...69)(:x)],
-         [],
-         [],
-         nil,
-         [],
-         nil,
-         nil
-       ),
-       StatementsNode(73...78)(
-         [CallNode(73...78)(
-            LocalVariableReadNode(73...74)(:x, 0),
-            nil,
-            (75...76),
-            nil,
-            ArgumentsNode(77...78)([IntegerNode(77...78)()]),
-            nil,
-            nil,
-            0,
-            "+"
-          )]
-       ),
-       [:x],
-       (56...59),
-       (63...64),
-       (67...68),
-       (69...70),
-       (71...72),
-       nil
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/whitequark/endless_method_command_syntax.txt b/test/yarp/snapshots/whitequark/endless_method_command_syntax.txt
deleted file mode 100644
index 33c64edfed2456..00000000000000
--- a/test/yarp/snapshots/whitequark/endless_method_command_syntax.txt
+++ /dev/null
@@ -1,316 +0,0 @@
-ProgramNode(0...278)(
-  [],
-  StatementsNode(0...278)(
-    [DefNode(0...22)(
-       (4...7),
-       nil,
-       nil,
-       StatementsNode(10...22)(
-         [CallNode(10...22)(
-            nil,
-            nil,
-            (10...14),
-            nil,
-            ArgumentsNode(15...22)(
-              [StringNode(15...22)((15...16), (16...21), (21...22), "Hello")]
-            ),
-            nil,
-            nil,
-            0,
-            "puts"
-          )]
-       ),
-       [],
-       (0...3),
-       nil,
-       nil,
-       nil,
-       (8...9),
-       nil
-     ),
-     DefNode(24...48)(
-       (28...31),
-       nil,
-       nil,
-       StatementsNode(36...48)(
-         [CallNode(36...48)(
-            nil,
-            nil,
-            (36...40),
-            nil,
-            ArgumentsNode(41...48)(
-              [StringNode(41...48)((41...42), (42...47), (47...48), "Hello")]
-            ),
-            nil,
-            nil,
-            0,
-            "puts"
-          )]
-       ),
-       [],
-       (24...27),
-       nil,
-       (31...32),
-       (32...33),
-       (34...35),
-       nil
-     ),
-     DefNode(50...69)(
-       (54...57),
-       nil,
-       ParametersNode(58...59)(
-         [RequiredParameterNode(58...59)(:x)],
-         [],
-         [],
-         nil,
-         [],
-         nil,
-         nil
-       ),
-       StatementsNode(63...69)(
-         [CallNode(63...69)(
-            nil,
-            nil,
-            (63...67),
-            nil,
-            ArgumentsNode(68...69)([LocalVariableReadNode(68...69)(:x, 0)]),
-            nil,
-            nil,
-            0,
-            "puts"
-          )]
-       ),
-       [:x],
-       (50...53),
-       nil,
-       (57...58),
-       (59...60),
-       (61...62),
-       nil
-     ),
-     DefNode(71...97)(
-       (79...82),
-       CallNode(75...78)(nil, nil, (75...78), nil, nil, nil, nil, 2, "obj"),
-       nil,
-       StatementsNode(85...97)(
-         [CallNode(85...97)(
-            nil,
-            nil,
-            (85...89),
-            nil,
-            ArgumentsNode(90...97)(
-              [StringNode(90...97)((90...91), (91...96), (96...97), "Hello")]
-            ),
-            nil,
-            nil,
-            0,
-            "puts"
-          )]
-       ),
-       [],
-       (71...74),
-       (78...79),
-       nil,
-       nil,
-       (83...84),
-       nil
-     ),
-     DefNode(99...127)(
-       (107...110),
-       CallNode(103...106)(
-         nil,
-         nil,
-         (103...106),
-         nil,
-         nil,
-         nil,
-         nil,
-         2,
-         "obj"
-       ),
-       nil,
-       StatementsNode(115...127)(
-         [CallNode(115...127)(
-            nil,
-            nil,
-            (115...119),
-            nil,
-            ArgumentsNode(120...127)(
-              [StringNode(120...127)(
-                 (120...121),
-                 (121...126),
-                 (126...127),
-                 "Hello"
-               )]
-            ),
-            nil,
-            nil,
-            0,
-            "puts"
-          )]
-       ),
-       [],
-       (99...102),
-       (106...107),
-       (110...111),
-       (111...112),
-       (113...114),
-       nil
-     ),
-     DefNode(129...152)(
-       (137...140),
-       CallNode(133...136)(
-         nil,
-         nil,
-         (133...136),
-         nil,
-         nil,
-         nil,
-         nil,
-         2,
-         "obj"
-       ),
-       ParametersNode(141...142)(
-         [RequiredParameterNode(141...142)(:x)],
-         [],
-         [],
-         nil,
-         [],
-         nil,
-         nil
-       ),
-       StatementsNode(146...152)(
-         [CallNode(146...152)(
-            nil,
-            nil,
-            (146...150),
-            nil,
-            ArgumentsNode(151...152)(
-              [LocalVariableReadNode(151...152)(:x, 0)]
-            ),
-            nil,
-            nil,
-            0,
-            "puts"
-          )]
-       ),
-       [:x],
-       (129...132),
-       (136...137),
-       (140...141),
-       (142...143),
-       (144...145),
-       nil
-     ),
-     DefNode(154...214)(
-       (158...165),
-       nil,
-       ParametersNode(166...167)(
-         [RequiredParameterNode(166...167)(:x)],
-         [],
-         [],
-         nil,
-         [],
-         nil,
-         nil
-       ),
-       StatementsNode(171...214)(
-         [CallNode(171...214)(
-            nil,
-            nil,
-            (171...176),
-            nil,
-            ArgumentsNode(177...214)(
-              [RescueModifierNode(177...214)(
-                 StringNode(177...191)(
-                   (177...178),
-                   (178...190),
-                   (190...191),
-                   "to be caught"
-                 ),
-                 (192...198),
-                 InterpolatedStringNode(199...214)(
-                   (199...200),
-                   [StringNode(200...209)(nil, (200...209), nil, "instance "),
-                    EmbeddedStatementsNode(209...213)(
-                      (209...211),
-                      StatementsNode(211...212)(
-                        [LocalVariableReadNode(211...212)(:x, 0)]
-                      ),
-                      (212...213)
-                    )],
-                   (213...214)
-                 )
-               )]
-            ),
-            nil,
-            nil,
-            0,
-            "raise"
-          )]
-       ),
-       [:x],
-       (154...157),
-       nil,
-       (165...166),
-       (167...168),
-       (169...170),
-       nil
-     ),
-     DefNode(216...278)(
-       (225...232),
-       SelfNode(220...224)(),
-       ParametersNode(233...234)(
-         [RequiredParameterNode(233...234)(:x)],
-         [],
-         [],
-         nil,
-         [],
-         nil,
-         nil
-       ),
-       StatementsNode(238...278)(
-         [CallNode(238...278)(
-            nil,
-            nil,
-            (238...243),
-            nil,
-            ArgumentsNode(244...278)(
-              [RescueModifierNode(244...278)(
-                 StringNode(244...258)(
-                   (244...245),
-                   (245...257),
-                   (257...258),
-                   "to be caught"
-                 ),
-                 (259...265),
-                 InterpolatedStringNode(266...278)(
-                   (266...267),
-                   [StringNode(267...273)(nil, (267...273), nil, "class "),
-                    EmbeddedStatementsNode(273...277)(
-                      (273...275),
-                      StatementsNode(275...276)(
-                        [LocalVariableReadNode(275...276)(:x, 0)]
-                      ),
-                      (276...277)
-                    )],
-                   (277...278)
-                 )
-               )]
-            ),
-            nil,
-            nil,
-            0,
-            "raise"
-          )]
-       ),
-       [:x],
-       (216...219),
-       (224...225),
-       (232...233),
-       (234...235),
-       (236...237),
-       nil
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/whitequark/endless_method_forwarded_args_legacy.txt b/test/yarp/snapshots/whitequark/endless_method_forwarded_args_legacy.txt
deleted file mode 100644
index 87c50ca846c80c..00000000000000
--- a/test/yarp/snapshots/whitequark/endless_method_forwarded_args_legacy.txt
+++ /dev/null
@@ -1,38 +0,0 @@
-ProgramNode(0...23)(
-  [],
-  StatementsNode(0...23)(
-    [DefNode(0...23)(
-       (4...7),
-       nil,
-       ParametersNode(8...11)(
-         [],
-         [],
-         [],
-         nil,
-         [],
-         ForwardingParameterNode(8...11)(),
-         nil
-       ),
-       StatementsNode(15...23)(
-         [CallNode(15...23)(
-            nil,
-            nil,
-            (15...18),
-            (18...19),
-            ArgumentsNode(19...22)([ForwardingArgumentsNode(19...22)()]),
-            (22...23),
-            nil,
-            0,
-            "bar"
-          )]
-       ),
-       [:"..."],
-       (0...3),
-       nil,
-       (7...8),
-       (11...12),
-       (13...14),
-       nil
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/whitequark/endless_method_with_rescue_mod.txt b/test/yarp/snapshots/whitequark/endless_method_with_rescue_mod.txt
deleted file mode 100644
index ac757efdbb7b30..00000000000000
--- a/test/yarp/snapshots/whitequark/endless_method_with_rescue_mod.txt
+++ /dev/null
@@ -1,43 +0,0 @@
-ProgramNode(0...47)(
-  [],
-  StatementsNode(0...47)(
-    [DefNode(0...20)(
-       (4...5),
-       nil,
-       nil,
-       StatementsNode(10...20)(
-         [RescueModifierNode(10...20)(
-            IntegerNode(10...11)(),
-            (12...18),
-            IntegerNode(19...20)()
-          )]
-       ),
-       [],
-       (0...3),
-       nil,
-       (5...6),
-       (6...7),
-       (8...9),
-       nil
-     ),
-     DefNode(22...47)(
-       (31...32),
-       SelfNode(26...30)(),
-       nil,
-       StatementsNode(37...47)(
-         [RescueModifierNode(37...47)(
-            IntegerNode(37...38)(),
-            (39...45),
-            IntegerNode(46...47)()
-          )]
-       ),
-       [],
-       (22...25),
-       (30...31),
-       (32...33),
-       (33...34),
-       (35...36),
-       nil
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/whitequark/endless_method_without_args.txt b/test/yarp/snapshots/whitequark/endless_method_without_args.txt
deleted file mode 100644
index 778c2b595b97da..00000000000000
--- a/test/yarp/snapshots/whitequark/endless_method_without_args.txt
+++ /dev/null
@@ -1,69 +0,0 @@
-ProgramNode(0...86)(
-  [],
-  StatementsNode(0...86)(
-    [DefNode(0...12)(
-       (4...7),
-       nil,
-       nil,
-       StatementsNode(10...12)([IntegerNode(10...12)()]),
-       [],
-       (0...3),
-       nil,
-       nil,
-       nil,
-       (8...9),
-       nil
-     ),
-     DefNode(14...37)(
-       (18...21),
-       nil,
-       nil,
-       StatementsNode(24...37)(
-         [RescueModifierNode(24...37)(
-            IntegerNode(24...26)(),
-            (27...33),
-            NilNode(34...37)()
-          )]
-       ),
-       [],
-       (14...17),
-       nil,
-       nil,
-       nil,
-       (22...23),
-       nil
-     ),
-     DefNode(39...56)(
-       (48...51),
-       SelfNode(43...47)(),
-       nil,
-       StatementsNode(54...56)([IntegerNode(54...56)()]),
-       [],
-       (39...42),
-       (47...48),
-       nil,
-       nil,
-       (52...53),
-       nil
-     ),
-     DefNode(58...86)(
-       (67...70),
-       SelfNode(62...66)(),
-       nil,
-       StatementsNode(73...86)(
-         [RescueModifierNode(73...86)(
-            IntegerNode(73...75)(),
-            (76...82),
-            NilNode(83...86)()
-          )]
-       ),
-       [],
-       (58...61),
-       (66...67),
-       nil,
-       nil,
-       (71...72),
-       nil
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/whitequark/ensure.txt b/test/yarp/snapshots/whitequark/ensure.txt
deleted file mode 100644
index abc443a2bb2185..00000000000000
--- a/test/yarp/snapshots/whitequark/ensure.txt
+++ /dev/null
@@ -1,31 +0,0 @@
-ProgramNode(0...29)(
-  [],
-  StatementsNode(0...29)(
-    [BeginNode(0...29)(
-       (0...5),
-       StatementsNode(7...11)(
-         [CallNode(7...11)(nil, nil, (7...11), nil, nil, nil, nil, 2, "meth")]
-       ),
-       nil,
-       nil,
-       EnsureNode(13...29)(
-         (13...19),
-         StatementsNode(21...24)(
-           [CallNode(21...24)(
-              nil,
-              nil,
-              (21...24),
-              nil,
-              nil,
-              nil,
-              nil,
-              2,
-              "bar"
-            )]
-         ),
-         (26...29)
-       ),
-       (26...29)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/whitequark/ensure_empty.txt b/test/yarp/snapshots/whitequark/ensure_empty.txt
deleted file mode 100644
index 39ac8bfea17660..00000000000000
--- a/test/yarp/snapshots/whitequark/ensure_empty.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-ProgramNode(0...16)(
-  [],
-  StatementsNode(0...16)(
-    [BeginNode(0...16)(
-       (0...5),
-       nil,
-       nil,
-       nil,
-       EnsureNode(6...16)((6...12), nil, (13...16)),
-       (13...16)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/whitequark/false.txt b/test/yarp/snapshots/whitequark/false.txt
deleted file mode 100644
index b435f45a625fea..00000000000000
--- a/test/yarp/snapshots/whitequark/false.txt
+++ /dev/null
@@ -1 +0,0 @@
-ProgramNode(0...5)([], StatementsNode(0...5)([FalseNode(0...5)()]))
diff --git a/test/yarp/snapshots/whitequark/float.txt b/test/yarp/snapshots/whitequark/float.txt
deleted file mode 100644
index dfeeb286974b4f..00000000000000
--- a/test/yarp/snapshots/whitequark/float.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-ProgramNode(0...11)(
-  [],
-  StatementsNode(0...11)([FloatNode(0...5)(), FloatNode(7...11)()])
-)
diff --git a/test/yarp/snapshots/whitequark/for.txt b/test/yarp/snapshots/whitequark/for.txt
deleted file mode 100644
index 1250760a01f976..00000000000000
--- a/test/yarp/snapshots/whitequark/for.txt
+++ /dev/null
@@ -1,59 +0,0 @@
-ProgramNode(0...48)(
-  [:a],
-  StatementsNode(0...48)(
-    [ForNode(0...24)(
-       MultiWriteNode(4...5)(
-         [LocalVariableTargetNode(4...5)(:a, 0)],
-         nil,
-         nil,
-         nil,
-         nil
-       ),
-       CallNode(9...12)(nil, nil, (9...12), nil, nil, nil, nil, 2, "foo"),
-       StatementsNode(16...19)(
-         [CallNode(16...19)(
-            nil,
-            nil,
-            (16...17),
-            nil,
-            ArgumentsNode(18...19)([LocalVariableReadNode(18...19)(:a, 0)]),
-            nil,
-            nil,
-            0,
-            "p"
-          )]
-       ),
-       (0...3),
-       (6...8),
-       (13...15),
-       (21...24)
-     ),
-     ForNode(26...48)(
-       MultiWriteNode(30...31)(
-         [LocalVariableTargetNode(30...31)(:a, 0)],
-         nil,
-         nil,
-         nil,
-         nil
-       ),
-       CallNode(35...38)(nil, nil, (35...38), nil, nil, nil, nil, 2, "foo"),
-       StatementsNode(40...43)(
-         [CallNode(40...43)(
-            nil,
-            nil,
-            (40...41),
-            nil,
-            ArgumentsNode(42...43)([LocalVariableReadNode(42...43)(:a, 0)]),
-            nil,
-            nil,
-            0,
-            "p"
-          )]
-       ),
-       (26...29),
-       (32...34),
-       nil,
-       (45...48)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/whitequark/for_mlhs.txt b/test/yarp/snapshots/whitequark/for_mlhs.txt
deleted file mode 100644
index fecaeb10caf949..00000000000000
--- a/test/yarp/snapshots/whitequark/for_mlhs.txt
+++ /dev/null
@@ -1,36 +0,0 @@
-ProgramNode(0...28)(
-  [:a, :b],
-  StatementsNode(0...28)(
-    [ForNode(0...28)(
-       MultiWriteNode(4...8)(
-         [LocalVariableTargetNode(4...5)(:a, 0),
-          LocalVariableTargetNode(7...8)(:b, 0)],
-         nil,
-         nil,
-         nil,
-         nil
-       ),
-       CallNode(12...15)(nil, nil, (12...15), nil, nil, nil, nil, 2, "foo"),
-       StatementsNode(17...23)(
-         [CallNode(17...23)(
-            nil,
-            nil,
-            (17...18),
-            nil,
-            ArgumentsNode(19...23)(
-              [LocalVariableReadNode(19...20)(:a, 0),
-               LocalVariableReadNode(22...23)(:b, 0)]
-            ),
-            nil,
-            nil,
-            0,
-            "p"
-          )]
-       ),
-       (0...3),
-       (9...11),
-       nil,
-       (25...28)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/whitequark/forward_arg.txt b/test/yarp/snapshots/whitequark/forward_arg.txt
deleted file mode 100644
index 449db10831ea72..00000000000000
--- a/test/yarp/snapshots/whitequark/forward_arg.txt
+++ /dev/null
@@ -1,38 +0,0 @@
-ProgramNode(0...27)(
-  [],
-  StatementsNode(0...27)(
-    [DefNode(0...27)(
-       (4...7),
-       nil,
-       ParametersNode(8...11)(
-         [],
-         [],
-         [],
-         nil,
-         [],
-         ForwardingParameterNode(8...11)(),
-         nil
-       ),
-       StatementsNode(14...22)(
-         [CallNode(14...22)(
-            nil,
-            nil,
-            (14...17),
-            (17...18),
-            ArgumentsNode(18...21)([ForwardingArgumentsNode(18...21)()]),
-            (21...22),
-            nil,
-            0,
-            "bar"
-          )]
-       ),
-       [:"..."],
-       (0...3),
-       nil,
-       (7...8),
-       (11...12),
-       nil,
-       (24...27)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/whitequark/forward_arg_with_open_args.txt b/test/yarp/snapshots/whitequark/forward_arg_with_open_args.txt
deleted file mode 100644
index 55352e9d70ca24..00000000000000
--- a/test/yarp/snapshots/whitequark/forward_arg_with_open_args.txt
+++ /dev/null
@@ -1,338 +0,0 @@
-ProgramNode(0...292)(
-  [],
-  StatementsNode(0...292)(
-    [ParenthesesNode(0...28)(
-       StatementsNode(1...27)(
-         [DefNode(1...27)(
-            (5...8),
-            nil,
-            ParametersNode(9...12)(
-              [],
-              [],
-              [],
-              nil,
-              [],
-              ForwardingParameterNode(9...12)(),
-              nil
-            ),
-            StatementsNode(15...23)(
-              [CallNode(15...23)(
-                 nil,
-                 nil,
-                 (15...18),
-                 (18...19),
-                 ArgumentsNode(19...22)([ForwardingArgumentsNode(19...22)()]),
-                 (22...23),
-                 nil,
-                 0,
-                 "bar"
-               )]
-            ),
-            [:"..."],
-            (1...4),
-            nil,
-            nil,
-            nil,
-            nil,
-            (24...27)
-          )]
-       ),
-       (0...1),
-       (27...28)
-     ),
-     ParenthesesNode(30...58)(
-       StatementsNode(31...57)(
-         [DefNode(31...57)(
-            (35...38),
-            nil,
-            ParametersNode(39...42)(
-              [],
-              [],
-              [],
-              nil,
-              [],
-              ForwardingParameterNode(39...42)(),
-              nil
-            ),
-            StatementsNode(44...52)(
-              [CallNode(44...52)(
-                 nil,
-                 nil,
-                 (44...47),
-                 (47...48),
-                 ArgumentsNode(48...51)([ForwardingArgumentsNode(48...51)()]),
-                 (51...52),
-                 nil,
-                 0,
-                 "bar"
-               )]
-            ),
-            [:"..."],
-            (31...34),
-            nil,
-            nil,
-            nil,
-            nil,
-            (54...57)
-          )]
-       ),
-       (30...31),
-       (57...58)
-     ),
-     DefNode(60...75)(
-       (64...67),
-       nil,
-       ParametersNode(68...71)(
-         [],
-         [],
-         [],
-         nil,
-         [],
-         ForwardingParameterNode(68...71)(),
-         nil
-       ),
-       nil,
-       [:"..."],
-       (60...63),
-       nil,
-       nil,
-       nil,
-       nil,
-       (72...75)
-     ),
-     DefNode(77...103)(
-       (81...84),
-       nil,
-       ParametersNode(85...88)(
-         [],
-         [],
-         [],
-         nil,
-         [],
-         ForwardingParameterNode(85...88)(),
-         nil
-       ),
-       StatementsNode(90...98)(
-         [CallNode(90...98)(
-            nil,
-            nil,
-            (90...93),
-            (93...94),
-            ArgumentsNode(94...97)([ForwardingArgumentsNode(94...97)()]),
-            (97...98),
-            nil,
-            0,
-            "bar"
-          )]
-       ),
-       [:"..."],
-       (77...80),
-       nil,
-       nil,
-       nil,
-       nil,
-       (100...103)
-     ),
-     DefNode(105...134)(
-       (109...112),
-       nil,
-       ParametersNode(113...119)(
-         [RequiredParameterNode(113...114)(:a)],
-         [],
-         [],
-         nil,
-         [],
-         ForwardingParameterNode(116...119)(),
-         nil
-       ),
-       StatementsNode(122...130)(
-         [CallNode(122...130)(
-            nil,
-            nil,
-            (122...125),
-            (125...126),
-            ArgumentsNode(126...129)([ForwardingArgumentsNode(126...129)()]),
-            (129...130),
-            nil,
-            0,
-            "bar"
-          )]
-       ),
-       [:a, :"..."],
-       (105...108),
-       nil,
-       nil,
-       nil,
-       nil,
-       (131...134)
-     ),
-     DefNode(136...165)(
-       (140...143),
-       nil,
-       ParametersNode(144...150)(
-         [RequiredParameterNode(144...145)(:a)],
-         [],
-         [],
-         nil,
-         [],
-         ForwardingParameterNode(147...150)(),
-         nil
-       ),
-       StatementsNode(152...160)(
-         [CallNode(152...160)(
-            nil,
-            nil,
-            (152...155),
-            (155...156),
-            ArgumentsNode(156...159)([ForwardingArgumentsNode(156...159)()]),
-            (159...160),
-            nil,
-            0,
-            "bar"
-          )]
-       ),
-       [:a, :"..."],
-       (136...139),
-       nil,
-       nil,
-       nil,
-       nil,
-       (162...165)
-     ),
-     DefNode(167...192)(
-       (171...174),
-       nil,
-       ParametersNode(175...188)(
-         [RequiredParameterNode(175...176)(:a)],
-         [OptionalParameterNode(178...183)(
-            :b,
-            (178...179),
-            (180...181),
-            IntegerNode(182...183)()
-          )],
-         [],
-         nil,
-         [],
-         ForwardingParameterNode(185...188)(),
-         nil
-       ),
-       nil,
-       [:a, :b, :"..."],
-       (167...170),
-       nil,
-       nil,
-       nil,
-       nil,
-       (189...192)
-     ),
-     DefNode(194...227)(
-       (198...201),
-       nil,
-       ParametersNode(202...212)(
-         [],
-         [OptionalParameterNode(202...207)(
-            :b,
-            (202...203),
-            (204...205),
-            IntegerNode(206...207)()
-          )],
-         [],
-         nil,
-         [],
-         ForwardingParameterNode(209...212)(),
-         nil
-       ),
-       StatementsNode(215...223)(
-         [CallNode(215...223)(
-            nil,
-            nil,
-            (215...218),
-            (218...219),
-            ArgumentsNode(219...222)([ForwardingArgumentsNode(219...222)()]),
-            (222...223),
-            nil,
-            0,
-            "bar"
-          )]
-       ),
-       [:b, :"..."],
-       (194...197),
-       nil,
-       nil,
-       nil,
-       nil,
-       (224...227)
-     ),
-     DefNode(229...262)(
-       (233...236),
-       nil,
-       ParametersNode(237...247)(
-         [],
-         [OptionalParameterNode(237...242)(
-            :b,
-            (237...238),
-            (239...240),
-            IntegerNode(241...242)()
-          )],
-         [],
-         nil,
-         [],
-         ForwardingParameterNode(244...247)(),
-         nil
-       ),
-       StatementsNode(249...257)(
-         [CallNode(249...257)(
-            nil,
-            nil,
-            (249...252),
-            (252...253),
-            ArgumentsNode(253...256)([ForwardingArgumentsNode(253...256)()]),
-            (256...257),
-            nil,
-            0,
-            "bar"
-          )]
-       ),
-       [:b, :"..."],
-       (229...232),
-       nil,
-       nil,
-       nil,
-       nil,
-       (259...262)
-     ),
-     DefNode(264...292)(
-       (268...271),
-       nil,
-       ParametersNode(272...278)(
-         [RequiredParameterNode(272...273)(:a)],
-         [],
-         [],
-         nil,
-         [],
-         ForwardingParameterNode(275...278)(),
-         nil
-       ),
-       StatementsNode(280...288)(
-         [CallNode(280...288)(
-            nil,
-            nil,
-            (280...283),
-            (283...284),
-            ArgumentsNode(284...287)([ForwardingArgumentsNode(284...287)()]),
-            (287...288),
-            nil,
-            0,
-            "bar"
-          )]
-       ),
-       [:a, :"..."],
-       (264...267),
-       nil,
-       (271...272),
-       (278...279),
-       nil,
-       (289...292)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/whitequark/forward_args_legacy.txt b/test/yarp/snapshots/whitequark/forward_args_legacy.txt
deleted file mode 100644
index eeaf4f1d537c89..00000000000000
--- a/test/yarp/snapshots/whitequark/forward_args_legacy.txt
+++ /dev/null
@@ -1,88 +0,0 @@
-ProgramNode(0...77)(
-  [],
-  StatementsNode(0...77)(
-    [DefNode(0...27)(
-       (4...7),
-       nil,
-       ParametersNode(8...11)(
-         [],
-         [],
-         [],
-         nil,
-         [],
-         ForwardingParameterNode(8...11)(),
-         nil
-       ),
-       StatementsNode(14...22)(
-         [CallNode(14...22)(
-            nil,
-            nil,
-            (14...17),
-            (17...18),
-            ArgumentsNode(18...21)([ForwardingArgumentsNode(18...21)()]),
-            (21...22),
-            nil,
-            0,
-            "bar"
-          )]
-       ),
-       [:"..."],
-       (0...3),
-       nil,
-       (7...8),
-       (11...12),
-       nil,
-       (24...27)
-     ),
-     DefNode(29...46)(
-       (33...36),
-       nil,
-       ParametersNode(37...40)(
-         [],
-         [],
-         [],
-         nil,
-         [],
-         ForwardingParameterNode(37...40)(),
-         nil
-       ),
-       nil,
-       [:"..."],
-       (29...32),
-       nil,
-       (36...37),
-       (40...41),
-       nil,
-       (43...46)
-     ),
-     DefNode(48...77)(
-       (52...55),
-       nil,
-       ParametersNode(56...59)(
-         [],
-         [],
-         [],
-         nil,
-         [],
-         ForwardingParameterNode(56...59)(),
-         nil
-       ),
-       StatementsNode(62...72)(
-         [SuperNode(62...72)(
-            (62...67),
-            (67...68),
-            ArgumentsNode(68...71)([ForwardingArgumentsNode(68...71)()]),
-            (71...72),
-            nil
-          )]
-       ),
-       [:"..."],
-       (48...51),
-       nil,
-       (55...56),
-       (59...60),
-       nil,
-       (74...77)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/whitequark/forwarded_argument_with_kwrestarg.txt b/test/yarp/snapshots/whitequark/forwarded_argument_with_kwrestarg.txt
deleted file mode 100644
index a751f923c117be..00000000000000
--- a/test/yarp/snapshots/whitequark/forwarded_argument_with_kwrestarg.txt
+++ /dev/null
@@ -1,43 +0,0 @@
-ProgramNode(0...45)(
-  [],
-  StatementsNode(0...45)(
-    [DefNode(0...45)(
-       (4...7),
-       nil,
-       ParametersNode(8...20)(
-         [RequiredParameterNode(8...16)(:argument)],
-         [],
-         [],
-         nil,
-         [],
-         KeywordRestParameterNode(18...20)((18...20), nil),
-         nil
-       ),
-       StatementsNode(23...40)(
-         [CallNode(23...40)(
-            nil,
-            nil,
-            (23...26),
-            (26...27),
-            ArgumentsNode(27...39)(
-              [LocalVariableReadNode(27...35)(:argument, 0),
-               KeywordHashNode(37...39)(
-                 [AssocSplatNode(37...39)(nil, (37...39))]
-               )]
-            ),
-            (39...40),
-            nil,
-            0,
-            "bar"
-          )]
-       ),
-       [:argument, :**],
-       (0...3),
-       nil,
-       (7...8),
-       (20...21),
-       nil,
-       (42...45)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/whitequark/forwarded_argument_with_restarg.txt b/test/yarp/snapshots/whitequark/forwarded_argument_with_restarg.txt
deleted file mode 100644
index ff0602c3982005..00000000000000
--- a/test/yarp/snapshots/whitequark/forwarded_argument_with_restarg.txt
+++ /dev/null
@@ -1,41 +0,0 @@
-ProgramNode(0...43)(
-  [],
-  StatementsNode(0...43)(
-    [DefNode(0...43)(
-       (4...7),
-       nil,
-       ParametersNode(8...19)(
-         [RequiredParameterNode(8...16)(:argument)],
-         [],
-         [],
-         RestParameterNode(18...19)((18...19), nil),
-         [],
-         nil,
-         nil
-       ),
-       StatementsNode(22...38)(
-         [CallNode(22...38)(
-            nil,
-            nil,
-            (22...25),
-            (25...26),
-            ArgumentsNode(26...37)(
-              [LocalVariableReadNode(26...34)(:argument, 0),
-               SplatNode(36...37)((36...37), nil)]
-            ),
-            (37...38),
-            nil,
-            0,
-            "bar"
-          )]
-       ),
-       [:argument, :*],
-       (0...3),
-       nil,
-       (7...8),
-       (19...20),
-       nil,
-       (40...43)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/whitequark/forwarded_kwrestarg.txt b/test/yarp/snapshots/whitequark/forwarded_kwrestarg.txt
deleted file mode 100644
index 0fcac6a2985d97..00000000000000
--- a/test/yarp/snapshots/whitequark/forwarded_kwrestarg.txt
+++ /dev/null
@@ -1,42 +0,0 @@
-ProgramNode(0...25)(
-  [],
-  StatementsNode(0...25)(
-    [DefNode(0...25)(
-       (4...7),
-       nil,
-       ParametersNode(8...10)(
-         [],
-         [],
-         [],
-         nil,
-         [],
-         KeywordRestParameterNode(8...10)((8...10), nil),
-         nil
-       ),
-       StatementsNode(13...20)(
-         [CallNode(13...20)(
-            nil,
-            nil,
-            (13...16),
-            (16...17),
-            ArgumentsNode(17...19)(
-              [KeywordHashNode(17...19)(
-                 [AssocSplatNode(17...19)(nil, (17...19))]
-               )]
-            ),
-            (19...20),
-            nil,
-            0,
-            "bar"
-          )]
-       ),
-       [:**],
-       (0...3),
-       nil,
-       (7...8),
-       (10...11),
-       nil,
-       (22...25)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/whitequark/forwarded_kwrestarg_with_additional_kwarg.txt b/test/yarp/snapshots/whitequark/forwarded_kwrestarg_with_additional_kwarg.txt
deleted file mode 100644
index 65f75e723a1793..00000000000000
--- a/test/yarp/snapshots/whitequark/forwarded_kwrestarg_with_additional_kwarg.txt
+++ /dev/null
@@ -1,47 +0,0 @@
-ProgramNode(0...41)(
-  [],
-  StatementsNode(0...41)(
-    [DefNode(0...41)(
-       (4...7),
-       nil,
-       ParametersNode(8...10)(
-         [],
-         [],
-         [],
-         nil,
-         [],
-         KeywordRestParameterNode(8...10)((8...10), nil),
-         nil
-       ),
-       StatementsNode(13...36)(
-         [CallNode(13...36)(
-            nil,
-            nil,
-            (13...16),
-            (16...17),
-            ArgumentsNode(17...35)(
-              [KeywordHashNode(17...35)(
-                 [AssocSplatNode(17...19)(nil, (17...19)),
-                  AssocNode(21...35)(
-                    SymbolNode(21...30)(nil, (21...29), (29...30), "from_foo"),
-                    TrueNode(31...35)(),
-                    nil
-                  )]
-               )]
-            ),
-            (35...36),
-            nil,
-            0,
-            "bar"
-          )]
-       ),
-       [:**],
-       (0...3),
-       nil,
-       (7...8),
-       (10...11),
-       nil,
-       (38...41)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/whitequark/forwarded_restarg.txt b/test/yarp/snapshots/whitequark/forwarded_restarg.txt
deleted file mode 100644
index d45b60fc0a348b..00000000000000
--- a/test/yarp/snapshots/whitequark/forwarded_restarg.txt
+++ /dev/null
@@ -1,38 +0,0 @@
-ProgramNode(0...23)(
-  [],
-  StatementsNode(0...23)(
-    [DefNode(0...23)(
-       (4...7),
-       nil,
-       ParametersNode(8...9)(
-         [],
-         [],
-         [],
-         RestParameterNode(8...9)((8...9), nil),
-         [],
-         nil,
-         nil
-       ),
-       StatementsNode(12...18)(
-         [CallNode(12...18)(
-            nil,
-            nil,
-            (12...15),
-            (15...16),
-            ArgumentsNode(16...17)([SplatNode(16...17)((16...17), nil)]),
-            (17...18),
-            nil,
-            0,
-            "bar"
-          )]
-       ),
-       [:*],
-       (0...3),
-       nil,
-       (7...8),
-       (9...10),
-       nil,
-       (20...23)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/whitequark/gvar.txt b/test/yarp/snapshots/whitequark/gvar.txt
deleted file mode 100644
index dbc16e65d8409f..00000000000000
--- a/test/yarp/snapshots/whitequark/gvar.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-ProgramNode(0...4)(
-  [],
-  StatementsNode(0...4)([GlobalVariableReadNode(0...4)(:$foo)])
-)
diff --git a/test/yarp/snapshots/whitequark/gvasgn.txt b/test/yarp/snapshots/whitequark/gvasgn.txt
deleted file mode 100644
index b416ac55abb545..00000000000000
--- a/test/yarp/snapshots/whitequark/gvasgn.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-ProgramNode(0...9)(
-  [],
-  StatementsNode(0...9)(
-    [GlobalVariableWriteNode(0...9)(
-       :$var,
-       (0...4),
-       IntegerNode(7...9)(),
-       (5...6)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/whitequark/hash_empty.txt b/test/yarp/snapshots/whitequark/hash_empty.txt
deleted file mode 100644
index b06b9d299bdf09..00000000000000
--- a/test/yarp/snapshots/whitequark/hash_empty.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-ProgramNode(0...3)(
-  [],
-  StatementsNode(0...3)([HashNode(0...3)((0...1), [], (2...3))])
-)
diff --git a/test/yarp/snapshots/whitequark/hash_hashrocket.txt b/test/yarp/snapshots/whitequark/hash_hashrocket.txt
deleted file mode 100644
index 9b96268c015f94..00000000000000
--- a/test/yarp/snapshots/whitequark/hash_hashrocket.txt
+++ /dev/null
@@ -1,24 +0,0 @@
-ProgramNode(0...37)(
-  [],
-  StatementsNode(0...37)(
-    [HashNode(0...10)(
-       (0...1),
-       [AssocNode(2...8)(IntegerNode(2...3)(), IntegerNode(7...8)(), (4...6))],
-       (9...10)
-     ),
-     HashNode(12...37)(
-       (12...13),
-       [AssocNode(14...20)(
-          IntegerNode(14...15)(),
-          IntegerNode(19...20)(),
-          (16...18)
-        ),
-        AssocNode(22...35)(
-          SymbolNode(22...26)((22...23), (23...26), nil, "foo"),
-          StringNode(30...35)((30...31), (31...34), (34...35), "bar"),
-          (27...29)
-        )],
-       (36...37)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/whitequark/hash_kwsplat.txt b/test/yarp/snapshots/whitequark/hash_kwsplat.txt
deleted file mode 100644
index bb56b81800b047..00000000000000
--- a/test/yarp/snapshots/whitequark/hash_kwsplat.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-ProgramNode(0...17)(
-  [],
-  StatementsNode(0...17)(
-    [HashNode(0...17)(
-       (0...1),
-       [AssocNode(2...8)(
-          SymbolNode(2...6)(nil, (2...5), (5...6), "foo"),
-          IntegerNode(7...8)(),
-          nil
-        ),
-        AssocSplatNode(10...15)(
-          CallNode(12...15)(nil, nil, (12...15), nil, nil, nil, nil, 2, "bar"),
-          (10...12)
-        )],
-       (16...17)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/whitequark/hash_label.txt b/test/yarp/snapshots/whitequark/hash_label.txt
deleted file mode 100644
index cfebb4b70c04a9..00000000000000
--- a/test/yarp/snapshots/whitequark/hash_label.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-ProgramNode(0...10)(
-  [],
-  StatementsNode(0...10)(
-    [HashNode(0...10)(
-       (0...1),
-       [AssocNode(2...8)(
-          SymbolNode(2...6)(nil, (2...5), (5...6), "foo"),
-          IntegerNode(7...8)(),
-          nil
-        )],
-       (9...10)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/whitequark/hash_label_end.txt b/test/yarp/snapshots/whitequark/hash_label_end.txt
deleted file mode 100644
index b5d4273d5ba625..00000000000000
--- a/test/yarp/snapshots/whitequark/hash_label_end.txt
+++ /dev/null
@@ -1,53 +0,0 @@
-ProgramNode(0...50)(
-  [],
-  StatementsNode(0...50)(
-    [CallNode(0...12)(
-       nil,
-       nil,
-       (0...1),
-       (1...2),
-       ArgumentsNode(2...11)(
-         [IfNode(2...11)(
-            nil,
-            CallNode(2...3)(nil, nil, (2...3), nil, nil, nil, nil, 2, "a"),
-            StatementsNode(6...9)(
-              [StringNode(6...9)((6...7), (7...8), (8...9), "a")]
-            ),
-            ElseNode(9...11)(
-              (9...10),
-              StatementsNode(10...11)([IntegerNode(10...11)()]),
-              nil
-            ),
-            nil
-          )]
-       ),
-       (11...12),
-       nil,
-       0,
-       "f"
-     ),
-     HashNode(14...26)(
-       (14...15),
-       [AssocNode(16...24)(
-          SymbolNode(16...22)((16...17), (17...20), (20...22), "foo"),
-          IntegerNode(23...24)(),
-          nil
-        )],
-       (25...26)
-     ),
-     HashNode(28...50)(
-       (28...29),
-       [AssocNode(30...38)(
-          SymbolNode(30...36)((30...31), (31...34), (34...36), "foo"),
-          IntegerNode(37...38)(),
-          nil
-        ),
-        AssocNode(40...49)(
-          SymbolNode(40...46)((40...41), (41...44), (44...46), "bar"),
-          HashNode(47...49)((47...48), [], (48...49)),
-          nil
-        )],
-       (49...50)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/whitequark/hash_pair_value_omission.txt b/test/yarp/snapshots/whitequark/hash_pair_value_omission.txt
deleted file mode 100644
index 825fe1beaabc61..00000000000000
--- a/test/yarp/snapshots/whitequark/hash_pair_value_omission.txt
+++ /dev/null
@@ -1,37 +0,0 @@
-ProgramNode(0...25)(
-  [],
-  StatementsNode(0...25)(
-    [HashNode(0...6)(
-       (0...1),
-       [AssocNode(1...5)(
-          SymbolNode(1...5)(nil, (1...4), (4...5), "BAR"),
-          nil,
-          nil
-        )],
-       (5...6)
-     ),
-     HashNode(8...16)(
-       (8...9),
-       [AssocNode(9...11)(
-          SymbolNode(9...11)(nil, (9...10), (10...11), "a"),
-          nil,
-          nil
-        ),
-        AssocNode(13...15)(
-          SymbolNode(13...15)(nil, (13...14), (14...15), "b"),
-          nil,
-          nil
-        )],
-       (15...16)
-     ),
-     HashNode(18...25)(
-       (18...19),
-       [AssocNode(19...24)(
-          SymbolNode(19...24)(nil, (19...23), (23...24), "puts"),
-          nil,
-          nil
-        )],
-       (24...25)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/whitequark/heredoc.txt b/test/yarp/snapshots/whitequark/heredoc.txt
deleted file mode 100644
index c61829ebd4eca1..00000000000000
--- a/test/yarp/snapshots/whitequark/heredoc.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-ProgramNode(0...52)(
-  [],
-  StatementsNode(0...52)(
-    [InterpolatedStringNode(0...8)(
-       (0...8),
-       [StringNode(9...17)(nil, (9...17), nil, "foo\n" + "bar\n")],
-       (17...22)
-     ),
-     InterpolatedStringNode(23...29)(
-       (23...29),
-       [StringNode(30...38)(nil, (30...38), nil, "foo\n" + "bar\n")],
-       (38...43)
-     ),
-     InterpolatedXStringNode(44...52)(
-       (44...52),
-       [StringNode(53...61)(nil, (53...61), nil, "foo\n" + "bar\n")],
-       (61...66)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/whitequark/if.txt b/test/yarp/snapshots/whitequark/if.txt
deleted file mode 100644
index 069eb07f25344a..00000000000000
--- a/test/yarp/snapshots/whitequark/if.txt
+++ /dev/null
@@ -1,23 +0,0 @@
-ProgramNode(0...38)(
-  [],
-  StatementsNode(0...38)(
-    [IfNode(0...20)(
-       (0...2),
-       CallNode(3...6)(nil, nil, (3...6), nil, nil, nil, nil, 2, "foo"),
-       StatementsNode(12...15)(
-         [CallNode(12...15)(nil, nil, (12...15), nil, nil, nil, nil, 2, "bar")]
-       ),
-       nil,
-       (17...20)
-     ),
-     IfNode(22...38)(
-       (22...24),
-       CallNode(25...28)(nil, nil, (25...28), nil, nil, nil, nil, 2, "foo"),
-       StatementsNode(30...33)(
-         [CallNode(30...33)(nil, nil, (30...33), nil, nil, nil, nil, 2, "bar")]
-       ),
-       nil,
-       (35...38)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/whitequark/if_else.txt b/test/yarp/snapshots/whitequark/if_else.txt
deleted file mode 100644
index d8799a330c5284..00000000000000
--- a/test/yarp/snapshots/whitequark/if_else.txt
+++ /dev/null
@@ -1,55 +0,0 @@
-ProgramNode(0...58)(
-  [],
-  StatementsNode(0...58)(
-    [IfNode(0...30)(
-       (0...2),
-       CallNode(3...6)(nil, nil, (3...6), nil, nil, nil, nil, 2, "foo"),
-       StatementsNode(12...15)(
-         [CallNode(12...15)(nil, nil, (12...15), nil, nil, nil, nil, 2, "bar")]
-       ),
-       ElseNode(17...30)(
-         (17...21),
-         StatementsNode(22...25)(
-           [CallNode(22...25)(
-              nil,
-              nil,
-              (22...25),
-              nil,
-              nil,
-              nil,
-              nil,
-              2,
-              "baz"
-            )]
-         ),
-         (27...30)
-       ),
-       (27...30)
-     ),
-     IfNode(32...58)(
-       (32...34),
-       CallNode(35...38)(nil, nil, (35...38), nil, nil, nil, nil, 2, "foo"),
-       StatementsNode(40...43)(
-         [CallNode(40...43)(nil, nil, (40...43), nil, nil, nil, nil, 2, "bar")]
-       ),
-       ElseNode(45...58)(
-         (45...49),
-         StatementsNode(50...53)(
-           [CallNode(50...53)(
-              nil,
-              nil,
-              (50...53),
-              nil,
-              nil,
-              nil,
-              nil,
-              2,
-              "baz"
-            )]
-         ),
-         (55...58)
-       ),
-       (55...58)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/whitequark/if_elsif.txt b/test/yarp/snapshots/whitequark/if_elsif.txt
deleted file mode 100644
index 953d565bf62898..00000000000000
--- a/test/yarp/snapshots/whitequark/if_elsif.txt
+++ /dev/null
@@ -1,24 +0,0 @@
-ProgramNode(0...38)(
-  [],
-  StatementsNode(0...38)(
-    [IfNode(0...38)(
-       (0...2),
-       CallNode(3...6)(nil, nil, (3...6), nil, nil, nil, nil, 2, "foo"),
-       StatementsNode(8...11)(
-         [CallNode(8...11)(nil, nil, (8...11), nil, nil, nil, nil, 2, "bar")]
-       ),
-       IfNode(13...38)(
-         (13...18),
-         CallNode(19...22)(nil, nil, (19...22), nil, nil, nil, nil, 2, "baz"),
-         StatementsNode(24...25)([IntegerNode(24...25)()]),
-         ElseNode(27...38)(
-           (27...31),
-           StatementsNode(32...33)([IntegerNode(32...33)()]),
-           (35...38)
-         ),
-         (35...38)
-       ),
-       (35...38)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/whitequark/if_masgn__24.txt b/test/yarp/snapshots/whitequark/if_masgn__24.txt
deleted file mode 100644
index 24c9ef784ddc58..00000000000000
--- a/test/yarp/snapshots/whitequark/if_masgn__24.txt
+++ /dev/null
@@ -1,35 +0,0 @@
-ProgramNode(0...20)(
-  [:a, :b],
-  StatementsNode(0...20)(
-    [IfNode(0...20)(
-       (0...2),
-       ParenthesesNode(3...15)(
-         StatementsNode(4...14)(
-           [MultiWriteNode(4...14)(
-              [LocalVariableTargetNode(4...5)(:a, 0),
-               LocalVariableTargetNode(7...8)(:b, 0)],
-              (9...10),
-              CallNode(11...14)(
-                nil,
-                nil,
-                (11...14),
-                nil,
-                nil,
-                nil,
-                nil,
-                2,
-                "foo"
-              ),
-              nil,
-              nil
-            )]
-         ),
-         (3...4),
-         (14...15)
-       ),
-       nil,
-       nil,
-       (17...20)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/whitequark/if_mod.txt b/test/yarp/snapshots/whitequark/if_mod.txt
deleted file mode 100644
index 9a6575b5d1d9b2..00000000000000
--- a/test/yarp/snapshots/whitequark/if_mod.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-ProgramNode(0...10)(
-  [],
-  StatementsNode(0...10)(
-    [IfNode(0...10)(
-       (4...6),
-       CallNode(7...10)(nil, nil, (7...10), nil, nil, nil, nil, 2, "foo"),
-       StatementsNode(0...3)(
-         [CallNode(0...3)(nil, nil, (0...3), nil, nil, nil, nil, 2, "bar")]
-       ),
-       nil,
-       nil
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/whitequark/if_nl_then.txt b/test/yarp/snapshots/whitequark/if_nl_then.txt
deleted file mode 100644
index db1b5231ef21fc..00000000000000
--- a/test/yarp/snapshots/whitequark/if_nl_then.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-ProgramNode(0...19)(
-  [],
-  StatementsNode(0...19)(
-    [IfNode(0...19)(
-       (0...2),
-       CallNode(3...6)(nil, nil, (3...6), nil, nil, nil, nil, 2, "foo"),
-       StatementsNode(12...15)(
-         [CallNode(12...15)(nil, nil, (12...15), nil, nil, nil, nil, 2, "bar")]
-       ),
-       nil,
-       (16...19)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/whitequark/if_while_after_class__since_32.txt b/test/yarp/snapshots/whitequark/if_while_after_class__since_32.txt
deleted file mode 100644
index c18c1b4e9a4a9e..00000000000000
--- a/test/yarp/snapshots/whitequark/if_while_after_class__since_32.txt
+++ /dev/null
@@ -1,97 +0,0 @@
-ProgramNode(0...178)(
-  [],
-  StatementsNode(0...178)(
-    [ClassNode(0...38)(
-       [],
-       (0...5),
-       ConstantPathNode(6...33)(
-         IfNode(6...25)(
-           (6...8),
-           TrueNode(9...13)(),
-           StatementsNode(15...21)([ConstantReadNode(15...21)(:Object)]),
-           nil,
-           (22...25)
-         ),
-         ConstantReadNode(27...33)(:Kernel),
-         (25...27)
-       ),
-       nil,
-       nil,
-       nil,
-       (35...38),
-       :Kernel,
-       :Kernel
-     ),
-     ClassNode(40...87)(
-       [],
-       (40...45),
-       ConstantPathNode(46...82)(
-         WhileNode(46...74)(
-           (46...51),
-           (71...74),
-           TrueNode(52...56)(),
-           StatementsNode(58...70)(
-             [BreakNode(58...70)(
-                ArgumentsNode(64...70)([ConstantReadNode(64...70)(:Object)]),
-                (58...63)
-              )]
-           ),
-           0
-         ),
-         ConstantReadNode(76...82)(:Kernel),
-         (74...76)
-       ),
-       nil,
-       nil,
-       nil,
-       (84...87),
-       :Kernel,
-       :Kernel
-     ),
-     ModuleNode(89...128)(
-       [],
-       (89...95),
-       ConstantPathNode(96...123)(
-         IfNode(96...115)(
-           (96...98),
-           TrueNode(99...103)(),
-           StatementsNode(105...111)([ConstantReadNode(105...111)(:Object)]),
-           nil,
-           (112...115)
-         ),
-         ConstantReadNode(117...123)(:Kernel),
-         (115...117)
-       ),
-       nil,
-       (125...128),
-       :Kernel,
-       :Kernel
-     ),
-     ModuleNode(130...178)(
-       [],
-       (130...136),
-       ConstantPathNode(137...173)(
-         WhileNode(137...165)(
-           (137...142),
-           (162...165),
-           TrueNode(143...147)(),
-           StatementsNode(149...161)(
-             [BreakNode(149...161)(
-                ArgumentsNode(155...161)(
-                  [ConstantReadNode(155...161)(:Object)]
-                ),
-                (149...154)
-              )]
-           ),
-           0
-         ),
-         ConstantReadNode(167...173)(:Kernel),
-         (165...167)
-       ),
-       nil,
-       (175...178),
-       :Kernel,
-       :Kernel
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/whitequark/int.txt b/test/yarp/snapshots/whitequark/int.txt
deleted file mode 100644
index a99820ad33b395..00000000000000
--- a/test/yarp/snapshots/whitequark/int.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-ProgramNode(0...12)(
-  [],
-  StatementsNode(0...12)(
-    [IntegerNode(0...3)(), IntegerNode(5...8)(), IntegerNode(10...12)()]
-  )
-)
diff --git a/test/yarp/snapshots/whitequark/int___LINE__.txt b/test/yarp/snapshots/whitequark/int___LINE__.txt
deleted file mode 100644
index 0f6e7aa884b629..00000000000000
--- a/test/yarp/snapshots/whitequark/int___LINE__.txt
+++ /dev/null
@@ -1 +0,0 @@
-ProgramNode(0...8)([], StatementsNode(0...8)([SourceLineNode(0...8)()]))
diff --git a/test/yarp/snapshots/whitequark/interp_digit_var.txt b/test/yarp/snapshots/whitequark/interp_digit_var.txt
deleted file mode 100644
index 48d7ac96716907..00000000000000
--- a/test/yarp/snapshots/whitequark/interp_digit_var.txt
+++ /dev/null
@@ -1,123 +0,0 @@
-ProgramNode(1...465)(
-  [],
-  StatementsNode(1...465)(
-    [StringNode(1...6)((1...2), (2...5), (5...6), "\#@1"),
-     StringNode(10...16)((10...11), (11...15), (15...16), "\#@@1"),
-     ArrayNode(20...27)(
-       [SymbolNode(23...26)(nil, (23...26), nil, "\#@1")],
-       (20...23),
-       (26...27)
-     ),
-     ArrayNode(31...39)(
-       [SymbolNode(34...38)(nil, (34...38), nil, "\#@@1")],
-       (31...34),
-       (38...39)
-     ),
-     StringNode(43...50)((43...46), (46...49), (49...50), "\#@1"),
-     StringNode(54...62)((54...57), (57...61), (61...62), "\#@@1"),
-     ArrayNode(66...73)(
-       [StringNode(69...72)(nil, (69...72), nil, "\#@1")],
-       (66...69),
-       (72...73)
-     ),
-     ArrayNode(77...85)(
-       [StringNode(80...84)(nil, (80...84), nil, "\#@@1")],
-       (77...80),
-       (84...85)
-     ),
-     ArrayNode(89...98)(
-       [SymbolNode(93...96)(nil, (93...96), nil, "\#@1")],
-       (89...92),
-       (97...98)
-     ),
-     ArrayNode(102...112)(
-       [SymbolNode(106...110)(nil, (106...110), nil, "\#@@1")],
-       (102...105),
-       (111...112)
-     ),
-     StringNode(116...123)((116...119), (119...122), (122...123), "\#@1"),
-     StringNode(127...135)((127...130), (130...134), (134...135), "\#@@1"),
-     RegularExpressionNode(139...146)(
-       (139...142),
-       (142...145),
-       (145...146),
-       "\#@1",
-       0
-     ),
-     RegularExpressionNode(150...158)(
-       (150...153),
-       (153...157),
-       (157...158),
-       "\#@@1",
-       0
-     ),
-     SymbolNode(162...169)((162...165), (165...168), (168...169), "\#@1"),
-     SymbolNode(173...181)((173...176), (176...180), (180...181), "\#@@1"),
-     ArrayNode(185...194)(
-       [StringNode(189...192)(nil, (189...192), nil, "\#@1")],
-       (185...188),
-       (193...194)
-     ),
-     ArrayNode(198...208)(
-       [StringNode(202...206)(nil, (202...206), nil, "\#@@1")],
-       (198...201),
-       (207...208)
-     ),
-     XStringNode(212...219)((212...215), (215...218), (218...219), "\#@1"),
-     XStringNode(223...231)((223...226), (226...230), (230...231), "\#@@1"),
-     StringNode(235...241)((235...237), (237...240), (240...241), "\#@1"),
-     StringNode(245...252)((245...247), (247...251), (251...252), "\#@@1"),
-     StringNode(256...261)((256...257), (257...260), (260...261), "\#@1"),
-     StringNode(265...271)((265...266), (266...270), (270...271), "\#@@1"),
-     RegularExpressionNode(275...280)(
-       (275...276),
-       (276...279),
-       (279...280),
-       "\#@1",
-       0
-     ),
-     RegularExpressionNode(284...290)(
-       (284...285),
-       (285...289),
-       (289...290),
-       "\#@@1",
-       0
-     ),
-     SymbolNode(294...300)((294...296), (296...299), (299...300), "\#@1"),
-     SymbolNode(304...311)((304...306), (306...310), (310...311), "\#@@1"),
-     SymbolNode(315...321)((315...317), (317...320), (320...321), "\#@1"),
-     SymbolNode(325...332)((325...327), (327...331), (331...332), "\#@@1"),
-     XStringNode(336...341)((336...337), (337...340), (340...341), "\#@1"),
-     XStringNode(345...351)((345...346), (346...350), (350...351), "\#@@1"),
-     InterpolatedStringNode(354...363)(
-       (354...363),
-       [StringNode(364...368)(nil, (364...368), nil, "\#@1\n")],
-       (368...373)
-     ),
-     InterpolatedStringNode(374...383)(
-       (374...383),
-       [StringNode(384...389)(nil, (384...389), nil, "\#@@1\n")],
-       (389...394)
-     ),
-     InterpolatedStringNode(395...404)(
-       (395...404),
-       [StringNode(405...409)(nil, (405...409), nil, "\#@1\n")],
-       (409...414)
-     ),
-     InterpolatedStringNode(415...424)(
-       (415...424),
-       [StringNode(425...430)(nil, (425...430), nil, "\#@@1\n")],
-       (430...435)
-     ),
-     InterpolatedXStringNode(436...445)(
-       (436...445),
-       [StringNode(446...450)(nil, (446...450), nil, "\#@1\n")],
-       (450...455)
-     ),
-     InterpolatedXStringNode(456...465)(
-       (456...465),
-       [StringNode(466...471)(nil, (466...471), nil, "\#@@1\n")],
-       (471...476)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/whitequark/ivar.txt b/test/yarp/snapshots/whitequark/ivar.txt
deleted file mode 100644
index ae2c8c34b48306..00000000000000
--- a/test/yarp/snapshots/whitequark/ivar.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-ProgramNode(0...4)(
-  [],
-  StatementsNode(0...4)([InstanceVariableReadNode(0...4)(:@foo)])
-)
diff --git a/test/yarp/snapshots/whitequark/ivasgn.txt b/test/yarp/snapshots/whitequark/ivasgn.txt
deleted file mode 100644
index 8e952de2465dd1..00000000000000
--- a/test/yarp/snapshots/whitequark/ivasgn.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-ProgramNode(0...9)(
-  [],
-  StatementsNode(0...9)(
-    [InstanceVariableWriteNode(0...9)(
-       :@var,
-       (0...4),
-       IntegerNode(7...9)(),
-       (5...6)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/whitequark/keyword_argument_omission.txt b/test/yarp/snapshots/whitequark/keyword_argument_omission.txt
deleted file mode 100644
index c1b3b8800dfac1..00000000000000
--- a/test/yarp/snapshots/whitequark/keyword_argument_omission.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-ProgramNode(0...11)(
-  [],
-  StatementsNode(0...11)(
-    [CallNode(0...11)(
-       nil,
-       nil,
-       (0...3),
-       (3...4),
-       ArgumentsNode(4...10)(
-         [KeywordHashNode(4...10)(
-            [AssocNode(4...6)(
-               SymbolNode(4...6)(nil, (4...5), (5...6), "a"),
-               nil,
-               nil
-             ),
-             AssocNode(8...10)(
-               SymbolNode(8...10)(nil, (8...9), (9...10), "b"),
-               nil,
-               nil
-             )]
-          )]
-       ),
-       (10...11),
-       nil,
-       0,
-       "foo"
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/whitequark/kwarg.txt b/test/yarp/snapshots/whitequark/kwarg.txt
deleted file mode 100644
index d096caece0c61c..00000000000000
--- a/test/yarp/snapshots/whitequark/kwarg.txt
+++ /dev/null
@@ -1,26 +0,0 @@
-ProgramNode(0...16)(
-  [],
-  StatementsNode(0...16)(
-    [DefNode(0...16)(
-       (4...5),
-       nil,
-       ParametersNode(6...10)(
-         [],
-         [],
-         [],
-         nil,
-         [KeywordParameterNode(6...10)((6...10), nil)],
-         nil,
-         nil
-       ),
-       nil,
-       [:foo],
-       (0...3),
-       nil,
-       (5...6),
-       (10...11),
-       nil,
-       (13...16)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/whitequark/kwbegin_compstmt.txt b/test/yarp/snapshots/whitequark/kwbegin_compstmt.txt
deleted file mode 100644
index 0d05407aad98e4..00000000000000
--- a/test/yarp/snapshots/whitequark/kwbegin_compstmt.txt
+++ /dev/null
@@ -1,26 +0,0 @@
-ProgramNode(0...20)(
-  [],
-  StatementsNode(0...20)(
-    [BeginNode(0...20)(
-       (0...5),
-       StatementsNode(6...16)(
-         [CallNode(6...10)(nil, nil, (6...10), nil, nil, nil, nil, 0, "foo!"),
-          CallNode(12...16)(
-            nil,
-            nil,
-            (12...16),
-            nil,
-            nil,
-            nil,
-            nil,
-            0,
-            "bar!"
-          )]
-       ),
-       nil,
-       nil,
-       nil,
-       (17...20)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/whitequark/kwnilarg.txt b/test/yarp/snapshots/whitequark/kwnilarg.txt
deleted file mode 100644
index 0995a597c26dfa..00000000000000
--- a/test/yarp/snapshots/whitequark/kwnilarg.txt
+++ /dev/null
@@ -1,77 +0,0 @@
-ProgramNode(0...46)(
-  [],
-  StatementsNode(0...46)(
-    [LambdaNode(0...12)(
-       [],
-       (0...2),
-       (10...11),
-       (11...12),
-       BlockParametersNode(2...9)(
-         ParametersNode(3...8)(
-           [],
-           [],
-           [],
-           nil,
-           [],
-           NoKeywordsParameterNode(3...8)((3...5), (5...8)),
-           nil
-         ),
-         [],
-         (2...3),
-         (8...9)
-       ),
-       nil
-     ),
-     DefNode(14...31)(
-       (18...19),
-       nil,
-       ParametersNode(20...25)(
-         [],
-         [],
-         [],
-         nil,
-         [],
-         NoKeywordsParameterNode(20...25)((20...22), (22...25)),
-         nil
-       ),
-       nil,
-       [],
-       (14...17),
-       nil,
-       (19...20),
-       (25...26),
-       nil,
-       (28...31)
-     ),
-     CallNode(33...46)(
-       nil,
-       nil,
-       (33...34),
-       nil,
-       nil,
-       nil,
-       BlockNode(35...46)(
-         [],
-         BlockParametersNode(37...44)(
-           ParametersNode(38...43)(
-             [],
-             [],
-             [],
-             nil,
-             [],
-             NoKeywordsParameterNode(38...43)((38...40), (40...43)),
-             nil
-           ),
-           [],
-           (37...38),
-           (43...44)
-         ),
-         nil,
-         (35...36),
-         (45...46)
-       ),
-       0,
-       "m"
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/whitequark/kwoptarg.txt b/test/yarp/snapshots/whitequark/kwoptarg.txt
deleted file mode 100644
index 9514567387d91f..00000000000000
--- a/test/yarp/snapshots/whitequark/kwoptarg.txt
+++ /dev/null
@@ -1,26 +0,0 @@
-ProgramNode(0...18)(
-  [],
-  StatementsNode(0...18)(
-    [DefNode(0...18)(
-       (4...5),
-       nil,
-       ParametersNode(6...12)(
-         [],
-         [],
-         [],
-         nil,
-         [KeywordParameterNode(6...12)((6...10), IntegerNode(11...12)())],
-         nil,
-         nil
-       ),
-       nil,
-       [:foo],
-       (0...3),
-       nil,
-       (5...6),
-       (12...13),
-       nil,
-       (15...18)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/whitequark/kwoptarg_with_kwrestarg_and_forwarded_args.txt b/test/yarp/snapshots/whitequark/kwoptarg_with_kwrestarg_and_forwarded_args.txt
deleted file mode 100644
index 14fd8da395164c..00000000000000
--- a/test/yarp/snapshots/whitequark/kwoptarg_with_kwrestarg_and_forwarded_args.txt
+++ /dev/null
@@ -1,42 +0,0 @@
-ProgramNode(0...28)(
-  [],
-  StatementsNode(0...28)(
-    [DefNode(0...28)(
-       (4...5),
-       nil,
-       ParametersNode(6...16)(
-         [],
-         [],
-         [],
-         nil,
-         [KeywordParameterNode(6...12)((6...8), NilNode(9...12)())],
-         KeywordRestParameterNode(14...16)((14...16), nil),
-         nil
-       ),
-       StatementsNode(19...24)(
-         [CallNode(19...24)(
-            nil,
-            nil,
-            (19...20),
-            (20...21),
-            ArgumentsNode(21...23)(
-              [KeywordHashNode(21...23)(
-                 [AssocSplatNode(21...23)(nil, (21...23))]
-               )]
-            ),
-            (23...24),
-            nil,
-            0,
-            "b"
-          )]
-       ),
-       [:a, :**],
-       (0...3),
-       nil,
-       (5...6),
-       (16...17),
-       nil,
-       (25...28)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/whitequark/kwrestarg_named.txt b/test/yarp/snapshots/whitequark/kwrestarg_named.txt
deleted file mode 100644
index 591c59dfba1c98..00000000000000
--- a/test/yarp/snapshots/whitequark/kwrestarg_named.txt
+++ /dev/null
@@ -1,26 +0,0 @@
-ProgramNode(0...17)(
-  [],
-  StatementsNode(0...17)(
-    [DefNode(0...17)(
-       (4...5),
-       nil,
-       ParametersNode(6...11)(
-         [],
-         [],
-         [],
-         nil,
-         [],
-         KeywordRestParameterNode(6...11)((6...8), (8...11)),
-         nil
-       ),
-       nil,
-       [:foo],
-       (0...3),
-       nil,
-       (5...6),
-       (11...12),
-       nil,
-       (14...17)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/whitequark/kwrestarg_unnamed.txt b/test/yarp/snapshots/whitequark/kwrestarg_unnamed.txt
deleted file mode 100644
index 57bf8cc8b4551b..00000000000000
--- a/test/yarp/snapshots/whitequark/kwrestarg_unnamed.txt
+++ /dev/null
@@ -1,26 +0,0 @@
-ProgramNode(0...14)(
-  [],
-  StatementsNode(0...14)(
-    [DefNode(0...14)(
-       (4...5),
-       nil,
-       ParametersNode(6...8)(
-         [],
-         [],
-         [],
-         nil,
-         [],
-         KeywordRestParameterNode(6...8)((6...8), nil),
-         nil
-       ),
-       nil,
-       [:**],
-       (0...3),
-       nil,
-       (5...6),
-       (8...9),
-       nil,
-       (11...14)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/whitequark/lbrace_arg_after_command_args.txt b/test/yarp/snapshots/whitequark/lbrace_arg_after_command_args.txt
deleted file mode 100644
index 0b2c12417d8b9b..00000000000000
--- a/test/yarp/snapshots/whitequark/lbrace_arg_after_command_args.txt
+++ /dev/null
@@ -1,42 +0,0 @@
-ProgramNode(0...22)(
-  [],
-  StatementsNode(0...22)(
-    [CallNode(0...22)(
-       nil,
-       nil,
-       (0...3),
-       nil,
-       ArgumentsNode(4...8)(
-         [ParenthesesNode(4...8)(
-            StatementsNode(5...7)(
-              [SymbolNode(5...7)((5...6), (6...7), nil, "a")]
-            ),
-            (4...5),
-            (7...8)
-          )]
-       ),
-       nil,
-       BlockNode(9...22)(
-         [],
-         nil,
-         StatementsNode(11...20)(
-           [CallNode(11...20)(
-              nil,
-              nil,
-              (11...12),
-              nil,
-              nil,
-              nil,
-              BlockNode(13...20)([], nil, nil, (13...15), (17...20)),
-              0,
-              "m"
-            )]
-         ),
-         (9...10),
-         (21...22)
-       ),
-       0,
-       "let"
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/whitequark/lparenarg_after_lvar__since_25.txt b/test/yarp/snapshots/whitequark/lparenarg_after_lvar__since_25.txt
deleted file mode 100644
index 027c04f09279cf..00000000000000
--- a/test/yarp/snapshots/whitequark/lparenarg_after_lvar__since_25.txt
+++ /dev/null
@@ -1,59 +0,0 @@
-ProgramNode(0...31)(
-  [],
-  StatementsNode(0...31)(
-    [CallNode(0...14)(
-       nil,
-       nil,
-       (0...3),
-       nil,
-       ArgumentsNode(4...14)(
-         [CallNode(4...14)(
-            ParenthesesNode(4...10)(
-              StatementsNode(5...9)([FloatNode(5...9)()]),
-              (4...5),
-              (9...10)
-            ),
-            (10...11),
-            (11...14),
-            nil,
-            nil,
-            nil,
-            nil,
-            0,
-            "abs"
-          )]
-       ),
-       nil,
-       nil,
-       0,
-       "foo"
-     ),
-     CallNode(16...31)(
-       nil,
-       nil,
-       (16...20),
-       nil,
-       ArgumentsNode(21...31)(
-         [CallNode(21...31)(
-            ParenthesesNode(21...27)(
-              StatementsNode(22...26)([FloatNode(22...26)()]),
-              (21...22),
-              (26...27)
-            ),
-            (27...28),
-            (28...31),
-            nil,
-            nil,
-            nil,
-            nil,
-            0,
-            "abs"
-          )]
-       ),
-       nil,
-       nil,
-       0,
-       "meth"
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/whitequark/lvar.txt b/test/yarp/snapshots/whitequark/lvar.txt
deleted file mode 100644
index 24f27ad073dbab..00000000000000
--- a/test/yarp/snapshots/whitequark/lvar.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-ProgramNode(0...3)(
-  [],
-  StatementsNode(0...3)(
-    [CallNode(0...3)(nil, nil, (0...3), nil, nil, nil, nil, 2, "foo")]
-  )
-)
diff --git a/test/yarp/snapshots/whitequark/lvar_injecting_match.txt b/test/yarp/snapshots/whitequark/lvar_injecting_match.txt
deleted file mode 100644
index 924b997bc7ebdc..00000000000000
--- a/test/yarp/snapshots/whitequark/lvar_injecting_match.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-ProgramNode(0...31)(
-  [:match],
-  StatementsNode(0...31)(
-    [CallNode(0...24)(
-       RegularExpressionNode(0...15)(
-         (0...1),
-         (1...14),
-         (14...15),
-         "(?<match>bar)",
-         0
-       ),
-       nil,
-       (16...18),
-       nil,
-       ArgumentsNode(19...24)(
-         [StringNode(19...24)((19...20), (20...23), (23...24), "bar")]
-       ),
-       nil,
-       nil,
-       0,
-       "=~"
-     ),
-     LocalVariableReadNode(26...31)(:match, 0)]
-  )
-)
diff --git a/test/yarp/snapshots/whitequark/lvasgn.txt b/test/yarp/snapshots/whitequark/lvasgn.txt
deleted file mode 100644
index bb762001ba0d17..00000000000000
--- a/test/yarp/snapshots/whitequark/lvasgn.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-ProgramNode(0...13)(
-  [:var],
-  StatementsNode(0...13)(
-    [LocalVariableWriteNode(0...8)(
-       :var,
-       0,
-       (0...3),
-       IntegerNode(6...8)(),
-       (4...5)
-     ),
-     LocalVariableReadNode(10...13)(:var, 0)]
-  )
-)
diff --git a/test/yarp/snapshots/whitequark/masgn.txt b/test/yarp/snapshots/whitequark/masgn.txt
deleted file mode 100644
index 69667e1a38b5a9..00000000000000
--- a/test/yarp/snapshots/whitequark/masgn.txt
+++ /dev/null
@@ -1,42 +0,0 @@
-ProgramNode(0...56)(
-  [:foo, :bar, :baz],
-  StatementsNode(0...56)(
-    [MultiWriteNode(0...17)(
-       [LocalVariableTargetNode(1...4)(:foo, 0),
-        LocalVariableTargetNode(6...9)(:bar, 0)],
-       (11...12),
-       ArrayNode(13...17)(
-         [IntegerNode(13...14)(), IntegerNode(16...17)()],
-         nil,
-         nil
-       ),
-       (0...1),
-       (9...10)
-     ),
-     MultiWriteNode(19...34)(
-       [LocalVariableTargetNode(19...22)(:foo, 0),
-        LocalVariableTargetNode(24...27)(:bar, 0)],
-       (28...29),
-       ArrayNode(30...34)(
-         [IntegerNode(30...31)(), IntegerNode(33...34)()],
-         nil,
-         nil
-       ),
-       nil,
-       nil
-     ),
-     MultiWriteNode(36...56)(
-       [LocalVariableTargetNode(36...39)(:foo, 0),
-        LocalVariableTargetNode(41...44)(:bar, 0),
-        LocalVariableTargetNode(46...49)(:baz, 0)],
-       (50...51),
-       ArrayNode(52...56)(
-         [IntegerNode(52...53)(), IntegerNode(55...56)()],
-         nil,
-         nil
-       ),
-       nil,
-       nil
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/whitequark/masgn_attr.txt b/test/yarp/snapshots/whitequark/masgn_attr.txt
deleted file mode 100644
index 1c71499f78f448..00000000000000
--- a/test/yarp/snapshots/whitequark/masgn_attr.txt
+++ /dev/null
@@ -1,71 +0,0 @@
-ProgramNode(0...63)(
-  [:foo],
-  StatementsNode(0...63)(
-    [MultiWriteNode(0...17)(
-       [CallNode(0...6)(
-          SelfNode(0...4)(),
-          (4...5),
-          (5...6),
-          nil,
-          nil,
-          nil,
-          nil,
-          0,
-          "A="
-        ),
-        LocalVariableTargetNode(8...11)(:foo, 0)],
-       (12...13),
-       LocalVariableReadNode(14...17)(:foo, 0),
-       nil,
-       nil
-     ),
-     MultiWriteNode(19...43)(
-       [CallNode(19...25)(
-          SelfNode(19...23)(),
-          (23...24),
-          (24...25),
-          nil,
-          nil,
-          nil,
-          nil,
-          0,
-          "a="
-        ),
-        CallNode(27...37)(
-          SelfNode(27...31)(),
-          nil,
-          (31...37),
-          (31...32),
-          ArgumentsNode(32...36)(
-            [IntegerNode(32...33)(), IntegerNode(35...36)()]
-          ),
-          (36...37),
-          nil,
-          0,
-          "[]="
-        )],
-       (38...39),
-       LocalVariableReadNode(40...43)(:foo, 0),
-       nil,
-       nil
-     ),
-     MultiWriteNode(45...63)(
-       [CallNode(45...52)(
-          SelfNode(45...49)(),
-          (49...51),
-          (51...52),
-          nil,
-          nil,
-          nil,
-          nil,
-          0,
-          "a="
-        ),
-        LocalVariableTargetNode(54...57)(:foo, 0)],
-       (58...59),
-       LocalVariableReadNode(60...63)(:foo, 0),
-       nil,
-       nil
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/whitequark/masgn_cmd.txt b/test/yarp/snapshots/whitequark/masgn_cmd.txt
deleted file mode 100644
index 14d81d79bcf2b3..00000000000000
--- a/test/yarp/snapshots/whitequark/masgn_cmd.txt
+++ /dev/null
@@ -1,23 +0,0 @@
-ProgramNode(0...16)(
-  [:foo, :bar],
-  StatementsNode(0...16)(
-    [MultiWriteNode(0...16)(
-       [LocalVariableTargetNode(0...3)(:foo, 0),
-        LocalVariableTargetNode(5...8)(:bar, 0)],
-       (9...10),
-       CallNode(11...16)(
-         nil,
-         nil,
-         (11...12),
-         nil,
-         ArgumentsNode(13...16)([LocalVariableReadNode(13...16)(:foo, 0)]),
-         nil,
-         nil,
-         0,
-         "m"
-       ),
-       nil,
-       nil
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/whitequark/masgn_const.txt b/test/yarp/snapshots/whitequark/masgn_const.txt
deleted file mode 100644
index 51f44f4d2bf7a5..00000000000000
--- a/test/yarp/snapshots/whitequark/masgn_const.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-ProgramNode(0...34)(
-  [:foo],
-  StatementsNode(0...34)(
-    [MultiWriteNode(0...14)(
-       [ConstantPathTargetNode(0...3)(
-          nil,
-          ConstantReadNode(2...3)(:A),
-          (0...2)
-        ),
-        LocalVariableTargetNode(5...8)(:foo, 0)],
-       (9...10),
-       LocalVariableReadNode(11...14)(:foo, 0),
-       nil,
-       nil
-     ),
-     MultiWriteNode(16...34)(
-       [ConstantPathTargetNode(16...23)(
-          SelfNode(16...20)(),
-          ConstantReadNode(22...23)(:A),
-          (20...22)
-        ),
-        LocalVariableTargetNode(25...28)(:foo, 0)],
-       (29...30),
-       LocalVariableReadNode(31...34)(:foo, 0),
-       nil,
-       nil
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/whitequark/masgn_nested.txt b/test/yarp/snapshots/whitequark/masgn_nested.txt
deleted file mode 100644
index b1601b8aa7436a..00000000000000
--- a/test/yarp/snapshots/whitequark/masgn_nested.txt
+++ /dev/null
@@ -1,34 +0,0 @@
-ProgramNode(0...30)(
-  [:b, :a, :c],
-  StatementsNode(0...30)(
-    [MultiWriteNode(0...13)(
-       [MultiWriteNode(1...6)(
-          [LocalVariableTargetNode(2...3)(:b, 0),
-           SplatNode(3...4)((3...4), nil)],
-          nil,
-          nil,
-          (1...2),
-          (5...6)
-        )],
-       (8...9),
-       CallNode(10...13)(nil, nil, (10...13), nil, nil, nil, nil, 2, "foo"),
-       (0...1),
-       (6...7)
-     ),
-     MultiWriteNode(15...30)(
-       [LocalVariableTargetNode(15...16)(:a, 0),
-        MultiWriteNode(18...24)(
-          [LocalVariableTargetNode(19...20)(:b, 0),
-           LocalVariableTargetNode(22...23)(:c, 0)],
-          nil,
-          nil,
-          (18...19),
-          (23...24)
-        )],
-       (25...26),
-       CallNode(27...30)(nil, nil, (27...30), nil, nil, nil, nil, 2, "foo"),
-       nil,
-       nil
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/whitequark/masgn_splat.txt b/test/yarp/snapshots/whitequark/masgn_splat.txt
deleted file mode 100644
index d21760a65b3921..00000000000000
--- a/test/yarp/snapshots/whitequark/masgn_splat.txt
+++ /dev/null
@@ -1,175 +0,0 @@
-ProgramNode(0...139)(
-  [:c, :d, :b, :a],
-  StatementsNode(0...139)(
-    [MultiWriteNode(0...7)(
-       [SplatNode(0...1)((0...1), nil)],
-       (2...3),
-       CallNode(4...7)(nil, nil, (4...7), nil, nil, nil, nil, 2, "bar"),
-       nil,
-       nil
-     ),
-     MultiWriteNode(9...22)(
-       [MultiWriteNode(9...10)(
-          [SplatNode(9...10)((9...10), nil)],
-          nil,
-          nil,
-          nil,
-          nil
-        ),
-        LocalVariableTargetNode(12...13)(:c, 0),
-        LocalVariableTargetNode(15...16)(:d, 0)],
-       (17...18),
-       CallNode(19...22)(nil, nil, (19...22), nil, nil, nil, nil, 2, "bar"),
-       nil,
-       nil
-     ),
-     MultiWriteNode(24...32)(
-       [SplatNode(24...26)(
-          (24...25),
-          LocalVariableTargetNode(25...26)(:b, 0)
-        )],
-       (27...28),
-       CallNode(29...32)(nil, nil, (29...32), nil, nil, nil, nil, 2, "bar"),
-       nil,
-       nil
-     ),
-     MultiWriteNode(34...45)(
-       [MultiWriteNode(34...36)(
-          [SplatNode(34...36)(
-             (34...35),
-             LocalVariableTargetNode(35...36)(:b, 0)
-           )],
-          nil,
-          nil,
-          nil,
-          nil
-        ),
-        LocalVariableTargetNode(38...39)(:c, 0)],
-       (40...41),
-       CallNode(42...45)(nil, nil, (42...45), nil, nil, nil, nil, 2, "bar"),
-       nil,
-       nil
-     ),
-     MultiWriteNode(47...65)(
-       [InstanceVariableTargetNode(47...51)(:@foo),
-        ClassVariableTargetNode(53...58)(:@@bar)],
-       (59...60),
-       ArrayNode(61...65)(
-         [SplatNode(61...65)(
-            (61...62),
-            CallNode(62...65)(
-              nil,
-              nil,
-              (62...65),
-              nil,
-              nil,
-              nil,
-              nil,
-              2,
-              "foo"
-            )
-          )],
-         nil,
-         nil
-       ),
-       nil,
-       nil
-     ),
-     MultiWriteNode(67...77)(
-       [LocalVariableTargetNode(67...68)(:a, 0),
-        SplatNode(70...71)((70...71), nil)],
-       (72...73),
-       CallNode(74...77)(nil, nil, (74...77), nil, nil, nil, nil, 2, "bar"),
-       nil,
-       nil
-     ),
-     MultiWriteNode(79...92)(
-       [LocalVariableTargetNode(79...80)(:a, 0),
-        SplatNode(82...83)((82...83), nil),
-        LocalVariableTargetNode(85...86)(:c, 0)],
-       (87...88),
-       CallNode(89...92)(nil, nil, (89...92), nil, nil, nil, nil, 2, "bar"),
-       nil,
-       nil
-     ),
-     MultiWriteNode(94...105)(
-       [LocalVariableTargetNode(94...95)(:a, 0),
-        SplatNode(97...99)(
-          (97...98),
-          LocalVariableTargetNode(98...99)(:b, 0)
-        )],
-       (100...101),
-       CallNode(102...105)(
-         nil,
-         nil,
-         (102...105),
-         nil,
-         nil,
-         nil,
-         nil,
-         2,
-         "bar"
-       ),
-       nil,
-       nil
-     ),
-     MultiWriteNode(107...121)(
-       [LocalVariableTargetNode(107...108)(:a, 0),
-        SplatNode(110...112)(
-          (110...111),
-          LocalVariableTargetNode(111...112)(:b, 0)
-        ),
-        LocalVariableTargetNode(114...115)(:c, 0)],
-       (116...117),
-       CallNode(118...121)(
-         nil,
-         nil,
-         (118...121),
-         nil,
-         nil,
-         nil,
-         nil,
-         2,
-         "bar"
-       ),
-       nil,
-       nil
-     ),
-     MultiWriteNode(123...139)(
-       [LocalVariableTargetNode(123...124)(:a, 0),
-        LocalVariableTargetNode(126...127)(:b, 0)],
-       (128...129),
-       ArrayNode(130...139)(
-         [SplatNode(130...134)(
-            (130...131),
-            CallNode(131...134)(
-              nil,
-              nil,
-              (131...134),
-              nil,
-              nil,
-              nil,
-              nil,
-              2,
-              "foo"
-            )
-          ),
-          CallNode(136...139)(
-            nil,
-            nil,
-            (136...139),
-            nil,
-            nil,
-            nil,
-            nil,
-            2,
-            "bar"
-          )],
-         nil,
-         nil
-       ),
-       nil,
-       nil
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/whitequark/method_definition_in_while_cond.txt b/test/yarp/snapshots/whitequark/method_definition_in_while_cond.txt
deleted file mode 100644
index 3179d39b959edc..00000000000000
--- a/test/yarp/snapshots/whitequark/method_definition_in_while_cond.txt
+++ /dev/null
@@ -1,151 +0,0 @@
-ProgramNode(0...190)(
-  [],
-  StatementsNode(0...190)(
-    [WhileNode(0...45)(
-       (0...5),
-       (42...45),
-       DefNode(6...33)(
-         (10...13),
-         nil,
-         ParametersNode(14...28)(
-           [],
-           [OptionalParameterNode(14...28)(
-              :a,
-              (14...15),
-              (16...17),
-              CallNode(18...28)(
-                nil,
-                nil,
-                (18...21),
-                nil,
-                nil,
-                nil,
-                BlockNode(22...28)([], nil, nil, (22...24), (25...28)),
-                0,
-                "tap"
-              )
-            )],
-           [],
-           nil,
-           [],
-           nil,
-           nil
-         ),
-         nil,
-         [:a],
-         (6...9),
-         nil,
-         nil,
-         nil,
-         nil,
-         (30...33)
-       ),
-       StatementsNode(35...40)([BreakNode(35...40)(nil, (35...40))]),
-       0
-     ),
-     WhileNode(47...89)(
-       (47...52),
-       (86...89),
-       DefNode(53...77)(
-         (57...60),
-         nil,
-         nil,
-         StatementsNode(62...72)(
-           [CallNode(62...72)(
-              nil,
-              nil,
-              (62...65),
-              nil,
-              nil,
-              nil,
-              BlockNode(66...72)([], nil, nil, (66...68), (69...72)),
-              0,
-              "tap"
-            )]
-         ),
-         [],
-         (53...56),
-         nil,
-         nil,
-         nil,
-         nil,
-         (74...77)
-       ),
-       StatementsNode(79...84)([BreakNode(79...84)(nil, (79...84))]),
-       0
-     ),
-     WhileNode(91...141)(
-       (91...96),
-       (138...141),
-       DefNode(97...129)(
-         (106...109),
-         SelfNode(101...105)(),
-         ParametersNode(110...124)(
-           [],
-           [OptionalParameterNode(110...124)(
-              :a,
-              (110...111),
-              (112...113),
-              CallNode(114...124)(
-                nil,
-                nil,
-                (114...117),
-                nil,
-                nil,
-                nil,
-                BlockNode(118...124)([], nil, nil, (118...120), (121...124)),
-                0,
-                "tap"
-              )
-            )],
-           [],
-           nil,
-           [],
-           nil,
-           nil
-         ),
-         nil,
-         [:a],
-         (97...100),
-         (105...106),
-         nil,
-         nil,
-         nil,
-         (126...129)
-       ),
-       StatementsNode(131...136)([BreakNode(131...136)(nil, (131...136))]),
-       0
-     ),
-     WhileNode(143...190)(
-       (143...148),
-       (187...190),
-       DefNode(149...178)(
-         (158...161),
-         SelfNode(153...157)(),
-         nil,
-         StatementsNode(163...173)(
-           [CallNode(163...173)(
-              nil,
-              nil,
-              (163...166),
-              nil,
-              nil,
-              nil,
-              BlockNode(167...173)([], nil, nil, (167...169), (170...173)),
-              0,
-              "tap"
-            )]
-         ),
-         [],
-         (149...152),
-         (157...158),
-         nil,
-         nil,
-         nil,
-         (175...178)
-       ),
-       StatementsNode(180...185)([BreakNode(180...185)(nil, (180...185))]),
-       0
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/whitequark/module.txt b/test/yarp/snapshots/whitequark/module.txt
deleted file mode 100644
index 7880ab9980ac22..00000000000000
--- a/test/yarp/snapshots/whitequark/module.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-ProgramNode(0...15)(
-  [],
-  StatementsNode(0...15)(
-    [ModuleNode(0...15)(
-       [],
-       (0...6),
-       ConstantReadNode(7...10)(:Foo),
-       nil,
-       (12...15),
-       :Foo,
-       :Foo
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/whitequark/multiple_pattern_matches.txt b/test/yarp/snapshots/whitequark/multiple_pattern_matches.txt
deleted file mode 100644
index 7f655240cddc57..00000000000000
--- a/test/yarp/snapshots/whitequark/multiple_pattern_matches.txt
+++ /dev/null
@@ -1,97 +0,0 @@
-ProgramNode(0...52)(
-  [:a],
-  StatementsNode(0...52)(
-    [MatchRequiredNode(0...12)(
-       HashNode(0...6)(
-         (0...1),
-         [AssocNode(1...5)(
-            SymbolNode(1...3)(nil, (1...2), (2...3), "a"),
-            IntegerNode(4...5)(),
-            nil
-          )],
-         (5...6)
-       ),
-       HashPatternNode(10...12)(
-         nil,
-         [AssocNode(10...12)(
-            SymbolNode(10...12)(nil, (10...11), (11...12), "a"),
-            nil,
-            nil
-          )],
-         nil,
-         nil,
-         nil
-       ),
-       (7...9)
-     ),
-     MatchRequiredNode(13...25)(
-       HashNode(13...19)(
-         (13...14),
-         [AssocNode(14...18)(
-            SymbolNode(14...16)(nil, (14...15), (15...16), "a"),
-            IntegerNode(17...18)(),
-            nil
-          )],
-         (18...19)
-       ),
-       HashPatternNode(23...25)(
-         nil,
-         [AssocNode(23...25)(
-            SymbolNode(23...25)(nil, (23...24), (24...25), "a"),
-            nil,
-            nil
-          )],
-         nil,
-         nil,
-         nil
-       ),
-       (20...22)
-     ),
-     MatchPredicateNode(27...39)(
-       HashNode(27...33)(
-         (27...28),
-         [AssocNode(28...32)(
-            SymbolNode(28...30)(nil, (28...29), (29...30), "a"),
-            IntegerNode(31...32)(),
-            nil
-          )],
-         (32...33)
-       ),
-       HashPatternNode(37...39)(
-         nil,
-         [AssocNode(37...39)(
-            SymbolNode(37...39)(nil, (37...38), (38...39), "a"),
-            nil,
-            nil
-          )],
-         nil,
-         nil,
-         nil
-       ),
-       (34...36)
-     ),
-     MatchPredicateNode(40...52)(
-       HashNode(40...46)(
-         (40...41),
-         [AssocNode(41...45)(
-            SymbolNode(41...43)(nil, (41...42), (42...43), "a"),
-            IntegerNode(44...45)(),
-            nil
-          )],
-         (45...46)
-       ),
-       HashPatternNode(50...52)(
-         nil,
-         [AssocNode(50...52)(
-            SymbolNode(50...52)(nil, (50...51), (51...52), "a"),
-            nil,
-            nil
-          )],
-         nil,
-         nil,
-         nil
-       ),
-       (47...49)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/whitequark/newline_in_hash_argument.txt b/test/yarp/snapshots/whitequark/newline_in_hash_argument.txt
deleted file mode 100644
index fad1c85494822b..00000000000000
--- a/test/yarp/snapshots/whitequark/newline_in_hash_argument.txt
+++ /dev/null
@@ -1,85 +0,0 @@
-ProgramNode(0...74)(
-  [:a, :b],
-  StatementsNode(0...74)(
-    [CaseNode(0...40)(
-       CallNode(5...8)(nil, nil, (5...8), nil, nil, nil, nil, 2, "foo"),
-       [InNode(9...21)(
-          HashPatternNode(12...14)(
-            nil,
-            [AssocNode(12...14)(
-               SymbolNode(12...14)(nil, (12...13), (13...14), "a"),
-               nil,
-               nil
-             )],
-            nil,
-            nil,
-            nil
-          ),
-          StatementsNode(15...21)(
-            [IntegerNode(15...16)(), TrueNode(17...21)()]
-          ),
-          (9...11),
-          nil
-        ),
-        InNode(22...36)(
-          HashPatternNode(25...29)(
-            nil,
-            [AssocNode(25...29)(
-               SymbolNode(25...29)((25...26), (26...27), (27...29), "b"),
-               nil,
-               nil
-             )],
-            nil,
-            nil,
-            nil
-          ),
-          StatementsNode(30...36)(
-            [IntegerNode(30...31)(), TrueNode(32...36)()]
-          ),
-          (22...24),
-          nil
-        )],
-       nil,
-       (0...4),
-       (37...40)
-     ),
-     CallNode(42...58)(
-       CallNode(42...45)(nil, nil, (42...45), nil, nil, nil, nil, 2, "obj"),
-       (45...46),
-       (46...49),
-       nil,
-       ArgumentsNode(50...58)(
-         [KeywordHashNode(50...58)(
-            [AssocNode(50...58)(
-               SymbolNode(50...56)((50...51), (51...54), (54...56), "foo"),
-               IntegerNode(57...58)(),
-               nil
-             )]
-          )]
-       ),
-       nil,
-       nil,
-       0,
-       "set"
-     ),
-     CallNode(60...74)(
-       CallNode(60...63)(nil, nil, (60...63), nil, nil, nil, nil, 2, "obj"),
-       (63...64),
-       (64...67),
-       nil,
-       ArgumentsNode(68...74)(
-         [KeywordHashNode(68...74)(
-            [AssocNode(68...74)(
-               SymbolNode(68...72)(nil, (68...71), (71...72), "foo"),
-               IntegerNode(73...74)(),
-               nil
-             )]
-          )]
-       ),
-       nil,
-       nil,
-       0,
-       "set"
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/whitequark/next.txt b/test/yarp/snapshots/whitequark/next.txt
deleted file mode 100644
index 07dbb690dac91d..00000000000000
--- a/test/yarp/snapshots/whitequark/next.txt
+++ /dev/null
@@ -1,40 +0,0 @@
-ProgramNode(0...33)(
-  [],
-  StatementsNode(0...33)(
-    [NextNode(0...4)(nil, (0...4)),
-     NextNode(6...14)(
-       ArgumentsNode(11...14)(
-         [CallNode(11...14)(nil, nil, (11...14), nil, nil, nil, nil, 2, "foo")]
-       ),
-       (6...10)
-     ),
-     NextNode(16...22)(
-       ArgumentsNode(20...22)(
-         [ParenthesesNode(20...22)(nil, (20...21), (21...22))]
-       ),
-       (16...20)
-     ),
-     NextNode(24...33)(
-       ArgumentsNode(28...33)(
-         [ParenthesesNode(28...33)(
-            StatementsNode(29...32)(
-              [CallNode(29...32)(
-                 nil,
-                 nil,
-                 (29...32),
-                 nil,
-                 nil,
-                 nil,
-                 nil,
-                 2,
-                 "foo"
-               )]
-            ),
-            (28...29),
-            (32...33)
-          )]
-       ),
-       (24...28)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/whitequark/next_block.txt b/test/yarp/snapshots/whitequark/next_block.txt
deleted file mode 100644
index 20cbe0d837bafa..00000000000000
--- a/test/yarp/snapshots/whitequark/next_block.txt
+++ /dev/null
@@ -1,33 +0,0 @@
-ProgramNode(0...19)(
-  [],
-  StatementsNode(0...19)(
-    [NextNode(0...19)(
-       ArgumentsNode(5...19)(
-         [CallNode(5...19)(
-            nil,
-            nil,
-            (5...8),
-            nil,
-            ArgumentsNode(9...12)(
-              [CallNode(9...12)(
-                 nil,
-                 nil,
-                 (9...12),
-                 nil,
-                 nil,
-                 nil,
-                 nil,
-                 2,
-                 "foo"
-               )]
-            ),
-            nil,
-            BlockNode(13...19)([], nil, nil, (13...15), (16...19)),
-            0,
-            "fun"
-          )]
-       ),
-       (0...4)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/whitequark/nil.txt b/test/yarp/snapshots/whitequark/nil.txt
deleted file mode 100644
index 4af940de662d5a..00000000000000
--- a/test/yarp/snapshots/whitequark/nil.txt
+++ /dev/null
@@ -1 +0,0 @@
-ProgramNode(0...3)([], StatementsNode(0...3)([NilNode(0...3)()]))
diff --git a/test/yarp/snapshots/whitequark/nil_expression.txt b/test/yarp/snapshots/whitequark/nil_expression.txt
deleted file mode 100644
index b9e8d19adbfcbf..00000000000000
--- a/test/yarp/snapshots/whitequark/nil_expression.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-ProgramNode(0...13)(
-  [],
-  StatementsNode(0...13)(
-    [ParenthesesNode(0...2)(nil, (0...1), (1...2)),
-     BeginNode(4...13)((4...9), nil, nil, nil, nil, (10...13))]
-  )
-)
diff --git a/test/yarp/snapshots/whitequark/non_lvar_injecting_match.txt b/test/yarp/snapshots/whitequark/non_lvar_injecting_match.txt
deleted file mode 100644
index e44f5db294d8f5..00000000000000
--- a/test/yarp/snapshots/whitequark/non_lvar_injecting_match.txt
+++ /dev/null
@@ -1,28 +0,0 @@
-ProgramNode(0...28)(
-  [],
-  StatementsNode(0...28)(
-    [CallNode(0...28)(
-       InterpolatedRegularExpressionNode(0...19)(
-         (0...1),
-         [EmbeddedStatementsNode(1...5)(
-            (1...3),
-            StatementsNode(3...4)([IntegerNode(3...4)()]),
-            (4...5)
-          ),
-          StringNode(5...18)(nil, (5...18), nil, "(?<match>bar)")],
-         (18...19),
-         0
-       ),
-       nil,
-       (20...22),
-       nil,
-       ArgumentsNode(23...28)(
-         [StringNode(23...28)((23...24), (24...27), (27...28), "bar")]
-       ),
-       nil,
-       nil,
-       0,
-       "=~"
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/whitequark/not.txt b/test/yarp/snapshots/whitequark/not.txt
deleted file mode 100644
index 1dc7b381cd397e..00000000000000
--- a/test/yarp/snapshots/whitequark/not.txt
+++ /dev/null
@@ -1,38 +0,0 @@
-ProgramNode(0...24)(
-  [],
-  StatementsNode(0...24)(
-    [CallNode(0...7)(
-       CallNode(4...7)(nil, nil, (4...7), nil, nil, nil, nil, 2, "foo"),
-       nil,
-       (0...3),
-       nil,
-       nil,
-       nil,
-       nil,
-       0,
-       "!"
-     ),
-     CallNode(9...14)(
-       nil,
-       nil,
-       (9...12),
-       (12...13),
-       nil,
-       (13...14),
-       nil,
-       0,
-       "!"
-     ),
-     CallNode(16...24)(
-       CallNode(20...23)(nil, nil, (20...23), nil, nil, nil, nil, 2, "foo"),
-       nil,
-       (16...19),
-       (19...20),
-       nil,
-       (23...24),
-       nil,
-       0,
-       "!"
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/whitequark/not_cmd.txt b/test/yarp/snapshots/whitequark/not_cmd.txt
deleted file mode 100644
index ff2acd00f5fe49..00000000000000
--- a/test/yarp/snapshots/whitequark/not_cmd.txt
+++ /dev/null
@@ -1,28 +0,0 @@
-ProgramNode(0...9)(
-  [],
-  StatementsNode(0...9)(
-    [CallNode(0...9)(
-       CallNode(4...9)(
-         nil,
-         nil,
-         (4...5),
-         nil,
-         ArgumentsNode(6...9)(
-           [CallNode(6...9)(nil, nil, (6...9), nil, nil, nil, nil, 2, "foo")]
-         ),
-         nil,
-         nil,
-         0,
-         "m"
-       ),
-       nil,
-       (0...3),
-       nil,
-       nil,
-       nil,
-       nil,
-       0,
-       "!"
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/whitequark/not_masgn__24.txt b/test/yarp/snapshots/whitequark/not_masgn__24.txt
deleted file mode 100644
index 47895d8c462466..00000000000000
--- a/test/yarp/snapshots/whitequark/not_masgn__24.txt
+++ /dev/null
@@ -1,39 +0,0 @@
-ProgramNode(0...13)(
-  [:a, :b],
-  StatementsNode(0...13)(
-    [CallNode(0...13)(
-       ParenthesesNode(1...13)(
-         StatementsNode(2...12)(
-           [MultiWriteNode(2...12)(
-              [LocalVariableTargetNode(2...3)(:a, 0),
-               LocalVariableTargetNode(5...6)(:b, 0)],
-              (7...8),
-              CallNode(9...12)(
-                nil,
-                nil,
-                (9...12),
-                nil,
-                nil,
-                nil,
-                nil,
-                2,
-                "foo"
-              ),
-              nil,
-              nil
-            )]
-         ),
-         (1...2),
-         (12...13)
-       ),
-       nil,
-       (0...1),
-       nil,
-       nil,
-       nil,
-       nil,
-       0,
-       "!"
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/whitequark/nth_ref.txt b/test/yarp/snapshots/whitequark/nth_ref.txt
deleted file mode 100644
index ca131a208ce53f..00000000000000
--- a/test/yarp/snapshots/whitequark/nth_ref.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-ProgramNode(0...3)(
-  [],
-  StatementsNode(0...3)([NumberedReferenceReadNode(0...3)(10)])
-)
diff --git a/test/yarp/snapshots/whitequark/numbered_args_after_27.txt b/test/yarp/snapshots/whitequark/numbered_args_after_27.txt
deleted file mode 100644
index c2a67b4cc32dc0..00000000000000
--- a/test/yarp/snapshots/whitequark/numbered_args_after_27.txt
+++ /dev/null
@@ -1,181 +0,0 @@
-ProgramNode(0...65)(
-  [],
-  StatementsNode(0...65)(
-    [LambdaNode(0...17)(
-       [],
-       (0...2),
-       (3...5),
-       (14...17),
-       nil,
-       StatementsNode(6...13)(
-         [CallNode(6...13)(
-            CallNode(6...8)(nil, nil, (6...8), nil, nil, nil, nil, 2, "_1"),
-            nil,
-            (9...10),
-            nil,
-            ArgumentsNode(11...13)(
-              [CallNode(11...13)(
-                 nil,
-                 nil,
-                 (11...13),
-                 nil,
-                 nil,
-                 nil,
-                 nil,
-                 2,
-                 "_9"
-               )]
-            ),
-            nil,
-            nil,
-            0,
-            "+"
-          )]
-       )
-     ),
-     LambdaNode(19...32)(
-       [],
-       (19...21),
-       (22...23),
-       (31...32),
-       nil,
-       StatementsNode(24...31)(
-         [CallNode(24...31)(
-            CallNode(24...26)(
-              nil,
-              nil,
-              (24...26),
-              nil,
-              nil,
-              nil,
-              nil,
-              2,
-              "_1"
-            ),
-            nil,
-            (27...28),
-            nil,
-            ArgumentsNode(29...31)(
-              [CallNode(29...31)(
-                 nil,
-                 nil,
-                 (29...31),
-                 nil,
-                 nil,
-                 nil,
-                 nil,
-                 2,
-                 "_9"
-               )]
-            ),
-            nil,
-            nil,
-            0,
-            "+"
-          )]
-       )
-     ),
-     CallNode(34...50)(
-       nil,
-       nil,
-       (34...35),
-       nil,
-       nil,
-       nil,
-       BlockNode(36...50)(
-         [],
-         nil,
-         StatementsNode(39...46)(
-           [CallNode(39...46)(
-              CallNode(39...41)(
-                nil,
-                nil,
-                (39...41),
-                nil,
-                nil,
-                nil,
-                nil,
-                2,
-                "_1"
-              ),
-              nil,
-              (42...43),
-              nil,
-              ArgumentsNode(44...46)(
-                [CallNode(44...46)(
-                   nil,
-                   nil,
-                   (44...46),
-                   nil,
-                   nil,
-                   nil,
-                   nil,
-                   2,
-                   "_9"
-                 )]
-              ),
-              nil,
-              nil,
-              0,
-              "+"
-            )]
-         ),
-         (36...38),
-         (47...50)
-       ),
-       0,
-       "m"
-     ),
-     CallNode(52...65)(
-       nil,
-       nil,
-       (52...53),
-       nil,
-       nil,
-       nil,
-       BlockNode(54...65)(
-         [],
-         nil,
-         StatementsNode(56...63)(
-           [CallNode(56...63)(
-              CallNode(56...58)(
-                nil,
-                nil,
-                (56...58),
-                nil,
-                nil,
-                nil,
-                nil,
-                2,
-                "_1"
-              ),
-              nil,
-              (59...60),
-              nil,
-              ArgumentsNode(61...63)(
-                [CallNode(61...63)(
-                   nil,
-                   nil,
-                   (61...63),
-                   nil,
-                   nil,
-                   nil,
-                   nil,
-                   2,
-                   "_9"
-                 )]
-              ),
-              nil,
-              nil,
-              0,
-              "+"
-            )]
-         ),
-         (54...55),
-         (64...65)
-       ),
-       0,
-       "m"
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/whitequark/numparam_outside_block.txt b/test/yarp/snapshots/whitequark/numparam_outside_block.txt
deleted file mode 100644
index 61d138fa6d5a89..00000000000000
--- a/test/yarp/snapshots/whitequark/numparam_outside_block.txt
+++ /dev/null
@@ -1,55 +0,0 @@
-ProgramNode(0...83)(
-  [],
-  StatementsNode(0...83)(
-    [CallNode(0...2)(nil, nil, (0...2), nil, nil, nil, nil, 2, "_1"),
-     SingletonClassNode(4...25)(
-       [],
-       (4...9),
-       (10...12),
-       CallNode(13...16)(nil, nil, (13...16), nil, nil, nil, nil, 2, "foo"),
-       StatementsNode(18...20)(
-         [CallNode(18...20)(nil, nil, (18...20), nil, nil, nil, nil, 2, "_1")]
-       ),
-       (22...25)
-     ),
-     ClassNode(27...43)(
-       [],
-       (27...32),
-       ConstantReadNode(33...34)(:A),
-       nil,
-       nil,
-       StatementsNode(36...38)(
-         [CallNode(36...38)(nil, nil, (36...38), nil, nil, nil, nil, 2, "_1")]
-       ),
-       (40...43),
-       :A,
-       :A
-     ),
-     DefNode(45...64)(
-       (54...55),
-       SelfNode(49...53)(),
-       nil,
-       StatementsNode(57...59)(
-         [CallNode(57...59)(nil, nil, (57...59), nil, nil, nil, nil, 2, "_1")]
-       ),
-       [],
-       (45...48),
-       (53...54),
-       nil,
-       nil,
-       nil,
-       (61...64)
-     ),
-     ModuleNode(66...83)(
-       [],
-       (66...72),
-       ConstantReadNode(73...74)(:A),
-       StatementsNode(76...78)(
-         [CallNode(76...78)(nil, nil, (76...78), nil, nil, nil, nil, 2, "_1")]
-       ),
-       (80...83),
-       :A,
-       :A
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/whitequark/op_asgn.txt b/test/yarp/snapshots/whitequark/op_asgn.txt
deleted file mode 100644
index 44e3694392afb3..00000000000000
--- a/test/yarp/snapshots/whitequark/op_asgn.txt
+++ /dev/null
@@ -1,47 +0,0 @@
-ProgramNode(0...35)(
-  [],
-  StatementsNode(0...35)(
-    [CallOperatorWriteNode(0...10)(
-       CallNode(0...3)(nil, nil, (0...3), nil, nil, nil, nil, 2, "foo"),
-       (3...4),
-       (4...5),
-       nil,
-       nil,
-       nil,
-       0,
-       "A",
-       "A=",
-       :+,
-       (6...8),
-       IntegerNode(9...10)()
-     ),
-     CallOperatorWriteNode(12...22)(
-       CallNode(12...15)(nil, nil, (12...15), nil, nil, nil, nil, 2, "foo"),
-       (15...16),
-       (16...17),
-       nil,
-       nil,
-       nil,
-       0,
-       "a",
-       "a=",
-       :+,
-       (18...20),
-       IntegerNode(21...22)()
-     ),
-     CallOperatorWriteNode(24...35)(
-       CallNode(24...27)(nil, nil, (24...27), nil, nil, nil, nil, 2, "foo"),
-       (27...29),
-       (29...30),
-       nil,
-       nil,
-       nil,
-       0,
-       "a",
-       "a=",
-       :+,
-       (31...33),
-       IntegerNode(34...35)()
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/whitequark/op_asgn_cmd.txt b/test/yarp/snapshots/whitequark/op_asgn_cmd.txt
deleted file mode 100644
index 9c15e15cde7ab7..00000000000000
--- a/test/yarp/snapshots/whitequark/op_asgn_cmd.txt
+++ /dev/null
@@ -1,145 +0,0 @@
-ProgramNode(0...64)(
-  [],
-  StatementsNode(0...64)(
-    [CallOperatorWriteNode(0...14)(
-       CallNode(0...3)(nil, nil, (0...3), nil, nil, nil, nil, 2, "foo"),
-       (3...4),
-       (4...5),
-       nil,
-       nil,
-       nil,
-       0,
-       "A",
-       "A=",
-       :+,
-       (6...8),
-       CallNode(9...14)(
-         nil,
-         nil,
-         (9...10),
-         nil,
-         ArgumentsNode(11...14)(
-           [CallNode(11...14)(
-              nil,
-              nil,
-              (11...14),
-              nil,
-              nil,
-              nil,
-              nil,
-              2,
-              "foo"
-            )]
-         ),
-         nil,
-         nil,
-         0,
-         "m"
-       )
-     ),
-     CallOperatorWriteNode(16...30)(
-       CallNode(16...19)(nil, nil, (16...19), nil, nil, nil, nil, 2, "foo"),
-       (19...20),
-       (20...21),
-       nil,
-       nil,
-       nil,
-       0,
-       "a",
-       "a=",
-       :+,
-       (22...24),
-       CallNode(25...30)(
-         nil,
-         nil,
-         (25...26),
-         nil,
-         ArgumentsNode(27...30)(
-           [CallNode(27...30)(
-              nil,
-              nil,
-              (27...30),
-              nil,
-              nil,
-              nil,
-              nil,
-              2,
-              "foo"
-            )]
-         ),
-         nil,
-         nil,
-         0,
-         "m"
-       )
-     ),
-     ConstantPathOperatorWriteNode(32...47)(
-       ConstantPathNode(32...38)(
-         CallNode(32...35)(nil, nil, (32...35), nil, nil, nil, nil, 2, "foo"),
-         ConstantReadNode(37...38)(:A),
-         (35...37)
-       ),
-       (39...41),
-       CallNode(42...47)(
-         nil,
-         nil,
-         (42...43),
-         nil,
-         ArgumentsNode(44...47)(
-           [CallNode(44...47)(
-              nil,
-              nil,
-              (44...47),
-              nil,
-              nil,
-              nil,
-              nil,
-              2,
-              "foo"
-            )]
-         ),
-         nil,
-         nil,
-         0,
-         "m"
-       ),
-       :+
-     ),
-     CallOperatorWriteNode(49...64)(
-       CallNode(49...52)(nil, nil, (49...52), nil, nil, nil, nil, 2, "foo"),
-       (52...54),
-       (54...55),
-       nil,
-       nil,
-       nil,
-       0,
-       "a",
-       "a=",
-       :+,
-       (56...58),
-       CallNode(59...64)(
-         nil,
-         nil,
-         (59...60),
-         nil,
-         ArgumentsNode(61...64)(
-           [CallNode(61...64)(
-              nil,
-              nil,
-              (61...64),
-              nil,
-              nil,
-              nil,
-              nil,
-              2,
-              "foo"
-            )]
-         ),
-         nil,
-         nil,
-         0,
-         "m"
-       )
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/whitequark/op_asgn_index.txt b/test/yarp/snapshots/whitequark/op_asgn_index.txt
deleted file mode 100644
index 153077be967da1..00000000000000
--- a/test/yarp/snapshots/whitequark/op_asgn_index.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-ProgramNode(0...14)(
-  [],
-  StatementsNode(0...14)(
-    [CallOperatorWriteNode(0...14)(
-       CallNode(0...3)(nil, nil, (0...3), nil, nil, nil, nil, 2, "foo"),
-       nil,
-       (3...9),
-       (3...4),
-       ArgumentsNode(4...8)([IntegerNode(4...5)(), IntegerNode(7...8)()]),
-       (8...9),
-       0,
-       "[]",
-       "[]=",
-       :+,
-       (10...12),
-       IntegerNode(13...14)()
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/whitequark/op_asgn_index_cmd.txt b/test/yarp/snapshots/whitequark/op_asgn_index_cmd.txt
deleted file mode 100644
index 9dda56d651d9bd..00000000000000
--- a/test/yarp/snapshots/whitequark/op_asgn_index_cmd.txt
+++ /dev/null
@@ -1,41 +0,0 @@
-ProgramNode(0...18)(
-  [],
-  StatementsNode(0...18)(
-    [CallOperatorWriteNode(0...18)(
-       CallNode(0...3)(nil, nil, (0...3), nil, nil, nil, nil, 2, "foo"),
-       nil,
-       (3...9),
-       (3...4),
-       ArgumentsNode(4...8)([IntegerNode(4...5)(), IntegerNode(7...8)()]),
-       (8...9),
-       0,
-       "[]",
-       "[]=",
-       :+,
-       (10...12),
-       CallNode(13...18)(
-         nil,
-         nil,
-         (13...14),
-         nil,
-         ArgumentsNode(15...18)(
-           [CallNode(15...18)(
-              nil,
-              nil,
-              (15...18),
-              nil,
-              nil,
-              nil,
-              nil,
-              2,
-              "foo"
-            )]
-         ),
-         nil,
-         nil,
-         0,
-         "m"
-       )
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/whitequark/optarg.txt b/test/yarp/snapshots/whitequark/optarg.txt
deleted file mode 100644
index 2cbb681c617ec8..00000000000000
--- a/test/yarp/snapshots/whitequark/optarg.txt
+++ /dev/null
@@ -1,63 +0,0 @@
-ProgramNode(0...44)(
-  [],
-  StatementsNode(0...44)(
-    [DefNode(0...18)(
-       (4...5),
-       nil,
-       ParametersNode(6...13)(
-         [],
-         [OptionalParameterNode(6...13)(
-            :foo,
-            (6...9),
-            (10...11),
-            IntegerNode(12...13)()
-          )],
-         [],
-         nil,
-         [],
-         nil,
-         nil
-       ),
-       nil,
-       [:foo],
-       (0...3),
-       nil,
-       nil,
-       nil,
-       nil,
-       (15...18)
-     ),
-     DefNode(20...44)(
-       (24...25),
-       nil,
-       ParametersNode(26...38)(
-         [],
-         [OptionalParameterNode(26...31)(
-            :foo,
-            (26...29),
-            (29...30),
-            IntegerNode(30...31)()
-          ),
-          OptionalParameterNode(33...38)(
-            :bar,
-            (33...36),
-            (36...37),
-            IntegerNode(37...38)()
-          )],
-         [],
-         nil,
-         [],
-         nil,
-         nil
-       ),
-       nil,
-       [:foo, :bar],
-       (20...23),
-       nil,
-       (25...26),
-       (38...39),
-       nil,
-       (41...44)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/whitequark/or.txt b/test/yarp/snapshots/whitequark/or.txt
deleted file mode 100644
index fb1599df1da051..00000000000000
--- a/test/yarp/snapshots/whitequark/or.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-ProgramNode(0...22)(
-  [],
-  StatementsNode(0...22)(
-    [OrNode(0...10)(
-       CallNode(0...3)(nil, nil, (0...3), nil, nil, nil, nil, 2, "foo"),
-       CallNode(7...10)(nil, nil, (7...10), nil, nil, nil, nil, 2, "bar"),
-       (4...6)
-     ),
-     OrNode(12...22)(
-       CallNode(12...15)(nil, nil, (12...15), nil, nil, nil, nil, 2, "foo"),
-       CallNode(19...22)(nil, nil, (19...22), nil, nil, nil, nil, 2, "bar"),
-       (16...18)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/whitequark/or_asgn.txt b/test/yarp/snapshots/whitequark/or_asgn.txt
deleted file mode 100644
index f681a319824893..00000000000000
--- a/test/yarp/snapshots/whitequark/or_asgn.txt
+++ /dev/null
@@ -1,33 +0,0 @@
-ProgramNode(0...28)(
-  [],
-  StatementsNode(0...28)(
-    [CallOrWriteNode(0...11)(
-       CallNode(0...3)(nil, nil, (0...3), nil, nil, nil, nil, 2, "foo"),
-       (3...4),
-       (4...5),
-       nil,
-       nil,
-       nil,
-       0,
-       "a",
-       "a=",
-       (6...9),
-       IntegerNode(10...11)()
-     ),
-     CallOrWriteNode(13...28)(
-       CallNode(13...16)(nil, nil, (13...16), nil, nil, nil, nil, 2, "foo"),
-       nil,
-       (16...22),
-       (16...17),
-       ArgumentsNode(17...21)(
-         [IntegerNode(17...18)(), IntegerNode(20...21)()]
-       ),
-       (21...22),
-       0,
-       "[]",
-       "[]=",
-       (23...26),
-       IntegerNode(27...28)()
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/whitequark/parser_bug_272.txt b/test/yarp/snapshots/whitequark/parser_bug_272.txt
deleted file mode 100644
index 0cb194d1ae4126..00000000000000
--- a/test/yarp/snapshots/whitequark/parser_bug_272.txt
+++ /dev/null
@@ -1,35 +0,0 @@
-ProgramNode(0...15)(
-  [],
-  StatementsNode(0...15)(
-    [CallNode(0...15)(
-       nil,
-       nil,
-       (0...1),
-       nil,
-       ArgumentsNode(2...4)([InstanceVariableReadNode(2...4)(:@b)]),
-       nil,
-       BlockNode(5...15)(
-         [:c],
-         BlockParametersNode(8...11)(
-           ParametersNode(9...10)(
-             [RequiredParameterNode(9...10)(:c)],
-             [],
-             [],
-             nil,
-             [],
-             nil,
-             nil
-           ),
-           [],
-           (8...9),
-           (10...11)
-         ),
-         nil,
-         (5...7),
-         (12...15)
-       ),
-       0,
-       "a"
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/whitequark/parser_bug_490.txt b/test/yarp/snapshots/whitequark/parser_bug_490.txt
deleted file mode 100644
index b3b5b04a4a4baf..00000000000000
--- a/test/yarp/snapshots/whitequark/parser_bug_490.txt
+++ /dev/null
@@ -1,100 +0,0 @@
-ProgramNode(0...132)(
-  [],
-  StatementsNode(0...132)(
-    [DefNode(0...39)(
-       (4...5),
-       nil,
-       nil,
-       StatementsNode(7...34)(
-         [SingletonClassNode(7...34)(
-            [],
-            (7...12),
-            (13...15),
-            SelfNode(16...20)(),
-            StatementsNode(22...29)(
-              [ConstantWriteNode(22...29)(
-                 :A,
-                 (22...23),
-                 NilNode(26...29)(),
-                 (24...25)
-               )]
-            ),
-            (31...34)
-          )]
-       ),
-       [],
-       (0...3),
-       nil,
-       nil,
-       nil,
-       nil,
-       (36...39)
-     ),
-     DefNode(41...85)(
-       (45...46),
-       nil,
-       nil,
-       StatementsNode(48...80)(
-         [SingletonClassNode(48...80)(
-            [],
-            (48...53),
-            (54...56),
-            SelfNode(57...61)(),
-            StatementsNode(63...75)(
-              [ClassNode(63...75)(
-                 [],
-                 (63...68),
-                 ConstantReadNode(69...70)(:C),
-                 nil,
-                 nil,
-                 nil,
-                 (72...75),
-                 :C,
-                 :C
-               )]
-            ),
-            (77...80)
-          )]
-       ),
-       [],
-       (41...44),
-       nil,
-       nil,
-       nil,
-       nil,
-       (82...85)
-     ),
-     DefNode(87...132)(
-       (91...92),
-       nil,
-       nil,
-       StatementsNode(94...127)(
-         [SingletonClassNode(94...127)(
-            [],
-            (94...99),
-            (100...102),
-            SelfNode(103...107)(),
-            StatementsNode(109...122)(
-              [ModuleNode(109...122)(
-                 [],
-                 (109...115),
-                 ConstantReadNode(116...117)(:M),
-                 nil,
-                 (119...122),
-                 :M,
-                 :M
-               )]
-            ),
-            (124...127)
-          )]
-       ),
-       [],
-       (87...90),
-       nil,
-       nil,
-       nil,
-       nil,
-       (129...132)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/whitequark/parser_bug_507.txt b/test/yarp/snapshots/whitequark/parser_bug_507.txt
deleted file mode 100644
index f305b7daeab39a..00000000000000
--- a/test/yarp/snapshots/whitequark/parser_bug_507.txt
+++ /dev/null
@@ -1,32 +0,0 @@
-ProgramNode(0...19)(
-  [:m],
-  StatementsNode(0...19)(
-    [LocalVariableWriteNode(0...19)(
-       :m,
-       0,
-       (0...1),
-       LambdaNode(4...19)(
-         [:args],
-         (4...6),
-         (13...15),
-         (16...19),
-         BlockParametersNode(7...12)(
-           ParametersNode(7...12)(
-             [],
-             [],
-             [],
-             RestParameterNode(7...12)((7...8), (8...12)),
-             [],
-             nil,
-             nil
-           ),
-           [],
-           nil,
-           nil
-         ),
-         nil
-       ),
-       (2...3)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/whitequark/parser_bug_518.txt b/test/yarp/snapshots/whitequark/parser_bug_518.txt
deleted file mode 100644
index fc53bcb5274727..00000000000000
--- a/test/yarp/snapshots/whitequark/parser_bug_518.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-ProgramNode(0...15)(
-  [],
-  StatementsNode(0...15)(
-    [ClassNode(0...15)(
-       [],
-       (0...5),
-       ConstantReadNode(6...7)(:A),
-       (8...9),
-       ConstantReadNode(10...11)(:B),
-       nil,
-       (12...15),
-       :A,
-       :A
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/whitequark/parser_bug_525.txt b/test/yarp/snapshots/whitequark/parser_bug_525.txt
deleted file mode 100644
index 0b5c2a5a44f77f..00000000000000
--- a/test/yarp/snapshots/whitequark/parser_bug_525.txt
+++ /dev/null
@@ -1,52 +0,0 @@
-ProgramNode(0...32)(
-  [],
-  StatementsNode(0...32)(
-    [CallNode(0...32)(
-       nil,
-       nil,
-       (0...2),
-       nil,
-       ArgumentsNode(3...11)(
-         [KeywordHashNode(3...11)(
-            [AssocNode(3...11)(
-               SymbolNode(3...5)((3...4), (4...5), nil, "k"),
-               CallNode(9...11)(
-                 nil,
-                 nil,
-                 (9...11),
-                 nil,
-                 nil,
-                 nil,
-                 nil,
-                 2,
-                 "m2"
-               ),
-               (6...8)
-             )]
-          )]
-       ),
-       nil,
-       BlockNode(12...32)(
-         [],
-         nil,
-         StatementsNode(16...27)(
-           [CallNode(16...27)(
-              nil,
-              nil,
-              (16...18),
-              (18...19),
-              nil,
-              (19...20),
-              BlockNode(21...27)([], nil, nil, (21...23), (24...27)),
-              0,
-              "m3"
-            )]
-         ),
-         (12...14),
-         (29...32)
-       ),
-       0,
-       "m1"
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/whitequark/parser_bug_604.txt b/test/yarp/snapshots/whitequark/parser_bug_604.txt
deleted file mode 100644
index ff732e34c57b67..00000000000000
--- a/test/yarp/snapshots/whitequark/parser_bug_604.txt
+++ /dev/null
@@ -1,30 +0,0 @@
-ProgramNode(0...14)(
-  [],
-  StatementsNode(0...14)(
-    [CallNode(0...14)(
-       nil,
-       nil,
-       (0...1),
-       nil,
-       ArgumentsNode(2...7)(
-         [CallNode(2...7)(
-            CallNode(2...3)(nil, nil, (2...3), nil, nil, nil, nil, 2, "a"),
-            nil,
-            (4...5),
-            nil,
-            ArgumentsNode(6...7)(
-              [CallNode(6...7)(nil, nil, (6...7), nil, nil, nil, nil, 2, "b")]
-            ),
-            nil,
-            nil,
-            0,
-            "+"
-          )]
-       ),
-       nil,
-       BlockNode(8...14)([], nil, nil, (8...10), (11...14)),
-       0,
-       "m"
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/whitequark/parser_bug_640.txt b/test/yarp/snapshots/whitequark/parser_bug_640.txt
deleted file mode 100644
index 5ca73c08a5739a..00000000000000
--- a/test/yarp/snapshots/whitequark/parser_bug_640.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-ProgramNode(0...6)(
-  [],
-  StatementsNode(0...6)(
-    [InterpolatedStringNode(0...6)(
-       (0...6),
-       [StringNode(7...20)(nil, (7...20), nil, "bazqux\n")],
-       (20...24)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/whitequark/parser_bug_645.txt b/test/yarp/snapshots/whitequark/parser_bug_645.txt
deleted file mode 100644
index 27680b00aecf85..00000000000000
--- a/test/yarp/snapshots/whitequark/parser_bug_645.txt
+++ /dev/null
@@ -1,31 +0,0 @@
-ProgramNode(0...14)(
-  [],
-  StatementsNode(0...14)(
-    [LambdaNode(0...14)(
-       [:arg],
-       (0...2),
-       (12...13),
-       (13...14),
-       BlockParametersNode(3...11)(
-         ParametersNode(4...10)(
-           [],
-           [OptionalParameterNode(4...10)(
-              :arg,
-              (4...7),
-              (7...8),
-              HashNode(8...10)((8...9), [], (9...10))
-            )],
-           [],
-           nil,
-           [],
-           nil,
-           nil
-         ),
-         [],
-         (3...4),
-         (10...11)
-       ),
-       nil
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/whitequark/parser_bug_830.txt b/test/yarp/snapshots/whitequark/parser_bug_830.txt
deleted file mode 100644
index c8f0c34e7dafc1..00000000000000
--- a/test/yarp/snapshots/whitequark/parser_bug_830.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-ProgramNode(0...4)(
-  [],
-  StatementsNode(0...4)(
-    [RegularExpressionNode(0...4)((0...1), (1...3), (3...4), "(", 0)]
-  )
-)
diff --git a/test/yarp/snapshots/whitequark/parser_drops_truncated_parts_of_squiggly_heredoc.txt b/test/yarp/snapshots/whitequark/parser_drops_truncated_parts_of_squiggly_heredoc.txt
deleted file mode 100644
index d2fe26f163da54..00000000000000
--- a/test/yarp/snapshots/whitequark/parser_drops_truncated_parts_of_squiggly_heredoc.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-ProgramNode(0...7)(
-  [],
-  StatementsNode(0...7)(
-    [InterpolatedStringNode(0...7)(
-       (0...7),
-       [EmbeddedStatementsNode(10...13)((10...12), nil, (12...13)),
-        StringNode(13...14)(nil, (13...14), nil, "\n")],
-       (14...19)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/whitequark/parser_slash_slash_n_escaping_in_literals.txt b/test/yarp/snapshots/whitequark/parser_slash_slash_n_escaping_in_literals.txt
deleted file mode 100644
index 3a3377f96d6aa2..00000000000000
--- a/test/yarp/snapshots/whitequark/parser_slash_slash_n_escaping_in_literals.txt
+++ /dev/null
@@ -1,63 +0,0 @@
-ProgramNode(0...210)(
-  [],
-  StatementsNode(0...210)(
-    [StringNode(0...6)((0...1), (1...5), (5...6), "ab"),
-     ArrayNode(8...16)(
-       [SymbolNode(11...15)(nil, (11...15), nil, "ab")],
-       (8...11),
-       (15...16)
-     ),
-     StringNode(18...26)((18...21), (21...25), (25...26), "ab"),
-     ArrayNode(28...36)(
-       [StringNode(31...35)(nil, (31...35), nil, "ab")],
-       (28...31),
-       (35...36)
-     ),
-     ArrayNode(38...46)(
-       [SymbolNode(41...45)(nil, (41...45), nil, "a\\\n" + "b")],
-       (38...41),
-       (45...46)
-     ),
-     StringNode(48...56)((48...51), (51...55), (55...56), "a\\\n" + "b"),
-     RegularExpressionNode(58...66)((58...61), (61...65), (65...66), "ab", 0),
-     SymbolNode(68...76)((68...71), (71...75), (75...76), "ab"),
-     ArrayNode(78...86)(
-       [StringNode(81...85)(nil, (81...85), nil, "a\\\n" + "b")],
-       (78...81),
-       (85...86)
-     ),
-     XStringNode(88...96)((88...91), (91...95), (95...96), "ab"),
-     StringNode(98...105)((98...100), (100...104), (104...105), "ab"),
-     StringNode(107...113)(
-       (107...108),
-       (108...112),
-       (112...113),
-       "a\\\n" + "b"
-     ),
-     RegularExpressionNode(115...121)(
-       (115...116),
-       (116...120),
-       (120...121),
-       "ab",
-       0
-     ),
-     SymbolNode(123...130)((123...125), (125...129), (129...130), "ab"),
-     SymbolNode(132...139)((132...134), (134...138), (138...139), "ab"),
-     InterpolatedStringNode(141...150)(
-       (141...150),
-       [StringNode(151...156)(nil, (151...156), nil, "ab\n")],
-       (156...161)
-     ),
-     InterpolatedStringNode(162...171)(
-       (162...171),
-       [StringNode(172...177)(nil, (172...177), nil, "a\\\n" + "b\n")],
-       (177...182)
-     ),
-     InterpolatedXStringNode(183...192)(
-       (183...192),
-       [StringNode(193...198)(nil, (193...198), nil, "ab\n")],
-       (198...203)
-     ),
-     XStringNode(204...210)((204...205), (205...209), (209...210), "ab")]
-  )
-)
diff --git a/test/yarp/snapshots/whitequark/pattern_matching__FILE__LINE_literals.txt b/test/yarp/snapshots/whitequark/pattern_matching__FILE__LINE_literals.txt
deleted file mode 100644
index 55938adfd8c113..00000000000000
--- a/test/yarp/snapshots/whitequark/pattern_matching__FILE__LINE_literals.txt
+++ /dev/null
@@ -1,46 +0,0 @@
-ProgramNode(8...111)(
-  [],
-  StatementsNode(8...111)(
-    [CaseNode(8...111)(
-       ArrayNode(13...51)(
-         [SourceFileNode(14...22)(
-            "whitequark/pattern_matching__FILE__LINE_literals.txt"
-          ),
-          CallNode(24...36)(
-            SourceLineNode(24...32)(),
-            nil,
-            (33...34),
-            nil,
-            ArgumentsNode(35...36)([IntegerNode(35...36)()]),
-            nil,
-            nil,
-            0,
-            "+"
-          ),
-          SourceEncodingNode(38...50)()],
-         (13...14),
-         (50...51)
-       ),
-       [InNode(62...99)(
-          ArrayPatternNode(65...99)(
-            nil,
-            [SourceFileNode(66...74)(
-               "whitequark/pattern_matching__FILE__LINE_literals.txt"
-             ),
-             SourceLineNode(76...84)(),
-             SourceEncodingNode(86...98)()],
-            nil,
-            [],
-            (65...66),
-            (98...99)
-          ),
-          nil,
-          (62...64),
-          nil
-        )],
-       nil,
-       (8...12),
-       (108...111)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/whitequark/pattern_matching_blank_else.txt b/test/yarp/snapshots/whitequark/pattern_matching_blank_else.txt
deleted file mode 100644
index df949e90b0db1e..00000000000000
--- a/test/yarp/snapshots/whitequark/pattern_matching_blank_else.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-ProgramNode(0...26)(
-  [],
-  StatementsNode(0...26)(
-    [CaseNode(0...26)(
-       IntegerNode(5...6)(),
-       [InNode(8...15)(
-          IntegerNode(11...12)(),
-          StatementsNode(14...15)([IntegerNode(14...15)()]),
-          (8...10),
-          nil
-        )],
-       ElseNode(17...26)((17...21), nil, (23...26)),
-       (0...4),
-       (23...26)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/whitequark/pattern_matching_else.txt b/test/yarp/snapshots/whitequark/pattern_matching_else.txt
deleted file mode 100644
index d776a0ba1eb096..00000000000000
--- a/test/yarp/snapshots/whitequark/pattern_matching_else.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-ProgramNode(0...29)(
-  [],
-  StatementsNode(0...29)(
-    [CaseNode(0...29)(
-       IntegerNode(5...6)(),
-       [InNode(8...15)(
-          IntegerNode(11...12)(),
-          StatementsNode(14...15)([IntegerNode(14...15)()]),
-          (8...10),
-          nil
-        )],
-       ElseNode(17...29)(
-         (17...21),
-         StatementsNode(23...24)([IntegerNode(23...24)()]),
-         (26...29)
-       ),
-       (0...4),
-       (26...29)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/whitequark/pattern_matching_single_line.txt b/test/yarp/snapshots/whitequark/pattern_matching_single_line.txt
deleted file mode 100644
index c428d83cda5e3d..00000000000000
--- a/test/yarp/snapshots/whitequark/pattern_matching_single_line.txt
+++ /dev/null
@@ -1,31 +0,0 @@
-ProgramNode(0...24)(
-  [:a],
-  StatementsNode(0...24)(
-    [MatchRequiredNode(0...8)(
-       IntegerNode(0...1)(),
-       ArrayPatternNode(5...8)(
-         nil,
-         [LocalVariableTargetNode(6...7)(:a, 0)],
-         nil,
-         [],
-         (5...6),
-         (7...8)
-       ),
-       (2...4)
-     ),
-     LocalVariableReadNode(10...11)(:a, 0),
-     MatchPredicateNode(13...21)(
-       IntegerNode(13...14)(),
-       ArrayPatternNode(18...21)(
-         nil,
-         [LocalVariableTargetNode(19...20)(:a, 0)],
-         nil,
-         [],
-         (18...19),
-         (20...21)
-       ),
-       (15...17)
-     ),
-     LocalVariableReadNode(23...24)(:a, 0)]
-  )
-)
diff --git a/test/yarp/snapshots/whitequark/pattern_matching_single_line_allowed_omission_of_parentheses.txt b/test/yarp/snapshots/whitequark/pattern_matching_single_line_allowed_omission_of_parentheses.txt
deleted file mode 100644
index 1e009aa3db8a71..00000000000000
--- a/test/yarp/snapshots/whitequark/pattern_matching_single_line_allowed_omission_of_parentheses.txt
+++ /dev/null
@@ -1,137 +0,0 @@
-ProgramNode(0...142)(
-  [:a, :b, :value],
-  StatementsNode(0...142)(
-    [MatchRequiredNode(0...14)(
-       ArrayNode(0...6)(
-         [IntegerNode(1...2)(), IntegerNode(4...5)()],
-         (0...1),
-         (5...6)
-       ),
-       ArrayPatternNode(10...14)(
-         nil,
-         [LocalVariableTargetNode(10...11)(:a, 0),
-          LocalVariableTargetNode(13...14)(:b, 0)],
-         nil,
-         [],
-         nil,
-         nil
-       ),
-       (7...9)
-     ),
-     LocalVariableReadNode(16...17)(:a, 0),
-     MatchPredicateNode(19...33)(
-       ArrayNode(19...25)(
-         [IntegerNode(20...21)(), IntegerNode(23...24)()],
-         (19...20),
-         (24...25)
-       ),
-       ArrayPatternNode(29...33)(
-         nil,
-         [LocalVariableTargetNode(29...30)(:a, 0),
-          LocalVariableTargetNode(32...33)(:b, 0)],
-         nil,
-         [],
-         nil,
-         nil
-       ),
-       (26...28)
-     ),
-     LocalVariableReadNode(35...36)(:a, 0),
-     MatchRequiredNode(38...50)(
-       HashNode(38...44)(
-         (38...39),
-         [AssocNode(39...43)(
-            SymbolNode(39...41)(nil, (39...40), (40...41), "a"),
-            IntegerNode(42...43)(),
-            nil
-          )],
-         (43...44)
-       ),
-       HashPatternNode(48...50)(
-         nil,
-         [AssocNode(48...50)(
-            SymbolNode(48...50)(nil, (48...49), (49...50), "a"),
-            nil,
-            nil
-          )],
-         nil,
-         nil,
-         nil
-       ),
-       (45...47)
-     ),
-     LocalVariableReadNode(52...53)(:a, 0),
-     MatchPredicateNode(55...67)(
-       HashNode(55...61)(
-         (55...56),
-         [AssocNode(56...60)(
-            SymbolNode(56...58)(nil, (56...57), (57...58), "a"),
-            IntegerNode(59...60)(),
-            nil
-          )],
-         (60...61)
-       ),
-       HashPatternNode(65...67)(
-         nil,
-         [AssocNode(65...67)(
-            SymbolNode(65...67)(nil, (65...66), (66...67), "a"),
-            nil,
-            nil
-          )],
-         nil,
-         nil,
-         nil
-       ),
-       (62...64)
-     ),
-     LocalVariableReadNode(69...70)(:a, 0),
-     MatchRequiredNode(72...99)(
-       HashNode(72...85)(
-         (72...73),
-         [AssocNode(73...84)(
-            SymbolNode(73...77)(nil, (73...76), (76...77), "key"),
-            SymbolNode(78...84)((78...79), (79...84), nil, "value"),
-            nil
-          )],
-         (84...85)
-       ),
-       HashPatternNode(89...99)(
-         nil,
-         [AssocNode(89...99)(
-            SymbolNode(89...93)(nil, (89...92), (92...93), "key"),
-            LocalVariableTargetNode(94...99)(:value, 0),
-            nil
-          )],
-         nil,
-         nil,
-         nil
-       ),
-       (86...88)
-     ),
-     LocalVariableReadNode(101...106)(:value, 0),
-     MatchPredicateNode(108...135)(
-       HashNode(108...121)(
-         (108...109),
-         [AssocNode(109...120)(
-            SymbolNode(109...113)(nil, (109...112), (112...113), "key"),
-            SymbolNode(114...120)((114...115), (115...120), nil, "value"),
-            nil
-          )],
-         (120...121)
-       ),
-       HashPatternNode(125...135)(
-         nil,
-         [AssocNode(125...135)(
-            SymbolNode(125...129)(nil, (125...128), (128...129), "key"),
-            LocalVariableTargetNode(130...135)(:value, 0),
-            nil
-          )],
-         nil,
-         nil,
-         nil
-       ),
-       (122...124)
-     ),
-     LocalVariableReadNode(137...142)(:value, 0)]
-  )
-)
diff --git a/test/yarp/snapshots/whitequark/postexe.txt b/test/yarp/snapshots/whitequark/postexe.txt
deleted file mode 100644
index d6af82bf15c949..00000000000000
--- a/test/yarp/snapshots/whitequark/postexe.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-ProgramNode(0...9)(
-  [],
-  StatementsNode(0...9)(
-    [PostExecutionNode(0...9)(
-       StatementsNode(6...7)([IntegerNode(6...7)()]),
-       (0...3),
-       (4...5),
-       (8...9)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/whitequark/preexe.txt b/test/yarp/snapshots/whitequark/preexe.txt
deleted file mode 100644
index bfa071f72c87c1..00000000000000
--- a/test/yarp/snapshots/whitequark/preexe.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-ProgramNode(0...11)(
-  [],
-  StatementsNode(0...11)(
-    [PreExecutionNode(0...11)(
-       StatementsNode(8...9)([IntegerNode(8...9)()]),
-       (0...5),
-       (6...7),
-       (10...11)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/whitequark/procarg0.txt b/test/yarp/snapshots/whitequark/procarg0.txt
deleted file mode 100644
index fb43e8721080b1..00000000000000
--- a/test/yarp/snapshots/whitequark/procarg0.txt
+++ /dev/null
@@ -1,70 +0,0 @@
-ProgramNode(0...32)(
-  [],
-  StatementsNode(0...32)(
-    [CallNode(0...18)(
-       nil,
-       nil,
-       (0...1),
-       nil,
-       nil,
-       nil,
-       BlockNode(2...18)(
-         [:foo, :bar],
-         BlockParametersNode(4...16)(
-           ParametersNode(5...15)(
-             [RequiredDestructuredParameterNode(5...15)(
-                [RequiredParameterNode(6...9)(:foo),
-                 RequiredParameterNode(11...14)(:bar)],
-                (5...6),
-                (14...15)
-              )],
-             [],
-             [],
-             nil,
-             [],
-             nil,
-             nil
-           ),
-           [],
-           (4...5),
-           (15...16)
-         ),
-         nil,
-         (2...3),
-         (17...18)
-       ),
-       0,
-       "m"
-     ),
-     CallNode(21...32)(
-       nil,
-       nil,
-       (21...22),
-       nil,
-       nil,
-       nil,
-       BlockNode(23...32)(
-         [:foo],
-         BlockParametersNode(25...30)(
-           ParametersNode(26...29)(
-             [RequiredParameterNode(26...29)(:foo)],
-             [],
-             [],
-             nil,
-             [],
-             nil,
-             nil
-           ),
-           [],
-           (25...26),
-           (29...30)
-         ),
-         nil,
-         (23...24),
-         (31...32)
-       ),
-       0,
-       "m"
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/whitequark/range_exclusive.txt b/test/yarp/snapshots/whitequark/range_exclusive.txt
deleted file mode 100644
index 4571ea317a8eb5..00000000000000
--- a/test/yarp/snapshots/whitequark/range_exclusive.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-ProgramNode(0...5)(
-  [],
-  StatementsNode(0...5)(
-    [RangeNode(0...5)(IntegerNode(0...1)(), IntegerNode(4...5)(), (1...4), 1)]
-  )
-)
diff --git a/test/yarp/snapshots/whitequark/range_inclusive.txt b/test/yarp/snapshots/whitequark/range_inclusive.txt
deleted file mode 100644
index 021f010a66920f..00000000000000
--- a/test/yarp/snapshots/whitequark/range_inclusive.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-ProgramNode(0...4)(
-  [],
-  StatementsNode(0...4)(
-    [RangeNode(0...4)(IntegerNode(0...1)(), IntegerNode(3...4)(), (1...3), 0)]
-  )
-)
diff --git a/test/yarp/snapshots/whitequark/rational.txt b/test/yarp/snapshots/whitequark/rational.txt
deleted file mode 100644
index dfa7d0c29f562d..00000000000000
--- a/test/yarp/snapshots/whitequark/rational.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-ProgramNode(0...10)(
-  [],
-  StatementsNode(0...10)(
-    [RationalNode(0...5)(FloatNode(0...4)()),
-     RationalNode(7...10)(IntegerNode(7...9)())]
-  )
-)
diff --git a/test/yarp/snapshots/whitequark/redo.txt b/test/yarp/snapshots/whitequark/redo.txt
deleted file mode 100644
index 99ab66873b8c13..00000000000000
--- a/test/yarp/snapshots/whitequark/redo.txt
+++ /dev/null
@@ -1 +0,0 @@
-ProgramNode(0...4)([], StatementsNode(0...4)([RedoNode(0...4)()]))
diff --git a/test/yarp/snapshots/whitequark/regex_interp.txt b/test/yarp/snapshots/whitequark/regex_interp.txt
deleted file mode 100644
index d314875cc4c25f..00000000000000
--- a/test/yarp/snapshots/whitequark/regex_interp.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-ProgramNode(0...14)(
-  [],
-  StatementsNode(0...14)(
-    [InterpolatedRegularExpressionNode(0...14)(
-       (0...1),
-       [StringNode(1...4)(nil, (1...4), nil, "foo"),
-        EmbeddedStatementsNode(4...10)(
-          (4...6),
-          StatementsNode(6...9)(
-            [CallNode(6...9)(nil, nil, (6...9), nil, nil, nil, nil, 2, "bar")]
-          ),
-          (9...10)
-        ),
-        StringNode(10...13)(nil, (10...13), nil, "baz")],
-       (13...14),
-       0
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/whitequark/regex_plain.txt b/test/yarp/snapshots/whitequark/regex_plain.txt
deleted file mode 100644
index cf2728065e71f8..00000000000000
--- a/test/yarp/snapshots/whitequark/regex_plain.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-ProgramNode(0...10)(
-  [],
-  StatementsNode(0...10)(
-    [RegularExpressionNode(0...10)((0...1), (1...7), (7...10), "source", 3)]
-  )
-)
diff --git a/test/yarp/snapshots/whitequark/resbody_list.txt b/test/yarp/snapshots/whitequark/resbody_list.txt
deleted file mode 100644
index 8456996663daa9..00000000000000
--- a/test/yarp/snapshots/whitequark/resbody_list.txt
+++ /dev/null
@@ -1,34 +0,0 @@
-ProgramNode(0...39)(
-  [],
-  StatementsNode(0...39)(
-    [BeginNode(0...39)(
-       (0...5),
-       StatementsNode(7...11)(
-         [CallNode(7...11)(nil, nil, (7...11), nil, nil, nil, nil, 2, "meth")]
-       ),
-       RescueNode(13...34)(
-         (13...19),
-         [ConstantReadNode(20...29)(:Exception)],
-         nil,
-         nil,
-         StatementsNode(31...34)(
-           [CallNode(31...34)(
-              nil,
-              nil,
-              (31...34),
-              nil,
-              nil,
-              nil,
-              nil,
-              2,
-              "bar"
-            )]
-         ),
-         nil
-       ),
-       nil,
-       nil,
-       (36...39)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/whitequark/resbody_list_mrhs.txt b/test/yarp/snapshots/whitequark/resbody_list_mrhs.txt
deleted file mode 100644
index f4160d82daf037..00000000000000
--- a/test/yarp/snapshots/whitequark/resbody_list_mrhs.txt
+++ /dev/null
@@ -1,45 +0,0 @@
-ProgramNode(0...44)(
-  [],
-  StatementsNode(0...44)(
-    [BeginNode(0...44)(
-       (0...5),
-       StatementsNode(7...11)(
-         [CallNode(7...11)(nil, nil, (7...11), nil, nil, nil, nil, 2, "meth")]
-       ),
-       RescueNode(13...39)(
-         (13...19),
-         [ConstantReadNode(20...29)(:Exception),
-          CallNode(31...34)(
-            nil,
-            nil,
-            (31...34),
-            nil,
-            nil,
-            nil,
-            nil,
-            2,
-            "foo"
-          )],
-         nil,
-         nil,
-         StatementsNode(36...39)(
-           [CallNode(36...39)(
-              nil,
-              nil,
-              (36...39),
-              nil,
-              nil,
-              nil,
-              nil,
-              2,
-              "bar"
-            )]
-         ),
-         nil
-       ),
-       nil,
-       nil,
-       (41...44)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/whitequark/resbody_list_var.txt b/test/yarp/snapshots/whitequark/resbody_list_var.txt
deleted file mode 100644
index 660abcc181dfff..00000000000000
--- a/test/yarp/snapshots/whitequark/resbody_list_var.txt
+++ /dev/null
@@ -1,44 +0,0 @@
-ProgramNode(0...39)(
-  [:ex],
-  StatementsNode(0...39)(
-    [BeginNode(0...39)(
-       (0...5),
-       StatementsNode(7...11)(
-         [CallNode(7...11)(nil, nil, (7...11), nil, nil, nil, nil, 2, "meth")]
-       ),
-       RescueNode(13...34)(
-         (13...19),
-         [CallNode(20...23)(
-            nil,
-            nil,
-            (20...23),
-            nil,
-            nil,
-            nil,
-            nil,
-            2,
-            "foo"
-          )],
-         (24...26),
-         LocalVariableTargetNode(27...29)(:ex, 0),
-         StatementsNode(31...34)(
-           [CallNode(31...34)(
-              nil,
-              nil,
-              (31...34),
-              nil,
-              nil,
-              nil,
-              nil,
-              2,
-              "bar"
-            )]
-         ),
-         nil
-       ),
-       nil,
-       nil,
-       (36...39)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/whitequark/resbody_var.txt b/test/yarp/snapshots/whitequark/resbody_var.txt
deleted file mode 100644
index e88a7612dc1b2a..00000000000000
--- a/test/yarp/snapshots/whitequark/resbody_var.txt
+++ /dev/null
@@ -1,73 +0,0 @@
-ProgramNode(0...73)(
-  [:ex],
-  StatementsNode(0...73)(
-    [BeginNode(0...36)(
-       (0...5),
-       StatementsNode(7...11)(
-         [CallNode(7...11)(nil, nil, (7...11), nil, nil, nil, nil, 2, "meth")]
-       ),
-       RescueNode(13...31)(
-         (13...19),
-         [],
-         (20...22),
-         InstanceVariableTargetNode(23...26)(:@ex),
-         StatementsNode(28...31)(
-           [CallNode(28...31)(
-              nil,
-              nil,
-              (28...31),
-              nil,
-              nil,
-              nil,
-              nil,
-              2,
-              "bar"
-            )]
-         ),
-         nil
-       ),
-       nil,
-       nil,
-       (33...36)
-     ),
-     BeginNode(38...73)(
-       (38...43),
-       StatementsNode(45...49)(
-         [CallNode(45...49)(
-            nil,
-            nil,
-            (45...49),
-            nil,
-            nil,
-            nil,
-            nil,
-            2,
-            "meth"
-          )]
-       ),
-       RescueNode(51...68)(
-         (51...57),
-         [],
-         (58...60),
-         LocalVariableTargetNode(61...63)(:ex, 0),
-         StatementsNode(65...68)(
-           [CallNode(65...68)(
-              nil,
-              nil,
-              (65...68),
-              nil,
-              nil,
-              nil,
-              nil,
-              2,
-              "bar"
-            )]
-         ),
-         nil
-       ),
-       nil,
-       nil,
-       (70...73)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/whitequark/rescue.txt b/test/yarp/snapshots/whitequark/rescue.txt
deleted file mode 100644
index 6a14aa0803248c..00000000000000
--- a/test/yarp/snapshots/whitequark/rescue.txt
+++ /dev/null
@@ -1,34 +0,0 @@
-ProgramNode(0...29)(
-  [],
-  StatementsNode(0...29)(
-    [BeginNode(0...29)(
-       (0...5),
-       StatementsNode(7...11)(
-         [CallNode(7...11)(nil, nil, (7...11), nil, nil, nil, nil, 2, "meth")]
-       ),
-       RescueNode(13...24)(
-         (13...19),
-         [],
-         nil,
-         nil,
-         StatementsNode(21...24)(
-           [CallNode(21...24)(
-              nil,
-              nil,
-              (21...24),
-              nil,
-              nil,
-              nil,
-              nil,
-              2,
-              "foo"
-            )]
-         ),
-         nil
-       ),
-       nil,
-       nil,
-       (26...29)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/whitequark/rescue_else.txt b/test/yarp/snapshots/whitequark/rescue_else.txt
deleted file mode 100644
index 5359bb2a626b4d..00000000000000
--- a/test/yarp/snapshots/whitequark/rescue_else.txt
+++ /dev/null
@@ -1,50 +0,0 @@
-ProgramNode(0...40)(
-  [],
-  StatementsNode(0...40)(
-    [BeginNode(0...40)(
-       (0...5),
-       StatementsNode(7...11)(
-         [CallNode(7...11)(nil, nil, (7...11), nil, nil, nil, nil, 2, "meth")]
-       ),
-       RescueNode(13...24)(
-         (13...19),
-         [],
-         nil,
-         nil,
-         StatementsNode(21...24)(
-           [CallNode(21...24)(
-              nil,
-              nil,
-              (21...24),
-              nil,
-              nil,
-              nil,
-              nil,
-              2,
-              "foo"
-            )]
-         ),
-         nil
-       ),
-       ElseNode(26...40)(
-         (26...30),
-         StatementsNode(32...35)(
-           [CallNode(32...35)(
-              nil,
-              nil,
-              (32...35),
-              nil,
-              nil,
-              nil,
-              nil,
-              2,
-              "bar"
-            )]
-         ),
-         (37...40)
-       ),
-       nil,
-       (37...40)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/whitequark/rescue_else_ensure.txt b/test/yarp/snapshots/whitequark/rescue_else_ensure.txt
deleted file mode 100644
index 89fc12478464a1..00000000000000
--- a/test/yarp/snapshots/whitequark/rescue_else_ensure.txt
+++ /dev/null
@@ -1,66 +0,0 @@
-ProgramNode(0...51)(
-  [],
-  StatementsNode(0...51)(
-    [BeginNode(0...51)(
-       (0...5),
-       StatementsNode(7...11)(
-         [CallNode(7...11)(nil, nil, (7...11), nil, nil, nil, nil, 2, "meth")]
-       ),
-       RescueNode(13...24)(
-         (13...19),
-         [],
-         nil,
-         nil,
-         StatementsNode(21...24)(
-           [CallNode(21...24)(
-              nil,
-              nil,
-              (21...24),
-              nil,
-              nil,
-              nil,
-              nil,
-              2,
-              "baz"
-            )]
-         ),
-         nil
-       ),
-       ElseNode(26...42)(
-         (26...30),
-         StatementsNode(31...34)(
-           [CallNode(31...34)(
-              nil,
-              nil,
-              (31...34),
-              nil,
-              nil,
-              nil,
-              nil,
-              2,
-              "foo"
-            )]
-         ),
-         (36...42)
-       ),
-       EnsureNode(36...51)(
-         (36...42),
-         StatementsNode(44...47)(
-           [CallNode(44...47)(
-              nil,
-              nil,
-              (44...47),
-              nil,
-              nil,
-              nil,
-              nil,
-              2,
-              "bar"
-            )]
-         ),
-         (48...51)
-       ),
-       (48...51)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/whitequark/rescue_ensure.txt b/test/yarp/snapshots/whitequark/rescue_ensure.txt
deleted file mode 100644
index 719ed167fec916..00000000000000
--- a/test/yarp/snapshots/whitequark/rescue_ensure.txt
+++ /dev/null
@@ -1,50 +0,0 @@
-ProgramNode(0...42)(
-  [],
-  StatementsNode(0...42)(
-    [BeginNode(0...42)(
-       (0...5),
-       StatementsNode(7...11)(
-         [CallNode(7...11)(nil, nil, (7...11), nil, nil, nil, nil, 2, "meth")]
-       ),
-       RescueNode(13...24)(
-         (13...19),
-         [],
-         nil,
-         nil,
-         StatementsNode(21...24)(
-           [CallNode(21...24)(
-              nil,
-              nil,
-              (21...24),
-              nil,
-              nil,
-              nil,
-              nil,
-              2,
-              "baz"
-            )]
-         ),
-         nil
-       ),
-       nil,
-       EnsureNode(26...42)(
-         (26...32),
-         StatementsNode(34...37)(
-           [CallNode(34...37)(
-              nil,
-              nil,
-              (34...37),
-              nil,
-              nil,
-              nil,
-              nil,
-              2,
-              "bar"
-            )]
-         ),
-         (39...42)
-       ),
-       (39...42)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/whitequark/rescue_in_lambda_block.txt b/test/yarp/snapshots/whitequark/rescue_in_lambda_block.txt
deleted file mode 100644
index 89825a7ac412ac..00000000000000
--- a/test/yarp/snapshots/whitequark/rescue_in_lambda_block.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-ProgramNode(0...17)(
-  [],
-  StatementsNode(0...17)(
-    [LambdaNode(0...17)(
-       [],
-       (0...2),
-       (3...5),
-       (14...17),
-       nil,
-       BeginNode(6...17)(
-         nil,
-         nil,
-         RescueNode(6...12)((6...12), [], nil, nil, nil, nil),
-         nil,
-         nil,
-         (14...17)
-       )
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/whitequark/rescue_mod.txt b/test/yarp/snapshots/whitequark/rescue_mod.txt
deleted file mode 100644
index e755977e7decfa..00000000000000
--- a/test/yarp/snapshots/whitequark/rescue_mod.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-ProgramNode(0...15)(
-  [],
-  StatementsNode(0...15)(
-    [RescueModifierNode(0...15)(
-       CallNode(0...4)(nil, nil, (0...4), nil, nil, nil, nil, 2, "meth"),
-       (5...11),
-       CallNode(12...15)(nil, nil, (12...15), nil, nil, nil, nil, 2, "bar")
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/whitequark/rescue_mod_asgn.txt b/test/yarp/snapshots/whitequark/rescue_mod_asgn.txt
deleted file mode 100644
index b0ca3f6c951009..00000000000000
--- a/test/yarp/snapshots/whitequark/rescue_mod_asgn.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-ProgramNode(0...21)(
-  [:foo],
-  StatementsNode(0...21)(
-    [LocalVariableWriteNode(0...21)(
-       :foo,
-       0,
-       (0...3),
-       RescueModifierNode(6...21)(
-         CallNode(6...10)(nil, nil, (6...10), nil, nil, nil, nil, 2, "meth"),
-         (11...17),
-         CallNode(18...21)(nil, nil, (18...21), nil, nil, nil, nil, 2, "bar")
-       ),
-       (4...5)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/whitequark/rescue_mod_masgn.txt b/test/yarp/snapshots/whitequark/rescue_mod_masgn.txt
deleted file mode 100644
index 13023afc175e47..00000000000000
--- a/test/yarp/snapshots/whitequark/rescue_mod_masgn.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-ProgramNode(0...29)(
-  [:foo, :bar],
-  StatementsNode(0...29)(
-    [MultiWriteNode(0...29)(
-       [LocalVariableTargetNode(0...3)(:foo, 0),
-        LocalVariableTargetNode(5...8)(:bar, 0)],
-       (9...10),
-       RescueModifierNode(11...29)(
-         CallNode(11...15)(nil, nil, (11...15), nil, nil, nil, nil, 2, "meth"),
-         (16...22),
-         ArrayNode(23...29)(
-           [IntegerNode(24...25)(), IntegerNode(27...28)()],
-           (23...24),
-           (28...29)
-         )
-       ),
-       nil,
-       nil
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/whitequark/rescue_mod_op_assign.txt b/test/yarp/snapshots/whitequark/rescue_mod_op_assign.txt
deleted file mode 100644
index f9bfc7bfeb3649..00000000000000
--- a/test/yarp/snapshots/whitequark/rescue_mod_op_assign.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-ProgramNode(0...22)(
-  [:foo],
-  StatementsNode(0...22)(
-    [LocalVariableOperatorWriteNode(0...22)(
-       (0...3),
-       (4...6),
-       RescueModifierNode(7...22)(
-         CallNode(7...11)(nil, nil, (7...11), nil, nil, nil, nil, 2, "meth"),
-         (12...18),
-         CallNode(19...22)(nil, nil, (19...22), nil, nil, nil, nil, 2, "bar")
-       ),
-       :foo,
-       :+,
-       0
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/whitequark/rescue_without_begin_end.txt b/test/yarp/snapshots/whitequark/rescue_without_begin_end.txt
deleted file mode 100644
index 038219dc1fc636..00000000000000
--- a/test/yarp/snapshots/whitequark/rescue_without_begin_end.txt
+++ /dev/null
@@ -1,60 +0,0 @@
-ProgramNode(0...30)(
-  [],
-  StatementsNode(0...30)(
-    [CallNode(0...30)(
-       nil,
-       nil,
-       (0...4),
-       nil,
-       nil,
-       nil,
-       BlockNode(5...30)(
-         [],
-         nil,
-         BeginNode(9...30)(
-           nil,
-           StatementsNode(9...12)(
-             [CallNode(9...12)(
-                nil,
-                nil,
-                (9...12),
-                nil,
-                nil,
-                nil,
-                nil,
-                2,
-                "foo"
-              )]
-           ),
-           RescueNode(14...25)(
-             (14...20),
-             [],
-             nil,
-             nil,
-             StatementsNode(22...25)(
-               [CallNode(22...25)(
-                  nil,
-                  nil,
-                  (22...25),
-                  nil,
-                  nil,
-                  nil,
-                  nil,
-                  2,
-                  "bar"
-                )]
-             ),
-             nil
-           ),
-           nil,
-           nil,
-           (27...30)
-         ),
-         (5...7),
-         (27...30)
-       ),
-       0,
-       "meth"
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/whitequark/restarg_named.txt b/test/yarp/snapshots/whitequark/restarg_named.txt
deleted file mode 100644
index ce26b2fc67a590..00000000000000
--- a/test/yarp/snapshots/whitequark/restarg_named.txt
+++ /dev/null
@@ -1,26 +0,0 @@
-ProgramNode(0...16)(
-  [],
-  StatementsNode(0...16)(
-    [DefNode(0...16)(
-       (4...5),
-       nil,
-       ParametersNode(6...10)(
-         [],
-         [],
-         [],
-         RestParameterNode(6...10)((6...7), (7...10)),
-         [],
-         nil,
-         nil
-       ),
-       nil,
-       [:foo],
-       (0...3),
-       nil,
-       (5...6),
-       (10...11),
-       nil,
-       (13...16)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/whitequark/restarg_unnamed.txt b/test/yarp/snapshots/whitequark/restarg_unnamed.txt
deleted file mode 100644
index b6778e293ceba5..00000000000000
--- a/test/yarp/snapshots/whitequark/restarg_unnamed.txt
+++ /dev/null
@@ -1,26 +0,0 @@
-ProgramNode(0...13)(
-  [],
-  StatementsNode(0...13)(
-    [DefNode(0...13)(
-       (4...5),
-       nil,
-       ParametersNode(6...7)(
-         [],
-         [],
-         [],
-         RestParameterNode(6...7)((6...7), nil),
-         [],
-         nil,
-         nil
-       ),
-       nil,
-       [:*],
-       (0...3),
-       nil,
-       (5...6),
-       (7...8),
-       nil,
-       (10...13)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/whitequark/retry.txt b/test/yarp/snapshots/whitequark/retry.txt
deleted file mode 100644
index 8963228e67bfc0..00000000000000
--- a/test/yarp/snapshots/whitequark/retry.txt
+++ /dev/null
@@ -1 +0,0 @@
-ProgramNode(0...5)([], StatementsNode(0...5)([RetryNode(0...5)()]))
diff --git a/test/yarp/snapshots/whitequark/return.txt b/test/yarp/snapshots/whitequark/return.txt
deleted file mode 100644
index 0afc3de823e8ca..00000000000000
--- a/test/yarp/snapshots/whitequark/return.txt
+++ /dev/null
@@ -1,40 +0,0 @@
-ProgramNode(0...41)(
-  [],
-  StatementsNode(0...41)(
-    [ReturnNode(0...6)((0...6), nil),
-     ReturnNode(8...18)(
-       (8...14),
-       ArgumentsNode(15...18)(
-         [CallNode(15...18)(nil, nil, (15...18), nil, nil, nil, nil, 2, "foo")]
-       )
-     ),
-     ReturnNode(20...28)(
-       (20...26),
-       ArgumentsNode(26...28)(
-         [ParenthesesNode(26...28)(nil, (26...27), (27...28))]
-       )
-     ),
-     ReturnNode(30...41)(
-       (30...36),
-       ArgumentsNode(36...41)(
-         [ParenthesesNode(36...41)(
-            StatementsNode(37...40)(
-              [CallNode(37...40)(
-                 nil,
-                 nil,
-                 (37...40),
-                 nil,
-                 nil,
-                 nil,
-                 nil,
-                 2,
-                 "foo"
-               )]
-            ),
-            (36...37),
-            (40...41)
-          )]
-       )
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/whitequark/return_block.txt b/test/yarp/snapshots/whitequark/return_block.txt
deleted file mode 100644
index 60f24062954bc0..00000000000000
--- a/test/yarp/snapshots/whitequark/return_block.txt
+++ /dev/null
@@ -1,33 +0,0 @@
-ProgramNode(0...21)(
-  [],
-  StatementsNode(0...21)(
-    [ReturnNode(0...21)(
-       (0...6),
-       ArgumentsNode(7...21)(
-         [CallNode(7...21)(
-            nil,
-            nil,
-            (7...10),
-            nil,
-            ArgumentsNode(11...14)(
-              [CallNode(11...14)(
-                 nil,
-                 nil,
-                 (11...14),
-                 nil,
-                 nil,
-                 nil,
-                 nil,
-                 2,
-                 "foo"
-               )]
-            ),
-            nil,
-            BlockNode(15...21)([], nil, nil, (15...17), (18...21)),
-            0,
-            "fun"
-          )]
-       )
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/whitequark/ruby_bug_10279.txt b/test/yarp/snapshots/whitequark/ruby_bug_10279.txt
deleted file mode 100644
index 74c9d70fa39f9f..00000000000000
--- a/test/yarp/snapshots/whitequark/ruby_bug_10279.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-ProgramNode(0...24)(
-  [],
-  StatementsNode(0...24)(
-    [HashNode(0...24)(
-       (0...1),
-       [AssocNode(1...23)(
-          SymbolNode(1...3)(nil, (1...2), (2...3), "a"),
-          IfNode(4...23)(
-            (4...6),
-            TrueNode(7...11)(),
-            StatementsNode(17...19)([IntegerNode(17...19)()]),
-            nil,
-            (20...23)
-          ),
-          nil
-        )],
-       (23...24)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/whitequark/ruby_bug_10653.txt b/test/yarp/snapshots/whitequark/ruby_bug_10653.txt
deleted file mode 100644
index 9223db088bd1ec..00000000000000
--- a/test/yarp/snapshots/whitequark/ruby_bug_10653.txt
+++ /dev/null
@@ -1,131 +0,0 @@
-ProgramNode(0...93)(
-  [],
-  StatementsNode(0...93)(
-    [IfNode(0...33)(
-       nil,
-       FalseNode(0...5)(),
-       StatementsNode(8...20)(
-         [CallNode(8...20)(
-            nil,
-            nil,
-            (8...13),
-            nil,
-            nil,
-            nil,
-            BlockNode(14...20)([], nil, nil, (14...16), (17...20)),
-            0,
-            "raise"
-          )]
-       ),
-       ElseNode(21...33)(
-         (21...22),
-         StatementsNode(23...33)(
-           [CallNode(23...33)(
-              nil,
-              nil,
-              (23...26),
-              nil,
-              nil,
-              nil,
-              BlockNode(27...33)([], nil, nil, (27...29), (30...33)),
-              0,
-              "tap"
-            )]
-         ),
-         nil
-       ),
-       nil
-     ),
-     IfNode(35...60)(
-       nil,
-       FalseNode(35...40)(),
-       StatementsNode(43...51)(
-         [CallNode(43...51)(
-            nil,
-            nil,
-            (43...48),
-            nil,
-            nil,
-            nil,
-            BlockNode(49...51)([], nil, nil, (49...50), (50...51)),
-            0,
-            "raise"
-          )]
-       ),
-       ElseNode(52...60)(
-         (52...53),
-         StatementsNode(54...60)(
-           [CallNode(54...60)(
-              nil,
-              nil,
-              (54...57),
-              nil,
-              nil,
-              nil,
-              BlockNode(58...60)([], nil, nil, (58...59), (59...60)),
-              0,
-              "tap"
-            )]
-         ),
-         nil
-       ),
-       nil
-     ),
-     IfNode(62...93)(
-       nil,
-       TrueNode(62...66)(),
-       StatementsNode(69...89)(
-         [CallNode(69...89)(
-            IntegerNode(69...70)(),
-            (70...71),
-            (71...74),
-            nil,
-            nil,
-            nil,
-            BlockNode(75...89)(
-              [:n],
-              BlockParametersNode(78...81)(
-                ParametersNode(79...80)(
-                  [RequiredParameterNode(79...80)(:n)],
-                  [],
-                  [],
-                  nil,
-                  [],
-                  nil,
-                  nil
-                ),
-                [],
-                (78...79),
-                (80...81)
-              ),
-              StatementsNode(82...85)(
-                [CallNode(82...85)(
-                   nil,
-                   nil,
-                   (82...83),
-                   nil,
-                   ArgumentsNode(84...85)(
-                     [LocalVariableReadNode(84...85)(:n, 0)]
-                   ),
-                   nil,
-                   nil,
-                   0,
-                   "p"
-                 )]
-              ),
-              (75...77),
-              (86...89)
-            ),
-            0,
-            "tap"
-          )]
-       ),
-       ElseNode(90...93)(
-         (90...91),
-         StatementsNode(92...93)([IntegerNode(92...93)()]),
-         nil
-       ),
-       nil
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/whitequark/ruby_bug_11107.txt b/test/yarp/snapshots/whitequark/ruby_bug_11107.txt
deleted file mode 100644
index c61ee9ef80d316..00000000000000
--- a/test/yarp/snapshots/whitequark/ruby_bug_11107.txt
+++ /dev/null
@@ -1,37 +0,0 @@
-ProgramNode(0...24)(
-  [],
-  StatementsNode(0...24)(
-    [CallNode(0...24)(
-       nil,
-       nil,
-       (0...1),
-       nil,
-       ArgumentsNode(2...24)(
-         [LambdaNode(2...24)(
-            [],
-            (2...4),
-            (7...9),
-            (21...24),
-            BlockParametersNode(4...6)(nil, [], (4...5), (5...6)),
-            StatementsNode(10...20)(
-              [CallNode(10...20)(
-                 nil,
-                 nil,
-                 (10...11),
-                 (11...12),
-                 nil,
-                 (12...13),
-                 BlockNode(14...20)([], nil, nil, (14...16), (17...20)),
-                 0,
-                 "a"
-               )]
-            )
-          )]
-       ),
-       nil,
-       nil,
-       0,
-       "p"
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/whitequark/ruby_bug_11380.txt b/test/yarp/snapshots/whitequark/ruby_bug_11380.txt
deleted file mode 100644
index 9e89161e7817e9..00000000000000
--- a/test/yarp/snapshots/whitequark/ruby_bug_11380.txt
+++ /dev/null
@@ -1,34 +0,0 @@
-ProgramNode(0...28)(
-  [],
-  StatementsNode(0...28)(
-    [CallNode(0...28)(
-       nil,
-       nil,
-       (0...1),
-       nil,
-       ArgumentsNode(2...21)(
-         [LambdaNode(2...15)(
-            [],
-            (2...4),
-            (5...6),
-            (14...15),
-            nil,
-            StatementsNode(7...13)(
-              [SymbolNode(7...13)((7...8), (8...13), nil, "hello")]
-            )
-          ),
-          KeywordHashNode(17...21)(
-            [AssocNode(17...21)(
-               SymbolNode(17...19)(nil, (17...18), (18...19), "a"),
-               IntegerNode(20...21)(),
-               nil
-             )]
-          )]
-       ),
-       nil,
-       BlockNode(22...28)([], nil, nil, (22...24), (25...28)),
-       0,
-       "p"
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/whitequark/ruby_bug_11873.txt b/test/yarp/snapshots/whitequark/ruby_bug_11873.txt
deleted file mode 100644
index 5c63deed0850b3..00000000000000
--- a/test/yarp/snapshots/whitequark/ruby_bug_11873.txt
+++ /dev/null
@@ -1,665 +0,0 @@
-ProgramNode(0...272)(
-  [],
-  StatementsNode(0...272)(
-    [CallNode(0...20)(
-       nil,
-       nil,
-       (0...1),
-       nil,
-       ArgumentsNode(2...13)(
-         [CallNode(2...8)(
-            nil,
-            nil,
-            (2...3),
-            (3...4),
-            ArgumentsNode(4...7)(
-              [CallNode(4...7)(
-                 nil,
-                 nil,
-                 (4...5),
-                 nil,
-                 ArgumentsNode(6...7)(
-                   [CallNode(6...7)(
-                      nil,
-                      nil,
-                      (6...7),
-                      nil,
-                      nil,
-                      nil,
-                      nil,
-                      2,
-                      "d"
-                    )]
-                 ),
-                 nil,
-                 nil,
-                 0,
-                 "c"
-               )]
-            ),
-            (7...8),
-            nil,
-            0,
-            "b"
-          ),
-          StringNode(10...13)((10...11), (11...12), (12...13), "x")]
-       ),
-       nil,
-       BlockNode(14...20)([], nil, nil, (14...16), (17...20)),
-       0,
-       "a"
-     ),
-     CallNode(22...42)(
-       nil,
-       nil,
-       (22...23),
-       nil,
-       ArgumentsNode(24...35)(
-         [CallNode(24...30)(
-            nil,
-            nil,
-            (24...25),
-            (25...26),
-            ArgumentsNode(26...29)(
-              [CallNode(26...29)(
-                 nil,
-                 nil,
-                 (26...27),
-                 nil,
-                 ArgumentsNode(28...29)(
-                   [CallNode(28...29)(
-                      nil,
-                      nil,
-                      (28...29),
-                      nil,
-                      nil,
-                      nil,
-                      nil,
-                      2,
-                      "d"
-                    )]
-                 ),
-                 nil,
-                 nil,
-                 0,
-                 "c"
-               )]
-            ),
-            (29...30),
-            nil,
-            0,
-            "b"
-          ),
-          RegularExpressionNode(32...35)(
-            (32...33),
-            (33...34),
-            (34...35),
-            "x",
-            0
-          )]
-       ),
-       nil,
-       BlockNode(36...42)([], nil, nil, (36...38), (39...42)),
-       0,
-       "a"
-     ),
-     CallNode(44...65)(
-       nil,
-       nil,
-       (44...45),
-       nil,
-       ArgumentsNode(46...58)(
-         [CallNode(46...52)(
-            nil,
-            nil,
-            (46...47),
-            (47...48),
-            ArgumentsNode(48...51)(
-              [CallNode(48...51)(
-                 nil,
-                 nil,
-                 (48...49),
-                 nil,
-                 ArgumentsNode(50...51)(
-                   [CallNode(50...51)(
-                      nil,
-                      nil,
-                      (50...51),
-                      nil,
-                      nil,
-                      nil,
-                      nil,
-                      2,
-                      "d"
-                    )]
-                 ),
-                 nil,
-                 nil,
-                 0,
-                 "c"
-               )]
-            ),
-            (51...52),
-            nil,
-            0,
-            "b"
-          ),
-          RegularExpressionNode(54...58)(
-            (54...55),
-            (55...56),
-            (56...58),
-            "x",
-            2
-          )]
-       ),
-       nil,
-       BlockNode(59...65)([], nil, nil, (59...61), (62...65)),
-       0,
-       "a"
-     ),
-     CallNode(67...88)(
-       nil,
-       nil,
-       (67...68),
-       nil,
-       ArgumentsNode(69...81)(
-         [CallNode(69...76)(
-            nil,
-            nil,
-            (69...70),
-            (70...71),
-            ArgumentsNode(71...75)(
-              [CallNode(71...75)(
-                 nil,
-                 nil,
-                 (71...72),
-                 (72...73),
-                 ArgumentsNode(73...74)(
-                   [CallNode(73...74)(
-                      nil,
-                      nil,
-                      (73...74),
-                      nil,
-                      nil,
-                      nil,
-                      nil,
-                      2,
-                      "d"
-                    )]
-                 ),
-                 (74...75),
-                 nil,
-                 0,
-                 "c"
-               )]
-            ),
-            (75...76),
-            nil,
-            0,
-            "b"
-          ),
-          StringNode(78...81)((78...79), (79...80), (80...81), "x")]
-       ),
-       nil,
-       BlockNode(82...88)([], nil, nil, (82...84), (85...88)),
-       0,
-       "a"
-     ),
-     CallNode(90...111)(
-       nil,
-       nil,
-       (90...91),
-       nil,
-       ArgumentsNode(92...104)(
-         [CallNode(92...99)(
-            nil,
-            nil,
-            (92...93),
-            (93...94),
-            ArgumentsNode(94...98)(
-              [CallNode(94...98)(
-                 nil,
-                 nil,
-                 (94...95),
-                 (95...96),
-                 ArgumentsNode(96...97)(
-                   [CallNode(96...97)(
-                      nil,
-                      nil,
-                      (96...97),
-                      nil,
-                      nil,
-                      nil,
-                      nil,
-                      2,
-                      "d"
-                    )]
-                 ),
-                 (97...98),
-                 nil,
-                 0,
-                 "c"
-               )]
-            ),
-            (98...99),
-            nil,
-            0,
-            "b"
-          ),
-          RegularExpressionNode(101...104)(
-            (101...102),
-            (102...103),
-            (103...104),
-            "x",
-            0
-          )]
-       ),
-       nil,
-       BlockNode(105...111)([], nil, nil, (105...107), (108...111)),
-       0,
-       "a"
-     ),
-     CallNode(113...135)(
-       nil,
-       nil,
-       (113...114),
-       nil,
-       ArgumentsNode(115...128)(
-         [CallNode(115...122)(
-            nil,
-            nil,
-            (115...116),
-            (116...117),
-            ArgumentsNode(117...121)(
-              [CallNode(117...121)(
-                 nil,
-                 nil,
-                 (117...118),
-                 (118...119),
-                 ArgumentsNode(119...120)(
-                   [CallNode(119...120)(
-                      nil,
-                      nil,
-                      (119...120),
-                      nil,
-                      nil,
-                      nil,
-                      nil,
-                      2,
-                      "d"
-                    )]
-                 ),
-                 (120...121),
-                 nil,
-                 0,
-                 "c"
-               )]
-            ),
-            (121...122),
-            nil,
-            0,
-            "b"
-          ),
-          RegularExpressionNode(124...128)(
-            (124...125),
-            (125...126),
-            (126...128),
-            "x",
-            2
-          )]
-       ),
-       nil,
-       BlockNode(129...135)([], nil, nil, (129...131), (132...135)),
-       0,
-       "a"
-     ),
-     CallNode(137...157)(
-       nil,
-       nil,
-       (137...138),
-       nil,
-       ArgumentsNode(139...150)(
-         [CallNode(139...145)(
-            nil,
-            nil,
-            (139...140),
-            nil,
-            nil,
-            nil,
-            BlockNode(140...145)(
-              [],
-              nil,
-              StatementsNode(141...144)(
-                [CallNode(141...144)(
-                   nil,
-                   nil,
-                   (141...142),
-                   nil,
-                   ArgumentsNode(143...144)(
-                     [CallNode(143...144)(
-                        nil,
-                        nil,
-                        (143...144),
-                        nil,
-                        nil,
-                        nil,
-                        nil,
-                        2,
-                        "d"
-                      )]
-                   ),
-                   nil,
-                   nil,
-                   0,
-                   "c"
-                 )]
-              ),
-              (140...141),
-              (144...145)
-            ),
-            0,
-            "b"
-          ),
-          StringNode(147...150)((147...148), (148...149), (149...150), "x")]
-       ),
-       nil,
-       BlockNode(151...157)([], nil, nil, (151...153), (154...157)),
-       0,
-       "a"
-     ),
-     CallNode(159...179)(
-       nil,
-       nil,
-       (159...160),
-       nil,
-       ArgumentsNode(161...172)(
-         [CallNode(161...167)(
-            nil,
-            nil,
-            (161...162),
-            nil,
-            nil,
-            nil,
-            BlockNode(162...167)(
-              [],
-              nil,
-              StatementsNode(163...166)(
-                [CallNode(163...166)(
-                   nil,
-                   nil,
-                   (163...164),
-                   nil,
-                   ArgumentsNode(165...166)(
-                     [CallNode(165...166)(
-                        nil,
-                        nil,
-                        (165...166),
-                        nil,
-                        nil,
-                        nil,
-                        nil,
-                        2,
-                        "d"
-                      )]
-                   ),
-                   nil,
-                   nil,
-                   0,
-                   "c"
-                 )]
-              ),
-              (162...163),
-              (166...167)
-            ),
-            0,
-            "b"
-          ),
-          RegularExpressionNode(169...172)(
-            (169...170),
-            (170...171),
-            (171...172),
-            "x",
-            0
-          )]
-       ),
-       nil,
-       BlockNode(173...179)([], nil, nil, (173...175), (176...179)),
-       0,
-       "a"
-     ),
-     CallNode(181...202)(
-       nil,
-       nil,
-       (181...182),
-       nil,
-       ArgumentsNode(183...195)(
-         [CallNode(183...189)(
-            nil,
-            nil,
-            (183...184),
-            nil,
-            nil,
-            nil,
-            BlockNode(184...189)(
-              [],
-              nil,
-              StatementsNode(185...188)(
-                [CallNode(185...188)(
-                   nil,
-                   nil,
-                   (185...186),
-                   nil,
-                   ArgumentsNode(187...188)(
-                     [CallNode(187...188)(
-                        nil,
-                        nil,
-                        (187...188),
-                        nil,
-                        nil,
-                        nil,
-                        nil,
-                        2,
-                        "d"
-                      )]
-                   ),
-                   nil,
-                   nil,
-                   0,
-                   "c"
-                 )]
-              ),
-              (184...185),
-              (188...189)
-            ),
-            0,
-            "b"
-          ),
-          RegularExpressionNode(191...195)(
-            (191...192),
-            (192...193),
-            (193...195),
-            "x",
-            2
-          )]
-       ),
-       nil,
-       BlockNode(196...202)([], nil, nil, (196...198), (199...202)),
-       0,
-       "a"
-     ),
-     CallNode(204...225)(
-       nil,
-       nil,
-       (204...205),
-       nil,
-       ArgumentsNode(206...218)(
-         [CallNode(206...213)(
-            nil,
-            nil,
-            (206...207),
-            nil,
-            nil,
-            nil,
-            BlockNode(207...213)(
-              [],
-              nil,
-              StatementsNode(208...212)(
-                [CallNode(208...212)(
-                   nil,
-                   nil,
-                   (208...209),
-                   (209...210),
-                   ArgumentsNode(210...211)(
-                     [CallNode(210...211)(
-                        nil,
-                        nil,
-                        (210...211),
-                        nil,
-                        nil,
-                        nil,
-                        nil,
-                        2,
-                        "d"
-                      )]
-                   ),
-                   (211...212),
-                   nil,
-                   0,
-                   "c"
-                 )]
-              ),
-              (207...208),
-              (212...213)
-            ),
-            0,
-            "b"
-          ),
-          StringNode(215...218)((215...216), (216...217), (217...218), "x")]
-       ),
-       nil,
-       BlockNode(219...225)([], nil, nil, (219...221), (222...225)),
-       0,
-       "a"
-     ),
-     CallNode(227...248)(
-       nil,
-       nil,
-       (227...228),
-       nil,
-       ArgumentsNode(229...241)(
-         [CallNode(229...236)(
-            nil,
-            nil,
-            (229...230),
-            nil,
-            nil,
-            nil,
-            BlockNode(230...236)(
-              [],
-              nil,
-              StatementsNode(231...235)(
-                [CallNode(231...235)(
-                   nil,
-                   nil,
-                   (231...232),
-                   (232...233),
-                   ArgumentsNode(233...234)(
-                     [CallNode(233...234)(
-                        nil,
-                        nil,
-                        (233...234),
-                        nil,
-                        nil,
-                        nil,
-                        nil,
-                        2,
-                        "d"
-                      )]
-                   ),
-                   (234...235),
-                   nil,
-                   0,
-                   "c"
-                 )]
-              ),
-              (230...231),
-              (235...236)
-            ),
-            0,
-            "b"
-          ),
-          RegularExpressionNode(238...241)(
-            (238...239),
-            (239...240),
-            (240...241),
-            "x",
-            0
-          )]
-       ),
-       nil,
-       BlockNode(242...248)([], nil, nil, (242...244), (245...248)),
-       0,
-       "a"
-     ),
-     CallNode(250...272)(
-       nil,
-       nil,
-       (250...251),
-       nil,
-       ArgumentsNode(252...265)(
-         [CallNode(252...259)(
-            nil,
-            nil,
-            (252...253),
-            nil,
-            nil,
-            nil,
-            BlockNode(253...259)(
-              [],
-              nil,
-              StatementsNode(254...258)(
-                [CallNode(254...258)(
-                   nil,
-                   nil,
-                   (254...255),
-                   (255...256),
-                   ArgumentsNode(256...257)(
-                     [CallNode(256...257)(
-                        nil,
-                        nil,
-                        (256...257),
-                        nil,
-                        nil,
-                        nil,
-                        nil,
-                        2,
-                        "d"
-                      )]
-                   ),
-                   (257...258),
-                   nil,
-                   0,
-                   "c"
-                 )]
-              ),
-              (253...254),
-              (258...259)
-            ),
-            0,
-            "b"
-          ),
-          RegularExpressionNode(261...265)(
-            (261...262),
-            (262...263),
-            (263...265),
-            "x",
-            2
-          )]
-       ),
-       nil,
-       BlockNode(266...272)([], nil, nil, (266...268), (269...272)),
-       0,
-       "a"
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/whitequark/ruby_bug_11873_a.txt b/test/yarp/snapshots/whitequark/ruby_bug_11873_a.txt
deleted file mode 100644
index 5cdffe39b18bcb..00000000000000
--- a/test/yarp/snapshots/whitequark/ruby_bug_11873_a.txt
+++ /dev/null
@@ -1,1025 +0,0 @@
-ProgramNode(0...444)(
-  [],
-  StatementsNode(0...444)(
-    [CallNode(0...18)(
-       nil,
-       nil,
-       (0...1),
-       nil,
-       ArgumentsNode(2...11)(
-         [CallNode(2...8)(
-            nil,
-            nil,
-            (2...3),
-            (3...4),
-            ArgumentsNode(4...7)(
-              [CallNode(4...7)(
-                 nil,
-                 nil,
-                 (4...5),
-                 nil,
-                 ArgumentsNode(6...7)(
-                   [CallNode(6...7)(
-                      nil,
-                      nil,
-                      (6...7),
-                      nil,
-                      nil,
-                      nil,
-                      nil,
-                      2,
-                      "d"
-                    )]
-                 ),
-                 nil,
-                 nil,
-                 0,
-                 "c"
-               )]
-            ),
-            (7...8),
-            nil,
-            0,
-            "b"
-          ),
-          IntegerNode(10...11)()]
-       ),
-       nil,
-       BlockNode(12...18)([], nil, nil, (12...14), (15...18)),
-       0,
-       "a"
-     ),
-     CallNode(20...40)(
-       nil,
-       nil,
-       (20...21),
-       nil,
-       ArgumentsNode(22...33)(
-         [CallNode(22...28)(
-            nil,
-            nil,
-            (22...23),
-            (23...24),
-            ArgumentsNode(24...27)(
-              [CallNode(24...27)(
-                 nil,
-                 nil,
-                 (24...25),
-                 nil,
-                 ArgumentsNode(26...27)(
-                   [CallNode(26...27)(
-                      nil,
-                      nil,
-                      (26...27),
-                      nil,
-                      nil,
-                      nil,
-                      nil,
-                      2,
-                      "d"
-                    )]
-                 ),
-                 nil,
-                 nil,
-                 0,
-                 "c"
-               )]
-            ),
-            (27...28),
-            nil,
-            0,
-            "b"
-          ),
-          FloatNode(30...33)()]
-       ),
-       nil,
-       BlockNode(34...40)([], nil, nil, (34...36), (37...40)),
-       0,
-       "a"
-     ),
-     CallNode(42...63)(
-       nil,
-       nil,
-       (42...43),
-       nil,
-       ArgumentsNode(44...56)(
-         [CallNode(44...50)(
-            nil,
-            nil,
-            (44...45),
-            (45...46),
-            ArgumentsNode(46...49)(
-              [CallNode(46...49)(
-                 nil,
-                 nil,
-                 (46...47),
-                 nil,
-                 ArgumentsNode(48...49)(
-                   [CallNode(48...49)(
-                      nil,
-                      nil,
-                      (48...49),
-                      nil,
-                      nil,
-                      nil,
-                      nil,
-                      2,
-                      "d"
-                    )]
-                 ),
-                 nil,
-                 nil,
-                 0,
-                 "c"
-               )]
-            ),
-            (49...50),
-            nil,
-            0,
-            "b"
-          ),
-          ImaginaryNode(52...56)(FloatNode(52...55)())]
-       ),
-       nil,
-       BlockNode(57...63)([], nil, nil, (57...59), (60...63)),
-       0,
-       "a"
-     ),
-     CallNode(65...86)(
-       nil,
-       nil,
-       (65...66),
-       nil,
-       ArgumentsNode(67...79)(
-         [CallNode(67...73)(
-            nil,
-            nil,
-            (67...68),
-            (68...69),
-            ArgumentsNode(69...72)(
-              [CallNode(69...72)(
-                 nil,
-                 nil,
-                 (69...70),
-                 nil,
-                 ArgumentsNode(71...72)(
-                   [CallNode(71...72)(
-                      nil,
-                      nil,
-                      (71...72),
-                      nil,
-                      nil,
-                      nil,
-                      nil,
-                      2,
-                      "d"
-                    )]
-                 ),
-                 nil,
-                 nil,
-                 0,
-                 "c"
-               )]
-            ),
-            (72...73),
-            nil,
-            0,
-            "b"
-          ),
-          RationalNode(75...79)(FloatNode(75...78)())]
-       ),
-       nil,
-       BlockNode(80...86)([], nil, nil, (80...82), (83...86)),
-       0,
-       "a"
-     ),
-     CallNode(88...107)(
-       nil,
-       nil,
-       (88...89),
-       nil,
-       ArgumentsNode(90...100)(
-         [CallNode(90...96)(
-            nil,
-            nil,
-            (90...91),
-            (91...92),
-            ArgumentsNode(92...95)(
-              [CallNode(92...95)(
-                 nil,
-                 nil,
-                 (92...93),
-                 nil,
-                 ArgumentsNode(94...95)(
-                   [CallNode(94...95)(
-                      nil,
-                      nil,
-                      (94...95),
-                      nil,
-                      nil,
-                      nil,
-                      nil,
-                      2,
-                      "d"
-                    )]
-                 ),
-                 nil,
-                 nil,
-                 0,
-                 "c"
-               )]
-            ),
-            (95...96),
-            nil,
-            0,
-            "b"
-          ),
-          SymbolNode(98...100)((98...99), (99...100), nil, "e")]
-       ),
-       nil,
-       BlockNode(101...107)([], nil, nil, (101...103), (104...107)),
-       0,
-       "a"
-     ),
-     CallNode(109...128)(
-       nil,
-       nil,
-       (109...110),
-       nil,
-       ArgumentsNode(111...121)(
-         [CallNode(111...118)(
-            nil,
-            nil,
-            (111...112),
-            (112...113),
-            ArgumentsNode(113...117)(
-              [CallNode(113...117)(
-                 nil,
-                 nil,
-                 (113...114),
-                 (114...115),
-                 ArgumentsNode(115...116)(
-                   [CallNode(115...116)(
-                      nil,
-                      nil,
-                      (115...116),
-                      nil,
-                      nil,
-                      nil,
-                      nil,
-                      2,
-                      "d"
-                    )]
-                 ),
-                 (116...117),
-                 nil,
-                 0,
-                 "c"
-               )]
-            ),
-            (117...118),
-            nil,
-            0,
-            "b"
-          ),
-          IntegerNode(120...121)()]
-       ),
-       nil,
-       BlockNode(122...128)([], nil, nil, (122...124), (125...128)),
-       0,
-       "a"
-     ),
-     CallNode(130...151)(
-       nil,
-       nil,
-       (130...131),
-       nil,
-       ArgumentsNode(132...144)(
-         [CallNode(132...139)(
-            nil,
-            nil,
-            (132...133),
-            (133...134),
-            ArgumentsNode(134...138)(
-              [CallNode(134...138)(
-                 nil,
-                 nil,
-                 (134...135),
-                 (135...136),
-                 ArgumentsNode(136...137)(
-                   [CallNode(136...137)(
-                      nil,
-                      nil,
-                      (136...137),
-                      nil,
-                      nil,
-                      nil,
-                      nil,
-                      2,
-                      "d"
-                    )]
-                 ),
-                 (137...138),
-                 nil,
-                 0,
-                 "c"
-               )]
-            ),
-            (138...139),
-            nil,
-            0,
-            "b"
-          ),
-          FloatNode(141...144)()]
-       ),
-       nil,
-       BlockNode(145...151)([], nil, nil, (145...147), (148...151)),
-       0,
-       "a"
-     ),
-     CallNode(153...175)(
-       nil,
-       nil,
-       (153...154),
-       nil,
-       ArgumentsNode(155...168)(
-         [CallNode(155...162)(
-            nil,
-            nil,
-            (155...156),
-            (156...157),
-            ArgumentsNode(157...161)(
-              [CallNode(157...161)(
-                 nil,
-                 nil,
-                 (157...158),
-                 (158...159),
-                 ArgumentsNode(159...160)(
-                   [CallNode(159...160)(
-                      nil,
-                      nil,
-                      (159...160),
-                      nil,
-                      nil,
-                      nil,
-                      nil,
-                      2,
-                      "d"
-                    )]
-                 ),
-                 (160...161),
-                 nil,
-                 0,
-                 "c"
-               )]
-            ),
-            (161...162),
-            nil,
-            0,
-            "b"
-          ),
-          ImaginaryNode(164...168)(FloatNode(164...167)())]
-       ),
-       nil,
-       BlockNode(169...175)([], nil, nil, (169...171), (172...175)),
-       0,
-       "a"
-     ),
-     CallNode(177...199)(
-       nil,
-       nil,
-       (177...178),
-       nil,
-       ArgumentsNode(179...192)(
-         [CallNode(179...186)(
-            nil,
-            nil,
-            (179...180),
-            (180...181),
-            ArgumentsNode(181...185)(
-              [CallNode(181...185)(
-                 nil,
-                 nil,
-                 (181...182),
-                 (182...183),
-                 ArgumentsNode(183...184)(
-                   [CallNode(183...184)(
-                      nil,
-                      nil,
-                      (183...184),
-                      nil,
-                      nil,
-                      nil,
-                      nil,
-                      2,
-                      "d"
-                    )]
-                 ),
-                 (184...185),
-                 nil,
-                 0,
-                 "c"
-               )]
-            ),
-            (185...186),
-            nil,
-            0,
-            "b"
-          ),
-          RationalNode(188...192)(FloatNode(188...191)())]
-       ),
-       nil,
-       BlockNode(193...199)([], nil, nil, (193...195), (196...199)),
-       0,
-       "a"
-     ),
-     CallNode(201...221)(
-       nil,
-       nil,
-       (201...202),
-       nil,
-       ArgumentsNode(203...214)(
-         [CallNode(203...210)(
-            nil,
-            nil,
-            (203...204),
-            (204...205),
-            ArgumentsNode(205...209)(
-              [CallNode(205...209)(
-                 nil,
-                 nil,
-                 (205...206),
-                 (206...207),
-                 ArgumentsNode(207...208)(
-                   [CallNode(207...208)(
-                      nil,
-                      nil,
-                      (207...208),
-                      nil,
-                      nil,
-                      nil,
-                      nil,
-                      2,
-                      "d"
-                    )]
-                 ),
-                 (208...209),
-                 nil,
-                 0,
-                 "c"
-               )]
-            ),
-            (209...210),
-            nil,
-            0,
-            "b"
-          ),
-          SymbolNode(212...214)((212...213), (213...214), nil, "e")]
-       ),
-       nil,
-       BlockNode(215...221)([], nil, nil, (215...217), (218...221)),
-       0,
-       "a"
-     ),
-     CallNode(223...241)(
-       nil,
-       nil,
-       (223...224),
-       nil,
-       ArgumentsNode(225...234)(
-         [CallNode(225...231)(
-            nil,
-            nil,
-            (225...226),
-            nil,
-            nil,
-            nil,
-            BlockNode(226...231)(
-              [],
-              nil,
-              StatementsNode(227...230)(
-                [CallNode(227...230)(
-                   nil,
-                   nil,
-                   (227...228),
-                   nil,
-                   ArgumentsNode(229...230)(
-                     [CallNode(229...230)(
-                        nil,
-                        nil,
-                        (229...230),
-                        nil,
-                        nil,
-                        nil,
-                        nil,
-                        2,
-                        "d"
-                      )]
-                   ),
-                   nil,
-                   nil,
-                   0,
-                   "c"
-                 )]
-              ),
-              (226...227),
-              (230...231)
-            ),
-            0,
-            "b"
-          ),
-          IntegerNode(233...234)()]
-       ),
-       nil,
-       BlockNode(235...241)([], nil, nil, (235...237), (238...241)),
-       0,
-       "a"
-     ),
-     CallNode(243...263)(
-       nil,
-       nil,
-       (243...244),
-       nil,
-       ArgumentsNode(245...256)(
-         [CallNode(245...251)(
-            nil,
-            nil,
-            (245...246),
-            nil,
-            nil,
-            nil,
-            BlockNode(246...251)(
-              [],
-              nil,
-              StatementsNode(247...250)(
-                [CallNode(247...250)(
-                   nil,
-                   nil,
-                   (247...248),
-                   nil,
-                   ArgumentsNode(249...250)(
-                     [CallNode(249...250)(
-                        nil,
-                        nil,
-                        (249...250),
-                        nil,
-                        nil,
-                        nil,
-                        nil,
-                        2,
-                        "d"
-                      )]
-                   ),
-                   nil,
-                   nil,
-                   0,
-                   "c"
-                 )]
-              ),
-              (246...247),
-              (250...251)
-            ),
-            0,
-            "b"
-          ),
-          FloatNode(253...256)()]
-       ),
-       nil,
-       BlockNode(257...263)([], nil, nil, (257...259), (260...263)),
-       0,
-       "a"
-     ),
-     CallNode(265...286)(
-       nil,
-       nil,
-       (265...266),
-       nil,
-       ArgumentsNode(267...279)(
-         [CallNode(267...273)(
-            nil,
-            nil,
-            (267...268),
-            nil,
-            nil,
-            nil,
-            BlockNode(268...273)(
-              [],
-              nil,
-              StatementsNode(269...272)(
-                [CallNode(269...272)(
-                   nil,
-                   nil,
-                   (269...270),
-                   nil,
-                   ArgumentsNode(271...272)(
-                     [CallNode(271...272)(
-                        nil,
-                        nil,
-                        (271...272),
-                        nil,
-                        nil,
-                        nil,
-                        nil,
-                        2,
-                        "d"
-                      )]
-                   ),
-                   nil,
-                   nil,
-                   0,
-                   "c"
-                 )]
-              ),
-              (268...269),
-              (272...273)
-            ),
-            0,
-            "b"
-          ),
-          ImaginaryNode(275...279)(FloatNode(275...278)())]
-       ),
-       nil,
-       BlockNode(280...286)([], nil, nil, (280...282), (283...286)),
-       0,
-       "a"
-     ),
-     CallNode(288...309)(
-       nil,
-       nil,
-       (288...289),
-       nil,
-       ArgumentsNode(290...302)(
-         [CallNode(290...296)(
-            nil,
-            nil,
-            (290...291),
-            nil,
-            nil,
-            nil,
-            BlockNode(291...296)(
-              [],
-              nil,
-              StatementsNode(292...295)(
-                [CallNode(292...295)(
-                   nil,
-                   nil,
-                   (292...293),
-                   nil,
-                   ArgumentsNode(294...295)(
-                     [CallNode(294...295)(
-                        nil,
-                        nil,
-                        (294...295),
-                        nil,
-                        nil,
-                        nil,
-                        nil,
-                        2,
-                        "d"
-                      )]
-                   ),
-                   nil,
-                   nil,
-                   0,
-                   "c"
-                 )]
-              ),
-              (291...292),
-              (295...296)
-            ),
-            0,
-            "b"
-          ),
-          RationalNode(298...302)(FloatNode(298...301)())]
-       ),
-       nil,
-       BlockNode(303...309)([], nil, nil, (303...305), (306...309)),
-       0,
-       "a"
-     ),
-     CallNode(311...330)(
-       nil,
-       nil,
-       (311...312),
-       nil,
-       ArgumentsNode(313...323)(
-         [CallNode(313...319)(
-            nil,
-            nil,
-            (313...314),
-            nil,
-            nil,
-            nil,
-            BlockNode(314...319)(
-              [],
-              nil,
-              StatementsNode(315...318)(
-                [CallNode(315...318)(
-                   nil,
-                   nil,
-                   (315...316),
-                   nil,
-                   ArgumentsNode(317...318)(
-                     [CallNode(317...318)(
-                        nil,
-                        nil,
-                        (317...318),
-                        nil,
-                        nil,
-                        nil,
-                        nil,
-                        2,
-                        "d"
-                      )]
-                   ),
-                   nil,
-                   nil,
-                   0,
-                   "c"
-                 )]
-              ),
-              (314...315),
-              (318...319)
-            ),
-            0,
-            "b"
-          ),
-          SymbolNode(321...323)((321...322), (322...323), nil, "e")]
-       ),
-       nil,
-       BlockNode(324...330)([], nil, nil, (324...326), (327...330)),
-       0,
-       "a"
-     ),
-     CallNode(332...351)(
-       nil,
-       nil,
-       (332...333),
-       nil,
-       ArgumentsNode(334...344)(
-         [CallNode(334...341)(
-            nil,
-            nil,
-            (334...335),
-            nil,
-            nil,
-            nil,
-            BlockNode(335...341)(
-              [],
-              nil,
-              StatementsNode(336...340)(
-                [CallNode(336...340)(
-                   nil,
-                   nil,
-                   (336...337),
-                   (337...338),
-                   ArgumentsNode(338...339)(
-                     [CallNode(338...339)(
-                        nil,
-                        nil,
-                        (338...339),
-                        nil,
-                        nil,
-                        nil,
-                        nil,
-                        2,
-                        "d"
-                      )]
-                   ),
-                   (339...340),
-                   nil,
-                   0,
-                   "c"
-                 )]
-              ),
-              (335...336),
-              (340...341)
-            ),
-            0,
-            "b"
-          ),
-          IntegerNode(343...344)()]
-       ),
-       nil,
-       BlockNode(345...351)([], nil, nil, (345...347), (348...351)),
-       0,
-       "a"
-     ),
-     CallNode(353...374)(
-       nil,
-       nil,
-       (353...354),
-       nil,
-       ArgumentsNode(355...367)(
-         [CallNode(355...362)(
-            nil,
-            nil,
-            (355...356),
-            nil,
-            nil,
-            nil,
-            BlockNode(356...362)(
-              [],
-              nil,
-              StatementsNode(357...361)(
-                [CallNode(357...361)(
-                   nil,
-                   nil,
-                   (357...358),
-                   (358...359),
-                   ArgumentsNode(359...360)(
-                     [CallNode(359...360)(
-                        nil,
-                        nil,
-                        (359...360),
-                        nil,
-                        nil,
-                        nil,
-                        nil,
-                        2,
-                        "d"
-                      )]
-                   ),
-                   (360...361),
-                   nil,
-                   0,
-                   "c"
-                 )]
-              ),
-              (356...357),
-              (361...362)
-            ),
-            0,
-            "b"
-          ),
-          FloatNode(364...367)()]
-       ),
-       nil,
-       BlockNode(368...374)([], nil, nil, (368...370), (371...374)),
-       0,
-       "a"
-     ),
-     CallNode(376...398)(
-       nil,
-       nil,
-       (376...377),
-       nil,
-       ArgumentsNode(378...391)(
-         [CallNode(378...385)(
-            nil,
-            nil,
-            (378...379),
-            nil,
-            nil,
-            nil,
-            BlockNode(379...385)(
-              [],
-              nil,
-              StatementsNode(380...384)(
-                [CallNode(380...384)(
-                   nil,
-                   nil,
-                   (380...381),
-                   (381...382),
-                   ArgumentsNode(382...383)(
-                     [CallNode(382...383)(
-                        nil,
-                        nil,
-                        (382...383),
-                        nil,
-                        nil,
-                        nil,
-                        nil,
-                        2,
-                        "d"
-                      )]
-                   ),
-                   (383...384),
-                   nil,
-                   0,
-                   "c"
-                 )]
-              ),
-              (379...380),
-              (384...385)
-            ),
-            0,
-            "b"
-          ),
-          ImaginaryNode(387...391)(FloatNode(387...390)())]
-       ),
-       nil,
-       BlockNode(392...398)([], nil, nil, (392...394), (395...398)),
-       0,
-       "a"
-     ),
-     CallNode(400...422)(
-       nil,
-       nil,
-       (400...401),
-       nil,
-       ArgumentsNode(402...415)(
-         [CallNode(402...409)(
-            nil,
-            nil,
-            (402...403),
-            nil,
-            nil,
-            nil,
-            BlockNode(403...409)(
-              [],
-              nil,
-              StatementsNode(404...408)(
-                [CallNode(404...408)(
-                   nil,
-                   nil,
-                   (404...405),
-                   (405...406),
-                   ArgumentsNode(406...407)(
-                     [CallNode(406...407)(
-                        nil,
-                        nil,
-                        (406...407),
-                        nil,
-                        nil,
-                        nil,
-                        nil,
-                        2,
-                        "d"
-                      )]
-                   ),
-                   (407...408),
-                   nil,
-                   0,
-                   "c"
-                 )]
-              ),
-              (403...404),
-              (408...409)
-            ),
-            0,
-            "b"
-          ),
-          RationalNode(411...415)(FloatNode(411...414)())]
-       ),
-       nil,
-       BlockNode(416...422)([], nil, nil, (416...418), (419...422)),
-       0,
-       "a"
-     ),
-     CallNode(424...444)(
-       nil,
-       nil,
-       (424...425),
-       nil,
-       ArgumentsNode(426...437)(
-         [CallNode(426...433)(
-            nil,
-            nil,
-            (426...427),
-            nil,
-            nil,
-            nil,
-            BlockNode(427...433)(
-              [],
-              nil,
-              StatementsNode(428...432)(
-                [CallNode(428...432)(
-                   nil,
-                   nil,
-                   (428...429),
-                   (429...430),
-                   ArgumentsNode(430...431)(
-                     [CallNode(430...431)(
-                        nil,
-                        nil,
-                        (430...431),
-                        nil,
-                        nil,
-                        nil,
-                        nil,
-                        2,
-                        "d"
-                      )]
-                   ),
-                   (431...432),
-                   nil,
-                   0,
-                   "c"
-                 )]
-              ),
-              (427...428),
-              (432...433)
-            ),
-            0,
-            "b"
-          ),
-          SymbolNode(435...437)((435...436), (436...437), nil, "e")]
-       ),
-       nil,
-       BlockNode(438...444)([], nil, nil, (438...440), (441...444)),
-       0,
-       "a"
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/whitequark/ruby_bug_11873_b.txt b/test/yarp/snapshots/whitequark/ruby_bug_11873_b.txt
deleted file mode 100644
index f1a840a8923abb..00000000000000
--- a/test/yarp/snapshots/whitequark/ruby_bug_11873_b.txt
+++ /dev/null
@@ -1,82 +0,0 @@
-ProgramNode(0...25)(
-  [],
-  StatementsNode(0...25)(
-    [CallNode(0...25)(
-       nil,
-       nil,
-       (0...1),
-       nil,
-       ArgumentsNode(2...18)(
-         [CallNode(2...13)(
-            nil,
-            nil,
-            (2...3),
-            nil,
-            nil,
-            nil,
-            BlockNode(3...13)(
-              [],
-              nil,
-              StatementsNode(4...12)(
-                [CallNode(4...8)(
-                   nil,
-                   nil,
-                   (4...5),
-                   (5...6),
-                   ArgumentsNode(6...7)(
-                     [CallNode(6...7)(
-                        nil,
-                        nil,
-                        (6...7),
-                        nil,
-                        nil,
-                        nil,
-                        nil,
-                        2,
-                        "p"
-                      )]
-                   ),
-                   (7...8),
-                   nil,
-                   0,
-                   "p"
-                 ),
-                 CallNode(9...12)(
-                   nil,
-                   nil,
-                   (9...10),
-                   nil,
-                   ArgumentsNode(11...12)(
-                     [CallNode(11...12)(
-                        nil,
-                        nil,
-                        (11...12),
-                        nil,
-                        nil,
-                        nil,
-                        nil,
-                        2,
-                        "p"
-                      )]
-                   ),
-                   nil,
-                   nil,
-                   0,
-                   "p"
-                 )]
-              ),
-              (3...4),
-              (12...13)
-            ),
-            0,
-            "p"
-          ),
-          CallNode(15...18)(nil, nil, (15...18), nil, nil, nil, nil, 2, "tap")]
-       ),
-       nil,
-       BlockNode(19...25)([], nil, nil, (19...21), (22...25)),
-       0,
-       "p"
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/whitequark/ruby_bug_11989.txt b/test/yarp/snapshots/whitequark/ruby_bug_11989.txt
deleted file mode 100644
index 847bc83fac538c..00000000000000
--- a/test/yarp/snapshots/whitequark/ruby_bug_11989.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-ProgramNode(0...8)(
-  [],
-  StatementsNode(0...8)(
-    [CallNode(0...8)(
-       nil,
-       nil,
-       (0...1),
-       nil,
-       ArgumentsNode(2...8)(
-         [InterpolatedStringNode(2...8)(
-            (2...8),
-            [StringNode(9...19)(nil, (9...19), nil, "x\n" + "   y\n")],
-            (19...21)
-          )]
-       ),
-       nil,
-       nil,
-       0,
-       "p"
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/whitequark/ruby_bug_11990.txt b/test/yarp/snapshots/whitequark/ruby_bug_11990.txt
deleted file mode 100644
index 379407bffb1c32..00000000000000
--- a/test/yarp/snapshots/whitequark/ruby_bug_11990.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-ProgramNode(0...12)(
-  [],
-  StatementsNode(0...12)(
-    [CallNode(0...12)(
-       nil,
-       nil,
-       (0...1),
-       nil,
-       ArgumentsNode(2...12)(
-         [StringConcatNode(2...12)(
-            InterpolatedStringNode(2...6)(
-              (2...6),
-              [StringNode(13...17)(nil, (13...17), nil, "x\n")],
-              (17...19)
-            ),
-            StringNode(7...12)((7...8), (8...11), (11...12), "  y")
-          )]
-       ),
-       nil,
-       nil,
-       0,
-       "p"
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/whitequark/ruby_bug_12073.txt b/test/yarp/snapshots/whitequark/ruby_bug_12073.txt
deleted file mode 100644
index 0688332fd34292..00000000000000
--- a/test/yarp/snapshots/whitequark/ruby_bug_12073.txt
+++ /dev/null
@@ -1,71 +0,0 @@
-ProgramNode(0...49)(
-  [:a],
-  StatementsNode(0...49)(
-    [LocalVariableWriteNode(0...5)(
-       :a,
-       0,
-       (0...1),
-       IntegerNode(4...5)(),
-       (2...3)
-     ),
-     CallNode(7...13)(
-       nil,
-       nil,
-       (7...8),
-       nil,
-       ArgumentsNode(9...13)(
-         [KeywordHashNode(9...13)(
-            [AssocNode(9...13)(
-               SymbolNode(9...11)(nil, (9...10), (10...11), "b"),
-               IntegerNode(12...13)(),
-               nil
-             )]
-          )]
-       ),
-       nil,
-       nil,
-       0,
-       "a"
-     ),
-     DefNode(15...49)(
-       (19...22),
-       nil,
-       ParametersNode(23...28)(
-         [RequiredParameterNode(23...28)(:raise)],
-         [],
-         [],
-         nil,
-         [],
-         nil,
-         nil
-       ),
-       StatementsNode(30...44)(
-         [CallNode(30...44)(
-            nil,
-            nil,
-            (30...35),
-            nil,
-            ArgumentsNode(36...44)(
-              [ConstantPathNode(36...40)(
-                 ConstantReadNode(36...37)(:A),
-                 ConstantReadNode(39...40)(:B),
-                 (37...39)
-               ),
-               StringNode(42...44)((42...43), (43...43), (43...44), "")]
-            ),
-            nil,
-            nil,
-            0,
-            "raise"
-          )]
-       ),
-       [:raise],
-       (15...18),
-       nil,
-       nil,
-       nil,
-       nil,
-       (46...49)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/whitequark/ruby_bug_12402.txt b/test/yarp/snapshots/whitequark/ruby_bug_12402.txt
deleted file mode 100644
index 2f7562fd20b22d..00000000000000
--- a/test/yarp/snapshots/whitequark/ruby_bug_12402.txt
+++ /dev/null
@@ -1,529 +0,0 @@
-ProgramNode(0...437)(
-  [:foo],
-  StatementsNode(0...437)(
-    [LocalVariableOperatorWriteNode(0...27)(
-       (0...3),
-       (4...6),
-       CallNode(7...27)(
-         nil,
-         nil,
-         (7...12),
-         nil,
-         ArgumentsNode(13...27)(
-           [RescueModifierNode(13...27)(
-              CallNode(13...16)(
-                nil,
-                nil,
-                (13...16),
-                nil,
-                nil,
-                nil,
-                nil,
-                2,
-                "bar"
-              ),
-              (17...23),
-              NilNode(24...27)()
-            )]
-         ),
-         nil,
-         nil,
-         0,
-         "raise"
-       ),
-       :foo,
-       :+,
-       0
-     ),
-     LocalVariableOperatorWriteNode(29...57)(
-       (29...32),
-       (33...35),
-       RescueModifierNode(36...57)(
-         CallNode(36...46)(
-           nil,
-           nil,
-           (36...41),
-           (41...42),
-           ArgumentsNode(42...45)(
-             [CallNode(42...45)(
-                nil,
-                nil,
-                (42...45),
-                nil,
-                nil,
-                nil,
-                nil,
-                2,
-                "bar"
-              )]
-           ),
-           (45...46),
-           nil,
-           0,
-           "raise"
-         ),
-         (47...53),
-         NilNode(54...57)()
-       ),
-       :foo,
-       :+,
-       0
-     ),
-     LocalVariableWriteNode(59...85)(
-       :foo,
-       0,
-       (59...62),
-       CallNode(65...85)(
-         nil,
-         nil,
-         (65...70),
-         nil,
-         ArgumentsNode(71...85)(
-           [RescueModifierNode(71...85)(
-              CallNode(71...74)(
-                nil,
-                nil,
-                (71...74),
-                nil,
-                nil,
-                nil,
-                nil,
-                2,
-                "bar"
-              ),
-              (75...81),
-              NilNode(82...85)()
-            )]
-         ),
-         nil,
-         nil,
-         0,
-         "raise"
-       ),
-       (63...64)
-     ),
-     LocalVariableWriteNode(87...114)(
-       :foo,
-       0,
-       (87...90),
-       RescueModifierNode(93...114)(
-         CallNode(93...103)(
-           nil,
-           nil,
-           (93...98),
-           (98...99),
-           ArgumentsNode(99...102)(
-             [CallNode(99...102)(
-                nil,
-                nil,
-                (99...102),
-                nil,
-                nil,
-                nil,
-                nil,
-                2,
-                "bar"
-              )]
-           ),
-           (102...103),
-           nil,
-           0,
-           "raise"
-         ),
-         (104...110),
-         NilNode(111...114)()
-       ),
-       (91...92)
-     ),
-     CallOperatorWriteNode(116...145)(
-       LocalVariableReadNode(116...119)(:foo, 0),
-       (119...120),
-       (120...121),
-       nil,
-       nil,
-       nil,
-       0,
-       "C",
-       "C=",
-       :+,
-       (122...124),
-       CallNode(125...145)(
-         nil,
-         nil,
-         (125...130),
-         nil,
-         ArgumentsNode(131...145)(
-           [RescueModifierNode(131...145)(
-              CallNode(131...134)(
-                nil,
-                nil,
-                (131...134),
-                nil,
-                nil,
-                nil,
-                nil,
-                2,
-                "bar"
-              ),
-              (135...141),
-              NilNode(142...145)()
-            )]
-         ),
-         nil,
-         nil,
-         0,
-         "raise"
-       )
-     ),
-     CallOperatorWriteNode(147...177)(
-       LocalVariableReadNode(147...150)(:foo, 0),
-       (150...151),
-       (151...152),
-       nil,
-       nil,
-       nil,
-       0,
-       "C",
-       "C=",
-       :+,
-       (153...155),
-       RescueModifierNode(156...177)(
-         CallNode(156...166)(
-           nil,
-           nil,
-           (156...161),
-           (161...162),
-           ArgumentsNode(162...165)(
-             [CallNode(162...165)(
-                nil,
-                nil,
-                (162...165),
-                nil,
-                nil,
-                nil,
-                nil,
-                2,
-                "bar"
-              )]
-           ),
-           (165...166),
-           nil,
-           0,
-           "raise"
-         ),
-         (167...173),
-         NilNode(174...177)()
-       )
-     ),
-     CallOperatorWriteNode(179...208)(
-       LocalVariableReadNode(179...182)(:foo, 0),
-       (182...183),
-       (183...184),
-       nil,
-       nil,
-       nil,
-       0,
-       "m",
-       "m=",
-       :+,
-       (185...187),
-       CallNode(188...208)(
-         nil,
-         nil,
-         (188...193),
-         nil,
-         ArgumentsNode(194...208)(
-           [RescueModifierNode(194...208)(
-              CallNode(194...197)(
-                nil,
-                nil,
-                (194...197),
-                nil,
-                nil,
-                nil,
-                nil,
-                2,
-                "bar"
-              ),
-              (198...204),
-              NilNode(205...208)()
-            )]
-         ),
-         nil,
-         nil,
-         0,
-         "raise"
-       )
-     ),
-     CallOperatorWriteNode(210...240)(
-       LocalVariableReadNode(210...213)(:foo, 0),
-       (213...214),
-       (214...215),
-       nil,
-       nil,
-       nil,
-       0,
-       "m",
-       "m=",
-       :+,
-       (216...218),
-       RescueModifierNode(219...240)(
-         CallNode(219...229)(
-           nil,
-           nil,
-           (219...224),
-           (224...225),
-           ArgumentsNode(225...228)(
-             [CallNode(225...228)(
-                nil,
-                nil,
-                (225...228),
-                nil,
-                nil,
-                nil,
-                nil,
-                2,
-                "bar"
-              )]
-           ),
-           (228...229),
-           nil,
-           0,
-           "raise"
-         ),
-         (230...236),
-         NilNode(237...240)()
-       )
-     ),
-     ConstantPathOrWriteNode(242...273)(
-       ConstantPathNode(242...248)(
-         LocalVariableReadNode(242...245)(:foo, 0),
-         ConstantReadNode(247...248)(:C),
-         (245...247)
-       ),
-       (249...252),
-       CallNode(253...273)(
-         nil,
-         nil,
-         (253...258),
-         nil,
-         ArgumentsNode(259...273)(
-           [RescueModifierNode(259...273)(
-              CallNode(259...262)(
-                nil,
-                nil,
-                (259...262),
-                nil,
-                nil,
-                nil,
-                nil,
-                2,
-                "bar"
-              ),
-              (263...269),
-              NilNode(270...273)()
-            )]
-         ),
-         nil,
-         nil,
-         0,
-         "raise"
-       )
-     ),
-     ConstantPathOrWriteNode(275...307)(
-       ConstantPathNode(275...281)(
-         LocalVariableReadNode(275...278)(:foo, 0),
-         ConstantReadNode(280...281)(:C),
-         (278...280)
-       ),
-       (282...285),
-       RescueModifierNode(286...307)(
-         CallNode(286...296)(
-           nil,
-           nil,
-           (286...291),
-           (291...292),
-           ArgumentsNode(292...295)(
-             [CallNode(292...295)(
-                nil,
-                nil,
-                (292...295),
-                nil,
-                nil,
-                nil,
-                nil,
-                2,
-                "bar"
-              )]
-           ),
-           (295...296),
-           nil,
-           0,
-           "raise"
-         ),
-         (297...303),
-         NilNode(304...307)()
-       )
-     ),
-     CallOperatorWriteNode(309...339)(
-       LocalVariableReadNode(309...312)(:foo, 0),
-       (312...314),
-       (314...315),
-       nil,
-       nil,
-       nil,
-       0,
-       "m",
-       "m=",
-       :+,
-       (316...318),
-       CallNode(319...339)(
-         nil,
-         nil,
-         (319...324),
-         nil,
-         ArgumentsNode(325...339)(
-           [RescueModifierNode(325...339)(
-              CallNode(325...328)(
-                nil,
-                nil,
-                (325...328),
-                nil,
-                nil,
-                nil,
-                nil,
-                2,
-                "bar"
-              ),
-              (329...335),
-              NilNode(336...339)()
-            )]
-         ),
-         nil,
-         nil,
-         0,
-         "raise"
-       )
-     ),
-     CallOperatorWriteNode(341...372)(
-       LocalVariableReadNode(341...344)(:foo, 0),
-       (344...346),
-       (346...347),
-       nil,
-       nil,
-       nil,
-       0,
-       "m",
-       "m=",
-       :+,
-       (348...350),
-       RescueModifierNode(351...372)(
-         CallNode(351...361)(
-           nil,
-           nil,
-           (351...356),
-           (356...357),
-           ArgumentsNode(357...360)(
-             [CallNode(357...360)(
-                nil,
-                nil,
-                (357...360),
-                nil,
-                nil,
-                nil,
-                nil,
-                2,
-                "bar"
-              )]
-           ),
-           (360...361),
-           nil,
-           0,
-           "raise"
-         ),
-         (362...368),
-         NilNode(369...372)()
-       )
-     ),
-     CallOperatorWriteNode(374...404)(
-       LocalVariableReadNode(374...377)(:foo, 0),
-       nil,
-       (377...380),
-       (377...378),
-       ArgumentsNode(378...379)([IntegerNode(378...379)()]),
-       (379...380),
-       0,
-       "[]",
-       "[]=",
-       :+,
-       (381...383),
-       CallNode(384...404)(
-         nil,
-         nil,
-         (384...389),
-         nil,
-         ArgumentsNode(390...404)(
-           [RescueModifierNode(390...404)(
-              CallNode(390...393)(
-                nil,
-                nil,
-                (390...393),
-                nil,
-                nil,
-                nil,
-                nil,
-                2,
-                "bar"
-              ),
-              (394...400),
-              NilNode(401...404)()
-            )]
-         ),
-         nil,
-         nil,
-         0,
-         "raise"
-       )
-     ),
-     CallOperatorWriteNode(406...437)(
-       LocalVariableReadNode(406...409)(:foo, 0),
-       nil,
-       (409...412),
-       (409...410),
-       ArgumentsNode(410...411)([IntegerNode(410...411)()]),
-       (411...412),
-       0,
-       "[]",
-       "[]=",
-       :+,
-       (413...415),
-       RescueModifierNode(416...437)(
-         CallNode(416...426)(
-           nil,
-           nil,
-           (416...421),
-           (421...422),
-           ArgumentsNode(422...425)(
-             [CallNode(422...425)(
-                nil,
-                nil,
-                (422...425),
-                nil,
-                nil,
-                nil,
-                nil,
-                2,
-                "bar"
-              )]
-           ),
-           (425...426),
-           nil,
-           0,
-           "raise"
-         ),
-         (427...433),
-         NilNode(434...437)()
-       )
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/whitequark/ruby_bug_12669.txt b/test/yarp/snapshots/whitequark/ruby_bug_12669.txt
deleted file mode 100644
index 689a3d9a77a245..00000000000000
--- a/test/yarp/snapshots/whitequark/ruby_bug_12669.txt
+++ /dev/null
@@ -1,109 +0,0 @@
-ProgramNode(0...74)(
-  [:a, :b],
-  StatementsNode(0...74)(
-    [LocalVariableOperatorWriteNode(0...18)(
-       (0...1),
-       (2...4),
-       LocalVariableOperatorWriteNode(5...18)(
-         (5...6),
-         (7...9),
-         CallNode(10...18)(
-           nil,
-           nil,
-           (10...15),
-           nil,
-           ArgumentsNode(16...18)(
-             [SymbolNode(16...18)((16...17), (17...18), nil, "x")]
-           ),
-           nil,
-           nil,
-           0,
-           "raise"
-         ),
-         :b,
-         :+,
-         0
-       ),
-       :a,
-       :+,
-       0
-     ),
-     LocalVariableOperatorWriteNode(20...37)(
-       (20...21),
-       (22...24),
-       LocalVariableWriteNode(25...37)(
-         :b,
-         0,
-         (25...26),
-         CallNode(29...37)(
-           nil,
-           nil,
-           (29...34),
-           nil,
-           ArgumentsNode(35...37)(
-             [SymbolNode(35...37)((35...36), (36...37), nil, "x")]
-           ),
-           nil,
-           nil,
-           0,
-           "raise"
-         ),
-         (27...28)
-       ),
-       :a,
-       :+,
-       0
-     ),
-     LocalVariableWriteNode(39...56)(
-       :a,
-       0,
-       (39...40),
-       LocalVariableOperatorWriteNode(43...56)(
-         (43...44),
-         (45...47),
-         CallNode(48...56)(
-           nil,
-           nil,
-           (48...53),
-           nil,
-           ArgumentsNode(54...56)(
-             [SymbolNode(54...56)((54...55), (55...56), nil, "x")]
-           ),
-           nil,
-           nil,
-           0,
-           "raise"
-         ),
-         :b,
-         :+,
-         0
-       ),
-       (41...42)
-     ),
-     LocalVariableWriteNode(58...74)(
-       :a,
-       0,
-       (58...59),
-       LocalVariableWriteNode(62...74)(
-         :b,
-         0,
-         (62...63),
-         CallNode(66...74)(
-           nil,
-           nil,
-           (66...71),
-           nil,
-           ArgumentsNode(72...74)(
-             [SymbolNode(72...74)((72...73), (73...74), nil, "x")]
-           ),
-           nil,
-           nil,
-           0,
-           "raise"
-         ),
-         (64...65)
-       ),
-       (60...61)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/whitequark/ruby_bug_12686.txt b/test/yarp/snapshots/whitequark/ruby_bug_12686.txt
deleted file mode 100644
index f0ae6d107494fd..00000000000000
--- a/test/yarp/snapshots/whitequark/ruby_bug_12686.txt
+++ /dev/null
@@ -1,38 +0,0 @@
-ProgramNode(0...16)(
-  [],
-  StatementsNode(0...16)(
-    [CallNode(0...16)(
-       nil,
-       nil,
-       (0...1),
-       nil,
-       ArgumentsNode(2...16)(
-         [ParenthesesNode(2...16)(
-            StatementsNode(3...15)(
-              [RescueModifierNode(3...15)(
-                 CallNode(3...4)(
-                   nil,
-                   nil,
-                   (3...4),
-                   nil,
-                   nil,
-                   nil,
-                   nil,
-                   2,
-                   "g"
-                 ),
-                 (5...11),
-                 NilNode(12...15)()
-               )]
-            ),
-            (2...3),
-            (15...16)
-          )]
-       ),
-       nil,
-       nil,
-       0,
-       "f"
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/whitequark/ruby_bug_13547.txt b/test/yarp/snapshots/whitequark/ruby_bug_13547.txt
deleted file mode 100644
index c0e5ccd927151e..00000000000000
--- a/test/yarp/snapshots/whitequark/ruby_bug_13547.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-ProgramNode(0...9)(
-  [],
-  StatementsNode(0...9)(
-    [CallNode(0...9)(
-       CallNode(0...4)(nil, nil, (0...4), nil, nil, nil, nil, 2, "meth"),
-       nil,
-       (4...6),
-       (4...5),
-       nil,
-       (5...6),
-       BlockNode(7...9)([], nil, nil, (7...8), (8...9)),
-       0,
-       "[]"
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/whitequark/ruby_bug_14690.txt b/test/yarp/snapshots/whitequark/ruby_bug_14690.txt
deleted file mode 100644
index 743cf8b7b6e1b7..00000000000000
--- a/test/yarp/snapshots/whitequark/ruby_bug_14690.txt
+++ /dev/null
@@ -1,46 +0,0 @@
-ProgramNode(0...23)(
-  [],
-  StatementsNode(0...23)(
-    [CallNode(0...23)(
-       nil,
-       nil,
-       (0...3),
-       nil,
-       ArgumentsNode(4...6)([ParenthesesNode(4...6)(nil, (4...5), (5...6))]),
-       nil,
-       BlockNode(7...23)(
-         [],
-         nil,
-         StatementsNode(9...21)(
-           [CallNode(9...21)(
-              nil,
-              nil,
-              (9...10),
-              (10...11),
-              ArgumentsNode(11...12)(
-                [CallNode(11...12)(
-                   nil,
-                   nil,
-                   (11...12),
-                   nil,
-                   nil,
-                   nil,
-                   nil,
-                   2,
-                   "a"
-                 )]
-              ),
-              (12...13),
-              BlockNode(14...21)([], nil, nil, (14...16), (18...21)),
-              0,
-              "m"
-            )]
-         ),
-         (7...8),
-         (22...23)
-       ),
-       0,
-       "let"
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/whitequark/ruby_bug_15789.txt b/test/yarp/snapshots/whitequark/ruby_bug_15789.txt
deleted file mode 100644
index 0621e71c8cc3f5..00000000000000
--- a/test/yarp/snapshots/whitequark/ruby_bug_15789.txt
+++ /dev/null
@@ -1,117 +0,0 @@
-ProgramNode(0...41)(
-  [],
-  StatementsNode(0...41)(
-    [CallNode(0...20)(
-       nil,
-       nil,
-       (0...1),
-       nil,
-       ArgumentsNode(2...20)(
-         [LambdaNode(2...20)(
-            [:a],
-            (2...4),
-            (17...18),
-            (19...20),
-            BlockParametersNode(4...16)(
-              ParametersNode(5...15)(
-                [],
-                [OptionalParameterNode(5...15)(
-                   :a,
-                   (5...6),
-                   (7...8),
-                   LambdaNode(9...15)(
-                     [],
-                     (9...11),
-                     (11...12),
-                     (14...15),
-                     nil,
-                     StatementsNode(12...14)(
-                       [CallNode(12...14)(
-                          nil,
-                          nil,
-                          (12...14),
-                          nil,
-                          nil,
-                          nil,
-                          nil,
-                          2,
-                          "_1"
-                        )]
-                     )
-                   )
-                 )],
-                [],
-                nil,
-                [],
-                nil,
-                nil
-              ),
-              [],
-              (4...5),
-              (15...16)
-            ),
-            StatementsNode(18...19)([LocalVariableReadNode(18...19)(:a, 0)])
-          )]
-       ),
-       nil,
-       nil,
-       0,
-       "m"
-     ),
-     CallNode(22...41)(
-       nil,
-       nil,
-       (22...23),
-       nil,
-       ArgumentsNode(24...41)(
-         [LambdaNode(24...41)(
-            [:a],
-            (24...26),
-            (38...39),
-            (40...41),
-            BlockParametersNode(26...37)(
-              ParametersNode(27...36)(
-                [],
-                [],
-                [],
-                nil,
-                [KeywordParameterNode(27...36)(
-                   (27...29),
-                   LambdaNode(30...36)(
-                     [],
-                     (30...32),
-                     (32...33),
-                     (35...36),
-                     nil,
-                     StatementsNode(33...35)(
-                       [CallNode(33...35)(
-                          nil,
-                          nil,
-                          (33...35),
-                          nil,
-                          nil,
-                          nil,
-                          nil,
-                          2,
-                          "_1"
-                        )]
-                     )
-                   )
-                 )],
-                nil,
-                nil
-              ),
-              [],
-              (26...27),
-              (36...37)
-            ),
-            StatementsNode(39...40)([LocalVariableReadNode(39...40)(:a, 0)])
-          )]
-       ),
-       nil,
-       nil,
-       0,
-       "m"
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/whitequark/ruby_bug_9669.txt b/test/yarp/snapshots/whitequark/ruby_bug_9669.txt
deleted file mode 100644
index 6302c3d317b073..00000000000000
--- a/test/yarp/snapshots/whitequark/ruby_bug_9669.txt
+++ /dev/null
@@ -1,41 +0,0 @@
-ProgramNode(0...33)(
-  [:o],
-  StatementsNode(0...33)(
-    [DefNode(0...19)(
-       (4...5),
-       nil,
-       ParametersNode(6...8)(
-         [],
-         [],
-         [],
-         nil,
-         [KeywordParameterNode(6...8)((6...8), nil)],
-         nil,
-         nil
-       ),
-       StatementsNode(9...15)([ReturnNode(9...15)((9...15), nil)]),
-       [:b],
-       (0...3),
-       nil,
-       nil,
-       nil,
-       nil,
-       (16...19)
-     ),
-     LocalVariableWriteNode(21...33)(
-       :o,
-       0,
-       (21...22),
-       HashNode(25...33)(
-         (25...26),
-         [AssocNode(27...31)(
-            SymbolNode(27...29)(nil, (27...28), (28...29), "a"),
-            IntegerNode(30...31)(),
-            nil
-          )],
-         (32...33)
-       ),
-       (23...24)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/whitequark/sclass.txt b/test/yarp/snapshots/whitequark/sclass.txt
deleted file mode 100644
index a8beb303ebf774..00000000000000
--- a/test/yarp/snapshots/whitequark/sclass.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-ProgramNode(0...22)(
-  [],
-  StatementsNode(0...22)(
-    [SingletonClassNode(0...22)(
-       [],
-       (0...5),
-       (6...8),
-       CallNode(9...12)(nil, nil, (9...12), nil, nil, nil, nil, 2, "foo"),
-       StatementsNode(14...17)([NilNode(14...17)()]),
-       (19...22)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/whitequark/self.txt b/test/yarp/snapshots/whitequark/self.txt
deleted file mode 100644
index 0002d6ee6d48dc..00000000000000
--- a/test/yarp/snapshots/whitequark/self.txt
+++ /dev/null
@@ -1 +0,0 @@
-ProgramNode(0...4)([], StatementsNode(0...4)([SelfNode(0...4)()]))
diff --git a/test/yarp/snapshots/whitequark/send_attr_asgn.txt b/test/yarp/snapshots/whitequark/send_attr_asgn.txt
deleted file mode 100644
index b4b3d5706433c5..00000000000000
--- a/test/yarp/snapshots/whitequark/send_attr_asgn.txt
+++ /dev/null
@@ -1,47 +0,0 @@
-ProgramNode(0...44)(
-  [],
-  StatementsNode(0...44)(
-    [CallNode(0...9)(
-       CallNode(0...3)(nil, nil, (0...3), nil, nil, nil, nil, 2, "foo"),
-       (3...4),
-       (4...5),
-       nil,
-       ArgumentsNode(8...9)([IntegerNode(8...9)()]),
-       nil,
-       nil,
-       0,
-       "A="
-     ),
-     CallNode(11...20)(
-       CallNode(11...14)(nil, nil, (11...14), nil, nil, nil, nil, 2, "foo"),
-       (14...15),
-       (15...16),
-       nil,
-       ArgumentsNode(19...20)([IntegerNode(19...20)()]),
-       nil,
-       nil,
-       0,
-       "a="
-     ),
-     ConstantPathWriteNode(22...32)(
-       ConstantPathNode(22...28)(
-         CallNode(22...25)(nil, nil, (22...25), nil, nil, nil, nil, 2, "foo"),
-         ConstantReadNode(27...28)(:A),
-         (25...27)
-       ),
-       (29...30),
-       IntegerNode(31...32)()
-     ),
-     CallNode(34...44)(
-       CallNode(34...37)(nil, nil, (34...37), nil, nil, nil, nil, 2, "foo"),
-       (37...39),
-       (39...40),
-       nil,
-       ArgumentsNode(43...44)([IntegerNode(43...44)()]),
-       nil,
-       nil,
-       0,
-       "a="
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/whitequark/send_attr_asgn_conditional.txt b/test/yarp/snapshots/whitequark/send_attr_asgn_conditional.txt
deleted file mode 100644
index a48f189f41a122..00000000000000
--- a/test/yarp/snapshots/whitequark/send_attr_asgn_conditional.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-ProgramNode(0...8)(
-  [],
-  StatementsNode(0...8)(
-    [CallNode(0...8)(
-       CallNode(0...1)(nil, nil, (0...1), nil, nil, nil, nil, 2, "a"),
-       (1...3),
-       (3...4),
-       nil,
-       ArgumentsNode(7...8)([IntegerNode(7...8)()]),
-       nil,
-       nil,
-       1,
-       "b="
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/whitequark/send_binary_op.txt b/test/yarp/snapshots/whitequark/send_binary_op.txt
deleted file mode 100644
index aadcb1fcb9dea3..00000000000000
--- a/test/yarp/snapshots/whitequark/send_binary_op.txt
+++ /dev/null
@@ -1,336 +0,0 @@
-ProgramNode(0...200)(
-  [],
-  StatementsNode(0...200)(
-    [CallNode(0...8)(
-       CallNode(0...3)(nil, nil, (0...3), nil, nil, nil, nil, 2, "foo"),
-       nil,
-       (4...6),
-       nil,
-       ArgumentsNode(7...8)([IntegerNode(7...8)()]),
-       nil,
-       nil,
-       0,
-       "!="
-     ),
-     CallNode(10...18)(
-       CallNode(10...13)(nil, nil, (10...13), nil, nil, nil, nil, 2, "foo"),
-       nil,
-       (14...16),
-       nil,
-       ArgumentsNode(17...18)([IntegerNode(17...18)()]),
-       nil,
-       nil,
-       0,
-       "!~"
-     ),
-     CallNode(20...27)(
-       CallNode(20...23)(nil, nil, (20...23), nil, nil, nil, nil, 2, "foo"),
-       nil,
-       (24...25),
-       nil,
-       ArgumentsNode(26...27)([IntegerNode(26...27)()]),
-       nil,
-       nil,
-       0,
-       "%"
-     ),
-     CallNode(29...36)(
-       CallNode(29...32)(nil, nil, (29...32), nil, nil, nil, nil, 2, "foo"),
-       nil,
-       (33...34),
-       nil,
-       ArgumentsNode(35...36)([IntegerNode(35...36)()]),
-       nil,
-       nil,
-       0,
-       "&"
-     ),
-     CallNode(38...45)(
-       CallNode(38...41)(nil, nil, (38...41), nil, nil, nil, nil, 2, "foo"),
-       nil,
-       (42...43),
-       nil,
-       ArgumentsNode(44...45)([IntegerNode(44...45)()]),
-       nil,
-       nil,
-       0,
-       "*"
-     ),
-     CallNode(47...55)(
-       CallNode(47...50)(nil, nil, (47...50), nil, nil, nil, nil, 2, "foo"),
-       nil,
-       (51...53),
-       nil,
-       ArgumentsNode(54...55)([IntegerNode(54...55)()]),
-       nil,
-       nil,
-       0,
-       "**"
-     ),
-     CallNode(57...64)(
-       CallNode(57...60)(nil, nil, (57...60), nil, nil, nil, nil, 2, "foo"),
-       nil,
-       (61...62),
-       nil,
-       ArgumentsNode(63...64)([IntegerNode(63...64)()]),
-       nil,
-       nil,
-       0,
-       "+"
-     ),
-     CallNode(66...73)(
-       CallNode(66...69)(nil, nil, (66...69), nil, nil, nil, nil, 2, "foo"),
-       nil,
-       (70...71),
-       nil,
-       ArgumentsNode(72...73)([IntegerNode(72...73)()]),
-       nil,
-       nil,
-       0,
-       "-"
-     ),
-     CallNode(75...82)(
-       CallNode(75...78)(nil, nil, (75...78), nil, nil, nil, nil, 2, "foo"),
-       nil,
-       (79...80),
-       nil,
-       ArgumentsNode(81...82)([IntegerNode(81...82)()]),
-       nil,
-       nil,
-       0,
-       "/"
-     ),
-     CallNode(84...91)(
-       CallNode(84...87)(nil, nil, (84...87), nil, nil, nil, nil, 2, "foo"),
-       nil,
-       (88...89),
-       nil,
-       ArgumentsNode(90...91)([IntegerNode(90...91)()]),
-       nil,
-       nil,
-       0,
-       "<"
-     ),
-     CallNode(93...101)(
-       CallNode(93...96)(nil, nil, (93...96), nil, nil, nil, nil, 2, "foo"),
-       nil,
-       (97...99),
-       nil,
-       ArgumentsNode(100...101)([IntegerNode(100...101)()]),
-       nil,
-       nil,
-       0,
-       "<<"
-     ),
-     CallNode(103...111)(
-       CallNode(103...106)(
-         nil,
-         nil,
-         (103...106),
-         nil,
-         nil,
-         nil,
-         nil,
-         2,
-         "foo"
-       ),
-       nil,
-       (107...109),
-       nil,
-       ArgumentsNode(110...111)([IntegerNode(110...111)()]),
-       nil,
-       nil,
-       0,
-       "<="
-     ),
-     CallNode(113...122)(
-       CallNode(113...116)(
-         nil,
-         nil,
-         (113...116),
-         nil,
-         nil,
-         nil,
-         nil,
-         2,
-         "foo"
-       ),
-       nil,
-       (117...120),
-       nil,
-       ArgumentsNode(121...122)([IntegerNode(121...122)()]),
-       nil,
-       nil,
-       0,
-       "<=>"
-     ),
-     CallNode(124...132)(
-       CallNode(124...127)(
-         nil,
-         nil,
-         (124...127),
-         nil,
-         nil,
-         nil,
-         nil,
-         2,
-         "foo"
-       ),
-       nil,
-       (128...130),
-       nil,
-       ArgumentsNode(131...132)([IntegerNode(131...132)()]),
-       nil,
-       nil,
-       0,
-       "=="
-     ),
-     CallNode(134...143)(
-       CallNode(134...137)(
-         nil,
-         nil,
-         (134...137),
-         nil,
-         nil,
-         nil,
-         nil,
-         2,
-         "foo"
-       ),
-       nil,
-       (138...141),
-       nil,
-       ArgumentsNode(142...143)([IntegerNode(142...143)()]),
-       nil,
-       nil,
-       0,
-       "==="
-     ),
-     CallNode(145...153)(
-       CallNode(145...148)(
-         nil,
-         nil,
-         (145...148),
-         nil,
-         nil,
-         nil,
-         nil,
-         2,
-         "foo"
-       ),
-       nil,
-       (149...151),
-       nil,
-       ArgumentsNode(152...153)([IntegerNode(152...153)()]),
-       nil,
-       nil,
-       0,
-       "=~"
-     ),
-     CallNode(155...162)(
-       CallNode(155...158)(
-         nil,
-         nil,
-         (155...158),
-         nil,
-         nil,
-         nil,
-         nil,
-         2,
-         "foo"
-       ),
-       nil,
-       (159...160),
-       nil,
-       ArgumentsNode(161...162)([IntegerNode(161...162)()]),
-       nil,
-       nil,
-       0,
-       ">"
-     ),
-     CallNode(164...172)(
-       CallNode(164...167)(
-         nil,
-         nil,
-         (164...167),
-         nil,
-         nil,
-         nil,
-         nil,
-         2,
-         "foo"
-       ),
-       nil,
-       (168...170),
-       nil,
-       ArgumentsNode(171...172)([IntegerNode(171...172)()]),
-       nil,
-       nil,
-       0,
-       ">="
-     ),
-     CallNode(174...182)(
-       CallNode(174...177)(
-         nil,
-         nil,
-         (174...177),
-         nil,
-         nil,
-         nil,
-         nil,
-         2,
-         "foo"
-       ),
-       nil,
-       (178...180),
-       nil,
-       ArgumentsNode(181...182)([IntegerNode(181...182)()]),
-       nil,
-       nil,
-       0,
-       ">>"
-     ),
-     CallNode(184...191)(
-       CallNode(184...187)(
-         nil,
-         nil,
-         (184...187),
-         nil,
-         nil,
-         nil,
-         nil,
-         2,
-         "foo"
-       ),
-       nil,
-       (188...189),
-       nil,
-       ArgumentsNode(190...191)([IntegerNode(190...191)()]),
-       nil,
-       nil,
-       0,
-       "^"
-     ),
-     CallNode(193...200)(
-       CallNode(193...196)(
-         nil,
-         nil,
-         (193...196),
-         nil,
-         nil,
-         nil,
-         nil,
-         2,
-         "foo"
-       ),
-       nil,
-       (197...198),
-       nil,
-       ArgumentsNode(199...200)([IntegerNode(199...200)()]),
-       nil,
-       nil,
-       0,
-       "|"
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/whitequark/send_block_chain_cmd.txt b/test/yarp/snapshots/whitequark/send_block_chain_cmd.txt
deleted file mode 100644
index c9d9a3662887eb..00000000000000
--- a/test/yarp/snapshots/whitequark/send_block_chain_cmd.txt
+++ /dev/null
@@ -1,194 +0,0 @@
-ProgramNode(0...173)(
-  [],
-  StatementsNode(0...173)(
-    [CallNode(0...21)(
-       CallNode(0...13)(
-         nil,
-         nil,
-         (0...4),
-         nil,
-         ArgumentsNode(5...6)([IntegerNode(5...6)()]),
-         nil,
-         BlockNode(7...13)([], nil, nil, (7...9), (10...13)),
-         0,
-         "meth"
-       ),
-       (13...14),
-       (14...17),
-       nil,
-       ArgumentsNode(18...21)(
-         [CallNode(18...21)(nil, nil, (18...21), nil, nil, nil, nil, 2, "bar")]
-       ),
-       nil,
-       nil,
-       0,
-       "fun"
-     ),
-     CallNode(23...51)(
-       CallNode(23...36)(
-         nil,
-         nil,
-         (23...27),
-         nil,
-         ArgumentsNode(28...29)([IntegerNode(28...29)()]),
-         nil,
-         BlockNode(30...36)([], nil, nil, (30...32), (33...36)),
-         0,
-         "meth"
-       ),
-       (36...37),
-       (37...40),
-       nil,
-       ArgumentsNode(41...44)(
-         [CallNode(41...44)(nil, nil, (41...44), nil, nil, nil, nil, 2, "bar")]
-       ),
-       nil,
-       BlockNode(45...51)([], nil, nil, (45...47), (48...51)),
-       0,
-       "fun"
-     ),
-     CallNode(53...73)(
-       CallNode(53...66)(
-         nil,
-         nil,
-         (53...57),
-         nil,
-         ArgumentsNode(58...59)([IntegerNode(58...59)()]),
-         nil,
-         BlockNode(60...66)([], nil, nil, (60...62), (63...66)),
-         0,
-         "meth"
-       ),
-       (66...67),
-       (67...70),
-       nil,
-       nil,
-       nil,
-       BlockNode(71...73)([], nil, nil, (71...72), (72...73)),
-       0,
-       "fun"
-     ),
-     CallNode(75...97)(
-       CallNode(75...88)(
-         nil,
-         nil,
-         (75...79),
-         nil,
-         ArgumentsNode(80...81)([IntegerNode(80...81)()]),
-         nil,
-         BlockNode(82...88)([], nil, nil, (82...84), (85...88)),
-         0,
-         "meth"
-       ),
-       (88...89),
-       (89...92),
-       (92...93),
-       ArgumentsNode(93...96)(
-         [CallNode(93...96)(nil, nil, (93...96), nil, nil, nil, nil, 2, "bar")]
-       ),
-       (96...97),
-       nil,
-       0,
-       "fun"
-     ),
-     CallNode(99...124)(
-       CallNode(99...112)(
-         nil,
-         nil,
-         (99...103),
-         nil,
-         ArgumentsNode(104...105)([IntegerNode(104...105)()]),
-         nil,
-         BlockNode(106...112)([], nil, nil, (106...108), (109...112)),
-         0,
-         "meth"
-       ),
-       (112...113),
-       (113...116),
-       (116...117),
-       ArgumentsNode(117...120)(
-         [CallNode(117...120)(
-            nil,
-            nil,
-            (117...120),
-            nil,
-            nil,
-            nil,
-            nil,
-            2,
-            "bar"
-          )]
-       ),
-       (120...121),
-       BlockNode(122...124)([], nil, nil, (122...123), (123...124)),
-       0,
-       "fun"
-     ),
-     CallNode(126...148)(
-       CallNode(126...139)(
-         nil,
-         nil,
-         (126...130),
-         nil,
-         ArgumentsNode(131...132)([IntegerNode(131...132)()]),
-         nil,
-         BlockNode(133...139)([], nil, nil, (133...135), (136...139)),
-         0,
-         "meth"
-       ),
-       (139...141),
-       (141...144),
-       nil,
-       ArgumentsNode(145...148)(
-         [CallNode(145...148)(
-            nil,
-            nil,
-            (145...148),
-            nil,
-            nil,
-            nil,
-            nil,
-            2,
-            "bar"
-          )]
-       ),
-       nil,
-       nil,
-       0,
-       "fun"
-     ),
-     CallNode(150...173)(
-       CallNode(150...163)(
-         nil,
-         nil,
-         (150...154),
-         nil,
-         ArgumentsNode(155...156)([IntegerNode(155...156)()]),
-         nil,
-         BlockNode(157...163)([], nil, nil, (157...159), (160...163)),
-         0,
-         "meth"
-       ),
-       (163...165),
-       (165...168),
-       (168...169),
-       ArgumentsNode(169...172)(
-         [CallNode(169...172)(
-            nil,
-            nil,
-            (169...172),
-            nil,
-            nil,
-            nil,
-            nil,
-            2,
-            "bar"
-          )]
-       ),
-       (172...173),
-       nil,
-       0,
-       "fun"
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/whitequark/send_block_conditional.txt b/test/yarp/snapshots/whitequark/send_block_conditional.txt
deleted file mode 100644
index 3ac7347f7ab21b..00000000000000
--- a/test/yarp/snapshots/whitequark/send_block_conditional.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-ProgramNode(0...11)(
-  [],
-  StatementsNode(0...11)(
-    [CallNode(0...11)(
-       CallNode(0...3)(nil, nil, (0...3), nil, nil, nil, nil, 2, "foo"),
-       (3...5),
-       (5...8),
-       nil,
-       nil,
-       nil,
-       BlockNode(9...11)([], nil, nil, (9...10), (10...11)),
-       1,
-       "bar"
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/whitequark/send_call.txt b/test/yarp/snapshots/whitequark/send_call.txt
deleted file mode 100644
index f96195145baf54..00000000000000
--- a/test/yarp/snapshots/whitequark/send_call.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-ProgramNode(0...17)(
-  [],
-  StatementsNode(0...17)(
-    [CallNode(0...7)(
-       CallNode(0...3)(nil, nil, (0...3), nil, nil, nil, nil, 2, "foo"),
-       (3...4),
-       nil,
-       (4...5),
-       ArgumentsNode(5...6)([IntegerNode(5...6)()]),
-       (6...7),
-       nil,
-       0,
-       "call"
-     ),
-     CallNode(9...17)(
-       CallNode(9...12)(nil, nil, (9...12), nil, nil, nil, nil, 2, "foo"),
-       (12...14),
-       nil,
-       (14...15),
-       ArgumentsNode(15...16)([IntegerNode(15...16)()]),
-       (16...17),
-       nil,
-       0,
-       "call"
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/whitequark/send_conditional.txt b/test/yarp/snapshots/whitequark/send_conditional.txt
deleted file mode 100644
index d170db0f559f59..00000000000000
--- a/test/yarp/snapshots/whitequark/send_conditional.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-ProgramNode(0...4)(
-  [],
-  StatementsNode(0...4)(
-    [CallNode(0...4)(
-       CallNode(0...1)(nil, nil, (0...1), nil, nil, nil, nil, 2, "a"),
-       (1...3),
-       (3...4),
-       nil,
-       nil,
-       nil,
-       nil,
-       1,
-       "b"
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/whitequark/send_index.txt b/test/yarp/snapshots/whitequark/send_index.txt
deleted file mode 100644
index 75f8c0ff876ec5..00000000000000
--- a/test/yarp/snapshots/whitequark/send_index.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-ProgramNode(0...9)(
-  [],
-  StatementsNode(0...9)(
-    [CallNode(0...9)(
-       CallNode(0...3)(nil, nil, (0...3), nil, nil, nil, nil, 2, "foo"),
-       nil,
-       (3...9),
-       (3...4),
-       ArgumentsNode(4...8)([IntegerNode(4...5)(), IntegerNode(7...8)()]),
-       (8...9),
-       nil,
-       0,
-       "[]"
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/whitequark/send_index_asgn.txt b/test/yarp/snapshots/whitequark/send_index_asgn.txt
deleted file mode 100644
index d38af8fb52cadd..00000000000000
--- a/test/yarp/snapshots/whitequark/send_index_asgn.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-ProgramNode(0...13)(
-  [],
-  StatementsNode(0...13)(
-    [CallNode(0...13)(
-       CallNode(0...3)(nil, nil, (0...3), nil, nil, nil, nil, 2, "foo"),
-       nil,
-       (3...9),
-       (3...4),
-       ArgumentsNode(4...13)(
-         [IntegerNode(4...5)(), IntegerNode(7...8)(), IntegerNode(12...13)()]
-       ),
-       (8...9),
-       nil,
-       0,
-       "[]="
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/whitequark/send_index_asgn_legacy.txt b/test/yarp/snapshots/whitequark/send_index_asgn_legacy.txt
deleted file mode 100644
index d38af8fb52cadd..00000000000000
--- a/test/yarp/snapshots/whitequark/send_index_asgn_legacy.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-ProgramNode(0...13)(
-  [],
-  StatementsNode(0...13)(
-    [CallNode(0...13)(
-       CallNode(0...3)(nil, nil, (0...3), nil, nil, nil, nil, 2, "foo"),
-       nil,
-       (3...9),
-       (3...4),
-       ArgumentsNode(4...13)(
-         [IntegerNode(4...5)(), IntegerNode(7...8)(), IntegerNode(12...13)()]
-       ),
-       (8...9),
-       nil,
-       0,
-       "[]="
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/whitequark/send_index_cmd.txt b/test/yarp/snapshots/whitequark/send_index_cmd.txt
deleted file mode 100644
index 38c69392b3d943..00000000000000
--- a/test/yarp/snapshots/whitequark/send_index_cmd.txt
+++ /dev/null
@@ -1,40 +0,0 @@
-ProgramNode(0...10)(
-  [],
-  StatementsNode(0...10)(
-    [CallNode(0...10)(
-       CallNode(0...3)(nil, nil, (0...3), nil, nil, nil, nil, 2, "foo"),
-       nil,
-       (3...10),
-       (3...4),
-       ArgumentsNode(4...9)(
-         [CallNode(4...9)(
-            nil,
-            nil,
-            (4...5),
-            nil,
-            ArgumentsNode(6...9)(
-              [CallNode(6...9)(
-                 nil,
-                 nil,
-                 (6...9),
-                 nil,
-                 nil,
-                 nil,
-                 nil,
-                 2,
-                 "bar"
-               )]
-            ),
-            nil,
-            nil,
-            0,
-            "m"
-          )]
-       ),
-       (9...10),
-       nil,
-       0,
-       "[]"
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/whitequark/send_index_legacy.txt b/test/yarp/snapshots/whitequark/send_index_legacy.txt
deleted file mode 100644
index 75f8c0ff876ec5..00000000000000
--- a/test/yarp/snapshots/whitequark/send_index_legacy.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-ProgramNode(0...9)(
-  [],
-  StatementsNode(0...9)(
-    [CallNode(0...9)(
-       CallNode(0...3)(nil, nil, (0...3), nil, nil, nil, nil, 2, "foo"),
-       nil,
-       (3...9),
-       (3...4),
-       ArgumentsNode(4...8)([IntegerNode(4...5)(), IntegerNode(7...8)()]),
-       (8...9),
-       nil,
-       0,
-       "[]"
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/whitequark/send_lambda.txt b/test/yarp/snapshots/whitequark/send_lambda.txt
deleted file mode 100644
index c30ec09249f4e6..00000000000000
--- a/test/yarp/snapshots/whitequark/send_lambda.txt
+++ /dev/null
@@ -1,28 +0,0 @@
-ProgramNode(0...26)(
-  [],
-  StatementsNode(0...26)(
-    [LambdaNode(0...8)(
-       [:*],
-       (0...2),
-       (5...6),
-       (7...8),
-       BlockParametersNode(3...4)(
-         ParametersNode(3...4)(
-           [],
-           [],
-           [],
-           RestParameterNode(3...4)((3...4), nil),
-           [],
-           nil,
-           nil
-         ),
-         [],
-         nil,
-         nil
-       ),
-       nil
-     ),
-     LambdaNode(10...19)([], (10...12), (13...15), (16...19), nil, nil),
-     LambdaNode(21...26)([], (21...23), (23...24), (25...26), nil, nil)]
-  )
-)
diff --git a/test/yarp/snapshots/whitequark/send_lambda_args.txt b/test/yarp/snapshots/whitequark/send_lambda_args.txt
deleted file mode 100644
index ae41cfa463fa6f..00000000000000
--- a/test/yarp/snapshots/whitequark/send_lambda_args.txt
+++ /dev/null
@@ -1,47 +0,0 @@
-ProgramNode(0...21)(
-  [],
-  StatementsNode(0...21)(
-    [LambdaNode(0...10)(
-       [:a],
-       (0...2),
-       (7...8),
-       (9...10),
-       BlockParametersNode(3...6)(
-         ParametersNode(4...5)(
-           [RequiredParameterNode(4...5)(:a)],
-           [],
-           [],
-           nil,
-           [],
-           nil,
-           nil
-         ),
-         [],
-         (3...4),
-         (5...6)
-       ),
-       nil
-     ),
-     LambdaNode(12...21)(
-       [:a],
-       (12...14),
-       (18...19),
-       (20...21),
-       BlockParametersNode(14...17)(
-         ParametersNode(15...16)(
-           [RequiredParameterNode(15...16)(:a)],
-           [],
-           [],
-           nil,
-           [],
-           nil,
-           nil
-         ),
-         [],
-         (14...15),
-         (16...17)
-       ),
-       nil
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/whitequark/send_lambda_args_noparen.txt b/test/yarp/snapshots/whitequark/send_lambda_args_noparen.txt
deleted file mode 100644
index ebb6fb106518f6..00000000000000
--- a/test/yarp/snapshots/whitequark/send_lambda_args_noparen.txt
+++ /dev/null
@@ -1,47 +0,0 @@
-ProgramNode(0...22)(
-  [],
-  StatementsNode(0...22)(
-    [LambdaNode(0...11)(
-       [:a],
-       (0...2),
-       (8...9),
-       (10...11),
-       BlockParametersNode(3...7)(
-         ParametersNode(3...7)(
-           [],
-           [],
-           [],
-           nil,
-           [KeywordParameterNode(3...7)((3...5), IntegerNode(6...7)())],
-           nil,
-           nil
-         ),
-         [],
-         nil,
-         nil
-       ),
-       nil
-     ),
-     LambdaNode(13...22)(
-       [:a],
-       (13...15),
-       (19...20),
-       (21...22),
-       BlockParametersNode(16...18)(
-         ParametersNode(16...18)(
-           [],
-           [],
-           [],
-           nil,
-           [KeywordParameterNode(16...18)((16...18), nil)],
-           nil,
-           nil
-         ),
-         [],
-         nil,
-         nil
-       ),
-       nil
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/whitequark/send_lambda_args_shadow.txt b/test/yarp/snapshots/whitequark/send_lambda_args_shadow.txt
deleted file mode 100644
index cee0016fa79d2c..00000000000000
--- a/test/yarp/snapshots/whitequark/send_lambda_args_shadow.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-ProgramNode(0...19)(
-  [],
-  StatementsNode(0...19)(
-    [LambdaNode(0...19)(
-       [:a, :foo, :bar],
-       (0...2),
-       (16...17),
-       (18...19),
-       BlockParametersNode(2...15)(
-         ParametersNode(3...4)(
-           [RequiredParameterNode(3...4)(:a)],
-           [],
-           [],
-           nil,
-           [],
-           nil,
-           nil
-         ),
-         [BlockLocalVariableNode(6...9)(:foo),
-          BlockLocalVariableNode(11...14)(:bar)],
-         (2...3),
-         (14...15)
-       ),
-       nil
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/whitequark/send_lambda_legacy.txt b/test/yarp/snapshots/whitequark/send_lambda_legacy.txt
deleted file mode 100644
index 57b827cb7edd27..00000000000000
--- a/test/yarp/snapshots/whitequark/send_lambda_legacy.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-ProgramNode(0...5)(
-  [],
-  StatementsNode(0...5)(
-    [LambdaNode(0...5)([], (0...2), (2...3), (4...5), nil, nil)]
-  )
-)
diff --git a/test/yarp/snapshots/whitequark/send_op_asgn_conditional.txt b/test/yarp/snapshots/whitequark/send_op_asgn_conditional.txt
deleted file mode 100644
index 767a6e7b2252cc..00000000000000
--- a/test/yarp/snapshots/whitequark/send_op_asgn_conditional.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-ProgramNode(0...10)(
-  [],
-  StatementsNode(0...10)(
-    [CallAndWriteNode(0...10)(
-       CallNode(0...1)(nil, nil, (0...1), nil, nil, nil, nil, 2, "a"),
-       (1...3),
-       (3...4),
-       nil,
-       nil,
-       nil,
-       1,
-       "b",
-       "b=",
-       (5...8),
-       IntegerNode(9...10)()
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/whitequark/send_plain.txt b/test/yarp/snapshots/whitequark/send_plain.txt
deleted file mode 100644
index 2272355126da7c..00000000000000
--- a/test/yarp/snapshots/whitequark/send_plain.txt
+++ /dev/null
@@ -1,38 +0,0 @@
-ProgramNode(0...29)(
-  [],
-  StatementsNode(0...29)(
-    [CallNode(0...7)(
-       CallNode(0...3)(nil, nil, (0...3), nil, nil, nil, nil, 2, "foo"),
-       (3...4),
-       (4...7),
-       nil,
-       nil,
-       nil,
-       nil,
-       0,
-       "fun"
-     ),
-     CallNode(9...19)(
-       CallNode(9...12)(nil, nil, (9...12), nil, nil, nil, nil, 2, "foo"),
-       (12...14),
-       (14...17),
-       (17...18),
-       nil,
-       (18...19),
-       nil,
-       0,
-       "Fun"
-     ),
-     CallNode(21...29)(
-       CallNode(21...24)(nil, nil, (21...24), nil, nil, nil, nil, 2, "foo"),
-       (24...26),
-       (26...29),
-       nil,
-       nil,
-       nil,
-       nil,
-       0,
-       "fun"
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/whitequark/send_plain_cmd.txt b/test/yarp/snapshots/whitequark/send_plain_cmd.txt
deleted file mode 100644
index 4fc9fcb730700a..00000000000000
--- a/test/yarp/snapshots/whitequark/send_plain_cmd.txt
+++ /dev/null
@@ -1,44 +0,0 @@
-ProgramNode(0...39)(
-  [],
-  StatementsNode(0...39)(
-    [CallNode(0...11)(
-       CallNode(0...3)(nil, nil, (0...3), nil, nil, nil, nil, 2, "foo"),
-       (3...4),
-       (4...7),
-       nil,
-       ArgumentsNode(8...11)(
-         [CallNode(8...11)(nil, nil, (8...11), nil, nil, nil, nil, 2, "bar")]
-       ),
-       nil,
-       nil,
-       0,
-       "fun"
-     ),
-     CallNode(13...25)(
-       CallNode(13...16)(nil, nil, (13...16), nil, nil, nil, nil, 2, "foo"),
-       (16...18),
-       (18...21),
-       nil,
-       ArgumentsNode(22...25)(
-         [CallNode(22...25)(nil, nil, (22...25), nil, nil, nil, nil, 2, "bar")]
-       ),
-       nil,
-       nil,
-       0,
-       "Fun"
-     ),
-     CallNode(27...39)(
-       CallNode(27...30)(nil, nil, (27...30), nil, nil, nil, nil, 2, "foo"),
-       (30...32),
-       (32...35),
-       nil,
-       ArgumentsNode(36...39)(
-         [CallNode(36...39)(nil, nil, (36...39), nil, nil, nil, nil, 2, "bar")]
-       ),
-       nil,
-       nil,
-       0,
-       "fun"
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/whitequark/send_self.txt b/test/yarp/snapshots/whitequark/send_self.txt
deleted file mode 100644
index 6f24c1ba8963ba..00000000000000
--- a/test/yarp/snapshots/whitequark/send_self.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-ProgramNode(0...17)(
-  [],
-  StatementsNode(0...17)(
-    [CallNode(0...3)(nil, nil, (0...3), nil, nil, nil, nil, 2, "fun"),
-     CallNode(5...9)(nil, nil, (5...9), nil, nil, nil, nil, 0, "fun!"),
-     CallNode(11...17)(
-       nil,
-       nil,
-       (11...14),
-       (14...15),
-       ArgumentsNode(15...16)([IntegerNode(15...16)()]),
-       (16...17),
-       nil,
-       0,
-       "fun"
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/whitequark/send_self_block.txt b/test/yarp/snapshots/whitequark/send_self_block.txt
deleted file mode 100644
index 1ae9968e74aefe..00000000000000
--- a/test/yarp/snapshots/whitequark/send_self_block.txt
+++ /dev/null
@@ -1,49 +0,0 @@
-ProgramNode(0...42)(
-  [],
-  StatementsNode(0...42)(
-    [CallNode(0...10)(
-       nil,
-       nil,
-       (0...3),
-       nil,
-       nil,
-       nil,
-       BlockNode(4...10)([], nil, nil, (4...6), (7...10)),
-       0,
-       "fun"
-     ),
-     CallNode(12...19)(
-       nil,
-       nil,
-       (12...15),
-       nil,
-       nil,
-       nil,
-       BlockNode(16...19)([], nil, nil, (16...17), (18...19)),
-       0,
-       "fun"
-     ),
-     CallNode(21...30)(
-       nil,
-       nil,
-       (21...24),
-       (24...25),
-       nil,
-       (25...26),
-       BlockNode(27...30)([], nil, nil, (27...28), (29...30)),
-       0,
-       "fun"
-     ),
-     CallNode(32...42)(
-       nil,
-       nil,
-       (32...35),
-       (35...36),
-       ArgumentsNode(36...37)([IntegerNode(36...37)()]),
-       (37...38),
-       BlockNode(39...42)([], nil, nil, (39...40), (41...42)),
-       0,
-       "fun"
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/whitequark/send_unary_op.txt b/test/yarp/snapshots/whitequark/send_unary_op.txt
deleted file mode 100644
index 6906d49ae0acad..00000000000000
--- a/test/yarp/snapshots/whitequark/send_unary_op.txt
+++ /dev/null
@@ -1,38 +0,0 @@
-ProgramNode(0...16)(
-  [],
-  StatementsNode(0...16)(
-    [CallNode(0...4)(
-       CallNode(1...4)(nil, nil, (1...4), nil, nil, nil, nil, 2, "foo"),
-       nil,
-       (0...1),
-       nil,
-       nil,
-       nil,
-       nil,
-       0,
-       "+@"
-     ),
-     CallNode(6...10)(
-       CallNode(7...10)(nil, nil, (7...10), nil, nil, nil, nil, 2, "foo"),
-       nil,
-       (6...7),
-       nil,
-       nil,
-       nil,
-       nil,
-       0,
-       "-@"
-     ),
-     CallNode(12...16)(
-       CallNode(13...16)(nil, nil, (13...16), nil, nil, nil, nil, 2, "foo"),
-       nil,
-       (12...13),
-       nil,
-       nil,
-       nil,
-       nil,
-       0,
-       "~"
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/whitequark/slash_newline_in_heredocs.txt b/test/yarp/snapshots/whitequark/slash_newline_in_heredocs.txt
deleted file mode 100644
index 7485f4c8bdba39..00000000000000
--- a/test/yarp/snapshots/whitequark/slash_newline_in_heredocs.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-ProgramNode(0...33)(
-  [],
-  StatementsNode(0...33)(
-    [InterpolatedStringNode(0...4)(
-       (0...4),
-       [StringNode(5...25)(nil, (5...25), nil, "    1     2\n" + "    3\n")],
-       (25...27)
-     ),
-     InterpolatedStringNode(29...33)(
-       (29...33),
-       [StringNode(34...54)(nil, (34...54), nil, "1 2\n" + "3\n")],
-       (54...56)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/whitequark/space_args_arg.txt b/test/yarp/snapshots/whitequark/space_args_arg.txt
deleted file mode 100644
index d1dfcc4f6559de..00000000000000
--- a/test/yarp/snapshots/whitequark/space_args_arg.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-ProgramNode(0...7)(
-  [],
-  StatementsNode(0...7)(
-    [CallNode(0...7)(
-       nil,
-       nil,
-       (0...3),
-       nil,
-       ArgumentsNode(4...7)(
-         [ParenthesesNode(4...7)(
-            StatementsNode(5...6)([IntegerNode(5...6)()]),
-            (4...5),
-            (6...7)
-          )]
-       ),
-       nil,
-       nil,
-       0,
-       "fun"
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/whitequark/space_args_arg_block.txt b/test/yarp/snapshots/whitequark/space_args_arg_block.txt
deleted file mode 100644
index d17aae90cd237b..00000000000000
--- a/test/yarp/snapshots/whitequark/space_args_arg_block.txt
+++ /dev/null
@@ -1,56 +0,0 @@
-ProgramNode(0...43)(
-  [],
-  StatementsNode(0...43)(
-    [CallNode(0...14)(
-       CallNode(0...3)(nil, nil, (0...3), nil, nil, nil, nil, 2, "foo"),
-       (3...4),
-       (4...7),
-       nil,
-       ArgumentsNode(8...11)(
-         [ParenthesesNode(8...11)(
-            StatementsNode(9...10)([IntegerNode(9...10)()]),
-            (8...9),
-            (10...11)
-          )]
-       ),
-       nil,
-       BlockNode(12...14)([], nil, nil, (12...13), (13...14)),
-       0,
-       "fun"
-     ),
-     CallNode(16...31)(
-       CallNode(16...19)(nil, nil, (16...19), nil, nil, nil, nil, 2, "foo"),
-       (19...21),
-       (21...24),
-       nil,
-       ArgumentsNode(25...28)(
-         [ParenthesesNode(25...28)(
-            StatementsNode(26...27)([IntegerNode(26...27)()]),
-            (25...26),
-            (27...28)
-          )]
-       ),
-       nil,
-       BlockNode(29...31)([], nil, nil, (29...30), (30...31)),
-       0,
-       "fun"
-     ),
-     CallNode(33...43)(
-       nil,
-       nil,
-       (33...36),
-       nil,
-       ArgumentsNode(37...40)(
-         [ParenthesesNode(37...40)(
-            StatementsNode(38...39)([IntegerNode(38...39)()]),
-            (37...38),
-            (39...40)
-          )]
-       ),
-       nil,
-       BlockNode(41...43)([], nil, nil, (41...42), (42...43)),
-       0,
-       "fun"
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/whitequark/space_args_arg_call.txt b/test/yarp/snapshots/whitequark/space_args_arg_call.txt
deleted file mode 100644
index 01bc1dbde372a5..00000000000000
--- a/test/yarp/snapshots/whitequark/space_args_arg_call.txt
+++ /dev/null
@@ -1,32 +0,0 @@
-ProgramNode(0...12)(
-  [],
-  StatementsNode(0...12)(
-    [CallNode(0...12)(
-       nil,
-       nil,
-       (0...3),
-       nil,
-       ArgumentsNode(4...12)(
-         [CallNode(4...12)(
-            ParenthesesNode(4...7)(
-              StatementsNode(5...6)([IntegerNode(5...6)()]),
-              (4...5),
-              (6...7)
-            ),
-            (7...8),
-            (8...12),
-            nil,
-            nil,
-            nil,
-            nil,
-            0,
-            "to_i"
-          )]
-       ),
-       nil,
-       nil,
-       0,
-       "fun"
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/whitequark/space_args_arg_newline.txt b/test/yarp/snapshots/whitequark/space_args_arg_newline.txt
deleted file mode 100644
index 36e321ad7c5605..00000000000000
--- a/test/yarp/snapshots/whitequark/space_args_arg_newline.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-ProgramNode(0...8)(
-  [],
-  StatementsNode(0...8)(
-    [CallNode(0...8)(
-       nil,
-       nil,
-       (0...3),
-       nil,
-       ArgumentsNode(4...8)(
-         [ParenthesesNode(4...8)(
-            StatementsNode(5...6)([IntegerNode(5...6)()]),
-            (4...5),
-            (7...8)
-          )]
-       ),
-       nil,
-       nil,
-       0,
-       "fun"
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/whitequark/space_args_block.txt b/test/yarp/snapshots/whitequark/space_args_block.txt
deleted file mode 100644
index 7895ad26064060..00000000000000
--- a/test/yarp/snapshots/whitequark/space_args_block.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-ProgramNode(0...9)(
-  [],
-  StatementsNode(0...9)(
-    [CallNode(0...9)(
-       nil,
-       nil,
-       (0...3),
-       nil,
-       ArgumentsNode(4...6)([ParenthesesNode(4...6)(nil, (4...5), (5...6))]),
-       nil,
-       BlockNode(7...9)([], nil, nil, (7...8), (8...9)),
-       0,
-       "fun"
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/whitequark/space_args_cmd.txt b/test/yarp/snapshots/whitequark/space_args_cmd.txt
deleted file mode 100644
index 84493c09a946dd..00000000000000
--- a/test/yarp/snapshots/whitequark/space_args_cmd.txt
+++ /dev/null
@@ -1,46 +0,0 @@
-ProgramNode(0...11)(
-  [],
-  StatementsNode(0...11)(
-    [CallNode(0...11)(
-       nil,
-       nil,
-       (0...3),
-       nil,
-       ArgumentsNode(4...11)(
-         [ParenthesesNode(4...11)(
-            StatementsNode(5...10)(
-              [CallNode(5...10)(
-                 nil,
-                 nil,
-                 (5...6),
-                 nil,
-                 ArgumentsNode(7...10)(
-                   [CallNode(7...10)(
-                      nil,
-                      nil,
-                      (7...10),
-                      nil,
-                      nil,
-                      nil,
-                      nil,
-                      2,
-                      "bar"
-                    )]
-                 ),
-                 nil,
-                 nil,
-                 0,
-                 "f"
-               )]
-            ),
-            (4...5),
-            (10...11)
-          )]
-       ),
-       nil,
-       nil,
-       0,
-       "fun"
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/whitequark/string___FILE__.txt b/test/yarp/snapshots/whitequark/string___FILE__.txt
deleted file mode 100644
index 83e601222d7658..00000000000000
--- a/test/yarp/snapshots/whitequark/string___FILE__.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-ProgramNode(0...8)(
-  [],
-  StatementsNode(0...8)(
-    [SourceFileNode(0...8)("whitequark/string___FILE__.txt")]
-  )
-)
diff --git a/test/yarp/snapshots/whitequark/string_concat.txt b/test/yarp/snapshots/whitequark/string_concat.txt
deleted file mode 100644
index a51362805e4997..00000000000000
--- a/test/yarp/snapshots/whitequark/string_concat.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-ProgramNode(0...14)(
-  [],
-  StatementsNode(0...14)(
-    [StringConcatNode(0...14)(
-       InterpolatedStringNode(0...8)(
-         (0...1),
-         [StringNode(1...4)(nil, (1...4), nil, "foo"),
-          EmbeddedVariableNode(4...7)(
-            (4...5),
-            InstanceVariableReadNode(5...7)(:@a)
-          )],
-         (7...8)
-       ),
-       StringNode(9...14)((9...10), (10...13), (13...14), "bar")
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/whitequark/string_dvar.txt b/test/yarp/snapshots/whitequark/string_dvar.txt
deleted file mode 100644
index 66cd00b5cb34e7..00000000000000
--- a/test/yarp/snapshots/whitequark/string_dvar.txt
+++ /dev/null
@@ -1,23 +0,0 @@
-ProgramNode(0...14)(
-  [],
-  StatementsNode(0...14)(
-    [InterpolatedStringNode(0...14)(
-       (0...1),
-       [EmbeddedVariableNode(1...4)(
-          (1...2),
-          InstanceVariableReadNode(2...4)(:@a)
-        ),
-        StringNode(4...5)(nil, (4...5), nil, " "),
-        EmbeddedVariableNode(5...9)(
-          (5...6),
-          ClassVariableReadNode(6...9)(:@@a)
-        ),
-        StringNode(9...10)(nil, (9...10), nil, " "),
-        EmbeddedVariableNode(10...13)(
-          (10...11),
-          GlobalVariableReadNode(11...13)(:$a)
-        )],
-       (13...14)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/whitequark/string_interp.txt b/test/yarp/snapshots/whitequark/string_interp.txt
deleted file mode 100644
index cd41265c99b133..00000000000000
--- a/test/yarp/snapshots/whitequark/string_interp.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-ProgramNode(0...14)(
-  [],
-  StatementsNode(0...14)(
-    [InterpolatedStringNode(0...14)(
-       (0...1),
-       [StringNode(1...4)(nil, (1...4), nil, "foo"),
-        EmbeddedStatementsNode(4...10)(
-          (4...6),
-          StatementsNode(6...9)(
-            [CallNode(6...9)(nil, nil, (6...9), nil, nil, nil, nil, 2, "bar")]
-          ),
-          (9...10)
-        ),
-        StringNode(10...13)(nil, (10...13), nil, "baz")],
-       (13...14)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/whitequark/string_plain.txt b/test/yarp/snapshots/whitequark/string_plain.txt
deleted file mode 100644
index fe0822a5687d19..00000000000000
--- a/test/yarp/snapshots/whitequark/string_plain.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-ProgramNode(0...20)(
-  [],
-  StatementsNode(0...20)(
-    [StringNode(0...10)((0...3), (3...9), (9...10), "foobar"),
-     StringNode(12...20)((12...13), (13...19), (19...20), "foobar")]
-  )
-)
diff --git a/test/yarp/snapshots/whitequark/super.txt b/test/yarp/snapshots/whitequark/super.txt
deleted file mode 100644
index 65eb72d5f5ba1e..00000000000000
--- a/test/yarp/snapshots/whitequark/super.txt
+++ /dev/null
@@ -1,24 +0,0 @@
-ProgramNode(0...30)(
-  [],
-  StatementsNode(0...30)(
-    [SuperNode(0...9)(
-       (0...5),
-       nil,
-       ArgumentsNode(6...9)(
-         [CallNode(6...9)(nil, nil, (6...9), nil, nil, nil, nil, 2, "foo")]
-       ),
-       nil,
-       nil
-     ),
-     SuperNode(11...18)((11...16), (16...17), nil, (17...18), nil),
-     SuperNode(20...30)(
-       (20...25),
-       (25...26),
-       ArgumentsNode(26...29)(
-         [CallNode(26...29)(nil, nil, (26...29), nil, nil, nil, nil, 2, "foo")]
-       ),
-       (29...30),
-       nil
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/whitequark/super_block.txt b/test/yarp/snapshots/whitequark/super_block.txt
deleted file mode 100644
index a26dad1b37b4f7..00000000000000
--- a/test/yarp/snapshots/whitequark/super_block.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-ProgramNode(0...35)(
-  [],
-  StatementsNode(0...35)(
-    [ForwardingSuperNode(0...12)(
-       BlockNode(6...12)([], nil, nil, (6...8), (9...12))
-     ),
-     SuperNode(14...35)(
-       (14...19),
-       nil,
-       ArgumentsNode(20...28)(
-         [CallNode(20...23)(nil, nil, (20...23), nil, nil, nil, nil, 2, "foo"),
-          CallNode(25...28)(nil, nil, (25...28), nil, nil, nil, nil, 2, "bar")]
-       ),
-       nil,
-       BlockNode(29...35)([], nil, nil, (29...31), (32...35))
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/whitequark/symbol_interp.txt b/test/yarp/snapshots/whitequark/symbol_interp.txt
deleted file mode 100644
index 5fd0375ae6a122..00000000000000
--- a/test/yarp/snapshots/whitequark/symbol_interp.txt
+++ /dev/null
@@ -1,28 +0,0 @@
-ProgramNode(0...15)(
-  [],
-  StatementsNode(0...15)(
-    [InterpolatedSymbolNode(0...15)(
-       (0...2),
-       [StringNode(2...5)(nil, (2...5), nil, "foo"),
-        EmbeddedStatementsNode(5...11)(
-          (5...7),
-          StatementsNode(7...10)(
-            [CallNode(7...10)(
-               nil,
-               nil,
-               (7...10),
-               nil,
-               nil,
-               nil,
-               nil,
-               2,
-               "bar"
-             )]
-          ),
-          (10...11)
-        ),
-        StringNode(11...14)(nil, (11...14), nil, "baz")],
-       (14...15)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/whitequark/symbol_plain.txt b/test/yarp/snapshots/whitequark/symbol_plain.txt
deleted file mode 100644
index 7cbac4e19de545..00000000000000
--- a/test/yarp/snapshots/whitequark/symbol_plain.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-ProgramNode(0...12)(
-  [],
-  StatementsNode(0...12)(
-    [SymbolNode(0...6)((0...2), (2...5), (5...6), "foo"),
-     SymbolNode(8...12)((8...9), (9...12), nil, "foo")]
-  )
-)
diff --git a/test/yarp/snapshots/whitequark/ternary.txt b/test/yarp/snapshots/whitequark/ternary.txt
deleted file mode 100644
index c975e93c7eff00..00000000000000
--- a/test/yarp/snapshots/whitequark/ternary.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-ProgramNode(0...11)(
-  [],
-  StatementsNode(0...11)(
-    [IfNode(0...11)(
-       nil,
-       CallNode(0...3)(nil, nil, (0...3), nil, nil, nil, nil, 2, "foo"),
-       StatementsNode(6...7)([IntegerNode(6...7)()]),
-       ElseNode(8...11)(
-         (8...9),
-         StatementsNode(10...11)([IntegerNode(10...11)()]),
-         nil
-       ),
-       nil
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/whitequark/ternary_ambiguous_symbol.txt b/test/yarp/snapshots/whitequark/ternary_ambiguous_symbol.txt
deleted file mode 100644
index e7e814c053ac41..00000000000000
--- a/test/yarp/snapshots/whitequark/ternary_ambiguous_symbol.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-ProgramNode(0...13)(
-  [:t],
-  StatementsNode(0...13)(
-    [LocalVariableWriteNode(0...3)(
-       :t,
-       0,
-       (0...1),
-       IntegerNode(2...3)(),
-       (1...2)
-     ),
-     IfNode(4...13)(
-       nil,
-       ParenthesesNode(4...9)(
-         StatementsNode(5...8)(
-           [CallNode(5...8)(nil, nil, (5...8), nil, nil, nil, nil, 2, "foo")]
-         ),
-         (4...5),
-         (8...9)
-       ),
-       StatementsNode(10...11)([LocalVariableReadNode(10...11)(:t, 0)]),
-       ElseNode(11...13)(
-         (11...12),
-         StatementsNode(12...13)([ConstantReadNode(12...13)(:T)]),
-         nil
-       ),
-       nil
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/whitequark/trailing_forward_arg.txt b/test/yarp/snapshots/whitequark/trailing_forward_arg.txt
deleted file mode 100644
index 61f29acca5a1d3..00000000000000
--- a/test/yarp/snapshots/whitequark/trailing_forward_arg.txt
+++ /dev/null
@@ -1,43 +0,0 @@
-ProgramNode(0...40)(
-  [],
-  StatementsNode(0...40)(
-    [DefNode(0...40)(
-       (4...7),
-       nil,
-       ParametersNode(8...17)(
-         [RequiredParameterNode(8...9)(:a),
-          RequiredParameterNode(11...12)(:b)],
-         [],
-         [],
-         nil,
-         [],
-         ForwardingParameterNode(14...17)(),
-         nil
-       ),
-       StatementsNode(20...35)(
-         [CallNode(20...35)(
-            nil,
-            nil,
-            (20...23),
-            (23...24),
-            ArgumentsNode(24...34)(
-              [LocalVariableReadNode(24...25)(:a, 0),
-               IntegerNode(27...29)(),
-               ForwardingArgumentsNode(31...34)()]
-            ),
-            (34...35),
-            nil,
-            0,
-            "bar"
-          )]
-       ),
-       [:a, :b, :"..."],
-       (0...3),
-       nil,
-       (7...8),
-       (17...18),
-       nil,
-       (37...40)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/whitequark/true.txt b/test/yarp/snapshots/whitequark/true.txt
deleted file mode 100644
index 14b0c8cecccd16..00000000000000
--- a/test/yarp/snapshots/whitequark/true.txt
+++ /dev/null
@@ -1 +0,0 @@
-ProgramNode(0...4)([], StatementsNode(0...4)([TrueNode(0...4)()]))
diff --git a/test/yarp/snapshots/whitequark/unary_num_pow_precedence.txt b/test/yarp/snapshots/whitequark/unary_num_pow_precedence.txt
deleted file mode 100644
index 319b29b170f38f..00000000000000
--- a/test/yarp/snapshots/whitequark/unary_num_pow_precedence.txt
+++ /dev/null
@@ -1,58 +0,0 @@
-ProgramNode(0...32)(
-  [],
-  StatementsNode(0...32)(
-    [CallNode(0...10)(
-       FloatNode(0...4)(),
-       nil,
-       (5...7),
-       nil,
-       ArgumentsNode(8...10)([IntegerNode(8...10)()]),
-       nil,
-       nil,
-       0,
-       "**"
-     ),
-     CallNode(12...20)(
-       CallNode(13...20)(
-         IntegerNode(13...14)(),
-         nil,
-         (15...17),
-         nil,
-         ArgumentsNode(18...20)([IntegerNode(18...20)()]),
-         nil,
-         nil,
-         0,
-         "**"
-       ),
-       nil,
-       (12...13),
-       nil,
-       nil,
-       nil,
-       nil,
-       0,
-       "-@"
-     ),
-     CallNode(22...32)(
-       CallNode(23...32)(
-         FloatNode(23...26)(),
-         nil,
-         (27...29),
-         nil,
-         ArgumentsNode(30...32)([IntegerNode(30...32)()]),
-         nil,
-         nil,
-         0,
-         "**"
-       ),
-       nil,
-       (22...23),
-       nil,
-       nil,
-       nil,
-       nil,
-       0,
-       "-@"
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/whitequark/undef.txt b/test/yarp/snapshots/whitequark/undef.txt
deleted file mode 100644
index eb253762b36a10..00000000000000
--- a/test/yarp/snapshots/whitequark/undef.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-ProgramNode(0...27)(
-  [],
-  StatementsNode(0...27)(
-    [UndefNode(0...27)(
-       [SymbolNode(6...9)(nil, (6...9), nil, "foo"),
-        SymbolNode(11...15)((11...12), (12...15), nil, "bar"),
-        InterpolatedSymbolNode(17...27)(
-          (17...19),
-          [StringNode(19...22)(nil, (19...22), nil, "foo"),
-           EmbeddedStatementsNode(22...26)(
-             (22...24),
-             StatementsNode(24...25)([IntegerNode(24...25)()]),
-             (25...26)
-           )],
-          (26...27)
-        )],
-       (0...5)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/whitequark/unless.txt b/test/yarp/snapshots/whitequark/unless.txt
deleted file mode 100644
index 2c0a7aa062545f..00000000000000
--- a/test/yarp/snapshots/whitequark/unless.txt
+++ /dev/null
@@ -1,23 +0,0 @@
-ProgramNode(0...46)(
-  [],
-  StatementsNode(0...46)(
-    [UnlessNode(0...24)(
-       (0...6),
-       CallNode(7...10)(nil, nil, (7...10), nil, nil, nil, nil, 2, "foo"),
-       StatementsNode(16...19)(
-         [CallNode(16...19)(nil, nil, (16...19), nil, nil, nil, nil, 2, "bar")]
-       ),
-       nil,
-       (21...24)
-     ),
-     UnlessNode(26...46)(
-       (26...32),
-       CallNode(33...36)(nil, nil, (33...36), nil, nil, nil, nil, 2, "foo"),
-       StatementsNode(38...41)(
-         [CallNode(38...41)(nil, nil, (38...41), nil, nil, nil, nil, 2, "bar")]
-       ),
-       nil,
-       (43...46)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/whitequark/unless_else.txt b/test/yarp/snapshots/whitequark/unless_else.txt
deleted file mode 100644
index d08e1294e1f60a..00000000000000
--- a/test/yarp/snapshots/whitequark/unless_else.txt
+++ /dev/null
@@ -1,55 +0,0 @@
-ProgramNode(0...66)(
-  [],
-  StatementsNode(0...66)(
-    [UnlessNode(0...34)(
-       (0...6),
-       CallNode(7...10)(nil, nil, (7...10), nil, nil, nil, nil, 2, "foo"),
-       StatementsNode(16...19)(
-         [CallNode(16...19)(nil, nil, (16...19), nil, nil, nil, nil, 2, "bar")]
-       ),
-       ElseNode(21...34)(
-         (21...25),
-         StatementsNode(26...29)(
-           [CallNode(26...29)(
-              nil,
-              nil,
-              (26...29),
-              nil,
-              nil,
-              nil,
-              nil,
-              2,
-              "baz"
-            )]
-         ),
-         (31...34)
-       ),
-       (31...34)
-     ),
-     UnlessNode(36...66)(
-       (36...42),
-       CallNode(43...46)(nil, nil, (43...46), nil, nil, nil, nil, 2, "foo"),
-       StatementsNode(48...51)(
-         [CallNode(48...51)(nil, nil, (48...51), nil, nil, nil, nil, 2, "bar")]
-       ),
-       ElseNode(53...66)(
-         (53...57),
-         StatementsNode(58...61)(
-           [CallNode(58...61)(
-              nil,
-              nil,
-              (58...61),
-              nil,
-              nil,
-              nil,
-              nil,
-              2,
-              "baz"
-            )]
-         ),
-         (63...66)
-       ),
-       (63...66)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/whitequark/unless_mod.txt b/test/yarp/snapshots/whitequark/unless_mod.txt
deleted file mode 100644
index 8f2306aa6cd9ba..00000000000000
--- a/test/yarp/snapshots/whitequark/unless_mod.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-ProgramNode(0...14)(
-  [],
-  StatementsNode(0...14)(
-    [UnlessNode(0...14)(
-       (4...10),
-       CallNode(11...14)(nil, nil, (11...14), nil, nil, nil, nil, 2, "foo"),
-       StatementsNode(0...3)(
-         [CallNode(0...3)(nil, nil, (0...3), nil, nil, nil, nil, 2, "bar")]
-       ),
-       nil,
-       nil
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/whitequark/until.txt b/test/yarp/snapshots/whitequark/until.txt
deleted file mode 100644
index 5a40a615bd68ef..00000000000000
--- a/test/yarp/snapshots/whitequark/until.txt
+++ /dev/null
@@ -1,43 +0,0 @@
-ProgramNode(0...42)(
-  [],
-  StatementsNode(0...42)(
-    [UntilNode(0...21)(
-       (0...5),
-       (18...21),
-       CallNode(6...9)(nil, nil, (6...9), nil, nil, nil, nil, 2, "foo"),
-       StatementsNode(13...17)(
-         [CallNode(13...17)(
-            nil,
-            nil,
-            (13...17),
-            nil,
-            nil,
-            nil,
-            nil,
-            2,
-            "meth"
-          )]
-       ),
-       0
-     ),
-     UntilNode(23...42)(
-       (23...28),
-       (39...42),
-       CallNode(29...32)(nil, nil, (29...32), nil, nil, nil, nil, 2, "foo"),
-       StatementsNode(34...38)(
-         [CallNode(34...38)(
-            nil,
-            nil,
-            (34...38),
-            nil,
-            nil,
-            nil,
-            nil,
-            2,
-            "meth"
-          )]
-       ),
-       0
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/whitequark/until_mod.txt b/test/yarp/snapshots/whitequark/until_mod.txt
deleted file mode 100644
index ab5acaf4b37eb4..00000000000000
--- a/test/yarp/snapshots/whitequark/until_mod.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-ProgramNode(0...14)(
-  [],
-  StatementsNode(0...14)(
-    [UntilNode(0...14)(
-       (5...10),
-       nil,
-       CallNode(11...14)(nil, nil, (11...14), nil, nil, nil, nil, 2, "foo"),
-       StatementsNode(0...4)(
-         [CallNode(0...4)(nil, nil, (0...4), nil, nil, nil, nil, 2, "meth")]
-       ),
-       0
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/whitequark/until_post.txt b/test/yarp/snapshots/whitequark/until_post.txt
deleted file mode 100644
index 87a0fa3a12e0f0..00000000000000
--- a/test/yarp/snapshots/whitequark/until_post.txt
+++ /dev/null
@@ -1,33 +0,0 @@
-ProgramNode(0...24)(
-  [],
-  StatementsNode(0...24)(
-    [UntilNode(0...24)(
-       (15...20),
-       nil,
-       CallNode(21...24)(nil, nil, (21...24), nil, nil, nil, nil, 2, "foo"),
-       StatementsNode(0...14)(
-         [BeginNode(0...14)(
-            (0...5),
-            StatementsNode(6...10)(
-              [CallNode(6...10)(
-                 nil,
-                 nil,
-                 (6...10),
-                 nil,
-                 nil,
-                 nil,
-                 nil,
-                 2,
-                 "meth"
-               )]
-            ),
-            nil,
-            nil,
-            nil,
-            (11...14)
-          )]
-       ),
-       1
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/whitequark/var_and_asgn.txt b/test/yarp/snapshots/whitequark/var_and_asgn.txt
deleted file mode 100644
index a613761d87e163..00000000000000
--- a/test/yarp/snapshots/whitequark/var_and_asgn.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-ProgramNode(0...7)(
-  [:a],
-  StatementsNode(0...7)(
-    [LocalVariableAndWriteNode(0...7)(
-       (0...1),
-       (2...5),
-       IntegerNode(6...7)(),
-       :a,
-       0
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/whitequark/var_op_asgn.txt b/test/yarp/snapshots/whitequark/var_op_asgn.txt
deleted file mode 100644
index 0927e8b8f3aebc..00000000000000
--- a/test/yarp/snapshots/whitequark/var_op_asgn.txt
+++ /dev/null
@@ -1,48 +0,0 @@
-ProgramNode(0...53)(
-  [:a],
-  StatementsNode(0...53)(
-    [ClassVariableOperatorWriteNode(0...11)(
-       :@@var,
-       (0...5),
-       (6...8),
-       IntegerNode(9...11)(),
-       :|
-     ),
-     InstanceVariableOperatorWriteNode(13...20)(
-       :@a,
-       (13...15),
-       (16...18),
-       IntegerNode(19...20)(),
-       :|
-     ),
-     LocalVariableOperatorWriteNode(22...28)(
-       (22...23),
-       (24...26),
-       IntegerNode(27...28)(),
-       :a,
-       :+,
-       0
-     ),
-     DefNode(30...53)(
-       (34...35),
-       nil,
-       nil,
-       StatementsNode(37...48)(
-         [ClassVariableOperatorWriteNode(37...48)(
-            :@@var,
-            (37...42),
-            (43...45),
-            IntegerNode(46...48)(),
-            :|
-          )]
-       ),
-       [],
-       (30...33),
-       nil,
-       nil,
-       nil,
-       nil,
-       (50...53)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/whitequark/var_op_asgn_cmd.txt b/test/yarp/snapshots/whitequark/var_op_asgn_cmd.txt
deleted file mode 100644
index 21c1fb6e1056a6..00000000000000
--- a/test/yarp/snapshots/whitequark/var_op_asgn_cmd.txt
+++ /dev/null
@@ -1,23 +0,0 @@
-ProgramNode(0...12)(
-  [:foo],
-  StatementsNode(0...12)(
-    [LocalVariableOperatorWriteNode(0...12)(
-       (0...3),
-       (4...6),
-       CallNode(7...12)(
-         nil,
-         nil,
-         (7...8),
-         nil,
-         ArgumentsNode(9...12)([LocalVariableReadNode(9...12)(:foo, 0)]),
-         nil,
-         nil,
-         0,
-         "m"
-       ),
-       :foo,
-       :+,
-       0
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/whitequark/var_or_asgn.txt b/test/yarp/snapshots/whitequark/var_or_asgn.txt
deleted file mode 100644
index 3fb56b7f4a88d8..00000000000000
--- a/test/yarp/snapshots/whitequark/var_or_asgn.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-ProgramNode(0...7)(
-  [:a],
-  StatementsNode(0...7)(
-    [LocalVariableOrWriteNode(0...7)(
-       (0...1),
-       (2...5),
-       IntegerNode(6...7)(),
-       :a,
-       0
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/whitequark/when_multi.txt b/test/yarp/snapshots/whitequark/when_multi.txt
deleted file mode 100644
index 7a5c41f7479863..00000000000000
--- a/test/yarp/snapshots/whitequark/when_multi.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-ProgramNode(0...37)(
-  [],
-  StatementsNode(0...37)(
-    [CaseNode(0...37)(
-       CallNode(5...8)(nil, nil, (5...8), nil, nil, nil, nil, 2, "foo"),
-       [WhenNode(10...32)(
-          (10...14),
-          [StringNode(15...20)((15...16), (16...19), (19...20), "bar"),
-           StringNode(22...27)((22...23), (23...26), (26...27), "baz")],
-          StatementsNode(29...32)(
-            [CallNode(29...32)(
-               nil,
-               nil,
-               (29...32),
-               nil,
-               nil,
-               nil,
-               nil,
-               2,
-               "bar"
-             )]
-          )
-        )],
-       nil,
-       (0...4),
-       (34...37)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/whitequark/when_splat.txt b/test/yarp/snapshots/whitequark/when_splat.txt
deleted file mode 100644
index 88d2115eb44de4..00000000000000
--- a/test/yarp/snapshots/whitequark/when_splat.txt
+++ /dev/null
@@ -1,60 +0,0 @@
-ProgramNode(0...43)(
-  [],
-  StatementsNode(0...43)(
-    [CaseNode(0...43)(
-       CallNode(5...8)(nil, nil, (5...8), nil, nil, nil, nil, 2, "foo"),
-       [WhenNode(10...27)(
-          (10...14),
-          [IntegerNode(15...16)(),
-           SplatNode(18...22)(
-             (18...19),
-             CallNode(19...22)(
-               nil,
-               nil,
-               (19...22),
-               nil,
-               nil,
-               nil,
-               nil,
-               2,
-               "baz"
-             )
-           )],
-          StatementsNode(24...27)(
-            [CallNode(24...27)(
-               nil,
-               nil,
-               (24...27),
-               nil,
-               nil,
-               nil,
-               nil,
-               2,
-               "bar"
-             )]
-          )
-        ),
-        WhenNode(29...38)(
-          (29...33),
-          [SplatNode(34...38)(
-             (34...35),
-             CallNode(35...38)(
-               nil,
-               nil,
-               (35...38),
-               nil,
-               nil,
-               nil,
-               nil,
-               2,
-               "foo"
-             )
-           )],
-          nil
-        )],
-       nil,
-       (0...4),
-       (40...43)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/whitequark/when_then.txt b/test/yarp/snapshots/whitequark/when_then.txt
deleted file mode 100644
index 8c08e6d8e50e38..00000000000000
--- a/test/yarp/snapshots/whitequark/when_then.txt
+++ /dev/null
@@ -1,28 +0,0 @@
-ProgramNode(0...34)(
-  [],
-  StatementsNode(0...34)(
-    [CaseNode(0...34)(
-       CallNode(5...8)(nil, nil, (5...8), nil, nil, nil, nil, 2, "foo"),
-       [WhenNode(10...29)(
-          (10...14),
-          [StringNode(15...20)((15...16), (16...19), (19...20), "bar")],
-          StatementsNode(26...29)(
-            [CallNode(26...29)(
-               nil,
-               nil,
-               (26...29),
-               nil,
-               nil,
-               nil,
-               nil,
-               2,
-               "bar"
-             )]
-          )
-        )],
-       nil,
-       (0...4),
-       (31...34)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/whitequark/while.txt b/test/yarp/snapshots/whitequark/while.txt
deleted file mode 100644
index 7529b6e1bc1ec6..00000000000000
--- a/test/yarp/snapshots/whitequark/while.txt
+++ /dev/null
@@ -1,43 +0,0 @@
-ProgramNode(0...42)(
-  [],
-  StatementsNode(0...42)(
-    [WhileNode(0...21)(
-       (0...5),
-       (18...21),
-       CallNode(6...9)(nil, nil, (6...9), nil, nil, nil, nil, 2, "foo"),
-       StatementsNode(13...17)(
-         [CallNode(13...17)(
-            nil,
-            nil,
-            (13...17),
-            nil,
-            nil,
-            nil,
-            nil,
-            2,
-            "meth"
-          )]
-       ),
-       0
-     ),
-     WhileNode(23...42)(
-       (23...28),
-       (39...42),
-       CallNode(29...32)(nil, nil, (29...32), nil, nil, nil, nil, 2, "foo"),
-       StatementsNode(34...38)(
-         [CallNode(34...38)(
-            nil,
-            nil,
-            (34...38),
-            nil,
-            nil,
-            nil,
-            nil,
-            2,
-            "meth"
-          )]
-       ),
-       0
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/whitequark/while_mod.txt b/test/yarp/snapshots/whitequark/while_mod.txt
deleted file mode 100644
index 2f0ade7006b5fc..00000000000000
--- a/test/yarp/snapshots/whitequark/while_mod.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-ProgramNode(0...14)(
-  [],
-  StatementsNode(0...14)(
-    [WhileNode(0...14)(
-       (5...10),
-       nil,
-       CallNode(11...14)(nil, nil, (11...14), nil, nil, nil, nil, 2, "foo"),
-       StatementsNode(0...4)(
-         [CallNode(0...4)(nil, nil, (0...4), nil, nil, nil, nil, 2, "meth")]
-       ),
-       0
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/whitequark/while_post.txt b/test/yarp/snapshots/whitequark/while_post.txt
deleted file mode 100644
index 1b2169107a160f..00000000000000
--- a/test/yarp/snapshots/whitequark/while_post.txt
+++ /dev/null
@@ -1,33 +0,0 @@
-ProgramNode(0...24)(
-  [],
-  StatementsNode(0...24)(
-    [WhileNode(0...24)(
-       (15...20),
-       nil,
-       CallNode(21...24)(nil, nil, (21...24), nil, nil, nil, nil, 2, "foo"),
-       StatementsNode(0...14)(
-         [BeginNode(0...14)(
-            (0...5),
-            StatementsNode(6...10)(
-              [CallNode(6...10)(
-                 nil,
-                 nil,
-                 (6...10),
-                 nil,
-                 nil,
-                 nil,
-                 nil,
-                 2,
-                 "meth"
-               )]
-            ),
-            nil,
-            nil,
-            nil,
-            (11...14)
-          )]
-       ),
-       1
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/whitequark/xstring_interp.txt b/test/yarp/snapshots/whitequark/xstring_interp.txt
deleted file mode 100644
index 39d4a12c9830d0..00000000000000
--- a/test/yarp/snapshots/whitequark/xstring_interp.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-ProgramNode(0...14)(
-  [],
-  StatementsNode(0...14)(
-    [InterpolatedXStringNode(0...14)(
-       (0...1),
-       [StringNode(1...4)(nil, (1...4), nil, "foo"),
-        EmbeddedStatementsNode(4...10)(
-          (4...6),
-          StatementsNode(6...9)(
-            [CallNode(6...9)(nil, nil, (6...9), nil, nil, nil, nil, 2, "bar")]
-          ),
-          (9...10)
-        ),
-        StringNode(10...13)(nil, (10...13), nil, "baz")],
-       (13...14)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/whitequark/xstring_plain.txt b/test/yarp/snapshots/whitequark/xstring_plain.txt
deleted file mode 100644
index 61515d89d97165..00000000000000
--- a/test/yarp/snapshots/whitequark/xstring_plain.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-ProgramNode(0...8)(
-  [],
-  StatementsNode(0...8)(
-    [XStringNode(0...8)((0...1), (1...7), (7...8), "foobar")]
-  )
-)
diff --git a/test/yarp/snapshots/whitequark/yield.txt b/test/yarp/snapshots/whitequark/yield.txt
deleted file mode 100644
index ae0c2140a3d6c1..00000000000000
--- a/test/yarp/snapshots/whitequark/yield.txt
+++ /dev/null
@@ -1,23 +0,0 @@
-ProgramNode(0...37)(
-  [],
-  StatementsNode(0...37)(
-    [YieldNode(0...5)((0...5), nil, nil, nil),
-     YieldNode(7...16)(
-       (7...12),
-       nil,
-       ArgumentsNode(13...16)(
-         [CallNode(13...16)(nil, nil, (13...16), nil, nil, nil, nil, 2, "foo")]
-       ),
-       nil
-     ),
-     YieldNode(18...25)((18...23), (23...24), nil, (24...25)),
-     YieldNode(27...37)(
-       (27...32),
-       (32...33),
-       ArgumentsNode(33...36)(
-         [CallNode(33...36)(nil, nil, (33...36), nil, nil, nil, nil, 2, "foo")]
-       ),
-       (36...37)
-     )]
-  )
-)
diff --git a/test/yarp/snapshots/whitequark/zsuper.txt b/test/yarp/snapshots/whitequark/zsuper.txt
deleted file mode 100644
index b9f92d0055857f..00000000000000
--- a/test/yarp/snapshots/whitequark/zsuper.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-ProgramNode(0...5)(
-  [],
-  StatementsNode(0...5)([ForwardingSuperNode(0...5)(nil)])
-)
diff --git a/test/yarp/snapshots/xstring.txt b/test/yarp/snapshots/xstring.txt
deleted file mode 100644
index fe7d5de5a0a987..00000000000000
--- a/test/yarp/snapshots/xstring.txt
+++ /dev/null
@@ -1,31 +0,0 @@
-ProgramNode(0...40)(
-  [],
-  StatementsNode(0...40)(
-    [XStringNode(0...7)((0...3), (3...6), (6...7), "foo"),
-     InterpolatedXStringNode(9...25)(
-       (9...10),
-       [StringNode(10...14)(nil, (10...14), nil, "foo "),
-        EmbeddedStatementsNode(14...20)(
-          (14...16),
-          StatementsNode(16...19)(
-            [CallNode(16...19)(
-               nil,
-               nil,
-               (16...19),
-               nil,
-               nil,
-               nil,
-               nil,
-               2,
-               "bar"
-             )]
-          ),
-          (19...20)
-        ),
-        StringNode(20...24)(nil, (20...24), nil, " baz")],
-       (24...25)
-     ),
-     XStringNode(27...33)((27...28), (28...32), (32...33), "foo"),
-     XStringNode(35...40)((35...36), (36...39), (39...40), "foo")]
-  )
-)
diff --git a/test/yarp/snapshots/yield.txt b/test/yarp/snapshots/yield.txt
deleted file mode 100644
index 9dba03e7b74eec..00000000000000
--- a/test/yarp/snapshots/yield.txt
+++ /dev/null
@@ -1,23 +0,0 @@
-ProgramNode(0...40)(
-  [],
-  StatementsNode(0...40)(
-    [YieldNode(0...5)((0...5), nil, nil, nil),
-     YieldNode(7...14)((7...12), (12...13), nil, (13...14)),
-     YieldNode(16...24)(
-       (16...21),
-       (21...22),
-       ArgumentsNode(22...23)([IntegerNode(22...23)()]),
-       (23...24)
-     ),
-     YieldNode(26...40)(
-       (26...31),
-       (31...32),
-       ArgumentsNode(32...39)(
-         [IntegerNode(32...33)(),
-          IntegerNode(35...36)(),
-          IntegerNode(38...39)()]
-       ),
-       (39...40)
-     )]
-  )
-)
diff --git a/test/yarp/test_helper.rb b/test/yarp/test_helper.rb
deleted file mode 100644
index 086b73dd563a6c..00000000000000
--- a/test/yarp/test_helper.rb
+++ /dev/null
@@ -1,91 +0,0 @@
-# frozen_string_literal: true
-
-require "yarp"
-require "ripper"
-require "pp"
-require "test/unit"
-require "tempfile"
-
-puts "Using YARP backend: #{YARP::BACKEND}" if ENV["YARP_FFI_BACKEND"]
-
-# It is useful to have a diff even if the strings to compare are big
-# However, ruby/ruby does not have a version of Test::Unit with access to
-# max_diff_target_string_size
-if defined?(Test::Unit::Assertions::AssertionMessage)
-  Test::Unit::Assertions::AssertionMessage.max_diff_target_string_size = 5000
-end
-
-module YARP
-  class TestCase < ::Test::Unit::TestCase
-    private
-
-    def assert_raises(*args, &block)
-      raise "Use assert_raise instead"
-    end
-
-    def assert_equal_nodes(expected, actual, compare_location: true, parent: nil)
-      assert_equal expected.class, actual.class
-
-      case expected
-      when Array
-        assert_equal(
-          expected.size,
-          actual.size,
-          -> { "Arrays were different sizes. Parent: #{parent.pretty_inspect}" }
-        )
-
-        expected.zip(actual).each do |(expected_element, actual_element)|
-          assert_equal_nodes(
-            expected_element,
-            actual_element,
-            compare_location: compare_location,
-            parent: actual
-          )
-        end
-      when SourceFileNode
-        deconstructed_expected = expected.deconstruct_keys(nil)
-        deconstructed_actual = actual.deconstruct_keys(nil)
-        assert_equal deconstructed_expected.keys, deconstructed_actual.keys
-
-        # Filepaths can be different if test suites were run on different
-        # machines. We accommodate for this by comparing the basenames, and not
-        # the absolute filepaths.
-        assert_equal deconstructed_expected.except(:filepath), deconstructed_actual.except(:filepath)
-        assert_equal File.basename(deconstructed_expected[:filepath]), File.basename(deconstructed_actual[:filepath])
-      when Node
-        deconstructed_expected = expected.deconstruct_keys(nil)
-        deconstructed_actual = actual.deconstruct_keys(nil)
-        assert_equal deconstructed_expected.keys, deconstructed_actual.keys
-
-        deconstructed_expected.each_key do |key|
-          assert_equal_nodes(
-            deconstructed_expected[key],
-            deconstructed_actual[key],
-            compare_location: compare_location,
-            parent: actual
-          )
-        end
-      when Location
-        assert_operator actual.start_offset, :<=, actual.end_offset, -> {
-          "start_offset > end_offset for #{actual.inspect}, parent is #{parent.pretty_inspect}"
-        }
-
-        if compare_location
-          assert_equal(
-            expected.start_offset,
-            actual.start_offset,
-            -> { "Start locations were different. Parent: #{parent.pretty_inspect}" }
-          )
-
-          assert_equal(
-            expected.end_offset,
-            actual.end_offset,
-            -> { "End locations were different. Parent: #{parent.pretty_inspect}" }
-          )
-        end
-      else
-        assert_equal expected, actual
-      end
-    end
-  end
-end
diff --git a/test/yarp/unescape_test.rb b/test/yarp/unescape_test.rb
deleted file mode 100644
index f39bdd0e394ee3..00000000000000
--- a/test/yarp/unescape_test.rb
+++ /dev/null
@@ -1,158 +0,0 @@
-# frozen_string_literal: true
-
-require_relative "test_helper"
-
-return if YARP::BACKEND == :FFI
-
-module YARP
-  class UnescapeNoneTest < TestCase
-    def test_backslash
-      assert_unescape_none("\\")
-    end
-
-    def test_single_quote
-      assert_unescape_none("'")
-    end
-
-    private
-
-    def assert_unescape_none(source)
-      assert_equal(source, Debug.unescape_none(source))
-    end
-  end
-
-  class UnescapeMinimalTest < TestCase
-    def test_backslash
-      assert_unescape_minimal("\\", "\\\\")
-    end
-
-    def test_single_quote
-      assert_unescape_minimal("'", "\\'")
-    end
-
-    def test_single_char
-      assert_unescape_minimal("\\a", "\\a")
-    end
-
-    private
-
-    def assert_unescape_minimal(expected, source)
-      assert_equal(expected, Debug.unescape_minimal(source))
-    end
-  end
-
-  class UnescapeAllTest < TestCase
-    def test_backslash
-      assert_unescape_all("\\", "\\\\")
-    end
-
-    def test_single_quote
-      assert_unescape_all("'", "\\'")
-    end
-
-    def test_single_char
-      assert_unescape_all("\a", "\\a")
-      assert_unescape_all("\b", "\\b")
-      assert_unescape_all("\e", "\\e")
-      assert_unescape_all("\f", "\\f")
-      assert_unescape_all("\n", "\\n")
-      assert_unescape_all("\r", "\\r")
-      assert_unescape_all("\s", "\\s")
-      assert_unescape_all("\t", "\\t")
-      assert_unescape_all("\v", "\\v")
-    end
-
-    def test_octal
-      assert_unescape_all("\a", "\\7")
-      assert_unescape_all("#", "\\43")
-      assert_unescape_all("a", "\\141")
-    end
-
-    def test_hexadecimal
-      assert_unescape_all("\a", "\\x7")
-      assert_unescape_all("#", "\\x23")
-      assert_unescape_all("a", "\\x61")
-    end
-
-    def test_deletes
-      assert_unescape_all("\x7f", "\\c?")
-      assert_unescape_all("\x7f", "\\C-?")
-    end
-
-    def test_unicode_codepoint
-      assert_unescape_all("a", "\\u0061")
-      assert_unescape_all("Ā", "\\u0100", "UTF-8")
-      assert_unescape_all("က", "\\u1000", "UTF-8")
-      assert_unescape_all("တ", "\\u1010", "UTF-8")
-
-      assert_nil(unescape_all("\\uxxxx"))
-    end
-
-    def test_unicode_codepoints
-      assert_unescape_all("a", "\\u{61}")
-      assert_unescape_all("Ā", "\\u{0100}", "UTF-8")
-      assert_unescape_all("က", "\\u{1000}", "UTF-8")
-      assert_unescape_all("တ", "\\u{1010}", "UTF-8")
-      assert_unescape_all("𐀀", "\\u{10000}", "UTF-8")
-      assert_unescape_all("𐀐", "\\u{10010}", "UTF-8")
-      assert_unescape_all("aĀကတ𐀀𐀐", "\\u{ 61\s100\n1000\t1010\r10000\v10010 }", "UTF-8")
-
-      assert_nil(unescape_all("\\u{110000}"))
-      assert_nil(unescape_all("\\u{110000 110001 110002}"))
-    end
-
-    def test_control_characters
-      each_printable do |chr|
-        byte = eval("\"\\c#{chr}\"").bytes.first
-        assert_unescape_all(byte.chr, "\\c#{chr}")
-
-        byte = eval("\"\\C-#{chr}\"").bytes.first
-        assert_unescape_all(byte.chr, "\\C-#{chr}")
-      end
-    end
-
-    def test_meta_characters
-      each_printable do |chr|
-        byte = eval("\"\\M-#{chr}\"").bytes.first
-        assert_unescape_all(byte.chr, "\\M-#{chr}")
-      end
-    end
-
-    def test_meta_control_characters
-      each_printable do |chr|
-        byte = eval("\"\\M-\\c#{chr}\"").bytes.first
-        assert_unescape_all(byte.chr, "\\M-\\c#{chr}")
-
-        byte = eval("\"\\M-\\C-#{chr}\"").bytes.first
-        assert_unescape_all(byte.chr, "\\M-\\C-#{chr}")
-
-        byte = eval("\"\\c\\M-#{chr}\"").bytes.first
-        assert_unescape_all(byte.chr, "\\c\\M-#{chr}")
-      end
-    end
-
-    def test_escaping_normal_characters
-      assert_unescape_all("d", "\\d")
-      assert_unescape_all("g", "\\g")
-    end
-
-    private
-
-    def unescape_all(source)
-      Debug.unescape_all(source)
-    end
-
-    def assert_unescape_all(expected, source, forced_encoding = nil)
-      result = unescape_all(source)
-      result.force_encoding(forced_encoding) if forced_encoding
-      assert_equal(expected, result)
-    end
-
-    def each_printable
-      (1..127).each do |ord|
-        chr = ord.chr
-        yield chr if chr.match?(/[[:print:]]/) && chr != " " && chr != "\\"
-      end
-    end
-  end
-end
diff --git a/test/yarp/version_test.rb b/test/yarp/version_test.rb
deleted file mode 100644
index 6011eb695d7267..00000000000000
--- a/test/yarp/version_test.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-# frozen_string_literal: true
-
-require_relative "test_helper"
-
-module YARP
-  class VersionTest < TestCase
-    def test_version_is_set
-      refute_nil VERSION
-    end
-  end
-end
diff --git a/test/zlib/test_zlib.rb b/test/zlib/test_zlib.rb
index 464141f7d49f55..5a8463ad8e719e 100644
--- a/test/zlib/test_zlib.rb
+++ b/test/zlib/test_zlib.rb
@@ -506,6 +506,7 @@ def test_set_dictionary
     end
 
     def test_multithread_deflate
+      pend 'hangs' if RUBY_ENGINE == 'truffleruby'
       zd = Zlib::Deflate.new
 
       s = "x" * 10000
@@ -522,6 +523,7 @@ def test_multithread_deflate
     end
 
     def test_multithread_inflate
+      pend 'hangs' if RUBY_ENGINE == 'truffleruby'
       zi = Zlib::Inflate.new
 
       s = Zlib.deflate("x" * 10000)
@@ -543,7 +545,7 @@ def test_recursive_deflate
       zd = Zlib::Deflate.new
 
       s = SecureRandom.random_bytes(1024**2)
-      assert_raise(Zlib::InProgressError) do
+      assert_raise(ThreadError) do
         zd.deflate(s) do
           zd.deflate(s)
         end
@@ -561,7 +563,7 @@ def test_recursive_inflate
 
       s = Zlib.deflate(SecureRandom.random_bytes(1024**2))
 
-      assert_raise(Zlib::InProgressError) do
+      assert_raise(ThreadError) do
         zi.inflate(s) do
           zi.inflate(s)
         end
@@ -792,14 +794,15 @@ def test_path
       }
     end
 
-    if defined? File::TMPFILE
+    if defined?(File::TMPFILE) and RUBY_ENGINE != 'truffleruby'
       def test_path_tmpfile
         sio = StringIO.new("".dup, 'w')
         gz = Zlib::GzipWriter.new(sio)
         gz.write "hi"
         gz.close
 
-        File.open(Dir.mktmpdir, File::RDWR | File::TMPFILE) do |io|
+        tmpdir = Dir.mktmpdir("zlib_file_tmpfile")
+        File.open(tmpdir, File::RDWR | File::TMPFILE) do |io|
           io.write sio.string
           io.rewind
 
@@ -823,6 +826,8 @@ def test_path_tmpfile
         omit 'O_TMPFILE not supported (EISDIR)'
       rescue Errno::EOPNOTSUPP
         omit 'O_TMPFILE not supported (EOPNOTSUPP)'
+      ensure
+        Dir.rmdir(tmpdir) if tmpdir
       end
     end
   end
@@ -986,6 +991,25 @@ def test_read
           assert_raise(ArgumentError) { f.read(-1) }
           assert_equal(str, f.read)
         end
+
+        Zlib::GzipReader.open(t.path) do |f|
+          s = "".b
+
+          assert_raise(ArgumentError) { f.read(-1, s) }
+
+          assert_same s, f.read(1, s)
+          assert_equal "\xE3".b, s
+
+          assert_same s, f.read(2, s)
+          assert_equal "\x81\x82".b, s
+
+          assert_same s, f.read(6, s)
+          assert_equal "\u3044\u3046".b, s
+
+          assert_nil f.read(1, s)
+          assert_equal "".b, s
+          assert_predicate f, :eof?
+        end
       }
     end
 
@@ -1000,10 +1024,14 @@ def test_readpartial
 
         Zlib::GzipReader.open(t.path) do |f|
           s = "".dup
-          f.readpartial(3, s)
+          assert_same s, f.readpartial(3, s)
           assert("foo".start_with?(s))
 
           assert_raise(ArgumentError) { f.readpartial(-1) }
+
+          assert_same s, f.readpartial(3, s)
+
+          assert_predicate f, :eof?
         end
       }
     end
@@ -1203,6 +1231,38 @@ def test_double_close
       }
     end
 
+    # Various methods of Zlib::GzipReader failed when to reading files
+    # just a few bytes larger than GZFILE_READ_SIZE.
+    def test_gzfile_read_size_boundary
+      Tempfile.create("test_zlib_gzip_read_size_boundary") {|t|
+        t.close
+        # NO_COMPRESSION helps with recreating the error condition.
+        # The error happens on compressed files too, but it's harder to reproduce.
+        # For example, ~12750 bytes are needed to trigger the error using __FILE__.
+        # We avoid this because the test file will change over time.
+        Zlib::GzipWriter.open(t.path, Zlib::NO_COMPRESSION) do |gz|
+          gz.print("\n" * 2024) # range from 2024 to 2033 triggers the error
+          gz.flush
+        end
+
+        Zlib::GzipReader.open(t.path) do |f|
+          f.readpartial(1024) until f.eof?
+          assert_raise(EOFError) { f.readpartial(1) }
+        end
+
+        Zlib::GzipReader.open(t.path) do |f|
+          f.readline until f.eof?
+          assert_raise(EOFError) { f.readline }
+        end
+
+        Zlib::GzipReader.open(t.path) do |f|
+          b = f.readbyte until f.eof?
+          f.ungetbyte(b)
+          f.readbyte
+          assert_raise(EOFError) { f.readbyte }
+        end
+      }
+    end
   end
 
   class TestZlibGzipWriter < Test::Unit::TestCase
diff --git a/thread.c b/thread.c
index 4073325b9d890f..6eb16beed65acc 100644
--- a/thread.c
+++ b/thread.c
@@ -89,7 +89,6 @@
 #include "internal/time.h"
 #include "internal/warnings.h"
 #include "iseq.h"
-#include "rjit.h"
 #include "ruby/debug.h"
 #include "ruby/io.h"
 #include "ruby/thread.h"
@@ -100,9 +99,7 @@
 #include "vm_debug.h"
 #include "vm_sync.h"
 
-#if USE_RJIT && defined(HAVE_SYS_WAIT_H)
-#include <sys/wait.h>
-#endif
+#include "ccan/list/list.h"
 
 #ifndef USE_NATIVE_THREAD_PRIORITY
 #define USE_NATIVE_THREAD_PRIORITY 0
@@ -111,11 +108,14 @@
 #endif
 
 static VALUE rb_cThreadShield;
+static VALUE cThGroup;
 
 static VALUE sym_immediate;
 static VALUE sym_on_blocking;
 static VALUE sym_never;
 
+static uint32_t thread_default_quantum_ms = 100;
+
 #define THREAD_LOCAL_STORAGE_INITIALISED FL_USER13
 #define THREAD_LOCAL_STORAGE_INITIALISED_P(th) RB_FL_TEST_RAW((th), THREAD_LOCAL_STORAGE_INITIALISED)
 
@@ -146,17 +146,10 @@ static int rb_threadptr_pending_interrupt_empty_p(const rb_thread_t *th);
 static const char *thread_status_name(rb_thread_t *th, int detail);
 static int hrtime_update_expire(rb_hrtime_t *, const rb_hrtime_t);
 NORETURN(static void async_bug_fd(const char *mesg, int errno_arg, int fd));
-static int consume_communication_pipe(int fd);
-static int check_signals_nogvl(rb_thread_t *, int sigwait_fd);
-
-static volatile int system_working = 1;
+MAYBE_UNUSED(static int consume_communication_pipe(int fd));
 
-struct waiting_fd {
-    struct ccan_list_node wfd_node; /* <=> vm.waiting_fds */
-    rb_thread_t *th;
-    int fd;
-    struct rb_io_close_wait_list *busy;
-};
+static rb_atomic_t system_working = 1;
+static rb_internal_thread_specific_key_t specific_key_count;
 
 /********************************************************************************/
 
@@ -180,7 +173,7 @@ static inline void blocking_region_end(rb_thread_t *th, struct rb_blocking_regio
 
 #define THREAD_BLOCKING_END(th) \
   thread_sched_to_running((sched), (th)); \
-  rb_ractor_thread_switch(th->ractor, th); \
+  rb_ractor_thread_switch(th->ractor, th, false); \
 } while(0)
 
 #ifdef __GNUC__
@@ -197,6 +190,10 @@ static inline void blocking_region_end(rb_thread_t *th, struct rb_blocking_regio
     if (blocking_region_begin(th, &__region, (ubf), (ubfarg), fail_if_interrupted) || \
         /* always return true unless fail_if_interrupted */ \
         !only_if_constant(fail_if_interrupted, TRUE)) { \
+        /* Important that this is inlined into the macro, and not part of \
+         * blocking_region_begin - see bug #20493 */ \
+        RB_VM_SAVE_MACHINE_CONTEXT(th); \
+        thread_sched_to_waiting(TH_SCHED(th), th); \
         exec; \
         blocking_region_end(th, &__region); \
     }; \
@@ -210,6 +207,10 @@ static inline void blocking_region_end(rb_thread_t *th, struct rb_blocking_regio
 static inline int
 vm_check_ints_blocking(rb_execution_context_t *ec)
 {
+#ifdef RUBY_ASSERT_CRITICAL_SECTION
+    VM_ASSERT(ruby_assert_critical_section_entered == 0);
+#endif
+
     rb_thread_t *th = rb_ec_thread_ptr(ec);
 
     if (LIKELY(rb_threadptr_pending_interrupt_empty_p(th))) {
@@ -259,12 +260,8 @@ timeout_prepare(rb_hrtime_t **to, rb_hrtime_t *rel, rb_hrtime_t *end,
 }
 
 MAYBE_UNUSED(NOINLINE(static int thread_start_func_2(rb_thread_t *th, VALUE *stack_start)));
-
-static void
-ubf_sigwait(void *ignore)
-{
-    rb_thread_wakeup_timer_thread(0);
-}
+MAYBE_UNUSED(static bool th_has_dedicated_nt(const rb_thread_t *th));
+MAYBE_UNUSED(static int waitfd_to_waiting_flag(int wfd_event));
 
 #include THREAD_IMPL_SRC
 
@@ -342,40 +339,49 @@ unblock_function_clear(rb_thread_t *th)
 }
 
 static void
-rb_threadptr_interrupt_common(rb_thread_t *th, int trap)
+threadptr_set_interrupt_locked(rb_thread_t *th, bool trap)
 {
+    // th->interrupt_lock should be acquired here
+
     RUBY_DEBUG_LOG("th:%u trap:%d", rb_th_serial(th), trap);
 
+    if (trap) {
+        RUBY_VM_SET_TRAP_INTERRUPT(th->ec);
+    }
+    else {
+        RUBY_VM_SET_INTERRUPT(th->ec);
+    }
+
+    if (th->unblock.func != NULL) {
+        (th->unblock.func)(th->unblock.arg);
+    }
+    else {
+        /* none */
+    }
+}
+
+static void
+threadptr_set_interrupt(rb_thread_t *th, int trap)
+{
     rb_native_mutex_lock(&th->interrupt_lock);
     {
-        if (trap) {
-            RUBY_VM_SET_TRAP_INTERRUPT(th->ec);
-        }
-        else {
-            RUBY_VM_SET_INTERRUPT(th->ec);
-        }
-
-        if (th->unblock.func != NULL) {
-            (th->unblock.func)(th->unblock.arg);
-        }
-        else {
-            /* none */
-        }
+        threadptr_set_interrupt_locked(th, trap);
     }
     rb_native_mutex_unlock(&th->interrupt_lock);
 }
 
+/* Set interrupt flag on another thread or current thread, and call its UBF if it has one set */
 void
 rb_threadptr_interrupt(rb_thread_t *th)
 {
     RUBY_DEBUG_LOG("th:%u", rb_th_serial(th));
-    rb_threadptr_interrupt_common(th, 0);
+    threadptr_set_interrupt(th, false);
 }
 
 static void
 threadptr_trap_interrupt(rb_thread_t *th)
 {
-    rb_threadptr_interrupt_common(th, 1);
+    threadptr_set_interrupt(th, true);
 }
 
 static void
@@ -416,12 +422,12 @@ rb_threadptr_join_list_wakeup(rb_thread_t *thread)
             rb_threadptr_interrupt(target_thread);
 
             switch (target_thread->status) {
-                case THREAD_STOPPED:
-                case THREAD_STOPPED_FOREVER:
-                    target_thread->status = THREAD_RUNNABLE;
-                    break;
-                default:
-                    break;
+              case THREAD_STOPPED:
+              case THREAD_STOPPED_FOREVER:
+                target_thread->status = THREAD_RUNNABLE;
+                break;
+              default:
+                break;
             }
         }
     }
@@ -490,6 +496,7 @@ rb_thread_terminate_all(rb_thread_t *th)
 }
 
 void rb_threadptr_root_fiber_terminate(rb_thread_t *th);
+static void threadptr_interrupt_exec_cleanup(rb_thread_t *th);
 
 static void
 thread_cleanup_func_before_exec(void *th_ptr)
@@ -500,6 +507,7 @@ thread_cleanup_func_before_exec(void *th_ptr)
     // The thread stack doesn't exist in the forked process:
     th->ec->machine.stack_start = th->ec->machine.stack_end = NULL;
 
+    threadptr_interrupt_exec_cleanup(th);
     rb_threadptr_root_fiber_terminate(th);
 }
 
@@ -511,29 +519,22 @@ thread_cleanup_func(void *th_ptr, int atfork)
     th->locking_mutex = Qfalse;
     thread_cleanup_func_before_exec(th_ptr);
 
-    /*
-     * Unfortunately, we can't release native threading resource at fork
-     * because libc may have unstable locking state therefore touching
-     * a threading resource may cause a deadlock.
-     *
-     * FIXME: Skipping native_mutex_destroy(pthread_mutex_destroy) is safe
-     * with NPTL, but native_thread_destroy calls pthread_cond_destroy
-     * which calls free(3), so there is a small memory leak atfork, here.
-     */
-    if (atfork)
+    if (atfork) {
+        native_thread_destroy_atfork(th->nt);
+        th->nt = NULL;
         return;
+    }
 
     rb_native_mutex_destroy(&th->interrupt_lock);
-    native_thread_destroy(th);
 }
 
 static VALUE rb_threadptr_raise(rb_thread_t *, int, VALUE *);
 static VALUE rb_thread_to_s(VALUE thread);
 
 void
-ruby_thread_init_stack(rb_thread_t *th)
+ruby_thread_init_stack(rb_thread_t *th, void *local_in_parent_frame)
 {
-    native_thread_init_stack(th);
+    native_thread_init_stack(th, local_in_parent_frame);
 }
 
 const VALUE *
@@ -571,6 +572,8 @@ thread_do_start_proc(rb_thread_t *th)
 
     if (th->invoke_type == thread_invoke_type_ractor_proc) {
         VALUE self = rb_ractor_self(th->ractor);
+        th->thgroup = th->ractor->thgroup_default = rb_obj_alloc(cThGroup);
+
         VM_ASSERT(FIXNUM_P(args));
         args_len = FIX2INT(args);
         args_ptr = ALLOCA_N(VALUE, args_len);
@@ -607,14 +610,12 @@ thread_do_start_proc(rb_thread_t *th)
     }
 }
 
-static void
+static VALUE
 thread_do_start(rb_thread_t *th)
 {
     native_set_thread_name(th);
     VALUE result = Qundef;
 
-    EXEC_EVENT_HOOK(th->ec, RUBY_EVENT_THREAD_BEGIN, th->self, 0, 0, 0, Qundef);
-
     switch (th->invoke_type) {
       case thread_invoke_type_proc:
         result = thread_do_start_proc(th);
@@ -633,11 +634,7 @@ thread_do_start(rb_thread_t *th)
         rb_bug("unreachable");
     }
 
-    rb_fiber_scheduler_set(Qnil);
-
-    th->value = result;
-
-    EXEC_EVENT_HOOK(th->ec, RUBY_EVENT_THREAD_END, th->self, 0, 0, 0, Qundef);
+    return result;
 }
 
 void rb_ec_clear_current_thread_trace_func(const rb_execution_context_t *ec);
@@ -645,21 +642,12 @@ void rb_ec_clear_current_thread_trace_func(const rb_execution_context_t *ec);
 static int
 thread_start_func_2(rb_thread_t *th, VALUE *stack_start)
 {
-    STACK_GROW_DIR_DETECTION;
+    RUBY_DEBUG_LOG("th:%u", rb_th_serial(th));
+    VM_ASSERT(th != th->vm->ractor.main_thread);
+
     enum ruby_tag_type state;
     VALUE errinfo = Qnil;
-    size_t size = th->vm->default_params.thread_vm_stack_size / sizeof(VALUE);
     rb_thread_t *ractor_main_th = th->ractor->threads.main;
-    VALUE * vm_stack = NULL;
-
-    VM_ASSERT(th != th->vm->ractor.main_thread);
-    RUBY_DEBUG_LOG("th:%u", rb_th_serial(th));
-
-    // setup native thread
-    thread_sched_to_running(TH_SCHED(th), th);
-    ruby_thread_set_native(th);
-
-    RUBY_DEBUG_LOG("got lock. th:%u", rb_th_serial(th));
 
     // setup ractor
     if (rb_ractor_status_p(th->ractor, ractor_blocking)) {
@@ -674,24 +662,33 @@ thread_start_func_2(rb_thread_t *th, VALUE *stack_start)
         RB_VM_UNLOCK();
     }
 
-    // This assertion is not passed on win32 env. Check it later.
-    // VM_ASSERT((size * sizeof(VALUE)) <= th->ec->machine.stack_maxsize);
-
-    // setup VM and machine stack
-    vm_stack = alloca(size * sizeof(VALUE));
-    VM_ASSERT(vm_stack);
-
-    rb_ec_initialize_vm_stack(th->ec, vm_stack, size);
-    th->ec->machine.stack_start = STACK_DIR_UPPER(vm_stack + size, vm_stack);
-    th->ec->machine.stack_maxsize -= size * sizeof(VALUE);
-
     // Ensure that we are not joinable.
     VM_ASSERT(UNDEF_P(th->value));
 
+    int fiber_scheduler_closed = 0, event_thread_end_hooked = 0;
+    VALUE result = Qundef;
+
     EC_PUSH_TAG(th->ec);
 
     if ((state = EC_EXEC_TAG()) == TAG_NONE) {
-        SAVE_ROOT_JMPBUF(th, thread_do_start(th));
+        EXEC_EVENT_HOOK(th->ec, RUBY_EVENT_THREAD_BEGIN, th->self, 0, 0, 0, Qundef);
+
+        result = thread_do_start(th);
+    }
+
+    if (!fiber_scheduler_closed) {
+        fiber_scheduler_closed = 1;
+        rb_fiber_scheduler_set(Qnil);
+    }
+
+    if (!event_thread_end_hooked) {
+        event_thread_end_hooked = 1;
+        EXEC_EVENT_HOOK(th->ec, RUBY_EVENT_THREAD_END, th->self, 0, 0, 0, Qundef);
+    }
+
+    if (state == TAG_NONE) {
+        // This must be set AFTER doing all user-level code. At this point, the thread is effectively finished and calls to `Thread#join` will succeed.
+        th->value = result;
     }
     else {
         errinfo = th->ec->errinfo;
@@ -706,6 +703,10 @@ thread_start_func_2(rb_thread_t *th, VALUE *stack_start)
             /* fatal error within this thread, need to stop whole script */
         }
         else if (rb_obj_is_kind_of(errinfo, rb_eSystemExit)) {
+            if (th->invoke_type == thread_invoke_type_ractor_proc) {
+                rb_ractor_atexit_exception(th->ec);
+            }
+
             /* exit on main_thread. */
         }
         else {
@@ -806,6 +807,8 @@ struct thread_create_params {
     VALUE (*fn)(void *);
 };
 
+static void thread_specific_storage_alloc(rb_thread_t *th);
+
 static VALUE
 thread_create_core(VALUE thval, struct thread_create_params *params)
 {
@@ -813,6 +816,8 @@ thread_create_core(VALUE thval, struct thread_create_params *params)
     rb_thread_t *th = rb_thread_ptr(thval), *current_th = rb_ec_thread_ptr(ec);
     int err;
 
+    thread_specific_storage_alloc(th);
+
     if (OBJ_FROZEN(current_th->thgroup)) {
         rb_raise(rb_eThreadError,
                  "can't start a new thread (frozen ThreadGroup)");
@@ -878,10 +883,10 @@ thread_create_core(VALUE thval, struct thread_create_params *params)
 #define threadptr_initialized(th) ((th)->invoke_type != thread_invoke_type_none)
 
 /*
- * call-seq:
- *  Thread.new { ... }			-> thread
- *  Thread.new(*args, &proc)		-> thread
- *  Thread.new(*args) { |args| ... }	-> thread
+ *  call-seq:
+ *    Thread.new { ... }		-> thread
+ *    Thread.new(*args, &proc)		-> thread
+ *    Thread.new(*args) { |args| ... }	-> thread
  *
  *  Creates a new thread executing the given block.
  *
@@ -910,7 +915,7 @@ thread_s_new(int argc, VALUE *argv, VALUE klass)
     rb_obj_call_init_kw(thread, argc, argv, RB_PASS_CALLED_KEYWORDS);
     th = rb_thread_ptr(thread);
     if (!threadptr_initialized(th)) {
-        rb_raise(rb_eThreadError, "uninitialized thread - check `%"PRIsVALUE"#initialize'",
+        rb_raise(rb_eThreadError, "uninitialized thread - check '%"PRIsVALUE"#initialize'",
                  klass);
     }
     return thread;
@@ -990,15 +995,15 @@ rb_thread_create(VALUE (*fn)(void *), void *arg)
 }
 
 VALUE
-rb_thread_create_ractor(rb_ractor_t *g, VALUE args, VALUE proc)
+rb_thread_create_ractor(rb_ractor_t *r, VALUE args, VALUE proc)
 {
     struct thread_create_params params = {
         .type = thread_invoke_type_ractor_proc,
-        .g = g,
+        .g = r,
         .args = args,
         .proc = proc,
     };
-    return thread_create_core(rb_thread_alloc(rb_cThread), &params);
+    return thread_create_core(rb_thread_alloc(rb_cThread), &params);;
 }
 
 
@@ -1051,23 +1056,28 @@ thread_join_sleep(VALUE arg)
     while (!thread_finished(target_th)) {
         VALUE scheduler = rb_fiber_scheduler_current();
 
-        if (scheduler != Qnil) {
-            rb_fiber_scheduler_block(scheduler, target_th->self, p->timeout);
-            // Check if the target thread is finished after blocking:
-            if (thread_finished(target_th)) break;
-            // Otherwise, a timeout occurred:
-            else return Qfalse;
-        }
-        else if (!limit) {
-            sleep_forever(th, SLEEP_DEADLOCKABLE | SLEEP_ALLOW_SPURIOUS | SLEEP_NO_CHECKINTS);
+        if (!limit) {
+            if (scheduler != Qnil) {
+                rb_fiber_scheduler_block(scheduler, target_th->self, Qnil);
+            }
+            else {
+                sleep_forever(th, SLEEP_DEADLOCKABLE | SLEEP_ALLOW_SPURIOUS | SLEEP_NO_CHECKINTS);
+            }
         }
         else {
             if (hrtime_update_expire(limit, end)) {
                 RUBY_DEBUG_LOG("timeout target_th:%u", rb_th_serial(target_th));
                 return Qfalse;
             }
-            th->status = THREAD_STOPPED;
-            native_sleep(th, limit);
+
+            if (scheduler != Qnil) {
+                VALUE timeout = rb_float_new(hrtime2double(*limit));
+                rb_fiber_scheduler_block(scheduler, target_th->self, timeout);
+            }
+            else {
+                th->status = THREAD_STOPPED;
+                native_sleep(th, limit);
+            }
         }
         RUBY_VM_CHECK_INTS_BLOCKING(th->ec);
         th->status = THREAD_RUNNABLE;
@@ -1126,6 +1136,10 @@ thread_join(rb_thread_t *target_th, VALUE timeout, rb_hrtime_t *limit)
                 /* OK. killed. */
                 break;
               default:
+                if (err == RUBY_FATAL_FIBER_KILLED) { // not integer constant so can't be a case expression
+                    // root fiber killed in non-main thread
+                    break;
+                }
                 rb_bug("thread_join: Fixnum (%d) should not reach here.", FIX2INT(err));
             }
         }
@@ -1375,14 +1389,14 @@ sleep_forever(rb_thread_t *th, unsigned int fl)
 void
 rb_thread_sleep_forever(void)
 {
-    RUBY_DEBUG_LOG("");
+    RUBY_DEBUG_LOG("forever");
     sleep_forever(GET_THREAD(), SLEEP_SPURIOUS_CHECK);
 }
 
 void
 rb_thread_sleep_deadly(void)
 {
-    RUBY_DEBUG_LOG("");
+    RUBY_DEBUG_LOG("deadly");
     sleep_forever(GET_THREAD(), SLEEP_DEADLOCKABLE|SLEEP_SPURIOUS_CHECK);
 }
 
@@ -1394,7 +1408,7 @@ rb_thread_sleep_deadly_allow_spurious_wakeup(VALUE blocker, VALUE timeout, rb_hr
         rb_fiber_scheduler_block(scheduler, blocker, timeout);
     }
     else {
-        RUBY_DEBUG_LOG("");
+        RUBY_DEBUG_LOG("...");
         if (end) {
             sleep_hrtime_until(GET_THREAD(), end, SLEEP_SPURIOUS_CHECK);
         }
@@ -1412,6 +1426,12 @@ rb_thread_wait_for(struct timeval time)
     sleep_hrtime(th, rb_timeval2hrtime(&time), SLEEP_SPURIOUS_CHECK);
 }
 
+void
+rb_ec_check_ints(rb_execution_context_t *ec)
+{
+    RUBY_VM_CHECK_INTS_BLOCKING(ec);
+}
+
 /*
  * CAUTION: This function causes thread switching.
  *          rb_thread_check_ints() check ruby's interrupts.
@@ -1422,7 +1442,7 @@ rb_thread_wait_for(struct timeval time)
 void
 rb_thread_check_ints(void)
 {
-    RUBY_VM_CHECK_INTS_BLOCKING(GET_EC());
+    rb_ec_check_ints(GET_EC());
 }
 
 /*
@@ -1460,7 +1480,7 @@ rb_thread_schedule_limits(uint32_t limits_us)
 
             RB_VM_SAVE_MACHINE_CONTEXT(th);
             thread_sched_yield(TH_SCHED(th), th);
-            rb_ractor_thread_switch(th->ractor, th);
+            rb_ractor_thread_switch(th->ractor, th, true);
 
             RUBY_DEBUG_LOG("switch %s", "done");
         }
@@ -1480,7 +1500,7 @@ static inline int
 blocking_region_begin(rb_thread_t *th, struct rb_blocking_region_buffer *region,
                       rb_unblock_function_t *ubf, void *arg, int fail_if_interrupted)
 {
-#ifdef RUBY_VM_CRITICAL_SECTION
+#ifdef RUBY_ASSERT_CRITICAL_SECTION
     VM_ASSERT(ruby_assert_critical_section_entered == 0);
 #endif
     VM_ASSERT(th == GET_THREAD());
@@ -1491,10 +1511,7 @@ blocking_region_begin(rb_thread_t *th, struct rb_blocking_region_buffer *region,
         th->status = THREAD_STOPPED;
         rb_ractor_blocking_threads_inc(th->ractor, __FILE__, __LINE__);
 
-        RUBY_DEBUG_LOG("");
-
-        RB_VM_SAVE_MACHINE_CONTEXT(th);
-        thread_sched_to_waiting(TH_SCHED(th), th);
+        RUBY_DEBUG_LOG("thread_id:%p", (void *)th->nt->thread_id);
         return TRUE;
     }
     else {
@@ -1511,7 +1528,7 @@ blocking_region_end(rb_thread_t *th, struct rb_blocking_region_buffer *region)
     unregister_ubf_list(th);
 
     thread_sched_to_running(TH_SCHED(th), th);
-    rb_ractor_thread_switch(th->ractor, th);
+    rb_ractor_thread_switch(th->ractor, th, false);
 
     th->blocking_region_buffer = 0;
     rb_ractor_blocking_threads_dec(th->ractor, __FILE__, __LINE__);
@@ -1519,8 +1536,35 @@ blocking_region_end(rb_thread_t *th, struct rb_blocking_region_buffer *region)
         th->status = region->prev_status;
     }
 
-    RUBY_DEBUG_LOG("");
+    RUBY_DEBUG_LOG("end");
+
+#ifndef _WIN32
+    // GET_THREAD() clears WSAGetLastError()
     VM_ASSERT(th == GET_THREAD());
+#endif
+}
+
+/*
+ * Resolve sentinel unblock function values to their actual function pointers
+ * and appropriate data2 values. This centralizes the logic for handling
+ * RUBY_UBF_IO and RUBY_UBF_PROCESS sentinel values.
+ *
+ * @param unblock_function Pointer to unblock function pointer (modified in place)
+ * @param data2 Pointer to data2 pointer (modified in place)
+ * @param thread Thread context for resolving data2 when needed
+ * @return true if sentinel values were resolved, false otherwise
+ */
+bool
+rb_thread_resolve_unblock_function(rb_unblock_function_t **unblock_function, void **data2, struct rb_thread_struct *thread)
+{
+    rb_unblock_function_t *ubf = *unblock_function;
+
+    if ((ubf == RUBY_UBF_IO) || (ubf == RUBY_UBF_PROCESS)) {
+        *unblock_function = ubf_select;
+        *data2 = thread;
+        return true;
+    }
+    return false;
 }
 
 void *
@@ -1528,31 +1572,41 @@ rb_nogvl(void *(*func)(void *), void *data1,
          rb_unblock_function_t *ubf, void *data2,
          int flags)
 {
+    if (flags & RB_NOGVL_OFFLOAD_SAFE) {
+        VALUE scheduler = rb_fiber_scheduler_current();
+        if (scheduler != Qnil) {
+            struct rb_fiber_scheduler_blocking_operation_state state = {0};
+
+            VALUE result = rb_fiber_scheduler_blocking_operation_wait(scheduler, func, data1, ubf, data2, flags, &state);
+
+            if (!UNDEF_P(result)) {
+                rb_errno_set(state.saved_errno);
+                return state.result;
+            }
+        }
+    }
+
     void *val = 0;
     rb_execution_context_t *ec = GET_EC();
     rb_thread_t *th = rb_ec_thread_ptr(ec);
     rb_vm_t *vm = rb_ec_vm_ptr(ec);
     bool is_main_thread = vm->ractor.main_thread == th;
     int saved_errno = 0;
-    VALUE ubf_th = Qfalse;
 
-    if ((ubf == RUBY_UBF_IO) || (ubf == RUBY_UBF_PROCESS)) {
-        ubf = ubf_select;
-        data2 = th;
-    }
-    else if (ubf && rb_ractor_living_thread_num(th->ractor) == 1 && is_main_thread) {
+    rb_thread_resolve_unblock_function(&ubf, &data2, th);
+
+    if (ubf && rb_ractor_living_thread_num(th->ractor) == 1 && is_main_thread) {
         if (flags & RB_NOGVL_UBF_ASYNC_SAFE) {
             vm->ubf_async_safe = 1;
         }
-        else {
-            ubf_th = rb_thread_start_unblock_thread();
-        }
     }
 
+    rb_vm_t *volatile saved_vm = vm;
     BLOCKING_REGION(th, {
         val = func(data1);
-        saved_errno = errno;
+        saved_errno = rb_errno();
     }, ubf, data2, flags & RB_NOGVL_INTR_FAIL);
+    vm = saved_vm;
 
     if (is_main_thread) vm->ubf_async_safe = 0;
 
@@ -1560,11 +1614,7 @@ rb_nogvl(void *(*func)(void *), void *data1,
         RUBY_VM_CHECK_INTS_BLOCKING(ec);
     }
 
-    if (ubf_th != Qfalse) {
-        thread_value(rb_thread_kill(ubf_th));
-    }
-
-    errno = saved_errno;
+    rb_errno_set(saved_errno);
 
     return val;
 }
@@ -1668,40 +1718,231 @@ rb_thread_call_without_gvl(void *(*func)(void *data), void *data1,
     return rb_nogvl(func, data1, ubf, data2, 0);
 }
 
+static int
+waitfd_to_waiting_flag(int wfd_event)
+{
+    return wfd_event << 1;
+}
+
+static struct ccan_list_head *
+rb_io_blocking_operations(struct rb_io *io)
+{
+    rb_serial_t fork_generation = GET_VM()->fork_gen;
+
+    // On fork, all existing entries in this list (which are stack allocated) become invalid.
+    // Therefore, we re-initialize the list which clears it.
+    if (io->fork_generation != fork_generation) {
+        ccan_list_head_init(&io->blocking_operations);
+        io->fork_generation = fork_generation;
+    }
+
+    return &io->blocking_operations;
+}
+
+/*
+ * Registers a blocking operation for an IO object. This is used to track all threads and fibers
+ * that are currently blocked on this IO for reading, writing or other operations.
+ *
+ * When the IO is closed, all blocking operations will be notified via rb_fiber_scheduler_fiber_interrupt
+ * for fibers with a scheduler, or via rb_threadptr_interrupt for threads without a scheduler.
+ *
+ * @parameter io The IO object on which the operation will block
+ * @parameter blocking_operation The operation details including the execution context that will be blocked
+ */
 static void
-rb_thread_io_wake_pending_closer(struct waiting_fd *wfd)
+rb_io_blocking_operation_enter(struct rb_io *io, struct rb_io_blocking_operation *blocking_operation)
 {
-    bool has_waiter = wfd->busy && RB_TEST(wfd->busy->wakeup_mutex);
-    if (has_waiter) {
-        rb_mutex_lock(wfd->busy->wakeup_mutex);
+    ccan_list_add(rb_io_blocking_operations(io), &blocking_operation->list);
+}
+
+static void
+rb_io_blocking_operation_pop(struct rb_io *io, struct rb_io_blocking_operation *blocking_operation)
+{
+    ccan_list_del(&blocking_operation->list);
+}
+
+struct io_blocking_operation_arguments {
+    struct rb_io *io;
+    struct rb_io_blocking_operation *blocking_operation;
+};
+
+static VALUE
+io_blocking_operation_exit(VALUE _arguments)
+{
+    struct io_blocking_operation_arguments *arguments = (void*)_arguments;
+    struct rb_io_blocking_operation *blocking_operation = arguments->blocking_operation;
+
+    rb_io_blocking_operation_pop(arguments->io, blocking_operation);
+
+    rb_io_t *io = arguments->io;
+    rb_thread_t *thread = io->closing_ec->thread_ptr;
+    rb_fiber_t *fiber = io->closing_ec->fiber_ptr;
+
+    if (thread->scheduler != Qnil) {
+        // This can cause spurious wakeups...
+        rb_fiber_scheduler_unblock(thread->scheduler, io->self, rb_fiberptr_self(fiber));
+    }
+    else {
+        rb_thread_wakeup(thread->self);
     }
 
-    /* Needs to be protected with RB_VM_LOCK because we don't know if
-       wfd is on the global list of pending FD ops or if it's on a
-       struct rb_io_close_wait_list close-waiter. */
-    RB_VM_LOCK_ENTER();
-    ccan_list_del(&wfd->wfd_node);
-    RB_VM_LOCK_LEAVE();
+    return Qnil;
+}
 
-    if (has_waiter) {
-        rb_thread_wakeup(wfd->busy->closing_thread);
-        rb_mutex_unlock(wfd->busy->wakeup_mutex);
+/*
+ * Called when a blocking operation completes or is interrupted. Removes the operation from
+ * the IO's blocking_operations list and wakes up any waiting threads/fibers.
+ *
+ * If there's a wakeup_mutex (meaning an IO close is in progress), synchronizes the cleanup
+ * through that mutex to ensure proper coordination with the closing thread.
+ *
+ * @parameter io The IO object the operation was performed on
+ * @parameter blocking_operation The completed operation to clean up
+ */
+static void
+rb_io_blocking_operation_exit(struct rb_io *io, struct rb_io_blocking_operation *blocking_operation)
+{
+    VALUE wakeup_mutex = io->wakeup_mutex;
+
+    // Indicate that the blocking operation is no longer active:
+    blocking_operation->ec = NULL;
+
+    if (RB_TEST(wakeup_mutex)) {
+        struct io_blocking_operation_arguments arguments = {
+            .io = io,
+            .blocking_operation = blocking_operation
+        };
+
+        rb_mutex_synchronize(wakeup_mutex, io_blocking_operation_exit, (VALUE)&arguments);
+    }
+    else {
+        // If there's no wakeup_mutex, we can safely remove the operation directly:
+        rb_io_blocking_operation_pop(io, blocking_operation);
     }
 }
 
+static VALUE
+rb_thread_io_blocking_operation_ensure(VALUE _argument)
+{
+    struct io_blocking_operation_arguments *arguments = (void*)_argument;
+
+    rb_io_blocking_operation_exit(arguments->io, arguments->blocking_operation);
+
+    return Qnil;
+}
+
+/*
+ * Executes a function that performs a blocking IO operation, while properly tracking
+ * the operation in the IO's blocking_operations list. This ensures proper cleanup
+ * and interruption handling if the IO is closed while blocked.
+ *
+ * The operation is automatically removed from the blocking_operations list when the function
+ * returns, whether normally or due to an exception.
+ *
+ * @parameter self The IO object
+ * @parameter function The function to execute that will perform the blocking operation
+ * @parameter argument The argument to pass to the function
+ * @returns The result of the blocking operation function
+ */
 VALUE
-rb_thread_io_blocking_region(rb_blocking_function_t *func, void *data1, int fd)
+rb_thread_io_blocking_operation(VALUE self, VALUE(*function)(VALUE), VALUE argument)
+{
+    struct rb_io *io;
+    RB_IO_POINTER(self, io);
+
+    rb_execution_context_t *ec = GET_EC();
+    struct rb_io_blocking_operation blocking_operation = {
+        .ec = ec,
+    };
+    rb_io_blocking_operation_enter(io, &blocking_operation);
+
+    struct io_blocking_operation_arguments io_blocking_operation_arguments = {
+        .io = io,
+        .blocking_operation = &blocking_operation
+    };
+
+    return rb_ensure(function, argument, rb_thread_io_blocking_operation_ensure, (VALUE)&io_blocking_operation_arguments);
+}
+
+static bool
+thread_io_mn_schedulable(rb_thread_t *th, int events, const struct timeval *timeout)
+{
+#if defined(USE_MN_THREADS) && USE_MN_THREADS
+    return !th_has_dedicated_nt(th) && (events || timeout) && th->blocking;
+#else
+    return false;
+#endif
+}
+
+// true if need retry
+static bool
+thread_io_wait_events(rb_thread_t *th, int fd, int events, const struct timeval *timeout)
+{
+#if defined(USE_MN_THREADS) && USE_MN_THREADS
+    if (thread_io_mn_schedulable(th, events, timeout)) {
+        rb_hrtime_t rel, *prel;
+
+        if (timeout) {
+            rel = rb_timeval2hrtime(timeout);
+            prel = &rel;
+        }
+        else {
+            prel = NULL;
+        }
+
+        VM_ASSERT(prel || (events & (RB_WAITFD_IN | RB_WAITFD_OUT)));
+
+        if (thread_sched_wait_events(TH_SCHED(th), th, fd, waitfd_to_waiting_flag(events), prel)) {
+            // timeout
+            return false;
+        }
+        else {
+            return true;
+        }
+    }
+#endif // defined(USE_MN_THREADS) && USE_MN_THREADS
+    return false;
+}
+
+// assume read/write
+static bool
+blocking_call_retryable_p(int r, int eno)
+{
+    if (r != -1) return false;
+
+    switch (eno) {
+      case EAGAIN:
+#if defined(EWOULDBLOCK) && EWOULDBLOCK != EAGAIN
+      case EWOULDBLOCK:
+#endif
+        return true;
+      default:
+        return false;
+    }
+}
+
+bool
+rb_thread_mn_schedulable(VALUE thval)
+{
+    rb_thread_t *th = rb_thread_ptr(thval);
+    return th->mn_schedulable;
+}
+
+VALUE
+rb_thread_io_blocking_call(struct rb_io* io, rb_blocking_function_t *func, void *data1, int events)
 {
-    volatile VALUE val = Qundef; /* shouldn't be used */
     rb_execution_context_t * volatile ec = GET_EC();
+    rb_thread_t * volatile th = rb_ec_thread_ptr(ec);
+
+    RUBY_DEBUG_LOG("th:%u fd:%d ev:%d", rb_th_serial(th), io->fd, events);
+
+    volatile VALUE val = Qundef; /* shouldn't be used */
     volatile int saved_errno = 0;
     enum ruby_tag_type state;
+    volatile bool prev_mn_schedulable = th->mn_schedulable;
+    th->mn_schedulable = thread_io_mn_schedulable(th, events, NULL);
 
-    struct waiting_fd waiting_fd = {
-        .fd = fd,
-        .th = rb_ec_thread_ptr(ec),
-        .busy = NULL,
-    };
+    int fd = io->fd;
 
     // `errno` is only valid when there is an actual error - but we can't
     // extract that from the return value of `func` alone, so we clear any
@@ -1709,32 +1950,44 @@ rb_thread_io_blocking_region(rb_blocking_function_t *func, void *data1, int fd)
     // `func` or not (as opposed to some previously set value).
     errno = 0;
 
-    RB_VM_LOCK_ENTER();
+    struct rb_io_blocking_operation blocking_operation = {
+        .ec = ec,
+    };
+    rb_io_blocking_operation_enter(io, &blocking_operation);
+
     {
-        ccan_list_add(&rb_ec_vm_ptr(ec)->waiting_fds, &waiting_fd.wfd_node);
-    }
-    RB_VM_LOCK_LEAVE();
+        EC_PUSH_TAG(ec);
+        if ((state = EC_EXEC_TAG()) == TAG_NONE) {
+            volatile enum ruby_tag_type saved_state = state; /* for BLOCKING_REGION */
+          retry:
+            BLOCKING_REGION(th, {
+                val = func(data1);
+                saved_errno = errno;
+            }, ubf_select, th, FALSE);
+
+            RUBY_ASSERT(th == rb_ec_thread_ptr(ec));
+            if (events &&
+                blocking_call_retryable_p((int)val, saved_errno) &&
+                thread_io_wait_events(th, fd, events, NULL)) {
+                RUBY_VM_CHECK_INTS_BLOCKING(ec);
+                goto retry;
+            }
 
-    EC_PUSH_TAG(ec);
-    if ((state = EC_EXEC_TAG()) == TAG_NONE) {
-        BLOCKING_REGION(waiting_fd.th, {
-            val = func(data1);
-            saved_errno = errno;
-        }, ubf_select, waiting_fd.th, FALSE);
+            RUBY_VM_CHECK_INTS_BLOCKING(ec);
+
+            state = saved_state;
+        }
+        EC_POP_TAG();
+
+        th = rb_ec_thread_ptr(ec);
+        th->mn_schedulable = prev_mn_schedulable;
     }
-    EC_POP_TAG();
 
-    /*
-     * must be deleted before jump
-     * this will delete either from waiting_fds or on-stack struct rb_io_close_wait_list
-     */
-    rb_thread_io_wake_pending_closer(&waiting_fd);
+    rb_io_blocking_operation_exit(io, &blocking_operation);
 
     if (state) {
         EC_JUMP_TAG(ec, state);
     }
-    /* TODO: check func() */
-    RUBY_VM_CHECK_INTS_BLOCKING(ec);
 
     // If the error was a timeout, we raise a specific exception for that:
     if (saved_errno == ETIMEDOUT) {
@@ -1746,6 +1999,12 @@ rb_thread_io_blocking_region(rb_blocking_function_t *func, void *data1, int fd)
     return val;
 }
 
+VALUE
+rb_thread_io_blocking_region(struct rb_io *io, rb_blocking_function_t *func, void *data1)
+{
+    return rb_thread_io_blocking_call(io, func, data1, 0);
+}
+
 /*
  * rb_thread_call_with_gvl - re-enter the Ruby world after GVL release.
  *
@@ -1805,16 +2064,13 @@ rb_thread_call_with_gvl(void *(*func)(void *), void *data1)
     /* leave from Ruby world: You can not access Ruby values, etc. */
     int released = blocking_region_begin(th, brb, prev_unblock.func, prev_unblock.arg, FALSE);
     RUBY_ASSERT_ALWAYS(released);
+    RB_VM_SAVE_MACHINE_CONTEXT(th);
+    thread_sched_to_waiting(TH_SCHED(th), th);
     return r;
 }
 
 /*
  * ruby_thread_has_gvl_p - check if current native thread has GVL.
- *
- ***
- *** This API is EXPERIMENTAL!
- *** We do not guarantee that this API remains in ruby 1.9.2 or later.
- ***
  */
 
 int
@@ -1891,6 +2147,23 @@ enum handle_interrupt_timing {
     INTERRUPT_NEVER
 };
 
+static enum handle_interrupt_timing
+rb_threadptr_pending_interrupt_from_symbol(rb_thread_t *th, VALUE sym)
+{
+    if (sym == sym_immediate) {
+        return INTERRUPT_IMMEDIATE;
+    }
+    else if (sym == sym_on_blocking) {
+        return INTERRUPT_ON_BLOCKING;
+    }
+    else if (sym == sym_never) {
+        return INTERRUPT_NEVER;
+    }
+    else {
+        rb_raise(rb_eThreadError, "unknown mask signature");
+    }
+}
+
 static enum handle_interrupt_timing
 rb_threadptr_pending_interrupt_check_mask(rb_thread_t *th, VALUE err)
 {
@@ -1903,6 +2176,16 @@ rb_threadptr_pending_interrupt_check_mask(rb_thread_t *th, VALUE err)
     for (i=0; i<mask_stack_len; i++) {
         mask = mask_stack[mask_stack_len-(i+1)];
 
+        if (SYMBOL_P(mask)) {
+            /* do not match RUBY_FATAL_THREAD_KILLED etc */
+            if (err != rb_cInteger) {
+                return rb_threadptr_pending_interrupt_from_symbol(th, mask);
+            }
+            else {
+                continue;
+            }
+        }
+
         for (mod = err; mod; mod = RCLASS_SUPER(mod)) {
             VALUE klass = mod;
             VALUE sym;
@@ -1915,18 +2198,7 @@ rb_threadptr_pending_interrupt_check_mask(rb_thread_t *th, VALUE err)
             }
 
             if ((sym = rb_hash_aref(mask, klass)) != Qnil) {
-                if (sym == sym_immediate) {
-                    return INTERRUPT_IMMEDIATE;
-                }
-                else if (sym == sym_on_blocking) {
-                    return INTERRUPT_ON_BLOCKING;
-                }
-                else if (sym == sym_never) {
-                    return INTERRUPT_NEVER;
-                }
-                else {
-                    rb_raise(rb_eThreadError, "unknown mask signature");
-                }
+                return rb_threadptr_pending_interrupt_from_symbol(th, sym);
             }
         }
         /* try to next mask */
@@ -2018,10 +2290,24 @@ handle_interrupt_arg_check_i(VALUE key, VALUE val, VALUE args)
         rb_raise(rb_eArgError, "unknown mask signature");
     }
 
-    if (!*maskp) {
-        *maskp = rb_ident_hash_new();
+    if (key == rb_eException && (UNDEF_P(*maskp) || NIL_P(*maskp))) {
+        *maskp = val;
+        return ST_CONTINUE;
+    }
+
+    if (RTEST(*maskp)) {
+        if (!RB_TYPE_P(*maskp, T_HASH)) {
+            VALUE prev = *maskp;
+            *maskp = rb_ident_hash_new();
+            if (SYMBOL_P(prev)) {
+                rb_hash_aset(*maskp, rb_eException, prev);
+            }
+        }
+        rb_hash_aset(*maskp, key, val);
+    }
+    else {
+        *maskp = Qfalse;
     }
-    rb_hash_aset(*maskp, key, val);
 
     return ST_CONTINUE;
 }
@@ -2088,30 +2374,6 @@ handle_interrupt_arg_check_i(VALUE key, VALUE val, VALUE args)
  * resource allocation code. Then, the ensure block is where we can safely
  * deallocate your resources.
  *
- * ==== Guarding from Timeout::Error
- *
- * In the next example, we will guard from the Timeout::Error exception. This
- * will help prevent from leaking resources when Timeout::Error exceptions occur
- * during normal ensure clause. For this example we use the help of the
- * standard library Timeout, from lib/timeout.rb
- *
- *   require 'timeout'
- *   Thread.handle_interrupt(Timeout::Error => :never) {
- *     timeout(10){
- *       # Timeout::Error doesn't occur here
- *       Thread.handle_interrupt(Timeout::Error => :on_blocking) {
- *         # possible to be killed by Timeout::Error
- *         # while blocking operation
- *       }
- *       # Timeout::Error doesn't occur here
- *     }
- *   }
- *
- * In the first part of the +timeout+ block, we can rely on Timeout::Error being
- * ignored. Then in the <code>Timeout::Error => :on_blocking</code> block, any
- * operation that will block the calling thread is susceptible to a
- * Timeout::Error exception being raised.
- *
  * ==== Stack control settings
  *
  * It's possible to stack multiple levels of ::handle_interrupt blocks in order
@@ -2137,7 +2399,7 @@ handle_interrupt_arg_check_i(VALUE key, VALUE val, VALUE args)
 static VALUE
 rb_thread_s_handle_interrupt(VALUE self, VALUE mask_arg)
 {
-    VALUE mask;
+    VALUE mask = Qundef;
     rb_execution_context_t * volatile ec = GET_EC();
     rb_thread_t * volatile th = rb_ec_thread_ptr(ec);
     volatile VALUE r = Qnil;
@@ -2147,13 +2409,25 @@ rb_thread_s_handle_interrupt(VALUE self, VALUE mask_arg)
         rb_raise(rb_eArgError, "block is needed.");
     }
 
-    mask = 0;
     mask_arg = rb_to_hash_type(mask_arg);
+
+    if (OBJ_FROZEN(mask_arg) && rb_hash_compare_by_id_p(mask_arg)) {
+        mask = Qnil;
+    }
+
     rb_hash_foreach(mask_arg, handle_interrupt_arg_check_i, (VALUE)&mask);
-    if (!mask) {
+
+    if (UNDEF_P(mask)) {
         return rb_yield(Qnil);
     }
-    OBJ_FREEZE_RAW(mask);
+
+    if (!RTEST(mask)) {
+        mask = mask_arg;
+    }
+    else if (RB_TYPE_P(mask, T_HASH)) {
+        OBJ_FREEZE(mask);
+    }
+
     rb_ary_push(th->pending_interrupt_mask_stack, mask);
     if (!rb_threadptr_pending_interrupt_empty_p(th)) {
         th->pending_interrupt_queue_checked = 0;
@@ -2282,6 +2556,7 @@ NORETURN(static void rb_threadptr_to_kill(rb_thread_t *th));
 static void
 rb_threadptr_to_kill(rb_thread_t *th)
 {
+    VM_ASSERT(GET_THREAD() == th);
     rb_threadptr_pending_interrupt_clear(th);
     th->status = THREAD_RUNNABLE;
     th->to_kill = 1;
@@ -2296,13 +2571,21 @@ threadptr_get_interrupts(rb_thread_t *th)
     rb_atomic_t interrupt;
     rb_atomic_t old;
 
+    old = ATOMIC_LOAD_RELAXED(ec->interrupt_flag);
     do {
-        interrupt = ec->interrupt_flag;
+        interrupt = old;
         old = ATOMIC_CAS(ec->interrupt_flag, interrupt, interrupt & ec->interrupt_mask);
     } while (old != interrupt);
     return interrupt & (rb_atomic_t)~ec->interrupt_mask;
 }
 
+static void threadptr_interrupt_exec_exec(rb_thread_t *th);
+
+// Execute interrupts on currently running thread
+// In certain situations, calling this function will raise an exception. Some examples are:
+//   * during VM shutdown (`rb_ractor_terminate_all`)
+//   * Call to Thread#exit for current thread (`rb_thread_kill`)
+//   * Call to Thread#raise for current thread
 int
 rb_threadptr_execute_interrupts(rb_thread_t *th, int blocking_timing)
 {
@@ -2310,6 +2593,8 @@ rb_threadptr_execute_interrupts(rb_thread_t *th, int blocking_timing)
     int postponed_job_interrupt = 0;
     int ret = FALSE;
 
+    VM_ASSERT(GET_THREAD() == th);
+
     if (th->ec->raised_flag) return ret;
 
     while ((interrupt = threadptr_get_interrupts(th)) != 0) {
@@ -2326,28 +2611,36 @@ rb_threadptr_execute_interrupts(rb_thread_t *th, int blocking_timing)
         terminate_interrupt = interrupt & TERMINATE_INTERRUPT_MASK; // request from other ractors
 
         if (interrupt & VM_BARRIER_INTERRUPT_MASK) {
-            RB_VM_LOCK_ENTER();
-            RB_VM_LOCK_LEAVE();
+            RB_VM_LOCKING();
         }
 
         if (postponed_job_interrupt) {
             rb_postponed_job_flush(th->vm);
         }
 
-        /* signal handling */
-        if (trap_interrupt && (th == th->vm->ractor.main_thread)) {
-            enum rb_thread_status prev_status = th->status;
-            int sigwait_fd = rb_sigwait_fd_get(th);
+        if (trap_interrupt) {
+            /* signal handling */
+            if (th == th->vm->ractor.main_thread) {
+                enum rb_thread_status prev_status = th->status;
 
-            if (sigwait_fd >= 0) {
-                (void)consume_communication_pipe(sigwait_fd);
-                rb_sigwait_fd_put(th, sigwait_fd);
+                th->status = THREAD_RUNNABLE;
+                {
+                    while ((sig = rb_get_next_signal()) != 0) {
+                        ret |= rb_signal_exec(th, sig);
+                    }
+                }
+                th->status = prev_status;
             }
-            th->status = THREAD_RUNNABLE;
-            while ((sig = rb_get_next_signal()) != 0) {
-                ret |= rb_signal_exec(th, sig);
+
+            if (!ccan_list_empty(&th->interrupt_exec_tasks)) {
+                enum rb_thread_status prev_status = th->status;
+
+                th->status = THREAD_RUNNABLE;
+                {
+                    threadptr_interrupt_exec_exec(th);
+                }
+                th->status = prev_status;
             }
-            th->status = prev_status;
         }
 
         /* exception from another thread */
@@ -2382,7 +2675,7 @@ rb_threadptr_execute_interrupts(rb_thread_t *th, int blocking_timing)
         }
 
         if (timer_interrupt) {
-            uint32_t limits_us = TIME_QUANTUM_USEC;
+            uint32_t limits_us = thread_default_quantum_ms * 1000;
 
             if (th->priority > 0)
                 limits_us <<= th->priority;
@@ -2390,7 +2683,7 @@ rb_threadptr_execute_interrupts(rb_thread_t *th, int blocking_timing)
                 limits_us >>= -th->priority;
 
             if (th->status == THREAD_RUNNABLE)
-                th->running_time_us += TIME_QUANTUM_USEC;
+                th->running_time_us += 10 * 1000; // 10ms = 10_000us // TODO: use macro
 
             VM_ASSERT(th->ec->cfp);
             EXEC_EVENT_HOOK(th->ec, RUBY_INTERNAL_EVENT_SWITCH, th->ec->cfp->self,
@@ -2470,89 +2763,127 @@ rb_ec_set_raised(rb_execution_context_t *ec)
     if (ec->raised_flag & RAISED_EXCEPTION) {
         return 1;
     }
-    ec->raised_flag |= RAISED_EXCEPTION;
-    return 0;
+    ec->raised_flag |= RAISED_EXCEPTION;
+    return 0;
+}
+
+int
+rb_ec_reset_raised(rb_execution_context_t *ec)
+{
+    if (!(ec->raised_flag & RAISED_EXCEPTION)) {
+        return 0;
+    }
+    ec->raised_flag &= ~RAISED_EXCEPTION;
+    return 1;
+}
+
+/*
+ * Thread-safe IO closing mechanism.
+ *
+ * When an IO is closed while other threads or fibers are blocked on it, we need to:
+ * 1. Track and notify all blocking operations through io->blocking_operations
+ * 2. Ensure only one thread can close at a time using io->closing_ec
+ * 3. Synchronize cleanup using wakeup_mutex
+ *
+ * The close process works as follows:
+ * - First check if any thread is already closing (io->closing_ec)
+ * - Set up wakeup_mutex for synchronization
+ * - Iterate through all blocking operations in io->blocking_operations
+ * - For each blocked fiber with a scheduler:
+ *   - Notify via rb_fiber_scheduler_fiber_interrupt
+ * - For each blocked thread without a scheduler:
+ *   - Enqueue IOError via rb_threadptr_pending_interrupt_enque
+ *   - Wake via rb_threadptr_interrupt
+ * - Wait on wakeup_mutex until all operations are cleaned up
+ * - Only then clear closing state and allow actual close to proceed
+ */
+static VALUE
+thread_io_close_notify_all(VALUE _io)
+{
+    struct rb_io *io = (struct rb_io *)_io;
+
+    size_t count = 0;
+    rb_vm_t *vm = io->closing_ec->thread_ptr->vm;
+    VALUE error = vm->special_exceptions[ruby_error_stream_closed];
+
+    struct rb_io_blocking_operation *blocking_operation;
+    ccan_list_for_each(rb_io_blocking_operations(io), blocking_operation, list) {
+        rb_execution_context_t *ec = blocking_operation->ec;
+
+        // If the operation is in progress, we need to interrupt it:
+        if (ec) {
+            rb_thread_t *thread = ec->thread_ptr;
+
+            VALUE result = RUBY_Qundef;
+            if (thread->scheduler != Qnil) {
+                result = rb_fiber_scheduler_fiber_interrupt(thread->scheduler, rb_fiberptr_self(ec->fiber_ptr), error);
+            }
+
+            if (result == RUBY_Qundef) {
+                // If the thread is not the current thread, we need to enqueue an error:
+                rb_threadptr_pending_interrupt_enque(thread, error);
+                rb_threadptr_interrupt(thread);
+            }
+        }
+
+        count += 1;
+    }
+
+    return (VALUE)count;
 }
 
-int
-rb_ec_reset_raised(rb_execution_context_t *ec)
+size_t
+rb_thread_io_close_interrupt(struct rb_io *io)
 {
-    if (!(ec->raised_flag & RAISED_EXCEPTION)) {
+    // We guard this operation based on `io->closing_ec` -> only one thread will ever enter this function.
+    if (io->closing_ec) {
         return 0;
     }
-    ec->raised_flag &= ~RAISED_EXCEPTION;
-    return 1;
-}
-
-int
-rb_notify_fd_close(int fd, struct rb_io_close_wait_list *busy)
-{
-    rb_vm_t *vm = GET_THREAD()->vm;
-    struct waiting_fd *wfd = 0, *next;
-    ccan_list_head_init(&busy->pending_fd_users);
-    int has_any;
-    VALUE wakeup_mutex;
 
-    RB_VM_LOCK_ENTER();
-    {
-        ccan_list_for_each_safe(&vm->waiting_fds, wfd, next, wfd_node) {
-            if (wfd->fd == fd) {
-                rb_thread_t *th = wfd->th;
-                VALUE err;
-
-                ccan_list_del(&wfd->wfd_node);
-                ccan_list_add(&busy->pending_fd_users, &wfd->wfd_node);
-
-                wfd->busy = busy;
-                err = th->vm->special_exceptions[ruby_error_stream_closed];
-                rb_threadptr_pending_interrupt_enque(th, err);
-                rb_threadptr_interrupt(th);
-            }
-        }
+    // If there are no blocking operations, we are done:
+    if (ccan_list_empty(rb_io_blocking_operations(io))) {
+        return 0;
     }
 
-    has_any = !ccan_list_empty(&busy->pending_fd_users);
-    busy->closing_thread = rb_thread_current();
-    wakeup_mutex = Qnil;
-    if (has_any) {
-        wakeup_mutex = rb_mutex_new();
-        RBASIC_CLEAR_CLASS(wakeup_mutex); /* hide from ObjectSpace */
-    }
-    busy->wakeup_mutex = wakeup_mutex;
+    // Otherwise, we are now closing the IO:
+    rb_execution_context_t *ec = GET_EC();
+    io->closing_ec = ec;
 
-    RB_VM_LOCK_LEAVE();
+    // This is used to ensure the correct execution context is woken up after the blocking operation is interrupted:
+    io->wakeup_mutex = rb_mutex_new();
+    rb_mutex_allow_trap(io->wakeup_mutex, 1);
 
-    /* If the caller didn't pass *busy as a pointer to something on the stack,
-       we need to guard this mutex object on _our_ C stack for the duration
-       of this function. */
-    RB_GC_GUARD(wakeup_mutex);
-    return has_any;
+    // We need to use a mutex here as entering the fiber scheduler may cause a context switch:
+    VALUE result = rb_mutex_synchronize(io->wakeup_mutex, thread_io_close_notify_all, (VALUE)io);
+
+    return (size_t)result;
 }
 
 void
-rb_notify_fd_close_wait(struct rb_io_close_wait_list *busy)
+rb_thread_io_close_wait(struct rb_io* io)
 {
-    if (!RB_TEST(busy->wakeup_mutex)) {
-        /* There was nobody else using this file when we closed it, so we
-           never bothered to allocate a mutex*/
+    VALUE wakeup_mutex = io->wakeup_mutex;
+
+    if (!RB_TEST(wakeup_mutex)) {
+        // There was nobody else using this file when we closed it, so we never bothered to allocate a mutex:
         return;
     }
 
-    rb_mutex_lock(busy->wakeup_mutex);
-    while (!ccan_list_empty(&busy->pending_fd_users)) {
-        rb_mutex_sleep(busy->wakeup_mutex, Qnil);
+    rb_mutex_lock(wakeup_mutex);
+    while (!ccan_list_empty(rb_io_blocking_operations(io))) {
+        rb_mutex_sleep(wakeup_mutex, Qnil);
     }
-    rb_mutex_unlock(busy->wakeup_mutex);
+    rb_mutex_unlock(wakeup_mutex);
+
+    // We are done closing:
+    io->wakeup_mutex = Qnil;
+    io->closing_ec = NULL;
 }
 
 void
 rb_thread_fd_close(int fd)
 {
-    struct rb_io_close_wait_list busy;
-
-    if (rb_notify_fd_close(fd, &busy)) {
-        rb_notify_fd_close_wait(&busy);
-    }
+    rb_warn("rb_thread_fd_close is deprecated (and is now a no-op).");
 }
 
 /*
@@ -3320,7 +3651,7 @@ rb_thread_setname(VALUE thread, VALUE name)
         name = rb_str_new_frozen(name);
     }
     target_th->name = name;
-    if (threadptr_initialized(target_th)) {
+    if (threadptr_initialized(target_th) && target_th->has_dedicated_nt) {
         native_set_another_thread_name(target_th->nt->thread_id, name);
     }
     return name;
@@ -3620,12 +3951,13 @@ static VALUE
 rb_thread_variable_get(VALUE thread, VALUE key)
 {
     VALUE locals;
+    VALUE symbol = rb_to_symbol(key);
 
     if (LIKELY(!THREAD_LOCAL_STORAGE_INITIALISED_P(thread))) {
         return Qnil;
     }
     locals = rb_thread_local_storage(thread);
-    return rb_hash_aref(locals, rb_to_symbol(key));
+    return rb_hash_aref(locals, symbol);
 }
 
 /*
@@ -3776,13 +4108,14 @@ static VALUE
 rb_thread_variable_p(VALUE thread, VALUE key)
 {
     VALUE locals;
+    VALUE symbol = rb_to_symbol(key);
 
     if (LIKELY(!THREAD_LOCAL_STORAGE_INITIALISED_P(thread))) {
         return Qfalse;
     }
     locals = rb_thread_local_storage(thread);
 
-    return RBOOL(rb_hash_lookup(locals, rb_to_symbol(key)) != Qnil);
+    return RBOOL(rb_hash_lookup(locals, symbol) != Qnil);
 }
 
 /*
@@ -4078,9 +4411,10 @@ rb_fd_set(int fd, rb_fdset_t *set)
 #endif
 
 static int
-wait_retryable(int *result, int errnum, rb_hrtime_t *rel, rb_hrtime_t end)
+wait_retryable(volatile int *result, int errnum, rb_hrtime_t *rel, rb_hrtime_t end)
 {
-    if (*result < 0) {
+    int r = *result;
+    if (r < 0) {
         switch (errnum) {
           case EINTR:
 #ifdef ERESTART
@@ -4094,7 +4428,7 @@ wait_retryable(int *result, int errnum, rb_hrtime_t *rel, rb_hrtime_t end)
         }
         return FALSE;
     }
-    else if (*result == 0) {
+    else if (r == 0) {
         /* check for spurious wakeup */
         if (rel) {
             return !hrtime_update_expire(rel, end);
@@ -4106,7 +4440,6 @@ wait_retryable(int *result, int errnum, rb_hrtime_t *rel, rb_hrtime_t end)
 
 struct select_set {
     int max;
-    int sigwait_fd;
     rb_thread_t *th;
     rb_fdset_t *rset;
     rb_fdset_t *wset;
@@ -4122,10 +4455,6 @@ select_set_free(VALUE p)
 {
     struct select_set *set = (struct select_set *)p;
 
-    if (set->sigwait_fd >= 0) {
-        rb_sigwait_fd_put(set->th, set->sigwait_fd);
-    }
-
     rb_fd_term(&set->orig_rset);
     rb_fd_term(&set->orig_wset);
     rb_fd_term(&set->orig_eset);
@@ -4133,33 +4462,16 @@ select_set_free(VALUE p)
     return Qfalse;
 }
 
-static const rb_hrtime_t *
-sigwait_timeout(rb_thread_t *th, int sigwait_fd, const rb_hrtime_t *orig,
-                int *drained_p)
-{
-    static const rb_hrtime_t quantum = TIME_QUANTUM_USEC * 1000;
-
-    if (sigwait_fd >= 0 && (!ubf_threads_empty() || BUSY_WAIT_SIGNALS)) {
-        *drained_p = check_signals_nogvl(th, sigwait_fd);
-        if (!orig || *orig > quantum)
-            return &quantum;
-    }
-
-    return orig;
-}
-
-#define sigwait_signals_fd(result, cond, sigwait_fd) \
-    (result > 0 && (cond) ? (result--, (sigwait_fd)) : -1)
-
 static VALUE
 do_select(VALUE p)
 {
     struct select_set *set = (struct select_set *)p;
-    int result = 0;
+    volatile int result = 0;
     int lerrno;
     rb_hrtime_t *to, rel, end = 0;
 
     timeout_prepare(&to, &rel, &end, set->timeout);
+    volatile rb_hrtime_t endtime = end;
 #define restore_fdset(dst, src) \
     ((dst) ? rb_fd_dup(dst, src) : (void)0)
 #define do_select_update() \
@@ -4169,31 +4481,23 @@ do_select(VALUE p)
      TRUE)
 
     do {
-        int drained;
         lerrno = 0;
 
         BLOCKING_REGION(set->th, {
-            const rb_hrtime_t *sto;
             struct timeval tv;
 
-            sto = sigwait_timeout(set->th, set->sigwait_fd, to, &drained);
             if (!RUBY_VM_INTERRUPTED(set->th->ec)) {
-                result = native_fd_select(set->max, set->rset, set->wset,
-                                          set->eset,
-                                          rb_hrtime2timeval(&tv, sto), set->th);
+                result = native_fd_select(set->max,
+                                          set->rset, set->wset, set->eset,
+                                          rb_hrtime2timeval(&tv, to), set->th);
                 if (result < 0) lerrno = errno;
             }
-        }, set->sigwait_fd >= 0 ? ubf_sigwait : ubf_select, set->th, TRUE);
-
-        if (set->sigwait_fd >= 0) {
-            int fd = sigwait_signals_fd(result,
-                                        rb_fd_isset(set->sigwait_fd, set->rset),
-                                        set->sigwait_fd);
-            (void)check_signals_nogvl(set->th, fd);
-        }
+        }, ubf_select, set->th, TRUE);
 
         RUBY_VM_CHECK_INTS_BLOCKING(set->th->ec); /* may raise */
-    } while (wait_retryable(&result, lerrno, to, end) && do_select_update());
+    } while (wait_retryable(&result, lerrno, to, endtime) && do_select_update());
+
+    RUBY_VM_CHECK_INTS_BLOCKING(set->th->ec);
 
     if (result < 0) {
         errno = lerrno;
@@ -4202,18 +4506,6 @@ do_select(VALUE p)
     return (VALUE)result;
 }
 
-static rb_fdset_t *
-init_set_fd(int fd, rb_fdset_t *fds)
-{
-    if (fd < 0) {
-        return 0;
-    }
-    rb_fd_init(fds);
-    rb_fd_set(fd, fds);
-
-    return fds;
-}
-
 int
 rb_thread_fd_select(int max, rb_fdset_t * read, rb_fdset_t * write, rb_fdset_t * except,
                     struct timeval *timeout)
@@ -4237,16 +4529,6 @@ rb_thread_fd_select(int max, rb_fdset_t * read, rb_fdset_t * write, rb_fdset_t *
         return 0;
     }
 
-    set.sigwait_fd = rb_sigwait_fd_get(set.th);
-    if (set.sigwait_fd >= 0) {
-        if (set.rset)
-            rb_fd_set(set.sigwait_fd, set.rset);
-        else
-            set.rset = init_set_fd(set.sigwait_fd, &set.orig_rset);
-        if (set.sigwait_fd >= set.max) {
-            set.max = set.sigwait_fd + 1;
-        }
-    }
 #define fd_init_copy(f) do { \
         if (set.f) { \
             rb_fd_resize(set.max - 1, set.f); \
@@ -4277,79 +4559,79 @@ rb_thread_fd_select(int max, rb_fdset_t * read, rb_fdset_t * write, rb_fdset_t *
 #  define POLLERR_SET (0)
 #endif
 
+static int
+wait_for_single_fd_blocking_region(rb_thread_t *th, struct pollfd *fds, nfds_t nfds,
+                                   rb_hrtime_t *const to, volatile int *lerrno)
+{
+    struct timespec ts;
+    volatile int result = 0;
+
+    *lerrno = 0;
+    BLOCKING_REGION(th, {
+        if (!RUBY_VM_INTERRUPTED(th->ec)) {
+            result = ppoll(fds, nfds, rb_hrtime2timespec(&ts, to), 0);
+            if (result < 0) *lerrno = errno;
+        }
+    }, ubf_select, th, TRUE);
+    return result;
+}
+
 /*
  * returns a mask of events
  */
-int
-rb_thread_wait_for_single_fd(int fd, int events, struct timeval *timeout)
+static int
+thread_io_wait(struct rb_io *io, int fd, int events, struct timeval *timeout)
 {
-    struct pollfd fds[2];
-    int result = 0;
-    int drained;
+    struct pollfd fds[1] = {{
+        .fd = fd,
+        .events = (short)events,
+        .revents = 0,
+    }};
+    volatile int result = 0;
     nfds_t nfds;
-    rb_unblock_function_t *ubf;
-    struct waiting_fd wfd;
-    int state;
+    struct rb_io_blocking_operation blocking_operation;
+    enum ruby_tag_type state;
     volatile int lerrno;
 
-    wfd.th = GET_THREAD();
-    wfd.fd = fd;
-    wfd.busy = NULL;
+    rb_execution_context_t *ec = GET_EC();
+    rb_thread_t *th = rb_ec_thread_ptr(ec);
 
-    RB_VM_LOCK_ENTER();
-    {
-        ccan_list_add(&wfd.th->vm->waiting_fds, &wfd.wfd_node);
+    if (io) {
+        blocking_operation.ec = ec;
+        rb_io_blocking_operation_enter(io, &blocking_operation);
     }
-    RB_VM_LOCK_LEAVE();
 
-    EC_PUSH_TAG(wfd.th->ec);
-    if ((state = EC_EXEC_TAG()) == TAG_NONE) {
-        rb_hrtime_t *to, rel, end = 0;
-        RUBY_VM_CHECK_INTS_BLOCKING(wfd.th->ec);
-        timeout_prepare(&to, &rel, &end, timeout);
-        fds[0].fd = fd;
-        fds[0].events = (short)events;
-        fds[0].revents = 0;
-        do {
-            fds[1].fd = rb_sigwait_fd_get(wfd.th);
-
-            if (fds[1].fd >= 0) {
-                fds[1].events = POLLIN;
-                fds[1].revents = 0;
-                nfds = 2;
-                ubf = ubf_sigwait;
-            }
-            else {
-                nfds = 1;
-                ubf = ubf_select;
-            }
+    if (timeout == NULL && thread_io_wait_events(th, fd, events, NULL)) {
+        // fd is readable
+        state = 0;
+        fds[0].revents = events;
+        errno = 0;
+    }
+    else {
+        EC_PUSH_TAG(ec);
+        if ((state = EC_EXEC_TAG()) == TAG_NONE) {
+            rb_hrtime_t *to, rel, end = 0;
+            RUBY_VM_CHECK_INTS_BLOCKING(ec);
+            timeout_prepare(&to, &rel, &end, timeout);
+            do {
+                nfds = numberof(fds);
+                result = wait_for_single_fd_blocking_region(th, fds, nfds, to, &lerrno);
 
-            lerrno = 0;
-            BLOCKING_REGION(wfd.th, {
-                const rb_hrtime_t *sto;
-                struct timespec ts;
+                RUBY_VM_CHECK_INTS_BLOCKING(ec);
+            } while (wait_retryable(&result, lerrno, to, end));
 
-                sto = sigwait_timeout(wfd.th, fds[1].fd, to, &drained);
-                if (!RUBY_VM_INTERRUPTED(wfd.th->ec)) {
-                    result = ppoll(fds, nfds, rb_hrtime2timespec(&ts, sto), 0);
-                    if (result < 0) lerrno = errno;
-                }
-            }, ubf, wfd.th, TRUE);
+            RUBY_VM_CHECK_INTS_BLOCKING(ec);
+        }
 
-            if (fds[1].fd >= 0) {
-                int fd1 = sigwait_signals_fd(result, fds[1].revents, fds[1].fd);
-                (void)check_signals_nogvl(wfd.th, fd1);
-                rb_sigwait_fd_put(wfd.th, fds[1].fd);
-            }
-            RUBY_VM_CHECK_INTS_BLOCKING(wfd.th->ec);
-        } while (wait_retryable(&result, lerrno, to, end));
+        EC_POP_TAG();
     }
-    EC_POP_TAG();
 
-    rb_thread_io_wake_pending_closer(&wfd);
+    if (io) {
+        rb_io_blocking_operation_exit(io, &blocking_operation);
+    }
 
     if (state) {
-        EC_JUMP_TAG(wfd.th->ec, state);
+        EC_JUMP_TAG(ec, state);
     }
 
     if (result < 0) {
@@ -4382,6 +4664,9 @@ rb_thread_wait_for_single_fd(int fd, int events, struct timeval *timeout)
 }
 #else /* ! USE_POLL - implement rb_io_poll_fd() using select() */
 struct select_args {
+    struct rb_io *io;
+    struct rb_io_blocking_operation *blocking_operation;
+
     union {
         int fd;
         int error;
@@ -4389,7 +4674,6 @@ struct select_args {
     rb_fdset_t *read;
     rb_fdset_t *write;
     rb_fdset_t *except;
-    struct waiting_fd wfd;
     struct timeval *tv;
 };
 
@@ -4420,7 +4704,10 @@ select_single_cleanup(VALUE ptr)
 {
     struct select_args *args = (struct select_args *)ptr;
 
-    rb_thread_io_wake_pending_closer(&args->wfd);
+    if (args->blocking_operation) {
+        rb_io_blocking_operation_exit(args->io, args->blocking_operation);
+    }
+
     if (args->read) rb_fd_term(args->read);
     if (args->write) rb_fd_term(args->write);
     if (args->except) rb_fd_term(args->except);
@@ -4428,37 +4715,64 @@ select_single_cleanup(VALUE ptr)
     return (VALUE)-1;
 }
 
-int
-rb_thread_wait_for_single_fd(int fd, int events, struct timeval *timeout)
+static rb_fdset_t *
+init_set_fd(int fd, rb_fdset_t *fds)
+{
+    if (fd < 0) {
+        return 0;
+    }
+    rb_fd_init(fds);
+    rb_fd_set(fd, fds);
+
+    return fds;
+}
+
+static int
+thread_io_wait(struct rb_io *io, int fd, int events, struct timeval *timeout)
 {
     rb_fdset_t rfds, wfds, efds;
     struct select_args args;
-    int r;
     VALUE ptr = (VALUE)&args;
 
+    struct rb_io_blocking_operation blocking_operation;
+    if (io) {
+        args.io = io;
+        blocking_operation.ec = GET_EC();
+        rb_io_blocking_operation_enter(io, &blocking_operation);
+        args.blocking_operation = &blocking_operation;
+    }
+    else {
+        args.io = NULL;
+        blocking_operation.ec = NULL;
+        args.blocking_operation = NULL;
+    }
+
     args.as.fd = fd;
     args.read = (events & RB_WAITFD_IN) ? init_set_fd(fd, &rfds) : NULL;
     args.write = (events & RB_WAITFD_OUT) ? init_set_fd(fd, &wfds) : NULL;
     args.except = (events & RB_WAITFD_PRI) ? init_set_fd(fd, &efds) : NULL;
     args.tv = timeout;
-    args.wfd.fd = fd;
-    args.wfd.th = GET_THREAD();
-    args.wfd.busy = NULL;
-
-    RB_VM_LOCK_ENTER();
-    {
-        ccan_list_add(&args.wfd.th->vm->waiting_fds, &args.wfd.wfd_node);
-    }
-    RB_VM_LOCK_LEAVE();
 
-    r = (int)rb_ensure(select_single, ptr, select_single_cleanup, ptr);
-    if (r == -1)
+    int result = (int)rb_ensure(select_single, ptr, select_single_cleanup, ptr);
+    if (result == -1)
         errno = args.as.error;
 
-    return r;
+    return result;
 }
 #endif /* ! USE_POLL */
 
+int
+rb_thread_wait_for_single_fd(int fd, int events, struct timeval *timeout)
+{
+    return thread_io_wait(NULL, fd, events, timeout);
+}
+
+int
+rb_thread_io_wait(struct rb_io *io, int events, struct timeval * timeout)
+{
+    return thread_io_wait(io, io->fd, events, timeout);
+}
+
 /*
  * for GC
  */
@@ -4468,7 +4782,12 @@ void
 rb_gc_set_stack_end(VALUE **stack_end_p)
 {
     VALUE stack_end;
+COMPILER_WARNING_PUSH
+#if RBIMPL_COMPILER_IS(GCC)
+COMPILER_WARNING_IGNORED(-Wdangling-pointer);
+#endif
     *stack_end_p = &stack_end;
+COMPILER_WARNING_POP
 }
 #endif
 
@@ -4510,16 +4829,13 @@ consume_communication_pipe(int fd)
     ssize_t result;
     int ret = FALSE; /* for rb_sigwait_sleep */
 
-    /*
-     * disarm UBF_TIMER before we read, because it can become
-     * re-armed at any time via sighandler and the pipe will refill
-     * We can disarm it because this thread is now processing signals
-     * and we do not want unnecessary SIGVTALRM
-     */
-    ubf_timer_disarm();
-
     while (1) {
         result = read(fd, buff, sizeof(buff));
+#if USE_EVENTFD
+        RUBY_DEBUG_LOG("resultf:%d buff:%lu", (int)result, (unsigned long)buff[0]);
+#else
+        RUBY_DEBUG_LOG("result:%d", (int)result);
+#endif
         if (result > 0) {
             ret = TRUE;
             if (USE_EVENTFD || result < (ssize_t)sizeof(buff)) {
@@ -4546,24 +4862,6 @@ consume_communication_pipe(int fd)
     }
 }
 
-static int
-check_signals_nogvl(rb_thread_t *th, int sigwait_fd)
-{
-    rb_vm_t *vm = GET_VM(); /* th may be 0 */
-    int ret = sigwait_fd >= 0 ? consume_communication_pipe(sigwait_fd) : FALSE;
-    ubf_wakeup_all_threads();
-    if (rb_signal_buff_size()) {
-        if (th == vm->ractor.main_thread) {
-            /* no need to lock + wakeup if already in main thread */
-            RUBY_VM_SET_TRAP_INTERRUPT(th->ec);
-        }
-        else {
-            threadptr_trap_interrupt(vm->ractor.main_thread);
-        }
-    }
-    return ret;
-}
-
 void
 rb_thread_stop_timer_thread(void)
 {
@@ -4639,9 +4937,13 @@ rb_thread_atfork_internal(rb_thread_t *th, void (*atfork)(rb_thread_t *, const r
 
     thread_sched_atfork(TH_SCHED(th));
     ubf_list_atfork();
+    rb_signal_atfork();
 
     // OK. Only this thread accesses:
     ccan_list_for_each(&vm->ractor.set, r, vmlr_node) {
+        if (r != vm->ractor.main_ractor) {
+            rb_ractor_terminate_atfork(vm, r);
+        }
         ccan_list_for_each(&r->threads.set, i, lt_node) {
             atfork(i, th);
         }
@@ -4649,17 +4951,20 @@ rb_thread_atfork_internal(rb_thread_t *th, void (*atfork)(rb_thread_t *, const r
     rb_vm_living_threads_init(vm);
 
     rb_ractor_atfork(vm, th);
-
-    /* may be held by RJIT threads in parent */
-    rb_native_mutex_initialize(&vm->workqueue_lock);
+    rb_vm_postponed_job_atfork();
 
     /* may be held by any thread in parent */
     rb_native_mutex_initialize(&th->interrupt_lock);
+    ccan_list_head_init(&th->interrupt_exec_tasks);
 
     vm->fork_gen++;
     rb_ractor_sleeper_threads_clear(th->ractor);
     rb_clear_coverages();
 
+    // restart timer thread (timer threads access to `vm->waitpid_lock` and so on.
+    rb_thread_reset_timer_thread();
+    rb_thread_start_timer_thread();
+
     VM_ASSERT(vm->ractor.blocking_cnt == 0);
     VM_ASSERT(vm->ractor.cnt == 1);
 }
@@ -4668,6 +4973,7 @@ static void
 terminate_atfork_i(rb_thread_t *th, const rb_thread_t *current_th)
 {
     if (th != current_th) {
+        rb_native_mutex_initialize(&th->interrupt_lock);
         rb_mutex_abandon_keeping_mutexes(th);
         rb_mutex_abandon_locking_mutex(th);
         thread_cleanup_func(th, TRUE);
@@ -4679,6 +4985,7 @@ void
 rb_thread_atfork(void)
 {
     rb_thread_t *th = GET_THREAD();
+    rb_threadptr_pending_interrupt_clear(th);
     rb_thread_atfork_internal(th, terminate_atfork_i);
     th->join_list = NULL;
     rb_fiber_atfork(th);
@@ -4717,16 +5024,14 @@ struct thgroup {
     int enclosed;
 };
 
-static size_t
-thgroup_memsize(const void *ptr)
-{
-    return sizeof(struct thgroup);
-}
-
 static const rb_data_type_t thgroup_data_type = {
     "thgroup",
-    {0, RUBY_TYPED_DEFAULT_FREE, thgroup_memsize,},
-    0, 0, RUBY_TYPED_FREE_IMMEDIATELY
+    {
+        0,
+        RUBY_TYPED_DEFAULT_FREE,
+        NULL, // No external memory to report
+    },
+    0, 0, RUBY_TYPED_FREE_IMMEDIATELY | RUBY_TYPED_WB_PROTECTED | RUBY_TYPED_EMBEDDABLE
 };
 
 /*
@@ -5054,12 +5359,12 @@ recursive_list_access(VALUE sym)
 }
 
 /*
- * Returns Qtrue if and only if obj (or the pair <obj, paired_obj>) is already
+ * Returns true if and only if obj (or the pair <obj, paired_obj>) is already
  * in the recursion list.
  * Assumes the recursion list is valid.
  */
 
-static VALUE
+static bool
 recursive_check(VALUE list, VALUE obj, VALUE paired_obj_id)
 {
 #if SIZEOF_LONG == SIZEOF_VOIDP
@@ -5071,18 +5376,18 @@ recursive_check(VALUE list, VALUE obj, VALUE paired_obj_id)
 
     VALUE pair_list = rb_hash_lookup2(list, obj, Qundef);
     if (UNDEF_P(pair_list))
-        return Qfalse;
+        return false;
     if (paired_obj_id) {
         if (!RB_TYPE_P(pair_list, T_HASH)) {
             if (!OBJ_ID_EQL(paired_obj_id, pair_list))
-                return Qfalse;
+                return false;
         }
         else {
             if (NIL_P(rb_hash_lookup(pair_list, paired_obj_id)))
-                return Qfalse;
+                return false;
         }
     }
-    return Qtrue;
+    return true;
 }
 
 /*
@@ -5162,7 +5467,7 @@ exec_recursive_i(RB_BLOCK_CALL_FUNC_ARGLIST(tag, data))
  * Calls func(obj, arg, recursive), where recursive is non-zero if the
  * current method is called recursively on obj, or on the pair <obj, pairid>
  * If outer is 0, then the innermost func will be called with recursive set
- * to Qtrue, otherwise the outermost func will be called. In the latter case,
+ * to true, otherwise the outermost func will be called. In the latter case,
  * all inner func are short-circuited by throw.
  * Implementation details: the value thrown is the recursive list which is
  * proper to the current method and unlikely to be caught anywhere else.
@@ -5253,7 +5558,7 @@ rb_exec_recursive_paired(VALUE (*func) (VALUE, VALUE, int), VALUE obj, VALUE pai
 
 /*
  * If recursion is detected on the current method and obj, the outermost
- * func will be called with (obj, arg, Qtrue). All inner func will be
+ * func will be called with (obj, arg, true). All inner func will be
  * short-circuited using throw.
  */
 
@@ -5271,7 +5576,7 @@ rb_exec_recursive_outer_mid(VALUE (*func) (VALUE, VALUE, int), VALUE obj, VALUE
 
 /*
  * If recursion is detected on the current method, obj and paired_obj,
- * the outermost func will be called with (obj, arg, Qtrue). All inner
+ * the outermost func will be called with (obj, arg, true). All inner
  * func will be short-circuited using throw.
  */
 
@@ -5339,7 +5644,6 @@ Init_Thread_Mutex(void)
 void
 Init_Thread(void)
 {
-    VALUE cThGroup;
     rb_thread_t *th = GET_THREAD();
 
     sym_never = ID2SYM(rb_intern_const("never"));
@@ -5413,6 +5717,18 @@ Init_Thread(void)
     rb_define_method(cThGroup, "enclosed?", thgroup_enclosed_p, 0);
     rb_define_method(cThGroup, "add", thgroup_add, 1);
 
+    const char * ptr = getenv("RUBY_THREAD_TIMESLICE");
+
+    if (ptr) {
+        long quantum = strtol(ptr, NULL, 0);
+        if (quantum > 0 && !(SIZEOF_LONG > 4 && quantum > UINT32_MAX)) {
+            thread_default_quantum_ms = (uint32_t)quantum;
+        }
+        else if (0) {
+            fprintf(stderr, "Ignored RUBY_THREAD_TIMESLICE=%s\n", ptr);
+        }
+    }
+
     {
         th->thgroup = th->ractor->thgroup_default = rb_obj_alloc(cThGroup);
         rb_define_const(cThGroup, "Default", th->thgroup);
@@ -5425,8 +5741,12 @@ Init_Thread(void)
         /* main thread setting */
         {
             /* acquire global vm lock */
-            struct rb_thread_sched *sched = TH_SCHED(th);
-            thread_sched_to_running(sched, th);
+#ifdef HAVE_PTHREAD_NP_H
+            VM_ASSERT(TH_SCHED(th)->running == th);
+#endif
+            // thread_sched_to_running() should not be called because
+            // it assumes blocked by thread_sched_to_waiting().
+            // thread_sched_to_running(sched, th);
 
             th->pending_interrupt_queue = rb_ary_hidden_new(0);
             th->pending_interrupt_queue_checked = 0;
@@ -5439,7 +5759,7 @@ Init_Thread(void)
     Init_thread_sync();
 
     // TODO: Suppress unused function warning for now
-    if (0) rb_thread_sched_destroy(NULL);
+    // if (0) rb_thread_sched_destroy(NULL);
 }
 
 int
@@ -5469,7 +5789,7 @@ debug_deadlock_check(rb_ractor_t *r, VALUE msg)
     ccan_list_for_each(&r->threads.set, th, lt_node) {
         rb_str_catf(msg, "* %+"PRIsVALUE"\n   rb_thread_t:%p "
                     "native:%p int:%u",
-                    th->self, (void *)th, thread_id_str(th), th->ec->interrupt_flag);
+                    th->self, (void *)th, th->nt ? thread_id_str(th) : "N/A", th->ec->interrupt_flag);
 
         if (th->locking_mutex) {
             rb_mutex_t *mutex = mutex_ptr(th->locking_mutex);
@@ -5485,7 +5805,7 @@ debug_deadlock_check(rb_ractor_t *r, VALUE msg)
             }
         }
         rb_str_catf(msg, "\n   ");
-        rb_str_concat(msg, rb_ary_join(rb_ec_backtrace_str_ary(th->ec, 0, 0), sep));
+        rb_str_concat(msg, rb_ary_join(rb_ec_backtrace_str_ary(th->ec, RUBY_BACKTRACE_START, RUBY_ALL_BACKTRACE_LINES), sep));
         rb_str_catf(msg, "\n");
     }
 }
@@ -5495,14 +5815,18 @@ rb_check_deadlock(rb_ractor_t *r)
 {
     if (GET_THREAD()->vm->thread_ignore_deadlock) return;
 
-    int found = 0;
-    rb_thread_t *th = NULL;
+#ifdef RUBY_THREAD_PTHREAD_H
+    if (r->threads.sched.readyq_cnt > 0) return;
+#endif
+
     int sleeper_num = rb_ractor_sleeper_thread_num(r);
     int ltnum = rb_ractor_living_thread_num(r);
 
     if (ltnum > sleeper_num) return;
     if (ltnum < sleeper_num) rb_bug("sleeper must not be more than vm_living_thread_num(vm)");
-    if (patrol_thread && patrol_thread != GET_THREAD()) return;
+
+    int found = 0;
+    rb_thread_t *th = NULL;
 
     ccan_list_for_each(&r->threads.set, th, lt_node) {
         if (th->status != THREAD_STOPPED_FOREVER || RUBY_VM_INTERRUPTED(th->ec)) {
@@ -5528,21 +5852,6 @@ rb_check_deadlock(rb_ractor_t *r)
     }
 }
 
-// Used for VM memsize reporting. Returns the size of a list of waiting_fd
-// structs. Defined here because the struct definition lives here as well.
-size_t
-rb_vm_memsize_waiting_fds(struct ccan_list_head *waiting_fds)
-{
-    struct waiting_fd *waitfd = 0;
-    size_t size = 0;
-
-    ccan_list_for_each(waiting_fds, waitfd, wfd_node) {
-        size += sizeof(struct waiting_fd);
-    }
-
-    return size;
-}
-
 static void
 update_line_coverage(VALUE data, const rb_trace_arg_t *trace_arg)
 {
@@ -5552,6 +5861,7 @@ update_line_coverage(VALUE data, const rb_trace_arg_t *trace_arg)
         VALUE lines = RARRAY_AREF(coverage, COVERAGE_INDEX_LINES);
         if (lines) {
             long line = rb_sourceline() - 1;
+            VM_ASSERT(line >= 0);
             long count;
             VALUE num;
             void rb_iseq_clear_event_flags(const rb_iseq_t *iseq, size_t pos, rb_event_flag_t reset);
@@ -5793,7 +6103,7 @@ rb_uninterruptible(VALUE (*b_proc)(VALUE), VALUE data)
     rb_thread_t *cur_th = GET_THREAD();
 
     rb_hash_aset(interrupt_mask, rb_cObject, sym_never);
-    OBJ_FREEZE_RAW(interrupt_mask);
+    OBJ_FREEZE(interrupt_mask);
     rb_ary_push(cur_th->pending_interrupt_mask_stack, interrupt_mask);
 
     VALUE ret = rb_ensure(b_proc, data, uninterruptible_exit, Qnil);
@@ -5801,3 +6111,165 @@ rb_uninterruptible(VALUE (*b_proc)(VALUE), VALUE data)
     RUBY_VM_CHECK_INTS(cur_th->ec);
     return ret;
 }
+
+static void
+thread_specific_storage_alloc(rb_thread_t *th)
+{
+    VM_ASSERT(th->specific_storage == NULL);
+
+    if (UNLIKELY(specific_key_count > 0)) {
+        th->specific_storage = ZALLOC_N(void *, RB_INTERNAL_THREAD_SPECIFIC_KEY_MAX);
+    }
+}
+
+rb_internal_thread_specific_key_t
+rb_internal_thread_specific_key_create(void)
+{
+    rb_vm_t *vm = GET_VM();
+
+    if (specific_key_count == 0 && vm->ractor.cnt > 1) {
+        rb_raise(rb_eThreadError, "The first rb_internal_thread_specific_key_create() is called with multiple ractors");
+    }
+    else if (specific_key_count > RB_INTERNAL_THREAD_SPECIFIC_KEY_MAX) {
+        rb_raise(rb_eThreadError, "rb_internal_thread_specific_key_create() is called more than %d times", RB_INTERNAL_THREAD_SPECIFIC_KEY_MAX);
+    }
+    else {
+        rb_internal_thread_specific_key_t key = specific_key_count++;
+
+        if (key == 0) {
+            // allocate
+            rb_ractor_t *cr = GET_RACTOR();
+            rb_thread_t *th;
+
+            ccan_list_for_each(&cr->threads.set, th, lt_node) {
+                thread_specific_storage_alloc(th);
+            }
+        }
+        return key;
+    }
+}
+
+// async and native thread safe.
+void *
+rb_internal_thread_specific_get(VALUE thread_val, rb_internal_thread_specific_key_t key)
+{
+    rb_thread_t *th = DATA_PTR(thread_val);
+
+    VM_ASSERT(rb_thread_ptr(thread_val) == th);
+    VM_ASSERT(key < RB_INTERNAL_THREAD_SPECIFIC_KEY_MAX);
+    VM_ASSERT(th->specific_storage);
+
+    return th->specific_storage[key];
+}
+
+// async and native thread safe.
+void
+rb_internal_thread_specific_set(VALUE thread_val, rb_internal_thread_specific_key_t key, void *data)
+{
+    rb_thread_t *th = DATA_PTR(thread_val);
+
+    VM_ASSERT(rb_thread_ptr(thread_val) == th);
+    VM_ASSERT(key < RB_INTERNAL_THREAD_SPECIFIC_KEY_MAX);
+    VM_ASSERT(th->specific_storage);
+
+    th->specific_storage[key] = data;
+}
+
+// interrupt_exec
+
+struct rb_interrupt_exec_task {
+    struct ccan_list_node node;
+
+    rb_interrupt_exec_func_t *func;
+    void *data;
+    enum rb_interrupt_exec_flag flags;
+};
+
+void
+rb_threadptr_interrupt_exec_task_mark(rb_thread_t *th)
+{
+    struct rb_interrupt_exec_task *task;
+
+    ccan_list_for_each(&th->interrupt_exec_tasks, task, node) {
+        if (task->flags & rb_interrupt_exec_flag_value_data) {
+            rb_gc_mark((VALUE)task->data);
+        }
+    }
+}
+
+// native thread safe
+// th should be available
+void
+rb_threadptr_interrupt_exec(rb_thread_t *th, rb_interrupt_exec_func_t *func, void *data, enum rb_interrupt_exec_flag flags)
+{
+    // should not use ALLOC
+    struct rb_interrupt_exec_task *task = ALLOC(struct rb_interrupt_exec_task);
+    *task = (struct rb_interrupt_exec_task) {
+        .flags = flags,
+        .func = func,
+        .data = data,
+    };
+
+    rb_native_mutex_lock(&th->interrupt_lock);
+    {
+        ccan_list_add_tail(&th->interrupt_exec_tasks, &task->node);
+        threadptr_set_interrupt_locked(th, true);
+    }
+    rb_native_mutex_unlock(&th->interrupt_lock);
+}
+
+static void
+threadptr_interrupt_exec_exec(rb_thread_t *th)
+{
+    while (1) {
+        struct rb_interrupt_exec_task *task;
+
+        rb_native_mutex_lock(&th->interrupt_lock);
+        {
+            task = ccan_list_pop(&th->interrupt_exec_tasks, struct rb_interrupt_exec_task, node);
+        }
+        rb_native_mutex_unlock(&th->interrupt_lock);
+
+        RUBY_DEBUG_LOG("task:%p", task);
+
+        if (task) {
+            if (task->flags & rb_interrupt_exec_flag_new_thread) {
+                rb_thread_create(task->func, task->data);
+            }
+            else {
+                (*task->func)(task->data);
+            }
+            ruby_xfree(task);
+        }
+        else {
+            break;
+        }
+    }
+}
+
+static void
+threadptr_interrupt_exec_cleanup(rb_thread_t *th)
+{
+    rb_native_mutex_lock(&th->interrupt_lock);
+    {
+        struct rb_interrupt_exec_task *task;
+
+        while ((task = ccan_list_pop(&th->interrupt_exec_tasks, struct rb_interrupt_exec_task, node)) != NULL) {
+            ruby_xfree(task);
+        }
+    }
+    rb_native_mutex_unlock(&th->interrupt_lock);
+}
+
+// native thread safe
+// func/data should be native thread safe
+void
+rb_ractor_interrupt_exec(struct rb_ractor_struct *target_r,
+                         rb_interrupt_exec_func_t *func, void *data, enum rb_interrupt_exec_flag flags)
+{
+    RUBY_DEBUG_LOG("flags:%d", (int)flags);
+
+    rb_thread_t *main_th = target_r->threads.main;
+    rb_threadptr_interrupt_exec(main_th, func, data, flags | rb_interrupt_exec_flag_new_thread);
+}
+
diff --git a/thread_none.c b/thread_none.c
index 27c6ddf754a18c..38686e17c1c339 100644
--- a/thread_none.c
+++ b/thread_none.c
@@ -19,10 +19,6 @@
 # include "wasm/machine.h"
 #endif
 
-#define TIME_QUANTUM_MSEC (100)
-#define TIME_QUANTUM_USEC (TIME_QUANTUM_MSEC * 1000)
-#define TIME_QUANTUM_NSEC (TIME_QUANTUM_USEC * 1000)
-
 // Do nothing for GVL
 static void
 thread_sched_to_running(struct rb_thread_sched *sched, rb_thread_t *th)
@@ -42,14 +38,16 @@ thread_sched_yield(struct rb_thread_sched *sched, rb_thread_t *th)
 }
 
 void
-rb_thread_sched_init(struct rb_thread_sched *sched)
+rb_thread_sched_init(struct rb_thread_sched *sched, bool atfork)
 {
 }
 
+#if 0
 static void
 rb_thread_sched_destroy(struct rb_thread_sched *sched)
 {
 }
+#endif
 
 // Do nothing for mutex guard
 void
@@ -134,18 +132,19 @@ Init_native_thread(rb_thread_t *main_th)
     ruby_thread_set_native(main_th);
 }
 
-static void
-native_thread_destroy(rb_thread_t *th)
+void
+ruby_mn_threads_params(void)
 {
 }
 
-void
-ruby_init_stack(volatile VALUE *addr)
+static void
+native_thread_destroy_atfork(struct rb_native_thread *nt)
 {
+    /* no-op */
 }
 
 static int
-native_thread_init_stack(rb_thread_t *th)
+native_thread_init_stack(rb_thread_t *th, void *local_in_parent_frame)
 {
 #if defined(__wasm__) && !defined(__EMSCRIPTEN__)
     th->ec->machine.stack_start = (VALUE *)rb_wasm_stack_get_base();
@@ -276,9 +275,64 @@ native_fd_select(int n, rb_fdset_t *readfds, rb_fdset_t *writefds, rb_fdset_t *e
     return rb_fd_select(n, readfds, writefds, exceptfds, timeout);
 }
 
-static VALUE
-rb_thread_start_unblock_thread(void)
+static bool
+th_has_dedicated_nt(const rb_thread_t *th)
 {
-    return Qfalse;
+    return true;
 }
+
+void
+rb_add_running_thread(rb_thread_t *th)
+{
+    // do nothing
+}
+
+void
+rb_del_running_thread(rb_thread_t *th)
+{
+    // do nothing
+}
+
+void
+rb_threadptr_sched_free(rb_thread_t *th)
+{
+    // do nothing
+}
+
+void
+rb_ractor_sched_barrier_start(rb_vm_t *vm, rb_ractor_t *cr)
+{
+    // do nothing
+}
+
+void
+rb_ractor_sched_barrier_join(rb_vm_t *vm, rb_ractor_t *cr)
+{
+    // do nothing
+}
+
+void
+rb_threadptr_remove(rb_thread_t *th)
+{
+    // do nothing
+}
+
+void
+rb_thread_sched_mark_zombies(rb_vm_t *vm)
+{
+    // do nothing
+}
+
+bool
+rb_thread_lock_native_thread(void)
+{
+    return false;
+}
+
+void *
+rb_thread_prevent_fork(void *(*func)(void *), void *data)
+{
+    return func(data);
+}
+
 #endif /* THREAD_SYSTEM_DEPENDENT_IMPLEMENTATION */
diff --git a/thread_none.h b/thread_none.h
index 89f64667f0c158..ac47e52bdaeba6 100644
--- a/thread_none.h
+++ b/thread_none.h
@@ -16,5 +16,6 @@ struct rb_thread_sched_item {};
 struct rb_thread_sched {};
 
 RUBY_EXTERN struct rb_execution_context_struct *ruby_current_ec;
+NOINLINE(struct rb_execution_context_struct *rb_current_ec_noinline(void)); // for assertions
 
 #endif /* RUBY_THREAD_NONE_H */
diff --git a/thread_pthread.c b/thread_pthread.c
index 057c50c1248a50..377e1d9f64a4c5 100644
--- a/thread_pthread.c
+++ b/thread_pthread.c
@@ -12,7 +12,7 @@
 #ifdef THREAD_SYSTEM_DEPENDENT_IMPLEMENTATION
 
 #include "internal/gc.h"
-#include "rjit.h"
+#include "internal/sanitizers.h"
 
 #ifdef HAVE_SYS_RESOURCE_H
 #include <sys/resource.h>
@@ -60,6 +60,36 @@ static pthread_condattr_t *condattr_monotonic = &condattr_mono;
 static const void *const condattr_monotonic = NULL;
 #endif
 
+#include COROUTINE_H
+
+#ifndef HAVE_SYS_EVENT_H
+#define HAVE_SYS_EVENT_H 0
+#endif
+
+#ifndef HAVE_SYS_EPOLL_H
+#define HAVE_SYS_EPOLL_H 0
+#else
+// force setting for debug
+// #undef HAVE_SYS_EPOLL_H
+// #define HAVE_SYS_EPOLL_H 0
+#endif
+
+#ifndef USE_MN_THREADS
+  #if defined(__EMSCRIPTEN__) || defined(COROUTINE_PTHREAD_CONTEXT)
+    // on __EMSCRIPTEN__ provides epoll* declarations, but no implementations.
+    // on COROUTINE_PTHREAD_CONTEXT, it doesn't worth to use it.
+    #define USE_MN_THREADS 0
+  #elif HAVE_SYS_EPOLL_H
+    #include <sys/epoll.h>
+    #define USE_MN_THREADS 1
+  #elif HAVE_SYS_EVENT_H
+    #include <sys/event.h>
+    #define USE_MN_THREADS 1
+  #else
+    #define USE_MN_THREADS 0
+  #endif
+#endif
+
 // native thread wrappers
 
 #define NATIVE_MUTEX_LOCK_DEBUG 0
@@ -242,149 +272,43 @@ rb_native_cond_timedwait(rb_nativethread_cond_t *cond, pthread_mutex_t *mutex, u
 // thread scheduling
 
 static rb_internal_thread_event_hook_t *rb_internal_thread_event_hooks = NULL;
-static void rb_thread_execute_hooks(rb_event_flag_t event);
-#define RB_INTERNAL_THREAD_HOOK(event) if (rb_internal_thread_event_hooks) { rb_thread_execute_hooks(event); }
-
-static rb_serial_t current_fork_gen = 1; /* We can't use GET_VM()->fork_gen */
-
-#if defined(SIGVTALRM) && !defined(__CYGWIN__) && !defined(__EMSCRIPTEN__)
-#  define USE_UBF_LIST 1
-#endif
-
-/*
- * UBF_TIMER and ubf_list both use SIGVTALRM.
- *
- * UBF_TIMER has NOTHING to do with thread timeslices (TIMER_INTERRUPT_MASK)
- *
- * UBF_TIMER is to close TOCTTOU signal race on programs where we
- * cannot rely on GVL contention (vm->gvl.timer) to perform wakeups
- * while a thread is doing blocking I/O on sockets or pipes.  With
- * rb_thread_call_without_gvl and similar functions:
- *
- * (1) Check interrupts.
- * (2) release GVL.
- * (2a) signal received
- * (3) call func with data1 (blocks for a long time without ubf_timer)
- * (4) acquire GVL.
- *     Other Ruby threads can not run in parallel any more.
- * (5) Check interrupts.
- *
- * We need UBF_TIMER to break out of (3) if (2a) happens.
- *
- * ubf_list wakeups may be triggered on gvl_yield.
- *
- * If we have vm->gvl.timer (on GVL contention), we don't need UBF_TIMER
- * as it can perform the same tasks while doing timeslices.
- */
-#define UBF_TIMER_NONE 0
-#define UBF_TIMER_POSIX 1
-#define UBF_TIMER_PTHREAD 2
-
-#ifndef UBF_TIMER
-#  if defined(HAVE_TIMER_SETTIME) && defined(HAVE_TIMER_CREATE) && \
-      defined(CLOCK_MONOTONIC) && defined(USE_UBF_LIST)
-     /* preferred */
-#    define UBF_TIMER UBF_TIMER_POSIX
-#  elif defined(USE_UBF_LIST)
-     /* safe, but inefficient */
-#    define UBF_TIMER UBF_TIMER_PTHREAD
-#  else
-     /* we'll be racy without SIGVTALRM for ubf_list */
-#    define UBF_TIMER UBF_TIMER_NONE
-#  endif
-#endif
-
-enum rtimer_state {
-    /* alive, after timer_create: */
-    RTIMER_DISARM,
-    RTIMER_ARMING,
-    RTIMER_ARMED,
-
-    RTIMER_DEAD
-};
-
-#if UBF_TIMER == UBF_TIMER_POSIX
-static const struct itimerspec zero;
-static struct {
-    rb_atomic_t state_; /* rtimer_state */
-    rb_serial_t fork_gen;
-    timer_t timerid;
-} timer_posix = {
-    /* .state = */ RTIMER_DEAD,
-};
-
-#define TIMER_STATE_DEBUG 0
+static void rb_thread_execute_hooks(rb_event_flag_t event, rb_thread_t *th);
 
+#if 0
 static const char *
-rtimer_state_name(enum rtimer_state state)
+event_name(rb_event_flag_t event)
 {
-    switch (state) {
-      case RTIMER_DISARM: return "disarm";
-      case RTIMER_ARMING: return "arming";
-      case RTIMER_ARMED:  return "armed";
-      case RTIMER_DEAD:   return "dead";
-      default: rb_bug("unreachable");
+    switch (event) {
+      case RUBY_INTERNAL_THREAD_EVENT_STARTED:
+        return "STARTED";
+      case RUBY_INTERNAL_THREAD_EVENT_READY:
+        return "READY";
+      case RUBY_INTERNAL_THREAD_EVENT_RESUMED:
+        return "RESUMED";
+      case RUBY_INTERNAL_THREAD_EVENT_SUSPENDED:
+        return "SUSPENDED";
+      case RUBY_INTERNAL_THREAD_EVENT_EXITED:
+        return "EXITED";
     }
+    return "no-event";
 }
 
-static enum rtimer_state
-timer_state_exchange(enum rtimer_state state)
-{
-    enum rtimer_state prev = ATOMIC_EXCHANGE(timer_posix.state_, state);
-    if (TIMER_STATE_DEBUG) fprintf(stderr, "state (exc): %s->%s\n", rtimer_state_name(prev), rtimer_state_name(state));
-    return prev;
-}
-
-static enum rtimer_state
-timer_state_cas(enum rtimer_state expected_prev, enum rtimer_state state)
-{
-    enum rtimer_state prev = ATOMIC_CAS(timer_posix.state_, expected_prev, state);
-
-    if (TIMER_STATE_DEBUG) {
-        if (prev == expected_prev) {
-            fprintf(stderr, "state (cas): %s->%s\n", rtimer_state_name(prev), rtimer_state_name(state));
-        }
-        else {
-            fprintf(stderr, "state (cas): %s (expected:%s)\n", rtimer_state_name(prev), rtimer_state_name(expected_prev));
-        }
+#define RB_INTERNAL_THREAD_HOOK(event, th) \
+    if (UNLIKELY(rb_internal_thread_event_hooks)) { \
+        fprintf(stderr, "[thread=%"PRIxVALUE"] %s in %s (%s:%d)\n", th->self, event_name(event), __func__, __FILE__, __LINE__); \
+        rb_thread_execute_hooks(event, th); \
     }
+#else
+#define RB_INTERNAL_THREAD_HOOK(event, th) if (UNLIKELY(rb_internal_thread_event_hooks)) { rb_thread_execute_hooks(event, th); }
+#endif
 
-    return prev;
-}
+static rb_serial_t current_fork_gen = 1; /* We can't use GET_VM()->fork_gen */
 
-#elif UBF_TIMER == UBF_TIMER_PTHREAD
-static void *timer_pthread_fn(void *);
-static struct {
-    int low[2];
-    rb_atomic_t armed; /* boolean */
-    rb_serial_t fork_gen;
-    pthread_t thid;
-} timer_pthread = {
-    { -1, -1 },
-};
+#if defined(SIGVTALRM) && !defined(__EMSCRIPTEN__)
+#  define USE_UBF_LIST 1
 #endif
 
-static const rb_hrtime_t *sigwait_timeout(rb_thread_t *, int sigwait_fd,
-                                              const rb_hrtime_t *,
-                                              int *drained_p);
-static void ubf_timer_disarm(void);
 static void threadptr_trap_interrupt(rb_thread_t *);
-static void ubf_wakeup_all_threads(void);
-static int ubf_threads_empty(void);
-
-#define TIMER_THREAD_CREATED_P() (signal_self_pipe.fork_gen == current_fork_gen)
-
-/* for testing, and in case we come across a platform w/o pipes: */
-#define BUSY_WAIT_SIGNALS (0)
-
-/*
- * sigwait_th is the thread which owns sigwait_fd and sleeps on it
- * (using ppoll).  RJIT worker can be sigwait_th==0, so we initialize
- * it to THREAD_INVALID at startup and fork time.  It is the ONLY thread
- * allowed to read from sigwait_fd, otherwise starvation can occur.
- */
-#define THREAD_INVALID ((const rb_thread_t *)-1)
-static const rb_thread_t *sigwait_th;
 
 #ifdef HAVE_SCHED_YIELD
 #define native_thread_yield() (void)sched_yield()
@@ -392,391 +316,1541 @@ static const rb_thread_t *sigwait_th;
 #define native_thread_yield() ((void)0)
 #endif
 
-/* 100ms.  10ms is too small for user level thread scheduling
- * on recent Linux (tested on 2.6.35)
- */
-#define TIME_QUANTUM_MSEC (100)
-#define TIME_QUANTUM_USEC (TIME_QUANTUM_MSEC * 1000)
-#define TIME_QUANTUM_NSEC (TIME_QUANTUM_USEC * 1000)
+static void native_thread_dedicated_inc(rb_vm_t *vm, rb_ractor_t *cr, struct rb_native_thread *nt);
+static void native_thread_dedicated_dec(rb_vm_t *vm, rb_ractor_t *cr, struct rb_native_thread *nt);
+static void native_thread_assign(struct rb_native_thread *nt, rb_thread_t *th);
 
-/*
- * Designate the next sched.timer thread, favor the last thread in
- * the readyq since it will be in readyq longest
- */
-static int
-designate_timer_thread(struct rb_thread_sched *sched)
-{
-    rb_thread_t *last;
+static void ractor_sched_enq(rb_vm_t *vm, rb_ractor_t *r);
+static void timer_thread_wakeup(void);
+static void timer_thread_wakeup_locked(rb_vm_t *vm);
+static void timer_thread_wakeup_force(void);
+static void thread_sched_switch(rb_thread_t *cth, rb_thread_t *next_th);
+static void coroutine_transfer0(struct coroutine_context *transfer_from,
+                                struct coroutine_context *transfer_to, bool to_dead);
 
-    last = ccan_list_tail(&sched->readyq, rb_thread_t, sched.node.readyq);
+#define thread_sched_dump(s) thread_sched_dump_(__FILE__, __LINE__, s)
 
-    if (last) {
-        rb_native_cond_signal(&last->nt->cond.readyq);
-        return TRUE;
-    }
-    else {
-        return FALSE;
-    }
+static bool
+th_has_dedicated_nt(const rb_thread_t *th)
+{
+    // TODO: th->has_dedicated_nt
+    return th->nt->dedicated > 0;
 }
 
-/*
- * We become designated timer thread to kick vm->gvl.owner
- * periodically.  Continue on old timeout if it expired.
- */
+RBIMPL_ATTR_MAYBE_UNUSED()
 static void
-do_gvl_timer(struct rb_thread_sched *sched, rb_thread_t *th)
+thread_sched_dump_(const char *file, int line, struct rb_thread_sched *sched)
 {
-    rb_vm_t *vm = GET_VM();
-    static rb_hrtime_t abs;
+    fprintf(stderr, "@%s:%d running:%d\n", file, line, sched->running ? (int)sched->running->serial : -1);
+    rb_thread_t *th;
+    int i = 0;
+    ccan_list_for_each(&sched->readyq, th, sched.node.readyq) {
+        i++; if (i>10) rb_bug("too many");
+        fprintf(stderr, "  ready:%d (%sNT:%d)\n", th->serial,
+                th->nt ? (th->nt->dedicated ? "D" : "S") : "x",
+                th->nt ? (int)th->nt->serial : -1);
+    }
+}
 
-    sched->timer = th;
+#define ractor_sched_dump(s) ractor_sched_dump_(__FILE__, __LINE__, s)
 
-    /* take over wakeups from UBF_TIMER */
-    ubf_timer_disarm();
+RBIMPL_ATTR_MAYBE_UNUSED()
+static void
+ractor_sched_dump_(const char *file, int line, rb_vm_t *vm)
+{
+    rb_ractor_t *r;
 
-    if (sched->timer_err == ETIMEDOUT) {
-        abs = native_cond_timeout(&th->nt->cond.readyq, TIME_QUANTUM_NSEC);
+    fprintf(stderr, "ractor_sched_dump %s:%d\n", file, line);
+
+    int i = 0;
+    ccan_list_for_each(&vm->ractor.sched.grq, r, threads.sched.grq_node) {
+        i++;
+        if (i>10) rb_bug("!!");
+        fprintf(stderr, "  %d ready:%d\n", i, rb_ractor_id(r));
     }
-    sched->timer_err = native_cond_timedwait(&th->nt->cond.readyq, &sched->lock, &abs);
+}
 
-    ubf_wakeup_all_threads();
+#define thread_sched_lock(a, b) thread_sched_lock_(a, b, __FILE__, __LINE__)
+#define thread_sched_unlock(a, b) thread_sched_unlock_(a, b, __FILE__, __LINE__)
 
-    if (UNLIKELY(rb_signal_buff_size())) {
-        if (th == vm->ractor.main_thread) {
-            RUBY_VM_SET_TRAP_INTERRUPT(th->ec);
-        }
-        else {
-            threadptr_trap_interrupt(vm->ractor.main_thread);
-        }
-    }
+static void
+thread_sched_set_locked(struct rb_thread_sched *sched, rb_thread_t *th)
+{
+#if VM_CHECK_MODE > 0
+    VM_ASSERT(sched->lock_owner == NULL);
 
-    /*
-     * Timeslice.  Warning: the process may fork while this
-     * thread is contending for GVL:
-     */
-    const rb_thread_t *running;
-    if ((running = sched->running) != 0) {
-        // strictly speaking, accessing "running" is not thread-safe
-        RUBY_VM_SET_TIMER_INTERRUPT(running->ec);
-    }
-    sched->timer = 0;
+    sched->lock_owner = th;
+#endif
 }
 
 static void
-thread_sched_to_ready_common(struct rb_thread_sched *sched, rb_thread_t *th)
+thread_sched_set_unlocked(struct rb_thread_sched *sched, rb_thread_t *th)
 {
-    ccan_list_add_tail(&sched->readyq, &th->sched.node.readyq);
+#if VM_CHECK_MODE > 0
+    VM_ASSERT(sched->lock_owner == th);
+
+    sched->lock_owner = NULL;
+#endif
 }
 
 static void
-thread_sched_to_running_common(struct rb_thread_sched *sched, rb_thread_t *th)
+thread_sched_lock_(struct rb_thread_sched *sched, rb_thread_t *th, const char *file, int line)
 {
-    RB_INTERNAL_THREAD_HOOK(RUBY_INTERNAL_THREAD_EVENT_READY);
-    if (sched->running) {
-        VM_ASSERT(th->unblock.func == 0 &&
-                  "we must not be in ubf_list and GVL readyq at the same time");
+    rb_native_mutex_lock(&sched->lock_);
 
-        // waiting -> ready
-        thread_sched_to_ready_common(sched, th);
+#if VM_CHECK_MODE
+    RUBY_DEBUG_LOG2(file, line, "r:%d th:%u", th ? (int)rb_ractor_id(th->ractor) : -1, rb_th_serial(th));
+#else
+    RUBY_DEBUG_LOG2(file, line, "th:%u", rb_th_serial(th));
+#endif
 
-        // wait for running chance
-        do {
-            if (!sched->timer) {
-                do_gvl_timer(sched, th);
-            }
-            else {
-                rb_native_cond_wait(&th->nt->cond.readyq, &sched->lock);
-            }
-        } while (sched->running);
+    thread_sched_set_locked(sched, th);
+}
 
-        ccan_list_del_init(&th->sched.node.readyq);
+static void
+thread_sched_unlock_(struct rb_thread_sched *sched, rb_thread_t *th, const char *file, int line)
+{
+    RUBY_DEBUG_LOG2(file, line, "th:%u", rb_th_serial(th));
 
-        if (sched->need_yield) {
-            sched->need_yield = 0;
-            rb_native_cond_signal(&sched->switch_cond);
-        }
-    }
-    else { /* reset timer if uncontended */
-        sched->timer_err = ETIMEDOUT;
-    }
+    thread_sched_set_unlocked(sched, th);
 
-    // ready -> running
-    sched->running = th;
+    rb_native_mutex_unlock(&sched->lock_);
+}
 
-    RB_INTERNAL_THREAD_HOOK(RUBY_INTERNAL_THREAD_EVENT_RESUMED);
+static void
+ASSERT_thread_sched_locked(struct rb_thread_sched *sched, rb_thread_t *th)
+{
+    VM_ASSERT(rb_native_mutex_trylock(&sched->lock_) == EBUSY);
 
-    if (!sched->timer) {
-        /* Make sure that this thread is not currently the sigwait_thread before we
-           decide to wake it up. Otherwise, we can end up in a loop of the following
-           operations:
-             * We are in native_sleep -> sigwait_sleep
-             * A signal arives, kicking this thread out of rb_sigwait_sleep
-             * We get here because of the call to THREAD_BLOCKING_END() in native_sleep
-             * write into the sigwait_fd pipe here
-             * re-loop around in native_sleep() because the desired sleep time has not
-               actually yet expired
-             * that calls rb_sigwait_sleep again
-             * the ppoll() in rb_sigwait_sleep immediately returns because of the byte we
-               wrote to the sigwait_fd here
-             * that wakes the thread up again and we end up here again.
-           Such a loop can only be broken by the main thread waking up and handling the
-           signal, such that ubf_threads_empty() below becomes true again; however this
-           loop can actually keep things so busy (and cause so much contention on the
-           main thread's interrupt_lock) that the main thread doesn't deal with the
-           signal for many seconds. This seems particuarly likely on FreeBSD 13.
-        */
-        if (!designate_timer_thread(sched) && !ubf_threads_empty() && th != sigwait_th) {
-            rb_thread_wakeup_timer_thread(-1);
-        }
+#if VM_CHECK_MODE
+    if (th) {
+        VM_ASSERT(sched->lock_owner == th);
+    }
+    else {
+        VM_ASSERT(sched->lock_owner != NULL);
     }
+#endif
 }
 
-static void
-thread_sched_to_running(struct rb_thread_sched *sched, rb_thread_t *th)
+#define ractor_sched_lock(a, b) ractor_sched_lock_(a, b, __FILE__, __LINE__)
+#define ractor_sched_unlock(a, b) ractor_sched_unlock_(a, b, __FILE__, __LINE__)
+
+RBIMPL_ATTR_MAYBE_UNUSED()
+static unsigned int
+rb_ractor_serial(const rb_ractor_t *r)
 {
-    rb_native_mutex_lock(&sched->lock);
-    thread_sched_to_running_common(sched, th);
-    rb_native_mutex_unlock(&sched->lock);
+    if (r) {
+        return rb_ractor_id(r);
+    }
+    else {
+        return 0;
+    }
 }
 
-static rb_thread_t *
-thread_sched_to_waiting_common(struct rb_thread_sched *sched, rb_thread_t *th)
+static void
+ractor_sched_set_locked(rb_vm_t *vm, rb_ractor_t *cr)
 {
-    rb_thread_t *next;
-    sched->running = NULL;
-    next = ccan_list_top(&sched->readyq, rb_thread_t, sched.node.readyq);
-    if (next) rb_native_cond_signal(&next->nt->cond.readyq);
+#if VM_CHECK_MODE > 0
+    VM_ASSERT(vm->ractor.sched.lock_owner == NULL);
+    VM_ASSERT(vm->ractor.sched.locked == false);
 
-    return next;
+    vm->ractor.sched.lock_owner = cr;
+    vm->ractor.sched.locked = true;
+#endif
 }
 
 static void
-thread_sched_to_waiting(struct rb_thread_sched *sched, rb_thread_t *th)
+ractor_sched_set_unlocked(rb_vm_t *vm, rb_ractor_t *cr)
 {
-    RB_INTERNAL_THREAD_HOOK(RUBY_INTERNAL_THREAD_EVENT_SUSPENDED);
-    rb_native_mutex_lock(&sched->lock);
-    thread_sched_to_waiting_common(sched, th);
-    rb_native_mutex_unlock(&sched->lock);
+#if VM_CHECK_MODE > 0
+    VM_ASSERT(vm->ractor.sched.locked);
+    VM_ASSERT(vm->ractor.sched.lock_owner == cr);
+
+    vm->ractor.sched.locked = false;
+    vm->ractor.sched.lock_owner = NULL;
+#endif
 }
 
 static void
-thread_sched_to_dead(struct rb_thread_sched *sched, rb_thread_t *th)
+ractor_sched_lock_(rb_vm_t *vm, rb_ractor_t *cr, const char *file, int line)
 {
-    RB_INTERNAL_THREAD_HOOK(RUBY_INTERNAL_THREAD_EVENT_EXITED);
-    thread_sched_to_waiting(sched, th);
+    rb_native_mutex_lock(&vm->ractor.sched.lock);
+
+#if VM_CHECK_MODE
+    RUBY_DEBUG_LOG2(file, line, "cr:%u prev_owner:%u", rb_ractor_serial(cr), rb_ractor_serial(vm->ractor.sched.lock_owner));
+#else
+    RUBY_DEBUG_LOG2(file, line, "cr:%u", rb_ractor_serial(cr));
+#endif
+
+    ractor_sched_set_locked(vm, cr);
 }
 
 static void
-thread_sched_yield(struct rb_thread_sched *sched, rb_thread_t *th)
+ractor_sched_unlock_(rb_vm_t *vm, rb_ractor_t *cr, const char *file, int line)
 {
-    rb_thread_t *next;
+    RUBY_DEBUG_LOG2(file, line, "cr:%u", rb_ractor_serial(cr));
 
-    /*
-     * Perhaps other threads are stuck in blocking region w/o GVL, too,
-     * (perhaps looping in io_close_fptr) so we kick them:
-     */
-    ubf_wakeup_all_threads();
-    rb_native_mutex_lock(&sched->lock);
-    next = thread_sched_to_waiting_common(sched, th);
-
-    /* An another thread is processing GVL yield. */
-    if (UNLIKELY(sched->wait_yield)) {
-        while (sched->wait_yield)
-            rb_native_cond_wait(&sched->switch_wait_cond, &sched->lock);
-    }
-    else if (next) {
-        /* Wait until another thread task takes GVL. */
-        sched->need_yield = 1;
-        sched->wait_yield = 1;
-        while (sched->need_yield)
-            rb_native_cond_wait(&sched->switch_cond, &sched->lock);
-        sched->wait_yield = 0;
-        rb_native_cond_broadcast(&sched->switch_wait_cond);
-    }
-    else {
-        rb_native_mutex_unlock(&sched->lock);
-        native_thread_yield();
-        rb_native_mutex_lock(&sched->lock);
-        rb_native_cond_broadcast(&sched->switch_wait_cond);
-    }
-    thread_sched_to_running_common(sched, th);
-    rb_native_mutex_unlock(&sched->lock);
+    ractor_sched_set_unlocked(vm, cr);
+    rb_native_mutex_unlock(&vm->ractor.sched.lock);
 }
 
-void
-rb_thread_sched_init(struct rb_thread_sched *sched)
+static void
+ASSERT_ractor_sched_locked(rb_vm_t *vm, rb_ractor_t *cr)
 {
-    rb_native_mutex_initialize(&sched->lock);
-    rb_native_cond_initialize(&sched->switch_cond);
-    rb_native_cond_initialize(&sched->switch_wait_cond);
-    ccan_list_head_init(&sched->readyq);
-    sched->running = NULL;
-    sched->timer = 0;
-    sched->timer_err = ETIMEDOUT;
-    sched->need_yield = 0;
-    sched->wait_yield = 0;
+    VM_ASSERT(rb_native_mutex_trylock(&vm->ractor.sched.lock) == EBUSY);
+    VM_ASSERT(vm->ractor.sched.locked);
+    VM_ASSERT(cr == NULL || vm->ractor.sched.lock_owner == cr);
 }
 
-// TODO
-
-static void clear_thread_cache_altstack(void);
-
-static void
-rb_thread_sched_destroy(struct rb_thread_sched *sched)
+RBIMPL_ATTR_MAYBE_UNUSED()
+static bool
+ractor_sched_running_threads_contain_p(rb_vm_t *vm, rb_thread_t *th)
 {
-    /*
-     * only called once at VM shutdown (not atfork), another thread
-     * may still grab vm->gvl.lock when calling gvl_release at
-     * the end of thread_start_func_2
-     */
-    if (0) {
-        rb_native_cond_destroy(&sched->switch_wait_cond);
-        rb_native_cond_destroy(&sched->switch_cond);
-        rb_native_mutex_destroy(&sched->lock);
+    rb_thread_t *rth;
+    ccan_list_for_each(&vm->ractor.sched.running_threads, rth, sched.node.running_threads) {
+        if (rth == th) return true;
     }
-    clear_thread_cache_altstack();
+    return false;
 }
 
-#if defined(HAVE_WORKING_FORK)
-static void thread_cache_reset(void);
-static void
-thread_sched_atfork(struct rb_thread_sched *sched)
+RBIMPL_ATTR_MAYBE_UNUSED()
+static unsigned int
+ractor_sched_running_threads_size(rb_vm_t *vm)
 {
-    current_fork_gen++;
-    thread_cache_reset();
-    rb_thread_sched_init(sched);
-    thread_sched_to_running(sched, GET_THREAD());
+    rb_thread_t *th;
+    unsigned int i = 0;
+    ccan_list_for_each(&vm->ractor.sched.running_threads, th, sched.node.running_threads) {
+        i++;
+    }
+    return i;
 }
-#endif
-
-#ifdef RB_THREAD_LOCAL_SPECIFIER
-static RB_THREAD_LOCAL_SPECIFIER rb_thread_t *ruby_native_thread;
-#else
-static pthread_key_t ruby_native_thread_key;
-#endif
 
-static void
-null_func(int i)
+RBIMPL_ATTR_MAYBE_UNUSED()
+static unsigned int
+ractor_sched_timeslice_threads_size(rb_vm_t *vm)
 {
-    /* null */
+    rb_thread_t *th;
+    unsigned int i = 0;
+    ccan_list_for_each(&vm->ractor.sched.timeslice_threads, th, sched.node.timeslice_threads) {
+        i++;
+    }
+    return i;
 }
 
-rb_thread_t *
-ruby_thread_from_native(void)
+RBIMPL_ATTR_MAYBE_UNUSED()
+static bool
+ractor_sched_timeslice_threads_contain_p(rb_vm_t *vm, rb_thread_t *th)
 {
-#ifdef RB_THREAD_LOCAL_SPECIFIER
-    return ruby_native_thread;
-#else
-    return pthread_getspecific(ruby_native_thread_key);
-#endif
+    rb_thread_t *rth;
+    ccan_list_for_each(&vm->ractor.sched.timeslice_threads, rth, sched.node.timeslice_threads) {
+        if (rth == th) return true;
+    }
+    return false;
 }
 
-int
-ruby_thread_set_native(rb_thread_t *th)
+static void ractor_sched_barrier_join_signal_locked(rb_vm_t *vm);
+
+// setup timeslice signals by the timer thread.
+static void
+thread_sched_setup_running_threads(struct rb_thread_sched *sched, rb_ractor_t *cr, rb_vm_t *vm,
+                                   rb_thread_t *add_th, rb_thread_t *del_th, rb_thread_t *add_timeslice_th)
 {
-    if (th) {
-#ifdef USE_UBF_LIST
-        ccan_list_node_init(&th->sched.node.ubf);
+#if USE_RUBY_DEBUG_LOG
+    unsigned int prev_running_cnt = vm->ractor.sched.running_cnt;
 #endif
+
+    rb_thread_t *del_timeslice_th;
+
+    if (del_th && sched->is_running_timeslice) {
+        del_timeslice_th = del_th;
+        sched->is_running_timeslice = false;
+    }
+    else {
+        del_timeslice_th = NULL;
     }
 
-    // setup TLS
+    RUBY_DEBUG_LOG("+:%u -:%u +ts:%u -ts:%u",
+                   rb_th_serial(add_th), rb_th_serial(del_th),
+                   rb_th_serial(add_timeslice_th), rb_th_serial(del_timeslice_th));
 
-    if (th && th->ec) {
-        rb_ractor_set_current_ec(th->ractor, th->ec);
+    ractor_sched_lock(vm, cr);
+    {
+        // update running_threads
+        if (del_th) {
+            VM_ASSERT(ractor_sched_running_threads_contain_p(vm, del_th));
+            VM_ASSERT(del_timeslice_th != NULL ||
+                      !ractor_sched_timeslice_threads_contain_p(vm, del_th));
+
+            ccan_list_del_init(&del_th->sched.node.running_threads);
+            vm->ractor.sched.running_cnt--;
+
+            if (UNLIKELY(vm->ractor.sched.barrier_waiting)) {
+                ractor_sched_barrier_join_signal_locked(vm);
+            }
+            sched->is_running = false;
+        }
+
+        if (add_th) {
+            if (vm->ractor.sched.barrier_waiting) {
+                // TODO: GC barrier check?
+                RUBY_DEBUG_LOG("barrier_waiting");
+                RUBY_VM_SET_VM_BARRIER_INTERRUPT(add_th->ec);
+            }
+
+            VM_ASSERT(!ractor_sched_running_threads_contain_p(vm, add_th));
+            VM_ASSERT(!ractor_sched_timeslice_threads_contain_p(vm, add_th));
+
+            ccan_list_add(&vm->ractor.sched.running_threads, &add_th->sched.node.running_threads);
+            vm->ractor.sched.running_cnt++;
+            sched->is_running = true;
+        }
+
+        if (add_timeslice_th) {
+            // update timeslice threads
+            int was_empty = ccan_list_empty(&vm->ractor.sched.timeslice_threads);
+            VM_ASSERT(!ractor_sched_timeslice_threads_contain_p(vm, add_timeslice_th));
+            ccan_list_add(&vm->ractor.sched.timeslice_threads, &add_timeslice_th->sched.node.timeslice_threads);
+            sched->is_running_timeslice = true;
+            if (was_empty) {
+                timer_thread_wakeup_locked(vm);
+            }
+        }
+
+        if (del_timeslice_th) {
+            VM_ASSERT(ractor_sched_timeslice_threads_contain_p(vm, del_timeslice_th));
+            ccan_list_del_init(&del_timeslice_th->sched.node.timeslice_threads);
+        }
+
+        VM_ASSERT(ractor_sched_running_threads_size(vm) == vm->ractor.sched.running_cnt);
+        VM_ASSERT(ractor_sched_timeslice_threads_size(vm) <= vm->ractor.sched.running_cnt);
     }
-#ifdef RB_THREAD_LOCAL_SPECIFIER
-    ruby_native_thread = th;
-    return 1;
-#else
-    return pthread_setspecific(ruby_native_thread_key, th) == 0;
-#endif
+    ractor_sched_unlock(vm, cr);
+
+    //RUBY_DEBUG_LOG("+:%u -:%u +ts:%u -ts:%u run:%u->%u",
+    //               rb_th_serial(add_th), rb_th_serial(del_th),
+    //               rb_th_serial(add_timeslice_th), rb_th_serial(del_timeslice_th),
+    RUBY_DEBUG_LOG("run:%u->%u", prev_running_cnt, vm->ractor.sched.running_cnt);
 }
 
-#ifdef RB_THREAD_T_HAS_NATIVE_ID
-static int
-get_native_thread_id(void)
+static void
+thread_sched_add_running_thread(struct rb_thread_sched *sched, rb_thread_t *th)
 {
-#ifdef __linux__
-    return (int)syscall(SYS_gettid);
-#elif defined(__FreeBSD__)
-    return pthread_getthreadid_np();
-#endif
+    ASSERT_thread_sched_locked(sched, th);
+    VM_ASSERT(sched->running == th);
+
+    rb_vm_t *vm = th->vm;
+    thread_sched_setup_running_threads(sched, th->ractor, vm, th, NULL, ccan_list_empty(&sched->readyq) ? NULL : th);
 }
-#endif
 
 static void
-native_thread_init(struct rb_native_thread *nt)
+thread_sched_del_running_thread(struct rb_thread_sched *sched, rb_thread_t *th)
 {
-#ifdef RB_THREAD_T_HAS_NATIVE_ID
-    nt->tid = get_native_thread_id();
-#endif
-    rb_native_cond_initialize(&nt->cond.readyq);
-    if (&nt->cond.readyq != &nt->cond.intr)
-      rb_native_cond_initialize(&nt->cond.intr);
+    ASSERT_thread_sched_locked(sched, th);
+
+    rb_vm_t *vm = th->vm;
+    thread_sched_setup_running_threads(sched, th->ractor, vm, NULL, th, NULL);
 }
 
 void
-Init_native_thread(rb_thread_t *main_th)
+rb_add_running_thread(rb_thread_t *th)
 {
-#if defined(HAVE_PTHREAD_CONDATTR_SETCLOCK)
-    if (condattr_monotonic) {
-        int r = pthread_condattr_init(condattr_monotonic);
-        if (r == 0) {
-            r = pthread_condattr_setclock(condattr_monotonic, CLOCK_MONOTONIC);
-        }
-        if (r) condattr_monotonic = NULL;
-    }
-#endif
+    struct rb_thread_sched *sched = TH_SCHED(th);
 
-#ifndef RB_THREAD_LOCAL_SPECIFIER
-    if (pthread_key_create(&ruby_native_thread_key, 0) == EAGAIN) {
-        rb_bug("pthread_key_create failed (ruby_native_thread_key)");
-    }
-    if (pthread_key_create(&ruby_current_ec_key, 0) == EAGAIN) {
-        rb_bug("pthread_key_create failed (ruby_current_ec_key)");
+    thread_sched_lock(sched, th);
+    {
+        thread_sched_add_running_thread(sched, th);
     }
-#endif
-    ruby_posix_signal(SIGVTALRM, null_func);
-
-    // setup main thread
-    main_th->nt->thread_id = pthread_self();
-    ruby_thread_set_native(main_th);
-    native_thread_init(main_th->nt);
+    thread_sched_unlock(sched, th);
 }
 
-#if defined(USE_THREAD_CACHE) && !(USE_THREAD_CACHE+0)
-# undef USE_THREAD_CACHE
-# define USE_THREAD_CACHE 0
-#else
-# undef USE_THREAD_CACHE
-# define USE_THREAD_CACHE 1
-#endif
+void
+rb_del_running_thread(rb_thread_t *th)
+{
+    struct rb_thread_sched *sched = TH_SCHED(th);
+
+    thread_sched_lock(sched, th);
+    {
+        thread_sched_del_running_thread(sched, th);
+    }
+    thread_sched_unlock(sched, th);
+}
 
+// setup current or next running thread
+// sched->running should be set only on this function.
+//
+// if th is NULL, there is no running threads.
 static void
-native_thread_destroy(rb_thread_t *th)
+thread_sched_set_running(struct rb_thread_sched *sched, rb_thread_t *th)
 {
-    struct rb_native_thread *nt = th->nt;
-
-    rb_native_cond_destroy(&nt->cond.readyq);
+    RUBY_DEBUG_LOG("th:%u->th:%u", rb_th_serial(sched->running), rb_th_serial(th));
+    VM_ASSERT(sched->running != th);
 
-    if (&nt->cond.readyq != &nt->cond.intr)
-      rb_native_cond_destroy(&nt->cond.intr);
+    sched->running = th;
+}
 
+RBIMPL_ATTR_MAYBE_UNUSED()
+static bool
+thread_sched_readyq_contain_p(struct rb_thread_sched *sched, rb_thread_t *th)
+{
+    rb_thread_t *rth;
+    ccan_list_for_each(&sched->readyq, rth, sched.node.readyq) {
+        if (rth == th) return true;
+    }
+    return false;
+}
+
+// deque thread from the ready queue.
+// if the ready queue is empty, return NULL.
+//
+// return deque'ed running thread (or NULL).
+static rb_thread_t *
+thread_sched_deq(struct rb_thread_sched *sched)
+{
+    ASSERT_thread_sched_locked(sched, NULL);
+    rb_thread_t *next_th;
+
+    VM_ASSERT(sched->running != NULL);
+
+    if (ccan_list_empty(&sched->readyq)) {
+        next_th = NULL;
+    }
+    else {
+        next_th = ccan_list_pop(&sched->readyq, rb_thread_t, sched.node.readyq);
+
+        VM_ASSERT(sched->readyq_cnt > 0);
+        sched->readyq_cnt--;
+        ccan_list_node_init(&next_th->sched.node.readyq);
+    }
+
+    RUBY_DEBUG_LOG("next_th:%u readyq_cnt:%d", rb_th_serial(next_th), sched->readyq_cnt);
+
+    return next_th;
+}
+
+// enqueue ready thread to the ready queue.
+static void
+thread_sched_enq(struct rb_thread_sched *sched, rb_thread_t *ready_th)
+{
+    ASSERT_thread_sched_locked(sched, NULL);
+    RUBY_DEBUG_LOG("ready_th:%u readyq_cnt:%d", rb_th_serial(ready_th), sched->readyq_cnt);
+
+    VM_ASSERT(sched->running != NULL);
+    VM_ASSERT(!thread_sched_readyq_contain_p(sched, ready_th));
+
+    if (sched->is_running) {
+        if (ccan_list_empty(&sched->readyq)) {
+            // add sched->running to timeslice
+            thread_sched_setup_running_threads(sched, ready_th->ractor, ready_th->vm, NULL, NULL, sched->running);
+        }
+    }
+    else {
+        // ractor_sched lock is needed
+        // VM_ASSERT(!ractor_sched_timeslice_threads_contain_p(ready_th->vm, sched->running));
+    }
+
+    ccan_list_add_tail(&sched->readyq, &ready_th->sched.node.readyq);
+    sched->readyq_cnt++;
+}
+
+// DNT: kick condvar
+// SNT: TODO
+static void
+thread_sched_wakeup_running_thread(struct rb_thread_sched *sched, rb_thread_t *next_th, bool will_switch)
+{
+    ASSERT_thread_sched_locked(sched, NULL);
+    VM_ASSERT(sched->running == next_th);
+
+    if (next_th) {
+        if (next_th->nt) {
+            if (th_has_dedicated_nt(next_th)) {
+                RUBY_DEBUG_LOG("pinning th:%u", next_th->serial);
+                rb_native_cond_signal(&next_th->nt->cond.readyq);
+            }
+            else {
+                // TODO
+                RUBY_DEBUG_LOG("th:%u is already running.", next_th->serial);
+            }
+        }
+        else {
+            if (will_switch) {
+                RUBY_DEBUG_LOG("th:%u (do nothing)", rb_th_serial(next_th));
+            }
+            else {
+                RUBY_DEBUG_LOG("th:%u (enq)", rb_th_serial(next_th));
+                ractor_sched_enq(next_th->vm, next_th->ractor);
+            }
+        }
+    }
+    else {
+        RUBY_DEBUG_LOG("no waiting threads%s", "");
+    }
+}
+
+// waiting -> ready (locked)
+static void
+thread_sched_to_ready_common(struct rb_thread_sched *sched, rb_thread_t *th, bool wakeup, bool will_switch)
+{
+    RUBY_DEBUG_LOG("th:%u running:%u redyq_cnt:%d", rb_th_serial(th), rb_th_serial(sched->running), sched->readyq_cnt);
+
+    VM_ASSERT(sched->running != th);
+    VM_ASSERT(!thread_sched_readyq_contain_p(sched, th));
+    RB_INTERNAL_THREAD_HOOK(RUBY_INTERNAL_THREAD_EVENT_READY, th);
+
+    if (sched->running == NULL) {
+        thread_sched_set_running(sched, th);
+        if (wakeup) thread_sched_wakeup_running_thread(sched, th, will_switch);
+    }
+    else {
+        thread_sched_enq(sched, th);
+    }
+}
+
+// waiting -> ready
+//
+// `th` had became "waiting" state by `thread_sched_to_waiting`
+// and `thread_sched_to_ready` enqueue `th` to the thread ready queue.
+RBIMPL_ATTR_MAYBE_UNUSED()
+static void
+thread_sched_to_ready(struct rb_thread_sched *sched, rb_thread_t *th)
+{
+    RUBY_DEBUG_LOG("th:%u", rb_th_serial(th));
+
+    thread_sched_lock(sched, th);
+    {
+        thread_sched_to_ready_common(sched, th, true, false);
+    }
+    thread_sched_unlock(sched, th);
+}
+
+// wait until sched->running is `th`.
+static void
+thread_sched_wait_running_turn(struct rb_thread_sched *sched, rb_thread_t *th, bool can_direct_transfer)
+{
+    RUBY_DEBUG_LOG("th:%u", rb_th_serial(th));
+
+    ASSERT_thread_sched_locked(sched, th);
+    VM_ASSERT(th == rb_ec_thread_ptr(rb_current_ec_noinline()));
+
+    if (th != sched->running) {
+        // already deleted from running threads
+        // VM_ASSERT(!ractor_sched_running_threads_contain_p(th->vm, th)); // need locking
+
+        // wait for execution right
+        rb_thread_t *next_th;
+        while((next_th = sched->running) != th) {
+            if (th_has_dedicated_nt(th)) {
+                RUBY_DEBUG_LOG("(nt) sleep th:%u running:%u", rb_th_serial(th), rb_th_serial(sched->running));
+
+                thread_sched_set_unlocked(sched, th);
+                {
+                    RUBY_DEBUG_LOG("nt:%d cond:%p", th->nt->serial, &th->nt->cond.readyq);
+                    rb_native_cond_wait(&th->nt->cond.readyq, &sched->lock_);
+                }
+                thread_sched_set_locked(sched, th);
+
+                RUBY_DEBUG_LOG("(nt) wakeup %s", sched->running == th ? "success" : "failed");
+                if (th == sched->running) {
+                    rb_ractor_thread_switch(th->ractor, th, false);
+                }
+            }
+            else {
+                // search another ready thread
+                if (can_direct_transfer &&
+                    (next_th = sched->running) != NULL &&
+                    !next_th->nt // next_th is running or has dedicated nt
+                    ) {
+
+                    RUBY_DEBUG_LOG("th:%u->%u (direct)", rb_th_serial(th), rb_th_serial(next_th));
+
+                    thread_sched_set_unlocked(sched, th);
+                    {
+                        rb_ractor_set_current_ec(th->ractor, NULL);
+                        thread_sched_switch(th, next_th);
+                    }
+                    thread_sched_set_locked(sched, th);
+                }
+                else {
+                    // search another ready ractor
+                    struct rb_native_thread *nt = th->nt;
+                    native_thread_assign(NULL, th);
+
+                    RUBY_DEBUG_LOG("th:%u->%u (ractor scheduling)", rb_th_serial(th), rb_th_serial(next_th));
+
+                    thread_sched_set_unlocked(sched, th);
+                    {
+                        rb_ractor_set_current_ec(th->ractor, NULL);
+                        coroutine_transfer0(th->sched.context, nt->nt_context, false);
+                    }
+                    thread_sched_set_locked(sched, th);
+                }
+
+                VM_ASSERT(rb_current_ec_noinline() == th->ec);
+            }
+        }
+
+        VM_ASSERT(th->nt != NULL);
+        VM_ASSERT(rb_current_ec_noinline() == th->ec);
+        VM_ASSERT(th->sched.waiting_reason.flags == thread_sched_waiting_none);
+
+        // add th to running threads
+        thread_sched_add_running_thread(sched, th);
+    }
+
+    // VM_ASSERT(ractor_sched_running_threads_contain_p(th->vm, th)); need locking
+    RB_INTERNAL_THREAD_HOOK(RUBY_INTERNAL_THREAD_EVENT_RESUMED, th);
+}
+
+// waiting -> ready -> running (locked)
+static void
+thread_sched_to_running_common(struct rb_thread_sched *sched, rb_thread_t *th)
+{
+    RUBY_DEBUG_LOG("th:%u dedicated:%d", rb_th_serial(th), th_has_dedicated_nt(th));
+
+    VM_ASSERT(sched->running != th);
+    VM_ASSERT(th_has_dedicated_nt(th));
+    VM_ASSERT(GET_THREAD() == th);
+
+    native_thread_dedicated_dec(th->vm, th->ractor, th->nt);
+
+    // waiting -> ready
+    thread_sched_to_ready_common(sched, th, false, false);
+
+    if (sched->running == th) {
+        thread_sched_add_running_thread(sched, th);
+    }
+
+    // TODO: check SNT number
+    thread_sched_wait_running_turn(sched, th, false);
+}
+
+// waiting -> ready -> running
+//
+// `th` had been waiting by `thread_sched_to_waiting()`
+// and run a dedicated task (like waitpid and so on).
+// After the dedicated task, this function is called
+// to join a normal thread-scheduling.
+static void
+thread_sched_to_running(struct rb_thread_sched *sched, rb_thread_t *th)
+{
+    thread_sched_lock(sched, th);
+    {
+        thread_sched_to_running_common(sched, th);
+    }
+    thread_sched_unlock(sched, th);
+}
+
+// resume a next thread in the thread ready queue.
+//
+// deque next running thread from the ready thread queue and
+// resume this thread if available.
+//
+// If the next therad has a dedicated native thraed, simply signal to resume.
+// Otherwise, make the ractor ready and other nt will run the ractor and the thread.
+static void
+thread_sched_wakeup_next_thread(struct rb_thread_sched *sched, rb_thread_t *th, bool will_switch)
+{
+    ASSERT_thread_sched_locked(sched, th);
+
+    VM_ASSERT(sched->running == th);
+    VM_ASSERT(sched->running->nt != NULL);
+
+    rb_thread_t *next_th = thread_sched_deq(sched);
+
+    RUBY_DEBUG_LOG("next_th:%u", rb_th_serial(next_th));
+    VM_ASSERT(th != next_th);
+
+    thread_sched_set_running(sched, next_th);
+    VM_ASSERT(next_th == sched->running);
+    thread_sched_wakeup_running_thread(sched, next_th, will_switch);
+
+    if (th != next_th) {
+        thread_sched_del_running_thread(sched, th);
+    }
+}
+
+// running -> waiting
+//
+// to_dead: false
+//   th will run dedicated task.
+//   run another ready thread.
+// to_dead: true
+//   th will be dead.
+//   run another ready thread.
+static void
+thread_sched_to_waiting_common0(struct rb_thread_sched *sched, rb_thread_t *th, bool to_dead)
+{
+    RB_INTERNAL_THREAD_HOOK(RUBY_INTERNAL_THREAD_EVENT_SUSPENDED, th);
+
+    if (!to_dead) native_thread_dedicated_inc(th->vm, th->ractor, th->nt);
+
+    RUBY_DEBUG_LOG("%sth:%u", to_dead ? "to_dead " : "", rb_th_serial(th));
+
+    bool can_switch = to_dead ? !th_has_dedicated_nt(th) : false;
+    thread_sched_wakeup_next_thread(sched, th, can_switch);
+}
+
+// running -> dead (locked)
+static void
+thread_sched_to_dead_common(struct rb_thread_sched *sched, rb_thread_t *th)
+{
+    RUBY_DEBUG_LOG("dedicated:%d", th->nt->dedicated);
+    thread_sched_to_waiting_common0(sched, th, true);
+    RB_INTERNAL_THREAD_HOOK(RUBY_INTERNAL_THREAD_EVENT_EXITED, th);
+}
+
+// running -> dead
+static void
+thread_sched_to_dead(struct rb_thread_sched *sched, rb_thread_t *th)
+{
+    thread_sched_lock(sched, th);
+    {
+        thread_sched_to_dead_common(sched, th);
+    }
+    thread_sched_unlock(sched, th);
+}
+
+// running -> waiting (locked)
+//
+// This thread will run dedicated task (th->nt->dedicated++).
+static void
+thread_sched_to_waiting_common(struct rb_thread_sched *sched, rb_thread_t *th)
+{
+    RUBY_DEBUG_LOG("dedicated:%d", th->nt->dedicated);
+    thread_sched_to_waiting_common0(sched, th, false);
+}
+
+// running -> waiting
+//
+// This thread will run a dedicated task.
+static void
+thread_sched_to_waiting(struct rb_thread_sched *sched, rb_thread_t *th)
+{
+    thread_sched_lock(sched, th);
+    {
+        thread_sched_to_waiting_common(sched, th);
+    }
+    thread_sched_unlock(sched, th);
+}
+
+// mini utility func
+// return true if any there are any interrupts
+static bool
+ubf_set(rb_thread_t *th, rb_unblock_function_t *func, void *arg)
+{
+    VM_ASSERT(func != NULL);
+
+  retry:
+    if (RUBY_VM_INTERRUPTED(th->ec)) {
+        RUBY_DEBUG_LOG("interrupted:0x%x", th->ec->interrupt_flag);
+        return true;
+    }
+
+    rb_native_mutex_lock(&th->interrupt_lock);
+    {
+        if (!th->ec->raised_flag && RUBY_VM_INTERRUPTED(th->ec)) {
+            rb_native_mutex_unlock(&th->interrupt_lock);
+            goto retry;
+        }
+
+        VM_ASSERT(th->unblock.func == NULL);
+        th->unblock.func = func;
+        th->unblock.arg  = arg;
+    }
+    rb_native_mutex_unlock(&th->interrupt_lock);
+
+    return false;
+}
+
+static void
+ubf_clear(rb_thread_t *th)
+{
+    if (th->unblock.func) {
+        rb_native_mutex_lock(&th->interrupt_lock);
+        {
+            th->unblock.func = NULL;
+            th->unblock.arg  = NULL;
+        }
+        rb_native_mutex_unlock(&th->interrupt_lock);
+    }
+}
+
+static void
+ubf_waiting(void *ptr)
+{
+    rb_thread_t *th = (rb_thread_t *)ptr;
+    struct rb_thread_sched *sched = TH_SCHED(th);
+
+    // only once. it is safe because th->interrupt_lock is already acquired.
+    th->unblock.func = NULL;
+    th->unblock.arg = NULL;
+
+    RUBY_DEBUG_LOG("th:%u", rb_th_serial(th));
+
+    thread_sched_lock(sched, th);
+    {
+        if (sched->running == th) {
+            // not sleeping yet.
+        }
+        else {
+            thread_sched_to_ready_common(sched, th, true, false);
+        }
+    }
+    thread_sched_unlock(sched, th);
+}
+
+// running -> waiting
+//
+// This thread will sleep until other thread wakeup the thread.
+static void
+thread_sched_to_waiting_until_wakeup(struct rb_thread_sched *sched, rb_thread_t *th)
+{
+    RUBY_DEBUG_LOG("th:%u", rb_th_serial(th));
+
+    RB_VM_SAVE_MACHINE_CONTEXT(th);
+
+    if (ubf_set(th, ubf_waiting, (void *)th)) {
+        return;
+    }
+
+    RB_INTERNAL_THREAD_HOOK(RUBY_INTERNAL_THREAD_EVENT_SUSPENDED, th);
+
+    thread_sched_lock(sched, th);
+    {
+        if (!RUBY_VM_INTERRUPTED(th->ec)) {
+            bool can_direct_transfer = !th_has_dedicated_nt(th);
+            thread_sched_wakeup_next_thread(sched, th, can_direct_transfer);
+            thread_sched_wait_running_turn(sched, th, can_direct_transfer);
+        }
+        else {
+            RUBY_DEBUG_LOG("th:%u interrupted", rb_th_serial(th));
+        }
+    }
+    thread_sched_unlock(sched, th);
+
+    ubf_clear(th);
+}
+
+// run another thread in the ready queue.
+// continue to run if there are no ready threads.
+static void
+thread_sched_yield(struct rb_thread_sched *sched, rb_thread_t *th)
+{
+    RUBY_DEBUG_LOG("th:%d sched->readyq_cnt:%d", (int)th->serial, sched->readyq_cnt);
+
+    thread_sched_lock(sched, th);
+    {
+        if (!ccan_list_empty(&sched->readyq)) {
+            RB_INTERNAL_THREAD_HOOK(RUBY_INTERNAL_THREAD_EVENT_SUSPENDED, th);
+            thread_sched_wakeup_next_thread(sched, th, !th_has_dedicated_nt(th));
+            bool can_direct_transfer = !th_has_dedicated_nt(th);
+            thread_sched_to_ready_common(sched, th, false, can_direct_transfer);
+            thread_sched_wait_running_turn(sched, th, can_direct_transfer);
+        }
+        else {
+            VM_ASSERT(sched->readyq_cnt == 0);
+        }
+    }
+    thread_sched_unlock(sched, th);
+}
+
+void
+rb_thread_sched_init(struct rb_thread_sched *sched, bool atfork)
+{
+    rb_native_mutex_initialize(&sched->lock_);
+
+#if VM_CHECK_MODE
+    sched->lock_owner = NULL;
+#endif
+
+    ccan_list_head_init(&sched->readyq);
+    sched->readyq_cnt = 0;
+
+#if USE_MN_THREADS
+    if (!atfork) sched->enable_mn_threads = true; // MN is enabled on Ractors
+#endif
+}
+
+static void
+coroutine_transfer0(struct coroutine_context *transfer_from, struct coroutine_context *transfer_to, bool to_dead)
+{
+#ifdef RUBY_ASAN_ENABLED
+    void **fake_stack = to_dead ? NULL : &transfer_from->fake_stack;
+    __sanitizer_start_switch_fiber(fake_stack, transfer_to->stack_base, transfer_to->stack_size);
+#endif
+
+    RBIMPL_ATTR_MAYBE_UNUSED()
+    struct coroutine_context *returning_from = coroutine_transfer(transfer_from, transfer_to);
+
+    /* if to_dead was passed, the caller is promising that this coroutine is finished and it should
+     * never be resumed! */
+    VM_ASSERT(!to_dead);
+#ifdef RUBY_ASAN_ENABLED
+   __sanitizer_finish_switch_fiber(transfer_from->fake_stack,
+                                   (const void**)&returning_from->stack_base, &returning_from->stack_size);
+#endif
+
+}
+
+static void
+thread_sched_switch0(struct coroutine_context *current_cont, rb_thread_t *next_th, struct rb_native_thread *nt, bool to_dead)
+{
+    VM_ASSERT(!nt->dedicated);
+    VM_ASSERT(next_th->nt == NULL);
+
+    RUBY_DEBUG_LOG("next_th:%u", rb_th_serial(next_th));
+
+    ruby_thread_set_native(next_th);
+    native_thread_assign(nt, next_th);
+
+    coroutine_transfer0(current_cont, next_th->sched.context, to_dead);
+}
+
+static void
+thread_sched_switch(rb_thread_t *cth, rb_thread_t *next_th)
+{
+    struct rb_native_thread *nt = cth->nt;
+    native_thread_assign(NULL, cth);
+    RUBY_DEBUG_LOG("th:%u->%u on nt:%d", rb_th_serial(cth), rb_th_serial(next_th), nt->serial);
+    thread_sched_switch0(cth->sched.context, next_th, nt, cth->status == THREAD_KILLED);
+}
+
+#if VM_CHECK_MODE > 0
+RBIMPL_ATTR_MAYBE_UNUSED()
+static unsigned int
+grq_size(rb_vm_t *vm, rb_ractor_t *cr)
+{
+    ASSERT_ractor_sched_locked(vm, cr);
+
+    rb_ractor_t *r, *prev_r = NULL;
+    unsigned int i = 0;
+
+    ccan_list_for_each(&vm->ractor.sched.grq, r, threads.sched.grq_node) {
+        i++;
+
+        VM_ASSERT(r != prev_r);
+        prev_r = r;
+    }
+    return i;
+}
+#endif
+
+static void
+ractor_sched_enq(rb_vm_t *vm, rb_ractor_t *r)
+{
+    struct rb_thread_sched *sched = &r->threads.sched;
+    rb_ractor_t *cr = NULL; // timer thread can call this function
+
+    VM_ASSERT(sched->running != NULL);
+    VM_ASSERT(sched->running->nt == NULL);
+
+    ractor_sched_lock(vm, cr);
+    {
+#if VM_CHECK_MODE > 0
+        // check if grq contains r
+        rb_ractor_t *tr;
+        ccan_list_for_each(&vm->ractor.sched.grq, tr, threads.sched.grq_node) {
+            VM_ASSERT(r != tr);
+        }
+#endif
+
+        ccan_list_add_tail(&vm->ractor.sched.grq, &sched->grq_node);
+        vm->ractor.sched.grq_cnt++;
+        VM_ASSERT(grq_size(vm, cr) == vm->ractor.sched.grq_cnt);
+
+        RUBY_DEBUG_LOG("r:%u th:%u grq_cnt:%u", rb_ractor_id(r), rb_th_serial(sched->running), vm->ractor.sched.grq_cnt);
+
+        rb_native_cond_signal(&vm->ractor.sched.cond);
+
+        // ractor_sched_dump(vm);
+    }
+    ractor_sched_unlock(vm, cr);
+}
+
+
+#ifndef SNT_KEEP_SECONDS
+#define SNT_KEEP_SECONDS 0
+#endif
+
+#ifndef MINIMUM_SNT
+// make at least MINIMUM_SNT snts for debug.
+#define MINIMUM_SNT 0
+#endif
+
+static rb_ractor_t *
+ractor_sched_deq(rb_vm_t *vm, rb_ractor_t *cr)
+{
+    rb_ractor_t *r;
+
+    ractor_sched_lock(vm, cr);
+    {
+        RUBY_DEBUG_LOG("empty? %d", ccan_list_empty(&vm->ractor.sched.grq));
+        // ractor_sched_dump(vm);
+
+        VM_ASSERT(rb_current_execution_context(false) == NULL);
+        VM_ASSERT(grq_size(vm, cr) == vm->ractor.sched.grq_cnt);
+
+        while ((r = ccan_list_pop(&vm->ractor.sched.grq, rb_ractor_t, threads.sched.grq_node)) == NULL) {
+            RUBY_DEBUG_LOG("wait grq_cnt:%d", (int)vm->ractor.sched.grq_cnt);
+
+#if SNT_KEEP_SECONDS > 0
+            rb_hrtime_t abs = rb_hrtime_add(rb_hrtime_now(), RB_HRTIME_PER_SEC * SNT_KEEP_SECONDS);
+            if (native_cond_timedwait(&vm->ractor.sched.cond, &vm->ractor.sched.lock, &abs) == ETIMEDOUT) {
+                RUBY_DEBUG_LOG("timeout, grq_cnt:%d", (int)vm->ractor.sched.grq_cnt);
+                VM_ASSERT(r == NULL);
+                vm->ractor.sched.snt_cnt--;
+                vm->ractor.sched.running_cnt--;
+                break;
+            }
+            else {
+                RUBY_DEBUG_LOG("wakeup grq_cnt:%d", (int)vm->ractor.sched.grq_cnt);
+            }
+#else
+            ractor_sched_set_unlocked(vm, cr);
+            rb_native_cond_wait(&vm->ractor.sched.cond, &vm->ractor.sched.lock);
+            ractor_sched_set_locked(vm, cr);
+
+            RUBY_DEBUG_LOG("wakeup grq_cnt:%d", (int)vm->ractor.sched.grq_cnt);
+#endif
+        }
+
+        VM_ASSERT(rb_current_execution_context(false) == NULL);
+
+        if (r) {
+            VM_ASSERT(vm->ractor.sched.grq_cnt > 0);
+            vm->ractor.sched.grq_cnt--;
+            RUBY_DEBUG_LOG("r:%d grq_cnt:%u", (int)rb_ractor_id(r), vm->ractor.sched.grq_cnt);
+        }
+        else {
+            VM_ASSERT(SNT_KEEP_SECONDS > 0);
+            // timeout
+        }
+    }
+    ractor_sched_unlock(vm, cr);
+
+    return r;
+}
+
+void rb_ractor_lock_self(rb_ractor_t *r);
+void rb_ractor_unlock_self(rb_ractor_t *r);
+
+// The current thread for a ractor is put to "sleep" (descheduled in the STOPPED_FOREVER state) waiting for
+// a ractor action to wake it up. See docs for `ractor_sched_sleep_with_cleanup` for more info.
+void
+rb_ractor_sched_wait(rb_execution_context_t *ec, rb_ractor_t *cr, rb_unblock_function_t *ubf, void *ubf_arg)
+{
+    // ractor lock of cr is acquired
+
+    RUBY_DEBUG_LOG("start%s", "");
+
+    rb_thread_t * volatile th = rb_ec_thread_ptr(ec);
+    struct rb_thread_sched *sched = TH_SCHED(th);
+
+    if (ubf_set(th, ubf, ubf_arg)) {
+        // interrupted
+        return;
+    }
+
+    thread_sched_lock(sched, th);
+    {
+        // setup sleep
+        bool can_direct_transfer = !th_has_dedicated_nt(th);
+        RB_VM_SAVE_MACHINE_CONTEXT(th);
+        th->status = THREAD_STOPPED_FOREVER;
+        RB_INTERNAL_THREAD_HOOK(RUBY_INTERNAL_THREAD_EVENT_SUSPENDED, th);
+        thread_sched_wakeup_next_thread(sched, th, can_direct_transfer);
+
+        rb_ractor_unlock_self(cr);
+        {
+            // sleep
+            thread_sched_wait_running_turn(sched, th, can_direct_transfer);
+            th->status = THREAD_RUNNABLE;
+        }
+        rb_ractor_lock_self(cr);
+    }
+    thread_sched_unlock(sched, th);
+
+    ubf_clear(th);
+
+    RUBY_DEBUG_LOG("end%s", "");
+}
+
+void
+rb_ractor_sched_wakeup(rb_ractor_t *r, rb_thread_t *r_th)
+{
+    // ractor lock of r is NOT acquired
+    struct rb_thread_sched *sched = TH_SCHED(r_th);
+
+    RUBY_DEBUG_LOG("r:%u th:%d", (unsigned int)rb_ractor_id(r), r_th->serial);
+
+    thread_sched_lock(sched, r_th);
+    {
+        if (r_th->status == THREAD_STOPPED_FOREVER) {
+            thread_sched_to_ready_common(sched, r_th, true, false);
+        }
+    }
+    thread_sched_unlock(sched, r_th);
+}
+
+static bool
+ractor_sched_barrier_completed_p(rb_vm_t *vm)
+{
+    RUBY_DEBUG_LOG("run:%u wait:%u", vm->ractor.sched.running_cnt, vm->ractor.sched.barrier_waiting_cnt);
+    VM_ASSERT(vm->ractor.sched.running_cnt - 1 >= vm->ractor.sched.barrier_waiting_cnt);
+
+    return (vm->ractor.sched.running_cnt - vm->ractor.sched.barrier_waiting_cnt) == 1;
+}
+
+void
+rb_ractor_sched_barrier_start(rb_vm_t *vm, rb_ractor_t *cr)
+{
+    VM_ASSERT(cr == GET_RACTOR());
+    VM_ASSERT(vm->ractor.sync.lock_owner == cr); // VM is locked
+    VM_ASSERT(!vm->ractor.sched.barrier_waiting);
+    VM_ASSERT(vm->ractor.sched.barrier_waiting_cnt == 0);
+    VM_ASSERT(vm->ractor.sched.barrier_ractor == NULL);
+    VM_ASSERT(vm->ractor.sched.barrier_lock_rec == 0);
+
+    RUBY_DEBUG_LOG("start serial:%u", vm->ractor.sched.barrier_serial);
+
+    unsigned int lock_rec;
+
+    ractor_sched_lock(vm, cr);
+    {
+        vm->ractor.sched.barrier_waiting = true;
+        vm->ractor.sched.barrier_ractor = cr;
+        vm->ractor.sched.barrier_lock_rec = vm->ractor.sync.lock_rec;
+
+        // release VM lock
+        lock_rec = vm->ractor.sync.lock_rec;
+        vm->ractor.sync.lock_rec = 0;
+        vm->ractor.sync.lock_owner = NULL;
+        rb_native_mutex_unlock(&vm->ractor.sync.lock);
+
+        // interrupts all running threads
+        rb_thread_t *ith;
+        ccan_list_for_each(&vm->ractor.sched.running_threads, ith, sched.node.running_threads) {
+            if (ith->ractor != cr) {
+                RUBY_DEBUG_LOG("barrier request to th:%u", rb_th_serial(ith));
+                RUBY_VM_SET_VM_BARRIER_INTERRUPT(ith->ec);
+            }
+        }
+
+        // wait for other ractors
+        while (!ractor_sched_barrier_completed_p(vm)) {
+            ractor_sched_set_unlocked(vm, cr);
+            rb_native_cond_wait(&vm->ractor.sched.barrier_complete_cond, &vm->ractor.sched.lock);
+            ractor_sched_set_locked(vm, cr);
+        }
+
+        RUBY_DEBUG_LOG("completed seirial:%u", vm->ractor.sched.barrier_serial);
+
+        // no other ractors are there
+        vm->ractor.sched.barrier_serial++;
+        vm->ractor.sched.barrier_waiting_cnt = 0;
+        rb_native_cond_broadcast(&vm->ractor.sched.barrier_release_cond);
+
+        // acquire VM lock
+        rb_native_mutex_lock(&vm->ractor.sync.lock);
+        vm->ractor.sync.lock_rec = lock_rec;
+        vm->ractor.sync.lock_owner = cr;
+    }
+
+    // do not release ractor_sched_lock and threre is no newly added (resumed) thread
+    // thread_sched_setup_running_threads
+}
+
+// called from vm_lock_leave if the vm_lock used for barrierred
+void
+rb_ractor_sched_barrier_end(rb_vm_t *vm, rb_ractor_t *cr)
+{
+    RUBY_DEBUG_LOG("serial:%u", (unsigned int)vm->ractor.sched.barrier_serial - 1);
+    VM_ASSERT(vm->ractor.sched.barrier_waiting);
+    VM_ASSERT(vm->ractor.sched.barrier_ractor);
+    VM_ASSERT(vm->ractor.sched.barrier_lock_rec > 0);
+
+    vm->ractor.sched.barrier_waiting = false;
+    vm->ractor.sched.barrier_ractor = NULL;
+    vm->ractor.sched.barrier_lock_rec = 0;
+    ractor_sched_unlock(vm, cr);
+}
+
+static void
+ractor_sched_barrier_join_signal_locked(rb_vm_t *vm)
+{
+    if (ractor_sched_barrier_completed_p(vm)) {
+        rb_native_cond_signal(&vm->ractor.sched.barrier_complete_cond);
+    }
+}
+
+static void
+ractor_sched_barrier_join_wait_locked(rb_vm_t *vm, rb_thread_t *th)
+{
+    VM_ASSERT(vm->ractor.sched.barrier_waiting);
+
+    unsigned int barrier_serial = vm->ractor.sched.barrier_serial;
+
+    while (vm->ractor.sched.barrier_serial == barrier_serial) {
+        RUBY_DEBUG_LOG("sleep serial:%u", barrier_serial);
+        RB_VM_SAVE_MACHINE_CONTEXT(th);
+
+        rb_ractor_t *cr = th->ractor;
+        ractor_sched_set_unlocked(vm, cr);
+        rb_native_cond_wait(&vm->ractor.sched.barrier_release_cond, &vm->ractor.sched.lock);
+        ractor_sched_set_locked(vm, cr);
+
+        RUBY_DEBUG_LOG("wakeup serial:%u", barrier_serial);
+    }
+}
+
+void
+rb_ractor_sched_barrier_join(rb_vm_t *vm, rb_ractor_t *cr)
+{
+    VM_ASSERT(cr->threads.sched.running != NULL); // running ractor
+    VM_ASSERT(cr == GET_RACTOR());
+    VM_ASSERT(vm->ractor.sync.lock_owner == NULL); // VM is locked, but owner == NULL
+    VM_ASSERT(vm->ractor.sched.barrier_waiting);  // VM needs barrier sync
+
+#if USE_RUBY_DEBUG_LOG || VM_CHECK_MODE > 0
+    unsigned int barrier_serial = vm->ractor.sched.barrier_serial;
+#endif
+
+    RUBY_DEBUG_LOG("join");
+
+    rb_native_mutex_unlock(&vm->ractor.sync.lock);
+    {
+        VM_ASSERT(vm->ractor.sched.barrier_waiting);  // VM needs barrier sync
+        VM_ASSERT(vm->ractor.sched.barrier_serial == barrier_serial);
+
+        ractor_sched_lock(vm, cr);
+        {
+            // running_cnt
+            vm->ractor.sched.barrier_waiting_cnt++;
+            RUBY_DEBUG_LOG("waiting_cnt:%u serial:%u", vm->ractor.sched.barrier_waiting_cnt, barrier_serial);
+
+            ractor_sched_barrier_join_signal_locked(vm);
+            ractor_sched_barrier_join_wait_locked(vm, cr->threads.sched.running);
+        }
+        ractor_sched_unlock(vm, cr);
+    }
+
+    rb_native_mutex_lock(&vm->ractor.sync.lock);
+    // VM locked here
+}
+
+#if 0
+// TODO
+
+static void clear_thread_cache_altstack(void);
+
+static void
+rb_thread_sched_destroy(struct rb_thread_sched *sched)
+{
     /*
-     * prevent false positive from ruby_thread_has_gvl_p if that
-     * gets called from an interposing function wrapper
+     * only called once at VM shutdown (not atfork), another thread
+     * may still grab vm->gvl.lock when calling gvl_release at
+     * the end of thread_start_func_2
      */
-    if (USE_THREAD_CACHE)
-        ruby_thread_set_native(0);
+    if (0) {
+        rb_native_mutex_destroy(&sched->lock);
+    }
+    clear_thread_cache_altstack();
+}
+#endif
+
+#ifdef RB_THREAD_T_HAS_NATIVE_ID
+static int
+get_native_thread_id(void)
+{
+#ifdef __linux__
+    return (int)syscall(SYS_gettid);
+#elif defined(__FreeBSD__)
+    return pthread_getthreadid_np();
+#endif
+}
+#endif
+
+#if defined(HAVE_WORKING_FORK)
+static void
+thread_sched_atfork(struct rb_thread_sched *sched)
+{
+    current_fork_gen++;
+    rb_thread_sched_init(sched, true);
+    rb_thread_t *th =  GET_THREAD();
+    rb_vm_t *vm = GET_VM();
+
+    if (th_has_dedicated_nt(th)) {
+        vm->ractor.sched.snt_cnt = 0;
+    }
+    else {
+        vm->ractor.sched.snt_cnt = 1;
+    }
+    vm->ractor.sched.running_cnt = 0;
+
+    rb_native_mutex_initialize(&vm->ractor.sched.lock);
+#if VM_CHECK_MODE > 0
+    vm->ractor.sched.lock_owner = NULL;
+    vm->ractor.sched.locked = false;
+#endif
+
+    // rb_native_cond_destroy(&vm->ractor.sched.cond);
+    rb_native_cond_initialize(&vm->ractor.sched.cond);
+    rb_native_cond_initialize(&vm->ractor.sched.barrier_complete_cond);
+    rb_native_cond_initialize(&vm->ractor.sched.barrier_release_cond);
+
+    ccan_list_head_init(&vm->ractor.sched.grq);
+    ccan_list_head_init(&vm->ractor.sched.timeslice_threads);
+    ccan_list_head_init(&vm->ractor.sched.running_threads);
+
+    VM_ASSERT(sched->is_running);
+    sched->is_running_timeslice = false;
+
+    if (sched->running != th) {
+        thread_sched_to_running(sched, th);
+    }
+    else {
+        thread_sched_setup_running_threads(sched, th->ractor, vm, th, NULL, NULL);
+    }
+
+#ifdef RB_THREAD_T_HAS_NATIVE_ID
+    if (th->nt) {
+        th->nt->tid = get_native_thread_id();
+    }
+#endif
+}
+
+#endif
+
+#ifdef RB_THREAD_LOCAL_SPECIFIER
+static RB_THREAD_LOCAL_SPECIFIER rb_thread_t *ruby_native_thread;
+#else
+static pthread_key_t ruby_native_thread_key;
+#endif
+
+static void
+null_func(int i)
+{
+    /* null */
+    // This function can be called from signal handler
+    // RUBY_DEBUG_LOG("i:%d", i);
+}
+
+rb_thread_t *
+ruby_thread_from_native(void)
+{
+#ifdef RB_THREAD_LOCAL_SPECIFIER
+    return ruby_native_thread;
+#else
+    return pthread_getspecific(ruby_native_thread_key);
+#endif
 }
 
-#if USE_THREAD_CACHE
-static rb_thread_t *register_cached_thread_and_wait(void *);
+int
+ruby_thread_set_native(rb_thread_t *th)
+{
+    if (th) {
+#ifdef USE_UBF_LIST
+        ccan_list_node_init(&th->sched.node.ubf);
+#endif
+    }
+
+    // setup TLS
+
+    if (th && th->ec) {
+        rb_ractor_set_current_ec(th->ractor, th->ec);
+    }
+#ifdef RB_THREAD_LOCAL_SPECIFIER
+    ruby_native_thread = th;
+    return 1;
 #else
-# define register_cached_thread_and_wait(altstack) ((void)(altstack), NULL)
+    return pthread_setspecific(ruby_native_thread_key, th) == 0;
+#endif
+}
+
+static void native_thread_setup(struct rb_native_thread *nt);
+static void native_thread_setup_on_thread(struct rb_native_thread *nt);
+
+void
+Init_native_thread(rb_thread_t *main_th)
+{
+#if defined(HAVE_PTHREAD_CONDATTR_SETCLOCK)
+    if (condattr_monotonic) {
+        int r = pthread_condattr_init(condattr_monotonic);
+        if (r == 0) {
+            r = pthread_condattr_setclock(condattr_monotonic, CLOCK_MONOTONIC);
+        }
+        if (r) condattr_monotonic = NULL;
+    }
+#endif
+
+#ifndef RB_THREAD_LOCAL_SPECIFIER
+    if (pthread_key_create(&ruby_native_thread_key, 0) == EAGAIN) {
+        rb_bug("pthread_key_create failed (ruby_native_thread_key)");
+    }
+    if (pthread_key_create(&ruby_current_ec_key, 0) == EAGAIN) {
+        rb_bug("pthread_key_create failed (ruby_current_ec_key)");
+    }
+#endif
+    ruby_posix_signal(SIGVTALRM, null_func);
+
+    // setup vm
+    rb_vm_t *vm = main_th->vm;
+    rb_native_mutex_initialize(&vm->ractor.sched.lock);
+    rb_native_cond_initialize(&vm->ractor.sched.cond);
+    rb_native_cond_initialize(&vm->ractor.sched.barrier_complete_cond);
+    rb_native_cond_initialize(&vm->ractor.sched.barrier_release_cond);
+
+    ccan_list_head_init(&vm->ractor.sched.grq);
+    ccan_list_head_init(&vm->ractor.sched.timeslice_threads);
+    ccan_list_head_init(&vm->ractor.sched.running_threads);
+
+    // setup main thread
+    main_th->nt->thread_id = pthread_self();
+    main_th->nt->serial = 1;
+#ifdef RUBY_NT_SERIAL
+    ruby_nt_serial = 1;
+#endif
+    ruby_thread_set_native(main_th);
+    native_thread_setup(main_th->nt);
+    native_thread_setup_on_thread(main_th->nt);
+
+    TH_SCHED(main_th)->running = main_th;
+    main_th->has_dedicated_nt = 1;
+
+    thread_sched_setup_running_threads(TH_SCHED(main_th), main_th->ractor, vm, main_th, NULL, NULL);
+
+    // setup main NT
+    main_th->nt->dedicated = 1;
+    main_th->nt->vm = vm;
+
+    // setup mn
+    vm->ractor.sched.dnt_cnt = 1;
+}
+
+extern int ruby_mn_threads_enabled;
+
+void
+ruby_mn_threads_params(void)
+{
+    rb_vm_t *vm = GET_VM();
+    rb_ractor_t *main_ractor = GET_RACTOR();
+
+    const char *mn_threads_cstr = getenv("RUBY_MN_THREADS");
+    bool enable_mn_threads = false;
+
+    if (USE_MN_THREADS && mn_threads_cstr && (enable_mn_threads = atoi(mn_threads_cstr) > 0)) {
+        // enabled
+        ruby_mn_threads_enabled = 1;
+    }
+    main_ractor->threads.sched.enable_mn_threads = enable_mn_threads;
+
+    const char *max_cpu_cstr = getenv("RUBY_MAX_CPU");
+    const int default_max_cpu = 8; // TODO: CPU num?
+    int max_cpu = default_max_cpu;
+
+    if (USE_MN_THREADS && max_cpu_cstr)  {
+        int given_max_cpu = atoi(max_cpu_cstr);
+        if (given_max_cpu > 0) {
+            max_cpu = given_max_cpu;
+        }
+    }
+
+    vm->ractor.sched.max_cpu = max_cpu;
+}
+
+static void
+native_thread_dedicated_inc(rb_vm_t *vm, rb_ractor_t *cr, struct rb_native_thread *nt)
+{
+    RUBY_DEBUG_LOG("nt:%d %d->%d", nt->serial, nt->dedicated, nt->dedicated + 1);
+
+    if (nt->dedicated == 0) {
+        ractor_sched_lock(vm, cr);
+        {
+            vm->ractor.sched.snt_cnt--;
+            vm->ractor.sched.dnt_cnt++;
+        }
+        ractor_sched_unlock(vm, cr);
+    }
+
+    nt->dedicated++;
+}
+
+static void
+native_thread_dedicated_dec(rb_vm_t *vm, rb_ractor_t *cr, struct rb_native_thread *nt)
+{
+    RUBY_DEBUG_LOG("nt:%d %d->%d", nt->serial, nt->dedicated, nt->dedicated - 1);
+    VM_ASSERT(nt->dedicated > 0);
+    nt->dedicated--;
+
+    if (nt->dedicated == 0) {
+        ractor_sched_lock(vm, cr);
+        {
+            nt->vm->ractor.sched.snt_cnt++;
+            nt->vm->ractor.sched.dnt_cnt--;
+        }
+        ractor_sched_unlock(vm, cr);
+    }
+}
+
+static void
+native_thread_assign(struct rb_native_thread *nt, rb_thread_t *th)
+{
+#if USE_RUBY_DEBUG_LOG
+    if (nt) {
+        if (th->nt) {
+            RUBY_DEBUG_LOG("th:%d nt:%d->%d", (int)th->serial, (int)th->nt->serial, (int)nt->serial);
+        }
+        else {
+            RUBY_DEBUG_LOG("th:%d nt:NULL->%d", (int)th->serial, (int)nt->serial);
+        }
+    }
+    else {
+        if (th->nt) {
+            RUBY_DEBUG_LOG("th:%d nt:%d->NULL", (int)th->serial, (int)th->nt->serial);
+        }
+        else {
+            RUBY_DEBUG_LOG("th:%d nt:NULL->NULL", (int)th->serial);
+        }
+    }
 #endif
 
+    th->nt = nt;
+}
+
+static void
+native_thread_destroy_atfork(struct rb_native_thread *nt)
+{
+    if (nt) {
+        /* We can't call rb_native_cond_destroy here because according to the
+         * specs of pthread_cond_destroy:
+         *
+         *   Attempting to destroy a condition variable upon which other threads
+         *   are currently blocked results in undefined behavior.
+         *
+         * Specifically, glibc's pthread_cond_destroy waits on all the other
+         * listeners. Since after forking all the threads are dead, the condition
+         * variable's listeners will never wake up, so it will hang forever.
+         */
+
+        RB_ALTSTACK_FREE(nt->altstack);
+        ruby_xfree(nt->nt_context);
+        ruby_xfree(nt);
+    }
+}
+
+static void
+native_thread_destroy(struct rb_native_thread *nt)
+{
+    if (nt) {
+        rb_native_cond_destroy(&nt->cond.readyq);
+
+        if (&nt->cond.readyq != &nt->cond.intr) {
+            rb_native_cond_destroy(&nt->cond.intr);
+        }
+
+        native_thread_destroy_atfork(nt);
+    }
+}
+
 #if defined HAVE_PTHREAD_GETATTR_NP || defined HAVE_PTHREAD_ATTR_GET_NP
 #define STACKADDR_AVAILABLE 1
 #elif defined HAVE_PTHREAD_GET_STACKADDR_NP && defined HAVE_PTHREAD_GET_STACKSIZE_NP
@@ -913,67 +1987,13 @@ space_size(size_t stack_size)
     }
 }
 
-#ifdef __linux__
-static __attribute__((noinline)) void
-reserve_stack(volatile char *limit, size_t size)
-{
-# ifdef C_ALLOCA
-#   error needs alloca()
-# endif
-    struct rlimit rl;
-    volatile char buf[0x100];
-    enum {stack_check_margin = 0x1000}; /* for -fstack-check */
-
-    STACK_GROW_DIR_DETECTION;
-
-    if (!getrlimit(RLIMIT_STACK, &rl) && rl.rlim_cur == RLIM_INFINITY)
-        return;
-
-    if (size < stack_check_margin) return;
-    size -= stack_check_margin;
-
-    size -= sizeof(buf); /* margin */
-    if (IS_STACK_DIR_UPPER()) {
-        const volatile char *end = buf + sizeof(buf);
-        limit += size;
-        if (limit > end) {
-            /* |<-bottom (=limit(a))                                     top->|
-             * | .. |<-buf 256B |<-end                          | stack check |
-             * |  256B  |              =size=                   | margin (4KB)|
-             * |              =size=         limit(b)->|  256B  |             |
-             * |                |       alloca(sz)     |        |             |
-             * | .. |<-buf      |<-limit(c)    [sz-1]->0>       |             |
-             */
-            size_t sz = limit - end;
-            limit = alloca(sz);
-            limit[sz-1] = 0;
-        }
-    }
-    else {
-        limit -= size;
-        if (buf > limit) {
-            /* |<-top (=limit(a))                                     bottom->|
-             * | .. | 256B buf->|                               | stack check |
-             * |  256B  |              =size=                   | margin (4KB)|
-             * |              =size=         limit(b)->|  256B  |             |
-             * |                |       alloca(sz)     |        |             |
-             * | .. |      buf->|           limit(c)-><0>       |             |
-             */
-            size_t sz = buf - limit;
-            limit = alloca(sz);
-            limit[0] = 0;
-        }
-    }
-}
-#else
-# define reserve_stack(limit, size) ((void)(limit), (void)(size))
-#endif
-
-#undef ruby_init_stack
-void
-ruby_init_stack(volatile VALUE *addr)
+static void
+native_thread_init_main_thread_stack(void *addr)
 {
     native_main_thread.id = pthread_self();
+#ifdef RUBY_ASAN_ENABLED
+    addr = asan_get_real_stack_addr((void *)addr);
+#endif
 
 #if MAINSTACKADDR_AVAILABLE
     if (native_main_thread.stack_maxsize) return;
@@ -983,7 +2003,6 @@ ruby_init_stack(volatile VALUE *addr)
         if (get_main_stack(&stackaddr, &size) == 0) {
             native_main_thread.stack_maxsize = size;
             native_main_thread.stack_start = stackaddr;
-            reserve_stack(stackaddr, size);
             goto bound_check;
         }
     }
@@ -993,8 +2012,8 @@ ruby_init_stack(volatile VALUE *addr)
 #else
     if (!native_main_thread.stack_start ||
         STACK_UPPER((VALUE *)(void *)&addr,
-                    native_main_thread.stack_start > addr,
-                    native_main_thread.stack_start < addr)) {
+                    native_main_thread.stack_start > (VALUE *)addr,
+                    native_main_thread.stack_start < (VALUE *)addr)) {
         native_main_thread.stack_start = (VALUE *)addr;
     }
 #endif
@@ -1056,9 +2075,19 @@ ruby_init_stack(volatile VALUE *addr)
     {int err = (expr); if (err) {rb_bug_errno(#expr, err);}}
 
 static int
-native_thread_init_stack(rb_thread_t *th)
+native_thread_init_stack(rb_thread_t *th, void *local_in_parent_frame)
 {
     rb_nativethread_id_t curr = pthread_self();
+#ifdef RUBY_ASAN_ENABLED
+    local_in_parent_frame = asan_get_real_stack_addr(local_in_parent_frame);
+    th->ec->machine.asan_fake_stack_handle = asan_get_thread_fake_stack_handle();
+#endif
+
+    if (!native_main_thread.id) {
+        /* This thread is the first thread, must be the main thread -
+         * configure the native_main_thread object */
+        native_thread_init_main_thread_stack(local_in_parent_frame);
+    }
 
     if (pthread_equal(curr, native_main_thread.id)) {
         th->ec->machine.stack_start = native_main_thread.stack_start;
@@ -1066,219 +2095,312 @@ native_thread_init_stack(rb_thread_t *th)
     }
     else {
 #ifdef STACKADDR_AVAILABLE
-        void *start;
-        size_t size;
-
-        if (get_stack(&start, &size) == 0) {
-            uintptr_t diff = (uintptr_t)start - (uintptr_t)&curr;
-            th->ec->machine.stack_start = (VALUE *)&curr;
-            th->ec->machine.stack_maxsize = size - diff;
+        if (th_has_dedicated_nt(th)) {
+            void *start;
+            size_t size;
+
+            if (get_stack(&start, &size) == 0) {
+                uintptr_t diff = (uintptr_t)start - (uintptr_t)local_in_parent_frame;
+                th->ec->machine.stack_start = local_in_parent_frame;
+                th->ec->machine.stack_maxsize = size - diff;
+            }
         }
 #else
         rb_raise(rb_eNotImpError, "ruby engine can initialize only in the main thread");
 #endif
     }
 
-    return 0;
+    return 0;
+}
+
+struct nt_param {
+    rb_vm_t *vm;
+    struct rb_native_thread *nt;
+};
+
+static void *
+nt_start(void *ptr);
+
+static int
+native_thread_create0(struct rb_native_thread *nt)
+{
+    int err = 0;
+    pthread_attr_t attr;
+
+    const size_t stack_size = nt->vm->default_params.thread_machine_stack_size;
+    const size_t space = space_size(stack_size);
+
+    nt->machine_stack_maxsize = stack_size - space;
+
+#ifdef USE_SIGALTSTACK
+    nt->altstack = rb_allocate_sigaltstack();
+#endif
+
+    CHECK_ERR(pthread_attr_init(&attr));
+
+# ifdef PTHREAD_STACK_MIN
+    RUBY_DEBUG_LOG("stack size: %lu", (unsigned long)stack_size);
+    CHECK_ERR(pthread_attr_setstacksize(&attr, stack_size));
+# endif
+
+# ifdef HAVE_PTHREAD_ATTR_SETINHERITSCHED
+    CHECK_ERR(pthread_attr_setinheritsched(&attr, PTHREAD_INHERIT_SCHED));
+# endif
+    CHECK_ERR(pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED));
+
+    err = pthread_create(&nt->thread_id, &attr, nt_start, nt);
+
+    RUBY_DEBUG_LOG("nt:%d err:%d", (int)nt->serial, err);
+
+    CHECK_ERR(pthread_attr_destroy(&attr));
+
+    return err;
+}
+
+static void
+native_thread_setup(struct rb_native_thread *nt)
+{
+    // init cond
+    rb_native_cond_initialize(&nt->cond.readyq);
+
+    if (&nt->cond.readyq != &nt->cond.intr) {
+        rb_native_cond_initialize(&nt->cond.intr);
+    }
 }
 
-#ifndef __CYGWIN__
-#define USE_NATIVE_THREAD_INIT 1
+static void
+native_thread_setup_on_thread(struct rb_native_thread *nt)
+{
+    // init tid
+#ifdef RB_THREAD_T_HAS_NATIVE_ID
+    nt->tid = get_native_thread_id();
 #endif
 
-static void *
-thread_start_func_1(void *th_ptr)
+    // init signal handler
+    RB_ALTSTACK_INIT(nt->altstack, nt->altstack);
+}
+
+static struct rb_native_thread *
+native_thread_alloc(void)
 {
-    rb_thread_t *th = th_ptr;
+    struct rb_native_thread *nt = ZALLOC(struct rb_native_thread);
+    native_thread_setup(nt);
 
-#if USE_RUBY_DEBUG_LOG && defined(RUBY_NT_SERIAL)
-    ruby_nt_serial = th->nt->serial;
+#if USE_MN_THREADS
+    nt->nt_context = ruby_xmalloc(sizeof(struct coroutine_context));
 #endif
 
-    RB_ALTSTACK_INIT(void *altstack, th->nt->altstack);
-    do {
-#if !defined USE_NATIVE_THREAD_INIT
-        VALUE stack_start;
+#if USE_RUBY_DEBUG_LOG
+    static rb_atomic_t nt_serial = 2;
+    nt->serial = RUBY_ATOMIC_FETCH_ADD(nt_serial, 1);
 #endif
+    return nt;
+}
 
-#if defined USE_NATIVE_THREAD_INIT
-        native_thread_init_stack(th);
-#endif
+static int
+native_thread_create_dedicated(rb_thread_t *th)
+{
+    th->nt = native_thread_alloc();
+    th->nt->vm = th->vm;
+    th->nt->running_thread = th;
+    th->nt->dedicated = 1;
 
-        native_thread_init(th->nt);
+    // vm stack
+    size_t vm_stack_word_size = th->vm->default_params.thread_vm_stack_size / sizeof(VALUE);
+    void *vm_stack = ruby_xmalloc(vm_stack_word_size * sizeof(VALUE));
+    th->sched.malloc_stack = true;
+    rb_ec_initialize_vm_stack(th->ec, vm_stack, vm_stack_word_size);
+    th->sched.context_stack = vm_stack;
 
-        RB_INTERNAL_THREAD_HOOK(RUBY_INTERNAL_THREAD_EVENT_STARTED);
 
-        /* run */
-#if defined USE_NATIVE_THREAD_INIT
-        thread_start_func_2(th, th->ec->machine.stack_start);
-#else
-        thread_start_func_2(th, &stack_start);
-#endif
-    } while ((th = register_cached_thread_and_wait(RB_ALTSTACK(altstack))) != 0);
-    if (!USE_THREAD_CACHE) {
-        RB_ALTSTACK_FREE(altstack);
+    int err = native_thread_create0(th->nt);
+    if (!err) {
+        // setup
+        thread_sched_to_ready(TH_SCHED(th), th);
     }
-    return 0;
+    return err;
 }
 
-struct cached_thread_entry {
-    rb_nativethread_cond_t cond;
-    rb_nativethread_id_t thread_id;
-    rb_thread_t *th;
-    void *altstack;
-    struct ccan_list_node node;
-};
-
-#if USE_THREAD_CACHE
-static rb_nativethread_lock_t thread_cache_lock = RB_NATIVETHREAD_LOCK_INIT;
-static CCAN_LIST_HEAD(cached_thread_head);
-
-#  if defined(HAVE_WORKING_FORK)
 static void
-thread_cache_reset(void)
+call_thread_start_func_2(rb_thread_t *th)
 {
-    rb_native_mutex_initialize(&thread_cache_lock);
-    ccan_list_head_init(&cached_thread_head);
+    /* Capture the address of a local in this stack frame to mark the beginning of the
+       machine stack for this thread. This is required even if we can tell the real
+       stack beginning from the pthread API in native_thread_init_stack, because
+       glibc stores some of its own data on the stack before calling into user code
+       on a new thread, and replacing that data on fiber-switch would break it (see
+       bug #13887) */
+    VALUE stack_start = 0;
+    VALUE *stack_start_addr = asan_get_real_stack_addr(&stack_start);
+
+    native_thread_init_stack(th, stack_start_addr);
+    thread_start_func_2(th, th->ec->machine.stack_start);
 }
-#  endif
 
-/*
- * number of seconds to cache for, I think 1-5s is sufficient to obviate
- * the need for thread pool in many network programs (taking into account
- * worst case network latency across the globe) without wasting memory
- */
-#ifndef THREAD_CACHE_TIME
-#  define THREAD_CACHE_TIME ((rb_hrtime_t)3 * RB_HRTIME_PER_SEC)
+static void *
+nt_start(void *ptr)
+{
+    struct rb_native_thread *nt = (struct rb_native_thread *)ptr;
+    rb_vm_t *vm = nt->vm;
+
+    native_thread_setup_on_thread(nt);
+
+    // init tid
+#ifdef RB_THREAD_T_HAS_NATIVE_ID
+    nt->tid = get_native_thread_id();
 #endif
 
-static rb_thread_t *
-register_cached_thread_and_wait(void *altstack)
-{
-    rb_hrtime_t end = THREAD_CACHE_TIME;
-    struct cached_thread_entry entry;
+#if USE_RUBY_DEBUG_LOG && defined(RUBY_NT_SERIAL)
+    ruby_nt_serial = nt->serial;
+#endif
 
-    rb_native_cond_initialize(&entry.cond);
-    entry.altstack = altstack;
-    entry.th = NULL;
-    entry.thread_id = pthread_self();
-    end = native_cond_timeout(&entry.cond, end);
+    RUBY_DEBUG_LOG("nt:%u", nt->serial);
 
-    rb_native_mutex_lock(&thread_cache_lock);
-    {
-        ccan_list_add(&cached_thread_head, &entry.node);
+    if (!nt->dedicated) {
+        coroutine_initialize_main(nt->nt_context);
+    }
 
-        native_cond_timedwait(&entry.cond, &thread_cache_lock, &end);
+    while (1) {
+        if (nt->dedicated) {
+            // wait running turn
+            rb_thread_t *th = nt->running_thread;
+            struct rb_thread_sched *sched = TH_SCHED(th);
 
-        if (entry.th == NULL) { /* unused */
-            ccan_list_del(&entry.node);
+            RUBY_DEBUG_LOG("on dedicated th:%u", rb_th_serial(th));
+            ruby_thread_set_native(th);
+
+            thread_sched_lock(sched, th);
+            {
+                if (sched->running == th) {
+                    thread_sched_add_running_thread(sched, th);
+                }
+                thread_sched_wait_running_turn(sched, th, false);
+            }
+            thread_sched_unlock(sched, th);
+
+            // start threads
+            call_thread_start_func_2(th);
+            break; // TODO: allow to change to the SNT
         }
-    }
-    rb_native_mutex_unlock(&thread_cache_lock);
+        else {
+            RUBY_DEBUG_LOG("check next");
+            rb_ractor_t *r = ractor_sched_deq(vm, NULL);
+
+            if (r) {
+                struct rb_thread_sched *sched = &r->threads.sched;
+
+                thread_sched_lock(sched, NULL);
+                {
+                    rb_thread_t *next_th = sched->running;
+
+                    if (next_th && next_th->nt == NULL) {
+                        RUBY_DEBUG_LOG("nt:%d next_th:%d", (int)nt->serial, (int)next_th->serial);
+                        thread_sched_switch0(nt->nt_context, next_th, nt, false);
+                    }
+                    else {
+                        RUBY_DEBUG_LOG("no schedulable threads -- next_th:%p", next_th);
+                    }
+                }
+                thread_sched_unlock(sched, NULL);
+            }
+            else {
+                // timeout -> deleted.
+                break;
+            }
 
-    rb_native_cond_destroy(&entry.cond);
-    if (!entry.th) {
-        RB_ALTSTACK_FREE(entry.altstack);
+            if (nt->dedicated) {
+                // SNT becomes DNT while running
+                break;
+            }
+        }
     }
 
-    return entry.th;
+    return NULL;
 }
-#else
-#  if defined(HAVE_WORKING_FORK)
-static void thread_cache_reset(void) { }
-#  endif
-#define thread_cache_lock *(rb_nativethread_lock_t *)NULL
-#define cached_thread_head *(struct ccan_list_head *)NULL
+
+static int native_thread_create_shared(rb_thread_t *th);
+
+#if USE_MN_THREADS
+static void nt_free_stack(void *mstack);
 #endif
 
-static int
-use_cached_thread(rb_thread_t *th)
+void
+rb_threadptr_remove(rb_thread_t *th)
 {
-    if (!USE_THREAD_CACHE) return 0;
-
-    struct cached_thread_entry *entry;
+#if USE_MN_THREADS
+    if (th->sched.malloc_stack) {
+        // dedicated
+        return;
+    }
+    else {
+        rb_vm_t *vm = th->vm;
+        th->sched.finished = false;
 
-    rb_native_mutex_lock(&thread_cache_lock);
-    entry = ccan_list_pop(&cached_thread_head, struct cached_thread_entry, node);
-    if (entry) {
-        entry->th = th;
-        /* th->nt->thread_id must be set before signal for Thread#name= */
-        th->nt->thread_id = entry->thread_id;
-        rb_native_cond_signal(&entry->cond);
+        RB_VM_LOCKING() {
+            ccan_list_add(&vm->ractor.sched.zombie_threads, &th->sched.node.zombie_threads);
+        }
     }
-    rb_native_mutex_unlock(&thread_cache_lock);
-    return !!entry;
+#endif
 }
 
-// TODO
-static void
-clear_thread_cache_altstack(void)
+void
+rb_threadptr_sched_free(rb_thread_t *th)
 {
-    if (!USE_THREAD_CACHE) return;
+#if USE_MN_THREADS
+    if (th->sched.malloc_stack) {
+        // has dedicated
+        ruby_xfree(th->sched.context_stack);
+        native_thread_destroy(th->nt);
+    }
+    else {
+        nt_free_stack(th->sched.context_stack);
+        // TODO: how to free nt and nt->altstack?
+    }
 
-    struct cached_thread_entry *entry;
+    ruby_xfree(th->sched.context);
+    th->sched.context = NULL;
+    // VM_ASSERT(th->sched.context == NULL);
+#else
+    ruby_xfree(th->sched.context_stack);
+    native_thread_destroy(th->nt);
+#endif
 
-    rb_native_mutex_lock(&thread_cache_lock);
-    ccan_list_for_each(&cached_thread_head, entry, node) {
-        void MAYBE_UNUSED(*altstack) = entry->altstack;
-        entry->altstack = 0;
-        RB_ALTSTACK_FREE(altstack);
-    }
-    rb_native_mutex_unlock(&thread_cache_lock);
+    th->nt = NULL;
 }
 
-static struct rb_native_thread *
-native_thread_alloc(void)
+void
+rb_thread_sched_mark_zombies(rb_vm_t *vm)
 {
-    struct rb_native_thread *nt = ZALLOC(struct rb_native_thread);
-#if USE_RUBY_DEBUG_LOG
-    static rb_atomic_t nt_serial = 1;
-    nt->serial = RUBY_ATOMIC_FETCH_ADD(nt_serial, 1);
-#endif
-    return nt;
+    if (!ccan_list_empty(&vm->ractor.sched.zombie_threads)) {
+        rb_thread_t *zombie_th, *next_zombie_th;
+        ccan_list_for_each_safe(&vm->ractor.sched.zombie_threads, zombie_th, next_zombie_th, sched.node.zombie_threads) {
+            if (zombie_th->sched.finished) {
+                ccan_list_del_init(&zombie_th->sched.node.zombie_threads);
+            }
+            else {
+                rb_gc_mark(zombie_th->self);
+            }
+        }
+    }
 }
 
 static int
 native_thread_create(rb_thread_t *th)
 {
-    int err = 0;
-
     VM_ASSERT(th->nt == 0);
-    th->nt = native_thread_alloc();
+    RUBY_DEBUG_LOG("th:%d has_dnt:%d", th->serial, th->has_dedicated_nt);
+    RB_INTERNAL_THREAD_HOOK(RUBY_INTERNAL_THREAD_EVENT_STARTED, th);
 
-    if (use_cached_thread(th)) {
-        RUBY_DEBUG_LOG("use cached nt. th:%u", rb_th_serial(th));
+    if (!th->ractor->threads.sched.enable_mn_threads) {
+        th->has_dedicated_nt = 1;
     }
-    else {
-        pthread_attr_t attr;
-        const size_t stack_size = th->vm->default_params.thread_machine_stack_size + th->vm->default_params.thread_vm_stack_size;
-        const size_t space = space_size(stack_size);
-
-#ifdef USE_SIGALTSTACK
-        th->nt->altstack = rb_allocate_sigaltstack();
-#endif
-        th->ec->machine.stack_maxsize = stack_size - space;
-
-        CHECK_ERR(pthread_attr_init(&attr));
-
-# ifdef PTHREAD_STACK_MIN
-        RUBY_DEBUG_LOG("stack size: %lu", (unsigned long)stack_size);
-        CHECK_ERR(pthread_attr_setstacksize(&attr, stack_size));
-# endif
-
-# ifdef HAVE_PTHREAD_ATTR_SETINHERITSCHED
-        CHECK_ERR(pthread_attr_setinheritsched(&attr, PTHREAD_INHERIT_SCHED));
-# endif
-        CHECK_ERR(pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED));
-
-        err = pthread_create(&th->nt->thread_id, &attr, thread_start_func_1, th);
 
-        RUBY_DEBUG_LOG("th:%u err:%d", rb_th_serial(th), err);
-
-        /* should be done in the created thread */
-        CHECK_ERR(pthread_attr_destroy(&attr));
+    if (th->has_dedicated_nt) {
+        return native_thread_create_dedicated(th);
+    }
+    else {
+        return native_thread_create_shared(th);
     }
-    return err;
 }
 
 #if USE_NATIVE_THREAD_PRIORITY
@@ -1321,7 +2443,7 @@ static void
 ubf_pthread_cond_signal(void *ptr)
 {
     rb_thread_t *th = (rb_thread_t *)ptr;
-    RUBY_DEBUG_LOG("th:%u", rb_th_serial(th));
+    RUBY_DEBUG_LOG("th:%u on nt:%d", rb_th_serial(th), (int)th->nt->serial);
     rb_native_cond_signal(&th->nt->cond.intr);
 }
 
@@ -1386,33 +2508,54 @@ ubf_list_atfork(void)
     rb_native_mutex_initialize(&ubf_list_lock);
 }
 
+RBIMPL_ATTR_MAYBE_UNUSED()
+static bool
+ubf_list_contain_p(rb_thread_t *th)
+{
+    rb_thread_t *list_th;
+    ccan_list_for_each(&ubf_list_head, list_th, sched.node.ubf) {
+        if (list_th == th) return true;
+    }
+    return false;
+}
+
 /* The thread 'th' is registered to be trying unblock. */
 static void
 register_ubf_list(rb_thread_t *th)
 {
+    RUBY_DEBUG_LOG("th:%u", rb_th_serial(th));
     struct ccan_list_node *node = &th->sched.node.ubf;
 
-    if (ccan_list_empty((struct ccan_list_head*)node)) {
-        rb_native_mutex_lock(&ubf_list_lock);
-        ccan_list_add(&ubf_list_head, node);
-        rb_native_mutex_unlock(&ubf_list_lock);
+    VM_ASSERT(th->unblock.func != NULL);
+
+    rb_native_mutex_lock(&ubf_list_lock);
+    {
+        // check not connected yet
+        if (ccan_list_empty((struct ccan_list_head*)node)) {
+            VM_ASSERT(!ubf_list_contain_p(th));
+            ccan_list_add(&ubf_list_head, node);
+        }
     }
+    rb_native_mutex_unlock(&ubf_list_lock);
+
+    timer_thread_wakeup();
 }
 
 /* The thread 'th' is unblocked. It no longer need to be registered. */
 static void
 unregister_ubf_list(rb_thread_t *th)
 {
+    RUBY_DEBUG_LOG("th:%u", rb_th_serial(th));
     struct ccan_list_node *node = &th->sched.node.ubf;
 
     /* we can't allow re-entry into ubf_list_head */
-    VM_ASSERT(th->unblock.func == 0);
+    VM_ASSERT(th->unblock.func == NULL);
 
     if (!ccan_list_empty((struct ccan_list_head*)node)) {
         rb_native_mutex_lock(&ubf_list_lock);
-        ccan_list_del_init(node);
-        if (ccan_list_empty(&ubf_list_head) && !rb_signal_buff_size()) {
-            ubf_timer_disarm();
+        {
+            VM_ASSERT(ubf_list_contain_p(th));
+            ccan_list_del_init(node);
         }
         rb_native_mutex_unlock(&ubf_list_lock);
     }
@@ -1425,7 +2568,8 @@ unregister_ubf_list(rb_thread_t *th)
 static void
 ubf_wakeup_thread(rb_thread_t *th)
 {
-    RUBY_DEBUG_LOG("th:%u", rb_th_serial(th));
+    RUBY_DEBUG_LOG("th:%u thread_id:%p", rb_th_serial(th), (void *)th->nt->thread_id);
+
     pthread_kill(th->nt->thread_id, SIGVTALRM);
 }
 
@@ -1433,53 +2577,27 @@ static void
 ubf_select(void *ptr)
 {
     rb_thread_t *th = (rb_thread_t *)ptr;
-    struct rb_thread_sched *sched = TH_SCHED(th);
-    const rb_thread_t *cur = ruby_thread_from_native(); /* may be 0 */
-
-    register_ubf_list(th);
-
-    /*
-     * ubf_wakeup_thread() doesn't guarantee to wake up a target thread.
-     * Therefore, we repeatedly call ubf_wakeup_thread() until a target thread
-     * exit from ubf function.  We must have a timer to perform this operation.
-     * We use double-checked locking here because this function may be called
-     * while vm->gvl.lock is held in do_gvl_timer.
-     * There is also no need to start a timer if we're the designated
-     * sigwait_th thread, otherwise we can deadlock with a thread
-     * in unblock_function_clear.
-     */
-    if (cur != sched->timer && cur != sigwait_th) {
-        /*
-         * Double-checked locking above was to prevent nested locking
-         * by the SAME thread.  We use trylock here to prevent deadlocks
-         * between DIFFERENT threads
-         */
-        if (rb_native_mutex_trylock(&sched->lock) == 0) {
-            if (!sched->timer) {
-                rb_thread_wakeup_timer_thread(-1);
-            }
-            rb_native_mutex_unlock(&sched->lock);
-        }
-    }
-
+    RUBY_DEBUG_LOG("wakeup th:%u", rb_th_serial(th));
     ubf_wakeup_thread(th);
+    register_ubf_list(th);
 }
 
-static int
+static bool
 ubf_threads_empty(void)
 {
-    return ccan_list_empty(&ubf_list_head);
+    return ccan_list_empty(&ubf_list_head) != 0;
 }
 
 static void
 ubf_wakeup_all_threads(void)
 {
     if (!ubf_threads_empty()) {
-        rb_native_mutex_lock(&ubf_list_lock);
         rb_thread_t *th;
-
-        ccan_list_for_each(&ubf_list_head, th, sched.node.ubf) {
-            ubf_wakeup_thread(th);
+        rb_native_mutex_lock(&ubf_list_lock);
+        {
+            ccan_list_for_each(&ubf_list_head, th, sched.node.ubf) {
+                ubf_wakeup_thread(th);
+            }
         }
         rb_native_mutex_unlock(&ubf_list_lock);
     }
@@ -1490,151 +2608,35 @@ ubf_wakeup_all_threads(void)
 #define unregister_ubf_list(th) (void)(th)
 #define ubf_select 0
 static void ubf_wakeup_all_threads(void) { return; }
-static int ubf_threads_empty(void) { return 1; }
+static bool ubf_threads_empty(void) { return true; }
 #define ubf_list_atfork() do {} while (0)
 #endif /* USE_UBF_LIST */
 
 #define TT_DEBUG 0
 #define WRITE_CONST(fd, str) (void)(write((fd),(str),sizeof(str)-1)<0)
 
-static struct {
-    /* pipes are closed in forked children when owner_process does not match */
-    int normal[2]; /* [0] == sigwait_fd */
-    int ub_main[2]; /* unblock main thread from native_ppoll_sleep */
-
-    /* volatile for signal handler use: */
-    volatile rb_serial_t fork_gen;
-} signal_self_pipe = {
-    {-1, -1},
-    {-1, -1},
-};
-
-/* only use signal-safe system calls here */
-static void
-rb_thread_wakeup_timer_thread_fd(int fd)
-{
-#if USE_EVENTFD
-    const uint64_t buff = 1;
-#else
-    const char buff = '!';
-#endif
-    ssize_t result;
-
-    /* already opened */
-    if (fd >= 0) {
-      retry:
-        if ((result = write(fd, &buff, sizeof(buff))) <= 0) {
-            int e = errno;
-            switch (e) {
-              case EINTR: goto retry;
-              case EAGAIN:
-#if defined(EWOULDBLOCK) && EWOULDBLOCK != EAGAIN
-              case EWOULDBLOCK:
-#endif
-                break;
-              default:
-                async_bug_fd("rb_thread_wakeup_timer_thread: write", e, fd);
-            }
-        }
-        if (TT_DEBUG) WRITE_CONST(2, "rb_thread_wakeup_timer_thread: write\n");
-    }
-    else {
-        /* ignore wakeup */
-    }
-}
-
-/*
- * This ensures we get a SIGVTALRM in TIME_QUANTUM_MSEC if our
- * process could not react to the original signal in time.
- */
-static void
-ubf_timer_arm(rb_serial_t fork_gen) /* async signal safe */
+void
+rb_thread_wakeup_timer_thread(int sig)
 {
-#if UBF_TIMER == UBF_TIMER_POSIX
-    if ((!fork_gen || timer_posix.fork_gen == fork_gen) &&
-        timer_state_cas(RTIMER_DISARM, RTIMER_ARMING) == RTIMER_DISARM) {
-        struct itimerspec it;
+    // This function can be called from signal handlers so that
+    // pthread_mutex_lock() should not be used.
 
-        it.it_interval.tv_sec = it.it_value.tv_sec = 0;
-        it.it_interval.tv_nsec = it.it_value.tv_nsec = TIME_QUANTUM_NSEC;
+    // wakeup timer thread
+    timer_thread_wakeup_force();
 
-        if (timer_settime(timer_posix.timerid, 0, &it, 0))
-            rb_async_bug_errno("timer_settime (arm)", errno);
-
-        switch (timer_state_cas(RTIMER_ARMING, RTIMER_ARMED)) {
-          case RTIMER_DISARM:
-            /* somebody requested a disarm while we were arming */
-            /* may race harmlessly with ubf_timer_destroy */
-            (void)timer_settime(timer_posix.timerid, 0, &zero, 0);
-
-          case RTIMER_ARMING: return; /* success */
-          case RTIMER_ARMED:
-            /*
-             * it is possible to have another thread disarm, and
-             * a third thread arm finish re-arming before we get
-             * here, so we wasted a syscall with timer_settime but
-             * probably unavoidable in a signal handler.
-             */
-            return;
-          case RTIMER_DEAD:
-            /* may race harmlessly with ubf_timer_destroy */
-            (void)timer_settime(timer_posix.timerid, 0, &zero, 0);
-            return;
-          default:
-            rb_async_bug_errno("UBF_TIMER_POSIX unknown state", ERANGE);
-        }
-    }
-#elif UBF_TIMER == UBF_TIMER_PTHREAD
-    if (!fork_gen || fork_gen == timer_pthread.fork_gen) {
-        if (ATOMIC_EXCHANGE(timer_pthread.armed, 1) == 0)
-            rb_thread_wakeup_timer_thread_fd(timer_pthread.low[1]);
-    }
-#endif
-}
+    // interrupt main thread if main thread is available
+    if (RUBY_ATOMIC_LOAD(system_working)) {
+        rb_vm_t *vm = GET_VM();
+        rb_thread_t *main_th = vm->ractor.main_thread;
 
-void
-rb_thread_wakeup_timer_thread(int sig)
-{
-    /* non-sighandler path */
-    if (sig <= 0) {
-        rb_thread_wakeup_timer_thread_fd(signal_self_pipe.normal[1]);
-        if (sig < 0) {
-            ubf_timer_arm(0);
-        }
-        return;
-    }
+        if (main_th) {
+            volatile rb_execution_context_t *main_th_ec = ACCESS_ONCE(rb_execution_context_t *, main_th->ec);
 
-    /* must be safe inside sighandler, so no mutex */
-    if (signal_self_pipe.fork_gen == current_fork_gen) {
-        rb_thread_wakeup_timer_thread_fd(signal_self_pipe.normal[1]);
+            if (main_th_ec) {
+                RUBY_VM_SET_TRAP_INTERRUPT(main_th_ec);
 
-        /*
-         * system_working check is required because vm and main_thread are
-         * freed during shutdown
-         */
-        if (system_working > 0) {
-            volatile rb_execution_context_t *ec;
-            rb_vm_t *vm = GET_VM();
-            rb_thread_t *mth;
-
-            /*
-             * FIXME: root VM and main_thread should be static and not
-             * on heap for maximum safety (and startup/shutdown speed)
-             */
-            if (!vm) return;
-            mth = vm->ractor.main_thread;
-            if (!mth || system_working <= 0) return;
-
-            /* this relies on GC for grace period before cont_free */
-            ec = ACCESS_ONCE(rb_execution_context_t *, mth->ec);
-
-            if (ec) {
-                RUBY_VM_SET_TRAP_INTERRUPT(ec);
-                ubf_timer_arm(current_fork_gen);
-
-                /* some ubfs can interrupt single-threaded process directly */
-                if (vm->ubf_async_safe && mth->unblock.func) {
-                    (mth->unblock.func)(mth->unblock.arg);
+                if (vm->ubf_async_safe && main_th->unblock.func) {
+                    (main_th->unblock.func)(main_th->unblock.arg);
                 }
             }
         }
@@ -1658,12 +2660,12 @@ static void
 close_invalidate_pair(int fds[2], const char *msg)
 {
     if (USE_EVENTFD && fds[0] == fds[1]) {
+        fds[1] = -1; // disable write port first
         close_invalidate(&fds[0], msg);
-        fds[1] = -1;
     }
     else {
-        close_invalidate(&fds[0], msg);
         close_invalidate(&fds[1], msg);
+        close_invalidate(&fds[0], msg);
     }
 }
 
@@ -1683,15 +2685,15 @@ set_nonblock(int fd)
 }
 
 /* communication pipe with timer thread and signal handler */
-static int
+static void
 setup_communication_pipe_internal(int pipes[2])
 {
     int err;
 
-    if (pipes[0] >= 0 || pipes[1] >= 0) {
-        VM_ASSERT(pipes[0] >= 0);
-        VM_ASSERT(pipes[1] >= 0);
-        return 0;
+    if (pipes[0] > 0 || pipes[1] > 0) {
+        VM_ASSERT(pipes[0] > 0);
+        VM_ASSERT(pipes[1] > 0);
+        return;
     }
 
     /*
@@ -1700,23 +2702,21 @@ setup_communication_pipe_internal(int pipes[2])
      */
 #if USE_EVENTFD && defined(EFD_NONBLOCK) && defined(EFD_CLOEXEC)
     pipes[0] = pipes[1] = eventfd(0, EFD_NONBLOCK|EFD_CLOEXEC);
+
     if (pipes[0] >= 0) {
         rb_update_max_fd(pipes[0]);
-        return 0;
+        return;
     }
 #endif
 
     err = rb_cloexec_pipe(pipes);
     if (err != 0) {
-        rb_warn("pipe creation failed for timer: %s, scheduling broken",
-                strerror(errno));
-        return -1;
+        rb_bug("can not create communication pipe");
     }
     rb_update_max_fd(pipes[0]);
     rb_update_max_fd(pipes[1]);
     set_nonblock(pipes[0]);
     set_nonblock(pipes[1]);
-    return 0;
 }
 
 #if !defined(SET_CURRENT_THREAD_NAME) && defined(__linux__) && defined(PR_SET_NAME)
@@ -1799,12 +2799,18 @@ native_set_another_thread_name(rb_nativethread_id_t thread_id, VALUE name)
 static VALUE
 native_thread_native_thread_id(rb_thread_t *target_th)
 {
+    if (!target_th->nt) return Qnil;
+
 #ifdef RB_THREAD_T_HAS_NATIVE_ID
     int tid = target_th->nt->tid;
     if (tid == 0) return Qnil;
     return INT2FIX(tid);
 #elif defined(__APPLE__)
     uint64_t tid;
+/* The first condition is needed because MAC_OS_X_VERSION_10_6
+    is not defined on 10.5, and while __POWERPC__ takes care of ppc/ppc64,
+    i386 will be broken without this. Note, 10.5 is supported with GCC upstream,
+    so it has C++17 and everything needed to build modern Ruby. */
 # if (!defined(MAC_OS_X_VERSION_10_6) || \
       (MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_6) || \
       defined(__POWERPC__) /* never defined for PowerPC platforms */)
@@ -1823,203 +2829,368 @@ native_thread_native_thread_id(rb_thread_t *target_th)
     if (no_pthread_threadid_np) {
         return ULL2NUM(pthread_mach_thread_np(pthread_self()));
     }
-# ifndef NO_PTHREAD_MACH_THREAD_NP
-    int e = pthread_threadid_np(target_th->nt->thread_id, &tid);
-    if (e != 0) rb_syserr_fail(e, "pthread_threadid_np");
-    return ULL2NUM((unsigned long long)tid);
-# endif
-#endif
-}
-# define USE_NATIVE_THREAD_NATIVE_THREAD_ID 1
-#else
-# define USE_NATIVE_THREAD_NATIVE_THREAD_ID 0
-#endif
+# ifndef NO_PTHREAD_MACH_THREAD_NP
+    int e = pthread_threadid_np(target_th->nt->thread_id, &tid);
+    if (e != 0) rb_syserr_fail(e, "pthread_threadid_np");
+    return ULL2NUM((unsigned long long)tid);
+# endif
+#endif
+}
+# define USE_NATIVE_THREAD_NATIVE_THREAD_ID 1
+#else
+# define USE_NATIVE_THREAD_NATIVE_THREAD_ID 0
+#endif
+
+static struct {
+    rb_serial_t created_fork_gen;
+    pthread_t pthread_id;
+
+    int comm_fds[2]; // r, w
+
+#if (HAVE_SYS_EPOLL_H || HAVE_SYS_EVENT_H) && USE_MN_THREADS
+    int event_fd; // kernel event queue fd (epoll/kqueue)
+#endif
+#if HAVE_SYS_EPOLL_H && USE_MN_THREADS
+#define EPOLL_EVENTS_MAX 0x10
+    struct epoll_event finished_events[EPOLL_EVENTS_MAX];
+#elif HAVE_SYS_EVENT_H && USE_MN_THREADS
+#define KQUEUE_EVENTS_MAX 0x10
+    struct kevent finished_events[KQUEUE_EVENTS_MAX];
+#endif
+
+    // waiting threads list
+    struct ccan_list_head waiting; // waiting threads in ractors
+    pthread_mutex_t waiting_lock;
+} timer_th = {
+    .created_fork_gen = 0,
+};
+
+#define TIMER_THREAD_CREATED_P() (timer_th.created_fork_gen == current_fork_gen)
+
+static void timer_thread_check_timeslice(rb_vm_t *vm);
+static int timer_thread_set_timeout(rb_vm_t *vm);
+static void timer_thread_wakeup_thread(rb_thread_t *th);
+
+#include "thread_pthread_mn.c"
+
+static rb_thread_t *
+thread_sched_waiting_thread(struct rb_thread_sched_waiting *w)
+{
+    if (w) {
+        return (rb_thread_t *)((size_t)w - offsetof(rb_thread_t, sched.waiting_reason));
+    }
+    else {
+        return NULL;
+    }
+}
+
+static int
+timer_thread_set_timeout(rb_vm_t *vm)
+{
+#if 0
+    return 10; // ms
+#else
+    int timeout = -1;
+
+    ractor_sched_lock(vm, NULL);
+    {
+        if (   !ccan_list_empty(&vm->ractor.sched.timeslice_threads) // (1-1) Provide time slice for active NTs
+            || !ubf_threads_empty()                                  // (1-3) Periodic UBF
+            || vm->ractor.sched.grq_cnt > 0                          // (1-4) Lazy GRQ deq start
+            ) {
+
+            RUBY_DEBUG_LOG("timeslice:%d ubf:%d grq:%d",
+                           !ccan_list_empty(&vm->ractor.sched.timeslice_threads),
+                           !ubf_threads_empty(),
+                           (vm->ractor.sched.grq_cnt > 0));
+
+            timeout = 10; // ms
+            vm->ractor.sched.timeslice_wait_inf = false;
+        }
+        else {
+            vm->ractor.sched.timeslice_wait_inf = true;
+        }
+    }
+    ractor_sched_unlock(vm, NULL);
+
+    if (vm->ractor.sched.timeslice_wait_inf) {
+        rb_native_mutex_lock(&timer_th.waiting_lock);
+        {
+            struct rb_thread_sched_waiting *w = ccan_list_top(&timer_th.waiting, struct rb_thread_sched_waiting, node);
+            rb_thread_t *th = thread_sched_waiting_thread(w);
+
+            if (th && (th->sched.waiting_reason.flags & thread_sched_waiting_timeout)) {
+                rb_hrtime_t now = rb_hrtime_now();
+                rb_hrtime_t hrrel = rb_hrtime_sub(th->sched.waiting_reason.data.timeout, now);
+
+                RUBY_DEBUG_LOG("th:%u now:%lu rel:%lu", rb_th_serial(th), (unsigned long)now, (unsigned long)hrrel);
+
+                // TODO: overflow?
+                timeout = (int)((hrrel + RB_HRTIME_PER_MSEC - 1) / RB_HRTIME_PER_MSEC); // ms
+            }
+        }
+        rb_native_mutex_unlock(&timer_th.waiting_lock);
+    }
 
-static void
-ubf_timer_invalidate(void)
-{
-#if UBF_TIMER == UBF_TIMER_PTHREAD
-    CLOSE_INVALIDATE_PAIR(timer_pthread.low);
+    RUBY_DEBUG_LOG("timeout:%d inf:%d", timeout, (int)vm->ractor.sched.timeslice_wait_inf);
+
+    // fprintf(stderr, "timeout:%d\n", timeout);
+    return timeout;
 #endif
 }
 
 static void
-ubf_timer_pthread_create(rb_serial_t fork_gen)
+timer_thread_check_signal(rb_vm_t *vm)
 {
-#if UBF_TIMER == UBF_TIMER_PTHREAD
-    int err;
-    if (timer_pthread.fork_gen == fork_gen)
-        return;
+    // ruby_sigchld_handler(vm); TODO
 
-    if (setup_communication_pipe_internal(timer_pthread.low) < 0)
-        return;
+    int signum = rb_signal_buff_size();
+    if (UNLIKELY(signum > 0) && vm->ractor.main_thread) {
+        RUBY_DEBUG_LOG("signum:%d", signum);
+        threadptr_trap_interrupt(vm->ractor.main_thread);
+    }
+}
 
-    err = pthread_create(&timer_pthread.thid, 0, timer_pthread_fn, GET_VM());
-    if (!err)
-        timer_pthread.fork_gen = fork_gen;
-    else
-        rb_warn("pthread_create failed for timer: %s, signals racy",
-                strerror(err));
-#endif
+static bool
+timer_thread_check_exceed(rb_hrtime_t abs, rb_hrtime_t now)
+{
+    if (abs < now) {
+        return true;
+    }
+    else if (abs - now < RB_HRTIME_PER_MSEC) {
+        return true; // too short time
+    }
+    else {
+        return false;
+    }
 }
 
-static void
-ubf_timer_create(rb_serial_t fork_gen)
+static rb_thread_t *
+timer_thread_deq_wakeup(rb_vm_t *vm, rb_hrtime_t now)
 {
-#if UBF_TIMER == UBF_TIMER_POSIX
-#  if defined(__sun)
-#    define UBF_TIMER_CLOCK CLOCK_REALTIME
-#  else /* Tested Linux and FreeBSD: */
-#    define UBF_TIMER_CLOCK CLOCK_MONOTONIC
-#  endif
+    struct rb_thread_sched_waiting *w = ccan_list_top(&timer_th.waiting, struct rb_thread_sched_waiting, node);
 
-    struct sigevent sev;
+    if (w != NULL &&
+        (w->flags & thread_sched_waiting_timeout) &&
+        timer_thread_check_exceed(w->data.timeout, now)) {
 
-    sev.sigev_notify = SIGEV_SIGNAL;
-    sev.sigev_signo = SIGVTALRM;
-    sev.sigev_value.sival_ptr = &timer_posix;
+        RUBY_DEBUG_LOG("wakeup th:%u", rb_th_serial(thread_sched_waiting_thread(w)));
 
-    if (!timer_create(UBF_TIMER_CLOCK, &sev, &timer_posix.timerid)) {
-        rb_atomic_t prev = timer_state_exchange(RTIMER_DISARM);
+        // delete from waiting list
+        ccan_list_del_init(&w->node);
 
-        if (prev != RTIMER_DEAD) {
-            rb_bug("timer_posix was not dead: %u", (unsigned)prev);
-        }
-        timer_posix.fork_gen = fork_gen;
-    }
-    else {
-        rb_warn("timer_create failed: %s, signals racy", strerror(errno));
+        // setup result
+        w->flags = thread_sched_waiting_none;
+        w->data.result = 0;
+
+        return thread_sched_waiting_thread(w);
     }
-#endif
-    if (UBF_TIMER == UBF_TIMER_PTHREAD)
-        ubf_timer_pthread_create(fork_gen);
+
+    return NULL;
 }
 
 static void
-rb_thread_create_timer_thread(void)
+timer_thread_wakeup_thread(rb_thread_t *th)
 {
-    /* we only create the pipe, and lazy-spawn */
-    rb_serial_t fork_gen = signal_self_pipe.fork_gen;
+    RUBY_DEBUG_LOG("th:%u", rb_th_serial(th));
+    struct rb_thread_sched *sched = TH_SCHED(th);
 
-    if (fork_gen && fork_gen != current_fork_gen) {
-        CLOSE_INVALIDATE_PAIR(signal_self_pipe.normal);
-        CLOSE_INVALIDATE_PAIR(signal_self_pipe.ub_main);
-        ubf_timer_invalidate();
+    thread_sched_lock(sched, th);
+    {
+        if (sched->running != th) {
+            thread_sched_to_ready_common(sched, th, true, false);
+        }
+        else {
+            // will be release the execution right
+        }
     }
+    thread_sched_unlock(sched, th);
+}
 
-    if (setup_communication_pipe_internal(signal_self_pipe.normal) < 0) return;
-    if (setup_communication_pipe_internal(signal_self_pipe.ub_main) < 0) return;
+static void
+timer_thread_check_timeout(rb_vm_t *vm)
+{
+    rb_hrtime_t now = rb_hrtime_now();
+    rb_thread_t *th;
 
-    ubf_timer_create(current_fork_gen);
-    if (fork_gen != current_fork_gen) {
-        /* validate pipe on this process */
-        sigwait_th = THREAD_INVALID;
-        signal_self_pipe.fork_gen = current_fork_gen;
+    rb_native_mutex_lock(&timer_th.waiting_lock);
+    {
+        while ((th = timer_thread_deq_wakeup(vm, now)) != NULL) {
+            timer_thread_wakeup_thread(th);
+        }
     }
+    rb_native_mutex_unlock(&timer_th.waiting_lock);
 }
 
 static void
-ubf_timer_disarm(void)
+timer_thread_check_timeslice(rb_vm_t *vm)
+{
+    // TODO: check time
+    rb_thread_t *th;
+    ccan_list_for_each(&vm->ractor.sched.timeslice_threads, th, sched.node.timeslice_threads) {
+        RUBY_DEBUG_LOG("timeslice th:%u", rb_th_serial(th));
+        RUBY_VM_SET_TIMER_INTERRUPT(th->ec);
+    }
+}
+
+void
+rb_assert_sig(void)
 {
-#if UBF_TIMER == UBF_TIMER_POSIX
-    rb_atomic_t prev;
+    sigset_t oldmask;
+    pthread_sigmask(0, NULL, &oldmask);
+    if (sigismember(&oldmask, SIGVTALRM)) {
+        rb_bug("!!!");
+    }
+    else {
+        RUBY_DEBUG_LOG("ok");
+    }
+}
 
-    if (timer_posix.fork_gen && timer_posix.fork_gen != current_fork_gen) return;
-    prev = timer_state_cas(RTIMER_ARMED, RTIMER_DISARM);
-    switch (prev) {
-      case RTIMER_DISARM: return; /* likely */
-      case RTIMER_ARMING: return; /* ubf_timer_arm will disarm itself */
-      case RTIMER_ARMED:
-        if (timer_settime(timer_posix.timerid, 0, &zero, 0)) {
-            int err = errno;
+static void *
+timer_thread_func(void *ptr)
+{
+    rb_vm_t *vm = (rb_vm_t *)ptr;
+#if defined(RUBY_NT_SERIAL)
+    ruby_nt_serial = (rb_atomic_t)-1;
+#endif
 
-            if (err == EINVAL) {
-                prev = timer_state_cas(RTIMER_DISARM, RTIMER_DISARM);
+    RUBY_DEBUG_LOG("started%s", "");
 
-                /* main thread may have killed the timer */
-                if (prev == RTIMER_DEAD) return;
+    while (RUBY_ATOMIC_LOAD(system_working)) {
+        timer_thread_check_signal(vm);
+        timer_thread_check_timeout(vm);
+        ubf_wakeup_all_threads();
 
-                rb_bug_errno("timer_settime (disarm)", err);
-            }
-        }
-        return;
-      case RTIMER_DEAD: return; /* stay dead */
-      default:
-        rb_bug("UBF_TIMER_POSIX bad state: %u", (unsigned)prev);
+        RUBY_DEBUG_LOG("system_working:%d", RUBY_ATOMIC_LOAD(system_working));
+        timer_thread_polling(vm);
     }
 
-#elif UBF_TIMER == UBF_TIMER_PTHREAD
-    ATOMIC_SET(timer_pthread.armed, 0);
-#endif
+    RUBY_DEBUG_LOG("terminated");
+    return NULL;
 }
 
+/* only use signal-safe system calls here */
 static void
-ubf_timer_destroy(void)
+signal_communication_pipe(int fd)
 {
-#if UBF_TIMER == UBF_TIMER_POSIX
-    if (timer_posix.fork_gen == current_fork_gen) {
-        rb_atomic_t expect = RTIMER_DISARM;
-        size_t i, max = 10000000;
+#if USE_EVENTFD
+    const uint64_t buff = 1;
+#else
+    const char buff = '!';
+#endif
+    ssize_t result;
 
-        /* prevent signal handler from arming: */
-        for (i = 0; i < max; i++) {
-            switch (timer_state_cas(expect, RTIMER_DEAD)) {
-              case RTIMER_DISARM:
-                if (expect == RTIMER_DISARM) goto done;
-                expect = RTIMER_DISARM;
-                break;
-              case RTIMER_ARMING:
-                native_thread_yield(); /* let another thread finish arming */
-                expect = RTIMER_ARMED;
-                break;
-              case RTIMER_ARMED:
-                if (expect == RTIMER_ARMED) {
-                    if (timer_settime(timer_posix.timerid, 0, &zero, 0))
-                        rb_bug_errno("timer_settime (destroy)", errno);
-                    goto done;
-                }
-                expect = RTIMER_ARMED;
+    /* already opened */
+    if (fd >= 0) {
+      retry:
+        if ((result = write(fd, &buff, sizeof(buff))) <= 0) {
+            int e = errno;
+            switch (e) {
+              case EINTR: goto retry;
+              case EAGAIN:
+#if defined(EWOULDBLOCK) && EWOULDBLOCK != EAGAIN
+              case EWOULDBLOCK:
+#endif
                 break;
-              case RTIMER_DEAD:
-                rb_bug("RTIMER_DEAD unexpected");
+              default:
+                async_bug_fd("rb_thread_wakeup_timer_thread: write", e, fd);
             }
         }
-        rb_bug("timed out waiting for timer to arm");
-done:
-        if (timer_delete(timer_posix.timerid) < 0)
-            rb_sys_fail("timer_delete");
+        if (TT_DEBUG) WRITE_CONST(2, "rb_thread_wakeup_timer_thread: write\n");
+    }
+    else {
+        // ignore wakeup
+    }
+}
+
+static void
+timer_thread_wakeup_force(void)
+{
+    // should not use RUBY_DEBUG_LOG() because it can be called within signal handlers.
+    signal_communication_pipe(timer_th.comm_fds[1]);
+}
+
+static void
+timer_thread_wakeup_locked(rb_vm_t *vm)
+{
+    // should be locked before.
+    ASSERT_ractor_sched_locked(vm, NULL);
 
-        VM_ASSERT(timer_state_exchange(RTIMER_DEAD) == RTIMER_DEAD);
+    if (timer_th.created_fork_gen == current_fork_gen) {
+        if (vm->ractor.sched.timeslice_wait_inf) {
+            RUBY_DEBUG_LOG("wakeup with fd:%d", timer_th.comm_fds[1]);
+            timer_thread_wakeup_force();
+        }
+        else {
+            RUBY_DEBUG_LOG("will be wakeup...");
+        }
     }
-#elif UBF_TIMER == UBF_TIMER_PTHREAD
-    int err;
+}
+
+static void
+timer_thread_wakeup(void)
+{
+    rb_vm_t *vm = GET_VM();
 
-    timer_pthread.fork_gen = 0;
-    ubf_timer_disarm();
-    rb_thread_wakeup_timer_thread_fd(timer_pthread.low[1]);
-    err = pthread_join(timer_pthread.thid, 0);
-    if (err) {
-        rb_raise(rb_eThreadError, "native_thread_join() failed (%d)", err);
+    ractor_sched_lock(vm, NULL);
+    {
+        timer_thread_wakeup_locked(vm);
     }
+    ractor_sched_unlock(vm, NULL);
+}
+
+static void
+rb_thread_create_timer_thread(void)
+{
+    rb_serial_t created_fork_gen = timer_th.created_fork_gen;
+
+    RUBY_DEBUG_LOG("fork_gen create:%d current:%d", (int)created_fork_gen, (int)current_fork_gen);
+
+    timer_th.created_fork_gen = current_fork_gen;
+
+    if (created_fork_gen != current_fork_gen) {
+        if (created_fork_gen != 0) {
+            RUBY_DEBUG_LOG("forked child process");
+
+            CLOSE_INVALIDATE_PAIR(timer_th.comm_fds);
+#if HAVE_SYS_EPOLL_H && USE_MN_THREADS
+            close_invalidate(&timer_th.event_fd, "close event_fd");
 #endif
+            rb_native_mutex_destroy(&timer_th.waiting_lock);
+        }
+
+        ccan_list_head_init(&timer_th.waiting);
+        rb_native_mutex_initialize(&timer_th.waiting_lock);
+
+        // open communication channel
+        setup_communication_pipe_internal(timer_th.comm_fds);
+
+        // open event fd
+        timer_thread_setup_mn();
+    }
+
+    pthread_create(&timer_th.pthread_id, NULL, timer_thread_func, GET_VM());
 }
 
 static int
 native_stop_timer_thread(void)
 {
-    int stopped;
-    stopped = --system_working <= 0;
-    if (stopped)
-        ubf_timer_destroy();
+    RUBY_ATOMIC_SET(system_working, 0);
+
+    RUBY_DEBUG_LOG("wakeup send %d", timer_th.comm_fds[1]);
+    timer_thread_wakeup_force();
+    RUBY_DEBUG_LOG("wakeup sent");
+    pthread_join(timer_th.pthread_id, NULL);
 
     if (TT_DEBUG) fprintf(stderr, "stop timer thread\n");
-    return stopped;
+
+    return 1;
 }
 
 static void
 native_reset_timer_thread(void)
 {
-    if (TT_DEBUG)  fprintf(stderr, "reset timer thread\n");
+    //
 }
 
 #ifdef HAVE_SIGALTSTACK
@@ -2031,8 +3202,12 @@ ruby_stack_overflowed_p(const rb_thread_t *th, const void *addr)
     const size_t water_mark = 1024 * 1024;
     STACK_GROW_DIR_DETECTION;
 
+    if (th) {
+        size = th->ec->machine.stack_maxsize;
+        base = (char *)th->ec->machine.stack_start - STACK_DIR_UPPER(0, size);
+    }
 #ifdef STACKADDR_AVAILABLE
-    if (get_stack(&base, &size) == 0) {
+    else if (get_stack(&base, &size) == 0) {
 # ifdef __APPLE__
         if (pthread_equal(th->nt->thread_id, native_main_thread.id)) {
             struct rlimit rlim;
@@ -2043,15 +3218,11 @@ ruby_stack_overflowed_p(const rb_thread_t *th, const void *addr)
 # endif
         base = (char *)base + STACK_DIR_UPPER(+size, -size);
     }
-    else
 #endif
-    if (th) {
-        size = th->ec->machine.stack_maxsize;
-        base = (char *)th->ec->machine.stack_start - STACK_DIR_UPPER(0, size);
-    }
     else {
         return 0;
     }
+
     size /= RUBY_STACK_SPACE_RATIO;
     if (size > water_mark) size = water_mark;
     if (IS_STACK_DIR_UPPER()) {
@@ -2070,22 +3241,26 @@ int
 rb_reserved_fd_p(int fd)
 {
     /* no false-positive if out-of-FD at startup */
-    if (fd < 0)
-        return 0;
+    if (fd < 0) return 0;
 
-#if UBF_TIMER == UBF_TIMER_PTHREAD
-    if (fd == timer_pthread.low[0] || fd == timer_pthread.low[1])
-        goto check_fork_gen;
+    if (fd == timer_th.comm_fds[0] ||
+        fd == timer_th.comm_fds[1]
+#if (HAVE_SYS_EPOLL_H || HAVE_SYS_EVENT_H) && USE_MN_THREADS
+        || fd == timer_th.event_fd
 #endif
-    if (fd == signal_self_pipe.normal[0] || fd == signal_self_pipe.normal[1])
-        goto check_fork_gen;
-    if (fd == signal_self_pipe.ub_main[0] || fd == signal_self_pipe.ub_main[1])
+        ) {
         goto check_fork_gen;
+    }
     return 0;
-check_fork_gen:
-    if (signal_self_pipe.fork_gen == current_fork_gen) /* async-signal-safe */
+
+  check_fork_gen:
+    if (timer_th.created_fork_gen == current_fork_gen) {
+        /* async-signal-safe */
         return 1;
-    return 0;
+    }
+    else {
+        return 0;
+    }
 }
 
 rb_nativethread_id_t
@@ -2094,35 +3269,7 @@ rb_nativethread_self(void)
     return pthread_self();
 }
 
-int
-rb_sigwait_fd_get(const rb_thread_t *th)
-{
-    if (signal_self_pipe.normal[0] >= 0) {
-        VM_ASSERT(signal_self_pipe.fork_gen == current_fork_gen);
-        /*
-         * no need to keep firing the timer if any thread is sleeping
-         * on the signal self-pipe
-         */
-        ubf_timer_disarm();
-
-        if (ATOMIC_PTR_CAS(sigwait_th, THREAD_INVALID, th) == THREAD_INVALID) {
-            return signal_self_pipe.normal[0];
-        }
-    }
-    return -1; /* avoid thundering herd and work stealing/starvation */
-}
-
-void
-rb_sigwait_fd_put(const rb_thread_t *th, int fd)
-{
-    const rb_thread_t *old;
-
-    VM_ASSERT(signal_self_pipe.normal[0] == fd);
-    old = ATOMIC_PTR_EXCHANGE(sigwait_th, THREAD_INVALID);
-    if (old != th) assert(old == th);
-}
-
-#ifndef HAVE_PPOLL
+#if defined(USE_POLL) && !defined(HAVE_PPOLL)
 /* TODO: don't ignore sigmask */
 static int
 ruby_ppoll(struct pollfd *fds, nfds_t nfds,
@@ -2153,61 +3300,6 @@ ruby_ppoll(struct pollfd *fds, nfds_t nfds,
 #  define ppoll(fds,nfds,ts,sigmask) ruby_ppoll((fds),(nfds),(ts),(sigmask))
 #endif
 
-void
-rb_sigwait_sleep(rb_thread_t *th, int sigwait_fd, const rb_hrtime_t *rel)
-{
-    struct pollfd pfd;
-    struct timespec ts;
-
-    pfd.fd = sigwait_fd;
-    pfd.events = POLLIN;
-
-    if (!BUSY_WAIT_SIGNALS && ubf_threads_empty()) {
-        (void)ppoll(&pfd, 1, rb_hrtime2timespec(&ts, rel), 0);
-        check_signals_nogvl(th, sigwait_fd);
-    }
-    else {
-        rb_hrtime_t to = RB_HRTIME_MAX, end = 0;
-        int n = 0;
-
-        if (rel) {
-            to = *rel;
-            end = rb_hrtime_add(rb_hrtime_now(), to);
-        }
-        /*
-         * tricky: this needs to return on spurious wakeup (no auto-retry).
-         * But we also need to distinguish between periodic quantum
-         * wakeups, so we care about the result of consume_communication_pipe
-         *
-         * We want to avoid spurious wakeup for Mutex#sleep compatibility
-         * [ruby-core:88102]
-         */
-        for (;;) {
-            const rb_hrtime_t *sto = sigwait_timeout(th, sigwait_fd, &to, &n);
-
-            if (n) return;
-            n = ppoll(&pfd, 1, rb_hrtime2timespec(&ts, sto), 0);
-            if (check_signals_nogvl(th, sigwait_fd))
-                return;
-            if (n || (th && RUBY_VM_INTERRUPTED(th->ec)))
-                return;
-            if (rel && hrtime_update_expire(&to, end))
-                return;
-        }
-    }
-}
-
-/*
- * we need to guarantee wakeups from native_ppoll_sleep because
- * ubf_select may not be going through ubf_list if other threads
- * are all sleeping.
- */
-static void
-ubf_ppoll_sleep(void *ignore)
-{
-    rb_thread_wakeup_timer_thread_fd(signal_self_pipe.ub_main[1]);
-}
-
 /*
  * Single CPU setups benefit from explicit sched_yield() before ppoll(),
  * since threads may be too starved to enter the GVL waitqueue for
@@ -2219,153 +3311,82 @@ ubf_ppoll_sleep(void *ignore)
  * [ruby-core:90417] [Bug #15398]
  */
 #define THREAD_BLOCKING_YIELD(th) do { \
-    const rb_thread_t *next; \
+    const rb_thread_t *next_th; \
     struct rb_thread_sched *sched = TH_SCHED(th); \
     RB_VM_SAVE_MACHINE_CONTEXT(th); \
-    rb_native_mutex_lock(&sched->lock); \
-    next = thread_sched_to_waiting_common((sched), (th)); \
-    rb_native_mutex_unlock(&sched->lock); \
-    if (!next && rb_ractor_living_thread_num(th->ractor) > 1) { \
+    thread_sched_to_waiting(sched, (th)); \
+    next_th = sched->running; \
+    rb_native_mutex_unlock(&sched->lock_); \
+    native_thread_yield(); /* TODO: needed? */ \
+    if (!next_th && rb_ractor_living_thread_num(th->ractor) > 1) { \
         native_thread_yield(); \
     }
 
-/*
- * This function does not exclusively acquire sigwait_fd, so it
- * cannot safely read from it.  However, it can be woken up in
- * 4 ways:
- *
- * 1) ubf_ppoll_sleep (from another thread)
- * 2) rb_thread_wakeup_timer_thread (from signal handler)
- * 3) any unmasked signal hitting the process
- * 4) periodic ubf timer wakeups (after 3)
- */
-static void
-native_ppoll_sleep(rb_thread_t *th, rb_hrtime_t *rel)
-{
-    rb_native_mutex_lock(&th->interrupt_lock);
-    th->unblock.func = ubf_ppoll_sleep;
-    rb_native_mutex_unlock(&th->interrupt_lock);
-
-    THREAD_BLOCKING_YIELD(th);
-    {
-        if (!RUBY_VM_INTERRUPTED(th->ec)) {
-            struct pollfd pfd[2];
-            struct timespec ts;
-
-            pfd[0].fd = signal_self_pipe.normal[0]; /* sigwait_fd */
-            pfd[1].fd = signal_self_pipe.ub_main[0];
-            pfd[0].events = pfd[1].events = POLLIN;
-            if (ppoll(pfd, 2, rb_hrtime2timespec(&ts, rel), 0) > 0) {
-                if (pfd[1].revents & POLLIN) {
-                    (void)consume_communication_pipe(pfd[1].fd);
-                }
-            }
-            /*
-             * do not read the sigwait_fd, here, let uplevel callers
-             * or other threads that, otherwise we may steal and starve
-             * other threads
-             */
-        }
-        unblock_function_clear(th);
-    }
-    THREAD_BLOCKING_END(th);
-}
-
 static void
 native_sleep(rb_thread_t *th, rb_hrtime_t *rel)
 {
-    int sigwait_fd = rb_sigwait_fd_get(th);
-    rb_ractor_blocking_threads_inc(th->ractor, __FILE__, __LINE__);
-
-    RB_INTERNAL_THREAD_HOOK(RUBY_INTERNAL_THREAD_EVENT_SUSPENDED);
-
-    if (sigwait_fd >= 0) {
-        rb_native_mutex_lock(&th->interrupt_lock);
-        th->unblock.func = ubf_sigwait;
-        rb_native_mutex_unlock(&th->interrupt_lock);
+    struct rb_thread_sched *sched = TH_SCHED(th);
 
-        THREAD_BLOCKING_YIELD(th);
-        {
-            if (!RUBY_VM_INTERRUPTED(th->ec)) {
-                rb_sigwait_sleep(th, sigwait_fd, rel);
-            }
-            else {
-                check_signals_nogvl(th, sigwait_fd);
-            }
-            unblock_function_clear(th);
+    RUBY_DEBUG_LOG("rel:%d", rel ? (int)*rel : 0);
+    if (rel) {
+        if (th_has_dedicated_nt(th)) {
+            native_cond_sleep(th, rel);
+        }
+        else {
+            thread_sched_wait_events(sched, th, -1, thread_sched_waiting_timeout, rel);
         }
-        THREAD_BLOCKING_END(th);
-
-        rb_sigwait_fd_put(th, sigwait_fd);
-    }
-    else if (th == th->vm->ractor.main_thread) { /* always able to handle signals */
-        native_ppoll_sleep(th, rel);
     }
     else {
-        native_cond_sleep(th, rel);
+        thread_sched_to_waiting_until_wakeup(sched, th);
     }
 
-    rb_ractor_blocking_threads_dec(th->ractor, __FILE__, __LINE__);
+    RUBY_DEBUG_LOG("wakeup");
 }
 
-#if UBF_TIMER == UBF_TIMER_PTHREAD
-static void *
-timer_pthread_fn(void *p)
-{
-    rb_vm_t *vm = p;
-    pthread_t main_thread_id = vm->ractor.main_thread->nt->thread_id;
-    struct pollfd pfd;
-    int timeout = -1;
-    int ccp;
-
-    pfd.fd = timer_pthread.low[0];
-    pfd.events = POLLIN;
-
-    while (system_working > 0) {
-        (void)poll(&pfd, 1, timeout);
-        ccp = consume_communication_pipe(pfd.fd);
+// fork read-write lock (only for pthread)
+static pthread_rwlock_t rb_thread_fork_rw_lock = PTHREAD_RWLOCK_INITIALIZER;
 
-        if (system_working > 0) {
-            if (ATOMIC_CAS(timer_pthread.armed, 1, 1)) {
-                pthread_kill(main_thread_id, SIGVTALRM);
+void
+rb_thread_release_fork_lock(void)
+{
+    int r;
+    if ((r = pthread_rwlock_unlock(&rb_thread_fork_rw_lock))) {
+        rb_bug_errno("pthread_rwlock_unlock", r);
+    }
+}
 
-                if (rb_signal_buff_size() || !ubf_threads_empty()) {
-                    timeout = TIME_QUANTUM_MSEC;
-                }
-                else {
-                    ATOMIC_SET(timer_pthread.armed, 0);
-                    timeout = -1;
-                }
-            }
-            else if (ccp) {
-                pthread_kill(main_thread_id, SIGVTALRM);
-                ATOMIC_SET(timer_pthread.armed, 0);
-                timeout = -1;
-            }
-        }
+void
+rb_thread_reset_fork_lock(void)
+{
+    int r;
+    if ((r = pthread_rwlock_destroy(&rb_thread_fork_rw_lock))) {
+        rb_bug_errno("pthread_rwlock_destroy", r);
     }
 
-    return 0;
+    if ((r = pthread_rwlock_init(&rb_thread_fork_rw_lock, NULL))) {
+        rb_bug_errno("pthread_rwlock_init", r);
+    }
 }
-#endif /* UBF_TIMER_PTHREAD */
 
-static VALUE
-ubf_caller(void *ignore)
+void *
+rb_thread_prevent_fork(void *(*func)(void *), void *data)
 {
-    rb_thread_sleep_forever();
-
-    return Qfalse;
+    int r;
+    if ((r = pthread_rwlock_rdlock(&rb_thread_fork_rw_lock))) {
+        rb_bug_errno("pthread_rwlock_rdlock", r);
+    }
+    void *result = func(data);
+    rb_thread_release_fork_lock();
+    return result;
 }
 
-/*
- * Called if and only if one thread is running, and
- * the unblock function is NOT async-signal-safe
- * This assumes USE_THREAD_CACHE is true for performance reasons
- */
-static VALUE
-rb_thread_start_unblock_thread(void)
+void
+rb_thread_acquire_fork_lock(void)
 {
-    return rb_thread_create(ubf_caller, 0);
+    int r;
+    if ((r = pthread_rwlock_wrlock(&rb_thread_fork_rw_lock))) {
+        rb_bug_errno("pthread_rwlock_wrlock", r);
+    }
 }
 
 // thread internal event hooks (only for pthread)
@@ -2439,7 +3460,7 @@ rb_internal_thread_remove_event_hook(rb_internal_thread_event_hook_t * hook)
 }
 
 static void
-rb_thread_execute_hooks(rb_event_flag_t event)
+rb_thread_execute_hooks(rb_event_flag_t event, rb_thread_t *th)
 {
     int r;
     if ((r = pthread_rwlock_rdlock(&rb_internal_thread_event_hooks_rw_lock))) {
@@ -2450,7 +3471,10 @@ rb_thread_execute_hooks(rb_event_flag_t event)
         rb_internal_thread_event_hook_t *h = rb_internal_thread_event_hooks;
         do {
             if (h->event & event) {
-                (*h->callback)(event, NULL, h->user_data);
+                rb_internal_thread_event_data_t event_data = {
+                    .thread = th->self,
+                };
+                (*h->callback)(event, &event_data, h->user_data);
             }
         } while((h = h->next));
     }
@@ -2459,4 +3483,16 @@ rb_thread_execute_hooks(rb_event_flag_t event)
     }
 }
 
+// return true if the current thread acquires DNT.
+// return false if the current thread already acquires DNT.
+bool
+rb_thread_lock_native_thread(void)
+{
+    rb_thread_t *th = GET_THREAD();
+    bool is_snt = th->nt->dedicated == 0;
+    native_thread_dedicated_inc(th->vm, th->ractor, th->nt);
+
+    return is_snt;
+}
+
 #endif /* THREAD_SYSTEM_DEPENDENT_IMPLEMENTATION */
diff --git a/thread_pthread.h b/thread_pthread.h
index 10d3fcd9280c17..22e5f3652b05ec 100644
--- a/thread_pthread.h
+++ b/thread_pthread.h
@@ -17,16 +17,63 @@
 #define RB_NATIVETHREAD_LOCK_INIT PTHREAD_MUTEX_INITIALIZER
 #define RB_NATIVETHREAD_COND_INIT PTHREAD_COND_INITIALIZER
 
+// this data should be protected by timer_th.waiting_lock
+struct rb_thread_sched_waiting {
+    enum thread_sched_waiting_flag {
+        thread_sched_waiting_none     = 0x00,
+        thread_sched_waiting_timeout  = 0x01,
+        thread_sched_waiting_io_read  = 0x02,
+        thread_sched_waiting_io_write = 0x08,
+        thread_sched_waiting_io_force = 0x40, // ignore readable
+    } flags;
+
+    struct {
+        // should be compat with hrtime.h
+#ifdef MY_RUBY_BUILD_MAY_TIME_TRAVEL
+        int128_t timeout;
+#else
+        uint64_t timeout;
+#endif
+        int fd; // -1 for timeout only
+        int result;
+    } data;
+
+    // connected to timer_th.waiting
+    struct ccan_list_node node;
+};
+
 // per-Thead scheduler helper data
 struct rb_thread_sched_item {
-    union {
+    struct {
         struct ccan_list_node ubf;
-        struct ccan_list_node readyq; // protected by sched->lock
+
+        // connected to ractor->threads.sched.reqdyq
+        // locked by ractor->threads.sched.lock
+        struct ccan_list_node readyq;
+
+        // connected to vm->ractor.sched.timeslice_threads
+        // locked by vm->ractor.sched.lock
+        struct ccan_list_node timeslice_threads;
+
+        // connected to vm->ractor.sched.running_threads
+        // locked by vm->ractor.sched.lock
+        struct ccan_list_node running_threads;
+
+        // connected to vm->ractor.sched.zombie_threads
+        struct ccan_list_node zombie_threads;
     } node;
+
+    struct rb_thread_sched_waiting waiting_reason;
+
+    bool finished;
+    bool malloc_stack;
+    void *context_stack;
+    struct coroutine_context *context;
 };
 
 struct rb_native_thread {
     rb_atomic_t serial;
+    struct rb_vm_struct *vm;
 
     rb_nativethread_id_t thread_id;
 
@@ -54,6 +101,11 @@ struct rb_native_thread {
 #ifdef USE_SIGALTSTACK
     void *altstack;
 #endif
+
+    struct coroutine_context *nt_context;
+    int dedicated;
+
+    size_t machine_stack_maxsize;
 };
 
 #undef except
@@ -63,45 +115,34 @@ struct rb_native_thread {
 
 // per-Ractor
 struct rb_thread_sched {
-    /* fast path */
-
-    const struct rb_thread_struct *running; // running thread or NULL
-    rb_nativethread_lock_t lock;
+    rb_nativethread_lock_t lock_;
+#if VM_CHECK_MODE
+    struct rb_thread_struct *lock_owner;
+#endif
+    struct rb_thread_struct *running; // running thread or NULL
+    bool is_running;
+    bool is_running_timeslice;
+    bool enable_mn_threads;
 
-    /*
-     * slow path, protected by ractor->thread_sched->lock
-     * - @readyq - FIFO queue of threads waiting for running
-     * - @timer - it handles timeslices for @current.  It is any one thread
-     *   in @waitq, there is no @timer if @waitq is empty, but always
-     *   a @timer if @waitq has entries
-     * - @timer_err tracks timeslice limit, the timeslice only resets
-     *   when pthread_cond_timedwait returns ETIMEDOUT, so frequent
-     *   switching between contended/uncontended GVL won't reset the
-     *   timer.
-     */
     struct ccan_list_head readyq;
-    const struct rb_thread_struct *timer;
-    int timer_err;
-
-    /* yield */
-    rb_nativethread_cond_t switch_cond;
-    rb_nativethread_cond_t switch_wait_cond;
-    int need_yield;
-    int wait_yield;
+    int readyq_cnt;
+    // ractor scheduling
+    struct ccan_list_node grq_node;
 };
 
 #ifdef RB_THREAD_LOCAL_SPECIFIER
-# ifdef __APPLE__
-// on Darwin, TLS can not be accessed across .so
-struct rb_execution_context_struct *rb_current_ec(void);
-void rb_current_ec_set(struct rb_execution_context_struct *);
-# else
-RUBY_EXTERN RB_THREAD_LOCAL_SPECIFIER struct rb_execution_context_struct *ruby_current_ec;
-
-// for RUBY_DEBUG_LOG()
-RUBY_EXTERN RB_THREAD_LOCAL_SPECIFIER rb_atomic_t ruby_nt_serial;
-#define RUBY_NT_SERIAL 1
-# endif
+  NOINLINE(void rb_current_ec_set(struct rb_execution_context_struct *));
+
+  # if defined(__arm64__) || defined(__aarch64__)
+    // on Arm64, TLS can not be accessed across .so
+    NOINLINE(struct rb_execution_context_struct *rb_current_ec(void));
+  # else
+    RUBY_EXTERN RB_THREAD_LOCAL_SPECIFIER struct rb_execution_context_struct *ruby_current_ec;
+
+    // for RUBY_DEBUG_LOG()
+    RUBY_EXTERN RB_THREAD_LOCAL_SPECIFIER rb_atomic_t ruby_nt_serial;
+    #define RUBY_NT_SERIAL 1
+  # endif
 #else
 typedef pthread_key_t native_tls_key_t;
 
@@ -123,4 +164,8 @@ native_tls_set(native_tls_key_t key, void *ptr)
 RUBY_EXTERN native_tls_key_t ruby_current_ec_key;
 #endif
 
+struct rb_ractor_struct;
+void rb_ractor_sched_wait(struct rb_execution_context_struct *ec, struct rb_ractor_struct *cr, rb_unblock_function_t *ubf, void *ptr);
+void rb_ractor_sched_wakeup(struct rb_ractor_struct *r, struct rb_thread_struct *th);
+
 #endif /* RUBY_THREAD_PTHREAD_H */
diff --git a/thread_pthread_mn.c b/thread_pthread_mn.c
new file mode 100644
index 00000000000000..4a671cf3a172f7
--- /dev/null
+++ b/thread_pthread_mn.c
@@ -0,0 +1,1087 @@
+// included by "thread_pthread.c"
+
+#if USE_MN_THREADS
+
+static void timer_thread_unregister_waiting(rb_thread_t *th, int fd, enum thread_sched_waiting_flag flags);
+
+static bool
+timer_thread_cancel_waiting(rb_thread_t *th)
+{
+    bool canceled = false;
+
+    if (th->sched.waiting_reason.flags) {
+        rb_native_mutex_lock(&timer_th.waiting_lock);
+        {
+            if (th->sched.waiting_reason.flags) {
+                canceled = true;
+                ccan_list_del_init(&th->sched.waiting_reason.node);
+                if (th->sched.waiting_reason.flags & (thread_sched_waiting_io_read | thread_sched_waiting_io_write)) {
+                    timer_thread_unregister_waiting(th, th->sched.waiting_reason.data.fd, th->sched.waiting_reason.flags);
+                }
+                th->sched.waiting_reason.flags = thread_sched_waiting_none;
+            }
+        }
+        rb_native_mutex_unlock(&timer_th.waiting_lock);
+    }
+
+    return canceled;
+}
+
+static void
+ubf_event_waiting(void *ptr)
+{
+    rb_thread_t *th = (rb_thread_t *)ptr;
+    struct rb_thread_sched *sched = TH_SCHED(th);
+
+    RUBY_DEBUG_LOG("th:%u", rb_th_serial(th));
+
+    VM_ASSERT(th->nt == NULL || !th_has_dedicated_nt(th));
+
+    // only once. it is safe because th->interrupt_lock is already acquired.
+    th->unblock.func = NULL;
+    th->unblock.arg = NULL;
+
+    bool canceled = timer_thread_cancel_waiting(th);
+
+    thread_sched_lock(sched, th);
+    {
+        if (sched->running == th) {
+            RUBY_DEBUG_LOG("not waiting yet");
+        }
+        else if (canceled) {
+            thread_sched_to_ready_common(sched, th, true, false);
+        }
+        else {
+            RUBY_DEBUG_LOG("already not waiting");
+        }
+    }
+    thread_sched_unlock(sched, th);
+}
+
+static bool timer_thread_register_waiting(rb_thread_t *th, int fd, enum thread_sched_waiting_flag flags, rb_hrtime_t *rel);
+
+// return true if timed out
+static bool
+thread_sched_wait_events(struct rb_thread_sched *sched, rb_thread_t *th, int fd, enum thread_sched_waiting_flag events, rb_hrtime_t *rel)
+{
+    VM_ASSERT(!th_has_dedicated_nt(th));  // on SNT
+
+    volatile bool timedout = false, need_cancel = false;
+
+    if (timer_thread_register_waiting(th, fd, events, rel)) {
+        RUBY_DEBUG_LOG("wait fd:%d", fd);
+
+        RB_VM_SAVE_MACHINE_CONTEXT(th);
+        ubf_set(th, ubf_event_waiting, (void *)th);
+
+        RB_INTERNAL_THREAD_HOOK(RUBY_INTERNAL_THREAD_EVENT_SUSPENDED, th);
+
+        thread_sched_lock(sched, th);
+        {
+            if (th->sched.waiting_reason.flags == thread_sched_waiting_none) {
+                // already awaken
+            }
+            else if (RUBY_VM_INTERRUPTED(th->ec)) {
+                need_cancel = true;
+            }
+            else {
+                RUBY_DEBUG_LOG("sleep");
+
+                th->status = THREAD_STOPPED_FOREVER;
+                thread_sched_wakeup_next_thread(sched, th, true);
+                thread_sched_wait_running_turn(sched, th, true);
+
+                RUBY_DEBUG_LOG("wakeup");
+            }
+
+            timedout = th->sched.waiting_reason.data.result == 0;
+        }
+        thread_sched_unlock(sched, th);
+
+        if (need_cancel) {
+            timer_thread_cancel_waiting(th);
+        }
+
+        ubf_clear(th); // TODO: maybe it is already NULL?
+
+        th->status = THREAD_RUNNABLE;
+    }
+    else {
+        RUBY_DEBUG_LOG("can not wait fd:%d", fd);
+        return false;
+    }
+
+    VM_ASSERT(sched->running == th);
+
+    return timedout;
+}
+
+/// stack management
+
+static int
+get_sysconf_page_size(void)
+{
+    static long page_size = 0;
+
+    if (UNLIKELY(page_size == 0)) {
+        page_size = sysconf(_SC_PAGESIZE);
+        VM_ASSERT(page_size < INT_MAX);
+    }
+    return (int)page_size;
+}
+
+#define MSTACK_CHUNK_SIZE (512 * 1024 * 1024) // 512MB
+#define MSTACK_PAGE_SIZE get_sysconf_page_size()
+#define MSTACK_CHUNK_PAGE_NUM (MSTACK_CHUNK_SIZE / MSTACK_PAGE_SIZE - 1) // 1 is start redzone
+
+// 512MB chunk
+// 131,072 pages (> 65,536)
+// 0th page is Redzone. Start from 1st page.
+
+/*
+ *            <--> machine stack + vm stack
+ * ----------------------------------
+ * |HD...|RZ| ... |RZ| ...   ... |RZ|
+ * <------------- 512MB ------------->
+ */
+
+static struct nt_stack_chunk_header {
+    struct nt_stack_chunk_header *prev_chunk;
+    struct nt_stack_chunk_header *prev_free_chunk;
+
+    uint16_t start_page;
+    uint16_t stack_count;
+    uint16_t uninitialized_stack_count;
+
+    uint16_t free_stack_pos;
+    uint16_t free_stack[];
+} *nt_stack_chunks = NULL,
+  *nt_free_stack_chunks = NULL;
+
+struct nt_machine_stack_footer {
+    struct nt_stack_chunk_header *ch;
+    size_t index;
+};
+
+static rb_nativethread_lock_t nt_machine_stack_lock = RB_NATIVETHREAD_LOCK_INIT;
+
+#include <sys/mman.h>
+
+// vm_stack_size + machine_stack_size + 1 * (guard page size)
+static inline size_t
+nt_thread_stack_size(void)
+{
+    static size_t msz;
+    if (LIKELY(msz > 0)) return msz;
+
+    rb_vm_t *vm = GET_VM();
+    int sz = (int)(vm->default_params.thread_vm_stack_size + vm->default_params.thread_machine_stack_size + MSTACK_PAGE_SIZE);
+    int page_num = roomof(sz, MSTACK_PAGE_SIZE);
+    msz = (size_t)page_num * MSTACK_PAGE_SIZE;
+    return msz;
+}
+
+static struct nt_stack_chunk_header *
+nt_alloc_thread_stack_chunk(void)
+{
+    int mmap_flags = MAP_ANONYMOUS | MAP_PRIVATE;
+#if defined(MAP_STACK) && !defined(__FreeBSD__) && !defined(__FreeBSD_kernel__)
+    mmap_flags |= MAP_STACK;
+#endif
+
+    const char *m = (void *)mmap(NULL, MSTACK_CHUNK_SIZE, PROT_READ | PROT_WRITE, mmap_flags, -1, 0);
+    if (m == MAP_FAILED) {
+        return NULL;
+    }
+
+    ruby_annotate_mmap(m, MSTACK_CHUNK_SIZE, "Ruby:nt_alloc_thread_stack_chunk");
+
+    size_t msz = nt_thread_stack_size();
+    int header_page_cnt = 1;
+    int stack_count = ((MSTACK_CHUNK_PAGE_NUM - header_page_cnt) * MSTACK_PAGE_SIZE) / msz;
+    int ch_size = sizeof(struct nt_stack_chunk_header) + sizeof(uint16_t) * stack_count;
+
+    if (ch_size > MSTACK_PAGE_SIZE * header_page_cnt) {
+        header_page_cnt = (ch_size + MSTACK_PAGE_SIZE - 1) / MSTACK_PAGE_SIZE;
+        stack_count = ((MSTACK_CHUNK_PAGE_NUM - header_page_cnt) * MSTACK_PAGE_SIZE) / msz;
+    }
+
+    VM_ASSERT(stack_count <= UINT16_MAX);
+
+    struct nt_stack_chunk_header *ch = (struct nt_stack_chunk_header *)m;
+
+    ch->start_page = header_page_cnt;
+    ch->prev_chunk = nt_stack_chunks;
+    ch->prev_free_chunk = nt_free_stack_chunks;
+    ch->uninitialized_stack_count = ch->stack_count = (uint16_t)stack_count;
+    ch->free_stack_pos = 0;
+
+    RUBY_DEBUG_LOG("ch:%p start_page:%d stack_cnt:%d stack_size:%d", ch, (int)ch->start_page, (int)ch->stack_count, (int)msz);
+
+    return ch;
+}
+
+static void *
+nt_stack_chunk_get_stack_start(struct nt_stack_chunk_header *ch, size_t idx)
+{
+    const char *m = (char *)ch;
+    return (void *)(m + ch->start_page * MSTACK_PAGE_SIZE + idx * nt_thread_stack_size());
+}
+
+static struct nt_machine_stack_footer *
+nt_stack_chunk_get_msf(const rb_vm_t *vm, const char *mstack)
+{
+    // TODO: stack direction
+    const size_t msz = vm->default_params.thread_machine_stack_size;
+    return (struct nt_machine_stack_footer *)&mstack[msz - sizeof(struct nt_machine_stack_footer)];
+}
+
+static void *
+nt_stack_chunk_get_stack(const rb_vm_t *vm, struct nt_stack_chunk_header *ch, size_t idx, void **vm_stack, void **machine_stack)
+{
+    // TODO: only support stack going down
+    // [VM ... <GUARD> machine stack ...]
+
+    const char *vstack, *mstack;
+    const char *guard_page;
+    vstack = nt_stack_chunk_get_stack_start(ch, idx);
+    guard_page = vstack + vm->default_params.thread_vm_stack_size;
+    mstack = guard_page + MSTACK_PAGE_SIZE;
+
+    struct nt_machine_stack_footer *msf = nt_stack_chunk_get_msf(vm, mstack);
+    msf->ch = ch;
+    msf->index = idx;
+
+#if 0
+    RUBY_DEBUG_LOG("msf:%p vstack:%p-%p guard_page:%p-%p mstack:%p-%p", msf,
+                   vstack, (void *)(guard_page-1),
+                   guard_page, (void *)(mstack-1),
+                   mstack, (void *)(msf));
+#endif
+
+    *vm_stack = (void *)vstack;
+    *machine_stack = (void *)mstack;
+
+    return (void *)guard_page;
+}
+
+RBIMPL_ATTR_MAYBE_UNUSED()
+static void
+nt_stack_chunk_dump(void)
+{
+    struct nt_stack_chunk_header *ch;
+    int i;
+
+    fprintf(stderr, "** nt_stack_chunks\n");
+    ch = nt_stack_chunks;
+    for (i=0; ch; i++, ch = ch->prev_chunk) {
+        fprintf(stderr, "%d %p free_pos:%d\n", i, (void *)ch, (int)ch->free_stack_pos);
+    }
+
+    fprintf(stderr, "** nt_free_stack_chunks\n");
+    ch = nt_free_stack_chunks;
+    for (i=0; ch; i++, ch = ch->prev_free_chunk) {
+        fprintf(stderr, "%d %p free_pos:%d\n", i, (void *)ch, (int)ch->free_stack_pos);
+    }
+}
+
+static int
+nt_guard_page(const char *p, size_t len)
+{
+    if (mprotect((void *)p, len, PROT_NONE) != -1) {
+        return 0;
+    }
+    else {
+        return errno;
+    }
+}
+
+static int
+nt_alloc_stack(rb_vm_t *vm, void **vm_stack, void **machine_stack)
+{
+    int err = 0;
+
+    rb_native_mutex_lock(&nt_machine_stack_lock);
+    {
+      retry:
+        if (nt_free_stack_chunks) {
+            struct nt_stack_chunk_header *ch = nt_free_stack_chunks;
+            if (ch->free_stack_pos > 0) {
+                RUBY_DEBUG_LOG("free_stack_pos:%d", ch->free_stack_pos);
+                nt_stack_chunk_get_stack(vm, ch, ch->free_stack[--ch->free_stack_pos], vm_stack, machine_stack);
+            }
+            else if (ch->uninitialized_stack_count > 0) {
+                RUBY_DEBUG_LOG("uninitialized_stack_count:%d", ch->uninitialized_stack_count);
+
+                size_t idx = ch->stack_count - ch->uninitialized_stack_count--;
+                void *guard_page = nt_stack_chunk_get_stack(vm, ch, idx, vm_stack, machine_stack);
+                err = nt_guard_page(guard_page, MSTACK_PAGE_SIZE);
+            }
+            else {
+                nt_free_stack_chunks = ch->prev_free_chunk;
+                ch->prev_free_chunk = NULL;
+                goto retry;
+            }
+        }
+        else {
+            struct nt_stack_chunk_header *p = nt_alloc_thread_stack_chunk();
+            if (p == NULL) {
+                err = errno;
+            }
+            else {
+                nt_free_stack_chunks = nt_stack_chunks = p;
+                goto retry;
+            }
+        }
+    }
+    rb_native_mutex_unlock(&nt_machine_stack_lock);
+
+    return err;
+}
+
+static void
+nt_madvise_free_or_dontneed(void *addr, size_t len)
+{
+    /* There is no real way to perform error handling here. Both MADV_FREE
+     * and MADV_DONTNEED are both documented to pretty much only return EINVAL
+     * for a huge variety of errors. It's indistinguishable if madvise fails
+     * because the parameters were bad, or because the kernel we're running on
+     * does not support the given advice. This kind of free-but-don't-unmap
+     * is best-effort anyway, so don't sweat it.
+     *
+     * n.b. A very common case of "the kernel doesn't support MADV_FREE and
+     * returns EINVAL" is running under the `rr` debugger; it makes all
+     * MADV_FREE calls return EINVAL. */
+
+#if defined(MADV_FREE)
+    int r = madvise(addr, len, MADV_FREE);
+    // Return on success, or else try MADV_DONTNEED
+    if (r == 0) return;
+#endif
+#if defined(MADV_DONTNEED)
+    madvise(addr, len, MADV_DONTNEED);
+#endif
+}
+
+static void
+nt_free_stack(void *mstack)
+{
+    if (!mstack) return;
+
+    rb_native_mutex_lock(&nt_machine_stack_lock);
+    {
+        struct nt_machine_stack_footer *msf = nt_stack_chunk_get_msf(GET_VM(), mstack);
+        struct nt_stack_chunk_header *ch = msf->ch;
+        int idx = (int)msf->index;
+        void *stack = nt_stack_chunk_get_stack_start(ch, idx);
+
+        RUBY_DEBUG_LOG("stack:%p mstack:%p ch:%p index:%d", stack, mstack, ch, idx);
+
+        if (ch->prev_free_chunk == NULL) {
+            ch->prev_free_chunk = nt_free_stack_chunks;
+            nt_free_stack_chunks = ch;
+        }
+        ch->free_stack[ch->free_stack_pos++] = idx;
+
+        // clear the stack pages
+        nt_madvise_free_or_dontneed(stack, nt_thread_stack_size());
+    }
+    rb_native_mutex_unlock(&nt_machine_stack_lock);
+}
+
+
+static int
+native_thread_check_and_create_shared(rb_vm_t *vm)
+{
+    bool need_to_make = false;
+
+    rb_native_mutex_lock(&vm->ractor.sched.lock);
+    {
+        unsigned int snt_cnt = vm->ractor.sched.snt_cnt;
+        if (!vm->ractor.main_ractor->threads.sched.enable_mn_threads) snt_cnt++; // do not need snt for main ractor
+
+        if (((int)snt_cnt < MINIMUM_SNT) ||
+            (snt_cnt < vm->ractor.cnt  &&
+             snt_cnt < vm->ractor.sched.max_cpu)) {
+
+            RUBY_DEBUG_LOG("added snt:%u dnt:%u ractor_cnt:%u grq_cnt:%u",
+                           vm->ractor.sched.snt_cnt,
+                           vm->ractor.sched.dnt_cnt,
+                           vm->ractor.cnt,
+                           vm->ractor.sched.grq_cnt);
+
+            vm->ractor.sched.snt_cnt++;
+            need_to_make = true;
+        }
+        else {
+            RUBY_DEBUG_LOG("snt:%d ractor_cnt:%d", (int)vm->ractor.sched.snt_cnt, (int)vm->ractor.cnt);
+        }
+    }
+    rb_native_mutex_unlock(&vm->ractor.sched.lock);
+
+    if (need_to_make) {
+        struct rb_native_thread *nt = native_thread_alloc();
+        nt->vm = vm;
+        return native_thread_create0(nt);
+    }
+    else {
+        return 0;
+    }
+}
+
+#ifdef __APPLE__
+# define co_start ruby_coroutine_start
+#else
+static
+#endif
+COROUTINE
+co_start(struct coroutine_context *from, struct coroutine_context *self)
+{
+#ifdef RUBY_ASAN_ENABLED
+    __sanitizer_finish_switch_fiber(self->fake_stack,
+                                    (const void**)&from->stack_base, &from->stack_size);
+#endif
+
+    rb_thread_t *th = (rb_thread_t *)self->argument;
+    struct rb_thread_sched *sched = TH_SCHED(th);
+    VM_ASSERT(th->nt != NULL);
+    VM_ASSERT(th == sched->running);
+    VM_ASSERT(sched->lock_owner == NULL);
+
+    // RUBY_DEBUG_LOG("th:%u", rb_th_serial(th));
+
+    thread_sched_set_locked(sched, th);
+    thread_sched_add_running_thread(TH_SCHED(th), th);
+    thread_sched_unlock(sched, th);
+    {
+        RB_INTERNAL_THREAD_HOOK(RUBY_INTERNAL_THREAD_EVENT_RESUMED, th);
+        call_thread_start_func_2(th);
+    }
+    thread_sched_lock(sched, NULL);
+
+    RUBY_DEBUG_LOG("terminated th:%d", (int)th->serial);
+
+    // Thread is terminated
+
+    struct rb_native_thread *nt = th->nt;
+    bool is_dnt = th_has_dedicated_nt(th);
+    native_thread_assign(NULL, th);
+    rb_ractor_set_current_ec(th->ractor, NULL);
+
+    if (is_dnt) {
+        // SNT became DNT while running. Just return to the nt_context
+
+        th->sched.finished = true;
+        coroutine_transfer0(self, nt->nt_context, true);
+    }
+    else {
+        rb_thread_t *next_th = sched->running;
+
+        if (next_th && !next_th->nt) {
+            // switch to the next thread
+            thread_sched_set_unlocked(sched, NULL);
+            th->sched.finished = true;
+            thread_sched_switch0(th->sched.context, next_th, nt, true);
+        }
+        else {
+            // switch to the next Ractor
+            th->sched.finished = true;
+            coroutine_transfer0(self, nt->nt_context, true);
+        }
+    }
+
+    rb_bug("unreachable");
+}
+
+static int
+native_thread_create_shared(rb_thread_t *th)
+{
+    // setup coroutine
+    rb_vm_t *vm = th->vm;
+    void *vm_stack = NULL, *machine_stack = NULL;
+    int err = nt_alloc_stack(vm, &vm_stack, &machine_stack);
+    if (err) return err;
+
+    VM_ASSERT(vm_stack < machine_stack);
+
+    // setup vm stack
+    size_t vm_stack_words = th->vm->default_params.thread_vm_stack_size/sizeof(VALUE);
+    rb_ec_initialize_vm_stack(th->ec, vm_stack, vm_stack_words);
+
+    // setup machine stack
+    size_t machine_stack_size = vm->default_params.thread_machine_stack_size - sizeof(struct nt_machine_stack_footer);
+    th->ec->machine.stack_start = (void *)((uintptr_t)machine_stack + machine_stack_size);
+    th->ec->machine.stack_maxsize = machine_stack_size; // TODO
+    th->sched.context_stack = machine_stack;
+
+    th->sched.context = ruby_xmalloc(sizeof(struct coroutine_context));
+    coroutine_initialize(th->sched.context, co_start, machine_stack, machine_stack_size);
+    th->sched.context->argument = th;
+
+    RUBY_DEBUG_LOG("th:%u vm_stack:%p machine_stack:%p", rb_th_serial(th), vm_stack, machine_stack);
+    thread_sched_to_ready(TH_SCHED(th), th);
+
+    // setup nt
+    return native_thread_check_and_create_shared(th->vm);
+}
+
+#else // USE_MN_THREADS
+
+static int
+native_thread_create_shared(rb_thread_t *th)
+{
+    rb_bug("unreachable");
+}
+
+static bool
+thread_sched_wait_events(struct rb_thread_sched *sched, rb_thread_t *th, int fd, enum thread_sched_waiting_flag events, rb_hrtime_t *rel)
+{
+    rb_bug("unreachable");
+}
+
+#endif // USE_MN_THREADS
+
+/// EPOLL/KQUEUE specific code
+#if (HAVE_SYS_EPOLL_H || HAVE_SYS_EVENT_H) && USE_MN_THREADS
+
+static bool
+fd_readable_nonblock(int fd)
+{
+    struct pollfd pfd = {
+        .fd = fd,
+        .events = POLLIN,
+    };
+    return poll(&pfd, 1, 0) != 0;
+}
+
+static bool
+fd_writable_nonblock(int fd)
+{
+    struct pollfd pfd = {
+        .fd = fd,
+        .events = POLLOUT,
+    };
+    return poll(&pfd, 1, 0) != 0;
+}
+
+static void
+verify_waiting_list(void)
+{
+#if VM_CHECK_MODE > 0
+    struct rb_thread_sched_waiting *w, *prev_w = NULL;
+
+    // waiting list's timeout order should be [1, 2, 3, ..., 0, 0, 0]
+
+    ccan_list_for_each(&timer_th.waiting, w, node) {
+        // fprintf(stderr, "verify_waiting_list th:%u abs:%lu\n", rb_th_serial(wth), (unsigned long)wth->sched.waiting_reason.data.timeout);
+        if (prev_w) {
+            rb_hrtime_t timeout = w->data.timeout;
+            rb_hrtime_t prev_timeout = w->data.timeout;
+            VM_ASSERT(timeout == 0 || prev_timeout <= timeout);
+        }
+        prev_w = w;
+    }
+#endif
+}
+
+#if HAVE_SYS_EVENT_H // kqueue helpers
+
+static enum thread_sched_waiting_flag
+kqueue_translate_filter_to_flags(int16_t filter)
+{
+    switch (filter) {
+      case EVFILT_READ:
+        return thread_sched_waiting_io_read;
+      case EVFILT_WRITE:
+        return thread_sched_waiting_io_write;
+      case EVFILT_TIMER:
+        return thread_sched_waiting_timeout;
+      default:
+        rb_bug("kevent filter:%d not supported", filter);
+    }
+}
+
+static int
+kqueue_wait(rb_vm_t *vm)
+{
+    struct timespec calculated_timeout;
+    struct timespec *timeout = NULL;
+    int timeout_ms = timer_thread_set_timeout(vm);
+
+    if (timeout_ms >= 0) {
+        calculated_timeout.tv_sec = timeout_ms / 1000;
+        calculated_timeout.tv_nsec = (timeout_ms % 1000) * 1000000;
+        timeout = &calculated_timeout;
+    }
+
+    return kevent(timer_th.event_fd, NULL, 0, timer_th.finished_events, KQUEUE_EVENTS_MAX, timeout);
+}
+
+static void
+kqueue_create(void)
+{
+    if ((timer_th.event_fd = kqueue()) == -1) rb_bug("kqueue creation failed (errno:%d)", errno);
+    int flags = fcntl(timer_th.event_fd, F_GETFD);
+    if (flags == -1) {
+        rb_bug("kqueue GETFD failed (errno:%d)", errno);
+    }
+
+    flags |= FD_CLOEXEC;
+    if (fcntl(timer_th.event_fd, F_SETFD, flags) == -1) {
+        rb_bug("kqueue SETFD failed (errno:%d)", errno);
+    }
+}
+
+static void
+kqueue_unregister_waiting(int fd, enum thread_sched_waiting_flag flags)
+{
+    if (flags) {
+        struct kevent ke[2];
+        int num_events = 0;
+
+        if (flags & thread_sched_waiting_io_read) {
+            EV_SET(&ke[num_events], fd, EVFILT_READ, EV_DELETE, 0, 0, NULL);
+            num_events++;
+        }
+        if (flags & thread_sched_waiting_io_write) {
+            EV_SET(&ke[num_events], fd, EVFILT_WRITE, EV_DELETE, 0, 0, NULL);
+            num_events++;
+        }
+        if (kevent(timer_th.event_fd, ke, num_events, NULL, 0, NULL) == -1) {
+            perror("kevent");
+            rb_bug("unregister/kevent fails. errno:%d", errno);
+        }
+    }
+}
+
+static bool
+kqueue_already_registered(int fd)
+{
+    struct rb_thread_sched_waiting *w, *found_w = NULL;
+
+    ccan_list_for_each(&timer_th.waiting, w, node) {
+        // Similar to EEXIST in epoll_ctl, but more strict because it checks fd rather than flags
+        //   for simplicity
+        if (w->flags && w->data.fd == fd) {
+            found_w = w;
+            break;
+        }
+    }
+    return found_w != NULL;
+}
+
+#endif // HAVE_SYS_EVENT_H
+
+// return false if the fd is not waitable or not need to wait.
+static bool
+timer_thread_register_waiting(rb_thread_t *th, int fd, enum thread_sched_waiting_flag flags, rb_hrtime_t *rel)
+{
+    RUBY_DEBUG_LOG("th:%u fd:%d flag:%d rel:%lu", rb_th_serial(th), fd, flags, rel ? (unsigned long)*rel : 0);
+
+    VM_ASSERT(th == NULL || TH_SCHED(th)->running == th);
+    VM_ASSERT(flags != 0);
+
+    rb_hrtime_t abs = 0; // 0 means no timeout
+
+    if (rel) {
+        if (*rel > 0) {
+            flags |= thread_sched_waiting_timeout;
+        }
+        else {
+            return false;
+        }
+    }
+
+    if (rel && *rel > 0) {
+        flags |= thread_sched_waiting_timeout;
+    }
+
+#if HAVE_SYS_EVENT_H
+    struct kevent ke[2];
+    int num_events = 0;
+#else
+    uint32_t epoll_events = 0;
+#endif
+    if (flags & thread_sched_waiting_timeout) {
+        VM_ASSERT(rel != NULL);
+        abs = rb_hrtime_add(rb_hrtime_now(), *rel);
+    }
+
+    if (flags & thread_sched_waiting_io_read) {
+        if (!(flags & thread_sched_waiting_io_force) && fd_readable_nonblock(fd)) {
+            RUBY_DEBUG_LOG("fd_readable_nonblock");
+            return false;
+        }
+        else {
+            VM_ASSERT(fd >= 0);
+#if HAVE_SYS_EVENT_H
+            EV_SET(&ke[num_events], fd, EVFILT_READ, EV_ADD, 0, 0, (void *)th);
+            num_events++;
+#else
+            epoll_events |= EPOLLIN;
+#endif
+        }
+    }
+
+    if (flags & thread_sched_waiting_io_write) {
+        if (!(flags & thread_sched_waiting_io_force) && fd_writable_nonblock(fd)) {
+            RUBY_DEBUG_LOG("fd_writable_nonblock");
+            return false;
+        }
+        else {
+            VM_ASSERT(fd >= 0);
+#if HAVE_SYS_EVENT_H
+            EV_SET(&ke[num_events], fd, EVFILT_WRITE, EV_ADD, 0, 0, (void *)th);
+            num_events++;
+#else
+            epoll_events |= EPOLLOUT;
+#endif
+        }
+    }
+
+    rb_native_mutex_lock(&timer_th.waiting_lock);
+    {
+#if HAVE_SYS_EVENT_H
+        if (num_events > 0) {
+            if (kqueue_already_registered(fd)) {
+                rb_native_mutex_unlock(&timer_th.waiting_lock);
+                return false;
+            }
+
+            if (kevent(timer_th.event_fd, ke, num_events, NULL, 0, NULL) == -1) {
+                RUBY_DEBUG_LOG("failed (%d)", errno);
+
+                switch (errno) {
+                  case EBADF:
+                    // the fd is closed?
+                  case EINTR:
+                    // signal received? is there a sensible way to handle this?
+                  default:
+                    perror("kevent");
+                    rb_bug("register/kevent failed(fd:%d, errno:%d)", fd, errno);
+                }
+            }
+            RUBY_DEBUG_LOG("kevent(add, fd:%d) success", fd);
+        }
+#else
+        if (epoll_events) {
+            struct epoll_event event = {
+                .events = epoll_events,
+                .data = {
+                    .ptr = (void *)th,
+                },
+            };
+            if (epoll_ctl(timer_th.event_fd, EPOLL_CTL_ADD, fd, &event) == -1) {
+                RUBY_DEBUG_LOG("failed (%d)", errno);
+
+                switch (errno) {
+                  case EBADF:
+                    // the fd is closed?
+                  case EPERM:
+                    // the fd doesn't support epoll
+                  case EEXIST:
+                    // the fd is already registered by another thread
+                    rb_native_mutex_unlock(&timer_th.waiting_lock);
+                    return false;
+                  default:
+                    perror("epoll_ctl");
+                    rb_bug("register/epoll_ctl failed(fd:%d, errno:%d)", fd, errno);
+                }
+            }
+            RUBY_DEBUG_LOG("epoll_ctl(add, fd:%d, events:%d) success", fd, epoll_events);
+        }
+#endif
+
+        if (th) {
+            VM_ASSERT(th->sched.waiting_reason.flags == thread_sched_waiting_none);
+
+            // setup waiting information
+            {
+                th->sched.waiting_reason.flags = flags;
+                th->sched.waiting_reason.data.timeout = abs;
+                th->sched.waiting_reason.data.fd = fd;
+                th->sched.waiting_reason.data.result = 0;
+            }
+
+            if (abs == 0) { // no timeout
+                VM_ASSERT(!(flags & thread_sched_waiting_timeout));
+                ccan_list_add_tail(&timer_th.waiting, &th->sched.waiting_reason.node);
+            }
+            else {
+                RUBY_DEBUG_LOG("abs:%lu", (unsigned long)abs);
+                VM_ASSERT(flags & thread_sched_waiting_timeout);
+
+                // insert th to sorted list (TODO: O(n))
+                struct rb_thread_sched_waiting *w, *prev_w = NULL;
+
+                ccan_list_for_each(&timer_th.waiting, w, node) {
+                    if ((w->flags & thread_sched_waiting_timeout) &&
+                        w->data.timeout < abs) {
+                        prev_w = w;
+                    }
+                    else {
+                        break;
+                    }
+                }
+
+                if (prev_w) {
+                    ccan_list_add_after(&timer_th.waiting, &prev_w->node, &th->sched.waiting_reason.node);
+                }
+                else {
+                    ccan_list_add(&timer_th.waiting, &th->sched.waiting_reason.node);
+                }
+
+                verify_waiting_list();
+
+                // update timeout seconds
+                timer_thread_wakeup();
+            }
+        }
+        else {
+            VM_ASSERT(abs == 0);
+        }
+    }
+    rb_native_mutex_unlock(&timer_th.waiting_lock);
+
+    return true;
+}
+
+static void
+timer_thread_unregister_waiting(rb_thread_t *th, int fd, enum thread_sched_waiting_flag flags)
+{
+    RUBY_DEBUG_LOG("th:%u fd:%d", rb_th_serial(th), fd);
+#if HAVE_SYS_EVENT_H
+    kqueue_unregister_waiting(fd, flags);
+#else
+    // Linux 2.6.9 or later is needed to pass NULL as data.
+    if (epoll_ctl(timer_th.event_fd, EPOLL_CTL_DEL, fd, NULL) == -1) {
+        switch (errno) {
+          case EBADF:
+            // just ignore. maybe fd is closed.
+            break;
+          default:
+            perror("epoll_ctl");
+            rb_bug("unregister/epoll_ctl fails. errno:%d", errno);
+        }
+    }
+#endif
+}
+
+static void
+timer_thread_setup_mn(void)
+{
+#if HAVE_SYS_EVENT_H
+    kqueue_create();
+    RUBY_DEBUG_LOG("kqueue_fd:%d", timer_th.event_fd);
+#else
+    if ((timer_th.event_fd = epoll_create1(EPOLL_CLOEXEC)) == -1) rb_bug("epoll_create (errno:%d)", errno);
+    RUBY_DEBUG_LOG("epoll_fd:%d", timer_th.event_fd);
+#endif
+    RUBY_DEBUG_LOG("comm_fds:%d/%d", timer_th.comm_fds[0], timer_th.comm_fds[1]);
+
+    timer_thread_register_waiting(NULL, timer_th.comm_fds[0], thread_sched_waiting_io_read | thread_sched_waiting_io_force, NULL);
+}
+
+static int
+event_wait(rb_vm_t *vm)
+{
+#if HAVE_SYS_EVENT_H
+    int r = kqueue_wait(vm);
+#else
+    int r = epoll_wait(timer_th.event_fd, timer_th.finished_events, EPOLL_EVENTS_MAX, timer_thread_set_timeout(vm));
+#endif
+    return r;
+}
+
+/*
+ * The purpose of the timer thread:
+ *
+ * (1) Periodic checking
+ *   (1-1) Provide time slice for active NTs
+ *   (1-2) Check NT shortage
+ *   (1-3) Periodic UBF (global)
+ *   (1-4) Lazy GRQ deq start
+ * (2) Receive notification
+ *   (2-1) async I/O termination
+ *   (2-2) timeout
+ *     (2-2-1) sleep(n)
+ *     (2-2-2) timeout(n), I/O, ...
+ */
+static void
+timer_thread_polling(rb_vm_t *vm)
+{
+    int r = event_wait(vm);
+
+    RUBY_DEBUG_LOG("r:%d errno:%d", r, errno);
+
+    switch (r) {
+      case 0: // timeout
+        RUBY_DEBUG_LOG("timeout%s", "");
+
+        ractor_sched_lock(vm, NULL);
+        {
+            // (1-1) timeslice
+            timer_thread_check_timeslice(vm);
+
+            // (1-4) lazy grq deq
+            if (vm->ractor.sched.grq_cnt > 0) {
+                RUBY_DEBUG_LOG("GRQ cnt: %u", vm->ractor.sched.grq_cnt);
+                rb_native_cond_signal(&vm->ractor.sched.cond);
+            }
+        }
+        ractor_sched_unlock(vm, NULL);
+
+        // (1-2)
+        native_thread_check_and_create_shared(vm);
+
+        break;
+
+      case -1:
+        switch (errno) {
+          case EINTR:
+            // simply retry
+            break;
+          default:
+            perror("event_wait");
+            rb_bug("event_wait errno:%d", errno);
+        }
+        break;
+
+      default:
+        RUBY_DEBUG_LOG("%d event(s)", r);
+
+#if HAVE_SYS_EVENT_H
+        for (int i=0; i<r; i++) {
+            rb_thread_t *th = (rb_thread_t *)timer_th.finished_events[i].udata;
+            int fd = (int)timer_th.finished_events[i].ident;
+            int16_t filter = timer_th.finished_events[i].filter;
+
+            if (th == NULL) {
+                // wakeup timerthread
+                RUBY_DEBUG_LOG("comm from fd:%d", timer_th.comm_fds[1]);
+                consume_communication_pipe(timer_th.comm_fds[0]);
+            }
+            else {
+                // wakeup specific thread by IO
+                RUBY_DEBUG_LOG("io event. wakeup_th:%u event:%s%s",
+                                rb_th_serial(th),
+                                (filter == EVFILT_READ) ? "read/" : "",
+                                (filter == EVFILT_WRITE) ? "write/" : "");
+
+                rb_native_mutex_lock(&timer_th.waiting_lock);
+                {
+                    if (th->sched.waiting_reason.flags) {
+                        // delete from chain
+                        ccan_list_del_init(&th->sched.waiting_reason.node);
+                        timer_thread_unregister_waiting(th, fd, kqueue_translate_filter_to_flags(filter));
+
+                        th->sched.waiting_reason.flags = thread_sched_waiting_none;
+                        th->sched.waiting_reason.data.fd = -1;
+                        th->sched.waiting_reason.data.result = filter;
+
+                        timer_thread_wakeup_thread(th);
+                    }
+                    else {
+                        // already released
+                    }
+                }
+                rb_native_mutex_unlock(&timer_th.waiting_lock);
+            }
+        }
+#else
+        for (int i=0; i<r; i++) {
+            rb_thread_t *th = (rb_thread_t *)timer_th.finished_events[i].data.ptr;
+
+            if (th == NULL) {
+                // wakeup timerthread
+                RUBY_DEBUG_LOG("comm from fd:%d", timer_th.comm_fds[1]);
+                consume_communication_pipe(timer_th.comm_fds[0]);
+            }
+            else {
+                // wakeup specific thread by IO
+                uint32_t events = timer_th.finished_events[i].events;
+
+                RUBY_DEBUG_LOG("io event. wakeup_th:%u event:%s%s%s%s%s%s",
+                               rb_th_serial(th),
+                               (events & EPOLLIN)    ? "in/" : "",
+                               (events & EPOLLOUT)   ? "out/" : "",
+                               (events & EPOLLRDHUP) ? "RDHUP/" : "",
+                               (events & EPOLLPRI)   ? "pri/" : "",
+                               (events & EPOLLERR)   ? "err/" : "",
+                               (events & EPOLLHUP)   ? "hup/" : "");
+
+                rb_native_mutex_lock(&timer_th.waiting_lock);
+                {
+                    if (th->sched.waiting_reason.flags) {
+                        // delete from chain
+                        ccan_list_del_init(&th->sched.waiting_reason.node);
+                        timer_thread_unregister_waiting(th, th->sched.waiting_reason.data.fd, th->sched.waiting_reason.flags);
+
+                        th->sched.waiting_reason.flags = thread_sched_waiting_none;
+                        th->sched.waiting_reason.data.fd = -1;
+                        th->sched.waiting_reason.data.result = (int)events;
+
+                        timer_thread_wakeup_thread(th);
+                    }
+                    else {
+                        // already released
+                    }
+                }
+                rb_native_mutex_unlock(&timer_th.waiting_lock);
+            }
+        }
+#endif
+    }
+}
+
+#else // HAVE_SYS_EPOLL_H || HAVE_SYS_EVENT_H
+
+static void
+timer_thread_setup_mn(void)
+{
+    // do nothing
+}
+
+static void
+timer_thread_polling(rb_vm_t *vm)
+{
+    int timeout = timer_thread_set_timeout(vm);
+
+    struct pollfd pfd = {
+        .fd = timer_th.comm_fds[0],
+        .events = POLLIN,
+    };
+
+    int r = poll(&pfd, 1, timeout);
+
+    switch (r) {
+      case 0: // timeout
+        rb_native_mutex_lock(&vm->ractor.sched.lock);
+        {
+            // (1-1) timeslice
+            timer_thread_check_timeslice(vm);
+        }
+        rb_native_mutex_unlock(&vm->ractor.sched.lock);
+        break;
+
+      case -1: // error
+        switch (errno) {
+          case EINTR:
+            // simply retry
+            break;
+          default:
+            perror("poll");
+            rb_bug("poll errno:%d", errno);
+            break;
+        }
+
+      case 1:
+        consume_communication_pipe(timer_th.comm_fds[0]);
+        break;
+
+      default:
+        rb_bug("unreachbale");
+    }
+}
+
+#endif // HAVE_SYS_EPOLL_H || HAVE_SYS_EVENT_H
diff --git a/thread_sync.c b/thread_sync.c
index 85ebec4d8cfc3d..955e5529457dc8 100644
--- a/thread_sync.c
+++ b/thread_sync.c
@@ -41,6 +41,8 @@ struct queue_sleep_arg {
 static void
 sync_wakeup(struct ccan_list_head *head, long max)
 {
+    RUBY_DEBUG_LOG("max:%ld", max);
+
     struct sync_waiter *cur = 0, *next;
 
     ccan_list_for_each_safe(head, cur, next, node) {
@@ -51,6 +53,7 @@ sync_wakeup(struct ccan_list_head *head, long max)
                 rb_fiber_scheduler_unblock(cur->th->scheduler, cur->self, rb_fiberptr_self(cur->fiber));
             }
             else {
+                RUBY_DEBUG_LOG("target_th:%u", rb_th_serial(cur->th));
                 rb_threadptr_interrupt(cur->th);
                 cur->th->status = THREAD_RUNNABLE;
             }
@@ -251,6 +254,8 @@ rb_mutex_trylock(VALUE self)
     rb_mutex_t *mutex = mutex_ptr(self);
 
     if (mutex->fiber == 0) {
+        RUBY_DEBUG_LOG("%p ok", mutex);
+
         rb_fiber_t *fiber = GET_EC()->fiber_ptr;
         rb_thread_t *th = GET_THREAD();
         mutex->fiber = fiber;
@@ -258,17 +263,12 @@ rb_mutex_trylock(VALUE self)
         mutex_locked(th, self);
         return Qtrue;
     }
-
-    return Qfalse;
+    else {
+        RUBY_DEBUG_LOG("%p ng", mutex);
+        return Qfalse;
+    }
 }
 
-/*
- * At maximum, only one thread can use cond_timedwait and watch deadlock
- * periodically. Multiple polling thread (i.e. concurrent deadlock check)
- * introduces new race conditions. [Bug #6278] [ruby-core:44275]
- */
-static const rb_thread_t *patrol_thread = NULL;
-
 static VALUE
 mutex_owned_p(rb_fiber_t *fiber, rb_mutex_t *mutex)
 {
@@ -290,6 +290,8 @@ delete_from_waitq(VALUE value)
     return Qnil;
 }
 
+static inline rb_atomic_t threadptr_get_interrupts(rb_thread_t *th);
+
 static VALUE
 do_mutex_lock(VALUE self, int interruptible_p)
 {
@@ -297,6 +299,7 @@ do_mutex_lock(VALUE self, int interruptible_p)
     rb_thread_t *th = ec->thread_ptr;
     rb_fiber_t *fiber = ec->fiber_ptr;
     rb_mutex_t *mutex = mutex_ptr(self);
+    rb_atomic_t saved_ints = 0;
 
     /* When running trap handler */
     if (!FL_TEST_RAW(self, MUTEX_ALLOW_TRAP) &&
@@ -310,6 +313,8 @@ do_mutex_lock(VALUE self, int interruptible_p)
         }
 
         while (mutex->fiber != fiber) {
+            VM_ASSERT(mutex->fiber != NULL);
+
             VALUE scheduler = rb_fiber_scheduler_current();
             if (scheduler != Qnil) {
                 struct sync_waiter sync_waiter = {
@@ -331,51 +336,47 @@ do_mutex_lock(VALUE self, int interruptible_p)
                     rb_raise(rb_eThreadError, "deadlock; lock already owned by another fiber belonging to the same thread");
                 }
 
-                enum rb_thread_status prev_status = th->status;
-                rb_hrtime_t *timeout = 0;
-                rb_hrtime_t rel = rb_msec2hrtime(100);
-
-                th->status = THREAD_STOPPED_FOREVER;
-                th->locking_mutex = self;
-                rb_ractor_sleeper_threads_inc(th->ractor);
-                /*
-                 * Carefully! while some contended threads are in native_sleep(),
-                 * ractor->sleeper is unstable value. we have to avoid both deadlock
-                 * and busy loop.
-                 */
-                if ((rb_ractor_living_thread_num(th->ractor) == rb_ractor_sleeper_thread_num(th->ractor)) &&
-                    !patrol_thread) {
-                    timeout = &rel;
-                    patrol_thread = th;
-                }
-
                 struct sync_waiter sync_waiter = {
                     .self = self,
                     .th = th,
-                    .fiber = nonblocking_fiber(fiber)
+                    .fiber = nonblocking_fiber(fiber),
                 };
 
-                ccan_list_add_tail(&mutex->waitq, &sync_waiter.node);
+                RUBY_DEBUG_LOG("%p wait", mutex);
+
+                // similar code with `sleep_forever`, but
+                // sleep_forever(SLEEP_DEADLOCKABLE) raises an exception.
+                // Ensure clause is needed like but `rb_ensure` a bit slow.
+                //
+                //   begin
+                //     sleep_forever(th, SLEEP_DEADLOCKABLE);
+                //   ensure
+                //     ccan_list_del(&sync_waiter.node);
+                //   end
+                enum rb_thread_status prev_status = th->status;
+                th->status = THREAD_STOPPED_FOREVER;
+                rb_ractor_sleeper_threads_inc(th->ractor);
+                rb_check_deadlock(th->ractor);
 
-                native_sleep(th, timeout); /* release GVL */
+                th->locking_mutex = self;
 
+                ccan_list_add_tail(&mutex->waitq, &sync_waiter.node);
+                {
+                    native_sleep(th, NULL);
+                }
                 ccan_list_del(&sync_waiter.node);
 
+                // unlocked by another thread while sleeping
                 if (!mutex->fiber) {
                     mutex->fiber = fiber;
                 }
 
-                if (patrol_thread == th)
-                    patrol_thread = NULL;
-
-                th->locking_mutex = Qfalse;
-                if (mutex->fiber && timeout && !RUBY_VM_INTERRUPTED(th->ec)) {
-                    rb_check_deadlock(th->ractor);
-                }
-                if (th->status == THREAD_STOPPED_FOREVER) {
-                    th->status = prev_status;
-                }
                 rb_ractor_sleeper_threads_dec(th->ractor);
+                th->status = prev_status;
+                th->locking_mutex = Qfalse;
+                th->locking_mutex = Qfalse;
+
+                RUBY_DEBUG_LOG("%p wakeup", mutex);
             }
 
             if (interruptible_p) {
@@ -387,11 +388,27 @@ do_mutex_lock(VALUE self, int interruptible_p)
                     mutex->fiber = fiber;
                 }
             }
+            else {
+                // clear interrupt information
+                if (RUBY_VM_INTERRUPTED(th->ec)) {
+                    // reset interrupts
+                    if (saved_ints == 0) {
+                        saved_ints = threadptr_get_interrupts(th);
+                    }
+                    else {
+                        // ignore additional interrupts
+                        threadptr_get_interrupts(th);
+                    }
+                }
+            }
         }
 
+        if (saved_ints) th->ec->interrupt_flag = saved_ints;
         if (mutex->fiber == fiber) mutex_locked(th, self);
     }
 
+    RUBY_DEBUG_LOG("%p locked", mutex);
+
     // assertion
     if (mutex_owned_p(fiber, mutex) == Qfalse) rb_bug("do_mutex_lock: mutex is not owned.");
 
@@ -435,6 +452,8 @@ rb_mutex_owned_p(VALUE self)
 static const char *
 rb_mutex_unlock_th(rb_mutex_t *mutex, rb_thread_t *th, rb_fiber_t *fiber)
 {
+    RUBY_DEBUG_LOG("%p", mutex);
+
     if (mutex->fiber == 0) {
         return "Attempt to unlock a mutex which is not locked";
     }
@@ -456,13 +475,14 @@ rb_mutex_unlock_th(rb_mutex_t *mutex, rb_thread_t *th, rb_fiber_t *fiber)
         }
         else {
             switch (cur->th->status) {
-                case THREAD_RUNNABLE: /* from someone else calling Thread#run */
-                case THREAD_STOPPED_FOREVER: /* likely (rb_mutex_lock) */
+              case THREAD_RUNNABLE: /* from someone else calling Thread#run */
+              case THREAD_STOPPED_FOREVER: /* likely (rb_mutex_lock) */
+                RUBY_DEBUG_LOG("wakeup th:%u", rb_th_serial(cur->th));
                 rb_threadptr_interrupt(cur->th);
                 return NULL;
-                case THREAD_STOPPED: /* probably impossible */
+              case THREAD_STOPPED: /* probably impossible */
                 rb_bug("unexpected THREAD_STOPPED");
-                case THREAD_KILLED:
+              case THREAD_KILLED:
                 /* not sure about this, possible in exit GC? */
                 rb_bug("unexpected THREAD_KILLED");
                 continue;
@@ -528,49 +548,55 @@ rb_mutex_abandon_all(rb_mutex_t *mutexes)
 }
 #endif
 
-static VALUE
-rb_mutex_sleep_forever(VALUE self)
-{
-    rb_thread_sleep_deadly_allow_spurious_wakeup(self, Qnil, 0);
-    return Qnil;
-}
+struct rb_mutex_sleep_arguments {
+    VALUE self;
+    VALUE timeout;
+};
 
 static VALUE
-rb_mutex_wait_for(VALUE time)
+mutex_sleep_begin(VALUE _arguments)
 {
-    rb_hrtime_t *rel = (rb_hrtime_t *)time;
-    /* permit spurious check */
-    return RBOOL(sleep_hrtime(GET_THREAD(), *rel, 0));
-}
-
-VALUE
-rb_mutex_sleep(VALUE self, VALUE timeout)
-{
-    struct timeval t;
+    struct rb_mutex_sleep_arguments *arguments = (struct rb_mutex_sleep_arguments *)_arguments;
+    VALUE timeout = arguments->timeout;
     VALUE woken = Qtrue;
 
-    if (!NIL_P(timeout)) {
-        t = rb_time_interval(timeout);
-    }
-
-    rb_mutex_unlock(self);
-    time_t beg = time(0);
-
     VALUE scheduler = rb_fiber_scheduler_current();
     if (scheduler != Qnil) {
         rb_fiber_scheduler_kernel_sleep(scheduler, timeout);
-        mutex_lock_uninterruptible(self);
     }
     else {
         if (NIL_P(timeout)) {
-            rb_ensure(rb_mutex_sleep_forever, self, mutex_lock_uninterruptible, self);
+            rb_thread_sleep_deadly_allow_spurious_wakeup(arguments->self, Qnil, 0);
         }
         else {
-            rb_hrtime_t rel = rb_timeval2hrtime(&t);
-            woken = rb_ensure(rb_mutex_wait_for, (VALUE)&rel, mutex_lock_uninterruptible, self);
+            struct timeval timeout_value = rb_time_interval(timeout);
+            rb_hrtime_t relative_timeout = rb_timeval2hrtime(&timeout_value);
+            /* permit spurious check */
+            woken = RBOOL(sleep_hrtime(GET_THREAD(), relative_timeout, 0));
         }
     }
 
+    return woken;
+}
+
+VALUE
+rb_mutex_sleep(VALUE self, VALUE timeout)
+{
+    if (!NIL_P(timeout)) {
+        // Validate the argument:
+        rb_time_interval(timeout);
+    }
+
+    rb_mutex_unlock(self);
+    time_t beg = time(0);
+
+    struct rb_mutex_sleep_arguments arguments = {
+        .self = self,
+        .timeout = timeout,
+    };
+
+    VALUE woken = rb_ensure(mutex_sleep_begin, (VALUE)&arguments, mutex_lock_uninterruptible, self);
+
     RUBY_VM_CHECK_INTS_BLOCKING(GET_EC());
     if (!woken) return Qnil;
     time_t end = time(0) - beg;
@@ -834,7 +860,7 @@ raise_closed_queue_error(VALUE self)
 static VALUE
 queue_closed_result(VALUE self, struct rb_queue *q)
 {
-    assert(queue_length(self, q) == 0);
+    RUBY_ASSERT(queue_length(self, q) == 0);
     return Qnil;
 }
 
@@ -1061,8 +1087,8 @@ queue_do_pop(VALUE self, struct rb_queue *q, int should_block, VALUE timeout)
         else {
             rb_execution_context_t *ec = GET_EC();
 
-            assert(RARRAY_LEN(q->que) == 0);
-            assert(queue_closed_p(self) == 0);
+            RUBY_ASSERT(RARRAY_LEN(q->que) == 0);
+            RUBY_ASSERT(queue_closed_p(self) == 0);
 
             struct queue_waiter queue_waiter = {
                 .w = {.self = self, .th = ec->thread_ptr, .fiber = nonblocking_fiber(ec->fiber_ptr)},
@@ -1138,6 +1164,22 @@ rb_queue_length(VALUE self)
     return LONG2NUM(queue_length(self, queue_ptr(self)));
 }
 
+NORETURN(static VALUE rb_queue_freeze(VALUE self));
+/*
+ * call-seq:
+ *   freeze
+ *
+ * The queue can't be frozen, so this method raises an exception:
+ *   Thread::Queue.new.freeze # Raises TypeError (cannot freeze #<Thread::Queue:0x...>)
+ *
+ */
+static VALUE
+rb_queue_freeze(VALUE self)
+{
+    rb_raise(rb_eTypeError, "cannot freeze " "%+"PRIsVALUE, self);
+    UNREACHABLE_RETURN(self);
+}
+
 /*
  * Document-method: Thread::Queue#num_waiting
  *
@@ -1388,27 +1430,81 @@ struct rb_condvar {
  *
  *  ConditionVariable objects augment class Mutex. Using condition variables,
  *  it is possible to suspend while in the middle of a critical section until a
- *  resource becomes available.
+ *  condition is met, such as a resource becomes available.
+ *
+ *  Due to non-deterministic scheduling and spurious wake-ups, users of
+ *  condition variables should always use a separate boolean predicate (such as
+ *  reading from a boolean variable) to check if the condition is actually met
+ *  before starting to wait, and should wait in a loop, re-checking the
+ *  condition every time the ConditionVariable is waken up.  The idiomatic way
+ *  of using condition variables is calling the +wait+ method in an +until+
+ *  loop with the predicate as the loop condition.
+ *
+ *    condvar.wait(mutex) until condition_is_met
+ *
+ *  In the example below, we use the boolean variable +resource_available+
+ *  (which is protected by +mutex+) to indicate the availability of the
+ *  resource, and use +condvar+ to wait for that variable to become true.  Note
+ *  that:
+ *
+ *  1.  Thread +b+ may be scheduled before thread +a1+ and +a2+, and may run so
+ *      fast that it have already made the resource available before either
+ *      +a1+ or +a2+ starts. Therefore, +a1+ and +a2+ should check if
+ *      +resource_available+ is already true before starting to wait.
+ *  2.  The +wait+ method may spuriously wake up without signalling. Therefore,
+ *      thread +a1+ and +a2+ should recheck +resource_available+ after the
+ *      +wait+ method returns, and go back to wait if the condition is not
+ *      actually met.
+ *  3.  It is possible that thread +a2+ starts right after thread +a1+ is waken
+ *      up by +b+.  Thread +a2+ may have acquired the +mutex+ and consumed the
+ *      resource before thread +a1+ acquires the +mutex+.  This necessitates
+ *      rechecking after +wait+, too.
  *
  *  Example:
  *
  *    mutex = Thread::Mutex.new
- *    resource = Thread::ConditionVariable.new
  *
- *    a = Thread.new {
- *	 mutex.synchronize {
- *	   # Thread 'a' now needs the resource
- *	   resource.wait(mutex)
- *	   # 'a' can now have the resource
- *	 }
+ *    resource_available = false
+ *    condvar = Thread::ConditionVariable.new
+ *
+ *    a1 = Thread.new {
+ *      # Thread 'a1' waits for the resource to become available and consumes
+ *      # the resource.
+ *      mutex.synchronize {
+ *        condvar.wait(mutex) until resource_available
+ *        # After the loop, 'resource_available' is guaranteed to be true.
+ *
+ *        resource_available = false
+ *        puts "a1 consumed the resource"
+ *      }
+ *    }
+ *
+ *    a2 = Thread.new {
+ *      # Thread 'a2' behaves like 'a1'.
+ *      mutex.synchronize {
+ *        condvar.wait(mutex) until resource_available
+ *        resource_available = false
+ *        puts "a2 consumed the resource"
+ *      }
  *    }
  *
  *    b = Thread.new {
- *	 mutex.synchronize {
- *	   # Thread 'b' has finished using the resource
- *	   resource.signal
- *	 }
+ *      # Thread 'b' periodically makes the resource available.
+ *      loop {
+ *        mutex.synchronize {
+ *          resource_available = true
+ *
+ *          # Notify one waiting thread if any.  It is possible that neither
+ *          # 'a1' nor 'a2 is waiting on 'condvar' at this moment.  That's OK.
+ *          condvar.signal
+ *        }
+ *        sleep 1
+ *      }
  *    }
+ *
+ *    # Eventually both 'a1' and 'a2' will have their resources, albeit in an
+ *    # unspecified order.
+ *    [a1, a2].each {|th| th.join}
  */
 
 static size_t
@@ -1489,6 +1585,8 @@ do_sleep(VALUE args)
  * If +timeout+ is given, this method returns after +timeout+ seconds passed,
  * even if no other thread doesn't signal.
  *
+ * This method may wake up spuriously due to underlying implementation details.
+ *
  * Returns the slept result on +mutex+.
  */
 
@@ -1599,6 +1697,7 @@ Init_thread_sync(void)
     rb_define_method(rb_cQueue, "clear", rb_queue_clear, 0);
     rb_define_method(rb_cQueue, "length", rb_queue_length, 0);
     rb_define_method(rb_cQueue, "num_waiting", rb_queue_num_waiting, 0);
+    rb_define_method(rb_cQueue, "freeze", rb_queue_freeze, 0);
 
     rb_define_alias(rb_cQueue, "enq", "push");
     rb_define_alias(rb_cQueue, "<<", "push");
diff --git a/thread_win32.c b/thread_win32.c
index 543a045bd81d06..576f617e8d5c2a 100644
--- a/thread_win32.c
+++ b/thread_win32.c
@@ -11,6 +11,7 @@
 
 #ifdef THREAD_SYSTEM_DEPENDENT_IMPLEMENTATION
 
+#include "internal/sanitizers.h"
 #include <process.h>
 
 #define TIME_QUANTUM_USEC (10 * 1000)
@@ -148,18 +149,21 @@ thread_sched_yield(struct rb_thread_sched *sched, rb_thread_t *th)
 }
 
 void
-rb_thread_sched_init(struct rb_thread_sched *sched)
+rb_thread_sched_init(struct rb_thread_sched *sched, bool atfork)
 {
     if (GVL_DEBUG) fprintf(stderr, "sched init\n");
     sched->lock = w32_mutex_create();
 }
 
+#if 0
+// per-ractor
 void
 rb_thread_sched_destroy(struct rb_thread_sched *sched)
 {
     if (GVL_DEBUG) fprintf(stderr, "sched destroy\n");
     CloseHandle(sched->lock);
 }
+#endif
 
 rb_thread_t *
 ruby_thread_from_native(void)
@@ -202,6 +206,11 @@ Init_native_thread(rb_thread_t *main_th)
                    main_th->nt->interrupt_event);
 }
 
+void
+ruby_mn_threads_params(void)
+{
+}
+
 static int
 w32_wait_events(HANDLE *events, int count, DWORD timeout, rb_thread_t *th)
 {
@@ -575,33 +584,29 @@ rb_native_cond_destroy(rb_nativethread_cond_t *cond)
     /* */
 }
 
-void
-ruby_init_stack(volatile VALUE *addr)
-{
-}
 
 #define CHECK_ERR(expr) \
     {if (!(expr)) {rb_bug("err: %lu - %s", GetLastError(), #expr);}}
 
 COMPILER_WARNING_PUSH
-#if defined(__GNUC__)
+#if __has_warning("-Wmaybe-uninitialized")
 COMPILER_WARNING_IGNORED(-Wmaybe-uninitialized)
 #endif
 static inline SIZE_T
-query_memory_basic_info(PMEMORY_BASIC_INFORMATION mi)
+query_memory_basic_info(PMEMORY_BASIC_INFORMATION mi, void *local_in_parent_frame)
 {
-    return VirtualQuery(mi, mi, sizeof(*mi));
+    return VirtualQuery(asan_get_real_stack_addr(local_in_parent_frame), mi, sizeof(*mi));
 }
 COMPILER_WARNING_POP
 
 static void
-native_thread_init_stack(rb_thread_t *th)
+native_thread_init_stack(rb_thread_t *th, void *local_in_parent_frame)
 {
     MEMORY_BASIC_INFORMATION mi;
     char *base, *end;
     DWORD size, space;
 
-    CHECK_ERR(query_memory_basic_info(&mi));
+    CHECK_ERR(query_memory_basic_info(&mi, local_in_parent_frame));
     base = mi.AllocationBase;
     end = mi.BaseAddress;
     end += mi.RegionSize;
@@ -612,16 +617,24 @@ native_thread_init_stack(rb_thread_t *th)
     th->ec->machine.stack_maxsize = size - space;
 }
 
+static void
+native_thread_destroy_atfork(struct rb_native_thread *nt)
+{
+    /* no-op */
+}
+
 #ifndef InterlockedExchangePointer
 #define InterlockedExchangePointer(t, v) \
     (void *)InterlockedExchange((long *)(t), (long)(v))
 #endif
 static void
-native_thread_destroy(rb_thread_t *th)
+native_thread_destroy(struct rb_native_thread *nt)
 {
-    HANDLE intr = InterlockedExchangePointer(&th->nt->interrupt_event, 0);
-    RUBY_DEBUG_LOG("close handle intr:%p, thid:%p\n", intr, th->nt->thread_id);
-    w32_close_handle(intr);
+    if (nt) {
+        HANDLE intr = InterlockedExchangePointer(&nt->interrupt_event, 0);
+        RUBY_DEBUG_LOG("close handle intr:%p, thid:%p\n", intr, nt->thread_id);
+        w32_close_handle(intr);
+    }
 }
 
 static unsigned long __stdcall
@@ -630,27 +643,39 @@ thread_start_func_1(void *th_ptr)
     rb_thread_t *th = th_ptr;
     volatile HANDLE thread_id = th->nt->thread_id;
 
-    native_thread_init_stack(th);
+    native_thread_init_stack(th, &th);
     th->nt->interrupt_event = CreateEvent(0, TRUE, FALSE, 0);
 
     /* run */
     RUBY_DEBUG_LOG("thread created th:%u, thid: %p, event: %p",
                    rb_th_serial(th), th->nt->thread_id, th->nt->interrupt_event);
 
+    thread_sched_to_running(TH_SCHED(th), th);
+    ruby_thread_set_native(th);
+
+    // kick threads
     thread_start_func_2(th, th->ec->machine.stack_start);
 
     w32_close_handle(thread_id);
     RUBY_DEBUG_LOG("thread deleted th:%u", rb_th_serial(th));
+
     return 0;
 }
 
 static int
 native_thread_create(rb_thread_t *th)
 {
-    const size_t stack_size = th->vm->default_params.thread_machine_stack_size + th->vm->default_params.thread_vm_stack_size;
+    // setup nt
+    const size_t stack_size = th->vm->default_params.thread_machine_stack_size;
     th->nt = ZALLOC(struct rb_native_thread);
     th->nt->thread_id = w32_create_thread(stack_size, thread_start_func_1, th);
 
+    // setup vm stack
+    size_t vm_stack_word_size = th->vm->default_params.thread_vm_stack_size / sizeof(VALUE);
+    void *vm_stack = ruby_xmalloc(vm_stack_word_size * sizeof(VALUE));
+    th->sched.vm_stack = vm_stack;
+    rb_ec_initialize_vm_stack(th->ec, vm_stack, vm_stack_word_size);
+
     if ((th->nt->thread_id) == 0) {
         return thread_errno;
     }
@@ -763,12 +788,6 @@ rb_thread_wakeup_timer_thread(int sig)
     /* do nothing */
 }
 
-static VALUE
-rb_thread_start_unblock_thread(void)
-{
-    return Qfalse; /* no-op */
-}
-
 static void
 rb_thread_create_timer_thread(void)
 {
@@ -785,14 +804,14 @@ rb_thread_create_timer_thread(void)
 static int
 native_stop_timer_thread(void)
 {
-    int stopped = --system_working <= 0;
-    if (stopped) {
-        SetEvent(timer_thread.lock);
-        native_thread_join(timer_thread.id);
-        CloseHandle(timer_thread.lock);
-        timer_thread.lock = 0;
-    }
-    return stopped;
+    RUBY_ATOMIC_SET(system_working, 0);
+
+    SetEvent(timer_thread.lock);
+    native_thread_join(timer_thread.id);
+    CloseHandle(timer_thread.lock);
+    timer_thread.lock = 0;
+
+    return 1;
 }
 
 static void
@@ -841,26 +860,6 @@ rb_reserved_fd_p(int fd)
     return 0;
 }
 
-int
-rb_sigwait_fd_get(rb_thread_t *th)
-{
-    return -1; /* TODO */
-}
-
-NORETURN(void rb_sigwait_fd_put(rb_thread_t *, int));
-void
-rb_sigwait_fd_put(rb_thread_t *th, int fd)
-{
-    rb_bug("not implemented, should not be called");
-}
-
-NORETURN(void rb_sigwait_sleep(const rb_thread_t *, int, const rb_hrtime_t *));
-void
-rb_sigwait_sleep(const rb_thread_t *th, int fd, const rb_hrtime_t *rel)
-{
-    rb_bug("not implemented, should not be called");
-}
-
 rb_nativethread_id_t
 rb_nativethread_self(void)
 {
@@ -881,4 +880,144 @@ native_thread_native_thread_id(rb_thread_t *th)
 }
 #define USE_NATIVE_THREAD_NATIVE_THREAD_ID 1
 
+void
+rb_add_running_thread(rb_thread_t *th)
+{
+    // do nothing
+}
+
+void
+rb_del_running_thread(rb_thread_t *th)
+{
+    // do nothing
+}
+
+static bool
+th_has_dedicated_nt(const rb_thread_t *th)
+{
+    return true;
+}
+
+void
+rb_threadptr_sched_free(rb_thread_t *th)
+{
+    native_thread_destroy(th->nt);
+    ruby_xfree(th->nt);
+    ruby_xfree(th->sched.vm_stack);
+}
+
+void
+rb_threadptr_remove(rb_thread_t *th)
+{
+    // do nothing
+}
+
+void
+rb_thread_sched_mark_zombies(rb_vm_t *vm)
+{
+    // do nothing
+}
+
+static bool
+vm_barrier_finish_p(rb_vm_t *vm)
+{
+    RUBY_DEBUG_LOG("cnt:%u living:%u blocking:%u",
+                   vm->ractor.blocking_cnt == vm->ractor.cnt,
+                   vm->ractor.sync.barrier_cnt,
+                   vm->ractor.cnt,
+                   vm->ractor.blocking_cnt);
+
+    VM_ASSERT(vm->ractor.blocking_cnt <= vm->ractor.cnt);
+
+    return vm->ractor.blocking_cnt == vm->ractor.cnt;
+}
+
+void
+rb_ractor_sched_barrier_start(rb_vm_t *vm, rb_ractor_t *cr)
+{
+    vm->ractor.sync.barrier_waiting = true;
+
+    RUBY_DEBUG_LOG("barrier start. cnt:%u living:%u blocking:%u",
+                   vm->ractor.sync.barrier_cnt,
+                   vm->ractor.cnt,
+                   vm->ractor.blocking_cnt);
+
+    rb_vm_ractor_blocking_cnt_inc(vm, cr, __FILE__, __LINE__);
+
+    // send signal
+    rb_ractor_t *r = 0;
+    ccan_list_for_each(&vm->ractor.set, r, vmlr_node) {
+        if (r != cr) {
+            rb_ractor_vm_barrier_interrupt_running_thread(r);
+        }
+    }
+
+    // wait
+    while (!vm_barrier_finish_p(vm)) {
+        rb_vm_cond_wait(vm, &vm->ractor.sync.barrier_complete_cond);
+    }
+
+    RUBY_DEBUG_LOG("cnt:%u barrier success", vm->ractor.sync.barrier_cnt);
+
+    rb_vm_ractor_blocking_cnt_dec(vm, cr, __FILE__, __LINE__);
+
+    vm->ractor.sync.barrier_waiting = false;
+    vm->ractor.sync.barrier_cnt++;
+
+    rb_native_cond_broadcast(&vm->ractor.sync.barrier_release_cond);
+}
+
+void
+rb_ractor_sched_barrier_join(rb_vm_t *vm, rb_ractor_t *cr)
+{
+    vm->ractor.sync.lock_owner = cr;
+    unsigned int barrier_cnt = vm->ractor.sync.barrier_cnt;
+    rb_thread_t *th = GET_THREAD();
+    bool running;
+
+    RB_VM_SAVE_MACHINE_CONTEXT(th);
+
+    if (rb_ractor_status_p(cr, ractor_running)) {
+        rb_vm_ractor_blocking_cnt_inc(vm, cr, __FILE__, __LINE__);
+        running = true;
+    }
+    else {
+        running = false;
+    }
+    VM_ASSERT(rb_ractor_status_p(cr, ractor_blocking));
+
+    if (vm_barrier_finish_p(vm)) {
+        RUBY_DEBUG_LOG("wakeup barrier owner");
+        rb_native_cond_signal(&vm->ractor.sync.barrier_complete_cond);
+    }
+    else {
+        RUBY_DEBUG_LOG("wait for barrier finish");
+    }
+
+    // wait for restart
+    while (barrier_cnt == vm->ractor.sync.barrier_cnt) {
+        rb_vm_cond_wait(vm, &vm->ractor.sync.barrier_release_cond);
+    }
+
+    RUBY_DEBUG_LOG("barrier is released. Acquire vm_lock");
+
+    if (running) {
+        rb_vm_ractor_blocking_cnt_dec(vm, cr, __FILE__, __LINE__);
+    }
+
+        vm->ractor.sync.lock_owner = NULL;
+}
+
+bool
+rb_thread_lock_native_thread(void)
+{
+    return false;
+}
+
+void *
+rb_thread_prevent_fork(void *(*func)(void *), void *data)
+{
+    return func(data);
+}
+
 #endif /* THREAD_SYSTEM_DEPENDENT_IMPLEMENTATION */
diff --git a/thread_win32.h b/thread_win32.h
index 0dfe9d46de4ed9..23cd71fcfe08d9 100644
--- a/thread_win32.h
+++ b/thread_win32.h
@@ -27,7 +27,7 @@ struct rb_native_thread {
 };
 
 struct rb_thread_sched_item {
-    char dmy;
+    void *vm_stack;
 };
 
 struct rb_thread_sched {
diff --git a/time.c b/time.c
index d0c1d0811e1804..1eb8f8da9c9a3a 100644
--- a/time.c
+++ b/time.c
@@ -42,8 +42,13 @@
 #include "internal/time.h"
 #include "internal/variable.h"
 #include "ruby/encoding.h"
+#include "ruby/util.h"
 #include "timev.h"
 
+#if defined(_WIN32)
+# include "timezoneapi.h" /* DYNAMIC_TIME_ZONE_INFORMATION */
+#endif
+
 #include "builtin.h"
 
 static ID id_submicro, id_nano_num, id_nano_den, id_offset, id_zone;
@@ -244,6 +249,7 @@ divmodv(VALUE n, VALUE d, VALUE *q, VALUE *r)
 #   define FIXWV2WINT(w) FIX2LONG(WIDEVAL_GET(w))
 #endif
 
+#define SIZEOF_WIDEINT SIZEOF_INT64_T
 #define POSFIXWVABLE(wi) ((wi) < FIXWV_MAX+1)
 #define NEGFIXWVABLE(wi) ((wi) >= FIXWV_MIN)
 #define FIXWV_P(w) FIXWINT_P(WIDEVAL_GET(w))
@@ -331,6 +337,8 @@ v2w(VALUE v)
     return WIDEVAL_WRAP(v);
 }
 
+#define NUM2WV(v) v2w(rb_Integer(v))
+
 static int
 weq(wideval_t wx, wideval_t wy)
 {
@@ -570,6 +578,9 @@ num_exact(VALUE v)
 
 /* time_t */
 
+/* TIME_SCALE should be 10000... */
+static const int TIME_SCALE_NUMDIGITS = rb_strlen_lit(STRINGIZE(TIME_SCALE)) - 1;
+
 static wideval_t
 rb_time_magnify(wideval_t w)
 {
@@ -650,13 +661,13 @@ wv2timet(wideval_t w)
         wideint_t wi = FIXWV2WINT(w);
         if (TIMET_MIN == 0) {
             if (wi < 0)
-                rb_raise(rb_eRangeError, "negative value to convert into `time_t'");
+                rb_raise(rb_eRangeError, "negative value to convert into 'time_t'");
             if (TIMET_MAX < (uwideint_t)wi)
-                rb_raise(rb_eRangeError, "too big to convert into `time_t'");
+                rb_raise(rb_eRangeError, "too big to convert into 'time_t'");
         }
         else {
             if (wi < TIMET_MIN || TIMET_MAX < wi)
-                rb_raise(rb_eRangeError, "too big to convert into `time_t'");
+                rb_raise(rb_eRangeError, "too big to convert into 'time_t'");
         }
         return (time_t)wi;
     }
@@ -697,10 +708,51 @@ static VALUE tm_from_time(VALUE klass, VALUE time);
 
 bool ruby_tz_uptodate_p;
 
+#ifdef _WIN32
+enum {tzkey_max = numberof(((DYNAMIC_TIME_ZONE_INFORMATION *)NULL)->TimeZoneKeyName)};
+static struct {
+    char use_tzkey;
+    char name[tzkey_max * 4 + 1];
+} w32_tz;
+
+static char *
+get_tzname(int dst)
+{
+    if (w32_tz.use_tzkey) {
+        if (w32_tz.name[0]) {
+            return w32_tz.name;
+        }
+        else {
+            /*
+             * Use GetDynamicTimeZoneInformation::TimeZoneKeyName, Windows
+             * time zone ID, which is not localized because it is the key
+             * for "Dynamic DST" keys under the "Time Zones" registry.
+             * Available since Windows Vista and Windows Server 2008.
+             */
+            DYNAMIC_TIME_ZONE_INFORMATION tzi;
+            WCHAR *const wtzkey = tzi.TimeZoneKeyName;
+            DWORD tzret = GetDynamicTimeZoneInformation(&tzi);
+            if (tzret != TIME_ZONE_ID_INVALID && *wtzkey) {
+                int wlen = (int)wcsnlen(wtzkey, tzkey_max);
+                int clen = WideCharToMultiByte(CP_UTF8, 0, wtzkey, wlen,
+                                               w32_tz.name, sizeof(w32_tz.name) - 1,
+                                               NULL, NULL);
+                w32_tz.name[clen] = '\0';
+                return w32_tz.name;
+            }
+        }
+    }
+    return _tzname[_daylight && dst];
+}
+#endif
+
 void
-ruby_reset_timezone(void)
+ruby_reset_timezone(const char *val)
 {
     ruby_tz_uptodate_p = false;
+#ifdef _WIN32
+    w32_tz.use_tzkey = !val || !*val;
+#endif
     ruby_reset_leap_second_info();
 }
 
@@ -936,17 +988,25 @@ zone_str(const char *zone)
         return rb_fstring_lit("(NO-TIMEZONE-ABBREVIATION)");
     }
 
-    for (p = zone; *p; p++)
+    for (p = zone; *p; p++) {
         if (!ISASCII(*p)) {
             ascii_only = 0;
+            p += strlen(p);
             break;
         }
-    len = p - zone + strlen(p);
+    }
+    len = p - zone;
     if (ascii_only) {
         str = rb_usascii_str_new(zone, len);
     }
     else {
+#ifdef _WIN32
+        str = rb_utf8_str_new(zone, len);
+        /* until we move to UTF-8 on Windows completely */
+        str = rb_str_export_locale(str);
+#else
         str = rb_enc_str_new(zone, len, rb_locale_encoding());
+#endif
     }
     return rb_fstring(str);
 }
@@ -1436,7 +1496,7 @@ guess_local_offset(struct vtm *vtm_utc, int *isdst_ret, VALUE *zone_ret)
     if (lt(vtm_utc->year, INT2FIX(1916))) {
         VALUE off = INT2FIX(0);
         int isdst = 0;
-        zone = rb_fstring_lit("UTC");
+        zone = str_utc;
 
 # if defined(NEGATIVE_TIME_T)
 #  if SIZEOF_TIME_T <= 4
@@ -1501,7 +1561,7 @@ guess_local_offset(struct vtm *vtm_utc, int *isdst_ret, VALUE *zone_ret)
             localtime_with_gmtoff_zone(&now, &tm, &now_gmtoff, &zone);
             now_isdst = tm.tm_isdst;
             zone = rb_fstring(zone);
-            rb_gc_register_mark_object(zone);
+            rb_vm_register_global_object(zone);
             now_zone = zone;
         }
         if (isdst_ret)
@@ -1645,11 +1705,9 @@ localtime_with_gmtoff_zone(const time_t *t, struct tm *result, long *gmtoff, VAL
         if (zone) {
 #if defined(HAVE_TM_ZONE)
             *zone = zone_str(tm.tm_zone);
+#elif defined(_WIN32)
+            *zone = zone_str(get_tzname(tm.tm_isdst));
 #elif defined(HAVE_TZNAME) && defined(HAVE_DAYLIGHT)
-# if defined(RUBY_MSVCRT_VERSION) && RUBY_MSVCRT_VERSION >= 140
-#  define tzname _tzname
-#  define daylight _daylight
-# endif
             /* this needs tzset or localtime, instead of localtime_r */
             *zone = zone_str(tzname[daylight && tm.tm_isdst]);
 #else
@@ -1833,25 +1891,38 @@ static void
 time_mark(void *ptr)
 {
     struct time_object *tobj = ptr;
-    if (!FIXWV_P(tobj->timew))
-        rb_gc_mark(w2v(tobj->timew));
-    rb_gc_mark(tobj->vtm.year);
-    rb_gc_mark(tobj->vtm.subsecx);
-    rb_gc_mark(tobj->vtm.utc_offset);
-    rb_gc_mark(tobj->vtm.zone);
+    if (!FIXWV_P(tobj->timew)) {
+        rb_gc_mark_movable(w2v(tobj->timew));
+    }
+    rb_gc_mark_movable(tobj->vtm.year);
+    rb_gc_mark_movable(tobj->vtm.subsecx);
+    rb_gc_mark_movable(tobj->vtm.utc_offset);
+    rb_gc_mark_movable(tobj->vtm.zone);
 }
 
-static size_t
-time_memsize(const void *tobj)
+static void
+time_compact(void *ptr)
 {
-    return sizeof(struct time_object);
+    struct time_object *tobj = ptr;
+    if (!FIXWV_P(tobj->timew)) {
+        WIDEVAL_GET(tobj->timew) = WIDEVAL_WRAP(rb_gc_location(w2v(tobj->timew)));
+    }
+
+    tobj->vtm.year = rb_gc_location(tobj->vtm.year);
+    tobj->vtm.subsecx = rb_gc_location(tobj->vtm.subsecx);
+    tobj->vtm.utc_offset = rb_gc_location(tobj->vtm.utc_offset);
+    tobj->vtm.zone = rb_gc_location(tobj->vtm.zone);
 }
 
 static const rb_data_type_t time_data_type = {
-    "time",
-    {time_mark, RUBY_TYPED_DEFAULT_FREE, time_memsize,},
-    0, 0,
-    (RUBY_TYPED_FREE_IMMEDIATELY | RUBY_TYPED_FROZEN_SHAREABLE | RUBY_TYPED_WB_PROTECTED),
+    .wrap_struct_name = "time",
+    .function = {
+        .dmark = time_mark,
+        .dfree = RUBY_TYPED_DEFAULT_FREE,
+        .dsize = NULL,
+        .dcompact = time_compact,
+    },
+    .flags = RUBY_TYPED_FREE_IMMEDIATELY | RUBY_TYPED_FROZEN_SHAREABLE | RUBY_TYPED_WB_PROTECTED | RUBY_TYPED_EMBEDDABLE,
 };
 
 static VALUE
@@ -1898,11 +1969,11 @@ time_modify(VALUE time)
 }
 
 static wideval_t
-timenano2timew(time_t sec, long nsec)
+timenano2timew(wideint_t sec, long nsec)
 {
     wideval_t timew;
 
-    timew = rb_time_magnify(TIMET2WV(sec));
+    timew = rb_time_magnify(WINT2WV(sec));
     if (nsec)
         timew = wadd(timew, wmulquoll(WINT2WV(nsec), TIME_SCALE, 1000000000));
     return timew;
@@ -1960,6 +2031,10 @@ rb_timespec_now(struct timespec *ts)
 #endif
 }
 
+/*
+ * Sets the current time information into _time_.
+ * Returns _time_.
+ */
 static VALUE
 time_init_now(rb_execution_context_t *ec, VALUE time, VALUE zone)
 {
@@ -2147,6 +2222,9 @@ invalid_utc_offset(VALUE zone)
              zone);
 }
 
+#define have_2digits(ptr) (ISDIGIT((ptr)[0]) && ISDIGIT((ptr)[1]))
+#define num_from_2digits(ptr) ((ptr)[0] * 10 + (ptr)[1] - '0' * 11)
+
 static VALUE
 utc_offset_arg(VALUE arg)
 {
@@ -2201,18 +2279,19 @@ utc_offset_arg(VALUE arg)
             goto invalid_utc_offset;
         }
         if (sec) {
-            if (!ISDIGIT(sec[0]) || !ISDIGIT(sec[1])) goto invalid_utc_offset;
-            n += (sec[0] * 10 + sec[1] - '0' * 11);
+            if (!have_2digits(sec)) goto invalid_utc_offset;
+            if (sec[0] > '5') goto invalid_utc_offset;
+            n += num_from_2digits(sec);
             ASSUME(min);
         }
         if (min) {
-            if (!ISDIGIT(min[0]) || !ISDIGIT(min[1])) goto invalid_utc_offset;
+            if (!have_2digits(min)) goto invalid_utc_offset;
             if (min[0] > '5') goto invalid_utc_offset;
-            n += (min[0] * 10 + min[1] - '0' * 11) * 60;
+            n += num_from_2digits(min) * 60;
         }
         if (s[0] != '+' && s[0] != '-') goto invalid_utc_offset;
-        if (!ISDIGIT(s[1]) || !ISDIGIT(s[2])) goto invalid_utc_offset;
-        n += (s[1] * 10 + s[2] - '0' * 11) * 3600;
+        if (!have_2digits(s+1)) goto invalid_utc_offset;
+        n += num_from_2digits(s+1) * 3600;
         if (s[0] == '-') {
             if (n == 0) return UTC_ZONE;
             n = -n;
@@ -2228,14 +2307,14 @@ utc_offset_arg(VALUE arg)
 
 static void
 zone_set_offset(VALUE zone, struct time_object *tobj,
-                wideval_t tlocal, wideval_t tutc)
+                wideval_t tlocal, wideval_t tutc, VALUE time)
 {
     /* tlocal and tutc must be unmagnified and in seconds */
     wideval_t w = wsub(tlocal, tutc);
     VALUE off = w2v(w);
     validate_utc_offset(off);
-    tobj->vtm.utc_offset = off;
-    tobj->vtm.zone = zone;
+    RB_OBJ_WRITE(time, &tobj->vtm.utc_offset, off);
+    RB_OBJ_WRITE(time, &tobj->vtm.zone, zone);
     TZMODE_SET_LOCALTIME(tobj);
 }
 
@@ -2246,14 +2325,16 @@ extract_time(VALUE time)
     const ID id_to_i = idTo_i;
 
 #define EXTRACT_TIME() do { \
-        t = v2w(rb_Integer(AREF(to_i))); \
+        t = NUM2WV(AREF(to_i)); \
     } while (0)
 
     if (rb_typeddata_is_kind_of(time, &time_data_type)) {
-        struct time_object *tobj = DATA_PTR(time);
+        struct time_object *tobj = RTYPEDDATA_GET_DATA(time);
 
         time_gmtime(time); /* ensure tm got */
         t = rb_time_unmagnify(tobj->timew);
+
+        RB_GC_GUARD(time);
     }
     else if (RB_TYPE_P(time, T_STRUCT)) {
 #define AREF(x) rb_struct_aref(time, ID2SYM(id_##x))
@@ -2287,17 +2368,19 @@ extract_vtm(VALUE time, VALUE orig_time, struct time_object *orig_tobj, VALUE su
         vtm->sec = obj2subsecx(AREF(sec), &subsecx); \
         vtm->isdst = RTEST(AREF(isdst));             \
         vtm->utc_offset = Qnil; \
-        t = v2w(rb_Integer(AREF(to_i))); \
+        t = NUM2WV(AREF(to_i)); \
     } while (0)
 
     if (rb_typeddata_is_kind_of(time, &time_data_type)) {
-        struct time_object *tobj = DATA_PTR(time);
+        struct time_object *tobj = RTYPEDDATA_GET_DATA(time);
 
         time_get_tm(time, tobj);
         time_set_vtm(orig_time, orig_tobj, tobj->vtm);
         t = rb_time_unmagnify(tobj->timew);
         if (TZMODE_FIXOFF_P(tobj) && vtm->utc_offset != INT2FIX(0))
             t = wadd(t, v2w(vtm->utc_offset));
+
+        RB_GC_GUARD(time);
     }
     else if (RB_TYPE_P(time, T_STRUCT)) {
 #define AREF(x) rb_struct_aref(time, ID2SYM(id_##x))
@@ -2337,16 +2420,16 @@ static int
 zone_timelocal(VALUE zone, VALUE time)
 {
     VALUE utc, tm;
-    struct time_object *tobj = DATA_PTR(time);
+    struct time_object *tobj = RTYPEDDATA_GET_DATA(time);
     wideval_t t, s;
 
-    t = rb_time_unmagnify(tobj->timew);
+    wdivmod(tobj->timew, WINT2FIXWV(TIME_SCALE), &t, &s);
     tm = tm_from_time(rb_cTimeTM, time);
     utc = rb_check_funcall(zone, id_local_to_utc, 1, &tm);
     if (UNDEF_P(utc)) return 0;
 
     s = extract_time(utc);
-    zone_set_offset(zone, tobj, t, s);
+    zone_set_offset(zone, tobj, t, s, time);
     s = rb_time_magnify(s);
     if (tobj->vtm.subsecx != INT2FIX(0)) {
         s = wadd(s, v2w(tobj->vtm.subsecx));
@@ -2354,6 +2437,9 @@ zone_timelocal(VALUE zone, VALUE time)
     time_set_timew(time, tobj, s);
 
     zone_set_dst(zone, tobj, tm);
+
+    RB_GC_GUARD(time);
+
     return 1;
 }
 
@@ -2361,7 +2447,7 @@ static int
 zone_localtime(VALUE zone, VALUE time)
 {
     VALUE local, tm, subsecx;
-    struct time_object *tobj = DATA_PTR(time);
+    struct time_object *tobj = RTYPEDDATA_GET_DATA(time);
     wideval_t t, s;
 
     split_second(tobj->timew, &t, &subsecx);
@@ -2372,8 +2458,11 @@ zone_localtime(VALUE zone, VALUE time)
 
     s = extract_vtm(local, time, tobj, subsecx);
     tobj->vtm.tm_got = 1;
-    zone_set_offset(zone, tobj, s, t);
+    zone_set_offset(zone, tobj, s, t, time);
     zone_set_dst(zone, tobj, tm);
+
+    RB_GC_GUARD(time);
+
     return 1;
 }
 
@@ -2400,6 +2489,10 @@ vtm_day_wraparound(struct vtm *vtm)
 
 static VALUE time_init_vtm(VALUE time, struct vtm vtm, VALUE zone);
 
+/*
+ * Sets the broken-out time information into _time_.
+ * Returns _time_.
+ */
 static VALUE
 time_init_args(rb_execution_context_t *ec, VALUE time, VALUE year, VALUE mon, VALUE mday,
                VALUE hour, VALUE min, VALUE sec, VALUE zone)
@@ -2508,17 +2601,16 @@ static int
 two_digits(const char *ptr, const char *end, const char **endp, const char *name)
 {
     ssize_t len = end - ptr;
-    if (len < 2 || (!ISDIGIT(ptr[0]) || !ISDIGIT(ptr[1])) ||
-        ((len > 2) && ISDIGIT(ptr[2]))) {
+    if (len < 2 || !have_2digits(ptr) || ((len > 2) && ISDIGIT(ptr[2]))) {
         VALUE mesg = rb_sprintf("two digits %s is expected", name);
         if (ptr[-1] == '-' || ptr[-1] == ':') {
-            rb_str_catf(mesg, " after `%c'", ptr[-1]);
+            rb_str_catf(mesg, " after '%c'", ptr[-1]);
         }
         rb_str_catf(mesg, ": %.*s", ((len > 10) ? 10 : (int)(end - ptr)) + 1, ptr - 1);
         rb_exc_raise(rb_exc_new_str(rb_eArgError, mesg));
     }
     *endp = ptr + 2;
-    return (ptr[0] - '0') * 10 + (ptr[1] - '0');
+    return num_from_2digits(ptr);
 }
 
 static VALUE
@@ -2529,8 +2621,12 @@ parse_int(const char *ptr, const char *end, const char **endp, size_t *ndigits,
     return rb_int_parse_cstr(ptr, len, (char **)endp, ndigits, 10, flags);
 }
 
+/*
+ * Parses _str_ and sets the broken-out time information into _time_.
+ * If _str_ is not a String, returns +nil+, otherwise returns _time_.
+ */
 static VALUE
-time_init_parse(rb_execution_context_t *ec, VALUE klass, VALUE str, VALUE zone, VALUE precision)
+time_init_parse(rb_execution_context_t *ec, VALUE time, VALUE str, VALUE zone, VALUE precision)
 {
     if (NIL_P(str = rb_check_string_type(str))) return Qnil;
     if (!rb_enc_str_asciicompat_p(str)) {
@@ -2623,15 +2719,11 @@ time_init_parse(rb_execution_context_t *ec, VALUE klass, VALUE str, VALUE zone,
     }
     if (!NIL_P(subsec)) {
         /* subseconds is the last using ndigits */
-        static const size_t TIME_SCALE_NUMDIGITS =
-            /* TIME_SCALE should be 10000... */
-            rb_strlen_lit(STRINGIZE(TIME_SCALE)) - 1;
-
-        if (ndigits < TIME_SCALE_NUMDIGITS) {
+        if (ndigits < (size_t)TIME_SCALE_NUMDIGITS) {
             VALUE mul = rb_int_positive_pow(10, TIME_SCALE_NUMDIGITS - ndigits);
             subsec = rb_int_mul(subsec, mul);
         }
-        else if (ndigits > TIME_SCALE_NUMDIGITS) {
+        else if (ndigits > (size_t)TIME_SCALE_NUMDIGITS) {
             VALUE num = rb_int_positive_pow(10, ndigits - TIME_SCALE_NUMDIGITS);
             subsec = rb_rational_new(subsec, num);
         }
@@ -2652,19 +2744,19 @@ time_init_parse(rb_execution_context_t *ec, VALUE klass, VALUE str, VALUE zone,
         .sec  = (sec < 0)  ? 0 : sec,
         .subsecx = NIL_P(subsec) ? INT2FIX(0) : subsec,
     };
-    return time_init_vtm(klass, vtm, zone);
+    return time_init_vtm(time, vtm, zone);
 }
 
 static void
-subsec_normalize(time_t *secp, long *subsecp, const long maxsubsec)
+subsec_normalize(wideint_t *secp, long *subsecp, const long maxsubsec)
 {
-    time_t sec = *secp;
+    wideint_t sec = *secp;
     long subsec = *subsecp;
     long sec2;
 
     if (UNLIKELY(subsec >= maxsubsec)) { /* subsec positive overflow */
         sec2 = subsec / maxsubsec;
-        if (TIMET_MAX - sec2 < sec) {
+        if (WIDEINT_MAX - sec2 < sec) {
             rb_raise(rb_eRangeError, "out of Time range");
         }
         subsec -= sec2 * maxsubsec;
@@ -2672,16 +2764,12 @@ subsec_normalize(time_t *secp, long *subsecp, const long maxsubsec)
     }
     else if (UNLIKELY(subsec < 0)) {    /* subsec negative overflow */
         sec2 = NDIV(subsec, maxsubsec); /* negative div */
-        if (sec < TIMET_MIN - sec2) {
+        if (sec < WIDEINT_MIN - sec2) {
             rb_raise(rb_eRangeError, "out of Time range");
         }
         subsec -= sec2 * maxsubsec;
         sec += sec2;
     }
-#ifndef NEGATIVE_TIME_T
-    if (sec < 0)
-        rb_raise(rb_eArgError, "time must be positive");
-#endif
     *secp = sec;
     *subsecp = subsec;
 }
@@ -2689,45 +2777,52 @@ subsec_normalize(time_t *secp, long *subsecp, const long maxsubsec)
 #define time_usec_normalize(secp, usecp) subsec_normalize(secp, usecp, 1000000)
 #define time_nsec_normalize(secp, nsecp) subsec_normalize(secp, nsecp, 1000000000)
 
-static wideval_t
-nsec2timew(time_t sec, long nsec)
-{
-    time_nsec_normalize(&sec, &nsec);
-    return timenano2timew(sec, nsec);
-}
-
 static VALUE
 time_new_timew(VALUE klass, wideval_t timew)
 {
     VALUE time = time_s_alloc(klass);
     struct time_object *tobj;
 
-    tobj = DATA_PTR(time);	/* skip type check */
+    tobj = RTYPEDDATA_GET_DATA(time);	/* skip type check */
     TZMODE_SET_LOCALTIME(tobj);
     time_set_timew(time, tobj, timew);
 
     return time;
 }
 
+static wideint_t
+TIMETtoWIDEINT(time_t t)
+{
+#if SIZEOF_TIME_T * CHAR_BIT - (SIGNEDNESS_OF_TIME_T < 0) > \
+    SIZEOF_WIDEINT * CHAR_BIT - 1
+    /* compare in bit size without sign bit */
+    if (t > WIDEINT_MAX) rb_raise(rb_eArgError, "out of Time range");
+#endif
+    return (wideint_t)t;
+}
+
 VALUE
 rb_time_new(time_t sec, long usec)
 {
-    time_usec_normalize(&sec, &usec);
-    return time_new_timew(rb_cTime, timenano2timew(sec, usec * 1000));
+    wideint_t isec = TIMETtoWIDEINT(sec);
+    time_usec_normalize(&isec, &usec);
+    return time_new_timew(rb_cTime, timenano2timew(isec, usec * 1000));
 }
 
 /* returns localtime time object */
 VALUE
 rb_time_nano_new(time_t sec, long nsec)
 {
-    return time_new_timew(rb_cTime, nsec2timew(sec, nsec));
+    wideint_t isec = TIMETtoWIDEINT(sec);
+    time_nsec_normalize(&isec, &nsec);
+    return time_new_timew(rb_cTime, timenano2timew(isec, nsec));
 }
 
 VALUE
 rb_time_timespec_new(const struct timespec *ts, int offset)
 {
     struct time_object *tobj;
-    VALUE time = time_new_timew(rb_cTime, nsec2timew(ts->tv_sec, ts->tv_nsec));
+    VALUE time = rb_time_nano_new(ts->tv_sec, ts->tv_nsec);
 
     if (-86400 < offset && offset <  86400) { /* fixoff */
         GetTimeval(time, tobj);
@@ -3576,7 +3671,7 @@ tmcmp(struct tm *a, struct tm *b)
  *   Time.utc(year, month = 1, mday = 1, hour = 0, min = 0, sec = 0, usec = 0) -> new_time
  *   Time.utc(sec, min, hour, mday, month, year, dummy, dummy, dummy, dummy) -> new_time
  *
- * Returns a new \Time object based the on given arguments,
+ * Returns a new +Time+ object based the on given arguments,
  * in the UTC timezone.
  *
  * With one to seven arguments given,
@@ -3654,7 +3749,7 @@ tmcmp(struct tm *a, struct tm *b)
  *   # => [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]
  *   Time.utc(*a) # => 0005-04-03 02:01:00 UTC
  *
- * This form is useful for creating a \Time object from a 10-element
+ * This form is useful for creating a +Time+ object from a 10-element
  * array returned by Time.to_a:
  *
  *   t = Time.new(2000, 1, 2, 3, 4, 5, 6) # => 2000-01-02 03:04:05 +000006
@@ -3685,7 +3780,7 @@ time_s_mkutc(int argc, VALUE *argv, VALUE klass)
  *   Time.local(year, month = 1, mday = 1, hour = 0, min = 0, sec = 0, usec = 0) -> new_time
  *   Time.local(sec, min, hour, mday, month, year, dummy, dummy, dummy, dummy) -> new_time
  *
- * Like Time.utc, except that the returned \Time object
+ * Like Time.utc, except that the returned +Time+ object
  * has the local timezone, not the UTC timezone:
  *
  *   # With seven arguments.
@@ -3914,7 +4009,7 @@ time_cmp(VALUE time1, VALUE time2)
  *   eql?(other_time)
  *
  * Returns +true+ if +self+ and +other_time+ are
- * both \Time objects with the exact same time value.
+ * both +Time+ objects with the exact same time value.
  */
 
 static VALUE
@@ -3939,10 +4034,21 @@ time_eql(VALUE time1, VALUE time2)
  *    now = Time.now
  *    # => 2022-08-18 10:24:13.5398485 -0500
  *    now.utc? # => false
+ *    now.getutc.utc? # => true
  *    utc = Time.utc(2000, 1, 1, 20, 15, 1)
  *    # => 2000-01-01 20:15:01 UTC
  *    utc.utc? # => true
  *
+ *  +Time+ objects created with these methods are considered to be in
+ *  UTC:
+ *
+ *  * Time.utc
+ *  * Time#utc
+ *  * Time#getutc
+ *
+ *  Objects created in other ways will not be treated as UTC even if
+ *  the environment variable "TZ" is "UTC".
+ *
  *  Related: Time.utc.
  */
 
@@ -3982,7 +4088,9 @@ time_init_copy(VALUE copy, VALUE time)
     if (!OBJ_INIT_COPY(copy, time)) return copy;
     GetTimeval(time, tobj);
     GetNewTimeval(copy, tcopy);
-    MEMCPY(tcopy, tobj, struct time_object, 1);
+
+    time_set_timew(copy, tcopy, tobj->timew);
+    time_set_vtm(copy, tcopy, tobj->vtm);
 
     return copy;
 }
@@ -4054,20 +4162,20 @@ time_zonelocal(VALUE time, VALUE off)
  *  With no argument given:
  *
  *  - Returns +self+ if +self+ is a local time.
- *  - Otherwise returns a new \Time in the user's local timezone:
+ *  - Otherwise returns a new +Time+ in the user's local timezone:
  *
  *      t = Time.utc(2000, 1, 1, 20, 15, 1) # => 2000-01-01 20:15:01 UTC
  *      t.localtime                         # => 2000-01-01 14:15:01 -0600
  *
  *  With argument +zone+ given,
- *  returns the new \Time object created by converting
+ *  returns the new +Time+ object created by converting
  *  +self+ to the given time zone:
  *
  *    t = Time.utc(2000, 1, 1, 20, 15, 1) # => 2000-01-01 20:15:01 UTC
  *    t.localtime("-09:00")               # => 2000-01-01 11:15:01 -0900
  *
  *  For forms of argument +zone+, see
- *  {Timezone Specifiers}[rdoc-ref:timezones.rdoc].
+ *  {Timezone Specifiers}[rdoc-ref:Time@Timezone+Specifiers].
  *
  */
 
@@ -4094,7 +4202,7 @@ time_localtime_m(int argc, VALUE *argv, VALUE time)
  *    t.utc              # => 2000-01-01 06:00:00 UTC
  *    t.utc?             # => true
  *
- *  Related: Time#getutc (returns a new converted \Time object).
+ *  Related: Time#getutc (returns a new converted +Time+ object).
  */
 
 static VALUE
@@ -4159,7 +4267,7 @@ time_fixoff(VALUE time)
  *  call-seq:
  *    getlocal(zone = nil) -> new_time
  *
- *  Returns a new \Time object representing the value of +self+
+ *  Returns a new +Time+ object representing the value of +self+
  *  converted to a given timezone;
  *  if +zone+ is +nil+, the local timezone is used:
  *
@@ -4168,7 +4276,7 @@ time_fixoff(VALUE time)
  *    t.getlocal('+12:00')                  # => 2000-01-01 12:00:00 +1200
  *
  *  For forms of argument +zone+, see
- *  {Timezone Specifiers}[rdoc-ref:timezones.rdoc].
+ *  {Timezone Specifiers}[rdoc-ref:Time@Timezone+Specifiers].
  *
  */
 
@@ -4208,7 +4316,7 @@ time_getlocaltime(int argc, VALUE *argv, VALUE time)
  *  call-seq:
  *    getutc -> new_time
  *
- *  Returns a new \Time object representing the value of +self+
+ *  Returns a new +Time+ object representing the value of +self+
  *  converted to the UTC timezone:
  *
  *    local = Time.local(2000) # => 2000-01-01 00:00:00 -0600
@@ -4373,7 +4481,7 @@ time_add(const struct time_object *tobj, VALUE torig, VALUE offset, int sign)
  *  call-seq:
  *    self + numeric -> new_time
  *
- *  Returns a new \Time object whose value is the sum of the numeric value
+ *  Returns a new +Time+ object whose value is the sum of the numeric value
  *  of +self+ and the given +numeric+:
  *
  *    t = Time.new(2000) # => 2000-01-01 00:00:00 -0600
@@ -4401,7 +4509,7 @@ time_plus(VALUE time1, VALUE time2)
  *    self - other_time -> float
  *
  *  When +numeric+ is given,
- *  returns a new \Time object whose value is the difference
+ *  returns a new +Time+ object whose value is the difference
  *  of the numeric value of +self+ and +numeric+:
  *
  *    t = Time.new(2000) # => 2000-01-01 00:00:00 -0600
@@ -4451,7 +4559,7 @@ ndigits_denominator(VALUE ndigits)
  * call-seq:
  *   round(ndigits = 0) -> new_time
  *
- * Returns a new \Time object whose numeric value is that of +self+,
+ * Returns a new +Time+ object whose numeric value is that of +self+,
  * with its seconds value rounded to precision +ndigits+:
  *
  *   t = Time.utc(2010, 3, 30, 5, 43, 25.123456789r)
@@ -4500,7 +4608,7 @@ time_round(int argc, VALUE *argv, VALUE time)
  * call-seq:
  *   floor(ndigits = 0) -> new_time
  *
- * Returns a new \Time object whose numerical value
+ * Returns a new +Time+ object whose numerical value
  * is less than or equal to +self+ with its seconds
  * truncated to precision +ndigits+:
  *
@@ -4545,7 +4653,7 @@ time_floor(int argc, VALUE *argv, VALUE time)
  * call-seq:
  *   ceil(ndigits = 0)   -> new_time
  *
- * Returns a new \Time object whose numerical value
+ * Returns a new +Time+ object whose numerical value
  * is greater than or equal to +self+ with its seconds
  * truncated to precision +ndigits+:
  *
@@ -5007,7 +5115,7 @@ rb_time_utc_offset(VALUE time)
  *    #    [sec, min, hour, day, mon, year, wday, yday, dst?,   zone]
  *
  *  The returned array is suitable for use as an argument to Time.utc or Time.local
- *  to create a new \Time object.
+ *  to create a new +Time+ object.
  *
  */
 
@@ -5195,6 +5303,136 @@ time_strftime(VALUE time, VALUE format)
     }
 }
 
+/*
+ *  call-seq:
+ *    xmlschema(fraction_digits=0) -> string
+ *
+ *  Returns a string which represents the time as a dateTime defined by XML
+ *  Schema:
+ *
+ *    CCYY-MM-DDThh:mm:ssTZD
+ *    CCYY-MM-DDThh:mm:ss.sssTZD
+ *
+ *  where TZD is Z or [+-]hh:mm.
+ *
+ *  If self is a UTC time, Z is used as TZD.  [+-]hh:mm is used otherwise.
+ *
+ *  +fraction_digits+ specifies a number of digits to use for fractional
+ *  seconds.  Its default value is 0.
+ *
+ *      t = Time.now
+ *      t.xmlschema  # => "2011-10-05T22:26:12-04:00"
+ */
+
+static VALUE
+time_xmlschema(int argc, VALUE *argv, VALUE time)
+{
+    long fraction_digits = 0;
+    rb_check_arity(argc, 0, 1);
+    if (argc > 0) {
+        fraction_digits = NUM2LONG(argv[0]);
+        if (fraction_digits < 0) {
+            fraction_digits = 0;
+        }
+    }
+
+    struct time_object *tobj;
+
+    GetTimeval(time, tobj);
+    MAKE_TM(time, tobj);
+
+    const long size_after_year = sizeof("-MM-DDTHH:MM:SS+ZH:ZM") + fraction_digits
+        + (fraction_digits > 0);
+    VALUE str;
+    char *ptr;
+
+# define fill_digits_long(len, prec, n) \
+    for (int fill_it = 1, written = snprintf(ptr, len, "%0*ld", prec, n); \
+         fill_it; ptr += written, fill_it = 0)
+
+    if (FIXNUM_P(tobj->vtm.year)) {
+        long year = FIX2LONG(tobj->vtm.year);
+        int year_width = (year < 0) + rb_strlen_lit("YYYY");
+        int w = (year >= -9999 && year <= 9999 ? year_width : (year < 0) + (int)DECIMAL_SIZE_OF(year));
+        str = rb_usascii_str_new(0, w + size_after_year);
+        ptr = RSTRING_PTR(str);
+        fill_digits_long(w + 1, year_width, year) {
+            if (year >= -9999 && year <= 9999) {
+                RUBY_ASSERT(written == year_width);
+            }
+            else {
+                RUBY_ASSERT(written >= year_width);
+                RUBY_ASSERT(written <= w);
+            }
+        }
+    }
+    else {
+        str = rb_int2str(tobj->vtm.year, 10);
+        rb_str_modify_expand(str, size_after_year);
+        ptr = RSTRING_END(str);
+    }
+
+# define fill_2(c, n) (*ptr++ = c, *ptr++ = '0' + (n) / 10, *ptr++ = '0' + (n) % 10)
+    fill_2('-', tobj->vtm.mon);
+    fill_2('-', tobj->vtm.mday);
+    fill_2('T', tobj->vtm.hour);
+    fill_2(':', tobj->vtm.min);
+    fill_2(':', tobj->vtm.sec);
+
+    if (fraction_digits > 0) {
+        VALUE subsecx = tobj->vtm.subsecx;
+        long subsec;
+        int digits = -1;
+        *ptr++ = '.';
+        if (fraction_digits <= TIME_SCALE_NUMDIGITS) {
+            digits = TIME_SCALE_NUMDIGITS - (int)fraction_digits;
+        }
+        else {
+            long w = fraction_digits - TIME_SCALE_NUMDIGITS; /* > 0 */
+            subsecx = mulv(subsecx, rb_int_positive_pow(10, (unsigned long)w));
+            if (!RB_INTEGER_TYPE_P(subsecx)) { /* maybe Rational */
+                subsecx = rb_Integer(subsecx);
+            }
+            if (FIXNUM_P(subsecx)) digits = 0;
+        }
+        if (digits >= 0 && fraction_digits < INT_MAX) {
+            subsec = NUM2LONG(subsecx);
+            if (digits > 0) subsec /= (long)pow(10, digits);
+            fill_digits_long(fraction_digits + 1, (int)fraction_digits, subsec) {
+                RUBY_ASSERT(written == (int)fraction_digits);
+            }
+        }
+        else {
+            subsecx = rb_int2str(subsecx, 10);
+            long len = RSTRING_LEN(subsecx);
+            if (fraction_digits > len) {
+                memset(ptr, '0', fraction_digits - len);
+            }
+            else {
+                len = fraction_digits;
+            }
+            ptr += fraction_digits;
+            memcpy(ptr - len, RSTRING_PTR(subsecx), len);
+        }
+    }
+
+    if (TZMODE_UTC_P(tobj)) {
+        *ptr = 'Z';
+        ptr++;
+    }
+    else {
+        long offset = NUM2LONG(rb_time_utc_offset(time));
+        char sign = offset < 0 ? '-' : '+';
+        if (offset < 0) offset = -offset;
+        offset /= 60;
+        fill_2(sign, offset / 60);
+        fill_2(':', offset % 60);
+    }
+    const char *const start = RSTRING_PTR(str);
+    rb_str_set_len(str, ptr - start); // We could skip coderange scanning as we know it's full ASCII.
+    return str;
+}
+
 int ruby_marshal_write_long(long x, char *buf);
 
 enum {base_dump_size = 8};
@@ -5516,7 +5754,7 @@ end_submicro: ;
     }
     if (!NIL_P(zone)) {
         zone = mload_zone(time, zone);
-        tobj->vtm.zone = zone;
+        RB_OBJ_WRITE(time, &tobj->vtm.zone, zone);
         zone_localtime(zone, time);
     }
 
@@ -5545,7 +5783,6 @@ time_load(VALUE klass, VALUE str)
 
 /*
  * call-seq:
- *
  *   Time::tm.from_time(t) -> tm
  *
  * Creates new Time::tm object from a Time object.
@@ -5561,10 +5798,12 @@ tm_from_time(VALUE klass, VALUE time)
 
     GetTimeval(time, tobj);
     tm = time_s_alloc(klass);
-    ttm = DATA_PTR(tm);
+    ttm = RTYPEDDATA_GET_DATA(tm);
     v = &vtm;
-    GMTIMEW(ttm->timew = tobj->timew, v);
-    ttm->timew = wsub(ttm->timew, v->subsecx);
+
+    WIDEVALUE timew = tobj->timew;
+    GMTIMEW(timew, v);
+    time_set_timew(tm, ttm, wsub(timew, v->subsecx));
     v->subsecx = INT2FIX(0);
     v->zone = Qnil;
     time_set_vtm(tm, ttm, *v);
@@ -5576,7 +5815,6 @@ tm_from_time(VALUE klass, VALUE time)
 
 /*
  * call-seq:
- *
  *   Time::tm.new(year, month=nil, day=nil, hour=nil, min=nil, sec=nil, zone=nil) -> tm
  *
  * Creates new Time::tm object.
@@ -5591,7 +5829,7 @@ tm_initialize(int argc, VALUE *argv, VALUE time)
     if (rb_check_arity(argc, 1, 7) > 6) argc = 6;
     time_arg(argc, argv, &vtm);
     t = timegmw(&vtm);
-    struct time_object *tobj = DATA_PTR(time);
+    struct time_object *tobj = RTYPEDDATA_GET_DATA(time);
     TZMODE_SET_UTC(tobj);
     time_set_timew(time, tobj, t);
     time_set_vtm(time, tobj, vtm);
@@ -5600,7 +5838,6 @@ tm_initialize(int argc, VALUE *argv, VALUE time)
 }
 
 /* call-seq:
- *
  *   tm.to_time -> time
  *
  * Returns a new Time object.
@@ -5611,7 +5848,7 @@ tm_to_time(VALUE tm)
 {
     struct time_object *torig = get_timeval(tm);
     VALUE dup = time_s_alloc(rb_cTime);
-    struct time_object *tobj = DATA_PTR(dup);
+    struct time_object *tobj = RTYPEDDATA_GET_DATA(dup);
     *tobj = *torig;
     return dup;
 }
@@ -5705,20 +5942,14 @@ rb_time_zone_abbreviation(VALUE zone, VALUE time)
     return rb_obj_as_string(abbr);
 }
 
-/*  Internal Details:
- *
- *  Since Ruby 1.9.2, Time implementation uses a signed 63 bit integer or
- *  Integer(T_BIGNUM), Rational.
- *  The integer is a number of nanoseconds since the _Epoch_ which can
- *  represent 1823-11-12 to 2116-02-20.
- *  When Integer(T_BIGNUM) or Rational is used (before 1823, after 2116, under
- *  nanosecond), Time works slower than when integer is used.
- */
-
 //
 void
 Init_Time(void)
 {
+#ifdef _WIN32
+    ruby_reset_timezone(getenv("TZ"));
+#endif
+
     id_submicro = rb_intern_const("submicro");
     id_nano_num = rb_intern_const("nano_num");
     id_nano_den = rb_intern_const("nano_den");
@@ -5753,9 +5984,9 @@ Init_Time(void)
     sym_zone = ID2SYM(rb_intern_const("zone"));
 
     str_utc = rb_fstring_lit("UTC");
-    rb_gc_register_mark_object(str_utc);
+    rb_vm_register_global_object(str_utc);
     str_empty = rb_fstring_lit("");
-    rb_gc_register_mark_object(str_empty);
+    rb_vm_register_global_object(str_empty);
 
     rb_cTime = rb_define_class("Time", rb_cObject);
     VALUE scTime = rb_singleton_class(rb_cTime);
@@ -5832,6 +6063,8 @@ Init_Time(void)
     rb_define_method(rb_cTime, "subsec", time_subsec, 0);
 
     rb_define_method(rb_cTime, "strftime", time_strftime, 1);
+    rb_define_method(rb_cTime, "xmlschema", time_xmlschema, -1);
+    rb_define_alias(rb_cTime, "iso8601", "xmlschema");
 
     /* methods for marshaling */
     rb_define_private_method(rb_cTime, "_dump", time_dump, -1);
diff --git a/timev.rb b/timev.rb
index e710dc699003e2..cf8a88e64eff0c 100644
--- a/timev.rb
+++ b/timev.rb
@@ -1,4 +1,4 @@
-# A \Time object represents a date and time:
+# A +Time+ object represents a date and time:
 #
 #   Time.new(2000, 1, 1, 0, 0, 0) # => 2000-01-01 00:00:00 -0600
 #
@@ -41,15 +41,60 @@
 #
 # == \Time Resolution
 #
-# A \Time object derived from the system clock
+# A +Time+ object derived from the system clock
 # (for example, by method Time.now)
 # has the resolution supported by the system.
 #
+# == \Time Internal Representation
+#
+# Conceptually, Time class uses a rational value to represent the number of
+# seconds from _Epoch_, 1970-01-01 00:00:00 UTC.
+# There are no boundary or resolution limitations.
+# The value can be obtained using Time#to_r.
+#
+# The Time class always uses the Gregorian calendar.
+# I.e. the proleptic Gregorian calendar is used.
+# Other calendars, such as Julian calendar, are not supported.
+#
+# The implementation uses a signed 63 bit integer, Integer (Bignum) object or
+# Ratoinal object to represent a rational value.
+# (The signed 63 bit integer is used regardless of 32 and 64 bit environments.)
+# The value represents the number of nanoseconds from _Epoch_.
+# The signed 63 bit integer can represent 1823-11-12 to 2116-02-20.
+# When Integer or Rational object is used (before 1823, after 2116, under
+# nanosecond), Time works slower than when the signed 63 bit integer is used.
+#
+# Ruby uses the C function +localtime+ and +gmtime+ to map between the number
+# and 6-tuple (year,month,day,hour,minute,second).
+# +localtime+ is used for local time and +gmtime+ is used for UTC.
+#
+# Integer and Rational has no range limit, but the localtime and
+# gmtime has range limits due to the C types +time_t+ and <tt>struct tm</tt>.
+# If that limit is exceeded, Ruby extrapolates the localtime function.
+#
+# +time_t+ can represent 1901-12-14 to 2038-01-19 if it is 32 bit signed integer,
+# -292277022657-01-27 to 292277026596-12-05 if it is 64 bit signed integer.
+# However +localtime+ on some platforms doesn't supports negative +time_t+ (before 1970).
+#
+# <tt>struct tm</tt> has _tm_year_ member to represent years.
+# (<tt>tm_year = 0</tt> means the year 1900.)
+# It is defined as +int+ in the C standard.
+# _tm_year_ can represent years between -2147481748 to 2147485547 if +int+ is 32 bit.
+#
+# Ruby supports leap seconds as far as if the C function +localtime+ and
+# +gmtime+ supports it.
+# They use the tz database in most Unix systems.
+# The tz database has timezones which supports leap seconds.
+# For example, "Asia/Tokyo" doesn't support leap seconds but
+# "right/Asia/Tokyo" supports leap seconds.
+# So, Ruby supports leap seconds if the TZ environment variable is
+# set to "right/Asia/Tokyo" in most Unix systems.
+#
 # == Examples
 #
 # All of these examples were done using the EST timezone which is GMT-5.
 #
-# === Creating a New \Time Instance
+# === Creating a New +Time+ Instance
 #
 # You can create a new instance of Time with Time.new. This will use the
 # current system time. Time.now is an alias for this. You can also
@@ -66,7 +111,7 @@
 #
 #   Time.new(2002, 10, 31, 2, 2, 2, "+02:00") #=> 2002-10-31 02:02:02 +0200
 #
-# Or a timezone object:
+# Or {a timezone object}[rdoc-ref:Time@Timezone+Objects]:
 #
 #   zone = timezone("Europe/Athens")      # Eastern European Time, UTC+2
 #   Time.new(2002, 10, 31, 2, 2, 2, zone) #=> 2002-10-31 02:02:02 +0200
@@ -81,7 +126,7 @@
 #
 #   Time.at(628232400) #=> 1989-11-28 00:00:00 -0500
 #
-# === Working with an Instance of \Time
+# === Working with an Instance of +Time+
 #
 # Once you have an instance of Time there is a multitude of things you can
 # do with it. Below are some examples. For all of the following examples, we
@@ -123,19 +168,19 @@
 #
 # == What's Here
 #
-# First, what's elsewhere. \Class \Time:
+# First, what's elsewhere. Class +Time+:
 #
 # - Inherits from {class Object}[rdoc-ref:Object@What-27s+Here].
 # - Includes {module Comparable}[rdoc-ref:Comparable@What-27s+Here].
 #
-# Here, class \Time provides methods that are useful for:
+# Here, class +Time+ provides methods that are useful for:
 #
-# - {Creating \Time objects}[rdoc-ref:Time@Methods+for+Creating].
-# - {Fetching \Time values}[rdoc-ref:Time@Methods+for+Fetching].
-# - {Querying a \Time object}[rdoc-ref:Time@Methods+for+Querying].
-# - {Comparing \Time objects}[rdoc-ref:Time@Methods+for+Comparing].
-# - {Converting a \Time object}[rdoc-ref:Time@Methods+for+Converting].
-# - {Rounding a \Time}[rdoc-ref:Time@Methods+for+Rounding].
+# - {Creating Time objects}[rdoc-ref:Time@Methods+for+Creating].
+# - {Fetching Time values}[rdoc-ref:Time@Methods+for+Fetching].
+# - {Querying a Time object}[rdoc-ref:Time@Methods+for+Querying].
+# - {Comparing Time objects}[rdoc-ref:Time@Methods+for+Comparing].
+# - {Converting a Time object}[rdoc-ref:Time@Methods+for+Converting].
+# - {Rounding a Time}[rdoc-ref:Time@Methods+for+Rounding].
 #
 # === Methods for Creating
 #
@@ -210,25 +255,27 @@
 # - #floor: Returns a new time with subseconds lowered to a floor.
 #
 # For the forms of argument +zone+, see
-# {Timezone Specifiers}[rdoc-ref:timezones.rdoc].
+# {Timezone Specifiers}[rdoc-ref:Time@Timezone+Specifiers].
+#
+# :include: doc/_timezones.rdoc
 class Time
-  # Creates a new \Time object from the current system time.
+  # Creates a new +Time+ object from the current system time.
   # This is the same as Time.new without arguments.
   #
   #    Time.now               # => 2009-06-24 12:39:54 +0900
   #    Time.now(in: '+04:00') # => 2009-06-24 07:39:54 +0400
   #
   # For forms of argument +zone+, see
-  # {Timezone Specifiers}[rdoc-ref:timezones.rdoc].
+  # {Timezone Specifiers}[rdoc-ref:Time@Timezone+Specifiers].
   def self.now(in: nil)
     Primitive.time_s_now(Primitive.arg!(:in))
   end
 
-  # Returns a new \Time object based on the given arguments.
+  # Returns a new +Time+ object based on the given arguments.
   #
   # Required argument +time+ may be either of:
   #
-  # - A \Time object, whose value is the basis for the returned time;
+  # - A +Time+ object, whose value is the basis for the returned time;
   #   also influenced by optional keyword argument +in:+ (see below).
   # - A numeric number of
   #   {Epoch seconds}[rdoc-ref:Time@Epoch+Seconds]
@@ -270,14 +317,14 @@ def self.now(in: nil)
   #     Time.at(secs, -1000000000, :nanosecond) # => 2000-12-31 23:59:58 -0600
   #
   #
-  # Optional keyword argument <tt>+in: zone</tt> specifies the timezone
+  # Optional keyword argument <tt>in: zone</tt> specifies the timezone
   # for the returned time:
   #
   #   Time.at(secs, in: '+12:00') # => 2001-01-01 17:59:59 +1200
   #   Time.at(secs, in: '-12:00') # => 2000-12-31 17:59:59 -1200
   #
   # For the forms of argument +zone+, see
-  # {Timezone Specifiers}[rdoc-ref:timezones.rdoc].
+  # {Timezone Specifiers}[rdoc-ref:Time@Timezone+Specifiers].
   #
   def self.at(time, subsec = false, unit = :microsecond, in: nil)
     if Primitive.mandatory_only?
@@ -287,7 +334,10 @@ def self.at(time, subsec = false, unit = :microsecond, in: nil)
     end
   end
 
-  # Returns a new \Time object based on the given arguments,
+  # call-seq:
+  #   Time.new(year = nil, mon = nil, mday = nil, hour = nil, min = nil, sec = nil, zone = nil, in: nil, precision: 9)
+  #
+  # Returns a new +Time+ object based on the given arguments,
   # by default in the local timezone.
   #
   # With no positional arguments, returns the value of Time.now:
@@ -295,7 +345,7 @@ def self.at(time, subsec = false, unit = :microsecond, in: nil)
   #   Time.new # => 2021-04-24 17:27:46.0512465 -0500
   #
   # With one string argument that represents a time, returns a new
-  # \Time object based on the given argument, in the local timezone.
+  # +Time+ object based on the given argument, in the local timezone.
   #
   #   Time.new('2000-12-31 23:59:59.5')              # => 2000-12-31 23:59:59.5 -0600
   #   Time.new('2000-12-31 23:59:59.5 +0900')        # => 2000-12-31 23:59:59.5 +0900
@@ -303,7 +353,7 @@ def self.at(time, subsec = false, unit = :microsecond, in: nil)
   #   Time.new('2000-12-31 23:59:59.5')              # => 2000-12-31 23:59:59.5 -0600
   #   Time.new('2000-12-31 23:59:59.56789', precision: 3) # => 2000-12-31 23:59:59.567 -0600
   #
-  # With one to six arguments, returns a new \Time object
+  # With one to six arguments, returns a new +Time+ object
   # based on the given arguments, in the local timezone.
   #
   #   Time.new(2000, 1, 2, 3, 4, 5) # => 2000-01-02 03:04:05 -0600
@@ -366,9 +416,9 @@ def self.at(time, subsec = false, unit = :microsecond, in: nil)
   #     Time.new(*a) # => 0000-01-01 00:00:00 -0600
   #
   # When positional argument +zone+ or keyword argument +in:+ is given,
-  # the new \Time object is in the specified timezone.
+  # the new +Time+ object is in the specified timezone.
   # For the forms of argument +zone+, see
-  # {Timezone Specifiers}[rdoc-ref:timezones.rdoc]:
+  # {Timezone Specifiers}[rdoc-ref:Time@Timezone+Specifiers]:
   #
   #   Time.new(2000, 1, 1, 0, 0, 0, '+12:00')
   #   # => 2000-01-01 00:00:00 +1200
@@ -377,8 +427,14 @@ def self.at(time, subsec = false, unit = :microsecond, in: nil)
   #   Time.new(in: '-12:00')
   #   # => 2022-08-23 08:49:26.1941467 -1200
   #
+  # Since +in:+ keyword argument just provides the default, so if the
+  # first argument in single string form contains time zone information,
+  # this keyword argument will be silently ignored.
+  #
+  #   Time.new('2000-01-01 00:00:00 +0100', in: '-0500').utc_offset  # => 3600
+  #
   # - +precision+: maximum effective digits in sub-second part, default is 9.
-  #   More digits will be truncated, as other operations of \Time.
+  #   More digits will be truncated, as other operations of +Time+.
   #   Ignored unless the first argument is a string.
   #
   def initialize(year = (now = true), mon = (str = year; nil), mday = nil, hour = nil, min = nil, sec = nil, zone = nil,
diff --git a/tool/annocheck/Dockerfile b/tool/annocheck/Dockerfile
index 138adc48de8bda..d1fb1839c9d0fe 100644
--- a/tool/annocheck/Dockerfile
+++ b/tool/annocheck/Dockerfile
@@ -1,4 +1,4 @@
-FROM docker.io/fedora:latest
+FROM ghcr.io/ruby/fedora:latest
 
 RUN dnf -y install annobin-annocheck
 WORKDIR /work
diff --git a/tool/annocheck/Dockerfile-copy b/tool/annocheck/Dockerfile-copy
index e658d12ddc1487..d437f27387ca4f 100644
--- a/tool/annocheck/Dockerfile-copy
+++ b/tool/annocheck/Dockerfile-copy
@@ -1,7 +1,6 @@
-FROM docker.io/fedora:latest
-ARG FILES
+FROM ghcr.io/ruby/fedora:latest
+ARG IN_DIR
 
 RUN dnf -y install annobin-annocheck
-RUN mkdir /work
-COPY ${FILES} /work
+COPY ${IN_DIR} /work
 WORKDIR /work
diff --git a/tool/auto-style.rb b/tool/auto-style.rb
new file mode 100755
index 00000000000000..b673e3d1771042
--- /dev/null
+++ b/tool/auto-style.rb
@@ -0,0 +1,270 @@
+#!/usr/bin/env ruby
+# Usage:
+#   auto-style.rb [oldrev] [newrev] [pushref]
+
+require 'shellwords'
+require 'tmpdir'
+ENV['LC_ALL'] = 'C'
+
+class Git
+  attr_reader :depth
+
+  def initialize(oldrev, newrev, branch = nil)
+    @oldrev = oldrev
+    @newrev = newrev.empty? ? 'HEAD' : newrev
+    @branch = branch
+
+    # GitHub may not fetch github.event.pull_request.base.sha at checkout
+    git('log', '--format=%H', '-1', @oldrev, out: IO::NULL, err: [:child, :out]) or
+      git('fetch', '--depth=1', 'origin', @oldrev)
+    git('log', '--format=%H', '-1', "#@newrev~99", out: IO::NULL, err: [:child, :out]) or
+      git('fetch', '--depth=100', 'origin', @newrev)
+
+    with_clean_env do
+      @revs = {}
+      IO.popen(['git', 'log', '--format=%H %s', "#{@oldrev}..#{@newrev}"]) do |f|
+        f.each do |line|
+          line.chomp!
+          rev, subj = line.split(' ', 2)
+          @revs[rev] = subj
+        end
+      end
+      @depth = @revs.size
+    end
+  end
+
+  # ["foo/bar.c", "baz.h", ...]
+  def updated_paths
+    with_clean_env do
+      IO.popen(['git', 'diff', '--name-only', @oldrev, @newrev], &:readlines).each(&:chomp!)
+    end
+  end
+
+  # [0, 1, 4, ...]
+  def updated_lines(file) # NOTE: This doesn't work well on pull requests, so not used anymore
+    lines = []
+    revs = @revs.map {|rev, subj| rev unless subj.start_with?("Revert ")}.compact
+    revs_pattern = /\A(?:#{revs.join('|')}) /
+    with_clean_env { IO.popen(['git', 'blame', '-l', '--', file], &:readlines) }.each_with_index do |line, index|
+      if revs_pattern =~ line
+        lines << index
+      end
+    end
+    lines
+  end
+
+  def commit(log, *files)
+    git('add', *files)
+    git('commit', '-m', log)
+  end
+
+  def push
+    git('push', 'origin', @branch)
+  end
+
+  def diff
+    git('--no-pager', 'diff')
+  end
+
+  private
+
+  def git(*args, **opts)
+    cmd = ['git', *args].shelljoin
+    puts "+ #{cmd}"
+    ret = with_clean_env { system('git', *args, **opts) }
+    unless ret or opts[:err]
+      abort "Failed to run: #{cmd}"
+    end
+    ret
+  end
+
+  def with_clean_env
+    git_dir = ENV.delete('GIT_DIR') # this overcomes '-C' or pwd
+    yield
+  ensure
+    ENV['GIT_DIR'] = git_dir if git_dir
+  end
+end
+
+DEFAULT_GEM_LIBS = %w[
+  bundler
+  cmath
+  csv
+  e2mmap
+  fileutils
+  forwardable
+  ipaddr
+  irb
+  logger
+  matrix
+  mutex_m
+  ostruct
+  prime
+  rdoc
+  rexml
+  rss
+  scanf
+  shell
+  sync
+  thwait
+  tracer
+  webrick
+]
+
+DEFAULT_GEM_EXTS = %w[
+  bigdecimal
+  date
+  dbm
+  digest
+  etc
+  fcntl
+  fiddle
+  gdbm
+  io/console
+  io/nonblock
+  json
+  openssl
+  psych
+  racc
+  sdbm
+  stringio
+  strscan
+  zlib
+]
+
+IGNORED_FILES = [
+  # default gems whose master is GitHub
+  %r{\Abin/(?!erb)\w+\z},
+  *(DEFAULT_GEM_LIBS + DEFAULT_GEM_EXTS).flat_map { |lib|
+    [
+      %r{\Alib/#{lib}/},
+      %r{\Alib/#{lib}\.gemspec\z},
+      %r{\Alib/#{lib}\.rb\z},
+      %r{\Atest/#{lib}/},
+    ]
+  },
+  *DEFAULT_GEM_EXTS.flat_map { |ext|
+    [
+      %r{\Aext/#{ext}/},
+      %r{\Atest/#{ext}/},
+    ]
+  },
+
+  # vendoring (ccan)
+  %r{\Accan/},
+
+  # vendoring (io/)
+  %r{\Aext/io/},
+
+  # vendoring (nkf)
+  %r{\Aext/nkf/nkf-utf8/},
+
+  # vendoring (onigmo)
+  %r{\Aenc/},
+  %r{\Ainclude/ruby/onigmo\.h\z},
+  %r{\Areg.+\.(c|h)\z},
+
+  # explicit or implicit `c-file-style: "linux"`
+  %r{\Aaddr2line\.c\z},
+  %r{\Amissing/},
+  %r{\Astrftime\.c\z},
+  %r{\Avsnprintf\.c\z},
+
+  # to respect the original statements of licenses
+  %r{\ALEGAL\z},
+
+  # trailing spaces could be intentional in TRICK code
+  %r{\Asample/trick[^/]*/},
+]
+
+DIFFERENT_STYLE_FILES = %w[
+  addr2line.c io_buffer.c prism*.c scheduler.c
+]
+
+oldrev, newrev, pushref = ARGV
+unless dry_run = pushref.empty?
+  branch = IO.popen(['git', 'rev-parse', '--symbolic', '--abbrev-ref', pushref], &:read).strip
+end
+git = Git.new(oldrev, newrev, branch)
+
+updated_files = git.updated_paths
+files = updated_files.select {|l|
+  /^\d/ !~ l and /\.bat\z/ !~ l and
+  (/\A(?:config|[Mm]akefile|GNUmakefile|README)/ =~ File.basename(l) or
+   /\A\z|\.(?:[chsy]|\d+|e?rb|tmpl|bas[eh]|z?sh|in|ma?k|def|src|trans|rdoc|ja|en|el|sed|awk|p[ly]|scm|mspec|html|rs)\z/ =~ File.extname(l))
+}
+files.select! {|n| File.file?(n) }
+files.reject! do |f|
+  IGNORED_FILES.any? { |re| f.match(re) }
+end
+if files.empty?
+  puts "No files are an auto-style target:\n#{updated_files.join("\n")}"
+  exit
+end
+
+trailing = eofnewline = expandtab = indent = false
+
+edited_files = files.select do |f|
+  src = File.binread(f) rescue next
+  eofnewline = eofnewline0 = true if src.sub!(/(?<!\A|\n)\z/, "\n")
+
+  trailing0 = false
+  expandtab0 = false
+  indent0 = false
+
+  src.gsub!(/^.*$/).with_index do |line, lineno|
+    trailing = trailing0 = true if line.sub!(/[ \t]+$/, '')
+    line
+  end
+
+  if f.end_with?('.c') || f.end_with?('.h') || f == 'insns.def'
+    # If and only if unedited lines did not have tab indentation, prevent introducing tab indentation to the file.
+    expandtab_allowed = src.each_line.with_index.all? do |line, lineno|
+      !line.start_with?("\t")
+    end
+
+    if expandtab_allowed
+      src.gsub!(/^.*$/).with_index do |line, lineno|
+        if line.start_with?("\t") # last-committed line with hard tabs
+          expandtab = expandtab0 = true
+          line.sub(/\A\t+/) { |tabs| ' ' * (8 * tabs.length) }
+        else
+          line
+        end
+      end
+    end
+  end
+
+  if File.fnmatch?("*.[ch]", f, File::FNM_PATHNAME) &&
+     !DIFFERENT_STYLE_FILES.any? {|pat| File.fnmatch?(pat, f, File::FNM_PATHNAME)}
+    indent0 = true if src.gsub!(/^\w+\([^\n]*?\)\K[ \t]*(?=\{( *\\)?$)/, '\1' "\n")
+    indent0 = true if src.gsub!(/^([ \t]*)\}\K[ \t]*(?=else\b.*?( *\\)?$)/, '\2' "\n" '\1')
+    indent0 = true if src.gsub!(/^[ \t]*\}\n\K\n+(?=[ \t]*else\b)/, '')
+    indent ||= indent0
+  end
+
+  if trailing0 or eofnewline0 or expandtab0 or indent0
+    File.binwrite(f, src)
+    true
+  end
+end
+if edited_files.empty?
+  puts "All edited lines are formatted well:\n#{files.join("\n")}"
+else
+  msg = [('remove trailing spaces' if trailing),
+         ('append newline at EOF' if eofnewline),
+         ('expand tabs' if expandtab),
+         ('adjust indents' if indent),
+        ].compact
+  message = "* #{msg.join(', ')}. [ci skip]"
+  if expandtab
+    message += "\nPlease consider using misc/expand_tabs.rb as a pre-commit hook."
+  end
+  if dry_run
+    git.diff
+    abort message
+  else
+    git.commit(message, *edited_files)
+    git.push
+  end
+end
diff --git a/tool/bundler/dev_gems.rb b/tool/bundler/dev_gems.rb
index 856256a24689c5..0d4dbd7f2ee058 100644
--- a/tool/bundler/dev_gems.rb
+++ b/tool/bundler/dev_gems.rb
@@ -3,18 +3,16 @@
 source "https://rubygems.org"
 
 gem "test-unit", "~> 3.0"
-gem "rake", "~> 13.0"
+gem "rake", "~> 13.1"
 gem "rb_sys"
 
-gem "webrick", "~> 1.6"
-gem "turbo_tests", "~> 2.1"
-gem "parallel_tests", "< 3.9.0"
+gem "turbo_tests", "~> 2.2.3"
+gem "parallel_tests", "~> 4.10.1"
 gem "parallel", "~> 1.19"
 gem "rspec-core", "~> 3.12"
 gem "rspec-expectations", "~> 3.12"
 gem "rspec-mocks", "~> 3.12"
-gem "uri", "~> 0.12.0"
 
 group :doc do
-  gem "ronn", "~> 0.7.3", :platform => :ruby
+  gem "ronn-ng", "~> 0.10.1", platform: :ruby
 end
diff --git a/tool/bundler/dev_gems.rb.lock b/tool/bundler/dev_gems.rb.lock
new file mode 100644
index 00000000000000..68106f71911944
--- /dev/null
+++ b/tool/bundler/dev_gems.rb.lock
@@ -0,0 +1,121 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    diff-lcs (1.6.1)
+    kramdown (2.5.1)
+      rexml (>= 3.3.9)
+    kramdown-parser-gfm (1.1.0)
+      kramdown (~> 2.0)
+    mini_portile2 (2.8.8)
+    mustache (1.1.1)
+    nokogiri (1.18.6)
+      mini_portile2 (~> 2.8.2)
+      racc (~> 1.4)
+    nokogiri (1.18.6-aarch64-linux-gnu)
+      racc (~> 1.4)
+    nokogiri (1.18.6-arm-linux-gnu)
+      racc (~> 1.4)
+    nokogiri (1.18.6-arm64-darwin)
+      racc (~> 1.4)
+    nokogiri (1.18.6-java)
+      racc (~> 1.4)
+    nokogiri (1.18.6-x64-mingw-ucrt)
+      racc (~> 1.4)
+    nokogiri (1.18.6-x86_64-darwin)
+      racc (~> 1.4)
+    nokogiri (1.18.6-x86_64-linux-gnu)
+      racc (~> 1.4)
+    parallel (1.26.3)
+    parallel_tests (4.10.1)
+      parallel
+    power_assert (2.0.5)
+    racc (1.8.1)
+    racc (1.8.1-java)
+    rake (13.3.0)
+    rake-compiler-dock (1.9.1)
+    rb_sys (0.9.111)
+      rake-compiler-dock (= 1.9.1)
+    rexml (3.4.1)
+    ronn-ng (0.10.1)
+      kramdown (~> 2, >= 2.1)
+      kramdown-parser-gfm (~> 1, >= 1.0.1)
+      mustache (~> 1)
+      nokogiri (~> 1, >= 1.14.3)
+    rspec (3.13.0)
+      rspec-core (~> 3.13.0)
+      rspec-expectations (~> 3.13.0)
+      rspec-mocks (~> 3.13.0)
+    rspec-core (3.13.3)
+      rspec-support (~> 3.13.0)
+    rspec-expectations (3.13.3)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.13.0)
+    rspec-mocks (3.13.2)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.13.0)
+    rspec-support (3.13.2)
+    test-unit (3.6.7)
+      power_assert
+    turbo_tests (2.2.5)
+      parallel_tests (>= 3.3.0, < 5)
+      rspec (>= 3.10)
+
+PLATFORMS
+  aarch64-darwin
+  aarch64-linux
+  arm-linux
+  arm64-darwin
+  java
+  ruby
+  universal-java
+  x64-mingw-ucrt
+  x86-linux
+  x86_64-darwin
+  x86_64-linux
+
+DEPENDENCIES
+  parallel (~> 1.19)
+  parallel_tests (~> 4.10.1)
+  rake (~> 13.1)
+  rb_sys
+  ronn-ng (~> 0.10.1)
+  rspec-core (~> 3.12)
+  rspec-expectations (~> 3.12)
+  rspec-mocks (~> 3.12)
+  test-unit (~> 3.0)
+  turbo_tests (~> 2.2.3)
+
+CHECKSUMS
+  diff-lcs (1.6.1) sha256=12a5a83f3e37a8e2f4427268e305914d5f1879f22b4e73bb1a09f76a3dd86cd4
+  kramdown (2.5.1) sha256=87bbb6abd9d3cebe4fc1f33e367c392b4500e6f8fa19dd61c0972cf4afe7368c
+  kramdown-parser-gfm (1.1.0) sha256=fb39745516427d2988543bf01fc4cf0ab1149476382393e0e9c48592f6581729
+  mini_portile2 (2.8.8) sha256=8e47136cdac04ce81750bb6c09733b37895bf06962554e4b4056d78168d70a75
+  mustache (1.1.1) sha256=90891fdd50b53919ca334c8c1031eada1215e78d226d5795e523d6123a2717d0
+  nokogiri (1.18.6) sha256=4d283431d7829719ea1287ca388f24c6ce343af736bbcbd1365cbdb83bce41a4
+  nokogiri (1.18.6-aarch64-linux-gnu) sha256=1b11f9a814068282cc2b47ebe61395b2a69d1918092d2ca3bd664074f72540e9
+  nokogiri (1.18.6-arm-linux-gnu) sha256=2da07a07ef4c9d9e9da809b3dc0937ed90b031e32c2c658d9918941b85d68b95
+  nokogiri (1.18.6-arm64-darwin) sha256=727a441d179d934b4b7c73e0e28e6723ee46463d96bb0cc6e2e33a13540962c4
+  nokogiri (1.18.6-java) sha256=bf16c53446987007ff3e1deb29d65d20444073ba112cb5bddbd2671135ba293c
+  nokogiri (1.18.6-x64-mingw-ucrt) sha256=134f6d54f56edd46cb6db77c9d9de1704b3f83b3981a6763671e3cfbeba221f5
+  nokogiri (1.18.6-x86_64-darwin) sha256=fb72568c97ccd90a8d68cb765b0ff0720b109bd62e3babbf372e854ef8fef995
+  nokogiri (1.18.6-x86_64-linux-gnu) sha256=df065db6ba6e1e80f76ef04f860fcf260cc24685125fe33cdc3d1572a1c66b71
+  parallel (1.26.3) sha256=d86babb7a2b814be9f4b81587bf0b6ce2da7d45969fab24d8ae4bf2bb4d4c7ef
+  parallel_tests (4.10.1) sha256=df05458c691462b210f7a41fc2651d4e4e8a881e8190e6d1e122c92c07735d70
+  power_assert (2.0.5) sha256=63b511b85bb8ea57336d25156864498644f5bbf028699ceda27949e0125bc323
+  racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f
+  racc (1.8.1-java) sha256=54f2e6d1e1b91c154013277d986f52a90e5ececbe91465d29172e49342732b98
+  rake (13.3.0) sha256=96f5092d786ff412c62fde76f793cc0541bd84d2eb579caa529aa8a059934493
+  rake-compiler-dock (1.9.1) sha256=e73720a29aba9c114728ce39cc0d8eef69ba61d88e7978c57bac171724cd4d53
+  rb_sys (0.9.111) sha256=65822fd8d57c248cd893db0efe01bc6edc15fcbea3ba6666091e35430c1cbaf0
+  rexml (3.4.1) sha256=c74527a9a0a04b4ec31dbe0dc4ed6004b960af943d8db42e539edde3a871abca
+  ronn-ng (0.10.1) sha256=4eeb0185c0fbfa889efed923b5b50e949cd869e7d82ac74138acd0c9c7165ec0
+  rspec (3.13.0) sha256=d490914ac1d5a5a64a0e1400c1d54ddd2a501324d703b8cfe83f458337bab993
+  rspec-core (3.13.3) sha256=25136507f4f9cf2e8977a2851e64e438b4331646054e345998714108745cdfe4
+  rspec-expectations (3.13.3) sha256=0e6b5af59b900147698ea0ff80456c4f2e69cac4394fbd392fbd1ca561f66c58
+  rspec-mocks (3.13.2) sha256=2327335def0e1665325a9b617e3af9ae20272741d80ac550336309a7c59abdef
+  rspec-support (3.13.2) sha256=cea3a2463fd9b84b9dcc9685efd80ea701aa8f7b3decb3b3ce795ed67737dbec
+  test-unit (3.6.7) sha256=c342bb9f7334ea84a361b43c20b063f405c0bf3c7dbe3ff38f61a91661d29221
+  turbo_tests (2.2.5) sha256=3fa31497d12976d11ccc298add29107b92bda94a90d8a0a5783f06f05102509f
+
+BUNDLED WITH
+   2.7.0.dev
diff --git a/tool/bundler/rubocop_gems.rb b/tool/bundler/rubocop_gems.rb
index 4d0b21060af8cb..ab13b1b2c374f8 100644
--- a/tool/bundler/rubocop_gems.rb
+++ b/tool/bundler/rubocop_gems.rb
@@ -5,6 +5,7 @@
 gem "rubocop", ">= 1.52.1", "< 2"
 
 gem "minitest"
+gem "irb"
 gem "rake"
 gem "rake-compiler"
 gem "rspec"
diff --git a/tool/bundler/rubocop_gems.rb.lock b/tool/bundler/rubocop_gems.rb.lock
new file mode 100644
index 00000000000000..e793b23cbf0f6d
--- /dev/null
+++ b/tool/bundler/rubocop_gems.rb.lock
@@ -0,0 +1,150 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    ast (2.4.3)
+    date (3.4.1)
+    date (3.4.1-java)
+    diff-lcs (1.6.1)
+    io-console (0.8.0)
+    io-console (0.8.0-java)
+    irb (1.15.1)
+      pp (>= 0.6.0)
+      rdoc (>= 4.0.0)
+      reline (>= 0.4.2)
+    jar-dependencies (0.5.5)
+    json (2.10.2)
+    json (2.10.2-java)
+    language_server-protocol (3.17.0.4)
+    lint_roller (1.1.0)
+    minitest (5.25.5)
+    parallel (1.26.3)
+    parser (3.3.7.3)
+      ast (~> 2.4.1)
+      racc
+    power_assert (2.0.5)
+    pp (0.6.2)
+      prettyprint
+    prettyprint (0.2.0)
+    prism (1.4.0)
+    psych (5.2.3)
+      date
+      stringio
+    psych (5.2.3-java)
+      date
+      jar-dependencies (>= 0.1.7)
+    racc (1.8.1)
+    racc (1.8.1-java)
+    rainbow (3.1.1)
+    rake (13.3.0)
+    rake-compiler (1.2.9)
+      rake
+    rake-compiler-dock (1.9.1)
+    rb_sys (0.9.111)
+      rake-compiler-dock (= 1.9.1)
+    rdoc (6.13.0)
+      psych (>= 4.0.0)
+    regexp_parser (2.10.0)
+    reline (0.6.0)
+      io-console (~> 0.5)
+    rspec (3.13.0)
+      rspec-core (~> 3.13.0)
+      rspec-expectations (~> 3.13.0)
+      rspec-mocks (~> 3.13.0)
+    rspec-core (3.13.3)
+      rspec-support (~> 3.13.0)
+    rspec-expectations (3.13.3)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.13.0)
+    rspec-mocks (3.13.2)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.13.0)
+    rspec-support (3.13.2)
+    rubocop (1.75.1)
+      json (~> 2.3)
+      language_server-protocol (~> 3.17.0.2)
+      lint_roller (~> 1.1.0)
+      parallel (~> 1.10)
+      parser (>= 3.3.0.2)
+      rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 2.9.3, < 3.0)
+      rubocop-ast (>= 1.43.0, < 2.0)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (>= 2.4.0, < 4.0)
+    rubocop-ast (1.43.0)
+      parser (>= 3.3.7.2)
+      prism (~> 1.4)
+    ruby-progressbar (1.13.0)
+    stringio (3.1.6)
+    test-unit (3.6.7)
+      power_assert
+    unicode-display_width (3.1.4)
+      unicode-emoji (~> 4.0, >= 4.0.4)
+    unicode-emoji (4.0.4)
+
+PLATFORMS
+  aarch64-darwin
+  aarch64-linux
+  arm64-darwin
+  ruby
+  universal-java
+  x64-mingw-ucrt
+  x86_64-darwin
+  x86_64-linux
+
+DEPENDENCIES
+  irb
+  minitest
+  rake
+  rake-compiler
+  rb_sys
+  rspec
+  rubocop (>= 1.52.1, < 2)
+  test-unit
+
+CHECKSUMS
+  ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383
+  date (3.4.1) sha256=bf268e14ef7158009bfeaec40b5fa3c7271906e88b196d958a89d4b408abe64f
+  date (3.4.1-java) sha256=74740d914c65a922a15657c25ff0e203c16f1d0f7aa910a9ebed712afe9819c4
+  diff-lcs (1.6.1) sha256=12a5a83f3e37a8e2f4427268e305914d5f1879f22b4e73bb1a09f76a3dd86cd4
+  io-console (0.8.0) sha256=cd6a9facbc69871d69b2cb8b926fc6ea7ef06f06e505e81a64f14a470fddefa2
+  io-console (0.8.0-java) sha256=3cc6fd5c66e587145c1fdf8dc40c2e3d851e90722a5d0cc3f38da352f06fe1bd
+  irb (1.15.1) sha256=d9bca745ac4207a8b728a52b98b766ca909b86ff1a504bcde3d6f8c84faae890
+  jar-dependencies (0.5.5) sha256=2972b9fcba4b014e6446a84b5c09674a3e8648b95b71768e729f0e8e40568059
+  json (2.10.2) sha256=34e0eada93022b2a0a3345bb0b5efddb6e9ff5be7c48e409cfb54ff8a36a8b06
+  json (2.10.2-java) sha256=fe31faac61ea21ea1448c35450183f84e85c2b94cc6522c241959ba9d1362006
+  language_server-protocol (3.17.0.4) sha256=c484626478664fd13482d8180947c50a8590484b1258b99b7aedb3b69df89669
+  lint_roller (1.1.0) sha256=2c0c845b632a7d172cb849cc90c1bce937a28c5c8ccccb50dfd46a485003cc87
+  minitest (5.25.5) sha256=391b6c6cb43a4802bfb7c93af1ebe2ac66a210293f4a3fb7db36f2fc7dc2c756
+  parallel (1.26.3) sha256=d86babb7a2b814be9f4b81587bf0b6ce2da7d45969fab24d8ae4bf2bb4d4c7ef
+  parser (3.3.7.3) sha256=5803acc132cf1155fac2656bf02d3fb9223dccd66f1aa538dac095b785fa4d64
+  power_assert (2.0.5) sha256=63b511b85bb8ea57336d25156864498644f5bbf028699ceda27949e0125bc323
+  pp (0.6.2) sha256=947ec3120c6f92195f8ee8aa25a7b2c5297bb106d83b41baa02983686577b6ff
+  prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193
+  prism (1.4.0) sha256=dc0e3e00e93160213dc2a65519d9002a4a1e7b962db57d444cf1a71565bb703e
+  psych (5.2.3) sha256=84a54bb952d14604fea22d99938348814678782f58b12648fcdfa4d2fce859ee
+  psych (5.2.3-java) sha256=3e5425b9e8a2f41cc2707d5ef14fdc1ae908abbafb12fe45727bd63900056585
+  racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f
+  racc (1.8.1-java) sha256=54f2e6d1e1b91c154013277d986f52a90e5ececbe91465d29172e49342732b98
+  rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a
+  rake (13.3.0) sha256=96f5092d786ff412c62fde76f793cc0541bd84d2eb579caa529aa8a059934493
+  rake-compiler (1.2.9) sha256=5a3213a5dda977dfdf73e28beed6f4cd6a2cc86ac640bb662728eb7049a23607
+  rake-compiler-dock (1.9.1) sha256=e73720a29aba9c114728ce39cc0d8eef69ba61d88e7978c57bac171724cd4d53
+  rb_sys (0.9.111) sha256=65822fd8d57c248cd893db0efe01bc6edc15fcbea3ba6666091e35430c1cbaf0
+  rdoc (6.13.0) sha256=32c2139ae43ed91b7c43032fe5423d21d57718829cc5a11e5c9710d2aa5e0329
+  regexp_parser (2.10.0) sha256=cb6f0ddde88772cd64bff1dbbf68df66d376043fe2e66a9ef77fcb1b0c548c61
+  reline (0.6.0) sha256=57620375dcbe56ec09bac7192bfb7460c716bbf0054dc94345ecaa5438e539d2
+  rspec (3.13.0) sha256=d490914ac1d5a5a64a0e1400c1d54ddd2a501324d703b8cfe83f458337bab993
+  rspec-core (3.13.3) sha256=25136507f4f9cf2e8977a2851e64e438b4331646054e345998714108745cdfe4
+  rspec-expectations (3.13.3) sha256=0e6b5af59b900147698ea0ff80456c4f2e69cac4394fbd392fbd1ca561f66c58
+  rspec-mocks (3.13.2) sha256=2327335def0e1665325a9b617e3af9ae20272741d80ac550336309a7c59abdef
+  rspec-support (3.13.2) sha256=cea3a2463fd9b84b9dcc9685efd80ea701aa8f7b3decb3b3ce795ed67737dbec
+  rubocop (1.75.1) sha256=c12900c55b0b52e6ed1384f7f7575beb92047019ce37ca14b9572d80239adc29
+  rubocop-ast (1.43.0) sha256=92cd649e336ce10212cb2f2b29028f487777ecc477f108f437a1dce1ee3db79a
+  ruby-progressbar (1.13.0) sha256=80fc9c47a9b640d6834e0dc7b3c94c9df37f08cb072b7761e4a71e22cff29b33
+  stringio (3.1.6) sha256=292c495d1657adfcdf0a32eecf12a60e6691317a500c3112ad3b2e31068274f5
+  test-unit (3.6.7) sha256=c342bb9f7334ea84a361b43c20b063f405c0bf3c7dbe3ff38f61a91661d29221
+  unicode-display_width (3.1.4) sha256=8caf2af1c0f2f07ec89ef9e18c7d88c2790e217c482bfc78aaa65eadd5415ac1
+  unicode-emoji (4.0.4) sha256=2c2c4ef7f353e5809497126285a50b23056cc6e61b64433764a35eff6c36532a
+
+BUNDLED WITH
+   2.7.0.dev
diff --git a/tool/bundler/standard_gems.rb b/tool/bundler/standard_gems.rb
index 20c1ecd827720d..fab93e6d6d8938 100644
--- a/tool/bundler/standard_gems.rb
+++ b/tool/bundler/standard_gems.rb
@@ -5,6 +5,7 @@
 gem "standard", "~> 1.0"
 
 gem "minitest"
+gem "irb"
 gem "rake"
 gem "rake-compiler"
 gem "rspec"
diff --git a/tool/bundler/standard_gems.rb.lock b/tool/bundler/standard_gems.rb.lock
new file mode 100644
index 00000000000000..3ec7b9376967ac
--- /dev/null
+++ b/tool/bundler/standard_gems.rb.lock
@@ -0,0 +1,170 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    ast (2.4.3)
+    date (3.4.1)
+    date (3.4.1-java)
+    diff-lcs (1.6.1)
+    io-console (0.8.0)
+    io-console (0.8.0-java)
+    irb (1.15.1)
+      pp (>= 0.6.0)
+      rdoc (>= 4.0.0)
+      reline (>= 0.4.2)
+    jar-dependencies (0.5.5)
+    json (2.10.2)
+    json (2.10.2-java)
+    language_server-protocol (3.17.0.4)
+    lint_roller (1.1.0)
+    minitest (5.25.5)
+    parallel (1.26.3)
+    parser (3.3.7.3)
+      ast (~> 2.4.1)
+      racc
+    power_assert (2.0.5)
+    pp (0.6.2)
+      prettyprint
+    prettyprint (0.2.0)
+    prism (1.4.0)
+    psych (5.2.3)
+      date
+      stringio
+    psych (5.2.3-java)
+      date
+      jar-dependencies (>= 0.1.7)
+    racc (1.8.1)
+    racc (1.8.1-java)
+    rainbow (3.1.1)
+    rake (13.3.0)
+    rake-compiler (1.2.9)
+      rake
+    rake-compiler-dock (1.9.1)
+    rb_sys (0.9.111)
+      rake-compiler-dock (= 1.9.1)
+    rdoc (6.13.0)
+      psych (>= 4.0.0)
+    regexp_parser (2.10.0)
+    reline (0.6.0)
+      io-console (~> 0.5)
+    rspec (3.13.0)
+      rspec-core (~> 3.13.0)
+      rspec-expectations (~> 3.13.0)
+      rspec-mocks (~> 3.13.0)
+    rspec-core (3.13.3)
+      rspec-support (~> 3.13.0)
+    rspec-expectations (3.13.3)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.13.0)
+    rspec-mocks (3.13.2)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.13.0)
+    rspec-support (3.13.2)
+    rubocop (1.73.2)
+      json (~> 2.3)
+      language_server-protocol (~> 3.17.0.2)
+      lint_roller (~> 1.1.0)
+      parallel (~> 1.10)
+      parser (>= 3.3.0.2)
+      rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 2.9.3, < 3.0)
+      rubocop-ast (>= 1.38.0, < 2.0)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (>= 2.4.0, < 4.0)
+    rubocop-ast (1.43.0)
+      parser (>= 3.3.7.2)
+      prism (~> 1.4)
+    rubocop-performance (1.24.0)
+      lint_roller (~> 1.1)
+      rubocop (>= 1.72.1, < 2.0)
+      rubocop-ast (>= 1.38.0, < 2.0)
+    ruby-progressbar (1.13.0)
+    standard (1.47.0)
+      language_server-protocol (~> 3.17.0.2)
+      lint_roller (~> 1.0)
+      rubocop (~> 1.73.0)
+      standard-custom (~> 1.0.0)
+      standard-performance (~> 1.7)
+    standard-custom (1.0.2)
+      lint_roller (~> 1.0)
+      rubocop (~> 1.50)
+    standard-performance (1.7.0)
+      lint_roller (~> 1.1)
+      rubocop-performance (~> 1.24.0)
+    stringio (3.1.6)
+    test-unit (3.6.7)
+      power_assert
+    unicode-display_width (3.1.4)
+      unicode-emoji (~> 4.0, >= 4.0.4)
+    unicode-emoji (4.0.4)
+
+PLATFORMS
+  aarch64-darwin
+  aarch64-linux
+  arm64-darwin
+  ruby
+  universal-java
+  x64-mingw-ucrt
+  x86_64-darwin
+  x86_64-linux
+
+DEPENDENCIES
+  irb
+  minitest
+  rake
+  rake-compiler
+  rb_sys
+  rspec
+  standard (~> 1.0)
+  test-unit
+
+CHECKSUMS
+  ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383
+  date (3.4.1) sha256=bf268e14ef7158009bfeaec40b5fa3c7271906e88b196d958a89d4b408abe64f
+  date (3.4.1-java) sha256=74740d914c65a922a15657c25ff0e203c16f1d0f7aa910a9ebed712afe9819c4
+  diff-lcs (1.6.1) sha256=12a5a83f3e37a8e2f4427268e305914d5f1879f22b4e73bb1a09f76a3dd86cd4
+  io-console (0.8.0) sha256=cd6a9facbc69871d69b2cb8b926fc6ea7ef06f06e505e81a64f14a470fddefa2
+  io-console (0.8.0-java) sha256=3cc6fd5c66e587145c1fdf8dc40c2e3d851e90722a5d0cc3f38da352f06fe1bd
+  irb (1.15.1) sha256=d9bca745ac4207a8b728a52b98b766ca909b86ff1a504bcde3d6f8c84faae890
+  jar-dependencies (0.5.5) sha256=2972b9fcba4b014e6446a84b5c09674a3e8648b95b71768e729f0e8e40568059
+  json (2.10.2) sha256=34e0eada93022b2a0a3345bb0b5efddb6e9ff5be7c48e409cfb54ff8a36a8b06
+  json (2.10.2-java) sha256=fe31faac61ea21ea1448c35450183f84e85c2b94cc6522c241959ba9d1362006
+  language_server-protocol (3.17.0.4) sha256=c484626478664fd13482d8180947c50a8590484b1258b99b7aedb3b69df89669
+  lint_roller (1.1.0) sha256=2c0c845b632a7d172cb849cc90c1bce937a28c5c8ccccb50dfd46a485003cc87
+  minitest (5.25.5) sha256=391b6c6cb43a4802bfb7c93af1ebe2ac66a210293f4a3fb7db36f2fc7dc2c756
+  parallel (1.26.3) sha256=d86babb7a2b814be9f4b81587bf0b6ce2da7d45969fab24d8ae4bf2bb4d4c7ef
+  parser (3.3.7.3) sha256=5803acc132cf1155fac2656bf02d3fb9223dccd66f1aa538dac095b785fa4d64
+  power_assert (2.0.5) sha256=63b511b85bb8ea57336d25156864498644f5bbf028699ceda27949e0125bc323
+  pp (0.6.2) sha256=947ec3120c6f92195f8ee8aa25a7b2c5297bb106d83b41baa02983686577b6ff
+  prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193
+  prism (1.4.0) sha256=dc0e3e00e93160213dc2a65519d9002a4a1e7b962db57d444cf1a71565bb703e
+  psych (5.2.3) sha256=84a54bb952d14604fea22d99938348814678782f58b12648fcdfa4d2fce859ee
+  psych (5.2.3-java) sha256=3e5425b9e8a2f41cc2707d5ef14fdc1ae908abbafb12fe45727bd63900056585
+  racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f
+  racc (1.8.1-java) sha256=54f2e6d1e1b91c154013277d986f52a90e5ececbe91465d29172e49342732b98
+  rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a
+  rake (13.3.0) sha256=96f5092d786ff412c62fde76f793cc0541bd84d2eb579caa529aa8a059934493
+  rake-compiler (1.2.9) sha256=5a3213a5dda977dfdf73e28beed6f4cd6a2cc86ac640bb662728eb7049a23607
+  rake-compiler-dock (1.9.1) sha256=e73720a29aba9c114728ce39cc0d8eef69ba61d88e7978c57bac171724cd4d53
+  rb_sys (0.9.111) sha256=65822fd8d57c248cd893db0efe01bc6edc15fcbea3ba6666091e35430c1cbaf0
+  rdoc (6.13.0) sha256=32c2139ae43ed91b7c43032fe5423d21d57718829cc5a11e5c9710d2aa5e0329
+  regexp_parser (2.10.0) sha256=cb6f0ddde88772cd64bff1dbbf68df66d376043fe2e66a9ef77fcb1b0c548c61
+  reline (0.6.0) sha256=57620375dcbe56ec09bac7192bfb7460c716bbf0054dc94345ecaa5438e539d2
+  rspec (3.13.0) sha256=d490914ac1d5a5a64a0e1400c1d54ddd2a501324d703b8cfe83f458337bab993
+  rspec-core (3.13.3) sha256=25136507f4f9cf2e8977a2851e64e438b4331646054e345998714108745cdfe4
+  rspec-expectations (3.13.3) sha256=0e6b5af59b900147698ea0ff80456c4f2e69cac4394fbd392fbd1ca561f66c58
+  rspec-mocks (3.13.2) sha256=2327335def0e1665325a9b617e3af9ae20272741d80ac550336309a7c59abdef
+  rspec-support (3.13.2) sha256=cea3a2463fd9b84b9dcc9685efd80ea701aa8f7b3decb3b3ce795ed67737dbec
+  rubocop (1.73.2) sha256=35cd1b1365ba97234323fe771abcecd09c9b77098464cd726c76aa7d9bc12b5d
+  rubocop-ast (1.43.0) sha256=92cd649e336ce10212cb2f2b29028f487777ecc477f108f437a1dce1ee3db79a
+  rubocop-performance (1.24.0) sha256=e5bd39ff3e368395b9af886927cc37f5892f43db4bd6c8526594352d5b4440b5
+  ruby-progressbar (1.13.0) sha256=80fc9c47a9b640d6834e0dc7b3c94c9df37f08cb072b7761e4a71e22cff29b33
+  standard (1.47.0) sha256=b0da6b71d8dec53e760c7216b723e3507ebdcd6962f7ce7c37c016a36c7cc190
+  standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b
+  standard-performance (1.7.0) sha256=c46a9aef3348c0cfc03053ed9a1c1f73b967f7e4edcdf30dac0101b143897314
+  stringio (3.1.6) sha256=292c495d1657adfcdf0a32eecf12a60e6691317a500c3112ad3b2e31068274f5
+  test-unit (3.6.7) sha256=c342bb9f7334ea84a361b43c20b063f405c0bf3c7dbe3ff38f61a91661d29221
+  unicode-display_width (3.1.4) sha256=8caf2af1c0f2f07ec89ef9e18c7d88c2790e217c482bfc78aaa65eadd5415ac1
+  unicode-emoji (4.0.4) sha256=2c2c4ef7f353e5809497126285a50b23056cc6e61b64433764a35eff6c36532a
+
+BUNDLED WITH
+   2.7.0.dev
diff --git a/tool/bundler/test_gems.rb b/tool/bundler/test_gems.rb
index 6de392132a6f70..28113cd299d4f0 100644
--- a/tool/bundler/test_gems.rb
+++ b/tool/bundler/test_gems.rb
@@ -2,13 +2,17 @@
 
 source "https://rubygems.org"
 
-gem "rack", "2.0.8"
-gem "webrick", "1.7.0"
-gem "rack-test", "~> 1.1"
-gem "compact_index", "~> 0.13.0"
-gem "sinatra", "~> 2.0"
-# for Ruby 2.6. bundler/spec/install/gemfile/sources_spec.rb is failed with sinatra-2.0.8.1 and tilt-2.2.0.
-gem "tilt", "~> 2.0.11"
-gem "rake", "13.0.1"
+gem "rack", "~> 3.1"
+gem "rack-test", "~> 2.1"
+gem "compact_index", "~> 0.15.0"
+gem "sinatra", "~> 4.1"
+gem "rake", "~> 13.1"
 gem "builder", "~> 3.2"
 gem "rb_sys"
+gem "fiddle"
+gem "rubygems-generate_index", "~> 1.1"
+gem "ruby-graphviz"
+gem "psych"
+gem "etc", platforms: [:ruby, :windows]
+gem "open3"
+gem "shellwords"
diff --git a/tool/bundler/test_gems.rb.lock b/tool/bundler/test_gems.rb.lock
new file mode 100644
index 00000000000000..cbc682cd5c45e0
--- /dev/null
+++ b/tool/bundler/test_gems.rb.lock
@@ -0,0 +1,108 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    base64 (0.2.0)
+    builder (3.3.0)
+    compact_index (0.15.0)
+    date (3.4.1)
+    date (3.4.1-java)
+    etc (1.4.5)
+    fiddle (1.1.6)
+    jar-dependencies (0.5.5)
+    logger (1.7.0)
+    mustermann (3.0.3)
+      ruby2_keywords (~> 0.0.1)
+    open3 (0.2.1)
+    psych (5.2.3)
+      date
+      stringio
+    psych (5.2.3-java)
+      date
+      jar-dependencies (>= 0.1.7)
+    rack (3.1.15)
+    rack-protection (4.1.1)
+      base64 (>= 0.1.0)
+      logger (>= 1.6.0)
+      rack (>= 3.0.0, < 4)
+    rack-session (2.1.0)
+      base64 (>= 0.1.0)
+      rack (>= 3.0.0)
+    rack-test (2.2.0)
+      rack (>= 1.3)
+    rake (13.3.0)
+    rake-compiler-dock (1.9.1)
+    rb_sys (0.9.111)
+      rake-compiler-dock (= 1.9.1)
+    rexml (3.4.1)
+    ruby-graphviz (1.2.5)
+      rexml
+    ruby2_keywords (0.0.5)
+    rubygems-generate_index (1.1.3)
+      compact_index (~> 0.15.0)
+    shellwords (0.2.2)
+    sinatra (4.1.1)
+      logger (>= 1.6.0)
+      mustermann (~> 3.0)
+      rack (>= 3.0.0, < 4)
+      rack-protection (= 4.1.1)
+      rack-session (>= 2.0.0, < 3)
+      tilt (~> 2.0)
+    stringio (3.1.6)
+    tilt (2.6.0)
+
+PLATFORMS
+  java
+  ruby
+  universal-java
+  x64-mingw-ucrt
+  x86_64-darwin
+  x86_64-linux
+
+DEPENDENCIES
+  builder (~> 3.2)
+  compact_index (~> 0.15.0)
+  etc
+  fiddle
+  open3
+  psych
+  rack (~> 3.1)
+  rack-test (~> 2.1)
+  rake (~> 13.1)
+  rb_sys
+  ruby-graphviz
+  rubygems-generate_index (~> 1.1)
+  shellwords
+  sinatra (~> 4.1)
+
+CHECKSUMS
+  base64 (0.2.0) sha256=0f25e9b21a02a0cc0cea8ef92b2041035d39350946e8789c562b2d1a3da01507
+  builder (3.3.0) sha256=497918d2f9dca528fdca4b88d84e4ef4387256d984b8154e9d5d3fe5a9c8835f
+  compact_index (0.15.0) sha256=5c6c404afca8928a7d9f4dde9524f6e1610db17e675330803055db282da84a8b
+  date (3.4.1) sha256=bf268e14ef7158009bfeaec40b5fa3c7271906e88b196d958a89d4b408abe64f
+  date (3.4.1-java) sha256=74740d914c65a922a15657c25ff0e203c16f1d0f7aa910a9ebed712afe9819c4
+  etc (1.4.5) sha256=0d854e7b97a40390b048ba51230c30886931931b9dba955e85985d7d3bccf26c
+  fiddle (1.1.6) sha256=79e8d909e602d979434cf9fccfa6e729cb16432bb00e39c7596abe6bee1249ab
+  jar-dependencies (0.5.5) sha256=2972b9fcba4b014e6446a84b5c09674a3e8648b95b71768e729f0e8e40568059
+  logger (1.7.0) sha256=196edec7cc44b66cfb40f9755ce11b392f21f7967696af15d274dde7edff0203
+  mustermann (3.0.3) sha256=d1f8e9ba2ddaed47150ddf81f6a7ea046826b64c672fbc92d83bce6b70657e88
+  open3 (0.2.1) sha256=8e2d7d2113526351201438c1aa35c8139f0141c9e8913baa007c898973bf3952
+  psych (5.2.3) sha256=84a54bb952d14604fea22d99938348814678782f58b12648fcdfa4d2fce859ee
+  psych (5.2.3-java) sha256=3e5425b9e8a2f41cc2707d5ef14fdc1ae908abbafb12fe45727bd63900056585
+  rack (3.1.15) sha256=d12b3e9960d18a26ded961250f2c0e3b375b49ff40dbe6786e9c3b160cbffca4
+  rack-protection (4.1.1) sha256=51a254a5d574a7f0ca4f0672025ce2a5ef7c8c3bd09c431349d683e825d7d16a
+  rack-session (2.1.0) sha256=437c3916535b58ef71c816ce4a2dee0a01c8a52ae6077dc2b6cd19085760a290
+  rack-test (2.2.0) sha256=005a36692c306ac0b4a9350355ee080fd09ddef1148a5f8b2ac636c720f5c463
+  rake (13.3.0) sha256=96f5092d786ff412c62fde76f793cc0541bd84d2eb579caa529aa8a059934493
+  rake-compiler-dock (1.9.1) sha256=e73720a29aba9c114728ce39cc0d8eef69ba61d88e7978c57bac171724cd4d53
+  rb_sys (0.9.111) sha256=65822fd8d57c248cd893db0efe01bc6edc15fcbea3ba6666091e35430c1cbaf0
+  rexml (3.4.1) sha256=c74527a9a0a04b4ec31dbe0dc4ed6004b960af943d8db42e539edde3a871abca
+  ruby-graphviz (1.2.5) sha256=1c2bb44e3f6da9e2b829f5e7fd8d75a521485fb6b4d1fc66ff0f93f906121504
+  ruby2_keywords (0.0.5) sha256=ffd13740c573b7301cf7a2e61fc857b2a8e3d3aff32545d6f8300d8bae10e3ef
+  rubygems-generate_index (1.1.3) sha256=3571424322666598e9586a906485e1543b617f87644913eaf137d986a3393f5c
+  shellwords (0.2.2) sha256=b8695a791de2f71472de5abdc3f4332f6535a4177f55d8f99e7e44266cd32f94
+  sinatra (4.1.1) sha256=4e997b859aa1b5d2e624f85d5b0fd0f0b3abc0da44daa6cbdf10f7c0da9f4d00
+  stringio (3.1.6) sha256=292c495d1657adfcdf0a32eecf12a60e6691317a500c3112ad3b2e31068274f5
+  tilt (2.6.0) sha256=263d748466e0d83e510aa1a2e2281eff547937f0ef06be33d3632721e255f76b
+
+BUNDLED WITH
+   2.7.0.dev
diff --git a/tool/bundler/vendor_gems.rb b/tool/bundler/vendor_gems.rb
new file mode 100644
index 00000000000000..71a7fbf4b0f7cc
--- /dev/null
+++ b/tool/bundler/vendor_gems.rb
@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+source "https://rubygems.org"
+
+gem "fileutils", "1.7.3"
+gem "molinillo", github: "cocoapods/molinillo"
+gem "net-http", github: "ruby/net-http", ref: "d8fd39c589279b1aaec85a7c8de9b3e199c72efe"
+gem "net-http-persistent", github: "hsbt/net-http-persistent", ref: "9b6fbd733cf35596dfe7f80c0c154f9f3d17dbdb"
+gem "net-protocol", "0.2.2"
+gem "optparse", "0.6.0"
+gem "pub_grub", github: "jhawthorn/pub_grub", ref: "df6add45d1b4d122daff2f959c9bd1ca93d14261"
+gem "resolv", "0.6.2"
+gem "securerandom", "0.4.1"
+gem "timeout", "0.4.3"
+gem "thor", "1.3.2"
+gem "tsort", "0.2.0"
+gem "uri", "1.0.3"
diff --git a/tool/bundler/vendor_gems.rb.lock b/tool/bundler/vendor_gems.rb.lock
new file mode 100644
index 00000000000000..dd005ee791ffcd
--- /dev/null
+++ b/tool/bundler/vendor_gems.rb.lock
@@ -0,0 +1,85 @@
+GIT
+  remote: https://github.com/cocoapods/molinillo.git
+  revision: 1d62d7d5f448e79418716dc779a4909509ccda2a
+  specs:
+    molinillo (0.8.0)
+
+GIT
+  remote: https://github.com/hsbt/net-http-persistent.git
+  revision: 9b6fbd733cf35596dfe7f80c0c154f9f3d17dbdb
+  ref: 9b6fbd733cf35596dfe7f80c0c154f9f3d17dbdb
+  specs:
+    net-http-persistent (4.0.6)
+      connection_pool (~> 2.2, >= 2.2.4)
+
+GIT
+  remote: https://github.com/jhawthorn/pub_grub.git
+  revision: df6add45d1b4d122daff2f959c9bd1ca93d14261
+  ref: df6add45d1b4d122daff2f959c9bd1ca93d14261
+  specs:
+    pub_grub (0.5.0)
+
+GIT
+  remote: https://github.com/ruby/net-http.git
+  revision: d8fd39c589279b1aaec85a7c8de9b3e199c72efe
+  ref: d8fd39c589279b1aaec85a7c8de9b3e199c72efe
+  specs:
+    net-http (0.6.0)
+      uri
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    connection_pool (2.4.1)
+    fileutils (1.7.3)
+    net-protocol (0.2.2)
+      timeout
+    optparse (0.6.0)
+    resolv (0.6.2)
+    securerandom (0.4.1)
+    thor (1.3.2)
+    timeout (0.4.3)
+    tsort (0.2.0)
+    uri (1.0.3)
+
+PLATFORMS
+  java
+  ruby
+  universal-java
+  x64-mingw-ucrt
+  x86_64-darwin
+  x86_64-linux
+
+DEPENDENCIES
+  fileutils (= 1.7.3)
+  molinillo!
+  net-http!
+  net-http-persistent!
+  net-protocol (= 0.2.2)
+  optparse (= 0.6.0)
+  pub_grub!
+  resolv (= 0.6.2)
+  securerandom (= 0.4.1)
+  thor (= 1.3.2)
+  timeout (= 0.4.3)
+  tsort (= 0.2.0)
+  uri (= 1.0.3)
+
+CHECKSUMS
+  connection_pool (2.4.1) sha256=0f40cf997091f1f04ff66da67eabd61a9fe0d4928b9a3645228532512fab62f4
+  fileutils (1.7.3) sha256=57271e854b694a87755d76f836f5c57b2c9538ebbaf4b2154bb66addf15eb5da
+  molinillo (0.8.0)
+  net-http (0.6.0)
+  net-http-persistent (4.0.6)
+  net-protocol (0.2.2) sha256=aa73e0cba6a125369de9837b8d8ef82a61849360eba0521900e2c3713aa162a8
+  optparse (0.6.0) sha256=25e90469c1cd44048a89dc01c1dde9d5f0bdf717851055fb18237780779b068c
+  pub_grub (0.5.0)
+  resolv (0.6.2) sha256=61efe545cedddeb1b14f77e51f85c85ca66af5098fdbf567fadf32c34590fb14
+  securerandom (0.4.1) sha256=cc5193d414a4341b6e225f0cb4446aceca8e50d5e1888743fac16987638ea0b1
+  thor (1.3.2) sha256=eef0293b9e24158ccad7ab383ae83534b7ad4ed99c09f96f1a6b036550abbeda
+  timeout (0.4.3) sha256=9509f079b2b55fe4236d79633bd75e34c1c1e7e3fb4b56cb5fda61f80a0fe30e
+  tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f
+  uri (1.0.3) sha256=e9f2244608eea2f7bc357d954c65c910ce0399ca5e18a7a29207ac22d8767011
+
+BUNDLED WITH
+   2.7.0.dev
diff --git a/tool/ci_functions.sh b/tool/ci_functions.sh
deleted file mode 100644
index 7066bbe4ecf1ba..00000000000000
--- a/tool/ci_functions.sh
+++ /dev/null
@@ -1,29 +0,0 @@
-# -*- BASH -*-
-# Manage functions used on a CI.
-# Run `. tool/ci_functions.sh` to use it.
-
-# Create options with patterns `-n !/name1/ -n !/name2/ ..` to exclude the test
-# method names by the method names `name1 name2 ..`.
-# See `ruby tool/test/runner.rb --help` `-n` option.
-function ci_to_excluded_test_opts {
-  local tests_str="${1}"
-  # Use the backward matching `!/name$/`, as the perfect matching doesn't work.
-  # https://bugs.ruby-lang.org/issues/16936
-  ruby <<EOF
-    opts = "${tests_str}".split.map { |test| "-n \!/#{test}\$$/" }
-    puts opts.join(' ')
-EOF
-  return 0
-}
-
-# Create options with patterns `-n name1 -n name2 ..` to include the test
-# method names by the method names `name1 name2 ..`.
-# See `ruby tool/test/runner.rb --help` `-n` option.
-function ci_to_included_test_opts {
-  local tests_str="${1}"
-  ruby <<EOF
-    opts = "${tests_str}".split.map { |test| "-n #{test}" }
-    puts opts.join(' ')
-EOF
-  return 0
-}
diff --git a/tool/darwin-cc b/tool/darwin-cc
index 6eee96e4359130..42637022a4e40f 100755
--- a/tool/darwin-cc
+++ b/tool/darwin-cc
@@ -2,5 +2,8 @@
 exec 2> >(exec grep -v \
   -e '^ld: warning: The [a-z0-9_][a-z0-9_]* architecture is deprecated for macOS' \
   -e '^ld: warning: text-based stub file /System/Library/Frameworks/' \
+  -e '^ld: warning: ignoring duplicate libraries:' \
+  -e "warning: '\.debug_macinfo' is not currently supported:" \
+  -e "note: while processing" \
   >&2)
 exec "$@"
diff --git a/tool/downloader.rb b/tool/downloader.rb
index 2398fd7b046ecd..14f18747f3849e 100644
--- a/tool/downloader.rb
+++ b/tool/downloader.rb
@@ -1,39 +1,12 @@
 # Used by configure and make to download or update mirrored Ruby and GCC
-# files. This will use HTTPS if possible, falling back to HTTP.
+# files.
+
+# -*- frozen-string-literal: true -*-
 
 require 'fileutils'
 require 'open-uri'
 require 'pathname'
-begin
-  require 'net/https'
-rescue LoadError
-  https = 'http'
-else
-  https = 'https'
-
-  # open-uri of ruby 2.2.0 accepts an array of PEMs as ssl_ca_cert, but old
-  # versions do not.  so, patching OpenSSL::X509::Store#add_file instead.
-  class OpenSSL::X509::Store
-    alias orig_add_file add_file
-    def add_file(pems)
-      Array(pems).each do |pem|
-        if File.directory?(pem)
-          add_path pem
-        else
-          orig_add_file pem
-        end
-      end
-    end
-  end
-  # since open-uri internally checks ssl_ca_cert using File.directory?,
-  # allow to accept an array.
-  class <<File
-    alias orig_directory? directory?
-    def File.directory? files
-      files.is_a?(Array) ? false : orig_directory?(files)
-    end
-  end
-end
+require 'net/https'
 
 class Downloader
   def self.find(dlname)
@@ -42,44 +15,37 @@ def self.find(dlname)
     end
   end
 
-  def self.https=(https)
-    @@https = https
-  end
-
-  def self.https?
-    @@https == 'https'
-  end
-
-  def self.https
-    @@https
-  end
-
   def self.get_option(argv, options)
     false
   end
 
   class GNU < self
-    def self.download(name, *rest)
-      if https?
-        begin
-          super("https://cdn.jsdelivr.net/gh/gcc-mirror/gcc@master/#{name}", name, *rest)
-        rescue => e
-          m1, m2 = e.message.split("\n", 2)
-          STDERR.puts "Download failed (#{m1}), try another URL\n#{m2}"
-          super("https://raw.githubusercontent.com/gcc-mirror/gcc/master/#{name}", name, *rest)
-        end
+    Mirrors = %w[
+      https://raw.githubusercontent.com/autotools-mirror/autoconf/refs/heads/master/build-aux/
+      https://cdn.jsdelivr.net/gh/gcc-mirror/gcc@master
+    ]
+
+    def self.download(name, *rest, **options)
+      Mirrors.each_with_index do |url, i|
+        super("#{url}/#{name}", name, *rest, **options)
+      rescue => e
+        raise if i + 1 == Mirrors.size # no more URLs
+        m1, m2 = e.message.split("\n", 2)
+        STDERR.puts "Download failed (#{m1}), try another URL\n#{m2}"
       else
-        super("https://repo.or.cz/official-gcc.git/blob_plain/HEAD:/#{name}", name, *rest)
+        return
       end
     end
   end
 
   class RubyGems < self
-    def self.download(name, dir = nil, since = true, options = {})
+    def self.download(name, dir = nil, since = true, **options)
       require 'rubygems'
-      options = options.dup
       options[:ssl_ca_cert] = Dir.glob(File.expand_path("../lib/rubygems/ssl_certs/**/*.pem", File.dirname(__FILE__)))
-      super("https://rubygems.org/downloads/#{name}", name, dir, since, options)
+      if Gem::Version.new(name[/-\K[^-]*(?=\.gem\z)/]).prerelease?
+        options[:ignore_http_client_errors] = true
+      end
+      super("https://rubygems.org/downloads/#{name}", name, dir, since, **options)
     end
   end
 
@@ -104,16 +70,13 @@ def self.get_option(argv, options)
       end
     end
 
-    def self.download(name, dir = nil, since = true, options = {})
-      options = options.dup
-      unicode_beta = options.delete(:unicode_beta)
+    def self.download(name, dir = nil, since = true, unicode_beta: nil, **options)
       name_dir_part = name.sub(/[^\/]+$/, '')
       if unicode_beta == 'YES'
         if INDEX.size == 0
-          index_options = options.dup
-          index_options[:cache_save] = false # TODO: make sure caching really doesn't work for index file
+          cache_save = false # TODO: make sure caching really doesn't work for index file
           index_data = File.read(under(dir, "index.html")) rescue nil
-          index_file = super(UNICODE_PUBLIC+name_dir_part, "#{name_dir_part}index.html", dir, true, index_options)
+          index_file = super(UNICODE_PUBLIC+name_dir_part, "#{name_dir_part}index.html", dir, true, cache_save: cache_save, **options)
           INDEX[:index] = File.read(index_file)
           since = true unless INDEX[:index] == index_data
         end
@@ -122,7 +85,7 @@ def self.download(name, dir = nil, since = true, options = {})
         beta_name = INDEX[:index][/#{Regexp.quote(file_base)}(-[0-9.]+d\d+)?\.txt/]
         # make sure we always check for new versions of files,
         # because they can easily change in the beta period
-        super(UNICODE_PUBLIC+name_dir_part+beta_name, name, dir, since, options)
+        super(UNICODE_PUBLIC+name_dir_part+beta_name, name, dir, since, **options)
       else
         index_file = Pathname.new(under(dir, name_dir_part+'index.html'))
         if index_file.exist? and name_dir_part !~ /^(12\.1\.0|emoji\/12\.0)/
@@ -130,7 +93,7 @@ def self.download(name, dir = nil, since = true, options = {})
                 "Remove all files in this directory and in .downloaded-cache/ " +
                 "because they may be leftovers from the beta period."
         end
-        super(UNICODE_PUBLIC+name, name, dir, since, options)
+        super(UNICODE_PUBLIC+name, name, dir, since, **options)
       end
     end
   end
@@ -195,64 +158,53 @@ def self.httpdate(date)
   # Example usage:
   #   download 'http://www.unicode.org/Public/UCD/latest/ucd/UnicodeData.txt',
   #            'UnicodeData.txt', 'enc/unicode/data'
-  def self.download(url, name, dir = nil, since = true, options = {})
-    options = options.dup
+  def self.download(url, name, dir = nil, since = true,
+                    cache_save: ENV["CACHE_SAVE"] != "no", cache_dir: nil,
+                    ignore_http_client_errors: nil,
+                    dryrun: nil, verbose: false, **options)
     url = URI(url)
-    dryrun = options.delete(:dryrun)
-
     if name
       file = Pathname.new(under(dir, name))
     else
       name = File.basename(url.path)
     end
-    cache_save = options.delete(:cache_save) {
-      ENV["CACHE_SAVE"] != "no"
-    }
-    cache = cache_file(url, name, options.delete(:cache_dir))
+    cache = cache_file(url, name, cache_dir)
     file ||= cache
     if since.nil? and file.exist?
-      if $VERBOSE
+      if verbose
         $stdout.puts "#{file} already exists"
         $stdout.flush
       end
-      if cache_save
-        save_cache(cache, file, name)
-      end
       return file.to_path
     end
     if dryrun
       puts "Download #{url} into #{file}"
       return
     end
-    if link_cache(cache, file, name, $VERBOSE)
+    if link_cache(cache, file, name, verbose: verbose)
       return file.to_path
     end
-    if !https? and URI::HTTPS === url
-      warn "*** using http instead of https ***"
-      url.scheme = 'http'
-      url = URI(url.to_s)
-    end
-    if $VERBOSE
+    if verbose
       $stdout.print "downloading #{name} ... "
       $stdout.flush
     end
     mtime = nil
     options = options.merge(http_options(file, since.nil? ? true : since))
     begin
-      data = with_retry(10) do
-        data = url.read(options)
-        if mtime = data.meta["last-modified"]
-          mtime = Time.httpdate(mtime)
-        end
-        data
-      end
+      data = with_retry(10) {url.read(options)}
     rescue OpenURI::HTTPError => http_error
-      if http_error.message =~ /^304 / # 304 Not Modified
-        if $VERBOSE
+      case http_error.message
+      when /^304 / # 304 Not Modified
+        if verbose
           $stdout.puts "#{name} not modified"
           $stdout.flush
         end
         return file.to_path
+      when /^40/ # Net::HTTPClientError: 403 Forbidden, 404 Not Found
+        if ignore_http_client_errors
+          puts "Ignore #{url}: #{http_error.message}"
+          return file.to_path
+        end
       end
       raise
     rescue Timeout::Error
@@ -267,6 +219,10 @@ def self.download(url, name, dir = nil, since = true, options = {})
         return file.to_path
       end
       raise
+    else
+      if mtime = data.meta["last-modified"]
+        mtime = Time.httpdate(mtime)
+      end
     end
     dest = (cache_save && cache && !cache.exist? ? cache : file)
     dest.parent.mkpath
@@ -278,7 +234,7 @@ def self.download(url, name, dir = nil, since = true, options = {})
     if mtime
       dest.utime(mtime, mtime)
     end
-    if $VERBOSE
+    if verbose
       $stdout.puts "done"
       $stdout.flush
     end
@@ -296,20 +252,24 @@ def self.under(dir, name)
     dir ? File.join(dir, File.basename(name)) : name
   end
 
+  def self.default_cache_dir
+    if cache_dir = ENV['CACHE_DIR']
+      return cache_dir unless cache_dir.empty?
+    end
+    ".downloaded-cache"
+  end
+
   def self.cache_file(url, name, cache_dir = nil)
     case cache_dir
     when false
       return nil
     when nil
-      cache_dir = ENV['CACHE_DIR']
-      if !cache_dir or cache_dir.empty?
-        cache_dir = ".downloaded-cache"
-      end
+      cache_dir = default_cache_dir
     end
     Pathname.new(cache_dir) + (name || File.basename(URI(url).path))
   end
 
-  def self.link_cache(cache, file, name, verbose = false)
+  def self.link_cache(cache, file, name, verbose: false)
     return false unless cache and cache.exist?
     return true if cache.eql?(file)
     if /cygwin/ !~ RUBY_PLATFORM or /winsymlink:nativestrict/ =~ ENV['CYGWIN']
@@ -381,8 +341,6 @@ def self.with_retry(max_times, &block)
   private_class_method :with_retry
 end
 
-Downloader.https = https.freeze
-
 if $0 == __FILE__
   since = true
   options = {}
@@ -407,26 +365,42 @@ def self.with_retry(max_times, &block)
 
     case ARGV[0]
     when '-d', '--destdir'
+      ## -d, --destdir DIRECTORY  Download into the directory
       destdir = ARGV[1]
       ARGV.shift
     when '-p', '--prefix'
-      # strip directory names from the name to download, and add the
-      # prefix instead.
+      ## -p, --prefix  Strip directory names from the name to download,
+      ##   and add the prefix instead.
       prefix = ARGV[1]
       ARGV.shift
     when '-e', '--exist', '--non-existent-only'
+      ## -e, --exist, --non-existent-only  Skip already existent files.
       since = nil
     when '-a', '--always'
+      ## -a, --always  Download all files.
       since = false
     when '-u', '--update', '--if-modified'
+      ## -u, --update, --if-modified  Download newer files only.
       since = true
-    when '-n', '--dryrun'
+    when '-n', '--dry-run', '--dryrun'
+      ## -n, --dry-run  Do not download actually.
       options[:dryrun] = true
     when '--cache-dir'
+      ## --cache-dir DIRECTORY  Cache downloaded files in the directory.
       options[:cache_dir] = ARGV[1]
       ARGV.shift
     when /\A--cache-dir=(.*)/m
       options[:cache_dir] = $1
+    when /\A--help\z/
+      ## --help  Print this message
+      puts "Usage: #$0 [options] relative-url..."
+      File.foreach(__FILE__) do |line|
+        line.sub!(/^ *## /, "") or next
+        break if line.chomp!.empty?
+        opt, desc = line.split(/ {2,}/, 2)
+        printf "  %-28s  %s\n", opt, desc
+      end
+      exit
     when /\A-/
       abort "#{$0}: unknown option #{ARGV[0]}"
     else
@@ -434,7 +408,7 @@ def self.with_retry(max_times, &block)
     end
     ARGV.shift
   end
-  $VERBOSE = true
+  options[:verbose] = true
   if dl
     args.each do |name|
       dir = destdir
@@ -453,10 +427,10 @@ def self.with_retry(max_times, &block)
         end
         name = "#{prefix}/#{name}"
       end
-      dl.download(name, dir, since, options)
+      dl.download(name, dir, since, **options)
     end
   else
     abort "usage: #{$0} url name" unless args.size == 2
-    Downloader.download(args[0], args[1], destdir, since, options)
+    Downloader.download(args[0], args[1], destdir, since, **options)
   end
 end
diff --git a/tool/enc-unicode.rb b/tool/enc-unicode.rb
index 2224ce7149d26c..493a6f91c14380 100755
--- a/tool/enc-unicode.rb
+++ b/tool/enc-unicode.rb
@@ -143,7 +143,8 @@ def define_posix_props(data)
   data['Space'] = data['White_Space']
   data['Blank'] = data['Space_Separator'] + [0x0009]
   data['Cntrl'] = data['Cc']
-  data['Word'] = data['Alpha'] + data['Mark'] + data['Digit'] + data['Connector_Punctuation']
+  data['Word'] = data['Alpha'] + data['Mark'] + data['Digit'] +
+    data['Connector_Punctuation'] + data['Join_Control']
   data['Graph'] = data['Any'] - data['Space'] - data['Cntrl'] -
     data['Surrogate'] - data['Unassigned']
   data['Print'] = data['Graph'] + data['Space_Separator']
@@ -161,14 +162,24 @@ def parse_scripts(data, categories)
   names = {}
   files.each do |file|
     data_foreach(file[:fn]) do |line|
+      # Parse Unicode data files and store code points and properties.
       if /^# Total (?:code points|elements): / =~ line
         data[current] = cps
         categories[current] = file[:title]
         (names[file[:title]] ||= []) << current
         cps = []
-      elsif /^([0-9a-fA-F]+)(?:\.\.([0-9a-fA-F]+))?\s*;\s*(\w+)/ =~ line
-        current = $3
+      elsif /^(\h+)(?:\.\.(\h+))?\s*;\s*(\w(?:[\w\s;]*\w)?)/ =~ line
+        # $1: The first hexadecimal code point or the start of a range.
+        # $2: The end code point of the range, if present.
+        #     If there's no range (just a single code point), $2 is nil.
+        # $3: The property or other info.
+        # Example:
+        #   line = "0915..0939    ; InCB; Consonant # Lo  [37] DEVANAGARI LETTER KA..DEVANAGARI LETTER HA"
+        #   $1 = "0915"
+        #   $2 = "0939"
+        #   $3 = "InCB; Consonant"
         $2 ? cps.concat(($1.to_i(16)..$2.to_i(16)).to_a) : cps.push($1.to_i(16))
+        current = $3.gsub(/\W+/, '_')
       end
     end
   end
@@ -221,7 +232,7 @@ def parse_age(data)
       ages << current
       last_constname = constname
       cps = []
-    elsif /^([0-9a-fA-F]+)(?:\.\.([0-9a-fA-F]+))?\s*;\s*(\d+\.\d+)/ =~ line
+    elsif /^(\h+)(?:\.\.(\h+))?\s*;\s*(\d+\.\d+)/ =~ line
       current = $3
       $2 ? cps.concat(($1.to_i(16)..$2.to_i(16)).to_a) : cps.push($1.to_i(16))
     end
@@ -240,7 +251,7 @@ def parse_GraphemeBreakProperty(data)
       make_const(constname, cps, "Grapheme_Cluster_Break=#{current}")
       ages << current
       cps = []
-    elsif /^([0-9a-fA-F]+)(?:\.\.([0-9a-fA-F]+))?\s*;\s*(\w+)/ =~ line
+    elsif /^(\h+)(?:\.\.(\h+))?\s*;\s*(\w+)/ =~ line
       current = $3
       $2 ? cps.concat(($1.to_i(16)..$2.to_i(16)).to_a) : cps.push($1.to_i(16))
     end
@@ -252,7 +263,7 @@ def parse_block(data)
   cps = []
   blocks = []
   data_foreach('Blocks.txt') do |line|
-    if /^([0-9a-fA-F]+)\.\.([0-9a-fA-F]+);\s*(.*)/ =~ line
+    if /^(\h+)\.\.(\h+);\s*(.*)/ =~ line
       cps = ($1.to_i(16)..$2.to_i(16)).to_a
       constname = constantize_blockname($3)
       data[constname] = cps
@@ -486,7 +497,11 @@ def write(str)
 output.ifdef :USE_UNICODE_PROPERTIES do
   props.each do |name|
     i += 1
-    name = normalize_propname(name)
+    name = if name.start_with?('InCB')
+             name.downcase.gsub(/_/, '=')
+           else
+             normalize_propname(name)
+           end
     name_to_index[name] = i
     puts "%-40s %3d" % [name + ',', i]
   end
@@ -597,7 +612,6 @@ def diff_args(diff)
     IO.popen([*NAME2CTYPE, out: tmp], "w") {|f| output.show(f, *syms)}
   end while syms.pop
   fds.each(&:close)
-  ff = nil
   IO.popen(ifdef["USE_UNICODE_AGE_PROPERTIES", fds[1].path, fds[0].path], "r") {|age|
     IO.popen(ifdef["USE_UNICODE_PROPERTIES", fds[2].path, "-"], "r", in: age) {|f|
       ansi = false
@@ -608,7 +622,7 @@ def diff_args(diff)
         line.sub!(/\/\*ANSI\*\//, '1') if ansi
         line.gsub!(/\(int\)\((?:long|size_t)\)&\(\(struct uniname2ctype_pool_t \*\)0\)->uniname2ctype_pool_(str\d+),\s+/,
                    'uniname2ctype_offset(\1), ')
-        if ff = (!ff ? /^(uniname2ctype_hash) /=~line : /^\}/!~line) # no line can match both, exclusive flip-flop
+        if line.start_with?("uniname2ctype_hash\s") ... line.start_with?("}")
           line.sub!(/^( *(?:register\s+)?(.*\S)\s+hval\s*=\s*)(?=len;)/, '\1(\2)')
         end
         puts line
diff --git a/tool/extlibs.rb b/tool/extlibs.rb
index 887cac61ebf192..cef671283334f3 100755
--- a/tool/extlibs.rb
+++ b/tool/extlibs.rb
@@ -43,7 +43,7 @@ def cache_file(url, cache_dir)
   end
 
   def do_download(url, cache_dir)
-    Downloader.download(url, nil, nil, nil, :cache_dir => cache_dir)
+    Downloader.download(url, nil, nil, nil, cache_dir: cache_dir)
   end
 
   def do_checksum(cache, chksums)
diff --git a/tool/fake.rb b/tool/fake.rb
index 91dfb041c4e30d..2c458985d8e1d3 100644
--- a/tool/fake.rb
+++ b/tool/fake.rb
@@ -9,6 +9,15 @@ class File
   end
 end
 
+[[libpathenv, "."], [preloadenv, libruby_so]].each do |env, path|
+  env or next
+  e = ENV[env] or next
+  e = e.split(File::PATH_SEPARATOR)
+  path = File.realpath(path, builddir) rescue next
+  e.delete(path) or next
+  ENV[env] = (e.join(File::PATH_SEPARATOR) unless e.empty?)
+end
+
 static = !!(defined?($static) && $static)
 $:.unshift(builddir)
 posthook = proc do
@@ -54,6 +63,8 @@ class File
   RbConfig.fire_update!("extout", $extout)
   RbConfig.fire_update!("rubyhdrdir", "$(top_srcdir)/include")
   RbConfig.fire_update!("rubyarchhdrdir", "$(extout)/include/$(arch)")
+  RbConfig.fire_update!("rubyarchdir", "$(extout)/$(arch)")
+  RbConfig.fire_update!("rubylibdir", "$(extout)/common")
   RbConfig.fire_update!("libdirname", "buildlibdir")
   trace_var(:$ruby, posthook)
   untrace_var(:$extmk, prehook)
diff --git a/tool/fetch-bundled_gems.rb b/tool/fetch-bundled_gems.rb
index f790c92ba97f79..b76feefd942cf7 100755
--- a/tool/fetch-bundled_gems.rb
+++ b/tool/fetch-bundled_gems.rb
@@ -1,6 +1,16 @@
 #!ruby -an
 BEGIN {
   require 'fileutils'
+  require_relative 'lib/colorize'
+
+  color = Colorize.new
+
+  if ARGV.first.start_with?("BUNDLED_GEMS=")
+    bundled_gems = ARGV.shift[13..-1]
+    sep = bundled_gems.include?(",") ? "," : " "
+    bundled_gems = bundled_gems.split(sep)
+    bundled_gems = nil if bundled_gems.empty?
+  end
 
   dir = ARGV.shift
   ARGF.eof?
@@ -12,23 +22,28 @@
 
 next unless n
 next if n =~ /^#/
+next if bundled_gems&.all? {|pat| !File.fnmatch?(pat, n)}
 
-if File.directory?(n)
-  puts "updating #{n} ..."
-  system("git", "fetch", chdir: n) or abort
-else
-  puts "retrieving #{n} ..."
-  system(*%W"git clone #{u} #{n}") or abort
+unless File.exist?("#{n}/.git")
+  puts "retrieving #{color.notice(n)} ..."
+  system(*%W"git clone --depth=1 --no-tags #{u} #{n}") or abort
 end
 
 if r
-  puts "fetching #{r} ..."
+  puts "fetching #{color.notice(r)} ..."
   system("git", "fetch", "origin", r, chdir: n) or abort
+  c = r
+else
+  c = ["v#{v}", v].find do |c|
+    puts "fetching #{color.notice(c)} ..."
+    system("git", "fetch", "origin", "refs/tags/#{c}:refs/tags/#{c}", chdir: n)
+  end or abort
 end
 
-c = r || "v#{v}"
 checkout = %w"git -c advice.detachedHead=false checkout"
-puts "checking out #{c} (v=#{v}, r=#{r}) ..."
+print %[checking out #{color.notice(c)} (v=#{color.info(v)}]
+print %[, r=#{color.info(r)}] if r
+puts ") ..."
 unless system(*checkout, c, "--", chdir: n)
   abort if r or !system(*checkout, v, "--", chdir: n)
 end
diff --git a/tool/file2lastrev.rb b/tool/file2lastrev.rb
index 6200e78a563b64..2de83796064bdd 100755
--- a/tool/file2lastrev.rb
+++ b/tool/file2lastrev.rb
@@ -98,6 +98,7 @@ def self.format=(format)
     data.sub!(/(?<!\A|\n)\z/, "\n")
     @output.write(data, overwrite: true, create_only: create_only)
   rescue => e
+    next if @suppress_not_found and VCS::NotFoundError === e
     warn "#{File.basename(Program)}: #{e.message}"
     ok = false
   end
diff --git a/tool/format-release b/tool/format-release
index 7b0f8e78e74587..72fc173000371d 100755
--- a/tool/format-release
+++ b/tool/format-release
@@ -1,6 +1,12 @@
 #!/usr/bin/env ruby
-# https://rubygems.org/gems/diffy
-require "diffy"
+
+require "bundler/inline"
+
+gemfile do
+  source "https://rubygems.org"
+  gem "diffy"
+end
+
 require "open-uri"
 require "yaml"
 
@@ -85,7 +91,7 @@ eom
     if prev_tag
       # show diff shortstat
       tag = "v#{version.gsub(/[.\-]/, '_')}"
-      stat = `git -C #{rubydir} diff --shortstat #{prev_tag}..#{tag}`
+      stat = `git -C #{rubydir} diff -l0 --shortstat #{prev_tag}..#{tag}`
       files_changed, insertions, deletions = stat.scan(/\d+/)
     end
 
@@ -235,11 +241,11 @@ eom
     diff.each_with_index do |line, index|
       case index
       when 0
-        line.sub!(/\A--- (.*)\t(\d+-\d+-\d+ [0-9:.]+ [\-+]\d+)\Z/) do
+        line.sub!(/\A--- (.*)\t(\d+-\d+-\d+ [0-9:.]+(?: [\-+]\d+)?)\Z/) do
           "--- a/#{filename}\t#{$2}"
         end
       when 1
-        line.sub!(/\A\+\+\+ (.*)\t(\d+-\d+-\d+ [0-9:.]+ [\-+]\d+)\Z/) do
+        line.sub!(/\A\+\+\+ (.*)\t(\d+-\d+-\d+ [0-9:.]+(?: [\-+]\d+)?)\Z/) do
           "+++ b/#{filename}\t#{$2}"
         end
       end
diff --git a/tool/gen-github-release.rb b/tool/gen-github-release.rb
index 4d8c2910f4932c..cdb66080d93470 100755
--- a/tool/gen-github-release.rb
+++ b/tool/gen-github-release.rb
@@ -27,10 +27,12 @@
 
 note =  "## What's Changed\n\n"
 
+notes = []
+
 diff = client.compare("ruby/ruby", ARGV[0], ARGV[1])
 diff[:commits].each do |c|
-  if c[:commit][:message] =~ /\[Backport #(\d*)\]/
-    url = "https://bugs.ruby-lang.org/issues/#{$1}"
+  if c[:commit][:message] =~ /\[(Backport|Feature|Bug) #(\d*)\]/
+    url = "https://bugs.ruby-lang.org/issues/#{$2}"
     title = Nokogiri::HTML(URI.open(url)).title
     title.gsub!(/ - Ruby master - Ruby Issue Tracking System/, "")
   elsif c[:commit][:message] =~ /\(#(\d*)\)/
@@ -40,19 +42,24 @@
   else
     next
   end
-  note << "* [#{title}](#{url})\n"
+  notes << "* [#{title}](#{url})"
 rescue OpenURI::HTTPError
   puts "Error: #{url}"
 end
 
-note << "\n"
+notes.uniq!
+
+note << notes.join("\n")
+
+note << "\n\n"
 note << "Note: This list is automatically generated by tool/gen-github-release.rb. Because of this, some commits may be missing.\n\n"
 note << "## Full Changelog\n\n"
 note << "https://github.com/ruby/ruby/compare/#{ARGV[0]}...#{ARGV[1]}\n\n"
 
 if ARGV[2] == "--no-dry-run"
-  name = ARGV[1].gsub(/v/, "").gsub(/_/, ".")
-  client.create_release("ruby/ruby", ARGV[1], name: name, body: note)
+  name = ARGV[1].gsub(/^v/, "").gsub(/_/, ".")
+  prerelease = ARGV[1].match?(/rc|preview/) ? true : false
+  client.create_release("ruby/ruby", ARGV[1], name: name, body: note, make_latest: "false", prerelease: prerelease)
   puts "Created a release: https://github.com/ruby/ruby/releases/tag/#{ARGV[1]}"
 else
   puts note
diff --git a/tool/generic_erb.rb b/tool/generic_erb.rb
index 6607d5c256e458..b6cb51474e30dd 100644
--- a/tool/generic_erb.rb
+++ b/tool/generic_erb.rb
@@ -12,7 +12,7 @@
 templates = []
 
 ARGV.options do |o|
-  o.on('-i', '--input=PATH') {|v| template << v}
+  o.on('-i', '--input=PATH') {|v| templates << v}
   o.on('-x', '--source') {source = true}
   out.def_options(o)
   o.order!(ARGV)
@@ -27,11 +27,7 @@
 output, vpath = output, vpath
 
 result = templates.map do |template|
-  if ERB.instance_method(:initialize).parameters.assoc(:key) # Ruby 2.6+
-    erb = ERB.new(File.read(template), trim_mode: '%-')
-  else
-    erb = ERB.new(File.read(template), nil, '%-')
-  end
+  erb = ERB.new(File.read(template), trim_mode: '%-')
   erb.filename = template
   source ? erb.src : proc{erb.result(binding)}.call
 end
diff --git a/tool/gperf.sed b/tool/gperf.sed
index 52915f80d51f28..9550a522b94f8b 100644
--- a/tool/gperf.sed
+++ b/tool/gperf.sed
@@ -1,23 +1,4 @@
-/ANSI-C code/{
-  h
-  s/.*/ANSI:offset:/
-  x
-}
-/\/\*!ANSI{\*\//{
-  G
-  s/\/\*!ANSI{\*\/\(.*\)\/\*}!ANSI\*\/\(.*\)\nANSI:.*/\/\*\1\*\/\2/
-}
-s/(int)([a-z_]*)&((struct \([a-zA-Z_0-9][a-zA-Z_0-9]*\)_t *\*)0)->\1_str\([1-9][0-9]*\),/gperf_offsetof(\1, \2),/g
-/^#line/{
-  G
-  x
-  s/:offset:/:/
-  x
-  s/\(.*\)\(\n\).*:offset:.*/#define gperf_offsetof(s, n) (short)offsetof(struct s##_t, s##_str##n)\2\1/
-  s/\n[^#].*//
-}
 /^[a-zA-Z_0-9]*hash/,/^}/{
   s/ hval = / hval = (unsigned int)/
   s/ return / return (unsigned int)/
 }
-s/^\(static\) \(unsigned char gperf_downcase\)/\1 const \2/
diff --git a/tool/ifchange b/tool/ifchange
index 5af41e01566f1e..9e4a89533c0f95 100755
--- a/tool/ifchange
+++ b/tool/ifchange
@@ -18,7 +18,7 @@ HELP
 set -e
 timestamp=
 keepsuffix=
-empty=
+srcavail=f
 color=auto
 until [ $# -eq 0 ]; do
     case "$1" in
@@ -39,7 +39,7 @@ until [ $# -eq 0 ]; do
 	    keepsuffix=`expr \( "$1" : '[^=]*=\(.*\)' \)`
 	    ;;
 	--empty)
-	    empty=yes
+	    srcavail=s
 	    ;;
 	--color)
 	    color=always
@@ -97,7 +97,7 @@ fi
 
 targetdir=
 case "$target" in */*) targetdir=`dirname "$target"`;; esac
-if [ -f "$target" -a ! -${empty:+f}${empty:-s} "$temp" ] || cmp "$target" "$temp" >/dev/null 2>&1; then
+if [ -f "$target" -a ! -${srcavail} "$temp" ] || cmp "$target" "$temp" >/dev/null 2>&1; then
     echo "$target ${msg_unchanged}unchanged${msg_reset}"
     rm -f "$temp"
 else
diff --git a/tool/leaked-globals b/tool/leaked-globals
index 99de52dd6c1861..6118cd56e8153b 100755
--- a/tool/leaked-globals
+++ b/tool/leaked-globals
@@ -1,21 +1,28 @@
 #!/usr/bin/ruby
 require_relative 'lib/colorize'
+require 'shellwords'
 
 until ARGV.empty?
   case ARGV[0]
   when /\A SYMBOL_PREFIX=(.*)/x
     SYMBOL_PREFIX = $1
   when /\A NM=(.*)/x            # may be multiple words
-    NM = $1
+    NM = $1.shellsplit
   when /\A PLATFORM=(.+)?/x
     platform = $1
   when /\A SOEXT=(.+)?/x
     soext = $1
+  when /\A SYMBOLS_IN_EMPTYLIB=(.*)/x
+    SYMBOLS_IN_EMPTYLIB = $1.split(" ")
+  when /\A EXTSTATIC=(.+)?/x
+    EXTSTATIC = true
   else
     break
   end
   ARGV.shift
 end
+SYMBOLS_IN_EMPTYLIB ||= nil
+EXTSTATIC ||= false
 
 config = ARGV.shift
 count = 0
@@ -41,7 +48,9 @@ if platform and !platform.empty?
 end
 missing = File.dirname(config) + "/missing/"
 ARGV.reject! do |n|
-  unless (src = Dir.glob(missing + File.basename(n, ".*") + ".[cS]")).empty?
+  base = File.basename(n, ".*")
+  next true if REPLACE.include?(base)
+  unless (src = Dir.glob(missing + base + ".[cS]")).empty?
     puts "Ignore #{col.skip(n)} because of #{src.map {|s| File.basename(s)}.join(', ')} under missing"
     true
   end
@@ -53,9 +62,21 @@ REPLACE.push("rust_eh_personality") if RUBY_PLATFORM.include?("darwin")
 
 print "Checking leaked global symbols..."
 STDOUT.flush
-soext = /\.#{soext}(?:$|\.)/ if soext
-so = soext =~ ARGV.first if ARGV.size == 1
-IO.foreach("|#{NM} #{ARGV.join(' ')}") do |line|
+if soext
+  soext = /\.#{soext}(?:$|\.)/
+  if EXTSTATIC
+    ARGV.delete_if {|n| soext =~ n}
+  elsif ARGV.size == 1
+    so = soext =~ ARGV.first
+  end
+end
+
+Pipe = Struct.new(:command) do
+  def open(&block) IO.popen(command, &block) end
+  def each(&block) open {|f| f.each(&block)} end
+end
+
+Pipe.new(NM + ARGV).each do |line|
   line.chomp!
   next so = nil if line.empty?
   if so.nil? and line.chomp!(":")
@@ -67,13 +88,18 @@ IO.foreach("|#{NM} #{ARGV.join(' ')}") do |line|
   next unless n.sub!(/^#{SYMBOL_PREFIX}/o, "")
   next if n.include?(".")
   next if !so and n.start_with?("___asan_")
+  next if !so and n.start_with?("__odr_asan_")
+  next if !so and n.start_with?("__retguard_")
+  next if !so and n.start_with?("__dtrace")
   case n
-  when /\A(?:Init_|InitVM_|yp_|[Oo]nig|dln_|coroutine_)/
+  when /\A(?:Init_|InitVM_|pm_|[Oo]nig|dln_|coroutine_)/
     next
   when /\Aruby_static_id_/
     next unless so
   when /\A(?:RUBY_|ruby_|rb_)/
     next unless so and /_(threadptr|ec)_/ =~ n
+  when *SYMBOLS_IN_EMPTYLIB
+    next
   end
   next if REPLACE.include?(n)
   puts col.fail("leaked") if count.zero?
diff --git a/tool/lib/_tmpdir.rb b/tool/lib/_tmpdir.rb
new file mode 100644
index 00000000000000..daa1a1f2350c69
--- /dev/null
+++ b/tool/lib/_tmpdir.rb
@@ -0,0 +1,100 @@
+template = "rubytest."
+
+# This path is only for tests.
+# Assume the directory by these environment variables are safe.
+base = [ENV["TMPDIR"], ENV["TMP"], "/tmp"].find do |tmp|
+  next unless tmp and tmp.size <= 50 and File.directory?(tmp)
+  # On macOS, the default TMPDIR is very long, in spite of UNIX socket
+  # path length being limited.
+  #
+  # Also Rubygems creates its own temporary directory per tests, and
+  # some tests copy the full path of gemhome there.  In that case, the
+  # path contains both temporary names twice, and can exceed path name
+  # limit very easily.
+  tmp
+end
+begin
+  tmpdir = File.join(base, template + Random.new_seed.to_s(36)[-6..-1])
+  Dir.mkdir(tmpdir, 0o700)
+rescue Errno::EEXIST
+  retry
+end
+# warn "tmpdir(#{tmpdir.size}) = #{tmpdir}"
+
+pid = $$
+END {
+  if pid == $$
+    begin
+      Dir.rmdir(tmpdir)
+    rescue Errno::ENOENT
+    rescue Errno::ENOTEMPTY
+      require_relative "colorize"
+      colorize = Colorize.new
+      ls = Struct.new(:colorize) do
+        def mode_inspect(m, s)
+          [
+            (m & 0o4 == 0 ? ?- : ?r),
+            (m & 0o2 == 0 ? ?- : ?w),
+            (m & 0o1 == 0 ? (s ? s.upcase : ?-) : (s || ?x)),
+          ]
+        end
+        def decorate_path(path, st)
+          case
+          when st.directory?
+            color = "bold;blue"
+            type = "/"
+          when st.symlink?
+            color = "bold;cyan"
+            # type = "@"
+          when st.executable?
+            color = "bold;green"
+            type = "*"
+          when path.end_with?(".gem")
+            color = "green"
+          end
+          colorize.decorate(path, color) + (type || "")
+        end
+        def list_tree(parent, indent = "", &block)
+          children = Dir.children(parent).map do |child|
+            [child, path = File.join(parent, child), File.lstat(path)]
+          end
+          nlink_width = children.map {|child, path, st| st.nlink}.max.to_s.size
+          size_width = children.map {|child, path, st| st.size}.max.to_s.size
+
+          children.each do |child, path, st|
+            m = st.mode
+            m = [
+              (st.file? ? ?- : st.ftype[0]),
+              mode_inspect(m >> 6, (?s unless m & 04000 == 0)),
+              mode_inspect(m >> 3, (?s unless m & 02000 == 0)),
+              mode_inspect(m,      (?t unless m & 01000 == 0)),
+            ].join("")
+            warn sprintf("%s* %s %*d %*d %s % s%s",
+                         indent, m, nlink_width, st.nlink, size_width, st.size,
+                         st.mtime.to_s, decorate_path(child,  st),
+                         (" -> " + decorate_path(File.readlink(path), File.stat(path)) if
+                           st.symlink?))
+            if st.directory?
+              list_tree(File.join(parent, child), indent + "  ", &block)
+            end
+            yield path, st if block
+          end
+        end
+      end.new(colorize)
+      warn colorize.notice("Children under ")+colorize.fail(tmpdir)+":"
+      Dir.chdir(tmpdir) do
+        ls.list_tree(".") do |path, st|
+          if st.directory?
+            Dir.rmdir(path)
+          else
+            File.unlink(path)
+          end
+        end
+      end
+      require "fileutils"
+      FileUtils.rm_rf(tmpdir)
+    end
+  end
+}
+
+ENV["TMPDIR"] = ENV["SPEC_TEMP_DIR"] = ENV["GEM_TEST_TMPDIR"] = tmpdir
diff --git a/tool/lib/bundle_env.rb b/tool/lib/bundle_env.rb
new file mode 100644
index 00000000000000..9ad5ea220b466b
--- /dev/null
+++ b/tool/lib/bundle_env.rb
@@ -0,0 +1,4 @@
+ENV["GEM_HOME"] = File.expand_path("../../.bundle", __dir__)
+ENV["BUNDLE_APP_CONFIG"] = File.expand_path("../../.bundle", __dir__)
+ENV["BUNDLE_PATH__SYSTEM"] = "true"
+ENV["BUNDLE_WITHOUT"] = "lint doc"
diff --git a/tool/lib/bundled_gem.rb b/tool/lib/bundled_gem.rb
index bfc0be1c810539..d2ed61a508fdde 100644
--- a/tool/lib/bundled_gem.rb
+++ b/tool/lib/bundled_gem.rb
@@ -6,11 +6,24 @@
 # unpack bundled gem files.
 
 module BundledGem
+  DEFAULT_GEMS_DEPENDENCIES = [
+    "net-protocol", # net-ftp
+    "time", # net-ftp
+    "singleton", # prime
+    "ipaddr", # rinda
+    "forwardable", # prime, rinda
+    "strscan", # rexml
+    "psych" # rdoc
+  ]
+
   module_function
 
   def unpack(file, *rest)
     pkg = Gem::Package.new(file)
-    prepare_test(pkg.spec, *rest) {|dir| pkg.extract_files(dir)}
+    prepare_test(pkg.spec, *rest) do |dir|
+      pkg.extract_files(dir)
+      FileUtils.rm_rf(Dir.glob(".git*", base: dir).map {|n| File.join(dir, n)})
+    end
     puts "Unpacked #{file}"
   rescue Gem::Package::FormatError, Errno::ENOENT
     puts "Try with hash version of bundled gems instead of #{file}. We don't use this gem with release version of Ruby."
@@ -55,6 +68,9 @@ def prepare_test(spec, dir = ".")
     gem_dir = File.join(dir, "gems", target)
     yield gem_dir
     spec_dir = spec.extensions.empty? ? "specifications" : File.join("gems", target)
+    if spec.extensions.empty?
+      spec.dependencies.reject! {|dep| DEFAULT_GEMS_DEPENDENCIES.include?(dep.name)}
+    end
     File.binwrite(File.join(dir, spec_dir, "#{target}.gemspec"), spec.to_ruby)
     unless spec.extensions.empty?
       spec.dependencies.clear
@@ -79,7 +95,10 @@ def dummy_gemspec(gemspec)
     Dir.chdir(gemdir) do
       spec = Gem::Specification.new do |s|
         s.name = gemfile.chomp(".gemspec")
-        s.version = File.read("lib/#{s.name}.rb")[/VERSION = "(.+?)"/, 1]
+        s.version =
+          File.read("lib/#{s.name}.rb")[/VERSION = "(.+?)"/, 1] ||
+          begin File.read("lib/#{s.name}/version.rb")[/VERSION = "(.+?)"/, 1]; rescue; nil; end ||
+          raise("cannot find the version of #{ s.name } gem")
         s.authors = ["DUMMY"]
         s.email = ["dummy@ruby-lang.org"]
         s.files = Dir.glob("{lib,ext}/**/*").select {|f| File.file?(f)}
diff --git a/tool/lib/colorize.rb b/tool/lib/colorize.rb
index 8fb90e183301cf..09043121193e80 100644
--- a/tool/lib/colorize.rb
+++ b/tool/lib/colorize.rb
@@ -7,7 +7,7 @@ class Colorize
   def initialize(color = nil, opts = ((_, color = color, nil)[0] if Hash === color))
     @colors = @reset = nil
     @color = opts && opts[:color] || color
-    if color or (color == nil && STDOUT.tty? && (ENV["NO_COLOR"] || "").empty?)
+    if color or (color == nil && coloring?)
       if (%w[smso so].any? {|attr| /\A\e\[.*m\z/ =~ IO.popen("tput #{attr}", "r", :err => IO::NULL, &:read)} rescue nil)
         @beg = "\e["
         colors = (colors = ENV['TEST_COLORS']) ? Hash[colors.scan(/(\w+)=([^:\n]*)/)] : {}
@@ -27,23 +27,48 @@ def initialize(color = nil, opts = ((_, color = color, nil)[0] if Hash === color
   end
 
   DEFAULTS = {
-    "pass"=>"32", "fail"=>"31;1", "skip"=>"33;1",
+    # color names
     "black"=>"30", "red"=>"31", "green"=>"32", "yellow"=>"33",
     "blue"=>"34", "magenta"=>"35", "cyan"=>"36", "white"=>"37",
     "bold"=>"1", "underline"=>"4", "reverse"=>"7",
+    "bright_black"=>"90", "bright_red"=>"91", "bright_green"=>"92", "bright_yellow"=>"93",
+    "bright_blue"=>"94", "bright_magenta"=>"95", "bright_cyan"=>"96", "bright_white"=>"97",
+
+    # abstract decorations
+    "pass"=>"green", "fail"=>"red;bold", "skip"=>"yellow;bold",
+    "note"=>"bright_yellow", "notice"=>"bright_yellow", "info"=>"bright_magenta",
   }
 
-  NO_COLOR = (nc = ENV['NO_COLOR']) && !nc.empty?
+  def coloring?
+    STDOUT.tty? && (!(nc = ENV['NO_COLOR']) || nc.empty?)
+  end
 
   # colorize.decorate(str, name = color_name)
   def decorate(str, name = @color)
-    if !NO_COLOR and @colors and color = (@colors[name] || DEFAULTS[name])
+    if coloring? and color = resolve_color(name)
       "#{@beg}#{color}m#{str}#{@reset}"
     else
       str
     end
   end
 
+  def resolve_color(color = @color, seen = {}, colors = nil)
+    return unless @colors
+    color.to_s.gsub(/\b[a-z][\w ]+/) do |n|
+      n.gsub!(/\W+/, "_")
+      n.downcase!
+      c = seen[n] and next c
+      if colors
+        c = colors[n]
+      elsif (c = (tbl = @colors)[n] || (tbl = DEFAULTS)[n])
+        colors = tbl
+      else
+        next n
+      end
+      seen[n] = resolve_color(c, seen, colors)
+    end
+  end
+
   DEFAULTS.each_key do |name|
     define_method(name) {|str|
       decorate(str, name)
diff --git a/tool/lib/core_assertions.rb b/tool/lib/core_assertions.rb
index 23de1f7e50ea67..ece6ca1dc8c373 100644
--- a/tool/lib/core_assertions.rb
+++ b/tool/lib/core_assertions.rb
@@ -74,6 +74,11 @@ def message msg = nil, ending = nil, &default
     module CoreAssertions
       require_relative 'envutil'
       require 'pp'
+      begin
+        require '-test-/asan'
+      rescue LoadError
+      end
+
       nil.pretty_inspect
 
       def mu_pp(obj) #:nodoc:
@@ -92,11 +97,12 @@ def assert_file
       end
 
       def assert_in_out_err(args, test_stdin = "", test_stdout = [], test_stderr = [], message = nil,
-                            success: nil, **opt)
+                            success: nil, failed: nil, **opt)
         args = Array(args).dup
         args.insert((Hash === args[0] ? 1 : 0), '--disable=gems')
         stdout, stderr, status = EnvUtil.invoke_ruby(args, test_stdin, true, true, **opt)
-        desc = FailDesc[status, message, stderr]
+        desc = failed[status, message, stderr] if failed
+        desc ||= FailDesc[status, message, stderr]
         if block_given?
           raise "test_stdout ignored, use block only or without block" if test_stdout != []
           raise "test_stderr ignored, use block only or without block" if test_stderr != []
@@ -152,6 +158,9 @@ def assert_no_memory_leak(args, prepare, code, message=nil, limit: 2.0, rss: fal
         pend 'assert_no_memory_leak may consider RJIT memory usage as leak' if defined?(RubyVM::RJIT) && RubyVM::RJIT.enabled?
         # For previous versions which implemented MJIT
         pend 'assert_no_memory_leak may consider MJIT memory usage as leak' if defined?(RubyVM::MJIT) && RubyVM::MJIT.enabled?
+        # ASAN has the same problem - its shadow memory greatly increases memory usage
+        # (plus asan has better ways to detect memory leaks than this assertion)
+        pend 'assert_no_memory_leak may consider ASAN memory usage as leak' if defined?(Test::ASAN) && Test::ASAN.enabled?
 
         require_relative 'memory_status'
         raise Test::Unit::PendedError, "unsupported platform" unless defined?(Memory::Status)
@@ -363,6 +372,10 @@ def assert_separately(args, file = nil, line = nil, src, ignore_stderr: nil, **o
       def assert_ractor(src, args: [], require: nil, require_relative: nil, file: nil, line: nil, ignore_stderr: nil, **opt)
         return unless defined?(Ractor)
 
+        # https://bugs.ruby-lang.org/issues/21262
+        shim_value = "class Ractor; alias value take; end" unless Ractor.method_defined?(:value)
+        shim_join = "class Ractor; alias join take; end" unless Ractor.method_defined?(:join)
+
         require = "require #{require.inspect}" if require
         if require_relative
           dir = File.dirname(caller_locations[0,1][0].absolute_path)
@@ -371,6 +384,8 @@ def assert_ractor(src, args: [], require: nil, require_relative: nil, file: nil,
         end
 
         assert_separately(args, file, line, <<~RUBY, ignore_stderr: ignore_stderr, **opt)
+          #{shim_value}
+          #{shim_join}
           #{require}
           previous_verbose = $VERBOSE
           $VERBOSE = nil
@@ -481,14 +496,13 @@ def assert_raise_with_message(exception, expected, msg = nil, &block)
         case expected
         when String
           assert = :assert_equal
-        when Regexp
-          assert = :assert_match
         else
-          raise TypeError, "Expected #{expected.inspect} to be a kind of String or Regexp, not #{expected.class}"
+          assert_respond_to(expected, :===)
+          assert = :assert_match
         end
 
         ex = m = nil
-        EnvUtil.with_default_internal(expected.encoding) do
+        EnvUtil.with_default_internal(of: expected) do
           ex = assert_raise(exception, msg || proc {"Exception(#{exception}) with message matches to #{expected.inspect}"}) do
             yield
           end
@@ -506,6 +520,43 @@ def assert_raise_with_message(exception, expected, msg = nil, &block)
         ex
       end
 
+      # :call-seq:
+      #   assert_raise_kind_of(*args, &block)
+      #
+      #Tests if the given block raises one of the given exceptions or
+      #sub exceptions of the given exceptions.  If the last argument
+      #is a String, it will be used as the error message.
+      #
+      #    assert_raise do #Fails, no Exceptions are raised
+      #    end
+      #
+      #    assert_raise SystemCallErr do
+      #      Dir.chdir(__FILE__) #Raises Errno::ENOTDIR, so assertion succeeds
+      #    end
+      def assert_raise_kind_of(*exp, &b)
+        case exp.last
+        when String, Proc
+          msg = exp.pop
+        end
+
+        begin
+          yield
+        rescue Test::Unit::PendedError => e
+          raise e unless exp.include? Test::Unit::PendedError
+        rescue *exp => e
+          pass
+        rescue Exception => e
+          flunk(message(msg) {"#{mu_pp(exp)} family exception expected, not #{mu_pp(e)}"})
+        ensure
+          unless e
+            exp = exp.first if exp.size == 1
+
+            flunk(message(msg) {"#{mu_pp(exp)} family expected but nothing was raised"})
+          end
+        end
+        e
+      end
+
       TEST_DIR = File.join(__dir__, "test/unit") #:nodoc:
 
       # :call-seq:
@@ -625,7 +676,7 @@ def assert_pattern_list(pattern_list, actual, message=nil)
 
       def assert_warning(pat, msg = nil)
         result = nil
-        stderr = EnvUtil.with_default_internal(pat.encoding) {
+        stderr = EnvUtil.with_default_internal(of: pat) {
           EnvUtil.verbose_warning {
             result = yield
           }
@@ -778,14 +829,16 @@ def assert_all_assertions_foreach(msg = nil, *keys, &block)
       %w[
         CLOCK_THREAD_CPUTIME_ID CLOCK_PROCESS_CPUTIME_ID
         CLOCK_MONOTONIC
-      ].find do |clk|
-        if Process.const_defined?(clk)
-          [clk.to_sym, Process.const_get(clk)].find do |clk|
-            Process.clock_gettime(clk)
-          rescue
-            # Constants may be defined but not implemented, e.g., mingw.
-          else
-            PERFORMANCE_CLOCK = clk
+      ].find do |c|
+        if Process.const_defined?(c)
+          [c.to_sym, Process.const_get(c)].find do |clk|
+            begin
+              Process.clock_gettime(clk)
+            rescue
+              # Constants may be defined but not implemented, e.g., mingw.
+            else
+              PERFORMANCE_CLOCK = clk
+            end
           end
         end
       end
@@ -815,7 +868,9 @@ def assert_linear_performance(seq, rehearsal: nil, pre: ->(n) {n})
         end
         times.compact!
         tmin, tmax = times.minmax
-        tbase = 10 ** Math.log10(tmax * ([(tmax / tmin), 2].max ** 2)).ceil
+
+        # safe_factor * tmax * rehearsal_time_variance_factor(equals to 1 when variance is small)
+        tbase = 10 * tmax * [(tmax / tmin) ** 2 / 4, 1].max
         info = "(tmin: #{tmin}, tmax: #{tmax}, tbase: #{tbase})"
 
         seq.each do |i|
@@ -849,6 +904,82 @@ def new_test_token
         token = "\e[7;1m#{$$.to_s}:#{Time.now.strftime('%s.%L')}:#{rand(0x10000).to_s(16)}:\e[m"
         return token.dump, Regexp.quote(token)
       end
+
+      # Platform predicates
+
+      def self.mswin?
+        defined?(@mswin) ? @mswin : @mswin = RUBY_PLATFORM.include?('mswin')
+      end
+      private def mswin?
+        CoreAssertions.mswin?
+      end
+
+      def self.mingw?
+        defined?(@mingw) ? @mingw : @mingw = RUBY_PLATFORM.include?('mingw')
+      end
+      private def mingw?
+        CoreAssertions.mingw?
+      end
+
+      module_function def windows?
+        mswin? or mingw?
+      end
+
+      def self.version_compare(expected, actual)
+        expected.zip(actual).each {|e, a| z = (e <=> a); return z if z.nonzero?}
+        0
+      end
+
+      def self.version_match?(expected, actual)
+        if !actual
+          false
+        elsif expected.empty?
+          true
+        elsif expected.size == 1 and Range === (range = expected.first)
+          b, e = range.begin, range.end
+          return false if b and (c = version_compare(Array(b), actual)) > 0
+          return false if e and (c = version_compare(Array(e), actual)) < 0
+          return false if e and range.exclude_end? and c == 0
+          true
+        else
+          version_compare(expected, actual).zero?
+        end
+      end
+
+      def self.linux?(*ver)
+        unless defined?(@linux)
+          @linux = RUBY_PLATFORM.include?('linux') && `uname -r`.scan(/\d+/).map(&:to_i)
+        end
+        version_match? ver, @linux
+      end
+      private def linux?(*ver)
+        CoreAssertions.linux?(*ver)
+      end
+
+      def self.glibc?(*ver)
+        unless defined?(@glibc)
+          libc = `/usr/bin/ldd /bin/sh`[/^\s*libc.*=> *\K\S*/]
+          if libc and /version (\d+)\.(\d+)\.$/ =~ IO.popen([libc], &:read)[]
+            @glibc = [$1.to_i, $2.to_i]
+          else
+            @glibc = false
+          end
+        end
+        version_match? ver, @glibc
+      end
+      private def glibc?(*ver)
+        CoreAssertions.glibc?(*ver)
+      end
+
+      def self.macos?(*ver)
+        unless defined?(@macos)
+          @macos = RUBY_PLATFORM.include?('darwin') && `sw_vers -productVersion`.scan(/\d+/).map(&:to_i)
+        end
+        version_match? ver, @macos
+      end
+      private def macos?(*ver)
+        CoreAssertions.macos?(*ver)
+      end
     end
   end
 end
diff --git a/tool/lib/dump.gdb b/tool/lib/dump.gdb
new file mode 100644
index 00000000000000..56b420a5461cd7
--- /dev/null
+++ b/tool/lib/dump.gdb
@@ -0,0 +1,17 @@
+set height 0
+set width 0
+set confirm off
+
+echo \n>>> Threads\n\n
+info threads
+
+echo \n>>> Machine level backtrace\n\n
+thread apply all info stack full
+
+echo \n>>> Dump Ruby level backtrace (if possible)\n\n
+call rb_vmdebug_stack_dump_all_threads()
+call fflush(stderr)
+
+echo ">>> Finish\n"
+detach
+quit
diff --git a/tool/lib/dump.lldb b/tool/lib/dump.lldb
new file mode 100644
index 00000000000000..ed9cb890104305
--- /dev/null
+++ b/tool/lib/dump.lldb
@@ -0,0 +1,13 @@
+script print("\n>>> Threads\n\n")
+thread list
+
+script print("\n>>> Machine level backtrace\n\n")
+thread backtrace all
+
+script print("\n>>> Dump Ruby level backtrace (if possible)\n\n")
+call rb_vmdebug_stack_dump_all_threads()
+call fflush(stderr)
+
+script print(">>> Finish\n")
+detach
+quit
diff --git a/tool/lib/envutil.rb b/tool/lib/envutil.rb
index 3fcded41626891..d02329d4f13053 100644
--- a/tool/lib/envutil.rb
+++ b/tool/lib/envutil.rb
@@ -15,23 +15,22 @@
 module EnvUtil
   def rubybin
     if ruby = ENV["RUBY"]
-      return ruby
-    end
-    ruby = "ruby"
-    exeext = RbConfig::CONFIG["EXEEXT"]
-    rubyexe = (ruby + exeext if exeext and !exeext.empty?)
-    3.times do
-      if File.exist? ruby and File.executable? ruby and !File.directory? ruby
-        return File.expand_path(ruby)
-      end
-      if rubyexe and File.exist? rubyexe and File.executable? rubyexe
-        return File.expand_path(rubyexe)
-      end
-      ruby = File.join("..", ruby)
-    end
-    if defined?(RbConfig.ruby)
+      ruby
+    elsif defined?(RbConfig.ruby)
       RbConfig.ruby
     else
+      ruby = "ruby"
+      exeext = RbConfig::CONFIG["EXEEXT"]
+      rubyexe = (ruby + exeext if exeext and !exeext.empty?)
+      3.times do
+        if File.exist? ruby and File.executable? ruby and !File.directory? ruby
+          return File.expand_path(ruby)
+        end
+        if rubyexe and File.exist? rubyexe and File.executable? rubyexe
+          return File.expand_path(rubyexe)
+        end
+        ruby = File.join("..", ruby)
+      end
       "ruby"
     end
   end
@@ -53,7 +52,14 @@ def capture_global_values
       @original_internal_encoding = Encoding.default_internal
       @original_external_encoding = Encoding.default_external
       @original_verbose = $VERBOSE
-      @original_warning = defined?(Warning.[]) ? %i[deprecated experimental].to_h {|i| [i, Warning[i]]} : nil
+      @original_warning =
+        if defined?(Warning.categories)
+          Warning.categories.to_h {|i| [i, Warning[i]]}
+        elsif defined?(Warning.[]) # 2.7+
+          %i[deprecated experimental performance].to_h do |i|
+            [i, begin Warning[i]; rescue ArgumentError; end]
+          end.compact
+        end
     end
   end
 
@@ -73,6 +79,70 @@ def timeout(sec, klass = nil, message = nil, &blk)
   end
   module_function :timeout
 
+  class Debugger
+    @list = []
+
+    attr_accessor :name
+
+    def self.register(name, &block)
+      @list << new(name, &block)
+    end
+
+    def initialize(name, &block)
+      @name = name
+      instance_eval(&block)
+    end
+
+    def usable?; false; end
+
+    def start(pid, *args) end
+
+    def dump(pid, timeout: 60, reprieve: timeout&.div(4))
+      dpid = start(pid, *command_file(File.join(__dir__, "dump.#{name}")), out: :err)
+    rescue Errno::ENOENT
+      return
+    else
+      return unless dpid
+      [[timeout, :TERM], [reprieve, :KILL]].find do |t, sig|
+        return EnvUtil.timeout(t) {Process.wait(dpid)}
+      rescue Timeout::Error
+        Process.kill(sig, dpid)
+      end
+      true
+    end
+
+    # sudo -n: --non-interactive
+    PRECOMMAND = (%[sudo -n] if /darwin/ =~ RUBY_PLATFORM)
+
+    def spawn(*args, **opts)
+      super(*PRECOMMAND, *args, **opts)
+    end
+
+    register("gdb") do
+      class << self
+        def usable?; system(*%w[gdb --batch --quiet --nx -ex exit]); end
+        def start(pid, *args, **opts)
+          spawn(*%W[gdb --batch --quiet --pid #{pid}], *args, **opts)
+        end
+        def command_file(file) "--command=#{file}"; end
+      end
+    end
+
+    register("lldb") do
+      class << self
+        def usable?; system(*%w[lldb -Q --no-lldbinit -o exit]); end
+        def start(pid, *args, **opts)
+          spawn(*%W[lldb --batch -Q --attach-pid #{pid}], *args, **opts)
+        end
+        def command_file(file) ["--source", file]; end
+      end
+    end
+
+    def self.search
+      @debugger ||= @list.find(&:usable?)
+    end
+  end
+
   def terminate(pid, signal = :TERM, pgroup = nil, reprieve = 1)
     reprieve = apply_timeout_scale(reprieve) if reprieve
 
@@ -88,17 +158,12 @@ def terminate(pid, signal = :TERM, pgroup = nil, reprieve = 1)
       pgroup = pid
     end
 
-    lldb = true if /darwin/ =~ RUBY_PLATFORM
-
+    dumped = false
     while signal = signals.shift
 
-      if lldb and [:ABRT, :KILL].include?(signal)
-        lldb = false
-        # sudo -n: --non-interactive
-        # lldb -p: attach
-        #      -o: run command
-        system(*%W[sudo -n lldb -p #{pid} --batch -o bt\ all -o call\ rb_vmdebug_stack_dump_all_threads() -o quit])
-        true
+      if !dumped and [:ABRT, :KILL].include?(signal)
+        Debugger.search&.dump(pid)
+        dumped = true
       end
 
       begin
@@ -159,6 +224,11 @@ def invoke_ruby(args, stdin_data = "", capture_stdout = false, capture_stderr =
     }
 
     args = [args] if args.kind_of?(String)
+    # use the same parser as current ruby
+    if args.none? { |arg| arg.start_with?("--parser=") }
+      current_parser = RUBY_DESCRIPTION =~ /prism/i ? "prism" : "parse.y"
+      args = ["--parser=#{current_parser}"] + args
+    end
     pid = spawn(child_env, *precommand, rubybin, *args, opt)
     in_c.close
     out_c&.close
@@ -246,7 +316,30 @@ def under_gc_stress(stress = true)
   end
   module_function :under_gc_stress
 
-  def with_default_external(enc)
+  def under_gc_compact_stress(val = :empty, &block)
+    raise "compaction doesn't work well on s390x. Omit the test in the caller." if RUBY_PLATFORM =~ /s390x/ # https://github.com/ruby/ruby/pull/5077
+
+    if GC.respond_to?(:auto_compact)
+      auto_compact = GC.auto_compact
+      GC.auto_compact = val
+    end
+
+    under_gc_stress(&block)
+  ensure
+    GC.auto_compact = auto_compact if GC.respond_to?(:auto_compact)
+  end
+  module_function :under_gc_compact_stress
+
+  def without_gc
+    prev_disabled = GC.disable
+    yield
+  ensure
+    GC.enable unless prev_disabled
+  end
+  module_function :without_gc
+
+  def with_default_external(enc = nil, of: nil)
+    enc = of.encoding if defined?(of.encoding)
     suppress_warning { Encoding.default_external = enc }
     yield
   ensure
@@ -254,7 +347,8 @@ def with_default_external(enc)
   end
   module_function :with_default_external
 
-  def with_default_internal(enc)
+  def with_default_internal(enc = nil, of: nil)
+    enc = of.encoding if defined?(of.encoding)
     suppress_warning { Encoding.default_internal = enc }
     yield
   ensure
diff --git a/tool/lib/gem_env.rb b/tool/lib/gem_env.rb
new file mode 100644
index 00000000000000..1893e076573cf1
--- /dev/null
+++ b/tool/lib/gem_env.rb
@@ -0,0 +1 @@
+ENV['GEM_HOME'] = File.expand_path('../../.bundle', __dir__)
diff --git a/tool/lib/helper.rb b/tool/lib/helper.rb
deleted file mode 100644
index 909f8f98afc8b7..00000000000000
--- a/tool/lib/helper.rb
+++ /dev/null
@@ -1,4 +0,0 @@
-require "test/unit"
-require_relative "core_assertions"
-
-Test::Unit::TestCase.include Test::Unit::CoreAssertions
diff --git a/tool/lib/iseq_loader_checker.rb b/tool/lib/iseq_loader_checker.rb
index 3f07b3a999e358..73784f8450f020 100644
--- a/tool/lib/iseq_loader_checker.rb
+++ b/tool/lib/iseq_loader_checker.rb
@@ -76,6 +76,15 @@ def self.translate i1
     # return value
     i2_bin if CHECK_TO_BINARY
   end if CHECK_TO_A || CHECK_TO_BINARY
+
+  if opt == "prism"
+    # If RUBY_ISEQ_DUMP_DEBUG is "prism", we'll set up
+    # InstructionSequence.load_iseq to intercept loading filepaths to compile
+    # using prism.
+    def self.load_iseq(filepath)
+      RubyVM::InstructionSequence.compile_file_prism(filepath)
+    end
+  end
 end
 
 #require_relative 'x'; exit(1)
diff --git a/tool/lib/launchable.rb b/tool/lib/launchable.rb
new file mode 100644
index 00000000000000..38f4fe92b3e192
--- /dev/null
+++ b/tool/lib/launchable.rb
@@ -0,0 +1,91 @@
+# frozen_string_literal: true
+require 'json'
+require 'uri'
+
+module Launchable
+  ##
+  # JsonStreamWriter writes a JSON file using a stream.
+  # By utilizing a stream, we can minimize memory usage, especially for large files.
+  class JsonStreamWriter
+    def initialize(path)
+      @file = File.open(path, "w")
+      @file.write("{")
+      @indent_level = 0
+      @is_first_key_val = true
+      @is_first_obj = true
+      write_new_line
+    end
+
+    def write_object obj
+      if @is_first_obj
+        @is_first_obj = false
+      else
+        write_comma
+        write_new_line
+      end
+      @indent_level += 1
+      @file.write(to_json_str(obj))
+      @indent_level -= 1
+      @is_first_key_val = true
+      # Occasionally, invalid JSON will be created as shown below, especially when `--repeat-count` is specified.
+      # {
+      #   "testPath": "file=test%2Ftest_timeout.rb&class=TestTimeout&testcase=test_allows_zero_seconds",
+      #   "status": "TEST_PASSED",
+      #   "duration": 2.7e-05,
+      #   "createdAt": "2024-02-09 12:21:07 +0000",
+      #   "stderr": null,
+      #   "stdout": null
+      # }: null <- here
+      # },
+      # To prevent this, IO#flush is called here.
+      @file.flush
+    end
+
+    def write_array(key)
+      @indent_level += 1
+      @file.write(to_json_str(key))
+      write_colon
+      @file.write(" ", "[")
+      write_new_line
+    end
+
+    def close
+      return if @file.closed?
+      close_array
+      @indent_level -= 1
+      write_new_line
+      @file.write("}", "\n")
+      @file.flush
+      @file.close
+    end
+
+    private
+    def to_json_str(obj)
+      json = JSON.pretty_generate(obj)
+      json.gsub(/^/, ' ' * (2 * @indent_level))
+    end
+
+    def write_indent
+      @file.write(" " * 2 * @indent_level)
+    end
+
+    def write_new_line
+      @file.write("\n")
+    end
+
+    def write_comma
+      @file.write(',')
+    end
+
+    def write_colon
+      @file.write(":")
+    end
+
+    def close_array
+      write_new_line
+      write_indent
+      @file.write("]")
+      @indent_level -= 1
+    end
+  end
+end
diff --git a/tool/lib/leakchecker.rb b/tool/lib/leakchecker.rb
index 4cd28b9dd55cea..69aeb2c254cbfd 100644
--- a/tool/lib/leakchecker.rb
+++ b/tool/lib/leakchecker.rb
@@ -136,14 +136,14 @@ class << self
         attr_accessor :count
       end
 
-      def new(data)
+      def new(...)
         LeakChecker::TempfileCounter.count += 1
-        super(data)
+        super
       end
     }
     LeakChecker.const_set(:TempfileCounter, m)
 
-    class << Tempfile::Remover
+    class << Tempfile
       prepend LeakChecker::TempfileCounter
     end
   end
@@ -155,8 +155,8 @@ def find_tempfiles(prev_count=-1)
     if prev_count == count
       [prev_count, []]
     else
-      tempfiles = ObjectSpace.each_object(Tempfile).find_all {|t|
-        t.instance_variable_defined?(:@tmpfile) and t.path
+      tempfiles = ObjectSpace.each_object(Tempfile).reject {|t|
+        t.instance_variables.empty? || t.closed?
       }
       [count, tempfiles]
     end
diff --git a/tool/lib/output.rb b/tool/lib/output.rb
index 5c645daca6c0d2..8cb426ae4af69b 100644
--- a/tool/lib/output.rb
+++ b/tool/lib/output.rb
@@ -4,10 +4,15 @@
 class Output
   attr_reader :path, :vpath
 
-  def initialize
-    @path = @timestamp = @ifchange = @color = nil
-    @overwrite = @create_only = false
-    @vpath = VPath.new
+  def initialize(path: nil, timestamp: nil, ifchange: nil, color: nil,
+                 overwrite: false, create_only: false, vpath: VPath.new)
+    @path = path
+    @timestamp = timestamp
+    @ifchange = ifchange
+    @color = color
+    @overwrite = overwrite
+    @create_only = create_only
+    @vpath = vpath
   end
 
   COLOR_WHEN = {
diff --git a/tool/lib/path.rb b/tool/lib/path.rb
new file mode 100644
index 00000000000000..f16a164338d66a
--- /dev/null
+++ b/tool/lib/path.rb
@@ -0,0 +1,101 @@
+module Path
+  module_function
+
+  def clean(path)
+    path = "#{path}/".gsub(/(\A|\/)(?:\.\/)+/, '\1').tr_s('/', '/')
+    nil while path.sub!(/[^\/]+\/\.\.\//, '')
+    path
+  end
+
+  def relative(path, base)
+    path = clean(path)
+    base = clean(base)
+    path, base = [path, base].map{|s|s.split("/")}
+    until path.empty? or base.empty? or path[0] != base[0]
+      path.shift
+      base.shift
+    end
+    path, base = [path, base].map{|s|s.join("/")}
+    if base.empty?
+      path
+    elsif base.start_with?("../") or File.absolute_path?(base)
+      File.expand_path(path)
+    else
+      base.gsub!(/[^\/]+/, '..')
+      File.join(base, path)
+    end
+  end
+
+  def clean_link(src, dest)
+    begin
+      link = File.readlink(dest)
+    rescue
+    else
+      return if link == src
+      File.unlink(dest)
+    end
+    yield src, dest
+  end
+
+  # Extensions to FileUtils
+
+  module Mswin
+    def ln_safe(src, dest, real_src, *opt)
+      cmd = ["mklink", dest.tr("/", "\\"), src.tr("/", "\\")]
+      cmd[1, 0] = opt
+      return if system("cmd", "/c", *cmd)
+      # TODO: use RUNAS or something
+      puts cmd.join(" ")
+    end
+
+    def ln_dir_safe(src, dest, real_src)
+      ln_safe(src, dest, "/d")
+    end
+  end
+
+  module HardlinkExcutable
+    def ln_exe(relative_src, dest, src)
+      ln(src, dest, force: true)
+    end
+  end
+
+  def ln_safe(src, dest, real_src)
+    ln_sf(src, dest)
+  rescue Errno::ENOENT
+    # Windows disallows to create broken symboic links, probably because
+    # it is a kind of reparse points.
+    raise if File.exist?(real_src)
+  end
+
+  alias ln_dir_safe ln_safe
+  alias ln_exe ln_safe
+
+  def ln_relative(src, dest, executable = false)
+    return if File.identical?(src, dest)
+    parent = File.dirname(dest)
+    File.directory?(parent) or mkdir_p(parent)
+    if executable
+      return (ln_exe(relative(src, parent), dest, src) if File.exist?(src))
+    end
+    clean_link(relative(src, parent), dest) {|s, d| ln_safe(s, d, src)}
+  end
+
+  def ln_dir_relative(src, dest)
+    return if File.identical?(src, dest)
+    parent = File.dirname(dest)
+    File.directory?(parent) or mkdir_p(parent)
+    clean_link(relative(src, parent), dest) {|s, d| ln_dir_safe(s, d, src)}
+  end
+
+  case (CROSS_COMPILING || RUBY_PLATFORM)
+  when /linux|darwin|solaris/
+    prepend HardlinkExcutable
+    extend HardlinkExcutable
+  when /mingw|mswin/
+    unless File.respond_to?(:symlink)
+      prepend Mswin
+      extend Mswin
+    end
+  else
+  end
+end
diff --git a/tool/lib/test/unit.rb b/tool/lib/test/unit.rb
index 23dfbd8f0f027d..7d43e825e179eb 100644
--- a/tool/lib/test/unit.rb
+++ b/tool/lib/test/unit.rb
@@ -37,6 +37,26 @@ class AssertionFailedError < Exception; end
 
     class PendedError < AssertionFailedError; end
 
+    class << self
+      ##
+      # Extract the location where the last assertion method was
+      # called.  Returns "<empty>" if _e_ does not have backtrace, or
+      # an empty string if no assertion method location was found.
+
+      def location e
+        last_before_assertion = nil
+
+        return '<empty>' unless e&.backtrace # SystemStackError can return nil.
+
+        e.backtrace.reverse_each do |s|
+          break if s =~ /:in \W(?:.*\#)?(?:assert|refute|flunk|pass|fail|raise|must|wont)/
+          last_before_assertion = s
+        end
+        return "" unless last_before_assertion
+        /:in / =~ last_before_assertion ? $` : last_before_assertion
+      end
+    end
+
     module Order
       class NoSort
         def initialize(seed)
@@ -53,17 +73,7 @@ def group(list)
         end
       end
 
-      module RJITFirst
-        def group(list)
-          # RJIT first
-          rjit, others = list.partition {|e| /test_rjit/ =~ e}
-          rjit + others
-        end
-      end
-
       class Alpha < NoSort
-        include RJITFirst
-
         def sort_by_name(list)
           list.sort_by(&:name)
         end
@@ -76,8 +86,6 @@ def sort_by_string(list)
 
       # shuffle test suites based on CRC32 of their names
       Shuffle = Struct.new(:seed, :salt) do
-        include RJITFirst
-
         def initialize(seed)
           self.class::CRC_TBL ||= (0..255).map {|i|
             (0..7).inject(i) {|c,| (c & 1 == 1) ? (0xEDB88320 ^ (c >> 1)) : (c >> 1) }
@@ -95,6 +103,10 @@ def sort_by_string(list)
           list.sort_by {|e| randomize_key(e)}
         end
 
+        def group(list)
+          list
+        end
+
         private
 
         def crc32(str, crc32 = 0xffffffff)
@@ -237,6 +249,8 @@ def non_options(files, options)
     end
 
     module Parallel # :nodoc: all
+      attr_accessor :prefix
+
       def process_args(args = [])
         return @options if @options
         options = super
@@ -267,10 +281,10 @@ def non_options(files, options)
             r.close_on_exec = true
             w.close_on_exec = true
             @jobserver = [r, w]
-            options[:parallel] ||= 1
+            options[:parallel] ||= 256 # number of tokens to acquire first
           end
         end
-        @worker_timeout = EnvUtil.apply_timeout_scale(options[:worker_timeout] || 180)
+        @worker_timeout = EnvUtil.apply_timeout_scale(options[:worker_timeout] || 1200)
         super
       end
 
@@ -286,7 +300,7 @@ def setup_options(opts, options)
 
         opts.separator "parallel test options:"
 
-        options[:retry] = true
+        options[:retry] = false
 
         opts.on '-j N', '--jobs N', /\A(t)?(\d+)\z/, "Allow run tests with N jobs at once" do |_, t, a|
           options[:testing] = true & t # For testing
@@ -358,8 +372,12 @@ def puts(*args)
           @io.puts(*args)
         end
 
-        def run(task,type)
-          @file = File.basename(task, ".rb")
+        def run(task, type, base = nil)
+          if base
+            @file = task.delete_prefix(base).chomp(".rb")
+          else
+            @file = File.basename(task, ".rb")
+          end
           @real_file = task
           begin
             puts "loadpath #{[Marshal.dump($:-@loadpath)].pack("m0")}"
@@ -394,16 +412,19 @@ def close
         rescue IOError
         end
 
-        def quit
+        def quit(reason = :normal)
           return if @io.closed?
           @quit_called = true
-          @io.puts "quit"
+          @io.puts "quit #{reason}"
         rescue Errno::EPIPE => e
           warn "#{@pid}:#{@status.to_s.ljust(7)}:#{@file}: #{e.message}"
         end
 
         def kill
-          Process.kill(:KILL, @pid)
+          EnvUtil::Debugger.search&.dump(@pid)
+          signal = RUBY_PLATFORM =~ /mswin|mingw/ ? :KILL : :SEGV
+          Process.kill(signal, @pid)
+          warn "worker #{to_s} does not respond; #{signal} is sent"
         rescue Errno::ESRCH
         end
 
@@ -521,15 +542,15 @@ def quit_workers(&cond)
         @workers.reject! do |worker|
           next unless cond&.call(worker)
           begin
-            Timeout.timeout(1) do
-              worker.quit
+            Timeout.timeout(5) do
+              worker.quit(cond ? :timeout : :normal)
             end
           rescue Errno::EPIPE
           rescue Timeout::Error
           end
           closed&.push worker
           begin
-            Timeout.timeout(0.2) do
+            Timeout.timeout(1) do
               worker.close
             end
           rescue Timeout::Error
@@ -542,7 +563,7 @@ def quit_workers(&cond)
         return if (closed ||= @workers).empty?
         pids = closed.map(&:pid)
         begin
-          Timeout.timeout(0.2 * closed.size) do
+          Timeout.timeout(1 * closed.size) do
             Process.waitall
           end
         rescue Timeout::Error
@@ -583,7 +604,7 @@ def deal(io, type, result, rep, shutting_down = false)
             worker.quit
             worker = launch_worker
           end
-          worker.run(task, type)
+          worker.run(task, type, (@prefix unless @options[:job_status] == :replace))
           @test_count += 1
 
           jobs_status(worker)
@@ -661,10 +682,18 @@ def _run_parallel suites, type, result
         @ios          = [] # Array of worker IOs
         @job_tokens   = String.new(encoding: Encoding::ASCII_8BIT) if @jobserver
         begin
-          [@tasks.size, @options[:parallel]].min.times {launch_worker}
-
           while true
-            timeout = [(@workers.filter_map {|w| w.response_at}.min&.-(Time.now) || 0) + @worker_timeout, 1].max
+            newjobs = [@tasks.size, @options[:parallel]].min - @workers.size
+            if newjobs > 0
+              if @jobserver
+                t = @jobserver[0].read_nonblock(newjobs, exception: false)
+                @job_tokens << t if String === t
+                newjobs = @job_tokens.size + 1 - @workers.size
+              end
+              newjobs.times {launch_worker}
+            end
+
+            timeout = [(@workers.filter_map {|w| w.response_at}.min&.-(Time.now) || 0), 0].max + @worker_timeout
 
             if !(_io = IO.select(@ios, nil, nil, timeout))
               timeout = Time.now - @worker_timeout
@@ -678,15 +707,9 @@ def _run_parallel suites, type, result
             }
               break
             end
-            break if @tasks.empty? and @workers.empty?
-            if @jobserver and @job_tokens and !@tasks.empty? and
-               ((newjobs = [@tasks.size, @options[:parallel]].min) > @workers.size or
-                !@workers.any? {|x| x.status == :ready})
-              t = @jobserver[0].read_nonblock(newjobs, exception: false)
-              if String === t
-                @job_tokens << t
-                t.size.times {launch_worker}
-              end
+            if @tasks.empty?
+              break if @workers.empty?
+              next # wait for all workers to finish
             end
           end
         rescue Interrupt => ex
@@ -722,7 +745,15 @@ def _run_parallel suites, type, result
             del_status_line or puts
             error, suites = suites.partition {|r| r[:error]}
             unless suites.empty?
-              puts "\n""Retrying..."
+              puts "\n"
+              @failed_output.puts "Failed tests:"
+              suites.each {|r|
+                r[:report].each {|c, m, e|
+                  @failed_output.puts "#{c}##{m}: #{e&.class}: #{e&.message&.slice(/\A.*/)}"
+                }
+              }
+              @failed_output.puts "\n"
+              puts "Retrying..."
               @verbose = options[:verbose]
               suites.map! {|r| ::Object.const_get(r[:testcase])}
               _run_suites(suites, type)
@@ -848,7 +879,7 @@ def update_list(list, rec, max)
         end
       end
 
-      def record(suite, method, assertions, time, error)
+      def record(suite, method, assertions, time, error, source_location = nil)
         if @options.values_at(:longest, :most_asserted).any?
           @tops ||= {}
           rec = [suite.name, method, assertions, time, error]
@@ -946,7 +977,7 @@ def output
       end
 
       def _prepare_run(suites, type)
-        options[:job_status] ||= :replace if @tty && !@verbose
+        options[:job_status] ||= @tty ? :replace : :normal unless @verbose
         case options[:color]
         when :always
           color = true
@@ -962,11 +993,14 @@ def _prepare_run(suites, type)
         @output = Output.new(self) unless @options[:testing]
         filter = options[:filter]
         type = "#{type}_methods"
-        total = if filter
-                  suites.inject(0) {|n, suite| n + suite.send(type).grep(filter).size}
-                else
-                  suites.inject(0) {|n, suite| n + suite.send(type).size}
-                end
+        total = suites.sum {|suite|
+          methods = suite.send(type)
+          if filter
+            methods.count {|method| filter === "#{suite}##{method}"}
+          else
+            methods.size
+          end
+        }
         @test_count = 0
         @total_tests = total.to_s(10)
       end
@@ -1060,7 +1094,7 @@ def print(s)
             runner.add_status(" = #$1")
           when /\A\.+\z/
             runner.succeed
-          when /\A\.*[EFS][EFS.]*\z/
+          when /\A\.*[EFST][EFST.]*\z/
             runner.failed(s)
           else
             $stdout.print(s)
@@ -1265,10 +1299,15 @@ def setup_options(parser, options)
         parser.on '--repeat-count=NUM', "Number of times to repeat", Integer do |n|
           options[:repeat_count] = n
         end
+        options[:keep_repeating] = false
+        parser.on '--[no-]keep-repeating', "Keep repeating even failed" do |n|
+          options[:keep_repeating] = true
+        end
       end
 
       def _run_anything(type)
         @repeat_count = @options[:repeat_count]
+        @keep_repeating = @options[:keep_repeating]
         super
       end
     end
@@ -1356,6 +1395,95 @@ def non_options(files, options)
       end
     end
 
+    module LaunchableOption
+      module Nothing
+        private
+        def setup_options(opts, options)
+          super
+          opts.define_tail 'Launchable options:'
+          # This is expected to be called by Test::Unit::Worker.
+          opts.on_tail '--launchable-test-reports=PATH', String, 'Do nothing'
+        end
+      end
+
+      def record(suite, method, assertions, time, error, source_location = nil)
+        if writer = @options[:launchable_test_reports]
+          if loc = (source_location || suite.instance_method(method).source_location)
+            path, lineno = loc
+            # Launchable JSON schema is defined at
+            # https://github.com/search?q=repo%3Alaunchableinc%2Fcli+https%3A%2F%2Flaunchableinc.com%2Fschema%2FRecordTestInput&type=code.
+            e = case error
+                when nil
+                  status = 'TEST_PASSED'
+                  nil
+                when Test::Unit::PendedError
+                  status = 'TEST_SKIPPED'
+                  "Skipped:\n#{suite.name}##{method} [#{location error}]:\n#{error.message}\n"
+                when Test::Unit::AssertionFailedError
+                  status = 'TEST_FAILED'
+                  "Failure:\n#{suite.name}##{method} [#{location error}]:\n#{error.message}\n"
+                when Timeout::Error
+                  status = 'TEST_FAILED'
+                  "Timeout:\n#{suite.name}##{method}\n"
+                else
+                  status = 'TEST_FAILED'
+                  bt = Test::filter_backtrace(error.backtrace).join "\n    "
+                  "Error:\n#{suite.name}##{method}:\n#{error.class}: #{error.message.b}\n    #{bt}\n"
+                end
+            repo_path = File.expand_path("#{__dir__}/../../../")
+            relative_path = path.delete_prefix("#{repo_path}/")
+            # The test path is a URL-encoded representation.
+            # https://github.com/launchableinc/cli/blob/v1.81.0/launchable/testpath.py#L18
+            test_path = {file: relative_path, class: suite.name, testcase: method}.map{|key, val|
+              "#{encode_test_path_component(key)}=#{encode_test_path_component(val)}"
+            }.join('#')
+          end
+        end
+        super
+      ensure
+        if writer && test_path && status
+          # Occasionally, the file writing operation may be paused, especially when `--repeat-count` is specified.
+          # In such cases, we proceed to execute the operation here.
+          writer.write_object(
+            {
+              testPath: test_path,
+              status: status,
+              duration: time,
+              createdAt: Time.now.to_s,
+              stderr: e,
+              stdout: nil,
+              data: {
+                lineNumber: lineno
+              }
+            }
+          )
+        end
+      end
+
+      private
+      def setup_options(opts, options)
+        super
+        opts.on_tail '--launchable-test-reports=PATH', String, 'Report test results in Launchable JSON format' do |path|
+          require_relative '../launchable'
+          options[:launchable_test_reports] = writer = Launchable::JsonStreamWriter.new(path)
+          writer.write_array('testCases')
+          main_pid = Process.pid
+          at_exit {
+            # This block is executed when the fork block in a test is completed.
+            # Therefore, we need to verify whether all tests have been completed.
+            stack = caller
+            if stack.size == 0 && main_pid == Process.pid && $!.is_a?(SystemExit)
+              writer.close
+            end
+          }
+        end
+
+        def encode_test_path_component component
+          component.to_s.gsub('%', '%25').gsub('=', '%3D').gsub('#', '%23').gsub('&', '%26')
+        end
+      end
+    end
+
     class Runner # :nodoc: all
 
       attr_accessor :report, :failures, :errors, :skips # :nodoc:
@@ -1501,7 +1629,7 @@ def _run_anything type
               [(@repeat_count ? "(#{@@current_repeat_count}/#{@repeat_count}) " : ""), type,
                 t, @test_count.fdiv(t), @assertion_count.fdiv(t)]
         end while @repeat_count && @@current_repeat_count < @repeat_count &&
-                  report.empty? && failures.zero? && errors.zero?
+                  (@keep_repeating || report.empty? && failures.zero? && errors.zero?)
 
         output.sync = old_sync if sync
 
@@ -1545,7 +1673,7 @@ def _run_suite suite, type
           _start_method(inst)
           inst._assertions = 0
 
-          print "#{suite}##{method} = " if @verbose
+          print "#{suite}##{method.inspect.sub(/\A:/, '')} = " if @verbose
 
           start_time = Time.now if @verbose
           result =
@@ -1560,9 +1688,7 @@ def _run_suite suite, type
           puts if @verbose
           $stdout.flush
 
-          unless defined?(RubyVM::RJIT) && RubyVM::RJIT.enabled? # compiler process is wrongly considered as leak
-            leakchecker.check("#{inst.class}\##{inst.__name__}")
-          end
+          leakchecker.check("#{inst.class}\##{inst.__name__}")
 
           _end_method(inst)
 
@@ -1593,19 +1719,11 @@ def _end_method(inst)
       # failure or error in teardown, it will be sent again with the
       # error or failure.
 
-      def record suite, method, assertions, time, error
+      def record suite, method, assertions, time, error, source_location = nil
       end
 
       def location e # :nodoc:
-        last_before_assertion = ""
-
-        return '<empty>' unless e.backtrace # SystemStackError can return nil.
-
-        e.backtrace.reverse_each do |s|
-          break if s =~ /in .(assert|refute|flunk|pass|fail|raise|must|wont)/
-          last_before_assertion = s
-        end
-        last_before_assertion.sub(/:in .*$/, '')
+        Test::Unit.location e
       end
 
       ##
@@ -1684,6 +1802,7 @@ def status io = self.output
       prepend Test::Unit::ExcludesOption
       prepend Test::Unit::TimeoutOption
       prepend Test::Unit::RunCount
+      prepend Test::Unit::LaunchableOption::Nothing
 
       ##
       # Begins the full test run. Delegates to +runner+'s #_run method.
@@ -1740,6 +1859,7 @@ def puke klass, meth, e
     class AutoRunner # :nodoc: all
       class Runner < Test::Unit::Runner
         include Test::Unit::RequireFiles
+        include Test::Unit::LaunchableOption
       end
 
       attr_accessor :to_run, :options
@@ -1748,6 +1868,7 @@ def initialize(force_standalone = false, default_dir = nil, argv = ARGV)
         @force_standalone = force_standalone
         @runner = Runner.new do |files, options|
           base = options[:base_directory] ||= default_dir
+          @runner.prefix = base ? (base + "/") : nil
           files << default_dir if files.empty? and default_dir
           @to_run = files
           yield self if block_given?
diff --git a/tool/lib/test/unit/assertions.rb b/tool/lib/test/unit/assertions.rb
index b4f1dbc1765f79..19581fc3ab3ec0 100644
--- a/tool/lib/test/unit/assertions.rb
+++ b/tool/lib/test/unit/assertions.rb
@@ -522,7 +522,7 @@ def refute_same exp, act, msg = nil
       # Skips the current test. Gets listed at the end of the run but
       # doesn't cause a failure exit code.
 
-      def pend msg = nil, bt = caller
+      def pend msg = nil, bt = caller, &_
         msg ||= "Skipped, no message given"
         @skip = true
         raise Test::Unit::PendedError, msg, bt
@@ -768,7 +768,14 @@ def assert_syntax_error(code, error, *args, **opt)
           e = assert_raise(SyntaxError, mesg) do
             syntax_check(src, fname, line)
           end
-          assert_match(error, e.message, mesg)
+
+          # Prism adds ANSI escape sequences to syntax error messages to
+          # colorize and format them. We strip them out here to make them easier
+          # to match against in tests.
+          message = e.message
+          message.gsub!(/\e\[.*?m/, "")
+
+          assert_match(error, message, mesg)
           e
         end
       end
@@ -791,33 +798,37 @@ def assert_no_warning(pat, msg = nil)
       MIN_MEASURABLE = 1.0 / MIN_HZ
 
       def assert_cpu_usage_low(msg = nil, pct: 0.05, wait: 1.0, stop: nil)
-        require 'benchmark'
-
         wait = EnvUtil.apply_timeout_scale(wait)
         if wait < 0.1 # TIME_QUANTUM_USEC in thread_pthread.c
           warn "test #{msg || 'assert_cpu_usage_low'} too short to be accurate"
         end
-        tms = Benchmark.measure(msg || '') do
-          if stop
-            th = Thread.start {sleep wait; stop.call}
-            yield
-            th.join
-          else
-            begin
-              Timeout.timeout(wait) {yield}
-            rescue Timeout::Error
-            end
+
+        t0, r0 = Process.times, Process.clock_gettime(Process::CLOCK_MONOTONIC)
+
+        if stop
+          th = Thread.start {sleep wait; stop.call}
+          yield
+          th.join
+        else
+          begin
+            Timeout.timeout(wait) {yield}
+          rescue Timeout::Error
           end
         end
 
-        max = pct * tms.real
+        t1, r1 = Process.times, Process.clock_gettime(Process::CLOCK_MONOTONIC)
+
+        total = t1.utime - t0.utime + t1.stime - t0.stime + t1.cutime - t0.cutime + t1.cstime - t0.cstime
+        real = r1 - r0
+
+        max = pct * real
         min_measurable = MIN_MEASURABLE
         min_measurable *= 1.30 # add a little (30%) to account for misc. overheads
         if max < min_measurable
           max = min_measurable
         end
 
-        assert_operator tms.total, :<=, max, msg
+        assert_operator total, :<=, max, msg
       end
 
       def assert_is_minus_zero(f)
diff --git a/tool/lib/test/unit/parallel.rb b/tool/lib/test/unit/parallel.rb
index 407e3fa1a2d524..188a0d1a191a2b 100644
--- a/tool/lib/test/unit/parallel.rb
+++ b/tool/lib/test/unit/parallel.rb
@@ -1,12 +1,6 @@
 # frozen_string_literal: true
-$LOAD_PATH.unshift "#{__dir__}/../.."
-require_relative '../../test/unit'
 
-require_relative '../../profile_test_all' if ENV.key?('RUBY_TEST_ALL_PROFILE')
-require_relative '../../tracepointchecker'
-require_relative '../../zombie_hunter'
-require_relative '../../iseq_loader_checker'
-require_relative '../../gc_checker'
+require_relative "../../../test/init"
 
 module Test
   module Unit
@@ -133,7 +127,18 @@ def run(args = []) # :nodoc:
               else
                 _report "ready"
               end
-            when /^quit$/
+            when /^quit (.+?)$/, "quit"
+              if $1 == "timeout"
+                err = ["", "!!! worker #{$$} killed due to timeout:"]
+                Thread.list.each do |th|
+                  err << "#{ th.inspect }:"
+                  th.backtrace.each do |s|
+                    err << "  #{ s }"
+                  end
+                end
+                err << ""
+                STDERR.puts err.join("\n")
+              end
               _report "bye"
               exit
             end
@@ -186,7 +191,7 @@ def record(suite, method, assertions, time, error) # :nodoc:
         else
           error = ProxyError.new(error)
         end
-        _report "record", Marshal.dump([suite.name, method, assertions, time, error])
+        _report "record", Marshal.dump([suite.name, method, assertions, time, error, suite.instance_method(method).source_location])
         super
       end
     end
diff --git a/tool/lib/test/unit/testcase.rb b/tool/lib/test/unit/testcase.rb
index 44d9ba7fdbf978..51ffff37ebc376 100644
--- a/tool/lib/test/unit/testcase.rb
+++ b/tool/lib/test/unit/testcase.rb
@@ -137,6 +137,9 @@ class TestCase
 
       attr_reader :__name__ # :nodoc:
 
+      # Method name of this test.
+      alias method_name __name__
+
       PASSTHROUGH_EXCEPTIONS = [NoMemoryError, SignalException,
                                 Interrupt, SystemExit] # :nodoc:
 
@@ -144,8 +147,7 @@ class TestCase
       # Runs the tests reporting the status to +runner+
 
       def run runner
-        @options = runner.options
-
+        @__runner_options__ = runner.options
         trap "INFO" do
           runner.report.each_with_index do |msg, i|
             warn "\n%3d) %s" % [i + 1, msg]
@@ -161,7 +163,7 @@ def run runner
         result = ""
 
         begin
-          @passed = nil
+          @__passed__ = nil
           self.before_setup
           self.setup
           self.after_setup
@@ -169,11 +171,11 @@ def run runner
           result = "." unless io?
           time = Time.now - start_time
           runner.record self.class, self.__name__, self._assertions, time, nil
-          @passed = true
+          @__passed__ = true
         rescue *PASSTHROUGH_EXCEPTIONS
           raise
         rescue Exception => e
-          @passed = Test::Unit::PendedError === e
+          @__passed__ = Test::Unit::PendedError === e
           time = Time.now - start_time
           runner.record self.class, self.__name__, self._assertions, time, e
           result = runner.puke self.class, self.__name__, e
@@ -184,7 +186,7 @@ def run runner
             rescue *PASSTHROUGH_EXCEPTIONS
               raise
             rescue Exception => e
-              @passed = false
+              @__passed__ = false
               runner.record self.class, self.__name__, self._assertions, time, e
               result = runner.puke self.class, self.__name__, e
             end
@@ -206,12 +208,12 @@ def run_test(name)
       def initialize name # :nodoc:
         @__name__ = name
         @__io__ = nil
-        @passed = nil
-        @@current = self # FIX: make thread local
+        @__passed__ = nil
+        @@__current__ = self # FIX: make thread local
       end
 
       def self.current # :nodoc:
-        @@current # FIX: make thread local
+        @@__current__ # FIX: make thread local
       end
 
       ##
@@ -263,7 +265,7 @@ def self.test_methods # :nodoc:
       # Returns true if the test passed.
 
       def passed?
-        @passed
+        @__passed__
       end
 
       ##
diff --git a/tool/lib/vcs.rb b/tool/lib/vcs.rb
index 8566d723497554..2c019d81fd421f 100644
--- a/tool/lib/vcs.rb
+++ b/tool/lib/vcs.rb
@@ -226,6 +226,7 @@ def relative_to(path)
 
   def after_export(dir)
     FileUtils.rm_rf(Dir.glob("#{dir}/.git*"))
+    FileUtils.rm_rf(Dir.glob("#{dir}/.mailmap"))
   end
 
   def revision_handler(rev)
@@ -270,155 +271,6 @@ def revision_header(last, release_date, release_datetime = nil, branch = nil, ti
     code
   end
 
-  class SVN < self
-    register(".svn")
-    COMMAND = ENV['SVN'] || 'svn'
-
-    def self.revision_name(rev)
-      "r#{rev}"
-    end
-
-    def _get_revisions(path, srcdir = nil)
-      if srcdir and self.class.local_path?(path)
-        path = File.join(srcdir, path)
-      end
-      if srcdir
-        info_xml = IO.pread(%W"#{COMMAND} info --xml #{srcdir}")
-        info_xml = nil unless info_xml[/<url>(.*)<\/url>/, 1] == path.to_s
-      end
-      info_xml ||= IO.pread(%W"#{COMMAND} info --xml #{path}")
-      _, last, _, changed, _ = info_xml.split(/revision="(\d+)"/)
-      modified = info_xml[/<date>([^<>]*)/, 1]
-      branch = info_xml[%r'<relative-url>\^/(?:branches/|tags/)?([^<>]+)', 1]
-      [Integer(last), Integer(changed), modified, branch]
-    end
-
-    def self.search_root(path)
-      return unless local_path?(path)
-      parent = File.realpath(path)
-      begin
-        parent = File.dirname(wkdir = parent)
-        return wkdir if File.directory?(wkdir + "/.svn")
-      end until parent == wkdir
-    end
-
-    def get_info
-      @info ||= IO.pread(%W"#{COMMAND} info --xml #{@srcdir}")
-    end
-
-    def url
-      @url ||= begin
-        url = get_info[/<root>(.*)<\/root>/, 1]
-        @url = URI.parse(url+"/") if url
-      end
-    end
-
-    def wcroot
-      @wcroot ||= begin
-        info = get_info
-        @wcroot = info[/<wcroot-abspath>(.*)<\/wcroot-abspath>/, 1]
-        @wcroot ||= self.class.search_root(@srcdir)
-      end
-    end
-
-    def branch(name)
-      return trunk if name == "trunk"
-      url + "branches/#{name}"
-    end
-
-    def tag(name)
-      url + "tags/#{name}"
-    end
-
-    def trunk
-      url + "trunk"
-    end
-    alias master trunk
-
-    def branch_list(pat)
-      IO.popen(%W"#{COMMAND} ls #{branch('')}") do |f|
-        f.each do |line|
-          line.chomp!
-          line.chomp!('/')
-          yield(line) if File.fnmatch?(pat, line)
-        end
-      end
-    end
-
-    def grep(pat, tag, *files, &block)
-      cmd = %W"#{COMMAND} cat"
-      files.map! {|n| File.join(tag, n)} if tag
-      set = block.binding.eval("proc {|match| $~ = match}")
-      IO.popen([cmd, *files]) do |f|
-        f.grep(pat) do |s|
-          set[$~]
-          yield s
-        end
-      end
-    end
-
-    def export(revision, url, dir, keep_temp = false)
-      if @srcdir and (rootdir = wcroot)
-        srcdir = File.realpath(@srcdir)
-        rootdir << "/"
-        if srcdir.start_with?(rootdir)
-          subdir = srcdir[rootdir.size..-1]
-          subdir = nil if subdir.empty?
-          FileUtils.mkdir_p(svndir = dir+"/.svn")
-          FileUtils.ln_s(Dir.glob(rootdir+"/.svn/*"), svndir)
-          system(COMMAND, "-q", "revert", "-R", subdir || ".", :chdir => dir) or return false
-          FileUtils.rm_rf(svndir) unless keep_temp
-          if subdir
-            tmpdir = Dir.mktmpdir("tmp-co.", "#{dir}/#{subdir}")
-            File.rename(tmpdir, tmpdir = "#{dir}/#{File.basename(tmpdir)}")
-            FileUtils.mv(Dir.glob("#{dir}/#{subdir}/{.[^.]*,..?*,*}"), tmpdir)
-            begin
-              Dir.rmdir("#{dir}/#{subdir}")
-            end until (subdir = File.dirname(subdir)) == '.'
-            FileUtils.mv(Dir.glob("#{tmpdir}/#{subdir}/{.[^.]*,..?*,*}"), dir)
-            Dir.rmdir(tmpdir)
-          end
-          return self
-        end
-      end
-      IO.popen(%W"#{COMMAND} export -r #{revision} #{url} #{dir}") do |pipe|
-        pipe.each {|line| /^A/ =~ line or yield line}
-      end
-      self if $?.success?
-    end
-
-    def after_export(dir)
-      super
-      FileUtils.rm_rf(dir+"/.svn")
-    end
-
-    def branch_beginning(url)
-      # `--limit` of svn-log is useless in this case, because it is
-      # applied before `--search`.
-      rev = IO.pread(%W[ #{COMMAND} log --xml
-                         --search=matz --search-and=has\ started
-                         -- #{url}/version.h])[/<logentry\s+revision="(\d+)"/m, 1]
-      rev.to_i if rev
-    end
-
-    def export_changelog(url = '.', from = nil, to = nil, _path = nil, path: _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|
-        IO.copy_stream(r, path)
-      end
-    end
-
-    def commit
-      args = %W"#{COMMAND} commit"
-      if dryrun?
-        VCS.dump(args, "commit: ")
-        return true
-      end
-      system(*args)
-    end
-  end
-
   class GIT < self
     register(".git") do |path, dir|
       SAFE_DIRECTORIES ||=
@@ -478,7 +330,7 @@ def _get_revisions(path, srcdir = nil)
         last = cmd_read_at(srcdir, [[*gitcmd, 'rev-parse', ref, err: w]]).rstrip
         w.close
         unless r.eof?
-          raise "#{COMMAND} rev-parse failed\n#{r.read.gsub(/^(?=\s*\S)/, '  ')}"
+          raise VCS::NotFoundError, "#{COMMAND} rev-parse failed\n#{r.read.gsub(/^(?=\s*\S)/, '  ')}"
         end
       end
       log = cmd_read_at(srcdir, [[*gitcmd, 'log', '-n1', '--date=iso', '--pretty=fuller', *path]])
@@ -532,15 +384,6 @@ def self.short_revision(rev)
       rev[0, 10]
     end
 
-    def revision_handler(rev)
-      case rev
-      when Integer
-        SVN
-      else
-        super
-      end
-    end
-
     def without_gitconfig
       envs = (%w'HOME XDG_CONFIG_HOME' + ENV.keys.grep(/\AGIT_/)).each_with_object({}) do |v, h|
         h[v] = ENV.delete(v)
@@ -615,7 +458,7 @@ def grep(pat, tag, *files, &block)
 
     def export(revision, url, dir, keep_temp = false)
       system(COMMAND, "clone", "-c", "advice.detachedHead=false", "-s", (@srcdir || '.').to_s, "-b", url, dir) or return
-      (Integer === revision ? GITSVN : GIT).new(File.expand_path(dir))
+      GIT.new(File.expand_path(dir))
     end
 
     def branch_beginning(url)
@@ -625,22 +468,15 @@ def branch_beginning(url)
     end
 
     def export_changelog(url = '@', from = nil, to = nil, _path = nil, path: _path, base_url: nil)
-      svn = nil
       from, to = [from, to].map do |rev|
         rev or next
-        if Integer === rev
-          svn = true
-          rev = cmd_read({'LANG' => 'C', 'LC_ALL' => 'C'},
-                         %W"#{COMMAND} log -n1 --format=format:%H" <<
-                         "--grep=^ *git-svn-id: .*@#{rev} ")
-        end
         rev unless rev.empty?
       end
       unless (from && /./.match(from)) or ((from = branch_beginning(url)) && /./.match(from))
         warn "no starting commit found", uplevel: 1
         from = nil
       end
-      if svn or system(*%W"#{COMMAND} fetch origin refs/notes/commits:refs/notes/commits",
+      if system(*%W"#{COMMAND} fetch origin refs/notes/commits:refs/notes/commits",
                            chdir: @srcdir, exception: false)
         system(*%W"#{COMMAND} fetch origin refs/notes/log-fix:refs/notes/log-fix",
                chdir: @srcdir, exception: false)
@@ -653,22 +489,17 @@ def export_changelog(url = '@', from = nil, to = nil, _path = nil, path: _path,
       else
         arg = ["--since=25 Dec 00:00:00", to]
       end
-      writer =
-        if svn
-          format_changelog_as_svn(path, arg)
-        else
-          if base_url == true
-            remote, = upstream
-            if remote &&= cmd_read(env, %W[#{COMMAND} remote get-url --no-push #{remote}])
-              remote.chomp!
-              # hack to redirect git.r-l.o to github
-              remote.sub!(/\Agit@git\.ruby-lang\.org:/, 'git@github.com:ruby/')
-              remote.sub!(/\Agit@(.*?):(.*?)(?:\.git)?\z/, 'https://\1/\2/commit/')
-            end
-            base_url = remote
-          end
-          format_changelog(path, arg, base_url)
+      if base_url == true
+        remote, = upstream
+        if remote &&= cmd_read(env, %W[#{COMMAND} remote get-url --no-push #{remote}])
+          remote.chomp!
+          # hack to redirect git.r-l.o to github
+          remote.sub!(/\Agit@git\.ruby-lang\.org:/, 'git@github.com:ruby/')
+          remote.sub!(/\Agit@(.*?):(.*?)(?:\.git)?\z/, 'https://\1/\2/commit/')
         end
+        base_url = remote
+      end
+      writer = changelog_formatter(path, arg, base_url)
       if !path or path == '-'
         writer[$stdout]
       else
@@ -678,9 +509,12 @@ def export_changelog(url = '@', from = nil, to = nil, _path = nil, path: _path,
 
     LOG_FIX_REGEXP_SEPARATORS = '/!:;|,#%&'
 
-    def format_changelog(path, arg, base_url = nil)
+    def changelog_formatter(path, arg, base_url = nil)
       env = {'TZ' => 'JST-9', 'LANG' => 'C', 'LC_ALL' => 'C'}
-      cmd = %W"#{COMMAND} log --format=fuller --notes=commits --notes=log-fix --topo-order --no-merges"
+      cmd = %W[#{COMMAND} log
+        --format=fuller --notes=commits --notes=log-fix --topo-order --no-merges
+        --fixed-strings --invert-grep --grep=[ci\ skip] --grep=[skip\ ci]
+      ]
       date = "--date=iso-local"
       unless system(env, *cmd, date, "-1", chdir: @srcdir, out: NullDevice, exception: false)
         date = "--date=iso"
@@ -688,25 +522,69 @@ def format_changelog(path, arg, base_url = nil)
       cmd << date
       cmd.concat(arg)
       proc do |w|
-        w.print "-*- coding: utf-8 -*-\n\n"
-        w.print "base-url = #{base_url}\n\n" if base_url
+        w.print "-*- coding: utf-8 -*-\n"
+        w.print "\n""base-url = #{base_url}\n" if base_url
+
+        begin
+          ignore_revs = File.readlines(File.join(@srcdir, ".git-blame-ignore-revs"), chomp: true)
+                          .grep_v(/^ *(?:#|$)/)
+                          .to_h {|v| [v, true]}
+          ignore_revs = nil if ignore_revs.empty?
+        rescue Errno::ENOENT
+        end
+
         cmd_pipe(env, cmd, chdir: @srcdir) do |r|
-          while s = r.gets("\ncommit ")
+          r.gets(sep = "commit ")
+          sep = "\n" + sep
+          while s = r.gets(sep, chomp: true)
             h, s = s.split(/^$/, 2)
+            if ignore_revs&.key?(h[/\A\h{40}/])
+              next
+            end
+
+            next if /^Author: *dependabot\[bot\]/ =~ h
+
             h.gsub!(/^(?:(?:Author|Commit)(?:Date)?|Date): /, '  \&')
             if s.sub!(/\nNotes \(log-fix\):\n((?: +.*\n)+)/, '')
               fix = $1
+              next if /\A *skip\Z/ =~ fix
               s = s.lines
               fix.each_line do |x|
+                next unless x.sub!(/^(\s+)(?:(\d+)|\$(?:-\d+)?)/, '')
+                b = ($2&.to_i || (s.size - 1 + $3.to_i))
+                sp = $1
+                if x.sub!(/^,(?:(\d+)|\$(?:-\d+)?)/, '')
+                  range = b..($1&.to_i || (s.size - 1 + $2.to_i))
+                else
+                  range = b..b
+                end
                 case x
-                when %r[^ +(\d+)s([#{LOG_FIX_REGEXP_SEPARATORS}])(.+)\2(.*)\2]o
-                  n = $1.to_i
-                  wrong = $3
-                  correct = $4
-                  begin
-                    s[n][wrong] = correct
-                  rescue IndexError
-                    message = ["format_changelog failed to replace #{wrong.dump} with #{correct.dump} at #$1\n"]
+                when %r[^s([#{LOG_FIX_REGEXP_SEPARATORS}])(.+)\1(.*)\1([gr]+)?]o
+                  wrong = $2
+                  correct = $3
+                  if opt = $4 and opt.include?("r") # regexp
+                    wrong = Regexp.new(wrong)
+                    correct.gsub!(/(?<!\\)(?:\\\\)*\K(?:\\n)+/) {"\n" * ($&.size / 2)}
+                    sub = opt.include?("g") ? :gsub! : :sub!
+                  else
+                    sub = false
+                  end
+                  range.each do |n|
+                    if sub
+                      ss = s[n].sub(/^#{sp}/, "") # un-indent for /^/
+                      if ss.__send__(sub, wrong, correct)
+                        s[n, 1] = ss.lines.map {|l| "#{sp}#{l}"}
+                        next
+                      end
+                    else
+                      begin
+                        s[n][wrong] = correct
+                      rescue IndexError
+                      else
+                        next
+                      end
+                    end
+                    message = ["changelog_formatter failed to replace #{wrong.dump} with #{correct.dump} at #{n}\n"]
                     from = [1, n-2].max
                     to = [s.size-1, n+2].min
                     s.each_with_index do |e, i|
@@ -716,12 +594,13 @@ def format_changelog(path, arg, base_url = nil)
                     end
                     raise message.join('')
                   end
-                when %r[^( +)(\d+)i([#{LOG_FIX_REGEXP_SEPARATORS}])(.*)\3]o
-                  s[$2.to_i, 0] = "#{$1}#{$4}\n"
-                when %r[^ +(\d+)(?:,(\d+))?d]
-                  n = $1.to_i
-                  e = $2
-                  s[n..(e ? e.to_i : n)] = []
+                when %r[^i([#{LOG_FIX_REGEXP_SEPARATORS}])(.*)\1]o
+                  insert = "#{sp}#{$2}\n"
+                  range.reverse_each do |n|
+                    s[n, 0] = insert
+                  end
+                when %r[^d]
+                  s[range] = []
                 end
               end
               s = s.join('')
@@ -734,28 +613,7 @@ def format_changelog(path, arg, base_url = nil)
 
             s.gsub!(/ +\n/, "\n")
             s.sub!(/^Notes:/, '  \&')
-            w.print h, s
-          end
-        end
-      end
-    end
-
-    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)
-      proc do |w|
-        sep = "-"*72 + "\n"
-        w.print sep
-        cmd_pipe(cmd) do |r|
-          while s = r.gets("\0")
-            s.chomp!("\0")
-            author, time, s = s.split("\n", 3)
-            s.sub!(/\n\ngit-svn-id: .*@(\d+) .*\n\Z/, '')
-            rev = $1
-            time = Time.at(time.to_i).getlocal("+09:00").strftime("%F %T %z (%a, %d %b %Y)")
-            lines = s.count("\n") + 1
-            lines = "#{lines} line#{lines == 1 ? '' : 's'}"
-            w.print "r#{rev} | #{author} | #{time} | #{lines}\n\n", s, "\n", sep
+            w.print sep, h, s
           end
         end
       end
@@ -792,46 +650,6 @@ def commit(opts = {})
     end
   end
 
-  class GITSVN < GIT
-    def self.revision_name(rev)
-      SVN.revision_name(rev)
-    end
-
-    def last_changed_revision
-      rev = cmd_read(%W"#{COMMAND} svn info"+[STDERR=>[:child, :out]])[/^Last Changed Rev: (\d+)/, 1]
-      com = cmd_read(%W"#{COMMAND} svn find-rev r#{rev}").chomp
-      return rev, com
-    end
-
-    def commit(opts = {})
-      rev, com = last_changed_revision
-      head = cmd_read(%W"#{COMMAND} symbolic-ref --short HEAD").chomp
-
-      commits = cmd_read([COMMAND, "log", "--reverse", "--format=%H %ae %ce", "#{com}..@"], "rb").split("\n")
-      commits.each_with_index do |l, i|
-        r, a, c = l.split(' ')
-        dcommit = [COMMAND, "svn", "dcommit"]
-        dcommit.insert(-2, "-n") if dryrun?
-        dcommit << "--add-author-from" unless a == c
-        dcommit << r
-        system(*dcommit) or return false
-        system(COMMAND, "checkout", head) or return false
-        system(COMMAND, "rebase") or return false
-      end
-
-      if rev
-        old = [cmd_read(%W"#{COMMAND} log -1 --format=%H").chomp]
-        old << cmd_read(%W"#{COMMAND} svn reset -r#{rev}")[/^r#{rev} = (\h+)/, 1]
-        3.times do
-          sleep 2
-          system(*%W"#{COMMAND} pull --no-edit --rebase")
-          break unless old.include?(cmd_read(%W"#{COMMAND} log -1 --format=%H").chomp)
-        end
-      end
-      true
-    end
-  end
-
   class Null < self
     def get_revisions(path, srcdir = nil)
       @modified ||= Time.now - 10
diff --git a/tool/lib/webrick.rb b/tool/lib/webrick.rb
deleted file mode 100644
index b854b68db4a98a..00000000000000
--- a/tool/lib/webrick.rb
+++ /dev/null
@@ -1,232 +0,0 @@
-# frozen_string_literal: false
-##
-# = WEB server toolkit.
-#
-# WEBrick is an HTTP server toolkit that can be configured as an HTTPS server,
-# a proxy server, and a virtual-host server.  WEBrick features complete
-# logging of both server operations and HTTP access.  WEBrick supports both
-# basic and digest authentication in addition to algorithms not in RFC 2617.
-#
-# A WEBrick server can be composed of multiple WEBrick servers or servlets to
-# provide differing behavior on a per-host or per-path basis.  WEBrick
-# includes servlets for handling CGI scripts, ERB pages, Ruby blocks and
-# directory listings.
-#
-# WEBrick also includes tools for daemonizing a process and starting a process
-# at a higher privilege level and dropping permissions.
-#
-# == Security
-#
-# *Warning:* WEBrick is not recommended for production.  It only implements
-# basic security checks.
-#
-# == Starting an HTTP server
-#
-# To create a new WEBrick::HTTPServer that will listen to connections on port
-# 8000 and serve documents from the current user's public_html folder:
-#
-#   require 'webrick'
-#
-#   root = File.expand_path '~/public_html'
-#   server = WEBrick::HTTPServer.new :Port => 8000, :DocumentRoot => root
-#
-# To run the server you will need to provide a suitable shutdown hook as
-# starting the server blocks the current thread:
-#
-#   trap 'INT' do server.shutdown end
-#
-#   server.start
-#
-# == Custom Behavior
-#
-# The easiest way to have a server perform custom operations is through
-# WEBrick::HTTPServer#mount_proc.  The block given will be called with a
-# WEBrick::HTTPRequest with request info and a WEBrick::HTTPResponse which
-# must be filled in appropriately:
-#
-#   server.mount_proc '/' do |req, res|
-#     res.body = 'Hello, world!'
-#   end
-#
-# Remember that +server.mount_proc+ must precede +server.start+.
-#
-# == Servlets
-#
-# Advanced custom behavior can be obtained through mounting a subclass of
-# WEBrick::HTTPServlet::AbstractServlet.  Servlets provide more modularity
-# when writing an HTTP server than mount_proc allows.  Here is a simple
-# servlet:
-#
-#   class Simple < WEBrick::HTTPServlet::AbstractServlet
-#     def do_GET request, response
-#       status, content_type, body = do_stuff_with request
-#
-#       response.status = 200
-#       response['Content-Type'] = 'text/plain'
-#       response.body = 'Hello, World!'
-#     end
-#   end
-#
-# To initialize the servlet you mount it on the server:
-#
-#   server.mount '/simple', Simple
-#
-# See WEBrick::HTTPServlet::AbstractServlet for more details.
-#
-# == Virtual Hosts
-#
-# A server can act as a virtual host for multiple host names.  After creating
-# the listening host, additional hosts that do not listen can be created and
-# attached as virtual hosts:
-#
-#   server = WEBrick::HTTPServer.new # ...
-#
-#   vhost = WEBrick::HTTPServer.new :ServerName => 'vhost.example',
-#                                   :DoNotListen => true, # ...
-#   vhost.mount '/', ...
-#
-#   server.virtual_host vhost
-#
-# If no +:DocumentRoot+ is provided and no servlets or procs are mounted on the
-# main server it will return 404 for all URLs.
-#
-# == HTTPS
-#
-# To create an HTTPS server you only need to enable SSL and provide an SSL
-# certificate name:
-#
-#   require 'webrick'
-#   require 'webrick/https'
-#
-#   cert_name = [
-#     %w[CN localhost],
-#   ]
-#
-#   server = WEBrick::HTTPServer.new(:Port => 8000,
-#                                    :SSLEnable => true,
-#                                    :SSLCertName => cert_name)
-#
-# This will start the server with a self-generated self-signed certificate.
-# The certificate will be changed every time the server is restarted.
-#
-# To create a server with a pre-determined key and certificate you can provide
-# them:
-#
-#   require 'webrick'
-#   require 'webrick/https'
-#   require 'openssl'
-#
-#   cert = OpenSSL::X509::Certificate.new File.read '/path/to/cert.pem'
-#   pkey = OpenSSL::PKey::RSA.new File.read '/path/to/pkey.pem'
-#
-#   server = WEBrick::HTTPServer.new(:Port => 8000,
-#                                    :SSLEnable => true,
-#                                    :SSLCertificate => cert,
-#                                    :SSLPrivateKey => pkey)
-#
-# == Proxy Server
-#
-# WEBrick can act as a proxy server:
-#
-#   require 'webrick'
-#   require 'webrick/httpproxy'
-#
-#   proxy = WEBrick::HTTPProxyServer.new :Port => 8000
-#
-#   trap 'INT' do proxy.shutdown end
-#
-# See WEBrick::HTTPProxy for further details including modifying proxied
-# responses.
-#
-# == Basic and Digest authentication
-#
-# WEBrick provides both Basic and Digest authentication for regular and proxy
-# servers.  See WEBrick::HTTPAuth, WEBrick::HTTPAuth::BasicAuth and
-# WEBrick::HTTPAuth::DigestAuth.
-#
-# == WEBrick as a daemonized Web Server
-#
-# WEBrick can be run as a daemonized server for small loads.
-#
-# === Daemonizing
-#
-# To start a WEBrick server as a daemon simple run WEBrick::Daemon.start
-# before starting the server.
-#
-# === Dropping Permissions
-#
-# WEBrick can be started as one user to gain permission to bind to port 80 or
-# 443 for serving HTTP or HTTPS traffic then can drop these permissions for
-# regular operation.  To listen on all interfaces for HTTP traffic:
-#
-#   sockets = WEBrick::Utils.create_listeners nil, 80
-#
-# Then drop privileges:
-#
-#   WEBrick::Utils.su 'www'
-#
-# Then create a server that does not listen by default:
-#
-#   server = WEBrick::HTTPServer.new :DoNotListen => true, # ...
-#
-# Then overwrite the listening sockets with the port 80 sockets:
-#
-#   server.listeners.replace sockets
-#
-# === Logging
-#
-# WEBrick can separately log server operations and end-user access.  For
-# server operations:
-#
-#   log_file = File.open '/var/log/webrick.log', 'a+'
-#   log = WEBrick::Log.new log_file
-#
-# For user access logging:
-#
-#   access_log = [
-#     [log_file, WEBrick::AccessLog::COMBINED_LOG_FORMAT],
-#   ]
-#
-#   server = WEBrick::HTTPServer.new :Logger => log, :AccessLog => access_log
-#
-# See WEBrick::AccessLog for further log formats.
-#
-# === Log Rotation
-#
-# To rotate logs in WEBrick on a HUP signal (like syslogd can send), open the
-# log file in 'a+' mode (as above) and trap 'HUP' to reopen the log file:
-#
-#   trap 'HUP' do log_file.reopen '/path/to/webrick.log', 'a+'
-#
-# == Copyright
-#
-# Author: IPR -- Internet Programming with Ruby -- writers
-#
-# Copyright (c) 2000 TAKAHASHI Masayoshi, GOTOU YUUZOU
-# Copyright (c) 2002 Internet Programming with Ruby writers. All rights
-# reserved.
-#--
-# $IPR: webrick.rb,v 1.12 2002/10/01 17:16:31 gotoyuzo Exp $
-
-module WEBrick
-end
-
-require 'webrick/compat.rb'
-
-require 'webrick/version.rb'
-require 'webrick/config.rb'
-require 'webrick/log.rb'
-require 'webrick/server.rb'
-require_relative 'webrick/utils.rb'
-require 'webrick/accesslog'
-
-require 'webrick/htmlutils.rb'
-require 'webrick/httputils.rb'
-require 'webrick/cookie.rb'
-require 'webrick/httpversion.rb'
-require 'webrick/httpstatus.rb'
-require 'webrick/httprequest.rb'
-require 'webrick/httpresponse.rb'
-require 'webrick/httpserver.rb'
-require 'webrick/httpservlet.rb'
-require 'webrick/httpauth.rb'
diff --git a/tool/lib/webrick/.document b/tool/lib/webrick/.document
deleted file mode 100644
index c62f89083b2e6f..00000000000000
--- a/tool/lib/webrick/.document
+++ /dev/null
@@ -1,6 +0,0 @@
-# Add files to this as they become documented
-
-*.rb
-
-httpauth
-httpservlet
diff --git a/tool/lib/webrick/accesslog.rb b/tool/lib/webrick/accesslog.rb
deleted file mode 100644
index e4849637f35898..00000000000000
--- a/tool/lib/webrick/accesslog.rb
+++ /dev/null
@@ -1,157 +0,0 @@
-# frozen_string_literal: false
-#--
-# accesslog.rb -- Access log handling utilities
-#
-# Author: IPR -- Internet Programming with Ruby -- writers
-# Copyright (c) 2002 keita yamaguchi
-# Copyright (c) 2002 Internet Programming with Ruby writers
-#
-# $IPR: accesslog.rb,v 1.1 2002/10/01 17:16:32 gotoyuzo Exp $
-
-module WEBrick
-
-  ##
-  # AccessLog provides logging to various files in various formats.
-  #
-  # Multiple logs may be written to at the same time:
-  #
-  #   access_log = [
-  #     [$stderr, WEBrick::AccessLog::COMMON_LOG_FORMAT],
-  #     [$stderr, WEBrick::AccessLog::REFERER_LOG_FORMAT],
-  #   ]
-  #
-  #   server = WEBrick::HTTPServer.new :AccessLog => access_log
-  #
-  # Custom log formats may be defined.  WEBrick::AccessLog provides a subset
-  # of the formatting from Apache's mod_log_config
-  # http://httpd.apache.org/docs/mod/mod_log_config.html#formats.  See
-  # AccessLog::setup_params for a list of supported options
-
-  module AccessLog
-
-    ##
-    # Raised if a parameter such as %e, %i, %o or %n is used without fetching
-    # a specific field.
-
-    class AccessLogError < StandardError; end
-
-    ##
-    # The Common Log Format's time format
-
-    CLF_TIME_FORMAT     = "[%d/%b/%Y:%H:%M:%S %Z]"
-
-    ##
-    # Common Log Format
-
-    COMMON_LOG_FORMAT   = "%h %l %u %t \"%r\" %s %b"
-
-    ##
-    # Short alias for Common Log Format
-
-    CLF                 = COMMON_LOG_FORMAT
-
-    ##
-    # Referer Log Format
-
-    REFERER_LOG_FORMAT  = "%{Referer}i -> %U"
-
-    ##
-    # User-Agent Log Format
-
-    AGENT_LOG_FORMAT    = "%{User-Agent}i"
-
-    ##
-    # Combined Log Format
-
-    COMBINED_LOG_FORMAT = "#{CLF} \"%{Referer}i\" \"%{User-agent}i\""
-
-    module_function
-
-    # This format specification is a subset of mod_log_config of Apache:
-    #
-    # %a:: Remote IP address
-    # %b:: Total response size
-    # %e{variable}:: Given variable in ENV
-    # %f:: Response filename
-    # %h:: Remote host name
-    # %{header}i:: Given request header
-    # %l:: Remote logname, always "-"
-    # %m:: Request method
-    # %{attr}n:: Given request attribute from <tt>req.attributes</tt>
-    # %{header}o:: Given response header
-    # %p:: Server's request port
-    # %{format}p:: The canonical port of the server serving the request or the
-    #              actual port or the client's actual port.  Valid formats are
-    #              canonical, local or remote.
-    # %q:: Request query string
-    # %r:: First line of the request
-    # %s:: Request status
-    # %t:: Time the request was received
-    # %T:: Time taken to process the request
-    # %u:: Remote user from auth
-    # %U:: Unparsed URI
-    # %%:: Literal %
-
-    def setup_params(config, req, res)
-      params = Hash.new("")
-      params["a"] = req.peeraddr[3]
-      params["b"] = res.sent_size
-      params["e"] = ENV
-      params["f"] = res.filename || ""
-      params["h"] = req.peeraddr[2]
-      params["i"] = req
-      params["l"] = "-"
-      params["m"] = req.request_method
-      params["n"] = req.attributes
-      params["o"] = res
-      params["p"] = req.port
-      params["q"] = req.query_string
-      params["r"] = req.request_line.sub(/\x0d?\x0a\z/o, '')
-      params["s"] = res.status       # won't support "%>s"
-      params["t"] = req.request_time
-      params["T"] = Time.now - req.request_time
-      params["u"] = req.user || "-"
-      params["U"] = req.unparsed_uri
-      params["v"] = config[:ServerName]
-      params
-    end
-
-    ##
-    # Formats +params+ according to +format_string+ which is described in
-    # setup_params.
-
-    def format(format_string, params)
-      format_string.gsub(/\%(?:\{(.*?)\})?>?([a-zA-Z%])/){
-         param, spec = $1, $2
-         case spec[0]
-         when ?e, ?i, ?n, ?o
-           raise AccessLogError,
-             "parameter is required for \"#{spec}\"" unless param
-           (param = params[spec][param]) ? escape(param) : "-"
-         when ?t
-           params[spec].strftime(param || CLF_TIME_FORMAT)
-         when ?p
-           case param
-           when 'remote'
-             escape(params["i"].peeraddr[1].to_s)
-           else
-             escape(params["p"].to_s)
-           end
-         when ?%
-           "%"
-         else
-           escape(params[spec].to_s)
-         end
-      }
-    end
-
-    ##
-    # Escapes control characters in +data+
-
-    def escape(data)
-      data = data.gsub(/[[:cntrl:]\\]+/) {$&.dump[1...-1]}
-      data.untaint if RUBY_VERSION < '2.7'
-      data
-    end
-  end
-end
diff --git a/tool/lib/webrick/cgi.rb b/tool/lib/webrick/cgi.rb
deleted file mode 100644
index bb0ae2fc844214..00000000000000
--- a/tool/lib/webrick/cgi.rb
+++ /dev/null
@@ -1,313 +0,0 @@
-# frozen_string_literal: false
-#
-# cgi.rb -- Yet another CGI library
-#
-# Author: IPR -- Internet Programming with Ruby -- writers
-# Copyright (c) 2003 Internet Programming with Ruby writers. All rights
-# reserved.
-#
-# $Id$
-
-require_relative "httprequest"
-require_relative "httpresponse"
-require_relative "config"
-require "stringio"
-
-module WEBrick
-
-  # A CGI library using WEBrick requests and responses.
-  #
-  # Example:
-  #
-  #   class MyCGI < WEBrick::CGI
-  #     def do_GET req, res
-  #       res.body = 'it worked!'
-  #       res.status = 200
-  #     end
-  #   end
-  #
-  #   MyCGI.new.start
-
-  class CGI
-
-    # The CGI error exception class
-
-    CGIError = Class.new(StandardError)
-
-    ##
-    # The CGI configuration.  This is based on WEBrick::Config::HTTP
-
-    attr_reader :config
-
-    ##
-    # The CGI logger
-
-    attr_reader :logger
-
-    ##
-    # Creates a new CGI interface.
-    #
-    # The first argument in +args+ is a configuration hash which would update
-    # WEBrick::Config::HTTP.
-    #
-    # Any remaining arguments are stored in the <code>@options</code> instance
-    # variable for use by a subclass.
-
-    def initialize(*args)
-      if defined?(MOD_RUBY)
-        unless ENV.has_key?("GATEWAY_INTERFACE")
-          Apache.request.setup_cgi_env
-        end
-      end
-      if %r{HTTP/(\d+\.\d+)} =~ ENV["SERVER_PROTOCOL"]
-        httpv = $1
-      end
-      @config = WEBrick::Config::HTTP.dup.update(
-        :ServerSoftware => ENV["SERVER_SOFTWARE"] || "null",
-        :HTTPVersion    => HTTPVersion.new(httpv || "1.0"),
-        :RunOnCGI       => true,   # to detect if it runs on CGI.
-        :NPH            => false   # set true to run as NPH script.
-      )
-      if config = args.shift
-        @config.update(config)
-      end
-      @config[:Logger] ||= WEBrick::BasicLog.new($stderr)
-      @logger = @config[:Logger]
-      @options = args
-    end
-
-    ##
-    # Reads +key+ from the configuration
-
-    def [](key)
-      @config[key]
-    end
-
-    ##
-    # Starts the CGI process with the given environment +env+ and standard
-    # input and output +stdin+ and +stdout+.
-
-    def start(env=ENV, stdin=$stdin, stdout=$stdout)
-      sock = WEBrick::CGI::Socket.new(@config, env, stdin, stdout)
-      req = HTTPRequest.new(@config)
-      res = HTTPResponse.new(@config)
-      unless @config[:NPH] or defined?(MOD_RUBY)
-        def res.setup_header
-          unless @header["status"]
-            phrase = HTTPStatus::reason_phrase(@status)
-            @header["status"] = "#{@status} #{phrase}"
-          end
-          super
-        end
-        def res.status_line
-          ""
-        end
-      end
-
-      begin
-        req.parse(sock)
-        req.script_name = (env["SCRIPT_NAME"] || File.expand_path($0)).dup
-        req.path_info = (env["PATH_INFO"] || "").dup
-        req.query_string = env["QUERY_STRING"]
-        req.user = env["REMOTE_USER"]
-        res.request_method = req.request_method
-        res.request_uri = req.request_uri
-        res.request_http_version = req.http_version
-        res.keep_alive = req.keep_alive?
-        self.service(req, res)
-      rescue HTTPStatus::Error => ex
-        res.set_error(ex)
-      rescue HTTPStatus::Status => ex
-        res.status = ex.code
-      rescue Exception => ex
-        @logger.error(ex)
-        res.set_error(ex, true)
-      ensure
-        req.fixup
-        if defined?(MOD_RUBY)
-          res.setup_header
-          Apache.request.status_line = "#{res.status} #{res.reason_phrase}"
-          Apache.request.status = res.status
-          table = Apache.request.headers_out
-          res.header.each{|key, val|
-            case key
-            when /^content-encoding$/i
-              Apache::request.content_encoding = val
-            when /^content-type$/i
-              Apache::request.content_type = val
-            else
-              table[key] = val.to_s
-            end
-          }
-          res.cookies.each{|cookie|
-            table.add("Set-Cookie", cookie.to_s)
-          }
-          Apache.request.send_http_header
-          res.send_body(sock)
-        else
-          res.send_response(sock)
-        end
-      end
-    end
-
-    ##
-    # Services the request +req+ which will fill in the response +res+.  See
-    # WEBrick::HTTPServlet::AbstractServlet#service for details.
-
-    def service(req, res)
-      method_name = "do_" + req.request_method.gsub(/-/, "_")
-      if respond_to?(method_name)
-        __send__(method_name, req, res)
-      else
-        raise HTTPStatus::MethodNotAllowed,
-              "unsupported method `#{req.request_method}'."
-      end
-    end
-
-    ##
-    # Provides HTTP socket emulation from the CGI environment
-
-    class Socket # :nodoc:
-      include Enumerable
-
-      private
-
-      def initialize(config, env, stdin, stdout)
-        @config = config
-        @env = env
-        @header_part = StringIO.new
-        @body_part = stdin
-        @out_port = stdout
-        @out_port.binmode
-
-        @server_addr = @env["SERVER_ADDR"] || "0.0.0.0"
-        @server_name = @env["SERVER_NAME"]
-        @server_port = @env["SERVER_PORT"]
-        @remote_addr = @env["REMOTE_ADDR"]
-        @remote_host = @env["REMOTE_HOST"] || @remote_addr
-        @remote_port = @env["REMOTE_PORT"] || 0
-
-        begin
-          @header_part << request_line << CRLF
-          setup_header
-          @header_part << CRLF
-          @header_part.rewind
-        rescue Exception
-          raise CGIError, "invalid CGI environment"
-        end
-      end
-
-      def request_line
-        meth = @env["REQUEST_METHOD"] || "GET"
-        unless url = @env["REQUEST_URI"]
-          url = (@env["SCRIPT_NAME"] || File.expand_path($0)).dup
-          url << @env["PATH_INFO"].to_s
-          url = WEBrick::HTTPUtils.escape_path(url)
-          if query_string = @env["QUERY_STRING"]
-            unless query_string.empty?
-              url << "?" << query_string
-            end
-          end
-        end
-        # we cannot get real HTTP version of client ;)
-        httpv = @config[:HTTPVersion]
-        return "#{meth} #{url} HTTP/#{httpv}"
-      end
-
-      def setup_header
-        @env.each{|key, value|
-          case key
-          when "CONTENT_TYPE", "CONTENT_LENGTH"
-            add_header(key.gsub(/_/, "-"), value)
-          when /^HTTP_(.*)/
-            add_header($1.gsub(/_/, "-"), value)
-          end
-        }
-      end
-
-      def add_header(hdrname, value)
-        unless value.empty?
-          @header_part << hdrname << ": " << value << CRLF
-        end
-      end
-
-      def input
-        @header_part.eof? ? @body_part : @header_part
-      end
-
-      public
-
-      def peeraddr
-        [nil, @remote_port, @remote_host, @remote_addr]
-      end
-
-      def addr
-        [nil, @server_port, @server_name, @server_addr]
-      end
-
-      def gets(eol=LF, size=nil)
-        input.gets(eol, size)
-      end
-
-      def read(size=nil)
-        input.read(size)
-      end
-
-      def each
-        input.each{|line| yield(line) }
-      end
-
-      def eof?
-        input.eof?
-      end
-
-      def <<(data)
-        @out_port << data
-      end
-
-      def write(data)
-        @out_port.write(data)
-      end
-
-      def cert
-        return nil unless defined?(OpenSSL)
-        if pem = @env["SSL_SERVER_CERT"]
-          OpenSSL::X509::Certificate.new(pem) unless pem.empty?
-        end
-      end
-
-      def peer_cert
-        return nil unless defined?(OpenSSL)
-        if pem = @env["SSL_CLIENT_CERT"]
-          OpenSSL::X509::Certificate.new(pem) unless pem.empty?
-        end
-      end
-
-      def peer_cert_chain
-        return nil unless defined?(OpenSSL)
-        if @env["SSL_CLIENT_CERT_CHAIN_0"]
-          keys = @env.keys
-          certs = keys.sort.collect{|k|
-            if /^SSL_CLIENT_CERT_CHAIN_\d+$/ =~ k
-              if pem = @env[k]
-                OpenSSL::X509::Certificate.new(pem) unless pem.empty?
-              end
-            end
-          }
-          certs.compact
-        end
-      end
-
-      def cipher
-        return nil unless defined?(OpenSSL)
-        if cipher = @env["SSL_CIPHER"]
-          ret = [ cipher ]
-          ret << @env["SSL_PROTOCOL"]
-          ret << @env["SSL_CIPHER_USEKEYSIZE"]
-          ret << @env["SSL_CIPHER_ALGKEYSIZE"]
-          ret
-        end
-      end
-    end
-  end
-end
diff --git a/tool/lib/webrick/compat.rb b/tool/lib/webrick/compat.rb
deleted file mode 100644
index c497a1933c92af..00000000000000
--- a/tool/lib/webrick/compat.rb
+++ /dev/null
@@ -1,36 +0,0 @@
-# frozen_string_literal: false
-#
-# compat.rb -- cross platform compatibility
-#
-# Author: IPR -- Internet Programming with Ruby -- writers
-# Copyright (c) 2002 GOTOU Yuuzou
-# Copyright (c) 2002 Internet Programming with Ruby writers. All rights
-# reserved.
-#
-# $IPR: compat.rb,v 1.6 2002/10/01 17:16:32 gotoyuzo Exp $
-
-##
-# System call error module used by webrick for cross platform compatibility.
-#
-# EPROTO:: protocol error
-# ECONNRESET:: remote host reset the connection request
-# ECONNABORTED:: Client sent TCP reset (RST) before server has accepted the
-#                connection requested by client.
-#
-module Errno
-  ##
-  # Protocol error.
-
-  class EPROTO       < SystemCallError; end
-
-  ##
-  # Remote host reset the connection request.
-
-  class ECONNRESET   < SystemCallError; end
-
-  ##
-  # Client sent TCP reset (RST) before server has accepted the connection
-  # requested by client.
-
-  class ECONNABORTED < SystemCallError; end
-end
diff --git a/tool/lib/webrick/config.rb b/tool/lib/webrick/config.rb
deleted file mode 100644
index 9f2ab44f49d80c..00000000000000
--- a/tool/lib/webrick/config.rb
+++ /dev/null
@@ -1,158 +0,0 @@
-# frozen_string_literal: false
-#
-# config.rb -- Default configurations.
-#
-# Author: IPR -- Internet Programming with Ruby -- writers
-# Copyright (c) 2000, 2001 TAKAHASHI Masayoshi, GOTOU Yuuzou
-# Copyright (c) 2003 Internet Programming with Ruby writers. All rights
-# reserved.
-#
-# $IPR: config.rb,v 1.52 2003/07/22 19:20:42 gotoyuzo Exp $
-
-require_relative 'version'
-require_relative 'httpversion'
-require_relative 'httputils'
-require_relative 'utils'
-require_relative 'log'
-
-module WEBrick
-  module Config
-    LIBDIR = File::dirname(__FILE__) # :nodoc:
-
-    # for GenericServer
-    General = Hash.new { |hash, key|
-      case key
-      when :ServerName
-        hash[key] = Utils.getservername
-      else
-        nil
-      end
-    }.update(
-      :BindAddress    => nil,   # "0.0.0.0" or "::" or nil
-      :Port           => nil,   # users MUST specify this!!
-      :MaxClients     => 100,   # maximum number of the concurrent connections
-      :ServerType     => nil,   # default: WEBrick::SimpleServer
-      :Logger         => nil,   # default: WEBrick::Log.new
-      :ServerSoftware => "WEBrick/#{WEBrick::VERSION} " +
-                         "(Ruby/#{RUBY_VERSION}/#{RUBY_RELEASE_DATE})",
-      :TempDir        => ENV['TMPDIR']||ENV['TMP']||ENV['TEMP']||'/tmp',
-      :DoNotListen    => false,
-      :StartCallback  => nil,
-      :StopCallback   => nil,
-      :AcceptCallback => nil,
-      :DoNotReverseLookup => true,
-      :ShutdownSocketWithoutClose => false,
-    )
-
-    # for HTTPServer, HTTPRequest, HTTPResponse ...
-    HTTP = General.dup.update(
-      :Port           => 80,
-      :RequestTimeout => 30,
-      :HTTPVersion    => HTTPVersion.new("1.1"),
-      :AccessLog      => nil,
-      :MimeTypes      => HTTPUtils::DefaultMimeTypes,
-      :DirectoryIndex => ["index.html","index.htm","index.cgi","index.rhtml"],
-      :DocumentRoot   => nil,
-      :DocumentRootOptions => { :FancyIndexing => true },
-      :RequestCallback => nil,
-      :ServerAlias    => nil,
-      :InputBufferSize  => 65536, # input buffer size in reading request body
-      :OutputBufferSize => 65536, # output buffer size in sending File or IO
-
-      # for HTTPProxyServer
-      :ProxyAuthProc  => nil,
-      :ProxyContentHandler => nil,
-      :ProxyVia       => true,
-      :ProxyTimeout   => true,
-      :ProxyURI       => nil,
-
-      :CGIInterpreter => nil,
-      :CGIPathEnv     => nil,
-
-      # workaround: if Request-URIs contain 8bit chars,
-      # they should be escaped before calling of URI::parse().
-      :Escape8bitURI  => false
-    )
-
-    ##
-    # Default configuration for WEBrick::HTTPServlet::FileHandler
-    #
-    # :AcceptableLanguages::
-    #   Array of languages allowed for accept-language.  There is no default
-    # :DirectoryCallback::
-    #   Allows preprocessing of directory requests.  There is no default
-    #   callback.
-    # :FancyIndexing::
-    #   If true, show an index for directories.  The default is true.
-    # :FileCallback::
-    #   Allows preprocessing of file requests.  There is no default callback.
-    # :HandlerCallback::
-    #   Allows preprocessing of requests.  There is no default callback.
-    # :HandlerTable::
-    #   Maps file suffixes to file handlers.  DefaultFileHandler is used by
-    #   default but any servlet can be used.
-    # :NondisclosureName::
-    #   Do not show files matching this array of globs.  .ht* and *~ are
-    #   excluded by default.
-    # :UserDir::
-    #   Directory inside ~user to serve content from for /~user requests.
-    #   Only works if mounted on /.  Disabled by default.
-
-    FileHandler = {
-      :NondisclosureName => [".ht*", "*~"],
-      :FancyIndexing     => false,
-      :HandlerTable      => {},
-      :HandlerCallback   => nil,
-      :DirectoryCallback => nil,
-      :FileCallback      => nil,
-      :UserDir           => nil,  # e.g. "public_html"
-      :AcceptableLanguages => []  # ["en", "ja", ... ]
-    }
-
-    ##
-    # Default configuration for WEBrick::HTTPAuth::BasicAuth
-    #
-    # :AutoReloadUserDB:: Reload the user database provided by :UserDB
-    #                     automatically?
-
-    BasicAuth = {
-      :AutoReloadUserDB     => true,
-    }
-
-    ##
-    # Default configuration for WEBrick::HTTPAuth::DigestAuth.
-    #
-    # :Algorithm:: MD5, MD5-sess (default), SHA1, SHA1-sess
-    # :Domain:: An Array of URIs that define the protected space
-    # :Qop:: 'auth' for authentication, 'auth-int' for integrity protection or
-    #        both
-    # :UseOpaque:: Should the server send opaque values to the client?  This
-    #              helps prevent replay attacks.
-    # :CheckNc:: Should the server check the nonce count?  This helps the
-    #            server detect replay attacks.
-    # :UseAuthenticationInfoHeader:: Should the server send an
-    #                                AuthenticationInfo header?
-    # :AutoReloadUserDB:: Reload the user database provided by :UserDB
-    #                     automatically?
-    # :NonceExpirePeriod:: How long should we store used nonces?  Default is
-    #                      30 minutes.
-    # :NonceExpireDelta:: How long is a nonce valid?  Default is 1 minute
-    # :InternetExplorerHack:: Hack which allows Internet Explorer to work.
-    # :OperaHack:: Hack which allows Opera to work.
-
-    DigestAuth = {
-      :Algorithm            => 'MD5-sess', # or 'MD5'
-      :Domain               => nil,        # an array includes domain names.
-      :Qop                  => [ 'auth' ], # 'auth' or 'auth-int' or both.
-      :UseOpaque            => true,
-      :UseNextNonce         => false,
-      :CheckNc              => false,
-      :UseAuthenticationInfoHeader => true,
-      :AutoReloadUserDB     => true,
-      :NonceExpirePeriod    => 30*60,
-      :NonceExpireDelta     => 60,
-      :InternetExplorerHack => true,
-      :OperaHack            => true,
-    }
-  end
-end
diff --git a/tool/lib/webrick/cookie.rb b/tool/lib/webrick/cookie.rb
deleted file mode 100644
index 5fd3bfb22862ee..00000000000000
--- a/tool/lib/webrick/cookie.rb
+++ /dev/null
@@ -1,172 +0,0 @@
-# frozen_string_literal: false
-#
-# cookie.rb -- Cookie class
-#
-# Author: IPR -- Internet Programming with Ruby -- writers
-# Copyright (c) 2000, 2001 TAKAHASHI Masayoshi, GOTOU Yuuzou
-# Copyright (c) 2002 Internet Programming with Ruby writers. All rights
-# reserved.
-#
-# $IPR: cookie.rb,v 1.16 2002/09/21 12:23:35 gotoyuzo Exp $
-
-require 'time'
-require_relative 'httputils'
-
-module WEBrick
-
-  ##
-  # Processes HTTP cookies
-
-  class Cookie
-
-    ##
-    # The cookie name
-
-    attr_reader :name
-
-    ##
-    # The cookie value
-
-    attr_accessor :value
-
-    ##
-    # The cookie version
-
-    attr_accessor :version
-
-    ##
-    # The cookie domain
-    attr_accessor :domain
-
-    ##
-    # The cookie path
-
-    attr_accessor :path
-
-    ##
-    # Is this a secure cookie?
-
-    attr_accessor :secure
-
-    ##
-    # The cookie comment
-
-    attr_accessor :comment
-
-    ##
-    # The maximum age of the cookie
-
-    attr_accessor :max_age
-
-    #attr_accessor :comment_url, :discard, :port
-
-    ##
-    # Creates a new cookie with the given +name+ and +value+
-
-    def initialize(name, value)
-      @name = name
-      @value = value
-      @version = 0     # Netscape Cookie
-
-      @domain = @path = @secure = @comment = @max_age =
-      @expires = @comment_url = @discard = @port = nil
-    end
-
-    ##
-    # Sets the cookie expiration to the time +t+.  The expiration time may be
-    # a false value to disable expiration or a Time or HTTP format time string
-    # to set the expiration date.
-
-    def expires=(t)
-      @expires = t && (t.is_a?(Time) ? t.httpdate : t.to_s)
-    end
-
-    ##
-    # Retrieves the expiration time as a Time
-
-    def expires
-      @expires && Time.parse(@expires)
-    end
-
-    ##
-    # The cookie string suitable for use in an HTTP header
-
-    def to_s
-      ret = ""
-      ret << @name << "=" << @value
-      ret << "; " << "Version=" << @version.to_s if @version > 0
-      ret << "; " << "Domain="  << @domain  if @domain
-      ret << "; " << "Expires=" << @expires if @expires
-      ret << "; " << "Max-Age=" << @max_age.to_s if @max_age
-      ret << "; " << "Comment=" << @comment if @comment
-      ret << "; " << "Path="    << @path if @path
-      ret << "; " << "Secure"   if @secure
-      ret
-    end
-
-    ##
-    # Parses a Cookie field sent from the user-agent.  Returns an array of
-    # cookies.
-
-    def self.parse(str)
-      if str
-        ret = []
-        cookie = nil
-        ver = 0
-        str.split(/;\s+/).each{|x|
-          key, val = x.split(/=/,2)
-          val = val ? HTTPUtils::dequote(val) : ""
-          case key
-          when "$Version"; ver = val.to_i
-          when "$Path";    cookie.path = val
-          when "$Domain";  cookie.domain = val
-          when "$Port";    cookie.port = val
-          else
-            ret << cookie if cookie
-            cookie = self.new(key, val)
-            cookie.version = ver
-          end
-        }
-        ret << cookie if cookie
-        ret
-      end
-    end
-
-    ##
-    # Parses the cookie in +str+
-
-    def self.parse_set_cookie(str)
-      cookie_elem = str.split(/;/)
-      first_elem = cookie_elem.shift
-      first_elem.strip!
-      key, value = first_elem.split(/=/, 2)
-      cookie = new(key, HTTPUtils.dequote(value))
-      cookie_elem.each{|pair|
-        pair.strip!
-        key, value = pair.split(/=/, 2)
-        if value
-          value = HTTPUtils.dequote(value.strip)
-        end
-        case key.downcase
-        when "domain"  then cookie.domain  = value
-        when "path"    then cookie.path    = value
-        when "expires" then cookie.expires = value
-        when "max-age" then cookie.max_age = Integer(value)
-        when "comment" then cookie.comment = value
-        when "version" then cookie.version = Integer(value)
-        when "secure"  then cookie.secure = true
-        end
-      }
-      return cookie
-    end
-
-    ##
-    # Parses the cookies in +str+
-
-    def self.parse_set_cookies(str)
-      return str.split(/,(?=[^;,]*=)|,$/).collect{|c|
-        parse_set_cookie(c)
-      }
-    end
-  end
-end
diff --git a/tool/lib/webrick/htmlutils.rb b/tool/lib/webrick/htmlutils.rb
deleted file mode 100644
index ed9f4ac0d3e97c..00000000000000
--- a/tool/lib/webrick/htmlutils.rb
+++ /dev/null
@@ -1,30 +0,0 @@
-# frozen_string_literal: false
-#--
-# htmlutils.rb -- HTMLUtils Module
-#
-# Author: IPR -- Internet Programming with Ruby -- writers
-# Copyright (c) 2000, 2001 TAKAHASHI Masayoshi, GOTOU Yuuzou
-# Copyright (c) 2002 Internet Programming with Ruby writers. All rights
-# reserved.
-#
-# $IPR: htmlutils.rb,v 1.7 2002/09/21 12:23:35 gotoyuzo Exp $
-
-module WEBrick
-  module HTMLUtils
-
-    ##
-    # Escapes &, ", > and < in +string+
-
-    def escape(string)
-      return "" unless string
-      str = string.b
-      str.gsub!(/&/n, '&amp;')
-      str.gsub!(/\"/n, '&quot;')
-      str.gsub!(/>/n, '&gt;')
-      str.gsub!(/</n, '&lt;')
-      str.force_encoding(string.encoding)
-    end
-    module_function :escape
-
-  end
-end
diff --git a/tool/lib/webrick/httpauth.rb b/tool/lib/webrick/httpauth.rb
deleted file mode 100644
index f8bf09a6f1972c..00000000000000
--- a/tool/lib/webrick/httpauth.rb
+++ /dev/null
@@ -1,96 +0,0 @@
-# frozen_string_literal: false
-#
-# httpauth.rb -- HTTP access authentication
-#
-# Author: IPR -- Internet Programming with Ruby -- writers
-# Copyright (c) 2000, 2001 TAKAHASHI Masayoshi, GOTOU Yuuzou
-# Copyright (c) 2002 Internet Programming with Ruby writers. All rights
-# reserved.
-#
-# $IPR: httpauth.rb,v 1.14 2003/07/22 19:20:42 gotoyuzo Exp $
-
-require_relative 'httpauth/basicauth'
-require_relative 'httpauth/digestauth'
-require_relative 'httpauth/htpasswd'
-require_relative 'httpauth/htdigest'
-require_relative 'httpauth/htgroup'
-
-module WEBrick
-
-  ##
-  # HTTPAuth provides both basic and digest authentication.
-  #
-  # To enable authentication for requests in WEBrick you will need a user
-  # database and an authenticator.  To start, here's an Htpasswd database for
-  # use with a DigestAuth authenticator:
-  #
-  #   config = { :Realm => 'DigestAuth example realm' }
-  #
-  #   htpasswd = WEBrick::HTTPAuth::Htpasswd.new 'my_password_file'
-  #   htpasswd.auth_type = WEBrick::HTTPAuth::DigestAuth
-  #   htpasswd.set_passwd config[:Realm], 'username', 'password'
-  #   htpasswd.flush
-  #
-  # The +:Realm+ is used to provide different access to different groups
-  # across several resources on a server.  Typically you'll need only one
-  # realm for a server.
-  #
-  # This database can be used to create an authenticator:
-  #
-  #   config[:UserDB] = htpasswd
-  #
-  #   digest_auth = WEBrick::HTTPAuth::DigestAuth.new config
-  #
-  # To authenticate a request call #authenticate with a request and response
-  # object in a servlet:
-  #
-  #   def do_GET req, res
-  #     @authenticator.authenticate req, res
-  #   end
-  #
-  # For digest authentication the authenticator must not be created every
-  # request, it must be passed in as an option via WEBrick::HTTPServer#mount.
-
-  module HTTPAuth
-    module_function
-
-    def _basic_auth(req, res, realm, req_field, res_field, err_type,
-                    block) # :nodoc:
-      user = pass = nil
-      if /^Basic\s+(.*)/o =~ req[req_field]
-        userpass = $1
-        user, pass = userpass.unpack("m*")[0].split(":", 2)
-      end
-      if block.call(user, pass)
-        req.user = user
-        return
-      end
-      res[res_field] = "Basic realm=\"#{realm}\""
-      raise err_type
-    end
-
-    ##
-    # Simple wrapper for providing basic authentication for a request.  When
-    # called with a request +req+, response +res+, authentication +realm+ and
-    # +block+ the block will be called with a +username+ and +password+.  If
-    # the block returns true the request is allowed to continue, otherwise an
-    # HTTPStatus::Unauthorized error is raised.
-
-    def basic_auth(req, res, realm, &block) # :yield: username, password
-      _basic_auth(req, res, realm, "Authorization", "WWW-Authenticate",
-                  HTTPStatus::Unauthorized, block)
-    end
-
-    ##
-    # Simple wrapper for providing basic authentication for a proxied request.
-    # When called with a request +req+, response +res+, authentication +realm+
-    # and +block+ the block will be called with a +username+ and +password+.
-    # If the block returns true the request is allowed to continue, otherwise
-    # an HTTPStatus::ProxyAuthenticationRequired error is raised.
-
-    def proxy_basic_auth(req, res, realm, &block) # :yield: username, password
-      _basic_auth(req, res, realm, "Proxy-Authorization", "Proxy-Authenticate",
-                  HTTPStatus::ProxyAuthenticationRequired, block)
-    end
-  end
-end
diff --git a/tool/lib/webrick/httpauth/authenticator.rb b/tool/lib/webrick/httpauth/authenticator.rb
deleted file mode 100644
index 8f0eaa3acaef2f..00000000000000
--- a/tool/lib/webrick/httpauth/authenticator.rb
+++ /dev/null
@@ -1,117 +0,0 @@
-# frozen_string_literal: false
-#--
-# httpauth/authenticator.rb -- Authenticator mix-in module.
-#
-# Author: IPR -- Internet Programming with Ruby -- writers
-# Copyright (c) 2003 Internet Programming with Ruby writers. All rights
-# reserved.
-#
-# $IPR: authenticator.rb,v 1.3 2003/02/20 07:15:47 gotoyuzo Exp $
-
-module WEBrick
-  module HTTPAuth
-
-    ##
-    # Module providing generic support for both Digest and Basic
-    # authentication schemes.
-
-    module Authenticator
-
-      RequestField      = "Authorization" # :nodoc:
-      ResponseField     = "WWW-Authenticate" # :nodoc:
-      ResponseInfoField = "Authentication-Info" # :nodoc:
-      AuthException     = HTTPStatus::Unauthorized # :nodoc:
-
-      ##
-      # Method of authentication, must be overridden by the including class
-
-      AuthScheme        = nil
-
-      ##
-      # The realm this authenticator covers
-
-      attr_reader :realm
-
-      ##
-      # The user database for this authenticator
-
-      attr_reader :userdb
-
-      ##
-      # The logger for this authenticator
-
-      attr_reader :logger
-
-      private
-
-      # :stopdoc:
-
-      ##
-      # Initializes the authenticator from +config+
-
-      def check_init(config)
-        [:UserDB, :Realm].each{|sym|
-          unless config[sym]
-            raise ArgumentError, "Argument #{sym.inspect} missing."
-          end
-        }
-        @realm     = config[:Realm]
-        @userdb    = config[:UserDB]
-        @logger    = config[:Logger] || Log::new($stderr)
-        @reload_db = config[:AutoReloadUserDB]
-        @request_field   = self::class::RequestField
-        @response_field  = self::class::ResponseField
-        @resp_info_field = self::class::ResponseInfoField
-        @auth_exception  = self::class::AuthException
-        @auth_scheme     = self::class::AuthScheme
-      end
-
-      ##
-      # Ensures +req+ has credentials that can be authenticated.
-
-      def check_scheme(req)
-        unless credentials = req[@request_field]
-          error("no credentials in the request.")
-          return nil
-        end
-        unless match = /^#{@auth_scheme}\s+/i.match(credentials)
-          error("invalid scheme in %s.", credentials)
-          info("%s: %s", @request_field, credentials) if $DEBUG
-          return nil
-        end
-        return match.post_match
-      end
-
-      def log(meth, fmt, *args)
-        msg = format("%s %s: ", @auth_scheme, @realm)
-        msg << fmt % args
-        @logger.__send__(meth, msg)
-      end
-
-      def error(fmt, *args)
-        if @logger.error?
-          log(:error, fmt, *args)
-        end
-      end
-
-      def info(fmt, *args)
-        if @logger.info?
-          log(:info, fmt, *args)
-        end
-      end
-
-      # :startdoc:
-    end
-
-    ##
-    # Module providing generic support for both Digest and Basic
-    # authentication schemes for proxies.
-
-    module ProxyAuthenticator
-      RequestField  = "Proxy-Authorization" # :nodoc:
-      ResponseField = "Proxy-Authenticate" # :nodoc:
-      InfoField     = "Proxy-Authentication-Info" # :nodoc:
-      AuthException = HTTPStatus::ProxyAuthenticationRequired # :nodoc:
-    end
-  end
-end
diff --git a/tool/lib/webrick/httpauth/basicauth.rb b/tool/lib/webrick/httpauth/basicauth.rb
deleted file mode 100644
index 7d0a9cfc8fd43d..00000000000000
--- a/tool/lib/webrick/httpauth/basicauth.rb
+++ /dev/null
@@ -1,116 +0,0 @@
-# frozen_string_literal: false
-#
-# httpauth/basicauth.rb -- HTTP basic access authentication
-#
-# Author: IPR -- Internet Programming with Ruby -- writers
-# Copyright (c) 2003 Internet Programming with Ruby writers. All rights
-# reserved.
-#
-# $IPR: basicauth.rb,v 1.5 2003/02/20 07:15:47 gotoyuzo Exp $
-
-require_relative '../config'
-require_relative '../httpstatus'
-require_relative 'authenticator'
-
-module WEBrick
-  module HTTPAuth
-
-    ##
-    # Basic Authentication for WEBrick
-    #
-    # Use this class to add basic authentication to a WEBrick servlet.
-    #
-    # Here is an example of how to set up a BasicAuth:
-    #
-    #   config = { :Realm => 'BasicAuth example realm' }
-    #
-    #   htpasswd = WEBrick::HTTPAuth::Htpasswd.new 'my_password_file', password_hash: :bcrypt
-    #   htpasswd.set_passwd config[:Realm], 'username', 'password'
-    #   htpasswd.flush
-    #
-    #   config[:UserDB] = htpasswd
-    #
-    #   basic_auth = WEBrick::HTTPAuth::BasicAuth.new config
-
-    class BasicAuth
-      include Authenticator
-
-      AuthScheme = "Basic" # :nodoc:
-
-      ##
-      # Used by UserDB to create a basic password entry
-
-      def self.make_passwd(realm, user, pass)
-        pass ||= ""
-        pass.crypt(Utils::random_string(2))
-      end
-
-      attr_reader :realm, :userdb, :logger
-
-      ##
-      # Creates a new BasicAuth instance.
-      #
-      # See WEBrick::Config::BasicAuth for default configuration entries
-      #
-      # You must supply the following configuration entries:
-      #
-      # :Realm:: The name of the realm being protected.
-      # :UserDB:: A database of usernames and passwords.
-      #           A WEBrick::HTTPAuth::Htpasswd instance should be used.
-
-      def initialize(config, default=Config::BasicAuth)
-        check_init(config)
-        @config = default.dup.update(config)
-      end
-
-      ##
-      # Authenticates a +req+ and returns a 401 Unauthorized using +res+ if
-      # the authentication was not correct.
-
-      def authenticate(req, res)
-        unless basic_credentials = check_scheme(req)
-          challenge(req, res)
-        end
-        userid, password = basic_credentials.unpack("m*")[0].split(":", 2)
-        password ||= ""
-        if userid.empty?
-          error("user id was not given.")
-          challenge(req, res)
-        end
-        unless encpass = @userdb.get_passwd(@realm, userid, @reload_db)
-          error("%s: the user is not allowed.", userid)
-          challenge(req, res)
-        end
-
-        case encpass
-        when /\A\$2[aby]\$/
-          password_matches = BCrypt::Password.new(encpass.sub(/\A\$2[aby]\$/, '$2a$')) == password
-        else
-          password_matches = password.crypt(encpass) == encpass
-        end
-
-        unless password_matches
-          error("%s: password unmatch.", userid)
-          challenge(req, res)
-        end
-        info("%s: authentication succeeded.", userid)
-        req.user = userid
-      end
-
-      ##
-      # Returns a challenge response which asks for authentication information
-
-      def challenge(req, res)
-        res[@response_field] = "#{@auth_scheme} realm=\"#{@realm}\""
-        raise @auth_exception
-      end
-    end
-
-    ##
-    # Basic authentication for proxy servers.  See BasicAuth for details.
-
-    class ProxyBasicAuth < BasicAuth
-      include ProxyAuthenticator
-    end
-  end
-end
diff --git a/tool/lib/webrick/httpauth/digestauth.rb b/tool/lib/webrick/httpauth/digestauth.rb
deleted file mode 100644
index 3cf12899d2f2ae..00000000000000
--- a/tool/lib/webrick/httpauth/digestauth.rb
+++ /dev/null
@@ -1,395 +0,0 @@
-# frozen_string_literal: false
-#
-# httpauth/digestauth.rb -- HTTP digest access authentication
-#
-# Author: IPR -- Internet Programming with Ruby -- writers
-# Copyright (c) 2003 Internet Programming with Ruby writers.
-# Copyright (c) 2003 H.M.
-#
-# The original implementation is provided by H.M.
-#   URL: http://rwiki.jin.gr.jp/cgi-bin/rw-cgi.rb?cmd=view;name=
-#        %C7%A7%BE%DA%B5%A1%C7%BD%A4%F2%B2%FE%C2%A4%A4%B7%A4%C6%A4%DF%A4%EB
-#
-# $IPR: digestauth.rb,v 1.5 2003/02/20 07:15:47 gotoyuzo Exp $
-
-require_relative '../config'
-require_relative '../httpstatus'
-require_relative 'authenticator'
-require 'digest/md5'
-require 'digest/sha1'
-
-module WEBrick
-  module HTTPAuth
-
-    ##
-    # RFC 2617 Digest Access Authentication for WEBrick
-    #
-    # Use this class to add digest authentication to a WEBrick servlet.
-    #
-    # Here is an example of how to set up DigestAuth:
-    #
-    #   config = { :Realm => 'DigestAuth example realm' }
-    #
-    #   htdigest = WEBrick::HTTPAuth::Htdigest.new 'my_password_file'
-    #   htdigest.set_passwd config[:Realm], 'username', 'password'
-    #   htdigest.flush
-    #
-    #   config[:UserDB] = htdigest
-    #
-    #   digest_auth = WEBrick::HTTPAuth::DigestAuth.new config
-    #
-    # When using this as with a servlet be sure not to create a new DigestAuth
-    # object in the servlet's #initialize.  By default WEBrick creates a new
-    # servlet instance for every request and the DigestAuth object must be
-    # used across requests.
-
-    class DigestAuth
-      include Authenticator
-
-      AuthScheme = "Digest" # :nodoc:
-
-      ##
-      # Struct containing the opaque portion of the digest authentication
-
-      OpaqueInfo = Struct.new(:time, :nonce, :nc) # :nodoc:
-
-      ##
-      # Digest authentication algorithm
-
-      attr_reader :algorithm
-
-      ##
-      # Quality of protection.  RFC 2617 defines "auth" and "auth-int"
-
-      attr_reader :qop
-
-      ##
-      # Used by UserDB to create a digest password entry
-
-      def self.make_passwd(realm, user, pass)
-        pass ||= ""
-        Digest::MD5::hexdigest([user, realm, pass].join(":"))
-      end
-
-      ##
-      # Creates a new DigestAuth instance.  Be sure to use the same DigestAuth
-      # instance for multiple requests as it saves state between requests in
-      # order to perform authentication.
-      #
-      # See WEBrick::Config::DigestAuth for default configuration entries
-      #
-      # You must supply the following configuration entries:
-      #
-      # :Realm:: The name of the realm being protected.
-      # :UserDB:: A database of usernames and passwords.
-      #           A WEBrick::HTTPAuth::Htdigest instance should be used.
-
-      def initialize(config, default=Config::DigestAuth)
-        check_init(config)
-        @config                 = default.dup.update(config)
-        @algorithm              = @config[:Algorithm]
-        @domain                 = @config[:Domain]
-        @qop                    = @config[:Qop]
-        @use_opaque             = @config[:UseOpaque]
-        @use_next_nonce         = @config[:UseNextNonce]
-        @check_nc               = @config[:CheckNc]
-        @use_auth_info_header   = @config[:UseAuthenticationInfoHeader]
-        @nonce_expire_period    = @config[:NonceExpirePeriod]
-        @nonce_expire_delta     = @config[:NonceExpireDelta]
-        @internet_explorer_hack = @config[:InternetExplorerHack]
-
-        case @algorithm
-        when 'MD5','MD5-sess'
-          @h = Digest::MD5
-        when 'SHA1','SHA1-sess'  # it is a bonus feature :-)
-          @h = Digest::SHA1
-        else
-          msg = format('Algorithm "%s" is not supported.', @algorithm)
-          raise ArgumentError.new(msg)
-        end
-
-        @instance_key = hexdigest(self.__id__, Time.now.to_i, Process.pid)
-        @opaques = {}
-        @last_nonce_expire = Time.now
-        @mutex = Thread::Mutex.new
-      end
-
-      ##
-      # Authenticates a +req+ and returns a 401 Unauthorized using +res+ if
-      # the authentication was not correct.
-
-      def authenticate(req, res)
-        unless result = @mutex.synchronize{ _authenticate(req, res) }
-          challenge(req, res)
-        end
-        if result == :nonce_is_stale
-          challenge(req, res, true)
-        end
-        return true
-      end
-
-      ##
-      # Returns a challenge response which asks for authentication information
-
-      def challenge(req, res, stale=false)
-        nonce = generate_next_nonce(req)
-        if @use_opaque
-          opaque = generate_opaque(req)
-          @opaques[opaque].nonce = nonce
-        end
-
-        param = Hash.new
-        param["realm"]  = HTTPUtils::quote(@realm)
-        param["domain"] = HTTPUtils::quote(@domain.to_a.join(" ")) if @domain
-        param["nonce"]  = HTTPUtils::quote(nonce)
-        param["opaque"] = HTTPUtils::quote(opaque) if opaque
-        param["stale"]  = stale.to_s
-        param["algorithm"] = @algorithm
-        param["qop"]    = HTTPUtils::quote(@qop.to_a.join(",")) if @qop
-
-        res[@response_field] =
-          "#{@auth_scheme} " + param.map{|k,v| "#{k}=#{v}" }.join(", ")
-        info("%s: %s", @response_field, res[@response_field]) if $DEBUG
-        raise @auth_exception
-      end
-
-      private
-
-      # :stopdoc:
-
-      MustParams = ['username','realm','nonce','uri','response']
-      MustParamsAuth = ['cnonce','nc']
-
-      def _authenticate(req, res)
-        unless digest_credentials = check_scheme(req)
-          return false
-        end
-
-        auth_req = split_param_value(digest_credentials)
-        if auth_req['qop'] == "auth" || auth_req['qop'] == "auth-int"
-          req_params = MustParams + MustParamsAuth
-        else
-          req_params = MustParams
-        end
-        req_params.each{|key|
-          unless auth_req.has_key?(key)
-            error('%s: parameter missing. "%s"', auth_req['username'], key)
-            raise HTTPStatus::BadRequest
-          end
-        }
-
-        if !check_uri(req, auth_req)
-          raise HTTPStatus::BadRequest
-        end
-
-        if auth_req['realm'] != @realm
-          error('%s: realm unmatch. "%s" for "%s"',
-                auth_req['username'], auth_req['realm'], @realm)
-          return false
-        end
-
-        auth_req['algorithm'] ||= 'MD5'
-        if auth_req['algorithm'].upcase != @algorithm.upcase
-          error('%s: algorithm unmatch. "%s" for "%s"',
-                auth_req['username'], auth_req['algorithm'], @algorithm)
-          return false
-        end
-
-        if (@qop.nil? && auth_req.has_key?('qop')) ||
-           (@qop && (! @qop.member?(auth_req['qop'])))
-          error('%s: the qop is not allowed. "%s"',
-                auth_req['username'], auth_req['qop'])
-          return false
-        end
-
-        password = @userdb.get_passwd(@realm, auth_req['username'], @reload_db)
-        unless password
-          error('%s: the user is not allowed.', auth_req['username'])
-          return false
-        end
-
-        nonce_is_invalid = false
-        if @use_opaque
-          info("@opaque = %s", @opaque.inspect) if $DEBUG
-          if !(opaque = auth_req['opaque'])
-            error('%s: opaque is not given.', auth_req['username'])
-            nonce_is_invalid = true
-          elsif !(opaque_struct = @opaques[opaque])
-            error('%s: invalid opaque is given.', auth_req['username'])
-            nonce_is_invalid = true
-          elsif !check_opaque(opaque_struct, req, auth_req)
-            @opaques.delete(auth_req['opaque'])
-            nonce_is_invalid = true
-          end
-        elsif !check_nonce(req, auth_req)
-          nonce_is_invalid = true
-        end
-
-        if /-sess$/i =~ auth_req['algorithm']
-          ha1 = hexdigest(password, auth_req['nonce'], auth_req['cnonce'])
-        else
-          ha1 = password
-        end
-
-        if auth_req['qop'] == "auth" || auth_req['qop'] == nil
-          ha2 = hexdigest(req.request_method, auth_req['uri'])
-          ha2_res = hexdigest("", auth_req['uri'])
-        elsif auth_req['qop'] == "auth-int"
-          body_digest = @h.new
-          req.body { |chunk| body_digest.update(chunk) }
-          body_digest = body_digest.hexdigest
-          ha2 = hexdigest(req.request_method, auth_req['uri'], body_digest)
-          ha2_res = hexdigest("", auth_req['uri'], body_digest)
-        end
-
-        if auth_req['qop'] == "auth" || auth_req['qop'] == "auth-int"
-          param2 = ['nonce', 'nc', 'cnonce', 'qop'].map{|key|
-            auth_req[key]
-          }.join(':')
-          digest     = hexdigest(ha1, param2, ha2)
-          digest_res = hexdigest(ha1, param2, ha2_res)
-        else
-          digest     = hexdigest(ha1, auth_req['nonce'], ha2)
-          digest_res = hexdigest(ha1, auth_req['nonce'], ha2_res)
-        end
-
-        if digest != auth_req['response']
-          error("%s: digest unmatch.", auth_req['username'])
-          return false
-        elsif nonce_is_invalid
-          error('%s: digest is valid, but nonce is not valid.',
-                auth_req['username'])
-          return :nonce_is_stale
-        elsif @use_auth_info_header
-          auth_info = {
-            'nextnonce' => generate_next_nonce(req),
-            'rspauth'   => digest_res
-          }
-          if @use_opaque
-            opaque_struct.time  = req.request_time
-            opaque_struct.nonce = auth_info['nextnonce']
-            opaque_struct.nc    = "%08x" % (auth_req['nc'].hex + 1)
-          end
-          if auth_req['qop'] == "auth" || auth_req['qop'] == "auth-int"
-            ['qop','cnonce','nc'].each{|key|
-              auth_info[key] = auth_req[key]
-            }
-          end
-          res[@resp_info_field] = auth_info.keys.map{|key|
-            if key == 'nc'
-              key + '=' + auth_info[key]
-            else
-              key + "=" + HTTPUtils::quote(auth_info[key])
-            end
-          }.join(', ')
-        end
-        info('%s: authentication succeeded.', auth_req['username'])
-        req.user = auth_req['username']
-        return true
-      end
-
-      def split_param_value(string)
-        ret = {}
-        string.scan(/\G\s*([\w\-.*%!]+)=\s*(?:\"((?>\\.|[^\"])*)\"|([^,\"]*))\s*,?/) do
-          ret[$1] = $3 || $2.gsub(/\\(.)/, "\\1")
-        end
-        ret
-      end
-
-      def generate_next_nonce(req)
-        now = "%012d" % req.request_time.to_i
-        pk  = hexdigest(now, @instance_key)[0,32]
-        nonce = [now + ":" + pk].pack("m0") # it has 60 length of chars.
-        nonce
-      end
-
-      def check_nonce(req, auth_req)
-        username = auth_req['username']
-        nonce = auth_req['nonce']
-
-        pub_time, pk = nonce.unpack("m*")[0].split(":", 2)
-        if (!pub_time || !pk)
-          error("%s: empty nonce is given", username)
-          return false
-        elsif (hexdigest(pub_time, @instance_key)[0,32] != pk)
-          error("%s: invalid private-key: %s for %s",
-                username, hexdigest(pub_time, @instance_key)[0,32], pk)
-          return false
-        end
-
-        diff_time = req.request_time.to_i - pub_time.to_i
-        if (diff_time < 0)
-          error("%s: difference of time-stamp is negative.", username)
-          return false
-        elsif diff_time > @nonce_expire_period
-          error("%s: nonce is expired.", username)
-          return false
-        end
-
-        return true
-      end
-
-      def generate_opaque(req)
-        @mutex.synchronize{
-          now = req.request_time
-          if now - @last_nonce_expire > @nonce_expire_delta
-            @opaques.delete_if{|key,val|
-              (now - val.time) > @nonce_expire_period
-            }
-            @last_nonce_expire = now
-          end
-          begin
-            opaque = Utils::random_string(16)
-          end while @opaques[opaque]
-          @opaques[opaque] = OpaqueInfo.new(now, nil, '00000001')
-          opaque
-        }
-      end
-
-      def check_opaque(opaque_struct, req, auth_req)
-        if (@use_next_nonce && auth_req['nonce'] != opaque_struct.nonce)
-          error('%s: nonce unmatched. "%s" for "%s"',
-                auth_req['username'], auth_req['nonce'], opaque_struct.nonce)
-          return false
-        elsif !check_nonce(req, auth_req)
-          return false
-        end
-        if (@check_nc && auth_req['nc'] != opaque_struct.nc)
-          error('%s: nc unmatched."%s" for "%s"',
-                auth_req['username'], auth_req['nc'], opaque_struct.nc)
-          return false
-        end
-        true
-      end
-
-      def check_uri(req, auth_req)
-        uri = auth_req['uri']
-        if uri != req.request_uri.to_s && uri != req.unparsed_uri &&
-           (@internet_explorer_hack && uri != req.path)
-          error('%s: uri unmatch. "%s" for "%s"', auth_req['username'],
-                auth_req['uri'], req.request_uri.to_s)
-          return false
-        end
-        true
-      end
-
-      def hexdigest(*args)
-        @h.hexdigest(args.join(":"))
-      end
-
-      # :startdoc:
-    end
-
-    ##
-    # Digest authentication for proxy servers.  See DigestAuth for details.
-
-    class ProxyDigestAuth < DigestAuth
-      include ProxyAuthenticator
-
-      private
-      def check_uri(req, auth_req) # :nodoc:
-        return true
-      end
-    end
-  end
-end
diff --git a/tool/lib/webrick/httpauth/htdigest.rb b/tool/lib/webrick/httpauth/htdigest.rb
deleted file mode 100644
index 93b18e2c750bd9..00000000000000
--- a/tool/lib/webrick/httpauth/htdigest.rb
+++ /dev/null
@@ -1,132 +0,0 @@
-# frozen_string_literal: false
-#
-# httpauth/htdigest.rb -- Apache compatible htdigest file
-#
-# Author: IPR -- Internet Programming with Ruby -- writers
-# Copyright (c) 2003 Internet Programming with Ruby writers. All rights
-# reserved.
-#
-# $IPR: htdigest.rb,v 1.4 2003/07/22 19:20:45 gotoyuzo Exp $
-
-require_relative 'userdb'
-require_relative 'digestauth'
-require 'tempfile'
-
-module WEBrick
-  module HTTPAuth
-
-    ##
-    # Htdigest accesses apache-compatible digest password files.  Passwords are
-    # matched to a realm where they are valid.  For security, the path for a
-    # digest password database should be stored outside of the paths available
-    # to the HTTP server.
-    #
-    # Htdigest is intended for use with WEBrick::HTTPAuth::DigestAuth and
-    # stores passwords using cryptographic hashes.
-    #
-    #   htpasswd = WEBrick::HTTPAuth::Htdigest.new 'my_password_file'
-    #   htpasswd.set_passwd 'my realm', 'username', 'password'
-    #   htpasswd.flush
-
-    class Htdigest
-      include UserDB
-
-      ##
-      # Open a digest password database at +path+
-
-      def initialize(path)
-        @path = path
-        @mtime = Time.at(0)
-        @digest = Hash.new
-        @mutex = Thread::Mutex::new
-        @auth_type = DigestAuth
-        File.open(@path,"a").close unless File.exist?(@path)
-        reload
-      end
-
-      ##
-      # Reloads passwords from the database
-
-      def reload
-        mtime = File::mtime(@path)
-        if mtime > @mtime
-          @digest.clear
-          File.open(@path){|io|
-            while line = io.gets
-              line.chomp!
-              user, realm, pass = line.split(/:/, 3)
-              unless @digest[realm]
-                @digest[realm] = Hash.new
-              end
-              @digest[realm][user] = pass
-            end
-          }
-          @mtime = mtime
-        end
-      end
-
-      ##
-      # Flush the password database.  If +output+ is given the database will
-      # be written there instead of to the original path.
-
-      def flush(output=nil)
-        output ||= @path
-        tmp = Tempfile.create("htpasswd", File::dirname(output))
-        renamed = false
-        begin
-          each{|item| tmp.puts(item.join(":")) }
-          tmp.close
-          File::rename(tmp.path, output)
-          renamed = true
-        ensure
-          tmp.close
-          File.unlink(tmp.path) if !renamed
-        end
-      end
-
-      ##
-      # Retrieves a password from the database for +user+ in +realm+.  If
-      # +reload_db+ is true the database will be reloaded first.
-
-      def get_passwd(realm, user, reload_db)
-        reload() if reload_db
-        if hash = @digest[realm]
-          hash[user]
-        end
-      end
-
-      ##
-      # Sets a password in the database for +user+ in +realm+ to +pass+.
-
-      def set_passwd(realm, user, pass)
-        @mutex.synchronize{
-          unless @digest[realm]
-            @digest[realm] = Hash.new
-          end
-          @digest[realm][user] = make_passwd(realm, user, pass)
-        }
-      end
-
-      ##
-      # Removes a password from the database for +user+ in +realm+.
-
-      def delete_passwd(realm, user)
-        if hash = @digest[realm]
-          hash.delete(user)
-        end
-      end
-
-      ##
-      # Iterate passwords in the database.
-
-      def each # :yields: [user, realm, password_hash]
-        @digest.keys.sort.each{|realm|
-          hash = @digest[realm]
-          hash.keys.sort.each{|user|
-            yield([user, realm, hash[user]])
-          }
-        }
-      end
-    end
-  end
-end
diff --git a/tool/lib/webrick/httpauth/htgroup.rb b/tool/lib/webrick/httpauth/htgroup.rb
deleted file mode 100644
index e06c441b18f356..00000000000000
--- a/tool/lib/webrick/httpauth/htgroup.rb
+++ /dev/null
@@ -1,97 +0,0 @@
-# frozen_string_literal: false
-#
-# httpauth/htgroup.rb -- Apache compatible htgroup file
-#
-# Author: IPR -- Internet Programming with Ruby -- writers
-# Copyright (c) 2003 Internet Programming with Ruby writers. All rights
-# reserved.
-#
-# $IPR: htgroup.rb,v 1.1 2003/02/16 22:22:56 gotoyuzo Exp $
-
-require 'tempfile'
-
-module WEBrick
-  module HTTPAuth
-
-    ##
-    # Htgroup accesses apache-compatible group files.  Htgroup can be used to
-    # provide group-based authentication for users.  Currently Htgroup is not
-    # directly integrated with any authenticators in WEBrick.  For security,
-    # the path for a digest password database should be stored outside of the
-    # paths available to the HTTP server.
-    #
-    # Example:
-    #
-    #   htgroup = WEBrick::HTTPAuth::Htgroup.new 'my_group_file'
-    #   htgroup.add 'superheroes', %w[spiderman batman]
-    #
-    #   htgroup.members('superheroes').include? 'magneto' # => false
-
-    class Htgroup
-
-      ##
-      # Open a group database at +path+
-
-      def initialize(path)
-        @path = path
-        @mtime = Time.at(0)
-        @group = Hash.new
-        File.open(@path,"a").close unless File.exist?(@path)
-        reload
-      end
-
-      ##
-      # Reload groups from the database
-
-      def reload
-        if (mtime = File::mtime(@path)) > @mtime
-          @group.clear
-          File.open(@path){|io|
-            while line = io.gets
-              line.chomp!
-              group, members = line.split(/:\s*/)
-              @group[group] = members.split(/\s+/)
-            end
-          }
-          @mtime = mtime
-        end
-      end
-
-      ##
-      # Flush the group database.  If +output+ is given the database will be
-      # written there instead of to the original path.
-
-      def flush(output=nil)
-        output ||= @path
-        tmp = Tempfile.create("htgroup", File::dirname(output))
-        begin
-          @group.keys.sort.each{|group|
-            tmp.puts(format("%s: %s", group, self.members(group).join(" ")))
-          }
-        ensure
-          tmp.close
-          if $!
-            File.unlink(tmp.path)
-          else
-            return File.rename(tmp.path, output)
-          end
-        end
-      end
-
-      ##
-      # Retrieve the list of members from +group+
-
-      def members(group)
-        reload
-        @group[group] || []
-      end
-
-      ##
-      # Add an Array of +members+ to +group+
-
-      def add(group, members)
-        @group[group] = members(group) | members
-      end
-    end
-  end
-end
diff --git a/tool/lib/webrick/httpauth/htpasswd.rb b/tool/lib/webrick/httpauth/htpasswd.rb
deleted file mode 100644
index abca30532e0429..00000000000000
--- a/tool/lib/webrick/httpauth/htpasswd.rb
+++ /dev/null
@@ -1,158 +0,0 @@
-# frozen_string_literal: false
-#
-# httpauth/htpasswd -- Apache compatible htpasswd file
-#
-# Author: IPR -- Internet Programming with Ruby -- writers
-# Copyright (c) 2003 Internet Programming with Ruby writers. All rights
-# reserved.
-#
-# $IPR: htpasswd.rb,v 1.4 2003/07/22 19:20:45 gotoyuzo Exp $
-
-require_relative 'userdb'
-require_relative 'basicauth'
-require 'tempfile'
-
-module WEBrick
-  module HTTPAuth
-
-    ##
-    # Htpasswd accesses apache-compatible password files.  Passwords are
-    # matched to a realm where they are valid.  For security, the path for a
-    # password database should be stored outside of the paths available to the
-    # HTTP server.
-    #
-    # Htpasswd is intended for use with WEBrick::HTTPAuth::BasicAuth.
-    #
-    # To create an Htpasswd database with a single user:
-    #
-    #   htpasswd = WEBrick::HTTPAuth::Htpasswd.new 'my_password_file'
-    #   htpasswd.set_passwd 'my realm', 'username', 'password'
-    #   htpasswd.flush
-
-    class Htpasswd
-      include UserDB
-
-      ##
-      # Open a password database at +path+
-
-      def initialize(path, password_hash: nil)
-        @path = path
-        @mtime = Time.at(0)
-        @passwd = Hash.new
-        @auth_type = BasicAuth
-        @password_hash = password_hash
-
-        case @password_hash
-        when nil
-          # begin
-          #   require "string/crypt"
-          # rescue LoadError
-          #   warn("Unable to load string/crypt, proceeding with deprecated use of String#crypt, consider using password_hash: :bcrypt")
-          # end
-          @password_hash = :crypt
-        when :crypt
-          # require "string/crypt"
-        when :bcrypt
-          require "bcrypt"
-        else
-          raise ArgumentError, "only :crypt and :bcrypt are supported for password_hash keyword argument"
-        end
-
-        File.open(@path,"a").close unless File.exist?(@path)
-        reload
-      end
-
-      ##
-      # Reload passwords from the database
-
-      def reload
-        mtime = File::mtime(@path)
-        if mtime > @mtime
-          @passwd.clear
-          File.open(@path){|io|
-            while line = io.gets
-              line.chomp!
-              case line
-              when %r!\A[^:]+:[a-zA-Z0-9./]{13}\z!
-                if @password_hash == :bcrypt
-                  raise StandardError, ".htpasswd file contains crypt password, only bcrypt passwords supported"
-                end
-                user, pass = line.split(":")
-              when %r!\A[^:]+:\$2[aby]\$\d{2}\$.{53}\z!
-                if @password_hash == :crypt
-                  raise StandardError, ".htpasswd file contains bcrypt password, only crypt passwords supported"
-                end
-                user, pass = line.split(":")
-              when /:\$/, /:{SHA}/
-                raise NotImplementedError,
-                      'MD5, SHA1 .htpasswd file not supported'
-              else
-                raise StandardError, 'bad .htpasswd file'
-              end
-              @passwd[user] = pass
-            end
-          }
-          @mtime = mtime
-        end
-      end
-
-      ##
-      # Flush the password database.  If +output+ is given the database will
-      # be written there instead of to the original path.
-
-      def flush(output=nil)
-        output ||= @path
-        tmp = Tempfile.create("htpasswd", File::dirname(output))
-        renamed = false
-        begin
-          each{|item| tmp.puts(item.join(":")) }
-          tmp.close
-          File::rename(tmp.path, output)
-          renamed = true
-        ensure
-          tmp.close
-          File.unlink(tmp.path) if !renamed
-        end
-      end
-
-      ##
-      # Retrieves a password from the database for +user+ in +realm+.  If
-      # +reload_db+ is true the database will be reloaded first.
-
-      def get_passwd(realm, user, reload_db)
-        reload() if reload_db
-        @passwd[user]
-      end
-
-      ##
-      # Sets a password in the database for +user+ in +realm+ to +pass+.
-
-      def set_passwd(realm, user, pass)
-        if @password_hash == :bcrypt
-          # Cost of 5 to match Apache default, and because the
-          # bcrypt default of 10 will introduce significant delays
-          # for every request.
-          @passwd[user] = BCrypt::Password.create(pass, :cost=>5)
-        else
-          @passwd[user] = make_passwd(realm, user, pass)
-        end
-      end
-
-      ##
-      # Removes a password from the database for +user+ in +realm+.
-
-      def delete_passwd(realm, user)
-        @passwd.delete(user)
-      end
-
-      ##
-      # Iterate passwords in the database.
-
-      def each # :yields: [user, password]
-        @passwd.keys.sort.each{|user|
-          yield([user, @passwd[user]])
-        }
-      end
-    end
-  end
-end
diff --git a/tool/lib/webrick/httpauth/userdb.rb b/tool/lib/webrick/httpauth/userdb.rb
deleted file mode 100644
index 7a17715cdf3951..00000000000000
--- a/tool/lib/webrick/httpauth/userdb.rb
+++ /dev/null
@@ -1,53 +0,0 @@
-# frozen_string_literal: false
-#--
-# httpauth/userdb.rb -- UserDB mix-in module.
-#
-# Author: IPR -- Internet Programming with Ruby -- writers
-# Copyright (c) 2003 Internet Programming with Ruby writers. All rights
-# reserved.
-#
-# $IPR: userdb.rb,v 1.2 2003/02/20 07:15:48 gotoyuzo Exp $
-
-module WEBrick
-  module HTTPAuth
-
-    ##
-    # User database mixin for HTTPAuth.  This mixin dispatches user record
-    # access to the underlying auth_type for this database.
-
-    module UserDB
-
-      ##
-      # The authentication type.
-      #
-      # WEBrick::HTTPAuth::BasicAuth or WEBrick::HTTPAuth::DigestAuth are
-      # built-in.
-
-      attr_accessor :auth_type
-
-      ##
-      # Creates an obscured password in +realm+ with +user+ and +password+
-      # using the auth_type of this database.
-
-      def make_passwd(realm, user, pass)
-        @auth_type::make_passwd(realm, user, pass)
-      end
-
-      ##
-      # Sets a password in +realm+ with +user+ and +password+ for the
-      # auth_type of this database.
-
-      def set_passwd(realm, user, pass)
-        self[user] = pass
-      end
-
-      ##
-      # Retrieves a password in +realm+ for +user+ for the auth_type of this
-      # database.  +reload_db+ is a dummy value.
-
-      def get_passwd(realm, user, reload_db=false)
-        make_passwd(realm, user, self[user])
-      end
-    end
-  end
-end
diff --git a/tool/lib/webrick/httpproxy.rb b/tool/lib/webrick/httpproxy.rb
deleted file mode 100644
index 7607c3df88e3e6..00000000000000
--- a/tool/lib/webrick/httpproxy.rb
+++ /dev/null
@@ -1,354 +0,0 @@
-# frozen_string_literal: false
-#
-# httpproxy.rb -- HTTPProxy Class
-#
-# Author: IPR -- Internet Programming with Ruby -- writers
-# Copyright (c) 2002 GOTO Kentaro
-# Copyright (c) 2002 Internet Programming with Ruby writers. All rights
-# reserved.
-#
-# $IPR: httpproxy.rb,v 1.18 2003/03/08 18:58:10 gotoyuzo Exp $
-# $kNotwork: straw.rb,v 1.3 2002/02/12 15:13:07 gotoken Exp $
-
-require_relative "httpserver"
-require "net/http"
-
-module WEBrick
-
-  NullReader = Object.new # :nodoc:
-  class << NullReader # :nodoc:
-    def read(*args)
-      nil
-    end
-    alias gets read
-  end
-
-  FakeProxyURI = Object.new # :nodoc:
-  class << FakeProxyURI # :nodoc:
-    def method_missing(meth, *args)
-      if %w(scheme host port path query userinfo).member?(meth.to_s)
-        return nil
-      end
-      super
-    end
-  end
-
-  # :startdoc:
-
-  ##
-  # An HTTP Proxy server which proxies GET, HEAD and POST requests.
-  #
-  # To create a simple proxy server:
-  #
-  #   require 'webrick'
-  #   require 'webrick/httpproxy'
-  #
-  #   proxy = WEBrick::HTTPProxyServer.new Port: 8000
-  #
-  #   trap 'INT'  do proxy.shutdown end
-  #   trap 'TERM' do proxy.shutdown end
-  #
-  #   proxy.start
-  #
-  # See ::new for proxy-specific configuration items.
-  #
-  # == Modifying proxied responses
-  #
-  # To modify content the proxy server returns use the +:ProxyContentHandler+
-  # option:
-  #
-  #   handler = proc do |req, res|
-  #     if res['content-type'] == 'text/plain' then
-  #       res.body << "\nThis content was proxied!\n"
-  #     end
-  #   end
-  #
-  #   proxy =
-  #     WEBrick::HTTPProxyServer.new Port: 8000, ProxyContentHandler: handler
-
-  class HTTPProxyServer < HTTPServer
-
-    ##
-    # Proxy server configurations.  The proxy server handles the following
-    # configuration items in addition to those supported by HTTPServer:
-    #
-    # :ProxyAuthProc:: Called with a request and response to authorize a
-    #                  request
-    # :ProxyVia:: Appended to the via header
-    # :ProxyURI:: The proxy server's URI
-    # :ProxyContentHandler:: Called with a request and response and allows
-    #                        modification of the response
-    # :ProxyTimeout:: Sets the proxy timeouts to 30 seconds for open and 60
-    #                 seconds for read operations
-
-    def initialize(config={}, default=Config::HTTP)
-      super(config, default)
-      c = @config
-      @via = "#{c[:HTTPVersion]} #{c[:ServerName]}:#{c[:Port]}"
-    end
-
-    # :stopdoc:
-    def service(req, res)
-      if req.request_method == "CONNECT"
-        do_CONNECT(req, res)
-      elsif req.unparsed_uri =~ %r!^http://!
-        proxy_service(req, res)
-      else
-        super(req, res)
-      end
-    end
-
-    def proxy_auth(req, res)
-      if proc = @config[:ProxyAuthProc]
-        proc.call(req, res)
-      end
-      req.header.delete("proxy-authorization")
-    end
-
-    def proxy_uri(req, res)
-      # should return upstream proxy server's URI
-      return @config[:ProxyURI]
-    end
-
-    def proxy_service(req, res)
-      # Proxy Authentication
-      proxy_auth(req, res)
-
-      begin
-        public_send("do_#{req.request_method}", req, res)
-      rescue NoMethodError
-        raise HTTPStatus::MethodNotAllowed,
-          "unsupported method `#{req.request_method}'."
-      rescue => err
-        logger.debug("#{err.class}: #{err.message}")
-        raise HTTPStatus::ServiceUnavailable, err.message
-      end
-
-      # Process contents
-      if handler = @config[:ProxyContentHandler]
-        handler.call(req, res)
-      end
-    end
-
-    def do_CONNECT(req, res)
-      # Proxy Authentication
-      proxy_auth(req, res)
-
-      ua = Thread.current[:WEBrickSocket]  # User-Agent
-      raise HTTPStatus::InternalServerError,
-        "[BUG] cannot get socket" unless ua
-
-      host, port = req.unparsed_uri.split(":", 2)
-      # Proxy authentication for upstream proxy server
-      if proxy = proxy_uri(req, res)
-        proxy_request_line = "CONNECT #{host}:#{port} HTTP/1.0"
-        if proxy.userinfo
-          credentials = "Basic " + [proxy.userinfo].pack("m0")
-        end
-        host, port = proxy.host, proxy.port
-      end
-
-      begin
-        @logger.debug("CONNECT: upstream proxy is `#{host}:#{port}'.")
-        os = TCPSocket.new(host, port)     # origin server
-
-        if proxy
-          @logger.debug("CONNECT: sending a Request-Line")
-          os << proxy_request_line << CRLF
-          @logger.debug("CONNECT: > #{proxy_request_line}")
-          if credentials
-            @logger.debug("CONNECT: sending credentials")
-            os << "Proxy-Authorization: " << credentials << CRLF
-          end
-          os << CRLF
-          proxy_status_line = os.gets(LF)
-          @logger.debug("CONNECT: read Status-Line from the upstream server")
-          @logger.debug("CONNECT: < #{proxy_status_line}")
-          if %r{^HTTP/\d+\.\d+\s+200\s*} =~ proxy_status_line
-            while line = os.gets(LF)
-              break if /\A(#{CRLF}|#{LF})\z/om =~ line
-            end
-          else
-            raise HTTPStatus::BadGateway
-          end
-        end
-        @logger.debug("CONNECT #{host}:#{port}: succeeded")
-        res.status = HTTPStatus::RC_OK
-      rescue => ex
-        @logger.debug("CONNECT #{host}:#{port}: failed `#{ex.message}'")
-        res.set_error(ex)
-        raise HTTPStatus::EOFError
-      ensure
-        if handler = @config[:ProxyContentHandler]
-          handler.call(req, res)
-        end
-        res.send_response(ua)
-        access_log(@config, req, res)
-
-        # Should clear request-line not to send the response twice.
-        # see: HTTPServer#run
-        req.parse(NullReader) rescue nil
-      end
-
-      begin
-        while fds = IO::select([ua, os])
-          if fds[0].member?(ua)
-            buf = ua.readpartial(1024);
-            @logger.debug("CONNECT: #{buf.bytesize} byte from User-Agent")
-            os.write(buf)
-          elsif fds[0].member?(os)
-            buf = os.readpartial(1024);
-            @logger.debug("CONNECT: #{buf.bytesize} byte from #{host}:#{port}")
-            ua.write(buf)
-          end
-        end
-      rescue
-        os.close
-        @logger.debug("CONNECT #{host}:#{port}: closed")
-      end
-
-      raise HTTPStatus::EOFError
-    end
-
-    def do_GET(req, res)
-      perform_proxy_request(req, res, Net::HTTP::Get)
-    end
-
-    def do_HEAD(req, res)
-      perform_proxy_request(req, res, Net::HTTP::Head)
-    end
-
-    def do_POST(req, res)
-      perform_proxy_request(req, res, Net::HTTP::Post, req.body_reader)
-    end
-
-    def do_OPTIONS(req, res)
-      res['allow'] = "GET,HEAD,POST,OPTIONS,CONNECT"
-    end
-
-    private
-
-    # Some header fields should not be transferred.
-    HopByHop = %w( connection keep-alive proxy-authenticate upgrade
-                   proxy-authorization te trailers transfer-encoding )
-    ShouldNotTransfer = %w( set-cookie proxy-connection )
-    def split_field(f) f ? f.split(/,\s+/).collect{|i| i.downcase } : [] end
-
-    def choose_header(src, dst)
-      connections = split_field(src['connection'])
-      src.each{|key, value|
-        key = key.downcase
-        if HopByHop.member?(key)          || # RFC2616: 13.5.1
-           connections.member?(key)       || # RFC2616: 14.10
-           ShouldNotTransfer.member?(key)    # pragmatics
-          @logger.debug("choose_header: `#{key}: #{value}'")
-          next
-        end
-        dst[key] = value
-      }
-    end
-
-    # Net::HTTP is stupid about the multiple header fields.
-    # Here is workaround:
-    def set_cookie(src, dst)
-      if str = src['set-cookie']
-        cookies = []
-        str.split(/,\s*/).each{|token|
-          if /^[^=]+;/o =~ token
-            cookies[-1] << ", " << token
-          elsif /=/o =~ token
-            cookies << token
-          else
-            cookies[-1] << ", " << token
-          end
-        }
-        dst.cookies.replace(cookies)
-      end
-    end
-
-    def set_via(h)
-      if @config[:ProxyVia]
-        if  h['via']
-          h['via'] << ", " << @via
-        else
-          h['via'] = @via
-        end
-      end
-    end
-
-    def setup_proxy_header(req, res)
-      # Choose header fields to transfer
-      header = Hash.new
-      choose_header(req, header)
-      set_via(header)
-      return header
-    end
-
-    def setup_upstream_proxy_authentication(req, res, header)
-      if upstream = proxy_uri(req, res)
-        if upstream.userinfo
-          header['proxy-authorization'] =
-            "Basic " + [upstream.userinfo].pack("m0")
-        end
-        return upstream
-      end
-      return FakeProxyURI
-    end
-
-    def create_net_http(uri, upstream)
-      Net::HTTP.new(uri.host, uri.port, upstream.host, upstream.port)
-    end
-
-    def perform_proxy_request(req, res, req_class, body_stream = nil)
-      uri = req.request_uri
-      path = uri.path.dup
-      path << "?" << uri.query if uri.query
-      header = setup_proxy_header(req, res)
-      upstream = setup_upstream_proxy_authentication(req, res, header)
-
-      body_tmp = []
-      http = create_net_http(uri, upstream)
-      req_fib = Fiber.new do
-        http.start do
-          if @config[:ProxyTimeout]
-            ##################################   these issues are
-            http.open_timeout = 30   # secs  #   necessary (maybe because
-            http.read_timeout = 60   # secs  #   Ruby's bug, but why?)
-            ##################################
-          end
-          if body_stream && req['transfer-encoding'] =~ /\bchunked\b/i
-            header['Transfer-Encoding'] = 'chunked'
-          end
-          http_req = req_class.new(path, header)
-          http_req.body_stream = body_stream if body_stream
-          http.request(http_req) do |response|
-            # Persistent connection requirements are mysterious for me.
-            # So I will close the connection in every response.
-            res['proxy-connection'] = "close"
-            res['connection'] = "close"
-
-            # stream Net::HTTP::HTTPResponse to WEBrick::HTTPResponse
-            res.status = response.code.to_i
-            res.chunked = response.chunked?
-            choose_header(response, res)
-            set_cookie(response, res)
-            set_via(res)
-            response.read_body do |buf|
-              body_tmp << buf
-              Fiber.yield # wait for res.body Proc#call
-            end
-          end # http.request
-        end
-      end
-      req_fib.resume # read HTTP response headers and first chunk of the body
-      res.body = ->(socket) do
-        while buf = body_tmp.shift
-          socket.write(buf)
-          buf.clear
-          req_fib.resume # continue response.read_body
-        end
-      end
-    end
-    # :stopdoc:
-  end
-end
diff --git a/tool/lib/webrick/httprequest.rb b/tool/lib/webrick/httprequest.rb
deleted file mode 100644
index d34eac7ecf6ed0..00000000000000
--- a/tool/lib/webrick/httprequest.rb
+++ /dev/null
@@ -1,636 +0,0 @@
-# frozen_string_literal: false
-#
-# httprequest.rb -- HTTPRequest Class
-#
-# Author: IPR -- Internet Programming with Ruby -- writers
-# Copyright (c) 2000, 2001 TAKAHASHI Masayoshi, GOTOU Yuuzou
-# Copyright (c) 2002 Internet Programming with Ruby writers. All rights
-# reserved.
-#
-# $IPR: httprequest.rb,v 1.64 2003/07/13 17:18:22 gotoyuzo Exp $
-
-require 'fiber'
-require 'uri'
-require_relative 'httpversion'
-require_relative 'httpstatus'
-require_relative 'httputils'
-require_relative 'cookie'
-
-module WEBrick
-
-  ##
-  # An HTTP request.  This is consumed by service and do_* methods in
-  # WEBrick servlets
-
-  class HTTPRequest
-
-    BODY_CONTAINABLE_METHODS = [ "POST", "PUT" ] # :nodoc:
-
-    # :section: Request line
-
-    ##
-    # The complete request line such as:
-    #
-    #   GET / HTTP/1.1
-
-    attr_reader :request_line
-
-    ##
-    # The request method, GET, POST, PUT, etc.
-
-    attr_reader :request_method
-
-    ##
-    # The unparsed URI of the request
-
-    attr_reader :unparsed_uri
-
-    ##
-    # The HTTP version of the request
-
-    attr_reader :http_version
-
-    # :section: Request-URI
-
-    ##
-    # The parsed URI of the request
-
-    attr_reader :request_uri
-
-    ##
-    # The request path
-
-    attr_reader :path
-
-    ##
-    # The script name (CGI variable)
-
-    attr_accessor :script_name
-
-    ##
-    # The path info (CGI variable)
-
-    attr_accessor :path_info
-
-    ##
-    # The query from the URI of the request
-
-    attr_accessor :query_string
-
-    # :section: Header and entity body
-
-    ##
-    # The raw header of the request
-
-    attr_reader :raw_header
-
-    ##
-    # The parsed header of the request
-
-    attr_reader :header
-
-    ##
-    # The parsed request cookies
-
-    attr_reader :cookies
-
-    ##
-    # The Accept header value
-
-    attr_reader :accept
-
-    ##
-    # The Accept-Charset header value
-
-    attr_reader :accept_charset
-
-    ##
-    # The Accept-Encoding header value
-
-    attr_reader :accept_encoding
-
-    ##
-    # The Accept-Language header value
-
-    attr_reader :accept_language
-
-    # :section:
-
-    ##
-    # The remote user (CGI variable)
-
-    attr_accessor :user
-
-    ##
-    # The socket address of the server
-
-    attr_reader :addr
-
-    ##
-    # The socket address of the client
-
-    attr_reader :peeraddr
-
-    ##
-    # Hash of request attributes
-
-    attr_reader :attributes
-
-    ##
-    # Is this a keep-alive connection?
-
-    attr_reader :keep_alive
-
-    ##
-    # The local time this request was received
-
-    attr_reader :request_time
-
-    ##
-    # Creates a new HTTP request.  WEBrick::Config::HTTP is the default
-    # configuration.
-
-    def initialize(config)
-      @config = config
-      @buffer_size = @config[:InputBufferSize]
-      @logger = config[:Logger]
-
-      @request_line = @request_method =
-        @unparsed_uri = @http_version = nil
-
-      @request_uri = @host = @port = @path = nil
-      @script_name = @path_info = nil
-      @query_string = nil
-      @query = nil
-      @form_data = nil
-
-      @raw_header = Array.new
-      @header = nil
-      @cookies = []
-      @accept = []
-      @accept_charset = []
-      @accept_encoding = []
-      @accept_language = []
-      @body = ""
-
-      @addr = @peeraddr = nil
-      @attributes = {}
-      @user = nil
-      @keep_alive = false
-      @request_time = nil
-
-      @remaining_size = nil
-      @socket = nil
-
-      @forwarded_proto = @forwarded_host = @forwarded_port =
-        @forwarded_server = @forwarded_for = nil
-    end
-
-    ##
-    # Parses a request from +socket+.  This is called internally by
-    # WEBrick::HTTPServer.
-
-    def parse(socket=nil)
-      @socket = socket
-      begin
-        @peeraddr = socket.respond_to?(:peeraddr) ? socket.peeraddr : []
-        @addr = socket.respond_to?(:addr) ? socket.addr : []
-      rescue Errno::ENOTCONN
-        raise HTTPStatus::EOFError
-      end
-
-      read_request_line(socket)
-      if @http_version.major > 0
-        read_header(socket)
-        @header['cookie'].each{|cookie|
-          @cookies += Cookie::parse(cookie)
-        }
-        @accept = HTTPUtils.parse_qvalues(self['accept'])
-        @accept_charset = HTTPUtils.parse_qvalues(self['accept-charset'])
-        @accept_encoding = HTTPUtils.parse_qvalues(self['accept-encoding'])
-        @accept_language = HTTPUtils.parse_qvalues(self['accept-language'])
-      end
-      return if @request_method == "CONNECT"
-      return if @unparsed_uri == "*"
-
-      begin
-        setup_forwarded_info
-        @request_uri = parse_uri(@unparsed_uri)
-        @path = HTTPUtils::unescape(@request_uri.path)
-        @path = HTTPUtils::normalize_path(@path)
-        @host = @request_uri.host
-        @port = @request_uri.port
-        @query_string = @request_uri.query
-        @script_name = ""
-        @path_info = @path.dup
-      rescue
-        raise HTTPStatus::BadRequest, "bad URI `#{@unparsed_uri}'."
-      end
-
-      if /\Aclose\z/io =~ self["connection"]
-        @keep_alive = false
-      elsif /\Akeep-alive\z/io =~ self["connection"]
-        @keep_alive = true
-      elsif @http_version < "1.1"
-        @keep_alive = false
-      else
-        @keep_alive = true
-      end
-    end
-
-    ##
-    # Generate HTTP/1.1 100 continue response if the client expects it,
-    # otherwise does nothing.
-
-    def continue # :nodoc:
-      if self['expect'] == '100-continue' && @config[:HTTPVersion] >= "1.1"
-        @socket << "HTTP/#{@config[:HTTPVersion]} 100 continue#{CRLF}#{CRLF}"
-        @header.delete('expect')
-      end
-    end
-
-    ##
-    # Returns the request body.
-
-    def body(&block) # :yields: body_chunk
-      block ||= Proc.new{|chunk| @body << chunk }
-      read_body(@socket, block)
-      @body.empty? ? nil : @body
-    end
-
-    ##
-    # Prepares the HTTPRequest object for use as the
-    # source for IO.copy_stream
-
-    def body_reader
-      @body_tmp = []
-      @body_rd = Fiber.new do
-        body do |buf|
-          @body_tmp << buf
-          Fiber.yield
-        end
-      end
-      @body_rd.resume # grab the first chunk and yield
-      self
-    end
-
-    # for IO.copy_stream.
-    def readpartial(size, buf = ''.b) # :nodoc
-      res = @body_tmp.shift or raise EOFError, 'end of file reached'
-      if res.length > size
-        @body_tmp.unshift(res[size..-1])
-        res = res[0..size - 1]
-      end
-      buf.replace(res)
-      res.clear
-      # get more chunks - check alive? because we can take a partial chunk
-      @body_rd.resume if @body_rd.alive?
-      buf
-    end
-
-    ##
-    # Request query as a Hash
-
-    def query
-      unless @query
-        parse_query()
-      end
-      @query
-    end
-
-    ##
-    # The content-length header
-
-    def content_length
-      return Integer(self['content-length'])
-    end
-
-    ##
-    # The content-type header
-
-    def content_type
-      return self['content-type']
-    end
-
-    ##
-    # Retrieves +header_name+
-
-    def [](header_name)
-      if @header
-        value = @header[header_name.downcase]
-        value.empty? ? nil : value.join(", ")
-      end
-    end
-
-    ##
-    # Iterates over the request headers
-
-    def each
-      if @header
-        @header.each{|k, v|
-          value = @header[k]
-          yield(k, value.empty? ? nil : value.join(", "))
-        }
-      end
-    end
-
-    ##
-    # The host this request is for
-
-    def host
-      return @forwarded_host || @host
-    end
-
-    ##
-    # The port this request is for
-
-    def port
-      return @forwarded_port || @port
-    end
-
-    ##
-    # The server name this request is for
-
-    def server_name
-      return @forwarded_server || @config[:ServerName]
-    end
-
-    ##
-    # The client's IP address
-
-    def remote_ip
-      return self["client-ip"] || @forwarded_for || @peeraddr[3]
-    end
-
-    ##
-    # Is this an SSL request?
-
-    def ssl?
-      return @request_uri.scheme == "https"
-    end
-
-    ##
-    # Should the connection this request was made on be kept alive?
-
-    def keep_alive?
-      @keep_alive
-    end
-
-    def to_s # :nodoc:
-      ret = @request_line.dup
-      @raw_header.each{|line| ret << line }
-      ret << CRLF
-      ret << body if body
-      ret
-    end
-
-    ##
-    # Consumes any remaining body and updates keep-alive status
-
-    def fixup() # :nodoc:
-      begin
-        body{|chunk| }   # read remaining body
-      rescue HTTPStatus::Error => ex
-        @logger.error("HTTPRequest#fixup: #{ex.class} occurred.")
-        @keep_alive = false
-      rescue => ex
-        @logger.error(ex)
-        @keep_alive = false
-      end
-    end
-
-    # This method provides the metavariables defined by the revision 3
-    # of "The WWW Common Gateway Interface Version 1.1"
-    # To browse the current document of CGI Version 1.1, see below:
-    # http://tools.ietf.org/html/rfc3875
-
-    def meta_vars
-      meta = Hash.new
-
-      cl = self["Content-Length"]
-      ct = self["Content-Type"]
-      meta["CONTENT_LENGTH"]    = cl if cl.to_i > 0
-      meta["CONTENT_TYPE"]      = ct.dup if ct
-      meta["GATEWAY_INTERFACE"] = "CGI/1.1"
-      meta["PATH_INFO"]         = @path_info ? @path_info.dup : ""
-     #meta["PATH_TRANSLATED"]   = nil      # no plan to be provided
-      meta["QUERY_STRING"]      = @query_string ? @query_string.dup : ""
-      meta["REMOTE_ADDR"]       = @peeraddr[3]
-      meta["REMOTE_HOST"]       = @peeraddr[2]
-     #meta["REMOTE_IDENT"]      = nil      # no plan to be provided
-      meta["REMOTE_USER"]       = @user
-      meta["REQUEST_METHOD"]    = @request_method.dup
-      meta["REQUEST_URI"]       = @request_uri.to_s
-      meta["SCRIPT_NAME"]       = @script_name.dup
-      meta["SERVER_NAME"]       = @host
-      meta["SERVER_PORT"]       = @port.to_s
-      meta["SERVER_PROTOCOL"]   = "HTTP/" + @config[:HTTPVersion].to_s
-      meta["SERVER_SOFTWARE"]   = @config[:ServerSoftware].dup
-
-      self.each{|key, val|
-        next if /^content-type$/i =~ key
-        next if /^content-length$/i =~ key
-        name = "HTTP_" + key
-        name.gsub!(/-/o, "_")
-        name.upcase!
-        meta[name] = val
-      }
-
-      meta
-    end
-
-    private
-
-    # :stopdoc:
-
-    MAX_URI_LENGTH = 2083 # :nodoc:
-
-    # same as Mongrel, Thin and Puma
-    MAX_HEADER_LENGTH = (112 * 1024) # :nodoc:
-
-    def read_request_line(socket)
-      @request_line = read_line(socket, MAX_URI_LENGTH) if socket
-      raise HTTPStatus::EOFError unless @request_line
-
-      @request_bytes = @request_line.bytesize
-      if @request_bytes >= MAX_URI_LENGTH and @request_line[-1, 1] != LF
-        raise HTTPStatus::RequestURITooLarge
-      end
-
-      @request_time = Time.now
-      if /^(\S+)\s+(\S++)(?:\s+HTTP\/(\d+\.\d+))?\r?\n/mo =~ @request_line
-        @request_method = $1
-        @unparsed_uri   = $2
-        @http_version   = HTTPVersion.new($3 ? $3 : "0.9")
-      else
-        rl = @request_line.sub(/\x0d?\x0a\z/o, '')
-        raise HTTPStatus::BadRequest, "bad Request-Line `#{rl}'."
-      end
-    end
-
-    def read_header(socket)
-      if socket
-        while line = read_line(socket)
-          break if /\A(#{CRLF}|#{LF})\z/om =~ line
-          if (@request_bytes += line.bytesize) > MAX_HEADER_LENGTH
-            raise HTTPStatus::RequestEntityTooLarge, 'headers too large'
-          end
-          @raw_header << line
-        end
-      end
-      @header = HTTPUtils::parse_header(@raw_header.join)
-    end
-
-    def parse_uri(str, scheme="http")
-      if @config[:Escape8bitURI]
-        str = HTTPUtils::escape8bit(str)
-      end
-      str.sub!(%r{\A/+}o, '/')
-      uri = URI::parse(str)
-      return uri if uri.absolute?
-      if @forwarded_host
-        host, port = @forwarded_host, @forwarded_port
-      elsif self["host"]
-        pattern = /\A(#{URI::REGEXP::PATTERN::HOST})(?::(\d+))?\z/n
-        host, port = *self['host'].scan(pattern)[0]
-      elsif @addr.size > 0
-        host, port = @addr[2], @addr[1]
-      else
-        host, port = @config[:ServerName], @config[:Port]
-      end
-      uri.scheme = @forwarded_proto || scheme
-      uri.host = host
-      uri.port = port ? port.to_i : nil
-      return URI::parse(uri.to_s)
-    end
-
-    def read_body(socket, block)
-      return unless socket
-      if tc = self['transfer-encoding']
-        case tc
-        when /\Achunked\z/io then read_chunked(socket, block)
-        else raise HTTPStatus::NotImplemented, "Transfer-Encoding: #{tc}."
-        end
-      elsif self['content-length'] || @remaining_size
-        @remaining_size ||= self['content-length'].to_i
-        while @remaining_size > 0
-          sz = [@buffer_size, @remaining_size].min
-          break unless buf = read_data(socket, sz)
-          @remaining_size -= buf.bytesize
-          block.call(buf)
-        end
-        if @remaining_size > 0 && @socket.eof?
-          raise HTTPStatus::BadRequest, "invalid body size."
-        end
-      elsif BODY_CONTAINABLE_METHODS.member?(@request_method) && !@socket.eof
-        raise HTTPStatus::LengthRequired
-      end
-      return @body
-    end
-
-    def read_chunk_size(socket)
-      line = read_line(socket)
-      if /^([0-9a-fA-F]+)(?:;(\S+))?/ =~ line
-        chunk_size = $1.hex
-        chunk_ext = $2
-        [ chunk_size, chunk_ext ]
-      else
-        raise HTTPStatus::BadRequest, "bad chunk `#{line}'."
-      end
-    end
-
-    def read_chunked(socket, block)
-      chunk_size, = read_chunk_size(socket)
-      while chunk_size > 0
-        begin
-          sz = [ chunk_size, @buffer_size ].min
-          data = read_data(socket, sz) # read chunk-data
-          if data.nil? || data.bytesize != sz
-            raise HTTPStatus::BadRequest, "bad chunk data size."
-          end
-          block.call(data)
-        end while (chunk_size -= sz) > 0
-
-        read_line(socket)                    # skip CRLF
-        chunk_size, = read_chunk_size(socket)
-      end
-      read_header(socket)                    # trailer + CRLF
-      @header.delete("transfer-encoding")
-      @remaining_size = 0
-    end
-
-    def _read_data(io, method, *arg)
-      begin
-        WEBrick::Utils.timeout(@config[:RequestTimeout]){
-          return io.__send__(method, *arg)
-        }
-      rescue Errno::ECONNRESET
-        return nil
-      rescue Timeout::Error
-        raise HTTPStatus::RequestTimeout
-      end
-    end
-
-    def read_line(io, size=4096)
-      _read_data(io, :gets, LF, size)
-    end
-
-    def read_data(io, size)
-      _read_data(io, :read, size)
-    end
-
-    def parse_query()
-      begin
-        if @request_method == "GET" || @request_method == "HEAD"
-          @query = HTTPUtils::parse_query(@query_string)
-        elsif self['content-type'] =~ /^application\/x-www-form-urlencoded/
-          @query = HTTPUtils::parse_query(body)
-        elsif self['content-type'] =~ /^multipart\/form-data; boundary=(.+)/
-          boundary = HTTPUtils::dequote($1)
-          @query = HTTPUtils::parse_form_data(body, boundary)
-        else
-          @query = Hash.new
-        end
-      rescue => ex
-        raise HTTPStatus::BadRequest, ex.message
-      end
-    end
-
-    PrivateNetworkRegexp = /
-      ^unknown$|
-      ^((::ffff:)?127.0.0.1|::1)$|
-      ^(::ffff:)?(10|172\.(1[6-9]|2[0-9]|3[01])|192\.168)\.
-    /ixo
-
-    # It's said that all X-Forwarded-* headers will contain more than one
-    # (comma-separated) value if the original request already contained one of
-    # these headers. Since we could use these values as Host header, we choose
-    # the initial(first) value. (apr_table_mergen() adds new value after the
-    # existing value with ", " prefix)
-    def setup_forwarded_info
-      if @forwarded_server = self["x-forwarded-server"]
-        @forwarded_server = @forwarded_server.split(",", 2).first
-      end
-      if @forwarded_proto = self["x-forwarded-proto"]
-        @forwarded_proto = @forwarded_proto.split(",", 2).first
-      end
-      if host_port = self["x-forwarded-host"]
-        host_port = host_port.split(",", 2).first
-        if host_port =~ /\A(\[[0-9a-fA-F:]+\])(?::(\d+))?\z/
-          @forwarded_host = $1
-          tmp = $2
-        else
-          @forwarded_host, tmp = host_port.split(":", 2)
-        end
-        @forwarded_port = (tmp || (@forwarded_proto == "https" ? 443 : 80)).to_i
-      end
-      if addrs = self["x-forwarded-for"]
-        addrs = addrs.split(",").collect(&:strip)
-        addrs.reject!{|ip| PrivateNetworkRegexp =~ ip }
-        @forwarded_for = addrs.first
-      end
-    end
-
-    # :startdoc:
-  end
-end
diff --git a/tool/lib/webrick/httpresponse.rb b/tool/lib/webrick/httpresponse.rb
deleted file mode 100644
index ba4494ab748af1..00000000000000
--- a/tool/lib/webrick/httpresponse.rb
+++ /dev/null
@@ -1,564 +0,0 @@
-# frozen_string_literal: false
-#
-# httpresponse.rb -- HTTPResponse Class
-#
-# Author: IPR -- Internet Programming with Ruby -- writers
-# Copyright (c) 2000, 2001 TAKAHASHI Masayoshi, GOTOU Yuuzou
-# Copyright (c) 2002 Internet Programming with Ruby writers. All rights
-# reserved.
-#
-# $IPR: httpresponse.rb,v 1.45 2003/07/11 11:02:25 gotoyuzo Exp $
-
-require 'time'
-require 'uri'
-require_relative 'httpversion'
-require_relative 'htmlutils'
-require_relative 'httputils'
-require_relative 'httpstatus'
-
-module WEBrick
-  ##
-  # An HTTP response.  This is filled in by the service or do_* methods of a
-  # WEBrick HTTP Servlet.
-
-  class HTTPResponse
-    class InvalidHeader < StandardError
-    end
-
-    ##
-    # HTTP Response version
-
-    attr_reader :http_version
-
-    ##
-    # Response status code (200)
-
-    attr_reader :status
-
-    ##
-    # Response header
-
-    attr_reader :header
-
-    ##
-    # Response cookies
-
-    attr_reader :cookies
-
-    ##
-    # Response reason phrase ("OK")
-
-    attr_accessor :reason_phrase
-
-    ##
-    # Body may be:
-    # * a String;
-    # * an IO-like object that responds to +#read+ and +#readpartial+;
-    # * a Proc-like object that responds to +#call+.
-    #
-    # In the latter case, either #chunked= should be set to +true+,
-    # or <code>header['content-length']</code> explicitly provided.
-    # Example:
-    #
-    #   server.mount_proc '/' do |req, res|
-    #     res.chunked = true
-    #     # or
-    #     # res.header['content-length'] = 10
-    #     res.body = proc { |out| out.write(Time.now.to_s) }
-    #   end
-
-    attr_accessor :body
-
-    ##
-    # Request method for this response
-
-    attr_accessor :request_method
-
-    ##
-    # Request URI for this response
-
-    attr_accessor :request_uri
-
-    ##
-    # Request HTTP version for this response
-
-    attr_accessor :request_http_version
-
-    ##
-    # Filename of the static file in this response.  Only used by the
-    # FileHandler servlet.
-
-    attr_accessor :filename
-
-    ##
-    # Is this a keep-alive response?
-
-    attr_accessor :keep_alive
-
-    ##
-    # Configuration for this response
-
-    attr_reader :config
-
-    ##
-    # Bytes sent in this response
-
-    attr_reader :sent_size
-
-    ##
-    # Creates a new HTTP response object.  WEBrick::Config::HTTP is the
-    # default configuration.
-
-    def initialize(config)
-      @config = config
-      @buffer_size = config[:OutputBufferSize]
-      @logger = config[:Logger]
-      @header = Hash.new
-      @status = HTTPStatus::RC_OK
-      @reason_phrase = nil
-      @http_version = HTTPVersion::convert(@config[:HTTPVersion])
-      @body = ''
-      @keep_alive = true
-      @cookies = []
-      @request_method = nil
-      @request_uri = nil
-      @request_http_version = @http_version  # temporary
-      @chunked = false
-      @filename = nil
-      @sent_size = 0
-      @bodytempfile = nil
-    end
-
-    ##
-    # The response's HTTP status line
-
-    def status_line
-      "HTTP/#@http_version #@status #@reason_phrase".rstrip << CRLF
-    end
-
-    ##
-    # Sets the response's status to the +status+ code
-
-    def status=(status)
-      @status = status
-      @reason_phrase = HTTPStatus::reason_phrase(status)
-    end
-
-    ##
-    # Retrieves the response header +field+
-
-    def [](field)
-      @header[field.downcase]
-    end
-
-    ##
-    # Sets the response header +field+ to +value+
-
-    def []=(field, value)
-      @chunked = value.to_s.downcase == 'chunked' if field.downcase == 'transfer-encoding'
-      @header[field.downcase] = value.to_s
-    end
-
-    ##
-    # The content-length header
-
-    def content_length
-      if len = self['content-length']
-        return Integer(len)
-      end
-    end
-
-    ##
-    # Sets the content-length header to +len+
-
-    def content_length=(len)
-      self['content-length'] = len.to_s
-    end
-
-    ##
-    # The content-type header
-
-    def content_type
-      self['content-type']
-    end
-
-    ##
-    # Sets the content-type header to +type+
-
-    def content_type=(type)
-      self['content-type'] = type
-    end
-
-    ##
-    # Iterates over each header in the response
-
-    def each
-      @header.each{|field, value|  yield(field, value) }
-    end
-
-    ##
-    # Will this response body be returned using chunked transfer-encoding?
-
-    def chunked?
-      @chunked
-    end
-
-    ##
-    # Enables chunked transfer encoding.
-
-    def chunked=(val)
-      @chunked = val ? true : false
-    end
-
-    ##
-    # Will this response's connection be kept alive?
-
-    def keep_alive?
-      @keep_alive
-    end
-
-    ##
-    # Sends the response on +socket+
-
-    def send_response(socket) # :nodoc:
-      begin
-        setup_header()
-        send_header(socket)
-        send_body(socket)
-      rescue Errno::EPIPE, Errno::ECONNRESET, Errno::ENOTCONN => ex
-        @logger.debug(ex)
-        @keep_alive = false
-      rescue Exception => ex
-        @logger.error(ex)
-        @keep_alive = false
-      end
-    end
-
-    ##
-    # Sets up the headers for sending
-
-    def setup_header() # :nodoc:
-      @reason_phrase    ||= HTTPStatus::reason_phrase(@status)
-      @header['server'] ||= @config[:ServerSoftware]
-      @header['date']   ||= Time.now.httpdate
-
-      # HTTP/0.9 features
-      if @request_http_version < "1.0"
-        @http_version = HTTPVersion.new("0.9")
-        @keep_alive = false
-      end
-
-      # HTTP/1.0 features
-      if @request_http_version < "1.1"
-        if chunked?
-          @chunked = false
-          ver = @request_http_version.to_s
-          msg = "chunked is set for an HTTP/#{ver} request. (ignored)"
-          @logger.warn(msg)
-        end
-      end
-
-      # Determine the message length (RFC2616 -- 4.4 Message Length)
-      if @status == 304 || @status == 204 || HTTPStatus::info?(@status)
-        @header.delete('content-length')
-        @body = ""
-      elsif chunked?
-        @header["transfer-encoding"] = "chunked"
-        @header.delete('content-length')
-      elsif %r{^multipart/byteranges} =~ @header['content-type']
-        @header.delete('content-length')
-      elsif @header['content-length'].nil?
-        if @body.respond_to? :readpartial
-        elsif @body.respond_to? :call
-          make_body_tempfile
-        else
-          @header['content-length'] = (@body ? @body.bytesize : 0).to_s
-        end
-      end
-
-      # Keep-Alive connection.
-      if @header['connection'] == "close"
-         @keep_alive = false
-      elsif keep_alive?
-        if chunked? || @header['content-length'] || @status == 304 || @status == 204 || HTTPStatus.info?(@status)
-          @header['connection'] = "Keep-Alive"
-        else
-          msg = "Could not determine content-length of response body. Set content-length of the response or set Response#chunked = true"
-          @logger.warn(msg)
-          @header['connection'] = "close"
-          @keep_alive = false
-        end
-      else
-        @header['connection'] = "close"
-      end
-
-      # Location is a single absoluteURI.
-      if location = @header['location']
-        if @request_uri
-          @header['location'] = @request_uri.merge(location).to_s
-        end
-      end
-    end
-
-    def make_body_tempfile # :nodoc:
-      return if @bodytempfile
-      bodytempfile = Tempfile.create("webrick")
-      if @body.nil?
-        # nothing
-      elsif @body.respond_to? :readpartial
-        IO.copy_stream(@body, bodytempfile)
-        @body.close
-      elsif @body.respond_to? :call
-        @body.call(bodytempfile)
-      else
-        bodytempfile.write @body
-      end
-      bodytempfile.rewind
-      @body = @bodytempfile = bodytempfile
-      @header['content-length'] = bodytempfile.stat.size.to_s
-    end
-
-    def remove_body_tempfile # :nodoc:
-      if @bodytempfile
-        @bodytempfile.close
-        File.unlink @bodytempfile.path
-        @bodytempfile = nil
-      end
-    end
-
-
-    ##
-    # Sends the headers on +socket+
-
-    def send_header(socket) # :nodoc:
-      if @http_version.major > 0
-        data = status_line()
-        @header.each{|key, value|
-          tmp = key.gsub(/\bwww|^te$|\b\w/){ $&.upcase }
-          data << "#{tmp}: #{check_header(value)}" << CRLF
-        }
-        @cookies.each{|cookie|
-          data << "Set-Cookie: " << check_header(cookie.to_s) << CRLF
-        }
-        data << CRLF
-        socket.write(data)
-      end
-    rescue InvalidHeader => e
-      @header.clear
-      @cookies.clear
-      set_error e
-      retry
-    end
-
-    ##
-    # Sends the body on +socket+
-
-    def send_body(socket) # :nodoc:
-      if @body.respond_to? :readpartial then
-        send_body_io(socket)
-      elsif @body.respond_to?(:call) then
-        send_body_proc(socket)
-      else
-        send_body_string(socket)
-      end
-    end
-
-    ##
-    # Redirects to +url+ with a WEBrick::HTTPStatus::Redirect +status+.
-    #
-    # Example:
-    #
-    #   res.set_redirect WEBrick::HTTPStatus::TemporaryRedirect
-
-    def set_redirect(status, url)
-      url = URI(url).to_s
-      @body = "<HTML><A HREF=\"#{url}\">#{url}</A>.</HTML>\n"
-      @header['location'] = url
-      raise status
-    end
-
-    ##
-    # Creates an error page for exception +ex+ with an optional +backtrace+
-
-    def set_error(ex, backtrace=false)
-      case ex
-      when HTTPStatus::Status
-        @keep_alive = false if HTTPStatus::error?(ex.code)
-        self.status = ex.code
-      else
-        @keep_alive = false
-        self.status = HTTPStatus::RC_INTERNAL_SERVER_ERROR
-      end
-      @header['content-type'] = "text/html; charset=ISO-8859-1"
-
-      if respond_to?(:create_error_page)
-        create_error_page()
-        return
-      end
-
-      if @request_uri
-        host, port = @request_uri.host, @request_uri.port
-      else
-        host, port = @config[:ServerName], @config[:Port]
-      end
-
-      error_body(backtrace, ex, host, port)
-    end
-
-    private
-
-    def check_header(header_value)
-      header_value = header_value.to_s
-      if /[\r\n]/ =~ header_value
-        raise InvalidHeader
-      else
-        header_value
-      end
-    end
-
-    # :stopdoc:
-
-    def error_body(backtrace, ex, host, port)
-      @body = ''
-      @body << <<-_end_of_html_
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<HTML>
-  <HEAD><TITLE>#{HTMLUtils::escape(@reason_phrase)}</TITLE></HEAD>
-  <BODY>
-    <H1>#{HTMLUtils::escape(@reason_phrase)}</H1>
-    #{HTMLUtils::escape(ex.message)}
-    <HR>
-      _end_of_html_
-
-      if backtrace && $DEBUG
-        @body << "backtrace of `#{HTMLUtils::escape(ex.class.to_s)}' "
-        @body << "#{HTMLUtils::escape(ex.message)}"
-        @body << "<PRE>"
-        ex.backtrace.each{|line| @body << "\t#{line}\n"}
-        @body << "</PRE><HR>"
-      end
-
-      @body << <<-_end_of_html_
-    <ADDRESS>
-     #{HTMLUtils::escape(@config[:ServerSoftware])} at
-     #{host}:#{port}
-    </ADDRESS>
-  </BODY>
-</HTML>
-      _end_of_html_
-    end
-
-    def send_body_io(socket)
-      begin
-        if @request_method == "HEAD"
-          # do nothing
-        elsif chunked?
-          buf  = ''
-          begin
-            @body.readpartial(@buffer_size, buf)
-            size = buf.bytesize
-            data = "#{size.to_s(16)}#{CRLF}#{buf}#{CRLF}"
-            socket.write(data)
-            data.clear
-            @sent_size += size
-          rescue EOFError
-            break
-          end while true
-          buf.clear
-          socket.write("0#{CRLF}#{CRLF}")
-        else
-          if %r{\Abytes (\d+)-(\d+)/\d+\z} =~ @header['content-range']
-            offset = $1.to_i
-            size = $2.to_i - offset + 1
-          else
-            offset = nil
-            size = @header['content-length']
-            size = size.to_i if size
-          end
-          begin
-            @sent_size = IO.copy_stream(@body, socket, size, offset)
-          rescue NotImplementedError
-            @body.seek(offset, IO::SEEK_SET)
-            @sent_size = IO.copy_stream(@body, socket, size)
-          end
-        end
-      ensure
-        @body.close
-      end
-      remove_body_tempfile
-    end
-
-    def send_body_string(socket)
-      if @request_method == "HEAD"
-        # do nothing
-      elsif chunked?
-        body ? @body.bytesize : 0
-        while buf = @body[@sent_size, @buffer_size]
-          break if buf.empty?
-          size = buf.bytesize
-          data = "#{size.to_s(16)}#{CRLF}#{buf}#{CRLF}"
-          buf.clear
-          socket.write(data)
-          @sent_size += size
-        end
-        socket.write("0#{CRLF}#{CRLF}")
-      else
-        if @body && @body.bytesize > 0
-          socket.write(@body)
-          @sent_size = @body.bytesize
-        end
-      end
-    end
-
-    def send_body_proc(socket)
-      if @request_method == "HEAD"
-        # do nothing
-      elsif chunked?
-        @body.call(ChunkedWrapper.new(socket, self))
-        socket.write("0#{CRLF}#{CRLF}")
-      else
-        size = @header['content-length'].to_i
-        if @bodytempfile
-          @bodytempfile.rewind
-          IO.copy_stream(@bodytempfile, socket)
-        else
-          @body.call(socket)
-        end
-        @sent_size = size
-      end
-    end
-
-    class ChunkedWrapper
-      def initialize(socket, resp)
-        @socket = socket
-        @resp = resp
-      end
-
-      def write(buf)
-        return 0 if buf.empty?
-        socket = @socket
-        @resp.instance_eval {
-          size = buf.bytesize
-          data = "#{size.to_s(16)}#{CRLF}#{buf}#{CRLF}"
-          socket.write(data)
-          data.clear
-          @sent_size += size
-          size
-        }
-      end
-
-      def <<(*buf)
-        write(buf)
-        self
-      end
-    end
-
-    # preserved for compatibility with some 3rd-party handlers
-    def _write_data(socket, data)
-      socket << data
-    end
-
-    # :startdoc:
-  end
-
-end
diff --git a/tool/lib/webrick/https.rb b/tool/lib/webrick/https.rb
deleted file mode 100644
index b0a49bc40bae05..00000000000000
--- a/tool/lib/webrick/https.rb
+++ /dev/null
@@ -1,152 +0,0 @@
-# frozen_string_literal: false
-#
-# https.rb -- SSL/TLS enhancement for HTTPServer
-#
-# Author: IPR -- Internet Programming with Ruby -- writers
-# Copyright (c) 2001 GOTOU Yuuzou
-# Copyright (c) 2002 Internet Programming with Ruby writers. All rights
-# reserved.
-#
-# $IPR: https.rb,v 1.15 2003/07/22 19:20:42 gotoyuzo Exp $
-
-require_relative 'ssl'
-require_relative 'httpserver'
-
-module WEBrick
-  module Config
-    HTTP.update(SSL)
-  end
-
-  ##
-  #--
-  # Adds SSL functionality to WEBrick::HTTPRequest
-
-  class HTTPRequest
-
-    ##
-    # HTTP request SSL cipher
-
-    attr_reader :cipher
-
-    ##
-    # HTTP request server certificate
-
-    attr_reader :server_cert
-
-    ##
-    # HTTP request client certificate
-
-    attr_reader :client_cert
-
-    # :stopdoc:
-
-    alias orig_parse parse
-
-    def parse(socket=nil)
-      if socket.respond_to?(:cert)
-        @server_cert = socket.cert || @config[:SSLCertificate]
-        @client_cert = socket.peer_cert
-        @client_cert_chain = socket.peer_cert_chain
-        @cipher      = socket.cipher
-      end
-      orig_parse(socket)
-    end
-
-    alias orig_parse_uri parse_uri
-
-    def parse_uri(str, scheme="https")
-      if server_cert
-        return orig_parse_uri(str, scheme)
-      end
-      return orig_parse_uri(str)
-    end
-    private :parse_uri
-
-    alias orig_meta_vars meta_vars
-
-    def meta_vars
-      meta = orig_meta_vars
-      if server_cert
-        meta["HTTPS"] = "on"
-        meta["SSL_SERVER_CERT"] = @server_cert.to_pem
-        meta["SSL_CLIENT_CERT"] = @client_cert ? @client_cert.to_pem : ""
-        if @client_cert_chain
-          @client_cert_chain.each_with_index{|cert, i|
-            meta["SSL_CLIENT_CERT_CHAIN_#{i}"] = cert.to_pem
-          }
-        end
-        meta["SSL_CIPHER"] = @cipher[0]
-        meta["SSL_PROTOCOL"] = @cipher[1]
-        meta["SSL_CIPHER_USEKEYSIZE"] = @cipher[2].to_s
-        meta["SSL_CIPHER_ALGKEYSIZE"] = @cipher[3].to_s
-      end
-      meta
-    end
-
-    # :startdoc:
-  end
-
-  ##
-  #--
-  # Fake WEBrick::HTTPRequest for lookup_server
-
-  class SNIRequest
-
-    ##
-    # The SNI hostname
-
-    attr_reader :host
-
-    ##
-    # The socket address of the server
-
-    attr_reader :addr
-
-    ##
-    # The port this request is for
-
-    attr_reader :port
-
-    ##
-    # Creates a new SNIRequest.
-
-    def initialize(sslsocket, hostname)
-      @host = hostname
-      @addr = sslsocket.addr
-      @port = @addr[1]
-    end
-  end
-
-
-  ##
-  #--
-  # Adds SSL functionality to WEBrick::HTTPServer
-
-  class HTTPServer < ::WEBrick::GenericServer
-    ##
-    # ServerNameIndication callback
-
-    def ssl_servername_callback(sslsocket, hostname = nil)
-      req = SNIRequest.new(sslsocket, hostname)
-      server = lookup_server(req)
-      server ? server.ssl_context : nil
-    end
-
-    # :stopdoc:
-
-    ##
-    # Check whether +server+ is also SSL server.
-    # Also +server+'s SSL context will be created.
-
-    alias orig_virtual_host virtual_host
-
-    def virtual_host(server)
-      if @config[:SSLEnable] && !server.ssl_context
-        raise ArgumentError, "virtual host must set SSLEnable to true"
-      end
-      orig_virtual_host(server)
-    end
-
-    # :startdoc:
-  end
-end
diff --git a/tool/lib/webrick/httpserver.rb b/tool/lib/webrick/httpserver.rb
deleted file mode 100644
index f3f948da3bf9ba..00000000000000
--- a/tool/lib/webrick/httpserver.rb
+++ /dev/null
@@ -1,293 +0,0 @@
-# frozen_string_literal: false
-#
-# httpserver.rb -- HTTPServer Class
-#
-# Author: IPR -- Internet Programming with Ruby -- writers
-# Copyright (c) 2000, 2001 TAKAHASHI Masayoshi, GOTOU Yuuzou
-# Copyright (c) 2002 Internet Programming with Ruby writers. All rights
-# reserved.
-#
-# $IPR: httpserver.rb,v 1.63 2002/10/01 17:16:32 gotoyuzo Exp $
-
-require_relative 'server'
-require_relative 'httputils'
-require_relative 'httpstatus'
-require_relative 'httprequest'
-require_relative 'httpresponse'
-require_relative 'httpservlet'
-require_relative 'accesslog'
-
-module WEBrick
-  class HTTPServerError < ServerError; end
-
-  ##
-  # An HTTP Server
-
-  class HTTPServer < ::WEBrick::GenericServer
-    ##
-    # Creates a new HTTP server according to +config+
-    #
-    # An HTTP server uses the following attributes:
-    #
-    # :AccessLog:: An array of access logs.  See WEBrick::AccessLog
-    # :BindAddress:: Local address for the server to bind to
-    # :DocumentRoot:: Root path to serve files from
-    # :DocumentRootOptions:: Options for the default HTTPServlet::FileHandler
-    # :HTTPVersion:: The HTTP version of this server
-    # :Port:: Port to listen on
-    # :RequestCallback:: Called with a request and response before each
-    #                    request is serviced.
-    # :RequestTimeout:: Maximum time to wait between requests
-    # :ServerAlias:: Array of alternate names for this server for virtual
-    #                hosting
-    # :ServerName:: Name for this server for virtual hosting
-
-    def initialize(config={}, default=Config::HTTP)
-      super(config, default)
-      @http_version = HTTPVersion::convert(@config[:HTTPVersion])
-
-      @mount_tab = MountTable.new
-      if @config[:DocumentRoot]
-        mount("/", HTTPServlet::FileHandler, @config[:DocumentRoot],
-              @config[:DocumentRootOptions])
-      end
-
-      unless @config[:AccessLog]
-        @config[:AccessLog] = [
-          [ $stderr, AccessLog::COMMON_LOG_FORMAT ],
-          [ $stderr, AccessLog::REFERER_LOG_FORMAT ]
-        ]
-      end
-
-      @virtual_hosts = Array.new
-    end
-
-    ##
-    # Processes requests on +sock+
-
-    def run(sock)
-      while true
-        req = create_request(@config)
-        res = create_response(@config)
-        server = self
-        begin
-          timeout = @config[:RequestTimeout]
-          while timeout > 0
-            break if sock.to_io.wait_readable(0.5)
-            break if @status != :Running
-            timeout -= 0.5
-          end
-          raise HTTPStatus::EOFError if timeout <= 0 || @status != :Running
-          raise HTTPStatus::EOFError if sock.eof?
-          req.parse(sock)
-          res.request_method = req.request_method
-          res.request_uri = req.request_uri
-          res.request_http_version = req.http_version
-          res.keep_alive = req.keep_alive?
-          server = lookup_server(req) || self
-          if callback = server[:RequestCallback]
-            callback.call(req, res)
-          elsif callback = server[:RequestHandler]
-            msg = ":RequestHandler is deprecated, please use :RequestCallback"
-            @logger.warn(msg)
-            callback.call(req, res)
-          end
-          server.service(req, res)
-        rescue HTTPStatus::EOFError, HTTPStatus::RequestTimeout => ex
-          res.set_error(ex)
-        rescue HTTPStatus::Error => ex
-          @logger.error(ex.message)
-          res.set_error(ex)
-        rescue HTTPStatus::Status => ex
-          res.status = ex.code
-        rescue StandardError => ex
-          @logger.error(ex)
-          res.set_error(ex, true)
-        ensure
-          if req.request_line
-            if req.keep_alive? && res.keep_alive?
-              req.fixup()
-            end
-            res.send_response(sock)
-            server.access_log(@config, req, res)
-          end
-        end
-        break if @http_version < "1.1"
-        break unless req.keep_alive?
-        break unless res.keep_alive?
-      end
-    end
-
-    ##
-    # Services +req+ and fills in +res+
-
-    def service(req, res)
-      if req.unparsed_uri == "*"
-        if req.request_method == "OPTIONS"
-          do_OPTIONS(req, res)
-          raise HTTPStatus::OK
-        end
-        raise HTTPStatus::NotFound, "`#{req.unparsed_uri}' not found."
-      end
-
-      servlet, options, script_name, path_info = search_servlet(req.path)
-      raise HTTPStatus::NotFound, "`#{req.path}' not found." unless servlet
-      req.script_name = script_name
-      req.path_info = path_info
-      si = servlet.get_instance(self, *options)
-      @logger.debug(format("%s is invoked.", si.class.name))
-      si.service(req, res)
-    end
-
-    ##
-    # The default OPTIONS request handler says GET, HEAD, POST and OPTIONS
-    # requests are allowed.
-
-    def do_OPTIONS(req, res)
-      res["allow"] = "GET,HEAD,POST,OPTIONS"
-    end
-
-    ##
-    # Mounts +servlet+ on +dir+ passing +options+ to the servlet at creation
-    # time
-
-    def mount(dir, servlet, *options)
-      @logger.debug(sprintf("%s is mounted on %s.", servlet.inspect, dir))
-      @mount_tab[dir] = [ servlet, options ]
-    end
-
-    ##
-    # Mounts +proc+ or +block+ on +dir+ and calls it with a
-    # WEBrick::HTTPRequest and WEBrick::HTTPResponse
-
-    def mount_proc(dir, proc=nil, &block)
-      proc ||= block
-      raise HTTPServerError, "must pass a proc or block" unless proc
-      mount(dir, HTTPServlet::ProcHandler.new(proc))
-    end
-
-    ##
-    # Unmounts +dir+
-
-    def unmount(dir)
-      @logger.debug(sprintf("unmount %s.", dir))
-      @mount_tab.delete(dir)
-    end
-    alias umount unmount
-
-    ##
-    # Finds a servlet for +path+
-
-    def search_servlet(path)
-      script_name, path_info = @mount_tab.scan(path)
-      servlet, options = @mount_tab[script_name]
-      if servlet
-        [ servlet, options, script_name, path_info ]
-      end
-    end
-
-    ##
-    # Adds +server+ as a virtual host.
-
-    def virtual_host(server)
-      @virtual_hosts << server
-      @virtual_hosts = @virtual_hosts.sort_by{|s|
-        num = 0
-        num -= 4 if s[:BindAddress]
-        num -= 2 if s[:Port]
-        num -= 1 if s[:ServerName]
-        num
-      }
-    end
-
-    ##
-    # Finds the appropriate virtual host to handle +req+
-
-    def lookup_server(req)
-      @virtual_hosts.find{|s|
-        (s[:BindAddress].nil? || req.addr[3] == s[:BindAddress]) &&
-        (s[:Port].nil?        || req.port == s[:Port])           &&
-        ((s[:ServerName].nil?  || req.host == s[:ServerName]) ||
-         (!s[:ServerAlias].nil? && s[:ServerAlias].find{|h| h === req.host}))
-      }
-    end
-
-    ##
-    # Logs +req+ and +res+ in the access logs.  +config+ is used for the
-    # server name.
-
-    def access_log(config, req, res)
-      param = AccessLog::setup_params(config, req, res)
-      @config[:AccessLog].each{|logger, fmt|
-        logger << AccessLog::format(fmt+"\n", param)
-      }
-    end
-
-    ##
-    # Creates the HTTPRequest used when handling the HTTP
-    # request. Can be overridden by subclasses.
-    def create_request(with_webrick_config)
-      HTTPRequest.new(with_webrick_config)
-    end
-
-    ##
-    # Creates the HTTPResponse used when handling the HTTP
-    # request. Can be overridden by subclasses.
-    def create_response(with_webrick_config)
-      HTTPResponse.new(with_webrick_config)
-    end
-
-    ##
-    # Mount table for the path a servlet is mounted on in the directory space
-    # of the server.  Users of WEBrick can only access this indirectly via
-    # WEBrick::HTTPServer#mount, WEBrick::HTTPServer#unmount and
-    # WEBrick::HTTPServer#search_servlet
-
-    class MountTable # :nodoc:
-      def initialize
-        @tab = Hash.new
-        compile
-      end
-
-      def [](dir)
-        dir = normalize(dir)
-        @tab[dir]
-      end
-
-      def []=(dir, val)
-        dir = normalize(dir)
-        @tab[dir] = val
-        compile
-        val
-      end
-
-      def delete(dir)
-        dir = normalize(dir)
-        res = @tab.delete(dir)
-        compile
-        res
-      end
-
-      def scan(path)
-        @scanner =~ path
-        [ $&, $' ]
-      end
-
-      private
-
-      def compile
-        k = @tab.keys
-        k.sort!
-        k.reverse!
-        k.collect!{|path| Regexp.escape(path) }
-        @scanner = Regexp.new("\\A(" + k.join("|") +")(?=/|\\z)")
-      end
-
-      def normalize(dir)
-        ret = dir ? dir.dup : ""
-        ret.sub!(%r|/+\z|, "")
-        ret
-      end
-    end
-  end
-end
diff --git a/tool/lib/webrick/httpservlet.rb b/tool/lib/webrick/httpservlet.rb
deleted file mode 100644
index da49a1405b3af9..00000000000000
--- a/tool/lib/webrick/httpservlet.rb
+++ /dev/null
@@ -1,23 +0,0 @@
-# frozen_string_literal: false
-#
-# httpservlet.rb -- HTTPServlet Utility File
-#
-# Author: IPR -- Internet Programming with Ruby -- writers
-# Copyright (c) 2000, 2001 TAKAHASHI Masayoshi, GOTOU Yuuzou
-# Copyright (c) 2002 Internet Programming with Ruby writers. All rights
-# reserved.
-#
-# $IPR: httpservlet.rb,v 1.21 2003/02/23 12:24:46 gotoyuzo Exp $
-
-require_relative 'httpservlet/abstract'
-require_relative 'httpservlet/filehandler'
-require_relative 'httpservlet/cgihandler'
-require_relative 'httpservlet/erbhandler'
-require_relative 'httpservlet/prochandler'
-
-module WEBrick
-  module HTTPServlet
-    FileHandler.add_handler("cgi", CGIHandler)
-    FileHandler.add_handler("rhtml", ERBHandler)
-  end
-end
diff --git a/tool/lib/webrick/httpservlet/abstract.rb b/tool/lib/webrick/httpservlet/abstract.rb
deleted file mode 100644
index bccb091861d7fa..00000000000000
--- a/tool/lib/webrick/httpservlet/abstract.rb
+++ /dev/null
@@ -1,152 +0,0 @@
-# frozen_string_literal: false
-#
-# httpservlet.rb -- HTTPServlet Module
-#
-# Author: IPR -- Internet Programming with Ruby -- writers
-# Copyright (c) 2000 TAKAHASHI Masayoshi, GOTOU Yuuzou
-# Copyright (c) 2002 Internet Programming with Ruby writers. All rights
-# reserved.
-#
-# $IPR: abstract.rb,v 1.24 2003/07/11 11:16:46 gotoyuzo Exp $
-
-require_relative '../htmlutils'
-require_relative '../httputils'
-require_relative '../httpstatus'
-
-module WEBrick
-  module HTTPServlet
-    class HTTPServletError < StandardError; end
-
-    ##
-    # AbstractServlet allows HTTP server modules to be reused across multiple
-    # servers and allows encapsulation of functionality.
-    #
-    # By default a servlet will respond to GET, HEAD (through an alias to GET)
-    # and OPTIONS requests.
-    #
-    # By default a new servlet is initialized for every request.  A servlet
-    # instance can be reused by overriding ::get_instance in the
-    # AbstractServlet subclass.
-    #
-    # == A Simple Servlet
-    #
-    #  class Simple < WEBrick::HTTPServlet::AbstractServlet
-    #    def do_GET request, response
-    #      status, content_type, body = do_stuff_with request
-    #
-    #      response.status = status
-    #      response['Content-Type'] = content_type
-    #      response.body = body
-    #    end
-    #
-    #    def do_stuff_with request
-    #      return 200, 'text/plain', 'you got a page'
-    #    end
-    #  end
-    #
-    # This servlet can be mounted on a server at a given path:
-    #
-    #   server.mount '/simple', Simple
-    #
-    # == Servlet Configuration
-    #
-    # Servlets can be configured via initialize.  The first argument is the
-    # HTTP server the servlet is being initialized for.
-    #
-    #  class Configurable < Simple
-    #    def initialize server, color, size
-    #      super server
-    #      @color = color
-    #      @size = size
-    #    end
-    #
-    #    def do_stuff_with request
-    #      content = "<p " \
-    #                %q{style="color: #{@color}; font-size: #{@size}"} \
-    #                ">Hello, World!"
-    #
-    #      return 200, "text/html", content
-    #    end
-    #  end
-    #
-    # This servlet must be provided two arguments at mount time:
-    #
-    #   server.mount '/configurable', Configurable, 'red', '2em'
-
-    class AbstractServlet
-
-      ##
-      # Factory for servlet instances that will handle a request from +server+
-      # using +options+ from the mount point.  By default a new servlet
-      # instance is created for every call.
-
-      def self.get_instance(server, *options)
-        self.new(server, *options)
-      end
-
-      ##
-      # Initializes a new servlet for +server+ using +options+ which are
-      # stored as-is in +@options+.  +@logger+ is also provided.
-
-      def initialize(server, *options)
-        @server = @config = server
-        @logger = @server[:Logger]
-        @options = options
-      end
-
-      ##
-      # Dispatches to a +do_+ method based on +req+ if such a method is
-      # available.  (+do_GET+ for a GET request).  Raises a MethodNotAllowed
-      # exception if the method is not implemented.
-
-      def service(req, res)
-        method_name = "do_" + req.request_method.gsub(/-/, "_")
-        if respond_to?(method_name)
-          __send__(method_name, req, res)
-        else
-          raise HTTPStatus::MethodNotAllowed,
-                "unsupported method `#{req.request_method}'."
-        end
-      end
-
-      ##
-      # Raises a NotFound exception
-
-      def do_GET(req, res)
-        raise HTTPStatus::NotFound, "not found."
-      end
-
-      ##
-      # Dispatches to do_GET
-
-      def do_HEAD(req, res)
-        do_GET(req, res)
-      end
-
-      ##
-      # Returns the allowed HTTP request methods
-
-      def do_OPTIONS(req, res)
-        m = self.methods.grep(/\Ado_([A-Z]+)\z/) {$1}
-        m.sort!
-        res["allow"] = m.join(",")
-      end
-
-      private
-
-      ##
-      # Redirects to a path ending in /
-
-      def redirect_to_directory_uri(req, res)
-        if req.path[-1] != ?/
-          location = WEBrick::HTTPUtils.escape_path(req.path + "/")
-          if req.query_string && req.query_string.bytesize > 0
-            location << "?" << req.query_string
-          end
-          res.set_redirect(HTTPStatus::MovedPermanently, location)
-        end
-      end
-    end
-
-  end
-end
diff --git a/tool/lib/webrick/httpservlet/cgi_runner.rb b/tool/lib/webrick/httpservlet/cgi_runner.rb
deleted file mode 100644
index 0398c16749c0c1..00000000000000
--- a/tool/lib/webrick/httpservlet/cgi_runner.rb
+++ /dev/null
@@ -1,47 +0,0 @@
-# frozen_string_literal: false
-#
-# cgi_runner.rb -- CGI launcher.
-#
-# Author: IPR -- Internet Programming with Ruby -- writers
-# Copyright (c) 2000 TAKAHASHI Masayoshi, GOTOU YUUZOU
-# Copyright (c) 2002 Internet Programming with Ruby writers. All rights
-# reserved.
-#
-# $IPR: cgi_runner.rb,v 1.9 2002/09/25 11:33:15 gotoyuzo Exp $
-
-def sysread(io, size)
-  buf = ""
-  while size > 0
-    tmp = io.sysread(size)
-    buf << tmp
-    size -= tmp.bytesize
-  end
-  return buf
-end
-
-STDIN.binmode
-
-len = sysread(STDIN, 8).to_i
-out = sysread(STDIN, len)
-STDOUT.reopen(File.open(out, "w"))
-
-len = sysread(STDIN, 8).to_i
-err = sysread(STDIN, len)
-STDERR.reopen(File.open(err, "w"))
-
-len  = sysread(STDIN, 8).to_i
-dump = sysread(STDIN, len)
-hash = Marshal.restore(dump)
-ENV.keys.each{|name| ENV.delete(name) }
-hash.each{|k, v| ENV[k] = v if v }
-
-dir = File::dirname(ENV["SCRIPT_FILENAME"])
-Dir::chdir dir
-
-if ARGV[0]
-  argv = ARGV.dup
-  argv << ENV["SCRIPT_FILENAME"]
-  exec(*argv)
-  # NOTREACHED
-end
-exec ENV["SCRIPT_FILENAME"]
diff --git a/tool/lib/webrick/httpservlet/cgihandler.rb b/tool/lib/webrick/httpservlet/cgihandler.rb
deleted file mode 100644
index 4457770b7a006d..00000000000000
--- a/tool/lib/webrick/httpservlet/cgihandler.rb
+++ /dev/null
@@ -1,126 +0,0 @@
-# frozen_string_literal: false
-#
-# cgihandler.rb -- CGIHandler Class
-#
-# Author: IPR -- Internet Programming with Ruby -- writers
-# Copyright (c) 2001 TAKAHASHI Masayoshi, GOTOU Yuuzou
-# Copyright (c) 2002 Internet Programming with Ruby writers. All rights
-# reserved.
-#
-# $IPR: cgihandler.rb,v 1.27 2003/03/21 19:56:01 gotoyuzo Exp $
-
-require 'rbconfig'
-require 'tempfile'
-require_relative '../config'
-require_relative 'abstract'
-
-module WEBrick
-  module HTTPServlet
-
-    ##
-    # Servlet for handling CGI scripts
-    #
-    # Example:
-    #
-    #  server.mount('/cgi/my_script', WEBrick::HTTPServlet::CGIHandler,
-    #               '/path/to/my_script')
-
-    class CGIHandler < AbstractServlet
-      Ruby = RbConfig.ruby # :nodoc:
-      CGIRunner = "\"#{Ruby}\" \"#{WEBrick::Config::LIBDIR}/httpservlet/cgi_runner.rb\"" # :nodoc:
-      CGIRunnerArray = [Ruby, "#{WEBrick::Config::LIBDIR}/httpservlet/cgi_runner.rb".freeze].freeze # :nodoc:
-
-      ##
-      # Creates a new CGI script servlet for the script at +name+
-
-      def initialize(server, name)
-        super(server, name)
-        @script_filename = name
-        @tempdir = server[:TempDir]
-        interpreter = server[:CGIInterpreter]
-        if interpreter.is_a?(Array)
-          @cgicmd = CGIRunnerArray + interpreter
-        else
-          @cgicmd = "#{CGIRunner} #{interpreter}"
-        end
-      end
-
-      # :stopdoc:
-
-      def do_GET(req, res)
-        cgi_in = IO::popen(@cgicmd, "wb")
-        cgi_out = Tempfile.new("webrick.cgiout.", @tempdir, mode: IO::BINARY)
-        cgi_out.set_encoding("ASCII-8BIT")
-        cgi_err = Tempfile.new("webrick.cgierr.", @tempdir, mode: IO::BINARY)
-        cgi_err.set_encoding("ASCII-8BIT")
-        begin
-          cgi_in.sync = true
-          meta = req.meta_vars
-          meta["SCRIPT_FILENAME"] = @script_filename
-          meta["PATH"] = @config[:CGIPathEnv]
-          meta.delete("HTTP_PROXY")
-          if /mswin|bccwin|mingw/ =~ RUBY_PLATFORM
-            meta["SystemRoot"] = ENV["SystemRoot"]
-          end
-          dump = Marshal.dump(meta)
-
-          cgi_in.write("%8d" % cgi_out.path.bytesize)
-          cgi_in.write(cgi_out.path)
-          cgi_in.write("%8d" % cgi_err.path.bytesize)
-          cgi_in.write(cgi_err.path)
-          cgi_in.write("%8d" % dump.bytesize)
-          cgi_in.write(dump)
-
-          req.body { |chunk| cgi_in.write(chunk) }
-        ensure
-          cgi_in.close
-          status = $?.exitstatus
-          sleep 0.1 if /mswin|bccwin|mingw/ =~ RUBY_PLATFORM
-          data = cgi_out.read
-          cgi_out.close(true)
-          if errmsg = cgi_err.read
-            if errmsg.bytesize > 0
-              @logger.error("CGIHandler: #{@script_filename}:\n" + errmsg)
-            end
-          end
-          cgi_err.close(true)
-        end
-
-        if status != 0
-          @logger.error("CGIHandler: #{@script_filename} exit with #{status}")
-        end
-
-        data = "" unless data
-        raw_header, body = data.split(/^[\xd\xa]+/, 2)
-        raise HTTPStatus::InternalServerError,
-          "Premature end of script headers: #{@script_filename}" if body.nil?
-
-        begin
-          header = HTTPUtils::parse_header(raw_header)
-          if /^(\d+)/ =~ header['status'][0]
-            res.status = $1.to_i
-            header.delete('status')
-          end
-          if header.has_key?('location')
-            # RFC 3875 6.2.3, 6.2.4
-            res.status = 302 unless (300...400) === res.status
-          end
-          if header.has_key?('set-cookie')
-            header['set-cookie'].each{|k|
-              res.cookies << Cookie.parse_set_cookie(k)
-            }
-            header.delete('set-cookie')
-          end
-          header.each{|key, val| res[key] = val.join(", ") }
-        rescue => ex
-          raise HTTPStatus::InternalServerError, ex.message
-        end
-        res.body = body
-      end
-      alias do_POST do_GET
-
-      # :startdoc:
-    end
-
-  end
-end
diff --git a/tool/lib/webrick/httpservlet/erbhandler.rb b/tool/lib/webrick/httpservlet/erbhandler.rb
deleted file mode 100644
index cd09e5f2161540..00000000000000
--- a/tool/lib/webrick/httpservlet/erbhandler.rb
+++ /dev/null
@@ -1,88 +0,0 @@
-# frozen_string_literal: false
-#
-# erbhandler.rb -- ERBHandler Class
-#
-# Author: IPR -- Internet Programming with Ruby -- writers
-# Copyright (c) 2001 TAKAHASHI Masayoshi, GOTOU Yuuzou
-# Copyright (c) 2002 Internet Programming with Ruby writers. All rights
-# reserved.
-#
-# $IPR: erbhandler.rb,v 1.25 2003/02/24 19:25:31 gotoyuzo Exp $
-
-require_relative 'abstract'
-
-require 'erb'
-
-module WEBrick
-  module HTTPServlet
-
-    ##
-    # ERBHandler evaluates an ERB file and returns the result.  This handler
-    # is automatically used if there are .rhtml files in a directory served by
-    # the FileHandler.
-    #
-    # ERBHandler supports GET and POST methods.
-    #
-    # The ERB file is evaluated with the local variables +servlet_request+ and
-    # +servlet_response+ which are a WEBrick::HTTPRequest and
-    # WEBrick::HTTPResponse respectively.
-    #
-    # Example .rhtml file:
-    #
-    #   Request to <%= servlet_request.request_uri %>
-    #
-    #   Query params <%= servlet_request.query.inspect %>
-
-    class ERBHandler < AbstractServlet
-
-      ##
-      # Creates a new ERBHandler on +server+ that will evaluate and serve the
-      # ERB file +name+
-
-      def initialize(server, name)
-        super(server, name)
-        @script_filename = name
-      end
-
-      ##
-      # Handles GET requests
-
-      def do_GET(req, res)
-        unless defined?(ERB)
-          @logger.warn "#{self.class}: ERB not defined."
-          raise HTTPStatus::Forbidden, "ERBHandler cannot work."
-        end
-        begin
-          data = File.open(@script_filename, &:read)
-          res.body = evaluate(ERB.new(data), req, res)
-          res['content-type'] ||=
-            HTTPUtils::mime_type(@script_filename, @config[:MimeTypes])
-        rescue StandardError
-          raise
-        rescue Exception => ex
-          @logger.error(ex)
-          raise HTTPStatus::InternalServerError, ex.message
-        end
-      end
-
-      ##
-      # Handles POST requests
-
-      alias do_POST do_GET
-
-      private
-
-      ##
-      # Evaluates +erb+ providing +servlet_request+ and +servlet_response+ as
-      # local variables.
-
-      def evaluate(erb, servlet_request, servlet_response)
-        Module.new.module_eval{
-          servlet_request.meta_vars
-          servlet_request.query
-          erb.result(binding)
-        }
-      end
-    end
-  end
-end
diff --git a/tool/lib/webrick/httpservlet/filehandler.rb b/tool/lib/webrick/httpservlet/filehandler.rb
deleted file mode 100644
index 010df0e918d22f..00000000000000
--- a/tool/lib/webrick/httpservlet/filehandler.rb
+++ /dev/null
@@ -1,552 +0,0 @@
-# frozen_string_literal: false
-#
-# filehandler.rb -- FileHandler Module
-#
-# Author: IPR -- Internet Programming with Ruby -- writers
-# Copyright (c) 2001 TAKAHASHI Masayoshi, GOTOU Yuuzou
-# Copyright (c) 2003 Internet Programming with Ruby writers. All rights
-# reserved.
-#
-# $IPR: filehandler.rb,v 1.44 2003/06/07 01:34:51 gotoyuzo Exp $
-
-require 'time'
-
-require_relative '../htmlutils'
-require_relative '../httputils'
-require_relative '../httpstatus'
-
-module WEBrick
-  module HTTPServlet
-
-    ##
-    # Servlet for serving a single file.  You probably want to use the
-    # FileHandler servlet instead as it handles directories and fancy indexes.
-    #
-    # Example:
-    #
-    #   server.mount('/my_page.txt', WEBrick::HTTPServlet::DefaultFileHandler,
-    #                '/path/to/my_page.txt')
-    #
-    # This servlet handles If-Modified-Since and Range requests.
-
-    class DefaultFileHandler < AbstractServlet
-
-      ##
-      # Creates a DefaultFileHandler instance for the file at +local_path+.
-
-      def initialize(server, local_path)
-        super(server, local_path)
-        @local_path = local_path
-      end
-
-      # :stopdoc:
-
-      def do_GET(req, res)
-        st = File::stat(@local_path)
-        mtime = st.mtime
-        res['etag'] = sprintf("%x-%x-%x", st.ino, st.size, st.mtime.to_i)
-
-        if not_modified?(req, res, mtime, res['etag'])
-          res.body = ''
-          raise HTTPStatus::NotModified
-        elsif req['range']
-          make_partial_content(req, res, @local_path, st.size)
-          raise HTTPStatus::PartialContent
-        else
-          mtype = HTTPUtils::mime_type(@local_path, @config[:MimeTypes])
-          res['content-type'] = mtype
-          res['content-length'] = st.size.to_s
-          res['last-modified'] = mtime.httpdate
-          res.body = File.open(@local_path, "rb")
-        end
-      end
-
-      def not_modified?(req, res, mtime, etag)
-        if ir = req['if-range']
-          begin
-            if Time.httpdate(ir) >= mtime
-              return true
-            end
-          rescue
-            if HTTPUtils::split_header_value(ir).member?(res['etag'])
-              return true
-            end
-          end
-        end
-
-        if (ims = req['if-modified-since']) && Time.parse(ims) >= mtime
-          return true
-        end
-
-        if (inm = req['if-none-match']) &&
-           HTTPUtils::split_header_value(inm).member?(res['etag'])
-          return true
-        end
-
-        return false
-      end
-
-      # returns a lambda for webrick/httpresponse.rb send_body_proc
-      def multipart_body(body, parts, boundary, mtype, filesize)
-        lambda do |socket|
-          begin
-            begin
-              first = parts.shift
-              last = parts.shift
-              socket.write(
-                "--#{boundary}#{CRLF}" \
-                "Content-Type: #{mtype}#{CRLF}" \
-                "Content-Range: bytes #{first}-#{last}/#{filesize}#{CRLF}" \
-                "#{CRLF}"
-              )
-
-              begin
-                IO.copy_stream(body, socket, last - first + 1, first)
-              rescue NotImplementedError
-                body.seek(first, IO::SEEK_SET)
-                IO.copy_stream(body, socket, last - first + 1)
-              end
-              socket.write(CRLF)
-            end while parts[0]
-            socket.write("--#{boundary}--#{CRLF}")
-          ensure
-            body.close
-          end
-        end
-      end
-
-      def make_partial_content(req, res, filename, filesize)
-        mtype = HTTPUtils::mime_type(filename, @config[:MimeTypes])
-        unless ranges = HTTPUtils::parse_range_header(req['range'])
-          raise HTTPStatus::BadRequest,
-            "Unrecognized range-spec: \"#{req['range']}\""
-        end
-        File.open(filename, "rb"){|io|
-          if ranges.size > 1
-            time = Time.now
-            boundary = "#{time.sec}_#{time.usec}_#{Process::pid}"
-            parts = []
-            ranges.each {|range|
-              prange = prepare_range(range, filesize)
-              next if prange[0] < 0
-              parts.concat(prange)
-            }
-            raise HTTPStatus::RequestRangeNotSatisfiable if parts.empty?
-            res["content-type"] = "multipart/byteranges; boundary=#{boundary}"
-            if req.http_version < '1.1'
-              res['connection'] = 'close'
-            else
-              res.chunked = true
-            end
-            res.body = multipart_body(io.dup, parts, boundary, mtype, filesize)
-          elsif range = ranges[0]
-            first, last = prepare_range(range, filesize)
-            raise HTTPStatus::RequestRangeNotSatisfiable if first < 0
-            res['content-type'] = mtype
-            res['content-range'] = "bytes #{first}-#{last}/#{filesize}"
-            res['content-length'] = (last - first + 1).to_s
-            res.body = io.dup
-          else
-            raise HTTPStatus::BadRequest
-          end
-        }
-      end
-
-      def prepare_range(range, filesize)
-        first = range.first < 0 ? filesize + range.first : range.first
-        return -1, -1 if first < 0 || first >= filesize
-        last = range.last < 0 ? filesize + range.last : range.last
-        last = filesize - 1 if last >= filesize
-        return first, last
-      end
-
-      # :startdoc:
-    end
-
-    ##
-    # Serves a directory including fancy indexing and a variety of other
-    # options.
-    #
-    # Example:
-    #
-    #   server.mount('/assets', WEBrick::HTTPServlet::FileHandler,
-    #                '/path/to/assets')
-
-    class FileHandler < AbstractServlet
-      HandlerTable = Hash.new # :nodoc:
-
-      ##
-      # Allow custom handling of requests for files with +suffix+ by class
-      # +handler+
-
-      def self.add_handler(suffix, handler)
-        HandlerTable[suffix] = handler
-      end
-
-      ##
-      # Remove custom handling of requests for files with +suffix+
-
-      def self.remove_handler(suffix)
-        HandlerTable.delete(suffix)
-      end
-
-      ##
-      # Creates a FileHandler servlet on +server+ that serves files starting
-      # at directory +root+
-      #
-      # +options+ may be a Hash containing keys from
-      # WEBrick::Config::FileHandler or +true+ or +false+.
-      #
-      # If +options+ is true or false then +:FancyIndexing+ is enabled or
-      # disabled respectively.
-
-      def initialize(server, root, options={}, default=Config::FileHandler)
-        @config = server.config
-        @logger = @config[:Logger]
-        @root = File.expand_path(root)
-        if options == true || options == false
-          options = { :FancyIndexing => options }
-        end
-        @options = default.dup.update(options)
-      end
-
-      # :stopdoc:
-
-      def set_filesystem_encoding(str)
-        enc = Encoding.find('filesystem')
-        if enc == Encoding::US_ASCII
-          str.b
-        else
-          str.dup.force_encoding(enc)
-        end
-      end
-
-      def service(req, res)
-        # if this class is mounted on "/" and /~username is requested.
-        # 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
-            path_info = $'
-            begin
-              passwd = Etc::getpwnam(user)
-              @root = File::join(passwd.dir, @options[:UserDir])
-              req.script_name = script_name
-              req.path_info = path_info
-            rescue
-              @logger.debug "#{self.class}#do_GET: getpwnam(#{user}) failed"
-            end
-          end
-        end
-        prevent_directory_traversal(req, res)
-        super(req, res)
-      end
-
-      def do_GET(req, res)
-        unless exec_handler(req, res)
-          set_dir_list(req, res)
-        end
-      end
-
-      def do_POST(req, res)
-        unless exec_handler(req, res)
-          raise HTTPStatus::NotFound, "`#{req.path}' not found."
-        end
-      end
-
-      def do_OPTIONS(req, res)
-        unless exec_handler(req, res)
-          super(req, res)
-        end
-      end
-
-      # ToDo
-      # RFC2518: HTTP Extensions for Distributed Authoring -- WEBDAV
-      #
-      # PROPFIND PROPPATCH MKCOL DELETE PUT COPY MOVE
-      # LOCK UNLOCK
-
-      # RFC3253: Versioning Extensions to WebDAV
-      #          (Web Distributed Authoring and Versioning)
-      #
-      # VERSION-CONTROL REPORT CHECKOUT CHECK_IN UNCHECKOUT
-      # MKWORKSPACE UPDATE LABEL MERGE ACTIVITY
-
-      private
-
-      def trailing_pathsep?(path)
-        # check for trailing path separator:
-        #   File.dirname("/aaaa/bbbb/")      #=> "/aaaa")
-        #   File.dirname("/aaaa/bbbb/x")     #=> "/aaaa/bbbb")
-        #   File.dirname("/aaaa/bbbb")       #=> "/aaaa")
-        #   File.dirname("/aaaa/bbbbx")      #=> "/aaaa")
-        return File.dirname(path) != File.dirname(path+"x")
-      end
-
-      def prevent_directory_traversal(req, res)
-        # Preventing directory traversal on Windows platforms;
-        # Backslashes (0x5c) in path_info are not interpreted as special
-        # character in URI notation. So the value of path_info should be
-        # normalize before accessing to the filesystem.
-
-        # dirty hack for filesystem encoding; in nature, File.expand_path
-        # should not be used for path normalization.  [Bug #3345]
-        path = req.path_info.dup.force_encoding(Encoding.find("filesystem"))
-        if trailing_pathsep?(req.path_info)
-          # File.expand_path removes the trailing path separator.
-          # Adding a character is a workaround to save it.
-          #  File.expand_path("/aaa/")        #=> "/aaa"
-          #  File.expand_path("/aaa/" + "x")  #=> "/aaa/x"
-          expanded = File.expand_path(path + "x")
-          expanded.chop!  # remove trailing "x"
-        else
-          expanded = File.expand_path(path)
-        end
-        expanded.force_encoding(req.path_info.encoding)
-        req.path_info = expanded
-      end
-
-      def exec_handler(req, res)
-        raise HTTPStatus::NotFound, "`#{req.path}' not found." unless @root
-        if set_filename(req, res)
-          handler = get_handler(req, res)
-          call_callback(:HandlerCallback, req, res)
-          h = handler.get_instance(@config, res.filename)
-          h.service(req, res)
-          return true
-        end
-        call_callback(:HandlerCallback, req, res)
-        return false
-      end
-
-      def get_handler(req, res)
-        suffix1 = (/\.(\w+)\z/ =~ res.filename) && $1.downcase
-        if /\.(\w+)\.([\w\-]+)\z/ =~ res.filename
-          if @options[:AcceptableLanguages].include?($2.downcase)
-            suffix2 = $1.downcase
-          end
-        end
-        handler_table = @options[:HandlerTable]
-        return handler_table[suffix1] || handler_table[suffix2] ||
-               HandlerTable[suffix1] || HandlerTable[suffix2] ||
-               DefaultFileHandler
-      end
-
-      def set_filename(req, res)
-        res.filename = @root
-        path_info = req.path_info.scan(%r|/[^/]*|)
-
-        path_info.unshift("")  # dummy for checking @root dir
-        while base = path_info.first
-          base = set_filesystem_encoding(base)
-          break if base == "/"
-          break unless File.directory?(File.expand_path(res.filename + base))
-          shift_path_info(req, res, path_info)
-          call_callback(:DirectoryCallback, req, res)
-        end
-
-        if base = path_info.first
-          base = set_filesystem_encoding(base)
-          if base == "/"
-            if file = search_index_file(req, res)
-              shift_path_info(req, res, path_info, file)
-              call_callback(:FileCallback, req, res)
-              return true
-            end
-            shift_path_info(req, res, path_info)
-          elsif file = search_file(req, res, base)
-            shift_path_info(req, res, path_info, file)
-            call_callback(:FileCallback, req, res)
-            return true
-          else
-            raise HTTPStatus::NotFound, "`#{req.path}' not found."
-          end
-        end
-
-        return false
-      end
-
-      def check_filename(req, res, name)
-        if nondisclosure_name?(name) || windows_ambiguous_name?(name)
-          @logger.warn("the request refers nondisclosure name `#{name}'.")
-          raise HTTPStatus::NotFound, "`#{req.path}' not found."
-        end
-      end
-
-      def shift_path_info(req, res, path_info, base=nil)
-        tmp = path_info.shift
-        base = base || set_filesystem_encoding(tmp)
-        req.path_info = path_info.join
-        req.script_name << base
-        res.filename = File.expand_path(res.filename + base)
-        check_filename(req, res, File.basename(res.filename))
-      end
-
-      def search_index_file(req, res)
-        @config[:DirectoryIndex].each{|index|
-          if file = search_file(req, res, "/"+index)
-            return file
-          end
-        }
-        return nil
-      end
-
-      def search_file(req, res, basename)
-        langs = @options[:AcceptableLanguages]
-        path = res.filename + basename
-        if File.file?(path)
-          return basename
-        elsif langs.size > 0
-          req.accept_language.each{|lang|
-            path_with_lang = path + ".#{lang}"
-            if langs.member?(lang) && File.file?(path_with_lang)
-              return basename + ".#{lang}"
-            end
-          }
-          (langs - req.accept_language).each{|lang|
-            path_with_lang = path + ".#{lang}"
-            if File.file?(path_with_lang)
-              return basename + ".#{lang}"
-            end
-          }
-        end
-        return nil
-      end
-
-      def call_callback(callback_name, req, res)
-        if cb = @options[callback_name]
-          cb.call(req, res)
-        end
-      end
-
-      def windows_ambiguous_name?(name)
-        return true if /[. ]+\z/ =~ name
-        return true if /::\$DATA\z/ =~ name
-        return false
-      end
-
-      def nondisclosure_name?(name)
-        @options[:NondisclosureName].each{|pattern|
-          if File.fnmatch(pattern, name, File::FNM_CASEFOLD)
-            return true
-          end
-        }
-        return false
-      end
-
-      def set_dir_list(req, res)
-        redirect_to_directory_uri(req, res)
-        unless @options[:FancyIndexing]
-          raise HTTPStatus::Forbidden, "no access permission to `#{req.path}'"
-        end
-        local_path = res.filename
-        list = Dir::entries(local_path).collect{|name|
-          next if name == "." || name == ".."
-          next if nondisclosure_name?(name)
-          next if windows_ambiguous_name?(name)
-          st = (File::stat(File.join(local_path, name)) rescue nil)
-          if st.nil?
-            [ name, nil, -1 ]
-          elsif st.directory?
-            [ name + "/", st.mtime, -1 ]
-          else
-            [ name, st.mtime, st.size ]
-          end
-        }
-        list.compact!
-
-        query = req.query
-
-        d0 = nil
-        idx = nil
-        %w[N M S].each_with_index do |q, i|
-          if d = query.delete(q)
-            idx ||= i
-            d0 ||= d
-          end
-        end
-        d0 ||= "A"
-        idx ||= 0
-        d1 = (d0 == "A") ? "D" : "A"
-
-        if d0 == "A"
-          list.sort!{|a,b| a[idx] <=> b[idx] }
-        else
-          list.sort!{|a,b| b[idx] <=> a[idx] }
-        end
-
-        namewidth = query["NameWidth"]
-        if namewidth == "*"
-          namewidth = nil
-        elsif !namewidth or (namewidth = namewidth.to_i) < 2
-          namewidth = 25
-        end
-        query = query.inject('') {|s, (k, v)| s << '&' << HTMLUtils::escape("#{k}=#{v}")}
-
-        type = "text/html"
-        case enc = Encoding.find('filesystem')
-        when Encoding::US_ASCII, Encoding::ASCII_8BIT
-        else
-          type << "; charset=\"#{enc.name}\""
-        end
-        res['content-type'] = type
-
-        title = "Index of #{HTMLUtils::escape(req.path)}"
-        res.body = <<-_end_of_html_
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<HTML>
-  <HEAD>
-    <TITLE>#{title}</TITLE>
-    <style type="text/css">
-    <!--
-    .name, .mtime { text-align: left; }
-    .size { text-align: right; }
-    td { text-overflow: ellipsis; white-space: nowrap; overflow: hidden; }
-    table { border-collapse: collapse; }
-    tr th { border-bottom: 2px groove; }
-    //-->
-    </style>
-  </HEAD>
-  <BODY>
-    <H1>#{title}</H1>
-        _end_of_html_
-
-        res.body << "<TABLE width=\"100%\"><THEAD><TR>\n"
-        res.body << "<TH class=\"name\"><A HREF=\"?N=#{d1}#{query}\">Name</A></TH>"
-        res.body << "<TH class=\"mtime\"><A HREF=\"?M=#{d1}#{query}\">Last modified</A></TH>"
-        res.body << "<TH class=\"size\"><A HREF=\"?S=#{d1}#{query}\">Size</A></TH>\n"
-        res.body << "</TR></THEAD>\n"
-        res.body << "<TBODY>\n"
-
-        query.sub!(/\A&/, '?')
-        list.unshift [ "..", File::mtime(local_path+"/.."), -1 ]
-        list.each{ |name, time, size|
-          if name == ".."
-            dname = "Parent Directory"
-          elsif namewidth and name.size > namewidth
-            dname = name[0...(namewidth - 2)] << '..'
-          else
-            dname = name
-          end
-          s =  "<TR><TD class=\"name\"><A HREF=\"#{HTTPUtils::escape(name)}#{query if name.end_with?('/')}\">#{HTMLUtils::escape(dname)}</A></TD>"
-          s << "<TD class=\"mtime\">" << (time ? time.strftime("%Y/%m/%d %H:%M") : "") << "</TD>"
-          s << "<TD class=\"size\">" << (size >= 0 ? size.to_s : "-") << "</TD></TR>\n"
-          res.body << s
-        }
-        res.body << "</TBODY></TABLE>"
-        res.body << "<HR>"
-
-        res.body << <<-_end_of_html_
-    <ADDRESS>
-     #{HTMLUtils::escape(@config[:ServerSoftware])}<BR>
-     at #{req.host}:#{req.port}
-    </ADDRESS>
-  </BODY>
-</HTML>
-        _end_of_html_
-      end
-
-      # :startdoc:
-    end
-  end
-end
diff --git a/tool/lib/webrick/httpservlet/prochandler.rb b/tool/lib/webrick/httpservlet/prochandler.rb
deleted file mode 100644
index 599ffc43408d37..00000000000000
--- a/tool/lib/webrick/httpservlet/prochandler.rb
+++ /dev/null
@@ -1,47 +0,0 @@
-# frozen_string_literal: false
-#
-# prochandler.rb -- ProcHandler Class
-#
-# Author: IPR -- Internet Programming with Ruby -- writers
-# Copyright (c) 2001 TAKAHASHI Masayoshi, GOTOU Yuuzou
-# Copyright (c) 2002 Internet Programming with Ruby writers. All rights
-# reserved.
-#
-# $IPR: prochandler.rb,v 1.7 2002/09/21 12:23:42 gotoyuzo Exp $
-
-require_relative 'abstract'
-
-module WEBrick
-  module HTTPServlet
-
-    ##
-    # Mounts a proc at a path that accepts a request and response.
-    #
-    # Instead of mounting this servlet with WEBrick::HTTPServer#mount use
-    # WEBrick::HTTPServer#mount_proc:
-    #
-    #   server.mount_proc '/' do |req, res|
-    #     res.body = 'it worked!'
-    #     res.status = 200
-    #   end
-
-    class ProcHandler < AbstractServlet
-      # :stopdoc:
-      def get_instance(server, *options)
-        self
-      end
-
-      def initialize(proc)
-        @proc = proc
-      end
-
-      def do_GET(request, response)
-        @proc.call(request, response)
-      end
-
-      alias do_POST do_GET
-      # :startdoc:
-    end
-
-  end
-end
diff --git a/tool/lib/webrick/httpstatus.rb b/tool/lib/webrick/httpstatus.rb
deleted file mode 100644
index c811f21964990c..00000000000000
--- a/tool/lib/webrick/httpstatus.rb
+++ /dev/null
@@ -1,194 +0,0 @@
-# frozen_string_literal: false
-#--
-# httpstatus.rb -- HTTPStatus Class
-#
-# Author: IPR -- Internet Programming with Ruby -- writers
-# Copyright (c) 2000, 2001 TAKAHASHI Masayoshi, GOTOU Yuuzou
-# Copyright (c) 2002 Internet Programming with Ruby writers. All rights
-# reserved.
-#
-# $IPR: httpstatus.rb,v 1.11 2003/03/24 20:18:55 gotoyuzo Exp $
-
-require_relative 'accesslog'
-
-module WEBrick
-
-  ##
-  # This module is used to manager HTTP status codes.
-  #
-  # See http://www.w3.org/Protocols/rfc2616/rfc2616-sec10.html for more
-  # information.
-  module HTTPStatus
-
-    ##
-    # Root of the HTTP status class hierarchy
-    class Status < StandardError
-      class << self
-        attr_reader :code, :reason_phrase # :nodoc:
-      end
-
-      # Returns the HTTP status code
-      def code() self::class::code end
-
-      # Returns the HTTP status description
-      def reason_phrase() self::class::reason_phrase end
-
-      alias to_i code # :nodoc:
-    end
-
-    # Root of the HTTP info statuses
-    class Info        < Status; end
-    # Root of the HTTP success statuses
-    class Success     < Status; end
-    # Root of the HTTP redirect statuses
-    class Redirect    < Status; end
-    # Root of the HTTP error statuses
-    class Error       < Status; end
-    # Root of the HTTP client error statuses
-    class ClientError < Error; end
-    # Root of the HTTP server error statuses
-    class ServerError < Error; end
-
-    class EOFError < StandardError; end
-
-    # HTTP status codes and descriptions
-    StatusMessage = { # :nodoc:
-      100 => 'Continue',
-      101 => 'Switching Protocols',
-      200 => 'OK',
-      201 => 'Created',
-      202 => 'Accepted',
-      203 => 'Non-Authoritative Information',
-      204 => 'No Content',
-      205 => 'Reset Content',
-      206 => 'Partial Content',
-      207 => 'Multi-Status',
-      300 => 'Multiple Choices',
-      301 => 'Moved Permanently',
-      302 => 'Found',
-      303 => 'See Other',
-      304 => 'Not Modified',
-      305 => 'Use Proxy',
-      307 => 'Temporary Redirect',
-      400 => 'Bad Request',
-      401 => 'Unauthorized',
-      402 => 'Payment Required',
-      403 => 'Forbidden',
-      404 => 'Not Found',
-      405 => 'Method Not Allowed',
-      406 => 'Not Acceptable',
-      407 => 'Proxy Authentication Required',
-      408 => 'Request Timeout',
-      409 => 'Conflict',
-      410 => 'Gone',
-      411 => 'Length Required',
-      412 => 'Precondition Failed',
-      413 => 'Request Entity Too Large',
-      414 => 'Request-URI Too Large',
-      415 => 'Unsupported Media Type',
-      416 => 'Request Range Not Satisfiable',
-      417 => 'Expectation Failed',
-      422 => 'Unprocessable Entity',
-      423 => 'Locked',
-      424 => 'Failed Dependency',
-      426 => 'Upgrade Required',
-      428 => 'Precondition Required',
-      429 => 'Too Many Requests',
-      431 => 'Request Header Fields Too Large',
-      451 => 'Unavailable For Legal Reasons',
-      500 => 'Internal Server Error',
-      501 => 'Not Implemented',
-      502 => 'Bad Gateway',
-      503 => 'Service Unavailable',
-      504 => 'Gateway Timeout',
-      505 => 'HTTP Version Not Supported',
-      507 => 'Insufficient Storage',
-      511 => 'Network Authentication Required',
-    }
-
-    # Maps a status code to the corresponding Status class
-    CodeToError = {} # :nodoc:
-
-    # Creates a status or error class for each status code and
-    # populates the CodeToError map.
-    StatusMessage.each{|code, message|
-      message.freeze
-      var_name = message.gsub(/[ \-]/,'_').upcase
-      err_name = message.gsub(/[ \-]/,'')
-
-      case code
-      when 100...200; parent = Info
-      when 200...300; parent = Success
-      when 300...400; parent = Redirect
-      when 400...500; parent = ClientError
-      when 500...600; parent = ServerError
-      end
-
-      const_set("RC_#{var_name}", code)
-      err_class = Class.new(parent)
-      err_class.instance_variable_set(:@code, code)
-      err_class.instance_variable_set(:@reason_phrase, message)
-      const_set(err_name, err_class)
-      CodeToError[code] = err_class
-    }
-
-    ##
-    # Returns the description corresponding to the HTTP status +code+
-    #
-    #   WEBrick::HTTPStatus.reason_phrase 404
-    #   => "Not Found"
-    def reason_phrase(code)
-      StatusMessage[code.to_i]
-    end
-
-    ##
-    # Is +code+ an informational status?
-    def info?(code)
-      code.to_i >= 100 and code.to_i < 200
-    end
-
-    ##
-    # Is +code+ a successful status?
-    def success?(code)
-      code.to_i >= 200 and code.to_i < 300
-    end
-
-    ##
-    # Is +code+ a redirection status?
-    def redirect?(code)
-      code.to_i >= 300 and code.to_i < 400
-    end
-
-    ##
-    # Is +code+ an error status?
-    def error?(code)
-      code.to_i >= 400 and code.to_i < 600
-    end
-
-    ##
-    # Is +code+ a client error status?
-    def client_error?(code)
-      code.to_i >= 400 and code.to_i < 500
-    end
-
-    ##
-    # Is +code+ a server error status?
-    def server_error?(code)
-      code.to_i >= 500 and code.to_i < 600
-    end
-
-    ##
-    # Returns the status class corresponding to +code+
-    #
-    #   WEBrick::HTTPStatus[302]
-    #   => WEBrick::HTTPStatus::NotFound
-    #
-    def self.[](code)
-      CodeToError[code]
-    end
-
-    module_function :reason_phrase
-    module_function :info?, :success?, :redirect?, :error?
-    module_function :client_error?, :server_error?
-  end
-end
diff --git a/tool/lib/webrick/httputils.rb b/tool/lib/webrick/httputils.rb
deleted file mode 100644
index e21284ee7f9097..00000000000000
--- a/tool/lib/webrick/httputils.rb
+++ /dev/null
@@ -1,512 +0,0 @@
-# frozen_string_literal: false
-#
-# httputils.rb -- HTTPUtils Module
-#
-# Author: IPR -- Internet Programming with Ruby -- writers
-# Copyright (c) 2000, 2001 TAKAHASHI Masayoshi, GOTOU Yuuzou
-# Copyright (c) 2002 Internet Programming with Ruby writers. All rights
-# reserved.
-#
-# $IPR: httputils.rb,v 1.34 2003/06/05 21:34:08 gotoyuzo Exp $
-
-require 'socket'
-require 'tempfile'
-
-module WEBrick
-  CR   = "\x0d"     # :nodoc:
-  LF   = "\x0a"     # :nodoc:
-  CRLF = "\x0d\x0a" # :nodoc:
-
-  ##
-  # HTTPUtils provides utility methods for working with the HTTP protocol.
-  #
-  # This module is generally used internally by WEBrick
-
-  module HTTPUtils
-
-    ##
-    # Normalizes a request path.  Raises an exception if the path cannot be
-    # normalized.
-
-    def normalize_path(path)
-      raise "abnormal path `#{path}'" if path[0] != ?/
-      ret = path.dup
-
-      ret.gsub!(%r{/+}o, '/')                    # //      => /
-      while ret.sub!(%r'/\.(?:/|\Z)', '/'); end  # /.      => /
-      while ret.sub!(%r'/(?!\.\./)[^/]+/\.\.(?:/|\Z)', '/'); end # /foo/.. => /foo
-
-      raise "abnormal path `#{path}'" if %r{/\.\.(/|\Z)} =~ ret
-      ret
-    end
-    module_function :normalize_path
-
-    ##
-    # Default mime types
-
-    DefaultMimeTypes = {
-      "ai"    => "application/postscript",
-      "asc"   => "text/plain",
-      "avi"   => "video/x-msvideo",
-      "bin"   => "application/octet-stream",
-      "bmp"   => "image/bmp",
-      "class" => "application/octet-stream",
-      "cer"   => "application/pkix-cert",
-      "crl"   => "application/pkix-crl",
-      "crt"   => "application/x-x509-ca-cert",
-     #"crl"   => "application/x-pkcs7-crl",
-      "css"   => "text/css",
-      "dms"   => "application/octet-stream",
-      "doc"   => "application/msword",
-      "dvi"   => "application/x-dvi",
-      "eps"   => "application/postscript",
-      "etx"   => "text/x-setext",
-      "exe"   => "application/octet-stream",
-      "gif"   => "image/gif",
-      "htm"   => "text/html",
-      "html"  => "text/html",
-      "jpe"   => "image/jpeg",
-      "jpeg"  => "image/jpeg",
-      "jpg"   => "image/jpeg",
-      "js"    => "application/javascript",
-      "json"  => "application/json",
-      "lha"   => "application/octet-stream",
-      "lzh"   => "application/octet-stream",
-      "mjs"   => "application/javascript",
-      "mov"   => "video/quicktime",
-      "mpe"   => "video/mpeg",
-      "mpeg"  => "video/mpeg",
-      "mpg"   => "video/mpeg",
-      "pbm"   => "image/x-portable-bitmap",
-      "pdf"   => "application/pdf",
-      "pgm"   => "image/x-portable-graymap",
-      "png"   => "image/png",
-      "pnm"   => "image/x-portable-anymap",
-      "ppm"   => "image/x-portable-pixmap",
-      "ppt"   => "application/vnd.ms-powerpoint",
-      "ps"    => "application/postscript",
-      "qt"    => "video/quicktime",
-      "ras"   => "image/x-cmu-raster",
-      "rb"    => "text/plain",
-      "rd"    => "text/plain",
-      "rtf"   => "application/rtf",
-      "sgm"   => "text/sgml",
-      "sgml"  => "text/sgml",
-      "svg"   => "image/svg+xml",
-      "tif"   => "image/tiff",
-      "tiff"  => "image/tiff",
-      "txt"   => "text/plain",
-      "wasm"  => "application/wasm",
-      "xbm"   => "image/x-xbitmap",
-      "xhtml" => "text/html",
-      "xls"   => "application/vnd.ms-excel",
-      "xml"   => "text/xml",
-      "xpm"   => "image/x-xpixmap",
-      "xwd"   => "image/x-xwindowdump",
-      "zip"   => "application/zip",
-    }
-
-    ##
-    # Loads Apache-compatible mime.types in +file+.
-
-    def load_mime_types(file)
-      # note: +file+ may be a "| command" for now; some people may
-      # rely on this, but currently we do not use this method by default.
-      File.open(file){ |io|
-        hash = Hash.new
-        io.each{ |line|
-          next if /^#/ =~ line
-          line.chomp!
-          mimetype, ext0 = line.split(/\s+/, 2)
-          next unless ext0
-          next if ext0.empty?
-          ext0.split(/\s+/).each{ |ext| hash[ext] = mimetype }
-        }
-        hash
-      }
-    end
-    module_function :load_mime_types
-
-    ##
-    # Returns the mime type of +filename+ from the list in +mime_tab+.  If no
-    # mime type was found application/octet-stream is returned.
-
-    def mime_type(filename, mime_tab)
-      suffix1 = (/\.(\w+)$/ =~ filename && $1.downcase)
-      suffix2 = (/\.(\w+)\.[\w\-]+$/ =~ filename && $1.downcase)
-      mime_tab[suffix1] || mime_tab[suffix2] || "application/octet-stream"
-    end
-    module_function :mime_type
-
-    ##
-    # Parses an HTTP header +raw+ into a hash of header fields with an Array
-    # of values.
-
-    def parse_header(raw)
-      header = Hash.new([].freeze)
-      field = nil
-      raw.each_line{|line|
-        case line
-        when /^([A-Za-z0-9!\#$%&'*+\-.^_`|~]+):\s*(.*?)\s*\z/om
-          field, value = $1, $2
-          field.downcase!
-          header[field] = [] unless header.has_key?(field)
-          header[field] << value
-        when /^\s+(.*?)\s*\z/om
-          value = $1
-          unless field
-            raise HTTPStatus::BadRequest, "bad header '#{line}'."
-          end
-          header[field][-1] << " " << value
-        else
-          raise HTTPStatus::BadRequest, "bad header '#{line}'."
-        end
-      }
-      header.each{|key, values|
-        values.each(&:strip!)
-      }
-      header
-    end
-    module_function :parse_header
-
-    ##
-    # Splits a header value +str+ according to HTTP specification.
-
-    def split_header_value(str)
-      str.scan(%r'\G((?:"(?:\\.|[^"])+?"|[^",]+)+)
-                    (?:,\s*|\Z)'xn).flatten
-    end
-    module_function :split_header_value
-
-    ##
-    # Parses a Range header value +ranges_specifier+
-
-    def parse_range_header(ranges_specifier)
-      if /^bytes=(.*)/ =~ ranges_specifier
-        byte_range_set = split_header_value($1)
-        byte_range_set.collect{|range_spec|
-          case range_spec
-          when /^(\d+)-(\d+)/ then $1.to_i .. $2.to_i
-          when /^(\d+)-/      then $1.to_i .. -1
-          when /^-(\d+)/      then -($1.to_i) .. -1
-          else return nil
-          end
-        }
-      end
-    end
-    module_function :parse_range_header
-
-    ##
-    # Parses q values in +value+ as used in Accept headers.
-
-    def parse_qvalues(value)
-      tmp = []
-      if value
-        parts = value.split(/,\s*/)
-        parts.each {|part|
-          if m = %r{^([^\s,]+?)(?:;\s*q=(\d+(?:\.\d+)?))?$}.match(part)
-            val = m[1]
-            q = (m[2] or 1).to_f
-            tmp.push([val, q])
-          end
-        }
-        tmp = tmp.sort_by{|val, q| -q}
-        tmp.collect!{|val, q| val}
-      end
-      return tmp
-    end
-    module_function :parse_qvalues
-
-    ##
-    # Removes quotes and escapes from +str+
-
-    def dequote(str)
-      ret = (/\A"(.*)"\Z/ =~ str) ? $1 : str.dup
-      ret.gsub!(/\\(.)/, "\\1")
-      ret
-    end
-    module_function :dequote
-
-    ##
-    # Quotes and escapes quotes in +str+
-
-    def quote(str)
-      '"' << str.gsub(/[\\\"]/o, "\\\1") << '"'
-    end
-    module_function :quote
-
-    ##
-    # Stores multipart form data.  FormData objects are created when
-    # WEBrick::HTTPUtils.parse_form_data is called.
-
-    class FormData < String
-      EmptyRawHeader = [].freeze # :nodoc:
-      EmptyHeader = {}.freeze # :nodoc:
-
-      ##
-      # The name of the form data part
-
-      attr_accessor :name
-
-      ##
-      # The filename of the form data part
-
-      attr_accessor :filename
-
-      attr_accessor :next_data # :nodoc:
-      protected :next_data
-
-      ##
-      # Creates a new FormData object.
-      #
-      # +args+ is an Array of form data entries.  One FormData will be created
-      # for each entry.
-      #
-      # This is called by WEBrick::HTTPUtils.parse_form_data for you
-
-      def initialize(*args)
-        @name = @filename = @next_data = nil
-        if args.empty?
-          @raw_header = []
-          @header = nil
-          super("")
-        else
-          @raw_header = EmptyRawHeader
-          @header = EmptyHeader
-          super(args.shift)
-          unless args.empty?
-            @next_data = self.class.new(*args)
-          end
-        end
-      end
-
-      ##
-      # Retrieves the header at the first entry in +key+
-
-      def [](*key)
-        begin
-          @header[key[0].downcase].join(", ")
-        rescue StandardError, NameError
-          super
-        end
-      end
-
-      ##
-      # Adds +str+ to this FormData which may be the body, a header or a
-      # header entry.
-      #
-      # This is called by WEBrick::HTTPUtils.parse_form_data for you
-
-      def <<(str)
-        if @header
-          super
-        elsif str == CRLF
-          @header = HTTPUtils::parse_header(@raw_header.join)
-          if cd = self['content-disposition']
-            if /\s+name="(.*?)"/ =~ cd then @name = $1 end
-            if /\s+filename="(.*?)"/ =~ cd then @filename = $1 end
-          end
-        else
-          @raw_header << str
-        end
-        self
-      end
-
-      ##
-      # Adds +data+ at the end of the chain of entries
-      #
-      # This is called by WEBrick::HTTPUtils.parse_form_data for you.
-
-      def append_data(data)
-        tmp = self
-        while tmp
-          unless tmp.next_data
-            tmp.next_data = data
-            break
-          end
-          tmp = tmp.next_data
-        end
-        self
-      end
-
-      ##
-      # Yields each entry in this FormData
-
-      def each_data
-        tmp = self
-        while tmp
-          next_data = tmp.next_data
-          yield(tmp)
-          tmp = next_data
-        end
-      end
-
-      ##
-      # Returns all the FormData as an Array
-
-      def list
-        ret = []
-        each_data{|data|
-          ret << data.to_s
-        }
-        ret
-      end
-
-      ##
-      # A FormData will behave like an Array
-
-      alias :to_ary :list
-
-      ##
-      # This FormData's body
-
-      def to_s
-        String.new(self)
-      end
-    end
-
-    ##
-    # Parses the query component of a URI in +str+
-
-    def parse_query(str)
-      query = Hash.new
-      if str
-        str.split(/[&;]/).each{|x|
-          next if x.empty?
-          key, val = x.split(/=/,2)
-          key = unescape_form(key)
-          val = unescape_form(val.to_s)
-          val = FormData.new(val)
-          val.name = key
-          if query.has_key?(key)
-            query[key].append_data(val)
-            next
-          end
-          query[key] = val
-        }
-      end
-      query
-    end
-    module_function :parse_query
-
-    ##
-    # Parses form data in +io+ with the given +boundary+
-
-    def parse_form_data(io, boundary)
-      boundary_regexp = /\A--#{Regexp.quote(boundary)}(--)?#{CRLF}\z/
-      form_data = Hash.new
-      return form_data unless io
-      data = nil
-      io.each_line{|line|
-        if boundary_regexp =~ line
-          if data
-            data.chop!
-            key = data.name
-            if form_data.has_key?(key)
-              form_data[key].append_data(data)
-            else
-              form_data[key] = data
-            end
-          end
-          data = FormData.new
-          next
-        else
-          if data
-            data << line
-          end
-        end
-      }
-      return form_data
-    end
-    module_function :parse_form_data
-
-    #####
-
-    reserved = ';/?:@&=+$,'
-    num      = '0123456789'
-    lowalpha = 'abcdefghijklmnopqrstuvwxyz'
-    upalpha  = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-    mark     = '-_.!~*\'()'
-    unreserved = num + lowalpha + upalpha + mark
-    control  = (0x0..0x1f).collect{|c| c.chr }.join + "\x7f"
-    space    = " "
-    delims   = '<>#%"'
-    unwise   = '{}|\\^[]`'
-    nonascii = (0x80..0xff).collect{|c| c.chr }.join
-
-    module_function
-
-    # :stopdoc:
-
-    def _make_regex(str) /([#{Regexp.escape(str)}])/n end
-    def _make_regex!(str) /([^#{Regexp.escape(str)}])/n end
-    def _escape(str, regex)
-      str = str.b
-      str.gsub!(regex) {"%%%02X" % $1.ord}
-      # %-escaped string should contain US-ASCII only
-      str.force_encoding(Encoding::US_ASCII)
-    end
-    def _unescape(str, regex)
-      str = str.b
-      str.gsub!(regex) {$1.hex.chr}
-      # encoding of %-unescaped string is unknown
-      str
-    end
-
-    UNESCAPED = _make_regex(control+space+delims+unwise+nonascii)
-    UNESCAPED_FORM = _make_regex(reserved+control+delims+unwise+nonascii)
-    NONASCII  = _make_regex(nonascii)
-    ESCAPED   = /%([0-9a-fA-F]{2})/
-    UNESCAPED_PCHAR = _make_regex!(unreserved+":@&=+$,")
-
-    # :startdoc:
-
-    ##
-    # Escapes HTTP reserved and unwise characters in +str+
-
-    def escape(str)
-      _escape(str, UNESCAPED)
-    end
-
-    ##
-    # Unescapes HTTP reserved and unwise characters in +str+
-
-    def unescape(str)
-      _unescape(str, ESCAPED)
-    end
-
-    ##
-    # Escapes form reserved characters in +str+
-
-    def escape_form(str)
-      ret = _escape(str, UNESCAPED_FORM)
-      ret.gsub!(/ /, "+")
-      ret
-    end
-
-    ##
-    # Unescapes form reserved characters in +str+
-
-    def unescape_form(str)
-      _unescape(str.gsub(/\+/, " "), ESCAPED)
-    end
-
-    ##
-    # Escapes path +str+
-
-    def escape_path(str)
-      result = ""
-      str.scan(%r{/([^/]*)}).each{|i|
-        result << "/" << _escape(i[0], UNESCAPED_PCHAR)
-      }
-      return result
-    end
-
-    ##
-    # Escapes 8 bit characters in +str+
-
-    def escape8bit(str)
-      _escape(str, NONASCII)
-    end
-  end
-end
diff --git a/tool/lib/webrick/httpversion.rb b/tool/lib/webrick/httpversion.rb
deleted file mode 100644
index 8a251944a2c067..00000000000000
--- a/tool/lib/webrick/httpversion.rb
+++ /dev/null
@@ -1,76 +0,0 @@
-# frozen_string_literal: false
-#--
-# HTTPVersion.rb -- presentation of HTTP version
-#
-# Author: IPR -- Internet Programming with Ruby -- writers
-# Copyright (c) 2002 Internet Programming with Ruby writers. All rights
-# reserved.
-#
-# $IPR: httpversion.rb,v 1.5 2002/09/21 12:23:37 gotoyuzo Exp $
-
-module WEBrick
-
-  ##
-  # Represents an HTTP protocol version
-
-  class HTTPVersion
-    include Comparable
-
-    ##
-    # The major protocol version number
-
-    attr_accessor :major
-
-    ##
-    # The minor protocol version number
-
-    attr_accessor :minor
-
-    ##
-    # Converts +version+ into an HTTPVersion
-
-    def self.convert(version)
-      version.is_a?(self) ? version : new(version)
-    end
-
-    ##
-    # Creates a new HTTPVersion from +version+.
-
-    def initialize(version)
-      case version
-      when HTTPVersion
-        @major, @minor = version.major, version.minor
-      when String
-        if /^(\d+)\.(\d+)$/ =~ version
-          @major, @minor = $1.to_i, $2.to_i
-        end
-      end
-      if @major.nil? || @minor.nil?
-        raise ArgumentError,
-          format("cannot convert %s into %s", version.class, self.class)
-      end
-    end
-
-    ##
-    # Compares this version with +other+ according to the HTTP specification
-    # rules.
-
-    def <=>(other)
-      unless other.is_a?(self.class)
-        other = self.class.new(other)
-      end
-      if (ret = @major <=> other.major) == 0
-        return @minor <=> other.minor
-      end
-      return ret
-    end
-
-    ##
-    # The HTTP version as show in the HTTP request and response.  For example,
-    # "1.1"
-
-    def to_s
-      format("%d.%d", @major, @minor)
-    end
-  end
-end
diff --git a/tool/lib/webrick/log.rb b/tool/lib/webrick/log.rb
deleted file mode 100644
index 2c1fdfe602bdc0..00000000000000
--- a/tool/lib/webrick/log.rb
+++ /dev/null
@@ -1,156 +0,0 @@
-# frozen_string_literal: false
-#--
-# log.rb -- Log Class
-#
-# Author: IPR -- Internet Programming with Ruby -- writers
-# Copyright (c) 2000, 2001 TAKAHASHI Masayoshi, GOTOU Yuuzou
-# Copyright (c) 2002 Internet Programming with Ruby writers. All rights
-# reserved.
-#
-# $IPR: log.rb,v 1.26 2002/10/06 17:06:10 gotoyuzo Exp $
-
-module WEBrick
-
-  ##
-  # A generic logging class
-
-  class BasicLog
-
-    # Fatal log level which indicates a server crash
-
-    FATAL = 1
-
-    # Error log level which indicates a recoverable error
-
-    ERROR = 2
-
-    # Warning log level which indicates a possible problem
-
-    WARN  = 3
-
-    # Information log level which indicates possibly useful information
-
-    INFO  = 4
-
-    # Debugging error level for messages used in server development or
-    # debugging
-
-    DEBUG = 5
-
-    # log-level, messages above this level will be logged
-    attr_accessor :level
-
-    ##
-    # Initializes a new logger for +log_file+ that outputs messages at +level+
-    # or higher.  +log_file+ can be a filename, an IO-like object that
-    # responds to #<< or nil which outputs to $stderr.
-    #
-    # If no level is given INFO is chosen by default
-
-    def initialize(log_file=nil, level=nil)
-      @level = level || INFO
-      case log_file
-      when String
-        @log = File.open(log_file, "a+")
-        @log.sync = true
-        @opened = true
-      when NilClass
-        @log = $stderr
-      else
-        @log = log_file  # requires "<<". (see BasicLog#log)
-      end
-    end
-
-    ##
-    # Closes the logger (also closes the log device associated to the logger)
-    def close
-      @log.close if @opened
-      @log = nil
-    end
-
-    ##
-    # Logs +data+ at +level+ if the given level is above the current log
-    # level.
-
-    def log(level, data)
-      if @log && level <= @level
-        data += "\n" if /\n\Z/ !~ data
-        @log << data
-      end
-    end
-
-    ##
-    # Synonym for log(INFO, obj.to_s)
-    def <<(obj)
-      log(INFO, obj.to_s)
-    end
-
-    # Shortcut for logging a FATAL message
-    def fatal(msg) log(FATAL, "FATAL " << format(msg)); end
-    # Shortcut for logging an ERROR message
-    def error(msg) log(ERROR, "ERROR " << format(msg)); end
-    # Shortcut for logging a WARN message
-    def warn(msg)  log(WARN,  "WARN  " << format(msg)); end
-    # Shortcut for logging an INFO message
-    def info(msg)  log(INFO,  "INFO  " << format(msg)); end
-    # Shortcut for logging a DEBUG message
-    def debug(msg) log(DEBUG, "DEBUG " << format(msg)); end
-
-    # Will the logger output FATAL messages?
-    def fatal?; @level >= FATAL; end
-    # Will the logger output ERROR messages?
-    def error?; @level >= ERROR; end
-    # Will the logger output WARN messages?
-    def warn?;  @level >= WARN; end
-    # Will the logger output INFO messages?
-    def info?;  @level >= INFO; end
-    # Will the logger output DEBUG messages?
-    def debug?; @level >= DEBUG; end
-
-    private
-
-    ##
-    # Formats +arg+ for the logger
-    #
-    # * If +arg+ is an Exception, it will format the error message and
-    #   the back trace.
-    # * If +arg+ responds to #to_str, it will return it.
-    # * Otherwise it will return +arg+.inspect.
-    def format(arg)
-      if arg.is_a?(Exception)
-        "#{arg.class}: #{AccessLog.escape(arg.message)}\n\t" <<
-        arg.backtrace.join("\n\t") << "\n"
-      elsif arg.respond_to?(:to_str)
-        AccessLog.escape(arg.to_str)
-      else
-        arg.inspect
-      end
-    end
-  end
-
-  ##
-  # A logging class that prepends a timestamp to each message.
-
-  class Log < BasicLog
-    # Format of the timestamp which is applied to each logged line.  The
-    # default is <tt>"[%Y-%m-%d %H:%M:%S]"</tt>
-    attr_accessor :time_format
-
-    ##
-    # Same as BasicLog#initialize
-    #
-    # You can set the timestamp format through #time_format
-    def initialize(log_file=nil, level=nil)
-      super(log_file, level)
-      @time_format = "[%Y-%m-%d %H:%M:%S]"
-    end
-
-    ##
-    # Same as BasicLog#log
-    def log(level, data)
-      tmp = Time.now.strftime(@time_format)
-      tmp << " " << data
-      super(level, tmp)
-    end
-  end
-end
diff --git a/tool/lib/webrick/server.rb b/tool/lib/webrick/server.rb
deleted file mode 100644
index fd6b7a61b56e2b..00000000000000
--- a/tool/lib/webrick/server.rb
+++ /dev/null
@@ -1,381 +0,0 @@
-# frozen_string_literal: false
-#
-# server.rb -- GenericServer Class
-#
-# Author: IPR -- Internet Programming with Ruby -- writers
-# Copyright (c) 2000, 2001 TAKAHASHI Masayoshi, GOTOU Yuuzou
-# Copyright (c) 2002 Internet Programming with Ruby writers. All rights
-# reserved.
-#
-# $IPR: server.rb,v 1.62 2003/07/22 19:20:43 gotoyuzo Exp $
-
-require 'socket'
-require_relative 'config'
-require_relative 'log'
-
-module WEBrick
-
-  ##
-  # Server error exception
-
-  class ServerError < StandardError; end
-
-  ##
-  # Base server class
-
-  class SimpleServer
-
-    ##
-    # A SimpleServer only yields when you start it
-
-    def SimpleServer.start
-      yield
-    end
-  end
-
-  ##
-  # A generic module for daemonizing a process
-
-  class Daemon
-
-    ##
-    # Performs the standard operations for daemonizing a process.  Runs a
-    # block, if given.
-
-    def Daemon.start
-      Process.daemon
-      File.umask(0)
-      yield if block_given?
-    end
-  end
-
-  ##
-  # Base TCP server class.  You must subclass GenericServer and provide a #run
-  # method.
-
-  class GenericServer
-
-    ##
-    # The server status.  One of :Stop, :Running or :Shutdown
-
-    attr_reader :status
-
-    ##
-    # The server configuration
-
-    attr_reader :config
-
-    ##
-    # The server logger.  This is independent from the HTTP access log.
-
-    attr_reader :logger
-
-    ##
-    # Tokens control the number of outstanding clients.  The
-    # <code>:MaxClients</code> configuration sets this.
-
-    attr_reader :tokens
-
-    ##
-    # Sockets listening for connections.
-
-    attr_reader :listeners
-
-    ##
-    # Creates a new generic server from +config+.  The default configuration
-    # comes from +default+.
-
-    def initialize(config={}, default=Config::General)
-      @config = default.dup.update(config)
-      @status = :Stop
-      @config[:Logger] ||= Log::new
-      @logger = @config[:Logger]
-
-      @tokens = Thread::SizedQueue.new(@config[:MaxClients])
-      @config[:MaxClients].times{ @tokens.push(nil) }
-
-      webrickv = WEBrick::VERSION
-      rubyv = "#{RUBY_VERSION} (#{RUBY_RELEASE_DATE}) [#{RUBY_PLATFORM}]"
-      @logger.info("WEBrick #{webrickv}")
-      @logger.info("ruby #{rubyv}")
-
-      @listeners = []
-      @shutdown_pipe = nil
-      unless @config[:DoNotListen]
-        raise ArgumentError, "Port must an integer" unless @config[:Port].to_s == @config[:Port].to_i.to_s
-
-        @config[:Port] = @config[:Port].to_i
-        if @config[:Listen]
-          warn(":Listen option is deprecated; use GenericServer#listen", uplevel: 1)
-        end
-        listen(@config[:BindAddress], @config[:Port])
-        if @config[:Port] == 0
-          @config[:Port] = @listeners[0].addr[1]
-        end
-      end
-    end
-
-    ##
-    # Retrieves +key+ from the configuration
-
-    def [](key)
-      @config[key]
-    end
-
-    ##
-    # Adds listeners from +address+ and +port+ to the server.  See
-    # WEBrick::Utils::create_listeners for details.
-
-    def listen(address, port)
-      @listeners += Utils::create_listeners(address, port)
-    end
-
-    ##
-    # Starts the server and runs the +block+ for each connection.  This method
-    # does not return until the server is stopped from a signal handler or
-    # another thread using #stop or #shutdown.
-    #
-    # If the block raises a subclass of StandardError the exception is logged
-    # and ignored.  If an IOError or Errno::EBADF exception is raised the
-    # exception is ignored.  If an Exception subclass is raised the exception
-    # is logged and re-raised which stops the server.
-    #
-    # To completely shut down a server call #shutdown from ensure:
-    #
-    #   server = WEBrick::GenericServer.new
-    #   # or WEBrick::HTTPServer.new
-    #
-    #   begin
-    #     server.start
-    #   ensure
-    #     server.shutdown
-    #   end
-
-    def start(&block)
-      raise ServerError, "already started." if @status != :Stop
-      server_type = @config[:ServerType] || SimpleServer
-
-      setup_shutdown_pipe
-
-      server_type.start{
-        @logger.info \
-          "#{self.class}#start: pid=#{$$} port=#{@config[:Port]}"
-        @status = :Running
-        call_callback(:StartCallback)
-
-        shutdown_pipe = @shutdown_pipe
-
-        thgroup = ThreadGroup.new
-        begin
-          while @status == :Running
-            begin
-              sp = shutdown_pipe[0]
-              if svrs = IO.select([sp, *@listeners])
-                if svrs[0].include? sp
-                  # swallow shutdown pipe
-                  buf = String.new
-                  nil while String ===
-                            sp.read_nonblock([sp.nread, 8].max, buf, exception: false)
-                  break
-                end
-                svrs[0].each{|svr|
-                  @tokens.pop          # blocks while no token is there.
-                  if sock = accept_client(svr)
-                    unless config[:DoNotReverseLookup].nil?
-                      sock.do_not_reverse_lookup = !!config[:DoNotReverseLookup]
-                    end
-                    th = start_thread(sock, &block)
-                    th[:WEBrickThread] = true
-                    thgroup.add(th)
-                  else
-                    @tokens.push(nil)
-                  end
-                }
-              end
-            rescue Errno::EBADF, Errno::ENOTSOCK, IOError => ex
-              # if the listening socket was closed in GenericServer#shutdown,
-              # IO::select raise it.
-            rescue StandardError => ex
-              msg = "#{ex.class}: #{ex.message}\n\t#{ex.backtrace[0]}"
-              @logger.error msg
-            rescue Exception => ex
-              @logger.fatal ex
-              raise
-            end
-          end
-        ensure
-          cleanup_shutdown_pipe(shutdown_pipe)
-          cleanup_listener
-          @status = :Shutdown
-          @logger.info "going to shutdown ..."
-          thgroup.list.each{|th| th.join if th[:WEBrickThread] }
-          call_callback(:StopCallback)
-          @logger.info "#{self.class}#start done."
-          @status = :Stop
-        end
-      }
-    end
-
-    ##
-    # Stops the server from accepting new connections.
-
-    def stop
-      if @status == :Running
-        @status = :Shutdown
-      end
-
-      alarm_shutdown_pipe {|f| f.write_nonblock("\0")}
-    end
-
-    ##
-    # Shuts down the server and all listening sockets.  New listeners must be
-    # provided to restart the server.
-
-    def shutdown
-      stop
-
-      alarm_shutdown_pipe(&:close)
-    end
-
-    ##
-    # You must subclass GenericServer and implement \#run which accepts a TCP
-    # client socket
-
-    def run(sock)
-      @logger.fatal "run() must be provided by user."
-    end
-
-    private
-
-    # :stopdoc:
-
-    ##
-    # Accepts a TCP client socket from the TCP server socket +svr+ and returns
-    # the client socket.
-
-    def accept_client(svr)
-      case sock = svr.to_io.accept_nonblock(exception: false)
-      when :wait_readable
-        nil
-      else
-        if svr.respond_to?(:start_immediately)
-          sock = OpenSSL::SSL::SSLSocket.new(sock, ssl_context)
-          sock.sync_close = true
-          # we cannot do OpenSSL::SSL::SSLSocket#accept here because
-          # a slow client can prevent us from accepting connections
-          # from other clients
-        end
-        sock
-      end
-    rescue Errno::ECONNRESET, Errno::ECONNABORTED,
-           Errno::EPROTO, Errno::EINVAL
-      nil
-    rescue StandardError => ex
-      msg = "#{ex.class}: #{ex.message}\n\t#{ex.backtrace[0]}"
-      @logger.error msg
-      nil
-    end
-
-    ##
-    # Starts a server thread for the client socket +sock+ that runs the given
-    # +block+.
-    #
-    # Sets the socket to the <code>:WEBrickSocket</code> thread local variable
-    # in the thread.
-    #
-    # If any errors occur in the block they are logged and handled.
-
-    def start_thread(sock, &block)
-      Thread.start{
-        begin
-          Thread.current[:WEBrickSocket] = sock
-          begin
-            addr = sock.peeraddr
-            @logger.debug "accept: #{addr[3]}:#{addr[1]}"
-          rescue SocketError
-            @logger.debug "accept: <address unknown>"
-            raise
-          end
-          if sock.respond_to?(:sync_close=) && @config[:SSLStartImmediately]
-            WEBrick::Utils.timeout(@config[:RequestTimeout]) do
-              begin
-                sock.accept # OpenSSL::SSL::SSLSocket#accept
-              rescue Errno::ECONNRESET, Errno::ECONNABORTED,
-                     Errno::EPROTO, Errno::EINVAL
-                Thread.exit
-              end
-            end
-          end
-          call_callback(:AcceptCallback, sock)
-          block ? block.call(sock) : run(sock)
-        rescue Errno::ENOTCONN
-          @logger.debug "Errno::ENOTCONN raised"
-        rescue ServerError => ex
-          msg = "#{ex.class}: #{ex.message}\n\t#{ex.backtrace[0]}"
-          @logger.error msg
-        rescue Exception => ex
-          @logger.error ex
-        ensure
-          @tokens.push(nil)
-          Thread.current[:WEBrickSocket] = nil
-          if addr
-            @logger.debug "close: #{addr[3]}:#{addr[1]}"
-          else
-            @logger.debug "close: <address unknown>"
-          end
-          sock.close
-        end
-      }
-    end
-
-    ##
-    # Calls the callback +callback_name+ from the configuration with +args+
-
-    def call_callback(callback_name, *args)
-      @config[callback_name]&.call(*args)
-    end
-
-    def setup_shutdown_pipe
-      return @shutdown_pipe ||= IO.pipe
-    end
-
-    def cleanup_shutdown_pipe(shutdown_pipe)
-      @shutdown_pipe = nil
-      shutdown_pipe&.each(&:close)
-    end
-
-    def alarm_shutdown_pipe
-      _, pipe = @shutdown_pipe # another thread may modify @shutdown_pipe.
-      if pipe
-        if !pipe.closed?
-          begin
-            yield pipe
-          rescue IOError # closed by another thread.
-          end
-        end
-      end
-    end
-
-    def cleanup_listener
-      @listeners.each{|s|
-        if @logger.debug?
-          addr = s.addr
-          @logger.debug("close TCPSocket(#{addr[2]}, #{addr[1]})")
-        end
-        begin
-          s.shutdown
-        rescue Errno::ENOTCONN
-          # when `Errno::ENOTCONN: Socket is not connected' on some platforms,
-          # call #close instead of #shutdown.
-          # (ignore @config[:ShutdownSocketWithoutClose])
-          s.close
-        else
-          unless @config[:ShutdownSocketWithoutClose]
-            s.close
-          end
-        end
-      }
-      @listeners.clear
-    end
-  end    # end of GenericServer
-end
diff --git a/tool/lib/webrick/ssl.rb b/tool/lib/webrick/ssl.rb
deleted file mode 100644
index e448095a12f6dd..00000000000000
--- a/tool/lib/webrick/ssl.rb
+++ /dev/null
@@ -1,215 +0,0 @@
-# frozen_string_literal: false
-#
-# ssl.rb -- SSL/TLS enhancement for GenericServer
-#
-# Copyright (c) 2003 GOTOU Yuuzou All rights reserved.
-#
-# $Id$
-
-require 'webrick'
-require 'openssl'
-
-module WEBrick
-  module Config
-    svrsoft = General[:ServerSoftware]
-    osslv = ::OpenSSL::OPENSSL_VERSION.split[1]
-
-    ##
-    # Default SSL server configuration.
-    #
-    # WEBrick can automatically create a self-signed certificate if
-    # <code>:SSLCertName</code> is set.  For more information on the various
-    # SSL options see OpenSSL::SSL::SSLContext.
-    #
-    # :ServerSoftware       ::
-    #   The server software name used in the Server: header.
-    # :SSLEnable            :: false,
-    #   Enable SSL for this server.  Defaults to false.
-    # :SSLCertificate       ::
-    #   The SSL certificate for the server.
-    # :SSLPrivateKey        ::
-    #   The SSL private key for the server certificate.
-    # :SSLClientCA          :: nil,
-    #   Array of certificates that will be sent to the client.
-    # :SSLExtraChainCert    :: nil,
-    #   Array of certificates that will be added to the certificate chain
-    # :SSLCACertificateFile :: nil,
-    #   Path to a CA certificate file
-    # :SSLCACertificatePath :: nil,
-    #   Path to a directory containing CA certificates
-    # :SSLCertificateStore  :: nil,
-    #   OpenSSL::X509::Store used for certificate validation of the client
-    # :SSLTmpDhCallback     :: nil,
-    #   Callback invoked when DH parameters are required.
-    # :SSLVerifyClient      ::
-    #   Sets whether the client is verified.  This defaults to VERIFY_NONE
-    #   which is typical for an HTTPS server.
-    # :SSLVerifyDepth       ::
-    #   Number of CA certificates to walk when verifying a certificate chain
-    # :SSLVerifyCallback    ::
-    #   Custom certificate verification callback
-    # :SSLServerNameCallback::
-    #   Custom servername indication callback
-    # :SSLTimeout           ::
-    #   Maximum session lifetime
-    # :SSLOptions           ::
-    #   Various SSL options
-    # :SSLCiphers           ::
-    #   Ciphers to be used
-    # :SSLStartImmediately  ::
-    #   Immediately start SSL upon connection?  Defaults to true
-    # :SSLCertName          ::
-    #   SSL certificate name.  Must be set to enable automatic certificate
-    #   creation.
-    # :SSLCertComment       ::
-    #   Comment used during automatic certificate creation.
-
-    SSL = {
-      :ServerSoftware       => "#{svrsoft} OpenSSL/#{osslv}",
-      :SSLEnable            => false,
-      :SSLCertificate       => nil,
-      :SSLPrivateKey        => nil,
-      :SSLClientCA          => nil,
-      :SSLExtraChainCert    => nil,
-      :SSLCACertificateFile => nil,
-      :SSLCACertificatePath => nil,
-      :SSLCertificateStore  => nil,
-      :SSLTmpDhCallback     => nil,
-      :SSLVerifyClient      => ::OpenSSL::SSL::VERIFY_NONE,
-      :SSLVerifyDepth       => nil,
-      :SSLVerifyCallback    => nil,   # custom verification
-      :SSLTimeout           => nil,
-      :SSLOptions           => nil,
-      :SSLCiphers           => nil,
-      :SSLStartImmediately  => true,
-      # Must specify if you use auto generated certificate.
-      :SSLCertName          => nil,
-      :SSLCertComment       => "Generated by Ruby/OpenSSL"
-    }
-    General.update(SSL)
-  end
-
-  module Utils
-    ##
-    # Creates a self-signed certificate with the given number of +bits+,
-    # the issuer +cn+ and a +comment+ to be stored in the certificate.
-
-    def create_self_signed_cert(bits, cn, comment)
-      rsa = OpenSSL::PKey::RSA.new(bits){|p, n|
-        case p
-        when 0; $stderr.putc "."  # BN_generate_prime
-        when 1; $stderr.putc "+"  # BN_generate_prime
-        when 2; $stderr.putc "*"  # searching good prime,
-                                  # n = #of try,
-                                  # but also data from BN_generate_prime
-        when 3; $stderr.putc "\n" # found good prime, n==0 - p, n==1 - q,
-                                  # but also data from BN_generate_prime
-        else;   $stderr.putc "*"  # BN_generate_prime
-        end
-      }
-      cert = OpenSSL::X509::Certificate.new
-      cert.version = 2
-      cert.serial = 1
-      name = (cn.kind_of? String) ? OpenSSL::X509::Name.parse(cn)
-                                  : OpenSSL::X509::Name.new(cn)
-      cert.subject = name
-      cert.issuer = name
-      cert.not_before = Time.now
-      cert.not_after = Time.now + (365*24*60*60)
-      cert.public_key = rsa.public_key
-
-      ef = OpenSSL::X509::ExtensionFactory.new(nil,cert)
-      ef.issuer_certificate = cert
-      cert.extensions = [
-        ef.create_extension("basicConstraints","CA:FALSE"),
-        ef.create_extension("keyUsage", "keyEncipherment, digitalSignature, keyAgreement, dataEncipherment"),
-        ef.create_extension("subjectKeyIdentifier", "hash"),
-        ef.create_extension("extendedKeyUsage", "serverAuth"),
-        ef.create_extension("nsComment", comment),
-      ]
-      aki = ef.create_extension("authorityKeyIdentifier",
-                                "keyid:always,issuer:always")
-      cert.add_extension(aki)
-      cert.sign(rsa, "SHA256")
-
-      return [ cert, rsa ]
-    end
-    module_function :create_self_signed_cert
-  end
-
-  ##
-  #--
-  # Updates WEBrick::GenericServer with SSL functionality
-
-  class GenericServer
-
-    ##
-    # SSL context for the server when run in SSL mode
-
-    def ssl_context # :nodoc:
-      @ssl_context ||= begin
-        if @config[:SSLEnable]
-          ssl_context = setup_ssl_context(@config)
-          @logger.info("\n" + @config[:SSLCertificate].to_text)
-          ssl_context
-        end
-      end
-    end
-
-    undef listen
-
-    ##
-    # Updates +listen+ to enable SSL when the SSL configuration is active.
-
-    def listen(address, port) # :nodoc:
-      listeners = Utils::create_listeners(address, port)
-      if @config[:SSLEnable]
-        listeners.collect!{|svr|
-          ssvr = ::OpenSSL::SSL::SSLServer.new(svr, ssl_context)
-          ssvr.start_immediately = @config[:SSLStartImmediately]
-          ssvr
-        }
-      end
-      @listeners += listeners
-      setup_shutdown_pipe
-    end
-
-    ##
-    # Sets up an SSL context for +config+
-
-    def setup_ssl_context(config) # :nodoc:
-      unless config[:SSLCertificate]
-        cn = config[:SSLCertName]
-        comment = config[:SSLCertComment]
-        cert, key = Utils::create_self_signed_cert(2048, cn, comment)
-        config[:SSLCertificate] = cert
-        config[:SSLPrivateKey] = key
-      end
-      ctx = OpenSSL::SSL::SSLContext.new
-      ctx.key = config[:SSLPrivateKey]
-      ctx.cert = config[:SSLCertificate]
-      ctx.client_ca = config[:SSLClientCA]
-      ctx.extra_chain_cert = config[:SSLExtraChainCert]
-      ctx.ca_file = config[:SSLCACertificateFile]
-      ctx.ca_path = config[:SSLCACertificatePath]
-      ctx.cert_store = config[:SSLCertificateStore]
-      ctx.tmp_dh_callback = config[:SSLTmpDhCallback]
-      ctx.verify_mode = config[:SSLVerifyClient]
-      ctx.verify_depth = config[:SSLVerifyDepth]
-      ctx.verify_callback = config[:SSLVerifyCallback]
-      ctx.servername_cb = config[:SSLServerNameCallback] || proc { |args| ssl_servername_callback(*args) }
-      ctx.timeout = config[:SSLTimeout]
-      ctx.options = config[:SSLOptions]
-      ctx.ciphers = config[:SSLCiphers]
-      ctx
-    end
-
-    ##
-    # ServerNameIndication callback
-
-    def ssl_servername_callback(sslsocket, hostname = nil)
-      # default
-    end
-
-  end
-end
diff --git a/tool/lib/webrick/utils.rb b/tool/lib/webrick/utils.rb
deleted file mode 100644
index a96d6f03fd0492..00000000000000
--- a/tool/lib/webrick/utils.rb
+++ /dev/null
@@ -1,265 +0,0 @@
-# frozen_string_literal: false
-#
-# utils.rb -- Miscellaneous utilities
-#
-# Author: IPR -- Internet Programming with Ruby -- writers
-# Copyright (c) 2001 TAKAHASHI Masayoshi, GOTOU Yuuzou
-# Copyright (c) 2002 Internet Programming with Ruby writers. All rights
-# reserved.
-#
-# $IPR: utils.rb,v 1.10 2003/02/16 22:22:54 gotoyuzo Exp $
-
-require 'socket'
-require 'io/nonblock'
-require 'etc'
-
-module WEBrick
-  module Utils
-    ##
-    # Sets IO operations on +io+ to be non-blocking
-    def set_non_blocking(io)
-      io.nonblock = true if io.respond_to?(:nonblock=)
-    end
-    module_function :set_non_blocking
-
-    ##
-    # Sets the close on exec flag for +io+
-    def set_close_on_exec(io)
-      io.close_on_exec = true if io.respond_to?(:close_on_exec=)
-    end
-    module_function :set_close_on_exec
-
-    ##
-    # Changes the process's uid and gid to the ones of +user+
-    def su(user)
-      if pw = Etc.getpwnam(user)
-        Process::initgroups(user, pw.gid)
-        Process::Sys::setgid(pw.gid)
-        Process::Sys::setuid(pw.uid)
-      else
-        warn("WEBrick::Utils::su doesn't work on this platform", uplevel: 1)
-      end
-    end
-    module_function :su
-
-    ##
-    # The server hostname
-    def getservername
-      Socket::gethostname
-    end
-    module_function :getservername
-
-    ##
-    # Creates TCP server sockets bound to +address+:+port+ and returns them.
-    #
-    # It will create IPV4 and IPV6 sockets on all interfaces.
-    def create_listeners(address, port)
-      unless port
-        raise ArgumentError, "must specify port"
-      end
-      sockets = Socket.tcp_server_sockets(address, port)
-      sockets = sockets.map {|s|
-        s.autoclose = false
-        ts = TCPServer.for_fd(s.fileno)
-        s.close
-        ts
-      }
-      return sockets
-    end
-    module_function :create_listeners
-
-    ##
-    # Characters used to generate random strings
-    RAND_CHARS = "ABCDEFGHIJKLMNOPQRSTUVWXYZ" +
-                 "0123456789" +
-                 "abcdefghijklmnopqrstuvwxyz"
-
-    ##
-    # Generates a random string of length +len+
-    def random_string(len)
-      rand_max = RAND_CHARS.bytesize
-      ret = ""
-      len.times{ ret << RAND_CHARS[rand(rand_max)] }
-      ret
-    end
-    module_function :random_string
-
-    ###########
-
-    require "timeout"
-    require "singleton"
-
-    ##
-    # Class used to manage timeout handlers across multiple threads.
-    #
-    # Timeout handlers should be managed by using the class methods which are
-    # synchronized.
-    #
-    #   id = TimeoutHandler.register(10, Timeout::Error)
-    #   begin
-    #     sleep 20
-    #     puts 'foo'
-    #   ensure
-    #     TimeoutHandler.cancel(id)
-    #   end
-    #
-    # will raise Timeout::Error
-    #
-    #   id = TimeoutHandler.register(10, Timeout::Error)
-    #   begin
-    #     sleep 5
-    #     puts 'foo'
-    #   ensure
-    #     TimeoutHandler.cancel(id)
-    #   end
-    #
-    # will print 'foo'
-    #
-    class TimeoutHandler
-      include Singleton
-
-      ##
-      # Mutex used to synchronize access across threads
-      TimeoutMutex = Thread::Mutex.new # :nodoc:
-
-      ##
-      # Registers a new timeout handler
-      #
-      # +time+:: Timeout in seconds
-      # +exception+:: Exception to raise when timeout elapsed
-      def TimeoutHandler.register(seconds, exception)
-        at = Process.clock_gettime(Process::CLOCK_MONOTONIC) + seconds
-        instance.register(Thread.current, at, exception)
-      end
-
-      ##
-      # Cancels the timeout handler +id+
-      def TimeoutHandler.cancel(id)
-        instance.cancel(Thread.current, id)
-      end
-
-      def self.terminate
-        instance.terminate
-      end
-
-      ##
-      # Creates a new TimeoutHandler.  You should use ::register and ::cancel
-      # instead of creating the timeout handler directly.
-      def initialize
-        TimeoutMutex.synchronize{
-          @timeout_info = Hash.new
-        }
-        @queue = Thread::Queue.new
-        @watcher = nil
-      end
-
-      # :nodoc:
-      private \
-        def watch
-          to_interrupt = []
-          while true
-            now = Process.clock_gettime(Process::CLOCK_MONOTONIC)
-            wakeup = nil
-            to_interrupt.clear
-            TimeoutMutex.synchronize{
-              @timeout_info.each {|thread, ary|
-                next unless ary
-                ary.each{|info|
-                  time, exception = *info
-                  if time < now
-                    to_interrupt.push [thread, info.object_id, exception]
-                  elsif !wakeup || time < wakeup
-                    wakeup = time
-                  end
-                }
-              }
-            }
-            to_interrupt.each {|arg| interrupt(*arg)}
-            if !wakeup
-              @queue.pop
-            elsif (wakeup -= now) > 0
-              begin
-                (th = Thread.start {@queue.pop}).join(wakeup)
-              ensure
-                th&.kill&.join
-              end
-            end
-            @queue.clear
-          end
-        end
-
-      # :nodoc:
-      private \
-        def watcher
-          (w = @watcher)&.alive? and return w # usual case
-          TimeoutMutex.synchronize{
-            (w = @watcher)&.alive? and next w # pathological check
-            @watcher = Thread.start(&method(:watch))
-          }
-        end
-
-      ##
-      # Interrupts the timeout handler +id+ and raises +exception+
-      def interrupt(thread, id, exception)
-        if cancel(thread, id) && thread.alive?
-          thread.raise(exception, "execution timeout")
-        end
-      end
-
-      ##
-      # Registers a new timeout handler
-      #
-      # +time+:: Timeout in seconds
-      # +exception+:: Exception to raise when timeout elapsed
-      def register(thread, time, exception)
-        info = nil
-        TimeoutMutex.synchronize{
-          (@timeout_info[thread] ||= []) << (info = [time, exception])
-        }
-        @queue.push nil
-        watcher
-        return info.object_id
-      end
-
-      ##
-      # Cancels the timeout handler +id+
-      def cancel(thread, id)
-        TimeoutMutex.synchronize{
-          if ary = @timeout_info[thread]
-            ary.delete_if{|info| info.object_id == id }
-            if ary.empty?
-              @timeout_info.delete(thread)
-            end
-            return true
-          end
-          return false
-        }
-      end
-
-      ##
-      def terminate
-        TimeoutMutex.synchronize{
-          @timeout_info.clear
-          @watcher&.kill&.join
-        }
-      end
-    end
-
-    ##
-    # Executes the passed block and raises +exception+ if execution takes more
-    # than +seconds+.
-    #
-    # If +seconds+ is zero or nil, simply executes the block
-    def timeout(seconds, exception=Timeout::Error)
-      return yield if seconds.nil? or seconds.zero?
-      # raise ThreadError, "timeout within critical session" if Thread.critical
-      id = TimeoutHandler.register(seconds, exception)
-      begin
-        yield(seconds)
-      ensure
-        TimeoutHandler.cancel(id)
-      end
-    end
-    module_function :timeout
-  end
-end
diff --git a/tool/lib/webrick/version.rb b/tool/lib/webrick/version.rb
deleted file mode 100644
index b62988bdbb5ec6..00000000000000
--- a/tool/lib/webrick/version.rb
+++ /dev/null
@@ -1,18 +0,0 @@
-# frozen_string_literal: false
-#--
-# version.rb -- version and release date
-#
-# Author: IPR -- Internet Programming with Ruby -- writers
-# Copyright (c) 2000 TAKAHASHI Masayoshi, GOTOU YUUZOU
-# Copyright (c) 2003 Internet Programming with Ruby writers. All rights
-# reserved.
-#
-# $IPR: version.rb,v 1.74 2003/07/22 19:20:43 gotoyuzo Exp $
-
-module WEBrick
-
-  ##
-  # The WEBrick version
-
-  VERSION      = "1.7.0"
-end
diff --git a/tool/ln_sr.rb b/tool/ln_sr.rb
index 2aa8391e17592f..e1b5b6f76b4436 100755
--- a/tool/ln_sr.rb
+++ b/tool/ln_sr.rb
@@ -96,7 +96,7 @@ def fu_clean_components(*comp)
     while c = comp.shift
       if c == ".." and clean.last != ".." and !(fu_have_symlink? && File.symlink?(path))
         clean.pop
-        path.chomp!(%r((?<=\A|/)[^/]+/\z), "")
+        path.sub!(%r((?<=\A|/)[^/]+/\z), "")
       else
         clean << c
         path << c << "/"
diff --git a/tool/lrama/LEGAL.md b/tool/lrama/LEGAL.md
index f708ae7a1c4d87..a3ef848514d3b0 100644
--- a/tool/lrama/LEGAL.md
+++ b/tool/lrama/LEGAL.md
@@ -7,5 +7,6 @@ mentioned below.
 
 These files are licensed under the GNU General Public License version 3 or later. See these files for more information.
 
+* template/bison/_yacc.h
 * template/bison/yacc.c
 * template/bison/yacc.h
diff --git a/tool/lrama/NEWS.md b/tool/lrama/NEWS.md
new file mode 100644
index 00000000000000..a535332ec37a32
--- /dev/null
+++ b/tool/lrama/NEWS.md
@@ -0,0 +1,697 @@
+# NEWS for Lrama
+
+## Lrama 0.7.0 (2025-01-21)
+
+## [EXPERIMENTAL] Support the generation of the IELR(1) parser described in this paper
+
+Support the generation of the IELR(1) parser described in this paper.
+https://www.sciencedirect.com/science/article/pii/S0167642309001191
+
+If you use IELR(1) parser, you can write the following directive in your grammar file.
+
+```yacc
+%define lr.type ielr
+```
+
+But, currently IELR(1) parser is experimental feature. If you find any bugs, please report it to us. Thank you.
+
+## Support `-t` option as same as `--debug` option
+
+Support to `-t` option as same as `--debug` option.
+These options align with Bison behavior. So same as `--debug` option.
+
+## Trace only explicit rules
+
+Support to trace only explicit rules.
+If you use `--trace=rules` option, it shows include mid-rule actions. If you want to show only explicit rules, you can use `--trace=only-explicit-rules` option.
+
+Example:
+
+```yacc
+%{
+%}
+%union {
+    int i;
+}
+%token <i> number
+%type <i> program
+%%
+program         : number { printf("%d", $1); } number { $$ = $1 + $3; }
+                ;
+%%
+```
+
+Result of `--trace=rules`:
+
+```console
+$ exe/lrama --trace=rules sample.y
+Grammar rules:
+$accept -> program YYEOF
+$@1 -> ε
+program -> number $@1 number
+```
+
+Result of `--trace=only-explicit-rules`:
+
+```console
+$ exe/lrama --trace=explicit-rules sample.y
+Grammar rules:
+$accept -> program YYEOF
+program -> number number
+```
+
+## Lrama 0.6.11 (2024-12-23)
+
+### Add support for %type declarations using %nterm in Nonterminal Symbols
+
+Allow to use `%nterm` in Nonterminal Symbols for `%type` declarations.
+
+```yacc
+%nterm <type> nonterminal…
+```
+
+This directive is also supported for compatibility with Bison, and only non-terminal symbols are allowed. In other words, definitions like the following will result in an error:
+
+```yacc
+%{
+// Prologue
+%}
+
+%token EOI 0 "EOI"
+%nterm EOI
+
+%%
+
+program: /* empty */
+        ;
+```
+
+It show an error message like the following:
+
+```command
+❯ exe/lrama nterm.y
+nterm.y:6:7: symbol EOI redeclared as a nonterminal
+%nterm EOI
+       ^^^
+```
+
+## Lrama 0.6.10 (2024-09-11)
+
+### Aliased Named References for actions of RHS in parameterizing rules
+
+Allow to use aliased named references for actions of RHS in parameterizing rules.
+
+```yacc
+%rule sum(X, Y): X[summand] '+' Y[addend] { $$ = $summand + $addend }
+               ;
+```
+
+https://github.com/ruby/lrama/pull/410
+
+
+### Named References for actions of RHS in parameterizing rules caller side
+
+Allow to use named references for actions of RHS in parameterizing rules caller side.
+
+```yacc
+opt_nl: '\n'?[nl] <str> { $$ = $nl; }
+      ;
+```
+
+https://github.com/ruby/lrama/pull/414
+
+### Widen the definable position of parameterizing rules
+
+Allow to define parameterizing rules in the middle of the grammar.
+
+```yacc
+%rule defined_option(X): /* empty */
+                       | X
+                       ;
+
+%%
+
+program         : defined_option(number) <i>
+                | defined_list(number) <i>
+                ;
+
+%rule defined_list(X): /* empty */  /* <--- here */
+                     | defined_list(X) number
+                     ;
+```
+
+https://github.com/ruby/lrama/pull/420
+
+### Report unused terminal symbols
+
+Support to report unused terminal symbols.
+Run `exe/lrama --report=terms` to show unused terminal symbols.
+
+```console
+$ exe/lrama --report=terms sample/calc.y
+ 11 Unused Terms
+     0 YYerror
+     1 YYUNDEF
+     2 '\\\\'
+     3 '\\13'
+     4 keyword_class2
+     5 tNUMBER
+     6 tPLUS
+     7 tMINUS
+     8 tEQ
+     9 tEQEQ
+    10 '>'
+```
+https://github.com/ruby/lrama/pull/439
+
+### Report unused rules
+
+Support to report unused rules.
+Run `exe/lrama --report=rules` to show unused rules.
+
+```console
+$ exe/lrama --report=rules sample/calc.y
+  3 Unused Rules
+     0 unused_option
+     1 unused_list
+     2 unused_nonempty_list
+```
+
+https://github.com/ruby/lrama/pull/441
+
+### Ensure compatibility with Bison for `%locations` directive
+
+Support `%locations` directive to ensure compatibility with Bison.
+Change to `%locations` directive not set by default.
+
+https://github.com/ruby/lrama/pull/446
+
+### Diagnostics report for parameterizing rules redefine
+
+Support to warning redefined parameterizing rules.
+Run `exe/lrama -W` or  `exe/lrama --warnings` to show redefined parameterizing rules.
+
+```console
+$ exe/lrama -W sample/calc.y
+parameterizing rule redefined: redefined_method(X)
+parameterizing rule redefined: redefined_method(X)
+```
+
+https://github.com/ruby/lrama/pull/448
+
+### Support `-v` and `--verbose` option
+
+Support to `-v` and `--verbose` option.
+These options align with Bison behavior. So same as '--report=state' option.
+
+https://github.com/ruby/lrama/pull/457
+
+## Lrama 0.6.9 (2024-05-02)
+
+### Callee side tag specification of parameterizing rules
+
+Allow to specify tag on callee side of parameterizing rules.
+
+```yacc
+%union {
+    int i;
+}
+
+%rule with_tag(X) <i>: X { $$ = $1; }
+                     ;
+```
+
+### Named References for actions of RHS in parameterizing rules
+
+Allow to use named references for actions of RHS in parameterizing rules.
+
+```yacc
+%rule option(number): /* empty */
+                    | number { $$ = $number; }
+                    ;
+```
+
+## Lrama 0.6.8 (2024-04-29)
+
+### Nested parameterizing rules with tag
+
+Allow to nested parameterizing rules with tag.
+
+```yacc
+%union {
+    int i;
+}
+
+%rule nested_nested_option(X): /* empty */
+                              | X
+                              ;
+
+%rule nested_option(X): /* empty */
+                       | nested_nested_option(X) <i>
+                       ;
+
+%rule option(Y): /* empty */
+               | nested_option(Y) <i>
+               ;
+```
+
+## Lrama 0.6.7 (2024-04-28)
+
+### RHS of user defined parameterizing rules contains `'symbol'?`, `'symbol'+` and `'symbol'*`.
+
+User can use `'symbol'?`, `'symbol'+` and `'symbol'*` in RHS of user defined parameterizing rules.
+
+```
+%rule with_word_seps(X): /* empty */
+                   | X ' '+
+                   ;
+```
+
+## Lrama 0.6.6 (2024-04-27)
+
+### Trace actions
+
+Support trace actions for debugging.
+Run `exe/lrama --trace=actions` to show grammar rules with actions.
+
+```console
+$ exe/lrama --trace=actions sample/calc.y
+Grammar rules with actions:
+$accept -> list, YYEOF {}
+list -> ε {}
+list -> list, LF {}
+list -> list, expr, LF { printf("=> %d\n", $2); }
+expr -> NUM {}
+expr -> expr, '+', expr { $$ = $1  +  $3; }
+expr -> expr, '-', expr { $$ = $1  -  $3; }
+expr -> expr, '*', expr { $$ = $1  *  $3; }
+expr -> expr, '/', expr { $$ = $1  /  $3; }
+expr -> '(', expr, ')' { $$ = $2; }
+```
+
+### Inlining
+
+Support inlining for rules.
+The `%inline` directive causes all references to symbols to be replaced with its definition.
+
+```yacc
+%rule %inline op: PLUS { + }
+                | TIMES { * }
+                ;
+
+%%
+
+expr : number { $$ = $1; }
+     | expr op expr { $$ = $1 $2 $3; }
+     ;
+```
+
+as same as
+
+```yacc
+expr : number { $$ = $1; }
+     | expr '+' expr { $$ = $1 + $3; }
+     | expr '*' expr { $$ = $1 * $3; }
+     ;
+```
+
+## Lrama 0.6.5 (2024-03-25)
+
+### Typed Midrule Actions
+
+User can specify the type of mid rule action by tag (`<bar>`) instead of specifying it with in an action.
+
+```yacc
+primary: k_case expr_value terms?
+           {
+               $<val>$ = p->case_labels;
+               p->case_labels = Qnil;
+           }
+         case_body
+         k_end
+           {
+             ...
+           }
+```
+
+can be written as
+
+```yacc
+primary: k_case expr_value terms?
+           {
+               $$ = p->case_labels;
+               p->case_labels = Qnil;
+           }<val>
+         case_body
+         k_end
+           {
+             ...
+           }
+```
+
+`%destructor` for midrule action is invoked only when tag is specified by Typed Midrule Actions.
+
+Difference from Bison's Typed Midrule Actions is that tag is postposed in Lrama however it's preposed in Bison.
+
+Bison supports this feature from 3.1.
+
+## Lrama 0.6.4 (2024-03-22)
+
+### Parameterizing rules (preceded, terminated, delimited)
+
+Support `preceded`, `terminated` and `delimited` rules.
+
+```text
+program: preceded(opening, X)
+
+// Expanded to
+
+program: preceded_opening_X
+preceded_opening_X: opening X
+```
+
+```
+program: terminated(X, closing)
+
+// Expanded to
+
+program: terminated_X_closing
+terminated_X_closing: X closing
+```
+
+```
+program: delimited(opening, X, closing)
+
+// Expanded to
+
+program: delimited_opening_X_closing
+delimited_opening_X_closing: opening X closing
+```
+
+https://github.com/ruby/lrama/pull/382
+
+### Support `%destructor` declaration
+
+User can set codes for freeing semantic value resources by using `%destructor`.
+In general, these resources are freed by actions or after parsing.
+However if syntax error happens in parsing, these codes may not be executed.
+Codes associated to `%destructor` are executed when semantic value is popped from the stack by an error.
+
+```yacc
+%token <val1> NUM
+%type <val2> expr2
+%type <val3> expr
+
+%destructor {
+    printf("destructor for val1: %d\n", $$);
+} <val1> // printer for TAG
+
+%destructor {
+    printf("destructor for val2: %d\n", $$);
+} <val2>
+
+%destructor {
+    printf("destructor for expr: %d\n", $$);
+} expr // printer for symbol
+```
+
+Bison supports this feature from 1.75b.
+
+https://github.com/ruby/lrama/pull/385
+
+## Lrama 0.6.3 (2024-02-15)
+
+### Bring Your Own Stack
+
+Provide functionalities for Bring Your Own Stack.
+
+Ruby’s Ripper library requires their own semantic value stack to manage Ruby Objects returned by user defined callback method. Currently Ripper uses semantic value stack (`yyvsa`) which is used by parser to manage Node. This hack introduces some limitation on Ripper. For example, Ripper can not execute semantic analysis depending on Node structure.
+
+Lrama introduces two features to support another semantic value stack by parser generator users.
+
+1. Callback entry points
+
+User can emulate semantic value stack by these callbacks.
+Lrama provides these five callbacks. Registered functions are called when each event happen. For example %after-shift function is called when shift happens on original semantic value stack.
+
+* `%after-shift` function_name
+* `%before-reduce` function_name
+* `%after-reduce` function_name
+* `%after-shift-error-token` function_name
+* `%after-pop-stack` function_name
+
+2. `$:n` variable to access index of each grammar symbols
+
+User also needs to access semantic value of their stack in grammar action. `$:n` provides the way to access to it. `$:n` is translated to the minus index from the top of the stack.
+For example
+
+```yacc
+primary: k_if expr_value then compstmt if_tail k_end
+          {
+          /*% ripper: if!($:2, $:4, $:5) %*/
+          /* $:2 = -5, $:4 = -3, $:5 = -2. */
+          }
+```
+
+https://github.com/ruby/lrama/pull/367
+
+## Lrama 0.6.2 (2024-01-27)
+
+### %no-stdlib directive
+
+If `%no-stdlib` directive is set, Lrama doesn't load Lrama standard library for
+parameterizing rules, stdlib.y.
+
+https://github.com/ruby/lrama/pull/344
+
+## Lrama 0.6.1 (2024-01-13)
+
+### Nested parameterizing rules
+
+Allow to pass an instantiated rule to other parameterizing rules.
+
+```yacc
+%rule constant(X) : X
+                  ;
+
+%rule option(Y) : /* empty */
+                | Y
+                ;
+
+%%
+
+program         : option(constant(number)) // Nested rule
+                ;
+%%
+```
+
+Allow to use nested parameterizing rules when define parameterizing rules.
+
+```yacc
+%rule option(x) : /* empty */
+                | X
+                ;
+
+%rule double(Y) : Y Y
+                ;
+
+%rule double_opt(A) : option(double(A)) // Nested rule
+                    ;
+
+%%
+
+program         : double_opt(number)
+                ;
+
+%%
+```
+
+https://github.com/ruby/lrama/pull/337
+
+## Lrama 0.6.0 (2023-12-25)
+
+### User defined parameterizing rules
+
+Allow to define parameterizing rule by `%rule` directive.
+
+```yacc
+%rule pair(X, Y): X Y { $$ = $1 + $2; }
+                ;
+
+%%
+
+program: stmt
+       ;
+
+stmt: pair(ODD, EVEN) <num>
+    | pair(EVEN, ODD) <num>
+    ;
+```
+
+https://github.com/ruby/lrama/pull/285
+
+## Lrama 0.5.11 (2023-12-02)
+
+### Type specification of parameterizing rules
+
+Allow to specify type of rules by specifying tag, `<i>` in below example.
+Tag is post-modification style.
+
+```yacc
+%union {
+    int i;
+}
+
+%%
+
+program         : option(number) <i>
+                | number_alias? <i>
+                ;
+```
+
+https://github.com/ruby/lrama/pull/272
+
+
+## Lrama 0.5.10 (2023-11-18)
+
+### Parameterizing rules (option, nonempty_list, list)
+
+Support function call style parameterizing rules for `option`, `nonempty_list` and `list`.
+
+https://github.com/ruby/lrama/pull/197
+
+### Parameterizing rules (separated_list)
+
+Support `separated_list` and `separated_nonempty_list` parameterizing rules.
+
+```text
+program: separated_list(',', number)
+
+// Expanded to
+
+program: separated_list_number
+separated_list_number: ε
+separated_list_number: separated_nonempty_list_number
+separated_nonempty_list_number: number
+separated_nonempty_list_number: separated_nonempty_list_number ',' number
+```
+
+```
+program: separated_nonempty_list(',', number)
+
+// Expanded to
+
+program: separated_nonempty_list_number
+separated_nonempty_list_number: number
+separated_nonempty_list_number: separated_nonempty_list_number ',' number
+```
+
+https://github.com/ruby/lrama/pull/204
+
+## Lrama 0.5.9 (2023-11-05)
+
+### Parameterizing rules (suffix)
+
+Parameterizing rules are template of rules.
+It's very common pattern to write "list" grammar rule like:
+
+```yacc
+opt_args: /* none */
+        | args
+        ;
+
+args: arg
+    | args arg
+```
+
+Lrama supports these suffixes:
+
+* `?`: option
+* `+`: nonempty list
+* `*`: list
+
+Idea of Parameterizing rules comes from Menhir LR(1) parser generator (https://gallium.inria.fr/~fpottier/menhir/manual.html#sec32).
+
+https://github.com/ruby/lrama/pull/181
+
+## Lrama 0.5.7 (2023-10-23)
+
+### Racc parser
+
+Replace Lrama's parser from hand written parser to LR parser generated by Racc.
+Lrama uses `--embedded` option to generate LR parser because Racc is changed from default gem to bundled gem by Ruby 3.3 (https://github.com/ruby/lrama/pull/132).
+
+https://github.com/ruby/lrama/pull/62
+
+## Lrama 0.5.4 (2023-08-17)
+
+### Runtime configuration for error recovery
+
+Make error recovery function configurable on runtime by two new macros.
+
+* `YYMAXREPAIR`: Expected to return max length of repair operations. `%parse-param` is passed to this function.
+* `YYERROR_RECOVERY_ENABLED`: Expected to return bool value to determine error recovery is enabled or not. `%parse-param` is passed to this function.
+
+https://github.com/ruby/lrama/pull/74
+
+## Lrama 0.5.3 (2023-08-05)
+
+### Error Recovery
+
+Support token insert base Error Recovery.
+`-e` option is needed to generate parser with error recovery functions.
+
+https://github.com/ruby/lrama/pull/44
+
+## Lrama 0.5.2 (2023-06-14)
+
+### Named References
+
+Instead of positional references like `$1` or `$$`,
+named references allow to access to symbol by name.
+
+```yacc
+primary: k_class cpath superclass bodystmt k_end
+           {
+             $primary = new_class($cpath, $bodystmt, $superclass);
+           }
+```
+
+Alias name can be declared.
+
+```yacc
+expr[result]: expr[ex-left] '+' expr[ex.right]
+                {
+                  $result = $[ex-left] + $[ex.right];
+                }
+```
+
+Bison supports this feature from 2.5.
+
+### Add parse params to some macros and functions
+
+`%parse-param` are added to these macros and functions to remove ytab.sed hack from Ruby.
+
+* `YY_LOCATION_PRINT`
+* `YY_SYMBOL_PRINT`
+* `yy_stack_print`
+* `YY_STACK_PRINT`
+* `YY_REDUCE_PRINT`
+* `yysyntax_error`
+
+https://github.com/ruby/lrama/pull/40
+
+See also: https://github.com/ruby/ruby/pull/7807
+
+## Lrama 0.5.0 (2023-05-17)
+
+### stdin mode
+
+When `-` is given as grammar file name, reads the grammar source from STDIN, and takes the next argument as the input file name. This mode helps pre-process a grammar source.
+
+https://github.com/ruby/lrama/pull/8
+
+## Lrama 0.4.0 (2023-05-13)
+
+This is the first version migrated to Ruby.
+This version generates "parse.c" compatible with Bison 3.8.2.
diff --git a/tool/lrama/exe/lrama b/tool/lrama/exe/lrama
index 5e1ee582cf5681..1aece5d1410125 100755
--- a/tool/lrama/exe/lrama
+++ b/tool/lrama/exe/lrama
@@ -1,6 +1,7 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
 $LOAD_PATH << File.join(__dir__, "../lib")
 require "lrama"
 
-Lrama::Command.new(ARGV.dup).run
+Lrama::Command.new.run(ARGV.dup)
diff --git a/tool/lrama/lib/lrama.rb b/tool/lrama/lib/lrama.rb
index 12e635d8b6ae73..fe2e05807c8994 100644
--- a/tool/lrama/lib/lrama.rb
+++ b/tool/lrama/lib/lrama.rb
@@ -1,16 +1,22 @@
-require "lrama/bitmap"
-require "lrama/command"
-require "lrama/context"
-require "lrama/counterexamples"
-require "lrama/digraph"
-require "lrama/grammar"
-require "lrama/lexer"
-require "lrama/output"
-require "lrama/parser"
-require "lrama/report"
-require "lrama/state"
-require "lrama/states"
-require "lrama/states_reporter"
-require "lrama/type"
-require "lrama/version"
-require "lrama/warning"
+# frozen_string_literal: true
+
+require_relative "lrama/bitmap"
+require_relative "lrama/command"
+require_relative "lrama/context"
+require_relative "lrama/counterexamples"
+require_relative "lrama/diagnostics"
+require_relative "lrama/digraph"
+require_relative "lrama/grammar"
+require_relative "lrama/grammar_validator"
+require_relative "lrama/lexer"
+require_relative "lrama/logger"
+require_relative "lrama/option_parser"
+require_relative "lrama/options"
+require_relative "lrama/output"
+require_relative "lrama/parser"
+require_relative "lrama/report"
+require_relative "lrama/state"
+require_relative "lrama/states"
+require_relative "lrama/states_reporter"
+require_relative "lrama/trace_reporter"
+require_relative "lrama/version"
diff --git a/tool/lrama/lib/lrama/bitmap.rb b/tool/lrama/lib/lrama/bitmap.rb
index 8349a23c344b1a..098c6e0b777a2c 100644
--- a/tool/lrama/lib/lrama/bitmap.rb
+++ b/tool/lrama/lib/lrama/bitmap.rb
@@ -1,5 +1,9 @@
+# rbs_inline: enabled
+# frozen_string_literal: true
+
 module Lrama
   module Bitmap
+    # @rbs (Array[Integer] ary) -> Integer
     def self.from_array(ary)
       bit = 0
 
@@ -10,8 +14,9 @@ def self.from_array(ary)
       bit
     end
 
+    # @rbs (Integer int) -> Array[Integer]
     def self.to_array(int)
-      a = []
+      a = [] #: Array[Integer]
       i = 0
 
       while int > 0 do
diff --git a/tool/lrama/lib/lrama/command.rb b/tool/lrama/lib/lrama/command.rb
index 45670ae405c0c6..3ff39d578d0319 100644
--- a/tool/lrama/lib/lrama/command.rb
+++ b/tool/lrama/lib/lrama/command.rb
@@ -1,162 +1,68 @@
-require 'optparse'
+# frozen_string_literal: true
 
 module Lrama
   class Command
-    def initialize(argv)
-      @argv = argv
-
-      @skeleton = "bison/yacc.c"
-      @header = false
-      @header_file = nil
-      @report = []
-      @report_file = nil
-      @outfile = "y.tab.c"
-      @trace = []
-      @error_recovery = false
-      @grammar_file = nil
-      @report_file = nil
-      @trace_opts = nil
-      @report_opts = nil
-    end
-
-    def run
-      parse_option
+    LRAMA_LIB = File.realpath(File.join(File.dirname(__FILE__)))
+    STDLIB_FILE_PATH = File.join(LRAMA_LIB, 'grammar', 'stdlib.y')
+
+    def run(argv)
+      begin
+        options = OptionParser.new.parse(argv)
+      rescue => e
+        message = e.message
+        message = message.gsub(/.+/, "\e[1m\\&\e[m") if Exception.to_tty?
+        abort message
+      end
 
-      Report::Duration.enable if @trace_opts[:time]
+      Report::Duration.enable if options.trace_opts[:time]
 
-      warning = Lrama::Warning.new
-      grammar = Lrama::Parser.new(@y.read).parse
-      @y.close if @y != STDIN
-      states = Lrama::States.new(grammar, warning, trace_state: (@trace_opts[:automaton] || @trace_opts[:closure]))
+      text = options.y.read
+      options.y.close if options.y != STDIN
+      begin
+        grammar = Lrama::Parser.new(text, options.grammar_file, options.debug, options.define).parse
+        unless grammar.no_stdlib
+          stdlib_grammar = Lrama::Parser.new(File.read(STDLIB_FILE_PATH), STDLIB_FILE_PATH, options.debug).parse
+          grammar.insert_before_parameterizing_rules(stdlib_grammar.parameterizing_rules)
+        end
+        grammar.prepare
+        grammar.validate!
+      rescue => e
+        raise e if options.debug
+        message = e.message
+        message = message.gsub(/.+/, "\e[1m\\&\e[m") if Exception.to_tty?
+        abort message
+      end
+      states = Lrama::States.new(grammar, trace_state: (options.trace_opts[:automaton] || options.trace_opts[:closure]))
       states.compute
+      states.compute_ielr if grammar.ielr_defined?
       context = Lrama::Context.new(states)
 
-      if @report_file
+      if options.report_file
         reporter = Lrama::StatesReporter.new(states)
-        File.open(@report_file, "w+") do |f|
-          reporter.report(f, **@report_opts)
+        File.open(options.report_file, "w+") do |f|
+          reporter.report(f, **options.report_opts)
         end
       end
 
-      File.open(@outfile, "w+") do |f|
+      reporter = Lrama::TraceReporter.new(grammar)
+      reporter.report(**options.trace_opts)
+
+      File.open(options.outfile, "w+") do |f|
         Lrama::Output.new(
           out: f,
-          output_file_path: @outfile,
-          template_name: @skeleton,
-          grammar_file_path: @grammar_file,
-          header_file_path: @header_file,
+          output_file_path: options.outfile,
+          template_name: options.skeleton,
+          grammar_file_path: options.grammar_file,
+          header_file_path: options.header_file,
           context: context,
           grammar: grammar,
-          error_recovery: @error_recovery,
+          error_recovery: options.error_recovery,
         ).render
       end
 
-      if warning.has_error?
-        exit 1
-      end
-    end
-
-    private
-
-    def validate_report(report)
-      bison_list = %w[states itemsets lookaheads solved counterexamples cex all none]
-      others = %w[verbose]
-      list = bison_list + others
-      not_supported = %w[cex none]
-      h = { grammar: true }
-
-      report.each do |r|
-        if list.include?(r) && !not_supported.include?(r)
-          h[r.to_sym] = true
-        else
-          raise "Invalid report option \"#{r}\"."
-        end
-      end
-
-      if h[:all]
-        (bison_list - not_supported).each do |r|
-          h[r.to_sym] = true
-        end
-
-        h.delete(:all)
-      end
-
-      return h
-    end
-
-    def validate_trace(trace)
-      list = %w[
-        none locations scan parse automaton bitsets
-        closure grammar resource sets muscles tools
-        m4-early m4 skeleton time ielr cex all
-      ]
-      h = {}
-
-      trace.each do |t|
-        if list.include?(t)
-          h[t.to_sym] = true
-        else
-          raise "Invalid trace option \"#{t}\"."
-        end
-      end
-
-      return h
-    end
-
-    def parse_option
-      opt = OptionParser.new
-
-      # opt.on('-h') {|v| p v }
-      opt.on('-V', '--version') {|v| puts "lrama #{Lrama::VERSION}"; exit 0 }
-
-      # Tuning the Parser
-      opt.on('-S', '--skeleton=FILE') {|v| @skeleton = v }
-      opt.on('-t') {  } # Do nothing
-
-      # Output Files:
-      opt.on('-h', '--header=[FILE]') {|v| @header = true; @header_file = v }
-      opt.on('-d') { @header = true }
-      opt.on('-r', '--report=THINGS', Array) {|v| @report = v }
-      opt.on('--report-file=FILE')    {|v| @report_file = v }
-      opt.on('-v') {  } # Do nothing
-      opt.on('-o', '--output=FILE')   {|v| @outfile = v }
-
-      # Hidden
-      opt.on('--trace=THINGS', Array) {|v| @trace = v }
-
-      # Error Recovery
-      opt.on('-e') {|v| @error_recovery = true }
-
-      opt.parse!(@argv)
-
-      @trace_opts = validate_trace(@trace)
-      @report_opts = validate_report(@report)
-
-      @grammar_file = @argv.shift
-
-      if !@grammar_file
-        abort "File should be specified\n"
-      end
-
-      if @grammar_file == '-'
-        @grammar_file = @argv.shift or abort "File name for STDIN should be specified\n"
-        @y = STDIN
-      else
-        @y = File.open(@grammar_file, 'r')
-      end
-
-      if !@report.empty? && @report_file.nil? && @grammar_file
-        @report_file = File.dirname(@grammar_file) + "/" + File.basename(@grammar_file, ".*") + ".output"
-      end
-
-      if !@header_file && @header
-        case
-        when @outfile
-          @header_file = File.dirname(@outfile) + "/" + File.basename(@outfile, ".*") + ".h"
-        when @grammar_file
-          @header_file = File.dirname(@grammar_file) + "/" + File.basename(@grammar_file, ".*") + ".h"
-        end
-      end
+      logger = Lrama::Logger.new
+      exit false unless Lrama::GrammarValidator.new(grammar, states, logger).valid?
+      Lrama::Diagnostics.new(grammar, states, logger).run(options.diagnostic)
     end
   end
 end
diff --git a/tool/lrama/lib/lrama/context.rb b/tool/lrama/lib/lrama/context.rb
index da70bf15422990..9f406f8de0bc65 100644
--- a/tool/lrama/lib/lrama/context.rb
+++ b/tool/lrama/lib/lrama/context.rb
@@ -1,4 +1,6 @@
-require "lrama/report/duration"
+# frozen_string_literal: true
+
+require_relative "report/duration"
 
 module Lrama
   # This is passed to a template
@@ -9,7 +11,7 @@ class Context
     BaseMin = -Float::INFINITY
 
     # TODO: It might be better to pass `states` to Output directly?
-    attr_reader :states
+    attr_reader :states, :yylast, :yypact_ninf, :yytable_ninf, :yydefact, :yydefgoto
 
     def initialize(states)
       @states = states
@@ -41,15 +43,11 @@ def yysymbol_kind_t
     def yyfinal
       @states.states.find do |state|
         state.items.find do |item|
-          item.rule.lhs.id.s_value == "$accept" && item.end_of_rule?
+          item.lhs.accept_symbol? && item.end_of_rule?
         end
       end.id
     end
 
-    def yylast
-      @yylast
-    end
-
     # Number of terms
     def yyntokens
       @states.terms.count
@@ -119,30 +117,14 @@ def yytname
       end
     end
 
-    def yypact_ninf
-      @yypact_ninf
-    end
-
-    def yytable_ninf
-      @yytable_ninf
-    end
-
     def yypact
       @base[0...yynstates]
     end
 
-    def yydefact
-      @yydefact
-    end
-
     def yypgoto
       @base[yynstates..-1]
     end
 
-    def yydefgoto
-      @yydefgoto
-    end
-
     def yytable
       @table
     end
@@ -170,7 +152,7 @@ def yyr1
       return a
     end
 
-    # Mapping from rule number to lenght of RHS.
+    # Mapping from rule number to length of RHS.
     # Dummy rule is appended as the first element whose value is 0
     # because 0 means error in yydefact.
     def yyr2
@@ -214,7 +196,7 @@ def rule_id_to_action_number(rule_id)
       (rule_id + 1) * -1
     end
 
-    # Symbol number is assinged to term first then nterm.
+    # Symbol number is assigned to term first then nterm.
     # This method calculates sequence_number for nterm.
     def nterm_number_to_sequence_number(nterm_number)
       nterm_number - @states.terms.count
@@ -241,7 +223,7 @@ def compute_yydefact
 
         if state.reduces.map(&:selected_look_ahead).any? {|la| !la.empty? }
           # Iterate reduces with reverse order so that first rule is used.
-          state.reduces.reverse.each do |reduce|
+          state.reduces.reverse_each do |reduce|
             reduce.look_ahead.each do |term|
               actions[term.number] = rule_id_to_action_number(reduce.rule.id)
             end
@@ -259,7 +241,7 @@ def compute_yydefact
           actions[conflict.symbol.number] = ErrorActionNumber
         end
 
-        # If default_reduction_rule, replase default_reduction_rule in
+        # If default_reduction_rule, replace default_reduction_rule in
         # actions with zero.
         if state.default_reduction_rule
           actions.map! do |e|
@@ -272,8 +254,8 @@ def compute_yydefact
         end
 
         # If no default_reduction_rule, default behavior is an
-        # error then replase ErrorActionNumber with zero.
-        if !state.default_reduction_rule
+        # error then replace ErrorActionNumber with zero.
+        unless state.default_reduction_rule
           actions.map! do |e|
             if e == ErrorActionNumber
               0
@@ -285,9 +267,9 @@ def compute_yydefact
 
         s = actions.each_with_index.map do |n, i|
           [i, n]
-        end.select do |i, n|
+        end.reject do |i, n|
           # Remove default_reduction_rule entries
-          n != 0
+          n == 0
         end
 
         if s.count != 0
@@ -309,10 +291,8 @@ def compute_yydefgoto
       # Index is sequence number of nterm, value is state id
       # of a default nterm transition destination.
       @yydefgoto = Array.new(@states.nterms.count, 0)
-      h = {}
       # Mapping from nterm to next_states
       nterm_to_next_states = {}
-      terms_count = @states.terms.count
 
       @states.states.each do |state|
         state.nterm_transitions.each do |shift, next_state|
@@ -323,10 +303,7 @@ def compute_yydefgoto
       end
 
       @states.nterms.each do |nterm|
-        if !(states = nterm_to_next_states[nterm])
-          default_goto = 0
-          not_default_gotos = []
-        else
+        if (states = nterm_to_next_states[nterm])
           default_state = states.map(&:last).group_by {|s| s }.max_by {|_, v| v.count }.first
           default_goto = default_state.id
           not_default_gotos = []
@@ -334,6 +311,9 @@ def compute_yydefgoto
             next if to_state.id == default_goto
             not_default_gotos << [from_state.id, to_state.id]
           end
+        else
+          default_goto = 0
+          not_default_gotos = []
         end
 
         k = nterm_number_to_sequence_number(nterm.number)
@@ -369,7 +349,7 @@ def sort_actions
         end
 
         j = @sorted_actions.count - 1
-        state_id, froms_and_tos, count, width = action
+        _state_id, _froms_and_tos, count, width = action
 
         while (j >= 0) do
           case
@@ -425,7 +405,7 @@ def compute_packed_table
       @check = []
       # Key is froms_and_tos, value is index position
       pushed = {}
-      userd_res = {}
+      used_res = {}
       lowzero = 0
       high = 0
 
@@ -450,7 +430,7 @@ def compute_packed_table
             end
           end
 
-          if ok && userd_res[res]
+          if ok && used_res[res]
             ok = false
           end
 
@@ -478,13 +458,13 @@ def compute_packed_table
 
         @base[state_id] = res
         pushed[froms_and_tos] = res
-        userd_res[res] = true
+        used_res[res] = true
       end
 
       @yylast = high
 
       # replace_ninf
-      @yypact_ninf = (@base.select {|i| i != BaseMin } + [0]).min - 1
+      @yypact_ninf = (@base.reject {|i| i == BaseMin } + [0]).min - 1
       @base.map! do |i|
         case i
         when BaseMin
@@ -494,7 +474,7 @@ def compute_packed_table
         end
       end
 
-      @yytable_ninf = (@table.compact.select {|i| i != ErrorActionNumber } + [0]).min - 1
+      @yytable_ninf = (@table.compact.reject {|i| i == ErrorActionNumber } + [0]).min - 1
       @table.map! do |i|
         case i
         when nil
diff --git a/tool/lrama/lib/lrama/counterexamples.rb b/tool/lrama/lib/lrama/counterexamples.rb
index 5019257dc3421a..ee2b5d5959539d 100644
--- a/tool/lrama/lib/lrama/counterexamples.rb
+++ b/tool/lrama/lib/lrama/counterexamples.rb
@@ -1,10 +1,15 @@
+# frozen_string_literal: true
+
 require "set"
 
-require "lrama/counterexamples/derivation"
-require "lrama/counterexamples/example"
-require "lrama/counterexamples/path"
-require "lrama/counterexamples/state_item"
-require "lrama/counterexamples/triple"
+require_relative "counterexamples/derivation"
+require_relative "counterexamples/example"
+require_relative "counterexamples/path"
+require_relative "counterexamples/production_path"
+require_relative "counterexamples/start_path"
+require_relative "counterexamples/state_item"
+require_relative "counterexamples/transition_path"
+require_relative "counterexamples/triple"
 
 module Lrama
   # See: https://www.cs.cornell.edu/andru/papers/cupex/cupex.pdf
@@ -27,8 +32,10 @@ def compute(conflict_state)
       conflict_state.conflicts.flat_map do |conflict|
         case conflict.type
         when :shift_reduce
+          # @type var conflict: State::ShiftReduceConflict
           shift_reduce_example(conflict_state, conflict)
         when :reduce_reduce
+          # @type var conflict: State::ReduceReduceConflict
           reduce_reduce_examples(conflict_state, conflict)
         end
       end.compact
@@ -43,7 +50,7 @@ def setup_transitions
       @reverse_transitions = {}
 
       @states.states.each do |src_state|
-        trans = {}
+        trans = {} #: Hash[Grammar::Symbol, State]
 
         src_state.transitions.each do |shift, next_state|
           trans[shift.next_sym] = next_state
@@ -61,6 +68,7 @@ def setup_transitions
 
             @transitions[[src_state_item, sym]] = dest_state_item
 
+            # @type var key: [StateItem, Grammar::Symbol]
             key = [dest_state_item, sym]
             @reverse_transitions[key] ||= Set.new
             @reverse_transitions[key] << src_state_item
@@ -77,7 +85,7 @@ def setup_productions
 
       @states.states.each do |state|
         # LHS => Set(Item)
-        h = {}
+        h = {} #: Hash[Grammar::Symbol, Set[States::Item]]
 
         state.closure.each do |item|
           sym = item.lhs
@@ -92,6 +100,7 @@ def setup_productions
 
           sym = item.next_sym
           state_item = StateItem.new(state, item)
+          # @type var key: [State, Grammar::Symbol]
           key = [state, sym]
 
           @productions[state_item] = h[sym]
@@ -104,6 +113,7 @@ def setup_productions
 
     def shift_reduce_example(conflict_state, conflict)
       conflict_symbol = conflict.symbols.first
+      # @type var shift_conflict_item: ::Lrama::States::Item
       shift_conflict_item = conflict_state.items.find { |item| item.next_sym == conflict_symbol }
       path2 = shortest_path(conflict_state, conflict.reduce.item, conflict_symbol)
       path1 = find_shift_conflict_shortest_path(path2, conflict_state, shift_conflict_item)
@@ -148,12 +158,14 @@ def find_shift_conflict_shortest_state_items(reduce_path, conflict_state, confli
         prev_state_item = prev_path&.to
 
         if target_state_item == state_item || target_state_item.item.start_item?
-          result.concat(reversed_reduce_path[_j..-1].map(&:to))
+          result.concat(
+            reversed_reduce_path[_j..-1] #: Array[StartPath|TransitionPath|ProductionPath]
+              .map(&:to))
           break
         end
 
         if target_state_item.item.beginning_of_rule?
-          queue = []
+          queue = [] #: Array[Array[StateItem]]
           queue << [target_state_item]
 
           # Find reverse production
@@ -168,10 +180,18 @@ def find_shift_conflict_shortest_state_items(reduce_path, conflict_state, confli
               break
             end
 
-            if !si.item.beginning_of_rule?
+            if si.item.beginning_of_rule?
+              # @type var key: [State, Grammar::Symbol]
+              key = [si.state, si.item.lhs]
+              @reverse_productions[key].each do |item|
+                state_item = StateItem.new(si.state, item)
+                queue << (sis + [state_item])
+              end
+            else
+              # @type var key: [StateItem, Grammar::Symbol]
               key = [si, si.item.previous_sym]
               @reverse_transitions[key].each do |prev_target_state_item|
-                next if prev_target_state_item.state != prev_state_item.state
+                next if prev_target_state_item.state != prev_state_item&.state
                 sis.shift
                 result.concat(sis)
                 result << prev_target_state_item
@@ -180,19 +200,14 @@ def find_shift_conflict_shortest_state_items(reduce_path, conflict_state, confli
                 queue.clear
                 break
               end
-            else
-              key = [si.state, si.item.lhs]
-              @reverse_productions[key].each do |item|
-                state_item = StateItem.new(si.state, item)
-                queue << (sis + [state_item])
-              end
             end
           end
         else
           # Find reverse transition
+          # @type var key: [StateItem, Grammar::Symbol]
           key = [target_state_item, target_state_item.item.previous_sym]
           @reverse_transitions[key].each do |prev_target_state_item|
-            next if prev_target_state_item.state != prev_state_item.state
+            next if prev_target_state_item.state != prev_state_item&.state
             result << prev_target_state_item
             target_state_item = prev_target_state_item
             i = j
@@ -219,9 +234,9 @@ def build_paths_from_state_items(state_items)
 
     def shortest_path(conflict_state, conflict_reduce_item, conflict_term)
       # queue: is an array of [Triple, [Path]]
-      queue = []
-      visited = {}
-      start_state = @states.states.first
+      queue = [] #: Array[[Triple, Array[StartPath|TransitionPath|ProductionPath]]]
+      visited = {} #: Hash[Triple, true]
+      start_state = @states.states.first #: Lrama::State
       raise "BUG: Start state should be just one kernel." if start_state.kernels.count != 1
 
       start = Triple.new(start_state, start_state.kernels.first, Set.new([@states.eof_symbol]))
diff --git a/tool/lrama/lib/lrama/counterexamples/derivation.rb b/tool/lrama/lib/lrama/counterexamples/derivation.rb
index 691e9353563aa4..368d7f1032f92d 100644
--- a/tool/lrama/lib/lrama/counterexamples/derivation.rb
+++ b/tool/lrama/lib/lrama/counterexamples/derivation.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Lrama
   class Counterexamples
     class Derivation
@@ -16,7 +18,7 @@ def to_s
       alias :inspect :to_s
 
       def render_strings_for_report
-        result = []
+        result = [] #: Array[String]
         _render_for_report(self, 0, result, 0)
         result.map(&:rstrip)
       end
@@ -42,18 +44,19 @@ def _render_for_report(derivation, offset, strings, index)
           str << "#{item.next_sym.display_name}"
           length = _render_for_report(derivation.left, len, strings, index + 1)
           # I want String#ljust!
-          str << " " * (length - str.length)
+          str << " " * (length - str.length) if length > str.length
         else
           str << " • #{item.symbols_after_dot.map(&:display_name).join(" ")} "
           return str.length
         end
 
         if derivation.right&.left
-          length = _render_for_report(derivation.right.left, str.length, strings, index + 1)
-          str << "#{item.symbols_after_dot[1..-1].map(&:display_name).join(" ")} "
+          left = derivation.right&.left #: Derivation
+          length = _render_for_report(left, str.length, strings, index + 1)
+          str << "#{item.symbols_after_dot[1..-1].map(&:display_name).join(" ")} " # steep:ignore
           str << " " * (length - str.length) if length > str.length
         elsif item.next_next_sym
-          str << "#{item.symbols_after_dot[1..-1].map(&:display_name).join(" ")} "
+          str << "#{item.symbols_after_dot[1..-1].map(&:display_name).join(" ")} " # steep:ignore
         end
 
         return str.length
diff --git a/tool/lrama/lib/lrama/counterexamples/example.rb b/tool/lrama/lib/lrama/counterexamples/example.rb
index 8f02d71fa45e0c..bb08428fcd8f11 100644
--- a/tool/lrama/lib/lrama/counterexamples/example.rb
+++ b/tool/lrama/lib/lrama/counterexamples/example.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Lrama
   class Counterexamples
     class Example
@@ -36,11 +38,12 @@ def derivations2
       private
 
       def _derivations(paths)
-        derivation = nil
+        derivation = nil #: Derivation
         current = :production
-        lookahead_sym = paths.last.to.item.end_of_rule? ? @conflict_symbol : nil
+        last_path = paths.last #: Path
+        lookahead_sym = last_path.to.item.end_of_rule? ? @conflict_symbol : nil
 
-        paths.reverse.each do |path|
+        paths.reverse_each do |path|
           item = path.to.item
 
           case current
@@ -55,12 +58,14 @@ def _derivations(paths)
             when ProductionPath
               derivation = Derivation.new(item, derivation)
               current = :production
+            else
+              raise "Unexpected. #{path}"
             end
 
             if lookahead_sym && item.next_next_sym && item.next_next_sym.first_set.include?(lookahead_sym)
               state_item = @counterexamples.transitions[[path.to, item.next_sym]]
               derivation2 = find_derivation_for_symbol(state_item, lookahead_sym)
-              derivation.right = derivation2
+              derivation.right = derivation2 # steep:ignore
               lookahead_sym = nil
             end
 
@@ -87,7 +92,7 @@ def _derivations(paths)
       end
 
       def find_derivation_for_symbol(state_item, sym)
-        queue = []
+        queue = [] #: Array[Array[StateItem]]
         queue << [state_item]
 
         while (sis = queue.shift)
@@ -97,7 +102,7 @@ def find_derivation_for_symbol(state_item, sym)
           if next_sym == sym
             derivation = nil
 
-            sis.reverse.each do |si|
+            sis.reverse_each do |si|
               derivation = Derivation.new(si.item, derivation)
             end
 
diff --git a/tool/lrama/lib/lrama/counterexamples/path.rb b/tool/lrama/lib/lrama/counterexamples/path.rb
index a4caecd765b14c..0a5823dd21690d 100644
--- a/tool/lrama/lib/lrama/counterexamples/path.rb
+++ b/tool/lrama/lib/lrama/counterexamples/path.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Lrama
   class Counterexamples
     class Path
@@ -18,51 +20,9 @@ def to_s
         "#<Path(#{type})>"
       end
       alias :inspect :to_s
-    end
-
-    class StartPath < Path
-      def initialize(to_state_item)
-        super nil, to_state_item
-      end
-
-      def type
-        :start
-      end
-
-      def transition?
-        false
-      end
-
-      def production?
-        false
-      end
-    end
 
-    class TransitionPath < Path
       def type
-        :transition
-      end
-
-      def transition?
-        true
-      end
-
-      def production?
-        false
-      end
-    end
-
-    class ProductionPath < Path
-      def type
-        :production
-      end
-
-      def transition?
-        false
-      end
-
-      def production?
-        true
+        raise NotImplementedError
       end
     end
   end
diff --git a/tool/lrama/lib/lrama/counterexamples/production_path.rb b/tool/lrama/lib/lrama/counterexamples/production_path.rb
new file mode 100644
index 00000000000000..0a230c7fce72fd
--- /dev/null
+++ b/tool/lrama/lib/lrama/counterexamples/production_path.rb
@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+module Lrama
+  class Counterexamples
+    class ProductionPath < Path
+      def type
+        :production
+      end
+
+      def transition?
+        false
+      end
+
+      def production?
+        true
+      end
+    end
+  end
+end
diff --git a/tool/lrama/lib/lrama/counterexamples/start_path.rb b/tool/lrama/lib/lrama/counterexamples/start_path.rb
new file mode 100644
index 00000000000000..c0351c8248972a
--- /dev/null
+++ b/tool/lrama/lib/lrama/counterexamples/start_path.rb
@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+module Lrama
+  class Counterexamples
+    class StartPath < Path
+      def initialize(to_state_item)
+        super nil, to_state_item
+      end
+
+      def type
+        :start
+      end
+
+      def transition?
+        false
+      end
+
+      def production?
+        false
+      end
+    end
+  end
+end
diff --git a/tool/lrama/lib/lrama/counterexamples/state_item.rb b/tool/lrama/lib/lrama/counterexamples/state_item.rb
index 930ff4a5f86493..c919818324c2f4 100644
--- a/tool/lrama/lib/lrama/counterexamples/state_item.rb
+++ b/tool/lrama/lib/lrama/counterexamples/state_item.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Lrama
   class Counterexamples
     class StateItem < Struct.new(:state, :item)
diff --git a/tool/lrama/lib/lrama/counterexamples/transition_path.rb b/tool/lrama/lib/lrama/counterexamples/transition_path.rb
new file mode 100644
index 00000000000000..47bfbc4f98d15d
--- /dev/null
+++ b/tool/lrama/lib/lrama/counterexamples/transition_path.rb
@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+module Lrama
+  class Counterexamples
+    class TransitionPath < Path
+      def type
+        :transition
+      end
+
+      def transition?
+        true
+      end
+
+      def production?
+        false
+      end
+    end
+  end
+end
diff --git a/tool/lrama/lib/lrama/counterexamples/triple.rb b/tool/lrama/lib/lrama/counterexamples/triple.rb
index e802beccf4cffc..64014ee223521b 100644
--- a/tool/lrama/lib/lrama/counterexamples/triple.rb
+++ b/tool/lrama/lib/lrama/counterexamples/triple.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Lrama
   class Counterexamples
     # s: state
diff --git a/tool/lrama/lib/lrama/diagnostics.rb b/tool/lrama/lib/lrama/diagnostics.rb
new file mode 100644
index 00000000000000..e9da398c89c9c6
--- /dev/null
+++ b/tool/lrama/lib/lrama/diagnostics.rb
@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+
+module Lrama
+  class Diagnostics
+    def initialize(grammar, states, logger)
+      @grammar = grammar
+      @states = states
+      @logger = logger
+    end
+
+    def run(diagnostic)
+      if diagnostic
+        diagnose_conflict
+        diagnose_parameterizing_redefined
+      end
+    end
+
+    private
+
+    def diagnose_conflict
+      if @states.sr_conflicts_count != 0
+        @logger.warn("shift/reduce conflicts: #{@states.sr_conflicts_count} found")
+      end
+
+      if  @states.rr_conflicts_count != 0
+        @logger.warn("reduce/reduce conflicts: #{@states.rr_conflicts_count} found")
+      end
+    end
+
+    def diagnose_parameterizing_redefined
+      @grammar.parameterizing_rule_resolver.redefined_rules.each do |rule|
+        @logger.warn("parameterizing rule redefined: #{rule}")
+      end
+    end
+  end
+end
diff --git a/tool/lrama/lib/lrama/digraph.rb b/tool/lrama/lib/lrama/digraph.rb
index c48b3f40413a2c..2161f304743cf6 100644
--- a/tool/lrama/lib/lrama/digraph.rb
+++ b/tool/lrama/lib/lrama/digraph.rb
@@ -1,21 +1,52 @@
+# rbs_inline: enabled
+# frozen_string_literal: true
+
 module Lrama
   # Algorithm Digraph of https://dl.acm.org/doi/pdf/10.1145/69622.357187 (P. 625)
+  #
+  # @rbs generic X < Object -- Type of a member of `sets`
+  # @rbs generic Y < _Or    -- Type of sets assigned to a member of `sets`
   class Digraph
+    # TODO: rbs-inline 0.10.0 doesn't support instance variables.
+    #       Move these type declarations above instance variable definitions, once it's supported.
+    #
+    # @rbs!
+    #   interface _Or
+    #     def |: (self) -> self
+    #   end
+    #   @sets: Array[X]
+    #   @relation: Hash[X, Array[X]]
+    #   @base_function: Hash[X, Y]
+    #   @stack: Array[X]
+    #   @h: Hash[X, (Integer|Float)?]
+    #   @result: Hash[X, Y]
+
+    # @rbs sets: Array[X]
+    # @rbs relation: Hash[X, Array[X]]
+    # @rbs base_function: Hash[X, Y]
+    # @rbs return: void
     def initialize(sets, relation, base_function)
+
       # X in the paper
       @sets = sets
+
       # R in the paper
       @relation = relation
+
       # F' in the paper
       @base_function = base_function
+
       # S in the paper
       @stack = []
+
       # N in the paper
       @h = Hash.new(0)
+
       # F in the paper
       @result = {}
     end
 
+    # @rbs () -> Hash[X, Y]
     def compute
       @sets.each do |x|
         next if @h[x] != 0
@@ -27,6 +58,7 @@ def compute
 
     private
 
+    # @rbs (X x) -> void
     def traverse(x)
       @stack.push(x)
       d = @stack.count
@@ -40,8 +72,7 @@ def traverse(x)
       end
 
       if @h[x] == d
-        while true do
-          z = @stack.pop
+        while (z = @stack.pop) do
           @h[z] = Float::INFINITY
           break if z == x
           @result[z] = @result[x] # F (Top of S) = F x
diff --git a/tool/lrama/lib/lrama/grammar.rb b/tool/lrama/lib/lrama/grammar.rb
index 81df3996820256..214ca1a3f238ba 100644
--- a/tool/lrama/lib/lrama/grammar.rb
+++ b/tool/lrama/lib/lrama/grammar.rb
@@ -1,90 +1,85 @@
-require "lrama/grammar/auxiliary"
-require "lrama/grammar/code"
-require "lrama/grammar/error_token"
-require "lrama/grammar/precedence"
-require "lrama/grammar/printer"
-require "lrama/grammar/reference"
-require "lrama/grammar/rule"
-require "lrama/grammar/symbol"
-require "lrama/grammar/union"
-require "lrama/lexer"
-require "lrama/type"
+# frozen_string_literal: true
+
+require "forwardable"
+require_relative "grammar/auxiliary"
+require_relative "grammar/binding"
+require_relative "grammar/code"
+require_relative "grammar/counter"
+require_relative "grammar/destructor"
+require_relative "grammar/error_token"
+require_relative "grammar/parameterizing_rule"
+require_relative "grammar/percent_code"
+require_relative "grammar/precedence"
+require_relative "grammar/printer"
+require_relative "grammar/reference"
+require_relative "grammar/rule"
+require_relative "grammar/rule_builder"
+require_relative "grammar/symbol"
+require_relative "grammar/symbols"
+require_relative "grammar/type"
+require_relative "grammar/union"
+require_relative "lexer"
 
 module Lrama
-  Token = Lrama::Lexer::Token
-
   # Grammar is the result of parsing an input grammar file
   class Grammar
-    attr_reader :eof_symbol, :error_symbol, :undef_symbol, :accept_symbol, :aux
-    attr_accessor :union, :expect,
-                  :printers, :error_tokens,
-                  :lex_param, :parse_param, :initial_action,
-                  :symbols, :types,
-                  :rules, :_rules,
-                  :sym_to_rules
-
-    def initialize
+    extend Forwardable
+
+    attr_reader :percent_codes, :eof_symbol, :error_symbol, :undef_symbol, :accept_symbol, :aux, :parameterizing_rule_resolver
+    attr_accessor :union, :expect, :printers, :error_tokens, :lex_param, :parse_param, :initial_action,
+                  :after_shift, :before_reduce, :after_reduce, :after_shift_error_token, :after_pop_stack,
+                  :symbols_resolver, :types, :rules, :rule_builders, :sym_to_rules, :no_stdlib, :locations, :define
+
+    def_delegators "@symbols_resolver", :symbols, :nterms, :terms, :add_nterm, :add_term, :find_term_by_s_value,
+                                        :find_symbol_by_number!, :find_symbol_by_id!, :token_to_symbol,
+                                        :find_symbol_by_s_value!, :fill_symbol_number, :fill_nterm_type,
+                                        :fill_printer, :fill_destructor, :fill_error_token, :sort_by_number!
+
+    def initialize(rule_counter, define = {})
+      @rule_counter = rule_counter
+
+      # Code defined by "%code"
+      @percent_codes = []
       @printers = []
+      @destructors = []
       @error_tokens = []
-      @symbols = []
+      @symbols_resolver = Grammar::Symbols::Resolver.new
       @types = []
-      @_rules = []
+      @rule_builders = []
       @rules = []
       @sym_to_rules = {}
+      @parameterizing_rule_resolver = ParameterizingRule::Resolver.new
       @empty_symbol = nil
       @eof_symbol = nil
       @error_symbol = nil
       @undef_symbol = nil
       @accept_symbol = nil
       @aux = Auxiliary.new
+      @no_stdlib = false
+      @locations = false
+      @define = define.map {|d| d.split('=') }.to_h
 
       append_special_symbols
     end
 
-    def add_printer(ident_or_tags:, code:, lineno:)
-      @printers << Printer.new(ident_or_tags: ident_or_tags, code: code, lineno: lineno)
+    def create_rule_builder(rule_counter, midrule_action_counter)
+      RuleBuilder.new(rule_counter, midrule_action_counter, @parameterizing_rule_resolver)
     end
 
-    def add_error_token(ident_or_tags:, code:, lineno:)
-      @error_tokens << ErrorToken.new(ident_or_tags: ident_or_tags, code: code, lineno: lineno)
+    def add_percent_code(id:, code:)
+      @percent_codes << PercentCode.new(id.s_value, code.s_value)
     end
 
-    def add_term(id:, alias_name: nil, tag: nil, token_id: nil, replace: false)
-      if token_id && (sym = @symbols.find {|s| s.token_id == token_id })
-        if replace
-          sym.id = id
-          sym.alias_name = alias_name
-          sym.tag = tag
-        end
-
-        return sym
-      end
-
-      if sym = @symbols.find {|s| s.id == id }
-        return sym
-      end
-
-      sym = Symbol.new(
-        id: id, alias_name: alias_name, number: nil, tag: tag,
-        term: true, token_id: token_id, nullable: false
-      )
-      @symbols << sym
-      @terms = nil
-
-      return sym
+    def add_destructor(ident_or_tags:, token_code:, lineno:)
+      @destructors << Destructor.new(ident_or_tags: ident_or_tags, token_code: token_code, lineno: lineno)
     end
 
-    def add_nterm(id:, alias_name: nil, tag: nil)
-      return if @symbols.find {|s| s.id == id }
-
-      sym = Symbol.new(
-        id: id, alias_name: alias_name, number: nil, tag: tag,
-        term: false, token_id: nil, nullable: nil,
-      )
-      @symbols << sym
-      @nterms = nil
+    def add_printer(ident_or_tags:, token_code:, lineno:)
+      @printers << Printer.new(ident_or_tags: ident_or_tags, token_code: token_code, lineno: lineno)
+    end
 
-      return sym
+    def add_error_token(ident_or_tags:, token_code:, lineno:)
+      @error_tokens << ErrorToken.new(ident_or_tags: ident_or_tags, token_code: token_code, lineno: lineno)
     end
 
     def add_type(id:, tag:)
@@ -116,21 +111,20 @@ def set_union(code, lineno)
       @union = Union.new(code: code, lineno: lineno)
     end
 
-    def add_rule(lhs:, rhs:, lineno:)
-      @_rules << [lhs, rhs, lineno]
+    def add_rule_builder(builder)
+      @rule_builders << builder
     end
 
-    def build_references(token_code)
-      token_code.references.map! do |type, value, tag, first_column, last_column|
-        Reference.new(type: type, value: value, ex_tag: tag, first_column: first_column, last_column: last_column)
-      end
+    def add_parameterizing_rule(rule)
+      @parameterizing_rule_resolver.add_parameterizing_rule(rule)
+    end
 
-      token_code
+    def parameterizing_rules
+      @parameterizing_rule_resolver.rules
     end
 
-    def build_code(type, token_code)
-      build_references(token_code)
-      Code.new(type: type, token_code: token_code)
+    def insert_before_parameterizing_rules(rules)
+      @parameterizing_rule_resolver.rules = rules + @parameterizing_rule_resolver.rules
     end
 
     def prologue_first_lineno=(prologue_first_lineno)
@@ -150,28 +144,44 @@ def epilogue=(epilogue)
     end
 
     def prepare
+      resolve_inline_rules
       normalize_rules
       collect_symbols
-      replace_token_with_symbol
-      fill_symbol_number
+      set_lhs_and_rhs
       fill_default_precedence
+      fill_symbols
       fill_sym_to_rules
-      fill_nterm_type
-      fill_symbol_printer
-      fill_symbol_error_token
-      @symbols.sort_by!(&:number)
+      compute_nullable
+      compute_first_set
+      set_locations
     end
 
     # TODO: More validation methods
+    #
+    # * Validation for no_declared_type_reference
     def validate!
-      validate_symbol_number_uniqueness!
-      validate_no_declared_type_reference!
+      @symbols_resolver.validate!
+      validate_rule_lhs_is_nterm!
     end
 
+    def find_rules_by_symbol!(sym)
+      find_rules_by_symbol(sym) || (raise "Rules for #{sym} not found")
+    end
+
+    def find_rules_by_symbol(sym)
+      @sym_to_rules[sym.number]
+    end
+
+    def ielr_defined?
+      @define.key?('lr.type') && @define['lr.type'] == 'ielr'
+    end
+
+    private
+
     def compute_nullable
       @rules.each do |rule|
         case
-        when rule.rhs.empty?
+        when rule.empty_rule?
           rule.nullable = true
         when rule.rhs.any?(&:term)
           rule.nullable = false
@@ -212,7 +222,7 @@ def compute_nullable
         rule.nullable = false
       end
 
-      nterms.select {|r| r.nullable.nil? }.each do |nterm|
+      nterms.select {|e| e.nullable.nil? }.each do |nterm|
         nterm.nullable = false
       end
     end
@@ -252,68 +262,12 @@ def compute_first_set
       end
     end
 
-    def find_symbol_by_s_value(s_value)
-      @symbols.find do |sym|
-        sym.id.s_value == s_value
-      end
-    end
-
-    def find_symbol_by_s_value!(s_value)
-      find_symbol_by_s_value(s_value) || (raise "Symbol not found: #{s_value}")
-    end
-
-    def find_symbol_by_id(id)
-      @symbols.find do |sym|
-        # TODO: validate uniqueness of Token#s_value and Symbol#alias_name
-        sym.id == id || sym.alias_name == id.s_value
+    def setup_rules
+      @rule_builders.each do |builder|
+        builder.setup_rules
       end
     end
 
-    def find_symbol_by_id!(id)
-      find_symbol_by_id(id) || (raise "Symbol not found: #{id}")
-    end
-
-    def find_symbol_by_number!(number)
-      sym = @symbols[number]
-
-      raise "Symbol not found: #{number}" unless sym
-      raise "[BUG] Symbol number mismatch. #{number}, #{sym}" if sym.number != number
-
-      sym
-    end
-
-    def find_rules_by_symbol!(sym)
-      find_rules_by_symbol(sym) || (raise "Rules for #{sym} not found")
-    end
-
-    def find_rules_by_symbol(sym)
-      @sym_to_rules[sym.number]
-    end
-
-    def terms_count
-      terms.count
-    end
-
-    def terms
-      @terms ||= @symbols.select(&:term?)
-    end
-
-    def nterms_count
-      nterms.count
-    end
-
-    def nterms
-      @nterms ||= @symbols.select(&:nterm?)
-    end
-
-    private
-
-    def find_nterm_by_id!(id)
-      nterms.find do |nterm|
-        nterm.id == id
-      end || (raise "Nterm not found: #{id}")
-    end
-
     def append_special_symbols
       # YYEMPTY (token_id: -2, number: -2) is added when a template is evaluated
       # term = add_term(id: Token.new(Token::Ident, "YYEMPTY"), token_id: -2)
@@ -321,146 +275,66 @@ def append_special_symbols
       # @empty_symbol = term
 
       # YYEOF
-      term = add_term(id: Token.new(type: Token::Ident, s_value: "YYEOF"), alias_name: "\"end of file\"", token_id: 0)
+      term = add_term(id: Lrama::Lexer::Token::Ident.new(s_value: "YYEOF"), alias_name: "\"end of file\"", token_id: 0)
       term.number = 0
       term.eof_symbol = true
       @eof_symbol = term
 
       # YYerror
-      term = add_term(id: Token.new(type: Token::Ident, s_value: "YYerror"), alias_name: "error")
+      term = add_term(id: Lrama::Lexer::Token::Ident.new(s_value: "YYerror"), alias_name: "error")
       term.number = 1
       term.error_symbol = true
       @error_symbol = term
 
       # YYUNDEF
-      term = add_term(id: Token.new(type: Token::Ident, s_value: "YYUNDEF"), alias_name: "\"invalid token\"")
+      term = add_term(id: Lrama::Lexer::Token::Ident.new(s_value: "YYUNDEF"), alias_name: "\"invalid token\"")
       term.number = 2
       term.undef_symbol = true
       @undef_symbol = term
 
       # $accept
-      term = add_nterm(id: Token.new(type: Token::Ident, s_value: "$accept"))
+      term = add_nterm(id: Lrama::Lexer::Token::Ident.new(s_value: "$accept"))
       term.accept_symbol = true
       @accept_symbol = term
     end
 
-    # 1. Add $accept rule to the top of rules
-    # 2. Extract precedence and last action
-    # 3. Extract action in the middle of RHS into new Empty rule
-    # 4. Append id and extract action then create Rule
-    #
-    # Bison 3.8.2 uses different orders for symbol number and rule number
-    # when a rule has actions in the middle of a rule.
-    #
-    # For example,
-    #
-    # `program: $@1 top_compstmt`
-    #
-    # Rules are ordered like below,
-    #
-    # 1 $@1: ε
-    # 2 program: $@1 top_compstmt
-    #
-    # Symbols are ordered like below,
-    #
-    # 164 program
-    # 165 $@1
-    #
-    def normalize_rules
-      # 1. Add $accept rule to the top of rules
-      accept = find_symbol_by_s_value!("$accept")
-      eof = find_symbol_by_number!(0)
-      lineno = @_rules.first ? @_rules.first[2] : 0
-      @rules << Rule.new(id: @rules.count, lhs: accept, rhs: [@_rules.first[0], eof], code: nil, lineno: lineno)
-
-      extracted_action_number = 1 # @n as nterm
-
-      @_rules.each do |lhs, rhs, lineno|
-        a = []
-        rhs1 = []
-        code = nil
-        precedence_sym = nil
-
-        # 2. Extract precedence and last action
-        rhs.reverse.each do |r|
-          case
-          when r.is_a?(Symbol) # precedence_sym
-            precedence_sym = r
-          when (r.type == Token::User_code) && precedence_sym.nil? && code.nil? && rhs1.empty?
-            code = r
+    def resolve_inline_rules
+      while @rule_builders.any?(&:has_inline_rules?) do
+        @rule_builders = @rule_builders.flat_map do |builder|
+          if builder.has_inline_rules?
+            builder.resolve_inline_rules
           else
-            rhs1 << r
-          end
-        end
-        rhs1.reverse!
-
-        # Bison n'th component is 1-origin
-        (rhs1 + [code]).compact.each.with_index(1) do |token, i|
-          if token.type == Token::User_code
-            token.references.each do |ref|
-              # Need to keep position_in_rhs for actions in the middle of RHS
-              ref.position_in_rhs = i - 1
-              next if ref.type == :at
-              # $$, $n, @$, @n can be used in any actions
-
-              if ref.value == "$"
-                # TODO: Should be postponed after middle actions are extracted?
-                ref.referring_symbol = lhs
-              elsif ref.value.is_a?(Integer)
-                raise "Can not refer following component. #{ref.value} >= #{i}. #{token}" if ref.value >= i
-                rhs1[ref.value - 1].referred = true
-                ref.referring_symbol = rhs1[ref.value - 1]
-              elsif ref.value.is_a?(String)
-                target_tokens = ([lhs] + rhs1 + [code]).compact.first(i)
-                referring_symbol_candidate = target_tokens.filter {|token| token.referred_by?(ref.value) }
-                raise "Referring symbol `#{ref.value}` is duplicated. #{token}" if referring_symbol_candidate.size >= 2
-                raise "Referring symbol `#{ref.value}` is not found. #{token}" if referring_symbol_candidate.count == 0
-
-                referring_symbol = referring_symbol_candidate.first
-                referring_symbol.referred = true
-                ref.referring_symbol = referring_symbol
-              end
-            end
-          end
-        end
-
-        rhs2 = rhs1.map do |token|
-          if token.type == Token::User_code
-            prefix = token.referred ? "@" : "$@"
-            new_token = Token.new(type: Token::Ident, s_value: prefix + extracted_action_number.to_s)
-            extracted_action_number += 1
-            a << [new_token, token]
-            new_token
-          else
-            token
+            builder
           end
         end
+      end
+    end
 
-        # Extract actions in the middle of RHS
-        # into new rules.
-        a.each do |new_token, code|
-          @rules << Rule.new(id: @rules.count, lhs: new_token, rhs: [], code: Code.new(type: :user_code, token_code: code), lineno: code.line)
-        end
+    def normalize_rules
+      # Add $accept rule to the top of rules
+      rule_builder = @rule_builders.first # : RuleBuilder
+      lineno = rule_builder ? rule_builder.line : 0
+      @rules << Rule.new(id: @rule_counter.increment, _lhs: @accept_symbol.id, _rhs: [rule_builder.lhs, @eof_symbol.id], token_code: nil, lineno: lineno)
 
-        c = code ? Code.new(type: :user_code, token_code: code) : nil
-        @rules << Rule.new(id: @rules.count, lhs: lhs, rhs: rhs2, code: c, precedence_sym: precedence_sym, lineno: lineno)
+      setup_rules
 
-        add_nterm(id: lhs)
-        a.each do |new_token, _|
-          add_nterm(id: new_token)
+      @rule_builders.each do |builder|
+        builder.rules.each do |rule|
+          add_nterm(id: rule._lhs, tag: rule.lhs_tag)
+          @rules << rule
         end
       end
+
+      @rules.sort_by!(&:id)
     end
 
     # Collect symbols from rules
     def collect_symbols
-      @rules.flat_map(&:rhs).each do |s|
+      @rules.flat_map(&:_rhs).each do |s|
         case s
-        when Token
-          if s.type == Token::Char
-            add_term(id: s)
-          end
-        when Symbol
+        when Lrama::Lexer::Token::Char
+          add_term(id: s)
+        when Lrama::Lexer::Token
           # skip
         else
           raise "Unknown class: #{s}"
@@ -468,105 +342,13 @@ def collect_symbols
       end
     end
 
-    # Fill #number and #token_id
-    def fill_symbol_number
-      # TODO: why start from 256
-      token_id = 256
-
-      # YYEMPTY = -2
-      # YYEOF   =  0
-      # YYerror =  1
-      # YYUNDEF =  2
-      number = 3
-
-      nterm_token_id = 0
-      used_numbers = {}
-
-      @symbols.map(&:number).each do |n|
-        used_numbers[n] = true
-      end
-
-      (@symbols.select(&:term?) + @symbols.select(&:nterm?)).each do |sym|
-        while used_numbers[number] do
-          number += 1
-        end
-
-        if sym.number.nil?
-          sym.number = number
-          number += 1
-        end
-
-        # If id is Token::Char, it uses ASCII code
-        if sym.term? && sym.token_id.nil?
-          if sym.id.type == Token::Char
-            # Ignore ' on the both sides
-            case sym.id.s_value[1..-2]
-            when "\\b"
-              sym.token_id = 8
-            when "\\f"
-              sym.token_id = 12
-            when "\\n"
-              sym.token_id = 10
-            when "\\r"
-              sym.token_id = 13
-            when "\\t"
-              sym.token_id = 9
-            when "\\v"
-              sym.token_id = 11
-            when "\""
-              sym.token_id = 34
-            when "'"
-              sym.token_id = 39
-            when "\\\\"
-              sym.token_id = 92
-            when /\A\\(\d+)\z/
-              sym.token_id = Integer($1, 8)
-            when /\A(.)\z/
-              sym.token_id = $1.bytes.first
-            else
-              raise "Unknown Char s_value #{sym}"
-            end
-          else
-            sym.token_id = token_id
-            token_id += 1
-          end
-        end
-
-        if sym.nterm? && sym.token_id.nil?
-          sym.token_id = nterm_token_id
-          nterm_token_id += 1
-        end
-      end
-    end
-
-    def replace_token_with_symbol
+    def set_lhs_and_rhs
       @rules.each do |rule|
-        rule.lhs = token_to_symbol(rule.lhs)
+        rule.lhs = token_to_symbol(rule._lhs) if rule._lhs
 
-        rule.rhs.map! do |t|
+        rule.rhs = rule._rhs.map do |t|
           token_to_symbol(t)
         end
-
-        if rule.code
-          rule.code.references.each do |ref|
-            next if ref.type == :at
-
-            if ref.referring_symbol.type != Token::User_code
-              ref.referring_symbol = token_to_symbol(ref.referring_symbol)
-            end
-          end
-        end
-      end
-    end
-
-    def token_to_symbol(token)
-      case token
-      when Token
-        find_symbol_by_id!(token)
-      when Symbol
-        token
-      else
-        raise "Unknown class: #{token}"
       end
     end
 
@@ -587,6 +369,15 @@ def fill_default_precedence
       end
     end
 
+    def fill_symbols
+      fill_symbol_number
+      fill_nterm_type(@types)
+      fill_printer(@printers)
+      fill_destructor(@destructors)
+      fill_error_token(@error_tokens)
+      sort_by_number!
+    end
+
     def fill_sym_to_rules
       @rules.each do |rule|
         key = rule.lhs.number
@@ -595,74 +386,22 @@ def fill_sym_to_rules
       end
     end
 
-    # Fill nterm's tag defined by %type decl
-    def fill_nterm_type
-      @types.each do |type|
-        nterm = find_nterm_by_id!(type.id)
-        nterm.tag = type.tag
-      end
-    end
-
-    def fill_symbol_printer
-      @symbols.each do |sym|
-        @printers.each do |printer|
-          printer.ident_or_tags.each do |ident_or_tag|
-            case ident_or_tag.type
-            when Token::Ident
-              sym.printer = printer if sym.id == ident_or_tag
-            when Token::Tag
-              sym.printer = printer if sym.tag == ident_or_tag
-            else
-              raise "Unknown token type. #{printer}"
-            end
-          end
-        end
-      end
-    end
-
-    def fill_symbol_error_token
-      @symbols.each do |sym|
-        @error_tokens.each do |error_token|
-          error_token.ident_or_tags.each do |ident_or_tag|
-            case ident_or_tag.type
-            when Token::Ident
-              sym.error_token = error_token if sym.id == ident_or_tag
-            when Token::Tag
-              sym.error_token = error_token if sym.tag == ident_or_tag
-            else
-              raise "Unknown token type. #{error_token}"
-            end
-          end
-        end
-      end
-    end
-
-    def validate_symbol_number_uniqueness!
-      invalid = @symbols.group_by(&:number).select do |number, syms|
-        syms.count > 1
-      end
-
-      return if invalid.empty?
-
-      raise "Symbol number is duplicated. #{invalid}"
-    end
-
-    def validate_no_declared_type_reference!
-      errors = []
+    def validate_rule_lhs_is_nterm!
+      errors = [] #: Array[String]
 
       rules.each do |rule|
-        next unless rule.code
+        next if rule.lhs.nterm?
 
-        rule.code.references.select do |ref|
-          ref.type == :dollar && !ref.tag
-        end.each do |ref|
-          errors << "$#{ref.value} of '#{rule.lhs.id.s_value}' has no declared type"
-        end
+        errors << "[BUG] LHS of #{rule.display_name} (line: #{rule.lineno}) is term. It should be nterm."
       end
 
       return if errors.empty?
 
       raise errors.join("\n")
     end
+
+    def set_locations
+      @locations = @locations || @rules.any? {|rule| rule.contains_at_reference? }
+    end
   end
 end
diff --git a/tool/lrama/lib/lrama/grammar/auxiliary.rb b/tool/lrama/lib/lrama/grammar/auxiliary.rb
index 933574b0f63733..2bacee6f1a87e7 100644
--- a/tool/lrama/lib/lrama/grammar/auxiliary.rb
+++ b/tool/lrama/lib/lrama/grammar/auxiliary.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Lrama
   class Grammar
     # Grammar file information not used by States but by Output
diff --git a/tool/lrama/lib/lrama/grammar/binding.rb b/tool/lrama/lib/lrama/grammar/binding.rb
new file mode 100644
index 00000000000000..2efb918a0b2205
--- /dev/null
+++ b/tool/lrama/lib/lrama/grammar/binding.rb
@@ -0,0 +1,67 @@
+# rbs_inline: enabled
+# frozen_string_literal: true
+
+module Lrama
+  class Grammar
+    class Binding
+      # @rbs @actual_args: Array[Lexer::Token]
+      # @rbs @param_to_arg: Hash[String, Lexer::Token]
+
+      # @rbs (Array[Lexer::Token] params, Array[Lexer::Token] actual_args) -> void
+      def initialize(params, actual_args)
+        @actual_args = actual_args
+        @param_to_arg = map_params_to_args(params, @actual_args)
+      end
+
+      # @rbs (Lexer::Token sym) -> Lexer::Token
+      def resolve_symbol(sym)
+        if sym.is_a?(Lexer::Token::InstantiateRule)
+          Lrama::Lexer::Token::InstantiateRule.new(
+            s_value: sym.s_value, location: sym.location, args: resolved_args(sym), lhs_tag: sym.lhs_tag
+          )
+        else
+          param_to_arg(sym)
+        end
+      end
+
+      # @rbs (Lexer::Token::InstantiateRule token) -> String
+      def concatenated_args_str(token)
+        "#{token.rule_name}_#{token_to_args_s_values(token).join('_')}"
+      end
+
+      private
+
+      # @rbs (Array[Lexer::Token] params, Array[Lexer::Token] actual_args) -> Hash[String, Lexer::Token]
+      def map_params_to_args(params, actual_args)
+        params.zip(actual_args).map do |param, arg|
+          [param.s_value, arg]
+        end.to_h
+      end
+
+      # @rbs (Lexer::Token::InstantiateRule sym) -> Array[Lexer::Token]
+      def resolved_args(sym)
+        sym.args.map { |arg| resolve_symbol(arg) }
+      end
+
+      # @rbs (Lexer::Token sym) -> Lexer::Token
+      def param_to_arg(sym)
+        if (arg = @param_to_arg[sym.s_value].dup)
+          arg.alias_name = sym.alias_name
+        end
+        arg || sym
+      end
+
+      # @rbs (Lexer::Token::InstantiateRule token) -> Array[String]
+      def token_to_args_s_values(token)
+        token.args.flat_map do |arg|
+          resolved = resolve_symbol(arg)
+          if resolved.is_a?(Lexer::Token::InstantiateRule)
+            [resolved.s_value] + resolved.args.map(&:s_value)
+          else
+            [resolved.s_value]
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/tool/lrama/lib/lrama/grammar/code.rb b/tool/lrama/lib/lrama/grammar/code.rb
index 712cb1ad5a95cb..b6c1cc49e74287 100644
--- a/tool/lrama/lib/lrama/grammar/code.rb
+++ b/tool/lrama/lib/lrama/grammar/code.rb
@@ -1,121 +1,52 @@
+# frozen_string_literal: true
+
 require "forwardable"
+require_relative "code/destructor_code"
+require_relative "code/initial_action_code"
+require_relative "code/no_reference_code"
+require_relative "code/printer_code"
+require_relative "code/rule_action"
 
 module Lrama
   class Grammar
-    class Code < Struct.new(:type, :token_code, keyword_init: true)
+    class Code
       extend Forwardable
 
       def_delegators "token_code", :s_value, :line, :column, :references
 
-      # $$, $n, @$, @n is translated to C code
-      def translated_code
-        case type
-        when :user_code
-          translated_user_code
-        when :initial_action
-          translated_initial_action_code
-        end
-      end
+      attr_reader :type, :token_code
 
-      # * ($1) error
-      # * ($$) *yyvaluep
-      # * (@1) error
-      # * (@$) *yylocationp
-      def translated_printer_code(tag)
-        t_code = s_value.dup
-
-        references.reverse.each do |ref|
-          first_column = ref.first_column
-          last_column = ref.last_column
-
-          case
-          when ref.value == "$" && ref.type == :dollar # $$
-            # Omit "<>"
-            member = tag.s_value[1..-2]
-            str = "((*yyvaluep).#{member})"
-          when ref.value == "$" && ref.type == :at # @$
-            str = "(*yylocationp)"
-          when ref.type == :dollar # $n
-            raise "$#{ref.value} can not be used in %printer."
-          when ref.type == :at # @n
-            raise "@#{ref.value} can not be used in %printer."
-          else
-            raise "Unexpected. #{self}, #{ref}"
-          end
-
-          t_code[first_column..last_column] = str
-        end
-
-        return t_code
+      def initialize(type:, token_code:)
+        @type = type
+        @token_code = token_code
       end
-      alias :translated_error_token_code :translated_printer_code
 
-      private
+      def ==(other)
+        self.class == other.class &&
+        self.type == other.type &&
+        self.token_code == other.token_code
+      end
 
-      # * ($1) yyvsp[i]
-      # * ($$) yyval
-      # * (@1) yylsp[i]
-      # * (@$) yyloc
-      def translated_user_code
+      # $$, $n, @$, @n are translated to C code
+      def translated_code
         t_code = s_value.dup
 
-        references.reverse.each do |ref|
+        references.reverse_each do |ref|
           first_column = ref.first_column
           last_column = ref.last_column
 
-          case
-          when ref.value == "$" && ref.type == :dollar # $$
-            # Omit "<>"
-            member = ref.tag.s_value[1..-2]
-            str = "(yyval.#{member})"
-          when ref.value == "$" && ref.type == :at # @$
-            str = "(yyloc)"
-          when ref.type == :dollar # $n
-            i = -ref.position_in_rhs + ref.value
-            # Omit "<>"
-            member = ref.tag.s_value[1..-2]
-            str = "(yyvsp[#{i}].#{member})"
-          when ref.type == :at # @n
-            i = -ref.position_in_rhs + ref.value
-            str = "(yylsp[#{i}])"
-          else
-            raise "Unexpected. #{self}, #{ref}"
-          end
+          str = reference_to_c(ref)
 
-          t_code[first_column..last_column] = str
+          t_code[first_column...last_column] = str
         end
 
         return t_code
       end
 
-      # * ($1) error
-      # * ($$) yylval
-      # * (@1) error
-      # * (@$) yylloc
-      def translated_initial_action_code
-        t_code = s_value.dup
-
-        references.reverse.each do |ref|
-          first_column = ref.first_column
-          last_column = ref.last_column
-
-          case
-          when ref.value == "$" && ref.type == :dollar # $$
-            str = "yylval"
-          when ref.value == "$" && ref.type == :at # @$
-            str = "yylloc"
-          when ref.type == :dollar # $n
-            raise "$#{ref.value} can not be used in initial_action."
-          when ref.type == :at # @n
-            raise "@#{ref.value} can not be used in initial_action."
-          else
-            raise "Unexpected. #{self}, #{ref}"
-          end
-
-          t_code[first_column..last_column] = str
-        end
+      private
 
-        return t_code
+      def reference_to_c(ref)
+        raise NotImplementedError.new("#reference_to_c is not implemented")
       end
     end
   end
diff --git a/tool/lrama/lib/lrama/grammar/code/destructor_code.rb b/tool/lrama/lib/lrama/grammar/code/destructor_code.rb
new file mode 100644
index 00000000000000..794017257c5486
--- /dev/null
+++ b/tool/lrama/lib/lrama/grammar/code/destructor_code.rb
@@ -0,0 +1,42 @@
+# frozen_string_literal: true
+
+module Lrama
+  class Grammar
+    class Code
+      class DestructorCode < Code
+        def initialize(type:, token_code:, tag:)
+          super(type: type, token_code: token_code)
+          @tag = tag
+        end
+
+        private
+
+        # * ($$) *yyvaluep
+        # * (@$) *yylocationp
+        # * ($:$) error
+        # * ($1) error
+        # * (@1) error
+        # * ($:1) error
+        def reference_to_c(ref)
+          case
+          when ref.type == :dollar && ref.name == "$" # $$
+            member = @tag.member
+            "((*yyvaluep).#{member})"
+          when ref.type == :at && ref.name == "$" # @$
+            "(*yylocationp)"
+          when ref.type == :index && ref.name == "$" # $:$
+            raise "$:#{ref.value} can not be used in #{type}."
+          when ref.type == :dollar # $n
+            raise "$#{ref.value} can not be used in #{type}."
+          when ref.type == :at # @n
+            raise "@#{ref.value} can not be used in #{type}."
+          when ref.type == :index # $:n
+            raise "$:#{ref.value} can not be used in #{type}."
+          else
+            raise "Unexpected. #{self}, #{ref}"
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/tool/lrama/lib/lrama/grammar/code/initial_action_code.rb b/tool/lrama/lib/lrama/grammar/code/initial_action_code.rb
new file mode 100644
index 00000000000000..02f2badc9e32e8
--- /dev/null
+++ b/tool/lrama/lib/lrama/grammar/code/initial_action_code.rb
@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+
+module Lrama
+  class Grammar
+    class Code
+      class InitialActionCode < Code
+        private
+
+        # * ($$) yylval
+        # * (@$) yylloc
+        # * ($:$) error
+        # * ($1) error
+        # * (@1) error
+        # * ($:1) error
+        def reference_to_c(ref)
+          case
+          when ref.type == :dollar && ref.name == "$" # $$
+            "yylval"
+          when ref.type == :at && ref.name == "$" # @$
+            "yylloc"
+          when ref.type == :index && ref.name == "$" # $:$
+            raise "$:#{ref.value} can not be used in initial_action."
+          when ref.type == :dollar # $n
+            raise "$#{ref.value} can not be used in initial_action."
+          when ref.type == :at # @n
+            raise "@#{ref.value} can not be used in initial_action."
+          when ref.type == :index # $:n
+            raise "$:#{ref.value} can not be used in initial_action."
+          else
+            raise "Unexpected. #{self}, #{ref}"
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/tool/lrama/lib/lrama/grammar/code/no_reference_code.rb b/tool/lrama/lib/lrama/grammar/code/no_reference_code.rb
new file mode 100644
index 00000000000000..ab12f32e297567
--- /dev/null
+++ b/tool/lrama/lib/lrama/grammar/code/no_reference_code.rb
@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+module Lrama
+  class Grammar
+    class Code
+      class NoReferenceCode < Code
+        private
+
+        # * ($$) error
+        # * (@$) error
+        # * ($:$) error
+        # * ($1) error
+        # * (@1) error
+        # * ($:1) error
+        def reference_to_c(ref)
+          case
+          when ref.type == :dollar # $$, $n
+            raise "$#{ref.value} can not be used in #{type}."
+          when ref.type == :at # @$, @n
+            raise "@#{ref.value} can not be used in #{type}."
+          when ref.type == :index # $:$, $:n
+            raise "$:#{ref.value} can not be used in #{type}."
+          else
+            raise "Unexpected. #{self}, #{ref}"
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/tool/lrama/lib/lrama/grammar/code/printer_code.rb b/tool/lrama/lib/lrama/grammar/code/printer_code.rb
new file mode 100644
index 00000000000000..c0b8d24306ff05
--- /dev/null
+++ b/tool/lrama/lib/lrama/grammar/code/printer_code.rb
@@ -0,0 +1,42 @@
+# frozen_string_literal: true
+
+module Lrama
+  class Grammar
+    class Code
+      class PrinterCode < Code
+        def initialize(type:, token_code:, tag:)
+          super(type: type, token_code: token_code)
+          @tag = tag
+        end
+
+        private
+
+        # * ($$) *yyvaluep
+        # * (@$) *yylocationp
+        # * ($:$) error
+        # * ($1) error
+        # * (@1) error
+        # * ($:1) error
+        def reference_to_c(ref)
+          case
+          when ref.type == :dollar && ref.name == "$" # $$
+            member = @tag.member
+            "((*yyvaluep).#{member})"
+          when ref.type == :at && ref.name == "$" # @$
+            "(*yylocationp)"
+          when ref.type == :index && ref.name == "$" # $:$
+            raise "$:#{ref.value} can not be used in #{type}."
+          when ref.type == :dollar # $n
+            raise "$#{ref.value} can not be used in #{type}."
+          when ref.type == :at # @n
+            raise "@#{ref.value} can not be used in #{type}."
+          when ref.type == :index # $:n
+            raise "$:#{ref.value} can not be used in #{type}."
+          else
+            raise "Unexpected. #{self}, #{ref}"
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/tool/lrama/lib/lrama/grammar/code/rule_action.rb b/tool/lrama/lib/lrama/grammar/code/rule_action.rb
new file mode 100644
index 00000000000000..363ecdf25dfc19
--- /dev/null
+++ b/tool/lrama/lib/lrama/grammar/code/rule_action.rb
@@ -0,0 +1,92 @@
+# frozen_string_literal: true
+
+module Lrama
+  class Grammar
+    class Code
+      class RuleAction < Code
+        def initialize(type:, token_code:, rule:)
+          super(type: type, token_code: token_code)
+          @rule = rule
+        end
+
+        private
+
+        # * ($$) yyval
+        # * (@$) yyloc
+        # * ($:$) error
+        # * ($1) yyvsp[i]
+        # * (@1) yylsp[i]
+        # * ($:1) i - 1
+        #
+        #
+        # Consider a rule like
+        #
+        #   class: keyword_class { $1 } tSTRING { $2 + $3 } keyword_end { $class = $1 + $keyword_end }
+        #
+        # For the semantic action of original rule:
+        #
+        # "Rule"                class: keyword_class { $1 } tSTRING { $2 + $3 } keyword_end { $class = $1 + $keyword_end }
+        # "Position in grammar"                   $1     $2      $3          $4          $5
+        # "Index for yyvsp"                       -4     -3      -2          -1           0
+        # "$:n"                                  $:1    $:2     $:3         $:4         $:5
+        # "index of $:n"                          -5     -4      -3          -2          -1
+        #
+        #
+        # For the first midrule action:
+        #
+        # "Rule"                class: keyword_class { $1 } tSTRING { $2 + $3 } keyword_end { $class = $1 + $keyword_end }
+        # "Position in grammar"                   $1
+        # "Index for yyvsp"                        0
+        # "$:n"                                  $:1
+        def reference_to_c(ref)
+          case
+          when ref.type == :dollar && ref.name == "$" # $$
+            tag = ref.ex_tag || lhs.tag
+            raise_tag_not_found_error(ref) unless tag
+            # @type var tag: Lexer::Token::Tag
+            "(yyval.#{tag.member})"
+          when ref.type == :at && ref.name == "$" # @$
+            "(yyloc)"
+          when ref.type == :index && ref.name == "$" # $:$
+            raise "$:$ is not supported"
+          when ref.type == :dollar # $n
+            i = -position_in_rhs + ref.index
+            tag = ref.ex_tag || rhs[ref.index - 1].tag
+            raise_tag_not_found_error(ref) unless tag
+            # @type var tag: Lexer::Token::Tag
+            "(yyvsp[#{i}].#{tag.member})"
+          when ref.type == :at # @n
+            i = -position_in_rhs + ref.index
+            "(yylsp[#{i}])"
+          when ref.type == :index # $:n
+            i = -position_in_rhs + ref.index
+            "(#{i} - 1)"
+          else
+            raise "Unexpected. #{self}, #{ref}"
+          end
+        end
+
+        def position_in_rhs
+          # If rule is not derived rule, User Code is only action at
+          # the end of rule RHS. In such case, the action is located on
+          # `@rule.rhs.count`.
+          @rule.position_in_original_rule_rhs || @rule.rhs.count
+        end
+
+        # If this is midrule action, RHS is an RHS of the original rule.
+        def rhs
+          (@rule.original_rule || @rule).rhs
+        end
+
+        # Unlike `rhs`, LHS is always an LHS of the rule.
+        def lhs
+          @rule.lhs
+        end
+
+        def raise_tag_not_found_error(ref)
+          raise "Tag is not specified for '$#{ref.value}' in '#{@rule.display_name}'"
+        end
+      end
+    end
+  end
+end
diff --git a/tool/lrama/lib/lrama/grammar/counter.rb b/tool/lrama/lib/lrama/grammar/counter.rb
new file mode 100644
index 00000000000000..dc91b87b711f2d
--- /dev/null
+++ b/tool/lrama/lib/lrama/grammar/counter.rb
@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+module Lrama
+  class Grammar
+    class Counter
+      def initialize(number)
+        @number = number
+      end
+
+      def increment
+        n = @number
+        @number += 1
+        n
+      end
+    end
+  end
+end
diff --git a/tool/lrama/lib/lrama/grammar/destructor.rb b/tool/lrama/lib/lrama/grammar/destructor.rb
new file mode 100644
index 00000000000000..a2b6fde0ed5b3d
--- /dev/null
+++ b/tool/lrama/lib/lrama/grammar/destructor.rb
@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+module Lrama
+  class Grammar
+    class Destructor < Struct.new(:ident_or_tags, :token_code, :lineno, keyword_init: true)
+      def translated_code(tag)
+        Code::DestructorCode.new(type: :destructor, token_code: token_code, tag: tag).translated_code
+      end
+    end
+  end
+end
diff --git a/tool/lrama/lib/lrama/grammar/error_token.rb b/tool/lrama/lib/lrama/grammar/error_token.rb
index de82523577c9cd..50eaafeebc66fd 100644
--- a/tool/lrama/lib/lrama/grammar/error_token.rb
+++ b/tool/lrama/lib/lrama/grammar/error_token.rb
@@ -1,8 +1,10 @@
+# frozen_string_literal: true
+
 module Lrama
   class Grammar
-    class ErrorToken < Struct.new(:ident_or_tags, :code, :lineno, keyword_init: true)
-      def translated_code(member)
-        code.translated_error_token_code(member)
+    class ErrorToken < Struct.new(:ident_or_tags, :token_code, :lineno, keyword_init: true)
+      def translated_code(tag)
+        Code::PrinterCode.new(type: :error_token, token_code: token_code, tag: tag).translated_code
       end
     end
   end
diff --git a/tool/lrama/lib/lrama/grammar/parameterizing_rule.rb b/tool/lrama/lib/lrama/grammar/parameterizing_rule.rb
new file mode 100644
index 00000000000000..ddc1a467ce974e
--- /dev/null
+++ b/tool/lrama/lib/lrama/grammar/parameterizing_rule.rb
@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+
+require_relative 'parameterizing_rule/resolver'
+require_relative 'parameterizing_rule/rhs'
+require_relative 'parameterizing_rule/rule'
diff --git a/tool/lrama/lib/lrama/grammar/parameterizing_rule/resolver.rb b/tool/lrama/lib/lrama/grammar/parameterizing_rule/resolver.rb
new file mode 100644
index 00000000000000..06f2f1cef7b9e4
--- /dev/null
+++ b/tool/lrama/lib/lrama/grammar/parameterizing_rule/resolver.rb
@@ -0,0 +1,62 @@
+# frozen_string_literal: true
+
+module Lrama
+  class Grammar
+    class ParameterizingRule
+      class Resolver
+        attr_accessor :rules, :created_lhs_list
+
+        def initialize
+          @rules = []
+          @created_lhs_list = []
+        end
+
+        def add_parameterizing_rule(rule)
+          @rules << rule
+        end
+
+        def find_rule(token)
+          select_rules(@rules, token).last
+        end
+
+        def find_inline(token)
+          @rules.reverse.find { |rule| rule.name == token.s_value && rule.is_inline }
+        end
+
+        def created_lhs(lhs_s_value)
+          @created_lhs_list.reverse.find { |created_lhs| created_lhs.s_value == lhs_s_value }
+        end
+
+        def redefined_rules
+          @rules.select { |rule| @rules.count { |r| r.name == rule.name && r.required_parameters_count == rule.required_parameters_count } > 1 }
+        end
+
+        private
+
+        def select_rules(rules, token)
+          rules = select_not_inline_rules(rules)
+          rules = select_rules_by_name(rules, token.rule_name)
+          rules = rules.select { |rule| rule.required_parameters_count == token.args_count }
+          if rules.empty?
+            raise "Invalid number of arguments. `#{token.rule_name}`"
+          else
+            rules
+          end
+        end
+
+        def select_not_inline_rules(rules)
+          rules.select { |rule| !rule.is_inline }
+        end
+
+        def select_rules_by_name(rules, rule_name)
+          rules = rules.select { |rule| rule.name == rule_name }
+          if rules.empty?
+            raise "Parameterizing rule does not exist. `#{rule_name}`"
+          else
+            rules
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/tool/lrama/lib/lrama/grammar/parameterizing_rule/rhs.rb b/tool/lrama/lib/lrama/grammar/parameterizing_rule/rhs.rb
new file mode 100644
index 00000000000000..f60781c0534905
--- /dev/null
+++ b/tool/lrama/lib/lrama/grammar/parameterizing_rule/rhs.rb
@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+module Lrama
+  class Grammar
+    class ParameterizingRule
+      class Rhs
+        attr_accessor :symbols, :user_code, :precedence_sym
+
+        def initialize
+          @symbols = []
+          @user_code = nil
+          @precedence_sym = nil
+        end
+
+        def resolve_user_code(bindings)
+          return unless user_code
+
+          resolved = Lexer::Token::UserCode.new(s_value: user_code.s_value, location: user_code.location)
+          var_to_arg = {} #: Hash[String, String]
+          symbols.each do |sym|
+            resolved_sym = bindings.resolve_symbol(sym)
+            if resolved_sym != sym
+              var_to_arg[sym.s_value] = resolved_sym.s_value
+            end
+          end
+
+          var_to_arg.each do |var, arg|
+            resolved.references.each do |ref|
+              if ref.name == var
+                ref.name = arg
+              end
+            end
+          end
+
+          return resolved
+        end
+      end
+    end
+  end
+end
diff --git a/tool/lrama/lib/lrama/grammar/parameterizing_rule/rule.rb b/tool/lrama/lib/lrama/grammar/parameterizing_rule/rule.rb
new file mode 100644
index 00000000000000..cc200d2fb60da9
--- /dev/null
+++ b/tool/lrama/lib/lrama/grammar/parameterizing_rule/rule.rb
@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+module Lrama
+  class Grammar
+    class ParameterizingRule
+      class Rule
+        attr_reader :name, :parameters, :rhs_list, :required_parameters_count, :tag, :is_inline
+
+        def initialize(name, parameters, rhs_list, tag: nil, is_inline: false)
+          @name = name
+          @parameters = parameters
+          @rhs_list = rhs_list
+          @tag = tag
+          @is_inline = is_inline
+          @required_parameters_count = parameters.count
+        end
+
+        def to_s
+          "#{@name}(#{@parameters.map(&:s_value).join(', ')})"
+        end
+      end
+    end
+  end
+end
diff --git a/tool/lrama/lib/lrama/grammar/percent_code.rb b/tool/lrama/lib/lrama/grammar/percent_code.rb
new file mode 100644
index 00000000000000..416a2d27534b97
--- /dev/null
+++ b/tool/lrama/lib/lrama/grammar/percent_code.rb
@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+module Lrama
+  class Grammar
+    class PercentCode
+      attr_reader :name, :code
+
+      def initialize(name, code)
+        @name = name
+        @code = code
+      end
+    end
+  end
+end
diff --git a/tool/lrama/lib/lrama/grammar/precedence.rb b/tool/lrama/lib/lrama/grammar/precedence.rb
index fed739b3c047a4..13cf960c32a5f4 100644
--- a/tool/lrama/lib/lrama/grammar/precedence.rb
+++ b/tool/lrama/lib/lrama/grammar/precedence.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Lrama
   class Grammar
     class Precedence < Struct.new(:type, :precedence, keyword_init: true)
diff --git a/tool/lrama/lib/lrama/grammar/printer.rb b/tool/lrama/lib/lrama/grammar/printer.rb
index da49463485ab6a..b78459e819a7bf 100644
--- a/tool/lrama/lib/lrama/grammar/printer.rb
+++ b/tool/lrama/lib/lrama/grammar/printer.rb
@@ -1,8 +1,10 @@
+# frozen_string_literal: true
+
 module Lrama
   class Grammar
-    class Printer < Struct.new(:ident_or_tags, :code, :lineno, keyword_init: true)
-      def translated_code(member)
-        code.translated_printer_code(member)
+    class Printer < Struct.new(:ident_or_tags, :token_code, :lineno, keyword_init: true)
+      def translated_code(tag)
+        Code::PrinterCode.new(type: :printer, token_code: token_code, tag: tag).translated_code
       end
     end
   end
diff --git a/tool/lrama/lib/lrama/grammar/reference.rb b/tool/lrama/lib/lrama/grammar/reference.rb
index bc178e104d1b74..b044516bdb9a83 100644
--- a/tool/lrama/lib/lrama/grammar/reference.rb
+++ b/tool/lrama/lib/lrama/grammar/reference.rb
@@ -1,21 +1,15 @@
-# type: :dollar or :at
-# ex_tag: "$<tag>1" (Optional)
+# frozen_string_literal: true
 
 module Lrama
   class Grammar
-    class Reference < Struct.new(:type, :value, :ex_tag, :first_column, :last_column, :referring_symbol, :position_in_rhs, keyword_init: true)
-      def tag
-        if ex_tag
-          ex_tag
-        else
-          # FIXME: Remove this class check
-          if referring_symbol.is_a?(Symbol)
-            referring_symbol.tag
-          else
-            # Lrama::Lexer::Token (User_code) case
-            nil
-          end
-        end
+    # type: :dollar or :at
+    # name: String (e.g. $$, $foo, $expr.right)
+    # number: Integer (e.g. $1)
+    # index: Integer
+    # ex_tag: "$<tag>1" (Optional)
+    class Reference < Struct.new(:type, :name, :number, :index, :ex_tag, :first_column, :last_column, keyword_init: true)
+      def value
+        name || number
       end
     end
   end
diff --git a/tool/lrama/lib/lrama/grammar/rule.rb b/tool/lrama/lib/lrama/grammar/rule.rb
index c559388b6273ce..445752ae0dd952 100644
--- a/tool/lrama/lib/lrama/grammar/rule.rb
+++ b/tool/lrama/lib/lrama/grammar/rule.rb
@@ -1,10 +1,34 @@
+# frozen_string_literal: true
+
 module Lrama
   class Grammar
-    class Rule < Struct.new(:id, :lhs, :rhs, :code, :nullable, :precedence_sym, :lineno, keyword_init: true)
-      # TODO: Change this to display_name
-      def to_s
+    # _rhs holds original RHS element. Use rhs to refer to Symbol.
+    class Rule < Struct.new(:id, :_lhs, :lhs, :lhs_tag, :_rhs, :rhs, :token_code, :position_in_original_rule_rhs, :nullable, :precedence_sym, :lineno, keyword_init: true)
+      attr_accessor :original_rule
+
+      def ==(other)
+        self.class == other.class &&
+        self.lhs == other.lhs &&
+        self.lhs_tag == other.lhs_tag &&
+        self.rhs == other.rhs &&
+        self.token_code == other.token_code &&
+        self.position_in_original_rule_rhs == other.position_in_original_rule_rhs &&
+        self.nullable == other.nullable &&
+        self.precedence_sym == other.precedence_sym &&
+        self.lineno == other.lineno
+      end
+
+      def display_name
+        l = lhs.id.s_value
+        r = empty_rule? ? "ε" : rhs.map {|r| r.id.s_value }.join(" ")
+        "#{l} -> #{r}"
+      end
+
+      def display_name_without_action
         l = lhs.id.s_value
-        r = rhs.empty? ? "ε" : rhs.map {|r| r.id.s_value }.join(", ")
+        r = empty_rule? ? "ε" : rhs.map do |r|
+          r.id.s_value if r.first_set.any?
+        end.compact.join(" ")
 
         "#{l} -> #{r}"
       end
@@ -12,11 +36,15 @@ def to_s
       # Used by #user_actions
       def as_comment
         l = lhs.id.s_value
-        r = rhs.empty? ? "%empty" : rhs.map(&:display_name).join(" ")
+        r = empty_rule? ? "%empty" : rhs.map(&:display_name).join(" ")
 
         "#{l}: #{r}"
       end
 
+      def with_actions
+        "#{display_name} {#{token_code&.s_value}}"
+      end
+
       # opt_nl: ε     <-- empty_rule
       #       | '\n'  <-- not empty_rule
       def empty_rule?
@@ -32,7 +60,15 @@ def initial_rule?
       end
 
       def translated_code
-        code&.translated_code
+        return nil unless token_code
+
+        Code::RuleAction.new(type: :rule_action, token_code: token_code, rule: self).translated_code
+      end
+
+      def contains_at_reference?
+        return false unless token_code
+
+        token_code.references.any? {|r| r.type == :at }
       end
     end
   end
diff --git a/tool/lrama/lib/lrama/grammar/rule_builder.rb b/tool/lrama/lib/lrama/grammar/rule_builder.rb
new file mode 100644
index 00000000000000..481a3780f49aa5
--- /dev/null
+++ b/tool/lrama/lib/lrama/grammar/rule_builder.rb
@@ -0,0 +1,255 @@
+# frozen_string_literal: true
+
+module Lrama
+  class Grammar
+    class RuleBuilder
+      attr_accessor :lhs, :line
+      attr_reader :lhs_tag, :rhs, :user_code, :precedence_sym
+
+      def initialize(rule_counter, midrule_action_counter, parameterizing_rule_resolver, position_in_original_rule_rhs = nil, lhs_tag: nil, skip_preprocess_references: false)
+        @rule_counter = rule_counter
+        @midrule_action_counter = midrule_action_counter
+        @parameterizing_rule_resolver = parameterizing_rule_resolver
+        @position_in_original_rule_rhs = position_in_original_rule_rhs
+        @skip_preprocess_references = skip_preprocess_references
+
+        @lhs = nil
+        @lhs_tag = lhs_tag
+        @rhs = []
+        @user_code = nil
+        @precedence_sym = nil
+        @line = nil
+        @rules = []
+        @rule_builders_for_parameterizing_rules = []
+        @rule_builders_for_derived_rules = []
+        @parameterizing_rules = []
+        @midrule_action_rules = []
+      end
+
+      def add_rhs(rhs)
+        @line ||= rhs.line
+
+        flush_user_code
+
+        @rhs << rhs
+      end
+
+      def user_code=(user_code)
+        @line ||= user_code&.line
+
+        flush_user_code
+
+        @user_code = user_code
+      end
+
+      def precedence_sym=(precedence_sym)
+        flush_user_code
+
+        @precedence_sym = precedence_sym
+      end
+
+      def complete_input
+        freeze_rhs
+      end
+
+      def setup_rules
+        preprocess_references unless @skip_preprocess_references
+        process_rhs
+        build_rules
+      end
+
+      def rules
+        @parameterizing_rules + @midrule_action_rules + @rules
+      end
+
+      def has_inline_rules?
+        rhs.any? { |token| @parameterizing_rule_resolver.find_inline(token) }
+      end
+
+      def resolve_inline_rules
+        resolved_builders = [] #: Array[RuleBuilder]
+        rhs.each_with_index do |token, i|
+          if (inline_rule = @parameterizing_rule_resolver.find_inline(token))
+            inline_rule.rhs_list.each do |inline_rhs|
+              rule_builder = RuleBuilder.new(@rule_counter, @midrule_action_counter, @parameterizing_rule_resolver, lhs_tag: lhs_tag)
+              if token.is_a?(Lexer::Token::InstantiateRule)
+                resolve_inline_rhs(rule_builder, inline_rhs, i, Binding.new(inline_rule.parameters, token.args))
+              else
+                resolve_inline_rhs(rule_builder, inline_rhs, i)
+              end
+              rule_builder.lhs = lhs
+              rule_builder.line = line
+              rule_builder.precedence_sym = precedence_sym
+              rule_builder.user_code = replace_inline_user_code(inline_rhs, i)
+              resolved_builders << rule_builder
+            end
+            break
+          end
+        end
+        resolved_builders
+      end
+
+      private
+
+      def freeze_rhs
+        @rhs.freeze
+      end
+
+      def preprocess_references
+        numberize_references
+      end
+
+      def build_rules
+        tokens = @replaced_rhs
+
+        rule = Rule.new(
+          id: @rule_counter.increment, _lhs: lhs, _rhs: tokens, lhs_tag: lhs_tag, token_code: user_code,
+          position_in_original_rule_rhs: @position_in_original_rule_rhs, precedence_sym: precedence_sym, lineno: line
+        )
+        @rules = [rule]
+        @parameterizing_rules = @rule_builders_for_parameterizing_rules.map do |rule_builder|
+          rule_builder.rules
+        end.flatten
+        @midrule_action_rules = @rule_builders_for_derived_rules.map do |rule_builder|
+          rule_builder.rules
+        end.flatten
+        @midrule_action_rules.each do |r|
+          r.original_rule = rule
+        end
+      end
+
+      # rhs is a mixture of variety type of tokens like `Ident`, `InstantiateRule`, `UserCode` and so on.
+      # `#process_rhs` replaces some kind of tokens to `Ident` so that all `@replaced_rhs` are `Ident` or `Char`.
+      def process_rhs
+        return if @replaced_rhs
+
+        @replaced_rhs = []
+
+        rhs.each_with_index do |token, i|
+          case token
+          when Lrama::Lexer::Token::Char
+            @replaced_rhs << token
+          when Lrama::Lexer::Token::Ident
+            @replaced_rhs << token
+          when Lrama::Lexer::Token::InstantiateRule
+            parameterizing_rule = @parameterizing_rule_resolver.find_rule(token)
+            raise "Unexpected token. #{token}" unless parameterizing_rule
+
+            bindings = Binding.new(parameterizing_rule.parameters, token.args)
+            lhs_s_value = bindings.concatenated_args_str(token)
+            if (created_lhs = @parameterizing_rule_resolver.created_lhs(lhs_s_value))
+              @replaced_rhs << created_lhs
+            else
+              lhs_token = Lrama::Lexer::Token::Ident.new(s_value: lhs_s_value, location: token.location)
+              @replaced_rhs << lhs_token
+              @parameterizing_rule_resolver.created_lhs_list << lhs_token
+              parameterizing_rule.rhs_list.each do |r|
+                rule_builder = RuleBuilder.new(@rule_counter, @midrule_action_counter, @parameterizing_rule_resolver, lhs_tag: token.lhs_tag || parameterizing_rule.tag)
+                rule_builder.lhs = lhs_token
+                r.symbols.each { |sym| rule_builder.add_rhs(bindings.resolve_symbol(sym)) }
+                rule_builder.line = line
+                rule_builder.precedence_sym = r.precedence_sym
+                rule_builder.user_code = r.resolve_user_code(bindings)
+                rule_builder.complete_input
+                rule_builder.setup_rules
+                @rule_builders_for_parameterizing_rules << rule_builder
+              end
+            end
+          when Lrama::Lexer::Token::UserCode
+            prefix = token.referred ? "@" : "$@"
+            tag = token.tag || lhs_tag
+            new_token = Lrama::Lexer::Token::Ident.new(s_value: prefix + @midrule_action_counter.increment.to_s)
+            @replaced_rhs << new_token
+
+            rule_builder = RuleBuilder.new(@rule_counter, @midrule_action_counter, @parameterizing_rule_resolver, i, lhs_tag: tag, skip_preprocess_references: true)
+            rule_builder.lhs = new_token
+            rule_builder.user_code = token
+            rule_builder.complete_input
+            rule_builder.setup_rules
+
+            @rule_builders_for_derived_rules << rule_builder
+          else
+            raise "Unexpected token. #{token}"
+          end
+        end
+      end
+
+      def resolve_inline_rhs(rule_builder, inline_rhs, index, bindings = nil)
+        rhs.each_with_index do |token, i|
+          if index == i
+            inline_rhs.symbols.each { |sym| rule_builder.add_rhs(bindings.nil? ? sym : bindings.resolve_symbol(sym)) }
+          else
+            rule_builder.add_rhs(token)
+          end
+        end
+      end
+
+      def replace_inline_user_code(inline_rhs, index)
+        return user_code if inline_rhs.user_code.nil?
+        return user_code if user_code.nil?
+
+        code = user_code.s_value.gsub(/\$#{index + 1}/, inline_rhs.user_code.s_value)
+        user_code.references.each do |ref|
+          next if ref.index.nil? || ref.index <= index # nil is a case for `$$`
+          code = code.gsub(/\$#{ref.index}/, "$#{ref.index + (inline_rhs.symbols.count-1)}")
+          code = code.gsub(/@#{ref.index}/, "@#{ref.index + (inline_rhs.symbols.count-1)}")
+        end
+        Lrama::Lexer::Token::UserCode.new(s_value: code, location: user_code.location)
+      end
+
+      def numberize_references
+        # Bison n'th component is 1-origin
+        (rhs + [user_code]).compact.each.with_index(1) do |token, i|
+          next unless token.is_a?(Lrama::Lexer::Token::UserCode)
+
+          token.references.each do |ref|
+            ref_name = ref.name
+
+            if ref_name
+              if ref_name == '$'
+                ref.name = '$'
+              else
+                candidates = ([lhs] + rhs).each_with_index.select {|token, _i| token.referred_by?(ref_name) }
+
+                if candidates.size >= 2
+                  token.invalid_ref(ref, "Referring symbol `#{ref_name}` is duplicated.")
+                end
+
+                unless (referring_symbol = candidates.first)
+                  token.invalid_ref(ref, "Referring symbol `#{ref_name}` is not found.")
+                end
+
+                if referring_symbol[1] == 0 # Refers to LHS
+                  ref.name = '$'
+                else
+                  ref.number = referring_symbol[1]
+                end
+              end
+            end
+
+            if ref.number
+              ref.index = ref.number
+            end
+
+            # TODO: Need to check index of @ too?
+            next if ref.type == :at
+
+            if ref.index
+              # TODO: Prohibit $0 even so Bison allows it?
+              # See: https://www.gnu.org/software/bison/manual/html_node/Actions.html
+              token.invalid_ref(ref, "Can not refer following component. #{ref.index} >= #{i}.") if ref.index >= i
+              rhs[ref.index - 1].referred = true
+            end
+          end
+        end
+      end
+
+      def flush_user_code
+        if (c = @user_code)
+          @rhs << c
+          @user_code = nil
+        end
+      end
+    end
+  end
+end
diff --git a/tool/lrama/lib/lrama/grammar/stdlib.y b/tool/lrama/lib/lrama/grammar/stdlib.y
new file mode 100644
index 00000000000000..d6e89c908c5139
--- /dev/null
+++ b/tool/lrama/lib/lrama/grammar/stdlib.y
@@ -0,0 +1,122 @@
+/**********************************************************************
+
+  stdlib.y
+
+  This is lrama's standard library. It provides a number of
+  parameterizing rule definitions, such as options and lists,
+  that should be useful in a number of situations.
+
+**********************************************************************/
+
+// -------------------------------------------------------------------
+// Options
+
+/*
+ * program: option(number)
+ *
+ * =>
+ *
+ * program: option_number
+ * option_number: %empty
+ * option_number: number
+ */
+%rule option(X): /* empty */
+               | X
+               ;
+
+// -------------------------------------------------------------------
+// Sequences
+
+/*
+ * program: preceded(opening, X)
+ *
+ * =>
+ *
+ * program: preceded_opening_X
+ * preceded_opening_X: opening X
+ */
+%rule preceded(opening, X): opening X { $$ = $2; }
+                          ;
+
+/*
+ * program: terminated(X, closing)
+ *
+ * =>
+ *
+ * program: terminated_X_closing
+ * terminated_X_closing: X closing
+ */
+%rule terminated(X, closing): X closing { $$ = $1; }
+                            ;
+
+/*
+ * program: delimited(opening, X, closing)
+ *
+ * =>
+ *
+ * program: delimited_opening_X_closing
+ * delimited_opening_X_closing: opening X closing
+ */
+%rule delimited(opening, X, closing): opening X closing { $$ = $2; }
+                                     ;
+
+// -------------------------------------------------------------------
+// Lists
+
+/*
+ * program: list(number)
+ *
+ * =>
+ *
+ * program: list_number
+ * list_number: %empty
+ * list_number: list_number number
+ */
+%rule list(X): /* empty */
+             | list(X) X
+             ;
+
+/*
+ * program: nonempty_list(number)
+ *
+ * =>
+ *
+ * program: nonempty_list_number
+ * nonempty_list_number: number
+ * nonempty_list_number: nonempty_list_number number
+ */
+%rule nonempty_list(X): X
+                      | nonempty_list(X) X
+                      ;
+
+/*
+ * program: separated_nonempty_list(comma, number)
+ *
+ * =>
+ *
+ * program: separated_nonempty_list_comma_number
+ * separated_nonempty_list_comma_number: number
+ * separated_nonempty_list_comma_number: separated_nonempty_list_comma_number comma number
+ */
+%rule separated_nonempty_list(separator, X): X
+                                           | separated_nonempty_list(separator, X) separator X
+                                           ;
+
+/*
+ * program: separated_list(comma, number)
+ *
+ * =>
+ *
+ * program: separated_list_comma_number
+ * separated_list_comma_number: option_separated_nonempty_list_comma_number
+ * option_separated_nonempty_list_comma_number: %empty
+ * option_separated_nonempty_list_comma_number: separated_nonempty_list_comma_number
+ * separated_nonempty_list_comma_number: number
+ * separated_nonempty_list_comma_number: comma separated_nonempty_list_comma_number number
+ */
+%rule separated_list(separator, X): option(separated_nonempty_list(separator, X))
+                                  ;
+
+%%
+
+%union{};
diff --git a/tool/lrama/lib/lrama/grammar/symbol.rb b/tool/lrama/lib/lrama/grammar/symbol.rb
index 9df1c2f636daf1..f9dffcad6c6b96 100644
--- a/tool/lrama/lib/lrama/grammar/symbol.rb
+++ b/tool/lrama/lib/lrama/grammar/symbol.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Symbol is both of nterm and term
 # `number` is both for nterm and term
 # `token_id` is tokentype for term, internal sequence number for nterm
@@ -6,10 +8,25 @@
 
 module Lrama
   class Grammar
-    class Symbol < Struct.new(:id, :alias_name, :number, :tag, :term, :token_id, :nullable, :precedence, :printer, :error_token, keyword_init: true)
-      attr_accessor :first_set, :first_set_bitmap
+    class Symbol
+      attr_accessor :id, :alias_name, :tag, :number, :token_id, :nullable, :precedence,
+                    :printer, :destructor, :error_token, :first_set, :first_set_bitmap
+      attr_reader :term
       attr_writer :eof_symbol, :error_symbol, :undef_symbol, :accept_symbol
 
+      def initialize(id:, term:, alias_name: nil, number: nil, tag: nil, token_id: nil, nullable: nil, precedence: nil, printer: nil, destructor: nil)
+        @id = id
+        @alias_name = alias_name
+        @number = number
+        @tag = tag
+        @term = term
+        @token_id = token_id
+        @nullable = nullable
+        @precedence = precedence
+        @printer = printer
+        @destructor = destructor
+      end
+
       def term?
         term
       end
@@ -41,15 +58,16 @@ def display_name
       # name for yysymbol_kind_t
       #
       # See: b4_symbol_kind_base
+      # @type var name: String
       def enum_name
         case
         when accept_symbol?
           name = "YYACCEPT"
         when eof_symbol?
           name = "YYEOF"
-        when term? && id.type == Token::Char
+        when term? && id.is_a?(Lrama::Lexer::Token::Char)
           name = number.to_s + display_name
-        when term? && id.type == Token::Ident
+        when term? && id.is_a?(Lrama::Lexer::Token::Ident)
           name = id.s_value
         when nterm? && (id.s_value.include?("$") || id.s_value.include?("@"))
           name = number.to_s + id.s_value
diff --git a/tool/lrama/lib/lrama/grammar/symbols.rb b/tool/lrama/lib/lrama/grammar/symbols.rb
new file mode 100644
index 00000000000000..337241d1b2ad47
--- /dev/null
+++ b/tool/lrama/lib/lrama/grammar/symbols.rb
@@ -0,0 +1,3 @@
+# frozen_string_literal: true
+
+require_relative "symbols/resolver"
diff --git a/tool/lrama/lib/lrama/grammar/symbols/resolver.rb b/tool/lrama/lib/lrama/grammar/symbols/resolver.rb
new file mode 100644
index 00000000000000..52f4ff90bdf1b8
--- /dev/null
+++ b/tool/lrama/lib/lrama/grammar/symbols/resolver.rb
@@ -0,0 +1,301 @@
+# frozen_string_literal: true
+
+module Lrama
+  class Grammar
+    class Symbols
+      class Resolver
+        attr_reader :terms, :nterms
+
+        def initialize
+          @terms = []
+          @nterms = []
+        end
+
+        def symbols
+          @symbols ||= (@terms + @nterms)
+        end
+
+        def sort_by_number!
+          symbols.sort_by!(&:number)
+        end
+
+        def add_term(id:, alias_name: nil, tag: nil, token_id: nil, replace: false)
+          if token_id && (sym = find_symbol_by_token_id(token_id))
+            if replace
+              sym.id = id
+              sym.alias_name = alias_name
+              sym.tag = tag
+            end
+
+            return sym
+          end
+
+          if (sym = find_symbol_by_id(id))
+            return sym
+          end
+
+          @symbols = nil
+          term = Symbol.new(
+            id: id, alias_name: alias_name, number: nil, tag: tag,
+            term: true, token_id: token_id, nullable: false
+          )
+          @terms << term
+          term
+        end
+
+        def add_nterm(id:, alias_name: nil, tag: nil)
+          if (sym = find_symbol_by_id(id))
+            return sym
+          end
+
+          @symbols = nil
+          nterm = Symbol.new(
+            id: id, alias_name: alias_name, number: nil, tag: tag,
+            term: false, token_id: nil, nullable: nil,
+          )
+          @nterms << nterm
+          nterm
+        end
+
+        def find_term_by_s_value(s_value)
+          terms.find { |s| s.id.s_value == s_value }
+        end
+
+        def find_symbol_by_s_value(s_value)
+          symbols.find { |s| s.id.s_value == s_value }
+        end
+
+        def find_symbol_by_s_value!(s_value)
+          find_symbol_by_s_value(s_value) || (raise "Symbol not found. value: `#{s_value}`")
+        end
+
+        def find_symbol_by_id(id)
+          symbols.find do |s|
+            s.id == id || s.alias_name == id.s_value
+          end
+        end
+
+        def find_symbol_by_id!(id)
+          find_symbol_by_id(id) || (raise "Symbol not found. #{id}")
+        end
+
+        def find_symbol_by_token_id(token_id)
+          symbols.find {|s| s.token_id == token_id }
+        end
+
+        def find_symbol_by_number!(number)
+          sym = symbols[number]
+
+          raise "Symbol not found. number: `#{number}`" unless sym
+          raise "[BUG] Symbol number mismatch. #{number}, #{sym}" if sym.number != number
+
+          sym
+        end
+
+        def fill_symbol_number
+          # YYEMPTY = -2
+          # YYEOF   =  0
+          # YYerror =  1
+          # YYUNDEF =  2
+          @number = 3
+          fill_terms_number
+          fill_nterms_number
+        end
+
+        def fill_nterm_type(types)
+          types.each do |type|
+            nterm = find_nterm_by_id!(type.id)
+            nterm.tag = type.tag
+          end
+        end
+
+        def fill_printer(printers)
+          symbols.each do |sym|
+            printers.each do |printer|
+              printer.ident_or_tags.each do |ident_or_tag|
+                case ident_or_tag
+                when Lrama::Lexer::Token::Ident
+                  sym.printer = printer if sym.id == ident_or_tag
+                when Lrama::Lexer::Token::Tag
+                  sym.printer = printer if sym.tag == ident_or_tag
+                else
+                  raise "Unknown token type. #{printer}"
+                end
+              end
+            end
+          end
+        end
+
+        def fill_destructor(destructors)
+          symbols.each do |sym|
+            destructors.each do |destructor|
+              destructor.ident_or_tags.each do |ident_or_tag|
+                case ident_or_tag
+                when Lrama::Lexer::Token::Ident
+                  sym.destructor = destructor if sym.id == ident_or_tag
+                when Lrama::Lexer::Token::Tag
+                  sym.destructor = destructor if sym.tag == ident_or_tag
+                else
+                  raise "Unknown token type. #{destructor}"
+                end
+              end
+            end
+          end
+        end
+
+        def fill_error_token(error_tokens)
+          symbols.each do |sym|
+            error_tokens.each do |token|
+              token.ident_or_tags.each do |ident_or_tag|
+                case ident_or_tag
+                when Lrama::Lexer::Token::Ident
+                  sym.error_token = token if sym.id == ident_or_tag
+                when Lrama::Lexer::Token::Tag
+                  sym.error_token = token if sym.tag == ident_or_tag
+                else
+                  raise "Unknown token type. #{token}"
+                end
+              end
+            end
+          end
+        end
+
+        def token_to_symbol(token)
+          case token
+          when Lrama::Lexer::Token
+            find_symbol_by_id!(token)
+          else
+            raise "Unknown class: #{token}"
+          end
+        end
+
+        def validate!
+          validate_number_uniqueness!
+          validate_alias_name_uniqueness!
+        end
+
+        private
+
+        def find_nterm_by_id!(id)
+          @nterms.find do |s|
+            s.id == id
+          end || (raise "Symbol not found. #{id}")
+        end
+
+        def fill_terms_number
+          # Character literal in grammar file has
+          # token id corresponding to ASCII code by default,
+          # so start token_id from 256.
+          token_id = 256
+
+          @terms.each do |sym|
+            while used_numbers[@number] do
+              @number += 1
+            end
+
+            if sym.number.nil?
+              sym.number = @number
+              used_numbers[@number] = true
+              @number += 1
+            end
+
+            # If id is Token::Char, it uses ASCII code
+            if sym.token_id.nil?
+              if sym.id.is_a?(Lrama::Lexer::Token::Char)
+                # Ignore ' on the both sides
+                case sym.id.s_value[1..-2]
+                when "\\b"
+                  sym.token_id = 8
+                when "\\f"
+                  sym.token_id = 12
+                when "\\n"
+                  sym.token_id = 10
+                when "\\r"
+                  sym.token_id = 13
+                when "\\t"
+                  sym.token_id = 9
+                when "\\v"
+                  sym.token_id = 11
+                when "\""
+                  sym.token_id = 34
+                when "'"
+                  sym.token_id = 39
+                when "\\\\"
+                  sym.token_id = 92
+                when /\A\\(\d+)\z/
+                  unless (id = Integer($1, 8)).nil?
+                    sym.token_id = id
+                  else
+                    raise "Unknown Char s_value #{sym}"
+                  end
+                when /\A(.)\z/
+                  unless (id = $1&.bytes&.first).nil?
+                    sym.token_id = id
+                  else
+                    raise "Unknown Char s_value #{sym}"
+                  end
+                else
+                  raise "Unknown Char s_value #{sym}"
+                end
+              else
+                sym.token_id = token_id
+                token_id += 1
+              end
+            end
+          end
+        end
+
+        def fill_nterms_number
+          token_id = 0
+
+          @nterms.each do |sym|
+            while used_numbers[@number] do
+              @number += 1
+            end
+
+            if sym.number.nil?
+              sym.number = @number
+              used_numbers[@number] = true
+              @number += 1
+            end
+
+            if sym.token_id.nil?
+              sym.token_id = token_id
+              token_id += 1
+            end
+          end
+        end
+
+        def used_numbers
+          return @used_numbers if defined?(@used_numbers)
+
+          @used_numbers = {}
+          symbols.map(&:number).each do |n|
+            @used_numbers[n] = true
+          end
+          @used_numbers
+        end
+
+        def validate_number_uniqueness!
+          invalid = symbols.group_by(&:number).select do |number, syms|
+            syms.count > 1
+          end
+
+          return if invalid.empty?
+
+          raise "Symbol number is duplicated. #{invalid}"
+        end
+
+        def validate_alias_name_uniqueness!
+          invalid = symbols.select(&:alias_name).group_by(&:alias_name).select do |alias_name, syms|
+            syms.count > 1
+          end
+
+          return if invalid.empty?
+
+          raise "Symbol alias name is duplicated. #{invalid}"
+        end
+      end
+    end
+  end
+end
diff --git a/tool/lrama/lib/lrama/grammar/type.rb b/tool/lrama/lib/lrama/grammar/type.rb
new file mode 100644
index 00000000000000..65537288b310b4
--- /dev/null
+++ b/tool/lrama/lib/lrama/grammar/type.rb
@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+module Lrama
+  class Grammar
+    class Type
+      attr_reader :id, :tag
+
+      def initialize(id:, tag:)
+        @id = id
+        @tag = tag
+      end
+
+      def ==(other)
+        self.class == other.class &&
+        self.id == other.id &&
+        self.tag == other.tag
+      end
+    end
+  end
+end
diff --git a/tool/lrama/lib/lrama/grammar/union.rb b/tool/lrama/lib/lrama/grammar/union.rb
index 978cebf22d3b3a..5f1bee0069af23 100644
--- a/tool/lrama/lib/lrama/grammar/union.rb
+++ b/tool/lrama/lib/lrama/grammar/union.rb
@@ -1,9 +1,11 @@
+# frozen_string_literal: true
+
 module Lrama
   class Grammar
     class Union < Struct.new(:code, :lineno, keyword_init: true)
       def braces_less_code
-        # Remove braces
-        code.s_value[1..-2]
+        # Braces is already removed by lexer
+        code.s_value
       end
     end
   end
diff --git a/tool/lrama/lib/lrama/grammar_validator.rb b/tool/lrama/lib/lrama/grammar_validator.rb
new file mode 100644
index 00000000000000..7790499589dfcc
--- /dev/null
+++ b/tool/lrama/lib/lrama/grammar_validator.rb
@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+module Lrama
+  class GrammarValidator
+    def initialize(grammar, states, logger)
+      @grammar = grammar
+      @states = states
+      @logger = logger
+    end
+
+    def valid?
+      conflicts_within_threshold?
+    end
+
+    private
+
+    def conflicts_within_threshold?
+      return true unless @grammar.expect
+
+      [sr_conflicts_within_threshold(@grammar.expect), rr_conflicts_within_threshold(0)].all?
+    end
+
+    def sr_conflicts_within_threshold(expected)
+      return true if expected == @states.sr_conflicts_count
+
+      @logger.error("shift/reduce conflicts: #{@states.sr_conflicts_count} found, #{expected} expected")
+      false
+    end
+
+    def rr_conflicts_within_threshold(expected)
+      return true if expected == @states.rr_conflicts_count
+
+      @logger.error("reduce/reduce conflicts: #{@states.rr_conflicts_count} found, #{expected} expected")
+      false
+    end
+  end
+end
diff --git a/tool/lrama/lib/lrama/lexer.rb b/tool/lrama/lib/lrama/lexer.rb
index c591684a05e621..c50af82ae4c300 100644
--- a/tool/lrama/lib/lrama/lexer.rb
+++ b/tool/lrama/lib/lrama/lexer.rb
@@ -1,332 +1,191 @@
+# frozen_string_literal: true
+
 require "strscan"
-require "lrama/report/duration"
-require "lrama/lexer/token"
+
+require_relative "lexer/grammar_file"
+require_relative "lexer/location"
+require_relative "lexer/token"
 
 module Lrama
-  # Lexer for parse.y
   class Lexer
-    include Lrama::Report::Duration
-
-    # States
-    #
-    # See: https://www.gnu.org/software/bison/manual/html_node/Grammar-Outline.html
-    Initial = 0
-    Prologue = 1
-    BisonDeclarations = 2
-    GrammarRules = 3
-    Epilogue = 4
-
-    # Token types
-
-    attr_reader :prologue, :bison_declarations, :grammar_rules, :epilogue,
-                :bison_declarations_tokens, :grammar_rules_tokens
-
-    def initialize(text)
-      @text = text
-      @state = Initial
-      # Array of texts
-      @prologue = []
-      @bison_declarations = []
-      @grammar_rules = []
-      @epilogue = []
-
-      @bison_declarations_tokens = []
-      @grammar_rules_tokens = []
-
-      @debug = false
+    attr_reader :head_line, :head_column, :line
+    attr_accessor :status, :end_symbol
+
+    SYMBOLS = ['%{', '%}', '%%', '{', '}', '\[', '\]', '\(', '\)', '\,', ':', '\|', ';'].freeze
+    PERCENT_TOKENS = %w(
+      %union
+      %token
+      %type
+      %nterm
+      %left
+      %right
+      %nonassoc
+      %expect
+      %define
+      %require
+      %printer
+      %destructor
+      %lex-param
+      %parse-param
+      %initial-action
+      %precedence
+      %prec
+      %error-token
+      %before-reduce
+      %after-reduce
+      %after-shift-error-token
+      %after-shift
+      %after-pop-stack
+      %empty
+      %code
+      %rule
+      %no-stdlib
+      %inline
+      %locations
+    ).freeze
+
+    def initialize(grammar_file)
+      @grammar_file = grammar_file
+      @scanner = StringScanner.new(grammar_file.text)
+      @head_column = @head = @scanner.pos
+      @head_line = @line = 1
+      @status = :initial
+      @end_symbol = nil
+    end
 
-      report_duration(:lex) do
-        lex_text
-        lex_bison_declarations_tokens
-        lex_grammar_rules_tokens
+    def next_token
+      case @status
+      when :initial
+        lex_token
+      when :c_declaration
+        lex_c_code
       end
     end
 
-    private
-
-    def create_token(type, s_value, line, column)
-      t = Token.new(type: type, s_value: s_value)
-      t.line = line
-      t.column = column
-
-      return t
+    def column
+      @scanner.pos - @head
     end
 
-    # TODO: Remove this
-    def lex_text
-      @text.each_line.with_index(1) do |string, lineno|
-        case @state
-        when Initial
-          # Skip until "%{"
-          if string == "%{\n"
-            @state = Prologue
-            @prologue << ["", lineno]
-            next
-          end
-        when Prologue
-          # Between "%{" and "%}"
-          if string == "%}\n"
-            @state = BisonDeclarations
-            @prologue << ["", lineno]
-            next
-          end
-
-          @prologue << [string, lineno]
-        when BisonDeclarations
-          if string == "%%\n"
-            @state = GrammarRules
-            next
-          end
-
-          @bison_declarations << [string, lineno]
-        when GrammarRules
-          # Between "%%" and "%%"
-          if string == "%%\n"
-            @state = Epilogue
-            next
-          end
-
-          @grammar_rules << [string, lineno]
-        when Epilogue
-          @epilogue << [string, lineno]
-        else
-          raise "Unknown state: #{@state}"
-        end
-      end
+    def location
+      Location.new(
+        grammar_file: @grammar_file,
+        first_line: @head_line, first_column: @head_column,
+        last_line: line, last_column: column
+      )
     end
 
-    # See:
-    #   * https://www.gnu.org/software/bison/manual/html_node/Decl-Summary.html
-    #   * https://www.gnu.org/software/bison/manual/html_node/Symbol-Decls.html
-    #   * https://www.gnu.org/software/bison/manual/html_node/Empty-Rules.html
-    def lex_common(lines, tokens)
-      line = lines.first[1]
-      column = 0
-      ss = StringScanner.new(lines.map(&:first).join)
-
-      while !ss.eos? do
+    def lex_token
+      until @scanner.eos? do
         case
-        when ss.scan(/\n/)
-          line += 1
-          column = ss.pos
-        when ss.scan(/\s+/)
-          # skip
-        when ss.scan(/;/)
-          tokens << create_token(Token::Semicolon, ss[0], line, ss.pos - column)
-        when ss.scan(/\|/)
-          tokens << create_token(Token::Bar, ss[0], line, ss.pos - column)
-        when ss.scan(/(\d+)/)
-          tokens << create_token(Token::Number, Integer(ss[0]), line, ss.pos - column)
-        when ss.scan(/(<[a-zA-Z0-9_]+>)/)
-          tokens << create_token(Token::Tag, ss[0], line, ss.pos - column)
-        when ss.scan(/([a-zA-Z_.][-a-zA-Z0-9_.]*)\[([a-zA-Z_.][-a-zA-Z0-9_.]*)\]\s*:/)
-          tokens << create_token(Token::Ident_Colon, ss[1], line, ss.pos - column)
-          tokens << create_token(Token::Named_Ref, ss[2], line, ss.pos - column)
-        when ss.scan(/([a-zA-Z_.][-a-zA-Z0-9_.]*)\s*:/)
-          tokens << create_token(Token::Ident_Colon, ss[1], line, ss.pos - column)
-        when ss.scan(/([a-zA-Z_.][-a-zA-Z0-9_.]*)/)
-          tokens << create_token(Token::Ident, ss[0], line, ss.pos - column)
-        when ss.scan(/\[([a-zA-Z_.][-a-zA-Z0-9_.]*)\]/)
-          tokens << create_token(Token::Named_Ref, ss[1], line, ss.pos - column)
-        when ss.scan(/%expect/)
-          tokens << create_token(Token::P_expect, ss[0], line, ss.pos - column)
-        when ss.scan(/%define/)
-          tokens << create_token(Token::P_define, ss[0], line, ss.pos - column)
-        when ss.scan(/%printer/)
-          tokens << create_token(Token::P_printer, ss[0], line, ss.pos - column)
-        when ss.scan(/%error-token/)
-          tokens << create_token(Token::P_error_token, ss[0], line, ss.pos - column)
-        when ss.scan(/%lex-param/)
-          tokens << create_token(Token::P_lex_param, ss[0], line, ss.pos - column)
-        when ss.scan(/%parse-param/)
-          tokens << create_token(Token::P_parse_param, ss[0], line, ss.pos - column)
-        when ss.scan(/%initial-action/)
-          tokens << create_token(Token::P_initial_action, ss[0], line, ss.pos - column)
-        when ss.scan(/%union/)
-          tokens << create_token(Token::P_union, ss[0], line, ss.pos - column)
-        when ss.scan(/%token/)
-          tokens << create_token(Token::P_token, ss[0], line, ss.pos - column)
-        when ss.scan(/%type/)
-          tokens << create_token(Token::P_type, ss[0], line, ss.pos - column)
-        when ss.scan(/%nonassoc/)
-          tokens << create_token(Token::P_nonassoc, ss[0], line, ss.pos - column)
-        when ss.scan(/%left/)
-          tokens << create_token(Token::P_left, ss[0], line, ss.pos - column)
-        when ss.scan(/%right/)
-          tokens << create_token(Token::P_right, ss[0], line, ss.pos - column)
-        when ss.scan(/%precedence/)
-          tokens << create_token(Token::P_precedence, ss[0], line, ss.pos - column)
-        when ss.scan(/%prec/)
-          tokens << create_token(Token::P_prec, ss[0], line, ss.pos - column)
-        when ss.scan(/{/)
-          token, line = lex_user_code(ss, line, ss.pos - column, lines)
-          tokens << token
-        when ss.scan(/"/)
-          string, line = lex_string(ss, "\"", line, lines)
-          token = create_token(Token::String, string, line, ss.pos - column)
-          tokens << token
-        when ss.scan(/\/\*/)
-          # TODO: Need to keep comment?
-          line = lex_comment(ss, line, lines, "")
-        when ss.scan(/\/\//)
-          line = lex_line_comment(ss, line, "")
-        when ss.scan(/'(.)'/)
-          tokens << create_token(Token::Char, ss[0], line, ss.pos - column)
-        when ss.scan(/'\\(.)'/) # '\\', '\t'
-          tokens << create_token(Token::Char, ss[0], line, ss.pos - column)
-        when ss.scan(/'\\(\d+)'/) # '\13'
-          tokens << create_token(Token::Char, ss[0], line, ss.pos - column)
-        when ss.scan(/%empty/)
-          # skip
+        when @scanner.scan(/\n/)
+          newline
+        when @scanner.scan(/\s+/)
+          # noop
+        when @scanner.scan(/\/\*/)
+          lex_comment
+        when @scanner.scan(/\/\/.*(?<newline>\n)?/)
+          newline if @scanner[:newline]
         else
-          l = line - lines.first[1]
-          split = ss.string.split("\n")
-          col = ss.pos - split[0...l].join("\n").length
-          raise "Parse error (unknown token): #{split[l]} \"#{ss.string[ss.pos]}\" (#{line}: #{col})"
+          break
         end
       end
-    end
 
-    def lex_bison_declarations_tokens
-      lex_common(@bison_declarations, @bison_declarations_tokens)
-    end
-
-    def lex_user_code(ss, line, column, lines)
-      first_line = line
-      first_column = column
-      debug("Enter lex_user_code: #{line}")
-      brace_count = 1
-      str = "{"
-      # Array of [type, $n, tag, first column, last column]
-      # TODO: Is it better to keep string, like "$$", and use gsub?
-      references = []
-
-      while !ss.eos? do
-        case
-        when ss.scan(/\n/)
-          line += 1
-        when ss.scan(/"/)
-          string, line = lex_string(ss, "\"", line, lines)
-          str << string
-          next
-        when ss.scan(/'/)
-          string, line = lex_string(ss, "'", line, lines)
-          str << string
-          next
-        when ss.scan(/\$(<[a-zA-Z0-9_]+>)?\$/) # $$, $<long>$
-          tag = ss[1] ? create_token(Token::Tag, ss[1], line, str.length) : nil
-          references << [:dollar, "$", tag, str.length, str.length + ss[0].length - 1]
-        when ss.scan(/\$(<[a-zA-Z0-9_]+>)?(\d+)/) # $1, $2, $<long>1
-          tag = ss[1] ? create_token(Token::Tag, ss[1], line, str.length) : nil
-          references << [:dollar, Integer(ss[2]), tag, str.length, str.length + ss[0].length - 1]
-        when ss.scan(/\$(<[a-zA-Z0-9_]+>)?([a-zA-Z_.][-a-zA-Z0-9_.]*)/) # $foo, $expr, $<long>program
-          tag = ss[1] ? create_token(Token::Tag, ss[1], line, str.length) : nil
-          references << [:dollar, ss[2], tag, str.length, str.length + ss[0].length - 1]
-        when ss.scan(/@\$/) # @$
-          references << [:at, "$", nil, str.length, str.length + ss[0].length - 1]
-        when ss.scan(/@(\d+)/) # @1
-          references << [:at, Integer(ss[1]), nil, str.length, str.length + ss[0].length - 1]
-        when ss.scan(/{/)
-          brace_count += 1
-        when ss.scan(/}/)
-          brace_count -= 1
-
-          debug("Return lex_user_code: #{line}")
-          if brace_count == 0
-            str << ss[0]
-            user_code = Token.new(type: Token::User_code, s_value: str.freeze)
-            user_code.line = first_line
-            user_code.column = first_column
-            user_code.references = references
-            return [user_code, line]
+      reset_first_position
+
+      case
+      when @scanner.eos?
+        return
+      when @scanner.scan(/#{SYMBOLS.join('|')}/)
+        return [@scanner.matched, @scanner.matched]
+      when @scanner.scan(/#{PERCENT_TOKENS.join('|')}/)
+        return [@scanner.matched, @scanner.matched]
+      when @scanner.scan(/[\?\+\*]/)
+        return [@scanner.matched, @scanner.matched]
+      when @scanner.scan(/<\w+>/)
+        return [:TAG, Lrama::Lexer::Token::Tag.new(s_value: @scanner.matched, location: location)]
+      when @scanner.scan(/'.'/)
+        return [:CHARACTER, Lrama::Lexer::Token::Char.new(s_value: @scanner.matched, location: location)]
+      when @scanner.scan(/'\\\\'|'\\b'|'\\t'|'\\f'|'\\r'|'\\n'|'\\v'|'\\13'/)
+        return [:CHARACTER, Lrama::Lexer::Token::Char.new(s_value: @scanner.matched, location: location)]
+      when @scanner.scan(/".*?"/)
+        return [:STRING, %Q(#{@scanner.matched})]
+      when @scanner.scan(/\d+/)
+        return [:INTEGER, Integer(@scanner.matched)]
+      when @scanner.scan(/([a-zA-Z_.][-a-zA-Z0-9_.]*)/)
+        token = Lrama::Lexer::Token::Ident.new(s_value: @scanner.matched, location: location)
+        type =
+          if @scanner.check(/\s*(\[\s*[a-zA-Z_.][-a-zA-Z0-9_.]*\s*\])?\s*:/)
+            :IDENT_COLON
+          else
+            :IDENTIFIER
           end
-        when ss.scan(/\/\*/)
-          str << ss[0]
-          line = lex_comment(ss, line, lines, str)
-        when ss.scan(/\/\//)
-          str << ss[0]
-          line = lex_line_comment(ss, line, str)
-        else
-          # noop, just consume char
-          str << ss.getch
-          next
-        end
-
-        str << ss[0]
+        return [type, token]
+      else
+        raise ParseError, "Unexpected token: #{@scanner.peek(10).chomp}."
       end
-
-      # Reach to end of input but brace does not match
-      l = line - lines.first[1]
-      raise "Parse error (brace mismatch): #{ss.string.split("\n")[l]} \"#{ss.string[ss.pos]}\" (#{line}: #{ss.pos})"
     end
 
-    def lex_string(ss, terminator, line, lines)
-      debug("Enter lex_string: #{line}")
-
-      str = terminator.dup
+    def lex_c_code
+      nested = 0
+      code = ''
+      reset_first_position
 
-      while (c = ss.getch) do
-        str << c
-
-        case c
-        when "\n"
-          line += 1
-        when terminator
-          debug("Return lex_string: #{line}")
-          return [str, line]
-        else
-          # noop
-        end
-      end
-
-      # Reach to end of input but quote does not match
-      l = line - lines.first[1]
-      raise "Parse error (quote mismatch): #{ss.string.split("\n")[l]} \"#{ss.string[ss.pos]}\" (#{line}: #{ss.pos})"
-    end
-
-    # /*  */ style comment
-    def lex_comment(ss, line, lines, str)
-      while !ss.eos? do
+      until @scanner.eos? do
         case
-        when ss.scan(/\n/)
-          line += 1
-        when ss.scan(/\*\//)
-          return line
+        when @scanner.scan(/{/)
+          code += @scanner.matched
+          nested += 1
+        when @scanner.scan(/}/)
+          if nested == 0 && @end_symbol == '}'
+            @scanner.unscan
+            return [:C_DECLARATION, Lrama::Lexer::Token::UserCode.new(s_value: code, location: location)]
+          else
+            code += @scanner.matched
+            nested -= 1
+          end
+        when @scanner.check(/#{@end_symbol}/)
+          return [:C_DECLARATION, Lrama::Lexer::Token::UserCode.new(s_value: code, location: location)]
+        when @scanner.scan(/\n/)
+          code += @scanner.matched
+          newline
+        when @scanner.scan(/".*?"/)
+          code += %Q(#{@scanner.matched})
+          @line += @scanner.matched.count("\n")
+        when @scanner.scan(/'.*?'/)
+          code += %Q(#{@scanner.matched})
+        when @scanner.scan(/[^\"'\{\}\n]+/)
+          code += @scanner.matched
+        when @scanner.scan(/#{Regexp.escape(@end_symbol)}/)
+          code += @scanner.matched
         else
-          str << ss.getch
-          next
+          code += @scanner.getch
         end
-
-        str << ss[0]
       end
-
-      # Reach to end of input but quote does not match
-      l = line - lines.first[1]
-      raise "Parse error (comment mismatch): #{ss.string.split("\n")[l]} \"#{ss.string[ss.pos]}\" (#{line}: #{ss.pos})"
+      raise ParseError, "Unexpected code: #{code}."
     end
 
-    # // style comment
-    def lex_line_comment(ss, line, str)
-      while !ss.eos? do
+    private
+
+    def lex_comment
+      until @scanner.eos? do
         case
-        when ss.scan(/\n/)
-          return line + 1
-        else
-          str << ss.getch
-          next
+        when @scanner.scan_until(/[\s\S]*?\*\//)
+          @scanner.matched.count("\n").times { newline }
+          return
+        when @scanner.scan_until(/\n/)
+          newline
         end
       end
-
-      line # Reach to end of input
     end
 
-    def lex_grammar_rules_tokens
-      lex_common(@grammar_rules, @grammar_rules_tokens)
+    def reset_first_position
+      @head_line = line
+      @head_column = column
     end
 
-    def debug(msg)
-      return unless @debug
-      puts "#{msg}\n"
+    def newline
+      @line += 1
+      @head = @scanner.pos
     end
   end
 end
diff --git a/tool/lrama/lib/lrama/lexer/grammar_file.rb b/tool/lrama/lib/lrama/lexer/grammar_file.rb
new file mode 100644
index 00000000000000..37e82ff18d3f4e
--- /dev/null
+++ b/tool/lrama/lib/lrama/lexer/grammar_file.rb
@@ -0,0 +1,40 @@
+# rbs_inline: enabled
+# frozen_string_literal: true
+
+module Lrama
+  class Lexer
+    class GrammarFile
+      class Text < String
+        # @rbs () -> String
+        def inspect
+          length <= 50 ? super : "#{self[0..47]}...".inspect
+        end
+      end
+
+      attr_reader :path #: String
+      attr_reader :text #: String
+
+      # @rbs (String path, String text) -> void
+      def initialize(path, text)
+        @path = path
+        @text = Text.new(text).freeze
+      end
+
+      # @rbs () -> String
+      def inspect
+        "<#{self.class}: @path=#{path}, @text=#{text.inspect}>"
+      end
+
+      # @rbs (GrammarFile other) -> bool
+      def ==(other)
+        self.class == other.class &&
+        self.path == other.path
+      end
+
+      # @rbs () -> Array[String]
+      def lines
+        @lines ||= text.split("\n")
+      end
+    end
+  end
+end
diff --git a/tool/lrama/lib/lrama/lexer/location.rb b/tool/lrama/lib/lrama/lexer/location.rb
new file mode 100644
index 00000000000000..defdbf8a0bc575
--- /dev/null
+++ b/tool/lrama/lib/lrama/lexer/location.rb
@@ -0,0 +1,115 @@
+# rbs_inline: enabled
+# frozen_string_literal: true
+
+module Lrama
+  class Lexer
+    class Location
+      attr_reader :grammar_file #: GrammarFile
+      attr_reader :first_line #: Integer
+      attr_reader :first_column #: Integer
+      attr_reader :last_line #: Integer
+      attr_reader :last_column #: Integer
+
+      # @rbs (grammar_file: GrammarFile, first_line: Integer, first_column: Integer, last_line: Integer, last_column: Integer) -> void
+      def initialize(grammar_file:, first_line:, first_column:, last_line:, last_column:)
+        @grammar_file = grammar_file
+        @first_line = first_line
+        @first_column = first_column
+        @last_line = last_line
+        @last_column = last_column
+      end
+
+      # @rbs (Location other) -> bool
+      def ==(other)
+        self.class == other.class &&
+        self.grammar_file == other.grammar_file &&
+        self.first_line == other.first_line &&
+        self.first_column == other.first_column &&
+        self.last_line == other.last_line &&
+        self.last_column == other.last_column
+      end
+
+      # @rbs (Integer left, Integer right) -> Location
+      def partial_location(left, right)
+        offset = -first_column
+        new_first_line = -1
+        new_first_column = -1
+        new_last_line = -1
+        new_last_column = -1
+
+        _text.each.with_index do |line, index|
+          new_offset = offset + line.length + 1
+
+          if offset <= left && left <= new_offset
+            new_first_line = first_line + index
+            new_first_column = left - offset
+          end
+
+          if offset <= right && right <= new_offset
+            new_last_line = first_line + index
+            new_last_column = right - offset
+          end
+
+          offset = new_offset
+        end
+
+        Location.new(
+          grammar_file: grammar_file,
+          first_line: new_first_line, first_column: new_first_column,
+          last_line: new_last_line, last_column: new_last_column
+        )
+      end
+
+      # @rbs () -> String
+      def to_s
+        "#{path} (#{first_line},#{first_column})-(#{last_line},#{last_column})"
+      end
+
+      # @rbs (String error_message) -> String
+      def generate_error_message(error_message)
+        <<~ERROR.chomp
+          #{path}:#{first_line}:#{first_column}: #{error_message}
+          #{line_with_carets}
+        ERROR
+      end
+
+      # @rbs () -> String
+      def line_with_carets
+        <<~TEXT
+          #{text}
+          #{carets}
+        TEXT
+      end
+
+      private
+
+      # @rbs () -> String
+      def path
+        grammar_file.path
+      end
+
+      # @rbs () -> String
+      def blanks
+        (text[0...first_column] or raise "#{first_column} is invalid").gsub(/[^\t]/, ' ')
+      end
+
+      # @rbs () -> String
+      def carets
+        blanks + '^' * (last_column - first_column)
+      end
+
+      # @rbs () -> String
+      def text
+        @text ||= _text.join("\n")
+      end
+
+      # @rbs () -> Array[String]
+      def _text
+        @_text ||=begin
+          range = (first_line - 1)...last_line
+          grammar_file.lines[range] or raise "#{range} is invalid"
+        end
+      end
+    end
+  end
+end
diff --git a/tool/lrama/lib/lrama/lexer/token.rb b/tool/lrama/lib/lrama/lexer/token.rb
index 4eca6f60077bbb..63da8be4a40653 100644
--- a/tool/lrama/lib/lrama/lexer/token.rb
+++ b/tool/lrama/lib/lrama/lexer/token.rb
@@ -1,78 +1,70 @@
-require 'lrama/lexer/token/type'
+# rbs_inline: enabled
+# frozen_string_literal: true
+
+require_relative 'token/char'
+require_relative 'token/ident'
+require_relative 'token/instantiate_rule'
+require_relative 'token/tag'
+require_relative 'token/user_code'
 
 module Lrama
   class Lexer
     class Token
+      attr_reader :s_value #: String
+      attr_reader :location #: Location
+      attr_accessor :alias_name #: String
+      attr_accessor :referred #: bool
 
-      attr_accessor :line, :column, :referred
-      # For User_code
-      attr_accessor :references
+      # @rbs (s_value: String, ?alias_name: String, ?location: Location) -> void
+      def initialize(s_value:, alias_name: nil, location: nil)
+        s_value.freeze
+        @s_value = s_value
+        @alias_name = alias_name
+        @location = location
+      end
 
+      # @rbs () -> String
       def to_s
-        "#{super} line: #{line}, column: #{column}"
+        "value: `#{s_value}`, location: #{location}"
       end
 
+      # @rbs (String string) -> bool
       def referred_by?(string)
-        [self.s_value, self.alias].include?(string)
+        [self.s_value, self.alias_name].compact.include?(string)
       end
 
+      # @rbs (Token other) -> bool
       def ==(other)
-        self.class == other.class && self.type == other.type && self.s_value == other.s_value
+        self.class == other.class && self.s_value == other.s_value
+      end
+
+      # @rbs () -> Integer
+      def first_line
+        location.first_line
       end
+      alias :line :first_line
 
-      def numberize_references(lhs, rhs)
-        self.references.map! {|ref|
-          ref_name = ref[1]
-          if ref_name.is_a?(::String) && ref_name != '$'
-            value =
-              if lhs.referred_by?(ref_name)
-                '$'
-              else
-                rhs.find_index {|token| token.referred_by?(ref_name) } + 1
-              end
-            [ref[0], value, ref[2], ref[3], ref[4]]
-          else
-            ref
-          end
-        }
+      # @rbs () -> Integer
+      def first_column
+        location.first_column
       end
+      alias :column :first_column
 
-      @i = 0
-      @types = []
+      # @rbs () -> Integer
+      def last_line
+        location.last_line
+      end
 
-      def self.define_type(name)
-        type = Type.new(id: @i, name: name.to_s)
-        const_set(name, type)
-        @types << type
-        @i += 1
+      # @rbs () -> Integer
+      def last_column
+        location.last_column
       end
 
-      # Token types
-      define_type(:P_expect)         # %expect
-      define_type(:P_define)         # %define
-      define_type(:P_printer)        # %printer
-      define_type(:P_error_token)    # %error-token
-      define_type(:P_lex_param)      # %lex-param
-      define_type(:P_parse_param)    # %parse-param
-      define_type(:P_initial_action) # %initial-action
-      define_type(:P_union)          # %union
-      define_type(:P_token)          # %token
-      define_type(:P_type)           # %type
-      define_type(:P_nonassoc)       # %nonassoc
-      define_type(:P_left)           # %left
-      define_type(:P_right)          # %right
-      define_type(:P_precedence)     # %precedence
-      define_type(:P_prec)           # %prec
-      define_type(:User_code)        # { ... }
-      define_type(:Tag)              # <int>
-      define_type(:Number)           # 0
-      define_type(:Ident_Colon)      # k_if:, k_if  : (spaces can be there)
-      define_type(:Ident)            # api.pure, tNUMBER
-      define_type(:Named_Ref)        # [foo]
-      define_type(:Semicolon)        # ;
-      define_type(:Bar)              # |
-      define_type(:String)           # "str"
-      define_type(:Char)             # '+'
+      # @rbs (Lrama::Grammar::Reference ref, String message) -> bot
+      def invalid_ref(ref, message)
+        location = self.location.partial_location(ref.first_column, ref.last_column)
+        raise location.generate_error_message(message)
+      end
     end
   end
 end
diff --git a/tool/lrama/lib/lrama/lexer/token/char.rb b/tool/lrama/lib/lrama/lexer/token/char.rb
new file mode 100644
index 00000000000000..fcab7a588f5e40
--- /dev/null
+++ b/tool/lrama/lib/lrama/lexer/token/char.rb
@@ -0,0 +1,11 @@
+# rbs_inline: enabled
+# frozen_string_literal: true
+
+module Lrama
+  class Lexer
+    class Token
+      class Char < Token
+      end
+    end
+  end
+end
diff --git a/tool/lrama/lib/lrama/lexer/token/ident.rb b/tool/lrama/lib/lrama/lexer/token/ident.rb
new file mode 100644
index 00000000000000..8b1328a040fadd
--- /dev/null
+++ b/tool/lrama/lib/lrama/lexer/token/ident.rb
@@ -0,0 +1,11 @@
+# rbs_inline: enabled
+# frozen_string_literal: true
+
+module Lrama
+  class Lexer
+    class Token
+      class Ident < Token
+      end
+    end
+  end
+end
diff --git a/tool/lrama/lib/lrama/lexer/token/instantiate_rule.rb b/tool/lrama/lib/lrama/lexer/token/instantiate_rule.rb
new file mode 100644
index 00000000000000..37d412aa838b3f
--- /dev/null
+++ b/tool/lrama/lib/lrama/lexer/token/instantiate_rule.rb
@@ -0,0 +1,30 @@
+# rbs_inline: enabled
+# frozen_string_literal: true
+
+module Lrama
+  class Lexer
+    class Token
+      class InstantiateRule < Token
+        attr_reader :args #: Array[Lexer::Token]
+        attr_reader :lhs_tag #: Lexer::Token::Tag?
+
+        # @rbs (s_value: String, ?alias_name: String, ?location: Location, ?args: Array[Lexer::Token], ?lhs_tag: Lexer::Token::Tag?) -> void
+        def initialize(s_value:, alias_name: nil, location: nil, args: [], lhs_tag: nil)
+          super s_value: s_value, alias_name: alias_name, location: location
+          @args = args
+          @lhs_tag = lhs_tag
+        end
+
+        # @rbs () -> String
+        def rule_name
+          s_value
+        end
+
+        # @rbs () -> Integer
+        def args_count
+          args.count
+        end
+      end
+    end
+  end
+end
diff --git a/tool/lrama/lib/lrama/lexer/token/tag.rb b/tool/lrama/lib/lrama/lexer/token/tag.rb
new file mode 100644
index 00000000000000..b346ef7c5c4075
--- /dev/null
+++ b/tool/lrama/lib/lrama/lexer/token/tag.rb
@@ -0,0 +1,16 @@
+# rbs_inline: enabled
+# frozen_string_literal: true
+
+module Lrama
+  class Lexer
+    class Token
+      class Tag < Token
+        # @rbs () -> String
+        def member
+          # Omit "<>"
+          s_value[1..-2] or raise "Unexpected Tag format (#{s_value})"
+        end
+      end
+    end
+  end
+end
diff --git a/tool/lrama/lib/lrama/lexer/token/type.rb b/tool/lrama/lib/lrama/lexer/token/type.rb
deleted file mode 100644
index d58a56f40bcfbc..00000000000000
--- a/tool/lrama/lib/lrama/lexer/token/type.rb
+++ /dev/null
@@ -1,8 +0,0 @@
-module Lrama
-  class Lexer
-    class Token < Struct.new(:type, :s_value, :alias, keyword_init: true)
-      class Type < Struct.new(:id, :name, keyword_init: true)
-      end
-    end
-  end
-end
diff --git a/tool/lrama/lib/lrama/lexer/token/user_code.rb b/tool/lrama/lib/lrama/lexer/token/user_code.rb
new file mode 100644
index 00000000000000..4ef40e6dc8f790
--- /dev/null
+++ b/tool/lrama/lib/lrama/lexer/token/user_code.rb
@@ -0,0 +1,83 @@
+# rbs_inline: enabled
+# frozen_string_literal: true
+
+require "strscan"
+
+module Lrama
+  class Lexer
+    class Token
+      class UserCode < Token
+        attr_accessor :tag #: Lexer::Token::Tag
+
+        # @rbs () -> Array[Lrama::Grammar::Reference]
+        def references
+          @references ||= _references
+        end
+
+        private
+
+        # @rbs () -> Array[Lrama::Grammar::Reference]
+        def _references
+          scanner = StringScanner.new(s_value)
+          references = [] #: Array[Grammar::Reference]
+
+          until scanner.eos? do
+            case
+            when reference = scan_reference(scanner)
+              references << reference
+            when scanner.scan(/\/\*/)
+              scanner.scan_until(/\*\//)
+            else
+              scanner.getch
+            end
+          end
+
+          references
+        end
+
+        # @rbs (StringScanner scanner) -> Lrama::Grammar::Reference?
+        def scan_reference(scanner)
+          start = scanner.pos
+          case
+          # $ references
+          # It need to wrap an identifier with brackets to use ".-" for identifiers
+          when scanner.scan(/\$(<[a-zA-Z0-9_]+>)?\$/) # $$, $<long>$
+            tag = scanner[1] ? Lrama::Lexer::Token::Tag.new(s_value: scanner[1]) : nil
+            return Lrama::Grammar::Reference.new(type: :dollar, name: "$", ex_tag: tag, first_column: start, last_column: scanner.pos)
+          when scanner.scan(/\$(<[a-zA-Z0-9_]+>)?(\d+)/) # $1, $2, $<long>1
+            tag = scanner[1] ? Lrama::Lexer::Token::Tag.new(s_value: scanner[1]) : nil
+            return Lrama::Grammar::Reference.new(type: :dollar, number: Integer(scanner[2]), index: Integer(scanner[2]), ex_tag: tag, first_column: start, last_column: scanner.pos)
+          when scanner.scan(/\$(<[a-zA-Z0-9_]+>)?([a-zA-Z_][a-zA-Z0-9_]*)/) # $foo, $expr, $<long>program (named reference without brackets)
+            tag = scanner[1] ? Lrama::Lexer::Token::Tag.new(s_value: scanner[1]) : nil
+            return Lrama::Grammar::Reference.new(type: :dollar, name: scanner[2], ex_tag: tag, first_column: start, last_column: scanner.pos)
+          when scanner.scan(/\$(<[a-zA-Z0-9_]+>)?\[([a-zA-Z_.][-a-zA-Z0-9_.]*)\]/) # $[expr.right], $[expr-right], $<long>[expr.right] (named reference with brackets)
+            tag = scanner[1] ? Lrama::Lexer::Token::Tag.new(s_value: scanner[1]) : nil
+            return Lrama::Grammar::Reference.new(type: :dollar, name: scanner[2], ex_tag: tag, first_column: start, last_column: scanner.pos)
+
+          # @ references
+          # It need to wrap an identifier with brackets to use ".-" for identifiers
+          when scanner.scan(/@\$/) # @$
+            return Lrama::Grammar::Reference.new(type: :at, name: "$", first_column: start, last_column: scanner.pos)
+          when scanner.scan(/@(\d+)/) # @1
+            return Lrama::Grammar::Reference.new(type: :at, number: Integer(scanner[1]), index: Integer(scanner[1]), first_column: start, last_column: scanner.pos)
+          when scanner.scan(/@([a-zA-Z][a-zA-Z0-9_]*)/) # @foo, @expr (named reference without brackets)
+            return Lrama::Grammar::Reference.new(type: :at, name: scanner[1], first_column: start, last_column: scanner.pos)
+          when scanner.scan(/@\[([a-zA-Z_.][-a-zA-Z0-9_.]*)\]/) # @[expr.right], @[expr-right]  (named reference with brackets)
+            return Lrama::Grammar::Reference.new(type: :at, name: scanner[1], first_column: start, last_column: scanner.pos)
+
+          # $: references
+          when scanner.scan(/\$:\$/) # $:$
+            return Lrama::Grammar::Reference.new(type: :index, name: "$", first_column: start, last_column: scanner.pos)
+          when scanner.scan(/\$:(\d+)/) # $:1
+            return Lrama::Grammar::Reference.new(type: :index, number: Integer(scanner[1]), first_column: start, last_column: scanner.pos)
+          when scanner.scan(/\$:([a-zA-Z_][a-zA-Z0-9_]*)/) # $:foo, $:expr (named reference without brackets)
+            return Lrama::Grammar::Reference.new(type: :index, name: scanner[1], first_column: start, last_column: scanner.pos)
+          when scanner.scan(/\$:\[([a-zA-Z_.][-a-zA-Z0-9_.]*)\]/) # $:[expr.right], $:[expr-right] (named reference with brackets)
+            return Lrama::Grammar::Reference.new(type: :index, name: scanner[1], first_column: start, last_column: scanner.pos)
+
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/tool/lrama/lib/lrama/logger.rb b/tool/lrama/lib/lrama/logger.rb
new file mode 100644
index 00000000000000..88bb9209604d60
--- /dev/null
+++ b/tool/lrama/lib/lrama/logger.rb
@@ -0,0 +1,21 @@
+# rbs_inline: enabled
+# frozen_string_literal: true
+
+module Lrama
+  class Logger
+    # @rbs (IO out) -> void
+    def initialize(out = STDERR)
+      @out = out
+    end
+
+    # @rbs (String message) -> void
+    def warn(message)
+      @out << message << "\n"
+    end
+
+    # @rbs (String message) -> void
+    def error(message)
+      @out << message << "\n"
+    end
+  end
+end
diff --git a/tool/lrama/lib/lrama/option_parser.rb b/tool/lrama/lib/lrama/option_parser.rb
new file mode 100644
index 00000000000000..23988a5fbb8099
--- /dev/null
+++ b/tool/lrama/lib/lrama/option_parser.rb
@@ -0,0 +1,169 @@
+# frozen_string_literal: true
+
+require 'optparse'
+
+module Lrama
+  # Handle option parsing for the command line interface.
+  class OptionParser
+    def initialize
+      @options = Options.new
+      @trace = []
+      @report = []
+    end
+
+    def parse(argv)
+      parse_by_option_parser(argv)
+
+      @options.trace_opts = validate_trace(@trace)
+      @options.report_opts = validate_report(@report)
+      @options.grammar_file = argv.shift
+
+      unless @options.grammar_file
+        abort "File should be specified\n"
+      end
+
+      if @options.grammar_file == '-'
+        @options.grammar_file = argv.shift or abort "File name for STDIN should be specified\n"
+      else
+        @options.y = File.open(@options.grammar_file, 'r')
+      end
+
+      if !@report.empty? && @options.report_file.nil? && @options.grammar_file
+        @options.report_file = File.dirname(@options.grammar_file) + "/" + File.basename(@options.grammar_file, ".*") + ".output"
+      end
+
+      if !@options.header_file && @options.header
+        case
+        when @options.outfile
+          @options.header_file = File.dirname(@options.outfile) + "/" + File.basename(@options.outfile, ".*") + ".h"
+        when @options.grammar_file
+          @options.header_file = File.dirname(@options.grammar_file) + "/" + File.basename(@options.grammar_file, ".*") + ".h"
+        end
+      end
+
+      @options
+    end
+
+    private
+
+    def parse_by_option_parser(argv)
+      ::OptionParser.new do |o|
+        o.banner = <<~BANNER
+          Lrama is LALR (1) parser generator written by Ruby.
+
+          Usage: lrama [options] FILE
+        BANNER
+        o.separator ''
+        o.separator 'STDIN mode:'
+        o.separator 'lrama [options] - FILE               read grammar from STDIN'
+        o.separator ''
+        o.separator 'Tuning the Parser:'
+        o.on('-S', '--skeleton=FILE', 'specify the skeleton to use') {|v| @options.skeleton = v }
+        o.on('-t', '--debug', 'display debugging outputs of internal parser') {|v| @options.debug = true }
+        o.on('-D', '--define=NAME[=VALUE]', Array, "similar to '%define NAME VALUE'") {|v| @options.define = v }
+        o.separator ''
+        o.separator 'Output:'
+        o.on('-H', '--header=[FILE]', 'also produce a header file named FILE') {|v| @options.header = true; @options.header_file = v }
+        o.on('-d', 'also produce a header file') { @options.header = true }
+        o.on('-r', '--report=REPORTS', Array, 'also produce details on the automaton') {|v| @report = v }
+        o.on_tail ''
+        o.on_tail 'REPORTS is a list of comma-separated words that can include:'
+        o.on_tail '    states                           describe the states'
+        o.on_tail '    itemsets                         complete the core item sets with their closure'
+        o.on_tail '    lookaheads                       explicitly associate lookahead tokens to items'
+        o.on_tail '    solved                           describe shift/reduce conflicts solving'
+        o.on_tail '    counterexamples, cex             generate conflict counterexamples'
+        o.on_tail '    rules                            list unused rules'
+        o.on_tail '    terms                            list unused terminals'
+        o.on_tail '    verbose                          report detailed internal state and analysis results'
+        o.on_tail '    all                              include all the above reports'
+        o.on_tail '    none                             disable all reports'
+        o.on('--report-file=FILE', 'also produce details on the automaton output to a file named FILE') {|v| @options.report_file = v }
+        o.on('-o', '--output=FILE', 'leave output to FILE') {|v| @options.outfile = v }
+        o.on('--trace=TRACES', Array, 'also output trace logs at runtime') {|v| @trace = v }
+        o.on_tail ''
+        o.on_tail 'TRACES is a list of comma-separated words that can include:'
+        o.on_tail '    automaton                        display states'
+        o.on_tail '    closure                          display states'
+        o.on_tail '    rules                            display grammar rules'
+        o.on_tail '    only-explicit-rules              display only explicit grammar rules'
+        o.on_tail '    actions                          display grammar rules with actions'
+        o.on_tail '    time                             display generation time'
+        o.on_tail '    all                              include all the above traces'
+        o.on_tail '    none                             disable all traces'
+        o.on('-v', '--verbose', "same as '--report=state'") {|_v| @report << 'states' }
+        o.separator ''
+        o.separator 'Diagnostics:'
+        o.on('-W', '--warnings', 'report the warnings') {|v| @options.diagnostic = true }
+        o.separator ''
+        o.separator 'Error Recovery:'
+        o.on('-e', 'enable error recovery') {|v| @options.error_recovery = true }
+        o.separator ''
+        o.separator 'Other options:'
+        o.on('-V', '--version', "output version information and exit") {|v| puts "lrama #{Lrama::VERSION}"; exit 0 }
+        o.on('-h', '--help', "display this help and exit") {|v| puts o; exit 0 }
+        o.on_tail
+        o.parse!(argv)
+      end
+    end
+
+    ALIASED_REPORTS = { cex: :counterexamples }.freeze
+    VALID_REPORTS = %i[states itemsets lookaheads solved counterexamples rules terms verbose].freeze
+
+    def validate_report(report)
+      h = { grammar: true }
+      return h if report.empty?
+      return {} if report == ['none']
+      if report == ['all']
+        VALID_REPORTS.each { |r| h[r] = true }
+        return h
+      end
+
+      report.each do |r|
+        aliased = aliased_report_option(r)
+        if VALID_REPORTS.include?(aliased)
+          h[aliased] = true
+        else
+          raise "Invalid report option \"#{r}\"."
+        end
+      end
+
+      return h
+    end
+
+    def aliased_report_option(opt)
+      (ALIASED_REPORTS[opt.to_sym] || opt).to_sym
+    end
+
+    VALID_TRACES = %w[
+      locations scan parse automaton bitsets closure
+      grammar rules only-explicit-rules actions resource
+      sets muscles tools m4-early m4 skeleton time ielr cex
+    ].freeze
+    NOT_SUPPORTED_TRACES = %w[
+      locations scan parse bitsets grammar resource
+      sets muscles tools m4-early m4 skeleton ielr cex
+    ].freeze
+    SUPPORTED_TRACES = VALID_TRACES - NOT_SUPPORTED_TRACES
+
+    def validate_trace(trace)
+      h = {}
+      return h if trace.empty? || trace == ['none']
+      all_traces = SUPPORTED_TRACES - %w[only-explicit-rules]
+      if trace == ['all']
+        all_traces.each { |t| h[t.gsub(/-/, '_').to_sym] = true }
+        return h
+      end
+
+      trace.each do |t|
+        if SUPPORTED_TRACES.include?(t)
+          h[t.gsub(/-/, '_').to_sym] = true
+        else
+          raise "Invalid trace option \"#{t}\"."
+        end
+      end
+
+      return h
+    end
+  end
+end
diff --git a/tool/lrama/lib/lrama/options.rb b/tool/lrama/lib/lrama/options.rb
new file mode 100644
index 00000000000000..08f75a770faa00
--- /dev/null
+++ b/tool/lrama/lib/lrama/options.rb
@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+module Lrama
+  # Command line options.
+  class Options
+    attr_accessor :skeleton, :header, :header_file,
+                  :report_file, :outfile,
+                  :error_recovery, :grammar_file,
+                  :trace_opts, :report_opts,
+                  :diagnostic, :y, :debug, :define
+
+    def initialize
+      @skeleton = "bison/yacc.c"
+      @define = {}
+      @header = false
+      @header_file = nil
+      @report_file = nil
+      @outfile = "y.tab.c"
+      @error_recovery = false
+      @grammar_file = nil
+      @trace_opts = nil
+      @report_opts = nil
+      @diagnostic = false
+      @y = STDIN
+      @debug = false
+    end
+  end
+end
diff --git a/tool/lrama/lib/lrama/output.rb b/tool/lrama/lib/lrama/output.rb
index 2dcdae7b422a33..3c7316ac6d871c 100644
--- a/tool/lrama/lib/lrama/output.rb
+++ b/tool/lrama/lib/lrama/output.rb
@@ -1,13 +1,15 @@
+# frozen_string_literal: true
+
 require "erb"
 require "forwardable"
-require "lrama/report/duration"
+require_relative "report/duration"
 
 module Lrama
   class Output
     extend Forwardable
     include Report::Duration
 
-    attr_reader :grammar_file_path, :context, :grammar, :error_recovery
+    attr_reader :grammar_file_path, :context, :grammar, :error_recovery, :include_header
 
     def_delegators "@context", :yyfinal, :yylast, :yyntokens, :yynnts, :yynrules, :yynstates,
                                :yymaxutok, :yypact_ninf, :yytable_ninf
@@ -16,8 +18,7 @@ class Output
 
     def initialize(
       out:, output_file_path:, template_name:, grammar_file_path:,
-      header_out: nil, header_file_path: nil,
-      context:, grammar:, error_recovery: false
+      context:, grammar:, header_out: nil, header_file_path: nil, error_recovery: false
     )
       @out = out
       @output_file_path = output_file_path
@@ -28,6 +29,7 @@ def initialize(
       @context = context
       @grammar = grammar
       @error_recovery = error_recovery
+      @include_header = header_file_path ? header_file_path.sub("./", "") : nil
     end
 
     if ERB.instance_method(:initialize).parameters.last.first == :key
@@ -40,11 +42,8 @@ def self.erb(input)
       end
     end
 
-    def eval_template(file, path)
-      erb = self.class.erb(File.read(file))
-      erb.filename = file
-      tmp = erb.result_with_hash(context: @context, output: self)
-      replace_special_variables(tmp, path)
+    def render_partial(file)
+      render_template(partial_file(file))
     end
 
     def render
@@ -66,37 +65,29 @@ def render
 
     # A part of b4_token_enums
     def token_enums
-      str = ""
-
-      @context.yytokentype.each do |s_value, token_id, display_name|
+      @context.yytokentype.map do |s_value, token_id, display_name|
         s = sprintf("%s = %d%s", s_value, token_id, token_id == yymaxutok ? "" : ",")
 
         if display_name
-          str << sprintf("    %-30s /* %s  */\n", s, display_name)
+          sprintf("    %-30s /* %s  */\n", s, display_name)
         else
-          str << sprintf("    %s\n", s)
+          sprintf("    %s\n", s)
         end
-      end
-
-      str
+      end.join
     end
 
     # b4_symbol_enum
     def symbol_enum
-      str = ""
-
       last_sym_number = @context.yysymbol_kind_t.last[1]
-      @context.yysymbol_kind_t.each do |s_value, sym_number, display_name|
+      @context.yysymbol_kind_t.map do |s_value, sym_number, display_name|
         s = sprintf("%s = %d%s", s_value, sym_number, (sym_number == last_sym_number) ? "" : ",")
 
         if display_name
-          str << sprintf("  %-40s /* %s  */\n", s, display_name)
+          sprintf("  %-40s /* %s  */\n", s, display_name)
         else
-          str << sprintf("  %s\n", s)
+          sprintf("  %s\n", s)
         end
-      end
-
-      str
+      end.join
     end
 
     def yytranslate
@@ -135,22 +126,33 @@ def int_type_for(ary)
     end
 
     def symbol_actions_for_printer
-      str = ""
-
-      @grammar.symbols.each do |sym|
+      @grammar.symbols.map do |sym|
         next unless sym.printer
 
-        str << <<-STR
+        <<-STR
     case #{sym.enum_name}: /* #{sym.comment}  */
 #line #{sym.printer.lineno} "#{@grammar_file_path}"
-         #{sym.printer.translated_code(sym.tag)}
+         {#{sym.printer.translated_code(sym.tag)}}
 #line [@oline@] [@ofile@]
         break;
 
         STR
-      end
+      end.join
+    end
 
-      str
+    def symbol_actions_for_destructor
+      @grammar.symbols.map do |sym|
+        next unless sym.destructor
+
+        <<-STR
+    case #{sym.enum_name}: /* #{sym.comment}  */
+#line #{sym.destructor.lineno} "#{@grammar_file_path}"
+         {#{sym.destructor.translated_code(sym.tag)}}
+#line [@oline@] [@ofile@]
+        break;
+
+        STR
+      end.join
     end
 
     # b4_user_initial_action
@@ -160,66 +162,112 @@ def user_initial_action(comment = "")
       <<-STR
         #{comment}
 #line #{@grammar.initial_action.line} "#{@grammar_file_path}"
-        #{@grammar.initial_action.translated_code}
+        {#{@grammar.initial_action.translated_code}}
       STR
     end
 
-    def symbol_actions_for_error_token
-      str = ""
+    def after_shift_function(comment = "")
+      return "" unless @grammar.after_shift
+
+      <<-STR
+        #{comment}
+#line #{@grammar.after_shift.line} "#{@grammar_file_path}"
+        {#{@grammar.after_shift.s_value}(#{parse_param_name});}
+#line [@oline@] [@ofile@]
+      STR
+    end
+
+    def before_reduce_function(comment = "")
+      return "" unless @grammar.before_reduce
 
-      @grammar.symbols.each do |sym|
+      <<-STR
+        #{comment}
+#line #{@grammar.before_reduce.line} "#{@grammar_file_path}"
+        {#{@grammar.before_reduce.s_value}(yylen#{user_args});}
+#line [@oline@] [@ofile@]
+      STR
+    end
+
+    def after_reduce_function(comment = "")
+      return "" unless @grammar.after_reduce
+
+      <<-STR
+        #{comment}
+#line #{@grammar.after_reduce.line} "#{@grammar_file_path}"
+        {#{@grammar.after_reduce.s_value}(yylen#{user_args});}
+#line [@oline@] [@ofile@]
+      STR
+    end
+
+    def after_shift_error_token_function(comment = "")
+      return "" unless @grammar.after_shift_error_token
+
+      <<-STR
+        #{comment}
+#line #{@grammar.after_shift_error_token.line} "#{@grammar_file_path}"
+        {#{@grammar.after_shift_error_token.s_value}(#{parse_param_name});}
+#line [@oline@] [@ofile@]
+      STR
+    end
+
+    def after_pop_stack_function(len, comment = "")
+      return "" unless @grammar.after_pop_stack
+
+      <<-STR
+        #{comment}
+#line #{@grammar.after_pop_stack.line} "#{@grammar_file_path}"
+        {#{@grammar.after_pop_stack.s_value}(#{len}#{user_args});}
+#line [@oline@] [@ofile@]
+      STR
+    end
+
+    def symbol_actions_for_error_token
+      @grammar.symbols.map do |sym|
         next unless sym.error_token
 
-        str << <<-STR
+        <<-STR
     case #{sym.enum_name}: /* #{sym.comment}  */
 #line #{sym.error_token.lineno} "#{@grammar_file_path}"
-         #{sym.error_token.translated_code(sym.tag)}
+         {#{sym.error_token.translated_code(sym.tag)}}
 #line [@oline@] [@ofile@]
         break;
 
         STR
-      end
-
-      str
+      end.join
     end
 
     # b4_user_actions
     def user_actions
-      str = ""
+      action = @context.states.rules.map do |rule|
+        next unless rule.token_code
 
-      @context.states.rules.each do |rule|
-        next unless rule.code
-
-        rule = rule
-        code = rule.code
+        code = rule.token_code
         spaces = " " * (code.column - 1)
 
-        str << <<-STR
+        <<-STR
   case #{rule.id + 1}: /* #{rule.as_comment}  */
 #line #{code.line} "#{@grammar_file_path}"
-#{spaces}#{rule.translated_code}
+#{spaces}{#{rule.translated_code}}
 #line [@oline@] [@ofile@]
     break;
 
         STR
-      end
+      end.join
 
-      str << <<-STR
+      action + <<-STR
 
 #line [@oline@] [@ofile@]
       STR
-
-      str
     end
 
-    def omit_braces_and_blanks(param)
-      param[1..-2].strip
+    def omit_blanks(param)
+      param.strip
     end
 
     # b4_parse_param
     def parse_param
       if @grammar.parse_param
-        omit_braces_and_blanks(@grammar.parse_param)
+        omit_blanks(@grammar.parse_param)
       else
         ""
       end
@@ -227,7 +275,7 @@ def parse_param
 
     def lex_param
       if @grammar.lex_param
-        omit_braces_and_blanks(@grammar.lex_param)
+        omit_blanks(@grammar.lex_param)
       else
         ""
       end
@@ -273,7 +321,7 @@ def lex_param_name
 
     # b4_parse_param_use
     def parse_param_use(val, loc)
-      str = <<-STR
+      str = <<-STR.dup
   YY_USE (#{val});
   YY_USE (#{loc});
       STR
@@ -287,7 +335,8 @@ def parse_param_use(val, loc)
 
     # b4_yylex_formals
     def yylex_formals
-      ary = ["&yylval", "&yylloc"]
+      ary = ["&yylval"]
+      ary << "&yylloc" if @grammar.locations
 
       if @grammar.lex_param
         ary << lex_param_name
@@ -327,17 +376,9 @@ def aux
     def int_array_to_string(ary)
       last = ary.count - 1
 
-      s = ary.each_with_index.each_slice(10).map do |slice|
-        str = "  "
-
-        slice.each do |e, i|
-          str << sprintf("%6d%s", e, (i == last) ? "" : ",")
-        end
-
-        str
-      end
-
-      s.join("\n")
+      ary.each_with_index.each_slice(10).map do |slice|
+        "  " + slice.map { |e, i| sprintf("%6d%s", e, (i == last) ? "" : ",") }.join
+      end.join("\n")
     end
 
     def spec_mapped_header_file
@@ -352,8 +393,28 @@ def b4_cpp_guard__b4_spec_mapped_header_file
       end
     end
 
+    # b4_percent_code_get
+    def percent_code(name)
+      @grammar.percent_codes.select do |percent_code|
+        percent_code.name == name
+      end.map do |percent_code|
+        percent_code.code
+      end.join
+    end
+
     private
 
+    def eval_template(file, path)
+      tmp = render_template(file)
+      replace_special_variables(tmp, path)
+    end
+
+    def render_template(file)
+      erb = self.class.erb(File.read(file))
+      erb.filename = file
+      erb.result_with_hash(context: @context, output: self)
+    end
+
     def template_file
       File.join(template_dir, @template_name)
     end
@@ -362,27 +423,29 @@ def header_template_file
       File.join(template_dir, "bison/yacc.h")
     end
 
+    def partial_file(file)
+      File.join(template_dir, file)
+    end
+
     def template_dir
-      File.expand_path("../../../template", __FILE__)
+      File.expand_path('../../template', __dir__)
     end
 
     def string_array_to_string(ary)
-      str = ""
+      result = ""
       tmp = " "
 
       ary.each do |s|
-        s = s.gsub('\\', '\\\\\\\\')
-        s = s.gsub('"', '\\"')
-
-        if (tmp + s + " \"\",").length > 75
-          str << tmp << "\n"
-          tmp = "  \"#{s}\","
+        replaced = s.gsub('\\', '\\\\\\\\').gsub('"', '\\"')
+        if (tmp + replaced + " \"\",").length > 75
+          result = "#{result}#{tmp}\n"
+          tmp = "  \"#{replaced}\","
         else
-          tmp << " \"#{s}\","
+          tmp = "#{tmp} \"#{replaced}\","
         end
       end
 
-      str << tmp
+      result + tmp
     end
 
     def replace_special_variables(str, ofile)
diff --git a/tool/lrama/lib/lrama/parser.rb b/tool/lrama/lib/lrama/parser.rb
index 18e2ef033eb400..177e784e5c4eb0 100644
--- a/tool/lrama/lib/lrama/parser.rb
+++ b/tool/lrama/lib/lrama/parser.rb
@@ -1,293 +1,2144 @@
-require "lrama/report/duration"
-require "lrama/parser/token_scanner"
+#
+# DO NOT MODIFY!!!!
+# This file is automatically generated by Racc 1.8.1
+# from Racc grammar file "parser.y".
+#
+
+###### racc/parser.rb begin
+unless $".find {|p| p.end_with?('/racc/parser.rb')}
+$".push "#{__dir__}/racc/parser.rb"
+self.class.module_eval(<<'...end racc/parser.rb/module_eval...', 'racc/parser.rb', 1)
+#--
+# Copyright (c) 1999-2006 Minero Aoki
+#
+# This program is free software.
+# You can distribute/modify this program under the same terms of ruby.
+#
+# As a special exception, when this code is copied by Racc
+# into a Racc output file, you may use that output file
+# without restriction.
+#++
+
+unless $".find {|p| p.end_with?('/racc/info.rb')}
+$".push "#{__dir__}/racc/info.rb"
+
+module Racc
+  VERSION   = '1.8.1'
+  Version = VERSION
+  Copyright = 'Copyright (c) 1999-2006 Minero Aoki'
+end
+
+end
+
+
+module Racc
+  class ParseError < StandardError; end
+end
+unless defined?(::ParseError)
+  ParseError = Racc::ParseError # :nodoc:
+end
+
+# Racc is an LALR(1) parser generator.
+# It is written in Ruby itself, and generates Ruby programs.
+#
+# == Command-line Reference
+#
+#     racc [-o<var>filename</var>] [--output-file=<var>filename</var>]
+#          [-e<var>rubypath</var>] [--executable=<var>rubypath</var>]
+#          [-v] [--verbose]
+#          [-O<var>filename</var>] [--log-file=<var>filename</var>]
+#          [-g] [--debug]
+#          [-E] [--embedded]
+#          [-l] [--no-line-convert]
+#          [-c] [--line-convert-all]
+#          [-a] [--no-omit-actions]
+#          [-C] [--check-only]
+#          [-S] [--output-status]
+#          [--version] [--copyright] [--help] <var>grammarfile</var>
+#
+# [+grammarfile+]
+#   Racc grammar file. Any extension is permitted.
+# [-o+outfile+, --output-file=+outfile+]
+#   A filename for output. default is <+filename+>.tab.rb
+# [-O+filename+, --log-file=+filename+]
+#   Place logging output in file +filename+.
+#   Default log file name is <+filename+>.output.
+# [-e+rubypath+, --executable=+rubypath+]
+#   output executable file(mode 755). where +path+ is the Ruby interpreter.
+# [-v, --verbose]
+#   verbose mode. create +filename+.output file, like yacc's y.output file.
+# [-g, --debug]
+#   add debug code to parser class. To display debugging information,
+#   use this '-g' option and set @yydebug true in parser class.
+# [-E, --embedded]
+#   Output parser which doesn't need runtime files (racc/parser.rb).
+# [-F, --frozen]
+#   Output parser which declares frozen_string_literals: true
+# [-C, --check-only]
+#   Check syntax of racc grammar file and quit.
+# [-S, --output-status]
+#   Print messages time to time while compiling.
+# [-l, --no-line-convert]
+#   turns off line number converting.
+# [-c, --line-convert-all]
+#   Convert line number of actions, inner, header and footer.
+# [-a, --no-omit-actions]
+#   Call all actions, even if an action is empty.
+# [--version]
+#   print Racc version and quit.
+# [--copyright]
+#   Print copyright and quit.
+# [--help]
+#   Print usage and quit.
+#
+# == Generating Parser Using Racc
+#
+# To compile Racc grammar file, simply type:
+#
+#   $ racc parse.y
+#
+# This creates Ruby script file "parse.tab.y". The -o option can change the output filename.
+#
+# == Writing A Racc Grammar File
+#
+# If you want your own parser, you have to write a grammar file.
+# A grammar file contains the name of your parser class, grammar for the parser,
+# user code, and anything else.
+# When writing a grammar file, yacc's knowledge is helpful.
+# If you have not used yacc before, Racc is not too difficult.
+#
+# Here's an example Racc grammar file.
+#
+#   class Calcparser
+#   rule
+#     target: exp { print val[0] }
+#
+#     exp: exp '+' exp
+#        | exp '*' exp
+#        | '(' exp ')'
+#        | NUMBER
+#   end
+#
+# Racc grammar files resemble yacc files.
+# But (of course), this is Ruby code.
+# yacc's $$ is the 'result', $0, $1... is
+# an array called 'val', and $-1, $-2... is an array called '_values'.
+#
+# See the {Grammar File Reference}[rdoc-ref:lib/racc/rdoc/grammar.en.rdoc] for
+# more information on grammar files.
+#
+# == Parser
+#
+# Then you must prepare the parse entry method. There are two types of
+# parse methods in Racc, Racc::Parser#do_parse and Racc::Parser#yyparse
+#
+# Racc::Parser#do_parse is simple.
+#
+# It's yyparse() of yacc, and Racc::Parser#next_token is yylex().
+# This method must returns an array like [TOKENSYMBOL, ITS_VALUE].
+# EOF is [false, false].
+# (TOKENSYMBOL is a Ruby symbol (taken from String#intern) by default.
+# If you want to change this, see the grammar reference.
+#
+# Racc::Parser#yyparse is little complicated, but useful.
+# It does not use Racc::Parser#next_token, instead it gets tokens from any iterator.
+#
+# For example, <code>yyparse(obj, :scan)</code> causes
+# calling +obj#scan+, and you can return tokens by yielding them from +obj#scan+.
+#
+# == Debugging
+#
+# When debugging, "-v" or/and the "-g" option is helpful.
+#
+# "-v" creates verbose log file (.output).
+# "-g" creates a "Verbose Parser".
+# Verbose Parser prints the internal status when parsing.
+# But it's _not_ automatic.
+# You must use -g option and set +@yydebug+ to +true+ in order to get output.
+# -g option only creates the verbose parser.
+#
+# === Racc reported syntax error.
+#
+# Isn't there too many "end"?
+# grammar of racc file is changed in v0.10.
+#
+# Racc does not use '%' mark, while yacc uses huge number of '%' marks..
+#
+# === Racc reported "XXXX conflicts".
+#
+# Try "racc -v xxxx.y".
+# It causes producing racc's internal log file, xxxx.output.
+#
+# === Generated parsers does not work correctly
+#
+# Try "racc -g xxxx.y".
+# This command let racc generate "debugging parser".
+# Then set @yydebug=true in your parser.
+# It produces a working log of your parser.
+#
+# == Re-distributing Racc runtime
+#
+# A parser, which is created by Racc, requires the Racc runtime module;
+# racc/parser.rb.
+#
+# Ruby 1.8.x comes with Racc runtime module,
+# you need NOT distribute Racc runtime files.
+#
+# If you want to include the Racc runtime module with your parser.
+# This can be done by using '-E' option:
+#
+#   $ racc -E -omyparser.rb myparser.y
+#
+# This command creates myparser.rb which `includes' Racc runtime.
+# Only you must do is to distribute your parser file (myparser.rb).
+#
+# Note: parser.rb is ruby license, but your parser is not.
+# Your own parser is completely yours.
+module Racc
+
+  unless defined?(Racc_No_Extensions)
+    Racc_No_Extensions = false # :nodoc:
+  end
 
-module Lrama
-  # Parser for parse.y, generates a grammar
   class Parser
-    include Lrama::Report::Duration
 
-    T = Lrama::Lexer::Token
+    Racc_Runtime_Version = ::Racc::VERSION
+    Racc_Runtime_Core_Version_R = ::Racc::VERSION
 
-    def initialize(text)
-      @text = text
+    begin
+      if Object.const_defined?(:RUBY_ENGINE) and RUBY_ENGINE == 'jruby'
+        require 'jruby'
+        require 'racc/cparse-jruby.jar'
+        com.headius.racc.Cparse.new.load(JRuby.runtime, false)
+      else
+        require 'racc/cparse'
+      end
+
+      unless new.respond_to?(:_racc_do_parse_c, true)
+        raise LoadError, 'old cparse.so'
+      end
+      if Racc_No_Extensions
+        raise LoadError, 'selecting ruby version of racc runtime core'
+      end
+
+      Racc_Main_Parsing_Routine    = :_racc_do_parse_c # :nodoc:
+      Racc_YY_Parse_Method         = :_racc_yyparse_c # :nodoc:
+      Racc_Runtime_Core_Version    = Racc_Runtime_Core_Version_C # :nodoc:
+      Racc_Runtime_Type            = 'c' # :nodoc:
+    rescue LoadError
+      Racc_Main_Parsing_Routine    = :_racc_do_parse_rb
+      Racc_YY_Parse_Method         = :_racc_yyparse_rb
+      Racc_Runtime_Core_Version    = Racc_Runtime_Core_Version_R
+      Racc_Runtime_Type            = 'ruby'
+    end
+
+    def Parser.racc_runtime_type # :nodoc:
+      Racc_Runtime_Type
     end
 
-    def parse
-      report_duration(:parse) do
-        lexer = Lexer.new(@text)
-        grammar = Grammar.new
-        process_prologue(grammar, lexer)
-        parse_bison_declarations(TokenScanner.new(lexer.bison_declarations_tokens), grammar)
-        parse_grammar_rules(TokenScanner.new(lexer.grammar_rules_tokens), grammar)
-        process_epilogue(grammar, lexer)
-        grammar.prepare
-        grammar.compute_nullable
-        grammar.compute_first_set
-        grammar.validate!
-
-        grammar
+    def _racc_setup
+      @yydebug = false unless self.class::Racc_debug_parser
+      @yydebug = false unless defined?(@yydebug)
+      if @yydebug
+        @racc_debug_out = $stderr unless defined?(@racc_debug_out)
+        @racc_debug_out ||= $stderr
       end
+      arg = self.class::Racc_arg
+      arg[13] = true if arg.size < 14
+      arg
     end
 
-    private
+    def _racc_init_sysvars
+      @racc_state  = [0]
+      @racc_tstack = []
+      @racc_vstack = []
 
-    def process_prologue(grammar, lexer)
-      grammar.prologue_first_lineno = lexer.prologue.first[1] if lexer.prologue.first
-      grammar.prologue = lexer.prologue.map(&:first).join
+      @racc_t = nil
+      @racc_val = nil
+
+      @racc_read_next = true
+
+      @racc_user_yyerror = false
+      @racc_error_status = 0
+    end
+
+    # The entry point of the parser. This method is used with #next_token.
+    # If Racc wants to get token (and its value), calls next_token.
+    #
+    # Example:
+    #     def parse
+    #       @q = [[1,1],
+    #             [2,2],
+    #             [3,3],
+    #             [false, '$']]
+    #       do_parse
+    #     end
+    #
+    #     def next_token
+    #       @q.shift
+    #     end
+    class_eval <<~RUBY, __FILE__, __LINE__ + 1
+    def do_parse
+      #{Racc_Main_Parsing_Routine}(_racc_setup(), false)
     end
+    RUBY
 
-    def process_epilogue(grammar, lexer)
-      grammar.epilogue_first_lineno = lexer.epilogue.first[1] if lexer.epilogue.first
-      grammar.epilogue = lexer.epilogue.map(&:first).join
+    # The method to fetch next token.
+    # If you use #do_parse method, you must implement #next_token.
+    #
+    # The format of return value is [TOKEN_SYMBOL, VALUE].
+    # +token-symbol+ is represented by Ruby's symbol by default, e.g. :IDENT
+    # for 'IDENT'.  ";" (String) for ';'.
+    #
+    # The final symbol (End of file) must be false.
+    def next_token
+      raise NotImplementedError, "#{self.class}\#next_token is not defined"
     end
 
-    def parse_bison_declarations(ts, grammar)
-      precedence_number = 0
-
-      while !ts.eots? do
-        case ts.current_type
-        when T::P_expect
-          ts.next
-          grammar.expect = ts.consume!(T::Number).s_value
-        when T::P_define
-          ts.next
-          # Ignore
-          ts.consume_multi(T::Ident)
-        when T::P_printer
-          lineno = ts.current_token.line
-          ts.next
-          code = ts.consume!(T::User_code)
-          code = grammar.build_code(:printer, code)
-          ident_or_tags = ts.consume_multi(T::Ident, T::Tag)
-          grammar.add_printer(ident_or_tags: ident_or_tags, code: code, lineno: lineno)
-        when T::P_error_token
-          lineno = ts.current_token.line
-          ts.next
-          code = ts.consume!(T::User_code)
-          code = grammar.build_code(:printer, code)
-          ident_or_tags = ts.consume_multi(T::Ident, T::Tag)
-          grammar.add_error_token(ident_or_tags: ident_or_tags, code: code, lineno: lineno)
-        when T::P_lex_param
-          ts.next
-          code = ts.consume!(T::User_code)
-          code = grammar.build_code(:lex_param, code)
-          grammar.lex_param = code.token_code.s_value
-        when T::P_parse_param
-          ts.next
-          code = ts.consume!(T::User_code)
-          code = grammar.build_code(:parse_param, code)
-          grammar.parse_param = code.token_code.s_value
-        when T::P_initial_action
-          ts.next
-          code = ts.consume!(T::User_code)
-          code = grammar.build_code(:initial_action, code)
-          ts.consume(T::Semicolon)
-          grammar.initial_action = code
-        when T::P_union
-          lineno = ts.current_token.line
-          ts.next
-          code = ts.consume!(T::User_code)
-          code = grammar.build_code(:union, code)
-          ts.consume(T::Semicolon)
-          grammar.set_union(code, lineno)
-        when T::P_token
-          # %token tag? (ident number? string?)+
-          #
-          # * ident can be char, e.g. '\\', '\t', '\13'
-          # * number is a token_id for term
-          #
-          # These are valid token declaration (from CRuby parse.y)
-          #
-          # %token END_OF_INPUT   0 "end-of-input"
-          # %token <id> '\\'      "backslash"
-          # %token tSP            "escaped space"
-          # %token tUPLUS         132 "unary+"
-          # %token tCOLON3        ":: at EXPR_BEG"
-          # %token tSTRING_DBEG tSTRING_DVAR tLAMBEG tLABEL_END
-          #
-          #
-          # See: https://www.gnu.org/software/bison/manual/html_node/Symbol-Decls.html
-          ts.next
-          opt_tag = ts.consume(T::Tag)
-
-          while (id = ts.consume(T::Ident, T::Char)) do
-            opt_number = ts.consume(T::Number)
-            opt_string = ts.consume(T::String)
-            # Can replace 0 (EOF)
-            grammar.add_term(
-              id: id,
-              alias_name: opt_string && opt_string.s_value,
-              token_id: opt_number && opt_number.s_value,
-              tag: opt_tag,
-              replace: true,
-            )
+    def _racc_do_parse_rb(arg, in_debug)
+      action_table, action_check, action_default, action_pointer,
+      _,            _,            _,              _,
+      _,            _,            token_table,    * = arg
+
+      _racc_init_sysvars
+      tok = act = i = nil
+
+      catch(:racc_end_parse) {
+        while true
+          if i = action_pointer[@racc_state[-1]]
+            if @racc_read_next
+              if @racc_t != 0   # not EOF
+                tok, @racc_val = next_token()
+                unless tok      # EOF
+                  @racc_t = 0
+                else
+                  @racc_t = (token_table[tok] or 1)   # error token
+                end
+                racc_read_token(@racc_t, tok, @racc_val) if @yydebug
+                @racc_read_next = false
+              end
+            end
+            i += @racc_t
+            unless i >= 0 and
+                   act = action_table[i] and
+                   action_check[i] == @racc_state[-1]
+              act = action_default[@racc_state[-1]]
+            end
+          else
+            act = action_default[@racc_state[-1]]
           end
-        when T::P_type
-          # %type tag? (ident|char|string)+
-          #
-          # See: https://www.gnu.org/software/bison/manual/html_node/Symbol-Decls.html
-          ts.next
-          opt_tag = ts.consume(T::Tag)
-
-          while (id = ts.consume(T::Ident, T::Char, T::String)) do
-            grammar.add_type(
-              id: id,
-              tag: opt_tag
-            )
+          while act = _racc_evalact(act, arg)
+            ;
           end
-        when T::P_nonassoc
-          # %nonassoc (ident|char|string)+
-          ts.next
-          while (id = ts.consume(T::Ident, T::Char, T::String)) do
-            sym = grammar.add_term(id: id)
-            grammar.add_nonassoc(sym, precedence_number)
+        end
+      }
+    end
+
+    # Another entry point for the parser.
+    # If you use this method, you must implement RECEIVER#METHOD_ID method.
+    #
+    # RECEIVER#METHOD_ID is a method to get next token.
+    # It must 'yield' the token, which format is [TOKEN-SYMBOL, VALUE].
+    class_eval <<~RUBY, __FILE__, __LINE__ + 1
+    def yyparse(recv, mid)
+      #{Racc_YY_Parse_Method}(recv, mid, _racc_setup(), false)
+    end
+    RUBY
+
+    def _racc_yyparse_rb(recv, mid, arg, c_debug)
+      action_table, action_check, action_default, action_pointer,
+      _,            _,            _,              _,
+      _,            _,            token_table,    * = arg
+
+      _racc_init_sysvars
+
+      catch(:racc_end_parse) {
+        until i = action_pointer[@racc_state[-1]]
+          while act = _racc_evalact(action_default[@racc_state[-1]], arg)
+            ;
           end
-          precedence_number += 1
-        when T::P_left
-          # %left (ident|char|string)+
-          ts.next
-          while (id = ts.consume(T::Ident, T::Char, T::String)) do
-            sym = grammar.add_term(id: id)
-            grammar.add_left(sym, precedence_number)
+        end
+        recv.__send__(mid) do |tok, val|
+          unless tok
+            @racc_t = 0
+          else
+            @racc_t = (token_table[tok] or 1)   # error token
           end
-          precedence_number += 1
-        when T::P_right
-          # %right (ident|char|string)+
-          ts.next
-          while (id = ts.consume(T::Ident, T::Char, T::String)) do
-            sym = grammar.add_term(id: id)
-            grammar.add_right(sym, precedence_number)
+          @racc_val = val
+          @racc_read_next = false
+
+          i += @racc_t
+          unless i >= 0 and
+                 act = action_table[i] and
+                 action_check[i] == @racc_state[-1]
+            act = action_default[@racc_state[-1]]
           end
-          precedence_number += 1
-        when T::P_precedence
-          # %precedence (ident|char|string)+
-          ts.next
-          while (id = ts.consume(T::Ident, T::Char, T::String)) do
-            sym = grammar.add_term(id: id)
-            grammar.add_precedence(sym, precedence_number)
+          while act = _racc_evalact(act, arg)
+            ;
+          end
+
+          while !(i = action_pointer[@racc_state[-1]]) ||
+                ! @racc_read_next ||
+                @racc_t == 0  # $
+            unless i and i += @racc_t and
+                   i >= 0 and
+                   act = action_table[i] and
+                   action_check[i] == @racc_state[-1]
+              act = action_default[@racc_state[-1]]
+            end
+            while act = _racc_evalact(act, arg)
+              ;
+            end
           end
-          precedence_number += 1
-        when nil
-          # end of input
-          raise "Reach to end of input within declarations"
-        else
-          raise "Unexpected token: #{ts.current_token}"
         end
-      end
+      }
     end
 
-    def parse_grammar_rules(ts, grammar)
-      while !ts.eots? do
-        parse_grammar_rule(ts, grammar)
+    ###
+    ### common
+    ###
+
+    def _racc_evalact(act, arg)
+      action_table, action_check, _, action_pointer,
+      _,            _,            _, _,
+      _,            _,            _, shift_n,
+      reduce_n,     * = arg
+      nerr = 0   # tmp
+
+      if act > 0 and act < shift_n
+        #
+        # shift
+        #
+        if @racc_error_status > 0
+          @racc_error_status -= 1 unless @racc_t <= 1 # error token or EOF
+        end
+        @racc_vstack.push @racc_val
+        @racc_state.push act
+        @racc_read_next = true
+        if @yydebug
+          @racc_tstack.push @racc_t
+          racc_shift @racc_t, @racc_tstack, @racc_vstack
+        end
+
+      elsif act < 0 and act > -reduce_n
+        #
+        # reduce
+        #
+        code = catch(:racc_jump) {
+          @racc_state.push _racc_do_reduce(arg, act)
+          false
+        }
+        if code
+          case code
+          when 1 # yyerror
+            @racc_user_yyerror = true   # user_yyerror
+            return -reduce_n
+          when 2 # yyaccept
+            return shift_n
+          else
+            raise '[Racc Bug] unknown jump code'
+          end
+        end
+
+      elsif act == shift_n
+        #
+        # accept
+        #
+        racc_accept if @yydebug
+        throw :racc_end_parse, @racc_vstack[0]
+
+      elsif act == -reduce_n
+        #
+        # error
+        #
+        case @racc_error_status
+        when 0
+          unless arg[21]    # user_yyerror
+            nerr += 1
+            on_error @racc_t, @racc_val, @racc_vstack
+          end
+        when 3
+          if @racc_t == 0   # is $
+            # We're at EOF, and another error occurred immediately after
+            # attempting auto-recovery
+            throw :racc_end_parse, nil
+          end
+          @racc_read_next = true
+        end
+        @racc_user_yyerror = false
+        @racc_error_status = 3
+        while true
+          if i = action_pointer[@racc_state[-1]]
+            i += 1   # error token
+            if  i >= 0 and
+                (act = action_table[i]) and
+                action_check[i] == @racc_state[-1]
+              break
+            end
+          end
+          throw :racc_end_parse, nil if @racc_state.size <= 1
+          @racc_state.pop
+          @racc_vstack.pop
+          if @yydebug
+            @racc_tstack.pop
+            racc_e_pop @racc_state, @racc_tstack, @racc_vstack
+          end
+        end
+        return act
+
+      else
+        raise "[Racc Bug] unknown action #{act.inspect}"
       end
+
+      racc_next_state(@racc_state[-1], @racc_state) if @yydebug
+
+      nil
     end
 
-    # TODO: Take care of %prec of rule.
-    #       If %prec exists, user code before %prec
-    #       is NOT an action. For example "{ code 3 }" is NOT an action.
-    #
-    #  keyword_class { code 2 } tSTRING '!' keyword_end { code 3 } %prec "="
-    def parse_grammar_rule(ts, grammar)
-      # LHS
-      lhs = ts.consume!(T::Ident_Colon) # class:
-      lhs.type = T::Ident
-      if named_ref = ts.consume(T::Named_Ref)
-        lhs.alias = named_ref.s_value
+    def _racc_do_reduce(arg, act)
+      _,          _,            _,            _,
+      goto_table, goto_check,   goto_default, goto_pointer,
+      nt_base,    reduce_table, _,            _,
+      _,          use_result,   * = arg
+
+      state = @racc_state
+      vstack = @racc_vstack
+      tstack = @racc_tstack
+
+      i = act * -3
+      len       = reduce_table[i]
+      reduce_to = reduce_table[i+1]
+      method_id = reduce_table[i+2]
+      void_array = []
+
+      tmp_t = tstack[-len, len] if @yydebug
+      tmp_v = vstack[-len, len]
+      tstack[-len, len] = void_array if @yydebug
+      vstack[-len, len] = void_array
+      state[-len, len]  = void_array
+
+      # tstack must be updated AFTER method call
+      if use_result
+        vstack.push __send__(method_id, tmp_v, vstack, tmp_v[0])
+      else
+        vstack.push __send__(method_id, tmp_v, vstack)
       end
+      tstack.push reduce_to
+
+      racc_reduce(tmp_t, reduce_to, tstack, vstack) if @yydebug
 
-      rhs = parse_grammar_rule_rhs(ts, grammar, lhs)
-
-      grammar.add_rule(lhs: lhs, rhs: rhs, lineno: rhs.first ? rhs.first.line : lhs.line)
-
-      while true do
-        case ts.current_type
-        when T::Bar
-          # |
-          bar_lineno = ts.current_token.line
-          ts.next
-          rhs = parse_grammar_rule_rhs(ts, grammar, lhs)
-          grammar.add_rule(lhs: lhs, rhs: rhs, lineno: rhs.first ? rhs.first.line : bar_lineno)
-        when T::Semicolon
-          # ;
-          ts.next
-          break
-        when T::Ident_Colon
-          # Next lhs can be here because ";" is optional.
-          # Do not consume next token.
-          break
-        when nil
-          # end of input can be here when ";" is omitted
-          break
-        else
-          raise "Unexpected token: #{ts.current_token}"
+      k1 = reduce_to - nt_base
+      if i = goto_pointer[k1]
+        i += state[-1]
+        if i >= 0 and (curstate = goto_table[i]) and goto_check[i] == k1
+          return curstate
         end
       end
+      goto_default[k1]
     end
 
-    def parse_grammar_rule_rhs(ts, grammar, lhs)
-      a = []
-      prec_seen = false
-      code_after_prec = false
-
-      while true do
-        # TODO: String can be here
-        case ts.current_type
-        when T::Ident
-          # keyword_class
-
-          raise "Ident after %prec" if prec_seen
-          a << ts.current_token
-          ts.next
-        when T::Char
-          # '!'
-
-          raise "Char after %prec" if prec_seen
-          a << ts.current_token
-          ts.next
-        when T::P_prec
-          # %prec tPLUS
-          #
-          # See: https://www.gnu.org/software/bison/manual/html_node/Contextual-Precedence.html
-
-          ts.next
-          prec_seen = true
-          precedence_id = ts.consume!(T::Ident, T::String, T::Char)
-          precedence_sym = grammar.find_symbol_by_id!(precedence_id)
-          a << precedence_sym
-        when T::User_code
-          # { code } in the middle of rhs
-
-          if prec_seen
-            raise "Multiple User_code after %prec" if code_after_prec
-            code_after_prec = true
-          end
+    # This method is called when a parse error is found.
+    #
+    # ERROR_TOKEN_ID is an internal ID of token which caused error.
+    # You can get string representation of this ID by calling
+    # #token_to_str.
+    #
+    # ERROR_VALUE is a value of error token.
+    #
+    # value_stack is a stack of symbol values.
+    # DO NOT MODIFY this object.
+    #
+    # This method raises ParseError by default.
+    #
+    # If this method returns, parsers enter "error recovering mode".
+    def on_error(t, val, vstack)
+      raise ParseError, sprintf("parse error on value %s (%s)",
+                                val.inspect, token_to_str(t) || '?')
+    end
 
-          code = ts.current_token
-          code.numberize_references(lhs, a)
-          grammar.build_references(code)
-          a << code
-          ts.next
-        when T::Named_Ref
-          ts.previous_token.alias = ts.current_token.s_value
-          ts.next
-        when T::Bar
-          # |
-          break
-        when T::Semicolon
-          # ;
-          break
-        when T::Ident_Colon
-          # Next lhs can be here because ";" is optional.
-          break
-        when nil
-          # end of input can be here when ";" is omitted
-          break
-        else
-          raise "Unexpected token: #{ts.current_token}"
-        end
+    # Enter error recovering mode.
+    # This method does not call #on_error.
+    def yyerror
+      throw :racc_jump, 1
+    end
+
+    # Exit parser.
+    # Return value is +Symbol_Value_Stack[0]+.
+    def yyaccept
+      throw :racc_jump, 2
+    end
+
+    # Leave error recovering mode.
+    def yyerrok
+      @racc_error_status = 0
+    end
+
+    # For debugging output
+    def racc_read_token(t, tok, val)
+      @racc_debug_out.print 'read    '
+      @racc_debug_out.print tok.inspect, '(', racc_token2str(t), ') '
+      @racc_debug_out.puts val.inspect
+      @racc_debug_out.puts
+    end
+
+    def racc_shift(tok, tstack, vstack)
+      @racc_debug_out.puts "shift   #{racc_token2str tok}"
+      racc_print_stacks tstack, vstack
+      @racc_debug_out.puts
+    end
+
+    def racc_reduce(toks, sim, tstack, vstack)
+      out = @racc_debug_out
+      out.print 'reduce '
+      if toks.empty?
+        out.print ' <none>'
+      else
+        toks.each {|t| out.print ' ', racc_token2str(t) }
+      end
+      out.puts " --> #{racc_token2str(sim)}"
+      racc_print_stacks tstack, vstack
+      @racc_debug_out.puts
+    end
+
+    def racc_accept
+      @racc_debug_out.puts 'accept'
+      @racc_debug_out.puts
+    end
+
+    def racc_e_pop(state, tstack, vstack)
+      @racc_debug_out.puts 'error recovering mode: pop token'
+      racc_print_states state
+      racc_print_stacks tstack, vstack
+      @racc_debug_out.puts
+    end
+
+    def racc_next_state(curstate, state)
+      @racc_debug_out.puts  "goto    #{curstate}"
+      racc_print_states state
+      @racc_debug_out.puts
+    end
+
+    def racc_print_stacks(t, v)
+      out = @racc_debug_out
+      out.print '        ['
+      t.each_index do |i|
+        out.print ' (', racc_token2str(t[i]), ' ', v[i].inspect, ')'
       end
+      out.puts ' ]'
+    end
+
+    def racc_print_states(s)
+      out = @racc_debug_out
+      out.print '        ['
+      s.each {|st| out.print ' ', st }
+      out.puts ' ]'
+    end
 
-      return a
+    def racc_token2str(tok)
+      self.class::Racc_token_to_s_table[tok] or
+          raise "[Racc Bug] can't convert token #{tok} to string"
     end
+
+    # Convert internal ID of token symbol to the string.
+    def token_to_str(t)
+      self.class::Racc_token_to_s_table[t]
+    end
+
+  end
+
+end
+
+...end racc/parser.rb/module_eval...
+end
+###### racc/parser.rb end
+module Lrama
+  class Parser < Racc::Parser
+
+module_eval(<<'...end parser.y/module_eval...', 'parser.y', 428)
+
+include Lrama::Report::Duration
+
+def initialize(text, path, debug = false, define = {})
+  @grammar_file = Lrama::Lexer::GrammarFile.new(path, text)
+  @yydebug = debug
+  @rule_counter = Lrama::Grammar::Counter.new(0)
+  @midrule_action_counter = Lrama::Grammar::Counter.new(1)
+  @define = define
+end
+
+def parse
+  report_duration(:parse) do
+    @lexer = Lrama::Lexer.new(@grammar_file)
+    @grammar = Lrama::Grammar.new(@rule_counter, @define)
+    @precedence_number = 0
+    reset_precs
+    do_parse
+    @grammar
+  end
+end
+
+def next_token
+  @lexer.next_token
+end
+
+def on_error(error_token_id, error_value, value_stack)
+  if error_value.is_a?(Lrama::Lexer::Token)
+    location = error_value.location
+    value = "'#{error_value.s_value}'"
+  else
+    location = @lexer.location
+    value = error_value.inspect
+  end
+
+  error_message = "parse error on value #{value} (#{token_to_str(error_token_id) || '?'})"
+
+  raise_parse_error(error_message, location)
+end
+
+def on_action_error(error_message, error_value)
+  if error_value.is_a?(Lrama::Lexer::Token)
+    location = error_value.location
+  else
+    location = @lexer.location
+  end
+
+  raise_parse_error(error_message, location)
+end
+
+private
+
+def reset_precs
+  @prec_seen = false
+  @code_after_prec = false
+end
+
+def begin_c_declaration(end_symbol)
+  @lexer.status = :c_declaration
+  @lexer.end_symbol = end_symbol
+end
+
+def end_c_declaration
+  @lexer.status = :initial
+  @lexer.end_symbol = nil
+end
+
+def raise_parse_error(error_message, location)
+  raise ParseError, location.generate_error_message(error_message)
+end
+...end parser.y/module_eval...
+##### State transition tables begin ###
+
+racc_action_table = [
+    89,    49,    90,   167,    49,   101,   173,    49,   101,   167,
+    49,   101,   173,     6,   101,    80,    49,    49,    48,    48,
+    41,    76,    76,    49,    49,    48,    48,    42,    76,    76,
+    49,    49,    48,    48,   101,    96,   113,    49,    87,    48,
+   150,   101,    96,   151,    45,   171,   169,   170,   151,   176,
+   170,    91,   169,   170,    81,   176,   170,    20,    24,    25,
+    26,    27,    28,    29,    30,    31,    87,    32,    33,    34,
+    35,    36,    37,    38,    39,    49,     4,    48,     5,   101,
+    96,   181,   182,   183,   128,    20,    24,    25,    26,    27,
+    28,    29,    30,    31,    46,    32,    33,    34,    35,    36,
+    37,    38,    39,    11,    12,    13,    14,    15,    16,    17,
+    18,    19,    53,    20,    24,    25,    26,    27,    28,    29,
+    30,    31,    53,    32,    33,    34,    35,    36,    37,    38,
+    39,    11,    12,    13,    14,    15,    16,    17,    18,    19,
+    44,    20,    24,    25,    26,    27,    28,    29,    30,    31,
+    53,    32,    33,    34,    35,    36,    37,    38,    39,    49,
+     4,    48,     5,   101,    96,    49,    49,    48,    48,   101,
+   101,    49,    49,    48,    48,   101,   101,    49,    49,    48,
+   197,   101,   101,    49,    49,   197,    48,   101,   101,    49,
+    49,   197,    48,   101,   181,   182,   183,   128,   204,   210,
+   217,   205,   205,   205,    49,    49,    48,    48,    49,    49,
+    48,    48,    49,    49,    48,    48,   181,   182,   183,   116,
+   117,    56,    53,    53,    53,    53,    53,    62,    63,    64,
+    65,    66,    68,    68,    68,    82,    53,    53,   104,   108,
+   108,   115,   122,   123,   125,   128,   129,   133,   139,   140,
+   141,   142,   144,   145,   101,   154,   139,   157,   154,   161,
+   162,    68,   164,   165,   172,   177,   154,   184,   128,   188,
+   154,   190,   128,   154,   199,   154,   128,    68,   165,   206,
+   165,    68,    68,   215,   128,    68 ]
+
+racc_action_check = [
+    47,   153,    47,   153,   159,   153,   159,   178,   159,   178,
+   189,   178,   189,     1,   189,    39,    35,    36,    35,    36,
+     5,    35,    36,    37,    38,    37,    38,     6,    37,    38,
+    59,    74,    59,    74,    59,    59,    74,    60,    45,    60,
+   138,    60,    60,   138,     9,   156,   153,   153,   156,   159,
+   159,    47,   178,   178,    39,   189,   189,    45,    45,    45,
+    45,    45,    45,    45,    45,    45,    83,    45,    45,    45,
+    45,    45,    45,    45,    45,    61,     0,    61,     0,    61,
+    61,   166,   166,   166,   166,    83,    83,    83,    83,    83,
+    83,    83,    83,    83,    11,    83,    83,    83,    83,    83,
+    83,    83,    83,     3,     3,     3,     3,     3,     3,     3,
+     3,     3,    13,     3,     3,     3,     3,     3,     3,     3,
+     3,     3,    14,     3,     3,     3,     3,     3,     3,     3,
+     3,     8,     8,     8,     8,     8,     8,     8,     8,     8,
+     8,     8,     8,     8,     8,     8,     8,     8,     8,     8,
+    15,     8,     8,     8,     8,     8,     8,     8,     8,    97,
+     2,    97,     2,    97,    97,    71,   108,    71,   108,    71,
+   108,   109,   169,   109,   169,   109,   169,   176,   184,   176,
+   184,   176,   184,   190,   205,   190,   205,   190,   205,   206,
+    12,   206,    12,   206,   174,   174,   174,   174,   196,   201,
+   214,   196,   201,   214,    69,    76,    69,    76,   104,   105,
+   104,   105,   111,   113,   111,   113,   198,   198,   198,    81,
+    81,    16,    17,    20,    24,    25,    26,    27,    28,    29,
+    30,    31,    32,    33,    34,    40,    51,    56,    67,    70,
+    72,    80,    84,    85,    86,    87,    93,   107,   115,   116,
+   117,   118,   127,   128,   134,   140,   141,   143,   144,   145,
+   146,   150,   151,   152,   158,   163,   165,   167,   168,   171,
+   172,   173,   175,   177,   187,   188,   192,   193,   195,   197,
+   200,   202,   204,   209,   210,   216 ]
+
+racc_action_pointer = [
+    66,    13,   150,    90,   nil,    13,    27,   nil,   118,    35,
+   nil,    88,   187,    63,    73,   101,   216,   173,   nil,   nil,
+   174,   nil,   nil,   nil,   175,   176,   177,   222,   223,   224,
+   225,   226,   224,   225,   226,    13,    14,    20,    21,    10,
+   233,   nil,   nil,   nil,   nil,    34,   nil,    -5,   nil,   nil,
+   nil,   187,   nil,   nil,   nil,   nil,   188,   nil,   nil,    27,
+    34,    72,   nil,   nil,   nil,   nil,   nil,   230,   nil,   201,
+   231,   162,   232,   nil,    28,   nil,   202,   nil,   nil,   nil,
+   200,   215,   nil,    62,   233,   221,   222,   191,   nil,   nil,
+   nil,   nil,   nil,   244,   nil,   nil,   nil,   156,   nil,   nil,
+   nil,   nil,   nil,   nil,   205,   206,   nil,   241,   163,   168,
+   nil,   209,   nil,   210,   nil,   243,   206,   209,   240,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   209,   248,   nil,
+   nil,   nil,   nil,   nil,   247,   nil,   nil,   nil,    -2,   nil,
+   208,   251,   nil,   255,   211,   204,   210,   nil,   nil,   nil,
+   253,   257,   217,    -2,   nil,   nil,     3,   nil,   218,     1,
+   nil,   nil,   nil,   222,   nil,   219,    30,   226,   214,   169,
+   nil,   226,   223,   230,   143,   218,   174,   226,     4,   nil,
+   nil,   nil,   nil,   nil,   175,   nil,   nil,   272,   228,     7,
+   180,   nil,   222,   269,   nil,   232,   156,   238,   165,   nil,
+   234,   157,   273,   nil,   274,   181,   186,   nil,   nil,   233,
+   230,   nil,   nil,   nil,   158,   nil,   277,   nil,   nil ]
+
+racc_action_default = [
+    -1,  -128,    -1,    -3,   -10,  -128,  -128,    -2,    -3,  -128,
+   -16,  -128,  -128,  -128,  -128,  -128,  -128,  -128,   -24,   -25,
+  -128,   -32,   -33,   -34,  -128,  -128,  -128,  -128,  -128,  -128,
+  -128,  -128,   -50,   -50,   -50,  -128,  -128,  -128,  -128,  -128,
+  -128,   -13,   219,    -4,   -26,  -128,   -17,  -123,   -93,   -94,
+  -122,   -14,   -19,   -85,   -20,   -21,  -128,   -23,   -31,  -128,
+  -128,  -128,   -38,   -39,   -40,   -41,   -42,   -43,   -51,  -128,
+   -44,  -128,   -45,   -46,   -88,   -90,  -128,   -47,   -48,   -49,
+  -128,  -128,   -11,    -5,    -7,   -95,  -128,   -68,   -18,  -124,
+  -125,  -126,   -15,  -128,   -22,   -27,   -28,   -29,   -35,   -83,
+   -84,  -127,   -36,   -37,  -128,   -52,   -54,   -56,  -128,   -79,
+   -81,   -88,   -89,  -128,   -91,  -128,  -128,  -128,  -128,    -6,
+    -8,    -9,  -120,   -96,   -97,   -98,   -69,  -128,  -128,   -86,
+   -30,   -55,   -53,   -57,   -76,   -82,   -80,   -92,  -128,   -62,
+   -66,  -128,   -12,  -128,   -66,  -128,  -128,   -58,   -77,   -78,
+   -50,  -128,   -60,   -64,   -67,   -70,  -128,  -121,   -99,  -100,
+  -102,  -119,   -87,  -128,   -63,   -66,   -68,   -93,   -68,  -128,
+  -116,  -128,   -66,   -93,   -68,   -68,  -128,   -66,   -65,   -71,
+   -72,  -108,  -109,  -110,  -128,   -74,   -75,  -128,   -66,  -101,
+  -128,  -103,   -68,   -50,  -107,   -59,  -128,   -93,  -111,  -117,
+   -61,  -128,   -50,  -106,   -50,  -128,  -128,  -112,  -113,  -128,
+   -68,  -104,   -73,  -114,  -128,  -118,   -50,  -115,  -105 ]
+
+racc_goto_table = [
+    69,   109,    50,   152,    57,   127,    84,    58,   112,   160,
+   114,    59,    60,    61,    86,    52,    54,    55,    98,   102,
+   103,   159,   106,   110,   175,    74,    74,    74,    74,   138,
+     9,     1,     3,   180,     7,    43,   120,   160,   109,   109,
+   195,   192,   121,    94,   119,   112,    40,   137,   118,   189,
+    47,   200,    86,    92,   175,   156,   130,   131,   132,   107,
+   135,   136,    88,   196,   111,   207,   111,    70,    72,   201,
+    73,    77,    78,    79,    67,   147,   134,   178,   148,   149,
+    93,   146,   124,   166,   179,   214,   185,   158,   208,   174,
+   187,   209,   191,   193,   107,   107,   143,   nil,   nil,   186,
+   nil,   111,   nil,   111,   nil,   nil,   194,   nil,   166,   nil,
+   202,   nil,   nil,   nil,   198,   nil,   nil,   nil,   163,   174,
+   198,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   216,   nil,
+   nil,   nil,   nil,   nil,   nil,   213,   198,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   203,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   211,   nil,   212,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   218 ]
+
+racc_goto_check = [
+    27,    20,    29,    33,    15,    40,     8,    15,    46,    39,
+    46,    15,    15,    15,    12,    16,    16,    16,    22,    22,
+    22,    50,    28,    43,    38,    29,    29,    29,    29,    32,
+     7,     1,     6,    36,     6,     7,     5,    39,    20,    20,
+    33,    36,     9,    15,     8,    46,    10,    46,    11,    50,
+    13,    33,    12,    16,    38,    32,    22,    28,    28,    29,
+    43,    43,    14,    37,    29,    36,    29,    24,    24,    37,
+    25,    25,    25,    25,    23,    30,    31,    34,    41,    42,
+    44,    45,    48,    20,    40,    37,    40,    49,    51,    20,
+    52,    53,    40,    40,    29,    29,    54,   nil,   nil,    20,
+   nil,    29,   nil,    29,   nil,   nil,    20,   nil,    20,   nil,
+    40,   nil,   nil,   nil,    20,   nil,   nil,   nil,    27,    20,
+    20,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    40,   nil,
+   nil,   nil,   nil,   nil,   nil,    20,    20,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,    27,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+    27,   nil,    27,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,    27 ]
+
+racc_goto_pointer = [
+   nil,    31,   nil,   nil,   nil,   -48,    32,    27,   -39,   -42,
+    42,   -34,   -31,    38,    15,   -13,     2,   nil,   nil,   nil,
+   -70,   nil,   -41,    42,    34,    35,   nil,   -32,   -47,   -10,
+   -59,   -31,   -86,  -137,   -88,   nil,  -133,  -121,  -135,  -135,
+   -82,   -56,   -55,   -48,    27,   -48,   -66,   nil,    -3,   -57,
+  -123,  -110,   -80,  -108,   -26 ]
+
+racc_goto_default = [
+   nil,   nil,     2,     8,    83,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,    10,   nil,   nil,    51,   nil,    21,    22,    23,
+    95,    97,   nil,   nil,   nil,   nil,   105,    71,   nil,    99,
+   nil,   nil,   nil,   nil,   153,   126,   nil,   nil,   168,   155,
+   nil,   100,   nil,   nil,   nil,   nil,    75,    85,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil ]
+
+racc_reduce_table = [
+  0, 0, :racc_error,
+  0, 63, :_reduce_1,
+  2, 63, :_reduce_2,
+  0, 64, :_reduce_3,
+  2, 64, :_reduce_4,
+  1, 65, :_reduce_5,
+  2, 65, :_reduce_6,
+  0, 66, :_reduce_none,
+  1, 66, :_reduce_none,
+  5, 58, :_reduce_none,
+  0, 67, :_reduce_10,
+  0, 68, :_reduce_11,
+  5, 59, :_reduce_12,
+  2, 59, :_reduce_none,
+  1, 73, :_reduce_14,
+  2, 73, :_reduce_15,
+  1, 60, :_reduce_none,
+  2, 60, :_reduce_17,
+  3, 60, :_reduce_18,
+  2, 60, :_reduce_none,
+  2, 60, :_reduce_20,
+  2, 60, :_reduce_21,
+  3, 60, :_reduce_22,
+  2, 60, :_reduce_23,
+  1, 60, :_reduce_24,
+  1, 60, :_reduce_25,
+  2, 60, :_reduce_none,
+  1, 78, :_reduce_27,
+  1, 78, :_reduce_28,
+  1, 79, :_reduce_29,
+  2, 79, :_reduce_30,
+  2, 69, :_reduce_31,
+  1, 69, :_reduce_none,
+  1, 69, :_reduce_none,
+  1, 69, :_reduce_none,
+  3, 69, :_reduce_35,
+  3, 69, :_reduce_36,
+  3, 69, :_reduce_37,
+  2, 69, :_reduce_38,
+  2, 69, :_reduce_39,
+  2, 69, :_reduce_40,
+  2, 69, :_reduce_41,
+  2, 69, :_reduce_42,
+  2, 74, :_reduce_none,
+  2, 74, :_reduce_44,
+  2, 74, :_reduce_45,
+  2, 74, :_reduce_46,
+  2, 74, :_reduce_47,
+  2, 74, :_reduce_48,
+  2, 74, :_reduce_49,
+  0, 84, :_reduce_none,
+  1, 84, :_reduce_none,
+  1, 85, :_reduce_52,
+  2, 85, :_reduce_53,
+  2, 80, :_reduce_54,
+  3, 80, :_reduce_55,
+  0, 88, :_reduce_none,
+  1, 88, :_reduce_none,
+  3, 83, :_reduce_58,
+  8, 75, :_reduce_59,
+  5, 76, :_reduce_60,
+  8, 76, :_reduce_61,
+  1, 89, :_reduce_62,
+  3, 89, :_reduce_63,
+  1, 90, :_reduce_64,
+  3, 90, :_reduce_65,
+  0, 96, :_reduce_none,
+  1, 96, :_reduce_none,
+  0, 97, :_reduce_none,
+  1, 97, :_reduce_none,
+  1, 91, :_reduce_70,
+  3, 91, :_reduce_71,
+  3, 91, :_reduce_72,
+  6, 91, :_reduce_73,
+  3, 91, :_reduce_74,
+  3, 91, :_reduce_75,
+  0, 99, :_reduce_none,
+  1, 99, :_reduce_none,
+  1, 87, :_reduce_78,
+  1, 100, :_reduce_79,
+  2, 100, :_reduce_80,
+  2, 81, :_reduce_81,
+  3, 81, :_reduce_82,
+  1, 77, :_reduce_none,
+  1, 77, :_reduce_none,
+  0, 101, :_reduce_85,
+  0, 102, :_reduce_86,
+  5, 72, :_reduce_87,
+  1, 103, :_reduce_88,
+  2, 103, :_reduce_89,
+  1, 82, :_reduce_90,
+  2, 82, :_reduce_91,
+  3, 82, :_reduce_92,
+  1, 86, :_reduce_93,
+  1, 86, :_reduce_94,
+  0, 105, :_reduce_none,
+  1, 105, :_reduce_none,
+  2, 61, :_reduce_none,
+  2, 61, :_reduce_none,
+  4, 104, :_reduce_99,
+  1, 106, :_reduce_100,
+  3, 106, :_reduce_101,
+  1, 107, :_reduce_102,
+  3, 107, :_reduce_103,
+  5, 107, :_reduce_104,
+  7, 107, :_reduce_105,
+  4, 107, :_reduce_106,
+  3, 107, :_reduce_107,
+  1, 93, :_reduce_108,
+  1, 93, :_reduce_109,
+  1, 93, :_reduce_110,
+  0, 108, :_reduce_none,
+  1, 108, :_reduce_none,
+  2, 94, :_reduce_113,
+  3, 94, :_reduce_114,
+  4, 94, :_reduce_115,
+  0, 109, :_reduce_116,
+  0, 110, :_reduce_117,
+  5, 95, :_reduce_118,
+  3, 92, :_reduce_119,
+  0, 111, :_reduce_120,
+  3, 62, :_reduce_121,
+  1, 70, :_reduce_none,
+  0, 71, :_reduce_none,
+  1, 71, :_reduce_none,
+  1, 71, :_reduce_none,
+  1, 71, :_reduce_none,
+  1, 98, :_reduce_127 ]
+
+racc_reduce_n = 128
+
+racc_shift_n = 219
+
+racc_token_table = {
+  false => 0,
+  :error => 1,
+  :C_DECLARATION => 2,
+  :CHARACTER => 3,
+  :IDENT_COLON => 4,
+  :IDENTIFIER => 5,
+  :INTEGER => 6,
+  :STRING => 7,
+  :TAG => 8,
+  "%%" => 9,
+  "%{" => 10,
+  "%}" => 11,
+  "%require" => 12,
+  "%expect" => 13,
+  "%define" => 14,
+  "%param" => 15,
+  "%lex-param" => 16,
+  "%parse-param" => 17,
+  "%code" => 18,
+  "%initial-action" => 19,
+  "%no-stdlib" => 20,
+  "%locations" => 21,
+  ";" => 22,
+  "%union" => 23,
+  "%destructor" => 24,
+  "%printer" => 25,
+  "%error-token" => 26,
+  "%after-shift" => 27,
+  "%before-reduce" => 28,
+  "%after-reduce" => 29,
+  "%after-shift-error-token" => 30,
+  "%after-pop-stack" => 31,
+  "-temp-group" => 32,
+  "%token" => 33,
+  "%type" => 34,
+  "%nterm" => 35,
+  "%left" => 36,
+  "%right" => 37,
+  "%precedence" => 38,
+  "%nonassoc" => 39,
+  "%rule" => 40,
+  "(" => 41,
+  ")" => 42,
+  ":" => 43,
+  "%inline" => 44,
+  "," => 45,
+  "|" => 46,
+  "%empty" => 47,
+  "%prec" => 48,
+  "{" => 49,
+  "}" => 50,
+  "?" => 51,
+  "+" => 52,
+  "*" => 53,
+  "[" => 54,
+  "]" => 55,
+  "{...}" => 56 }
+
+racc_nt_base = 57
+
+racc_use_result_var = true
+
+Racc_arg = [
+  racc_action_table,
+  racc_action_check,
+  racc_action_default,
+  racc_action_pointer,
+  racc_goto_table,
+  racc_goto_check,
+  racc_goto_default,
+  racc_goto_pointer,
+  racc_nt_base,
+  racc_reduce_table,
+  racc_token_table,
+  racc_shift_n,
+  racc_reduce_n,
+  racc_use_result_var ]
+Ractor.make_shareable(Racc_arg) if defined?(Ractor)
+
+Racc_token_to_s_table = [
+  "$end",
+  "error",
+  "C_DECLARATION",
+  "CHARACTER",
+  "IDENT_COLON",
+  "IDENTIFIER",
+  "INTEGER",
+  "STRING",
+  "TAG",
+  "\"%%\"",
+  "\"%{\"",
+  "\"%}\"",
+  "\"%require\"",
+  "\"%expect\"",
+  "\"%define\"",
+  "\"%param\"",
+  "\"%lex-param\"",
+  "\"%parse-param\"",
+  "\"%code\"",
+  "\"%initial-action\"",
+  "\"%no-stdlib\"",
+  "\"%locations\"",
+  "\";\"",
+  "\"%union\"",
+  "\"%destructor\"",
+  "\"%printer\"",
+  "\"%error-token\"",
+  "\"%after-shift\"",
+  "\"%before-reduce\"",
+  "\"%after-reduce\"",
+  "\"%after-shift-error-token\"",
+  "\"%after-pop-stack\"",
+  "\"-temp-group\"",
+  "\"%token\"",
+  "\"%type\"",
+  "\"%nterm\"",
+  "\"%left\"",
+  "\"%right\"",
+  "\"%precedence\"",
+  "\"%nonassoc\"",
+  "\"%rule\"",
+  "\"(\"",
+  "\")\"",
+  "\":\"",
+  "\"%inline\"",
+  "\",\"",
+  "\"|\"",
+  "\"%empty\"",
+  "\"%prec\"",
+  "\"{\"",
+  "\"}\"",
+  "\"?\"",
+  "\"+\"",
+  "\"*\"",
+  "\"[\"",
+  "\"]\"",
+  "\"{...}\"",
+  "$start",
+  "input",
+  "prologue_declaration",
+  "bison_declaration",
+  "rules_or_grammar_declaration",
+  "epilogue_declaration",
+  "\"-many@prologue_declaration\"",
+  "\"-many@bison_declaration\"",
+  "\"-many1@rules_or_grammar_declaration\"",
+  "\"-option@epilogue_declaration\"",
+  "@1",
+  "@2",
+  "grammar_declaration",
+  "variable",
+  "value",
+  "param",
+  "\"-many1@param\"",
+  "symbol_declaration",
+  "rule_declaration",
+  "inline_declaration",
+  "symbol",
+  "\"-group@symbol|TAG\"",
+  "\"-many1@-group@symbol|TAG\"",
+  "token_declarations",
+  "symbol_declarations",
+  "token_declarations_for_precedence",
+  "token_declaration",
+  "\"-option@TAG\"",
+  "\"-many1@token_declaration\"",
+  "id",
+  "alias",
+  "\"-option@INTEGER\"",
+  "rule_args",
+  "rule_rhs_list",
+  "rule_rhs",
+  "named_ref",
+  "parameterizing_suffix",
+  "parameterizing_args",
+  "midrule_action",
+  "\"-option@%empty\"",
+  "\"-option@named_ref\"",
+  "string_as_id",
+  "\"-option@string_as_id\"",
+  "\"-many1@symbol\"",
+  "@3",
+  "@4",
+  "\"-many1@id\"",
+  "rules",
+  "\"-option@;\"",
+  "rhs_list",
+  "rhs",
+  "\"-option@parameterizing_suffix\"",
+  "@5",
+  "@6",
+  "@7" ]
+Ractor.make_shareable(Racc_token_to_s_table) if defined?(Ractor)
+
+Racc_debug_parser = true
+
+##### State transition tables end #####
+
+# reduce 0 omitted
+
+module_eval(<<'.,.,', 'parser.y', 11)
+  def _reduce_1(val, _values, result)
+    result = val[1] ? val[1].unshift(val[0]) : val
+    result
+  end
+.,.,
+
+module_eval(<<'.,.,', 'parser.y', 11)
+  def _reduce_2(val, _values, result)
+    result = val[1] ? val[1].unshift(val[0]) : val
+    result
+  end
+.,.,
+
+module_eval(<<'.,.,', 'parser.y', 11)
+  def _reduce_3(val, _values, result)
+    result = val[1] ? val[1].unshift(val[0]) : val
+    result
+  end
+.,.,
+
+module_eval(<<'.,.,', 'parser.y', 11)
+  def _reduce_4(val, _values, result)
+    result = val[1] ? val[1].unshift(val[0]) : val
+    result
+  end
+.,.,
+
+module_eval(<<'.,.,', 'parser.y', 11)
+  def _reduce_5(val, _values, result)
+    result = val[1] ? val[1].unshift(val[0]) : val
+    result
+  end
+.,.,
+
+module_eval(<<'.,.,', 'parser.y', 11)
+  def _reduce_6(val, _values, result)
+    result = val[1] ? val[1].unshift(val[0]) : val
+    result
+  end
+.,.,
+
+# reduce 7 omitted
+
+# reduce 8 omitted
+
+# reduce 9 omitted
+
+module_eval(<<'.,.,', 'parser.y', 12)
+  def _reduce_10(val, _values, result)
+                                begin_c_declaration("%}")
+                            @grammar.prologue_first_lineno = @lexer.line
+
+    result
+  end
+.,.,
+
+module_eval(<<'.,.,', 'parser.y', 17)
+  def _reduce_11(val, _values, result)
+                                end_c_declaration
+
+    result
+  end
+.,.,
+
+module_eval(<<'.,.,', 'parser.y', 21)
+  def _reduce_12(val, _values, result)
+                                @grammar.prologue = val[2].s_value
+
+    result
+  end
+.,.,
+
+# reduce 13 omitted
+
+module_eval(<<'.,.,', 'parser.y', 54)
+  def _reduce_14(val, _values, result)
+    result = val[1] ? val[1].unshift(val[0]) : val
+    result
+  end
+.,.,
+
+module_eval(<<'.,.,', 'parser.y', 54)
+  def _reduce_15(val, _values, result)
+    result = val[1] ? val[1].unshift(val[0]) : val
+    result
+  end
+.,.,
+
+# reduce 16 omitted
+
+module_eval(<<'.,.,', 'parser.y', 26)
+  def _reduce_17(val, _values, result)
+     @grammar.expect = val[1]
+    result
+  end
+.,.,
+
+module_eval(<<'.,.,', 'parser.y', 27)
+  def _reduce_18(val, _values, result)
+     @grammar.define[val[1].s_value] = val[2]&.s_value
+    result
+  end
+.,.,
+
+# reduce 19 omitted
+
+module_eval(<<'.,.,', 'parser.y', 31)
+  def _reduce_20(val, _values, result)
+                             val[1].each {|token|
+                           @grammar.lex_param = Grammar::Code::NoReferenceCode.new(type: :lex_param, token_code: token).token_code.s_value
+                         }
+
+    result
+  end
+.,.,
+
+module_eval(<<'.,.,', 'parser.y', 37)
+  def _reduce_21(val, _values, result)
+                             val[1].each {|token|
+                           @grammar.parse_param = Grammar::Code::NoReferenceCode.new(type: :parse_param, token_code: token).token_code.s_value
+                         }
+
+    result
+  end
+.,.,
+
+module_eval(<<'.,.,', 'parser.y', 43)
+  def _reduce_22(val, _values, result)
+                             @grammar.add_percent_code(id: val[1], code: val[2])
+
+    result
+  end
+.,.,
+
+module_eval(<<'.,.,', 'parser.y', 47)
+  def _reduce_23(val, _values, result)
+                             @grammar.initial_action = Grammar::Code::InitialActionCode.new(type: :initial_action, token_code: val[1])
+
+    result
+  end
+.,.,
+
+module_eval(<<'.,.,', 'parser.y', 49)
+  def _reduce_24(val, _values, result)
+     @grammar.no_stdlib = true
+    result
+  end
+.,.,
+
+module_eval(<<'.,.,', 'parser.y', 50)
+  def _reduce_25(val, _values, result)
+     @grammar.locations = true
+    result
+  end
+.,.,
+
+# reduce 26 omitted
+
+module_eval(<<'.,.,', 'parser.y', 109)
+  def _reduce_27(val, _values, result)
+    result = val
+    result
+  end
+.,.,
+
+module_eval(<<'.,.,', 'parser.y', 109)
+  def _reduce_28(val, _values, result)
+    result = val
+    result
+  end
+.,.,
+
+module_eval(<<'.,.,', 'parser.y', 109)
+  def _reduce_29(val, _values, result)
+    result = val[1] ? val[1].unshift(val[0]) : val
+    result
+  end
+.,.,
+
+module_eval(<<'.,.,', 'parser.y', 109)
+  def _reduce_30(val, _values, result)
+    result = val[1] ? val[1].unshift(val[0]) : val
+    result
+  end
+.,.,
+
+module_eval(<<'.,.,', 'parser.y', 55)
+  def _reduce_31(val, _values, result)
+                               @grammar.set_union(
+                             Grammar::Code::NoReferenceCode.new(type: :union, token_code: val[1]),
+                             val[1].line
+                           )
+
+    result
+  end
+.,.,
+
+# reduce 32 omitted
+
+# reduce 33 omitted
+
+# reduce 34 omitted
+
+module_eval(<<'.,.,', 'parser.y', 65)
+  def _reduce_35(val, _values, result)
+                               @grammar.add_destructor(
+                             ident_or_tags: val[2].flatten,
+                             token_code: val[1],
+                             lineno: val[1].line
+                           )
+
+    result
+  end
+.,.,
+
+module_eval(<<'.,.,', 'parser.y', 73)
+  def _reduce_36(val, _values, result)
+                               @grammar.add_printer(
+                             ident_or_tags: val[2].flatten,
+                             token_code: val[1],
+                             lineno: val[1].line
+                           )
+
+    result
+  end
+.,.,
+
+module_eval(<<'.,.,', 'parser.y', 81)
+  def _reduce_37(val, _values, result)
+                               @grammar.add_error_token(
+                             ident_or_tags: val[2].flatten,
+                             token_code: val[1],
+                             lineno: val[1].line
+                           )
+
+    result
+  end
+.,.,
+
+module_eval(<<'.,.,', 'parser.y', 89)
+  def _reduce_38(val, _values, result)
+                               @grammar.after_shift = val[1]
+
+    result
+  end
+.,.,
+
+module_eval(<<'.,.,', 'parser.y', 93)
+  def _reduce_39(val, _values, result)
+                               @grammar.before_reduce = val[1]
+
+    result
+  end
+.,.,
+
+module_eval(<<'.,.,', 'parser.y', 97)
+  def _reduce_40(val, _values, result)
+                               @grammar.after_reduce = val[1]
+
+    result
+  end
+.,.,
+
+module_eval(<<'.,.,', 'parser.y', 101)
+  def _reduce_41(val, _values, result)
+                               @grammar.after_shift_error_token = val[1]
+
+    result
+  end
+.,.,
+
+module_eval(<<'.,.,', 'parser.y', 105)
+  def _reduce_42(val, _values, result)
+                               @grammar.after_pop_stack = val[1]
+
+    result
+  end
+.,.,
+
+# reduce 43 omitted
+
+module_eval(<<'.,.,', 'parser.y', 111)
+  def _reduce_44(val, _values, result)
+                              val[1].each {|hash|
+                            hash[:tokens].each {|id|
+                              @grammar.add_type(id: id, tag: hash[:tag])
+                            }
+                          }
+
+    result
+  end
+.,.,
+
+module_eval(<<'.,.,', 'parser.y', 119)
+  def _reduce_45(val, _values, result)
+                              val[1].each {|hash|
+                            hash[:tokens].each {|id|
+                              if @grammar.find_term_by_s_value(id.s_value)
+                                on_action_error("symbol #{id.s_value} redeclared as a nonterminal", id)
+                              else
+                                @grammar.add_type(id: id, tag: hash[:tag])
+                              end
+                            }
+                          }
+
+    result
+  end
+.,.,
+
+module_eval(<<'.,.,', 'parser.y', 131)
+  def _reduce_46(val, _values, result)
+                              val[1].each {|hash|
+                            hash[:tokens].each {|id|
+                              sym = @grammar.add_term(id: id)
+                              @grammar.add_left(sym, @precedence_number)
+                            }
+                          }
+                          @precedence_number += 1
+
+    result
+  end
+.,.,
+
+module_eval(<<'.,.,', 'parser.y', 141)
+  def _reduce_47(val, _values, result)
+                              val[1].each {|hash|
+                            hash[:tokens].each {|id|
+                              sym = @grammar.add_term(id: id)
+                              @grammar.add_right(sym, @precedence_number)
+                            }
+                          }
+                          @precedence_number += 1
+
+    result
+  end
+.,.,
+
+module_eval(<<'.,.,', 'parser.y', 151)
+  def _reduce_48(val, _values, result)
+                              val[1].each {|hash|
+                            hash[:tokens].each {|id|
+                              sym = @grammar.add_term(id: id)
+                              @grammar.add_precedence(sym, @precedence_number)
+                            }
+                          }
+                          @precedence_number += 1
+
+    result
+  end
+.,.,
+
+module_eval(<<'.,.,', 'parser.y', 161)
+  def _reduce_49(val, _values, result)
+                              val[1].each {|hash|
+                            hash[:tokens].each {|id|
+                              sym = @grammar.add_term(id: id)
+                              @grammar.add_nonassoc(sym, @precedence_number)
+                            }
+                          }
+                          @precedence_number += 1
+
+    result
+  end
+.,.,
+
+# reduce 50 omitted
+
+# reduce 51 omitted
+
+module_eval(<<'.,.,', 'parser.y', 184)
+  def _reduce_52(val, _values, result)
+    result = val[1] ? val[1].unshift(val[0]) : val
+    result
+  end
+.,.,
+
+module_eval(<<'.,.,', 'parser.y', 184)
+  def _reduce_53(val, _values, result)
+    result = val[1] ? val[1].unshift(val[0]) : val
+    result
+  end
+.,.,
+
+module_eval(<<'.,.,', 'parser.y', 172)
+  def _reduce_54(val, _values, result)
+                              val[1].each {|token_declaration|
+                            @grammar.add_term(id: token_declaration[0], alias_name: token_declaration[2], token_id: token_declaration[1], tag: val[0], replace: true)
+                          }
+
+    result
+  end
+.,.,
+
+module_eval(<<'.,.,', 'parser.y', 178)
+  def _reduce_55(val, _values, result)
+                              val[2].each {|token_declaration|
+                            @grammar.add_term(id: token_declaration[0], alias_name: token_declaration[2], token_id: token_declaration[1], tag: val[1], replace: true)
+                          }
+
+    result
+  end
+.,.,
+
+# reduce 56 omitted
+
+# reduce 57 omitted
+
+module_eval(<<'.,.,', 'parser.y', 183)
+  def _reduce_58(val, _values, result)
+     result = val
+    result
+  end
+.,.,
+
+module_eval(<<'.,.,', 'parser.y', 187)
+  def _reduce_59(val, _values, result)
+                            rule = Grammar::ParameterizingRule::Rule.new(val[1].s_value, val[3], val[7], tag: val[5])
+                        @grammar.add_parameterizing_rule(rule)
+
+    result
+  end
+.,.,
+
+module_eval(<<'.,.,', 'parser.y', 193)
+  def _reduce_60(val, _values, result)
+                            rule = Grammar::ParameterizingRule::Rule.new(val[2].s_value, [], val[4], is_inline: true)
+                        @grammar.add_parameterizing_rule(rule)
+
+    result
+  end
+.,.,
+
+module_eval(<<'.,.,', 'parser.y', 198)
+  def _reduce_61(val, _values, result)
+                            rule = Grammar::ParameterizingRule::Rule.new(val[2].s_value, val[4], val[7], is_inline: true)
+                        @grammar.add_parameterizing_rule(rule)
+
+    result
+  end
+.,.,
+
+module_eval(<<'.,.,', 'parser.y', 202)
+  def _reduce_62(val, _values, result)
+     result = [val[0]]
+    result
+  end
+.,.,
+
+module_eval(<<'.,.,', 'parser.y', 203)
+  def _reduce_63(val, _values, result)
+     result = val[0].append(val[2])
+    result
+  end
+.,.,
+
+module_eval(<<'.,.,', 'parser.y', 207)
+  def _reduce_64(val, _values, result)
+                      builder = val[0]
+                  result = [builder]
+
+    result
+  end
+.,.,
+
+module_eval(<<'.,.,', 'parser.y', 212)
+  def _reduce_65(val, _values, result)
+                      builder = val[2]
+                  result = val[0].append(builder)
+
+    result
+  end
+.,.,
+
+# reduce 66 omitted
+
+# reduce 67 omitted
+
+# reduce 68 omitted
+
+# reduce 69 omitted
+
+module_eval(<<'.,.,', 'parser.y', 218)
+  def _reduce_70(val, _values, result)
+                  reset_precs
+              result = Grammar::ParameterizingRule::Rhs.new
+
+    result
+  end
+.,.,
+
+module_eval(<<'.,.,', 'parser.y', 223)
+  def _reduce_71(val, _values, result)
+                  token = val[1]
+              token.alias_name = val[2]
+              builder = val[0]
+              builder.symbols << token
+              result = builder
+
+    result
+  end
+.,.,
+
+module_eval(<<'.,.,', 'parser.y', 231)
+  def _reduce_72(val, _values, result)
+                    builder = val[0]
+                builder.symbols << Lrama::Lexer::Token::InstantiateRule.new(s_value: val[2], location: @lexer.location, args: [val[1]])
+                result = builder
+
+    result
+  end
+.,.,
+
+module_eval(<<'.,.,', 'parser.y', 237)
+  def _reduce_73(val, _values, result)
+                    builder = val[0]
+                builder.symbols << Lrama::Lexer::Token::InstantiateRule.new(s_value: val[1].s_value, location: @lexer.location, args: val[3], lhs_tag: val[5])
+                result = builder
+
+    result
+  end
+.,.,
+
+module_eval(<<'.,.,', 'parser.y', 243)
+  def _reduce_74(val, _values, result)
+                  user_code = val[1]
+              user_code.alias_name = val[2]
+              builder = val[0]
+              builder.user_code = user_code
+              result = builder
+
+    result
+  end
+.,.,
+
+module_eval(<<'.,.,', 'parser.y', 251)
+  def _reduce_75(val, _values, result)
+                  sym = @grammar.find_symbol_by_id!(val[2])
+              @prec_seen = true
+              builder = val[0]
+              builder.precedence_sym = sym
+              result = builder
+
+    result
+  end
+.,.,
+
+# reduce 76 omitted
+
+# reduce 77 omitted
+
+module_eval(<<'.,.,', 'parser.y', 258)
+  def _reduce_78(val, _values, result)
+     result = val[0].s_value if val[0]
+    result
+  end
+.,.,
+
+module_eval(<<'.,.,', 'parser.y', 271)
+  def _reduce_79(val, _values, result)
+    result = val[1] ? val[1].unshift(val[0]) : val
+    result
+  end
+.,.,
+
+module_eval(<<'.,.,', 'parser.y', 271)
+  def _reduce_80(val, _values, result)
+    result = val[1] ? val[1].unshift(val[0]) : val
+    result
+  end
+.,.,
+
+module_eval(<<'.,.,', 'parser.y', 262)
+  def _reduce_81(val, _values, result)
+                              result = if val[0]
+                            [{tag: val[0], tokens: val[1]}]
+                          else
+                            [{tag: nil, tokens: val[1]}]
+                          end
+
+    result
+  end
+.,.,
+
+module_eval(<<'.,.,', 'parser.y', 268)
+  def _reduce_82(val, _values, result)
+     result = val[0].append({tag: val[1], tokens: val[2]})
+    result
+  end
+.,.,
+
+# reduce 83 omitted
+
+# reduce 84 omitted
+
+module_eval(<<'.,.,', 'parser.y', 274)
+  def _reduce_85(val, _values, result)
+                   begin_c_declaration("}")
+
+    result
+  end
+.,.,
+
+module_eval(<<'.,.,', 'parser.y', 278)
+  def _reduce_86(val, _values, result)
+                   end_c_declaration
+
+    result
+  end
+.,.,
+
+module_eval(<<'.,.,', 'parser.y', 282)
+  def _reduce_87(val, _values, result)
+                   result = val[2]
+
+    result
+  end
+.,.,
+
+module_eval(<<'.,.,', 'parser.y', 290)
+  def _reduce_88(val, _values, result)
+    result = val[1] ? val[1].unshift(val[0]) : val
+    result
+  end
+.,.,
+
+module_eval(<<'.,.,', 'parser.y', 290)
+  def _reduce_89(val, _values, result)
+    result = val[1] ? val[1].unshift(val[0]) : val
+    result
+  end
+.,.,
+
+module_eval(<<'.,.,', 'parser.y', 285)
+  def _reduce_90(val, _values, result)
+     result = [{tag: nil, tokens: val[0]}]
+    result
+  end
+.,.,
+
+module_eval(<<'.,.,', 'parser.y', 286)
+  def _reduce_91(val, _values, result)
+     result = [{tag: val[0], tokens: val[1]}]
+    result
+  end
+.,.,
+
+module_eval(<<'.,.,', 'parser.y', 287)
+  def _reduce_92(val, _values, result)
+     result = val[0].append({tag: val[1], tokens: val[2]})
+    result
+  end
+.,.,
+
+module_eval(<<'.,.,', 'parser.y', 289)
+  def _reduce_93(val, _values, result)
+     on_action_error("ident after %prec", val[0]) if @prec_seen
+    result
+  end
+.,.,
+
+module_eval(<<'.,.,', 'parser.y', 290)
+  def _reduce_94(val, _values, result)
+     on_action_error("char after %prec", val[0]) if @prec_seen
+    result
+  end
+.,.,
+
+# reduce 95 omitted
+
+# reduce 96 omitted
+
+# reduce 97 omitted
+
+# reduce 98 omitted
+
+module_eval(<<'.,.,', 'parser.y', 298)
+  def _reduce_99(val, _values, result)
+                 lhs = val[0]
+             lhs.alias_name = val[1]
+             val[3].each do |builder|
+               builder.lhs = lhs
+               builder.complete_input
+               @grammar.add_rule_builder(builder)
+             end
+
+    result
+  end
+.,.,
+
+module_eval(<<'.,.,', 'parser.y', 309)
+  def _reduce_100(val, _values, result)
+                    builder = val[0]
+                if !builder.line
+                  builder.line = @lexer.line - 1
+                end
+                result = [builder]
+
+    result
+  end
+.,.,
+
+module_eval(<<'.,.,', 'parser.y', 317)
+  def _reduce_101(val, _values, result)
+                    builder = val[2]
+                if !builder.line
+                  builder.line = @lexer.line - 1
+                end
+                result = val[0].append(builder)
+
+    result
+  end
+.,.,
+
+module_eval(<<'.,.,', 'parser.y', 326)
+  def _reduce_102(val, _values, result)
+               reset_precs
+           result = @grammar.create_rule_builder(@rule_counter, @midrule_action_counter)
+
+    result
+  end
+.,.,
+
+module_eval(<<'.,.,', 'parser.y', 331)
+  def _reduce_103(val, _values, result)
+               token = val[1]
+           token.alias_name = val[2]
+           builder = val[0]
+           builder.add_rhs(token)
+           result = builder
+
+    result
   end
+.,.,
+
+module_eval(<<'.,.,', 'parser.y', 339)
+  def _reduce_104(val, _values, result)
+               token = Lrama::Lexer::Token::InstantiateRule.new(s_value: val[2], alias_name: val[3], location: @lexer.location, args: [val[1]], lhs_tag: val[4])
+           builder = val[0]
+           builder.add_rhs(token)
+           builder.line = val[1].first_line
+           result = builder
+
+    result
+  end
+.,.,
+
+module_eval(<<'.,.,', 'parser.y', 347)
+  def _reduce_105(val, _values, result)
+               token = Lrama::Lexer::Token::InstantiateRule.new(s_value: val[1].s_value, alias_name: val[5], location: @lexer.location, args: val[3], lhs_tag: val[6])
+           builder = val[0]
+           builder.add_rhs(token)
+           builder.line = val[1].first_line
+           result = builder
+
+    result
+  end
+.,.,
+
+module_eval(<<'.,.,', 'parser.y', 355)
+  def _reduce_106(val, _values, result)
+               user_code = val[1]
+           user_code.alias_name = val[2]
+           user_code.tag = val[3]
+           builder = val[0]
+           builder.user_code = user_code
+           result = builder
+
+    result
+  end
+.,.,
+
+module_eval(<<'.,.,', 'parser.y', 364)
+  def _reduce_107(val, _values, result)
+               sym = @grammar.find_symbol_by_id!(val[2])
+           @prec_seen = true
+           builder = val[0]
+           builder.precedence_sym = sym
+           result = builder
+
+    result
+  end
+.,.,
+
+module_eval(<<'.,.,', 'parser.y', 371)
+  def _reduce_108(val, _values, result)
+     result = "option"
+    result
+  end
+.,.,
+
+module_eval(<<'.,.,', 'parser.y', 372)
+  def _reduce_109(val, _values, result)
+     result = "nonempty_list"
+    result
+  end
+.,.,
+
+module_eval(<<'.,.,', 'parser.y', 373)
+  def _reduce_110(val, _values, result)
+     result = "list"
+    result
+  end
+.,.,
+
+# reduce 111 omitted
+
+# reduce 112 omitted
+
+module_eval(<<'.,.,', 'parser.y', 377)
+  def _reduce_113(val, _values, result)
+                                result = if val[1]
+                              [Lrama::Lexer::Token::InstantiateRule.new(s_value: val[1].s_value, location: @lexer.location, args: val[0])]
+                            else
+                              [val[0]]
+                            end
+
+    result
+  end
+.,.,
+
+module_eval(<<'.,.,', 'parser.y', 383)
+  def _reduce_114(val, _values, result)
+     result = val[0].append(val[2])
+    result
+  end
+.,.,
+
+module_eval(<<'.,.,', 'parser.y', 384)
+  def _reduce_115(val, _values, result)
+     result = [Lrama::Lexer::Token::InstantiateRule.new(s_value: val[0].s_value, location: @lexer.location, args: val[2])]
+    result
+  end
+.,.,
+
+module_eval(<<'.,.,', 'parser.y', 388)
+  def _reduce_116(val, _values, result)
+                          if @prec_seen
+                        on_action_error("multiple User_code after %prec", val[0])  if @code_after_prec
+                        @code_after_prec = true
+                      end
+                      begin_c_declaration("}")
+
+    result
+  end
+.,.,
+
+module_eval(<<'.,.,', 'parser.y', 396)
+  def _reduce_117(val, _values, result)
+                          end_c_declaration
+
+    result
+  end
+.,.,
+
+module_eval(<<'.,.,', 'parser.y', 400)
+  def _reduce_118(val, _values, result)
+                          result = val[2]
+
+    result
+  end
+.,.,
+
+module_eval(<<'.,.,', 'parser.y', 403)
+  def _reduce_119(val, _values, result)
+     result = val[1].s_value
+    result
+  end
+.,.,
+
+module_eval(<<'.,.,', 'parser.y', 407)
+  def _reduce_120(val, _values, result)
+                                begin_c_declaration('\Z')
+                            @grammar.epilogue_first_lineno = @lexer.line + 1
+
+    result
+  end
+.,.,
+
+module_eval(<<'.,.,', 'parser.y', 412)
+  def _reduce_121(val, _values, result)
+                                end_c_declaration
+                            @grammar.epilogue = val[2].s_value
+
+    result
+  end
+.,.,
+
+# reduce 122 omitted
+
+# reduce 123 omitted
+
+# reduce 124 omitted
+
+# reduce 125 omitted
+
+# reduce 126 omitted
+
+module_eval(<<'.,.,', 'parser.y', 423)
+  def _reduce_127(val, _values, result)
+     result = Lrama::Lexer::Token::Ident.new(s_value: val[0])
+    result
+  end
+.,.,
+
+def _reduce_none(val, _values, result)
+  val[0]
 end
+
+  end   # class Parser
+end   # module Lrama
diff --git a/tool/lrama/lib/lrama/parser/token_scanner.rb b/tool/lrama/lib/lrama/parser/token_scanner.rb
deleted file mode 100644
index 992b5742d3b857..00000000000000
--- a/tool/lrama/lib/lrama/parser/token_scanner.rb
+++ /dev/null
@@ -1,56 +0,0 @@
-module Lrama
-  class Parser
-    class TokenScanner
-      def initialize(tokens)
-        @tokens = tokens
-        @index = 0
-      end
-
-      def current_token
-        @tokens[@index]
-      end
-
-      def current_type
-        current_token&.type
-      end
-
-      def previous_token
-        @tokens[@index - 1]
-      end
-
-      def next
-        token = current_token
-        @index += 1
-        return token
-      end
-
-      def consume(*token_types)
-        if token_types.include?(current_type)
-          return self.next
-        end
-
-        return nil
-      end
-
-      def consume!(*token_types)
-        consume(*token_types) || (raise "#{token_types} is expected but #{current_type}. #{current_token}")
-      end
-
-      def consume_multi(*token_types)
-        a = []
-
-        while token_types.include?(current_type)
-          a << self.next
-        end
-
-        raise "No token is consumed. #{token_types}" if a.empty?
-
-        return a
-      end
-
-      def eots?
-        current_token.nil?
-      end
-    end
-  end
-end
diff --git a/tool/lrama/lib/lrama/report.rb b/tool/lrama/lib/lrama/report.rb
index 650ac09d52e4a2..890e5f1e8c5cc4 100644
--- a/tool/lrama/lib/lrama/report.rb
+++ b/tool/lrama/lib/lrama/report.rb
@@ -1,2 +1,4 @@
-require 'lrama/report/duration'
-require 'lrama/report/profile'
+# frozen_string_literal: true
+
+require_relative 'report/duration'
+require_relative 'report/profile'
diff --git a/tool/lrama/lib/lrama/report/duration.rb b/tool/lrama/lib/lrama/report/duration.rb
index 7afe284f1a1aaa..fe09a0d028f501 100644
--- a/tool/lrama/lib/lrama/report/duration.rb
+++ b/tool/lrama/lib/lrama/report/duration.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Lrama
   class Report
     module Duration
diff --git a/tool/lrama/lib/lrama/report/profile.rb b/tool/lrama/lib/lrama/report/profile.rb
index 8265d94c2f7c6f..10488cf9130bd1 100644
--- a/tool/lrama/lib/lrama/report/profile.rb
+++ b/tool/lrama/lib/lrama/report/profile.rb
@@ -1,18 +1,9 @@
+# frozen_string_literal: true
+
 module Lrama
   class Report
     module Profile
-      # 1. Wrap target method with Profile.report_profile like below:
-      #
-      #   Lrama::Report::Profile.report_profile { method }
-      #
-      # 2. Run lrama command, for example
-      #
-      #   $ ./exe/lrama --trace=time spec/fixtures/integration/ruby_3_2_0/parse.tmp.y
-      #
-      # 3. Generate html file
-      #
-      #   $ stackprof --d3-flamegraph tmp/stackprof-cpu-myapp.dump > tmp/flamegraph.html
-      #
+      # See "Profiling Lrama" in README.md for how to use.
       def self.report_profile
         require "stackprof"
 
diff --git a/tool/lrama/lib/lrama/state.rb b/tool/lrama/lib/lrama/state.rb
index 1b406402157346..3008786ced0271 100644
--- a/tool/lrama/lib/lrama/state.rb
+++ b/tool/lrama/lib/lrama/state.rb
@@ -1,14 +1,16 @@
-require "lrama/state/reduce"
-require "lrama/state/reduce_reduce_conflict"
-require "lrama/state/resolved_conflict"
-require "lrama/state/shift"
-require "lrama/state/shift_reduce_conflict"
+# frozen_string_literal: true
+
+require_relative "state/reduce"
+require_relative "state/reduce_reduce_conflict"
+require_relative "state/resolved_conflict"
+require_relative "state/shift"
+require_relative "state/shift_reduce_conflict"
 
 module Lrama
   class State
     attr_reader :id, :accessing_symbol, :kernels, :conflicts, :resolved_conflicts,
                 :default_reduction_rule, :closure, :items
-    attr_accessor :shifts, :reduces
+    attr_accessor :shifts, :reduces, :ielr_isocores, :lalr_isocore
 
     def initialize(id, accessing_symbol, kernels)
       @id = id
@@ -21,6 +23,12 @@ def initialize(id, accessing_symbol, kernels)
       @conflicts = []
       @resolved_conflicts = []
       @default_reduction_rule = nil
+      @predecessors = []
+      @lalr_isocore = self
+      @ielr_isocores = [self]
+      @internal_dependencies = {}
+      @successor_dependencies = {}
+      @always_follows = {}
     end
 
     def closure=(closure)
@@ -29,8 +37,8 @@ def closure=(closure)
     end
 
     def non_default_reduces
-      reduces.select do |reduce|
-        reduce.rule != @default_reduction_rule
+      reduces.reject do |reduce|
+        reduce.rule == @default_reduction_rule
       end
     end
 
@@ -70,43 +78,33 @@ def set_look_ahead(rule, look_ahead)
       reduce.look_ahead = look_ahead
     end
 
-    # Returns array of [Shift, next_state]
     def nterm_transitions
-      return @nterm_transitions if @nterm_transitions
-
-      @nterm_transitions = []
-
-      shifts.each do |shift|
-        next if shift.next_sym.term?
-
-        @nterm_transitions << [shift, @items_to_state[shift.next_items]]
-      end
-
-      @nterm_transitions
+      @nterm_transitions ||= transitions.select {|shift, _| shift.next_sym.nterm? }
     end
 
-    # Returns array of [Shift, next_state]
     def term_transitions
-      return @term_transitions if @term_transitions
-
-      @term_transitions = []
-
-      shifts.each do |shift|
-        next if shift.next_sym.nterm?
+      @term_transitions ||= transitions.select {|shift, _| shift.next_sym.term? }
+    end
 
-        @term_transitions << [shift, @items_to_state[shift.next_items]]
-      end
+    def transitions
+      @transitions ||= shifts.map {|shift| [shift, @items_to_state[shift.next_items]] }
+    end
 
-      @term_transitions
+    def update_transition(shift, next_state)
+      set_items_to_state(shift.next_items, next_state)
+      next_state.append_predecessor(self)
+      clear_transitions_cache
     end
 
-    def transitions
-      term_transitions + nterm_transitions
+    def clear_transitions_cache
+      @nterm_transitions = nil
+      @term_transitions = nil
+      @transitions = nil
     end
 
     def selected_term_transitions
-      term_transitions.select do |shift, next_state|
-        !shift.not_selected
+      term_transitions.reject do |shift, next_state|
+        shift.not_selected
       end
     end
 
@@ -162,5 +160,274 @@ def rr_conflicts
         conflict.type == :reduce_reduce
       end
     end
+
+    def propagate_lookaheads(next_state)
+      next_state.kernels.map {|item|
+        lookahead_sets =
+          if item.position == 1
+            goto_follow_set(item.lhs)
+          else
+            kernel = kernels.find {|k| k.predecessor_item_of?(item) }
+            item_lookahead_set[kernel]
+          end
+
+        [item, lookahead_sets & next_state.lookahead_set_filters[item]]
+      }.to_h
+    end
+
+    def lookaheads_recomputed
+      !@item_lookahead_set.nil?
+    end
+
+    def compatible_lookahead?(filtered_lookahead)
+      !lookaheads_recomputed ||
+        @lalr_isocore.annotation_list.all? {|token, actions|
+          a = dominant_contribution(token, actions, item_lookahead_set)
+          b = dominant_contribution(token, actions, filtered_lookahead)
+          a.nil? || b.nil? || a == b
+        }
+    end
+
+    def lookahead_set_filters
+      kernels.map {|kernel|
+        [kernel,
+         @lalr_isocore.annotation_list.select {|token, actions|
+           token.term? && actions.any? {|action, contributions|
+             !contributions.nil? && contributions.key?(kernel) && contributions[kernel]
+           }
+         }.map {|token, _| token }
+        ]
+      }.to_h
+    end
+
+    def dominant_contribution(token, actions, lookaheads)
+      a = actions.select {|action, contributions|
+        contributions.nil? || contributions.any? {|item, contributed| contributed && lookaheads[item].include?(token) }
+      }.map {|action, _| action }
+      return nil if a.empty?
+      a.reject {|action|
+        if action.is_a?(State::Shift)
+          action.not_selected
+        elsif action.is_a?(State::Reduce)
+          action.not_selected_symbols.include?(token)
+        end
+      }
+    end
+
+    def inadequacy_list
+      return @inadequacy_list if @inadequacy_list
+
+      shift_contributions = shifts.map {|shift|
+        [shift.next_sym, [shift]]
+      }.to_h
+      reduce_contributions = reduces.map {|reduce|
+        (reduce.look_ahead || []).map {|sym|
+          [sym, [reduce]]
+        }.to_h
+      }.reduce(Hash.new([])) {|hash, cont|
+        hash.merge(cont) {|_, a, b| a | b }
+      }
+
+      list = shift_contributions.merge(reduce_contributions) {|_, a, b| a | b }
+      @inadequacy_list = list.select {|token, actions| token.term? && actions.size > 1 }
+    end
+
+    def annotation_list
+      return @annotation_list if @annotation_list
+
+      @annotation_list = annotate_manifestation
+      @annotation_list = @items_to_state.values.map {|next_state| next_state.annotate_predecessor(self) }
+        .reduce(@annotation_list) {|result, annotations|
+          result.merge(annotations) {|_, actions_a, actions_b|
+            if actions_a.nil? || actions_b.nil?
+              actions_a || actions_b
+            else
+              actions_a.merge(actions_b) {|_, contributions_a, contributions_b|
+                if contributions_a.nil? || contributions_b.nil?
+                  next contributions_a || contributions_b
+                end
+
+                contributions_a.merge(contributions_b) {|_, contributed_a, contributed_b|
+                  contributed_a || contributed_b
+                }
+              }
+            end
+          }
+        }
+    end
+
+    def annotate_manifestation
+      inadequacy_list.transform_values {|actions|
+        actions.map {|action|
+          if action.is_a?(Shift)
+            [action, nil]
+          elsif action.is_a?(Reduce)
+            if action.rule.empty_rule?
+              [action, lhs_contributions(action.rule.lhs, inadequacy_list.key(actions))]
+            else
+              contributions = kernels.map {|kernel| [kernel, kernel.rule == action.rule && kernel.end_of_rule?] }.to_h
+              [action, contributions]
+            end
+          end
+        }.to_h
+      }
+    end
+
+    def annotate_predecessor(predecessor)
+      annotation_list.transform_values {|actions|
+        token = annotation_list.key(actions)
+        actions.transform_values {|inadequacy|
+          next nil if inadequacy.nil?
+          lhs_adequacy = kernels.any? {|kernel|
+            inadequacy[kernel] && kernel.position == 1 && predecessor.lhs_contributions(kernel.lhs, token).nil?
+          }
+          if lhs_adequacy
+            next nil
+          else
+            predecessor.kernels.map {|pred_k|
+              [pred_k, kernels.any? {|k|
+                inadequacy[k] && (
+                  pred_k.predecessor_item_of?(k) && predecessor.item_lookahead_set[pred_k].include?(token) ||
+                  k.position == 1 && predecessor.lhs_contributions(k.lhs, token)[pred_k]
+                )
+              }]
+            }.to_h
+          end
+        }
+      }
+    end
+
+    def lhs_contributions(sym, token)
+      shift, next_state = nterm_transitions.find {|sh, _| sh.next_sym == sym }
+      if always_follows(shift, next_state).include?(token)
+        nil
+      else
+        kernels.map {|kernel| [kernel, follow_kernel_items(shift, next_state, kernel) && item_lookahead_set[kernel].include?(token)] }.to_h
+      end
+    end
+
+    def follow_kernel_items(shift, next_state, kernel)
+      queue = [[self, shift, next_state]]
+      until queue.empty?
+        st, sh, next_st = queue.pop
+        return true if kernel.next_sym == sh.next_sym && kernel.symbols_after_transition.all?(&:nullable)
+        st.internal_dependencies(sh, next_st).each {|v| queue << v }
+      end
+      false
+    end
+
+    def item_lookahead_set
+      return @item_lookahead_set if @item_lookahead_set
+
+      kernels.map {|item|
+        value =
+          if item.lhs.accept_symbol?
+            []
+          elsif item.position > 1
+            prev_items = predecessors_with_item(item)
+            prev_items.map {|st, i| st.item_lookahead_set[i] }.reduce([]) {|acc, syms| acc |= syms }
+          elsif item.position == 1
+            prev_state = @predecessors.find {|p| p.shifts.any? {|shift| shift.next_sym == item.lhs } }
+            shift, next_state = prev_state.nterm_transitions.find {|shift, _| shift.next_sym == item.lhs }
+            prev_state.goto_follows(shift, next_state)
+          end
+        [item, value]
+      }.to_h
+    end
+
+    def item_lookahead_set=(k)
+      @item_lookahead_set = k
+    end
+
+    def predecessors_with_item(item)
+      result = []
+      @predecessors.each do |pre|
+        pre.items.each do |i|
+          result << [pre, i] if i.predecessor_item_of?(item)
+        end
+      end
+      result
+    end
+
+    def append_predecessor(prev_state)
+      @predecessors << prev_state
+      @predecessors.uniq!
+    end
+
+    def goto_follow_set(nterm_token)
+      return [] if nterm_token.accept_symbol?
+      shift, next_state = @lalr_isocore.nterm_transitions.find {|sh, _| sh.next_sym == nterm_token }
+
+      @kernels
+        .select {|kernel| follow_kernel_items(shift, next_state, kernel) }
+        .map {|kernel| item_lookahead_set[kernel] }
+        .reduce(always_follows(shift, next_state)) {|result, terms| result |= terms }
+    end
+
+    def goto_follows(shift, next_state)
+      queue = internal_dependencies(shift, next_state) + predecessor_dependencies(shift, next_state)
+      terms = always_follows(shift, next_state)
+      until queue.empty?
+        st, sh, next_st = queue.pop
+        terms |= st.always_follows(sh, next_st)
+        st.internal_dependencies(sh, next_st).each {|v| queue << v }
+        st.predecessor_dependencies(sh, next_st).each {|v| queue << v }
+      end
+      terms
+    end
+
+    def always_follows(shift, next_state)
+      return @always_follows[[shift, next_state]] if @always_follows[[shift, next_state]]
+
+      queue = internal_dependencies(shift, next_state) + successor_dependencies(shift, next_state)
+      terms = []
+      until queue.empty?
+        st, sh, next_st = queue.pop
+        terms |= next_st.term_transitions.map {|sh, _| sh.next_sym }
+        st.internal_dependencies(sh, next_st).each {|v| queue << v }
+        st.successor_dependencies(sh, next_st).each {|v| queue << v }
+      end
+      @always_follows[[shift, next_state]] = terms
+    end
+
+    def internal_dependencies(shift, next_state)
+      return @internal_dependencies[[shift, next_state]] if @internal_dependencies[[shift, next_state]]
+
+      syms = @items.select {|i|
+        i.next_sym == shift.next_sym && i.symbols_after_transition.all?(&:nullable) && i.position == 0
+      }.map(&:lhs).uniq
+      @internal_dependencies[[shift, next_state]] = nterm_transitions.select {|sh, _| syms.include?(sh.next_sym) }.map {|goto| [self, *goto] }
+    end
+
+    def successor_dependencies(shift, next_state)
+      return @successor_dependencies[[shift, next_state]] if @successor_dependencies[[shift, next_state]]
+
+      @successor_dependencies[[shift, next_state]] =
+        next_state.nterm_transitions
+        .select {|next_shift, _| next_shift.next_sym.nullable }
+        .map {|transition| [next_state, *transition] }
+    end
+
+    def predecessor_dependencies(shift, next_state)
+      state_items = []
+      @kernels.select {|kernel|
+        kernel.next_sym == shift.next_sym && kernel.symbols_after_transition.all?(&:nullable)
+      }.each do |item|
+        queue = predecessors_with_item(item)
+        until queue.empty?
+          st, i = queue.pop
+          if i.position == 0
+            state_items << [st, i]
+          else
+            st.predecessors_with_item(i).each {|v| queue << v }
+          end
+        end
+      end
+
+      state_items.map {|state, item|
+        sh, next_st = state.nterm_transitions.find {|shi, _| shi.next_sym == item.lhs }
+        [state, sh, next_st]
+      }
+    end
   end
 end
diff --git a/tool/lrama/lib/lrama/state/reduce.rb b/tool/lrama/lib/lrama/state/reduce.rb
index 8ba51f45f2f41d..54ab87b468c48d 100644
--- a/tool/lrama/lib/lrama/state/reduce.rb
+++ b/tool/lrama/lib/lrama/state/reduce.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Lrama
   class State
     class Reduce
@@ -24,8 +26,8 @@ def add_not_selected_symbol(sym)
       end
 
       def selected_look_ahead
-        if @look_ahead
-          @look_ahead - @not_selected_symbols
+        if look_ahead
+          look_ahead - @not_selected_symbols
         else
           []
         end
diff --git a/tool/lrama/lib/lrama/state/reduce_reduce_conflict.rb b/tool/lrama/lib/lrama/state/reduce_reduce_conflict.rb
index 0a0e4dc20ae7f3..736d08376a73c7 100644
--- a/tool/lrama/lib/lrama/state/reduce_reduce_conflict.rb
+++ b/tool/lrama/lib/lrama/state/reduce_reduce_conflict.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Lrama
   class State
     class ReduceReduceConflict < Struct.new(:symbols, :reduce1, :reduce2, keyword_init: true)
diff --git a/tool/lrama/lib/lrama/state/resolved_conflict.rb b/tool/lrama/lib/lrama/state/resolved_conflict.rb
index 02ea8921475fd4..3bb3d1446e7214 100644
--- a/tool/lrama/lib/lrama/state/resolved_conflict.rb
+++ b/tool/lrama/lib/lrama/state/resolved_conflict.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Lrama
   class State
     # * symbol: A symbol under discussion
@@ -6,7 +8,7 @@ class State
     class ResolvedConflict < Struct.new(:symbol, :reduce, :which, :same_prec, keyword_init: true)
       def report_message
         s = symbol.display_name
-        r = reduce.rule.precedence_sym.display_name
+        r = reduce.rule.precedence_sym&.display_name
         case
         when which == :shift && same_prec
           msg = "resolved as #{which} (%right #{s})"
diff --git a/tool/lrama/lib/lrama/state/shift.rb b/tool/lrama/lib/lrama/state/shift.rb
index 2021eb61f61041..81ef013a17c009 100644
--- a/tool/lrama/lib/lrama/state/shift.rb
+++ b/tool/lrama/lib/lrama/state/shift.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Lrama
   class State
     class Shift
diff --git a/tool/lrama/lib/lrama/state/shift_reduce_conflict.rb b/tool/lrama/lib/lrama/state/shift_reduce_conflict.rb
index f80bd5f352453f..fd66834539e924 100644
--- a/tool/lrama/lib/lrama/state/shift_reduce_conflict.rb
+++ b/tool/lrama/lib/lrama/state/shift_reduce_conflict.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Lrama
   class State
     class ShiftReduceConflict < Struct.new(:symbols, :shift, :reduce, keyword_init: true)
diff --git a/tool/lrama/lib/lrama/states.rb b/tool/lrama/lib/lrama/states.rb
index 290e996b822b08..fd8ded905f0699 100644
--- a/tool/lrama/lib/lrama/states.rb
+++ b/tool/lrama/lib/lrama/states.rb
@@ -1,6 +1,8 @@
+# frozen_string_literal: true
+
 require "forwardable"
-require "lrama/report/duration"
-require "lrama/states/item"
+require_relative "report/duration"
+require_relative "states/item"
 
 module Lrama
   # States is passed to a template file
@@ -16,9 +18,8 @@ class States
 
     attr_reader :states, :reads_relation, :includes_relation, :lookback_relation
 
-    def initialize(grammar, warning, trace_state: false)
+    def initialize(grammar, trace_state: false)
       @grammar = grammar
-      @warning = warning
       @trace_state = trace_state
 
       @states = []
@@ -40,6 +41,8 @@ def initialize(grammar, warning, trace_state: false)
       # value is array of [state.id, nterm.token_id].
       @reads_relation = {}
 
+      # `Read(p, A) =s DR(p, A) ∪ ∪{Read(r, C) | (p, A) reads (r, C)}`
+      #
       # `@read_sets` is a hash whose
       # key is [state.id, nterm.token_id],
       # value is bitmap of term.
@@ -61,6 +64,8 @@ def initialize(grammar, warning, trace_state: false)
       # value is array of [state.id, nterm.token_id].
       @lookback_relation = {}
 
+      # `Follow(p, A) =s Read(p, A) ∪ ∪{Follow(p', B) | (p, A) includes (p', B)}`
+      #
       # `@follow_sets` is a hash whose
       # key is [state.id, rule.id],
       # value is bitmap of term.
@@ -89,8 +94,20 @@ def compute
       report_duration(:compute_conflicts) { compute_conflicts }
 
       report_duration(:compute_default_reduction) { compute_default_reduction }
+    end
 
-      check_conflicts
+    def compute_ielr
+      report_duration(:split_states) { split_states }
+      report_duration(:compute_direct_read_sets) { compute_direct_read_sets }
+      report_duration(:compute_reads_relation) { compute_reads_relation }
+      report_duration(:compute_read_sets) { compute_read_sets }
+      report_duration(:compute_includes_relation) { compute_includes_relation }
+      report_duration(:compute_lookback_relation) { compute_lookback_relation }
+      report_duration(:compute_follow_sets) { compute_follow_sets }
+      report_duration(:compute_look_ahead_sets) { compute_look_ahead_sets }
+      report_duration(:compute_conflicts) { compute_conflicts }
+
+      report_duration(:compute_default_reduction) { compute_default_reduction }
     end
 
     def reporter
@@ -125,16 +142,16 @@ def la
       end
     end
 
-    private
-
-    def sr_conflicts
-      @states.flat_map(&:sr_conflicts)
+    def sr_conflicts_count
+      @sr_conflicts_count ||= @states.flat_map(&:sr_conflicts).count
     end
 
-    def rr_conflicts
-      @states.flat_map(&:rr_conflicts)
+    def rr_conflicts_count
+      @rr_conflicts_count ||= @states.flat_map(&:rr_conflicts).count
     end
 
+    private
+
     def trace_state
       if @trace_state
         yield STDERR
@@ -236,7 +253,7 @@ def enqueue_state(states, state)
       # Trace
       previous = state.kernels.first.previous_sym
       trace_state do |out|
-        out << sprintf("state_list_append (state = %d, symbol = %d (%s))",
+        out << sprintf("state_list_append (state = %d, symbol = %d (%s))\n",
           @states.count, previous.number, previous.display_name)
       end
 
@@ -266,7 +283,10 @@ def compute_lr0_states
         state.shifts.each do |shift|
           new_state, created = create_state(shift.next_sym, shift.next_items, states_created)
           state.set_items_to_state(shift.next_items, new_state)
-          enqueue_state(states, new_state) if created
+          if created
+            enqueue_state(states, new_state)
+            new_state.append_predecessor(state)
+          end
         end
       end
     end
@@ -350,7 +370,7 @@ def compute_includes_relation
               # TODO: need to omit if state == state2 ?
               @includes_relation[key] ||= []
               @includes_relation[key] << [state.id, nterm.token_id]
-              break if !sym.nullable
+              break unless sym.nullable
               i -= 1
             end
           end
@@ -385,7 +405,7 @@ def compute_look_ahead_sets
       @states.each do |state|
         rules.each do |rule|
           ary = @lookback_relation[[state.id, rule.id]]
-          next if !ary
+          next unless ary
 
           ary.each do |state2_id, nterm_token_id|
             # q = state, A -> ω = rule, p = state2, A = nterm
@@ -428,7 +448,7 @@ def compute_shift_reduce_conflicts
             sym = shift.next_sym
 
             next unless reduce.look_ahead
-            next if !reduce.look_ahead.include?(sym)
+            next unless reduce.look_ahead.include?(sym)
 
             # Shift/Reduce conflict
             shift_prec = sym.precedence
@@ -492,17 +512,17 @@ def compute_reduce_reduce_conflicts
       states.each do |state|
         count = state.reduces.count
 
-        for i in 0...count do
+        (0...count).each do |i|
           reduce1 = state.reduces[i]
           next if reduce1.look_ahead.nil?
 
-          for j in (i+1)...count do
+          ((i+1)...count).each do |j|
             reduce2 = state.reduces[j]
             next if reduce2.look_ahead.nil?
 
             intersection = reduce1.look_ahead & reduce2.look_ahead
 
-            if !intersection.empty?
+            unless intersection.empty?
               state.conflicts << State::ReduceReduceConflict.new(symbols: intersection, reduce1: reduce1, reduce2: reduce2)
             end
           end
@@ -514,7 +534,7 @@ def compute_default_reduction
       states.each do |state|
         next if state.reduces.empty?
         # Do not set, if conflict exist
-        next if !state.conflicts.empty?
+        next unless state.conflicts.empty?
         # Do not set, if shift with `error` exists.
         next if state.shifts.map(&:next_sym).include?(@grammar.error_symbol)
 
@@ -526,30 +546,49 @@ def compute_default_reduction
       end
     end
 
-    def check_conflicts
-      sr_count = sr_conflicts.count
-      rr_count = rr_conflicts.count
+    def split_states
+      @states.each do |state|
+        state.transitions.each do |shift, next_state|
+          compute_state(state, shift, next_state)
+        end
+      end
+    end
 
-      if @grammar.expect
+    def merge_lookaheads(state, filtered_lookaheads)
+      return if state.kernels.all? {|item| (filtered_lookaheads[item] - state.item_lookahead_set[item]).empty? }
 
-        expected_sr_conflicts = @grammar.expect
-        expected_rr_conflicts = 0
+      state.item_lookahead_set = state.item_lookahead_set.merge {|_, v1, v2| v1 | v2 }
+      state.transitions.each do |shift, next_state|
+        next if next_state.lookaheads_recomputed
+        compute_state(state, shift, next_state)
+      end
+    end
 
-        if expected_sr_conflicts != sr_count
-          @warning.error("shift/reduce conflicts: #{sr_count} found, #{expected_sr_conflicts} expected")
+    def compute_state(state, shift, next_state)
+      filtered_lookaheads = state.propagate_lookaheads(next_state)
+      s = next_state.ielr_isocores.find {|st| st.compatible_lookahead?(filtered_lookaheads) }
+
+      if s.nil?
+        s = next_state.ielr_isocores.last
+        new_state = State.new(@states.count, s.accessing_symbol, s.kernels)
+        new_state.closure = s.closure
+        new_state.compute_shifts_reduces
+        s.transitions.each do |sh, next_state|
+          new_state.set_items_to_state(sh.next_items, next_state)
         end
-
-        if expected_rr_conflicts != rr_count
-          @warning.error("reduce/reduce conflicts: #{rr_count} found, #{expected_rr_conflicts} expected")
+        @states << new_state
+        new_state.lalr_isocore = s
+        s.ielr_isocores << new_state
+        s.ielr_isocores.each do |st|
+          st.ielr_isocores = s.ielr_isocores
         end
+        new_state.item_lookahead_set = filtered_lookaheads
+        state.update_transition(shift, new_state)
+      elsif(!s.lookaheads_recomputed)
+        s.item_lookahead_set = filtered_lookaheads
       else
-        if sr_count != 0
-          @warning.warn("shift/reduce conflicts: #{sr_count} found")
-        end
-
-        if rr_count != 0
-          @warning.warn("reduce/reduce conflicts: #{rr_count} found")
-        end
+        state.update_transition(shift, s)
+        merge_lookaheads(s, filtered_lookaheads)
       end
     end
   end
diff --git a/tool/lrama/lib/lrama/states/item.rb b/tool/lrama/lib/lrama/states/item.rb
index 823ccc72e1b4cf..e89cb9695b6c7c 100644
--- a/tool/lrama/lib/lrama/states/item.rb
+++ b/tool/lrama/lib/lrama/states/item.rb
@@ -1,11 +1,19 @@
+# frozen_string_literal: true
+
 # TODO: Validate position is not over rule rhs
 
+require "forwardable"
+
 module Lrama
   class States
     class Item < Struct.new(:rule, :position, keyword_init: true)
+      extend Forwardable
+
+      def_delegators "rule", :lhs, :rhs
+
       # Optimization for States#setup_state
       def hash
-        [rule.id, position].hash
+        [rule_id, position].hash
       end
 
       def rule_id
@@ -17,27 +25,23 @@ def empty_rule?
       end
 
       def number_of_rest_symbols
-        rule.rhs.count - position
-      end
-
-      def lhs
-        rule.lhs
+        rhs.count - position
       end
 
       def next_sym
-        rule.rhs[position]
+        rhs[position]
       end
 
       def next_next_sym
-        rule.rhs[position + 1]
+        rhs[position + 1]
       end
 
       def previous_sym
-        rule.rhs[position - 1]
+        rhs[position - 1]
       end
 
       def end_of_rule?
-        rule.rhs.count == position
+        rhs.count == position
       end
 
       def beginning_of_rule?
@@ -45,19 +49,23 @@ def beginning_of_rule?
       end
 
       def start_item?
-        rule.id == 0 && position == 0
+        rule.initial_rule? && beginning_of_rule?
       end
 
       def new_by_next_position
         Item.new(rule: rule, position: position + 1)
       end
 
-      def symbols_before_dot
-        rule.rhs[0...position]
+      def symbols_before_dot # steep:ignore
+        rhs[0...position]
+      end
+
+      def symbols_after_dot # steep:ignore
+        rhs[position..-1]
       end
 
-      def symbols_after_dot
-        rule.rhs[position..-1]
+      def symbols_after_transition
+        rhs[position+1..-1]
       end
 
       def to_s
@@ -65,14 +73,18 @@ def to_s
       end
 
       def display_name
-        r = rule.rhs.map(&:display_name).insert(position, "•").join(" ")
-        "#{r}  (rule #{rule.id})"
+        r = rhs.map(&:display_name).insert(position, "•").join(" ")
+        "#{r}  (rule #{rule_id})"
       end
 
       # Right after position
       def display_rest
-        r = rule.rhs[position..-1].map(&:display_name).join(" ")
-        ". #{r}  (rule #{rule.id})"
+        r = symbols_after_dot.map(&:display_name).join(" ")
+        ". #{r}  (rule #{rule_id})"
+      end
+
+      def predecessor_item_of?(other_item)
+        rule == other_item.rule && position == other_item.position - 1
       end
     end
   end
diff --git a/tool/lrama/lib/lrama/states_reporter.rb b/tool/lrama/lib/lrama/states_reporter.rb
index 8be0f71e40dddf..64ff4de1006c58 100644
--- a/tool/lrama/lib/lrama/states_reporter.rb
+++ b/tool/lrama/lib/lrama/states_reporter.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Lrama
   class StatesReporter
     include Lrama::Report::Duration
@@ -14,15 +16,54 @@ def report(io, **options)
 
     private
 
-    def _report(io, grammar: false, states: false, itemsets: false, lookaheads: false, solved: false, counterexamples: false, verbose: false)
-      # TODO: Unused terms
-      # TODO: Unused rules
-
+    def _report(io, grammar: false, rules: false, terms: false, states: false, itemsets: false, lookaheads: false, solved: false, counterexamples: false, verbose: false)
+      report_unused_rules(io) if rules
+      report_unused_terms(io) if terms
       report_conflicts(io)
       report_grammar(io) if grammar
       report_states(io, itemsets, lookaheads, solved, counterexamples, verbose)
     end
 
+    def report_unused_terms(io)
+      look_aheads = @states.states.each do |state|
+        state.reduces.flat_map do |reduce|
+          reduce.look_ahead unless reduce.look_ahead.nil?
+        end
+      end
+
+      next_terms = @states.states.flat_map do |state|
+        state.shifts.map(&:next_sym).select(&:term?)
+      end
+
+      unused_symbols = @states.terms.select do |term|
+        !(look_aheads + next_terms).include?(term)
+      end
+
+      unless unused_symbols.empty?
+        io << "#{unused_symbols.count} Unused Terms\n\n"
+        unused_symbols.each_with_index do |term, index|
+          io << sprintf("%5d %s\n", index, term.id.s_value)
+        end
+        io << "\n\n"
+      end
+    end
+
+    def report_unused_rules(io)
+      used_rules = @states.rules.flat_map(&:rhs)
+
+      unused_rules = @states.rules.map(&:lhs).select do |rule|
+        !used_rules.include?(rule) && rule.token_id != 0
+      end
+
+      unless unused_rules.empty?
+        io << "#{unused_rules.count} Unused Rules\n\n"
+        unused_rules.each_with_index do |rule, index|
+          io << sprintf("%5d %s\n", index, rule.display_name)
+        end
+        io << "\n\n"
+      end
+    end
+
     def report_conflicts(io)
       has_conflict = false
 
@@ -37,7 +78,7 @@ def report_conflicts(io)
           messages << "#{cs[:reduce_reduce].count} reduce/reduce"
         end
 
-        if !messages.empty?
+        unless messages.empty?
           has_conflict = true
           io << "State #{state.id} conflicts: #{messages.join(', ')}\n"
         end
@@ -53,7 +94,7 @@ def report_grammar(io)
       last_lhs = nil
 
       @states.rules.each do |rule|
-        if rule.rhs.empty?
+        if rule.empty_rule?
           r = "ε"
         else
           r = rule.rhs.map(&:display_name).join(" ")
@@ -84,35 +125,33 @@ def report_states(io, itemsets, lookaheads, solved, counterexamples, verbose)
         last_lhs = nil
         list = itemsets ? state.items : state.kernels
         list.sort_by {|i| [i.rule_id, i.position] }.each do |item|
-          rule = item.rule
-          position = item.position
-          if rule.rhs.empty?
+          if item.empty_rule?
             r = "ε •"
           else
-            r = rule.rhs.map(&:display_name).insert(position, "•").join(" ")
+            r = item.rhs.map(&:display_name).insert(item.position, "•").join(" ")
           end
-          if rule.lhs == last_lhs
-            l = " " * rule.lhs.id.s_value.length + "|"
+          if item.lhs == last_lhs
+            l = " " * item.lhs.id.s_value.length + "|"
           else
-            l = rule.lhs.id.s_value + ":"
+            l = item.lhs.id.s_value + ":"
           end
           la = ""
           if lookaheads && item.end_of_rule?
             reduce = state.find_reduce_by_item!(item)
             look_ahead = reduce.selected_look_ahead
-            if !look_ahead.empty?
+            unless look_ahead.empty?
               la = "  [#{look_ahead.map(&:display_name).join(", ")}]"
             end
           end
-          last_lhs = rule.lhs
+          last_lhs = item.lhs
 
-          io << sprintf("%5i %s %s%s\n", rule.id, l, r, la)
+          io << sprintf("%5i %s %s%s\n", item.rule_id, l, r, la)
         end
         io << "\n"
 
         # Report shifts
-        tmp = state.term_transitions.select do |shift, _|
-          !shift.not_selected
+        tmp = state.term_transitions.reject do |shift, _|
+          shift.not_selected
         end.map do |shift, next_state|
           [shift.next_sym, next_state.id]
         end
@@ -120,7 +159,7 @@ def report_states(io, itemsets, lookaheads, solved, counterexamples, verbose)
         tmp.each do |term, state_id|
           io << "    #{term.display_name.ljust(max_len)}  shift, and go to state #{state_id}\n"
         end
-        io << "\n" if !tmp.empty?
+        io << "\n" unless tmp.empty?
 
         # Report error caused by %nonassoc
         nl = false
@@ -134,7 +173,7 @@ def report_states(io, itemsets, lookaheads, solved, counterexamples, verbose)
           nl = true
           io << "    #{name.ljust(max_len)}  error (nonassociative)\n"
         end
-        io << "\n" if !tmp.empty?
+        io << "\n" unless tmp.empty?
 
         # Report reduces
         nl = false
@@ -156,7 +195,7 @@ def report_states(io, itemsets, lookaheads, solved, counterexamples, verbose)
           nl = true
         end
 
-        if r = state.default_reduction_rule
+        if (r = state.default_reduction_rule)
           nl = true
           s = "$default".ljust(max_len)
 
@@ -183,14 +222,14 @@ def report_states(io, itemsets, lookaheads, solved, counterexamples, verbose)
         tmp.each do |nterm, state_id|
           io << "    #{nterm.id.s_value.ljust(max_len)}  go to state #{state_id}\n"
         end
-        io << "\n" if !tmp.empty?
+        io << "\n" unless tmp.empty?
 
         if solved
           # Report conflict resolutions
           state.resolved_conflicts.each do |resolved|
             io << "    #{resolved.report_message}\n"
           end
-          io << "\n" if !state.resolved_conflicts.empty?
+          io << "\n" unless state.resolved_conflicts.empty?
         end
 
         if counterexamples && state.has_conflicts?
@@ -221,7 +260,7 @@ def report_states(io, itemsets, lookaheads, solved, counterexamples, verbose)
           direct_read_sets = @states.direct_read_sets
           @states.nterms.each do |nterm|
             terms = direct_read_sets[[state.id, nterm.token_id]]
-            next if !terms
+            next unless terms
             next if terms.empty?
 
             str = terms.map {|sym| sym.id.s_value }.join(", ")
@@ -233,7 +272,7 @@ def report_states(io, itemsets, lookaheads, solved, counterexamples, verbose)
           io << "  [Reads Relation]\n"
           @states.nterms.each do |nterm|
             a = @states.reads_relation[[state.id, nterm.token_id]]
-            next if !a
+            next unless a
 
             a.each do |state_id2, nterm_id2|
               n = @states.nterms.find {|n| n.token_id == nterm_id2 }
@@ -247,7 +286,7 @@ def report_states(io, itemsets, lookaheads, solved, counterexamples, verbose)
           read_sets = @states.read_sets
           @states.nterms.each do |nterm|
             terms = read_sets[[state.id, nterm.token_id]]
-            next if !terms
+            next unless terms
             next if terms.empty?
 
             terms.each do |sym|
@@ -260,7 +299,7 @@ def report_states(io, itemsets, lookaheads, solved, counterexamples, verbose)
           io << "  [Includes Relation]\n"
           @states.nterms.each do |nterm|
             a = @states.includes_relation[[state.id, nterm.token_id]]
-            next if !a
+            next unless a
 
             a.each do |state_id2, nterm_id2|
               n = @states.nterms.find {|n| n.token_id == nterm_id2 }
@@ -273,11 +312,11 @@ def report_states(io, itemsets, lookaheads, solved, counterexamples, verbose)
           io << "  [Lookback Relation]\n"
           @states.rules.each do |rule|
             a = @states.lookback_relation[[state.id, rule.id]]
-            next if !a
+            next unless a
 
             a.each do |state_id2, nterm_id2|
               n = @states.nterms.find {|n| n.token_id == nterm_id2 }
-              io << "    (Rule: #{rule}) -> (State #{state_id2}, #{n.id.s_value})\n"
+              io << "    (Rule: #{rule.display_name}) -> (State #{state_id2}, #{n.id.s_value})\n"
             end
           end
           io << "\n"
@@ -288,7 +327,7 @@ def report_states(io, itemsets, lookaheads, solved, counterexamples, verbose)
           @states.nterms.each do |nterm|
             terms = follow_sets[[state.id, nterm.token_id]]
 
-            next if !terms
+            next unless terms
 
             terms.each do |sym|
               io << "    #{nterm.id.s_value} -> #{sym.id.s_value}\n"
@@ -302,7 +341,7 @@ def report_states(io, itemsets, lookaheads, solved, counterexamples, verbose)
           max_len = 0
           @states.rules.each do |rule|
             syms = @states.la[[state.id, rule.id]]
-            next if !syms
+            next unless syms
 
             tmp << [rule, syms]
             max_len = ([max_len] + syms.map {|s| s.id.s_value.length }).max
@@ -312,7 +351,7 @@ def report_states(io, itemsets, lookaheads, solved, counterexamples, verbose)
               io << "    #{sym.id.s_value.ljust(max_len)}  reduce using rule #{rule.id} (#{rule.lhs.id.s_value})\n"
             end
           end
-          io << "\n" if !tmp.empty?
+          io << "\n" unless tmp.empty?
         end
 
         # End of Report State
diff --git a/tool/lrama/lib/lrama/trace_reporter.rb b/tool/lrama/lib/lrama/trace_reporter.rb
new file mode 100644
index 00000000000000..bcf1ef1e50327e
--- /dev/null
+++ b/tool/lrama/lib/lrama/trace_reporter.rb
@@ -0,0 +1,45 @@
+# rbs_inline: enabled
+# frozen_string_literal: true
+
+module Lrama
+  class TraceReporter
+    # @rbs (Lrama::Grammar grammar) -> void
+    def initialize(grammar)
+      @grammar = grammar
+    end
+
+    # @rbs (**Hash[Symbol, bool] options) -> void
+    def report(**options)
+      _report(**options)
+    end
+
+    private
+
+    # @rbs rules: (bool rules, bool actions, bool only_explicit_rules, **untyped _) -> void
+    def _report(rules: false, actions: false, only_explicit_rules: false, **_)
+      report_rules if rules && !only_explicit_rules
+      report_only_explicit_rules if only_explicit_rules
+      report_actions if actions
+    end
+
+    # @rbs () -> void
+    def report_rules
+      puts "Grammar rules:"
+      @grammar.rules.each { |rule| puts rule.display_name }
+    end
+
+    # @rbs () -> void
+    def report_only_explicit_rules
+      puts "Grammar rules:"
+      @grammar.rules.each do |rule|
+        puts rule.display_name_without_action if rule.lhs.first_set.any?
+      end
+    end
+
+    # @rbs () -> void
+    def report_actions
+      puts "Grammar rules with actions:"
+      @grammar.rules.each { |rule| puts rule.with_actions }
+    end
+  end
+end
diff --git a/tool/lrama/lib/lrama/type.rb b/tool/lrama/lib/lrama/type.rb
deleted file mode 100644
index fe5ff7405821ed..00000000000000
--- a/tool/lrama/lib/lrama/type.rb
+++ /dev/null
@@ -1,4 +0,0 @@
-module Lrama
-  class Type < Struct.new(:id, :tag, keyword_init: true)
-  end
-end
diff --git a/tool/lrama/lib/lrama/version.rb b/tool/lrama/lib/lrama/version.rb
index 41215c1aee8b18..12ece5a8f2b153 100644
--- a/tool/lrama/lib/lrama/version.rb
+++ b/tool/lrama/lib/lrama/version.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Lrama
-  VERSION = "0.5.5".freeze
+  VERSION = "0.7.0".freeze
 end
diff --git a/tool/lrama/lib/lrama/warning.rb b/tool/lrama/lib/lrama/warning.rb
deleted file mode 100644
index 3c99791ebf81dc..00000000000000
--- a/tool/lrama/lib/lrama/warning.rb
+++ /dev/null
@@ -1,25 +0,0 @@
-module Lrama
-  class Warning
-    attr_reader :errors, :warns
-
-    def initialize(out = STDERR)
-      @out = out
-      @errors = []
-      @warns = []
-    end
-
-    def error(message)
-      @out << message << "\n"
-      @errors << message
-    end
-
-    def warn(message)
-      @out << message << "\n"
-      @warns << message
-    end
-
-    def has_error?
-      !@errors.empty?
-    end
-  end
-end
diff --git a/tool/lrama/template/bison/_yacc.h b/tool/lrama/template/bison/_yacc.h
new file mode 100644
index 00000000000000..34ed6d81f59d74
--- /dev/null
+++ b/tool/lrama/template/bison/_yacc.h
@@ -0,0 +1,71 @@
+<%# b4_shared_declarations -%>
+  <%-# b4_cpp_guard_open([b4_spec_mapped_header_file]) -%>
+    <%- if output.spec_mapped_header_file -%>
+#ifndef <%= output.b4_cpp_guard__b4_spec_mapped_header_file %>
+# define <%= output.b4_cpp_guard__b4_spec_mapped_header_file %>
+    <%- end -%>
+  <%-# b4_declare_yydebug & b4_YYDEBUG_define -%>
+/* Debug traces.  */
+#ifndef YYDEBUG
+# define YYDEBUG 0
+#endif
+#if YYDEBUG && !defined(yydebug)
+extern int yydebug;
+#endif
+<%= output.percent_code("requires") %>
+
+  <%-# b4_token_enums_defines -%>
+/* Token kinds.  */
+#ifndef YYTOKENTYPE
+# define YYTOKENTYPE
+  enum yytokentype
+  {
+<%= output.token_enums -%>
+  };
+  typedef enum yytokentype yytoken_kind_t;
+#endif
+
+  <%-# b4_declare_yylstype -%>
+    <%-# b4_value_type_define -%>
+/* Value type.  */
+#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
+union YYSTYPE
+{
+#line <%= output.grammar.union.lineno %> "<%= output.grammar_file_path %>"
+<%= output.grammar.union.braces_less_code %>
+#line [@oline@] [@ofile@]
+
+};
+typedef union YYSTYPE YYSTYPE;
+# define YYSTYPE_IS_TRIVIAL 1
+# define YYSTYPE_IS_DECLARED 1
+#endif
+
+    <%-# b4_location_type_define -%>
+/* Location type.  */
+#if ! defined YYLTYPE && ! defined YYLTYPE_IS_DECLARED
+typedef struct YYLTYPE YYLTYPE;
+struct YYLTYPE
+{
+  int first_line;
+  int first_column;
+  int last_line;
+  int last_column;
+};
+# define YYLTYPE_IS_DECLARED 1
+# define YYLTYPE_IS_TRIVIAL 1
+#endif
+
+
+
+
+  <%-# b4_declare_yyerror_and_yylex. Not supported -%>
+  <%-# b4_declare_yyparse -%>
+int yyparse (<%= output.parse_param %>);
+
+
+<%= output.percent_code("provides") %>
+  <%-# b4_cpp_guard_close([b4_spec_mapped_header_file]) -%>
+    <%- if output.spec_mapped_header_file -%>
+#endif /* !<%= output.b4_cpp_guard__b4_spec_mapped_header_file %>  */
+    <%- end -%>
diff --git a/tool/lrama/template/bison/yacc.c b/tool/lrama/template/bison/yacc.c
index 8f57984ef33023..6edd59a0d562cb 100644
--- a/tool/lrama/template/bison/yacc.c
+++ b/tool/lrama/template/bison/yacc.c
@@ -68,14 +68,13 @@
 #define YYPULL 1
 
 
-
-
 <%# b4_user_pre_prologue -%>
+<%- if output.aux.prologue -%>
 /* First part of user prologue.  */
 #line <%= output.aux.prologue_first_lineno %> "<%= output.grammar_file_path %>"
-
 <%= output.aux.prologue %>
 #line [@oline@] [@ofile@]
+<%- end -%>
 
 <%# b4_cast_define -%>
 # ifndef YY_CAST
@@ -101,79 +100,13 @@
 # endif
 
 <%# b4_header_include_if -%>
+<%- if output.include_header -%>
+#include "<%= output.include_header %>"
+<%- else -%>
 /* Use api.header.include to #include this header
    instead of duplicating it here.  */
-<%# b4_shared_declarations -%>
-  <%-# b4_cpp_guard_open([b4_spec_mapped_header_file]) -%>
-    <%- if output.spec_mapped_header_file -%>
-#ifndef <%= output.b4_cpp_guard__b4_spec_mapped_header_file %>
-# define <%= output.b4_cpp_guard__b4_spec_mapped_header_file %>
-    <%- end -%>
-  <%-# b4_declare_yydebug & b4_YYDEBUG_define -%>
-/* Debug traces.  */
-#ifndef YYDEBUG
-# define YYDEBUG 0
-#endif
-#if YYDEBUG && !defined(yydebug)
-extern int yydebug;
-#endif
-  <%-# b4_percent_code_get([[requires]]). %code is not supported -%>
-
-  <%-# b4_token_enums_defines -%>
-/* Token kinds.  */
-#ifndef YYTOKENTYPE
-# define YYTOKENTYPE
-  enum yytokentype
-  {
-<%= output.token_enums -%>
-  };
-  typedef enum yytokentype yytoken_kind_t;
-#endif
-
-  <%-# b4_declare_yylstype -%>
-    <%-# b4_value_type_define -%>
-/* Value type.  */
-#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
-union YYSTYPE
-{
-#line <%= output.grammar.union.lineno %> "<%= output.grammar_file_path %>"
-<%= output.grammar.union.braces_less_code %>
-#line [@oline@] [@ofile@]
-
-};
-typedef union YYSTYPE YYSTYPE;
-# define YYSTYPE_IS_TRIVIAL 1
-# define YYSTYPE_IS_DECLARED 1
-#endif
-
-    <%-# b4_location_type_define -%>
-/* Location type.  */
-#if ! defined YYLTYPE && ! defined YYLTYPE_IS_DECLARED
-typedef struct YYLTYPE YYLTYPE;
-struct YYLTYPE
-{
-  int first_line;
-  int first_column;
-  int last_line;
-  int last_column;
-};
-# define YYLTYPE_IS_DECLARED 1
-# define YYLTYPE_IS_TRIVIAL 1
-#endif
-
-
-
-
-  <%-# b4_declare_yyerror_and_yylex. Not supported -%>
-  <%-# b4_declare_yyparse -%>
-int yyparse (<%= output.parse_param %>);
-
-
-  <%-# b4_percent_code_get([[provides]]). %code is not supported -%>
-  <%-# b4_cpp_guard_close([b4_spec_mapped_header_file]) -%>
-    <%- if output.spec_mapped_header_file -%>
-#endif /* !<%= output.b4_cpp_guard__b4_spec_mapped_header_file %>  */
-    <%- end -%>
+<%= output.render_partial("bison/_yacc.h") %>
+<%- end -%>
 <%# b4_declare_symbol_enum -%>
 /* Symbol kind.  */
 enum yysymbol_kind_t
@@ -1212,7 +1145,12 @@ yydestruct (const char *yymsg,
   YY_SYMBOL_PRINT (yymsg, yykind, yyvaluep, yylocationp<%= output.user_args %>);
 
   YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
-  YY_USE (yykind);
+  switch (yykind)
+    {
+<%= output.symbol_actions_for_destructor -%>
+      default:
+        break;
+    }
   YY_IGNORE_MAYBE_UNINITIALIZED_END
 }
 
@@ -1228,9 +1166,9 @@ yydestruct (const char *yymsg,
 #endif
 
 enum yy_repair_type {
-  insert,
-  delete,
-  shift,
+  inserting,
+  deleting,
+  shifting,
 };
 
 struct yy_repair {
@@ -1463,27 +1401,27 @@ yyrecover(yy_state_t *yyss, yy_state_t *yyssp, int yychar<%= output.user_formals
                   if (current->repair_length + 1 > YYMAXREPAIR(<%= output.parse_param_name %>))
                     continue;
 
-                  yy_repairs *new = (yy_repairs *) YYMALLOC (sizeof (yy_repairs));
-                  new->id = count;
-                  new->next = 0;
-                  new->stack_length = stack_length;
-                  new->states = (yy_state_t *) YYMALLOC (sizeof (yy_state_t) * (stack_length));
-                  new->state = new->states + (current->state - current->states);
-                  YYCOPY (new->states, current->states, current->state - current->states + 1);
-                  new->repair_length = current->repair_length + 1;
-                  new->prev_repair = current;
-                  new->repair.type = insert;
-                  new->repair.term = (yysymbol_kind_t) yyx;
+                  yy_repairs *reps = (yy_repairs *) YYMALLOC (sizeof (yy_repairs));
+                  reps->id = count;
+                  reps->next = 0;
+                  reps->stack_length = stack_length;
+                  reps->states = (yy_state_t *) YYMALLOC (sizeof (yy_state_t) * (stack_length));
+                  reps->state = reps->states + (current->state - current->states);
+                  YYCOPY (reps->states, current->states, current->state - current->states + 1);
+                  reps->repair_length = current->repair_length + 1;
+                  reps->prev_repair = current;
+                  reps->repair.type = inserting;
+                  reps->repair.term = (yysymbol_kind_t) yyx;
 
                   /* Process PDA assuming next token is yyx */
-                  if (! yy_process_repairs (new, yyx))
+                  if (! yy_process_repairs (reps, (yysymbol_kind_t)yyx))
                     {
-                      YYFREE (new);
+                      YYFREE (reps);
                       continue;
                     }
 
-                  tail->next = new;
-                  tail = new;
+                  tail->next = reps;
+                  tail = reps;
                   count++;
 
                   if (yyx == yytoken)
@@ -1499,7 +1437,7 @@ yyrecover(yy_state_t *yyss, yy_state_t *yyssp, int yychar<%= output.user_formals
                   YYDPRINTF ((stderr,
                         "New repairs is enqueued. count: %d, yystate: %d, yyx: %d\n",
                         count, yystate, yyx));
-                  yy_print_repairs (new<%= output.user_args %>);
+                  yy_print_repairs (reps<%= output.user_args %>);
                 }
             }
         }
@@ -1537,7 +1475,12 @@ int yychar;
 /* The semantic value of the lookahead symbol.  */
 /* Default value used for initialization, for pacifying older GCCs
    or non-GCC compilers.  */
+#ifdef __cplusplus
+static const YYSTYPE yyval_default = {};
+(void) yyval_default;
+#else
 YY_INITIAL_VALUE (static const YYSTYPE yyval_default;)
+#endif
 YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default);
 
 /* Location data for the lookahead symbol.  */
@@ -1551,6 +1494,7 @@ YYLTYPE yylloc = yyloc_default;
 <%# b4_declare_parser_state_variables -%>
     /* Number of syntax errors so far.  */
     int yynerrs = 0;
+    YY_USE (yynerrs); /* Silence compiler warning.  */
 
     yy_state_fast_t yystate = 0;
     /* Number of tokens to shift before error messages enabled.  */
@@ -1818,6 +1762,7 @@ YYLTYPE yylloc = yyloc_default;
   *++yyvsp = yylval;
   YY_IGNORE_MAYBE_UNINITIALIZED_END
   *++yylsp = yylloc;
+<%= output.after_shift_function("/* %after-shift code. */") %>
 
   /* Discard the shifted token.  */
   yychar = YYEMPTY;
@@ -1850,6 +1795,7 @@ YYLTYPE yylloc = yyloc_default;
      unconditionally makes the parser a bit smaller, and it avoids a
      GCC warning that YYVAL may be used uninitialized.  */
   yyval = yyvsp[1-yylen];
+<%= output.before_reduce_function("/* %before-reduce function. */") %>
 
   /* Default location. */
   YYLLOC_DEFAULT (yyloc, (yylsp - yylen), yylen);
@@ -1875,6 +1821,7 @@ YYLTYPE yylloc = yyloc_default;
   YY_SYMBOL_PRINT ("-> $$ =", YY_CAST (yysymbol_kind_t, yyr1[yyn]), &yyval, &yyloc<%= output.user_args %>);
 
   YYPOPSTACK (yylen);
+<%= output.after_reduce_function("/* %after-reduce function. */") %>
   yylen = 0;
 
   *++yyvsp = yyval;
@@ -1976,6 +1923,7 @@ YYLTYPE yylloc = yyloc_default;
   /* Do not reclaim the symbols of the rule whose action triggered
      this YYERROR.  */
   YYPOPSTACK (yylen);
+<%= output.after_pop_stack_function("yylen", "/* %after-pop-stack function. */") %>
   yylen = 0;
   YY_STACK_PRINT (yyss, yyssp<%= output.user_args %>);
   yystate = *yyssp;
@@ -2035,6 +1983,7 @@ YYLTYPE yylloc = yyloc_default;
       yydestruct ("Error: popping",
                   YY_ACCESSING_SYMBOL (yystate), yyvsp, yylsp<%= output.user_args %>);
       YYPOPSTACK (1);
+<%= output.after_pop_stack_function(1, "/* %after-pop-stack function. */") %>
       yystate = *yyssp;
       YY_STACK_PRINT (yyss, yyssp<%= output.user_args %>);
     }
@@ -2049,6 +1998,7 @@ YYLTYPE yylloc = yyloc_default;
 
   /* Shift the error token.  */
   YY_SYMBOL_PRINT ("Shifting", YY_ACCESSING_SYMBOL (yyn), yyvsp, yylsp<%= output.user_args %>);
+<%= output.after_shift_error_token_function("/* %after-shift-error-token code. */") %>
 
   yystate = yyn;
   goto yynewstate;
@@ -2111,6 +2061,8 @@ YYLTYPE yylloc = yyloc_default;
 }
 
 <%# b4_percent_code_get([[epilogue]]) -%>
+<%- if output.aux.epilogue -%>
 #line <%= output.aux.epilogue_first_lineno - 1 %> "<%= output.grammar_file_path %>"
-
 <%= output.aux.epilogue -%>
+<%- end -%>
+
diff --git a/tool/lrama/template/bison/yacc.h b/tool/lrama/template/bison/yacc.h
index 932d6409db5017..848dbf596184b3 100644
--- a/tool/lrama/template/bison/yacc.h
+++ b/tool/lrama/template/bison/yacc.h
@@ -37,76 +37,4 @@
 /* DO NOT RELY ON FEATURES THAT ARE NOT DOCUMENTED in the manual,
    especially those whose name start with YY_ or yy_.  They are
    private implementation details that can be changed or removed.  */
-
-<%# b4_shared_declarations -%>
-<%# b4_shared_declarations -%>
-  <%-# b4_cpp_guard_open([b4_spec_mapped_header_file]) -%>
-    <%- if output.spec_mapped_header_file -%>
-#ifndef <%= output.b4_cpp_guard__b4_spec_mapped_header_file %>
-# define <%= output.b4_cpp_guard__b4_spec_mapped_header_file %>
-    <%- end -%>
-  <%-# b4_declare_yydebug & b4_YYDEBUG_define -%>
-/* Debug traces.  */
-#ifndef YYDEBUG
-# define YYDEBUG 0
-#endif
-#if YYDEBUG
-extern int yydebug;
-#endif
-  <%-# b4_percent_code_get([[requires]]). %code is not supported -%>
-
-  <%-# b4_token_enums_defines -%>
-/* Token kinds.  */
-#ifndef YYTOKENTYPE
-# define YYTOKENTYPE
-  enum yytokentype
-  {
-<%= output.token_enums -%>
-  };
-  typedef enum yytokentype yytoken_kind_t;
-#endif
-
-  <%-# b4_declare_yylstype -%>
-    <%-# b4_value_type_define -%>
-/* Value type.  */
-#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
-union YYSTYPE
-{
-#line <%= output.grammar.union.lineno %> "<%= output.grammar_file_path %>"
-<%= output.grammar.union.braces_less_code %>
-#line [@oline@] [@ofile@]
-
-};
-typedef union YYSTYPE YYSTYPE;
-# define YYSTYPE_IS_TRIVIAL 1
-# define YYSTYPE_IS_DECLARED 1
-#endif
-
-    <%-# b4_location_type_define -%>
-/* Location type.  */
-#if ! defined YYLTYPE && ! defined YYLTYPE_IS_DECLARED
-typedef struct YYLTYPE YYLTYPE;
-struct YYLTYPE
-{
-  int first_line;
-  int first_column;
-  int last_line;
-  int last_column;
-};
-# define YYLTYPE_IS_DECLARED 1
-# define YYLTYPE_IS_TRIVIAL 1
-#endif
-
-
-
-
-  <%-# b4_declare_yyerror_and_yylex. Not supported -%>
-  <%-# b4_declare_yyparse -%>
-int yyparse (<%= output.parse_param %>);
-
-
-  <%-# b4_percent_code_get([[provides]]). %code is not supported -%>
-  <%-# b4_cpp_guard_close([b4_spec_mapped_header_file]) -%>
-    <%- if output.spec_mapped_header_file -%>
-#endif /* !<%= output.b4_cpp_guard__b4_spec_mapped_header_file %>  */
-    <%- end -%>
+<%= output.render_partial("bison/_yacc.h") %>
diff --git a/tool/m4/ruby_append_option.m4 b/tool/m4/ruby_append_option.m4
index ff828d2162c22f..98359fa1f95f52 100644
--- a/tool/m4/ruby_append_option.m4
+++ b/tool/m4/ruby_append_option.m4
@@ -3,3 +3,7 @@ AC_DEFUN([RUBY_APPEND_OPTION],
 	[# RUBY_APPEND_OPTION($1)
 	AS_CASE([" [$]{$1-} "],
 	[*" $2 "*], [], ['  '], [ $1="$2"], [ $1="[$]$1 $2"])])dnl
+AC_DEFUN([RUBY_PREPEND_OPTION],
+	[# RUBY_APPEND_OPTION($1)
+	AS_CASE([" [$]{$1-} "],
+	[*" $2 "*], [], ['  '], [ $1="$2"], [ $1="$2 [$]$1"])])dnl
diff --git a/tool/m4/ruby_check_builtin_overflow.m4 b/tool/m4/ruby_check_builtin_overflow.m4
new file mode 100644
index 00000000000000..8568d2c6d927d7
--- /dev/null
+++ b/tool/m4/ruby_check_builtin_overflow.m4
@@ -0,0 +1,28 @@
+dnl -*- Autoconf -*-
+AC_DEFUN([RUBY_CHECK_BUILTIN_OVERFLOW], [dnl
+{ # $0($1)
+  RUBY_CHECK_BUILTIN_FUNC(__builtin_[$1]_overflow, [int x;__builtin_[$1]_overflow(0,0,&x)])
+  RUBY_CHECK_BUILTIN_FUNC(__builtin_[$1]_overflow_p, [__builtin_[$1]_overflow_p(0,0,(int)0)])
+
+  AS_IF([test "$rb_cv_builtin___builtin_[$1]_overflow" != no], [
+    AC_CACHE_CHECK(for __builtin_[$1]_overflow with long long arguments, rb_cv_use___builtin_[$1]_overflow_long_long, [
+      AC_LINK_IFELSE([AC_LANG_SOURCE([[
+@%:@pragma clang optimize off
+
+int
+main(void)
+{
+    long long x = 0, y;
+    __builtin_$1_overflow(x, x, &y);
+
+    return 0;
+}
+]])],
+	rb_cv_use___builtin_[$1]_overflow_long_long=yes,
+	rb_cv_use___builtin_[$1]_overflow_long_long=no)])
+  ])
+  AS_IF([test "$rb_cv_use___builtin_[$1]_overflow_long_long" = yes], [
+    AC_DEFINE(USE___BUILTIN_[]AS_TR_CPP($1)_OVERFLOW_LONG_LONG, 1)
+  ])
+}
+])dnl
diff --git a/tool/m4/ruby_check_builtin_setjmp.m4 b/tool/m4/ruby_check_builtin_setjmp.m4
index 05118e22437299..1e5d9b3028db9b 100644
--- a/tool/m4/ruby_check_builtin_setjmp.m4
+++ b/tool/m4/ruby_check_builtin_setjmp.m4
@@ -20,7 +20,7 @@ AC_CACHE_CHECK(for __builtin_setjmp, ac_cv_func___builtin_setjmp,
 	    void (*volatile f)(void) = t;
 	    if (!jump()) printf("%d\n", f != 0);
 	    ]])],
-	    [ac_cv_func___builtin_setjmp="yes with cast ($cast)"])
+	    [ac_cv_func___builtin_setjmp="yes${cast:+ with cast ($cast)}"])
 	])
 	test "$ac_cv_func___builtin_setjmp" = no || break
     done])
diff --git a/tool/m4/ruby_check_header.m4 b/tool/m4/ruby_check_header.m4
new file mode 100644
index 00000000000000..6fec9d16c5bcf1
--- /dev/null
+++ b/tool/m4/ruby_check_header.m4
@@ -0,0 +1,8 @@
+dnl -*- Autoconf -*-
+AC_DEFUN([RUBY_CHECK_HEADER],
+    [# RUBY_CHECK_HEADER($@)
+    save_CPPFLAGS="$CPPFLAGS"
+    CPPFLAGS="$CPPFLAGS m4_if([$5], [], [$INCFLAGS], [$5])"
+    AC_CHECK_HEADERS([$1], [$2], [$3], [$4])
+    CPPFLAGS="$save_CPPFLAGS"
+    unset save_CPPFLAGS])
diff --git a/tool/m4/ruby_default_arch.m4 b/tool/m4/ruby_default_arch.m4
index 35eb8112f6c9b1..2f25ba81ee10c6 100644
--- a/tool/m4/ruby_default_arch.m4
+++ b/tool/m4/ruby_default_arch.m4
@@ -1,12 +1,21 @@
 dnl -*- Autoconf -*-
 AC_DEFUN([RUBY_DEFAULT_ARCH], [
+# Set ARCH_FLAG for different width but family CPU
 AC_MSG_CHECKING([arch option])
-AS_CASE([$1],
-	[arm64],      [],
-	[*64],        [ARCH_FLAG=-m64],
-	[[i[3-6]86]], [ARCH_FLAG=-m32],
-	[ppc],        [ARCH_FLAG=-m32],
-	[AC_MSG_ERROR(unknown target architecture: $target_archs)]
-	)
-AC_MSG_RESULT([$ARCH_FLAG])
+AS_CASE([$1:"$host_cpu"],
+    [arm64:arm*],        [ARCH_FLAG=-m64],
+    [arm*:arm*],         [ARCH_FLAG=-m32],
+    [x86_64:[i[3-6]86]], [ARCH_FLAG=-m64],
+    [x64:x86_64],        [],
+    [[i[3-6]86]:x86_64], [ARCH_FLAG=-m32],
+    [ppc64:ppc*],        [ARCH_FLAG=-m64],
+    [ppc*:ppc64],        [ARCH_FLAG=-m32],
+    [
+    ARCH_FLAG=
+    for flag in "-arch "$1 -march=$1; do
+        _RUBY_TRY_CFLAGS([$]flag, [ARCH_FLAG="[$]flag"])
+        test x"$ARCH_FLAG" = x || break
+    done]
+)
+AC_MSG_RESULT([${ARCH_FLAG:-'(none)'}])
 ])dnl
diff --git a/tool/m4/ruby_modular_gc.m4 b/tool/m4/ruby_modular_gc.m4
new file mode 100644
index 00000000000000..661fce2e60364f
--- /dev/null
+++ b/tool/m4/ruby_modular_gc.m4
@@ -0,0 +1,41 @@
+dnl -*- Autoconf -*-
+AC_DEFUN([RUBY_MODULAR_GC],[
+AC_ARG_WITH(modular-gc,
+    AS_HELP_STRING([--with-modular-gc=DIR],
+    [Enable replacement of Ruby's GC from a modular library in the specified directory.]),
+    [modular_gc_dir=$withval], [unset modular_gc_dir]
+)
+
+AS_IF([test "$modular_gc_dir" = yes], [
+    AC_MSG_ERROR(you must specify a directory when using --with-modular-gc)
+])
+
+AC_MSG_CHECKING([if building with modular GC support])
+AS_IF([test x"$modular_gc_dir" != x], [
+    AC_MSG_RESULT([yes])
+
+    # Ensure that modular_gc_dir is always an absolute path so that Ruby
+    # never loads a modular GC from a relative path
+    AS_CASE(["$modular_gc_dir"],
+        [/*], [],
+        [test "$load_relative" = yes || modular_gc_dir="$prefix/$modular_gc_dir"]
+    )
+
+    # Ensure that modular_gc_dir always terminates with a /
+    AS_CASE(["$modular_gc_dir"],
+        [*/], [],
+        [modular_gc_dir="$modular_gc_dir/"]
+    )
+
+    AC_DEFINE([USE_MODULAR_GC], [1])
+
+    modular_gc_summary="yes (in $modular_gc_dir)"
+], [
+    AC_MSG_RESULT([no])
+    AC_DEFINE([USE_MODULAR_GC], [0])
+
+    modular_gc_summary="no"
+])
+
+AC_SUBST(modular_gc_dir, "${modular_gc_dir}")
+])dnl
diff --git a/tool/m4/ruby_setjmp_type.m4 b/tool/m4/ruby_setjmp_type.m4
index 4ae26fe5cdc25c..d26af34ea03c4b 100644
--- a/tool/m4/ruby_setjmp_type.m4
+++ b/tool/m4/ruby_setjmp_type.m4
@@ -3,18 +3,15 @@ AC_DEFUN([RUBY_SETJMP_TYPE], [
 RUBY_CHECK_BUILTIN_SETJMP
 RUBY_CHECK_SETJMP(_setjmpex, [], [@%:@include <setjmpex.h>])
 RUBY_CHECK_SETJMP(_setjmp)
-RUBY_CHECK_SETJMP(sigsetjmp, [sigjmp_buf])
 AC_MSG_CHECKING(for setjmp type)
 setjmp_suffix=
-unset setjmp_sigmask
 AC_ARG_WITH(setjmp-type,
-	AS_HELP_STRING([--with-setjmp-type], [select setjmp type]),
+    AS_HELP_STRING([--with-setjmp-type], [select setjmp type]),
 	[
 	AS_CASE([$withval],
 	[__builtin_setjmp], [setjmp=__builtin_setjmp],
 	[_setjmp], [ setjmp_prefix=_],
-	[sigsetjmp,*], [ setjmp_prefix=sig setjmp_sigmask=`expr "$withval" : 'sigsetjmp\(,.*\)'`],
-	[sigsetjmp], [ setjmp_prefix=sig],
+	[sigsetjmp*], [ AC_MSG_WARN(No longer use sigsetjmp; use setjmp instead); setjmp_prefix=],
 	[setjmp], [ setjmp_prefix=],
 	[setjmpex], [ setjmp_prefix= setjmp_suffix=ex],
 	[''], [ unset setjmp_prefix],
@@ -34,19 +31,13 @@ AS_IF([test ${setjmp_prefix+set}], [
 ], [test "$ac_cv_func__setjmp" = yes], [
     setjmp_prefix=_
     setjmp_suffix=
-], [test "$ac_cv_func_sigsetjmp" = yes], [
-    AS_CASE([$target_os],[solaris*|cygwin*],[setjmp_prefix=],[setjmp_prefix=sig])
-    setjmp_suffix=
 ], [
     setjmp_prefix=
     setjmp_suffix=
 ])
-AS_IF([test x$setjmp_prefix:$setjmp_sigmask = xsig:], [
-    setjmp_sigmask=,0
-])
-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_MSG_RESULT(${setjmp_prefix}setjmp${setjmp_suffix}${setjmp_cast:+\($setjmp_cast\)})
+AC_DEFINE_UNQUOTED([RUBY_SETJMP(env)], [${setjmp_prefix}setjmp${setjmp_suffix}($setjmp_cast(env))])
 AC_DEFINE_UNQUOTED([RUBY_LONGJMP(env,val)], [${setjmp_prefix}longjmp($setjmp_cast(env),val)])
-AS_IF([test "(" "$GCC" != yes ")" -o x$setjmp_prefix != x__builtin_], AC_DEFINE_UNQUOTED(RUBY_JMP_BUF, ${setjmp_sigmask+${setjmp_prefix}}jmp_buf))
+AS_CASE(["$GCC:$setjmp_prefix"], [yes:__builtin_], [], AC_DEFINE_UNQUOTED(RUBY_JMP_BUF, jmp_buf))
 AS_IF([test x$setjmp_suffix = xex], [AC_DEFINE_UNQUOTED(RUBY_USE_SETJMPEX, 1)])
 ])dnl
diff --git a/tool/m4/ruby_try_cflags.m4 b/tool/m4/ruby_try_cflags.m4
index 672f4f8e512459..b397642aad9ca2 100644
--- a/tool/m4/ruby_try_cflags.m4
+++ b/tool/m4/ruby_try_cflags.m4
@@ -6,14 +6,36 @@ m4_version_prereq([2.70], [], [
 m4_defun([AC_LANG_PROGRAM(C)], m4_bpatsubst(m4_defn([AC_LANG_PROGRAM(C)]), [main ()], [main (void)]))
 ])dnl
 dnl
-AC_DEFUN([RUBY_TRY_CFLAGS], [
-    AC_MSG_CHECKING([whether ]$1[ is accepted as CFLAGS])
+AC_DEFUN([_RUBY_TRY_CFLAGS], [
     RUBY_WERROR_FLAG([
     CFLAGS="[$]CFLAGS $1"
     AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[$4]], [[$5]])],
+	[$2], [$3])
+    ])dnl
+])dnl
+AC_DEFUN([RUBY_TRY_CFLAGS], [
+    AC_MSG_CHECKING([whether ]$1[ is accepted as CFLAGS])dnl
+    _RUBY_TRY_CFLAGS([$1],
+	[$2
+	AC_MSG_RESULT(yes)],
+	[$3
+	AC_MSG_RESULT(no)],
+	[$4], [$5])
+])dnl
+
+AC_DEFUN([_RUBY_TRY_CFLAGS_PREPEND], [
+    RUBY_WERROR_FLAG([
+    CFLAGS="$1 [$]CFLAGS"
+    AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[$4]], [[$5]])],
+	[$2], [$3])
+    ])dnl
+])dnl
+AC_DEFUN([RUBY_TRY_CFLAGS_PREPEND], [
+    AC_MSG_CHECKING([whether ]$1[ is accepted as CFLAGS])dnl
+    _RUBY_TRY_CFLAGS_PREPEND([$1],
 	[$2
 	AC_MSG_RESULT(yes)],
 	[$3
-	AC_MSG_RESULT(no)])
-    ])
+	AC_MSG_RESULT(no)],
+	[$4], [$5])
 ])dnl
diff --git a/tool/m4/ruby_universal_arch.m4 b/tool/m4/ruby_universal_arch.m4
index c8914c88d97a27..d3e0dd0b477504 100644
--- a/tool/m4/ruby_universal_arch.m4
+++ b/tool/m4/ruby_universal_arch.m4
@@ -17,7 +17,7 @@ AS_IF([test ${target_archs+set}], [
 	    cpu=$archs
 	    cpu=`echo $cpu | sed 's/-.*-.*//'`
 	    universal_binary="${universal_binary+$universal_binary,}$cpu"
-	    universal_archnames="${universal_archnames} ${archs}=${cpu}"
+	    universal_archnames="${universal_archnames:+$universal_archnames }${archs}=${cpu}"
 	    ARCH_FLAG="${ARCH_FLAG+$ARCH_FLAG }-arch $archs"
 	    ])
     done
@@ -40,7 +40,7 @@ AS_IF([test ${target_archs+set}], [
 	    AS_IF([$CC $CFLAGS $ARCH_FLAG -o conftest conftest.c > /dev/null 2>&1], [
 		rm -fr conftest.*
 	    ], [test -z "$ARCH_FLAG"], [
-		RUBY_DEFAULT_ARCH("$target_archs")
+		RUBY_DEFAULT_ARCH($target_archs)
 	    ])
 	])
 	target_cpu=${target_archs}
@@ -73,7 +73,7 @@ EOF
 	    sed -n 's/^"processor-name=\(.*\)"/\1/p'`
 	    target="$target_cpu${target}"
 	    AC_MSG_RESULT([$target_cpu])
-	    ])
+	])
     ])
     target_archs="$target_cpu"
 ])
diff --git a/tool/m4/ruby_wasm_tools.m4 b/tool/m4/ruby_wasm_tools.m4
index a6d8c34ebc39b0..efc017e7712884 100644
--- a/tool/m4/ruby_wasm_tools.m4
+++ b/tool/m4/ruby_wasm_tools.m4
@@ -9,7 +9,7 @@ AC_DEFUN([RUBY_WASM_TOOLS],
     AC_SUBST(wasmoptflags)
     : ${wasmoptflags=-O3}
 
-    AC_MSG_CHECKING([wheather \$WASI_SDK_PATH is set])
+    AC_MSG_CHECKING([whether \$WASI_SDK_PATH is set])
     AS_IF([test x"${WASI_SDK_PATH}" = x], [
         AC_MSG_RESULT([no])
 	AC_MSG_ERROR([WASI_SDK_PATH environment variable is required])
@@ -19,6 +19,7 @@ AC_DEFUN([RUBY_WASM_TOOLS],
         LD="${LD:-${WASI_SDK_PATH}/bin/clang}"
         AR="${AR:-${WASI_SDK_PATH}/bin/llvm-ar}"
         RANLIB="${RANLIB:-${WASI_SDK_PATH}/bin/llvm-ranlib}"
+        OBJCOPY="${OBJCOPY:-${WASI_SDK_PATH}/bin/llvm-objcopy}"
     ])
 ])
 ])dnl
diff --git a/tool/make-snapshot b/tool/make-snapshot
index 3e5689e873b057..c7ccc468d4c256 100755
--- a/tool/make-snapshot
+++ b/tool/make-snapshot
@@ -56,7 +56,7 @@ PACKAGES = {
 DEFAULT_PACKAGES = PACKAGES.keys - ["tar"]
 if !$no7z and system("7z", out: IO::NULL)
   PACKAGES["gzip"] = %w".tar.gz 7z a dummy -tgzip -mx -so"
-  PACKAGES["zip"]  = %w".zip    7z a -tzip -l -mx -mtc=off" << {out: IO::NULL}
+  PACKAGES["zip"]  = %w".zip    7z a -tzip -mx -mtc=off" << {out: IO::NULL}
 elsif gzip = ENV.delete("GZIP")
   PACKAGES["gzip"].concat(gzip.shellsplit)
 end
@@ -71,16 +71,6 @@ ENV["LC_ALL"] = ENV["LANG"] = "C"
 GITURL = URI.parse("https://github.com/ruby/ruby.git")
 RUBY_VERSION_PATTERN = /^\#define\s+RUBY_VERSION\s+"([\d.]+)"/
 
-ENV["VPATH"] ||= "include/ruby"
-YACC = ENV["YACC"] ||= "#{$tooldir}/lrama/exe/lrama"
-ENV["BASERUBY"] ||= "ruby"
-ENV["RUBY"] ||= "ruby"
-ENV["MV"] ||= "mv"
-ENV["RM"] ||= "rm -f"
-ENV["MINIRUBY"] ||= "ruby"
-ENV["PROGRAM"] ||= "ruby"
-ENV["AUTOCONF"] ||= "autoconf"
-ENV["BUILTIN_TRANSOBJS"] ||= "newline.o"
 ENV["TZ"] = "UTC"
 
 class String
@@ -117,22 +107,32 @@ $digests &&= $digests.split(/[, ]+/).tap {|dig|
 $digests ||= DIGESTS
 
 $patch_file &&= File.expand_path($patch_file)
-path = ENV["PATH"].split(File::PATH_SEPARATOR)
-%w[YACC BASERUBY RUBY MV MINIRUBY].each do |var|
-  cmd, = ENV[var].shellsplit
-  unless path.any? {|dir|
+PATH = ENV["PATH"].split(File::PATH_SEPARATOR)
+def PATH.executable_env(var, command = nil)
+  command = ENV[var] ||= (command or return)
+  cmd, = command.shellsplit
+  unless any? {|dir|
       file = File.expand_path(cmd, dir)
       File.file?(file) and File.executable?(file)
     }
     abort "#{File.basename $0}: #{var} command not found - #{cmd}"
   end
+  command
 end
 
+PATH.executable_env("MV", "mv")
+PATH.executable_env("RM", "rm -f")
+PATH.executable_env("AUTOCONF", "autoconf")
+
 %w[BASERUBY RUBY MINIRUBY].each do |var|
-  %x[#{ENV[var]} --disable-gem -e1 2>&1]
-  if $?.success?
-    ENV[var] += ' --disable-gem'
+  cmd = PATH.executable_env(var, "ruby")
+  help = IO.popen("#{cmd} --help", err: %i[child out], &:read)
+  unless $?.success? and /ruby/ =~ help
+    abort "#{File.basename $0}: #{var} ruby not found - #{cmd}"
   end
+  IO.popen("#{cmd} --disable-gem -eexit", err: %i[child out], &:read)
+  cmd += ' --disable-gem' if $?.success?
+  ENV[var] = cmd
 end
 
 if defined?($help) or defined?($_help)
@@ -364,7 +364,7 @@ def package(vcs, rev, destdir, tmp = nil)
     end
   elsif prerelease
     versionhdr ||= IO.read("#{v}/version.h")
-    versionhdr.sub!(/^\#define\s+RUBY_PATCHLEVEL_STR\s+"\K.+?(?=")/, tag)
+    versionhdr.sub!(/^\#\s*define\s+RUBY_PATCHLEVEL_STR\s+"\K.+?(?=")/, tag) or raise "no match of RUBY_PATCHLEVEL_STR to replace"
     IO.write("#{v}/version.h", versionhdr)
   else
     tag ||= vcs.revision_name(revision)
@@ -384,8 +384,21 @@ def package(vcs, rev, destdir, tmp = nil)
     puts $colorize.fail("patching failed")
     return
   end
-  def (clean = []).add(n) push(n); n end
-  def clean.create(file, content = "") File.binwrite(add(file), content) end
+
+  class << (clean = [])
+    def add(n) push(n)
+      n
+    end
+    def create(file, content = "", &block)
+      add(file)
+      if block
+        File.open(file, "wb", &block)
+      else
+        File.binwrite(file, content)
+      end
+    end
+  end
+
   Dir.chdir(v) do
     unless File.exist?("ChangeLog")
       vcs.export_changelog(url, nil, revision, "ChangeLog")
@@ -406,7 +419,7 @@ def package(vcs, rev, destdir, tmp = nil)
       puts
     end
 
-    File.open(clean.add("cross.rb"), "w") do |f|
+    clean.create("cross.rb") do |f|
       f.puts "Object.__send__(:remove_const, :CROSS_COMPILING) if defined?(CROSS_COMPILING)"
       f.puts "CROSS_COMPILING=true"
       f.puts "Object.__send__(:remove_const, :RUBY_PLATFORM)"
@@ -456,6 +469,9 @@ def package(vcs, rev, destdir, tmp = nil)
         "MAJOR"=>api_major_version,
         "MINOR"=>api_minor_version,
         "TEENY"=>version_teeny,
+        "VPATH"=>(ENV["VPATH"] || "include/ruby"),
+        "PROGRAM"=>(ENV["PROGRAM"] || "ruby"),
+        "BUILTIN_TRANSOBJS"=>(ENV["BUILTIN_TRANSOBJS"] || "newline.o"),
       }
       status.scan(/^s([%,])@([A-Za-z_][A-Za-z_0-9]*)@\1(.*?)\1g$/) do
         vars[$2] ||= $3
@@ -501,12 +517,11 @@ touch-unicode-files:
       end
       print "prerequisites"
     else
-      system(*%W"#{YACC} -o parse.c parse.y")
+      system(*%W[#{PATH.executable_env("YACC", "bison")} -o parse.c parse.y])
     end
     vcs.after_export(".") if exported
     clean.concat(Dir.glob("ext/**/autom4te.cache"))
-    FileUtils.rm_rf(clean) unless $keep_temp
-    FileUtils.rm_rf(".downloaded-cache")
+    clean.add(".downloaded-cache")
     if File.exist?("gems/bundled_gems")
       gems = Dir.glob("gems/*.gem")
       gems -= File.readlines("gems/bundled_gems").map {|line|
@@ -514,10 +529,11 @@ touch-unicode-files:
         name, version, _ = line.split(' ')
         "gems/#{name}-#{version}.gem"
       }
-      FileUtils.rm_f(gems)
+      clean.concat(gems)
     else
-      FileUtils.rm_rf("gems")
+      clean.add("gems")
     end
+    FileUtils.rm_rf(clean)
     if modified
       touch_all(modified, "**/*/", 0) do |name, stat|
         stat.mtime > modified
diff --git a/tool/merger.rb b/tool/merger.rb
index d181a77f841381..8b12334b735df4 100755
--- a/tool/merger.rb
+++ b/tool/merger.rb
@@ -2,9 +2,8 @@
 # -*- ruby -*-
 exec "${RUBY-ruby}" "-x" "$0" "$@" && [ ] if false
 #!ruby
-# This needs ruby 2.0, Subversion and Git.
-# As a Ruby committer, run this in an SVN repository
-# to commit a change.
+# This needs ruby 2.0 and Git.
+# As a Ruby committer, run this in a git repository to commit a change.
 
 require 'tempfile'
 require 'net/http'
@@ -15,20 +14,11 @@
 ORIGIN = 'git@git.ruby-lang.org:ruby.git'
 GITHUB = 'git@github.com:ruby/ruby.git'
 
-module Merger
-  REPOS = 'svn+ssh://svn@ci.ruby-lang.org/ruby/'
-end
-
-class << Merger
-  include Merger
-
+class << Merger = Object.new
   def help
     puts <<-HELP
 \e[1msimple backport\e[0m
-  ruby #$0 1234
-
-\e[1mbackport from other branch\e[0m
-  ruby #$0 17502 mvm
+  ruby #$0 1234abc
 
 \e[1mrevision increment\e[0m
   ruby #$0 revisionup
@@ -37,16 +27,16 @@ def help
   ruby #$0 teenyup
 
 \e[1mtagging major release\e[0m
-  ruby #$0 tag 2.2.0
+  ruby #$0 tag 3.2.0
 
-\e[1mtagging patch release\e[0m (about 2.1.0 or later, it means X.Y.Z (Z > 0) release)
+\e[1mtagging patch release\e[0m (for 2.1.0 or later, it means X.Y.Z (Z > 0) release)
   ruby #$0 tag
 
 \e[1mtagging preview/RC\e[0m
-  ruby #$0 tag 2.2.0-preview1
+  ruby #$0 tag 3.2.0-preview1
 
 \e[1mremove tag\e[0m
-  ruby #$0 removetag 2.2.9
+  ruby #$0 removetag 3.2.9
 
 \e[33;1m* all operations shall be applied to the working directory.\e[0m
     HELP
@@ -57,11 +47,11 @@ def interactive(str, editfile = nil)
       yield if block_given?
       STDERR.puts "\e[1;33m#{str} ([y]es|[a]bort|[r]etry#{'|[e]dit' if editfile})\e[0m"
       case STDIN.gets
-      when /\Aa/i then exit
+      when /\Aa/i then exit 1
       when /\Ar/i then redo
       when /\Ay/i then break
       when /\Ae/i then system(ENV['EDITOR'], editfile)
-      else exit
+      else exit 1
       end
     end
   end
@@ -69,11 +59,7 @@ def interactive(str, editfile = nil)
   def version_up(teeny: false)
     now = Time.now
     now = now.localtime(9*60*60) # server is Japan Standard Time +09:00
-    if svn_mode?
-      system('svn', 'revert', 'version.h')
-    else
-      system('git', 'checkout', 'HEAD', 'version.h')
-    end
+    system('git', 'checkout', 'HEAD', 'version.h')
     v, pl = version
 
     if teeny
@@ -129,31 +115,13 @@ def tag(relname)
     end
     tagname = "v#{v.join('_')}#{("_#{pl}" if v[0] < "2" || (v[0] == "2" && v[1] < "1") || /^(?:preview|rc)/ =~ pl)}"
 
-    if svn_mode?
-      if relname
-        branch_url = `svn info`[/URL: (.*)/, 1]
-      else
-        branch_url = "#{REPOS}branches/ruby_"
-        if v[0] < '2' || (v[0] == '2' && v[1] < '1')
-          abort 'patchlevel must be greater than 0 for patch release' if pl == '0'
-          branch_url << v.join('_')
-        else
-          abort 'teeny must be greater than 0 for patch release' if v[2] == '0'
-          branch_url << v.join('_').sub(/_\d+\z/, '')
-        end
-      end
-      tag_url = "#{REPOS}tags/#{tagname}"
-      system('svn', 'info', tag_url, out: IO::NULL, err: IO::NULL)
-      if $?.success?
-        abort 'specfied tag already exists. check tag name and remove it if you want to force re-tagging'
-      end
-      execute('svn', 'cp', '-m', "add tag #{tagname}", branch_url, tag_url, interactive: true)
-    else
-      unless execute('git', 'tag', tagname)
-        abort 'specfied tag already exists. check tag name and remove it if you want to force re-tagging'
-      end
-      execute('git', 'push', ORIGIN, tagname, interactive: true)
+    unless execute('git', 'diff', '--exit-code')
+      abort 'uncommitted changes'
     end
+    unless execute('git', 'tag', tagname)
+      abort 'specfied tag already exists. check tag name and remove it if you want to force re-tagging'
+    end
+    execute('git', 'push', ORIGIN, tagname, interactive: true)
   end
 
   def remove_tag(relname)
@@ -173,64 +141,44 @@ def remove_tag(relname)
       tagname = relname
     end
 
-    if svn_mode?
-      tag_url = "#{REPOS}tags/#{tagname}"
-      execute('svn', 'rm', '-m', "remove tag #{tagname}", tag_url, interactive: true)
-    else
-      execute('git', 'tag', '-d', tagname)
-      execute('git', 'push', ORIGIN, ":#{tagname}", interactive: true)
-      execute('git', 'push', GITHUB, ":#{tagname}", interactive: true)
-    end
+    execute('git', 'tag', '-d', tagname)
+    execute('git', 'push', ORIGIN, ":#{tagname}", interactive: true)
+    execute('git', 'push', GITHUB, ":#{tagname}", interactive: true)
   end
 
   def update_revision_h
-    if svn_mode?
-      execute('svn', 'up')
-    end
     execute('ruby tool/file2lastrev.rb --revision.h . > revision.tmp')
     execute('tool/ifchange', '--timestamp=.revision.time', 'revision.h', 'revision.tmp')
     execute('rm', '-f', 'revision.tmp')
   end
 
   def stat
-    if svn_mode?
-      `svn stat`
-    else
-      `git status --short`
-    end
+    `git status --short`
   end
 
   def diff(file = nil)
-    if svn_mode?
-      command = %w[svn diff --diff-cmd=diff -x -upw]
-    else
-      command = %w[git diff --color HEAD]
-    end
+    command = %w[git diff --color HEAD]
     IO.popen(command + [file].compact, &:read)
   end
 
   def commit(file)
-    if svn_mode?
-      begin
-        execute('svn', 'ci', '-F', file)
-        execute('svn', 'update') # svn ci doesn't update revision info on working copy
-      ensure
-        execute('rm', '-f', 'subversion.commitlog')
-      end
-    else
-      current_branch = IO.popen(['git', 'rev-parse', '--abbrev-ref', 'HEAD'], &:read).strip
-      execute('git', 'add', '.') &&
-        execute('git', 'commit', '-F', file)
-    end
+    current_branch = IO.popen(['git', 'rev-parse', '--abbrev-ref', 'HEAD'], &:read).strip
+    execute('git', 'add', '.') && execute('git', 'commit', '-F', file)
   end
 
-  private
-
-  def svn_mode?
-    return @svn_mode if defined?(@svn_mode)
-    @svn_mode = system("svn info", %i(out err) => IO::NULL)
+  def has_conflicts?
+    changes = IO.popen(%w[git status --porcelain -z]) { |io| io.readlines("\0", chomp: true) }
+    # Discover unmerged files
+    # AU: unmerged, added by us
+    # DU: unmerged, deleted by us
+    # UU: unmerged, both modified
+    # AA: unmerged, both added
+    conflict = changes.grep(/\A(?:.U|AA) /) {$'}
+    !conflict.empty?
   end
 
+  private
+
   # Prints the version of Ruby found in version.h
   def version
     v = p = nil
@@ -289,10 +237,11 @@ def execute(*cmd, interactive: false)
 
   case ARGV[0]
   when /--ticket=(.*)/
-    tickets = $1.split(/,/).map{|num| " [Backport ##{num}]"}.join
+    tickets = $1.split(/,/)
     ARGV.shift
   else
-    tickets = ''
+    tickets = []
+    detect_ticket = true
   end
 
   revstr = ARGV[0].gsub(%r!https://github\.com/ruby/ruby/commit/|https://bugs\.ruby-lang\.org/projects/ruby-master/repository/git/revisions/!, '')
@@ -303,8 +252,6 @@ def execute(*cmd, interactive: false)
   revs.each do |rev|
     git_rev = nil
     case rev
-    when /\A\d{1,6}\z/
-      svn_rev = rev
     when /\A\h{7,40}\z/
       git_rev = rev
     when nil then
@@ -315,28 +262,25 @@ def execute(*cmd, interactive: false)
       exit
     end
 
-    # Merge revision from Git patch or SVN
-    if git_rev
-      git_uri = "https://git.ruby-lang.org/ruby.git/patch/?id=#{git_rev}"
-      resp = Net::HTTP.get_response(URI(git_uri))
-      if resp.code != '200'
-        abort "'#{git_uri}' returned status '#{resp.code}':\n#{resp.body}"
-      end
-      patch = resp.body.sub(/^diff --git a\/version\.h b\/version\.h\nindex .*\n--- a\/version\.h\n\+\+\+ b\/version\.h\n@@ .* @@\n(?:[-\+ ].*\n|\n)+/, '')
-
-      message = "\n\n#{(patch[/^Subject: (.*)\n\ndiff --git/m, 1] || "Message not found for revision: #{git_rev}\n")}"
-      puts '+ git apply'
-      IO.popen(['git', 'apply', '--3way'], 'wb') { |f| f.write(patch) }
-    else
-      default_merge_branch = (%r{^URL: .*/branches/ruby_1_8_} =~ `svn info` ? 'branches/ruby_1_8' : 'trunk')
-      svn_src = "#{Merger::REPOS}#{ARGV[1] || default_merge_branch}"
-      message = IO.popen(['svn', 'log', '-c', svn_rev, svn_src], &:read)
+    # Merge revision from Git patch
+    git_uri = "https://git.ruby-lang.org/ruby.git/patch/?id=#{git_rev}"
+    resp = Net::HTTP.get_response(URI(git_uri))
+    if resp.code != '200'
+      abort "'#{git_uri}' returned status '#{resp.code}':\n#{resp.body}"
+    end
+    patch = resp.body.sub(/^diff --git a\/version\.h b\/version\.h\nindex .*\n--- a\/version\.h\n\+\+\+ b\/version\.h\n@@ .* @@\n(?:[-\+ ].*\n|\n)+/, '')
 
-      cmd = ['svn', 'merge', '--accept=postpone', '-c', svn_rev, svn_src]
-      puts "+ #{cmd.join(' ')}"
-      system(*cmd)
+    if detect_ticket
+      tickets += patch.scan(/\[(?:Bug|Feature|Misc) #(\d+)\]/i).map(&:first)
     end
 
+    message = "#{(patch[/^Subject: (.*)\n---\n /m, 1] || "Message not found for revision: #{git_rev}\n")}"
+    message.gsub!(/\G(.*)\n( .*)/, "\\1\\2")
+    message = "\n\n#{message}"
+
+    puts '+ git apply'
+    IO.popen(['git', 'apply', '--3way'], 'wb') { |f| f.write(patch) }
+
     commit_message << message.sub(/\A-+\nr.*/, '').sub(/\n-+\n\z/, '').gsub(/^./, "\t\\&")
   end
 
@@ -346,20 +290,22 @@ def execute(*cmd, interactive: false)
 
   Merger.version_up
   f = Tempfile.new 'merger.rb'
-  f.printf "merge revision(s) %s:%s", revstr, tickets
+  f.printf "merge revision(s) %s:%s", revs.join(', '), tickets.map{|num| " [Backport ##{num}]"}.join
   f.write commit_message
   f.flush
   f.close
 
-  Merger.interactive('conflicts resolved?', f.path) do
-    IO.popen(ENV['PAGER'] || ['less', '-R'], 'w') do |g|
-      g << Merger.stat
-      g << "\n\n"
-      f.open
-      g << f.read
-      f.close
-      g << "\n\n"
-      g << Merger.diff
+  if Merger.has_conflicts?
+    Merger.interactive('conflicts resolved?', f.path) do
+      IO.popen(ENV['PAGER'] || ['less', '-R'], 'w') do |g|
+        g << Merger.stat
+        g << "\n\n"
+        f.open
+        g << f.read
+        f.close
+        g << "\n\n"
+        g << Merger.diff
+      end
     end
   end
 
diff --git a/tool/missing-baseruby.bat b/tool/missing-baseruby.bat
new file mode 100755
index 00000000000000..9274482a4c9ca6
--- /dev/null
+++ b/tool/missing-baseruby.bat
@@ -0,0 +1,23 @@
+:"" == "
+@echo off || (
+  :warn
+    echo>&2.%~1
+  goto :eof
+  :abort
+    exit /b 1
+)||(
+:)"||(
+  # necessary libraries
+  require 'erb'
+  require 'fileutils'
+  require 'tempfile'
+  s = %^#
+)
+: ; call() { local call=${1#:}; shift; $call "$@"; }
+: ; warn() { echo "$1" >&2; }
+: ; abort () { exit 1; }
+
+call :warn "executable host ruby is required.  use --with-baseruby option."
+call :warn "Note that BASERUBY must be Ruby 3.1.0 or later."
+call :abort
+: || (:^; abort if RUBY_VERSION < s[%r"warn .*Ruby ([\d.]+)(?:\.0)?",1])
diff --git a/tool/mk_builtin_loader.rb b/tool/mk_builtin_loader.rb
index 5ab427ca9b2931..6e1f5c666a9bab 100644
--- a/tool/mk_builtin_loader.rb
+++ b/tool/mk_builtin_loader.rb
@@ -6,7 +6,23 @@
 
 SUBLIBS = {}
 REQUIRED = {}
-BUILTIN_ATTRS = %w[leaf no_gc]
+BUILTIN_ATTRS = %w[leaf inline_block use_block c_trace]
+
+module CompileWarning
+  @@warnings = 0
+
+  def warn(message)
+    @@warnings += 1
+    super
+  end
+
+  def self.reset
+    w, @@warnings = @@warnings, 0
+    w.nonzero?
+  end
+end
+
+Warning.extend CompileWarning
 
 def string_literal(lit, str = [])
   while lit
@@ -166,7 +182,7 @@ def collect_builtin base, tree, name, bs, inlines, locals = nil
           when 'cstmt'
             text = inline_text argc, args.first
 
-            func_name = "_bi#{inlines.size}"
+            func_name = "_bi#{lineno}"
             cfunc_name = make_cfunc_name(inlines, name, lineno)
             inlines[cfunc_name] = [lineno, text, locals, func_name]
             argc -= 1
@@ -174,7 +190,7 @@ def collect_builtin base, tree, name, bs, inlines, locals = nil
             text = inline_text argc, args.first
             code = "return #{text};"
 
-            func_name = "_bi#{inlines.size}"
+            func_name = "_bi#{lineno}"
             cfunc_name = make_cfunc_name(inlines, name, lineno)
 
             locals = [] if $1 == 'cconst'
@@ -263,12 +279,19 @@ def collect_iseq iseq_ary
 
 def generate_cexpr(ofile, lineno, line_file, body_lineno, text, locals, func_name)
   f = StringIO.new
+
+  # Avoid generating fetches of lvars we don't need. This is imperfect as it
+  # will match text inside strings or other false positives.
+  local_candidates = text.scan(/[a-zA-Z_][a-zA-Z0-9_]*/)
+
   f.puts '{'
   lineno += 1
   # locals is nil outside methods
   locals&.reverse_each&.with_index{|param, i|
     next unless Symbol === param
-    f.puts "MAYBE_UNUSED(const VALUE) #{param} = rb_vm_lvar(ec, #{-3 - i});"
+    next unless local_candidates.include?(param.to_s)
+    f.puts "VALUE *const #{param}__ptr = (VALUE *)&ec->cfp->ep[#{-3 - i}];"
+    f.puts "MAYBE_UNUSED(const VALUE) #{param} = *#{param}__ptr;"
     lineno += 1
   }
   f.puts "#line #{body_lineno} \"#{line_file}\""
@@ -293,16 +316,18 @@ def mk_builtin_header file
 
   # bs = { func_name => argc }
   code = File.read(file)
-  collect_iseq RubyVM::InstructionSequence.compile(code).to_a
-  collect_builtin(base, Ripper.sexp(code), 'top', bs = {}, inlines = {})
-
   begin
-    f = File.open(ofile, 'w')
-  rescue SystemCallError # EACCES, EPERM, EROFS, etc.
-    # Fall back to the current directory
-    f = File.open(File.basename(ofile), 'w')
+    verbose, $VERBOSE = $VERBOSE, true
+    collect_iseq RubyVM::InstructionSequence.compile(code, base).to_a
+  ensure
+    $VERBOSE = verbose
   end
-  begin
+  if warnings = CompileWarning.reset
+    raise "#{warnings} warnings in #{file}"
+  end
+  collect_builtin(base, Ripper.sexp(code), 'top', bs = {}, inlines = {})
+
+  StringIO.open do |f|
     if File::ALT_SEPARATOR
       file = file.tr(File::ALT_SEPARATOR, File::SEPARATOR)
       ofile = ofile.tr(File::ALT_SEPARATOR, File::SEPARATOR)
@@ -383,8 +408,13 @@ def mk_builtin_header file
     f.puts "  rb_load_with_builtin_functions(#{base.dump}, #{table});"
 
     f.puts "}"
-  ensure
-    f.close
+
+    begin
+      File.write(ofile, f.string)
+    rescue SystemCallError # EACCES, EPERM, EROFS, etc.
+      # Fall back to the current directory
+      File.write(File.basename(ofile), f.string)
+    end
   end
 end
 
diff --git a/tool/mk_rbbin.rb b/tool/mk_rbbin.rb
new file mode 100755
index 00000000000000..991230f0947be2
--- /dev/null
+++ b/tool/mk_rbbin.rb
@@ -0,0 +1,48 @@
+#!ruby -s
+
+OPTIMIZATION = {
+  inline_const_cache: true,
+  peephole_optimization: true,
+  tailcall_optimization: false,
+  specialized_instruction: true,
+  operands_unification: true,
+  instructions_unification: true,
+  frozen_string_literal: true,
+  debug_frozen_string_literal: false,
+  coverage_enabled: false,
+  debug_level: 0,
+}
+
+file = File.basename(ARGV[0], ".rb")
+name = "<internal:#{file}>"
+iseq = RubyVM::InstructionSequence.compile(ARGF.read, name, name, **OPTIMIZATION)
+puts <<C
+/* -*- C -*- */
+
+static const char #{file}_builtin[] = {
+C
+iseq.to_binary.bytes.each_slice(8) do |b|
+  print "    ", b.map {|c| "0x%.2x," % c}.join(" ")
+  if $comment
+    print " /* ", b.pack("C*").gsub(/([[ -~]&&[^\\]])|(?m:.)/) {
+      (c = $1) ? "#{c} " : (c = $&.dump).size == 2 ? c : ". "
+    }, "*/"
+  end
+  puts
+end
+puts <<C
+};
+
+#include "ruby/ruby.h"
+#include "vm_core.h"
+
+void
+Init_#{file}(void)
+{
+    const char *builtin = #{file}_builtin;
+    size_t size = sizeof(#{file}_builtin);
+    VALUE code = rb_str_new_static(builtin, (long)size);
+    VALUE iseq = rb_funcallv(rb_cISeq, rb_intern_const("load_from_binary"), 1, &code);
+    rb_funcallv(iseq, rb_intern_const("eval"), 0, 0);
+}
+C
diff --git a/tool/mkconfig.rb b/tool/mkconfig.rb
index 55e781a28e5764..ffa4c1c0b263e0 100755
--- a/tool/mkconfig.rb
+++ b/tool/mkconfig.rb
@@ -1,4 +1,5 @@
 #!./miniruby -s
+# frozen-string-literal: true
 
 # This script, which is run when ruby is built, generates rbconfig.rb by
 # parsing information from config.status.  rbconfig.rb contains build
@@ -63,8 +64,6 @@
     when /^(?:X|(?:MINI|RUN|(?:HAVE_)?BASE|BOOTSTRAP|BTEST)RUBY(?:_COMMAND)?$)/; next
     when /^INSTALLDOC|TARGET$/; next
     when /^DTRACE/; next
-    when /^RJIT_(CC|SUPPORT)$/; # pass
-    when /^RJIT_/; next
     when /^(?:MAJOR|MINOR|TEENY)$/; vars[name] = val; next
     when /^LIBRUBY_D?LD/; next
     when /^RUBY_INSTALL_NAME$/; next vars[name] = (install_name = val).dup if $install_name
@@ -169,8 +168,8 @@ def vars.expand(val, config = self)
   val.replace(newval) unless newval == val
   val
 end
-prefix = vars.expand(vars["prefix"] ||= "")
-rubyarchdir = vars.expand(vars["rubyarchdir"] ||= "")
+prefix = vars.expand(vars["prefix"] ||= +"")
+rubyarchdir = vars.expand(vars["rubyarchdir"] ||= +"")
 relative_archdir = rubyarchdir.rindex(prefix, 0) ? rubyarchdir[prefix.size..-1] : rubyarchdir
 
 puts %[\
@@ -257,14 +256,14 @@ module RbConfig
 v_others.compact!
 
 if $install_name
-  if install_name and vars.expand("$(RUBY_INSTALL_NAME)") == $install_name
+  if install_name and vars.expand(+"$(RUBY_INSTALL_NAME)") == $install_name
     $install_name = install_name
   end
   v_fast << "  CONFIG[\"ruby_install_name\"] = \"" + $install_name + "\"\n"
   v_fast << "  CONFIG[\"RUBY_INSTALL_NAME\"] = \"" + $install_name + "\"\n"
 end
 if $so_name
-  if so_name and vars.expand("$(RUBY_SO_NAME)") == $so_name
+  if so_name and vars.expand(+"$(RUBY_SO_NAME)") == $so_name
     $so_name = so_name
   end
   v_fast << "  CONFIG[\"RUBY_SO_NAME\"] = \"" + $so_name + "\"\n"
diff --git a/tool/mkrunnable.rb b/tool/mkrunnable.rb
index 8bfb4fe6a4f430..ef358e24251595 100755
--- a/tool/mkrunnable.rb
+++ b/tool/mkrunnable.rb
@@ -6,6 +6,7 @@
 
 require './rbconfig'
 require 'fileutils'
+require_relative 'lib/path'
 
 case ARGV[0]
 when "-n"
@@ -18,93 +19,7 @@
   include FileUtils
 end
 
-module Mswin
-  def ln_safe(src, dest, *opt)
-    cmd = ["mklink", dest.tr("/", "\\"), src.tr("/", "\\")]
-    cmd[1, 0] = opt
-    return if system("cmd", "/c", *cmd)
-    # TODO: use RUNAS or something
-    puts cmd.join(" ")
-  end
-
-  def ln_dir_safe(src, dest)
-    ln_safe(src, dest, "/d")
-  end
-end
-
-def clean_link(src, dest)
-  begin
-    link = File.readlink(dest)
-  rescue
-  else
-    return if link == src
-    File.unlink(dest)
-  end
-  yield src, dest
-end
-
-def ln_safe(src, dest)
-  ln_sf(src, dest)
-rescue Errno::ENOENT
-  # Windows disallows to create broken symboic links, probably because
-  # it is a kind of reparse points.
-  raise if File.exist?(src)
-end
-
-alias ln_dir_safe ln_safe
-
-case RUBY_PLATFORM
-when /linux|darwin|solaris/
-  def ln_exe(src, dest)
-    ln(src, dest, force: true)
-  end
-else
-  alias ln_exe ln_safe
-end
-
-if !File.respond_to?(:symlink) && /mingw|mswin/ =~ (CROSS_COMPILING || RUBY_PLATFORM)
-  extend Mswin
-end
-
-def clean_path(path)
-  path = "#{path}/".gsub(/(\A|\/)(?:\.\/)+/, '\1').tr_s('/', '/')
-  nil while path.sub!(/[^\/]+\/\.\.\//, '')
-  path
-end
-
-def relative_path_from(path, base)
-  path = clean_path(path)
-  base = clean_path(base)
-  path, base = [path, base].map{|s|s.split("/")}
-  until path.empty? or base.empty? or path[0] != base[0]
-    path.shift
-    base.shift
-  end
-  path, base = [path, base].map{|s|s.join("/")}
-  if /(\A|\/)\.\.\// =~ base
-    File.expand_path(path)
-  else
-    base.gsub!(/[^\/]+/, '..')
-    File.join(base, path)
-  end
-end
-
-def ln_relative(src, dest, executable = false)
-  return if File.identical?(src, dest)
-  parent = File.dirname(dest)
-  File.directory?(parent) or mkdir_p(parent)
-  if executable
-    return (ln_exe(src, dest) if File.exist?(src))
-  end
-  clean_link(relative_path_from(src, parent), dest) {|s, d| ln_safe(s, d)}
-end
-
-def ln_dir_relative(src, dest)
-  return if File.identical?(src, dest)
-  parent = File.dirname(dest)
-  File.directory?(parent) or mkdir_p(parent)
-  clean_link(relative_path_from(src, parent), dest) {|s, d| ln_dir_safe(s, d)}
-end
+include Path
 
 config = RbConfig::MAKEFILE_CONFIG.merge("prefix" => ".", "exec_prefix" => ".")
 config.each_value {|s| RbConfig.expand(s, config)}
@@ -119,18 +34,25 @@ def ln_dir_relative(src, dest)
 rubylibdir = config["rubylibdir"]
 rubyarchdir = config["rubyarchdir"]
 archdir = "#{extout}/#{arch}"
-[bindir, libdir, archdir].uniq.each do |dir|
+exedir = bindir
+if libdirname == "archlibdir"
+  exedir = exedir.sub(%r[/\K(?=[^/]+\z)]) {extout+"/"}
+end
+[exedir, libdir, archdir].uniq.each do |dir|
   File.directory?(dir) or mkdir_p(dir)
 end
+unless exedir == bindir
+  ln_dir_relative(exedir, bindir)
+end
 
 exeext = config["EXEEXT"]
 ruby_install_name = config["ruby_install_name"]
 rubyw_install_name = config["rubyw_install_name"]
 goruby_install_name = "go" + ruby_install_name
-[ruby_install_name, rubyw_install_name, goruby_install_name].map do |ruby|
+[ruby_install_name, rubyw_install_name, goruby_install_name].each do |ruby|
   if ruby and !ruby.empty?
     ruby += exeext
-    ln_relative(ruby, "#{bindir}/#{ruby}", true)
+    ln_relative(ruby, "#{exedir}/#{ruby}", true)
   end
 end
 so = config["LIBRUBY_SO"]
diff --git a/tool/outdate-bundled-gems.rb b/tool/outdate-bundled-gems.rb
index bf6b26870010c8..c82d31d743da65 100755
--- a/tool/outdate-bundled-gems.rb
+++ b/tool/outdate-bundled-gems.rb
@@ -3,26 +3,60 @@
 require 'rubygems'
 
 fu = FileUtils::Verbose
+
 until ARGV.empty?
   case ARGV.first
   when '--'
     ARGV.shift
     break
-  when '-n', '--dryrun'
+  when '-n', '--dry-run', '--dryrun'
+    ## -n, --dry-run  Don't remove
     fu = FileUtils::DryRun
   when /\A--make=/
     # just to run when `make -n`
   when /\A--mflags=(.*)/
     fu = FileUtils::DryRun if /\A-\S*n/ =~ $1
+  when /\A--gem[-_]platform=(.*)/im
+    ## --gem-platform=PLATFORM  Platform in RubyGems style
+    gem_platform = $1
+    ruby_platform = nil
+  when /\A--ruby[-_]platform=(.*)/im
+    ## --ruby-platform=PLATFORM  Platform in Ruby style
+    ruby_platform = $1
+    gem_platform = nil
+  when /\A--ruby[-_]version=(.*)/im
+    ## --ruby-version=VERSION  Ruby version to keep
+    ruby_version = $1
+  when /\A--only=(?:(curdir|srcdir)|all)\z/im
+    ## --only=(curdir|srcdir|all)  Specify directory to remove gems from
+    only = $1&.downcase
+  when /\A--all\z/im
+    ## --all  Remove all gems not only bundled gems
+    all = true
+  when /\A--help\z/im
+    ## --help  Print this message
+    puts "Usage: #$0 [options] [srcdir]"
+    File.foreach(__FILE__) do |line|
+      line.sub!(/^ *## /, "") or next
+      break if line.chomp!.empty?
+      opt, desc = line.split(/ {2,}/, 2)
+      printf "  %-28s  %s\n", opt, desc
+    end
+    exit
   when /\A-/
     raise "#{$0}: unknown option: #{ARGV.first}"
   else
     break
   end
+  ##
   ARGV.shift
 end
 
+gem_platform ||= Gem::Platform.new(ruby_platform).to_s if ruby_platform
+
 class Removal
+  attr_reader :base
+
   def initialize(base = nil)
     @base = (File.join(base, "/") if base)
     @remove = {}
@@ -64,24 +98,39 @@ def glob(pattern, *rest)
     }
   end
 
+  def sorted
+    @remove.sort_by {|k, | [-k.count("/"), k]}
+  end
+
   def each_file
-    @remove.each {|k, v| yield prefixed(k) if v == :rm_f}
+    sorted.each {|k, v| yield prefixed(k) if v == :rm_f}
   end
 
   def each_directory
-    @remove.each {|k, v| yield prefixed(k) if v == :rm_rf}
+    sorted.each {|k, v| yield prefixed(k) if v == :rm_rf}
   end
 end
 
 srcdir = Removal.new(ARGV.shift)
-curdir = Removal.new
+curdir = !srcdir.base || File.identical?(srcdir.base, ".") ? srcdir : Removal.new
+
+bundled = File.readlines("#{srcdir.base}gems/bundled_gems").
+            grep(/^(\w\S+)\s+\S+(?:\s+\S+\s+(\S+))?/) {$~.captures}.to_h rescue nil
 
 srcdir.glob(".bundle/gems/*/") do |dir|
-  unless srcdir.exist?("gems/#{File.basename(dir)}.gem")
+  base = File.basename(dir)
+  next if !all && bundled && !bundled.key?(base[/\A.+(?=-)/])
+  unless srcdir.exist?("gems/#{base}.gem")
     srcdir.rmdir(dir)
   end
 end
 
+srcdir.glob(".bundle/.timestamp/*.revision") do |file|
+  unless bundled&.fetch(File.basename(file, ".revision"), nil)
+    srcdir.unlink(file)
+  end
+end
+
 srcdir.glob(".bundle/specifications/*.gemspec") do |spec|
   unless srcdir.directory?(".bundle/gems/#{File.basename(spec, '.gemspec')}/")
     srcdir.unlink(spec)
@@ -102,34 +151,40 @@ def each_directory
   end
 end
 
-platform = Gem::Platform.local.to_s
 curdir.glob(".bundle/{extensions,.timestamp}/*/") do |dir|
-  unless File.basename(dir) == platform
+  unless gem_platform and File.fnmatch?(gem_platform, File.basename(dir))
     curdir.rmdir(dir)
   end
 end
 
-baseruby_version = RbConfig::CONFIG['ruby_version'] # This may not have "-static"
-curdir.glob(".bundle/{extensions,.timestamp}/#{platform}/*/") do |dir|
-  version = File.basename(dir).split('-', 2).first # Remove "-static" if exists
-  unless version == baseruby_version
-    curdir.rmdir(dir)
+if gem_platform
+  curdir.glob(".bundle/{extensions,.timestamp}/#{gem_platform}/*/") do |dir|
+    unless ruby_version and File.fnmatch?(ruby_version, File.basename(dir, '-static'))
+      curdir.rmdir(dir)
+    end
   end
 end
 
-curdir.glob(".bundle/extensions/#{platform}/#{baseruby_version}/*/") do |dir|
-  unless curdir.exist?(".bundle/specifications/#{File.basename(dir)}.gemspec")
-    curdir.rmdir(dir)
+if ruby_version
+  curdir.glob(".bundle/extensions/#{gem_platform || '*'}/#{ruby_version}/*/") do |dir|
+    unless curdir.exist?(".bundle/specifications/#{File.basename(dir)}.gemspec")
+      curdir.rmdir(dir)
+    end
   end
-end
 
-curdir.glob(".bundle/.timestamp/#{platform}/#{baseruby_version}/.*.time") do |stamp|
-  unless curdir.directory?(File.join(".bundle", stamp[%r[/\.([^/]+)\.time\z], 1].gsub('.-.', '/')))
-    curdir.unlink(stamp)
+  curdir.glob(".bundle/.timestamp/#{gem_platform || '*'}/#{ruby_version}/.*.time") do |stamp|
+    dir = stamp[%r[/\.([^/]+)\.time\z], 1].gsub('.-.', '/')[%r[\A[^/]+/[^/]+]]
+    unless curdir.directory?(File.join(".bundle", dir))
+      curdir.unlink(stamp)
+    end
   end
 end
 
-srcdir.each_file {|f| fu.rm_f(f)}
-srcdir.each_directory {|d| fu.rm_rf(d)}
-curdir.each_file {|f| fu.rm_f(f)}
-curdir.each_directory {|d| fu.rm_rf(d)}
+unless only == "curdir"
+  srcdir.each_file {|f| fu.rm_f(f)}
+  srcdir.each_directory {|d| fu.rm_rf(d)}
+end
+unless only == "srcdir" or curdir.equal?(srcdir)
+  curdir.each_file {|f| fu.rm_f(f)}
+  curdir.each_directory {|d| fu.rm_rf(d)}
+end
diff --git a/tool/rakelib/sync_tool.rake b/tool/rakelib/sync_tool.rake
deleted file mode 100644
index 8ea8cb0ad257cf..00000000000000
--- a/tool/rakelib/sync_tool.rake
+++ /dev/null
@@ -1,17 +0,0 @@
-task :sync_tool, [:from] do |t, from: nil|
-  from ||= (File.identical?(__dir__, "rakelib") ? "../ruby/tool" : File.dirname(__dir__))
-
-  require 'fileutils'
-
-  {
-    "rakelib/sync_tool.rake" => "rakelib",
-    "lib/core_assertions.rb" => "test/lib",
-    "lib/envutil.rb" => "test/lib",
-    "lib/find_executable.rb" => "test/lib",
-    "lib/helper.rb" => "test/lib",
-  }.each do |src, dest|
-    FileUtils.mkpath(dest)
-    FileUtils.cp "#{from}/#{src}", dest
-  rescue Errno::ENOENT
-  end
-end
diff --git a/tool/rbinstall.rb b/tool/rbinstall.rb
index 90697bfe923b20..24c6234d843a6b 100755
--- a/tool/rbinstall.rb
+++ b/tool/rbinstall.rb
@@ -28,6 +28,7 @@
 rescue LoadError
   $" << "zlib.rb"
 end
+require_relative 'lib/path'
 
 INDENT = " "*36
 STDOUT.sync = true
@@ -96,6 +97,20 @@ def parse_args(argv = ARGV)
   opt.on('--gnumake') {gnumake = true}
   opt.on('--debug-symbols=SUFFIX', /\w+/) {|name| $debug_symbols = ".#{name}"}
 
+  unless $install_procs.empty?
+    w = (w = ENV["COLUMNS"] and (w = w.to_i) > 80) ? w - 30 : 50
+    opt.on("\n""Types for --install and --exclude:")
+    mesg = +" "
+    $install_procs.each_key do |t|
+      if mesg.size + t.size > w
+        opt.on(mesg)
+        mesg = +" "
+      end
+      mesg << " " << t.to_s
+    end
+    opt.on(mesg)
+  end
+
   opt.order!(argv) do |v|
     case v
     when /\AINSTALL[-_]([-\w]+)=(.*)/
@@ -135,6 +150,7 @@ def $mflags.defined?(var)
   end
 
   $destdir ||= $mflags.defined?("DESTDIR")
+  $destdir = File.expand_path($destdir) unless $destdir.empty?
   if $extout ||= $mflags.defined?("EXTOUT")
     RbConfig.expand($extout)
   end
@@ -157,6 +173,16 @@ def $mflags.defined?(var)
   end
 end
 
+Compressors = {".gz"=>"gzip", ".bz2"=>"bzip2"}
+def Compressors.for(type)
+  ext = File.extname(type)
+  if compress = fetch(ext, nil)
+    [type.chomp(ext), ext, compress]
+  else
+    [type, *find {|_, z| system(z, in: IO::NULL, out: IO::NULL)}]
+  end
+end
+
 $install_procs = Hash.new {[]}
 def install?(*types, &block)
   unless types.delete(:nodefault)
@@ -205,15 +231,20 @@ def ln_sf(src, dest)
 end
 
 $made_dirs = {}
+
+def dir_creating(dir)
+  $made_dirs.fetch(dir) do
+    $made_dirs[dir] = true
+    $installed_list.puts(File.join(dir, "")) if $installed_list
+    yield if defined?(yield)
+  end
+end
+
 def makedirs(dirs)
   dirs = fu_list(dirs)
   dirs.collect! do |dir|
     realdir = with_destdir(dir)
-    realdir unless $made_dirs.fetch(dir) do
-      $made_dirs[dir] = true
-      $installed_list.puts(File.join(dir, "")) if $installed_list
-      File.directory?(realdir)
-    end
+    realdir unless dir_creating(dir) {File.directory?(realdir)}
   end.compact!
   super(dirs, :mode => $dir_mode) unless dirs.empty?
 end
@@ -346,6 +377,9 @@ def CONFIG.[](name, mandatory = false)
 goruby_install_name = "go" + ruby_install_name
 
 bindir = CONFIG["bindir", true]
+if CONFIG["libdirname"] == "archlibdir"
+  archbindir = bindir.sub(%r[/\K(?=[^/]+\z)]) {CONFIG["config_target"] + "/"}
+end
 libdir = CONFIG[CONFIG.fetch("libdirname", "libdir"), true]
 rubyhdrdir = CONFIG["rubyhdrdir", true]
 archhdrdir = CONFIG["rubyarchhdrdir"] || (rubyhdrdir + "/" + CONFIG['arch'])
@@ -369,113 +403,13 @@ def CONFIG.[](name, mandatory = false)
 
 rdoc_noinst = %w[created.rid]
 
-install?(:local, :arch, :bin, :'bin-arch') do
-  prepare "binary commands", bindir
-
-  install ruby_install_name+exeext, bindir, :mode => $prog_mode, :strip => $strip
-  if rubyw_install_name and !rubyw_install_name.empty?
-    install rubyw_install_name+exeext, bindir, :mode => $prog_mode, :strip => $strip
-  end
-  # emcc produces ruby and ruby.wasm, the first is a JavaScript file of runtime support
-  # to load and execute the second .wasm file. Both are required to execute ruby
-  if RUBY_PLATFORM =~ /emscripten/ and File.exist? ruby_install_name+".wasm"
-    install ruby_install_name+".wasm", bindir, :mode => $prog_mode, :strip => $strip
-  end
-  if File.exist? goruby_install_name+exeext
-    install goruby_install_name+exeext, bindir, :mode => $prog_mode, :strip => $strip
-  end
-  if enable_shared and dll != lib
-    install dll, bindir, :mode => $prog_mode, :strip => $strip
-  end
-end
-
-install?(:local, :arch, :lib, :'lib-arch') do
-  prepare "base libraries", libdir
-
-  install lib, libdir, :mode => $prog_mode, :strip => $strip unless lib == arc
-  install arc, libdir, :mode => $data_mode unless CONFIG["INSTALL_STATIC_LIBRARY"] == "no"
-  if dll == lib and dll != arc
-    for link in CONFIG["LIBRUBY_ALIASES"].split - [File.basename(dll)]
-      ln_sf(dll, File.join(libdir, link))
-    end
-  end
-
-  prepare "arch files", archlibdir
-  install "rbconfig.rb", archlibdir, :mode => $data_mode
-  if CONFIG["ARCHFILE"]
-    for file in CONFIG["ARCHFILE"].split
-      install file, archlibdir, :mode => $data_mode
-    end
-  end
-end
-
-install?(:local, :arch, :data) do
-  pc = CONFIG["ruby_pc"]
-  if pc and File.file?(pc) and File.size?(pc)
-    prepare "pkgconfig data", pkgconfigdir = File.join(libdir, "pkgconfig")
-    install pc, pkgconfigdir, :mode => $data_mode
-  end
-end
-
-install?(:ext, :arch, :'ext-arch') do
-  prepare "extension objects", archlibdir
-  noinst = %w[-* -*/] | (CONFIG["no_install_files"] || "").split
-  install_recursive("#{$extout}/#{CONFIG['arch']}", archlibdir, :no_install => noinst, :mode => $prog_mode, :strip => $strip)
-  prepare "extension objects", sitearchlibdir
-  prepare "extension objects", vendorarchlibdir
-  if extso = File.read("exts.mk")[/^EXTSO[ \t]*=[ \t]*((?:.*\\\n)*.*)/, 1] and
-    !(extso = extso.gsub(/\\\n/, '').split).empty?
-    libpathenv = CONFIG["LIBPATHENV"]
-    dest = CONFIG[!libpathenv || libpathenv == "PATH" ? "bindir" : "libdir"]
-    prepare "external libraries", dest
-    for file in extso
-      install file, dest, :mode => $prog_mode
-    end
-  end
-end
-install?(:ext, :arch, :hdr, :'arch-hdr', :'hdr-arch') do
-  prepare "extension headers", archhdrdir
-  install_recursive("#{$extout}/include/#{CONFIG['arch']}", archhdrdir, :glob => "*.h", :mode => $data_mode)
-  install_recursive("#{$extout}/include/#{CONFIG['arch']}", archhdrdir, :glob => "rb_rjit_header-*.obj", :mode => $data_mode)
-  install_recursive("#{$extout}/include/#{CONFIG['arch']}", archhdrdir, :glob => "rb_rjit_header-*.pch", :mode => $data_mode)
-end
-install?(:ext, :comm, :'ext-comm') do
-  prepare "extension scripts", rubylibdir
-  install_recursive("#{$extout}/common", rubylibdir, :mode => $data_mode)
-  prepare "extension scripts", sitelibdir
-  prepare "extension scripts", vendorlibdir
-end
-install?(:ext, :comm, :hdr, :'comm-hdr', :'hdr-comm') do
-  hdrdir = rubyhdrdir + "/ruby"
-  prepare "extension headers", hdrdir
-  install_recursive("#{$extout}/include/ruby", hdrdir, :glob => "*.h", :mode => $data_mode)
-end
-
-install?(:doc, :rdoc) do
-  if $rdocdir
-    ridatadir = File.join(CONFIG['ridir'], CONFIG['ruby_version'], "system")
-    prepare "rdoc", ridatadir
-    install_recursive($rdocdir, ridatadir, :no_install => rdoc_noinst, :mode => $data_mode)
-  end
-end
-install?(:doc, :html) do
-  if $htmldir
-    prepare "html-docs", docdir
-    install_recursive($htmldir, docdir+"/html", :no_install => rdoc_noinst, :mode => $data_mode)
-  end
-end
-install?(:doc, :capi) do
-  prepare "capi-docs", docdir
-  install_recursive "doc/capi", docdir+"/capi", :mode => $data_mode
-end
-
 prolog_script = <<EOS
 bindir="#{load_relative ? '${0%/*}' : bindir.gsub(/\"/, '\\\\"')}"
 EOS
-if CONFIG["LIBRUBY_RELATIVE"] != 'yes' and libpathenv = CONFIG["LIBPATHENV"]
+if !load_relative and libpathenv = CONFIG["LIBPATHENV"]
   pathsep = File::PATH_SEPARATOR
   prolog_script << <<EOS
-libdir="#{load_relative ? '$\{bindir%/bin\}/lib' : libdir.gsub(/\"/, '\\\\"')}"
+libdir="#{libdir.gsub(/\"/, '\\\\"')}"
 export #{libpathenv}="$libdir${#{libpathenv}:+#{pathsep}$#{libpathenv}}"
 EOS
 end
@@ -584,129 +518,6 @@ def stub
   break new(ruby_shebang, ruby_bin, ruby_install_name, nil, trans)
 end
 
-install?(:local, :comm, :bin, :'bin-comm') do
-  prepare "command scripts", bindir
-
-  install_recursive(File.join(srcdir, "bin"), bindir, :maxdepth => 1) do |src, cmd|
-    $script_installer.install(src, cmd)
-  end
-end
-
-install?(:local, :comm, :lib) do
-  prepare "library scripts", rubylibdir
-  noinst = %w[*.txt *.rdoc *.gemspec]
-  install_recursive(File.join(srcdir, "lib"), rubylibdir, :no_install => noinst, :mode => $data_mode)
-end
-
-install?(:local, :comm, :hdr, :'comm-hdr') do
-  prepare "common headers", rubyhdrdir
-
-  noinst = []
-  unless RUBY_PLATFORM =~ /mswin|mingw|bccwin/
-    noinst << "win32.h"
-  end
-  noinst = nil if noinst.empty?
-  install_recursive(File.join(srcdir, "include"), rubyhdrdir, :no_install => noinst, :glob => "*.{h,hpp}", :mode => $data_mode)
-end
-
-install?(:local, :comm, :man) do
-  mdocs = Dir["#{srcdir}/man/*.[1-9]"]
-  prepare "manpages", mandir, ([] | mdocs.collect {|mdoc| mdoc[/\d+$/]}).sort.collect {|sec| "man#{sec}"}
-
-  case $mantype
-  when /\.(?:(gz)|bz2)\z/
-    compress = $1 ? "gzip" : "bzip2"
-    suffix = $&
-  end
-  mandir = File.join(mandir, "man")
-  has_goruby = File.exist?(goruby_install_name+exeext)
-  require File.join(srcdir, "tool/mdoc2man.rb") if /\Adoc\b/ !~ $mantype
-  mdocs.each do |mdoc|
-    next unless File.file?(mdoc) and File.read(mdoc, 1) == '.'
-    base = File.basename(mdoc)
-    if base == "goruby.1"
-      next unless has_goruby
-    end
-
-    destdir = mandir + (section = mdoc[/\d+$/])
-    destname = ruby_install_name.sub(/ruby/, base.chomp(".#{section}"))
-    destfile = File.join(destdir, "#{destname}.#{section}")
-
-    if /\Adoc\b/ =~ $mantype
-      if compress
-        begin
-          w = IO.popen(compress, "rb", in: mdoc, &:read)
-        rescue
-        else
-          destfile << suffix
-        end
-      end
-      if w
-        open_for_install(destfile, $data_mode) {w}
-      else
-        install mdoc, destfile, :mode => $data_mode
-      end
-    else
-      class << (w = [])
-        alias print push
-      end
-      if File.basename(mdoc).start_with?('bundle') ||
-         File.basename(mdoc).start_with?('gemfile')
-        w = File.read(mdoc)
-      else
-        File.open(mdoc) {|r| Mdoc2Man.mdoc2man(r, w)}
-        w = w.join("")
-      end
-      if compress
-        begin
-          w = IO.popen(compress, "r+b") do |f|
-            Thread.start {f.write w; f.close_write}
-            f.read
-          end
-        rescue
-        else
-          destfile << suffix
-        end
-      end
-      open_for_install(destfile, $data_mode) {w}
-    end
-  end
-end
-
-install?(:dbg, :nodefault) do
-  prepare "debugger commands", bindir
-  prepare "debugger scripts", rubylibdir
-  conf = RbConfig::MAKEFILE_CONFIG.merge({"prefix"=>"${prefix#/}"})
-  Dir.glob(File.join(srcdir, "template/ruby-*db.in")) do |src|
-    cmd = $script_installer.transform(File.basename(src, ".in"))
-    open_for_install(File.join(bindir, cmd), $script_mode) {
-      RbConfig.expand(File.read(src), conf)
-    }
-  end
-  Dir.glob(File.join(srcdir, "misc/lldb_*")) do |src|
-    if File.directory?(src)
-      install_recursive src, File.join(rubylibdir, File.basename(src))
-    else
-      install src, rubylibdir
-    end
-  end
-  install File.join(srcdir, ".gdbinit"), File.join(rubylibdir, "gdbinit")
-  if $debug_symbols
-    {
-      ruby_install_name => bindir,
-      rubyw_install_name => bindir,
-      goruby_install_name => bindir,
-      dll => libdir,
-    }.each do |src, dest|
-      next if src.empty?
-      src += $debug_symbols
-      if File.directory?(src)
-        install_recursive src, File.join(dest, src)
-      end
-    end
-  end
-end
-
 module RbInstall
   def self.no_write(options = nil)
     u = File.umask(0022)
@@ -716,6 +527,8 @@ def self.no_write(options = nil)
         const_set(:FileUtils, fu::NoWrite)
         fu
       end
+      # RubyGems 3.0.0 or later supports `dir_mode`, but it uses
+      # `File` method to apply it, not `FileUtils`.
       dir_mode = options.delete(:dir_mode) if options
     end
     yield
@@ -745,47 +558,119 @@ def initialize(gemspec, srcdir, relative_base)
       end
 
       def collect
-        ruby_libraries.sort
+        requirable_features.sort
+      end
+
+      private
+
+      def features_from_makefile(makefile_path)
+        makefile = File.read(makefile_path)
+
+        name = makefile[/^TARGET[ \t]*=[ \t]*((?:.*\\\n)*.*)/, 1]
+        return [] if name.nil? || name.empty?
+
+        feature = makefile[/^DLLIB[ \t]*=[ \t]*((?:.*\\\n)*.*)/, 1]
+        feature = feature.sub("$(TARGET)", name)
+
+        target_prefix = makefile[/^target_prefix[ \t]*=[ \t]*((?:.*\\\n)*.*)/, 1]
+        feature = File.join(target_prefix.delete_prefix("/"), feature) unless target_prefix.empty?
+
+        Array(feature)
       end
 
       class Ext < self
-        def skip_install?(files)
+        def requirable_features
           # install ext only when it's configured
-          !File.exist?("#{$ext_build_dir}/#{relative_base}/Makefile")
+          return [] unless File.exist?(makefile_path)
+
+          ruby_features + ext_features
+        end
+
+        private
+
+        def ruby_features
+          Dir.glob("**/*.rb", base: "#{makefile_dir}/lib")
         end
 
-        def ruby_libraries
-          Dir.glob("lib/**/*.rb", base: "#{srcdir}/ext/#{relative_base}")
+        def ext_features
+          features_from_makefile(makefile_path)
+        end
+
+        def makefile_path
+          if File.exist?("#{makefile_dir}/Makefile")
+            "#{makefile_dir}/Makefile"
+          else
+            # for out-of-place build
+            "#{$ext_build_dir}/#{relative_base}/Makefile"
+          end
+        end
+
+        def makefile_dir
+          "#{root}/#{relative_base}"
+        end
+
+        def root
+          File.expand_path($ext_build_dir, srcdir)
         end
       end
 
       class Lib < self
-        def skip_install?(files)
-          files.empty?
+        def requirable_features
+          ruby_features + ext_features
         end
 
-        def ruby_libraries
+        private
+
+        def ruby_features
           gemname = File.basename(gemspec, ".gemspec")
           base = relative_base || gemname
           # for lib/net/net-smtp.gemspec
           if m = /.*(?=-(.*)\z)/.match(gemname)
             base = File.join(base, *m.to_a.select {|n| !base.include?(n)})
           end
-          files = Dir.glob("lib/#{base}{.rb,/**/*.rb}", base: srcdir)
+          files = Dir.glob("#{base}{.rb,/**/*.rb}", base: root)
           if !relative_base and files.empty? # no files at the toplevel
             # pseudo gem like ruby2_keywords
-            files << "lib/#{gemname}.rb"
+            files << "#{gemname}.rb"
           end
 
           case gemname
           when "net-http"
-            files << "lib/net/https.rb"
+            files << "net/https.rb"
           when "optparse"
-            files << "lib/optionparser.rb"
+            files << "optionparser.rb"
           end
 
           files
         end
+
+        def ext_features
+          loaded_gemspec = load_gemspec("#{root}/#{gemspec}")
+          extension = loaded_gemspec.extensions.first
+          return [] unless extension
+
+          extconf = File.expand_path(extension, srcdir)
+          ext_build_dir = File.dirname(extconf)
+          makefile_path = "#{ext_build_dir}/Makefile"
+          return [] unless File.exist?(makefile_path)
+
+          features_from_makefile(makefile_path)
+        end
+
+        def root
+          "#{srcdir}/lib"
+        end
+      end
+
+      class UnpackedGem < self
+        def collect
+          base = @srcdir or return []
+          Dir.glob("**/*", File::FNM_DOTMATCH, base: base).select do |n|
+            next if n == "."
+            next if File.fnmatch?("*.gemspec", n, File::FNM_DOTMATCH|File::FNM_PATHNAME)
+            !File.directory?(File.join(base, n))
+          end
+        end
       end
     end
   end
@@ -823,10 +708,7 @@ def extract_files(destination_dir, pattern = "*")
     end
   end
 
-  class GemInstaller < Gem::Installer
-  end
-
-  class UnpackedInstaller < GemInstaller
+  class UnpackedInstaller < Gem::Installer
     def write_cache_file
     end
 
@@ -850,11 +732,6 @@ def check_executable_overwrite(filename)
       super
     end
 
-    def generate_bin_script(filename, bindir)
-      return if same_bin_script?(filename, bindir)
-      super
-    end
-
     def same_bin_script?(filename, bindir)
       path = File.join(bindir, formatted_program_filename(filename))
       begin
@@ -873,11 +750,10 @@ def write_default_spec
       super unless $dryrun
       $installed_list.puts(without_destdir(default_spec_file)) if $installed_list
     end
-  end
 
-  class GemInstaller
     def install
       spec.post_install_message = nil
+      dir_creating(without_destdir(gem_dir))
       RbInstall.no_write(options) {super}
     end
 
@@ -886,10 +762,13 @@ def build_extensions
     end
 
     def generate_bin_script(filename, bindir)
+      return if same_bin_script?(filename, bindir)
       name = formatted_program_filename(filename)
       unless $dryrun
         super
-        File.chmod($script_mode, File.join(bindir, name))
+        script = File.join(bindir, name)
+        File.chmod($script_mode, script)
+        File.unlink("#{script}.lock") rescue nil
       end
       $installed_list.puts(File.join(without_destdir(bindir), name)) if $installed_list
     end
@@ -904,38 +783,36 @@ def ensure_writable_dir(dir)
         $installed_list.puts(d+"/") if $installed_list
       end
     end
-  end
-end
-
-# :startdoc:
 
-install?(:ext, :comm, :gem, :'default-gems', :'default-gems-comm') do
-  install_default_gem('lib', srcdir, bindir)
-end
-install?(:ext, :arch, :gem, :'default-gems', :'default-gems-arch') do
-  install_default_gem('ext', srcdir, bindir)
+    def load_plugin
+      # Suppress warnings for constant re-assignment
+      verbose, $VERBOSE = $VERBOSE, nil
+      super
+    ensure
+      $VERBOSE = verbose
+    end
+  end
 end
 
-def load_gemspec(file, base = nil)
+def load_gemspec(file, base = nil, files: nil)
   file = File.realpath(file)
   code = File.read(file, encoding: "utf-8:-")
-  code.gsub!(/(?:`git[^\`]*`|%x\[git[^\]]*\])\.split\([^\)]*\)/m) do
-    files = []
-    if base
-      Dir.glob("**/*", File::FNM_DOTMATCH, base: base) do |n|
-        case File.basename(n); when ".", ".."; next; end
-        next if File.directory?(File.join(base, n))
-        files << n.dump
-      end
-    end
-    "[" + files.join(", ") + "]"
+
+  code.gsub!(/^ *#.*/, "")
+  files = files ? files.map(&:dump).join(", ") : ""
+  code.gsub!(/(?:`git[^\`]*`|%x\[git[^\]]*\])\.split(\([^\)]*\))?/m) do
+    "[" + files + "]"
+  end \
+  or
+  code.gsub!(/IO\.popen\(.*git.*?\)/) do
+    "[" + files + "] || itself"
   end
+
   spec = eval(code, binding, file)
   unless Gem::Specification === spec
     raise TypeError, "[#{file}] isn't a Gem::Specification (#{spec.class} instead)."
   end
   spec.loaded_from = base ? File.join(base, File.basename(file)) : file
-  spec.files.reject! {|n| n.end_with?(".gemspec") or n.start_with?(".git")}
   spec.date = RUBY_RELEASE_DATE
 
   spec
@@ -946,6 +823,7 @@ def install_default_gem(dir, srcdir, bindir)
   install_dir = with_destdir(gem_dir)
   prepare "default gems from #{dir}", gem_dir
   RbInstall.no_write do
+    # Record making directories
     makedirs(Gem.ensure_default_gem_subdirectories(install_dir, $dir_mode).map {|d| File.join(gem_dir, d)})
   end
 
@@ -964,14 +842,11 @@ def install_default_gem(dir, srcdir, bindir)
 
   base = "#{srcdir}/#{dir}"
   gems = Dir.glob("**/*.gemspec", base: base).map {|src|
-    spec = load_gemspec("#{base}/#{src}")
-    file_collector = RbInstall::Specs::FileCollector.for(srcdir, dir, src)
-    files = file_collector.collect
-    if file_collector.skip_install?(files)
+    files = RbInstall::Specs::FileCollector.for(srcdir, dir, src).collect
+    if files.empty?
       next
     end
-    spec.files = files
-    spec
+    load_gemspec("#{base}/#{src}", files: files)
   }
   gems.compact.sort_by(&:name).each do |gemspec|
     old_gemspecs = Dir[File.join(with_destdir(default_spec_dir), "#{gemspec.name}-*.gemspec")]
@@ -990,11 +865,260 @@ def install_default_gem(dir, srcdir, bindir)
   end
 end
 
+def mdoc_file?(mdoc)
+  /^\.Nm / =~ File.read(mdoc, 1024)
+end
+
+# :startdoc:
+
+install?(:local, :arch, :bin, :'bin-arch') do
+  prepare "binary commands", (dest = archbindir || bindir)
+
+  def (bins = []).add(name)
+    push(name)
+    name
+  end
+
+  install bins.add(ruby_install_name+exeext), dest, :mode => $prog_mode, :strip => $strip
+  if rubyw_install_name and !rubyw_install_name.empty?
+    install bins.add(rubyw_install_name+exeext), dest, :mode => $prog_mode, :strip => $strip
+  end
+  # emcc produces ruby and ruby.wasm, the first is a JavaScript file of runtime support
+  # to load and execute the second .wasm file. Both are required to execute ruby
+  if RUBY_PLATFORM =~ /emscripten/ and File.exist? ruby_install_name+".wasm"
+    install bins.add(ruby_install_name+".wasm"), dest, :mode => $prog_mode, :strip => $strip
+  end
+  if File.exist? goruby_install_name+exeext
+    install bins.add(goruby_install_name+exeext), dest, :mode => $prog_mode, :strip => $strip
+  end
+  if enable_shared and dll != lib
+    install bins.add(dll), dest, :mode => $prog_mode, :strip => $strip
+  end
+  if archbindir
+    prepare "binary command links", bindir
+    relpath = Path.relative(archbindir, bindir)
+    bins.each do |f|
+      ln_sf(File.join(relpath, f), File.join(bindir, f))
+    end
+  end
+end
+
+install?(:local, :arch, :lib, :'lib-arch') do
+  prepare "base libraries", libdir
+
+  install lib, libdir, :mode => $prog_mode, :strip => $strip unless lib == arc
+  install arc, libdir, :mode => $data_mode unless CONFIG["INSTALL_STATIC_LIBRARY"] == "no"
+  if dll == lib and dll != arc
+    for link in CONFIG["LIBRUBY_ALIASES"].split - [File.basename(dll)]
+      ln_sf(dll, File.join(libdir, link))
+    end
+  end
+
+  prepare "arch files", archlibdir
+  install "rbconfig.rb", archlibdir, :mode => $data_mode
+  if CONFIG["ARCHFILE"]
+    for file in CONFIG["ARCHFILE"].split
+      install file, archlibdir, :mode => $data_mode
+    end
+  end
+end
+
+install?(:local, :arch, :data) do
+  pc = CONFIG["ruby_pc"]
+  if pc and File.file?(pc) and File.size?(pc)
+    prepare "pkgconfig data", pkgconfigdir = File.join(libdir, "pkgconfig")
+    install pc, pkgconfigdir, :mode => $data_mode
+    if (pkgconfig_base = CONFIG["libdir", true]) != libdir
+      prepare "pkgconfig data link", File.join(pkgconfig_base, "pkgconfig")
+      ln_sf(File.join("..", Path.relative(pkgconfigdir, pkgconfig_base), pc),
+            File.join(pkgconfig_base, "pkgconfig", pc))
+    end
+  end
+end
+
+install?(:ext, :arch, :'ext-arch') do
+  prepare "extension objects", archlibdir
+  noinst = %w[-* -*/] | (CONFIG["no_install_files"] || "").split
+  install_recursive("#{$extout}/#{CONFIG['arch']}", archlibdir, :no_install => noinst, :mode => $prog_mode, :strip => $strip)
+  prepare "extension objects", sitearchlibdir
+  prepare "extension objects", vendorarchlibdir
+  if extso = File.read("exts.mk")[/^EXTSO[ \t]*=[ \t]*((?:.*\\\n)*.*)/, 1] and
+    !(extso = extso.gsub(/\\\n/, '').split).empty?
+    libpathenv = CONFIG["LIBPATHENV"]
+    dest = CONFIG[!libpathenv || libpathenv == "PATH" ? "bindir" : "libdir"]
+    prepare "external libraries", dest
+    for file in extso
+      install file, dest, :mode => $prog_mode
+    end
+  end
+end
+
+install?(:ext, :arch, :hdr, :'arch-hdr', :'hdr-arch') do
+  prepare "extension headers", archhdrdir
+  install_recursive("#{$extout}/include/#{CONFIG['arch']}", archhdrdir, :glob => "*.h", :mode => $data_mode)
+end
+
+install?(:ext, :comm, :'ext-comm') do
+  prepare "extension scripts", rubylibdir
+  install_recursive("#{$extout}/common", rubylibdir, :mode => $data_mode)
+  prepare "extension scripts", sitelibdir
+  prepare "extension scripts", vendorlibdir
+end
+
+install?(:ext, :comm, :hdr, :'comm-hdr', :'hdr-comm') do
+  hdrdir = rubyhdrdir + "/ruby"
+  prepare "extension headers", hdrdir
+  install_recursive("#{$extout}/include/ruby", hdrdir, :glob => "*.h", :mode => $data_mode)
+end
+
+install?(:doc, :rdoc) do
+  if $rdocdir
+    ridatadir = File.join(CONFIG['ridir'], CONFIG['ruby_version'], "system")
+    prepare "rdoc", ridatadir
+    install_recursive($rdocdir, ridatadir, :no_install => rdoc_noinst, :mode => $data_mode)
+  end
+end
+
+install?(:doc, :html) do
+  if $htmldir
+    prepare "html-docs", docdir
+    install_recursive($htmldir, docdir+"/html", :no_install => rdoc_noinst, :mode => $data_mode)
+  end
+end
+
+install?(:doc, :capi) do
+  prepare "capi-docs", docdir
+  install_recursive "doc/capi", docdir+"/capi", :mode => $data_mode
+end
+
+install?(:local, :comm, :bin, :'bin-comm') do
+  prepare "command scripts", bindir
+
+  install_recursive(File.join(srcdir, "bin"), bindir, :maxdepth => 1) do |src, cmd|
+    $script_installer.install(src, cmd)
+  end
+end
+
+install?(:local, :comm, :lib) do
+  prepare "library scripts", rubylibdir
+  noinst = %w[*.txt *.rdoc *.gemspec]
+  install_recursive(File.join(srcdir, "lib"), rubylibdir, :no_install => noinst, :mode => $data_mode)
+end
+
+install?(:local, :comm, :hdr, :'comm-hdr') do
+  prepare "common headers", rubyhdrdir
+
+  noinst = []
+  unless RUBY_PLATFORM =~ /mswin|mingw|bccwin/
+    noinst << "win32.h"
+  end
+  noinst = nil if noinst.empty?
+  install_recursive(File.join(srcdir, "include"), rubyhdrdir, :no_install => noinst, :glob => "*.{h,hpp}", :mode => $data_mode)
+end
+
+install?(:local, :comm, :man) do
+  mdocs = Dir["#{srcdir}/man/*.[1-9]"]
+  prepare "manpages", mandir, ([] | mdocs.collect {|mdoc| mdoc[/\d+$/]}).sort.collect {|sec| "man#{sec}"}
+
+  mantype, suffix, compress = Compressors.for($mantype)
+  mandir = File.join(mandir, "man")
+  has_goruby = File.exist?(goruby_install_name+exeext)
+  require File.join(srcdir, "tool/mdoc2man.rb") if /\Adoc\b/ !~ mantype
+  mdocs.each do |mdoc|
+    next unless File.file?(mdoc) and File.read(mdoc, 1) == '.'
+    base = File.basename(mdoc)
+    if base == "goruby.1"
+      next unless has_goruby
+    end
+
+    destdir = mandir + (section = mdoc[/\d+$/])
+    destname = ruby_install_name.sub(/ruby/, base.chomp(".#{section}"))
+    destfile = File.join(destdir, "#{destname}.#{section}")
+
+    if /\Adoc\b/ =~ mantype or !mdoc_file?(mdoc)
+      if compress
+        begin
+          w = IO.popen(compress, "rb", in: mdoc, &:read)
+        rescue
+        else
+          destfile << suffix
+        end
+      end
+      if w
+        open_for_install(destfile, $data_mode) {w}
+      else
+        install mdoc, destfile, :mode => $data_mode
+      end
+    else
+      class << (w = [])
+        alias print push
+      end
+      File.open(mdoc) {|r| Mdoc2Man.mdoc2man(r, w)}
+      w = w.join("")
+      if compress
+        begin
+          w = IO.popen(compress, "r+b") do |f|
+            Thread.start {f.write w; f.close_write}
+            f.read
+          end
+        rescue
+        else
+          destfile << suffix
+        end
+      end
+      open_for_install(destfile, $data_mode) {w}
+    end
+  end
+end
+
+install?(:dbg, :nodefault) do
+  prepare "debugger commands", bindir
+  prepare "debugger scripts", rubylibdir
+  conf = MAKEFILE_CONFIG.merge({"prefix"=>"${prefix#/}"})
+  Dir.glob(File.join(srcdir, "template/ruby-*db.in")) do |src|
+    cmd = $script_installer.transform(File.basename(src, ".in"))
+    open_for_install(File.join(bindir, cmd), $script_mode) {
+      RbConfig.expand(File.read(src), conf)
+    }
+  end
+  Dir.glob(File.join(srcdir, "misc/lldb_*")) do |src|
+    if File.directory?(src)
+      install_recursive src, File.join(rubylibdir, File.basename(src))
+    else
+      install src, rubylibdir
+    end
+  end
+  install File.join(srcdir, ".gdbinit"), File.join(rubylibdir, "gdbinit")
+  if $debug_symbols
+    {
+      ruby_install_name => archbindir || bindir,
+      rubyw_install_name => archbindir || bindir,
+      goruby_install_name => archbindir || bindir,
+      dll => libdir,
+    }.each do |src, dest|
+      next if src.empty?
+      src += $debug_symbols
+      if File.directory?(src)
+        install_recursive src, File.join(dest, src)
+      end
+    end
+  end
+end
+
+install?(:ext, :comm, :gem, :'default-gems', :'default-gems-comm') do
+  install_default_gem('lib', srcdir, bindir)
+end
+
+install?(:ext, :arch, :gem, :'default-gems', :'default-gems-arch') do
+  install_default_gem('ext', srcdir, bindir)
+end
+
 install?(:ext, :comm, :gem, :'bundled-gems') do
   gem_dir = Gem.default_dir
   install_dir = with_destdir(gem_dir)
   prepare "bundled gems", gem_dir
   RbInstall.no_write do
+    # Record making directories
     makedirs(Gem.ensure_gem_subdirectories(install_dir, $dir_mode).map {|d| File.join(gem_dir, d)})
   end
 
@@ -1023,22 +1147,30 @@ def install_default_gem(dir, srcdir, bindir)
   # the newly installed ruby.
   ENV.delete('RUBYOPT')
 
+  collector = RbInstall::Specs::FileCollector::UnpackedGem
   File.foreach("#{srcdir}/gems/bundled_gems") do |name|
     next if /^\s*(?:#|$)/ =~ name
     next unless /^(\S+)\s+(\S+).*/ =~ name
+    gem = $1
     gem_name = "#$1-#$2"
-    # Try to find the gemspec file for C ext gems
-    # ex .bundle/gems/debug-1.7.1/debug-1.7.1.gemspec
-    # This gemspec keep the original dependencies
-    path = "#{srcdir}/.bundle/gems/#{gem_name}/#{gem_name}.gemspec"
-    unless File.exist?(path)
-      path = "#{srcdir}/.bundle/specifications/#{gem_name}.gemspec"
-      unless File.exist?(path)
-         skipped[gem_name] = "gemspec not found"
-         next
-      end
+    path = [
+      # gemspec that removed duplicated dependencies of bundled gems
+      "#{srcdir}/.bundle/gems/#{gem_name}/#{gem}.gemspec",
+      # gemspec for C ext gems, It has the original dependencies
+      # ex .bundle/gems/debug-1.7.1/debug-1.7.1.gemspec
+      "#{srcdir}/.bundle/gems/#{gem_name}/#{gem_name}.gemspec",
+      # original gemspec generated by rubygems
+      "#{srcdir}/.bundle/specifications/#{gem_name}.gemspec"
+    ].find { |gemspec| File.exist?(gemspec) }
+    if path.nil?
+      skipped[gem_name] = "gemspec not found"
+      next
     end
-    spec = load_gemspec(path, "#{srcdir}/.bundle/gems/#{gem_name}")
+    base = "#{srcdir}/.bundle/gems/#{gem_name}"
+    files = collector.new(path, base, nil).collect
+    files.delete("#{gem}.gemspec")
+    files.delete("#{gem_name}.gemspec")
+    spec = load_gemspec(path, base, files: files)
     unless spec.platform == Gem::Platform::RUBY
       skipped[gem_name] = "not ruby platform (#{spec.platform})"
       next
@@ -1047,7 +1179,13 @@ def install_default_gem(dir, srcdir, bindir)
       skipped[gem_name] = "full name unmatch #{spec.full_name}"
       next
     end
+    # Skip install C ext bundled gem if it is build failed or not found
+    if !spec.extensions.empty? && !File.exist?("#{build_dir}/#{gem_name}/gem.build_complete")
+      skipped[gem_name] = "extensions not found or build failed #{spec.full_name}"
+      next
+    end
     spec.extension_dir = "#{extensions_dir}/#{spec.full_name}"
+
     package = RbInstall::DirPackage.new spec
     ins = RbInstall::UnpackedInstaller.new(package, options)
     puts "#{INDENT}#{spec.name} #{spec.version}"
@@ -1067,11 +1205,21 @@ def install_default_gem(dir, srcdir, bindir)
     skipped.default = "not found in bundled_gems"
     puts "skipped bundled gems:"
     gems.each do |gem|
-      printf "    %-32s%s\n", File.basename(gem), skipped[gem]
+      gem = File.basename(gem)
+      printf "    %-31s %s\n", gem, skipped[gem.chomp(".gem")]
     end
   end
 end
 
+install?('modular-gc') do
+  if modular_gc_dir = CONFIG['modular_gc_dir'] and !modular_gc_dir.empty?
+    dlext = CONFIG['DLEXT', true]
+    modular_gc_dir = File.expand_path(modular_gc_dir, CONFIG['prefix'])
+    prepare "modular GC library", modular_gc_dir
+    install Dir.glob("gc/*/librubygc.*.#{dlext}"), modular_gc_dir
+  end
+end
+
 parse_args()
 
 include FileUtils
@@ -1088,7 +1236,6 @@ def install_default_gem(dir, srcdir, bindir)
 end
 installs.flatten!
 installs -= $exclude.map {|exc| $install_procs[exc]}.flatten
-puts "Installing to #$destdir" unless installs.empty?
 installs.each do |block|
   dir = Dir.pwd
   begin
@@ -1097,5 +1244,9 @@ def install_default_gem(dir, srcdir, bindir)
     Dir.chdir(dir)
   end
 end
+unless installs.empty? or $destdir.empty?
+  require_relative 'lib/colorize'
+  puts "Installed under #{Colorize.new.info($destdir)}"
+end
 
 # vi:set sw=2:
diff --git a/tool/rbs_skip_tests b/tool/rbs_skip_tests
index 7a67e156ef55fe..e8a10cf1459fee 100644
--- a/tool/rbs_skip_tests
+++ b/tool/rbs_skip_tests
@@ -15,21 +15,67 @@
 #   $(test-class-name) ` ` $(optional comment)   # Skipping a test class
 #
 
-test_replicate(EncodingTest) the method was removed in 3.3
+## Failed tests because of testing environment
 
 test_collection_install(RBS::CliTest) running tests without Bundler
+test_collection_install__mutex_m__bundled(RBS::CliTest) running tests without Bundler
+test_collection_install__mutex_m__config__bundled(RBS::CliTest) running tests without Bundler
+test_collection_install__mutex_m__config__no_bundled(RBS::CliTest) running tests without Bundler
+test_collection_install__mutex_m__config__stdlib_source(RBS::CliTest) running tests without Bundler
+test_collection_install__mutex_m__dependency_no_bundled(RBS::CliTest) running tests without Bundler
+test_collection_install__mutex_m__no_bundled(RBS::CliTest) running tests without Bundler
+test_collection_install__mutex_m__rbs_dependency_and__gem_dependency(RBS::CliTest) running tests without Bundler
 test_collection_install_frozen(RBS::CliTest) running tests without Bundler
 test_collection_install_gemspec(RBS::CliTest) running tests without Bundler
 test_collection_update(RBS::CliTest) running tests without Bundler
-test_subtract(RBS::CliTest) running tests without Bundler
-test_subtract_several_subtrahends(RBS::CliTest) running tests without Bundler
-test_subtract_write(RBS::CliTest) running tests without Bundler
-test_subtract_write_removes_definition_if_empty(RBS::CliTest) runnint tests without Bundler
-
-test_aref(FiberSingletonTest) the method should not accept String keys
 
 NetSingletonTest depending on external resources
 NetInstanceTest depending on external resources
 TestHTTPRequest depending on external resources
 TestSingletonNetHTTPResponse depending on external resources
 TestInstanceNetHTTPResponse depending on external resources
+
+test_TOPDIR(RbConfigSingletonTest) `TOPDIR` is `nil` during CI while RBS type is declared as `String`
+
+## Unknown failures
+
+# NoMethodError: undefined method 'inspect' for an instance of RBS::UnitTest::Convertibles::ToInt
+test_compile(RegexpSingletonTest)
+test_linear_time?(RegexpSingletonTest)
+test_new(RegexpSingletonTest)
+
+## Failed tests caused by unreleased version of Ruby
+
+# https://github.com/ruby/openssl/pull/774
+test_params(OpenSSLDHTest)
+
+# RBS isn't compatible with RDoc 6.13
+RDocPluginParserTest
+
+# https://github.com/ruby/json/pull/773
+test_load(JSONInstanceTest)
+test_load(JSONSingletonTest)
+
+# https://github.com/ruby/json/pull/775
+test_fast_unparse(JSONInstanceTest)
+test_pretty_unparse(JSONInstanceTest)
+test_restore(JSONInstanceTest)
+test_unparse(JSONInstanceTest)
+test_fast_unparse(JSONSingletonTest)
+test_pretty_unparse(JSONSingletonTest)
+test_restore(JSONSingletonTest)
+test_unparse(JSONSingletonTest)
+
+# https://github.com/ruby/json/pull/779
+test_iconv(JSONSingletonTest)
+
+# https://github.com/ruby/json/pull/774
+test_recurse_proc(JSONInstanceTest)
+test_recurse_proc(JSONSingletonTest)
+
+CGITest CGI is retired
+CGISingletonTest CGI is retired
+
+RactorSingletonTest Ractor API was changed https://bugs.ruby-lang.org/issues/21262
+RactorInstanceTest  Ractor API was changed https://bugs.ruby-lang.org/issues/21262
+
diff --git a/tool/rbuninstall.rb b/tool/rbuninstall.rb
index f0c286012cfd26..60f5241a4f58e3 100755
--- a/tool/rbuninstall.rb
+++ b/tool/rbuninstall.rb
@@ -21,15 +21,33 @@
   end
   $dirs = []
   $files = []
+  COLUMNS = $tty && (ENV["COLUMNS"]&.to_i || begin require 'io/console/size'; rescue; else IO.console_size&.at(1); end)&.then do |n|
+    n-1 if n > 1
+  end
+  if COLUMNS
+    $column = 0
+    def message(str = nil)
+      $stdout.print "\b \b" * $column
+      if str
+        if str.size > COLUMNS
+          str = "..." + str[(-COLUMNS+3)..-1]
+        end
+        $stdout.print str
+      end
+      $stdout.flush
+      $column = str&.size || 0
+    end
+  else
+    alias message puts
+  end
 }
 list = ($_.chomp!('/') ? $dirs : $files)
 list << $_
 END {
   status = true
   $\ = nil
-  ors = (!$dryrun and $tty) ? "\e[K\r" : "\n"
   $files.each do |file|
-    print "rm #{file}#{ors}"
+    message "rm #{file}"
     unless $dryrun
       file = File.join($destdir, file) if $destdir
       begin
@@ -45,9 +63,10 @@
   $dirs.each do |dir|
     unlink[dir] = true
   end
+  nonempty = {}
   while dir = $dirs.pop
     dir = File.dirname(dir) while File.basename(dir) == '.'
-    print "rmdir #{dir}#{ors}"
+    message "rmdir #{dir}"
     unless $dryrun
       realdir = $destdir ? File.join($destdir, dir) : dir
       begin
@@ -58,16 +77,23 @@
           raise unless File.symlink?(realdir)
           File.unlink(realdir)
         end
-      rescue Errno::ENOENT, Errno::ENOTEMPTY
+      rescue Errno::ENOTEMPTY
+        nonempty[dir] = true
+      rescue Errno::ENOENT
       rescue
         status = false
         puts $!
       else
+        nonempty.delete(dir)
         parent = File.dirname(dir)
         $dirs.push(parent) unless parent == dir or unlink[parent]
       end
     end
   end
-  print ors.chomp
+  message
+  unless nonempty.empty?
+    puts "Non empty director#{nonempty.size == 1 ? 'y' : 'ies'}:"
+    nonempty.each_key {|dir| print "    #{dir}\n"}
+  end
   exit(status)
 }
diff --git a/tool/rdoc-srcdir b/tool/rdoc-srcdir
new file mode 100755
index 00000000000000..f830fdc3027ffd
--- /dev/null
+++ b/tool/rdoc-srcdir
@@ -0,0 +1,28 @@
+#!ruby -W0
+
+rdoc_path = Dir.glob("#{File.dirname(__dir__)}/.bundle/gems/rdoc-*").first
+$LOAD_PATH.unshift("#{rdoc_path}/lib")
+require 'rdoc/rdoc'
+
+# Make only the output directory relative to the invoked directory.
+invoked = Dir.pwd
+
+# Load options and parse files from srcdir.
+Dir.chdir(File.dirname(__dir__))
+
+options = RDoc::Options.load_options
+options.title = options.title.sub(/Ruby \K.*version/) {
+  File.read("include/ruby/version.h")
+    .scan(/^ *# *define +RUBY_API_VERSION_(MAJOR|MINOR) +(\d+)/)
+    .sort # "MAJOR" < "MINOR", fortunately
+    .to_h.values.join(".")
+}
+options.parse ARGV
+
+options.singleton_class.define_method(:finish) do
+  super()
+  @op_dir = File.expand_path(@op_dir, invoked)
+end
+
+# Do not hide errors when generating documents of Ruby itself.
+RDoc::RDoc.new.document options
diff --git a/tool/redmine-backporter.rb b/tool/redmine-backporter.rb
index 44b44920d43abb..7f08eb8d1a956b 100755
--- a/tool/redmine-backporter.rb
+++ b/tool/redmine-backporter.rb
@@ -10,13 +10,7 @@
 require 'abbrev'
 require 'pp'
 require 'shellwords'
-begin
-  require 'readline'
-rescue LoadError
-  module Readline; end
-end
-
-VERSION = '0.0.1'
+require 'reline'
 
 opts = OptionParser.new
 target_version = nil
@@ -24,10 +18,9 @@ module Readline; end
 api_key = nil
 ssl_verify = true
 opts.on('-k REDMINE_API_KEY', '--key=REDMINE_API_KEY', 'specify your REDMINE_API_KEY') {|v| api_key = v}
-opts.on('-t TARGET_VERSION', '--target=TARGET_VARSION', /\A\d(?:\.\d)+\z/, 'specify target version (ex: 2.1)') {|v| target_version = v}
+opts.on('-t TARGET_VERSION', '--target=TARGET_VARSION', /\A\d(?:\.\d)+\z/, 'specify target version (ex: 3.1)') {|v| target_version = v}
 opts.on('-r RUBY_REPO_PATH', '--repository=RUBY_REPO_PATH', 'specify repository path') {|v| repo_path = v}
 opts.on('--[no-]ssl-verify', TrueClass, 'use / not use SSL verify') {|v| ssl_verify = v}
-opts.version = VERSION
 opts.parse!(ARGV)
 
 http_options = {use_ssl: true}
@@ -35,11 +28,11 @@ module Readline; end
 $openuri_options = {}
 $openuri_options[:ssl_verify_mode] = OpenSSL::SSL::VERIFY_NONE unless ssl_verify
 
-TARGET_VERSION = target_version || ENV['TARGET_VERSION'] || (raise 'need to specify TARGET_VERSION')
+TARGET_VERSION = target_version || ENV['TARGET_VERSION'] || (puts opts.help; raise 'need to specify TARGET_VERSION')
 RUBY_REPO_PATH = repo_path || ENV['RUBY_REPO_PATH']
 BACKPORT_CF_KEY = 'cf_5'
 STATUS_CLOSE = 5
-REDMINE_API_KEY = api_key || ENV['REDMINE_API_KEY'] || (raise 'need to specify REDMINE_API_KEY')
+REDMINE_API_KEY = api_key || ENV['REDMINE_API_KEY'] || (puts opts.help; raise 'need to specify REDMINE_API_KEY')
 REDMINE_BASE = 'https://bugs.ruby-lang.org'
 
 @query = {
@@ -70,28 +63,28 @@ module Readline; end
 }
 
 class String
-  def color(fore=nil, back=nil, bold: false, underscore: false)
+  def color(fore=nil, back=nil, opts={}, bold: false, underscore: false)
     seq = ""
-    if bold
-      seq << "\e[1m"
+    if bold || opts[:bold]
+      seq = seq + "\e[1m"
     end
-    if underscore
-      seq << "\e[2m"
+    if underscore || opts[:underscore]
+      seq = seq + "\e[2m"
     end
     if fore
       c = COLORS[fore]
       raise "unknown foreground color #{fore}" unless c
-      seq << "\e[#{c}m"
+      seq = seq + "\e[#{c}m"
     end
     if back
       c = COLORS[back]
       raise "unknown background color #{back}" unless c
-      seq << "\e[#{c + 10}m"
+      seq = seq + "\e[#{c + 10}m"
     end
     if seq.empty?
       self
     else
-      seq << self << "\e[0m"
+      seq = seq + self + "\e[0m"
     end
   end
 end
@@ -162,84 +155,6 @@ def more(sio)
   end
 end
 
-class << Readline
-  def readline(prompt = '')
-    console = IO.console
-    console.binmode
-    _, lx = console.winsize
-    if /mswin|mingw/ =~ RUBY_PLATFORM or /^(?:vt\d\d\d|xterm)/i =~ ENV["TERM"]
-      cls = "\r\e[2K"
-    else
-      cls = "\r" << (" " * lx)
-    end
-    cls << "\r" << prompt
-    console.print prompt
-    console.flush
-    line = ''
-    while true
-      case c = console.getch
-      when "\r", "\n"
-        puts
-        HISTORY << line
-        return line
-      when "\C-?", "\b" # DEL/BS
-        print "\b \b" if line.chop!
-      when "\C-u"
-        print cls
-        line.clear
-      when "\C-d"
-        return nil if line.empty?
-        line << c
-      when "\C-p"
-        HISTORY.pos -= 1
-        line = HISTORY.current
-        print cls
-        print line
-      when "\C-n"
-        HISTORY.pos += 1
-        line = HISTORY.current
-        print cls
-        print line
-      else
-        if c >= " "
-          print c
-          line << c
-        end
-      end
-    end
-  end
-
-  HISTORY = []
-  def HISTORY.<<(val)
-    HISTORY.push(val)
-    @pos = self.size
-    self
-  end
-  def HISTORY.pos
-    @pos ||= 0
-  end
-  def HISTORY.pos=(val)
-    @pos = val
-    if @pos < 0
-      @pos = -1
-    elsif @pos >= self.size
-      @pos = self.size
-    end
-  end
-  def HISTORY.current
-    @pos ||= 0
-    if @pos < 0 || @pos >= self.size
-      ''
-    else
-      self[@pos]
-    end
-  end
-end unless defined?(Readline.readline)
-
-def find_svn_log(pattern)
-  `svn log --xml --stop-on-copy --search="#{pattern}" #{RUBY_REPO_PATH}`
-end
-
 def find_git_log(pattern)
   `git #{RUBY_REPO_PATH ? "-C #{RUBY_REPO_PATH.shellescape}" : ""} log --grep="#{pattern}"`
 end
@@ -276,10 +191,12 @@ def backport_command_string
 
       # check if the Git revision is included in master
       has_commit(c, "master")
+    end.sort_by do |changeset|
+      Integer(IO.popen(%W[git show -s --format=%ct #{changeset}], &:read))
     end
     @changesets.define_singleton_method(:validated){true}
   end
-  " #{merger_path} --ticket=#{@issue} #{@changesets.sort.join(',')}"
+  "#{merger_path} --ticket=#{@issue} #{@changesets.join(',')}"
 end
 
 def status_char(obj)
@@ -294,7 +211,7 @@ def status_char(obj)
 console = IO.console
 row, = console.winsize
 @query['limit'] = row - 2
-puts "Backporter #{VERSION}".color(bold: true) + " for #{TARGET_VERSION}"
+puts "Redmine Backporter".color(bold: true) + " for Ruby #{TARGET_VERSION}"
 
 class CommandSyntaxError < RuntimeError; end
 commands = {
@@ -306,10 +223,11 @@ class CommandSyntaxError < RuntimeError; end
     @issues = issues = res["issues"]
     from = res["offset"] + 1
     total = res["total_count"]
+    closed = issues.count { |x, _| x["status"]["name"] == "Closed" }
     to = from + issues.size - 1
-    puts "#{from}-#{to} / #{total}"
+    puts "#{from}-#{to} / #{total} (closed: #{closed})"
     issues.each_with_index do |x, i|
-      id = "##{x["id"]}".color(*PRIORITIES[x["priority"]["name"]])
+      id = "##{x["id"]}".color(*PRIORITIES[x["priority"]["name"]], bold: x["status"]["name"] == "Closed")
       puts "#{'%2d' % i} #{id} #{x["priority"]["name"][0]} #{status_char(x["status"])} #{x["subject"][0,80]}"
     end
   },
@@ -376,9 +294,6 @@ class CommandSyntaxError < RuntimeError; end
   "rel" => proc{|args|
     # this feature requires custom redmine which allows add_related_issue API
     case args
-    when /\Ar?(\d+)\z/ # SVN
-      rev = $1
-      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-master/repository/git/revisions/#{rev}/issues.json")
@@ -436,33 +351,22 @@ class << @changesets
       next
     end
 
-    if rev
-    elsif system("svn info #{RUBY_REPO_PATH&.shellescape}", %i(out err) => IO::NULL) # SVN
-      if (log = find_svn_log("##@issue]")) && (/revision="(?<rev>\d+)/ =~ log)
-        rev = "r#{rev}"
-      end
-    else # Git
-      if log = find_git_log("##@issue]")
-        /^commit (?<rev>\h{40})$/ =~ log
-      end
-    end
-    if log && rev
-      str = log[/merge revision\(s\) ([^:]+)(?=:)/]
-      if str
-        str.insert(5, "d")
-        str = "ruby_#{TARGET_VERSION.tr('.','_')} #{rev} #{str}."
+    if rev && has_commit(rev, "ruby_#{TARGET_VERSION.tr('.','_')}")
+      notes = "ruby_#{TARGET_VERSION.tr('.','_')} commit:#{rev}."
+    elsif rev.nil? && (log = find_git_log("##@issue]")) && !(revs = log.scan(/^commit (\h{40})$/).flatten).empty?
+      commits = revs.map { |rev| "commit:#{rev}" }.join(", ")
+      if merged_revs = log[/merge revision\(s\) ([^:]+)(?=:)/]
+        merged_revs.sub!(/\Amerge/, 'merged')
+        merged_revs.gsub!(/\h{8,40}/, 'commit:\0')
+        str = "ruby_#{TARGET_VERSION.tr('.','_')} #{commits} #{merged_revs}."
       else
-        str = "ruby_#{TARGET_VERSION.tr('.','_')} #{rev}."
+        str = "ruby_#{TARGET_VERSION.tr('.','_')} #{commits}."
       end
       if notes
         str << "\n"
         str << notes
       end
       notes = str
-    elsif rev && has_commit(rev, "ruby_#{TARGET_VERSION.tr('.','_')}")
-      # Backport commit's log doesn't have the issue number.
-      # Instead of that manually it's provided.
-      notes = "ruby_#{TARGET_VERSION.tr('.','_')} commit:#{rev}."
     else
       puts "no commit is found whose log include ##@issue"
       next
@@ -571,7 +475,7 @@ class << @changesets
 @changesets = nil
 while true
   begin
-    l = Readline.readline "#{('#' + @issue.to_s).color(bold: true) if @issue}> "
+    l = Reline.readline "#{('#' + @issue.to_s).color(bold: true) if @issue}> "
   rescue Interrupt
     break
   end
diff --git a/tool/release.sh b/tool/release.sh
index 0988dc2a671574..d467d8f24b8b38 100755
--- a/tool/release.sh
+++ b/tool/release.sh
@@ -1,7 +1,15 @@
 #!/bin/bash
 # Bash version 3.2+ is required for regexp
+# Usage:
+#   tool/release.sh 3.0.0
+#   tool/release.sh 3.0.0-rc1
 
-EXTS='.tar.gz .tar.bz2 .tar.xz .zip'
+EXTS='.tar.gz .tar.xz .zip'
+if [[ -n $AWS_ACCESS_KEY_ID ]]; then
+  AWS_CLI_OPTS=""
+else
+  AWS_CLI_OPTS="--profile ruby"
+fi
 
 ver=$1
 if [[ $ver =~ ^([1-9]\.[0-9])\.([0-9]|[1-9][0-9]|0-(preview[1-9]|rc[1-9]))$ ]]; then
@@ -15,5 +23,5 @@ short=${BASH_REMATCH[1]}
 echo $ver
 echo $short
 for ext in $EXTS; do
-  aws --profile ruby s3 cp s3://ftp.r-l.o/pub/tmp/ruby-$ver-draft$ext s3://ftp.r-l.o/pub/ruby/$short/ruby-$ver$ext
+  aws $AWS_CLI_OPTS s3 cp s3://ftp.r-l.o/pub/tmp/ruby-$ver-draft$ext s3://ftp.r-l.o/pub/ruby/$short/ruby-$ver$ext
 done
diff --git a/tool/rjit/bindgen.rb b/tool/rjit/bindgen.rb
deleted file mode 100755
index 0b4b2fa09582e9..00000000000000
--- a/tool/rjit/bindgen.rb
+++ /dev/null
@@ -1,665 +0,0 @@
-#!/usr/bin/env ruby
-# frozen_string_literal: true
-
-ENV['GEM_HOME'] = File.expand_path('./.bundle', __dir__)
-require 'rubygems/source'
-require 'bundler/inline'
-gemfile(true) do
-  source 'https://rubygems.org'
-  gem 'ffi-clang', '0.7.0', require: false
-end
-
-# Help ffi-clang find libclang
-# Hint: apt install libclang1
-ENV['LIBCLANG'] ||= Dir.glob("/usr/lib/llvm-*/lib/libclang.so.1").grep_v(/-cpp/).sort.last
-require 'ffi/clang'
-
-require 'etc'
-require 'fiddle/import'
-require 'set'
-
-unless build_dir = ARGV.first
-  abort "Usage: #{$0} BUILD_DIR"
-end
-
-class Node < Struct.new(
-  :kind,
-  :spelling,
-  :type,
-  :typedef_type,
-  :bitwidth,
-  :sizeof_type,
-  :offsetof,
-  :enum_value,
-  :children,
-  keyword_init: true,
-)
-end
-
-# Parse a C header with ffi-clang and return Node objects.
-# To ease the maintenance, ffi-clang should be used only inside this class.
-class HeaderParser
-  def initialize(header, cflags:)
-    @translation_unit = FFI::Clang::Index.new.parse_translation_unit(header, cflags, [], {})
-  end
-
-  def parse
-    parse_children(@translation_unit.cursor)
-  end
-
-  private
-
-  def parse_children(cursor)
-    children = []
-    cursor.visit_children do |cursor, _parent|
-      children << parse_cursor(cursor)
-      next :continue
-    end
-    children
-  end
-
-  def parse_cursor(cursor)
-    unless cursor.kind.start_with?('cursor_')
-      raise "unexpected cursor kind: #{cursor.kind}"
-    end
-    kind = cursor.kind.to_s.delete_prefix('cursor_').to_sym
-    children = parse_children(cursor)
-
-    offsetof = {}
-    if kind == :struct
-      children.select { |c| c.kind == :field_decl }.each do |child|
-        offsetof[child.spelling] = cursor.type.offsetof(child.spelling)
-      end
-    end
-
-    sizeof_type = nil
-    if %i[struct union].include?(kind)
-      sizeof_type = cursor.type.sizeof
-    end
-
-    enum_value = nil
-    if kind == :enum_constant_decl
-      enum_value = cursor.enum_value
-    end
-
-    Node.new(
-      kind: kind,
-      spelling: cursor.spelling,
-      type: cursor.type.spelling,
-      typedef_type: cursor.typedef_type.spelling,
-      bitwidth: cursor.bitwidth,
-      sizeof_type: sizeof_type,
-      offsetof: offsetof,
-      enum_value: enum_value,
-      children: children,
-    )
-  end
-end
-
-# Convert Node objects to a Ruby binding source.
-class BindingGenerator
-  BINDGEN_BEG = '### RJIT bindgen begin ###'
-  BINDGEN_END = '### RJIT bindgen end ###'
-  DEFAULTS = { '_Bool' => 'CType::Bool.new' }
-  DEFAULTS.default_proc = proc { |_h, k| "CType::Stub.new(:#{k})" }
-
-  attr_reader :src
-
-  # @param src_path [String]
-  # @param consts [Hash{ Symbol => Array<String> }]
-  # @param values [Hash{ Symbol => Array<String> }]
-  # @param funcs [Array<String>]
-  # @param types [Array<String>]
-  # @param dynamic_types [Array<String>] #ifdef-dependent immediate types, which need Primitive.cexpr! for type detection
-  # @param skip_fields [Hash{ Symbol => Array<String> }] Struct fields that are skipped from bindgen
-  # @param ruby_fields [Hash{ Symbol => Array<String> }] Struct VALUE fields that are considered Ruby objects
-  def initialize(src_path:, consts:, values:, funcs:, types:, dynamic_types:, skip_fields:, ruby_fields:)
-    @preamble, @postamble = split_ambles(src_path)
-    @src = String.new
-    @consts = consts.transform_values(&:sort)
-    @values = values.transform_values(&:sort)
-    @funcs = funcs.sort
-    @types = types.sort
-    @dynamic_types = dynamic_types.sort
-    @skip_fields = skip_fields.transform_keys(&:to_s)
-    @ruby_fields = ruby_fields.transform_keys(&:to_s)
-    @references = Set.new
-  end
-
-  def generate(nodes)
-    println @preamble
-
-    # Define macros/enums
-    @consts.each do |type, values|
-      values.each do |value|
-        raise "#{value} isn't a valid constant name" unless ('A'..'Z').include?(value[0])
-        println "  C::#{value} = Primitive.cexpr! %q{ #{type}2NUM(#{value}) }"
-      end
-    end
-    println
-
-    # Define variables
-    @values.each do |type, values|
-      values.each do |value|
-        println "  def C.#{value}"
-        println "    Primitive.cexpr! %q{ #{type}2NUM(#{value}) }"
-        println "  end"
-        println
-      end
-    end
-
-    # Define function pointers
-    @funcs.each do |func|
-      println "  def C.#{func}"
-      println "    Primitive.cexpr! %q{ SIZET2NUM((size_t)#{func}) }"
-      println "  end"
-      println
-    end
-
-    # Build a hash table for type lookup by name
-    nodes_index = flatten_nodes(nodes).group_by(&:spelling).transform_values do |values|
-      # Try to search a declaration with definitions
-      node_with_children = values.find { |v| !v.children.empty? }
-      next node_with_children if node_with_children
-
-      # Otherwise, assume the last one is the main declaration
-      values.last
-    end
-
-    # Define types
-    @types.each do |type|
-      unless definition = generate_node(nodes_index[type])
-        raise "Failed to find or generate type: #{type}"
-      end
-      println "  def C.#{type}"
-      println "@#{type} ||= #{definition}".gsub(/^/, "    ").chomp
-      println "  end"
-      println
-    end
-
-    # Define dynamic types
-    @dynamic_types.each do |type|
-      unless generate_node(nodes_index[type])&.start_with?('CType::Immediate')
-        raise "Non-immediate type is given to dynamic_types: #{type}"
-      end
-      println "  def C.#{type}"
-      println "    @#{type} ||= CType::Immediate.find(Primitive.cexpr!(\"SIZEOF(#{type})\"), Primitive.cexpr!(\"SIGNED_TYPE_P(#{type})\"))"
-      println "  end"
-      println
-    end
-
-    # Leave a stub for types that are referenced but not targeted
-    (@references - @types - @dynamic_types).each do |type|
-      println "  def C.#{type}"
-      println "    #{DEFAULTS[type]}"
-      println "  end"
-      println
-    end
-
-    print @postamble
-  end
-
-  private
-
-  # Make an array that includes all top-level and nested nodes
-  def flatten_nodes(nodes)
-    result = []
-    nodes.each do |node|
-      unless node.children.empty?
-        result.concat(flatten_nodes(node.children))
-      end
-    end
-    result.concat(nodes) # prioritize top-level nodes
-    result
-  end
-
-  # Return code before BINDGEN_BEG and code after BINDGEN_END
-  def split_ambles(src_path)
-    lines = File.read(src_path).lines
-
-    preamble_end = lines.index { |l| l.include?(BINDGEN_BEG) }
-    raise "`#{BINDGEN_BEG}` was not found in '#{src_path}'" if preamble_end.nil?
-
-    postamble_beg = lines.index { |l| l.include?(BINDGEN_END) }
-    raise "`#{BINDGEN_END}` was not found in '#{src_path}'" if postamble_beg.nil?
-    raise "`#{BINDGEN_BEG}` was found after `#{BINDGEN_END}`" if preamble_end >= postamble_beg
-
-    return lines[0..preamble_end].join, lines[postamble_beg..-1].join
-  end
-
-  # Generate code from a node. Used for constructing a complex nested node.
-  # @param node [Node]
-  def generate_node(node, sizeof_type: nil)
-    case node&.kind
-    when :struct, :union
-      # node.spelling is often empty for union, but we'd like to give it a name when it has one.
-      buf = +"CType::#{node.kind.to_s.sub(/\A[a-z]/, &:upcase)}.new(\n"
-      buf << "  \"#{node.spelling}\", Primitive.cexpr!(\"SIZEOF(#{sizeof_type || node.type})\"),\n"
-      bit_fields_end = node.children.index { |c| c.bitwidth == -1 } || node.children.size # first non-bit field index
-      node.children.each_with_index do |child, i|
-        skip_type = sizeof_type&.gsub(/\(\(struct ([^\)]+) \*\)NULL\)->/, '\1.') || node.spelling
-        next if @skip_fields.fetch(skip_type, []).include?(child.spelling)
-        field_builder = proc do |field, type|
-          if node.kind == :struct
-            to_ruby = @ruby_fields.fetch(node.spelling, []).include?(field)
-            if child.bitwidth > 0
-              if bit_fields_end <= i # give up offsetof calculation for non-leading bit fields
-                binding.irb
-                raise "non-leading bit fields are not supported. consider including '#{field}' in skip_fields."
-              end
-              offsetof = node.offsetof.fetch(field)
-            else
-              off_type = sizeof_type || "(*((#{node.type} *)NULL))"
-              offsetof = "Primitive.cexpr!(\"OFFSETOF(#{off_type}, #{field})\")"
-            end
-            "  #{field}: [#{type}, #{offsetof}#{', true' if to_ruby}],\n"
-          else
-            "  #{field}: #{type},\n"
-          end
-        end
-
-        case child
-        # BitField is struct-specific. So it must be handled here.
-        in Node[kind: :field_decl, spelling:, bitwidth:, children: [_grandchild, *]] if bitwidth > 0
-          buf << field_builder.call(spelling, "CType::BitField.new(#{bitwidth}, #{node.offsetof.fetch(spelling) % 8})")
-        # "(unnamed ...)" struct and union are handled here, which are also struct-specific.
-        in Node[kind: :field_decl, spelling:, type:, children: [grandchild]] if type.match?(/\((unnamed|anonymous) [^)]+\)\z/)
-          if sizeof_type
-            child_type = "#{sizeof_type}.#{child.spelling}"
-          else
-            child_type = "((#{node.type} *)NULL)->#{child.spelling}"
-          end
-          buf << field_builder.call(spelling, generate_node(grandchild, sizeof_type: child_type).gsub(/^/, '  ').sub(/\A +/, ''))
-        # In most cases, we'd like to let generate_type handle the type unless it's "(unnamed ...)".
-        in Node[kind: :field_decl, spelling:, type:] if !type.empty?
-          buf << field_builder.call(spelling, generate_type(type))
-        else # forward declarations are ignored
-        end
-      end
-      buf << ")"
-    when :typedef_decl
-      case node.children
-      in [child]
-        generate_node(child)
-      in [child, Node[kind: :integer_literal]]
-        generate_node(child)
-      in _ unless node.typedef_type.empty?
-        generate_type(node.typedef_type)
-      end
-    when :enum_decl
-      generate_type('int')
-    when :type_ref
-      generate_type(node.spelling)
-    end
-  end
-
-  # Generate code from a type name. Used for resolving the name of a simple leaf node.
-  # @param type [String]
-  def generate_type(type)
-    if type.match?(/\[\d+\]\z/)
-      return "CType::Pointer.new { #{generate_type(type.sub!(/\[\d+\]\z/, ''))} }"
-    end
-    type = type.delete_suffix('const')
-    if type.end_with?('*')
-      if type == 'const void *'
-        # `CType::Pointer.new { CType::Immediate.parse("void") }` is never useful,
-        # so specially handle that case here.
-        return 'CType::Immediate.parse("void *")'
-      end
-      return "CType::Pointer.new { #{generate_type(type.delete_suffix('*').rstrip)} }"
-    end
-
-    type = type.gsub(/((const|volatile) )+/, '').rstrip
-    if type.start_with?(/(struct|union|enum) /)
-      target = type.split(' ', 2).last
-      push_target(target)
-      "self.#{target}"
-    else
-      begin
-        ctype = Fiddle::Importer.parse_ctype(type)
-      rescue Fiddle::DLError
-        push_target(type)
-        "self.#{type}"
-      else
-        # Convert any function pointers to void* to workaround FILE* vs int*
-        if ctype == Fiddle::TYPE_VOIDP
-          "CType::Immediate.parse(\"void *\")"
-        else
-          "CType::Immediate.parse(#{type.dump})"
-        end
-      end
-    end
-  end
-
-  def print(str)
-    @src << str
-  end
-
-  def println(str = "")
-    @src << str << "\n"
-  end
-
-  def chomp
-    @src.delete_suffix!("\n")
-  end
-
-  def rstrip!
-    @src.rstrip!
-  end
-
-  def push_target(target)
-    unless target.match?(/\A\w+\z/)
-      raise "invalid target: #{target}"
-    end
-    @references << target
-  end
-end
-
-src_dir = File.expand_path('../..', __dir__)
-src_path = File.join(src_dir, 'rjit_c.rb')
-build_dir = File.expand_path(build_dir)
-cflags = [
-  src_dir,
-  build_dir,
-  File.join(src_dir, 'include'),
-  File.join(build_dir, ".ext/include/#{RUBY_PLATFORM}"),
-].map { |dir| "-I#{dir}" }
-
-# Clear .cache/clangd created by the language server, which could break this bindgen
-clangd_cache = File.join(src_dir, '.cache/clangd')
-if Dir.exist?(clangd_cache)
-  system('rm', '-rf', clangd_cache, exception: true)
-end
-
-# Parse rjit_c.h and generate rjit_c.rb
-nodes = HeaderParser.new(File.join(src_dir, 'rjit_c.h'), cflags: cflags).parse
-generator = BindingGenerator.new(
-  src_path: src_path,
-  consts: {
-    LONG: %w[
-      UNLIMITED_ARGUMENTS
-      VM_ENV_DATA_INDEX_ME_CREF
-      VM_ENV_DATA_INDEX_SPECVAL
-    ],
-    SIZET: %w[
-      ARRAY_REDEFINED_OP_FLAG
-      BOP_AND
-      BOP_AREF
-      BOP_EQ
-      BOP_EQQ
-      BOP_FREEZE
-      BOP_GE
-      BOP_GT
-      BOP_LE
-      BOP_LT
-      BOP_MINUS
-      BOP_MOD
-      BOP_OR
-      BOP_PLUS
-      BUILTIN_ATTR_LEAF
-      BUILTIN_ATTR_NO_GC
-      HASH_REDEFINED_OP_FLAG
-      INTEGER_REDEFINED_OP_FLAG
-      INVALID_SHAPE_ID
-      METHOD_VISI_PRIVATE
-      METHOD_VISI_PROTECTED
-      METHOD_VISI_PUBLIC
-      METHOD_VISI_UNDEF
-      OBJ_TOO_COMPLEX_SHAPE_ID
-      OPTIMIZED_METHOD_TYPE_BLOCK_CALL
-      OPTIMIZED_METHOD_TYPE_CALL
-      OPTIMIZED_METHOD_TYPE_SEND
-      OPTIMIZED_METHOD_TYPE_STRUCT_AREF
-      OPTIMIZED_METHOD_TYPE_STRUCT_ASET
-      RARRAY_EMBED_FLAG
-      RARRAY_EMBED_LEN_MASK
-      RARRAY_EMBED_LEN_SHIFT
-      RMODULE_IS_REFINEMENT
-      ROBJECT_EMBED
-      RSTRUCT_EMBED_LEN_MASK
-      RUBY_EVENT_CLASS
-      RUBY_EVENT_C_CALL
-      RUBY_EVENT_C_RETURN
-      RUBY_FIXNUM_FLAG
-      RUBY_FLONUM_FLAG
-      RUBY_FLONUM_MASK
-      RUBY_FL_SINGLETON
-      RUBY_IMMEDIATE_MASK
-      RUBY_SPECIAL_SHIFT
-      RUBY_SYMBOL_FLAG
-      RUBY_T_ARRAY
-      RUBY_T_CLASS
-      RUBY_T_ICLASS
-      RUBY_T_HASH
-      RUBY_T_MASK
-      RUBY_T_MODULE
-      RUBY_T_STRING
-      RUBY_T_SYMBOL
-      RUBY_T_OBJECT
-      SHAPE_CAPACITY_CHANGE
-      SHAPE_FLAG_SHIFT
-      SHAPE_FROZEN
-      SHAPE_ID_NUM_BITS
-      SHAPE_INITIAL_CAPACITY
-      SHAPE_IVAR
-      SHAPE_MASK
-      SHAPE_ROOT
-      STRING_REDEFINED_OP_FLAG
-      T_OBJECT
-      VM_BLOCK_HANDLER_NONE
-      VM_CALL_ARGS_BLOCKARG
-      VM_CALL_ARGS_SPLAT
-      VM_CALL_FCALL
-      VM_CALL_KWARG
-      VM_CALL_KW_SPLAT
-      VM_CALL_KW_SPLAT_MUT
-      VM_CALL_KW_SPLAT_bit
-      VM_CALL_OPT_SEND
-      VM_CALL_TAILCALL
-      VM_CALL_TAILCALL_bit
-      VM_CALL_ZSUPER
-      VM_ENV_DATA_INDEX_FLAGS
-      VM_ENV_DATA_SIZE
-      VM_ENV_FLAG_LOCAL
-      VM_ENV_FLAG_WB_REQUIRED
-      VM_FRAME_FLAG_BMETHOD
-      VM_FRAME_FLAG_CFRAME
-      VM_FRAME_FLAG_CFRAME_KW
-      VM_FRAME_FLAG_LAMBDA
-      VM_FRAME_FLAG_MODIFIED_BLOCK_PARAM
-      VM_FRAME_MAGIC_BLOCK
-      VM_FRAME_MAGIC_CFUNC
-      VM_FRAME_MAGIC_METHOD
-      VM_METHOD_TYPE_ALIAS
-      VM_METHOD_TYPE_ATTRSET
-      VM_METHOD_TYPE_BMETHOD
-      VM_METHOD_TYPE_CFUNC
-      VM_METHOD_TYPE_ISEQ
-      VM_METHOD_TYPE_IVAR
-      VM_METHOD_TYPE_MISSING
-      VM_METHOD_TYPE_NOTIMPLEMENTED
-      VM_METHOD_TYPE_OPTIMIZED
-      VM_METHOD_TYPE_REFINED
-      VM_METHOD_TYPE_UNDEF
-      VM_METHOD_TYPE_ZSUPER
-      VM_SPECIAL_OBJECT_VMCORE
-      RUBY_ENCODING_MASK
-      RUBY_FL_FREEZE
-      RHASH_PASS_AS_KEYWORDS
-    ],
-  },
-  values: {
-    SIZET: %w[
-      block_type_iseq
-      imemo_iseq
-      imemo_callinfo
-      rb_block_param_proxy
-      rb_cArray
-      rb_cFalseClass
-      rb_cFloat
-      rb_cInteger
-      rb_cNilClass
-      rb_cString
-      rb_cSymbol
-      rb_cTrueClass
-      rb_rjit_global_events
-      rb_mRubyVMFrozenCore
-      idRespond_to_missing
-    ],
-  },
-  funcs: %w[
-    rb_ary_entry_internal
-    rb_ary_push
-    rb_ary_resurrect
-    rb_ary_store
-    rb_ec_ary_new_from_values
-    rb_ec_str_resurrect
-    rb_ensure_iv_list_size
-    rb_fix_aref
-    rb_fix_div_fix
-    rb_fix_mod_fix
-    rb_fix_mul_fix
-    rb_gc_writebarrier
-    rb_get_symbol_id
-    rb_hash_aref
-    rb_hash_aset
-    rb_hash_bulk_insert
-    rb_hash_new
-    rb_hash_new_with_size
-    rb_hash_resurrect
-    rb_ivar_get
-    rb_obj_as_string_result
-    rb_obj_is_kind_of
-    rb_str_concat_literals
-    rb_str_eql_internal
-    rb_str_getbyte
-    rb_vm_bh_to_procval
-    rb_vm_concat_array
-    rb_vm_defined
-    rb_vm_get_ev_const
-    rb_vm_getclassvariable
-    rb_vm_ic_hit_p
-    rb_vm_opt_newarray_min
-    rb_vm_opt_newarray_max
-    rb_vm_opt_newarray_hash
-    rb_vm_setinstancevariable
-    rb_vm_splat_array
-    rjit_full_cfunc_return
-    rjit_optimized_call
-    rjit_str_neq_internal
-    rjit_record_exit_stack
-    rb_ivar_defined
-    rb_vm_throw
-    rb_backref_get
-    rb_reg_last_match
-    rb_reg_match_pre
-    rb_reg_match_post
-    rb_reg_match_last
-    rb_reg_nth_match
-    rb_gvar_get
-    rb_range_new
-    rb_ary_tmp_new_from_values
-    rb_reg_new_ary
-    rb_ary_clear
-    rb_str_intern
-    rb_vm_setclassvariable
-    rb_str_bytesize
-    rjit_str_simple_append
-    rb_str_buf_append
-    rb_str_dup
-    rb_vm_yield_with_cfunc
-    rb_vm_set_ivar_id
-    rb_ary_dup
-    rjit_rb_ary_subseq_length
-    rb_ary_unshift_m
-    rjit_build_kwhash
-    rb_rjit_entry_stub_hit
-    rb_rjit_branch_stub_hit
-    rb_sym_to_proc
-  ],
-  types: %w[
-    CALL_DATA
-    IC
-    ID
-    IVC
-    RArray
-    RB_BUILTIN
-    RBasic
-    RObject
-    RStruct
-    RString
-    attr_index_t
-    iseq_inline_constant_cache
-    iseq_inline_constant_cache_entry
-    iseq_inline_iv_cache_entry
-    iseq_inline_storage_entry
-    method_optimized_type
-    rb_block
-    rb_block_type
-    rb_builtin_function
-    rb_call_data
-    rb_callable_method_entry_struct
-    rb_callable_method_entry_t
-    rb_callcache
-    rb_callinfo
-    rb_captured_block
-    rb_control_frame_t
-    rb_cref_t
-    rb_execution_context_struct
-    rb_execution_context_t
-    rb_iseq_constant_body
-    rb_iseq_location_t
-    rb_iseq_struct
-    rb_iseq_t
-    rb_method_attr_t
-    rb_method_bmethod_t
-    rb_method_cfunc_t
-    rb_method_definition_struct
-    rb_method_entry_t
-    rb_method_iseq_t
-    rb_method_optimized_t
-    rb_method_type_t
-    rb_proc_t
-    rb_rjit_runtime_counters
-    rb_serial_t
-    rb_shape
-    rb_shape_t
-    rb_thread_struct
-    rb_jit_func_t
-    rb_iseq_param_keyword
-    rb_rjit_options
-    rb_callinfo_kwarg
-  ],
-  # #ifdef-dependent immediate types, which need Primitive.cexpr! for type detection
-  dynamic_types: %w[
-    VALUE
-    shape_id_t
-  ],
-  skip_fields: {
-    'rb_execution_context_struct.machine': %w[regs], # differs between macOS and Linux
-    rb_execution_context_struct: %w[method_missing_reason], # non-leading bit fields not supported
-    rb_iseq_constant_body: %w[jit_exception jit_exception_calls yjit_payload], # conditionally defined
-    rb_thread_struct: %w[status has_dedicated_nt to_kill abort_on_exception report_on_exception pending_interrupt_queue_checked],
-    :'' => %w[is_from_method is_lambda is_isolated], # rb_proc_t
-  },
-  ruby_fields: {
-    rb_iseq_constant_body: %w[
-      rjit_blocks
-    ],
-    rb_iseq_location_struct: %w[
-      base_label
-      label
-      pathobj
-    ],
-    rb_callable_method_entry_t: %w[
-      defined_class
-    ],
-    rb_callable_method_entry_struct: %w[
-      defined_class
-    ],
-  },
-)
-generator.generate(nodes)
-
-# Write rjit_c.rb
-File.write(src_path, generator.src)
diff --git a/tool/ruby_vm/controllers/application_controller.rb b/tool/ruby_vm/controllers/application_controller.rb
index e03e54e3971a5c..f6c0e3960013dc 100644
--- a/tool/ruby_vm/controllers/application_controller.rb
+++ b/tool/ruby_vm/controllers/application_controller.rb
@@ -1,4 +1,3 @@
-#! /your/favourite/path/to/ruby
 # -*- Ruby -*-
 # -*- frozen_string_literal: true; -*-
 # -*- warn_indent: true; -*-
diff --git a/tool/ruby_vm/helpers/c_escape.rb b/tool/ruby_vm/helpers/c_escape.rb
index 2a99e408daeb4b..628cb0428bcbac 100644
--- a/tool/ruby_vm/helpers/c_escape.rb
+++ b/tool/ruby_vm/helpers/c_escape.rb
@@ -1,4 +1,3 @@
-#! /your/favourite/path/to/ruby
 # -*- Ruby -*-
 # -*- frozen_string_literal: true; -*-
 # -*- warn_indent: true; -*-
diff --git a/tool/ruby_vm/helpers/dumper.rb b/tool/ruby_vm/helpers/dumper.rb
index c083dffa7abf53..f0758dd44f9bde 100644
--- a/tool/ruby_vm/helpers/dumper.rb
+++ b/tool/ruby_vm/helpers/dumper.rb
@@ -1,4 +1,3 @@
-#! /your/favourite/path/to/ruby
 # -*- Ruby -*-
 # -*- frozen_string_literal: true; -*-
 # -*- warn_indent: true; -*-
@@ -33,11 +32,7 @@ def new_erb spec
   rescue Errno::ENOENT
     raise "don't know how to generate #{path}"
   else
-    if ERB.instance_method(:initialize).parameters.assoc(:key) # Ruby 2.6+
-      erb = ERB.new(src, trim_mode: '%-')
-    else
-      erb = ERB.new(src, nil, '%-')
-    end
+    erb = ERB.new(src, trim_mode: '%-')
     erb.filename = path.to_path
     return erb
   end
diff --git a/tool/ruby_vm/helpers/scanner.rb b/tool/ruby_vm/helpers/scanner.rb
index ef6de8120e5803..8998abb2d3aa03 100644
--- a/tool/ruby_vm/helpers/scanner.rb
+++ b/tool/ruby_vm/helpers/scanner.rb
@@ -1,4 +1,3 @@
-#! /your/favourite/path/to/ruby
 # -*- Ruby -*-
 # -*- frozen_string_literal: true; -*-
 # -*- warn_indent: true; -*-
diff --git a/tool/ruby_vm/loaders/insns_def.rb b/tool/ruby_vm/loaders/insns_def.rb
index 034905f74e7d86..d45d0ba83cdb39 100644
--- a/tool/ruby_vm/loaders/insns_def.rb
+++ b/tool/ruby_vm/loaders/insns_def.rb
@@ -1,4 +1,3 @@
-#! /your/favourite/path/to/ruby
 # -*- Ruby -*-
 # -*- frozen_string_literal: true; -*-
 # -*- warn_indent: true; -*-
diff --git a/tool/ruby_vm/loaders/opt_insn_unif_def.rb b/tool/ruby_vm/loaders/opt_insn_unif_def.rb
index aa6fd79e79c4e4..0750f1823a0f15 100644
--- a/tool/ruby_vm/loaders/opt_insn_unif_def.rb
+++ b/tool/ruby_vm/loaders/opt_insn_unif_def.rb
@@ -1,4 +1,3 @@
-#! /your/favourite/path/to/ruby
 # -*- Ruby -*-
 # -*- frozen_string_literal: true; -*-
 # -*- warn_indent: true; -*-
diff --git a/tool/ruby_vm/loaders/opt_operand_def.rb b/tool/ruby_vm/loaders/opt_operand_def.rb
index 29aef8a325928d..e08509a433797b 100644
--- a/tool/ruby_vm/loaders/opt_operand_def.rb
+++ b/tool/ruby_vm/loaders/opt_operand_def.rb
@@ -1,4 +1,3 @@
-#! /your/favourite/path/to/ruby
 # -*- Ruby -*-
 # -*- frozen_string_literal: true; -*-
 # -*- warn_indent: true; -*-
diff --git a/tool/ruby_vm/loaders/vm_opts_h.rb b/tool/ruby_vm/loaders/vm_opts_h.rb
index 3f05c270eee2d6..d626ea0296db52 100644
--- a/tool/ruby_vm/loaders/vm_opts_h.rb
+++ b/tool/ruby_vm/loaders/vm_opts_h.rb
@@ -1,4 +1,3 @@
-#! /your/favourite/path/to/ruby
 # -*- Ruby -*-
 # -*- frozen_string_literal: true; -*-
 # -*- warn_indent: true; -*-
diff --git a/tool/ruby_vm/models/attribute.rb b/tool/ruby_vm/models/attribute.rb
index ac4122f3acee08..177b701b9286b7 100644
--- a/tool/ruby_vm/models/attribute.rb
+++ b/tool/ruby_vm/models/attribute.rb
@@ -1,4 +1,3 @@
-#! /your/favourite/path/to/ruby
 # -*- Ruby -*-
 # -*- frozen_string_literal: true; -*-
 # -*- warn_indent: true; -*-
diff --git a/tool/ruby_vm/models/bare_instructions.rb b/tool/ruby_vm/models/bare_instructions.rb
old mode 100755
new mode 100644
index a810d89f3c0477..491e3eaaa65b84
--- a/tool/ruby_vm/models/bare_instructions.rb
+++ b/tool/ruby_vm/models/bare_instructions.rb
@@ -1,4 +1,3 @@
-#! /your/favourite/path/to/ruby
 # -*- Ruby -*-
 # -*- frozen_string_literal: true; -*-
 # -*- warn_indent: true; -*-
@@ -149,6 +148,10 @@ def use_call_data?
       @variables.find { |_, var_info| var_info[:type] == 'CALL_DATA' }
   end
 
+  def zjit_profile?
+    @attrs.fetch('zjit_profile').expr.expr != 'false;'
+  end
+
   private
 
   def check_attribute_consistency
@@ -187,6 +190,7 @@ def predefine_attributes
     generate_attribute 'rb_snum_t', 'sp_inc', rets.size - pops.size
     generate_attribute 'bool', 'handles_sp', default_definition_of_handles_sp
     generate_attribute 'bool', 'leaf', default_definition_of_leaf
+    generate_attribute 'bool', 'zjit_profile', false
   end
 
   def default_definition_of_handles_sp
diff --git a/tool/ruby_vm/models/c_expr.rb b/tool/ruby_vm/models/c_expr.rb
index 4b5aec58dd1c8e..095ff4f1d9c356 100644
--- a/tool/ruby_vm/models/c_expr.rb
+++ b/tool/ruby_vm/models/c_expr.rb
@@ -1,4 +1,3 @@
-#! /your/favourite/path/to/ruby
 # -*- Ruby -*-
 # -*- frozen_string_literal: true; -*-
 # -*- warn_indent: true; -*-
diff --git a/tool/ruby_vm/models/instructions.rb b/tool/ruby_vm/models/instructions.rb
index 1198c7a4a63deb..e3da2ba5ac3525 100644
--- a/tool/ruby_vm/models/instructions.rb
+++ b/tool/ruby_vm/models/instructions.rb
@@ -1,4 +1,3 @@
-#! /your/favourite/path/to/ruby
 # -*- Ruby -*-
 # -*- frozen_string_literal: true; -*-
 # -*- warn_indent: true; -*-
@@ -19,4 +18,5 @@
                        RubyVM::InstructionsUnifications.to_a
 
 require_relative 'trace_instructions'
+require_relative 'zjit_instructions'
 RubyVM::Instructions.freeze
diff --git a/tool/ruby_vm/models/instructions_unifications.rb b/tool/ruby_vm/models/instructions_unifications.rb
index 214ba5fcc20ca3..2932ec57b264f2 100644
--- a/tool/ruby_vm/models/instructions_unifications.rb
+++ b/tool/ruby_vm/models/instructions_unifications.rb
@@ -1,4 +1,3 @@
-#! /your/favourite/path/to/ruby
 # -*- Ruby -*-
 # -*- frozen_string_literal: true; -*-
 # -*- warn_indent: true; -*-
diff --git a/tool/ruby_vm/models/operands_unifications.rb b/tool/ruby_vm/models/operands_unifications.rb
index 10e57428971c03..ff84abb3c3e0fb 100644
--- a/tool/ruby_vm/models/operands_unifications.rb
+++ b/tool/ruby_vm/models/operands_unifications.rb
@@ -1,4 +1,3 @@
-#! /your/favourite/path/to/ruby
 # -*- Ruby -*-
 # -*- frozen_string_literal: true; -*-
 # -*- warn_indent: true; -*-
diff --git a/tool/ruby_vm/models/trace_instructions.rb b/tool/ruby_vm/models/trace_instructions.rb
index 4ed4c8cb4265a5..5ffff3f63de1ce 100644
--- a/tool/ruby_vm/models/trace_instructions.rb
+++ b/tool/ruby_vm/models/trace_instructions.rb
@@ -1,4 +1,3 @@
-#! /your/favourite/path/to/ruby
 # -*- Ruby -*-
 # -*- frozen_string_literal: true; -*-
 # -*- warn_indent: true; -*-
@@ -59,6 +58,10 @@ def has_attribute? *;
     return false
   end
 
+  def zjit_profile?
+    return false
+  end
+
   private
 
   @instances = RubyVM::Instructions.map {|i| new i }
diff --git a/tool/ruby_vm/models/typemap.rb b/tool/ruby_vm/models/typemap.rb
index d762dd3321ab7d..68ef5a41a5cfdf 100644
--- a/tool/ruby_vm/models/typemap.rb
+++ b/tool/ruby_vm/models/typemap.rb
@@ -1,4 +1,3 @@
-#! /your/favourite/path/to/ruby
 # -*- Ruby -*-
 # -*- frozen_string_literal: true; -*-
 # -*- warn_indent: true; -*-
diff --git a/tool/ruby_vm/models/zjit_instructions.rb b/tool/ruby_vm/models/zjit_instructions.rb
new file mode 100644
index 00000000000000..2bf190e3f744d6
--- /dev/null
+++ b/tool/ruby_vm/models/zjit_instructions.rb
@@ -0,0 +1,58 @@
+require_relative '../helpers/c_escape'
+require_relative 'bare_instructions'
+
+# Profile YARV instructions to optimize code generated by ZJIT
+class RubyVM::ZJITInstructions
+  include RubyVM::CEscape
+
+  attr_reader :name
+
+  def initialize(orig)
+    @orig = orig
+    @name = as_tr_cpp "zjit @ #{@orig.name}"
+  end
+
+  def pretty_name
+    return sprintf "%s(...)(...)(...)", @name
+  end
+
+  def jump_destination
+    return @orig.name
+  end
+
+  def bin
+    return sprintf "BIN(%s)", @name
+  end
+
+  def width
+    return @orig.width
+  end
+
+  def operands_info
+    return @orig.operands_info
+  end
+
+  def rets
+    return ['...']
+  end
+
+  def pops
+    return ['...']
+  end
+
+  def attributes
+    return []
+  end
+
+  def has_attribute?(*)
+    return false
+  end
+
+  @instances = RubyVM::Instructions.filter(&:zjit_profile?).map {|i| new(i) }
+
+  def self.to_a
+    @instances
+  end
+
+  RubyVM::Instructions.push(*to_a)
+end
diff --git a/tool/ruby_vm/scripts/insns2vm.rb b/tool/ruby_vm/scripts/insns2vm.rb
index 47d8da5513434f..ad8603b1a8cacc 100644
--- a/tool/ruby_vm/scripts/insns2vm.rb
+++ b/tool/ruby_vm/scripts/insns2vm.rb
@@ -1,4 +1,3 @@
-#! /your/favourite/path/to/ruby
 # -*- Ruby -*-
 # -*- frozen_string_literal: true; -*-
 # -*- warn_indent: true; -*-
diff --git a/tool/ruby_vm/tests/.gitkeep b/tool/ruby_vm/tests/.gitkeep
deleted file mode 100644
index e69de29bb2d1d6..00000000000000
diff --git a/tool/ruby_vm/views/_comptime_insn_stack_increase.erb b/tool/ruby_vm/views/_comptime_insn_stack_increase.erb
index cb895815ce2f70..8bb28db1c16d21 100644
--- a/tool/ruby_vm/views/_comptime_insn_stack_increase.erb
+++ b/tool/ruby_vm/views/_comptime_insn_stack_increase.erb
@@ -6,6 +6,16 @@
 %# conditions mentioned  in the  file COPYING  are met.   Consult the  file for
 %# details.
 %#
+%
+% stack_increase = proc do |i|
+%   if i.has_attribute?('sp_inc')
+%     '-127'
+%   else
+%     sprintf("%4d", i.rets.size - i.pops.size)
+%   end
+% end
+% zjit_insns, insns = RubyVM::Instructions.partition { |i| i.name.start_with?('zjit_') }
+%
 PUREFUNC(MAYBE_UNUSED(static int comptime_insn_stack_increase(int depth, int insn, const VALUE *opes)));
 PUREFUNC(static rb_snum_t comptime_insn_stack_increase_dispatch(enum ruby_vminsn_type insn, const VALUE *opes));
 
@@ -13,15 +23,14 @@ rb_snum_t
 comptime_insn_stack_increase_dispatch(enum ruby_vminsn_type insn, const VALUE *opes)
 {
     static const signed char t[] = {
-% RubyVM::Instructions.each_slice 8 do |a|
-        <%= a.map { |i|
-          if i.has_attribute?('sp_inc')
-            '-127'
-          else
-            sprintf("%4d", i.rets.size - i.pops.size)
-          end
-        }.join(', ') -%>,
+% insns.each_slice(8) do |row|
+        <%= row.map(&stack_increase).join(', ') -%>,
+% end
+#if USE_ZJIT
+% zjit_insns.each_slice(8) do |row|
+        <%= row.map(&stack_increase).join(', ') -%>,
 % end
+#endif
     };
     signed char c = t[insn];
 
diff --git a/tool/ruby_vm/views/_insn_len_info.erb b/tool/ruby_vm/views/_insn_len_info.erb
index 569dca5845bb3a..b29a40591841cd 100644
--- a/tool/ruby_vm/views/_insn_len_info.erb
+++ b/tool/ruby_vm/views/_insn_len_info.erb
@@ -5,6 +5,9 @@
 %# 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.
+%
+% zjit_insns, insns = RubyVM::Instructions.partition { |i| i.name.start_with?('zjit_') }
+%
 CONSTFUNC(MAYBE_UNUSED(static int insn_len(VALUE insn)));
 
 RUBY_SYMBOL_EXPORT_BEGIN /* for debuggers */
@@ -13,9 +16,14 @@ RUBY_SYMBOL_EXPORT_END
 
 #ifdef RUBY_VM_INSNS_INFO
 const uint8_t rb_vm_insn_len_info[] = {
-% RubyVM::Instructions.each_slice 23 do |a|
-    <%= a.map(&:width).join(', ') -%>,
+% insns.each_slice(23) do |row|
+    <%= row.map(&:width).join(', ') -%>,
 % end
+#if USE_ZJIT
+% zjit_insns.each_slice(23) do |row|
+    <%= row.map(&:width).join(', ') -%>,
+% end
+#endif
 };
 
 ASSERT_VM_INSTRUCTION_SIZE(rb_vm_insn_len_info);
diff --git a/tool/ruby_vm/views/_insn_name_info.erb b/tool/ruby_vm/views/_insn_name_info.erb
index e7ded75e6576dd..2862908631e1e3 100644
--- a/tool/ruby_vm/views/_insn_name_info.erb
+++ b/tool/ruby_vm/views/_insn_name_info.erb
@@ -6,10 +6,14 @@
 %# conditions mentioned  in the  file COPYING  are met.   Consult the  file for
 %# details.
 %
-% a = RubyVM::Instructions.map {|i| i.name }
-% b = (0...a.size)
-% c = a.inject([0]) {|r, i| r << (r[-1] + i.length + 1) }
-% c.pop
+% zjit_insns, insns = RubyVM::Instructions.partition { |i| i.name.start_with?('zjit_') }
+%
+% next_offset = 0
+% name_offset = proc do |i|
+%   offset = sprintf("%4d", next_offset)
+%   next_offset += i.name.length + 1 # insn.name + \0
+%   offset
+% end
 %
 CONSTFUNC(MAYBE_UNUSED(static const char *insn_name(VALUE insn)));
 
@@ -20,18 +24,29 @@ extern const unsigned short rb_vm_insn_name_offset[VM_INSTRUCTION_SIZE];
 RUBY_SYMBOL_EXPORT_END
 
 #ifdef RUBY_VM_INSNS_INFO
-const int rb_vm_max_insn_name_size = <%= a.map(&:size).max %>;
+%# "trace_" is longer than "zjit_", so USE_ZJIT doesn't impact the max name size.
+const int rb_vm_max_insn_name_size = <%= RubyVM::Instructions.map { |i| i.name.size }.max %>;
 
 const char rb_vm_insn_name_base[] =
-% a.each do |i|
-    <%=cstr i%> "\0"
+% insns.each do |i|
+    <%= cstr i.name %> "\0"
+% end
+#if USE_ZJIT
+% zjit_insns.each do |i|
+    <%= cstr i.name %> "\0"
 % end
+#endif
     ;
 
 const unsigned short rb_vm_insn_name_offset[] = {
-% c.each_slice 12 do |d|
-    <%= d.map {|i| sprintf("%4d", i) }.join(', ') %>,
+% insns.each_slice(12) do |row|
+    <%= row.map(&name_offset).join(', ') %>,
+% end
+#if USE_ZJIT
+% zjit_insns.each_slice(12) do |row|
+    <%= row.map(&name_offset).join(', ') %>,
 % end
+#endif
 };
 
 ASSERT_VM_INSTRUCTION_SIZE(rb_vm_insn_name_offset);
diff --git a/tool/ruby_vm/views/_insn_operand_info.erb b/tool/ruby_vm/views/_insn_operand_info.erb
index 996c33e9605368..410869fcd3ce11 100644
--- a/tool/ruby_vm/views/_insn_operand_info.erb
+++ b/tool/ruby_vm/views/_insn_operand_info.erb
@@ -6,10 +6,16 @@
 %# conditions mentioned  in the  file COPYING  are met.   Consult the  file for
 %# details.
 %
-% a = RubyVM::Instructions.map {|i| i.operands_info }
-% b = (0...a.size)
-% c = a.inject([0]) {|r, i| r << (r[-1] + i.length + 1) }
-% c.pop
+% zjit_insns, insns = RubyVM::Instructions.partition { |i| i.name.start_with?('zjit_') }
+%
+% operands_info = proc { |i| sprintf("%-6s", cstr(i.operands_info)) }
+%
+% next_offset = 0
+% op_offset = proc do |i|
+%   offset = sprintf("%3d", next_offset)
+%   next_offset += i.operands_info.length + 1 # insn.operands_info + \0
+%   offset
+% end
 %
 CONSTFUNC(MAYBE_UNUSED(static const char *insn_op_types(VALUE insn)));
 CONSTFUNC(MAYBE_UNUSED(static int insn_op_type(VALUE insn, long pos)));
@@ -21,15 +27,25 @@ RUBY_SYMBOL_EXPORT_END
 
 #ifdef RUBY_VM_INSNS_INFO
 const char rb_vm_insn_op_base[] =
-% a.each_slice 5 do |d|
-    <%= d.map {|i| sprintf("%-6s", cstr(i)) }.join(' "\0" ') %> "\0"
+% insns.each_slice(5) do |row|
+    <%= row.map(&operands_info).join(' "\0" ') %> "\0"
+% end
+#if USE_ZJIT
+% zjit_insns.each_slice(5) do |row|
+    <%= row.map(&operands_info).join(' "\0" ') %> "\0"
 % end
+#endif
     ;
 
 const unsigned short rb_vm_insn_op_offset[] = {
-% c.each_slice 12 do |d|
-    <%= d.map {|i| sprintf("%3d", i) }.join(', ') %>,
+% insns.each_slice(12) do |row|
+    <%= row.map(&op_offset).join(', ') %>,
+% end
+#if USE_ZJIT
+% zjit_insns.each_slice(12) do |row|
+    <%= row.map(&op_offset).join(', ') %>,
 % end
+#endif
 };
 
 ASSERT_VM_INSTRUCTION_SIZE(rb_vm_insn_op_offset);
diff --git a/tool/ruby_vm/views/_insn_sp_pc_dependency.erb b/tool/ruby_vm/views/_insn_sp_pc_dependency.erb
index 95528fbbf4c580..7e7d5ade11b209 100644
--- a/tool/ruby_vm/views/_insn_sp_pc_dependency.erb
+++ b/tool/ruby_vm/views/_insn_sp_pc_dependency.erb
@@ -16,7 +16,7 @@ insn_may_depend_on_sp_or_pc(int insn, const VALUE *opes)
 %   # handles_sp?:  If true, it requires to move sp in JIT
 %   # always_leaf?: If false, it may call an arbitrary method. pc should be moved
 %   #               before the call, and the method may refer to caller's pc (lineno).
-%   unless !insn.is_a?(RubyVM::TraceInstructions) && !insn.handles_sp? && insn.always_leaf?
+%   unless !insn.is_a?(RubyVM::TraceInstructions) && !insn.is_a?(RubyVM::ZJITInstructions) && !insn.handles_sp? && insn.always_leaf?
       case <%= insn.bin %>:
 %   end
 % end
diff --git a/tool/ruby_vm/views/_leaf_helpers.erb b/tool/ruby_vm/views/_leaf_helpers.erb
index f740107a0ad873..6dae554a510d68 100644
--- a/tool/ruby_vm/views/_leaf_helpers.erb
+++ b/tool/ruby_vm/views/_leaf_helpers.erb
@@ -10,7 +10,7 @@
 
 #include "iseq.h"
 
-// This is used to tell RJIT that this insn would be leaf if CHECK_INTS didn't exist.
+// This is used to tell JIT that this insn would be leaf if CHECK_INTS didn't exist.
 // It should be used only when RUBY_VM_CHECK_INTS is directly written in insns.def.
 static bool leafness_of_check_ints = false;
 
diff --git a/tool/ruby_vm/views/_sp_inc_helpers.erb b/tool/ruby_vm/views/_sp_inc_helpers.erb
index d0b0bd79efcff2..740fe101420033 100644
--- a/tool/ruby_vm/views/_sp_inc_helpers.erb
+++ b/tool/ruby_vm/views/_sp_inc_helpers.erb
@@ -18,7 +18,7 @@ sp_inc_of_sendish(const struct rb_callinfo *ci)
      * 3. Pop receiver.
      * 4. Push return value.
      */
-    const int argb = (vm_ci_flag(ci) & VM_CALL_ARGS_BLOCKARG) ? 1 : 0;
+    const int argb = (vm_ci_flag(ci) & (VM_CALL_ARGS_BLOCKARG | VM_CALL_FORWARDING)) ? 1 : 0;
     const int argc = vm_ci_argc(ci);
     const int recv = 1;
     const int retn = 1;
diff --git a/tool/ruby_vm/views/_zjit_helpers.erb b/tool/ruby_vm/views/_zjit_helpers.erb
new file mode 100644
index 00000000000000..97b9feffbc3106
--- /dev/null
+++ b/tool/ruby_vm/views/_zjit_helpers.erb
@@ -0,0 +1,31 @@
+#if USE_ZJIT
+
+MAYBE_UNUSED(static int vm_bare_insn_to_zjit_insn(int insn));
+static int
+vm_bare_insn_to_zjit_insn(int insn)
+{
+    switch (insn) {
+% RubyVM::ZJITInstructions.to_a.each do |insn|
+      case BIN(<%= insn.jump_destination %>):
+        return <%= insn.bin %>;
+% end
+      default:
+        return insn;
+    }
+}
+
+MAYBE_UNUSED(static int vm_zjit_insn_to_bare_insn(int insn));
+static int
+vm_zjit_insn_to_bare_insn(int insn)
+{
+    switch (insn) {
+% RubyVM::ZJITInstructions.to_a.each do |insn|
+      case <%= insn.bin %>:
+        return BIN(<%= insn.jump_destination %>);
+% end
+      default:
+        return insn;
+    }
+}
+
+#endif
diff --git a/tool/ruby_vm/views/_zjit_instruction.erb b/tool/ruby_vm/views/_zjit_instruction.erb
new file mode 100644
index 00000000000000..7fd657697cd227
--- /dev/null
+++ b/tool/ruby_vm/views/_zjit_instruction.erb
@@ -0,0 +1,12 @@
+#if USE_ZJIT
+
+/* insn <%= insn.pretty_name %> */
+INSN_ENTRY(<%= insn.name %>)
+{
+    START_OF_ORIGINAL_INSN(<%= insn.name %>);
+    rb_zjit_profile_insn(BIN(<%= insn.jump_destination %>), ec);
+    DISPATCH_ORIGINAL_INSN(<%= insn.jump_destination %>);
+    END_INSN(<%= insn.name %>);
+}
+
+#endif
diff --git a/tool/ruby_vm/views/insns.inc.erb b/tool/ruby_vm/views/insns.inc.erb
index 29981a8a2d0db0..6521a89b8aec23 100644
--- a/tool/ruby_vm/views/insns.inc.erb
+++ b/tool/ruby_vm/views/insns.inc.erb
@@ -6,21 +6,36 @@
 %# 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.
+%
+% zjit_insns, insns = RubyVM::Instructions.partition { |i| i.name.start_with?('zjit_') }
+%
 <%= render 'copyright' %>
 <%= render 'notice', locals: {
     this_file: 'contains YARV instruction list',
     edit: __FILE__,
 } -%>
 
+#ifndef INSNS_INC
+#define INSNS_INC 1
+
 /* BIN : Basic Instruction Name */
 #define BIN(n) YARVINSN_##n
 
 enum ruby_vminsn_type {
-% RubyVM::Instructions.each do |i|
+% insns.each do |i|
+    <%= i.bin %>,
+% end
+#if USE_ZJIT
+% zjit_insns.each do |i|
     <%= i.bin %>,
 % end
+#endif
     VM_INSTRUCTION_SIZE
 };
 
+#define VM_BARE_INSTRUCTION_SIZE <%= RubyVM::Instructions.count { |i| i.name !~ /\A(trace|zjit)_/ } %>
+
 #define ASSERT_VM_INSTRUCTION_SIZE(array) \
     STATIC_ASSERT(numberof_##array, numberof(array) == VM_INSTRUCTION_SIZE)
+
+#endif
diff --git a/tool/ruby_vm/views/insns_info.inc.erb b/tool/ruby_vm/views/insns_info.inc.erb
index 2ca5aca7cf3905..0a6f71fee3574d 100644
--- a/tool/ruby_vm/views/insns_info.inc.erb
+++ b/tool/ruby_vm/views/insns_info.inc.erb
@@ -11,12 +11,15 @@
   this_file: 'contains instruction information for yarv instruction sequence.',
   edit: __FILE__,
 } %>
+#ifndef INSNS_INFO_INC
+#define INSNS_INFO_INC 1
 <%= render 'insn_type_chars' %>
 <%= render 'insn_name_info' %>
 <%= render 'insn_len_info' %>
 <%= render 'insn_operand_info' %>
 <%= render 'leaf_helpers' %>
 <%= render 'sp_inc_helpers' %>
+<%= render 'zjit_helpers' %>
 <%= render 'attributes' %>
 <%= render 'comptime_insn_stack_increase' %>
-<%= render 'insn_sp_pc_dependency' %>
+#endif
diff --git a/tool/ruby_vm/views/lib/ruby_vm/rjit/instruction.rb.erb b/tool/ruby_vm/views/lib/ruby_vm/rjit/instruction.rb.erb
index 4f08524a77b669..793528af5db7a8 100644
--- a/tool/ruby_vm/views/lib/ruby_vm/rjit/instruction.rb.erb
+++ b/tool/ruby_vm/views/lib/ruby_vm/rjit/instruction.rb.erb
@@ -7,7 +7,7 @@ module RubyVM::RJIT # :nodoc: all
       name: :<%= insn.name %>,
       bin: <%= i %>, # BIN(<%= insn.name %>)
       len: <%= insn.width %>, # insn_len
-      operands: <%= (insn.operands unless insn.name.start_with?('trace_')).inspect %>,
+      operands: <%= (insn.operands unless insn.name.start_with?(/trace_|zjit_/)).inspect %>,
     ),
 % end
   }
diff --git a/tool/ruby_vm/views/optunifs.inc.erb b/tool/ruby_vm/views/optunifs.inc.erb
index e92a95beff5400..c096712936d6d3 100644
--- a/tool/ruby_vm/views/optunifs.inc.erb
+++ b/tool/ruby_vm/views/optunifs.inc.erb
@@ -7,7 +7,6 @@
 %# conditions mentioned  in the  file COPYING  are met.   Consult the  file for
 %# details.
 % raise ':FIXME:TBW' if RubyVM::VmOptsH['INSTRUCTIONS_UNIFICATION']
-% n = RubyVM::Instructions.size
 <%= render 'copyright' %>
 <%= render 'notice', locals: {
     this_file: 'is for threaded code',
@@ -16,6 +15,4 @@
 
 /* Let .bss section automatically initialize this variable */
 /* cf. Section 6.7.8 of ISO/IEC 9899:1999 */
-static const int *const *const unified_insns_data[<%= n %>];
-
-ASSERT_VM_INSTRUCTION_SIZE(unified_insns_data);
+static const int *const *const unified_insns_data[VM_INSTRUCTION_SIZE];
diff --git a/tool/ruby_vm/views/vm.inc.erb b/tool/ruby_vm/views/vm.inc.erb
index c1a3faf60a7b57..b92d6d31bcc562 100644
--- a/tool/ruby_vm/views/vm.inc.erb
+++ b/tool/ruby_vm/views/vm.inc.erb
@@ -25,6 +25,10 @@
 <%= render 'insn_entry', locals: { insn: insn } -%>
 % end
 %
+% RubyVM::ZJITInstructions.to_a.each do |insn|
+<%= render 'zjit_instruction', locals: { insn: insn } -%>
+% end
+%
 % RubyVM::TraceInstructions.to_a.each do |insn|
 <%= render 'trace_instruction', locals: { insn: insn } -%>
 % end
diff --git a/tool/ruby_vm/views/vmtc.inc.erb b/tool/ruby_vm/views/vmtc.inc.erb
index 99cbd92614930b..39dc8bfa6b25db 100644
--- a/tool/ruby_vm/views/vmtc.inc.erb
+++ b/tool/ruby_vm/views/vmtc.inc.erb
@@ -6,6 +6,9 @@
 %# 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.
+%
+% zjit_insns, insns = RubyVM::Instructions.partition { |i| i.name.start_with?('zjit_') }
+%
 <%= render 'copyright' -%>
 <%= render 'notice', locals: {
     this_file: 'is for threaded code',
@@ -13,9 +16,14 @@
 } -%>
 
 static const void *const insns_address_table[] = {
-% RubyVM::Instructions.each do |i|
+% insns.each do |i|
     LABEL_PTR(<%= i.name %>),
 % end
+#if USE_ZJIT
+% zjit_insns.each do |i|
+    LABEL_PTR(<%= i.name %>),
+% end
+#endif
 };
 
 ASSERT_VM_INSTRUCTION_SIZE(insns_address_table);
diff --git a/tool/rubyspec_temp.rb b/tool/rubyspec_temp.rb
deleted file mode 100644
index 339bfce211a32f..00000000000000
--- a/tool/rubyspec_temp.rb
+++ /dev/null
@@ -1,13 +0,0 @@
-require "tmpdir"
-require "fileutils"
-
-if (tmpdir = Dir.mktmpdir("rubyspec_temp.")).size > 80
-  # On macOS, the default TMPDIR is very long, inspite of UNIX socket
-  # path length is limited.
-  Dir.rmdir(tmpdir)
-  tmpdir = Dir.mktmpdir("rubyspec_temp.", "/tmp")
-end
-# warn "tmpdir(#{tmpdir.size}) = #{tmpdir}"
-END {FileUtils.rm_rf(tmpdir)}
-
-ENV["TMPDIR"] = ENV["SPEC_TEMP_DIR"] = tmpdir
diff --git a/tool/run-gcov.rb b/tool/run-gcov.rb
index 5df7622aa371d4..46626e4703f4b4 100644
--- a/tool/run-gcov.rb
+++ b/tool/run-gcov.rb
@@ -47,7 +47,8 @@
       )?
       Creating\ .*\n
       \n
-    )+\z
+    )+
+    (Lines\ executed:.*\n)?\z
   )x
     raise "Unexpected gcov output"
   end
diff --git a/tool/run-lcov.rb b/tool/run-lcov.rb
index f27578200a4828..bdccc29a11fece 100644
--- a/tool/run-lcov.rb
+++ b/tool/run-lcov.rb
@@ -20,7 +20,7 @@ def backup_gcda_files(gcda_files)
 end
 
 def run_lcov(*args)
-  system("lcov", "--rc", "lcov_branch_coverage=1", *args)
+  system("lcov", "--rc", "geninfo_unexecuted_blocks=1", "--rc", "lcov_branch_coverage=1", *args, exception: true)
 end
 
 $info_files = []
@@ -41,11 +41,19 @@ def run_lcov_remove(info_src, info_out)
     ext/-test-/*
     ext/nkf/nkf-utf8/nkf.c
   ).each {|f| dirs << File.join(File.dirname(__dir__), f) }
-  run_lcov("--remove", info_src, *dirs, "-o", info_out)
+  run_lcov("--ignore-errors", "unused", "--remove", info_src, *dirs, "-o", info_out)
 end
 
 def run_genhtml(info, out)
-  system("genhtml", "--branch-coverage", "--ignore-errors", "source", info, "-o", out)
+  base_dir = File.dirname(File.dirname(__dir__))
+  ignore_errors = %w(source unmapped category).reject do |a|
+    Open3.capture3("genhtml", "--ignore-errors", a)[1].include?("unknown argument for --ignore-errors")
+  end
+  system("genhtml",
+    "--branch-coverage",
+    "--prefix", base_dir,
+    *ignore_errors.flat_map {|a| ["--ignore-errors", a] },
+    info, "-o", out, exception: true)
 end
 
 def gen_rb_lcov(file)
diff --git a/tool/runruby.rb b/tool/runruby.rb
index c6724f53d3f7b3..ec63d1008a2348 100755
--- a/tool/runruby.rb
+++ b/tool/runruby.rb
@@ -11,6 +11,8 @@
   debugger = :gdb
 when ENV['RUNRUBY_USE_LLDB'] == 'true'
   debugger = :lldb
+when ENV['RUNRUBY_USE_RR'] == 'true'
+  debugger = :rr
 when ENV['RUNRUBY_YJIT_STATS']
   use_yjit_stat = true
 end
@@ -142,7 +144,7 @@ def File.realpath(*args)
 
 if debugger
   case debugger
-  when :gdb, nil
+  when :gdb
     debugger = %W'gdb -x #{srcdir}/.gdbinit'
     if File.exist?(gdb = 'run.gdb') or
       File.exist?(gdb = File.join(abs_archdir, 'run.gdb'))
@@ -156,6 +158,8 @@ def File.realpath(*args)
       debugger.push('-s', lldb)
     end
     debugger << '--'
+  when :rr
+    debugger = ['rr', 'record']
   end
 
   if idx = precommand.index(:debugger)
diff --git a/tool/sync_default_gems.rb b/tool/sync_default_gems.rb
index fcfb06047e7b60..7a231772b5cbb4 100755
--- a/tool/sync_default_gems.rb
+++ b/tool/sync_default_gems.rb
@@ -3,6 +3,7 @@
 # See `tool/sync_default_gems.rb --help` for how to use this.
 
 require 'fileutils'
+require "rbconfig"
 
 module SyncDefaultGems
   include FileUtils
@@ -17,58 +18,39 @@ module SyncDefaultGems
     "net-http": "ruby/net-http",
     "net-protocol": "ruby/net-protocol",
     "open-uri": "ruby/open-uri",
-    "resolv-replace": "ruby/resolv-replace",
+    "win32-registry": "ruby/win32-registry",
     English: "ruby/English",
-    abbrev: "ruby/abbrev",
-    base64: "ruby/base64",
-    benchmark: "ruby/benchmark",
-    bigdecimal: "ruby/bigdecimal",
     cgi: "ruby/cgi",
-    csv: 'ruby/csv',
     date: 'ruby/date',
     delegate: "ruby/delegate",
     did_you_mean: "ruby/did_you_mean",
     digest: "ruby/digest",
-    drb: "ruby/drb",
     erb: "ruby/erb",
     error_highlight: "ruby/error_highlight",
     etc: 'ruby/etc',
     fcntl: 'ruby/fcntl',
-    fiddle: 'ruby/fiddle',
     fileutils: 'ruby/fileutils',
     find: "ruby/find",
     forwardable: "ruby/forwardable",
-    getoptlong: "ruby/getoptlong",
     ipaddr: 'ruby/ipaddr',
-    irb: 'ruby/irb',
-    json: 'flori/json',
-    logger: 'ruby/logger',
-    mutex_m: "ruby/mutex_m",
-    nkf: "ruby/nkf",
-    observer: "ruby/observer",
+    json: 'ruby/json',
+    mmtk: ['ruby/mmtk', "main"],
     open3: "ruby/open3",
     openssl: "ruby/openssl",
     optparse: "ruby/optparse",
-    ostruct: 'ruby/ostruct',
     pathname: "ruby/pathname",
     pp: "ruby/pp",
     prettyprint: "ruby/prettyprint",
-    pstore: "ruby/pstore",
+    prism: ["ruby/prism", "main"],
     psych: 'ruby/psych',
-    rdoc: 'ruby/rdoc',
-    readline: "ruby/readline",
-    reline: 'ruby/reline',
     resolv: "ruby/resolv",
-    rinda: "ruby/rinda",
     rubygems: 'rubygems/rubygems',
     securerandom: "ruby/securerandom",
-    set: "ruby/set",
     shellwords: "ruby/shellwords",
     singleton: "ruby/singleton",
     stringio: 'ruby/stringio',
     strscan: 'ruby/strscan',
     syntax_suggest: ["ruby/syntax_suggest", "main"],
-    syslog: "ruby/syslog",
     tempfile: "ruby/tempfile",
     time: "ruby/time",
     timeout: "ruby/timeout",
@@ -77,9 +59,7 @@ module SyncDefaultGems
     un: "ruby/un",
     uri: "ruby/uri",
     weakref: "ruby/weakref",
-    win32ole: "ruby/win32ole",
     yaml: "ruby/yaml",
-    yarp: ["ruby/yarp", "main"],
     zlib: 'ruby/zlib',
   }.transform_keys(&:to_s)
 
@@ -149,66 +129,37 @@ def sync_default_gems(gem)
       gemspec_content = File.readlines("#{upstream}/bundler/bundler.gemspec").map do |line|
         next if line =~ /LICENSE\.md/
 
-        line.gsub("bundler.gemspec", "lib/bundler/bundler.gemspec").gsub('"exe"', '"libexec"')
+        line.gsub("bundler.gemspec", "lib/bundler/bundler.gemspec")
       end.compact.join
       File.write("lib/bundler/bundler.gemspec", gemspec_content)
 
       cp_r("#{upstream}/bundler/spec", "spec/bundler")
+      rm_rf("spec/bundler/bin")
+
+      ["bundle", "parallel_rspec", "rspec"].each do |binstub|
+        content = File.read("#{upstream}/bundler/bin/#{binstub}").gsub("../spec", "../bundler")
+        File.write("spec/bin/#{binstub}", content)
+        chmod("+x", "spec/bin/#{binstub}")
+      end
+
       %w[dev_gems test_gems rubocop_gems standard_gems].each do |gemfile|
-        cp_r("#{upstream}/tool/bundler/#{gemfile}.rb", "tool/bundler")
+        ["rb.lock", "rb"].each do |ext|
+          cp_r("#{upstream}/tool/bundler/#{gemfile}.#{ext}", "tool/bundler")
+        end
       end
       rm_rf Dir.glob("spec/bundler/support/artifice/{vcr_cassettes,used_cassettes.txt}")
       rm_rf Dir.glob("lib/{bundler,rubygems}/**/{COPYING,LICENSE,README}{,.{md,txt,rdoc}}")
-    when "rdoc"
-      rm_rf(%w[lib/rdoc lib/rdoc.rb test/rdoc libexec/rdoc libexec/ri])
-      cp_r(Dir.glob("#{upstream}/lib/rdoc*"), "lib")
-      cp_r("#{upstream}/doc/rdoc", "doc")
-      cp_r("#{upstream}/test/rdoc", "test")
-      cp_r("#{upstream}/rdoc.gemspec", "lib/rdoc")
-      cp_r("#{upstream}/Gemfile", "lib/rdoc")
-      cp_r("#{upstream}/Rakefile", "lib/rdoc")
-      cp_r("#{upstream}/exe/rdoc", "libexec")
-      cp_r("#{upstream}/exe/ri", "libexec")
-      parser_files = {
-        'lib/rdoc/markdown.kpeg' => 'lib/rdoc/markdown.rb',
-        'lib/rdoc/markdown/literals.kpeg' => 'lib/rdoc/markdown/literals.rb',
-        'lib/rdoc/rd/block_parser.ry' => 'lib/rdoc/rd/block_parser.rb',
-        'lib/rdoc/rd/inline_parser.ry' => 'lib/rdoc/rd/inline_parser.rb'
-      }
-      Dir.chdir(upstream) do
-        `bundle install`
-        parser_files.each_value do |dst|
-          `bundle exec rake #{dst}`
-        end
-      end
-      parser_files.each_pair do |src, dst|
-        rm_rf(src)
-        cp_r("#{upstream}/#{dst}", dst)
-      end
-      `git checkout lib/rdoc/.document`
-      rm_rf(%w[lib/rdoc/Gemfile lib/rdoc/Rakefile])
-    when "reline"
-      rm_rf(%w[lib/reline lib/reline.rb test/reline])
-      cp_r(Dir.glob("#{upstream}/lib/reline*"), "lib")
-      cp_r("#{upstream}/test/reline", "test")
-      cp_r("#{upstream}/reline.gemspec", "lib/reline")
-    when "irb"
-      rm_rf(%w[lib/irb lib/irb.rb test/irb])
-      cp_r(Dir.glob("#{upstream}/lib/irb*"), "lib")
-      cp_r("#{upstream}/test/irb", "test")
-      cp_r("#{upstream}/irb.gemspec", "lib/irb")
-      cp_r("#{upstream}/man/irb.1", "man/irb.1")
-      cp_r("#{upstream}/doc/irb", "doc")
     when "json"
-      rm_rf(%w[ext/json test/json])
+      rm_rf(%w[ext/json lib/json test/json])
       cp_r("#{upstream}/ext/json/ext", "ext/json")
-      cp_r("#{upstream}/tests", "test/json")
+      cp_r("#{upstream}/test/json", "test/json")
       rm_rf("test/json/lib")
       cp_r("#{upstream}/lib", "ext/json")
       cp_r("#{upstream}/json.gemspec", "ext/json")
-      cp_r("#{upstream}/VERSION", "ext/json")
-      rm_rf(%w[ext/json/lib/json/ext ext/json/lib/json/pure.rb ext/json/lib/json/pure])
-      `git checkout ext/json/extconf.rb ext/json/parser/prereq.mk ext/json/generator/depend ext/json/parser/depend ext/json/depend`
+      rm_rf(%w[ext/json/lib/json/pure.rb ext/json/lib/json/pure ext/json/lib/json/truffle_ruby/])
+      json_files = Dir.glob("ext/json/lib/json/ext/**/*", File::FNM_DOTMATCH).select { |f| File.file?(f) }
+      rm_rf(json_files - Dir.glob("ext/json/lib/json/ext/**/*.rb") - Dir.glob("ext/json/lib/json/ext/**/depend"))
+      `git checkout ext/json/extconf.rb ext/json/generator/depend ext/json/parser/depend ext/json/depend benchmark/`
     when "psych"
       rm_rf(%w[ext/psych test/psych])
       cp_r("#{upstream}/ext/psych", "ext")
@@ -219,14 +170,6 @@ def sync_default_gems(gem)
       rm_rf(["ext/psych/yaml/LICENSE"])
       cp_r("#{upstream}/psych.gemspec", "ext/psych")
       `git checkout ext/psych/depend ext/psych/.gitignore`
-    when "fiddle"
-      rm_rf(%w[ext/fiddle test/fiddle])
-      cp_r("#{upstream}/ext/fiddle", "ext")
-      cp_r("#{upstream}/lib", "ext/fiddle")
-      cp_r("#{upstream}/test/fiddle", "test")
-      cp_r("#{upstream}/fiddle.gemspec", "ext/fiddle")
-      `git checkout ext/fiddle/depend`
-      rm_rf(%w[ext/fiddle/lib/fiddle.{bundle,so}])
     when "stringio"
       rm_rf(%w[ext/stringio test/stringio])
       cp_r("#{upstream}/ext/stringio", "ext")
@@ -283,18 +226,25 @@ def sync_default_gems(gem)
     when "strscan"
       rm_rf(%w[ext/strscan test/strscan])
       cp_r("#{upstream}/ext/strscan", "ext")
+      cp_r("#{upstream}/lib", "ext/strscan")
       cp_r("#{upstream}/test/strscan", "test")
       cp_r("#{upstream}/strscan.gemspec", "ext/strscan")
+      begin
+        cp_r("#{upstream}/doc/strscan", "doc")
+      rescue Errno::ENOENT
+      end
       rm_rf(%w["ext/strscan/regenc.h ext/strscan/regint.h"])
       `git checkout ext/strscan/depend`
     when "cgi"
       rm_rf(%w[lib/cgi.rb lib/cgi ext/cgi test/cgi])
       cp_r("#{upstream}/ext/cgi", "ext")
-      cp_r("#{upstream}/lib", ".")
+      mkdir_p("lib/cgi")
+      cp_r("#{upstream}/lib/cgi/escape.rb", "lib/cgi")
+      mkdir_p("test/cgi")
+      cp_r("#{upstream}/test/cgi/test_cgi_escape.rb", "test/cgi")
+      cp_r("#{upstream}/test/cgi/update_env.rb", "test/cgi")
       rm_rf("lib/cgi/escape.jar")
-      cp_r("#{upstream}/test/cgi", "test")
-      cp_r("#{upstream}/cgi.gemspec", "lib/cgi")
-      `git checkout ext/cgi/escape/depend`
+      `git checkout lib/cgi.rb lib/cgi/util.rb ext/cgi/escape/depend`
     when "openssl"
       rm_rf(%w[ext/openssl test/openssl])
       cp_r("#{upstream}/ext/openssl", "ext")
@@ -326,31 +276,8 @@ def sync_default_gems(gem)
       rm_rf(%w[lib/erb* test/erb libexec/erb])
       cp_r("#{upstream}/lib/erb.rb", "lib")
       cp_r("#{upstream}/test/erb", "test")
-      cp_r("#{upstream}/erb.gemspec", "lib")
+      cp_r("#{upstream}/erb.gemspec", "lib/erb")
       cp_r("#{upstream}/libexec/erb", "libexec")
-    when "nkf"
-      rm_rf(%w[ext/nkf test/nkf])
-      cp_r("#{upstream}/ext/nkf", "ext")
-      cp_r("#{upstream}/lib", "ext/nkf")
-      cp_r("#{upstream}/test/nkf", "test")
-      cp_r("#{upstream}/nkf.gemspec", "ext/nkf")
-      `git checkout ext/nkf/depend`
-    when "syslog"
-      rm_rf(%w[ext/syslog test/syslog test/test_syslog.rb])
-      cp_r("#{upstream}/ext/syslog", "ext")
-      cp_r("#{upstream}/lib", "ext/syslog")
-      cp_r("#{upstream}/test/syslog", "test")
-      cp_r("#{upstream}/test/test_syslog.rb", "test")
-      cp_r("#{upstream}/syslog.gemspec", "ext/syslog")
-      `git checkout ext/syslog/depend`
-    when "bigdecimal"
-      rm_rf(%w[ext/bigdecimal test/bigdecimal])
-      cp_r("#{upstream}/ext/bigdecimal", "ext")
-      cp_r("#{upstream}/sample", "ext/bigdecimal")
-      cp_r("#{upstream}/lib", "ext/bigdecimal")
-      cp_r("#{upstream}/test/bigdecimal", "test")
-      cp_r("#{upstream}/bigdecimal.gemspec", "ext/bigdecimal")
-      `git checkout ext/bigdecimal/depend`
     when "pathname"
       rm_rf(%w[ext/pathname test/pathname])
       cp_r("#{upstream}/ext/pathname", "ext")
@@ -370,9 +297,6 @@ def sync_default_gems(gem)
       cp_r("#{upstream}/test/digest", "test")
       cp_r("#{upstream}/digest.gemspec", "ext/digest")
       `git checkout ext/digest/depend ext/digest/*/depend`
-    when "set"
-      sync_lib gem, upstream
-      cp_r(Dir.glob("#{upstream}/test/*"), "test/set")
     when "optparse"
       sync_lib gem, upstream
       rm_rf(%w[doc/optparse])
@@ -383,12 +307,6 @@ def sync_default_gems(gem)
       cp_r(Dir.glob("#{upstream}/lib/error_highlight*"), "lib")
       cp_r("#{upstream}/error_highlight.gemspec", "lib/error_highlight")
       cp_r("#{upstream}/test", "test/error_highlight")
-    when "win32ole"
-      sync_lib gem, upstream
-      rm_rf(%w[ext/win32ole/lib])
-      Dir.mkdir(*%w[ext/win32ole/lib])
-      move("lib/win32ole/win32ole.gemspec", "ext/win32ole")
-      move(Dir.glob("lib/win32ole*"), "ext/win32ole/lib")
     when "open3"
       sync_lib gem, upstream
       rm_rf("lib/open3/jruby_windows.rb")
@@ -397,52 +315,95 @@ def sync_default_gems(gem)
       rm_rf(%w[spec/syntax_suggest libexec/syntax_suggest])
       cp_r("#{upstream}/spec", "spec/syntax_suggest")
       cp_r("#{upstream}/exe/syntax_suggest", "libexec/syntax_suggest")
-    when "yarp"
-      # We don't want to remove yarp_init.c, so we temporarily move it
-      # out of the yarp dir, wipe the yarp dir, and then put it back
-      mv("yarp/yarp_init.c", ".")
-      mv("yarp/yarp_compiler.c", ".")
-      mv("test/yarp/compiler_test.rb", ".")
-      rm_rf(%w[test/yarp yarp])
-
-      # Run the YARP templating scripts
-      cp_r("#{upstream}/ext/yarp", "yarp")
-      cp_r("#{upstream}/lib/.", "lib")
-      cp_r("#{upstream}/test/yarp", "test")
-      cp_r("#{upstream}/src/.", "yarp")
+    when "prism"
+      rm_rf(%w[test/prism prism])
 
-      cp_r("#{upstream}/yarp.gemspec", "lib/yarp")
-      cp_r("#{upstream}/include/yarp/.", "yarp")
-      cp_r("#{upstream}/include/yarp.h", "yarp")
-
-      cp_r("#{upstream}/config.yml", "yarp/")
-      cp_r("#{upstream}/templates", "yarp/")
-      rm_rf("yarp/templates/java")
-
-      rm("yarp/extconf.rb")
-      mv("yarp_init.c", "yarp/")
-      mv("yarp_compiler.c", "yarp/")
-      mv("compiler_test.rb", "test/yarp/")
+      cp_r("#{upstream}/ext/prism", "prism")
+      cp_r("#{upstream}/lib/.", "lib")
+      cp_r("#{upstream}/test/prism", "test")
+      cp_r("#{upstream}/src/.", "prism")
+
+      cp_r("#{upstream}/prism.gemspec", "lib/prism")
+      cp_r("#{upstream}/include/prism/.", "prism")
+      cp_r("#{upstream}/include/prism.h", "prism")
+
+      cp_r("#{upstream}/config.yml", "prism/")
+      cp_r("#{upstream}/templates", "prism/")
+      rm_rf("prism/templates/javascript")
+      rm_rf("prism/templates/java")
+      rm_rf("prism/templates/rbi")
+      rm_rf("prism/templates/sig")
+
+      rm("test/prism/snapshots_test.rb")
+      rm_rf("test/prism/snapshots")
+
+      rm("prism/extconf.rb")
+    when "resolv"
+      rm_rf(%w[lib/resolv.* ext/win32/resolv test/resolv ext/win32/lib/win32/resolv.rb])
+      cp_r("#{upstream}/lib/resolv.rb", "lib")
+      cp_r("#{upstream}/resolv.gemspec", "lib")
+      cp_r("#{upstream}/ext/win32/resolv", "ext/win32")
+      move("ext/win32/resolv/lib/resolv.rb", "ext/win32/lib/win32")
+      rm_rf("ext/win32/resolv/lib") # Clean up empty directory
+      cp_r("#{upstream}/test/resolv", "test")
+      `git checkout ext/win32/resolv/depend`
+    when "win32-registry"
+      rm_rf(%w[ext/win32/lib/win32/registry.rb test/win32/test_registry.rb])
+      cp_r("#{upstream}/lib/win32/registry.rb", "ext/win32/lib/win32")
+      cp_r("#{upstream}/test/win32/test_registry.rb", "test/win32")
+      cp_r("#{upstream}/win32-registry.gemspec", "ext/win32")
+    when "mmtk"
+      rm_rf("gc/mmtk")
+      cp_r("#{upstream}/gc/mmtk", "gc")
     else
       sync_lib gem, upstream
     end
+
+    check_prerelease_version(gem)
+
+    # Architecture-dependent files must not pollute libdir.
+    rm_rf(Dir["lib/**/*.#{RbConfig::CONFIG['DLEXT']}"])
     replace_rdoc_ref_all
   end
 
+  def check_prerelease_version(gem)
+    return if ["rubygems", "mmtk", "cgi"].include?(gem)
+
+    gem = gem.downcase
+
+    require "net/https"
+    require "json"
+    require "uri"
+
+    uri = URI("https://rubygems.org/api/v1/versions/#{gem}/latest.json")
+    response = Net::HTTP.get(uri)
+    latest_version = JSON.parse(response)["version"]
+
+    gemspec = [
+      "lib/#{gem}/#{gem}.gemspec",
+      "lib/#{gem}.gemspec",
+      "ext/#{gem}/#{gem}.gemspec",
+      "ext/#{gem.split("-").join("/")}/#{gem}.gemspec",
+      "lib/#{gem.split("-").first}/#{gem}.gemspec",
+      "ext/#{gem.split("-").first}/#{gem}.gemspec",
+      "lib/#{gem.split("-").join("/")}/#{gem}.gemspec",
+    ].find{|gemspec| File.exist?(gemspec)}
+    spec = Gem::Specification.load(gemspec)
+    puts "#{gem}-#{spec.version} is not latest version of rubygems.org" if spec.version.to_s != latest_version
+  end
+
   def ignore_file_pattern_for(gem)
     patterns = []
 
     # Common patterns
     patterns << %r[\A(?:
-      [A-Z]\w*\.(?:md|txt)
-      |[^/]+\.yml
+      [^/]+ # top-level entries
       |\.git.*
-      |[A-Z]\w+file
-      |COPYING
-      |Gemfile.lock
       |bin/.*
+      |ext/.*\.java
       |rakelib/.*
-      |test/lib/.*
+      |test/(?:lib|fixtures)/.*
+      |tool/(?!bundler/).*
     )\z]mx
 
     # Gem-specific patterns
@@ -456,11 +417,21 @@ def ignore_file_pattern_for(gem)
   end
 
   def message_filter(repo, sha, input: ARGF)
+    unless repo.count("/") == 1 and /\A\S+\z/ =~ repo
+      raise ArgumentError, "invalid repository: #{repo}"
+    end
+    unless /\A\h{10,40}\z/ =~ sha
+      raise ArgumentError, "invalid commit-hash: #{sha}"
+    end
     log = input.read
     log.delete!("\r")
     log << "\n" if !log.end_with?("\n")
     repo_url = "https://github.com/#{repo}"
-    subject, log = log.split(/\n(?:[ \t]*(?:\n|\z))/, 2)
+
+    # Split the subject from the log message according to git conventions.
+    # SPECIAL TREAT: when the first line ends with a dot `.` (which is not
+    # obeying the conventions too), takes only that line.
+    subject, log = log.split(/\A.+\.\K\n(?=\S)|\n(?:[ \t]*(?:\n|\z))/, 2)
     conv = proc do |s|
       mod = true if s.gsub!(/\b(?:(?i:fix(?:e[sd])?|close[sd]?|resolve[sd]?) +)\K#(?=\d+\b)|\bGH-#?(?=\d+\b)|\(\K#(?=\d+\))/) {
         "#{repo_url}/pull/"
@@ -494,8 +465,10 @@ def message_filter(repo, sha, input: ARGF)
   def commits_in_ranges(gem, repo, default_branch, ranges)
     # If -a is given, discover all commits since the last picked commit
     if ranges == true
-      pattern = "https://github\.com/#{Regexp.quote(repo)}/commit/([0-9a-f]+)$"
-      log = IO.popen(%W"git log -E --grep=#{pattern} -n1 --format=%B", &:read)
+      # \r? needed in the regex in case the commit has windows-style line endings (because e.g. we're running
+      # tests on Windows)
+      pattern = "https://github\.com/#{Regexp.quote(repo)}/commit/([0-9a-f]+)\r?$"
+      log = IO.popen(%W"git log -E --grep=#{pattern} -n1 --format=%B", "rb", &:read)
       ranges = ["#{log[%r[#{pattern}\n\s*(?i:co-authored-by:.*)*\s*\Z], 1]}..#{gem}/#{default_branch}"]
     end
 
@@ -505,7 +478,7 @@ def commits_in_ranges(gem, repo, default_branch, ranges)
         range = "#{range}~1..#{range}"
       end
 
-      IO.popen(%W"git log --format=%H,%s #{range} --") do |f|
+      IO.popen(%W"git log --format=%H,%s #{range} --", "rb") do |f|
         f.read.split("\n").reverse.map{|commit| commit.split(',', 2)}
       end
     end
@@ -549,6 +522,8 @@ def resolve_conflicts(gem, sha, edit)
         end
         if editor
           system([editor, conflict].join(' '))
+          conflict.delete_if {|f| !File.exist?(f)}
+          return true if conflict.empty?
           return system(*%w"git add --", *conflict)
         end
       end
@@ -558,6 +533,10 @@ def resolve_conflicts(gem, sha, edit)
     return true
   end
 
+  def preexisting?(base, file)
+    system(*%w"git cat-file -e", "#{base}:#{file}", err: File::NULL)
+  end
+
   def filter_pickup_files(changed, ignore_file_pattern, base)
     toplevels = {}
     remove = []
@@ -565,19 +544,13 @@ def filter_pickup_files(changed, ignore_file_pattern, base)
     changed = changed.reject do |f|
       case
       when toplevels.fetch(top = f[%r[\A[^/]+(?=/|\z)]m]) {
-             remove << top unless
-               toplevels[top] = system(*%w"git cat-file -e", "#{base}:#{top}", err: File::NULL)
+             remove << top if toplevels[top] = !preexisting?(base, top)
            }
         # Remove any new top-level directories.
         true
-      when !f.include?("/"),
-           f.start_with?("test/fixtures/", "test/lib/", "tool/")
-        # Forcibly reset any top-level entries, and any changes under
-        # /test/fixtures, /test/lib, or /tool.
-        ignore << f
       when ignore_file_pattern.match?(f)
         # Forcibly reset any changes matching ignore_file_pattern.
-        ignore << f
+        (preexisting?(base, f) ? ignore : remove) << f
       end
     end
     return changed, remove, ignore
@@ -603,7 +576,7 @@ def pickup_files(gem, changed, picked)
     unless ignore.empty?
       puts "Reset ignored files: #{ignore.join(', ')}"
       system(*%W"git rm -r --", *ignore)
-      system(*%W"git checkout -f", base, "--", *ignore)
+      ignore.each {|f| system(*%W"git checkout -f", base, "--", f)}
     end
 
     if changed.empty?
@@ -615,7 +588,7 @@ def pickup_files(gem, changed, picked)
 
   def pickup_commit(gem, sha, edit)
     # Attempt to cherry-pick a commit
-    result = IO.popen(%W"git cherry-pick #{sha}", &:read)
+    result = IO.popen(%W"git cherry-pick #{sha}", "rb", &:read)
     picked = $?.success?
     if result =~ /nothing\ to\ commit/
       `git reset`
diff --git a/tool/sync_test_lib.rb b/tool/sync_test_lib.rb
deleted file mode 100755
index 23ca4a11548d86..00000000000000
--- a/tool/sync_test_lib.rb
+++ /dev/null
@@ -1,101 +0,0 @@
-#!/usr/bin/env ruby
-
-require "fileutils"
-
-test_lib_files = [
-  ["lib/core_assertions.rb", "test/lib"],
-  ["lib/find_executable.rb", "test/lib"],
-  ["lib/envutil.rb", "test/lib"],
-  ["lib/helper.rb", "test/lib"],
-  ["rakelib/sync_tool.rake", "rakelib"],
-].map do |file, dest|
-  [file, dest, File.read("#{__dir__}/#{file}")]
-end
-
-repos = %w[
-  bigdecimal cgi cmath date delegate did_you_mean digest drb erb etc
-  fileutils find forwardable io-console io-nonblock io-wait ipaddr
-  irb logger net-http net-protocol open-uri open3 openssl optparse
-  ostruct pathname pstore psych racc resolv stringio strscan tempfile
-  time timeout tmpdir uri weakref win32ole yaml zlib
-]
-
-branch_name = "update-test-lib-#{Time.now.strftime("%Y%m%d")}"
-title = "Update test libraries from ruby/ruby #{Time.now.strftime("%Y-%m-%d")}"
-commit = `git rev-parse HEAD`.chomp
-message = "From https://github.com/ruby/ruby/commit/#{commit}"
-
-update = true
-keep = nil
-topdir = nil
-while arg = ARGV.shift
-  case arg
-  when '--dry-run'
-    update = false
-    keep = true
-  when '--update'
-    update = true
-    keep = false if keep.nil?
-  when '--no-update'
-    update = false
-    keep = true if keep.nil?
-  when '--keep'
-    keep = true
-  when '--no-keep'
-    keep = false
-  when '--'
-    break
-  else
-    if topdir
-      ARGV.unshift(arg)
-    else
-      topdir = arg
-    end
-    break
-  end
-end
-topdir ||= '..'
-repos = ARGV unless ARGV.empty?
-
-repos.each do |repo|
-  puts "#{repo}: start"
-
-  Dir.chdir("#{topdir}/#{repo}") do
-    if `git branch --list #{branch_name}`.empty?
-      system(*%W"git switch master")
-      system(*%W"git switch -c #{branch_name}")
-    else
-      puts "#{repo}: skip"
-      next
-    end
-
-    test_lib_files.each do |file, dest, code|
-      FileUtils.mkdir_p(dest)
-      file = "#{dest}/#{File.basename(file)}"
-      File.binwrite(file, code)
-      system "git add #{file}"
-    end
-
-    rf = File.binread("Rakefile")
-    if rf.sub!(/(?>\A|(\n)\n*)task +:sync_tool +do\n(?>(?> .*)?\n)*end\n(?=\z|(\n))/) {$1&&$2}
-      File.binwrite("Rakefile", rf)
-      system "git add Rakefile"
-    end
-
-    if IO.popen(%W"git commit -m #{title}\n\n#{message}", &:read).chomp =~ /nothing to commit/
-      puts "#{repo}: nothing to update"
-    elsif update
-      system(*%W"git push")
-      system(*%W"gh repo set-default ruby/#{repo}")
-      system(*%W"gh pr create --base master --head ruby:#{branch_name} --title #{title} --body #{message}")
-      puts "#{repo}: updated"
-    end
-
-    unless keep
-      system "git switch master"
-      system "git branch -D #{branch_name}"
-    end
-  end
-rescue StandardError => e
-  puts e
-end
diff --git a/tool/test-annocheck.sh b/tool/test-annocheck.sh
index 0224152d007b6b..6896869e07e964 100755
--- a/tool/test-annocheck.sh
+++ b/tool/test-annocheck.sh
@@ -14,7 +14,8 @@ set -x
 
 DOCKER="$(command -v docker || command -v podman)"
 TAG=ruby-fedora-annocheck
-TOOL_DIR=$(dirname "${0}")
+TOOL_DIR="$(dirname "${0}")"
+TMP_DIR="tmp/annocheck"
 DOCKER_RUN_VOLUME_OPTS=
 
 if [ -z "${CI-}" ]; then
@@ -27,7 +28,13 @@ else
   # volume in container in container on GitHub Actions
   # <.github/workflows/compilers.yml>.
   TAG="${TAG}-copy"
-  "${DOCKER}" build --rm -t "${TAG}" --build-arg=FILES="${*}" -f ${TOOL_DIR}/annocheck/Dockerfile-copy .
+  rm -rf "${TMP_DIR}"
+  mkdir -p "${TMP_DIR}"
+  for file in "${@}"; do
+    cp -p "${file}" "${TMP_DIR}"
+  done
+  "${DOCKER}" build --rm -t "${TAG}" --build-arg=IN_DIR="${TMP_DIR}" -f ${TOOL_DIR}/annocheck/Dockerfile-copy .
+  rm -rf "${TMP_DIR}"
 fi
 
 "${DOCKER}" run --rm -t ${DOCKER_RUN_VOLUME_OPTS} "${TAG}" annocheck --verbose ${TEST_ANNOCHECK_OPTS-} "${@}"
diff --git a/tool/test-bundled-gems.rb b/tool/test-bundled-gems.rb
index 9721d2d908ebf3..2b7e8916e50964 100644
--- a/tool/test-bundled-gems.rb
+++ b/tool/test-bundled-gems.rb
@@ -2,15 +2,20 @@
 require 'timeout'
 require 'fileutils'
 require_relative 'lib/colorize'
+require_relative 'lib/gem_env'
 
 ENV.delete("GNUMAKEFLAGS")
 
 github_actions = ENV["GITHUB_ACTIONS"] == "true"
 
 allowed_failures = ENV['TEST_BUNDLED_GEMS_ALLOW_FAILURES'] || ''
-allowed_failures = allowed_failures.split(',').reject(&:empty?)
+if RUBY_PLATFORM =~ /mswin|mingw/
+  allowed_failures = [allowed_failures, "rbs,debug,irb,power_assert"].join(',')
+end
+allowed_failures = allowed_failures.split(',').uniq.reject(&:empty?)
 
-ENV["GEM_PATH"] = [File.realpath('.bundle'), File.realpath('../.bundle', __dir__)].join(File::PATH_SEPARATOR)
+# make test-bundled-gems BUNDLED_GEMS=gem1,gem2,gem3
+bundled_gems = ARGV.first || ''
 
 colorize = Colorize.new
 rake = File.realpath("../../.bundle/bin/rake", __FILE__)
@@ -22,21 +27,22 @@
 File.foreach("#{gem_dir}/bundled_gems") do |line|
   next if /^\s*(?:#|$)/ =~ line
   gem = line.split.first
-  next if ARGV.any? {|pat| !File.fnmatch?(pat, gem)}
-  # 93(bright yellow) is copied from .github/workflows/mingw.yml
-  puts "#{github_actions ? "::group::\e\[93m" : "\n"}Testing the #{gem} gem#{github_actions ? "\e\[m" : ""}"
+  next unless bundled_gems.empty? || bundled_gems.split(",").include?(gem)
+  next unless File.directory?("#{gem_dir}/src/#{gem}/test")
 
   test_command = "#{ruby} -C #{gem_dir}/src/#{gem} #{rake} test"
   first_timeout = 600 # 10min
 
   toplib = gem
-  case gem
-  when "typeprof"
+  unless File.exist?("#{gem_dir}/src/#{gem}/lib/#{toplib}.rb")
+    toplib = gem.tr("-", "/")
+    next unless File.exist?("#{gem_dir}/src/#{gem}/lib/#{toplib}.rb")
+  end
 
+  case gem
   when "rbs"
     # TODO: We should skip test file instead of test class/methods
     skip_test_files = %w[
-      test/stdlib/Prime_test.rb
     ]
 
     skip_test_files.each do |file|
@@ -49,34 +55,45 @@
 
   when "debug"
     # Since debug gem requires debug.so in child processes without
-    # acitvating the gem, we preset necessary paths in RUBYLIB
+    # activating the gem, we preset necessary paths in RUBYLIB
     # environment variable.
     load_path = true
 
   when "test-unit"
-    test_command = "#{ruby} -C #{gem_dir}/src/#{gem} test/run-test.rb"
+    test_command = "#{ruby} -C #{gem_dir}/src/#{gem} test/run.rb"
 
-  when /\Anet-/
-    toplib = gem.tr("-", "/")
+  when "win32ole"
+    next unless /mswin|mingw/ =~ RUBY_PLATFORM
 
   end
 
   if load_path
     libs = IO.popen([ruby, "-e", "old = $:.dup; require '#{toplib}'; puts $:-old"], &:read)
     next unless $?.success?
-    puts libs
     ENV["RUBYLIB"] = [libs.split("\n"), rubylib].join(File::PATH_SEPARATOR)
   else
     ENV["RUBYLIB"] = rubylib
   end
 
+  # 93(bright yellow) is copied from .github/workflows/mingw.yml
+  puts "#{github_actions ? "::group::\e\[93m" : "\n"}Testing the #{gem} gem#{github_actions ? "\e\[m" : ""}"
   print "[command]" if github_actions
   puts test_command
-  pid = Process.spawn(test_command, "#{/mingw|mswin/ =~ RUBY_PLATFORM ? 'new_' : ''}pgroup": true)
-  {nil => first_timeout, INT: 30, TERM: 10, KILL: nil}.each do |sig, sec|
+  timeouts = {nil => first_timeout, INT: 30, TERM: 10, KILL: nil}
+  if /mingw|mswin/ =~ RUBY_PLATFORM
+    timeouts.delete(:TERM)      # Inner process signal on Windows
+    timeouts.delete(:INT)       # root process will be terminated too
+    group = :new_pgroup
+    pg = ""
+  else
+    group = :pgroup
+    pg = "-"
+  end
+  pid = Process.spawn(test_command, group => true)
+  timeouts.each do |sig, sec|
     if sig
       puts "Sending #{sig} signal"
-      Process.kill("-#{sig}", pid)
+      Process.kill("#{pg}#{sig}", pid)
     end
     begin
       break Timeout.timeout(sec) {Process.wait(pid)}
@@ -84,7 +101,7 @@
     end
   rescue Interrupt
     exit_code = Signal.list["INT"]
-    Process.kill("-KILL", pid)
+    Process.kill("#{pg}KILL", pid)
     Process.wait(pid)
     break
   end
diff --git a/tool/test-coverage.rb b/tool/test-coverage.rb
index 055577feea6c88..28ef0bf7f8ce21 100644
--- a/tool/test-coverage.rb
+++ b/tool/test-coverage.rb
@@ -114,6 +114,10 @@ def invoke_simplecov_formatter
 pwd = Dir.pwd
 
 at_exit do
+  # Some tests leave GC.stress enabled, causing slow coverage processing.
+  # Reset it here to avoid performance issues.
+  GC.stress = false
+
   exit_exc = $!
 
   Dir.chdir(pwd) do
diff --git a/tool/test/init.rb b/tool/test/init.rb
new file mode 100644
index 00000000000000..3a1143d01db281
--- /dev/null
+++ b/tool/test/init.rb
@@ -0,0 +1,18 @@
+# This file includes the settings for "make test-all".
+# Note that this file is loaded not only by test/runner.rb but also by tool/lib/test/unit/parallel.rb.
+
+ENV["GEM_SKIP"] = ENV["GEM_HOME"] = ENV["GEM_PATH"] = "".freeze
+ENV.delete("RUBY_CODESIGN")
+
+Warning[:experimental] = false
+
+$LOAD_PATH.unshift File.expand_path("../lib", __dir__)
+
+require 'test/unit'
+
+require "profile_test_all" if ENV.key?('RUBY_TEST_ALL_PROFILE')
+require "tracepointchecker"
+require "zombie_hunter"
+require "iseq_loader_checker"
+require "gc_checker"
+require_relative "../test-coverage.rb" if ENV.key?('COVERAGE')
diff --git a/tool/test/runner.rb b/tool/test/runner.rb
index 335fe65fd46704..9001fc2d069ac6 100644
--- a/tool/test/runner.rb
+++ b/tool/test/runner.rb
@@ -1,16 +1,7 @@
 # frozen_string_literal: true
 require 'rbconfig'
 
-$LOAD_PATH.unshift File.expand_path("../lib", __dir__)
-
-require 'test/unit'
-
-require "profile_test_all" if ENV.key?('RUBY_TEST_ALL_PROFILE')
-require "tracepointchecker"
-require "zombie_hunter"
-require "iseq_loader_checker"
-require "gc_checker"
-require_relative "../test-coverage.rb" if ENV.key?('COVERAGE')
+require_relative "init"
 
 case $0
 when __FILE__
diff --git a/tool/test/test_sync_default_gems.rb b/tool/test/test_sync_default_gems.rb
index a73fc65d6e6b48..e64c6c6fda9e21 100755
--- a/tool/test/test_sync_default_gems.rb
+++ b/tool/test/test_sync_default_gems.rb
@@ -1,6 +1,7 @@
 #!/usr/bin/ruby
 require 'test/unit'
 require 'stringio'
+require 'tmpdir'
 require_relative '../sync_default_gems'
 
 module Test_SyncDefaultGems
@@ -72,6 +73,15 @@ def test_co_authored_by_no_newline
       ]
       assert_message_filter(expected, trailers, [expected, "", trailers].join("\n"))
     end
+
+    def test_dot_ending_subject
+      expected = [
+        "subject with a dot.",
+        "",
+        "- next body line",
+      ]
+      assert_message_filter(expected, nil, [expected[0], expected[2], ""].join("\n"))
+    end
   end
 
   class TestSyncWithCommits < Test::Unit::TestCase
@@ -83,31 +93,38 @@ def setup
       @git_config = %W"HOME GIT_CONFIG_GLOBAL".each_with_object({}) {|k, c| c[k] = ENV[k]}
       ENV["HOME"] = @testdir
       ENV["GIT_CONFIG_GLOBAL"] = @testdir + "/gitconfig"
-      system(*%W"git config --global user.email test@ruby-lang.org")
-      system(*%W"git config --global user.name", "Ruby")
-      system(*%W"git config --global init.defaultBranch default")
+      git(*%W"config --global user.email test@ruby-lang.org")
+      git(*%W"config --global user.name", "Ruby")
+      git(*%W"config --global init.defaultBranch default")
       @target = "sync-test"
       SyncDefaultGems::REPOSITORIES[@target] = ["ruby/#{@target}", "default"]
       @sha = {}
       @origdir = Dir.pwd
       Dir.chdir(@testdir)
       ["src", @target].each do |dir|
-        system(*%W"git init -q #{dir}", exception: true)
+        git(*%W"init -q #{dir}")
+        File.write("#{dir}/.gitignore", "*~\n")
+        Dir.mkdir("#{dir}/lib")
+        File.write("#{dir}/lib/common.rb", ":ok\n")
+        Dir.mkdir("#{dir}/.github")
+        Dir.mkdir("#{dir}/.github/workflows")
+        File.write("#{dir}/.github/workflows/default.yml", "default:\n")
+        git(*%W"add .gitignore lib/common.rb .github", chdir: dir)
+        git(*%W"commit -q -m", "Initialize", chdir: dir)
         if dir == "src"
-          Dir.mkdir("#{dir}/lib")
           File.write("#{dir}/lib/fine.rb", "return\n")
           Dir.mkdir("#{dir}/test")
           File.write("#{dir}/test/test_fine.rb", "return\n")
-          system(*%W"git add lib/fine.rb test/test_fine.rb", exception: true, chdir: dir)
-          system(*%W"git commit -q -m", "Looks fine", exception: true, chdir: dir)
+          git(*%W"add lib/fine.rb test/test_fine.rb", chdir: dir)
+          git(*%W"commit -q -m", "Looks fine", chdir: dir)
         end
         Dir.mkdir("#{dir}/tool")
         File.write("#{dir}/tool/ok", "#!/bin/sh\n""echo ok\n")
-        system(*%W"git add tool/ok", exception: true, chdir: dir)
-        system(*%W"git commit -q -m", "Add tool #{dir}", exception: true, chdir: dir)
-        @sha[dir] = IO.popen(%W[git log --format=%H -1], chdir: dir, &:read).chomp
+        git(*%W"add tool/ok", chdir: dir)
+        git(*%W"commit -q -m", "Add tool #{dir}", chdir: dir)
+        @sha[dir] = top_commit(dir)
       end
-      system(*%W"git remote add #{@target} ../#{@target}", exception: true, chdir: "src")
+      git(*%W"remote add #{@target} ../#{@target}", chdir: "src")
     end
 
     def teardown
@@ -121,6 +138,7 @@ def teardown
     end
 
     def capture_process_output_to(outputs)
+      return yield unless outputs&.empty? == false
       IO.pipe do |r, w|
         orig = outputs.map {|out| out.dup}
         outputs.each {|out| out.reopen(w)}
@@ -145,60 +163,135 @@ def capture_process_outputs
       return out, err
     end
 
-    def test_skip_tool
-      system(*%W"git rm -q tool/ok", exception: true, chdir: @target)
-      system(*%W"git commit -q -m", "Remove tool", exception: true, chdir: @target)
+    def git(*commands, **opts)
+      system("git", *commands, exception: true, **opts)
+    end
+
+    def top_commit(dir, format: "%H")
+      IO.popen(%W[git log --format=#{format} -1], chdir: dir, &:read)&.chomp
+    end
+
+    def assert_sync(commits = true, success: true, editor: nil)
+      result = nil
       out = capture_process_output_to([STDOUT, STDERR]) do
         Dir.chdir("src") do
-          SyncDefaultGems.sync_default_gems_with_commits(@target, true)
+          orig_editor = ENV["GIT_EDITOR"]
+          ENV["GIT_EDITOR"] = editor || 'false'
+          edit = true if editor
+
+          result = SyncDefaultGems.sync_default_gems_with_commits(@target, commits, edit: edit)
+        ensure
+          ENV["GIT_EDITOR"] = orig_editor
         end
       end
-      assert_equal(@sha["src"], IO.popen(%W[git log --format=%H -1], chdir: "src", &:read).chomp, out)
+      assert_equal(success, result, out)
+      out
+    end
+
+    def test_sync
+      File.write("#@target/lib/common.rb", "# OK!\n")
+      git(*%W"commit -q -m", "OK", "lib/common.rb", chdir: @target)
+      out = assert_sync()
+      assert_not_equal(@sha["src"], top_commit("src"), out)
+      assert_equal("# OK!\n", File.read("src/lib/common.rb"))
+      log = top_commit("src", format: "%B").lines
+      assert_equal("[ruby/#@target] OK\n", log.first, out)
+      assert_match(%r[/ruby/#{@target}/commit/\h+$], log.last, out)
+      assert_operator(top_commit(@target), :start_with?, log.last[/\h+$/], out)
+    end
+
+    def test_skip_tool
+      git(*%W"rm -q tool/ok", chdir: @target)
+      git(*%W"commit -q -m", "Remove tool", chdir: @target)
+      out = assert_sync()
+      assert_equal(@sha["src"], top_commit("src"), out)
     end
 
     def test_skip_test_fixtures
       Dir.mkdir("#@target/test")
       Dir.mkdir("#@target/test/fixtures")
       File.write("#@target/test/fixtures/fixme.rb", "")
-      system(*%W"git add test/fixtures/fixme.rb", exception: true, chdir: @target)
-      system(*%W"git commit -q -m", "Add fitures", exception: true, chdir: @target)
-      out = capture_process_output_to([STDOUT, STDERR]) do
-        Dir.chdir("src") do
-          SyncDefaultGems.sync_default_gems_with_commits(@target, ["#{@sha[@target]}..#{@target}/default"])
-        end
-      end
-      assert_equal(@sha["src"], IO.popen(%W[git log --format=%H -1], chdir: "src", &:read).chomp, out)
+      git(*%W"add test/fixtures/fixme.rb", chdir: @target)
+      git(*%W"commit -q -m", "Add fixtures", chdir: @target)
+      out = assert_sync(["#{@sha[@target]}..#{@target}/default"])
+      assert_equal(@sha["src"], top_commit("src"), out)
     end
 
     def test_skip_toplevel
       Dir.mkdir("#@target/docs")
       File.write("#@target/docs/NEWS.md", "= NEWS!!!\n")
-      system(*%W"git add --", "docs/NEWS.md", exception: true, chdir: @target)
-      system(*%W"git commit -q -m", "It's a news", exception: true, chdir: @target)
-      out = capture_process_output_to([STDOUT, STDERR]) do
-        Dir.chdir("src") do
-          SyncDefaultGems.sync_default_gems_with_commits(@target, true)
-        end
-      end
-      assert_equal(@sha["src"], IO.popen(%W[git log --format=%H -1], chdir: "src", &:read).chomp, out)
+      git(*%W"add --", "docs/NEWS.md", chdir: @target)
+      File.write("#@target/docs/hello.md", "Hello\n")
+      git(*%W"add --", "docs/hello.md", chdir: @target)
+      git(*%W"commit -q -m", "It's a news", chdir: @target)
+      out = assert_sync()
+      assert_equal(@sha["src"], top_commit("src"), out)
     end
 
     def test_adding_toplevel
       Dir.mkdir("#@target/docs")
       File.write("#@target/docs/NEWS.md", "= New library\n")
-      Dir.mkdir("#@target/lib")
       File.write("#@target/lib/news.rb", "return\n")
-      system(*%W"git add --", "docs/NEWS.md", "lib/news.rb", exception: true, chdir: @target)
-      system(*%W"git commit -q -m", "New lib", exception: true, chdir: @target)
-      out = capture_process_output_to([STDOUT, STDERR]) do
-        Dir.chdir("src") do
-          SyncDefaultGems.sync_default_gems_with_commits(@target, true)
-        end
-      end
-      assert_not_equal(@sha["src"], IO.popen(%W[git log --format=%H -1], chdir: "src", &:read).chomp, out)
+      git(*%W"add --", "docs/NEWS.md", "lib/news.rb", chdir: @target)
+      git(*%W"commit -q -m", "New lib", chdir: @target)
+      out = assert_sync()
+      assert_not_equal(@sha["src"], top_commit("src"), out)
       assert_equal "return\n", File.read("src/lib/news.rb")
-      assert_include IO.popen(%W[git log -1 --oneline], chdir: "src", &:read), "[ruby/#{@target}] New lib"
+      assert_include top_commit("src", format: "oneline"), "[ruby/#{@target}] New lib"
       assert_not_operator File, :exist?, "src/docs"
     end
+
+    def test_gitignore
+      File.write("#@target/.gitignore", "*.bak\n", mode: "a")
+      File.write("#@target/lib/common.rb", "Should.be_merged\n", mode: "a")
+      File.write("#@target/.github/workflows/main.yml", "# Should not merge\n", mode: "a")
+      git(*%W"add .github", chdir: @target)
+      git(*%W"commit -q -m", "Should be common.rb only",
+          *%W".gitignore lib/common.rb .github", chdir: @target)
+      out = assert_sync()
+      assert_not_equal(@sha["src"], top_commit("src"), out)
+      assert_equal("*~\n", File.read("src/.gitignore"), out)
+      assert_equal("#!/bin/sh\n""echo ok\n", File.read("src/tool/ok"), out)
+      assert_equal(":ok\n""Should.be_merged\n", File.read("src/lib/common.rb"), out)
+      assert_not_operator(File, :exist?, "src/.github/workflows/main.yml", out)
+    end
+
+    def test_gitignore_after_conflict
+      File.write("src/Gemfile", "# main\n")
+      git(*%W"add Gemfile", chdir: "src")
+      git(*%W"commit -q -m", "Add Gemfile", chdir: "src")
+      File.write("#@target/Gemfile", "# conflict\n", mode: "a")
+      File.write("#@target/lib/common.rb", "Should.be_merged\n", mode: "a")
+      File.write("#@target/.github/workflows/main.yml", "# Should not merge\n", mode: "a")
+      git(*%W"add Gemfile .github lib/common.rb", chdir: @target)
+      git(*%W"commit -q -m", "Should be common.rb only", chdir: @target)
+      out = assert_sync()
+      assert_not_equal(@sha["src"], top_commit("src"), out)
+      assert_equal("# main\n", File.read("src/Gemfile"), out)
+      assert_equal(":ok\n""Should.be_merged\n", File.read("src/lib/common.rb"), out)
+      assert_not_operator(File, :exist?, "src/.github/workflows/main.yml", out)
+    end
+
+    def test_delete_after_conflict
+      File.write("#@target/lib/bad.rb", "raise\n")
+      git(*%W"add lib/bad.rb", chdir: @target)
+      git(*%W"commit -q -m", "Add bad.rb", chdir: @target)
+      out = assert_sync
+      assert_equal("raise\n", File.read("src/lib/bad.rb"))
+
+      git(*%W"rm lib/bad.rb", chdir: "src", out: IO::NULL)
+      git(*%W"commit -q -m", "Remove bad.rb", chdir: "src")
+
+      File.write("#@target/lib/bad.rb", "raise 'bar'\n")
+      File.write("#@target/lib/common.rb", "Should.be_merged\n", mode: "a")
+      git(*%W"add lib/bad.rb lib/common.rb", chdir: @target)
+      git(*%W"commit -q -m", "Add conflict", chdir: @target)
+
+      head = top_commit("src")
+      out = assert_sync(editor: "git rm -f lib/bad.rb")
+      assert_not_equal(head, top_commit("src"))
+      assert_equal(":ok\n""Should.be_merged\n", File.read("src/lib/common.rb"), out)
+      assert_not_operator(File, :exist?, "src/lib/bad.rb", out)
+    end
   end
 end
diff --git a/tool/test/testunit/test4test_timeout.rb b/tool/test/testunit/test4test_timeout.rb
new file mode 100644
index 00000000000000..3225f663988c09
--- /dev/null
+++ b/tool/test/testunit/test4test_timeout.rb
@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+$LOAD_PATH.unshift "#{File.dirname(__FILE__)}/../../lib"
+
+require 'test/unit'
+require 'timeout'
+
+class TestForTestTimeout < Test::Unit::TestCase
+  10.times do |i|
+    define_method("test_timeout_#{i}") do
+      Timeout.timeout(0.001) do
+        sleep
+      end
+    end
+  end
+end
diff --git a/tool/test/testunit/test_assertion.rb b/tool/test/testunit/test_assertion.rb
index 709b4955729643..b0c2267b31ade3 100644
--- a/tool/test/testunit/test_assertion.rb
+++ b/tool/test/testunit/test_assertion.rb
@@ -27,6 +27,38 @@ def test_assert_raise
     end
   end
 
+  def test_assert_raise_with_message
+    my_error = Class.new(StandardError)
+
+    assert_raise_with_message(my_error, "with message") do
+      raise my_error, "with message"
+    end
+
+    assert_raise(Test::Unit::AssertionFailedError) do
+      assert_raise_with_message(RuntimeError, "with message") do
+        raise my_error, "with message"
+      end
+    end
+
+    assert_raise(Test::Unit::AssertionFailedError) do
+      assert_raise_with_message(my_error, "without message") do
+        raise my_error, "with message"
+      end
+    end
+  end
+
+  def test_assert_raise_kind_of
+    my_error = Class.new(StandardError)
+
+    assert_raise_kind_of(my_error) do
+      raise my_error
+    end
+
+    assert_raise_kind_of(StandardError) do
+      raise my_error
+    end
+  end
+
   def test_assert_pattern_list
     assert_pattern_list([/foo?/], "foo")
     assert_not_pattern_list([/foo?/], "afoo")
@@ -50,4 +82,122 @@ def assert_not_pattern_list(pattern_list, actual, message=nil)
       assert_pattern_list(pattern_list, actual, message)
     end
   end
+
+  def test_caller_bactrace_location
+    begin
+      line = __LINE__; assert_fail_for_backtrace_location
+    rescue Test::Unit::AssertionFailedError => e
+    end
+    location = Test::Unit::Runner.new.location(e)
+    assert_equal "#{__FILE__}:#{line}", location
+  end
+
+  def assert_fail_for_backtrace_location
+    assert false
+  end
+
+  VersionClass = Struct.new(:version) do
+    def version?(*ver)
+      Test::Unit::CoreAssertions.version_match?(ver, self.version)
+    end
+  end
+
+  V14_6_0 = VersionClass.new([14, 6, 0])
+  V15_0_0 = VersionClass.new([15, 0, 0])
+
+  def test_version_match_integer
+    assert_not_operator(V14_6_0, :version?, 13)
+    assert_operator(V14_6_0, :version?, 14)
+    assert_not_operator(V14_6_0, :version?, 15)
+    assert_not_operator(V15_0_0, :version?, 14)
+    assert_operator(V15_0_0, :version?, 15)
+  end
+
+  def test_version_match_integer_range
+    assert_operator(V14_6_0, :version?, 13..14)
+    assert_not_operator(V15_0_0, :version?, 13..14)
+    assert_not_operator(V14_6_0, :version?, 13...14)
+    assert_not_operator(V15_0_0, :version?, 13...14)
+  end
+
+  def test_version_match_array_range
+    assert_operator(V14_6_0, :version?, [14, 0]..[14, 6])
+    assert_not_operator(V15_0_0, :version?, [14, 0]..[14, 6])
+    assert_not_operator(V14_6_0, :version?, [14, 0]...[14, 6])
+    assert_not_operator(V15_0_0, :version?, [14, 0]...[14, 6])
+    assert_operator(V14_6_0, :version?, [14, 0]..[15])
+    assert_operator(V15_0_0, :version?, [14, 0]..[15])
+    assert_operator(V14_6_0, :version?, [14, 0]...[15])
+    assert_not_operator(V15_0_0, :version?, [14, 0]...[15])
+  end
+
+  def test_version_match_integer_endless_range
+    assert_operator(V14_6_0, :version?, 14..)
+    assert_operator(V15_0_0, :version?, 14..)
+    assert_not_operator(V14_6_0, :version?, 15..)
+    assert_operator(V15_0_0, :version?, 15..)
+  end
+
+  def test_version_match_integer_endless_range_exclusive
+    assert_operator(V14_6_0, :version?, 14...)
+    assert_operator(V15_0_0, :version?, 14...)
+    assert_not_operator(V14_6_0, :version?, 15...)
+    assert_operator(V15_0_0, :version?, 15...)
+  end
+
+  def test_version_match_array_endless_range
+    assert_operator(V14_6_0, :version?, [14, 5]..)
+    assert_operator(V15_0_0, :version?, [14, 5]..)
+    assert_not_operator(V14_6_0, :version?, [14, 7]..)
+    assert_operator(V15_0_0, :version?, [14, 7]..)
+    assert_not_operator(V14_6_0, :version?, [15]..)
+    assert_operator(V15_0_0, :version?, [15]..)
+    assert_not_operator(V14_6_0, :version?, [15, 0]..)
+    assert_operator(V15_0_0, :version?, [15, 0]..)
+  end
+
+  def test_version_match_array_endless_range_exclude_end
+    assert_operator(V14_6_0, :version?, [14, 5]...)
+    assert_operator(V15_0_0, :version?, [14, 5]...)
+    assert_not_operator(V14_6_0, :version?, [14, 7]...)
+    assert_operator(V15_0_0, :version?, [14, 7]...)
+    assert_not_operator(V14_6_0, :version?, [15]...)
+    assert_operator(V15_0_0, :version?, [15]...)
+    assert_not_operator(V14_6_0, :version?, [15, 0]...)
+    assert_operator(V15_0_0, :version?, [15, 0]...)
+  end
+
+  def test_version_match_integer_beginless_range
+    assert_operator(V14_6_0, :version?, ..14)
+    assert_not_operator(V15_0_0, :version?, ..14)
+    assert_operator(V14_6_0, :version?, ..15)
+    assert_operator(V15_0_0, :version?, ..15)
+
+    assert_not_operator(V14_6_0, :version?, ...14)
+    assert_not_operator(V15_0_0, :version?, ...14)
+    assert_operator(V14_6_0, :version?, ...15)
+    assert_not_operator(V15_0_0, :version?, ...15)
+  end
+
+  def test_version_match_array_beginless_range
+    assert_not_operator(V14_6_0, :version?, ..[14, 5])
+    assert_not_operator(V15_0_0, :version?, ..[14, 5])
+    assert_operator(V14_6_0, :version?, ..[14, 6])
+    assert_not_operator(V15_0_0, :version?, ..[14, 6])
+    assert_operator(V14_6_0, :version?, ..[15])
+    assert_operator(V15_0_0, :version?, ..[15])
+    assert_operator(V14_6_0, :version?, ..[15, 0])
+    assert_operator(V15_0_0, :version?, ..[15, 0])
+  end
+
+  def test_version_match_array_beginless_range_exclude_end
+    assert_not_operator(V14_6_0, :version?, ...[14, 5])
+    assert_not_operator(V15_0_0, :version?, ...[14, 5])
+    assert_not_operator(V14_6_0, :version?, ...[14, 6])
+    assert_not_operator(V15_0_0, :version?, ...[14, 6])
+    assert_operator(V14_6_0, :version?, ...[15])
+    assert_not_operator(V15_0_0, :version?, ...[15])
+    assert_operator(V14_6_0, :version?, ...[15, 0])
+    assert_not_operator(V15_0_0, :version?, ...[15, 0])
+  end
 end
diff --git a/tool/test/testunit/test_hideskip.rb b/tool/test/testunit/test_hideskip.rb
index 0cf8f4e4b03daa..a470368bca9244 100644
--- a/tool/test/testunit/test_hideskip.rb
+++ b/tool/test/testunit/test_hideskip.rb
@@ -6,14 +6,13 @@ def test_hideskip
     assert_not_match(/^ *1\) Skipped/, hideskip)
     assert_match(/^ *1\) Skipped.*^ *2\) Skipped/m, hideskip("--show-skip"))
     output = hideskip("--hide-skip")
-    output.gsub!(/Successful RJIT finish\n/, '') if defined?(RubyVM::RJIT) && RubyVM::RJIT.enabled?
     assert_match(/assertions\/s.\n+2 tests, 0 assertions, 0 failures, 0 errors, 2 skips/, output)
   end
 
   private
 
   def hideskip(*args)
-    IO.popen([*@options[:ruby], "#{File.dirname(__FILE__)}/test4test_hideskip.rb",
+    IO.popen([*@__runner_options__[:ruby], "#{File.dirname(__FILE__)}/test4test_hideskip.rb",
                        "--verbose", *args], err: [:child, :out]) {|f|
       f.read
     }
diff --git a/tool/test/testunit/test_launchable.rb b/tool/test/testunit/test_launchable.rb
new file mode 100644
index 00000000000000..76be876456ddb1
--- /dev/null
+++ b/tool/test/testunit/test_launchable.rb
@@ -0,0 +1,70 @@
+# frozen_string_literal: false
+require 'test/unit'
+require 'tempfile'
+require 'json'
+require_relative '../../lib/launchable'
+
+class TestLaunchable < Test::Unit::TestCase
+  def test_json_stream_writer
+    Tempfile.create(['launchable-test-', '.json']) do |f|
+      json_stream_writer = Launchable::JsonStreamWriter.new(f.path)
+      json_stream_writer.write_array('testCases')
+      json_stream_writer.write_object(
+        {
+          testPath: "file=test/test_a.rb#class=class1#testcase=testcase899",
+          duration: 42,
+          status: "TEST_FAILED",
+          stdout: nil,
+          stderr: nil,
+          createdAt: "2021-10-05T12:34:00",
+          data: {
+            lineNumber: 1
+          }
+        }
+      )
+      json_stream_writer.write_object(
+        {
+          testPath: "file=test/test_a.rb#class=class1#testcase=testcase899",
+          duration: 45,
+          status: "TEST_PASSED",
+          stdout: "This is stdout",
+          stderr: "This is stderr",
+          createdAt: "2021-10-05T12:36:00",
+          data: {
+            lineNumber: 10
+          }
+        }
+      )
+      json_stream_writer.close()
+      expected = <<JSON
+{
+  "testCases": [
+    {
+      "testPath": "file=test/test_a.rb#class=class1#testcase=testcase899",
+      "duration": 42,
+      "status": "TEST_FAILED",
+      "stdout": null,
+      "stderr": null,
+      "createdAt": "2021-10-05T12:34:00",
+      "data": {
+        "lineNumber": 1
+      }
+    },
+    {
+      "testPath": "file=test/test_a.rb#class=class1#testcase=testcase899",
+      "duration": 45,
+      "status": "TEST_PASSED",
+      "stdout": "This is stdout",
+      "stderr": "This is stderr",
+      "createdAt": "2021-10-05T12:36:00",
+      "data": {
+        "lineNumber": 10
+      }
+    }
+  ]
+}
+JSON
+      assert_equal(expected, f.read)
+    end
+  end
+end
diff --git a/tool/test/testunit/test_load_failure.rb b/tool/test/testunit/test_load_failure.rb
index 63db33fd2cc6f6..8defa9e39a9f97 100644
--- a/tool/test/testunit/test_load_failure.rb
+++ b/tool/test/testunit/test_load_failure.rb
@@ -13,7 +13,7 @@ def test_load_failure_parallel
   private
 
   def load_failure(*args)
-    IO.popen([*@options[:ruby], "#{__dir__}/../runner.rb",
+    IO.popen([*@__runner_options__[:ruby], "#{__dir__}/../runner.rb",
               "#{__dir__}/test4test_load_failure.rb",
               "--verbose", *args], err: [:child, :out]) {|f|
       assert_include(f.read, "test4test_load_failure.rb")
diff --git a/tool/test/testunit/test_parallel.rb b/tool/test/testunit/test_parallel.rb
index 29176483b5306f..d87e0ed3271a35 100644
--- a/tool/test/testunit/test_parallel.rb
+++ b/tool/test/testunit/test_parallel.rb
@@ -6,14 +6,22 @@ module TestParallel
   PARALLEL_RB = "#{__dir__}/../../lib/test/unit/parallel.rb"
   TESTS = "#{__dir__}/tests_for_parallel"
   # use large timeout for --jit-wait
-  TIMEOUT = EnvUtil.apply_timeout_scale(defined?(RubyVM::RJIT) && RubyVM::RJIT.enabled? ? 100 : 30)
+  TIMEOUT = EnvUtil.apply_timeout_scale(100)
+
+  def self.timeout(n, &blk)
+    start_time = Time.now
+    Timeout.timeout(n, &blk)
+  rescue Timeout::Error
+    end_time = Time.now
+    raise Timeout::Error, "execution expired (start: #{ start_time }, end: #{ end_time })"
+  end
 
   class TestParallelWorker < Test::Unit::TestCase
     def setup
       i, @worker_in = IO.pipe
       @worker_out, o = IO.pipe
-      @worker_pid = spawn(*@options[:ruby], PARALLEL_RB,
-                          "--ruby", @options[:ruby].join(" "),
+      @worker_pid = spawn(*@__runner_options__[:ruby], PARALLEL_RB,
+                          "--ruby", @__runner_options__[:ruby].join(" "),
                           "-j", "t1", "-v", out: o, in: i)
       [i,o].each(&:close)
     end
@@ -22,10 +30,10 @@ def teardown
       if @worker_pid && @worker_in
         begin
           begin
-            @worker_in.puts "quit"
+            @worker_in.puts "quit normal"
           rescue IOError, Errno::EPIPE
           end
-          Timeout.timeout(2) do
+          ::TestParallel.timeout(2) do
             Process.waitpid(@worker_pid)
           end
         rescue Timeout::Error
@@ -45,7 +53,7 @@ def teardown
     end
 
     def test_run
-      Timeout.timeout(TIMEOUT) do
+      ::TestParallel.timeout(TIMEOUT) do
         assert_match(/^ready/,@worker_out.gets)
         @worker_in.puts "run #{TESTS}/ptest_first.rb test"
         assert_match(/^okay/,@worker_out.gets)
@@ -58,7 +66,7 @@ def test_run
     end
 
     def test_run_multiple_testcase_in_one_file
-      Timeout.timeout(TIMEOUT) do
+      ::TestParallel.timeout(TIMEOUT) do
         assert_match(/^ready/,@worker_out.gets)
         @worker_in.puts "run #{TESTS}/ptest_second.rb test"
         assert_match(/^okay/,@worker_out.gets)
@@ -75,7 +83,7 @@ def test_run_multiple_testcase_in_one_file
     end
 
     def test_accept_run_command_multiple_times
-      Timeout.timeout(TIMEOUT) do
+      ::TestParallel.timeout(TIMEOUT) do
         assert_match(/^ready/,@worker_out.gets)
         @worker_in.puts "run #{TESTS}/ptest_first.rb test"
         assert_match(/^okay/,@worker_out.gets)
@@ -99,7 +107,7 @@ def test_accept_run_command_multiple_times
     end
 
     def test_p
-      Timeout.timeout(TIMEOUT) do
+      ::TestParallel.timeout(TIMEOUT) do
         @worker_in.puts "run #{TESTS}/ptest_first.rb test"
         while buf = @worker_out.gets
           break if /^p (.+?)$/ =~ buf
@@ -110,7 +118,7 @@ def test_p
     end
 
     def test_done
-      Timeout.timeout(TIMEOUT) do
+      ::TestParallel.timeout(TIMEOUT) do
         @worker_in.puts "run #{TESTS}/ptest_forth.rb test"
         while buf = @worker_out.gets
           break if /^done (.+?)$/ =~ buf
@@ -118,43 +126,43 @@ def test_done
         assert_not_nil($1, "'done' was not found")
 
         result = Marshal.load($1.chomp.unpack1("m"))
-        assert_equal(5, result[0])
-        pend "TODO: result[1] returns 17. We should investigate it" do
-          assert_equal(12, result[1])
-        end
-        assert_kind_of(Array,result[2])
-        assert_kind_of(Array,result[3])
-        assert_kind_of(Array,result[4])
-        assert_kind_of(Array,result[2][1])
-        assert_kind_of(Test::Unit::AssertionFailedError,result[2][0][2])
-        assert_kind_of(Test::Unit::PendedError,result[2][1][2])
-        assert_kind_of(Test::Unit::PendedError,result[2][2][2])
-        assert_kind_of(Exception, result[2][3][2])
-        assert_equal(result[5], "TestE")
+        tests, asserts, reports, failures, loadpaths, suite = result
+        assert_equal(5, tests)
+        assert_equal(12, asserts)
+        assert_kind_of(Array, reports)
+        assert_kind_of(Array, failures)
+        assert_kind_of(Array, loadpaths)
+        reports.sort_by! {|_, t| t}
+        assert_kind_of(Array, reports[1])
+        assert_kind_of(Test::Unit::AssertionFailedError, reports[0][2])
+        assert_kind_of(Test::Unit::PendedError, reports[1][2])
+        assert_kind_of(Test::Unit::PendedError, reports[2][2])
+        assert_kind_of(Exception, reports[3][2])
+        assert_equal("TestE", suite)
       end
     end
 
     def test_quit
-      Timeout.timeout(TIMEOUT) do
-        @worker_in.puts "quit"
+      ::TestParallel.timeout(TIMEOUT) do
+        @worker_in.puts "quit normal"
         assert_match(/^bye$/m,@worker_out.read)
       end
     end
   end
 
   class TestParallel < Test::Unit::TestCase
-    def spawn_runner(*opt_args)
+    def spawn_runner(*opt_args, jobs: "t1")
       @test_out, o = IO.pipe
-      @test_pid = spawn(*@options[:ruby], TESTS+"/runner.rb",
-                        "--ruby", @options[:ruby].join(" "),
-                        "-j","t1",*opt_args, out: o, err: o)
+      @test_pid = spawn(*@__runner_options__[:ruby], TESTS+"/runner.rb",
+                        "--ruby", @__runner_options__[:ruby].join(" "),
+                        "-j", jobs, *opt_args, out: o, err: o)
       o.close
     end
 
     def teardown
       begin
         if @test_pid
-          Timeout.timeout(2) do
+          ::TestParallel.timeout(2) do
             Process.waitpid(@test_pid)
           end
         end
@@ -166,52 +174,48 @@ def teardown
     end
 
     def test_ignore_jzero
-      @test_out, o = IO.pipe
-      @test_pid = spawn(*@options[:ruby], TESTS+"/runner.rb",
-                        "--ruby", @options[:ruby].join(" "),
-                        "-j","0", out: File::NULL, err: o)
-      o.close
-      Timeout.timeout(TIMEOUT) {
+      spawn_runner(jobs: "0")
+      ::TestParallel.timeout(TIMEOUT) {
         assert_match(/Error: parameter of -j option should be greater than 0/,@test_out.read)
       }
     end
 
     def test_should_run_all_without_any_leaks
       spawn_runner
-      buf = Timeout.timeout(TIMEOUT) {@test_out.read}
+      buf = ::TestParallel.timeout(TIMEOUT) {@test_out.read}
       assert_match(/^9 tests/,buf)
     end
 
     def test_should_retry_failed_on_workers
-      spawn_runner
-      buf = Timeout.timeout(TIMEOUT) {@test_out.read}
+      spawn_runner "--retry"
+      buf = ::TestParallel.timeout(TIMEOUT) {@test_out.read}
       assert_match(/^Retrying\.+$/,buf)
     end
 
     def test_no_retry_option
       spawn_runner "--no-retry"
-      buf = Timeout.timeout(TIMEOUT) {@test_out.read}
+      buf = ::TestParallel.timeout(TIMEOUT) {@test_out.read}
       refute_match(/^Retrying\.+$/,buf)
       assert_match(/^ +\d+\) Failure:\nTestD#test_fail_at_worker/,buf)
     end
 
     def test_jobs_status
       spawn_runner "--jobs-status"
-      buf = Timeout.timeout(TIMEOUT) {@test_out.read}
+      buf = ::TestParallel.timeout(TIMEOUT) {@test_out.read}
       assert_match(/\d+=ptest_(first|second|third|forth) */,buf)
     end
 
     def test_separate
       # this test depends to --jobs-status
       spawn_runner "--jobs-status", "--separate"
-      buf = Timeout.timeout(TIMEOUT) {@test_out.read}
+      buf = ::TestParallel.timeout(TIMEOUT) {@test_out.read}
       assert(buf.scan(/^\[\s*\d+\/\d+\]\s*(\d+?)=/).flatten.uniq.size > 1,
              message("retried tests should run in different processes") {buf})
     end
 
     def test_hungup
-      spawn_runner "--worker-timeout=1", "test4test_hungup.rb"
-      buf = Timeout.timeout(TIMEOUT) {@test_out.read}
+      spawn_runner "--worker-timeout=1", "--retry", "test4test_hungup.rb"
+      buf = ::TestParallel.timeout(TIMEOUT) {@test_out.read}
       assert_match(/^Retrying hung up testcases\.+$/, buf)
       assert_match(/^2 tests,.* 0 failures,/, buf)
     end
diff --git a/tool/test/testunit/test_sorting.rb b/tool/test/testunit/test_sorting.rb
index 7678249ec2da88..3e5d7bfdcceb7f 100644
--- a/tool/test/testunit/test_sorting.rb
+++ b/tool/test/testunit/test_sorting.rb
@@ -10,7 +10,7 @@ def test_sorting
   end
 
   def sorting(*args)
-    IO.popen([*@options[:ruby], "#{File.dirname(__FILE__)}/test4test_sorting.rb",
+    IO.popen([*@__runner_options__[:ruby], "#{File.dirname(__FILE__)}/test4test_sorting.rb",
               "--verbose", *args], err: [:child, :out]) {|f|
       f.read
     }
diff --git a/tool/test/testunit/test_timeout.rb b/tool/test/testunit/test_timeout.rb
new file mode 100644
index 00000000000000..452f5e1a7e19f6
--- /dev/null
+++ b/tool/test/testunit/test_timeout.rb
@@ -0,0 +1,10 @@
+# frozen_string_literal: false
+require 'test/unit'
+
+class TestTiemout < Test::Unit::TestCase
+  def test_timeout
+    cmd = [*@__runner_options__[:ruby], "#{File.dirname(__FILE__)}/test4test_timeout.rb"]
+    result = IO.popen(cmd, err: [:child, :out], &:read)
+    assert_not_match(/^T{10}$/, result)
+  end
+end
diff --git a/tool/test/testunit/tests_for_parallel/ptest_forth.rb b/tool/test/testunit/tests_for_parallel/ptest_forth.rb
index 8831676e1903e3..54474c828d7214 100644
--- a/tool/test/testunit/tests_for_parallel/ptest_forth.rb
+++ b/tool/test/testunit/tests_for_parallel/ptest_forth.rb
@@ -8,19 +8,19 @@ def test_not_fail
     assert_equal(1,1)
   end
 
-  def test_always_skip
-    skip "always"
+  def test_always_omit
+    omit "always"
   end
 
   def test_always_fail
     assert_equal(0,1)
   end
 
-  def test_skip_after_unknown_error
+  def test_pend_after_unknown_error
     begin
       raise UnknownError, "unknown error"
     rescue
-      skip "after raise"
+      pend "after raise"
     end
   end
 
diff --git a/tool/test/testunit/tests_for_parallel/slow_helper.rb b/tool/test/testunit/tests_for_parallel/slow_helper.rb
new file mode 100644
index 00000000000000..38067c1f470fb5
--- /dev/null
+++ b/tool/test/testunit/tests_for_parallel/slow_helper.rb
@@ -0,0 +1,8 @@
+require 'test/unit'
+
+module TestSlowTimeout
+  def test_slow
+    sleep_for = EnvUtil.apply_timeout_scale((ENV['sec'] || 3).to_i)
+    sleep sleep_for if on_parallel_worker?
+  end
+end
diff --git a/tool/test/testunit/tests_for_parallel/test4test_hungup.rb b/tool/test/testunit/tests_for_parallel/test4test_hungup.rb
index 65a75f7c4dc339..49f503ba9e2b62 100644
--- a/tool/test/testunit/tests_for_parallel/test4test_hungup.rb
+++ b/tool/test/testunit/tests_for_parallel/test4test_hungup.rb
@@ -8,7 +8,7 @@ def test_success_at_worker
 
   def test_hungup_at_worker
     if on_parallel_worker?
-      sleep 10
+      sleep EnvUtil.apply_timeout_scale(10)
     end
     assert true
   end
diff --git a/tool/test/webrick/.htaccess b/tool/test/webrick/.htaccess
deleted file mode 100644
index 69d4659b9f1a33..00000000000000
--- a/tool/test/webrick/.htaccess
+++ /dev/null
@@ -1 +0,0 @@
-this file should not be published.
diff --git a/tool/test/webrick/test_cgi.rb b/tool/test/webrick/test_cgi.rb
deleted file mode 100644
index 7a75cf565e4556..00000000000000
--- a/tool/test/webrick/test_cgi.rb
+++ /dev/null
@@ -1,170 +0,0 @@
-# coding: US-ASCII
-# frozen_string_literal: false
-require_relative "utils"
-require "webrick"
-require "test/unit"
-
-class TestWEBrickCGI < Test::Unit::TestCase
-  CRLF = "\r\n"
-
-  def teardown
-    WEBrick::Utils::TimeoutHandler.terminate
-    super
-  end
-
-  def start_cgi_server(log_tester=TestWEBrick::DefaultLogTester, &block)
-    config = {
-      :CGIInterpreter => TestWEBrick::RubyBin,
-      :DocumentRoot => File.dirname(__FILE__),
-      :DirectoryIndex => ["webrick.cgi"],
-      :RequestCallback => Proc.new{|req, res|
-        def req.meta_vars
-          meta = super
-          meta["RUBYLIB"] = $:.join(File::PATH_SEPARATOR)
-          meta[RbConfig::CONFIG['LIBPATHENV']] = ENV[RbConfig::CONFIG['LIBPATHENV']] if RbConfig::CONFIG['LIBPATHENV']
-          return meta
-        end
-      },
-    }
-    if RUBY_PLATFORM =~ /mswin|mingw|cygwin|bccwin32/
-      config[:CGIPathEnv] = ENV['PATH'] # runtime dll may not be in system dir.
-    end
-    TestWEBrick.start_httpserver(config, log_tester){|server, addr, port, log|
-      block.call(server, addr, port, log)
-    }
-  end
-
-  def test_cgi
-    start_cgi_server{|server, addr, port, log|
-      http = Net::HTTP.new(addr, port)
-      req = Net::HTTP::Get.new("/webrick.cgi")
-      http.request(req){|res| assert_equal("/webrick.cgi", res.body, log.call)}
-      req = Net::HTTP::Get.new("/webrick.cgi/path/info")
-      http.request(req){|res| assert_equal("/path/info", res.body, log.call)}
-      req = Net::HTTP::Get.new("/webrick.cgi/%3F%3F%3F?foo=bar")
-      http.request(req){|res| assert_equal("/???", res.body, log.call)}
-      unless RUBY_PLATFORM =~ /mswin|mingw|cygwin|bccwin32|java/
-        # Path info of res.body is passed via ENV.
-        # ENV[] returns different value on Windows depending on locale.
-        req = Net::HTTP::Get.new("/webrick.cgi/%A4%DB%A4%B2/%A4%DB%A4%B2")
-        http.request(req){|res|
-          assert_equal("/\xA4\xDB\xA4\xB2/\xA4\xDB\xA4\xB2", res.body, log.call)}
-      end
-      req = Net::HTTP::Get.new("/webrick.cgi?a=1;a=2;b=x")
-      http.request(req){|res| assert_equal("a=1, a=2, b=x", res.body, log.call)}
-      req = Net::HTTP::Get.new("/webrick.cgi?a=1&a=2&b=x")
-      http.request(req){|res| assert_equal("a=1, a=2, b=x", res.body, log.call)}
-
-      req = Net::HTTP::Post.new("/webrick.cgi?a=x;a=y;b=1")
-      req["Content-Type"] = "application/x-www-form-urlencoded"
-      http.request(req, "a=1;a=2;b=x"){|res|
-        assert_equal("a=1, a=2, b=x", res.body, log.call)}
-      req = Net::HTTP::Post.new("/webrick.cgi?a=x&a=y&b=1")
-      req["Content-Type"] = "application/x-www-form-urlencoded"
-      http.request(req, "a=1&a=2&b=x"){|res|
-        assert_equal("a=1, a=2, b=x", res.body, log.call)}
-      req = Net::HTTP::Get.new("/")
-      http.request(req){|res|
-        ary = res.body.lines.to_a
-        assert_match(%r{/$}, ary[0], log.call)
-        assert_match(%r{/webrick.cgi$}, ary[1], log.call)
-      }
-
-      req = Net::HTTP::Get.new("/webrick.cgi")
-      req["Cookie"] = "CUSTOMER=WILE_E_COYOTE; PART_NUMBER=ROCKET_LAUNCHER_0001"
-      http.request(req){|res|
-        assert_equal(
-          "CUSTOMER=WILE_E_COYOTE\nPART_NUMBER=ROCKET_LAUNCHER_0001\n",
-          res.body, log.call)
-      }
-
-      req = Net::HTTP::Get.new("/webrick.cgi")
-      cookie =  %{$Version="1"; }
-      cookie << %{Customer="WILE_E_COYOTE"; $Path="/acme"; }
-      cookie << %{Part_Number="Rocket_Launcher_0001"; $Path="/acme"; }
-      cookie << %{Shipping="FedEx"; $Path="/acme"}
-      req["Cookie"] = cookie
-      http.request(req){|res|
-        assert_equal("Customer=WILE_E_COYOTE, Shipping=FedEx",
-                     res["Set-Cookie"], log.call)
-        assert_equal("Customer=WILE_E_COYOTE\n" +
-                     "Part_Number=Rocket_Launcher_0001\n" +
-                     "Shipping=FedEx\n", res.body, log.call)
-      }
-    }
-  end
-
-  def test_bad_request
-    log_tester = lambda {|log, access_log|
-      assert_match(/BadRequest/, log.join)
-    }
-    start_cgi_server(log_tester) {|server, addr, port, log|
-      sock = TCPSocket.new(addr, port)
-      begin
-        sock << "POST /webrick.cgi HTTP/1.0" << CRLF
-        sock << "Content-Type: application/x-www-form-urlencoded" << CRLF
-        sock << "Content-Length: 1024" << CRLF
-        sock << CRLF
-        sock << "a=1&a=2&b=x"
-        sock.close_write
-        assert_match(%r{\AHTTP/\d.\d 400 Bad Request}, sock.read, log.call)
-      ensure
-        sock.close
-      end
-    }
-  end
-
-  def test_cgi_env
-    start_cgi_server do |server, addr, port, log|
-      http = Net::HTTP.new(addr, port)
-      req = Net::HTTP::Get.new("/webrick.cgi/dumpenv")
-      req['proxy'] = 'http://example.com/'
-      req['hello'] = 'world'
-      http.request(req) do |res|
-        env = Marshal.load(res.body)
-        assert_equal 'world', env['HTTP_HELLO']
-        assert_not_operator env, :include?, 'HTTP_PROXY'
-      end
-    end
-  end
-
-  CtrlSeq = [0x7f, *(1..31)].pack("C*").gsub(/\s+/, '')
-  CtrlPat = /#{Regexp.quote(CtrlSeq)}/o
-  DumpPat = /#{Regexp.quote(CtrlSeq.dump[1...-1])}/o
-
-  def test_bad_uri
-    log_tester = lambda {|log, access_log|
-      assert_equal(1, log.length)
-      assert_match(/ERROR bad URI/, log[0])
-    }
-    start_cgi_server(log_tester) {|server, addr, port, log|
-      res = TCPSocket.open(addr, port) {|sock|
-        sock << "GET /#{CtrlSeq}#{CRLF}#{CRLF}"
-        sock.close_write
-        sock.read
-      }
-      assert_match(%r{\AHTTP/\d.\d 400 Bad Request}, res)
-      s = log.call.each_line.grep(/ERROR bad URI/)[0]
-      assert_match(DumpPat, s)
-      assert_not_match(CtrlPat, s)
-    }
-  end
-
-  def test_bad_header
-    log_tester = lambda {|log, access_log|
-      assert_equal(1, log.length)
-      assert_match(/ERROR bad header/, log[0])
-    }
-    start_cgi_server(log_tester) {|server, addr, port, log|
-      res = TCPSocket.open(addr, port) {|sock|
-        sock << "GET / HTTP/1.0#{CRLF}#{CtrlSeq}#{CRLF}#{CRLF}"
-        sock.close_write
-        sock.read
-      }
-      assert_match(%r{\AHTTP/\d.\d 400 Bad Request}, res)
-      s = log.call.each_line.grep(/ERROR bad header/)[0]
-      assert_match(DumpPat, s)
-      assert_not_match(CtrlPat, s)
-    }
-  end
-end
diff --git a/tool/test/webrick/test_config.rb b/tool/test/webrick/test_config.rb
deleted file mode 100644
index a54a667452e92b..00000000000000
--- a/tool/test/webrick/test_config.rb
+++ /dev/null
@@ -1,17 +0,0 @@
-# frozen_string_literal: false
-require "test/unit"
-require "webrick/config"
-
-class TestWEBrickConfig < Test::Unit::TestCase
-  def test_server_name_default
-    config = WEBrick::Config::General.dup
-    assert_equal(false, config.key?(:ServerName))
-    assert_equal(WEBrick::Utils.getservername, config[:ServerName])
-    assert_equal(true, config.key?(:ServerName))
-  end
-
-  def test_server_name_set_nil
-    config = WEBrick::Config::General.dup.update(ServerName: nil)
-    assert_equal(nil, config[:ServerName])
-  end
-end
diff --git a/tool/test/webrick/test_cookie.rb b/tool/test/webrick/test_cookie.rb
deleted file mode 100644
index e46185f12752a6..00000000000000
--- a/tool/test/webrick/test_cookie.rb
+++ /dev/null
@@ -1,141 +0,0 @@
-# frozen_string_literal: false
-require "test/unit"
-require "webrick/cookie"
-
-class TestWEBrickCookie < Test::Unit::TestCase
-  def test_new
-    cookie = WEBrick::Cookie.new("foo","bar")
-    assert_equal("foo", cookie.name)
-    assert_equal("bar", cookie.value)
-    assert_equal("foo=bar", cookie.to_s)
-  end
-
-  def test_time
-    cookie = WEBrick::Cookie.new("foo","bar")
-    t = 1000000000
-    cookie.max_age = t
-    assert_match(t.to_s, cookie.to_s)
-
-    cookie = WEBrick::Cookie.new("foo","bar")
-    t = Time.at(1000000000)
-    cookie.expires = t
-    assert_equal(Time, cookie.expires.class)
-    assert_equal(t, cookie.expires)
-    ts = t.httpdate
-    cookie.expires = ts
-    assert_equal(Time, cookie.expires.class)
-    assert_equal(t, cookie.expires)
-    assert_match(ts, cookie.to_s)
-  end
-
-  def test_parse
-    data = ""
-    data << '$Version="1"; '
-    data << 'Customer="WILE_E_COYOTE"; $Path="/acme"; '
-    data << 'Part_Number="Rocket_Launcher_0001"; $Path="/acme"; '
-    data << 'Shipping="FedEx"; $Path="/acme"'
-    cookies = WEBrick::Cookie.parse(data)
-    assert_equal(3, cookies.size)
-    assert_equal(1, cookies[0].version)
-    assert_equal("Customer", cookies[0].name)
-    assert_equal("WILE_E_COYOTE", cookies[0].value)
-    assert_equal("/acme", cookies[0].path)
-    assert_equal(1, cookies[1].version)
-    assert_equal("Part_Number", cookies[1].name)
-    assert_equal("Rocket_Launcher_0001", cookies[1].value)
-    assert_equal(1, cookies[2].version)
-    assert_equal("Shipping", cookies[2].name)
-    assert_equal("FedEx", cookies[2].value)
-
-    data = "hoge=moge; __div__session=9865ecfd514be7f7"
-    cookies = WEBrick::Cookie.parse(data)
-    assert_equal(2, cookies.size)
-    assert_equal(0, cookies[0].version)
-    assert_equal("hoge", cookies[0].name)
-    assert_equal("moge", cookies[0].value)
-    assert_equal("__div__session", cookies[1].name)
-    assert_equal("9865ecfd514be7f7", cookies[1].value)
-
-    # don't allow ,-separator
-    data = "hoge=moge, __div__session=9865ecfd514be7f7"
-    cookies = WEBrick::Cookie.parse(data)
-    assert_equal(1, cookies.size)
-    assert_equal(0, cookies[0].version)
-    assert_equal("hoge", cookies[0].name)
-    assert_equal("moge, __div__session=9865ecfd514be7f7", cookies[0].value)
-  end
-
-  def test_parse_no_whitespace
-    data = [
-      '$Version="1"; ',
-      'Customer="WILE_E_COYOTE";$Path="/acme";', # no SP between cookie-string
-      'Part_Number="Rocket_Launcher_0001";$Path="/acme";', # no SP between cookie-string
-      'Shipping="FedEx";$Path="/acme"'
-    ].join
-    cookies = WEBrick::Cookie.parse(data)
-    assert_equal(1, cookies.size)
-  end
-
-  def test_parse_too_much_whitespaces
-    # According to RFC6265,
-    #   cookie-string = cookie-pair *( ";" SP cookie-pair )
-    # So single 0x20 is needed after ';'. We allow multiple spaces here for
-    # compatibility with older WEBrick versions.
-    data = [
-      '$Version="1"; ',
-      'Customer="WILE_E_COYOTE";$Path="/acme";     ', # no SP between cookie-string
-      'Part_Number="Rocket_Launcher_0001";$Path="/acme";     ', # no SP between cookie-string
-      'Shipping="FedEx";$Path="/acme"'
-    ].join
-    cookies = WEBrick::Cookie.parse(data)
-    assert_equal(3, cookies.size)
-  end
-
-  def test_parse_set_cookie
-    data = %(Customer="WILE_E_COYOTE"; Version="1"; Path="/acme")
-    cookie = WEBrick::Cookie.parse_set_cookie(data)
-    assert_equal("Customer", cookie.name)
-    assert_equal("WILE_E_COYOTE", cookie.value)
-    assert_equal(1, cookie.version)
-    assert_equal("/acme", cookie.path)
-
-    data = %(Shipping="FedEx"; Version="1"; Path="/acme"; Secure)
-    cookie = WEBrick::Cookie.parse_set_cookie(data)
-    assert_equal("Shipping", cookie.name)
-    assert_equal("FedEx", cookie.value)
-    assert_equal(1, cookie.version)
-    assert_equal("/acme", cookie.path)
-    assert_equal(true, cookie.secure)
-  end
-
-  def test_parse_set_cookies
-    data = %(Shipping="FedEx"; Version="1"; Path="/acme"; Secure)
-    data << %(, CUSTOMER=WILE_E_COYOTE; path=/; expires=Wednesday, 09-Nov-99 23:12:40 GMT; path=/; Secure)
-    data << %(, name="Aaron"; Version="1"; path="/acme")
-    cookies = WEBrick::Cookie.parse_set_cookies(data)
-    assert_equal(3, cookies.length)
-
-    fed_ex = cookies.find { |c| c.name == 'Shipping' }
-    assert_not_nil(fed_ex)
-    assert_equal("Shipping", fed_ex.name)
-    assert_equal("FedEx", fed_ex.value)
-    assert_equal(1, fed_ex.version)
-    assert_equal("/acme", fed_ex.path)
-    assert_equal(true, fed_ex.secure)
-
-    name = cookies.find { |c| c.name == 'name' }
-    assert_not_nil(name)
-    assert_equal("name", name.name)
-    assert_equal("Aaron", name.value)
-    assert_equal(1, name.version)
-    assert_equal("/acme", name.path)
-
-    customer = cookies.find { |c| c.name == 'CUSTOMER' }
-    assert_not_nil(customer)
-    assert_equal("CUSTOMER", customer.name)
-    assert_equal("WILE_E_COYOTE", customer.value)
-    assert_equal(0, customer.version)
-    assert_equal("/", customer.path)
-    assert_equal(Time.utc(1999, 11, 9, 23, 12, 40), customer.expires)
-  end
-end
diff --git a/tool/test/webrick/test_do_not_reverse_lookup.rb b/tool/test/webrick/test_do_not_reverse_lookup.rb
deleted file mode 100644
index efcb5a92990194..00000000000000
--- a/tool/test/webrick/test_do_not_reverse_lookup.rb
+++ /dev/null
@@ -1,71 +0,0 @@
-# frozen_string_literal: false
-require "test/unit"
-require "webrick"
-require_relative "utils"
-
-class TestDoNotReverseLookup < Test::Unit::TestCase
-  class DNRL < WEBrick::GenericServer
-    def run(sock)
-      sock << sock.do_not_reverse_lookup.to_s
-    end
-  end
-
-  @@original_do_not_reverse_lookup_value = Socket.do_not_reverse_lookup
-
-  def teardown
-    Socket.do_not_reverse_lookup = @@original_do_not_reverse_lookup_value
-  end
-
-  def do_not_reverse_lookup?(config)
-    result = nil
-    TestWEBrick.start_server(DNRL, config) do |server, addr, port, log|
-      TCPSocket.open(addr, port) do |sock|
-        result = {'true' => true, 'false' => false}[sock.gets]
-      end
-    end
-    result
-  end
-
-  # +--------------------------------------------------------------------------+
-  # |        Expected interaction between Socket.do_not_reverse_lookup         |
-  # |            and WEBrick::Config::General[:DoNotReverseLookup]             |
-  # +----------------------------+---------------------------------------------+
-  # |                            |WEBrick::Config::General[:DoNotReverseLookup]|
-  # +----------------------------+--------------+---------------+--------------+
-  # |Socket.do_not_reverse_lookup|     TRUE     |     FALSE     |     NIL      |
-  # +----------------------------+--------------+---------------+--------------+
-  # |            TRUE            |     true     |     false     |     true     |
-  # +----------------------------+--------------+---------------+--------------+
-  # |            FALSE           |     true     |     false     |     false    |
-  # +----------------------------+--------------+---------------+--------------+
-
-  def test_socket_dnrl_true_server_dnrl_true
-    Socket.do_not_reverse_lookup = true
-    assert_equal(true, do_not_reverse_lookup?(:DoNotReverseLookup => true))
-  end
-
-  def test_socket_dnrl_true_server_dnrl_false
-    Socket.do_not_reverse_lookup = true
-    assert_equal(false, do_not_reverse_lookup?(:DoNotReverseLookup => false))
-  end
-
-  def test_socket_dnrl_true_server_dnrl_nil
-    Socket.do_not_reverse_lookup = true
-    assert_equal(true, do_not_reverse_lookup?(:DoNotReverseLookup => nil))
-  end
-
-  def test_socket_dnrl_false_server_dnrl_true
-    Socket.do_not_reverse_lookup = false
-    assert_equal(true, do_not_reverse_lookup?(:DoNotReverseLookup => true))
-  end
-
-  def test_socket_dnrl_false_server_dnrl_false
-    Socket.do_not_reverse_lookup = false
-    assert_equal(false, do_not_reverse_lookup?(:DoNotReverseLookup => false))
-  end
-
-  def test_socket_dnrl_false_server_dnrl_nil
-    Socket.do_not_reverse_lookup = false
-    assert_equal(false, do_not_reverse_lookup?(:DoNotReverseLookup => nil))
-  end
-end
diff --git a/tool/test/webrick/test_filehandler.rb b/tool/test/webrick/test_filehandler.rb
deleted file mode 100644
index 9c5b83e300b376..00000000000000
--- a/tool/test/webrick/test_filehandler.rb
+++ /dev/null
@@ -1,403 +0,0 @@
-# frozen_string_literal: false
-require "test/unit"
-require_relative "utils.rb"
-require "webrick"
-require "stringio"
-require "tmpdir"
-
-class WEBrick::TestFileHandler < Test::Unit::TestCase
-  def teardown
-    WEBrick::Utils::TimeoutHandler.terminate
-    super
-  end
-
-  def default_file_handler(filename)
-    klass = WEBrick::HTTPServlet::DefaultFileHandler
-    klass.new(WEBrick::Config::HTTP, filename)
-  end
-
-  def windows?
-    File.directory?("\\")
-  end
-
-  def get_res_body(res)
-    sio = StringIO.new
-    sio.binmode
-    res.send_body(sio)
-    sio.string
-  end
-
-  def make_range_request(range_spec)
-    msg = <<-END_OF_REQUEST
-      GET / HTTP/1.0
-      Range: #{range_spec}
-
-    END_OF_REQUEST
-    return StringIO.new(msg.gsub(/^ {6}/, ""))
-  end
-
-  def make_range_response(file, range_spec)
-    req = WEBrick::HTTPRequest.new(WEBrick::Config::HTTP)
-    req.parse(make_range_request(range_spec))
-    res = WEBrick::HTTPResponse.new(WEBrick::Config::HTTP)
-    size = File.size(file)
-    handler = default_file_handler(file)
-    handler.make_partial_content(req, res, file, size)
-    return res
-  end
-
-  def test_make_partial_content
-    filename = __FILE__
-    filesize = File.size(filename)
-
-    res = make_range_response(filename, "bytes=#{filesize-100}-")
-    assert_match(%r{^text/plain}, res["content-type"])
-    assert_equal(100, get_res_body(res).size)
-
-    res = make_range_response(filename, "bytes=-100")
-    assert_match(%r{^text/plain}, res["content-type"])
-    assert_equal(100, get_res_body(res).size)
-
-    res = make_range_response(filename, "bytes=0-99")
-    assert_match(%r{^text/plain}, res["content-type"])
-    assert_equal(100, get_res_body(res).size)
-
-    res = make_range_response(filename, "bytes=100-199")
-    assert_match(%r{^text/plain}, res["content-type"])
-    assert_equal(100, get_res_body(res).size)
-
-    res = make_range_response(filename, "bytes=0-0")
-    assert_match(%r{^text/plain}, res["content-type"])
-    assert_equal(1, get_res_body(res).size)
-
-    res = make_range_response(filename, "bytes=-1")
-    assert_match(%r{^text/plain}, res["content-type"])
-    assert_equal(1, get_res_body(res).size)
-
-    res = make_range_response(filename, "bytes=0-0, -2")
-    assert_match(%r{^multipart/byteranges}, res["content-type"])
-    body = get_res_body(res)
-    boundary = /; boundary=(.+)/.match(res['content-type'])[1]
-    off = filesize - 2
-    last = filesize - 1
-
-    exp = "--#{boundary}\r\n" \
-          "Content-Type: text/plain\r\n" \
-          "Content-Range: bytes 0-0/#{filesize}\r\n" \
-          "\r\n" \
-          "#{File.read(__FILE__, 1)}\r\n" \
-          "--#{boundary}\r\n" \
-          "Content-Type: text/plain\r\n" \
-          "Content-Range: bytes #{off}-#{last}/#{filesize}\r\n" \
-          "\r\n" \
-          "#{File.read(__FILE__, 2, off)}\r\n" \
-          "--#{boundary}--\r\n"
-    assert_equal exp, body
-  end
-
-  def test_filehandler
-    config = { :DocumentRoot => File.dirname(__FILE__), }
-    this_file = File.basename(__FILE__)
-    filesize = File.size(__FILE__)
-    this_data = File.binread(__FILE__)
-    range = nil
-    bug2593 = '[ruby-dev:40030]'
-
-    TestWEBrick.start_httpserver(config) do |server, addr, port, log|
-      begin
-        server[:DocumentRootOptions][:NondisclosureName] = []
-        http = Net::HTTP.new(addr, port)
-        req = Net::HTTP::Get.new("/")
-        http.request(req){|res|
-          assert_equal("200", res.code, log.call)
-          assert_equal("text/html", res.content_type, log.call)
-          assert_match(/HREF="#{this_file}"/, res.body, log.call)
-        }
-        req = Net::HTTP::Get.new("/#{this_file}")
-        http.request(req){|res|
-          assert_equal("200", res.code, log.call)
-          assert_equal("text/plain", res.content_type, log.call)
-          assert_equal(this_data, res.body, log.call)
-        }
-
-        req = Net::HTTP::Get.new("/#{this_file}", "range"=>"bytes=#{filesize-100}-")
-        http.request(req){|res|
-          assert_equal("206", res.code, log.call)
-          assert_equal("text/plain", res.content_type, log.call)
-          assert_nothing_raised(bug2593) {range = res.content_range}
-          assert_equal((filesize-100)..(filesize-1), range, log.call)
-          assert_equal(this_data[-100..-1], res.body, log.call)
-        }
-
-        req = Net::HTTP::Get.new("/#{this_file}", "range"=>"bytes=-100")
-        http.request(req){|res|
-          assert_equal("206", res.code, log.call)
-          assert_equal("text/plain", res.content_type, log.call)
-          assert_nothing_raised(bug2593) {range = res.content_range}
-          assert_equal((filesize-100)..(filesize-1), range, log.call)
-          assert_equal(this_data[-100..-1], res.body, log.call)
-        }
-
-        req = Net::HTTP::Get.new("/#{this_file}", "range"=>"bytes=0-99")
-        http.request(req){|res|
-          assert_equal("206", res.code, log.call)
-          assert_equal("text/plain", res.content_type, log.call)
-          assert_nothing_raised(bug2593) {range = res.content_range}
-          assert_equal(0..99, range, log.call)
-          assert_equal(this_data[0..99], res.body, log.call)
-        }
-
-        req = Net::HTTP::Get.new("/#{this_file}", "range"=>"bytes=100-199")
-        http.request(req){|res|
-          assert_equal("206", res.code, log.call)
-          assert_equal("text/plain", res.content_type, log.call)
-          assert_nothing_raised(bug2593) {range = res.content_range}
-          assert_equal(100..199, range, log.call)
-          assert_equal(this_data[100..199], res.body, log.call)
-        }
-
-        req = Net::HTTP::Get.new("/#{this_file}", "range"=>"bytes=0-0")
-        http.request(req){|res|
-          assert_equal("206", res.code, log.call)
-          assert_equal("text/plain", res.content_type, log.call)
-          assert_nothing_raised(bug2593) {range = res.content_range}
-          assert_equal(0..0, range, log.call)
-          assert_equal(this_data[0..0], res.body, log.call)
-        }
-
-        req = Net::HTTP::Get.new("/#{this_file}", "range"=>"bytes=-1")
-        http.request(req){|res|
-          assert_equal("206", res.code, log.call)
-          assert_equal("text/plain", res.content_type, log.call)
-          assert_nothing_raised(bug2593) {range = res.content_range}
-          assert_equal((filesize-1)..(filesize-1), range, log.call)
-          assert_equal(this_data[-1, 1], res.body, log.call)
-        }
-
-        req = Net::HTTP::Get.new("/#{this_file}", "range"=>"bytes=0-0, -2")
-        http.request(req){|res|
-          assert_equal("206", res.code, log.call)
-          assert_equal("multipart/byteranges", res.content_type, log.call)
-        }
-      ensure
-        server[:DocumentRootOptions].delete :NondisclosureName
-      end
-    end
-  end
-
-  def test_non_disclosure_name
-    config = { :DocumentRoot => File.dirname(__FILE__), }
-    log_tester = lambda {|log, access_log|
-      log = log.reject {|s| /ERROR `.*\' not found\./ =~ s }
-      log = log.reject {|s| /WARN  the request refers nondisclosure name/ =~ s }
-      assert_equal([], log)
-    }
-    this_file = File.basename(__FILE__)
-    TestWEBrick.start_httpserver(config, log_tester) do |server, addr, port, log|
-      http = Net::HTTP.new(addr, port)
-      doc_root_opts = server[:DocumentRootOptions]
-      doc_root_opts[:NondisclosureName] = %w(.ht* *~ test_*)
-      req = Net::HTTP::Get.new("/")
-      http.request(req){|res|
-        assert_equal("200", res.code, log.call)
-        assert_equal("text/html", res.content_type, log.call)
-        assert_no_match(/HREF="#{File.basename(__FILE__)}"/, res.body)
-      }
-      req = Net::HTTP::Get.new("/#{this_file}")
-      http.request(req){|res|
-        assert_equal("404", res.code, log.call)
-      }
-      doc_root_opts[:NondisclosureName] = %w(.ht* *~ TEST_*)
-      http.request(req){|res|
-        assert_equal("404", res.code, log.call)
-      }
-    end
-  end
-
-  def test_directory_traversal
-    return if File.executable?(__FILE__) # skip on strange file system
-
-    config = { :DocumentRoot => File.dirname(__FILE__), }
-    log_tester = lambda {|log, access_log|
-      log = log.reject {|s| /ERROR bad URI/ =~ s }
-      log = log.reject {|s| /ERROR `.*\' not found\./ =~ s }
-      assert_equal([], log)
-    }
-    TestWEBrick.start_httpserver(config, log_tester) do |server, addr, port, log|
-      http = Net::HTTP.new(addr, port)
-      req = Net::HTTP::Get.new("/../../")
-      http.request(req){|res| assert_equal("400", res.code, log.call) }
-      req = Net::HTTP::Get.new("/..%5c../#{File.basename(__FILE__)}")
-      http.request(req){|res| assert_equal(windows? ? "200" : "404", res.code, log.call) }
-      req = Net::HTTP::Get.new("/..%5c..%5cruby.c")
-      http.request(req){|res| assert_equal("404", res.code, log.call) }
-    end
-  end
-
-  def test_unwise_in_path
-    if windows?
-      config = { :DocumentRoot => File.dirname(__FILE__), }
-      TestWEBrick.start_httpserver(config) do |server, addr, port, log|
-        http = Net::HTTP.new(addr, port)
-        req = Net::HTTP::Get.new("/..%5c..")
-        http.request(req){|res| assert_equal("301", res.code, log.call) }
-      end
-    end
-  end
-
-  def test_short_filename
-    return if File.executable?(__FILE__) # skip on strange file system
-    return if /mswin/ =~ RUBY_PLATFORM && ENV.key?('GITHUB_ACTIONS') # not working from the beginning
-
-    config = {
-      :CGIInterpreter => TestWEBrick::RubyBin,
-      :DocumentRoot => File.dirname(__FILE__),
-      :CGIPathEnv => ENV['PATH'],
-    }
-    log_tester = lambda {|log, access_log|
-      log = log.reject {|s| /ERROR `.*\' not found\./ =~ s }
-      log = log.reject {|s| /WARN  the request refers nondisclosure name/ =~ s }
-      assert_equal([], log)
-    }
-    TestWEBrick.start_httpserver(config, log_tester) do |server, addr, port, log|
-      http = Net::HTTP.new(addr, port)
-      if windows?
-        root = config[:DocumentRoot].tr("/", "\\")
-        fname = IO.popen(%W[dir /x #{root}\\webrick_long_filename.cgi], encoding: "binary", &:read)
-        fname.sub!(/\A.*$^$.*$^$/m, '')
-        if fname
-          fname = fname[/\s(w.+?cgi)\s/i, 1]
-          fname.downcase!
-        end
-      else
-        fname = "webric~1.cgi"
-      end
-      req = Net::HTTP::Get.new("/#{fname}/test")
-      http.request(req) do |res|
-        if windows?
-          assert_equal("200", res.code, log.call)
-          assert_equal("/test", res.body, log.call)
-        else
-          assert_equal("404", res.code, log.call)
-        end
-      end
-
-      req = Net::HTTP::Get.new("/.htaccess")
-      http.request(req) {|res| assert_equal("404", res.code, log.call) }
-      req = Net::HTTP::Get.new("/htacce~1")
-      http.request(req) {|res| assert_equal("404", res.code, log.call) }
-      req = Net::HTTP::Get.new("/HTACCE~1")
-      http.request(req) {|res| assert_equal("404", res.code, log.call) }
-    end
-  end
-
-  def test_multibyte_char_in_path
-    if Encoding.default_external == Encoding.find('US-ASCII')
-      reset_encoding = true
-      verb = $VERBOSE
-      $VERBOSE = false
-      Encoding.default_external = Encoding.find('UTF-8')
-    end
-
-    c = "\u00a7"
-    begin
-      c = c.encode('filesystem')
-    rescue EncodingError
-      c = c.b
-    end
-    Dir.mktmpdir(c) do |dir|
-      basename = "#{c}.txt"
-      File.write("#{dir}/#{basename}", "test_multibyte_char_in_path")
-      Dir.mkdir("#{dir}/#{c}")
-      File.write("#{dir}/#{c}/#{basename}", "nested")
-      config = {
-        :DocumentRoot => dir,
-        :DirectoryIndex => [basename],
-      }
-      TestWEBrick.start_httpserver(config) do |server, addr, port, log|
-        http = Net::HTTP.new(addr, port)
-        path = "/#{basename}"
-        req = Net::HTTP::Get.new(WEBrick::HTTPUtils::escape(path))
-        http.request(req){|res| assert_equal("200", res.code, log.call + "\nFilesystem encoding is #{Encoding.find('filesystem')}") }
-        path = "/#{c}/#{basename}"
-        req = Net::HTTP::Get.new(WEBrick::HTTPUtils::escape(path))
-        http.request(req){|res| assert_equal("200", res.code, log.call) }
-        req = Net::HTTP::Get.new('/')
-        http.request(req){|res|
-          assert_equal("test_multibyte_char_in_path", res.body, log.call)
-        }
-      end
-    end
-  ensure
-    if reset_encoding
-      Encoding.default_external = Encoding.find('US-ASCII')
-      $VERBOSE = verb
-    end
-  end
-
-  def test_script_disclosure
-    return if File.executable?(__FILE__) # skip on strange file system
-
-    config = {
-      :CGIInterpreter => TestWEBrick::RubyBinArray,
-      :DocumentRoot => File.dirname(__FILE__),
-      :CGIPathEnv => ENV['PATH'],
-      :RequestCallback => Proc.new{|req, res|
-        def req.meta_vars
-          meta = super
-          meta["RUBYLIB"] = $:.join(File::PATH_SEPARATOR)
-          meta[RbConfig::CONFIG['LIBPATHENV']] = ENV[RbConfig::CONFIG['LIBPATHENV']] if RbConfig::CONFIG['LIBPATHENV']
-          return meta
-        end
-      },
-    }
-    log_tester = lambda {|log, access_log|
-      log = log.reject {|s| /ERROR `.*\' not found\./ =~ s }
-      assert_equal([], log)
-    }
-    TestWEBrick.start_httpserver(config, log_tester) do |server, addr, port, log|
-      http = Net::HTTP.new(addr, port)
-      http.read_timeout = EnvUtil.apply_timeout_scale(60)
-      http.write_timeout = EnvUtil.apply_timeout_scale(60) if http.respond_to?(:write_timeout=)
-
-      req = Net::HTTP::Get.new("/webrick.cgi/test")
-      http.request(req) do |res|
-        assert_equal("200", res.code, log.call)
-        assert_equal("/test", res.body, log.call)
-      end
-
-      resok = windows?
-      response_assertion = Proc.new do |res|
-        if resok
-          assert_equal("200", res.code, log.call)
-          assert_equal("/test", res.body, log.call)
-        else
-          assert_equal("404", res.code, log.call)
-        end
-      end
-      req = Net::HTTP::Get.new("/webrick.cgi%20/test")
-      http.request(req, &response_assertion)
-      req = Net::HTTP::Get.new("/webrick.cgi./test")
-      http.request(req, &response_assertion)
-      resok &&= File.exist?(__FILE__+"::$DATA")
-      req = Net::HTTP::Get.new("/webrick.cgi::$DATA/test")
-      http.request(req, &response_assertion)
-    end
-  end
-
-  def test_erbhandler
-    config = { :DocumentRoot => File.dirname(__FILE__) }
-    log_tester = lambda {|log, access_log|
-      log = log.reject {|s| /ERROR `.*\' not found\./ =~ s }
-      assert_equal([], log)
-    }
-    TestWEBrick.start_httpserver(config, log_tester) do |server, addr, port, log|
-      http = Net::HTTP.new(addr, port)
-      req = Net::HTTP::Get.new("/webrick.rhtml")
-      http.request(req) do |res|
-        assert_equal("200", res.code, log.call)
-        assert_match %r!\Areq to http://[^/]+/webrick\.rhtml {}\n!, res.body
-      end
-    end
-  end
-end
diff --git a/tool/test/webrick/test_htgroup.rb b/tool/test/webrick/test_htgroup.rb
deleted file mode 100644
index 8749711df5f62b..00000000000000
--- a/tool/test/webrick/test_htgroup.rb
+++ /dev/null
@@ -1,19 +0,0 @@
-require "tempfile"
-require "test/unit"
-require "webrick/httpauth/htgroup"
-
-class TestHtgroup < Test::Unit::TestCase
-  def test_htgroup
-    Tempfile.create('test_htgroup') do |tmpfile|
-      tmpfile.close
-      tmp_group = WEBrick::HTTPAuth::Htgroup.new(tmpfile.path)
-      tmp_group.add 'superheroes', %w[spiderman batman]
-      tmp_group.add 'supervillains', %w[joker]
-      tmp_group.flush
-
-      htgroup = WEBrick::HTTPAuth::Htgroup.new(tmpfile.path)
-      assert_equal(htgroup.members('superheroes'), %w[spiderman batman])
-      assert_equal(htgroup.members('supervillains'), %w[joker])
-    end
-  end
-end
diff --git a/tool/test/webrick/test_htmlutils.rb b/tool/test/webrick/test_htmlutils.rb
deleted file mode 100644
index ae1b8efa954a58..00000000000000
--- a/tool/test/webrick/test_htmlutils.rb
+++ /dev/null
@@ -1,21 +0,0 @@
-# frozen_string_literal: false
-require "test/unit"
-require "webrick/htmlutils"
-
-class TestWEBrickHTMLUtils < Test::Unit::TestCase
-  include WEBrick::HTMLUtils
-
-  def test_escape
-    assert_equal("foo", escape("foo"))
-    assert_equal("foo bar", escape("foo bar"))
-    assert_equal("foo&amp;bar", escape("foo&bar"))
-    assert_equal("foo&quot;bar", escape("foo\"bar"))
-    assert_equal("foo&gt;bar", escape("foo>bar"))
-    assert_equal("foo&lt;bar", escape("foo<bar"))
-    assert_equal("\u{3053 3093 306B 3061 306F}", escape("\u{3053 3093 306B 3061 306F}"))
-    bug8425 = '[Bug #8425] [ruby-core:55052]'
-    assert_nothing_raised(ArgumentError, Encoding::CompatibilityError, bug8425) {
-      assert_equal("\u{3053 3093 306B}\xff&lt;", escape("\u{3053 3093 306B}\xff<"))
-    }
-  end
-end
diff --git a/tool/test/webrick/test_httpauth.rb b/tool/test/webrick/test_httpauth.rb
deleted file mode 100644
index 9fe8af8be21522..00000000000000
--- a/tool/test/webrick/test_httpauth.rb
+++ /dev/null
@@ -1,366 +0,0 @@
-# frozen_string_literal: false
-require "test/unit"
-require "net/http"
-require "tempfile"
-require "webrick"
-require "webrick/httpauth/basicauth"
-require "stringio"
-require_relative "utils"
-
-class TestWEBrickHTTPAuth < Test::Unit::TestCase
-  def teardown
-    WEBrick::Utils::TimeoutHandler.terminate
-    super
-  end
-
-  def test_basic_auth
-    log_tester = lambda {|log, access_log|
-      assert_equal(1, log.length)
-      assert_match(/ERROR WEBrick::HTTPStatus::Unauthorized/, log[0])
-    }
-    TestWEBrick.start_httpserver({}, log_tester) {|server, addr, port, log|
-      realm = "WEBrick's realm"
-      path = "/basic_auth"
-
-      server.mount_proc(path){|req, res|
-        WEBrick::HTTPAuth.basic_auth(req, res, realm){|user, pass|
-          user == "webrick" && pass == "supersecretpassword"
-        }
-        res.body = "hoge"
-      }
-      http = Net::HTTP.new(addr, port)
-      g = Net::HTTP::Get.new(path)
-      g.basic_auth("webrick", "supersecretpassword")
-      http.request(g){|res| assert_equal("hoge", res.body, log.call)}
-      g.basic_auth("webrick", "not super")
-      http.request(g){|res| assert_not_equal("hoge", res.body, log.call)}
-    }
-  end
-
-  def test_basic_auth_sha
-    Tempfile.create("test_webrick_auth") {|tmpfile|
-      tmpfile.puts("webrick:{SHA}GJYFRpBbdchp595jlh3Bhfmgp8k=")
-      tmpfile.flush
-      assert_raise(NotImplementedError){
-        WEBrick::HTTPAuth::Htpasswd.new(tmpfile.path)
-      }
-    }
-  end
-
-  def test_basic_auth_md5
-    Tempfile.create("test_webrick_auth") {|tmpfile|
-      tmpfile.puts("webrick:$apr1$IOVMD/..$rmnOSPXr0.wwrLPZHBQZy0")
-      tmpfile.flush
-      assert_raise(NotImplementedError){
-        WEBrick::HTTPAuth::Htpasswd.new(tmpfile.path)
-      }
-    }
-  end
-
-  [nil, :crypt, :bcrypt].each do |hash_algo|
-    # OpenBSD does not support insecure DES-crypt
-    next if /openbsd/ =~ RUBY_PLATFORM && hash_algo != :bcrypt
-
-    begin
-      case hash_algo
-      when :crypt
-        # require 'string/crypt'
-      when :bcrypt
-        require 'bcrypt'
-      end
-    rescue LoadError
-      next
-    end
-
-    define_method(:"test_basic_auth_htpasswd_#{hash_algo}") do
-      log_tester = lambda {|log, access_log|
-        log.reject! {|line| /\A\s*\z/ =~ line }
-        pats = [
-          /ERROR Basic WEBrick's realm: webrick: password unmatch\./,
-          /ERROR WEBrick::HTTPStatus::Unauthorized/
-        ]
-        pats.each {|pat|
-          assert(!log.grep(pat).empty?, "webrick log doesn't have expected error: #{pat.inspect}")
-          log.reject! {|line| pat =~ line }
-        }
-        assert_equal([], log)
-      }
-      TestWEBrick.start_httpserver({}, log_tester) {|server, addr, port, log|
-        realm = "WEBrick's realm"
-        path = "/basic_auth2"
-
-        Tempfile.create("test_webrick_auth") {|tmpfile|
-          tmpfile.close
-          tmp_pass = WEBrick::HTTPAuth::Htpasswd.new(tmpfile.path, password_hash: hash_algo)
-          tmp_pass.set_passwd(realm, "webrick", "supersecretpassword")
-          tmp_pass.set_passwd(realm, "foo", "supersecretpassword")
-          tmp_pass.flush
-
-          htpasswd = WEBrick::HTTPAuth::Htpasswd.new(tmpfile.path, password_hash: hash_algo)
-          users = []
-          htpasswd.each{|user, pass| users << user }
-          assert_equal(2, users.size, log.call)
-          assert(users.member?("webrick"), log.call)
-          assert(users.member?("foo"), log.call)
-
-          server.mount_proc(path){|req, res|
-            auth = WEBrick::HTTPAuth::BasicAuth.new(
-              :Realm => realm, :UserDB => htpasswd,
-              :Logger => server.logger
-            )
-            auth.authenticate(req, res)
-            res.body = "hoge"
-          }
-          http = Net::HTTP.new(addr, port)
-          g = Net::HTTP::Get.new(path)
-          g.basic_auth("webrick", "supersecretpassword")
-          http.request(g){|res| assert_equal("hoge", res.body, log.call)}
-          g.basic_auth("webrick", "not super")
-          http.request(g){|res| assert_not_equal("hoge", res.body, log.call)}
-        }
-      }
-    end
-
-    define_method(:"test_basic_auth_bad_username_htpasswd_#{hash_algo}") do
-      log_tester = lambda {|log, access_log|
-        assert_equal(2, log.length)
-        assert_match(/ERROR Basic WEBrick's realm: foo\\ebar: the user is not allowed\./, log[0])
-        assert_match(/ERROR WEBrick::HTTPStatus::Unauthorized/, log[1])
-      }
-      TestWEBrick.start_httpserver({}, log_tester) {|server, addr, port, log|
-        realm = "WEBrick's realm"
-        path = "/basic_auth"
-
-        Tempfile.create("test_webrick_auth") {|tmpfile|
-          tmpfile.close
-          tmp_pass = WEBrick::HTTPAuth::Htpasswd.new(tmpfile.path, password_hash: hash_algo)
-          tmp_pass.set_passwd(realm, "webrick", "supersecretpassword")
-          tmp_pass.set_passwd(realm, "foo", "supersecretpassword")
-          tmp_pass.flush
-
-          htpasswd = WEBrick::HTTPAuth::Htpasswd.new(tmpfile.path, password_hash: hash_algo)
-          users = []
-          htpasswd.each{|user, pass| users << user }
-          server.mount_proc(path){|req, res|
-            auth = WEBrick::HTTPAuth::BasicAuth.new(
-              :Realm => realm, :UserDB => htpasswd,
-              :Logger => server.logger
-            )
-            auth.authenticate(req, res)
-            res.body = "hoge"
-          }
-          http = Net::HTTP.new(addr, port)
-          g = Net::HTTP::Get.new(path)
-          g.basic_auth("foo\ebar", "passwd")
-          http.request(g){|res| assert_not_equal("hoge", res.body, log.call) }
-        }
-      }
-    end
-  end
-
-  DIGESTRES_ = /
-    ([a-zA-Z\-]+)
-      [ \t]*(?:\r\n[ \t]*)*
-      =
-      [ \t]*(?:\r\n[ \t]*)*
-      (?:
-       "((?:[^"]+|\\[\x00-\x7F])*)" |
-       ([!\#$%&'*+\-.0-9A-Z^_`a-z|~]+)
-      )/x
-
-  def test_digest_auth
-    log_tester = lambda {|log, access_log|
-      log.reject! {|line| /\A\s*\z/ =~ line }
-      pats = [
-        /ERROR Digest WEBrick's realm: no credentials in the request\./,
-        /ERROR WEBrick::HTTPStatus::Unauthorized/,
-        /ERROR Digest WEBrick's realm: webrick: digest unmatch\./
-      ]
-      pats.each {|pat|
-        assert(!log.grep(pat).empty?, "webrick log doesn't have expected error: #{pat.inspect}")
-        log.reject! {|line| pat =~ line }
-      }
-      assert_equal([], log)
-    }
-    TestWEBrick.start_httpserver({}, log_tester) {|server, addr, port, log|
-      realm = "WEBrick's realm"
-      path = "/digest_auth"
-
-      Tempfile.create("test_webrick_auth") {|tmpfile|
-        tmpfile.close
-        tmp_pass = WEBrick::HTTPAuth::Htdigest.new(tmpfile.path)
-        tmp_pass.set_passwd(realm, "webrick", "supersecretpassword")
-        tmp_pass.set_passwd(realm, "foo", "supersecretpassword")
-        tmp_pass.flush
-
-        htdigest = WEBrick::HTTPAuth::Htdigest.new(tmpfile.path)
-        users = []
-        htdigest.each{|user, pass| users << user }
-        assert_equal(2, users.size, log.call)
-        assert(users.member?("webrick"), log.call)
-        assert(users.member?("foo"), log.call)
-
-        auth = WEBrick::HTTPAuth::DigestAuth.new(
-          :Realm => realm, :UserDB => htdigest,
-          :Algorithm => 'MD5',
-          :Logger => server.logger
-        )
-        server.mount_proc(path){|req, res|
-          auth.authenticate(req, res)
-          res.body = "hoge"
-        }
-
-        Net::HTTP.start(addr, port) do |http|
-          g = Net::HTTP::Get.new(path)
-          params = {}
-          http.request(g) do |res|
-            assert_equal('401', res.code, log.call)
-            res["www-authenticate"].scan(DIGESTRES_) do |key, quoted, token|
-              params[key.downcase] = token || quoted.delete('\\')
-            end
-            params['uri'] = "http://#{addr}:#{port}#{path}"
-          end
-
-          g['Authorization'] = credentials_for_request('webrick', "supersecretpassword", params)
-          http.request(g){|res| assert_equal("hoge", res.body, log.call)}
-
-          params['algorithm'].downcase! #4936
-          g['Authorization'] = credentials_for_request('webrick', "supersecretpassword", params)
-          http.request(g){|res| assert_equal("hoge", res.body, log.call)}
-
-          g['Authorization'] = credentials_for_request('webrick', "not super", params)
-          http.request(g){|res| assert_not_equal("hoge", res.body, log.call)}
-        end
-      }
-    }
-  end
-
-  def test_digest_auth_int
-    log_tester = lambda {|log, access_log|
-      log.reject! {|line| /\A\s*\z/ =~ line }
-      pats = [
-        /ERROR Digest wb auth-int realm: no credentials in the request\./,
-        /ERROR WEBrick::HTTPStatus::Unauthorized/,
-        /ERROR Digest wb auth-int realm: foo: digest unmatch\./
-      ]
-      pats.each {|pat|
-        assert(!log.grep(pat).empty?, "webrick log doesn't have expected error: #{pat.inspect}")
-        log.reject! {|line| pat =~ line }
-      }
-      assert_equal([], log)
-    }
-    TestWEBrick.start_httpserver({}, log_tester) {|server, addr, port, log|
-      realm = "wb auth-int realm"
-      path = "/digest_auth_int"
-
-      Tempfile.create("test_webrick_auth_int") {|tmpfile|
-        tmpfile.close
-        tmp_pass = WEBrick::HTTPAuth::Htdigest.new(tmpfile.path)
-        tmp_pass.set_passwd(realm, "foo", "Hunter2")
-        tmp_pass.flush
-
-        htdigest = WEBrick::HTTPAuth::Htdigest.new(tmpfile.path)
-        users = []
-        htdigest.each{|user, pass| users << user }
-        assert_equal %w(foo), users
-
-        auth = WEBrick::HTTPAuth::DigestAuth.new(
-          :Realm => realm, :UserDB => htdigest,
-          :Algorithm => 'MD5',
-          :Logger => server.logger,
-          :Qop => %w(auth-int),
-        )
-        server.mount_proc(path){|req, res|
-          auth.authenticate(req, res)
-          res.body = "bbb"
-        }
-        Net::HTTP.start(addr, port) do |http|
-          post = Net::HTTP::Post.new(path)
-          params = {}
-          data = 'hello=world'
-          body = StringIO.new(data)
-          post.content_length = data.bytesize
-          post['Content-Type'] = 'application/x-www-form-urlencoded'
-          post.body_stream = body
-
-          http.request(post) do |res|
-            assert_equal('401', res.code, log.call)
-            res["www-authenticate"].scan(DIGESTRES_) do |key, quoted, token|
-              params[key.downcase] = token || quoted.delete('\\')
-            end
-             params['uri'] = "http://#{addr}:#{port}#{path}"
-          end
-
-          body.rewind
-          cred = credentials_for_request('foo', 'Hunter3', params, body)
-          post['Authorization'] = cred
-          post.body_stream = body
-          http.request(post){|res|
-            assert_equal('401', res.code, log.call)
-            assert_not_equal("bbb", res.body, log.call)
-          }
-
-          body.rewind
-          cred = credentials_for_request('foo', 'Hunter2', params, body)
-          post['Authorization'] = cred
-          post.body_stream = body
-          http.request(post){|res| assert_equal("bbb", res.body, log.call)}
-        end
-      }
-    }
-  end
-
-  def test_digest_auth_invalid
-    digest_auth = WEBrick::HTTPAuth::DigestAuth.new(Realm: 'realm', UserDB: '')
-
-    def digest_auth.error(fmt, *)
-    end
-
-    def digest_auth.try_bad_request(len)
-      request = {"Authorization" => %[Digest a="#{'\b'*len}]}
-      authenticate request, nil
-    end
-
-    bad_request = WEBrick::HTTPStatus::BadRequest
-    t0 = Process.clock_gettime(Process::CLOCK_MONOTONIC)
-    assert_raise(bad_request) {digest_auth.try_bad_request(10)}
-    limit = (Process.clock_gettime(Process::CLOCK_MONOTONIC) - t0)
-    [20, 50, 100, 200].each do |len|
-      assert_raise(bad_request) do
-        Timeout.timeout(len*limit) {digest_auth.try_bad_request(len)}
-      end
-    end
-  end
-
-  private
-  def credentials_for_request(user, password, params, body = nil)
-    cnonce = "hoge"
-    nonce_count = 1
-    ha1 = "#{user}:#{params['realm']}:#{password}"
-    if body
-      dig = Digest::MD5.new
-      while buf = body.read(16384)
-        dig.update(buf)
-      end
-      body.rewind
-      ha2 = "POST:#{params['uri']}:#{dig.hexdigest}"
-    else
-      ha2 = "GET:#{params['uri']}"
-    end
-
-    request_digest =
-      "#{Digest::MD5.hexdigest(ha1)}:" \
-      "#{params['nonce']}:#{'%08x' % nonce_count}:#{cnonce}:#{params['qop']}:" \
-      "#{Digest::MD5.hexdigest(ha2)}"
-    "Digest username=\"#{user}\"" \
-      ", realm=\"#{params['realm']}\"" \
-      ", nonce=\"#{params['nonce']}\"" \
-      ", uri=\"#{params['uri']}\"" \
-      ", qop=#{params['qop']}" \
-      ", nc=#{'%08x' % nonce_count}" \
-      ", cnonce=\"#{cnonce}\"" \
-      ", response=\"#{Digest::MD5.hexdigest(request_digest)}\"" \
-      ", opaque=\"#{params['opaque']}\"" \
-      ", algorithm=#{params['algorithm']}"
-  end
-end
diff --git a/tool/test/webrick/test_httpproxy.rb b/tool/test/webrick/test_httpproxy.rb
deleted file mode 100644
index 66dae6f6f66910..00000000000000
--- a/tool/test/webrick/test_httpproxy.rb
+++ /dev/null
@@ -1,467 +0,0 @@
-# frozen_string_literal: false
-require "test/unit"
-require "net/http"
-require "webrick"
-require "webrick/httpproxy"
-begin
-  require "webrick/ssl"
-  require "net/https"
-rescue LoadError
-  # test_connect will be skipped
-end
-require File.expand_path("utils.rb", File.dirname(__FILE__))
-
-class TestWEBrickHTTPProxy < Test::Unit::TestCase
-  def teardown
-    WEBrick::Utils::TimeoutHandler.terminate
-    super
-  end
-
-  def test_fake_proxy
-    assert_nil(WEBrick::FakeProxyURI.scheme)
-    assert_nil(WEBrick::FakeProxyURI.host)
-    assert_nil(WEBrick::FakeProxyURI.port)
-    assert_nil(WEBrick::FakeProxyURI.path)
-    assert_nil(WEBrick::FakeProxyURI.userinfo)
-    assert_raise(NoMethodError){ WEBrick::FakeProxyURI.foo }
-  end
-
-  def test_proxy
-    # Testing GET or POST to the proxy server
-    # Note that the proxy server works as the origin server.
-    #                    +------+
-    #                    V      |
-    #  client -------> proxy ---+
-    #        GET / POST     GET / POST
-    #
-    proxy_handler_called = request_handler_called = 0
-    config = {
-      :ServerName => "localhost.localdomain",
-      :ProxyContentHandler => Proc.new{|req, res| proxy_handler_called += 1 },
-      :RequestCallback => Proc.new{|req, res| request_handler_called += 1 }
-    }
-    TestWEBrick.start_httpproxy(config){|server, addr, port, log|
-      server.mount_proc("/"){|req, res|
-        res.body = "#{req.request_method} #{req.path} #{req.body}"
-      }
-      http = Net::HTTP.new(addr, port, addr, port)
-
-      req = Net::HTTP::Get.new("/")
-      http.request(req){|res|
-        assert_equal("1.1 localhost.localdomain:#{port}", res["via"], log.call)
-        assert_equal("GET / ", res.body, log.call)
-      }
-      assert_equal(1, proxy_handler_called, log.call)
-      assert_equal(2, request_handler_called, log.call)
-
-      req = Net::HTTP::Head.new("/")
-      http.request(req){|res|
-        assert_equal("1.1 localhost.localdomain:#{port}", res["via"], log.call)
-        assert_nil(res.body, log.call)
-      }
-      assert_equal(2, proxy_handler_called, log.call)
-      assert_equal(4, request_handler_called, log.call)
-
-      req = Net::HTTP::Post.new("/")
-      req.body = "post-data"
-      req.content_type = "application/x-www-form-urlencoded"
-      http.request(req){|res|
-        assert_equal("1.1 localhost.localdomain:#{port}", res["via"], log.call)
-        assert_equal("POST / post-data", res.body, log.call)
-      }
-      assert_equal(3, proxy_handler_called, log.call)
-      assert_equal(6, request_handler_called, log.call)
-    }
-  end
-
-  def test_no_proxy
-    # Testing GET or POST to the proxy server without proxy request.
-    #
-    #  client -------> proxy
-    #        GET / POST
-    #
-    proxy_handler_called = request_handler_called = 0
-    config = {
-      :ServerName => "localhost.localdomain",
-      :ProxyContentHandler => Proc.new{|req, res| proxy_handler_called += 1 },
-      :RequestCallback => Proc.new{|req, res| request_handler_called += 1 }
-    }
-    TestWEBrick.start_httpproxy(config){|server, addr, port, log|
-      server.mount_proc("/"){|req, res|
-        res.body = "#{req.request_method} #{req.path} #{req.body}"
-      }
-      http = Net::HTTP.new(addr, port)
-
-      req = Net::HTTP::Get.new("/")
-      http.request(req){|res|
-        assert_nil(res["via"], log.call)
-        assert_equal("GET / ", res.body, log.call)
-      }
-      assert_equal(0, proxy_handler_called, log.call)
-      assert_equal(1, request_handler_called, log.call)
-
-      req = Net::HTTP::Head.new("/")
-      http.request(req){|res|
-        assert_nil(res["via"], log.call)
-        assert_nil(res.body, log.call)
-      }
-      assert_equal(0, proxy_handler_called, log.call)
-      assert_equal(2, request_handler_called, log.call)
-
-      req = Net::HTTP::Post.new("/")
-      req.content_type = "application/x-www-form-urlencoded"
-      req.body = "post-data"
-      http.request(req){|res|
-        assert_nil(res["via"], log.call)
-        assert_equal("POST / post-data", res.body, log.call)
-      }
-      assert_equal(0, proxy_handler_called, log.call)
-      assert_equal(3, request_handler_called, log.call)
-    }
-  end
-
-  def test_big_bodies
-    require 'digest/md5'
-    rand_str = File.read(__FILE__)
-    rand_str.freeze
-    nr = 1024 ** 2 / rand_str.size # bigger works, too
-    exp = Digest::MD5.new
-    nr.times { exp.update(rand_str) }
-    exp = exp.hexdigest
-    TestWEBrick.start_httpserver do |o_server, o_addr, o_port, o_log|
-      o_server.mount_proc('/') do |req, res|
-        case req.request_method
-        when 'GET'
-          res['content-type'] = 'application/octet-stream'
-          if req.path == '/length'
-            res['content-length'] = (nr * rand_str.size).to_s
-          else
-            res.chunked = true
-          end
-          res.body = ->(socket) { nr.times { socket.write(rand_str) } }
-        when 'POST'
-          dig = Digest::MD5.new
-          req.body { |buf| dig.update(buf); buf.clear }
-          res['content-type'] = 'text/plain'
-          res['content-length'] = '32'
-          res.body = dig.hexdigest
-        end
-      end
-
-      http = Net::HTTP.new(o_addr, o_port)
-      IO.pipe do |rd, wr|
-        headers = {
-          'Content-Type' => 'application/octet-stream',
-          'Transfer-Encoding' => 'chunked',
-        }
-        post = Net::HTTP::Post.new('/', headers)
-        th = Thread.new { nr.times { wr.write(rand_str) }; wr.close }
-        post.body_stream = rd
-        http.request(post) do |res|
-          assert_equal 'text/plain', res['content-type']
-          assert_equal 32, res.content_length
-          assert_equal exp, res.body
-        end
-        assert_nil th.value
-      end
-
-      TestWEBrick.start_httpproxy do |p_server, p_addr, p_port, p_log|
-        http = Net::HTTP.new(o_addr, o_port, p_addr, p_port)
-        http.request_get('/length') do |res|
-          assert_equal(nr * rand_str.size, res.content_length)
-          dig = Digest::MD5.new
-          res.read_body { |buf| dig.update(buf); buf.clear }
-          assert_equal exp, dig.hexdigest
-        end
-        http.request_get('/') do |res|
-          assert_predicate res, :chunked?
-          dig = Digest::MD5.new
-          res.read_body { |buf| dig.update(buf); buf.clear }
-          assert_equal exp, dig.hexdigest
-        end
-
-        IO.pipe do |rd, wr|
-          headers = {
-            'Content-Type' => 'application/octet-stream',
-            'Content-Length' => (nr * rand_str.size).to_s,
-          }
-          post = Net::HTTP::Post.new('/', headers)
-          th = Thread.new { nr.times { wr.write(rand_str) }; wr.close }
-          post.body_stream = rd
-          http.request(post) do |res|
-            assert_equal 'text/plain', res['content-type']
-            assert_equal 32, res.content_length
-            assert_equal exp, res.body
-          end
-          assert_nil th.value
-        end
-
-        IO.pipe do |rd, wr|
-          headers = {
-            'Content-Type' => 'application/octet-stream',
-            'Transfer-Encoding' => 'chunked',
-          }
-          post = Net::HTTP::Post.new('/', headers)
-          th = Thread.new { nr.times { wr.write(rand_str) }; wr.close }
-          post.body_stream = rd
-          http.request(post) do |res|
-            assert_equal 'text/plain', res['content-type']
-            assert_equal 32, res.content_length
-            assert_equal exp, res.body
-          end
-          assert_nil th.value
-        end
-      end
-    end
-  end if RUBY_VERSION >= '2.5'
-
-  def test_http10_proxy_chunked
-    # Testing HTTP/1.0 client request and HTTP/1.1 chunked response
-    # from origin server.
-    #                    +------+
-    #                    V      |
-    #  client -------> proxy ---+
-    #           GET          GET
-    #           HTTP/1.0     HTTP/1.1
-    #           non-chunked  chunked
-    #
-    proxy_handler_called = request_handler_called = 0
-    config = {
-      :ServerName => "localhost.localdomain",
-      :ProxyContentHandler => Proc.new{|req, res| proxy_handler_called += 1 },
-      :RequestCallback => Proc.new{|req, res| request_handler_called += 1 }
-    }
-    log_tester = lambda {|log, access_log|
-      log.reject! {|str|
-        %r{WARN  chunked is set for an HTTP/1\.0 request\. \(ignored\)} =~ str
-      }
-      assert_equal([], log)
-    }
-    TestWEBrick.start_httpproxy(config, log_tester){|server, addr, port, log|
-      body = nil
-      server.mount_proc("/"){|req, res|
-        body = "#{req.request_method} #{req.path} #{req.body}"
-        res.chunked = true
-        res.body = -> (socket) { body.each_char {|c| socket.write c } }
-      }
-
-      # Don't use Net::HTTP because it uses HTTP/1.1.
-      TCPSocket.open(addr, port) {|s|
-        s.write "GET / HTTP/1.0\r\nHost: localhost.localdomain\r\n\r\n"
-        response = s.read
-        assert_equal(body, response[/.*\z/])
-      }
-    }
-  end
-
-  def make_certificate(key, cn)
-    subject = OpenSSL::X509::Name.parse("/DC=org/DC=ruby-lang/CN=#{cn}")
-    exts = [
-      ["keyUsage", "keyEncipherment,digitalSignature", true],
-    ]
-    cert = OpenSSL::X509::Certificate.new
-    cert.version = 2
-    cert.serial = 1
-    cert.subject = subject
-    cert.issuer = subject
-    cert.public_key = key
-    cert.not_before = Time.now - 3600
-    cert.not_after = Time.now + 3600
-    ef = OpenSSL::X509::ExtensionFactory.new(cert, cert)
-    exts.each {|args| cert.add_extension(ef.create_extension(*args)) }
-    cert.sign(key, "sha256")
-    return cert
-  end if defined?(OpenSSL::SSL)
-
-  def test_connect
-    # Testing CONNECT to proxy server
-    #
-    #  client -----------> proxy -----------> https
-    #    1.     CONNECT          establish TCP
-    #    2.   ---- establish SSL session --->
-    #    3.   ------- GET or POST ---------->
-    #
-    key = TEST_KEY_RSA2048
-    cert = make_certificate(key, "127.0.0.1")
-    s_config = {
-      :SSLEnable =>true,
-      :ServerName => "localhost",
-      :SSLCertificate => cert,
-      :SSLPrivateKey => key,
-    }
-    config = {
-      :ServerName => "localhost.localdomain",
-      :RequestCallback => Proc.new{|req, res|
-        assert_equal("CONNECT", req.request_method)
-      },
-    }
-    TestWEBrick.start_httpserver(s_config){|s_server, s_addr, s_port, s_log|
-      s_server.mount_proc("/"){|req, res|
-        res.body = "SSL #{req.request_method} #{req.path} #{req.body}"
-      }
-      TestWEBrick.start_httpproxy(config){|server, addr, port, log|
-        http = Net::HTTP.new("127.0.0.1", s_port, addr, port)
-        http.use_ssl = true
-        http.verify_callback = Proc.new do |preverify_ok, store_ctx|
-          store_ctx.current_cert.to_der == cert.to_der
-        end
-
-        req = Net::HTTP::Get.new("/")
-        req["Content-Type"] = "application/x-www-form-urlencoded"
-        http.request(req){|res|
-          assert_equal("SSL GET / ", res.body, s_log.call + log.call)
-        }
-
-        req = Net::HTTP::Post.new("/")
-        req["Content-Type"] = "application/x-www-form-urlencoded"
-        req.body = "post-data"
-        http.request(req){|res|
-          assert_equal("SSL POST / post-data", res.body, s_log.call + log.call)
-        }
-      }
-    }
-  end if defined?(OpenSSL::SSL)
-
-  def test_upstream_proxy
-    return if /mswin/ =~ RUBY_PLATFORM && ENV.key?('GITHUB_ACTIONS') # not working from the beginning
-    # Testing GET or POST through the upstream proxy server
-    # Note that the upstream proxy server works as the origin server.
-    #                                   +------+
-    #                                   V      |
-    #  client -------> proxy -------> proxy ---+
-    #        GET / POST     GET / POST     GET / POST
-    #
-    up_proxy_handler_called = up_request_handler_called = 0
-    proxy_handler_called = request_handler_called = 0
-    up_config = {
-      :ServerName => "localhost.localdomain",
-      :ProxyContentHandler => Proc.new{|req, res| up_proxy_handler_called += 1},
-      :RequestCallback => Proc.new{|req, res| up_request_handler_called += 1}
-    }
-    TestWEBrick.start_httpproxy(up_config){|up_server, up_addr, up_port, up_log|
-      up_server.mount_proc("/"){|req, res|
-        res.body = "#{req.request_method} #{req.path} #{req.body}"
-      }
-      config = {
-        :ServerName => "localhost.localdomain",
-        :ProxyURI => URI.parse("http://localhost:#{up_port}"),
-        :ProxyContentHandler => Proc.new{|req, res| proxy_handler_called += 1},
-        :RequestCallback => Proc.new{|req, res| request_handler_called += 1},
-      }
-      TestWEBrick.start_httpproxy(config){|server, addr, port, log|
-        http = Net::HTTP.new(up_addr, up_port, addr, port)
-
-        req = Net::HTTP::Get.new("/")
-        http.request(req){|res|
-          skip res.message unless res.code == '200'
-          via = res["via"].split(/,\s+/)
-          assert(via.include?("1.1 localhost.localdomain:#{up_port}"), up_log.call + log.call)
-          assert(via.include?("1.1 localhost.localdomain:#{port}"), up_log.call + log.call)
-          assert_equal("GET / ", res.body)
-        }
-        assert_equal(1, up_proxy_handler_called, up_log.call + log.call)
-        assert_equal(2, up_request_handler_called, up_log.call + log.call)
-        assert_equal(1, proxy_handler_called, up_log.call + log.call)
-        assert_equal(1, request_handler_called, up_log.call + log.call)
-
-        req = Net::HTTP::Head.new("/")
-        http.request(req){|res|
-          via = res["via"].split(/,\s+/)
-          assert(via.include?("1.1 localhost.localdomain:#{up_port}"), up_log.call + log.call)
-          assert(via.include?("1.1 localhost.localdomain:#{port}"), up_log.call + log.call)
-          assert_nil(res.body, up_log.call + log.call)
-        }
-        assert_equal(2, up_proxy_handler_called, up_log.call + log.call)
-        assert_equal(4, up_request_handler_called, up_log.call + log.call)
-        assert_equal(2, proxy_handler_called, up_log.call + log.call)
-        assert_equal(2, request_handler_called, up_log.call + log.call)
-
-        req = Net::HTTP::Post.new("/")
-        req.body = "post-data"
-        req.content_type = "application/x-www-form-urlencoded"
-        http.request(req){|res|
-          via = res["via"].split(/,\s+/)
-          assert(via.include?("1.1 localhost.localdomain:#{up_port}"), up_log.call + log.call)
-          assert(via.include?("1.1 localhost.localdomain:#{port}"), up_log.call + log.call)
-          assert_equal("POST / post-data", res.body, up_log.call + log.call)
-        }
-        assert_equal(3, up_proxy_handler_called, up_log.call + log.call)
-        assert_equal(6, up_request_handler_called, up_log.call + log.call)
-        assert_equal(3, proxy_handler_called, up_log.call + log.call)
-        assert_equal(3, request_handler_called, up_log.call + log.call)
-
-        if defined?(OpenSSL::SSL)
-          # Testing CONNECT to the upstream proxy server
-          #
-          #  client -------> proxy -------> proxy -------> https
-          #    1.   CONNECT        CONNECT      establish TCP
-          #    2.   -------- establish SSL session ------>
-          #    3.   ---------- GET or POST -------------->
-          #
-          key = TEST_KEY_RSA2048
-          cert = make_certificate(key, "127.0.0.1")
-          s_config = {
-            :SSLEnable =>true,
-            :ServerName => "localhost",
-            :SSLCertificate => cert,
-            :SSLPrivateKey => key,
-          }
-          TestWEBrick.start_httpserver(s_config){|s_server, s_addr, s_port, s_log|
-            s_server.mount_proc("/"){|req2, res|
-              res.body = "SSL #{req2.request_method} #{req2.path} #{req2.body}"
-            }
-            http = Net::HTTP.new("127.0.0.1", s_port, addr, port, up_log.call + log.call + s_log.call)
-            http.use_ssl = true
-            http.verify_callback = Proc.new do |preverify_ok, store_ctx|
-              store_ctx.current_cert.to_der == cert.to_der
-            end
-
-            req2 = Net::HTTP::Get.new("/")
-            http.request(req2){|res|
-              assert_equal("SSL GET / ", res.body, up_log.call + log.call + s_log.call)
-            }
-
-            req2 = Net::HTTP::Post.new("/")
-            req2.body = "post-data"
-            req2.content_type = "application/x-www-form-urlencoded"
-            http.request(req2){|res|
-              assert_equal("SSL POST / post-data", res.body, up_log.call + log.call + s_log.call)
-            }
-          }
-        end
-      }
-    }
-  end
-
-  if defined?(OpenSSL::SSL)
-    TEST_KEY_RSA2048 = OpenSSL::PKey.read <<-_end_of_pem_
------BEGIN RSA PRIVATE KEY-----
-MIIEpAIBAAKCAQEAuV9ht9J7k4NBs38jOXvvTKY9gW8nLICSno5EETR1cuF7i4pN
-s9I1QJGAFAX0BEO4KbzXmuOvfCpD3CU+Slp1enenfzq/t/e/1IRW0wkJUJUFQign
-4CtrkJL+P07yx18UjyPlBXb81ApEmAB5mrJVSrWmqbjs07JbuS4QQGGXLc+Su96D
-kYKmSNVjBiLxVVSpyZfAY3hD37d60uG+X8xdW5v68JkRFIhdGlb6JL8fllf/A/bl
-NwdJOhVr9mESHhwGjwfSeTDPfd8ZLE027E5lyAVX9KZYcU00mOX+fdxOSnGqS/8J
-DRh0EPHDL15RcJjV2J6vZjPb0rOYGDoMcH+94wIDAQABAoIBAAzsamqfYQAqwXTb
-I0CJtGg6msUgU7HVkOM+9d3hM2L791oGHV6xBAdpXW2H8LgvZHJ8eOeSghR8+dgq
-PIqAffo4x1Oma+FOg3A0fb0evyiACyrOk+EcBdbBeLo/LcvahBtqnDfiUMQTpy6V
-seSoFCwuN91TSCeGIsDpRjbG1vxZgtx+uI+oH5+ytqJOmfCksRDCkMglGkzyfcl0
-Xc5CUhIJ0my53xijEUQl19rtWdMnNnnkdbG8PT3LZlOta5Do86BElzUYka0C6dUc
-VsBDQ0Nup0P6rEQgy7tephHoRlUGTYamsajGJaAo1F3IQVIrRSuagi7+YpSpCqsW
-wORqorkCgYEA7RdX6MDVrbw7LePnhyuaqTiMK+055/R1TqhB1JvvxJ1CXk2rDL6G
-0TLHQ7oGofd5LYiemg4ZVtWdJe43BPZlVgT6lvL/iGo8JnrncB9Da6L7nrq/+Rvj
-XGjf1qODCK+LmreZWEsaLPURIoR/Ewwxb9J2zd0CaMjeTwafJo1CZvcCgYEAyCgb
-aqoWvUecX8VvARfuA593Lsi50t4MEArnOXXcd1RnXoZWhbx5rgO8/ATKfXr0BK/n
-h2GF9PfKzHFm/4V6e82OL7gu/kLy2u9bXN74vOvWFL5NOrOKPM7Kg+9I131kNYOw
-Ivnr/VtHE5s0dY7JChYWE1F3vArrOw3T00a4CXUCgYEA0SqY+dS2LvIzW4cHCe9k
-IQqsT0yYm5TFsUEr4sA3xcPfe4cV8sZb9k/QEGYb1+SWWZ+AHPV3UW5fl8kTbSNb
-v4ng8i8rVVQ0ANbJO9e5CUrepein2MPL0AkOATR8M7t7dGGpvYV0cFk8ZrFx0oId
-U0PgYDotF/iueBWlbsOM430CgYEAqYI95dFyPI5/AiSkY5queeb8+mQH62sdcCCr
-vd/w/CZA/K5sbAo4SoTj8dLk4evU6HtIa0DOP63y071eaxvRpTNqLUOgmLh+D6gS
-Cc7TfLuFrD+WDBatBd5jZ+SoHccVrLR/4L8jeodo5FPW05A+9gnKXEXsTxY4LOUC
-9bS4e1kCgYAqVXZh63JsMwoaxCYmQ66eJojKa47VNrOeIZDZvd2BPVf30glBOT41
-gBoDG3WMPZoQj9pb7uMcrnvs4APj2FIhMU8U15LcPAj59cD6S6rWnAxO8NFK7HQG
-4Jxg3JNNf8ErQoCHb1B3oVdXJkmbJkARoDpBKmTCgKtP8ADYLmVPQw==
------END RSA PRIVATE KEY-----
-    _end_of_pem_
-  end
-end
diff --git a/tool/test/webrick/test_httprequest.rb b/tool/test/webrick/test_httprequest.rb
deleted file mode 100644
index 3c0ea937d9c239..00000000000000
--- a/tool/test/webrick/test_httprequest.rb
+++ /dev/null
@@ -1,488 +0,0 @@
-# frozen_string_literal: false
-require "webrick"
-require "stringio"
-require "test/unit"
-
-class TestWEBrickHTTPRequest < Test::Unit::TestCase
-  def teardown
-    WEBrick::Utils::TimeoutHandler.terminate
-    super
-  end
-
-  def test_simple_request
-    msg = <<-_end_of_message_
-GET /
-    _end_of_message_
-    req = WEBrick::HTTPRequest.new(WEBrick::Config::HTTP)
-    req.parse(StringIO.new(msg))
-    assert(req.meta_vars) # fails if @header was not initialized and iteration is attempted on the nil reference
-  end
-
-  def test_parse_09
-    msg = <<-_end_of_message_
-      GET /
-      foobar    # HTTP/0.9 request don't have header nor entity body.
-    _end_of_message_
-    req = WEBrick::HTTPRequest.new(WEBrick::Config::HTTP)
-    req.parse(StringIO.new(msg.gsub(/^ {6}/, "")))
-    assert_equal("GET", req.request_method)
-    assert_equal("/", req.unparsed_uri)
-    assert_equal(WEBrick::HTTPVersion.new("0.9"), req.http_version)
-    assert_equal(WEBrick::Config::HTTP[:ServerName], req.host)
-    assert_equal(80, req.port)
-    assert_equal(false, req.keep_alive?)
-    assert_equal(nil, req.body)
-    assert(req.query.empty?)
-  end
-
-  def test_parse_10
-    msg = <<-_end_of_message_
-      GET / HTTP/1.0
-
-    _end_of_message_
-    req = WEBrick::HTTPRequest.new(WEBrick::Config::HTTP)
-    req.parse(StringIO.new(msg.gsub(/^ {6}/, "")))
-    assert_equal("GET", req.request_method)
-    assert_equal("/", req.unparsed_uri)
-    assert_equal(WEBrick::HTTPVersion.new("1.0"), req.http_version)
-    assert_equal(WEBrick::Config::HTTP[:ServerName], req.host)
-    assert_equal(80, req.port)
-    assert_equal(false, req.keep_alive?)
-    assert_equal(nil, req.body)
-    assert(req.query.empty?)
-  end
-
-  def test_parse_11
-    msg = <<-_end_of_message_
-      GET /path HTTP/1.1
-
-    _end_of_message_
-    req = WEBrick::HTTPRequest.new(WEBrick::Config::HTTP)
-    req.parse(StringIO.new(msg.gsub(/^ {6}/, "")))
-    assert_equal("GET", req.request_method)
-    assert_equal("/path", req.unparsed_uri)
-    assert_equal("", req.script_name)
-    assert_equal("/path", req.path_info)
-    assert_equal(WEBrick::HTTPVersion.new("1.1"), req.http_version)
-    assert_equal(WEBrick::Config::HTTP[:ServerName], req.host)
-    assert_equal(80, req.port)
-    assert_equal(true, req.keep_alive?)
-    assert_equal(nil, req.body)
-    assert(req.query.empty?)
-  end
-
-  def test_request_uri_too_large
-    msg = <<-_end_of_message_
-      GET /#{"a"*2084} HTTP/1.1
-    _end_of_message_
-    req = WEBrick::HTTPRequest.new(WEBrick::Config::HTTP)
-    assert_raise(WEBrick::HTTPStatus::RequestURITooLarge){
-      req.parse(StringIO.new(msg.gsub(/^ {6}/, "")))
-    }
-  end
-
-  def test_parse_headers
-    msg = <<-_end_of_message_
-      GET /path HTTP/1.1
-      Host: test.ruby-lang.org:8080
-      Connection: close
-      Accept: text/*;q=0.3, text/html;q=0.7, text/html;level=1,
-              text/html;level=2;q=0.4, */*;q=0.5
-      Accept-Encoding: compress;q=0.5
-      Accept-Encoding: gzip;q=1.0, identity; q=0.4, *;q=0
-      Accept-Language: en;q=0.5, *; q=0
-      Accept-Language: ja
-      Content-Type: text/plain
-      Content-Length: 7
-      X-Empty-Header:
-
-      foobar
-    _end_of_message_
-    req = WEBrick::HTTPRequest.new(WEBrick::Config::HTTP)
-    req.parse(StringIO.new(msg.gsub(/^ {6}/, "")))
-    assert_equal(
-      URI.parse("http://test.ruby-lang.org:8080/path"), req.request_uri)
-    assert_equal("test.ruby-lang.org", req.host)
-    assert_equal(8080, req.port)
-    assert_equal(false, req.keep_alive?)
-    assert_equal(
-      %w(text/html;level=1 text/html */* text/html;level=2 text/*),
-      req.accept)
-    assert_equal(%w(gzip compress identity *), req.accept_encoding)
-    assert_equal(%w(ja en *), req.accept_language)
-    assert_equal(7, req.content_length)
-    assert_equal("text/plain", req.content_type)
-    assert_equal("foobar\n", req.body)
-    assert_equal("", req["x-empty-header"])
-    assert_equal(nil, req["x-no-header"])
-    assert(req.query.empty?)
-  end
-
-  def test_parse_header2()
-    msg = <<-_end_of_message_
-      POST /foo/bar/../baz?q=a HTTP/1.0
-      Content-Length: 9
-      User-Agent:
-        FOO   BAR
-        BAZ
-
-      hogehoge
-    _end_of_message_
-    req = WEBrick::HTTPRequest.new(WEBrick::Config::HTTP)
-    req.parse(StringIO.new(msg.gsub(/^ {6}/, "")))
-    assert_equal("POST", req.request_method)
-    assert_equal("/foo/baz", req.path)
-    assert_equal("", req.script_name)
-    assert_equal("/foo/baz", req.path_info)
-    assert_equal("9", req['content-length'])
-    assert_equal("FOO   BAR BAZ", req['user-agent'])
-    assert_equal("hogehoge\n", req.body)
-  end
-
-  def test_parse_headers3
-    msg = <<-_end_of_message_
-      GET /path HTTP/1.1
-      Host: test.ruby-lang.org
-
-    _end_of_message_
-    req = WEBrick::HTTPRequest.new(WEBrick::Config::HTTP)
-    req.parse(StringIO.new(msg.gsub(/^ {6}/, "")))
-    assert_equal(URI.parse("http://test.ruby-lang.org/path"), req.request_uri)
-    assert_equal("test.ruby-lang.org", req.host)
-    assert_equal(80, req.port)
-
-    msg = <<-_end_of_message_
-      GET /path HTTP/1.1
-      Host: 192.168.1.1
-
-    _end_of_message_
-    req = WEBrick::HTTPRequest.new(WEBrick::Config::HTTP)
-    req.parse(StringIO.new(msg.gsub(/^ {6}/, "")))
-    assert_equal(URI.parse("http://192.168.1.1/path"), req.request_uri)
-    assert_equal("192.168.1.1", req.host)
-    assert_equal(80, req.port)
-
-    msg = <<-_end_of_message_
-      GET /path HTTP/1.1
-      Host: [fe80::208:dff:feef:98c7]
-
-    _end_of_message_
-    req = WEBrick::HTTPRequest.new(WEBrick::Config::HTTP)
-    req.parse(StringIO.new(msg.gsub(/^ {6}/, "")))
-    assert_equal(URI.parse("http://[fe80::208:dff:feef:98c7]/path"),
-                 req.request_uri)
-    assert_equal("[fe80::208:dff:feef:98c7]", req.host)
-    assert_equal(80, req.port)
-
-    msg = <<-_end_of_message_
-      GET /path HTTP/1.1
-      Host: 192.168.1.1:8080
-
-    _end_of_message_
-    req = WEBrick::HTTPRequest.new(WEBrick::Config::HTTP)
-    req.parse(StringIO.new(msg.gsub(/^ {6}/, "")))
-    assert_equal(URI.parse("http://192.168.1.1:8080/path"), req.request_uri)
-    assert_equal("192.168.1.1", req.host)
-    assert_equal(8080, req.port)
-
-    msg = <<-_end_of_message_
-      GET /path HTTP/1.1
-      Host: [fe80::208:dff:feef:98c7]:8080
-
-    _end_of_message_
-    req = WEBrick::HTTPRequest.new(WEBrick::Config::HTTP)
-    req.parse(StringIO.new(msg.gsub(/^ {6}/, "")))
-    assert_equal(URI.parse("http://[fe80::208:dff:feef:98c7]:8080/path"),
-                 req.request_uri)
-    assert_equal("[fe80::208:dff:feef:98c7]", req.host)
-    assert_equal(8080, req.port)
-  end
-
-  def test_parse_get_params
-    param = "foo=1;foo=2;foo=3;bar=x"
-    msg = <<-_end_of_message_
-      GET /path?#{param} HTTP/1.1
-      Host: test.ruby-lang.org:8080
-
-    _end_of_message_
-    req = WEBrick::HTTPRequest.new(WEBrick::Config::HTTP)
-    req.parse(StringIO.new(msg.gsub(/^ {6}/, "")))
-    query = req.query
-    assert_equal("1", query["foo"])
-    assert_equal(["1", "2", "3"], query["foo"].to_ary)
-    assert_equal(["1", "2", "3"], query["foo"].list)
-    assert_equal("x", query["bar"])
-    assert_equal(["x"], query["bar"].list)
-  end
-
-  def test_parse_post_params
-    param = "foo=1;foo=2;foo=3;bar=x"
-    msg = <<-_end_of_message_
-      POST /path?foo=x;foo=y;foo=z;bar=1 HTTP/1.1
-      Host: test.ruby-lang.org:8080
-      Content-Length: #{param.size}
-      Content-Type: application/x-www-form-urlencoded
-
-      #{param}
-    _end_of_message_
-    req = WEBrick::HTTPRequest.new(WEBrick::Config::HTTP)
-    req.parse(StringIO.new(msg.gsub(/^ {6}/, "")))
-    query = req.query
-    assert_equal("1", query["foo"])
-    assert_equal(["1", "2", "3"], query["foo"].to_ary)
-    assert_equal(["1", "2", "3"], query["foo"].list)
-    assert_equal("x", query["bar"])
-    assert_equal(["x"], query["bar"].list)
-  end
-
-  def test_chunked
-    crlf = "\x0d\x0a"
-    expect = File.binread(__FILE__).freeze
-    msg = <<-_end_of_message_
-      POST /path HTTP/1.1
-      Host: test.ruby-lang.org:8080
-      Transfer-Encoding: chunked
-
-    _end_of_message_
-    msg.gsub!(/^ {6}/, "")
-    File.open(__FILE__){|io|
-      while chunk = io.read(100)
-        msg << chunk.size.to_s(16) << crlf
-        msg << chunk << crlf
-      end
-    }
-    msg << "0" << crlf
-    req = WEBrick::HTTPRequest.new(WEBrick::Config::HTTP)
-    req.parse(StringIO.new(msg))
-    assert_equal(expect, req.body)
-
-    # chunked req.body_reader
-    req = WEBrick::HTTPRequest.new(WEBrick::Config::HTTP)
-    req.parse(StringIO.new(msg))
-    dst = StringIO.new
-    IO.copy_stream(req.body_reader, dst)
-    assert_equal(expect, dst.string)
-  end
-
-  def test_forwarded
-    msg = <<-_end_of_message_
-      GET /foo HTTP/1.1
-      Host: localhost:10080
-      User-Agent: w3m/0.5.2
-      X-Forwarded-For: 123.123.123.123
-      X-Forwarded-Host: forward.example.com
-      X-Forwarded-Server: server.example.com
-      Connection: Keep-Alive
-
-    _end_of_message_
-    msg.gsub!(/^ {6}/, "")
-    req = WEBrick::HTTPRequest.new(WEBrick::Config::HTTP)
-    req.parse(StringIO.new(msg))
-    assert_equal("server.example.com", req.server_name)
-    assert_equal("http://forward.example.com/foo", req.request_uri.to_s)
-    assert_equal("forward.example.com", req.host)
-    assert_equal(80, req.port)
-    assert_equal("123.123.123.123", req.remote_ip)
-    assert(!req.ssl?)
-
-    msg = <<-_end_of_message_
-      GET /foo HTTP/1.1
-      Host: localhost:10080
-      User-Agent: w3m/0.5.2
-      X-Forwarded-For: 192.168.1.10, 172.16.1.1, 123.123.123.123
-      X-Forwarded-Host: forward.example.com:8080
-      X-Forwarded-Server: server.example.com
-      Connection: Keep-Alive
-
-    _end_of_message_
-    msg.gsub!(/^ {6}/, "")
-    req = WEBrick::HTTPRequest.new(WEBrick::Config::HTTP)
-    req.parse(StringIO.new(msg))
-    assert_equal("server.example.com", req.server_name)
-    assert_equal("http://forward.example.com:8080/foo", req.request_uri.to_s)
-    assert_equal("forward.example.com", req.host)
-    assert_equal(8080, req.port)
-    assert_equal("123.123.123.123", req.remote_ip)
-    assert(!req.ssl?)
-
-    msg = <<-_end_of_message_
-      GET /foo HTTP/1.1
-      Host: localhost:10080
-      Client-IP: 234.234.234.234
-      X-Forwarded-Proto: https, http
-      X-Forwarded-For: 192.168.1.10, 10.0.0.1, 123.123.123.123
-      X-Forwarded-Host: forward.example.com
-      X-Forwarded-Server: server.example.com
-      X-Requested-With: XMLHttpRequest
-      Connection: Keep-Alive
-
-    _end_of_message_
-    msg.gsub!(/^ {6}/, "")
-    req = WEBrick::HTTPRequest.new(WEBrick::Config::HTTP)
-    req.parse(StringIO.new(msg))
-    assert_equal("server.example.com", req.server_name)
-    assert_equal("https://forward.example.com/foo", req.request_uri.to_s)
-    assert_equal("forward.example.com", req.host)
-    assert_equal(443, req.port)
-    assert_equal("234.234.234.234", req.remote_ip)
-    assert(req.ssl?)
-
-    msg = <<-_end_of_message_
-      GET /foo HTTP/1.1
-      Host: localhost:10080
-      Client-IP: 234.234.234.234
-      X-Forwarded-Proto: https
-      X-Forwarded-For: 192.168.1.10
-      X-Forwarded-Host: forward1.example.com:1234, forward2.example.com:5678
-      X-Forwarded-Server: server1.example.com, server2.example.com
-      X-Requested-With: XMLHttpRequest
-      Connection: Keep-Alive
-
-    _end_of_message_
-    msg.gsub!(/^ {6}/, "")
-    req = WEBrick::HTTPRequest.new(WEBrick::Config::HTTP)
-    req.parse(StringIO.new(msg))
-    assert_equal("server1.example.com", req.server_name)
-    assert_equal("https://forward1.example.com:1234/foo", req.request_uri.to_s)
-    assert_equal("forward1.example.com", req.host)
-    assert_equal(1234, req.port)
-    assert_equal("234.234.234.234", req.remote_ip)
-    assert(req.ssl?)
-
-    msg = <<-_end_of_message_
-      GET /foo HTTP/1.1
-      Host: localhost:10080
-      Client-IP: 234.234.234.234
-      X-Forwarded-Proto: https
-      X-Forwarded-For: 192.168.1.10
-      X-Forwarded-Host: [fd20:8b1e:b255:8154:250:56ff:fea8:4d84], forward2.example.com:5678
-      X-Forwarded-Server: server1.example.com, server2.example.com
-      X-Requested-With: XMLHttpRequest
-      Connection: Keep-Alive
-
-    _end_of_message_
-    msg.gsub!(/^ {6}/, "")
-    req = WEBrick::HTTPRequest.new(WEBrick::Config::HTTP)
-    req.parse(StringIO.new(msg))
-    assert_equal("server1.example.com", req.server_name)
-    assert_equal("https://[fd20:8b1e:b255:8154:250:56ff:fea8:4d84]/foo", req.request_uri.to_s)
-    assert_equal("[fd20:8b1e:b255:8154:250:56ff:fea8:4d84]", req.host)
-    assert_equal(443, req.port)
-    assert_equal("234.234.234.234", req.remote_ip)
-    assert(req.ssl?)
-
-    msg = <<-_end_of_message_
-      GET /foo HTTP/1.1
-      Host: localhost:10080
-      Client-IP: 234.234.234.234
-      X-Forwarded-Proto: https
-      X-Forwarded-For: 192.168.1.10
-      X-Forwarded-Host: [fd20:8b1e:b255:8154:250:56ff:fea8:4d84]:1234, forward2.example.com:5678
-      X-Forwarded-Server: server1.example.com, server2.example.com
-      X-Requested-With: XMLHttpRequest
-      Connection: Keep-Alive
-
-    _end_of_message_
-    msg.gsub!(/^ {6}/, "")
-    req = WEBrick::HTTPRequest.new(WEBrick::Config::HTTP)
-    req.parse(StringIO.new(msg))
-    assert_equal("server1.example.com", req.server_name)
-    assert_equal("https://[fd20:8b1e:b255:8154:250:56ff:fea8:4d84]:1234/foo", req.request_uri.to_s)
-    assert_equal("[fd20:8b1e:b255:8154:250:56ff:fea8:4d84]", req.host)
-    assert_equal(1234, req.port)
-    assert_equal("234.234.234.234", req.remote_ip)
-    assert(req.ssl?)
-  end
-
-  def test_continue_sent
-    msg = <<-_end_of_message_
-      POST /path HTTP/1.1
-      Expect: 100-continue
-
-    _end_of_message_
-    msg.gsub!(/^ {6}/, "")
-    req = WEBrick::HTTPRequest.new(WEBrick::Config::HTTP)
-    req.parse(StringIO.new(msg))
-    assert req['expect']
-    l = msg.size
-    req.continue
-    assert_not_equal l, msg.size
-    assert_match(/HTTP\/1.1 100 continue\r\n\r\n\z/, msg)
-    assert !req['expect']
-  end
-
-  def test_continue_not_sent
-    msg = <<-_end_of_message_
-      POST /path HTTP/1.1
-
-    _end_of_message_
-    msg.gsub!(/^ {6}/, "")
-    req = WEBrick::HTTPRequest.new(WEBrick::Config::HTTP)
-    req.parse(StringIO.new(msg))
-    assert !req['expect']
-    l = msg.size
-    req.continue
-    assert_equal l, msg.size
-  end
-
-  def test_empty_post
-    msg = <<-_end_of_message_
-      POST /path?foo=x;foo=y;foo=z;bar=1 HTTP/1.1
-      Host: test.ruby-lang.org:8080
-      Content-Type: application/x-www-form-urlencoded
-
-    _end_of_message_
-    req = WEBrick::HTTPRequest.new(WEBrick::Config::HTTP)
-    req.parse(StringIO.new(msg.gsub(/^ {6}/, "")))
-    req.body
-  end
-
-  def test_bad_messages
-    param = "foo=1;foo=2;foo=3;bar=x"
-    msg = <<-_end_of_message_
-      POST /path?foo=x;foo=y;foo=z;bar=1 HTTP/1.1
-      Host: test.ruby-lang.org:8080
-      Content-Type: application/x-www-form-urlencoded
-
-      #{param}
-    _end_of_message_
-    assert_raise(WEBrick::HTTPStatus::LengthRequired){
-      req = WEBrick::HTTPRequest.new(WEBrick::Config::HTTP)
-      req.parse(StringIO.new(msg.gsub(/^ {6}/, "")))
-      req.body
-    }
-
-    msg = <<-_end_of_message_
-      POST /path?foo=x;foo=y;foo=z;bar=1 HTTP/1.1
-      Host: test.ruby-lang.org:8080
-      Content-Length: 100000
-
-      body is too short.
-    _end_of_message_
-    assert_raise(WEBrick::HTTPStatus::BadRequest){
-      req = WEBrick::HTTPRequest.new(WEBrick::Config::HTTP)
-      req.parse(StringIO.new(msg.gsub(/^ {6}/, "")))
-      req.body
-    }
-
-    msg = <<-_end_of_message_
-      POST /path?foo=x;foo=y;foo=z;bar=1 HTTP/1.1
-      Host: test.ruby-lang.org:8080
-      Transfer-Encoding: foobar
-
-      body is too short.
-    _end_of_message_
-    assert_raise(WEBrick::HTTPStatus::NotImplemented){
-      req = WEBrick::HTTPRequest.new(WEBrick::Config::HTTP)
-      req.parse(StringIO.new(msg.gsub(/^ {6}/, "")))
-      req.body
-    }
-  end
-
-  def test_eof_raised_when_line_is_nil
-    assert_raise(WEBrick::HTTPStatus::EOFError) {
-      req = WEBrick::HTTPRequest.new(WEBrick::Config::HTTP)
-      req.parse(StringIO.new(""))
-    }
-  end
-end
diff --git a/tool/test/webrick/test_httpresponse.rb b/tool/test/webrick/test_httpresponse.rb
deleted file mode 100644
index 4410f63e893d5d..00000000000000
--- a/tool/test/webrick/test_httpresponse.rb
+++ /dev/null
@@ -1,282 +0,0 @@
-# frozen_string_literal: false
-require "webrick"
-require "test/unit"
-require "stringio"
-require "net/http"
-
-module WEBrick
-  class TestHTTPResponse < Test::Unit::TestCase
-    class FakeLogger
-      attr_reader :messages
-
-      def initialize
-        @messages = []
-      end
-
-      def warn msg
-        @messages << msg
-      end
-    end
-
-    attr_reader :config, :logger, :res
-
-    def setup
-      super
-      @logger          = FakeLogger.new
-      @config          = Config::HTTP
-      @config[:Logger] = logger
-      @res             = HTTPResponse.new config
-      @res.keep_alive  = true
-    end
-
-    def test_prevent_response_splitting_headers_crlf
-      res['X-header'] = "malicious\r\nCookie: cracked_indicator_for_test"
-      io = StringIO.new
-      res.send_response io
-      io.rewind
-      res = Net::HTTPResponse.read_new(Net::BufferedIO.new(io))
-      assert_equal '500', res.code
-      refute_match 'cracked_indicator_for_test', io.string
-    end
-
-    def test_prevent_response_splitting_cookie_headers_crlf
-      user_input = "malicious\r\nCookie: cracked_indicator_for_test"
-      res.cookies << WEBrick::Cookie.new('author', user_input)
-      io = StringIO.new
-      res.send_response io
-      io.rewind
-      res = Net::HTTPResponse.read_new(Net::BufferedIO.new(io))
-      assert_equal '500', res.code
-      refute_match 'cracked_indicator_for_test', io.string
-    end
-
-    def test_prevent_response_splitting_headers_cr
-      res['X-header'] = "malicious\rCookie: cracked_indicator_for_test"
-      io = StringIO.new
-      res.send_response io
-      io.rewind
-      res = Net::HTTPResponse.read_new(Net::BufferedIO.new(io))
-      assert_equal '500', res.code
-      refute_match 'cracked_indicator_for_test', io.string
-    end
-
-    def test_prevent_response_splitting_cookie_headers_cr
-      user_input = "malicious\rCookie: cracked_indicator_for_test"
-      res.cookies << WEBrick::Cookie.new('author', user_input)
-      io = StringIO.new
-      res.send_response io
-      io.rewind
-      res = Net::HTTPResponse.read_new(Net::BufferedIO.new(io))
-      assert_equal '500', res.code
-      refute_match 'cracked_indicator_for_test', io.string
-    end
-
-    def test_prevent_response_splitting_headers_lf
-      res['X-header'] = "malicious\nCookie: cracked_indicator_for_test"
-      io = StringIO.new
-      res.send_response io
-      io.rewind
-      res = Net::HTTPResponse.read_new(Net::BufferedIO.new(io))
-      assert_equal '500', res.code
-      refute_match 'cracked_indicator_for_test', io.string
-    end
-
-    def test_prevent_response_splitting_cookie_headers_lf
-      user_input = "malicious\nCookie: cracked_indicator_for_test"
-      res.cookies << WEBrick::Cookie.new('author', user_input)
-      io = StringIO.new
-      res.send_response io
-      io.rewind
-      res = Net::HTTPResponse.read_new(Net::BufferedIO.new(io))
-      assert_equal '500', res.code
-      refute_match 'cracked_indicator_for_test', io.string
-    end
-
-    def test_set_redirect_response_splitting
-      url = "malicious\r\nCookie: cracked_indicator_for_test"
-      assert_raise(URI::InvalidURIError) do
-        res.set_redirect(WEBrick::HTTPStatus::MultipleChoices, url)
-      end
-    end
-
-    def test_set_redirect_html_injection
-      url = 'http://example.com////?a</a><head></head><body><img src=1></body>'
-      assert_raise(WEBrick::HTTPStatus::MultipleChoices) do
-        res.set_redirect(WEBrick::HTTPStatus::MultipleChoices, url)
-      end
-      res.status = 300
-      io = StringIO.new
-      res.send_response(io)
-      io.rewind
-      res = Net::HTTPResponse.read_new(Net::BufferedIO.new(io))
-      assert_equal '300', res.code
-      refute_match(/<img/, io.string)
-    end
-
-    def test_304_does_not_log_warning
-      res.status      = 304
-      res.setup_header
-      assert_equal 0, logger.messages.length
-    end
-
-    def test_204_does_not_log_warning
-      res.status      = 204
-      res.setup_header
-
-      assert_equal 0, logger.messages.length
-    end
-
-    def test_1xx_does_not_log_warnings
-      res.status      = 105
-      res.setup_header
-
-      assert_equal 0, logger.messages.length
-    end
-
-    def test_200_chunked_does_not_set_content_length
-      res.chunked     = false
-      res["Transfer-Encoding"] = 'chunked'
-      res.setup_header
-      assert_nil res.header.fetch('content-length', nil)
-    end
-
-    def test_send_body_io
-      IO.pipe {|body_r, body_w|
-        body_w.write 'hello'
-        body_w.close
-
-        @res.body = body_r
-
-        IO.pipe {|r, w|
-
-          @res.send_body w
-
-          w.close
-
-          assert_equal 'hello', r.read
-        }
-      }
-      assert_equal 0, logger.messages.length
-    end
-
-    def test_send_body_string
-      @res.body = 'hello'
-
-      IO.pipe {|r, w|
-        @res.send_body w
-
-        w.close
-
-        assert_equal 'hello', r.read
-      }
-      assert_equal 0, logger.messages.length
-    end
-
-    def test_send_body_string_io
-      @res.body = StringIO.new 'hello'
-
-      IO.pipe {|r, w|
-        @res.send_body w
-
-        w.close
-
-        assert_equal 'hello', r.read
-      }
-      assert_equal 0, logger.messages.length
-    end
-
-    def test_send_body_io_chunked
-      @res.chunked = true
-
-      IO.pipe {|body_r, body_w|
-
-        body_w.write 'hello'
-        body_w.close
-
-        @res.body = body_r
-
-        IO.pipe {|r, w|
-          @res.send_body w
-
-          w.close
-
-          r.binmode
-          assert_equal "5\r\nhello\r\n0\r\n\r\n", r.read
-        }
-      }
-      assert_equal 0, logger.messages.length
-    end
-
-    def test_send_body_string_chunked
-      @res.chunked = true
-
-      @res.body = 'hello'
-
-      IO.pipe {|r, w|
-        @res.send_body w
-
-        w.close
-
-        r.binmode
-        assert_equal "5\r\nhello\r\n0\r\n\r\n", r.read
-      }
-      assert_equal 0, logger.messages.length
-    end
-
-    def test_send_body_string_io_chunked
-      @res.chunked = true
-
-      @res.body = StringIO.new 'hello'
-
-      IO.pipe {|r, w|
-        @res.send_body w
-
-        w.close
-
-        r.binmode
-        assert_equal "5\r\nhello\r\n0\r\n\r\n", r.read
-      }
-      assert_equal 0, logger.messages.length
-    end
-
-    def test_send_body_proc
-      @res.body = Proc.new { |out| out.write('hello') }
-      IO.pipe do |r, w|
-        @res.send_body(w)
-        w.close
-        r.binmode
-        assert_equal 'hello', r.read
-      end
-      assert_equal 0, logger.messages.length
-    end
-
-    def test_send_body_proc_chunked
-      @res.body = Proc.new { |out| out.write('hello') }
-      @res.chunked = true
-      IO.pipe do |r, w|
-        @res.send_body(w)
-        w.close
-        r.binmode
-        assert_equal "5\r\nhello\r\n0\r\n\r\n", r.read
-      end
-      assert_equal 0, logger.messages.length
-    end
-
-    def test_set_error
-      status = 400
-      message = 'missing attribute'
-      @res.status = status
-      error = WEBrick::HTTPStatus[status].new(message)
-      body = @res.set_error(error)
-      assert_match(/#{@res.reason_phrase}/, body)
-      assert_match(/#{message}/, body)
-    end
-
-    def test_no_extraneous_space
-      [200, 300, 400, 500].each do |status|
-        @res.status = status
-        assert_match(/\S\r\n/, @res.status_line)
-      end
-    end
-  end
-end
diff --git a/tool/test/webrick/test_https.rb b/tool/test/webrick/test_https.rb
deleted file mode 100644
index ec0aac354af03b..00000000000000
--- a/tool/test/webrick/test_https.rb
+++ /dev/null
@@ -1,112 +0,0 @@
-# frozen_string_literal: false
-require "test/unit"
-require "net/http"
-require "webrick"
-require "webrick/https"
-require "webrick/utils"
-require_relative "utils"
-
-class TestWEBrickHTTPS < Test::Unit::TestCase
-  empty_log = Object.new
-  def empty_log.<<(str)
-    assert_equal('', str)
-    self
-  end
-  NoLog = WEBrick::Log.new(empty_log, WEBrick::BasicLog::WARN)
-
-  class HTTPSNITest < ::Net::HTTP
-    attr_accessor :sni_hostname
-
-    def ssl_socket_connect(s, timeout)
-      s.hostname = sni_hostname
-      super
-    end
-  end
-
-  def teardown
-    WEBrick::Utils::TimeoutHandler.terminate
-    super
-  end
-
-  def https_get(addr, port, hostname, path, verifyname = nil)
-    subject = nil
-    http = HTTPSNITest.new(addr, port)
-    http.use_ssl = true
-    http.verify_mode = OpenSSL::SSL::VERIFY_NONE
-    http.verify_callback = proc { |x, store| subject = store.chain[0].subject.to_s; x }
-    http.sni_hostname = hostname
-    req = Net::HTTP::Get.new(path)
-    req["Host"] = "#{hostname}:#{port}"
-    response = http.start { http.request(req).body }
-    assert_equal("/CN=#{verifyname || hostname}", subject)
-    response
-  end
-
-  def test_sni
-    config = {
-      :ServerName => "localhost",
-      :SSLEnable => true,
-      :SSLCertName => "/CN=localhost",
-    }
-    TestWEBrick.start_httpserver(config){|server, addr, port, log|
-      server.mount_proc("/") {|req, res| res.body = "master" }
-
-      # catch stderr in create_self_signed_cert
-      stderr_buffer = StringIO.new
-      old_stderr, $stderr = $stderr, stderr_buffer
-
-      begin
-        vhost_config1 = {
-          :ServerName => "vhost1",
-          :Port => port,
-          :DoNotListen => true,
-          :Logger => NoLog,
-          :AccessLog => [],
-          :SSLEnable => true,
-          :SSLCertName => "/CN=vhost1",
-        }
-        vhost1 = WEBrick::HTTPServer.new(vhost_config1)
-        vhost1.mount_proc("/") {|req, res| res.body = "vhost1" }
-        server.virtual_host(vhost1)
-
-        vhost_config2 = {
-          :ServerName => "vhost2",
-          :ServerAlias => ["vhost2alias"],
-          :Port => port,
-          :DoNotListen => true,
-          :Logger => NoLog,
-          :AccessLog => [],
-          :SSLEnable => true,
-          :SSLCertName => "/CN=vhost2",
-        }
-        vhost2 = WEBrick::HTTPServer.new(vhost_config2)
-        vhost2.mount_proc("/") {|req, res| res.body = "vhost2" }
-        server.virtual_host(vhost2)
-      ensure
-        # restore stderr
-        $stderr = old_stderr
-      end
-
-      assert_match(/\A([.+*]+\n)+\z/, stderr_buffer.string)
-      assert_equal("master", https_get(addr, port, "localhost", "/localhost"))
-      assert_equal("master", https_get(addr, port, "unknown", "/unknown", "localhost"))
-      assert_equal("vhost1", https_get(addr, port, "vhost1", "/vhost1"))
-      assert_equal("vhost2", https_get(addr, port, "vhost2", "/vhost2"))
-      assert_equal("vhost2", https_get(addr, port, "vhost2alias", "/vhost2alias", "vhost2"))
-    }
-  end
-
-  def test_check_ssl_virtual
-    config = {
-      :ServerName => "localhost",
-      :SSLEnable => true,
-      :SSLCertName => "/CN=localhost",
-    }
-    TestWEBrick.start_httpserver(config){|server, addr, port, log|
-      assert_raise ArgumentError do
-        vhost = WEBrick::HTTPServer.new({:DoNotListen => true, :Logger => NoLog})
-        server.virtual_host(vhost)
-      end
-    }
-  end
-end
diff --git a/tool/test/webrick/test_httpserver.rb b/tool/test/webrick/test_httpserver.rb
deleted file mode 100644
index f6b53e142ba99a..00000000000000
--- a/tool/test/webrick/test_httpserver.rb
+++ /dev/null
@@ -1,543 +0,0 @@
-# frozen_string_literal: false
-require "test/unit"
-require "net/http"
-require "webrick"
-require_relative "utils"
-
-class TestWEBrickHTTPServer < Test::Unit::TestCase
-  empty_log = Object.new
-  def empty_log.<<(str)
-    assert_equal('', str)
-    self
-  end
-  NoLog = WEBrick::Log.new(empty_log, WEBrick::BasicLog::WARN)
-
-  def teardown
-    WEBrick::Utils::TimeoutHandler.terminate
-    super
-  end
-
-  def test_mount
-    httpd = WEBrick::HTTPServer.new(
-      :Logger => NoLog,
-      :DoNotListen=>true
-    )
-    httpd.mount("/", :Root)
-    httpd.mount("/foo", :Foo)
-    httpd.mount("/foo/bar", :Bar, :bar1)
-    httpd.mount("/foo/bar/baz", :Baz, :baz1, :baz2)
-
-    serv, opts, script_name, path_info = httpd.search_servlet("/")
-    assert_equal(:Root, serv)
-    assert_equal([], opts)
-    assert_equal("", script_name)
-    assert_equal("/", path_info)
-
-    serv, opts, script_name, path_info = httpd.search_servlet("/sub")
-    assert_equal(:Root, serv)
-    assert_equal([], opts)
-    assert_equal("", script_name)
-    assert_equal("/sub", path_info)
-
-    serv, opts, script_name, path_info = httpd.search_servlet("/sub/")
-    assert_equal(:Root, serv)
-    assert_equal([], opts)
-    assert_equal("", script_name)
-    assert_equal("/sub/", path_info)
-
-    serv, opts, script_name, path_info = httpd.search_servlet("/foo")
-    assert_equal(:Foo, serv)
-    assert_equal([], opts)
-    assert_equal("/foo", script_name)
-    assert_equal("", path_info)
-
-    serv, opts, script_name, path_info = httpd.search_servlet("/foo/")
-    assert_equal(:Foo, serv)
-    assert_equal([], opts)
-    assert_equal("/foo", script_name)
-    assert_equal("/", path_info)
-
-    serv, opts, script_name, path_info = httpd.search_servlet("/foo/sub")
-    assert_equal(:Foo, serv)
-    assert_equal([], opts)
-    assert_equal("/foo", script_name)
-    assert_equal("/sub", path_info)
-
-    serv, opts, script_name, path_info = httpd.search_servlet("/foo/bar")
-    assert_equal(:Bar, serv)
-    assert_equal([:bar1], opts)
-    assert_equal("/foo/bar", script_name)
-    assert_equal("", path_info)
-
-    serv, opts, script_name, path_info = httpd.search_servlet("/foo/bar/baz")
-    assert_equal(:Baz, serv)
-    assert_equal([:baz1, :baz2], opts)
-    assert_equal("/foo/bar/baz", script_name)
-    assert_equal("", path_info)
-  end
-
-  class Req
-    attr_reader :port, :host
-    def initialize(addr, port, host)
-      @addr, @port, @host = addr, port, host
-    end
-    def addr
-      [0,0,0,@addr]
-    end
-  end
-
-  def httpd(addr, port, host, ali)
-    config ={
-      :Logger      => NoLog,
-      :DoNotListen => true,
-      :BindAddress => addr,
-      :Port        => port,
-      :ServerName  => host,
-      :ServerAlias => ali,
-    }
-    return WEBrick::HTTPServer.new(config)
-  end
-
-  def assert_eql?(v1, v2)
-    assert_equal(v1.object_id, v2.object_id)
-  end
-
-  def test_lookup_server
-    addr1  = "192.168.100.1"
-    addr2  = "192.168.100.2"
-    addrz  = "192.168.100.254"
-    local  = "127.0.0.1"
-    port1  = 80
-    port2  = 8080
-    port3  = 10080
-    portz  = 32767
-    name1  = "www.example.com"
-    name2  = "www2.example.com"
-    name3  = "www3.example.com"
-    namea  = "www.example.co.jp"
-    nameb  = "www.example.jp"
-    namec  = "www2.example.co.jp"
-    named  = "www2.example.jp"
-    namez  = "foobar.example.com"
-    alias1 = [namea, nameb]
-    alias2 = [namec, named]
-
-    host1 = httpd(nil, port1, name1, nil)
-    hosts = [
-      host2  = httpd(addr1, port1, name1, nil),
-      host3  = httpd(addr1, port1, name2, alias1),
-      host4  = httpd(addr1, port2, name1, nil),
-      host5  = httpd(addr1, port2, name2, alias1),
-               httpd(addr1, port2, name3, alias2),
-      host7  = httpd(addr2, nil,   name1, nil),
-      host8  = httpd(addr2, nil,   name2, alias1),
-               httpd(addr2, nil,   name3, alias2),
-      host10 = httpd(local, nil,   nil,   nil),
-      host11 = httpd(nil,   port3, nil,   nil),
-    ].sort_by{ rand }
-    hosts.each{|h| host1.virtual_host(h) }
-
-    # connect to addr1
-    assert_eql?(host2,   host1.lookup_server(Req.new(addr1, port1, name1)))
-    assert_eql?(host3,   host1.lookup_server(Req.new(addr1, port1, name2)))
-    assert_eql?(host3,   host1.lookup_server(Req.new(addr1, port1, namea)))
-    assert_eql?(host3,   host1.lookup_server(Req.new(addr1, port1, nameb)))
-    assert_eql?(nil,     host1.lookup_server(Req.new(addr1, port1, namez)))
-    assert_eql?(host4,   host1.lookup_server(Req.new(addr1, port2, name1)))
-    assert_eql?(host5,   host1.lookup_server(Req.new(addr1, port2, name2)))
-    assert_eql?(host5,   host1.lookup_server(Req.new(addr1, port2, namea)))
-    assert_eql?(host5,   host1.lookup_server(Req.new(addr1, port2, nameb)))
-    assert_eql?(nil,     host1.lookup_server(Req.new(addr1, port2, namez)))
-    assert_eql?(host11,  host1.lookup_server(Req.new(addr1, port3, name1)))
-    assert_eql?(host11,  host1.lookup_server(Req.new(addr1, port3, name2)))
-    assert_eql?(host11,  host1.lookup_server(Req.new(addr1, port3, namea)))
-    assert_eql?(host11,  host1.lookup_server(Req.new(addr1, port3, nameb)))
-    assert_eql?(host11,  host1.lookup_server(Req.new(addr1, port3, namez)))
-    assert_eql?(nil,     host1.lookup_server(Req.new(addr1, portz, name1)))
-    assert_eql?(nil,     host1.lookup_server(Req.new(addr1, portz, name2)))
-    assert_eql?(nil,     host1.lookup_server(Req.new(addr1, portz, namea)))
-    assert_eql?(nil,     host1.lookup_server(Req.new(addr1, portz, nameb)))
-    assert_eql?(nil,     host1.lookup_server(Req.new(addr1, portz, namez)))
-
-    # connect to addr2
-    assert_eql?(host7,  host1.lookup_server(Req.new(addr2, port1, name1)))
-    assert_eql?(host8,  host1.lookup_server(Req.new(addr2, port1, name2)))
-    assert_eql?(host8,  host1.lookup_server(Req.new(addr2, port1, namea)))
-    assert_eql?(host8,  host1.lookup_server(Req.new(addr2, port1, nameb)))
-    assert_eql?(nil,    host1.lookup_server(Req.new(addr2, port1, namez)))
-    assert_eql?(host7,  host1.lookup_server(Req.new(addr2, port2, name1)))
-    assert_eql?(host8,  host1.lookup_server(Req.new(addr2, port2, name2)))
-    assert_eql?(host8,  host1.lookup_server(Req.new(addr2, port2, namea)))
-    assert_eql?(host8,  host1.lookup_server(Req.new(addr2, port2, nameb)))
-    assert_eql?(nil,    host1.lookup_server(Req.new(addr2, port2, namez)))
-    assert_eql?(host7,  host1.lookup_server(Req.new(addr2, port3, name1)))
-    assert_eql?(host8,  host1.lookup_server(Req.new(addr2, port3, name2)))
-    assert_eql?(host8,  host1.lookup_server(Req.new(addr2, port3, namea)))
-    assert_eql?(host8,  host1.lookup_server(Req.new(addr2, port3, nameb)))
-    assert_eql?(host11, host1.lookup_server(Req.new(addr2, port3, namez)))
-    assert_eql?(host7,  host1.lookup_server(Req.new(addr2, portz, name1)))
-    assert_eql?(host8,  host1.lookup_server(Req.new(addr2, portz, name2)))
-    assert_eql?(host8,  host1.lookup_server(Req.new(addr2, portz, namea)))
-    assert_eql?(host8,  host1.lookup_server(Req.new(addr2, portz, nameb)))
-    assert_eql?(nil,    host1.lookup_server(Req.new(addr2, portz, namez)))
-
-    # connect to addrz
-    assert_eql?(nil,    host1.lookup_server(Req.new(addrz, port1, name1)))
-    assert_eql?(nil,    host1.lookup_server(Req.new(addrz, port1, name2)))
-    assert_eql?(nil,    host1.lookup_server(Req.new(addrz, port1, namea)))
-    assert_eql?(nil,    host1.lookup_server(Req.new(addrz, port1, nameb)))
-    assert_eql?(nil,    host1.lookup_server(Req.new(addrz, port1, namez)))
-    assert_eql?(nil,    host1.lookup_server(Req.new(addrz, port2, name1)))
-    assert_eql?(nil,    host1.lookup_server(Req.new(addrz, port2, name2)))
-    assert_eql?(nil,    host1.lookup_server(Req.new(addrz, port2, namea)))
-    assert_eql?(nil,    host1.lookup_server(Req.new(addrz, port2, nameb)))
-    assert_eql?(nil,    host1.lookup_server(Req.new(addrz, port2, namez)))
-    assert_eql?(host11, host1.lookup_server(Req.new(addrz, port3, name1)))
-    assert_eql?(host11, host1.lookup_server(Req.new(addrz, port3, name2)))
-    assert_eql?(host11, host1.lookup_server(Req.new(addrz, port3, namea)))
-    assert_eql?(host11, host1.lookup_server(Req.new(addrz, port3, nameb)))
-    assert_eql?(host11, host1.lookup_server(Req.new(addrz, port3, namez)))
-    assert_eql?(nil,    host1.lookup_server(Req.new(addrz, portz, name1)))
-    assert_eql?(nil,    host1.lookup_server(Req.new(addrz, portz, name2)))
-    assert_eql?(nil,    host1.lookup_server(Req.new(addrz, portz, namea)))
-    assert_eql?(nil,    host1.lookup_server(Req.new(addrz, portz, nameb)))
-    assert_eql?(nil,    host1.lookup_server(Req.new(addrz, portz, namez)))
-
-    # connect to localhost
-    assert_eql?(host10, host1.lookup_server(Req.new(local, port1, name1)))
-    assert_eql?(host10, host1.lookup_server(Req.new(local, port1, name2)))
-    assert_eql?(host10, host1.lookup_server(Req.new(local, port1, namea)))
-    assert_eql?(host10, host1.lookup_server(Req.new(local, port1, nameb)))
-    assert_eql?(host10, host1.lookup_server(Req.new(local, port1, namez)))
-    assert_eql?(host10, host1.lookup_server(Req.new(local, port2, name1)))
-    assert_eql?(host10, host1.lookup_server(Req.new(local, port2, name2)))
-    assert_eql?(host10, host1.lookup_server(Req.new(local, port2, namea)))
-    assert_eql?(host10, host1.lookup_server(Req.new(local, port2, nameb)))
-    assert_eql?(host10, host1.lookup_server(Req.new(local, port2, namez)))
-    assert_eql?(host10, host1.lookup_server(Req.new(local, port3, name1)))
-    assert_eql?(host10, host1.lookup_server(Req.new(local, port3, name2)))
-    assert_eql?(host10, host1.lookup_server(Req.new(local, port3, namea)))
-    assert_eql?(host10, host1.lookup_server(Req.new(local, port3, nameb)))
-    assert_eql?(host10, host1.lookup_server(Req.new(local, port3, namez)))
-    assert_eql?(host10, host1.lookup_server(Req.new(local, portz, name1)))
-    assert_eql?(host10, host1.lookup_server(Req.new(local, portz, name2)))
-    assert_eql?(host10, host1.lookup_server(Req.new(local, portz, namea)))
-    assert_eql?(host10, host1.lookup_server(Req.new(local, portz, nameb)))
-    assert_eql?(host10, host1.lookup_server(Req.new(local, portz, namez)))
-  end
-
-  def test_callbacks
-    accepted = started = stopped = 0
-    requested0 = requested1 = 0
-    config = {
-      :ServerName => "localhost",
-      :AcceptCallback => Proc.new{ accepted += 1 },
-      :StartCallback => Proc.new{ started += 1 },
-      :StopCallback => Proc.new{ stopped += 1 },
-      :RequestCallback => Proc.new{|req, res| requested0 += 1 },
-    }
-    log_tester = lambda {|log, access_log|
-      assert(log.find {|s| %r{ERROR `/' not found\.} =~ s })
-      assert_equal([], log.reject {|s| %r{ERROR `/' not found\.} =~ s })
-    }
-    TestWEBrick.start_httpserver(config, log_tester){|server, addr, port, log|
-      vhost_config = {
-        :ServerName => "myhostname",
-        :BindAddress => addr,
-        :Port => port,
-        :DoNotListen => true,
-        :Logger => NoLog,
-        :AccessLog => [],
-        :RequestCallback => Proc.new{|req, res| requested1 += 1 },
-      }
-      server.virtual_host(WEBrick::HTTPServer.new(vhost_config))
-
-      Thread.pass while server.status != :Running
-      sleep 1 if defined?(RubyVM::RJIT) && RubyVM::RJIT.enabled? # server.status behaves unexpectedly with --jit-wait
-      assert_equal(1, started, log.call)
-      assert_equal(0, stopped, log.call)
-      assert_equal(0, accepted, log.call)
-
-      http = Net::HTTP.new(addr, port)
-      req = Net::HTTP::Get.new("/")
-      req["Host"] = "myhostname:#{port}"
-      http.request(req){|res| assert_equal("404", res.code, log.call)}
-      http.request(req){|res| assert_equal("404", res.code, log.call)}
-      http.request(req){|res| assert_equal("404", res.code, log.call)}
-      req["Host"] = "localhost:#{port}"
-      http.request(req){|res| assert_equal("404", res.code, log.call)}
-      http.request(req){|res| assert_equal("404", res.code, log.call)}
-      http.request(req){|res| assert_equal("404", res.code, log.call)}
-      assert_equal(6, accepted, log.call)
-      assert_equal(3, requested0, log.call)
-      assert_equal(3, requested1, log.call)
-    }
-    assert_equal(started, 1)
-    assert_equal(stopped, 1)
-  end
-
-  class CustomRequest < ::WEBrick::HTTPRequest; end
-  class CustomResponse < ::WEBrick::HTTPResponse; end
-  class CustomServer < ::WEBrick::HTTPServer
-    def create_request(config)
-      CustomRequest.new(config)
-    end
-
-    def create_response(config)
-      CustomResponse.new(config)
-    end
-  end
-
-  def test_custom_server_request_and_response
-    config = { :ServerName => "localhost" }
-    TestWEBrick.start_server(CustomServer, config){|server, addr, port, log|
-      server.mount_proc("/", lambda {|req, res|
-        assert_kind_of(CustomRequest, req)
-        assert_kind_of(CustomResponse, res)
-        res.body = "via custom response"
-      })
-      Thread.pass while server.status != :Running
-
-      Net::HTTP.start(addr, port) do |http|
-        req = Net::HTTP::Get.new("/")
-        http.request(req){|res|
-          assert_equal("via custom response", res.body)
-        }
-        server.shutdown
-      end
-    }
-  end
-
-  # This class is needed by test_response_io_with_chunked_set method
-  class EventManagerForChunkedResponseTest
-    def initialize
-      @listeners = []
-    end
-    def add_listener( &block )
-      @listeners << block
-    end
-    def raise_str_event( str )
-      @listeners.each{ |e| e.call( :str, str ) }
-    end
-    def raise_close_event()
-      @listeners.each{ |e| e.call( :cls ) }
-    end
-  end
-  def test_response_io_with_chunked_set
-    evt_man = EventManagerForChunkedResponseTest.new
-    t = Thread.new do
-      begin
-        config = {
-          :ServerName => "localhost"
-        }
-        TestWEBrick.start_httpserver(config) do |server, addr, port, log|
-          body_strs = [ 'aaaaaa', 'bb', 'cccc' ]
-          server.mount_proc( "/", ->( req, res ){
-            # Test for setting chunked...
-            res.chunked = true
-            r,w = IO.pipe
-            evt_man.add_listener do |type,str|
-              type == :cls ? ( w.close ) : ( w << str )
-            end
-            res.body = r
-          } )
-          Thread.pass while server.status != :Running
-          http = Net::HTTP.new(addr, port)
-          req  = Net::HTTP::Get.new("/")
-          http.request(req) do |res|
-            i = 0
-            evt_man.raise_str_event( body_strs[i] )
-            res.read_body do |s|
-              assert_equal( body_strs[i], s )
-              i += 1
-              if i < body_strs.length
-                evt_man.raise_str_event( body_strs[i] )
-              else
-                evt_man.raise_close_event()
-              end
-            end
-            assert_equal( body_strs.length, i )
-          end
-        end
-      rescue => err
-        flunk( 'exception raised in thread: ' + err.to_s )
-      end
-    end
-    if t.join( 3 ).nil?
-      evt_man.raise_close_event()
-      flunk( 'timeout' )
-      if t.join( 1 ).nil?
-        Thread.kill t
-      end
-    end
-  end
-
-  def test_response_io_without_chunked_set
-    config = {
-      :ServerName => "localhost"
-    }
-    log_tester = lambda {|log, access_log|
-      assert_equal(1, log.length)
-      assert_match(/WARN  Could not determine content-length of response body./, log[0])
-    }
-    TestWEBrick.start_httpserver(config, log_tester){|server, addr, port, log|
-      server.mount_proc("/", lambda { |req, res|
-        r,w = IO.pipe
-        # Test for not setting chunked...
-        # res.chunked = true
-        res.body = r
-        w << "foo"
-        w.close
-      })
-      Thread.pass while server.status != :Running
-      http = Net::HTTP.new(addr, port)
-      req = Net::HTTP::Get.new("/")
-      req['Connection'] = 'Keep-Alive'
-      begin
-        Timeout.timeout(2) do
-          http.request(req){|res| assert_equal("foo", res.body) }
-        end
-      rescue Timeout::Error
-        flunk('corrupted response')
-      end
-    }
-  end
-
-  def test_request_handler_callback_is_deprecated
-    requested = 0
-    config = {
-      :ServerName => "localhost",
-      :RequestHandler => Proc.new{|req, res| requested += 1 },
-    }
-    log_tester = lambda {|log, access_log|
-      assert_equal(2, log.length)
-      assert_match(/WARN  :RequestHandler is deprecated, please use :RequestCallback/, log[0])
-      assert_match(%r{ERROR `/' not found\.}, log[1])
-    }
-    TestWEBrick.start_httpserver(config, log_tester){|server, addr, port, log|
-      Thread.pass while server.status != :Running
-
-      http = Net::HTTP.new(addr, port)
-      req = Net::HTTP::Get.new("/")
-      req["Host"] = "localhost:#{port}"
-      http.request(req){|res| assert_equal("404", res.code, log.call)}
-      assert_match(%r{:RequestHandler is deprecated, please use :RequestCallback$}, log.call, log.call)
-    }
-    assert_equal(1, requested)
-  end
-
-  def test_shutdown_with_busy_keepalive_connection
-    requested = 0
-    config = {
-      :ServerName => "localhost",
-    }
-    TestWEBrick.start_httpserver(config){|server, addr, port, log|
-      server.mount_proc("/", lambda {|req, res| res.body = "heffalump" })
-      Thread.pass while server.status != :Running
-
-      Net::HTTP.start(addr, port) do |http|
-        req = Net::HTTP::Get.new("/")
-        http.request(req){|res| assert_equal('Keep-Alive', res['Connection'], log.call) }
-        server.shutdown
-        begin
-          10.times {|n| http.request(req); requested += 1 }
-        rescue
-          # Errno::ECONNREFUSED or similar
-        end
-      end
-    }
-    assert_equal(0, requested, "Server responded to #{requested} requests after shutdown")
-  end
-
-  def test_cntrl_in_path
-    log_ary = []
-    access_log_ary = []
-    config = {
-      :Port => 0,
-      :BindAddress => '127.0.0.1',
-      :Logger => WEBrick::Log.new(log_ary, WEBrick::BasicLog::WARN),
-      :AccessLog => [[access_log_ary, '']],
-    }
-    s = WEBrick::HTTPServer.new(config)
-    s.mount('/foo', WEBrick::HTTPServlet::FileHandler, __FILE__)
-    th = Thread.new { s.start }
-    addr = s.listeners[0].addr
-
-    http = Net::HTTP.new(addr[3], addr[1])
-    req = Net::HTTP::Get.new('/notexist%0a/foo')
-    http.request(req) { |res| assert_equal('404', res.code) }
-    exp = %Q(ERROR `/notexist\\n/foo' not found.\n)
-    assert_equal 1, log_ary.size
-    assert_include log_ary[0], exp
-  ensure
-    s&.shutdown
-    th&.join
-  end
-
-  def test_gigantic_request_header
-    log_tester = lambda {|log, access_log|
-      assert_equal 1, log.size
-      assert_include log[0], 'ERROR headers too large'
-    }
-    TestWEBrick.start_httpserver({}, log_tester){|server, addr, port, log|
-      server.mount('/', WEBrick::HTTPServlet::FileHandler, __FILE__)
-      TCPSocket.open(addr, port) do |c|
-        c.write("GET / HTTP/1.0\r\n")
-        junk = -"X-Junk: #{' ' * 1024}\r\n"
-        assert_raise(Errno::ECONNRESET, Errno::EPIPE, Errno::EPROTOTYPE) do
-          loop { c.write(junk) }
-        end
-      end
-    }
-  end
-
-  def test_eof_in_chunk
-    log_tester = lambda do |log, access_log|
-      assert_equal 1, log.size
-      assert_include log[0], 'ERROR bad chunk data size'
-    end
-    TestWEBrick.start_httpserver({}, log_tester){|server, addr, port, log|
-      server.mount_proc('/', ->(req, res) { res.body = req.body })
-      TCPSocket.open(addr, port) do |c|
-        c.write("POST / HTTP/1.1\r\nHost: example.com\r\n" \
-                "Transfer-Encoding: chunked\r\n\r\n5\r\na")
-        c.shutdown(Socket::SHUT_WR) # trigger EOF in server
-        res = c.read
-        assert_match %r{\AHTTP/1\.1 400 }, res
-      end
-    }
-  end
-
-  def test_big_chunks
-    nr_out = 3
-    buf = 'big' # 3 bytes is bigger than 2!
-    config = { :InputBufferSize => 2 }.freeze
-    total = 0
-    all = ''
-    TestWEBrick.start_httpserver(config){|server, addr, port, log|
-      server.mount_proc('/', ->(req, res) {
-        err = []
-        ret = req.body do |chunk|
-          n = chunk.bytesize
-          n > config[:InputBufferSize] and err << "#{n} > :InputBufferSize"
-          total += n
-          all << chunk
-        end
-        ret.nil? or err << 'req.body should return nil'
-        (buf * nr_out) == all or err << 'input body does not match expected'
-        res.header['connection'] = 'close'
-        res.body = err.join("\n")
-      })
-      TCPSocket.open(addr, port) do |c|
-        c.write("POST / HTTP/1.1\r\nHost: example.com\r\n" \
-                "Transfer-Encoding: chunked\r\n\r\n")
-        chunk = "#{buf.bytesize.to_s(16)}\r\n#{buf}\r\n"
-        nr_out.times { c.write(chunk) }
-        c.write("0\r\n\r\n")
-        head, body = c.read.split("\r\n\r\n")
-        assert_match %r{\AHTTP/1\.1 200 OK}, head
-        assert_nil body
-      end
-    }
-  end
-end
diff --git a/tool/test/webrick/test_httpstatus.rb b/tool/test/webrick/test_httpstatus.rb
deleted file mode 100644
index fd0570d5c663a7..00000000000000
--- a/tool/test/webrick/test_httpstatus.rb
+++ /dev/null
@@ -1,35 +0,0 @@
-# frozen_string_literal: false
-require "test/unit"
-require "webrick"
-
-class TestWEBrickHTTPStatus < Test::Unit::TestCase
-  def test_info?
-    assert WEBrick::HTTPStatus.info?(100)
-    refute WEBrick::HTTPStatus.info?(200)
-  end
-
-  def test_success?
-    assert WEBrick::HTTPStatus.success?(200)
-    refute WEBrick::HTTPStatus.success?(300)
-  end
-
-  def test_redirect?
-    assert WEBrick::HTTPStatus.redirect?(300)
-    refute WEBrick::HTTPStatus.redirect?(400)
-  end
-
-  def test_error?
-    assert WEBrick::HTTPStatus.error?(400)
-    refute WEBrick::HTTPStatus.error?(600)
-  end
-
-  def test_client_error?
-    assert WEBrick::HTTPStatus.client_error?(400)
-    refute WEBrick::HTTPStatus.client_error?(500)
-  end
-
-  def test_server_error?
-    assert WEBrick::HTTPStatus.server_error?(500)
-    refute WEBrick::HTTPStatus.server_error?(600)
-  end
-end
diff --git a/tool/test/webrick/test_httputils.rb b/tool/test/webrick/test_httputils.rb
deleted file mode 100644
index 00f297bd09e626..00000000000000
--- a/tool/test/webrick/test_httputils.rb
+++ /dev/null
@@ -1,101 +0,0 @@
-# frozen_string_literal: false
-require "test/unit"
-require "webrick/httputils"
-
-class TestWEBrickHTTPUtils < Test::Unit::TestCase
-  include WEBrick::HTTPUtils
-
-  def test_normilize_path
-    assert_equal("/foo",       normalize_path("/foo"))
-    assert_equal("/foo/bar/",  normalize_path("/foo/bar/"))
-
-    assert_equal("/",          normalize_path("/foo/../"))
-    assert_equal("/",          normalize_path("/foo/.."))
-    assert_equal("/",          normalize_path("/foo/bar/../../"))
-    assert_equal("/",          normalize_path("/foo/bar/../.."))
-    assert_equal("/",          normalize_path("/foo/bar/../.."))
-    assert_equal("/baz",       normalize_path("/foo/bar/../../baz"))
-    assert_equal("/baz",       normalize_path("/foo/../bar/../baz"))
-    assert_equal("/baz/",      normalize_path("/foo/../bar/../baz/"))
-    assert_equal("/...",       normalize_path("/bar/../..."))
-    assert_equal("/.../",      normalize_path("/bar/../.../"))
-
-    assert_equal("/foo/",      normalize_path("/foo/./"))
-    assert_equal("/foo/",      normalize_path("/foo/."))
-    assert_equal("/foo/",      normalize_path("/foo/././"))
-    assert_equal("/foo/",      normalize_path("/foo/./."))
-    assert_equal("/foo/bar",   normalize_path("/foo/./bar"))
-    assert_equal("/foo/bar/",  normalize_path("/foo/./bar/."))
-    assert_equal("/foo/bar/",  normalize_path("/./././foo/./bar/."))
-
-    assert_equal("/foo/bar/",  normalize_path("//foo///.//bar/.///.//"))
-    assert_equal("/",          normalize_path("//foo///..///bar/.///..//.//"))
-
-    assert_raise(RuntimeError){ normalize_path("foo/bar") }
-    assert_raise(RuntimeError){ normalize_path("..") }
-    assert_raise(RuntimeError){ normalize_path("/..") }
-    assert_raise(RuntimeError){ normalize_path("/./..") }
-    assert_raise(RuntimeError){ normalize_path("/./../") }
-    assert_raise(RuntimeError){ normalize_path("/./../..") }
-    assert_raise(RuntimeError){ normalize_path("/./../../") }
-    assert_raise(RuntimeError){ normalize_path("/./../") }
-    assert_raise(RuntimeError){ normalize_path("/../..") }
-    assert_raise(RuntimeError){ normalize_path("/../../") }
-    assert_raise(RuntimeError){ normalize_path("/../../..") }
-    assert_raise(RuntimeError){ normalize_path("/../../../") }
-    assert_raise(RuntimeError){ normalize_path("/../foo/../") }
-    assert_raise(RuntimeError){ normalize_path("/../foo/../../") }
-    assert_raise(RuntimeError){ normalize_path("/foo/bar/../../../../") }
-    assert_raise(RuntimeError){ normalize_path("/foo/../bar/../../") }
-    assert_raise(RuntimeError){ normalize_path("/./../bar/") }
-    assert_raise(RuntimeError){ normalize_path("/./../") }
-  end
-
-  def test_split_header_value
-    assert_equal(['foo', 'bar'], split_header_value('foo, bar'))
-    assert_equal(['"foo"', 'bar'], split_header_value('"foo", bar'))
-    assert_equal(['foo', '"bar"'], split_header_value('foo, "bar"'))
-    assert_equal(['*'], split_header_value('*'))
-    assert_equal(['W/"xyzzy"', 'W/"r2d2xxxx"', 'W/"c3piozzzz"'],
-                 split_header_value('W/"xyzzy", W/"r2d2xxxx", W/"c3piozzzz"'))
-  end
-
-  def test_escape
-    assert_equal("/foo/bar", escape("/foo/bar"))
-    assert_equal("/~foo/bar", escape("/~foo/bar"))
-    assert_equal("/~foo%20bar", escape("/~foo bar"))
-    assert_equal("/~foo%20bar", escape("/~foo bar"))
-    assert_equal("/~foo%09bar", escape("/~foo\tbar"))
-    assert_equal("/~foo+bar", escape("/~foo+bar"))
-    bug8425 = '[Bug #8425] [ruby-core:55052]'
-    assert_nothing_raised(ArgumentError, Encoding::CompatibilityError, bug8425) {
-      assert_equal("%E3%83%AB%E3%83%93%E3%83%BC%E3%81%95%E3%82%93", escape("\u{30EB 30D3 30FC 3055 3093}"))
-    }
-  end
-
-  def test_escape_form
-    assert_equal("%2Ffoo%2Fbar", escape_form("/foo/bar"))
-    assert_equal("%2F~foo%2Fbar", escape_form("/~foo/bar"))
-    assert_equal("%2F~foo+bar", escape_form("/~foo bar"))
-    assert_equal("%2F~foo+%2B+bar", escape_form("/~foo + bar"))
-  end
-
-  def test_unescape
-    assert_equal("/foo/bar", unescape("%2ffoo%2fbar"))
-    assert_equal("/~foo/bar", unescape("/%7efoo/bar"))
-    assert_equal("/~foo/bar", unescape("%2f%7efoo%2fbar"))
-    assert_equal("/~foo+bar", unescape("/%7efoo+bar"))
-  end
-
-  def test_unescape_form
-    assert_equal("//foo/bar", unescape_form("/%2Ffoo/bar"))
-    assert_equal("//foo/bar baz", unescape_form("/%2Ffoo/bar+baz"))
-    assert_equal("/~foo/bar baz", unescape_form("/%7Efoo/bar+baz"))
-  end
-
-  def test_escape_path
-    assert_equal("/foo/bar", escape_path("/foo/bar"))
-    assert_equal("/foo/bar/", escape_path("/foo/bar/"))
-    assert_equal("/%25foo/bar/", escape_path("/%foo/bar/"))
-  end
-end
diff --git a/tool/test/webrick/test_httpversion.rb b/tool/test/webrick/test_httpversion.rb
deleted file mode 100644
index e50ee179710a71..00000000000000
--- a/tool/test/webrick/test_httpversion.rb
+++ /dev/null
@@ -1,41 +0,0 @@
-# frozen_string_literal: false
-require "test/unit"
-require "webrick/httpversion"
-
-class TestWEBrickHTTPVersion < Test::Unit::TestCase
-  def setup
-    @v09 = WEBrick::HTTPVersion.new("0.9")
-    @v10 = WEBrick::HTTPVersion.new("1.0")
-    @v11 = WEBrick::HTTPVersion.new("1.001")
-  end
-
-  def test_to_s()
-    assert_equal("0.9", @v09.to_s)
-    assert_equal("1.0", @v10.to_s)
-    assert_equal("1.1", @v11.to_s)
-  end
-
-  def test_major()
-    assert_equal(0, @v09.major)
-    assert_equal(1, @v10.major)
-    assert_equal(1, @v11.major)
-  end
-
-  def test_minor()
-    assert_equal(9, @v09.minor)
-    assert_equal(0, @v10.minor)
-    assert_equal(1, @v11.minor)
-  end
-
-  def test_compar()
-    assert_equal(0, @v09 <=> "0.9")
-    assert_equal(0, @v09 <=> "0.09")
-
-    assert_equal(-1, @v09 <=> @v10)
-    assert_equal(-1, @v09 <=> "1.00")
-
-    assert_equal(1, @v11 <=> @v09)
-    assert_equal(1, @v11 <=> "1.0")
-    assert_equal(1, @v11 <=> "0.9")
-  end
-end
diff --git a/tool/test/webrick/test_server.rb b/tool/test/webrick/test_server.rb
deleted file mode 100644
index 3bd8115c61ce4f..00000000000000
--- a/tool/test/webrick/test_server.rb
+++ /dev/null
@@ -1,191 +0,0 @@
-# frozen_string_literal: false
-require "test/unit"
-require "tempfile"
-require "webrick"
-require_relative "utils"
-
-class TestWEBrickServer < Test::Unit::TestCase
-  class Echo < WEBrick::GenericServer
-    def run(sock)
-      while line = sock.gets
-        sock << line
-      end
-    end
-  end
-
-  def test_server
-    TestWEBrick.start_server(Echo){|server, addr, port, log|
-      TCPSocket.open(addr, port){|sock|
-        sock.puts("foo"); assert_equal("foo\n", sock.gets, log.call)
-        sock.puts("bar"); assert_equal("bar\n", sock.gets, log.call)
-        sock.puts("baz"); assert_equal("baz\n", sock.gets, log.call)
-        sock.puts("qux"); assert_equal("qux\n", sock.gets, log.call)
-      }
-    }
-  end
-
-  def test_start_exception
-    stopped = 0
-
-    log = []
-    logger = WEBrick::Log.new(log, WEBrick::BasicLog::WARN)
-
-    assert_raise(SignalException) do
-      listener = Object.new
-      def listener.to_io # IO.select invokes #to_io.
-        raise SignalException, 'SIGTERM' # simulate signal in main thread
-      end
-      def listener.shutdown
-      end
-      def listener.close
-      end
-
-      server = WEBrick::HTTPServer.new({
-        :BindAddress => "127.0.0.1", :Port => 0,
-        :StopCallback => Proc.new{ stopped += 1 },
-        :Logger => logger,
-      })
-      server.listeners[0].close
-      server.listeners[0] = listener
-
-      server.start
-    end
-
-    assert_equal(1, stopped)
-    assert_equal(1, log.length)
-    assert_match(/FATAL SignalException: SIGTERM/, log[0])
-  end
-
-  def test_callbacks
-    accepted = started = stopped = 0
-    config = {
-      :AcceptCallback => Proc.new{ accepted += 1 },
-      :StartCallback => Proc.new{ started += 1 },
-      :StopCallback => Proc.new{ stopped += 1 },
-    }
-    TestWEBrick.start_server(Echo, config){|server, addr, port, log|
-      true while server.status != :Running
-      sleep 1 if defined?(RubyVM::RJIT) && RubyVM::RJIT.enabled? # server.status behaves unexpectedly with --jit-wait
-      assert_equal(1, started, log.call)
-      assert_equal(0, stopped, log.call)
-      assert_equal(0, accepted, log.call)
-      TCPSocket.open(addr, port){|sock| (sock << "foo\n").gets }
-      TCPSocket.open(addr, port){|sock| (sock << "foo\n").gets }
-      TCPSocket.open(addr, port){|sock| (sock << "foo\n").gets }
-      assert_equal(3, accepted, log.call)
-    }
-    assert_equal(1, started)
-    assert_equal(1, stopped)
-  end
-
-  def test_daemon
-    begin
-      r, w = IO.pipe
-      pid1 = Process.fork{
-        r.close
-        WEBrick::Daemon.start
-        w.puts(Process.pid)
-        sleep 10
-      }
-      pid2 = r.gets.to_i
-      assert(Process.kill(:KILL, pid2))
-      assert_not_equal(pid1, pid2)
-    rescue NotImplementedError
-      # snip this test
-    ensure
-      Process.wait(pid1) if pid1
-      r.close
-      w.close
-    end
-  end
-
-  def test_restart_after_shutdown
-    address = '127.0.0.1'
-    port = 0
-    log = []
-    config = {
-      :BindAddress => address,
-      :Port => port,
-      :Logger => WEBrick::Log.new(log, WEBrick::BasicLog::WARN),
-    }
-    server = Echo.new(config)
-    client_proc = lambda {|str|
-      begin
-        ret = server.listeners.first.connect_address.connect {|s|
-          s.write(str)
-          s.close_write
-          s.read
-        }
-        assert_equal(str, ret)
-      ensure
-        server.shutdown
-      end
-    }
-    server_thread = Thread.new { server.start }
-    client_thread = Thread.new { client_proc.call("a") }
-    assert_join_threads([client_thread, server_thread])
-    server.listen(address, port)
-    server_thread = Thread.new { server.start }
-    client_thread = Thread.new { client_proc.call("b") }
-    assert_join_threads([client_thread, server_thread])
-    assert_equal([], log)
-  end
-
-  def test_restart_after_stop
-    log = Object.new
-    class << log
-      include Test::Unit::Assertions
-      def <<(msg)
-        flunk "unexpected log: #{msg.inspect}"
-      end
-    end
-    client_thread = nil
-    wakeup = -> {client_thread.wakeup}
-    warn_flunk = WEBrick::Log.new(log, WEBrick::BasicLog::WARN)
-    server = WEBrick::HTTPServer.new(
-      :StartCallback => wakeup,
-      :StopCallback => wakeup,
-      :BindAddress => '0.0.0.0',
-      :Port => 0,
-      :Logger => warn_flunk)
-    2.times {
-      server_thread = Thread.start {
-        server.start
-      }
-      client_thread = Thread.start {
-        sleep 0.1 until server.status == :Running || !server_thread.status
-        server.stop
-        sleep 0.1 until server.status == :Stop || !server_thread.status
-      }
-      assert_join_threads([client_thread, server_thread])
-    }
-  end
-
-  def test_port_numbers
-    config = {
-      :BindAddress => '0.0.0.0',
-      :Logger => WEBrick::Log.new([], WEBrick::BasicLog::WARN),
-    }
-
-    ports = [0, "0"]
-
-    ports.each do |port|
-      config[:Port]= port
-      server = WEBrick::GenericServer.new(config)
-      server_thread = Thread.start { server.start }
-      client_thread = Thread.start {
-        sleep 0.1 until server.status == :Running || !server_thread.status
-        server_port = server.listeners[0].addr[1]
-        server.stop
-        assert_equal server.config[:Port], server_port
-        sleep 0.1 until server.status == :Stop || !server_thread.status
-      }
-      assert_join_threads([client_thread, server_thread])
-    end
-
-    assert_raise(ArgumentError) do
-      config[:Port]= "FOO"
-      WEBrick::GenericServer.new(config)
-    end
-  end
-end
diff --git a/tool/test/webrick/test_ssl_server.rb b/tool/test/webrick/test_ssl_server.rb
deleted file mode 100644
index 4e52598bf59cc2..00000000000000
--- a/tool/test/webrick/test_ssl_server.rb
+++ /dev/null
@@ -1,67 +0,0 @@
-require "test/unit"
-require "webrick"
-require "webrick/ssl"
-require_relative "utils"
-require 'timeout'
-
-class TestWEBrickSSLServer < Test::Unit::TestCase
-  class Echo < WEBrick::GenericServer
-    def run(sock)
-      while line = sock.gets
-        sock << line
-      end
-    end
-  end
-
-  def test_self_signed_cert_server
-    assert_self_signed_cert(
-      :SSLEnable => true,
-      :SSLCertName => [["C", "JP"], ["O", "www.ruby-lang.org"], ["CN", "Ruby"]],
-    )
-  end
-
-  def test_self_signed_cert_server_with_string
-    assert_self_signed_cert(
-      :SSLEnable => true,
-      :SSLCertName => "/C=JP/O=www.ruby-lang.org/CN=Ruby",
-    )
-  end
-
-  def assert_self_signed_cert(config)
-    TestWEBrick.start_server(Echo, config){|server, addr, port, log|
-      io = TCPSocket.new(addr, port)
-      sock = OpenSSL::SSL::SSLSocket.new(io)
-      sock.connect
-      sock.puts(server.ssl_context.cert.subject.to_s)
-      assert_equal("/C=JP/O=www.ruby-lang.org/CN=Ruby\n", sock.gets, log.call)
-      sock.close
-      io.close
-    }
-  end
-
-  def test_slow_connect
-    poke = lambda do |io, msg|
-      begin
-        sock = OpenSSL::SSL::SSLSocket.new(io)
-        sock.connect
-        sock.puts(msg)
-        assert_equal "#{msg}\n", sock.gets, msg
-      ensure
-        sock&.close
-        io.close
-      end
-    end
-    config = {
-      :SSLEnable => true,
-      :SSLCertName => "/C=JP/O=www.ruby-lang.org/CN=Ruby",
-    }
-    EnvUtil.timeout(10) do
-      TestWEBrick.start_server(Echo, config) do |server, addr, port, log|
-        outer = TCPSocket.new(addr, port)
-        inner = TCPSocket.new(addr, port)
-        poke.call(inner, 'fast TLS negotiation')
-        poke.call(outer, 'slow TLS negotiation')
-      end
-    end
-  end
-end
diff --git a/tool/test/webrick/test_utils.rb b/tool/test/webrick/test_utils.rb
deleted file mode 100644
index c2b7a36e8aa98f..00000000000000
--- a/tool/test/webrick/test_utils.rb
+++ /dev/null
@@ -1,110 +0,0 @@
-# frozen_string_literal: false
-require "test/unit"
-require "webrick/utils"
-
-class TestWEBrickUtils < Test::Unit::TestCase
-  def teardown
-    WEBrick::Utils::TimeoutHandler.terminate
-    super
-  end
-
-  def assert_expired(m)
-    Thread.handle_interrupt(Timeout::Error => :never, EX => :never) do
-      assert_empty(m::TimeoutHandler.instance.instance_variable_get(:@timeout_info))
-    end
-  end
-
-  def assert_not_expired(m)
-    Thread.handle_interrupt(Timeout::Error => :never, EX => :never) do
-      assert_not_empty(m::TimeoutHandler.instance.instance_variable_get(:@timeout_info))
-    end
-  end
-
-  EX = Class.new(StandardError)
-
-  def test_no_timeout
-    m = WEBrick::Utils
-    assert_equal(:foo, m.timeout(10){ :foo })
-    assert_expired(m)
-  end
-
-  def test_nested_timeout_outer
-    m = WEBrick::Utils
-    i = 0
-    assert_raise(Timeout::Error){
-      m.timeout(1){
-        assert_raise(Timeout::Error){ m.timeout(0.1){ i += 1; sleep(1) } }
-        assert_not_expired(m)
-        i += 1
-        sleep(2)
-      }
-    }
-    assert_equal(2, i)
-    assert_expired(m)
-  end
-
-  def test_timeout_default_exception
-    m = WEBrick::Utils
-    assert_raise(Timeout::Error){ m.timeout(0.01){ sleep } }
-    assert_expired(m)
-  end
-
-  def test_timeout_custom_exception
-    m = WEBrick::Utils
-    ex = EX
-    assert_raise(ex){ m.timeout(0.01, ex){ sleep } }
-    assert_expired(m)
-  end
-
-  def test_nested_timeout_inner_custom_exception
-    m = WEBrick::Utils
-    ex = EX
-    i = 0
-    assert_raise(ex){
-      m.timeout(10){
-        m.timeout(0.01, ex){ i += 1; sleep }
-      }
-      sleep
-    }
-    assert_equal(1, i)
-    assert_expired(m)
-  end
-
-  def test_nested_timeout_outer_custom_exception
-    m = WEBrick::Utils
-    ex = EX
-    i = 0
-    assert_raise(Timeout::Error){
-      m.timeout(0.01){
-        m.timeout(1.0, ex){ i += 1; sleep }
-      }
-      sleep
-    }
-    assert_equal(1, i)
-    assert_expired(m)
-  end
-
-  def test_create_listeners
-    addr = listener_address(0)
-    port = addr.slice!(1)
-    assert_kind_of(Integer, port, "dynamically chosen port number")
-    assert_equal(["AF_INET", "127.0.0.1", "127.0.0.1"], addr)
-
-    assert_equal(["AF_INET", port, "127.0.0.1", "127.0.0.1"],
-                 listener_address(port),
-                 "specific port number")
-
-    assert_equal(["AF_INET", port, "127.0.0.1", "127.0.0.1"],
-                 listener_address(port.to_s),
-                 "specific port number string")
-  end
-
-  def listener_address(port)
-    listeners = WEBrick::Utils.create_listeners("127.0.0.1", port)
-    srv = listeners.first
-    assert_kind_of TCPServer, srv
-    srv.addr
-  ensure
-    listeners.each(&:close) if listeners
-  end
-end
diff --git a/tool/test/webrick/utils.rb b/tool/test/webrick/utils.rb
deleted file mode 100644
index a8568d0a432ec9..00000000000000
--- a/tool/test/webrick/utils.rb
+++ /dev/null
@@ -1,84 +0,0 @@
-# frozen_string_literal: false
-require "webrick"
-begin
-  require "webrick/https"
-rescue LoadError
-end
-require "webrick/httpproxy"
-
-module TestWEBrick
-  NullWriter = Object.new
-  def NullWriter.<<(msg)
-    puts msg if $DEBUG
-    return self
-  end
-
-  class WEBrick::HTTPServlet::CGIHandler
-    remove_const :Ruby
-    require "envutil" unless defined?(EnvUtil)
-    Ruby = EnvUtil.rubybin
-    remove_const :CGIRunner
-    CGIRunner = "\"#{Ruby}\" \"#{WEBrick::Config::LIBDIR}/httpservlet/cgi_runner.rb\"" # :nodoc:
-    remove_const :CGIRunnerArray
-    CGIRunnerArray = [Ruby, "#{WEBrick::Config::LIBDIR}/httpservlet/cgi_runner.rb"] # :nodoc:
-  end
-
-  RubyBin = "\"#{EnvUtil.rubybin}\""
-  RubyBin << " --disable-gems"
-  RubyBin << " \"-I#{File.expand_path("../..", File.dirname(__FILE__))}/lib\""
-  RubyBin << " \"-I#{File.dirname(EnvUtil.rubybin)}/.ext/common\""
-  RubyBin << " \"-I#{File.dirname(EnvUtil.rubybin)}/.ext/#{RUBY_PLATFORM}\""
-
-  RubyBinArray = [EnvUtil.rubybin]
-  RubyBinArray << "--disable-gems"
-  RubyBinArray << "-I" << "#{File.expand_path("../..", File.dirname(__FILE__))}/lib"
-  RubyBinArray << "-I" << "#{File.dirname(EnvUtil.rubybin)}/.ext/common"
-  RubyBinArray << "-I" << "#{File.dirname(EnvUtil.rubybin)}/.ext/#{RUBY_PLATFORM}"
-
-  require "test/unit" unless defined?(Test::Unit)
-  include Test::Unit::Assertions
-  extend Test::Unit::Assertions
-  include Test::Unit::CoreAssertions
-  extend Test::Unit::CoreAssertions
-
-  module_function
-
-  DefaultLogTester = lambda {|log, access_log| assert_equal([], log) }
-
-  def start_server(klass, config={}, log_tester=DefaultLogTester, &block)
-    log_ary = []
-    access_log_ary = []
-    log = proc { "webrick log start:\n" + (log_ary+access_log_ary).join.gsub(/^/, "  ").chomp + "\nwebrick log end" }
-    config = ({
-      :BindAddress => "127.0.0.1", :Port => 0,
-      :ServerType => Thread,
-      :Logger => WEBrick::Log.new(log_ary, WEBrick::BasicLog::WARN),
-      :AccessLog => [[access_log_ary, ""]]
-    }.update(config))
-    server = capture_output {break klass.new(config)}
-    server_thread = server.start
-    server_thread2 = Thread.new {
-      server_thread.join
-      if log_tester
-        log_tester.call(log_ary, access_log_ary)
-      end
-    }
-    addr = server.listeners[0].addr
-    client_thread = Thread.new {
-      begin
-        block.yield([server, addr[3], addr[1], log])
-      ensure
-        server.shutdown
-      end
-    }
-    assert_join_threads([client_thread, server_thread2])
-  end
-
-  def start_httpserver(config={}, log_tester=DefaultLogTester, &block)
-    start_server(WEBrick::HTTPServer, config, log_tester, &block)
-  end
-
-  def start_httpproxy(config={}, log_tester=DefaultLogTester, &block)
-    start_server(WEBrick::HTTPProxyServer, config, log_tester, &block)
-  end
-end
diff --git a/tool/test/webrick/webrick.cgi b/tool/test/webrick/webrick.cgi
deleted file mode 100644
index a294fa72f9948d..00000000000000
--- a/tool/test/webrick/webrick.cgi
+++ /dev/null
@@ -1,38 +0,0 @@
-#!ruby
-require "webrick/cgi"
-
-class TestApp < WEBrick::CGI
-  def do_GET(req, res)
-    res["content-type"] = "text/plain"
-    if req.path_info == "/dumpenv"
-      res.body = Marshal.dump(ENV.to_hash)
-    elsif (p = req.path_info) && p.length > 0
-      res.body = p
-    elsif (q = req.query).size > 0
-      res.body = q.keys.sort.collect{|key|
-        q[key].list.sort.collect{|v|
-          "#{key}=#{v}"
-        }.join(", ")
-      }.join(", ")
-    elsif %r{/$} =~ req.request_uri.to_s
-      res.body = ""
-      res.body << req.request_uri.to_s  << "\n"
-      res.body << req.script_name
-    elsif !req.cookies.empty?
-      res.body = req.cookies.inject(""){|result, cookie|
-        result << "%s=%s\n" % [cookie.name, cookie.value]
-      }
-      res.cookies << WEBrick::Cookie.new("Customer", "WILE_E_COYOTE")
-      res.cookies << WEBrick::Cookie.new("Shipping", "FedEx")
-    else
-      res.body = req.script_name
-    end
-  end
-
-  def do_POST(req, res)
-    do_GET(req, res)
-  end
-end
-
-cgi = TestApp.new
-cgi.start
diff --git a/tool/test/webrick/webrick.rhtml b/tool/test/webrick/webrick.rhtml
deleted file mode 100644
index a7bbe43fb5e6b7..00000000000000
--- a/tool/test/webrick/webrick.rhtml
+++ /dev/null
@@ -1,4 +0,0 @@
-req to <%=
-servlet_request.request_uri
-%> <%=
-servlet_request.query.inspect %>
diff --git a/tool/test/webrick/webrick_long_filename.cgi b/tool/test/webrick/webrick_long_filename.cgi
deleted file mode 100644
index 43c1af825c336a..00000000000000
--- a/tool/test/webrick/webrick_long_filename.cgi
+++ /dev/null
@@ -1,36 +0,0 @@
-#!ruby
-require "webrick/cgi"
-
-class TestApp < WEBrick::CGI
-  def do_GET(req, res)
-    res["content-type"] = "text/plain"
-    if (p = req.path_info) && p.length > 0
-      res.body = p
-    elsif (q = req.query).size > 0
-      res.body = q.keys.sort.collect{|key|
-        q[key].list.sort.collect{|v|
-          "#{key}=#{v}"
-        }.join(", ")
-      }.join(", ")
-    elsif %r{/$} =~ req.request_uri.to_s
-      res.body = ""
-      res.body << req.request_uri.to_s  << "\n"
-      res.body << req.script_name
-    elsif !req.cookies.empty?
-      res.body = req.cookies.inject(""){|result, cookie|
-        result << "%s=%s\n" % [cookie.name, cookie.value]
-      }
-      res.cookies << WEBrick::Cookie.new("Customer", "WILE_E_COYOTE")
-      res.cookies << WEBrick::Cookie.new("Shipping", "FedEx")
-    else
-      res.body = req.script_name
-    end
-  end
-
-  def do_POST(req, res)
-    do_GET(req, res)
-  end
-end
-
-cgi = TestApp.new
-cgi.start
diff --git a/tool/transcode-tblgen.rb b/tool/transcode-tblgen.rb
index b19f68bac48663..1257a92d386331 100644
--- a/tool/transcode-tblgen.rb
+++ b/tool/transcode-tblgen.rb
@@ -1078,11 +1078,7 @@ def make_signature(filename, src)
   end
 
   libs1 = $".dup
-  if ERB.instance_method(:initialize).parameters.assoc(:key) # Ruby 2.6+
-    erb = ERB.new(src, trim_mode: '%')
-  else
-    erb = ERB.new(src, nil, '%')
-  end
+  erb = ERB.new(src, trim_mode: '%')
   erb.filename = arg
   erb_result = erb.result(binding)
   libs2 = $".dup
diff --git a/tool/update-NEWS-gemlist.rb b/tool/update-NEWS-gemlist.rb
index aa766b884618e0..e1535eb400bc7e 100755
--- a/tool/update-NEWS-gemlist.rb
+++ b/tool/update-NEWS-gemlist.rb
@@ -1,4 +1,4 @@
-#!/usr/bin/ruby
+#!/usr/bin/env ruby
 require 'json'
 news = File.read("NEWS.md")
 prev = news[/since the \*+(\d+\.\d+\.\d+)\*+/, 1]
@@ -15,25 +15,38 @@
     item[$1 || "* "]
   end
 end
-ARGV.each do |type|
-  last = JSON.parse(File.read("#{type}_gems.json"))['gems'].filter_map do |g|
+
+load_gems_json = ->(type) do
+  JSON.parse(File.read("#{type}_gems.json"))['gems'].filter_map do |g|
     v = g['versions'].values_at(*prevs).compact.first
     g = g['gem']
     g = 'RubyGems' if g == 'rubygems'
     [g, v] if v
   end.to_h
+end
+
+ARGV.each do |type|
+  last = load_gems_json[type]
   changed = File.foreach("gems/#{type}_gems").filter_map do |l|
     next if l.start_with?("#")
     g, v = l.split(" ", 3)
     next unless v
     [g, v] unless last[g] == v
   end
-  if type == 'bundled'
-    changed, added = changed.partition {|g, _| last[g]}
-  end
+  changed, added = changed.partition {|g, _| last[g]}
   update[changed, type] or next
   if added and !added.empty?
-    update[added, 'default', 'now bundled'] or next
+    if type == 'bundled'
+      default_gems = load_gems_json['default']
+      promoted = {}
+      added.delete_if do |k, v|
+        default_gems.key?(k) && promoted[k] = v
+      end
+      update[added, type, 'added']
+      update[promoted, type, 'promoted from default gems'] or next
+    else
+      update[added, type, 'added'] or next
+    end
   end
   File.write("NEWS.md", news)
 end
diff --git a/tool/update-NEWS-refs.rb b/tool/update-NEWS-refs.rb
index 2b19f0fdaa46da..f48cac5ee1d90e 100644
--- a/tool/update-NEWS-refs.rb
+++ b/tool/update-NEWS-refs.rb
@@ -13,8 +13,9 @@
   raise "NEWS.md must end with a sequence of links"
 end
 
-labels = links.keys.select {|k| !(k.start_with?("Feature") || k.start_with?("Bug"))}
-new_src = lines.join("\n").gsub(/\[?\[((?:Feature|Bug)\s+#(\d+))\]\]?/) do
+trackers = ["Feature", "Bug", "Misc"]
+labels = links.keys.reject {|k| k.start_with?(*trackers)}
+new_src = lines.join("\n").gsub(/\[?\[(#{Regexp.union(trackers)}\s+#(\d+))\]\]?/) do
   links[$1] ||= "https://bugs.ruby-lang.org/issues/#$2"
   "[[#$1]]"
 end.gsub(/\[\[#{Regexp.union(labels)}\]\]?/) do
@@ -22,7 +23,7 @@
 end.chomp + "\n\n"
 
 label_width = links.max_by {|k, _| k.size}.first.size + 4
-redmine_links, non_redmine_links = links.partition {|k,| k =~ /\A(Feature|Bug)\s+#\d+\z/ }
+redmine_links, non_redmine_links = links.partition {|k,| k =~ /\A#{Regexp.union(trackers)}\s+#\d+\z/ }
 
 (redmine_links.sort_by {|k,| k[/\d+/].to_i } + non_redmine_links.reverse).each do |k, v|
   new_src << "[#{k}]:".ljust(label_width) << v << "\n"
diff --git a/tool/update-bundled_gems.rb b/tool/update-bundled_gems.rb
index 688ca340862c8f..e20566546bb0c4 100755
--- a/tool/update-bundled_gems.rb
+++ b/tool/update-bundled_gems.rb
@@ -1,27 +1,41 @@
 #!ruby -pla
 BEGIN {
   require 'rubygems'
+  date = nil
+  # STDOUT is not usable in inplace edit mode
+  output = $-i ? STDOUT : STDERR
+}
+output = STDERR if ARGF.file == STDIN
+END {
+  output.print date.strftime("latest_date=%F") if date
 }
 unless /^[^#]/ !~ (gem = $F[0])
+  ver = Gem::Version.new($F[1])
   (gem, src), = Gem::SpecFetcher.fetcher.detect(:latest) {|s|
     s.platform == "ruby" && s.name == gem
   }
-  gem = src.fetch_spec(gem)
-  if ENV["UPDATE_BUNDLED_GEMS_ALL"]
-    uri = gem.metadata["source_code_uri"] || gem.homepage
-    uri = uri.sub(%r[\Ahttps://github\.com/[^/]+/[^/]+\K/tree/.*], "").chomp(".git")
-  else
-    uri = $F[2]
-  end
-  if $F[3]
-    if $F[3].include?($F[1])
-      $F[3][$F[1]] = gem.version.to_s
-    elsif Gem::Version.new($F[1]) != gem.version and /\A\h+\z/ =~ $F[3]
-      $F[3..-1] = []
+  if gem.version > ver
+    gem = src.fetch_spec(gem)
+    if ENV["UPDATE_BUNDLED_GEMS_ALL"]
+      uri = gem.metadata["source_code_uri"] || gem.homepage
+      uri = uri.sub(%r[\Ahttps://github\.com/[^/]+/[^/]+\K/tree/.*], "").chomp(".git")
+    else
+      uri = $F[2]
+    end
+    if (!date or gem.date && gem.date > date) and gem.date.to_i != 315_619_200
+      # DEFAULT_SOURCE_DATE_EPOCH is meaningless
+      date = gem.date
+    end
+    if $F[3]
+      if $F[3].include?($F[1])
+        $F[3][$F[1]] = gem.version.to_s
+      elsif Gem::Version.new($F[1]) != gem.version and /\A\h+\z/ =~ $F[3]
+        $F[3..-1] = []
+      end
     end
+    f = [gem.name, gem.version.to_s, uri, *$F[3..-1]]
+    $_.gsub!(/\S+\s*(?=\s|$)/) {|s| (f.shift || "").ljust(s.size)}
+    $_ = [$_, *f].join(" ") unless f.empty?
+    $_.rstrip!
   end
-  f = [gem.name, gem.version.to_s, uri, *$F[3..-1]]
-  $_.gsub!(/\S+\s*/) {|s| (f.shift || "").ljust(s.size)}
-  $_ = [$_, *f].join(" ") unless f.empty?
-  $_.rstrip!
 end
diff --git a/tool/update-deps b/tool/update-deps
index 90107e50c83758..67f68c5381f8e9 100755
--- a/tool/update-deps
+++ b/tool/update-deps
@@ -17,6 +17,14 @@
 #   3. Use --fix to fix makefiles.
 #      Ex.  ./ruby tool/update-deps --fix
 #
+# Usage to create a depend file initially:
+#   1. Copy the dependency section from the Makefile generated by extconf.rb.
+#      Ex.  ext/cgi/escape/Makefile
+#   2. Add `# AUTOGENERATED DEPENDENCIES START` and `# AUTOGENERATED DEPENDENCIES END`
+#      sections to top and end of the depend file.
+#   3. Run tool/update-deps --fix to fix the depend file.
+#   4. Commit the depend file.
+#
 # Other usages:
 #   *  Fix makefiles using previously detected dependency problems
 #      Ex.  ruby tool/update-deps --actual-fix [file]
@@ -150,13 +158,15 @@ FILES_NEED_VPATH = %w[
   enc/trans/utf8_mac.c
   enc/trans/utf_16_32.c
 
-  yarp/api_node.c
-  yarp/ast.h
-  yarp/node.c
-  yarp/prettyprint.c
-  yarp/serialize.c
-  yarp/token_type.c
-  yarp/version.h
+  prism/api_node.c
+  prism/ast.h
+  prism/diagnostic.c
+  prism/diagnostic.h
+  prism/node.c
+  prism/prettyprint.c
+  prism/serialize.c
+  prism/token_type.c
+  prism/version.h
 ]
 
 # Multiple files with same filename.
@@ -184,7 +194,7 @@ def in_makefile(target, source)
   target = target.to_s
   source = source.to_s
   case target
-  when %r{\A[^/]*\z}, %r{\Acoroutine/}, %r{\Ayarp/}
+  when %r{\A[^/]*\z}, %r{\Acoroutine/}, %r{\Aprism/}
     target2 = "#{target.sub(/\.o\z/, '.$(OBJEXT)')}"
     case source
     when *FILES_IN_SOURCE_DIRECTORY then source2 = "$(top_srcdir)/#{source}"
diff --git a/trace_point.rb b/trace_point.rb
index dc9c339b6b26ba..682398ec3fe263 100644
--- a/trace_point.rb
+++ b/trace_point.rb
@@ -1,149 +1,149 @@
 # loaded from vm_trace.c
 
 # A class that provides the functionality of Kernel#set_trace_func in a
-# nice Object-Oriented API.
+# well-structured Object-Oriented API.
 #
 # == Example
 #
-# We can use TracePoint to gather information specifically for exceptions:
+# Use TracePoint to gather information specifically for exceptions:
 #
-#	    trace = TracePoint.new(:raise) do |tp|
-#		p [tp.lineno, tp.event, tp.raised_exception]
-#	    end
-#	    #=> #<TracePoint:disabled>
+#     trace = TracePoint.new(:raise) do |tp|
+#       p [tp.lineno, tp.event, tp.raised_exception]
+#     end
+#     #=> #<TracePoint:disabled>
 #
-#	    trace.enable
-#	    #=> false
+#     trace.enable  #=> false
 #
-#	    0 / 0
-#	    #=> [5, :raise, #<ZeroDivisionError: divided by 0>]
+#     0 / 0
+#     #=> [5, :raise, #<ZeroDivisionError: divided by 0>]
 #
 # == Events
 #
-# If you don't specify the type of events you want to listen for,
+# If you don't specify the types of events you want to listen for,
 # TracePoint will include all available events.
 #
-# *Note* do not depend on current event set, as this list is subject to
-# change. Instead, it is recommended you specify the type of events you
+# *Note:* Do not depend on the current event set, as this list is subject to
+# change. Instead, it is recommended to specify the types of events you
 # want to use.
 #
 # To filter what is traced, you can pass any of the following as +events+:
 #
-# +:line+:: execute an expression or statement on a new line
-# +:class+:: start a class or module definition
-# +:end+:: finish a class or module definition
-# +:call+:: call a Ruby method
-# +:return+:: return from a Ruby method
-# +:c_call+:: call a C-language routine
-# +:c_return+:: return from a C-language routine
-# +:raise+:: raise an exception
-# +:b_call+:: event hook at block entry
-# +:b_return+:: event hook at block ending
-# +:a_call+:: event hook at all calls (+call+, +b_call+, and +c_call+)
-# +:a_return+:: event hook at all returns (+return+, +b_return+, and +c_return+)
-# +:thread_begin+:: event hook at thread beginning
-# +:thread_end+:: event hook at thread ending
-# +:fiber_switch+:: event hook at fiber switch
-# +:script_compiled+:: new Ruby code compiled (with +eval+, +load+ or +require+)
+# +:line+:: Execute an expression or statement on a new line.
+# +:class+:: Start a class or module definition.
+# +:end+:: Finish a class or module definition.
+# +:call+:: Call a Ruby method.
+# +:return+:: Return from a Ruby method.
+# +:c_call+:: Call a C-language routine.
+# +:c_return+:: Return from a C-language routine.
+# +:raise+:: Raise an exception.
+# +:rescue+:: Rescue an exception.
+# +:b_call+:: Event hook at block entry.
+# +:b_return+:: Event hook at block ending.
+# +:a_call+:: Event hook at all calls (+call+, +b_call+, and +c_call+).
+# +:a_return+:: Event hook at all returns (+return+, +b_return+, and +c_return+).
+# +:thread_begin+:: Event hook at thread beginning.
+# +:thread_end+:: Event hook at thread ending.
+# +:fiber_switch+:: Event hook at fiber switch.
+# +:script_compiled+:: New Ruby code compiled (with +eval+, +load+, or +require+).
 #
 class TracePoint
   # call-seq:
-  #	TracePoint.new(*events) { |obj| block }	    -> obj
+  #   TracePoint.new(*events) { |tp| block } -> tp
   #
   # Returns a new TracePoint object, not enabled by default.
   #
-  # Next, in order to activate the trace, you must use TracePoint#enable
+  # To activate the TracePoint object, use TracePoint#enable:
   #
-  #	trace = TracePoint.new(:call) do |tp|
-  #	    p [tp.lineno, tp.defined_class, tp.method_id, tp.event]
-  #	end
-  #	#=> #<TracePoint:disabled>
+  #     trace = TracePoint.new(:call) do |tp|
+  #       p [tp.lineno, tp.defined_class, tp.method_id, tp.event]
+  #     end
+  #     #=> #<TracePoint:disabled>
   #
-  #	trace.enable
-  #	#=> false
+  #     trace.enable  #=> false
   #
-  #	puts "Hello, TracePoint!"
-  #	# ...
-  #	# [48, IRB::Notifier::AbstractNotifier, :printf, :call]
-  #	# ...
+  #     puts "Hello, TracePoint!"
+  #     # ...
+  #     # [48, IRB::Notifier::AbstractNotifier, :printf, :call]
+  #     # ...
   #
-  # When you want to deactivate the trace, you must use TracePoint#disable
+  # To deactivate the trace, use TracePoint#disable.
   #
-  #	trace.disable
+  #     trace.disable
   #
   # See TracePoint@Events for possible events and more information.
   #
-  # A block must be given, otherwise an ArgumentError is raised.
+  # A block must be given; otherwise, an ArgumentError is raised.
   #
   # If the trace method isn't included in the given events filter, a
   # RuntimeError is raised.
   #
-  #	TracePoint.trace(:line) do |tp|
-  #	    p tp.raised_exception
-  #	end
-  #	#=> RuntimeError: 'raised_exception' not supported by this event
+  #     TracePoint.trace(:line) do |tp|
+  #       p tp.raised_exception
+  #     end
+  #     #=> RuntimeError: 'raised_exception' not supported by this event
   #
-  # If the trace method is called outside block, a RuntimeError is raised.
+  # If the trace method is called outside a block, a RuntimeError is raised.
   #
-  #      TracePoint.trace(:line) do |tp|
-  #        $tp = tp
-  #      end
-  #      $tp.lineno #=> access from outside (RuntimeError)
+  #     TracePoint.trace(:line) do |tp|
+  #       $tp = tp
+  #     end
+  #     $tp.lineno #=> access from outside (RuntimeError)
   #
   # Access from other threads is also forbidden.
   #
   def self.new(*events)
+    Primitive.attr! :use_block
     Primitive.tracepoint_new_s(events)
   end
 
-  #  call-seq:
-  #    trace.inspect  -> string
+  # call-seq:
+  #   trace.inspect -> string
   #
-  #  Return a string containing a human-readable TracePoint
-  #  status.
+  # Returns a string containing a human-readable TracePoint
+  # status.
   def inspect
     Primitive.tracepoint_inspect
   end
 
   # call-seq:
-  #	TracePoint.stat -> obj
+  #   TracePoint.stat -> obj
   #
-  #  Returns internal information of TracePoint.
+  # Returns internal information of TracePoint.
   #
-  #  The contents of the returned value are implementation specific.
-  #  It may be changed in future.
+  # The contents of the returned value are implementation-specific
+  # and may change in the future.
   #
-  #  This method is only for debugging TracePoint itself.
+  # This method is only for debugging TracePoint itself.
   def self.stat
     Primitive.tracepoint_stat_s
   end
 
   # call-seq:
-  #	   TracePoint.trace(*events) { |obj| block }	-> obj
+  #   TracePoint.trace(*events) { |tp| block } -> obj
   #
-  # A convenience method for TracePoint.new, that activates the trace
+  # A convenience method for TracePoint.new that activates the trace
   # automatically.
   #
-  #	    trace = TracePoint.trace(:call) { |tp| [tp.lineno, tp.event] }
-  #	    #=> #<TracePoint:enabled>
+  #     trace = TracePoint.trace(:call) { |tp| [tp.lineno, tp.event] }
+  #     #=> #<TracePoint:enabled>
   #
-  #	    trace.enabled? #=> true
+  #     trace.enabled?  #=> true
   #
   def self.trace(*events)
+    Primitive.attr! :use_block
     Primitive.tracepoint_trace_s(events)
   end
 
   # call-seq:
   #   TracePoint.allow_reentry { block }
   #
-  # In general, while a TracePoint callback is running,
+  # Generally, while a TracePoint callback is running,
   # other registered callbacks are not called to avoid
-  # confusion by reentrance.
-  # This method allows the reentrance in a given block.
-  # This method should be used carefully, otherwise the callback
-  # can be easily called infinitely.
+  # confusion from reentrance.
+  # This method allows reentrance within a given block.
+  # Use this method carefully to avoid infinite callback invocation.
   #
-  # If this method is called when the reentrance is already allowed,
+  # If called when reentrance is already allowed,
   # it raises a RuntimeError.
   #
   # <b>Example:</b>
@@ -152,7 +152,7 @@ def self.trace(*events)
   #   # ---------------
   #
   #   line_handler = TracePoint.new(:line) do |tp|
-  #     next if tp.path != __FILE__ # only work in this file
+  #     next if tp.path != __FILE__ # Only works in this file
   #     puts "Line handler"
   #     binding.eval("class C; end")
   #   end.enable
@@ -164,16 +164,16 @@ def self.trace(*events)
   #   class B
   #   end
   #
-  #   # This script will print "Class handler" only once: when inside :line
-  #   # handler, all other handlers are ignored
+  #   # This script will print "Class handler" only once: when inside the :line
+  #   # handler, all other handlers are ignored.
   #
   #
   #   # With reentry
   #   # ------------
   #
   #   line_handler = TracePoint.new(:line) do |tp|
-  #     next if tp.path != __FILE__ # only work in this file
-  #     next if (__LINE__..__LINE__+3).cover?(tp.lineno) # don't be invoked from itself
+  #     next if tp.path != __FILE__ # Only works in this file
+  #     next if (__LINE__..__LINE__+3).cover?(tp.lineno) # Prevent infinite calls
   #     puts "Line handler"
   #     TracePoint.allow_reentry { binding.eval("class C; end") }
   #   end.enable
@@ -185,27 +185,29 @@ def self.trace(*events)
   #   class B
   #   end
   #
-  #   # This wil print "Class handler" twice: inside allow_reentry block in :line
+  #   # This will print "Class handler" twice: inside the allow_reentry block in the :line
   #   # handler, other handlers are enabled.
   #
   # Note that the example shows the principal effect of the method, but its
-  # practical usage is for debugging libraries that sometimes require other libraries
-  # hooks to not be affected by debugger being inside trace point handling. Precautions
-  # should be taken against infinite recursion in this case (note that we needed to filter
-  # out calls by itself from :line handler, otherwise it will call itself infinitely).
+  # practical usage is for debugging libraries that sometimes require other libraries'
+  # hooks to not be affected by the debugger being inside trace point handling.
+  # Precautions should be taken against infinite recursion in this case
+  # (note that we needed to filter out calls by itself from the :line handler,
+  # otherwise it would call itself infinitely).
   #
   def self.allow_reentry
+    Primitive.attr! :use_block
     Primitive.tracepoint_allow_reentry
   end
 
   # call-seq:
-  #    trace.enable(target: nil, target_line: nil, target_thread: nil)    -> true or false
-  #    trace.enable(target: nil, target_line: nil, target_thread: :default) { block }  -> obj
+  #   trace.enable(target: nil, target_line: nil, target_thread: nil) -> true or false
+  #   trace.enable(target: nil, target_line: nil, target_thread: :default) { block } -> obj
   #
   # Activates the trace.
   #
-  # Returns +true+ if trace was enabled.
-  # Returns +false+ if trace was disabled.
+  # Returns +true+ if the trace was enabled.
+  # Returns +false+ if the trace was disabled.
   #
   #   trace.enabled?  #=> false
   #   trace.enable    #=> false (previous state)
@@ -214,203 +216,202 @@ def self.allow_reentry
   #   trace.enable    #=> true (previous state)
   #                   #   trace is still enabled
   #
-  # If a block is given, the trace will only be enabled during the block call.
+  # If a block is given, the trace will only be enabled during the block execution.
   # If target and target_line are both nil, then target_thread will default
   # to the current thread if a block is given.
   #
-  #    trace.enabled?
-  #    #=> false
+  #     trace.enabled?  #=> false
   #
-  #    trace.enable do
-  #      trace.enabled?
-  #      # only enabled for this block and thread
-  #    end
+  #     trace.enable do
+  #       trace.enabled?
+  #       # Only enabled for this block and thread
+  #     end
   #
-  #    trace.enabled?
-  #    #=> false
+  #     trace.enabled?  #=> false
   #
-  # +target+, +target_line+ and +target_thread+ parameters are used to
-  # limit tracing only to specified code objects. +target+ should be a
+  # The +target+, +target_line+, and +target_thread+ parameters are used to
+  # limit tracing to specified code objects. +target+ should be a
   # code object for which RubyVM::InstructionSequence.of will return
   # an instruction sequence.
   #
-  #    t = TracePoint.new(:line) { |tp| p tp }
+  #     t = TracePoint.new(:line) { |tp| p tp }
   #
-  #    def m1
-  #      p 1
-  #    end
+  #     def m1
+  #       p 1
+  #     end
   #
-  #    def m2
-  #      p 2
-  #    end
+  #     def m2
+  #       p 2
+  #     end
   #
-  #    t.enable(target: method(:m1))
+  #     t.enable(target: method(:m1))
   #
-  #    m1
-  #    # prints #<TracePoint:line test.rb:4 in `m1'>
-  #    m2
-  #    # prints nothing
+  #     m1
+  #     # Prints #<TracePoint:line test.rb:4 in `m1'>
+  #     m2
+  #     # Prints nothing
   #
   # Note: You cannot access event hooks within the +enable+ block.
   #
-  #    trace.enable { p tp.lineno }
-  #    #=> RuntimeError: access from outside
+  #     trace.enable { p tp.lineno }
+  #     #=> RuntimeError: access from outside
   #
   def enable(target: nil, target_line: nil, target_thread: :default)
+    Primitive.attr! :use_block
     Primitive.tracepoint_enable_m(target, target_line, target_thread)
   end
 
   # call-seq:
-  #	trace.disable		-> true or false
-  #	trace.disable { block } -> obj
+  #   trace.disable -> true or false
+  #   trace.disable { block } -> obj
   #
-  # Deactivates the trace
+  # Deactivates the trace.
   #
-  # Return true if trace was enabled.
-  # Return false if trace was disabled.
+  # Returns +true+ if the trace was enabled.
+  # Returns +false+ if the trace was disabled.
   #
-  #	trace.enabled?	#=> true
-  #	trace.disable	#=> true (previous status)
-  #	trace.enabled?	#=> false
-  #	trace.disable	#=> false
+  #     trace.enabled?  #=> true
+  #     trace.disable   #=> true (previous status)
+  #     trace.enabled?  #=> false
+  #     trace.disable   #=> false
   #
-  # If a block is given, the trace will only be disable within the scope of the
+  # If a block is given, the trace will only be disabled within the scope of the
   # block.
   #
-  #	trace.enabled?
-  #	#=> true
+  #     trace.enabled?  #=> true
   #
-  #	trace.disable do
-  #	    trace.enabled?
-  #	    # only disabled for this block
-  #	end
+  #     trace.disable do
+  #       trace.enabled?
+  #       # Only disabled for this block
+  #     end
   #
-  #	trace.enabled?
-  #	#=> true
+  #     trace.enabled?  #=> true
   #
   # Note: You cannot access event hooks within the block.
   #
-  #	trace.disable { p tp.lineno }
-  #	#=> RuntimeError: access from outside
+  #     trace.disable { p tp.lineno }
+  #     #=> RuntimeError: access from outside
+  #
   def disable
+    Primitive.attr! :use_block
     Primitive.tracepoint_disable_m
   end
 
   # call-seq:
-  #	trace.enabled?	    -> true or false
+  #   trace.enabled? -> true or false
   #
-  # The current status of the trace
+  # Returns the current status of the trace.
   def enabled?
     Primitive.tracepoint_enabled_p
   end
 
-  # Type of event
+  # Returns the type of event.
   #
   # See TracePoint@Events for more information.
   def event
     Primitive.tracepoint_attr_event
   end
 
-  # Line number of the event
+  # Returns the line number of the event.
   def lineno
     Primitive.tracepoint_attr_lineno
   end
 
-  # Path of the file being run
+  # Returns the path of the file being executed.
   def path
     Primitive.tracepoint_attr_path
   end
 
-  # Return the parameters definition of the method or block that the
-  # current hook belongs to. Format is the same as for Method#parameters
+  # Returns the parameter definitions of the method or block that the
+  # current hook belongs to. The format is the same as for Method#parameters.
   def parameters
     Primitive.tracepoint_attr_parameters
   end
 
-  # Return the name at the definition of the method being called
+  # Returns the name at the definition of the method being called.
   def method_id
     Primitive.tracepoint_attr_method_id
   end
 
-  # Return the called name of the method being called
+  # Returns the called name of the method being called.
   def callee_id
     Primitive.tracepoint_attr_callee_id
   end
 
-  # Return class or module of the method being called.
+  # Returns the class or module of the method being called.
   #
-  #	class C; def foo; end; end
-  # 	trace = TracePoint.new(:call) do |tp|
-  # 	  p tp.defined_class #=> C
-  # 	end.enable do
-  # 	  C.new.foo
-  # 	end
+  #     class C; def foo; end; end
+  #     trace = TracePoint.new(:call) do |tp|
+  #       p tp.defined_class #=> C
+  #     end.enable do
+  #       C.new.foo
+  #     end
   #
-  # If method is defined by a module, then that module is returned.
+  # If the method is defined by a module, then that module is returned.
   #
-  #	module M; def foo; end; end
-  # 	class C; include M; end;
-  # 	trace = TracePoint.new(:call) do |tp|
-  # 	  p tp.defined_class #=> M
-  # 	end.enable do
-  # 	  C.new.foo
-  # 	end
+  #     module M; def foo; end; end
+  #     class C; include M; end
+  #     trace = TracePoint.new(:call) do |tp|
+  #       p tp.defined_class #=> M
+  #     end.enable do
+  #       C.new.foo
+  #     end
   #
-  # <b>Note:</b> #defined_class returns singleton class.
+  # <b>Note:</b> #defined_class returns the singleton class.
   #
-  # 6th block parameter of Kernel#set_trace_func passes original class
-  # of attached by singleton class.
+  # The 6th block parameter of Kernel#set_trace_func passes the original class
+  # attached by the singleton class.
   #
   # <b>This is a difference between Kernel#set_trace_func and TracePoint.</b>
   #
-  #	class C; def self.foo; end; end
-  # 	trace = TracePoint.new(:call) do |tp|
-  # 	  p tp.defined_class #=> #<Class:C>
-  # 	end.enable do
-  # 	  C.foo
-  # 	end
+  #     class C; def self.foo; end; end
+  #     trace = TracePoint.new(:call) do |tp|
+  #       p tp.defined_class #=> #<Class:C>
+  #     end.enable do
+  #       C.foo
+  #     end
   def defined_class
     Primitive.tracepoint_attr_defined_class
   end
 
-  # Return the generated binding object from event.
+  # Returns the generated binding object from the event.
   #
-  # Note that for +c_call+ and +c_return+ events, the method will return
+  # Note that for +:c_call+ and +:c_return+ events, the method returns
   # +nil+, since C methods themselves do not have bindings.
   def binding
     Primitive.tracepoint_attr_binding
   end
 
-  # Return the trace object during event
+  # Returns the trace object during the event.
   #
-  # Same as the following, except it returns the correct object (the method
-  # receiver) for +c_call+ and +c_return+ events:
+  # Similar to the following, but it returns the correct object (the method
+  # receiver) for +:c_call+ and +:c_return+ events:
   #
   #   trace.binding.eval('self')
   def self
     Primitive.tracepoint_attr_self
   end
 
-  #  Return value from +:return+, +c_return+, and +b_return+ event
+  # Returns the return value from +:return+, +:c_return+, and +:b_return+ events.
   def return_value
     Primitive.tracepoint_attr_return_value
   end
 
-  # Value from exception raised on the +:raise+ event
+  # Returns the exception raised on the +:raise+ event or rescued on the +:rescue+ event.
   def raised_exception
     Primitive.tracepoint_attr_raised_exception
   end
 
-  # Compiled source code (String) on *eval methods on the +:script_compiled+ event.
-  # If loaded from a file, it will return nil.
+  # Returns the compiled source code (String) from eval methods on the +:script_compiled+ event.
+  # If loaded from a file, it returns +nil+.
   def eval_script
     Primitive.tracepoint_attr_eval_script
   end
 
-  # Compiled instruction sequence represented by a RubyVM::InstructionSequence instance
+  # Returns the compiled instruction sequence represented by a RubyVM::InstructionSequence instance
   # on the +:script_compiled+ event.
   #
-  # Note that this method is MRI specific.
+  # Note that this method is CRuby-specific.
   def instruction_sequence
     Primitive.tracepoint_attr_instruction_sequence
   end
diff --git a/transcode.c b/transcode.c
index b64768e48cf866..8e36fa13eb88cd 100644
--- a/transcode.c
+++ b/transcode.c
@@ -20,6 +20,7 @@
 #include "internal/string.h"
 #include "internal/transcode.h"
 #include "ruby/encoding.h"
+#include "vm_sync.h"
 
 #include "transcode_data.h"
 #include "id.h"
@@ -181,25 +182,49 @@ typedef struct {
 
 static st_table *transcoder_table;
 
+static int
+free_inner_transcode_i(st_data_t key, st_data_t val, st_data_t arg)
+{
+    xfree((void *)val);
+    return ST_DELETE;
+}
+
+static int
+free_transcode_i(st_data_t key, st_data_t val, st_data_t arg)
+{
+    st_foreach((void *)val, free_inner_transcode_i, 0);
+    st_free_table((void *)val);
+    return ST_DELETE;
+}
+
+void
+rb_free_transcoder_table(void)
+{
+    st_foreach(transcoder_table, free_transcode_i, 0);
+    st_free_table(transcoder_table);
+}
+
 static transcoder_entry_t *
 make_transcoder_entry(const char *sname, const char *dname)
 {
     st_data_t val;
     st_table *table2;
 
-    if (!st_lookup(transcoder_table, (st_data_t)sname, &val)) {
-        val = (st_data_t)st_init_strcasetable();
-        st_add_direct(transcoder_table, (st_data_t)sname, val);
-    }
-    table2 = (st_table *)val;
-    if (!st_lookup(table2, (st_data_t)dname, &val)) {
-        transcoder_entry_t *entry = ALLOC(transcoder_entry_t);
-        entry->sname = sname;
-        entry->dname = dname;
-        entry->lib = NULL;
-        entry->transcoder = NULL;
-        val = (st_data_t)entry;
-        st_add_direct(table2, (st_data_t)dname, val);
+    RB_VM_LOCKING() {
+        if (!st_lookup(transcoder_table, (st_data_t)sname, &val)) {
+            val = (st_data_t)st_init_strcasetable();
+            st_add_direct(transcoder_table, (st_data_t)sname, val);
+        }
+        table2 = (st_table *)val;
+        if (!st_lookup(table2, (st_data_t)dname, &val)) {
+            transcoder_entry_t *entry = ALLOC(transcoder_entry_t);
+            entry->sname = sname;
+            entry->dname = dname;
+            entry->lib = NULL;
+            entry->transcoder = NULL;
+            val = (st_data_t)entry;
+            st_add_direct(table2, (st_data_t)dname, val);
+        }
     }
     return (transcoder_entry_t *)val;
 }
@@ -207,15 +232,15 @@ make_transcoder_entry(const char *sname, const char *dname)
 static transcoder_entry_t *
 get_transcoder_entry(const char *sname, const char *dname)
 {
-    st_data_t val;
+    st_data_t val = 0;
     st_table *table2;
-
-    if (!st_lookup(transcoder_table, (st_data_t)sname, &val)) {
-        return NULL;
-    }
-    table2 = (st_table *)val;
-    if (!st_lookup(table2, (st_data_t)dname, &val)) {
-        return NULL;
+    RB_VM_LOCKING() {
+        if (st_lookup(transcoder_table, (st_data_t)sname, &val)) {
+            table2 = (st_table *)val;
+            if (!st_lookup(table2, (st_data_t)dname, &val)) {
+                val = 0;
+            }
+        }
     }
     return (transcoder_entry_t *)val;
 }
@@ -228,13 +253,14 @@ rb_register_transcoder(const rb_transcoder *tr)
 
     transcoder_entry_t *entry;
 
-    entry = make_transcoder_entry(sname, dname);
-    if (entry->transcoder) {
-        rb_raise(rb_eArgError, "transcoder from %s to %s has been already registered",
-                 sname, dname);
+    RB_VM_LOCKING() {
+        entry = make_transcoder_entry(sname, dname);
+        if (entry->transcoder) {
+            rb_raise(rb_eArgError, "transcoder from %s to %s has been already registered",
+                    sname, dname);
+        }
+        entry->transcoder = tr;
     }
-
-    entry->transcoder = tr;
 }
 
 static void
@@ -301,8 +327,9 @@ transcode_search_path(const char *sname, const char *dname,
     search_path_queue_t *q;
     st_data_t val;
     st_table *table2;
-    int found;
     int pathlen = -1;
+    bool found = false;
+    bool lookup_res;
 
     if (encoding_equal(sname, dname))
         return -1;
@@ -316,34 +343,36 @@ transcode_search_path(const char *sname, const char *dname,
     bfs.visited = st_init_strcasetable();
     st_add_direct(bfs.visited, (st_data_t)sname, (st_data_t)NULL);
 
-    while (bfs.queue) {
-        q = bfs.queue;
-        bfs.queue = q->next;
-        if (!bfs.queue)
-            bfs.queue_last_ptr = &bfs.queue;
+    RB_VM_LOCKING() {
+        while (bfs.queue) {
+            q = bfs.queue;
+            bfs.queue = q->next;
+            if (!bfs.queue) {
+                bfs.queue_last_ptr = &bfs.queue;
+            }
 
-        if (!st_lookup(transcoder_table, (st_data_t)q->enc, &val)) {
-            xfree(q);
-            continue;
-        }
-        table2 = (st_table *)val;
+            lookup_res = st_lookup(transcoder_table, (st_data_t)q->enc, &val);
+            if (!lookup_res) {
+                xfree(q);
+                continue;
+            }
+            table2 = (st_table *)val;
 
-        if (st_lookup(table2, (st_data_t)dname, &val)) {
-            st_add_direct(bfs.visited, (st_data_t)dname, (st_data_t)q->enc);
-            xfree(q);
-            found = 1;
-            goto cleanup;
-        }
+            if (st_lookup(table2, (st_data_t)dname, &val)) {
+                st_add_direct(bfs.visited, (st_data_t)dname, (st_data_t)q->enc);
+                xfree(q);
+                found = true;
+                break;
+            }
 
-        bfs.base_enc = q->enc;
-        st_foreach(table2, transcode_search_path_i, (st_data_t)&bfs);
-        bfs.base_enc = NULL;
+            bfs.base_enc = q->enc;
+            st_foreach(table2, transcode_search_path_i, (st_data_t)&bfs);
 
-        xfree(q);
+            bfs.base_enc = NULL;
+            xfree(q);
+        }
     }
-    found = 0;
 
-  cleanup:
     while (bfs.queue) {
         q = bfs.queue;
         bfs.queue = q->next;
@@ -382,6 +411,8 @@ int rb_require_internal_silent(VALUE fname);
 static const rb_transcoder *
 load_transcoder_entry(transcoder_entry_t *entry)
 {
+    // changes result of entry->transcoder depending on if it's required or not, so needs lock
+    ASSERT_vm_locking();
     if (entry->transcoder)
         return entry->transcoder;
 
@@ -675,7 +706,7 @@ transcode_restartable0(const unsigned char **in_pos, unsigned char **out_pos,
                 }
                 break;
             }
-      case FUNsio:
+          case FUNsio:
             {
                 const unsigned char *char_start;
                 size_t char_len;
@@ -950,6 +981,7 @@ rb_econv_open_by_transcoder_entries(int n, transcoder_entry_t **entries)
 {
     rb_econv_t *ec;
     int i, ret;
+    ASSERT_vm_locking();
 
     for (i = 0; i < n; i++) {
         const rb_transcoder *tr;
@@ -994,6 +1026,7 @@ rb_econv_open0(const char *sname, const char *dname, int ecflags)
     transcoder_entry_t **entries = NULL;
     int num_trans;
     rb_econv_t *ec;
+    ASSERT_vm_locking();
 
     /* Just check if sname and dname are defined */
     /* (This check is needed?) */
@@ -1084,19 +1117,23 @@ rb_econv_open(const char *sname, const char *dname, int ecflags)
     if (num_decorators == -1)
         return NULL;
 
-    ec = rb_econv_open0(sname, dname, ecflags & ECONV_ERROR_HANDLER_MASK);
-    if (!ec)
-        return NULL;
-
-    for (i = 0; i < num_decorators; i++)
-        if (rb_econv_decorate_at_last(ec, decorators[i]) == -1) {
-            rb_econv_close(ec);
-            return NULL;
+    RB_VM_LOCKING() {
+        ec = rb_econv_open0(sname, dname, ecflags & ECONV_ERROR_HANDLER_MASK);
+        if (ec) {
+            for (i = 0; i < num_decorators; i++) {
+                if (rb_econv_decorate_at_last(ec, decorators[i]) == -1) {
+                    rb_econv_close(ec);
+                    ec = NULL;
+                    break;
+                }
+            }
         }
+    }
 
-    ec->flags |= ecflags & ~ECONV_ERROR_HANDLER_MASK;
-
-    return ec;
+    if (ec) {
+        ec->flags |= ecflags & ~ECONV_ERROR_HANDLER_MASK;
+    }
+    return ec; // can be NULL
 }
 
 static int
@@ -1793,26 +1830,29 @@ rb_econv_asciicompat_encoding(const char *ascii_incompat_name)
 {
     st_data_t v;
     st_table *table2;
-    struct asciicompat_encoding_t data;
+    struct asciicompat_encoding_t data = {0};
+
+    RB_VM_LOCKING() {
+        if (st_lookup(transcoder_table, (st_data_t)ascii_incompat_name, &v)) {
+            table2 = (st_table *)v;
+            /*
+            * Assumption:
+            * There is at most one transcoder for
+            * converting from ASCII incompatible encoding.
+            *
+            * For ISO-2022-JP, there is ISO-2022-JP -> stateless-ISO-2022-JP and no others.
+            */
+            if (table2->num_entries == 1) {
+                data.ascii_incompat_name = ascii_incompat_name;
+                data.ascii_compat_name = NULL;
+                st_foreach(table2, asciicompat_encoding_i, (st_data_t)&data);
+            }
 
-    if (!st_lookup(transcoder_table, (st_data_t)ascii_incompat_name, &v))
-        return NULL;
-    table2 = (st_table *)v;
+        }
 
-    /*
-     * Assumption:
-     * There is at most one transcoder for
-     * converting from ASCII incompatible encoding.
-     *
-     * For ISO-2022-JP, there is ISO-2022-JP -> stateless-ISO-2022-JP and no others.
-     */
-    if (table2->num_entries != 1)
-        return NULL;
+    }
 
-    data.ascii_incompat_name = ascii_incompat_name;
-    data.ascii_compat_name = NULL;
-    st_foreach(table2, asciicompat_encoding_i, (st_data_t)&data);
-    return data.ascii_compat_name;
+    return data.ascii_compat_name; // can be NULL
 }
 
 /*
@@ -1915,19 +1955,20 @@ static int
 rb_econv_add_converter(rb_econv_t *ec, const char *sname, const char *dname, int n)
 {
     transcoder_entry_t *entry;
-    const rb_transcoder *tr;
+    const rb_transcoder *tr = NULL;
 
     if (ec->started != 0)
         return -1;
 
-    entry = get_transcoder_entry(sname, dname);
-    if (!entry)
-        return -1;
+    RB_VM_LOCKING() {
+        entry = get_transcoder_entry(sname, dname);
+        if (entry) {
+            tr = load_transcoder_entry(entry);
+        }
 
-    tr = load_transcoder_entry(entry);
-    if (!tr) return -1;
+    }
 
-    return rb_econv_add_transcoder_at(ec, tr, n);
+    return tr ? rb_econv_add_transcoder_at(ec, tr, n) : -1;
 }
 
 static int
@@ -2640,24 +2681,25 @@ rb_econv_open_opts(const char *source_encoding, const char *destination_encoding
         replacement = rb_hash_aref(opthash, sym_replace);
     }
 
-    ec = rb_econv_open(source_encoding, destination_encoding, ecflags);
-    if (!ec)
-        return ec;
-
-    if (!NIL_P(replacement)) {
-        int ret;
-        rb_encoding *enc = rb_enc_get(replacement);
-
-        ret = rb_econv_set_replacement(ec,
-                (const unsigned char *)RSTRING_PTR(replacement),
-                RSTRING_LEN(replacement),
-                rb_enc_name(enc));
-        if (ret == -1) {
-            rb_econv_close(ec);
-            return NULL;
+    RB_VM_LOCKING() {
+        ec = rb_econv_open(source_encoding, destination_encoding, ecflags);
+        if (ec) {
+            if (!NIL_P(replacement)) {
+                int ret;
+                rb_encoding *enc = rb_enc_get(replacement);
+
+                ret = rb_econv_set_replacement(ec,
+                        (const unsigned char *)RSTRING_PTR(replacement),
+                        RSTRING_LEN(replacement),
+                        rb_enc_name(enc));
+                if (ret == -1) {
+                    rb_econv_close(ec);
+                    ec = NULL;
+                }
+            }
         }
     }
-    return ec;
+    return ec; // can be NULL
 }
 
 static int
@@ -2957,9 +2999,11 @@ static rb_encoding *
 make_encoding(const char *name)
 {
     rb_encoding *enc;
-    enc = rb_enc_find(name);
-    if (!enc)
-        enc = make_dummy_encoding(name);
+    RB_VM_LOCKING() {
+        enc = rb_enc_find(name);
+        if (!enc)
+            enc = make_dummy_encoding(name);
+    }
     return enc;
 }
 
@@ -2992,17 +3036,19 @@ econv_s_asciicompat_encoding(VALUE klass, VALUE arg)
 {
     const char *arg_name, *result_name;
     rb_encoding *arg_enc, *result_enc;
+    VALUE enc = Qnil;
 
     enc_arg(&arg, &arg_name, &arg_enc);
 
-    result_name = rb_econv_asciicompat_encoding(arg_name);
-
-    if (result_name == NULL)
-        return Qnil;
-
-    result_enc = make_encoding(result_name);
+    RB_VM_LOCKING() {
+        result_name = rb_econv_asciicompat_encoding(arg_name);
 
-    return rb_enc_from_encoding(result_enc);
+        if (result_name) {
+            result_enc = make_encoding(result_name);
+            enc = rb_enc_from_encoding(result_enc);
+        }
+    }
+    return enc;
 }
 
 static void
@@ -3083,8 +3129,12 @@ decorate_convpath(VALUE convpath, int ecflags)
         if (RB_TYPE_P(pair, T_ARRAY)) {
             const char *sname = rb_enc_name(rb_to_encoding(RARRAY_AREF(pair, 0)));
             const char *dname = rb_enc_name(rb_to_encoding(RARRAY_AREF(pair, 1)));
-            transcoder_entry_t *entry = get_transcoder_entry(sname, dname);
-            const rb_transcoder *tr = load_transcoder_entry(entry);
+            transcoder_entry_t *entry;
+            const rb_transcoder *tr;
+            RB_VM_LOCKING() {
+                entry = get_transcoder_entry(sname, dname);
+                tr = load_transcoder_entry(entry);
+            }
             if (!tr)
                 return -1;
             if (!DECORATOR_P(tr->src_encoding, tr->dst_encoding) &&
@@ -4507,91 +4557,77 @@ InitVM_transcode(void)
     rb_define_method(rb_cEncodingConverter, "replacement=", econv_set_replacement, 1);
     rb_define_method(rb_cEncodingConverter, "==", econv_equal, 1);
 
-    /* Document-const: INVALID_MASK
-     *
-     * Mask for invalid byte sequences
+    /*
+     *Mask for invalid byte sequences
      */
     rb_define_const(rb_cEncodingConverter, "INVALID_MASK", INT2FIX(ECONV_INVALID_MASK));
 
-    /* Document-const: INVALID_REPLACE
-     *
+    /*
      * Replace invalid byte sequences
      */
     rb_define_const(rb_cEncodingConverter, "INVALID_REPLACE", INT2FIX(ECONV_INVALID_REPLACE));
 
-    /* Document-const: UNDEF_MASK
-     *
+    /*
      * Mask for a valid character in the source encoding but no related
      * character(s) in destination encoding.
      */
     rb_define_const(rb_cEncodingConverter, "UNDEF_MASK", INT2FIX(ECONV_UNDEF_MASK));
 
-    /* Document-const: UNDEF_REPLACE
-     *
+    /*
      * Replace byte sequences that are undefined in the destination encoding.
      */
     rb_define_const(rb_cEncodingConverter, "UNDEF_REPLACE", INT2FIX(ECONV_UNDEF_REPLACE));
 
-    /* Document-const: UNDEF_HEX_CHARREF
-     *
+    /*
      * Replace byte sequences that are undefined in the destination encoding
      * with an XML hexadecimal character reference.  This is valid for XML
      * conversion.
      */
     rb_define_const(rb_cEncodingConverter, "UNDEF_HEX_CHARREF", INT2FIX(ECONV_UNDEF_HEX_CHARREF));
 
-    /* Document-const: PARTIAL_INPUT
-     *
+    /*
      * Indicates the source may be part of a larger string.  See
      * primitive_convert for an example.
      */
     rb_define_const(rb_cEncodingConverter, "PARTIAL_INPUT", INT2FIX(ECONV_PARTIAL_INPUT));
 
-    /* Document-const: AFTER_OUTPUT
-     *
+    /*
      * Stop converting after some output is complete but before all of the
      * input was consumed.  See primitive_convert for an example.
      */
     rb_define_const(rb_cEncodingConverter, "AFTER_OUTPUT", INT2FIX(ECONV_AFTER_OUTPUT));
 
-    /* Document-const: UNIVERSAL_NEWLINE_DECORATOR
-     *
+    /*
      * Decorator for converting CRLF and CR to LF
      */
     rb_define_const(rb_cEncodingConverter, "UNIVERSAL_NEWLINE_DECORATOR", INT2FIX(ECONV_UNIVERSAL_NEWLINE_DECORATOR));
 
-    /* Document-const: LF_NEWLINE_DECORATOR
-     *
+    /*
      * Decorator for converting CRLF and CR to LF when writing
      */
     rb_define_const(rb_cEncodingConverter, "LF_NEWLINE_DECORATOR", INT2FIX(ECONV_LF_NEWLINE_DECORATOR));
 
-    /* Document-const: CRLF_NEWLINE_DECORATOR
-     *
+    /*
      * Decorator for converting LF to CRLF
      */
     rb_define_const(rb_cEncodingConverter, "CRLF_NEWLINE_DECORATOR", INT2FIX(ECONV_CRLF_NEWLINE_DECORATOR));
 
-    /* Document-const: CR_NEWLINE_DECORATOR
-     *
+    /*
      * Decorator for converting LF to CR
      */
     rb_define_const(rb_cEncodingConverter, "CR_NEWLINE_DECORATOR", INT2FIX(ECONV_CR_NEWLINE_DECORATOR));
 
-    /* Document-const: XML_TEXT_DECORATOR
-     *
+    /*
      * Escape as XML CharData
      */
     rb_define_const(rb_cEncodingConverter, "XML_TEXT_DECORATOR", INT2FIX(ECONV_XML_TEXT_DECORATOR));
 
-    /* Document-const: XML_ATTR_CONTENT_DECORATOR
-     *
+    /*
      * Escape as XML AttValue
      */
     rb_define_const(rb_cEncodingConverter, "XML_ATTR_CONTENT_DECORATOR", INT2FIX(ECONV_XML_ATTR_CONTENT_DECORATOR));
 
-    /* Document-const: XML_ATTR_QUOTE_DECORATOR
-     *
+    /*
      * Escape as XML AttValue
      */
     rb_define_const(rb_cEncodingConverter, "XML_ATTR_QUOTE_DECORATOR", INT2FIX(ECONV_XML_ATTR_QUOTE_DECORATOR));
diff --git a/universal_parser.c b/universal_parser.c
index 0f1395322e263b..84c71748af7de2 100644
--- a/universal_parser.c
+++ b/universal_parser.c
@@ -13,7 +13,6 @@
 #include "ruby/backward/2/inttypes.h"
 #include "probes.h"
 
-#define LIKELY(x) RB_LIKELY(x)
 #define UNLIKELY(x) RB_UNLIKELY(x)
 #ifndef TRUE
 # define TRUE    1
@@ -23,20 +22,9 @@
 # define FALSE   0
 #endif
 #define numberof(array) ((int)(sizeof(array) / sizeof((array)[0])))
-#define rb_strlen_lit(str) (sizeof(str "") - 1)
+#define rb_strlen_lit(str) ((sizeof(str "") / sizeof(str ""[0])) - 1)
 #undef FIXNUM_MAX
 #define FIXNUM_MAX (LONG_MAX / 2)
-#undef RSTRING_GETMEM
-#define RSTRING_GETMEM(str, ptrvar, lenvar) \
-    ((ptrvar) = RSTRING_PTR(str),           \
-     (lenvar) = RSTRING_LEN(str))
-#if defined(USE_FLONUM)
-# /* Take that. */
-#elif SIZEOF_VALUE >= SIZEOF_DOUBLE
-# define USE_FLONUM 1
-#else
-# define USE_FLONUM 0
-#endif
 
 /* parser_st */
 #define st_table parser_st_table
@@ -61,31 +49,12 @@
 #define st_delete rb_parser_st_delete
 #undef st_is_member
 #define st_is_member parser_st_is_member
+#undef st_init_table
+#define st_init_table rb_parser_st_init_table
+#undef st_lookup
+#define st_lookup rb_parser_st_lookup
 
-#define rb_encoding void
-
-#undef T_FLOAT
-#define T_FLOAT    0x04
-#undef T_REGEXP
-#define T_REGEXP   0x06
-#undef T_HASH
-#define T_HASH     0x08
-#undef T_BIGNUM
-#define T_BIGNUM   0x0a
-#undef T_COMPLEX
-#define T_COMPLEX  0x0e
-#undef T_RATIONAL
-#define T_RATIONAL 0x0f
-
-#ifndef INTERNAL_IMEMO_H
-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 */
-};
-#endif
+#define rb_encoding const void
 
 #undef xmalloc
 #define xmalloc p->config->malloc
@@ -111,52 +80,15 @@ struct rb_imemo_tmpbuf_struct {
 #undef MEMCPY
 #define MEMCPY(p1,p2,type,n) (p->config->nonempty_memcpy((p1), (p2), sizeof(type), (n)))
 
-#define new_strterm p->config->new_strterm
-#define strterm_is_heredoc p->config->strterm_is_heredoc
-#define rb_imemo_tmpbuf_auto_free_pointer p->config->tmpbuf_auto_free_pointer
-#define rb_imemo_tmpbuf_set_ptr p->config->tmpbuf_set_ptr
-#define rb_imemo_tmpbuf_parser_heap p->config->tmpbuf_parser_heap
-
 #define compile_callback         p->config->compile_callback
 #define reg_named_capture_assign p->config->reg_named_capture_assign
-#define script_lines_defined     p->config->script_lines_defined
-#define script_lines_get         p->config->script_lines_get
-
-#define rb_obj_freeze p->config->obj_freeze
-#define rb_obj_hide p->config->obj_hide
-#undef RB_OBJ_FROZEN
-#define RB_OBJ_FROZEN p->config->obj_frozen
-#undef RB_TYPE_P
-#define RB_TYPE_P p->config->type_p
-#undef OBJ_FREEZE_RAW
-#define OBJ_FREEZE_RAW p->config->obj_freeze_raw
-
-#undef FIXNUM_P
-#define FIXNUM_P p->config->fixnum_p
-#undef SYMBOL_P
-#define SYMBOL_P p->config->symbol_p
 
 #define rb_attr_get p->config->attr_get
 
-#define rb_ary_new           p->config->ary_new
-#define rb_ary_push          p->config->ary_push
 #undef rb_ary_new_from_args
 #define rb_ary_new_from_args p->config->ary_new_from_args
-#define rb_ary_pop           p->config->ary_pop
-#define rb_ary_last          p->config->ary_last
 #define rb_ary_unshift       p->config->ary_unshift
-#undef rb_ary_new2
-#define rb_ary_new2          p->config->ary_new2
-#define rb_ary_entry         p->config->ary_entry
-#define rb_ary_join          p->config->ary_join
-#define rb_ary_reverse       p->config->ary_reverse
-#define rb_ary_clear         p->config->ary_clear
-#undef RARRAY_LEN
-#define RARRAY_LEN           p->config->array_len
-#define RARRAY_AREF          p->config->array_aref
 
-#undef rb_sym_intern_ascii_cstr
-#define rb_sym_intern_ascii_cstr p->config->sym_intern_ascii_cstr
 #define rb_make_temporary_id     p->config->make_temporary_id
 #define is_local_id              p->config->is_local_id
 #define is_attrset_id            p->config->is_attrset_id
@@ -170,98 +102,36 @@ struct rb_imemo_tmpbuf_struct {
 #define rb_intern_str            p->config->intern_str
 #define is_notop_id              p->config->is_notop_id
 #define rb_enc_symname_type      p->config->enc_symname_type
-#define rb_str_intern            p->config->str_intern
 #define rb_id2name               p->config->id2name
 #define rb_id2str                p->config->id2str
-#define rb_id2sym                p->config->id2sym
 #undef ID2SYM
 #define ID2SYM                   p->config->id2sym
-#undef SYM2ID
-#define SYM2ID                   p->config->sym2id
 
 #define rb_str_catf                       p->config->str_catf
 #undef rb_str_cat_cstr
 #define rb_str_cat_cstr                   p->config->str_cat_cstr
-#define rb_str_subseq                     p->config->str_subseq
-#define rb_str_dup                        p->config->str_dup
-#define rb_str_new_frozen                 p->config->str_new_frozen
-#define rb_str_buf_new                    p->config->str_buf_new
-#undef rb_str_buf_cat
-#define rb_str_buf_cat                    p->config->str_buf_cat
-#define rb_str_modify                     p->config->str_modify
-#define rb_str_set_len                    p->config->str_set_len
-#define rb_str_cat                        p->config->str_cat
 #define rb_str_resize                     p->config->str_resize
 #undef rb_str_new
 #define rb_str_new                        p->config->str_new
 #undef rb_str_new_cstr
 #define rb_str_new_cstr                   p->config->str_new_cstr
-#define rb_fstring                        p->config->fstring
-#define is_ascii_string                   p->config->is_ascii_string
+#define rb_str_to_interned_str            p->config->str_to_interned_str
 #define rb_enc_str_new                    p->config->enc_str_new
-#define rb_enc_str_buf_cat                p->config->enc_str_buf_cat
-#define rb_str_buf_append                 p->config->str_buf_append
 #define rb_str_vcatf                      p->config->str_vcatf
-#undef StringValueCStr
-#define StringValueCStr(v)                p->config->string_value_cstr(&(v))
 #define rb_sprintf                        p->config->rb_sprintf
 #undef RSTRING_PTR
 #define RSTRING_PTR                       p->config->rstring_ptr
-#undef RSTRING_END
-#define RSTRING_END                       p->config->rstring_end
 #undef RSTRING_LEN
 #define RSTRING_LEN                       p->config->rstring_len
-#define rb_filesystem_str_new_cstr        p->config->filesystem_str_new_cstr
-#define rb_obj_as_string                  p->config->obj_as_string
-
-#define rb_hash_clear     p->config->hash_clear
-#define rb_hash_new       p->config->hash_new
-#define rb_hash_aset      p->config->hash_aset
-#define rb_hash_lookup    p->config->hash_lookup
-#define rb_ident_hash_new p->config->ident_hash_new
-
-#undef INT2FIX
-#define INT2FIX  p->config->int2fix
-#undef LONG2FIX
-#define LONG2FIX p->config->int2fix
-
-#define bignum_negate p->config->bignum_negate
-#define rb_big_norm   p->config->big_norm
-#define rb_cstr_to_inum p->config->cstr_to_inum
 
-#define rb_float_new   p->config->float_new
-#undef RFLOAT_VALUE
-#define RFLOAT_VALUE   p->config->float_value
-#undef DBL2NUM
-#define DBL2NUM p->config->float_new
-
-#undef NUM2INT
-#define NUM2INT             p->config->num2int
-#define rb_int_positive_pow p->config->int_positive_pow
 #undef INT2NUM
 #define INT2NUM             p->config->int2num
-#undef FIX2LONG
-#define FIX2LONG            p->config->fix2long
-
-#define rb_rational_new  p->config->rational_new
-#undef rb_rational_raw1
-#define rb_rational_raw1 p->config->rational_raw1
-#define rational_set_num p->config->rational_set_num
-#define rational_get_num p->config->rational_get_num
-
-#define rb_complex_raw    p->config->complex_raw
-#define rcomplex_set_real p->config->rcomplex_set_real
-#define rcomplex_set_imag p->config->rcomplex_set_imag
-#define rcomplex_get_real p->config->rcomplex_get_real
-#define rcomplex_get_imag p->config->rcomplex_get_imag
 
 #define rb_stderr_tty_p    p->config->stderr_tty_p
 #define rb_write_error_str p->config->write_error_str
-#define rb_default_rs      p->config->default_rs()
 #define rb_io_write        p->config->io_write
 #define rb_io_flush        p->config->io_flush
 #define rb_io_puts         p->config->io_puts
-#define rb_io_gets_internal p->config->io_gets_internal
 
 #define rb_ractor_stdout   p->config->debug_output_stdout
 #define rb_ractor_stderr   p->config->debug_output_stderr
@@ -270,56 +140,34 @@ struct rb_imemo_tmpbuf_struct {
 #define rb_enc_isalnum          p->config->enc_isalnum
 #define rb_enc_precise_mbclen   p->config->enc_precise_mbclen
 #define MBCLEN_CHARFOUND_P      p->config->mbclen_charfound_p
+#define MBCLEN_CHARFOUND_LEN    p->config->mbclen_charfound_len
 #define rb_enc_name             p->config->enc_name
 #define rb_enc_prev_char        p->config->enc_prev_char
 #define rb_enc_get              p->config->enc_get
 #define rb_enc_asciicompat      p->config->enc_asciicompat
 #define rb_utf8_encoding        p->config->utf8_encoding
-#define rb_enc_associate        p->config->enc_associate
 #define rb_ascii8bit_encoding   p->config->ascii8bit_encoding
 #define rb_enc_codelen          p->config->enc_codelen
 #define rb_enc_mbcput           p->config->enc_mbcput
-#define rb_char_to_option_kcode p->config->char_to_option_kcode
-#define rb_ascii8bit_encindex   p->config->ascii8bit_encindex
 #define rb_enc_find_index       p->config->enc_find_index
 #define rb_enc_from_index       p->config->enc_from_index
-#define rb_enc_associate_index  p->config->enc_associate_index
 #define rb_enc_isspace          p->config->enc_isspace
 #define ENC_CODERANGE_7BIT      p->config->enc_coderange_7bit
 #define ENC_CODERANGE_UNKNOWN   p->config->enc_coderange_unknown
-#define rb_enc_compatible       p->config->enc_compatible
-#define rb_enc_from_encoding    p->config->enc_from_encoding
-#define ENCODING_GET            p->config->encoding_get
-#define ENCODING_SET            p->config->encoding_set
-#define ENCODING_IS_ASCII8BIT   p->config->encoding_is_ascii8bit
-#define rb_usascii_encoding     p->config->usascii_encoding
 
-#define rb_ractor_make_shareable p->config->ractor_make_shareable
-
-#define ruby_vm_keep_script_lines p->config->vm_keep_script_lines()
 #define rb_local_defined          p->config->local_defined
 #define rb_dvar_defined           p->config->dvar_defined
 
-#define literal_cmp  p->config->literal_cmp
-#define literal_hash p->config->literal_hash
-
-#define rb_builtin_class_name p->config->builtin_class_name
 #define rb_syntax_error_append p->config->syntax_error_append
 #define rb_raise p->config->raise
 #define syntax_error_new p->config->syntax_error_new
 
 #define rb_errinfo p->config->errinfo
 #define rb_set_errinfo p->config->set_errinfo
-#define rb_exc_raise p->config->exc_raise
 #define rb_make_exception p->config->make_exception
 
 #define ruby_sized_xfree p->config->sized_xfree
 #define SIZED_REALLOC_N(v, T, m, n) ((v) = (T *)p->config->sized_realloc_n((void *)(v), (m), sizeof(T), (n)))
-#undef RB_OBJ_WRITE
-#define RB_OBJ_WRITE(old, slot, young) p->config->obj_write((VALUE)(old), (VALUE *)(slot), (VALUE)(young))
-#undef RB_OBJ_WRITTEN
-#define RB_OBJ_WRITTEN(old, oldv, young) p->config->obj_written((VALUE)(old), (VALUE)(oldv), (VALUE)(young))
-#define rb_gc_register_mark_object p->config->gc_register_mark_object
 #undef RB_GC_GUARD
 #define RB_GC_GUARD p->config->gc_guard
 #define rb_gc_mark p->config->gc_mark
@@ -334,6 +182,8 @@ struct rb_imemo_tmpbuf_struct {
 #define rb_fatal           p->config->fatal
 #undef ruby_verbose
 #define ruby_verbose       p->config->verbose()
+#undef errno
+#define errno              (*p->config->errno_ptr())
 
 #define rb_make_backtrace p->config->make_backtrace
 
@@ -342,38 +192,20 @@ struct rb_imemo_tmpbuf_struct {
 #define ruby_scan_digits p->config->scan_digits
 #define strtod           p->config->strtod
 
-#undef RBOOL
-#define RBOOL p->config->rbool
-#undef UNDEF_P
-#define UNDEF_P p->config->undef_p
 #undef RTEST
 #define RTEST p->config->rtest
 #undef NIL_P
 #define NIL_P p->config->nil_p
-#undef FLONUM_P
-#define FLONUM_P p->config->flonum_p
 #undef Qnil
 #define Qnil  p->config->qnil
-#undef Qtrue
-#define Qtrue p->config->qtrue
 #undef Qfalse
 #define Qfalse p->config->qfalse
-#undef Qundef
-#define Qundef p->config->qundef
-#define rb_eArgError p->config->eArgError
-#define rb_mRubyVMFrozenCore p->config->mRubyVMFrozenCore
+#define rb_eArgError p->config->eArgError()
 #undef rb_long2int
 #define rb_long2int p->config->long2int
-#undef SPECIAL_CONST_P
-#define SPECIAL_CONST_P p->config->special_const_p
-#undef BUILTIN_TYPE
-#define BUILTIN_TYPE p->config->builtin_type
-#define ruby_snprintf p->config->snprintf
-
-#define rb_node_case_when_optimizable_literal p->config->node_case_when_optimizable_literal
-
-#undef st_init_table_with_size
-#define st_init_table_with_size rb_parser_st_init_table_with_size
+#define rb_enc_mbminlen p->config->enc_mbminlen
+#define rb_enc_isascii p->config->enc_isascii
+#define rb_enc_mbc_to_codepoint p->config->enc_mbc_to_codepoint
 
 #define rb_ast_new() \
     rb_ast_new(p->config)
diff --git a/util.c b/util.c
index 3c08879ce58698..3e8ae590a8d54e 100644
--- a/util.c
+++ b/util.c
@@ -31,6 +31,7 @@
 
 #include "internal.h"
 #include "internal/sanitizers.h"
+#include "internal/imemo.h"
 #include "internal/util.h"
 #include "ruby/util.h"
 #include "ruby_atomic.h"
@@ -41,40 +42,19 @@ const char ruby_hexdigits[] = "0123456789abcdef0123456789ABCDEF";
 unsigned long
 ruby_scan_oct(const char *start, size_t len, size_t *retlen)
 {
-    register const char *s = start;
-    register unsigned long retval = 0;
-    size_t i;
-
-    for (i = 0; i < len; i++) {
-        if ((s[0] < '0') || ('7' < s[0])) {
-            break;
-        }
-        retval <<= 3;
-        retval |= *s++ - '0';
-    }
-    *retlen = (size_t)(s - start);
-    return retval;
+    int overflow;
+    unsigned long val = ruby_scan_digits(start, (ssize_t)len, 8, retlen, &overflow);
+    (void)overflow;
+    return val;
 }
 
 unsigned long
 ruby_scan_hex(const char *start, size_t len, size_t *retlen)
 {
-    register const char *s = start;
-    register unsigned long retval = 0;
-    signed char d;
-    size_t i = 0;
-
-    for (i = 0; i < len; i++) {
-        d = ruby_digit36_to_number_table[(unsigned char)*s];
-        if (d < 0 || 15 < d) {
-            break;
-        }
-        retval <<= 4;
-        retval |= d;
-        s++;
-    }
-    *retlen = (size_t)(s - start);
-    return retval;
+    int overflow;
+    unsigned long val = ruby_scan_digits(start, (ssize_t)len, 16, retlen, &overflow);
+    (void)overflow;
+    return val;
 }
 
 const signed char ruby_digit36_to_number_table[] = {
@@ -543,41 +523,63 @@ ruby_strdup(const char *str)
     return tmp;
 }
 
+#if defined HAVE_GETCWD
+# if defined NO_GETCWD_MALLOC
+
 char *
 ruby_getcwd(void)
 {
-#if defined HAVE_GETCWD
-# undef RUBY_UNTYPED_DATA_WARNING
-# define RUBY_UNTYPED_DATA_WARNING 0
-# if defined NO_GETCWD_MALLOC
-    VALUE guard = Data_Wrap_Struct((VALUE)0, NULL, RUBY_DEFAULT_FREE, NULL);
+    VALUE guard = rb_imemo_tmpbuf_auto_free_pointer();
     int size = 200;
     char *buf = xmalloc(size);
 
     while (!getcwd(buf, size)) {
         int e = errno;
         if (e != ERANGE) {
-            xfree(buf);
-            DATA_PTR(guard) = NULL;
+            rb_free_tmp_buffer(&guard);
             rb_syserr_fail(e, "getcwd");
         }
         size *= 2;
-        DATA_PTR(guard) = buf;
+        rb_imemo_tmpbuf_set_ptr(guard, buf);
         buf = xrealloc(buf, size);
     }
+    rb_imemo_tmpbuf_set_ptr(guard, NULL);
+    return buf;
+}
+
 # else
-    VALUE guard = Data_Wrap_Struct((VALUE)0, NULL, free, NULL);
+
+static const rb_data_type_t getcwd_buffer_guard_type = {
+    .wrap_struct_name = "ruby_getcwd_guard",
+    .function = {
+        .dfree = free // not xfree.
+    },
+    .flags = RUBY_TYPED_FREE_IMMEDIATELY | RUBY_TYPED_WB_PROTECTED
+};
+
+char *
+ruby_getcwd(void)
+{
+    VALUE guard = TypedData_Wrap_Struct((VALUE)0, &getcwd_buffer_guard_type, NULL);
     char *buf, *cwd = getcwd(NULL, 0);
-    DATA_PTR(guard) = cwd;
+    RTYPEDDATA_DATA(guard) = cwd;
     if (!cwd) rb_sys_fail("getcwd");
     buf = ruby_strdup(cwd);	/* allocate by xmalloc */
     free(cwd);
+    RTYPEDDATA_DATA(RB_GC_GUARD(guard)) = NULL;
+    return buf;
+}
+
 # endif
-    DATA_PTR(RB_GC_GUARD(guard)) = NULL;
 #else
+
 # ifndef PATH_MAX
 #  define PATH_MAX 8192
 # endif
+
+char *
+ruby_getcwd(void)
+{
     char *buf = xmalloc(PATH_MAX+1);
 
     if (!getwd(buf)) {
@@ -585,10 +587,11 @@ ruby_getcwd(void)
         xfree(buf);
         rb_syserr_fail(e, "getwd");
     }
-#endif
     return buf;
 }
 
+#endif
+
 void
 ruby_each_words(const char *str, void (*func)(const char*, int, void*), void *arg)
 {
diff --git a/variable.c b/variable.c
index c30971bd085c8e..ce63b7282c4436 100644
--- a/variable.c
+++ b/variable.c
@@ -25,7 +25,9 @@
 #include "internal/error.h"
 #include "internal/eval.h"
 #include "internal/hash.h"
+#include "internal/namespace.h"
 #include "internal/object.h"
+#include "internal/gc.h"
 #include "internal/re.h"
 #include "internal/symbol.h"
 #include "internal/thread.h"
@@ -61,31 +63,25 @@ static VALUE autoload_mutex;
 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_;
-
-struct ivar_update {
-    struct gen_ivtbl *ivtbl;
-    uint32_t iv_index;
-    uint32_t max_index;
-#if !SHAPE_IN_BASIC_FLAGS
-    rb_shape_t *shape;
-#endif
-};
+static st_table *generic_fields_tbl_;
+
+typedef int rb_ivar_foreach_callback_func(ID key, VALUE val, st_data_t arg);
+static void rb_field_foreach(VALUE obj, rb_ivar_foreach_callback_func *func, st_data_t arg, bool ivar_only);
 
 void
 Init_var_tables(void)
 {
     rb_global_tbl = rb_id_table_create(0);
-    generic_iv_tbl_ = st_init_numtable();
+    generic_fields_tbl_ = st_init_numtable();
     autoload = rb_intern_const("__autoload__");
 
     autoload_mutex = rb_mutex_new();
     rb_obj_hide(autoload_mutex);
-    rb_gc_register_mark_object(autoload_mutex);
+    rb_vm_register_global_object(autoload_mutex);
 
     autoload_features = rb_ident_hash_new();
     rb_obj_hide(autoload_features);
-    rb_gc_register_mark_object(autoload_features);
+    rb_vm_register_global_object(autoload_features);
 }
 
 static inline bool
@@ -106,35 +102,44 @@ rb_namespace_p(VALUE obj)
  * to not be anonymous. <code>*permanent</code> is set to 1
  * if +classpath+ has no anonymous components. There is no builtin
  * Ruby level APIs that can change a permanent +classpath+.
+ *
+ * YJIT needs this function to not allocate.
  */
 static VALUE
 classname(VALUE klass, bool *permanent)
 {
     *permanent = false;
 
-    VALUE classpath = RCLASS_EXT(klass)->classpath;
+    VALUE classpath = RCLASS_CLASSPATH(klass);
     if (classpath == 0) return Qnil;
 
-    *permanent = RCLASS_EXT(klass)->permanent_classpath;
+    *permanent = RCLASS_PERMANENT_CLASSPATH_P(klass);
 
     return classpath;
 }
 
+VALUE
+rb_mod_name0(VALUE klass, bool *permanent)
+{
+    return classname(klass, permanent);
+}
+
 /*
  *  call-seq:
- *     mod.name    -> string
+ *     mod.name    -> string or nil
  *
- *  Returns the name of the module <i>mod</i>.  Returns nil for anonymous modules.
+ *  Returns the name of the module <i>mod</i>.  Returns +nil+ for anonymous modules.
  */
 
 VALUE
 rb_mod_name(VALUE mod)
 {
+    // YJIT needs this function to not allocate.
     bool permanent;
     return classname(mod, &permanent);
 }
 
-// Similar to logic in rb_mod_const_get()
+// Similar to logic in rb_mod_const_get().
 static bool
 is_constant_path(VALUE name)
 {
@@ -166,26 +171,100 @@ is_constant_path(VALUE name)
     return true;
 }
 
+struct sub_temporary_name_args {
+    VALUE names;
+    ID last;
+};
+
+static VALUE build_const_path(VALUE head, ID tail);
+static void set_sub_temporary_name_foreach(VALUE mod, struct sub_temporary_name_args *args, VALUE name);
+
+static VALUE
+set_sub_temporary_name_recursive(VALUE mod, VALUE data, int recursive)
+{
+    if (recursive) return Qfalse;
+
+    struct sub_temporary_name_args *args = (void *)data;
+    VALUE name = 0;
+    if (args->names) {
+        name = build_const_path(rb_ary_last(0, 0, args->names), args->last);
+    }
+    set_sub_temporary_name_foreach(mod, args, name);
+    return Qtrue;
+}
+
+static VALUE
+set_sub_temporary_name_topmost(VALUE mod, VALUE data, int recursive)
+{
+    if (recursive) return Qfalse;
+
+    struct sub_temporary_name_args *args = (void *)data;
+    VALUE name = args->names;
+    if (name) {
+        args->names = rb_ary_hidden_new(0);
+    }
+    set_sub_temporary_name_foreach(mod, args, name);
+    return Qtrue;
+}
+
+static enum rb_id_table_iterator_result
+set_sub_temporary_name_i(ID id, VALUE val, void *data)
+{
+    val = ((rb_const_entry_t *)val)->value;
+    if (rb_namespace_p(val) && !RCLASS_PERMANENT_CLASSPATH_P(val)) {
+        VALUE arg = (VALUE)data;
+        struct sub_temporary_name_args *args = data;
+        args->last = id;
+        rb_exec_recursive_paired(set_sub_temporary_name_recursive, val, arg, arg);
+    }
+    return ID_TABLE_CONTINUE;
+}
+
+static void
+set_sub_temporary_name_foreach(VALUE mod, struct sub_temporary_name_args *args, VALUE name)
+{
+    RCLASS_WRITE_CLASSPATH(mod, name, FALSE);
+    struct rb_id_table *tbl = RCLASS_CONST_TBL(mod);
+    if (!tbl) return;
+    if (!name) {
+        rb_id_table_foreach(tbl, set_sub_temporary_name_i, args);
+    }
+    else {
+        long names_len = RARRAY_LEN(args->names); // paranoiac check?
+        rb_ary_push(args->names, name);
+        rb_id_table_foreach(tbl, set_sub_temporary_name_i, args);
+        rb_ary_set_len(args->names, names_len);
+    }
+}
+
+static void
+set_sub_temporary_name(VALUE mod, VALUE name)
+{
+    struct sub_temporary_name_args args = {name};
+    VALUE arg = (VALUE)&args;
+    rb_exec_recursive_paired(set_sub_temporary_name_topmost, mod, arg, arg);
+}
+
 /*
  *  call-seq:
  *     mod.set_temporary_name(string) -> self
  *     mod.set_temporary_name(nil) -> self
  *
- *  Sets the temporary name of the module +mod+. This name is used as a prefix
- *  for the names of constants declared in +mod+. If the module is assigned a
- *  permanent name, the temporary name is discarded.
+ *  Sets the temporary name of the module. This name is reflected in
+ *  introspection of the module and the values that are related to it, such
+ *  as instances, constants, and methods.
  *
- *  After a permanent name is assigned, a temporary name can no longer be set,
- *  and this method raises a RuntimeError.
+ *  The name should be +nil+ or a non-empty string that is not a valid constant
+ *  path (to avoid confusing between permanent and temporary names).
  *
- *  If the name given is not a string or is a zero length string, this method
- *  raises an ArgumentError.
+ *  The method can be useful to distinguish dynamically generated classes and
+ *  modules without assigning them to constants.
  *
- *  The temporary name must not be a valid constant name, to avoid confusion
- *  with actual constants. If you attempt to set a temporary name that is a
- *  a valid constant name, this method raises an ArgumentError.
+ *  If the module is given a permanent name by assigning it to a constant,
+ *  the temporary name is discarded. A temporary name can't be assigned to
+ *  modules that have a permanent name.
  *
- *  If the given name is +nil+, the module becomes anonymous.
+ *  If the given name is +nil+, the module becomes anonymous again.
  *
  *  Example:
  *
@@ -198,29 +277,37 @@ is_constant_path(VALUE name)
  *    m.set_temporary_name(nil) # => #<Module:0x0000000102c68f38>
  *    m.name #=> nil
  *
- *    n = Module.new
- *    n.set_temporary_name("fake_name")
+ *    c = Class.new
+ *    c.set_temporary_name("MyClass(with description)")
  *
- *    n::M = m
- *    n::M.name #=> "fake_name::M"
- *    N = n
+ *    c.new # => #<MyClass(with description):0x0....>
  *
- *    N.name #=> "nested_fake_name"
- *    N::M.name #=> "N::M"
+ *    c::M = m
+ *    c::M.name #=> "MyClass(with description)::M"
+ *
+ *    # Assigning to a constant replaces the name with a permanent one
+ *    C = c
+ *
+ *    C.name #=> "C"
+ *    C::M.name #=> "C::M"
+ *    c.new # => #<C:0x0....>
  */
 
 VALUE
 rb_mod_set_temporary_name(VALUE mod, VALUE name)
 {
     // We don't allow setting the name if the classpath is already permanent:
-    if (RCLASS_EXT(mod)->permanent_classpath) {
+    if (RCLASS_PERMANENT_CLASSPATH_P(mod)) {
         rb_raise(rb_eRuntimeError, "can't change permanent name");
     }
 
     if (NIL_P(name)) {
         // Set the temporary classpath to NULL (anonymous):
-        RCLASS_SET_CLASSPATH(mod, 0, FALSE);
-    } else {
+        RB_VM_LOCKING() {
+            set_sub_temporary_name(mod, 0);
+        }
+    }
+    else {
         // Ensure the name is a string:
         StringValue(name);
 
@@ -232,8 +319,12 @@ rb_mod_set_temporary_name(VALUE mod, VALUE name)
             rb_raise(rb_eArgError, "the temporary name must not be a constant path to avoid confusion");
         }
 
+        name = rb_str_new_frozen(name);
+
         // Set the temporary classpath to the given name:
-        RCLASS_SET_CLASSPATH(mod, name, FALSE);
+        RB_VM_LOCKING() {
+            set_sub_temporary_name(mod, name);
+        }
     }
 
     return mod;
@@ -268,19 +359,19 @@ rb_tmp_class_path(VALUE klass, bool *permanent, fallback_func fallback)
     if (!NIL_P(path)) {
         return path;
     }
-    else {
-        if (RB_TYPE_P(klass, T_MODULE)) {
-            if (rb_obj_class(klass) == rb_cModule) {
-                path = Qfalse;
-            }
-            else {
-                bool perm;
-                path = rb_tmp_class_path(RBASIC(klass)->klass, &perm, fallback);
-            }
+
+    if (RB_TYPE_P(klass, T_MODULE)) {
+        if (rb_obj_class(klass) == rb_cModule) {
+            path = Qfalse;
+        }
+        else {
+            bool perm;
+            path = rb_tmp_class_path(RBASIC(klass)->klass, &perm, fallback);
         }
-        *permanent = false;
-        return fallback(klass, path);
     }
+
+    *permanent = false;
+    return fallback(klass, path);
 }
 
 VALUE
@@ -439,6 +530,7 @@ struct rb_global_variable {
     rb_gvar_marker_t *marker;
     rb_gvar_compact_t *compactor;
     struct trace_var *trace;
+    bool namespace_ready;
 };
 
 struct rb_global_entry {
@@ -447,6 +539,45 @@ struct rb_global_entry {
     bool ractor_local;
 };
 
+static void
+free_global_variable(struct rb_global_variable *var)
+{
+    RUBY_ASSERT(var->counter == 0);
+
+    struct trace_var *trace = var->trace;
+    while (trace) {
+        struct trace_var *next = trace->next;
+        xfree(trace);
+        trace = next;
+    }
+    xfree(var);
+}
+
+static enum rb_id_table_iterator_result
+free_global_entry_i(VALUE val, void *arg)
+{
+    struct rb_global_entry *entry = (struct rb_global_entry *)val;
+    entry->var->counter--;
+    if (entry->var->counter == 0) {
+        free_global_variable(entry->var);
+    }
+    ruby_xfree(entry);
+    return ID_TABLE_DELETE;
+}
+
+void
+rb_free_rb_global_tbl(void)
+{
+    rb_id_table_foreach_values(rb_global_tbl, free_global_entry_i, 0);
+    rb_id_table_free(rb_global_tbl);
+}
+
+void
+rb_free_generic_fields_tbl_(void)
+{
+    st_free_table(generic_fields_tbl_);
+}
+
 static struct rb_global_entry*
 rb_find_global_entry(ID id)
 {
@@ -475,6 +606,13 @@ rb_gvar_ractor_local(const char *name)
     entry->ractor_local = true;
 }
 
+void
+rb_gvar_namespace_ready(const char *name)
+{
+    struct rb_global_entry *entry = rb_find_global_entry(rb_intern(name));
+    entry->var->namespace_ready = true;
+}
+
 static void
 rb_gvar_undef_compactor(void *var)
 {
@@ -500,6 +638,7 @@ rb_global_entry(ID id)
 
         var->block_trace = 0;
         var->trace = 0;
+        var->namespace_ready = false;
         rb_id_table_insert(rb_global_tbl, id, (VALUE)entry);
     }
     return entry;
@@ -508,7 +647,7 @@ rb_global_entry(ID id)
 VALUE
 rb_gvar_undef_getter(ID id, VALUE *_)
 {
-    rb_warning("global variable `%"PRIsVALUE"' not initialized", QUOTE_ID(id));
+    rb_warning("global variable '%"PRIsVALUE"' not initialized", QUOTE_ID(id));
 
     return Qnil;
 }
@@ -853,13 +992,28 @@ rb_gvar_set_entry(struct rb_global_entry *entry, VALUE val)
     return val;
 }
 
+#define USE_NAMESPACE_GVAR_TBL(ns,entry) \
+    (NAMESPACE_OPTIONAL_P(ns) && \
+     (!entry || !entry->var->namespace_ready || entry->var->setter != rb_gvar_readonly_setter))
+
 VALUE
 rb_gvar_set(ID id, VALUE val)
 {
+    VALUE retval;
     struct rb_global_entry *entry;
+    const rb_namespace_t *ns = rb_current_namespace();
+
     entry = rb_global_entry(id);
 
-    return rb_gvar_set_entry(entry, val);
+    if (USE_NAMESPACE_GVAR_TBL(ns, entry)) {
+        rb_hash_aset(ns->gvar_tbl, rb_id2sym(entry->id), val);
+        retval = val;
+        // TODO: think about trace
+    }
+    else {
+        retval = rb_gvar_set_entry(entry, val);
+    }
+    return retval;
 }
 
 VALUE
@@ -871,9 +1025,29 @@ rb_gv_set(const char *name, VALUE val)
 VALUE
 rb_gvar_get(ID id)
 {
+    VALUE retval, gvars, key;
     struct rb_global_entry *entry = rb_global_entry(id);
     struct rb_global_variable *var = entry->var;
-    return (*var->getter)(entry->id, var->data);
+    const rb_namespace_t *ns = rb_current_namespace();
+
+    if (USE_NAMESPACE_GVAR_TBL(ns, entry)) {
+        gvars = ns->gvar_tbl;
+        key = rb_id2sym(entry->id);
+        if (RTEST(rb_hash_has_key(gvars, key))) { // this gvar is already cached
+            retval = rb_hash_aref(gvars, key);
+        }
+        else {
+            retval = (*var->getter)(entry->id, var->data);
+            if (rb_obj_respond_to(retval, rb_intern("clone"), 1)) {
+                retval = rb_funcall(retval, rb_intern("clone"), 0);
+            }
+            rb_hash_aset(gvars, key, retval);
+        }
+    }
+    else {
+        retval = (*var->getter)(entry->id, var->data);
+    }
+    return retval;
 }
 
 VALUE
@@ -882,7 +1056,7 @@ rb_gv_get(const char *name)
     ID id = find_global_id(name);
 
     if (!id) {
-        rb_warning("global variable `%s' not initialized", name);
+        rb_warning("global variable '%s' not initialized", name);
         return Qnil;
     }
 
@@ -927,6 +1101,7 @@ rb_f_global_variables(void)
     if (!rb_ractor_main_p()) {
         rb_raise(rb_eRactorIsolationError, "can not access global variables from non-main Ractors");
     }
+    /* gvar access (get/set) in namespaces creates gvar entries globally */
 
     rb_id_table_foreach(rb_global_tbl, gvar_i, (void *)ary);
     if (!NIL_P(backref)) {
@@ -974,13 +1149,7 @@ rb_alias_variable(ID name1, ID name2)
         }
         var->counter--;
         if (var->counter == 0) {
-            struct trace_var *trace = var->trace;
-            while (trace) {
-                struct trace_var *next = trace->next;
-                xfree(trace);
-                trace = next;
-            }
-            xfree(var);
+            free_global_variable(var);
         }
     }
     else {
@@ -1006,7 +1175,7 @@ IVAR_ACCESSOR_SHOULD_BE_MAIN_RACTOR(ID id)
   }
 
 static inline struct st_table *
-generic_ivtbl(VALUE obj, ID id, bool force_check_ractor)
+generic_fields_tbl(VALUE obj, ID id, bool force_check_ractor)
 {
     ASSERT_vm_locking();
 
@@ -1017,201 +1186,162 @@ generic_ivtbl(VALUE obj, ID id, bool force_check_ractor)
 
         rb_raise(rb_eRactorIsolationError, "can not access instance variables of shareable objects from non-main Ractors");
     }
-    return generic_iv_tbl_;
+    return generic_fields_tbl_;
 }
 
 static inline struct st_table *
-generic_ivtbl_no_ractor_check(VALUE obj)
+generic_fields_tbl_no_ractor_check(VALUE obj)
 {
-    return generic_ivtbl(obj, 0, false);
+    return generic_fields_tbl(obj, 0, false);
 }
 
-static int
-gen_ivtbl_get_unlocked(VALUE obj, ID id, struct gen_ivtbl **ivtbl)
+struct st_table *
+rb_generic_fields_tbl_get(void)
 {
-    st_data_t data;
+    return generic_fields_tbl_;
+}
 
-    if (st_lookup(generic_ivtbl(obj, id, false), (st_data_t)obj, &data)) {
-        *ivtbl = (struct gen_ivtbl *)data;
-        return 1;
+static inline VALUE
+generic_fields_lookup(VALUE obj, ID id, bool force_check_ractor)
+{
+    VALUE fields_obj = Qfalse;
+    RB_VM_LOCKING() {
+        st_table *generic_tbl = generic_fields_tbl(obj, id, false);
+        st_lookup(generic_tbl, obj, (st_data_t *)&fields_obj);
     }
+    return fields_obj;
+}
 
-    return 0;
+static inline void
+generic_fields_insert(VALUE obj, VALUE fields_obj)
+{
+    RUBY_ASSERT(IMEMO_TYPE_P(fields_obj, imemo_fields));
+
+    RB_VM_LOCKING() {
+        st_table *generic_tbl = generic_fields_tbl_no_ractor_check(obj);
+        st_insert(generic_tbl, obj, fields_obj);
+    }
+    RB_OBJ_WRITTEN(obj, Qundef, fields_obj);
 }
 
 int
-rb_gen_ivtbl_get(VALUE obj, ID id, struct gen_ivtbl **ivtbl)
+rb_gen_fields_tbl_get(VALUE obj, ID id, VALUE *fields_obj)
 {
     RUBY_ASSERT(!RB_TYPE_P(obj, T_ICLASS));
 
     st_data_t data;
     int r = 0;
 
-    RB_VM_LOCK_ENTER();
-    {
-        if (st_lookup(generic_ivtbl(obj, id, false), (st_data_t)obj, &data)) {
-            *ivtbl = (struct gen_ivtbl *)data;
+    RB_VM_LOCKING() {
+        if (st_lookup(generic_fields_tbl(obj, id, false), (st_data_t)obj, &data)) {
+            *fields_obj = (VALUE)data;
             r = 1;
         }
     }
-    RB_VM_LOCK_LEAVE();
 
     return r;
 }
 
 int
-rb_ivar_generic_ivtbl_lookup(VALUE obj, struct gen_ivtbl **ivtbl)
-{
-    return rb_gen_ivtbl_get(obj, 0, ivtbl);
-}
-
-static size_t
-gen_ivtbl_bytes(size_t n)
-{
-    return offsetof(struct gen_ivtbl, ivptr) + n * sizeof(VALUE);
-}
-
-static struct gen_ivtbl *
-gen_ivtbl_resize(struct gen_ivtbl *old, uint32_t n)
-{
-    RUBY_ASSERT(n > 0);
-
-    uint32_t len = old ? old->numiv : 0;
-    struct gen_ivtbl *ivtbl = xrealloc(old, gen_ivtbl_bytes(n));
-
-    ivtbl->numiv = n;
-    for (; len < n; len++) {
-        ivtbl->ivptr[len] = Qundef;
-    }
-
-    return ivtbl;
-}
-
-#if 0
-static struct gen_ivtbl *
-gen_ivtbl_dup(const struct gen_ivtbl *orig)
-{
-    size_t s = gen_ivtbl_bytes(orig->numiv);
-    struct gen_ivtbl *ivtbl = xmalloc(s);
-
-    memcpy(ivtbl, orig, s);
-
-    return ivtbl;
-}
-#endif
-
-static int
-generic_ivar_update(st_data_t *k, st_data_t *v, st_data_t u, int existing)
-{
-    ASSERT_vm_locking();
-
-    struct ivar_update *ivup = (struct ivar_update *)u;
-    struct gen_ivtbl *ivtbl = 0;
-
-    if (existing) {
-        ivtbl = (struct gen_ivtbl *)*v;
-        if (ivup->iv_index < ivtbl->numiv) {
-            ivup->ivtbl = ivtbl;
-            return ST_STOP;
-        }
-    }
-    FL_SET((VALUE)*k, FL_EXIVAR);
-    ivtbl = gen_ivtbl_resize(ivtbl, ivup->max_index);
-    // Reinsert in to the hash table because ivtbl might be a newly resized chunk of memory
-    *v = (st_data_t)ivtbl;
-    ivup->ivtbl = ivtbl;
-#if !SHAPE_IN_BASIC_FLAGS
-    ivtbl->shape_id = rb_shape_id(ivup->shape);
-#endif
-    return ST_CONTINUE;
-}
-
-static void
-gen_ivtbl_mark_and_update(struct gen_ivtbl *ivtbl)
+rb_ivar_generic_fields_tbl_lookup(VALUE obj, VALUE *fields_obj)
 {
-    uint32_t i;
-
-    for (i = 0; i < ivtbl->numiv; i++) {
-        rb_gc_mark_and_move(&ivtbl->ivptr[i]);
-    }
+    return rb_gen_fields_tbl_get(obj, 0, fields_obj);
 }
 
 void
-rb_mark_and_update_generic_ivar(VALUE obj)
+rb_mark_generic_ivar(VALUE obj)
 {
-    struct gen_ivtbl *ivtbl;
-
-    if (rb_gen_ivtbl_get(obj, 0, &ivtbl)) {
-        gen_ivtbl_mark_and_update(ivtbl);
+    VALUE data;
+    if (st_lookup(generic_fields_tbl_no_ractor_check(obj), (st_data_t)obj, (st_data_t *)&data)) {
+        rb_gc_mark_movable(data);
     }
 }
 
-void
-rb_mv_generic_ivar(VALUE rsrc, VALUE dst)
-{
-    st_data_t key = (st_data_t)rsrc;
-    st_data_t ivtbl;
-
-    if (st_delete(generic_ivtbl_no_ractor_check(rsrc), &key, &ivtbl))
-        st_insert(generic_ivtbl_no_ractor_check(dst), (st_data_t)dst, ivtbl);
-}
-
 void
 rb_free_generic_ivar(VALUE obj)
 {
-    st_data_t key = (st_data_t)obj, ivtbl;
-
-    if (st_delete(generic_ivtbl_no_ractor_check(obj), &key, &ivtbl))
-        xfree((struct gen_ivtbl *)ivtbl);
-}
-
-RUBY_FUNC_EXPORTED size_t
-rb_generic_ivar_memsize(VALUE obj)
-{
-    struct gen_ivtbl *ivtbl;
+    if (rb_obj_exivar_p(obj)) {
+        st_data_t key = (st_data_t)obj, value;
 
-    if (rb_gen_ivtbl_get(obj, 0, &ivtbl))
-        return gen_ivtbl_bytes(ivtbl->numiv);
-    return 0;
+        RB_VM_LOCKING() {
+            st_delete(generic_fields_tbl_no_ractor_check(obj), &key, &value);
+        }
+    }
 }
 
-#if !SHAPE_IN_BASIC_FLAGS
-shape_id_t
-rb_generic_shape_id(VALUE obj)
+VALUE
+rb_obj_field_get(VALUE obj, shape_id_t target_shape_id)
 {
-    struct gen_ivtbl *ivtbl = 0;
-    shape_id_t shape_id = 0;
+    RUBY_ASSERT(!SPECIAL_CONST_P(obj));
+    RUBY_ASSERT(RSHAPE_TYPE_P(target_shape_id, SHAPE_IVAR) || RSHAPE_TYPE_P(target_shape_id, SHAPE_OBJ_ID));
 
-    RB_VM_LOCK_ENTER();
-    {
-        st_table* global_iv_table = generic_ivtbl(obj, 0, false);
-
-        if (global_iv_table && st_lookup(global_iv_table, obj, (st_data_t *)&ivtbl)) {
-            shape_id = ivtbl->shape_id;
-        }
-        else if (OBJ_FROZEN(obj)) {
-            shape_id = SPECIAL_CONST_SHAPE_ID;
+    if (BUILTIN_TYPE(obj) == T_CLASS || BUILTIN_TYPE(obj) == T_MODULE) {
+        ASSERT_vm_locking();
+        VALUE field_obj = RCLASS_WRITABLE_FIELDS_OBJ(obj);
+        if (field_obj) {
+            return rb_obj_field_get(field_obj, target_shape_id);
         }
+        return Qundef;
     }
-    RB_VM_LOCK_LEAVE();
-
-    return shape_id;
-}
-#endif
 
-static size_t
-gen_ivtbl_count(const struct gen_ivtbl *ivtbl)
-{
-    uint32_t i;
-    size_t n = 0;
+    if (rb_shape_too_complex_p(target_shape_id)) {
+        st_table *fields_hash;
+        switch (BUILTIN_TYPE(obj)) {
+          case T_CLASS:
+          case T_MODULE:
+            rb_bug("Unreachable");
+            break;
+          case T_OBJECT:
+            fields_hash = ROBJECT_FIELDS_HASH(obj);
+            break;
+          case T_IMEMO:
+            RUBY_ASSERT(IMEMO_TYPE_P(obj, imemo_fields));
+            fields_hash = rb_imemo_fields_complex_tbl(obj);
+            break;
+          default:
+            RUBY_ASSERT(rb_obj_exivar_p(obj));
+            VALUE fields_obj = 0;
+            rb_ivar_generic_fields_tbl_lookup(obj, &fields_obj);
+            RUBY_ASSERT(fields_obj);
+            fields_hash = rb_imemo_fields_complex_tbl(fields_obj);
+            break;
+        }
+        VALUE value = Qundef;
+        st_lookup(fields_hash, RSHAPE_EDGE_NAME(target_shape_id), &value);
 
-    for (i = 0; i < ivtbl->numiv; i++) {
-        if (!UNDEF_P(ivtbl->ivptr[i])) {
-            n++;
+#if RUBY_DEBUG
+        if (UNDEF_P(value)) {
+            rb_bug("Object's shape includes object_id, but it's missing %s", rb_obj_info(obj));
         }
+#endif
+
+        RUBY_ASSERT(!UNDEF_P(value));
+        return value;
     }
 
-    return n;
+    attr_index_t attr_index = RSHAPE_INDEX(target_shape_id);
+    VALUE *fields;
+    switch (BUILTIN_TYPE(obj)) {
+      case T_CLASS:
+      case T_MODULE:
+        rb_bug("Unreachable");
+        break;
+      case T_OBJECT:
+        fields = ROBJECT_FIELDS(obj);
+        break;
+      case T_IMEMO:
+        RUBY_ASSERT(IMEMO_TYPE_P(obj, imemo_fields));
+        fields = rb_imemo_fields_ptr(obj);
+        break;
+      default:
+        RUBY_ASSERT(rb_obj_exivar_p(obj));
+        VALUE fields_obj = 0;
+        rb_ivar_generic_fields_tbl_lookup(obj, &fields_obj);
+        RUBY_ASSERT(fields_obj);
+        fields = rb_imemo_fields_ptr(fields_obj);
+        break;
+    }
+    return fields[attr_index];
 }
 
 VALUE
@@ -1220,43 +1350,19 @@ rb_ivar_lookup(VALUE obj, ID id, VALUE undef)
     if (SPECIAL_CONST_P(obj)) return undef;
 
     shape_id_t shape_id;
-    VALUE * ivar_list;
-    rb_shape_t * shape;
-
-#if SHAPE_IN_BASIC_FLAGS
-    shape_id = RBASIC_SHAPE_ID(obj);
-#endif
+    VALUE *ivar_list;
 
     switch (BUILTIN_TYPE(obj)) {
       case T_CLASS:
       case T_MODULE:
         {
-            bool found;
-            VALUE val;
-
-            RB_VM_LOCK_ENTER();
-            {
-#if !SHAPE_IN_BASIC_FLAGS
-                shape_id = RCLASS_SHAPE_ID(obj);
-#endif
-
-                attr_index_t index = 0;
-                shape = rb_shape_get_shape_by_id(shape_id);
-                found = rb_shape_get_iv_index(shape, id, &index);
-
-                if (found) {
-                    ivar_list = RCLASS_IVPTR(obj);
-                    RUBY_ASSERT(ivar_list);
-
-                    val = ivar_list[index];
-                }
-                else {
-                    val = undef;
-                }
+            VALUE val = undef;
+            VALUE fields_obj = RCLASS_WRITABLE_FIELDS_OBJ(obj);
+            if (fields_obj) {
+                val = rb_ivar_lookup(fields_obj, id, undef);
             }
-            RB_VM_LOCK_LEAVE();
 
-            if (found &&
+            if (val != undef &&
                     rb_is_instance_id(id) &&
                     UNLIKELY(!rb_ractor_main_p()) &&
                     !rb_ractor_shareable_p(val)) {
@@ -1265,13 +1371,32 @@ rb_ivar_lookup(VALUE obj, ID id, VALUE undef)
             }
             return val;
         }
+      case T_IMEMO:
+        // Handled like T_OBJECT
+        {
+            RUBY_ASSERT(IMEMO_TYPE_P(obj, imemo_fields));
+            shape_id = RBASIC_SHAPE_ID(obj);
+
+            if (rb_shape_too_complex_p(shape_id)) {
+                st_table *iv_table = rb_imemo_fields_complex_tbl(obj);
+                VALUE val;
+                if (rb_st_lookup(iv_table, (st_data_t)id, (st_data_t *)&val)) {
+                    return val;
+                }
+                else {
+                    return undef;
+                }
+            }
+
+            RUBY_ASSERT(!rb_shape_obj_too_complex_p(obj));
+            ivar_list = rb_imemo_fields_ptr(obj);
+            break;
+        }
       case T_OBJECT:
         {
-#if !SHAPE_IN_BASIC_FLAGS
-            shape_id = ROBJECT_SHAPE_ID(obj);
-#endif
-            if (rb_shape_obj_too_complex(obj)) {
-                st_table * iv_table = ROBJECT_IV_HASH(obj);
+            shape_id = RBASIC_SHAPE_ID(obj);
+            if (rb_shape_too_complex_p(shape_id)) {
+                st_table *iv_table = ROBJECT_FIELDS_HASH(obj);
                 VALUE val;
                 if (rb_st_lookup(iv_table, (st_data_t)id, (st_data_t *)&val)) {
                     return val;
@@ -1281,18 +1406,28 @@ rb_ivar_lookup(VALUE obj, ID id, VALUE undef)
                 }
             }
 
-            RUBY_ASSERT(!rb_shape_obj_too_complex(obj));
-            ivar_list = ROBJECT_IVPTR(obj);
+            RUBY_ASSERT(!rb_shape_obj_too_complex_p(obj));
+            ivar_list = ROBJECT_FIELDS(obj);
             break;
         }
       default:
-        if (FL_TEST_RAW(obj, FL_EXIVAR)) {
-            struct gen_ivtbl *ivtbl;
-            rb_gen_ivtbl_get(obj, id, &ivtbl);
-#if !SHAPE_IN_BASIC_FLAGS
-            shape_id = ivtbl->shape_id;
-#endif
-            ivar_list = ivtbl->ivptr;
+        shape_id = RBASIC_SHAPE_ID(obj);
+        if (rb_obj_exivar_p(obj)) {
+            VALUE fields_obj = 0;
+            rb_gen_fields_tbl_get(obj, id, &fields_obj);
+
+            RUBY_ASSERT(fields_obj);
+
+            if (rb_shape_obj_too_complex_p(fields_obj)) {
+                VALUE val;
+                if (rb_st_lookup(rb_imemo_fields_complex_tbl(fields_obj), (st_data_t)id, (st_data_t *)&val)) {
+                    return val;
+                }
+                else {
+                    return undef;
+                }
+            }
+            ivar_list = rb_imemo_fields_ptr(fields_obj);
         }
         else {
             return undef;
@@ -1301,8 +1436,7 @@ rb_ivar_lookup(VALUE obj, ID id, VALUE undef)
     }
 
     attr_index_t index = 0;
-    shape = rb_shape_get_shape_by_id(shape_id);
-    if (rb_shape_get_iv_index(shape, id, &index)) {
+    if (rb_shape_get_iv_index(shape_id, id, &index)) {
         return ivar_list[index];
     }
 
@@ -1329,205 +1463,568 @@ rb_ivar_delete(VALUE obj, ID id, VALUE undef)
     rb_check_frozen(obj);
 
     VALUE val = undef;
-    rb_shape_t * shape = rb_shape_get_shape(obj);
-
-    switch (BUILTIN_TYPE(obj)) {
-      case T_CLASS:
-      case T_MODULE:
+    if (BUILTIN_TYPE(obj) == T_CLASS || BUILTIN_TYPE(obj) == T_MODULE) {
         IVAR_ACCESSOR_SHOULD_BE_MAIN_RACTOR(id);
 
-        RB_VM_LOCK_ENTER();
-        {
-            rb_shape_transition_shape_remove_ivar(obj, id, shape, &val);
+        VALUE fields_obj = RCLASS_WRITABLE_FIELDS_OBJ(obj);
+        if (fields_obj) {
+            if (rb_multi_ractor_p()) {
+                fields_obj = rb_imemo_fields_clone(fields_obj);
+                val = rb_ivar_delete(fields_obj, id, undef);
+                RCLASS_WRITABLE_SET_FIELDS_OBJ(obj, fields_obj);
+            }
+            else {
+                val = rb_ivar_delete(fields_obj, id, undef);
+            }
         }
-        RB_VM_LOCK_LEAVE();
+        return val;
+    }
+
+    shape_id_t old_shape_id = rb_obj_shape_id(obj);
+    if (rb_shape_too_complex_p(old_shape_id)) {
+        goto too_complex;
+    }
+
+    shape_id_t removed_shape_id = 0;
+    shape_id_t next_shape_id = rb_shape_transition_remove_ivar(obj, id, &removed_shape_id);
+
+    if (next_shape_id == old_shape_id) {
+        return undef;
+    }
 
+    if (UNLIKELY(rb_shape_too_complex_p(next_shape_id))) {
+        rb_evict_fields_to_hash(obj);
+        goto too_complex;
+    }
+
+    RUBY_ASSERT(RSHAPE_LEN(next_shape_id) == RSHAPE_LEN(old_shape_id) - 1);
+
+    VALUE *fields;
+    switch(BUILTIN_TYPE(obj)) {
+      case T_CLASS:
+      case T_MODULE:
+        rb_bug("Unreachable");
+        break;
+      case T_IMEMO:
+        RUBY_ASSERT(IMEMO_TYPE_P(obj, imemo_fields));
+        fields = rb_imemo_fields_ptr(obj);
+        break;
+      case T_OBJECT:
+        fields = ROBJECT_FIELDS(obj);
         break;
       default: {
-        rb_shape_transition_shape_remove_ivar(obj, id, shape, &val);
-
+        VALUE fields_obj;
+        rb_gen_fields_tbl_get(obj, id, &fields_obj);
+        fields = rb_imemo_fields_ptr(fields_obj);
         break;
       }
     }
 
-    return val;
-}
+    RUBY_ASSERT(removed_shape_id != INVALID_SHAPE_ID);
 
-VALUE
-rb_attr_delete(VALUE obj, ID id)
-{
-    return rb_ivar_delete(obj, id, Qnil);
-}
+    attr_index_t removed_index = RSHAPE_INDEX(removed_shape_id);
+    val = fields[removed_index];
 
-static void
-generic_ivar_set(VALUE obj, ID id, VALUE val)
-{
-    struct ivar_update ivup;
+    attr_index_t new_fields_count = RSHAPE_LEN(next_shape_id);
+    if (new_fields_count) {
+        size_t trailing_fields = new_fields_count - removed_index;
 
-    attr_index_t index;
-    // The returned shape will have `id` in its iv_table
-    rb_shape_t *shape = rb_shape_get_shape(obj);
-    bool found = rb_shape_get_iv_index(shape, id, &index);
-    if (!found) {
-        index = shape->next_iv_index;
-        shape = rb_shape_get_next(shape, obj, id);
-        RUBY_ASSERT(index == (shape->next_iv_index - 1));
-    }
-
-    ivup.max_index = shape->next_iv_index;
-#if !SHAPE_IN_BASIC_FLAGS
-    ivup.shape = shape;
-#endif
+        MEMMOVE(&fields[removed_index], &fields[removed_index + 1], VALUE, trailing_fields);
+    }
+    else {
+        rb_free_generic_ivar(obj);
+    }
 
-    RB_VM_LOCK_ENTER();
+    if (RB_TYPE_P(obj, T_OBJECT) &&
+        !RB_FL_TEST_RAW(obj, ROBJECT_EMBED) &&
+        rb_obj_embedded_size(new_fields_count) <= rb_gc_obj_slot_size(obj)) {
+        // Re-embed objects when instances become small enough
+        // This is necessary because YJIT assumes that objects with the same shape
+        // have the same embeddedness for efficiency (avoid extra checks)
+        RB_FL_SET_RAW(obj, ROBJECT_EMBED);
+        MEMCPY(ROBJECT_FIELDS(obj), fields, VALUE, new_fields_count);
+        xfree(fields);
+    }
+    rb_obj_set_shape_id(obj, next_shape_id);
+
+    return val;
+
+too_complex:
     {
-        ivup.iv_index = (uint32_t)index;
+        st_table *table = NULL;
+        switch (BUILTIN_TYPE(obj)) {
+          case T_CLASS:
+          case T_MODULE:
+            rb_bug("Unreachable");
+            break;
 
-        st_update(generic_ivtbl(obj, id, false), (st_data_t)obj, generic_ivar_update, (st_data_t)&ivup);
-    }
-    RB_VM_LOCK_LEAVE();
+          case T_IMEMO:
+            RUBY_ASSERT(IMEMO_TYPE_P(obj, imemo_fields));
+            table = rb_imemo_fields_complex_tbl(obj);
+            break;
 
-    ivup.ivtbl->ivptr[ivup.iv_index] = val;
-    RB_OBJ_WRITTEN(obj, Qundef, val);
+          case T_OBJECT:
+            table = ROBJECT_FIELDS_HASH(obj);
+            break;
 
-    if (!found) {
-        rb_shape_set_shape(obj, shape);
+          default: {
+            VALUE fields_obj;
+            if (rb_gen_fields_tbl_get(obj, 0, &fields_obj)) {
+                table = rb_imemo_fields_complex_tbl(fields_obj);
+            }
+            break;
+          }
+        }
+
+        if (table) {
+            if (!st_delete(table, (st_data_t *)&id, (st_data_t *)&val)) {
+                val = undef;
+            }
+        }
     }
+
+    return val;
 }
 
-void
-rb_ensure_iv_list_size(VALUE obj, uint32_t current_capacity, uint32_t new_capacity)
+VALUE
+rb_attr_delete(VALUE obj, ID id)
 {
-    RUBY_ASSERT(!rb_shape_obj_too_complex(obj));
-
-    if (RBASIC(obj)->flags & ROBJECT_EMBED) {
-        VALUE *ptr = ROBJECT_IVPTR(obj);
-        VALUE *newptr = ALLOC_N(VALUE, new_capacity);
-        MEMCPY(newptr, ptr, VALUE, current_capacity);
-        RB_FL_UNSET_RAW(obj, ROBJECT_EMBED);
-        ROBJECT(obj)->as.heap.ivptr = newptr;
-    }
-    else {
-        REALLOC_N(ROBJECT(obj)->as.heap.ivptr, VALUE, new_capacity);
-    }
+    return rb_ivar_delete(obj, id, Qnil);
 }
 
-struct gen_ivtbl *
-rb_ensure_generic_iv_list_size(VALUE obj, rb_shape_t *shape, uint32_t newsize)
+static inline void generic_update_fields_obj(VALUE obj, VALUE fields_obj, const VALUE original_fields_obj);
+
+static shape_id_t
+obj_transition_too_complex(VALUE obj, st_table *table)
 {
-    struct gen_ivtbl * ivtbl = 0;
+    if (BUILTIN_TYPE(obj) == T_CLASS || BUILTIN_TYPE(obj) == T_MODULE) {
+        return obj_transition_too_complex(RCLASS_WRITABLE_ENSURE_FIELDS_OBJ(obj), table);
+    }
 
-    RB_VM_LOCK_ENTER();
-    {
-        if (UNLIKELY(!gen_ivtbl_get_unlocked(obj, 0, &ivtbl) || newsize > ivtbl->numiv)) {
-            struct ivar_update ivup = {
-                .iv_index = newsize - 1,
-                .max_index = newsize,
-#if !SHAPE_IN_BASIC_FLAGS
-                .shape = shape
-#endif
-            };
-            st_update(generic_ivtbl_no_ractor_check(obj), (st_data_t)obj, generic_ivar_update, (st_data_t)&ivup);
-            ivtbl = ivup.ivtbl;
-            FL_SET_RAW(obj, FL_EXIVAR);
+    RUBY_ASSERT(!rb_shape_obj_too_complex_p(obj));
+    shape_id_t shape_id = rb_shape_transition_complex(obj);
+
+    switch (BUILTIN_TYPE(obj)) {
+      case T_OBJECT:
+        {
+            VALUE *old_fields = NULL;
+            if (!(RBASIC(obj)->flags & ROBJECT_EMBED)) {
+                old_fields = ROBJECT_FIELDS(obj);
+            }
+            RBASIC_SET_SHAPE_ID(obj, shape_id);
+            ROBJECT_SET_FIELDS_HASH(obj, table);
+            if (old_fields) {
+                xfree(old_fields);
+            }
+        }
+        break;
+      case T_CLASS:
+      case T_MODULE:
+        rb_bug("Unreachable");
+        break;
+      default:
+        {
+            VALUE fields_obj = rb_imemo_fields_new_complex_tbl(rb_obj_class(obj), table);
+            RBASIC_SET_SHAPE_ID(fields_obj, shape_id);
+
+            RB_VM_LOCKING() {
+                const VALUE original_fields_obj = generic_fields_lookup(obj, 0, false);
+                generic_update_fields_obj(obj, fields_obj, original_fields_obj);
+            }
+            RBASIC_SET_SHAPE_ID(obj, shape_id);
         }
     }
-    RB_VM_LOCK_LEAVE();
 
-    RUBY_ASSERT(ivtbl);
+    return shape_id;
+}
+
+void
+rb_obj_init_too_complex(VALUE obj, st_table *table)
+{
+    // This method is meant to be called on newly allocated object.
+    RUBY_ASSERT(!rb_shape_obj_too_complex_p(obj));
+    RUBY_ASSERT(rb_shape_canonical_p(RBASIC_SHAPE_ID(obj)));
+    RUBY_ASSERT(RSHAPE_LEN(RBASIC_SHAPE_ID(obj)) == 0);
 
-    return ivtbl;
+    obj_transition_too_complex(obj, table);
 }
 
-// @note May raise when there are too many instance variables.
-rb_shape_t *
-rb_grow_iv_list(VALUE obj)
+static int
+imemo_fields_complex_from_obj_i(ID key, VALUE val, st_data_t arg)
 {
-    rb_shape_t * initial_shape = rb_shape_get_shape(obj);
-    uint32_t len = initial_shape->capacity;
-    RUBY_ASSERT(len > 0);
-    uint32_t newsize = (uint32_t)(len * 2);
+    VALUE fields = (VALUE)arg;
+    st_table *table = rb_imemo_fields_complex_tbl(fields);
+
+    RUBY_ASSERT(!st_lookup(table, (st_data_t)key, NULL));
+    st_add_direct(table, (st_data_t)key, (st_data_t)val);
+    RB_OBJ_WRITTEN(fields, Qundef, val);
+
+    return ST_CONTINUE;
+}
 
-    rb_shape_t * res = rb_shape_transition_shape_capa(initial_shape, newsize);
+static VALUE
+imemo_fields_complex_from_obj(VALUE klass, VALUE source_fields_obj, shape_id_t shape_id)
+{
+    attr_index_t len = source_fields_obj ? RSHAPE_LEN(RBASIC_SHAPE_ID(source_fields_obj)) : 0;
+    VALUE fields_obj = rb_imemo_fields_new_complex(klass, len + 1);
 
-    rb_ensure_iv_list_size(obj, len, newsize);
+    rb_field_foreach(source_fields_obj, imemo_fields_complex_from_obj_i, (st_data_t)fields_obj, false);
+    RBASIC_SET_SHAPE_ID(fields_obj, shape_id);
 
-    rb_shape_set_shape(obj, res);
+    return fields_obj;
+}
 
-    return res;
+static VALUE
+imemo_fields_copy_capa(VALUE klass, VALUE source_fields_obj, attr_index_t new_size)
+{
+    VALUE fields_obj = rb_imemo_fields_new(klass, new_size);
+    if (source_fields_obj) {
+        attr_index_t fields_count = RSHAPE_LEN(RBASIC_SHAPE_ID(source_fields_obj));
+        VALUE *fields = rb_imemo_fields_ptr(fields_obj);
+        MEMCPY(fields, rb_imemo_fields_ptr(source_fields_obj), VALUE, fields_count);
+        RBASIC_SET_SHAPE_ID(fields_obj, RBASIC_SHAPE_ID(source_fields_obj));
+        for (attr_index_t i = 0; i < fields_count; i++) {
+            RB_OBJ_WRITTEN(fields_obj, Qundef, fields[i]);
+        }
+    }
+    return fields_obj;
 }
 
-int
-rb_obj_evacuate_ivs_to_hash_table(ID key, VALUE val, st_data_t arg)
+void rb_obj_copy_fields_to_hash_table(VALUE obj, st_table *table);
+
+// Copy all object fields, including ivars and internal object_id, etc
+shape_id_t
+rb_evict_fields_to_hash(VALUE obj)
 {
-    st_insert((st_table *)arg, (st_data_t)key, (st_data_t)val);
-    return ST_CONTINUE;
+    RUBY_ASSERT(!rb_shape_obj_too_complex_p(obj));
+
+    st_table *table = st_init_numtable_with_size(RSHAPE_LEN(RBASIC_SHAPE_ID(obj)));
+    rb_obj_copy_fields_to_hash_table(obj, table);
+    shape_id_t new_shape_id = obj_transition_too_complex(obj, table);
+
+    RUBY_ASSERT(rb_shape_obj_too_complex_p(obj));
+    return new_shape_id;
 }
 
-attr_index_t
-rb_obj_ivar_set(VALUE obj, ID id, VALUE val)
+void
+rb_evict_ivars_to_hash(VALUE obj)
 {
+    RUBY_ASSERT(!rb_shape_obj_too_complex_p(obj));
+
+    st_table *table = st_init_numtable_with_size(rb_ivar_count(obj));
+
+    // Evacuate all previous values from shape into id_table
+    rb_obj_copy_ivs_to_hash_table(obj, table);
+    obj_transition_too_complex(obj, table);
+
+    RUBY_ASSERT(rb_shape_obj_too_complex_p(obj));
+}
+
+struct general_ivar_set_result {
     attr_index_t index;
+    bool existing;
+};
 
-    rb_shape_t *shape = rb_shape_get_shape(obj);
-    uint32_t num_iv = shape->capacity;
+static struct general_ivar_set_result
+general_ivar_set(VALUE obj, ID id, VALUE val, void *data,
+                 VALUE *(*shape_fields_func)(VALUE, void *),
+                 void (*shape_resize_fields_func)(VALUE, attr_index_t, attr_index_t, void *),
+                 void (*set_shape_id_func)(VALUE, shape_id_t, void *),
+                 shape_id_t (*transition_too_complex_func)(VALUE, void *),
+                 st_table *(*too_complex_table_func)(VALUE, void *))
+{
+    struct general_ivar_set_result result = {
+        .index = 0,
+        .existing = true
+    };
 
-    if (rb_shape_obj_too_complex(obj)) {
-        st_table * table = ROBJECT_IV_HASH(obj);
-        st_insert(table, (st_data_t)id, (st_data_t)val);
-        RB_OBJ_WRITTEN(obj, Qundef, val);
-        return 0;
+    shape_id_t current_shape_id = RBASIC_SHAPE_ID(obj);
+
+    if (UNLIKELY(rb_shape_too_complex_p(current_shape_id))) {
+        goto too_complex;
     }
 
-    if (!rb_shape_get_iv_index(shape, id, &index)) {
-        index = shape->next_iv_index;
-        if (index >= MAX_IVARS) {
+    attr_index_t index;
+    if (!rb_shape_get_iv_index(current_shape_id, id, &index)) {
+        result.existing = false;
+
+        index = RSHAPE_LEN(current_shape_id);
+        if (index >= SHAPE_MAX_FIELDS) {
             rb_raise(rb_eArgError, "too many instance variables");
         }
 
-        RUBY_ASSERT(!rb_shape_obj_too_complex(obj));
+        shape_id_t next_shape_id = rb_shape_transition_add_ivar(obj, id);
+        if (UNLIKELY(rb_shape_too_complex_p(next_shape_id))) {
+            current_shape_id = transition_too_complex_func(obj, data);
+            goto too_complex;
+        }
+        else if (UNLIKELY(RSHAPE_CAPACITY(next_shape_id) != RSHAPE_CAPACITY(current_shape_id))) {
+            RUBY_ASSERT(RSHAPE_CAPACITY(next_shape_id) > RSHAPE_CAPACITY(current_shape_id));
+            shape_resize_fields_func(obj, RSHAPE_CAPACITY(current_shape_id), RSHAPE_CAPACITY(next_shape_id), data);
+        }
+
+        RUBY_ASSERT(RSHAPE_TYPE_P(next_shape_id, SHAPE_IVAR));
+        RUBY_ASSERT(index == (RSHAPE_INDEX(next_shape_id)));
+        set_shape_id_func(obj, next_shape_id, data);
+    }
+
+    VALUE *table = shape_fields_func(obj, data);
+    RB_OBJ_WRITE(obj, &table[index], val);
 
-        if (UNLIKELY(shape->next_iv_index >= num_iv)) {
-            RUBY_ASSERT(shape->next_iv_index == num_iv);
+    result.index = index;
+    return result;
 
-            shape = rb_grow_iv_list(obj);
-            RUBY_ASSERT(shape->type == SHAPE_CAPACITY_CHANGE);
+too_complex:
+    {
+        RUBY_ASSERT(rb_shape_obj_too_complex_p(obj));
+
+        st_table *table = too_complex_table_func(obj, data);
+        result.existing = st_insert(table, (st_data_t)id, (st_data_t)val);
+        result.index = 0;
+        RB_OBJ_WRITTEN(obj, Qundef, val);
+    }
+    return result;
+}
+
+static void
+general_field_set(VALUE obj, shape_id_t target_shape_id, VALUE val, void *data,
+                  VALUE *(*shape_fields_func)(VALUE, void *),
+                  void (*shape_resize_fields_func)(VALUE, attr_index_t, attr_index_t, void *),
+                  void (*set_shape_id_func)(VALUE, shape_id_t, void *),
+                  shape_id_t (*transition_too_complex_func)(VALUE, void *),
+                  st_table *(*too_complex_table_func)(VALUE, void *))
+{
+    shape_id_t current_shape_id = RBASIC_SHAPE_ID(obj);
+
+    if (UNLIKELY(rb_shape_too_complex_p(target_shape_id))) {
+        if (UNLIKELY(!rb_shape_too_complex_p(current_shape_id))) {
+            current_shape_id = transition_too_complex_func(obj, data);
         }
 
-        rb_shape_t *next_shape = rb_shape_get_next(shape, obj, id);
+        st_table *table = too_complex_table_func(obj, data);
 
-        if (next_shape->type == SHAPE_OBJ_TOO_COMPLEX) {
-            st_table * table = st_init_numtable_with_size(shape->next_iv_index);
+        if (RSHAPE_LEN(target_shape_id) > RSHAPE_LEN(current_shape_id)) {
+            RBASIC_SET_SHAPE_ID(obj, target_shape_id);
+        }
 
-            // Evacuate all previous values from shape into id_table
-            rb_ivar_foreach(obj, rb_obj_evacuate_ivs_to_hash_table, (st_data_t)table);
+        RUBY_ASSERT(RSHAPE_EDGE_NAME(target_shape_id));
+        st_insert(table, (st_data_t)RSHAPE_EDGE_NAME(target_shape_id), (st_data_t)val);
+        RB_OBJ_WRITTEN(obj, Qundef, val);
+    }
+    else {
+        attr_index_t index = RSHAPE_INDEX(target_shape_id);
+        if (index >= RSHAPE_CAPACITY(current_shape_id)) {
+            shape_resize_fields_func(obj, RSHAPE_CAPACITY(current_shape_id), RSHAPE_CAPACITY(target_shape_id), data);
+        }
 
-            // Insert new value too
-            st_insert(table, (st_data_t)id, (st_data_t)val);
-            RB_OBJ_WRITTEN(obj, Qundef, val);
+        if (RSHAPE_LEN(target_shape_id) > RSHAPE_LEN(current_shape_id)) {
+            set_shape_id_func(obj, target_shape_id, data);
+        }
 
-            rb_shape_set_too_complex(obj);
-            RUBY_ASSERT(rb_shape_obj_too_complex(obj));
+        VALUE *table = shape_fields_func(obj, data);
+        RB_OBJ_WRITE(obj, &table[index], val);
+    }
+}
 
-            if (!(RBASIC(obj)->flags & ROBJECT_EMBED)) {
-                xfree(ROBJECT(obj)->as.heap.ivptr);
-            }
+static inline void
+generic_update_fields_obj(VALUE obj, VALUE fields_obj, const VALUE original_fields_obj)
+{
+    if (fields_obj != original_fields_obj) {
+        if (original_fields_obj) {
+            // Clear root shape to avoid triggering cleanup such as free_object_id.
+            rb_imemo_fields_clear(original_fields_obj);
+        }
 
-            ROBJECT(obj)->as.heap.ivptr = (VALUE *)table;
+        generic_fields_insert(obj, fields_obj);
+    }
+}
 
-            return 0;
+static VALUE
+imemo_fields_set(VALUE klass, VALUE fields_obj, shape_id_t target_shape_id, ID field_name, VALUE val, bool concurrent)
+{
+    const VALUE original_fields_obj = fields_obj;
+    shape_id_t current_shape_id = fields_obj ? RBASIC_SHAPE_ID(fields_obj) : ROOT_SHAPE_ID;
+
+    if (UNLIKELY(rb_shape_too_complex_p(target_shape_id))) {
+        if (rb_shape_too_complex_p(current_shape_id)) {
+            if (concurrent) {
+                // In multi-ractor case, we must always work on a copy because
+                // even if the field already exist, inserting in a st_table may
+                // cause a rebuild.
+                fields_obj = rb_imemo_fields_clone(fields_obj);
+            }
         }
         else {
-            rb_shape_set_shape(obj, next_shape);
-            RUBY_ASSERT(next_shape->type == SHAPE_IVAR);
-            RUBY_ASSERT(index == (next_shape->next_iv_index - 1));
+            fields_obj = imemo_fields_complex_from_obj(klass, original_fields_obj, target_shape_id);
+            current_shape_id = target_shape_id;
         }
+
+        st_table *table = rb_imemo_fields_complex_tbl(fields_obj);
+
+        RUBY_ASSERT(field_name);
+        st_insert(table, (st_data_t)field_name, (st_data_t)val);
+        RB_OBJ_WRITTEN(fields_obj, Qundef, val);
+        RBASIC_SET_SHAPE_ID(fields_obj, target_shape_id);
     }
+    else {
+        attr_index_t index = RSHAPE_INDEX(target_shape_id);
+        if (concurrent || index >= RSHAPE_CAPACITY(current_shape_id)) {
+            fields_obj = imemo_fields_copy_capa(klass, original_fields_obj, RSHAPE_CAPACITY(target_shape_id));
+        }
+
+        VALUE *table = rb_imemo_fields_ptr(fields_obj);
+        RB_OBJ_WRITE(fields_obj, &table[index], val);
 
-    RUBY_ASSERT(!rb_shape_obj_too_complex(obj));
-    RB_OBJ_WRITE(obj, &ROBJECT_IVPTR(obj)[index], val);
+        if (RSHAPE_LEN(target_shape_id) > RSHAPE_LEN(current_shape_id)) {
+            RBASIC_SET_SHAPE_ID(fields_obj, target_shape_id);
+        }
+    }
 
-    return index;
+    return fields_obj;
+}
+
+static void
+generic_field_set(VALUE obj, shape_id_t target_shape_id, ID field_name, VALUE val)
+{
+    if (!field_name) {
+        field_name = RSHAPE_EDGE_NAME(target_shape_id);
+        RUBY_ASSERT(field_name);
+    }
+
+    const VALUE original_fields_obj = generic_fields_lookup(obj, field_name, false);
+    VALUE fields_obj = imemo_fields_set(rb_obj_class(obj), original_fields_obj, target_shape_id, field_name, val, false);
+
+    generic_update_fields_obj(obj, fields_obj, original_fields_obj);
+
+    if (RBASIC_SHAPE_ID(fields_obj) == target_shape_id) {
+        RBASIC_SET_SHAPE_ID(obj, target_shape_id);
+    }
+
+    RUBY_ASSERT(RBASIC_SHAPE_ID(obj) == RBASIC_SHAPE_ID(fields_obj));
+}
+
+static shape_id_t
+generic_shape_ivar(VALUE obj, ID id, bool *new_ivar_out)
+{
+    bool new_ivar = false;
+    shape_id_t current_shape_id = RBASIC_SHAPE_ID(obj);
+    shape_id_t target_shape_id = current_shape_id;
+
+    if (!rb_shape_too_complex_p(current_shape_id)) {
+        if (!rb_shape_find_ivar(current_shape_id, id, &target_shape_id)) {
+            if (RSHAPE_LEN(current_shape_id) >= SHAPE_MAX_FIELDS) {
+                rb_raise(rb_eArgError, "too many instance variables");
+            }
+
+            new_ivar = true;
+            target_shape_id = rb_shape_transition_add_ivar(obj, id);
+        }
+    }
+
+    *new_ivar_out = new_ivar;
+    return target_shape_id;
+}
+
+static void
+generic_ivar_set(VALUE obj, ID id, VALUE val)
+{
+    bool dontcare;
+    shape_id_t target_shape_id = generic_shape_ivar(obj, id, &dontcare);
+    generic_field_set(obj, target_shape_id, id, val);
+}
+
+void
+rb_ensure_iv_list_size(VALUE obj, uint32_t current_len, uint32_t new_capacity)
+{
+    RUBY_ASSERT(!rb_shape_obj_too_complex_p(obj));
+
+    if (RBASIC(obj)->flags & ROBJECT_EMBED) {
+        VALUE *ptr = ROBJECT_FIELDS(obj);
+        VALUE *newptr = ALLOC_N(VALUE, new_capacity);
+        MEMCPY(newptr, ptr, VALUE, current_len);
+        RB_FL_UNSET_RAW(obj, ROBJECT_EMBED);
+        ROBJECT(obj)->as.heap.fields = newptr;
+    }
+    else {
+        REALLOC_N(ROBJECT(obj)->as.heap.fields, VALUE, new_capacity);
+    }
+}
+
+static int
+rb_obj_copy_ivs_to_hash_table_i(ID key, VALUE val, st_data_t arg)
+{
+    RUBY_ASSERT(!st_lookup((st_table *)arg, (st_data_t)key, NULL));
+
+    st_add_direct((st_table *)arg, (st_data_t)key, (st_data_t)val);
+    return ST_CONTINUE;
+}
+
+void
+rb_obj_copy_ivs_to_hash_table(VALUE obj, st_table *table)
+{
+    rb_ivar_foreach(obj, rb_obj_copy_ivs_to_hash_table_i, (st_data_t)table);
+}
+
+void
+rb_obj_copy_fields_to_hash_table(VALUE obj, st_table *table)
+{
+    rb_field_foreach(obj, rb_obj_copy_ivs_to_hash_table_i, (st_data_t)table, false);
+}
+
+static VALUE *
+obj_ivar_set_shape_fields(VALUE obj, void *_data)
+{
+    RUBY_ASSERT(!rb_shape_obj_too_complex_p(obj));
+
+    return ROBJECT_FIELDS(obj);
+}
+
+static void
+obj_ivar_set_shape_resize_fields(VALUE obj, attr_index_t old_capa, attr_index_t new_capa, void *_data)
+{
+    rb_ensure_iv_list_size(obj, old_capa, new_capa);
+}
+
+static void
+obj_ivar_set_set_shape_id(VALUE obj, shape_id_t shape_id, void *_data)
+{
+    rb_obj_set_shape_id(obj, shape_id);
+}
+
+static shape_id_t
+obj_ivar_set_transition_too_complex(VALUE obj, void *_data)
+{
+    return rb_evict_fields_to_hash(obj);
+}
+
+static st_table *
+obj_ivar_set_too_complex_table(VALUE obj, void *_data)
+{
+    RUBY_ASSERT(rb_shape_obj_too_complex_p(obj));
+
+    return ROBJECT_FIELDS_HASH(obj);
+}
+
+attr_index_t
+rb_obj_ivar_set(VALUE obj, ID id, VALUE val)
+{
+    return general_ivar_set(obj, id, val, NULL,
+                            obj_ivar_set_shape_fields,
+                            obj_ivar_set_shape_resize_fields,
+                            obj_ivar_set_set_shape_id,
+                            obj_ivar_set_transition_too_complex,
+                            obj_ivar_set_too_complex_table).index;
+}
+
+static void
+obj_field_set(VALUE obj, shape_id_t target_shape_id, VALUE val)
+{
+    general_field_set(obj, target_shape_id, val, NULL,
+                      obj_ivar_set_shape_fields,
+                      obj_ivar_set_shape_resize_fields,
+                      obj_ivar_set_set_shape_id,
+                      obj_ivar_set_transition_too_complex,
+                      obj_ivar_set_too_complex_table);
 }
 
 /* Set the instance variable +val+ on object +obj+ at ivar name +id+.
@@ -1537,65 +2034,34 @@ rb_obj_ivar_set(VALUE obj, ID id, VALUE val)
 VALUE
 rb_vm_set_ivar_id(VALUE obj, ID id, VALUE val)
 {
-    rb_check_frozen_internal(obj);
+    rb_check_frozen(obj);
     rb_obj_ivar_set(obj, id, val);
     return val;
 }
 
 bool
-rb_shape_set_shape_id(VALUE obj, shape_id_t shape_id)
+rb_obj_set_shape_id(VALUE obj, shape_id_t shape_id)
 {
-    if (rb_shape_get_shape_id(obj) == shape_id) {
+    shape_id_t old_shape_id = rb_obj_shape_id(obj);
+    if (old_shape_id == shape_id) {
         return false;
     }
 
-#if SHAPE_IN_BASIC_FLAGS
-    RBASIC_SET_SHAPE_ID(obj, shape_id);
-#else
-    switch (BUILTIN_TYPE(obj)) {
-      case T_OBJECT:
-        ROBJECT_SET_SHAPE_ID(obj, shape_id);
-        break;
-      case T_CLASS:
-      case T_MODULE:
-        RCLASS_SET_SHAPE_ID(obj, shape_id);
-        break;
-      default:
-        if (shape_id != SPECIAL_CONST_SHAPE_ID) {
-            struct gen_ivtbl *ivtbl = 0;
-            RB_VM_LOCK_ENTER();
-            {
-                st_table* global_iv_table = generic_ivtbl(obj, 0, false);
-
-                if (st_lookup(global_iv_table, obj, (st_data_t *)&ivtbl)) {
-                    ivtbl->shape_id = shape_id;
-                }
-                else {
-                    rb_bug("Expected shape_id entry in global iv table");
-                }
-            }
-            RB_VM_LOCK_LEAVE();
-        }
-    }
-#endif
-
+    RB_SET_SHAPE_ID(obj, shape_id);
     return true;
 }
 
-/**
- * Prevents further modifications to the given object.  ::rb_eFrozenError shall
- * be raised if modification is attempted.
- *
- * @param[out]  x  Object in question.
- */
 void rb_obj_freeze_inline(VALUE x)
 {
     if (RB_FL_ABLE(x)) {
-        RB_OBJ_FREEZE_RAW(x);
+        RB_FL_SET_RAW(x, RUBY_FL_FREEZE);
+        if (TYPE(x) == T_STRING) {
+            RB_FL_UNSET_RAW(x, FL_USER2 | FL_USER3); // STR_CHILLED
+        }
 
-        rb_shape_transition_shape_frozen(x);
+        RB_SET_SHAPE_ID(x, rb_shape_transition_frozen(x));
 
-        if (RBASIC_CLASS(x) && !(RBASIC(x)->flags & RUBY_FL_SINGLETON)) {
+        if (RBASIC_CLASS(x)) {
             rb_freeze_singleton_class(x);
         }
     }
@@ -1609,8 +2075,8 @@ ivar_set(VALUE obj, ID id, VALUE val)
     switch (BUILTIN_TYPE(obj)) {
       case T_OBJECT:
       {
-          rb_obj_ivar_set(obj, id, val);
-          break;
+        rb_obj_ivar_set(obj, id, val);
+        break;
       }
       case T_CLASS:
       case T_MODULE:
@@ -1641,84 +2107,134 @@ rb_ivar_set_internal(VALUE obj, ID id, VALUE val)
     ivar_set(obj, id, val);
 }
 
-VALUE
-rb_ivar_defined(VALUE obj, ID id)
+void
+rb_obj_field_set(VALUE obj, shape_id_t target_shape_id, ID field_name, VALUE val)
+{
+    switch (BUILTIN_TYPE(obj)) {
+      case T_OBJECT:
+        obj_field_set(obj, target_shape_id, val);
+        break;
+      case T_CLASS:
+      case T_MODULE:
+        // The only field is object_id and T_CLASS handle it differently.
+        rb_bug("Unreachable");
+        break;
+      default:
+        generic_field_set(obj, target_shape_id, field_name, val);
+        break;
+    }
+}
+
+static VALUE
+ivar_defined0(VALUE obj, ID id)
 {
     attr_index_t index;
 
-    if (SPECIAL_CONST_P(obj)) return Qfalse;
-    if (rb_shape_obj_too_complex(obj)) {
+    if (rb_shape_obj_too_complex_p(obj)) {
         VALUE idx;
-        if (!rb_st_lookup(ROBJECT_IV_HASH(obj), id, &idx)) {
+        st_table *table = NULL;
+        switch (BUILTIN_TYPE(obj)) {
+          case T_CLASS:
+          case T_MODULE:
+            rb_bug("Unreachable");
+            break;
+
+          case T_IMEMO:
+            RUBY_ASSERT(IMEMO_TYPE_P(obj, imemo_fields));
+            table = rb_imemo_fields_complex_tbl(obj);
+            break;
+
+          case T_OBJECT:
+            table = ROBJECT_FIELDS_HASH(obj);
+            break;
+
+          default: {
+            VALUE fields_obj;
+            if (rb_gen_fields_tbl_get(obj, 0, &fields_obj)) {
+                table = rb_imemo_fields_complex_tbl(fields_obj);
+            }
+          }
+        }
+
+        if (!table || !rb_st_lookup(table, id, &idx)) {
             return Qfalse;
         }
 
         return Qtrue;
     }
     else {
-        return RBOOL(rb_shape_get_iv_index(rb_shape_get_shape(obj), id, &index));
+        return RBOOL(rb_shape_get_iv_index(RBASIC_SHAPE_ID(obj), id, &index));
+    }
+}
+
+VALUE
+rb_ivar_defined(VALUE obj, ID id)
+{
+    if (SPECIAL_CONST_P(obj)) return Qfalse;
+
+    VALUE defined = Qfalse;
+    switch (BUILTIN_TYPE(obj)) {
+      case T_CLASS:
+      case T_MODULE:
+        {
+            VALUE fields_obj = RCLASS_WRITABLE_FIELDS_OBJ(obj);
+            if (fields_obj) {
+                defined = ivar_defined0(fields_obj, id);
+            }
+        }
+        break;
+      default:
+        defined = ivar_defined0(obj, id);
+        break;
     }
+    return defined;
 }
 
-typedef int rb_ivar_foreach_callback_func(ID key, VALUE val, st_data_t arg);
-st_data_t rb_st_nth_key(st_table *tab, st_index_t index);
-
 struct iv_itr_data {
     VALUE obj;
-    struct gen_ivtbl * ivtbl;
+    struct gen_fields_tbl *fields_tbl;
     st_data_t arg;
     rb_ivar_foreach_callback_func *func;
+    VALUE *fields;
+    bool ivar_only;
 };
 
-/*
- * Returns a flag to stop iterating depending on the result of +callback+.
- */
-static bool
-iterate_over_shapes_with_callback(rb_shape_t *shape, rb_ivar_foreach_callback_func *callback, struct iv_itr_data * itr_data)
+static int
+iterate_over_shapes_callback(shape_id_t shape_id, void *data)
 {
-    switch ((enum shape_type)shape->type) {
-      case SHAPE_ROOT:
-        return false;
-      case SHAPE_IVAR:
-        ASSUME(callback);
-        if (iterate_over_shapes_with_callback(rb_shape_get_parent(shape), callback, itr_data))
-            return true;
-        VALUE * iv_list;
-        switch (BUILTIN_TYPE(itr_data->obj)) {
-          case T_OBJECT:
-            RUBY_ASSERT(!rb_shape_obj_too_complex(itr_data->obj));
-            iv_list = ROBJECT_IVPTR(itr_data->obj);
-            break;
-          case T_CLASS:
-          case T_MODULE:
-            iv_list = RCLASS_IVPTR(itr_data->obj);
-            break;
-          default:
-            iv_list = itr_data->ivtbl->ivptr;
-            break;
-        }
-        VALUE val = iv_list[shape->next_iv_index - 1];
-        if (!UNDEF_P(val)) {
-            switch (callback(shape->edge_name, val, itr_data->arg)) {
-              case ST_CHECK:
-              case ST_CONTINUE:
-                break;
-              case ST_STOP:
-                return true;
-              default:
-                rb_bug("unreachable");
-            }
-        }
-        return false;
-      case SHAPE_INITIAL_CAPACITY:
-      case SHAPE_CAPACITY_CHANGE:
-      case SHAPE_FROZEN:
-      case SHAPE_T_OBJECT:
-        return iterate_over_shapes_with_callback(rb_shape_get_parent(shape), callback, itr_data);
-      case SHAPE_OBJ_TOO_COMPLEX:
+    struct iv_itr_data *itr_data = data;
+
+    if (itr_data->ivar_only && !RSHAPE_TYPE_P(shape_id, SHAPE_IVAR)) {
+        return ST_CONTINUE;
+    }
+
+    VALUE *fields;
+    switch (BUILTIN_TYPE(itr_data->obj)) {
+      case T_OBJECT:
+        RUBY_ASSERT(!rb_shape_obj_too_complex_p(itr_data->obj));
+        fields = ROBJECT_FIELDS(itr_data->obj);
+        break;
+      case T_IMEMO:
+        RUBY_ASSERT(IMEMO_TYPE_P(itr_data->obj, imemo_fields));
+        RUBY_ASSERT(!rb_shape_obj_too_complex_p(itr_data->obj));
+
+        fields = rb_imemo_fields_ptr(itr_data->obj);
+        break;
       default:
         rb_bug("Unreachable");
     }
+
+    VALUE val = fields[RSHAPE_INDEX(shape_id)];
+    return itr_data->func(RSHAPE_EDGE_NAME(shape_id), val, itr_data->arg);
+}
+
+/*
+ * Returns a flag to stop iterating depending on the result of +callback+.
+ */
+static void
+iterate_over_shapes(shape_id_t shape_id, rb_ivar_foreach_callback_func *callback, struct iv_itr_data *itr_data)
+{
+    rb_shape_foreach_field(shape_id, iterate_over_shapes_callback, itr_data);
 }
 
 static int
@@ -1730,204 +2246,232 @@ each_hash_iv(st_data_t id, st_data_t val, st_data_t data)
 }
 
 static void
-obj_ivar_each(VALUE obj, rb_ivar_foreach_callback_func *func, st_data_t arg)
+obj_fields_each(VALUE obj, rb_ivar_foreach_callback_func *func, st_data_t arg, bool ivar_only)
 {
-    rb_shape_t* shape = rb_shape_get_shape(obj);
-    struct iv_itr_data itr_data;
-    itr_data.obj = obj;
-    itr_data.arg = arg;
-    itr_data.func = func;
-    if (rb_shape_obj_too_complex(obj)) {
-        rb_st_foreach(ROBJECT_IV_HASH(obj), each_hash_iv, (st_data_t)&itr_data);
+    struct iv_itr_data itr_data = {
+        .obj = obj,
+        .arg = arg,
+        .func = func,
+        .ivar_only = ivar_only,
+    };
+
+    shape_id_t shape_id = RBASIC_SHAPE_ID(obj);
+    if (rb_shape_too_complex_p(shape_id)) {
+        rb_st_foreach(ROBJECT_FIELDS_HASH(obj), each_hash_iv, (st_data_t)&itr_data);
     }
     else {
-        iterate_over_shapes_with_callback(shape, func, &itr_data);
+        itr_data.fields = ROBJECT_FIELDS(obj);
+        iterate_over_shapes(shape_id, func, &itr_data);
     }
 }
 
 static void
-gen_ivar_each(VALUE obj, rb_ivar_foreach_callback_func *func, st_data_t arg)
+imemo_fields_each(VALUE fields_obj, rb_ivar_foreach_callback_func *func, st_data_t arg, bool ivar_only)
 {
-    rb_shape_t *shape = rb_shape_get_shape(obj);
-    struct gen_ivtbl *ivtbl;
-    if (!rb_gen_ivtbl_get(obj, 0, &ivtbl)) return;
-
-    struct iv_itr_data itr_data;
-    itr_data.obj = obj;
-    itr_data.ivtbl = ivtbl;
-    itr_data.arg = arg;
-    iterate_over_shapes_with_callback(shape, func, &itr_data);
-}
+    IMEMO_TYPE_P(fields_obj, imemo_fields);
 
-static void
-class_ivar_each(VALUE obj, rb_ivar_foreach_callback_func *func, st_data_t arg)
-{
-    RUBY_ASSERT(RB_TYPE_P(obj, T_CLASS) || RB_TYPE_P(obj, T_MODULE));
+    struct iv_itr_data itr_data = {
+        .obj = fields_obj,
+        .arg = arg,
+        .func = func,
+        .ivar_only = ivar_only,
+    };
 
-    rb_shape_t* shape = rb_shape_get_shape(obj);
-    struct iv_itr_data itr_data;
-    itr_data.obj = obj;
-    itr_data.arg = arg;
-    iterate_over_shapes_with_callback(shape, func, &itr_data);
+    shape_id_t shape_id = RBASIC_SHAPE_ID(fields_obj);
+    if (rb_shape_too_complex_p(shape_id)) {
+        rb_st_foreach(rb_imemo_fields_complex_tbl(fields_obj), each_hash_iv, (st_data_t)&itr_data);
+    }
+    else {
+        itr_data.fields = rb_imemo_fields_ptr(fields_obj);
+        iterate_over_shapes(shape_id, func, &itr_data);
+    }
 }
 
 void
-rb_copy_generic_ivar(VALUE clone, VALUE obj)
+rb_copy_generic_ivar(VALUE dest, VALUE obj)
 {
-    struct gen_ivtbl *obj_ivtbl;
-    struct gen_ivtbl *new_ivtbl;
+    VALUE fields_obj;
+    VALUE new_fields_obj;
 
-    rb_check_frozen(clone);
+    rb_check_frozen(dest);
 
-    if (!FL_TEST(obj, FL_EXIVAR)) {
-        goto clear;
+    if (!rb_obj_exivar_p(obj)) {
+        return;
     }
 
-    if (rb_gen_ivtbl_get(obj, 0, &obj_ivtbl)) {
-        if (gen_ivtbl_count(obj_ivtbl) == 0)
-            goto clear;
+    shape_id_t src_shape_id = rb_obj_shape_id(obj);
 
-        new_ivtbl = gen_ivtbl_resize(0, obj_ivtbl->numiv);
-        FL_SET(clone, FL_EXIVAR);
+    if (rb_gen_fields_tbl_get(obj, 0, &fields_obj)) {
+        unsigned long src_num_ivs = rb_ivar_count(fields_obj);
+        if (!src_num_ivs) {
+            goto clear;
+        }
 
-        for (uint32_t i=0; i<obj_ivtbl->numiv; i++) {
-            new_ivtbl->ivptr[i] = obj_ivtbl->ivptr[i];
-            RB_OBJ_WRITTEN(clone, Qundef, &new_ivtbl[i]);
+        if (rb_shape_too_complex_p(src_shape_id)) {
+            rb_shape_copy_complex_ivars(dest, obj, src_shape_id, rb_imemo_fields_complex_tbl(fields_obj));
+            return;
         }
 
-        /*
-         * c.ivtbl may change in gen_ivar_copy due to realloc,
-         * no need to free
-         */
-        RB_VM_LOCK_ENTER();
-        {
-            generic_ivtbl_no_ractor_check(clone);
-            st_insert(generic_ivtbl_no_ractor_check(obj), (st_data_t)clone, (st_data_t)new_ivtbl);
+        shape_id_t dest_shape_id = src_shape_id;
+        shape_id_t initial_shape_id = rb_obj_shape_id(dest);
+
+        if (!rb_shape_canonical_p(src_shape_id)) {
+            RUBY_ASSERT(RSHAPE_TYPE_P(initial_shape_id, SHAPE_ROOT));
+
+            dest_shape_id = rb_shape_rebuild(initial_shape_id, src_shape_id);
+            if (UNLIKELY(rb_shape_too_complex_p(dest_shape_id))) {
+                st_table *table = rb_st_init_numtable_with_size(src_num_ivs);
+                rb_obj_copy_ivs_to_hash_table(obj, table);
+                rb_obj_init_too_complex(dest, table);
+                return;
+            }
         }
-        RB_VM_LOCK_LEAVE();
 
-        rb_shape_t * obj_shape = rb_shape_get_shape(obj);
-        if (rb_shape_frozen_shape_p(obj_shape)) {
-            rb_shape_set_shape_id(clone, obj_shape->parent_id);
+        if (!RSHAPE_LEN(dest_shape_id)) {
+            rb_obj_set_shape_id(dest, dest_shape_id);
+            return;
         }
-        else {
-            rb_shape_set_shape(clone, obj_shape);
+
+        new_fields_obj = rb_imemo_fields_new(rb_obj_class(dest), RSHAPE_CAPACITY(dest_shape_id));
+        VALUE *src_buf = rb_imemo_fields_ptr(fields_obj);
+        VALUE *dest_buf = rb_imemo_fields_ptr(new_fields_obj);
+        rb_shape_copy_fields(new_fields_obj, dest_buf, dest_shape_id, src_buf, src_shape_id);
+        RBASIC_SET_SHAPE_ID(new_fields_obj, dest_shape_id);
+
+        RB_VM_LOCKING() {
+            generic_fields_tbl_no_ractor_check(dest);
+            st_insert(generic_fields_tbl_no_ractor_check(obj), (st_data_t)dest, (st_data_t)new_fields_obj);
+            RB_OBJ_WRITTEN(dest, Qundef, new_fields_obj);
         }
+
+        RBASIC_SET_SHAPE_ID(dest, dest_shape_id);
     }
     return;
 
   clear:
-    if (FL_TEST(clone, FL_EXIVAR)) {
-        rb_free_generic_ivar(clone);
-        FL_UNSET(clone, FL_EXIVAR);
-    }
+    rb_free_generic_ivar(dest);
 }
 
 void
 rb_replace_generic_ivar(VALUE clone, VALUE obj)
 {
-    RUBY_ASSERT(FL_TEST(obj, FL_EXIVAR));
-
-    RB_VM_LOCK_ENTER();
-    {
-        st_data_t ivtbl, obj_data = (st_data_t)obj;
-        if (st_lookup(generic_iv_tbl_, (st_data_t)obj, &ivtbl)) {
-            st_insert(generic_iv_tbl_, (st_data_t)clone, ivtbl);
-            st_delete(generic_iv_tbl_, &obj_data, NULL);
+    RB_VM_LOCKING() {
+        st_data_t fields_tbl, obj_data = (st_data_t)obj;
+        if (st_delete(generic_fields_tbl_, &obj_data, &fields_tbl)) {
+            st_insert(generic_fields_tbl_, (st_data_t)clone, fields_tbl);
+            RB_OBJ_WRITTEN(clone, Qundef, fields_tbl);
         }
         else {
             rb_bug("unreachable");
         }
     }
-    RB_VM_LOCK_LEAVE();
-
-    FL_SET(clone, FL_EXIVAR);
 }
 
 void
-rb_ivar_foreach(VALUE obj, rb_ivar_foreach_callback_func *func, st_data_t arg)
+rb_field_foreach(VALUE obj, rb_ivar_foreach_callback_func *func, st_data_t arg, bool ivar_only)
 {
     if (SPECIAL_CONST_P(obj)) return;
     switch (BUILTIN_TYPE(obj)) {
+      case T_IMEMO:
+        if (IMEMO_TYPE_P(obj, imemo_fields)) {
+            imemo_fields_each(obj, func, arg, ivar_only);
+        }
+        break;
       case T_OBJECT:
-        obj_ivar_each(obj, func, arg);
+        obj_fields_each(obj, func, arg, ivar_only);
         break;
       case T_CLASS:
       case T_MODULE:
-        IVAR_ACCESSOR_SHOULD_BE_MAIN_RACTOR(0);
-        RB_VM_LOCK_ENTER();
         {
-            class_ivar_each(obj, func, arg);
+            IVAR_ACCESSOR_SHOULD_BE_MAIN_RACTOR(0);
+            VALUE fields_obj = RCLASS_WRITABLE_FIELDS_OBJ(obj);
+            if (fields_obj) {
+                imemo_fields_each(fields_obj, func, arg, ivar_only);
+            }
         }
-        RB_VM_LOCK_LEAVE();
         break;
       default:
-        if (FL_TEST(obj, FL_EXIVAR)) {
-            gen_ivar_each(obj, func, arg);
+        if (rb_obj_exivar_p(obj)) {
+            VALUE fields_obj = 0;
+            if (!rb_gen_fields_tbl_get(obj, 0, &fields_obj)) return;
+
+            imemo_fields_each(fields_obj, func, arg, ivar_only);
         }
         break;
     }
 }
 
+void
+rb_ivar_foreach(VALUE obj, rb_ivar_foreach_callback_func *func, st_data_t arg)
+{
+    rb_field_foreach(obj, func, arg, true);
+}
+
 st_index_t
 rb_ivar_count(VALUE obj)
 {
     if (SPECIAL_CONST_P(obj)) return 0;
 
+    st_index_t iv_count = 0;
     switch (BUILTIN_TYPE(obj)) {
       case T_OBJECT:
-        if (rb_shape_obj_too_complex(obj)) {
-            return ROBJECT_IV_COUNT(obj);
-        }
-
-        if (rb_shape_get_shape(obj)->next_iv_index > 0) {
-            st_index_t i, count, num = ROBJECT_IV_COUNT(obj);
-            const VALUE *const ivptr = ROBJECT_IVPTR(obj);
-            for (i = count = 0; i < num; ++i) {
-                if (!UNDEF_P(ivptr[i])) {
-                    count++;
-                }
-            }
-            return count;
-        }
+        iv_count = ROBJECT_FIELDS_COUNT(obj);
         break;
+
       case T_CLASS:
       case T_MODULE:
-        if (rb_shape_get_shape(obj)->next_iv_index > 0) {
-            st_index_t count = 0;
-
-            RB_VM_LOCK_ENTER();
-            {
-                st_index_t i, num = rb_shape_get_shape(obj)->next_iv_index;
-                const VALUE *const ivptr = RCLASS_IVPTR(obj);
-                for (i = count = 0; i < num; ++i) {
-                    if (!UNDEF_P(ivptr[i])) {
-                        count++;
-                    }
-                }
+        {
+            VALUE fields_obj = RCLASS_WRITABLE_FIELDS_OBJ(obj);
+            if (!fields_obj) {
+                return 0;
+            }
+            if (rb_shape_obj_too_complex_p(fields_obj)) {
+                iv_count = rb_st_table_size(rb_imemo_fields_complex_tbl(fields_obj));
+            }
+            else {
+                iv_count = RBASIC_FIELDS_COUNT(fields_obj);
             }
-            RB_VM_LOCK_LEAVE();
+        }
+        break;
+
+      case T_IMEMO:
+        RUBY_ASSERT(IMEMO_TYPE_P(obj, imemo_fields));
 
-            return count;
+        if (rb_shape_obj_too_complex_p(obj)) {
+            iv_count = rb_st_table_size(rb_imemo_fields_complex_tbl(obj));
+        }
+        else {
+            iv_count = RBASIC_FIELDS_COUNT(obj);
         }
         break;
+
       default:
-        if (FL_TEST(obj, FL_EXIVAR)) {
-            struct gen_ivtbl *ivtbl;
+        if (rb_obj_exivar_p(obj)) {
+
+            if (rb_shape_obj_too_complex_p(obj)) {
+                VALUE fields_obj;
 
-            if (rb_gen_ivtbl_get(obj, 0, &ivtbl)) {
-                return gen_ivtbl_count(ivtbl);
+                if (rb_gen_fields_tbl_get(obj, 0, &fields_obj)) {
+                    iv_count = rb_st_table_size(rb_imemo_fields_complex_tbl(fields_obj));
+                }
+            }
+            else {
+                iv_count = RBASIC_FIELDS_COUNT(obj);
             }
         }
         break;
     }
-    return 0;
+
+    if (rb_shape_obj_has_id(obj)) {
+        iv_count--;
+    }
+
+    return iv_count;
 }
 
 static int
-ivar_i(st_data_t k, st_data_t v, st_data_t a)
+ivar_i(ID key, VALUE v, st_data_t a)
 {
-    ID key = (ID)k;
     VALUE ary = (VALUE)a;
 
     if (rb_is_instance_id(key)) {
@@ -1966,7 +2510,7 @@ rb_obj_instance_variables(VALUE obj)
 #define rb_is_constant_id rb_is_const_id
 #define rb_is_constant_name rb_is_const_name
 #define id_for_var(obj, name, part, type) \
-    id_for_var_message(obj, name, type, "`%1$s' is not allowed as "#part" "#type" variable name")
+    id_for_var_message(obj, name, type, "'%1$s' is not allowed as "#part" "#type" variable name")
 #define id_for_var_message(obj, name, type, message) \
     check_id_type(obj, &(name), rb_is_##type##_id, rb_is_##type##_name, message, strlen(message))
 static ID
@@ -1990,8 +2534,7 @@ check_id_type(VALUE obj, VALUE *pname,
  *     obj.remove_instance_variable(string)    -> obj
  *
  *  Removes the named instance variable from <i>obj</i>, returning that
- *  variable's value.
- *  String arguments are converted to symbols.
+ *  variable's value. The name can be passed as a symbol or as a string.
  *
  *     class Dummy
  *       attr_reader :var
@@ -2011,47 +2554,18 @@ check_id_type(VALUE obj, VALUE *pname,
 VALUE
 rb_obj_remove_instance_variable(VALUE obj, VALUE name)
 {
-    VALUE val = Qundef;
     const ID id = id_for_var(obj, name, an, instance);
 
     // Frozen check comes here because it's expected that we raise a
     // NameError (from the id_for_var check) before we raise a FrozenError
     rb_check_frozen(obj);
 
-    if (!id) {
-        goto not_defined;
-    }
-
-    rb_shape_t * shape = rb_shape_get_shape(obj);
-
-    switch (BUILTIN_TYPE(obj)) {
-      case T_CLASS:
-      case T_MODULE:
-        IVAR_ACCESSOR_SHOULD_BE_MAIN_RACTOR(id);
-        rb_shape_transition_shape_remove_ivar(obj, id, shape, &val);
-        break;
-      case T_OBJECT: {
-        if (rb_shape_obj_too_complex(obj)) {
-            if (rb_st_lookup(ROBJECT_IV_HASH(obj), (st_data_t)id, (st_data_t *)&val)) {
-                rb_st_delete(ROBJECT_IV_HASH(obj), (st_data_t *)&id, 0);
-            }
-        }
-        else {
-            rb_shape_transition_shape_remove_ivar(obj, id, shape, &val);
-        }
-        break;
-      }
-      default: {
-        rb_shape_transition_shape_remove_ivar(obj, id, shape, &val);
-        break;
-      }
-    }
+    if (id) {
+        VALUE val = rb_ivar_delete(obj, id, Qundef);
 
-    if (val != Qundef) {
-        return val;
+        if (!UNDEF_P(val)) return val;
     }
 
-  not_defined:
     rb_name_err_raise("instance variable %1$s not defined",
                       obj, name);
     UNREACHABLE_RETURN(Qnil);
@@ -2084,8 +2598,7 @@ rb_const_missing(VALUE klass, VALUE name)
  *
  * Invoked when a reference is made to an undefined constant in
  * <i>mod</i>. It is passed a symbol for the undefined constant, and
- * returns a value to be used for that constant. The
- * following code is an example of the same:
+ * returns a value to be used for that constant. For example, consider:
  *
  *   def Foo.const_missing(name)
  *     name # return the constant name as Symbol
@@ -2093,23 +2606,28 @@ rb_const_missing(VALUE klass, VALUE name)
  *
  *   Foo::UNDEFINED_CONST    #=> :UNDEFINED_CONST: symbol returned
  *
- * In the next example when a reference is made to an undefined constant,
- * it attempts to load a file whose name is the lowercase version of the
- * constant (thus class <code>Fred</code> is assumed to be in file
- * <code>fred.rb</code>).  If found, it returns the loaded class. It
- * therefore implements an autoload feature similar to Kernel#autoload and
- * Module#autoload.
+ * As the example above shows, +const_missing+ is not required to create the
+ * missing constant in <i>mod</i>, though that is often a side-effect. The
+ * caller gets its return value when triggered. If the constant is also defined,
+ * further lookups won't hit +const_missing+ and will return the value stored in
+ * the constant as usual. Otherwise, +const_missing+ will be invoked again.
+ *
+ * In the next example, when a reference is made to an undefined constant,
+ * +const_missing+ attempts to load a file whose path is the lowercase version
+ * of the constant name (thus class <code>Fred</code> is assumed to be in file
+ * <code>fred.rb</code>). If defined as a side-effect of loading the file, the
+ * method returns the value stored in the constant. This implements an autoload
+ * feature similar to Kernel#autoload and Module#autoload, though it differs in
+ * important ways.
  *
  *   def Object.const_missing(name)
  *     @looked_for ||= {}
  *     str_name = name.to_s
- *     raise "Class not found: #{name}" if @looked_for[str_name]
+ *     raise "Constant not found: #{name}" if @looked_for[str_name]
  *     @looked_for[str_name] = 1
  *     file = str_name.downcase
  *     require file
- *     klass = const_get(name)
- *     return klass if klass
- *     raise "Class not found: #{name}"
+ *     const_get(name, false)
  *   end
  *
  */
@@ -2151,7 +2669,7 @@ autoload_table_memsize(const void *ptr)
 static void
 autoload_table_compact(void *ptr)
 {
-    rb_gc_update_tbl_refs((st_table *)ptr);
+    rb_gc_ref_update_table_values_only((st_table *)ptr);
 }
 
 static const rb_data_type_t autoload_table_type = {
@@ -2172,7 +2690,7 @@ autoload_data(VALUE mod, ID id)
     // If we are called with a non-origin ICLASS, fetch the autoload data from
     // the original module.
     if (RB_TYPE_P(mod, T_ICLASS)) {
-        if (FL_TEST_RAW(mod, RICLASS_IS_ORIGIN)) {
+        if (RICLASS_IS_ORIGIN_P(mod)) {
             return 0;
         }
         else {
@@ -2200,6 +2718,10 @@ struct autoload_const {
     // The shared "autoload_data" if multiple constants are defined from the same feature.
     VALUE autoload_data_value;
 
+    // The namespace object when the autoload is called in a user namespace
+    // Otherwise, Qnil means the builtin namespace, Qfalse means unspecified.
+    VALUE namespace;
+
     // The module we are loading a constant into.
     VALUE module;
 
@@ -2255,10 +2777,12 @@ autoload_data_free(void *ptr)
 {
     struct autoload_data *p = ptr;
 
-    // We may leak some memory at VM shutdown time, no big deal...?
-    if (ccan_list_empty(&p->constants)) {
-        ruby_xfree(p);
+    struct autoload_const *autoload_const, *next;
+    ccan_list_for_each_safe(&p->constants, autoload_const, next, cnode) {
+        ccan_list_del_init(&autoload_const->cnode);
     }
+
+    ruby_xfree(p);
 }
 
 static size_t
@@ -2282,6 +2806,7 @@ autoload_const_compact(void *ptr)
     ac->autoload_data_value = rb_gc_location(ac->autoload_data_value);
     ac->value = rb_gc_location(ac->value);
     ac->file = rb_gc_location(ac->file);
+    ac->namespace = rb_gc_location(ac->namespace);
 }
 
 static void
@@ -2293,6 +2818,7 @@ autoload_const_mark(void *ptr)
     rb_gc_mark_movable(ac->autoload_data_value);
     rb_gc_mark_movable(ac->value);
     rb_gc_mark_movable(ac->file);
+    rb_gc_mark_movable(ac->namespace);
 }
 
 static size_t
@@ -2335,7 +2861,71 @@ get_autoload_data(VALUE autoload_const_value, struct autoload_const **autoload_c
     return autoload_data;
 }
 
-RUBY_FUNC_EXPORTED void
+struct autoload_copy_table_data {
+    VALUE dst_tbl_value;
+    struct st_table *dst_tbl;
+    const rb_namespace_t *ns;
+};
+
+static int
+autoload_copy_table_for_namespace_i(st_data_t key, st_data_t value, st_data_t arg)
+{
+    struct autoload_const *autoload_const;
+    struct autoload_copy_table_data *data = (struct autoload_copy_table_data *)arg;
+    struct st_table *tbl = data->dst_tbl;
+    VALUE tbl_value = data->dst_tbl_value;
+    const rb_namespace_t *ns = data->ns;
+
+    VALUE src_value = (VALUE)value;
+    struct autoload_const *src_const = rb_check_typeddata(src_value, &autoload_const_type);
+    // autoload_data can be shared between copies because the feature is equal between copies.
+    VALUE autoload_data_value = src_const->autoload_data_value;
+    struct autoload_data *autoload_data = rb_check_typeddata(autoload_data_value, &autoload_data_type);
+
+    VALUE new_value = TypedData_Make_Struct(0, struct autoload_const, &autoload_const_type, autoload_const);
+    autoload_const->namespace = rb_get_namespace_object((rb_namespace_t *)ns);
+    autoload_const->module = src_const->module;
+    autoload_const->name = src_const->name;
+    autoload_const->value = src_const->value;
+    autoload_const->flag = src_const->flag;
+    autoload_const->autoload_data_value = autoload_data_value;
+    ccan_list_add_tail(&autoload_data->constants, &autoload_const->cnode);
+
+    st_insert(tbl, (st_data_t)autoload_const->name, (st_data_t)new_value);
+    RB_OBJ_WRITTEN(tbl_value, Qundef, new_value);
+
+    return ST_CONTINUE;
+}
+
+void
+rb_autoload_copy_table_for_namespace(st_table *iv_ptr, const rb_namespace_t *ns)
+{
+    struct st_table *src_tbl, *dst_tbl;
+    VALUE src_tbl_value, dst_tbl_value;
+    if (!rb_st_lookup(iv_ptr, (st_data_t)autoload, (st_data_t *)&src_tbl_value)) {
+        // the class has no autoload table yet.
+        return;
+    }
+    if (!RTEST(src_tbl_value) || !(src_tbl = check_autoload_table(src_tbl_value))) {
+        // the __autoload__ ivar value isn't autoload table value.
+        return;
+    }
+    src_tbl = check_autoload_table(src_tbl_value);
+
+    dst_tbl_value = TypedData_Wrap_Struct(0, &autoload_table_type, NULL);
+    RTYPEDDATA_DATA(dst_tbl_value) = dst_tbl = st_init_numtable();
+
+    struct autoload_copy_table_data data = {
+        .dst_tbl_value = dst_tbl_value,
+        .dst_tbl = dst_tbl,
+        .ns = ns,
+    };
+
+    st_foreach(src_tbl, autoload_copy_table_for_namespace_i, (st_data_t)&data);
+    st_insert(iv_ptr, (st_data_t)autoload, (st_data_t)dst_tbl_value);
+}
+
+void
 rb_autoload(VALUE module, ID name, const char *feature)
 {
     if (!feature || !*feature) {
@@ -2352,6 +2942,7 @@ struct autoload_arguments {
     VALUE module;
     ID name;
     VALUE feature;
+    VALUE namespace;
 };
 
 static VALUE
@@ -2421,6 +3012,7 @@ autoload_synchronized(VALUE _arguments)
     {
         struct autoload_const *autoload_const;
         VALUE autoload_const_value = TypedData_Make_Struct(0, struct autoload_const, &autoload_const_type, autoload_const);
+        autoload_const->namespace = arguments->namespace;
         autoload_const->module = arguments->module;
         autoload_const->name = arguments->name;
         autoload_const->value = Qundef;
@@ -2437,6 +3029,9 @@ autoload_synchronized(VALUE _arguments)
 void
 rb_autoload_str(VALUE module, ID name, VALUE feature)
 {
+    const rb_namespace_t *ns = rb_current_namespace();
+    VALUE current_namespace = rb_get_namespace_object((rb_namespace_t *)ns);
+
     if (!rb_is_const_id(name)) {
         rb_raise(rb_eNameError, "autoload must be constant name: %"PRIsVALUE"", QUOTE_ID(name));
     }
@@ -2450,6 +3045,7 @@ rb_autoload_str(VALUE module, ID name, VALUE feature)
         .module = module,
         .name = name,
         .feature = feature,
+        .namespace = current_namespace,
     };
 
     VALUE result = rb_mutex_synchronize(autoload_mutex, autoload_synchronized, (VALUE)&arguments);
@@ -2634,11 +3230,9 @@ autoload_const_set(struct autoload_const *ac)
 {
     check_before_mod_set(ac->module, ac->name, ac->value, "constant");
 
-    RB_VM_LOCK_ENTER();
-    {
+    RB_VM_LOCKING() {
         const_tbl_update(ac, true);
     }
-    RB_VM_LOCK_LEAVE();
 
     return 0; /* ignored */
 }
@@ -2710,22 +3304,82 @@ autoload_apply_constants(VALUE _arguments)
     return Qtrue;
 }
 
+struct autoload_feature_require_data {
+    struct autoload_load_arguments *arguments;
+    VALUE receiver;
+    VALUE feature;
+};
+
+static VALUE
+autoload_feature_require_in_builtin(VALUE arg)
+{
+    struct autoload_feature_require_data *data = (struct autoload_feature_require_data *)arg;
+
+    VALUE result = rb_funcall(data->receiver, rb_intern("require"), 1, data->feature);
+    if (RTEST(result)) {
+        return rb_mutex_synchronize(autoload_mutex, autoload_apply_constants, (VALUE)data->arguments);
+    }
+    return Qnil;
+}
+
+static VALUE
+autoload_feature_require_ensure_in_builtin(VALUE _arg)
+{
+    /*
+     * The gccct should be cleared again after the rb_funcall() to remove
+     * the inconsistent cache entry against the current namespace.
+     */
+    rb_gccct_clear_table(Qnil);
+    rb_namespace_disable_builtin();
+    return Qnil;
+}
+
+static VALUE
+autoload_feature_require_in_builtin_wrap(VALUE arg)
+{
+    return rb_ensure(autoload_feature_require_in_builtin, arg,
+                     autoload_feature_require_ensure_in_builtin, Qnil);
+}
+
 static VALUE
 autoload_feature_require(VALUE _arguments)
 {
+    VALUE receiver = rb_vm_top_self();
+
     struct autoload_load_arguments *arguments = (struct autoload_load_arguments*)_arguments;
 
     struct autoload_const *autoload_const = arguments->autoload_const;
+    VALUE autoload_namespace = autoload_const->namespace;
 
     // We save this for later use in autoload_apply_constants:
     arguments->autoload_data = rb_check_typeddata(autoload_const->autoload_data_value, &autoload_data_type);
 
-    VALUE result = rb_funcall(rb_vm_top_self(), rb_intern("require"), 1, arguments->autoload_data->feature);
+    if (NIL_P(autoload_namespace)) {
+        rb_namespace_enable_builtin();
+        /*
+         * Clear the global cc cache table because the require method can be different from the current
+         * namespace's one and it may cause inconsistent cc-cme states.
+         * For example, the assertion below may fail in gccct_method_search();
+         * VM_ASSERT(vm_cc_check_cme(cc, rb_callable_method_entry(klass, mid)))
+         */
+        rb_gccct_clear_table(Qnil);
+        struct autoload_feature_require_data data = {
+            .arguments = arguments,
+            .receiver = receiver,
+            .feature = arguments->autoload_data->feature,
+        };
+        return rb_namespace_exec(rb_builtin_namespace(), autoload_feature_require_in_builtin_wrap, (VALUE)&data);
+    }
+
+    if (RTEST(autoload_namespace) && NAMESPACE_OPTIONAL_P(rb_get_namespace_t(autoload_namespace))) {
+        receiver = autoload_namespace;
+    }
+
+    VALUE result = rb_funcall(receiver, rb_intern("require"), 1, arguments->autoload_data->feature);
 
     if (RTEST(result)) {
         return rb_mutex_synchronize(autoload_mutex, autoload_apply_constants, _arguments);
     }
-
     return result;
 }
 
@@ -2780,7 +3434,7 @@ rb_autoload_load(VALUE module, ID name)
 
     // At this point, we assume there might be autoloading, so fail if it's ractor:
     if (UNLIKELY(!rb_ractor_main_p())) {
-        rb_raise(rb_eRactorUnsafeError, "require by autoload on non-main Ractor is not supported (%s)", rb_id2name(name));
+        return rb_ractor_autoload_load(module, name);
     }
 
     // This state is stored on the stack and is used during the autoload process.
@@ -2978,6 +3632,19 @@ rb_const_location_from(VALUE klass, ID id, int exclude, int recurse, int visibil
             if (exclude && klass == rb_cObject) {
                 goto not_found;
             }
+
+            if (UNDEF_P(ce->value)) { // autoload
+                VALUE autoload_const_value = autoload_data(klass, id);
+                if (RTEST(autoload_const_value)) {
+                    struct autoload_const *autoload_const;
+                    struct autoload_data *autoload_data = get_autoload_data(autoload_const_value, &autoload_const);
+
+                    if (!UNDEF_P(autoload_const->value) && RTEST(rb_mutex_owned_p(autoload_data->mutex))) {
+                        return rb_assoc_new(autoload_const->file, INT2NUM(autoload_const->line));
+                    }
+                }
+            }
+
             if (NIL_P(ce->file)) return rb_ary_new();
             return rb_assoc_new(ce->file, INT2NUM(ce->line));
         }
@@ -3036,6 +3703,8 @@ rb_mod_remove_const(VALUE mod, VALUE name)
     return rb_const_remove(mod, id);
 }
 
+static rb_const_entry_t * const_lookup(struct rb_id_table *tbl, ID id);
+
 VALUE
 rb_const_remove(VALUE mod, ID id)
 {
@@ -3045,7 +3714,7 @@ rb_const_remove(VALUE mod, ID id)
     rb_check_frozen(mod);
 
     ce = rb_const_lookup(mod, id);
-    if (!ce || !rb_id_table_delete(RCLASS_CONST_TBL(mod), id)) {
+    if (!ce || !rb_id_table_delete(RCLASS_WRITABLE_CONST_TBL(mod), id)) {
         if (rb_const_defined_at(mod, id)) {
             rb_name_err_raise("cannot remove %2$s::%1$s", mod, ID2SYM(id));
         }
@@ -3053,6 +3722,7 @@ rb_const_remove(VALUE mod, ID id)
         undefined_constant(mod, ID2SYM(id));
     }
 
+    rb_const_warn_if_deprecated(ce, mod, id);
     rb_clear_constant_cache_for_id(id);
 
     val = ce->value;
@@ -3062,7 +3732,10 @@ rb_const_remove(VALUE mod, ID id)
         val = Qnil;
     }
 
-    ruby_xfree(ce);
+    if (ce != const_lookup(RCLASS_PRIME_CONST_TBL(mod), id)) {
+        ruby_xfree(ce);
+    }
+    // else - skip free'ing the ce because it still exists in the prime classext
 
     return val;
 }
@@ -3104,12 +3777,10 @@ rb_local_constants(VALUE mod)
 
     if (!tbl) return rb_ary_new2(0);
 
-    RB_VM_LOCK_ENTER();
-    {
+    RB_VM_LOCKING() {
         ary = rb_ary_new2(rb_id_table_size(tbl));
         rb_id_table_foreach(tbl, rb_local_constants_i, (void *)ary);
     }
-    RB_VM_LOCK_LEAVE();
 
     return ary;
 }
@@ -3122,11 +3793,9 @@ rb_mod_const_at(VALUE mod, void *data)
         tbl = st_init_numtable();
     }
     if (RCLASS_CONST_TBL(mod)) {
-        RB_VM_LOCK_ENTER();
-        {
+        RB_VM_LOCKING() {
             rb_id_table_foreach(RCLASS_CONST_TBL(mod), sv_i, tbl);
         }
-        RB_VM_LOCK_LEAVE();
     }
     return tbl;
 }
@@ -3284,8 +3953,8 @@ set_namespace_path_i(ID id, VALUE v, void *payload)
     }
     set_namespace_path(value, build_const_path(parental_path, id));
 
-    if (!RCLASS_EXT(value)->permanent_classpath) {
-        RCLASS_SET_CLASSPATH(value, 0, false);
+    if (!RCLASS_PERMANENT_CLASSPATH_P(value)) {
+        RCLASS_WRITE_CLASSPATH(value, 0, false);
     }
 
     return ID_TABLE_CONTINUE;
@@ -3301,15 +3970,13 @@ set_namespace_path(VALUE named_namespace, VALUE namespace_path)
 {
     struct rb_id_table *const_table = RCLASS_CONST_TBL(named_namespace);
 
-    RB_VM_LOCK_ENTER();
-    {
-        RCLASS_SET_CLASSPATH(named_namespace, namespace_path, true);
+    RB_VM_LOCKING() {
+        RCLASS_WRITE_CLASSPATH(named_namespace, namespace_path, true);
 
         if (const_table) {
             rb_id_table_foreach(const_table, set_namespace_path_i, &namespace_path);
         }
     }
-    RB_VM_LOCK_LEAVE();
 }
 
 static void
@@ -3337,11 +4004,11 @@ const_set(VALUE klass, ID id, VALUE val)
 
     check_before_mod_set(klass, id, val, "constant");
 
-    RB_VM_LOCK_ENTER();
-    {
-        struct rb_id_table *tbl = RCLASS_CONST_TBL(klass);
+    RB_VM_LOCKING() {
+        struct rb_id_table *tbl = RCLASS_WRITABLE_CONST_TBL(klass);
         if (!tbl) {
-            RCLASS_CONST_TBL(klass) = tbl = rb_id_table_create(0);
+            tbl = rb_id_table_create(0);
+            RCLASS_WRITE_CONST_TBL(klass, tbl, false);
             rb_clear_constant_cache_for_id(id);
             ce = ZALLOC(rb_const_entry_t);
             rb_id_table_insert(tbl, id, (VALUE)ce);
@@ -3357,7 +4024,6 @@ const_set(VALUE klass, ID id, VALUE val)
             const_tbl_update(&ac, false);
         }
     }
-    RB_VM_LOCK_LEAVE();
 
     /*
      * Resolve and cache class name immediately to resolve ambiguity
@@ -3465,6 +4131,7 @@ const_tbl_update(struct autoload_const *ac, int autoload_force)
         setup_const_entry(ce, klass, val, visibility);
     }
     else {
+        tbl = RCLASS_WRITABLE_CONST_TBL(klass);
         rb_clear_constant_cache_for_id(id);
 
         ce = ZALLOC(rb_const_entry_t);
@@ -3488,9 +4155,11 @@ rb_define_const(VALUE klass, const char *name, VALUE val)
     ID id = rb_intern(name);
 
     if (!rb_is_const_id(id)) {
-        rb_warn("rb_define_const: invalid name `%s' for constant", name);
+        rb_warn("rb_define_const: invalid name '%s' for constant", name);
+    }
+    if (!RB_SPECIAL_CONST_P(val)) {
+        rb_vm_register_global_object(val);
     }
-    rb_gc_register_mark_object(val);
     rb_const_set(klass, id, val);
 }
 
@@ -3534,7 +4203,7 @@ set_const_visibility(VALUE mod, int argc, const VALUE *argv,
                     ac->flag |= flag;
                 }
             }
-        rb_clear_constant_cache_for_id(id);
+            rb_clear_constant_cache_for_id(id);
         }
         else {
             undefined_constant(mod, ID2SYM(id));
@@ -3625,7 +4294,7 @@ static int
 cvar_lookup_at(VALUE klass, ID id, st_data_t *v)
 {
     if (RB_TYPE_P(klass, T_ICLASS)) {
-        if (FL_TEST_RAW(klass, RICLASS_IS_ORIGIN)) {
+        if (RICLASS_IS_ORIGIN_P(klass)) {
             return 0;
         }
         else {
@@ -3644,7 +4313,7 @@ cvar_lookup_at(VALUE klass, ID id, st_data_t *v)
 static VALUE
 cvar_front_klass(VALUE klass)
 {
-    if (FL_TEST(klass, FL_SINGLETON)) {
+    if (RCLASS_SINGLETON_P(klass)) {
         VALUE obj = RCLASS_ATTACHED_OBJECT(klass);
         if (rb_namespace_p(obj)) {
             return obj;
@@ -3728,12 +4397,13 @@ rb_cvar_set(VALUE klass, ID id, VALUE val)
     }
     check_before_mod_set(target, id, val, "class variable");
 
-    int result = rb_class_ivar_set(target, id, val);
+    bool new_cvar = rb_class_ivar_set(target, id, val);
 
-    struct rb_id_table *rb_cvc_tbl = RCLASS_CVC_TBL(target);
+    struct rb_id_table *rb_cvc_tbl = RCLASS_WRITABLE_CVC_TBL(target);
 
     if (!rb_cvc_tbl) {
-        rb_cvc_tbl = RCLASS_CVC_TBL(target) = rb_id_table_create(2);
+        rb_cvc_tbl = rb_id_table_create(2);
+        RCLASS_WRITE_CVC_TBL(target, rb_cvc_tbl);
     }
 
     struct rb_cvar_class_tbl_entry *ent;
@@ -3755,9 +4425,9 @@ rb_cvar_set(VALUE klass, ID id, VALUE val)
     // Break the cvar cache if this is a new class variable
     // and target is a module or a subclass with the same
     // cvar in this lookup.
-    if (result == 0) {
+    if (new_cvar) {
         if (RB_TYPE_P(target, T_CLASS)) {
-            if (RCLASS_SUBCLASSES(target)) {
+            if (RCLASS_SUBCLASSES_FIRST(target)) {
                 rb_class_foreach_subclass(target, check_for_cvar_table, id);
             }
         }
@@ -3826,9 +4496,8 @@ rb_define_class_variable(VALUE klass, const char *name, VALUE val)
 }
 
 static int
-cv_i(st_data_t k, st_data_t v, st_data_t a)
+cv_i(ID key, VALUE v, st_data_t a)
 {
-    ID key = (ID)k;
     st_table *tbl = (st_table *)a;
 
     if (rb_is_class_id(key)) {
@@ -3854,7 +4523,7 @@ static void*
 mod_cvar_of(VALUE mod, void *data)
 {
     VALUE tmp = mod;
-    if (FL_TEST(mod, FL_SINGLETON)) {
+    if (RCLASS_SINGLETON_P(mod)) {
         if (rb_namespace_p(RCLASS_ATTACHED_OBJECT(mod))) {
             data = mod_cvar_at(tmp, data);
             tmp = cvar_front_klass(tmp);
@@ -3987,87 +4656,149 @@ rb_iv_set(VALUE obj, const char *name, VALUE val)
     return rb_ivar_set(obj, id, val);
 }
 
-/* tbl = xx(obj); tbl[key] = value; */
-int
-rb_class_ivar_set(VALUE obj, ID key, VALUE value)
+static bool
+class_fields_ivar_set(VALUE klass, VALUE fields_obj, ID id, VALUE val, bool concurrent, VALUE *new_fields_obj)
 {
-    RUBY_ASSERT(RB_TYPE_P(obj, T_CLASS) || RB_TYPE_P(obj, T_MODULE));
-    int found;
-    rb_check_frozen(obj);
+    bool existing = true;
+    const VALUE original_fields_obj = fields_obj;
+    fields_obj = original_fields_obj ? original_fields_obj : rb_imemo_fields_new(rb_singleton_class(klass), 1);
 
-    RB_VM_LOCK_ENTER();
-    {
-        rb_shape_t * shape = rb_shape_get_shape(obj);
-        attr_index_t idx;
-        found = rb_shape_get_iv_index(shape, key, &idx);
+    shape_id_t current_shape_id = RBASIC_SHAPE_ID(fields_obj);
+    shape_id_t next_shape_id = current_shape_id;
+
+    if (UNLIKELY(rb_shape_too_complex_p(current_shape_id))) {
+        goto too_complex;
+    }
 
-        if (found) {
-            // Changing an existing instance variable
-            RUBY_ASSERT(RCLASS_IVPTR(obj));
+    attr_index_t index;
+    if (!rb_shape_get_iv_index(current_shape_id, id, &index)) {
+        existing = false;
 
-            RCLASS_IVPTR(obj)[idx] = value;
-            RB_OBJ_WRITTEN(obj, Qundef, value);
+        index = RSHAPE_LEN(current_shape_id);
+        if (index >= SHAPE_MAX_FIELDS) {
+            rb_raise(rb_eArgError, "too many instance variables");
+        }
+
+        next_shape_id = rb_shape_transition_add_ivar(fields_obj, id);
+        if (UNLIKELY(rb_shape_too_complex_p(next_shape_id))) {
+            fields_obj = imemo_fields_complex_from_obj(rb_singleton_class(klass), fields_obj, next_shape_id);
+            goto too_complex;
         }
-        else {
-            // Creating and setting a new instance variable
 
-            // Move to a shape which fits the new ivar
-            idx = shape->next_iv_index;
-            shape = rb_shape_get_next(shape, obj, key);
+        attr_index_t next_capacity = RSHAPE_CAPACITY(next_shape_id);
+        attr_index_t current_capacity = RSHAPE_CAPACITY(current_shape_id);
 
-            // We always allocate a power of two sized IV array. This way we
-            // only need to realloc when we expand into a new power of two size
-            if ((idx & (idx - 1)) == 0) {
-                size_t newsize = idx ? idx * 2 : 1;
-                REALLOC_N(RCLASS_IVPTR(obj), VALUE, newsize);
-            }
+        if (next_capacity > current_capacity) {
+            // We allocate a new fields_obj even when concurrency isn't a concern
+            // so that we're embedded as long as possible.
+            fields_obj = imemo_fields_copy_capa(rb_singleton_class(klass), fields_obj, next_capacity);
+        }
+
+        RUBY_ASSERT(RSHAPE(next_shape_id)->type == SHAPE_IVAR);
+        RUBY_ASSERT(index == (RSHAPE_LEN(next_shape_id) - 1));
+    }
+
+    VALUE *fields = rb_imemo_fields_ptr(fields_obj);
+
+    if (concurrent && original_fields_obj == fields_obj) {
+        // In the concurrent case, if we're mutating the existing
+        // fields_obj, we must use an atomic write, because if we're
+        // adding a new field, the shape_id must be written after the field
+        // and if we're updating an existing field, we at least need a relaxed
+        // write to avoid reaping.
+        RB_OBJ_ATOMIC_WRITE(fields_obj, &fields[index], val);
+    }
+    else {
+        RB_OBJ_WRITE(fields_obj, &fields[index], val);
+    }
+
+    if (!existing) {
+        RBASIC_SET_SHAPE_ID(fields_obj, next_shape_id);
+    }
+
+    *new_fields_obj = fields_obj;
+    return existing;
+
+too_complex:
+    {
+        if (concurrent && fields_obj == original_fields_obj) {
+            // In multi-ractor case, we must always work on a copy because
+            // even if the field already exist, inserting in a st_table may
+            // cause a rebuild.
+            fields_obj = rb_imemo_fields_clone(fields_obj);
+        }
 
-            RUBY_ASSERT(RCLASS_IVPTR(obj));
+        st_table *table = rb_imemo_fields_complex_tbl(fields_obj);
+        existing = st_insert(table, (st_data_t)id, (st_data_t)val);
+        RB_OBJ_WRITTEN(fields_obj, Qundef, val);
 
-            RB_OBJ_WRITE(obj, &RCLASS_IVPTR(obj)[idx], value);
-            rb_shape_set_shape(obj, shape);
+        if (fields_obj != original_fields_obj) {
+            RBASIC_SET_SHAPE_ID(fields_obj, next_shape_id);
         }
     }
-    RB_VM_LOCK_LEAVE();
 
-    return found;
+    *new_fields_obj = fields_obj;
+    return existing;
 }
 
-static int
-tbl_copy_i(st_data_t key, st_data_t val, st_data_t dest)
+bool
+rb_class_ivar_set(VALUE obj, ID id, VALUE val)
 {
-    rb_class_ivar_set(dest, key, val);
+    RUBY_ASSERT(RB_TYPE_P(obj, T_CLASS) || RB_TYPE_P(obj, T_MODULE));
+    rb_check_frozen(obj);
 
-    return ST_CONTINUE;
+    rb_class_ensure_writable(obj);
+
+    const VALUE original_fields_obj = RCLASS_WRITABLE_FIELDS_OBJ(obj);
+    VALUE new_fields_obj = 0;
+
+    bool existing = class_fields_ivar_set(obj, original_fields_obj, id, val, rb_multi_ractor_p(), &new_fields_obj);
+
+    if (new_fields_obj != original_fields_obj) {
+        RCLASS_WRITABLE_SET_FIELDS_OBJ(obj, new_fields_obj);
+    }
+
+    // TODO: What should we set as the T_CLASS shape_id?
+    // In most case we can replicate the single `fields_obj` shape
+    // but in namespaced case?
+    // Perhaps INVALID_SHAPE_ID?
+    RBASIC_SET_SHAPE_ID(obj, RBASIC_SHAPE_ID(new_fields_obj));
+
+    return !existing;
 }
 
 void
-rb_iv_tbl_copy(VALUE dst, VALUE src)
+rb_fields_tbl_copy(VALUE dst, VALUE src)
 {
     RUBY_ASSERT(rb_type(dst) == rb_type(src));
     RUBY_ASSERT(RB_TYPE_P(dst, T_CLASS) || RB_TYPE_P(dst, T_MODULE));
+    RUBY_ASSERT(RSHAPE_TYPE_P(RBASIC_SHAPE_ID(dst), SHAPE_ROOT));
 
-    RUBY_ASSERT(RCLASS_SHAPE_ID(dst) == ROOT_SHAPE_ID || rb_shape_get_shape_by_id(RCLASS_SHAPE_ID(dst))->type == SHAPE_INITIAL_CAPACITY);
-    RUBY_ASSERT(!RCLASS_IVPTR(dst));
-
-    rb_ivar_foreach(src, tbl_copy_i, dst);
+    VALUE fields_obj = RCLASS_WRITABLE_FIELDS_OBJ(src);
+    if (fields_obj) {
+        RCLASS_WRITABLE_SET_FIELDS_OBJ(dst, rb_imemo_fields_clone(fields_obj));
+        RBASIC_SET_SHAPE_ID(dst, RBASIC_SHAPE_ID(src));
+    }
 }
 
-rb_const_entry_t *
-rb_const_lookup(VALUE klass, ID id)
+static rb_const_entry_t *
+const_lookup(struct rb_id_table *tbl, ID id)
 {
-    struct rb_id_table *tbl = RCLASS_CONST_TBL(klass);
-
     if (tbl) {
         VALUE val;
         bool r;
-        RB_VM_LOCK_ENTER();
-        {
+        RB_VM_LOCKING() {
             r = rb_id_table_lookup(tbl, id, &val);
         }
-        RB_VM_LOCK_LEAVE();
 
         if (r) return (rb_const_entry_t *)val;
     }
     return NULL;
 }
+
+rb_const_entry_t *
+rb_const_lookup(VALUE klass, ID id)
+{
+    return const_lookup(RCLASS_CONST_TBL(klass), id);
+}
+
diff --git a/variable.h b/variable.h
index 5c0366de32b5b4..82a79c63ce492b 100644
--- a/variable.h
+++ b/variable.h
@@ -12,19 +12,10 @@
 
 #include "shape.h"
 
-struct gen_ivtbl {
-#if !SHAPE_IN_BASIC_FLAGS
-    uint16_t shape_id;
-#endif
-    uint32_t numiv;
-    VALUE ivptr[FLEX_ARY_LEN];
-};
-
-int rb_ivar_generic_ivtbl_lookup(VALUE obj, struct gen_ivtbl **);
-
-#if !SHAPE_IN_BASIC_FLAGS
-shape_id_t rb_generic_shape_id(VALUE obj);
-#endif
+int rb_ivar_generic_fields_tbl_lookup(VALUE obj, VALUE *);
+void rb_copy_complex_ivars(VALUE dest, VALUE obj, shape_id_t src_shape_id, st_table *fields_table);
 
+void rb_free_rb_global_tbl(void);
+void rb_free_generic_fields_tbl_(void);
 
 #endif /* RUBY_TOPLEVEL_VARIABLE_H */
diff --git a/vcpkg.json b/vcpkg.json
new file mode 100644
index 00000000000000..16415dece1163c
--- /dev/null
+++ b/vcpkg.json
@@ -0,0 +1,11 @@
+{
+  "$schema": "https://raw.githubusercontent.com/microsoft/vcpkg-tool/main/docs/vcpkg.schema.json",
+  "dependencies": [
+    "gmp",
+    "libffi",
+    "libyaml",
+    "openssl",
+    "zlib"
+  ],
+  "builtin-baseline": "65be7019941e1401e02daaba0738cab2c8a4a355"
+}
diff --git a/version.c b/version.c
index c4756771e1cecc..bb6c15fb7a66a2 100644
--- a/version.c
+++ b/version.c
@@ -10,10 +10,11 @@
 **********************************************************************/
 
 #include "internal/cmdlineopt.h"
+#include "internal/parse.h"
+#include "internal/gc.h"
 #include "ruby/ruby.h"
 #include "version.h"
 #include "vm_core.h"
-#include "rjit.h"
 #include "yjit.h"
 #include <stdio.h>
 
@@ -39,11 +40,6 @@
 # define RUBY_RELEASE_DATETIME RUBY_RELEASE_DATE
 #endif
 
-# define RUBY_DESCRIPTION_WITH(opt) \
-    "ruby " RUBY_VERSION RUBY_PATCHLEVEL_STR " " \
-    "(" RUBY_RELEASE_DATETIME RUBY_REVISION_STR ")" opt " " \
-    "[" RUBY_PLATFORM "]"
-
 #define PRINT(type) puts(ruby_##type)
 #define MKSTR(type) rb_obj_freeze(rb_usascii_str_new_static(ruby_##type, sizeof(ruby_##type)-1))
 #define MKINT(name) INT2FIX(ruby_##name)
@@ -65,14 +61,33 @@ const int ruby_api_version[] = {
 #else
 #define YJIT_DESCRIPTION " +YJIT"
 #endif
+#ifdef ZJIT_SUPPORT
+#define ZJIT_DESCRIPTION " +ZJIT " STRINGIZE(ZJIT_SUPPORT)
+#else
+#define ZJIT_DESCRIPTION " +ZJIT"
+#endif
+#if USE_ZJIT
+#define JIT_DESCRIPTION ZJIT_DESCRIPTION
+#else
+#define JIT_DESCRIPTION YJIT_DESCRIPTION
+#endif
+#if USE_MODULAR_GC
+#define GC_DESCRIPTION " +GC"
+#else
+#define GC_DESCRIPTION ""
+#endif
 const char ruby_version[] = RUBY_VERSION;
 const char ruby_revision[] = RUBY_FULL_REVISION;
 const char ruby_release_date[] = RUBY_RELEASE_DATE;
 const char ruby_platform[] = RUBY_PLATFORM;
 const int ruby_patchlevel = RUBY_PATCHLEVEL;
-const char ruby_description[] = RUBY_DESCRIPTION_WITH("");
-static const char ruby_description_with_rjit[] = RUBY_DESCRIPTION_WITH(" +RJIT");
-static const char ruby_description_with_yjit[] = RUBY_DESCRIPTION_WITH(YJIT_DESCRIPTION);
+const char ruby_description[] =
+    "ruby " RUBY_VERSION RUBY_PATCHLEVEL_STR " "
+    "(" RUBY_RELEASE_DATETIME RUBY_REVISION_STR ") "
+    "[" RUBY_PLATFORM "]";
+static const int ruby_description_opt_point =
+    (int)(sizeof(ruby_description) - sizeof(" [" RUBY_PLATFORM "]"));
+
 const char ruby_copyright[] = "ruby - Copyright (C) "
     RUBY_BIRTH_YEAR_STR "-" RUBY_RELEASE_YEAR_STR " "
     RUBY_AUTHOR;
@@ -81,10 +96,33 @@ const char ruby_engine[] = "ruby";
 // Might change after initialization
 const char *rb_dynamic_description = ruby_description;
 
+static inline void
+define_ruby_const(VALUE mod, const char *name, VALUE value, bool toplevel)
+{
+    if (toplevel) {
+        rb_define_global_const(name, value);
+        name += rb_strlen_lit("RUBY_");
+    }
+    rb_define_const(mod, name, value);
+}
+
+/* RDoc needs rb_define_const */
+#define rb_define_const(mod, name, value) \
+    define_ruby_const(mod, (mod == mRuby ? "RUBY_" name : name), value, (mod == mRuby))
+
 /*! Defines platform-depended Ruby-level constants */
 void
 Init_version(void)
 {
+    /*
+     * The Ruby[rdoc-ref:Ruby] module that contains portable information among
+     * implementations.
+     *
+     * The constants defined here are aliased in the toplevel with
+     * +RUBY_+ prefix.
+     */
+    VALUE mRuby = rb_define_module("Ruby");
+
     enum {ruby_patchlevel = RUBY_PATCHLEVEL};
     VALUE version = MKSTR(version);
     VALUE ruby_engine_name = MKSTR(engine);
@@ -93,74 +131,135 @@ Init_version(void)
     /*
      * The running version of ruby
      */
-    rb_define_global_const("RUBY_VERSION", /* MKSTR(version) */ version);
+    rb_define_const(mRuby, "VERSION", /* MKSTR(version) */ version);
     /*
      * The date this ruby was released
      */
-    rb_define_global_const("RUBY_RELEASE_DATE", MKSTR(release_date));
+    rb_define_const(mRuby, "RELEASE_DATE", MKSTR(release_date));
     /*
      * The platform for this ruby
      */
-    rb_define_global_const("RUBY_PLATFORM", MKSTR(platform));
+    rb_define_const(mRuby, "PLATFORM", MKSTR(platform));
     /*
      * The patchlevel for this ruby.  If this is a development build of ruby
      * the patchlevel will be -1
      */
-    rb_define_global_const("RUBY_PATCHLEVEL", MKINT(patchlevel));
+    rb_define_const(mRuby, "PATCHLEVEL", MKINT(patchlevel));
     /*
      * The GIT commit hash for this ruby.
      */
-    rb_define_global_const("RUBY_REVISION", MKSTR(revision));
+    rb_define_const(mRuby, "REVISION", MKSTR(revision));
     /*
      * The copyright string for ruby
      */
-    rb_define_global_const("RUBY_COPYRIGHT", MKSTR(copyright));
+    rb_define_const(mRuby, "COPYRIGHT", MKSTR(copyright));
     /*
      * The engine or interpreter this ruby uses.
      */
-    rb_define_global_const("RUBY_ENGINE", /* MKSTR(engine) */ ruby_engine_name);
+    rb_define_const(mRuby, "ENGINE", /* MKSTR(engine) */ ruby_engine_name);
     ruby_set_script_name(ruby_engine_name);
     /*
      * The version of the engine or interpreter this ruby uses.
      */
-    rb_define_global_const("RUBY_ENGINE_VERSION", /* MKSTR(version) */ version);
+    rb_define_const(mRuby, "ENGINE_VERSION", /* MKSTR(version) */ version);
 
     rb_provide("ruby2_keywords.rb");
 }
 
-#if USE_RJIT
-#define RJIT_OPTS_ON opt->rjit.on
-#else
-#define RJIT_OPTS_ON 0
-#endif
-
 #if USE_YJIT
 #define YJIT_OPTS_ON opt->yjit
 #else
 #define YJIT_OPTS_ON 0
 #endif
 
+#if USE_ZJIT
+#define ZJIT_OPTS_ON opt->zjit
+#else
+#define ZJIT_OPTS_ON 0
+#endif
+
+int ruby_mn_threads_enabled;
+
+#ifndef RB_DEFAULT_PARSER
+#define RB_DEFAULT_PARSER RB_DEFAULT_PARSER_PRISM
+#endif
+static ruby_default_parser_enum default_parser = RB_DEFAULT_PARSER;
+
+ruby_default_parser_enum
+rb_ruby_default_parser(void)
+{
+    return default_parser;
+}
+
 void
-Init_ruby_description(ruby_cmdline_options_t *opt)
+rb_ruby_default_parser_set(ruby_default_parser_enum parser)
+{
+    default_parser = parser;
+}
+
+static void
+define_ruby_description(const char *const jit_opt)
 {
-    VALUE description;
+    static char desc[
+        sizeof(ruby_description)
+        + rb_strlen_lit(JIT_DESCRIPTION)
+        + rb_strlen_lit(" +MN")
+        + rb_strlen_lit(" +PRISM")
+#if USE_MODULAR_GC
+        + rb_strlen_lit(GC_DESCRIPTION)
+        // Assume the active GC name can not be longer than 20 chars
+        // so that we don't have to use strlen and remove the static
+        // qualifier from desc.
+        + RB_GC_MAX_NAME_LEN + 3
+#endif
 
-    if (RJIT_OPTS_ON) {
-        rb_dynamic_description = ruby_description_with_rjit;
-        description = MKSTR(description_with_rjit);
-    }
-    else if (YJIT_OPTS_ON) {
-        rb_dynamic_description = ruby_description_with_yjit;
-        description = MKSTR(description_with_yjit);
-    }
-    else {
-        description = MKSTR(description);
+    ];
+
+    int n = ruby_description_opt_point;
+    memcpy(desc, ruby_description, n);
+# define append(s) (n += (int)strlcpy(desc + n, s, sizeof(desc) - n))
+    if (*jit_opt) append(jit_opt);
+    RUBY_ASSERT(n <= ruby_description_opt_point + (int)rb_strlen_lit(JIT_DESCRIPTION));
+    if (ruby_mn_threads_enabled) append(" +MN");
+    if (rb_ruby_prism_p()) append(" +PRISM");
+#if USE_MODULAR_GC
+    append(GC_DESCRIPTION);
+    if (rb_gc_modular_gc_loaded_p()) {
+        append("[");
+        append(rb_gc_active_gc_name());
+        append("]");
     }
+#endif
+    append(ruby_description + ruby_description_opt_point);
+# undef append
+
+    VALUE mRuby = rb_path2class("Ruby");
+    VALUE description = rb_obj_freeze(rb_usascii_str_new_static(desc, n));
+    rb_dynamic_description = desc;
 
     /*
      * The full ruby version string, like <tt>ruby -v</tt> prints
      */
-    rb_define_global_const("RUBY_DESCRIPTION", /* MKSTR(description) */ description);
+    rb_define_const(mRuby, "DESCRIPTION", /* MKSTR(description) */ description);
+}
+
+void
+Init_ruby_description(ruby_cmdline_options_t *opt)
+{
+    const char *const jit_opt =
+        YJIT_OPTS_ON ? YJIT_DESCRIPTION :
+        ZJIT_OPTS_ON ? ZJIT_DESCRIPTION :
+        "";
+    define_ruby_description(jit_opt);
+}
+
+void
+ruby_set_yjit_description(void)
+{
+    VALUE mRuby = rb_path2class("Ruby");
+    rb_const_remove(rb_cObject, rb_intern("RUBY_DESCRIPTION"));
+    rb_const_remove(mRuby, rb_intern("DESCRIPTION"));
+    define_ruby_description(YJIT_DESCRIPTION);
 }
 
 void
diff --git a/version.h b/version.h
index 46f14e3f14ff3f..eaba1c19856c37 100644
--- a/version.h
+++ b/version.h
@@ -55,11 +55,15 @@
 #endif
 
 #if RUBY_PATCHLEVEL == -1
-#define RUBY_PATCHLEVEL_STR "dev"
+# ifdef RUBY_PATCHLEVEL_NAME
+#  define RUBY_PATCHLEVEL_STR STRINGIZE(RUBY_PATCHLEVEL_NAME)
+# else
+#  define RUBY_PATCHLEVEL_STR "dev"
+# endif
 #elif defined RUBY_ABI_VERSION
-#error RUBY_ABI_VERSION is defined in non-development branch
+# error RUBY_ABI_VERSION is defined in non-development branch
 #else
-#define RUBY_PATCHLEVEL_STR ""
+# define RUBY_PATCHLEVEL_STR ""
 #endif
 
 #endif /* RUBY_TOPLEVEL_VERSION_H */
diff --git a/vm.c b/vm.c
index 4b2b1ad3441ade..86395df3402432 100644
--- a/vm.c
+++ b/vm.c
@@ -16,20 +16,24 @@
 #include "internal/compile.h"
 #include "internal/cont.h"
 #include "internal/error.h"
+#include "internal/encoding.h"
 #include "internal/eval.h"
 #include "internal/gc.h"
 #include "internal/inits.h"
+#include "internal/missing.h"
+#include "internal/namespace.h"
 #include "internal/object.h"
 #include "internal/proc.h"
 #include "internal/re.h"
 #include "internal/ruby_parser.h"
 #include "internal/symbol.h"
 #include "internal/thread.h"
+#include "internal/transcode.h"
 #include "internal/vm.h"
 #include "internal/sanitizers.h"
 #include "internal/variable.h"
 #include "iseq.h"
-#include "rjit.h"
+#include "symbol.h" // This includes a macro for a more performant rb_id2sym.
 #include "yjit.h"
 #include "ruby/st.h"
 #include "ruby/vm.h"
@@ -41,6 +45,8 @@
 #include "ractor_core.h"
 #include "vm_sync.h"
 #include "shape.h"
+#include "insns.inc"
+#include "zjit.h"
 
 #include "builtin.h"
 
@@ -51,6 +57,8 @@
 int ruby_assert_critical_section_entered = 0;
 #endif
 
+static void *native_main_thread_stack_top;
+
 VALUE rb_str_concat_literals(size_t, const VALUE*);
 
 VALUE vm_exec(rb_execution_context_t *);
@@ -166,7 +174,7 @@ vm_ep_in_heap_p_(const rb_execution_context_t *ec, const VALUE *ep)
         if (!UNDEF_P(envval)) {
             const rb_env_t *env = (const rb_env_t *)envval;
 
-            VM_ASSERT(vm_assert_env(envval));
+            VM_ASSERT(imemo_type_p(envval, imemo_env));
             VM_ASSERT(VM_ENV_FLAGS(ep, VM_ENV_FLAG_ESCAPED));
             VM_ASSERT(env->ep == ep);
         }
@@ -223,16 +231,11 @@ vm_cref_new0(VALUE klass, rb_method_visibility_t visi, int module_func, rb_cref_
 {
     VALUE refinements = Qnil;
     int omod_shared = FALSE;
-    rb_cref_t *cref;
 
     /* scope */
-    union {
-        rb_scope_visibility_t visi;
-        VALUE value;
-    } scope_visi;
-
-    scope_visi.visi.method_visi = visi;
-    scope_visi.visi.module_func = module_func;
+    rb_scope_visibility_t scope_visi;
+    scope_visi.method_visi = visi;
+    scope_visi.module_func = module_func;
 
     /* refinements */
     if (prev_cref != NULL && prev_cref != (void *)1 /* TODO: why CREF_NEXT(cref) is 1? */) {
@@ -246,7 +249,10 @@ vm_cref_new0(VALUE klass, rb_method_visibility_t visi, int module_func, rb_cref_
 
     VM_ASSERT(singleton || klass);
 
-    cref = (rb_cref_t *)rb_imemo_new(imemo_cref, klass, (VALUE)(use_prev_prev ? CREF_NEXT(prev_cref) : prev_cref), scope_visi.value, refinements);
+    rb_cref_t *cref = IMEMO_NEW(rb_cref_t, imemo_cref, refinements);
+    cref->klass_or_self = klass;
+    cref->next = use_prev_prev ? CREF_NEXT(prev_cref) : prev_cref;
+    *((rb_scope_visibility_t *)&cref->scope_visi) = scope_visi;
 
     if (pushed_by_eval) CREF_PUSHED_BY_EVAL_SET(cref);
     if (omod_shared) CREF_OMOD_SHARED_SET(cref);
@@ -364,12 +370,55 @@ static void vm_collect_usage_register(int reg, int isset);
 #endif
 
 static VALUE vm_make_env_object(const rb_execution_context_t *ec, rb_control_frame_t *cfp);
-extern VALUE rb_vm_invoke_bmethod(rb_execution_context_t *ec, rb_proc_t *proc, VALUE self,
+static VALUE vm_invoke_bmethod(rb_execution_context_t *ec, rb_proc_t *proc, VALUE self,
                                   int argc, const VALUE *argv, int kw_splat, VALUE block_handler,
                                   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);
 
-#if USE_RJIT || USE_YJIT
+#if USE_YJIT
+// Counter to serve as a proxy for execution time, total number of calls
+static uint64_t yjit_total_entry_hits = 0;
+
+// Number of calls used to estimate how hot an ISEQ is
+#define YJIT_CALL_COUNT_INTERV 20u
+
+/// Test whether we are ready to compile an ISEQ or not
+static inline bool
+rb_yjit_threshold_hit(const rb_iseq_t *iseq, uint64_t entry_calls)
+{
+    yjit_total_entry_hits += 1;
+
+    // Record the number of calls at the beginning of the interval
+    if (entry_calls + YJIT_CALL_COUNT_INTERV == rb_yjit_call_threshold) {
+        iseq->body->yjit_calls_at_interv = yjit_total_entry_hits;
+    }
+
+    // Try to estimate the total time taken (total number of calls) to reach 20 calls to this ISEQ
+    // This give us a ratio of how hot/cold this ISEQ is
+    if (entry_calls == rb_yjit_call_threshold) {
+        // We expect threshold 1 to compile everything immediately
+        if (rb_yjit_call_threshold < YJIT_CALL_COUNT_INTERV) {
+            return true;
+        }
+
+        uint64_t num_calls = yjit_total_entry_hits - iseq->body->yjit_calls_at_interv;
+
+        // Reject ISEQs that don't get called often enough
+        if (num_calls > rb_yjit_cold_threshold) {
+            rb_yjit_incr_counter("cold_iseq_entry");
+            return false;
+        }
+
+        return true;
+    }
+
+    return false;
+}
+#else
+#define rb_yjit_threshold_hit(iseq, entry_calls) false
+#endif
+
+#if USE_YJIT || USE_ZJIT
 // Generate JIT code that supports the following kinds of ISEQ entries:
 //   * The first ISEQ on vm_exec (e.g. <main>, or Ruby methods/blocks
 //     called by a C method). The current frame has VM_FRAME_FLAG_FINISH.
@@ -383,25 +432,33 @@ jit_compile(rb_execution_context_t *ec)
 {
     const rb_iseq_t *iseq = ec->cfp->iseq;
     struct rb_iseq_constant_body *body = ISEQ_BODY(iseq);
-    bool yjit_enabled = rb_yjit_compile_new_iseqs();
-    if (!(yjit_enabled || rb_rjit_call_p)) {
-        return NULL;
+
+#if USE_ZJIT
+    if (body->jit_entry == NULL && rb_zjit_enabled_p) {
+        body->jit_entry_calls++;
+
+        // At profile-threshold, rewrite some of the YARV instructions
+        // to zjit_* instructions to profile these instructions.
+        if (body->jit_entry_calls == rb_zjit_profile_threshold) {
+            rb_zjit_profile_enable(iseq);
+        }
+
+        // At call-threshold, compile the ISEQ with ZJIT.
+        if (body->jit_entry_calls == rb_zjit_call_threshold) {
+            rb_zjit_compile_iseq(iseq, ec, false);
+        }
     }
+#endif
 
+#if USE_YJIT
     // Increment the ISEQ's call counter and trigger JIT compilation if not compiled
-    if (body->jit_entry == NULL) {
+    if (body->jit_entry == NULL && rb_yjit_enabled_p) {
         body->jit_entry_calls++;
-        if (yjit_enabled) {
-            if (rb_yjit_threshold_hit(iseq, body->jit_entry_calls)) {
-                rb_yjit_compile_iseq(iseq, ec, false);
-            }
-        }
-        else { // rb_rjit_call_p
-            if (body->jit_entry_calls == rb_rjit_call_threshold()) {
-                rb_rjit_compile(iseq);
-            }
+        if (rb_yjit_threshold_hit(iseq, body->jit_entry_calls)) {
+            rb_yjit_compile_iseq(iseq, ec, false);
         }
     }
+#endif
     return body->jit_entry;
 }
 
@@ -435,17 +492,16 @@ jit_compile_exception(rb_execution_context_t *ec)
 {
     const rb_iseq_t *iseq = ec->cfp->iseq;
     struct rb_iseq_constant_body *body = ISEQ_BODY(iseq);
-    if (!rb_yjit_compile_new_iseqs()) {
-        return NULL;
-    }
 
     // Increment the ISEQ's call counter and trigger JIT compilation if not compiled
-    if (body->jit_exception == NULL) {
+#if USE_YJIT
+    if (body->jit_exception == NULL && rb_yjit_enabled_p) {
         body->jit_exception_calls++;
-        if (rb_yjit_threshold_hit(iseq, body->jit_exception_calls)) {
+        if (body->jit_exception_calls == rb_yjit_call_threshold) {
             rb_yjit_compile_iseq(iseq, ec, true);
         }
     }
+#endif
     return body->jit_exception;
 }
 
@@ -467,6 +523,20 @@ jit_exec_exception(rb_execution_context_t *ec)
 # define jit_exec_exception(ec) Qundef
 #endif
 
+static void add_opt_method_entry(const rb_method_entry_t *me);
+
+#define RB_TYPE_2_P(obj, type1, type2) \
+    (RB_TYPE_P(obj, type1) || RB_TYPE_P(obj, type2))
+#define RB_TYPE_3_P(obj, type1, type2, type3) \
+    (RB_TYPE_P(obj, type1) || RB_TYPE_P(obj, type2) || RB_TYPE_P(obj, type3))
+
+#define VM_ASSERT_TYPE(obj, type) \
+    VM_ASSERT(RB_TYPE_P(obj, type), #obj ": %s", rb_obj_info(obj))
+#define VM_ASSERT_TYPE2(obj, type1, type2) \
+    VM_ASSERT(RB_TYPE_2_P(obj, type1, type2), #obj ": %s", rb_obj_info(obj))
+#define VM_ASSERT_TYPE3(obj, type1, type2, type3) \
+    VM_ASSERT(RB_TYPE_3_P(obj, type1, type2, type3), #obj ": %s", rb_obj_info(obj))
+
 #include "vm_insnhelper.c"
 
 #include "vm_exec.c"
@@ -488,13 +558,14 @@ bool ruby_vm_keep_script_lines;
 
 #ifdef RB_THREAD_LOCAL_SPECIFIER
 RB_THREAD_LOCAL_SPECIFIER rb_execution_context_t *ruby_current_ec;
+
 #ifdef RUBY_NT_SERIAL
 RB_THREAD_LOCAL_SPECIFIER rb_atomic_t ruby_nt_serial;
 #endif
 
-#ifdef __APPLE__
+// no-inline decl on vm_core.h
 rb_execution_context_t *
-rb_current_ec(void)
+rb_current_ec_noinline(void)
 {
     return ruby_current_ec;
 }
@@ -504,10 +575,26 @@ rb_current_ec_set(rb_execution_context_t *ec)
 {
     ruby_current_ec = ec;
 }
-#endif
 
+
+#if defined(__arm64__) || defined(__aarch64__)
+rb_execution_context_t *
+rb_current_ec(void)
+{
+    return ruby_current_ec;
+}
+
+#endif
 #else
 native_tls_key_t ruby_current_ec_key;
+
+// no-inline decl on vm_core.h
+rb_execution_context_t *
+rb_current_ec_noinline(void)
+{
+    return native_tls_get(ruby_current_ec_key);
+}
+
 #endif
 
 rb_event_flag_t ruby_vm_event_flags;
@@ -559,7 +646,7 @@ rb_dtrace_setup(rb_execution_context_t *ec, VALUE klass, ID id,
     if (RB_TYPE_P(klass, T_ICLASS)) {
         klass = RBASIC(klass)->klass;
     }
-    else if (FL_TEST(klass, FL_SINGLETON)) {
+    else if (RCLASS_SINGLETON_P(klass)) {
         klass = RCLASS_ATTACHED_OBJECT(klass);
         if (NIL_P(klass)) return FALSE;
     }
@@ -582,6 +669,8 @@ rb_dtrace_setup(rb_execution_context_t *ec, VALUE klass, ID id,
     return FALSE;
 }
 
+extern unsigned int redblack_buffer_size;
+
 /*
  *  call-seq:
  *    RubyVM.stat -> Hash
@@ -609,6 +698,7 @@ static VALUE
 vm_stat(int argc, VALUE *argv, VALUE self)
 {
     static VALUE sym_constant_cache_invalidations, sym_constant_cache_misses, sym_global_cvar_state, sym_next_shape_id;
+    static VALUE sym_shape_cache_size;
     VALUE arg = Qnil;
     VALUE hash = Qnil, key = Qnil;
 
@@ -630,6 +720,7 @@ vm_stat(int argc, VALUE *argv, VALUE self)
     S(constant_cache_misses);
         S(global_cvar_state);
     S(next_shape_id);
+    S(shape_cache_size);
 #undef S
 
 #define SET(name, attr) \
@@ -641,7 +732,8 @@ vm_stat(int argc, VALUE *argv, VALUE self)
     SET(constant_cache_invalidations, ruby_vm_constant_cache_invalidations);
     SET(constant_cache_misses, ruby_vm_constant_cache_misses);
     SET(global_cvar_state, ruby_vm_global_cvar_state);
-    SET(next_shape_id, (rb_serial_t)GET_SHAPE_TREE()->next_shape_id);
+    SET(next_shape_id, (rb_serial_t)rb_shapes_count());
+    SET(shape_cache_size, (rb_serial_t)rb_shape_tree.cache_size);
 #undef SET
 
 #if USE_DEBUG_COUNTER
@@ -848,7 +940,7 @@ vm_block_handler_escape(const rb_execution_context_t *ec, VALUE block_handler)
     switch (vm_block_handler_type(block_handler)) {
       case block_handler_type_ifunc:
       case block_handler_type_iseq:
-        return  rb_vm_make_proc(ec, VM_BH_TO_CAPT_BLOCK(block_handler), rb_cProc);
+        return rb_vm_make_proc(ec, VM_BH_TO_CAPT_BLOCK(block_handler), rb_cProc);
 
       case block_handler_type_symbol:
       case block_handler_type_proc:
@@ -862,8 +954,6 @@ static VALUE
 vm_make_env_each(const rb_execution_context_t * const ec, rb_control_frame_t *const cfp)
 {
     const VALUE * const ep = cfp->ep;
-    const rb_env_t *env;
-    const rb_iseq_t *env_iseq;
     VALUE *env_body, *env_ep;
     int local_size, env_size;
 
@@ -898,7 +988,14 @@ vm_make_env_each(const rb_execution_context_t * const ec, rb_control_frame_t *co
         local_size = VM_ENV_DATA_SIZE;
     }
     else {
-        local_size = ISEQ_BODY(cfp->iseq)->local_table_size + VM_ENV_DATA_SIZE;
+        local_size = ISEQ_BODY(cfp->iseq)->local_table_size;
+        if (ISEQ_BODY(cfp->iseq)->param.flags.forwardable && VM_ENV_LOCAL_P(cfp->ep)) {
+            int ci_offset = local_size - ISEQ_BODY(cfp->iseq)->param.size + VM_ENV_DATA_SIZE;
+
+            CALL_INFO ci = (CALL_INFO)VM_CF_LEP(cfp)[-ci_offset];
+            local_size += vm_ci_argc(ci);
+        }
+        local_size += VM_ENV_DATA_SIZE;
     }
 
     /*
@@ -915,9 +1012,26 @@ vm_make_env_each(const rb_execution_context_t * const ec, rb_control_frame_t *co
 
     env_size = local_size +
                1 /* envval */;
+
+    // Careful with order in the following sequence. Each allocation can move objects.
     env_body = ALLOC_N(VALUE, env_size);
+    rb_env_t *env = IMEMO_NEW(rb_env_t, imemo_env, 0);
+
+    // Set up env without WB since it's brand new (similar to newobj_init(), newobj_fill())
     MEMCPY(env_body, ep - (local_size - 1 /* specval */), VALUE, local_size);
 
+    env_ep = &env_body[local_size - 1 /* specval */];
+    env_ep[VM_ENV_DATA_INDEX_ENV] = (VALUE)env;
+
+    env->iseq = (rb_iseq_t *)(VM_FRAME_RUBYFRAME_P(cfp) ? cfp->iseq : NULL);
+    env->ep = env_ep;
+    env->env = env_body;
+    env->env_size = env_size;
+
+    cfp->ep = env_ep;
+    VM_ENV_FLAGS_SET(env_ep, VM_ENV_FLAG_ESCAPED | VM_ENV_FLAG_WB_REQUIRED);
+    VM_STACK_ENV_WRITE(ep, 0, (VALUE)env);		/* GC mark */
+
 #if 0
     for (i = 0; i < local_size; i++) {
         if (VM_FRAME_RUBYFRAME_P(cfp)) {
@@ -927,14 +1041,12 @@ vm_make_env_each(const rb_execution_context_t * const ec, rb_control_frame_t *co
     }
 #endif
 
-    env_iseq = VM_FRAME_RUBYFRAME_P(cfp) ? cfp->iseq : NULL;
-    env_ep = &env_body[local_size - 1 /* specval */];
-
-    env = vm_env_new(env_ep, env_body, env_size, env_iseq);
+    // Invalidate JIT code that assumes cfp->ep == vm_base_ptr(cfp).
+    if (env->iseq) {
+        rb_yjit_invalidate_ep_is_bp(env->iseq);
+        rb_zjit_invalidate_ep_is_bp(env->iseq);
+    }
 
-    cfp->ep = env_ep;
-    VM_ENV_FLAGS_SET(env_ep, VM_ENV_FLAG_ESCAPED | VM_ENV_FLAG_WB_REQUIRED);
-    VM_STACK_ENV_WRITE(ep, 0, (VALUE)env);		/* GC mark */
     return (VALUE)env;
 }
 
@@ -1015,6 +1127,21 @@ rb_vm_env_local_variables(const rb_env_t *env)
     return local_var_list_finish(&vars);
 }
 
+VALUE
+rb_vm_env_numbered_parameters(const rb_env_t *env)
+{
+    struct local_var_list vars;
+    local_var_list_init(&vars);
+    // if (VM_ENV_FLAGS(env->ep, VM_ENV_FLAG_ISOLATED)) break; // TODO: is this needed?
+    const rb_iseq_t *iseq = env->iseq;
+    unsigned int i;
+    if (!iseq) return 0;
+    for (i = 0; i < ISEQ_BODY(iseq)->local_table_size; i++) {
+        numparam_list_add(&vars, ISEQ_BODY(iseq)->local_table[i]);
+    }
+    return local_var_list_finish(&vars);
+}
+
 VALUE
 rb_iseq_local_variables(const rb_iseq_t *iseq)
 {
@@ -1036,6 +1163,7 @@ vm_proc_create_from_captured(VALUE klass,
 {
     VALUE procval = rb_proc_alloc(klass);
     rb_proc_t *proc = RTYPEDDATA_DATA(procval);
+    const rb_namespace_t *ns = rb_current_namespace();
 
     VM_ASSERT(VM_EP_IN_HEAP_P(GET_EC(), captured->ep));
 
@@ -1045,6 +1173,7 @@ vm_proc_create_from_captured(VALUE klass,
     rb_vm_block_ep_update(procval, &proc->block, captured->ep);
 
     vm_block_type_set(&proc->block, block_type);
+    proc->ns = ns;
     proc->is_from_method = is_from_method;
     proc->is_lambda = is_lambda;
 
@@ -1076,10 +1205,12 @@ proc_create(VALUE klass, const struct rb_block *block, int8_t is_from_method, in
 {
     VALUE procval = rb_proc_alloc(klass);
     rb_proc_t *proc = RTYPEDDATA_DATA(procval);
+    const rb_namespace_t *ns = rb_current_namespace();
 
     VM_ASSERT(VM_EP_IN_HEAP_P(GET_EC(), vm_block_ep(block)));
     rb_vm_block_copy(procval, &proc->block, block);
     vm_block_type_set(&proc->block, block->type);
+    proc->ns = ns;
     proc->is_from_method = is_from_method;
     proc->is_lambda = is_lambda;
 
@@ -1093,7 +1224,16 @@ rb_proc_dup(VALUE self)
     rb_proc_t *src;
 
     GetProcPtr(self, src);
-    procval = proc_create(rb_obj_class(self), &src->block, src->is_from_method, src->is_lambda);
+
+    switch (vm_block_type(&src->block)) {
+      case block_type_ifunc:
+        procval = rb_func_proc_dup(self);
+        break;
+      default:
+        procval = proc_create(rb_obj_class(self), &src->block, src->is_from_method, src->is_lambda);
+        break;
+    }
+
     if (RB_OBJ_SHAREABLE_P(self)) FL_SET_RAW(procval, RUBY_FL_SHAREABLE);
     RB_GC_GUARD(self); /* for: body = rb_proc_dup(body) */
     return procval;
@@ -1155,26 +1295,33 @@ env_copy(const VALUE *src_ep, VALUE read_only_variables)
 
     VALUE *env_body = ZALLOC_N(VALUE, src_env->env_size); // fill with Qfalse
     VALUE *ep = &env_body[src_env->env_size - 2];
-    volatile VALUE prev_env = Qnil;
+    const rb_env_t *copied_env = vm_env_new(ep, env_body, src_env->env_size, src_env->iseq);
+
+    // Copy after allocations above, since they can move objects in src_ep.
+    RB_OBJ_WRITE(copied_env, &ep[VM_ENV_DATA_INDEX_ME_CREF], src_ep[VM_ENV_DATA_INDEX_ME_CREF]);
+    ep[VM_ENV_DATA_INDEX_FLAGS] = src_ep[VM_ENV_DATA_INDEX_FLAGS] | VM_ENV_FLAG_ISOLATED;
+    if (!VM_ENV_LOCAL_P(src_ep)) {
+        VM_ENV_FLAGS_SET(ep, VM_ENV_FLAG_LOCAL);
+    }
 
     if (read_only_variables) {
         for (int i=RARRAY_LENINT(read_only_variables)-1; i>=0; i--) {
             ID id = NUM2ID(RARRAY_AREF(read_only_variables, i));
 
             for (unsigned int j=0; j<ISEQ_BODY(src_env->iseq)->local_table_size; j++) {
-                if (id ==  ISEQ_BODY(src_env->iseq)->local_table[j]) {
+                if (id == ISEQ_BODY(src_env->iseq)->local_table[j]) {
                     VALUE v = src_env->env[j];
                     if (!rb_ractor_shareable_p(v)) {
                         VALUE name = rb_id2str(id);
                         VALUE msg = rb_sprintf("can not make shareable Proc because it can refer"
                                                " unshareable object %+" PRIsVALUE " from ", v);
                         if (name)
-                            rb_str_catf(msg, "variable `%" PRIsVALUE "'", name);
+                            rb_str_catf(msg, "variable '%" PRIsVALUE "'", name);
                         else
                             rb_str_cat_cstr(msg, "a hidden variable");
                         rb_exc_raise(rb_exc_new_str(rb_eRactorIsolationError, msg));
                     }
-                    env_body[j] = v;
+                    RB_OBJ_WRITE((VALUE)copied_env, &env_body[j], v);
                     rb_ary_delete_at(read_only_variables, i);
                     break;
                 }
@@ -1182,21 +1329,17 @@ env_copy(const VALUE *src_ep, VALUE read_only_variables)
         }
     }
 
-    ep[VM_ENV_DATA_INDEX_ME_CREF] = src_ep[VM_ENV_DATA_INDEX_ME_CREF];
-    ep[VM_ENV_DATA_INDEX_FLAGS]   = src_ep[VM_ENV_DATA_INDEX_FLAGS] | VM_ENV_FLAG_ISOLATED;
-
     if (!VM_ENV_LOCAL_P(src_ep)) {
         const VALUE *prev_ep = VM_ENV_PREV_EP(src_env->ep);
         const rb_env_t *new_prev_env = env_copy(prev_ep, read_only_variables);
-        prev_env = (VALUE)new_prev_env;
         ep[VM_ENV_DATA_INDEX_SPECVAL] = VM_GUARDED_PREV_EP(new_prev_env->ep);
+        RB_OBJ_WRITTEN(copied_env, Qundef, new_prev_env);
+        VM_ENV_FLAGS_UNSET(ep, VM_ENV_FLAG_LOCAL);
     }
     else {
         ep[VM_ENV_DATA_INDEX_SPECVAL] = VM_BLOCK_HANDLER_NONE;
     }
 
-    const rb_env_t *copied_env = vm_env_new(ep, env_body, src_env->env_size, src_env->iseq);
-    RB_GC_GUARD(prev_env);
     return copied_env;
 }
 
@@ -1232,11 +1375,11 @@ proc_shared_outer_variables(struct rb_id_table *outer_variables, bool isolate, c
             rb_str_append(str, name);
         }
         if (*sep == ',') rb_str_cat_cstr(str, ")");
-        rb_str_cat_cstr(str, data.yield ? " and uses `yield'." : ".");
+        rb_str_cat_cstr(str, data.yield ? " and uses 'yield'." : ".");
         rb_exc_raise(rb_exc_new_str(rb_eArgError, str));
     }
     else if (data.yield) {
-        rb_raise(rb_eArgError, "can not %s because it uses `yield'.", message);
+        rb_raise(rb_eArgError, "can not %s because it uses 'yield'.", message);
     }
 
     return data.read_only;
@@ -1297,7 +1440,7 @@ rb_proc_ractor_make_shareable(VALUE self)
         proc->is_isolated = TRUE;
     }
 
-    FL_SET_RAW(self, RUBY_FL_SHAREABLE);
+    rb_obj_freeze(self);
     return self;
 }
 
@@ -1319,7 +1462,7 @@ rb_vm_make_proc_lambda(const rb_execution_context_t *ec, const struct rb_capture
                                            code_type == imemo_iseq ? block_type_iseq : block_type_ifunc,
                                            FALSE, is_lambda);
 
-    if (code_type ==  imemo_ifunc) {
+    if (code_type == imemo_ifunc) {
         struct vm_ifunc *ifunc = (struct vm_ifunc *)captured->code.val;
         if (ifunc->svar_lep) {
             VALUE ep0 = ifunc->svar_lep[0];
@@ -1383,8 +1526,7 @@ rb_binding_add_dynavars(VALUE bindval, rb_binding_t *bind, int dyncount, const I
     const rb_env_t *env;
     rb_execution_context_t *ec = GET_EC();
     const rb_iseq_t *base_iseq, *iseq;
-    rb_ast_body_t ast;
-    NODE tmp_node;
+    rb_node_scope_t tmp_node;
 
     if (dyncount < 0) return 0;
 
@@ -1396,18 +1538,19 @@ rb_binding_add_dynavars(VALUE bindval, rb_binding_t *bind, int dyncount, const I
     dyns->size = dyncount;
     MEMCPY(dyns->ids, dynvars, ID, dyncount);
 
-    rb_node_init(&tmp_node, NODE_SCOPE, (VALUE)dyns, 0, 0);
-    ast.root = &tmp_node;
-    ast.frozen_string_literal = -1;
-    ast.coverage_enabled = -1;
-    ast.script_lines = INT2FIX(-1);
+    rb_node_init(RNODE(&tmp_node), NODE_SCOPE);
+    tmp_node.nd_tbl = dyns;
+    tmp_node.nd_body = 0;
+    tmp_node.nd_args = 0;
+
+    VALUE ast_value = rb_ruby_ast_new(RNODE(&tmp_node));
 
     if (base_iseq) {
-        iseq = rb_iseq_new(&ast, ISEQ_BODY(base_iseq)->location.label, path, realpath, base_iseq, ISEQ_TYPE_EVAL);
+        iseq = rb_iseq_new(ast_value, ISEQ_BODY(base_iseq)->location.label, path, realpath, base_iseq, ISEQ_TYPE_EVAL);
     }
     else {
         VALUE tempstr = rb_fstring_lit("<temp>");
-        iseq = rb_iseq_new_top(&ast, tempstr, tempstr, tempstr, NULL);
+        iseq = rb_iseq_new_top(ast_value, tempstr, tempstr, tempstr, NULL);
     }
     tmp_node.nd_tbl = 0; /* reset table */
     ALLOCV_END(idtmp);
@@ -1422,7 +1565,7 @@ rb_binding_add_dynavars(VALUE bindval, rb_binding_t *bind, int dyncount, const I
 
 /* C -> Ruby: block */
 
-static inline VALUE
+static inline void
 invoke_block(rb_execution_context_t *ec, const rb_iseq_t *iseq, VALUE self, const struct rb_captured_block *captured, const rb_cref_t *cref, VALUE type, int opt_pc)
 {
     int arg_size = ISEQ_BODY(iseq)->param.size;
@@ -1434,15 +1577,13 @@ invoke_block(rb_execution_context_t *ec, const rb_iseq_t *iseq, VALUE self, cons
                   ec->cfp->sp + arg_size,
                   ISEQ_BODY(iseq)->local_table_size - arg_size,
                   ISEQ_BODY(iseq)->stack_max);
-    return vm_exec(ec);
 }
 
-static VALUE
+static inline void
 invoke_bmethod(rb_execution_context_t *ec, const rb_iseq_t *iseq, VALUE self, const struct rb_captured_block *captured, const rb_callable_method_entry_t *me, VALUE type, int opt_pc)
 {
     /* bmethod call from outside the VM */
     int arg_size = ISEQ_BODY(iseq)->param.size;
-    VALUE ret;
 
     VM_ASSERT(me->def->type == VM_METHOD_TYPE_BMETHOD);
 
@@ -1455,9 +1596,6 @@ invoke_bmethod(rb_execution_context_t *ec, const rb_iseq_t *iseq, VALUE self, co
                   ISEQ_BODY(iseq)->stack_max);
 
     VM_ENV_FLAGS_SET(ec->cfp->ep, VM_FRAME_FLAG_FINISH);
-    ret = vm_exec(ec);
-
-    return ret;
 }
 
 ALWAYS_INLINE(static VALUE
@@ -1504,14 +1642,16 @@ invoke_iseq_block_from_c(rb_execution_context_t *ec, const struct rb_captured_bl
     cfp->sp = sp;
 
     if (me == NULL) {
-        return invoke_block(ec, iseq, self, captured, cref, type, opt_pc);
+        invoke_block(ec, iseq, self, captured, cref, type, opt_pc);
     }
     else {
-        return invoke_bmethod(ec, iseq, self, captured, me, type, opt_pc);
+        invoke_bmethod(ec, iseq, self, captured, me, type, opt_pc);
     }
+
+    return vm_exec(ec);
 }
 
-static inline VALUE
+static VALUE
 invoke_block_from_c_bh(rb_execution_context_t *ec, VALUE block_handler,
                        int argc, const VALUE *argv,
                        int kw_splat, VALUE passed_block_handler, const rb_cref_t *cref,
@@ -1635,8 +1775,8 @@ vm_invoke_proc(rb_execution_context_t *ec, rb_proc_t *proc, VALUE self,
     return invoke_block_from_c_proc(ec, proc, self, argc, argv, kw_splat, passed_block_handler, proc->is_lambda, NULL);
 }
 
-VALUE
-rb_vm_invoke_bmethod(rb_execution_context_t *ec, rb_proc_t *proc, VALUE self,
+static VALUE
+vm_invoke_bmethod(rb_execution_context_t *ec, rb_proc_t *proc, VALUE self,
                      int argc, const VALUE *argv, int kw_splat, VALUE block_handler, const rb_callable_method_entry_t *me)
 {
     return invoke_block_from_c_proc(ec, proc, self, argc, argv, kw_splat, block_handler, TRUE, me);
@@ -1650,7 +1790,7 @@ rb_vm_invoke_proc(rb_execution_context_t *ec, rb_proc_t *proc,
     vm_block_handler_verify(passed_block_handler);
 
     if (proc->is_from_method) {
-        return rb_vm_invoke_bmethod(ec, proc, self, argc, argv, kw_splat, passed_block_handler, NULL);
+        return vm_invoke_bmethod(ec, proc, self, argc, argv, kw_splat, passed_block_handler, NULL);
     }
     else {
         return vm_invoke_proc(ec, proc, self, argc, argv, kw_splat, passed_block_handler);
@@ -1664,7 +1804,7 @@ rb_vm_invoke_proc_with_self(rb_execution_context_t *ec, rb_proc_t *proc, VALUE s
     vm_block_handler_verify(passed_block_handler);
 
     if (proc->is_from_method) {
-        return rb_vm_invoke_bmethod(ec, proc, self, argc, argv, kw_splat, passed_block_handler, NULL);
+        return vm_invoke_bmethod(ec, proc, self, argc, argv, kw_splat, passed_block_handler, NULL);
     }
     else {
         return vm_invoke_proc(ec, proc, self, argc, argv, kw_splat, passed_block_handler);
@@ -1677,7 +1817,7 @@ VALUE *
 rb_vm_svar_lep(const rb_execution_context_t *ec, const rb_control_frame_t *cfp)
 {
     while (cfp->pc == 0 || cfp->iseq == 0) {
-        if (VM_FRAME_TYPE(cfp) ==  VM_FRAME_MAGIC_IFUNC) {
+        if (VM_FRAME_TYPE(cfp) == VM_FRAME_MAGIC_IFUNC) {
             struct vm_ifunc *ifunc = (struct vm_ifunc *)cfp->iseq;
             return ifunc->svar_lep;
         }
@@ -1690,12 +1830,7 @@ rb_vm_svar_lep(const rb_execution_context_t *ec, const rb_control_frame_t *cfp)
         }
     }
 
-    if (cfp) {
-        return (VALUE *)VM_CF_LEP(cfp);
-    }
-    else {
-        return NULL;
-    }
+    return (VALUE *)VM_CF_LEP(cfp);
 }
 
 static VALUE
@@ -1746,6 +1881,17 @@ rb_lastline_set(VALUE val)
     vm_svar_set(GET_EC(), VM_SVAR_LASTLINE, val);
 }
 
+void
+rb_lastline_set_up(VALUE val, unsigned int up)
+{
+    rb_control_frame_t * cfp = GET_EC()->cfp;
+
+    for(unsigned int i = 0; i < up; i++) {
+        cfp = RUBY_VM_PREVIOUS_CONTROL_FRAME(cfp);
+    }
+    vm_cfp_svar_set(GET_EC(), cfp, VM_SVAR_LASTLINE, val);
+}
+
 /* misc */
 
 const char *
@@ -1896,7 +2042,7 @@ rb_vm_localjump_error(const char *mesg, VALUE value, int reason)
 }
 
 VALUE
-rb_vm_make_jump_tag_but_local_jump(int state, VALUE val)
+rb_vm_make_jump_tag_but_local_jump(enum ruby_tag_type state, VALUE val)
 {
     const char *mesg;
 
@@ -1928,7 +2074,7 @@ rb_vm_make_jump_tag_but_local_jump(int state, VALUE val)
 }
 
 void
-rb_vm_jump_tag_but_local_jump(int state)
+rb_vm_jump_tag_but_local_jump(enum ruby_tag_type state)
 {
     VALUE exc = rb_vm_make_jump_tag_but_local_jump(state, Qundef);
     if (!NIL_P(exc)) rb_exc_raise(exc);
@@ -1979,6 +2125,13 @@ short ruby_vm_redefined_flag[BOP_LAST_];
 static st_table *vm_opt_method_def_table = 0;
 static st_table *vm_opt_mid_table = 0;
 
+void
+rb_free_vm_opt_tables(void)
+{
+    st_free_table(vm_opt_method_def_table);
+    st_free_table(vm_opt_mid_table);
+}
+
 static int
 vm_redefinition_check_flag(VALUE klass)
 {
@@ -2016,6 +2169,8 @@ vm_redefinition_check_method_type(const rb_method_entry_t *me)
         return FALSE;
     }
 
+    if (METHOD_ENTRY_BASIC(me)) return TRUE;
+
     const rb_method_definition_t *def = me->def;
     switch (def->type) {
       case VM_METHOD_TYPE_CFUNC:
@@ -2030,7 +2185,7 @@ static void
 rb_vm_check_redefinition_opt_method(const rb_method_entry_t *me, VALUE klass)
 {
     st_data_t bop;
-    if (RB_TYPE_P(klass, T_ICLASS) && FL_TEST(klass, RICLASS_IS_ORIGIN) &&
+    if (RB_TYPE_P(klass, T_ICLASS) && RICLASS_IS_ORIGIN_P(klass) &&
             RB_TYPE_P(RBASIC_CLASS(klass), T_CLASS)) {
        klass = RBASIC_CLASS(klass);
     }
@@ -2038,8 +2193,14 @@ rb_vm_check_redefinition_opt_method(const rb_method_entry_t *me, VALUE klass)
         if (st_lookup(vm_opt_method_def_table, (st_data_t)me->def, &bop)) {
             int flag = vm_redefinition_check_flag(klass);
             if (flag != 0) {
+                rb_category_warn(
+                    RB_WARN_CATEGORY_PERFORMANCE,
+                    "Redefining '%s#%s' disables interpreter and JIT optimizations",
+                    rb_class2name(me->owner),
+                    rb_id2name(me->called_id)
+                );
                 rb_yjit_bop_redefined(flag, (enum ruby_basic_operators)bop);
-                rb_rjit_bop_redefined(flag, (enum ruby_basic_operators)bop);
+                rb_zjit_bop_redefined(flag, (enum ruby_basic_operators)bop);
                 ruby_vm_redefined_flag[bop] |= flag;
             }
         }
@@ -2066,27 +2227,44 @@ rb_vm_check_redefinition_by_prepend(VALUE klass)
 }
 
 static void
-add_opt_method(VALUE klass, ID mid, VALUE bop)
+add_opt_method_entry_bop(const rb_method_entry_t *me, ID mid, enum ruby_basic_operators bop)
+{
+    st_insert(vm_opt_method_def_table, (st_data_t)me->def, (st_data_t)bop);
+    st_insert(vm_opt_mid_table, (st_data_t)mid, (st_data_t)Qtrue);
+}
+
+static void
+add_opt_method(VALUE klass, ID mid, enum ruby_basic_operators bop)
 {
     const rb_method_entry_t *me = rb_method_entry_at(klass, mid);
 
     if (me && vm_redefinition_check_method_type(me)) {
-        st_insert(vm_opt_method_def_table, (st_data_t)me->def, (st_data_t)bop);
-        st_insert(vm_opt_mid_table, (st_data_t)mid, (st_data_t)Qtrue);
+        add_opt_method_entry_bop(me, mid, bop);
     }
     else {
         rb_bug("undefined optimized method: %s", rb_id2name(mid));
     }
 }
 
+static enum ruby_basic_operators vm_redefinition_bop_for_id(ID mid);
+
+static void
+add_opt_method_entry(const rb_method_entry_t *me)
+{
+    if (me && vm_redefinition_check_method_type(me)) {
+        ID mid = me->called_id;
+        enum ruby_basic_operators bop = vm_redefinition_bop_for_id(mid);
+        if ((int)bop >= 0) {
+            add_opt_method_entry_bop(me, mid, bop);
+        }
+    }
+}
+
 static void
 vm_init_redefined_flag(void)
 {
     ID mid;
-    VALUE bop;
-
-    vm_opt_method_def_table = st_init_numtable();
-    vm_opt_mid_table = st_init_numtable();
+    enum ruby_basic_operators bop;
 
 #define OP(mid_, bop_) (mid = id##mid_, bop = BOP_##bop_, ruby_vm_redefined_flag[bop] = 0)
 #define C(k) add_opt_method(rb_c##k, mid, bop)
@@ -2110,7 +2288,7 @@ vm_init_redefined_flag(void)
     OP(EmptyP, EMPTY_P), (C(Array), C(String), C(Hash));
     OP(Succ, SUCC), (C(Integer), C(String));
     OP(EqTilde, MATCH), (C(Regexp), C(String));
-    OP(Freeze, FREEZE), (C(String));
+    OP(Freeze, FREEZE), (C(String), C(Array), C(Hash));
     OP(UMinus, UMINUS), (C(String));
     OP(Max, MAX), (C(Array));
     OP(Min, MIN), (C(Array));
@@ -2121,10 +2299,52 @@ vm_init_redefined_flag(void)
     OP(NilP, NIL_P), (C(NilClass));
     OP(Cmp, CMP), (C(Integer), C(Float), C(String));
     OP(Default, DEFAULT), (C(Hash));
+    OP(IncludeP, INCLUDE_P), (C(Array));
 #undef C
 #undef OP
 }
 
+static enum ruby_basic_operators
+vm_redefinition_bop_for_id(ID mid)
+{
+    switch (mid) {
+#define OP(mid_, bop_) case id##mid_: return BOP_##bop_
+    OP(PLUS, PLUS);
+    OP(MINUS, MINUS);
+    OP(MULT, MULT);
+    OP(DIV, DIV);
+    OP(MOD, MOD);
+    OP(Eq, EQ);
+    OP(Eqq, EQQ);
+    OP(LT, LT);
+    OP(LE, LE);
+    OP(GT, GT);
+    OP(GE, GE);
+    OP(LTLT, LTLT);
+    OP(AREF, AREF);
+    OP(ASET, ASET);
+    OP(Length, LENGTH);
+    OP(Size, SIZE);
+    OP(EmptyP, EMPTY_P);
+    OP(Succ, SUCC);
+    OP(EqTilde, MATCH);
+    OP(Freeze, FREEZE);
+    OP(UMinus, UMINUS);
+    OP(Max, MAX);
+    OP(Min, MIN);
+    OP(Hash, HASH);
+    OP(Call, CALL);
+    OP(And, AND);
+    OP(Or, OR);
+    OP(NilP, NIL_P);
+    OP(Cmp, CMP);
+    OP(Default, DEFAULT);
+    OP(Pack, PACK);
+#undef OP
+    }
+    return -1;
+}
+
 /* for vm development */
 
 #if VMDEBUG
@@ -2391,7 +2611,7 @@ vm_exec(rb_execution_context_t *ec)
 
     rb_wasm_try_catch_init(&try_catch, vm_exec_bottom_main, vm_exec_bottom_rescue, &ctx);
 
-    rb_wasm_try_catch_loop_run(&try_catch, &_tag.buf);
+    rb_wasm_try_catch_loop_run(&try_catch, &RB_VM_TAG_JMPBUF_GET(_tag.buf));
 
     result = ctx.result;
 #else
@@ -2635,6 +2855,7 @@ vm_exec_handle_exception(rb_execution_context_t *ec, enum ruby_tag_type state, V
             if (VM_FRAME_FINISHED_P(ec->cfp)) {
                 rb_vm_pop_frame(ec);
                 ec->errinfo = (VALUE)err;
+                rb_vm_tag_jmpbuf_deinit(&ec->tag->buf);
                 ec->tag = ec->tag->prev;
                 EC_JUMP_TAG(ec, state);
             }
@@ -2653,17 +2874,30 @@ rb_iseq_eval(const rb_iseq_t *iseq)
     rb_execution_context_t *ec = GET_EC();
     VALUE val;
     vm_set_top_stack(ec, iseq);
+    // TODO: set the namespace frame like require/load
     val = vm_exec(ec);
     return val;
 }
 
 VALUE
-rb_iseq_eval_main(const rb_iseq_t *iseq)
+rb_iseq_eval_with_refinement(const rb_iseq_t *iseq, VALUE mod)
 {
     rb_execution_context_t *ec = GET_EC();
     VALUE val;
+    vm_set_top_stack(ec, iseq);
+    rb_vm_using_module(mod);
+    // TODO: set the namespace frame like require/load
+    val = vm_exec(ec);
+    return val;
+}
 
+VALUE
+rb_iseq_eval_main(const rb_iseq_t *iseq)
+{
+    rb_execution_context_t *ec = GET_EC();
+    VALUE val;
     vm_set_main_stack(ec, iseq);
+    // TODO: set the namespace frame like require/load
     val = vm_exec(ec);
     return val;
 }
@@ -2702,7 +2936,7 @@ rb_vm_call_cfunc(VALUE recv, VALUE (*func)(VALUE), VALUE arg,
 {
     rb_execution_context_t *ec = GET_EC();
     const rb_control_frame_t *reg_cfp = ec->cfp;
-    const rb_iseq_t *iseq = rb_iseq_new(0, filename, filename, Qnil, 0, ISEQ_TYPE_TOP);
+    const rb_iseq_t *iseq = rb_iseq_new(Qnil, filename, filename, Qnil, 0, ISEQ_TYPE_TOP);
     VALUE val;
 
     vm_push_frame(ec, iseq, VM_FRAME_MAGIC_TOP | VM_ENV_FLAG_LOCAL | VM_FRAME_FLAG_FINISH,
@@ -2716,6 +2950,26 @@ rb_vm_call_cfunc(VALUE recv, VALUE (*func)(VALUE), VALUE arg,
     return val;
 }
 
+VALUE
+rb_vm_call_cfunc2(VALUE recv, VALUE (*func)(VALUE, VALUE), VALUE arg1, VALUE arg2,
+                 VALUE block_handler, VALUE filename)
+{
+    rb_execution_context_t *ec = GET_EC();
+    const rb_control_frame_t *reg_cfp = ec->cfp;
+    const rb_iseq_t *iseq = rb_iseq_new(Qnil, filename, filename, Qnil, 0, ISEQ_TYPE_TOP);
+    VALUE val;
+
+    vm_push_frame(ec, iseq, VM_FRAME_MAGIC_TOP | VM_ENV_FLAG_LOCAL | VM_FRAME_FLAG_FINISH,
+                  recv, block_handler,
+                  (VALUE)vm_cref_new_toplevel(ec), /* cref or me */
+                  0, reg_cfp->sp, 0, 0);
+
+    val = (*func)(arg1, arg2);
+
+    rb_vm_pop_frame(ec);
+    return val;
+}
+
 /* vm */
 
 void
@@ -2724,7 +2978,7 @@ rb_vm_update_references(void *ptr)
     if (ptr) {
         rb_vm_t *vm = ptr;
 
-        rb_gc_update_tbl_refs(vm->frozen_strings);
+        vm->self = rb_gc_location(vm->self);
         vm->mark_object_ary = rb_gc_location(vm->mark_object_ary);
         vm->load_path = rb_gc_location(vm->load_path);
         vm->load_path_snapshot = rb_gc_location(vm->load_path_snapshot);
@@ -2739,10 +2993,9 @@ rb_vm_update_references(void *ptr)
         vm->loaded_features_realpaths = rb_gc_location(vm->loaded_features_realpaths);
         vm->loaded_features_realpath_map = rb_gc_location(vm->loaded_features_realpath_map);
         vm->top_self = rb_gc_location(vm->top_self);
+        vm->require_stack = rb_gc_location(vm->require_stack);
         vm->orig_progname = rb_gc_location(vm->orig_progname);
 
-        rb_gc_update_tbl_refs(vm->overloaded_cme_table);
-
         rb_gc_update_values(RUBY_NSIG, vm->trap_list.cmd);
 
         if (vm->coverages) {
@@ -2770,7 +3023,7 @@ rb_vm_each_stack_value(void *ptr, void (*cb)(VALUE, void*), void *ctx)
                         VALUE *p = ec->vm_stack;
                         VALUE *sp = ec->cfp->sp;
                         while (p < sp) {
-                            if (!rb_special_const_p(*p)) {
+                            if (!RB_SPECIAL_CONST_P(*p)) {
                                 cb(*p, ctx);
                             }
                             p++;
@@ -2789,6 +3042,8 @@ vm_mark_negative_cme(VALUE val, void *dmy)
     return ID_TABLE_CONTINUE;
 }
 
+void rb_thread_sched_mark_zombies(rb_vm_t *vm);
+
 void
 rb_vm_mark(void *ptr)
 {
@@ -2797,8 +3052,7 @@ rb_vm_mark(void *ptr)
     if (ptr) {
         rb_vm_t *vm = ptr;
         rb_ractor_t *r = 0;
-        long i, len;
-        const VALUE *obj_ary;
+        long i;
 
         ccan_list_for_each(&vm->ractor.set, r, vmlr_node) {
             // ractor.set only contains blocking or running ractors
@@ -2807,37 +3061,30 @@ rb_vm_mark(void *ptr)
             rb_gc_mark(rb_ractor_self(r));
         }
 
-        rb_gc_mark_movable(vm->mark_object_ary);
+        for (struct global_object_list *list = vm->global_object_list; list; list = list->next) {
+            rb_gc_mark_maybe(*list->varptr);
+        }
 
-        len = RARRAY_LEN(vm->mark_object_ary);
-        obj_ary = RARRAY_CONST_PTR(vm->mark_object_ary);
-        for (i=0; i < len; i++) {
-            const VALUE *ptr;
-            long j, jlen;
-
-            rb_gc_mark(*obj_ary);
-            jlen = RARRAY_LEN(*obj_ary);
-            ptr = RARRAY_CONST_PTR(*obj_ary);
-            for (j=0; j < jlen; j++) {
-                rb_gc_mark(*ptr++);
-            }
-            obj_ary++;
+        rb_gc_mark_movable(vm->self);
+
+        if (vm->main_namespace) {
+            rb_namespace_entry_mark((void *)vm->main_namespace);
         }
 
+        rb_gc_mark_movable(vm->mark_object_ary);
         rb_gc_mark_movable(vm->load_path);
         rb_gc_mark_movable(vm->load_path_snapshot);
-        RUBY_MARK_MOVABLE_UNLESS_NULL(vm->load_path_check_cache);
+        rb_gc_mark_movable(vm->load_path_check_cache);
         rb_gc_mark_movable(vm->expanded_load_path);
         rb_gc_mark_movable(vm->loaded_features);
         rb_gc_mark_movable(vm->loaded_features_snapshot);
         rb_gc_mark_movable(vm->loaded_features_realpaths);
         rb_gc_mark_movable(vm->loaded_features_realpath_map);
+        rb_gc_mark_movable(vm->require_stack);
         rb_gc_mark_movable(vm->top_self);
         rb_gc_mark_movable(vm->orig_progname);
-        RUBY_MARK_MOVABLE_UNLESS_NULL(vm->coverages);
-        RUBY_MARK_MOVABLE_UNLESS_NULL(vm->me2counter);
-        /* Prevent classes from moving */
-        rb_mark_tbl(vm->defined_module_hash);
+        rb_gc_mark_movable(vm->coverages);
+        rb_gc_mark_movable(vm->me2counter);
 
         if (vm->loading_table) {
             rb_mark_tbl(vm->loading_table);
@@ -2860,7 +3107,7 @@ rb_vm_mark(void *ptr)
             }
         }
 
-        rb_rjit_mark();
+        rb_thread_sched_mark_zombies(vm);
     }
 
     RUBY_MARK_LEAVE("vm");
@@ -2874,17 +3121,7 @@ rb_vm_register_special_exception_str(enum ruby_special_exceptions sp, VALUE cls,
     VALUE exc = rb_exc_new3(cls, rb_obj_freeze(mesg));
     OBJ_FREEZE(exc);
     ((VALUE *)vm->special_exceptions)[sp] = exc;
-    rb_gc_register_mark_object(exc);
-}
-
-int
-rb_vm_add_root_module(VALUE module)
-{
-    rb_vm_t *vm = GET_VM();
-
-    st_insert(vm->defined_module_hash, (st_data_t)module, (st_data_t)module);
-
-    return TRUE;
+    rb_vm_register_global_object(exc);
 }
 
 static int
@@ -2894,6 +3131,9 @@ free_loading_table_entry(st_data_t key, st_data_t value, st_data_t arg)
     return ST_DELETE;
 }
 
+void rb_free_loaded_features_index(rb_vm_t *vm);
+void rb_objspace_free_objects(void *objspace);
+
 int
 ruby_vm_destruct(rb_vm_t *vm)
 {
@@ -2901,13 +3141,47 @@ ruby_vm_destruct(rb_vm_t *vm)
 
     if (vm) {
         rb_thread_t *th = vm->ractor.main_thread;
-        struct rb_objspace *objspace = vm->objspace;
-        vm->ractor.main_thread = NULL;
+        VALUE *stack = th->ec->vm_stack;
+        if (rb_free_at_exit) {
+            rb_free_encoded_insn_data();
+            rb_free_global_enc_table();
+            rb_free_loaded_builtin_table();
+
+            rb_free_shared_fiber_pool();
+            rb_free_static_symid_str();
+            rb_free_transcoder_table();
+            rb_free_vm_opt_tables();
+            rb_free_warning();
+            rb_free_rb_global_tbl();
+            rb_free_loaded_features_index(vm);
+
+            rb_id_table_free(vm->negative_cme_table);
+            st_free_table(vm->overloaded_cme_table);
+
+            // TODO: Is this ignorable for classext->m_tbl ?
+            // rb_id_table_free(RCLASS(rb_mRubyVMFrozenCore)->m_tbl);
 
-        if (th) {
+            st_free_table(vm->static_ext_inits);
+
+            rb_vm_postponed_job_free();
+
+            rb_id_table_free(vm->constant_cache);
+            set_free_table(vm->unused_block_warning_table);
+
+            xfree(th->nt);
+            th->nt = NULL;
+
+#ifndef HAVE_SETPROCTITLE
+            ruby_free_proctitle();
+#endif
+        }
+        else {
             rb_fiber_reset_root_local_storage(th);
             thread_free(th);
         }
+
+        struct rb_objspace *objspace = vm->gc.objspace;
+
         rb_vm_living_threads_init(vm);
         ruby_vm_run_at_exit_hooks(vm);
         if (vm->loading_table) {
@@ -2915,25 +3189,51 @@ ruby_vm_destruct(rb_vm_t *vm)
             st_free_table(vm->loading_table);
             vm->loading_table = 0;
         }
-        if (vm->frozen_strings) {
-            st_free_table(vm->frozen_strings);
-            vm->frozen_strings = 0;
+        if (vm->ci_table) {
+            st_free_table(vm->ci_table);
+            vm->ci_table = NULL;
+        }
+        if (vm->cc_refinement_table) {
+            rb_set_free_table(vm->cc_refinement_table);
+            vm->cc_refinement_table = NULL;
         }
         RB_ALTSTACK_FREE(vm->main_altstack);
+
+        struct global_object_list *next;
+        for (struct global_object_list *list = vm->global_object_list; list; list = next) {
+            next = list->next;
+            xfree(list);
+        }
+
         if (objspace) {
+            if (rb_free_at_exit) {
+                rb_objspace_free_objects(objspace);
+                rb_free_generic_fields_tbl_();
+                rb_free_default_rand_key();
+                if (th && vm->fork_gen == 0) {
+                    /* If we have forked, main_thread may not be the initial thread */
+                    xfree(stack);
+                    ruby_mimfree(th);
+                }
+            }
             rb_objspace_free(objspace);
         }
         rb_native_mutex_destroy(&vm->workqueue_lock);
         /* after freeing objspace, you *can't* use ruby_xfree() */
         ruby_mimfree(vm);
         ruby_current_vm_ptr = NULL;
+
+        if (rb_free_at_exit) {
+            rb_shape_free_all();
+#if USE_YJIT
+            rb_yjit_free_at_exit();
+#endif
+        }
     }
     RUBY_FREE_LEAVE("vm");
     return 0;
 }
 
-size_t rb_vm_memsize_waiting_fds(struct ccan_list_head *waiting_fds); // thread.c
-size_t rb_vm_memsize_postponed_job_buffer(void); // vm_trace.c
 size_t rb_vm_memsize_workqueue(struct ccan_list_head *workqueue); // vm_trace.c
 
 // Used for VM memsize reporting. Returns the size of the at_exit list by
@@ -2988,18 +3288,16 @@ vm_memsize(const void *ptr)
 
     return (
         sizeof(rb_vm_t) +
-        rb_vm_memsize_waiting_fds(&vm->waiting_fds) +
         rb_st_memsize(vm->loaded_features_index) +
         rb_st_memsize(vm->loading_table) +
-        rb_st_memsize(vm->ensure_rollback_table) +
-        rb_vm_memsize_postponed_job_buffer() +
+        rb_vm_memsize_postponed_job_queue() +
         rb_vm_memsize_workqueue(&vm->workqueue) +
-        rb_st_memsize(vm->defined_module_hash) +
         vm_memsize_at_exit_list(vm->at_exit) +
-        rb_st_memsize(vm->frozen_strings) +
+        rb_st_memsize(vm->ci_table) +
         vm_memsize_builtin_function_table(vm->builtin_function_table) +
         rb_id_table_memsize(vm->negative_cme_table) +
         rb_st_memsize(vm->overloaded_cme_table) +
+        rb_set_memsize(vm->cc_refinement_table) +
         vm_memsize_constant_cache()
     );
 
@@ -3093,7 +3391,6 @@ vm_default_params_setup(rb_vm_t *vm)
 static void
 vm_init2(rb_vm_t *vm)
 {
-    MEMZERO(vm, rb_vm_t, 1);
     rb_vm_living_threads_init(vm);
     vm->thread_report_on_exception = 1;
     vm->src_encoding_index = -1;
@@ -3171,21 +3468,19 @@ rb_execution_context_mark(const rb_execution_context_t *ec)
             const VALUE *ep = cfp->ep;
             VM_ASSERT(!!VM_ENV_FLAGS(ep, VM_ENV_FLAG_ESCAPED) == vm_ep_in_heap_p_(ec, ep));
 
-            if (VM_FRAME_TYPE(cfp) != VM_FRAME_MAGIC_DUMMY) {
-                rb_gc_mark_movable(cfp->self);
-                rb_gc_mark_movable((VALUE)cfp->iseq);
-                rb_gc_mark_movable((VALUE)cfp->block_code);
+            rb_gc_mark_movable(cfp->self);
+            rb_gc_mark_movable((VALUE)cfp->iseq);
+            rb_gc_mark_movable((VALUE)cfp->block_code);
 
-                if (!VM_ENV_LOCAL_P(ep)) {
-                    const VALUE *prev_ep = VM_ENV_PREV_EP(ep);
-                    if (VM_ENV_FLAGS(prev_ep, VM_ENV_FLAG_ESCAPED)) {
-                        rb_gc_mark_movable(prev_ep[VM_ENV_DATA_INDEX_ENV]);
-                    }
+            if (!VM_ENV_LOCAL_P(ep)) {
+                const VALUE *prev_ep = VM_ENV_PREV_EP(ep);
+                if (VM_ENV_FLAGS(prev_ep, VM_ENV_FLAG_ESCAPED)) {
+                    rb_gc_mark_movable(prev_ep[VM_ENV_DATA_INDEX_ENV]);
+                }
 
-                    if (VM_ENV_FLAGS(ep, VM_ENV_FLAG_ESCAPED)) {
-                        rb_gc_mark_movable(ep[VM_ENV_DATA_INDEX_ENV]);
-                        rb_gc_mark(ep[VM_ENV_DATA_INDEX_ME_CREF]);
-                    }
+                if (VM_ENV_FLAGS(ep, VM_ENV_FLAG_ESCAPED)) {
+                    rb_gc_mark_movable(ep[VM_ENV_DATA_INDEX_ENV]);
+                    rb_gc_mark(ep[VM_ENV_DATA_INDEX_ME_CREF]);
                 }
             }
 
@@ -3197,22 +3492,19 @@ rb_execution_context_mark(const rb_execution_context_t *ec)
     if (ec->machine.stack_start && ec->machine.stack_end &&
         ec != GET_EC() /* marked for current ec at the first stage of marking */
         ) {
-        rb_gc_mark_machine_stack(ec);
-        rb_gc_mark_locations((VALUE *)&ec->machine.regs,
-                             (VALUE *)(&ec->machine.regs) +
-                             sizeof(ec->machine.regs) / (sizeof(VALUE)));
+        rb_gc_mark_machine_context(ec);
     }
 
-    RUBY_MARK_UNLESS_NULL(ec->errinfo);
-    RUBY_MARK_UNLESS_NULL(ec->root_svar);
+    rb_gc_mark(ec->errinfo);
+    rb_gc_mark(ec->root_svar);
     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);
+    rb_gc_mark(ec->local_storage_recursive_hash);
+    rb_gc_mark(ec->local_storage_recursive_hash_for_trace);
+    rb_gc_mark(ec->private_const_reference);
 
-    RUBY_MARK_MOVABLE_UNLESS_NULL(ec->storage);
+    rb_gc_mark_movable(ec->storage);
 }
 
 void rb_fiber_mark_self(rb_fiber_t *fib);
@@ -3243,8 +3535,8 @@ thread_mark(void *ptr)
     switch (th->invoke_type) {
       case thread_invoke_type_proc:
       case thread_invoke_type_ractor_proc:
-        RUBY_MARK_UNLESS_NULL(th->invoke_arg.proc.proc);
-        RUBY_MARK_UNLESS_NULL(th->invoke_arg.proc.args);
+        rb_gc_mark(th->invoke_arg.proc.proc);
+        rb_gc_mark(th->invoke_arg.proc.args);
         break;
       case thread_invoke_type_func:
         rb_gc_mark_maybe((VALUE)th->invoke_arg.func.arg);
@@ -3254,31 +3546,38 @@ thread_mark(void *ptr)
     }
 
     rb_gc_mark(rb_ractor_self(th->ractor));
-    RUBY_MARK_UNLESS_NULL(th->thgroup);
-    RUBY_MARK_UNLESS_NULL(th->value);
-    RUBY_MARK_UNLESS_NULL(th->pending_interrupt_queue);
-    RUBY_MARK_UNLESS_NULL(th->pending_interrupt_mask_stack);
-    RUBY_MARK_UNLESS_NULL(th->top_self);
-    RUBY_MARK_UNLESS_NULL(th->top_wrapper);
+    rb_gc_mark(th->thgroup);
+    rb_gc_mark(th->value);
+    rb_gc_mark(th->pending_interrupt_queue);
+    rb_gc_mark(th->pending_interrupt_mask_stack);
+    rb_gc_mark(th->top_self);
+    rb_gc_mark(th->top_wrapper);
+    rb_gc_mark(th->namespaces);
+    if (NAMESPACE_USER_P(th->ns)) rb_namespace_entry_mark(th->ns);
     if (th->root_fiber) rb_fiber_mark_self(th->root_fiber);
 
     RUBY_ASSERT(th->ec == rb_fiberptr_get_ec(th->ec->fiber_ptr));
-    RUBY_MARK_UNLESS_NULL(th->stat_insn_usage);
-    RUBY_MARK_UNLESS_NULL(th->last_status);
-    RUBY_MARK_UNLESS_NULL(th->locking_mutex);
-    RUBY_MARK_UNLESS_NULL(th->name);
+    rb_gc_mark(th->last_status);
+    rb_gc_mark(th->locking_mutex);
+    rb_gc_mark(th->name);
+
+    rb_gc_mark(th->scheduler);
 
-    RUBY_MARK_UNLESS_NULL(th->scheduler);
+    rb_threadptr_interrupt_exec_task_mark(th);
 
     RUBY_MARK_LEAVE("thread");
 }
 
+void rb_threadptr_sched_free(rb_thread_t *th); // thread_*.c
+
 static void
 thread_free(void *ptr)
 {
     rb_thread_t *th = ptr;
     RUBY_FREE_ENTER("thread");
 
+    rb_threadptr_sched_free(th);
+
     if (th->locking_mutex != Qfalse) {
         rb_bug("thread_free: locking_mutex must be NULL (%p:%p)", (void *)th, (void *)th->locking_mutex);
     }
@@ -3286,13 +3585,16 @@ thread_free(void *ptr)
         rb_bug("thread_free: keeping_mutexes must be NULL (%p:%p)", (void *)th, (void *)th->keeping_mutexes);
     }
 
+    ruby_xfree(th->specific_storage);
+
     rb_threadptr_root_fiber_release(th);
 
     if (th->vm && th->vm->ractor.main_thread == th) {
         RUBY_GC_INFO("MRI main thread\n");
     }
     else {
-        ruby_xfree(th->nt); // TODO
+        // ruby_xfree(th->nt);
+        // TODO: MN system collect nt, but without MN system it should be freed here.
         ruby_xfree(th);
     }
 
@@ -3339,7 +3641,7 @@ thread_alloc(VALUE klass)
     return TypedData_Make_Struct(klass, rb_thread_t, &thread_data_type, th);
 }
 
-inline void
+void
 rb_ec_set_vm_stack(rb_execution_context_t *ec, VALUE *stack, size_t size)
 {
     ec->vm_stack = stack;
@@ -3351,6 +3653,10 @@ rb_ec_initialize_vm_stack(rb_execution_context_t *ec, VALUE *stack, size_t size)
 {
     rb_ec_set_vm_stack(ec, stack, size);
 
+#if VM_CHECK_MODE > 0
+    MEMZERO(stack, VALUE, size); // malloc memory could have the VM canary in it
+#endif
+
     ec->cfp = (void *)(ec->vm_stack + ec->vm_stack_size);
 
     vm_push_frame(ec,
@@ -3365,10 +3671,10 @@ rb_ec_initialize_vm_stack(rb_execution_context_t *ec, VALUE *stack, size_t size)
 void
 rb_ec_clear_vm_stack(rb_execution_context_t *ec)
 {
-    rb_ec_set_vm_stack(ec, NULL, 0);
-
-    // Avoid dangling pointers:
+    // set cfp to NULL before clearing the stack in case `thread_profile_frames`
+    // gets called in this middle of `rb_ec_set_vm_stack` via signal handler.
     ec->cfp = NULL;
+    rb_ec_set_vm_stack(ec, NULL, 0);
 }
 
 static void
@@ -3396,6 +3702,8 @@ th_init(rb_thread_t *th, VALUE self, rb_vm_t *vm)
     th->last_status = Qnil;
     th->top_wrapper = 0;
     th->top_self = vm->top_self; // 0 while self == 0
+    th->namespaces = 0;
+    th->ns = 0;
     th->value = Qundef;
 
     th->ec->errinfo = Qnil;
@@ -3412,19 +3720,29 @@ th_init(rb_thread_t *th, VALUE self, rb_vm_t *vm)
     th->report_on_exception = vm->thread_report_on_exception;
     th->ext_config.ractor_safe = true;
 
+    ccan_list_head_init(&th->interrupt_exec_tasks);
+
 #if USE_RUBY_DEBUG_LOG
-    static rb_atomic_t thread_serial = 0;
+    static rb_atomic_t thread_serial = 1;
     th->serial = RUBY_ATOMIC_FETCH_ADD(thread_serial, 1);
+
+    RUBY_DEBUG_LOG("th:%u", th->serial);
 #endif
 }
 
 VALUE
 rb_thread_alloc(VALUE klass)
 {
+    rb_namespace_t *ns;
+    rb_execution_context_t *ec = GET_EC();
     VALUE self = thread_alloc(klass);
     rb_thread_t *target_th = rb_thread_ptr(self);
     target_th->ractor = GET_RACTOR();
     th_init(target_th, self, target_th->vm = GET_VM());
+    if ((ns = rb_ec_thread_ptr(ec)->ns) == 0) {
+        ns = rb_main_namespace();
+    }
+    target_th->ns = ns;
     return self;
 }
 
@@ -3504,7 +3822,9 @@ kwmerge_i(VALUE key, VALUE value, VALUE hash)
 static VALUE
 m_core_hash_merge_kwd(VALUE recv, VALUE hash, VALUE kw)
 {
-    REWIND_CFP(hash = core_hash_merge_kwd(hash, kw));
+    if (!NIL_P(kw)) {
+        REWIND_CFP(hash = core_hash_merge_kwd(hash, kw));
+    }
     return hash;
 }
 
@@ -3542,7 +3862,7 @@ extern size_t rb_gc_stack_maxsize;
 static VALUE
 sdr(VALUE self)
 {
-    rb_vm_bugreport(NULL);
+    rb_vm_bugreport(NULL, stderr);
     return Qnil;
 }
 
@@ -3610,6 +3930,7 @@ f_sprintf(int c, const VALUE *v, VALUE _)
     return rb_f_sprintf(c, v);
 }
 
+/* :nodoc: */
 static VALUE
 vm_mtbl(VALUE self, VALUE obj, VALUE sym)
 {
@@ -3617,6 +3938,7 @@ vm_mtbl(VALUE self, VALUE obj, VALUE sym)
     return Qnil;
 }
 
+/* :nodoc: */
 static VALUE
 vm_mtbl2(VALUE self, VALUE obj, VALUE sym)
 {
@@ -3664,6 +3986,7 @@ Init_VM(void)
 {
     VALUE opts;
     VALUE klass;
+    VALUE fcore;
 
     /*
      * Document-class: RubyVM
@@ -3689,8 +4012,9 @@ Init_VM(void)
 #endif
 
     /* FrozenCore (hidden) */
-    VALUE fcore = rb_mRubyVMFrozenCore = rb_iclass_alloc(rb_cBasicObject);
+    fcore = rb_class_new(rb_cBasicObject);
     rb_set_class_path(fcore, rb_cRubyVM, "FrozenCore");
+    rb_vm_register_global_object(rb_class_path_cached(fcore));
     klass = rb_singleton_class(fcore);
     rb_define_method_id(klass, id_core_set_method_alias, m_core_set_method_alias, 3);
     rb_define_method_id(klass, id_core_set_variable_alias, m_core_set_variable_alias, 2);
@@ -3708,7 +4032,8 @@ Init_VM(void)
     rb_obj_freeze(fcore);
     RBASIC_CLEAR_CLASS(klass);
     rb_obj_freeze(klass);
-    rb_gc_register_mark_object(fcore);
+    rb_vm_register_global_object(fcore);
+    rb_mRubyVMFrozenCore = fcore;
 
     /*
      * Document-class: Thread
@@ -3949,7 +4274,7 @@ Init_VM(void)
         rb_vm_t *vm = ruby_current_vm_ptr;
         rb_thread_t *th = GET_THREAD();
         VALUE filename = rb_fstring_lit("<main>");
-        const rb_iseq_t *iseq = rb_iseq_new(0, filename, filename, Qnil, 0, ISEQ_TYPE_TOP);
+        const rb_iseq_t *iseq = rb_iseq_new(Qnil, filename, filename, Qnil, 0, ISEQ_TYPE_TOP);
 
         // Ractor setup
         rb_ractor_main_setup(vm, th->ractor, th);
@@ -3964,8 +4289,10 @@ Init_VM(void)
         th->vm = vm;
         th->top_wrapper = 0;
         th->top_self = rb_vm_top_self();
+        th->namespaces = 0;
+        th->ns = 0;
 
-        rb_gc_register_mark_object((VALUE)iseq);
+        rb_vm_register_global_object((VALUE)iseq);
         th->ec->cfp->iseq = iseq;
         th->ec->cfp->pc = ISEQ_BODY(iseq)->iseq_encoded;
         th->ec->cfp->self = th->top_self;
@@ -3978,7 +4305,9 @@ Init_VM(void)
          */
         rb_define_global_const("TOPLEVEL_BINDING", rb_binding_new());
 
-        rb_objspace_gc_enable(vm->objspace);
+#ifdef _WIN32
+        rb_objspace_gc_enable(vm->gc.objspace);
+#endif
     }
     vm_init_redefined_flag();
 
@@ -3986,7 +4315,7 @@ Init_VM(void)
     rb_add_method_optimized(rb_singleton_class(rb_block_param_proxy), idCall,
                             OPTIMIZED_METHOD_TYPE_BLOCK_CALL, 0, METHOD_VISI_PUBLIC);
     rb_obj_freeze(rb_block_param_proxy);
-    rb_gc_register_mark_object(rb_block_param_proxy);
+    rb_vm_register_global_object(rb_block_param_proxy);
 
     /* vm_backtrace.c */
     Init_vm_backtrace();
@@ -4009,37 +4338,53 @@ void
 Init_BareVM(void)
 {
     /* VM bootstrap: phase 1 */
-    rb_vm_t * vm = ruby_mimmalloc(sizeof(*vm));
-    rb_thread_t * th = ruby_mimmalloc(sizeof(*th));
+    rb_vm_t *vm = ruby_mimcalloc(1, sizeof(*vm));
+    rb_thread_t *th = ruby_mimcalloc(1, sizeof(*th));
     if (!vm || !th) {
         fputs("[FATAL] failed to allocate memory\n", stderr);
         exit(EXIT_FAILURE);
     }
 
     // setup the VM
-    MEMZERO(th, rb_thread_t, 1);
     vm_init2(vm);
 
-    vm->objspace = rb_objspace_alloc();
+    rb_vm_postponed_job_queue_init(vm);
     ruby_current_vm_ptr = vm;
+    rb_objspace_alloc();
     vm->negative_cme_table = rb_id_table_create(16);
     vm->overloaded_cme_table = st_init_numtable();
     vm->constant_cache = rb_id_table_create(0);
+    vm->unused_block_warning_table = set_init_numtable();
 
     // setup main thread
     th->nt = ZALLOC(struct rb_native_thread);
     th->vm = vm;
     th->ractor = vm->ractor.main_ractor = rb_ractor_main_alloc();
     Init_native_thread(th);
+    rb_jit_cont_init();
     th_init(th, 0, vm);
 
     rb_ractor_set_current_ec(th->ractor, th->ec);
-    ruby_thread_init_stack(th);
+    /* n.b. native_main_thread_stack_top is set by the INIT_STACK macro */
+    ruby_thread_init_stack(th, native_main_thread_stack_top);
 
     // setup ractor system
     rb_native_mutex_initialize(&vm->ractor.sync.lock);
-    rb_native_cond_initialize(&vm->ractor.sync.barrier_cond);
     rb_native_cond_initialize(&vm->ractor.sync.terminate_cond);
+
+    vm_opt_method_def_table = st_init_numtable();
+    vm_opt_mid_table = st_init_numtable();
+
+#ifdef RUBY_THREAD_WIN32_H
+    rb_native_cond_initialize(&vm->ractor.sync.barrier_complete_cond);
+    rb_native_cond_initialize(&vm->ractor.sync.barrier_release_cond);
+#endif
+}
+
+void
+ruby_init_stack(void *addr)
+{
+    native_main_thread_stack_top = addr;
 }
 
 #ifndef _WIN32
@@ -4047,24 +4392,137 @@ Init_BareVM(void)
 #include <sys/mman.h>
 #endif
 
+
+#ifndef MARK_OBJECT_ARY_BUCKET_SIZE
+#define MARK_OBJECT_ARY_BUCKET_SIZE 1024
+#endif
+
+struct pin_array_list {
+    VALUE next;
+    long len;
+    VALUE *array;
+};
+
+static void
+pin_array_list_mark(void *data)
+{
+    struct pin_array_list *array = (struct pin_array_list *)data;
+    rb_gc_mark_movable(array->next);
+
+    rb_gc_mark_vm_stack_values(array->len, array->array);
+}
+
+static void
+pin_array_list_free(void *data)
+{
+    struct pin_array_list *array = (struct pin_array_list *)data;
+    xfree(array->array);
+}
+
+static size_t
+pin_array_list_memsize(const void *data)
+{
+    return sizeof(struct pin_array_list) + (MARK_OBJECT_ARY_BUCKET_SIZE * sizeof(VALUE));
+}
+
+static void
+pin_array_list_update_references(void *data)
+{
+    struct pin_array_list *array = (struct pin_array_list *)data;
+    array->next = rb_gc_location(array->next);
+}
+
+static const rb_data_type_t pin_array_list_type = {
+    .wrap_struct_name = "VM/pin_array_list",
+    .function = {
+        .dmark = pin_array_list_mark,
+        .dfree = pin_array_list_free,
+        .dsize = pin_array_list_memsize,
+        .dcompact = pin_array_list_update_references,
+    },
+    .flags = RUBY_TYPED_FREE_IMMEDIATELY | RUBY_TYPED_WB_PROTECTED | RUBY_TYPED_EMBEDDABLE,
+};
+
+static VALUE
+pin_array_list_new(VALUE next)
+{
+    struct pin_array_list *array_list;
+    VALUE obj = TypedData_Make_Struct(0, struct pin_array_list, &pin_array_list_type, array_list);
+    RB_OBJ_WRITE(obj, &array_list->next, next);
+    array_list->array = ALLOC_N(VALUE, MARK_OBJECT_ARY_BUCKET_SIZE);
+    return obj;
+}
+
+static VALUE
+pin_array_list_append(VALUE obj, VALUE item)
+{
+    struct pin_array_list *array_list;
+    TypedData_Get_Struct(obj, struct pin_array_list, &pin_array_list_type, array_list);
+
+    if (array_list->len >= MARK_OBJECT_ARY_BUCKET_SIZE) {
+        obj = pin_array_list_new(obj);
+        TypedData_Get_Struct(obj, struct pin_array_list, &pin_array_list_type, array_list);
+    }
+
+    RB_OBJ_WRITE(obj, &array_list->array[array_list->len], item);
+    array_list->len++;
+    return obj;
+}
+
+void
+rb_vm_register_global_object(VALUE obj)
+{
+    RUBY_ASSERT(!RB_SPECIAL_CONST_P(obj));
+    if (RB_SPECIAL_CONST_P(obj)) {
+        return;
+    }
+
+    switch (RB_BUILTIN_TYPE(obj)) {
+      case T_CLASS:
+      case T_MODULE:
+        if (FL_TEST(obj, RCLASS_IS_ROOT)) {
+            return;
+        }
+        FL_SET(obj, RCLASS_IS_ROOT);
+        break;
+      default:
+        break;
+    }
+    RB_VM_LOCKING() {
+        VALUE list = GET_VM()->mark_object_ary;
+        VALUE head = pin_array_list_append(list, obj);
+        if (head != list) {
+            GET_VM()->mark_object_ary = head;
+        }
+        RB_GC_GUARD(obj);
+    }
+}
+
 void
 Init_vm_objects(void)
 {
     rb_vm_t *vm = GET_VM();
 
-    vm->defined_module_hash = st_init_numtable();
-
     /* initialize mark object array, hash */
-    vm->mark_object_ary = rb_ary_hidden_new(128);
+    vm->mark_object_ary = pin_array_list_new(Qnil);
     vm->loading_table = st_init_strtable();
-    vm->frozen_strings = st_init_table_with_size(&rb_fstring_hash_type, 10000);
+    vm->ci_table = st_init_table(&vm_ci_hashtype);
+    vm->cc_refinement_table = rb_set_init_numtable();
 }
 
-/* Stub for builtin function when not building YJIT units*/
+// Stub for builtin function when not building YJIT units
 #if !USE_YJIT
 void Init_builtin_yjit(void) {}
 #endif
 
+// Whether YJIT is enabled or not, we load yjit_hook.rb to remove Kernel#with_yjit.
+#include "yjit_hook.rbinc"
+
+// Stub for builtin function when not building ZJIT units
+#if !USE_ZJIT
+void Init_builtin_zjit(void) {}
+#endif
+
 /* top self */
 
 static VALUE
@@ -4103,17 +4561,19 @@ rb_ruby_debug_ptr(void)
     return &cr->debug;
 }
 
+bool rb_free_at_exit = false;
+
+bool
+ruby_free_at_exit_p(void)
+{
+    return rb_free_at_exit;
+}
+
 /* iseq.c */
 VALUE rb_insn_operand_intern(const rb_iseq_t *iseq,
                              VALUE insn, int op_no, VALUE op,
                              int len, size_t pos, VALUE *pnop, VALUE child);
 
-st_table *
-rb_vm_fstring_table(void)
-{
-    return GET_VM()->frozen_strings;
-}
-
 #if VM_COLLECT_USAGE_DETAILS
 
 #define HASH_ASET(h, k, v) rb_hash_aset((h), (st_data_t)(k), (st_data_t)(v))
@@ -4305,21 +4765,21 @@ usage_analysis_register_stop(VALUE self)
 static VALUE
 usage_analysis_insn_running(VALUE self)
 {
-  return RBOOL(ruby_vm_collect_usage_func_insn != 0);
+    return RBOOL(ruby_vm_collect_usage_func_insn != 0);
 }
 
 /* :nodoc: */
 static VALUE
 usage_analysis_operand_running(VALUE self)
 {
-  return RBOOL(ruby_vm_collect_usage_func_operand != 0);
+    return RBOOL(ruby_vm_collect_usage_func_operand != 0);
 }
 
 /* :nodoc: */
 static VALUE
 usage_analysis_register_running(VALUE self)
 {
-  return RBOOL(ruby_vm_collect_usage_func_register != 0);
+    return RBOOL(ruby_vm_collect_usage_func_register != 0);
 }
 
 static VALUE
diff --git a/vm_args.c b/vm_args.c
index a02e08d7fc2433..44be6f54c5cf79 100644
--- a/vm_args.c
+++ b/vm_args.c
@@ -8,9 +8,9 @@
 
 **********************************************************************/
 
-NORETURN(static void raise_argument_error(rb_execution_context_t *ec, const rb_iseq_t *iseq, const VALUE exc));
-NORETURN(static void argument_arity_error(rb_execution_context_t *ec, const rb_iseq_t *iseq, const int miss_argc, const int min_argc, const int max_argc));
-NORETURN(static void argument_kw_error(rb_execution_context_t *ec, const rb_iseq_t *iseq, const char *error, const VALUE keys));
+NORETURN(static void raise_argument_error(rb_execution_context_t *ec, const rb_iseq_t *iseq, const rb_callable_method_entry_t *cme, const VALUE exc));
+NORETURN(static void argument_arity_error(rb_execution_context_t *ec, const rb_iseq_t *iseq, const rb_callable_method_entry_t *cme, const int miss_argc, const int min_argc, const int max_argc));
+NORETURN(static void argument_kw_error(rb_execution_context_t *ec, const rb_iseq_t *iseq, const rb_callable_method_entry_t *cme, const char *error, const VALUE keys));
 VALUE rb_keyword_error_new(const char *error, VALUE keys); /* class.c */
 static VALUE method_missing(rb_execution_context_t *ec, VALUE obj, ID id, int argc, const VALUE *argv,
                             enum method_missing_reason call_status, int kw_splat);
@@ -321,7 +321,7 @@ args_setup_kw_parameters_lookup(const ID key, VALUE *ptr, const VALUE *const pas
 #define KW_SPECIFIED_BITS_MAX (32-1) /* TODO: 32 -> Fixnum's max bits */
 
 static void
-args_setup_kw_parameters(rb_execution_context_t *const ec, const rb_iseq_t *const iseq,
+args_setup_kw_parameters(rb_execution_context_t *const ec, const rb_iseq_t *const iseq, const rb_callable_method_entry_t *cme,
                          VALUE *const passed_values, const int passed_keyword_len, const VALUE *const passed_keywords,
                          VALUE *const locals)
 {
@@ -345,7 +345,7 @@ args_setup_kw_parameters(rb_execution_context_t *const ec, const rb_iseq_t *cons
         }
     }
 
-    if (missing) argument_kw_error(ec, iseq, "missing", missing);
+    if (missing) argument_kw_error(ec, iseq, cme, "missing", missing);
 
     for (di=0; i<key_num; i++, di++) {
         if (args_setup_kw_parameters_lookup(acceptable_keywords[i], &locals[i], passed_keywords, passed_values, passed_keyword_len)) {
@@ -386,7 +386,110 @@ args_setup_kw_parameters(rb_execution_context_t *const ec, const rb_iseq_t *cons
     else {
         if (found != passed_keyword_len) {
             VALUE keys = make_unknown_kw_hash(passed_keywords, passed_keyword_len, passed_values);
-            argument_kw_error(ec, iseq, "unknown", keys);
+            argument_kw_error(ec, iseq, cme, "unknown", keys);
+        }
+    }
+
+    if (NIL_P(unspecified_bits_value)) {
+        unspecified_bits_value = INT2FIX(unspecified_bits);
+    }
+    locals[key_num] = unspecified_bits_value;
+}
+
+static void
+args_setup_kw_parameters_from_kwsplat(rb_execution_context_t *const ec, const rb_iseq_t *const iseq, const rb_callable_method_entry_t *cme,
+                         VALUE keyword_hash, VALUE *const locals, bool remove_hash_value)
+{
+    const ID *acceptable_keywords = ISEQ_BODY(iseq)->param.keyword->table;
+    const int req_key_num = ISEQ_BODY(iseq)->param.keyword->required_num;
+    const int key_num = ISEQ_BODY(iseq)->param.keyword->num;
+    const VALUE * const default_values = ISEQ_BODY(iseq)->param.keyword->default_values;
+    VALUE missing = 0;
+    int i, di;
+    int unspecified_bits = 0;
+    size_t keyword_size = RHASH_SIZE(keyword_hash);
+    VALUE unspecified_bits_value = Qnil;
+
+    for (i=0; i<req_key_num; i++) {
+        VALUE key = ID2SYM(acceptable_keywords[i]);
+        VALUE value;
+        if (remove_hash_value) {
+            value = rb_hash_delete_entry(keyword_hash, key);
+        }
+        else {
+            value = rb_hash_lookup2(keyword_hash, key, Qundef);
+        }
+
+        if (!UNDEF_P(value)) {
+            keyword_size--;
+            locals[i] = value;
+        }
+        else {
+            if (!missing) missing = rb_ary_hidden_new(1);
+            rb_ary_push(missing, key);
+        }
+    }
+
+    if (missing) argument_kw_error(ec, iseq, cme, "missing", missing);
+
+    for (di=0; i<key_num; i++, di++) {
+        VALUE key = ID2SYM(acceptable_keywords[i]);
+        VALUE value;
+        if (remove_hash_value) {
+            value = rb_hash_delete_entry(keyword_hash, key);
+        }
+        else {
+            value = rb_hash_lookup2(keyword_hash, key, Qundef);
+        }
+
+        if (!UNDEF_P(value)) {
+            keyword_size--;
+            locals[i] = value;
+        }
+        else {
+            if (UNDEF_P(default_values[di])) {
+                locals[i] = Qnil;
+
+                if (LIKELY(i < KW_SPECIFIED_BITS_MAX)) {
+                    unspecified_bits |= 0x01 << di;
+                }
+                else {
+                    if (NIL_P(unspecified_bits_value)) {
+                        /* fixnum -> hash */
+                        int j;
+                        unspecified_bits_value = rb_hash_new();
+
+                        for (j=0; j<KW_SPECIFIED_BITS_MAX; j++) {
+                            if (unspecified_bits & (0x01 << j)) {
+                                rb_hash_aset(unspecified_bits_value, INT2FIX(j), Qtrue);
+                            }
+                        }
+                    }
+                    rb_hash_aset(unspecified_bits_value, INT2FIX(di), Qtrue);
+                }
+            }
+            else {
+                locals[i] = default_values[di];
+            }
+        }
+    }
+
+    if (ISEQ_BODY(iseq)->param.flags.has_kwrest) {
+        const int rest_hash_index = key_num + 1;
+        locals[rest_hash_index] = keyword_hash;
+    }
+    else {
+        if (!remove_hash_value) {
+            if (keyword_size != 0) {
+                /* Recurse with duplicated keyword hash in remove mode.
+                 * This is simpler than writing code to check which entries in the hash do not match.
+                 * This will raise an exception, so the additional performance impact shouldn't be material.
+                 */
+                args_setup_kw_parameters_from_kwsplat(ec, iseq, cme, rb_hash_dup(keyword_hash), locals, true);
+            }
+        }
+        else if (!RHASH_EMPTY_P(keyword_hash)) {
+            argument_kw_error(ec, iseq, cme, "unknown", rb_hash_keys(keyword_hash));
         }
     }
 
@@ -397,10 +500,12 @@ args_setup_kw_parameters(rb_execution_context_t *const ec, const rb_iseq_t *cons
 }
 
 static inline void
-args_setup_kw_rest_parameter(VALUE keyword_hash, VALUE *locals, int kw_flag)
+args_setup_kw_rest_parameter(VALUE keyword_hash, VALUE *locals, int kw_flag, bool anon_kwrest)
 {
     if (NIL_P(keyword_hash)) {
-        keyword_hash = rb_hash_new();
+        if (!anon_kwrest) {
+            keyword_hash = rb_hash_new();
+        }
     }
     else if (!(kw_flag & VM_CALL_KW_SPLAT_MUT)) {
         keyword_hash = rb_hash_dup(keyword_hash);
@@ -415,28 +520,24 @@ args_setup_block_parameter(const rb_execution_context_t *ec, struct rb_calling_i
     *locals = rb_vm_bh_to_procval(ec, block_handler);
 }
 
-struct fill_values_arg {
-    VALUE *keys;
-    VALUE *vals;
-    int argc;
-};
-
-static int
-fill_keys_values(st_data_t key, st_data_t val, st_data_t ptr)
-{
-    struct fill_values_arg *arg = (struct fill_values_arg *)ptr;
-    int i = arg->argc++;
-    arg->keys[i] = (VALUE)key;
-    arg->vals[i] = (VALUE)val;
-    return ST_CONTINUE;
-}
-
 static inline int
 ignore_keyword_hash_p(VALUE keyword_hash, const rb_iseq_t * const iseq, unsigned int * kw_flag, VALUE * converted_keyword_hash)
 {
-    if (!RB_TYPE_P(keyword_hash, T_HASH)) {
+    if (keyword_hash == Qnil) {
+        goto ignore;
+    }
+    else if (!RB_TYPE_P(keyword_hash, T_HASH)) {
         keyword_hash = rb_to_hash_type(keyword_hash);
     }
+    else if (UNLIKELY(ISEQ_BODY(iseq)->param.flags.anon_kwrest)) {
+        if (!ISEQ_BODY(iseq)->param.flags.has_kw) {
+            *kw_flag |= VM_CALL_KW_SPLAT_MUT;
+        }
+    }
+
+    if (RHASH_EMPTY_P(keyword_hash) && !ISEQ_BODY(iseq)->param.flags.has_kwrest) {
+        goto ignore;
+    }
 
     if (!(*kw_flag & VM_CALL_KW_SPLAT_MUT) &&
         (ISEQ_BODY(iseq)->param.flags.has_kwrest ||
@@ -445,9 +546,17 @@ ignore_keyword_hash_p(VALUE keyword_hash, const rb_iseq_t * const iseq, unsigned
         keyword_hash = rb_hash_dup(keyword_hash);
     }
     *converted_keyword_hash = keyword_hash;
-    return !(ISEQ_BODY(iseq)->param.flags.has_kw) &&
-           !(ISEQ_BODY(iseq)->param.flags.has_kwrest) &&
-           RHASH_EMPTY_P(keyword_hash);
+
+    if (!(ISEQ_BODY(iseq)->param.flags.has_kw) &&
+        !(ISEQ_BODY(iseq)->param.flags.has_kwrest) &&
+        RHASH_EMPTY_P(keyword_hash)) {
+      ignore:
+        *kw_flag &= ~(VM_CALL_KW_SPLAT | VM_CALL_KW_SPLAT_MUT);
+        return 1;
+    }
+    else {
+        return 0;
+    }
 }
 
 static VALUE
@@ -462,6 +571,22 @@ check_kwrestarg(VALUE keyword_hash, unsigned int *kw_flag)
     }
 }
 
+static void
+flatten_rest_args(rb_execution_context_t * const ec, struct args_info *args, VALUE * const locals, unsigned int *ci_flag)
+{
+    const VALUE *argv = RARRAY_CONST_PTR(args->rest);
+    int j, i=args->argc, rest_len = RARRAY_LENINT(args->rest)-1;
+    args->argc += rest_len;
+    if (rest_len) {
+        CHECK_VM_STACK_OVERFLOW(ec->cfp, rest_len+1);
+        for (j=0; rest_len > 0; rest_len--, i++, j++) {
+            locals[i] = argv[j];
+        }
+    }
+    args->rest = Qfalse;
+    *ci_flag &= ~VM_CALL_ARGS_SPLAT;
+}
+
 static int
 setup_parameters_complex(rb_execution_context_t * const ec, const rb_iseq_t * const iseq,
                          struct rb_calling_info *const calling,
@@ -471,7 +596,8 @@ setup_parameters_complex(rb_execution_context_t * const ec, const rb_iseq_t * co
     const int min_argc = ISEQ_BODY(iseq)->param.lead_num + ISEQ_BODY(iseq)->param.post_num;
     const int max_argc = (ISEQ_BODY(iseq)->param.flags.has_rest == FALSE) ? min_argc + ISEQ_BODY(iseq)->param.opt_num : UNLIMITED_ARGUMENTS;
     int given_argc;
-    unsigned int kw_flag = vm_ci_flag(ci) & (VM_CALL_KWARG | VM_CALL_KW_SPLAT | VM_CALL_KW_SPLAT_MUT);
+    unsigned int ci_flag = vm_ci_flag(ci);
+    unsigned int kw_flag = ci_flag & (VM_CALL_KWARG | VM_CALL_KW_SPLAT | VM_CALL_KW_SPLAT_MUT);
     int opt_pc = 0, allow_autosplat = !kw_flag;
     struct args_info args_body, *args;
     VALUE keyword_hash = Qnil;
@@ -481,6 +607,7 @@ setup_parameters_complex(rb_execution_context_t * const ec, const rb_iseq_t * co
     VALUE splat_flagged_keyword_hash = 0;
     VALUE converted_keyword_hash = 0;
     VALUE rest_last = 0;
+    const rb_callable_method_entry_t *cme = calling->cc ? vm_cc_cme(calling->cc) : NULL;
 
     vm_check_canary(ec, orig_sp);
     /*
@@ -506,7 +633,21 @@ setup_parameters_complex(rb_execution_context_t * const ec, const rb_iseq_t * co
     args = &args_body;
     given_argc = args->argc = calling->argc;
     args->argv = locals;
-    args->rest_dupped = FALSE;
+    args->rest_dupped = ci_flag & VM_CALL_ARGS_SPLAT_MUT;
+
+    if (UNLIKELY(ISEQ_BODY(iseq)->param.flags.anon_rest)) {
+        if ((ci_flag & VM_CALL_ARGS_SPLAT) &&
+                given_argc == ISEQ_BODY(iseq)->param.lead_num + (kw_flag ? 2 : 1) &&
+                !ISEQ_BODY(iseq)->param.flags.has_opt &&
+                !ISEQ_BODY(iseq)->param.flags.has_post &&
+                !ISEQ_BODY(iseq)->param.flags.ruby2_keywords &&
+                (!kw_flag ||
+                !ISEQ_BODY(iseq)->param.flags.has_kw ||
+                !ISEQ_BODY(iseq)->param.flags.has_kwrest ||
+                !ISEQ_BODY(iseq)->param.flags.accepts_no_kwarg)) {
+            args->rest_dupped = true;
+        }
+    }
 
     if (kw_flag & VM_CALL_KWARG) {
         args->kw_arg = vm_ci_kwarg(ci);
@@ -530,7 +671,7 @@ setup_parameters_complex(rb_execution_context_t * const ec, const rb_iseq_t * co
         args->kw_argv = NULL;
     }
 
-    if ((vm_ci_flag(ci) & VM_CALL_ARGS_SPLAT) && (vm_ci_flag(ci) & VM_CALL_KW_SPLAT)) {
+    if ((ci_flag & VM_CALL_ARGS_SPLAT) && (ci_flag & VM_CALL_KW_SPLAT)) {
         // f(*a, **kw)
         args->rest_index = 0;
         keyword_hash = locals[--args->argc];
@@ -542,19 +683,47 @@ setup_parameters_complex(rb_execution_context_t * const ec, const rb_iseq_t * co
         else if (UNLIKELY(ISEQ_BODY(iseq)->param.flags.ruby2_keywords)) {
             converted_keyword_hash = check_kwrestarg(converted_keyword_hash, &kw_flag);
             flag_keyword_hash = converted_keyword_hash;
+            arg_rest_dup(args);
             rb_ary_push(args->rest, converted_keyword_hash);
             keyword_hash = Qnil;
         }
         else if (!ISEQ_BODY(iseq)->param.flags.has_kwrest && !ISEQ_BODY(iseq)->param.flags.has_kw) {
             converted_keyword_hash = check_kwrestarg(converted_keyword_hash, &kw_flag);
-            rb_ary_push(args->rest, converted_keyword_hash);
-            keyword_hash = Qnil;
+            if (ISEQ_BODY(iseq)->param.flags.has_rest) {
+                arg_rest_dup(args);
+                rb_ary_push(args->rest, converted_keyword_hash);
+                keyword_hash = Qnil;
+            }
+            else {
+                // Avoid duping rest when not necessary
+                // Copy rest elements and converted keyword hash directly to VM stack
+                const VALUE *argv = RARRAY_CONST_PTR(args->rest);
+                int j, i=args->argc, rest_len = RARRAY_LENINT(args->rest);
+                if (rest_len) {
+                    CHECK_VM_STACK_OVERFLOW(ec->cfp, rest_len+1);
+                    given_argc += rest_len;
+                    args->argc += rest_len;
+                    for (j=0; rest_len > 0; rest_len--, i++, j++) {
+                        locals[i] = argv[j];
+                    }
+                }
+                locals[i] = converted_keyword_hash;
+                given_argc--;
+                args->argc++;
+                args->rest = Qfalse;
+                ci_flag &= ~(VM_CALL_ARGS_SPLAT|VM_CALL_KW_SPLAT);
+                keyword_hash = Qnil;
+                goto arg_splat_and_kw_splat_flattened;
+            }
+        }
+        else {
+            keyword_hash = converted_keyword_hash;
         }
 
         int len = RARRAY_LENINT(args->rest);
         given_argc += len - 2;
     }
-    else if (vm_ci_flag(ci) & VM_CALL_ARGS_SPLAT) {
+    else if (ci_flag & VM_CALL_ARGS_SPLAT) {
         // f(*a)
         args->rest_index = 0;
         args->rest = locals[--args->argc];
@@ -566,14 +735,44 @@ setup_parameters_complex(rb_execution_context_t * const ec, const rb_iseq_t * co
             if (RB_TYPE_P(rest_last, T_HASH) && FL_TEST_RAW(rest_last, RHASH_PASS_AS_KEYWORDS)) {
                 // def f(**kw); a = [..., kw]; g(*a)
                 splat_flagged_keyword_hash = rest_last;
-                rest_last = rb_hash_dup(rest_last);
+                if (!(RHASH_EMPTY_P(rest_last) || ISEQ_BODY(iseq)->param.flags.has_kw) || (ISEQ_BODY(iseq)->param.flags.has_kwrest)) {
+                    rest_last = rb_hash_dup(rest_last);
+                }
                 kw_flag |= VM_CALL_KW_SPLAT | VM_CALL_KW_SPLAT_MUT;
 
+                // Unset rest_dupped set by anon_rest as we may need to modify splat in this case
+                args->rest_dupped = false;
+
                 if (ignore_keyword_hash_p(rest_last, iseq, &kw_flag, &converted_keyword_hash)) {
-                    arg_rest_dup(args);
-                    rb_ary_pop(args->rest);
+                    if (ISEQ_BODY(iseq)->param.flags.has_rest) {
+                        // Only duplicate/modify splat array if it will be used
+                        arg_rest_dup(args);
+                        rb_ary_pop(args->rest);
+                    }
+                    else if (arg_setup_type == arg_setup_block && !ISEQ_BODY(iseq)->param.flags.has_kwrest) {
+                        // Avoid hash allocation for empty hashes
+                        // Copy rest elements except empty keyword hash directly to VM stack
+                        flatten_rest_args(ec, args, locals, &ci_flag);
+                        keyword_hash = Qnil;
+                        kw_flag = 0;
+                    }
                     given_argc--;
-                    kw_flag &= ~(VM_CALL_KW_SPLAT | VM_CALL_KW_SPLAT_MUT);
+                }
+                else if (!ISEQ_BODY(iseq)->param.flags.has_rest) {
+                    // Avoid duping rest when not necessary
+                    // Copy rest elements and converted keyword hash directly to VM stack
+                    flatten_rest_args(ec, args, locals, &ci_flag);
+
+                    if (ISEQ_BODY(iseq)->param.flags.has_kw || ISEQ_BODY(iseq)->param.flags.has_kwrest) {
+                        given_argc--;
+                        keyword_hash = converted_keyword_hash;
+                    }
+                    else {
+                        locals[args->argc] = converted_keyword_hash;
+                        args->argc += 1;
+                        keyword_hash = Qnil;
+                        kw_flag = 0;
+                    }
                 }
                 else {
                     if (rest_last != converted_keyword_hash) {
@@ -604,9 +803,13 @@ setup_parameters_complex(rb_execution_context_t * const ec, const rb_iseq_t * co
             if (ignore_keyword_hash_p(last_arg, iseq, &kw_flag, &converted_keyword_hash)) {
                 args->argc--;
                 given_argc--;
-                kw_flag &= ~(VM_CALL_KW_SPLAT | VM_CALL_KW_SPLAT_MUT);
             }
             else {
+                if (!(kw_flag & VM_CALL_KW_SPLAT_MUT) && !ISEQ_BODY(iseq)->param.flags.has_kw) {
+                    converted_keyword_hash = rb_hash_dup(converted_keyword_hash);
+                    kw_flag |= VM_CALL_KW_SPLAT_MUT;
+                }
+
                 if (last_arg != converted_keyword_hash) {
                     last_arg = converted_keyword_hash;
                     args->argv[args->argc-1] = last_arg;
@@ -628,6 +831,7 @@ setup_parameters_complex(rb_execution_context_t * const ec, const rb_iseq_t * co
         FL_SET_RAW(flag_keyword_hash, RHASH_PASS_AS_KEYWORDS);
     }
 
+  arg_splat_and_kw_splat_flattened:
     if (kw_flag && ISEQ_BODY(iseq)->param.flags.accepts_no_kwarg) {
         rb_raise(rb_eArgError, "no keywords accepted");
     }
@@ -658,7 +862,7 @@ setup_parameters_complex(rb_execution_context_t * const ec, const rb_iseq_t * co
             args_extend(args, min_argc);
         }
         else {
-            argument_arity_error(ec, iseq, given_argc, min_argc, max_argc);
+            argument_arity_error(ec, iseq, cme, given_argc, min_argc, max_argc);
         }
     }
 
@@ -669,7 +873,7 @@ setup_parameters_complex(rb_execution_context_t * const ec, const rb_iseq_t * co
             given_argc = max_argc;
         }
         else {
-            argument_arity_error(ec, iseq, given_argc, min_argc, max_argc);
+            argument_arity_error(ec, iseq, cme, given_argc, min_argc, max_argc);
         }
     }
 
@@ -691,16 +895,22 @@ setup_parameters_complex(rb_execution_context_t * const ec, const rb_iseq_t * co
     }
 
     if (ISEQ_BODY(iseq)->param.flags.has_rest) {
-        args_setup_rest_parameter(args, locals + ISEQ_BODY(iseq)->param.rest_start);
-        VALUE ary = *(locals + ISEQ_BODY(iseq)->param.rest_start);
-        VALUE index = RARRAY_LEN(ary) - 1;
-        if (splat_flagged_keyword_hash &&
-            !ISEQ_BODY(iseq)->param.flags.ruby2_keywords &&
-            !ISEQ_BODY(iseq)->param.flags.has_kw &&
-            !ISEQ_BODY(iseq)->param.flags.has_kwrest &&
-            RARRAY_AREF(ary, index) == splat_flagged_keyword_hash) {
-            ((struct RHash *)rest_last)->basic.flags &= ~RHASH_PASS_AS_KEYWORDS;
-            RARRAY_ASET(ary, index, rest_last);
+        if (UNLIKELY(ISEQ_BODY(iseq)->param.flags.anon_rest && args->argc == 0 && !args->rest && !ISEQ_BODY(iseq)->param.flags.has_post)) {
+           *(locals + ISEQ_BODY(iseq)->param.rest_start) = args->rest = rb_cArray_empty_frozen;
+           args->rest_index = 0;
+        }
+        else {
+            args_setup_rest_parameter(args, locals + ISEQ_BODY(iseq)->param.rest_start);
+            VALUE ary = *(locals + ISEQ_BODY(iseq)->param.rest_start);
+            VALUE index = RARRAY_LEN(ary) - 1;
+            if (splat_flagged_keyword_hash &&
+                !ISEQ_BODY(iseq)->param.flags.ruby2_keywords &&
+                !ISEQ_BODY(iseq)->param.flags.has_kw &&
+                !ISEQ_BODY(iseq)->param.flags.has_kwrest &&
+                RARRAY_AREF(ary, index) == splat_flagged_keyword_hash) {
+                ((struct RHash *)rest_last)->basic.flags &= ~RHASH_PASS_AS_KEYWORDS;
+                RARRAY_ASET(ary, index, rest_last);
+            }
         }
     }
 
@@ -709,29 +919,38 @@ setup_parameters_complex(rb_execution_context_t * const ec, const rb_iseq_t * co
 
         if (args->kw_argv != NULL) {
             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);
+            args_setup_kw_parameters(ec, iseq, cme, args->kw_argv, kw_arg->keyword_len, kw_arg->keywords, klocals);
         }
         else if (!NIL_P(keyword_hash)) {
-            int kw_len = rb_long2int(RHASH_SIZE(keyword_hash));
-            struct fill_values_arg arg;
-            /* copy kw_argv */
-            arg.keys = args->kw_argv = ALLOCA_N(VALUE, kw_len * 2);
-            arg.vals = arg.keys + kw_len;
-            arg.argc = 0;
-            rb_hash_foreach(keyword_hash, fill_keys_values, (VALUE)&arg);
-            VM_ASSERT(arg.argc == kw_len);
-            args_setup_kw_parameters(ec, iseq, arg.vals, kw_len, arg.keys, klocals);
+            bool remove_hash_value = false;
+            if (ISEQ_BODY(iseq)->param.flags.has_kwrest) {
+                keyword_hash = check_kwrestarg(keyword_hash, &kw_flag);
+                remove_hash_value = true;
+            }
+            args_setup_kw_parameters_from_kwsplat(ec, iseq, cme, keyword_hash, klocals, remove_hash_value);
         }
         else {
-            VM_ASSERT(args_argc(args) == 0);
-            args_setup_kw_parameters(ec, iseq, NULL, 0, NULL, klocals);
+#if VM_CHECK_MODE > 0
+            if (args_argc(args) != 0) {
+                VM_ASSERT(ci_flag & VM_CALL_ARGS_SPLAT);
+                VM_ASSERT(!(ci_flag & (VM_CALL_KWARG | VM_CALL_KW_SPLAT | VM_CALL_KW_SPLAT_MUT)));
+                VM_ASSERT(!kw_flag);
+                VM_ASSERT(!ISEQ_BODY(iseq)->param.flags.has_rest);
+                VM_ASSERT(RARRAY_LENINT(args->rest) > 0);
+                VM_ASSERT(RB_TYPE_P(rest_last, T_HASH));
+                VM_ASSERT(FL_TEST_RAW(rest_last, RHASH_PASS_AS_KEYWORDS));
+                VM_ASSERT(args_argc(args) == 1);
+            }
+#endif
+            args_setup_kw_parameters(ec, iseq, cme, NULL, 0, NULL, klocals);
         }
     }
     else if (ISEQ_BODY(iseq)->param.flags.has_kwrest) {
-        args_setup_kw_rest_parameter(keyword_hash, locals + ISEQ_BODY(iseq)->param.keyword->rest_start, kw_flag);
+        args_setup_kw_rest_parameter(keyword_hash, locals + ISEQ_BODY(iseq)->param.keyword->rest_start,
+            kw_flag, ISEQ_BODY(iseq)->param.flags.anon_kwrest);
     }
     else if (!NIL_P(keyword_hash) && RHASH_SIZE(keyword_hash) > 0 && arg_setup_type == arg_setup_method) {
-        argument_kw_error(ec, iseq, "unknown", rb_hash_keys(keyword_hash));
+        argument_kw_error(ec, iseq, cme, "unknown", rb_hash_keys(keyword_hash));
     }
 
     if (ISEQ_BODY(iseq)->param.flags.has_block) {
@@ -757,17 +976,16 @@ setup_parameters_complex(rb_execution_context_t * const ec, const rb_iseq_t * co
 }
 
 static void
-raise_argument_error(rb_execution_context_t *ec, const rb_iseq_t *iseq, const VALUE exc)
+raise_argument_error(rb_execution_context_t *ec, const rb_iseq_t *iseq, const rb_callable_method_entry_t *cme, const VALUE exc)
 {
     VALUE at;
 
     if (iseq) {
         vm_push_frame(ec, iseq, VM_FRAME_MAGIC_DUMMY | VM_ENV_FLAG_LOCAL, Qnil /* self */,
-                      VM_BLOCK_HANDLER_NONE /* specval*/, Qfalse /* me or cref */,
+                      VM_BLOCK_HANDLER_NONE /* specval*/, (VALUE) cme /* me or cref */,
                       ISEQ_BODY(iseq)->iseq_encoded,
                       ec->cfp->sp, 0, 0 /* stack_max */);
         at = rb_ec_backtrace_object(ec);
-        rb_backtrace_use_iseq_first_lineno_for_last_location(at);
         rb_vm_pop_frame(ec);
     }
     else {
@@ -780,7 +998,7 @@ raise_argument_error(rb_execution_context_t *ec, const rb_iseq_t *iseq, const VA
 }
 
 static void
-argument_arity_error(rb_execution_context_t *ec, const rb_iseq_t *iseq, const int miss_argc, const int min_argc, const int max_argc)
+argument_arity_error(rb_execution_context_t *ec, const rb_iseq_t *iseq, const rb_callable_method_entry_t *cme, const int miss_argc, const int min_argc, const int max_argc)
 {
     VALUE exc = rb_arity_error_new(miss_argc, min_argc, max_argc);
     if (ISEQ_BODY(iseq)->param.flags.has_kw) {
@@ -801,13 +1019,13 @@ argument_arity_error(rb_execution_context_t *ec, const rb_iseq_t *iseq, const in
             RSTRING_PTR(mesg)[RSTRING_LEN(mesg)-1] = ')';
         }
     }
-    raise_argument_error(ec, iseq, exc);
+    raise_argument_error(ec, iseq, cme, exc);
 }
 
 static void
-argument_kw_error(rb_execution_context_t *ec, const rb_iseq_t *iseq, const char *error, const VALUE keys)
+argument_kw_error(rb_execution_context_t *ec, const rb_iseq_t *iseq, const rb_callable_method_entry_t *cme, const char *error, const VALUE keys)
 {
-    raise_argument_error(ec, iseq, rb_keyword_error_new(error, keys));
+    raise_argument_error(ec, iseq, cme, rb_keyword_error_new(error, keys));
 }
 
 static VALUE
@@ -885,10 +1103,7 @@ 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) {
-            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;
+            return VM_CF_BLOCK_HANDLER(reg_cfp);
         }
         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);
@@ -900,7 +1115,7 @@ vm_caller_setup_arg_block(const rb_execution_context_t *ec, rb_control_frame_t *
                     VALUE callback_arg = rb_ary_hidden_new(2);
                     rb_ary_push(callback_arg, block_code);
                     rb_ary_push(callback_arg, ref);
-                    OBJ_FREEZE_RAW(callback_arg);
+                    OBJ_FREEZE(callback_arg);
                     func = rb_func_lambda_new(refine_sym_proc_call, callback_arg, 1, UNLIMITED_ARGUMENTS);
                     rb_hash_aset(ref, block_code, func);
                 }
@@ -926,3 +1141,57 @@ vm_caller_setup_arg_block(const rb_execution_context_t *ec, rb_control_frame_t *
         }
     }
 }
+
+static void vm_adjust_stack_forwarding(const struct rb_execution_context_struct *ec, struct rb_control_frame_struct *cfp, int argc, VALUE splat);
+
+static VALUE
+vm_caller_setup_fwd_args(const rb_execution_context_t *ec, rb_control_frame_t *reg_cfp,
+                    CALL_DATA cd, const rb_iseq_t *blockiseq, const int is_super,
+                    struct rb_forwarding_call_data *adjusted_cd, struct rb_callinfo *adjusted_ci)
+{
+    CALL_INFO site_ci = cd->ci;
+    VALUE bh = Qundef;
+
+    RUBY_ASSERT(ISEQ_BODY(ISEQ_BODY(GET_ISEQ())->local_iseq)->param.flags.forwardable);
+    CALL_INFO caller_ci = (CALL_INFO)TOPN(0);
+
+    unsigned int site_argc = vm_ci_argc(site_ci);
+    unsigned int site_flag = vm_ci_flag(site_ci);
+    ID site_mid = vm_ci_mid(site_ci);
+
+    unsigned int caller_argc = vm_ci_argc(caller_ci);
+    unsigned int caller_flag = vm_ci_flag(caller_ci);
+    const struct rb_callinfo_kwarg * kw = vm_ci_kwarg(caller_ci);
+
+    VALUE splat = Qfalse;
+
+    if (site_flag & VM_CALL_ARGS_SPLAT) {
+        // If we're called with args_splat, the top 1 should be an array
+        splat = TOPN(1);
+        site_argc += (RARRAY_LEN(splat) - 1);
+    }
+
+    // Need to setup the block in case of e.g. `super { :block }`
+    if (is_super && blockiseq) {
+        bh = vm_caller_setup_arg_block(ec, GET_CFP(), site_ci, blockiseq, is_super);
+    }
+    else {
+        bh = VM_ENV_BLOCK_HANDLER(GET_LEP());
+    }
+
+    vm_adjust_stack_forwarding(ec, GET_CFP(), caller_argc, splat);
+
+    *adjusted_ci = VM_CI_ON_STACK(
+            site_mid,
+            ((caller_flag & ~(VM_CALL_ARGS_SIMPLE | VM_CALL_FCALL)) |
+             (site_flag & (VM_CALL_FCALL | VM_CALL_FORWARDING))),
+            site_argc + caller_argc,
+            kw
+            );
+
+    adjusted_cd->cd.ci = adjusted_ci;
+    adjusted_cd->cd.cc = cd->cc;
+    adjusted_cd->caller_ci = caller_ci;
+
+    return bh;
+}
diff --git a/vm_backtrace.c b/vm_backtrace.c
index e46eaa5b813bca..12e4b771e22060 100644
--- a/vm_backtrace.c
+++ b/vm_backtrace.c
@@ -31,9 +31,6 @@ id2str(ID id)
 }
 #define rb_id2str(id) id2str(id)
 
-#define BACKTRACE_START 0
-#define ALL_BACKTRACE_LINES -1
-
 inline static int
 calc_pos(const rb_iseq_t *iseq, const VALUE *pc, int *lineno, int *node_id)
 {
@@ -71,7 +68,7 @@ calc_pos(const rb_iseq_t *iseq, const VALUE *pc, int *lineno, int *node_id)
 #if VMDEBUG && defined(HAVE_BUILTIN___BUILTIN_TRAP)
         else {
             /* SDR() is not possible; that causes infinite loop. */
-            rb_print_backtrace();
+            rb_print_backtrace(stderr);
             __builtin_trap();
         }
 #endif
@@ -120,14 +117,9 @@ rb_vm_get_sourceline(const rb_control_frame_t *cfp)
 }
 
 typedef struct rb_backtrace_location_struct {
-    enum LOCATION_TYPE {
-        LOCATION_TYPE_ISEQ = 1,
-        LOCATION_TYPE_CFUNC,
-    } type;
-
+    const rb_callable_method_entry_t *cme;
     const rb_iseq_t *iseq;
     const VALUE *pc;
-    ID mid;
 } rb_backtrace_location_t;
 
 struct valued_frame_info {
@@ -139,37 +131,32 @@ static void
 location_mark(void *ptr)
 {
     struct valued_frame_info *vfi = (struct valued_frame_info *)ptr;
-    rb_gc_mark(vfi->btobj);
+    rb_gc_mark_movable(vfi->btobj);
 }
 
 static void
-location_mark_entry(rb_backtrace_location_t *fi)
+location_ref_update(void *ptr)
 {
-    switch (fi->type) {
-      case LOCATION_TYPE_ISEQ:
-        rb_gc_mark_movable((VALUE)fi->iseq);
-        break;
-      case LOCATION_TYPE_CFUNC:
-        if (fi->iseq) {
-            rb_gc_mark_movable((VALUE)fi->iseq);
-        }
-        break;
-      default:
-        break;
-    }
+    struct valued_frame_info *vfi = ptr;
+    vfi->btobj = rb_gc_location(vfi->btobj);
 }
 
-static size_t
-location_memsize(const void *ptr)
+static void
+location_mark_entry(rb_backtrace_location_t *fi)
 {
-    /* rb_backtrace_location_t *fi = (rb_backtrace_location_t *)ptr; */
-    return sizeof(rb_backtrace_location_t);
+    rb_gc_mark((VALUE)fi->cme);
+    if (fi->iseq) rb_gc_mark_movable((VALUE)fi->iseq);
 }
 
 static const rb_data_type_t location_data_type = {
     "frame_info",
-    {location_mark, RUBY_TYPED_DEFAULT_FREE, location_memsize,},
-    0, 0, RUBY_TYPED_FREE_IMMEDIATELY | RUBY_TYPED_WB_PROTECTED
+    {
+        location_mark,
+        RUBY_TYPED_DEFAULT_FREE,
+        NULL, // No external memory to report,
+        location_ref_update,
+    },
+    0, 0, RUBY_TYPED_FREE_IMMEDIATELY | RUBY_TYPED_WB_PROTECTED | RUBY_TYPED_EMBEDDABLE
 };
 
 int
@@ -182,25 +169,17 @@ static inline rb_backtrace_location_t *
 location_ptr(VALUE locobj)
 {
     struct valued_frame_info *vloc;
-    GetCoreDataFromValue(locobj, struct valued_frame_info, vloc);
+    TypedData_Get_Struct(locobj, struct valued_frame_info, &location_data_type, vloc);
     return vloc->loc;
 }
 
 static int
 location_lineno(rb_backtrace_location_t *loc)
 {
-    switch (loc->type) {
-      case LOCATION_TYPE_ISEQ:
+    if (loc->iseq) {
         return calc_lineno(loc->iseq, loc->pc);
-      case LOCATION_TYPE_CFUNC:
-        if (loc->iseq && loc->pc) {
-            return calc_lineno(loc->iseq, loc->pc);
-        }
-        return 0;
-      default:
-        rb_bug("location_lineno: unreachable");
-        UNREACHABLE;
     }
+    return 0;
 }
 
 /*
@@ -217,20 +196,111 @@ location_lineno_m(VALUE self)
     return INT2FIX(location_lineno(location_ptr(self)));
 }
 
+VALUE rb_mod_name0(VALUE klass, bool *permanent);
+
+VALUE
+rb_gen_method_name(VALUE owner, VALUE name)
+{
+    bool permanent;
+    if (RB_TYPE_P(owner, T_CLASS) || RB_TYPE_P(owner, T_MODULE)) {
+        if (RCLASS_SINGLETON_P(owner)) {
+            VALUE v = RCLASS_ATTACHED_OBJECT(owner);
+            if (RB_TYPE_P(v, T_CLASS) || RB_TYPE_P(v, T_MODULE)) {
+                v = rb_mod_name0(v, &permanent);
+                if (permanent && !NIL_P(v)) {
+                    return rb_sprintf("%"PRIsVALUE".%"PRIsVALUE, v, name);
+                }
+            }
+        }
+        else {
+            owner = rb_mod_name0(owner, &permanent);
+            if (permanent && !NIL_P(owner)) {
+                return rb_sprintf("%"PRIsVALUE"#%"PRIsVALUE, owner, name);
+            }
+        }
+    }
+    return name;
+}
+
 static VALUE
-location_label(rb_backtrace_location_t *loc)
+calculate_iseq_label(VALUE owner, const rb_iseq_t *iseq)
+{
+retry:
+    switch (ISEQ_BODY(iseq)->type) {
+      case ISEQ_TYPE_TOP:
+      case ISEQ_TYPE_CLASS:
+      case ISEQ_TYPE_MAIN:
+        return ISEQ_BODY(iseq)->location.label;
+      case ISEQ_TYPE_METHOD:
+        return rb_gen_method_name(owner, ISEQ_BODY(iseq)->location.label);
+      case ISEQ_TYPE_BLOCK:
+      case ISEQ_TYPE_PLAIN: {
+        int level = 0;
+        const rb_iseq_t *orig_iseq = iseq;
+        if (ISEQ_BODY(orig_iseq)->parent_iseq != 0) {
+            while (ISEQ_BODY(orig_iseq)->local_iseq != iseq) {
+                if (ISEQ_BODY(iseq)->type == ISEQ_TYPE_BLOCK) {
+                    level++;
+                }
+                iseq = ISEQ_BODY(iseq)->parent_iseq;
+            }
+        }
+        if (level <= 1) {
+            return rb_sprintf("block in %"PRIsVALUE, calculate_iseq_label(owner, iseq));
+        }
+        else {
+            return rb_sprintf("block (%d levels) in %"PRIsVALUE, level, calculate_iseq_label(owner, iseq));
+        }
+      }
+      case ISEQ_TYPE_RESCUE:
+      case ISEQ_TYPE_ENSURE:
+      case ISEQ_TYPE_EVAL:
+        iseq = ISEQ_BODY(iseq)->parent_iseq;
+        goto retry;
+      default:
+        rb_bug("calculate_iseq_label: unreachable");
+    }
+}
+
+static bool
+is_internal_location(const rb_iseq_t *iseq)
+{
+    static const char prefix[] = "<internal:";
+    const size_t prefix_len = sizeof(prefix) - 1;
+    VALUE file = rb_iseq_path(iseq);
+    return strncmp(prefix, RSTRING_PTR(file), prefix_len) == 0;
+}
+
+// Return true if a given location is a C method or supposed to behave like one.
+static inline bool
+location_cfunc_p(rb_backtrace_location_t *loc)
 {
-    switch (loc->type) {
-      case LOCATION_TYPE_ISEQ:
-        return ISEQ_BODY(loc->iseq)->location.label;
-      case LOCATION_TYPE_CFUNC:
-        return rb_id2str(loc->mid);
+    if (!loc->cme) return false;
+
+    switch (loc->cme->def->type) {
+      case VM_METHOD_TYPE_CFUNC:
+        return true;
+      case VM_METHOD_TYPE_ISEQ:
+        return is_internal_location(loc->cme->def->body.iseq.iseqptr);
       default:
-        rb_bug("location_label: unreachable");
-        UNREACHABLE;
+        return false;
     }
 }
 
+static VALUE
+location_label(rb_backtrace_location_t *loc)
+{
+    if (location_cfunc_p(loc)) {
+        return rb_gen_method_name(loc->cme->owner, rb_id2str(loc->cme->def->original_id));
+    }
+    else {
+        VALUE owner = Qnil;
+        if (loc->cme) {
+            owner = loc->cme->owner;
+        }
+        return calculate_iseq_label(owner, loc->iseq);
+    }
+}
 /*
  * Returns the label of this frame.
  *
@@ -247,15 +317,14 @@ location_label(rb_backtrace_location_t *loc)
  *	    1.times do
  *	      puts caller_locations(0).first.label
  *	    end
- *
  *	  end
  *	end
  *
  * The result of calling +foo+ is this:
  *
- *	label: foo
- *	label: block in foo
- *	label: block (2 levels) in foo
+ *	foo
+ *	block in foo
+ *	block (2 levels) in foo
  *
  */
 static VALUE
@@ -267,21 +336,36 @@ location_label_m(VALUE self)
 static VALUE
 location_base_label(rb_backtrace_location_t *loc)
 {
-    switch (loc->type) {
-      case LOCATION_TYPE_ISEQ:
-        return ISEQ_BODY(loc->iseq)->location.base_label;
-      case LOCATION_TYPE_CFUNC:
-        return rb_id2str(loc->mid);
-      default:
-        rb_bug("location_base_label: unreachable");
-        UNREACHABLE;
+    if (location_cfunc_p(loc)) {
+        return rb_id2str(loc->cme->def->original_id);
     }
+
+    return ISEQ_BODY(loc->iseq)->location.base_label;
 }
 
 /*
- * Returns the base label of this frame.
+ * Returns the base label of this frame, which is usually equal to the label,
+ * without decoration.
+ *
+ * Consider the following example:
+ *
+ *	def foo
+ *	  puts caller_locations(0).first.base_label
+ *
+ *	  1.times do
+ *	    puts caller_locations(0).first.base_label
+ *
+ *	    1.times do
+ *	      puts caller_locations(0).first.base_label
+ *	    end
+ *	  end
+ *	end
+ *
+ * The result of calling +foo+ is this:
  *
- * Usually same as #label, without decoration.
+ *	foo
+ *	foo
+ *	foo
  */
 static VALUE
 location_base_label_m(VALUE self)
@@ -292,15 +376,7 @@ location_base_label_m(VALUE self)
 static const rb_iseq_t *
 location_iseq(rb_backtrace_location_t *loc)
 {
-    switch (loc->type) {
-      case LOCATION_TYPE_ISEQ:
-        return loc->iseq;
-      case LOCATION_TYPE_CFUNC:
-        return loc->iseq;
-      default:
-        rb_bug("location_iseq: unreachable");
-        UNREACHABLE;
-    }
+    return loc->iseq;
 }
 
 /*
@@ -324,18 +400,10 @@ location_path_m(VALUE self)
 static int
 location_node_id(rb_backtrace_location_t *loc)
 {
-    switch (loc->type) {
-      case LOCATION_TYPE_ISEQ:
+    if (loc->iseq && loc->pc) {
         return calc_node_id(loc->iseq, loc->pc);
-      case LOCATION_TYPE_CFUNC:
-        if (loc->iseq && loc->pc) {
-            return calc_node_id(loc->iseq, loc->pc);
-        }
-        return -1;
-      default:
-        rb_bug("location_node_id: unreachable");
-        UNREACHABLE;
     }
+    return -1;
 }
 #endif
 
@@ -361,18 +429,10 @@ rb_get_iseq_from_frame_info(VALUE obj)
 static VALUE
 location_realpath(rb_backtrace_location_t *loc)
 {
-    switch (loc->type) {
-      case LOCATION_TYPE_ISEQ:
+    if (loc->iseq) {
         return rb_iseq_realpath(loc->iseq);
-      case LOCATION_TYPE_CFUNC:
-        if (loc->iseq) {
-            return rb_iseq_realpath(loc->iseq);
-        }
-        return Qnil;
-      default:
-        rb_bug("location_realpath: unreachable");
-        UNREACHABLE;
     }
+    return Qnil;
 }
 
 /*
@@ -399,25 +459,19 @@ location_format(VALUE file, int lineno, VALUE name)
         rb_str_cat_cstr(s, "unknown method");
     }
     else {
-        rb_str_catf(s, "`%s'", RSTRING_PTR(name));
+        rb_str_catf(s, "'%s'", RSTRING_PTR(name));
     }
+    RB_GC_GUARD(name);
     return s;
 }
 
 static VALUE
 location_to_str(rb_backtrace_location_t *loc)
 {
-    VALUE file, name;
+    VALUE file, owner = Qnil, name;
     int lineno;
 
-    switch (loc->type) {
-      case LOCATION_TYPE_ISEQ:
-        file = rb_iseq_path(loc->iseq);
-        name = ISEQ_BODY(loc->iseq)->location.label;
-
-        lineno = calc_lineno(loc->iseq, loc->pc);
-        break;
-      case LOCATION_TYPE_CFUNC:
+    if (location_cfunc_p(loc)) {
         if (loc->iseq && loc->pc) {
             file = rb_iseq_path(loc->iseq);
             lineno = calc_lineno(loc->iseq, loc->pc);
@@ -426,10 +480,15 @@ location_to_str(rb_backtrace_location_t *loc)
             file = GET_VM()->progname;
             lineno = 0;
         }
-        name = rb_id2str(loc->mid);
-        break;
-      default:
-        rb_bug("location_to_str: unreachable");
+        name = rb_gen_method_name(loc->cme->owner, rb_id2str(loc->cme->def->original_id));
+    }
+    else {
+        file = rb_iseq_path(loc->iseq);
+        lineno = calc_lineno(loc->iseq, loc->pc);
+        if (loc->cme) {
+            owner = loc->cme->owner;
+        }
+        name = calculate_iseq_label(owner, loc->iseq);
     }
 
     return location_format(file, lineno, name);
@@ -455,10 +514,10 @@ location_inspect_m(VALUE self)
 }
 
 typedef struct rb_backtrace_struct {
-    rb_backtrace_location_t *backtrace;
     int backtrace_size;
     VALUE strary;
     VALUE locary;
+    rb_backtrace_location_t backtrace[1];
 } rb_backtrace_t;
 
 static void
@@ -474,28 +533,12 @@ backtrace_mark(void *ptr)
     rb_gc_mark_movable(bt->locary);
 }
 
-static void
-backtrace_free(void *ptr)
-{
-   rb_backtrace_t *bt = (rb_backtrace_t *)ptr;
-   ruby_xfree(bt->backtrace);
-   ruby_xfree(bt);
-}
-
 static void
 location_update_entry(rb_backtrace_location_t *fi)
 {
-    switch (fi->type) {
-      case LOCATION_TYPE_ISEQ:
-        fi->iseq = (rb_iseq_t*)rb_gc_location((VALUE)fi->iseq);
-        break;
-      case LOCATION_TYPE_CFUNC:
-        if (fi->iseq) {
-            fi->iseq = (rb_iseq_t*)rb_gc_location((VALUE)fi->iseq);
-        }
-        break;
-      default:
-        break;
+    fi->cme = (rb_callable_method_entry_t *)rb_gc_location((VALUE)fi->cme);
+    if (fi->iseq) {
+        fi->iseq = (rb_iseq_t *)rb_gc_location((VALUE)fi->iseq);
     }
 }
 
@@ -512,16 +555,17 @@ backtrace_update(void *ptr)
     bt->locary = rb_gc_location(bt->locary);
 }
 
-static size_t
-backtrace_memsize(const void *ptr)
-{
-    rb_backtrace_t *bt = (rb_backtrace_t *)ptr;
-    return sizeof(rb_backtrace_t) + sizeof(rb_backtrace_location_t) * bt->backtrace_size;
-}
-
 static const rb_data_type_t backtrace_data_type = {
     "backtrace",
-    {backtrace_mark, backtrace_free, backtrace_memsize, backtrace_update},
+    {
+        backtrace_mark,
+        RUBY_DEFAULT_FREE,
+        NULL, // No external memory to report,
+        backtrace_update,
+    },
+    /* Cannot set the RUBY_TYPED_EMBEDDABLE flag because the loc of frame_info
+     * points elements in the backtrace array. This can cause the loc to become
+     * incorrect if this backtrace object is moved by compaction. */
     0, 0, RUBY_TYPED_FREE_IMMEDIATELY | RUBY_TYPED_WB_PROTECTED
 };
 
@@ -539,6 +583,16 @@ backtrace_alloc(VALUE klass)
     return obj;
 }
 
+static VALUE
+backtrace_alloc_capa(long num_frames, rb_backtrace_t **backtrace)
+{
+    size_t memsize = offsetof(rb_backtrace_t, backtrace) + num_frames * sizeof(rb_backtrace_location_t);
+    VALUE btobj = rb_data_typed_object_zalloc(rb_cBacktrace, memsize, &backtrace_data_type);
+    TypedData_Get_Struct(btobj, rb_backtrace_t, &backtrace_data_type, *backtrace);
+    return btobj;
+}
+
+
 static long
 backtrace_size(const rb_execution_context_t *ec)
 {
@@ -561,20 +615,18 @@ backtrace_size(const rb_execution_context_t *ec)
 }
 
 static bool
-is_internal_location(const rb_control_frame_t *cfp)
+is_rescue_or_ensure_frame(const rb_control_frame_t *cfp)
 {
-    static const char prefix[] = "<internal:";
-    const size_t prefix_len = sizeof(prefix) - 1;
-    VALUE file = rb_iseq_path(cfp->iseq);
-    return strncmp(prefix, RSTRING_PTR(file), prefix_len) == 0;
+    enum rb_iseq_type type = ISEQ_BODY(cfp->iseq)->type;
+    return type == ISEQ_TYPE_RESCUE || type == ISEQ_TYPE_ENSURE;
 }
 
 static void
-bt_update_cfunc_loc(unsigned long cfunc_counter, rb_backtrace_location_t *cfunc_loc, const rb_iseq_t *iseq, const VALUE *pc)
+bt_backpatch_loc(unsigned long backpatch_counter, rb_backtrace_location_t *loc, const rb_iseq_t *iseq, const VALUE *pc)
 {
-    for (; cfunc_counter > 0; cfunc_counter--, cfunc_loc--) {
-        cfunc_loc->iseq = iseq;
-        cfunc_loc->pc = pc;
+    for (; backpatch_counter > 0; backpatch_counter--, loc--) {
+        loc->iseq = iseq;
+        loc->pc = pc;
     }
 }
 
@@ -594,11 +646,11 @@ rb_ec_partial_backtrace_object(const rb_execution_context_t *ec, long start_fram
     const rb_control_frame_t *cfp = ec->cfp;
     const rb_control_frame_t *end_cfp = RUBY_VM_END_CONTROL_FRAME(ec);
     ptrdiff_t size;
-    rb_backtrace_t *bt;
-    VALUE btobj = backtrace_alloc(rb_cBacktrace);
+    rb_backtrace_t *bt = NULL;
+    VALUE btobj = Qnil;
     rb_backtrace_location_t *loc = NULL;
-    unsigned long cfunc_counter = 0;
-    GetCoreDataFromValue(btobj, rb_backtrace_t, bt);
+    unsigned long backpatch_counter = 0;
+    bool skip_next_frame = FALSE;
 
     // In the case the thread vm_stack or cfp is not initialized, there is no backtrace.
     if (end_cfp == NULL) {
@@ -626,7 +678,8 @@ rb_ec_partial_backtrace_object(const rb_execution_context_t *ec, long start_fram
         }
     }
 
-    bt->backtrace = ZALLOC_N(rb_backtrace_location_t, num_frames);
+    btobj = backtrace_alloc_capa(num_frames, &bt);
+
     bt->backtrace_size = 0;
     if (num_frames == 0) {
         if (start_too_large) *start_too_large = 0;
@@ -639,18 +692,44 @@ rb_ec_partial_backtrace_object(const rb_execution_context_t *ec, long start_fram
                 if (start_frame > 0) {
                     start_frame--;
                 }
-                else if (!skip_internal || !is_internal_location(cfp)) {
-                    const rb_iseq_t *iseq = cfp->iseq;
-                    const VALUE *pc = cfp->pc;
-                    loc = &bt->backtrace[bt->backtrace_size++];
-                    loc->type = LOCATION_TYPE_ISEQ;
-                    RB_OBJ_WRITE(btobj, &loc->iseq, iseq);
-                    loc->pc = pc;
-                    bt_update_cfunc_loc(cfunc_counter, loc-1, iseq, pc);
-                    if (do_yield) {
-                        bt_yield_loc(loc - cfunc_counter, cfunc_counter+1, btobj);
+                else {
+                    bool internal = is_internal_location(cfp->iseq);
+                    if (skip_internal && internal) continue;
+                    if (!skip_next_frame) {
+                        const rb_iseq_t *iseq = cfp->iseq;
+                        const VALUE *pc = cfp->pc;
+                        if (internal && backpatch_counter > 0) {
+                            // To keep only one internal frame, discard the previous backpatch frames
+                            bt->backtrace_size -= backpatch_counter;
+                            backpatch_counter = 0;
+                        }
+                        loc = &bt->backtrace[bt->backtrace_size++];
+                        RB_OBJ_WRITE(btobj, &loc->cme, rb_vm_frame_method_entry(cfp));
+                        // internal frames (`<internal:...>`) should behave like C methods
+                        if (internal) {
+                            // Typically, these iseq and pc are not needed because they will be backpatched later.
+                            // But when the call stack starts with an internal frame (i.e., prelude.rb),
+                            // they will be used to show the `<internal:...>` location.
+                            RB_OBJ_WRITE(btobj, &loc->iseq, iseq);
+                            loc->pc = pc;
+                            backpatch_counter++;
+                        }
+                        else {
+                            RB_OBJ_WRITE(btobj, &loc->iseq, iseq);
+                            if ((VM_FRAME_TYPE(cfp) & VM_FRAME_MAGIC_MASK) == VM_FRAME_MAGIC_DUMMY) {
+                                loc->pc = NULL; // means location.first_lineno
+                            }
+                            else {
+                                loc->pc = pc;
+                            }
+                            bt_backpatch_loc(backpatch_counter, loc-1, iseq, pc);
+                            if (do_yield) {
+                                bt_yield_loc(loc - backpatch_counter, backpatch_counter+1, btobj);
+                            }
+                            backpatch_counter = 0;
+                        }
                     }
-                    cfunc_counter = 0;
+                    skip_next_frame = is_rescue_or_ensure_frame(cfp);
                 }
             }
         }
@@ -661,22 +740,24 @@ rb_ec_partial_backtrace_object(const rb_execution_context_t *ec, long start_fram
             }
             else {
                 loc = &bt->backtrace[bt->backtrace_size++];
-                loc->type = LOCATION_TYPE_CFUNC;
+                RB_OBJ_WRITE(btobj, &loc->cme, rb_vm_frame_method_entry(cfp));
                 loc->iseq = NULL;
                 loc->pc = NULL;
-                loc->mid = rb_vm_frame_method_entry(cfp)->def->original_id;
-                cfunc_counter++;
+                backpatch_counter++;
             }
         }
     }
 
-    if (cfunc_counter > 0) {
+    // When a backtrace entry corresponds to a method defined in C (e.g. rb_define_method), the reported file:line
+    // is the one of the caller Ruby frame, so if the last entry is a C frame we find the caller Ruby frame here.
+    if (backpatch_counter > 0) {
         for (; cfp != end_cfp; cfp = RUBY_VM_PREVIOUS_CONTROL_FRAME(cfp)) {
-            if (cfp->iseq && cfp->pc && (!skip_internal || !is_internal_location(cfp))) {
-                bt_update_cfunc_loc(cfunc_counter, loc, cfp->iseq, cfp->pc);
+            if (cfp->iseq && cfp->pc && !(skip_internal && is_internal_location(cfp->iseq))) {
+                VM_ASSERT(!skip_next_frame); // ISEQ_TYPE_RESCUE/ISEQ_TYPE_ENSURE should have a caller Ruby ISEQ, not a cfunc
+                bt_backpatch_loc(backpatch_counter, loc, cfp->iseq, cfp->pc);
                 RB_OBJ_WRITTEN(btobj, Qundef, cfp->iseq);
                 if (do_yield) {
-                    bt_yield_loc(loc - cfunc_counter, cfunc_counter, btobj);
+                    bt_yield_loc(loc - backpatch_counter, backpatch_counter, btobj);
                 }
                 break;
             }
@@ -690,7 +771,7 @@ rb_ec_partial_backtrace_object(const rb_execution_context_t *ec, long start_fram
 VALUE
 rb_ec_backtrace_object(const rb_execution_context_t *ec)
 {
-    return rb_ec_partial_backtrace_object(ec, BACKTRACE_START, ALL_BACKTRACE_LINES, NULL, FALSE, FALSE);
+    return rb_ec_partial_backtrace_object(ec, RUBY_BACKTRACE_START, RUBY_ALL_BACKTRACE_LINES, NULL, FALSE, FALSE);
 }
 
 static VALUE
@@ -720,7 +801,7 @@ backtrace_to_str_ary(VALUE self)
 {
     VALUE r;
     rb_backtrace_t *bt;
-    GetCoreDataFromValue(self, rb_backtrace_t, bt);
+    TypedData_Get_Struct(self, rb_backtrace_t, &backtrace_data_type, bt);
     r = backtrace_collect(bt, location_to_str_dmyarg, 0);
     RB_GC_GUARD(self);
     return r;
@@ -730,7 +811,7 @@ VALUE
 rb_backtrace_to_str_ary(VALUE self)
 {
     rb_backtrace_t *bt;
-    GetCoreDataFromValue(self, rb_backtrace_t, bt);
+    TypedData_Get_Struct(self, rb_backtrace_t, &backtrace_data_type, bt);
 
     if (!bt->strary) {
         RB_OBJ_WRITE(self, &bt->strary, backtrace_to_str_ary(self));
@@ -738,22 +819,6 @@ rb_backtrace_to_str_ary(VALUE self)
     return bt->strary;
 }
 
-void
-rb_backtrace_use_iseq_first_lineno_for_last_location(VALUE self)
-{
-    const rb_backtrace_t *bt;
-    rb_backtrace_location_t *loc;
-
-    GetCoreDataFromValue(self, rb_backtrace_t, bt);
-    VM_ASSERT(bt->backtrace_size > 0);
-
-    loc = &bt->backtrace[0];
-
-    VM_ASSERT(loc->type == LOCATION_TYPE_ISEQ);
-
-    loc->pc = NULL; // means location.first_lineno
-}
-
 static VALUE
 location_create(rb_backtrace_location_t *srcloc, void *btobj)
 {
@@ -772,7 +837,7 @@ backtrace_to_location_ary(VALUE self)
 {
     VALUE r;
     rb_backtrace_t *bt;
-    GetCoreDataFromValue(self, rb_backtrace_t, bt);
+    TypedData_Get_Struct(self, rb_backtrace_t, &backtrace_data_type, bt);
     r = backtrace_collect(bt, location_create, (void *)self);
     RB_GC_GUARD(self);
     return r;
@@ -782,7 +847,7 @@ VALUE
 rb_backtrace_to_location_ary(VALUE self)
 {
     rb_backtrace_t *bt;
-    GetCoreDataFromValue(self, rb_backtrace_t, bt);
+    TypedData_Get_Struct(self, rb_backtrace_t, &backtrace_data_type, bt);
 
     if (!bt->locary) {
         RB_OBJ_WRITE(self, &bt->locary, backtrace_to_location_ary(self));
@@ -790,6 +855,40 @@ rb_backtrace_to_location_ary(VALUE self)
     return bt->locary;
 }
 
+VALUE
+rb_location_ary_to_backtrace(VALUE ary)
+{
+    if (!RB_TYPE_P(ary, T_ARRAY) || !rb_frame_info_p(RARRAY_AREF(ary, 0))) {
+        return Qfalse;
+    }
+
+    rb_backtrace_t *new_backtrace;
+    long num_frames = RARRAY_LEN(ary);
+    VALUE btobj = backtrace_alloc_capa(num_frames, &new_backtrace);
+
+    for (long index = 0; index < RARRAY_LEN(ary); index++) {
+        VALUE locobj = RARRAY_AREF(ary, index);
+
+        if (!rb_frame_info_p(locobj)) {
+            return Qfalse;
+        }
+
+        struct valued_frame_info *src_vloc;
+        TypedData_Get_Struct(locobj, struct valued_frame_info, &location_data_type, src_vloc);
+
+        rb_backtrace_location_t *dst_location = &new_backtrace->backtrace[index];
+        RB_OBJ_WRITE(btobj, &dst_location->cme, src_vloc->loc->cme);
+        RB_OBJ_WRITE(btobj, &dst_location->iseq, src_vloc->loc->iseq);
+        dst_location->pc = src_vloc->loc->pc;
+
+        new_backtrace->backtrace_size++;
+
+        RB_GC_GUARD(locobj);
+    }
+
+    return btobj;
+}
+
 static VALUE
 backtrace_dump_data(VALUE self)
 {
@@ -801,7 +900,7 @@ static VALUE
 backtrace_load_data(VALUE self, VALUE str)
 {
     rb_backtrace_t *bt;
-    GetCoreDataFromValue(self, rb_backtrace_t, bt);
+    TypedData_Get_Struct(self, rb_backtrace_t, &backtrace_data_type, bt);
     RB_OBJ_WRITE(self, &bt->strary, str);
     return self;
 }
@@ -984,7 +1083,7 @@ oldbt_print(void *data, VALUE file, int lineno, VALUE name)
                 RSTRING_PTR(file), lineno);
     }
     else {
-        fprintf(fp, "\tfrom %s:%d:in `%s'\n",
+        fprintf(fp, "\tfrom %s:%d:in '%s'\n",
                 RSTRING_PTR(file), lineno, RSTRING_PTR(name));
     }
 }
@@ -1003,31 +1102,38 @@ vm_backtrace_print(FILE *fp)
                    &arg);
 }
 
+struct oldbt_bugreport_arg {
+    FILE *fp;
+    int count;
+};
+
 static void
 oldbt_bugreport(void *arg, VALUE file, int line, VALUE method)
 {
+    struct oldbt_bugreport_arg *p = arg;
+    FILE *fp = p->fp;
     const char *filename = NIL_P(file) ? "ruby" : RSTRING_PTR(file);
-    if (!*(int *)arg) {
-        fprintf(stderr, "-- Ruby level backtrace information "
+    if (!p->count) {
+        fprintf(fp, "-- Ruby level backtrace information "
                 "----------------------------------------\n");
-        *(int *)arg = 1;
+        p->count = 1;
     }
     if (NIL_P(method)) {
-        fprintf(stderr, "%s:%d:in unknown method\n", filename, line);
+        fprintf(fp, "%s:%d:in unknown method\n", filename, line);
     }
     else {
-        fprintf(stderr, "%s:%d:in `%s'\n", filename, line, RSTRING_PTR(method));
+        fprintf(fp, "%s:%d:in '%s'\n", filename, line, RSTRING_PTR(method));
     }
 }
 
 void
-rb_backtrace_print_as_bugreport(void)
+rb_backtrace_print_as_bugreport(FILE *fp)
 {
     struct oldbt_arg arg;
-    int i = 0;
+    struct oldbt_bugreport_arg barg = {fp, 0};
 
     arg.func = oldbt_bugreport;
-    arg.data = (int *)&i;
+    arg.data = &barg;
 
     backtrace_each(GET_EC(),
                    oldbt_init,
@@ -1057,7 +1163,7 @@ oldbt_print_to(void *data, VALUE file, int lineno, VALUE name)
         rb_str_cat2(str, "unknown method\n");
     }
     else {
-        rb_str_catf(str, " `%"PRIsVALUE"'\n", name);
+        rb_str_catf(str, " '%"PRIsVALUE"'\n", name);
     }
     (*arg->iter)(arg->output, str);
 }
@@ -1082,26 +1188,26 @@ rb_backtrace_each(VALUE (*iter)(VALUE recv, VALUE str), VALUE output)
 VALUE
 rb_make_backtrace(void)
 {
-    return rb_ec_backtrace_str_ary(GET_EC(), BACKTRACE_START, ALL_BACKTRACE_LINES);
+    return rb_ec_backtrace_str_ary(GET_EC(), RUBY_BACKTRACE_START, RUBY_ALL_BACKTRACE_LINES);
 }
 
-static VALUE
-ec_backtrace_to_ary(const rb_execution_context_t *ec, int argc, const VALUE *argv, int lev_default, int lev_plus, int to_str)
+static long
+ec_backtrace_range(const rb_execution_context_t *ec, int argc, const VALUE *argv, int lev_default, int lev_plus, long *len_ptr)
 {
-    VALUE level, vn;
+    VALUE level, vn, opts;
     long lev, n;
-    VALUE btval;
-    VALUE r;
-    int too_large;
 
-    rb_scan_args(argc, argv, "02", &level, &vn);
+    rb_scan_args(argc, argv, "02:", &level, &vn, &opts);
 
+    if (!NIL_P(opts)) {
+        rb_get_kwargs(opts, (ID []){0}, 0, 0, NULL);
+    }
     if (argc == 2 && NIL_P(vn)) argc--;
 
     switch (argc) {
       case 0:
         lev = lev_default + lev_plus;
-        n = ALL_BACKTRACE_LINES;
+        n = RUBY_ALL_BACKTRACE_LINES;
         break;
       case 1:
         {
@@ -1113,10 +1219,10 @@ ec_backtrace_to_ary(const rb_execution_context_t *ec, int argc, const VALUE *arg
                     rb_raise(rb_eArgError, "negative level (%ld)", lev);
                 }
                 lev += lev_plus;
-                n = ALL_BACKTRACE_LINES;
+                n = RUBY_ALL_BACKTRACE_LINES;
                 break;
               case Qnil:
-                return Qnil;
+                return -1;
               default:
                 lev = beg + lev_plus;
                 n = len;
@@ -1140,6 +1246,20 @@ ec_backtrace_to_ary(const rb_execution_context_t *ec, int argc, const VALUE *arg
         break;
     }
 
+    *len_ptr = n;
+    return lev;
+}
+
+static VALUE
+ec_backtrace_to_ary(const rb_execution_context_t *ec, int argc, const VALUE *argv, int lev_default, int lev_plus, int to_str)
+{
+    long lev, n;
+    VALUE btval, r;
+    int too_large;
+
+    lev = ec_backtrace_range(ec, argc, argv, lev_default, lev_plus, &n);
+    if (lev < 0) return Qnil;
+
     if (n == 0) {
         return rb_ary_new();
     }
@@ -1269,15 +1389,19 @@ rb_f_caller_locations(int argc, VALUE *argv, VALUE _)
 
 /*
  *  call-seq:
- *     Thread.each_caller_location{ |loc| ... } -> nil
+ *     Thread.each_caller_location(...) { |loc| ... } -> nil
  *
  *  Yields each frame of the current execution stack as a
  *  backtrace location object.
  */
 static VALUE
-each_caller_location(VALUE unused)
+each_caller_location(int argc, VALUE *argv, VALUE _)
 {
-    rb_ec_partial_backtrace_object(GET_EC(), 2, ALL_BACKTRACE_LINES, NULL, FALSE, TRUE);
+    rb_execution_context_t *ec = GET_EC();
+    long n, lev = ec_backtrace_range(ec, argc, argv, 1, 1, &n);
+    if (lev >= 0 && n != 0) {
+        rb_ec_partial_backtrace_object(ec, lev, n, NULL, FALSE, TRUE);
+    }
     return Qnil;
 }
 
@@ -1357,7 +1481,7 @@ Init_vm_backtrace(void)
     rb_define_global_function("caller", rb_f_caller, -1);
     rb_define_global_function("caller_locations", rb_f_caller_locations, -1);
 
-    rb_define_singleton_method(rb_cThread, "each_caller_location", each_caller_location, 0);
+    rb_define_singleton_method(rb_cThread, "each_caller_location", each_caller_location, -1);
 }
 
 /* debugger API */
@@ -1369,9 +1493,8 @@ RUBY_SYMBOL_EXPORT_END
 struct rb_debug_inspector_struct {
     rb_execution_context_t *ec;
     rb_control_frame_t *cfp;
-    VALUE backtrace;
     VALUE contexts; /* [[klass, binding, iseq, cfp], ...] */
-    long backtrace_size;
+    VALUE raw_backtrace;
 };
 
 enum {
@@ -1380,18 +1503,22 @@ enum {
     CALLER_BINDING_BINDING,
     CALLER_BINDING_ISEQ,
     CALLER_BINDING_CFP,
+    CALLER_BINDING_LOC,
     CALLER_BINDING_DEPTH,
 };
 
 struct collect_caller_bindings_data {
     VALUE ary;
     const rb_execution_context_t *ec;
+    VALUE btobj;
+    rb_backtrace_t *bt;
 };
 
 static void
-collect_caller_bindings_init(void *arg, size_t size)
+collect_caller_bindings_init(void *arg, size_t num_frames)
 {
-    /* */
+    struct collect_caller_bindings_data *data = (struct collect_caller_bindings_data *)arg;
+    data->btobj = backtrace_alloc_capa(num_frames, &data->bt);
 }
 
 static VALUE
@@ -1429,6 +1556,14 @@ collect_caller_bindings_iseq(void *arg, const rb_control_frame_t *cfp)
     rb_ary_store(frame, CALLER_BINDING_BINDING, GC_GUARDED_PTR(cfp)); /* create later */
     rb_ary_store(frame, CALLER_BINDING_ISEQ, cfp->iseq ? (VALUE)cfp->iseq : Qnil);
     rb_ary_store(frame, CALLER_BINDING_CFP, GC_GUARDED_PTR(cfp));
+
+    rb_backtrace_location_t *loc = &data->bt->backtrace[data->bt->backtrace_size++];
+    RB_OBJ_WRITE(data->btobj, &loc->cme, rb_vm_frame_method_entry(cfp));
+    RB_OBJ_WRITE(data->btobj, &loc->iseq, cfp->iseq);
+    loc->pc = cfp->pc;
+    VALUE vloc = location_create(loc, (void *)data->btobj);
+    rb_ary_store(frame, CALLER_BINDING_LOC, vloc);
+
     rb_ary_store(frame, CALLER_BINDING_DEPTH, INT2FIX(frame_depth(data->ec, cfp)));
 
     rb_ary_push(data->ary, frame);
@@ -1445,6 +1580,14 @@ collect_caller_bindings_cfunc(void *arg, const rb_control_frame_t *cfp, ID mid)
     rb_ary_store(frame, CALLER_BINDING_BINDING, Qnil); /* not available */
     rb_ary_store(frame, CALLER_BINDING_ISEQ, Qnil); /* not available */
     rb_ary_store(frame, CALLER_BINDING_CFP, GC_GUARDED_PTR(cfp));
+
+    rb_backtrace_location_t *loc = &data->bt->backtrace[data->bt->backtrace_size++];
+    RB_OBJ_WRITE(data->btobj, &loc->cme, rb_vm_frame_method_entry(cfp));
+    loc->iseq = NULL;
+    loc->pc = NULL;
+    VALUE vloc = location_create(loc, (void *)data->btobj);
+    rb_ary_store(frame, CALLER_BINDING_LOC, vloc);
+
     rb_ary_store(frame, CALLER_BINDING_DEPTH, INT2FIX(frame_depth(data->ec, cfp)));
 
     rb_ary_push(data->ary, frame);
@@ -1493,15 +1636,19 @@ rb_debug_inspector_open(rb_debug_inspector_func_t func, void *data)
     rb_execution_context_t *ec = GET_EC();
     enum ruby_tag_type state;
     volatile VALUE MAYBE_UNUSED(result);
+    int i;
 
     /* escape all env to heap */
     rb_vm_stack_to_heap(ec);
 
     dbg_context.ec = ec;
     dbg_context.cfp = dbg_context.ec->cfp;
-    dbg_context.backtrace = rb_ec_backtrace_location_ary(ec, BACKTRACE_START, ALL_BACKTRACE_LINES, FALSE);
-    dbg_context.backtrace_size = RARRAY_LEN(dbg_context.backtrace);
     dbg_context.contexts = collect_caller_bindings(ec);
+    dbg_context.raw_backtrace = rb_ary_new();
+    for (i=0; i<RARRAY_LEN(dbg_context.contexts); i++) {
+        VALUE frame = rb_ary_entry(dbg_context.contexts, i);
+        rb_ary_push(dbg_context.raw_backtrace, rb_ary_entry(frame, CALLER_BINDING_LOC));
+    }
 
     EC_PUSH_TAG(ec);
     if ((state = EC_EXEC_TAG()) == TAG_NONE) {
@@ -1521,7 +1668,7 @@ rb_debug_inspector_open(rb_debug_inspector_func_t func, void *data)
 static VALUE
 frame_get(const rb_debug_inspector_t *dc, long index)
 {
-    if (index < 0 || index >= dc->backtrace_size) {
+    if (index < 0 || index >= RARRAY_LEN(dc->contexts)) {
         rb_raise(rb_eArgError, "no such frame");
     }
     return rb_ary_entry(dc->contexts, index);
@@ -1574,15 +1721,15 @@ rb_debug_inspector_current_depth(void)
 VALUE
 rb_debug_inspector_backtrace_locations(const rb_debug_inspector_t *dc)
 {
-    return dc->backtrace;
+    return dc->raw_backtrace;
 }
 
-int
-rb_profile_frames(int start, int limit, VALUE *buff, int *lines)
+static int
+thread_profile_frames(rb_execution_context_t *ec, int start, int limit, VALUE *buff, int *lines)
 {
     int i;
-    const rb_execution_context_t *ec = GET_EC();
     const rb_control_frame_t *cfp = ec->cfp, *end_cfp = RUBY_VM_END_CONTROL_FRAME(ec);
+    const rb_control_frame_t *top = cfp;
     const rb_callable_method_entry_t *cme;
 
     // If this function is called inside a thread after thread creation, but
@@ -1597,7 +1744,7 @@ rb_profile_frames(int start, int limit, VALUE *buff, int *lines)
     // Skip dummy frame; see `rb_ec_partial_backtrace_object` for details
     end_cfp = RUBY_VM_NEXT_CONTROL_FRAME(end_cfp);
 
-    for (i=0; i<limit && cfp != end_cfp;) {
+    for (i=0; i<limit && cfp != end_cfp; cfp = RUBY_VM_PREVIOUS_CONTROL_FRAME(cfp)) {
         if (VM_FRAME_RUBYFRAME_P(cfp) && cfp->pc != 0) {
             if (start > 0) {
                 start--;
@@ -1613,24 +1760,59 @@ rb_profile_frames(int start, int limit, VALUE *buff, int *lines)
                 buff[i] = (VALUE)cfp->iseq;
             }
 
-            if (lines) lines[i] = calc_lineno(cfp->iseq, cfp->pc);
+            if (lines) {
+                // The topmost frame may not have an updated PC because the JIT
+                // may not have set one.  The JIT compiler will update the PC
+                // before entering a new function (so that `caller` will work),
+                // so only the topmost frame could possibly have an out of date PC
+                if (cfp == top && cfp->jit_return) {
+                    lines[i] = 0;
+                }
+                else {
+                    lines[i] = calc_lineno(cfp->iseq, cfp->pc);
+                }
+            }
 
             i++;
         }
         else {
             cme = rb_vm_frame_method_entry(cfp);
             if (cme && cme->def->type == VM_METHOD_TYPE_CFUNC) {
+                if (start > 0) {
+                    start--;
+                    continue;
+                }
                 buff[i] = (VALUE)cme;
                 if (lines) lines[i] = 0;
                 i++;
             }
         }
-        cfp = RUBY_VM_PREVIOUS_CONTROL_FRAME(cfp);
     }
 
     return i;
 }
 
+int
+rb_profile_frames(int start, int limit, VALUE *buff, int *lines)
+{
+    rb_execution_context_t *ec = rb_current_execution_context(false);
+
+    // If there is no EC, we may be attempting to profile a non-Ruby thread or a
+    // M:N shared native thread which has no active Ruby thread.
+    if (!ec) {
+        return 0;
+    }
+
+    return thread_profile_frames(ec, start, limit, buff, lines);
+}
+
+int
+rb_profile_thread_frames(VALUE thread, int start, int limit, VALUE *buff, int *lines)
+{
+    rb_thread_t *th = rb_thread_ptr(thread);
+    return thread_profile_frames(th->ec, start, limit, buff, lines);
+}
+
 static const rb_iseq_t *
 frame2iseq(VALUE frame)
 {
@@ -1696,7 +1878,7 @@ rb_profile_frame_absolute_path(VALUE frame)
         static VALUE cfunc_str = Qfalse;
         if (!cfunc_str) {
             cfunc_str = rb_str_new_literal("<cfunc>");
-            rb_gc_register_mark_object(cfunc_str);
+            rb_vm_register_global_object(cfunc_str);
         }
         return cfunc_str;
     }
@@ -1749,7 +1931,7 @@ rb_profile_frame_classpath(VALUE frame)
         if (RB_TYPE_P(klass, T_ICLASS)) {
             klass = RBASIC(klass)->klass;
         }
-        else if (FL_TEST(klass, FL_SINGLETON)) {
+        else if (RCLASS_SINGLETON_P(klass)) {
             klass = RCLASS_ATTACHED_OBJECT(klass);
             if (!RB_TYPE_P(klass, T_CLASS) && !RB_TYPE_P(klass, T_MODULE))
                 return rb_sprintf("#<%s:%p>", rb_class2name(rb_obj_class(klass)), (void*)klass);
@@ -1766,7 +1948,7 @@ rb_profile_frame_singleton_method_p(VALUE frame)
 {
     VALUE klass = frame2klass(frame);
 
-    return RBOOL(klass && !NIL_P(klass) && FL_TEST(klass, FL_SINGLETON));
+    return RBOOL(klass && !NIL_P(klass) && RCLASS_SINGLETON_P(klass));
 }
 
 VALUE
diff --git a/vm_callinfo.h b/vm_callinfo.h
index 91c92854d7849b..0ce25c2c0f89dc 100644
--- a/vm_callinfo.h
+++ b/vm_callinfo.h
@@ -17,7 +17,7 @@ enum vm_call_flag_bits {
     VM_CALL_ARGS_BLOCKARG_bit,  // m(&block)
     VM_CALL_FCALL_bit,          // m(args)   # receiver is self
     VM_CALL_VCALL_bit,          // m         # method call that looks like a local variable
-    VM_CALL_ARGS_SIMPLE_bit,    // (ci->flag & (SPLAT|BLOCKARG)) && blockiseq == NULL && ci->kw_arg == NULL
+    VM_CALL_ARGS_SIMPLE_bit,    // !(ci->flag & (SPLAT|BLOCKARG|KWARG|KW_SPLAT|FORWARDING)) && !has_block_iseq
     VM_CALL_KWARG_bit,          // has kwarg
     VM_CALL_KW_SPLAT_bit,       // m(**opts)
     VM_CALL_TAILCALL_bit,       // located at tail position
@@ -25,6 +25,8 @@ enum vm_call_flag_bits {
     VM_CALL_ZSUPER_bit,         // zsuper
     VM_CALL_OPT_SEND_bit,       // internal flag
     VM_CALL_KW_SPLAT_MUT_bit,   // kw splat hash can be modified (to avoid allocating a new one)
+    VM_CALL_ARGS_SPLAT_MUT_bit, // args splat can be modified (to avoid allocating a new one)
+    VM_CALL_FORWARDING_bit,     // m(...)
     VM_CALL__END
 };
 
@@ -40,9 +42,12 @@ enum vm_call_flag_bits {
 #define VM_CALL_ZSUPER          (0x01 << VM_CALL_ZSUPER_bit)
 #define VM_CALL_OPT_SEND        (0x01 << VM_CALL_OPT_SEND_bit)
 #define VM_CALL_KW_SPLAT_MUT    (0x01 << VM_CALL_KW_SPLAT_MUT_bit)
+#define VM_CALL_ARGS_SPLAT_MUT  (0x01 << VM_CALL_ARGS_SPLAT_MUT_bit)
+#define VM_CALL_FORWARDING      (0x01 << VM_CALL_FORWARDING_bit)
 
 struct rb_callinfo_kwarg {
     int keyword_len;
+    int references;
     VALUE keywords[];
 };
 
@@ -196,6 +201,10 @@ vm_ci_dump(const struct rb_callinfo *ci)
       (((VALUE)(argc)) << CI_EMBED_ARGC_SHFT) |  \
       RUBY_FIXNUM_FLAG))
 
+// vm_method.c
+const struct rb_callinfo *rb_vm_ci_lookup(ID mid, unsigned int flag, unsigned int argc, const struct rb_callinfo_kwarg *kwarg);
+void rb_vm_ci_free(const struct rb_callinfo *);
+
 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)
 {
@@ -207,13 +216,8 @@ vm_ci_new_(ID mid, unsigned int flag, unsigned int argc, const struct rb_callinf
     const bool debug = 0;
     if (debug) ruby_debug_printf("%s:%d ", file, line);
 
-    // TODO: dedup
-    const struct rb_callinfo *ci = (const struct rb_callinfo *)
-      rb_imemo_new(imemo_callinfo,
-                   (VALUE)mid,
-                   (VALUE)flag,
-                   (VALUE)argc,
-                   (VALUE)kwarg);
+    const struct rb_callinfo *ci = rb_vm_ci_lookup(mid, flag, argc, kwarg);
+
     if (debug) rp(ci);
     if (kwarg) {
         RB_DEBUG_COUNTER_INC(ci_kw);
@@ -285,7 +289,7 @@ struct rb_callcache {
 
     union {
         struct {
-          uintptr_t value; // Shape ID in upper bits, index in lower bits
+            uint64_t value; // Shape ID in former half, index in latter half
         } attr;
         const enum method_missing_reason method_missing_reason; /* used by method_missing */
         VALUE v;
@@ -293,13 +297,13 @@ struct rb_callcache {
     } aux_;
 };
 
-#define VM_CALLCACHE_UNMARKABLE FL_FREEZE
-#define VM_CALLCACHE_ON_STACK   FL_EXIVAR
-
+/* VM_CALLCACHE_IVAR used for IVAR/ATTRSET/STRUCT_AREF/STRUCT_ASET methods */
 #define VM_CALLCACHE_IVAR       IMEMO_FL_USER0
 #define VM_CALLCACHE_BF         IMEMO_FL_USER1
 #define VM_CALLCACHE_SUPER      IMEMO_FL_USER2
 #define VM_CALLCACHE_REFINEMENT IMEMO_FL_USER3
+#define VM_CALLCACHE_UNMARKABLE IMEMO_FL_USER4
+#define VM_CALLCACHE_ON_STACK   IMEMO_FL_USER5
 
 enum vm_cc_type {
     cc_type_normal, // chained from ccs
@@ -326,7 +330,11 @@ vm_cc_new(VALUE klass,
           vm_call_handler call,
           enum vm_cc_type type)
 {
-    const struct rb_callcache *cc = (const struct rb_callcache *)rb_imemo_new(imemo_callcache, (VALUE)cme, (VALUE)call, 0, klass);
+    struct rb_callcache *cc = IMEMO_NEW(struct rb_callcache, imemo_callcache, klass);
+    *((struct rb_callable_method_entry_struct **)&cc->cme_) = (struct rb_callable_method_entry_struct *)cme;
+    *((vm_call_handler *)&cc->call_) = call;
+
+    VM_ASSERT(RB_TYPE_P(klass, T_CLASS) || RB_TYPE_P(klass, T_ICLASS));
 
     switch (type) {
       case cc_type_normal:
@@ -336,10 +344,14 @@ vm_cc_new(VALUE klass,
         break;
       case cc_type_refinement:
         *(VALUE *)&cc->flags |= VM_CALLCACHE_REFINEMENT;
+        rb_vm_insert_cc_refinement(cc);
         break;
     }
 
-    vm_cc_attr_index_initialize(cc, INVALID_SHAPE_ID);
+    if (cme->def->type == VM_METHOD_TYPE_ATTRSET || cme->def->type == VM_METHOD_TYPE_IVAR) {
+        vm_cc_attr_index_initialize(cc, INVALID_SHAPE_ID);
+    }
+
     RB_DEBUG_COUNTER_INC(cc_new);
     return cc;
 }
@@ -403,43 +415,26 @@ vm_cc_call(const struct rb_callcache *cc)
     return cc->call_;
 }
 
-static inline attr_index_t
-vm_cc_attr_index(const struct rb_callcache *cc)
-{
-    VM_ASSERT(IMEMO_TYPE_P(cc, imemo_callcache));
-    return (attr_index_t)((cc->aux_.attr.value & SHAPE_FLAG_MASK) - 1);
-}
-
-static inline shape_id_t
-vm_cc_attr_index_dest_shape_id(const struct rb_callcache *cc)
-{
-    VM_ASSERT(IMEMO_TYPE_P(cc, imemo_callcache));
-
-    return cc->aux_.attr.value >> SHAPE_FLAG_SHIFT;
-}
-
 static inline void
-vm_cc_atomic_shape_and_index(const struct rb_callcache *cc, shape_id_t * shape_id, attr_index_t * index)
+vm_unpack_shape_and_index(const uint64_t cache_value, shape_id_t *shape_id, attr_index_t *index)
 {
-    uintptr_t cache_value = cc->aux_.attr.value; // Atomically read 64 bits
-    *shape_id = (shape_id_t)(cache_value >> SHAPE_FLAG_SHIFT);
-    *index = (attr_index_t)(cache_value & SHAPE_FLAG_MASK) - 1;
-    return;
+    union rb_attr_index_cache cache = {
+        .pack = cache_value,
+    };
+    *shape_id = cache.unpack.shape_id;
+    *index = cache.unpack.index - 1;
 }
 
 static inline void
-vm_ic_atomic_shape_and_index(const struct iseq_inline_iv_cache_entry *ic, shape_id_t * shape_id, attr_index_t * index)
+vm_cc_atomic_shape_and_index(const struct rb_callcache *cc, shape_id_t *shape_id, attr_index_t *index)
 {
-    uintptr_t cache_value = ic->value; // Atomically read 64 bits
-    *shape_id = (shape_id_t)(cache_value >> SHAPE_FLAG_SHIFT);
-    *index = (attr_index_t)(cache_value & SHAPE_FLAG_MASK) - 1;
-    return;
+    vm_unpack_shape_and_index(ATOMIC_U64_LOAD_RELAXED(cc->aux_.attr.value), shape_id, index);
 }
 
-static inline shape_id_t
-vm_ic_attr_index_dest_shape_id(const struct iseq_inline_iv_cache_entry *ic)
+static inline void
+vm_ic_atomic_shape_and_index(const struct iseq_inline_iv_cache_entry *ic, shape_id_t *shape_id, attr_index_t *index)
 {
-    return (shape_id_t)(ic->value >> SHAPE_FLAG_SHIFT);
+    vm_unpack_shape_and_index(ATOMIC_U64_LOAD_RELAXED(ic->value), shape_id, index);
 }
 
 static inline unsigned int
@@ -460,19 +455,6 @@ vm_cc_invalidated_p(const struct rb_callcache *cc)
     }
 }
 
-// For RJIT. cc_cme is supposed to have inlined `vm_cc_cme(cc)`.
-static inline bool
-vm_cc_valid_p(const struct rb_callcache *cc, const rb_callable_method_entry_t *cc_cme, VALUE klass)
-{
-    VM_ASSERT(IMEMO_TYPE_P(cc, imemo_callcache));
-    if (cc->klass == klass && !METHOD_ENTRY_INVALIDATED(cc_cme)) {
-        return 1;
-    }
-    else {
-        return 0;
-    }
-}
-
 /* callcache: mutate */
 
 static inline void
@@ -483,18 +465,36 @@ vm_cc_call_set(const struct rb_callcache *cc, vm_call_handler call)
     *(vm_call_handler *)&cc->call_ = call;
 }
 
+static inline void
+set_vm_cc_ivar(const struct rb_callcache *cc)
+{
+    *(VALUE *)&cc->flags |= VM_CALLCACHE_IVAR;
+}
+
+static inline uint64_t
+vm_pack_shape_and_index(shape_id_t shape_id, attr_index_t index)
+{
+    union rb_attr_index_cache cache = {
+        .unpack = {
+            .shape_id = shape_id,
+            .index = index + 1,
+        }
+    };
+    return cache.pack;
+}
+
 static inline void
 vm_cc_attr_index_set(const struct rb_callcache *cc, attr_index_t index, shape_id_t dest_shape_id)
 {
-    uintptr_t *attr_value = (uintptr_t *)&cc->aux_.attr.value;
+    uint64_t *attr_value = (uint64_t *)&cc->aux_.attr.value;
     if (!vm_cc_markable(cc)) {
-        *attr_value = (uintptr_t)INVALID_SHAPE_ID << SHAPE_FLAG_SHIFT;
+        *attr_value = vm_pack_shape_and_index(INVALID_SHAPE_ID, ATTR_INDEX_NOT_SET);
         return;
     }
     VM_ASSERT(IMEMO_TYPE_P(cc, imemo_callcache));
     VM_ASSERT(cc != vm_cc_empty());
-    *attr_value = (attr_index_t)(index + 1) | ((uintptr_t)(dest_shape_id) << SHAPE_FLAG_SHIFT);
-    *(VALUE *)&cc->flags |= VM_CALLCACHE_IVAR;
+    *attr_value = vm_pack_shape_and_index(dest_shape_id, index);
+    set_vm_cc_ivar(cc);
 }
 
 static inline bool
@@ -504,15 +504,15 @@ vm_cc_ivar_p(const struct rb_callcache *cc)
 }
 
 static inline void
-vm_ic_attr_index_set(const rb_iseq_t *iseq, const struct iseq_inline_iv_cache_entry *ic, attr_index_t index, shape_id_t dest_shape_id)
+vm_ic_attr_index_set(const rb_iseq_t *iseq, struct iseq_inline_iv_cache_entry *ic, attr_index_t index, shape_id_t dest_shape_id)
 {
-    *(uintptr_t *)&ic->value = ((uintptr_t)dest_shape_id << SHAPE_FLAG_SHIFT) | (attr_index_t)(index + 1);
+    ATOMIC_U64_SET_RELAXED(ic->value, vm_pack_shape_and_index(dest_shape_id, index));
 }
 
 static inline void
-vm_ic_attr_index_initialize(const struct iseq_inline_iv_cache_entry *ic, shape_id_t shape_id)
+vm_ic_attr_index_initialize(struct iseq_inline_iv_cache_entry *ic, shape_id_t shape_id)
 {
-    *(uintptr_t *)&ic->value = (uintptr_t)shape_id << SHAPE_FLAG_SHIFT;
+    ATOMIC_U64_SET_RELAXED(ic->value, vm_pack_shape_and_index(shape_id, ATTR_INDEX_NOT_SET));
 }
 
 static inline void
@@ -564,7 +564,8 @@ struct rb_class_cc_entries {
     int len;
     const struct rb_callable_method_entry_struct *cme;
     struct rb_class_cc_entries_entry {
-        const struct rb_callinfo *ci;
+        unsigned int argc;
+        unsigned int flag;
         const struct rb_callcache *cc;
     } *entries;
 };
@@ -591,10 +592,13 @@ vm_cc_check_cme(const struct rb_callcache *cc, const rb_callable_method_entry_t
 #if 1
         // debug print
 
-        fprintf(stderr, "iseq_overload:%d\n", (int)cme->def->iseq_overload);
+        fprintf(stderr, "iseq_overload:%d, cme:%p (def:%p), cm_cc_cme(cc):%p (def:%p)\n",
+                (int)cme->def->iseq_overload,
+                cme, cme->def,
+                vm_cc_cme(cc), vm_cc_cme(cc)->def);
         rp(cme);
         rp(vm_cc_cme(cc));
-        rb_vm_lookup_overloaded_cme(cme);
+        rp(rb_vm_lookup_overloaded_cme(cme));
 #endif
         return false;
     }
diff --git a/vm_core.h b/vm_core.h
index 25629d3789491a..8da7a0811992c0 100644
--- a/vm_core.h
+++ b/vm_core.h
@@ -56,12 +56,13 @@
 #define RVALUE_SIZE (sizeof(struct RBasic) + sizeof(VALUE[RBIMPL_RVALUE_EMBED_LEN_MAX]))
 
 #if VM_CHECK_MODE > 0
-#define VM_ASSERT(expr) RUBY_ASSERT_MESG_WHEN(VM_CHECK_MODE > 0, expr, #expr)
+#define VM_ASSERT(expr, ...) \
+    RUBY_ASSERT_MESG_WHEN(VM_CHECK_MODE > 0, expr, #expr RBIMPL_VA_OPT_ARGS(__VA_ARGS__))
 #define VM_UNREACHABLE(func) rb_bug(#func ": unreachable")
 #define RUBY_ASSERT_CRITICAL_SECTION
 #define RUBY_DEBUG_THREAD_SCHEDULE() rb_thread_schedule()
 #else
-#define VM_ASSERT(expr) ((void)0)
+#define VM_ASSERT(/*expr, */...) ((void)0)
 #define VM_UNREACHABLE(func) UNREACHABLE
 #define RUBY_DEBUG_THREAD_SCHEDULE()
 #endif
@@ -69,7 +70,30 @@
 #define RUBY_ASSERT_MUTEX_OWNED(mutex) VM_ASSERT(rb_mutex_owned_p(mutex))
 
 #if defined(RUBY_ASSERT_CRITICAL_SECTION)
-// TODO add documentation
+/*
+# Critical Section Assertions
+
+These assertions are used to ensure that context switching does not occur between two points in the code. In theory,
+such code should already be protected by a mutex, but these assertions are used to ensure that the mutex is held.
+
+The specific case where it can be useful is where a mutex is held further up the call stack, and the code in question
+may not directly hold the mutex. In this case, the critical section assertions can be used to ensure that the mutex is
+held by someone else.
+
+These assertions are only enabled when RUBY_ASSERT_CRITICAL_SECTION is defined, which is only defined if VM_CHECK_MODE
+is set.
+
+## Example Usage
+
+```c
+RUBY_ASSERT_CRITICAL_SECTION_ENTER();
+// ... some code which does not invoke rb_vm_check_ints() ...
+RUBY_ASSERT_CRITICAL_SECTION_LEAVE();
+```
+
+If `rb_vm_check_ints()` is called between the `RUBY_ASSERT_CRITICAL_SECTION_ENTER()` and
+`RUBY_ASSERT_CRITICAL_SECTION_LEAVE()`, a failed assertion will result.
+*/
 extern int ruby_assert_critical_section_entered;
 #define RUBY_ASSERT_CRITICAL_SECTION_ENTER() do{ruby_assert_critical_section_entered += 1;}while(false)
 #define RUBY_ASSERT_CRITICAL_SECTION_LEAVE() do{VM_ASSERT(ruby_assert_critical_section_entered > 0);ruby_assert_critical_section_entered -= 1;}while(false)
@@ -94,7 +118,10 @@ extern int ruby_assert_critical_section_entered;
 #include "internal.h"
 #include "internal/array.h"
 #include "internal/basic_operators.h"
+#include "internal/namespace.h"
+#include "internal/sanitizers.h"
 #include "internal/serial.h"
+#include "internal/set_table.h"
 #include "internal/vm.h"
 #include "method.h"
 #include "node.h"
@@ -104,7 +131,6 @@ extern int ruby_assert_critical_section_entered;
 #include "vm_opts.h"
 
 #include "ruby/thread_native.h"
-
 /*
  * implementation selector of get_insn_info algorithm
  *   0: linear search
@@ -229,6 +255,8 @@ union ic_serial_entry {
     VALUE data[2];
 };
 
+#define IMEMO_CONST_CACHE_SHAREABLE IMEMO_FL_USER0
+
 // imemo_constcache
 struct iseq_inline_constant_cache_entry {
     VALUE flags;
@@ -260,7 +288,7 @@ struct iseq_inline_constant_cache {
 };
 
 struct iseq_inline_iv_cache_entry {
-    uintptr_t value; // attr_index in lower bits, dest_shape_id in upper bits
+    uint64_t value; // dest_shape_id in former half, attr_index in latter half
     ID iv_set_name;
 };
 
@@ -285,6 +313,7 @@ struct rb_calling_info {
     int argc;
     bool kw_splat;
     VALUE heap_argv;
+    const rb_namespace_t *proc_ns;
 };
 
 #ifndef VM_ARGC_STACK_MAX
@@ -339,8 +368,6 @@ pathobj_realpath(VALUE pathobj)
 }
 
 /* Forward declarations */
-struct rb_rjit_unit;
-
 typedef uintptr_t iseq_bits_t;
 
 #define ISEQ_IS_SIZE(body) (body->ic_size + body->ivc_size + body->ise_size + body->icvarc_size)
@@ -365,10 +392,12 @@ enum rb_iseq_type {
 enum rb_builtin_attr {
     // The iseq does not call methods.
     BUILTIN_ATTR_LEAF = 0x01,
-    // The iseq does not allocate objects.
-    BUILTIN_ATTR_NO_GC = 0x02,
     // This iseq only contains single `opt_invokebuiltin_delegate_leave` instruction with 0 arguments.
-    BUILTIN_ATTR_SINGLE_NOARG_INLINE = 0x04,
+    BUILTIN_ATTR_SINGLE_NOARG_LEAF = 0x02,
+    // This attribute signals JIT to duplicate the iseq for each block iseq so that its `yield` will be monomorphic.
+    BUILTIN_ATTR_INLINE_BLOCK = 0x04,
+    // The iseq acts like a C method in backtraces.
+    BUILTIN_ATTR_C_TRACE = 0x08,
 };
 
 typedef VALUE (*rb_jit_func_t)(struct rb_execution_context_struct *, struct rb_control_frame_struct *);
@@ -415,6 +444,10 @@ struct rb_iseq_constant_body {
             unsigned int ambiguous_param0 : 1; /* {|a|} */
             unsigned int accepts_no_kwarg : 1;
             unsigned int ruby2_keywords: 1;
+            unsigned int anon_rest: 1;
+            unsigned int anon_kwrest: 1;
+            unsigned int use_block: 1;
+            unsigned int forwardable: 1;
         } flags;
 
         unsigned int size;
@@ -493,6 +526,8 @@ struct rb_iseq_constant_body {
 
     unsigned int builtin_attrs; // Union of rb_builtin_attr
 
+    bool prism; // ISEQ was generated from prism compiler
+
     union {
         iseq_bits_t * list; /* Find references for GC */
         iseq_bits_t single;
@@ -502,28 +537,27 @@ struct rb_iseq_constant_body {
 
     const rb_iseq_t *mandatory_only_iseq;
 
-#if USE_RJIT || USE_YJIT
+#if USE_YJIT || USE_ZJIT
     // Function pointer for JIT code on jit_exec()
     rb_jit_func_t jit_entry;
     // Number of calls on jit_exec()
     long unsigned jit_entry_calls;
-#endif
-
-#if USE_YJIT
     // Function pointer for JIT code on jit_exec_exception()
     rb_jit_func_t jit_exception;
     // Number of calls on jit_exec_exception()
     long unsigned jit_exception_calls;
 #endif
 
-#if USE_RJIT
-    // RJIT stores some data on each iseq.
-    VALUE rjit_blocks;
-#endif
-
 #if USE_YJIT
     // YJIT stores some data on each iseq.
     void *yjit_payload;
+    // Used to estimate how frequently this ISEQ gets called
+    uint64_t yjit_calls_at_interv;
+#endif
+
+#if USE_ZJIT
+    // ZJIT stores some data on each iseq.
+    void *zjit_payload;
 #endif
 };
 
@@ -570,6 +604,12 @@ rb_iseq_check(const rb_iseq_t *iseq)
     return iseq;
 }
 
+static inline bool
+rb_iseq_attr_p(const rb_iseq_t *iseq, enum rb_builtin_attr attr)
+{
+    return (ISEQ_BODY(iseq)->builtin_attrs & attr) == attr;
+}
+
 static inline const rb_iseq_t *
 def_iseq_ptr(rb_method_definition_t *def)
 {
@@ -600,10 +640,9 @@ typedef struct rb_at_exit_list {
     struct rb_at_exit_list *next;
 } rb_at_exit_list;
 
-struct rb_objspace;
-struct rb_objspace *rb_objspace_alloc(void);
-void rb_objspace_free(struct rb_objspace *);
-void rb_objspace_call_finalizer(struct rb_objspace *);
+void *rb_objspace_alloc(void);
+void rb_objspace_free(void *objspace);
+void rb_objspace_call_finalizer(void);
 
 typedef struct rb_hook_list_struct {
     struct rb_event_hook_struct *hooks;
@@ -617,6 +656,11 @@ typedef struct rb_hook_list_struct {
 // see builtin.h for definition
 typedef const struct rb_builtin_function *RB_BUILTIN;
 
+struct global_object_list {
+    VALUE *varptr;
+    struct global_object_list *next;
+};
+
 typedef struct rb_vm_struct {
     VALUE self;
 
@@ -634,15 +678,57 @@ typedef struct rb_vm_struct {
             struct rb_ractor_struct *lock_owner;
             unsigned int lock_rec;
 
-            // barrier
-            bool barrier_waiting;
-            unsigned int barrier_cnt;
-            rb_nativethread_cond_t barrier_cond;
-
             // join at exit
             rb_nativethread_cond_t terminate_cond;
             bool terminate_waiting;
+
+#ifndef RUBY_THREAD_PTHREAD_H
+            // win32
+            bool barrier_waiting;
+            unsigned int barrier_cnt;
+            rb_nativethread_cond_t barrier_complete_cond;
+            rb_nativethread_cond_t barrier_release_cond;
+#endif
         } sync;
+
+#ifdef RUBY_THREAD_PTHREAD_H
+        // ractor scheduling
+        struct {
+            rb_nativethread_lock_t lock;
+            struct rb_ractor_struct *lock_owner;
+            bool locked;
+
+            rb_nativethread_cond_t cond; // GRQ
+            unsigned int snt_cnt; // count of shared NTs
+            unsigned int dnt_cnt; // count of dedicated NTs
+
+            unsigned int running_cnt;
+
+            unsigned int max_cpu;
+            struct ccan_list_head grq; // // Global Ready Queue
+            unsigned int grq_cnt;
+
+            // running threads
+            struct ccan_list_head running_threads;
+
+            // threads which switch context by timeslice
+            struct ccan_list_head timeslice_threads;
+
+            struct ccan_list_head zombie_threads;
+
+            // true if timeslice timer is not enable
+            bool timeslice_wait_inf;
+
+            // barrier
+            rb_nativethread_cond_t barrier_complete_cond;
+            rb_nativethread_cond_t barrier_release_cond;
+            bool barrier_waiting;
+            unsigned int barrier_waiting_cnt;
+            unsigned int barrier_serial;
+            struct rb_ractor_struct *barrier_ractor;
+            unsigned int barrier_lock_rec;
+        } sched;
+#endif
     } ractor;
 
 #ifdef USE_SIGALTSTACK
@@ -650,7 +736,6 @@ typedef struct rb_vm_struct {
 #endif
 
     rb_serial_t fork_gen;
-    struct ccan_list_head waiting_fds; /* <=> struct waiting_fd */
 
     /* set in single-threaded processes only: */
     volatile int ubf_async_safe;
@@ -662,8 +747,12 @@ typedef struct rb_vm_struct {
 
     /* object management */
     VALUE mark_object_ary;
+    struct global_object_list *global_object_list;
     const VALUE special_exceptions[ruby_special_error_count];
 
+    /* namespace */
+    rb_namespace_t *main_namespace;
+
     /* load */
     VALUE top_self;
     VALUE load_path;
@@ -685,12 +774,8 @@ typedef struct rb_vm_struct {
         VALUE cmd[RUBY_NSIG];
     } trap_list;
 
-    /* relation table of ensure - rollback for callcc */
-    struct st_table *ensure_rollback_table;
-
-    /* postponed_job (async-signal-safe, NOT thread-safe) */
-    struct rb_postponed_job_struct *postponed_job_buffer;
-    rb_atomic_t postponed_job_index;
+    /* postponed_job (async-signal-safe, and thread-safe) */
+    struct rb_postponed_job_queue *postponed_job_queue;
 
     int src_encoding_index;
 
@@ -702,25 +787,30 @@ typedef struct rb_vm_struct {
     VALUE coverages, me2counter;
     int coverage_mode;
 
-    st_table * defined_module_hash;
-
-    struct rb_objspace *objspace;
+    struct {
+        struct rb_objspace *objspace;
+        struct gc_mark_func_data_struct {
+            void *data;
+            void (*mark_func)(VALUE v, void *data);
+        } *mark_func_data;
+    } gc;
 
     rb_at_exit_list *at_exit;
 
-    st_table *frozen_strings;
-
     const struct rb_builtin_function *builtin_function_table;
-    int builtin_inline_index;
 
+    st_table *ci_table;
     struct rb_id_table *negative_cme_table;
     st_table *overloaded_cme_table; // cme -> overloaded_cme
+    set_table *unused_block_warning_table;
+    set_table *cc_refinement_table;
 
     // This id table contains a mapping from ID to ICs. It does this with ID
     // keys and nested st_tables as values. The nested tables have ICs as keys
     // and Qtrue as values. It is used when inline constant caches need to be
     // invalidated or ISEQs are being freed.
     struct rb_id_table *constant_cache;
+    ID inserting_constant_cache_id;
 
 #ifndef VM_GLOBAL_CC_CACHE_TABLE_SIZE
 #define VM_GLOBAL_CC_CACHE_TABLE_SIZE 1023
@@ -739,6 +829,8 @@ typedef struct rb_vm_struct {
         size_t fiber_machine_stack_size;
     } default_params;
 
+    // TODO: a single require_stack can't support multi-threaded require trees
+    VALUE require_stack;
 } rb_vm_t;
 
 /* default values */
@@ -846,6 +938,61 @@ typedef RUBY_JMP_BUF rb_jmpbuf_t;
 typedef void *rb_jmpbuf_t[5];
 #endif
 
+/*
+  `rb_vm_tag_jmpbuf_t` type represents a buffer used to
+  long jump to a C frame associated with `rb_vm_tag`.
+
+  Use-site of `rb_vm_tag_jmpbuf_t` is responsible for calling the
+  following functions:
+  - `rb_vm_tag_jmpbuf_init` once `rb_vm_tag_jmpbuf_t` is allocated.
+  - `rb_vm_tag_jmpbuf_deinit` once `rb_vm_tag_jmpbuf_t` is no longer necessary.
+
+  `RB_VM_TAG_JMPBUF_GET` transforms a `rb_vm_tag_jmpbuf_t` into a
+  `rb_jmpbuf_t` to be passed to `rb_setjmp/rb_longjmp`.
+*/
+#if defined(__wasm__) && !defined(__EMSCRIPTEN__)
+/*
+  WebAssembly target with Asyncify-based SJLJ needs
+  to capture the execution context by unwind/rewind-ing
+  call frames into a jump buffer. The buffer space tends
+  to be considerably large unlike other architectures'
+  register-based buffers.
+  Therefore, we allocates the buffer on the heap on such
+  environments.
+*/
+typedef rb_jmpbuf_t *rb_vm_tag_jmpbuf_t;
+
+#define RB_VM_TAG_JMPBUF_GET(buf) (*buf)
+
+static inline void
+rb_vm_tag_jmpbuf_init(rb_vm_tag_jmpbuf_t *jmpbuf)
+{
+    *jmpbuf = ruby_xmalloc(sizeof(rb_jmpbuf_t));
+}
+
+static inline void
+rb_vm_tag_jmpbuf_deinit(const rb_vm_tag_jmpbuf_t *jmpbuf)
+{
+    ruby_xfree(*jmpbuf);
+}
+#else
+typedef rb_jmpbuf_t rb_vm_tag_jmpbuf_t;
+
+#define RB_VM_TAG_JMPBUF_GET(buf) (buf)
+
+static inline void
+rb_vm_tag_jmpbuf_init(rb_vm_tag_jmpbuf_t *jmpbuf)
+{
+    // no-op
+}
+
+static inline void
+rb_vm_tag_jmpbuf_deinit(const rb_vm_tag_jmpbuf_t *jmpbuf)
+{
+    // no-op
+}
+#endif
+
 /*
   the members which are written in EC_PUSH_TAG() should be placed at
   the beginning and the end, so that entire region is accessible.
@@ -853,7 +1000,7 @@ typedef void *rb_jmpbuf_t[5];
 struct rb_vm_tag {
     VALUE tag;
     VALUE retval;
-    rb_jmpbuf_t buf;
+    rb_vm_tag_jmpbuf_t buf;
     struct rb_vm_tag *prev;
     enum ruby_tag_type state;
     unsigned int lock_rec;
@@ -861,7 +1008,7 @@ struct rb_vm_tag {
 
 STATIC_ASSERT(rb_vm_tag_buf_offset, offsetof(struct rb_vm_tag, buf) > 0);
 STATIC_ASSERT(rb_vm_tag_buf_end,
-              offsetof(struct rb_vm_tag, buf) + sizeof(rb_jmpbuf_t) <
+              offsetof(struct rb_vm_tag, buf) + sizeof(rb_vm_tag_jmpbuf_t) <
               sizeof(struct rb_vm_tag));
 
 struct rb_unblock_callback {
@@ -871,17 +1018,6 @@ struct rb_unblock_callback {
 
 struct rb_mutex_struct;
 
-typedef struct rb_ensure_entry {
-    VALUE marker;
-    VALUE (*e_proc)(VALUE);
-    VALUE data2;
-} rb_ensure_entry_t;
-
-typedef struct rb_ensure_list {
-    struct rb_ensure_list *next;
-    struct rb_ensure_entry entry;
-} rb_ensure_list_t;
-
 typedef struct rb_fiber_struct rb_fiber_t;
 
 struct rb_waiting_list {
@@ -920,9 +1056,6 @@ struct rb_execution_context_struct {
     const VALUE *root_lep;
     VALUE root_svar;
 
-    /* ensure & callcc */
-    rb_ensure_list_t *ensure_list;
-
     /* trace information */
     struct rb_trace_arg_struct *trace_arg;
 
@@ -943,6 +1076,10 @@ struct rb_execution_context_struct {
         VALUE *stack_end;
         size_t stack_maxsize;
         RUBY_ALIGNAS(SIZEOF_VALUE) jmp_buf regs;
+
+#ifdef RUBY_ASAN_ENABLED
+        void *asan_fake_stack_handle;
+#endif
     } machine;
 };
 
@@ -976,7 +1113,7 @@ typedef struct rb_ractor_struct rb_ractor_t;
 struct rb_native_thread;
 
 typedef struct rb_thread_struct {
-    struct ccan_list_node lt_node; // managed by a ractor
+    struct ccan_list_node lt_node; // managed by a ractor (r->threads.set)
     VALUE self;
     rb_ractor_t *ractor;
     rb_vm_t *vm;
@@ -984,6 +1121,7 @@ typedef struct rb_thread_struct {
     rb_execution_context_t *ec;
 
     struct rb_thread_sched_item sched;
+    bool mn_schedulable;
     rb_atomic_t serial; // only for RUBY_DEBUG_LOG()
 
     VALUE last_status; /* $? */
@@ -994,6 +1132,9 @@ typedef struct rb_thread_struct {
     /* for load(true) */
     VALUE top_self;
     VALUE top_wrapper;
+    /* for namespace */
+    VALUE namespaces; // Stack of namespaces
+    rb_namespace_t *ns; // The current one
 
     /* thread control */
 
@@ -1026,6 +1167,7 @@ typedef struct rb_thread_struct {
     struct rb_unblock_callback unblock;
     VALUE locking_mutex;
     struct rb_mutex_struct *keeping_mutexes;
+    struct ccan_list_head interrupt_exec_tasks;
 
     struct rb_waiting_list *join_list;
 
@@ -1048,9 +1190,6 @@ typedef struct rb_thread_struct {
         thread_invoke_type_func
     } invoke_type;
 
-    /* statistics data for profiler */
-    VALUE stat_insn_usage;
-
     /* fiber */
     rb_fiber_t *root_fiber;
 
@@ -1059,6 +1198,7 @@ typedef struct rb_thread_struct {
 
     /* misc */
     VALUE name;
+    void **specific_storage;
 
     struct rb_ext_config ext_config;
 } rb_thread_t;
@@ -1088,12 +1228,13 @@ typedef enum {
 RUBY_SYMBOL_EXPORT_BEGIN
 
 /* node -> iseq */
-rb_iseq_t *rb_iseq_new         (const rb_ast_body_t *ast, VALUE name, VALUE path, VALUE realpath,                     const rb_iseq_t *parent, enum rb_iseq_type);
-rb_iseq_t *rb_iseq_new_top     (const rb_ast_body_t *ast, VALUE name, VALUE path, VALUE realpath,                     const rb_iseq_t *parent);
-rb_iseq_t *rb_iseq_new_main    (const rb_ast_body_t *ast,             VALUE path, VALUE realpath,                     const rb_iseq_t *parent, int opt);
-rb_iseq_t *rb_iseq_new_eval    (const rb_ast_body_t *ast, VALUE name, VALUE path, VALUE realpath, int first_lineno, const rb_iseq_t *parent, int isolated_depth);
-rb_iseq_t *rb_iseq_new_with_opt(const rb_ast_body_t *ast, VALUE name, VALUE path, VALUE realpath, int first_lineno, const rb_iseq_t *parent, int isolated_depth,
-                                enum rb_iseq_type, const rb_compile_option_t*);
+rb_iseq_t *rb_iseq_new         (const VALUE ast_value, VALUE name, VALUE path, VALUE realpath,                   const rb_iseq_t *parent, enum rb_iseq_type);
+rb_iseq_t *rb_iseq_new_top     (const VALUE ast_value, VALUE name, VALUE path, VALUE realpath,                   const rb_iseq_t *parent);
+rb_iseq_t *rb_iseq_new_main    (const VALUE ast_value,             VALUE path, VALUE realpath,                   const rb_iseq_t *parent, int opt);
+rb_iseq_t *rb_iseq_new_eval    (const VALUE ast_value, VALUE name, VALUE path, VALUE realpath, int first_lineno, const rb_iseq_t *parent, int isolated_depth);
+rb_iseq_t *rb_iseq_new_with_opt(      VALUE ast_value, VALUE name, VALUE path, VALUE realpath, int first_lineno, const rb_iseq_t *parent, int isolated_depth,
+                                enum rb_iseq_type, const rb_compile_option_t*,
+                                VALUE script_lines);
 
 struct iseq_link_anchor;
 struct rb_iseq_new_with_callback_callback_func {
@@ -1106,8 +1247,12 @@ static inline struct rb_iseq_new_with_callback_callback_func *
 rb_iseq_new_with_callback_new_callback(
     void (*func)(rb_iseq_t *, struct iseq_link_anchor *, const void *), const void *ptr)
 {
-    VALUE memo = rb_imemo_new(imemo_ifunc, (VALUE)func, (VALUE)ptr, Qundef, Qfalse);
-    return (struct rb_iseq_new_with_callback_callback_func *)memo;
+    struct rb_iseq_new_with_callback_callback_func *memo =
+        IMEMO_NEW(struct rb_iseq_new_with_callback_callback_func, imemo_ifunc, Qfalse);
+    memo->func = func;
+    memo->data = ptr;
+
+    return memo;
 }
 rb_iseq_t *rb_iseq_new_with_callback(const struct rb_iseq_new_with_callback_callback_func * ifunc,
     VALUE name, VALUE path, VALUE realpath, int first_lineno,
@@ -1129,6 +1274,7 @@ RUBY_SYMBOL_EXPORT_END
 
 typedef struct {
     const struct rb_block block;
+    const rb_namespace_t *ns;
     unsigned int is_from_method: 1;	/* bool */
     unsigned int is_lambda: 1;		/* bool */
     unsigned int is_isolated: 1;        /* bool */
@@ -1170,6 +1316,15 @@ enum vm_check_match_type {
 #define VM_CHECKMATCH_TYPE_MASK   0x03
 #define VM_CHECKMATCH_ARRAY       0x04
 
+enum vm_opt_newarray_send_type {
+    VM_OPT_NEWARRAY_SEND_MAX = 1,
+    VM_OPT_NEWARRAY_SEND_MIN = 2,
+    VM_OPT_NEWARRAY_SEND_HASH = 3,
+    VM_OPT_NEWARRAY_SEND_PACK = 4,
+    VM_OPT_NEWARRAY_SEND_PACK_BUFFER = 5,
+    VM_OPT_NEWARRAY_SEND_INCLUDE_P = 6,
+};
+
 enum vm_special_object_type {
     VM_SPECIAL_OBJECT_VMCORE = 1,
     VM_SPECIAL_OBJECT_CBASE,
@@ -1211,11 +1366,11 @@ typedef rb_control_frame_t *
 
 enum vm_frame_env_flags {
     /* Frame/Environment flag bits:
-     *   MMMM MMMM MMMM MMMM ____ FFFF FFFE EEEX (LSB)
+     *   MMMM MMMM MMMM MMMM __FF FFFF FFFE EEEX (LSB)
      *
      * X   : tag for GC marking (It seems as Fixnum)
      * EEE : 4 bits Env flags
-     * FF..: 7 bits Frame flags
+     * FF..: 9 bits Frame flags
      * MM..: 15 bits frame magic (to check frame corruption)
      */
 
@@ -1240,6 +1395,8 @@ enum vm_frame_env_flags {
     VM_FRAME_FLAG_MODIFIED_BLOCK_PARAM = 0x0200,
     VM_FRAME_FLAG_CFRAME_KW = 0x0400,
     VM_FRAME_FLAG_PASSED    = 0x0800,
+    VM_FRAME_FLAG_NS_SWITCH = 0x1000,
+    VM_FRAME_FLAG_LOAD_ISEQ = 0x2000,
 
     /* env flag */
     VM_ENV_FLAG_LOCAL       = 0x0002,
@@ -1338,6 +1495,12 @@ VM_FRAME_RUBYFRAME_P(const rb_control_frame_t *cfp)
     return !VM_FRAME_CFRAME_P(cfp);
 }
 
+static inline int
+VM_FRAME_NS_SWITCH_P(const rb_control_frame_t *cfp)
+{
+    return VM_ENV_FLAGS(cfp->ep, VM_FRAME_FLAG_NS_SWITCH) != 0;
+}
+
 #define RUBYVM_CFUNC_FRAME_P(cfp) \
   (VM_FRAME_TYPE(cfp) == VM_FRAME_MAGIC_CFUNC)
 
@@ -1375,22 +1538,13 @@ VM_ENV_ESCAPED_P(const VALUE *ep)
     return VM_ENV_FLAGS(ep, VM_ENV_FLAG_ESCAPED) ? 1 : 0;
 }
 
-#if VM_CHECK_MODE > 0
-static inline int
-vm_assert_env(VALUE obj)
-{
-    VM_ASSERT(imemo_type_p(obj, imemo_env));
-    return 1;
-}
-#endif
-
 RBIMPL_ATTR_NONNULL((1))
 static inline VALUE
 VM_ENV_ENVVAL(const VALUE *ep)
 {
     VALUE envval = ep[VM_ENV_DATA_INDEX_ENV];
     VM_ASSERT(VM_ENV_ESCAPED_P(ep));
-    VM_ASSERT(vm_assert_env(envval));
+    VM_ASSERT(envval == Qundef || imemo_type_p(envval, imemo_env));
     return envval;
 }
 
@@ -1404,7 +1558,9 @@ VM_ENV_ENVVAL_PTR(const VALUE *ep)
 static inline const rb_env_t *
 vm_env_new(VALUE *env_ep, VALUE *env_body, unsigned int env_size, const rb_iseq_t *iseq)
 {
-    rb_env_t *env = (rb_env_t *)rb_imemo_new(imemo_env, (VALUE)env_ep, (VALUE)env_body, 0, (VALUE)iseq);
+    rb_env_t *env = IMEMO_NEW(rb_env_t, imemo_env, (VALUE)iseq);
+    env->ep = env_ep;
+    env->env = env_body;
     env->env_size = env_size;
     env_ep[VM_ENV_DATA_INDEX_ENV] = (VALUE)env;
     return env;
@@ -1550,12 +1706,6 @@ 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)
 {
@@ -1684,13 +1834,13 @@ VALUE rb_proc_alloc(VALUE klass);
 VALUE rb_proc_dup(VALUE self);
 
 /* for debug */
-extern void rb_vmdebug_stack_dump_raw(const rb_execution_context_t *ec, const rb_control_frame_t *cfp);
-extern void rb_vmdebug_debug_print_pre(const rb_execution_context_t *ec, const rb_control_frame_t *cfp, const VALUE *_pc);
-extern void rb_vmdebug_debug_print_post(const rb_execution_context_t *ec, const rb_control_frame_t *cfp);
+extern bool rb_vmdebug_stack_dump_raw(const rb_execution_context_t *ec, const rb_control_frame_t *cfp, FILE *);
+extern bool rb_vmdebug_debug_print_pre(const rb_execution_context_t *ec, const rb_control_frame_t *cfp, const VALUE *_pc, FILE *);
+extern bool rb_vmdebug_debug_print_post(const rb_execution_context_t *ec, const rb_control_frame_t *cfp, FILE *);
 
-#define SDR() rb_vmdebug_stack_dump_raw(GET_EC(), GET_EC()->cfp)
-#define SDR2(cfp) rb_vmdebug_stack_dump_raw(GET_EC(), (cfp))
-void rb_vm_bugreport(const void *);
+#define SDR() rb_vmdebug_stack_dump_raw(GET_EC(), GET_EC()->cfp, stderr)
+#define SDR2(cfp) rb_vmdebug_stack_dump_raw(GET_EC(), (cfp), stderr)
+bool rb_vm_bugreport(const void *, FILE *);
 typedef void (*ruby_sighandler_t)(int);
 RBIMPL_ATTR_FORMAT(RBIMPL_PRINTF_FORMAT, 4, 5)
 NORETURN(void rb_bug_for_fatal_signal(ruby_sighandler_t default_sighandler, int sig, const void *, const char *fmt, ...));
@@ -1698,6 +1848,7 @@ NORETURN(void rb_bug_for_fatal_signal(ruby_sighandler_t default_sighandler, int
 /* functions about thread/vm execution */
 RUBY_SYMBOL_EXPORT_BEGIN
 VALUE rb_iseq_eval(const rb_iseq_t *iseq);
+VALUE rb_iseq_eval_with_refinement(const rb_iseq_t *iseq, VALUE mod);
 VALUE rb_iseq_eval_main(const rb_iseq_t *iseq);
 VALUE rb_iseq_path(const rb_iseq_t *iseq);
 VALUE rb_iseq_realpath(const rb_iseq_t *iseq);
@@ -1726,6 +1877,7 @@ rb_vm_make_lambda(const rb_execution_context_t *ec, const struct rb_captured_blo
 
 VALUE rb_vm_make_binding(const rb_execution_context_t *ec, const rb_control_frame_t *src_cfp);
 VALUE rb_vm_env_local_variables(const rb_env_t *env);
+VALUE rb_vm_env_numbered_parameters(const rb_env_t *env);
 const rb_env_t *rb_vm_env_prev_env(const rb_env_t *env);
 const VALUE *rb_binding_add_dynavars(VALUE bindval, rb_binding_t *bind, int dyncount, const ID *dynvars);
 void rb_vm_inc_const_missing_count(void);
@@ -1742,9 +1894,11 @@ void rb_thread_wakeup_timer_thread(int);
 static inline void
 rb_vm_living_threads_init(rb_vm_t *vm)
 {
-    ccan_list_head_init(&vm->waiting_fds);
     ccan_list_head_init(&vm->workqueue);
     ccan_list_head_init(&vm->ractor.set);
+#ifdef RUBY_THREAD_PTHREAD_H
+    ccan_list_head_init(&vm->ractor.sched.zombie_threads);
+#endif
 }
 
 typedef int rb_backtrace_iter_func(void *, VALUE, int, VALUE);
@@ -1753,7 +1907,7 @@ rb_control_frame_t *rb_vm_get_binding_creatable_next_cfp(const rb_execution_cont
 VALUE *rb_vm_svar_lep(const rb_execution_context_t *ec, const rb_control_frame_t *cfp);
 int rb_vm_get_sourceline(const rb_control_frame_t *);
 void rb_vm_stack_to_heap(rb_execution_context_t *ec);
-void ruby_thread_init_stack(rb_thread_t *th);
+void ruby_thread_init_stack(rb_thread_t *th, void *local_in_parent_frame);
 rb_thread_t * ruby_thread_from_native(void);
 int ruby_thread_set_native(rb_thread_t *th);
 int rb_vm_control_frame_id_and_class(const rb_control_frame_t *cfp, ID *idp, ID *called_idp, VALUE *klassp);
@@ -1766,9 +1920,9 @@ void rb_vm_register_special_exception_str(enum ruby_special_exceptions sp, VALUE
 #define rb_vm_register_special_exception(sp, e, m) \
     rb_vm_register_special_exception_str(sp, e, rb_usascii_str_new_static((m), (long)rb_strlen_lit(m)))
 
-void rb_gc_mark_machine_stack(const rb_execution_context_t *ec);
+void rb_gc_mark_machine_context(const rb_execution_context_t *ec);
 
-void rb_vm_rewrite_cref(rb_cref_t *node, VALUE old_klass, VALUE new_klass, rb_cref_t **new_cref_ptr);
+rb_cref_t *rb_vm_rewrite_cref(rb_cref_t *node, VALUE old_klass, VALUE new_klass);
 
 const rb_callable_method_entry_t *rb_vm_frame_method_entry(const rb_control_frame_t *cfp);
 
@@ -1836,17 +1990,33 @@ rb_ec_vm_ptr(const rb_execution_context_t *ec)
     }
 }
 
+NOINLINE(struct rb_execution_context_struct *rb_current_ec_noinline(void));
+
 static inline rb_execution_context_t *
 rb_current_execution_context(bool expect_ec)
 {
 #ifdef RB_THREAD_LOCAL_SPECIFIER
-  #ifdef __APPLE__
-    rb_execution_context_t *ec = rb_current_ec();
+  #if defined(__arm64__) || defined(__aarch64__)
+    rb_execution_context_t * volatile ec = rb_current_ec();
   #else
-    rb_execution_context_t *ec = ruby_current_ec;
+    rb_execution_context_t * volatile ec = ruby_current_ec;
   #endif
+
+    /* On the shared objects, `__tls_get_addr()` is used to access the TLS
+     * and the address of the `ruby_current_ec` can be stored on a function
+     * frame. However, this address can be mis-used after native thread
+     * migration of a coroutine.
+     *   1) Get `ptr =&ruby_current_ec` op NT1 and store it on the frame.
+     *   2) Context switch and resume it on the NT2.
+     *   3) `ptr` is used on NT2 but it accesses to the TLS on NT1.
+     * This assertion checks such misusage.
+     *
+     * To avoid accidents, `GET_EC()` should be called once on the frame.
+     * Note that inlining can produce the problem.
+     */
+    VM_ASSERT(ec == rb_current_ec_noinline());
 #else
-    rb_execution_context_t *ec = native_tls_get(ruby_current_ec_key);
+    rb_execution_context_t * volatile ec = native_tls_get(ruby_current_ec_key);
 #endif
     VM_ASSERT(!expect_ec || ec != NULL);
     return ec;
@@ -1927,8 +2097,12 @@ enum {
 #define RUBY_VM_SET_TRAP_INTERRUPT(ec)		ATOMIC_OR((ec)->interrupt_flag, TRAP_INTERRUPT_MASK)
 #define RUBY_VM_SET_TERMINATE_INTERRUPT(ec)     ATOMIC_OR((ec)->interrupt_flag, TERMINATE_INTERRUPT_MASK)
 #define RUBY_VM_SET_VM_BARRIER_INTERRUPT(ec)    ATOMIC_OR((ec)->interrupt_flag, VM_BARRIER_INTERRUPT_MASK)
-#define RUBY_VM_INTERRUPTED(ec)			((ec)->interrupt_flag & ~(ec)->interrupt_mask & \
-                                                 (PENDING_INTERRUPT_MASK|TRAP_INTERRUPT_MASK))
+
+static inline bool
+RUBY_VM_INTERRUPTED(rb_execution_context_t *ec)
+{
+    return (ATOMIC_LOAD_RELAXED(ec->interrupt_flag) & ~(ec->interrupt_mask) & (PENDING_INTERRUPT_MASK|TRAP_INTERRUPT_MASK));
+}
 
 static inline bool
 RUBY_VM_INTERRUPTED_ANY(rb_execution_context_t *ec)
@@ -1941,7 +2115,7 @@ RUBY_VM_INTERRUPTED_ANY(rb_execution_context_t *ec)
         RUBY_VM_SET_TIMER_INTERRUPT(ec);
     }
 #endif
-    return ec->interrupt_flag & ~(ec)->interrupt_mask;
+    return ATOMIC_LOAD_RELAXED(ec->interrupt_flag) & ~(ec)->interrupt_mask;
 }
 
 VALUE rb_exc_set_backtrace(VALUE exc, VALUE bt);
@@ -1975,7 +2149,7 @@ rb_vm_check_ints(rb_execution_context_t *ec)
     VM_ASSERT(ruby_assert_critical_section_entered == 0);
 #endif
 
-    VM_ASSERT(ec == GET_EC());
+    VM_ASSERT(ec == rb_current_ec_noinline());
 
     if (UNLIKELY(RUBY_VM_INTERRUPTED_ANY(ec))) {
         rb_threadptr_execute_interrupts(rb_ec_thread_ptr(ec), 0);
@@ -2068,6 +2242,10 @@ rb_exec_event_hook_script_compiled(rb_execution_context_t *ec, const rb_iseq_t *
 }
 
 void rb_vm_trap_exit(rb_vm_t *vm);
+void rb_vm_postponed_job_atfork(void); /* vm_trace.c */
+void rb_vm_postponed_job_free(void); /* vm_trace.c */
+size_t rb_vm_memsize_postponed_job_queue(void); /* vm_trace.c */
+void rb_vm_postponed_job_queue_init(rb_vm_t *vm); /* vm_trace.c */
 
 RUBY_SYMBOL_EXPORT_BEGIN
 
diff --git a/vm_debug.h b/vm_debug.h
index 9c7fc65f7c1f92..d0bc81574a31b5 100644
--- a/vm_debug.h
+++ b/vm_debug.h
@@ -23,8 +23,10 @@ RUBY_SYMBOL_EXPORT_BEGIN
 struct RNode;
 
 VALUE ruby_debug_print_value(int level, int debug_level, const char *header, VALUE v);
+void  ruby_debug_print_v(VALUE v);
 ID    ruby_debug_print_id(int level, int debug_level, const char *header, ID id);
 struct RNode *ruby_debug_print_node(int level, int debug_level, const char *header, const struct RNode *node);
+void  ruby_debug_print_n(const struct RNode *node);
 int   ruby_debug_print_indent(int level, int debug_level, int indent_level);
 void  ruby_debug_gc_check_func(void);
 void ruby_set_debug_option(const char *str);
diff --git a/vm_dump.c b/vm_dump.c
index b9f4e098a00cc1..2a863ddef955a0 100644
--- a/vm_dump.c
+++ b/vm_dump.c
@@ -9,6 +9,7 @@
 **********************************************************************/
 
 #include "ruby/internal/config.h"
+#include "ruby/fiber/scheduler.h"
 
 #ifdef HAVE_UCONTEXT_H
 # include <ucontext.h>
@@ -46,8 +47,11 @@
 const char *rb_method_type_name(rb_method_type_t type);
 int ruby_on_ci;
 
-static void
-control_frame_dump(const rb_execution_context_t *ec, const rb_control_frame_t *cfp)
+#define kprintf(...) if (fprintf(errout, __VA_ARGS__) < 0) goto error
+#define kputs(s) if (fputs(s, errout) < 0) goto error
+
+static bool
+control_frame_dump(const rb_execution_context_t *ec, const rb_control_frame_t *cfp, FILE *errout)
 {
     ptrdiff_t pc = -1;
     ptrdiff_t ep = cfp->ep - ec->vm_stack;
@@ -140,30 +144,30 @@ control_frame_dump(const rb_execution_context_t *ec, const rb_control_frame_t *c
         line = -1;
     }
 
-    fprintf(stderr, "c:%04"PRIdPTRDIFF" ",
+    kprintf("c:%04"PRIdPTRDIFF" ",
             ((rb_control_frame_t *)(ec->vm_stack + ec->vm_stack_size) - cfp));
     if (pc == -1) {
-        fprintf(stderr, "p:---- ");
+        kprintf("p:---- ");
     }
     else {
-        fprintf(stderr, "p:%04"PRIdPTRDIFF" ", pc);
+        kprintf("p:%04"PRIdPTRDIFF" ", pc);
     }
-    fprintf(stderr, "s:%04"PRIdPTRDIFF" ", cfp->sp - ec->vm_stack);
-    fprintf(stderr, ep_in_heap == ' ' ? "e:%06"PRIdPTRDIFF" " : "E:%06"PRIxPTRDIFF" ", ep % 10000);
-    fprintf(stderr, "%-6s", magic);
+    kprintf("s:%04"PRIdPTRDIFF" ", cfp->sp - ec->vm_stack);
+    kprintf(ep_in_heap == ' ' ? "e:%06"PRIdPTRDIFF" " : "E:%06"PRIxPTRDIFF" ", ep % 10000);
+    kprintf("%-6s", magic);
     if (line) {
-        fprintf(stderr, " %s", posbuf);
+        kprintf(" %s", posbuf);
     }
     if (VM_FRAME_FINISHED_P(cfp)) {
-        fprintf(stderr, " [FINISH]");
+        kprintf(" [FINISH]");
     }
     if (0) {
-        fprintf(stderr, "              \t");
-        fprintf(stderr, "iseq: %-24s ", iseq_name);
-        fprintf(stderr, "self: %-24s ", selfstr);
-        fprintf(stderr, "%-1s ", biseq_name);
+        kprintf("              \t");
+        kprintf("iseq: %-24s ", iseq_name);
+        kprintf("self: %-24s ", selfstr);
+        kprintf("%-1s ", biseq_name);
     }
-    fprintf(stderr, "\n");
+    kprintf("\n");
 
     // additional information for CI machines
     if (ruby_on_ci) {
@@ -171,112 +175,127 @@ control_frame_dump(const rb_execution_context_t *ec, const rb_control_frame_t *c
 
         if (me) {
             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));
+                kprintf("  me:\n");
+                kprintf("    called_id: %s, type: %s\n", rb_id2name(me->called_id), rb_method_type_name(me->def->type));
+                kprintf("    owner class: %s\n", rb_raw_obj_info(buff, 0x100, me->owner));
                 if (me->owner != me->defined_class) {
-                    fprintf(stderr, "    defined_class: %s\n", rb_raw_obj_info(buff, 0x100, me->defined_class));
+                    kprintf("    defined_class: %s\n", rb_raw_obj_info(buff, 0x100, me->defined_class));
                 }
             }
             else {
-                fprintf(stderr, " me is corrupted (%s)\n", rb_raw_obj_info(buff, 0x100, (VALUE)me));
+                kprintf(" me is corrupted (%s)\n", rb_raw_obj_info(buff, 0x100, (VALUE)me));
             }
         }
 
-        fprintf(stderr, "  self: %s\n", rb_raw_obj_info(buff, 0x100, cfp->self));
+        kprintf("  self: %s\n", rb_raw_obj_info(buff, 0x100, cfp->self));
 
         if (iseq) {
             if (ISEQ_BODY(iseq)->local_table_size > 0) {
-                fprintf(stderr, "  lvars:\n");
+                kprintf("  lvars:\n");
                 for (unsigned int i=0; i<ISEQ_BODY(iseq)->local_table_size; i++) {
                     const VALUE *argv = cfp->ep - ISEQ_BODY(cfp->iseq)->local_table_size - VM_ENV_DATA_SIZE + 1;
-                    fprintf(stderr, "    %s: %s\n",
+                    kprintf("    %s: %s\n",
                             rb_id2name(ISEQ_BODY(iseq)->local_table[i]),
                             rb_raw_obj_info(buff, 0x100, argv[i]));
                 }
             }
         }
     }
+    return true;
+  error:
+    return false;
 }
 
-void
-rb_vmdebug_stack_dump_raw(const rb_execution_context_t *ec, const rb_control_frame_t *cfp)
+bool
+rb_vmdebug_stack_dump_raw(const rb_execution_context_t *ec, const rb_control_frame_t *cfp, FILE *errout)
 {
 #if 0
     VALUE *sp = cfp->sp;
     const VALUE *ep = cfp->ep;
     VALUE *p, *st, *t;
 
-    fprintf(stderr, "-- stack frame ------------\n");
+    kprintf("-- stack frame ------------\n");
     for (p = st = ec->vm_stack; p < sp; p++) {
-        fprintf(stderr, "%04ld (%p): %08"PRIxVALUE, (long)(p - st), p, *p);
+        kprintf("%04ld (%p): %08"PRIxVALUE, (long)(p - st), p, *p);
 
         t = (VALUE *)*p;
         if (ec->vm_stack <= t && t < sp) {
-            fprintf(stderr, " (= %ld)", (long)((VALUE *)GC_GUARDED_PTR_REF((VALUE)t) - ec->vm_stack));
+            kprintf(" (= %ld)", (long)((VALUE *)GC_GUARDED_PTR_REF((VALUE)t) - ec->vm_stack));
         }
 
         if (p == ep)
-            fprintf(stderr, " <- ep");
+            kprintf(" <- ep");
 
-        fprintf(stderr, "\n");
+        kprintf("\n");
     }
 #endif
 
-    fprintf(stderr, "-- Control frame information "
+    kprintf("-- Control frame information "
             "-----------------------------------------------\n");
     while ((void *)cfp < (void *)(ec->vm_stack + ec->vm_stack_size)) {
-        control_frame_dump(ec, cfp);
+        control_frame_dump(ec, cfp, errout);
         cfp++;
     }
-    fprintf(stderr, "\n");
+    kprintf("\n");
+    return true;
+
+  error:
+    return false;
 }
 
-void
+bool
 rb_vmdebug_stack_dump_raw_current(void)
 {
     const rb_execution_context_t *ec = GET_EC();
-    rb_vmdebug_stack_dump_raw(ec, ec->cfp);
+    return rb_vmdebug_stack_dump_raw(ec, ec->cfp, stderr);
 }
 
-void
-rb_vmdebug_env_dump_raw(const rb_env_t *env, const VALUE *ep)
+bool
+rb_vmdebug_env_dump_raw(const rb_env_t *env, const VALUE *ep, FILE *errout)
 {
     unsigned int i;
-    fprintf(stderr, "-- env --------------------\n");
+    kprintf("-- env --------------------\n");
 
     while (env) {
-        fprintf(stderr, "--\n");
+        kprintf("--\n");
         for (i = 0; i < env->env_size; i++) {
-            fprintf(stderr, "%04d: %08"PRIxVALUE" (%p)", i, env->env[i], (void *)&env->env[i]);
-            if (&env->env[i] == ep) fprintf(stderr, " <- ep");
-            fprintf(stderr, "\n");
+            kprintf("%04d: %08"PRIxVALUE" (%p)", i, env->env[i], (void *)&env->env[i]);
+            if (&env->env[i] == ep) kprintf(" <- ep");
+            kprintf("\n");
         }
 
         env = rb_vm_env_prev_env(env);
     }
-    fprintf(stderr, "---------------------------\n");
+    kprintf("---------------------------\n");
+    return true;
+
+  error:
+    return false;
 }
 
-void
-rb_vmdebug_proc_dump_raw(rb_proc_t *proc)
+bool
+rb_vmdebug_proc_dump_raw(rb_proc_t *proc, FILE *errout)
 {
     const rb_env_t *env;
     char *selfstr;
     VALUE val = rb_inspect(vm_block_self(&proc->block));
     selfstr = StringValueCStr(val);
 
-    fprintf(stderr, "-- proc -------------------\n");
-    fprintf(stderr, "self: %s\n", selfstr);
+    kprintf("-- proc -------------------\n");
+    kprintf("self: %s\n", selfstr);
     env = VM_ENV_ENVVAL_PTR(vm_block_ep(&proc->block));
-    rb_vmdebug_env_dump_raw(env, vm_block_ep(&proc->block));
+    rb_vmdebug_env_dump_raw(env, vm_block_ep(&proc->block), errout);
+    return true;
+
+  error:
+    return false;
 }
 
-void
-rb_vmdebug_stack_dump_th(VALUE thval)
+bool
+rb_vmdebug_stack_dump_th(VALUE thval, FILE *errout)
 {
     rb_thread_t *target_th = rb_thread_ptr(thval);
-    rb_vmdebug_stack_dump_raw(target_th->ec, target_th->ec->cfp);
+    return rb_vmdebug_stack_dump_raw(target_th->ec, target_th->ec->cfp, errout);
 }
 
 #if VMDEBUG > 2
@@ -295,7 +314,7 @@ vm_base_ptr(const rb_control_frame_t *cfp)
 }
 
 static void
-vm_stack_dump_each(const rb_execution_context_t *ec, const rb_control_frame_t *cfp)
+vm_stack_dump_each(const rb_execution_context_t *ec, const rb_control_frame_t *cfp, FILE *errout)
 {
     int i, argc = 0, local_table_size = 0;
     VALUE rstr;
@@ -321,17 +340,17 @@ vm_stack_dump_each(const rb_execution_context_t *ec, const rb_control_frame_t *c
     {
         const VALUE *ptr = ep - local_table_size;
 
-        control_frame_dump(ec, cfp);
+        control_frame_dump(ec, cfp, errout);
 
         for (i = 0; i < argc; i++) {
             rstr = rb_inspect(*ptr);
-            fprintf(stderr, "  arg   %2d: %8s (%p)\n", i, StringValueCStr(rstr),
-                   (void *)ptr++);
+            kprintf("  arg   %2d: %8s (%p)\n", i, StringValueCStr(rstr),
+                    (void *)ptr++);
         }
         for (; i < local_table_size - 1; i++) {
             rstr = rb_inspect(*ptr);
-            fprintf(stderr, "  local %2d: %8s (%p)\n", i, StringValueCStr(rstr),
-                   (void *)ptr++);
+            kprintf("  local %2d: %8s (%p)\n", i, StringValueCStr(rstr),
+                    (void *)ptr++);
         }
 
         ptr = vm_base_ptr(cfp);
@@ -347,13 +366,13 @@ vm_stack_dump_each(const rb_execution_context_t *ec, const rb_control_frame_t *c
                 rstr = rb_inspect(*ptr);
                 break;
             }
-            fprintf(stderr, "  stack %2d: %8s (%"PRIdPTRDIFF")\n", i, StringValueCStr(rstr),
+            kprintf("  stack %2d: %8s (%"PRIdPTRDIFF")\n", i, StringValueCStr(rstr),
                     (ptr - ec->vm_stack));
         }
     }
     else if (VM_FRAME_FINISHED_P(cfp)) {
         if (ec->vm_stack + ec->vm_stack_size > (VALUE *)(cfp + 1)) {
-            vm_stack_dump_each(ec, cfp + 1);
+            vm_stack_dump_each(ec, cfp + 1, errout);
         }
         else {
             /* SDR(); */
@@ -365,8 +384,8 @@ vm_stack_dump_each(const rb_execution_context_t *ec, const rb_control_frame_t *c
 }
 #endif
 
-void
-rb_vmdebug_debug_print_register(const rb_execution_context_t *ec)
+bool
+rb_vmdebug_debug_print_register(const rb_execution_context_t *ec, FILE *errout)
 {
     rb_control_frame_t *cfp = ec->cfp;
     ptrdiff_t pc = -1;
@@ -382,18 +401,22 @@ rb_vmdebug_debug_print_register(const rb_execution_context_t *ec)
     }
 
     cfpi = ((rb_control_frame_t *)(ec->vm_stack + ec->vm_stack_size)) - cfp;
-    fprintf(stderr, "  [PC] %04"PRIdPTRDIFF", [SP] %04"PRIdPTRDIFF", [EP] %04"PRIdPTRDIFF", [CFP] %04"PRIdPTRDIFF"\n",
+    kprintf("  [PC] %04"PRIdPTRDIFF", [SP] %04"PRIdPTRDIFF", [EP] %04"PRIdPTRDIFF", [CFP] %04"PRIdPTRDIFF"\n",
             pc, (cfp->sp - ec->vm_stack), ep, cfpi);
+    return true;
+
+  error:
+    return false;
 }
 
-void
-rb_vmdebug_thread_dump_regs(VALUE thval)
+bool
+rb_vmdebug_thread_dump_regs(VALUE thval, FILE *errout)
 {
-    rb_vmdebug_debug_print_register(rb_thread_ptr(thval)->ec);
+    return rb_vmdebug_debug_print_register(rb_thread_ptr(thval)->ec, errout);
 }
 
-void
-rb_vmdebug_debug_print_pre(const rb_execution_context_t *ec, const rb_control_frame_t *cfp, const VALUE *_pc)
+bool
+rb_vmdebug_debug_print_pre(const rb_execution_context_t *ec, const rb_control_frame_t *cfp, const VALUE *_pc, FILE *errout)
 {
     const rb_iseq_t *iseq = cfp->iseq;
 
@@ -402,10 +425,10 @@ rb_vmdebug_debug_print_pre(const rb_execution_context_t *ec, const rb_control_fr
         int i;
 
         for (i=0; i<(int)VM_CFP_CNT(ec, cfp); i++) {
-            printf(" ");
+            kprintf(" ");
         }
-        printf("| ");
-        if(0)printf("[%03ld] ", (long)(cfp->sp - ec->vm_stack));
+        kprintf("| ");
+        if(0) kprintf("[%03ld] ", (long)(cfp->sp - ec->vm_stack));
 
         /* printf("%3"PRIdPTRDIFF" ", VM_CFP_CNT(ec, cfp)); */
         if (pc >= 0) {
@@ -416,48 +439,60 @@ rb_vmdebug_debug_print_pre(const rb_execution_context_t *ec, const rb_control_fr
     }
 
 #if VMDEBUG > 3
-    fprintf(stderr, "        (1)");
-    rb_vmdebug_debug_print_register(ec);
+    kprintf("        (1)");
+    rb_vmdebug_debug_print_register(errout, ec);
 #endif
+    return true;
+
+  error:
+    return false;
 }
 
-void
-rb_vmdebug_debug_print_post(const rb_execution_context_t *ec, const rb_control_frame_t *cfp)
+bool
+rb_vmdebug_debug_print_post(const rb_execution_context_t *ec, const rb_control_frame_t *cfp, FILE *errout)
 {
 #if VMDEBUG > 9
-    SDR2(cfp);
+    if (!rb_vmdebug_stack_dump_raw(ec, cfp, errout)) goto errout;
 #endif
 
 #if VMDEBUG > 3
-    fprintf(stderr, "        (2)");
-    rb_vmdebug_debug_print_register(ec);
+    kprintf("        (2)");
+    rb_vmdebug_debug_print_register(errout, ec);
 #endif
     /* stack_dump_raw(ec, cfp); */
 
 #if VMDEBUG > 2
     /* stack_dump_thobj(ec); */
-    vm_stack_dump_each(ec, ec->cfp);
+    vm_stack_dump_each(ec, ec->cfp, errout);
 
-    printf
+    kprintf
         ("--------------------------------------------------------------\n");
+#endif
+    return true;
+
+#if VMDEBUG > 2
+  error:
+    return false;
 #endif
 }
 
 VALUE
-rb_vmdebug_thread_dump_state(VALUE self)
+rb_vmdebug_thread_dump_state(FILE *errout, VALUE self)
 {
     rb_thread_t *th = rb_thread_ptr(self);
     rb_control_frame_t *cfp = th->ec->cfp;
 
-    fprintf(stderr, "Thread state dump:\n");
-    fprintf(stderr, "pc : %p, sp : %p\n", (void *)cfp->pc, (void *)cfp->sp);
-    fprintf(stderr, "cfp: %p, ep : %p\n", (void *)cfp, (void *)cfp->ep);
+    kprintf("Thread state dump:\n");
+    kprintf("pc : %p, sp : %p\n", (void *)cfp->pc, (void *)cfp->sp);
+    kprintf("cfp: %p, ep : %p\n", (void *)cfp, (void *)cfp->ep);
 
+  error:
     return Qnil;
 }
 
 #if defined __APPLE__
-# if __DARWIN_UNIX03
+# include <AvailabilityMacros.h>
+# if defined(MAC_OS_X_VERSION_10_5) && MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5
 #   define MCTX_SS_REG(reg) __ss.__##reg
 # else
 #   define MCTX_SS_REG(reg) ss.reg
@@ -469,11 +504,27 @@ rb_vmdebug_thread_dump_state(VALUE self)
 # ifdef HAVE_LIBUNWIND
 #  undef backtrace
 #  define backtrace unw_backtrace
-# elif defined(__APPLE__) && defined(HAVE_LIBUNWIND_H)
+# elif defined(__APPLE__) && defined(HAVE_LIBUNWIND_H) \
+    && defined(MAC_OS_X_VERSION_10_6) && MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_6
 #  define UNW_LOCAL_ONLY
 #  include <libunwind.h>
 #  include <sys/mman.h>
 #  undef backtrace
+
+#  if defined(__arm64__)
+static bool
+is_coroutine_start(unw_word_t ip)
+{
+#if defined(USE_MN_THREADS) && USE_MN_THREADS
+    struct coroutine_context;
+    extern void ruby_coroutine_start(struct coroutine_context *, struct coroutine_context *);
+    return ((void *)(ip) == (void *)ruby_coroutine_start);
+#else
+    return false;
+#endif
+}
+#  endif
+
 int
 backtrace(void **trace, int size)
 {
@@ -569,7 +620,7 @@ backtrace(void **trace, int size)
     }
     return n;
 
-#  else /* defined(__arm64__) */
+#  elif defined(__arm64__)
     /* Since Darwin arm64's _sigtramp is implemented as normal function,
      * unwind can unwind frames without special code.
      * https://github.com/apple/darwin-libplatform/blob/215b09856ab5765b7462a91be7076183076600df/src/setjmp/generic/sigtramp.c
@@ -581,8 +632,13 @@ backtrace(void **trace, int size)
         // I wish I could use "ptrauth_strip()" but I get an error:
         // "this target does not support pointer authentication"
         trace[n++] = (void *)(ip & 0x7fffffffffffull);
+
+        // Apple's libunwind can't handle our coroutine switching code
+        if (is_coroutine_start(ip)) break;
     }
     return n;
+#  else
+#    error unsupported architecture
 #  endif
 }
 # elif defined(BROKEN_BACKTRACE)
@@ -664,6 +720,11 @@ typedef void *PGET_MODULE_BASE_ROUTINE64;
 typedef void *PTRANSLATE_ADDRESS_ROUTINE64;
 # endif
 
+struct dump_thead_arg {
+    DWORD tid;
+    FILE *errout;
+};
+
 static void
 dump_thread(void *arg)
 {
@@ -675,7 +736,8 @@ dump_thread(void *arg)
     BOOL (WINAPI *pSymFromAddr)(HANDLE, DWORD64, DWORD64 *, SYMBOL_INFO *);
     BOOL (WINAPI *pSymGetLineFromAddr64)(HANDLE, DWORD64, DWORD *, IMAGEHLP_LINE64 *);
     HANDLE (WINAPI *pOpenThread)(DWORD, BOOL, DWORD);
-    DWORD tid = *(DWORD *)arg;
+    DWORD tid = ((struct dump_thead_arg *)arg)->tid;
+    FILE *errout = ((struct dump_thead_arg *)arg)->errout;
     HANDLE ph;
     HANDLE th;
 
@@ -714,6 +776,14 @@ dump_thread(void *arg)
                     frame.AddrFrame.Offset = context.Rbp;
                     frame.AddrStack.Mode = AddrModeFlat;
                     frame.AddrStack.Offset = context.Rsp;
+#elif defined(_M_ARM64) || defined(__aarch64__)
+                    mac = IMAGE_FILE_MACHINE_ARM64;
+                    frame.AddrPC.Mode = AddrModeFlat;
+                    frame.AddrPC.Offset = context.Pc;
+                    frame.AddrFrame.Mode = AddrModeFlat;
+                    frame.AddrFrame.Offset = context.Fp;
+                    frame.AddrStack.Mode = AddrModeFlat;
+                    frame.AddrStack.Offset = context.Sp;
 #else	/* i386 */
                     mac = IMAGE_FILE_MACHINE_I386;
                     frame.AddrPC.Mode = AddrModeFlat;
@@ -740,19 +810,20 @@ dump_thread(void *arg)
                         info->MaxNameLen = MAX_SYM_NAME;
                         if (pSymFromAddr(ph, addr, &displacement, info)) {
                             if (GetModuleFileName((HANDLE)(uintptr_t)pSymGetModuleBase64(ph, addr), libpath, sizeof(libpath)))
-                                fprintf(stderr, "%s", libpath);
-                            fprintf(stderr, "(%s+0x%"PRI_64_PREFIX"x)",
+                                kprintf("%s", libpath);
+                            kprintf("(%s+0x%"PRI_64_PREFIX"x)",
                                     info->Name, displacement);
                         }
-                        fprintf(stderr, " [0x%p]", (void *)(VALUE)addr);
+                        kprintf(" [0x%p]", (void *)(VALUE)addr);
                         memset(&line, 0, sizeof(line));
                         line.SizeOfStruct = sizeof(line);
                         if (pSymGetLineFromAddr64(ph, addr, &tmp, &line))
-                            fprintf(stderr, " %s:%lu", line.FileName, line.LineNumber);
-                        fprintf(stderr, "\n");
+                            kprintf(" %s:%lu", line.FileName, line.LineNumber);
+                        kprintf("\n");
                     }
                 }
 
+              error:
                 ResumeThread(th);
             }
             CloseHandle(th);
@@ -764,53 +835,61 @@ dump_thread(void *arg)
 #endif
 
 void
-rb_print_backtrace(void)
+rb_print_backtrace(FILE *errout)
 {
 #if USE_BACKTRACE
 #define MAX_NATIVE_TRACE 1024
     static void *trace[MAX_NATIVE_TRACE];
     int n = (int)backtrace(trace, MAX_NATIVE_TRACE);
 #if (defined(USE_ELF) || defined(HAVE_MACH_O_LOADER_H)) && defined(HAVE_DLADDR) && !defined(__sparc)
-    rb_dump_backtrace_with_lines(n, trace);
+    rb_dump_backtrace_with_lines(n, trace, errout);
 #else
     char **syms = backtrace_symbols(trace, n);
     if (syms) {
         int i;
         for (i=0; i<n; i++) {
-            fprintf(stderr, "%s\n", syms[i]);
+            kprintf("%s\n", syms[i]);
         }
         free(syms);
     }
+  error:
+    /* ignore errors at writing */;
 #endif
 #elif defined(_WIN32)
-    DWORD tid = GetCurrentThreadId();
-    HANDLE th = (HANDLE)_beginthread(dump_thread, 0, &tid);
+    struct dump_thead_arg arg = {
+        .tid = GetCurrentThreadId(),
+        .errout = errout,
+    };
+    HANDLE th = (HANDLE)_beginthread(dump_thread, 0, &arg);
     if (th != (HANDLE)-1)
         WaitForSingleObject(th, INFINITE);
 #endif
 }
 
 #ifdef HAVE_LIBPROCSTAT
+struct procstat;
+struct kinfo_proc;
+static void procstat_vm(struct procstat *, struct kinfo_proc *, FILE *);
 #include "missing/procstat_vm.c"
 #endif
 
 #if defined __linux__
 # if defined(__x86_64__) || defined(__i386__)
-#   define dump_machine_register(reg) (col_count = print_machine_register(mctx->gregs[REG_##reg], #reg, col_count, 80))
+#   define dump_machine_register(reg) (col_count = print_machine_register(errout, mctx->gregs[REG_##reg], #reg, col_count, 80))
 # elif defined(__aarch64__) || defined(__arm__) || defined(__riscv) || defined(__loongarch64)
-#   define dump_machine_register(reg, regstr) (col_count = print_machine_register(reg, regstr, col_count, 80))
+#   define dump_machine_register(reg, regstr) (col_count = print_machine_register(errout, reg, regstr, col_count, 80))
 # endif
 #elif defined __APPLE__
 # if defined(__aarch64__)
-#   define dump_machine_register(reg, regstr) (col_count = print_machine_register(mctx->MCTX_SS_REG(reg), regstr, col_count, 80))
+#   define dump_machine_register(reg, regstr) (col_count = print_machine_register(errout, mctx->MCTX_SS_REG(reg), regstr, col_count, 80))
 # else
-#   define dump_machine_register(reg) (col_count = print_machine_register(mctx->MCTX_SS_REG(reg), #reg, col_count, 80))
+#   define dump_machine_register(reg) (col_count = print_machine_register(errout, mctx->MCTX_SS_REG(reg), #reg, col_count, 80))
 # endif
 #endif
 
 #ifdef dump_machine_register
 static int
-print_machine_register(size_t reg, const char *reg_name, int col_count, int max_col)
+print_machine_register(FILE *errout, size_t reg, const char *reg_name, int col_count, int max_col)
 {
     int ret;
     char buf[64];
@@ -818,21 +897,24 @@ print_machine_register(size_t reg, const char *reg_name, int col_count, int max_
 
     ret = snprintf(buf, sizeof(buf), " %3.3s: 0x%.*" PRIxSIZE, reg_name, size_width, reg);
     if (col_count + ret > max_col) {
-        fputs("\n", stderr);
+        kputs("\n");
         col_count = 0;
     }
     col_count += ret;
-    fputs(buf, stderr);
+    kputs(buf);
     return col_count;
+
+  error:
+    return -1;
 }
 
-static void
-rb_dump_machine_register(const ucontext_t *ctx)
+static bool
+rb_dump_machine_register(FILE *errout, const ucontext_t *ctx)
 {
     int col_count = 0;
-    if (!ctx) return;
+    if (!ctx) return true;
 
-    fprintf(stderr, "-- Machine register context "
+    kprintf("-- Machine register context "
             "------------------------------------------------\n");
 
 # if defined __linux__
@@ -938,8 +1020,6 @@ rb_dump_machine_register(const ucontext_t *ctx)
         dump_machine_register(mctx->__gregs[REG_S2+9], "s11");
 #   elif defined __loongarch64
         dump_machine_register(mctx->__gregs[LARCH_REG_SP], "sp");
-        dump_machine_register(mctx->__gregs[LARCH_REG_S0], "s0");
-        dump_machine_register(mctx->__gregs[LARCH_REG_S1], "s1");
         dump_machine_register(mctx->__gregs[LARCH_REG_A0], "a0");
         dump_machine_register(mctx->__gregs[LARCH_REG_A0+1], "a1");
         dump_machine_register(mctx->__gregs[LARCH_REG_A0+2], "a2");
@@ -948,10 +1028,10 @@ rb_dump_machine_register(const ucontext_t *ctx)
         dump_machine_register(mctx->__gregs[LARCH_REG_A0+5], "a5");
         dump_machine_register(mctx->__gregs[LARCH_REG_A0+6], "a6");
         dump_machine_register(mctx->__gregs[LARCH_REG_A0+7], "a7");
-        dump_machine_register(mctx->__gregs[LARCH_REG_A0+7], "a7");
+        dump_machine_register(mctx->__gregs[LARCH_REG_A0+8], "fp");
         dump_machine_register(mctx->__gregs[LARCH_REG_S0], "s0");
-        dump_machine_register(mctx->__gregs[LARCH_REG_S0+1], "s1");
-        dump_machine_register(mctx->__gregs[LARCH_REG_S0+2], "s2");
+        dump_machine_register(mctx->__gregs[LARCH_REG_S1], "s1");
+        dump_machine_register(mctx->__gregs[LARCH_REG_S2], "s2");
         dump_machine_register(mctx->__gregs[LARCH_REG_S0+3], "s3");
         dump_machine_register(mctx->__gregs[LARCH_REG_S0+4], "s4");
         dump_machine_register(mctx->__gregs[LARCH_REG_S0+5], "s5");
@@ -1025,14 +1105,18 @@ rb_dump_machine_register(const ucontext_t *ctx)
 #   endif
     }
 # endif
-    fprintf(stderr, "\n\n");
+    kprintf("\n\n");
+    return true;
+
+  error:
+    return false;
 }
 #else
-# define rb_dump_machine_register(ctx) ((void)0)
+# define rb_dump_machine_register(errout, ctx) ((void)0)
 #endif /* dump_machine_register */
 
-void
-rb_vm_bugreport(const void *ctx)
+bool
+rb_vm_bugreport(const void *ctx, FILE *errout)
 {
     const char *cmd = getenv("RUBY_ON_BUG");
     if (cmd) {
@@ -1049,8 +1133,8 @@ rb_vm_bugreport(const void *ctx)
     {
         static bool crashing = false;
         if (crashing) {
-            fprintf(stderr, "Crashed while printing bug report\n");
-            return;
+            kprintf("Crashed while printing bug report\n");
+            return true;
         }
         crashing = true;
     }
@@ -1067,32 +1151,35 @@ rb_vm_bugreport(const void *ctx)
     const rb_execution_context_t *ec = rb_current_execution_context(false);
 
     if (vm && ec) {
-        SDR();
-        rb_backtrace_print_as_bugreport();
-        fputs("\n", stderr);
+        rb_vmdebug_stack_dump_raw(ec, ec->cfp, errout);
+        rb_backtrace_print_as_bugreport(errout);
+        kputs("\n");
         // If we get here, hopefully things are intact enough that
         // we can read these two numbers. It is an estimate because
         // we are reading without synchronization.
-        fprintf(stderr, "-- Threading information "
+        kprintf("-- Threading information "
                 "---------------------------------------------------\n");
-        fprintf(stderr, "Total ractor count: %u\n", vm->ractor.cnt);
-        fprintf(stderr, "Ruby thread count for this ractor: %u\n", rb_ec_ractor_ptr(ec)->threads.cnt);
-        fputs("\n", stderr);
+        kprintf("Total ractor count: %u\n", vm->ractor.cnt);
+        kprintf("Ruby thread count for this ractor: %u\n", rb_ec_ractor_ptr(ec)->threads.cnt);
+        if (rb_fiber_scheduler_get() != Qnil) {
+            kprintf("Note that the Fiber scheduler is enabled\n");
+        }
+        kputs("\n");
     }
 
-    rb_dump_machine_register(ctx);
+    rb_dump_machine_register(errout, ctx);
 
 #if USE_BACKTRACE || defined(_WIN32)
-    fprintf(stderr, "-- C level backtrace information "
+    kprintf("-- C level backtrace information "
             "-------------------------------------------\n");
-    rb_print_backtrace();
+    rb_print_backtrace(errout);
 
 
-    fprintf(stderr, "\n");
+    kprintf("\n");
 #endif /* USE_BACKTRACE */
 
     if (other_runtime_info || vm) {
-        fprintf(stderr, "-- Other runtime information "
+        kprintf("-- Other runtime information "
                 "-----------------------------------------------\n\n");
     }
     if (vm && !rb_during_gc()) {
@@ -1105,16 +1192,16 @@ rb_vm_bugreport(const void *ctx)
 
         name = vm->progname;
         if (name) {
-            fprintf(stderr, "* Loaded script: %.*s\n",
+            kprintf("* Loaded script: %.*s\n",
                     LIMITED_NAME_LENGTH(name), RSTRING_PTR(name));
-            fprintf(stderr, "\n");
+            kprintf("\n");
         }
         if (vm->loaded_features) {
-            fprintf(stderr, "* Loaded features:\n\n");
+            kprintf("* Loaded features:\n\n");
             for (i=0; i<RARRAY_LEN(vm->loaded_features); i++) {
                 name = RARRAY_AREF(vm->loaded_features, i);
                 if (RB_TYPE_P(name, T_STRING)) {
-                    fprintf(stderr, " %4d %.*s\n", i,
+                    kprintf(" %4d %.*s\n", i,
                             LIMITED_NAME_LENGTH(name), RSTRING_PTR(name));
                 }
                 else if (RB_TYPE_P(name, T_CLASS) || RB_TYPE_P(name, T_MODULE)) {
@@ -1122,49 +1209,50 @@ rb_vm_bugreport(const void *ctx)
                         "class" : "module";
                     name = rb_search_class_path(rb_class_real(name));
                     if (!RB_TYPE_P(name, T_STRING)) {
-                        fprintf(stderr, " %4d %s:<unnamed>\n", i, type);
+                        kprintf(" %4d %s:<unnamed>\n", i, type);
                         continue;
                     }
-                    fprintf(stderr, " %4d %s:%.*s\n", i, type,
+                    kprintf(" %4d %s:%.*s\n", i, type,
                             LIMITED_NAME_LENGTH(name), RSTRING_PTR(name));
                 }
                 else {
                     VALUE klass = rb_search_class_path(rb_obj_class(name));
                     if (!RB_TYPE_P(klass, T_STRING)) {
-                        fprintf(stderr, " %4d #<%p:%p>\n", i,
+                        kprintf(" %4d #<%p:%p>\n", i,
                                 (void *)CLASS_OF(name), (void *)name);
                         continue;
                     }
-                    fprintf(stderr, " %4d #<%.*s:%p>\n", i,
+                    kprintf(" %4d #<%.*s:%p>\n", i,
                             LIMITED_NAME_LENGTH(klass), RSTRING_PTR(klass),
                             (void *)name);
                 }
             }
         }
-        fprintf(stderr, "\n");
+        kprintf("\n");
     }
 
     {
-#ifdef PROC_MAPS_NAME
+#ifndef RUBY_ASAN_ENABLED
+# ifdef PROC_MAPS_NAME
         {
             FILE *fp = fopen(PROC_MAPS_NAME, "r");
             if (fp) {
-                fprintf(stderr, "* Process memory map:\n\n");
+                kprintf("* Process memory map:\n\n");
 
                 while (!feof(fp)) {
                     char buff[0x100];
                     size_t rn = fread(buff, 1, 0x100, fp);
-                    if (fwrite(buff, 1, rn, stderr) != rn)
+                    if (fwrite(buff, 1, rn, errout) != rn)
                         break;
                 }
 
                 fclose(fp);
-                fprintf(stderr, "\n\n");
+                kprintf("\n\n");
             }
         }
-#endif /* __linux__ */
-#ifdef HAVE_LIBPROCSTAT
-# define MIB_KERN_PROC_PID_LEN 4
+# endif /* __linux__ */
+# ifdef HAVE_LIBPROCSTAT
+#  define MIB_KERN_PROC_PID_LEN 4
         int mib[MIB_KERN_PROC_PID_LEN];
         struct kinfo_proc kp;
         size_t len = sizeof(struct kinfo_proc);
@@ -1173,24 +1261,24 @@ rb_vm_bugreport(const void *ctx)
         mib[2] = KERN_PROC_PID;
         mib[3] = getpid();
         if (sysctl(mib, MIB_KERN_PROC_PID_LEN, &kp, &len, NULL, 0) == -1) {
-            perror("sysctl");
+            kprintf("sysctl: %s\n", strerror(errno));
         }
         else {
             struct procstat *prstat = procstat_open_sysctl();
-            fprintf(stderr, "* Process memory map:\n\n");
-            procstat_vm(prstat, &kp);
+            kprintf("* Process memory map:\n\n");
+            procstat_vm(prstat, &kp, errout);
             procstat_close(prstat);
-            fprintf(stderr, "\n");
+            kprintf("\n");
         }
-#endif /* __FreeBSD__ */
-#ifdef __APPLE__
+# endif /* __FreeBSD__ */
+# ifdef __APPLE__
         vm_address_t addr = 0;
         vm_size_t size = 0;
         struct vm_region_submap_info map;
         mach_msg_type_number_t count = VM_REGION_SUBMAP_INFO_COUNT;
         natural_t depth = 0;
 
-        fprintf(stderr, "* Process memory map:\n\n");
+        kprintf("* Process memory map:\n\n");
         while (1) {
             if (vm_region_recurse(mach_task_self(), &addr, &size, &depth,
                         (vm_region_recurse_info_t)&map, &count) != KERN_SUCCESS) {
@@ -1202,39 +1290,49 @@ rb_vm_bugreport(const void *ctx)
                 depth++;
             }
             else {
-                fprintf(stderr, "%lx-%lx %s%s%s", addr, (addr+size),
+                kprintf("%lx-%lx %s%s%s", addr, (addr+size),
                         ((map.protection & VM_PROT_READ) != 0 ? "r" : "-"),
                         ((map.protection & VM_PROT_WRITE) != 0 ? "w" : "-"),
                     ((map.protection & VM_PROT_EXECUTE) != 0 ? "x" : "-"));
-#ifdef HAVE_LIBPROC_H
+#  ifdef HAVE_LIBPROC_H
                 char buff[PATH_MAX];
                 if (proc_regionfilename(getpid(), addr, buff, sizeof(buff)) > 0) {
-                    fprintf(stderr, " %s", buff);
+                    kprintf(" %s", buff);
                 }
-#endif
-                fprintf(stderr, "\n");
+#  endif
+                kprintf("\n");
             }
 
             addr += size;
             size = 0;
         }
+# endif
 #endif
     }
+    return true;
+
+  error:
+    return false;
 }
 
-void
+bool
 rb_vmdebug_stack_dump_all_threads(void)
 {
     rb_thread_t *th = NULL;
     rb_ractor_t *r = GET_RACTOR();
+    FILE *errout = stderr;
 
     // TODO: now it only shows current ractor
     ccan_list_for_each(&r->threads.set, th, lt_node) {
 #ifdef NON_SCALAR_THREAD_ID
-        fprintf(stderr, "th: %p, native_id: N/A\n", th);
+        kprintf("th: %p, native_id: N/A\n", th);
 #else
-        fprintf(stderr, "th: %p, native_id: %p\n", (void *)th, (void *)(uintptr_t)th->nt->thread_id);
+        kprintf("th: %p, native_id: %p\n", (void *)th, (void *)(uintptr_t)th->nt->thread_id);
 #endif
-        rb_vmdebug_stack_dump_raw(th->ec, th->ec->cfp);
+        if (!rb_vmdebug_stack_dump_raw(th->ec, th->ec->cfp, errout)) goto error;
     }
+    return true;
+
+  error:
+    return false;
 }
diff --git a/vm_eval.c b/vm_eval.c
index 36c665509352d8..dff0e47c7e1290 100644
--- a/vm_eval.c
+++ b/vm_eval.c
@@ -29,15 +29,6 @@ static VALUE rb_eUncaughtThrow;
 static ID id_result, id_tag, id_value;
 #define id_mesg idMesg
 
-typedef enum call_type {
-    CALL_PUBLIC,
-    CALL_FCALL,
-    CALL_VCALL,
-    CALL_PUBLIC_KW,
-    CALL_FCALL_KW,
-    CALL_TYPE_MAX
-} call_type;
-
 static VALUE send_internal(int argc, const VALUE *argv, VALUE recv, call_type scope);
 static VALUE vm_call0_body(rb_execution_context_t* ec, struct rb_calling_info *calling, const VALUE *argv);
 
@@ -224,7 +215,12 @@ vm_call0_body(rb_execution_context_t *ec, struct rb_calling_info *calling, const
                 *reg_cfp->sp++ = argv[i];
             }
 
-            vm_call_iseq_setup(ec, reg_cfp, calling);
+            if (ISEQ_BODY(def_iseq_ptr(vm_cc_cme(cc)->def))->param.flags.forwardable) {
+                vm_call_iseq_fwd_setup(ec, reg_cfp, calling);
+            }
+            else {
+                vm_call_iseq_setup(ec, reg_cfp, calling);
+            }
             VM_ENV_FLAGS_SET(ec->cfp->ep, VM_FRAME_FLAG_FINISH);
             return vm_exec(ec); // CHECK_INTS in this function
         }
@@ -299,11 +295,15 @@ vm_call0_body(rb_execution_context_t *ec, struct rb_calling_info *calling, const
             }
           case OPTIMIZED_METHOD_TYPE_STRUCT_AREF:
             vm_call_check_arity(calling, 0, argv);
-            ret = vm_call_opt_struct_aref0(ec, calling);
+            VM_CALL_METHOD_ATTR(ret,
+                                vm_call_opt_struct_aref0(ec, calling),
+                                (void)0);
             goto success;
           case OPTIMIZED_METHOD_TYPE_STRUCT_ASET:
             vm_call_check_arity(calling, 1, argv);
-            ret = vm_call_opt_struct_aset0(ec, calling, argv[0]);
+            VM_CALL_METHOD_ATTR(ret,
+                                vm_call_opt_struct_aset0(ec, calling, argv[0]),
+                                (void)0);
             goto success;
           default:
             rb_bug("vm_call0: unsupported optimized method type (%d)", vm_cc_cme(cc)->def->body.optimized.type);
@@ -381,7 +381,7 @@ stack_check(rb_execution_context_t *ec)
     if (!rb_ec_raised_p(ec, RAISED_STACKOVERFLOW) &&
         rb_ec_stack_check(ec)) {
         rb_ec_raised_set(ec, RAISED_STACKOVERFLOW);
-        rb_ec_stack_overflow(ec, FALSE);
+        rb_ec_stack_overflow(ec, 0);
     }
 }
 
@@ -399,73 +399,56 @@ NORETURN(static void uncallable_object(VALUE recv, ID mid));
 static inline const rb_callable_method_entry_t *rb_search_method_entry(VALUE recv, ID mid);
 static inline enum method_missing_reason rb_method_call_status(rb_execution_context_t *ec, const rb_callable_method_entry_t *me, call_type scope, VALUE self);
 
-static const struct rb_callcache *
-cc_new(VALUE klass, ID mid, int argc, const rb_callable_method_entry_t *cme)
+static VALUE
+gccct_hash(VALUE klass, VALUE namespace, ID mid)
 {
-    const struct rb_callcache *cc = NULL;
-
-    RB_VM_LOCK_ENTER();
-    {
-        struct rb_class_cc_entries *ccs;
-        struct rb_id_table *cc_tbl = RCLASS_CC_TBL(klass);
-        VALUE ccs_data;
-
-        if (rb_id_table_lookup(cc_tbl, mid, &ccs_data)) {
-            // ok
-            ccs = (struct rb_class_cc_entries *)ccs_data;
-        }
-        else {
-            ccs = vm_ccs_create(klass, cc_tbl, mid, cme);
-        }
+    return ((klass ^ namespace) >> 3) ^ (VALUE)mid;
+}
 
-        for (int i=0; i<ccs->len; i++) {
-            cc = ccs->entries[i].cc;
-            if (vm_cc_cme(cc) == cme) {
-                break;
-            }
-            cc = NULL;
-        }
+NOINLINE(static const struct rb_callcache *gccct_method_search_slowpath(rb_vm_t *vm, VALUE klass, unsigned int index, const struct rb_callinfo * ci));
 
-        if (cc == NULL) {
-            const struct rb_callinfo *ci = vm_ci_new(mid, 0, argc, NULL); // TODO: proper ci
-            cc = vm_cc_new(klass, cme, vm_call_general, cc_type_normal);
-            METHOD_ENTRY_CACHED_SET((struct rb_callable_method_entry_struct *)cme);
-            vm_ccs_push(klass, ccs, ci, cc);
-        }
-    }
-    RB_VM_LOCK_LEAVE();
+static const struct rb_callcache *
+gccct_method_search_slowpath(rb_vm_t *vm, VALUE klass, unsigned int index, const struct rb_callinfo *ci)
+{
+    struct rb_call_data cd = {
+            .ci = ci,
+            .cc = NULL
+    };
 
-    return cc;
-}
+    vm_search_method_slowpath0(vm->self, &cd, klass);
 
-static VALUE
-gccct_hash(VALUE klass, ID mid)
-{
-    return (klass >> 3) ^ (VALUE)mid;
+    return vm->global_cc_cache_table[index] = cd.cc;
 }
 
-NOINLINE(static const struct rb_callcache *gccct_method_search_slowpath(rb_vm_t *vm, VALUE klass, ID mid, int argc, unsigned int index));
-
-static const struct rb_callcache *
-gccct_method_search_slowpath(rb_vm_t *vm, VALUE klass, ID mid, int argc, unsigned int index)
+static void
+scope_to_ci(call_type scope, ID mid, int argc, struct rb_callinfo *ci)
 {
-    const rb_callable_method_entry_t *cme = rb_callable_method_entry(klass, mid);
-    const struct rb_callcache *cc;
+    int flags = 0;
 
-    if (cme != NULL) {
-        cc = cc_new(klass, mid, argc, cme);
-    }
-    else {
-        cc = NULL;
+    switch(scope) {
+      case CALL_PUBLIC:
+        break;
+      case CALL_FCALL:
+        flags |= VM_CALL_FCALL;
+        break;
+      case CALL_VCALL:
+        flags |= VM_CALL_VCALL;
+        break;
+      case CALL_PUBLIC_KW:
+        flags |= VM_CALL_KWARG;
+        break;
+      case CALL_FCALL_KW:
+        flags |= (VM_CALL_KWARG | VM_CALL_FCALL);
+        break;
     }
-
-    return vm->global_cc_cache_table[index] = cc;
+    *ci = VM_CI_ON_STACK(mid, flags, argc, NULL);
 }
 
 static inline const struct rb_callcache *
-gccct_method_search(rb_execution_context_t *ec, VALUE recv, ID mid, int argc)
+gccct_method_search(rb_execution_context_t *ec, VALUE recv, ID mid, const struct rb_callinfo *ci)
 {
-    VALUE klass;
+    VALUE klass, ns_value;
+    const rb_namespace_t *ns = rb_current_namespace();
 
     if (!SPECIAL_CONST_P(recv)) {
         klass = RBASIC_CLASS(recv);
@@ -475,8 +458,14 @@ gccct_method_search(rb_execution_context_t *ec, VALUE recv, ID mid, int argc)
         klass = CLASS_OF(recv);
     }
 
+    if (NAMESPACE_USER_P(ns)) {
+        ns_value = ns->ns_object;
+    }
+    else {
+        ns_value = 0;
+    }
     // search global method cache
-    unsigned int index = (unsigned int)(gccct_hash(klass, mid) % VM_GLOBAL_CC_CACHE_TABLE_SIZE);
+    unsigned int index = (unsigned int)(gccct_hash(klass, ns_value, mid) % VM_GLOBAL_CC_CACHE_TABLE_SIZE);
     rb_vm_t *vm = rb_ec_vm_ptr(ec);
     const struct rb_callcache *cc = vm->global_cc_cache_table[index];
 
@@ -498,24 +487,35 @@ gccct_method_search(rb_execution_context_t *ec, VALUE recv, ID mid, int argc)
     }
 
     RB_DEBUG_COUNTER_INC(gccct_miss);
-    return gccct_method_search_slowpath(vm, klass, mid, argc, index);
+    return gccct_method_search_slowpath(vm, klass, index, ci);
 }
 
-/*!
- * \internal
+VALUE
+rb_gccct_clear_table(VALUE _self)
+{
+    int i;
+    rb_vm_t *vm = GET_VM();
+    for (i=0; i<VM_GLOBAL_CC_CACHE_TABLE_SIZE; i++) {
+        vm->global_cc_cache_table[i] = NULL;
+    }
+    return Qnil;
+}
+
+/**
+ * @internal
  * calls the specified method.
  *
  * This function is called by functions in rb_call* family.
- * \param ec     current execution context
- * \param recv   receiver of the method
- * \param mid    an ID that represents the name of the method
- * \param argc   the number of method arguments
- * \param argv   a pointer to an array of method arguments
- * \param scope
- * \param self   self in the caller. Qundef means no self is considered and
+ * @param ec     current execution context
+ * @param recv   receiver of the method
+ * @param mid    an ID that represents the name of the method
+ * @param argc   the number of method arguments
+ * @param argv   a pointer to an array of method arguments
+ * @param scope
+ * @param self   self in the caller. Qundef means no self is considered and
  *               protected methods cannot be called
  *
- * \note \a self is used in order to controlling access to protected methods.
+ * @note `self` is used in order to controlling access to protected methods.
  */
 static inline VALUE
 rb_call0(rb_execution_context_t *ec,
@@ -539,13 +539,16 @@ rb_call0(rb_execution_context_t *ec,
         break;
     }
 
-    const struct rb_callcache *cc = gccct_method_search(ec, recv, mid, argc);
+    struct rb_callinfo ci;
+    scope_to_ci(scope, mid, argc, &ci);
+
+    const struct rb_callcache *cc = gccct_method_search(ec, recv, mid, &ci);
 
     if (scope == CALL_PUBLIC) {
         RB_DEBUG_COUNTER_INC(call0_public);
 
         const rb_callable_method_entry_t *cc_cme = cc ? vm_cc_cme(cc) : NULL;
-        const rb_callable_method_entry_t *cme = callable_method_entry_refeinements0(CLASS_OF(recv), mid, NULL, true, cc_cme);
+        const rb_callable_method_entry_t *cme = callable_method_entry_refinements0(CLASS_OF(recv), mid, NULL, true, cc_cme);
         call_status = rb_method_call_status(ec, cme, scope, self);
 
         if (UNLIKELY(call_status != MISSING_NONE)) {
@@ -741,13 +744,6 @@ rb_check_funcall_with_hook_kw(VALUE recv, ID mid, int argc, const VALUE *argv,
     return rb_vm_call_kw(ec, recv, mid, argc, argv, me, kw_splat);
 }
 
-VALUE
-rb_check_funcall_with_hook(VALUE recv, ID mid, int argc, const VALUE *argv,
-                           rb_check_funcall_hook *hook, VALUE arg)
-{
-    return rb_check_funcall_with_hook_kw(recv, mid, argc, argv, hook, arg, RB_NO_KEYWORDS);
-}
-
 const char *
 rb_type_str(enum ruby_value_type type)
 {
@@ -796,29 +792,29 @@ uncallable_object(VALUE recv, ID mid)
 
     if (SPECIAL_CONST_P(recv)) {
         rb_raise(rb_eNotImpError,
-                 "method `%"PRIsVALUE"' called on unexpected immediate object (%p)",
+                 "method '%"PRIsVALUE"' called on unexpected immediate object (%p)",
                  mname, (void *)recv);
     }
     else if ((flags = RBASIC(recv)->flags) == 0) {
         rb_raise(rb_eNotImpError,
-                 "method `%"PRIsVALUE"' called on terminated object (%p)",
+                 "method '%"PRIsVALUE"' called on terminated object (%p)",
                  mname, (void *)recv);
     }
     else if (!(typestr = rb_type_str(type = BUILTIN_TYPE(recv)))) {
         rb_raise(rb_eNotImpError,
-                 "method `%"PRIsVALUE"' called on broken T_?""?""?(0x%02x) object"
+                 "method '%"PRIsVALUE"' called on broken T_?""?""?(0x%02x) object"
                  " (%p flags=0x%"PRIxVALUE")",
                  mname, type, (void *)recv, flags);
     }
     else if (T_OBJECT <= type && type < T_NIL) {
         rb_raise(rb_eNotImpError,
-                 "method `%"PRIsVALUE"' called on hidden %s object"
+                 "method '%"PRIsVALUE"' called on hidden %s object"
                  " (%p flags=0x%"PRIxVALUE")",
                  mname, typestr, (void *)recv, flags);
     }
     else {
         rb_raise(rb_eNotImpError,
-                 "method `%"PRIsVALUE"' called on unexpected %s object"
+                 "method '%"PRIsVALUE"' called on unexpected %s object"
                  " (%p flags=0x%"PRIxVALUE")",
                  mname, typestr, (void *)recv, flags);
     }
@@ -877,16 +873,16 @@ rb_method_call_status(rb_execution_context_t *ec, const rb_callable_method_entry
 }
 
 
-/*!
- * \internal
+/**
+ * @internal
  * calls the specified method.
  *
  * This function is called by functions in rb_call* family.
- * \param recv   receiver
- * \param mid    an ID that represents the name of the method
- * \param argc   the number of method arguments
- * \param argv   a pointer to an array of method arguments
- * \param scope
+ * @param recv   receiver
+ * @param mid    an ID that represents the name of the method
+ * @param argc   the number of method arguments
+ * @param argv   a pointer to an array of method arguments
+ * @param scope
  */
 static inline VALUE
 rb_call(VALUE recv, ID mid, int argc, const VALUE *argv, call_type scope)
@@ -952,7 +948,7 @@ rb_make_no_method_exception(VALUE exc, VALUE format, VALUE obj,
     VALUE name = argv[0];
 
     if (!format) {
-        format = rb_fstring_lit("undefined method `%1$s' for %3$s%4$s");
+        format = rb_fstring_lit("undefined method '%1$s' for %3$s%4$s");
     }
     if (exc == rb_eNoMethodError) {
         VALUE args = rb_ary_new4(argc - 1, argv + 1);
@@ -982,17 +978,17 @@ raise_method_missing(rb_execution_context_t *ec, int argc, const VALUE *argv, VA
     stack_check(ec);
 
     if (last_call_status & MISSING_PRIVATE) {
-        format = rb_fstring_lit("private method `%1$s' called for %3$s%4$s");
+        format = rb_fstring_lit("private method '%1$s' called for %3$s%4$s");
     }
     else if (last_call_status & MISSING_PROTECTED) {
-        format = rb_fstring_lit("protected method `%1$s' called for %3$s%4$s");
+        format = rb_fstring_lit("protected method '%1$s' called for %3$s%4$s");
     }
     else if (last_call_status & MISSING_VCALL) {
-        format = rb_fstring_lit("undefined local variable or method `%1$s' for %3$s%4$s");
+        format = rb_fstring_lit("undefined local variable or method '%1$s' for %3$s%4$s");
         exc = rb_eNameError;
     }
     else if (last_call_status & MISSING_SUPER) {
-        format = rb_fstring_lit("super: no superclass method `%1$s' for %3$s%4$s");
+        format = rb_fstring_lit("super: no superclass method '%1$s' for %3$s%4$s");
     }
 
     {
@@ -1056,7 +1052,11 @@ static inline VALUE
 rb_funcallv_scope(VALUE recv, ID mid, int argc, const VALUE *argv, call_type scope)
 {
     rb_execution_context_t *ec = GET_EC();
-    const struct rb_callcache *cc = gccct_method_search(ec, recv, mid, argc);
+
+    struct rb_callinfo ci;
+    scope_to_ci(scope, mid, argc, &ci);
+
+    const struct rb_callcache *cc = gccct_method_search(ec, recv, mid, &ci);
     VALUE self = ec->cfp->self;
 
     if (LIKELY(cc) &&
@@ -1137,15 +1137,15 @@ rb_funcall(VALUE recv, ID mid, int n, ...)
     return rb_funcallv(recv, mid, n, argv);
 }
 
-/*!
+/**
  * Calls a method only if it is the basic method of `ancestor`
  * otherwise returns Qundef;
- * \param recv   receiver of the method
- * \param mid    an ID that represents the name of the method
- * \param ancestor the Class that defined the basic method
- * \param argc   the number of arguments
- * \param argv   pointer to an array of method arguments
- * \param kw_splat bool
+ * @param recv   receiver of the method
+ * @param mid    an ID that represents the name of the method
+ * @param ancestor the Class that defined the basic method
+ * @param argc   the number of arguments
+ * @param argv   pointer to an array of method arguments
+ * @param kw_splat bool
  */
 VALUE
 rb_check_funcall_basic_kw(VALUE recv, ID mid, VALUE ancestor, int argc, const VALUE *argv, int kw_splat)
@@ -1569,6 +1569,37 @@ rb_block_call_kw(VALUE obj, ID mid, int argc, const VALUE * argv,
     return rb_iterate_internal(iterate_method, (VALUE)&arg, bl_proc, data2);
 }
 
+/*
+ * A flexible variant of rb_block_call and rb_block_call_kw.
+ * This function accepts flags:
+ *
+ *   RB_NO_KEYWORDS, RB_PASS_KEYWORDS, RB_PASS_CALLED_KEYWORDS:
+ *   Works as the same as rb_block_call_kw.
+ *
+ *   RB_BLOCK_NO_USE_PACKED_ARGS:
+ *   The given block ("bl_proc") does not use "yielded_arg" of rb_block_call_func_t.
+ *   Instead, the block accesses the yielded arguments via "argc" and "argv".
+ *   This flag allows the called method to yield arguments without allocating an Array.
+ */
+VALUE
+rb_block_call2(VALUE obj, ID mid, int argc, const VALUE *argv,
+               rb_block_call_func_t bl_proc, VALUE data2, long flags)
+{
+    struct iter_method_arg arg;
+
+    arg.obj = obj;
+    arg.mid = mid;
+    arg.argc = argc;
+    arg.argv = argv;
+    arg.kw_splat = flags & 1;
+
+    struct vm_ifunc *ifunc = rb_vm_ifunc_proc_new(bl_proc, (void *)data2);
+    if (flags & RB_BLOCK_NO_USE_PACKED_ARGS)
+        ifunc->flags |= IFUNC_YIELD_OPTIMIZABLE;
+
+    return rb_iterate0(iterate_method, (VALUE)&arg, ifunc, GET_EC());
+}
+
 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,
@@ -1633,18 +1664,249 @@ get_eval_default_path(void)
 
     if (!eval_default_path) {
         eval_default_path = rb_fstring_lit("(eval)");
-        rb_gc_register_mark_object(eval_default_path);
+        rb_vm_register_global_object(eval_default_path);
     }
     return eval_default_path;
 }
 
 static const rb_iseq_t *
-eval_make_iseq(VALUE src, VALUE fname, int line, const rb_binding_t *bind,
+pm_eval_make_iseq(VALUE src, VALUE fname, int line,
+        const struct rb_block *base_block)
+{
+    const rb_iseq_t *const parent = vm_block_iseq(base_block);
+    const rb_iseq_t *iseq = parent;
+    VALUE name = rb_fstring_lit("<compiled>");
+
+    // Conditionally enable coverage depending on the current mode:
+    int coverage_enabled = ((rb_get_coverage_mode() & COVERAGE_TARGET_EVAL) != 0) ? 1 : 0;
+
+    if (!fname) {
+        fname = rb_source_location(&line);
+    }
+
+    if (!UNDEF_P(fname)) {
+        if (!NIL_P(fname)) fname = rb_fstring(fname);
+    }
+    else {
+        fname = get_eval_default_path();
+        coverage_enabled = 0;
+    }
+
+    pm_parse_result_t result = { 0 };
+    pm_options_line_set(&result.options, line);
+    result.node.coverage_enabled = coverage_enabled;
+
+    // Cout scopes, one for each parent iseq, plus one for our local scope
+    int scopes_count = 0;
+    do {
+        scopes_count++;
+    } while ((iseq = ISEQ_BODY(iseq)->parent_iseq));
+    pm_options_scopes_init(&result.options, scopes_count + 1);
+
+    // Walk over the scope tree, adding known locals at the correct depths. The
+    // scope array should be deepest -> shallowest. so lower indexes in the
+    // scopes array refer to root nodes on the tree, and higher indexes are the
+    // leaf nodes.
+    iseq = parent;
+    rb_encoding *encoding = rb_enc_get(src);
+
+#define FORWARDING_POSITIONALS_CHR '*'
+#define FORWARDING_POSITIONALS_STR "*"
+#define FORWARDING_KEYWORDS_CHR ':'
+#define FORWARDING_KEYWORDS_STR ":"
+#define FORWARDING_BLOCK_CHR '&'
+#define FORWARDING_BLOCK_STR "&"
+#define FORWARDING_ALL_CHR '.'
+#define FORWARDING_ALL_STR "."
+
+    for (int scopes_index = 0; scopes_index < scopes_count; scopes_index++) {
+        VALUE iseq_value = (VALUE)iseq;
+        int locals_count = ISEQ_BODY(iseq)->local_table_size;
+
+        pm_options_scope_t *options_scope = &result.options.scopes[scopes_count - scopes_index - 1];
+        pm_options_scope_init(options_scope, locals_count);
+
+        uint8_t forwarding = PM_OPTIONS_SCOPE_FORWARDING_NONE;
+
+        for (int local_index = 0; local_index < locals_count; local_index++) {
+            pm_string_t *scope_local = &options_scope->locals[local_index];
+            ID local = ISEQ_BODY(iseq)->local_table[local_index];
+
+            if (rb_is_local_id(local)) {
+                VALUE name_obj = rb_id2str(local);
+                const char *name = RSTRING_PTR(name_obj);
+                size_t length = strlen(name);
+
+                // Explicitly skip numbered parameters. These should not be sent
+                // into the eval.
+                if (length == 2 && name[0] == '_' && name[1] >= '1' && name[1] <= '9') {
+                    continue;
+                }
+
+                // Check here if this local can be represented validly in the
+                // encoding of the source string. If it _cannot_, then it should
+                // not be added to the constant pool as it would not be able to
+                // be referenced anyway.
+                if (rb_enc_str_coderange_scan(name_obj, encoding) == ENC_CODERANGE_BROKEN) {
+                    continue;
+                }
+
+                /* We need to duplicate the string because the Ruby string may
+                 * be embedded so compaction could move the string and the pointer
+                 * will change. */
+                char *name_dup = xmalloc(length + 1);
+                strlcpy(name_dup, name, length + 1);
+
+                RB_GC_GUARD(name_obj);
+
+                pm_string_owned_init(scope_local, (uint8_t *) name_dup, length);
+            }
+            else if (local == idMULT) {
+                forwarding |= PM_OPTIONS_SCOPE_FORWARDING_POSITIONALS;
+                pm_string_constant_init(scope_local, FORWARDING_POSITIONALS_STR, 1);
+            }
+            else if (local == idPow) {
+                forwarding |= PM_OPTIONS_SCOPE_FORWARDING_KEYWORDS;
+                pm_string_constant_init(scope_local, FORWARDING_KEYWORDS_STR, 1);
+            }
+            else if (local == idAnd) {
+                forwarding |= PM_OPTIONS_SCOPE_FORWARDING_BLOCK;
+                pm_string_constant_init(scope_local, FORWARDING_BLOCK_STR, 1);
+            }
+            else if (local == idDot3) {
+                forwarding |= PM_OPTIONS_SCOPE_FORWARDING_ALL;
+                pm_string_constant_init(scope_local, FORWARDING_ALL_STR, 1);
+            }
+        }
+
+        pm_options_scope_forwarding_set(options_scope, forwarding);
+        iseq = ISEQ_BODY(iseq)->parent_iseq;
+
+        /* We need to GC guard the iseq because the code above malloc memory
+         * which could trigger a GC. Since we only use ISEQ_BODY, the compiler
+         * may optimize out the iseq local variable so we need to GC guard it. */
+        RB_GC_GUARD(iseq_value);
+    }
+
+    // Add our empty local scope at the very end of the array for our eval
+    // scope's locals.
+    pm_options_scope_init(&result.options.scopes[scopes_count], 0);
+
+    VALUE script_lines;
+    VALUE error = pm_parse_string(&result, src, fname, ruby_vm_keep_script_lines ? &script_lines : NULL);
+
+    // If the parse failed, clean up and raise.
+    if (error != Qnil) {
+        pm_parse_result_free(&result);
+        rb_exc_raise(error);
+    }
+
+    // Create one scope node for each scope passed in, initialize the local
+    // lookup table with all the local variable information attached to the
+    // scope used by the parser.
+    pm_scope_node_t *node = &result.node;
+    iseq = parent;
+
+    for (int scopes_index = 0; scopes_index < scopes_count; scopes_index++) {
+        pm_scope_node_t *parent_scope = ruby_xcalloc(1, sizeof(pm_scope_node_t));
+        RUBY_ASSERT(parent_scope != NULL);
+
+        pm_options_scope_t *options_scope = &result.options.scopes[scopes_count - scopes_index - 1];
+        parent_scope->coverage_enabled = coverage_enabled;
+        parent_scope->parser = &result.parser;
+        parent_scope->index_lookup_table = st_init_numtable();
+
+        int locals_count = ISEQ_BODY(iseq)->local_table_size;
+        parent_scope->local_table_for_iseq_size = locals_count;
+        pm_constant_id_list_init(&parent_scope->locals);
+
+        for (int local_index = 0; local_index < locals_count; local_index++) {
+            const pm_string_t *scope_local = &options_scope->locals[local_index];
+            pm_constant_id_t constant_id = 0;
+
+            const uint8_t *source = pm_string_source(scope_local);
+            size_t length = pm_string_length(scope_local);
+
+            if (length > 0) {
+                if (length == 1) {
+                    switch (*source) {
+                      case FORWARDING_POSITIONALS_CHR:
+                        constant_id = PM_CONSTANT_MULT;
+                        break;
+                      case FORWARDING_KEYWORDS_CHR:
+                        constant_id = PM_CONSTANT_POW;
+                        break;
+                      case FORWARDING_BLOCK_CHR:
+                        constant_id = PM_CONSTANT_AND;
+                        break;
+                      case FORWARDING_ALL_CHR:
+                        constant_id = PM_CONSTANT_DOT3;
+                        break;
+                      default:
+                        constant_id = pm_constant_pool_insert_constant(&result.parser.constant_pool, source, length);
+                        break;
+                    }
+                }
+                else {
+                    constant_id = pm_constant_pool_insert_constant(&result.parser.constant_pool, source, length);
+                }
+
+                st_insert(parent_scope->index_lookup_table, (st_data_t) constant_id, (st_data_t) local_index);
+            }
+
+            pm_constant_id_list_append(&parent_scope->locals, constant_id);
+        }
+
+        node->previous = parent_scope;
+        node = parent_scope;
+        iseq = ISEQ_BODY(iseq)->parent_iseq;
+    }
+
+#undef FORWARDING_POSITIONALS_CHR
+#undef FORWARDING_POSITIONALS_STR
+#undef FORWARDING_KEYWORDS_CHR
+#undef FORWARDING_KEYWORDS_STR
+#undef FORWARDING_BLOCK_CHR
+#undef FORWARDING_BLOCK_STR
+#undef FORWARDING_ALL_CHR
+#undef FORWARDING_ALL_STR
+
+    int error_state;
+    iseq = pm_iseq_new_eval(&result.node, name, fname, Qnil, line, parent, 0, &error_state);
+
+    pm_scope_node_t *prev = result.node.previous;
+    while (prev) {
+        pm_scope_node_t *next = prev->previous;
+        pm_constant_id_list_free(&prev->locals);
+        pm_scope_node_destroy(prev);
+        ruby_xfree(prev);
+        prev = next;
+    }
+
+    pm_parse_result_free(&result);
+
+    // If there was an error, raise it after memory has been cleaned up
+    if (error_state) {
+        RUBY_ASSERT(iseq == NULL);
+        rb_jump_tag(error_state);
+    }
+
+    rb_exec_event_hook_script_compiled(GET_EC(), iseq, src);
+
+    return iseq;
+}
+
+static const rb_iseq_t *
+eval_make_iseq(VALUE src, VALUE fname, int line,
                const struct rb_block *base_block)
 {
+    if (rb_ruby_prism_p()) {
+        return pm_eval_make_iseq(src, fname, line, base_block);
+    }
     const VALUE parser = rb_parser_new();
     const rb_iseq_t *const parent = vm_block_iseq(base_block);
     rb_iseq_t *iseq = NULL;
+    VALUE ast_value;
     rb_ast_t *ast;
     int isolated_depth = 0;
 
@@ -1681,11 +1943,14 @@ eval_make_iseq(VALUE src, VALUE fname, int line, const rb_binding_t *bind,
     }
 
     rb_parser_set_context(parser, parent, FALSE);
-    rb_parser_set_script_lines(parser, RBOOL(ruby_vm_keep_script_lines));
-    ast = rb_parser_compile_string_path(parser, fname, src, line);
+    if (ruby_vm_keep_script_lines) rb_parser_set_script_lines(parser);
+    ast_value = rb_parser_compile_string_path(parser, fname, src, line);
+
+    ast = rb_ruby_ast_data_get(ast_value);
+
     if (ast->body.root) {
         ast->body.coverage_enabled = coverage_enabled;
-        iseq = rb_iseq_new_eval(&ast->body,
+        iseq = rb_iseq_new_eval(ast_value,
                                 ISEQ_BODY(parent)->location.label,
                                 fname, Qnil, line,
                                 parent, isolated_depth);
@@ -1720,7 +1985,7 @@ eval_string_with_cref(VALUE self, VALUE src, rb_cref_t *cref, VALUE file, int li
     block.as.captured.code.iseq = cfp->iseq;
     block.type = block_type_iseq;
 
-    iseq = eval_make_iseq(src, file, line, NULL, &block);
+    iseq = eval_make_iseq(src, file, line, &block);
     if (!iseq) {
         rb_exc_raise(ec->errinfo);
     }
@@ -1731,6 +1996,7 @@ eval_string_with_cref(VALUE self, VALUE src, rb_cref_t *cref, VALUE file, int li
         cref = vm_cref_dup(orig_cref);
     }
     vm_set_eval_stack(ec, iseq, cref, &block);
+    // TODO: set the namespace frame
 
     /* kick */
     return vm_exec(ec);
@@ -1741,7 +2007,7 @@ eval_string_with_scope(VALUE scope, VALUE src, VALUE file, int line)
 {
     rb_execution_context_t *ec = GET_EC();
     rb_binding_t *bind = Check_TypedStruct(scope, &ruby_binding_data_type);
-    const rb_iseq_t *iseq = eval_make_iseq(src, file, line, bind, &bind->block);
+    const rb_iseq_t *iseq = eval_make_iseq(src, file, line, &bind->block);
     if (!iseq) {
         rb_exc_raise(ec->errinfo);
     }
@@ -1753,6 +2019,8 @@ eval_string_with_scope(VALUE scope, VALUE src, VALUE file, int line)
         vm_bind_update_env(scope, bind, vm_make_env_object(ec, ec->cfp));
     }
 
+    // TODO: set the namespace frame
+
     /* kick */
     return vm_exec(ec);
 }
@@ -1783,7 +2051,7 @@ rb_f_eval(int argc, const VALUE *argv, VALUE self)
     int line = 1;
 
     rb_scan_args(argc, argv, "13", &src, &scope, &vfile, &vline);
-    SafeStringValue(src);
+    StringValue(src);
     if (argc >= 3) {
         StringValue(vfile);
     }
@@ -1961,13 +2229,14 @@ rb_yield_refine_block(VALUE refinement, VALUE refinements)
     else {
         const struct rb_captured_block *captured = VM_BH_TO_ISEQ_BLOCK(block_handler);
         struct rb_captured_block new_captured = *captured;
+        const VALUE *const argv = &new_captured.self; /* dummy to suppress nonnull warning from gcc */
         VALUE new_block_handler = VM_BH_FROM_ISEQ_BLOCK(&new_captured);
         const VALUE *ep = captured->ep;
         rb_cref_t *cref = vm_cref_push(ec, refinement, ep, TRUE, FALSE);
         CREF_REFINEMENTS_SET(cref, refinements);
         VM_FORCE_WRITE_SPECIAL_CONST(&VM_CF_LEP(ec->cfp)[VM_ENV_DATA_INDEX_SPECVAL], new_block_handler);
         new_captured.self = refinement;
-        return vm_yield_with_cref(ec, 0, NULL, RB_NO_KEYWORDS, cref, FALSE);
+        return vm_yield_with_cref(ec, 0, argv, RB_NO_KEYWORDS, cref, FALSE);
     }
 }
 
@@ -1976,7 +2245,7 @@ static VALUE
 eval_under(VALUE self, int singleton, VALUE src, VALUE file, int line)
 {
     rb_cref_t *cref = vm_cref_push(GET_EC(), self, NULL, FALSE, singleton);
-    SafeStringValue(src);
+    StringValue(src);
 
     return eval_string_with_cref(self, src, cref, file, line);
 }
@@ -1995,7 +2264,7 @@ specific_eval(int argc, const VALUE *argv, VALUE self, int singleton, int kw_spl
 
         rb_check_arity(argc, 1, 3);
         code = argv[0];
-        SafeStringValue(code);
+        StringValue(code);
         if (argc > 2)
             line = NUM2INT(argv[2]);
         if (argc > 1) {
@@ -2417,11 +2686,31 @@ local_var_list_update(st_data_t *key, st_data_t *value, st_data_t arg, int exist
     return ST_CONTINUE;
 }
 
+extern int rb_numparam_id_p(ID id);
+
 static void
 local_var_list_add(const struct local_var_list *vars, ID lid)
 {
-    if (lid && rb_is_local_id(lid)) {
-        /* should skip temporary variable */
+    /* should skip temporary variable */
+    if (!lid) return;
+    if (!rb_is_local_id(lid)) return;
+
+    /* should skip numbered parameters as well */
+    if (rb_numparam_id_p(lid)) return;
+
+    st_data_t idx = 0;	/* tbl->num_entries */
+    rb_hash_stlike_update(vars->tbl, ID2SYM(lid), local_var_list_update, idx);
+}
+
+static void
+numparam_list_add(const struct local_var_list *vars, ID lid)
+{
+    /* should skip temporary variable */
+    if (!lid) return;
+    if (!rb_is_local_id(lid)) return;
+
+    /* should skip anything but numbered parameters */
+    if (rb_numparam_id_p(lid)) {
         st_data_t idx = 0;	/* tbl->num_entries */
         rb_hash_stlike_update(vars->tbl, ID2SYM(lid), local_var_list_update, idx);
     }
@@ -2549,6 +2838,17 @@ rb_current_realfilepath(void)
     return Qnil;
 }
 
+// Assert that an internal function is running and return
+// the imemo object that represents it.
+struct vm_ifunc *
+rb_current_ifunc(void)
+{
+    // Search VM_FRAME_MAGIC_IFUNC to see ifunc imemos put on the iseq field.
+    VALUE ifunc = (VALUE)GET_EC()->cfp->iseq;
+    RUBY_ASSERT_ALWAYS(imemo_type_p(ifunc, imemo_ifunc));
+    return (struct vm_ifunc *)ifunc;
+}
+
 void
 Init_vm_eval(void)
 {
diff --git a/vm_exec.h b/vm_exec.h
index 152410a6a738bf..c3b7d4e48882c3 100644
--- a/vm_exec.h
+++ b/vm_exec.h
@@ -167,7 +167,7 @@ default:                        \
 
 // Run the interpreter from the JIT
 #define VM_EXEC(ec, val) do { \
-    if (val == Qundef) { \
+    if (UNDEF_P(val)) { \
         VM_ENV_FLAGS_SET(ec->cfp->ep, VM_FRAME_FLAG_FINISH); \
         val = vm_exec(ec); \
     } \
@@ -176,9 +176,9 @@ default:                        \
 // Run the JIT from the interpreter
 #define JIT_EXEC(ec, val) do { \
     rb_jit_func_t func; \
-    if (val == Qundef && (func = jit_compile(ec))) { \
+    /* don't run tailcalls since that breaks FINISH */ \
+    if (UNDEF_P(val) && GET_CFP() != ec->cfp && (func = jit_compile(ec))) { \
         val = func(ec, ec->cfp); \
-        RESTORE_REGS(); /* fix cfp for tailcall */ \
         if (ec->tag->state) THROW_EXCEPTION(val); \
     } \
 } while (0)
diff --git a/vm_insnhelper.c b/vm_insnhelper.c
index a325d070a252db..d5eb84e691d4b5 100644
--- a/vm_insnhelper.c
+++ b/vm_insnhelper.c
@@ -12,6 +12,10 @@
 
 #include <math.h>
 
+#ifdef HAVE_STDATOMIC_H
+  #include <stdatomic.h>
+#endif
+
 #include "constant.h"
 #include "debug_counter.h"
 #include "internal.h"
@@ -22,6 +26,7 @@
 #include "internal/proc.h"
 #include "internal/random.h"
 #include "internal/variable.h"
+#include "internal/set_table.h"
 #include "internal/struct.h"
 #include "variable.h"
 
@@ -74,25 +79,21 @@ vm_stackoverflow(void)
     ec_stack_overflow(GET_EC(), TRUE);
 }
 
-NORETURN(void rb_ec_stack_overflow(rb_execution_context_t *ec, int crit));
 void
-rb_ec_stack_overflow(rb_execution_context_t *ec, int crit)
+rb_ec_stack_overflow(rb_execution_context_t *ec, ruby_stack_overflow_critical_level crit)
 {
     if (rb_during_gc()) {
         rb_bug("system stack overflow during GC. Faulty native extension?");
     }
-    if (crit) {
+    if (crit >= rb_stack_overflow_fatal) {
         ec->raised_flag = RAISED_STACKOVERFLOW;
         ec->errinfo = rb_ec_vm_ptr(ec)->special_exceptions[ruby_error_stackfatal];
         EC_JUMP_TAG(ec, TAG_RAISE);
     }
-#ifdef USE_SIGALTSTACK
-    ec_stack_overflow(ec, TRUE);
-#else
-    ec_stack_overflow(ec, FALSE);
-#endif
+    ec_stack_overflow(ec, crit < rb_stack_overflow_signal);
 }
 
+static inline void stack_check(rb_execution_context_t *ec);
 
 #if VM_CHECK_MODE > 0
 static int
@@ -127,7 +128,7 @@ callable_method_entry_p(const rb_callable_method_entry_t *cme)
         return TRUE;
     }
     else {
-        VM_ASSERT(IMEMO_TYPE_P((VALUE)cme, imemo_ment));
+        VM_ASSERT(IMEMO_TYPE_P((VALUE)cme, imemo_ment), "imemo_type:%s", rb_imemo_name(imemo_type((VALUE)cme)));
 
         if (callable_class_p(cme->defined_class)) {
             return TRUE;
@@ -169,7 +170,7 @@ vm_check_frame_detail(VALUE type, int req_block, int req_me, int req_cref, VALUE
         }
         else { /* cref or Qfalse */
             if (cref_or_me != Qfalse && cref_or_me_type != imemo_cref) {
-                if (((type & VM_FRAME_FLAG_LAMBDA) || magic == VM_FRAME_MAGIC_IFUNC) && (cref_or_me_type == imemo_ment)) {
+                if (((type & VM_FRAME_FLAG_LAMBDA) || magic == VM_FRAME_MAGIC_IFUNC || magic == VM_FRAME_MAGIC_DUMMY) && (cref_or_me_type == imemo_ment)) {
                     /* ignore */
                 }
                 else {
@@ -232,6 +233,23 @@ vm_check_frame(VALUE type,
 static VALUE vm_stack_canary; /* Initialized later */
 static bool vm_stack_canary_was_born = false;
 
+// Return the index of the instruction right before the given PC.
+// This is needed because insn_entry advances PC before the insn body.
+static unsigned int
+previous_insn_index(const rb_iseq_t *iseq, const VALUE *pc)
+{
+    unsigned int pos = 0;
+    while (pos < ISEQ_BODY(iseq)->iseq_size) {
+        int opcode = rb_vm_insn_addr2opcode((void *)ISEQ_BODY(iseq)->iseq_encoded[pos]);
+        unsigned int next_pos = pos + insn_len(opcode);
+        if (ISEQ_BODY(iseq)->iseq_encoded + next_pos == pc) {
+            return pos;
+        }
+        pos = next_pos;
+    }
+    rb_bug("failed to find the previous insn");
+}
+
 void
 rb_vm_check_canary(const rb_execution_context_t *ec, VALUE *sp)
 {
@@ -258,15 +276,14 @@ rb_vm_check_canary(const rb_execution_context_t *ec, VALUE *sp)
     }
 
     const VALUE *orig = rb_iseq_original_iseq(iseq);
-    const VALUE *encoded = ISEQ_BODY(iseq)->iseq_encoded;
-    const ptrdiff_t pos = GET_PC() - encoded;
-    const enum ruby_vminsn_type insn = (enum ruby_vminsn_type)orig[pos];
-    const char *name = insn_name(insn);
     const VALUE iseqw = rb_iseqw_new(iseq);
     const VALUE inspection = rb_inspect(iseqw);
     const char *stri = rb_str_to_cstr(inspection);
     const VALUE disasm = rb_iseq_disasm(iseq);
     const char *strd = rb_str_to_cstr(disasm);
+    const ptrdiff_t pos = previous_insn_index(iseq, GET_PC());
+    const enum ruby_vminsn_type insn = (enum ruby_vminsn_type)orig[pos];
+    const char *name = insn_name(insn);
 
     /* rb_bug() is not capable of outputting this large contents.  It
        is designed to run form a SIGSEGV handler, which tends to be
@@ -336,6 +353,17 @@ vm_push_frame_debug_counter_inc(
 #define vm_push_frame_debug_counter_inc(ec, cfp, t) /* void */
 #endif
 
+// Return a poison value to be set above the stack top to verify leafness.
+VALUE
+rb_vm_stack_canary(void)
+{
+#if VM_CHECK_MODE > 0
+    return vm_stack_canary;
+#else
+    return 0;
+#endif
+}
+
 STATIC_ASSERT(VM_ENV_DATA_INDEX_ME_CREF, VM_ENV_DATA_INDEX_ME_CREF == -2);
 STATIC_ASSERT(VM_ENV_DATA_INDEX_SPECVAL, VM_ENV_DATA_INDEX_SPECVAL == -1);
 STATIC_ASSERT(VM_ENV_DATA_INDEX_FLAGS,   VM_ENV_DATA_INDEX_FLAGS   == -0);
@@ -384,9 +412,17 @@ vm_push_frame(rb_execution_context_t *ec,
 #if VM_DEBUG_BP_CHECK
         .bp_check   = sp,
 #endif
-        .jit_return = NULL
+        .jit_return = NULL,
     };
 
+    /* Ensure the initialization of `*cfp` above never gets reordered with the update of `ec->cfp` below.
+    This is a no-op in all cases we've looked at (https://godbolt.org/z/3oxd1446K), but should guarantee it for all
+    future/untested compilers/platforms. */
+
+    #if defined HAVE_DECL_ATOMIC_SIGNAL_FENCE && HAVE_DECL_ATOMIC_SIGNAL_FENCE
+    atomic_signal_fence(memory_order_seq_cst);
+    #endif
+
     ec->cfp = cfp;
 
     if (VMDEBUG == 2) {
@@ -400,7 +436,6 @@ rb_vm_pop_frame_no_int(rb_execution_context_t *ec)
 {
     rb_control_frame_t *cfp = ec->cfp;
 
-    if (VM_CHECK_MODE >= 4) rb_gc_verify_internal_consistency();
     if (VMDEBUG == 2)       SDR();
 
     ec->cfp = RUBY_VM_PREVIOUS_CONTROL_FRAME(cfp);
@@ -412,7 +447,6 @@ vm_pop_frame(rb_execution_context_t *ec, rb_control_frame_t *cfp, const VALUE *e
 {
     VALUE flags = ep[VM_ENV_DATA_INDEX_FLAGS];
 
-    if (VM_CHECK_MODE >= 4) rb_gc_verify_internal_consistency();
     if (VMDEBUG == 2)       SDR();
 
     RUBY_VM_CHECK_INTS(ec);
@@ -431,15 +465,8 @@ rb_vm_pop_frame(rb_execution_context_t *ec)
 VALUE
 rb_vm_push_frame_fname(rb_execution_context_t *ec, VALUE fname)
 {
-    VALUE tmpbuf = rb_imemo_tmpbuf_auto_free_pointer();
-    void *ptr = ruby_xcalloc(sizeof(struct rb_iseq_constant_body) + sizeof(struct rb_iseq_struct), 1);
-    rb_imemo_tmpbuf_set_ptr(tmpbuf, ptr);
-
-    struct rb_iseq_struct *dmy_iseq = (struct rb_iseq_struct *)ptr;
-    struct rb_iseq_constant_body *dmy_body = (struct rb_iseq_constant_body *)&dmy_iseq[1];
-    dmy_iseq->body = dmy_body;
-    dmy_body->type = ISEQ_TYPE_TOP;
-    dmy_body->location.pathobj = fname;
+    rb_iseq_t *rb_iseq_alloc_with_dummy_path(VALUE fname);
+    rb_iseq_t *dmy_iseq = rb_iseq_alloc_with_dummy_path(fname);
 
     vm_push_frame(ec,
                   dmy_iseq, //const rb_iseq_t *iseq,
@@ -452,7 +479,7 @@ rb_vm_push_frame_fname(rb_execution_context_t *ec, VALUE fname)
                   0, // int local_size,
                   0); // int stack_max
 
-    return tmpbuf;
+    return (VALUE)dmy_iseq;
 }
 
 /* method dispatch */
@@ -493,6 +520,7 @@ vm_env_write_slowpath(const VALUE *ep, int index, VALUE v)
     RB_DEBUG_COUNTER_INC(lvar_set_slowpath);
 }
 
+// YJIT assumes this function never runs GC
 static inline void
 vm_env_write(const VALUE *ep, int index, VALUE v)
 {
@@ -611,7 +639,12 @@ lep_svar_get(const rb_execution_context_t *ec, const VALUE *lep, rb_num_t key)
 static struct vm_svar *
 svar_new(VALUE obj)
 {
-    return (struct vm_svar *)rb_imemo_new(imemo_svar, Qnil, Qnil, Qnil, obj);
+    struct vm_svar *svar = IMEMO_NEW(struct vm_svar, imemo_svar, obj);
+    *((VALUE *)&svar->lastline) = Qnil;
+    *((VALUE *)&svar->backref) = Qnil;
+    *((VALUE *)&svar->others) = Qnil;
+
+    return svar;
 }
 
 static void
@@ -923,8 +956,8 @@ vm_get_const_key_cref(const VALUE *ep)
     const rb_cref_t *key_cref = cref;
 
     while (cref) {
-        if (FL_TEST(CREF_CLASS(cref), FL_SINGLETON) ||
-                RCLASS_EXT(CREF_CLASS(cref))->cloned) {
+        if (RCLASS_SINGLETON_P(CREF_CLASS(cref)) ||
+                RCLASS_CLONED_P(CREF_CLASS(cref)) ) {
             return key_cref;
         }
         cref = CREF_NEXT(cref);
@@ -934,23 +967,37 @@ vm_get_const_key_cref(const VALUE *ep)
     return NULL;
 }
 
-void
-rb_vm_rewrite_cref(rb_cref_t *cref, VALUE old_klass, VALUE new_klass, rb_cref_t **new_cref_ptr)
+rb_cref_t *
+rb_vm_rewrite_cref(rb_cref_t *cref, VALUE old_klass, VALUE new_klass)
 {
-    rb_cref_t *new_cref;
+    rb_cref_t *new_cref_head = NULL;
+    rb_cref_t *new_cref_tail = NULL;
+
+    #define ADD_NEW_CREF(new_cref) \
+        if (new_cref_tail) { \
+            RB_OBJ_WRITE(new_cref_tail, &new_cref_tail->next, new_cref); \
+        } \
+        else { \
+            new_cref_head = new_cref; \
+        } \
+        new_cref_tail = new_cref;
 
     while (cref) {
+        rb_cref_t *new_cref;
         if (CREF_CLASS(cref) == old_klass) {
             new_cref = vm_cref_new_use_prev(new_klass, METHOD_VISI_UNDEF, FALSE, cref, FALSE);
-            *new_cref_ptr = new_cref;
-            return;
+            ADD_NEW_CREF(new_cref);
+            return new_cref_head;
         }
         new_cref = vm_cref_new_use_prev(CREF_CLASS(cref), METHOD_VISI_UNDEF, FALSE, cref, FALSE);
         cref = CREF_NEXT(cref);
-        *new_cref_ptr = new_cref;
-        new_cref_ptr = &new_cref->next;
+        ADD_NEW_CREF(new_cref);
     }
-    *new_cref_ptr = NULL;
+
+    #undef ADD_NEW_CREF
+
+    // Could we just reuse the original cref?
+    return new_cref_head;
 }
 
 static rb_cref_t *
@@ -1137,7 +1184,7 @@ vm_get_cvar_base(const rb_cref_t *cref, const rb_control_frame_t *cfp, int top_l
     }
 
     while (CREF_NEXT(cref) &&
-           (NIL_P(CREF_CLASS(cref)) || FL_TEST(CREF_CLASS(cref), FL_SINGLETON) ||
+           (NIL_P(CREF_CLASS(cref)) || RCLASS_SINGLETON_P(CREF_CLASS(cref)) ||
             CREF_PUSHED_BY_EVAL(cref) || CREF_SINGLETON(cref))) {
         cref = CREF_NEXT(cref);
     }
@@ -1170,33 +1217,25 @@ fill_ivar_cache(const rb_iseq_t *iseq, IVC ic, const struct rb_callcache *cc, in
 #define ractor_object_incidental_shareable_p(obj, val) \
     ractor_incidental_shareable_p(rb_ractor_shareable_p(obj), val)
 
-#define ATTR_INDEX_NOT_SET (attr_index_t)-1
-
 ALWAYS_INLINE(static VALUE vm_getivar(VALUE, ID, const rb_iseq_t *, IVC, const struct rb_callcache *, int, VALUE));
 static inline VALUE
 vm_getivar(VALUE obj, ID id, const rb_iseq_t *iseq, IVC ic, const struct rb_callcache *cc, int is_attr, VALUE default_value)
 {
+    VALUE fields_obj;
 #if OPT_IC_FOR_IVAR
     VALUE val = Qundef;
-    shape_id_t shape_id;
-    VALUE * ivar_list;
+    VALUE *ivar_list;
 
     if (SPECIAL_CONST_P(obj)) {
         return default_value;
     }
 
-#if SHAPE_IN_BASIC_FLAGS
-    shape_id = RBASIC_SHAPE_ID(obj);
-#endif
+    shape_id_t shape_id = RBASIC_SHAPE_ID_FOR_READ(obj);
 
     switch (BUILTIN_TYPE(obj)) {
       case T_OBJECT:
-        ivar_list = ROBJECT_IVPTR(obj);
+        ivar_list = ROBJECT_FIELDS(obj);
         VM_ASSERT(rb_ractor_shareable_p(obj) ? rb_ractor_shareable_p(val) : true);
-
-#if !SHAPE_IN_BASIC_FLAGS
-        shape_id = ROBJECT_SHAPE_ID(obj);
-#endif
         break;
       case T_CLASS:
       case T_MODULE:
@@ -1208,25 +1247,31 @@ vm_getivar(VALUE obj, ID id, const rb_iseq_t *iseq, IVC ic, const struct rb_call
                 // and modules. So we can skip locking.
                 // Second, other ractors need to check the shareability of the
                 // values returned from the class ivars.
-                goto general_path;
-            }
 
-            ivar_list = RCLASS_IVPTR(obj);
+                if (default_value == Qundef) { // defined?
+                    return rb_ivar_defined(obj, id) ? Qtrue : Qundef;
+                }
+                else {
+                    goto general_path;
+                }
+            }
 
-#if !SHAPE_IN_BASIC_FLAGS
-            shape_id = RCLASS_SHAPE_ID(obj);
-#endif
+            fields_obj = RCLASS_WRITABLE_FIELDS_OBJ(obj);
+            if (!fields_obj) {
+                return default_value;
+            }
+            ivar_list = rb_imemo_fields_ptr(fields_obj);
+            shape_id = RBASIC_SHAPE_ID_FOR_READ(fields_obj);
 
             break;
         }
       default:
-        if (FL_TEST_RAW(obj, FL_EXIVAR)) {
-            struct gen_ivtbl *ivtbl;
-            rb_gen_ivtbl_get(obj, id, &ivtbl);
-#if !SHAPE_IN_BASIC_FLAGS
-            shape_id = ivtbl->shape_id;
-#endif
-            ivar_list = ivtbl->ivptr;
+        if (rb_obj_exivar_p(obj)) {
+            VALUE fields_obj = 0;
+            if (!rb_gen_fields_tbl_get(obj, id, &fields_obj)) {
+                return default_value;
+            }
+            ivar_list = rb_imemo_fields_ptr(fields_obj);
         }
         else {
             return default_value;
@@ -1244,7 +1289,7 @@ vm_getivar(VALUE obj, ID id, const rb_iseq_t *iseq, IVC ic, const struct rb_call
     }
 
     if (LIKELY(cached_id == shape_id)) {
-        RUBY_ASSERT(cached_id != OBJ_TOO_COMPLEX_SHAPE_ID);
+        RUBY_ASSERT(!rb_shape_too_complex_p(cached_id));
 
         if (index == ATTR_INDEX_NOT_SET) {
             return default_value;
@@ -1285,22 +1330,48 @@ vm_getivar(VALUE obj, ID id, const rb_iseq_t *iseq, IVC ic, const struct rb_call
         }
 #endif
 
-        rb_shape_t *shape = rb_shape_get_shape_by_id(shape_id);
+        if (rb_shape_too_complex_p(shape_id)) {
+            st_table *table = NULL;
+            switch (BUILTIN_TYPE(obj)) {
+              case T_CLASS:
+              case T_MODULE:
+                table = rb_imemo_fields_complex_tbl(fields_obj);
+                break;
+
+              case T_OBJECT:
+                table = ROBJECT_FIELDS_HASH(obj);
+                break;
+
+              default: {
+                VALUE fields_obj;
+                if (rb_gen_fields_tbl_get(obj, 0, &fields_obj)) {
+                    table = rb_imemo_fields_complex_tbl(fields_obj);
+                }
+                break;
+              }
+            }
 
-        if (shape_id == OBJ_TOO_COMPLEX_SHAPE_ID) {
-            if (!st_lookup(ROBJECT_IV_HASH(obj), id, &val)) {
+            if (!table || !st_lookup(table, id, &val)) {
                 val = default_value;
             }
         }
         else {
-            if (rb_shape_get_iv_index(shape, id, &index)) {
+            shape_id_t previous_cached_id = cached_id;
+            if (rb_shape_get_iv_index_with_hint(shape_id, id, &index, &cached_id)) {
                 // This fills in the cache with the shared cache object.
                 // "ent" is the shared cache object
-                fill_ivar_cache(iseq, ic, cc, is_attr, index, shape_id);
+                if (cached_id != previous_cached_id) {
+                    fill_ivar_cache(iseq, ic, cc, is_attr, index, cached_id);
+                }
 
-                // We fetched the ivar list above
-                val = ivar_list[index];
-                RUBY_ASSERT(!UNDEF_P(val));
+                if (index == ATTR_INDEX_NOT_SET) {
+                    val = default_value;
+                }
+                else {
+                    // We fetched the ivar list above
+                    val = ivar_list[index];
+                    RUBY_ASSERT(!UNDEF_P(val));
+                }
             }
             else {
                 if (is_attr) {
@@ -1316,10 +1387,11 @@ vm_getivar(VALUE obj, ID id, const rb_iseq_t *iseq, IVC ic, const struct rb_call
 
     }
 
-    if (default_value != Qundef) {
+    if (!UNDEF_P(default_value)) {
         RUBY_ASSERT(!UNDEF_P(val));
     }
 
+    RB_GC_GUARD(fields_obj);
     return val;
 
 general_path:
@@ -1337,7 +1409,7 @@ vm_getivar(VALUE obj, ID id, const rb_iseq_t *iseq, IVC ic, const struct rb_call
 static void
 populate_cache(attr_index_t index, shape_id_t next_shape_id, ID id, const rb_iseq_t *iseq, IVC ic, const struct rb_callcache *cc, bool is_attr)
 {
-    RUBY_ASSERT(next_shape_id != OBJ_TOO_COMPLEX_SHAPE_ID);
+    RUBY_ASSERT(!rb_shape_too_complex_p(next_shape_id));
 
     // Cache population code
     if (is_attr) {
@@ -1358,45 +1430,19 @@ vm_setivar_slowpath(VALUE obj, ID id, VALUE val, const rb_iseq_t *iseq, IVC ic,
 #if OPT_IC_FOR_IVAR
     RB_DEBUG_COUNTER_INC(ivar_set_ic_miss);
 
-    switch (BUILTIN_TYPE(obj)) {
-      case T_OBJECT:
-        {
-            rb_check_frozen_internal(obj);
-
-            attr_index_t index = rb_obj_ivar_set(obj, id, val);
+    if (BUILTIN_TYPE(obj) == T_OBJECT) {
+        rb_check_frozen(obj);
 
-            shape_id_t next_shape_id = ROBJECT_SHAPE_ID(obj);
+        attr_index_t index = rb_obj_ivar_set(obj, id, val);
 
-            if (next_shape_id != OBJ_TOO_COMPLEX_SHAPE_ID) {
-                populate_cache(index, next_shape_id, id, iseq, ic, cc, is_attr);
-            }
+        shape_id_t next_shape_id = RBASIC_SHAPE_ID(obj);
 
-            RB_DEBUG_COUNTER_INC(ivar_set_obj_miss);
-            return val;
+        if (!rb_shape_too_complex_p(next_shape_id)) {
+            populate_cache(index, next_shape_id, id, iseq, ic, cc, is_attr);
         }
-      case T_CLASS:
-      case T_MODULE:
-        break;
-      default:
-        {
-            rb_ivar_set(obj, id, val);
-            shape_id_t next_shape_id = rb_shape_get_shape_id(obj);
-            rb_shape_t *next_shape = rb_shape_get_shape_by_id(next_shape_id);
-            attr_index_t index;
-
-            if (rb_shape_get_iv_index(next_shape, id, &index)) { // based off the hash stored in the transition tree
-                if (index >= MAX_IVARS) {
-                    rb_raise(rb_eArgError, "too many instance variables");
-                }
-
-                populate_cache(index, next_shape_id, id, iseq, ic, cc, is_attr);
-            }
-            else {
-                rb_bug("didn't find the id");
-            }
 
-            return val;
-        }
+        RB_DEBUG_COUNTER_INC(ivar_set_obj_miss);
+        return val;
     }
 #endif
     return rb_ivar_set(obj, id, val);
@@ -1418,32 +1464,17 @@ NOINLINE(static VALUE vm_setivar_default(VALUE obj, ID id, VALUE val, shape_id_t
 static VALUE
 vm_setivar_default(VALUE obj, ID id, VALUE val, shape_id_t dest_shape_id, attr_index_t index)
 {
-#if SHAPE_IN_BASIC_FLAGS
     shape_id_t shape_id = RBASIC_SHAPE_ID(obj);
-#else
-    shape_id_t shape_id = rb_generic_shape_id(obj);
-#endif
 
-    struct gen_ivtbl *ivtbl = 0;
+    VALUE fields_obj = 0;
 
     // Cache hit case
     if (shape_id == dest_shape_id) {
         RUBY_ASSERT(dest_shape_id != INVALID_SHAPE_ID && shape_id != INVALID_SHAPE_ID);
-
-        // Just get the IV table
-        rb_gen_ivtbl_get(obj, 0, &ivtbl);
     }
     else if (dest_shape_id != INVALID_SHAPE_ID) {
-        rb_shape_t * dest_shape = rb_shape_get_shape_by_id(dest_shape_id);
-        shape_id_t source_shape_id = dest_shape->parent_id;
-
-        if (shape_id == source_shape_id && dest_shape->edge_name == id && dest_shape->type == SHAPE_IVAR) {
-            ivtbl = rb_ensure_generic_iv_list_size(obj, dest_shape, index + 1);
-#if SHAPE_IN_BASIC_FLAGS
-            RBASIC_SET_SHAPE_ID(obj, dest_shape_id);
-#else
-            RUBY_ASSERT(ivtbl->shape_id == dest_shape_id);
-#endif
+        if (shape_id == RSHAPE_PARENT(dest_shape_id) && RSHAPE_EDGE_NAME(dest_shape_id) == id && RSHAPE_CAPACITY(shape_id) == RSHAPE_CAPACITY(dest_shape_id)) {
+            RUBY_ASSERT(index < RSHAPE_CAPACITY(dest_shape_id));
         }
         else {
             return Qundef;
@@ -1453,9 +1484,13 @@ vm_setivar_default(VALUE obj, ID id, VALUE val, shape_id_t dest_shape_id, attr_i
         return Qundef;
     }
 
-    VALUE *ptr = ivtbl->ivptr;
+    rb_gen_fields_tbl_get(obj, 0, &fields_obj);
 
-    RB_OBJ_WRITE(obj, &ptr[index], val);
+    if (shape_id != dest_shape_id) {
+        RBASIC_SET_SHAPE_ID(obj, dest_shape_id);
+    }
+
+    RB_OBJ_WRITE(obj, &rb_imemo_fields_ptr(fields_obj)[index], val);
 
     RB_DEBUG_COUNTER_INC(ivar_set_ic_hit);
 
@@ -1471,24 +1506,23 @@ vm_setivar(VALUE obj, ID id, VALUE val, shape_id_t dest_shape_id, attr_index_t i
         {
             VM_ASSERT(!rb_ractor_shareable_p(obj) || rb_obj_frozen_p(obj));
 
-            shape_id_t shape_id = ROBJECT_SHAPE_ID(obj);
-            RUBY_ASSERT(dest_shape_id != OBJ_TOO_COMPLEX_SHAPE_ID);
+            shape_id_t shape_id = RBASIC_SHAPE_ID(obj);
+            RUBY_ASSERT(dest_shape_id == INVALID_SHAPE_ID || !rb_shape_too_complex_p(dest_shape_id));
 
             if (LIKELY(shape_id == dest_shape_id)) {
                 RUBY_ASSERT(dest_shape_id != INVALID_SHAPE_ID && shape_id != INVALID_SHAPE_ID);
                 VM_ASSERT(!rb_ractor_shareable_p(obj));
             }
             else if (dest_shape_id != INVALID_SHAPE_ID) {
-                rb_shape_t *dest_shape = rb_shape_get_shape_by_id(dest_shape_id);
-                shape_id_t source_shape_id = dest_shape->parent_id;
+                shape_id_t source_shape_id = RSHAPE_PARENT(dest_shape_id);
 
-                if (shape_id == source_shape_id && dest_shape->edge_name == id) {
+                if (shape_id == source_shape_id && RSHAPE_EDGE_NAME(dest_shape_id) == id && RSHAPE_CAPACITY(shape_id) == RSHAPE_CAPACITY(dest_shape_id)) {
                     RUBY_ASSERT(dest_shape_id != INVALID_SHAPE_ID && shape_id != INVALID_SHAPE_ID);
 
-                    ROBJECT_SET_SHAPE_ID(obj, dest_shape_id);
+                    RBASIC_SET_SHAPE_ID(obj, dest_shape_id);
 
-                    RUBY_ASSERT(rb_shape_get_next_iv_shape(rb_shape_get_shape_by_id(source_shape_id), id) == dest_shape);
-                    RUBY_ASSERT(index < dest_shape->capacity);
+                    RUBY_ASSERT(rb_shape_get_next_iv_shape(source_shape_id, id) == dest_shape_id);
+                    RUBY_ASSERT(index < RSHAPE_CAPACITY(dest_shape_id));
                 }
                 else {
                     break;
@@ -1498,9 +1532,9 @@ vm_setivar(VALUE obj, ID id, VALUE val, shape_id_t dest_shape_id, attr_index_t i
                 break;
             }
 
-            VALUE *ptr = ROBJECT_IVPTR(obj);
+            VALUE *ptr = ROBJECT_FIELDS(obj);
 
-            RUBY_ASSERT(!rb_shape_obj_too_complex(obj));
+            RUBY_ASSERT(!rb_shape_obj_too_complex_p(obj));
             RB_OBJ_WRITE(obj, &ptr[index], val);
 
             RB_DEBUG_COUNTER_INC(ivar_set_ic_hit);
@@ -1807,7 +1841,16 @@ vm_throw_start(const rb_execution_context_t *ec, rb_control_frame_t *const reg_c
                             }
                         }
                         break;
-                      case ISEQ_TYPE_EVAL:
+                      case ISEQ_TYPE_EVAL: {
+                        const rb_iseq_t *is = escape_cfp->iseq;
+                        enum rb_iseq_type t = ISEQ_BODY(is)->type;
+                        while (t == ISEQ_TYPE_RESCUE || t == ISEQ_TYPE_ENSURE || t == ISEQ_TYPE_EVAL) {
+                            if (!(is = ISEQ_BODY(is)->parent_iseq)) break;
+                            t = ISEQ_BODY(is)->type;
+                        }
+                        toplevel = t == ISEQ_TYPE_TOP || t == ISEQ_TYPE_MAIN;
+                        break;
+                      }
                       case ISEQ_TYPE_CLASS:
                         toplevel = 0;
                         break;
@@ -1864,11 +1907,9 @@ rb_vm_throw(const rb_execution_context_t *ec, rb_control_frame_t *reg_cfp, rb_nu
 }
 
 static inline void
-vm_expandarray(VALUE *sp, VALUE ary, rb_num_t num, int flag)
+vm_expandarray(struct rb_control_frame_struct *cfp, VALUE ary, rb_num_t num, int flag)
 {
     int is_splat = flag & 0x01;
-    rb_num_t space_size = num + is_splat;
-    VALUE *base = sp - 1;
     const VALUE *ptr;
     rb_num_t len;
     const VALUE obj = ary;
@@ -1883,7 +1924,7 @@ vm_expandarray(VALUE *sp, VALUE ary, rb_num_t num, int flag)
         len = (rb_num_t)RARRAY_LEN(ary);
     }
 
-    if (space_size == 0) {
+    if (num + is_splat == 0) {
         /* no space left on stack */
     }
     else if (flag & 0x02) {
@@ -1891,41 +1932,48 @@ vm_expandarray(VALUE *sp, VALUE ary, rb_num_t num, int flag)
         rb_num_t i = 0, j;
 
         if (len < num) {
-            for (i=0; i<num-len; i++) {
-                *base++ = Qnil;
+            for (i = 0; i < num - len; i++) {
+                *cfp->sp++ = Qnil;
             }
         }
-        for (j=0; i<num; i++, j++) {
+
+        for (j = 0; i < num; i++, j++) {
             VALUE v = ptr[len - j - 1];
-            *base++ = v;
+            *cfp->sp++ = v;
         }
+
         if (is_splat) {
-            *base = rb_ary_new4(len - j, ptr);
+            *cfp->sp++ = rb_ary_new4(len - j, ptr);
         }
     }
     else {
         /* normal: ary[num..-1], ary[num-2], ary[num-3], ..., ary[0] # top */
-        rb_num_t i;
-        VALUE *bptr = &base[space_size - 1];
-
-        for (i=0; i<num; i++) {
-            if (len <= i) {
-                for (; i<num; i++) {
-                    *bptr-- = Qnil;
-                }
-                break;
-            }
-            *bptr-- = ptr[i];
-        }
         if (is_splat) {
             if (num > len) {
-                *bptr = rb_ary_new();
+                *cfp->sp++ = rb_ary_new();
             }
             else {
-                *bptr = rb_ary_new4(len - num, ptr + num);
+                *cfp->sp++ = rb_ary_new4(len - num, ptr + num);
+            }
+        }
+
+        if (num > len) {
+            rb_num_t i = 0;
+            for (; i < num - len; i++) {
+                *cfp->sp++ = Qnil;
+            }
+
+            for (rb_num_t j = 0; i < num; i++, j++) {
+                *cfp->sp++ = ptr[len - j - 1];
+            }
+        }
+        else {
+            for (rb_num_t j = 0; j < num; j++) {
+                *cfp->sp++ = ptr[num - j - 1];
             }
         }
     }
+
     RB_GC_GUARD(ary);
 }
 
@@ -1957,9 +2005,6 @@ vm_ccs_push(VALUE klass, struct rb_class_cc_entries *ccs, const struct rb_callin
     if (! vm_cc_markable(cc)) {
         return;
     }
-    else if (! vm_ci_markable(ci)) {
-        return;
-    }
 
     if (UNLIKELY(ccs->len == ccs->capa)) {
         if (ccs->capa == 0) {
@@ -1974,7 +2019,8 @@ vm_ccs_push(VALUE klass, struct rb_class_cc_entries *ccs, const struct rb_callin
     VM_ASSERT(ccs->len < ccs->capa);
 
     const int pos = ccs->len++;
-    RB_OBJ_WRITE(klass, &ccs->entries[pos].ci, ci);
+    ccs->entries[pos].argc = vm_ci_argc(ci);
+    ccs->entries[pos].flag = vm_ci_flag(ci);
     RB_OBJ_WRITE(klass, &ccs->entries[pos].cc, cc);
 
     if (RB_DEBUG_COUNTER_SETMAX(ccs_maxlen, ccs->len)) {
@@ -1989,7 +2035,9 @@ rb_vm_ccs_dump(struct rb_class_cc_entries *ccs)
 {
     ruby_debug_printf("ccs:%p (%d,%d)\n", (void *)ccs, ccs->len, ccs->capa);
     for (int i=0; i<ccs->len; i++) {
-        vm_ci_dump(ccs->entries[i].ci);
+        ruby_debug_printf("CCS CI ID:flag:%x argc:%u\n",
+                ccs->entries[i].flag,
+                ccs->entries[i].argc);
         rp(ccs->entries[i].cc);
     }
 }
@@ -2001,11 +2049,8 @@ vm_ccs_verify(struct rb_class_cc_entries *ccs, ID mid, VALUE klass)
     VM_ASSERT(ccs->len <= ccs->capa);
 
     for (int i=0; i<ccs->len; i++) {
-        const struct rb_callinfo  *ci = ccs->entries[i].ci;
         const struct rb_callcache *cc = ccs->entries[i].cc;
 
-        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_check_cme(cc, ccs->cme));
@@ -2016,17 +2061,19 @@ vm_ccs_verify(struct rb_class_cc_entries *ccs, ID mid, VALUE klass)
 }
 #endif
 
-static const rb_callable_method_entry_t *check_overloaded_cme(const rb_callable_method_entry_t *cme, const struct rb_callinfo * const ci);
+const rb_callable_method_entry_t *rb_check_overloaded_cme(const rb_callable_method_entry_t *cme, const struct rb_callinfo * const ci);
 
 static const struct rb_callcache *
 vm_search_cc(const VALUE klass, const struct rb_callinfo * const ci)
 {
     const ID mid = vm_ci_mid(ci);
-    struct rb_id_table *cc_tbl = RCLASS_CC_TBL(klass);
+    struct rb_id_table *cc_tbl = RCLASS_WRITABLE_CC_TBL(klass);
     struct rb_class_cc_entries *ccs = NULL;
     VALUE ccs_data;
 
     if (cc_tbl) {
+        // CCS data is keyed on method id, so we don't need the method id
+        // for doing comparisons in the `for` loop below.
         if (rb_id_table_lookup(cc_tbl, mid, &ccs_data)) {
             ccs = (struct rb_class_cc_entries *)ccs_data;
             const int ccs_len = ccs->len;
@@ -2039,14 +2086,20 @@ vm_search_cc(const VALUE klass, const struct rb_callinfo * const ci)
             else {
                 VM_ASSERT(vm_ccs_verify(ccs, mid, klass));
 
+                // We already know the method id is correct because we had
+                // to look up the ccs_data by method id.  All we need to
+                // compare is argc and flag
+                unsigned int argc = vm_ci_argc(ci);
+                unsigned int flag = vm_ci_flag(ci);
+
                 for (int i=0; i<ccs_len; i++) {
-                    const struct rb_callinfo  *ccs_ci = ccs->entries[i].ci;
+                    unsigned int ccs_ci_argc = ccs->entries[i].argc;
+                    unsigned int ccs_ci_flag = ccs->entries[i].flag;
                     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
+                    if (ccs_ci_argc == argc && ccs_ci_flag == flag) {
                         RB_DEBUG_COUNTER_INC(cc_found_in_ccs);
 
                         VM_ASSERT(vm_cc_cme(ccs_cc)->called_id == mid);
@@ -2060,7 +2113,8 @@ vm_search_cc(const VALUE klass, const struct rb_callinfo * const ci)
         }
     }
     else {
-        cc_tbl = RCLASS_CC_TBL(klass) = rb_id_table_create(2);
+        cc_tbl = rb_id_table_create(2);
+        RCLASS_WRITE_CC_TBL(klass, cc_tbl);
     }
 
     RB_DEBUG_COUNTER_INC(cc_not_found_in_ccs);
@@ -2102,7 +2156,7 @@ vm_search_cc(const VALUE klass, const struct rb_callinfo * const ci)
         }
     }
 
-    cme = check_overloaded_cme(cme, ci);
+    cme = rb_check_overloaded_cme(cme, ci);
 
     const struct rb_callcache *cc = vm_cc_new(klass, cme, vm_call_general, cc_type_normal);
     vm_ccs_push(klass, ccs, ci, cc);
@@ -2119,10 +2173,9 @@ rb_vm_search_method_slowpath(const struct rb_callinfo *ci, VALUE klass)
 {
     const struct rb_callcache *cc;
 
-    VM_ASSERT(RB_TYPE_P(klass, T_CLASS) || RB_TYPE_P(klass, T_ICLASS));
+    VM_ASSERT_TYPE2(klass, T_CLASS, T_ICLASS);
 
-    RB_VM_LOCK_ENTER();
-    {
+    RB_VM_LOCKING() {
         cc = vm_search_cc(klass, ci);
 
         VM_ASSERT(cc);
@@ -2132,7 +2185,6 @@ rb_vm_search_method_slowpath(const struct rb_callinfo *ci, VALUE klass)
         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(ci));
     }
-    RB_VM_LOCK_LEAVE();
 
     return cc;
 }
@@ -2155,7 +2207,7 @@ vm_search_method_slowpath0(VALUE cd_owner, struct rb_call_data *cd, VALUE klass)
     }
 
 #if USE_DEBUG_COUNTER
-    if (old_cc == empty_cc) {
+    if (!old_cc || old_cc == empty_cc) {
         // empty
         RB_DEBUG_COUNTER_INC(mc_inline_miss_empty);
     }
@@ -2239,8 +2291,10 @@ typedef union {
     VALUE (*f15)(VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE);
     VALUE (*fm1)(int, union { VALUE *x; const VALUE *y; } __attribute__((__transparent_union__)), VALUE);
 } __attribute__((__transparent_union__)) cfunc_type;
+# define make_cfunc_type(f) (cfunc_type){.anyargs = (VALUE (*)(ANYARGS))(f)}
 #else
 typedef VALUE (*cfunc_type)(ANYARGS);
+# define make_cfunc_type(f) (cfunc_type)(f)
 #endif
 
 static inline int
@@ -2266,6 +2320,12 @@ check_cfunc(const rb_callable_method_entry_t *me, cfunc_type func)
     }
 }
 
+static inline int
+check_method_basic_definition(const rb_callable_method_entry_t *me)
+{
+    return me && METHOD_ENTRY_BASIC(me);
+}
+
 static inline int
 vm_method_cfunc_is(const rb_iseq_t *iseq, CALL_DATA cd, VALUE recv, cfunc_type func)
 {
@@ -2274,6 +2334,9 @@ vm_method_cfunc_is(const rb_iseq_t *iseq, CALL_DATA cd, VALUE recv, cfunc_type f
     return check_cfunc(vm_cc_cme(cc), func);
 }
 
+#define check_cfunc(me, func) check_cfunc(me, make_cfunc_type(func))
+#define vm_method_cfunc_is(iseq, cd, recv, func) vm_method_cfunc_is(iseq, cd, recv, make_cfunc_type(func))
+
 #define EQ_UNREDEFINED_P(t) BASIC_OP_UNREDEFINED_P(BOP_EQ, t##_REDEFINED_OP_FLAG)
 
 static inline bool
@@ -2367,13 +2430,13 @@ opt_equality(const rb_iseq_t *cd_owner, VALUE recv, VALUE obj, CALL_DATA cd)
 
 #undef EQ_UNREDEFINED_P
 
-static inline const struct rb_callcache *gccct_method_search(rb_execution_context_t *ec, VALUE recv, ID mid, int argc); // vm_eval.c
+static inline const struct rb_callcache *gccct_method_search(rb_execution_context_t *ec, VALUE recv, ID mid, const struct rb_callinfo *ci); // vm_eval.c
 NOINLINE(static VALUE opt_equality_by_mid_slowpath(VALUE recv, VALUE obj, ID mid));
 
 static VALUE
 opt_equality_by_mid_slowpath(VALUE recv, VALUE obj, ID mid)
 {
-    const struct rb_callcache *cc = gccct_method_search(GET_EC(), recv, mid, 1);
+    const struct rb_callcache *cc = gccct_method_search(GET_EC(), recv, mid, &VM_CI_ON_STACK(mid, 0, 1, NULL));
 
     if (cc && check_cfunc(vm_cc_cme(cc), rb_obj_equal)) {
         return RBOOL(recv == obj);
@@ -2472,6 +2535,15 @@ vm_base_ptr(const rb_control_frame_t *cfp)
 
     if (cfp->iseq && VM_FRAME_RUBYFRAME_P(cfp)) {
         VALUE *bp = prev_cfp->sp + ISEQ_BODY(cfp->iseq)->local_table_size + VM_ENV_DATA_SIZE;
+
+        if (ISEQ_BODY(cfp->iseq)->param.flags.forwardable && VM_ENV_LOCAL_P(cfp->ep)) {
+            int lts = ISEQ_BODY(cfp->iseq)->local_table_size;
+            int params = ISEQ_BODY(cfp->iseq)->param.size;
+
+            CALL_INFO ci = (CALL_INFO)cfp->ep[-(VM_ENV_DATA_SIZE + (lts - params))]; // skip EP stuff, CI should be last local
+            bp += vm_ci_argc(ci);
+        }
+
         if (ISEQ_BODY(cfp->iseq)->type == ISEQ_TYPE_METHOD || VM_FRAME_BMETHOD_P(cfp)) {
             /* adjust `self' */
             bp += 1;
@@ -2540,6 +2612,7 @@ rb_simple_iseq_p(const rb_iseq_t *iseq)
            ISEQ_BODY(iseq)->param.flags.has_kw == FALSE &&
            ISEQ_BODY(iseq)->param.flags.has_kwrest == FALSE &&
            ISEQ_BODY(iseq)->param.flags.accepts_no_kwarg == FALSE &&
+           ISEQ_BODY(iseq)->param.flags.forwardable == FALSE &&
            ISEQ_BODY(iseq)->param.flags.has_block == FALSE;
 }
 
@@ -2552,6 +2625,7 @@ rb_iseq_only_optparam_p(const rb_iseq_t *iseq)
            ISEQ_BODY(iseq)->param.flags.has_kw == FALSE &&
            ISEQ_BODY(iseq)->param.flags.has_kwrest == FALSE &&
            ISEQ_BODY(iseq)->param.flags.accepts_no_kwarg == FALSE &&
+           ISEQ_BODY(iseq)->param.flags.forwardable == FALSE &&
            ISEQ_BODY(iseq)->param.flags.has_block == FALSE;
 }
 
@@ -2563,6 +2637,7 @@ rb_iseq_only_kwparam_p(const rb_iseq_t *iseq)
            ISEQ_BODY(iseq)->param.flags.has_post == FALSE &&
            ISEQ_BODY(iseq)->param.flags.has_kw == TRUE &&
            ISEQ_BODY(iseq)->param.flags.has_kwrest == FALSE &&
+           ISEQ_BODY(iseq)->param.flags.forwardable == FALSE &&
            ISEQ_BODY(iseq)->param.flags.has_block == FALSE;
 }
 
@@ -2652,12 +2727,16 @@ static inline VALUE
 vm_caller_setup_keyword_hash(const struct rb_callinfo *ci, VALUE keyword_hash)
 {
     if (UNLIKELY(!RB_TYPE_P(keyword_hash, T_HASH))) {
-        /* Convert a non-hash keyword splat to a new hash */
-        keyword_hash = rb_hash_dup(rb_to_hash_type(keyword_hash));
+        if (keyword_hash != Qnil) {
+            /* Convert a non-hash keyword splat to a new hash */
+            keyword_hash = rb_hash_dup(rb_to_hash_type(keyword_hash));
+        }
     }
-    else if (!IS_ARGS_KW_SPLAT_MUT(ci)) {
+    else if (!IS_ARGS_KW_SPLAT_MUT(ci) && !RHASH_EMPTY_P(keyword_hash)) {
         /* Convert a hash keyword splat to a new hash unless
          * a mutable keyword splat was passed.
+         * Skip allocating new hash for empty keyword splat, as empty
+         * keyword splat will be ignored by both callers.
          */
         keyword_hash = rb_hash_dup(keyword_hash);
     }
@@ -2683,7 +2762,7 @@ CALLER_SETUP_ARG(struct rb_control_frame_struct *restrict cfp,
             if (vm_caller_setup_arg_splat(cfp, calling, ary, max_args)) return;
 
             // put kw
-            if (!RHASH_EMPTY_P(kwh)) {
+            if (kwh != Qnil && !RHASH_EMPTY_P(kwh)) {
                 if (UNLIKELY(calling->heap_argv)) {
                     rb_ary_push(calling->heap_argv, kwh);
                     ((struct RHash *)kwh)->basic.flags |= RHASH_PASS_AS_KEYWORDS;
@@ -2754,7 +2833,7 @@ CALLER_SETUP_ARG(struct rb_control_frame_struct *restrict cfp,
         VM_ASSERT(calling->kw_splat == 1);
         VALUE kwh = vm_caller_setup_keyword_hash(ci, cfp->sp[-1]);
 
-        if (RHASH_EMPTY_P(kwh)) {
+        if (kwh == Qnil || RHASH_EMPTY_P(kwh)) {
             cfp->sp--;
             calling->argc--;
             calling->kw_splat = 0;
@@ -2844,10 +2923,30 @@ vm_call_iseq_setup_tailcall_opt_start(rb_execution_context_t *ec, rb_control_fra
 }
 
 static void
-args_setup_kw_parameters(rb_execution_context_t *const ec, const rb_iseq_t *const iseq,
+args_setup_kw_parameters(rb_execution_context_t *const ec, const rb_iseq_t *const iseq, const rb_callable_method_entry_t *cme,
                          VALUE *const passed_values, const int passed_keyword_len, const VALUE *const passed_keywords,
                          VALUE *const locals);
 
+static VALUE
+vm_call_iseq_forwardable(rb_execution_context_t *ec, rb_control_frame_t *cfp,
+                                struct rb_calling_info *calling)
+{
+    const struct rb_callcache *cc = calling->cc;
+    const rb_iseq_t *iseq = def_iseq_ptr(vm_cc_cme(cc)->def);
+    int param_size = ISEQ_BODY(iseq)->param.size;
+    int local_size = ISEQ_BODY(iseq)->local_table_size;
+
+    // Setting up local size and param size
+    VM_ASSERT(ISEQ_BODY(iseq)->param.flags.forwardable);
+
+    local_size = local_size + vm_ci_argc(calling->cd->ci);
+    param_size = param_size + vm_ci_argc(calling->cd->ci);
+
+    cfp->sp[0] = (VALUE)calling->cd->ci;
+
+    return vm_call_iseq_setup_normal(ec, cfp, calling, vm_cc_cme(cc), 0, param_size, local_size);
+}
+
 static VALUE
 vm_call_iseq_setup_kwparm_kwarg(rb_execution_context_t *ec, rb_control_frame_t *cfp,
                                 struct rb_calling_info *calling)
@@ -2868,7 +2967,7 @@ vm_call_iseq_setup_kwparm_kwarg(rb_execution_context_t *ec, rb_control_frame_t *
     const int lead_num = ISEQ_BODY(iseq)->param.lead_num;
     VALUE * const ci_kws = ALLOCA_N(VALUE, ci_kw_len);
     MEMCPY(ci_kws, argv + lead_num, VALUE, ci_kw_len);
-    args_setup_kw_parameters(ec, iseq, ci_kws, ci_kw_len, ci_keywords, klocals);
+    args_setup_kw_parameters(ec, iseq, vm_cc_cme(cc), ci_kws, ci_kw_len, ci_keywords, klocals);
 
     int param = ISEQ_BODY(iseq)->param.size;
     int local = ISEQ_BODY(iseq)->local_table_size;
@@ -2907,12 +3006,73 @@ vm_call_iseq_setup_kwparm_nokwarg(rb_execution_context_t *ec, rb_control_frame_t
 static VALUE builtin_invoker0(rb_execution_context_t *ec, VALUE self, const VALUE *argv, rb_insn_func_t funcptr);
 
 static VALUE
-vm_call_single_noarg_inline_builtin(rb_execution_context_t *ec, rb_control_frame_t *cfp,
+vm_call_single_noarg_leaf_builtin(rb_execution_context_t *ec, rb_control_frame_t *cfp,
                                     struct rb_calling_info *calling)
 {
     const struct rb_builtin_function *bf = calling->cc->aux_.bf;
     cfp->sp -= (calling->argc + 1);
-    return builtin_invoker0(ec, calling->recv, NULL, (rb_insn_func_t)bf->func_ptr);
+    rb_insn_func_t func_ptr = (rb_insn_func_t)(uintptr_t)bf->func_ptr;
+    return builtin_invoker0(ec, calling->recv, NULL, func_ptr);
+}
+
+VALUE rb_gen_method_name(VALUE owner, VALUE name); // in vm_backtrace.c
+
+static void
+warn_unused_block(const rb_callable_method_entry_t *cme, const rb_iseq_t *iseq, void *pc)
+{
+    rb_vm_t *vm = GET_VM();
+    set_table *dup_check_table = vm->unused_block_warning_table;
+    st_data_t key;
+    bool strict_unused_block = rb_warning_category_enabled_p(RB_WARN_CATEGORY_STRICT_UNUSED_BLOCK);
+
+    union {
+        VALUE v;
+        unsigned char b[SIZEOF_VALUE];
+    } k1 = {
+        .v = (VALUE)pc,
+    }, k2 = {
+        .v = (VALUE)cme->def,
+    };
+
+    // relax check
+    if (!strict_unused_block) {
+        key = (st_data_t)cme->def->original_id;
+
+        if (set_table_lookup(dup_check_table, key)) {
+            return;
+        }
+    }
+
+    // strict check
+    // make unique key from pc and me->def pointer
+    key = 0;
+    for (int i=0; i<SIZEOF_VALUE; i++) {
+        // fprintf(stderr, "k1:%3d k2:%3d\n", k1.b[i], k2.b[SIZEOF_VALUE-1-i]);
+        key |= (st_data_t)(k1.b[i] ^ k2.b[SIZEOF_VALUE-1-i]) << (8 * i);
+    }
+
+    if (0) {
+        fprintf(stderr, "SIZEOF_VALUE:%d\n", SIZEOF_VALUE);
+        fprintf(stderr, "pc:%p def:%p\n", pc, (void *)cme->def);
+        fprintf(stderr, "key:%p\n", (void *)key);
+    }
+
+    // duplication check
+    if (set_insert(dup_check_table, key)) {
+        // already shown
+    }
+    else if (RTEST(ruby_verbose) || strict_unused_block) {
+        VALUE m_loc = rb_method_entry_location((const rb_method_entry_t *)cme);
+        VALUE name = rb_gen_method_name(cme->defined_class, ISEQ_BODY(iseq)->location.base_label);
+
+        if (!NIL_P(m_loc)) {
+            rb_warn("the block passed to '%"PRIsVALUE"' defined at %"PRIsVALUE":%"PRIsVALUE" may be ignored",
+                    name, RARRAY_AREF(m_loc, 0), RARRAY_AREF(m_loc, 1));
+        }
+        else {
+            rb_warn("the block may be ignored because '%"PRIsVALUE"' does not use a block", name);
+        }
+    }
 }
 
 static inline int
@@ -2921,7 +3081,15 @@ vm_callee_setup_arg(rb_execution_context_t *ec, struct rb_calling_info *calling,
 {
     const struct rb_callinfo *ci = calling->cd->ci;
     const struct rb_callcache *cc = calling->cc;
-    bool cacheable_ci = vm_ci_markable(ci);
+
+    VM_ASSERT((vm_ci_argc(ci), 1));
+    VM_ASSERT(vm_cc_cme(cc) != NULL);
+
+    if (UNLIKELY(!ISEQ_BODY(iseq)->param.flags.use_block &&
+                 calling->block_handler != VM_BLOCK_HANDLER_NONE &&
+                 !(vm_ci_flag(calling->cd->ci) & (VM_CALL_OPT_SEND | VM_CALL_SUPER)))) {
+        warn_unused_block(vm_cc_cme(cc), iseq, (void *)ec->cfp->pc);
+    }
 
     if (LIKELY(!(vm_ci_flag(ci) & VM_CALL_KW_SPLAT))) {
         if (LIKELY(rb_simple_iseq_p(iseq))) {
@@ -2930,18 +3098,18 @@ vm_callee_setup_arg(rb_execution_context_t *ec, struct rb_calling_info *calling,
             CALLER_SETUP_ARG(cfp, calling, ci, lead_num);
 
             if (calling->argc != lead_num) {
-                argument_arity_error(ec, iseq, calling->argc, lead_num, lead_num);
+                argument_arity_error(ec, iseq, vm_cc_cme(cc), calling->argc, lead_num, lead_num);
             }
 
-            VM_ASSERT(ci == calling->cd->ci);
+            //VM_ASSERT(ci == calling->cd->ci);
             VM_ASSERT(cc == calling->cc);
 
-            if (cacheable_ci && vm_call_iseq_optimizable_p(ci, cc)) {
-                if ((iseq->body->builtin_attrs & BUILTIN_ATTR_SINGLE_NOARG_INLINE) &&
+            if (vm_call_iseq_optimizable_p(ci, cc)) {
+                if ((iseq->body->builtin_attrs & BUILTIN_ATTR_SINGLE_NOARG_LEAF) &&
                     !(ruby_vm_event_flags & (RUBY_EVENT_C_CALL | RUBY_EVENT_C_RETURN))) {
                     VM_ASSERT(iseq->body->builtin_attrs & BUILTIN_ATTR_LEAF);
                     vm_cc_bf_set(cc, (void *)iseq->body->iseq_encoded[1]);
-                    CC_SET_FASTPATH(cc, vm_call_single_noarg_inline_builtin, true);
+                    CC_SET_FASTPATH(cc, vm_call_single_noarg_leaf_builtin, true);
                 }
                 else {
                     CC_SET_FASTPATH(cc, vm_call_iseq_setup_func(ci, param_size, local_size), true);
@@ -2960,18 +3128,18 @@ vm_callee_setup_arg(rb_execution_context_t *ec, struct rb_calling_info *calling,
             const int opt = argc - lead_num;
 
             if (opt < 0 || opt > opt_num) {
-                argument_arity_error(ec, iseq, argc, lead_num, lead_num + opt_num);
+                argument_arity_error(ec, iseq, vm_cc_cme(cc), argc, lead_num, lead_num + opt_num);
             }
 
             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) &&
-                                cacheable_ci && vm_call_cacheable(ci, cc));
+                                vm_call_cacheable(ci, cc));
             }
             else {
                 CC_SET_FASTPATH(cc, vm_call_iseq_setup_tailcall_opt_start,
                                 !IS_ARGS_SPLAT(ci) && !IS_ARGS_KEYWORD(ci) &&
-                                cacheable_ci && vm_call_cacheable(ci, cc));
+                                vm_call_cacheable(ci, cc));
             }
 
             /* initialize opt vars for self-references */
@@ -2996,10 +3164,10 @@ vm_callee_setup_arg(rb_execution_context_t *ec, struct rb_calling_info *calling,
                     MEMCPY(ci_kws, argv + lead_num, VALUE, ci_kw_len);
 
                     VALUE *const klocals = argv + kw_param->bits_start - kw_param->num;
-                    args_setup_kw_parameters(ec, iseq, ci_kws, ci_kw_len, ci_keywords, klocals);
+                    args_setup_kw_parameters(ec, iseq, vm_cc_cme(cc), ci_kws, ci_kw_len, ci_keywords, klocals);
 
                     CC_SET_FASTPATH(cc, vm_call_iseq_setup_kwparm_kwarg,
-                                    cacheable_ci && vm_call_cacheable(ci, cc));
+                                    vm_call_cacheable(ci, cc));
 
                     return 0;
                 }
@@ -3007,12 +3175,12 @@ vm_callee_setup_arg(rb_execution_context_t *ec, struct rb_calling_info *calling,
             else if (argc == lead_num) {
                 /* no kwarg */
                 VALUE *const klocals = argv + kw_param->bits_start - kw_param->num;
-                args_setup_kw_parameters(ec, iseq, NULL, 0, NULL, klocals);
+                args_setup_kw_parameters(ec, iseq, vm_cc_cme(cc), NULL, 0, NULL, klocals);
 
                 if (klocals[kw_param->num] == INT2FIX(0)) {
                     /* copy from default_values */
                     CC_SET_FASTPATH(cc, vm_call_iseq_setup_kwparm_nokwarg,
-                                    cacheable_ci && vm_call_cacheable(ci, cc));
+                                    vm_call_cacheable(ci, cc));
                 }
 
                 return 0;
@@ -3020,9 +3188,128 @@ vm_callee_setup_arg(rb_execution_context_t *ec, struct rb_calling_info *calling,
         }
     }
 
+    // Called iseq is using ... param
+    // def foo(...) # <- iseq for foo will have "forwardable"
+    //
+    // We want to set the `...` local to the caller's CI
+    //   foo(1, 2) # <- the ci for this should end up as `...`
+    //
+    // So hopefully the stack looks like:
+    //
+    //   => 1
+    //   => 2
+    //   => *
+    //   => **
+    //   => &
+    //   => ... # <- points at `foo`s CI
+    //   => cref_or_me
+    //   => specval
+    //   => type
+    //
+    if (ISEQ_BODY(iseq)->param.flags.forwardable) {
+        bool can_fastpath = true;
+
+        if ((vm_ci_flag(ci) & VM_CALL_FORWARDING)) {
+            struct rb_forwarding_call_data * forward_cd = (struct rb_forwarding_call_data *)calling->cd;
+            if (vm_ci_argc(ci) != vm_ci_argc(forward_cd->caller_ci)) {
+                ci = vm_ci_new_runtime(
+                        vm_ci_mid(ci),
+                        vm_ci_flag(ci),
+                        vm_ci_argc(ci),
+                        vm_ci_kwarg(ci));
+            }
+            else {
+                ci = forward_cd->caller_ci;
+            }
+            can_fastpath = false;
+        }
+        // C functions calling iseqs will stack allocate a CI,
+        // so we need to convert it to heap allocated
+        if (!vm_ci_markable(ci)) {
+            ci = vm_ci_new_runtime(
+                    vm_ci_mid(ci),
+                    vm_ci_flag(ci),
+                    vm_ci_argc(ci),
+                    vm_ci_kwarg(ci));
+            can_fastpath = false;
+        }
+        argv[param_size - 1] = (VALUE)ci;
+        CC_SET_FASTPATH(cc, vm_call_iseq_forwardable, can_fastpath);
+        return 0;
+    }
+
     return setup_parameters_complex(ec, iseq, calling, ci, argv, arg_setup_method);
 }
 
+static void
+vm_adjust_stack_forwarding(const struct rb_execution_context_struct *ec, struct rb_control_frame_struct *cfp, int argc, VALUE splat)
+{
+    // This case is when the caller is using a ... parameter.
+    // For example `bar(...)`. The call info will have VM_CALL_FORWARDING
+    // In this case the caller's caller's CI will be on the stack.
+    //
+    // For example:
+    //
+    // def bar(a, b); a + b; end
+    // def foo(...); bar(...); end
+    // foo(1, 2) # <- this CI will be on the stack when we call `bar(...)`
+    //
+    // Stack layout will be:
+    //
+    // > 1
+    // > 2
+    // > CI for foo(1, 2)
+    // > cref_or_me
+    // > specval
+    // > type
+    // > receiver
+    // > CI for foo(1, 2), via `getlocal ...`
+    // >      ( SP points here )
+    const VALUE * lep = VM_CF_LEP(cfp);
+
+    const rb_iseq_t *iseq;
+
+    // If we're in an escaped environment (lambda for example), get the iseq
+    // from the captured env.
+    if (VM_ENV_FLAGS(lep, VM_ENV_FLAG_ESCAPED)) {
+        rb_env_t * env = (rb_env_t *)lep[VM_ENV_DATA_INDEX_ENV];
+        iseq = env->iseq;
+    }
+    else { // Otherwise use the lep to find the caller
+        iseq = rb_vm_search_cf_from_ep(ec, cfp, lep)->iseq;
+    }
+
+    // Our local storage is below the args we need to copy
+    int local_size = ISEQ_BODY(iseq)->local_table_size + argc;
+
+    const VALUE * from = lep - (local_size + VM_ENV_DATA_SIZE - 1); // 2 for EP values
+    VALUE * to = cfp->sp - 1; // clobber the CI
+
+    if (RTEST(splat)) {
+        to -= 1; // clobber the splat array
+        CHECK_VM_STACK_OVERFLOW0(cfp, to, RARRAY_LEN(splat));
+        MEMCPY(to, RARRAY_CONST_PTR(splat), VALUE, RARRAY_LEN(splat));
+        to += RARRAY_LEN(splat);
+    }
+
+    CHECK_VM_STACK_OVERFLOW0(cfp, to, argc);
+    MEMCPY(to, from, VALUE, argc);
+    cfp->sp = to + argc;
+
+    // Stack layout should now be:
+    //
+    // > 1
+    // > 2
+    // > CI for foo(1, 2)
+    // > cref_or_me
+    // > specval
+    // > type
+    // > receiver
+    // > 1
+    // > 2
+    // >      ( SP points here )
+}
+
 static VALUE
 vm_call_iseq_setup(rb_execution_context_t *ec, rb_control_frame_t *cfp, struct rb_calling_info *calling)
 {
@@ -3030,8 +3317,31 @@ vm_call_iseq_setup(rb_execution_context_t *ec, rb_control_frame_t *cfp, struct r
 
     const struct rb_callcache *cc = calling->cc;
     const rb_iseq_t *iseq = def_iseq_ptr(vm_cc_cme(cc)->def);
-    const int param_size = ISEQ_BODY(iseq)->param.size;
-    const int local_size = ISEQ_BODY(iseq)->local_table_size;
+    int param_size = ISEQ_BODY(iseq)->param.size;
+    int local_size = ISEQ_BODY(iseq)->local_table_size;
+
+    RUBY_ASSERT(!ISEQ_BODY(iseq)->param.flags.forwardable);
+
+    const int opt_pc = vm_callee_setup_arg(ec, calling, iseq, cfp->sp - calling->argc, param_size, local_size);
+    return vm_call_iseq_setup_2(ec, cfp, calling, opt_pc, param_size, local_size);
+}
+
+static VALUE
+vm_call_iseq_fwd_setup(rb_execution_context_t *ec, rb_control_frame_t *cfp, struct rb_calling_info *calling)
+{
+    RB_DEBUG_COUNTER_INC(ccf_iseq_setup);
+
+    const struct rb_callcache *cc = calling->cc;
+    const rb_iseq_t *iseq = def_iseq_ptr(vm_cc_cme(cc)->def);
+    int param_size = ISEQ_BODY(iseq)->param.size;
+    int local_size = ISEQ_BODY(iseq)->local_table_size;
+
+    RUBY_ASSERT(ISEQ_BODY(iseq)->param.flags.forwardable);
+
+    // Setting up local size and param size
+    local_size = local_size + vm_ci_argc(calling->cd->ci);
+    param_size = param_size + vm_ci_argc(calling->cd->ci);
+
     const int opt_pc = vm_callee_setup_arg(ec, calling, iseq, cfp->sp - calling->argc, param_size, local_size);
     return vm_call_iseq_setup_2(ec, cfp, calling, opt_pc, param_size, local_size);
 }
@@ -3439,7 +3749,7 @@ vm_method_cfunc_entry(const rb_callable_method_entry_t *me)
     return UNALIGNED_MEMBER_PTR(me->def, body.cfunc);
 }
 
-static inline VALUE
+static VALUE
 vm_call_cfunc_with_frame_(rb_execution_context_t *ec, rb_control_frame_t *reg_cfp, struct rb_calling_info *calling,
                           int argc, VALUE *argv, VALUE *stack_bottom)
 {
@@ -3485,6 +3795,24 @@ vm_call_cfunc_with_frame_(rb_execution_context_t *ec, rb_control_frame_t *reg_cf
     return val;
 }
 
+// Push a C method frame for a given cme. This is called when JIT code skipped
+// pushing a frame but the C method reached a point where a frame is needed.
+void
+rb_vm_push_cfunc_frame(const rb_callable_method_entry_t *cme, int recv_idx)
+{
+    VM_ASSERT(cme->def->type == VM_METHOD_TYPE_CFUNC);
+    rb_execution_context_t *ec = GET_EC();
+    VALUE *sp = ec->cfp->sp;
+    VALUE recv = *(sp - recv_idx - 1);
+    VALUE frame_type = VM_FRAME_MAGIC_CFUNC | VM_FRAME_FLAG_CFRAME | VM_ENV_FLAG_LOCAL;
+    VALUE block_handler = VM_BLOCK_HANDLER_NONE;
+#if VM_CHECK_MODE > 0
+    // Clean up the stack canary since we're about to satisfy the "leaf or lazy push" assumption
+    *(GET_EC()->cfp->sp) = Qfalse;
+#endif
+    vm_push_frame(ec, NULL, frame_type, recv, block_handler, (VALUE)cme, 0, ec->cfp->sp, 0, 0);
+}
+
 // If true, cc->call needs to include `CALLER_SETUP_ARG` (i.e. can't be skipped in fastpath)
 bool
 rb_splat_or_kwargs_p(const struct rb_callinfo *restrict ci)
@@ -3523,7 +3851,7 @@ vm_call_cfunc_other(rb_execution_context_t *ec, rb_control_frame_t *reg_cfp, str
         return vm_call_cfunc_with_frame_(ec, reg_cfp, calling, argc, argv, stack_bottom);
     }
     else {
-        CC_SET_FASTPATH(calling->cc, vm_call_cfunc_with_frame, !rb_splat_or_kwargs_p(ci) && !calling->kw_splat);
+        CC_SET_FASTPATH(calling->cc, vm_call_cfunc_with_frame, !rb_splat_or_kwargs_p(ci) && !calling->kw_splat && !(vm_ci_flag(ci) & VM_CALL_FORWARDING));
 
         return vm_call_cfunc_with_frame(ec, reg_cfp, calling);
     }
@@ -3580,7 +3908,7 @@ vm_call_cfunc_only_splat_kw(rb_execution_context_t *ec, rb_control_frame_t *reg_
     RB_DEBUG_COUNTER_INC(ccf_cfunc_only_splat_kw);
     VALUE keyword_hash = reg_cfp->sp[-1];
 
-    if (RB_TYPE_P(keyword_hash, T_HASH) && RHASH_EMPTY_P(keyword_hash)) {
+    if (keyword_hash == Qnil || (RB_TYPE_P(keyword_hash, T_HASH) && RHASH_EMPTY_P(keyword_hash))) {
         return vm_call_cfunc_array_argv(ec, reg_cfp, calling, 1, 0);
     }
 
@@ -3593,7 +3921,7 @@ vm_call_cfunc(rb_execution_context_t *ec, rb_control_frame_t *reg_cfp, struct rb
     const struct rb_callinfo *ci = calling->cd->ci;
     RB_DEBUG_COUNTER_INC(ccf_cfunc);
 
-    if (IS_ARGS_SPLAT(ci)) {
+    if (IS_ARGS_SPLAT(ci) && !(vm_ci_flag(ci) & VM_CALL_FORWARDING)) {
         if (!IS_ARGS_KW_SPLAT(ci) && vm_ci_argc(ci) == 1) {
             // f(*a)
             CC_SET_FASTPATH(calling->cc, vm_call_cfunc_only_splat, TRUE);
@@ -3626,10 +3954,11 @@ vm_call_attrset_direct(rb_execution_context_t *ec, rb_control_frame_t *cfp, cons
     RB_DEBUG_COUNTER_INC(ccf_attrset);
     VALUE val = *(cfp->sp - 1);
     cfp->sp -= 2;
-    attr_index_t index = vm_cc_attr_index(cc);
-    shape_id_t dest_shape_id = vm_cc_attr_index_dest_shape_id(cc);
+    attr_index_t index;
+    shape_id_t dest_shape_id;
+    vm_cc_atomic_shape_and_index(cc, &dest_shape_id, &index);
     ID id = vm_cc_cme(cc)->def->body.attr.id;
-    rb_check_frozen_internal(obj);
+    rb_check_frozen(obj);
     VALUE res = vm_setivar(obj, id, val, dest_shape_id, index);
     if (UNDEF_P(res)) {
         switch (BUILTIN_TYPE(obj)) {
@@ -3672,13 +4001,12 @@ vm_call_bmethod_body(rb_execution_context_t *ec, struct rb_calling_info *calling
 
     /* control block frame */
     GetProcPtr(procv, proc);
-    val = rb_vm_invoke_bmethod(ec, proc, calling->recv, CALLING_ARGC(calling), argv, calling->kw_splat, calling->block_handler, vm_cc_cme(cc));
+    val = vm_invoke_bmethod(ec, proc, calling->recv, CALLING_ARGC(calling), argv, calling->kw_splat, calling->block_handler, vm_cc_cme(cc));
 
     return val;
 }
 
 static int 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);
-static VALUE invoke_bmethod(rb_execution_context_t *ec, const rb_iseq_t *iseq, VALUE self, const struct rb_captured_block *captured, const rb_callable_method_entry_t *me, VALUE type, int opt_pc);
 
 static VALUE
 vm_call_iseq_bmethod(rb_execution_context_t *ec, rb_control_frame_t *cfp, struct rb_calling_info *calling)
@@ -3783,7 +4111,7 @@ rb_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) &&
+    if (RB_TYPE_P(klass, T_ICLASS) && RICLASS_IS_ORIGIN_P(klass) &&
             RB_TYPE_P(RBASIC_CLASS(klass), T_CLASS)) {
         klass = RBASIC_CLASS(klass);
     }
@@ -3807,10 +4135,10 @@ aliased_callable_method_entry(const rb_callable_method_entry_t *me)
 
     if (orig_me->defined_class == 0) {
         VALUE defined_class = rb_find_defined_class_by_owner(me->defined_class, orig_me->owner);
-        VM_ASSERT(RB_TYPE_P(orig_me->owner, T_MODULE));
+        VM_ASSERT_TYPE(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) {
+        if (me->def->reference_count == 1) {
             RB_OBJ_WRITE(me, &me->def->body.alias.original_me, cme);
         }
         else {
@@ -3924,10 +4252,23 @@ vm_call_symbol(rb_execution_context_t *ec, rb_control_frame_t *reg_cfp,
         }
     }
 
-    calling->cd = &(struct rb_call_data) {
-        .ci = &VM_CI_ON_STACK(mid, flags, argc, vm_ci_kwarg(ci)),
-        .cc = NULL,
+    struct rb_forwarding_call_data new_fcd = {
+        .cd = {
+            .ci = &VM_CI_ON_STACK(mid, flags, argc, vm_ci_kwarg(ci)),
+            .cc = NULL,
+        },
+        .caller_ci = NULL,
     };
+
+    if (!(vm_ci_flag(ci) & VM_CALL_FORWARDING)) {
+        calling->cd = &new_fcd.cd;
+    }
+    else {
+        const struct rb_callinfo *caller_ci = ((struct rb_forwarding_call_data *)calling->cd)->caller_ci;
+        VM_ASSERT((vm_ci_argc(caller_ci), 1));
+        new_fcd.caller_ci = caller_ci;
+        calling->cd = (struct rb_call_data *)&new_fcd;
+    }
     calling->cc = &VM_CC_ON_STACK(klass,
                                   vm_call_general,
                                   { .method_missing_reason = missing_reason },
@@ -4036,10 +4377,10 @@ vm_call_opt_send(rb_execution_context_t *ec, rb_control_frame_t *reg_cfp, struct
     const struct rb_callinfo *ci = calling->cd->ci;
     int flags = vm_ci_flag(ci);
 
-    if (UNLIKELY(!(flags & VM_CALL_ARGS_SIMPLE) &&
+    if (UNLIKELY((flags & VM_CALL_FORWARDING) || (!(flags & VM_CALL_ARGS_SIMPLE) &&
         ((calling->argc == 1 && (flags & (VM_CALL_ARGS_SPLAT | VM_CALL_KW_SPLAT))) ||
          (calling->argc == 2 && (flags & VM_CALL_ARGS_SPLAT) && (flags & VM_CALL_KW_SPLAT)) ||
-         ((flags & VM_CALL_KWARG) && (vm_ci_kwarg(ci)->keyword_len == calling->argc))))) {
+         ((flags & VM_CALL_KWARG) && (vm_ci_kwarg(ci)->keyword_len == calling->argc)))))) {
         CC_SET_FASTPATH(calling->cc, vm_call_opt_send_complex, TRUE);
         return vm_call_opt_send_complex(ec, reg_cfp, calling);
     }
@@ -4070,10 +4411,25 @@ vm_call_method_missing_body(rb_execution_context_t *ec, rb_control_frame_t *reg_
     INC_SP(1);
 
     ec->method_missing_reason = reason;
-    calling->cd = &(struct rb_call_data) {
-        .ci = &VM_CI_ON_STACK(idMethodMissing, flag, argc, vm_ci_kwarg(orig_ci)),
-        .cc = NULL,
+
+    struct rb_forwarding_call_data new_fcd = {
+        .cd = {
+            .ci = &VM_CI_ON_STACK(idMethodMissing, flag, argc, vm_ci_kwarg(orig_ci)),
+            .cc = NULL,
+        },
+        .caller_ci = NULL,
     };
+
+    if (!(flag & VM_CALL_FORWARDING)) {
+        calling->cd = &new_fcd.cd;
+    }
+    else {
+        const struct rb_callinfo *caller_ci = ((struct rb_forwarding_call_data *)calling->cd)->caller_ci;
+        VM_ASSERT((vm_ci_argc(caller_ci), 1));
+        new_fcd.caller_ci = caller_ci;
+        calling->cd = (struct rb_call_data *)&new_fcd;
+    }
+
     calling->cc = &VM_CC_ON_STACK(Qundef, vm_call_general, {{ 0 }},
                                   rb_callable_method_entry_without_refinements(CLASS_OF(calling->recv), idMethodMissing, NULL));
     return vm_call_method(ec, reg_cfp, calling);
@@ -4326,6 +4682,19 @@ vm_call_opt_struct_aset(rb_execution_context_t *ec, rb_control_frame_t *reg_cfp,
 NOINLINE(static VALUE vm_call_optimized(rb_execution_context_t *ec, rb_control_frame_t *cfp, struct rb_calling_info *calling,
                                         const struct rb_callinfo *ci, const struct rb_callcache *cc));
 
+#define VM_CALL_METHOD_ATTR(var, func, nohook) \
+    if (UNLIKELY(ruby_vm_event_flags & (RUBY_EVENT_C_CALL | RUBY_EVENT_C_RETURN))) { \
+        EXEC_EVENT_HOOK(ec, RUBY_EVENT_C_CALL, calling->recv, vm_cc_cme(cc)->def->original_id, \
+                        vm_ci_mid(ci), vm_cc_cme(cc)->owner, Qundef); \
+        var = func; \
+        EXEC_EVENT_HOOK(ec, RUBY_EVENT_C_RETURN, calling->recv, vm_cc_cme(cc)->def->original_id, \
+                        vm_ci_mid(ci), vm_cc_cme(cc)->owner, (var)); \
+    } \
+    else { \
+        nohook; \
+        var = func; \
+    }
+
 static VALUE
 vm_call_optimized(rb_execution_context_t *ec, rb_control_frame_t *cfp, struct rb_calling_info *calling,
                   const struct rb_callinfo *ci, const struct rb_callcache *cc)
@@ -4340,35 +4709,33 @@ vm_call_optimized(rb_execution_context_t *ec, rb_control_frame_t *cfp, struct rb
       case OPTIMIZED_METHOD_TYPE_BLOCK_CALL:
         CC_SET_FASTPATH(cc, vm_call_opt_block_call, TRUE);
         return vm_call_opt_block_call(ec, cfp, calling);
-      case OPTIMIZED_METHOD_TYPE_STRUCT_AREF:
+      case OPTIMIZED_METHOD_TYPE_STRUCT_AREF: {
         CALLER_SETUP_ARG(cfp, calling, ci, 0);
         rb_check_arity(calling->argc, 0, 0);
-        CC_SET_FASTPATH(cc, vm_call_opt_struct_aref, (vm_ci_flag(ci) & VM_CALL_ARGS_SIMPLE));
-        return vm_call_opt_struct_aref(ec, cfp, calling);
 
-      case OPTIMIZED_METHOD_TYPE_STRUCT_ASET:
+        VALUE v;
+        VM_CALL_METHOD_ATTR(v,
+                            vm_call_opt_struct_aref(ec, cfp, calling),
+                            set_vm_cc_ivar(cc); \
+                            CC_SET_FASTPATH(cc, vm_call_opt_struct_aref, (vm_ci_flag(ci) & VM_CALL_ARGS_SIMPLE)))
+        return v;
+      }
+      case OPTIMIZED_METHOD_TYPE_STRUCT_ASET: {
         CALLER_SETUP_ARG(cfp, calling, ci, 1);
         rb_check_arity(calling->argc, 1, 1);
-        CC_SET_FASTPATH(cc, vm_call_opt_struct_aset, (vm_ci_flag(ci) & VM_CALL_ARGS_SIMPLE));
-        return vm_call_opt_struct_aset(ec, cfp, calling);
+
+        VALUE v;
+        VM_CALL_METHOD_ATTR(v,
+                            vm_call_opt_struct_aset(ec, cfp, calling),
+                            set_vm_cc_ivar(cc); \
+                            CC_SET_FASTPATH(cc, vm_call_opt_struct_aset, (vm_ci_flag(ci) & VM_CALL_ARGS_SIMPLE)))
+        return v;
+      }
       default:
         rb_bug("vm_call_method: unsupported optimized method type (%d)", vm_cc_cme(cc)->def->body.optimized.type);
     }
 }
 
-#define VM_CALL_METHOD_ATTR(var, func, nohook) \
-    if (UNLIKELY(ruby_vm_event_flags & (RUBY_EVENT_C_CALL | RUBY_EVENT_C_RETURN))) { \
-        EXEC_EVENT_HOOK(ec, RUBY_EVENT_C_CALL, calling->recv, vm_cc_cme(cc)->def->original_id, \
-                        vm_ci_mid(ci), vm_cc_cme(cc)->owner, Qundef); \
-        var = func; \
-        EXEC_EVENT_HOOK(ec, RUBY_EVENT_C_RETURN, calling->recv, vm_cc_cme(cc)->def->original_id, \
-                        vm_ci_mid(ci), vm_cc_cme(cc)->owner, (var)); \
-    } \
-    else { \
-        nohook; \
-        var = func; \
-    }
-
 static VALUE
 vm_call_method_each_type(rb_execution_context_t *ec, rb_control_frame_t *cfp, struct rb_calling_info *calling)
 {
@@ -4377,10 +4744,18 @@ vm_call_method_each_type(rb_execution_context_t *ec, rb_control_frame_t *cfp, st
     const rb_callable_method_entry_t *cme = vm_cc_cme(cc);
     VALUE v;
 
+    VM_ASSERT(! METHOD_ENTRY_INVALIDATED(cme));
+
     switch (cme->def->type) {
       case VM_METHOD_TYPE_ISEQ:
-        CC_SET_FASTPATH(cc, vm_call_iseq_setup, TRUE);
-        return vm_call_iseq_setup(ec, cfp, calling);
+        if (ISEQ_BODY(def_iseq_ptr(cme->def))->param.flags.forwardable) {
+            CC_SET_FASTPATH(cc, vm_call_iseq_fwd_setup, TRUE);
+            return vm_call_iseq_fwd_setup(ec, cfp, calling);
+        }
+        else {
+            CC_SET_FASTPATH(cc, vm_call_iseq_setup, TRUE);
+            return vm_call_iseq_setup(ec, cfp, calling);
+        }
 
       case VM_METHOD_TYPE_NOTIMPLEMENTED:
       case VM_METHOD_TYPE_CFUNC:
@@ -4392,7 +4767,7 @@ vm_call_method_each_type(rb_execution_context_t *ec, rb_control_frame_t *cfp, st
 
         rb_check_arity(calling->argc, 1, 1);
 
-        const unsigned int aset_mask = (VM_CALL_ARGS_SPLAT | VM_CALL_KW_SPLAT | VM_CALL_KWARG);
+        const unsigned int aset_mask = (VM_CALL_ARGS_SPLAT | VM_CALL_KW_SPLAT | VM_CALL_KWARG | VM_CALL_FORWARDING);
 
         if (vm_cc_markable(cc)) {
             vm_cc_attr_index_initialize(cc, INVALID_SHAPE_ID);
@@ -4411,7 +4786,7 @@ vm_call_method_each_type(rb_execution_context_t *ec, rb_control_frame_t *cfp, st
                     .call_ = cc->call_,
                     .aux_  = {
                         .attr = {
-                            .value = INVALID_SHAPE_ID << SHAPE_FLAG_SHIFT,
+                            .value = vm_pack_shape_and_index(INVALID_SHAPE_ID, ATTR_INDEX_NOT_SET),
                         }
                     },
             });
@@ -4426,7 +4801,7 @@ vm_call_method_each_type(rb_execution_context_t *ec, rb_control_frame_t *cfp, st
         CALLER_SETUP_ARG(cfp, calling, ci, 0);
         rb_check_arity(calling->argc, 0, 0);
         vm_cc_attr_index_initialize(cc, INVALID_SHAPE_ID);
-        const unsigned int ivar_mask = (VM_CALL_ARGS_SPLAT | VM_CALL_KW_SPLAT);
+        const unsigned int ivar_mask = (VM_CALL_ARGS_SPLAT | VM_CALL_KW_SPLAT | VM_CALL_FORWARDING);
         VM_CALL_METHOD_ATTR(v,
                             vm_call_ivar(ec, cfp, calling),
                             CC_SET_FASTPATH(cc, vm_call_ivar, !(vm_ci_flag(ci) & ivar_mask)));
@@ -4645,13 +5020,18 @@ vm_search_super_method(const rb_control_frame_t *reg_cfp, struct rb_call_data *c
 
     ID mid = me->def->original_id;
 
-    // update iseq. really? (TODO)
-    cd->ci = vm_ci_new_runtime(mid,
-                               vm_ci_flag(cd->ci),
-                               vm_ci_argc(cd->ci),
-                               vm_ci_kwarg(cd->ci));
+    if (!vm_ci_markable(cd->ci)) {
+        VM_FORCE_WRITE((const VALUE *)&cd->ci->mid, (VALUE)mid);
+    }
+    else {
+        // update iseq. really? (TODO)
+        cd->ci = vm_ci_new_runtime(mid,
+                                   vm_ci_flag(cd->ci),
+                                   vm_ci_argc(cd->ci),
+                                   vm_ci_kwarg(cd->ci));
 
-    RB_OBJ_WRITTEN(reg_cfp->iseq, Qundef, cd->ci);
+        RB_OBJ_WRITTEN(reg_cfp->iseq, Qundef, cd->ci);
+    }
 
     const struct rb_callcache *cc;
 
@@ -4717,6 +5097,20 @@ block_proc_is_lambda(const VALUE procval)
     }
 }
 
+static inline const rb_namespace_t *
+block_proc_namespace(const VALUE procval)
+{
+    rb_proc_t *proc;
+
+    if (procval) {
+        GetProcPtr(procval, proc);
+        return proc->ns;
+    }
+    else {
+        return NULL;
+    }
+}
+
 static VALUE
 vm_yield_with_cfunc(rb_execution_context_t *ec,
                     const struct rb_captured_block *captured,
@@ -4827,7 +5221,7 @@ vm_callee_setup_block_arg(rb_execution_context_t *ec, struct rb_calling_info *ca
                 }
             }
             else {
-                argument_arity_error(ec, iseq, calling->argc, ISEQ_BODY(iseq)->param.lead_num, ISEQ_BODY(iseq)->param.lead_num);
+                argument_arity_error(ec, iseq, NULL, calling->argc, ISEQ_BODY(iseq)->param.lead_num, ISEQ_BODY(iseq)->param.lead_num);
             }
         }
 
@@ -4849,6 +5243,7 @@ vm_yield_setup_args(rb_execution_context_t *ec, const rb_iseq_t *iseq, const int
     calling->kw_splat = (flags & VM_CALL_KW_SPLAT) ?  1 : 0;
     calling->recv = Qundef;
     calling->heap_argv = 0;
+    calling->cc = NULL;
     struct rb_callinfo dummy_ci = VM_CI_ON_STACK(0, flags, 0, 0);
 
     return vm_callee_setup_block_arg(ec, calling, &dummy_ci, iseq, argv, arg_setup_type);
@@ -4867,11 +5262,16 @@ vm_invoke_iseq_block(rb_execution_context_t *ec, rb_control_frame_t *reg_cfp,
     VALUE * const rsp = GET_SP() - calling->argc;
     VALUE * const argv = rsp;
     int opt_pc = vm_callee_setup_block_arg(ec, calling, ci, iseq, argv, is_lambda ? arg_setup_method : arg_setup_block);
+    int frame_flag = VM_FRAME_MAGIC_BLOCK | (is_lambda ? VM_FRAME_FLAG_LAMBDA : 0);
 
     SET_SP(rsp);
 
+    if (calling->proc_ns) {
+        frame_flag |= VM_FRAME_FLAG_NS_SWITCH;
+    }
+
     vm_push_frame(ec, iseq,
-                  VM_FRAME_MAGIC_BLOCK | (is_lambda ? VM_FRAME_FLAG_LAMBDA : 0),
+                  frame_flag,
                   captured->self,
                   VM_GUARDED_PREV_EP(captured->ep), 0,
                   ISEQ_BODY(iseq)->iseq_encoded + opt_pc,
@@ -4970,6 +5370,9 @@ vm_invoke_proc_block(rb_execution_context_t *ec, rb_control_frame_t *reg_cfp,
 {
     while (vm_block_handler_type(block_handler) == block_handler_type_proc) {
         VALUE proc = VM_BH_TO_PROC(block_handler);
+        if (!calling->proc_ns) {
+            calling->proc_ns = block_proc_namespace(proc);
+        }
         is_lambda = block_proc_is_lambda(proc);
         block_handler = vm_proc_to_block_handler(proc);
     }
@@ -5163,6 +5566,14 @@ vm_get_special_object(const VALUE *const reg_ep,
     }
 }
 
+// ZJIT implementation is using the C function
+// and needs to call a non-static function
+VALUE
+rb_vm_get_special_object(const VALUE *reg_ep, enum vm_special_object_type type)
+{
+    return vm_get_special_object(reg_ep, type);
+}
+
 static VALUE
 vm_concat_array(VALUE ary1, VALUE ary2st)
 {
@@ -5173,15 +5584,34 @@ vm_concat_array(VALUE ary1, VALUE ary2st)
     if (NIL_P(tmp1)) {
         tmp1 = rb_ary_new3(1, ary1);
     }
+    if (tmp1 == ary1) {
+        tmp1 = rb_ary_dup(ary1);
+    }
 
     if (NIL_P(tmp2)) {
-        tmp2 = rb_ary_new3(1, ary2);
+        return rb_ary_push(tmp1, ary2);
+    }
+    else {
+        return rb_ary_concat(tmp1, tmp2);
     }
+}
 
-    if (tmp1 == ary1) {
-        tmp1 = rb_ary_dup(ary1);
+static VALUE
+vm_concat_to_array(VALUE ary1, VALUE ary2st)
+{
+    /* ary1 must be a newly created array */
+    const VALUE ary2 = ary2st;
+
+    if (NIL_P(ary2)) return ary1;
+
+    VALUE tmp2 = rb_check_to_array(ary2);
+
+    if (NIL_P(tmp2)) {
+        return rb_ary_push(ary1, ary2);
+    }
+    else {
+        return rb_ary_concat(ary1, tmp2);
     }
-    return rb_ary_concat(tmp1, tmp2);
 }
 
 // YJIT implementation is using the C function
@@ -5192,9 +5622,18 @@ rb_vm_concat_array(VALUE ary1, VALUE ary2st)
     return vm_concat_array(ary1, ary2st);
 }
 
+VALUE
+rb_vm_concat_to_array(VALUE ary1, VALUE ary2st)
+{
+    return vm_concat_to_array(ary1, ary2st);
+}
+
 static VALUE
 vm_splat_array(VALUE flag, VALUE ary)
 {
+    if (NIL_P(ary)) {
+        return RTEST(flag) ? rb_ary_new() : rb_cArray_empty_frozen;
+    }
     VALUE tmp = rb_check_to_array(ary);
     if (NIL_P(tmp)) {
         return rb_ary_new3(1, ary);
@@ -5392,6 +5831,7 @@ vm_define_class(ID id, rb_num_t flags, VALUE cbase, VALUE super)
 
     /* find klass */
     rb_autoload_load(cbase, id);
+
     if ((klass = vm_const_get_under(id, flags, cbase)) != 0) {
         if (!vm_check_if_class(id, flags, super, klass))
             unmatched_redefinition("class", cbase, id, klass);
@@ -5492,9 +5932,8 @@ vm_define_method(const rb_execution_context_t *ec, VALUE obj, ID id, VALUE iseqv
 
     rb_add_method_iseq(klass, id, (const rb_iseq_t *)iseqval, cref, visi);
     // Set max_iv_count on klasses based on number of ivar sets that are in the initialize method
-    if (id == rb_intern("initialize") && klass != rb_cObject &&  RB_TYPE_P(klass, T_CLASS) && (rb_get_alloc_func(klass) == rb_class_allocate_instance)) {
-
-        RCLASS_EXT(klass)->max_iv_count = rb_estimate_iv_count(klass, (const rb_iseq_t *)iseqval);
+    if (id == idInitialize && klass != rb_cObject &&  RB_TYPE_P(klass, T_CLASS) && (rb_get_alloc_func(klass) == rb_class_allocate_instance)) {
+        RCLASS_SET_MAX_IV_COUNT(klass, rb_estimate_iv_count(klass, (const rb_iseq_t *)iseqval));
     }
 
     if (!is_singleton && vm_scope_module_func_check(ec)) {
@@ -5565,8 +6004,28 @@ vm_sendish(
 VALUE
 rb_vm_send(rb_execution_context_t *ec, rb_control_frame_t *reg_cfp, CALL_DATA cd, ISEQ blockiseq)
 {
-    VALUE bh = vm_caller_setup_arg_block(ec, GET_CFP(), cd->ci, blockiseq, false);
-    VALUE val = vm_sendish(ec, GET_CFP(), cd, bh, mexp_search_method);
+    stack_check(ec);
+
+    struct rb_forwarding_call_data adjusted_cd;
+    struct rb_callinfo adjusted_ci;
+
+    VALUE bh;
+    VALUE val;
+
+    if (vm_ci_flag(cd->ci) & VM_CALL_FORWARDING) {
+        bh = vm_caller_setup_fwd_args(GET_EC(), GET_CFP(), cd, blockiseq, false, &adjusted_cd, &adjusted_ci);
+
+        val = vm_sendish(ec, GET_CFP(), &adjusted_cd.cd, bh, mexp_search_method);
+
+        if (cd->cc != adjusted_cd.cd.cc && vm_cc_markable(adjusted_cd.cd.cc)) {
+            RB_OBJ_WRITE(GET_ISEQ(), &cd->cc, adjusted_cd.cd.cc);
+        }
+    }
+    else {
+        bh = vm_caller_setup_arg_block(ec, GET_CFP(), cd->ci, blockiseq, false);
+        val = vm_sendish(ec, GET_CFP(), cd, bh, mexp_search_method);
+    }
+
     VM_EXEC(ec, val);
     return val;
 }
@@ -5574,6 +6033,7 @@ rb_vm_send(rb_execution_context_t *ec, rb_control_frame_t *reg_cfp, CALL_DATA cd
 VALUE
 rb_vm_opt_send_without_block(rb_execution_context_t *ec, rb_control_frame_t *reg_cfp, CALL_DATA cd)
 {
+    stack_check(ec);
     VALUE bh = VM_BLOCK_HANDLER_NONE;
     VALUE val = vm_sendish(ec, GET_CFP(), cd, bh, mexp_search_method);
     VM_EXEC(ec, val);
@@ -5583,8 +6043,27 @@ rb_vm_opt_send_without_block(rb_execution_context_t *ec, rb_control_frame_t *reg
 VALUE
 rb_vm_invokesuper(rb_execution_context_t *ec, rb_control_frame_t *reg_cfp, CALL_DATA cd, ISEQ blockiseq)
 {
-    VALUE bh = vm_caller_setup_arg_block(ec, GET_CFP(), cd->ci, blockiseq, true);
-    VALUE val = vm_sendish(ec, GET_CFP(), cd, bh, mexp_search_super);
+    stack_check(ec);
+    struct rb_forwarding_call_data adjusted_cd;
+    struct rb_callinfo adjusted_ci;
+
+    VALUE bh;
+    VALUE val;
+
+    if (vm_ci_flag(cd->ci) & VM_CALL_FORWARDING) {
+        bh = vm_caller_setup_fwd_args(GET_EC(), GET_CFP(), cd, blockiseq, true, &adjusted_cd, &adjusted_ci);
+
+        val = vm_sendish(ec, GET_CFP(), &adjusted_cd.cd, bh, mexp_search_super);
+
+        if (cd->cc != adjusted_cd.cd.cc && vm_cc_markable(adjusted_cd.cd.cc)) {
+            RB_OBJ_WRITE(GET_ISEQ(), &cd->cc, adjusted_cd.cd.cc);
+        }
+    }
+    else {
+        bh = vm_caller_setup_arg_block(ec, GET_CFP(), cd->ci, blockiseq, true);
+        val = vm_sendish(ec, GET_CFP(), cd, bh, mexp_search_super);
+    }
+
     VM_EXEC(ec, val);
     return val;
 }
@@ -5592,6 +6071,7 @@ rb_vm_invokesuper(rb_execution_context_t *ec, rb_control_frame_t *reg_cfp, CALL_
 VALUE
 rb_vm_invokeblock(rb_execution_context_t *ec, rb_control_frame_t *reg_cfp, CALL_DATA cd)
 {
+    stack_check(ec);
     VALUE bh = VM_BLOCK_HANDLER_NONE;
     VALUE val = vm_sendish(ec, GET_CFP(), cd, bh, mexp_search_invokeblock);
     VM_EXEC(ec, val);
@@ -5621,7 +6101,7 @@ vm_objtostring(const rb_iseq_t *iseq, VALUE recv, CALL_DATA cd)
 
     switch (type) {
       case T_SYMBOL:
-        if (check_cfunc(vm_cc_cme(cc), rb_sym_to_s)) {
+        if (check_method_basic_definition(vm_cc_cme(cc))) {
             // rb_sym_to_s() allocates a mutable string, but since we are only
             // going to use this string for interpolation, it's fine to use the
             // frozen string.
@@ -5665,6 +6145,28 @@ vm_objtostring(const rb_iseq_t *iseq, VALUE recv, CALL_DATA cd)
     return Qundef;
 }
 
+static VALUE
+vm_opt_ary_freeze(VALUE ary, int bop, ID id)
+{
+    if (BASIC_OP_UNREDEFINED_P(bop, ARRAY_REDEFINED_OP_FLAG)) {
+        return ary;
+    }
+    else {
+        return Qundef;
+    }
+}
+
+static VALUE
+vm_opt_hash_freeze(VALUE hash, int bop, ID id)
+{
+    if (BASIC_OP_UNREDEFINED_P(bop, HASH_REDEFINED_OP_FLAG)) {
+        return hash;
+    }
+    else {
+        return Qundef;
+    }
+}
+
 static VALUE
 vm_opt_str_freeze(VALUE str, int bop, ID id)
 {
@@ -5679,6 +6181,29 @@ vm_opt_str_freeze(VALUE str, int bop, ID id)
 /* this macro is mandatory to use OPTIMIZED_CMP. What a design! */
 #define id_cmp idCmp
 
+static VALUE
+vm_opt_duparray_include_p(rb_execution_context_t *ec, const VALUE ary, VALUE target)
+{
+    if (BASIC_OP_UNREDEFINED_P(BOP_INCLUDE_P, ARRAY_REDEFINED_OP_FLAG)) {
+        return rb_ary_includes(ary, target);
+    }
+    else {
+        VALUE args[1] = {target};
+
+        // duparray
+        RUBY_DTRACE_CREATE_HOOK(ARRAY, RARRAY_LEN(ary));
+        VALUE dupary = rb_ary_resurrect(ary);
+
+        return rb_vm_call_with_refinements(ec, dupary, idIncludeP, 1, args, RB_NO_KEYWORDS);
+    }
+}
+
+VALUE
+rb_vm_opt_duparray_include_p(rb_execution_context_t *ec, const VALUE ary, VALUE target)
+{
+    return vm_opt_duparray_include_p(ec, ary, target);
+}
+
 static VALUE
 vm_opt_newarray_max(rb_execution_context_t *ec, rb_num_t num, const VALUE *ptr)
 {
@@ -5757,43 +6282,118 @@ rb_vm_opt_newarray_hash(rb_execution_context_t *ec, rb_num_t num, const VALUE *p
     return vm_opt_newarray_hash(ec, num, ptr);
 }
 
-#undef id_cmp
+VALUE rb_setup_fake_ary(struct RArray *fake_ary, const VALUE *list, long len);
+VALUE rb_ec_pack_ary(rb_execution_context_t *ec, VALUE ary, VALUE fmt, VALUE buffer);
+
+static VALUE
+vm_opt_newarray_include_p(rb_execution_context_t *ec, rb_num_t num, const VALUE *ptr, VALUE target)
+{
+    if (BASIC_OP_UNREDEFINED_P(BOP_INCLUDE_P, ARRAY_REDEFINED_OP_FLAG)) {
+        struct RArray fake_ary;
+        VALUE ary = rb_setup_fake_ary(&fake_ary, ptr, num);
+        return rb_ary_includes(ary, target);
+    }
+    else {
+        VALUE args[1] = {target};
+        return rb_vm_call_with_refinements(ec, rb_ary_new4(num, ptr), idIncludeP, 1, args, RB_NO_KEYWORDS);
+    }
+}
+
+VALUE
+rb_vm_opt_newarray_include_p(rb_execution_context_t *ec, rb_num_t num, const VALUE *ptr, VALUE target)
+{
+    return vm_opt_newarray_include_p(ec, num, ptr, target);
+}
 
-#define IMEMO_CONST_CACHE_SHAREABLE IMEMO_FL_USER0
+static VALUE
+vm_opt_newarray_pack_buffer(rb_execution_context_t *ec, rb_num_t num, const VALUE *ptr, VALUE fmt, VALUE buffer)
+{
+    if (BASIC_OP_UNREDEFINED_P(BOP_PACK, ARRAY_REDEFINED_OP_FLAG)) {
+        struct RArray fake_ary;
+        VALUE ary = rb_setup_fake_ary(&fake_ary, ptr, num);
+        return rb_ec_pack_ary(ec, ary, fmt, (UNDEF_P(buffer) ? Qnil : buffer));
+    }
+    else {
+        // The opt_newarray_send insn drops the keyword args so we need to rebuild them.
+        // Setup an array with room for keyword hash.
+        VALUE args[2];
+        args[0] = fmt;
+        int kw_splat = RB_NO_KEYWORDS;
+        int argc = 1;
+
+        if (!UNDEF_P(buffer)) {
+            args[1] = rb_hash_new_with_size(1);
+            rb_hash_aset(args[1], ID2SYM(idBuffer), buffer);
+            kw_splat = RB_PASS_KEYWORDS;
+            argc++;
+        }
+
+        return rb_vm_call_with_refinements(ec, rb_ary_new4(num, ptr), idPack, argc, args, kw_splat);
+    }
+}
+
+VALUE
+rb_vm_opt_newarray_pack_buffer(rb_execution_context_t *ec, rb_num_t num, const VALUE *ptr, VALUE fmt, VALUE buffer)
+{
+    return vm_opt_newarray_pack_buffer(ec, num, ptr, fmt, buffer);
+}
+
+VALUE
+rb_vm_opt_newarray_pack(rb_execution_context_t *ec, rb_num_t num, const VALUE *ptr, VALUE fmt)
+{
+    return vm_opt_newarray_pack_buffer(ec, num, ptr, fmt, Qundef);
+}
+
+#undef id_cmp
 
 static void
 vm_track_constant_cache(ID id, void *ic)
 {
-    struct rb_id_table *const_cache = GET_VM()->constant_cache;
+    rb_vm_t *vm = GET_VM();
+    struct rb_id_table *const_cache = vm->constant_cache;
     VALUE lookup_result;
-    st_table *ics;
+    set_table *ics;
 
     if (rb_id_table_lookup(const_cache, id, &lookup_result)) {
-        ics = (st_table *)lookup_result;
+        ics = (set_table *)lookup_result;
     }
     else {
-        ics = st_init_numtable();
+        ics = set_init_numtable();
         rb_id_table_insert(const_cache, id, (VALUE)ics);
     }
 
-    st_insert(ics, (st_data_t) ic, (st_data_t) Qtrue);
+    /* The call below to st_insert could allocate which could trigger a GC.
+     * If it triggers a GC, it may free an iseq that also holds a cache to this
+     * constant. If that iseq is the last iseq with a cache to this constant, then
+     * it will free this ST table, which would cause an use-after-free during this
+     * st_insert.
+     *
+     * So to fix this issue, we store the ID that is currently being inserted
+     * and, in remove_from_constant_cache, we don't free the ST table for ID
+     * equal to this one.
+     *
+     * See [Bug #20921].
+     */
+    vm->inserting_constant_cache_id = id;
+
+    set_insert(ics, (st_data_t)ic);
+
+    vm->inserting_constant_cache_id = (ID)0;
 }
 
 static void
 vm_ic_track_const_chain(rb_control_frame_t *cfp, IC ic, const ID *segments)
 {
-    RB_VM_LOCK_ENTER();
-
-    for (int i = 0; segments[i]; i++) {
-        ID id = segments[i];
-        if (id == idNULL) continue;
-        vm_track_constant_cache(id, ic);
+    RB_VM_LOCKING() {
+        for (int i = 0; segments[i]; i++) {
+            ID id = segments[i];
+            if (id == idNULL) continue;
+            vm_track_constant_cache(id, ic);
+        }
     }
-
-    RB_VM_LOCK_LEAVE();
 }
 
-// For RJIT inlining
+// For JIT inlining
 static inline bool
 vm_inlined_ic_hit_p(VALUE flags, VALUE value, const rb_cref_t *ic_cref, const VALUE *reg_ep)
 {
@@ -5829,7 +6429,7 @@ vm_ic_update(const rb_iseq_t *iseq, IC ic, VALUE val, const VALUE *reg_ep, const
         return;
     }
 
-    struct iseq_inline_constant_cache_entry *ice = (struct iseq_inline_constant_cache_entry *)rb_imemo_new(imemo_constcache, 0, 0, 0, 0);
+    struct iseq_inline_constant_cache_entry *ice = IMEMO_NEW(struct iseq_inline_constant_cache_entry, imemo_constcache, 0);
     RB_OBJ_WRITE(ice, &ice->value, val);
     ice->ic_cref = vm_get_const_key_cref(reg_ep);
     if (rb_ractor_shareable_p(val)) ice->flags |= IMEMO_CONST_CACHE_SHAREABLE;
@@ -5838,7 +6438,28 @@ vm_ic_update(const rb_iseq_t *iseq, IC ic, VALUE val, const VALUE *reg_ep, const
     RUBY_ASSERT(pc >= ISEQ_BODY(iseq)->iseq_encoded);
     unsigned pos = (unsigned)(pc - ISEQ_BODY(iseq)->iseq_encoded);
     rb_yjit_constant_ic_update(iseq, ic, pos);
-    rb_rjit_constant_ic_update(iseq, ic, pos);
+}
+
+VALUE
+rb_vm_opt_getconstant_path(rb_execution_context_t *ec, rb_control_frame_t *const reg_cfp, IC ic)
+{
+    VALUE val;
+    const ID *segments = ic->segments;
+    struct iseq_inline_constant_cache_entry *ice = ic->entry;
+    if (ice && vm_ic_hit_p(ice, GET_EP())) {
+        val = ice->value;
+
+        VM_ASSERT(val == vm_get_ev_const_chain(ec, segments));
+    }
+    else {
+        ruby_vm_constant_cache_misses++;
+        val = vm_get_ev_const_chain(ec, segments);
+        vm_ic_track_const_chain(GET_CFP(), ic, segments);
+        // Undo the PC increment to get the address to this instruction
+        // INSN_ATTR(width) == 2
+        vm_ic_update(GET_ISEQ(), ic, val, GET_EP(), GET_PC() - 2);
+    }
+    return val;
 }
 
 static VALUE
@@ -6312,6 +6933,12 @@ vm_opt_aset_with(VALUE recv, VALUE key, VALUE val)
     }
 }
 
+VALUE
+rb_vm_opt_aset_with(VALUE recv, VALUE key, VALUE value)
+{
+    return vm_opt_aset_with(recv, key, value);
+}
+
 static VALUE
 vm_opt_length(VALUE recv, int bop)
 {
@@ -6479,22 +7106,6 @@ vm_trace_hook(rb_execution_context_t *ec, rb_control_frame_t *reg_cfp, const VAL
     }
 }
 
-// Return true if given cc has cfunc which is NOT handled by opt_send_without_block.
-bool
-rb_vm_opt_cfunc_p(CALL_CACHE cc, int insn)
-{
-    switch (insn) {
-      case BIN(opt_eq):
-        return check_cfunc(vm_cc_cme(cc), rb_obj_equal);
-      case BIN(opt_nil_p):
-        return check_cfunc(vm_cc_cme(cc), rb_false);
-      case BIN(opt_not):
-        return check_cfunc(vm_cc_cme(cc), rb_obj_not);
-      default:
-        return false;
-    }
-}
-
 #define VM_TRACE_HOOK(target_event, val) do { \
     if ((pc_events & (target_event)) & enabled_flags) { \
         vm_trace_hook(ec, reg_cfp, pc, pc_events, (target_event), global_hooks, local_hooks_ptr, (val)); \
@@ -6806,7 +7417,8 @@ invoke_bf(rb_execution_context_t *ec, rb_control_frame_t *reg_cfp, const struct
 {
     const bool canary_p = ISEQ_BODY(reg_cfp->iseq)->builtin_attrs & BUILTIN_ATTR_LEAF; // Verify an assumption of `Primitive.attr! :leaf`
     SETUP_CANARY(canary_p);
-    VALUE ret = (*lookup_builtin_invoker(bf->argc))(ec, reg_cfp->self, argv, (rb_insn_func_t)bf->func_ptr);
+    rb_insn_func_t func_ptr = (rb_insn_func_t)(uintptr_t)bf->func_ptr;
+    VALUE ret = (*lookup_builtin_invoker(bf->argc))(ec, reg_cfp->self, argv, func_ptr);
     CHECK_CANARY(canary_p, BIN(invokebuiltin));
     return ret;
 }
@@ -6825,7 +7437,8 @@ vm_invoke_builtin_delegate(rb_execution_context_t *ec, rb_control_frame_t *cfp,
         for (int i=0; i<bf->argc; i++) {
             ruby_debug_printf(":%s ", rb_id2name(ISEQ_BODY(cfp->iseq)->local_table[i+start_index]));
         }
-        ruby_debug_printf("\n" "%s %s(%d):%p\n", RUBY_FUNCTION_NAME_STRING, bf->name, bf->argc, bf->func_ptr);
+        ruby_debug_printf("\n" "%s %s(%d):%p\n", RUBY_FUNCTION_NAME_STRING, bf->name, bf->argc,
+                          (void *)(uintptr_t)bf->func_ptr);
     }
 
     if (bf->argc == 0) {
@@ -6845,3 +7458,4 @@ rb_vm_lvar_exposed(rb_execution_context_t *ec, int index)
     const rb_control_frame_t *cfp = ec->cfp;
     return cfp->ep[index];
 }
+
diff --git a/vm_insnhelper.h b/vm_insnhelper.h
index 90372853dd92fb..ba957406978e11 100644
--- a/vm_insnhelper.h
+++ b/vm_insnhelper.h
@@ -16,23 +16,13 @@ RUBY_EXTERN rb_serial_t ruby_vm_constant_cache_invalidations;
 RUBY_EXTERN rb_serial_t ruby_vm_constant_cache_misses;
 RUBY_EXTERN rb_serial_t ruby_vm_global_cvar_state;
 
-#ifndef RJIT_STATS
-# define RJIT_STATS RUBY_DEBUG
-#endif
-
-#if USE_YJIT // We want vm_insns_count on any YJIT-enabled build
+#if USE_YJIT && YJIT_STATS // We want vm_insns_count only on stats builds.
 // Increment vm_insns_count for --yjit-stats. We increment this even when
 // --yjit or --yjit-stats is not used because branching to skip it is slower.
 // We also don't use ATOMIC_INC for performance, allowing inaccuracy on Ractors.
-#define YJIT_COLLECT_USAGE_INSN(insn) rb_vm_insns_count++
-#else
-#define YJIT_COLLECT_USAGE_INSN(insn) // none
-#endif
-
-#if RJIT_STATS
-#define RJIT_COLLECT_USAGE_INSN(insn) rb_rjit_collect_vm_usage_insn(insn)
+#define JIT_COLLECT_USAGE_INSN(insn) rb_vm_insns_count++
 #else
-#define RJIT_COLLECT_USAGE_INSN(insn) // none
+#define JIT_COLLECT_USAGE_INSN(insn) // none
 #endif
 
 #if VM_COLLECT_USAGE_DETAILS
@@ -40,7 +30,7 @@ RUBY_EXTERN rb_serial_t ruby_vm_global_cvar_state;
 #define COLLECT_USAGE_OPERAND(insn, n, op) vm_collect_usage_operand((insn), (n), ((VALUE)(op)))
 #define COLLECT_USAGE_REGISTER(reg, s)     vm_collect_usage_register((reg), (s))
 #else
-#define COLLECT_USAGE_INSN(insn)           YJIT_COLLECT_USAGE_INSN(insn); RJIT_COLLECT_USAGE_INSN(insn)
+#define COLLECT_USAGE_INSN(insn)           JIT_COLLECT_USAGE_INSN(insn)
 #define COLLECT_USAGE_OPERAND(insn, n, op) // none
 #define COLLECT_USAGE_REGISTER(reg, s)     // none
 #endif
@@ -68,6 +58,19 @@ RUBY_EXTERN rb_serial_t ruby_vm_global_cvar_state;
     VM_REG_CFP = ec->cfp; \
 } while (0)
 
+typedef enum call_type {
+    CALL_PUBLIC,
+    CALL_FCALL,
+    CALL_VCALL,
+    CALL_PUBLIC_KW,
+    CALL_FCALL_KW
+} call_type;
+
+struct rb_forwarding_call_data {
+    struct rb_call_data cd;
+    CALL_INFO caller_ci;
+};
+
 #if VM_COLLECT_USAGE_DETAILS
 enum vm_regan_regtype {
     VM_REGAN_PC = 0,
@@ -192,8 +195,11 @@ CC_SET_FASTPATH(const struct rb_callcache *cc, vm_call_handler func, bool enable
 static inline struct vm_throw_data *
 THROW_DATA_NEW(VALUE val, const rb_control_frame_t *cf, int st)
 {
-    struct vm_throw_data *obj = (struct vm_throw_data *)rb_imemo_new(imemo_throw_data, val, (VALUE)cf, 0, 0);
+    struct vm_throw_data *obj = IMEMO_NEW(struct vm_throw_data, imemo_throw_data, 0);
+    *((VALUE *)&obj->throw_obj) = val;
+    *((struct rb_control_frame_struct **)&obj->catch_frame) = (struct rb_control_frame_struct *)cf;
     obj->throw_state = st;
+
     return obj;
 }
 
@@ -257,8 +263,8 @@ THROW_DATA_CONSUMED_SET(struct vm_throw_data *obj)
 static inline bool
 vm_call_cacheable(const struct rb_callinfo *ci, const struct rb_callcache *cc)
 {
-    return (vm_ci_flag(ci) & VM_CALL_FCALL) ||
-        METHOD_ENTRY_VISI(vm_cc_cme(cc)) != METHOD_VISI_PROTECTED;
+    return !(vm_ci_flag(ci) & VM_CALL_FORWARDING) && ((vm_ci_flag(ci) & VM_CALL_FCALL) ||
+        METHOD_ENTRY_VISI(vm_cc_cme(cc)) != METHOD_VISI_PROTECTED);
 }
 /* If this returns true, an optimized function returned by `vm_call_iseq_setup_func`
    can be used as a fastpath. */
diff --git a/vm_method.c b/vm_method.c
index a65c676cfcee79..08fcd2ca4571fc 100644
--- a/vm_method.c
+++ b/vm_method.c
@@ -4,7 +4,6 @@
 
 #include "id_table.h"
 #include "yjit.h"
-#include "rjit.h"
 
 #define METHOD_DEBUG 0
 
@@ -31,7 +30,6 @@ vm_ccs_dump_i(ID mid, VALUE val, void *data)
     rp(ccs->cme);
 
     for (int i=0; i<ccs->len; i++) {
-        fprintf(stderr, "  | [%d]\t", i); vm_ci_dump(ccs->entries[i].ci);
         rp_m(           "  |   \t", ccs->entries[i].cc);
     }
 
@@ -41,7 +39,7 @@ vm_ccs_dump_i(ID mid, VALUE val, void *data)
 static void
 vm_ccs_dump(VALUE klass, ID target_mid)
 {
-    struct rb_id_table *cc_tbl = RCLASS_CC_TBL(klass);
+    struct rb_id_table *cc_tbl = RCLASS_WRITABLE_CC_TBL(klass);
     if (cc_tbl) {
         VALUE ccs;
         if (target_mid) {
@@ -89,18 +87,18 @@ vm_mtbl_dump(VALUE klass, ID target_mid)
         else {
             fprintf(stderr, "    MTBL: NULL\n");
         }
-        if (RCLASS_CALLABLE_M_TBL(klass)) {
+        if (RCLASS_WRITABLE_CALLABLE_M_TBL(klass)) {
             if (target_mid != 0) {
-                if (rb_id_table_lookup(RCLASS_CALLABLE_M_TBL(klass), target_mid, &me)) {
+                if (rb_id_table_lookup(RCLASS_WRITABLE_CALLABLE_M_TBL(klass), target_mid, &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);
+                rb_id_table_foreach(RCLASS_WRITABLE_CALLABLE_M_TBL(klass), vm_cme_dump_i, NULL);
             }
         }
-        if (RCLASS_CC_TBL(klass)) {
+        if (RCLASS_WRITABLE_CC_TBL(klass)) {
             vm_ccs_dump(klass, target_mid);
         }
         klass = RCLASS_SUPER(klass);
@@ -118,17 +116,16 @@ rb_vm_mtbl_dump(const char *msg, VALUE klass, ID target_mid)
 static inline void
 vm_cme_invalidate(rb_callable_method_entry_t *cme)
 {
-    VM_ASSERT(IMEMO_TYPE_P(cme, imemo_ment));
+    VM_ASSERT(IMEMO_TYPE_P(cme, imemo_ment), "cme: %d", imemo_type((VALUE)cme));
     VM_ASSERT(callable_method_entry_p(cme));
     METHOD_ENTRY_INVALIDATED_SET(cme);
     RB_DEBUG_COUNTER_INC(cc_cme_invalidate);
 
     rb_yjit_cme_invalidate(cme);
-    rb_rjit_cme_invalidate(cme);
 }
 
 static int
-rb_clear_constant_cache_for_id_i(st_data_t ic, st_data_t idx, st_data_t arg)
+rb_clear_constant_cache_for_id_i(st_data_t ic, st_data_t arg)
 {
     ((IC) ic)->entry = NULL;
     return ST_CONTINUE;
@@ -144,13 +141,12 @@ rb_clear_constant_cache_for_id(ID id)
     rb_vm_t *vm = GET_VM();
 
     if (rb_id_table_lookup(vm->constant_cache, id, &lookup_result)) {
-        st_table *ics = (st_table *)lookup_result;
-        st_foreach(ics, rb_clear_constant_cache_for_id_i, (st_data_t) NULL);
+        set_table *ics = (set_table *)lookup_result;
+        set_table_foreach(ics, rb_clear_constant_cache_for_id_i, (st_data_t) NULL);
         ruby_vm_constant_cache_invalidations += ics->num_entries;
     }
 
     rb_yjit_constant_state_changed(id);
-    rb_rjit_constant_state_changed(id);
 }
 
 static void
@@ -166,112 +162,179 @@ invalidate_negative_cache(ID mid)
     }
 }
 
-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 *complemented_callable_method_entry(VALUE klass, ID id);
 static const rb_callable_method_entry_t *lookup_overloaded_cme(const rb_callable_method_entry_t *cme);
 
+static void
+invalidate_method_cache_in_cc_table(struct rb_id_table *tbl, ID mid)
+{
+    VALUE ccs_data;
+    if (tbl && rb_id_table_lookup(tbl, mid, &ccs_data)) {
+        struct rb_class_cc_entries *ccs = (struct rb_class_cc_entries *)ccs_data;
+        rb_yjit_cme_invalidate((rb_callable_method_entry_t *)ccs->cme);
+        if (NIL_P(ccs->cme->owner)) invalidate_negative_cache(mid);
+        rb_vm_ccs_free(ccs);
+        rb_id_table_delete(tbl, mid);
+        RB_DEBUG_COUNTER_INC(cc_invalidate_leaf_ccs);
+    }
+}
+
+static void
+invalidate_callable_method_entry_in_callable_m_table(struct rb_id_table *tbl, ID mid)
+{
+    VALUE cme;
+    if (tbl && rb_id_table_lookup(tbl, mid, &cme)) {
+        if (rb_yjit_enabled_p) {
+            rb_yjit_cme_invalidate((rb_callable_method_entry_t *)cme);
+        }
+        rb_id_table_delete(tbl, mid);
+        RB_DEBUG_COUNTER_INC(cc_invalidate_leaf_callable);
+    }
+}
+
+struct invalidate_callable_method_entry_foreach_arg {
+    VALUE klass;
+    ID mid;
+    const rb_method_entry_t *cme;
+    const rb_method_entry_t *newer;
+};
+
+static void
+invalidate_callable_method_entry_in_every_m_table_i(rb_classext_t *ext, bool is_prime, VALUE namespace, void *data)
+{
+    st_data_t me;
+    struct invalidate_callable_method_entry_foreach_arg *arg = (struct invalidate_callable_method_entry_foreach_arg *)data;
+    struct rb_id_table *tbl = RCLASSEXT_M_TBL(ext);
+
+    if (rb_id_table_lookup(tbl, arg->mid, &me) && arg->cme == (const rb_method_entry_t *)me) {
+        rb_method_table_insert(arg->klass, tbl, arg->mid, arg->newer);
+    }
+}
+
+static void
+invalidate_callable_method_entry_in_every_m_table(VALUE klass, ID mid, const rb_callable_method_entry_t *cme)
+{
+    // The argument cme must be invalidated later in the caller side
+    const rb_method_entry_t *newer = rb_method_entry_clone((const rb_method_entry_t *)cme);
+    struct invalidate_callable_method_entry_foreach_arg arg = {
+        .klass = klass,
+        .mid = mid,
+        .cme = (const rb_method_entry_t *) cme,
+        .newer = newer,
+    };
+    rb_class_classext_foreach(klass, invalidate_callable_method_entry_in_every_m_table_i, (void *)&arg);
+}
+
+static void
+invalidate_complemented_method_entry_in_callable_m_table(struct rb_id_table *tbl, ID mid)
+{
+    VALUE cme;
+    if (tbl && rb_id_table_lookup(tbl, mid, &cme)) {
+        if (rb_yjit_enabled_p) {
+            rb_yjit_cme_invalidate((rb_callable_method_entry_t *)cme);
+        }
+        rb_id_table_delete(tbl, mid);
+        RB_DEBUG_COUNTER_INC(cc_invalidate_tree_callable);
+    }
+}
 
 static void
 clear_method_cache_by_id_in_class(VALUE klass, ID mid)
 {
-    VM_ASSERT(RB_TYPE_P(klass, T_CLASS) || RB_TYPE_P(klass, T_ICLASS));
+    VM_ASSERT_TYPE2(klass, T_CLASS, T_ICLASS);
     if (rb_objspace_garbage_object_p(klass)) return;
 
-    RB_VM_LOCK_ENTER();
-    if (LIKELY(RCLASS_SUBCLASSES(klass) == NULL)) {
-        // no subclasses
-        // check only current class
-
-        struct rb_id_table *cc_tbl = RCLASS_CC_TBL(klass);
-        VALUE ccs_data;
-
-        // invalidate CCs
-        if (cc_tbl && rb_id_table_lookup(cc_tbl, mid, &ccs_data)) {
-            struct rb_class_cc_entries *ccs = (struct rb_class_cc_entries *)ccs_data;
-            rb_yjit_cme_invalidate((rb_callable_method_entry_t *)ccs->cme);
-            rb_rjit_cme_invalidate((rb_callable_method_entry_t *)ccs->cme);
-            if (NIL_P(ccs->cme->owner)) invalidate_negative_cache(mid);
-            rb_vm_ccs_free(ccs);
-            rb_id_table_delete(cc_tbl, mid);
-            RB_DEBUG_COUNTER_INC(cc_invalidate_leaf_ccs);
-        }
+    RB_VM_LOCKING() {
+        if (LIKELY(RCLASS_SUBCLASSES_FIRST(klass) == NULL)) {
+            // no subclasses
+            // check only current class
 
-        // remove from callable_m_tbl, if exists
-        struct rb_id_table *cm_tbl;
-        if ((cm_tbl = RCLASS_CALLABLE_M_TBL(klass)) != NULL) {
-            VALUE cme;
-            if (rb_yjit_enabled_p() && rb_id_table_lookup(cm_tbl, mid, &cme)) {
-                rb_yjit_cme_invalidate((rb_callable_method_entry_t *)cme);
+            // invalidate CCs
+            struct rb_id_table *cc_tbl = RCLASS_WRITABLE_CC_TBL(klass);
+            invalidate_method_cache_in_cc_table(cc_tbl, mid);
+            if (RCLASS_CC_TBL_NOT_PRIME_P(klass, cc_tbl)) {
+                invalidate_method_cache_in_cc_table(RCLASS_PRIME_CC_TBL(klass), mid);
             }
-            if (rb_rjit_enabled && rb_id_table_lookup(cm_tbl, mid, &cme)) {
-                rb_rjit_cme_invalidate((rb_callable_method_entry_t *)cme);
+
+            // remove from callable_m_tbl, if exists
+            struct rb_id_table *cm_tbl = RCLASS_WRITABLE_CALLABLE_M_TBL(klass);
+            invalidate_callable_method_entry_in_callable_m_table(cm_tbl, mid);
+            if (RCLASS_CALLABLE_M_TBL_NOT_PRIME_P(klass, cm_tbl)) {
+                invalidate_callable_method_entry_in_callable_m_table(RCLASS_PRIME_CALLABLE_M_TBL(klass), mid);
             }
-            rb_id_table_delete(cm_tbl, mid);
-            RB_DEBUG_COUNTER_INC(cc_invalidate_leaf_callable);
+
+            RB_DEBUG_COUNTER_INC(cc_invalidate_leaf);
         }
-        RB_DEBUG_COUNTER_INC(cc_invalidate_leaf);
-    }
-    else {
-        const rb_callable_method_entry_t *cme = complemented_callable_method_entry(klass, mid);
+        else {
+            const rb_callable_method_entry_t *cme = complemented_callable_method_entry(klass, mid);
 
-        if (cme) {
-            // invalidate cme if found to invalidate the inline method cache.
-            if (METHOD_ENTRY_CACHED(cme)) {
-                if (METHOD_ENTRY_COMPLEMENTED(cme)) {
-                    // do nothing
-                }
-                else {
-                    // invalidate cc by invalidating cc->cme
-                    VALUE owner = cme->owner;
-                    VM_ASSERT(BUILTIN_TYPE(owner) == T_CLASS);
-                    VALUE klass_housing_cme;
-                    if (cme->def->type == VM_METHOD_TYPE_REFINED && !cme->def->body.refined.orig_me) {
-                        klass_housing_cme = owner;
+            if (cme) {
+                // invalidate cme if found to invalidate the inline method cache.
+                if (METHOD_ENTRY_CACHED(cme)) {
+                    if (METHOD_ENTRY_COMPLEMENTED(cme)) {
+                        // do nothing
                     }
                     else {
-                        klass_housing_cme = RCLASS_ORIGIN(owner);
+                        // invalidate cc by invalidating cc->cme
+                        VALUE owner = cme->owner;
+                        VM_ASSERT_TYPE(owner, T_CLASS);
+                        VALUE klass_housing_cme;
+                        if (cme->def->type == VM_METHOD_TYPE_REFINED && !cme->def->body.refined.orig_me) {
+                            klass_housing_cme = owner;
+                        }
+                        else {
+                            klass_housing_cme = RCLASS_ORIGIN(owner);
+                        }
+
+                        // replace the cme that will be invalid in the all classexts
+                        invalidate_callable_method_entry_in_every_m_table(klass_housing_cme, mid, cme);
                     }
-                    // replace the cme that will be invalid
-                    VM_ASSERT(lookup_method_table(klass_housing_cme, mid) == (const rb_method_entry_t *)cme);
-                    const rb_method_entry_t *new_cme = rb_method_entry_clone((const rb_method_entry_t *)cme);
-                    rb_method_table_insert(klass_housing_cme, RCLASS_M_TBL(klass_housing_cme), mid, new_cme);
-                }
 
-                vm_cme_invalidate((rb_callable_method_entry_t *)cme);
-                RB_DEBUG_COUNTER_INC(cc_invalidate_tree_cme);
+                    vm_cme_invalidate((rb_callable_method_entry_t *)cme);
+                    RB_DEBUG_COUNTER_INC(cc_invalidate_tree_cme);
+
+                    // In case of refinement ME, also invalidate the wrapped ME that
+                    // could be cached at some callsite and is unreachable from any
+                    // RCLASS_WRITABLE_CC_TBL.
+                    if (cme->def->type == VM_METHOD_TYPE_REFINED && cme->def->body.refined.orig_me) {
+                        vm_cme_invalidate((rb_callable_method_entry_t *)cme->def->body.refined.orig_me);
+                    }
 
-                if (cme->def->iseq_overload) {
-                    rb_callable_method_entry_t *monly_cme = (rb_callable_method_entry_t *)lookup_overloaded_cme(cme);
-                    if (monly_cme) {
-                        vm_cme_invalidate(monly_cme);
+                    if (cme->def->iseq_overload) {
+                        rb_callable_method_entry_t *monly_cme = (rb_callable_method_entry_t *)lookup_overloaded_cme(cme);
+                        if (monly_cme) {
+                            vm_cme_invalidate(monly_cme);
+                        }
                     }
                 }
-            }
 
-            // 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);
-            }
+                // invalidate complement tbl
+                if (METHOD_ENTRY_COMPLEMENTED(cme)) {
+                    VALUE defined_class = cme->defined_class;
+                    struct rb_id_table *cm_tbl = RCLASS_WRITABLE_CALLABLE_M_TBL(defined_class);
+                    invalidate_complemented_method_entry_in_callable_m_table(cm_tbl, mid);
+                    if (RCLASS_CALLABLE_M_TBL_NOT_PRIME_P(defined_class, cm_tbl)) {
+                        struct rb_id_table *prime_cm_table = RCLASS_PRIME_CALLABLE_M_TBL(defined_class);
+                        invalidate_complemented_method_entry_in_callable_m_table(prime_cm_table, mid);
+                    }
+                }
 
-            RB_DEBUG_COUNTER_INC(cc_invalidate_tree);
-        }
-        else {
-            invalidate_negative_cache(mid);
+                RB_DEBUG_COUNTER_INC(cc_invalidate_tree);
+            }
+            else {
+                invalidate_negative_cache(mid);
+            }
         }
-    }
-    RB_VM_LOCK_LEAVE();
+
+        rb_gccct_clear_table(Qnil);
+}
 }
 
 static void
 clear_iclass_method_cache_by_id(VALUE iclass, VALUE d)
 {
-    VM_ASSERT(RB_TYPE_P(iclass, T_ICLASS));
+    VM_ASSERT_TYPE(iclass, T_ICLASS);
     ID mid = (ID)d;
     clear_method_cache_by_id_in_class(iclass, mid);
 }
@@ -295,6 +358,7 @@ rb_clear_method_cache(VALUE klass_or_module, ID mid)
             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_clear_all_refinement_method_cache();
         }
         rb_class_foreach_subclass(module, clear_iclass_method_cache_by_id, mid);
     }
@@ -303,49 +367,221 @@ rb_clear_method_cache(VALUE klass_or_module, ID mid)
     }
 }
 
-// gc.c
-void rb_cc_table_free(VALUE klass);
+static enum rb_id_table_iterator_result
+invalidate_method_entry_in_iclass_callable_m_tbl(VALUE cme, void *data)
+{
+    vm_cme_invalidate((rb_callable_method_entry_t *)cme);
+    return ID_TABLE_DELETE;
+}
+
+static enum rb_id_table_iterator_result
+invalidate_ccs_in_iclass_cc_tbl(VALUE value, void *data)
+{
+    struct rb_class_cc_entries *ccs = (struct rb_class_cc_entries *)value;
+    vm_cme_invalidate((rb_callable_method_entry_t *)ccs->cme);
+    return ID_TABLE_DELETE;
+}
+
+void
+rb_invalidate_method_caches(struct rb_id_table *cm_tbl, struct rb_id_table *cc_tbl)
+{
+    if (cm_tbl) {
+        rb_id_table_foreach_values(cm_tbl, invalidate_method_entry_in_iclass_callable_m_tbl, NULL);
+    }
+    if (cc_tbl) {
+        rb_id_table_foreach_values(cc_tbl, invalidate_ccs_in_iclass_cc_tbl, NULL);
+    }
+}
 
 static int
-invalidate_all_refinement_cc(void *vstart, void *vend, size_t stride, void *data)
-{
-    VALUE v = (VALUE)vstart;
-    for (; v != (VALUE)vend; v += stride) {
-        void *ptr = asan_poisoned_object_p(v);
-        asan_unpoison_object(v, false);
-
-        if (RBASIC(v)->flags) { // liveness check
-            if (imemo_type_p(v, imemo_callcache)) {
-                const struct rb_callcache *cc = (const struct rb_callcache *)v;
-                if (vm_cc_refinement_p(cc) && cc->klass) {
-                    vm_cc_invalidate(cc);
-                }
+invalidate_cc_refinement(st_data_t key, st_data_t data)
+{
+    VALUE v = (VALUE)key;
+    void *ptr = rb_asan_poisoned_object_p(v);
+    rb_asan_unpoison_object(v, false);
+
+    if (rb_gc_pointer_to_heap_p(v) &&
+        !rb_objspace_garbage_object_p(v) &&
+        RBASIC(v)->flags) { // liveness check
+        const struct rb_callcache *cc = (const struct rb_callcache *)v;
+
+        VM_ASSERT(vm_cc_refinement_p(cc));
+
+        if (cc->klass) {
+            vm_cc_invalidate(cc);
+        }
+    }
+
+    if (ptr) {
+        rb_asan_poison_object(v);
+    }
+
+    return ST_CONTINUE;
+}
+
+static st_index_t
+vm_ci_hash(VALUE v)
+{
+    const struct rb_callinfo *ci = (const struct rb_callinfo *)v;
+    st_index_t h;
+    h = rb_hash_start(ci->mid);
+    h = rb_hash_uint(h, ci->flag);
+    h = rb_hash_uint(h, ci->argc);
+    if (ci->kwarg) {
+        for (int i = 0; i < ci->kwarg->keyword_len; i++) {
+            h = rb_hash_uint(h, ci->kwarg->keywords[i]);
+        }
+    }
+    return h;
+}
+
+static int
+vm_ci_hash_cmp(VALUE v1, VALUE v2)
+{
+    const struct rb_callinfo *ci1 = (const struct rb_callinfo *)v1;
+    const struct rb_callinfo *ci2 = (const struct rb_callinfo *)v2;
+    if (ci1->mid != ci2->mid) return 1;
+    if (ci1->flag != ci2->flag) return 1;
+    if (ci1->argc != ci2->argc) return 1;
+    if (ci1->kwarg != NULL) {
+        VM_ASSERT(ci2->kwarg != NULL); // implied by matching flags
+
+        if (ci1->kwarg->keyword_len != ci2->kwarg->keyword_len)
+            return 1;
+
+        for (int i = 0; i < ci1->kwarg->keyword_len; i++) {
+            if (ci1->kwarg->keywords[i] != ci2->kwarg->keywords[i]) {
+                return 1;
             }
         }
+    }
+    else {
+        VM_ASSERT(ci2->kwarg == NULL); // implied by matching flags
+    }
+    return 0;
+}
 
-        if (ptr) {
-            asan_poison_object(v);
+static const struct st_hash_type vm_ci_hashtype = {
+    vm_ci_hash_cmp,
+    vm_ci_hash
+};
+
+static int
+ci_lookup_i(st_data_t *key, st_data_t *value, st_data_t data, int existing)
+{
+    const struct rb_callinfo *ci = (const struct rb_callinfo *)*key;
+    st_data_t *ret = (st_data_t *)data;
+
+    if (existing) {
+        if (rb_objspace_garbage_object_p((VALUE)ci)) {
+            *ret = (st_data_t)NULL;
+            return ST_DELETE;
+        }
+        else {
+            *ret = *key;
+            return ST_STOP;
         }
     }
-    return 0; // continue to iteration
+    else {
+        *key = *value = *ret = (st_data_t)ci;
+        return ST_CONTINUE;
+    }
+}
+
+const struct rb_callinfo *
+rb_vm_ci_lookup(ID mid, unsigned int flag, unsigned int argc, const struct rb_callinfo_kwarg *kwarg)
+{
+    rb_vm_t *vm = GET_VM();
+    const struct rb_callinfo *ci = NULL;
+
+    if (kwarg) {
+        ((struct rb_callinfo_kwarg *)kwarg)->references++;
+    }
+
+    struct rb_callinfo *new_ci = IMEMO_NEW(struct rb_callinfo, imemo_callinfo, (VALUE)kwarg);
+    new_ci->mid = mid;
+    new_ci->flag = flag;
+    new_ci->argc = argc;
+
+    RB_VM_LOCKING() {
+        st_table *ci_table = vm->ci_table;
+        VM_ASSERT(ci_table);
+
+        do {
+            st_update(ci_table, (st_data_t)new_ci, ci_lookup_i, (st_data_t)&ci);
+        } while (ci == NULL);
+    }
+
+    VM_ASSERT(ci);
+
+    return ci;
+}
+
+void
+rb_vm_ci_free(const struct rb_callinfo *ci)
+{
+    ASSERT_vm_locking();
+
+    rb_vm_t *vm = GET_VM();
+
+    st_data_t key = (st_data_t)ci;
+    st_delete(vm->ci_table, &key, NULL);
+}
+
+void
+rb_vm_insert_cc_refinement(const struct rb_callcache *cc)
+{
+    st_data_t key = (st_data_t)cc;
+
+    rb_vm_t *vm = GET_VM();
+    RB_VM_LOCK_ENTER();
+    {
+        rb_set_insert(vm->cc_refinement_table, key);
+    }
+    RB_VM_LOCK_LEAVE();
+}
+
+void
+rb_vm_delete_cc_refinement(const struct rb_callcache *cc)
+{
+    ASSERT_vm_locking();
+
+    rb_vm_t *vm = GET_VM();
+    st_data_t key = (st_data_t)cc;
+
+    rb_set_table_delete(vm->cc_refinement_table, &key);
 }
 
 void
 rb_clear_all_refinement_method_cache(void)
 {
-    rb_objspace_each_objects(invalidate_all_refinement_cc, NULL);
+    rb_vm_t *vm = GET_VM();
+
+    RB_VM_LOCK_ENTER();
+    {
+        rb_set_table_foreach(vm->cc_refinement_table, invalidate_cc_refinement, (st_data_t)NULL);
+        rb_set_table_clear(vm->cc_refinement_table);
+        rb_set_compact_table(vm->cc_refinement_table);
+    }
+    RB_VM_LOCK_LEAVE();
+
     rb_yjit_invalidate_all_method_lookup_assumptions();
 }
 
 void
 rb_method_table_insert(VALUE klass, struct rb_id_table *table, ID method_id, const rb_method_entry_t *me)
+{
+    rb_method_table_insert0(klass, table, method_id, me, RB_TYPE_P(klass, T_ICLASS) && !RICLASS_OWNS_M_TBL_P(klass));
+}
+
+void
+rb_method_table_insert0(VALUE klass, struct rb_id_table *table, ID method_id, const rb_method_entry_t *me, bool iclass_shared_mtbl)
 {
     VALUE table_owner = klass;
-    if (RB_TYPE_P(klass, T_ICLASS) && !RICLASS_OWNS_M_TBL_P(klass)) {
+    if (iclass_shared_mtbl) {
         table_owner = RBASIC(table_owner)->klass;
     }
-    VM_ASSERT(RB_TYPE_P(table_owner, T_CLASS) || RB_TYPE_P(table_owner, T_ICLASS) || RB_TYPE_P(table_owner, T_MODULE));
-    VM_ASSERT(table == RCLASS_M_TBL(table_owner));
+    VM_ASSERT_TYPE3(table_owner, T_CLASS, T_ICLASS, T_MODULE);
     rb_id_table_insert(table, method_id, (VALUE)me);
     RB_OBJ_WRITTEN(table_owner, Qundef, (VALUE)me);
 }
@@ -403,33 +639,24 @@ rb_add_method_optimized(VALUE klass, ID mid, enum method_optimized_type opt_type
 }
 
 static void
-rb_method_definition_release(rb_method_definition_t *def, int complemented)
+rb_method_definition_release(rb_method_definition_t *def)
 {
     if (def != NULL) {
-        const int alias_count = def->alias_count;
-        const int complemented_count = def->complemented_count;
-        VM_ASSERT(alias_count >= 0);
-        VM_ASSERT(complemented_count >= 0);
-
-        if (alias_count + complemented_count == 0) {
-            if (METHOD_DEBUG) fprintf(stderr, "-%p-%s:%d,%d (remove)\n", (void *)def,
-                                      rb_id2name(def->original_id), alias_count, complemented_count);
+        const unsigned int reference_count_was = RUBY_ATOMIC_FETCH_SUB(def->reference_count, 1);
+
+        RUBY_ASSERT_ALWAYS(reference_count_was != 0);
+
+        if (reference_count_was == 1) {
+            if (METHOD_DEBUG) fprintf(stderr, "-%p-%s:1->0 (remove)\n", (void *)def,
+                                      rb_id2name(def->original_id));
             if (def->type == VM_METHOD_TYPE_BMETHOD && def->body.bmethod.hooks) {
                 xfree(def->body.bmethod.hooks);
             }
             xfree(def);
         }
         else {
-            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);
+            if (METHOD_DEBUG) fprintf(stderr, "-%p-%s:%d->%d (dec)\n", (void *)def, rb_id2name(def->original_id),
+                                      reference_count_was, reference_count_was - 1);
         }
     }
 }
@@ -437,12 +664,17 @@ rb_method_definition_release(rb_method_definition_t *def, int complemented)
 static void delete_overloaded_cme(const rb_callable_method_entry_t *cme);
 
 void
-rb_free_method_entry(const rb_method_entry_t *me)
+rb_free_method_entry_vm_weak_references(const rb_method_entry_t *me)
 {
     if (me->def && me->def->iseq_overload) {
         delete_overloaded_cme((const rb_callable_method_entry_t *)me);
     }
-    rb_method_definition_release(me->def, METHOD_ENTRY_COMPLEMENTED(me));
+}
+
+void
+rb_free_method_entry(const rb_method_entry_t *me)
+{
+    rb_method_definition_release(me->def);
 }
 
 static inline rb_method_entry_t *search_method(VALUE klass, ID id, VALUE *defined_class_ptr);
@@ -509,10 +741,26 @@ setup_method_cfunc_struct(rb_method_cfunc_t *cfunc, VALUE (*func)(ANYARGS), int
     cfunc->invoker = call_cfunc_invoker_func(argc);
 }
 
+static rb_method_definition_t *
+method_definition_addref(rb_method_definition_t *def, bool complemented)
+{
+    unsigned int reference_count_was = RUBY_ATOMIC_FETCH_ADD(def->reference_count, 1);
+    if (!complemented && reference_count_was > 0) {
+        /* TODO: A Ractor can reach this via UnboundMethod#bind */
+        def->aliased = true;
+    }
+    if (METHOD_DEBUG) fprintf(stderr, "+%p-%s:%d->%d\n", (void *)def, rb_id2name(def->original_id), reference_count_was, reference_count_was+1);
+
+    return def;
+}
+
 void
 rb_method_definition_set(const rb_method_entry_t *me, rb_method_definition_t *def, void *opts)
 {
-    *(rb_method_definition_t **)&me->def = def;
+    rb_method_definition_release(me->def);
+    *(rb_method_definition_t **)&me->def = method_definition_addref(def, METHOD_ENTRY_COMPLEMENTED(me));
+
+    if (!ruby_running) add_opt_method_entry(me);
 
     if (opts != NULL) {
         switch (def->type) {
@@ -525,6 +773,11 @@ rb_method_definition_set(const rb_method_entry_t *me, rb_method_definition_t *de
                 /* setup iseq first (before invoking GC) */
                 RB_OBJ_WRITE(me, &def->body.iseq.iseqptr, iseq);
 
+                // Methods defined in `with_yjit` should be considered METHOD_ENTRY_BASIC
+                if (rb_iseq_attr_p(iseq, BUILTIN_ATTR_C_TRACE)) {
+                    METHOD_ENTRY_BASIC_SET((rb_method_entry_t *)me, TRUE);
+                }
+
                 if (ISEQ_BODY(iseq)->mandatory_only_iseq) def->iseq_overload = 1;
 
                 if (0) vm_cref_dump("rb_method_definition_create", cref);
@@ -577,9 +830,7 @@ rb_method_definition_set(const rb_method_entry_t *me, rb_method_definition_t *de
             return;
           case VM_METHOD_TYPE_REFINED:
             {
-                const rb_method_refined_t *refined = (rb_method_refined_t *)opts;
-                RB_OBJ_WRITE(me, &def->body.refined.orig_me, refined->orig_me);
-                RB_OBJ_WRITE(me, &def->body.refined.owner, refined->owner);
+                RB_OBJ_WRITE(me, &def->body.refined.orig_me, (rb_method_entry_t *)opts);
                 return;
             }
           case VM_METHOD_TYPE_ALIAS:
@@ -615,7 +866,6 @@ method_definition_reset(const rb_method_entry_t *me)
         break;
       case VM_METHOD_TYPE_REFINED:
         RB_OBJ_WRITTEN(me, Qundef, def->body.refined.orig_me);
-        RB_OBJ_WRITTEN(me, Qundef, def->body.refined.owner);
         break;
       case VM_METHOD_TYPE_ALIAS:
         RB_OBJ_WRITTEN(me, Qundef, def->body.alias.original_me);
@@ -630,6 +880,8 @@ method_definition_reset(const rb_method_entry_t *me)
     }
 }
 
+static rb_atomic_t method_serial = 1;
+
 rb_method_definition_t *
 rb_method_definition_create(rb_method_type_t type, ID mid)
 {
@@ -637,31 +889,24 @@ rb_method_definition_create(rb_method_type_t type, ID mid)
     def = ZALLOC(rb_method_definition_t);
     def->type = type;
     def->original_id = mid;
-    static uintptr_t method_serial = 1;
-    def->method_serial = method_serial++;
-    return def;
-}
-
-static rb_method_definition_t *
-method_definition_addref(rb_method_definition_t *def)
-{
-    def->alias_count++;
-    if (METHOD_DEBUG) fprintf(stderr, "+%p-%s:%d\n", (void *)def, rb_id2name(def->original_id), def->alias_count);
-    return def;
-}
-
-static rb_method_definition_t *
-method_definition_addref_complement(rb_method_definition_t *def)
-{
-    def->complemented_count++;
-    if (METHOD_DEBUG) fprintf(stderr, "+%p-%s:%d\n", (void *)def, rb_id2name(def->original_id), def->complemented_count);
+    def->method_serial = (uintptr_t)RUBY_ATOMIC_FETCH_ADD(method_serial, 1);
+    def->ns = rb_current_namespace();
     return def;
 }
 
 static rb_method_entry_t *
-rb_method_entry_alloc(ID called_id, VALUE owner, VALUE defined_class, const rb_method_definition_t *def)
+rb_method_entry_alloc(ID called_id, VALUE owner, VALUE defined_class, rb_method_definition_t *def, bool complement)
 {
-    rb_method_entry_t *me = (rb_method_entry_t *)rb_imemo_new(imemo_ment, (VALUE)def, (VALUE)called_id, owner, defined_class);
+    if (def) method_definition_addref(def, complement);
+    if (RTEST(defined_class)) {
+        // not negative cache
+        VM_ASSERT_TYPE2(defined_class, T_CLASS, T_ICLASS);
+    }
+    rb_method_entry_t *me = IMEMO_NEW(rb_method_entry_t, imemo_ment, defined_class);
+    *((rb_method_definition_t **)&me->def) = def;
+    me->called_id = called_id;
+    me->owner = owner;
+
     return me;
 }
 
@@ -682,24 +927,39 @@ filter_defined_class(VALUE klass)
 }
 
 rb_method_entry_t *
-rb_method_entry_create(ID called_id, VALUE klass, rb_method_visibility_t visi, const rb_method_definition_t *def)
+rb_method_entry_create(ID called_id, VALUE klass, rb_method_visibility_t visi, rb_method_definition_t *def)
 {
-    rb_method_entry_t *me = rb_method_entry_alloc(called_id, klass, filter_defined_class(klass), def);
+    rb_method_entry_t *me = rb_method_entry_alloc(called_id, klass, filter_defined_class(klass), def, false);
     METHOD_ENTRY_FLAGS_SET(me, visi, ruby_running ? FALSE : TRUE);
     if (def != NULL) method_definition_reset(me);
     return me;
 }
 
+// Return a cloned ME that's not invalidated (MEs are disposable for caching).
 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));
-    if (METHOD_ENTRY_COMPLEMENTED(src_me)) {
-        method_definition_addref_complement(src_me->def);
-    }
+    rb_method_entry_t *me = rb_method_entry_alloc(src_me->called_id, src_me->owner, src_me->defined_class, src_me->def, METHOD_ENTRY_COMPLEMENTED(src_me));
 
     METHOD_ENTRY_FLAGS_COPY(me, src_me);
+
+    // Also clone inner ME in case of refinement ME
+    if (src_me->def &&
+            src_me->def->type == VM_METHOD_TYPE_REFINED &&
+            src_me->def->body.refined.orig_me) {
+        const rb_method_entry_t *orig_me = src_me->def->body.refined.orig_me;
+        VM_ASSERT(orig_me->def->type != VM_METHOD_TYPE_REFINED);
+
+        rb_method_entry_t *orig_clone = rb_method_entry_alloc(orig_me->called_id,
+                orig_me->owner, orig_me->defined_class, orig_me->def, METHOD_ENTRY_COMPLEMENTED(orig_me));
+        METHOD_ENTRY_FLAGS_COPY(orig_clone, orig_me);
+
+        // Clone definition, since writing a VALUE to a shared definition
+        // can create reference edges we can't run WBs for.
+        rb_method_definition_t *clone_def =
+            rb_method_definition_create(VM_METHOD_TYPE_REFINED, src_me->called_id);
+        rb_method_definition_set(me, clone_def, orig_clone);
+    }
     return me;
 }
 
@@ -708,10 +968,7 @@ rb_method_entry_complement_defined_class(const rb_method_entry_t *src_me, ID cal
 {
     rb_method_definition_t *def = src_me->def;
     rb_method_entry_t *me;
-    struct {
-        const struct rb_method_entry_struct *orig_me;
-        VALUE owner;
-    } refined = {0};
+    const rb_method_entry_t *refined_orig_me = NULL;
 
     if (!src_me->defined_class &&
         def->type == VM_METHOD_TYPE_REFINED &&
@@ -719,22 +976,19 @@ rb_method_entry_complement_defined_class(const rb_method_entry_t *src_me, ID cal
         const rb_method_entry_t *orig_me =
             rb_method_entry_clone(def->body.refined.orig_me);
         RB_OBJ_WRITE((VALUE)orig_me, &orig_me->defined_class, defined_class);
-        refined.orig_me = orig_me;
-        refined.owner = orig_me->owner;
+        refined_orig_me = orig_me;
         def = NULL;
     }
-    else {
-        def = method_definition_addref_complement(def);
-    }
-    me = rb_method_entry_alloc(called_id, src_me->owner, defined_class, def);
+
+    me = rb_method_entry_alloc(called_id, src_me->owner, defined_class, def, true);
     METHOD_ENTRY_FLAGS_COPY(me, src_me);
     METHOD_ENTRY_COMPLEMENTED_SET(me);
     if (!def) {
         def = rb_method_definition_create(VM_METHOD_TYPE_REFINED, called_id);
-        rb_method_definition_set(me, def, &refined);
+        rb_method_definition_set(me, def, (void *)refined_orig_me);
     }
 
-    VM_ASSERT(RB_TYPE_P(me->owner, T_MODULE));
+    VM_ASSERT_TYPE(me->owner, T_MODULE);
 
     return (rb_callable_method_entry_t *)me;
 }
@@ -742,7 +996,8 @@ rb_method_entry_complement_defined_class(const rb_method_entry_t *src_me, ID cal
 void
 rb_method_entry_copy(rb_method_entry_t *dst, const rb_method_entry_t *src)
 {
-    *(rb_method_definition_t **)&dst->def = method_definition_addref(src->def);
+    rb_method_definition_release(dst->def);
+    *(rb_method_definition_t **)&dst->def = method_definition_addref(src->def, METHOD_ENTRY_COMPLEMENTED(src));
     method_definition_reset(dst);
     dst->called_id = src->called_id;
     RB_OBJ_WRITE((VALUE)dst, &dst->owner, src->owner);
@@ -757,24 +1012,20 @@ make_method_entry_refined(VALUE owner, rb_method_entry_t *me)
         return;
     }
     else {
-        struct {
-            struct rb_method_entry_struct *orig_me;
-            VALUE owner;
-        } refined;
         rb_method_definition_t *def;
 
         rb_vm_check_redefinition_opt_method(me, me->owner);
 
-        refined.orig_me =
-            rb_method_entry_alloc(me->called_id, me->owner,
-                                  me->defined_class ?
-                                  me->defined_class : owner,
-                                  method_definition_addref(me->def));
-        METHOD_ENTRY_FLAGS_COPY(refined.orig_me, me);
-        refined.owner = owner;
+        struct rb_method_entry_struct *orig_me =
+            rb_method_entry_alloc(me->called_id,
+                                  me->owner,
+                                  me->defined_class,
+                                  me->def,
+                                  true);
+        METHOD_ENTRY_FLAGS_COPY(orig_me, me);
 
         def = rb_method_definition_create(VM_METHOD_TYPE_REFINED, me->called_id);
-        rb_method_definition_set(me, def, (void *)&refined);
+        rb_method_definition_set(me, def, orig_me);
         METHOD_ENTRY_VISI_SET(me, METHOD_VISI_PUBLIC);
     }
 }
@@ -852,7 +1103,7 @@ rb_method_entry_make(VALUE klass, ID mid, VALUE defined_class, rb_method_visibil
     }
     orig_klass = klass;
 
-    if (!FL_TEST(klass, FL_SINGLETON) &&
+    if (!RCLASS_SINGLETON_P(klass) &&
         type != VM_METHOD_TYPE_NOTIMPLEMENTED &&
         type != VM_METHOD_TYPE_ZSUPER) {
         switch (mid) {
@@ -883,7 +1134,7 @@ rb_method_entry_make(VALUE klass, ID mid, VALUE defined_class, rb_method_visibil
             rb_clear_method_cache(orig_klass, mid);
         }
     }
-    mtbl = RCLASS_M_TBL(klass);
+    mtbl = RCLASS_WRITABLE_M_TBL(klass);
 
     /* check re-definition */
     if (rb_id_table_lookup(mtbl, mid, &data)) {
@@ -897,7 +1148,7 @@ rb_method_entry_make(VALUE klass, ID mid, VALUE defined_class, rb_method_visibil
 
         if (RTEST(ruby_verbose) &&
             type != VM_METHOD_TYPE_UNDEF &&
-            (old_def->alias_count == 0) &&
+            (old_def->aliased == false) &&
             (!old_def->no_redef_warning) &&
             !make_refined &&
             old_def->type != VM_METHOD_TYPE_UNDEF &&
@@ -905,7 +1156,6 @@ rb_method_entry_make(VALUE klass, ID mid, VALUE defined_class, rb_method_visibil
             old_def->type != VM_METHOD_TYPE_ALIAS) {
             const rb_iseq_t *iseq = 0;
 
-            rb_warning("method redefined; discarding old %"PRIsVALUE, rb_id2str(mid));
             switch (old_def->type) {
               case VM_METHOD_TYPE_ISEQ:
                 iseq = def_iseq_ptr(old_def);
@@ -917,17 +1167,25 @@ rb_method_entry_make(VALUE klass, ID mid, VALUE defined_class, rb_method_visibil
                 break;
             }
             if (iseq) {
-                rb_compile_warning(RSTRING_PTR(rb_iseq_path(iseq)),
-                                   ISEQ_BODY(iseq)->location.first_lineno,
-                                   "previous definition of %"PRIsVALUE" was here",
-                                   rb_id2str(old_def->original_id));
+                rb_warning(
+                    "method redefined; discarding old %"PRIsVALUE"\n%s:%d: warning: previous definition of %"PRIsVALUE" was here",
+                    rb_id2str(mid),
+                    RSTRING_PTR(rb_iseq_path(iseq)),
+                    ISEQ_BODY(iseq)->location.first_lineno,
+                    rb_id2str(old_def->original_id)
+                );
+            }
+            else {
+                rb_warning("method redefined; discarding old %"PRIsVALUE, rb_id2str(mid));
             }
         }
     }
 
     /* create method entry */
     me = rb_method_entry_create(mid, defined_class, visi, NULL);
-    if (def == NULL) def = rb_method_definition_create(type, original_id);
+    if (def == NULL) {
+        def = rb_method_definition_create(type, original_id);
+    }
     rb_method_definition_set(me, def, opts);
 
     rb_clear_method_cache(klass, mid);
@@ -943,9 +1201,9 @@ rb_method_entry_make(VALUE klass, ID mid, VALUE defined_class, rb_method_visibil
         }
     }
     /* check mid */
-    if (mid == object_id || mid == id__send__) {
-        if (type == VM_METHOD_TYPE_ISEQ && search_method(klass, mid, 0)) {
-            rb_warn("redefining `%s' may cause serious problems", rb_id2name(mid));
+    if (mid == object_id || mid == id__id__ || mid == id__send__) {
+        if (type != VM_METHOD_TYPE_CFUNC && search_method(klass, mid, 0)) {
+            rb_warn("redefining '%s' may cause serious problems", rb_id2name(mid));
         }
     }
 
@@ -965,8 +1223,6 @@ rb_method_entry_make(VALUE klass, ID mid, VALUE defined_class, rb_method_visibil
     return me;
 }
 
-static rb_method_entry_t *rb_method_entry_alloc(ID called_id, VALUE owner, VALUE defined_class, const rb_method_definition_t *def);
-
 static st_table *
 overloaded_cme_table(void)
 {
@@ -1049,13 +1305,14 @@ get_overloaded_cme(const rb_callable_method_entry_t *cme)
     else {
         // create
         rb_method_definition_t *def = rb_method_definition_create(VM_METHOD_TYPE_ISEQ, cme->def->original_id);
-        def->body.iseq.cref = cme->def->body.iseq.cref;
-        def->body.iseq.iseqptr = ISEQ_BODY(cme->def->body.iseq.iseqptr)->mandatory_only_iseq;
-
         rb_method_entry_t *me = rb_method_entry_alloc(cme->called_id,
                                                       cme->owner,
                                                       cme->defined_class,
-                                                      def);
+                                                      def,
+                                                      false);
+
+        RB_OBJ_WRITE(me, &def->body.iseq.cref, cme->def->body.iseq.cref);
+        RB_OBJ_WRITE(me, &def->body.iseq.iseqptr, ISEQ_BODY(cme->def->body.iseq.iseqptr)->mandatory_only_iseq);
 
         ASSERT_vm_locking();
         st_insert(overloaded_cme_table(), (st_data_t)cme, (st_data_t)me);
@@ -1065,13 +1322,14 @@ get_overloaded_cme(const rb_callable_method_entry_t *cme)
     }
 }
 
-static const rb_callable_method_entry_t *
-check_overloaded_cme(const rb_callable_method_entry_t *cme, const struct rb_callinfo * const ci)
+const rb_callable_method_entry_t *
+rb_check_overloaded_cme(const rb_callable_method_entry_t *cme, const struct rb_callinfo * const ci)
 {
     if (UNLIKELY(cme->def->iseq_overload) &&
         (vm_ci_flag(ci) & (VM_CALL_ARGS_SIMPLE)) &&
+        (!(vm_ci_flag(ci) & VM_CALL_FORWARDING)) &&
         (int)vm_ci_argc(ci) == ISEQ_BODY(method_entry_iseqptr(cme))->param.lead_num) {
-        VM_ASSERT(cme->def->type == VM_METHOD_TYPE_ISEQ); // iseq_overload is marked only on ISEQ methods
+        VM_ASSERT(cme->def->type == VM_METHOD_TYPE_ISEQ, "type: %d", cme->def->type); // iseq_overload is marked only on ISEQ methods
 
         cme = get_overloaded_cme(cme);
 
@@ -1086,7 +1344,7 @@ check_overloaded_cme(const rb_callable_method_entry_t *cme, const struct rb_call
         const VALUE arg = ID2SYM(mid);			\
         VALUE recv_class = (klass);			\
         ID hook_id = (hook);				\
-        if (FL_TEST((klass), FL_SINGLETON)) {		\
+        if (RCLASS_SINGLETON_P((klass))) {		\
             recv_class = RCLASS_ATTACHED_OBJECT((klass));	\
             hook_id = singleton_##hook;			\
         }						\
@@ -1133,10 +1391,9 @@ method_entry_set(VALUE klass, ID mid, const rb_method_entry_t *me,
                                                     me->def->type, me->def, 0, NULL);
     if (newme == me) {
         me->def->no_redef_warning = TRUE;
+        METHOD_ENTRY_FLAGS_SET(newme, visi, FALSE);
     }
-    else {
-        method_definition_addref(me->def);
-    }
+
     method_added(klass, mid);
     return newme;
 }
@@ -1153,7 +1410,7 @@ void
 rb_define_alloc_func(VALUE klass, VALUE (*func)(VALUE))
 {
     Check_Type(klass, T_CLASS);
-    if (FL_TEST_RAW(klass, FL_SINGLETON)) {
+    if (RCLASS_SINGLETON_P(klass)) {
         rb_raise(rb_eTypeError, "can't define an allocator for a singleton class");
     }
     RCLASS_SET_ALLOCATOR(klass, func);
@@ -1205,7 +1462,11 @@ search_method0(VALUE klass, ID id, VALUE *defined_class_ptr, bool skip_refined)
 
     if (me == NULL) RB_DEBUG_COUNTER_INC(mc_search_notfound);
 
-    VM_ASSERT(me == NULL || !METHOD_ENTRY_INVALIDATED(me));
+    VM_ASSERT(me == NULL || !METHOD_ENTRY_INVALIDATED(me),
+              "invalid me, mid:%s, klass:%s(%s)",
+              rb_id2name(id),
+              RTEST(rb_mod_name(klass)) ? RSTRING_PTR(rb_mod_name(klass)) : "anonymous",
+              rb_obj_info(klass));
     return me;
 }
 
@@ -1240,24 +1501,27 @@ prepare_callable_method_entry(VALUE defined_class, ID id, const rb_method_entry_
     struct rb_id_table *mtbl;
     const rb_callable_method_entry_t *cme;
     VALUE cme_data;
+    int cme_found = 0;
 
     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);
+            VM_ASSERT_TYPE2(defined_class, T_ICLASS, T_MODULE);
 
+            mtbl = RCLASS_WRITABLE_CALLABLE_M_TBL(defined_class);
             if (mtbl && rb_id_table_lookup(mtbl, id, &cme_data)) {
                 cme = (rb_callable_method_entry_t *)cme_data;
+                cme_found = 1;
+            }
+            if (cme_found) {
                 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);
+                    mtbl = rb_id_table_create(0);
+                    RCLASS_WRITE_CALLABLE_M_TBL(defined_class, mtbl);
                 }
                 cme = rb_method_entry_complement_defined_class(me, me->called_id, defined_class);
                 rb_id_table_insert(mtbl, id, (VALUE)cme);
@@ -1293,7 +1557,7 @@ cached_callable_method_entry(VALUE klass, ID mid)
 {
     ASSERT_vm_locking();
 
-    struct rb_id_table *cc_tbl = RCLASS_CC_TBL(klass);
+    struct rb_id_table *cc_tbl = RCLASS_WRITABLE_CC_TBL(klass);
     VALUE ccs_data;
 
     if (cc_tbl && rb_id_table_lookup(cc_tbl, mid, &ccs_data)) {
@@ -1321,11 +1585,12 @@ cache_callable_method_entry(VALUE klass, ID mid, const rb_callable_method_entry_
     ASSERT_vm_locking();
     VM_ASSERT(cme != NULL);
 
-    struct rb_id_table *cc_tbl = RCLASS_CC_TBL(klass);
+    struct rb_id_table *cc_tbl = RCLASS_WRITABLE_CC_TBL(klass);
     VALUE ccs_data;
 
     if (!cc_tbl) {
-        cc_tbl = RCLASS_CC_TBL(klass) = rb_id_table_create(2);
+        cc_tbl = rb_id_table_create(2);
+        RCLASS_WRITE_CC_TBL(klass, cc_tbl);
     }
 
     if (rb_id_table_lookup(cc_tbl, mid, &ccs_data)) {
@@ -1350,7 +1615,7 @@ negative_cme(ID mid)
         cme = (rb_callable_method_entry_t *)cme_data;
     }
     else {
-        cme = (rb_callable_method_entry_t *)rb_method_entry_alloc(mid, Qnil, Qnil, NULL);
+        cme = (rb_callable_method_entry_t *)rb_method_entry_alloc(mid, Qnil, Qnil, NULL, false);
         rb_id_table_insert(vm->negative_cme_table, mid, (VALUE)cme);
     }
 
@@ -1363,9 +1628,8 @@ callable_method_entry_or_negative(VALUE klass, ID mid, VALUE *defined_class_ptr)
 {
     const rb_callable_method_entry_t *cme;
 
-    VM_ASSERT(RB_TYPE_P(klass, T_CLASS) || RB_TYPE_P(klass, T_ICLASS));
-    RB_VM_LOCK_ENTER();
-    {
+    VM_ASSERT_TYPE2(klass, T_CLASS, T_ICLASS);
+    RB_VM_LOCKING() {
         cme = cached_callable_method_entry(klass, mid);
 
         if (cme) {
@@ -1386,7 +1650,6 @@ callable_method_entry_or_negative(VALUE klass, ID mid, VALUE *defined_class_ptr)
             cache_callable_method_entry(klass, mid, cme);
         }
     }
-    RB_VM_LOCK_LEAVE();
 
     return cme;
 }
@@ -1445,7 +1708,7 @@ rb_method_entry_with_refinements(VALUE klass, ID id, VALUE *defined_class_ptr)
 }
 
 static const rb_callable_method_entry_t *
-callable_method_entry_refeinements0(VALUE klass, ID id, VALUE *defined_class_ptr, bool with_refinements,
+callable_method_entry_refinements0(VALUE klass, ID id, VALUE *defined_class_ptr, bool with_refinements,
                                     const rb_callable_method_entry_t *cme)
 {
     if (cme == NULL || LIKELY(cme->def->type != VM_METHOD_TYPE_REFINED)) {
@@ -1462,7 +1725,7 @@ static const rb_callable_method_entry_t *
 callable_method_entry_refinements(VALUE klass, ID id, VALUE *defined_class_ptr, bool with_refinements)
 {
     const rb_callable_method_entry_t *cme = callable_method_entry(klass, id, defined_class_ptr);
-    return callable_method_entry_refeinements0(klass, id, defined_class_ptr, with_refinements, cme);
+    return callable_method_entry_refinements0(klass, id, defined_class_ptr, with_refinements, cme);
 }
 
 const rb_callable_method_entry_t *
@@ -1553,15 +1816,15 @@ remove_method(VALUE klass, ID mid)
 
     rb_class_modify_check(klass);
     klass = RCLASS_ORIGIN(klass);
-    if (mid == object_id || mid == id__send__ || mid == idInitialize) {
-        rb_warn("removing `%s' may cause serious problems", rb_id2name(mid));
+    if (mid == object_id || mid == id__id__ || mid == id__send__ || mid == idInitialize) {
+        rb_warn("removing '%s' may cause serious problems", rb_id2name(mid));
     }
 
     if (!rb_id_table_lookup(RCLASS_M_TBL(klass), mid, &data) ||
         !(me = (rb_method_entry_t *)data) ||
         (!me->def || me->def->type == VM_METHOD_TYPE_UNDEF) ||
         UNDEFINED_REFINED_METHOD_P(me->def)) {
-        rb_name_err_raise("method `%1$s' not defined in %2$s",
+        rb_name_err_raise("method '%1$s' not defined in %2$s",
                           klass, ID2SYM(mid));
     }
 
@@ -1569,7 +1832,7 @@ remove_method(VALUE klass, ID mid)
         rb_clear_method_cache(self, mid);
     }
     rb_clear_method_cache(klass, mid);
-    rb_id_table_delete(RCLASS_M_TBL(klass), mid);
+    rb_id_table_delete(RCLASS_WRITABLE_M_TBL(klass), mid);
 
     rb_vm_check_redefinition_opt_method(me, klass);
 
@@ -1611,7 +1874,7 @@ rb_mod_remove_method(int argc, VALUE *argv, VALUE mod)
         VALUE v = argv[i];
         ID id = rb_check_id(&v);
         if (!id) {
-            rb_name_err_raise("method `%1$s' not defined in %2$s",
+            rb_name_err_raise("method '%1$s' not defined in %2$s",
                               mod, v);
         }
         remove_method(mod, id);
@@ -1667,7 +1930,7 @@ method_boundp(VALUE klass, ID id, int ex)
 {
     const rb_callable_method_entry_t *cme;
 
-    VM_ASSERT(RB_TYPE_P(klass, T_CLASS) || RB_TYPE_P(klass, T_ICLASS));
+    VM_ASSERT_TYPE2(klass, T_CLASS, T_ICLASS);
 
     if (ex & BOUND_RESPONDS) {
         cme = rb_callable_method_entry_with_refinements(klass, id, NULL);
@@ -1783,8 +2046,8 @@ rb_undef(VALUE klass, ID id)
         rb_raise(rb_eTypeError, "no class to undef method");
     }
     rb_class_modify_check(klass);
-    if (id == object_id || id == id__send__ || id == idInitialize) {
-        rb_warn("undefining `%s' may cause serious problems", rb_id2name(id));
+    if (id == object_id || id == id__id__ || id == id__send__ || id == idInitialize) {
+        rb_warn("undefining '%s' may cause serious problems", rb_id2name(id));
     }
 
     me = search_method(klass, id, 0);
@@ -1844,7 +2107,7 @@ rb_undef(VALUE klass, ID id)
  *
  *     In child
  *     In parent
- *     prog.rb:23: undefined method `hello' for #<Child:0x401b3bb4> (NoMethodError)
+ *     prog.rb:23: undefined method 'hello' for #<Child:0x401b3bb4> (NoMethodError)
  */
 
 static VALUE
@@ -2126,7 +2389,7 @@ rb_hash_method_definition(st_index_t hash, const rb_method_definition_t *def)
 
     switch (def->type) {
       case VM_METHOD_TYPE_ISEQ:
-        return rb_hash_uint(hash, (st_index_t)def->body.iseq.iseqptr);
+        return rb_hash_uint(hash, (st_index_t)def->body.iseq.iseqptr->body);
       case VM_METHOD_TYPE_CFUNC:
         hash = rb_hash_uint(hash, (st_index_t)def->body.cfunc.func);
         return rb_hash_uint(hash, def->body.cfunc.argc);
@@ -2183,7 +2446,7 @@ rb_alias(VALUE klass, ID alias_name, ID original_name)
         if ((!RB_TYPE_P(klass, T_MODULE)) ||
             (orig_me = search_method(rb_cObject, original_name, &defined_class),
              UNDEFINED_METHOD_ENTRY_P(orig_me))) {
-            rb_print_undef(klass, original_name, METHOD_VISI_UNDEF);
+            rb_print_undef(target_klass, original_name, METHOD_VISI_UNDEF);
         }
     }
 
@@ -2214,7 +2477,13 @@ rb_alias(VALUE klass, ID alias_name, ID original_name)
 
         alias_me = method_entry_set(target_klass, alias_name, orig_me, visi, orig_me->owner);
         RB_OBJ_WRITE(alias_me, &alias_me->owner, target_klass);
-        RB_OBJ_WRITE(alias_me, &alias_me->defined_class, orig_me->defined_class);
+
+        if (RB_TYPE_P(target_klass, T_MODULE)) {
+            // defined_class should not be set
+        }
+        else {
+            RB_OBJ_WRITE(alias_me, &alias_me->defined_class, orig_me->defined_class);
+        }
     }
 }
 
@@ -2471,7 +2740,7 @@ rb_mod_ruby2_keywords(int argc, VALUE *argv, VALUE 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));
+                    rb_warn("Skipping set of ruby2_keywords flag for %"PRIsVALUE" (method accepts keywords or method does not accept argument splat)", QUOTE_ID(name));
                 }
                 break;
               case VM_METHOD_TYPE_BMETHOD: {
@@ -2490,19 +2759,19 @@ rb_mod_ruby2_keywords(int argc, VALUE *argv, VALUE 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));
+                        rb_warn("Skipping set of ruby2_keywords flag for %"PRIsVALUE" (method accepts keywords or method does not accept argument splat)", QUOTE_ID(name));
                     }
                     break;
                 }
               }
               /* fallthrough */
               default:
-                rb_warn("Skipping set of ruby2_keywords flag for %s (method not defined in Ruby)", rb_id2name(name));
+                rb_warn("Skipping set of ruby2_keywords flag for %"PRIsVALUE" (method not defined in Ruby)", QUOTE_ID(name));
                 break;
             }
         }
         else {
-            rb_warn("Skipping set of ruby2_keywords flag for %s (can only set in method defining module)", rb_id2name(name));
+            rb_warn("Skipping set of ruby2_keywords flag for %"PRIsVALUE" (can only set in method defining module)", QUOTE_ID(name));
         }
     }
     return Qnil;
@@ -2573,7 +2842,7 @@ rb_mod_private_method(int argc, VALUE *argv, VALUE obj)
 static VALUE
 top_public(int argc, VALUE *argv, VALUE _)
 {
-    return rb_mod_public(argc, argv, rb_cObject);
+    return rb_mod_public(argc, argv, rb_top_main_class("public"));
 }
 
 /*
@@ -2593,7 +2862,7 @@ top_public(int argc, VALUE *argv, VALUE _)
 static VALUE
 top_private(int argc, VALUE *argv, VALUE _)
 {
-    return rb_mod_private(argc, argv, rb_cObject);
+    return rb_mod_private(argc, argv, rb_top_main_class("private"));
 }
 
 /*
@@ -2606,7 +2875,7 @@ top_private(int argc, VALUE *argv, VALUE _)
 static VALUE
 top_ruby2_keywords(int argc, VALUE *argv, VALUE module)
 {
-    return rb_mod_ruby2_keywords(argc, argv, rb_cObject);
+    return rb_mod_ruby2_keywords(argc, argv, rb_top_main_class("ruby2_keywords"));
 }
 
 /*
@@ -2787,8 +3056,8 @@ vm_respond_to(rb_execution_context_t *ec, VALUE klass, VALUE obj, ID id, int pri
                 rb_category_warn(RB_WARN_CATEGORY_DEPRECATED,
                         "%"PRIsVALUE"%c""respond_to?(:%"PRIsVALUE") uses"
                         " the deprecated method signature, which takes one parameter",
-                        (FL_TEST(klass, FL_SINGLETON) ? obj : klass),
-                        (FL_TEST(klass, FL_SINGLETON) ? '.' : '#'),
+                        (RCLASS_SINGLETON_P(klass) ? obj : klass),
+                        (RCLASS_SINGLETON_P(klass) ? '.' : '#'),
                         QUOTE_ID(id));
                 if (!NIL_P(location)) {
                     VALUE path = RARRAY_AREF(location, 0);
@@ -2887,12 +3156,6 @@ obj_respond_to_missing(VALUE obj, VALUE mid, VALUE priv)
     return Qfalse;
 }
 
-void
-Init_Method(void)
-{
-    //
-}
-
 void
 Init_eval_method(void)
 {
@@ -2933,3 +3196,4 @@ Init_eval_method(void)
         REPLICATE_METHOD(rb_eException, idRespond_to_missing);
     }
 }
+
diff --git a/vm_opts.h b/vm_opts.h
index 7b3caf47548f9c..ce47745b1102de 100644
--- a/vm_opts.h
+++ b/vm_opts.h
@@ -19,7 +19,7 @@
 #define OPT_PEEPHOLE_OPTIMIZATION       1
 #define OPT_SPECIALISED_INSTRUCTION     1
 #define OPT_INLINE_CONST_CACHE          1
-#define OPT_FROZEN_STRING_LITERAL       0
+#define OPT_FROZEN_STRING_LITERAL       -1
 #define OPT_DEBUG_FROZEN_STRING_LITERAL 0
 
 /* Build Options.
diff --git a/vm_sync.c b/vm_sync.c
index 01c85053446480..772a3239db1386 100644
--- a/vm_sync.c
+++ b/vm_sync.c
@@ -5,7 +5,9 @@
 #include "ractor_core.h"
 #include "vm_debug.h"
 
-static bool vm_barrier_finish_p(rb_vm_t *vm);
+void rb_ractor_sched_barrier_start(rb_vm_t *vm, rb_ractor_t *cr);
+void rb_ractor_sched_barrier_join(rb_vm_t *vm, rb_ractor_t *cr);
+void rb_ractor_sched_barrier_end(rb_vm_t *vm, rb_ractor_t *cr);
 
 static bool
 vm_locked(rb_vm_t *vm)
@@ -39,6 +41,26 @@ rb_vm_locked_p(void)
     return vm_locked(GET_VM());
 }
 
+static bool
+vm_need_barrier_waiting(const rb_vm_t *vm)
+{
+#ifdef RUBY_THREAD_PTHREAD_H
+    return vm->ractor.sched.barrier_waiting;
+#else
+    return vm->ractor.sync.barrier_waiting;
+#endif
+}
+
+static bool
+vm_need_barrier(bool no_barrier, const rb_ractor_t *cr, const rb_vm_t *vm)
+{
+#ifdef RUBY_THREAD_PTHREAD_H
+    return !no_barrier && cr->threads.sched.running != NULL && vm_need_barrier_waiting(vm); // ractor has running threads.
+#else
+    return !no_barrier && vm_need_barrier_waiting(vm);
+#endif
+}
+
 static void
 vm_lock_enter(rb_ractor_t *cr, rb_vm_t *vm, bool locked, bool no_barrier, unsigned int *lev APPEND_LOCATION_ARGS)
 {
@@ -52,56 +74,26 @@ vm_lock_enter(rb_ractor_t *cr, rb_vm_t *vm, bool locked, bool no_barrier, unsign
         // locking ractor and acquire VM lock will cause deadlock
         VM_ASSERT(cr->sync.locked_by != rb_ractor_self(cr));
 #endif
-
         // lock
         rb_native_mutex_lock(&vm->ractor.sync.lock);
         VM_ASSERT(vm->ractor.sync.lock_owner == NULL);
-        vm->ractor.sync.lock_owner = cr;
+        VM_ASSERT(vm->ractor.sync.lock_rec == 0);
+
+        // barrier
+        if (vm_need_barrier(no_barrier, cr, vm)) {
+            rb_execution_context_t *ec = GET_EC();
+            RB_VM_SAVE_MACHINE_CONTEXT(rb_ec_thread_ptr(ec));
 
-        if (!no_barrier) {
-            // barrier
-            while (vm->ractor.sync.barrier_waiting) {
-                unsigned int barrier_cnt = vm->ractor.sync.barrier_cnt;
-                rb_thread_t *th = GET_THREAD();
-                bool running;
-
-                RB_VM_SAVE_MACHINE_CONTEXT(th);
-
-                if (rb_ractor_status_p(cr, ractor_running)) {
-                    rb_vm_ractor_blocking_cnt_inc(vm, cr, __FILE__, __LINE__);
-                    running = true;
-                }
-                else {
-                    running = false;
-                }
-                VM_ASSERT(rb_ractor_status_p(cr, ractor_blocking));
-
-                if (vm_barrier_finish_p(vm)) {
-                    RUBY_DEBUG_LOG("wakeup barrier owner");
-                    rb_native_cond_signal(&vm->ractor.sync.barrier_cond);
-                }
-                else {
-                    RUBY_DEBUG_LOG("wait for barrier finish");
-                }
-
-                // wait for restart
-                while (barrier_cnt == vm->ractor.sync.barrier_cnt) {
-                    vm->ractor.sync.lock_owner = NULL;
-                    rb_native_cond_wait(&cr->barrier_wait_cond, &vm->ractor.sync.lock);
-                    VM_ASSERT(vm->ractor.sync.lock_owner == NULL);
-                    vm->ractor.sync.lock_owner = cr;
-                }
-
-                RUBY_DEBUG_LOG("barrier is released. Acquire vm_lock");
-
-                if (running) {
-                    rb_vm_ractor_blocking_cnt_dec(vm, cr, __FILE__, __LINE__);
-                }
-            }
+            do {
+                VM_ASSERT(vm_need_barrier_waiting(vm));
+                RUBY_DEBUG_LOG("barrier serial:%u", vm->ractor.sched.barrier_serial);
+                rb_ractor_sched_barrier_join(vm, cr);
+            } while (vm_need_barrier_waiting(vm));
         }
 
         VM_ASSERT(vm->ractor.sync.lock_rec == 0);
-        VM_ASSERT(vm->ractor.sync.lock_owner == cr);
+        VM_ASSERT(vm->ractor.sync.lock_owner == NULL);
+        vm->ractor.sync.lock_owner = cr;
     }
 
     vm->ractor.sync.lock_rec++;
@@ -112,14 +104,26 @@ vm_lock_enter(rb_ractor_t *cr, rb_vm_t *vm, bool locked, bool no_barrier, unsign
 }
 
 static void
-vm_lock_leave(rb_vm_t *vm, unsigned int *lev APPEND_LOCATION_ARGS)
+vm_lock_leave(rb_vm_t *vm, bool no_barrier, unsigned int *lev APPEND_LOCATION_ARGS)
 {
-    RUBY_DEBUG_LOG2(file, line, "rec:%u owner:%u", vm->ractor.sync.lock_rec,
-                    (unsigned int)rb_ractor_id(vm->ractor.sync.lock_owner));
+    MAYBE_UNUSED(rb_ractor_t *cr = vm->ractor.sync.lock_owner);
+
+    RUBY_DEBUG_LOG2(file, line, "rec:%u owner:%u%s", vm->ractor.sync.lock_rec,
+                    (unsigned int)rb_ractor_id(cr),
+                    vm->ractor.sync.lock_rec == 1 ? " (leave)" : "");
 
     ASSERT_vm_locking();
     VM_ASSERT(vm->ractor.sync.lock_rec > 0);
     VM_ASSERT(vm->ractor.sync.lock_rec == *lev);
+    VM_ASSERT(cr == GET_RACTOR());
+
+#ifdef RUBY_THREAD_PTHREAD_H
+    if (vm->ractor.sched.barrier_ractor == cr &&
+        vm->ractor.sched.barrier_lock_rec == vm->ractor.sync.lock_rec) {
+        VM_ASSERT(!no_barrier);
+        rb_ractor_sched_barrier_end(vm, cr);
+    }
+#endif
 
     vm->ractor.sync.lock_rec--;
     *lev = vm->ractor.sync.lock_rec;
@@ -161,10 +165,16 @@ rb_vm_lock_enter_body_cr(rb_ractor_t *cr, unsigned int *lev APPEND_LOCATION_ARGS
     vm_lock_enter(cr, vm, vm_locked(vm), false, lev APPEND_LOCATION_PARAMS);
 }
 
+void
+rb_vm_lock_leave_body_nb(unsigned int *lev APPEND_LOCATION_ARGS)
+{
+    vm_lock_leave(GET_VM(), true, lev APPEND_LOCATION_PARAMS);
+}
+
 void
 rb_vm_lock_leave_body(unsigned int *lev APPEND_LOCATION_ARGS)
 {
-    vm_lock_leave(GET_VM(), lev APPEND_LOCATION_PARAMS);
+    vm_lock_leave(GET_VM(),  false, lev APPEND_LOCATION_PARAMS);
 }
 
 void
@@ -182,7 +192,7 @@ rb_vm_unlock_body(LOCATION_ARGS)
     rb_vm_t *vm = GET_VM();
     ASSERT_vm_locking();
     VM_ASSERT(vm->ractor.sync.lock_rec == 1);
-    vm_lock_leave(vm, &vm->ractor.sync.lock_rec APPEND_LOCATION_PARAMS);
+    vm_lock_leave(vm, false, &vm->ractor.sync.lock_rec APPEND_LOCATION_PARAMS);
 }
 
 static void
@@ -217,15 +227,13 @@ rb_vm_cond_timedwait(rb_vm_t *vm, rb_nativethread_cond_t *cond, unsigned long ms
 }
 
 static bool
-vm_barrier_finish_p(rb_vm_t *vm)
+vm_barrier_acquired_p(const rb_vm_t *vm, const rb_ractor_t *cr)
 {
-    RUBY_DEBUG_LOG("cnt:%u living:%u blocking:%u",
-                   vm->ractor.sync.barrier_cnt,
-                   vm->ractor.cnt,
-                   vm->ractor.blocking_cnt);
-
-    VM_ASSERT(vm->ractor.blocking_cnt <= vm->ractor.cnt);
-    return vm->ractor.blocking_cnt == vm->ractor.cnt;
+#ifdef RUBY_THREAD_PTHREAD_H
+    return vm->ractor.sched.barrier_ractor == cr;
+#else
+    return false;
+#endif
 }
 
 void
@@ -239,44 +247,19 @@ rb_vm_barrier(void)
     }
     else {
         rb_vm_t *vm = GET_VM();
-        VM_ASSERT(vm->ractor.sync.barrier_waiting == false);
-        ASSERT_vm_locking();
-
         rb_ractor_t *cr = vm->ractor.sync.lock_owner;
+
+        ASSERT_vm_locking();
         VM_ASSERT(cr == GET_RACTOR());
         VM_ASSERT(rb_ractor_status_p(cr, ractor_running));
 
-        vm->ractor.sync.barrier_waiting = true;
-
-        RUBY_DEBUG_LOG("barrier start. cnt:%u living:%u blocking:%u",
-                       vm->ractor.sync.barrier_cnt,
-                       vm->ractor.cnt,
-                       vm->ractor.blocking_cnt);
-
-        rb_vm_ractor_blocking_cnt_inc(vm, cr, __FILE__, __LINE__);
-
-        // send signal
-        rb_ractor_t *r = 0;
-        ccan_list_for_each(&vm->ractor.set, r, vmlr_node) {
-            if (r != cr) {
-                rb_ractor_vm_barrier_interrupt_running_thread(r);
-            }
-        }
-
-        // wait
-        while (!vm_barrier_finish_p(vm)) {
-            rb_vm_cond_wait(vm, &vm->ractor.sync.barrier_cond);
+        if (vm_barrier_acquired_p(vm, cr)) {
+            // already in barrier synchronization
+            return;
         }
-
-        RUBY_DEBUG_LOG("cnt:%u barrier success", vm->ractor.sync.barrier_cnt);
-
-        rb_vm_ractor_blocking_cnt_dec(vm, cr, __FILE__, __LINE__);
-
-        vm->ractor.sync.barrier_waiting = false;
-        vm->ractor.sync.barrier_cnt++;
-
-        ccan_list_for_each(&vm->ractor.set, r, vmlr_node) {
-            rb_native_cond_signal(&r->barrier_wait_cond);
+        else {
+            VM_ASSERT(!vm->ractor.sched.barrier_waiting);
+            rb_ractor_sched_barrier_start(vm, cr);
         }
     }
 }
diff --git a/vm_sync.h b/vm_sync.h
index 4d83b5e52cbb9f..457be2c6b888aa 100644
--- a/vm_sync.h
+++ b/vm_sync.h
@@ -21,9 +21,10 @@ void rb_vm_lock_body(LOCATION_ARGS);
 void rb_vm_unlock_body(LOCATION_ARGS);
 
 struct rb_ractor_struct;
-void rb_vm_lock_enter_body_cr(struct rb_ractor_struct *cr, unsigned int *lev APPEND_LOCATION_ARGS);
-void rb_vm_lock_enter_body_nb(unsigned int *lev APPEND_LOCATION_ARGS);
-void rb_vm_lock_enter_body(unsigned int *lev APPEND_LOCATION_ARGS);
+NOINLINE(void rb_vm_lock_enter_body_cr(struct rb_ractor_struct *cr, unsigned int *lev APPEND_LOCATION_ARGS));
+NOINLINE(void rb_vm_lock_enter_body_nb(unsigned int *lev APPEND_LOCATION_ARGS));
+NOINLINE(void rb_vm_lock_enter_body(unsigned int *lev APPEND_LOCATION_ARGS));
+void rb_vm_lock_leave_body_nb(unsigned int *lev APPEND_LOCATION_ARGS);
 void rb_vm_lock_leave_body(unsigned int *lev APPEND_LOCATION_ARGS);
 void rb_vm_barrier(void);
 
@@ -86,6 +87,14 @@ rb_vm_lock_enter_nb(unsigned int *lev, const char *file, int line)
     }
 }
 
+static inline void
+rb_vm_lock_leave_nb(unsigned int *lev, const char *file, int line)
+{
+    if (rb_multi_ractor_p()) {
+        rb_vm_lock_leave_body_nb(lev APPEND_LOCATION_PARAMS);
+    }
+}
+
 static inline void
 rb_vm_lock_leave(unsigned int *lev, const char *file, int line)
 {
@@ -119,10 +128,17 @@ rb_vm_lock_leave_cr(struct rb_ractor_struct *cr, unsigned int *levp, const char
 
 #define RB_VM_LOCK_ENTER()  { unsigned int _lev; RB_VM_LOCK_ENTER_LEV(&_lev);
 #define RB_VM_LOCK_LEAVE()    RB_VM_LOCK_LEAVE_LEV(&_lev); }
+#define RB_VM_LOCKING() \
+    for (unsigned int vm_locking_level, vm_locking_do = (RB_VM_LOCK_ENTER_LEV(&vm_locking_level), 1); \
+         vm_locking_do; RB_VM_LOCK_LEAVE_LEV(&vm_locking_level), vm_locking_do = 0)
 
 #define RB_VM_LOCK_ENTER_LEV_NB(levp) rb_vm_lock_enter_nb(levp, __FILE__, __LINE__)
+#define RB_VM_LOCK_LEAVE_LEV_NB(levp) rb_vm_lock_leave_nb(levp, __FILE__, __LINE__)
 #define RB_VM_LOCK_ENTER_NO_BARRIER()  { unsigned int _lev; RB_VM_LOCK_ENTER_LEV_NB(&_lev);
-#define RB_VM_LOCK_LEAVE_NO_BARRIER()    RB_VM_LOCK_LEAVE_LEV(&_lev); }
+#define RB_VM_LOCK_LEAVE_NO_BARRIER()    RB_VM_LOCK_LEAVE_LEV_NB(&_lev); }
+#define RB_VM_LOCKING_NO_BARRIER() \
+    for (unsigned int vm_locking_level, vm_locking_do = (RB_VM_LOCK_ENTER_LEV_NB(&vm_locking_level), 1); \
+         vm_locking_do; RB_VM_LOCK_LEAVE_LEV_NB(&vm_locking_level), vm_locking_do = 0)
 
 #if RUBY_DEBUG > 0
 void RUBY_ASSERT_vm_locking(void);
diff --git a/vm_trace.c b/vm_trace.c
index 3e11131bddacc0..4032b1f6391fa1 100644
--- a/vm_trace.c
+++ b/vm_trace.c
@@ -23,11 +23,14 @@
 
 #include "eval_intern.h"
 #include "internal.h"
+#include "internal/bits.h"
 #include "internal/class.h"
+#include "internal/gc.h"
 #include "internal/hash.h"
 #include "internal/symbol.h"
+#include "internal/thread.h"
 #include "iseq.h"
-#include "rjit.h"
+#include "ruby/atomic.h"
 #include "ruby/debug.h"
 #include "vm_core.h"
 #include "ruby/ractor.h"
@@ -78,7 +81,7 @@ rb_hook_list_mark_and_update(rb_hook_list_t *hooks)
     }
 }
 
-static void clean_hooks(const rb_execution_context_t *ec, rb_hook_list_t *list);
+static void clean_hooks(rb_hook_list_t *list);
 
 void
 rb_hook_list_free(rb_hook_list_t *hooks)
@@ -86,7 +89,7 @@ rb_hook_list_free(rb_hook_list_t *hooks)
     hooks->need_clean = true;
 
     if (hooks->running == 0) {
-        clean_hooks(GET_EC(), hooks);
+        clean_hooks(hooks);
     }
 }
 
@@ -132,7 +135,6 @@ update_global_event_hook(rb_event_flag_t prev_events, rb_event_flag_t new_events
         // Do this after event flags updates so other ractors see updated vm events
         // when they wake up.
         rb_yjit_tracing_invalidate_all();
-        rb_rjit_tracing_invalidate_all(new_iseq_events);
     }
 }
 
@@ -219,7 +221,7 @@ rb_add_event_hook2(rb_event_hook_func_t func, rb_event_flag_t events, VALUE data
 }
 
 static void
-clean_hooks(const rb_execution_context_t *ec, rb_hook_list_t *list)
+clean_hooks(rb_hook_list_t *list)
 {
     rb_event_hook_t *hook, **nextp = &list->hooks;
     rb_event_flag_t prev_events = list->events;
@@ -253,11 +255,11 @@ clean_hooks(const rb_execution_context_t *ec, rb_hook_list_t *list)
 }
 
 static void
-clean_hooks_check(const rb_execution_context_t *ec, rb_hook_list_t *list)
+clean_hooks_check(rb_hook_list_t *list)
 {
     if (UNLIKELY(list->need_clean)) {
         if (list->running == 0) {
-            clean_hooks(ec, list);
+            clean_hooks(list);
         }
     }
 }
@@ -285,7 +287,7 @@ remove_event_hook(const rb_execution_context_t *ec, const rb_thread_t *filter_th
         hook = hook->next;
     }
 
-    clean_hooks_check(ec, list);
+    clean_hooks_check(list);
     return ret;
 }
 
@@ -369,7 +371,7 @@ static void
 exec_hooks_postcheck(const rb_execution_context_t *ec, rb_hook_list_t *list)
 {
     list->running--;
-    clean_hooks_check(ec, list);
+    clean_hooks_check(list);
 }
 
 static void
@@ -431,7 +433,7 @@ rb_exec_event_hooks(rb_trace_arg_t *trace_arg, rb_hook_list_t *hooks, int pop_p)
             trace_arg->self != rb_mRubyVMFrozenCore /* skip special methods. TODO: remove it. */) {
             const VALUE errinfo = ec->errinfo;
             const VALUE old_recursive = ec->local_storage_recursive_hash;
-            int state = 0;
+            enum ruby_tag_type state = 0;
 
             /* setup */
             ec->local_storage_recursive_hash = ec->local_storage_recursive_hash_for_trace;
@@ -451,6 +453,7 @@ rb_exec_event_hooks(rb_trace_arg_t *trace_arg, rb_hook_list_t *hooks, int pop_p)
             if (state) {
                 if (pop_p) {
                     if (VM_FRAME_FINISHED_P(ec->cfp)) {
+                        rb_vm_tag_jmpbuf_deinit(&ec->tag->buf);
                         ec->tag = ec->tag->prev;
                     }
                     rb_vm_pop_frame(ec);
@@ -730,7 +733,7 @@ call_trace_func(rb_event_flag_t event, VALUE proc, VALUE self, ID id, VALUE klas
         if (RB_TYPE_P(klass, T_ICLASS)) {
             klass = RBASIC(klass)->klass;
         }
-        else if (FL_TEST(klass, FL_SINGLETON)) {
+        else if (RCLASS_SINGLETON_P(klass)) {
             klass = RCLASS_ATTACHED_OBJECT(klass);
         }
     }
@@ -779,16 +782,14 @@ tp_mark(void *ptr)
     if (tp->target_th) rb_gc_mark(tp->target_th->self);
 }
 
-static size_t
-tp_memsize(const void *ptr)
-{
-    return sizeof(rb_tp_t);
-}
-
 static const rb_data_type_t tp_data_type = {
     "tracepoint",
-    {tp_mark, RUBY_TYPED_DEFAULT_FREE, tp_memsize,},
-    0, 0, RUBY_TYPED_FREE_IMMEDIATELY
+    {
+        tp_mark,
+        RUBY_TYPED_DEFAULT_FREE,
+        NULL, // Nothing allocated externally, so don't need a memsize function
+    },
+    0, 0, RUBY_TYPED_FREE_IMMEDIATELY | RUBY_TYPED_WB_PROTECTED | RUBY_TYPED_EMBEDDABLE
 };
 
 static VALUE
@@ -935,6 +936,9 @@ rb_tracearg_parameters(rb_trace_arg_t *trace_arg)
             const rb_method_entry_t *me;
             VALUE iclass = Qnil;
             me = rb_method_entry_without_refinements(trace_arg->klass, trace_arg->called_id, &iclass);
+            if (!me) {
+                me = rb_method_entry_without_refinements(trace_arg->klass, trace_arg->id, &iclass);
+            }
             return rb_unnamed_parameters(rb_method_entry_arity(me));
         }
         break;
@@ -1195,6 +1199,10 @@ rb_tracepoint_enable(VALUE tpval)
         rb_raise(rb_eArgError, "can't nest-enable a targeting TracePoint");
     }
 
+    if (tp->tracing) {
+        return Qundef;
+    }
+
     if (tp->target_th) {
         rb_thread_add_event_hook2(tp->target_th->self, (rb_event_hook_func_t)tp_call_trace, tp->events, tpval,
                                   RUBY_EVENT_HOOK_FLAG_SAFE | RUBY_EVENT_HOOK_FLAG_RAW_ARG);
@@ -1244,7 +1252,7 @@ rb_tracepoint_enable_for_target(VALUE tpval, VALUE target, VALUE target_line)
     }
 
     VM_ASSERT(tp->local_target_set == Qfalse);
-    tp->local_target_set = rb_obj_hide(rb_ident_hash_new());
+    RB_OBJ_WRITE(tpval, &tp->local_target_set, rb_obj_hide(rb_ident_hash_new()));
 
     /* bmethod */
     if (rb_obj_is_method(target)) {
@@ -1253,6 +1261,7 @@ rb_tracepoint_enable_for_target(VALUE tpval, VALUE target, VALUE target_line)
             (tp->events & (RUBY_EVENT_CALL | RUBY_EVENT_RETURN))) {
             if (def->body.bmethod.hooks == NULL) {
                 def->body.bmethod.hooks = ZALLOC(rb_hook_list_t);
+                def->body.bmethod.hooks->is_local = true;
             }
             rb_hook_list_connect_tracepoint(target, def->body.bmethod.hooks, tpval, 0);
             rb_hash_aset(tp->local_target_set, target, Qfalse);
@@ -1267,7 +1276,7 @@ rb_tracepoint_enable_for_target(VALUE tpval, VALUE target, VALUE target_line)
     rb_hash_aset(tp->local_target_set, (VALUE)iseq, Qtrue);
 
     if ((tp->events & (RUBY_EVENT_CALL | RUBY_EVENT_RETURN)) &&
-        iseq->body->builtin_attrs & BUILTIN_ATTR_SINGLE_NOARG_INLINE) {
+        iseq->body->builtin_attrs & BUILTIN_ATTR_SINGLE_NOARG_LEAF) {
         rb_clear_bf_ccs();
     }
 
@@ -1276,7 +1285,6 @@ rb_tracepoint_enable_for_target(VALUE tpval, VALUE target, VALUE target_line)
     }
 
     rb_yjit_tracing_invalidate_all();
-    rb_rjit_tracing_invalidate_all(tp->events);
 
     ruby_vm_event_local_num++;
 
@@ -1315,7 +1323,7 @@ rb_tracepoint_disable(VALUE tpval)
 
     if (tp->local_target_set) {
         rb_hash_foreach(tp->local_target_set, disable_local_event_iseq_i, tpval);
-        tp->local_target_set = Qfalse;
+        RB_OBJ_WRITE(tpval, &tp->local_target_set, Qfalse);
         ruby_vm_event_local_num--;
     }
     else {
@@ -1335,7 +1343,7 @@ void
 rb_hook_list_connect_tracepoint(VALUE target, rb_hook_list_t *list, VALUE tpval, unsigned int target_line)
 {
     rb_tp_t *tp = tpptr(tpval);
-    rb_event_hook_t *hook = alloc_event_hook((rb_event_hook_func_t)tp_call_trace, tp->events, tpval,
+    rb_event_hook_t *hook = alloc_event_hook((rb_event_hook_func_t)tp_call_trace, tp->events & ISEQ_TRACE_EVENTS, tpval,
                                              RUBY_EVENT_HOOK_FLAG_SAFE | RUBY_EVENT_HOOK_FLAG_RAW_ARG);
     hook->filter.target_line = target_line;
     hook_list_connect(target, list, hook, FALSE);
@@ -1382,6 +1390,9 @@ tracepoint_enable_m(rb_execution_context_t *ec, VALUE tpval, VALUE target, VALUE
             rb_raise(rb_eArgError, "can not override target_thread filter");
         }
         tp->target_th = rb_thread_ptr(target_thread);
+
+        RUBY_ASSERT(tp->target_th->self == target_thread);
+        RB_OBJ_WRITTEN(tpval, Qundef, target_thread);
     }
     else {
         tp->target_th = NULL;
@@ -1449,7 +1460,7 @@ tracepoint_new(VALUE klass, rb_thread_t *target_th, rb_event_flag_t events, void
     rb_tp_t *tp;
     TypedData_Get_Struct(tpval, rb_tp_t, &tp_data_type, tp);
 
-    tp->proc = proc;
+    RB_OBJ_WRITE(tpval, &tp->proc, proc);
     tp->ractor = rb_ractor_shareable_p(proc) ? NULL : GET_RACTOR();
     tp->func = func;
     tp->data = data;
@@ -1517,7 +1528,7 @@ tracepoint_inspect(rb_execution_context_t *ec, VALUE self)
                 VALUE sym = rb_tracearg_method_id(trace_arg);
                 if (NIL_P(sym))
                     break;
-                return rb_sprintf("#<TracePoint:%"PRIsVALUE" %"PRIsVALUE":%d in `%"PRIsVALUE"'>",
+                return rb_sprintf("#<TracePoint:%"PRIsVALUE" %"PRIsVALUE":%d in '%"PRIsVALUE"'>",
                                   rb_tracearg_event(trace_arg),
                                   rb_tracearg_path(trace_arg),
                                   FIX2INT(rb_tracearg_lineno(trace_arg)),
@@ -1527,7 +1538,7 @@ tracepoint_inspect(rb_execution_context_t *ec, VALUE self)
           case RUBY_EVENT_C_CALL:
           case RUBY_EVENT_RETURN:
           case RUBY_EVENT_C_RETURN:
-            return rb_sprintf("#<TracePoint:%"PRIsVALUE" `%"PRIsVALUE"' %"PRIsVALUE":%d>",
+            return rb_sprintf("#<TracePoint:%"PRIsVALUE" '%"PRIsVALUE"' %"PRIsVALUE":%d>",
                               rb_tracearg_event(trace_arg),
                               rb_tracearg_method_id(trace_arg),
                               rb_tracearg_path(trace_arg),
@@ -1616,17 +1627,22 @@ Init_vm_trace(void)
     rb_undef_alloc_func(rb_cTracePoint);
 }
 
-typedef struct rb_postponed_job_struct {
-    rb_postponed_job_func_t func;
-    void *data;
-} rb_postponed_job_t;
-
-#define MAX_POSTPONED_JOB                  1000
-#define MAX_POSTPONED_JOB_SPECIAL_ADDITION   24
+/*
+ * Ruby actually has two separate mechanisms for enqueueing work from contexts
+ * where it is not safe to run Ruby code, to run later on when it is safe. One
+ * is async-signal-safe but more limited, and accessed through the
+ * `rb_postponed_job_preregister` and `rb_postponed_job_trigger` functions. The
+ * other is more flexible but cannot be used in signal handlers, and is accessed
+ * through the `rb_workqueue_register` function.
+ *
+ * The postponed job functions form part of Ruby's extension API, but the
+ * workqueue functions are for internal use only.
+ */
 
 struct rb_workqueue_job {
     struct ccan_list_node jnode; /* <=> vm->workqueue */
-    rb_postponed_job_t job;
+    rb_postponed_job_func_t func;
+    void *data;
 };
 
 // Used for VM memsize reporting. Returns the size of a list of rb_workqueue_job
@@ -1644,52 +1660,51 @@ rb_vm_memsize_workqueue(struct ccan_list_head *workqueue)
     return size;
 }
 
-// Used for VM memsize reporting. Returns the total size of the postponed job
-// buffer that was allocated at initialization.
-size_t
-rb_vm_memsize_postponed_job_buffer(void)
-{
-    return sizeof(rb_postponed_job_t) * MAX_POSTPONED_JOB;
-}
-
-void
-Init_vm_postponed_job(void)
+/*
+ * thread-safe and called from non-Ruby thread
+ * returns FALSE on failure (ENOMEM), TRUE otherwise
+ */
+int
+rb_workqueue_register(unsigned flags, rb_postponed_job_func_t func, void *data)
 {
+    struct rb_workqueue_job *wq_job = malloc(sizeof(*wq_job));
     rb_vm_t *vm = GET_VM();
-    vm->postponed_job_buffer = ALLOC_N(rb_postponed_job_t, MAX_POSTPONED_JOB);
-    vm->postponed_job_index = 0;
-    /* workqueue is initialized when VM locks are initialized */
-}
 
-enum postponed_job_register_result {
-    PJRR_SUCCESS     = 0,
-    PJRR_FULL        = 1,
-    PJRR_INTERRUPTED = 2
-};
-
-/* 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, rb_atomic_t max, rb_atomic_t expected_index)
-{
-    rb_postponed_job_t *pjob;
+    if (!wq_job) return FALSE;
+    wq_job->func = func;
+    wq_job->data = data;
 
-    if (expected_index >= max) return PJRR_FULL; /* failed */
+    rb_nativethread_lock_lock(&vm->workqueue_lock);
+    ccan_list_add_tail(&vm->workqueue, &wq_job->jnode);
+    rb_nativethread_lock_unlock(&vm->workqueue_lock);
 
-    if (ATOMIC_CAS(vm->postponed_job_index, expected_index, expected_index+1) == expected_index) {
-        pjob = &vm->postponed_job_buffer[expected_index];
-    }
-    else {
-        return PJRR_INTERRUPTED;
-    }
+    // TODO: current implementation affects only main ractor
+    RUBY_VM_SET_POSTPONED_JOB_INTERRUPT(rb_vm_main_ractor_ec(vm));
 
-    /* unused: pjob->flags = flags; */
-    pjob->func = func;
-    pjob->data = data;
+    return TRUE;
+}
 
-    RUBY_VM_SET_POSTPONED_JOB_INTERRUPT(ec);
+#define PJOB_TABLE_SIZE              (sizeof(rb_atomic_t) * CHAR_BIT)
+/* pre-registered jobs table, for async-safe jobs */
+typedef struct rb_postponed_job_queue {
+    struct {
+        rb_postponed_job_func_t func;
+        void *data;
+    } table[PJOB_TABLE_SIZE];
+    /* Bits in this are set when the corresponding entry in prereg_table has non-zero
+     * triggered_count; i.e. somebody called rb_postponed_job_trigger */
+    rb_atomic_t triggered_bitset;
+} rb_postponed_job_queues_t;
 
-    return PJRR_SUCCESS;
+void
+rb_vm_postponed_job_queue_init(rb_vm_t *vm)
+{
+    /* use mimmalloc; postponed job registration is a dependency of objspace, so this gets
+     * called _VERY_ early inside Init_BareVM */
+    rb_postponed_job_queues_t *pjq = ruby_mimmalloc(sizeof(rb_postponed_job_queues_t));
+    pjq->triggered_bitset = 0;
+    memset(pjq->table, 0, sizeof(pjq->table));
+    vm->postponed_job_queue = pjq;
 }
 
 static rb_execution_context_t *
@@ -1700,83 +1715,114 @@ get_valid_ec(rb_vm_t *vm)
     return ec;
 }
 
-/*
- * return 0 if job buffer is full
- * Async-signal-safe
- */
-int
-rb_postponed_job_register(unsigned int flags, rb_postponed_job_func_t func, void *data)
+void
+rb_vm_postponed_job_atfork(void)
 {
     rb_vm_t *vm = GET_VM();
-    rb_execution_context_t *ec = get_valid_ec(vm);
-
-  begin:
-    switch (postponed_job_register(ec, vm, flags, func, data, MAX_POSTPONED_JOB, vm->postponed_job_index)) {
-      case PJRR_SUCCESS    : return 1;
-      case PJRR_FULL       : return 0;
-      case PJRR_INTERRUPTED: goto begin;
-      default: rb_bug("unreachable");
+    rb_postponed_job_queues_t *pjq = vm->postponed_job_queue;
+    /* make sure we set the interrupt flag on _this_ thread if we carried any pjobs over
+     * from the other side of the fork */
+    if (pjq->triggered_bitset) {
+        RUBY_VM_SET_POSTPONED_JOB_INTERRUPT(get_valid_ec(vm));
     }
+
 }
 
-/*
- * return 0 if job buffer is full
- * Async-signal-safe
- */
-int
-rb_postponed_job_register_one(unsigned int flags, rb_postponed_job_func_t func, void *data)
+/* Frees the memory managed by the postponed job infrastructure at shutdown */
+void
+rb_vm_postponed_job_free(void)
 {
     rb_vm_t *vm = GET_VM();
-    rb_execution_context_t *ec = get_valid_ec(vm);
-    rb_postponed_job_t *pjob;
-    rb_atomic_t i, index;
-
-  begin:
-    index = vm->postponed_job_index;
-    for (i=0; i<index; i++) {
-        pjob = &vm->postponed_job_buffer[i];
-        if (pjob->func == func) {
-            RUBY_VM_SET_POSTPONED_JOB_INTERRUPT(ec);
-            return 2;
+    ruby_xfree(vm->postponed_job_queue);
+    vm->postponed_job_queue = NULL;
+}
+
+// Used for VM memsize reporting. Returns the total size of the postponed job
+// queue infrastructure.
+size_t
+rb_vm_memsize_postponed_job_queue(void)
+{
+    return sizeof(rb_postponed_job_queues_t);
+}
+
+
+rb_postponed_job_handle_t
+rb_postponed_job_preregister(unsigned int flags, rb_postponed_job_func_t func, void *data)
+{
+    /* The doc comments say that this function should be called under the GVL, because
+     * that is actually required to get the guarantee that "if a given (func, data) pair
+     * was already pre-registered, this method will return the same handle instance".
+     *
+     * However, the actual implementation here is called without the GVL, from inside
+     * rb_postponed_job_register, to support that legacy interface. In the presence
+     * of concurrent calls to both _preregister and _register functions on the same
+     * func, however, the data may get mixed up between them. */
+
+    rb_postponed_job_queues_t *pjq = GET_VM()->postponed_job_queue;
+    for (unsigned int i = 0; i < PJOB_TABLE_SIZE; i++) {
+        /* Try and set this slot to equal `func` */
+        rb_postponed_job_func_t existing_func = (rb_postponed_job_func_t)(uintptr_t)RUBY_ATOMIC_PTR_CAS(pjq->table[i].func, NULL, (void *)(uintptr_t)func);
+        if (existing_func == NULL || existing_func == func) {
+            /* Either this slot was NULL, and we set it to func, or, this slot was already equal to func.
+             * In either case, clobber the data with our data. Note that concurrent calls to
+             * rb_postponed_job_register with the same func & different data will result in either of the
+             * datas being written */
+            RUBY_ATOMIC_PTR_EXCHANGE(pjq->table[i].data, data);
+            return (rb_postponed_job_handle_t)i;
+        }
+        else {
+            /* Try the next slot if this one already has a func in it */
+            continue;
         }
     }
-    switch (postponed_job_register(ec, vm, flags, func, data, MAX_POSTPONED_JOB + MAX_POSTPONED_JOB_SPECIAL_ADDITION, index)) {
-      case PJRR_SUCCESS    : return 1;
-      case PJRR_FULL       : return 0;
-      case PJRR_INTERRUPTED: goto begin;
-      default: rb_bug("unreachable");
-    }
+
+    /* full */
+    return POSTPONED_JOB_HANDLE_INVALID;
 }
 
-/*
- * thread-safe and called from non-Ruby thread
- * returns FALSE on failure (ENOMEM), TRUE otherwise
- */
-int
-rb_workqueue_register(unsigned flags, rb_postponed_job_func_t func, void *data)
+void
+rb_postponed_job_trigger(rb_postponed_job_handle_t h)
 {
-    struct rb_workqueue_job *wq_job = malloc(sizeof(*wq_job));
     rb_vm_t *vm = GET_VM();
+    rb_postponed_job_queues_t *pjq = vm->postponed_job_queue;
 
-    if (!wq_job) return FALSE;
-    wq_job->job.func = func;
-    wq_job->job.data = data;
+    RUBY_ATOMIC_OR(pjq->triggered_bitset, (((rb_atomic_t)1UL) << h));
+    RUBY_VM_SET_POSTPONED_JOB_INTERRUPT(get_valid_ec(vm));
+}
 
-    rb_nativethread_lock_lock(&vm->workqueue_lock);
-    ccan_list_add_tail(&vm->workqueue, &wq_job->jnode);
-    rb_nativethread_lock_unlock(&vm->workqueue_lock);
 
-    // TODO: current implementation affects only main ractor
-    RUBY_VM_SET_POSTPONED_JOB_INTERRUPT(rb_vm_main_ractor_ec(vm));
+static int
+pjob_register_legacy_impl(unsigned int flags, rb_postponed_job_func_t func, void *data)
+{
+    /* We _know_ calling preregister from a signal handler like this is racy; what is
+     * and is not promised is very exhaustively documented in debug.h */
+    rb_postponed_job_handle_t h = rb_postponed_job_preregister(0, func, data);
+    if (h == POSTPONED_JOB_HANDLE_INVALID) {
+        return 0;
+    }
+    rb_postponed_job_trigger(h);
+    return 1;
+}
 
-    return TRUE;
+int
+rb_postponed_job_register(unsigned int flags, rb_postponed_job_func_t func, void *data)
+{
+    return pjob_register_legacy_impl(flags, func, data);
+}
+
+int
+rb_postponed_job_register_one(unsigned int flags, rb_postponed_job_func_t func, void *data)
+{
+    return pjob_register_legacy_impl(flags, func, data);
 }
 
+
 void
 rb_postponed_job_flush(rb_vm_t *vm)
 {
+    rb_postponed_job_queues_t *pjq = GET_VM()->postponed_job_queue;
     rb_execution_context_t *ec = GET_EC();
-    const rb_atomic_t block_mask = POSTPONED_JOB_INTERRUPT_MASK|TRAP_INTERRUPT_MASK;
+    const rb_atomic_t block_mask = POSTPONED_JOB_INTERRUPT_MASK | TRAP_INTERRUPT_MASK;
     volatile rb_atomic_t saved_mask = ec->interrupt_mask & block_mask;
     VALUE volatile saved_errno = ec->errinfo;
     struct ccan_list_head tmp;
@@ -1787,26 +1833,31 @@ rb_postponed_job_flush(rb_vm_t *vm)
     ccan_list_append_list(&tmp, &vm->workqueue);
     rb_nativethread_lock_unlock(&vm->workqueue_lock);
 
+    rb_atomic_t triggered_bits = RUBY_ATOMIC_EXCHANGE(pjq->triggered_bitset, 0);
+
     ec->errinfo = Qnil;
     /* mask POSTPONED_JOB dispatch */
     ec->interrupt_mask |= block_mask;
     {
         EC_PUSH_TAG(ec);
         if (EC_EXEC_TAG() == TAG_NONE) {
-            rb_atomic_t index;
-            struct rb_workqueue_job *wq_job;
-
-            while ((index = vm->postponed_job_index) > 0) {
-                if (ATOMIC_CAS(vm->postponed_job_index, index, index-1) == index) {
-                    rb_postponed_job_t *pjob = &vm->postponed_job_buffer[index-1];
-                    (*pjob->func)(pjob->data);
-                }
+            /* execute postponed jobs */
+            while (triggered_bits) {
+                unsigned int i = bit_length(triggered_bits) - 1;
+                triggered_bits ^= ((1UL) << i); /* toggle ith bit off */
+                rb_postponed_job_func_t func = pjq->table[i].func;
+                void *data = pjq->table[i].data;
+                (func)(data);
             }
+
+            /* execute workqueue jobs */
+            struct rb_workqueue_job *wq_job;
             while ((wq_job = ccan_list_pop(&tmp, struct rb_workqueue_job, jnode))) {
-                rb_postponed_job_t pjob = wq_job->job;
+                rb_postponed_job_func_t func = wq_job->func;
+                void *data = wq_job->data;
 
                 free(wq_job);
-                (pjob.func)(pjob.data);
+                (func)(data);
             }
         }
         EC_POP_TAG();
@@ -1815,7 +1866,8 @@ rb_postponed_job_flush(rb_vm_t *vm)
     ec->interrupt_mask &= ~(saved_mask ^ block_mask);
     ec->errinfo = saved_errno;
 
-    /* don't leak memory if a job threw an exception */
+    /* If we threw an exception, there might be leftover workqueue items; carry them over
+     * to a subsequent execution of flush */
     if (!ccan_list_empty(&tmp)) {
         rb_nativethread_lock_lock(&vm->workqueue_lock);
         ccan_list_prepend_list(&vm->workqueue, &tmp);
@@ -1823,4 +1875,10 @@ rb_postponed_job_flush(rb_vm_t *vm)
 
         RUBY_VM_SET_POSTPONED_JOB_INTERRUPT(GET_EC());
     }
+    /* likewise with any remaining-to-be-executed bits of the preregistered postponed
+     * job table */
+    if (triggered_bits) {
+        RUBY_ATOMIC_OR(pjq->triggered_bitset, triggered_bits);
+        RUBY_VM_SET_POSTPONED_JOB_INTERRUPT(GET_EC());
+    }
 }
diff --git a/vsnprintf.c b/vsnprintf.c
index 212bb06c5ecf4c..ecd5573dd581fc 100644
--- a/vsnprintf.c
+++ b/vsnprintf.c
@@ -1255,8 +1255,8 @@ cvt(double value, int ndigits, int flags, char *sign, int *decpt, int ch, int *l
 	}
 	buf[0] = 0; /* rve - digits may be 0 */
 	memcpy(buf, digits, rve - digits);
-	xfree(digits);
 	rve = buf + (rve - digits);
+	free(digits);
 	digits = buf;
 	if (flags & ALT) {	/* Print trailing zeros */
 		bp = digits + ndigits;
diff --git a/warning.rb b/warning.rb
index 4e34c6383393e5..625dd9506b3c90 100644
--- a/warning.rb
+++ b/warning.rb
@@ -40,14 +40,20 @@ module Kernel
   #    baz.rb:6: warning: invalid call to foo
   #
   # If <code>category</code> keyword argument is given, passes the category
-  # to <code>Warning.warn</code>.  The category given must be be one of the
+  # to <code>Warning.warn</code>.  The category given must be one of the
   # following categories:
   #
   # :deprecated :: Used for warning for deprecated functionality that may
   #                be removed in the future.
   # :experimental :: Used for experimental features that may change in
   #                  future releases.
+  # :performance  :: Used for warning about APIs or pattern that have
+  #                  negative performance impact
   def warn(*msgs, uplevel: nil, category: nil)
-    Primitive.rb_warn_m(msgs, uplevel, category)
+    if Primitive.cexpr!("NIL_P(category)")
+      Primitive.rb_warn_m(msgs, uplevel, nil)
+    elsif Warning[category = Primitive.cexpr!("rb_to_symbol_type(category)")]
+      Primitive.rb_warn_m(msgs, uplevel, category)
+    end
   end
 end
diff --git a/wasm/README.md b/wasm/README.md
index 0f9ca1a3d587b5..c23a9b8a916460 100644
--- a/wasm/README.md
+++ b/wasm/README.md
@@ -13,50 +13,58 @@
 ### Steps
 
 1. Download a prebuilt WASI SDK package from [WASI SDK release page](https://github.com/WebAssembly/wasi-sdk/releases).
+
 2. Set `WASI_SDK_PATH` environment variable to the root directory of the WASI SDK package.
-```console
-$ export WASI_SDK_PATH=/path/to/wasi-sdk-X.Y
-```
+
+    ```console
+    $ export WASI_SDK_PATH=/path/to/wasi-sdk-X.Y
+    ```
+
 3. Download a prebuilt binaryen from [Binaryen release page](https://github.com/WebAssembly/binaryen/releases)
+
 4. Set PATH environment variable to lookup binaryen tools
-```console
-$ export PATH=path/to/binaryen:$PATH
-```
-5. Download the latest `config.guess` with WASI support, and run `./autogen.sh` to generate configure when you
-   are building from the source checked out from Git repository
-```console
-$ ruby tool/downloader.rb -d tool -e gnu config.guess config.sub
-$ ./autogen.sh
-```
+
+    ```console
+    $ export PATH=path/to/binaryen:$PATH
+    ```
+
+5. Download the latest `config.guess` with WASI support, and run `./autogen.sh` to generate configure when you are building from the source checked out from Git repository
+
+    ```console
+    $ ruby tool/downloader.rb -d tool -e gnu config.guess config.sub
+    $ ./autogen.sh
+    ```
 
 6. Configure
-  - You can select which extensions you want to build.
-  - If you got `Out of bounds memory access` while running the produced ruby, you may need to increase the maximum size of stack.
-```console
-$ ./configure LDFLAGS="-Xlinker -zstack-size=16777216" \
-  --host wasm32-unknown-wasi \
-  --with-destdir=./ruby-wasm32-wasi \
-  --with-static-linked-ext \
-  --with-ext=ripper,monitor
-```
+    - You can select which extensions you want to build.
+    - If you got `Out of bounds memory access` while running the produced ruby, you may need to increase the maximum size of stack.
+
+        ```console
+        $ ./configure LDFLAGS="-Xlinker -zstack-size=16777216" \
+          --host wasm32-unknown-wasi \
+          --with-destdir=./ruby-wasm32-wasi \
+          --with-static-linked-ext \
+          --with-ext=ripper,monitor
+        ```
 
 7. Make
-```console
-$ make install
-```
+
+    ```console
+    $ make install
+    ```
 
 Now you have a WASI compatible ruby binary. You can run it by any WebAssembly runtime like [`wasmtime`](https://github.com/bytecodealliance/wasmtime), [`wasmer`](https://github.com/wasmerio/wasmer), [Node.js](https://nodejs.org/api/wasi.html), or browser with [WASI polyfill](https://www.npmjs.com/package/@wasmer/wasi).
 
 Note: it may take a long time (~20 sec) for the first time for JIT compilation
 
-```
+```console
 $ wasmtime ruby-wasm32-wasi/usr/local/bin/ruby --mapdir /::./ruby-wasm32-wasi/ -- -e 'puts RUBY_PLATFORM'
 wasm32-wasi
 ```
 
 Note: you cannot run the built ruby without a WebAssembly runtime, because of the difference of the binary file type.
 
-```
+```console
 $ ruby-wasm32-wasi/usr/local/bin/ruby -e 'puts "a"'
 bash: ruby-wasm32-wasi/usr/local/bin/ruby: cannot execute binary file: Exec format error
 
diff --git a/wasm/missing.c b/wasm/missing.c
index 5bbf988642534a..b9ecf520fd66ce 100644
--- a/wasm/missing.c
+++ b/wasm/missing.c
@@ -119,13 +119,6 @@ umask(rb_mode_t mask)
     return 0;
 }
 
-WASM_MISSING_LIBC_FUNC
-int
-mprotect(const void *addr, size_t len, int prot)
-{
-    return 0;
-}
-
 WASM_MISSING_LIBC_FUNC
 int
 pclose(FILE *stream)
diff --git a/wasm/runtime.c b/wasm/runtime.c
index b5b0a1a9660f46..89b06be6ade5b0 100644
--- a/wasm/runtime.c
+++ b/wasm/runtime.c
@@ -19,6 +19,13 @@ int rb_wasm_rt_start(int (main)(int argc, char **argv), int argc, char **argv) {
       result = main(argc, argv);
     }
 
+    extern void *rb_asyncify_unwind_buf;
+    // Exit Asyncify loop if there is no unwound buffer, which
+    // means that main function has returned normally.
+    if (rb_asyncify_unwind_buf == NULL) {
+      break;
+    }
+
     // NOTE: it's important to call 'asyncify_stop_unwind' here instead in rb_wasm_handle_jmp_unwind
     // because unless that, Asyncify inserts another unwind check here and it unwinds to the root frame.
     asyncify_stop_unwind();
diff --git a/wasm/setjmp.c b/wasm/setjmp.c
index 198d210bbf9616..32ede68c09997c 100644
--- a/wasm/setjmp.c
+++ b/wasm/setjmp.c
@@ -101,7 +101,6 @@ _rb_wasm_setjmp_internal(rb_wasm_jmp_buf *env)
         asyncify_stop_rewind();
         RB_WASM_DEBUG_LOG("  JMP_BUF_STATE_RETURNING");
         env->state = JMP_BUF_STATE_CAPTURED;
-        free(env->longjmp_buf_ptr);
         _rb_wasm_active_jmpbuf = NULL;
         return env->payload;
     }
@@ -119,7 +118,10 @@ _rb_wasm_longjmp(rb_wasm_jmp_buf* env, int value)
     assert(value != 0);
     env->state = JMP_BUF_STATE_RETURNING;
     env->payload = value;
-    env->longjmp_buf_ptr = malloc(sizeof(struct __rb_wasm_asyncify_jmp_buf));
+    // Asyncify buffer built during unwinding for longjmp will not
+    // be used to rewind, so re-use static-variable.
+    static struct __rb_wasm_asyncify_jmp_buf tmp_longjmp_buf;
+    env->longjmp_buf_ptr = &tmp_longjmp_buf;
     _rb_wasm_active_jmpbuf = env;
     async_buf_init(env->longjmp_buf_ptr);
     asyncify_start_unwind(env->longjmp_buf_ptr);
@@ -141,9 +143,11 @@ rb_wasm_try_catch_init(struct rb_wasm_try_catch *try_catch,
     try_catch->try_f = try_f;
     try_catch->catch_f = catch_f;
     try_catch->context = context;
+    try_catch->stack_pointer = NULL;
 }
 
 // NOTE: This function is not processed by Asyncify due to a call of asyncify_stop_rewind
+__attribute__((noinline))
 void
 rb_wasm_try_catch_loop_run(struct rb_wasm_try_catch *try_catch, rb_wasm_jmp_buf *target)
 {
@@ -152,6 +156,10 @@ rb_wasm_try_catch_loop_run(struct rb_wasm_try_catch *try_catch, rb_wasm_jmp_buf
 
     target->state = JMP_BUF_STATE_CAPTURED;
 
+    if (try_catch->stack_pointer == NULL) {
+        try_catch->stack_pointer = rb_wasm_get_stack_pointer();
+    }
+
     switch ((enum try_catch_phase)try_catch->state) {
     case TRY_CATCH_PHASE_MAIN:
         // may unwind
@@ -173,6 +181,8 @@ rb_wasm_try_catch_loop_run(struct rb_wasm_try_catch *try_catch, rb_wasm_jmp_buf
             // stop unwinding
             // (but call stop_rewind to update the asyncify state to "normal" from "unwind")
             asyncify_stop_rewind();
+            // reset the stack pointer to what it was before the most recent call to try_f or catch_f
+            rb_wasm_set_stack_pointer(try_catch->stack_pointer);
             // clear the active jmpbuf because it's already stopped
             _rb_wasm_active_jmpbuf = NULL;
             // reset jmpbuf state to be able to unwind again
diff --git a/wasm/setjmp.h b/wasm/setjmp.h
index cc14df33be1140..82cfff1d00bb0a 100644
--- a/wasm/setjmp.h
+++ b/wasm/setjmp.h
@@ -5,7 +5,7 @@
 #include <stdbool.h>
 
 #ifndef WASM_SETJMP_STACK_BUFFER_SIZE
-# define WASM_SETJMP_STACK_BUFFER_SIZE 6144
+# define WASM_SETJMP_STACK_BUFFER_SIZE 8192
 #endif
 
 struct __rb_wasm_asyncify_jmp_buf {
@@ -65,6 +65,7 @@ struct rb_wasm_try_catch {
     rb_wasm_try_catch_func_t try_f;
     rb_wasm_try_catch_func_t catch_f;
     void *context;
+    void *stack_pointer;
     int state;
 };
 
diff --git a/weakmap.c b/weakmap.c
index 3c7fd43f9bc45d..2ebf7d204f7195 100644
--- a/weakmap.c
+++ b/weakmap.c
@@ -4,7 +4,6 @@
 #include "internal/proc.h"
 #include "internal/sanitizers.h"
 #include "ruby/st.h"
-#include "ruby/st.h"
 
 /* ===== WeakMap =====
  *
@@ -30,54 +29,98 @@ struct weakmap {
     st_table *table;
 };
 
+struct weakmap_entry {
+    VALUE key;
+    VALUE val;
+};
+
 static bool
 wmap_live_p(VALUE obj)
 {
     return !UNDEF_P(obj);
 }
 
-static void
-wmap_free_entry(VALUE *key, VALUE *val)
-{
-    assert(key + 1 == val);
+struct wmap_foreach_data {
+    int (*func)(struct weakmap_entry *, st_data_t);
+    st_data_t arg;
 
-    /* We only need to free key because val is allocated beside key on in the
-     * same malloc call. */
-    ruby_sized_xfree(key, sizeof(VALUE) * 2);
-}
+    struct weakmap_entry *dead_entry;
+};
 
 static int
-wmap_mark_weak_table_i(st_data_t key, st_data_t val, st_data_t _)
+wmap_foreach_i(st_data_t key, st_data_t val, st_data_t arg)
 {
-    VALUE key_obj = *(VALUE *)key;
-    VALUE val_obj = *(VALUE *)val;
+    struct wmap_foreach_data *data = (struct wmap_foreach_data *)arg;
 
-    if (wmap_live_p(key_obj) && wmap_live_p(val_obj)) {
-        rb_gc_mark_weak((VALUE *)key);
-        rb_gc_mark_weak((VALUE *)val);
+    if (data->dead_entry != NULL) {
+        ruby_sized_xfree(data->dead_entry, sizeof(struct weakmap_entry));
+        data->dead_entry = NULL;
+    }
 
-        return ST_CONTINUE;
+    struct weakmap_entry *entry = (struct weakmap_entry *)key;
+    RUBY_ASSERT(&entry->val == (VALUE *)val);
+
+    if (wmap_live_p(entry->key) && wmap_live_p(entry->val)) {
+        VALUE k = entry->key;
+        VALUE v = entry->val;
+
+        int ret = data->func(entry, data->arg);
+
+        RB_GC_GUARD(k);
+        RB_GC_GUARD(v);
+
+        return ret;
     }
     else {
-        wmap_free_entry((VALUE *)key, (VALUE *)val);
+        /* We cannot free the weakmap_entry here because the ST_DELETE could
+         * hash the key which would read the weakmap_entry and would cause a
+         * use-after-free. Instead, we store this entry and free it on the next
+         * iteration. */
+        data->dead_entry = entry;
 
         return ST_DELETE;
     }
 }
 
+static void
+wmap_foreach(struct weakmap *w, int (*func)(struct weakmap_entry *, st_data_t), st_data_t arg)
+{
+    struct wmap_foreach_data foreach_data = {
+        .func = func,
+        .arg = arg,
+        .dead_entry = NULL,
+    };
+
+    st_foreach(w->table, wmap_foreach_i, (st_data_t)&foreach_data);
+
+    ruby_sized_xfree(foreach_data.dead_entry, sizeof(struct weakmap_entry));
+}
+
+static int
+wmap_mark_weak_table_i(struct weakmap_entry *entry, st_data_t _)
+{
+    rb_gc_mark_weak(&entry->key);
+    rb_gc_mark_weak(&entry->val);
+
+    return ST_CONTINUE;
+}
+
 static void
 wmap_mark(void *ptr)
 {
     struct weakmap *w = ptr;
     if (w->table) {
-        st_foreach(w->table, wmap_mark_weak_table_i, (st_data_t)0);
+        wmap_foreach(w, wmap_mark_weak_table_i, (st_data_t)0);
     }
 }
 
 static int
 wmap_free_table_i(st_data_t key, st_data_t val, st_data_t arg)
 {
-    wmap_free_entry((VALUE *)key, (VALUE *)val);
+    struct weakmap_entry *entry = (struct weakmap_entry *)key;
+    RUBY_ASSERT(&entry->val == (VALUE *)val);
+    ruby_sized_xfree(entry, sizeof(struct weakmap_entry));
+
     return ST_CONTINUE;
 }
 
@@ -88,7 +131,6 @@ wmap_free(void *ptr)
 
     st_foreach(w->table, wmap_free_table_i, 0);
     st_free_table(w->table);
-    xfree(w);
 }
 
 static size_t
@@ -96,7 +138,7 @@ wmap_memsize(const void *ptr)
 {
     const struct weakmap *w = ptr;
 
-    size_t size = sizeof(*w);
+    size_t size = 0;
     size += st_memsize(w->table);
     /* The key and value of the table each take sizeof(VALUE) in size. */
     size += st_table_size(w->table) * (2 * sizeof(VALUE));
@@ -104,35 +146,43 @@ wmap_memsize(const void *ptr)
     return size;
 }
 
+struct wmap_compact_table_data {
+    st_table *table;
+    struct weakmap_entry *dead_entry;
+};
+
 static int
-wmap_compact_table_i(st_data_t key, st_data_t val, st_data_t data)
+wmap_compact_table_i(st_data_t key, st_data_t val, st_data_t d)
 {
-    st_table *table = (st_table *)data;
-
-    VALUE key_obj = *(VALUE *)key;
-    VALUE val_obj = *(VALUE *)val;
-
-    if (wmap_live_p(key_obj) && wmap_live_p(val_obj)) {
-        VALUE new_key_obj = rb_gc_location(key_obj);
+    struct wmap_compact_table_data *data = (struct wmap_compact_table_data *)d;
+    if (data->dead_entry != NULL) {
+        ruby_sized_xfree(data->dead_entry, sizeof(struct weakmap_entry));
+        data->dead_entry = NULL;
+    }
 
-        *(VALUE *)val = rb_gc_location(val_obj);
+    struct weakmap_entry *entry = (struct weakmap_entry *)key;
 
-        /* If the key object moves, then we must reinsert because the hash is
-         * based on the pointer rather than the object itself. */
-        if (key_obj != new_key_obj) {
-            *(VALUE *)key = new_key_obj;
+    entry->val = rb_gc_location(entry->val);
 
-            DURING_GC_COULD_MALLOC_REGION_START();
-            {
-                st_insert(table, key, val);
-            }
-            DURING_GC_COULD_MALLOC_REGION_END();
+    VALUE new_key = rb_gc_location(entry->key);
 
-            return ST_DELETE;
+    /* If the key object moves, then we must reinsert because the hash is
+     * based on the pointer rather than the object itself. */
+    if (entry->key != new_key) {
+        DURING_GC_COULD_MALLOC_REGION_START();
+        {
+            struct weakmap_entry *new_entry = xmalloc(sizeof(struct weakmap_entry));
+            new_entry->key = new_key;
+            new_entry->val = entry->val;
+            st_insert(data->table, (st_data_t)&new_entry->key, (st_data_t)&new_entry->val);
         }
-    }
-    else {
-        wmap_free_entry((VALUE *)key, (VALUE *)val);
+        DURING_GC_COULD_MALLOC_REGION_END();
+
+        /* We cannot free the weakmap_entry here because the ST_DELETE could
+         * hash the key which would read the weakmap_entry and would cause a
+         * use-after-free. Instead, we store this entry and free it on the next
+         * iteration. */
+        data->dead_entry = entry;
 
         return ST_DELETE;
     }
@@ -145,7 +195,16 @@ wmap_compact(void *ptr)
 {
     struct weakmap *w = ptr;
 
-    st_foreach(w->table, wmap_compact_table_i, (st_data_t)w->table);
+    if (w->table) {
+        struct wmap_compact_table_data compact_data = {
+            .table = w->table,
+            .dead_entry = NULL,
+        };
+
+        st_foreach(w->table, wmap_compact_table_i, (st_data_t)&compact_data);
+
+        ruby_sized_xfree(compact_data.dead_entry, sizeof(struct weakmap_entry));
+    }
 }
 
 static const rb_data_type_t weakmap_type = {
@@ -156,13 +215,21 @@ static const rb_data_type_t weakmap_type = {
         wmap_memsize,
         wmap_compact,
     },
-    0, 0, RUBY_TYPED_FREE_IMMEDIATELY | RUBY_TYPED_WB_PROTECTED
+    0, 0, RUBY_TYPED_FREE_IMMEDIATELY | RUBY_TYPED_WB_PROTECTED | RUBY_TYPED_EMBEDDABLE
 };
 
 static int
 wmap_cmp(st_data_t x, st_data_t y)
 {
-    return *(VALUE *)x != *(VALUE *)y;
+    VALUE x_obj = *(VALUE *)x;
+    VALUE y_obj = *(VALUE *)y;
+
+    if (!wmap_live_p(x_obj) && !wmap_live_p(y_obj)) {
+        return x != y;
+    }
+    else {
+        return x_obj != y_obj;
+    }
 }
 
 static st_index_t
@@ -185,44 +252,6 @@ wmap_allocate(VALUE klass)
     return obj;
 }
 
-struct wmap_foreach_data {
-    struct weakmap *w;
-    void (*func)(VALUE, VALUE, st_data_t);
-    st_data_t arg;
-};
-
-static int
-wmap_foreach_i(st_data_t key, st_data_t val, st_data_t arg)
-{
-    struct wmap_foreach_data *data = (struct wmap_foreach_data *)arg;
-
-    VALUE key_obj = *(VALUE *)key;
-    VALUE val_obj = *(VALUE *)val;
-
-    if (wmap_live_p(key_obj) && wmap_live_p(val_obj)) {
-        data->func(key_obj, val_obj, data->arg);
-    }
-    else {
-        wmap_free_entry((VALUE *)key, (VALUE *)val);
-
-        return ST_DELETE;
-    }
-
-    return ST_CONTINUE;
-}
-
-static void
-wmap_foreach(struct weakmap *w, void (*func)(VALUE, VALUE, st_data_t), st_data_t arg)
-{
-    struct wmap_foreach_data foreach_data = {
-        .w = w,
-        .func = func,
-        .arg = arg,
-    };
-
-    st_foreach(w->table, wmap_foreach_i, (st_data_t)&foreach_data);
-}
-
 static VALUE
 wmap_inspect_append(VALUE str, VALUE obj)
 {
@@ -234,8 +263,8 @@ wmap_inspect_append(VALUE str, VALUE obj)
     }
 }
 
-static void
-wmap_inspect_i(VALUE key, VALUE val, st_data_t data)
+static int
+wmap_inspect_i(struct weakmap_entry *entry, st_data_t data)
 {
     VALUE str = (VALUE)data;
 
@@ -247,9 +276,11 @@ wmap_inspect_i(VALUE key, VALUE val, st_data_t data)
         RSTRING_PTR(str)[0] = '#';
     }
 
-    wmap_inspect_append(str, key);
+    wmap_inspect_append(str, entry->key);
     rb_str_cat2(str, " => ");
-    wmap_inspect_append(str, val);
+    wmap_inspect_append(str, entry->val);
+
+    return ST_CONTINUE;
 }
 
 static VALUE
@@ -269,13 +300,22 @@ wmap_inspect(VALUE self)
     return str;
 }
 
-static void
-wmap_each_i(VALUE key, VALUE val, st_data_t _)
+static int
+wmap_each_i(struct weakmap_entry *entry, st_data_t _)
 {
-    rb_yield_values(2, key, val);
+    rb_yield_values(2, entry->key, entry->val);
+
+    return ST_CONTINUE;
 }
 
-/* Iterates over keys and objects in a weakly referenced object */
+/*
+ * call-seq:
+ *   map.each {|key, val| ... } -> self
+ *
+ * Iterates over keys and values. Note that unlike other collections,
+ * +each+ without block isn't supported.
+ *
+ */
 static VALUE
 wmap_each(VALUE self)
 {
@@ -287,13 +327,22 @@ wmap_each(VALUE self)
     return self;
 }
 
-static void
-wmap_each_key_i(VALUE key, VALUE _val, st_data_t _data)
+static int
+wmap_each_key_i(struct weakmap_entry *entry, st_data_t _data)
 {
-    rb_yield(key);
+    rb_yield(entry->key);
+
+    return ST_CONTINUE;
 }
 
-/* Iterates over keys and objects in a weakly referenced object */
+/*
+ * call-seq:
+ *   map.each_key {|key| ... } -> self
+ *
+ * Iterates over keys. Note that unlike other collections,
+ * +each_key+ without block isn't supported.
+ *
+ */
 static VALUE
 wmap_each_key(VALUE self)
 {
@@ -305,13 +354,22 @@ wmap_each_key(VALUE self)
     return self;
 }
 
-static void
-wmap_each_value_i(VALUE _key, VALUE val, st_data_t _data)
+static int
+wmap_each_value_i(struct weakmap_entry *entry, st_data_t _data)
 {
-    rb_yield(val);
+    rb_yield(entry->val);
+
+    return ST_CONTINUE;
 }
 
-/* Iterates over keys and objects in a weakly referenced object */
+/*
+ * call-seq:
+ *   map.each_value {|val| ... } -> self
+ *
+ * Iterates over values. Note that unlike other collections,
+ * +each_value+ without block isn't supported.
+ *
+ */
 static VALUE
 wmap_each_value(VALUE self)
 {
@@ -323,15 +381,23 @@ wmap_each_value(VALUE self)
     return self;
 }
 
-static void
-wmap_keys_i(st_data_t key, st_data_t _, st_data_t arg)
+static int
+wmap_keys_i(struct weakmap_entry *entry, st_data_t arg)
 {
     VALUE ary = (VALUE)arg;
 
-    rb_ary_push(ary, key);
+    rb_ary_push(ary, entry->key);
+
+    return ST_CONTINUE;
 }
 
-/* Iterates over keys and objects in a weakly referenced object */
+/*
+ * call-seq:
+ *   map.keys -> new_array
+ *
+ * Returns a new Array containing all keys in the map.
+ *
+ */
 static VALUE
 wmap_keys(VALUE self)
 {
@@ -344,15 +410,23 @@ wmap_keys(VALUE self)
     return ary;
 }
 
-static void
-wmap_values_i(st_data_t key, st_data_t val, st_data_t arg)
+static int
+wmap_values_i(struct weakmap_entry *entry, st_data_t arg)
 {
     VALUE ary = (VALUE)arg;
 
-    rb_ary_push(ary, (VALUE)val);
+    rb_ary_push(ary, entry->val);
+
+    return ST_CONTINUE;
 }
 
-/* Iterates over values and objects in a weakly referenced object */
+/*
+ * call-seq:
+ *   map.values -> new_array
+ *
+ * Returns a new Array containing all values in the map.
+ *
+ */
 static VALUE
 wmap_values(VALUE self)
 {
@@ -365,18 +439,6 @@ wmap_values(VALUE self)
     return ary;
 }
 
-static VALUE
-nonspecial_obj_id(VALUE obj)
-{
-#if SIZEOF_LONG == SIZEOF_VOIDP
-    return (VALUE)((SIGNED_VALUE)(obj)|FIXNUM_FLAG);
-#elif SIZEOF_LONG_LONG == SIZEOF_VOIDP
-    return LL2NUM((SIGNED_VALUE)(obj) / 2);
-#else
-# error not supported
-#endif
-}
-
 static int
 wmap_aset_replace(st_data_t *key, st_data_t *val, st_data_t new_key_ptr, int existing)
 {
@@ -384,13 +446,13 @@ wmap_aset_replace(st_data_t *key, st_data_t *val, st_data_t new_key_ptr, int exi
     VALUE new_val = *(((VALUE *)new_key_ptr) + 1);
 
     if (existing) {
-        assert(*(VALUE *)*key == new_key);
+        RUBY_ASSERT(*(VALUE *)*key == new_key);
     }
     else {
-        VALUE *pair = xmalloc(sizeof(VALUE) * 2);
+        struct weakmap_entry *entry = xmalloc(sizeof(struct weakmap_entry));
 
-        *key = (st_data_t)pair;
-        *val = (st_data_t)(pair + 1);
+        *key = (st_data_t)&entry->key;
+        *val = (st_data_t)&entry->val;
     }
 
     *(VALUE *)*key = new_key;
@@ -399,7 +461,15 @@ wmap_aset_replace(st_data_t *key, st_data_t *val, st_data_t new_key_ptr, int exi
     return ST_CONTINUE;
 }
 
-/* Creates a weak reference from the given key to the given value */
+/*
+ *  call-seq:
+ *    map[key] = value -> value
+ *
+ *  Associates the given +value+ with the given +key+.
+ *
+ *  If the given +key+ exists, replaces its value with the given +value+;
+ *  the ordering is not affected.
+ */
 static VALUE
 wmap_aset(VALUE self, VALUE key, VALUE val)
 {
@@ -413,14 +483,14 @@ wmap_aset(VALUE self, VALUE key, VALUE val)
     RB_OBJ_WRITTEN(self, Qundef, key);
     RB_OBJ_WRITTEN(self, Qundef, val);
 
-    return nonspecial_obj_id(val);
+    return Qnil;
 }
 
 /* Retrieves a weakly referenced object with the given key */
 static VALUE
 wmap_lookup(VALUE self, VALUE key)
 {
-    assert(wmap_live_p(key));
+    RUBY_ASSERT(wmap_live_p(key));
 
     struct weakmap *w;
     TypedData_Get_Struct(self, struct weakmap, &weakmap_type, w);
@@ -433,7 +503,14 @@ wmap_lookup(VALUE self, VALUE key)
     return *(VALUE *)data;
 }
 
-/* Retrieves a weakly referenced object with the given key */
+/*
+ *  call-seq:
+ *    map[key] -> value
+ *
+ *  Returns the value associated with the given +key+ if found.
+ *
+ *  If +key+ is not found, returns +nil+.
+ */
 static VALUE
 wmap_aref(VALUE self, VALUE key)
 {
@@ -441,7 +518,34 @@ wmap_aref(VALUE self, VALUE key)
     return !UNDEF_P(obj) ? obj : Qnil;
 }
 
-/* Delete the given key from the map */
+/*
+ *  call-seq:
+ *    map.delete(key) -> value or nil
+ *    map.delete(key) {|key| ... } -> object
+ *
+ *  Deletes the entry for the given +key+ and returns its associated value.
+ *
+ *  If no block is given and +key+ is found, deletes the entry and returns the associated value:
+ *    m = ObjectSpace::WeakMap.new
+ *    key = "foo"
+ *    m[key] = 1
+ *    m.delete(key) # => 1
+ *    m[key] # => nil
+ *
+ *  If no block is given and +key+ is not found, returns +nil+.
+ *
+ *  If a block is given and +key+ is found, ignores the block,
+ *  deletes the entry, and returns the associated value:
+ *    m = ObjectSpace::WeakMap.new
+ *    key = "foo"
+ *    m[key] = 2
+ *    m.delete(key) { |key| raise 'Will never happen'} # => 2
+ *
+ *  If a block is given and +key+ is not found,
+ *  yields the +key+ to the block and returns the block's return value:
+ *    m = ObjectSpace::WeakMap.new
+ *    m.delete("nosuch") { |key| "Key #{key} not found" } # => "Key nosuch not found"
+ */
 static VALUE
 wmap_delete(VALUE self, VALUE key)
 {
@@ -457,7 +561,8 @@ wmap_delete(VALUE self, VALUE key)
         rb_gc_remove_weak(self, (VALUE *)orig_key_data);
         rb_gc_remove_weak(self, (VALUE *)orig_val_data);
 
-        wmap_free_entry((VALUE *)orig_key_data, (VALUE *)orig_val_data);
+        struct weakmap_entry *entry = (struct weakmap_entry *)orig_key_data;
+        ruby_sized_xfree(entry, sizeof(struct weakmap_entry));
 
         if (wmap_live_p(orig_val)) {
             return orig_val;
@@ -472,14 +577,24 @@ wmap_delete(VALUE self, VALUE key)
     }
 }
 
-/* Returns +true+ if +key+ is registered */
+/*
+ *  call-seq:
+ *    map.key?(key) -> true or false
+ *
+ *  Returns +true+ if +key+ is a key in +self+, otherwise +false+.
+ */
 static VALUE
 wmap_has_key(VALUE self, VALUE key)
 {
     return RBOOL(!UNDEF_P(wmap_lookup(self, key)));
 }
 
-/* Returns the number of referenced objects */
+/*
+ * call-seq:
+ *   map.size -> number
+ *
+ * Returns the number of referenced objects
+ */
 static VALUE
 wmap_size(VALUE self)
 {
@@ -501,7 +616,7 @@ wmap_size(VALUE self)
  * the key and the object as the value. This means that the key is of the type
  * `VALUE *` while the value is of the type `VALUE`.
  *
- * The object is not not directly stored as keys in the table because
+ * The object is not directly stored as keys in the table because
  * `rb_gc_mark_weak` requires a pointer to the memory location to overwrite
  * when the object is reclaimed. Using a pointer into the ST table entry is not
  * safe because the pointer can change when the ST table is resized.
@@ -518,18 +633,22 @@ struct weakkeymap {
 };
 
 static int
-wkmap_mark_table_i(st_data_t key, st_data_t val_obj, st_data_t _)
+wkmap_mark_table_i(st_data_t key, st_data_t val_obj, st_data_t data)
 {
-    VALUE key_obj = *(VALUE *)key;
+    VALUE **dead_entry = (VALUE **)data;
+    ruby_sized_xfree(*dead_entry, sizeof(VALUE));
+    *dead_entry = NULL;
+
+    VALUE *key_ptr = (VALUE *)key;
 
-    if (wmap_live_p(key_obj)) {
-        rb_gc_mark_weak((VALUE *)key);
+    if (wmap_live_p(*key_ptr)) {
+        rb_gc_mark_weak(key_ptr);
         rb_gc_mark_movable((VALUE)val_obj);
 
         return ST_CONTINUE;
     }
     else {
-        ruby_sized_xfree((VALUE *)key, sizeof(VALUE));
+        *dead_entry = key_ptr;
 
         return ST_DELETE;
     }
@@ -540,7 +659,11 @@ wkmap_mark(void *ptr)
 {
     struct weakkeymap *w = ptr;
     if (w->table) {
-        st_foreach(w->table, wkmap_mark_table_i, (st_data_t)0);
+        VALUE *dead_entry = NULL;
+        st_foreach(w->table, wkmap_mark_table_i, (st_data_t)&dead_entry);
+        if (dead_entry != NULL) {
+            ruby_sized_xfree(dead_entry, sizeof(VALUE));
+        }
     }
 }
 
@@ -558,7 +681,6 @@ wkmap_free(void *ptr)
 
     st_foreach(w->table, wkmap_free_table_i, 0);
     st_free_table(w->table);
-    xfree(w);
 }
 
 static size_t
@@ -566,7 +688,7 @@ wkmap_memsize(const void *ptr)
 {
     const struct weakkeymap *w = ptr;
 
-    size_t size = sizeof(*w);
+    size_t size = 0;
     size += st_memsize(w->table);
     /* Each key of the table takes sizeof(VALUE) in size. */
     size += st_table_size(w->table) * sizeof(VALUE);
@@ -575,28 +697,32 @@ wkmap_memsize(const void *ptr)
 }
 
 static int
-wkmap_compact_table_i(st_data_t key, st_data_t val_obj, st_data_t _data, int _error)
+wkmap_compact_table_i(st_data_t key, st_data_t val_obj, st_data_t data, int _error)
 {
-    VALUE key_obj = *(VALUE *)key;
+    VALUE **dead_entry = (VALUE **)data;
+    ruby_sized_xfree(*dead_entry, sizeof(VALUE));
+    *dead_entry = NULL;
 
-    if (wmap_live_p(key_obj)) {
-        if (key_obj != rb_gc_location(key_obj) || val_obj != rb_gc_location(val_obj)) {
+    VALUE *key_ptr = (VALUE *)key;
+
+    if (wmap_live_p(*key_ptr)) {
+        if (*key_ptr != rb_gc_location(*key_ptr) || val_obj != rb_gc_location(val_obj)) {
             return ST_REPLACE;
         }
+
+        return ST_CONTINUE;
     }
     else {
-        ruby_sized_xfree((VALUE *)key, sizeof(VALUE));
+        *dead_entry = key_ptr;
 
         return ST_DELETE;
     }
-
-    return ST_CONTINUE;
 }
 
 static int
 wkmap_compact_table_replace(st_data_t *key_ptr, st_data_t *val_ptr, st_data_t _data, int existing)
 {
-    assert(existing);
+    RUBY_ASSERT(existing);
 
     *(VALUE *)*key_ptr = rb_gc_location(*(VALUE *)*key_ptr);
     *val_ptr = (st_data_t)rb_gc_location((VALUE)*val_ptr);
@@ -609,7 +735,13 @@ wkmap_compact(void *ptr)
 {
     struct weakkeymap *w = ptr;
 
-    st_foreach_with_replace(w->table, wkmap_compact_table_i, wkmap_compact_table_replace, (st_data_t)0);
+    if (w->table) {
+        VALUE *dead_entry = NULL;
+        st_foreach_with_replace(w->table, wkmap_compact_table_i, wkmap_compact_table_replace, (st_data_t)&dead_entry);
+        if (dead_entry != NULL) {
+            ruby_sized_xfree(dead_entry, sizeof(VALUE));
+        }
+    }
 }
 
 static const rb_data_type_t weakkeymap_type = {
@@ -620,7 +752,7 @@ static const rb_data_type_t weakkeymap_type = {
         wkmap_memsize,
         wkmap_compact,
     },
-    0, 0, RUBY_TYPED_FREE_IMMEDIATELY | RUBY_TYPED_WB_PROTECTED
+    0, 0, RUBY_TYPED_FREE_IMMEDIATELY | RUBY_TYPED_WB_PROTECTED | RUBY_TYPED_EMBEDDABLE
 };
 
 static int
@@ -642,7 +774,7 @@ static st_index_t
 wkmap_hash(st_data_t n)
 {
     VALUE obj = *(VALUE *)n;
-    assert(wmap_live_p(obj));
+    RUBY_ASSERT(wmap_live_p(obj));
 
     return rb_any_hash(obj);
 }
@@ -685,7 +817,7 @@ static VALUE
 wkmap_aref(VALUE self, VALUE key)
 {
     VALUE obj = wkmap_lookup(self, key);
-    return obj != Qundef ? obj : Qnil;
+    return !UNDEF_P(obj) ? obj : Qnil;
 }
 
 struct wkmap_aset_args {
@@ -712,7 +844,7 @@ wkmap_aset_replace(st_data_t *key, st_data_t *val, st_data_t data_args, int exis
  *  call-seq:
  *    map[key] = value -> value
  *
- *  Associates the given +value+ with the given +key+; returns +value+.
+ *  Associates the given +value+ with the given +key+
  *
  *  The reference to +key+ is weak, so when there is no other reference
  *  to +key+ it may be garbage collected.
@@ -727,7 +859,7 @@ wkmap_aset(VALUE self, VALUE key, VALUE val)
     TypedData_Get_Struct(self, struct weakkeymap, &weakkeymap_type, w);
 
     if (!FL_ABLE(key) || SYMBOL_P(key) || RB_BIGNUM_TYPE_P(key) || RB_TYPE_P(key, T_FLOAT)) {
-        rb_raise(rb_eArgError, "WeakKeyMap must be garbage collectable");
+        rb_raise(rb_eArgError, "WeakKeyMap keys must be garbage collectable");
         UNREACHABLE_RETURN(Qnil);
     }
 
@@ -753,7 +885,8 @@ wkmap_aset(VALUE self, VALUE key, VALUE val)
  *
  *  If no block is given and +key+ is found, deletes the entry and returns the associated value:
  *    m = ObjectSpace::WeakKeyMap.new
- *    m["foo"] = 1
+ *    key = "foo" # to hold reference to the key
+ *    m[key] = 1
  *    m.delete("foo") # => 1
  *    m["foo"] # => nil
  *
@@ -762,13 +895,14 @@ wkmap_aset(VALUE self, VALUE key, VALUE val)
  *  If a block is given and +key+ is found, ignores the block,
  *  deletes the entry, and returns the associated value:
  *    m = ObjectSpace::WeakKeyMap.new
- *    m["foo"] = 2
- *    h.delete("foo") { |key| raise 'Will never happen'} # => 2
+ *    key = "foo" # to hold reference to the key
+ *    m[key] = 2
+ *    m.delete("foo") { |key| raise 'Will never happen'} # => 2
  *
  *  If a block is given and +key+ is not found,
- *  calls the block and returns the block's return value:
+ *  yields the +key+ to the block and returns the block's return value:
  *    m = ObjectSpace::WeakKeyMap.new
- *    h.delete("nosuch") { |key| "Key #{key} not found" } # => "Key nosuch not found"
+ *    m.delete("nosuch") { |key| "Key #{key} not found" } # => "Key nosuch not found"
  */
 
 static VALUE
@@ -803,6 +937,19 @@ wkmap_delete(VALUE self, VALUE key)
  *    map.getkey(key) -> existing_key or nil
  *
  *  Returns the existing equal key if it exists, otherwise returns +nil+.
+ *
+ *  This might be useful for implementing caches, so that only one copy of
+ *  some object would be used everywhere in the program:
+ *
+ *    value = {amount: 1, currency: 'USD'}
+ *
+ *    # Now if we put this object in a cache:
+ *    cache = ObjectSpace::WeakKeyMap.new
+ *    cache[value] = true
+ *
+ *    # ...we can always extract from there and use the same object:
+ *    copy = cache.getkey({amount: 1, currency: 'USD'})
+ *    copy.object_id == value.object_id #=> true
  */
 static VALUE
 wkmap_getkey(VALUE self, VALUE key)
@@ -818,14 +965,25 @@ wkmap_getkey(VALUE self, VALUE key)
 
 /*
  *  call-seq:
- *    hash.key?(key) -> true or false
+ *    map.key?(key) -> true or false
  *
  *  Returns +true+ if +key+ is a key in +self+, otherwise +false+.
  */
 static VALUE
 wkmap_has_key(VALUE self, VALUE key)
 {
-    return RBOOL(wkmap_lookup(self, key) != Qundef);
+    return RBOOL(!UNDEF_P(wkmap_lookup(self, key)));
+}
+
+static int
+wkmap_clear_i(st_data_t key, st_data_t val, st_data_t data)
+{
+    VALUE self = (VALUE)data;
+
+    /* This WeakKeyMap may have already been marked, so we need to remove the
+     * keys to prevent a use-after-free. */
+    rb_gc_remove_weak(self, (VALUE *)key);
+    return wkmap_free_table_i(key, val, 0);
 }
 
 /*
@@ -840,7 +998,7 @@ wkmap_clear(VALUE self)
     struct weakkeymap *w;
     TypedData_Get_Struct(self, struct weakkeymap, &weakkeymap_type, w);
 
-    st_foreach(w->table, wkmap_free_table_i, 0);
+    st_foreach(w->table, wkmap_clear_i, (st_data_t)self);
     st_clear(w->table);
 
     return self;
@@ -878,20 +1036,101 @@ wkmap_inspect(VALUE self)
 /*
  *  Document-class: ObjectSpace::WeakMap
  *
- *  An ObjectSpace::WeakMap object holds references to
- *  any objects, but those objects can get garbage collected.
+ *  An ObjectSpace::WeakMap is a key-value map that holds weak references
+ *  to its keys and values, so they can be garbage-collected when there are
+ *  no more references left.
+ *
+ *  Keys in the map are compared by identity.
+ *
+ *     m = ObjectSpace::WeakMap.new
+ *     key1 = "foo"
+ *     val1 = Object.new
+ *     m[key1] = val1
+ *
+ *     key2 = "bar"
+ *     val2 = Object.new
+ *     m[key2] = val2
+ *
+ *     m[key1] #=> #<Object:0x0...>
+ *     m[key2] #=> #<Object:0x0...>
+ *
+ *     val1 = nil # remove the other reference to value
+ *     GC.start
+ *
+ *     m[key1] #=> nil
+ *     m.keys #=> ["bar"]
+ *
+ *     key2 = nil # remove the other reference to key
+ *     GC.start
  *
- *  This class is mostly used internally by WeakRef, please use
- *  +lib/weakref.rb+ for the public interface.
+ *     m[key2] #=> nil
+ *     m.keys #=> []
+ *
+ *  (Note that GC.start is used here only for demonstrational purposes and might
+ *  not always lead to demonstrated results.)
+ *
+ *
+ *  See also ObjectSpace::WeakKeyMap map class, which compares keys by value,
+ *  and holds weak references only to the keys.
  */
 
 /*
  *  Document-class: ObjectSpace::WeakKeyMap
  *
- *  An ObjectSpace::WeakKeyMap object holds references to
- *  any objects, but objects uses as keys can be garbage collected.
+ *  An ObjectSpace::WeakKeyMap is a key-value map that holds weak references
+ *  to its keys, so they can be garbage collected when there is no more references.
+ *
+ *  Unlike ObjectSpace::WeakMap:
+ *
+ *  * references to values are _strong_, so they aren't garbage collected while
+ *    they are in the map;
+ *  * keys are compared by value (using Object#eql?), not by identity;
+ *  * only garbage-collectable objects can be used as keys.
+ *
+ *       map = ObjectSpace::WeakKeyMap.new
+ *       val = Time.new(2023, 12, 7)
+ *       key = "name"
+ *       map[key] = val
+ *
+ *       # Value is fetched by equality: the instance of string "name" is
+ *       # different here, but it is equal to the key
+ *       map["name"] #=> 2023-12-07 00:00:00 +0200
+ *
+ *       val = nil
+ *       GC.start
+ *       # There are no more references to `val`, yet the pair isn't
+ *       # garbage-collected.
+ *       map["name"] #=> 2023-12-07 00:00:00 +0200
+ *
+ *       key = nil
+ *       GC.start
+ *       # There are no more references to `key`, key and value are
+ *       # garbage-collected.
+ *       map["name"] #=> nil
+ *
+ *  (Note that GC.start is used here only for demonstrational purposes and might
+ *  not always lead to demonstrated results.)
+ *
+ *  The collection is especially useful for implementing caches of lightweight value
+ *  objects, so that only one copy of each value representation would be stored in
+ *  memory, but the copies that aren't used would be garbage-collected.
+ *
+ *    CACHE = ObjectSpace::WeakKeyMap
+ *
+ *    def make_value(**)
+ *       val = ValueObject.new(**)
+ *       if (existing = @cache.getkey(val))
+ *          # if the object with this value exists, we return it
+ *          existing
+ *       else
+ *          # otherwise, put it in the cache
+ *          @cache[val] = true
+ *          val
+ *       end
+ *    end
  *
- *  Objects used as values can't be garbage collected until the key is.
+ *  This will result in +make_value+ returning the same object for same set of attributes
+ *  always, but the values that aren't needed anymore wouldn't be sitting in the cache forever.
  */
 
 void
diff --git a/win32/Makefile.sub b/win32/Makefile.sub
index feb7bfd2b514e3..7c125a4a02ecc6 100644
--- a/win32/Makefile.sub
+++ b/win32/Makefile.sub
@@ -11,13 +11,18 @@ PATH_SEPARATOR = ;
 TZ =				# skip timezone tests
 PWD = $(MAKEDIR)
 empty =
+tooldir = $(srcdir)/tool
 
 !ifndef MFLAGS
 MFLAGS=-l
 !endif
 
 !if "$(BASERUBY)" == ""
-! if [for %I in (ruby.exe) do @echo BASERUBY = %~s$$PATH:I > baseruby.mk]
+# After `nmake`, just built `ruby.exe` exists in the build directory,
+# and is searched first prior to $PATH.  Assume that no ruby
+# executable in $(tooldir).
+! if [cd $(tooldir) && ruby missing-baseruby.bat 2> nul]
+! else if [(cd $(tooldir) && for %I in (ruby.exe) do @echo BASERUBY = %~s$$PATH:I) > baseruby.mk]
 ! else
 !   include baseruby.mk
 ! endif
@@ -27,7 +32,7 @@ MFLAGS=-l
 BASERUBY =
 !endif
 !if "$(BASERUBY)" == ""
-BASERUBY = echo executable host ruby is required.  use --with-baseruby option.^& exit 1
+BASERUBY = $(tooldir:/=\)\missing-baseruby.bat
 HAVE_BASERUBY = no
 !else
 HAVE_BASERUBY = yes
@@ -100,8 +105,8 @@ CC = cl -nologo
 !if !defined(CPP) || "$(CPP)" == "cl"
 CPP = $(CC) -E
 !endif
-!if !defined(YACC)
-YACC = $(BASERUBY) $(top_srcdir)/tool/lrama/exe/lrama
+!if !defined(LRAMA)
+LRAMA = $(BASERUBY) $(top_srcdir)/tool/lrama/exe/lrama
 !endif
 AR = lib -nologo
 PURIFY =
@@ -151,6 +156,9 @@ DEBUGFLAGS = -Zi
 !if "$(RUBY_DEVEL)" == "yes"
 XCFLAGS = $(XCFLAGS) -DRUBY_DEVEL=1
 !endif
+!if "$(modular_gc_dir)" != ""
+XCFLAGS = $(XCFLAGS) -Dmodular_gc_dir="$(modular_gc_dir)"
+!endif
 !if !defined(OPTFLAGS)
 !if $(MSC_VER) < 1400
 OPTFLAGS = -O2b2xg-
@@ -158,6 +166,12 @@ OPTFLAGS = -O2b2xg-
 OPTFLAGS = -O2sy-
 !endif
 !endif
+!if $(MSC_VER) >= 1900
+OPTFLAGS = $(OPTFLAGS) -Zc:inline
+!endif
+!if !defined(incflags)
+incflags =
+!endif
 !if !defined(PLATFORM)
 PLATFORM = mswin32
 !endif
@@ -165,7 +179,7 @@ PLATFORM = mswin32
 !error RT not defined.  Retry from configure pass.
 !endif
 !ifndef NTVER
-NTVER = 0x0600
+NTVER = _WIN32_WINNT_WIN8
 !endif
 !ifdef NTVER
 ARCHDEFS = -D_WIN32_WINNT=$(NTVER) $(ARCHDEFS)
@@ -182,9 +196,6 @@ ruby_version = $(MAJOR).$(MINOR).0
 !if defined(ABI_VERSION)
 ruby_version = $(ruby_version)+$(ABI_VERSION)
 !endif
-!if !defined(RUBY_VERSION_NAME)
-RUBY_VERSION_NAME = $(RUBY_BASE_NAME)-$(ruby_version)
-!endif
 RUBY_PROGRAM_VERSION = $(MAJOR).$(MINOR).$(TEENY)
 
 !ifndef RUBY_SO_NAME
@@ -271,10 +282,14 @@ COMPILERFLAG  = -Zm600
 !if $(MSC_VER) >= 1400
 WARNFLAGS = -W2 -wd4100 -wd4127 -wd4210 -wd4214 -wd4255 -wd4574 \
 	    -wd4668 -wd4710 -wd4711 -wd4820 -wd4996 \
-	    -we4028 -we4142 -we4047
+	    -we4028 -we4142 -we4047 -we4013
 !else
 WARNFLAGS = -W2
 !endif
+!if $(MSC_VER) >= 1944
+# https://developercommunity.visualstudio.com/t/warning-C5287:-operands-are-different-e/10877942
+WARNFLAGS = $(WARNFLAGS) -wd5287
+!endif
 !endif
 WERRORFLAG = -WX
 !if !defined(CFLAGS_NO_ARCH)
@@ -292,9 +307,7 @@ CXXFLAGS = $(CFLAGS)
 !if !defined(LDFLAGS)
 LDFLAGS = -incremental:no -debug -opt:ref -opt:icf
 !endif
-!if !defined(XLDFLAGS)
-XLDFLAGS = -stack:$(STACK)
-!endif
+XLDFLAGS = -stack:$(STACK) $(XLDFLAGS)
 !if !defined(RFLAGS)
 RFLAGS = -r
 !endif
@@ -329,17 +342,21 @@ COROUTINE_SRC = $(COROUTINE_OBJ:.obj=.asm)
 !elseif "$(ARCH)" == "i386"
 COROUTINE_OBJ = coroutine/win32/Context.obj
 COROUTINE_SRC = $(COROUTINE_OBJ:.obj=.asm)
+!elseif "$(ARCH)" == "arm64"
+COROUTINE_OBJ = coroutine/arm64/Context.obj
+COROUTINE_SRC = $(COROUTINE_OBJ:.obj=.asm)
 !else
-COROUTINE_OBJ = coroutine/copy/Context.obj
-COROUTINE_SRC = $(COROUTINE_OBJ:.obj=.c)
+!error copy coroutine has been replaced with pthread implementation at 42130a64f02294dc8025af3a51bda518c67ab33d
 !endif
 COROUTINE_H = $(COROUTINE_OBJ:.obj=.h)
 
 ARFLAGS = -machine:$(MACHINE) -out:
 LD = $(CC)
 LDSHARED = $(LD) -LD
-XCFLAGS = -DRUBY_EXPORT $(INCFLAGS) $(XCFLAGS)
-!if $(MSC_VER) >= 1400
+XCFLAGS = -DRUBY_EXPORT $(INCFLAGS) $(XCFLAGS) $(XINCFLAGS)
+!if $(MSC_VER) >= 1800
+LDFLAGS = $(LDFLAGS) -manifest:embed,ID=2
+!elseif $(MSC_VER) >= 1400
 # Prevents VC++ 2005 (cl ver 14) warnings
 MANIFESTTOOL = mt -nologo
 LDSHARED_0 = @if exist $(@).manifest $(MINIRUBY) -run -e wait_writable -- -n 10 $@
@@ -350,9 +367,6 @@ CPPFLAGS = $(DEFS) $(ARCHDEFS) $(CPPFLAGS)
 !if "$(USE_RUBYGEMS)" == "no"
 CPPFLAGS = -DDISABLE_RUBYGEMS $(CPPFLAGS)
 !endif
-!ifndef RJIT_SUPPORT
-RJIT_SUPPORT = no
-!endif
 
 POSTLINK =
 DLDFLAGS = $(LDFLAGS) -dll
@@ -433,10 +447,14 @@ THREAD_IMPL_SRC = thread_$(THREAD_MODEL).c
 
 !if "$(CROSS_COMPILING)" == "yes"
 PREP          = $(arch)-fake.rb
+BUILTIN_BINARY = no
 !else
 PREP          = miniruby$(EXEEXT)
+BUILTIN_BINARY = yes
 !endif
 
+BUILTIN_GC = default
+
 !if !defined(EXTSTATIC)
 EXTSTATIC     =
 !endif
@@ -479,10 +497,10 @@ ENCOBJS = dmyenc.$(OBJEXT)
 EXTOBJS = dmyext.$(OBJEXT)
 !endif
 
-arch_hdrdir = $(EXTOUT)/include/$(arch)
+ext_hdrdir = $(EXTOUT)/include
+arch_hdrdir = $(ext_hdrdir)/$(arch)
 top_srcdir = $(srcdir)
 hdrdir = $(srcdir)/include
-tooldir = $(srcdir)/tool
 VPATH = $(arch_hdrdir)/ruby;$(hdrdir)/ruby;$(srcdir);$(srcdir)/missing;$(win_srcdir)
 
 !ifndef GIT
@@ -514,8 +532,6 @@ VCSUP = rem
 !endif
 ruby_pc = $(RUBY_BASE_NAME)-$(MAJOR).$(MINOR).pc
 
-YARP_BUILD_DIR = $(MAKEDIR)/yarp
-
 MESSAGE_BEGIN = @(for %I in (
 MESSAGE_END = ) do @echo.%~I)
 ECHO_BEGIN = @echo.
@@ -539,11 +555,6 @@ MINIPRELUDE_C = $(srcdir)/miniprelude.c
 !else
 MINIPRELUDE_C = miniprelude.c
 !endif
-!if !exist(golf_prelude.c) && exist($(srcdir)/golf_prelude.c)
-GOLF_PRELUDE_C = $(srcdir)/golf_prelude.c
-!else
-GOLF_PRELUDE_C = golf_prelude.c
-!endif
 RBCONFIG      = ./.rbconfig.time
 
 !if "$(GITHUB_ACTIONS)" == "true"
@@ -589,6 +600,22 @@ $(SCRIPTPROGRAMS): $(STUBPROGRAM)
 update-src::
 	@cd "$(srcdir:/=\)" && set LC_TIME=C && $(VCSUP)
 
+!ifndef VCPKG_DEFAULT_TRIPLET
+VCPKG_DEFAULT_TRIPLET = $(MACHINE)-windows
+!endif
+TRIPLET_OPTION = --triplet $(VCPKG_DEFAULT_TRIPLET)
+
+update-vcpkg::
+	@cd "$(srcdir:/=\)" && set LC_TIME=C && vcpkg x-update-baseline $(TRIPLET_OPTION)
+
+install-vcpkg::
+	@cd "$(srcdir:/=\)" && set LC_TIME=C && vcpkg install $(TRIPLET_OPTION)
+
+prepare-vcpkg::
+	for %%I in ($(srcdir:/=\)\vcpkg_installed\$(VCPKG_DEFAULT_TRIPLET)\bin\*.dll) do @( \
+		if not %%~nI == readline mklink %%~nxI %%I \
+	)
+
 .PHONY: reconfig
 reconfig $(MKFILES): $(srcdir)/common.mk $(srcdir)/version.h \
 	    $(hdrdir)/ruby/version.h $(ABI_VERSION_HDR) \
@@ -645,6 +672,7 @@ $(CONFIG_H): $(MKFILES) $(srcdir)/win32/Makefile.sub $(win_srcdir)/Makefile.sub
 !if defined(ABI_VERSION)
 #define RUBY_ABI_VERSION $(ABI_VERSION)
 !endif
+#define _WIN32_WINNT $(NTVER)
 #define STDC_HEADERS 1
 #define HAVE_SYS_TYPES_H 1
 #define HAVE_SYS_STAT_H 1
@@ -681,7 +709,7 @@ $(CONFIG_H): $(MKFILES) $(srcdir)/win32/Makefile.sub $(win_srcdir)/Makefile.sub
 #define _INTEGRAL_MAX_BITS 64
 #endif
 #define SIZEOF_OFF_T 8
-!if "$(ARCH)" == "x64"
+!if "$(TARGET_OS)" == "mswin64"
 #define SIZEOF_VOIDP 8
 !else
 #define SIZEOF_VOIDP 4
@@ -703,7 +731,7 @@ $(CONFIG_H): $(MKFILES) $(srcdir)/win32/Makefile.sub $(win_srcdir)/Makefile.sub
 #define NUM2CLOCKID(v) NUM2INT(v)
 #define SIZEOF_CLOCK_T 4
 #define SIZEOF_RLIM_T 0
-!if "$(ARCH)" == "x64"
+!if "$(TARGET_OS)" == "mswin64"
 #define SIZEOF_SIZE_T 8
 #define SIZEOF_PTRDIFF_T 8
 #define SIZEOF_INTPTR_T 8
@@ -743,6 +771,7 @@ $(CONFIG_H): $(MKFILES) $(srcdir)/win32/Makefile.sub $(win_srcdir)/Makefile.sub
 #define RBIMPL_ATTR_PACKED_STRUCT_END() __pragma(pack(pop))
 !endif
 #define RUBY_EXTERN extern __declspec(dllimport)
+#define RUBY_FUNC_EXPORTED extern __declspec(dllexport)
 #define RUBY_ALIGNAS(n) __declspec(align(n))
 #define RUBY_ALIGNOF __alignof
 #define HAVE_DECL_SYS_NERR 1
@@ -760,6 +789,7 @@ $(CONFIG_H): $(MKFILES) $(srcdir)/win32/Makefile.sub $(win_srcdir)/Makefile.sub
 #define HAVE_STRUCT_TIMESPEC
 !endif
 !if $(MSC_VER) >= 1600
+#define HAVE_INTTYPES_H 1
 #define HAVE_STDINT_H 1
 !else
 #define int8_t signed char
@@ -802,7 +832,7 @@ $(CONFIG_H): $(MKFILES) $(srcdir)/win32/Makefile.sub $(win_srcdir)/Makefile.sub
 #define HAVE_INTPTR_T 1
 #define HAVE_UINTPTR_T 1
 #define HAVE_SSIZE_T 1
-!if "$(ARCH)" == "x64"
+!if "$(TARGET_OS)" == "mswin64"
 #define ssize_t __int64
 #define PRI_PTR_PREFIX "I64"
 !else
@@ -842,6 +872,9 @@ $(CONFIG_H): $(MKFILES) $(srcdir)/win32/Makefile.sub $(win_srcdir)/Makefile.sub
 #define HAVE_STRCHR 1
 #define HAVE_STRSTR 1
 #define HAVE_FLOCK 1
+!if $(MSC_VER) >= 1800
+#define HAVE_ISINF 1
+!endif
 #define HAVE_ISNAN 1
 #define HAVE_FINITE 1
 !if $(RT_VER) >= 120
@@ -935,7 +968,6 @@ $(CONFIG_H): $(MKFILES) $(srcdir)/win32/Makefile.sub $(win_srcdir)/Makefile.sub
 #define RUBY_COREDLL "$(RT)"
 #define RUBY_PLATFORM "$(arch)"
 #define RUBY_SITEARCH "$(sitearch)"
-#define USE_RJIT 0
 #endif /* $(guard) */
 <<
 
@@ -967,6 +999,7 @@ s,@WERRORFLAG@,$(WERRORFLAG),;t t
 s,@DEFS@,$(DEFS),;t t
 s,@CPPFLAGS@,$(CPPFLAGS),;t t
 s,@CXXFLAGS@,$(CXXFLAGS),;t t
+s,@incflags@,$(incflags),;t t
 s,@FFLAGS@,$(FFLAGS),;t t
 s,@LDFLAGS@,$(LDFLAGS),;t t
 s,@LIBS@,user32.lib,;t t
@@ -1008,7 +1041,7 @@ s,@CC@,$(CC),;t t
 s,@CPP@,$(CPP),;t t
 s,@CXX@,$$(CC),;t t
 s,@LD@,$$(CC),;t t
-s,@YACC@,$(YACC),;t t
+s,@LRAMA@,$(LRAMA),;t t
 s,@RANLIB@,,;t t
 s,@AR@,$(AR),;t t
 s,@ARFLAGS@,$(ARFLAGS),;t t
@@ -1056,6 +1089,7 @@ s,@RUBY_SO_NAME@,$(RUBY_SO_NAME),;t t
 s,@LIBRUBY_A@,$$(RUBY_SO_NAME)-static.lib,;t t
 s,@LIBRUBY_SO@,$$(RUBY_SO_NAME).dll,;t t
 s,@LIBRUBY_ALIASES@,$(LIBRUBY_ALIASES),;t t
+s,@LIBRUBY_RELATIVE@,$(LIBRUBY_RELATIVE),;t t
 s,@LIBRUBY@,$$(RUBY_SO_NAME).lib,;t t
 s,@LIBRUBYARG@,$$(LIBRUBYARG_SHARED),;t t
 s,@LIBRUBYARG_STATIC@,$$(LIBRUBY_A) $$(MAINLIBS),;t t
@@ -1070,11 +1104,11 @@ s,@CSRCFLAG@,$(CSRCFLAG),;t t
 s,@CPPOUTFILE@,-P,;t t
 s,@PRELOADENV@,,;t t
 s,@LIBPATHENV@,PATH,;t t
-s,@LIBPATHFLAG@, -libpath:%s,;t t
+s,@LIBPATHFLAG@,-libpath:%s,;t t
 s,@RPATHFLAG@,,;t t
 s,@LIBARG@,%s.lib,;t t
 s,@LINK_SO@,$$(LDSHARED) -Fe$$(@) $$(OBJS) $$(LIBS) $$(LOCAL_LIBS) -link $$(DLDFLAGS) -implib:$$(*F:.so=)-$$(arch).lib -pdb:$$(*F:.so=)-$$(arch).pdb -def:$$(DEFFILE),;t t
-!if $(MSC_VER) >= 1400
+!if $(MSC_VER) >= 1400 && $(MSC_VER) < 1800
 s,@LINK_SO@,@if exist $$(@).manifest $$(RUBY) -run -e wait_writable -- -n 10 $$(@),;t t
 s,@LINK_SO@,@if exist $$(@).manifest $(MANIFESTTOOL) -manifest $$(@).manifest -outputresource:$$(@);2,;t t
 s,@LINK_SO@,@if exist $$(@).manifest $$(RM) $$(@:/=\).manifest,;t t
@@ -1105,6 +1139,11 @@ s,@TEENY@,$(TEENY),;t t
 s,@ruby_version@,$(ruby_version),;t t
 s,@RUBY_PROGRAM_VERSION@,$$(MAJOR).$$(MINOR).$$(TEENY),;t t
 s,@RUBY_API_VERSION@,$$(MAJOR).$$(MINOR),;t t
+!if defined(RUBY_VERSION_NAME)
+s,@RUBY_VERSION_NAME@,$(RUBY_VERSION_NAME),;t t
+!else
+s,@RUBY_VERSION_NAME@,$$(RUBY_BASE_NAME)-$$(ruby_version),;t t
+!endif
 s,@rubylibprefix@,$${prefix}/lib/$${RUBY_BASE_NAME},;t t
 s,@rubyarchdir@,$${rubylibdir}/$${arch},;t t
 s,@rubylibdir@,$${rubylibprefix}/$${ruby_version},;t t
@@ -1114,7 +1153,7 @@ s,@sitelibdir@,$${sitedir}/$${ruby_version},;t t
 s,@vendordir@,$${rubylibprefix}/vendor_ruby,;t t
 s,@vendorarchdir@,$${vendorlibdir}/$${sitearch},;t t
 s,@vendorlibdir@,$${vendordir}/$${ruby_version},;t t
-s,@rubyhdrdir@,$$(includedir)/$${RUBY_BASE_NAME}-$$(ruby_version),;t t
+s,@rubyhdrdir@,$$(includedir)/$$(RUBY_VERSION_NAME),;t t
 s,@sitehdrdir@,$$(rubyhdrdir)/site_ruby,;t t
 s,@vendorhdrdir@,$$(rubyhdrdir)/vendor_ruby,;t t
 s,@rubyarchhdrdir@,$$(rubyhdrdir)/$${arch},;t t
@@ -1128,7 +1167,7 @@ s,@srcdir@,$(srcdir),;t t
 s,@top_srcdir@,$(srcdir),;t t
 s,@try_header@,try_compile,;t t
 s,@ruby_pc@,$(ruby_pc),;t t
-s,@RJIT_SUPPORT@,$(RJIT_SUPPORT),;t t
+s,@PKG_CONFIG@,$(PKG_CONFIG),;t t
 <<KEEP
 
 !if "$(HAVE_BASERUBY)" != "yes" || "$(CROSS_COMPILING)" == "yes"
@@ -1140,7 +1179,8 @@ miniruby: miniruby$(EXEEXT)
 miniruby$(EXEEXT):
 		@echo $(LIBS)
 		$(ECHO) linking $(@:\=/)
-		$(Q) $(PURIFY) $(CC) $(MAINOBJ) $(MINIOBJS) $(COMMONOBJS) $(LIBS) -Fe$@ -link $(LDFLAGS)
+		$(Q) $(PURIFY) $(CC) $(MAINOBJ) $(MINIOBJS) $(COMMONOBJS) $(LIBS) \
+			$(OUTFLAG)$@ -link $(LDFLAGS) $(XLDFLAGS)
 		@$(RM) miniruby.lib miniruby.exp
 		$(Q) miniruby.exe -v
 		$(Q) $(LDSHARED_1)
@@ -1154,9 +1194,11 @@ $(PROGRAM):	$(MAINOBJ) $(LIBRUBY_SO) $(RUBY_INSTALL_NAME).res
 		$(ECHO) linking $(@:\=/)
 		$(Q) $(PURIFY) $(CC) $(MAINOBJ) $(EXTOBJS) $(RUBY_INSTALL_NAME).res \
 			$(OUTFLAG)$@ $(LIBRUBYARG) -link $(LDFLAGS) $(XLDFLAGS)
+! if defined(LDSHARED_0)
 		$(Q) $(LDSHARED_0)
 		$(Q) $(LDSHARED_1)
 		$(Q) $(LDSHARED_2)
+! endif
 !endif
 
 !if "$(WPROGRAM)" != ""
@@ -1165,9 +1207,11 @@ $(WPROGRAM):	$(MAINOBJ) $(WINMAINOBJ) $(LIBRUBY_SO) $(RUBYW_INSTALL_NAME).res
 		$(Q) $(PURIFY) $(CC) $(MAINOBJ) $(WINMAINOBJ) \
 			$(RUBYW_INSTALL_NAME).res $(OUTFLAG)$@ $(LIBRUBYARG) \
 			-link $(LDFLAGS) $(XLDFLAGS) -subsystem:Windows
+! if defined(LDSHARED_0)
 		$(Q) $(LDSHARED_0)
 		$(Q) $(LDSHARED_1)
 		$(Q) $(LDSHARED_2)
+! endif
 !endif
 
 !if "$(STUBPROGRAM)" != ""
@@ -1175,9 +1219,11 @@ $(STUBPROGRAM):	rubystub.$(OBJEXT) $(LIBRUBY) $(LIBRUBY_SO) $(RUBY_INSTALL_NAME)
 		$(ECHO) linking $(@:\=/)
 		$(Q) $(PURIFY) $(CC) rubystub.$(OBJEXT) $(RUBY_INSTALL_NAME).res \
 			$(OUTFLAG)$@ $(LIBRUBYARG) -link $(LDFLAGS) $(XLDFLAGS)
+! if defined(LDSHARED_0)
 		$(Q) $(LDSHARED_0)
 		$(Q) $(LDSHARED_1)
 		$(Q) $(LDSHARED_2)
+! endif
 !endif
 
 !if "$(LIBRUBY_SO_UPDATE)" == ""
@@ -1204,13 +1250,16 @@ $(LIBRUBY_SO):	$(LIBRUBY_A) $(DLDOBJS) $(RUBYDEF) $(RUBY_SO_NAME).res
 !endif
 		$(ECHO) linking shared-library $(@:\=/)
 		$(Q) $(LDSHARED) $(DLDOBJS) $(LIBRUBY_A) \
-			$(RUBY_SO_NAME).res $(SOLIBS) $(EXTSOLIBS) $(LIBS) -Fe$@ -link $(LDFLAGS) \
+			$(RUBY_SO_NAME).res $(SOLIBS) $(EXTSOLIBS) $(LIBS) \
+			$(OUTFLAG)$@ -link $(LDFLAGS) $(XLDFLAGS) \
 			$(LIBRUBY_DLDFLAGS)
 		@$(RM) dummy.lib dummy.exp
+!if defined(LDSHARED_0)
 		$(Q) $(LDSHARED_0)
 		$(Q) $(LDSHARED_1)
 		$(Q) $(LDSHARED_2)
 # | findstr -v -c:LNK4049 -c:LNK4217
+!endif
 
 $(RUBYDEF):	$(LIBRUBY_A) $(RBCONFIG)
 		$(ECHO) generating $(@:\=/)
@@ -1230,11 +1279,21 @@ distclean-local::
 		$(Q)$(RM) ext\config.cache $(RBCONFIG:/=\) $(CONFIG_H:/=\)
 		-$(Q)$(RM) $(INSTALLED_LIST:/=\) $(arch_hdrdir:/=\)\ruby\config.h verconf.h
 		-$(Q)$(RMDIRS) $(arch_hdrdir:/=\)\ruby
+		-$(Q)$(RMDIR) win32
+
+.bundle/clean:: .bundle/clean.sub
+.bundle/distclean:: .bundle/distclean.sub
+.bundle/realclean:: .bundle/realclean.sub
+
+.bundle/clean.sub:: ext/clean.mk
+.bundle/distclean.sub:: ext/distclean.mk
+.bundle/realclean.sub:: ext/realclean.mk
 
 ext/clean.mk ext/distclean.mk ext/realclean.mk::
 	$(Q)if exist $(EXTS_MK) $(MAKE) -k -f $(EXTS_MK) top_srcdir=$(srcdir) $(*F)
 
-ext/clean gems/clean ext/distclean gems/distclean ext/realclean gems/realclean::
+ext/clean.sub ext/distclean.sub ext/realclean.sub \
+.bundle/clean.sub .bundle/distclean.sub .bundle/realclean.sub::
 		$(Q)cd $(@D) 2>nul && (for /R $(EXTS) %I in (.) \
 		do $(Q)if exist %I\Makefile ( \
 		    cd %I && ( \
@@ -1247,11 +1306,19 @@ ext/clean gems/clean ext/distclean gems/distclean ext/realclean gems/realclean::
 		    $(RMDIRS) %I \
 		))) || @
 
-ext/distclean gems/distclean ext/realclean gems/realclean::
+ext/distclean ext/realclean .bundle/distclean .bundle/realclean::
 		$(Q)cd $(@D) 2>nul && (for /R $(EXTS) %I in (exts.mk*) \
 		do $(Q)(del %I & rmdir %~dpI)) || @
 		-$(Q)rmdir $(@D) 2> nul || @
 
+.bundle/realclean::
+	@$(RMALL) $(tooldir)/bunlder/*.lock $(srcdir)/.bundle
+
+gc/clean gc/distclean gc/realclean::
+	- for /D %G in (gc\*) do (pushd %G && $(MAKE) TARGET_SO_DIR=./ $(@F) & popd) || $(NULLCMD)
+gc/distclean gc/realclean::
+	- for /D %G in (gc\*) do ($(RMDIR) %G) || $(NULLCMD)
+
 clean-enc distclean-enc realclean-enc:
 !if exist($(ENC_MK))
 	$(ECHO) $(@:-enc=ing) encodings
@@ -1274,20 +1341,29 @@ $(ruby_pc): $(RBCONFIG)
 		-output=$@ -mode=$(INSTALL_DATA_MODE) -config=rbconfig.rb \
 		$(srcdir)/template/ruby.pc.in
 
+modular-gc-precheck:
+!if "$(modular_gc_dir)" == ""
+	@echo You must configure with --with-modular-gc to use modular GC
+	@exit /b 1
+!endif
+
 {$(srcdir)/coroutine/win32}.asm{coroutine/win32}.obj:
 	$(ECHO) assembling $(<:\=/)
 	$(Q) $(AS) $(ASFLAGS) $(XCFLAGS) $(CPPFLAGS) $(COUTFLAG)$@ -c $(<:\=/)
 {$(srcdir)/coroutine/win64}.asm{coroutine/win64}.obj:
 	$(ECHO) assembling $(<:\=/)
 	$(Q) $(AS) $(ASFLAGS) $(XCFLAGS) $(CPPFLAGS) $(COUTFLAG)$@ -c $(<:\=/)
+{$(srcdir)/coroutine/arm64}.asm{coroutine/arm64}.obj:
+	$(ECHO) assembling $(<:\=/)
+	$(Q) $(AS) $(ASFLAGS) -o $@ $(<:\=/)
 
-{$(srcdir)/yarp}.c.obj:
+{$(srcdir)/prism}.c.obj:
 	$(ECHO) compiling $(<:\=/)
 	$(Q) $(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) $(COUTFLAG)$@ -c $(CSRCFLAG)$(<:\=/)
-{$(srcdir)/yarp/enc}.c.obj:
+{$(srcdir)/prism/enc}.c.obj:
 	$(ECHO) compiling $(<:\=/)
 	$(Q) $(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) $(COUTFLAG)$@ -c $(CSRCFLAG)$(<:\=/)
-{$(srcdir)/yarp/util}.c.obj:
+{$(srcdir)/prism/util}.c.obj:
 	$(ECHO) compiling $(<:\=/)
 	$(Q) $(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) $(COUTFLAG)$@ -c $(CSRCFLAG)$(<:\=/)
 {$(srcdir)/enc/trans}.c.obj:
@@ -1309,6 +1385,11 @@ $(ruby_pc): $(RBCONFIG)
 	$(ECHO) compiling $(<:\=/)
 	$(Q) $(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) $(COUTFLAG)$@ -c $(CSRCFLAG)$(<:\=/)
 
+BUILTIN_GC_PATH = $(srcdir)/gc/$(BUILTIN_GC).c
+gc_impl.obj: $(BUILTIN_GC_PATH)
+	$(ECHO) compiling $(BUILTIN_GC_PATH:\=/)
+	$(Q) $(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) $(COUTFLAG)$@ -c $(CSRCFLAG)$(BUILTIN_GC_PATH:\=/)
+
 {$(srcdir)/missing}.c.asm:
 	$(ECHO) translating $(<:\=/)
 	$(Q) $(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) -Fa$@ -c $(CSRCFLAG)$(<:\=/)
@@ -1392,8 +1473,6 @@ loadpath: verconf.h
 	sed -e '1,/^const char ruby_initial_load_paths/d;/;/,$$d' \
 	    -e '/^^ /!d;s/ *"\\\\0"$$//;s/" *"//g'
 
-RUBYSPEC_CAPIEXT_SRCDIR = $(srcdir)/$(RUBYSPEC_CAPIEXT)
-RUBYSPEC_CAPIEXT_DEPS = $(RUBYSPEC_CAPIEXT_SRCDIR)/rubyspec.h $(RUBY_H_INCLUDES) $(LIBRUBY)
 RUBYSPEC_CAPIEXT_EXTS =
 
 !if [echo>rubyspec-capiext.mk RUBYSPEC_CAPIEXT_EXTS = \]
@@ -1413,11 +1492,18 @@ rubyspec-capiext: $(RUBYSPEC_CAPIEXT_EXTS)
 {$(RUBYSPEC_CAPIEXT_SRCDIR)}.c{$(RUBYSPEC_CAPIEXT)}.so:
 	$(ECHO) building $(@F)
 	$(Q)$(MAKEDIRS) $(@D)
-	$(Q)echo> $*.def EXPORTS
-	$(Q)echo>> $*.def Init_$(*F)
-	$(Q)$(LDSHARED) -Fe$(@) $(INCFLAGS) $(CFLAGS) $(CPPFLAGS) $< $(LIBRUBYARG) -link $(DLDFLAGS) $(LIBS) $(LOCAL_LIBS) -implib:$*.lib -pdb:$*.pdb -def:$*.def
+	$(Q)(echo EXPORTS&&echo Init_$(*F))> $*.def
+	$(Q)$(LDSHARED) -Fe$(@) -Fo$(*).obj $(INCFLAGS) $(CFLAGS) $(CPPFLAGS) $< $(LIBRUBYARG) -link $(DLDFLAGS) $(XLDFLAGS) $(LIBS) $(LOCAL_LIBS) -implib:$*.lib -pdb:$*.pdb -def:$*.def
+!if defined(LDSHARED_0)
 	$(Q)$(LDSHARED_0)
 	$(Q)$(LDSHARED_1)
 	$(Q)$(LDSHARED_2)
+!endif
+	$(Q)$(RM) $*.def $*.exp $*.lib $*.obj $*.pdb
 
 exts: rubyspec-capiext
+
+yesterday:
+	for /f "usebackq" %H in \
+	    (`$(GIT) -C $(srcdir) log -1 "--before=00:00+0900" "--format=%H"`) do \
+	    $(GIT) -C $(srcdir) reset --hard %%H
diff --git a/win32/configure.bat b/win32/configure.bat
index 7253ade28bd0ff..bad09cd3f5964a 100755
--- a/win32/configure.bat
+++ b/win32/configure.bat
@@ -1,5 +1,6 @@
 @echo off
 @setlocal disabledelayedexpansion
+set PROMPT=$E[94m+$E[m$S
 set witharg=
 
 for %%I in (%0) do if /%%~dpI/ == /%CD%\/ (
@@ -7,16 +8,24 @@ for %%I in (%0) do if /%%~dpI/ == /%CD%\/ (
     exit /b 999
 )
 
-echo> ~tmp~.mak ####
-echo>> ~tmp~.mak conf = %0
-echo>> ~tmp~.mak $(conf): nul
-echo>> ~tmp~.mak 	@del ~setup~.mak
-echo>> ~tmp~.mak 	@$(MAKE) -l$(MAKEFLAGS) -f $(@D)/setup.mak \
-if exist pathlist.tmp del pathlist.tmp
-echo>confargs.tmp #define CONFIGURE_ARGS \
+set XINCFLAGS=
+set XLDFLAGS=
+
+set conf=%0
+set pathlist=
+set config_make=confargs~%RANDOM%.mak
+set confargs=%config_make:.mak=.c%
+echo>%config_make% # CONFIGURE
+(
+  echo #define $ $$ //
+  echo !ifndef CONFIGURE_ARGS
+  echo #define CONFIGURE_ARGS \
+) >%confargs%
 :loop
 set opt=%1
 if "%1" == "" goto :end
+if "%1" == "--debug-configure" (echo on & shift & goto :loop)
+if "%1" == "--no-debug-configure" (echo off & shift & goto :loop)
 if "%1" == "--prefix" goto :prefix
 if "%1" == "--srcdir" goto :srcdir
 if "%1" == "srcdir" goto :srcdir
@@ -25,6 +34,7 @@ if "%1" == "target" goto :target
 if "%1" == "--with-static-linked-ext" goto :extstatic
 if "%1" == "--program-prefix" goto :pprefix
 if "%1" == "--program-suffix" goto :suffix
+if "%1" == "--program-transform-name" goto :transform_name
 if "%1" == "--program-name" goto :installname
 if "%1" == "--install-name" goto :installname
 if "%1" == "--so-name" goto :soname
@@ -48,183 +58,209 @@ if "%1" == "--with-git" goto :git
 if "%1" == "--without-git" goto :nogit
 if "%1" == "--without-ext" goto :witharg
 if "%1" == "--without-extensions" goto :witharg
+if "%1" == "--with-opt-dir" goto :opt-dir
 if "%1" == "--with-gmp" goto :gmp
+if "%1" == "--with-gmp-dir" goto :gmp-dir
 if "%opt:~0,10%" == "--without-" goto :withoutarg
 if "%opt:~0,7%" == "--with-" goto :witharg
 if "%1" == "-h" goto :help
 if "%1" == "--help" goto :help
   if "%opt:~0,1%" == "-" (
-    echo>>confargs.tmp  %1 \
+    echo>>%confargs%  %1 \
     set witharg=
   ) else if "%witharg%" == "" (
-    echo>>confargs.tmp  %1 \
+    echo>>%confargs%  %1 \
   ) else (
-    echo>>confargs.tmp ,%1\
+    echo>>%confargs% ,%1\
   )
   shift
 goto :loop ;
 :srcdir
-  echo>> ~tmp~.mak 	"srcdir=%~2" \
-  echo>>confargs.tmp --srcdir=%2 \
+  echo>> %config_make% srcdir = %~2
+  echo>>%confargs% --srcdir=%2 \
   shift
   shift
 goto :loop ;
 :prefix
-  echo>> ~tmp~.mak 	"prefix=%~2" \
-  echo>>confargs.tmp  %1=%2 \
+  echo>> %config_make% prefix = %~2
+  echo>>%confargs%  %1=%2 \
   shift
   shift
 goto :loop ;
 :pprefix
-  echo>> ~tmp~.mak 	"PROGRAM_PREFIX=%~2" \
-  echo>>confargs.tmp  %1=%2 \
+  echo>> %config_make% PROGRAM_PREFIX = %~2
+  echo>>%confargs%  %1=%2 \
   shift
   shift
 goto :loop ;
 :suffix
-  echo>> ~tmp~.mak 	"PROGRAM_SUFFIX=%~2" \
-  echo>>confargs.tmp  %1=%2 \
+  echo>> %config_make% PROGRAM_SUFFIX = %~2
+  echo>>%confargs%  %1=%2 \
   shift
   shift
 goto :loop ;
 :installname
-  echo>> ~tmp~.mak 	"RUBY_INSTALL_NAME=%~2" \
-  echo>>confargs.tmp  %1=%2 \
+  echo>> %config_make% RUBY_INSTALL_NAME = %~2
+  echo>>%confargs%  %1=%2 \
   shift
   shift
 goto :loop ;
 :soname
-  echo>> ~tmp~.mak 	"RUBY_SO_NAME=%~2" \
-  echo>>confargs.tmp  %1=%2 \
+  echo>> %config_make% RUBY_SO_NAME = %~2
+  echo>>%confargs%  %1=%2 \
+  shift
+  shift
+goto :loop ;
+:transform_name
+
   shift
   shift
 goto :loop ;
 :target
-  echo>> ~tmp~.mak 	"%~2" \
-  echo>>confargs.tmp --target=%2 \
-  if NOT "%~2" == "x64-mswin64" goto target3
-:target2
-  echo>> ~tmp~.mak 	"TARGET_OS=mswin64" \
-:target3
+  echo>> %config_make% target = %~2
+  echo>>%confargs% --target=%2 \
+  if "%~2" == "x64-mswin64" (
+    echo>> %config_make% TARGET_OS = mswin64
+  )
   shift
   shift
 goto :loop ;
 :extstatic
-  echo>> ~tmp~.mak 	"EXTSTATIC=static" \
-  echo>>confargs.tmp  %1 \
+  echo>> %config_make% EXTSTATIC = static
+  echo>>%confargs%  %1 \
   shift
 goto :loop ;
 :enable-rdoc
-  echo>> ~tmp~.mak 	"RDOCTARGET=rdoc" \
-  echo>>confargs.tmp  %1 \
+  echo>> %config_make% RDOCTARGET = rdoc
+  echo>>%confargs%  %1 \
   shift
 goto :loop ;
 :disable-rdoc
-  echo>> ~tmp~.mak 	"RDOCTARGET=nodoc" \
-  echo>>confargs.tmp  %1 \
+  echo>> %config_make% RDOCTARGET = nodoc
+  echo>>%confargs%  %1 \
   shift
 goto :loop ;
 :enable-lib
-  echo>> ~tmp~.mak 	"INSTALL_STATIC_LIBRARY=yes" \
-  echo>>confargs.tmp  %1 \
+  echo>> %config_make% INSTALL_STATIC_LIBRARY = yes
+  echo>>%confargs%  %1 \
   shift
 goto :loop ;
 :disable-lib
-  echo>> ~tmp~.mak 	"INSTALL_STATIC_LIBRARY=no" \
-  echo>>confargs.tmp  %1 \
+  echo>> %config_make% INSTALL_STATIC_LIBRARY = no
+  echo>>%confargs%  %1 \
   shift
 goto :loop ;
 :enable-debug-env
-  echo>> ~tmp~.mak 	"ENABLE_DEBUG_ENV=yes" \
-  echo>>confargs.tmp  %1 \
+  echo>> %config_make% ENABLE_DEBUG_ENV = yes
+  echo>>%confargs%  %1 \
   shift
 goto :loop ;
 :disable-debug-env
-  echo>> ~tmp~.mak 	"ENABLE_DEBUG_ENV=no" \
-  echo>>confargs.tmp  %1 \
+  echo>> %config_make% ENABLE_DEBUG_ENV = no
+  echo>>%confargs%  %1 \
   shift
 goto :loop ;
 :enable-devel
-  echo>> ~tmp~.mak 	"RUBY_DEVEL=yes" \
-  echo>>confargs.tmp  %1 \
+  echo>> %config_make% RUBY_DEVEL = yes
+  echo>>%confargs%  %1 \
   shift
 goto :loop ;
 :disable-devel
-  echo>> ~tmp~.mak 	"RUBY_DEVEL=no" \
-  echo>>confargs.tmp  %1 \
+  echo>> %config_make% RUBY_DEVEL = no
+  echo>>%confargs%  %1 \
   shift
 goto :loop ;
 :enable-rubygems
-  echo>> ~tmp~.mak 	"USE_RUBYGEMS=yes" \
-  echo>>confargs.tmp  %1 \
+  echo>> %config_make% USE_RUBYGEMS = yes
+  echo>>%confargs%  %1 \
   shift
 goto :loop ;
 :disable-rubygems
-  echo>> ~tmp~.mak 	"USE_RUBYGEMS=no" \
-  echo>>confargs.tmp  %1 \
+  echo>> %config_make% USE_RUBYGEMS = no
+  echo>>%confargs%  %1 \
   shift
 goto :loop ;
 :ntver
-  echo>> ~tmp~.mak 	"NTVER=%~2" \
-  echo>>confargs.tmp  %1=%2 \
+  ::- For version constants, see
+  ::- https://learn.microsoft.com/en-us/cpp/porting/modifying-winver-and-win32-winnt#remarks
+  set NTVER=%~2
+  if /i not "%NTVER:~0,2%" == "0x" if /i not "%NTVER:~0,13%" == "_WIN32_WINNT_" (
+    for %%i in (A B C D E F G H I J K L M N O P Q R S T U V W X Y Z) do (
+      call set NTVER=%%NTVER:%%i=%%i%%
+    )
+    call set NTVER=_WIN32_WINNT_%%NTVER%%
+  )
+  echo>> %config_make% NTVER = %NTVER%
+  echo>>%confargs%  %1=%2 \
   shift
   shift
 goto :loop ;
 :extout
-  echo>> ~tmp~.mak 	"EXTOUT=%~2" \
-  echo>>confargs.tmp  %1=%2 \
+  if not "%~2" == ".ext" (echo>> %config_make% EXTOUT = %~2)
+  echo>>%confargs%  %1=%2 \
   shift
   shift
 goto :loop ;
 :path
-  echo>>pathlist.tmp %~2;\
-  echo>>confargs.tmp  %1=%2 \
+  set pathlist=%pathlist%%~2;
+  echo>>%confargs%  %1=%2 \
   shift
   shift
 goto :loop ;
 :baseruby
-  echo>> ~tmp~.mak 	"BASERUBY=%~2" \
-  echo>>confargs.tmp  %1=%2 \
+  echo>> %config_make% BASERUBY = %~2
+  echo>>%confargs%  %1=%2 \
   shift
   shift
 goto :loop ;
 :nobaseruby
-  echo>> ~tmp~.mak 	"HAVE_BASERUBY=no" \
-  echo>>confargs.tmp  %1=%2 \
+  echo>> %config_make% HAVE_BASERUBY = no
+  echo>>%confargs%  %1=%2 \
   shift
 goto :loop ;
 :libdir
-  echo>> ~tmp~.mak 	"libdir_basename=%~2" \
-  echo>>confargs.tmp  %1=%2 \
+  echo>> %config_make% libdir_basename = %~2
+  echo>>%confargs%  %1=%2 \
   shift
   shift
 goto :loop ;
 :git
-  echo>> ~tmp~.mak 	"GIT=%~2" \
-  echo>>confargs.tmp  %1=%2 \
+  echo>> %config_make% GIT = %~2
+  echo>>%confargs%  %1=%2 \
   shift
   shift
 goto :loop ;
 :nogit
-  echo>> ~tmp~.mak 	"GIT=never-use" \
-  echo>> ~tmp~.mak 	"HAVE_GIT=no" \
-  echo>>confargs.tmp  %1 \
+  echo>> %config_make% GIT = never-use
+  echo>> %config_make% HAVE_GIT = no
+  echo>>%confargs%  %1 \
   shift
 goto :loop ;
 :gmp
-  echo>> ~tmp~.mak 	"WITH_GMP=yes" \
-  echo>>confargs.tmp  %1=1 \
+  echo>> %config_make% WITH_GMP = yes
+  echo>>%confargs%  %1=1 \
   shift
   shift
 goto :loop ;
+:gmp-dir
+:opt-dir
+  set opt=%~2
+  for %%I in (%opt:;= %) do (
+    set d=%%I
+    call pushd %%d:/=\%% && (
+      call set XINCFLAGS=%%XINCFLAGS%% -I%%CD:\=/%%/include
+      call set XLDFLAGS=%%XLDFLAGS%% -libpath:%%CD:\=/%%/lib
+      popd
+    )
+  )
 :witharg
-  echo>>confargs.tmp  %1=%2\
+  echo>>%confargs%  %1=%2\
   set witharg=1
   shift
   shift
 goto :loop ;
 :withoutarg
-  echo>>confargs.tmp  %1 \
+  echo>>%confargs%  %1 \
   shift
 goto :loop ;
 :help
@@ -240,36 +276,47 @@ goto :loop ;
   echo   --with-static-linked-ext link external modules statically
   echo   --with-ext="a,b,..."    use extensions a, b, ...
   echo   --without-ext="a,b,..." ignore extensions a, b, ...
-  echo   --with-opt-dir=DIR-LIST add optional headers and libraries directories separated by `;'
+  echo   --with-opt-dir="DIR-LIST" add optional headers and libraries directories separated by `;'
   echo   --disable-install-doc   do not install rdoc indexes during install
   echo   --with-ntver=0xXXXX     target NT version (shouldn't use with old SDK)
-  del *.tmp
-  del ~tmp~.mak
+  echo   --with-ntver=_WIN32_WINNT_XXXX
+  echo   --with-ntver=XXXX       same as --with-ntver=_WIN32_WINNT_XXXX
+  echo Note that `,' and `;' need to be enclosed within double quotes in batch file command line.
+  del %confargs% %config_make%
 goto :exit
 :end
-echo>> ~tmp~.mak 	WIN32DIR=$(@D:\=/)
-echo.>>confargs.tmp
-echo>confargs.c #define $ $$ //
-echo>>confargs.c !ifndef CONFIGURE_ARGS
-type>>confargs.c confargs.tmp
-echo>>confargs.c configure_args = CONFIGURE_ARGS
-echo>>confargs.c !endif
-echo>>confargs.c #undef $
-if exist pathlist.tmp echo>>confargs.c #define PATH_LIST \
-if exist pathlist.tmp type>>confargs.c pathlist.tmp
-if exist pathlist.tmp echo.>>confargs.c
-if exist pathlist.tmp echo>>confargs.c pathlist = PATH_LIST
-cl -EP confargs.c > ~setup~.mak 2>nul
-if exist pathlist.tmp echo>>~setup~.mak PATH = $(pathlist:;=/bin;)$(PATH)
-if exist pathlist.tmp echo>>~setup~.mak INCLUDE = $(pathlist:;=/include;)
-if exist pathlist.tmp echo>>~setup~.mak LIB = $(pathlist:;=/lib;)
-type>>~setup~.mak ~tmp~.mak
-del *.tmp > nul
-del ~tmp~.mak > nul
-echo>>~setup~.mak 	@if exist Makefile.old del Makefile.old
-echo>>~setup~.mak 	@if exist Makefile ren Makefile Makefile.old
-echo>>~setup~.mak 	@ren Makefile.new Makefile
-nmake -alf ~setup~.mak MAKEFILE=Makefile.new
+(
+  echo //
+  echo configure_args = CONFIGURE_ARGS
+  echo !endif
+  echo #undef $
+) >> %confargs%
+(
+  cl -EP %confargs% 2>nul | findstr "! ="
+  echo.
+  if NOT "%XINCFLAGS%" == "" echo XINCFLAGS = %XINCFLAGS%
+  if NOT "%XLDFLAGS%" == "" echo XLDFLAGS = %XLDFLAGS%
+  if NOT "%pathlist%" == "" (
+    call echo PATH = %%pathlist:;=/bin;%%$^(PATH^)
+    call echo INCLUDE = %%pathlist:;=/include;%%$^(INCLUDE^)
+    call echo LIB = %%pathlist:;=/lib;%%$^(LIB^)
+  )
+) >> %config_make%
+del %confargs% > nul
+
+set setup_make=%config_make:confargs=setup%
+(
+  echo #### -*- makefile -*-
+  echo conf = %conf%
+  echo $^(conf^): nul
+  echo 	@del %setup_make%
+  echo 	@$^(MAKE^) -l$^(MAKEFLAGS^) -f $^(@D^)/setup.mak \
+  echo 	WIN32DIR=$^(@D:\=/^) config_make=%config_make%
+  echo 	-@move /y Makefile Makefile.old ^> nul 2^> nul
+  echo 	@ren Makefile.new Makefile
+) > %setup_make%
+nmake -alf %setup_make% MAKEFILE=Makefile.new
+
 exit /b %ERRORLEVEL%
 :exit
 @endlocal
diff --git a/win32/dir.h b/win32/dir.h
index 0292c27c9c6c2b..da1c4b76afae14 100644
--- a/win32/dir.h
+++ b/win32/dir.h
@@ -36,7 +36,7 @@ struct direct* rb_w32_ureaddir(DIR *);
 long           rb_w32_telldir(DIR *);
 void           rb_w32_seekdir(DIR *, long);
 void           rb_w32_rewinddir(DIR *);
-void           rb_w32_closedir(DIR *);
+int            rb_w32_closedir(DIR *);
 char          *rb_w32_ugetcwd(char *, int);
 
 #define opendir(s)   rb_w32_uopendir((s))
diff --git a/win32/file.c b/win32/file.c
index 8e6c2c778d6cd1..f137f04c43db94 100644
--- a/win32/file.c
+++ b/win32/file.c
@@ -263,7 +263,7 @@ rb_default_home_dir(VALUE result)
 {
     WCHAR *dir = rb_w32_home_dir();
     if (!dir) {
-        rb_raise(rb_eArgError, "couldn't find HOME environment -- expanding `~'");
+        rb_raise(rb_eArgError, "couldn't find HOME environment -- expanding '~'");
     }
     append_wstr(result, dir, -1,
                        CP_UTF8, rb_utf8_encoding());
@@ -326,13 +326,13 @@ rb_file_expand_path_internal(VALUE fname, VALUE dname, int abs_mode, int long_na
         whome = rb_w32_home_dir();
         if (whome == NULL) {
             free(wpath);
-            rb_raise(rb_eArgError, "couldn't find HOME environment -- expanding `~'");
+            rb_raise(rb_eArgError, "couldn't find HOME environment -- expanding '~'");
         }
         whome_len = wcslen(whome);
 
         if (!IS_ABSOLUTE_PATH_P(whome, whome_len)) {
             free(wpath);
-            xfree(whome);
+            free(whome);
             rb_raise(rb_eArgError, "non-absolute home");
         }
 
@@ -404,14 +404,14 @@ rb_file_expand_path_internal(VALUE fname, VALUE dname, int abs_mode, int long_na
             if (whome == NULL) {
                 free(wpath);
                 free(wdir);
-                rb_raise(rb_eArgError, "couldn't find HOME environment -- expanding `~'");
+                rb_raise(rb_eArgError, "couldn't find HOME environment -- expanding '~'");
             }
             whome_len = wcslen(whome);
 
             if (!IS_ABSOLUTE_PATH_P(whome, whome_len)) {
                 free(wpath);
                 free(wdir);
-                xfree(whome);
+                free(whome);
                 rb_raise(rb_eArgError, "non-absolute home");
             }
 
@@ -572,7 +572,7 @@ rb_file_expand_path_internal(VALUE fname, VALUE dname, int abs_mode, int long_na
     xfree(buffer);
     free(wpath);
     free(wdir);
-    xfree(whome);
+    free(whome);
 
     if (wfullpath != wfullpath_buffer)
         xfree(wfullpath);
diff --git a/win32/file.h b/win32/file.h
index 4f1f36a75cd72a..7bf9868e7daa39 100644
--- a/win32/file.h
+++ b/win32/file.h
@@ -47,4 +47,7 @@ int fchmod(int fd, int mode);
 UINT rb_w32_filecp(void);
 WCHAR *rb_w32_home_dir(void);
 
+rb_pid_t rb_w32_uspawn_process(int mode, const char *prog, char *const *argv,
+                               int in_fd, int out_fd, int err_fd, DWORD flags);
+
 #endif	/* RUBY_WIN32_FILE_H */
diff --git a/win32/ifchange.bat b/win32/ifchange.bat
index fb9ad27337c77b..1de98f99900d70 100755
--- a/win32/ifchange.bat
+++ b/win32/ifchange.bat
@@ -60,26 +60,9 @@ set src=%2
 set dest=%dest:/=\%
 set src=%src:/=\%
 
-goto :nt
-
-:unchange
-echo %1 unchanged.
-del %2
-goto :end
-
-:update
-echo %1 updated.
-:: if exist %1 del %1
-dir /b %2
-if "%keepsuffix%" != "" %1 %1%keepsuffix%
-copy %2 %1
-del %2
-goto :end
-
-:nt
 if exist %dest% (
     if not exist %src% goto :nt_unchanged1
-    if "%empty%" == "" for %%I in (%src%) do if %%~zI == 0 goto :nt_unchanged
+    if not "%empty%" == "" for %%I in (%src%) do if %%~zI == 0 goto :nt_unchanged
     fc.exe %dest% %src% > nul && (
       :nt_unchanged
 	del %src%
@@ -89,7 +72,7 @@ if exist %dest% (
     )
 )
 for %%I in (%1) do echo %%~I updated
-del /f %dest%
+del /f %dest% 2> nul
 copy %src% %dest% > nul
 del %src%
 
diff --git a/win32/install-buildtools.cmd b/win32/install-buildtools.cmd
new file mode 100755
index 00000000000000..6ec147528000db
--- /dev/null
+++ b/win32/install-buildtools.cmd
@@ -0,0 +1,14 @@
+@echo off
+setlocal
+
+set components=VC.Tools.x86.x64 VC.Redist.14.Latest CoreBuildTools
+set components=%components% Windows11SDK.26100
+if /i "%PROCESSOR_ARCHITECTURE%" == "ARM64" (
+    set components=%components% VC.Tools.ARM64 VC.Tools.ARM64EC
+)
+set override=--passive
+for %%I in (%components%) do (
+    call set override=%%override%% --add Microsoft.VisualStudio.Component.%%I
+)
+echo on
+winget install --id Microsoft.VisualStudio.2022.BuildTools --override "%override%"
diff --git a/win32/mkexports.rb b/win32/mkexports.rb
index 28899089422f3a..389b49def83544 100755
--- a/win32/mkexports.rb
+++ b/win32/mkexports.rb
@@ -106,14 +106,11 @@ def each_export(objs)
     objs = objs.collect {|s| s.tr('/', '\\')}
     filetype = nil
     objdump(objs) do |l|
-      if filetype
-        if /^\f/ =~ l
-          filetype = nil
-          next
-        end
+      if (filetype = l[/^File Type: (.+)/, 1])..(/^\f/ =~ l)
         case filetype
         when /OBJECT/, /LIBRARY/
           l.chomp!
+          next if (/^ .*\(pick any\)$/ =~ l)...true
           next if /^[[:xdigit:]]+ 0+ UNDEF / =~ l
           next unless /External/ =~ l
           next if /(?:_local_stdio_printf_options|v(f|sn?)printf(_s)?_l)\Z/ =~ l
@@ -132,8 +129,6 @@ def each_export(objs)
           next
         end
         yield l.strip, is_data
-      else
-        filetype = l[/^File Type: (.+)/, 1]
       end
     end
     yield "strcasecmp", "msvcrt.stricmp"
@@ -151,7 +146,7 @@ def exports(*)
   end
 
   def each_line(objs, &block)
-    IO.foreach("|#{self.class.nm} --extern --defined #{objs.join(' ')}", &block)
+    IO.foreach("|#{self.class.nm} --extern-only --defined-only #{objs.join(' ')}", &block)
   end
 
   def each_export(objs)
diff --git a/win32/rm.bat b/win32/rm.bat
index 8dddf454d60707..fefc0305458e57 100755
--- a/win32/rm.bat
+++ b/win32/rm.bat
@@ -1,18 +1,18 @@
 @echo off
+setlocal
+set recursive=
 :optloop
 if "%1" == "-f" shift
 if "%1" == "-r" (shift & set "recursive=1" & goto :optloop)
-if "%recursive%" == "1" goto :recursive
+if "%1" == "--debug" (shift & set PROMPT=$E[34m+$E[m$S & echo on & goto :optloop)
 :begin
 if "%1" == "" goto :end
 set p=%1
-if exist "%p:/=\%" for %%I in ("%p:/=\%") do @del "%%I"
+set p=%p:/=\%
+if exist "%p%" del /q "%p%" > nul
+if "%recursive%" == "1" for /D %%I in (%p%) do (
+    rd /s /q %%I
+)
 shift
 goto :begin
-:recursive
-if "%1" == "" goto :end
-set p=%1
-if exist "%p:/=\%" rd /s /q "%p:/=\%"
-shift
-goto :recursive
 :end
diff --git a/win32/setup.mak b/win32/setup.mak
index c0074bf963db4c..275ccda3bb6578 100644
--- a/win32/setup.mak
+++ b/win32/setup.mak
@@ -1,5 +1,7 @@
 # -*- makefile -*-
 
+!include $(config_make)
+
 !if "$(srcdir)" != ""
 WIN32DIR = $(srcdir)/win32
 !elseif "$(WIN32DIR)" == "win32"
@@ -40,46 +42,20 @@ x64-mswin64: -prologue- -x64- -epilogue-
 MAKE = nmake
 srcdir = $(srcdir:\=/)
 prefix = $(prefix:\=/)
-!if defined(libdir_basename)
-libdir_basename = $(libdir_basename)
-!endif
-EXTSTATIC = $(EXTSTATIC)
-!if defined(RDOCTARGET)
-RDOCTARGET = $(RDOCTARGET)
-!endif
-!if defined(EXTOUT) && "$(EXTOUT)" != ".ext"
-EXTOUT = $(EXTOUT)
-!endif
-!if defined(NTVER)
-NTVER = $(NTVER)
-!endif
-!if defined(USE_RUBYGEMS)
-USE_RUBYGEMS = $(USE_RUBYGEMS)
-!endif
-!if defined(ENABLE_DEBUG_ENV)
-ENABLE_DEBUG_ENV = $(ENABLE_DEBUG_ENV)
-!endif
-!if defined(RJIT_SUPPORT)
-RJIT_SUPPORT = $(RJIT_SUPPORT)
-!endif
 
-# TOOLS
 <<
+	@type $(config_make) >>$(MAKEFILE)
+	@del $(config_make) > nul
 !if defined(BASERUBY)
-	@echo BASERUBY = $(BASERUBY:/=\)>> $(MAKEFILE)
+	$(BASERUBY:/=\) "$(srcdir)/tool/missing-baseruby.bat"
 !endif
-!if "$(RUBY_DEVEL)" == "yes"
-	RUBY_DEVEL = yes
-!endif
-!if "$(GIT)" != ""
-	@echo GIT = $(GIT)>> $(MAKEFILE)
-!endif
-!if "$(HAVE_GIT)" != ""
-	@echo HAVE_GIT = $(HAVE_GIT)>> $(MAKEFILE)
-!endif
-
-!if "$(WITH_GMP)" == "yes"
-	@echo>>$(MAKEFILE) USE_GMP = 1
+!if "$(WITH_GMP)" != "no"
+	@($(CC) $(XINCFLAGS) <<conftest.c -link $(XLDFLAGS) gmp.lib > nul && (echo USE_GMP = yes) || exit /b 0) >>$(MAKEFILE)
+#include <gmp.h>
+mpz_t x;
+int main(void) {mpz_init(x); return 0;}
+<<
+	@$(WIN32DIR:/=\)\rm.bat conftest.*
 !endif
 
 -osname-section-:
@@ -118,7 +94,9 @@ int main(void) {FILE *volatile f = stdin; return 0;}
 
 -headers-: nul
 
+!ifdef VS2022_FP_BUG_CHECK # Fixed In: Visual Studio 2022 version 17.3
 -headers-: vs2022-fp-bug
+!endif
 
 # Check the bug reported at:
 # https://developercommunity.visualstudio.com/t/With-__assume-isnan-after-isinf/1515649
@@ -129,6 +107,7 @@ vs2022-fp-bug:
 /* compile with -O2 */
 #include <math.h>
 #include <float.h>
+#include <stdio.h>
 
 #define value_finite(d) 'f'
 #define value_infinity() 'i'
@@ -170,14 +149,26 @@ main(void)
 
 -version-: nul verconf.mk
 
+!if !(exist(revision.h) || exist($(srcdir)/revision.h))
+revision_opt = -DRUBY_REVISION=0
+!endif
+
 verconf.mk: nul
 	@findstr /R /C:"^#define RUBY_ABI_VERSION " $(srcdir:/=\)\include\ruby\internal\abi.h > $(@)
-	@$(CPP) -I$(srcdir) -I$(srcdir)/include <<"Creating $(@)" > $(*F).bat && cmd /c $(*F).bat > $(@)
+	@$(CPP) -I$(srcdir) -I$(srcdir)/include $(revision_opt) <<"Creating $(@)" > $(*F).bat && cmd /c $(*F).bat > $(@)
 @echo off
-#define RUBY_REVISION 0
 #define STRINGIZE0(expr) #expr
 #define STRINGIZE(x) STRINGIZE0(x)
 #include "version.h"
+#ifndef RUBY_RELEASE_YEAR
+# define RUBY_RELEASE_YEAR 0000
+#endif
+#ifndef RUBY_RELEASE_MONTH
+# define RUBY_RELEASE_MONTH 00
+#endif
+#ifndef RUBY_RELEASE_DAY
+# define RUBY_RELEASE_DAY 00
+#endif
 set ruby_release_year=RUBY_RELEASE_YEAR
 set ruby_release_month=RUBY_RELEASE_MONTH
 set ruby_release_day=RUBY_RELEASE_DAY
@@ -208,27 +199,11 @@ set MSC_VER
 del %0 & exit
 <<
 
--program-name-:
-	@type << >>$(MAKEFILE)
-
-# PROGRAM-NAME
-!ifdef PROGRAM_PREFIX
-PROGRAM_PREFIX = $(PROGRAM_PREFIX)
-!endif
-!ifdef PROGRAM_SUFFIX
-PROGRAM_SUFFIX = $(PROGRAM_SUFFIX)
-!endif
-!ifdef RUBY_INSTALL_NAME
-RUBY_INSTALL_NAME = $(RUBY_INSTALL_NAME)
-!endif
-!ifdef RUBY_SO_NAME
-RUBY_SO_NAME = $(RUBY_SO_NAME)
-!endif
-<<
-
 -generic-: nul
 	@$(CPP) <<conftest.c 2>nul | findstr = >>$(MAKEFILE)
-#if defined _M_X64
+#if defined _M_ARM64
+MACHINE = arm64
+#elif defined _M_X64
 MACHINE = x64
 #else
 MACHINE = x86
@@ -244,6 +219,8 @@ MACHINE = x86
 	@echo MACHINE = x64>>$(MAKEFILE)
 -ix86-: -osname32-
 	@echo MACHINE = x86>>$(MAKEFILE)
+-arm64-: -osname64-
+	@echo MACHINE = arm64>>$(MAKEFILE)
 
 -i386-: -ix86-
 	@echo $(CPU) = 3>>$(MAKEFILE)
@@ -254,7 +231,7 @@ MACHINE = x86
 -i686-: -ix86-
 	@echo $(CPU) = 6>>$(MAKEFILE)
 
--epilogue-: -compiler- -program-name- -encs-
+-epilogue-: -compiler- -encs-
 
 -encs-: nul
 	@$(APPEND)
@@ -262,11 +239,6 @@ MACHINE = x86
 	@$(MAKE) -l -f $(srcdir)/win32/enc-setup.mak srcdir="$(srcdir)" MAKEFILE=$(MAKEFILE)
 
 -epilogue-: nul
-!if exist(confargs.c)
-	@$(APPEND)
-	@$(CPP) confargs.c 2>&1 | findstr "! =" >> $(MAKEFILE)
-	@del confargs.c
-!endif
 	@type << >>$(MAKEFILE)
 
 # RUBY_INSTALL_NAME = ruby
@@ -293,4 +265,4 @@ AS = $(AS) -nologo
 $(BANG)include $$(srcdir)/win32/Makefile.sub
 <<
 	@$(COMSPEC) /C $(srcdir:/=\)\win32\rm.bat config.h config.status
-	@echo "type `nmake' to make ruby."
+	@echo type 'nmake' to make ruby.
diff --git a/win32/vssetup.cmd b/win32/vssetup.cmd
new file mode 100755
index 00000000000000..be77c87b294a6c
--- /dev/null
+++ b/win32/vssetup.cmd
@@ -0,0 +1,27 @@
+@echo off
+setlocal ENABLEEXTENSIONS
+
+::- check for vswhere
+set vswhere=%ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vswhere.exe
+if not exist "%vswhere%" (
+  echo 1>&2 vswhere.exe not found
+  exit /b 1
+)
+
+::- find the latest build tool and its setup batch file.
+set VSDEVCMD=
+for /f "delims=" %%I in ('"%vswhere%" -products * -latest -property installationPath') do (
+  set VSDEVCMD=%%I\Common7\Tools\VsDevCmd.bat
+)
+if not defined VSDEVCMD (
+  echo 1>&2 Visual Studio not found
+  exit /b 1
+)
+
+::- default to the current processor.
+set arch=%PROCESSOR_ARCHITECTURE%
+::- `vsdevcmd.bat` requires arch names to be lowercase
+for %%i in (a b c d e f g h i j k l m n o p q r s t u v w x y z) do @(
+  call set arch=%%arch:%%i=%%i%%
+)
+echo on && endlocal && "%VSDEVCMD%" -arch=%arch% -host_arch=%arch% %*
diff --git a/win32/win32.c b/win32/win32.c
index 61b13777bd8589..72539e8a63b209 100644
--- a/win32/win32.c
+++ b/win32/win32.c
@@ -447,22 +447,9 @@ get_special_folder(int n, WCHAR *buf, size_t len)
     LPITEMIDLIST pidl;
     LPMALLOC alloc;
     BOOL f = FALSE;
-    typedef BOOL (WINAPI *get_path_func)(LPITEMIDLIST, WCHAR*, DWORD, int);
-    static get_path_func func = (get_path_func)-1;
-
-    if (func == (get_path_func)-1) {
-        func = (get_path_func)
-            get_proc_address("shell32", "SHGetPathFromIDListEx", NULL);
-    }
-    if (!func && len < MAX_PATH) return FALSE;
 
     if (SHGetSpecialFolderLocation(NULL, n, &pidl) == 0) {
-        if (func) {
-            f = func(pidl, buf, len, 0);
-        }
-        else {
-            f = SHGetPathFromIDListW(pidl, buf);
-        }
+        f = SHGetPathFromIDListEx(pidl, buf, len, 0);
         SHGetMalloc(&alloc);
         alloc->lpVtbl->Free(alloc, pidl);
         alloc->lpVtbl->Release(alloc);
@@ -572,8 +559,9 @@ rb_w32_home_dir(void)
         }
     }
 
-    /* allocate buffer */
-    buffer = ALLOC_N(WCHAR, buffer_len);
+    /* can't use xmalloc here, since it's called too early from init_env() */
+    buffer = malloc(sizeof(WCHAR) * buffer_len);
+    if (buffer == NULL) return NULL;
 
     switch (home_type) {
       case ENV_HOME:
@@ -589,10 +577,10 @@ rb_w32_home_dir(void)
       default:
         if (!get_special_folder(CSIDL_PROFILE, buffer, buffer_len) &&
             !get_special_folder(CSIDL_PERSONAL, buffer, buffer_len)) {
-            xfree(buffer);
+            free(buffer);
             return NULL;
         }
-        REALLOC_N(buffer, WCHAR, lstrlenW(buffer) + 1);
+        buffer = realloc(buffer, sizeof(WCHAR) * (lstrlenW(buffer) + 1));
         break;
     }
 
@@ -606,51 +594,24 @@ rb_w32_home_dir(void)
 static void
 init_env(void)
 {
-    static const WCHAR TMPDIR[] = L"TMPDIR";
-    struct {WCHAR name[6], eq, val[ENV_MAX];} wk;
-    DWORD len;
-    BOOL f;
-#define env wk.val
-#define set_env_val(vname) do { \
-        typedef char wk_name_offset[(numberof(wk.name) - (numberof(vname) - 1)) * 2 + 1]; \
-        WCHAR *const buf = wk.name + sizeof(wk_name_offset) / 2; \
-        MEMCPY(buf, vname, WCHAR, numberof(vname) - 1); \
-        _wputenv(buf); \
-    } while (0)
-
-    wk.eq = L'=';
+    WCHAR env[ENV_MAX];
 
     if (!GetEnvironmentVariableW(L"HOME", env, numberof(env))) {
-        f = FALSE;
-        if (GetEnvironmentVariableW(L"HOMEDRIVE", env, numberof(env)))
-            len = lstrlenW(env);
-        else
-            len = 0;
-        if (GetEnvironmentVariableW(L"HOMEPATH", env + len, numberof(env) - len) || len) {
-            f = TRUE;
-        }
-        else if (GetEnvironmentVariableW(L"USERPROFILE", env, numberof(env))) {
-            f = TRUE;
-        }
-        else if (get_special_folder(CSIDL_PROFILE, env, numberof(env))) {
-            f = TRUE;
-        }
-        else if (get_special_folder(CSIDL_PERSONAL, env, numberof(env))) {
-            f = TRUE;
-        }
-        if (f) {
-            regulate_path(env);
-            set_env_val(L"HOME");
+        WCHAR *whome = rb_w32_home_dir();
+        if (whome) {
+            _wputenv_s(L"HOME", whome);
+            free(whome);
         }
     }
 
     if (!GetEnvironmentVariableW(L"USER", env, numberof(env))) {
+        DWORD len;
         if (!GetEnvironmentVariableW(L"USERNAME", env, numberof(env)) &&
             !GetUserNameW(env, (len = numberof(env), &len))) {
             NTLoginName = "<Unknown>";
         }
         else {
-            set_env_val(L"USER");
+            _wputenv_s(L"USER", env);
             NTLoginName = rb_w32_wstr_to_mbstr(CP_UTF8, env, -1, NULL);
         }
     }
@@ -658,15 +619,12 @@ init_env(void)
         NTLoginName = rb_w32_wstr_to_mbstr(CP_UTF8, env, -1, NULL);
     }
 
-    if (!GetEnvironmentVariableW(TMPDIR, env, numberof(env)) &&
+    if (!GetEnvironmentVariableW(L"TMPDIR", env, numberof(env)) &&
         !GetEnvironmentVariableW(L"TMP", env, numberof(env)) &&
         !GetEnvironmentVariableW(L"TEMP", env, numberof(env)) &&
         rb_w32_system_tmpdir(env, numberof(env))) {
-        set_env_val(TMPDIR);
+        _wputenv_s(L"TMPDIR", env);
     }
-
-#undef env
-#undef set_env_val
 }
 
 static void init_stdhandle(void);
@@ -1351,46 +1309,6 @@ is_batch(const char *cmd)
 #define utf8_to_wstr(str, plen) mbstr_to_wstr(CP_UTF8, str, -1, plen)
 #define wstr_to_utf8(str, plen) wstr_to_mbstr(CP_UTF8, str, -1, plen)
 
-/* License: Ruby's */
-HANDLE
-rb_w32_start_process(const char *abspath, char *const *argv, int out_fd)
-{
-    /* NOTE: This function is used by RJIT worker, so it can be used parallelly with
-       Ruby's main thread. So functions touching things shared with main thread can't
-       be used, like `ALLOCV` that may trigger GC or `FindFreeChildSlot` that finds
-       a slot from shared memory without atomic locks. */
-    struct ChildRecord child;
-    char *cmd;
-    size_t len;
-    WCHAR *wcmd = NULL, *wprog = NULL;
-    HANDLE outHandle = NULL;
-
-    if (out_fd) {
-        outHandle = (HANDLE)rb_w32_get_osfhandle(out_fd);
-    }
-
-    len = join_argv(NULL, argv, FALSE, filecp(), 1);
-    cmd = alloca(sizeof(char) * len);
-    join_argv(cmd, argv, FALSE, filecp(), 1);
-
-    if (!(wcmd = mbstr_to_wstr(filecp(), cmd, -1, NULL))) {
-        errno = E2BIG;
-        return NULL;
-    }
-    if (!(wprog = mbstr_to_wstr(filecp(), abspath, -1, NULL))) {
-        errno = E2BIG;
-        return NULL;
-    }
-
-    if (!CreateChild(&child, wcmd, wprog, NULL, outHandle, outHandle, 0)) {
-        return NULL;
-    }
-
-    free(wcmd);
-    free(wprog);
-    return child.hProcess;
-}
-
 /* License: Artistic or GPL */
 static rb_pid_t
 w32_spawn(int mode, const char *cmd, const char *prog, UINT cp)
@@ -1537,7 +1455,8 @@ rb_w32_uspawn(int mode, const char *cmd, const char *prog)
 
 /* License: Artistic or GPL */
 static rb_pid_t
-w32_aspawn_flags(int mode, const char *prog, char *const *argv, DWORD flags, UINT cp)
+w32_spawn_process(int mode, const char *prog, char *const *argv,
+                  int in_fd, int out_fd, int err_fd, DWORD flags, UINT cp)
 {
     int c_switch = 0;
     size_t len;
@@ -1548,9 +1467,20 @@ w32_aspawn_flags(int mode, const char *prog, char *const *argv, DWORD flags, UIN
     int e = 0;
     rb_pid_t ret = -1;
     VALUE v = 0;
+    HANDLE in_handle = NULL, out_handle = NULL, err_handle = NULL;
 
     if (check_spawn_mode(mode)) return -1;
 
+    if (in_fd >= 0) {
+        in_handle = (HANDLE)rb_w32_get_osfhandle(in_fd);
+    }
+    if (out_fd >= 0) {
+        out_handle = (HANDLE)rb_w32_get_osfhandle(out_fd);
+    }
+    if (err_fd >= 0) {
+        err_handle = (HANDLE)rb_w32_get_osfhandle(err_fd);
+    }
+
     if (!prog) prog = argv[0];
     if ((shell = w32_getenv("COMSPEC", cp)) &&
         internal_cmd_match(prog, tmpnt = !is_command_com(shell))) {
@@ -1598,7 +1528,7 @@ w32_aspawn_flags(int mode, const char *prog, char *const *argv, DWORD flags, UIN
 
     if (!e) {
         struct ChildRecord *child = FindFreeChildSlot();
-        if (CreateChild(child, wcmd, wprog, NULL, NULL, NULL, flags)) {
+        if (CreateChild(child, wcmd, wprog, in_handle, out_handle, err_handle, flags)) {
             ret = child_result(child, mode);
         }
     }
@@ -1613,21 +1543,21 @@ rb_pid_t
 rb_w32_aspawn_flags(int mode, const char *prog, char *const *argv, DWORD flags)
 {
     /* assume ACP */
-    return w32_aspawn_flags(mode, prog, argv, flags, filecp());
+    return w32_spawn_process(mode, prog, argv, -1, -1, -1, flags, filecp());
 }
 
 /* License: Ruby's */
 rb_pid_t
 rb_w32_uaspawn_flags(int mode, const char *prog, char *const *argv, DWORD flags)
 {
-    return w32_aspawn_flags(mode, prog, argv, flags, CP_UTF8);
+    return w32_spawn_process(mode, prog, argv, -1, -1, -1, flags, CP_UTF8);
 }
 
 /* License: Ruby's */
 rb_pid_t
 rb_w32_aspawn(int mode, const char *prog, char *const *argv)
 {
-    return w32_aspawn_flags(mode, prog, argv, 0, filecp());
+    return w32_spawn_process(mode, prog, argv, -1, -1, -1, 0, filecp());
 }
 
 /* License: Ruby's */
@@ -1637,6 +1567,15 @@ rb_w32_uaspawn(int mode, const char *prog, char *const *argv)
     return rb_w32_uaspawn_flags(mode, prog, argv, 0);
 }
 
+/* License: Ruby's */
+rb_pid_t
+rb_w32_uspawn_process(int mode, const char *prog, char *const *argv,
+                      int in_fd, int out_fd, int err_fd, DWORD flags)
+{
+    return w32_spawn_process(mode, prog, argv, in_fd, out_fd, err_fd,
+                             flags, CP_UTF8);
+}
+
 /* License: Artistic or GPL */
 typedef struct _NtCmdLineElement {
     struct _NtCmdLineElement *next;
@@ -1926,7 +1865,7 @@ w32_cmdvector(const WCHAR *cmd, char ***vec, UINT cp, rb_encoding *enc)
             }
         }
 
-        curr = (NtCmdLineElement *)calloc(sizeof(NtCmdLineElement), 1);
+        curr = (NtCmdLineElement *)calloc(1, sizeof(NtCmdLineElement));
         if (!curr) goto do_nothing;
         curr->str = rb_w32_wstr_to_mbstr(cp, base, len, &curr->len);
         curr->flags |= NTMALLOC;
@@ -2001,28 +1940,6 @@ w32_cmdvector(const WCHAR *cmd, char ***vec, UINT cp, rb_encoding *enc)
 // UNIX compatible directory access functions for NT
 //
 
-typedef DWORD (WINAPI *get_final_path_func)(HANDLE, WCHAR*, DWORD, DWORD);
-static get_final_path_func get_final_path;
-
-static DWORD WINAPI
-get_final_path_fail(HANDLE f, WCHAR *buf, DWORD len, DWORD flag)
-{
-    return 0;
-}
-
-static DWORD WINAPI
-get_final_path_unknown(HANDLE f, WCHAR *buf, DWORD len, DWORD flag)
-{
-    /* Since Windows Vista and Windows Server 2008 */
-    get_final_path_func func = (get_final_path_func)
-        get_proc_address("kernel32", "GetFinalPathNameByHandleW", NULL);
-    if (!func) func = get_final_path_fail;
-    get_final_path = func;
-    return func(f, buf, len, flag);
-}
-
-static get_final_path_func get_final_path = get_final_path_unknown;
-
 /* License: Ruby's */
 /* TODO: better name */
 static HANDLE
@@ -2050,14 +1967,28 @@ open_special(const WCHAR *path, DWORD access, DWORD flags)
 
 static const WCHAR namespace_prefix[] = {L'\\', L'\\', L'?', L'\\'};
 
-enum {FINAL_PATH_MAX = PATH_MAX + numberof(namespace_prefix)};
+/* License: Ruby's */
+/* returns 0 on failure, otherwise stores tha path in `*pathptr` and
+ * returns the length of that path.  The path must be freed. */
+static DWORD
+get_handle_pathname(HANDLE fh, WCHAR **pathptr, DWORD add)
+{
+    DWORD len = GetFinalPathNameByHandleW(fh, NULL, 0, 0);
+    if (!len) return 0;
+    WCHAR *path = malloc((len + add + 1) * sizeof(WCHAR));
+    if (!(*pathptr = path)) return 0;
+    len = GetFinalPathNameByHandleW(fh, path, len + 1, 0);
+    if (!len) free(path);
+    return len;
+}
 
 /* License: Artistic or GPL */
 static HANDLE
 open_dir_handle(const WCHAR *filename, WIN32_FIND_DATAW *fd)
 {
     HANDLE fh;
-    WCHAR fullname[FINAL_PATH_MAX + rb_strlen_lit("\\*")];
+    int wildcard_len = rb_strlen_lit("\\*");
+    WCHAR *fullname = 0;
     WCHAR *p;
     int len = 0;
 
@@ -2067,21 +1998,18 @@ open_dir_handle(const WCHAR *filename, WIN32_FIND_DATAW *fd)
 
     fh = open_special(filename, 0, 0);
     if (fh != INVALID_HANDLE_VALUE) {
-        len = get_final_path(fh, fullname, FINAL_PATH_MAX, 0);
+        len = get_handle_pathname(fh, &fullname, wildcard_len);
         CloseHandle(fh);
-        if (len >= FINAL_PATH_MAX) {
-            errno = ENAMETOOLONG;
-            return INVALID_HANDLE_VALUE;
-        }
     }
     if (!len) {
         len = lstrlenW(filename);
-        if (len >= PATH_MAX) {
-            errno = ENAMETOOLONG;
-            return INVALID_HANDLE_VALUE;
-        }
+        fullname = malloc((len + wildcard_len + 1) * sizeof(WCHAR));
+        if (!fullname) return INVALID_HANDLE_VALUE;
         MEMCPY(fullname, filename, WCHAR, len);
     }
+    else {
+        RUBY_ASSERT(fullname);
+    }
     p = &fullname[len-1];
     if (!(isdirsep(*p) || *p == L':')) *++p = L'\\';
     *++p = L'*';
@@ -2094,6 +2022,7 @@ open_dir_handle(const WCHAR *filename, WIN32_FIND_DATAW *fd)
     if (fh == INVALID_HANDLE_VALUE) {
         errno = map_errno(GetLastError());
     }
+    free(fullname);
     return fh;
 }
 
@@ -2132,7 +2061,7 @@ w32_wopendir(const WCHAR *wpath)
     //
     // Get us a DIR structure
     //
-    p = calloc(sizeof(DIR), 1);
+    p = calloc(1, sizeof(DIR));
     if (p == NULL)
         return NULL;
 
@@ -2222,7 +2151,6 @@ rb_w32_wstr_to_mbstr(UINT cp, const WCHAR *wstr, int clen, long *plen)
 WCHAR *
 rb_w32_mbstr_to_wstr(UINT cp, const char *str, int clen, long *plen)
 {
-    /* This is used by RJIT worker. Do not trigger GC or call Ruby method here. */
     WCHAR *ptr;
     int len = MultiByteToWideChar(cp, 0, str, clen, NULL, 0);
     if (!(ptr = malloc(sizeof(WCHAR) * len))) return 0;
@@ -2472,7 +2400,7 @@ rb_w32_rewinddir(DIR *dirp)
 //
 
 /* License: Artistic or GPL */
-void
+int
 rb_w32_closedir(DIR *dirp)
 {
     if (dirp) {
@@ -2482,6 +2410,7 @@ rb_w32_closedir(DIR *dirp)
         free(dirp->bits);
         free(dirp);
     }
+    return 0;
 }
 
 #if RUBY_MSVCRT_VERSION >= 140
@@ -2591,9 +2520,70 @@ set_pioinfo_extra(void)
      * * https://bugs.ruby-lang.org/issues/18605
      */
     char *p = (char*)get_proc_address(UCRTBASE, "_isatty", NULL);
-    char *pend = p;
     /* _osfile(fh) & FDEV */
 
+#if defined(_M_ARM64) || defined(__aarch64__)
+#define IS_INSN(pc, name) ((*(pc) & name##_mask) == name##_id)
+    const int max_num_inst = 500;
+    uint32_t *start = (uint32_t*)p;
+    uint32_t *end_limit = (start + max_num_inst);
+    uint32_t *pc = start;
+
+    if (!p) {
+        fprintf(stderr, "_isatty proc not found in " UCRTBASE "\n");
+        _exit(1);
+    }
+
+    /* end of function */
+    const uint32_t ret_id = 0xd65f0000;
+    const uint32_t ret_mask = 0xfffffc1f;
+    for(; pc < end_limit; pc++) {
+        if (IS_INSN(pc, ret)) {
+            break;
+        }
+    }
+    if (pc == end_limit) {
+        fprintf(stderr, "end of _isatty not found in " UCRTBASE "\n");
+        _exit(1);
+    }
+
+    /* pioinfo instruction mark */
+    const uint32_t adrp_id = 0x90000000;
+    const uint32_t adrp_mask = 0x9f000000;
+    const uint32_t add_id = 0x11000000;
+    const uint32_t add_mask = 0x7fc00000;
+    for(; pc > start; pc--) {
+        if (IS_INSN(pc, adrp) && IS_INSN(pc + 1, add)) {
+            break;
+        }
+    }
+    if(pc == start) {
+        fprintf(stderr, "pioinfo mark not found in " UCRTBASE "\n");
+        _exit(1);
+    }
+
+    /* We now point to instructions that load address of __pioinfo:
+     * adrp	x8, 0x1801d8000
+     * add	x8, x8, #0xdb0
+     * https://devblogs.microsoft.com/oldnewthing/20220809-00/?p=106955
+     * The last adrp/add sequence before ret is what we are looking for.
+     */
+    const uint32_t adrp_insn = *pc;
+    const uint32_t adrp_immhi = (adrp_insn & 0x00ffffe0) >> 5;
+    const uint32_t adrp_immlo = (adrp_insn & 0x60000000) >> (5 + 19 + 5);
+    const int64_t  adrp_sign  = (adrp_insn & 0x00800000) ? ~0x001fffff : 0;
+    /* imm = SignExtend(immhi:immlo:Zeros(12), 64) */
+    const int64_t adrp_imm = (adrp_sign | (adrp_immhi << 2) | adrp_immlo) << 12;
+    /* base = PC64<63:12>:Zeros(12) */
+    const uint64_t adrp_base = (uint64_t)pc & 0xfffffffffffff000;
+
+    const uint32_t add_insn = *(pc + 1);
+    const uint64_t add_imm = (add_insn & 0x3ffc00) >> (5 + 5);
+
+    __pioinfo = (ioinfo**)(adrp_base + adrp_imm + add_imm);
+#else /* _M_ARM64 */
+    char *pend = p;
+
 # ifdef _WIN64
     int32_t rel;
     char *rip;
@@ -2611,15 +2601,21 @@ set_pioinfo_extra(void)
 # else /* x86 */
     /* pop ebp */
 #  define FUNCTION_BEFORE_RET_MARK "\x5d"
+    /* leave */
+#  define FUNCTION_BEFORE_RET_MARK_2 "\xc9"
 #  define FUNCTION_SKIP_BYTES 0
     /* mov eax,dword ptr [eax*4+100EB430h] */
 #  define PIOINFO_MARK "\x8B\x04\x85"
 # endif
     if (p) {
-        for (pend += 10; pend < p + 300; pend++) {
+        for (pend += 10; pend < p + 500; pend++) {
             // find end of function
-            if (memcmp(pend, FUNCTION_BEFORE_RET_MARK, sizeof(FUNCTION_BEFORE_RET_MARK) - 1) == 0 &&
-                (*(pend + (sizeof(FUNCTION_BEFORE_RET_MARK) - 1) + FUNCTION_SKIP_BYTES) & FUNCTION_RET) == FUNCTION_RET) {
+            if ((memcmp(pend, FUNCTION_BEFORE_RET_MARK, sizeof(FUNCTION_BEFORE_RET_MARK) - 1) == 0
+# ifdef FUNCTION_BEFORE_RET_MARK_2
+                || memcmp(pend, FUNCTION_BEFORE_RET_MARK_2, sizeof(FUNCTION_BEFORE_RET_MARK_2) - 1) == 0
+# endif
+                ) &&
+                *(pend + (sizeof(FUNCTION_BEFORE_RET_MARK) - 1) + FUNCTION_SKIP_BYTES) == (char)FUNCTION_RET) {
                 // search backwards from end of function
                 for (pend -= (sizeof(PIOINFO_MARK) - 1); pend > p; pend--) {
                     if (memcmp(pend, PIOINFO_MARK, sizeof(PIOINFO_MARK) - 1) == 0) {
@@ -2643,7 +2639,8 @@ set_pioinfo_extra(void)
 #else
     __pioinfo = *(ioinfo***)(p);
 #endif
-#endif
+#endif /* _M_ARM64 */
+#endif /* RUBY_MSVCRT_VERSION */
     int fd;
 
     fd = _open("NUL", O_RDONLY);
@@ -2808,11 +2805,11 @@ rb_w32_strerror(int e)
     DWORD source = 0;
     char *p;
 
-    if (e < 0 || e > sys_nerr) {
-        if (e < 0)
-            e = GetLastError();
+    if (e < 0)
+        strlcpy(buffer, "Unknown Error", sizeof(buffer));
+    else if (e > sys_nerr) {
 #if WSAEWOULDBLOCK != EWOULDBLOCK
-        else if (e >= EADDRINUSE && e <= EWOULDBLOCK) {
+        if (e >= EADDRINUSE && e <= EWOULDBLOCK) {
             static int s = -1;
             int i;
             if (s < 0)
@@ -4275,10 +4272,6 @@ str2guid(const char *str, GUID *guid)
         } Info;
     } NET_LUID;
 #endif
-typedef DWORD (WINAPI *cigl_t)(const GUID *, NET_LUID *);
-typedef DWORD (WINAPI *cilnA_t)(const NET_LUID *, char *, size_t);
-static cigl_t pConvertInterfaceGuidToLuid = (cigl_t)-1;
-static cilnA_t pConvertInterfaceLuidToNameA = (cilnA_t)-1;
 
 int
 getifaddrs(struct ifaddrs **ifap)
@@ -4301,15 +4294,6 @@ getifaddrs(struct ifaddrs **ifap)
         return -1;
     }
 
-    if (pConvertInterfaceGuidToLuid == (cigl_t)-1)
-        pConvertInterfaceGuidToLuid =
-            (cigl_t)get_proc_address("iphlpapi.dll",
-                                     "ConvertInterfaceGuidToLuid", NULL);
-    if (pConvertInterfaceLuidToNameA == (cilnA_t)-1)
-        pConvertInterfaceLuidToNameA =
-            (cilnA_t)get_proc_address("iphlpapi.dll",
-                                      "ConvertInterfaceLuidToNameA", NULL);
-
     for (prev = NULL, addr = root; addr; addr = addr->Next) {
         struct ifaddrs *ifa = ruby_xcalloc(1, sizeof(*ifa));
         char name[IFNAMSIZ];
@@ -4322,9 +4306,8 @@ getifaddrs(struct ifaddrs **ifap)
             *ifap = ifa;
 
         str2guid(addr->AdapterName, &guid);
-        if (pConvertInterfaceGuidToLuid && pConvertInterfaceLuidToNameA &&
-            pConvertInterfaceGuidToLuid(&guid, &luid) == NO_ERROR &&
-            pConvertInterfaceLuidToNameA(&luid, name, sizeof(name)) == NO_ERROR) {
+        if (ConvertInterfaceGuidToLuid(&guid, &luid) == NO_ERROR &&
+            ConvertInterfaceLuidToNameA(&luid, name, sizeof(name)) == NO_ERROR) {
             ifa->ifa_name = ruby_strdup(name);
         }
         else {
@@ -4741,28 +4724,6 @@ waitpid(rb_pid_t pid, int *stat_loc, int options)
 
 #include <sys/timeb.h>
 
-static int have_precisetime = -1;
-
-static void
-get_systemtime(FILETIME *ft)
-{
-    typedef void (WINAPI *get_time_func)(FILETIME *ft);
-    static get_time_func func = (get_time_func)-1;
-
-    if (func == (get_time_func)-1) {
-        /* GetSystemTimePreciseAsFileTime is available since Windows 8 and Windows Server 2012. */
-        func = (get_time_func)get_proc_address("kernel32", "GetSystemTimePreciseAsFileTime", NULL);
-        if (func == NULL) {
-            func = GetSystemTimeAsFileTime;
-            have_precisetime = 0;
-        }
-        else
-            have_precisetime = 1;
-    }
-    if (!ft) return;
-    func(ft);
-}
-
 /* License: Ruby's */
 /* split FILETIME value into UNIX time and sub-seconds in NT ticks */
 static time_t
@@ -4793,13 +4754,14 @@ gettimeofday(struct timeval *tv, struct timezone *tz)
     FILETIME ft;
     long subsec;
 
-    get_systemtime(&ft);
+    GetSystemTimePreciseAsFileTime(&ft);
     tv->tv_sec = filetime_split(&ft, &subsec);
     tv->tv_usec = subsec / 10;
 
     return 0;
 }
 
+#ifdef NEED_CLOCK_GETTIME
 /* License: Ruby's */
 int
 clock_gettime(clockid_t clock_id, struct timespec *sp)
@@ -4810,7 +4772,7 @@ clock_gettime(clockid_t clock_id, struct timespec *sp)
             FILETIME ft;
             long subsec;
 
-            get_systemtime(&ft);
+            GetSystemTimePreciseAsFileTime(&ft);
             sp->tv_sec = filetime_split(&ft, &subsec);
             sp->tv_nsec = subsec * 100;
             return 0;
@@ -4839,7 +4801,9 @@ clock_gettime(clockid_t clock_id, struct timespec *sp)
         return -1;
     }
 }
+#endif
 
+#ifdef NEED_CLOCK_GETRES
 /* License: Ruby's */
 int
 clock_getres(clockid_t clock_id, struct timespec *sp)
@@ -4867,6 +4831,7 @@ clock_getres(clockid_t clock_id, struct timespec *sp)
         return -1;
     }
 }
+#endif
 
 /* License: Ruby's */
 static char *
@@ -5314,21 +5279,8 @@ w32_symlink(UINT cp, const char *src, const char *link)
     BOOLEAN ret;
     int e;
 
-    typedef BOOLEAN (WINAPI *create_symbolic_link_func)(WCHAR*, WCHAR*, DWORD);
-    static create_symbolic_link_func create_symbolic_link =
-        (create_symbolic_link_func)-1;
     static DWORD create_flag = SYMBOLIC_LINK_FLAG_ALLOW_UNPRIVILEGED_CREATE;
 
-    if (create_symbolic_link == (create_symbolic_link_func)-1) {
-        /* Since Windows Vista and Windows Server 2008 */
-        create_symbolic_link = (create_symbolic_link_func)
-            get_proc_address("kernel32", "CreateSymbolicLinkW", NULL);
-    }
-    if (!create_symbolic_link) {
-        errno = ENOSYS;
-        return -1;
-    }
-
     if (!*link) {
         errno = ENOENT;
         return -1;
@@ -5348,13 +5300,13 @@ w32_symlink(UINT cp, const char *src, const char *link)
     atts = GetFileAttributesW(wsrc);
     if (atts != -1 && atts & FILE_ATTRIBUTE_DIRECTORY)
         flag = SYMBOLIC_LINK_FLAG_DIRECTORY;
-    ret = create_symbolic_link(wlink, wsrc, flag |= create_flag);
+    ret = CreateSymbolicLinkW(wlink, wsrc, flag |= create_flag);
     if (!ret &&
         (e = GetLastError()) == ERROR_INVALID_PARAMETER &&
         (flag & SYMBOLIC_LINK_FLAG_ALLOW_UNPRIVILEGED_CREATE)) {
         create_flag = 0;
         flag &= ~SYMBOLIC_LINK_FLAG_ALLOW_UNPRIVILEGED_CREATE;
-        ret = create_symbolic_link(wlink, wsrc, flag);
+        ret = CreateSymbolicLinkW(wlink, wsrc, flag);
         if (!ret) e = GetLastError();
     }
     ALLOCV_END(buf);
@@ -5649,23 +5601,10 @@ typedef struct {
 } FILE_ID_INFO;
 #endif
 
-static DWORD
+static BOOL
 get_ino(HANDLE h, FILE_ID_INFO *id)
 {
-    typedef BOOL (WINAPI *gfibhe_t)(HANDLE, int, void *, DWORD);
-    static gfibhe_t pGetFileInformationByHandleEx = (gfibhe_t)-1;
-
-    if (pGetFileInformationByHandleEx == (gfibhe_t)-1)
-        /* Since Windows Vista and Windows Server 2008 */
-        pGetFileInformationByHandleEx = (gfibhe_t)get_proc_address("kernel32", "GetFileInformationByHandleEx", NULL);
-
-    if (pGetFileInformationByHandleEx) {
-        if (pGetFileInformationByHandleEx(h, FileIdInfo, id, sizeof(*id)))
-            return 0;
-        else
-            return GetLastError();
-    }
-    return ERROR_INVALID_PARAMETER;
+    return GetFileInformationByHandleEx(h, FileIdInfo, id, sizeof(*id));
 }
 
 /* License: Ruby's */
@@ -5686,7 +5625,7 @@ stati128_handle(HANDLE h, struct stati128 *st)
         st->st_ctimensec = filetime_to_nsec(&info.ftCreationTime);
         st->st_nlink = info.nNumberOfLinks;
         attr = info.dwFileAttributes;
-        if (!get_ino(h, &fii)) {
+        if (get_ino(h, &fii)) {
             st->st_ino = *((unsigned __int64 *)&fii.FileId);
             st->st_inohigh = *((__int64 *)&fii.FileId + 1);
         }
@@ -5713,14 +5652,10 @@ filetime_to_unixtime(const FILETIME *ft)
 static long
 filetime_to_nsec(const FILETIME *ft)
 {
-    if (have_precisetime <= 0)
-        return 0;
-    else {
-        ULARGE_INTEGER tmp;
-        tmp.LowPart = ft->dwLowDateTime;
-        tmp.HighPart = ft->dwHighDateTime;
-        return (long)(tmp.QuadPart % 10000000) * 100;
-    }
+    ULARGE_INTEGER tmp;
+    tmp.LowPart = ft->dwLowDateTime;
+    tmp.HighPart = ft->dwHighDateTime;
+    return (long)(tmp.QuadPart % 10000000) * 100;
 }
 
 /* License: Ruby's */
@@ -5778,7 +5713,6 @@ check_valid_dir(const WCHAR *path)
     WIN32_FIND_DATAW fd;
     HANDLE fh;
     WCHAR full[PATH_MAX];
-    WCHAR *dmy;
     WCHAR *p, *q;
 
     /* GetFileAttributes() determines "..." as directory. */
@@ -5794,12 +5728,20 @@ check_valid_dir(const WCHAR *path)
 
     /* if the specified path is the root of a drive and the drive is empty, */
     /* FindFirstFile() returns INVALID_HANDLE_VALUE. */
-    if (!GetFullPathNameW(path, sizeof(full) / sizeof(WCHAR), full, &dmy)) {
+    DWORD len = GetFullPathNameW(path, numberof(full), full, NULL);
+    if (len >= numberof(full)) {
+        WCHAR *fullpath = malloc(len * sizeof(WCHAR));
+        if (!fullpath) return -1;
+        len = GetFullPathNameW(path, len, fullpath, NULL);
+        if (len == 3) MEMCPY(full, fullpath, WCHAR, len+1);
+        free(fullpath);
+    }
+    if (!len) {
         errno = map_errno(GetLastError());
         return -1;
     }
-    if (full[1] == L':' && !full[3] && GetDriveTypeW(full) != DRIVE_NO_ROOT_DIR)
-        return 0;
+    if (len == 3 && full[1] == L':' && GetDriveTypeW(full) != DRIVE_NO_ROOT_DIR)
+        return 0;               /* x:\ only */
 
     fh = open_dir_handle(path, &fd);
     if (fh == INVALID_HANDLE_VALUE)
@@ -5838,8 +5780,11 @@ stat_by_find(const WCHAR *path, struct stati128 *st)
 static int
 path_drive(const WCHAR *path)
 {
-    return (iswalpha(path[0]) && path[1] == L':') ?
-        towupper(path[0]) - L'A' : _getdrive() - 1;
+    if (path[0] && path[1] == L':') {
+        if (iswalpha(path[0])) return towupper(path[0]) - L'A';
+        return (int)path[0];
+    }
+    return _getdrive() - 1;
 }
 
 /* License: Ruby's */
@@ -5848,7 +5793,7 @@ winnt_stat(const WCHAR *path, struct stati128 *st, BOOL lstat)
 {
     DWORD flags = lstat ? FILE_FLAG_OPEN_REPARSE_POINT : 0;
     HANDLE f;
-    WCHAR finalname[PATH_MAX];
+    WCHAR *finalname = 0;
     int open_error;
 
     memset(st, 0, sizeof(*st));
@@ -5860,8 +5805,8 @@ winnt_stat(const WCHAR *path, struct stati128 *st, BOOL lstat)
         DWORD e;
 
         f = open_special(path, 0, FILE_FLAG_OPEN_REPARSE_POINT);
-        e = GetFileInformationByHandleEx( f, FileAttributeTagInfo,
-                &attr_info, sizeof(attr_info));
+        e = GetFileInformationByHandleEx(f, FileAttributeTagInfo,
+                                         &attr_info, sizeof(attr_info));
         if (!e || attr_info.ReparseTag != IO_REPARSE_TAG_AF_UNIX) {
             CloseHandle(f);
             f = INVALID_HANDLE_VALUE;
@@ -5869,7 +5814,6 @@ winnt_stat(const WCHAR *path, struct stati128 *st, BOOL lstat)
     }
     if (f != INVALID_HANDLE_VALUE) {
         DWORD attr = stati128_handle(f, st);
-        const DWORD len = get_final_path(f, finalname, numberof(finalname), 0);
         unsigned mode = 0;
         switch (GetFileType(f)) {
           case FILE_TYPE_CHAR:
@@ -5879,12 +5823,15 @@ winnt_stat(const WCHAR *path, struct stati128 *st, BOOL lstat)
             mode = S_IFIFO;
             break;
           default:
+            if (attr & FILE_ATTRIBUTE_DIRECTORY) {
+                if (check_valid_dir(path)) return -1;
+            }
             if (attr & FILE_ATTRIBUTE_REPARSE_POINT) {
                 FILE_ATTRIBUTE_TAG_INFO attr_info;
                 DWORD e;
 
-                e = GetFileInformationByHandleEx( f, FileAttributeTagInfo,
-                        &attr_info, sizeof(attr_info));
+                e = GetFileInformationByHandleEx(f, FileAttributeTagInfo,
+                                                 &attr_info, sizeof(attr_info));
                 if (e && attr_info.ReparseTag == IO_REPARSE_TAG_AF_UNIX) {
                     st->st_size = 0;
                     mode |= S_IFSOCK;
@@ -5899,13 +5846,10 @@ winnt_stat(const WCHAR *path, struct stati128 *st, BOOL lstat)
                 }
             }
         }
+        const DWORD len = get_handle_pathname(f, &finalname, 0);
         CloseHandle(f);
-        if (attr & FILE_ATTRIBUTE_DIRECTORY) {
-            if (check_valid_dir(path)) return -1;
-        }
         st->st_mode = fileattr_to_unixmode(attr, path, mode);
         if (len) {
-            finalname[min(len, numberof(finalname)-1)] = L'\0';
             path = finalname;
             if (wcsncmp(path, namespace_prefix, numberof(namespace_prefix)) == 0)
                 path += numberof(namespace_prefix);
@@ -5922,6 +5866,7 @@ winnt_stat(const WCHAR *path, struct stati128 *st, BOOL lstat)
     }
 
     st->st_dev = st->st_rdev = path_drive(path);
+    if (finalname) free(finalname);
 
     return 0;
 }
@@ -7651,7 +7596,7 @@ wutimensat(int dirfd, const WCHAR *path, const struct timespec *times, int flags
         }
     }
     else {
-        get_systemtime(&atime);
+        GetSystemTimePreciseAsFileTime(&atime);
         mtime = atime;
     }
 
@@ -7945,11 +7890,6 @@ rb_w32_uchmod(const char *path, int mode)
 int
 fchmod(int fd, int mode)
 {
-    typedef BOOL (WINAPI *set_file_information_by_handle_func)
-        (HANDLE, int, void*, DWORD);
-    static set_file_information_by_handle_func set_file_info =
-        (set_file_information_by_handle_func)-1;
-
     /* from winbase.h of the mingw-w64 runtime package. */
     struct {
         LARGE_INTEGER CreationTime;
@@ -7960,23 +7900,9 @@ fchmod(int fd, int mode)
     } info = {{{0}}, {{0}}, {{0}},}; /* fields with 0 are unchanged */
     HANDLE h = (HANDLE)_get_osfhandle(fd);
 
-    if (h == INVALID_HANDLE_VALUE) {
-        errno = EBADF;
-        return -1;
-    }
-    if (set_file_info == (set_file_information_by_handle_func)-1) {
-        /* Since Windows Vista and Windows Server 2008 */
-        set_file_info = (set_file_information_by_handle_func)
-            get_proc_address("kernel32", "SetFileInformationByHandle", NULL);
-    }
-    if (!set_file_info) {
-        errno = ENOSYS;
-        return -1;
-    }
-
     info.FileAttributes = FILE_ATTRIBUTE_NORMAL;
     if (!(mode & 0200)) info.FileAttributes |= FILE_ATTRIBUTE_READONLY;
-    if (!set_file_info(h, 0, &info, sizeof(info))) {
+    if (!SetFileInformationByHandle(h, 0, &info, sizeof(info))) {
         errno = map_errno(GetLastError());
         return -1;
     }
@@ -8031,33 +7957,14 @@ signbit(double x)
 const char * WSAAPI
 rb_w32_inet_ntop(int af, const void *addr, char *numaddr, size_t numaddr_len)
 {
-    typedef char *(WSAAPI inet_ntop_t)(int, void *, char *, size_t);
-    static inet_ntop_t *pInetNtop = (inet_ntop_t *)-1;
-    if (pInetNtop == (inet_ntop_t *)-1)
-        pInetNtop = (inet_ntop_t *)get_proc_address("ws2_32", "inet_ntop", NULL);
-    if (pInetNtop) {
-        return pInetNtop(af, (void *)addr, numaddr, numaddr_len);
-    }
-    else {
-        struct in_addr in;
-        memcpy(&in.s_addr, addr, sizeof(in.s_addr));
-        snprintf(numaddr, numaddr_len, "%s", inet_ntoa(in));
-    }
-    return numaddr;
+    return (inet_ntop)(af, (void *)addr, numaddr, numaddr_len);
 }
 
 /* License: Ruby's */
 int WSAAPI
 rb_w32_inet_pton(int af, const char *src, void *dst)
 {
-    typedef int (WSAAPI inet_pton_t)(int, const char*, void *);
-    static inet_pton_t *pInetPton = (inet_pton_t *)-1;
-    if (pInetPton == (inet_pton_t *)-1)
-        pInetPton = (inet_pton_t *)get_proc_address("ws2_32", "inet_pton", NULL);
-    if (pInetPton) {
-        return pInetPton(af, src, dst);
-    }
-    return 0;
+    return (inet_pton)(af, src, dst);
 }
 
 /* License: Ruby's */
@@ -8285,14 +8192,12 @@ w32_io_info(VALUE *file, w32_io_info_t *st)
         ret = f;
     }
     if (GetFileType(f) == FILE_TYPE_DISK) {
-        DWORD err;
         ZeroMemory(st, sizeof(*st));
-        err = get_ino(f, &st->info.fii);
-        if (!err) {
+        if (get_ino(f, &st->info.fii)) {
             st->file_id_p = TRUE;
             return ret;
         }
-        else if (err != ERROR_INVALID_PARAMETER) {
+        else if (GetLastError() != ERROR_INVALID_PARAMETER) {
             CloseHandle(f);
             return INVALID_HANDLE_VALUE;
         }
diff --git a/win32/winmain.c b/win32/winmain.c
index 467a835d290fda..a9f38099dba5d3 100644
--- a/win32/winmain.c
+++ b/win32/winmain.c
@@ -1,10 +1,10 @@
 #include <windows.h>
 #include <stdio.h>
 
-extern int main(int, char**);
+extern int wmain(int, WCHAR**);
 
 int WINAPI
 WinMain(HINSTANCE current, HINSTANCE prev, LPSTR cmdline, int showcmd)
 {
-    return main(0, NULL);
+    return wmain(0, NULL);
 }
diff --git a/yarp/api_pack.c b/yarp/api_pack.c
deleted file mode 100644
index 7f0440970e3514..00000000000000
--- a/yarp/api_pack.c
+++ /dev/null
@@ -1,256 +0,0 @@
-#include "yarp/extension.h"
-
-static VALUE rb_cYARP;
-static VALUE rb_cYARPPack;
-static VALUE rb_cYARPPackDirective;
-static VALUE rb_cYARPPackFormat;
-
-static VALUE v3_2_0_symbol;
-static VALUE pack_symbol;
-static VALUE unpack_symbol;
-
-#if SIZEOF_UINT64_T == SIZEOF_LONG_LONG
-# define UINT64T2NUM(x) ULL2NUM(x)
-# define NUM2UINT64T(x) (uint64_t)NUM2ULL(x)
-#elif SIZEOF_UINT64_T == SIZEOF_LONG
-# define UINT64T2NUM(x) ULONG2NUM(x)
-# define NUM2UINT64T(x) (uint64_t)NUM2ULONG(x)
-#else
-// error No uint64_t conversion
-#endif
-
-static VALUE
-pack_type_to_symbol(yp_pack_type type) {
-    switch (type) {
-        case YP_PACK_SPACE:
-            return ID2SYM(rb_intern("SPACE"));
-        case YP_PACK_COMMENT:
-            return ID2SYM(rb_intern("COMMENT"));
-        case YP_PACK_INTEGER:
-            return ID2SYM(rb_intern("INTEGER"));
-        case YP_PACK_UTF8:
-            return ID2SYM(rb_intern("UTF8"));
-        case YP_PACK_BER:
-            return ID2SYM(rb_intern("BER"));
-        case YP_PACK_FLOAT:
-            return ID2SYM(rb_intern("FLOAT"));
-        case YP_PACK_STRING_SPACE_PADDED:
-            return ID2SYM(rb_intern("STRING_SPACE_PADDED"));
-        case YP_PACK_STRING_NULL_PADDED:
-            return ID2SYM(rb_intern("STRING_NULL_PADDED"));
-        case YP_PACK_STRING_NULL_TERMINATED:
-            return ID2SYM(rb_intern("STRING_NULL_TERMINATED"));
-        case YP_PACK_STRING_MSB:
-            return ID2SYM(rb_intern("STRING_MSB"));
-        case YP_PACK_STRING_LSB:
-            return ID2SYM(rb_intern("STRING_LSB"));
-        case YP_PACK_STRING_HEX_HIGH:
-            return ID2SYM(rb_intern("STRING_HEX_HIGH"));
-        case YP_PACK_STRING_HEX_LOW:
-            return ID2SYM(rb_intern("STRING_HEX_LOW"));
-        case YP_PACK_STRING_UU:
-            return ID2SYM(rb_intern("STRING_UU"));
-        case YP_PACK_STRING_MIME:
-            return ID2SYM(rb_intern("STRING_MIME"));
-        case YP_PACK_STRING_BASE64:
-            return ID2SYM(rb_intern("STRING_BASE64"));
-        case YP_PACK_STRING_FIXED:
-            return ID2SYM(rb_intern("STRING_FIXED"));
-        case YP_PACK_STRING_POINTER:
-            return ID2SYM(rb_intern("STRING_POINTER"));
-        case YP_PACK_MOVE:
-            return ID2SYM(rb_intern("MOVE"));
-        case YP_PACK_BACK:
-            return ID2SYM(rb_intern("BACK"));
-        case YP_PACK_NULL:
-            return ID2SYM(rb_intern("NULL"));
-        default:
-            return Qnil;
-    }
-}
-
-static VALUE
-pack_signed_to_symbol(yp_pack_signed signed_type) {
-    switch (signed_type) {
-        case YP_PACK_UNSIGNED:
-            return ID2SYM(rb_intern("UNSIGNED"));
-        case YP_PACK_SIGNED:
-            return ID2SYM(rb_intern("SIGNED"));
-        case YP_PACK_SIGNED_NA:
-            return ID2SYM(rb_intern("SIGNED_NA"));
-        default:
-            return Qnil;
-    }
-}
-
-static VALUE
-pack_endian_to_symbol(yp_pack_endian endian) {
-    switch (endian) {
-        case YP_PACK_AGNOSTIC_ENDIAN:
-            return ID2SYM(rb_intern("AGNOSTIC_ENDIAN"));
-        case YP_PACK_LITTLE_ENDIAN:
-            return ID2SYM(rb_intern("LITTLE_ENDIAN"));
-        case YP_PACK_BIG_ENDIAN:
-            return ID2SYM(rb_intern("BIG_ENDIAN"));
-        case YP_PACK_NATIVE_ENDIAN:
-            return ID2SYM(rb_intern("NATIVE_ENDIAN"));
-        case YP_PACK_ENDIAN_NA:
-            return ID2SYM(rb_intern("ENDIAN_NA"));
-        default:
-            return Qnil;
-    }
-}
-
-static VALUE
-pack_size_to_symbol(yp_pack_size size) {
-    switch (size) {
-        case YP_PACK_SIZE_SHORT:
-            return ID2SYM(rb_intern("SIZE_SHORT"));
-        case YP_PACK_SIZE_INT:
-            return ID2SYM(rb_intern("SIZE_INT"));
-        case YP_PACK_SIZE_LONG:
-            return ID2SYM(rb_intern("SIZE_LONG"));
-        case YP_PACK_SIZE_LONG_LONG:
-            return ID2SYM(rb_intern("SIZE_LONG_LONG"));
-        case YP_PACK_SIZE_8:
-            return ID2SYM(rb_intern("SIZE_8"));
-        case YP_PACK_SIZE_16:
-            return ID2SYM(rb_intern("SIZE_16"));
-        case YP_PACK_SIZE_32:
-            return ID2SYM(rb_intern("SIZE_32"));
-        case YP_PACK_SIZE_64:
-            return ID2SYM(rb_intern("SIZE_64"));
-        case YP_PACK_SIZE_P:
-            return ID2SYM(rb_intern("SIZE_P"));
-        case YP_PACK_SIZE_NA:
-            return ID2SYM(rb_intern("SIZE_NA"));
-        default:
-            return Qnil;
-    }
-}
-
-static VALUE
-pack_length_type_to_symbol(yp_pack_length_type length_type) {
-    switch (length_type) {
-        case YP_PACK_LENGTH_FIXED:
-            return ID2SYM(rb_intern("LENGTH_FIXED"));
-        case YP_PACK_LENGTH_MAX:
-            return ID2SYM(rb_intern("LENGTH_MAX"));
-        case YP_PACK_LENGTH_RELATIVE:
-            return ID2SYM(rb_intern("LENGTH_RELATIVE"));
-        case YP_PACK_LENGTH_NA:
-            return ID2SYM(rb_intern("LENGTH_NA"));
-        default:
-            return Qnil;
-    }
-}
-
-static VALUE
-pack_encoding_to_ruby(yp_pack_encoding encoding) {
-    int index;
-    switch (encoding) {
-        case YP_PACK_ENCODING_ASCII_8BIT:
-            index = rb_ascii8bit_encindex();
-            break;
-        case YP_PACK_ENCODING_US_ASCII:
-            index = rb_usascii_encindex();
-            break;
-        case YP_PACK_ENCODING_UTF_8:
-            index = rb_utf8_encindex();
-            break;
-        default:
-            return Qnil;
-    }
-    return rb_enc_from_encoding(rb_enc_from_index(index));
-}
-
-static VALUE
-pack_parse(VALUE self, VALUE version_symbol, VALUE variant_symbol, VALUE format_string) {
-    if (version_symbol != v3_2_0_symbol) {
-        rb_raise(rb_eArgError, "invalid version");
-    }
-
-    yp_pack_variant variant;
-    if (variant_symbol == pack_symbol) {
-        variant = YP_PACK_VARIANT_PACK;
-    } else if (variant_symbol == unpack_symbol) {
-        variant = YP_PACK_VARIANT_UNPACK;
-    } else {
-        rb_raise(rb_eArgError, "invalid variant");
-    }
-
-    StringValue(format_string);
-
-    const char *format = RSTRING_PTR(format_string);
-    const char *format_end = format + RSTRING_LEN(format_string);
-    yp_pack_encoding encoding = YP_PACK_ENCODING_START;
-
-    VALUE directives_array = rb_ary_new();
-
-    while (format < format_end) {
-        yp_pack_type type;
-        yp_pack_signed signed_type;
-        yp_pack_endian endian;
-        yp_pack_size size;
-        yp_pack_length_type length_type;
-        uint64_t length;
-
-        const char *directive_start = format;
-
-        yp_pack_result parse_result = yp_pack_parse(variant, &format, format_end, &type, &signed_type, &endian,
-                                                    &size, &length_type, &length, &encoding);
-
-        const char *directive_end = format;
-
-        switch (parse_result) {
-            case YP_PACK_OK:
-                break;
-            case YP_PACK_ERROR_UNSUPPORTED_DIRECTIVE:
-                rb_raise(rb_eArgError, "unsupported directive");
-            case YP_PACK_ERROR_UNKNOWN_DIRECTIVE:
-                rb_raise(rb_eArgError, "unsupported directive");
-            case YP_PACK_ERROR_LENGTH_TOO_BIG:
-                rb_raise(rb_eRangeError, "pack length too big");
-            case YP_PACK_ERROR_BANG_NOT_ALLOWED:
-                rb_raise(rb_eRangeError, "bang not allowed");
-            case YP_PACK_ERROR_DOUBLE_ENDIAN:
-                rb_raise(rb_eRangeError, "double endian");
-            default:
-                rb_bug("parse result");
-        }
-
-        if (type == YP_PACK_END) {
-            break;
-        }
-
-        VALUE directive_args[9] = { version_symbol,
-                                    variant_symbol,
-                                    rb_usascii_str_new(directive_start, directive_end - directive_start),
-                                    pack_type_to_symbol(type),
-                                    pack_signed_to_symbol(signed_type),
-                                    pack_endian_to_symbol(endian),
-                                    pack_size_to_symbol(size),
-                                    pack_length_type_to_symbol(length_type),
-                                    UINT64T2NUM(length) };
-
-        rb_ary_push(directives_array, rb_class_new_instance(9, directive_args, rb_cYARPPackDirective));
-    }
-
-    VALUE format_args[2];
-    format_args[0] = directives_array;
-    format_args[1] = pack_encoding_to_ruby(encoding);
-    return rb_class_new_instance(2, format_args, rb_cYARPPackFormat);
-}
-
-void
-Init_yarp_pack(void) {
-    rb_cYARP = rb_define_module("YARP");
-    rb_cYARPPack = rb_define_module_under(rb_cYARP, "Pack");
-    rb_cYARPPackDirective = rb_define_class_under(rb_cYARPPack, "Directive", rb_cObject);
-    rb_cYARPPackFormat = rb_define_class_under(rb_cYARPPack, "Format", rb_cObject);
-    rb_define_singleton_method(rb_cYARPPack, "parse", pack_parse, 3);
-
-    v3_2_0_symbol = ID2SYM(rb_intern("v3_2_0"));
-    pack_symbol = ID2SYM(rb_intern("pack"));
-    unpack_symbol = ID2SYM(rb_intern("unpack"));
-}
diff --git a/yarp/config.yml b/yarp/config.yml
deleted file mode 100644
index 5ccdabab16cda9..00000000000000
--- a/yarp/config.yml
+++ /dev/null
@@ -1,2361 +0,0 @@
-tokens:
-  - name: EOF
-    value: 1
-    comment: final token in the file
-  - name: MISSING
-    comment: "a token that was expected but not found"
-  - name: NOT_PROVIDED
-    comment: "a token that was not present but it is okay"
-  - name: AMPERSAND
-    comment: "&"
-  - name: AMPERSAND_AMPERSAND
-    comment: "&&"
-  - name: AMPERSAND_AMPERSAND_EQUAL
-    comment: "&&="
-  - name: AMPERSAND_DOT
-    comment: "&."
-  - name: AMPERSAND_EQUAL
-    comment: "&="
-  - name: BACKTICK
-    comment: "`"
-  - name: BACK_REFERENCE
-    comment: "a back reference"
-  - name: BANG
-    comment: "! or !@"
-  - name: BANG_EQUAL
-    comment: "!="
-  - name: BANG_TILDE
-    comment: "!~"
-  - name: BRACE_LEFT
-    comment: "{"
-  - name: BRACE_RIGHT
-    comment: "}"
-  - name: BRACKET_LEFT
-    comment: "["
-  - name: BRACKET_LEFT_ARRAY
-    comment: "[ for the beginning of an array"
-  - name: BRACKET_LEFT_RIGHT
-    comment: "[]"
-  - name: BRACKET_LEFT_RIGHT_EQUAL
-    comment: "[]="
-  - name: BRACKET_RIGHT
-    comment: "]"
-  - name: CARET
-    comment: "^"
-  - name: CARET_EQUAL
-    comment: "^="
-  - name: CHARACTER_LITERAL
-    comment: "a character literal"
-  - name: CLASS_VARIABLE
-    comment: "a class variable"
-  - name: COLON
-    comment: ":"
-  - name: COLON_COLON
-    comment: "::"
-  - name: COMMA
-    comment: ","
-  - name: COMMENT
-    comment: "a comment"
-  - name: CONSTANT
-    comment: "a constant"
-  - name: DOT
-    comment: "."
-  - name: DOT_DOT
-    comment: ".."
-  - name: DOT_DOT_DOT
-    comment: "..."
-  - name: EMBDOC_BEGIN
-    comment: "=begin"
-  - name: EMBDOC_END
-    comment: "=end"
-  - name: EMBDOC_LINE
-    comment: "a line inside of embedded documentation"
-  - name: EMBEXPR_BEGIN
-    comment: "#{"
-  - name: EMBEXPR_END
-    comment: "}"
-  - name: EMBVAR
-    comment: "#"
-  - name: EQUAL
-    comment: "="
-  - name: EQUAL_EQUAL
-    comment: "=="
-  - name: EQUAL_EQUAL_EQUAL
-    comment: "==="
-  - name: EQUAL_GREATER
-    comment: "=>"
-  - name: EQUAL_TILDE
-    comment: "=~"
-  - name: FLOAT
-    comment: "a floating point number"
-  - name: FLOAT_IMAGINARY
-    comment: "a floating pointer number with an imaginary suffix"
-  - name: FLOAT_RATIONAL
-    comment: "a floating pointer number with a rational suffix"
-  - name: FLOAT_RATIONAL_IMAGINARY
-    comment: "a floating pointer number with a rational and imaginary suffix"
-  - name: GLOBAL_VARIABLE
-    comment: "a global variable"
-  - name: GREATER
-    comment: ">"
-  - name: GREATER_EQUAL
-    comment: ">="
-  - name: GREATER_GREATER
-    comment: ">>"
-  - name: GREATER_GREATER_EQUAL
-    comment: ">>="
-  - name: HEREDOC_END
-    comment: "the end of a heredoc"
-  - name: HEREDOC_START
-    comment: "the start of a heredoc"
-  - name: IDENTIFIER
-    comment: "an identifier"
-  - name: IGNORED_NEWLINE
-    comment: "an ignored newline"
-  - name: INSTANCE_VARIABLE
-    comment: "an instance variable"
-  - name: INTEGER
-    comment: "an integer (any base)"
-  - name: INTEGER_IMAGINARY
-    comment: "an integer with an imaginary suffix"
-  - name: INTEGER_RATIONAL
-    comment: "an integer with a rational suffix"
-  - name: INTEGER_RATIONAL_IMAGINARY
-    comment: "an integer with a rational and imaginary suffix"
-  - name: KEYWORD_ALIAS
-    comment: "alias"
-  - name: KEYWORD_AND
-    comment: "and"
-  - name: KEYWORD_BEGIN
-    comment: "begin"
-  - name: KEYWORD_BEGIN_UPCASE
-    comment: "BEGIN"
-  - name: KEYWORD_BREAK
-    comment: "break"
-  - name: KEYWORD_CASE
-    comment: "case"
-  - name: KEYWORD_CLASS
-    comment: "class"
-  - name: KEYWORD_DEF
-    comment: "def"
-  - name: KEYWORD_DEFINED
-    comment: "defined?"
-  - name: KEYWORD_DO
-    comment: "do"
-  - name: KEYWORD_DO_LOOP
-    comment: "do keyword for a predicate in a while, until, or for loop"
-  - name: KEYWORD_ELSE
-    comment: "else"
-  - name: KEYWORD_ELSIF
-    comment: "elsif"
-  - name: KEYWORD_END
-    comment: "end"
-  - name: KEYWORD_END_UPCASE
-    comment: "END"
-  - name: KEYWORD_ENSURE
-    comment: "ensure"
-  - name: KEYWORD_FALSE
-    comment: "false"
-  - name: KEYWORD_FOR
-    comment: "for"
-  - name: KEYWORD_IF
-    comment: "if"
-  - name: KEYWORD_IF_MODIFIER
-    comment: "if in the modifier form"
-  - name: KEYWORD_IN
-    comment: "in"
-  - name: KEYWORD_MODULE
-    comment: "module"
-  - name: KEYWORD_NEXT
-    comment: "next"
-  - name: KEYWORD_NIL
-    comment: "nil"
-  - name: KEYWORD_NOT
-    comment: "not"
-  - name: KEYWORD_OR
-    comment: "or"
-  - name: KEYWORD_REDO
-    comment: "redo"
-  - name: KEYWORD_RESCUE
-    comment: "rescue"
-  - name: KEYWORD_RESCUE_MODIFIER
-    comment: "rescue in the modifier form"
-  - name: KEYWORD_RETRY
-    comment: "retry"
-  - name: KEYWORD_RETURN
-    comment: "return"
-  - name: KEYWORD_SELF
-    comment: "self"
-  - name: KEYWORD_SUPER
-    comment: "super"
-  - name: KEYWORD_THEN
-    comment: "then"
-  - name: KEYWORD_TRUE
-    comment: "true"
-  - name: KEYWORD_UNDEF
-    comment: "undef"
-  - name: KEYWORD_UNLESS
-    comment: "unless"
-  - name: KEYWORD_UNLESS_MODIFIER
-    comment: "unless in the modifier form"
-  - name: KEYWORD_UNTIL
-    comment: "until"
-  - name: KEYWORD_UNTIL_MODIFIER
-    comment: "until in the modifier form"
-  - name: KEYWORD_WHEN
-    comment: "when"
-  - name: KEYWORD_WHILE
-    comment: "while"
-  - name: KEYWORD_WHILE_MODIFIER
-    comment: "while in the modifier form"
-  - name: KEYWORD_YIELD
-    comment: "yield"
-  - name: KEYWORD___ENCODING__
-    comment: "__ENCODING__"
-  - name: KEYWORD___FILE__
-    comment: "__FILE__"
-  - name: KEYWORD___LINE__
-    comment: "__LINE__"
-  - name: LABEL
-    comment: "a label"
-  - name: LABEL_END
-    comment: "the end of a label"
-  - name: LAMBDA_BEGIN
-    comment: "{"
-  - name: LESS
-    comment: "<"
-  - name: LESS_EQUAL
-    comment: "<="
-  - name: LESS_EQUAL_GREATER
-    comment: "<=>"
-  - name: LESS_LESS
-    comment: "<<"
-  - name: LESS_LESS_EQUAL
-    comment: "<<="
-  - name: MINUS
-    comment: "-"
-  - name: MINUS_EQUAL
-    comment: "-="
-  - name: MINUS_GREATER
-    comment: "->"
-  - name: NEWLINE
-    comment: "a newline character outside of other tokens"
-  - name: NUMBERED_REFERENCE
-    comment: "a numbered reference to a capture group in the previous regular expression match"
-  - name: PARENTHESIS_LEFT
-    comment: "("
-  - name: PARENTHESIS_LEFT_PARENTHESES
-    comment: "( for a parentheses node"
-  - name: PARENTHESIS_RIGHT
-    comment: ")"
-  - name: PERCENT
-    comment: "%"
-  - name: PERCENT_EQUAL
-    comment: "%="
-  - name: PERCENT_LOWER_I
-    comment: "%i"
-  - name: PERCENT_LOWER_W
-    comment: "%w"
-  - name: PERCENT_LOWER_X
-    comment: "%x"
-  - name: PERCENT_UPPER_I
-    comment: "%I"
-  - name: PERCENT_UPPER_W
-    comment: "%W"
-  - name: PIPE
-    comment: "|"
-  - name: PIPE_EQUAL
-    comment: "|="
-  - name: PIPE_PIPE
-    comment: "||"
-  - name: PIPE_PIPE_EQUAL
-    comment: "||="
-  - name: PLUS
-    comment: "+"
-  - name: PLUS_EQUAL
-    comment: "+="
-  - name: QUESTION_MARK
-    comment: "?"
-  - name: REGEXP_BEGIN
-    comment: "the beginning of a regular expression"
-  - name: REGEXP_END
-    comment: "the end of a regular expression"
-  - name: SEMICOLON
-    comment: ";"
-  - name: SLASH
-    comment: "/"
-  - name: SLASH_EQUAL
-    comment: "/="
-  - name: STAR
-    comment: "*"
-  - name: STAR_EQUAL
-    comment: "*="
-  - name: STAR_STAR
-    comment: "**"
-  - name: STAR_STAR_EQUAL
-    comment: "**="
-  - name: STRING_BEGIN
-    comment: "the beginning of a string"
-  - name: STRING_CONTENT
-    comment: "the contents of a string"
-  - name: STRING_END
-    comment: "the end of a string"
-  - name: SYMBOL_BEGIN
-    comment: "the beginning of a symbol"
-  - name: TILDE
-    comment: "~ or ~@"
-  - name: UAMPERSAND
-    comment: "unary &"
-  - name: UCOLON_COLON
-    comment: "unary ::"
-  - name: UDOT_DOT
-    comment: "unary .."
-  - name: UDOT_DOT_DOT
-    comment: "unary ..."
-  - name: UMINUS
-    comment: "-@"
-  - name: UMINUS_NUM
-    comment: "-@ for a number"
-  - name: UPLUS
-    comment: "+@"
-  - name: USTAR
-    comment: "unary *"
-  - name: USTAR_STAR
-    comment: "unary **"
-  - name: WORDS_SEP
-    comment: "a separator between words in a list"
-  - name: __END__
-    comment: "marker for the point in the file at which the parser should stop"
-flags:
-  - name: CallNodeFlags
-    values:
-      - name: SAFE_NAVIGATION
-        comment: "&. operator"
-      - name: VARIABLE_CALL
-        comment: "a call that could have been a local variable"
-  - name: LoopFlags
-    values:
-      - name: BEGIN_MODIFIER
-        comment: "a loop after a begin statement, so the body is executed first before the condition"
-  - name: RangeFlags
-    values:
-      - name: EXCLUDE_END
-        comment: "... operator"
-  - name: RegularExpressionFlags
-    values:
-      - name: IGNORE_CASE
-        comment: "i - ignores the case of characters when matching"
-      - name: MULTI_LINE
-        comment: "m - allows $ to match the end of lines within strings"
-      - name: EXTENDED
-        comment: "x - ignores whitespace and allows comments in regular expressions"
-      - name: EUC_JP
-        comment: "e - forces the EUC-JP encoding"
-      - name: ASCII_8BIT
-        comment: "n - forces the ASCII-8BIT encoding"
-      - name: WINDOWS_31J
-        comment: "s - forces the Windows-31J encoding"
-      - name: UTF_8
-        comment: "u - forces the UTF-8 encoding"
-      - name: ONCE
-        comment: "o - only interpolates values into the regular expression once"
-nodes:
-  - name: AliasNode
-    fields:
-      - name: new_name
-        type: node
-      - name: old_name
-        type: node
-      - name: keyword_loc
-        type: location
-    comment: |
-      Represents the use of the `alias` keyword.
-
-          alias foo bar
-          ^^^^^^^^^^^^^
-  - name: AlternationPatternNode
-    fields:
-      - name: left
-        type: node
-      - name: right
-        type: node
-      - name: operator_loc
-        type: location
-    comment: |
-      Represents an alternation pattern in pattern matching.
-
-          foo => bar | baz
-                 ^^^^^^^^^
-  - name: AndNode
-    fields:
-      - name: left
-        type: node
-      - name: right
-        type: node
-      - name: operator_loc
-        type: location
-    comment: |
-      Represents the use of the `&&` operator or the `and` keyword.
-
-          left and right
-          ^^^^^^^^^^^^^^
-  - name: ArgumentsNode
-    fields:
-      - name: arguments
-        type: node[]
-    comment: |
-      Represents a set of arguments to a method or a keyword.
-
-          return foo, bar, baz
-                 ^^^^^^^^^^^^^
-  - name: ArrayNode
-    fields:
-      - name: elements
-        type: node[]
-      - name: opening_loc
-        type: location?
-      - name: closing_loc
-        type: location?
-    comment: |
-      Represents an array literal. This can be a regular array using brackets or
-      a special array using % like %w or %i.
-
-          [1, 2, 3]
-          ^^^^^^^^^
-  - name: ArrayPatternNode
-    fields:
-      - name: constant
-        type: node?
-      - name: requireds
-        type: node[]
-      - name: rest
-        type: node?
-      - name: posts
-        type: node[]
-      - name: opening_loc
-        type: location?
-      - name: closing_loc
-        type: location?
-    comment: |
-      Represents an array pattern in pattern matching.
-
-          foo in 1, 2
-          ^^^^^^^^^^^
-
-          foo in [1, 2]
-          ^^^^^^^^^^^^^
-
-          foo in *1
-          ^^^^^^^^^
-
-          foo in Bar[]
-          ^^^^^^^^^^^^
-
-          foo in Bar[1, 2, 3]
-          ^^^^^^^^^^^^^^^^^^^
-  - name: AssocNode
-    fields:
-      - name: key
-        type: node
-      - name: value
-        type: node?
-      - name: operator_loc
-        type: location?
-    comment: |
-      Represents a hash key/value pair.
-
-          { a => b }
-            ^^^^^^
-  - name: AssocSplatNode
-    fields:
-      - name: value
-        type: node?
-      - name: operator_loc
-        type: location
-    comment: |
-      Represents a splat in a hash literal.
-
-          { **foo }
-            ^^^^^
-  - name: BackReferenceReadNode
-    comment: |
-      Represents reading a reference to a field in the previous match.
-
-          $'
-          ^^
-  - name: BeginNode
-    fields:
-      - name: begin_keyword_loc
-        type: location?
-      - name: statements
-        type: node?
-        kind: StatementsNode
-      - name: rescue_clause
-        type: node?
-        kind: RescueNode
-      - name: else_clause
-        type: node?
-        kind: ElseNode
-      - name: ensure_clause
-        type: node?
-        kind: EnsureNode
-      - name: end_keyword_loc
-        type: location?
-    newline: false
-    comment: |
-      Represents a begin statement.
-
-          begin
-            foo
-          end
-          ^^^^^
-  - name: BlockArgumentNode
-    fields:
-      - name: expression
-        type: node?
-      - name: operator_loc
-        type: location
-    comment: |
-      Represents block method arguments.
-
-          bar(&args)
-          ^^^^^^^^^^
-  - name: BlockLocalVariableNode
-    fields:
-      - name: name
-        type: constant
-    comment: |
-      Represents a block local variable.
-
-          a { |; b| }
-                 ^
-  - name: BlockNode
-    fields:
-      - name: locals
-        type: constant[]
-      - name: parameters
-        type: node?
-        kind: BlockParametersNode
-      - name: body
-        type: node?
-      - name: opening_loc
-        type: location
-      - name: closing_loc
-        type: location
-    comment: |
-      Represents a block of ruby code.
-
-      [1, 2, 3].each { |i| puts x }
-                     ^^^^^^^^^^^^^^
-  - name: BlockParameterNode
-    fields:
-      - name: name
-        type: constant?
-      - name: name_loc
-        type: location?
-      - name: operator_loc
-        type: location
-    comment: |
-      Represents a block parameter to a method, block, or lambda definition.
-
-          def a(&b)
-                ^^
-          end
-  - name: BlockParametersNode
-    fields:
-      - name: parameters
-        type: node?
-        kind: ParametersNode
-      - name: locals
-        type: node[]
-      - name: opening_loc
-        type: location?
-      - name: closing_loc
-        type: location?
-    comment: |
-      Represents a block's parameters declaration.
-
-          -> (a, b = 1; local) { }
-             ^^^^^^^^^^^^^^^^^
-
-          foo do |a, b = 1; local|
-                 ^^^^^^^^^^^^^^^^^
-          end
-  - name: BreakNode
-    fields:
-      - name: arguments
-        type: node?
-        kind: ArgumentsNode
-      - name: keyword_loc
-        type: location
-    comment: |
-      Represents the use of the `break` keyword.
-
-          break foo
-          ^^^^^^^^^
-  - name: CallAndWriteNode
-    fields:
-      - name: receiver
-        type: node?
-      - name: call_operator_loc
-        type: location?
-      - name: message_loc
-        type: location?
-      - name: opening_loc
-        type: location?
-      - name: arguments
-        type: node?
-        kind: ArgumentsNode
-      - name: closing_loc
-        type: location?
-      - name: flags
-        type: flags
-        kind: CallNodeFlags
-      - name: read_name
-        type: string
-      - name: write_name
-        type: string
-      - name: operator_loc
-        type: location
-      - name: value
-        type: node
-    comment: |
-      Represents the use of the `&&=` operator on a call.
-
-          foo.bar &&= value
-          ^^^^^^^^^^^^^^^^^
-  - name: CallNode
-    fields:
-      - name: receiver
-        type: node?
-      - name: call_operator_loc
-        type: location?
-      - name: message_loc
-        type: location?
-      - name: opening_loc
-        type: location?
-      - name: arguments
-        type: node?
-        kind: ArgumentsNode
-      - name: closing_loc
-        type: location?
-      - name: block
-        type: node?
-        kind: BlockNode
-      - name: flags
-        type: flags
-        kind: CallNodeFlags
-      - name: name
-        type: string
-    comment: |
-      Represents a method call, in all of the various forms that can take.
-
-          foo
-          ^^^
-
-          foo()
-          ^^^^^
-
-          +foo
-          ^^^^
-
-          foo + bar
-          ^^^^^^^^^
-
-          foo.bar
-          ^^^^^^^
-
-          foo&.bar
-          ^^^^^^^^
-  - name: CallOperatorWriteNode
-    fields:
-      - name: receiver
-        type: node?
-      - name: call_operator_loc
-        type: location?
-      - name: message_loc
-        type: location?
-      - name: opening_loc
-        type: location?
-      - name: arguments
-        type: node?
-        kind: ArgumentsNode
-      - name: closing_loc
-        type: location?
-      - name: flags
-        type: flags
-        kind: CallNodeFlags
-      - name: read_name
-        type: string
-      - name: write_name
-        type: string
-      - name: operator
-        type: constant
-      - name: operator_loc
-        type: location
-      - name: value
-        type: node
-    comment: |
-      Represents the use of an assignment operator on a call.
-
-          foo.bar += baz
-          ^^^^^^^^^^^^^^
-  - name: CallOrWriteNode
-    fields:
-      - name: receiver
-        type: node?
-      - name: call_operator_loc
-        type: location?
-      - name: message_loc
-        type: location?
-      - name: opening_loc
-        type: location?
-      - name: arguments
-        type: node?
-        kind: ArgumentsNode
-      - name: closing_loc
-        type: location?
-      - name: flags
-        type: flags
-        kind: CallNodeFlags
-      - name: read_name
-        type: string
-      - name: write_name
-        type: string
-      - name: operator_loc
-        type: location
-      - name: value
-        type: node
-    comment: |
-      Represents the use of the `||=` operator on a call.
-
-          foo.bar ||= value
-          ^^^^^^^^^^^^^^^^^
-  - name: CapturePatternNode
-    fields:
-      - name: value
-        type: node
-      - name: target
-        type: node
-      - name: operator_loc
-        type: location
-    comment: |
-      Represents assigning to a local variable in pattern matching.
-
-          foo => [bar => baz]
-                 ^^^^^^^^^^^^
-  - name: CaseNode
-    fields:
-      - name: predicate
-        type: node?
-      - name: conditions
-        type: node[]
-      - name: consequent
-        type: node?
-        kind: ElseNode
-      - name: case_keyword_loc
-        type: location
-      - name: end_keyword_loc
-        type: location
-    comment: |
-      Represents the use of a case statement.
-
-      case true
-      ^^^^^^^^^
-      when false
-      end
-  - name: ClassNode
-    fields:
-      - name: locals
-        type: constant[]
-      - name: class_keyword_loc
-        type: location
-      - name: constant_path
-        type: node
-      - name: inheritance_operator_loc
-        type: location?
-      - name: superclass
-        type: node?
-      - name: body
-        type: node?
-      - name: end_keyword_loc
-        type: location
-      - name: name
-        type: constant
-      - name: name_constant
-        type: constant
-    comment: |
-      Represents a class declaration involving the `class` keyword.
-
-          class Foo end
-          ^^^^^^^^^^^^^
-  - name: ClassVariableAndWriteNode
-    fields:
-      - name: name
-        type: constant
-      - name: name_loc
-        type: location
-      - name: operator_loc
-        type: location
-      - name: value
-        type: node
-    comment: |
-      Represents the use of the `&&=` operator for assignment to a class variable.
-
-          @@target &&= value
-          ^^^^^^^^^^^^^^^^
-  - name: ClassVariableOperatorWriteNode
-    fields:
-      - name: name
-        type: constant
-      - name: name_loc
-        type: location
-      - name: operator_loc
-        type: location
-      - name: value
-        type: node
-      - name: operator
-        type: constant
-    comment: |
-      Represents assigning to a class variable using an operator that isn't `=`.
-
-          @@target += value
-          ^^^^^^^^^^^^^^^^^
-  - name: ClassVariableOrWriteNode
-    fields:
-      - name: name
-        type: constant
-      - name: name_loc
-        type: location
-      - name: operator_loc
-        type: location
-      - name: value
-        type: node
-    comment: |
-      Represents the use of the `||=` operator for assignment to a class variable.
-
-          @@target ||= value
-          ^^^^^^^^^^^^^^^^^^
-  - name: ClassVariableReadNode
-    fields:
-      - name: name
-        type: constant
-    comment: |
-      Represents referencing a class variable.
-
-          @@foo
-          ^^^^^
-  - name: ClassVariableTargetNode
-    fields:
-      - name: name
-        type: constant
-    comment: |
-      Represents writing to a class variable in a context that doesn't have an explicit value.
-
-          @@foo, @@bar = baz
-          ^^^^^  ^^^^^
-  - name: ClassVariableWriteNode
-    fields:
-      - name: name
-        type: constant
-      - name: name_loc
-        type: location
-      - name: value
-        type: node
-      - name: operator_loc
-        type: location?
-    comment: |
-      Represents writing to a class variable.
-
-          @@foo = 1
-          ^^^^^^^^^
-  - name: ConstantAndWriteNode
-    fields:
-      - name: name
-        type: constant
-      - name: name_loc
-        type: location
-      - name: operator_loc
-        type: location
-      - name: value
-        type: node
-    comment: |
-      Represents the use of the `&&=` operator for assignment to a constant.
-
-          Target &&= value
-          ^^^^^^^^^^^^^^^^
-  - name: ConstantOperatorWriteNode
-    fields:
-      - name: name
-        type: constant
-      - name: name_loc
-        type: location
-      - name: operator_loc
-        type: location
-      - name: value
-        type: node
-      - name: operator
-        type: constant
-    comment: |
-      Represents assigning to a constant using an operator that isn't `=`.
-
-          Target += value
-          ^^^^^^^^^^^^^^^
-  - name: ConstantOrWriteNode
-    fields:
-      - name: name
-        type: constant
-      - name: name_loc
-        type: location
-      - name: operator_loc
-        type: location
-      - name: value
-        type: node
-    comment: |
-      Represents the use of the `||=` operator for assignment to a constant.
-
-          Target ||= value
-          ^^^^^^^^^^^^^^^^
-  - name: ConstantPathAndWriteNode
-    fields:
-      - name: target
-        type: node
-        kind: ConstantPathNode
-      - name: operator_loc
-        type: location
-      - name: value
-        type: node
-    comment: |
-      Represents the use of the `&&=` operator for assignment to a constant path.
-
-          Parent::Child &&= value
-          ^^^^^^^^^^^^^^^^^^^^^^^
-  - name: ConstantPathNode
-    fields:
-      - name: parent
-        type: node?
-      - name: child
-        type: node
-      - name: delimiter_loc
-        type: location
-    comment: |
-      Represents accessing a constant through a path of `::` operators.
-
-          Foo::Bar
-          ^^^^^^^^
-  - name: ConstantPathOperatorWriteNode
-    fields:
-      - name: target
-        type: node
-        kind: ConstantPathNode
-      - name: operator_loc
-        type: location
-      - name: value
-        type: node
-      - name: operator
-        type: constant
-    comment: |
-      Represents assigning to a constant path using an operator that isn't `=`.
-
-          Parent::Child += value
-          ^^^^^^^^^^^^^^^^^^^^^^
-  - name: ConstantPathOrWriteNode
-    fields:
-      - name: target
-        type: node
-        kind: ConstantPathNode
-      - name: operator_loc
-        type: location
-      - name: value
-        type: node
-    comment: |
-      Represents the use of the `||=` operator for assignment to a constant path.
-
-          Parent::Child ||= value
-          ^^^^^^^^^^^^^^^^^^^^^^^
-  - name: ConstantPathTargetNode
-    fields:
-      - name: parent
-        type: node?
-      - name: child
-        type: node
-      - name: delimiter_loc
-        type: location
-    comment: |
-      Represents writing to a constant path in a context that doesn't have an explicit value.
-
-          Foo::Foo, Bar::Bar = baz
-          ^^^^^^^^  ^^^^^^^^
-  - name: ConstantPathWriteNode
-    fields:
-      - name: target
-        type: node
-        kind: ConstantPathNode
-      - name: operator_loc
-        type: location
-      - name: value
-        type: node
-    comment: |
-      Represents writing to a constant path.
-
-          ::Foo = 1
-          ^^^^^^^^^
-
-          Foo::Bar = 1
-          ^^^^^^^^^^^^
-
-          ::Foo::Bar = 1
-          ^^^^^^^^^^^^^^
-  - name: ConstantReadNode
-    fields:
-      - name: name
-        type: constant
-    comment: |
-      Represents referencing a constant.
-
-          Foo
-          ^^^
-  - name: ConstantTargetNode
-    fields:
-      - name: name
-        type: constant
-    comment: |
-      Represents writing to a constant in a context that doesn't have an explicit value.
-
-          Foo, Bar = baz
-          ^^^  ^^^
-  - name: ConstantWriteNode
-    fields:
-      - name: name
-        type: constant
-      - name: name_loc
-        type: location
-      - name: value
-        type: node
-      - name: operator_loc
-        type: location
-    comment: |
-      Represents writing to a constant.
-
-          Foo = 1
-          ^^^^^^^
-  - name: DefNode
-    fields:
-      - name: name_loc
-        type: location
-      - name: receiver
-        type: node?
-      - name: parameters
-        type: node?
-        kind: ParametersNode
-      - name: body
-        type: node?
-      - name: locals
-        type: constant[]
-      - name: def_keyword_loc
-        type: location
-      - name: operator_loc
-        type: location?
-      - name: lparen_loc
-        type: location?
-      - name: rparen_loc
-        type: location?
-      - name: equal_loc
-        type: location?
-      - name: end_keyword_loc
-        type: location?
-    comment: |
-      Represents a method definition.
-
-          def method
-          end
-          ^^^^^^^^^^
-  - name: DefinedNode
-    fields:
-      - name: lparen_loc
-        type: location?
-      - name: value
-        type: node
-      - name: rparen_loc
-        type: location?
-      - name: keyword_loc
-        type: location
-    comment: |
-      Represents the use of the `defined?` keyword.
-
-          defined?(a)
-          ^^^^^^^^^^^
-  - name: ElseNode
-    fields:
-      - name: else_keyword_loc
-        type: location
-      - name: statements
-        type: node?
-        kind: StatementsNode
-      - name: end_keyword_loc
-        type: location?
-    comment: |
-      Represents an `else` clause in a `case`, `if`, or `unless` statement.
-
-          if a then b else c end
-                      ^^^^^^^^^^
-  - name: EmbeddedStatementsNode
-    fields:
-      - name: opening_loc
-        type: location
-      - name: statements
-        type: node?
-        kind: StatementsNode
-      - name: closing_loc
-        type: location
-    comment: |
-      Represents an interpolated set of statements.
-
-          "foo #{bar}"
-               ^^^^^^
-  - name: EmbeddedVariableNode
-    fields:
-      - name: operator_loc
-        type: location
-      - name: variable
-        type: node
-    comment: |
-      Represents an interpolated variable.
-
-          "foo #@bar"
-               ^^^^^
-  - name: EnsureNode
-    fields:
-      - name: ensure_keyword_loc
-        type: location
-      - name: statements
-        type: node?
-        kind: StatementsNode
-      - name: end_keyword_loc
-        type: location
-    comment: |
-      Represents an `ensure` clause in a `begin` statement.
-
-          begin
-            foo
-          ensure
-          ^^^^^^
-            bar
-          end
-  - name: FalseNode
-    comment: |
-      Represents the use of the literal `false` keyword.
-
-          false
-          ^^^^^
-  - name: FindPatternNode
-    fields:
-      - name: constant
-        type: node?
-      - name: left
-        type: node
-      - name: requireds
-        type: node[]
-      - name: right
-        type: node
-      - name: opening_loc
-        type: location?
-      - name: closing_loc
-        type: location?
-    comment: |
-      Represents a find pattern in pattern matching.
-
-          foo in *bar, baz, *qux
-          ^^^^^^^^^^^^^^^^^^^^^^
-
-          foo in [*bar, baz, *qux]
-          ^^^^^^^^^^^^^^^^^^^^^^^^
-
-          foo in Foo(*bar, baz, *qux)
-          ^^^^^^^^^^^^^^^^^^^^^^^^^^^
-  - name: FlipFlopNode
-    fields:
-      - name: left
-        type: node?
-      - name: right
-        type: node?
-      - name: operator_loc
-        type: location
-      - name: flags
-        type: flags
-        kind: RangeFlags
-    comment: |
-      Represents the use of the `..` or `...` operators to create flip flops.
-
-          baz if foo .. bar
-                 ^^^^^^^^^^
-  - name: FloatNode
-    comment: |
-      Represents a floating point number literal.
-
-          1.0
-          ^^^
-  - name: ForNode
-    fields:
-      - name: index
-        type: node
-      - name: collection
-        type: node
-      - name: statements
-        type: node?
-        kind: StatementsNode
-      - name: for_keyword_loc
-        type: location
-      - name: in_keyword_loc
-        type: location
-      - name: do_keyword_loc
-        type: location?
-      - name: end_keyword_loc
-        type: location
-    comment: |
-      Represents the use of the `for` keyword.
-
-          for i in a end
-          ^^^^^^^^^^^^^^
-  - name: ForwardingArgumentsNode
-    comment: |
-      Represents forwarding all arguments to this method to another method.
-
-          def foo(...)
-            bar(...)
-            ^^^^^^^^
-          end
-  - name: ForwardingParameterNode
-    comment: |
-      Represents the use of the forwarding parameter in a method, block, or lambda declaration.
-
-          def foo(...)
-                  ^^^
-          end
-  - name: ForwardingSuperNode
-    fields:
-      - name: block
-        type: node?
-        kind: BlockNode
-    comment: |
-      Represents the use of the `super` keyword without parentheses or arguments.
-
-          super
-          ^^^^^
-  - name: GlobalVariableAndWriteNode
-    fields:
-      - name: name
-        type: constant
-      - name: name_loc
-        type: location
-      - name: operator_loc
-        type: location
-      - name: value
-        type: node
-    comment: |
-      Represents the use of the `&&=` operator for assignment to a global variable.
-
-          $target &&= value
-          ^^^^^^^^^^^^^^^^^
-  - name: GlobalVariableOperatorWriteNode
-    fields:
-      - name: name
-        type: constant
-      - name: name_loc
-        type: location
-      - name: operator_loc
-        type: location
-      - name: value
-        type: node
-      - name: operator
-        type: constant
-    comment: |
-      Represents assigning to a global variable using an operator that isn't `=`.
-
-          $target += value
-          ^^^^^^^^^^^^^^^^
-  - name: GlobalVariableOrWriteNode
-    fields:
-      - name: name
-        type: constant
-      - name: name_loc
-        type: location
-      - name: operator_loc
-        type: location
-      - name: value
-        type: node
-    comment: |
-      Represents the use of the `||=` operator for assignment to a global variable.
-
-          $target ||= value
-          ^^^^^^^^^^^^^^^^^
-  - name: GlobalVariableReadNode
-    fields:
-      - name: name
-        type: constant
-    comment: |
-      Represents referencing a global variable.
-
-          $foo
-          ^^^^
-  - name: GlobalVariableTargetNode
-    fields:
-      - name: name
-        type: constant
-    comment: |
-      Represents writing to a global variable in a context that doesn't have an explicit value.
-
-          $foo, $bar = baz
-          ^^^^  ^^^^
-  - name: GlobalVariableWriteNode
-    fields:
-      - name: name
-        type: constant
-      - name: name_loc
-        type: location
-      - name: value
-        type: node
-      - name: operator_loc
-        type: location
-    comment: |
-      Represents writing to a global variable.
-
-          $foo = 1
-          ^^^^^^^^
-  - name: HashNode
-    fields:
-      - name: opening_loc
-        type: location
-      - name: elements
-        type: node[]
-      - name: closing_loc
-        type: location
-    comment: |
-      Represents a hash literal.
-
-          { a => b }
-          ^^^^^^^^^^
-  - name: HashPatternNode
-    fields:
-      - name: constant
-        type: node?
-      - name: assocs
-        type: node[]
-      - name: kwrest
-        type: node?
-      - name: opening_loc
-        type: location?
-      - name: closing_loc
-        type: location?
-    comment: |
-      Represents a hash pattern in pattern matching.
-
-          foo => { a: 1, b: 2 }
-                 ^^^^^^^^^^^^^^
-
-          foo => { a: 1, b: 2, **c }
-                 ^^^^^^^^^^^^^^^^^^^
-  - name: IfNode
-    fields:
-      - name: if_keyword_loc
-        type: location?
-      - name: predicate
-        type: node
-      - name: statements
-        type: node?
-        kind: StatementsNode
-      - name: consequent
-        type: node?
-      - name: end_keyword_loc
-        type: location?
-    newline: predicate
-    comment: |
-      Represents the use of the `if` keyword, either in the block form or the modifier form.
-
-          bar if foo
-          ^^^^^^^^^^
-
-          if foo then bar end
-          ^^^^^^^^^^^^^^^^^^^
-  - name: ImaginaryNode
-    fields:
-      - name: numeric
-        type: node
-    comment: |
-      Represents an imaginary number literal.
-
-          1.0i
-          ^^^^
-  - name: InNode
-    fields:
-      - name: pattern
-        type: node
-      - name: statements
-        type: node?
-        kind: StatementsNode
-      - name: in_loc
-        type: location
-      - name: then_loc
-        type: location?
-    comment: |
-      Represents the use of the `in` keyword in a case statement.
-
-          case a; in b then c end
-                  ^^^^^^^^^^^
-  - name: InstanceVariableAndWriteNode
-    fields:
-      - name: name
-        type: constant
-      - name: name_loc
-        type: location
-      - name: operator_loc
-        type: location
-      - name: value
-        type: node
-    comment: |
-      Represents the use of the `&&=` operator for assignment to an instance variable.
-
-          @target &&= value
-          ^^^^^^^^^^^^^^^^^
-  - name: InstanceVariableOperatorWriteNode
-    fields:
-      - name: name
-        type: constant
-      - name: name_loc
-        type: location
-      - name: operator_loc
-        type: location
-      - name: value
-        type: node
-      - name: operator
-        type: constant
-    comment: |
-      Represents assigning to an instance variable using an operator that isn't `=`.
-
-          @target += value
-          ^^^^^^^^^^^^^^^^
-  - name: InstanceVariableOrWriteNode
-    fields:
-      - name: name
-        type: constant
-      - name: name_loc
-        type: location
-      - name: operator_loc
-        type: location
-      - name: value
-        type: node
-    comment: |
-      Represents the use of the `||=` operator for assignment to an instance variable.
-
-          @target ||= value
-          ^^^^^^^^^^^^^^^^^
-  - name: InstanceVariableReadNode
-    fields:
-      - name: name
-        type: constant
-    comment: |
-      Represents referencing an instance variable.
-
-          @foo
-          ^^^^
-  - name: InstanceVariableTargetNode
-    fields:
-      - name: name
-        type: constant
-    comment: |
-      Represents writing to an instance variable in a context that doesn't have an explicit value.
-
-          @foo, @bar = baz
-          ^^^^  ^^^^
-  - name: InstanceVariableWriteNode
-    fields:
-      - name: name
-        type: constant
-      - name: name_loc
-        type: location
-      - name: value
-        type: node
-      - name: operator_loc
-        type: location
-    comment: |
-      Represents writing to an instance variable.
-
-          @foo = 1
-          ^^^^^^^^
-  - name: IntegerNode
-    comment: |
-      Represents an integer number literal.
-
-          1
-          ^
-  - name: InterpolatedRegularExpressionNode
-    fields:
-      - name: opening_loc
-        type: location
-      - name: parts
-        type: node[]
-      - name: closing_loc
-        type: location
-      - name: flags
-        type: flags
-        kind: RegularExpressionFlags
-    newline: parts
-    comment: |
-      Represents a regular expression literal that contains interpolation.
-
-          /foo #{bar} baz/
-          ^^^^^^^^^^^^^^^^
-  - name: InterpolatedStringNode
-    fields:
-      - name: opening_loc
-        type: location?
-      - name: parts
-        type: node[]
-      - name: closing_loc
-        type: location?
-    newline: parts
-    comment: |
-      Represents a string literal that contains interpolation.
-
-          "foo #{bar} baz"
-          ^^^^^^^^^^^^^^^^
-  - name: InterpolatedSymbolNode
-    fields:
-      - name: opening_loc
-        type: location?
-      - name: parts
-        type: node[]
-      - name: closing_loc
-        type: location?
-    newline: parts
-    comment: |
-      Represents a symbol literal that contains interpolation.
-
-          :"foo #{bar} baz"
-          ^^^^^^^^^^^^^^^^^
-  - name: InterpolatedXStringNode
-    fields:
-      - name: opening_loc
-        type: location
-      - name: parts
-        type: node[]
-      - name: closing_loc
-        type: location
-    newline: parts
-    comment: |
-      Represents an xstring literal that contains interpolation.
-
-          `foo #{bar} baz`
-          ^^^^^^^^^^^^^^^^
-  - name: KeywordHashNode
-    fields:
-      - name: elements
-        type: node[]
-    comment: |
-      Represents a hash literal without opening and closing braces.
-
-          foo(a: b)
-              ^^^^
-  - name: KeywordParameterNode
-    fields:
-      - name: name_loc
-        type: location
-      - name: value
-        type: node?
-    comment: |
-      Represents a keyword parameter to a method, block, or lambda definition.
-
-          def a(b:)
-                ^^
-          end
-
-          def a(b: 1)
-                ^^^^
-          end
-  - name: KeywordRestParameterNode
-    fields:
-      - name: operator_loc
-        type: location
-      - name: name_loc
-        type: location?
-    comment: |
-      Represents a keyword rest parameter to a method, block, or lambda definition.
-
-          def a(**b)
-                ^^^
-          end
-  - name: LambdaNode
-    fields:
-      - name: locals
-        type: constant[]
-      - name: operator_loc
-        type: location
-      - name: opening_loc
-        type: location
-      - name: closing_loc
-        type: location
-      - name: parameters
-        type: node?
-        kind: BlockParametersNode
-      - name: body
-        type: node?
-    comment: |
-      Represents using a lambda literal (not the lambda method call).
-
-          ->(value) { value * 2 }
-          ^^^^^^^^^^^^^^^^^^^^^^^
-  - name: LocalVariableAndWriteNode
-    fields:
-      - name: name_loc
-        type: location
-      - name: operator_loc
-        type: location
-      - name: value
-        type: node
-      - name: name
-        type: constant
-      - name: depth
-        type: uint32
-    comment: |
-      Represents the use of the `&&=` operator for assignment to a local variable.
-
-          target &&= value
-          ^^^^^^^^^^^^^^^^
-  - name: LocalVariableOperatorWriteNode
-    fields:
-      - name: name_loc
-        type: location
-      - name: operator_loc
-        type: location
-      - name: value
-        type: node
-      - name: name
-        type: constant
-      - name: operator
-        type: constant
-      - name: depth
-        type: uint32
-    comment: |
-      Represents assigning to a local variable using an operator that isn't `=`.
-
-          target += value
-          ^^^^^^^^^^^^^^^
-  - name: LocalVariableOrWriteNode
-    fields:
-      - name: name_loc
-        type: location
-      - name: operator_loc
-        type: location
-      - name: value
-        type: node
-      - name: name
-        type: constant
-      - name: depth
-        type: uint32
-    comment: |
-      Represents the use of the `||=` operator for assignment to a local variable.
-
-          target ||= value
-          ^^^^^^^^^^^^^^^^
-  - name: LocalVariableReadNode
-    fields:
-      - name: name
-        type: constant
-      - name: depth
-        type: uint32
-    comment: |
-      Represents reading a local variable. Note that this requires that a local
-      variable of the same name has already been written to in the same scope,
-      otherwise it is parsed as a method call.
-
-          foo
-          ^^^
-  - name: LocalVariableTargetNode
-    fields:
-      - name: name
-        type: constant
-      - name: depth
-        type: uint32
-    comment: |
-      Represents writing to a local variable in a context that doesn't have an explicit value.
-
-          foo, bar = baz
-          ^^^  ^^^
-  - name: LocalVariableWriteNode
-    fields:
-      - name: name
-        type: constant
-      - name: depth
-        type: uint32
-      - name: name_loc
-        type: location
-      - name: value
-        type: node
-      - name: operator_loc
-        type: location
-    comment: |
-      Represents writing to a local variable.
-
-          foo = 1
-          ^^^^^^^
-  - name: MatchPredicateNode
-    fields:
-      - name: value
-        type: node
-      - name: pattern
-        type: node
-      - name: operator_loc
-        type: location
-    comment: |
-      Represents the use of the modifier `in` operator.
-
-          foo in bar
-          ^^^^^^^^^^
-  - name: MatchRequiredNode
-    fields:
-      - name: value
-        type: node
-      - name: pattern
-        type: node
-      - name: operator_loc
-        type: location
-    comment: |
-      Represents the use of the `=>` operator.
-
-          foo => bar
-          ^^^^^^^^^^
-  - name: MissingNode
-    comment: |
-      Represents a node that is missing from the source and results in a syntax
-      error.
-  - name: ModuleNode
-    fields:
-      - name: locals
-        type: constant[]
-      - name: module_keyword_loc
-        type: location
-      - name: constant_path
-        type: node
-      - name: body
-        type: node?
-      - name: end_keyword_loc
-        type: location
-      - name: name
-        type: constant
-      - name: name_constant
-        type: constant
-    comment: |
-      Represents a module declaration involving the `module` keyword.
-
-          module Foo end
-          ^^^^^^^^^^^^^^
-  - name: MultiWriteNode
-    fields:
-      - name: targets
-        type: node[]
-      - name: operator_loc
-        type: location?
-      - name: value
-        type: node?
-      - name: lparen_loc
-        type: location?
-      - name: rparen_loc
-        type: location?
-    comment: |
-      Represents a multi-target expression.
-
-          a, b, c = 1, 2, 3
-          ^^^^^^^^^^^^^^^^^
-  - name: NextNode
-    fields:
-      - name: arguments
-        type: node?
-        kind: ArgumentsNode
-      - name: keyword_loc
-        type: location
-    comment: |
-      Represents the use of the `next` keyword.
-
-          next 1
-          ^^^^^^
-  - name: NilNode
-    comment: |
-      Represents the use of the `nil` keyword.
-
-          nil
-          ^^^
-  - name: NoKeywordsParameterNode
-    fields:
-      - name: operator_loc
-        type: location
-      - name: keyword_loc
-        type: location
-    comment: |
-      Represents the use of `**nil` inside method arguments.
-
-          def a(**nil)
-                ^^^^^
-          end
-  - name: NumberedReferenceReadNode
-    fields:
-      - name: number
-        type: uint32
-    comment: |
-      Represents reading a numbered reference to a capture in the previous match.
-
-          $1
-          ^^
-  - name: OptionalParameterNode
-    fields:
-      - name: name
-        type: constant
-      - name: name_loc
-        type: location
-      - name: operator_loc
-        type: location
-      - name: value
-        type: node
-    comment: |
-      Represents an optional parameter to a method, block, or lambda definition.
-
-          def a(b = 1)
-                ^^^^^
-          end
-  - name: OrNode
-    fields:
-      - name: left
-        type: node
-      - name: right
-        type: node
-      - name: operator_loc
-        type: location
-    comment: |
-      Represents the use of the `||` operator or the `or` keyword.
-
-          left or right
-          ^^^^^^^^^^^^^
-  - name: ParametersNode
-    fields:
-      - name: requireds
-        type: node[]
-      - name: optionals
-        type: node[]
-      - name: posts
-        type: node[]
-      - name: rest
-        type: node?
-        kind: RestParameterNode
-      - name: keywords
-        type: node[]
-      - name: keyword_rest
-        type: node?
-      - name: block
-        type: node?
-        kind: BlockParameterNode
-    comment: |
-      Represents the list of parameters on a method, block, or lambda definition.
-
-          def a(b, c, d)
-                ^^^^^^^
-          end
-  - name: ParenthesesNode
-    fields:
-      - name: body
-        type: node?
-      - name: opening_loc
-        type: location
-      - name: closing_loc
-        type: location
-    newline: false
-    comment: |
-      Represents a parenthesized expression
-
-          (10 + 34)
-          ^^^^^^^^^
-  - name: PinnedExpressionNode
-    fields:
-      - name: expression
-        type: node
-      - name: operator_loc
-        type: location
-      - name: lparen_loc
-        type: location
-      - name: rparen_loc
-        type: location
-    comment: |
-      Represents the use of the `^` operator for pinning an expression in a
-      pattern matching expression.
-
-          foo in ^(bar)
-                 ^^^^^^
-  - name: PinnedVariableNode
-    fields:
-      - name: variable
-        type: node
-      - name: operator_loc
-        type: location
-    comment: |
-      Represents the use of the `^` operator for pinning a variable in a pattern
-      matching expression.
-
-          foo in ^bar
-                 ^^^^
-  - name: PostExecutionNode
-    fields:
-      - name: statements
-        type: node?
-        kind: StatementsNode
-      - name: keyword_loc
-        type: location
-      - name: opening_loc
-        type: location
-      - name: closing_loc
-        type: location
-    comment: |
-      Represents the use of the `END` keyword.
-
-          END { foo }
-          ^^^^^^^^^^^
-  - name: PreExecutionNode
-    fields:
-      - name: statements
-        type: node?
-        kind: StatementsNode
-      - name: keyword_loc
-        type: location
-      - name: opening_loc
-        type: location
-      - name: closing_loc
-        type: location
-    comment: |
-      Represents the use of the `BEGIN` keyword.
-
-          BEGIN { foo }
-          ^^^^^^^^^^^^^
-  - name: ProgramNode
-    fields:
-      - name: locals
-        type: constant[]
-      - name: statements
-        type: node
-        kind: StatementsNode
-    comment: The top level node of any parse tree.
-  - name: RangeNode
-    fields:
-      - name: left
-        type: node?
-      - name: right
-        type: node?
-      - name: operator_loc
-        type: location
-      - name: flags
-        type: flags
-        kind: RangeFlags
-    comment: |
-      Represents the use of the `..` or `...` operators.
-
-          1..2
-          ^^^^
-
-          c if a =~ /left/ ... b =~ /right/
-               ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-  - name: RationalNode
-    fields:
-      - name: numeric
-        type: node
-    comment: |
-      Represents a rational number literal.
-
-          1.0r
-          ^^^^
-  - name: RedoNode
-    comment: |
-      Represents the use of the `redo` keyword.
-
-          redo
-          ^^^^
-  - name: RegularExpressionNode
-    fields:
-      - name: opening_loc
-        type: location
-      - name: content_loc
-        type: location
-      - name: closing_loc
-        type: location
-      - name: unescaped
-        type: string
-      - name: flags
-        type: flags
-        kind: RegularExpressionFlags
-    comment: |
-      Represents a regular expression literal with no interpolation.
-
-          /foo/i
-          ^^^^^^
-  - name: RequiredDestructuredParameterNode
-    fields:
-      - name: parameters
-        type: node[]
-      - name: opening_loc
-        type: location
-      - name: closing_loc
-        type: location
-    comment: |
-      Represents a destructured required parameter node.
-
-          def foo((bar, baz))
-                  ^^^^^^^^^^
-          end
-  - name: RequiredParameterNode
-    fields:
-      - name: name
-        type: constant
-    comment: |
-      Represents a required parameter to a method, block, or lambda definition.
-
-          def a(b)
-                ^
-          end
-  - name: RescueModifierNode
-    fields:
-      - name: expression
-        type: node
-      - name: keyword_loc
-        type: location
-      - name: rescue_expression
-        type: node
-    newline: expression
-    comment: |
-      Represents an expression modified with a rescue.
-
-        foo rescue nil
-        ^^^^^^^^^^^^^^
-  - name: RescueNode
-    fields:
-      - name: keyword_loc
-        type: location
-      - name: exceptions
-        type: node[]
-      - name: operator_loc
-        type: location?
-      - name: reference
-        type: node?
-      - name: statements
-        type: node?
-        kind: StatementsNode
-      - name: consequent
-        type: node?
-        kind: RescueNode
-    comment: |
-      Represents a rescue statement.
-
-          begin
-          rescue Foo, *splat, Bar => ex
-          ^^^^^^
-            foo
-          end
-
-      `Foo, *splat, Bar` are in the `exceptions` field.
-      `ex` is in the `exception` field.
-  - name: RestParameterNode
-    fields:
-      - name: operator_loc
-        type: location
-      - name: name_loc
-        type: location?
-    comment: |
-      Represents a rest parameter to a method, block, or lambda definition.
-
-          def a(*b)
-                ^^
-          end
-  - name: RetryNode
-    comment: |
-      Represents the use of the `retry` keyword.
-
-          retry
-          ^^^^^
-  - name: ReturnNode
-    fields:
-      - name: keyword_loc
-        type: location
-      - name: arguments
-        type: node?
-        kind: ArgumentsNode
-    comment: |
-      Represents the use of the `return` keyword.
-
-          return 1
-          ^^^^^^^^
-  - name: SelfNode
-    comment: |
-      Represents the `self` keyword.
-
-          self
-          ^^^^
-  - name: SingletonClassNode
-    fields:
-      - name: locals
-        type: constant[]
-      - name: class_keyword_loc
-        type: location
-      - name: operator_loc
-        type: location
-      - name: expression
-        type: node
-      - name: body
-        type: node?
-      - name: end_keyword_loc
-        type: location
-    comment: |
-      Represents a singleton class declaration involving the `class` keyword.
-
-          class << self end
-          ^^^^^^^^^^^^^^^^^
-  - name: SourceEncodingNode
-    comment: |
-      Represents the use of the `__ENCODING__` keyword.
-
-          __ENCODING__
-          ^^^^^^^^^^^^
-  - name: SourceFileNode
-    fields:
-      - name: filepath
-        type: string
-    comment: |
-      Represents the use of the `__FILE__` keyword.
-
-          __FILE__
-          ^^^^^^^^
-  - name: SourceLineNode
-    comment: |
-      Represents the use of the `__LINE__` keyword.
-
-          __LINE__
-          ^^^^^^^^
-  - name: SplatNode
-    fields:
-      - name: operator_loc
-        type: location
-      - name: expression
-        type: node?
-    comment: |
-      Represents the use of the splat operator.
-
-          [*a]
-           ^^
-  - name: StatementsNode
-    fields:
-      - name: body
-        type: node[]
-    comment: |
-      Represents a set of statements contained within some scope.
-
-          foo; bar; baz
-          ^^^^^^^^^^^^^
-  - name: StringConcatNode
-    fields:
-      - name: left
-        type: node
-      - name: right
-        type: node
-    comment: |
-      Represents the use of compile-time string concatenation.
-
-          "foo" "bar"
-          ^^^^^^^^^^^
-  - name: StringNode
-    fields:
-      - name: opening_loc
-        type: location?
-      - name: content_loc
-        type: location
-      - name: closing_loc
-        type: location?
-      - name: unescaped
-        type: string
-    comment: |
-      Represents a string literal, a string contained within a `%w` list, or
-      plain string content within an interpolated string.
-
-          "foo"
-          ^^^^^
-
-          %w[foo]
-             ^^^
-
-          "foo #{bar} baz"
-           ^^^^      ^^^^
-  - name: SuperNode
-    fields:
-      - name: keyword_loc
-        type: location
-      - name: lparen_loc
-        type: location?
-      - name: arguments
-        type: node?
-        kind: ArgumentsNode
-      - name: rparen_loc
-        type: location?
-      - name: block
-        type: node?
-        kind: BlockNode
-    comment: |
-      Represents the use of the `super` keyword with parentheses or arguments.
-
-          super()
-          ^^^^^^^
-
-          super foo, bar
-          ^^^^^^^^^^^^^^
-  - name: SymbolNode
-    fields:
-      - name: opening_loc
-        type: location?
-      - name: value_loc
-        type: location?
-      - name: closing_loc
-        type: location?
-      - name: unescaped
-        type: string
-    comment: |
-      Represents a symbol literal or a symbol contained within a `%i` list.
-
-          :foo
-          ^^^^
-
-          %i[foo]
-             ^^^
-  - name: TrueNode
-    comment: |
-      Represents the use of the literal `true` keyword.
-
-          true
-          ^^^^
-  - name: UndefNode
-    fields:
-      - name: names
-        type: node[]
-      - name: keyword_loc
-        type: location
-    comment: |
-      Represents the use of the `undef` keyword.
-
-          undef :foo, :bar, :baz
-          ^^^^^^^^^^^^^^^^^^^^^^
-  - name: UnlessNode
-    fields:
-      - name: keyword_loc
-        type: location
-      - name: predicate
-        type: node
-      - name: statements
-        type: node?
-        kind: StatementsNode
-      - name: consequent
-        type: node?
-        kind: ElseNode
-      - name: end_keyword_loc
-        type: location?
-    newline: predicate
-    comment: |
-      Represents the use of the `unless` keyword, either in the block form or the modifier form.
-
-          bar unless foo
-          ^^^^^^^^^^^^^^
-
-          unless foo then bar end
-          ^^^^^^^^^^^^^^^^^^^^^^^
-  - name: UntilNode
-    fields:
-      - name: keyword_loc
-        type: location
-      - name: closing_loc
-        type: location?
-      - name: predicate
-        type: node
-      - name: statements
-        type: node?
-        kind: StatementsNode
-      - name: flags
-        type: flags
-        kind: LoopFlags
-    newline: predicate
-    comment: |
-      Represents the use of the `until` keyword, either in the block form or the modifier form.
-
-          bar until foo
-          ^^^^^^^^^^^^^
-
-          until foo do bar end
-          ^^^^^^^^^^^^^^^^^^^^
-  - name: WhenNode
-    fields:
-      - name: keyword_loc
-        type: location
-      - name: conditions
-        type: node[]
-      - name: statements
-        type: node?
-        kind: StatementsNode
-    comment: |
-      Represents the use of the `when` keyword within a case statement.
-
-          case true
-          when true
-          ^^^^^^^^^
-          end
-  - name: WhileNode
-    fields:
-      - name: keyword_loc
-        type: location
-      - name: closing_loc
-        type: location?
-      - name: predicate
-        type: node
-      - name: statements
-        type: node?
-        kind: StatementsNode
-      - name: flags
-        type: flags
-        kind: LoopFlags
-    newline: predicate
-    comment: |
-      Represents the use of the `while` keyword, either in the block form or the modifier form.
-
-          bar while foo
-          ^^^^^^^^^^^^^
-
-          while foo do bar end
-          ^^^^^^^^^^^^^^^^^^^^
-  - name: XStringNode
-    fields:
-      - name: opening_loc
-        type: location
-      - name: content_loc
-        type: location
-      - name: closing_loc
-        type: location
-      - name: unescaped
-        type: string
-    comment: |
-      Represents an xstring literal with no interpolation.
-
-          `foo`
-          ^^^^^
-  - name: YieldNode
-    fields:
-      - name: keyword_loc
-        type: location
-      - name: lparen_loc
-        type: location?
-      - name: arguments
-        type: node?
-        kind: ArgumentsNode
-      - name: rparen_loc
-        type: location?
-    comment: |
-      Represents the use of the `yield` keyword.
-
-          yield 1
-          ^^^^^^^
diff --git a/yarp/defines.h b/yarp/defines.h
deleted file mode 100644
index 24d33b5e091d84..00000000000000
--- a/yarp/defines.h
+++ /dev/null
@@ -1,45 +0,0 @@
-#ifndef YARP_DEFINES_H
-#define YARP_DEFINES_H
-
-// This file should be included first by any *.h or *.c in YARP
-
-#include <ctype.h>
-#include <stdarg.h>
-#include <stddef.h>
-#include <stdint.h>
-#include <stdio.h>
-#include <string.h>
-
-// YP_EXPORTED_FUNCTION
-#ifndef YP_EXPORTED_FUNCTION
-#   ifdef YP_EXPORT_SYMBOLS
-#       ifdef _WIN32
-#          define YP_EXPORTED_FUNCTION __declspec(dllexport) extern
-#       else
-#          define YP_EXPORTED_FUNCTION __attribute__((__visibility__("default"))) extern
-#       endif
-#   else
-#       define YP_EXPORTED_FUNCTION
-#   endif
-#endif
-
-// YP_ATTRIBUTE_UNUSED
-#if defined(__GNUC__)
-#   define YP_ATTRIBUTE_UNUSED __attribute__((unused))
-#else
-#   define YP_ATTRIBUTE_UNUSED
-#endif
-
-// inline
-#if defined(_MSC_VER) && !defined(inline)
-#   define inline __inline
-#endif
-
-// Windows versions before 2015 use _snprintf
-#if !defined(snprintf) && defined(_MSC_VER) && (_MSC_VER < 1900)
-#   define snprintf _snprintf
-#endif
-
-int yp_strncasecmp(const uint8_t *string1, const uint8_t *string2, size_t length);
-
-#endif
diff --git a/yarp/diagnostic.c b/yarp/diagnostic.c
deleted file mode 100644
index b216d96a330974..00000000000000
--- a/yarp/diagnostic.c
+++ /dev/null
@@ -1,25 +0,0 @@
-#include "yarp/diagnostic.h"
-
-// Append an error to the given list of diagnostic.
-bool
-yp_diagnostic_list_append(yp_list_t *list, const uint8_t *start, const uint8_t *end, const char *message) {
-    yp_diagnostic_t *diagnostic = (yp_diagnostic_t *) malloc(sizeof(yp_diagnostic_t));
-    if (diagnostic == NULL) return false;
-
-    *diagnostic = (yp_diagnostic_t) { .start = start, .end = end, .message = message };
-    yp_list_append(list, (yp_list_node_t *) diagnostic);
-    return true;
-}
-
-// Deallocate the internal state of the given diagnostic list.
-void
-yp_diagnostic_list_free(yp_list_t *list) {
-    yp_list_node_t *node, *next;
-
-    for (node = list->head; node != NULL; node = next) {
-        next = node->next;
-
-        yp_diagnostic_t *diagnostic = (yp_diagnostic_t *) node;
-        free(diagnostic);
-    }
-}
diff --git a/yarp/diagnostic.h b/yarp/diagnostic.h
deleted file mode 100644
index 58228d8493ad31..00000000000000
--- a/yarp/diagnostic.h
+++ /dev/null
@@ -1,24 +0,0 @@
-#ifndef YARP_DIAGNOSTIC_H
-#define YARP_DIAGNOSTIC_H
-
-#include "yarp/defines.h"
-#include "yarp/util/yp_list.h"
-
-#include <stdbool.h>
-#include <stdlib.h>
-
-// This struct represents a diagnostic found during parsing.
-typedef struct {
-    yp_list_node_t node;
-    const uint8_t *start;
-    const uint8_t *end;
-    const char *message;
-} yp_diagnostic_t;
-
-// Append a diagnostic to the given list of diagnostics.
-bool yp_diagnostic_list_append(yp_list_t *list, const uint8_t *start, const uint8_t *end, const char *message);
-
-// Deallocate the internal state of the given diagnostic list.
-void yp_diagnostic_list_free(yp_list_t *list);
-
-#endif
diff --git a/yarp/enc/yp_big5.c b/yarp/enc/yp_big5.c
deleted file mode 100644
index a7c879cd0abb16..00000000000000
--- a/yarp/enc/yp_big5.c
+++ /dev/null
@@ -1,52 +0,0 @@
-#include "yarp/enc/yp_encoding.h"
-
-static size_t
-yp_encoding_big5_char_width(const uint8_t *b, ptrdiff_t n) {
-    // These are the single byte characters.
-    if (*b < 0x80) {
-        return 1;
-    }
-
-    // These are the double byte characters.
-    if ((n > 1) && (b[0] >= 0xA1 && b[0] <= 0xFE) && (b[1] >= 0x40 && b[1] <= 0xFE)) {
-        return 2;
-    }
-
-    return 0;
-}
-
-static size_t
-yp_encoding_big5_alpha_char(const uint8_t *b, ptrdiff_t n) {
-    if (yp_encoding_big5_char_width(b, n) == 1) {
-        return yp_encoding_ascii_alpha_char(b, n);
-    } else {
-        return 0;
-    }
-}
-
-static size_t
-yp_encoding_big5_alnum_char(const uint8_t *b, ptrdiff_t n) {
-    if (yp_encoding_big5_char_width(b, n) == 1) {
-        return yp_encoding_ascii_alnum_char(b, n);
-    } else {
-        return 0;
-    }
-}
-
-static bool
-yp_encoding_big5_isupper_char(const uint8_t *b, ptrdiff_t n) {
-    if (yp_encoding_big5_char_width(b, n) == 1) {
-        return yp_encoding_ascii_isupper_char(b, n);
-    } else {
-        return false;
-    }
-}
-
-yp_encoding_t yp_encoding_big5 = {
-    .name = "big5",
-    .char_width = yp_encoding_big5_char_width,
-    .alnum_char = yp_encoding_big5_alnum_char,
-    .alpha_char = yp_encoding_big5_alpha_char,
-    .isupper_char = yp_encoding_big5_isupper_char,
-    .multibyte = true
-};
diff --git a/yarp/enc/yp_encoding.h b/yarp/enc/yp_encoding.h
deleted file mode 100644
index 9e8e7e01f60dba..00000000000000
--- a/yarp/enc/yp_encoding.h
+++ /dev/null
@@ -1,95 +0,0 @@
-#ifndef YARP_ENCODING_H
-#define YARP_ENCODING_H
-
-#include "yarp/defines.h"
-
-#include <assert.h>
-#include <stdbool.h>
-#include <stddef.h>
-#include <stdint.h>
-
-// This struct defines the functions necessary to implement the encoding
-// interface so we can determine how many bytes the subsequent character takes.
-// Each callback should return the number of bytes, or 0 if the next bytes are
-// invalid for the encoding and type.
-typedef struct {
-    // Return the number of bytes that the next character takes if it is valid
-    // in the encoding. Does not read more than n bytes. It is assumed that n is
-    // at least 1.
-    size_t (*char_width)(const uint8_t *b, ptrdiff_t n);
-
-    // Return the number of bytes that the next character takes if it is valid
-    // in the encoding and is alphabetical. Does not read more than n bytes. It
-    // is assumed that n is at least 1.
-    size_t (*alpha_char)(const uint8_t *b, ptrdiff_t n);
-
-    // Return the number of bytes that the next character takes if it is valid
-    // in the encoding and is alphanumeric. Does not read more than n bytes. It
-    // is assumed that n is at least 1.
-    size_t (*alnum_char)(const uint8_t *b, ptrdiff_t n);
-
-    // Return true if the next character is valid in the encoding and is an
-    // uppercase character. Does not read more than n bytes. It is assumed that
-    // n is at least 1.
-    bool (*isupper_char)(const uint8_t *b, ptrdiff_t n);
-
-    // The name of the encoding. This should correspond to a value that can be
-    // passed to Encoding.find in Ruby.
-    const char *name;
-
-    // Return true if the encoding is a multibyte encoding.
-    bool multibyte;
-} yp_encoding_t;
-
-// These bits define the location of each bit of metadata within the various
-// lookup tables that are used to determine the properties of a character.
-#define YP_ENCODING_ALPHABETIC_BIT 1 << 0
-#define YP_ENCODING_ALPHANUMERIC_BIT 1 << 1
-#define YP_ENCODING_UPPERCASE_BIT 1 << 2
-
-// These functions are reused by some other encodings, so they are defined here
-// so they can be shared.
-size_t yp_encoding_ascii_alpha_char(const uint8_t *b, YP_ATTRIBUTE_UNUSED ptrdiff_t n);
-size_t yp_encoding_ascii_alnum_char(const uint8_t *b, YP_ATTRIBUTE_UNUSED ptrdiff_t n);
-bool yp_encoding_ascii_isupper_char(const uint8_t *b, YP_ATTRIBUTE_UNUSED ptrdiff_t n);
-
-// These functions are shared between the actual encoding and the fast path in
-// the parser so they need to be internally visible.
-size_t yp_encoding_utf_8_alpha_char(const uint8_t *b, ptrdiff_t n);
-size_t yp_encoding_utf_8_alnum_char(const uint8_t *b, ptrdiff_t n);
-
-// This lookup table is referenced in both the UTF-8 encoding file and the
-// parser directly in order to speed up the default encoding processing.
-extern uint8_t yp_encoding_unicode_table[256];
-
-// These are the encodings that are supported by the parser. They are defined in
-// their own files in the src/enc directory.
-extern yp_encoding_t yp_encoding_ascii;
-extern yp_encoding_t yp_encoding_ascii_8bit;
-extern yp_encoding_t yp_encoding_big5;
-extern yp_encoding_t yp_encoding_euc_jp;
-extern yp_encoding_t yp_encoding_gbk;
-extern yp_encoding_t yp_encoding_iso_8859_1;
-extern yp_encoding_t yp_encoding_iso_8859_2;
-extern yp_encoding_t yp_encoding_iso_8859_3;
-extern yp_encoding_t yp_encoding_iso_8859_4;
-extern yp_encoding_t yp_encoding_iso_8859_5;
-extern yp_encoding_t yp_encoding_iso_8859_6;
-extern yp_encoding_t yp_encoding_iso_8859_7;
-extern yp_encoding_t yp_encoding_iso_8859_8;
-extern yp_encoding_t yp_encoding_iso_8859_9;
-extern yp_encoding_t yp_encoding_iso_8859_10;
-extern yp_encoding_t yp_encoding_iso_8859_11;
-extern yp_encoding_t yp_encoding_iso_8859_13;
-extern yp_encoding_t yp_encoding_iso_8859_14;
-extern yp_encoding_t yp_encoding_iso_8859_15;
-extern yp_encoding_t yp_encoding_iso_8859_16;
-extern yp_encoding_t yp_encoding_koi8_r;
-extern yp_encoding_t yp_encoding_shift_jis;
-extern yp_encoding_t yp_encoding_utf_8;
-extern yp_encoding_t yp_encoding_utf8_mac;
-extern yp_encoding_t yp_encoding_windows_31j;
-extern yp_encoding_t yp_encoding_windows_1251;
-extern yp_encoding_t yp_encoding_windows_1252;
-
-#endif
diff --git a/yarp/enc/yp_euc_jp.c b/yarp/enc/yp_euc_jp.c
deleted file mode 100644
index f6f80d528bcde0..00000000000000
--- a/yarp/enc/yp_euc_jp.c
+++ /dev/null
@@ -1,58 +0,0 @@
-#include "yarp/enc/yp_encoding.h"
-
-static size_t
-yp_encoding_euc_jp_char_width(const uint8_t *b, ptrdiff_t n) {
-    // These are the single byte characters.
-    if (*b < 0x80) {
-        return 1;
-    }
-
-    // These are the double byte characters.
-    if (
-        (n > 1) &&
-        (
-            ((b[0] == 0x8E) && (b[1] >= 0xA1 && b[1] <= 0xFE)) ||
-            ((b[0] >= 0xA1 && b[0] <= 0xFE) && (b[1] >= 0xA1 && b[1] <= 0xFE))
-        )
-    ) {
-        return 2;
-    }
-
-    return 0;
-}
-
-static size_t
-yp_encoding_euc_jp_alpha_char(const uint8_t *b, ptrdiff_t n) {
-    if (yp_encoding_euc_jp_char_width(b, n) == 1) {
-        return yp_encoding_ascii_alpha_char(b, n);
-    } else {
-        return 0;
-    }
-}
-
-static size_t
-yp_encoding_euc_jp_alnum_char(const uint8_t *b, ptrdiff_t n) {
-    if (yp_encoding_euc_jp_char_width(b, n) == 1) {
-        return yp_encoding_ascii_alnum_char(b, n);
-    } else {
-        return 0;
-    }
-}
-
-static bool
-yp_encoding_euc_jp_isupper_char(const uint8_t *b, ptrdiff_t n) {
-    if (yp_encoding_euc_jp_char_width(b, n) == 1) {
-        return yp_encoding_ascii_isupper_char(b, n);
-    } else {
-        return 0;
-    }
-}
-
-yp_encoding_t yp_encoding_euc_jp = {
-    .name = "euc-jp",
-    .char_width = yp_encoding_euc_jp_char_width,
-    .alnum_char = yp_encoding_euc_jp_alnum_char,
-    .alpha_char = yp_encoding_euc_jp_alpha_char,
-    .isupper_char = yp_encoding_euc_jp_isupper_char,
-    .multibyte = true
-};
diff --git a/yarp/enc/yp_gbk.c b/yarp/enc/yp_gbk.c
deleted file mode 100644
index 71de318612d45d..00000000000000
--- a/yarp/enc/yp_gbk.c
+++ /dev/null
@@ -1,61 +0,0 @@
-#include "yarp/enc/yp_encoding.h"
-
-static size_t
-yp_encoding_gbk_char_width(const uint8_t *b, ptrdiff_t n) {
-    // These are the single byte characters.
-    if (*b < 0x80) {
-        return 1;
-    }
-
-    // These are the double byte characters.
-    if (
-        (n > 1) &&
-        (
-            ((b[0] >= 0xA1 && b[0] <= 0xA9) && (b[1] >= 0xA1 && b[1] <= 0xFE)) || // GBK/1
-            ((b[0] >= 0xB0 && b[0] <= 0xF7) && (b[1] >= 0xA1 && b[1] <= 0xFE)) || // GBK/2
-            ((b[0] >= 0x81 && b[0] <= 0xA0) && (b[1] >= 0x40 && b[1] <= 0xFE) && (b[1] != 0x7F)) || // GBK/3
-            ((b[0] >= 0xAA && b[0] <= 0xFE) && (b[1] >= 0x40 && b[1] <= 0xA0) && (b[1] != 0x7F)) || // GBK/4
-            ((b[0] >= 0xA8 && b[0] <= 0xA9) && (b[1] >= 0x40 && b[1] <= 0xA0) && (b[1] != 0x7F)) // GBK/5
-        )
-    ) {
-        return 2;
-    }
-
-    return 0;
-}
-
-static size_t
-yp_encoding_gbk_alpha_char(const uint8_t *b, ptrdiff_t n) {
-    if (yp_encoding_gbk_char_width(b, n) == 1) {
-        return yp_encoding_ascii_alpha_char(b, n);
-    } else {
-        return 0;
-    }
-}
-
-static size_t
-yp_encoding_gbk_alnum_char(const uint8_t *b, ptrdiff_t n) {
-    if (yp_encoding_gbk_char_width(b, n) == 1) {
-        return yp_encoding_ascii_alnum_char(b, n);
-    } else {
-        return 0;
-    }
-}
-
-static bool
-yp_encoding_gbk_isupper_char(const uint8_t *b, ptrdiff_t n) {
-    if (yp_encoding_gbk_char_width(b, n) == 1) {
-        return yp_encoding_ascii_isupper_char(b, n);
-    } else {
-        return false;
-    }
-}
-
-yp_encoding_t yp_encoding_gbk = {
-    .name = "gbk",
-    .char_width = yp_encoding_gbk_char_width,
-    .alnum_char = yp_encoding_gbk_alnum_char,
-    .alpha_char = yp_encoding_gbk_alpha_char,
-    .isupper_char = yp_encoding_gbk_isupper_char,
-    .multibyte = true
-};
diff --git a/yarp/enc/yp_shift_jis.c b/yarp/enc/yp_shift_jis.c
deleted file mode 100644
index e6ca10d1fdc5b1..00000000000000
--- a/yarp/enc/yp_shift_jis.c
+++ /dev/null
@@ -1,56 +0,0 @@
-#include "yarp/enc/yp_encoding.h"
-
-static size_t
-yp_encoding_shift_jis_char_width(const uint8_t *b, ptrdiff_t n) {
-    // These are the single byte characters.
-    if (*b < 0x80 || (*b >= 0xA1 && *b <= 0xDF)) {
-        return 1;
-    }
-
-    // These are the double byte characters.
-    if (
-        (n > 1) &&
-        ((b[0] >= 0x81 && b[0] <= 0x9F) || (b[0] >= 0xE0 && b[0] <= 0xFC)) &&
-        (b[1] >= 0x40 && b[1] <= 0xFC)
-    ) {
-        return 2;
-    }
-
-    return 0;
-}
-
-static size_t
-yp_encoding_shift_jis_alpha_char(const uint8_t *b, ptrdiff_t n) {
-    if (yp_encoding_shift_jis_char_width(b, n) == 1) {
-        return yp_encoding_ascii_alpha_char(b, n);
-    } else {
-        return 0;
-    }
-}
-
-static size_t
-yp_encoding_shift_jis_alnum_char(const uint8_t *b, ptrdiff_t n) {
-    if (yp_encoding_shift_jis_char_width(b, n) == 1) {
-        return yp_encoding_ascii_alnum_char(b, n);
-    } else {
-        return 0;
-    }
-}
-
-static bool
-yp_encoding_shift_jis_isupper_char(const uint8_t *b, ptrdiff_t n) {
-    if (yp_encoding_shift_jis_char_width(b, n) == 1) {
-        return yp_encoding_ascii_isupper_char(b, n);
-    } else {
-        return 0;
-    }
-}
-
-yp_encoding_t yp_encoding_shift_jis = {
-    .name = "shift_jis",
-    .char_width = yp_encoding_shift_jis_char_width,
-    .alnum_char = yp_encoding_shift_jis_alnum_char,
-    .alpha_char = yp_encoding_shift_jis_alpha_char,
-    .isupper_char = yp_encoding_shift_jis_isupper_char,
-    .multibyte = true
-};
diff --git a/yarp/enc/yp_tables.c b/yarp/enc/yp_tables.c
deleted file mode 100644
index 5504cd5419ac93..00000000000000
--- a/yarp/enc/yp_tables.c
+++ /dev/null
@@ -1,507 +0,0 @@
-#include "yarp/enc/yp_encoding.h"
-
-// Each element of the following table contains a bitfield that indicates a
-// piece of information about the corresponding ASCII character.
-static uint8_t yp_encoding_ascii_table[256] = {
-//  0  1  2  3  4  5  6  7  8  9  A  B  C  D  E  F
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 0x
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 1x
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 2x
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 0, 0, 0, 0, 0, 0, // 3x
-    0, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, // 4x
-    7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 0, 0, 0, 0, 0, // 5x
-    0, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, // 6x
-    3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 0, 0, 0, 0, 0, // 7x
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 8x
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 9x
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // Ax
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // Bx
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // Cx
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // Dx
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // Ex
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // Fx
-};
-
-// Each element of the following table contains a bitfield that indicates a
-// piece of information about the corresponding ISO-8859-1 character.
-static uint8_t yp_encoding_iso_8859_1_table[256] = {
-//  0  1  2  3  4  5  6  7  8  9  A  B  C  D  E  F
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 0x
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 1x
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 2x
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 0, 0, 0, 0, 0, 0, // 3x
-    0, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, // 4x
-    7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 0, 0, 0, 0, 0, // 5x
-    0, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, // 6x
-    3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 0, 0, 0, 0, 0, // 7x
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 8x
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 9x
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 0, 0, 0, 0, 0, // Ax
-    0, 0, 0, 0, 0, 3, 0, 0, 0, 0, 3, 0, 0, 0, 0, 0, // Bx
-    7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, // Cx
-    7, 7, 7, 7, 7, 7, 7, 0, 7, 7, 7, 7, 7, 7, 7, 3, // Dx
-    3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, // Ex
-    3, 3, 3, 3, 3, 3, 3, 0, 3, 3, 3, 3, 3, 3, 3, 3, // Fx
-};
-
-// Each element of the following table contains a bitfield that indicates a
-// piece of information about the corresponding ISO-8859-2 character.
-static uint8_t yp_encoding_iso_8859_2_table[256] = {
-//  0  1  2  3  4  5  6  7  8  9  A  B  C  D  E  F
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 0x
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 1x
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 2x
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 0, 0, 0, 0, 0, 0, // 3x
-    0, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, // 4x
-    7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 0, 0, 0, 0, 0, // 5x
-    0, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, // 6x
-    3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 0, 0, 0, 0, 0, // 7x
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 8x
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 9x
-    0, 7, 0, 7, 0, 7, 7, 0, 0, 7, 7, 7, 7, 0, 7, 7, // Ax
-    0, 3, 0, 3, 0, 3, 3, 0, 0, 3, 3, 3, 3, 0, 3, 3, // Bx
-    7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, // Cx
-    7, 7, 7, 7, 7, 7, 7, 0, 7, 7, 7, 7, 7, 7, 7, 3, // Dx
-    3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, // Ex
-    3, 3, 3, 3, 3, 3, 3, 0, 3, 3, 3, 3, 3, 3, 3, 0, // Fx
-};
-
-// Each element of the following table contains a bitfield that indicates a
-// piece of information about the corresponding ISO-8859-3 character.
-static uint8_t yp_encoding_iso_8859_3_table[256] = {
-//  0  1  2  3  4  5  6  7  8  9  A  B  C  D  E  F
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 0x
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 1x
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 2x
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 0, 0, 0, 0, 0, 0, // 3x
-    0, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, // 4x
-    7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 0, 0, 0, 0, 0, // 5x
-    0, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, // 6x
-    3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 0, 0, 0, 0, 0, // 7x
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 8x
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 9x
-    0, 7, 0, 0, 0, 0, 7, 0, 0, 7, 7, 7, 7, 0, 0, 7, // Ax
-    0, 3, 0, 0, 0, 3, 3, 0, 0, 3, 3, 3, 3, 0, 0, 3, // Bx
-    7, 7, 7, 0, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, // Cx
-    0, 7, 7, 7, 7, 7, 7, 0, 7, 7, 7, 7, 7, 7, 7, 3, // Dx
-    3, 3, 3, 0, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, // Ex
-    0, 3, 3, 3, 3, 3, 3, 0, 3, 3, 3, 3, 3, 3, 3, 0, // Fx
-};
-
-// Each element of the following table contains a bitfield that indicates a
-// piece of information about the corresponding ISO-8859-4 character.
-static uint8_t yp_encoding_iso_8859_4_table[256] = {
-//  0  1  2  3  4  5  6  7  8  9  A  B  C  D  E  F
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 0x
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 1x
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 2x
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 0, 0, 0, 0, 0, 0, // 3x
-    0, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, // 4x
-    7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 0, 0, 0, 0, 0, // 5x
-    0, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, // 6x
-    3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 0, 0, 0, 0, 0, // 7x
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 8x
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 9x
-    0, 7, 3, 7, 0, 7, 7, 0, 0, 7, 7, 7, 7, 0, 7, 0, // Ax
-    0, 3, 0, 3, 0, 3, 3, 0, 0, 3, 3, 3, 3, 7, 3, 3, // Bx
-    7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, // Cx
-    7, 7, 7, 7, 7, 7, 7, 0, 7, 7, 7, 7, 7, 7, 7, 3, // Dx
-    3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, // Ex
-    3, 3, 3, 3, 3, 3, 3, 0, 3, 3, 3, 3, 3, 3, 3, 0, // Fx
-};
-
-// Each element of the following table contains a bitfield that indicates a
-// piece of information about the corresponding ISO-8859-5 character.
-static uint8_t yp_encoding_iso_8859_5_table[256] = {
-//  0  1  2  3  4  5  6  7  8  9  A  B  C  D  E  F
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 0x
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 1x
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 2x
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 0, 0, 0, 0, 0, 0, // 3x
-    0, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, // 4x
-    7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 0, 0, 0, 0, 0, // 5x
-    0, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, // 6x
-    3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 0, 0, 0, 0, 0, // 7x
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 8x
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 9x
-    0, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 0, 7, 7, // Ax
-    7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, // Bx
-    7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, // Cx
-    3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, // Dx
-    3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, // Ex
-    0, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 0, 3, 3, // Fx
-};
-
-// Each element of the following table contains a bitfield that indicates a
-// piece of information about the corresponding ISO-8859-6 character.
-static uint8_t yp_encoding_iso_8859_6_table[256] = {
-//  0  1  2  3  4  5  6  7  8  9  A  B  C  D  E  F
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 0x
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 1x
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 2x
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 0, 0, 0, 0, 0, 0, // 3x
-    0, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, // 4x
-    7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 0, 0, 0, 0, 0, // 5x
-    0, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, // 6x
-    3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 0, 0, 0, 0, 0, // 7x
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 8x
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 9x
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // Ax
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // Bx
-    0, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, // Cx
-    3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 0, 0, 0, 0, 0, // Dx
-    3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, // Ex
-    3, 3, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // Fx
-};
-
-// Each element of the following table contains a bitfield that indicates a
-// piece of information about the corresponding ISO-8859-7 character.
-static uint8_t yp_encoding_iso_8859_7_table[256] = {
-//  0  1  2  3  4  5  6  7  8  9  A  B  C  D  E  F
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 0x
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 1x
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 2x
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 0, 0, 0, 0, 0, 0, // 3x
-    0, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, // 4x
-    7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 0, 0, 0, 0, 0, // 5x
-    0, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, // 6x
-    3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 0, 0, 0, 0, 0, // 7x
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 8x
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 9x
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // Ax
-    0, 0, 0, 0, 0, 0, 7, 0, 7, 7, 7, 0, 7, 0, 7, 7, // Bx
-    3, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, // Cx
-    7, 7, 0, 7, 7, 7, 7, 7, 7, 7, 7, 7, 3, 3, 3, 3, // Dx
-    3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, // Ex
-    3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 0, // Fx
-};
-
-// Each element of the following table contains a bitfield that indicates a
-// piece of information about the corresponding ISO-8859-8 character.
-static uint8_t yp_encoding_iso_8859_8_table[256] = {
-//  0  1  2  3  4  5  6  7  8  9  A  B  C  D  E  F
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 0x
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 1x
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 2x
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 0, 0, 0, 0, 0, 0, // 3x
-    0, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, // 4x
-    7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 0, 0, 0, 0, 0, // 5x
-    0, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, // 6x
-    3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 0, 0, 0, 0, 0, // 7x
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 8x
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 9x
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // Ax
-    0, 0, 0, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // Bx
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // Cx
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // Dx
-    3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, // Ex
-    3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 0, 0, 0, 0, 0, // Fx
-};
-
-// Each element of the following table contains a bitfield that indicates a
-// piece of information about the corresponding ISO-8859-9 character.
-static uint8_t yp_encoding_iso_8859_9_table[256] = {
-//  0  1  2  3  4  5  6  7  8  9  A  B  C  D  E  F
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 0x
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 1x
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 2x
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 0, 0, 0, 0, 0, 0, // 3x
-    0, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, // 4x
-    7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 0, 0, 0, 0, 0, // 5x
-    0, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, // 6x
-    3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 0, 0, 0, 0, 0, // 7x
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 8x
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 9x
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 0, 0, 0, 0, 0, // Ax
-    0, 0, 0, 0, 0, 3, 0, 0, 0, 0, 3, 0, 0, 0, 0, 0, // Bx
-    7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, // Cx
-    7, 7, 7, 7, 7, 7, 7, 0, 7, 7, 7, 7, 7, 7, 7, 3, // Dx
-    3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, // Ex
-    3, 3, 3, 3, 3, 3, 3, 0, 3, 3, 3, 3, 3, 3, 3, 3, // Fx
-};
-
-// Each element of the following table contains a bitfield that indicates a
-// piece of information about the corresponding ISO-8859-10 character.
-static uint8_t yp_encoding_iso_8859_10_table[256] = {
-//  0  1  2  3  4  5  6  7  8  9  A  B  C  D  E  F
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 0x
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 1x
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 2x
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 0, 0, 0, 0, 0, 0, // 3x
-    0, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, // 4x
-    7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 0, 0, 0, 0, 0, // 5x
-    0, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, // 6x
-    3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 0, 0, 0, 0, 0, // 7x
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 8x
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 9x
-    0, 7, 7, 7, 7, 7, 7, 0, 7, 7, 7, 7, 7, 0, 7, 7, // Ax
-    0, 3, 3, 3, 3, 3, 3, 0, 3, 3, 3, 3, 3, 0, 3, 3, // Bx
-    7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, // Cx
-    7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 3, // Dx
-    3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, // Ex
-    3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, // Fx
-};
-
-// Each element of the following table contains a bitfield that indicates a
-// piece of information about the corresponding ISO-8859-11 character.
-static uint8_t yp_encoding_iso_8859_11_table[256] = {
-//  0  1  2  3  4  5  6  7  8  9  A  B  C  D  E  F
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 0x
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 1x
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 2x
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 0, 0, 0, 0, 0, 0, // 3x
-    0, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, // 4x
-    7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 0, 0, 0, 0, 0, // 5x
-    0, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, // 6x
-    3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 0, 0, 0, 0, 0, // 7x
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 8x
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 9x
-    0, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, // Ax
-    3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, // Bx
-    3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, // Cx
-    3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 0, 0, 0, 0, 3, // Dx
-    3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, // Ex
-    3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 0, 0, 0, 0, // Fx
-};
-
-// Each element of the following table contains a bitfield that indicates a
-// piece of information about the corresponding ISO-8859-13 character.
-static uint8_t yp_encoding_iso_8859_13_table[256] = {
-//  0  1  2  3  4  5  6  7  8  9  A  B  C  D  E  F
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 0x
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 1x
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 2x
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 0, 0, 0, 0, 0, 0, // 3x
-    0, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, // 4x
-    7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 0, 0, 0, 0, 0, // 5x
-    0, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, // 6x
-    3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 0, 0, 0, 0, 0, // 7x
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 8x
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 9x
-    0, 0, 0, 0, 0, 0, 0, 0, 7, 0, 7, 0, 0, 0, 0, 7, // Ax
-    0, 0, 0, 0, 0, 3, 0, 0, 3, 0, 3, 0, 0, 0, 0, 3, // Bx
-    7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, // Cx
-    7, 7, 7, 7, 7, 7, 7, 0, 7, 7, 7, 7, 7, 7, 7, 3, // Dx
-    3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, // Ex
-    3, 3, 3, 3, 3, 3, 3, 0, 3, 3, 3, 3, 3, 3, 3, 0, // Fx
-};
-
-// Each element of the following table contains a bitfield that indicates a
-// piece of information about the corresponding ISO-8859-14 character.
-static uint8_t yp_encoding_iso_8859_14_table[256] = {
-//  0  1  2  3  4  5  6  7  8  9  A  B  C  D  E  F
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 0x
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 1x
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 2x
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 0, 0, 0, 0, 0, 0, // 3x
-    0, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, // 4x
-    7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 0, 0, 0, 0, 0, // 5x
-    0, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, // 6x
-    3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 0, 0, 0, 0, 0, // 7x
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 8x
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 9x
-    0, 7, 3, 0, 7, 3, 7, 0, 7, 0, 7, 3, 7, 0, 0, 7, // Ax
-    7, 3, 7, 3, 7, 3, 0, 7, 3, 3, 3, 7, 3, 7, 3, 3, // Bx
-    7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, // Cx
-    7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 3, // Dx
-    3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, // Ex
-    3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, // Fx
-};
-
-// Each element of the following table contains a bitfield that indicates a
-// piece of information about the corresponding ISO-8859-15 character.
-static uint8_t yp_encoding_iso_8859_15_table[256] = {
-//  0  1  2  3  4  5  6  7  8  9  A  B  C  D  E  F
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 0x
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 1x
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 2x
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 0, 0, 0, 0, 0, 0, // 3x
-    0, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, // 4x
-    7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 0, 0, 0, 0, 0, // 5x
-    0, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, // 6x
-    3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 0, 0, 0, 0, 0, // 7x
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 8x
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 9x
-    0, 0, 0, 0, 0, 0, 7, 0, 3, 0, 3, 0, 0, 0, 0, 0, // Ax
-    0, 0, 0, 0, 7, 3, 0, 0, 3, 0, 3, 0, 7, 3, 7, 0, // Bx
-    7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, // Cx
-    7, 7, 7, 7, 7, 7, 7, 0, 7, 7, 7, 7, 7, 7, 7, 3, // Dx
-    3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, // Ex
-    3, 3, 3, 3, 3, 3, 3, 0, 3, 3, 3, 3, 3, 3, 3, 3, // Fx
-};
-
-// Each element of the following table contains a bitfield that indicates a
-// piece of information about the corresponding ISO-8859-16 character.
-static uint8_t yp_encoding_iso_8859_16_table[256] = {
-//  0  1  2  3  4  5  6  7  8  9  A  B  C  D  E  F
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 0x
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 1x
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 2x
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 0, 0, 0, 0, 0, 0, // 3x
-    0, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, // 4x
-    7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 0, 0, 0, 0, 0, // 5x
-    0, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, // 6x
-    3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 0, 0, 0, 0, 0, // 7x
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 8x
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 9x
-    0, 7, 3, 7, 0, 0, 7, 0, 3, 0, 7, 0, 7, 0, 3, 7, // Ax
-    0, 0, 7, 3, 7, 0, 0, 0, 3, 3, 3, 0, 7, 3, 7, 3, // Bx
-    7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, // Cx
-    7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 3, // Dx
-    3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, // Ex
-    3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, // Fx
-};
-
-// Each element of the following table contains a bitfield that indicates a
-// piece of information about the corresponding KOI8-R character.
-static uint8_t yp_encoding_koi8_r_table[256] = {
-//  0  1  2  3  4  5  6  7  8  9  A  B  C  D  E  F
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 0x
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 1x
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 2x
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 0, 0, 0, 0, 0, 0, // 3x
-    0, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, // 4x
-    7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 0, 0, 0, 0, 0, // 5x
-    0, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, // 6x
-    3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 0, 0, 0, 0, 0, // 7x
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 8x
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 9x
-    0, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // Ax
-    0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // Bx
-    3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, // Cx
-    3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, // Dx
-    7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, // Ex
-    7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, // Fx
-};
-
-// Each element of the following table contains a bitfield that indicates a
-// piece of information about the corresponding windows-1251 character.
-static uint8_t yp_encoding_windows_1251_table[256] = {
-//  0  1  2  3  4  5  6  7  8  9  A  B  C  D  E  F
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 0x
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 1x
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 2x
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 0, 0, 0, 0, 0, 0, // 3x
-    0, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, // 4x
-    7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 0, 0, 0, 0, 0, // 5x
-    0, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, // 6x
-    3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 0, 0, 0, 0, 0, // 7x
-    7, 7, 0, 3, 0, 0, 0, 0, 0, 0, 7, 0, 7, 7, 7, 7, // 8x
-    3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 0, 3, 3, 3, 3, // 9x
-    0, 7, 3, 7, 0, 7, 0, 0, 7, 0, 7, 0, 0, 0, 0, 7, // Ax
-    0, 0, 7, 3, 3, 3, 0, 0, 3, 0, 3, 0, 3, 7, 3, 3, // Bx
-    7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, // Cx
-    7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, // Dx
-    3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, // Ex
-    3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, // Fx
-};
-
-// Each element of the following table contains a bitfield that indicates a
-// piece of information about the corresponding windows-1252 character.
-static uint8_t yp_encoding_windows_1252_table[256] = {
-//  0  1  2  3  4  5  6  7  8  9  A  B  C  D  E  F
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 0x
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 1x
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 2x
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 0, 0, 0, 0, 0, 0, // 3x
-    0, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, // 4x
-    7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 0, 0, 0, 0, 0, // 5x
-    0, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, // 6x
-    3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 0, 0, 0, 0, 0, // 7x
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 0, 7, 0, 7, 0, // 8x
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 0, 3, 0, 3, 7, // 9x
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 0, 0, 0, 0, 0, // Ax
-    0, 0, 0, 0, 0, 3, 0, 0, 0, 0, 3, 0, 0, 0, 0, 0, // Bx
-    7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, // Cx
-    7, 7, 7, 7, 7, 7, 7, 0, 7, 7, 7, 7, 7, 7, 7, 3, // Dx
-    3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, // Ex
-    3, 3, 3, 3, 3, 3, 3, 0, 3, 3, 3, 3, 3, 3, 3, 3, // Fx
-};
-
-static size_t
-yp_encoding_ascii_char_width(const uint8_t *b, YP_ATTRIBUTE_UNUSED ptrdiff_t n) {
-    return *b < 0x80 ? 1 : 0;
-}
-
-size_t
-yp_encoding_ascii_alpha_char(const uint8_t *b, YP_ATTRIBUTE_UNUSED ptrdiff_t n) {
-    return (yp_encoding_ascii_table[*b] & YP_ENCODING_ALPHABETIC_BIT);
-}
-
-size_t
-yp_encoding_ascii_alnum_char(const uint8_t *b, YP_ATTRIBUTE_UNUSED ptrdiff_t n) {
-    return (yp_encoding_ascii_table[*b] & YP_ENCODING_ALPHANUMERIC_BIT) ? 1 : 0;
-}
-
-bool
-yp_encoding_ascii_isupper_char(const uint8_t *b, YP_ATTRIBUTE_UNUSED ptrdiff_t n) {
-    return (yp_encoding_ascii_table[*b] & YP_ENCODING_UPPERCASE_BIT);
-}
-
-static size_t
-yp_encoding_koi8_r_char_width(const uint8_t *b, YP_ATTRIBUTE_UNUSED ptrdiff_t n) {
-    return ((*b >= 0x20 && *b <= 0x7E) || (*b >= 0x80)) ? 1 : 0;
-}
-
-static size_t
-yp_encoding_single_char_width(YP_ATTRIBUTE_UNUSED const uint8_t *b, YP_ATTRIBUTE_UNUSED ptrdiff_t n) {
-    return 1;
-}
-
-yp_encoding_t yp_encoding_ascii = {
-    .name = "ascii",
-    .char_width = yp_encoding_ascii_char_width,
-    .alnum_char = yp_encoding_ascii_alnum_char,
-    .alpha_char = yp_encoding_ascii_alpha_char,
-    .isupper_char = yp_encoding_ascii_isupper_char,
-    .multibyte = false
-};
-
-yp_encoding_t yp_encoding_ascii_8bit = {
-    .name = "ascii-8bit",
-    .char_width = yp_encoding_single_char_width,
-    .alnum_char = yp_encoding_ascii_alnum_char,
-    .alpha_char = yp_encoding_ascii_alpha_char,
-    .isupper_char = yp_encoding_ascii_isupper_char,
-    .multibyte = false
-};
-
-#define YP_ENCODING_TABLE(s, i, w) \
-    static size_t yp_encoding_ ##i ## _alpha_char(const uint8_t *b, YP_ATTRIBUTE_UNUSED ptrdiff_t n) {           \
-        return (yp_encoding_ ##i ## _table[*b] & YP_ENCODING_ALPHABETIC_BIT);           \
-    }                                                                                                         \
-    static size_t yp_encoding_ ##i ## _alnum_char(const uint8_t *b, YP_ATTRIBUTE_UNUSED ptrdiff_t n) {           \
-        return (yp_encoding_ ##i ## _table[*b] & YP_ENCODING_ALPHANUMERIC_BIT) ? 1 : 0; \
-    }                                                                                                         \
-    static bool yp_encoding_ ##i ## _isupper_char(const uint8_t *b, YP_ATTRIBUTE_UNUSED ptrdiff_t n) {           \
-        return (yp_encoding_ ##i ## _table[*b] & YP_ENCODING_UPPERCASE_BIT);            \
-    }                                                                                                         \
-    yp_encoding_t yp_encoding_ ##i = {                                                                        \
-        .name = s,                                                                                            \
-        .char_width = w,                                                                                      \
-        .alnum_char = yp_encoding_ ##i ## _alnum_char,                                                        \
-        .alpha_char = yp_encoding_ ##i ## _alpha_char,                                                        \
-        .isupper_char = yp_encoding_ ##i ## _isupper_char,                                                    \
-        .multibyte = false,                                                                                   \
-    };
-
-YP_ENCODING_TABLE("iso-8859-1", iso_8859_1, yp_encoding_single_char_width)
-YP_ENCODING_TABLE("iso-8859-2", iso_8859_2, yp_encoding_single_char_width)
-YP_ENCODING_TABLE("iso-8859-3", iso_8859_3, yp_encoding_single_char_width)
-YP_ENCODING_TABLE("iso-8859-4", iso_8859_4, yp_encoding_single_char_width)
-YP_ENCODING_TABLE("iso-8859-5", iso_8859_5, yp_encoding_single_char_width)
-YP_ENCODING_TABLE("iso-8859-6", iso_8859_6, yp_encoding_single_char_width)
-YP_ENCODING_TABLE("iso-8859-7", iso_8859_7, yp_encoding_single_char_width)
-YP_ENCODING_TABLE("iso-8859-8", iso_8859_8, yp_encoding_single_char_width)
-YP_ENCODING_TABLE("iso-8859-9", iso_8859_9, yp_encoding_single_char_width)
-YP_ENCODING_TABLE("iso-8859-10", iso_8859_10, yp_encoding_single_char_width)
-YP_ENCODING_TABLE("iso-8859-11", iso_8859_11, yp_encoding_single_char_width)
-YP_ENCODING_TABLE("iso-8859-13", iso_8859_13, yp_encoding_single_char_width)
-YP_ENCODING_TABLE("iso-8859-14", iso_8859_14, yp_encoding_single_char_width)
-YP_ENCODING_TABLE("iso-8859-15", iso_8859_15, yp_encoding_single_char_width)
-YP_ENCODING_TABLE("iso-8859-16", iso_8859_16, yp_encoding_single_char_width)
-YP_ENCODING_TABLE("koi8-r", koi8_r, yp_encoding_koi8_r_char_width)
-YP_ENCODING_TABLE("windows-1251", windows_1251, yp_encoding_single_char_width)
-YP_ENCODING_TABLE("windows-1252", windows_1252, yp_encoding_single_char_width)
-
-#undef YP_ENCODING_TABLE
diff --git a/yarp/enc/yp_unicode.c b/yarp/enc/yp_unicode.c
deleted file mode 100644
index bb4e041309baa7..00000000000000
--- a/yarp/enc/yp_unicode.c
+++ /dev/null
@@ -1,2324 +0,0 @@
-// Note that the UTF-8 decoding code is based on Bjoern Hoehrmann's UTF-8 DFA
-// decoder. See http://bjoern.hoehrmann.de/utf-8/decoder/dfa/ for details.
-
-#include "yarp/enc/yp_encoding.h"
-
-typedef uint32_t yp_unicode_codepoint_t;
-
-// Each element of the following table contains a bitfield that indicates a
-// piece of information about the corresponding unicode codepoint. Note that
-// this table is different from other encodings where we used a lookup table
-// because the indices of those tables are the byte representations, not the
-// codepoints themselves.
-uint8_t yp_encoding_unicode_table[256] = {
-//  0  1  2  3  4  5  6  7  8  9  A  B  C  D  E  F
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 0x
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 1x
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 2x
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 0, 0, 0, 0, 0, 0, // 3x
-    0, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, // 4x
-    7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 0, 0, 0, 0, 0, // 5x
-    0, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, // 6x
-    3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 0, 0, 0, 0, 0, // 7x
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 8x
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 9x
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 0, 0, 0, 0, 0, // Ax
-    0, 0, 0, 0, 0, 3, 0, 0, 0, 0, 3, 0, 0, 0, 0, 0, // Bx
-    7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, // Cx
-    7, 7, 7, 7, 7, 7, 7, 0, 7, 7, 7, 7, 7, 7, 7, 3, // Dx
-    3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, // Ex
-    3, 3, 3, 3, 3, 3, 3, 0, 3, 3, 3, 3, 3, 3, 3, 3, // Fx
-};
-
-#define UNICODE_ALPHA_CODEPOINTS_LENGTH 1450
-static yp_unicode_codepoint_t unicode_alpha_codepoints[UNICODE_ALPHA_CODEPOINTS_LENGTH] = {
-    0x100, 0x2C1,
-    0x2C6, 0x2D1,
-    0x2E0, 0x2E4,
-    0x2EC, 0x2EC,
-    0x2EE, 0x2EE,
-    0x345, 0x345,
-    0x370, 0x374,
-    0x376, 0x377,
-    0x37A, 0x37D,
-    0x37F, 0x37F,
-    0x386, 0x386,
-    0x388, 0x38A,
-    0x38C, 0x38C,
-    0x38E, 0x3A1,
-    0x3A3, 0x3F5,
-    0x3F7, 0x481,
-    0x48A, 0x52F,
-    0x531, 0x556,
-    0x559, 0x559,
-    0x560, 0x588,
-    0x5B0, 0x5BD,
-    0x5BF, 0x5BF,
-    0x5C1, 0x5C2,
-    0x5C4, 0x5C5,
-    0x5C7, 0x5C7,
-    0x5D0, 0x5EA,
-    0x5EF, 0x5F2,
-    0x610, 0x61A,
-    0x620, 0x657,
-    0x659, 0x65F,
-    0x66E, 0x6D3,
-    0x6D5, 0x6DC,
-    0x6E1, 0x6E8,
-    0x6ED, 0x6EF,
-    0x6FA, 0x6FC,
-    0x6FF, 0x6FF,
-    0x710, 0x73F,
-    0x74D, 0x7B1,
-    0x7CA, 0x7EA,
-    0x7F4, 0x7F5,
-    0x7FA, 0x7FA,
-    0x800, 0x817,
-    0x81A, 0x82C,
-    0x840, 0x858,
-    0x860, 0x86A,
-    0x870, 0x887,
-    0x889, 0x88E,
-    0x8A0, 0x8C9,
-    0x8D4, 0x8DF,
-    0x8E3, 0x8E9,
-    0x8F0, 0x93B,
-    0x93D, 0x94C,
-    0x94E, 0x950,
-    0x955, 0x963,
-    0x971, 0x983,
-    0x985, 0x98C,
-    0x98F, 0x990,
-    0x993, 0x9A8,
-    0x9AA, 0x9B0,
-    0x9B2, 0x9B2,
-    0x9B6, 0x9B9,
-    0x9BD, 0x9C4,
-    0x9C7, 0x9C8,
-    0x9CB, 0x9CC,
-    0x9CE, 0x9CE,
-    0x9D7, 0x9D7,
-    0x9DC, 0x9DD,
-    0x9DF, 0x9E3,
-    0x9F0, 0x9F1,
-    0x9FC, 0x9FC,
-    0xA01, 0xA03,
-    0xA05, 0xA0A,
-    0xA0F, 0xA10,
-    0xA13, 0xA28,
-    0xA2A, 0xA30,
-    0xA32, 0xA33,
-    0xA35, 0xA36,
-    0xA38, 0xA39,
-    0xA3E, 0xA42,
-    0xA47, 0xA48,
-    0xA4B, 0xA4C,
-    0xA51, 0xA51,
-    0xA59, 0xA5C,
-    0xA5E, 0xA5E,
-    0xA70, 0xA75,
-    0xA81, 0xA83,
-    0xA85, 0xA8D,
-    0xA8F, 0xA91,
-    0xA93, 0xAA8,
-    0xAAA, 0xAB0,
-    0xAB2, 0xAB3,
-    0xAB5, 0xAB9,
-    0xABD, 0xAC5,
-    0xAC7, 0xAC9,
-    0xACB, 0xACC,
-    0xAD0, 0xAD0,
-    0xAE0, 0xAE3,
-    0xAF9, 0xAFC,
-    0xB01, 0xB03,
-    0xB05, 0xB0C,
-    0xB0F, 0xB10,
-    0xB13, 0xB28,
-    0xB2A, 0xB30,
-    0xB32, 0xB33,
-    0xB35, 0xB39,
-    0xB3D, 0xB44,
-    0xB47, 0xB48,
-    0xB4B, 0xB4C,
-    0xB56, 0xB57,
-    0xB5C, 0xB5D,
-    0xB5F, 0xB63,
-    0xB71, 0xB71,
-    0xB82, 0xB83,
-    0xB85, 0xB8A,
-    0xB8E, 0xB90,
-    0xB92, 0xB95,
-    0xB99, 0xB9A,
-    0xB9C, 0xB9C,
-    0xB9E, 0xB9F,
-    0xBA3, 0xBA4,
-    0xBA8, 0xBAA,
-    0xBAE, 0xBB9,
-    0xBBE, 0xBC2,
-    0xBC6, 0xBC8,
-    0xBCA, 0xBCC,
-    0xBD0, 0xBD0,
-    0xBD7, 0xBD7,
-    0xC00, 0xC0C,
-    0xC0E, 0xC10,
-    0xC12, 0xC28,
-    0xC2A, 0xC39,
-    0xC3D, 0xC44,
-    0xC46, 0xC48,
-    0xC4A, 0xC4C,
-    0xC55, 0xC56,
-    0xC58, 0xC5A,
-    0xC5D, 0xC5D,
-    0xC60, 0xC63,
-    0xC80, 0xC83,
-    0xC85, 0xC8C,
-    0xC8E, 0xC90,
-    0xC92, 0xCA8,
-    0xCAA, 0xCB3,
-    0xCB5, 0xCB9,
-    0xCBD, 0xCC4,
-    0xCC6, 0xCC8,
-    0xCCA, 0xCCC,
-    0xCD5, 0xCD6,
-    0xCDD, 0xCDE,
-    0xCE0, 0xCE3,
-    0xCF1, 0xCF3,
-    0xD00, 0xD0C,
-    0xD0E, 0xD10,
-    0xD12, 0xD3A,
-    0xD3D, 0xD44,
-    0xD46, 0xD48,
-    0xD4A, 0xD4C,
-    0xD4E, 0xD4E,
-    0xD54, 0xD57,
-    0xD5F, 0xD63,
-    0xD7A, 0xD7F,
-    0xD81, 0xD83,
-    0xD85, 0xD96,
-    0xD9A, 0xDB1,
-    0xDB3, 0xDBB,
-    0xDBD, 0xDBD,
-    0xDC0, 0xDC6,
-    0xDCF, 0xDD4,
-    0xDD6, 0xDD6,
-    0xDD8, 0xDDF,
-    0xDF2, 0xDF3,
-    0xE01, 0xE3A,
-    0xE40, 0xE46,
-    0xE4D, 0xE4D,
-    0xE81, 0xE82,
-    0xE84, 0xE84,
-    0xE86, 0xE8A,
-    0xE8C, 0xEA3,
-    0xEA5, 0xEA5,
-    0xEA7, 0xEB9,
-    0xEBB, 0xEBD,
-    0xEC0, 0xEC4,
-    0xEC6, 0xEC6,
-    0xECD, 0xECD,
-    0xEDC, 0xEDF,
-    0xF00, 0xF00,
-    0xF40, 0xF47,
-    0xF49, 0xF6C,
-    0xF71, 0xF83,
-    0xF88, 0xF97,
-    0xF99, 0xFBC,
-    0x1000, 0x1036,
-    0x1038, 0x1038,
-    0x103B, 0x103F,
-    0x1050, 0x108F,
-    0x109A, 0x109D,
-    0x10A0, 0x10C5,
-    0x10C7, 0x10C7,
-    0x10CD, 0x10CD,
-    0x10D0, 0x10FA,
-    0x10FC, 0x1248,
-    0x124A, 0x124D,
-    0x1250, 0x1256,
-    0x1258, 0x1258,
-    0x125A, 0x125D,
-    0x1260, 0x1288,
-    0x128A, 0x128D,
-    0x1290, 0x12B0,
-    0x12B2, 0x12B5,
-    0x12B8, 0x12BE,
-    0x12C0, 0x12C0,
-    0x12C2, 0x12C5,
-    0x12C8, 0x12D6,
-    0x12D8, 0x1310,
-    0x1312, 0x1315,
-    0x1318, 0x135A,
-    0x1380, 0x138F,
-    0x13A0, 0x13F5,
-    0x13F8, 0x13FD,
-    0x1401, 0x166C,
-    0x166F, 0x167F,
-    0x1681, 0x169A,
-    0x16A0, 0x16EA,
-    0x16EE, 0x16F8,
-    0x1700, 0x1713,
-    0x171F, 0x1733,
-    0x1740, 0x1753,
-    0x1760, 0x176C,
-    0x176E, 0x1770,
-    0x1772, 0x1773,
-    0x1780, 0x17B3,
-    0x17B6, 0x17C8,
-    0x17D7, 0x17D7,
-    0x17DC, 0x17DC,
-    0x1820, 0x1878,
-    0x1880, 0x18AA,
-    0x18B0, 0x18F5,
-    0x1900, 0x191E,
-    0x1920, 0x192B,
-    0x1930, 0x1938,
-    0x1950, 0x196D,
-    0x1970, 0x1974,
-    0x1980, 0x19AB,
-    0x19B0, 0x19C9,
-    0x1A00, 0x1A1B,
-    0x1A20, 0x1A5E,
-    0x1A61, 0x1A74,
-    0x1AA7, 0x1AA7,
-    0x1ABF, 0x1AC0,
-    0x1ACC, 0x1ACE,
-    0x1B00, 0x1B33,
-    0x1B35, 0x1B43,
-    0x1B45, 0x1B4C,
-    0x1B80, 0x1BA9,
-    0x1BAC, 0x1BAF,
-    0x1BBA, 0x1BE5,
-    0x1BE7, 0x1BF1,
-    0x1C00, 0x1C36,
-    0x1C4D, 0x1C4F,
-    0x1C5A, 0x1C7D,
-    0x1C80, 0x1C88,
-    0x1C90, 0x1CBA,
-    0x1CBD, 0x1CBF,
-    0x1CE9, 0x1CEC,
-    0x1CEE, 0x1CF3,
-    0x1CF5, 0x1CF6,
-    0x1CFA, 0x1CFA,
-    0x1D00, 0x1DBF,
-    0x1DE7, 0x1DF4,
-    0x1E00, 0x1F15,
-    0x1F18, 0x1F1D,
-    0x1F20, 0x1F45,
-    0x1F48, 0x1F4D,
-    0x1F50, 0x1F57,
-    0x1F59, 0x1F59,
-    0x1F5B, 0x1F5B,
-    0x1F5D, 0x1F5D,
-    0x1F5F, 0x1F7D,
-    0x1F80, 0x1FB4,
-    0x1FB6, 0x1FBC,
-    0x1FBE, 0x1FBE,
-    0x1FC2, 0x1FC4,
-    0x1FC6, 0x1FCC,
-    0x1FD0, 0x1FD3,
-    0x1FD6, 0x1FDB,
-    0x1FE0, 0x1FEC,
-    0x1FF2, 0x1FF4,
-    0x1FF6, 0x1FFC,
-    0x2071, 0x2071,
-    0x207F, 0x207F,
-    0x2090, 0x209C,
-    0x2102, 0x2102,
-    0x2107, 0x2107,
-    0x210A, 0x2113,
-    0x2115, 0x2115,
-    0x2119, 0x211D,
-    0x2124, 0x2124,
-    0x2126, 0x2126,
-    0x2128, 0x2128,
-    0x212A, 0x212D,
-    0x212F, 0x2139,
-    0x213C, 0x213F,
-    0x2145, 0x2149,
-    0x214E, 0x214E,
-    0x2160, 0x2188,
-    0x24B6, 0x24E9,
-    0x2C00, 0x2CE4,
-    0x2CEB, 0x2CEE,
-    0x2CF2, 0x2CF3,
-    0x2D00, 0x2D25,
-    0x2D27, 0x2D27,
-    0x2D2D, 0x2D2D,
-    0x2D30, 0x2D67,
-    0x2D6F, 0x2D6F,
-    0x2D80, 0x2D96,
-    0x2DA0, 0x2DA6,
-    0x2DA8, 0x2DAE,
-    0x2DB0, 0x2DB6,
-    0x2DB8, 0x2DBE,
-    0x2DC0, 0x2DC6,
-    0x2DC8, 0x2DCE,
-    0x2DD0, 0x2DD6,
-    0x2DD8, 0x2DDE,
-    0x2DE0, 0x2DFF,
-    0x2E2F, 0x2E2F,
-    0x3005, 0x3007,
-    0x3021, 0x3029,
-    0x3031, 0x3035,
-    0x3038, 0x303C,
-    0x3041, 0x3096,
-    0x309D, 0x309F,
-    0x30A1, 0x30FA,
-    0x30FC, 0x30FF,
-    0x3105, 0x312F,
-    0x3131, 0x318E,
-    0x31A0, 0x31BF,
-    0x31F0, 0x31FF,
-    0x3400, 0x4DBF,
-    0x4E00, 0xA48C,
-    0xA4D0, 0xA4FD,
-    0xA500, 0xA60C,
-    0xA610, 0xA61F,
-    0xA62A, 0xA62B,
-    0xA640, 0xA66E,
-    0xA674, 0xA67B,
-    0xA67F, 0xA6EF,
-    0xA717, 0xA71F,
-    0xA722, 0xA788,
-    0xA78B, 0xA7CA,
-    0xA7D0, 0xA7D1,
-    0xA7D3, 0xA7D3,
-    0xA7D5, 0xA7D9,
-    0xA7F2, 0xA805,
-    0xA807, 0xA827,
-    0xA840, 0xA873,
-    0xA880, 0xA8C3,
-    0xA8C5, 0xA8C5,
-    0xA8F2, 0xA8F7,
-    0xA8FB, 0xA8FB,
-    0xA8FD, 0xA8FF,
-    0xA90A, 0xA92A,
-    0xA930, 0xA952,
-    0xA960, 0xA97C,
-    0xA980, 0xA9B2,
-    0xA9B4, 0xA9BF,
-    0xA9CF, 0xA9CF,
-    0xA9E0, 0xA9EF,
-    0xA9FA, 0xA9FE,
-    0xAA00, 0xAA36,
-    0xAA40, 0xAA4D,
-    0xAA60, 0xAA76,
-    0xAA7A, 0xAABE,
-    0xAAC0, 0xAAC0,
-    0xAAC2, 0xAAC2,
-    0xAADB, 0xAADD,
-    0xAAE0, 0xAAEF,
-    0xAAF2, 0xAAF5,
-    0xAB01, 0xAB06,
-    0xAB09, 0xAB0E,
-    0xAB11, 0xAB16,
-    0xAB20, 0xAB26,
-    0xAB28, 0xAB2E,
-    0xAB30, 0xAB5A,
-    0xAB5C, 0xAB69,
-    0xAB70, 0xABEA,
-    0xAC00, 0xD7A3,
-    0xD7B0, 0xD7C6,
-    0xD7CB, 0xD7FB,
-    0xF900, 0xFA6D,
-    0xFA70, 0xFAD9,
-    0xFB00, 0xFB06,
-    0xFB13, 0xFB17,
-    0xFB1D, 0xFB28,
-    0xFB2A, 0xFB36,
-    0xFB38, 0xFB3C,
-    0xFB3E, 0xFB3E,
-    0xFB40, 0xFB41,
-    0xFB43, 0xFB44,
-    0xFB46, 0xFBB1,
-    0xFBD3, 0xFD3D,
-    0xFD50, 0xFD8F,
-    0xFD92, 0xFDC7,
-    0xFDF0, 0xFDFB,
-    0xFE70, 0xFE74,
-    0xFE76, 0xFEFC,
-    0xFF21, 0xFF3A,
-    0xFF41, 0xFF5A,
-    0xFF66, 0xFFBE,
-    0xFFC2, 0xFFC7,
-    0xFFCA, 0xFFCF,
-    0xFFD2, 0xFFD7,
-    0xFFDA, 0xFFDC,
-    0x10000, 0x1000B,
-    0x1000D, 0x10026,
-    0x10028, 0x1003A,
-    0x1003C, 0x1003D,
-    0x1003F, 0x1004D,
-    0x10050, 0x1005D,
-    0x10080, 0x100FA,
-    0x10140, 0x10174,
-    0x10280, 0x1029C,
-    0x102A0, 0x102D0,
-    0x10300, 0x1031F,
-    0x1032D, 0x1034A,
-    0x10350, 0x1037A,
-    0x10380, 0x1039D,
-    0x103A0, 0x103C3,
-    0x103C8, 0x103CF,
-    0x103D1, 0x103D5,
-    0x10400, 0x1049D,
-    0x104B0, 0x104D3,
-    0x104D8, 0x104FB,
-    0x10500, 0x10527,
-    0x10530, 0x10563,
-    0x10570, 0x1057A,
-    0x1057C, 0x1058A,
-    0x1058C, 0x10592,
-    0x10594, 0x10595,
-    0x10597, 0x105A1,
-    0x105A3, 0x105B1,
-    0x105B3, 0x105B9,
-    0x105BB, 0x105BC,
-    0x10600, 0x10736,
-    0x10740, 0x10755,
-    0x10760, 0x10767,
-    0x10780, 0x10785,
-    0x10787, 0x107B0,
-    0x107B2, 0x107BA,
-    0x10800, 0x10805,
-    0x10808, 0x10808,
-    0x1080A, 0x10835,
-    0x10837, 0x10838,
-    0x1083C, 0x1083C,
-    0x1083F, 0x10855,
-    0x10860, 0x10876,
-    0x10880, 0x1089E,
-    0x108E0, 0x108F2,
-    0x108F4, 0x108F5,
-    0x10900, 0x10915,
-    0x10920, 0x10939,
-    0x10980, 0x109B7,
-    0x109BE, 0x109BF,
-    0x10A00, 0x10A03,
-    0x10A05, 0x10A06,
-    0x10A0C, 0x10A13,
-    0x10A15, 0x10A17,
-    0x10A19, 0x10A35,
-    0x10A60, 0x10A7C,
-    0x10A80, 0x10A9C,
-    0x10AC0, 0x10AC7,
-    0x10AC9, 0x10AE4,
-    0x10B00, 0x10B35,
-    0x10B40, 0x10B55,
-    0x10B60, 0x10B72,
-    0x10B80, 0x10B91,
-    0x10C00, 0x10C48,
-    0x10C80, 0x10CB2,
-    0x10CC0, 0x10CF2,
-    0x10D00, 0x10D27,
-    0x10E80, 0x10EA9,
-    0x10EAB, 0x10EAC,
-    0x10EB0, 0x10EB1,
-    0x10F00, 0x10F1C,
-    0x10F27, 0x10F27,
-    0x10F30, 0x10F45,
-    0x10F70, 0x10F81,
-    0x10FB0, 0x10FC4,
-    0x10FE0, 0x10FF6,
-    0x11000, 0x11045,
-    0x11071, 0x11075,
-    0x11080, 0x110B8,
-    0x110C2, 0x110C2,
-    0x110D0, 0x110E8,
-    0x11100, 0x11132,
-    0x11144, 0x11147,
-    0x11150, 0x11172,
-    0x11176, 0x11176,
-    0x11180, 0x111BF,
-    0x111C1, 0x111C4,
-    0x111CE, 0x111CF,
-    0x111DA, 0x111DA,
-    0x111DC, 0x111DC,
-    0x11200, 0x11211,
-    0x11213, 0x11234,
-    0x11237, 0x11237,
-    0x1123E, 0x11241,
-    0x11280, 0x11286,
-    0x11288, 0x11288,
-    0x1128A, 0x1128D,
-    0x1128F, 0x1129D,
-    0x1129F, 0x112A8,
-    0x112B0, 0x112E8,
-    0x11300, 0x11303,
-    0x11305, 0x1130C,
-    0x1130F, 0x11310,
-    0x11313, 0x11328,
-    0x1132A, 0x11330,
-    0x11332, 0x11333,
-    0x11335, 0x11339,
-    0x1133D, 0x11344,
-    0x11347, 0x11348,
-    0x1134B, 0x1134C,
-    0x11350, 0x11350,
-    0x11357, 0x11357,
-    0x1135D, 0x11363,
-    0x11400, 0x11441,
-    0x11443, 0x11445,
-    0x11447, 0x1144A,
-    0x1145F, 0x11461,
-    0x11480, 0x114C1,
-    0x114C4, 0x114C5,
-    0x114C7, 0x114C7,
-    0x11580, 0x115B5,
-    0x115B8, 0x115BE,
-    0x115D8, 0x115DD,
-    0x11600, 0x1163E,
-    0x11640, 0x11640,
-    0x11644, 0x11644,
-    0x11680, 0x116B5,
-    0x116B8, 0x116B8,
-    0x11700, 0x1171A,
-    0x1171D, 0x1172A,
-    0x11740, 0x11746,
-    0x11800, 0x11838,
-    0x118A0, 0x118DF,
-    0x118FF, 0x11906,
-    0x11909, 0x11909,
-    0x1190C, 0x11913,
-    0x11915, 0x11916,
-    0x11918, 0x11935,
-    0x11937, 0x11938,
-    0x1193B, 0x1193C,
-    0x1193F, 0x11942,
-    0x119A0, 0x119A7,
-    0x119AA, 0x119D7,
-    0x119DA, 0x119DF,
-    0x119E1, 0x119E1,
-    0x119E3, 0x119E4,
-    0x11A00, 0x11A32,
-    0x11A35, 0x11A3E,
-    0x11A50, 0x11A97,
-    0x11A9D, 0x11A9D,
-    0x11AB0, 0x11AF8,
-    0x11C00, 0x11C08,
-    0x11C0A, 0x11C36,
-    0x11C38, 0x11C3E,
-    0x11C40, 0x11C40,
-    0x11C72, 0x11C8F,
-    0x11C92, 0x11CA7,
-    0x11CA9, 0x11CB6,
-    0x11D00, 0x11D06,
-    0x11D08, 0x11D09,
-    0x11D0B, 0x11D36,
-    0x11D3A, 0x11D3A,
-    0x11D3C, 0x11D3D,
-    0x11D3F, 0x11D41,
-    0x11D43, 0x11D43,
-    0x11D46, 0x11D47,
-    0x11D60, 0x11D65,
-    0x11D67, 0x11D68,
-    0x11D6A, 0x11D8E,
-    0x11D90, 0x11D91,
-    0x11D93, 0x11D96,
-    0x11D98, 0x11D98,
-    0x11EE0, 0x11EF6,
-    0x11F00, 0x11F10,
-    0x11F12, 0x11F3A,
-    0x11F3E, 0x11F40,
-    0x11FB0, 0x11FB0,
-    0x12000, 0x12399,
-    0x12400, 0x1246E,
-    0x12480, 0x12543,
-    0x12F90, 0x12FF0,
-    0x13000, 0x1342F,
-    0x13441, 0x13446,
-    0x14400, 0x14646,
-    0x16800, 0x16A38,
-    0x16A40, 0x16A5E,
-    0x16A70, 0x16ABE,
-    0x16AD0, 0x16AED,
-    0x16B00, 0x16B2F,
-    0x16B40, 0x16B43,
-    0x16B63, 0x16B77,
-    0x16B7D, 0x16B8F,
-    0x16E40, 0x16E7F,
-    0x16F00, 0x16F4A,
-    0x16F4F, 0x16F87,
-    0x16F8F, 0x16F9F,
-    0x16FE0, 0x16FE1,
-    0x16FE3, 0x16FE3,
-    0x16FF0, 0x16FF1,
-    0x17000, 0x187F7,
-    0x18800, 0x18CD5,
-    0x18D00, 0x18D08,
-    0x1AFF0, 0x1AFF3,
-    0x1AFF5, 0x1AFFB,
-    0x1AFFD, 0x1AFFE,
-    0x1B000, 0x1B122,
-    0x1B132, 0x1B132,
-    0x1B150, 0x1B152,
-    0x1B155, 0x1B155,
-    0x1B164, 0x1B167,
-    0x1B170, 0x1B2FB,
-    0x1BC00, 0x1BC6A,
-    0x1BC70, 0x1BC7C,
-    0x1BC80, 0x1BC88,
-    0x1BC90, 0x1BC99,
-    0x1BC9E, 0x1BC9E,
-    0x1D400, 0x1D454,
-    0x1D456, 0x1D49C,
-    0x1D49E, 0x1D49F,
-    0x1D4A2, 0x1D4A2,
-    0x1D4A5, 0x1D4A6,
-    0x1D4A9, 0x1D4AC,
-    0x1D4AE, 0x1D4B9,
-    0x1D4BB, 0x1D4BB,
-    0x1D4BD, 0x1D4C3,
-    0x1D4C5, 0x1D505,
-    0x1D507, 0x1D50A,
-    0x1D50D, 0x1D514,
-    0x1D516, 0x1D51C,
-    0x1D51E, 0x1D539,
-    0x1D53B, 0x1D53E,
-    0x1D540, 0x1D544,
-    0x1D546, 0x1D546,
-    0x1D54A, 0x1D550,
-    0x1D552, 0x1D6A5,
-    0x1D6A8, 0x1D6C0,
-    0x1D6C2, 0x1D6DA,
-    0x1D6DC, 0x1D6FA,
-    0x1D6FC, 0x1D714,
-    0x1D716, 0x1D734,
-    0x1D736, 0x1D74E,
-    0x1D750, 0x1D76E,
-    0x1D770, 0x1D788,
-    0x1D78A, 0x1D7A8,
-    0x1D7AA, 0x1D7C2,
-    0x1D7C4, 0x1D7CB,
-    0x1DF00, 0x1DF1E,
-    0x1DF25, 0x1DF2A,
-    0x1E000, 0x1E006,
-    0x1E008, 0x1E018,
-    0x1E01B, 0x1E021,
-    0x1E023, 0x1E024,
-    0x1E026, 0x1E02A,
-    0x1E030, 0x1E06D,
-    0x1E08F, 0x1E08F,
-    0x1E100, 0x1E12C,
-    0x1E137, 0x1E13D,
-    0x1E14E, 0x1E14E,
-    0x1E290, 0x1E2AD,
-    0x1E2C0, 0x1E2EB,
-    0x1E4D0, 0x1E4EB,
-    0x1E7E0, 0x1E7E6,
-    0x1E7E8, 0x1E7EB,
-    0x1E7ED, 0x1E7EE,
-    0x1E7F0, 0x1E7FE,
-    0x1E800, 0x1E8C4,
-    0x1E900, 0x1E943,
-    0x1E947, 0x1E947,
-    0x1E94B, 0x1E94B,
-    0x1EE00, 0x1EE03,
-    0x1EE05, 0x1EE1F,
-    0x1EE21, 0x1EE22,
-    0x1EE24, 0x1EE24,
-    0x1EE27, 0x1EE27,
-    0x1EE29, 0x1EE32,
-    0x1EE34, 0x1EE37,
-    0x1EE39, 0x1EE39,
-    0x1EE3B, 0x1EE3B,
-    0x1EE42, 0x1EE42,
-    0x1EE47, 0x1EE47,
-    0x1EE49, 0x1EE49,
-    0x1EE4B, 0x1EE4B,
-    0x1EE4D, 0x1EE4F,
-    0x1EE51, 0x1EE52,
-    0x1EE54, 0x1EE54,
-    0x1EE57, 0x1EE57,
-    0x1EE59, 0x1EE59,
-    0x1EE5B, 0x1EE5B,
-    0x1EE5D, 0x1EE5D,
-    0x1EE5F, 0x1EE5F,
-    0x1EE61, 0x1EE62,
-    0x1EE64, 0x1EE64,
-    0x1EE67, 0x1EE6A,
-    0x1EE6C, 0x1EE72,
-    0x1EE74, 0x1EE77,
-    0x1EE79, 0x1EE7C,
-    0x1EE7E, 0x1EE7E,
-    0x1EE80, 0x1EE89,
-    0x1EE8B, 0x1EE9B,
-    0x1EEA1, 0x1EEA3,
-    0x1EEA5, 0x1EEA9,
-    0x1EEAB, 0x1EEBB,
-    0x1F130, 0x1F149,
-    0x1F150, 0x1F169,
-    0x1F170, 0x1F189,
-    0x20000, 0x2A6DF,
-    0x2A700, 0x2B739,
-    0x2B740, 0x2B81D,
-    0x2B820, 0x2CEA1,
-    0x2CEB0, 0x2EBE0,
-    0x2F800, 0x2FA1D,
-    0x30000, 0x3134A,
-    0x31350, 0x323AF,
-};
-
-#define UNICODE_ALNUM_CODEPOINTS_LENGTH 1528
-static yp_unicode_codepoint_t unicode_alnum_codepoints[UNICODE_ALNUM_CODEPOINTS_LENGTH] = {
-    0x100, 0x2C1,
-    0x2C6, 0x2D1,
-    0x2E0, 0x2E4,
-    0x2EC, 0x2EC,
-    0x2EE, 0x2EE,
-    0x345, 0x345,
-    0x370, 0x374,
-    0x376, 0x377,
-    0x37A, 0x37D,
-    0x37F, 0x37F,
-    0x386, 0x386,
-    0x388, 0x38A,
-    0x38C, 0x38C,
-    0x38E, 0x3A1,
-    0x3A3, 0x3F5,
-    0x3F7, 0x481,
-    0x48A, 0x52F,
-    0x531, 0x556,
-    0x559, 0x559,
-    0x560, 0x588,
-    0x5B0, 0x5BD,
-    0x5BF, 0x5BF,
-    0x5C1, 0x5C2,
-    0x5C4, 0x5C5,
-    0x5C7, 0x5C7,
-    0x5D0, 0x5EA,
-    0x5EF, 0x5F2,
-    0x610, 0x61A,
-    0x620, 0x657,
-    0x659, 0x669,
-    0x66E, 0x6D3,
-    0x6D5, 0x6DC,
-    0x6E1, 0x6E8,
-    0x6ED, 0x6FC,
-    0x6FF, 0x6FF,
-    0x710, 0x73F,
-    0x74D, 0x7B1,
-    0x7C0, 0x7EA,
-    0x7F4, 0x7F5,
-    0x7FA, 0x7FA,
-    0x800, 0x817,
-    0x81A, 0x82C,
-    0x840, 0x858,
-    0x860, 0x86A,
-    0x870, 0x887,
-    0x889, 0x88E,
-    0x8A0, 0x8C9,
-    0x8D4, 0x8DF,
-    0x8E3, 0x8E9,
-    0x8F0, 0x93B,
-    0x93D, 0x94C,
-    0x94E, 0x950,
-    0x955, 0x963,
-    0x966, 0x96F,
-    0x971, 0x983,
-    0x985, 0x98C,
-    0x98F, 0x990,
-    0x993, 0x9A8,
-    0x9AA, 0x9B0,
-    0x9B2, 0x9B2,
-    0x9B6, 0x9B9,
-    0x9BD, 0x9C4,
-    0x9C7, 0x9C8,
-    0x9CB, 0x9CC,
-    0x9CE, 0x9CE,
-    0x9D7, 0x9D7,
-    0x9DC, 0x9DD,
-    0x9DF, 0x9E3,
-    0x9E6, 0x9F1,
-    0x9FC, 0x9FC,
-    0xA01, 0xA03,
-    0xA05, 0xA0A,
-    0xA0F, 0xA10,
-    0xA13, 0xA28,
-    0xA2A, 0xA30,
-    0xA32, 0xA33,
-    0xA35, 0xA36,
-    0xA38, 0xA39,
-    0xA3E, 0xA42,
-    0xA47, 0xA48,
-    0xA4B, 0xA4C,
-    0xA51, 0xA51,
-    0xA59, 0xA5C,
-    0xA5E, 0xA5E,
-    0xA66, 0xA75,
-    0xA81, 0xA83,
-    0xA85, 0xA8D,
-    0xA8F, 0xA91,
-    0xA93, 0xAA8,
-    0xAAA, 0xAB0,
-    0xAB2, 0xAB3,
-    0xAB5, 0xAB9,
-    0xABD, 0xAC5,
-    0xAC7, 0xAC9,
-    0xACB, 0xACC,
-    0xAD0, 0xAD0,
-    0xAE0, 0xAE3,
-    0xAE6, 0xAEF,
-    0xAF9, 0xAFC,
-    0xB01, 0xB03,
-    0xB05, 0xB0C,
-    0xB0F, 0xB10,
-    0xB13, 0xB28,
-    0xB2A, 0xB30,
-    0xB32, 0xB33,
-    0xB35, 0xB39,
-    0xB3D, 0xB44,
-    0xB47, 0xB48,
-    0xB4B, 0xB4C,
-    0xB56, 0xB57,
-    0xB5C, 0xB5D,
-    0xB5F, 0xB63,
-    0xB66, 0xB6F,
-    0xB71, 0xB71,
-    0xB82, 0xB83,
-    0xB85, 0xB8A,
-    0xB8E, 0xB90,
-    0xB92, 0xB95,
-    0xB99, 0xB9A,
-    0xB9C, 0xB9C,
-    0xB9E, 0xB9F,
-    0xBA3, 0xBA4,
-    0xBA8, 0xBAA,
-    0xBAE, 0xBB9,
-    0xBBE, 0xBC2,
-    0xBC6, 0xBC8,
-    0xBCA, 0xBCC,
-    0xBD0, 0xBD0,
-    0xBD7, 0xBD7,
-    0xBE6, 0xBEF,
-    0xC00, 0xC0C,
-    0xC0E, 0xC10,
-    0xC12, 0xC28,
-    0xC2A, 0xC39,
-    0xC3D, 0xC44,
-    0xC46, 0xC48,
-    0xC4A, 0xC4C,
-    0xC55, 0xC56,
-    0xC58, 0xC5A,
-    0xC5D, 0xC5D,
-    0xC60, 0xC63,
-    0xC66, 0xC6F,
-    0xC80, 0xC83,
-    0xC85, 0xC8C,
-    0xC8E, 0xC90,
-    0xC92, 0xCA8,
-    0xCAA, 0xCB3,
-    0xCB5, 0xCB9,
-    0xCBD, 0xCC4,
-    0xCC6, 0xCC8,
-    0xCCA, 0xCCC,
-    0xCD5, 0xCD6,
-    0xCDD, 0xCDE,
-    0xCE0, 0xCE3,
-    0xCE6, 0xCEF,
-    0xCF1, 0xCF3,
-    0xD00, 0xD0C,
-    0xD0E, 0xD10,
-    0xD12, 0xD3A,
-    0xD3D, 0xD44,
-    0xD46, 0xD48,
-    0xD4A, 0xD4C,
-    0xD4E, 0xD4E,
-    0xD54, 0xD57,
-    0xD5F, 0xD63,
-    0xD66, 0xD6F,
-    0xD7A, 0xD7F,
-    0xD81, 0xD83,
-    0xD85, 0xD96,
-    0xD9A, 0xDB1,
-    0xDB3, 0xDBB,
-    0xDBD, 0xDBD,
-    0xDC0, 0xDC6,
-    0xDCF, 0xDD4,
-    0xDD6, 0xDD6,
-    0xDD8, 0xDDF,
-    0xDE6, 0xDEF,
-    0xDF2, 0xDF3,
-    0xE01, 0xE3A,
-    0xE40, 0xE46,
-    0xE4D, 0xE4D,
-    0xE50, 0xE59,
-    0xE81, 0xE82,
-    0xE84, 0xE84,
-    0xE86, 0xE8A,
-    0xE8C, 0xEA3,
-    0xEA5, 0xEA5,
-    0xEA7, 0xEB9,
-    0xEBB, 0xEBD,
-    0xEC0, 0xEC4,
-    0xEC6, 0xEC6,
-    0xECD, 0xECD,
-    0xED0, 0xED9,
-    0xEDC, 0xEDF,
-    0xF00, 0xF00,
-    0xF20, 0xF29,
-    0xF40, 0xF47,
-    0xF49, 0xF6C,
-    0xF71, 0xF83,
-    0xF88, 0xF97,
-    0xF99, 0xFBC,
-    0x1000, 0x1036,
-    0x1038, 0x1038,
-    0x103B, 0x1049,
-    0x1050, 0x109D,
-    0x10A0, 0x10C5,
-    0x10C7, 0x10C7,
-    0x10CD, 0x10CD,
-    0x10D0, 0x10FA,
-    0x10FC, 0x1248,
-    0x124A, 0x124D,
-    0x1250, 0x1256,
-    0x1258, 0x1258,
-    0x125A, 0x125D,
-    0x1260, 0x1288,
-    0x128A, 0x128D,
-    0x1290, 0x12B0,
-    0x12B2, 0x12B5,
-    0x12B8, 0x12BE,
-    0x12C0, 0x12C0,
-    0x12C2, 0x12C5,
-    0x12C8, 0x12D6,
-    0x12D8, 0x1310,
-    0x1312, 0x1315,
-    0x1318, 0x135A,
-    0x1380, 0x138F,
-    0x13A0, 0x13F5,
-    0x13F8, 0x13FD,
-    0x1401, 0x166C,
-    0x166F, 0x167F,
-    0x1681, 0x169A,
-    0x16A0, 0x16EA,
-    0x16EE, 0x16F8,
-    0x1700, 0x1713,
-    0x171F, 0x1733,
-    0x1740, 0x1753,
-    0x1760, 0x176C,
-    0x176E, 0x1770,
-    0x1772, 0x1773,
-    0x1780, 0x17B3,
-    0x17B6, 0x17C8,
-    0x17D7, 0x17D7,
-    0x17DC, 0x17DC,
-    0x17E0, 0x17E9,
-    0x1810, 0x1819,
-    0x1820, 0x1878,
-    0x1880, 0x18AA,
-    0x18B0, 0x18F5,
-    0x1900, 0x191E,
-    0x1920, 0x192B,
-    0x1930, 0x1938,
-    0x1946, 0x196D,
-    0x1970, 0x1974,
-    0x1980, 0x19AB,
-    0x19B0, 0x19C9,
-    0x19D0, 0x19D9,
-    0x1A00, 0x1A1B,
-    0x1A20, 0x1A5E,
-    0x1A61, 0x1A74,
-    0x1A80, 0x1A89,
-    0x1A90, 0x1A99,
-    0x1AA7, 0x1AA7,
-    0x1ABF, 0x1AC0,
-    0x1ACC, 0x1ACE,
-    0x1B00, 0x1B33,
-    0x1B35, 0x1B43,
-    0x1B45, 0x1B4C,
-    0x1B50, 0x1B59,
-    0x1B80, 0x1BA9,
-    0x1BAC, 0x1BE5,
-    0x1BE7, 0x1BF1,
-    0x1C00, 0x1C36,
-    0x1C40, 0x1C49,
-    0x1C4D, 0x1C7D,
-    0x1C80, 0x1C88,
-    0x1C90, 0x1CBA,
-    0x1CBD, 0x1CBF,
-    0x1CE9, 0x1CEC,
-    0x1CEE, 0x1CF3,
-    0x1CF5, 0x1CF6,
-    0x1CFA, 0x1CFA,
-    0x1D00, 0x1DBF,
-    0x1DE7, 0x1DF4,
-    0x1E00, 0x1F15,
-    0x1F18, 0x1F1D,
-    0x1F20, 0x1F45,
-    0x1F48, 0x1F4D,
-    0x1F50, 0x1F57,
-    0x1F59, 0x1F59,
-    0x1F5B, 0x1F5B,
-    0x1F5D, 0x1F5D,
-    0x1F5F, 0x1F7D,
-    0x1F80, 0x1FB4,
-    0x1FB6, 0x1FBC,
-    0x1FBE, 0x1FBE,
-    0x1FC2, 0x1FC4,
-    0x1FC6, 0x1FCC,
-    0x1FD0, 0x1FD3,
-    0x1FD6, 0x1FDB,
-    0x1FE0, 0x1FEC,
-    0x1FF2, 0x1FF4,
-    0x1FF6, 0x1FFC,
-    0x2071, 0x2071,
-    0x207F, 0x207F,
-    0x2090, 0x209C,
-    0x2102, 0x2102,
-    0x2107, 0x2107,
-    0x210A, 0x2113,
-    0x2115, 0x2115,
-    0x2119, 0x211D,
-    0x2124, 0x2124,
-    0x2126, 0x2126,
-    0x2128, 0x2128,
-    0x212A, 0x212D,
-    0x212F, 0x2139,
-    0x213C, 0x213F,
-    0x2145, 0x2149,
-    0x214E, 0x214E,
-    0x2160, 0x2188,
-    0x24B6, 0x24E9,
-    0x2C00, 0x2CE4,
-    0x2CEB, 0x2CEE,
-    0x2CF2, 0x2CF3,
-    0x2D00, 0x2D25,
-    0x2D27, 0x2D27,
-    0x2D2D, 0x2D2D,
-    0x2D30, 0x2D67,
-    0x2D6F, 0x2D6F,
-    0x2D80, 0x2D96,
-    0x2DA0, 0x2DA6,
-    0x2DA8, 0x2DAE,
-    0x2DB0, 0x2DB6,
-    0x2DB8, 0x2DBE,
-    0x2DC0, 0x2DC6,
-    0x2DC8, 0x2DCE,
-    0x2DD0, 0x2DD6,
-    0x2DD8, 0x2DDE,
-    0x2DE0, 0x2DFF,
-    0x2E2F, 0x2E2F,
-    0x3005, 0x3007,
-    0x3021, 0x3029,
-    0x3031, 0x3035,
-    0x3038, 0x303C,
-    0x3041, 0x3096,
-    0x309D, 0x309F,
-    0x30A1, 0x30FA,
-    0x30FC, 0x30FF,
-    0x3105, 0x312F,
-    0x3131, 0x318E,
-    0x31A0, 0x31BF,
-    0x31F0, 0x31FF,
-    0x3400, 0x4DBF,
-    0x4E00, 0xA48C,
-    0xA4D0, 0xA4FD,
-    0xA500, 0xA60C,
-    0xA610, 0xA62B,
-    0xA640, 0xA66E,
-    0xA674, 0xA67B,
-    0xA67F, 0xA6EF,
-    0xA717, 0xA71F,
-    0xA722, 0xA788,
-    0xA78B, 0xA7CA,
-    0xA7D0, 0xA7D1,
-    0xA7D3, 0xA7D3,
-    0xA7D5, 0xA7D9,
-    0xA7F2, 0xA805,
-    0xA807, 0xA827,
-    0xA840, 0xA873,
-    0xA880, 0xA8C3,
-    0xA8C5, 0xA8C5,
-    0xA8D0, 0xA8D9,
-    0xA8F2, 0xA8F7,
-    0xA8FB, 0xA8FB,
-    0xA8FD, 0xA92A,
-    0xA930, 0xA952,
-    0xA960, 0xA97C,
-    0xA980, 0xA9B2,
-    0xA9B4, 0xA9BF,
-    0xA9CF, 0xA9D9,
-    0xA9E0, 0xA9FE,
-    0xAA00, 0xAA36,
-    0xAA40, 0xAA4D,
-    0xAA50, 0xAA59,
-    0xAA60, 0xAA76,
-    0xAA7A, 0xAABE,
-    0xAAC0, 0xAAC0,
-    0xAAC2, 0xAAC2,
-    0xAADB, 0xAADD,
-    0xAAE0, 0xAAEF,
-    0xAAF2, 0xAAF5,
-    0xAB01, 0xAB06,
-    0xAB09, 0xAB0E,
-    0xAB11, 0xAB16,
-    0xAB20, 0xAB26,
-    0xAB28, 0xAB2E,
-    0xAB30, 0xAB5A,
-    0xAB5C, 0xAB69,
-    0xAB70, 0xABEA,
-    0xABF0, 0xABF9,
-    0xAC00, 0xD7A3,
-    0xD7B0, 0xD7C6,
-    0xD7CB, 0xD7FB,
-    0xF900, 0xFA6D,
-    0xFA70, 0xFAD9,
-    0xFB00, 0xFB06,
-    0xFB13, 0xFB17,
-    0xFB1D, 0xFB28,
-    0xFB2A, 0xFB36,
-    0xFB38, 0xFB3C,
-    0xFB3E, 0xFB3E,
-    0xFB40, 0xFB41,
-    0xFB43, 0xFB44,
-    0xFB46, 0xFBB1,
-    0xFBD3, 0xFD3D,
-    0xFD50, 0xFD8F,
-    0xFD92, 0xFDC7,
-    0xFDF0, 0xFDFB,
-    0xFE70, 0xFE74,
-    0xFE76, 0xFEFC,
-    0xFF10, 0xFF19,
-    0xFF21, 0xFF3A,
-    0xFF41, 0xFF5A,
-    0xFF66, 0xFFBE,
-    0xFFC2, 0xFFC7,
-    0xFFCA, 0xFFCF,
-    0xFFD2, 0xFFD7,
-    0xFFDA, 0xFFDC,
-    0x10000, 0x1000B,
-    0x1000D, 0x10026,
-    0x10028, 0x1003A,
-    0x1003C, 0x1003D,
-    0x1003F, 0x1004D,
-    0x10050, 0x1005D,
-    0x10080, 0x100FA,
-    0x10140, 0x10174,
-    0x10280, 0x1029C,
-    0x102A0, 0x102D0,
-    0x10300, 0x1031F,
-    0x1032D, 0x1034A,
-    0x10350, 0x1037A,
-    0x10380, 0x1039D,
-    0x103A0, 0x103C3,
-    0x103C8, 0x103CF,
-    0x103D1, 0x103D5,
-    0x10400, 0x1049D,
-    0x104A0, 0x104A9,
-    0x104B0, 0x104D3,
-    0x104D8, 0x104FB,
-    0x10500, 0x10527,
-    0x10530, 0x10563,
-    0x10570, 0x1057A,
-    0x1057C, 0x1058A,
-    0x1058C, 0x10592,
-    0x10594, 0x10595,
-    0x10597, 0x105A1,
-    0x105A3, 0x105B1,
-    0x105B3, 0x105B9,
-    0x105BB, 0x105BC,
-    0x10600, 0x10736,
-    0x10740, 0x10755,
-    0x10760, 0x10767,
-    0x10780, 0x10785,
-    0x10787, 0x107B0,
-    0x107B2, 0x107BA,
-    0x10800, 0x10805,
-    0x10808, 0x10808,
-    0x1080A, 0x10835,
-    0x10837, 0x10838,
-    0x1083C, 0x1083C,
-    0x1083F, 0x10855,
-    0x10860, 0x10876,
-    0x10880, 0x1089E,
-    0x108E0, 0x108F2,
-    0x108F4, 0x108F5,
-    0x10900, 0x10915,
-    0x10920, 0x10939,
-    0x10980, 0x109B7,
-    0x109BE, 0x109BF,
-    0x10A00, 0x10A03,
-    0x10A05, 0x10A06,
-    0x10A0C, 0x10A13,
-    0x10A15, 0x10A17,
-    0x10A19, 0x10A35,
-    0x10A60, 0x10A7C,
-    0x10A80, 0x10A9C,
-    0x10AC0, 0x10AC7,
-    0x10AC9, 0x10AE4,
-    0x10B00, 0x10B35,
-    0x10B40, 0x10B55,
-    0x10B60, 0x10B72,
-    0x10B80, 0x10B91,
-    0x10C00, 0x10C48,
-    0x10C80, 0x10CB2,
-    0x10CC0, 0x10CF2,
-    0x10D00, 0x10D27,
-    0x10D30, 0x10D39,
-    0x10E80, 0x10EA9,
-    0x10EAB, 0x10EAC,
-    0x10EB0, 0x10EB1,
-    0x10F00, 0x10F1C,
-    0x10F27, 0x10F27,
-    0x10F30, 0x10F45,
-    0x10F70, 0x10F81,
-    0x10FB0, 0x10FC4,
-    0x10FE0, 0x10FF6,
-    0x11000, 0x11045,
-    0x11066, 0x1106F,
-    0x11071, 0x11075,
-    0x11080, 0x110B8,
-    0x110C2, 0x110C2,
-    0x110D0, 0x110E8,
-    0x110F0, 0x110F9,
-    0x11100, 0x11132,
-    0x11136, 0x1113F,
-    0x11144, 0x11147,
-    0x11150, 0x11172,
-    0x11176, 0x11176,
-    0x11180, 0x111BF,
-    0x111C1, 0x111C4,
-    0x111CE, 0x111DA,
-    0x111DC, 0x111DC,
-    0x11200, 0x11211,
-    0x11213, 0x11234,
-    0x11237, 0x11237,
-    0x1123E, 0x11241,
-    0x11280, 0x11286,
-    0x11288, 0x11288,
-    0x1128A, 0x1128D,
-    0x1128F, 0x1129D,
-    0x1129F, 0x112A8,
-    0x112B0, 0x112E8,
-    0x112F0, 0x112F9,
-    0x11300, 0x11303,
-    0x11305, 0x1130C,
-    0x1130F, 0x11310,
-    0x11313, 0x11328,
-    0x1132A, 0x11330,
-    0x11332, 0x11333,
-    0x11335, 0x11339,
-    0x1133D, 0x11344,
-    0x11347, 0x11348,
-    0x1134B, 0x1134C,
-    0x11350, 0x11350,
-    0x11357, 0x11357,
-    0x1135D, 0x11363,
-    0x11400, 0x11441,
-    0x11443, 0x11445,
-    0x11447, 0x1144A,
-    0x11450, 0x11459,
-    0x1145F, 0x11461,
-    0x11480, 0x114C1,
-    0x114C4, 0x114C5,
-    0x114C7, 0x114C7,
-    0x114D0, 0x114D9,
-    0x11580, 0x115B5,
-    0x115B8, 0x115BE,
-    0x115D8, 0x115DD,
-    0x11600, 0x1163E,
-    0x11640, 0x11640,
-    0x11644, 0x11644,
-    0x11650, 0x11659,
-    0x11680, 0x116B5,
-    0x116B8, 0x116B8,
-    0x116C0, 0x116C9,
-    0x11700, 0x1171A,
-    0x1171D, 0x1172A,
-    0x11730, 0x11739,
-    0x11740, 0x11746,
-    0x11800, 0x11838,
-    0x118A0, 0x118E9,
-    0x118FF, 0x11906,
-    0x11909, 0x11909,
-    0x1190C, 0x11913,
-    0x11915, 0x11916,
-    0x11918, 0x11935,
-    0x11937, 0x11938,
-    0x1193B, 0x1193C,
-    0x1193F, 0x11942,
-    0x11950, 0x11959,
-    0x119A0, 0x119A7,
-    0x119AA, 0x119D7,
-    0x119DA, 0x119DF,
-    0x119E1, 0x119E1,
-    0x119E3, 0x119E4,
-    0x11A00, 0x11A32,
-    0x11A35, 0x11A3E,
-    0x11A50, 0x11A97,
-    0x11A9D, 0x11A9D,
-    0x11AB0, 0x11AF8,
-    0x11C00, 0x11C08,
-    0x11C0A, 0x11C36,
-    0x11C38, 0x11C3E,
-    0x11C40, 0x11C40,
-    0x11C50, 0x11C59,
-    0x11C72, 0x11C8F,
-    0x11C92, 0x11CA7,
-    0x11CA9, 0x11CB6,
-    0x11D00, 0x11D06,
-    0x11D08, 0x11D09,
-    0x11D0B, 0x11D36,
-    0x11D3A, 0x11D3A,
-    0x11D3C, 0x11D3D,
-    0x11D3F, 0x11D41,
-    0x11D43, 0x11D43,
-    0x11D46, 0x11D47,
-    0x11D50, 0x11D59,
-    0x11D60, 0x11D65,
-    0x11D67, 0x11D68,
-    0x11D6A, 0x11D8E,
-    0x11D90, 0x11D91,
-    0x11D93, 0x11D96,
-    0x11D98, 0x11D98,
-    0x11DA0, 0x11DA9,
-    0x11EE0, 0x11EF6,
-    0x11F00, 0x11F10,
-    0x11F12, 0x11F3A,
-    0x11F3E, 0x11F40,
-    0x11F50, 0x11F59,
-    0x11FB0, 0x11FB0,
-    0x12000, 0x12399,
-    0x12400, 0x1246E,
-    0x12480, 0x12543,
-    0x12F90, 0x12FF0,
-    0x13000, 0x1342F,
-    0x13441, 0x13446,
-    0x14400, 0x14646,
-    0x16800, 0x16A38,
-    0x16A40, 0x16A5E,
-    0x16A60, 0x16A69,
-    0x16A70, 0x16ABE,
-    0x16AC0, 0x16AC9,
-    0x16AD0, 0x16AED,
-    0x16B00, 0x16B2F,
-    0x16B40, 0x16B43,
-    0x16B50, 0x16B59,
-    0x16B63, 0x16B77,
-    0x16B7D, 0x16B8F,
-    0x16E40, 0x16E7F,
-    0x16F00, 0x16F4A,
-    0x16F4F, 0x16F87,
-    0x16F8F, 0x16F9F,
-    0x16FE0, 0x16FE1,
-    0x16FE3, 0x16FE3,
-    0x16FF0, 0x16FF1,
-    0x17000, 0x187F7,
-    0x18800, 0x18CD5,
-    0x18D00, 0x18D08,
-    0x1AFF0, 0x1AFF3,
-    0x1AFF5, 0x1AFFB,
-    0x1AFFD, 0x1AFFE,
-    0x1B000, 0x1B122,
-    0x1B132, 0x1B132,
-    0x1B150, 0x1B152,
-    0x1B155, 0x1B155,
-    0x1B164, 0x1B167,
-    0x1B170, 0x1B2FB,
-    0x1BC00, 0x1BC6A,
-    0x1BC70, 0x1BC7C,
-    0x1BC80, 0x1BC88,
-    0x1BC90, 0x1BC99,
-    0x1BC9E, 0x1BC9E,
-    0x1D400, 0x1D454,
-    0x1D456, 0x1D49C,
-    0x1D49E, 0x1D49F,
-    0x1D4A2, 0x1D4A2,
-    0x1D4A5, 0x1D4A6,
-    0x1D4A9, 0x1D4AC,
-    0x1D4AE, 0x1D4B9,
-    0x1D4BB, 0x1D4BB,
-    0x1D4BD, 0x1D4C3,
-    0x1D4C5, 0x1D505,
-    0x1D507, 0x1D50A,
-    0x1D50D, 0x1D514,
-    0x1D516, 0x1D51C,
-    0x1D51E, 0x1D539,
-    0x1D53B, 0x1D53E,
-    0x1D540, 0x1D544,
-    0x1D546, 0x1D546,
-    0x1D54A, 0x1D550,
-    0x1D552, 0x1D6A5,
-    0x1D6A8, 0x1D6C0,
-    0x1D6C2, 0x1D6DA,
-    0x1D6DC, 0x1D6FA,
-    0x1D6FC, 0x1D714,
-    0x1D716, 0x1D734,
-    0x1D736, 0x1D74E,
-    0x1D750, 0x1D76E,
-    0x1D770, 0x1D788,
-    0x1D78A, 0x1D7A8,
-    0x1D7AA, 0x1D7C2,
-    0x1D7C4, 0x1D7CB,
-    0x1D7CE, 0x1D7FF,
-    0x1DF00, 0x1DF1E,
-    0x1DF25, 0x1DF2A,
-    0x1E000, 0x1E006,
-    0x1E008, 0x1E018,
-    0x1E01B, 0x1E021,
-    0x1E023, 0x1E024,
-    0x1E026, 0x1E02A,
-    0x1E030, 0x1E06D,
-    0x1E08F, 0x1E08F,
-    0x1E100, 0x1E12C,
-    0x1E137, 0x1E13D,
-    0x1E140, 0x1E149,
-    0x1E14E, 0x1E14E,
-    0x1E290, 0x1E2AD,
-    0x1E2C0, 0x1E2EB,
-    0x1E2F0, 0x1E2F9,
-    0x1E4D0, 0x1E4EB,
-    0x1E4F0, 0x1E4F9,
-    0x1E7E0, 0x1E7E6,
-    0x1E7E8, 0x1E7EB,
-    0x1E7ED, 0x1E7EE,
-    0x1E7F0, 0x1E7FE,
-    0x1E800, 0x1E8C4,
-    0x1E900, 0x1E943,
-    0x1E947, 0x1E947,
-    0x1E94B, 0x1E94B,
-    0x1E950, 0x1E959,
-    0x1EE00, 0x1EE03,
-    0x1EE05, 0x1EE1F,
-    0x1EE21, 0x1EE22,
-    0x1EE24, 0x1EE24,
-    0x1EE27, 0x1EE27,
-    0x1EE29, 0x1EE32,
-    0x1EE34, 0x1EE37,
-    0x1EE39, 0x1EE39,
-    0x1EE3B, 0x1EE3B,
-    0x1EE42, 0x1EE42,
-    0x1EE47, 0x1EE47,
-    0x1EE49, 0x1EE49,
-    0x1EE4B, 0x1EE4B,
-    0x1EE4D, 0x1EE4F,
-    0x1EE51, 0x1EE52,
-    0x1EE54, 0x1EE54,
-    0x1EE57, 0x1EE57,
-    0x1EE59, 0x1EE59,
-    0x1EE5B, 0x1EE5B,
-    0x1EE5D, 0x1EE5D,
-    0x1EE5F, 0x1EE5F,
-    0x1EE61, 0x1EE62,
-    0x1EE64, 0x1EE64,
-    0x1EE67, 0x1EE6A,
-    0x1EE6C, 0x1EE72,
-    0x1EE74, 0x1EE77,
-    0x1EE79, 0x1EE7C,
-    0x1EE7E, 0x1EE7E,
-    0x1EE80, 0x1EE89,
-    0x1EE8B, 0x1EE9B,
-    0x1EEA1, 0x1EEA3,
-    0x1EEA5, 0x1EEA9,
-    0x1EEAB, 0x1EEBB,
-    0x1F130, 0x1F149,
-    0x1F150, 0x1F169,
-    0x1F170, 0x1F189,
-    0x1FBF0, 0x1FBF9,
-    0x20000, 0x2A6DF,
-    0x2A700, 0x2B739,
-    0x2B740, 0x2B81D,
-    0x2B820, 0x2CEA1,
-    0x2CEB0, 0x2EBE0,
-    0x2F800, 0x2FA1D,
-    0x30000, 0x3134A,
-    0x31350, 0x323AF,
-};
-
-#define UNICODE_ISUPPER_CODEPOINTS_LENGTH 1296
-static yp_unicode_codepoint_t unicode_isupper_codepoints[UNICODE_ISUPPER_CODEPOINTS_LENGTH] = {
-    0x100, 0x100,
-    0x102, 0x102,
-    0x104, 0x104,
-    0x106, 0x106,
-    0x108, 0x108,
-    0x10A, 0x10A,
-    0x10C, 0x10C,
-    0x10E, 0x10E,
-    0x110, 0x110,
-    0x112, 0x112,
-    0x114, 0x114,
-    0x116, 0x116,
-    0x118, 0x118,
-    0x11A, 0x11A,
-    0x11C, 0x11C,
-    0x11E, 0x11E,
-    0x120, 0x120,
-    0x122, 0x122,
-    0x124, 0x124,
-    0x126, 0x126,
-    0x128, 0x128,
-    0x12A, 0x12A,
-    0x12C, 0x12C,
-    0x12E, 0x12E,
-    0x130, 0x130,
-    0x132, 0x132,
-    0x134, 0x134,
-    0x136, 0x136,
-    0x139, 0x139,
-    0x13B, 0x13B,
-    0x13D, 0x13D,
-    0x13F, 0x13F,
-    0x141, 0x141,
-    0x143, 0x143,
-    0x145, 0x145,
-    0x147, 0x147,
-    0x14A, 0x14A,
-    0x14C, 0x14C,
-    0x14E, 0x14E,
-    0x150, 0x150,
-    0x152, 0x152,
-    0x154, 0x154,
-    0x156, 0x156,
-    0x158, 0x158,
-    0x15A, 0x15A,
-    0x15C, 0x15C,
-    0x15E, 0x15E,
-    0x160, 0x160,
-    0x162, 0x162,
-    0x164, 0x164,
-    0x166, 0x166,
-    0x168, 0x168,
-    0x16A, 0x16A,
-    0x16C, 0x16C,
-    0x16E, 0x16E,
-    0x170, 0x170,
-    0x172, 0x172,
-    0x174, 0x174,
-    0x176, 0x176,
-    0x178, 0x179,
-    0x17B, 0x17B,
-    0x17D, 0x17D,
-    0x181, 0x182,
-    0x184, 0x184,
-    0x186, 0x187,
-    0x189, 0x18B,
-    0x18E, 0x191,
-    0x193, 0x194,
-    0x196, 0x198,
-    0x19C, 0x19D,
-    0x19F, 0x1A0,
-    0x1A2, 0x1A2,
-    0x1A4, 0x1A4,
-    0x1A6, 0x1A7,
-    0x1A9, 0x1A9,
-    0x1AC, 0x1AC,
-    0x1AE, 0x1AF,
-    0x1B1, 0x1B3,
-    0x1B5, 0x1B5,
-    0x1B7, 0x1B8,
-    0x1BC, 0x1BC,
-    0x1C4, 0x1C4,
-    0x1C7, 0x1C7,
-    0x1CA, 0x1CA,
-    0x1CD, 0x1CD,
-    0x1CF, 0x1CF,
-    0x1D1, 0x1D1,
-    0x1D3, 0x1D3,
-    0x1D5, 0x1D5,
-    0x1D7, 0x1D7,
-    0x1D9, 0x1D9,
-    0x1DB, 0x1DB,
-    0x1DE, 0x1DE,
-    0x1E0, 0x1E0,
-    0x1E2, 0x1E2,
-    0x1E4, 0x1E4,
-    0x1E6, 0x1E6,
-    0x1E8, 0x1E8,
-    0x1EA, 0x1EA,
-    0x1EC, 0x1EC,
-    0x1EE, 0x1EE,
-    0x1F1, 0x1F1,
-    0x1F4, 0x1F4,
-    0x1F6, 0x1F8,
-    0x1FA, 0x1FA,
-    0x1FC, 0x1FC,
-    0x1FE, 0x1FE,
-    0x200, 0x200,
-    0x202, 0x202,
-    0x204, 0x204,
-    0x206, 0x206,
-    0x208, 0x208,
-    0x20A, 0x20A,
-    0x20C, 0x20C,
-    0x20E, 0x20E,
-    0x210, 0x210,
-    0x212, 0x212,
-    0x214, 0x214,
-    0x216, 0x216,
-    0x218, 0x218,
-    0x21A, 0x21A,
-    0x21C, 0x21C,
-    0x21E, 0x21E,
-    0x220, 0x220,
-    0x222, 0x222,
-    0x224, 0x224,
-    0x226, 0x226,
-    0x228, 0x228,
-    0x22A, 0x22A,
-    0x22C, 0x22C,
-    0x22E, 0x22E,
-    0x230, 0x230,
-    0x232, 0x232,
-    0x23A, 0x23B,
-    0x23D, 0x23E,
-    0x241, 0x241,
-    0x243, 0x246,
-    0x248, 0x248,
-    0x24A, 0x24A,
-    0x24C, 0x24C,
-    0x24E, 0x24E,
-    0x370, 0x370,
-    0x372, 0x372,
-    0x376, 0x376,
-    0x37F, 0x37F,
-    0x386, 0x386,
-    0x388, 0x38A,
-    0x38C, 0x38C,
-    0x38E, 0x38F,
-    0x391, 0x3A1,
-    0x3A3, 0x3AB,
-    0x3CF, 0x3CF,
-    0x3D2, 0x3D4,
-    0x3D8, 0x3D8,
-    0x3DA, 0x3DA,
-    0x3DC, 0x3DC,
-    0x3DE, 0x3DE,
-    0x3E0, 0x3E0,
-    0x3E2, 0x3E2,
-    0x3E4, 0x3E4,
-    0x3E6, 0x3E6,
-    0x3E8, 0x3E8,
-    0x3EA, 0x3EA,
-    0x3EC, 0x3EC,
-    0x3EE, 0x3EE,
-    0x3F4, 0x3F4,
-    0x3F7, 0x3F7,
-    0x3F9, 0x3FA,
-    0x3FD, 0x42F,
-    0x460, 0x460,
-    0x462, 0x462,
-    0x464, 0x464,
-    0x466, 0x466,
-    0x468, 0x468,
-    0x46A, 0x46A,
-    0x46C, 0x46C,
-    0x46E, 0x46E,
-    0x470, 0x470,
-    0x472, 0x472,
-    0x474, 0x474,
-    0x476, 0x476,
-    0x478, 0x478,
-    0x47A, 0x47A,
-    0x47C, 0x47C,
-    0x47E, 0x47E,
-    0x480, 0x480,
-    0x48A, 0x48A,
-    0x48C, 0x48C,
-    0x48E, 0x48E,
-    0x490, 0x490,
-    0x492, 0x492,
-    0x494, 0x494,
-    0x496, 0x496,
-    0x498, 0x498,
-    0x49A, 0x49A,
-    0x49C, 0x49C,
-    0x49E, 0x49E,
-    0x4A0, 0x4A0,
-    0x4A2, 0x4A2,
-    0x4A4, 0x4A4,
-    0x4A6, 0x4A6,
-    0x4A8, 0x4A8,
-    0x4AA, 0x4AA,
-    0x4AC, 0x4AC,
-    0x4AE, 0x4AE,
-    0x4B0, 0x4B0,
-    0x4B2, 0x4B2,
-    0x4B4, 0x4B4,
-    0x4B6, 0x4B6,
-    0x4B8, 0x4B8,
-    0x4BA, 0x4BA,
-    0x4BC, 0x4BC,
-    0x4BE, 0x4BE,
-    0x4C0, 0x4C1,
-    0x4C3, 0x4C3,
-    0x4C5, 0x4C5,
-    0x4C7, 0x4C7,
-    0x4C9, 0x4C9,
-    0x4CB, 0x4CB,
-    0x4CD, 0x4CD,
-    0x4D0, 0x4D0,
-    0x4D2, 0x4D2,
-    0x4D4, 0x4D4,
-    0x4D6, 0x4D6,
-    0x4D8, 0x4D8,
-    0x4DA, 0x4DA,
-    0x4DC, 0x4DC,
-    0x4DE, 0x4DE,
-    0x4E0, 0x4E0,
-    0x4E2, 0x4E2,
-    0x4E4, 0x4E4,
-    0x4E6, 0x4E6,
-    0x4E8, 0x4E8,
-    0x4EA, 0x4EA,
-    0x4EC, 0x4EC,
-    0x4EE, 0x4EE,
-    0x4F0, 0x4F0,
-    0x4F2, 0x4F2,
-    0x4F4, 0x4F4,
-    0x4F6, 0x4F6,
-    0x4F8, 0x4F8,
-    0x4FA, 0x4FA,
-    0x4FC, 0x4FC,
-    0x4FE, 0x4FE,
-    0x500, 0x500,
-    0x502, 0x502,
-    0x504, 0x504,
-    0x506, 0x506,
-    0x508, 0x508,
-    0x50A, 0x50A,
-    0x50C, 0x50C,
-    0x50E, 0x50E,
-    0x510, 0x510,
-    0x512, 0x512,
-    0x514, 0x514,
-    0x516, 0x516,
-    0x518, 0x518,
-    0x51A, 0x51A,
-    0x51C, 0x51C,
-    0x51E, 0x51E,
-    0x520, 0x520,
-    0x522, 0x522,
-    0x524, 0x524,
-    0x526, 0x526,
-    0x528, 0x528,
-    0x52A, 0x52A,
-    0x52C, 0x52C,
-    0x52E, 0x52E,
-    0x531, 0x556,
-    0x10A0, 0x10C5,
-    0x10C7, 0x10C7,
-    0x10CD, 0x10CD,
-    0x13A0, 0x13F5,
-    0x1C90, 0x1CBA,
-    0x1CBD, 0x1CBF,
-    0x1E00, 0x1E00,
-    0x1E02, 0x1E02,
-    0x1E04, 0x1E04,
-    0x1E06, 0x1E06,
-    0x1E08, 0x1E08,
-    0x1E0A, 0x1E0A,
-    0x1E0C, 0x1E0C,
-    0x1E0E, 0x1E0E,
-    0x1E10, 0x1E10,
-    0x1E12, 0x1E12,
-    0x1E14, 0x1E14,
-    0x1E16, 0x1E16,
-    0x1E18, 0x1E18,
-    0x1E1A, 0x1E1A,
-    0x1E1C, 0x1E1C,
-    0x1E1E, 0x1E1E,
-    0x1E20, 0x1E20,
-    0x1E22, 0x1E22,
-    0x1E24, 0x1E24,
-    0x1E26, 0x1E26,
-    0x1E28, 0x1E28,
-    0x1E2A, 0x1E2A,
-    0x1E2C, 0x1E2C,
-    0x1E2E, 0x1E2E,
-    0x1E30, 0x1E30,
-    0x1E32, 0x1E32,
-    0x1E34, 0x1E34,
-    0x1E36, 0x1E36,
-    0x1E38, 0x1E38,
-    0x1E3A, 0x1E3A,
-    0x1E3C, 0x1E3C,
-    0x1E3E, 0x1E3E,
-    0x1E40, 0x1E40,
-    0x1E42, 0x1E42,
-    0x1E44, 0x1E44,
-    0x1E46, 0x1E46,
-    0x1E48, 0x1E48,
-    0x1E4A, 0x1E4A,
-    0x1E4C, 0x1E4C,
-    0x1E4E, 0x1E4E,
-    0x1E50, 0x1E50,
-    0x1E52, 0x1E52,
-    0x1E54, 0x1E54,
-    0x1E56, 0x1E56,
-    0x1E58, 0x1E58,
-    0x1E5A, 0x1E5A,
-    0x1E5C, 0x1E5C,
-    0x1E5E, 0x1E5E,
-    0x1E60, 0x1E60,
-    0x1E62, 0x1E62,
-    0x1E64, 0x1E64,
-    0x1E66, 0x1E66,
-    0x1E68, 0x1E68,
-    0x1E6A, 0x1E6A,
-    0x1E6C, 0x1E6C,
-    0x1E6E, 0x1E6E,
-    0x1E70, 0x1E70,
-    0x1E72, 0x1E72,
-    0x1E74, 0x1E74,
-    0x1E76, 0x1E76,
-    0x1E78, 0x1E78,
-    0x1E7A, 0x1E7A,
-    0x1E7C, 0x1E7C,
-    0x1E7E, 0x1E7E,
-    0x1E80, 0x1E80,
-    0x1E82, 0x1E82,
-    0x1E84, 0x1E84,
-    0x1E86, 0x1E86,
-    0x1E88, 0x1E88,
-    0x1E8A, 0x1E8A,
-    0x1E8C, 0x1E8C,
-    0x1E8E, 0x1E8E,
-    0x1E90, 0x1E90,
-    0x1E92, 0x1E92,
-    0x1E94, 0x1E94,
-    0x1E9E, 0x1E9E,
-    0x1EA0, 0x1EA0,
-    0x1EA2, 0x1EA2,
-    0x1EA4, 0x1EA4,
-    0x1EA6, 0x1EA6,
-    0x1EA8, 0x1EA8,
-    0x1EAA, 0x1EAA,
-    0x1EAC, 0x1EAC,
-    0x1EAE, 0x1EAE,
-    0x1EB0, 0x1EB0,
-    0x1EB2, 0x1EB2,
-    0x1EB4, 0x1EB4,
-    0x1EB6, 0x1EB6,
-    0x1EB8, 0x1EB8,
-    0x1EBA, 0x1EBA,
-    0x1EBC, 0x1EBC,
-    0x1EBE, 0x1EBE,
-    0x1EC0, 0x1EC0,
-    0x1EC2, 0x1EC2,
-    0x1EC4, 0x1EC4,
-    0x1EC6, 0x1EC6,
-    0x1EC8, 0x1EC8,
-    0x1ECA, 0x1ECA,
-    0x1ECC, 0x1ECC,
-    0x1ECE, 0x1ECE,
-    0x1ED0, 0x1ED0,
-    0x1ED2, 0x1ED2,
-    0x1ED4, 0x1ED4,
-    0x1ED6, 0x1ED6,
-    0x1ED8, 0x1ED8,
-    0x1EDA, 0x1EDA,
-    0x1EDC, 0x1EDC,
-    0x1EDE, 0x1EDE,
-    0x1EE0, 0x1EE0,
-    0x1EE2, 0x1EE2,
-    0x1EE4, 0x1EE4,
-    0x1EE6, 0x1EE6,
-    0x1EE8, 0x1EE8,
-    0x1EEA, 0x1EEA,
-    0x1EEC, 0x1EEC,
-    0x1EEE, 0x1EEE,
-    0x1EF0, 0x1EF0,
-    0x1EF2, 0x1EF2,
-    0x1EF4, 0x1EF4,
-    0x1EF6, 0x1EF6,
-    0x1EF8, 0x1EF8,
-    0x1EFA, 0x1EFA,
-    0x1EFC, 0x1EFC,
-    0x1EFE, 0x1EFE,
-    0x1F08, 0x1F0F,
-    0x1F18, 0x1F1D,
-    0x1F28, 0x1F2F,
-    0x1F38, 0x1F3F,
-    0x1F48, 0x1F4D,
-    0x1F59, 0x1F59,
-    0x1F5B, 0x1F5B,
-    0x1F5D, 0x1F5D,
-    0x1F5F, 0x1F5F,
-    0x1F68, 0x1F6F,
-    0x1FB8, 0x1FBB,
-    0x1FC8, 0x1FCB,
-    0x1FD8, 0x1FDB,
-    0x1FE8, 0x1FEC,
-    0x1FF8, 0x1FFB,
-    0x2102, 0x2102,
-    0x2107, 0x2107,
-    0x210B, 0x210D,
-    0x2110, 0x2112,
-    0x2115, 0x2115,
-    0x2119, 0x211D,
-    0x2124, 0x2124,
-    0x2126, 0x2126,
-    0x2128, 0x2128,
-    0x212A, 0x212D,
-    0x2130, 0x2133,
-    0x213E, 0x213F,
-    0x2145, 0x2145,
-    0x2160, 0x216F,
-    0x2183, 0x2183,
-    0x24B6, 0x24CF,
-    0x2C00, 0x2C2F,
-    0x2C60, 0x2C60,
-    0x2C62, 0x2C64,
-    0x2C67, 0x2C67,
-    0x2C69, 0x2C69,
-    0x2C6B, 0x2C6B,
-    0x2C6D, 0x2C70,
-    0x2C72, 0x2C72,
-    0x2C75, 0x2C75,
-    0x2C7E, 0x2C80,
-    0x2C82, 0x2C82,
-    0x2C84, 0x2C84,
-    0x2C86, 0x2C86,
-    0x2C88, 0x2C88,
-    0x2C8A, 0x2C8A,
-    0x2C8C, 0x2C8C,
-    0x2C8E, 0x2C8E,
-    0x2C90, 0x2C90,
-    0x2C92, 0x2C92,
-    0x2C94, 0x2C94,
-    0x2C96, 0x2C96,
-    0x2C98, 0x2C98,
-    0x2C9A, 0x2C9A,
-    0x2C9C, 0x2C9C,
-    0x2C9E, 0x2C9E,
-    0x2CA0, 0x2CA0,
-    0x2CA2, 0x2CA2,
-    0x2CA4, 0x2CA4,
-    0x2CA6, 0x2CA6,
-    0x2CA8, 0x2CA8,
-    0x2CAA, 0x2CAA,
-    0x2CAC, 0x2CAC,
-    0x2CAE, 0x2CAE,
-    0x2CB0, 0x2CB0,
-    0x2CB2, 0x2CB2,
-    0x2CB4, 0x2CB4,
-    0x2CB6, 0x2CB6,
-    0x2CB8, 0x2CB8,
-    0x2CBA, 0x2CBA,
-    0x2CBC, 0x2CBC,
-    0x2CBE, 0x2CBE,
-    0x2CC0, 0x2CC0,
-    0x2CC2, 0x2CC2,
-    0x2CC4, 0x2CC4,
-    0x2CC6, 0x2CC6,
-    0x2CC8, 0x2CC8,
-    0x2CCA, 0x2CCA,
-    0x2CCC, 0x2CCC,
-    0x2CCE, 0x2CCE,
-    0x2CD0, 0x2CD0,
-    0x2CD2, 0x2CD2,
-    0x2CD4, 0x2CD4,
-    0x2CD6, 0x2CD6,
-    0x2CD8, 0x2CD8,
-    0x2CDA, 0x2CDA,
-    0x2CDC, 0x2CDC,
-    0x2CDE, 0x2CDE,
-    0x2CE0, 0x2CE0,
-    0x2CE2, 0x2CE2,
-    0x2CEB, 0x2CEB,
-    0x2CED, 0x2CED,
-    0x2CF2, 0x2CF2,
-    0xA640, 0xA640,
-    0xA642, 0xA642,
-    0xA644, 0xA644,
-    0xA646, 0xA646,
-    0xA648, 0xA648,
-    0xA64A, 0xA64A,
-    0xA64C, 0xA64C,
-    0xA64E, 0xA64E,
-    0xA650, 0xA650,
-    0xA652, 0xA652,
-    0xA654, 0xA654,
-    0xA656, 0xA656,
-    0xA658, 0xA658,
-    0xA65A, 0xA65A,
-    0xA65C, 0xA65C,
-    0xA65E, 0xA65E,
-    0xA660, 0xA660,
-    0xA662, 0xA662,
-    0xA664, 0xA664,
-    0xA666, 0xA666,
-    0xA668, 0xA668,
-    0xA66A, 0xA66A,
-    0xA66C, 0xA66C,
-    0xA680, 0xA680,
-    0xA682, 0xA682,
-    0xA684, 0xA684,
-    0xA686, 0xA686,
-    0xA688, 0xA688,
-    0xA68A, 0xA68A,
-    0xA68C, 0xA68C,
-    0xA68E, 0xA68E,
-    0xA690, 0xA690,
-    0xA692, 0xA692,
-    0xA694, 0xA694,
-    0xA696, 0xA696,
-    0xA698, 0xA698,
-    0xA69A, 0xA69A,
-    0xA722, 0xA722,
-    0xA724, 0xA724,
-    0xA726, 0xA726,
-    0xA728, 0xA728,
-    0xA72A, 0xA72A,
-    0xA72C, 0xA72C,
-    0xA72E, 0xA72E,
-    0xA732, 0xA732,
-    0xA734, 0xA734,
-    0xA736, 0xA736,
-    0xA738, 0xA738,
-    0xA73A, 0xA73A,
-    0xA73C, 0xA73C,
-    0xA73E, 0xA73E,
-    0xA740, 0xA740,
-    0xA742, 0xA742,
-    0xA744, 0xA744,
-    0xA746, 0xA746,
-    0xA748, 0xA748,
-    0xA74A, 0xA74A,
-    0xA74C, 0xA74C,
-    0xA74E, 0xA74E,
-    0xA750, 0xA750,
-    0xA752, 0xA752,
-    0xA754, 0xA754,
-    0xA756, 0xA756,
-    0xA758, 0xA758,
-    0xA75A, 0xA75A,
-    0xA75C, 0xA75C,
-    0xA75E, 0xA75E,
-    0xA760, 0xA760,
-    0xA762, 0xA762,
-    0xA764, 0xA764,
-    0xA766, 0xA766,
-    0xA768, 0xA768,
-    0xA76A, 0xA76A,
-    0xA76C, 0xA76C,
-    0xA76E, 0xA76E,
-    0xA779, 0xA779,
-    0xA77B, 0xA77B,
-    0xA77D, 0xA77E,
-    0xA780, 0xA780,
-    0xA782, 0xA782,
-    0xA784, 0xA784,
-    0xA786, 0xA786,
-    0xA78B, 0xA78B,
-    0xA78D, 0xA78D,
-    0xA790, 0xA790,
-    0xA792, 0xA792,
-    0xA796, 0xA796,
-    0xA798, 0xA798,
-    0xA79A, 0xA79A,
-    0xA79C, 0xA79C,
-    0xA79E, 0xA79E,
-    0xA7A0, 0xA7A0,
-    0xA7A2, 0xA7A2,
-    0xA7A4, 0xA7A4,
-    0xA7A6, 0xA7A6,
-    0xA7A8, 0xA7A8,
-    0xA7AA, 0xA7AE,
-    0xA7B0, 0xA7B4,
-    0xA7B6, 0xA7B6,
-    0xA7B8, 0xA7B8,
-    0xA7BA, 0xA7BA,
-    0xA7BC, 0xA7BC,
-    0xA7BE, 0xA7BE,
-    0xA7C0, 0xA7C0,
-    0xA7C2, 0xA7C2,
-    0xA7C4, 0xA7C7,
-    0xA7C9, 0xA7C9,
-    0xA7D0, 0xA7D0,
-    0xA7D6, 0xA7D6,
-    0xA7D8, 0xA7D8,
-    0xA7F5, 0xA7F5,
-    0xFF21, 0xFF3A,
-    0x10400, 0x10427,
-    0x104B0, 0x104D3,
-    0x10570, 0x1057A,
-    0x1057C, 0x1058A,
-    0x1058C, 0x10592,
-    0x10594, 0x10595,
-    0x10C80, 0x10CB2,
-    0x118A0, 0x118BF,
-    0x16E40, 0x16E5F,
-    0x1D400, 0x1D419,
-    0x1D434, 0x1D44D,
-    0x1D468, 0x1D481,
-    0x1D49C, 0x1D49C,
-    0x1D49E, 0x1D49F,
-    0x1D4A2, 0x1D4A2,
-    0x1D4A5, 0x1D4A6,
-    0x1D4A9, 0x1D4AC,
-    0x1D4AE, 0x1D4B5,
-    0x1D4D0, 0x1D4E9,
-    0x1D504, 0x1D505,
-    0x1D507, 0x1D50A,
-    0x1D50D, 0x1D514,
-    0x1D516, 0x1D51C,
-    0x1D538, 0x1D539,
-    0x1D53B, 0x1D53E,
-    0x1D540, 0x1D544,
-    0x1D546, 0x1D546,
-    0x1D54A, 0x1D550,
-    0x1D56C, 0x1D585,
-    0x1D5A0, 0x1D5B9,
-    0x1D5D4, 0x1D5ED,
-    0x1D608, 0x1D621,
-    0x1D63C, 0x1D655,
-    0x1D670, 0x1D689,
-    0x1D6A8, 0x1D6C0,
-    0x1D6E2, 0x1D6FA,
-    0x1D71C, 0x1D734,
-    0x1D756, 0x1D76E,
-    0x1D790, 0x1D7A8,
-    0x1D7CA, 0x1D7CA,
-    0x1E900, 0x1E921,
-    0x1F130, 0x1F149,
-    0x1F150, 0x1F169,
-    0x1F170, 0x1F189,
-};
-
-static bool
-yp_unicode_codepoint_match(yp_unicode_codepoint_t codepoint, yp_unicode_codepoint_t *codepoints, size_t size) {
-    size_t start = 0;
-    size_t end = size;
-
-    while (start < end) {
-        size_t middle = start + (end - start) / 2;
-        if ((middle % 2) != 0) middle--;
-
-        if (codepoint >= codepoints[middle] && codepoint <= codepoints[middle + 1]) {
-            return true;
-        }
-
-        if (codepoint < codepoints[middle]) {
-            end = middle;
-        } else {
-            start = middle + 2;
-        }
-    }
-
-    return false;
-}
-
-static const uint8_t yp_utf_8_dfa[] = {
-    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, // 00..1f
-    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, // 20..3f
-    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, // 40..5f
-    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, // 60..7f
-    1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9, // 80..9f
-    7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7, // a0..bf
-    8,8,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2, // c0..df
-    0xa,0x3,0x3,0x3,0x3,0x3,0x3,0x3,0x3,0x3,0x3,0x3,0x3,0x4,0x3,0x3, // e0..ef
-    0xb,0x6,0x6,0x6,0x5,0x8,0x8,0x8,0x8,0x8,0x8,0x8,0x8,0x8,0x8,0x8, // f0..ff
-    0x0,0x1,0x2,0x3,0x5,0x8,0x7,0x1,0x1,0x1,0x4,0x6,0x1,0x1,0x1,0x1, // s0..s0
-    1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,1,1,1,1,1,0,1,0,1,1,1,1,1,1, // s1..s2
-    1,2,1,1,1,1,1,2,1,2,1,1,1,1,1,1,1,1,1,1,1,1,1,2,1,1,1,1,1,1,1,1, // s3..s4
-    1,2,1,1,1,1,1,1,1,2,1,1,1,1,1,1,1,1,1,1,1,1,1,3,1,3,1,1,1,1,1,1, // s5..s6
-    1,3,1,1,1,1,1,3,1,3,1,1,1,1,1,1,1,3,1,1,1,1,1,1,1,1,1,1,1,1,1,1, // s7..s8
-};
-
-static yp_unicode_codepoint_t
-yp_utf_8_codepoint(const uint8_t *b, ptrdiff_t n, size_t *width) {
-    assert(n >= 1);
-    size_t maximum = (size_t) n;
-
-    uint32_t codepoint;
-    uint32_t state = 0;
-
-    for (size_t index = 0; index < 4 && index < maximum; index++) {
-        uint32_t byte = b[index];
-        uint32_t type = yp_utf_8_dfa[byte];
-
-        codepoint = (state != 0) ?
-            (byte & 0x3fu) | (codepoint << 6) :
-            (0xffu >> type) & (byte);
-
-        state = yp_utf_8_dfa[256 + (state * 16) + type];
-        if (!state) {
-            *width = index + 1;
-            return (yp_unicode_codepoint_t) codepoint;
-        }
-    }
-
-    *width = 0;
-    return 0;
-}
-
-static size_t
-yp_encoding_utf_8_char_width(const uint8_t *b, ptrdiff_t n) {
-    size_t width;
-    yp_utf_8_codepoint(b, n, &width);
-    return width;
-}
-
-size_t
-yp_encoding_utf_8_alpha_char(const uint8_t *b, ptrdiff_t n) {
-    if (*b < 0x80) {
-        return (yp_encoding_unicode_table[*b] & YP_ENCODING_ALPHABETIC_BIT) ? 1 : 0;
-    }
-
-    size_t width;
-    yp_unicode_codepoint_t codepoint = yp_utf_8_codepoint(b, n, &width);
-
-    if (codepoint <= 0xFF) {
-        return (yp_encoding_unicode_table[(uint8_t) codepoint] & YP_ENCODING_ALPHABETIC_BIT) ? width : 0;
-    } else {
-        return yp_unicode_codepoint_match(codepoint, unicode_alpha_codepoints, UNICODE_ALPHA_CODEPOINTS_LENGTH) ? width : 0;
-    }
-}
-
-size_t
-yp_encoding_utf_8_alnum_char(const uint8_t *b, ptrdiff_t n) {
-    if (*b < 0x80) {
-        return (yp_encoding_unicode_table[*b] & (YP_ENCODING_ALPHANUMERIC_BIT)) ? 1 : 0;
-    }
-
-    size_t width;
-    yp_unicode_codepoint_t codepoint = yp_utf_8_codepoint(b, n, &width);
-
-    if (codepoint <= 0xFF) {
-        return (yp_encoding_unicode_table[(uint8_t) codepoint] & (YP_ENCODING_ALPHANUMERIC_BIT)) ? width : 0;
-    } else {
-        return yp_unicode_codepoint_match(codepoint, unicode_alnum_codepoints, UNICODE_ALNUM_CODEPOINTS_LENGTH) ? width : 0;
-    }
-}
-
-static bool
-yp_encoding_utf_8_isupper_char(const uint8_t *b, ptrdiff_t n) {
-    if (*b < 0x80) {
-        return (yp_encoding_unicode_table[*b] & YP_ENCODING_UPPERCASE_BIT) ? true : false;
-    }
-
-    size_t width;
-    yp_unicode_codepoint_t codepoint = yp_utf_8_codepoint(b, n, &width);
-
-    if (codepoint <= 0xFF) {
-        return (yp_encoding_unicode_table[(uint8_t) codepoint] & YP_ENCODING_UPPERCASE_BIT) ? true : false;
-    } else {
-        return yp_unicode_codepoint_match(codepoint, unicode_isupper_codepoints, UNICODE_ISUPPER_CODEPOINTS_LENGTH) ? true : false;
-    }
-}
-
-#undef UNICODE_ALPHA_CODEPOINTS_LENGTH
-#undef UNICODE_ALNUM_CODEPOINTS_LENGTH
-#undef UNICODE_ISUPPER_CODEPOINTS_LENGTH
-
-yp_encoding_t yp_encoding_utf_8 = {
-    .name = "utf-8",
-    .char_width = yp_encoding_utf_8_char_width,
-    .alnum_char = yp_encoding_utf_8_alnum_char,
-    .alpha_char = yp_encoding_utf_8_alpha_char,
-    .isupper_char = yp_encoding_utf_8_isupper_char,
-    .multibyte = true
-};
-
-yp_encoding_t yp_encoding_utf8_mac = {
-    .name = "utf8-mac",
-    .char_width = yp_encoding_utf_8_char_width,
-    .alnum_char = yp_encoding_utf_8_alnum_char,
-    .alpha_char = yp_encoding_utf_8_alpha_char,
-    .isupper_char = yp_encoding_utf_8_isupper_char,
-    .multibyte = true
-};
diff --git a/yarp/enc/yp_windows_31j.c b/yarp/enc/yp_windows_31j.c
deleted file mode 100644
index 0d346395353e1e..00000000000000
--- a/yarp/enc/yp_windows_31j.c
+++ /dev/null
@@ -1,56 +0,0 @@
-#include "yarp/enc/yp_encoding.h"
-
-static size_t
-yp_encoding_windows_31j_char_width(const uint8_t *b, ptrdiff_t n) {
-    // These are the single byte characters.
-    if (*b < 0x80 || (*b >= 0xA1 && *b <= 0xDF)) {
-        return 1;
-    }
-
-    // These are the double byte characters.
-    if (
-        (n > 1) &&
-        ((b[0] >= 0x81 && b[0] <= 0x9F) || (b[0] >= 0xE0 && b[0] <= 0xFC)) &&
-        (b[1] >= 0x40 && b[1] <= 0xFC)
-    ) {
-        return 2;
-    }
-
-    return 0;
-}
-
-static size_t
-yp_encoding_windows_31j_alpha_char(const uint8_t *b, ptrdiff_t n) {
-    if (yp_encoding_windows_31j_char_width(b, n) == 1) {
-        return yp_encoding_ascii_alpha_char(b, n);
-    } else {
-        return 0;
-    }
-}
-
-static size_t
-yp_encoding_windows_31j_alnum_char(const uint8_t *b, ptrdiff_t n) {
-    if (yp_encoding_windows_31j_char_width(b, n) == 1) {
-        return yp_encoding_ascii_alnum_char(b, n);
-    } else {
-        return 0;
-    }
-}
-
-static bool
-yp_encoding_windows_31j_isupper_char(const uint8_t *b, ptrdiff_t n) {
-    if (yp_encoding_windows_31j_char_width(b, n) == 1) {
-        return yp_encoding_ascii_isupper_char(b, n);
-    } else {
-        return false;
-    }
-}
-
-yp_encoding_t yp_encoding_windows_31j = {
-    .name = "windows-31j",
-    .char_width = yp_encoding_windows_31j_char_width,
-    .alnum_char = yp_encoding_windows_31j_alnum_char,
-    .alpha_char = yp_encoding_windows_31j_alpha_char,
-    .isupper_char = yp_encoding_windows_31j_isupper_char,
-    .multibyte = true
-};
diff --git a/yarp/extension.c b/yarp/extension.c
deleted file mode 100644
index 8d36cd44272f02..00000000000000
--- a/yarp/extension.c
+++ /dev/null
@@ -1,612 +0,0 @@
-#include "yarp/extension.h"
-
-// NOTE: this file should contain only bindings.
-// All non-trivial logic should be in librubyparser so it can be shared its the various callers.
-
-VALUE rb_cYARP;
-VALUE rb_cYARPNode;
-VALUE rb_cYARPSource;
-VALUE rb_cYARPToken;
-VALUE rb_cYARPLocation;
-
-VALUE rb_cYARPComment;
-VALUE rb_cYARPParseError;
-VALUE rb_cYARPParseWarning;
-VALUE rb_cYARPParseResult;
-
-/******************************************************************************/
-/* IO of Ruby code                                                            */
-/******************************************************************************/
-
-// Check if the given VALUE is a string. If it's nil, then return NULL. If it's
-// not a string, then raise a type error. Otherwise return the VALUE as a C
-// string.
-static const char *
-check_string(VALUE value) {
-    // If the value is nil, then we don't need to do anything.
-    if (NIL_P(value)) {
-        return NULL;
-    }
-
-    // Check if the value is a string. If it's not, then raise a type error.
-    if (!RB_TYPE_P(value, T_STRING)) {
-        rb_raise(rb_eTypeError, "wrong argument type %"PRIsVALUE" (expected String)", rb_obj_class(value));
-    }
-
-    // Otherwise, return the value as a C string.
-    return RSTRING_PTR(value);
-}
-
-// Load the contents and size of the given string into the given yp_string_t.
-static void
-input_load_string(yp_string_t *input, VALUE string) {
-    // Check if the string is a string. If it's not, then raise a type error.
-    if (!RB_TYPE_P(string, T_STRING)) {
-        rb_raise(rb_eTypeError, "wrong argument type %"PRIsVALUE" (expected String)", rb_obj_class(string));
-    }
-
-    yp_string_constant_init(input, RSTRING_PTR(string), RSTRING_LEN(string));
-}
-
-/******************************************************************************/
-/* Serializing the AST                                                        */
-/******************************************************************************/
-
-// Dump the AST corresponding to the given input to a string.
-static VALUE
-dump_input(yp_string_t *input, const char *filepath) {
-    yp_buffer_t buffer;
-    if (!yp_buffer_init(&buffer)) {
-        rb_raise(rb_eNoMemError, "failed to allocate memory");
-    }
-
-    yp_parser_t parser;
-    yp_parser_init(&parser, yp_string_source(input), yp_string_length(input), filepath);
-
-    yp_node_t *node = yp_parse(&parser);
-    yp_serialize(&parser, node, &buffer);
-
-    VALUE result = rb_str_new(yp_buffer_value(&buffer), yp_buffer_length(&buffer));
-    yp_node_destroy(&parser, node);
-    yp_buffer_free(&buffer);
-    yp_parser_free(&parser);
-
-    return result;
-}
-
-// Dump the AST corresponding to the given string to a string.
-static VALUE
-dump(int argc, VALUE *argv, VALUE self) {
-    VALUE string;
-    VALUE filepath;
-    rb_scan_args(argc, argv, "11", &string, &filepath);
-
-    yp_string_t input;
-    input_load_string(&input, string);
-
-#ifdef YARP_DEBUG_MODE_BUILD
-    size_t length = yp_string_length(&input);
-    char* dup = malloc(length);
-    memcpy(dup, yp_string_source(&input), length);
-    yp_string_constant_init(&input, dup, length);
-#endif
-
-    VALUE value = dump_input(&input, check_string(filepath));
-
-#ifdef YARP_DEBUG_MODE_BUILD
-    free(dup);
-#endif
-
-    return value;
-}
-
-// Dump the AST corresponding to the given file to a string.
-static VALUE
-dump_file(VALUE self, VALUE filepath) {
-    yp_string_t input;
-
-    const char *checked = check_string(filepath);
-    if (!yp_string_mapped_init(&input, checked)) return Qnil;
-
-    VALUE value = dump_input(&input, checked);
-    yp_string_free(&input);
-
-    return value;
-}
-
-/******************************************************************************/
-/* Extracting values for the parse result                                     */
-/******************************************************************************/
-
-// Extract the comments out of the parser into an array.
-static VALUE
-parser_comments(yp_parser_t *parser, VALUE source) {
-    VALUE comments = rb_ary_new();
-
-    for (yp_comment_t *comment = (yp_comment_t *) parser->comment_list.head; comment != NULL; comment = (yp_comment_t *) comment->node.next) {
-        VALUE location_argv[] = {
-            source,
-            LONG2FIX(comment->start - parser->start),
-            LONG2FIX(comment->end - comment->start)
-        };
-
-        VALUE type;
-        switch (comment->type) {
-            case YP_COMMENT_INLINE:
-                type = ID2SYM(rb_intern("inline"));
-                break;
-            case YP_COMMENT_EMBDOC:
-                type = ID2SYM(rb_intern("embdoc"));
-                break;
-            case YP_COMMENT___END__:
-                type = ID2SYM(rb_intern("__END__"));
-                break;
-            default:
-                type = ID2SYM(rb_intern("inline"));
-                break;
-        }
-
-        VALUE comment_argv[] = { type, rb_class_new_instance(3, location_argv, rb_cYARPLocation) };
-        rb_ary_push(comments, rb_class_new_instance(2, comment_argv, rb_cYARPComment));
-    }
-
-    return comments;
-}
-
-// Extract the errors out of the parser into an array.
-static VALUE
-parser_errors(yp_parser_t *parser, rb_encoding *encoding, VALUE source) {
-    VALUE errors = rb_ary_new();
-    yp_diagnostic_t *error;
-
-    for (error = (yp_diagnostic_t *) parser->error_list.head; error != NULL; error = (yp_diagnostic_t *) error->node.next) {
-        VALUE location_argv[] = {
-            source,
-            LONG2FIX(error->start - parser->start),
-            LONG2FIX(error->end - error->start)
-        };
-
-        VALUE error_argv[] = {
-            rb_enc_str_new_cstr(error->message, encoding),
-            rb_class_new_instance(3, location_argv, rb_cYARPLocation)
-        };
-
-        rb_ary_push(errors, rb_class_new_instance(2, error_argv, rb_cYARPParseError));
-    }
-
-    return errors;
-}
-
-// Extract the warnings out of the parser into an array.
-static VALUE
-parser_warnings(yp_parser_t *parser, rb_encoding *encoding, VALUE source) {
-    VALUE warnings = rb_ary_new();
-    yp_diagnostic_t *warning;
-
-    for (warning = (yp_diagnostic_t *) parser->warning_list.head; warning != NULL; warning = (yp_diagnostic_t *) warning->node.next) {
-        VALUE location_argv[] = {
-            source,
-            LONG2FIX(warning->start - parser->start),
-            LONG2FIX(warning->end - warning->start)
-        };
-
-        VALUE warning_argv[] = {
-            rb_enc_str_new_cstr(warning->message, encoding),
-            rb_class_new_instance(3, location_argv, rb_cYARPLocation)
-        };
-
-        rb_ary_push(warnings, rb_class_new_instance(2, warning_argv, rb_cYARPParseWarning));
-    }
-
-    return warnings;
-}
-
-/******************************************************************************/
-/* Lexing Ruby code                                                           */
-/******************************************************************************/
-
-// This struct gets stored in the parser and passed in to the lex callback any
-// time a new token is found. We use it to store the necessary information to
-// initialize a Token instance.
-typedef struct {
-    VALUE source;
-    VALUE tokens;
-    rb_encoding *encoding;
-} parse_lex_data_t;
-
-// This is passed as a callback to the parser. It gets called every time a new
-// token is found. Once found, we initialize a new instance of Token and push it
-// onto the tokens array.
-static void
-parse_lex_token(void *data, yp_parser_t *parser, yp_token_t *token) {
-    parse_lex_data_t *parse_lex_data = (parse_lex_data_t *) parser->lex_callback->data;
-
-    VALUE yields = rb_ary_new_capa(2);
-    rb_ary_push(yields, yp_token_new(parser, token, parse_lex_data->encoding, parse_lex_data->source));
-    rb_ary_push(yields, INT2FIX(parser->lex_state));
-
-    rb_ary_push(parse_lex_data->tokens, yields);
-}
-
-// This is called whenever the encoding changes based on the magic comment at
-// the top of the file. We use it to update the encoding that we are using to
-// create tokens.
-static void
-parse_lex_encoding_changed_callback(yp_parser_t *parser) {
-    parse_lex_data_t *parse_lex_data = (parse_lex_data_t *) parser->lex_callback->data;
-    parse_lex_data->encoding = rb_enc_find(parser->encoding.name);
-
-    // Since the encoding changed, we need to go back and change the encoding of
-    // the tokens that were already lexed. This is only going to end up being
-    // one or two tokens, since the encoding can only change at the top of the
-    // file.
-    VALUE tokens = parse_lex_data->tokens;
-    for (long index = 0; index < RARRAY_LEN(tokens); index++) {
-        VALUE yields = rb_ary_entry(tokens, index);
-        VALUE token = rb_ary_entry(yields, 0);
-
-        VALUE value = rb_ivar_get(token, rb_intern("@value"));
-        rb_enc_associate(value, parse_lex_data->encoding);
-        ENC_CODERANGE_CLEAR(value);
-    }
-}
-
-// Parse the given input and return a ParseResult containing just the tokens or
-// the nodes and tokens.
-static VALUE
-parse_lex_input(yp_string_t *input, const char *filepath, bool return_nodes) {
-    yp_parser_t parser;
-    yp_parser_init(&parser, yp_string_source(input), yp_string_length(input), filepath);
-    yp_parser_register_encoding_changed_callback(&parser, parse_lex_encoding_changed_callback);
-
-    VALUE offsets = rb_ary_new();
-    VALUE source_argv[] = { rb_str_new((const char *) yp_string_source(input), yp_string_length(input)), offsets };
-    VALUE source = rb_class_new_instance(2, source_argv, rb_cYARPSource);
-
-    parse_lex_data_t parse_lex_data = {
-        .source = source,
-        .tokens = rb_ary_new(),
-        .encoding = rb_utf8_encoding()
-    };
-
-    parse_lex_data_t *data = &parse_lex_data;
-    yp_lex_callback_t lex_callback = (yp_lex_callback_t) {
-        .data = (void *) data,
-        .callback = parse_lex_token,
-    };
-
-    parser.lex_callback = &lex_callback;
-    yp_node_t *node = yp_parse(&parser);
-
-    // Here we need to update the source range to have the correct newline
-    // offsets. We do it here because we've already created the object and given
-    // it over to all of the tokens.
-    for (size_t index = 0; index < parser.newline_list.size; index++) {
-        rb_ary_push(offsets, INT2FIX(parser.newline_list.offsets[index]));
-    }
-
-    VALUE value;
-    if (return_nodes) {
-        value = rb_ary_new_capa(2);
-        rb_ary_push(value, yp_ast_new(&parser, node, parse_lex_data.encoding));
-        rb_ary_push(value, parse_lex_data.tokens);
-    } else {
-        value = parse_lex_data.tokens;
-    }
-
-    VALUE result_argv[] = {
-        value,
-        parser_comments(&parser, source),
-        parser_errors(&parser, parse_lex_data.encoding, source),
-        parser_warnings(&parser, parse_lex_data.encoding, source),
-        source
-    };
-
-    yp_node_destroy(&parser, node);
-    yp_parser_free(&parser);
-    return rb_class_new_instance(5, result_argv, rb_cYARPParseResult);
-}
-
-// Return an array of tokens corresponding to the given string.
-static VALUE
-lex(int argc, VALUE *argv, VALUE self) {
-    VALUE string;
-    VALUE filepath;
-    rb_scan_args(argc, argv, "11", &string, &filepath);
-
-    yp_string_t input;
-    input_load_string(&input, string);
-
-    return parse_lex_input(&input, check_string(filepath), false);
-}
-
-// Return an array of tokens corresponding to the given file.
-static VALUE
-lex_file(VALUE self, VALUE filepath) {
-    yp_string_t input;
-
-    const char *checked = check_string(filepath);
-    if (!yp_string_mapped_init(&input, checked)) return Qnil;
-
-    VALUE value = parse_lex_input(&input, checked, false);
-    yp_string_free(&input);
-
-    return value;
-}
-
-/******************************************************************************/
-/* Parsing Ruby code                                                          */
-/******************************************************************************/
-
-// Parse the given input and return a ParseResult instance.
-static VALUE
-parse_input(yp_string_t *input, const char *filepath) {
-    yp_parser_t parser;
-    yp_parser_init(&parser, yp_string_source(input), yp_string_length(input), filepath);
-
-    yp_node_t *node = yp_parse(&parser);
-    rb_encoding *encoding = rb_enc_find(parser.encoding.name);
-
-    VALUE source = yp_source_new(&parser, encoding);
-    VALUE result_argv[] = {
-        yp_ast_new(&parser, node, encoding),
-        parser_comments(&parser, source),
-        parser_errors(&parser, encoding, source),
-        parser_warnings(&parser, encoding, source),
-        source
-    };
-
-    VALUE result = rb_class_new_instance(5, result_argv, rb_cYARPParseResult);
-
-    yp_node_destroy(&parser, node);
-    yp_parser_free(&parser);
-
-    return result;
-}
-
-// Parse the given string and return a ParseResult instance.
-static VALUE
-parse(int argc, VALUE *argv, VALUE self) {
-    VALUE string;
-    VALUE filepath;
-    rb_scan_args(argc, argv, "11", &string, &filepath);
-
-    yp_string_t input;
-    input_load_string(&input, string);
-
-#ifdef YARP_DEBUG_MODE_BUILD
-    size_t length = yp_string_length(&input);
-    char* dup = malloc(length);
-    memcpy(dup, yp_string_source(&input), length);
-    yp_string_constant_init(&input, dup, length);
-#endif
-
-    VALUE value = parse_input(&input, check_string(filepath));
-
-#ifdef YARP_DEBUG_MODE_BUILD
-    free(dup);
-#endif
-
-    return value;
-}
-
-// Parse the given file and return a ParseResult instance.
-static VALUE
-parse_file(VALUE self, VALUE filepath) {
-    yp_string_t input;
-
-    const char *checked = check_string(filepath);
-    if (!yp_string_mapped_init(&input, checked)) return Qnil;
-
-    VALUE value = parse_input(&input, checked);
-    yp_string_free(&input);
-
-    return value;
-}
-
-// Parse the given string and return a ParseResult instance.
-static VALUE
-parse_lex(int argc, VALUE *argv, VALUE self) {
-    VALUE string;
-    VALUE filepath;
-    rb_scan_args(argc, argv, "11", &string, &filepath);
-
-    yp_string_t input;
-    input_load_string(&input, string);
-    return parse_lex_input(&input, check_string(filepath), true);
-}
-
-// Parse and lex the given file and return a ParseResult instance.
-static VALUE
-parse_lex_file(VALUE self, VALUE filepath) {
-    yp_string_t input;
-
-    const char *checked = check_string(filepath);
-    if (!yp_string_mapped_init(&input, checked)) return Qnil;
-
-    VALUE value = parse_lex_input(&input, checked, true);
-    yp_string_free(&input);
-
-    return value;
-}
-
-/******************************************************************************/
-/* Utility functions exposed to make testing easier                           */
-/******************************************************************************/
-
-// Returns an array of strings corresponding to the named capture groups in the
-// given source string. If YARP was unable to parse the regular expression, this
-// function returns nil.
-static VALUE
-named_captures(VALUE self, VALUE source) {
-    yp_string_list_t string_list;
-    yp_string_list_init(&string_list);
-
-    if (!yp_regexp_named_capture_group_names((const uint8_t *) RSTRING_PTR(source), RSTRING_LEN(source), &string_list, false, &yp_encoding_utf_8)) {
-        yp_string_list_free(&string_list);
-        return Qnil;
-    }
-
-    VALUE names = rb_ary_new();
-    for (size_t index = 0; index < string_list.length; index++) {
-        const yp_string_t *string = &string_list.strings[index];
-        rb_ary_push(names, rb_str_new((const char *) yp_string_source(string), yp_string_length(string)));
-    }
-
-    yp_string_list_free(&string_list);
-    return names;
-}
-
-// Accepts a source string and a type of unescaping and returns the unescaped
-// version.
-static VALUE
-unescape(VALUE source, yp_unescape_type_t unescape_type) {
-    yp_string_t result;
-
-    if (yp_unescape_string((const uint8_t *) RSTRING_PTR(source), RSTRING_LEN(source), unescape_type, &result)) {
-        VALUE str = rb_str_new((const char *) yp_string_source(&result), yp_string_length(&result));
-        yp_string_free(&result);
-        return str;
-    } else {
-        yp_string_free(&result);
-        return Qnil;
-    }
-}
-
-// Do not unescape anything in the given string. This is here to provide a
-// consistent API.
-static VALUE
-unescape_none(VALUE self, VALUE source) {
-    return unescape(source, YP_UNESCAPE_NONE);
-}
-
-// Minimally unescape the given string. This means effectively unescaping just
-// the quotes of a string. Returns the unescaped string.
-static VALUE
-unescape_minimal(VALUE self, VALUE source) {
-    return unescape(source, YP_UNESCAPE_MINIMAL);
-}
-
-// Unescape everything in the given string. Return the unescaped string.
-static VALUE
-unescape_all(VALUE self, VALUE source) {
-    return unescape(source, YP_UNESCAPE_ALL);
-}
-
-// Return a hash of information about the given source string's memory usage.
-static VALUE
-memsize(VALUE self, VALUE string) {
-    yp_parser_t parser;
-    size_t length = RSTRING_LEN(string);
-    yp_parser_init(&parser, (const uint8_t *) RSTRING_PTR(string), length, NULL);
-
-    yp_node_t *node = yp_parse(&parser);
-    yp_memsize_t memsize;
-    yp_node_memsize(node, &memsize);
-
-    yp_node_destroy(&parser, node);
-    yp_parser_free(&parser);
-
-    VALUE result = rb_hash_new();
-    rb_hash_aset(result, ID2SYM(rb_intern("length")), INT2FIX(length));
-    rb_hash_aset(result, ID2SYM(rb_intern("memsize")), INT2FIX(memsize.memsize));
-    rb_hash_aset(result, ID2SYM(rb_intern("node_count")), INT2FIX(memsize.node_count));
-    return result;
-}
-
-// Parse the file, but do nothing with the result. This is used to profile the
-// parser for memory and speed.
-static VALUE
-profile_file(VALUE self, VALUE filepath) {
-    yp_string_t input;
-
-    const char *checked = check_string(filepath);
-    if (!yp_string_mapped_init(&input, checked)) return Qnil;
-
-    yp_parser_t parser;
-    yp_parser_init(&parser, yp_string_source(&input), yp_string_length(&input), checked);
-
-    yp_node_t *node = yp_parse(&parser);
-    yp_node_destroy(&parser, node);
-    yp_parser_free(&parser);
-
-    return Qnil;
-}
-
-// Parse the file and serialize the result. This is mostly used to test this
-// path since it is used by client libraries.
-static VALUE
-parse_serialize_file_metadata(VALUE self, VALUE filepath, VALUE metadata) {
-    yp_string_t input;
-    yp_buffer_t buffer;
-    yp_buffer_init(&buffer);
-
-    const char *checked = check_string(filepath);
-    if (!yp_string_mapped_init(&input, checked)) return Qnil;
-
-    yp_parse_serialize(yp_string_source(&input), yp_string_length(&input), &buffer, check_string(metadata));
-    VALUE result = rb_str_new(yp_buffer_value(&buffer), yp_buffer_length(&buffer));
-
-    yp_buffer_free(&buffer);
-    return result;
-}
-
-/******************************************************************************/
-/* Initialization of the extension                                            */
-/******************************************************************************/
-
-RUBY_FUNC_EXPORTED void
-Init_yarp(void) {
-    // Make sure that the YARP library version matches the expected version.
-    // Otherwise something was compiled incorrectly.
-    if (strcmp(yp_version(), EXPECTED_YARP_VERSION) != 0) {
-        rb_raise(
-            rb_eRuntimeError,
-            "The YARP library version (%s) does not match the expected version (%s)",
-            yp_version(),
-            EXPECTED_YARP_VERSION
-        );
-    }
-
-    // Grab up references to all of the constants that we're going to need to
-    // reference throughout this extension.
-    rb_cYARP = rb_define_module("YARP");
-    rb_cYARPNode = rb_define_class_under(rb_cYARP, "Node", rb_cObject);
-    rb_cYARPSource = rb_define_class_under(rb_cYARP, "Source", rb_cObject);
-    rb_cYARPToken = rb_define_class_under(rb_cYARP, "Token", rb_cObject);
-    rb_cYARPLocation = rb_define_class_under(rb_cYARP, "Location", rb_cObject);
-    rb_cYARPComment = rb_define_class_under(rb_cYARP, "Comment", rb_cObject);
-    rb_cYARPParseError = rb_define_class_under(rb_cYARP, "ParseError", rb_cObject);
-    rb_cYARPParseWarning = rb_define_class_under(rb_cYARP, "ParseWarning", rb_cObject);
-    rb_cYARPParseResult = rb_define_class_under(rb_cYARP, "ParseResult", rb_cObject);
-
-    // Define the version string here so that we can use the constants defined
-    // in yarp.h.
-    rb_define_const(rb_cYARP, "VERSION", rb_str_new2(EXPECTED_YARP_VERSION));
-    rb_define_const(rb_cYARP, "BACKEND", ID2SYM(rb_intern("CExtension")));
-
-    // First, the functions that have to do with lexing and parsing.
-    rb_define_singleton_method(rb_cYARP, "dump", dump, -1);
-    rb_define_singleton_method(rb_cYARP, "dump_file", dump_file, 1);
-    rb_define_singleton_method(rb_cYARP, "lex", lex, -1);
-    rb_define_singleton_method(rb_cYARP, "lex_file", lex_file, 1);
-    rb_define_singleton_method(rb_cYARP, "parse", parse, -1);
-    rb_define_singleton_method(rb_cYARP, "parse_file", parse_file, 1);
-    rb_define_singleton_method(rb_cYARP, "parse_lex", parse_lex, -1);
-    rb_define_singleton_method(rb_cYARP, "parse_lex_file", parse_lex_file, 1);
-
-    // Next, the functions that will be called by the parser to perform various
-    // internal tasks. We expose these to make them easier to test.
-    VALUE rb_cYARPDebug = rb_define_module_under(rb_cYARP, "Debug");
-    rb_define_singleton_method(rb_cYARPDebug, "named_captures", named_captures, 1);
-    rb_define_singleton_method(rb_cYARPDebug, "unescape_none", unescape_none, 1);
-    rb_define_singleton_method(rb_cYARPDebug, "unescape_minimal", unescape_minimal, 1);
-    rb_define_singleton_method(rb_cYARPDebug, "unescape_all", unescape_all, 1);
-    rb_define_singleton_method(rb_cYARPDebug, "memsize", memsize, 1);
-    rb_define_singleton_method(rb_cYARPDebug, "profile_file", profile_file, 1);
-    rb_define_singleton_method(rb_cYARPDebug, "parse_serialize_file_metadata", parse_serialize_file_metadata, 2);
-
-    // Next, initialize the other APIs.
-    Init_yarp_api_node();
-    Init_yarp_pack();
-}
diff --git a/yarp/extension.h b/yarp/extension.h
deleted file mode 100644
index ccfb6f9454f173..00000000000000
--- a/yarp/extension.h
+++ /dev/null
@@ -1,18 +0,0 @@
-#ifndef YARP_EXT_NODE_H
-#define YARP_EXT_NODE_H
-
-#define EXPECTED_YARP_VERSION "0.10.0"
-
-#include <ruby.h>
-#include <ruby/encoding.h>
-#include "yarp.h"
-
-VALUE yp_source_new(yp_parser_t *parser, rb_encoding *encoding);
-VALUE yp_token_new(yp_parser_t *parser, yp_token_t *token, rb_encoding *encoding, VALUE source);
-VALUE yp_ast_new(yp_parser_t *parser, yp_node_t *node, rb_encoding *encoding);
-
-void Init_yarp_api_node(void);
-void Init_yarp_pack(void);
-YP_EXPORTED_FUNCTION void Init_yarp(void);
-
-#endif
diff --git a/yarp/node.h b/yarp/node.h
deleted file mode 100644
index 1b546f086f0004..00000000000000
--- a/yarp/node.h
+++ /dev/null
@@ -1,42 +0,0 @@
-#ifndef YARP_NODE_H
-#define YARP_NODE_H
-
-#include "yarp/defines.h"
-#include "yarp/parser.h"
-
-// Append a new node onto the end of the node list.
-void yp_node_list_append(yp_node_list_t *list, yp_node_t *node);
-
-// Clear the node but preserves the location.
-void yp_node_clear(yp_node_t *node);
-
-// Deallocate a node and all of its children.
-YP_EXPORTED_FUNCTION void yp_node_destroy(yp_parser_t *parser, struct yp_node *node);
-
-// This struct stores the information gathered by the yp_node_memsize function.
-// It contains both the memory footprint and additionally metadata about the
-// shape of the tree.
-typedef struct {
-    size_t memsize;
-    size_t node_count;
-} yp_memsize_t;
-
-// Calculates the memory footprint of a given node.
-YP_EXPORTED_FUNCTION void yp_node_memsize(yp_node_t *node, yp_memsize_t *memsize);
-
-// Returns a string representation of the given node type.
-YP_EXPORTED_FUNCTION const char * yp_node_type_to_str(yp_node_type_t node_type);
-
-#define YP_EMPTY_NODE_LIST ((yp_node_list_t) { .nodes = NULL, .size = 0, .capacity = 0 })
-
-#endif // YARP_NODE_H
-
-// ScopeNodes are helper nodes, and will never
-// be part of the AST. We manually declare them
-// here to avoid generating them
-typedef struct yp_scope_node {
-    yp_node_t base;
-    struct yp_parameters_node *parameters;
-    yp_node_t *body;
-    yp_constant_id_list_t locals;
-} yp_scope_node_t;
diff --git a/yarp/pack.c b/yarp/pack.c
deleted file mode 100644
index 48bba4ea4917d6..00000000000000
--- a/yarp/pack.c
+++ /dev/null
@@ -1,493 +0,0 @@
-#include "yarp/pack.h"
-
-#include <stdbool.h>
-#include <errno.h>
-
-static uintmax_t
-strtoumaxc(const char **format);
-
-YP_EXPORTED_FUNCTION yp_pack_result
-yp_pack_parse(yp_pack_variant variant, const char **format, const char *format_end,
-                            yp_pack_type *type, yp_pack_signed *signed_type, yp_pack_endian *endian, yp_pack_size *size,
-                            yp_pack_length_type *length_type, uint64_t *length, yp_pack_encoding *encoding) {
-
-    if (*encoding == YP_PACK_ENCODING_START) {
-        *encoding = YP_PACK_ENCODING_US_ASCII;
-    }
-
-    if (*format == format_end) {
-            *type = YP_PACK_END;
-            *signed_type = YP_PACK_SIGNED_NA;
-            *endian = YP_PACK_ENDIAN_NA;
-            *size = YP_PACK_SIZE_NA;
-            *length_type = YP_PACK_LENGTH_NA;
-            return YP_PACK_OK;
-    }
-
-    *length_type = YP_PACK_LENGTH_FIXED;
-    *length = 1;
-    bool length_changed_allowed = true;
-
-    char directive = **format;
-    (*format)++;
-    switch (directive) {
-        case ' ':
-        case '\t':
-        case '\n':
-        case '\v':
-        case '\f':
-        case '\r':
-            *type = YP_PACK_SPACE;
-            *signed_type = YP_PACK_SIGNED_NA;
-            *endian = YP_PACK_ENDIAN_NA;
-            *size = YP_PACK_SIZE_NA;
-            *length_type = YP_PACK_LENGTH_NA;
-            *length = 0;
-            return YP_PACK_OK;
-        case '#':
-            while ((*format < format_end) && (**format != '\n')) {
-                (*format)++;
-            }
-            *type = YP_PACK_COMMENT;
-            *signed_type = YP_PACK_SIGNED_NA;
-            *endian = YP_PACK_ENDIAN_NA;
-            *size = YP_PACK_SIZE_NA;
-            *length_type = YP_PACK_LENGTH_NA;
-            *length = 0;
-            return YP_PACK_OK;
-        case 'C':
-            *type = YP_PACK_INTEGER;
-            *signed_type = YP_PACK_UNSIGNED;
-            *endian = YP_PACK_AGNOSTIC_ENDIAN;
-            *size = YP_PACK_SIZE_8;
-            break;
-        case 'S':
-            *type = YP_PACK_INTEGER;
-            *signed_type = YP_PACK_UNSIGNED;
-            *endian = YP_PACK_NATIVE_ENDIAN;
-            *size = YP_PACK_SIZE_16;
-            break;
-        case 'L':
-            *type = YP_PACK_INTEGER;
-            *signed_type = YP_PACK_UNSIGNED;
-            *endian = YP_PACK_NATIVE_ENDIAN;
-            *size = YP_PACK_SIZE_32;
-            break;
-        case 'Q':
-            *type = YP_PACK_INTEGER;
-            *signed_type = YP_PACK_UNSIGNED;
-            *endian = YP_PACK_NATIVE_ENDIAN;
-            *size = YP_PACK_SIZE_64;
-            break;
-        case 'J':
-            *type = YP_PACK_INTEGER;
-            *signed_type = YP_PACK_UNSIGNED;
-            *endian = YP_PACK_NATIVE_ENDIAN;
-            *size = YP_PACK_SIZE_P;
-            break;
-        case 'c':
-            *type = YP_PACK_INTEGER;
-            *signed_type = YP_PACK_SIGNED;
-            *endian = YP_PACK_AGNOSTIC_ENDIAN;
-            *size = YP_PACK_SIZE_8;
-            break;
-        case 's':
-            *type = YP_PACK_INTEGER;
-            *signed_type = YP_PACK_SIGNED;
-            *endian = YP_PACK_NATIVE_ENDIAN;
-            *size = YP_PACK_SIZE_16;
-            break;
-        case 'l':
-            *type = YP_PACK_INTEGER;
-            *signed_type = YP_PACK_SIGNED;
-            *endian = YP_PACK_NATIVE_ENDIAN;
-            *size = YP_PACK_SIZE_32;
-            break;
-        case 'q':
-            *type = YP_PACK_INTEGER;
-            *signed_type = YP_PACK_SIGNED;
-            *endian = YP_PACK_NATIVE_ENDIAN;
-            *size = YP_PACK_SIZE_64;
-            break;
-        case 'j':
-            *type = YP_PACK_INTEGER;
-            *signed_type = YP_PACK_SIGNED;
-            *endian = YP_PACK_NATIVE_ENDIAN;
-            *size = YP_PACK_SIZE_P;
-            break;
-        case 'I':
-            *type = YP_PACK_INTEGER;
-            *signed_type = YP_PACK_UNSIGNED;
-            *endian = YP_PACK_NATIVE_ENDIAN;
-            *size = YP_PACK_SIZE_INT;
-            break;
-        case 'i':
-            *type = YP_PACK_INTEGER;
-            *signed_type = YP_PACK_SIGNED;
-            *endian = YP_PACK_NATIVE_ENDIAN;
-            *size = YP_PACK_SIZE_INT;
-            break;
-        case 'n':
-            *type = YP_PACK_INTEGER;
-            *signed_type = YP_PACK_UNSIGNED;
-            *endian = YP_PACK_BIG_ENDIAN;
-            *size = YP_PACK_SIZE_16;
-            length_changed_allowed = false;
-            break;
-        case 'N':
-            *type = YP_PACK_INTEGER;
-            *signed_type = YP_PACK_UNSIGNED;
-            *endian = YP_PACK_BIG_ENDIAN;
-            *size = YP_PACK_SIZE_32;
-            length_changed_allowed = false;
-            break;
-        case 'v':
-            *type = YP_PACK_INTEGER;
-            *signed_type = YP_PACK_UNSIGNED;
-            *endian = YP_PACK_LITTLE_ENDIAN;
-            *size = YP_PACK_SIZE_16;
-            length_changed_allowed = false;
-            break;
-        case 'V':
-            *type = YP_PACK_INTEGER;
-            *signed_type = YP_PACK_UNSIGNED;
-            *endian = YP_PACK_LITTLE_ENDIAN;
-            *size = YP_PACK_SIZE_32;
-            length_changed_allowed = false;
-            break;
-        case 'U':
-            *type = YP_PACK_UTF8;
-            *signed_type = YP_PACK_SIGNED_NA;
-            *endian = YP_PACK_ENDIAN_NA;
-            *size = YP_PACK_SIZE_NA;
-            break;
-        case 'w':
-            *type = YP_PACK_BER;
-            *signed_type = YP_PACK_SIGNED_NA;
-            *endian = YP_PACK_ENDIAN_NA;
-            *size = YP_PACK_SIZE_NA;
-            break;
-        case 'D':
-        case 'd':
-            *type = YP_PACK_FLOAT;
-            *signed_type = YP_PACK_SIGNED_NA;
-            *endian = YP_PACK_NATIVE_ENDIAN;
-            *size = YP_PACK_SIZE_64;
-            break;
-        case 'F':
-        case 'f':
-            *type = YP_PACK_FLOAT;
-            *signed_type = YP_PACK_SIGNED_NA;
-            *endian = YP_PACK_NATIVE_ENDIAN;
-            *size = YP_PACK_SIZE_32;
-            break;
-        case 'E':
-            *type = YP_PACK_FLOAT;
-            *signed_type = YP_PACK_SIGNED_NA;
-            *endian = YP_PACK_LITTLE_ENDIAN;
-            *size = YP_PACK_SIZE_64;
-            break;
-        case 'e':
-            *type = YP_PACK_FLOAT;
-            *signed_type = YP_PACK_SIGNED_NA;
-            *endian = YP_PACK_LITTLE_ENDIAN;
-            *size = YP_PACK_SIZE_32;
-            break;
-        case 'G':
-            *type = YP_PACK_FLOAT;
-            *signed_type = YP_PACK_SIGNED_NA;
-            *endian = YP_PACK_BIG_ENDIAN;
-            *size = YP_PACK_SIZE_64;
-            break;
-        case 'g':
-            *type = YP_PACK_FLOAT;
-            *signed_type = YP_PACK_SIGNED_NA;
-            *endian = YP_PACK_BIG_ENDIAN;
-            *size = YP_PACK_SIZE_32;
-            break;
-        case 'A':
-            *type = YP_PACK_STRING_SPACE_PADDED;
-            *signed_type = YP_PACK_SIGNED_NA;
-            *endian = YP_PACK_ENDIAN_NA;
-            *size = YP_PACK_SIZE_NA;
-            break;
-        case 'a':
-            *type = YP_PACK_STRING_NULL_PADDED;
-            *signed_type = YP_PACK_SIGNED_NA;
-            *endian = YP_PACK_ENDIAN_NA;
-            *size = YP_PACK_SIZE_NA;
-            break;
-        case 'Z':
-            *type = YP_PACK_STRING_NULL_TERMINATED;
-            *signed_type = YP_PACK_SIGNED_NA;
-            *endian = YP_PACK_ENDIAN_NA;
-            *size = YP_PACK_SIZE_NA;
-            break;
-        case 'B':
-            *type = YP_PACK_STRING_MSB;
-            *signed_type = YP_PACK_SIGNED_NA;
-            *endian = YP_PACK_ENDIAN_NA;
-            *size = YP_PACK_SIZE_NA;
-            break;
-        case 'b':
-            *type = YP_PACK_STRING_LSB;
-            *signed_type = YP_PACK_SIGNED_NA;
-            *endian = YP_PACK_ENDIAN_NA;
-            *size = YP_PACK_SIZE_NA;
-            break;
-        case 'H':
-            *type = YP_PACK_STRING_HEX_HIGH;
-            *signed_type = YP_PACK_SIGNED_NA;
-            *endian = YP_PACK_ENDIAN_NA;
-            *size = YP_PACK_SIZE_NA;
-            break;
-        case 'h':
-            *type = YP_PACK_STRING_HEX_LOW;
-            *signed_type = YP_PACK_SIGNED_NA;
-            *endian = YP_PACK_ENDIAN_NA;
-            *size = YP_PACK_SIZE_NA;
-            break;
-        case 'u':
-            *type = YP_PACK_STRING_UU;
-            *signed_type = YP_PACK_SIGNED_NA;
-            *endian = YP_PACK_ENDIAN_NA;
-            *size = YP_PACK_SIZE_NA;
-            break;
-        case 'M':
-            *type = YP_PACK_STRING_MIME;
-            *signed_type = YP_PACK_SIGNED_NA;
-            *endian = YP_PACK_ENDIAN_NA;
-            *size = YP_PACK_SIZE_NA;
-            break;
-        case 'm':
-            *type = YP_PACK_STRING_BASE64;
-            *signed_type = YP_PACK_SIGNED_NA;
-            *endian = YP_PACK_ENDIAN_NA;
-            *size = YP_PACK_SIZE_NA;
-            break;
-        case 'P':
-            *type = YP_PACK_STRING_FIXED;
-            *signed_type = YP_PACK_SIGNED_NA;
-            *endian = YP_PACK_ENDIAN_NA;
-            *size = YP_PACK_SIZE_NA;
-            break;
-        case 'p':
-            *type = YP_PACK_STRING_POINTER;
-            *signed_type = YP_PACK_SIGNED_NA;
-            *endian = YP_PACK_ENDIAN_NA;
-            *size = YP_PACK_SIZE_NA;
-            break;
-        case '@':
-            *type = YP_PACK_MOVE;
-            *signed_type = YP_PACK_SIGNED_NA;
-            *endian = YP_PACK_ENDIAN_NA;
-            *size = YP_PACK_SIZE_NA;
-            break;
-        case 'X':
-            *type = YP_PACK_BACK;
-            *signed_type = YP_PACK_SIGNED_NA;
-            *endian = YP_PACK_ENDIAN_NA;
-            *size = YP_PACK_SIZE_NA;
-            break;
-        case 'x':
-            *type = YP_PACK_NULL;
-            *signed_type = YP_PACK_SIGNED_NA;
-            *endian = YP_PACK_ENDIAN_NA;
-            *size = YP_PACK_SIZE_NA;
-            break;
-        case '%':
-            return YP_PACK_ERROR_UNSUPPORTED_DIRECTIVE;
-        default:
-            return YP_PACK_ERROR_UNKNOWN_DIRECTIVE;
-    }
-
-    bool explicit_endian = false;
-
-    while (*format < format_end) {
-        switch (**format) {
-            case '_':
-            case '!':
-                (*format)++;
-                if (*type != YP_PACK_INTEGER || !length_changed_allowed) {
-                    return YP_PACK_ERROR_BANG_NOT_ALLOWED;
-                }
-                switch (*size) {
-                    case YP_PACK_SIZE_SHORT:
-                    case YP_PACK_SIZE_INT:
-                    case YP_PACK_SIZE_LONG:
-                    case YP_PACK_SIZE_LONG_LONG:
-                        break;
-                    case YP_PACK_SIZE_16:
-                        *size = YP_PACK_SIZE_SHORT;
-                        break;
-                    case YP_PACK_SIZE_32:
-                        *size = YP_PACK_SIZE_LONG;
-                        break;
-                    case YP_PACK_SIZE_64:
-                        *size = YP_PACK_SIZE_LONG_LONG;
-                        break;
-                    case YP_PACK_SIZE_P:
-                        break;
-                    default:
-                        return YP_PACK_ERROR_BANG_NOT_ALLOWED;
-                }
-                break;
-            case '<':
-                (*format)++;
-                if (explicit_endian) {
-                    return YP_PACK_ERROR_DOUBLE_ENDIAN;
-                }
-                *endian = YP_PACK_LITTLE_ENDIAN;
-                explicit_endian = true;
-                break;
-            case '>':
-                (*format)++;
-                if (explicit_endian) {
-                    return YP_PACK_ERROR_DOUBLE_ENDIAN;
-                }
-                *endian = YP_PACK_BIG_ENDIAN;
-                explicit_endian = true;
-                break;
-            default:
-                goto exit_modifier_loop;
-        }
-    }
-
-exit_modifier_loop:
-
-    if (variant == YP_PACK_VARIANT_UNPACK && *type == YP_PACK_MOVE) {
-        *length = 0;
-    }
-
-    if (*format < format_end) {
-        if (**format == '*') {
-            switch (*type) {
-                case YP_PACK_NULL:
-                case YP_PACK_BACK:
-                    switch (variant) {
-                        case YP_PACK_VARIANT_PACK:
-                            *length_type = YP_PACK_LENGTH_FIXED;
-                            break;
-                        case YP_PACK_VARIANT_UNPACK:
-                            *length_type = YP_PACK_LENGTH_MAX;
-                            break;
-                    }
-                    *length = 0;
-                    break;
-
-                case YP_PACK_MOVE:
-                    switch (variant) {
-                        case YP_PACK_VARIANT_PACK:
-                            *length_type = YP_PACK_LENGTH_FIXED;
-                            break;
-                        case YP_PACK_VARIANT_UNPACK:
-                            *length_type = YP_PACK_LENGTH_RELATIVE;
-                            break;
-                    }
-                    *length = 0;
-                    break;
-
-                case YP_PACK_STRING_UU:
-                    *length_type = YP_PACK_LENGTH_FIXED;
-                    *length = 0;
-                    break;
-
-                case YP_PACK_STRING_FIXED:
-                    switch (variant) {
-                        case YP_PACK_VARIANT_PACK:
-                            *length_type = YP_PACK_LENGTH_FIXED;
-                            *length = 1;
-                            break;
-                        case YP_PACK_VARIANT_UNPACK:
-                            *length_type = YP_PACK_LENGTH_MAX;
-                            *length = 0;
-                            break;
-                    }
-                    break;
-
-                case YP_PACK_STRING_MIME:
-                case YP_PACK_STRING_BASE64:
-                    *length_type = YP_PACK_LENGTH_FIXED;
-                    *length = 1;
-                    break;
-
-                default:
-                    *length_type = YP_PACK_LENGTH_MAX;
-                    *length = 0;
-                    break;
-            }
-
-            (*format)++;
-        } else if (**format >= '0' && **format <= '9') {
-            errno = 0;
-            *length_type = YP_PACK_LENGTH_FIXED;
-            #if UINTMAX_MAX < UINT64_MAX
-                #error "YARP's design assumes uintmax_t is at least as large as uint64_t"
-            #endif
-            uintmax_t length_max = strtoumaxc(format);
-            if (errno || length_max > UINT64_MAX) {
-                return YP_PACK_ERROR_LENGTH_TOO_BIG;
-            }
-            *length = (uint64_t) length_max;
-        }
-    }
-
-    switch (*type) {
-        case YP_PACK_UTF8:
-            /* if encoding is US-ASCII, upgrade to UTF-8 */
-            if (*encoding == YP_PACK_ENCODING_US_ASCII) {
-                *encoding = YP_PACK_ENCODING_UTF_8;
-            }
-            break;
-        case YP_PACK_STRING_MIME:
-        case YP_PACK_STRING_BASE64:
-        case YP_PACK_STRING_UU:
-            /* keep US-ASCII (do nothing) */
-            break;
-        default:
-            /* fall back to BINARY */
-            *encoding = YP_PACK_ENCODING_ASCII_8BIT;
-            break;
-    }
-
-    return YP_PACK_OK;
-}
-
-YP_EXPORTED_FUNCTION size_t
-yp_size_to_native(yp_pack_size size) {
-    switch (size) {
-        case YP_PACK_SIZE_SHORT:
-            return sizeof(short);
-        case YP_PACK_SIZE_INT:
-            return sizeof(int);
-        case YP_PACK_SIZE_LONG:
-            return sizeof(long);
-        case YP_PACK_SIZE_LONG_LONG:
-            return sizeof(long long);
-        case YP_PACK_SIZE_8:
-            return 1;
-        case YP_PACK_SIZE_16:
-            return 2;
-        case YP_PACK_SIZE_32:
-            return 4;
-        case YP_PACK_SIZE_64:
-            return 8;
-        case YP_PACK_SIZE_P:
-            return sizeof(void *);
-        default:
-            return 0;
-    }
-}
-
-static uintmax_t
-strtoumaxc(const char **format) {
-    uintmax_t value = 0;
-    while (**format >= '0' && **format <= '9') {
-        if (value > UINTMAX_MAX / 10) {
-            errno = ERANGE;
-        }
-        value = value * 10 + ((uintmax_t) (**format - '0'));
-        (*format)++;
-    }
-    return value;
-}
diff --git a/yarp/pack.h b/yarp/pack.h
deleted file mode 100644
index 9d6204bf7b7410..00000000000000
--- a/yarp/pack.h
+++ /dev/null
@@ -1,141 +0,0 @@
-#ifndef YARP_PACK_H
-#define YARP_PACK_H
-
-#include "yarp/defines.h"
-
-#include <stdint.h>
-#include <stdlib.h>
-
-typedef enum yp_pack_version {
-    YP_PACK_VERSION_3_2_0
-} yp_pack_version;
-
-typedef enum yp_pack_variant {
-    YP_PACK_VARIANT_PACK,
-    YP_PACK_VARIANT_UNPACK
-} yp_pack_variant;
-
-typedef enum yp_pack_type {
-    YP_PACK_SPACE,
-    YP_PACK_COMMENT,
-    YP_PACK_INTEGER,
-    YP_PACK_UTF8,
-    YP_PACK_BER,
-    YP_PACK_FLOAT,
-    YP_PACK_STRING_SPACE_PADDED,
-    YP_PACK_STRING_NULL_PADDED,
-    YP_PACK_STRING_NULL_TERMINATED,
-    YP_PACK_STRING_MSB,
-    YP_PACK_STRING_LSB,
-    YP_PACK_STRING_HEX_HIGH,
-    YP_PACK_STRING_HEX_LOW,
-    YP_PACK_STRING_UU,
-    YP_PACK_STRING_MIME,
-    YP_PACK_STRING_BASE64,
-    YP_PACK_STRING_FIXED,
-    YP_PACK_STRING_POINTER,
-    YP_PACK_MOVE,
-    YP_PACK_BACK,
-    YP_PACK_NULL,
-    YP_PACK_END
-} yp_pack_type;
-
-typedef enum yp_pack_signed {
-    YP_PACK_UNSIGNED,
-    YP_PACK_SIGNED,
-    YP_PACK_SIGNED_NA
-} yp_pack_signed;
-
-typedef enum yp_pack_endian {
-    YP_PACK_AGNOSTIC_ENDIAN,
-    YP_PACK_LITTLE_ENDIAN,      // aka 'VAX', or 'V'
-    YP_PACK_BIG_ENDIAN,         // aka 'network', or 'N'
-    YP_PACK_NATIVE_ENDIAN,
-    YP_PACK_ENDIAN_NA
-} yp_pack_endian;
-
-typedef enum yp_pack_size {
-    YP_PACK_SIZE_SHORT,
-    YP_PACK_SIZE_INT,
-    YP_PACK_SIZE_LONG,
-    YP_PACK_SIZE_LONG_LONG,
-    YP_PACK_SIZE_8,
-    YP_PACK_SIZE_16,
-    YP_PACK_SIZE_32,
-    YP_PACK_SIZE_64,
-    YP_PACK_SIZE_P,
-    YP_PACK_SIZE_NA
-} yp_pack_size;
-
-typedef enum yp_pack_length_type {
-    YP_PACK_LENGTH_FIXED,
-    YP_PACK_LENGTH_MAX,
-    YP_PACK_LENGTH_RELATIVE,  // special case for unpack @*
-    YP_PACK_LENGTH_NA
-} yp_pack_length_type;
-
-typedef enum yp_pack_encoding {
-    YP_PACK_ENCODING_START,
-    YP_PACK_ENCODING_ASCII_8BIT,
-    YP_PACK_ENCODING_US_ASCII,
-    YP_PACK_ENCODING_UTF_8
-} yp_pack_encoding;
-
-typedef enum yp_pack_result {
-    YP_PACK_OK,
-    YP_PACK_ERROR_UNSUPPORTED_DIRECTIVE,
-    YP_PACK_ERROR_UNKNOWN_DIRECTIVE,
-    YP_PACK_ERROR_LENGTH_TOO_BIG,
-    YP_PACK_ERROR_BANG_NOT_ALLOWED,
-    YP_PACK_ERROR_DOUBLE_ENDIAN
-} yp_pack_result;
-
-// Parse a single directive from a pack or unpack format string.
-//
-// Parameters:
-//  - [in] yp_pack_version version    the version of Ruby
-//  - [in] yp_pack_variant variant    pack or unpack
-//  - [in out] const char **format    the start of the next directive to parse
-//      on calling, and advanced beyond the parsed directive on return, or as
-//      much of it as was consumed until an error was encountered
-//  - [in] const char *format_end     the end of the format string
-//  - [out] yp_pack_type *type        the type of the directive
-//  - [out] yp_pack_signed *signed_type
-//                                    whether the value is signed
-//  - [out] yp_pack_endian *endian    the endianness of the value
-//  - [out] yp_pack_size *size        the size of the value
-//  - [out] yp_pack_length_type *length_type
-//                                    what kind of length is specified
-//  - [out] size_t *length            the length of the directive
-//  - [in out] yp_pack_encoding *encoding
-//                                    takes the current encoding of the string
-//      which would result from parsing the whole format string, and returns a
-//      possibly changed directive - the encoding should be
-//      YP_PACK_ENCODING_START when yp_pack_parse is called for the first
-//      directive in a format string
-//
-// Return:
-//  - YP_PACK_OK on success
-//  - YP_PACK_ERROR_* on error
-//
-// Notes:
-//   Consult Ruby documentation for the meaning of directives.
-YP_EXPORTED_FUNCTION yp_pack_result
-yp_pack_parse(
-    yp_pack_variant variant_arg,
-    const char **format,
-    const char *format_end,
-    yp_pack_type *type,
-    yp_pack_signed *signed_type,
-    yp_pack_endian *endian,
-    yp_pack_size *size,
-    yp_pack_length_type *length_type,
-    uint64_t *length,
-    yp_pack_encoding *encoding
-);
-
-// YARP abstracts sizes away from the native system - this converts an abstract
-// size to a native size.
-YP_EXPORTED_FUNCTION size_t yp_size_to_native(yp_pack_size size);
-
-#endif
diff --git a/yarp/parser.h b/yarp/parser.h
deleted file mode 100644
index 0ae01f78da6e53..00000000000000
--- a/yarp/parser.h
+++ /dev/null
@@ -1,389 +0,0 @@
-#ifndef YARP_PARSER_H
-#define YARP_PARSER_H
-
-#include "yarp/ast.h"
-#include "yarp/defines.h"
-#include "yarp/enc/yp_encoding.h"
-#include "yarp/util/yp_constant_pool.h"
-#include "yarp/util/yp_list.h"
-#include "yarp/util/yp_newline_list.h"
-#include "yarp/util/yp_state_stack.h"
-
-#include <stdbool.h>
-
-// This enum provides various bits that represent different kinds of states that
-// the lexer can track. This is used to determine which kind of token to return
-// based on the context of the parser.
-typedef enum {
-    YP_LEX_STATE_BIT_BEG,
-    YP_LEX_STATE_BIT_END,
-    YP_LEX_STATE_BIT_ENDARG,
-    YP_LEX_STATE_BIT_ENDFN,
-    YP_LEX_STATE_BIT_ARG,
-    YP_LEX_STATE_BIT_CMDARG,
-    YP_LEX_STATE_BIT_MID,
-    YP_LEX_STATE_BIT_FNAME,
-    YP_LEX_STATE_BIT_DOT,
-    YP_LEX_STATE_BIT_CLASS,
-    YP_LEX_STATE_BIT_LABEL,
-    YP_LEX_STATE_BIT_LABELED,
-    YP_LEX_STATE_BIT_FITEM
-} yp_lex_state_bit_t;
-
-// This enum combines the various bits from the above enum into individual
-// values that represent the various states of the lexer.
-typedef enum {
-    YP_LEX_STATE_NONE = 0,
-    YP_LEX_STATE_BEG = (1 << YP_LEX_STATE_BIT_BEG),
-    YP_LEX_STATE_END = (1 << YP_LEX_STATE_BIT_END),
-    YP_LEX_STATE_ENDARG = (1 << YP_LEX_STATE_BIT_ENDARG),
-    YP_LEX_STATE_ENDFN = (1 << YP_LEX_STATE_BIT_ENDFN),
-    YP_LEX_STATE_ARG = (1 << YP_LEX_STATE_BIT_ARG),
-    YP_LEX_STATE_CMDARG = (1 << YP_LEX_STATE_BIT_CMDARG),
-    YP_LEX_STATE_MID = (1 << YP_LEX_STATE_BIT_MID),
-    YP_LEX_STATE_FNAME = (1 << YP_LEX_STATE_BIT_FNAME),
-    YP_LEX_STATE_DOT = (1 << YP_LEX_STATE_BIT_DOT),
-    YP_LEX_STATE_CLASS = (1 << YP_LEX_STATE_BIT_CLASS),
-    YP_LEX_STATE_LABEL = (1 << YP_LEX_STATE_BIT_LABEL),
-    YP_LEX_STATE_LABELED = (1 << YP_LEX_STATE_BIT_LABELED),
-    YP_LEX_STATE_FITEM = (1 << YP_LEX_STATE_BIT_FITEM),
-    YP_LEX_STATE_BEG_ANY = YP_LEX_STATE_BEG | YP_LEX_STATE_MID | YP_LEX_STATE_CLASS,
-    YP_LEX_STATE_ARG_ANY = YP_LEX_STATE_ARG | YP_LEX_STATE_CMDARG,
-    YP_LEX_STATE_END_ANY = YP_LEX_STATE_END | YP_LEX_STATE_ENDARG | YP_LEX_STATE_ENDFN
-} yp_lex_state_t;
-
-typedef enum {
-    YP_HEREDOC_QUOTE_NONE,
-    YP_HEREDOC_QUOTE_SINGLE = '\'',
-    YP_HEREDOC_QUOTE_DOUBLE = '"',
-    YP_HEREDOC_QUOTE_BACKTICK = '`',
-} yp_heredoc_quote_t;
-
-typedef enum {
-    YP_HEREDOC_INDENT_NONE,
-    YP_HEREDOC_INDENT_DASH,
-    YP_HEREDOC_INDENT_TILDE,
-} yp_heredoc_indent_t;
-
-// When lexing Ruby source, the lexer has a small amount of state to tell which
-// kind of token it is currently lexing. For example, when we find the start of
-// a string, the first token that we return is a TOKEN_STRING_BEGIN token. After
-// that the lexer is now in the YP_LEX_STRING mode, and will return tokens that
-// are found as part of a string.
-typedef struct yp_lex_mode {
-    enum {
-        // This state is used when any given token is being lexed.
-        YP_LEX_DEFAULT,
-
-        // This state is used when we're lexing as normal but inside an embedded
-        // expression of a string.
-        YP_LEX_EMBEXPR,
-
-        // This state is used when we're lexing a variable that is embedded
-        // directly inside of a string with the # shorthand.
-        YP_LEX_EMBVAR,
-
-        // This state is used when you are inside the content of a heredoc.
-        YP_LEX_HEREDOC,
-
-        // This state is used when we are lexing a list of tokens, as in a %w
-        // word list literal or a %i symbol list literal.
-        YP_LEX_LIST,
-
-        // This state is used when a regular expression has been begun and we
-        // are looking for the terminator.
-        YP_LEX_REGEXP,
-
-        // This state is used when we are lexing a string or a string-like
-        // token, as in string content with either quote or an xstring.
-        YP_LEX_STRING
-    } mode;
-
-    union {
-        struct {
-            // This keeps track of the nesting level of the list.
-            size_t nesting;
-
-            // Whether or not interpolation is allowed in this list.
-            bool interpolation;
-
-            // When lexing a list, it takes into account balancing the
-            // terminator if the terminator is one of (), [], {}, or <>.
-            uint8_t incrementor;
-
-            // This is the terminator of the list literal.
-            uint8_t terminator;
-
-            // This is the character set that should be used to delimit the
-            // tokens within the list.
-            uint8_t breakpoints[11];
-        } list;
-
-        struct {
-            // This keeps track of the nesting level of the regular expression.
-            size_t nesting;
-
-            // When lexing a regular expression, it takes into account balancing
-            // the terminator if the terminator is one of (), [], {}, or <>.
-            uint8_t incrementor;
-
-            // This is the terminator of the regular expression.
-            uint8_t terminator;
-
-            // This is the character set that should be used to delimit the
-            // tokens within the regular expression.
-            uint8_t breakpoints[6];
-        } regexp;
-
-        struct {
-            // This keeps track of the nesting level of the string.
-            size_t nesting;
-
-            // Whether or not interpolation is allowed in this string.
-            bool interpolation;
-
-            // Whether or not at the end of the string we should allow a :,
-            // which would indicate this was a dynamic symbol instead of a
-            // string.
-            bool label_allowed;
-
-            // When lexing a string, it takes into account balancing the
-            // terminator if the terminator is one of (), [], {}, or <>.
-            uint8_t incrementor;
-
-            // This is the terminator of the string. It is typically either a
-            // single or double quote.
-            uint8_t terminator;
-
-            // This is the character set that should be used to delimit the
-            // tokens within the string.
-            uint8_t breakpoints[6];
-        } string;
-
-        struct {
-            // These pointers point to the beginning and end of the heredoc
-            // identifier.
-            const uint8_t *ident_start;
-            size_t ident_length;
-
-            yp_heredoc_quote_t quote;
-            yp_heredoc_indent_t indent;
-
-            // This is the pointer to the character where lexing should resume
-            // once the heredoc has been completely processed.
-            const uint8_t *next_start;
-        } heredoc;
-    } as;
-
-    // The previous lex state so that it knows how to pop.
-    struct yp_lex_mode *prev;
-} yp_lex_mode_t;
-
-// We pre-allocate a certain number of lex states in order to avoid having to
-// call malloc too many times while parsing. You really shouldn't need more than
-// this because you only really nest deeply when doing string interpolation.
-#define YP_LEX_STACK_SIZE 4
-
-// A forward declaration since our error handler struct accepts a parser for
-// each of its function calls.
-typedef struct yp_parser yp_parser_t;
-
-// While parsing, we keep track of a stack of contexts. This is helpful for
-// error recovery so that we can pop back to a previous context when we hit a
-// token that is understood by a parent context but not by the current context.
-typedef enum {
-    YP_CONTEXT_BEGIN,          // a begin statement
-    YP_CONTEXT_BLOCK_BRACES,   // expressions in block arguments using braces
-    YP_CONTEXT_BLOCK_KEYWORDS, // expressions in block arguments using do..end
-    YP_CONTEXT_CASE_WHEN,      // a case when statements
-    YP_CONTEXT_CASE_IN,        // a case in statements
-    YP_CONTEXT_CLASS,          // a class declaration
-    YP_CONTEXT_DEF,            // a method definition
-    YP_CONTEXT_DEF_PARAMS,     // a method definition's parameters
-    YP_CONTEXT_DEFAULT_PARAMS, // a method definition's default parameter
-    YP_CONTEXT_ELSE,           // an else clause
-    YP_CONTEXT_ELSIF,          // an elsif clause
-    YP_CONTEXT_EMBEXPR,        // an interpolated expression
-    YP_CONTEXT_ENSURE,         // an ensure statement
-    YP_CONTEXT_FOR,            // a for loop
-    YP_CONTEXT_IF,             // an if statement
-    YP_CONTEXT_LAMBDA_BRACES,  // a lambda expression with braces
-    YP_CONTEXT_LAMBDA_DO_END,  // a lambda expression with do..end
-    YP_CONTEXT_MAIN,           // the top level context
-    YP_CONTEXT_MODULE,         // a module declaration
-    YP_CONTEXT_PARENS,         // a parenthesized expression
-    YP_CONTEXT_POSTEXE,        // an END block
-    YP_CONTEXT_PREDICATE,      // a predicate inside an if/elsif/unless statement
-    YP_CONTEXT_PREEXE,         // a BEGIN block
-    YP_CONTEXT_RESCUE_ELSE,    // a rescue else statement
-    YP_CONTEXT_RESCUE,         // a rescue statement
-    YP_CONTEXT_SCLASS,         // a singleton class definition
-    YP_CONTEXT_UNLESS,         // an unless statement
-    YP_CONTEXT_UNTIL,          // an until statement
-    YP_CONTEXT_WHILE,          // a while statement
-} yp_context_t;
-
-// This is a node in a linked list of contexts.
-typedef struct yp_context_node {
-    yp_context_t context;
-    struct yp_context_node *prev;
-} yp_context_node_t;
-
-// This is the type of a comment that we've found while parsing.
-typedef enum {
-    YP_COMMENT_INLINE,
-    YP_COMMENT_EMBDOC,
-    YP_COMMENT___END__
-} yp_comment_type_t;
-
-// This is a node in the linked list of comments that we've found while parsing.
-typedef struct yp_comment {
-    yp_list_node_t node;
-    const uint8_t *start;
-    const uint8_t *end;
-    yp_comment_type_t type;
-} yp_comment_t;
-
-// When the encoding that is being used to parse the source is changed by YARP,
-// we provide the ability here to call out to a user-defined function.
-typedef void (*yp_encoding_changed_callback_t)(yp_parser_t *parser);
-
-// When an encoding is encountered that isn't understood by YARP, we provide
-// the ability here to call out to a user-defined function to get an encoding
-// struct. If the function returns something that isn't NULL, we set that to
-// our encoding and use it to parse identifiers.
-typedef yp_encoding_t *(*yp_encoding_decode_callback_t)(yp_parser_t *parser, const uint8_t *name, size_t width);
-
-// When you are lexing through a file, the lexer needs all of the information
-// that the parser additionally provides (for example, the local table). So if
-// you want to properly lex Ruby, you need to actually lex it in the context of
-// the parser. In order to provide this functionality, we optionally allow a
-// struct to be attached to the parser that calls back out to a user-provided
-// callback when each token is lexed.
-typedef struct {
-    // This opaque pointer is used to provide whatever information the user
-    // deemed necessary to the callback. In our case we use it to pass the array
-    // that the tokens get appended into.
-    void *data;
-
-    // This is the callback that is called when a token is lexed. It is passed
-    // the opaque data pointer, the parser, and the token that was lexed.
-    void (*callback)(void *data, yp_parser_t *parser, yp_token_t *token);
-} yp_lex_callback_t;
-
-// This struct represents a node in a linked list of scopes. Some scopes can see
-// into their parent scopes, while others cannot.
-typedef struct yp_scope {
-    // The IDs of the locals in the given scope.
-    yp_constant_id_list_t locals;
-
-    // A boolean indicating whether or not this scope can see into its parent.
-    // If closed is true, then the scope cannot see into its parent.
-    bool closed;
-
-    // A pointer to the previous scope in the linked list.
-    struct yp_scope *previous;
-} yp_scope_t;
-
-// This struct represents the overall parser. It contains a reference to the
-// source file, as well as pointers that indicate where in the source it's
-// currently parsing. It also contains the most recent and current token that
-// it's considering.
-struct yp_parser {
-    yp_lex_state_t lex_state; // the current state of the lexer
-    bool command_start;       // whether or not we're at the beginning of a command
-    int enclosure_nesting;    // tracks the current nesting of (), [], and {}
-
-    // Used to temporarily track the nesting of enclosures to determine if a {
-    // is the beginning of a lambda following the parameters of a lambda.
-    int lambda_enclosure_nesting;
-
-    // Used to track the nesting of braces to ensure we get the correct value
-    // when we are interpolating blocks with braces.
-    int brace_nesting;
-
-    // the stack used to determine if a do keyword belongs to the predicate of a
-    // while, until, or for loop
-    yp_state_stack_t do_loop_stack;
-
-    // the stack used to determine if a do keyword belongs to the beginning of a
-    // block
-    yp_state_stack_t accepts_block_stack;
-
-    struct {
-        yp_lex_mode_t *current;                 // the current mode of the lexer
-        yp_lex_mode_t stack[YP_LEX_STACK_SIZE]; // the stack of lexer modes
-        size_t index;                           // the current index into the lexer mode stack
-    } lex_modes;
-
-    const uint8_t *start;   // the pointer to the start of the source
-    const uint8_t *end;     // the pointer to the end of the source
-    yp_token_t previous; // the previous token we were considering
-    yp_token_t current;  // the current token we're considering
-
-    // This is a special field set on the parser when we need the parser to jump
-    // to a specific location when lexing the next token, as opposed to just
-    // using the end of the previous token. Normally this is NULL.
-    const uint8_t *next_start;
-
-    // This field indicates the end of a heredoc whose identifier was found on
-    // the current line. If another heredoc is found on the same line, then this
-    // will be moved forward to the end of that heredoc. If no heredocs are
-    // found on a line then this is NULL.
-    const uint8_t *heredoc_end;
-
-    yp_list_t comment_list;             // the list of comments that have been found while parsing
-    yp_list_t warning_list;             // the list of warnings that have been found while parsing
-    yp_list_t error_list;               // the list of errors that have been found while parsing
-    yp_scope_t *current_scope;          // the current local scope
-
-    yp_context_node_t *current_context; // the current parsing context
-    bool recovering; // whether or not we're currently recovering from a syntax error
-
-    // The encoding functions for the current file is attached to the parser as
-    // it's parsing so that it can change with a magic comment.
-    yp_encoding_t encoding;
-
-    // Whether or not the encoding has been changed by a magic comment. We use
-    // this to provide a fast path for the lexer instead of going through the
-    // function pointer.
-    bool encoding_changed;
-
-    // When the encoding that is being used to parse the source is changed by
-    // YARP, we provide the ability here to call out to a user-defined function.
-    yp_encoding_changed_callback_t encoding_changed_callback;
-
-    // When an encoding is encountered that isn't understood by YARP, we provide
-    // the ability here to call out to a user-defined function to get an
-    // encoding struct. If the function returns something that isn't NULL, we
-    // set that to our encoding and use it to parse identifiers.
-    yp_encoding_decode_callback_t encoding_decode_callback;
-
-    // This pointer indicates where a comment must start if it is to be
-    // considered an encoding comment.
-    const uint8_t *encoding_comment_start;
-
-    // This is an optional callback that can be attached to the parser that will
-    // be called whenever a new token is lexed by the parser.
-    yp_lex_callback_t *lex_callback;
-
-    // This flag indicates that we are currently parsing a pattern matching
-    // expression and impacts that calculation of newlines.
-    bool pattern_matching_newlines;
-
-    // This flag indicates that we are currently parsing a keyword argument.
-    bool in_keyword_arg;
-
-    // This is the path of the file being parsed
-    // We use the filepath when constructing SourceFileNodes
-    yp_string_t filepath_string;
-
-    // This constant pool keeps all of the constants defined throughout the file
-    // so that we can reference them later.
-    yp_constant_pool_t constant_pool;
-
-    // This is the list of newline offsets in the source file.
-    yp_newline_list_t newline_list;
-};
-
-#endif // YARP_PARSER_H
diff --git a/yarp/regexp.c b/yarp/regexp.c
deleted file mode 100644
index 2aeadc1bfcfef0..00000000000000
--- a/yarp/regexp.c
+++ /dev/null
@@ -1,580 +0,0 @@
-#include "yarp/regexp.h"
-
-// This is the parser that is going to handle parsing regular expressions.
-typedef struct {
-    const uint8_t *start;
-    const uint8_t *cursor;
-    const uint8_t *end;
-    yp_string_list_t *named_captures;
-    bool encoding_changed;
-    yp_encoding_t *encoding;
-} yp_regexp_parser_t;
-
-// This initializes a new parser with the given source.
-static void
-yp_regexp_parser_init(yp_regexp_parser_t *parser, const uint8_t *start, const uint8_t *end, yp_string_list_t *named_captures, bool encoding_changed, yp_encoding_t *encoding) {
-    *parser = (yp_regexp_parser_t) {
-        .start = start,
-        .cursor = start,
-        .end = end,
-        .named_captures = named_captures,
-        .encoding_changed = encoding_changed,
-        .encoding = encoding
-    };
-}
-
-// This appends a new string to the list of named captures.
-static void
-yp_regexp_parser_named_capture(yp_regexp_parser_t *parser, const uint8_t *start, const uint8_t *end) {
-    yp_string_t string;
-    yp_string_shared_init(&string, start, end);
-    yp_string_list_append(parser->named_captures, &string);
-    yp_string_free(&string);
-}
-
-// Returns true if the next character is the end of the source.
-static inline bool
-yp_regexp_char_is_eof(yp_regexp_parser_t *parser) {
-    return parser->cursor >= parser->end;
-}
-
-// Optionally accept a char and consume it if it exists.
-static inline bool
-yp_regexp_char_accept(yp_regexp_parser_t *parser, uint8_t value) {
-    if (!yp_regexp_char_is_eof(parser) && *parser->cursor == value) {
-        parser->cursor++;
-        return true;
-    }
-    return false;
-}
-
-// Expect a character to be present and consume it.
-static inline bool
-yp_regexp_char_expect(yp_regexp_parser_t *parser, uint8_t value) {
-    if (!yp_regexp_char_is_eof(parser) && *parser->cursor == value) {
-        parser->cursor++;
-        return true;
-    }
-    return false;
-}
-
-// This advances the current token to the next instance of the given character.
-static bool
-yp_regexp_char_find(yp_regexp_parser_t *parser, uint8_t value) {
-    if (yp_regexp_char_is_eof(parser)) {
-        return false;
-    }
-
-    const uint8_t *end = (const uint8_t *) yp_memchr(parser->cursor, value, (size_t) (parser->end - parser->cursor), parser->encoding_changed, parser->encoding);
-    if (end == NULL) {
-        return false;
-    }
-
-    parser->cursor = end + 1;
-    return true;
-}
-
-// Range quantifiers are a special class of quantifiers that look like
-//
-// * {digit}
-// * {digit,}
-// * {digit,digit}
-// * {,digit}
-//
-// Unfortunately, if there are any spaces in between, then this just becomes a
-// regular character match expression and we have to backtrack. So when this
-// function first starts running, we'll create a "save" point and then attempt
-// to parse the quantifier. If it fails, we'll restore the save point and
-// return.
-//
-// The properly track everything, we're going to build a little state machine.
-// It looks something like the following:
-//
-//                  ┌───────┐                 ┌─────────┐ ────────────┐
-// ──── lbrace ───> │ start │ ──── digit ───> │ minimum │             │
-//                  └───────┘                 └─────────┘ <─── digit ─┘
-//                      │                       │    │
-//   ┌───────┐          │                       │  rbrace
-//   │ comma │ <───── comma  ┌──── comma ───────┘    │
-//   └───────┘               V                       V
-//      │             ┌─────────┐               ┌─────────┐
-//      └── digit ──> │ maximum │ ── rbrace ──> │| final |│
-//                    └─────────┘               └─────────┘
-//                    │         ^
-//                    └─ digit ─┘
-//
-// Note that by the time we've hit this function, the lbrace has already been
-// consumed so we're in the start state.
-static bool
-yp_regexp_parse_range_quantifier(yp_regexp_parser_t *parser) {
-    const uint8_t *savepoint = parser->cursor;
-
-    enum {
-        YP_REGEXP_RANGE_QUANTIFIER_STATE_START,
-        YP_REGEXP_RANGE_QUANTIFIER_STATE_MINIMUM,
-        YP_REGEXP_RANGE_QUANTIFIER_STATE_MAXIMUM,
-        YP_REGEXP_RANGE_QUANTIFIER_STATE_COMMA
-    } state = YP_REGEXP_RANGE_QUANTIFIER_STATE_START;
-
-    while (1) {
-        switch (state) {
-            case YP_REGEXP_RANGE_QUANTIFIER_STATE_START:
-                switch (*parser->cursor) {
-                    case '0': case '1': case '2': case '3': case '4': case '5': case '6': case '7': case '8': case '9':
-                        parser->cursor++;
-                        state = YP_REGEXP_RANGE_QUANTIFIER_STATE_MINIMUM;
-                        break;
-                    case ',':
-                        parser->cursor++;
-                        state = YP_REGEXP_RANGE_QUANTIFIER_STATE_COMMA;
-                        break;
-                    default:
-                        parser->cursor = savepoint;
-                        return true;
-                }
-                break;
-            case YP_REGEXP_RANGE_QUANTIFIER_STATE_MINIMUM:
-                switch (*parser->cursor) {
-                    case '0': case '1': case '2': case '3': case '4': case '5': case '6': case '7': case '8': case '9':
-                        parser->cursor++;
-                        break;
-                    case ',':
-                        parser->cursor++;
-                        state = YP_REGEXP_RANGE_QUANTIFIER_STATE_MAXIMUM;
-                        break;
-                    case '}':
-                        parser->cursor++;
-                        return true;
-                    default:
-                        parser->cursor = savepoint;
-                        return true;
-                }
-                break;
-            case YP_REGEXP_RANGE_QUANTIFIER_STATE_COMMA:
-                switch (*parser->cursor) {
-                    case '0': case '1': case '2': case '3': case '4': case '5': case '6': case '7': case '8': case '9':
-                        parser->cursor++;
-                        state = YP_REGEXP_RANGE_QUANTIFIER_STATE_MAXIMUM;
-                        break;
-                    default:
-                        parser->cursor = savepoint;
-                        return true;
-                }
-                break;
-            case YP_REGEXP_RANGE_QUANTIFIER_STATE_MAXIMUM:
-                switch (*parser->cursor) {
-                    case '0': case '1': case '2': case '3': case '4': case '5': case '6': case '7': case '8': case '9':
-                        parser->cursor++;
-                        break;
-                    case '}':
-                        parser->cursor++;
-                        return true;
-                    default:
-                        parser->cursor = savepoint;
-                        return true;
-                }
-                break;
-        }
-    }
-
-    return true;
-}
-
-// quantifier : star-quantifier
-//            | plus-quantifier
-//            | optional-quantifier
-//            | range-quantifier
-//            | <empty>
-//            ;
-static bool
-yp_regexp_parse_quantifier(yp_regexp_parser_t *parser) {
-    switch (*parser->cursor) {
-        case '*':
-        case '+':
-        case '?':
-            parser->cursor++;
-            return true;
-        case '{':
-            parser->cursor++;
-            return yp_regexp_parse_range_quantifier(parser);
-        default:
-            // In this case there is no quantifier.
-            return true;
-    }
-}
-
-// match-posix-class : '[' '[' ':' '^'? CHAR+ ':' ']' ']'
-//                   ;
-static bool
-yp_regexp_parse_posix_class(yp_regexp_parser_t *parser) {
-    if (!yp_regexp_char_expect(parser, ':')) {
-        return false;
-    }
-
-    yp_regexp_char_accept(parser, '^');
-
-    return (
-        yp_regexp_char_find(parser, ':') &&
-        yp_regexp_char_expect(parser, ']') &&
-        yp_regexp_char_expect(parser, ']')
-    );
-}
-
-// Forward declaration because character sets can be nested.
-static bool
-yp_regexp_parse_lbracket(yp_regexp_parser_t *parser);
-
-// match-char-set : '[' '^'? (match-range | match-char)* ']'
-//                ;
-static bool
-yp_regexp_parse_character_set(yp_regexp_parser_t *parser) {
-    yp_regexp_char_accept(parser, '^');
-
-    while (!yp_regexp_char_is_eof(parser) && *parser->cursor != ']') {
-        switch (*parser->cursor++) {
-            case '[':
-                yp_regexp_parse_lbracket(parser);
-                break;
-            case '\\':
-                if (!yp_regexp_char_is_eof(parser)) {
-                    parser->cursor++;
-                }
-                break;
-            default:
-                // do nothing, we've already advanced the cursor
-                break;
-        }
-    }
-
-    return yp_regexp_char_expect(parser, ']');
-}
-
-// A left bracket can either mean a POSIX class or a character set.
-static bool
-yp_regexp_parse_lbracket(yp_regexp_parser_t *parser) {
-    const uint8_t *reset = parser->cursor;
-
-    if ((parser->cursor + 2 < parser->end) && parser->cursor[0] == '[' && parser->cursor[1] == ':') {
-        parser->cursor++;
-        if (yp_regexp_parse_posix_class(parser)) return true;
-
-        parser->cursor = reset;
-    }
-
-    return yp_regexp_parse_character_set(parser);
-}
-
-// Forward declaration here since parsing groups needs to go back up the grammar
-// to parse expressions within them.
-static bool
-yp_regexp_parse_expression(yp_regexp_parser_t *parser);
-
-// These are the states of the options that are configurable on the regular
-// expression (or from within a group).
-typedef enum {
-    YP_REGEXP_OPTION_STATE_INVALID,
-    YP_REGEXP_OPTION_STATE_TOGGLEABLE,
-    YP_REGEXP_OPTION_STATE_ADDABLE,
-    YP_REGEXP_OPTION_STATE_ADDED,
-    YP_REGEXP_OPTION_STATE_REMOVED
-} yp_regexp_option_state_t;
-
-// These are the options that are configurable on the regular expression (or
-// from within a group).
-#define YP_REGEXP_OPTION_STATE_SLOT_MINIMUM 'a'
-#define YP_REGEXP_OPTION_STATE_SLOT_MAXIMUM 'x'
-#define YP_REGEXP_OPTION_STATE_SLOTS (YP_REGEXP_OPTION_STATE_SLOT_MAXIMUM - YP_REGEXP_OPTION_STATE_SLOT_MINIMUM + 1)
-
-// This is the set of options that are configurable on the regular expression.
-typedef struct {
-    uint8_t values[YP_REGEXP_OPTION_STATE_SLOTS];
-} yp_regexp_options_t;
-
-// Initialize a new set of options to their default values.
-static void
-yp_regexp_options_init(yp_regexp_options_t *options) {
-    memset(options, YP_REGEXP_OPTION_STATE_INVALID, sizeof(uint8_t) * YP_REGEXP_OPTION_STATE_SLOTS);
-    options->values['i' - YP_REGEXP_OPTION_STATE_SLOT_MINIMUM] = YP_REGEXP_OPTION_STATE_TOGGLEABLE;
-    options->values['m' - YP_REGEXP_OPTION_STATE_SLOT_MINIMUM] = YP_REGEXP_OPTION_STATE_TOGGLEABLE;
-    options->values['x' - YP_REGEXP_OPTION_STATE_SLOT_MINIMUM] = YP_REGEXP_OPTION_STATE_TOGGLEABLE;
-    options->values['d' - YP_REGEXP_OPTION_STATE_SLOT_MINIMUM] = YP_REGEXP_OPTION_STATE_ADDABLE;
-    options->values['a' - YP_REGEXP_OPTION_STATE_SLOT_MINIMUM] = YP_REGEXP_OPTION_STATE_ADDABLE;
-    options->values['u' - YP_REGEXP_OPTION_STATE_SLOT_MINIMUM] = YP_REGEXP_OPTION_STATE_ADDABLE;
-}
-
-// Attempt to add the given option to the set of options. Returns true if it was
-// added, false if it was already present.
-static bool
-yp_regexp_options_add(yp_regexp_options_t *options, uint8_t key) {
-    if (key >= YP_REGEXP_OPTION_STATE_SLOT_MINIMUM && key <= YP_REGEXP_OPTION_STATE_SLOT_MAXIMUM) {
-        key = (uint8_t) (key - YP_REGEXP_OPTION_STATE_SLOT_MINIMUM);
-
-        switch (options->values[key]) {
-            case YP_REGEXP_OPTION_STATE_INVALID:
-            case YP_REGEXP_OPTION_STATE_REMOVED:
-                return false;
-            case YP_REGEXP_OPTION_STATE_TOGGLEABLE:
-            case YP_REGEXP_OPTION_STATE_ADDABLE:
-                options->values[key] = YP_REGEXP_OPTION_STATE_ADDED;
-                return true;
-            case YP_REGEXP_OPTION_STATE_ADDED:
-                return true;
-        }
-    }
-
-    return false;
-}
-
-// Attempt to remove the given option from the set of options. Returns true if
-// it was removed, false if it was already absent.
-static bool
-yp_regexp_options_remove(yp_regexp_options_t *options, uint8_t key) {
-    if (key >= YP_REGEXP_OPTION_STATE_SLOT_MINIMUM && key <= YP_REGEXP_OPTION_STATE_SLOT_MAXIMUM) {
-        key = (uint8_t) (key - YP_REGEXP_OPTION_STATE_SLOT_MINIMUM);
-
-        switch (options->values[key]) {
-            case YP_REGEXP_OPTION_STATE_INVALID:
-            case YP_REGEXP_OPTION_STATE_ADDABLE:
-                return false;
-            case YP_REGEXP_OPTION_STATE_TOGGLEABLE:
-            case YP_REGEXP_OPTION_STATE_ADDED:
-            case YP_REGEXP_OPTION_STATE_REMOVED:
-                options->values[key] = YP_REGEXP_OPTION_STATE_REMOVED;
-                return true;
-        }
-    }
-
-    return false;
-}
-
-// Groups can have quite a few different patterns for syntax. They basically
-// just wrap a set of expressions, but they can potentially have options after a
-// question mark. If there _isn't_ a question mark, then it's just a set of
-// expressions. If there _is_, then here are the options:
-//
-// * (?#...)                       - inline comments
-// * (?:subexp)                    - non-capturing group
-// * (?=subexp)                    - positive lookahead
-// * (?!subexp)                    - negative lookahead
-// * (?>subexp)                    - atomic group
-// * (?~subexp)                    - absence operator
-// * (?<=subexp)                   - positive lookbehind
-// * (?<!subexp)                   - negative lookbehind
-// * (?<name>subexp)               - named capturing group
-// * (?'name'subexp)               - named capturing group
-// * (?(cond)yes-subexp)           - conditional expression
-// * (?(cond)yes-subexp|no-subexp) - conditional expression
-// * (?imxdau-imx)                 - turn on and off configuration
-// * (?imxdau-imx:subexp)          - turn on and off configuration for an expression
-//
-static bool
-yp_regexp_parse_group(yp_regexp_parser_t *parser) {
-    // First, parse any options for the group.
-    if (yp_regexp_char_accept(parser, '?')) {
-        if (yp_regexp_char_is_eof(parser)) {
-            return false;
-        }
-        yp_regexp_options_t options;
-        yp_regexp_options_init(&options);
-
-        switch (*parser->cursor) {
-            case '#': { // inline comments
-                if (parser->encoding_changed && parser->encoding->multibyte) {
-                    bool escaped = false;
-
-                    // Here we're going to take a slow path and iterate through
-                    // each multibyte character to find the close paren. We do
-                    // this because \ can be a trailing byte in some encodings.
-                    while (parser->cursor < parser->end) {
-                        if (!escaped && *parser->cursor == ')') {
-                            parser->cursor++;
-                            return true;
-                        }
-
-                        size_t width = parser->encoding->char_width(parser->cursor, (ptrdiff_t) (parser->end - parser->cursor));
-                        if (width == 0) return false;
-
-                        escaped = (width == 1) && (*parser->cursor == '\\');
-                        parser->cursor += width;
-                    }
-
-                    return false;
-                } else {
-                    // Here we can take the fast path and use memchr to find the
-                    // next ) because we are safe checking backward for \ since
-                    // it cannot be a trailing character.
-                    bool found = yp_regexp_char_find(parser, ')');
-
-                    while (found && (parser->start <= parser->cursor - 2) && (*(parser->cursor - 2) == '\\')) {
-                        found = yp_regexp_char_find(parser, ')');
-                    }
-
-                    return found;
-                }
-            }
-            case ':': // non-capturing group
-            case '=': // positive lookahead
-            case '!': // negative lookahead
-            case '>': // atomic group
-            case '~': // absence operator
-                parser->cursor++;
-                break;
-            case '<':
-                parser->cursor++;
-                if (yp_regexp_char_is_eof(parser)) {
-                    return false;
-                }
-
-                switch (*parser->cursor) {
-                    case '=': // positive lookbehind
-                    case '!': // negative lookbehind
-                        parser->cursor++;
-                        break;
-                    default: { // named capture group
-                        const uint8_t *start = parser->cursor;
-                        if (!yp_regexp_char_find(parser, '>')) {
-                            return false;
-                        }
-                        yp_regexp_parser_named_capture(parser, start, parser->cursor - 1);
-                        break;
-                    }
-                }
-                break;
-            case '\'': { // named capture group
-                const uint8_t *start = ++parser->cursor;
-                if (!yp_regexp_char_find(parser, '\'')) {
-                    return false;
-                }
-
-                yp_regexp_parser_named_capture(parser, start, parser->cursor - 1);
-                break;
-            }
-            case '(': // conditional expression
-                if (!yp_regexp_char_find(parser, ')')) {
-                    return false;
-                }
-                break;
-            case 'i': case 'm': case 'x': case 'd': case 'a': case 'u': // options
-                while (!yp_regexp_char_is_eof(parser) && *parser->cursor != '-' && *parser->cursor != ':' && *parser->cursor != ')') {
-                    if (!yp_regexp_options_add(&options, *parser->cursor)) {
-                        return false;
-                    }
-                    parser->cursor++;
-                }
-
-                if (yp_regexp_char_is_eof(parser)) {
-                    return false;
-                }
-
-                // If we hit a -, then we're done parsing options.
-                if (*parser->cursor != '-') break;
-
-                // Otherwise, fallthrough to the - case.
-                /* fallthrough */
-            case '-':
-                parser->cursor++;
-                while (!yp_regexp_char_is_eof(parser) && *parser->cursor != ':' && *parser->cursor != ')') {
-                    if (!yp_regexp_options_remove(&options, *parser->cursor)) {
-                        return false;
-                    }
-                    parser->cursor++;
-                }
-
-                if (yp_regexp_char_is_eof(parser)) {
-                    return false;
-                }
-                break;
-            default:
-                return false;
-        }
-    }
-
-    // Now, parse the expressions within this group.
-    while (!yp_regexp_char_is_eof(parser) && *parser->cursor != ')') {
-        if (!yp_regexp_parse_expression(parser)) {
-            return false;
-        }
-        yp_regexp_char_accept(parser, '|');
-    }
-
-    // Finally, make sure we have a closing parenthesis.
-    return yp_regexp_char_expect(parser, ')');
-}
-
-// item : anchor
-//      | match-posix-class
-//      | match-char-set
-//      | match-char-class
-//      | match-char-prop
-//      | match-char
-//      | match-any
-//      | group
-//      | quantified
-//      ;
-static bool
-yp_regexp_parse_item(yp_regexp_parser_t *parser) {
-    switch (*parser->cursor++) {
-        case '^':
-        case '$':
-            return true;
-        case '\\':
-            if (!yp_regexp_char_is_eof(parser)) {
-                parser->cursor++;
-            }
-            return yp_regexp_parse_quantifier(parser);
-        case '(':
-            return yp_regexp_parse_group(parser) && yp_regexp_parse_quantifier(parser);
-        case '[':
-            return yp_regexp_parse_lbracket(parser) && yp_regexp_parse_quantifier(parser);
-        default:
-            return yp_regexp_parse_quantifier(parser);
-    }
-}
-
-// expression : item+
-//            ;
-static bool
-yp_regexp_parse_expression(yp_regexp_parser_t *parser) {
-    if (!yp_regexp_parse_item(parser)) {
-        return false;
-    }
-
-    while (!yp_regexp_char_is_eof(parser) && *parser->cursor != ')' && *parser->cursor != '|') {
-        if (!yp_regexp_parse_item(parser)) {
-            return false;
-        }
-    }
-
-    return true;
-}
-
-// pattern : EOF
-//         | expression EOF
-//         | expression '|' pattern
-//         ;
-static bool
-yp_regexp_parse_pattern(yp_regexp_parser_t *parser) {
-    return (
-        (
-            // Exit early if the pattern is empty.
-            yp_regexp_char_is_eof(parser) ||
-            // Parse the first expression in the pattern.
-            yp_regexp_parse_expression(parser)
-        ) &&
-        (
-            // Return now if we've parsed the entire pattern.
-            yp_regexp_char_is_eof(parser) ||
-            // Otherwise, we should have a pipe character.
-            (yp_regexp_char_expect(parser, '|') && yp_regexp_parse_pattern(parser))
-        )
-    );
-}
-
-// Parse a regular expression and extract the names of all of the named capture
-// groups.
-YP_EXPORTED_FUNCTION bool
-yp_regexp_named_capture_group_names(const uint8_t *source, size_t size, yp_string_list_t *named_captures, bool encoding_changed, yp_encoding_t *encoding) {
-    yp_regexp_parser_t parser;
-    yp_regexp_parser_init(&parser, source, source + size, named_captures, encoding_changed, encoding);
-    return yp_regexp_parse_pattern(&parser);
-}
diff --git a/yarp/regexp.h b/yarp/regexp.h
deleted file mode 100644
index 6807c58398080b..00000000000000
--- a/yarp/regexp.h
+++ /dev/null
@@ -1,19 +0,0 @@
-#ifndef YARP_REGEXP_H
-#define YARP_REGEXP_H
-
-#include "yarp/defines.h"
-#include "yarp/parser.h"
-#include "yarp/enc/yp_encoding.h"
-#include "yarp/util/yp_memchr.h"
-#include "yarp/util/yp_string_list.h"
-#include "yarp/util/yp_string.h"
-
-#include <stdbool.h>
-#include <stddef.h>
-#include <string.h>
-
-// Parse a regular expression and extract the names of all of the named capture
-// groups.
-YP_EXPORTED_FUNCTION bool yp_regexp_named_capture_group_names(const uint8_t *source, size_t size, yp_string_list_t *named_captures, bool encoding_changed, yp_encoding_t *encoding);
-
-#endif
diff --git a/yarp/templates/ext/yarp/api_node.c.erb b/yarp/templates/ext/yarp/api_node.c.erb
deleted file mode 100644
index 0d075112c8f96f..00000000000000
--- a/yarp/templates/ext/yarp/api_node.c.erb
+++ /dev/null
@@ -1,200 +0,0 @@
-#line <%= __LINE__ + 1 %> "<%= File.basename(__FILE__) %>"
-#include "yarp/extension.h"
-
-extern VALUE rb_cYARP;
-extern VALUE rb_cYARPNode;
-extern VALUE rb_cYARPSource;
-extern VALUE rb_cYARPToken;
-extern VALUE rb_cYARPLocation;
-
-<%- nodes.each do |node| -%>
-static VALUE rb_cYARP<%= node.name %>;
-<%- end -%>
-
-static VALUE
-yp_location_new(yp_parser_t *parser, const uint8_t *start, const uint8_t *end, VALUE source) {
-    VALUE argv[] = { source, LONG2FIX(start - parser->start), LONG2FIX(end - start) };
-    return rb_class_new_instance(3, argv, rb_cYARPLocation);
-}
-
-VALUE
-yp_token_new(yp_parser_t *parser, yp_token_t *token, rb_encoding *encoding, VALUE source) {
-    ID type = rb_intern(yp_token_type_to_str(token->type));
-    VALUE location = yp_location_new(parser, token->start, token->end, source);
-
-    VALUE argv[] = {
-        ID2SYM(type),
-        rb_enc_str_new((const char *) token->start, token->end - token->start, encoding),
-        location
-    };
-
-    return rb_class_new_instance(3, argv, rb_cYARPToken);
-}
-
-static VALUE
-yp_string_new(yp_string_t *string, rb_encoding *encoding) {
-    return rb_enc_str_new((const char *) yp_string_source(string), yp_string_length(string), encoding);
-}
-
-// Create a YARP::Source object from the given parser.
-VALUE
-yp_source_new(yp_parser_t *parser, rb_encoding *encoding) {
-    VALUE source = rb_enc_str_new((const char *) parser->start, parser->end - parser->start, encoding);
-    VALUE offsets = rb_ary_new_capa(parser->newline_list.size);
-
-    for (size_t index = 0; index < parser->newline_list.size; index++) {
-        rb_ary_push(offsets, INT2FIX(parser->newline_list.offsets[index]));
-    }
-
-    VALUE source_argv[] = { source, offsets };
-    return rb_class_new_instance(2, source_argv, rb_cYARPSource);
-}
-
-typedef struct yp_node_stack_node {
-    struct yp_node_stack_node *prev;
-    yp_node_t *visit;
-    bool visited;
-} yp_node_stack_node_t;
-
-static void
-yp_node_stack_push(yp_node_stack_node_t **stack, yp_node_t *visit) {
-    yp_node_stack_node_t *node = malloc(sizeof(yp_node_stack_node_t));
-    node->prev = *stack;
-    node->visit = visit;
-    node->visited = false;
-    *stack = node;
-}
-
-static yp_node_t *
-yp_node_stack_pop(yp_node_stack_node_t **stack) {
-    yp_node_stack_node_t *current = *stack;
-    yp_node_t *visit = current->visit;
-
-    *stack = current->prev;
-    free(current);
-
-    return visit;
-}
-
-VALUE
-yp_ast_new(yp_parser_t *parser, yp_node_t *node, rb_encoding *encoding) {
-    VALUE source = yp_source_new(parser, encoding);
-    ID *constants = calloc(parser->constant_pool.size, sizeof(ID));
-
-    for (size_t index = 0; index < parser->constant_pool.capacity; index++) {
-        yp_constant_t constant = parser->constant_pool.constants[index];
-
-        if (constant.id != 0) {
-            constants[constant.id - 1] = rb_intern3((const char *) constant.start, constant.length, encoding);
-        }
-    }
-
-    yp_node_stack_node_t *node_stack = NULL;
-    yp_node_stack_push(&node_stack, node);
-    VALUE value_stack = rb_ary_new();
-
-    while (node_stack != NULL) {
-        if (!node_stack->visited) {
-            if (node_stack->visit == NULL) {
-                yp_node_stack_pop(&node_stack);
-                rb_ary_push(value_stack, Qnil);
-                continue;
-            }
-
-            yp_node_t *node = node_stack->visit;
-            node_stack->visited = true;
-
-            switch (YP_NODE_TYPE(node)) {
-                <%- nodes.each do |node| -%>
-                <%- if node.fields.any? { |field| [YARP::NodeField, YARP::OptionalNodeField, YARP::NodeListField].include?(field.class) } -%>
-#line <%= __LINE__ + 1 %> "<%= File.basename(__FILE__) %>"
-                case <%= node.type %>: {
-                    yp_<%= node.human %>_t *cast = (yp_<%= node.human %>_t *) node;
-                    <%- node.fields.each do |field| -%>
-                    <%- case field -%>
-                    <%- when YARP::NodeField, YARP::OptionalNodeField -%>
-                    yp_node_stack_push(&node_stack, (yp_node_t *) cast-><%= field.name %>);
-                    <%- when YARP::NodeListField -%>
-                    for (size_t index = 0; index < cast-><%= field.name %>.size; index++) {
-                        yp_node_stack_push(&node_stack, (yp_node_t *) cast-><%= field.name %>.nodes[index]);
-                    }
-                    <%- end -%>
-                    <%- end -%>
-                    break;
-                }
-                <%- end -%>
-                <%- end -%>
-                default:
-                    break;
-            }
-#line <%= __LINE__ + 1 %> "<%= File.basename(__FILE__) %>"
-        } else {
-            yp_node_t *node = yp_node_stack_pop(&node_stack);
-
-            switch (YP_NODE_TYPE(node)) {
-                <%- nodes.each do |node| -%>
-#line <%= __LINE__ + 1 %> "<%= File.basename(__FILE__) %>"
-                case <%= node.type %>: {
-                    <%- if node.fields.any? { |field| ![YARP::NodeField, YARP::OptionalNodeField].include?(field.class) } -%>
-                    yp_<%= node.human %>_t *cast = (yp_<%= node.human %>_t *) node;
-                    <%- end -%>
-                    VALUE argv[<%= node.fields.length + 1 %>];
-                    <%- node.fields.each_with_index do |field, index| -%>
-
-                    // <%= field.name %>
-                    <%- case field -%>
-                    <%- when YARP::NodeField, YARP::OptionalNodeField -%>
-                    argv[<%= index %>] = rb_ary_pop(value_stack);
-                    <%- when YARP::NodeListField -%>
-                    argv[<%= index %>] = rb_ary_new_capa(cast-><%= field.name %>.size);
-                    for (size_t index = 0; index < cast-><%= field.name %>.size; index++) {
-                        rb_ary_push(argv[<%= index %>], rb_ary_pop(value_stack));
-                    }
-                    <%- when YARP::StringField -%>
-                    argv[<%= index %>] = yp_string_new(&cast-><%= field.name %>, encoding);
-                    <%- when YARP::ConstantField -%>
-                    argv[<%= index %>] = rb_id2sym(constants[cast-><%= field.name %> - 1]);
-                    <%- when YARP::OptionalConstantField -%>
-                    argv[<%= index %>] = cast-><%= field.name %> == 0 ? Qnil : rb_id2sym(constants[cast-><%= field.name %> - 1]);
-                    <%- when YARP::ConstantListField -%>
-                    argv[<%= index %>] = rb_ary_new_capa(cast-><%= field.name %>.size);
-                    for (size_t index = 0; index < cast-><%= field.name %>.size; index++) {
-                        rb_ary_push(argv[<%= index %>], rb_id2sym(constants[cast-><%= field.name %>.ids[index] - 1]));
-                    }
-                    <%- when YARP::LocationField -%>
-                    argv[<%= index %>] = yp_location_new(parser, cast-><%= field.name %>.start, cast-><%= field.name %>.end, source);
-                    <%- when YARP::OptionalLocationField -%>
-                    argv[<%= index %>] = cast-><%= field.name %>.start == NULL ? Qnil : yp_location_new(parser, cast-><%= field.name %>.start, cast-><%= field.name %>.end, source);
-                    <%- when YARP::UInt32Field -%>
-                    argv[<%= index %>] = ULONG2NUM(cast-><%= field.name %>);
-                    <%- when YARP::FlagsField -%>
-                    argv[<%= index %>] = ULONG2NUM(node->flags >> <%= YARP::COMMON_FLAGS %>);
-                    <%- else -%>
-                    <%- raise -%>
-                    <%- end -%>
-                    <%- end -%>
-
-                    // location
-                    argv[<%= node.fields.length %>] = yp_location_new(parser, node->location.start, node->location.end, source);
-
-                    rb_ary_push(value_stack, rb_class_new_instance(<%= node.fields.length + 1 %>, argv, rb_cYARP<%= node.name %>));
-                    break;
-                }
-                <%- end -%>
-                default:
-                    rb_raise(rb_eRuntimeError, "unknown node type: %d", YP_NODE_TYPE(node));
-            }
-        }
-    }
-
-    VALUE result = rb_ary_pop(value_stack);
-    free(constants);
-    return result;
-}
-
-void
-Init_yarp_api_node(void) {
-    <%- nodes.each do |node| -%>
-    rb_cYARP<%= node.name %> = rb_define_class_under(rb_cYARP, "<%= node.name %>", rb_cYARPNode);
-    <%- end -%>
-}
diff --git a/yarp/templates/include/yarp/ast.h.erb b/yarp/templates/include/yarp/ast.h.erb
deleted file mode 100644
index 09841408eb5c33..00000000000000
--- a/yarp/templates/include/yarp/ast.h.erb
+++ /dev/null
@@ -1,119 +0,0 @@
-#ifndef YARP_AST_H
-#define YARP_AST_H
-
-#include "yarp/defines.h"
-#include "yarp/util/yp_constant_pool.h"
-#include "yarp/util/yp_string.h"
-
-#include <assert.h>
-#include <stddef.h>
-#include <stdint.h>
-
-// This enum represents every type of token in the Ruby source.
-typedef enum yp_token_type {
-<%- tokens.each do |token| -%>
-    <%= token.declaration %>
-<%- end -%>
-    YP_TOKEN_MAXIMUM, // the maximum token value
-} yp_token_type_t;
-
-// This struct represents a token in the Ruby source. We use it to track both
-// type and location information.
-typedef struct {
-    yp_token_type_t type;
-    const uint8_t *start;
-    const uint8_t *end;
-} yp_token_t;
-
-// This represents a range of bytes in the source string to which a node or
-// token corresponds.
-typedef struct {
-    const uint8_t *start;
-    const uint8_t *end;
-} yp_location_t;
-
-struct yp_node;
-
-typedef struct yp_node_list {
-    struct yp_node **nodes;
-    size_t size;
-    size_t capacity;
-} yp_node_list_t;
-
-enum yp_node_type {
-<%- nodes.each_with_index do |node, index| -%>
-    <%= node.type %> = <%= index + 1 %>,
-<%- end -%>
-    YP_SCOPE_NODE
-};
-
-// Deprecated aliases
-#define YP_NODE_SCOPE_NODE YP_SCOPE_NODE
-<%- nodes.each do |node| -%>
-#define <%= node.type.sub(/^YP_/, 'YP_NODE_') %> <%= node.type %>
-<%- end -%>
-
-typedef uint16_t yp_node_type_t;
-typedef uint16_t yp_node_flags_t;
-
-// We store the flags enum in every node in the tree. Some flags are common to
-// all nodes (the ones listed below). Others are specific to certain node types.
-static const yp_node_flags_t YP_NODE_FLAG_NEWLINE = 0x1;
-
-// For easy access, we define some macros to check node type
-#define YP_NODE_TYPE(node) ((enum yp_node_type)node->type)
-#define YP_NODE_TYPE_P(node, type) (YP_NODE_TYPE(node) == (type))
-
-// This is the overall tagged union representing a node in the syntax tree.
-typedef struct yp_node {
-    // This represents the type of the node. It somewhat maps to the nodes that
-    // existed in the original grammar and ripper, but it's not a 1:1 mapping.
-    yp_node_type_t type;
-
-    // This represents any flags on the node
-    yp_node_flags_t flags;
-
-    // This is the location of the node in the source. It's a range of bytes
-    // containing a start and an end.
-    yp_location_t location;
-} yp_node_t;
-<%- nodes.each do |node| -%>
-
-// <%= node.name %>
-//
-// Type: <%= node.type %>
-<%- if (node_flags = node.fields.find { |field| field.is_a? YARP::FlagsField }) -%>
-// Flags:
-<%- found = flags.find { |flag| flag.name == node_flags.kind }.tap { |found| raise "Expected to find #{field.kind}" unless found } -%>
-<%- found.values.each do |value| -%>
-//    YP_<%= found.human.upcase %>_<%= value.name %>
-<%- end -%>
-<%- end -%>
-typedef struct yp_<%= node.human %> {
-    yp_node_t base;
-<%- node.fields.grep_v(YARP::FlagsField).each do |field| -%>
-    <%= case field
-    when YARP::NodeField, YARP::OptionalNodeField then "struct #{field.c_type} *#{field.name}"
-    when YARP::NodeListField then "struct yp_node_list #{field.name}"
-    when YARP::ConstantField, YARP::OptionalConstantField then "yp_constant_id_t #{field.name}"
-    when YARP::ConstantListField then "yp_constant_id_list_t #{field.name}"
-    when YARP::StringField then "yp_string_t #{field.name}"
-    when YARP::LocationField, YARP::OptionalLocationField then "yp_location_t #{field.name}"
-    when YARP::UInt32Field then "uint32_t #{field.name}"
-    else raise field.class.name
-    end
-    %>;
-<%- end -%>
-} yp_<%= node.human %>_t;
-<%- end -%>
-<%- flags.each do |flag| -%>
-
-// <%= flag.name %>
-typedef enum {
-    <%- flag.values.each.with_index(YARP::COMMON_FLAGS) do |value, index| -%>
-    YP_<%= flag.human.upcase %>_<%= value.name %> = 1 << <%= index %>,
-    <%- end -%>
-} yp_<%= flag.human %>_t;
-<%- end -%>
-
-#endif // YARP_AST_H
diff --git a/yarp/templates/lib/yarp/mutation_visitor.rb.erb b/yarp/templates/lib/yarp/mutation_visitor.rb.erb
deleted file mode 100644
index 3bb2dfb4b27616..00000000000000
--- a/yarp/templates/lib/yarp/mutation_visitor.rb.erb
+++ /dev/null
@@ -1,19 +0,0 @@
-module YARP
-  # This visitor walks through the tree and copies each node as it is being
-  # visited. This is useful for consumers that want to mutate the tree, as you
-  # can change subtrees in place without effecting the rest of the tree.
-  class MutationVisitor < BasicVisitor
-    <%- nodes.each_with_index do |node, index| -%>
-<%= "\n" if index != 0 -%>
-    # Copy a <%= node.name %> node
-    def visit_<%= node.human %>(node)
-      <%- fields = node.fields.select { |field| [YARP::NodeField, YARP::OptionalNodeField, YARP::NodeListField].include?(field.class) } -%>
-      <%- if fields.any? -%>
-      node.copy(<%= fields.map { |field| "#{field.name}: #{field.is_a?(YARP::NodeListField) ? "visit_all" : "visit"}(node.#{field.name})" }.join(", ") %>)
-      <%- else -%>
-      node.copy
-      <%- end -%>
-    end
-    <%- end -%>
-  end
-end
diff --git a/yarp/templates/lib/yarp/node.rb.erb b/yarp/templates/lib/yarp/node.rb.erb
deleted file mode 100644
index 0d404063601d0f..00000000000000
--- a/yarp/templates/lib/yarp/node.rb.erb
+++ /dev/null
@@ -1,164 +0,0 @@
-module YARP
-  <%- nodes.each do |node| -%>
-  <%= "#{node.comment.split("\n").map { |line| line.empty? ? "#" : "# #{line}" }.join("\n  ")}\n  " if node.comment %>class <%= node.name -%> < Node
-    <%- node.fields.each do |field| -%>
-    # attr_reader <%= field.name %>: <%= field.rbs_class %>
-    attr_reader :<%= field.name %>
-
-    <%- end -%>
-    # def initialize: (<%= (node.fields.map { |field| "#{field.name}: #{field.rbs_class}" } + ["location: Location"]).join(", ") %>) -> void
-    def initialize(<%= (node.fields.map(&:name) + ["location"]).join(", ") %>)
-      <%- node.fields.each do |field| -%>
-      @<%= field.name %> = <%= field.name %>
-      <%- end -%>
-      @location = location
-    end
-
-    # def accept: (visitor: Visitor) -> void
-    def accept(visitor)
-      visitor.visit_<%= node.human %>(self)
-    end
-    <%- if node.newline == false -%>
-
-    def set_newline_flag(newline_marked)
-      # Never mark <%= node.name %> with a newline flag, mark children instead
-    end
-    <%- elsif node.newline.is_a?(String) -%>
-
-    def set_newline_flag(newline_marked)
-      <%- field = node.fields.find { |f| f.name == node.newline } or raise node.newline -%>
-      <%- case field -%>
-      <%- when YARP::NodeField, YARP::OptionalNodeField -%>
-      <%= field.name %>.set_newline_flag(newline_marked)
-      <%- when YARP::NodeListField -%>
-      first = <%= field.name %>.first
-      first.set_newline_flag(newline_marked) if first
-      <%- else raise field.class.name -%>
-      <%- end -%>
-    end
-    <%- end -%>
-
-    # def child_nodes: () -> Array[nil | Node]
-    def child_nodes
-      [<%= node.fields.map { |field|
-        case field
-        when YARP::NodeField, YARP::OptionalNodeField then field.name
-        when YARP::NodeListField then "*#{field.name}"
-        end
-      }.compact.join(", ") %>]
-    end
-
-    # def copy: (**params) -> <%= node.name %>
-    def copy(**params)
-      <%= node.name %>.new(
-        <%- (node.fields.map(&:name) + ["location"]).map do |name| -%>
-        params.fetch(:<%= name %>) { <%= name %> },
-        <%- end -%>
-      )
-    end
-
-    # def deconstruct: () -> Array[nil | Node]
-    alias deconstruct child_nodes
-
-    # def deconstruct_keys: (keys: Array[Symbol]) -> Hash[Symbol, nil | Node | Array[Node] | String | Token | Array[Token] | Location]
-    def deconstruct_keys(keys)
-      { <%= (node.fields.map { |field| "#{field.name}: #{field.name}" } + ["location: location"]).join(", ") %> }
-    end
-    <%- node.fields.each do |field| -%>
-    <%- case field -%>
-    <%- when YARP::LocationField -%>
-    <%- raise unless field.name.end_with?("_loc") -%>
-    <%- next if node.fields.any? { |other| other.name == field.name.delete_suffix("_loc") } -%>
-
-    # def <%= field.name.delete_suffix("_loc") %>: () -> String
-    def <%= field.name.delete_suffix("_loc") %>
-      <%= field.name %>.slice
-    end
-    <%- when YARP::OptionalLocationField -%>
-    <%- raise unless field.name.end_with?("_loc") -%>
-    <%- next if node.fields.any? { |other| other.name == field.name.delete_suffix("_loc") } -%>
-
-    # def <%= field.name.delete_suffix("_loc") %>: () -> String?
-    def <%= field.name.delete_suffix("_loc") %>
-      <%= field.name %>&.slice
-    end
-    <%- when YARP::FlagsField -%>
-    <%- flags.find { |flag| flag.name == field.kind }.tap { |flag| raise "Expected to find #{field.kind}" unless flag }.values.each do |value| -%>
-
-    # def <%= value.name.downcase %>?: () -> bool
-    def <%= value.name.downcase %>?
-      <%= field.name %>.anybits?(<%= field.kind %>::<%= value.name %>)
-    end
-    <%- end -%>
-    <%- end -%>
-    <%- end -%>
-
-    def inspect(inspector = NodeInspector.new)
-      inspector << inspector.header(self)
-      <%- node.fields.each_with_index do |field, index| -%>
-      <%- pointer, preadd = index == node.fields.length - 1 ? ["└── ", "    "] : ["├── ", "│   "] -%>
-      <%- case field -%>
-      <%- when YARP::NodeListField -%>
-      inspector << "<%= pointer %><%= field.name %>: #{inspector.list("#{inspector.prefix}<%= preadd %>", <%= field.name %>)}"
-      <%- when YARP::ConstantListField -%>
-      inspector << "<%= pointer %><%= field.name %>: #{<%= field.name %>.inspect}\n"
-      <%- when YARP::NodeField -%>
-      inspector << "<%= pointer %><%= field.name %>:\n"
-      inspector << inspector.child_node(<%= field.name %>, "<%= preadd %>")
-      <%- when YARP::OptionalNodeField -%>
-      if (<%= field.name %> = self.<%= field.name %>).nil?
-        inspector << "<%= pointer %><%= field.name %>: ∅\n"
-      else
-        inspector << "<%= pointer %><%= field.name %>:\n"
-        inspector << <%= field.name %>.inspect(inspector.child_inspector("<%= preadd %>")).delete_prefix(inspector.prefix)
-      end
-      <%- when YARP::ConstantField, YARP::OptionalConstantField, YARP::StringField, YARP::UInt32Field -%>
-      inspector << "<%= pointer %><%= field.name %>: #{<%= field.name %>.inspect}\n"
-      <%- when YARP::FlagsField -%>
-      <%- flag = flags.find { |flag| flag.name == field.kind }.tap { |flag| raise unless flag } -%>
-      inspector << "<%= pointer %><%= field.name %>: #{[<%= flag.values.map { |value| "(\"#{value.name.downcase}\" if #{value.name.downcase}?)" }.join(", ") %>].compact.join(", ")}\n"
-      <%- when YARP::LocationField, YARP::OptionalLocationField -%>
-      inspector << "<%= pointer %><%= field.name %>: #{inspector.location(<%= field.name %>)}\n"
-      <%- else -%>
-      <%- raise -%>
-      <%- end -%>
-      <%- end -%>
-      inspector.to_str
-    end
-  end
-
-  <%- end -%>
-  <%- flags.each do |flag| -%>
-  module <%= flag.name %>
-    <%- flag.values.each_with_index do |value, index| -%>
-    # <%= value.comment %>
-    <%= value.name %> = 1 << <%= index %>
-<%= "\n" if value != flag.values.last -%>
-    <%- end -%>
-  end
-
-  <%- end -%>
-  class Visitor < BasicVisitor
-    <%- nodes.each do |node| -%>
-    # Visit a <%= node.name %> node
-    alias visit_<%= node.human %> visit_child_nodes
-<%= "\n" if node != nodes.last -%>
-    <%- end -%>
-  end
-
-  module DSL
-    private
-
-    # Create a new Location object
-    def Location(source = nil, start_offset = 0, length = 0)
-      Location.new(source, start_offset, length)
-    end
-    <%- nodes.each do |node| -%>
-
-    # Create a new <%= node.name %> node
-    def <%= node.name %>(<%= (node.fields.map(&:name) + ["location = Location()"]).join(", ") %>)
-      <%= node.name %>.new(<%= (node.fields.map(&:name) + ["location"]).join(", ") %>)
-    end
-    <%- end -%>
-  end
-end
diff --git a/yarp/templates/lib/yarp/serialize.rb.erb b/yarp/templates/lib/yarp/serialize.rb.erb
deleted file mode 100644
index c8d7f422cdb5ba..00000000000000
--- a/yarp/templates/lib/yarp/serialize.rb.erb
+++ /dev/null
@@ -1,223 +0,0 @@
-require "stringio"
-
-# Polyfill for String#unpack1 with the offset parameter.
-if String.instance_method(:unpack1).parameters.none? { |_, name| name == :offset }
-  String.prepend(
-    Module.new {
-      def unpack1(format, offset: 0)
-        offset == 0 ? super(format) : self[offset..].unpack1(format)
-      end
-    }
-  )
-end
-
-module YARP
-  module Serialize
-    MAJOR_VERSION = 0
-    MINOR_VERSION = 10
-    PATCH_VERSION = 0
-
-    def self.load(input, serialized)
-      input = input.dup
-      source = Source.new(input)
-      loader = Loader.new(source, serialized)
-      result = loader.load_result
-
-      input.force_encoding(loader.encoding)
-      result
-    end
-
-    def self.load_tokens(source, serialized)
-      Loader.new(source, serialized).load_tokens_result
-    end
-
-    class Loader
-      attr_reader :encoding, :input, :serialized, :io
-      attr_reader :constant_pool_offset, :constant_pool, :source
-
-      def initialize(source, serialized)
-        @encoding = Encoding::UTF_8
-
-        @input = source.source.dup
-        @serialized = serialized
-        @io = StringIO.new(serialized)
-        @io.set_encoding(Encoding::BINARY)
-
-        @constant_pool_offset = nil
-        @constant_pool = nil
-
-        @source = source
-      end
-
-      def load_encoding
-        Encoding.find(io.read(load_varint))
-      end
-
-      def load_metadata
-        comments = load_varint.times.map { Comment.new(Comment::TYPES.fetch(load_varint), load_location) }
-        errors = load_varint.times.map { ParseError.new(load_embedded_string, load_location) }
-        warnings = load_varint.times.map { ParseWarning.new(load_embedded_string, load_location) }
-        [comments, errors, warnings]
-      end
-
-      def load_tokens
-        tokens = []
-        while type = TOKEN_TYPES.fetch(load_varint)
-          start = load_varint
-          length = load_varint
-          lex_state = load_varint
-          location = Location.new(@source, start, length)
-          tokens << [YARP::Token.new(type, location.slice, location), lex_state]
-        end
-
-        tokens
-      end
-
-      def load_tokens_result
-        tokens = load_tokens
-        encoding = load_encoding
-        comments, errors, warnings = load_metadata
-
-        if encoding != @encoding
-          tokens.each { |token,| token.value.force_encoding(encoding) }
-        end
-
-        raise "Expected to consume all bytes while deserializing" unless @io.eof?
-        YARP::ParseResult.new(tokens, comments, errors, warnings, @source)
-      end
-
-      def load_nodes
-        raise "Invalid serialization" if io.read(4) != "YARP"
-        raise "Invalid serialization" if io.read(3).unpack("C3") != [MAJOR_VERSION, MINOR_VERSION, PATCH_VERSION]
-
-        @encoding = load_encoding
-        @input = input.force_encoding(@encoding).freeze
-
-        comments, errors, warnings = load_metadata
-
-        @constant_pool_offset = io.read(4).unpack1("L")
-        @constant_pool = Array.new(load_varint, nil)
-
-        [load_node, comments, errors, warnings]
-      end
-
-      def load_result
-        node, comments, errors, warnings = load_nodes
-        YARP::ParseResult.new(node, comments, errors, warnings, @source)
-      end
-
-      private
-
-      # variable-length integer using https://en.wikipedia.org/wiki/LEB128
-      # This is also what protobuf uses: https://protobuf.dev/programming-guides/encoding/#varints
-      def load_varint
-        n = io.getbyte
-        if n < 128
-          n
-        else
-          n -= 128
-          shift = 0
-          while (b = io.getbyte) >= 128
-            n += (b - 128) << (shift += 7)
-          end
-          n + (b << (shift + 7))
-        end
-      end
-
-      def load_serialized_length
-        io.read(4).unpack1("L")
-      end
-
-      def load_optional_node
-        if io.getbyte != 0
-          io.pos -= 1
-          load_node
-        end
-      end
-
-      def load_embedded_string
-        io.read(load_varint).force_encoding(encoding)
-      end
-
-      def load_string
-        case io.getbyte
-        when 1
-          input.byteslice(load_varint, load_varint).force_encoding(encoding)
-        when 2
-          load_embedded_string
-        else
-          raise
-        end
-      end
-
-      def load_location
-        Location.new(source, load_varint, load_varint)
-      end
-
-      def load_optional_location
-        load_location if io.getbyte != 0
-      end
-
-      def load_constant(index)
-        constant = constant_pool[index]
-
-        unless constant
-          offset = constant_pool_offset + index * 8
-
-          start = serialized.unpack1("L", offset: offset)
-          length = serialized.unpack1("L", offset: offset + 4)
-
-          constant = input.byteslice(start, length).to_sym
-          constant_pool[index] = constant
-        end
-
-        constant
-      end
-
-      def load_required_constant
-        load_constant(load_varint - 1)
-      end
-
-      def load_optional_constant
-        index = load_varint
-        load_constant(index - 1) if index != 0
-      end
-
-      def load_node
-        type = io.getbyte
-        location = load_location
-
-        case type
-        <%- nodes.each_with_index do |node, index| -%>
-        when <%= index + 1 %> then
-          <%- if node.needs_serialized_length? -%>
-          load_serialized_length
-          <%- end -%>
-          <%= node.name %>.new(<%= (node.fields.map { |field|
-            case field
-            when YARP::NodeField then "load_node"
-            when YARP::OptionalNodeField then "load_optional_node"
-            when YARP::StringField then "load_string"
-            when YARP::NodeListField then "Array.new(load_varint) { load_node }"
-            when YARP::ConstantField then "load_required_constant"
-            when YARP::OptionalConstantField then "load_optional_constant"
-            when YARP::ConstantListField then "Array.new(load_varint) { load_required_constant }"
-            when YARP::LocationField then "load_location"
-            when YARP::OptionalLocationField then "load_optional_location"
-            when YARP::UInt32Field, YARP::FlagsField then "load_varint"
-            else raise
-            end
-          } + ["location"]).join(", ") -%>)
-          <%- end -%>
-        end
-      end
-    end
-
-    TOKEN_TYPES = [
-      nil,
-      <%- tokens.each do |token| -%>
-      <%= token.name.to_sym.inspect %>,
-      <%- end -%>
-    ]
-  end
-end
diff --git a/yarp/templates/src/node.c.erb b/yarp/templates/src/node.c.erb
deleted file mode 100644
index 9f231239142dcf..00000000000000
--- a/yarp/templates/src/node.c.erb
+++ /dev/null
@@ -1,149 +0,0 @@
-#line <%= __LINE__ + 1 %> "<%= File.basename(__FILE__) %>"
-#include "yarp/node.h"
-
-// Clear the node but preserves the location.
-void yp_node_clear(yp_node_t *node) {
-    yp_location_t location = node->location;
-    memset(node, 0, sizeof(yp_node_t));
-    node->location = location;
-}
-
-static void
-yp_node_memsize_node(yp_node_t *node, yp_memsize_t *memsize);
-
-// Calculate the size of the node list in bytes.
-static size_t
-yp_node_list_memsize(yp_node_list_t *node_list, yp_memsize_t *memsize) {
-    size_t size = sizeof(yp_node_list_t) + (node_list->capacity * sizeof(yp_node_t *));
-    for (size_t index = 0; index < node_list->size; index++) {
-        yp_node_memsize_node(node_list->nodes[index], memsize);
-    }
-    return size;
-}
-
-// Append a new node onto the end of the node list.
-void
-yp_node_list_append(yp_node_list_t *list, yp_node_t *node) {
-    if (list->size == list->capacity) {
-        list->capacity = list->capacity == 0 ? 4 : list->capacity * 2;
-        list->nodes = (yp_node_t **) realloc(list->nodes, sizeof(yp_node_t *) * list->capacity);
-    }
-    list->nodes[list->size++] = node;
-}
-
-YP_EXPORTED_FUNCTION void
-yp_node_destroy(yp_parser_t *parser, yp_node_t *node);
-
-// Deallocate the inner memory of a list of nodes. The parser argument is not
-// used, but is here for the future possibility of pre-allocating memory pools.
-static void
-yp_node_list_free(yp_parser_t *parser, yp_node_list_t *list) {
-    if (list->capacity > 0) {
-        for (size_t index = 0; index < list->size; index++) {
-            yp_node_destroy(parser, list->nodes[index]);
-        }
-        free(list->nodes);
-    }
-}
-
-// Deallocate the space for a yp_node_t. Similarly to yp_node_alloc, we're not
-// using the parser argument, but it's there to allow for the future possibility
-// of pre-allocating larger memory pools.
-YP_EXPORTED_FUNCTION void
-yp_node_destroy(yp_parser_t *parser, yp_node_t *node) {
-    switch (YP_NODE_TYPE(node)) {
-        <%- nodes.each do |node| -%>
-#line <%= __LINE__ + 1 %> "<%= File.basename(__FILE__) %>"
-        case <%= node.type %>: {
-            <%- if node.fields.any? { |field| ![YARP::LocationField, YARP::OptionalLocationField, YARP::UInt32Field, YARP::FlagsField, YARP::ConstantField, YARP::OptionalConstantField].include?(field.class) } -%>
-            yp_<%= node.human %>_t *cast = (yp_<%= node.human %>_t *) node;
-            <%- end -%>
-            <%- node.fields.each do |field| -%>
-            <%- case field -%>
-            <%- when YARP::LocationField, YARP::OptionalLocationField, YARP::UInt32Field, YARP::FlagsField, YARP::ConstantField, YARP::OptionalConstantField -%>
-            <%- when YARP::NodeField -%>
-            yp_node_destroy(parser, (yp_node_t *)cast-><%= field.name %>);
-            <%- when YARP::OptionalNodeField -%>
-            if (cast-><%= field.name %> != NULL) {
-                yp_node_destroy(parser, (yp_node_t *)cast-><%= field.name %>);
-            }
-            <%- when YARP::StringField -%>
-            yp_string_free(&cast-><%= field.name %>);
-            <%- when YARP::NodeListField -%>
-            yp_node_list_free(parser, &cast-><%= field.name %>);
-            <%- when YARP::ConstantListField -%>
-            yp_constant_id_list_free(&cast-><%= field.name %>);
-            <%- else -%>
-            <%- raise -%>
-            <%- end -%>
-            <%- end -%>
-            break;
-        }
-        <%- end -%>
-#line <%= __LINE__ + 1 %> "<%= File.basename(__FILE__) %>"
-        default:
-            assert(false && "unreachable");
-            break;
-    }
-    free(node);
-}
-
-static void
-yp_node_memsize_node(yp_node_t *node, yp_memsize_t *memsize) {
-    memsize->node_count++;
-
-    switch (YP_NODE_TYPE(node)) {
-        // We do not calculate memsize of a ScopeNode
-        // as it should never be generated
-        case YP_SCOPE_NODE:
-            return;
-        <%- nodes.each do |node| -%>
-#line <%= __LINE__ + 1 %> "<%= File.basename(__FILE__) %>"
-        case <%= node.type %>: {
-            yp_<%= node.human %>_t *cast = (yp_<%= node.human %>_t *) node;
-            memsize->memsize += sizeof(*cast);
-            <%- node.fields.each do |field| -%>
-            <%- case field -%>
-            <%- when YARP::ConstantField, YARP::OptionalConstantField, YARP::UInt32Field, YARP::FlagsField, YARP::LocationField, YARP::OptionalLocationField -%>
-            <%- when YARP::NodeField -%>
-            yp_node_memsize_node((yp_node_t *)cast-><%= field.name %>, memsize);
-            <%- when YARP::OptionalNodeField -%>
-            if (cast-><%= field.name %> != NULL) {
-                yp_node_memsize_node((yp_node_t *)cast-><%= field.name %>, memsize);
-            }
-            <%- when YARP::StringField -%>
-            memsize->memsize += yp_string_memsize(&cast-><%= field.name %>);
-            <%- when YARP::NodeListField -%>
-            yp_node_list_memsize(&cast-><%= field.name %>, memsize);
-            <%- when YARP::ConstantListField -%>
-            memsize->memsize += yp_constant_id_list_memsize(&cast-><%= field.name %>);
-            <%- else -%>
-            <%- raise -%>
-            <%- end -%>
-            <%- end -%>
-            break;
-        }
-        <%- end -%>
-#line <%= __LINE__ + 1 %> "<%= File.basename(__FILE__) %>"
-    }
-}
-
-// Calculates the memory footprint of a given node.
-YP_EXPORTED_FUNCTION void
-yp_node_memsize(yp_node_t *node, yp_memsize_t *memsize) {
-    *memsize = (yp_memsize_t) { .memsize = 0, .node_count = 0 };
-    yp_node_memsize_node(node, memsize);
-}
-
-// Returns a string representation of the given node type.
-YP_EXPORTED_FUNCTION const char *
-yp_node_type_to_str(yp_node_type_t node_type)
-{
-    switch (node_type) {
-<%- nodes.each do |node| -%>
-        case <%= node.type %>:
-            return "<%= node.type %>";
-<%- end -%>
-    }
-    return "";
-}
diff --git a/yarp/templates/src/prettyprint.c.erb b/yarp/templates/src/prettyprint.c.erb
deleted file mode 100644
index 796d8ccafb9dd0..00000000000000
--- a/yarp/templates/src/prettyprint.c.erb
+++ /dev/null
@@ -1,111 +0,0 @@
-#include "yarp/defines.h"
-
-#include <stdio.h>
-
-#include "yarp/ast.h"
-#include "yarp/parser.h"
-#include "yarp/util/yp_buffer.h"
-
-static void
-prettyprint_location(yp_buffer_t *buffer, yp_parser_t *parser, yp_location_t *location) {
-    char printed[] = "[0000-0000]";
-    snprintf(printed, sizeof(printed), "[%04ld-%04ld]", (long int)(location->start - parser->start), (long int)(location->end - parser->start));
-    yp_buffer_append_str(buffer, printed, strlen(printed));
-}
-
-static void
-prettyprint_node(yp_buffer_t *buffer, yp_parser_t *parser, yp_node_t *node) {
-    switch (YP_NODE_TYPE(node)) {
-        // We do not need to print a ScopeNode as it's not part
-        // of the AST
-        case YP_SCOPE_NODE:
-            return;
-        <%- nodes.each do |node| -%>
-        case <%= node.type %>: {
-            yp_buffer_append_str(buffer, "<%= node.name %>(", <%= node.name.length + 1 %>);
-            <%- node.fields.each_with_index do |field, index| -%>
-            <%= "yp_buffer_append_str(buffer, \", \", 2);" if index != 0 -%>
-            <%- case field -%>
-            <%- when YARP::NodeField -%>
-            prettyprint_node(buffer, parser, (yp_node_t *)((yp_<%= node.human %>_t *)node)-><%= field.name %>);
-            <%- when YARP::OptionalNodeField -%>
-            if (((yp_<%= node.human %>_t *)node)-><%= field.name %> == NULL) {
-                yp_buffer_append_str(buffer, "nil", 3);
-            } else {
-                prettyprint_node(buffer, parser, (yp_node_t *)((yp_<%= node.human %>_t *)node)-><%= field.name %>);
-            }
-            <%- when YARP::StringField -%>
-            yp_buffer_append_str(buffer, "\"", 1);
-            yp_buffer_append_bytes(buffer, yp_string_source(&((yp_<%= node.human %>_t *)node)-><%= field.name %>), yp_string_length(&((yp_<%= node.human %>_t *)node)-><%= field.name %>));
-            yp_buffer_append_str(buffer, "\"", 1);
-            <%- when YARP::NodeListField -%>
-            yp_buffer_append_str(buffer, "[", 1);
-            for (uint32_t index = 0; index < ((yp_<%= node.human %>_t *)node)-><%= field.name %>.size; index++) {
-                if (index != 0) yp_buffer_append_str(buffer, ", ", 2);
-                prettyprint_node(buffer, parser, (yp_node_t *) ((yp_<%= node.human %>_t *) node)-><%= field.name %>.nodes[index]);
-            }
-            yp_buffer_append_str(buffer, "]", 1);
-            <%- when YARP::ConstantField -%>
-            char <%= field.name %>_buffer[12];
-            snprintf(<%= field.name %>_buffer, sizeof(<%= field.name %>_buffer), "%u", ((yp_<%= node.human %>_t *)node)-><%= field.name %>);
-            yp_buffer_append_str(buffer, <%= field.name %>_buffer, strlen(<%= field.name %>_buffer));
-            <%- when YARP::OptionalConstantField -%>
-            if (((yp_<%= node.human %>_t *)node)-><%= field.name %> == 0) {
-                yp_buffer_append_str(buffer, "nil", 3);
-            } else {
-                char <%= field.name %>_buffer[12];
-                snprintf(<%= field.name %>_buffer, sizeof(<%= field.name %>_buffer), "%u", ((yp_<%= node.human %>_t *)node)-><%= field.name %>);
-                yp_buffer_append_str(buffer, <%= field.name %>_buffer, strlen(<%= field.name %>_buffer));
-            }
-            <%- when YARP::ConstantListField -%>
-            yp_buffer_append_str(buffer, "[", 1);
-            for (uint32_t index = 0; index < ((yp_<%= node.human %>_t *)node)-><%= field.name %>.size; index++) {
-                if (index != 0) yp_buffer_append_str(buffer, ", ", 2);
-                char <%= field.name %>_buffer[12];
-                snprintf(<%= field.name %>_buffer, sizeof(<%= field.name %>_buffer), "%u", ((yp_<%= node.human %>_t *)node)-><%= field.name %>.ids[index]);
-                yp_buffer_append_str(buffer, <%= field.name %>_buffer, strlen(<%= field.name %>_buffer));
-            }
-            yp_buffer_append_str(buffer, "]", 1);
-            <%- when YARP::LocationField -%>
-            prettyprint_location(buffer, parser, &((yp_<%= node.human %>_t *)node)-><%= field.name %>);
-            <%- when YARP::OptionalLocationField -%>
-            if (((yp_<%= node.human %>_t *)node)-><%= field.name %>.start == NULL) {
-                yp_buffer_append_str(buffer, "nil", 3);
-            } else {
-                prettyprint_location(buffer, parser, &((yp_<%= node.human %>_t *)node)-><%= field.name %>);
-            }
-            <%- when YARP::UInt32Field -%>
-            char <%= field.name %>_buffer[12];
-            snprintf(<%= field.name %>_buffer, sizeof(<%= field.name %>_buffer), "+%d", ((yp_<%= node.human %>_t *)node)-><%= field.name %>);
-            yp_buffer_append_str(buffer, <%= field.name %>_buffer, strlen(<%= field.name %>_buffer));
-            <%- when YARP::FlagsField -%>
-            char <%= field.name %>_buffer[12];
-            snprintf(<%= field.name %>_buffer, sizeof(<%= field.name %>_buffer), "+%d", node->flags >> <%= YARP::COMMON_FLAGS %>);
-            yp_buffer_append_str(buffer, <%= field.name %>_buffer, strlen(<%= field.name %>_buffer));
-            <%- else -%>
-            <%- raise -%>
-            <%- end -%>
-            <%- end -%>
-            yp_buffer_append_str(buffer, ")", 1);
-            break;
-        }
-        <%- end -%>
-    }
-}
-
-void
-yp_print_node(yp_parser_t *parser, yp_node_t *node) {
-    yp_buffer_t buffer;
-    if (!yp_buffer_init(&buffer)) return;
-
-    prettyprint_node(&buffer, parser, node);
-    printf("%.*s\n", (int) buffer.length, buffer.value);
-
-    yp_buffer_free(&buffer);
-}
-
-// Pretty-prints the AST represented by the given node to the given buffer.
-YP_EXPORTED_FUNCTION void
-yp_prettyprint(yp_parser_t *parser, yp_node_t *node, yp_buffer_t *buffer) {
-    prettyprint_node(buffer, parser, node);
-}
diff --git a/yarp/templates/src/serialize.c.erb b/yarp/templates/src/serialize.c.erb
deleted file mode 100644
index 8e0b0905dcc5d1..00000000000000
--- a/yarp/templates/src/serialize.c.erb
+++ /dev/null
@@ -1,276 +0,0 @@
-#include "yarp.h"
-
-#include <stdio.h>
-
-static inline uint32_t
-yp_ptrdifft_to_u32(ptrdiff_t value) {
-    assert(value >= 0 && ((unsigned long) value) < UINT32_MAX);
-    return (uint32_t) value;
-}
-
-static inline uint32_t
-yp_sizet_to_u32(size_t value) {
-    assert(value < UINT32_MAX);
-    return (uint32_t) value;
-}
-
-static void
-yp_serialize_location(yp_parser_t *parser, yp_location_t *location, yp_buffer_t *buffer) {
-    assert(location->start);
-    assert(location->end);
-    assert(location->start <= location->end);
-
-    yp_buffer_append_u32(buffer, yp_ptrdifft_to_u32(location->start - parser->start));
-    yp_buffer_append_u32(buffer, yp_ptrdifft_to_u32(location->end - location->start));
-}
-
-static void
-yp_serialize_string(yp_parser_t *parser, yp_string_t *string, yp_buffer_t *buffer) {
-    switch (string->type) {
-        case YP_STRING_SHARED: {
-            yp_buffer_append_u8(buffer, 1);
-            yp_buffer_append_u32(buffer, yp_ptrdifft_to_u32(yp_string_source(string) - parser->start));
-            yp_buffer_append_u32(buffer, yp_sizet_to_u32(yp_string_length(string)));
-            break;
-        }
-        case YP_STRING_OWNED:
-        case YP_STRING_CONSTANT: {
-            uint32_t length = yp_sizet_to_u32(yp_string_length(string));
-            yp_buffer_append_u8(buffer, 2);
-            yp_buffer_append_u32(buffer, length);
-            yp_buffer_append_bytes(buffer, yp_string_source(string), length);
-            break;
-        }
-        case YP_STRING_MAPPED:
-            assert(false && "Cannot serialize mapped strings.");
-            break;
-    }
-}
-
-void
-yp_serialize_node(yp_parser_t *parser, yp_node_t *node, yp_buffer_t *buffer) {
-    yp_buffer_append_u8(buffer, (uint8_t) YP_NODE_TYPE(node));
-
-    size_t offset = buffer->length;
-
-    yp_serialize_location(parser, &node->location, buffer);
-
-    switch (YP_NODE_TYPE(node)) {
-        // We do not need to serialize a ScopeNode ever as
-        // it is not part of the AST
-        case YP_SCOPE_NODE:
-            return;
-        <%- nodes.each do |node| -%>
-        case <%= node.type %>: {
-            <%- if node.needs_serialized_length? -%>
-            // serialize length
-            // encoding of location u32s make us need to save this offset.
-            size_t length_offset = buffer->length;
-            yp_buffer_append_str(buffer, "\0\0\0\0", 4); /* consume 4 bytes, updated below */
-            <%- end -%>
-            <%- node.fields.each do |field| -%>
-            <%- case field -%>
-            <%- when YARP::NodeField -%>
-            yp_serialize_node(parser, (yp_node_t *)((yp_<%= node.human %>_t *)node)-><%= field.name %>, buffer);
-            <%- when YARP::OptionalNodeField -%>
-            if (((yp_<%= node.human %>_t *)node)-><%= field.name %> == NULL) {
-                yp_buffer_append_u8(buffer, 0);
-            } else {
-                yp_serialize_node(parser, (yp_node_t *)((yp_<%= node.human %>_t *)node)-><%= field.name %>, buffer);
-            }
-            <%- when YARP::StringField -%>
-            yp_serialize_string(parser, &((yp_<%= node.human %>_t *)node)-><%= field.name %>, buffer);
-            <%- when YARP::NodeListField -%>
-            uint32_t <%= field.name %>_size = yp_sizet_to_u32(((yp_<%= node.human %>_t *)node)-><%= field.name %>.size);
-            yp_buffer_append_u32(buffer, <%= field.name %>_size);
-            for (uint32_t index = 0; index < <%= field.name %>_size; index++) {
-                yp_serialize_node(parser, (yp_node_t *) ((yp_<%= node.human %>_t *)node)-><%= field.name %>.nodes[index], buffer);
-            }
-            <%- when YARP::ConstantField, YARP::OptionalConstantField -%>
-            yp_buffer_append_u32(buffer, yp_sizet_to_u32(((yp_<%= node.human %>_t *)node)-><%= field.name %>));
-            <%- when YARP::ConstantListField -%>
-            uint32_t <%= field.name %>_size = yp_sizet_to_u32(((yp_<%= node.human %>_t *)node)-><%= field.name %>.size);
-            yp_buffer_append_u32(buffer, <%= field.name %>_size);
-            for (uint32_t index = 0; index < <%= field.name %>_size; index++) {
-                yp_buffer_append_u32(buffer, yp_sizet_to_u32(((yp_<%= node.human %>_t *)node)-><%= field.name %>.ids[index]));
-            }
-            <%- when YARP::LocationField -%>
-            yp_serialize_location(parser, &((yp_<%= node.human %>_t *)node)-><%= field.name %>, buffer);
-            <%- when YARP::OptionalLocationField -%>
-            if (((yp_<%= node.human %>_t *)node)-><%= field.name %>.start == NULL) {
-                yp_buffer_append_u8(buffer, 0);
-            } else {
-                yp_buffer_append_u8(buffer, 1);
-                yp_serialize_location(parser, &((yp_<%= node.human %>_t *)node)-><%= field.name %>, buffer);
-            }
-            <%- when YARP::UInt32Field -%>
-            yp_buffer_append_u32(buffer, ((yp_<%= node.human %>_t *)node)-><%= field.name %>);
-            <%- when YARP::FlagsField -%>
-            yp_buffer_append_u32(buffer, node->flags >> <%= YARP::COMMON_FLAGS %>);
-            <%- else -%>
-            <%- raise -%>
-            <%- end -%>
-            <%- end -%>
-            <%- if node.needs_serialized_length? -%>
-            // serialize length
-            uint32_t length = yp_sizet_to_u32(buffer->length - offset - sizeof(uint32_t));
-            memcpy(buffer->value + length_offset, &length, sizeof(uint32_t));
-            <%- end -%>
-            break;
-        }
-        <%- end -%>
-    }
-}
-
-static void
-yp_serialize_comment(yp_parser_t *parser, yp_comment_t *comment, yp_buffer_t *buffer) {
-    // serialize type
-    yp_buffer_append_u8(buffer, (uint8_t) comment->type);
-
-    // serialize location
-    yp_buffer_append_u32(buffer, yp_ptrdifft_to_u32(comment->start - parser->start));
-    yp_buffer_append_u32(buffer, yp_ptrdifft_to_u32(comment->end - comment->start));
-}
-
-static void
-yp_serialize_comment_list(yp_parser_t *parser, yp_list_t *list, yp_buffer_t *buffer) {
-    yp_buffer_append_u32(buffer, yp_sizet_to_u32(yp_list_size(list)));
-
-    yp_comment_t *comment;
-    for (comment = (yp_comment_t *) list->head; comment != NULL; comment = (yp_comment_t *) comment->node.next) {
-        yp_serialize_comment(parser, comment, buffer);
-    }
-}
-
-static void
-yp_serialize_diagnostic(yp_parser_t *parser, yp_diagnostic_t *diagnostic, yp_buffer_t *buffer) {
-    // serialize message
-    size_t message_length = strlen(diagnostic->message);
-    yp_buffer_append_u32(buffer, yp_sizet_to_u32(message_length));
-    yp_buffer_append_str(buffer, diagnostic->message, message_length);
-
-    // serialize location
-    yp_buffer_append_u32(buffer, yp_ptrdifft_to_u32(diagnostic->start - parser->start));
-    yp_buffer_append_u32(buffer, yp_ptrdifft_to_u32(diagnostic->end - diagnostic->start));
-}
-
-static void
-yp_serialize_diagnostic_list(yp_parser_t *parser, yp_list_t *list, yp_buffer_t *buffer) {
-    yp_buffer_append_u32(buffer, yp_sizet_to_u32(yp_list_size(list)));
-
-    yp_diagnostic_t *diagnostic;
-    for (diagnostic = (yp_diagnostic_t *) list->head; diagnostic != NULL; diagnostic = (yp_diagnostic_t *) diagnostic->node.next) {
-        yp_serialize_diagnostic(parser, diagnostic, buffer);
-    }
-}
-
-static void
-yp_serialize_encoding(yp_encoding_t *encoding, yp_buffer_t *buffer) {
-    size_t encoding_length = strlen(encoding->name);
-    yp_buffer_append_u32(buffer, yp_sizet_to_u32(encoding_length));
-    yp_buffer_append_str(buffer, encoding->name, encoding_length);
-}
-
-#line <%= __LINE__ + 1 %> "<%= File.basename(__FILE__) %>"
-void
-yp_serialize_content(yp_parser_t *parser, yp_node_t *node, yp_buffer_t *buffer) {
-    yp_serialize_encoding(&parser->encoding, buffer);
-    yp_serialize_comment_list(parser, &parser->comment_list, buffer);
-    yp_serialize_diagnostic_list(parser, &parser->error_list, buffer);
-    yp_serialize_diagnostic_list(parser, &parser->warning_list, buffer);
-
-    // Here we're going to leave space for the offset of the constant pool in
-    // the buffer.
-    size_t offset = buffer->length;
-    yp_buffer_append_zeroes(buffer, 4);
-
-    // Next, encode the length of the constant pool.
-    yp_buffer_append_u32(buffer, yp_sizet_to_u32(parser->constant_pool.size));
-
-    // Now we're going to serialize the content of the node.
-    yp_serialize_node(parser, node, buffer);
-
-    // Now we're going to serialize the offset of the constant pool back where
-    // we left space for it.
-    uint32_t length = yp_sizet_to_u32(buffer->length);
-    memcpy(buffer->value + offset, &length, sizeof(uint32_t));
-
-    // Now we're going to serialize the constant pool.
-    offset = buffer->length;
-    yp_buffer_append_zeroes(buffer, parser->constant_pool.size * 8);
-
-    yp_constant_t *constant;
-    for (size_t index = 0; index < parser->constant_pool.capacity; index++) {
-        constant = &parser->constant_pool.constants[index];
-
-        // If we find a constant at this index, serialize it at the correct
-        // index in the buffer.
-        if (constant->id != 0) {
-            size_t buffer_offset = offset + ((constant->id - 1) * 8);
-
-            uint32_t source_offset = yp_ptrdifft_to_u32(constant->start - parser->start);
-            uint32_t constant_length = yp_sizet_to_u32(constant->length);
-
-            memcpy(buffer->value + buffer_offset, &source_offset, 4);
-            memcpy(buffer->value + buffer_offset + 4, &constant_length, 4);
-        }
-    }
-}
-
-static void
-serialize_token(void *data, yp_parser_t *parser, yp_token_t *token) {
-    yp_buffer_t *buffer = (yp_buffer_t *) data;
-
-    yp_buffer_append_u32(buffer, token->type);
-    yp_buffer_append_u32(buffer, yp_ptrdifft_to_u32(token->start - parser->start));
-    yp_buffer_append_u32(buffer, yp_ptrdifft_to_u32(token->end - token->start));
-    yp_buffer_append_u32(buffer, parser->lex_state);
-}
-
-YP_EXPORTED_FUNCTION void
-yp_lex_serialize(const uint8_t *source, size_t size, const char *filepath, yp_buffer_t *buffer) {
-    yp_parser_t parser;
-    yp_parser_init(&parser, source, size, filepath);
-
-    yp_lex_callback_t lex_callback = (yp_lex_callback_t) {
-        .data = (void *) buffer,
-        .callback = serialize_token,
-    };
-
-    parser.lex_callback = &lex_callback;
-    yp_node_t *node = yp_parse(&parser);
-
-    // Append 0 to mark end of tokens
-    yp_buffer_append_u8(buffer, 0);
-
-    yp_serialize_encoding(&parser.encoding, buffer);
-    yp_serialize_comment_list(&parser, &parser.comment_list, buffer);
-    yp_serialize_diagnostic_list(&parser, &parser.error_list, buffer);
-    yp_serialize_diagnostic_list(&parser, &parser.warning_list, buffer);
-
-    yp_node_destroy(&parser, node);
-    yp_parser_free(&parser);
-}
-
-// Parse and serialize both the AST and the tokens represented by the given
-// source to the given buffer.
-YP_EXPORTED_FUNCTION void
-yp_parse_lex_serialize(const uint8_t *source, size_t size, yp_buffer_t *buffer, const char *metadata) {
-    yp_parser_t parser;
-    yp_parser_init(&parser, source, size, NULL);
-    if (metadata) yp_parser_metadata(&parser, metadata);
-
-    yp_lex_callback_t lex_callback = (yp_lex_callback_t) {
-        .data = (void *) buffer,
-        .callback = serialize_token,
-    };
-
-    parser.lex_callback = &lex_callback;
-    yp_node_t *node = yp_parse(&parser);
-
-    yp_buffer_append_u8(buffer, 0);
-    yp_serialize(&parser, node, buffer);
-
-    yp_node_destroy(&parser, node);
-    yp_parser_free(&parser);
-}
diff --git a/yarp/templates/src/token_type.c.erb b/yarp/templates/src/token_type.c.erb
deleted file mode 100644
index d861352eec9a9c..00000000000000
--- a/yarp/templates/src/token_type.c.erb
+++ /dev/null
@@ -1,18 +0,0 @@
-#include <string.h>
-
-#include "yarp/ast.h"
-
-// Returns a string representation of the given token type.
-YP_EXPORTED_FUNCTION const char *
-yp_token_type_to_str(yp_token_type_t token_type)
-{
-    switch (token_type) {
-<%- tokens.each do |token| -%>
-        case YP_TOKEN_<%= token.name %>:
-            return "<%= token.name %>";
-<%- end -%>
-        case YP_TOKEN_MAXIMUM:
-            return "MAXIMUM";
-    }
-    return "\0";
-}
diff --git a/yarp/templates/template.rb b/yarp/templates/template.rb
deleted file mode 100755
index 928ade61a6e601..00000000000000
--- a/yarp/templates/template.rb
+++ /dev/null
@@ -1,361 +0,0 @@
-#!/usr/bin/env ruby
-
-require "erb"
-require "fileutils"
-require "yaml"
-
-module YARP
-  COMMON_FLAGS = 1
-
-  # This represents a field on a node. It contains all of the necessary
-  # information to template out the code for that field.
-  class Field
-    attr_reader :name, :options
-
-    def initialize(name:, type:, **options)
-      @name, @type, @options = name, type, options
-    end
-  end
-
-  # Some node fields can be specialized if they point to a specific kind of
-  # node and not just a generic node.
-  class NodeKindField < Field
-    def c_type
-      if options[:kind]
-        "yp_#{options[:kind].gsub(/(?<=.)[A-Z]/, "_\\0").downcase}"
-      else
-        "yp_node"
-      end
-    end
-
-    def ruby_type
-      options[:kind] || "Node"
-    end
-
-    def java_type
-      options[:kind] || "Node"
-    end
-
-    def java_cast
-      if options[:kind]
-        "(Nodes.#{options[:kind]}) "
-      else
-        ""
-      end
-    end
-  end
-
-  # This represents a field on a node that is itself a node. We pass them as
-  # references and store them as references.
-  class NodeField < NodeKindField
-    def rbs_class
-      ruby_type
-    end
-  end
-
-  # This represents a field on a node that is itself a node and can be
-  # optionally null. We pass them as references and store them as references.
-  class OptionalNodeField < NodeKindField
-    def rbs_class
-      "#{ruby_type}?"
-    end
-  end
-
-  # This represents a field on a node that is a list of nodes. We pass them as
-  # references and store them directly on the struct.
-  class NodeListField < Field
-    def rbs_class
-      "Array[Node]"
-    end
-
-    def java_type
-      "Node[]"
-    end
-  end
-
-  # This represents a field on a node that is the ID of a string interned
-  # through the parser's constant pool.
-  class ConstantField < Field
-    def rbs_class
-      "Symbol"
-    end
-
-    def java_type
-      "byte[]"
-    end
-  end
-
-  # This represents a field on a node that is the ID of a string interned
-  # through the parser's constant pool and can be optionally null.
-  class OptionalConstantField < Field
-    def rbs_class
-      "Symbol?"
-    end
-
-    def java_type
-      "byte[]"
-    end
-  end
-
-  # This represents a field on a node that is a list of IDs that are associated
-  # with strings interned through the parser's constant pool.
-  class ConstantListField < Field
-    def rbs_class
-      "Array[Symbol]"
-    end
-
-    def java_type
-      "byte[][]"
-    end
-  end
-
-  # This represents a field on a node that is a string.
-  class StringField < Field
-    def rbs_class
-      "String"
-    end
-
-    def java_type
-      "byte[]"
-    end
-  end
-
-  # This represents a field on a node that is a location.
-  class LocationField < Field
-    def rbs_class
-      "Location"
-    end
-
-    def java_type
-      "Location"
-    end
-  end
-
-  # This represents a field on a node that is a location that is optional.
-  class OptionalLocationField < Field
-    def rbs_class
-      "Location?"
-    end
-
-    def java_type
-      "Location"
-    end
-  end
-
-  # This represents an integer field.
-  class UInt32Field < Field
-    def rbs_class
-      "Integer"
-    end
-
-    def java_type
-      "int"
-    end
-  end
-
-  # This represents a set of flags. It is very similar to the UInt32Field, but
-  # can be directly embedded into the flags field on the struct and provides
-  # convenient methods for checking if a flag is set.
-  class FlagsField < Field
-    def rbs_class
-      "Integer"
-    end
-
-    def java_type
-      "short"
-    end
-
-    def kind
-      options.fetch(:kind)
-    end
-  end
-
-  # This class represents a node in the tree, configured by the config.yml file in
-  # YAML format. It contains information about the name of the node and the
-  # various child nodes it contains.
-  class NodeType
-    attr_reader :name, :type, :human, :fields, :newline, :comment
-
-    def initialize(config)
-      @name = config.fetch("name")
-
-      type = @name.gsub(/(?<=.)[A-Z]/, "_\\0")
-      @type = "YP_#{type.upcase}"
-      @human = type.downcase
-
-      @fields =
-        config.fetch("fields", []).map do |field|
-          field_type_for(field.fetch("type")).new(**field.transform_keys(&:to_sym))
-        end
-
-      @newline = config.fetch("newline", true)
-      @comment = config.fetch("comment")
-    end
-
-    # Should emit serialized length of node so implementations can skip
-    # the node to enable lazy parsing.
-    def needs_serialized_length?
-      name == "DefNode"
-    end
-
-    private
-
-    def field_type_for(name)
-      case name
-      when "node"       then NodeField
-      when "node?"      then OptionalNodeField
-      when "node[]"     then NodeListField
-      when "string"     then StringField
-      when "constant"   then ConstantField
-      when "constant?"  then OptionalConstantField
-      when "constant[]" then ConstantListField
-      when "location"   then LocationField
-      when "location?"  then OptionalLocationField
-      when "uint32"     then UInt32Field
-      when "flags"      then FlagsField
-      else raise("Unknown field type: #{name.inspect}")
-      end
-    end
-  end
-
-  # This represents a token in the lexer.
-  class Token
-    attr_reader :name, :value, :comment
-
-    def initialize(config)
-      @name = config.fetch("name")
-      @value = config["value"]
-      @comment = config.fetch("comment")
-    end
-
-    def declaration
-      output = []
-      output << "YP_TOKEN_#{name}"
-      output << " = #{value}" if value
-      output << ", // #{comment}"
-      output.join
-    end
-  end
-
-  # Represents a set of flags that should be internally represented with an enum.
-  class Flags
-    # Represents an individual flag within a set of flags.
-    class Flag
-      attr_reader :name, :camelcase, :comment
-
-      def initialize(config)
-        @name = config.fetch("name")
-        @camelcase = @name.split("_").map(&:capitalize).join
-        @comment = config.fetch("comment")
-      end
-    end
-
-    attr_reader :name, :human, :values
-
-    def initialize(config)
-      @name = config.fetch("name")
-      @human = @name.gsub(/(?<=.)[A-Z]/, "_\\0").downcase
-      @values = config.fetch("values").map { |flag| Flag.new(flag) }
-    end
-  end
-
-  class << self
-    # This templates out a file using ERB with the given locals. The locals are
-    # derived from the config.yml file.
-    def template(name, write_to: nil)
-      filepath = "templates/#{name}.erb"
-      template = File.expand_path("../#{filepath}", __dir__)
-
-      erb = read_template(template)
-
-      non_ruby_heading = <<~HEADING
-      /******************************************************************************/
-      /* This file is generated by the templates/template.rb script and should not  */
-      /* be modified manually. See                                                  */
-      /* #{filepath + " " * (74 - filepath.size) } */
-      /* if you are looking to modify the                                           */
-      /* template                                                                   */
-      /******************************************************************************/
-      HEADING
-
-      ruby_heading = <<~HEADING
-      # frozen_string_literal: true
-      =begin
-      This file is generated by the templates/template.rb script and should not be
-      modified manually. See #{filepath}
-      if you are looking to modify the template
-      =end
-
-      HEADING
-
-      heading =
-        if File.extname(filepath.gsub(".erb", "")) == ".rb"
-          ruby_heading
-        else
-          non_ruby_heading
-        end
-
-      write_to ||= File.expand_path("../#{name}", __dir__)
-      contents = heading + erb.result_with_hash(locals)
-
-      FileUtils.mkdir_p(File.dirname(write_to))
-      File.write(write_to, contents)
-    end
-
-    private
-
-    def read_template(filepath)
-      template = File.read(filepath, encoding: Encoding::UTF_8)
-      erb = erb(template)
-      erb.filename = filepath
-      erb
-    end
-
-    if ERB.instance_method(:initialize).parameters.assoc(:key) # Ruby 2.6+
-      def erb(template)
-        ERB.new(template, trim_mode: "-")
-      end
-    else
-      def erb(template)
-        ERB.new(template, nil, "-")
-      end
-    end
-
-    def locals
-      @locals ||=
-        begin
-          config = YAML.load_file(File.expand_path("../config.yml", __dir__))
-
-          {
-            nodes: config.fetch("nodes").map { |node| NodeType.new(node) }.sort_by(&:name),
-            tokens: config.fetch("tokens").map { |token| Token.new(token) },
-            flags: config.fetch("flags").map { |flags| Flags.new(flags) }
-          }
-        end
-    end
-  end
-
-  TEMPLATES = [
-    "ext/yarp/api_node.c",
-    "include/yarp/ast.h",
-    "java/org/yarp/Loader.java",
-    "java/org/yarp/Nodes.java",
-    "java/org/yarp/AbstractNodeVisitor.java",
-    "lib/yarp/mutation_visitor.rb",
-    "lib/yarp/node.rb",
-    "lib/yarp/serialize.rb",
-    "src/node.c",
-    "src/prettyprint.c",
-    "src/serialize.c",
-    "src/token_type.c"
-  ]
-end
-
-if __FILE__ == $0
-  if ARGV.empty?
-    YARP::TEMPLATES.each { |filepath| YARP.template(filepath) }
-  else # ruby/ruby
-    name, write_to = ARGV
-    YARP.template(name, write_to: write_to)
-  end
-end
diff --git a/yarp/unescape.c b/yarp/unescape.c
deleted file mode 100644
index 830c5996ae380d..00000000000000
--- a/yarp/unescape.c
+++ /dev/null
@@ -1,618 +0,0 @@
-#include "yarp.h"
-
-/******************************************************************************/
-/* Character checks                                                           */
-/******************************************************************************/
-
-static inline bool
-yp_char_is_hexadecimal_digits(const uint8_t *string, size_t length) {
-    for (size_t index = 0; index < length; index++) {
-        if (!yp_char_is_hexadecimal_digit(string[index])) {
-            return false;
-        }
-    }
-    return true;
-}
-
-// We don't call the char_width function unless we have to because it's
-// expensive to go through the indirection of the function pointer. Instead we
-// provide a fast path that will check if we can just return 1.
-static inline size_t
-yp_char_width(yp_parser_t *parser, const uint8_t *start, const uint8_t *end) {
-    if (parser->encoding_changed || (*start >= 0x80)) {
-        return parser->encoding.char_width(start, end - start);
-    } else {
-        return 1;
-    }
-}
-
-/******************************************************************************/
-/* Lookup tables for characters                                               */
-/******************************************************************************/
-
-// This is a lookup table for unescapes that only take up a single character.
-static const uint8_t unescape_chars[] = {
-    ['\''] = '\'',
-    ['\\'] = '\\',
-    ['a'] = '\a',
-    ['b'] = '\b',
-    ['e'] = '\033',
-    ['f'] = '\f',
-    ['n'] = '\n',
-    ['r'] = '\r',
-    ['s'] = ' ',
-    ['t'] = '\t',
-    ['v'] = '\v'
-};
-
-// This is a lookup table for whether or not an ASCII character is printable.
-static const bool ascii_printable_chars[] = {
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1,
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0
-};
-
-static inline bool
-char_is_ascii_printable(const uint8_t b) {
-    return (b < 0x80) && ascii_printable_chars[b];
-}
-
-/******************************************************************************/
-/* Unescaping for segments                                                    */
-/******************************************************************************/
-
-// Scan the 1-3 digits of octal into the value. Returns the number of digits
-// scanned.
-static inline size_t
-unescape_octal(const uint8_t *backslash, uint8_t *value, const uint8_t *end) {
-    *value = (uint8_t) (backslash[1] - '0');
-    if (backslash + 2 >= end || !yp_char_is_octal_digit(backslash[2])) {
-        return 2;
-    }
-    *value = (uint8_t) ((*value << 3) | (backslash[2] - '0'));
-    if (backslash + 3 >= end || !yp_char_is_octal_digit(backslash[3])) {
-        return 3;
-    }
-    *value = (uint8_t) ((*value << 3) | (backslash[3] - '0'));
-    return 4;
-}
-
-// Convert a hexadecimal digit into its equivalent value.
-static inline uint8_t
-unescape_hexadecimal_digit(const uint8_t value) {
-    return (uint8_t) ((value <= '9') ? (value - '0') : (value & 0x7) + 9);
-}
-
-// Scan the 1-2 digits of hexadecimal into the value. Returns the number of
-// digits scanned.
-static inline size_t
-unescape_hexadecimal(const uint8_t *backslash, uint8_t *value, const uint8_t *end, yp_list_t *error_list) {
-    *value = 0;
-    if (backslash + 2 >= end || !yp_char_is_hexadecimal_digit(backslash[2])) {
-        if (error_list) yp_diagnostic_list_append(error_list, backslash, backslash + 2, "Invalid hex escape.");
-        return 2;
-    }
-    *value = unescape_hexadecimal_digit(backslash[2]);
-    if (backslash + 3 >=  end || !yp_char_is_hexadecimal_digit(backslash[3])) {
-        return 3;
-    }
-    *value = (uint8_t) ((*value << 4) | unescape_hexadecimal_digit(backslash[3]));
-    return 4;
-}
-
-// Scan the 4 digits of a Unicode escape into the value. Returns the number of
-// digits scanned. This function assumes that the characters have already been
-// validated.
-static inline void
-unescape_unicode(const uint8_t *string, size_t length, uint32_t *value) {
-    *value = 0;
-    for (size_t index = 0; index < length; index++) {
-        if (index != 0) *value <<= 4;
-        *value |= unescape_hexadecimal_digit(string[index]);
-    }
-}
-
-// Accepts the pointer to the string to write the unicode value along with the
-// 32-bit value to write. Writes the UTF-8 representation of the value to the
-// string and returns the number of bytes written.
-static inline size_t
-unescape_unicode_write(uint8_t *dest, uint32_t value, const uint8_t *start, const uint8_t *end, yp_list_t *error_list) {
-    if (value <= 0x7F) {
-        // 0xxxxxxx
-        dest[0] = (uint8_t) value;
-        return 1;
-    }
-
-    if (value <= 0x7FF) {
-        // 110xxxxx 10xxxxxx
-        dest[0] = (uint8_t) (0xC0 | (value >> 6));
-        dest[1] = (uint8_t) (0x80 | (value & 0x3F));
-        return 2;
-    }
-
-    if (value <= 0xFFFF) {
-        // 1110xxxx 10xxxxxx 10xxxxxx
-        dest[0] = (uint8_t) (0xE0 | (value >> 12));
-        dest[1] = (uint8_t) (0x80 | ((value >> 6) & 0x3F));
-        dest[2] = (uint8_t) (0x80 | (value & 0x3F));
-        return 3;
-    }
-
-    // At this point it must be a 4 digit UTF-8 representation. If it's not, then
-    // the input is invalid.
-    if (value <= 0x10FFFF) {
-        // 11110xxx 10xxxxxx 10xxxxxx 10xxxxxx
-        dest[0] = (uint8_t) (0xF0 | (value >> 18));
-        dest[1] = (uint8_t) (0x80 | ((value >> 12) & 0x3F));
-        dest[2] = (uint8_t) (0x80 | ((value >> 6) & 0x3F));
-        dest[3] = (uint8_t) (0x80 | (value & 0x3F));
-        return 4;
-    }
-
-    // If we get here, then the value is too big. This is an error, but we don't
-    // want to just crash, so instead we'll add an error to the error list and put
-    // in a replacement character instead.
-    if (error_list) yp_diagnostic_list_append(error_list, start, end, "Invalid Unicode escape sequence.");
-    dest[0] = 0xEF;
-    dest[1] = 0xBF;
-    dest[2] = 0xBD;
-    return 3;
-}
-
-typedef enum {
-    YP_UNESCAPE_FLAG_NONE = 0,
-    YP_UNESCAPE_FLAG_CONTROL = 1,
-    YP_UNESCAPE_FLAG_META = 2,
-    YP_UNESCAPE_FLAG_EXPECT_SINGLE = 4
-} yp_unescape_flag_t;
-
-// Unescape a single character value based on the given flags.
-static inline uint8_t
-unescape_char(uint8_t value, const uint8_t flags) {
-    if (flags & YP_UNESCAPE_FLAG_CONTROL) {
-        value &= 0x1f;
-    }
-
-    if (flags & YP_UNESCAPE_FLAG_META) {
-        value |= 0x80;
-    }
-
-    return value;
-}
-
-// Read a specific escape sequence into the given destination.
-static const uint8_t *
-unescape(
-    yp_parser_t *parser,
-    uint8_t *dest,
-    size_t *dest_length,
-    const uint8_t *backslash,
-    const uint8_t *end,
-    const uint8_t flags,
-    yp_list_t *error_list
-) {
-    switch (backslash[1]) {
-        case 'a':
-        case 'b':
-        case 'e':
-        case 'f':
-        case 'n':
-        case 'r':
-        case 's':
-        case 't':
-        case 'v':
-            if (dest) {
-                dest[(*dest_length)++] = unescape_char(unescape_chars[backslash[1]], flags);
-            }
-            return backslash + 2;
-        // \nnn         octal bit pattern, where nnn is 1-3 octal digits ([0-7])
-        case '0': case '1': case '2': case '3': case '4':
-        case '5': case '6': case '7': case '8': case '9': {
-            uint8_t value;
-            const uint8_t *cursor = backslash + unescape_octal(backslash, &value, end);
-
-            if (dest) {
-                dest[(*dest_length)++] = unescape_char(value, flags);
-            }
-            return cursor;
-        }
-        // \xnn         hexadecimal bit pattern, where nn is 1-2 hexadecimal digits ([0-9a-fA-F])
-        case 'x': {
-            uint8_t value;
-            const uint8_t *cursor = backslash + unescape_hexadecimal(backslash, &value, end, error_list);
-
-            if (dest) {
-                dest[(*dest_length)++] = unescape_char(value, flags);
-            }
-            return cursor;
-        }
-        // \u{nnnn ...} Unicode character(s), where each nnnn is 1-6 hexadecimal digits ([0-9a-fA-F])
-        // \unnnn       Unicode character, where nnnn is exactly 4 hexadecimal digits ([0-9a-fA-F])
-        case 'u': {
-            if ((flags & YP_UNESCAPE_FLAG_CONTROL) | (flags & YP_UNESCAPE_FLAG_META)) {
-                if (error_list) yp_diagnostic_list_append(error_list, backslash, backslash + 2, "Unicode escape sequence cannot be used with control or meta flags.");
-                return backslash + 2;
-            }
-
-            if ((backslash + 3) < end && backslash[2] == '{') {
-                const uint8_t *unicode_cursor = backslash + 3;
-                const uint8_t *extra_codepoints_start = NULL;
-                int codepoints_count = 0;
-
-                unicode_cursor += yp_strspn_whitespace(unicode_cursor, end - unicode_cursor);
-
-                while ((unicode_cursor < end) && (*unicode_cursor != '}')) {
-                    const uint8_t *unicode_start = unicode_cursor;
-                    size_t hexadecimal_length = yp_strspn_hexadecimal_digit(unicode_cursor, end - unicode_cursor);
-
-                    // \u{nnnn} character literal allows only 1-6 hexadecimal digits
-                    if (hexadecimal_length > 6) {
-                        if (error_list) yp_diagnostic_list_append(error_list, unicode_cursor, unicode_cursor + hexadecimal_length, "invalid Unicode escape.");
-                    }
-                    // there are not hexadecimal characters
-                    else if (hexadecimal_length == 0) {
-                        if (error_list) yp_diagnostic_list_append(error_list, unicode_cursor, unicode_cursor + hexadecimal_length, "unterminated Unicode escape");
-                        return unicode_cursor;
-                    }
-
-                    unicode_cursor += hexadecimal_length;
-
-                    codepoints_count++;
-                    if (flags & YP_UNESCAPE_FLAG_EXPECT_SINGLE && codepoints_count == 2)
-                        extra_codepoints_start = unicode_start;
-
-                    uint32_t value;
-                    unescape_unicode(unicode_start, (size_t) (unicode_cursor - unicode_start), &value);
-                    if (dest) {
-                        *dest_length += unescape_unicode_write(dest + *dest_length, value, unicode_start, unicode_cursor, error_list);
-                    }
-
-                    unicode_cursor += yp_strspn_whitespace(unicode_cursor, end - unicode_cursor);
-                }
-
-                // ?\u{nnnn} character literal should contain only one codepoint and cannot be like ?\u{nnnn mmmm}
-                if (flags & YP_UNESCAPE_FLAG_EXPECT_SINGLE && codepoints_count > 1) {
-                    if (error_list) yp_diagnostic_list_append(error_list, extra_codepoints_start, unicode_cursor - 1, "Multiple codepoints at single character literal");
-                }
-
-                if (unicode_cursor < end && *unicode_cursor == '}') {
-                    unicode_cursor++;
-                } else {
-                    if (error_list) yp_diagnostic_list_append(error_list, backslash, unicode_cursor, "invalid Unicode escape.");
-                }
-
-                return unicode_cursor;
-            }
-            else if ((backslash + 5) < end && yp_char_is_hexadecimal_digits(backslash + 2, 4)) {
-                uint32_t value;
-                unescape_unicode(backslash + 2, 4, &value);
-
-                if (dest) {
-                    *dest_length += unescape_unicode_write(dest + *dest_length, value, backslash + 2, backslash + 6, error_list);
-                }
-                return backslash + 6;
-            }
-
-            if (error_list) yp_diagnostic_list_append(error_list, backslash, backslash + 2, "Invalid Unicode escape sequence");
-            return backslash + 2;
-        }
-        // \c\M-x       meta control character, where x is an ASCII printable character
-        // \c?          delete, ASCII 7Fh (DEL)
-        // \cx          control character, where x is an ASCII printable character
-        case 'c':
-            if (backslash + 2 >= end) {
-                if (error_list) yp_diagnostic_list_append(error_list, backslash, backslash + 1, "Invalid control escape sequence");
-                return end;
-            }
-
-            if (flags & YP_UNESCAPE_FLAG_CONTROL) {
-                if (error_list) yp_diagnostic_list_append(error_list, backslash, backslash + 1, "Control escape sequence cannot be doubled.");
-                return backslash + 2;
-            }
-
-            switch (backslash[2]) {
-                case '\\':
-                    return unescape(parser, dest, dest_length, backslash + 2, end, flags | YP_UNESCAPE_FLAG_CONTROL, error_list);
-                case '?':
-                    if (dest) {
-                        dest[(*dest_length)++] = unescape_char(0x7f, flags);
-                    }
-                    return backslash + 3;
-                default: {
-                    if (!char_is_ascii_printable(backslash[2])) {
-                        if (error_list) yp_diagnostic_list_append(error_list, backslash, backslash + 1, "Invalid control escape sequence");
-                        return backslash + 2;
-                    }
-
-                    if (dest) {
-                        dest[(*dest_length)++] = unescape_char(backslash[2], flags | YP_UNESCAPE_FLAG_CONTROL);
-                    }
-                    return backslash + 3;
-                }
-            }
-        // \C-x         control character, where x is an ASCII printable character
-        // \C-?         delete, ASCII 7Fh (DEL)
-        case 'C':
-            if (backslash + 3 >= end) {
-                if (error_list) yp_diagnostic_list_append(error_list, backslash, backslash + 1, "Invalid control escape sequence");
-                return end;
-            }
-
-            if (flags & YP_UNESCAPE_FLAG_CONTROL) {
-                if (error_list) yp_diagnostic_list_append(error_list, backslash, backslash + 1, "Control escape sequence cannot be doubled.");
-                return backslash + 2;
-            }
-
-            if (backslash[2] != '-') {
-                if (error_list) yp_diagnostic_list_append(error_list, backslash, backslash + 1, "Invalid control escape sequence");
-                return backslash + 2;
-            }
-
-            switch (backslash[3]) {
-                case '\\':
-                    return unescape(parser, dest, dest_length, backslash + 3, end, flags | YP_UNESCAPE_FLAG_CONTROL, error_list);
-                case '?':
-                    if (dest) {
-                        dest[(*dest_length)++] = unescape_char(0x7f, flags);
-                    }
-                    return backslash + 4;
-                default:
-                    if (!char_is_ascii_printable(backslash[3])) {
-                        if (error_list) yp_diagnostic_list_append(error_list, backslash, backslash + 2, "Invalid control escape sequence");
-                        return backslash + 2;
-                    }
-
-                    if (dest) {
-                        dest[(*dest_length)++] = unescape_char(backslash[3], flags | YP_UNESCAPE_FLAG_CONTROL);
-                    }
-                    return backslash + 4;
-            }
-        // \M-\C-x      meta control character, where x is an ASCII printable character
-        // \M-\cx       meta control character, where x is an ASCII printable character
-        // \M-x         meta character, where x is an ASCII printable character
-        case 'M': {
-            if (backslash + 3 >= end) {
-                if (error_list) yp_diagnostic_list_append(error_list, backslash, backslash + 1, "Invalid control escape sequence");
-                return end;
-            }
-
-            if (flags & YP_UNESCAPE_FLAG_META) {
-                if (error_list) yp_diagnostic_list_append(error_list, backslash, backslash + 2, "Meta escape sequence cannot be doubled.");
-                return backslash + 2;
-            }
-
-            if (backslash[2] != '-') {
-                if (error_list) yp_diagnostic_list_append(error_list, backslash, backslash + 2, "Invalid meta escape sequence");
-                return backslash + 2;
-            }
-
-            if (backslash[3] == '\\') {
-                return unescape(parser, dest, dest_length, backslash + 3, end, flags | YP_UNESCAPE_FLAG_META, error_list);
-            }
-
-            if (char_is_ascii_printable(backslash[3])) {
-                if (dest) {
-                    dest[(*dest_length)++] = unescape_char(backslash[3], flags | YP_UNESCAPE_FLAG_META);
-                }
-                return backslash + 4;
-            }
-
-            if (error_list) yp_diagnostic_list_append(error_list, backslash, backslash + 2, "Invalid meta escape sequence");
-            return backslash + 3;
-        }
-        // \n
-        case '\n':
-            return backslash + 2;
-        // \r
-        case '\r':
-            if (backslash + 2 < end && backslash[2] == '\n') {
-                return backslash + 3;
-            }
-        /* fallthrough */
-        // In this case we're escaping something that doesn't need escaping.
-        default: {
-            size_t width = yp_char_width(parser, backslash + 1, end);
-
-            if (dest) {
-                memcpy(dest + *dest_length, backslash + 1, width);
-                *dest_length += width;
-            }
-
-            return backslash + 1 + width;
-        }
-    }
-}
-
-/******************************************************************************/
-/* Public functions and entrypoints                                           */
-/******************************************************************************/
-
-// Unescape the contents of the given token into the given string using the
-// given unescape mode. The supported escapes are:
-//
-// \a             bell, ASCII 07h (BEL)
-// \b             backspace, ASCII 08h (BS)
-// \t             horizontal tab, ASCII 09h (TAB)
-// \n             newline (line feed), ASCII 0Ah (LF)
-// \v             vertical tab, ASCII 0Bh (VT)
-// \f             form feed, ASCII 0Ch (FF)
-// \r             carriage return, ASCII 0Dh (CR)
-// \e             escape, ASCII 1Bh (ESC)
-// \s             space, ASCII 20h (SPC)
-// \\             backslash
-// \nnn           octal bit pattern, where nnn is 1-3 octal digits ([0-7])
-// \xnn           hexadecimal bit pattern, where nn is 1-2 hexadecimal digits ([0-9a-fA-F])
-// \unnnn         Unicode character, where nnnn is exactly 4 hexadecimal digits ([0-9a-fA-F])
-// \u{nnnn ...}   Unicode character(s), where each nnnn is 1-6 hexadecimal digits ([0-9a-fA-F])
-// \cx or \C-x    control character, where x is an ASCII printable character
-// \M-x           meta character, where x is an ASCII printable character
-// \M-\C-x        meta control character, where x is an ASCII printable character
-// \M-\cx         same as above
-// \c\M-x         same as above
-// \c? or \C-?    delete, ASCII 7Fh (DEL)
-//
-static void
-yp_unescape_manipulate_string_or_char_literal(yp_parser_t *parser, yp_string_t *string, yp_unescape_type_t unescape_type, bool expect_single_codepoint) {
-    if (unescape_type == YP_UNESCAPE_NONE) {
-        // If we're not unescaping then we can reference the source directly.
-        return;
-    }
-
-    const uint8_t *backslash = yp_memchr(string->source, '\\', string->length, parser->encoding_changed, &parser->encoding);
-
-    if (backslash == NULL) {
-        // Here there are no escapes, so we can reference the source directly.
-        return;
-    }
-
-    // Here we have found an escape character, so we need to handle all escapes
-    // within the string.
-    uint8_t *allocated = malloc(string->length);
-    if (allocated == NULL) {
-        yp_diagnostic_list_append(&parser->error_list, string->source, string->source + string->length, "Failed to allocate memory for unescaping.");
-        return;
-    }
-
-    // This is the memory address where we're putting the unescaped string.
-    uint8_t *dest = allocated;
-    size_t dest_length = 0;
-
-    // This is the current position in the source string that we're looking at.
-    // It's going to move along behind the backslash so that we can copy each
-    // segment of the string that doesn't contain an escape.
-    const uint8_t *cursor = string->source;
-    const uint8_t *end = string->source + string->length;
-
-    // For each escape found in the source string, we will handle it and update
-    // the moving cursor->backslash window.
-    while (backslash != NULL && backslash + 1 < end) {
-        assert(dest_length < string->length);
-
-        // This is the size of the segment of the string from the previous escape
-        // or the start of the string to the current escape.
-        size_t segment_size = (size_t) (backslash - cursor);
-
-        // Here we're going to copy everything up until the escape into the
-        // destination buffer.
-        memcpy(dest + dest_length, cursor, segment_size);
-        dest_length += segment_size;
-
-        switch (backslash[1]) {
-            case '\\':
-            case '\'':
-                dest[dest_length++] = unescape_chars[backslash[1]];
-                cursor = backslash + 2;
-                break;
-            default:
-                if (unescape_type == YP_UNESCAPE_MINIMAL) {
-                    // In this case we're escaping something that doesn't need escaping.
-                    dest[dest_length++] = '\\';
-                    cursor = backslash + 1;
-                    break;
-                }
-
-                // This is the only type of unescaping left. In this case we need to
-                // handle all of the different unescapes.
-                assert(unescape_type == YP_UNESCAPE_ALL);
-
-                uint8_t flags = YP_UNESCAPE_FLAG_NONE;
-                if (expect_single_codepoint) {
-                    flags |= YP_UNESCAPE_FLAG_EXPECT_SINGLE;
-                }
-
-                cursor = unescape(parser, dest, &dest_length, backslash, end, flags, &parser->error_list);
-                break;
-        }
-
-        if (end > cursor) {
-            backslash = yp_memchr(cursor, '\\', (size_t) (end - cursor), parser->encoding_changed, &parser->encoding);
-        } else {
-            backslash = NULL;
-        }
-    }
-
-    // We need to copy the final segment of the string after the last escape.
-    if (end > cursor) {
-        memcpy(dest + dest_length, cursor, (size_t) (end - cursor));
-    } else {
-        cursor = end;
-    }
-
-    // If the string was already allocated, then we need to free that memory
-    // here. That's because we're about to override it with the escaped string.
-    yp_string_free(string);
-
-    // We also need to update the length at the end. This is because every escape
-    // reduces the length of the final string, and we don't want garbage at the
-    // end.
-    yp_string_owned_init(string, allocated, dest_length + ((size_t) (end - cursor)));
-}
-
-YP_EXPORTED_FUNCTION void
-yp_unescape_manipulate_string(yp_parser_t *parser, yp_string_t *string, yp_unescape_type_t unescape_type) {
-    yp_unescape_manipulate_string_or_char_literal(parser, string, unescape_type, false);
-}
-
-void
-yp_unescape_manipulate_char_literal(yp_parser_t *parser, yp_string_t *string, yp_unescape_type_t unescape_type) {
-    yp_unescape_manipulate_string_or_char_literal(parser, string, unescape_type, true);
-}
-
-// This function is similar to yp_unescape_manipulate_string, except it doesn't
-// actually perform any string manipulations. Instead, it calculates how long
-// the unescaped character is, and returns that value
-size_t
-yp_unescape_calculate_difference(yp_parser_t *parser, const uint8_t *backslash, yp_unescape_type_t unescape_type, bool expect_single_codepoint) {
-    assert(unescape_type != YP_UNESCAPE_NONE);
-
-    if (backslash + 1 >= parser->end) {
-        return 0;
-    }
-
-    switch (backslash[1]) {
-        case '\\':
-        case '\'':
-            return 2;
-        default: {
-            if (unescape_type == YP_UNESCAPE_MINIMAL) {
-                return 1 + yp_char_width(parser, backslash + 1, parser->end);
-            }
-
-            // This is the only type of unescaping left. In this case we need to
-            // handle all of the different unescapes.
-            assert(unescape_type == YP_UNESCAPE_ALL);
-
-            uint8_t flags = YP_UNESCAPE_FLAG_NONE;
-            if (expect_single_codepoint) {
-                flags |= YP_UNESCAPE_FLAG_EXPECT_SINGLE;
-            }
-
-            const uint8_t *cursor = unescape(parser, NULL, 0, backslash, parser->end, flags, NULL);
-            assert(cursor > backslash);
-
-            return (size_t) (cursor - backslash);
-        }
-    }
-}
-
-// This is one of the main entry points into the extension. It accepts a source
-// string, a type of unescaping, and a pointer to a result string. It returns a
-// boolean indicating whether or not the unescaping was successful.
-YP_EXPORTED_FUNCTION bool
-yp_unescape_string(const uint8_t *start, size_t length, yp_unescape_type_t unescape_type, yp_string_t *result) {
-    yp_parser_t parser;
-    yp_parser_init(&parser, start, length, NULL);
-
-    yp_string_shared_init(result, start, start + length);
-    yp_unescape_manipulate_string(&parser, result, unescape_type);
-
-    bool success = yp_list_empty_p(&parser.error_list);
-    yp_parser_free(&parser);
-
-    return success;
-}
diff --git a/yarp/unescape.h b/yarp/unescape.h
deleted file mode 100644
index fb0df9fcb08145..00000000000000
--- a/yarp/unescape.h
+++ /dev/null
@@ -1,44 +0,0 @@
-#ifndef YARP_UNESCAPE_H
-#define YARP_UNESCAPE_H
-
-#include "yarp/defines.h"
-#include "yarp/diagnostic.h"
-#include "yarp/parser.h"
-#include "yarp/util/yp_char.h"
-#include "yarp/util/yp_list.h"
-#include "yarp/util/yp_memchr.h"
-#include "yarp/util/yp_string.h"
-
-#include <assert.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <string.h>
-
-// The type of unescape we are performing.
-typedef enum {
-    // When we're creating a string inside of a list literal like %w, we
-    // shouldn't escape anything.
-    YP_UNESCAPE_NONE,
-
-    // When we're unescaping a single-quoted string, we only need to unescape
-    // single quotes and backslashes.
-    YP_UNESCAPE_MINIMAL,
-
-    // When we're unescaping a double-quoted string, we need to unescape all
-    // escapes.
-    YP_UNESCAPE_ALL
-} yp_unescape_type_t;
-
-// Unescape the contents of the given token into the given string using the given unescape mode.
-YP_EXPORTED_FUNCTION void yp_unescape_manipulate_string(yp_parser_t *parser, yp_string_t *string, yp_unescape_type_t unescape_type);
-void yp_unescape_manipulate_char_literal(yp_parser_t *parser, yp_string_t *string, yp_unescape_type_t unescape_type);
-
-// Accepts a source string and a type of unescaping and returns the unescaped version.
-// The caller must yp_string_free(result); after calling this function.
-YP_EXPORTED_FUNCTION bool yp_unescape_string(const uint8_t *start, size_t length, yp_unescape_type_t unescape_type, yp_string_t *result);
-
-// Returns the number of bytes that encompass the first escape sequence in the
-// given string.
-size_t yp_unescape_calculate_difference(yp_parser_t *parser, const uint8_t *value, yp_unescape_type_t unescape_type, bool expect_single_codepoint);
-
-#endif
diff --git a/yarp/util/yp_buffer.c b/yarp/util/yp_buffer.c
deleted file mode 100644
index 15cdef74f88073..00000000000000
--- a/yarp/util/yp_buffer.c
+++ /dev/null
@@ -1,101 +0,0 @@
-#include "yarp/util/yp_buffer.h"
-
-#define YP_BUFFER_INITIAL_SIZE 1024
-
-// Return the size of the yp_buffer_t struct.
-size_t
-yp_buffer_sizeof(void) {
-    return sizeof(yp_buffer_t);
-}
-
-// Initialize a yp_buffer_t with its default values.
-bool
-yp_buffer_init(yp_buffer_t *buffer) {
-    buffer->length = 0;
-    buffer->capacity = YP_BUFFER_INITIAL_SIZE;
-
-    buffer->value = (char *) malloc(YP_BUFFER_INITIAL_SIZE);
-    return buffer->value != NULL;
-}
-
-// Return the value of the buffer.
-char *
-yp_buffer_value(yp_buffer_t *buffer) {
-    return buffer->value;
-}
-
-// Return the length of the buffer.
-size_t
-yp_buffer_length(yp_buffer_t *buffer) {
-    return buffer->length;
-}
-
-// Append the given amount of space to the buffer.
-static inline void
-yp_buffer_append_length(yp_buffer_t *buffer, size_t length) {
-    size_t next_length = buffer->length + length;
-
-    if (next_length > buffer->capacity) {
-        do {
-            buffer->capacity *= 2;
-        } while (next_length > buffer->capacity);
-
-        buffer->value = realloc(buffer->value, buffer->capacity);
-    }
-
-    buffer->length = next_length;
-}
-
-// Append a generic pointer to memory to the buffer.
-static inline void
-yp_buffer_append(yp_buffer_t *buffer, const void *source, size_t length) {
-    yp_buffer_append_length(buffer, length);
-    memcpy(buffer->value + (buffer->length - length), source, length);
-}
-
-// Append the given amount of space as zeroes to the buffer.
-void
-yp_buffer_append_zeroes(yp_buffer_t *buffer, size_t length) {
-    yp_buffer_append_length(buffer, length);
-    memset(buffer->value + (buffer->length - length), 0, length);
-}
-
-// Append a string to the buffer.
-void
-yp_buffer_append_str(yp_buffer_t *buffer, const char *value, size_t length) {
-    yp_buffer_append(buffer, value, length);
-}
-
-// Append a list of bytes to the buffer.
-void
-yp_buffer_append_bytes(yp_buffer_t *buffer, const uint8_t *value, size_t length) {
-    yp_buffer_append(buffer, (const char *) value, length);
-}
-
-// Append a single byte to the buffer.
-void
-yp_buffer_append_u8(yp_buffer_t *buffer, uint8_t value) {
-    const void *source = &value;
-    yp_buffer_append(buffer, source, sizeof(uint8_t));
-}
-
-// Append a 32-bit unsigned integer to the buffer.
-void
-yp_buffer_append_u32(yp_buffer_t *buffer, uint32_t value) {
-    if (value < 128) {
-        yp_buffer_append_u8(buffer, (uint8_t) value);
-    } else {
-        uint32_t n = value;
-        while (n >= 128) {
-            yp_buffer_append_u8(buffer, (uint8_t) (n | 128));
-            n >>= 7;
-        }
-        yp_buffer_append_u8(buffer, (uint8_t) n);
-    }
-}
-
-// Free the memory associated with the buffer.
-void
-yp_buffer_free(yp_buffer_t *buffer) {
-    free(buffer->value);
-}
diff --git a/yarp/util/yp_buffer.h b/yarp/util/yp_buffer.h
deleted file mode 100644
index c388e8d5ce0000..00000000000000
--- a/yarp/util/yp_buffer.h
+++ /dev/null
@@ -1,51 +0,0 @@
-#ifndef YARP_BUFFER_H
-#define YARP_BUFFER_H
-
-#include "yarp/defines.h"
-
-#include <assert.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-#include <string.h>
-
-// A yp_buffer_t is a simple memory buffer that stores data in a contiguous
-// block of memory. It is used to store the serialized representation of a
-// YARP tree.
-typedef struct {
-    char *value;
-    size_t length;
-    size_t capacity;
-} yp_buffer_t;
-
-// Return the size of the yp_buffer_t struct.
-YP_EXPORTED_FUNCTION size_t yp_buffer_sizeof(void);
-
-// Initialize a yp_buffer_t with its default values.
-YP_EXPORTED_FUNCTION bool yp_buffer_init(yp_buffer_t *buffer);
-
-// Return the value of the buffer.
-YP_EXPORTED_FUNCTION char * yp_buffer_value(yp_buffer_t *buffer);
-
-// Return the length of the buffer.
-YP_EXPORTED_FUNCTION size_t yp_buffer_length(yp_buffer_t *buffer);
-
-// Append the given amount of space as zeroes to the buffer.
-void yp_buffer_append_zeroes(yp_buffer_t *buffer, size_t length);
-
-// Append a string to the buffer.
-void yp_buffer_append_str(yp_buffer_t *buffer, const char *value, size_t length);
-
-// Append a list of bytes to the buffer.
-void yp_buffer_append_bytes(yp_buffer_t *buffer, const uint8_t *value, size_t length);
-
-// Append a single byte to the buffer.
-void yp_buffer_append_u8(yp_buffer_t *buffer, uint8_t value);
-
-// Append a 32-bit unsigned integer to the buffer.
-void yp_buffer_append_u32(yp_buffer_t *buffer, uint32_t value);
-
-// Free the memory associated with the buffer.
-YP_EXPORTED_FUNCTION void yp_buffer_free(yp_buffer_t *buffer);
-
-#endif
diff --git a/yarp/util/yp_char.c b/yarp/util/yp_char.c
deleted file mode 100644
index e9f1ef45c20997..00000000000000
--- a/yarp/util/yp_char.c
+++ /dev/null
@@ -1,229 +0,0 @@
-#include "yarp/util/yp_char.h"
-
-#define YP_CHAR_BIT_WHITESPACE (1 << 0)
-#define YP_CHAR_BIT_INLINE_WHITESPACE (1 << 1)
-#define YP_CHAR_BIT_REGEXP_OPTION (1 << 2)
-
-#define YP_NUMBER_BIT_BINARY_DIGIT (1 << 0)
-#define YP_NUMBER_BIT_BINARY_NUMBER (1 << 1)
-#define YP_NUMBER_BIT_OCTAL_DIGIT (1 << 2)
-#define YP_NUMBER_BIT_OCTAL_NUMBER (1 << 3)
-#define YP_NUMBER_BIT_DECIMAL_DIGIT (1 << 4)
-#define YP_NUMBER_BIT_DECIMAL_NUMBER (1 << 5)
-#define YP_NUMBER_BIT_HEXADECIMAL_DIGIT (1 << 6)
-#define YP_NUMBER_BIT_HEXADECIMAL_NUMBER (1 << 7)
-
-static const uint8_t yp_byte_table[256] = {
-//  0  1  2  3  4  5  6  7  8  9  A  B  C  D  E  F
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 1, 3, 3, 3, 0, 0, // 0x
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 1x
-    3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 2x
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 3x
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 4x
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 5x
-    0, 0, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 4, 4, // 6x
-    0, 0, 0, 4, 0, 4, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0, // 7x
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 8x
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 9x
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // Ax
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // Bx
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // Cx
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // Dx
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // Ex
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // Fx
-};
-
-static const uint8_t yp_number_table[256] = {
-    // 0     1     2     3     4     5     6     7     8     9     A     B     C     D     E     F
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0x
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 1x
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 2x
-    0xff, 0xff, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xf0, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 3x
-    0x00, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 4x
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xaa, // 5x
-    0x00, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 6x
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 7x
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 8x
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 9x
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // Ax
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // Bx
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // Cx
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // Dx
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // Ex
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // Fx
-};
-
-static inline size_t
-yp_strspn_char_kind(const uint8_t *string, ptrdiff_t length, uint8_t kind) {
-    if (length <= 0) return 0;
-
-    size_t size = 0;
-    size_t maximum = (size_t) length;
-
-    while (size < maximum && (yp_byte_table[string[size]] & kind)) size++;
-    return size;
-}
-
-// Returns the number of characters at the start of the string that are
-// whitespace. Disallows searching past the given maximum number of characters.
-size_t
-yp_strspn_whitespace(const uint8_t *string, ptrdiff_t length) {
-    return yp_strspn_char_kind(string, length, YP_CHAR_BIT_WHITESPACE);
-}
-
-// Returns the number of characters at the start of the string that are
-// whitespace while also tracking the location of each newline. Disallows
-// searching past the given maximum number of characters.
-size_t
-yp_strspn_whitespace_newlines(const uint8_t *string, ptrdiff_t length, yp_newline_list_t *newline_list, bool stop_at_newline) {
-    if (length <= 0) return 0;
-
-    size_t size = 0;
-    size_t maximum = (size_t) length;
-
-    while (size < maximum && (yp_byte_table[string[size]] & YP_CHAR_BIT_WHITESPACE)) {
-        if (string[size] == '\n') {
-            if (stop_at_newline) {
-                return size + 1;
-            }
-            else {
-                yp_newline_list_append(newline_list, string + size);
-            }
-        }
-
-        size++;
-    }
-
-    return size;
-}
-
-// Returns the number of characters at the start of the string that are inline
-// whitespace. Disallows searching past the given maximum number of characters.
-size_t
-yp_strspn_inline_whitespace(const uint8_t *string, ptrdiff_t length) {
-    return yp_strspn_char_kind(string, length, YP_CHAR_BIT_INLINE_WHITESPACE);
-}
-
-// Returns the number of characters at the start of the string that are regexp
-// options. Disallows searching past the given maximum number of characters.
-size_t
-yp_strspn_regexp_option(const uint8_t *string, ptrdiff_t length) {
-    return yp_strspn_char_kind(string, length, YP_CHAR_BIT_REGEXP_OPTION);
-}
-
-static inline bool
-yp_char_is_char_kind(const uint8_t b, uint8_t kind) {
-    return (yp_byte_table[b] & kind) != 0;
-}
-
-// Returns true if the given character is a whitespace character.
-bool
-yp_char_is_whitespace(const uint8_t b) {
-    return yp_char_is_char_kind(b, YP_CHAR_BIT_WHITESPACE);
-}
-
-// Returns true if the given character is an inline whitespace character.
-bool
-yp_char_is_inline_whitespace(const uint8_t b) {
-    return yp_char_is_char_kind(b, YP_CHAR_BIT_INLINE_WHITESPACE);
-}
-
-static inline size_t
-yp_strspn_number_kind(const uint8_t *string, ptrdiff_t length, uint8_t kind) {
-    if (length <= 0) return 0;
-
-    size_t size = 0;
-    size_t maximum = (size_t) length;
-
-    while (size < maximum && (yp_number_table[string[size]] & kind)) size++;
-    return size;
-}
-
-// Returns the number of characters at the start of the string that are binary
-// digits or underscores. Disallows searching past the given maximum number of
-// characters.
-size_t
-yp_strspn_binary_number(const uint8_t *string, ptrdiff_t length) {
-    return yp_strspn_number_kind(string, length, YP_NUMBER_BIT_BINARY_NUMBER);
-}
-
-// Returns the number of characters at the start of the string that are octal
-// digits or underscores.  Disallows searching past the given maximum number of
-// characters.
-size_t
-yp_strspn_octal_number(const uint8_t *string, ptrdiff_t length) {
-    return yp_strspn_number_kind(string, length, YP_NUMBER_BIT_OCTAL_NUMBER);
-}
-
-// Returns the number of characters at the start of the string that are decimal
-// digits. Disallows searching past the given maximum number of characters.
-size_t
-yp_strspn_decimal_digit(const uint8_t *string, ptrdiff_t length) {
-    return yp_strspn_number_kind(string, length, YP_NUMBER_BIT_DECIMAL_DIGIT);
-}
-
-// Returns the number of characters at the start of the string that are decimal
-// digits or underscores. Disallows searching past the given maximum number of
-// characters.
-size_t
-yp_strspn_decimal_number(const uint8_t *string, ptrdiff_t length) {
-    return yp_strspn_number_kind(string, length, YP_NUMBER_BIT_DECIMAL_NUMBER);
-}
-
-// Returns the number of characters at the start of the string that are
-// hexadecimal digits. Disallows searching past the given maximum number of
-// characters.
-size_t
-yp_strspn_hexadecimal_digit(const uint8_t *string, ptrdiff_t length) {
-    return yp_strspn_number_kind(string, length, YP_NUMBER_BIT_HEXADECIMAL_DIGIT);
-}
-
-// Returns the number of characters at the start of the string that are
-// hexadecimal digits or underscores. Disallows searching past the given maximum
-// number of characters.
-size_t
-yp_strspn_hexadecimal_number(const uint8_t *string, ptrdiff_t length) {
-    return yp_strspn_number_kind(string, length, YP_NUMBER_BIT_HEXADECIMAL_NUMBER);
-}
-
-static inline bool
-yp_char_is_number_kind(const uint8_t b, uint8_t kind) {
-    return (yp_number_table[b] & kind) != 0;
-}
-
-// Returns true if the given character is a binary digit.
-bool
-yp_char_is_binary_digit(const uint8_t b) {
-    return yp_char_is_number_kind(b, YP_NUMBER_BIT_BINARY_DIGIT);
-}
-
-// Returns true if the given character is an octal digit.
-bool
-yp_char_is_octal_digit(const uint8_t b) {
-    return yp_char_is_number_kind(b, YP_NUMBER_BIT_OCTAL_DIGIT);
-}
-
-// Returns true if the given character is a decimal digit.
-bool
-yp_char_is_decimal_digit(const uint8_t b) {
-    return yp_char_is_number_kind(b, YP_NUMBER_BIT_DECIMAL_DIGIT);
-}
-
-// Returns true if the given character is a hexadecimal digit.
-bool
-yp_char_is_hexadecimal_digit(const uint8_t b) {
-    return yp_char_is_number_kind(b, YP_NUMBER_BIT_HEXADECIMAL_DIGIT);
-}
-
-#undef YP_CHAR_BIT_WHITESPACE
-#undef YP_CHAR_BIT_INLINE_WHITESPACE
-#undef YP_CHAR_BIT_REGEXP_OPTION
-
-#undef YP_NUMBER_BIT_BINARY_DIGIT
-#undef YP_NUMBER_BIT_BINARY_NUMBER
-#undef YP_NUMBER_BIT_OCTAL_DIGIT
-#undef YP_NUMBER_BIT_OCTAL_NUMBER
-#undef YP_NUMBER_BIT_DECIMAL_DIGIT
-#undef YP_NUMBER_BIT_DECIMAL_NUMBER
-#undef YP_NUMBER_BIT_HEXADECIMAL_NUMBER
-#undef YP_NUMBER_BIT_HEXADECIMAL_DIGIT
diff --git a/yarp/util/yp_char.h b/yarp/util/yp_char.h
deleted file mode 100644
index 67ba31d34d687a..00000000000000
--- a/yarp/util/yp_char.h
+++ /dev/null
@@ -1,75 +0,0 @@
-#ifndef YP_CHAR_H
-#define YP_CHAR_H
-
-#include "yarp/defines.h"
-#include "yarp/util/yp_newline_list.h"
-
-#include <stdbool.h>
-#include <stddef.h>
-
-// Returns the number of characters at the start of the string that are
-// whitespace. Disallows searching past the given maximum number of characters.
-size_t yp_strspn_whitespace(const uint8_t *string, ptrdiff_t length);
-
-// Returns the number of characters at the start of the string that are
-// whitespace while also tracking the location of each newline. Disallows
-// searching past the given maximum number of characters.
-size_t
-yp_strspn_whitespace_newlines(const uint8_t *string, ptrdiff_t length, yp_newline_list_t *newline_list, bool stop_at_newline);
-
-// Returns the number of characters at the start of the string that are inline
-// whitespace. Disallows searching past the given maximum number of characters.
-size_t yp_strspn_inline_whitespace(const uint8_t *string, ptrdiff_t length);
-
-// Returns the number of characters at the start of the string that are decimal
-// digits. Disallows searching past the given maximum number of characters.
-size_t yp_strspn_decimal_digit(const uint8_t *string, ptrdiff_t length);
-
-// Returns the number of characters at the start of the string that are
-// hexadecimal digits. Disallows searching past the given maximum number of
-// characters.
-size_t yp_strspn_hexadecimal_digit(const uint8_t *string, ptrdiff_t length);
-
-// Returns the number of characters at the start of the string that are octal
-// digits or underscores.  Disallows searching past the given maximum number of
-// characters.
-size_t yp_strspn_octal_number(const uint8_t *string, ptrdiff_t length);
-
-// Returns the number of characters at the start of the string that are decimal
-// digits or underscores. Disallows searching past the given maximum number of
-// characters.
-size_t yp_strspn_decimal_number(const uint8_t *string, ptrdiff_t length);
-
-// Returns the number of characters at the start of the string that are
-// hexadecimal digits or underscores. Disallows searching past the given maximum
-// number of characters.
-size_t yp_strspn_hexadecimal_number(const uint8_t *string, ptrdiff_t length);
-
-// Returns the number of characters at the start of the string that are regexp
-// options. Disallows searching past the given maximum number of characters.
-size_t yp_strspn_regexp_option(const uint8_t *string, ptrdiff_t length);
-
-// Returns the number of characters at the start of the string that are binary
-// digits or underscores. Disallows searching past the given maximum number of
-// characters.
-size_t yp_strspn_binary_number(const uint8_t *string, ptrdiff_t length);
-
-// Returns true if the given character is a whitespace character.
-bool yp_char_is_whitespace(const uint8_t b);
-
-// Returns true if the given character is an inline whitespace character.
-bool yp_char_is_inline_whitespace(const uint8_t b);
-
-// Returns true if the given character is a binary digit.
-bool yp_char_is_binary_digit(const uint8_t b);
-
-// Returns true if the given character is an octal digit.
-bool yp_char_is_octal_digit(const uint8_t b);
-
-// Returns true if the given character is a decimal digit.
-bool yp_char_is_decimal_digit(const uint8_t b);
-
-// Returns true if the given character is a hexadecimal digit.
-bool yp_char_is_hexadecimal_digit(const uint8_t b);
-
-#endif
diff --git a/yarp/util/yp_constant_pool.c b/yarp/util/yp_constant_pool.c
deleted file mode 100644
index 3ad241a9d1bb54..00000000000000
--- a/yarp/util/yp_constant_pool.c
+++ /dev/null
@@ -1,147 +0,0 @@
-#include "yarp/util/yp_constant_pool.h"
-
-// Initialize a list of constant ids.
-void
-yp_constant_id_list_init(yp_constant_id_list_t *list) {
-    list->ids = NULL;
-    list->size = 0;
-    list->capacity = 0;
-}
-
-// Append a constant id to a list of constant ids. Returns false if any
-// potential reallocations fail.
-bool
-yp_constant_id_list_append(yp_constant_id_list_t *list, yp_constant_id_t id) {
-    if (list->size >= list->capacity) {
-        list->capacity = list->capacity == 0 ? 8 : list->capacity * 2;
-        list->ids = (yp_constant_id_t *) realloc(list->ids, sizeof(yp_constant_id_t) * list->capacity);
-        if (list->ids == NULL) return false;
-    }
-
-    list->ids[list->size++] = id;
-    return true;
-}
-
-// Checks if the current constant id list includes the given constant id.
-bool
-yp_constant_id_list_includes(yp_constant_id_list_t *list, yp_constant_id_t id) {
-    for (size_t index = 0; index < list->size; index++) {
-        if (list->ids[index] == id) return true;
-    }
-    return false;
-}
-
-// Get the memory size of a list of constant ids.
-size_t
-yp_constant_id_list_memsize(yp_constant_id_list_t *list) {
-    return sizeof(yp_constant_id_list_t) + (list->capacity * sizeof(yp_constant_id_t));
-}
-
-// Free the memory associated with a list of constant ids.
-void
-yp_constant_id_list_free(yp_constant_id_list_t *list) {
-    if (list->ids != NULL) {
-        free(list->ids);
-    }
-}
-
-// A relatively simple hash function (djb2) that is used to hash strings. We are
-// optimizing here for simplicity and speed.
-static inline size_t
-yp_constant_pool_hash(const uint8_t *start, size_t length) {
-    // This is a prime number used as the initial value for the hash function.
-    size_t value = 5381;
-
-    for (size_t index = 0; index < length; index++) {
-        value = ((value << 5) + value) + start[index];
-    }
-
-    return value;
-}
-
-// Resize a constant pool to a given capacity.
-static inline bool
-yp_constant_pool_resize(yp_constant_pool_t *pool) {
-    size_t next_capacity = pool->capacity * 2;
-    yp_constant_t *next_constants = calloc(next_capacity, sizeof(yp_constant_t));
-    if (next_constants == NULL) return false;
-
-    // For each constant in the current constant pool, rehash the content, find
-    // the index in the next constant pool, and insert it.
-    for (size_t index = 0; index < pool->capacity; index++) {
-        yp_constant_t *constant = &pool->constants[index];
-
-        // If an id is set on this constant, then we know we have content here.
-        // In this case we need to insert it into the next constant pool.
-        if (constant->id != 0) {
-            size_t next_index = constant->hash % next_capacity;
-
-            // This implements linear scanning to find the next available slot
-            // in case this index is already taken. We don't need to bother
-            // comparing the values since we know that the hash is unique.
-            while (next_constants[next_index].id != 0) {
-                next_index = (next_index + 1) % next_capacity;
-            }
-
-            // Here we copy over the entire constant, which includes the id so
-            // that they are consistent between resizes.
-            next_constants[next_index] = *constant;
-        }
-    }
-
-    free(pool->constants);
-    pool->constants = next_constants;
-    pool->capacity = next_capacity;
-    return true;
-}
-
-// Initialize a new constant pool with a given capacity.
-bool
-yp_constant_pool_init(yp_constant_pool_t *pool, size_t capacity) {
-    pool->constants = calloc(capacity, sizeof(yp_constant_t));
-    if (pool->constants == NULL) return false;
-
-    pool->size = 0;
-    pool->capacity = capacity;
-    return true;
-}
-
-// Insert a constant into a constant pool. Returns the id of the constant, or 0
-// if any potential calls to resize fail.
-yp_constant_id_t
-yp_constant_pool_insert(yp_constant_pool_t *pool, const uint8_t *start, size_t length) {
-    if (pool->size >= (pool->capacity / 4 * 3)) {
-        if (!yp_constant_pool_resize(pool)) return 0;
-    }
-
-    size_t hash = yp_constant_pool_hash(start, length);
-    size_t index = hash % pool->capacity;
-    yp_constant_t *constant;
-
-    while (constant = &pool->constants[index], constant->id != 0) {
-        // If there is a collision, then we need to check if the content is the
-        // same as the content we are trying to insert. If it is, then we can
-        // return the id of the existing constant.
-        if ((constant->length == length) && memcmp(constant->start, start, length) == 0) {
-            return pool->constants[index].id;
-        }
-
-        index = (index + 1) % pool->capacity;
-    }
-
-    yp_constant_id_t id = (yp_constant_id_t)++pool->size;
-    pool->constants[index] = (yp_constant_t) {
-        .id = id,
-        .start = start,
-        .length = length,
-        .hash = hash
-    };
-
-    return id;
-}
-
-// Free the memory associated with a constant pool.
-void
-yp_constant_pool_free(yp_constant_pool_t *pool) {
-    free(pool->constants);
-}
diff --git a/yarp/util/yp_constant_pool.h b/yarp/util/yp_constant_pool.h
deleted file mode 100644
index 1ac23cf88bbf28..00000000000000
--- a/yarp/util/yp_constant_pool.h
+++ /dev/null
@@ -1,67 +0,0 @@
-// The constant pool is a data structure that stores a set of strings. Each
-// string is assigned a unique id, which can be used to compare strings for
-// equality. This comparison ends up being much faster than strcmp, since it
-// only requires a single integer comparison.
-
-#ifndef YP_CONSTANT_POOL_H
-#define YP_CONSTANT_POOL_H
-
-#include "yarp/defines.h"
-
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-#include <string.h>
-
-typedef uint32_t yp_constant_id_t;
-
-typedef struct {
-    yp_constant_id_t *ids;
-    size_t size;
-    size_t capacity;
-} yp_constant_id_list_t;
-
-// Initialize a list of constant ids.
-void yp_constant_id_list_init(yp_constant_id_list_t *list);
-
-// Append a constant id to a list of constant ids. Returns false if any
-// potential reallocations fail.
-bool yp_constant_id_list_append(yp_constant_id_list_t *list, yp_constant_id_t id);
-
-// Checks if the current constant id list includes the given constant id.
-bool
-yp_constant_id_list_includes(yp_constant_id_list_t *list, yp_constant_id_t id);
-
-// Get the memory size of a list of constant ids.
-size_t yp_constant_id_list_memsize(yp_constant_id_list_t *list);
-
-// Free the memory associated with a list of constant ids.
-void yp_constant_id_list_free(yp_constant_id_list_t *list);
-
-typedef struct {
-    yp_constant_id_t id;
-    const uint8_t *start;
-    size_t length;
-    size_t hash;
-} yp_constant_t;
-
-typedef struct {
-    yp_constant_t *constants;
-    size_t size;
-    size_t capacity;
-} yp_constant_pool_t;
-
-// Define an empty constant pool.
-#define YP_CONSTANT_POOL_EMPTY ((yp_constant_pool_t) { .constants = NULL, .size = 0, .capacity = 0 })
-
-// Initialize a new constant pool with a given capacity.
-bool yp_constant_pool_init(yp_constant_pool_t *pool, size_t capacity);
-
-// Insert a constant into a constant pool. Returns the id of the constant, or 0
-// if any potential calls to resize fail.
-yp_constant_id_t yp_constant_pool_insert(yp_constant_pool_t *pool, const uint8_t *start, size_t length);
-
-// Free the memory associated with a constant pool.
-void yp_constant_pool_free(yp_constant_pool_t *pool);
-
-#endif
diff --git a/yarp/util/yp_list.c b/yarp/util/yp_list.c
deleted file mode 100644
index e03dd79d8d89a8..00000000000000
--- a/yarp/util/yp_list.c
+++ /dev/null
@@ -1,41 +0,0 @@
-#include "yarp/util/yp_list.h"
-
-// Returns true if the given list is empty.
-YP_EXPORTED_FUNCTION bool
-yp_list_empty_p(yp_list_t *list) {
-    return list->head == NULL;
-}
-
-// Returns the size of the list.
-YP_EXPORTED_FUNCTION size_t
-yp_list_size(yp_list_t *list) {
-    return list->size;
-}
-
-// Append a node to the given list.
-void
-yp_list_append(yp_list_t *list, yp_list_node_t *node) {
-    if (list->head == NULL) {
-        list->head = node;
-    } else {
-        list->tail->next = node;
-    }
-
-    list->tail = node;
-    list->size++;
-}
-
-// Deallocate the internal state of the given list.
-YP_EXPORTED_FUNCTION void
-yp_list_free(yp_list_t *list) {
-    yp_list_node_t *node = list->head;
-    yp_list_node_t *next;
-
-    while (node != NULL) {
-        next = node->next;
-        free(node);
-        node = next;
-    }
-
-    list->size = 0;
-}
diff --git a/yarp/util/yp_list.h b/yarp/util/yp_list.h
deleted file mode 100644
index 205a5a7eab4a8f..00000000000000
--- a/yarp/util/yp_list.h
+++ /dev/null
@@ -1,67 +0,0 @@
-// This struct represents an abstract linked list that provides common
-// functionality. It is meant to be used any time a linked list is necessary to
-// store data.
-//
-// The linked list itself operates off a set of pointers. Because the pointers
-// are not necessarily sequential, they can be of any size. We use this fact to
-// allow the consumer of this linked list to extend the node struct to include
-// any data they want. This is done by using the yp_list_node_t as the first
-// member of the struct.
-//
-// For example, if we want to store a list of integers, we can do the following:
-//
-//     typedef struct {
-//       yp_list_node_t node;
-//       int value;
-//     } yp_int_node_t;
-//
-//     yp_list_t list = YP_LIST_EMPTY;
-//     yp_int_node_t *node = malloc(sizeof(yp_int_node_t));
-//     node->value = 5;
-//
-//     yp_list_append(&list, &node->node);
-//
-// The yp_list_t struct is used to represent the overall linked list. It
-// contains a pointer to the head and tail of the list. This allows for easy
-// iteration and appending of new nodes.
-
-#ifndef YARP_LIST_H
-#define YARP_LIST_H
-
-#include "yarp/defines.h"
-
-#include <stdbool.h>
-#include <stddef.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-// This represents a node in the linked list.
-typedef struct yp_list_node {
-    struct yp_list_node *next;
-} yp_list_node_t;
-
-// This represents the overall linked list. It keeps a pointer to the head and
-// tail so that iteration is easy and pushing new nodes is easy.
-typedef struct {
-    size_t size;
-    yp_list_node_t *head;
-    yp_list_node_t *tail;
-} yp_list_t;
-
-// This represents an empty list. It's used to initialize a stack-allocated list
-// as opposed to a method call.
-#define YP_LIST_EMPTY ((yp_list_t) { .size = 0, .head = NULL, .tail = NULL })
-
-// Returns true if the given list is empty.
-YP_EXPORTED_FUNCTION bool yp_list_empty_p(yp_list_t *list);
-
-// Returns the size of the list.
-YP_EXPORTED_FUNCTION size_t yp_list_size(yp_list_t *list);
-
-// Append a node to the given list.
-void yp_list_append(yp_list_t *list, yp_list_node_t *node);
-
-// Deallocate the internal state of the given list.
-YP_EXPORTED_FUNCTION void yp_list_free(yp_list_t *list);
-
-#endif
diff --git a/yarp/util/yp_memchr.c b/yarp/util/yp_memchr.c
deleted file mode 100644
index af9c14397e0b37..00000000000000
--- a/yarp/util/yp_memchr.c
+++ /dev/null
@@ -1,31 +0,0 @@
-#include "yarp/util/yp_memchr.h"
-
-#define YP_MEMCHR_TRAILING_BYTE_MINIMUM 0x40
-
-// We need to roll our own memchr to handle cases where the encoding changes and
-// we need to search for a character in a buffer that could be the trailing byte
-// of a multibyte character.
-void *
-yp_memchr(const void *memory, int character, size_t number, bool encoding_changed, yp_encoding_t *encoding) {
-    if (encoding_changed && encoding->multibyte && character >= YP_MEMCHR_TRAILING_BYTE_MINIMUM) {
-        const uint8_t *source = (const uint8_t *) memory;
-        size_t index = 0;
-
-        while (index < number) {
-            if (source[index] == character) {
-                return (void *) (source + index);
-            }
-
-            size_t width = encoding->char_width(source + index, (ptrdiff_t) (number - index));
-            if (width == 0) {
-                return NULL;
-            }
-
-            index += width;
-        }
-
-        return NULL;
-    } else {
-        return memchr(memory, character, number);
-    }
-}
diff --git a/yarp/util/yp_memchr.h b/yarp/util/yp_memchr.h
deleted file mode 100644
index 97f4b15a839b02..00000000000000
--- a/yarp/util/yp_memchr.h
+++ /dev/null
@@ -1,14 +0,0 @@
-#ifndef YP_MEMCHR_H
-#define YP_MEMCHR_H
-
-#include "yarp/defines.h"
-#include "yarp/enc/yp_encoding.h"
-
-#include <stddef.h>
-
-// We need to roll our own memchr to handle cases where the encoding changes and
-// we need to search for a character in a buffer that could be the trailing byte
-// of a multibyte character.
-void * yp_memchr(const void *source, int character, size_t number, bool encoding_changed, yp_encoding_t *encoding);
-
-#endif
diff --git a/yarp/util/yp_newline_list.c b/yarp/util/yp_newline_list.c
deleted file mode 100644
index 969b8845605019..00000000000000
--- a/yarp/util/yp_newline_list.c
+++ /dev/null
@@ -1,134 +0,0 @@
-#include "yarp/util/yp_newline_list.h"
-
-// Initialize a new newline list with the given capacity. Returns true if the
-// allocation of the offsets succeeds, otherwise returns false.
-bool
-yp_newline_list_init(yp_newline_list_t *list, const uint8_t *start, size_t capacity) {
-    list->offsets = (size_t *) calloc(capacity, sizeof(size_t));
-    if (list->offsets == NULL) return false;
-
-    list->start = start;
-
-    // This is 1 instead of 0 because we want to include the first line of the
-    // file as having offset 0, which is set because of calloc.
-    list->size = 1;
-    list->capacity = capacity;
-
-    list->last_index = 0;
-    list->last_offset = 0;
-
-    return true;
-}
-
-// Append a new offset to the newline list. Returns true if the reallocation of
-// the offsets succeeds (if one was necessary), otherwise returns false.
-bool
-yp_newline_list_append(yp_newline_list_t *list, const uint8_t *cursor) {
-    if (list->size == list->capacity) {
-        size_t *original_offsets = list->offsets;
-
-        list->capacity = (list->capacity * 3) / 2;
-        list->offsets = (size_t *) calloc(list->capacity, sizeof(size_t));
-        memcpy(list->offsets, original_offsets, list->size * sizeof(size_t));
-        free(original_offsets);
-        if (list->offsets == NULL) return false;
-    }
-
-    assert(*cursor == '\n');
-    assert(cursor >= list->start);
-    size_t newline_offset = (size_t) (cursor - list->start + 1);
-
-    assert(list->size == 0 || newline_offset > list->offsets[list->size - 1]);
-    list->offsets[list->size++] = newline_offset;
-
-    return true;
-}
-
-// Conditionally append a new offset to the newline list, if the value passed in is a newline.
-bool
-yp_newline_list_check_append(yp_newline_list_t *list, const uint8_t *cursor) {
-    if (*cursor != '\n') {
-        return true;
-    }
-    return yp_newline_list_append(list, cursor);
-}
-
-// Returns the line and column of the given offset, assuming we don't have any
-// information about the previous index that we found.
-static yp_line_column_t
-yp_newline_list_line_column_search(yp_newline_list_t *list, size_t offset) {
-    size_t left = 0;
-    size_t right = list->size - 1;
-
-    while (left <= right) {
-        size_t mid = left + (right - left) / 2;
-
-        if (list->offsets[mid] == offset) {
-            return ((yp_line_column_t) { mid, 0 });
-        }
-
-        if (list->offsets[mid] < offset) {
-            left = mid + 1;
-        } else {
-            right = mid - 1;
-        }
-    }
-
-    return ((yp_line_column_t) { left - 1, offset - list->offsets[left - 1] });
-}
-
-// Returns the line and column of the given offset, assuming we know the last
-// index that we found.
-static yp_line_column_t
-yp_newline_list_line_column_scan(yp_newline_list_t *list, size_t offset) {
-    if (offset > list->last_offset) {
-        size_t index = list->last_index;
-        while (index < list->size && list->offsets[index] < offset) {
-            index++;
-        }
-
-        if (index == list->size) {
-            return ((yp_line_column_t) { index - 1, offset - list->offsets[index - 1] });
-        }
-
-        return ((yp_line_column_t) { index, 0 });
-    } else {
-        size_t index = list->last_index;
-        while (index > 0 && list->offsets[index] > offset) {
-            index--;
-        }
-
-        if (index == 0) {
-            return ((yp_line_column_t) { 0, offset });
-        }
-
-        return ((yp_line_column_t) { index, offset - list->offsets[index - 1] });
-    }
-}
-
-// Returns the line and column of the given offset. If the offset is not in the
-// list, the line and column of the closest offset less than the given offset
-// are returned.
-yp_line_column_t
-yp_newline_list_line_column(yp_newline_list_t *list, const uint8_t *cursor) {
-    assert(cursor >= list->start);
-    size_t offset = (size_t) (cursor - list->start);
-    yp_line_column_t result;
-
-    if (list->last_offset == 0) {
-        result = yp_newline_list_line_column_search(list, offset);
-    } else {
-        result = yp_newline_list_line_column_scan(list, offset);
-    }
-
-    list->last_index = result.line;
-    list->last_offset = offset;
-
-    return result;
-}
-
-// Free the internal memory allocated for the newline list.
-void
-yp_newline_list_free(yp_newline_list_t *list) {
-    free(list->offsets);
-}
diff --git a/yarp/util/yp_newline_list.h b/yarp/util/yp_newline_list.h
deleted file mode 100644
index 92313050084dc3..00000000000000
--- a/yarp/util/yp_newline_list.h
+++ /dev/null
@@ -1,61 +0,0 @@
-// When compiling the syntax tree, it's necessary to know the line and column
-// of many nodes. This is necessary to support things like error messages,
-// tracepoints, etc.
-//
-// It's possible that we could store the start line, start column, end line, and
-// end column on every node in addition to the offsets that we already store,
-// but that would be quite a lot of memory overhead.
-
-#ifndef YP_NEWLINE_LIST_H
-#define YP_NEWLINE_LIST_H
-
-#include "yarp/defines.h"
-
-#include <assert.h>
-#include <stdbool.h>
-#include <stddef.h>
-#include <stdlib.h>
-
-// A list of offsets of newlines in a string. The offsets are assumed to be
-// sorted/inserted in ascending order.
-typedef struct {
-    const uint8_t *start;
-
-    size_t *offsets;
-    size_t size;
-    size_t capacity;
-
-    size_t last_offset;
-    size_t last_index;
-} yp_newline_list_t;
-
-// A line and column in a string.
-typedef struct {
-    size_t line;
-    size_t column;
-} yp_line_column_t;
-
-#define YP_NEWLINE_LIST_EMPTY ((yp_newline_list_t) { \
-    .start = NULL, .offsets = NULL, .size = 0, .capacity = 0, .last_offset = 0, .last_index = 0 \
-})
-
-// Initialize a new newline list with the given capacity. Returns true if the
-// allocation of the offsets succeeds, otherwise returns false.
-bool yp_newline_list_init(yp_newline_list_t *list, const uint8_t *start, size_t capacity);
-
-// Append a new offset to the newline list. Returns true if the reallocation of
-// the offsets succeeds (if one was necessary), otherwise returns false.
-bool yp_newline_list_append(yp_newline_list_t *list, const uint8_t *cursor);
-
-// Conditionally append a new offset to the newline list, if the value passed in is a newline.
-bool yp_newline_list_check_append(yp_newline_list_t *list, const uint8_t *cursor);
-
-// Returns the line and column of the given offset. If the offset is not in the
-// list, the line and column of the closest offset less than the given offset
-// are returned.
-yp_line_column_t yp_newline_list_line_column(yp_newline_list_t *list, const uint8_t *cursor);
-
-// Free the internal memory allocated for the newline list.
-void yp_newline_list_free(yp_newline_list_t *list);
-
-#endif
diff --git a/yarp/util/yp_state_stack.c b/yarp/util/yp_state_stack.c
deleted file mode 100644
index 7ff95bd61166a5..00000000000000
--- a/yarp/util/yp_state_stack.c
+++ /dev/null
@@ -1,19 +0,0 @@
-#include "yarp/util/yp_state_stack.h"
-
-// Pushes a value onto the stack.
-void
-yp_state_stack_push(yp_state_stack_t *stack, bool value) {
-    *stack = (*stack << 1) | (value & 1);
-}
-
-// Pops a value off the stack.
-void
-yp_state_stack_pop(yp_state_stack_t *stack) {
-    *stack >>= 1;
-}
-
-// Returns the value at the top of the stack.
-bool
-yp_state_stack_p(yp_state_stack_t *stack) {
-    return *stack & 1;
-}
diff --git a/yarp/util/yp_state_stack.h b/yarp/util/yp_state_stack.h
deleted file mode 100644
index 69d8d7d54b4322..00000000000000
--- a/yarp/util/yp_state_stack.h
+++ /dev/null
@@ -1,24 +0,0 @@
-#ifndef YP_STATE_STACK_H
-#define YP_STATE_STACK_H
-
-#include "yarp/defines.h"
-
-#include <stdbool.h>
-#include <stdint.h>
-
-// A struct that represents a stack of bools.
-typedef uint32_t yp_state_stack_t;
-
-// Initializes the state stack to an empty stack.
-#define YP_STATE_STACK_EMPTY ((yp_state_stack_t) 0)
-
-// Pushes a value onto the stack.
-void yp_state_stack_push(yp_state_stack_t *stack, bool value);
-
-// Pops a value off the stack.
-void yp_state_stack_pop(yp_state_stack_t *stack);
-
-// Returns the value at the top of the stack.
-bool yp_state_stack_p(yp_state_stack_t *stack);
-
-#endif
diff --git a/yarp/util/yp_string.c b/yarp/util/yp_string.c
deleted file mode 100644
index 9ee25155a3bdfb..00000000000000
--- a/yarp/util/yp_string.c
+++ /dev/null
@@ -1,200 +0,0 @@
-#include "yarp/util/yp_string.h"
-
-// The following headers are necessary to read files using demand paging.
-#ifdef _WIN32
-#include <windows.h>
-#else
-#include <fcntl.h>
-#include <sys/mman.h>
-#include <sys/stat.h>
-#include <unistd.h>
-#endif
-
-// Initialize a shared string that is based on initial input.
-void
-yp_string_shared_init(yp_string_t *string, const uint8_t *start, const uint8_t *end) {
-    assert(start <= end);
-
-    *string = (yp_string_t) {
-        .type = YP_STRING_SHARED,
-        .source = start,
-        .length = (size_t) (end - start)
-    };
-}
-
-// Initialize an owned string that is responsible for freeing allocated memory.
-void
-yp_string_owned_init(yp_string_t *string, uint8_t *source, size_t length) {
-    *string = (yp_string_t) {
-        .type = YP_STRING_OWNED,
-        .source = source,
-        .length = length
-    };
-}
-
-// Initialize a constant string that doesn't own its memory source.
-void
-yp_string_constant_init(yp_string_t *string, const char *source, size_t length) {
-    *string = (yp_string_t) {
-        .type = YP_STRING_CONSTANT,
-        .source = (const uint8_t *) source,
-        .length = length
-    };
-}
-
-static void
-yp_string_mapped_init_internal(yp_string_t *string, uint8_t *source, size_t length) {
-    *string = (yp_string_t) {
-        .type = YP_STRING_MAPPED,
-        .source = source,
-        .length = length
-    };
-}
-
-// Returns the memory size associated with the string.
-size_t
-yp_string_memsize(const yp_string_t *string) {
-    size_t size = sizeof(yp_string_t);
-    if (string->type == YP_STRING_OWNED) {
-        size += string->length;
-    }
-    return size;
-}
-
-// Ensure the string is owned. If it is not, then reinitialize it as owned and
-// copy over the previous source.
-void
-yp_string_ensure_owned(yp_string_t *string) {
-    if (string->type == YP_STRING_OWNED) return;
-
-    size_t length = yp_string_length(string);
-    const uint8_t *source = yp_string_source(string);
-
-    uint8_t *memory = malloc(length);
-    if (!memory) return;
-
-    yp_string_owned_init(string, memory, length);
-    memcpy((void *) string->source, source, length);
-}
-
-// Returns the length associated with the string.
-YP_EXPORTED_FUNCTION size_t
-yp_string_length(const yp_string_t *string) {
-    return string->length;
-}
-
-// Returns the start pointer associated with the string.
-YP_EXPORTED_FUNCTION const uint8_t *
-yp_string_source(const yp_string_t *string) {
-    return string->source;
-}
-
-// Free the associated memory of the given string.
-YP_EXPORTED_FUNCTION void
-yp_string_free(yp_string_t *string) {
-    void *memory = (void *) string->source;
-
-    if (string->type == YP_STRING_OWNED) {
-        free(memory);
-    } else if (string->type == YP_STRING_MAPPED && string->length) {
-#if defined(_WIN32)
-        UnmapViewOfFile(memory);
-#else
-        munmap(memory, string->length);
-#endif
-    }
-}
-
-bool
-yp_string_mapped_init(yp_string_t *string, const char *filepath) {
-#ifdef _WIN32
-    // Open the file for reading.
-    HANDLE file = CreateFile(filepath, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL);
-
-    if (file == INVALID_HANDLE_VALUE) {
-        perror("CreateFile failed");
-        return false;
-    }
-
-    // Get the file size.
-    DWORD file_size = GetFileSize(file, NULL);
-    if (file_size == INVALID_FILE_SIZE) {
-        CloseHandle(file);
-        perror("GetFileSize failed");
-        return false;
-    }
-
-    // If the file is empty, then we don't need to do anything else, we'll set
-    // the source to a constant empty string and return.
-    if (file_size == 0) {
-        CloseHandle(file);
-        uint8_t empty[] = "";
-        yp_string_mapped_init_internal(string, empty, 0);
-        return true;
-    }
-
-    // Create a mapping of the file.
-    HANDLE mapping = CreateFileMapping(file, NULL, PAGE_READONLY, 0, 0, NULL);
-    if (mapping == NULL) {
-        CloseHandle(file);
-        perror("CreateFileMapping failed");
-        return false;
-    }
-
-    // Map the file into memory.
-    uint8_t *source = (uint8_t *) MapViewOfFile(mapping, FILE_MAP_READ, 0, 0, 0);
-    CloseHandle(mapping);
-    CloseHandle(file);
-
-    if (source == NULL) {
-        perror("MapViewOfFile failed");
-        return false;
-    }
-
-    yp_string_mapped_init_internal(string, source, (size_t) file_size);
-    return true;
-#else
-    // Open the file for reading
-    int fd = open(filepath, O_RDONLY);
-    if (fd == -1) {
-        perror("open");
-        return false;
-    }
-
-    // Stat the file to get the file size
-    struct stat sb;
-    if (fstat(fd, &sb) == -1) {
-        close(fd);
-        perror("fstat");
-        return false;
-    }
-
-    // mmap the file descriptor to virtually get the contents
-    size_t size = (size_t) sb.st_size;
-    uint8_t *source = NULL;
-
-    if (size == 0) {
-        close(fd);
-        uint8_t empty[] = "";
-        yp_string_mapped_init_internal(string, empty, 0);
-        return true;
-    }
-
-    source = mmap(NULL, size, PROT_READ, MAP_PRIVATE, fd, 0);
-    if (source == MAP_FAILED) {
-        perror("Map failed");
-        return false;
-    }
-
-    close(fd);
-    yp_string_mapped_init_internal(string, source, size);
-    return true;
-#endif
-}
-
-// Returns the size of the yp_string_t struct. This is necessary to allocate the
-// correct amount of memory in the FFI backend.
-YP_EXPORTED_FUNCTION size_t
-yp_string_sizeof(void) {
-    return sizeof(yp_string_t);
-}
diff --git a/yarp/util/yp_string.h b/yarp/util/yp_string.h
deleted file mode 100644
index bcdf8b66d99c60..00000000000000
--- a/yarp/util/yp_string.h
+++ /dev/null
@@ -1,61 +0,0 @@
-#ifndef YARP_STRING_H
-#define YARP_STRING_H
-
-#include "yarp/defines.h"
-
-#include <assert.h>
-#include <stdbool.h>
-#include <stddef.h>
-#include <stdlib.h>
-#include <string.h>
-
-// This struct represents a string value.
-typedef struct {
-    enum { YP_STRING_SHARED, YP_STRING_OWNED, YP_STRING_CONSTANT, YP_STRING_MAPPED } type;
-    const uint8_t *source;
-    size_t length;
-} yp_string_t;
-
-#define YP_EMPTY_STRING ((yp_string_t) { .type = YP_STRING_CONSTANT, .source = NULL, .length = 0 })
-
-// Initialize a shared string that is based on initial input.
-void yp_string_shared_init(yp_string_t *string, const uint8_t *start, const uint8_t *end);
-
-// Initialize an owned string that is responsible for freeing allocated memory.
-void yp_string_owned_init(yp_string_t *string, uint8_t *source, size_t length);
-
-// Initialize a constant string that doesn't own its memory source.
-void yp_string_constant_init(yp_string_t *string, const char *source, size_t length);
-
-// Read the file indicated by the filepath parameter into source and load its
-// contents and size into the given yp_string_t.
-// The given yp_string_t should be freed using yp_string_free() when it is no longer used.
-//
-// We want to use demand paging as much as possible in order to avoid having to
-// read the entire file into memory (which could be detrimental to performance
-// for large files). This means that if we're on windows we'll use
-// `MapViewOfFile`, on POSIX systems that have access to `mmap` we'll use
-// `mmap`, and on other POSIX systems we'll use `read`.
-YP_EXPORTED_FUNCTION bool yp_string_mapped_init(yp_string_t *string, const char *filepath);
-
-// Returns the memory size associated with the string.
-size_t yp_string_memsize(const yp_string_t *string);
-
-// Ensure the string is owned. If it is not, then reinitialize it as owned and
-// copy over the previous source.
-void yp_string_ensure_owned(yp_string_t *string);
-
-// Returns the length associated with the string.
-YP_EXPORTED_FUNCTION size_t yp_string_length(const yp_string_t *string);
-
-// Returns the start pointer associated with the string.
-YP_EXPORTED_FUNCTION const uint8_t * yp_string_source(const yp_string_t *string);
-
-// Free the associated memory of the given string.
-YP_EXPORTED_FUNCTION void yp_string_free(yp_string_t *string);
-
-// Returns the size of the yp_string_t struct. This is necessary to allocate the
-// correct amount of memory in the FFI backend.
-YP_EXPORTED_FUNCTION size_t yp_string_sizeof(void);
-
-#endif // YARP_STRING_H
diff --git a/yarp/util/yp_string_list.c b/yarp/util/yp_string_list.c
deleted file mode 100644
index 3b2b4381c500e6..00000000000000
--- a/yarp/util/yp_string_list.c
+++ /dev/null
@@ -1,29 +0,0 @@
-#include "yarp/util/yp_string_list.h"
-
-// Initialize a yp_string_list_t with its default values.
-void
-yp_string_list_init(yp_string_list_t *string_list) {
-    string_list->strings = (yp_string_t *) malloc(sizeof(yp_string_t));
-    string_list->length = 0;
-    string_list->capacity = 1;
-}
-
-// Append a yp_string_t to the given string list.
-void
-yp_string_list_append(yp_string_list_t *string_list, yp_string_t *string) {
-    if (string_list->length + 1 > string_list->capacity) {
-        yp_string_t *original_string = string_list->strings;
-        string_list->capacity *= 2;
-        string_list->strings = (yp_string_t *) malloc(string_list->capacity * sizeof(yp_string_t));
-        memcpy(string_list->strings, original_string, (string_list->length) * sizeof(yp_string_t));
-        free(original_string);
-    }
-
-    string_list->strings[string_list->length++] = *string;
-}
-
-// Free the memory associated with the string list.
-void
-yp_string_list_free(yp_string_list_t *string_list) {
-    free(string_list->strings);
-}
diff --git a/yarp/util/yp_string_list.h b/yarp/util/yp_string_list.h
deleted file mode 100644
index 0009a27a60cce4..00000000000000
--- a/yarp/util/yp_string_list.h
+++ /dev/null
@@ -1,25 +0,0 @@
-#ifndef YARP_STRING_LIST_H
-#define YARP_STRING_LIST_H
-
-#include "yarp/defines.h"
-#include "yarp/util/yp_string.h"
-
-#include <stddef.h>
-#include <stdlib.h>
-
-typedef struct {
-    yp_string_t *strings;
-    size_t length;
-    size_t capacity;
-} yp_string_list_t;
-
-// Initialize a yp_string_list_t with its default values.
-YP_EXPORTED_FUNCTION void yp_string_list_init(yp_string_list_t *string_list);
-
-// Append a yp_string_t to the given string list.
-void yp_string_list_append(yp_string_list_t *string_list, yp_string_t *string);
-
-// Free the memory associated with the string list.
-YP_EXPORTED_FUNCTION void yp_string_list_free(yp_string_list_t *string_list);
-
-#endif
diff --git a/yarp/util/yp_strncasecmp.c b/yarp/util/yp_strncasecmp.c
deleted file mode 100644
index 1cbaf904f49c73..00000000000000
--- a/yarp/util/yp_strncasecmp.c
+++ /dev/null
@@ -1,17 +0,0 @@
-#include <ctype.h>
-#include <stddef.h>
-#include <stdint.h>
-
-int
-yp_strncasecmp(const uint8_t *string1, const uint8_t *string2, size_t length) {
-    size_t offset = 0;
-    int difference = 0;
-
-    while (offset < length && string1[offset] != '\0') {
-        if (string2[offset] == '\0') return string1[offset];
-        if ((difference = tolower(string1[offset]) - tolower(string2[offset])) != 0) return difference;
-        offset++;
-    }
-
-    return difference;
-}
diff --git a/yarp/util/yp_strpbrk.c b/yarp/util/yp_strpbrk.c
deleted file mode 100644
index 7c0015d2890fcf..00000000000000
--- a/yarp/util/yp_strpbrk.c
+++ /dev/null
@@ -1,66 +0,0 @@
-#include "yarp/util/yp_strpbrk.h"
-
-// This is the slow path that does care about the encoding.
-static inline const uint8_t *
-yp_strpbrk_multi_byte(yp_parser_t *parser, const uint8_t *source, const uint8_t *charset, size_t maximum) {
-    size_t index = 0;
-
-    while (index < maximum) {
-        if (strchr((const char *) charset, source[index]) != NULL) {
-            return source + index;
-        }
-
-        size_t width = parser->encoding.char_width(source + index, (ptrdiff_t) (maximum - index));
-        if (width == 0) {
-            return NULL;
-        }
-
-        index += width;
-    }
-
-    return NULL;
-}
-
-// This is the fast path that does not care about the encoding.
-static inline const uint8_t *
-yp_strpbrk_single_byte(const uint8_t *source, const uint8_t *charset, size_t maximum) {
-    size_t index = 0;
-
-    while (index < maximum) {
-        if (strchr((const char *) charset, source[index]) != NULL) {
-            return source + index;
-        }
-
-        index++;
-    }
-
-    return NULL;
-}
-
-// Here we have rolled our own version of strpbrk. The standard library strpbrk
-// has undefined behavior when the source string is not null-terminated. We want
-// to support strings that are not null-terminated because yp_parse does not
-// have the contract that the string is null-terminated. (This is desirable
-// because it means the extension can call yp_parse with the result of a call to
-// mmap).
-//
-// The standard library strpbrk also does not support passing a maximum length
-// to search. We want to support this for the reason mentioned above, but we
-// also don't want it to stop on null bytes. Ruby actually allows null bytes
-// within strings, comments, regular expressions, etc. So we need to be able to
-// skip past them.
-//
-// Finally, we want to support encodings wherein the charset could contain
-// characters that are trailing bytes of multi-byte characters. For example, in
-// Shift-JIS, the backslash character can be a trailing byte. In that case we
-// need to take a slower path and iterate one multi-byte character at a time.
-const uint8_t *
-yp_strpbrk(yp_parser_t *parser, const uint8_t *source, const uint8_t *charset, ptrdiff_t length) {
-    if (length <= 0) {
-        return NULL;
-    } else if (parser->encoding_changed && parser->encoding.multibyte) {
-        return yp_strpbrk_multi_byte(parser, source, charset, (size_t) length);
-    } else {
-        return yp_strpbrk_single_byte(source, charset, (size_t) length);
-    }
-}
diff --git a/yarp/util/yp_strpbrk.h b/yarp/util/yp_strpbrk.h
deleted file mode 100644
index d0bdd5bec000cc..00000000000000
--- a/yarp/util/yp_strpbrk.h
+++ /dev/null
@@ -1,29 +0,0 @@
-#ifndef YP_STRPBRK_H
-#define YP_STRPBRK_H
-
-#include "yarp/defines.h"
-#include "yarp/parser.h"
-
-#include <stddef.h>
-#include <string.h>
-
-// Here we have rolled our own version of strpbrk. The standard library strpbrk
-// has undefined behavior when the source string is not null-terminated. We want
-// to support strings that are not null-terminated because yp_parse does not
-// have the contract that the string is null-terminated. (This is desirable
-// because it means the extension can call yp_parse with the result of a call to
-// mmap).
-//
-// The standard library strpbrk also does not support passing a maximum length
-// to search. We want to support this for the reason mentioned above, but we
-// also don't want it to stop on null bytes. Ruby actually allows null bytes
-// within strings, comments, regular expressions, etc. So we need to be able to
-// skip past them.
-//
-// Finally, we want to support encodings wherein the charset could contain
-// characters that are trailing bytes of multi-byte characters. For example, in
-// Shift-JIS, the backslash character can be a trailing byte. In that case we
-// need to take a slower path and iterate one multi-byte character at a time.
-const uint8_t * yp_strpbrk(yp_parser_t *parser, const uint8_t *source, const uint8_t *charset, ptrdiff_t length);
-
-#endif
diff --git a/yarp/version.h b/yarp/version.h
deleted file mode 100644
index 60fd830ca7c14b..00000000000000
--- a/yarp/version.h
+++ /dev/null
@@ -1,4 +0,0 @@
-#define YP_VERSION_MAJOR 0
-#define YP_VERSION_MINOR 10
-#define YP_VERSION_PATCH 0
-#define YP_VERSION "0.10.0"
diff --git a/yarp/yarp.c b/yarp/yarp.c
deleted file mode 100644
index 2bce80abade61f..00000000000000
--- a/yarp/yarp.c
+++ /dev/null
@@ -1,13938 +0,0 @@
-#include "yarp.h"
-
-// The YARP version and the serialization format.
-const char *
-yp_version(void) {
-    return YP_VERSION;
-}
-
-// In heredocs, tabs automatically complete up to the next 8 spaces. This is
-// defined in CRuby as TAB_WIDTH.
-#define YP_TAB_WHITESPACE_SIZE 8
-
-// Debugging logging will provide you will additional debugging functions as
-// well as automatically replace some functions with their debugging
-// counterparts.
-#ifndef YP_DEBUG_LOGGING
-#define YP_DEBUG_LOGGING 0
-#endif
-
-#if YP_DEBUG_LOGGING
-
-/******************************************************************************/
-/* Debugging                                                                  */
-/******************************************************************************/
-
-YP_ATTRIBUTE_UNUSED static const char *
-debug_context(yp_context_t context) {
-    switch (context) {
-        case YP_CONTEXT_BEGIN: return "BEGIN";
-        case YP_CONTEXT_CLASS: return "CLASS";
-        case YP_CONTEXT_CASE_IN: return "CASE_IN";
-        case YP_CONTEXT_CASE_WHEN: return "CASE_WHEN";
-        case YP_CONTEXT_DEF: return "DEF";
-        case YP_CONTEXT_DEF_PARAMS: return "DEF_PARAMS";
-        case YP_CONTEXT_DEFAULT_PARAMS: return "DEFAULT_PARAMS";
-        case YP_CONTEXT_ENSURE: return "ENSURE";
-        case YP_CONTEXT_ELSE: return "ELSE";
-        case YP_CONTEXT_ELSIF: return "ELSIF";
-        case YP_CONTEXT_EMBEXPR: return "EMBEXPR";
-        case YP_CONTEXT_BLOCK_BRACES: return "BLOCK_BRACES";
-        case YP_CONTEXT_BLOCK_KEYWORDS: return "BLOCK_KEYWORDS";
-        case YP_CONTEXT_FOR: return "FOR";
-        case YP_CONTEXT_IF: return "IF";
-        case YP_CONTEXT_MAIN: return "MAIN";
-        case YP_CONTEXT_MODULE: return "MODULE";
-        case YP_CONTEXT_PARENS: return "PARENS";
-        case YP_CONTEXT_POSTEXE: return "POSTEXE";
-        case YP_CONTEXT_PREDICATE: return "PREDICATE";
-        case YP_CONTEXT_PREEXE: return "PREEXE";
-        case YP_CONTEXT_RESCUE: return "RESCUE";
-        case YP_CONTEXT_RESCUE_ELSE: return "RESCUE_ELSE";
-        case YP_CONTEXT_SCLASS: return "SCLASS";
-        case YP_CONTEXT_UNLESS: return "UNLESS";
-        case YP_CONTEXT_UNTIL: return "UNTIL";
-        case YP_CONTEXT_WHILE: return "WHILE";
-        case YP_CONTEXT_LAMBDA_BRACES: return "LAMBDA_BRACES";
-        case YP_CONTEXT_LAMBDA_DO_END: return "LAMBDA_DO_END";
-    }
-    return NULL;
-}
-
-YP_ATTRIBUTE_UNUSED static void
-debug_contexts(yp_parser_t *parser) {
-    yp_context_node_t *context_node = parser->current_context;
-    fprintf(stderr, "CONTEXTS: ");
-
-    if (context_node != NULL) {
-        while (context_node != NULL) {
-            fprintf(stderr, "%s", debug_context(context_node->context));
-            context_node = context_node->prev;
-            if (context_node != NULL) {
-                fprintf(stderr, " <- ");
-            }
-        }
-    } else {
-        fprintf(stderr, "NONE");
-    }
-
-    fprintf(stderr, "\n");
-}
-
-YP_ATTRIBUTE_UNUSED static void
-debug_node(const char *message, yp_parser_t *parser, yp_node_t *node) {
-    yp_buffer_t buffer;
-    if (!yp_buffer_init(&buffer)) return;
-
-    yp_prettyprint(parser, node, &buffer);
-
-    fprintf(stderr, "%s\n%.*s\n", message, (int) buffer.length, buffer.value);
-    yp_buffer_free(&buffer);
-}
-
-YP_ATTRIBUTE_UNUSED static void
-debug_lex_mode(yp_parser_t *parser) {
-    yp_lex_mode_t *lex_mode = parser->lex_modes.current;
-    bool first = true;
-
-    while (lex_mode != NULL) {
-        if (first) {
-            first = false;
-        } else {
-            fprintf(stderr, " <- ");
-        }
-
-        switch (lex_mode->mode) {
-            case YP_LEX_DEFAULT: fprintf(stderr, "DEFAULT"); break;
-            case YP_LEX_EMBEXPR: fprintf(stderr, "EMBEXPR"); break;
-            case YP_LEX_EMBVAR: fprintf(stderr, "EMBVAR"); break;
-            case YP_LEX_HEREDOC: fprintf(stderr, "HEREDOC"); break;
-            case YP_LEX_LIST: fprintf(stderr, "LIST (terminator=%c, interpolation=%d)", lex_mode->as.list.terminator, lex_mode->as.list.interpolation); break;
-            case YP_LEX_REGEXP: fprintf(stderr, "REGEXP (terminator=%c)", lex_mode->as.regexp.terminator); break;
-            case YP_LEX_STRING: fprintf(stderr, "STRING (terminator=%c, interpolation=%d)", lex_mode->as.string.terminator, lex_mode->as.string.interpolation); break;
-        }
-
-        lex_mode = lex_mode->prev;
-    }
-
-    fprintf(stderr, "\n");
-}
-
-YP_ATTRIBUTE_UNUSED static void
-debug_state(yp_parser_t *parser) {
-    fprintf(stderr, "STATE: ");
-    bool first = true;
-
-    if (parser->lex_state == YP_LEX_STATE_NONE) {
-        fprintf(stderr, "NONE\n");
-        return;
-    }
-
-#define CHECK_STATE(state) \
-    if (parser->lex_state & state) { \
-        if (!first) fprintf(stderr, "|"); \
-        fprintf(stderr, "%s", #state); \
-        first = false; \
-    }
-
-    CHECK_STATE(YP_LEX_STATE_BEG)
-    CHECK_STATE(YP_LEX_STATE_END)
-    CHECK_STATE(YP_LEX_STATE_ENDARG)
-    CHECK_STATE(YP_LEX_STATE_ENDFN)
-    CHECK_STATE(YP_LEX_STATE_ARG)
-    CHECK_STATE(YP_LEX_STATE_CMDARG)
-    CHECK_STATE(YP_LEX_STATE_MID)
-    CHECK_STATE(YP_LEX_STATE_FNAME)
-    CHECK_STATE(YP_LEX_STATE_DOT)
-    CHECK_STATE(YP_LEX_STATE_CLASS)
-    CHECK_STATE(YP_LEX_STATE_LABEL)
-    CHECK_STATE(YP_LEX_STATE_LABELED)
-    CHECK_STATE(YP_LEX_STATE_FITEM)
-
-#undef CHECK_STATE
-
-    fprintf(stderr, "\n");
-}
-
-YP_ATTRIBUTE_UNUSED static void
-debug_token(yp_token_t * token) {
-    fprintf(stderr, "%s: \"%.*s\"\n", yp_token_type_to_str(token->type), (int) (token->end - token->start), token->start);
-}
-
-#endif
-
-/* Macros for min/max.  */
-#define MIN(a,b) (((a)<(b))?(a):(b))
-#define MAX(a,b) (((a)>(b))?(a):(b))
-
-/******************************************************************************/
-/* Lex mode manipulations                                                     */
-/******************************************************************************/
-
-// Returns the incrementor character that should be used to increment the
-// nesting count if one is possible.
-static inline uint8_t
-lex_mode_incrementor(const uint8_t start) {
-    switch (start) {
-        case '(':
-        case '[':
-        case '{':
-        case '<':
-            return start;
-        default:
-            return '\0';
-    }
-}
-
-// Returns the matching character that should be used to terminate a list
-// beginning with the given character.
-static inline uint8_t
-lex_mode_terminator(const uint8_t start) {
-    switch (start) {
-        case '(':
-            return ')';
-        case '[':
-            return ']';
-        case '{':
-            return '}';
-        case '<':
-            return '>';
-        default:
-            return start;
-    }
-}
-
-// Push a new lex state onto the stack. If we're still within the pre-allocated
-// space of the lex state stack, then we'll just use a new slot. Otherwise we'll
-// allocate a new pointer and use that.
-static bool
-lex_mode_push(yp_parser_t *parser, yp_lex_mode_t lex_mode) {
-    lex_mode.prev = parser->lex_modes.current;
-    parser->lex_modes.index++;
-
-    if (parser->lex_modes.index > YP_LEX_STACK_SIZE - 1) {
-        parser->lex_modes.current = (yp_lex_mode_t *) malloc(sizeof(yp_lex_mode_t));
-        if (parser->lex_modes.current == NULL) return false;
-
-        *parser->lex_modes.current = lex_mode;
-    } else {
-        parser->lex_modes.stack[parser->lex_modes.index] = lex_mode;
-        parser->lex_modes.current = &parser->lex_modes.stack[parser->lex_modes.index];
-    }
-
-    return true;
-}
-
-// Push on a new list lex mode.
-static inline bool
-lex_mode_push_list(yp_parser_t *parser, bool interpolation, uint8_t delimiter) {
-    uint8_t incrementor = lex_mode_incrementor(delimiter);
-    uint8_t terminator = lex_mode_terminator(delimiter);
-
-    yp_lex_mode_t lex_mode = {
-        .mode = YP_LEX_LIST,
-        .as.list = {
-            .nesting = 0,
-            .interpolation = interpolation,
-            .incrementor = incrementor,
-            .terminator = terminator
-        }
-    };
-
-    // These are the places where we need to split up the content of the list.
-    // We'll use strpbrk to find the first of these characters.
-    uint8_t *breakpoints = lex_mode.as.list.breakpoints;
-    memcpy(breakpoints, "\\ \t\f\r\v\n\0\0\0", sizeof(lex_mode.as.list.breakpoints));
-
-    // Now we'll add the terminator to the list of breakpoints.
-    size_t index = 7;
-    breakpoints[index++] = terminator;
-
-    // If interpolation is allowed, then we're going to check for the #
-    // character. Otherwise we'll only look for escapes and the terminator.
-    if (interpolation) {
-        breakpoints[index++] = '#';
-    }
-
-    // If there is an incrementor, then we'll check for that as well.
-    if (incrementor != '\0') {
-        breakpoints[index++] = incrementor;
-    }
-
-    return lex_mode_push(parser, lex_mode);
-}
-
-// Push on a new regexp lex mode.
-static inline bool
-lex_mode_push_regexp(yp_parser_t *parser, uint8_t incrementor, uint8_t terminator) {
-    yp_lex_mode_t lex_mode = {
-        .mode = YP_LEX_REGEXP,
-        .as.regexp = {
-            .nesting = 0,
-            .incrementor = incrementor,
-            .terminator = terminator
-        }
-    };
-
-    // These are the places where we need to split up the content of the
-    // regular expression. We'll use strpbrk to find the first of these
-    // characters.
-    uint8_t *breakpoints = lex_mode.as.regexp.breakpoints;
-    memcpy(breakpoints, "\n\\#\0\0", sizeof(lex_mode.as.regexp.breakpoints));
-
-    // First we'll add the terminator.
-    breakpoints[3] = terminator;
-
-    // Next, if there is an incrementor, then we'll check for that as well.
-    if (incrementor != '\0') {
-        breakpoints[4] = incrementor;
-    }
-
-    return lex_mode_push(parser, lex_mode);
-}
-
-// Push on a new string lex mode.
-static inline bool
-lex_mode_push_string(yp_parser_t *parser, bool interpolation, bool label_allowed, uint8_t incrementor, uint8_t terminator) {
-    yp_lex_mode_t lex_mode = {
-        .mode = YP_LEX_STRING,
-        .as.string = {
-            .nesting = 0,
-            .interpolation = interpolation,
-            .label_allowed = label_allowed,
-            .incrementor = incrementor,
-            .terminator = terminator
-        }
-    };
-
-    // These are the places where we need to split up the content of the
-    // string. We'll use strpbrk to find the first of these characters.
-    uint8_t *breakpoints = lex_mode.as.string.breakpoints;
-    memcpy(breakpoints, "\n\\\0\0\0", sizeof(lex_mode.as.string.breakpoints));
-
-    // Now add in the terminator.
-    size_t index = 2;
-    breakpoints[index++] = terminator;
-
-    // If interpolation is allowed, then we're going to check for the #
-    // character. Otherwise we'll only look for escapes and the terminator.
-    if (interpolation) {
-        breakpoints[index++] = '#';
-    }
-
-    // If we have an incrementor, then we'll add that in as a breakpoint as
-    // well.
-    if (incrementor != '\0') {
-        breakpoints[index++] = incrementor;
-    }
-
-    return lex_mode_push(parser, lex_mode);
-}
-
-// Pop the current lex state off the stack. If we're within the pre-allocated
-// space of the lex state stack, then we'll just decrement the index. Otherwise
-// we'll free the current pointer and use the previous pointer.
-static void
-lex_mode_pop(yp_parser_t *parser) {
-    if (parser->lex_modes.index == 0) {
-        parser->lex_modes.current->mode = YP_LEX_DEFAULT;
-    } else if (parser->lex_modes.index < YP_LEX_STACK_SIZE) {
-        parser->lex_modes.index--;
-        parser->lex_modes.current = &parser->lex_modes.stack[parser->lex_modes.index];
-    } else {
-        parser->lex_modes.index--;
-        yp_lex_mode_t *prev = parser->lex_modes.current->prev;
-        free(parser->lex_modes.current);
-        parser->lex_modes.current = prev;
-    }
-}
-
-// This is the equivalent of IS_lex_state is CRuby.
-static inline bool
-lex_state_p(yp_parser_t *parser, yp_lex_state_t state) {
-    return parser->lex_state & state;
-}
-
-typedef enum {
-    YP_IGNORED_NEWLINE_NONE = 0,
-    YP_IGNORED_NEWLINE_ALL,
-    YP_IGNORED_NEWLINE_PATTERN
-} yp_ignored_newline_type_t;
-
-static inline yp_ignored_newline_type_t
-lex_state_ignored_p(yp_parser_t *parser) {
-    bool ignored = lex_state_p(parser, YP_LEX_STATE_BEG | YP_LEX_STATE_CLASS | YP_LEX_STATE_FNAME | YP_LEX_STATE_DOT) && !lex_state_p(parser, YP_LEX_STATE_LABELED);
-
-    if (ignored) {
-        return YP_IGNORED_NEWLINE_ALL;
-    } else if ((parser->lex_state & ~((unsigned int) YP_LEX_STATE_LABEL)) == (YP_LEX_STATE_ARG | YP_LEX_STATE_LABELED)) {
-        return YP_IGNORED_NEWLINE_PATTERN;
-    } else {
-        return YP_IGNORED_NEWLINE_NONE;
-    }
-}
-
-static inline bool
-lex_state_beg_p(yp_parser_t *parser) {
-    return lex_state_p(parser, YP_LEX_STATE_BEG_ANY) || (parser->lex_state == (YP_LEX_STATE_ARG | YP_LEX_STATE_LABELED));
-}
-
-static inline bool
-lex_state_arg_p(yp_parser_t *parser) {
-    return lex_state_p(parser, YP_LEX_STATE_ARG_ANY);
-}
-
-static inline bool
-lex_state_spcarg_p(yp_parser_t *parser, bool space_seen) {
-    if (parser->current.end >= parser->end) {
-        return false;
-    }
-    return lex_state_arg_p(parser) && space_seen && !yp_char_is_whitespace(*parser->current.end);
-}
-
-static inline bool
-lex_state_end_p(yp_parser_t *parser) {
-    return lex_state_p(parser, YP_LEX_STATE_END_ANY);
-}
-
-// This is the equivalent of IS_AFTER_OPERATOR in CRuby.
-static inline bool
-lex_state_operator_p(yp_parser_t *parser) {
-    return lex_state_p(parser, YP_LEX_STATE_FNAME | YP_LEX_STATE_DOT);
-}
-
-// Set the state of the lexer. This is defined as a function to be able to put a breakpoint in it.
-static inline void
-lex_state_set(yp_parser_t *parser, yp_lex_state_t state) {
-    parser->lex_state = state;
-}
-
-#if YP_DEBUG_LOGGING
-static inline void
-debug_lex_state_set(yp_parser_t *parser, yp_lex_state_t state, char const * caller_name, int line_number) {
-    fprintf(stderr, "Caller: %s:%d\nPrevious: ", caller_name, line_number);
-    debug_state(parser);
-    lex_state_set(parser, state);
-    fprintf(stderr, "Now: ");
-    debug_state(parser);
-    fprintf(stderr, "\n");
-}
-
-#define lex_state_set(parser, state) debug_lex_state_set(parser, state, __func__, __LINE__)
-#endif
-
-/******************************************************************************/
-/* Node-related functions                                                     */
-/******************************************************************************/
-
-// Retrieve the constant pool id for the given location.
-static inline yp_constant_id_t
-yp_parser_constant_id_location(yp_parser_t *parser, const uint8_t *start, const uint8_t *end) {
-    return yp_constant_pool_insert(&parser->constant_pool, start, (size_t) (end - start));
-}
-
-// Retrieve the constant pool id for the given token.
-static inline yp_constant_id_t
-yp_parser_constant_id_token(yp_parser_t *parser, const yp_token_t *token) {
-    return yp_parser_constant_id_location(parser, token->start, token->end);
-}
-
-// Retrieve the constant pool id for the given token. If the token is not
-// provided, then return 0.
-static inline yp_constant_id_t
-yp_parser_optional_constant_id_token(yp_parser_t *parser, const yp_token_t *token) {
-    return token->type == YP_TOKEN_NOT_PROVIDED ? 0 : yp_parser_constant_id_token(parser, token);
-}
-
-// Mark any range nodes in this subtree as flipflops.
-static void
-yp_flip_flop(yp_node_t *node) {
-    switch (YP_NODE_TYPE(node)) {
-        case YP_AND_NODE: {
-            yp_and_node_t *cast = (yp_and_node_t *) node;
-            yp_flip_flop(cast->left);
-            yp_flip_flop(cast->right);
-            break;
-        }
-        case YP_OR_NODE: {
-            yp_or_node_t *cast = (yp_or_node_t *) node;
-            yp_flip_flop(cast->left);
-            yp_flip_flop(cast->right);
-            break;
-        }
-        case YP_PARENTHESES_NODE: {
-            yp_parentheses_node_t *cast = (yp_parentheses_node_t *) node;
-
-            if ((cast->body != NULL) && YP_NODE_TYPE_P(cast->body, YP_STATEMENTS_NODE)) {
-                yp_statements_node_t *statements = (yp_statements_node_t *) cast->body;
-                if (statements->body.size == 1) yp_flip_flop(statements->body.nodes[0]);
-            }
-
-            break;
-        }
-        case YP_RANGE_NODE: {
-            yp_range_node_t *cast = (yp_range_node_t *) node;
-            if (cast->left) {
-                yp_flip_flop(cast->left);
-            }
-            if (cast->right) {
-                yp_flip_flop(cast->right);
-            }
-
-            // Here we change the range node into a flip flop node. We can do
-            // this since the nodes are exactly the same except for the type.
-            assert(sizeof(yp_range_node_t) == sizeof(yp_flip_flop_node_t));
-            node->type = YP_FLIP_FLOP_NODE;
-
-            break;
-        }
-        default:
-            break;
-    }
-}
-
-// In a lot of places in the tree you can have tokens that are not provided but
-// that do not cause an error. For example, in a method call without
-// parentheses. In these cases we set the token to the "not provided" type. For
-// example:
-//
-//     yp_token_t token;
-//     not_provided(&token, parser->previous.end);
-//
-static inline yp_token_t
-not_provided(yp_parser_t *parser) {
-    return (yp_token_t) { .type = YP_TOKEN_NOT_PROVIDED, .start = parser->start, .end = parser->start };
-}
-
-#define YP_LOCATION_NULL_VALUE(parser) ((yp_location_t) { .start = parser->start, .end = parser->start })
-#define YP_LOCATION_TOKEN_VALUE(token) ((yp_location_t) { .start = (token)->start, .end = (token)->end })
-#define YP_LOCATION_NODE_VALUE(node) ((yp_location_t) { .start = (node)->location.start, .end = (node)->location.end })
-#define YP_LOCATION_NODE_BASE_VALUE(node) ((yp_location_t) { .start = (node)->base.location.start, .end = (node)->base.location.end })
-#define YP_OPTIONAL_LOCATION_NOT_PROVIDED_VALUE ((yp_location_t) { .start = NULL, .end = NULL })
-#define YP_OPTIONAL_LOCATION_TOKEN_VALUE(token) ((token)->type == YP_TOKEN_NOT_PROVIDED ? YP_OPTIONAL_LOCATION_NOT_PROVIDED_VALUE : YP_LOCATION_TOKEN_VALUE(token))
-#define YP_TOKEN_NOT_PROVIDED_VALUE(parser) ((yp_token_t) { .type = YP_TOKEN_NOT_PROVIDED, .start = (parser)->start, .end = (parser)->start })
-
-// This is a special out parameter to the parse_arguments_list function that
-// includes opening and closing parentheses in addition to the arguments since
-// it's so common. It is handy to use when passing argument information to one
-// of the call node creation functions.
-typedef struct {
-    yp_location_t opening_loc;
-    yp_arguments_node_t *arguments;
-    yp_location_t closing_loc;
-    yp_block_node_t *block;
-
-    // This boolean is used to tell if there is an implicit block (i.e., an
-    // argument passed with an & operator).
-    bool implicit_block;
-} yp_arguments_t;
-
-#define YP_EMPTY_ARGUMENTS ((yp_arguments_t) {              \
-    .opening_loc = YP_OPTIONAL_LOCATION_NOT_PROVIDED_VALUE, \
-    .arguments = NULL,                                      \
-    .closing_loc = YP_OPTIONAL_LOCATION_NOT_PROVIDED_VALUE, \
-    .block = NULL,                                          \
-    .implicit_block = false                                 \
-})
-
-// Check that the set of arguments parsed for a given node is valid. This means
-// checking that we don't have both an implicit and explicit block.
-static void
-yp_arguments_validate(yp_parser_t *parser, yp_arguments_t *arguments) {
-    if (arguments->block != NULL && arguments->implicit_block) {
-        yp_diagnostic_list_append(
-            &parser->error_list,
-            arguments->block->base.location.start,
-            arguments->block->base.location.end,
-            "both block arg and actual block given"
-        );
-    }
-}
-
-/******************************************************************************/
-/* Scope node functions                                                       */
-/******************************************************************************/
-
-// Generate a scope node from the given node.
-void
-yp_scope_node_init(yp_node_t *node, yp_scope_node_t *scope) {
-    scope->base.type = YP_SCOPE_NODE;
-    scope->base.location.start = node->location.start;
-    scope->base.location.end = node->location.end;
-
-    scope->parameters = NULL;
-    scope->body = NULL;
-    yp_constant_id_list_init(&scope->locals);
-
-    switch (YP_NODE_TYPE(node)) {
-        case YP_BLOCK_NODE: {
-            yp_block_node_t *cast = (yp_block_node_t *) node;
-            if (cast->parameters) scope->parameters = cast->parameters->parameters;
-            scope->body = cast->body;
-            scope->locals = cast->locals;
-            break;
-        }
-        case YP_CLASS_NODE: {
-            yp_class_node_t *cast = (yp_class_node_t *) node;
-            scope->body = cast->body;
-            scope->locals = cast->locals;
-            break;
-        }
-        case YP_DEF_NODE: {
-            yp_def_node_t *cast = (yp_def_node_t *) node;
-            scope->parameters = cast->parameters;
-            scope->body = cast->body;
-            scope->locals = cast->locals;
-            break;
-        }
-        case YP_LAMBDA_NODE: {
-            yp_lambda_node_t *cast = (yp_lambda_node_t *) node;
-            if (cast->parameters) scope->parameters = cast->parameters->parameters;
-            scope->body = cast->body;
-            scope->locals = cast->locals;
-            break;
-        }
-        case YP_MODULE_NODE: {
-            yp_module_node_t *cast = (yp_module_node_t *) node;
-            scope->body = cast->body;
-            scope->locals = cast->locals;
-            break;
-        }
-        case YP_PROGRAM_NODE: {
-            yp_program_node_t *cast = (yp_program_node_t *) node;
-            scope->body = (yp_node_t *) cast->statements;
-            scope->locals = cast->locals;
-            break;
-        }
-        case YP_SINGLETON_CLASS_NODE: {
-            yp_singleton_class_node_t *cast = (yp_singleton_class_node_t *) node;
-            scope->body = cast->body;
-            scope->locals = cast->locals;
-            break;
-        }
-        default:
-            assert(false && "unreachable");
-            break;
-    }
-}
-
-/******************************************************************************/
-/* Node creation functions                                                    */
-/******************************************************************************/
-
-// Parse the decimal number represented by the range of bytes. returns
-// UINT32_MAX if the number fails to parse. This function assumes that the range
-// of bytes has already been validated to contain only decimal digits.
-static uint32_t
-parse_decimal_number(yp_parser_t *parser, const uint8_t *start, const uint8_t *end) {
-    ptrdiff_t diff = end - start;
-    assert(diff > 0 && ((unsigned long) diff < SIZE_MAX));
-    size_t length = (size_t) diff;
-
-    char *digits = calloc(length + 1, sizeof(char));
-    memcpy(digits, start, length);
-    digits[length] = '\0';
-
-    char *endptr;
-    errno = 0;
-    unsigned long value = strtoul(digits, &endptr, 10);
-
-    if ((digits == endptr) || (*endptr != '\0') || (errno == ERANGE)) {
-        yp_diagnostic_list_append(&parser->error_list, start, end, "invalid decimal number");
-        value = UINT32_MAX;
-    }
-
-    free(digits);
-
-    if (value > UINT32_MAX) {
-        yp_diagnostic_list_append(&parser->error_list, start, end, "invalid decimal number");
-        value = UINT32_MAX;
-    }
-
-    return (uint32_t) value;
-}
-
-// Parse out the options for a regular expression.
-static inline yp_node_flags_t
-yp_regular_expression_flags_create(const yp_token_t *closing) {
-    yp_node_flags_t flags = 0;
-
-    if (closing->type == YP_TOKEN_REGEXP_END) {
-        for (const uint8_t *flag = closing->start + 1; flag < closing->end; flag++) {
-            switch (*flag) {
-                case 'i': flags |= YP_REGULAR_EXPRESSION_FLAGS_IGNORE_CASE; break;
-                case 'm': flags |= YP_REGULAR_EXPRESSION_FLAGS_MULTI_LINE; break;
-                case 'x': flags |= YP_REGULAR_EXPRESSION_FLAGS_EXTENDED; break;
-                case 'e': flags |= YP_REGULAR_EXPRESSION_FLAGS_EUC_JP; break;
-                case 'n': flags |= YP_REGULAR_EXPRESSION_FLAGS_ASCII_8BIT; break;
-                case 's': flags |= YP_REGULAR_EXPRESSION_FLAGS_WINDOWS_31J; break;
-                case 'u': flags |= YP_REGULAR_EXPRESSION_FLAGS_UTF_8; break;
-                case 'o': flags |= YP_REGULAR_EXPRESSION_FLAGS_ONCE; break;
-                default: assert(false && "unreachable");
-            }
-        }
-    }
-
-    return flags;
-}
-
-// Allocate and initialize a new StatementsNode node.
-static yp_statements_node_t *
-yp_statements_node_create(yp_parser_t *parser);
-
-// Append a new node to the given StatementsNode node's body.
-static void
-yp_statements_node_body_append(yp_statements_node_t *node, yp_node_t *statement);
-
-// This function is here to allow us a place to extend in the future when we
-// implement our own arena allocation.
-static inline void *
-yp_alloc_node(YP_ATTRIBUTE_UNUSED yp_parser_t *parser, size_t size) {
-    void *memory = calloc(1, size);
-    if (memory == NULL) {
-        fprintf(stderr, "Failed to allocate %zu bytes\n", size);
-        abort();
-    }
-    return memory;
-}
-
-#define YP_ALLOC_NODE(parser, type) (type *) yp_alloc_node(parser, sizeof(type))
-
-// Allocate a new MissingNode node.
-static yp_missing_node_t *
-yp_missing_node_create(yp_parser_t *parser, const uint8_t *start, const uint8_t *end) {
-    yp_missing_node_t *node = YP_ALLOC_NODE(parser, yp_missing_node_t);
-    *node = (yp_missing_node_t) {{ .type = YP_MISSING_NODE, .location = { .start = start, .end = end } }};
-    return node;
-}
-
-// Allocate and initialize a new alias node.
-static yp_alias_node_t *
-yp_alias_node_create(yp_parser_t *parser, const yp_token_t *keyword, yp_node_t *new_name, yp_node_t *old_name) {
-    assert(keyword->type == YP_TOKEN_KEYWORD_ALIAS);
-    yp_alias_node_t *node = YP_ALLOC_NODE(parser, yp_alias_node_t);
-
-    *node = (yp_alias_node_t) {
-        {
-            .type = YP_ALIAS_NODE,
-            .location = {
-                .start = keyword->start,
-                .end = old_name->location.end
-            },
-        },
-        .new_name = new_name,
-        .old_name = old_name,
-        .keyword_loc = YP_LOCATION_TOKEN_VALUE(keyword)
-    };
-
-    return node;
-}
-
-// Allocate a new AlternationPatternNode node.
-static yp_alternation_pattern_node_t *
-yp_alternation_pattern_node_create(yp_parser_t *parser, yp_node_t *left, yp_node_t *right, const yp_token_t *operator) {
-    yp_alternation_pattern_node_t *node = YP_ALLOC_NODE(parser, yp_alternation_pattern_node_t);
-
-    *node = (yp_alternation_pattern_node_t) {
-        {
-            .type = YP_ALTERNATION_PATTERN_NODE,
-            .location = {
-                .start = left->location.start,
-                .end = right->location.end
-            },
-        },
-        .left = left,
-        .right = right,
-        .operator_loc = YP_LOCATION_TOKEN_VALUE(operator)
-    };
-
-    return node;
-}
-
-// Allocate and initialize a new and node.
-static yp_and_node_t *
-yp_and_node_create(yp_parser_t *parser, yp_node_t *left, const yp_token_t *operator, yp_node_t *right) {
-    yp_and_node_t *node = YP_ALLOC_NODE(parser, yp_and_node_t);
-
-    *node = (yp_and_node_t) {
-        {
-            .type = YP_AND_NODE,
-            .location = {
-                .start = left->location.start,
-                .end = right->location.end
-            },
-        },
-        .left = left,
-        .operator_loc = YP_LOCATION_TOKEN_VALUE(operator),
-        .right = right
-    };
-
-    return node;
-}
-
-// Allocate an initialize a new arguments node.
-static yp_arguments_node_t *
-yp_arguments_node_create(yp_parser_t *parser) {
-    yp_arguments_node_t *node = YP_ALLOC_NODE(parser, yp_arguments_node_t);
-
-    *node = (yp_arguments_node_t) {
-        {
-            .type = YP_ARGUMENTS_NODE,
-            .location = YP_LOCATION_NULL_VALUE(parser)
-        },
-        .arguments = YP_EMPTY_NODE_LIST
-    };
-
-    return node;
-}
-
-// Return the size of the given arguments node.
-static size_t
-yp_arguments_node_size(yp_arguments_node_t *node) {
-    return node->arguments.size;
-}
-
-// Append an argument to an arguments node.
-static void
-yp_arguments_node_arguments_append(yp_arguments_node_t *node, yp_node_t *argument) {
-    if (yp_arguments_node_size(node) == 0) {
-        node->base.location.start = argument->location.start;
-    }
-
-    node->base.location.end = argument->location.end;
-    yp_node_list_append(&node->arguments, argument);
-}
-
-// Allocate and initialize a new ArrayNode node.
-static yp_array_node_t *
-yp_array_node_create(yp_parser_t *parser, const yp_token_t *opening) {
-    yp_array_node_t *node = YP_ALLOC_NODE(parser, yp_array_node_t);
-
-    *node = (yp_array_node_t) {
-        {
-            .type = YP_ARRAY_NODE,
-            .location = {
-                .start = opening->start,
-                .end = opening->end
-            },
-        },
-        .opening_loc = YP_OPTIONAL_LOCATION_TOKEN_VALUE(opening),
-        .closing_loc = YP_OPTIONAL_LOCATION_TOKEN_VALUE(opening),
-        .elements = YP_EMPTY_NODE_LIST
-    };
-
-    return node;
-}
-
-// Return the size of the given array node.
-static inline size_t
-yp_array_node_size(yp_array_node_t *node) {
-    return node->elements.size;
-}
-
-// Append an argument to an array node.
-static inline void
-yp_array_node_elements_append(yp_array_node_t *node, yp_node_t *element) {
-    if (!node->elements.size && !node->opening_loc.start) {
-        node->base.location.start = element->location.start;
-    }
-    yp_node_list_append(&node->elements, element);
-    node->base.location.end = element->location.end;
-}
-
-// Set the closing token and end location of an array node.
-static void
-yp_array_node_close_set(yp_array_node_t *node, const yp_token_t *closing) {
-    assert(closing->type == YP_TOKEN_BRACKET_RIGHT || closing->type == YP_TOKEN_STRING_END || closing->type == YP_TOKEN_MISSING || closing->type == YP_TOKEN_NOT_PROVIDED);
-    node->base.location.end = closing->end;
-    node->closing_loc = YP_LOCATION_TOKEN_VALUE(closing);
-}
-
-// Allocate and initialize a new array pattern node. The node list given in the
-// nodes parameter is guaranteed to have at least two nodes.
-static yp_array_pattern_node_t *
-yp_array_pattern_node_node_list_create(yp_parser_t *parser, yp_node_list_t *nodes) {
-    yp_array_pattern_node_t *node = YP_ALLOC_NODE(parser, yp_array_pattern_node_t);
-
-    *node = (yp_array_pattern_node_t) {
-        {
-            .type = YP_ARRAY_PATTERN_NODE,
-            .location = {
-                .start = nodes->nodes[0]->location.start,
-                .end = nodes->nodes[nodes->size - 1]->location.end
-            },
-        },
-        .constant = NULL,
-        .rest = NULL,
-        .requireds = YP_EMPTY_NODE_LIST,
-        .posts = YP_EMPTY_NODE_LIST,
-        .opening_loc = YP_OPTIONAL_LOCATION_NOT_PROVIDED_VALUE,
-        .closing_loc = YP_OPTIONAL_LOCATION_NOT_PROVIDED_VALUE
-    };
-
-    // For now we're going to just copy over each pointer manually. This could be
-    // much more efficient, as we could instead resize the node list.
-    bool found_rest = false;
-    for (size_t index = 0; index < nodes->size; index++) {
-        yp_node_t *child = nodes->nodes[index];
-
-        if (!found_rest && YP_NODE_TYPE_P(child, YP_SPLAT_NODE)) {
-            node->rest = child;
-            found_rest = true;
-        } else if (found_rest) {
-            yp_node_list_append(&node->posts, child);
-        } else {
-            yp_node_list_append(&node->requireds, child);
-        }
-    }
-
-    return node;
-}
-
-// Allocate and initialize a new array pattern node from a single rest node.
-static yp_array_pattern_node_t *
-yp_array_pattern_node_rest_create(yp_parser_t *parser, yp_node_t *rest) {
-    yp_array_pattern_node_t *node = YP_ALLOC_NODE(parser, yp_array_pattern_node_t);
-
-    *node = (yp_array_pattern_node_t) {
-        {
-            .type = YP_ARRAY_PATTERN_NODE,
-            .location = rest->location,
-        },
-        .constant = NULL,
-        .rest = rest,
-        .requireds = YP_EMPTY_NODE_LIST,
-        .posts = YP_EMPTY_NODE_LIST,
-        .opening_loc = YP_OPTIONAL_LOCATION_NOT_PROVIDED_VALUE,
-        .closing_loc = YP_OPTIONAL_LOCATION_NOT_PROVIDED_VALUE
-    };
-
-    return node;
-}
-
-// Allocate and initialize a new array pattern node from a constant and opening
-// and closing tokens.
-static yp_array_pattern_node_t *
-yp_array_pattern_node_constant_create(yp_parser_t *parser, yp_node_t *constant, const yp_token_t *opening, const yp_token_t *closing) {
-    yp_array_pattern_node_t *node = YP_ALLOC_NODE(parser, yp_array_pattern_node_t);
-
-    *node = (yp_array_pattern_node_t) {
-        {
-            .type = YP_ARRAY_PATTERN_NODE,
-            .location = {
-                .start = constant->location.start,
-                .end = closing->end
-            },
-        },
-        .constant = constant,
-        .rest = NULL,
-        .opening_loc = YP_LOCATION_TOKEN_VALUE(opening),
-        .closing_loc = YP_LOCATION_TOKEN_VALUE(closing),
-        .requireds = YP_EMPTY_NODE_LIST,
-        .posts = YP_EMPTY_NODE_LIST
-    };
-
-    return node;
-}
-
-// Allocate and initialize a new array pattern node from an opening and closing
-// token.
-static yp_array_pattern_node_t *
-yp_array_pattern_node_empty_create(yp_parser_t *parser, const yp_token_t *opening, const yp_token_t *closing) {
-    yp_array_pattern_node_t *node = YP_ALLOC_NODE(parser, yp_array_pattern_node_t);
-
-    *node = (yp_array_pattern_node_t) {
-        {
-            .type = YP_ARRAY_PATTERN_NODE,
-            .location = {
-                .start = opening->start,
-                .end = closing->end
-            },
-        },
-        .constant = NULL,
-        .rest = NULL,
-        .opening_loc = YP_LOCATION_TOKEN_VALUE(opening),
-        .closing_loc = YP_LOCATION_TOKEN_VALUE(closing),
-        .requireds = YP_EMPTY_NODE_LIST,
-        .posts = YP_EMPTY_NODE_LIST
-    };
-
-    return node;
-}
-
-static inline void
-yp_array_pattern_node_requireds_append(yp_array_pattern_node_t *node, yp_node_t *inner) {
-    yp_node_list_append(&node->requireds, inner);
-}
-
-// Allocate and initialize a new assoc node.
-static yp_assoc_node_t *
-yp_assoc_node_create(yp_parser_t *parser, yp_node_t *key, const yp_token_t *operator, yp_node_t *value) {
-    yp_assoc_node_t *node = YP_ALLOC_NODE(parser, yp_assoc_node_t);
-    const uint8_t *end;
-
-    if (value != NULL) {
-        end = value->location.end;
-    } else if (operator->type != YP_TOKEN_NOT_PROVIDED) {
-        end = operator->end;
-    } else {
-        end = key->location.end;
-    }
-
-    *node = (yp_assoc_node_t) {
-        {
-            .type = YP_ASSOC_NODE,
-            .location = {
-                .start = key->location.start,
-                .end = end
-            },
-        },
-        .key = key,
-        .operator_loc = YP_OPTIONAL_LOCATION_TOKEN_VALUE(operator),
-        .value = value
-    };
-
-    return node;
-}
-
-// Allocate and initialize a new assoc splat node.
-static yp_assoc_splat_node_t *
-yp_assoc_splat_node_create(yp_parser_t *parser, yp_node_t *value, const yp_token_t *operator) {
-    assert(operator->type == YP_TOKEN_USTAR_STAR);
-    yp_assoc_splat_node_t *node = YP_ALLOC_NODE(parser, yp_assoc_splat_node_t);
-
-    *node = (yp_assoc_splat_node_t) {
-        {
-            .type = YP_ASSOC_SPLAT_NODE,
-            .location = {
-                .start = operator->start,
-                .end = value == NULL ? operator->end : value->location.end
-            },
-        },
-        .value = value,
-        .operator_loc = YP_LOCATION_TOKEN_VALUE(operator)
-    };
-
-    return node;
-}
-
-// Allocate a new BackReferenceReadNode node.
-static yp_back_reference_read_node_t *
-yp_back_reference_read_node_create(yp_parser_t *parser, const yp_token_t *name) {
-    assert(name->type == YP_TOKEN_BACK_REFERENCE);
-    yp_back_reference_read_node_t *node = YP_ALLOC_NODE(parser, yp_back_reference_read_node_t);
-
-    *node = (yp_back_reference_read_node_t) {
-        {
-            .type = YP_BACK_REFERENCE_READ_NODE,
-            .location = YP_LOCATION_TOKEN_VALUE(name),
-        }
-    };
-
-    return node;
-}
-
-// Allocate and initialize new a begin node.
-static yp_begin_node_t *
-yp_begin_node_create(yp_parser_t *parser, const yp_token_t *begin_keyword, yp_statements_node_t *statements) {
-    yp_begin_node_t *node = YP_ALLOC_NODE(parser, yp_begin_node_t);
-
-    *node = (yp_begin_node_t) {
-        {
-            .type = YP_BEGIN_NODE,
-            .location = {
-                .start = begin_keyword->start,
-                .end = statements == NULL ? begin_keyword->end : statements->base.location.end
-            },
-        },
-        .begin_keyword_loc = YP_OPTIONAL_LOCATION_TOKEN_VALUE(begin_keyword),
-        .statements = statements,
-        .end_keyword_loc = YP_OPTIONAL_LOCATION_NOT_PROVIDED_VALUE
-    };
-
-    return node;
-}
-
-// Set the rescue clause, optionally start, and end location of a begin node.
-static void
-yp_begin_node_rescue_clause_set(yp_begin_node_t *node, yp_rescue_node_t *rescue_clause) {
-    // If the begin keyword doesn't exist, we set the start on the begin_node
-    if (!node->begin_keyword_loc.start) {
-        node->base.location.start = rescue_clause->base.location.start;
-    }
-    node->base.location.end = rescue_clause->base.location.end;
-    node->rescue_clause = rescue_clause;
-}
-
-// Set the else clause and end location of a begin node.
-static void
-yp_begin_node_else_clause_set(yp_begin_node_t *node, yp_else_node_t *else_clause) {
-    node->base.location.end = else_clause->base.location.end;
-    node->else_clause = else_clause;
-}
-
-// Set the ensure clause and end location of a begin node.
-static void
-yp_begin_node_ensure_clause_set(yp_begin_node_t *node, yp_ensure_node_t *ensure_clause) {
-    node->base.location.end = ensure_clause->base.location.end;
-    node->ensure_clause = ensure_clause;
-}
-
-// Set the end keyword and end location of a begin node.
-static void
-yp_begin_node_end_keyword_set(yp_begin_node_t *node, const yp_token_t *end_keyword) {
-    assert(end_keyword->type == YP_TOKEN_KEYWORD_END || end_keyword->type == YP_TOKEN_MISSING);
-
-    node->base.location.end = end_keyword->end;
-    node->end_keyword_loc = YP_OPTIONAL_LOCATION_TOKEN_VALUE(end_keyword);
-}
-
-// Allocate and initialize a new BlockArgumentNode node.
-static yp_block_argument_node_t *
-yp_block_argument_node_create(yp_parser_t *parser, const yp_token_t *operator, yp_node_t *expression) {
-    yp_block_argument_node_t *node = YP_ALLOC_NODE(parser, yp_block_argument_node_t);
-
-    *node = (yp_block_argument_node_t) {
-        {
-            .type = YP_BLOCK_ARGUMENT_NODE,
-            .location = {
-                .start = operator->start,
-                .end = expression == NULL ? operator->end : expression->location.end
-            },
-        },
-        .expression = expression,
-        .operator_loc = YP_LOCATION_TOKEN_VALUE(operator)
-    };
-
-    return node;
-}
-
-// Allocate and initialize a new BlockNode node.
-static yp_block_node_t *
-yp_block_node_create(yp_parser_t *parser, yp_constant_id_list_t *locals, const yp_token_t *opening, yp_block_parameters_node_t *parameters, yp_node_t *body, const yp_token_t *closing) {
-    yp_block_node_t *node = YP_ALLOC_NODE(parser, yp_block_node_t);
-
-    *node = (yp_block_node_t) {
-        {
-            .type = YP_BLOCK_NODE,
-            .location = { .start = opening->start, .end = closing->end },
-        },
-        .locals = *locals,
-        .parameters = parameters,
-        .body = body,
-        .opening_loc = YP_LOCATION_TOKEN_VALUE(opening),
-        .closing_loc = YP_LOCATION_TOKEN_VALUE(closing)
-    };
-
-    return node;
-}
-
-// Allocate and initialize a new BlockParameterNode node.
-static yp_block_parameter_node_t *
-yp_block_parameter_node_create(yp_parser_t *parser, const yp_token_t *name, const yp_token_t *operator) {
-    assert(operator->type == YP_TOKEN_NOT_PROVIDED || operator->type == YP_TOKEN_UAMPERSAND || operator->type == YP_TOKEN_AMPERSAND);
-    yp_block_parameter_node_t *node = YP_ALLOC_NODE(parser, yp_block_parameter_node_t);
-
-    *node = (yp_block_parameter_node_t) {
-        {
-            .type = YP_BLOCK_PARAMETER_NODE,
-            .location = {
-                .start = operator->start,
-                .end = (name->type == YP_TOKEN_NOT_PROVIDED ? operator->end : name->end)
-            },
-        },
-        .name = yp_parser_optional_constant_id_token(parser, name),
-        .name_loc = YP_OPTIONAL_LOCATION_TOKEN_VALUE(name),
-        .operator_loc = YP_LOCATION_TOKEN_VALUE(operator)
-    };
-
-    return node;
-}
-
-// Allocate and initialize a new BlockParametersNode node.
-static yp_block_parameters_node_t *
-yp_block_parameters_node_create(yp_parser_t *parser, yp_parameters_node_t *parameters, const yp_token_t *opening) {
-    yp_block_parameters_node_t *node = YP_ALLOC_NODE(parser, yp_block_parameters_node_t);
-
-    const uint8_t *start;
-    if (opening->type != YP_TOKEN_NOT_PROVIDED) {
-        start = opening->start;
-    } else if (parameters != NULL) {
-        start = parameters->base.location.start;
-    } else {
-        start = NULL;
-    }
-
-    const uint8_t *end;
-    if (parameters != NULL) {
-        end = parameters->base.location.end;
-    } else if (opening->type != YP_TOKEN_NOT_PROVIDED) {
-        end = opening->end;
-    } else {
-        end = NULL;
-    }
-
-    *node = (yp_block_parameters_node_t) {
-        {
-            .type = YP_BLOCK_PARAMETERS_NODE,
-            .location = {
-                .start = start,
-                .end = end
-            }
-        },
-        .parameters = parameters,
-        .opening_loc = YP_OPTIONAL_LOCATION_TOKEN_VALUE(opening),
-        .closing_loc = { .start = NULL, .end = NULL },
-        .locals = YP_EMPTY_NODE_LIST
-    };
-
-    return node;
-}
-
-// Set the closing location of a BlockParametersNode node.
-static void
-yp_block_parameters_node_closing_set(yp_block_parameters_node_t *node, const yp_token_t *closing) {
-    assert(closing->type == YP_TOKEN_PIPE || closing->type == YP_TOKEN_PARENTHESIS_RIGHT || closing->type == YP_TOKEN_MISSING);
-
-    node->base.location.end = closing->end;
-    node->closing_loc = YP_LOCATION_TOKEN_VALUE(closing);
-}
-
-// Allocate and initialize a new BlockLocalVariableNode node.
-static yp_block_local_variable_node_t *
-yp_block_local_variable_node_create(yp_parser_t *parser, const yp_token_t *name) {
-    assert(name->type == YP_TOKEN_IDENTIFIER || name->type == YP_TOKEN_MISSING);
-    yp_block_local_variable_node_t *node = YP_ALLOC_NODE(parser, yp_block_local_variable_node_t);
-
-    *node = (yp_block_local_variable_node_t) {
-        {
-            .type = YP_BLOCK_LOCAL_VARIABLE_NODE,
-            .location = YP_LOCATION_TOKEN_VALUE(name),
-        },
-        .name = yp_parser_constant_id_token(parser, name)
-    };
-
-    return node;
-}
-
-// Append a new block-local variable to a BlockParametersNode node.
-static void
-yp_block_parameters_node_append_local(yp_block_parameters_node_t *node, const yp_block_local_variable_node_t *local) {
-    yp_node_list_append(&node->locals, (yp_node_t *) local);
-
-    if (node->base.location.start == NULL) node->base.location.start = local->base.location.start;
-    node->base.location.end = local->base.location.end;
-}
-
-// Allocate and initialize a new BreakNode node.
-static yp_break_node_t *
-yp_break_node_create(yp_parser_t *parser, const yp_token_t *keyword, yp_arguments_node_t *arguments) {
-    assert(keyword->type == YP_TOKEN_KEYWORD_BREAK);
-    yp_break_node_t *node = YP_ALLOC_NODE(parser, yp_break_node_t);
-
-    *node = (yp_break_node_t) {
-        {
-            .type = YP_BREAK_NODE,
-            .location = {
-                .start = keyword->start,
-                .end = (arguments == NULL ? keyword->end : arguments->base.location.end)
-            },
-        },
-        .arguments = arguments,
-        .keyword_loc = YP_LOCATION_TOKEN_VALUE(keyword)
-    };
-
-    return node;
-}
-
-// Allocate and initialize a new CallNode node. This sets everything to NULL or
-// YP_TOKEN_NOT_PROVIDED as appropriate such that its values can be overridden
-// in the various specializations of this function.
-static yp_call_node_t *
-yp_call_node_create(yp_parser_t *parser) {
-    yp_call_node_t *node = YP_ALLOC_NODE(parser, yp_call_node_t);
-
-    *node = (yp_call_node_t) {
-        {
-            .type = YP_CALL_NODE,
-            .location = YP_LOCATION_NULL_VALUE(parser),
-        },
-        .receiver = NULL,
-        .call_operator_loc = YP_OPTIONAL_LOCATION_NOT_PROVIDED_VALUE,
-        .message_loc = YP_OPTIONAL_LOCATION_NOT_PROVIDED_VALUE,
-        .opening_loc = YP_OPTIONAL_LOCATION_NOT_PROVIDED_VALUE,
-        .arguments = NULL,
-        .closing_loc = YP_OPTIONAL_LOCATION_NOT_PROVIDED_VALUE,
-        .block = NULL
-    };
-
-    return node;
-}
-
-// Allocate and initialize a new CallNode node from an aref or an aset
-// expression.
-static yp_call_node_t *
-yp_call_node_aref_create(yp_parser_t *parser, yp_node_t *receiver, yp_arguments_t *arguments) {
-    yp_call_node_t *node = yp_call_node_create(parser);
-
-    node->base.location.start = receiver->location.start;
-    if (arguments->block != NULL) {
-        node->base.location.end = arguments->block->base.location.end;
-    } else {
-        node->base.location.end = arguments->closing_loc.end;
-    }
-
-    node->receiver = receiver;
-    node->message_loc.start = arguments->opening_loc.start;
-    node->message_loc.end = arguments->closing_loc.end;
-
-    node->opening_loc = arguments->opening_loc;
-    node->arguments = arguments->arguments;
-    node->closing_loc = arguments->closing_loc;
-    node->block = arguments->block;
-
-    yp_string_constant_init(&node->name, "[]", 2);
-    return node;
-}
-
-// Allocate and initialize a new CallNode node from a binary expression.
-static yp_call_node_t *
-yp_call_node_binary_create(yp_parser_t *parser, yp_node_t *receiver, yp_token_t *operator, yp_node_t *argument) {
-    yp_call_node_t *node = yp_call_node_create(parser);
-
-    node->base.location.start = MIN(receiver->location.start, argument->location.start);
-    node->base.location.end = MAX(receiver->location.end, argument->location.end);
-
-    node->receiver = receiver;
-    node->message_loc = YP_OPTIONAL_LOCATION_TOKEN_VALUE(operator);
-
-    yp_arguments_node_t *arguments = yp_arguments_node_create(parser);
-    yp_arguments_node_arguments_append(arguments, argument);
-    node->arguments = arguments;
-
-    yp_string_shared_init(&node->name, operator->start, operator->end);
-    return node;
-}
-
-// Allocate and initialize a new CallNode node from a call expression.
-static yp_call_node_t *
-yp_call_node_call_create(yp_parser_t *parser, yp_node_t *receiver, yp_token_t *operator, yp_token_t *message, yp_arguments_t *arguments) {
-    yp_call_node_t *node = yp_call_node_create(parser);
-
-    node->base.location.start = receiver->location.start;
-    if (arguments->block != NULL) {
-        node->base.location.end = arguments->block->base.location.end;
-    } else if (arguments->closing_loc.start != NULL) {
-        node->base.location.end = arguments->closing_loc.end;
-    } else if (arguments->arguments != NULL) {
-        node->base.location.end = arguments->arguments->base.location.end;
-    } else {
-        node->base.location.end = message->end;
-    }
-
-    node->receiver = receiver;
-    node->call_operator_loc = YP_OPTIONAL_LOCATION_TOKEN_VALUE(operator);
-    node->message_loc = YP_OPTIONAL_LOCATION_TOKEN_VALUE(message);
-    node->opening_loc = arguments->opening_loc;
-    node->arguments = arguments->arguments;
-    node->closing_loc = arguments->closing_loc;
-    node->block = arguments->block;
-
-    if (operator->type == YP_TOKEN_AMPERSAND_DOT) {
-        node->base.flags |= YP_CALL_NODE_FLAGS_SAFE_NAVIGATION;
-    }
-
-    yp_string_shared_init(&node->name, message->start, message->end);
-    return node;
-}
-
-// Allocate and initialize a new CallNode node from a call to a method name
-// without a receiver that could not have been a local variable read.
-static yp_call_node_t *
-yp_call_node_fcall_create(yp_parser_t *parser, yp_token_t *message, yp_arguments_t *arguments) {
-    yp_call_node_t *node = yp_call_node_create(parser);
-
-    node->base.location.start = message->start;
-    if (arguments->block != NULL) {
-        node->base.location.end = arguments->block->base.location.end;
-    } else if (arguments->closing_loc.start != NULL) {
-        node->base.location.end = arguments->closing_loc.end;
-    } else if (arguments->arguments != NULL) {
-        node->base.location.end = arguments->arguments->base.location.end;
-    } else {
-        node->base.location.end = arguments->closing_loc.end;
-    }
-
-    node->message_loc = YP_OPTIONAL_LOCATION_TOKEN_VALUE(message);
-    node->opening_loc = arguments->opening_loc;
-    node->arguments = arguments->arguments;
-    node->closing_loc = arguments->closing_loc;
-    node->block = arguments->block;
-
-    yp_string_shared_init(&node->name, message->start, message->end);
-    return node;
-}
-
-// Allocate and initialize a new CallNode node from a not expression.
-static yp_call_node_t *
-yp_call_node_not_create(yp_parser_t *parser, yp_node_t *receiver, yp_token_t *message, yp_arguments_t *arguments) {
-    yp_call_node_t *node = yp_call_node_create(parser);
-
-    node->base.location.start = message->start;
-    if (arguments->closing_loc.start != NULL) {
-        node->base.location.end = arguments->closing_loc.end;
-    } else {
-        node->base.location.end = receiver->location.end;
-    }
-
-    node->receiver = receiver;
-    node->message_loc = YP_OPTIONAL_LOCATION_TOKEN_VALUE(message);
-    node->opening_loc = arguments->opening_loc;
-    node->arguments = arguments->arguments;
-    node->closing_loc = arguments->closing_loc;
-
-    yp_string_constant_init(&node->name, "!", 1);
-    return node;
-}
-
-// Allocate and initialize a new CallNode node from a call shorthand expression.
-static yp_call_node_t *
-yp_call_node_shorthand_create(yp_parser_t *parser, yp_node_t *receiver, yp_token_t *operator, yp_arguments_t *arguments) {
-    yp_call_node_t *node = yp_call_node_create(parser);
-
-    node->base.location.start = receiver->location.start;
-    if (arguments->block != NULL) {
-        node->base.location.end = arguments->block->base.location.end;
-    } else {
-        node->base.location.end = arguments->closing_loc.end;
-    }
-
-    node->receiver = receiver;
-    node->call_operator_loc = YP_OPTIONAL_LOCATION_TOKEN_VALUE(operator);
-    node->opening_loc = arguments->opening_loc;
-    node->arguments = arguments->arguments;
-    node->closing_loc = arguments->closing_loc;
-    node->block = arguments->block;
-
-    if (operator->type == YP_TOKEN_AMPERSAND_DOT) {
-        node->base.flags |= YP_CALL_NODE_FLAGS_SAFE_NAVIGATION;
-    }
-
-    yp_string_constant_init(&node->name, "call", 4);
-    return node;
-}
-
-// Allocate and initialize a new CallNode node from a unary operator expression.
-static yp_call_node_t *
-yp_call_node_unary_create(yp_parser_t *parser, yp_token_t *operator, yp_node_t *receiver, const char *name) {
-    yp_call_node_t *node = yp_call_node_create(parser);
-
-    node->base.location.start = operator->start;
-    node->base.location.end = receiver->location.end;
-
-    node->receiver = receiver;
-    node->message_loc = YP_OPTIONAL_LOCATION_TOKEN_VALUE(operator);
-
-    yp_string_constant_init(&node->name, name, strlen(name));
-    return node;
-}
-
-// Allocate and initialize a new CallNode node from a call to a method name
-// without a receiver that could also have been a local variable read.
-static yp_call_node_t *
-yp_call_node_variable_call_create(yp_parser_t *parser, yp_token_t *message) {
-    yp_call_node_t *node = yp_call_node_create(parser);
-
-    node->base.location.start = message->start;
-    node->base.location.end = message->end;
-
-    node->message_loc = YP_OPTIONAL_LOCATION_TOKEN_VALUE(message);
-
-    yp_string_shared_init(&node->name, message->start, message->end);
-    return node;
-}
-
-// Returns whether or not this call node is a "vcall" (a call to a method name
-// without a receiver that could also have been a local variable read).
-static inline bool
-yp_call_node_variable_call_p(yp_call_node_t *node) {
-    return node->base.flags & YP_CALL_NODE_FLAGS_VARIABLE_CALL;
-}
-
-// Initialize the read name by reading the write name and chopping off the '='.
-static void
-yp_call_write_read_name_init(yp_string_t *read_name, yp_string_t *write_name) {
-    size_t length = write_name->length - 1;
-
-    void *memory = malloc(length);
-    memcpy(memory, write_name->source, length);
-
-    yp_string_owned_init(read_name, (uint8_t *) memory, length);
-}
-
-// Allocate and initialize a new CallAndWriteNode node.
-static yp_call_and_write_node_t *
-yp_call_and_write_node_create(yp_parser_t *parser, yp_call_node_t *target, const yp_token_t *operator, yp_node_t *value) {
-    assert(target->block == NULL);
-    assert(operator->type == YP_TOKEN_AMPERSAND_AMPERSAND_EQUAL);
-    yp_call_and_write_node_t *node = YP_ALLOC_NODE(parser, yp_call_and_write_node_t);
-
-    *node = (yp_call_and_write_node_t) {
-        {
-            .type = YP_CALL_AND_WRITE_NODE,
-            .flags = target->base.flags,
-            .location = {
-                .start = target->base.location.start,
-                .end = value->location.end
-            }
-        },
-        .receiver = target->receiver,
-        .call_operator_loc = target->call_operator_loc,
-        .message_loc = target->message_loc,
-        .opening_loc = target->opening_loc,
-        .arguments = target->arguments,
-        .closing_loc = target->closing_loc,
-        .read_name = YP_EMPTY_STRING,
-        .write_name = target->name,
-        .operator_loc = YP_LOCATION_TOKEN_VALUE(operator),
-        .value = value
-    };
-
-    yp_call_write_read_name_init(&node->read_name, &node->write_name);
-
-    // Here we're going to free the target, since it is no longer necessary.
-    // However, we don't want to call `yp_node_destroy` because we want to keep
-    // around all of its children since we just reused them.
-    free(target);
-
-    return node;
-}
-
-// Allocate a new CallOperatorWriteNode node.
-static yp_call_operator_write_node_t *
-yp_call_operator_write_node_create(yp_parser_t *parser, yp_call_node_t *target, const yp_token_t *operator, yp_node_t *value) {
-    assert(target->block == NULL);
-    yp_call_operator_write_node_t *node = YP_ALLOC_NODE(parser, yp_call_operator_write_node_t);
-
-    *node = (yp_call_operator_write_node_t) {
-        {
-            .type = YP_CALL_OPERATOR_WRITE_NODE,
-            .flags = target->base.flags,
-            .location = {
-                .start = target->base.location.start,
-                .end = value->location.end
-            }
-        },
-        .receiver = target->receiver,
-        .call_operator_loc = target->call_operator_loc,
-        .message_loc = target->message_loc,
-        .opening_loc = target->opening_loc,
-        .arguments = target->arguments,
-        .closing_loc = target->closing_loc,
-        .read_name = YP_EMPTY_STRING,
-        .write_name = target->name,
-        .operator = yp_parser_constant_id_location(parser, operator->start, operator->end - 1),
-        .operator_loc = YP_LOCATION_TOKEN_VALUE(operator),
-        .value = value
-    };
-
-    yp_call_write_read_name_init(&node->read_name, &node->write_name);
-
-    // Here we're going to free the target, since it is no longer necessary.
-    // However, we don't want to call `yp_node_destroy` because we want to keep
-    // around all of its children since we just reused them.
-    free(target);
-
-    return node;
-}
-
-// Allocate and initialize a new CallOperatorOrWriteNode node.
-static yp_call_or_write_node_t *
-yp_call_or_write_node_create(yp_parser_t *parser, yp_call_node_t *target, const yp_token_t *operator, yp_node_t *value) {
-    assert(target->block == NULL);
-    assert(operator->type == YP_TOKEN_PIPE_PIPE_EQUAL);
-    yp_call_or_write_node_t *node = YP_ALLOC_NODE(parser, yp_call_or_write_node_t);
-
-    *node = (yp_call_or_write_node_t) {
-        {
-            .type = YP_CALL_OR_WRITE_NODE,
-            .flags = target->base.flags,
-            .location = {
-                .start = target->base.location.start,
-                .end = value->location.end
-            }
-        },
-        .receiver = target->receiver,
-        .call_operator_loc = target->call_operator_loc,
-        .message_loc = target->message_loc,
-        .opening_loc = target->opening_loc,
-        .arguments = target->arguments,
-        .closing_loc = target->closing_loc,
-        .read_name = YP_EMPTY_STRING,
-        .write_name = target->name,
-        .operator_loc = YP_LOCATION_TOKEN_VALUE(operator),
-        .value = value
-    };
-
-    yp_call_write_read_name_init(&node->read_name, &node->write_name);
-
-    // Here we're going to free the target, since it is no longer necessary.
-    // However, we don't want to call `yp_node_destroy` because we want to keep
-    // around all of its children since we just reused them.
-    free(target);
-
-    return node;
-}
-
-// Allocate and initialize a new CapturePatternNode node.
-static yp_capture_pattern_node_t *
-yp_capture_pattern_node_create(yp_parser_t *parser, yp_node_t *value, yp_node_t *target, const yp_token_t *operator) {
-    yp_capture_pattern_node_t *node = YP_ALLOC_NODE(parser, yp_capture_pattern_node_t);
-
-    *node = (yp_capture_pattern_node_t) {
-        {
-            .type = YP_CAPTURE_PATTERN_NODE,
-            .location = {
-                .start = value->location.start,
-                .end = target->location.end
-            },
-        },
-        .value = value,
-        .target = target,
-        .operator_loc = YP_LOCATION_TOKEN_VALUE(operator)
-    };
-
-    return node;
-}
-
-// Allocate and initialize a new CaseNode node.
-static yp_case_node_t *
-yp_case_node_create(yp_parser_t *parser, const yp_token_t *case_keyword, yp_node_t *predicate, yp_else_node_t *consequent, const yp_token_t *end_keyword) {
-    yp_case_node_t *node = YP_ALLOC_NODE(parser, yp_case_node_t);
-
-    *node = (yp_case_node_t) {
-        {
-            .type = YP_CASE_NODE,
-            .location = {
-                .start = case_keyword->start,
-                .end = end_keyword->end
-            },
-        },
-        .predicate = predicate,
-        .consequent = consequent,
-        .case_keyword_loc = YP_LOCATION_TOKEN_VALUE(case_keyword),
-        .end_keyword_loc = YP_LOCATION_TOKEN_VALUE(end_keyword),
-        .conditions = YP_EMPTY_NODE_LIST
-    };
-
-    return node;
-}
-
-// Append a new condition to a CaseNode node.
-static void
-yp_case_node_condition_append(yp_case_node_t *node, yp_node_t *condition) {
-    assert(YP_NODE_TYPE_P(condition, YP_WHEN_NODE) || YP_NODE_TYPE_P(condition, YP_IN_NODE));
-
-    yp_node_list_append(&node->conditions, condition);
-    node->base.location.end = condition->location.end;
-}
-
-// Set the consequent of a CaseNode node.
-static void
-yp_case_node_consequent_set(yp_case_node_t *node, yp_else_node_t *consequent) {
-    node->consequent = consequent;
-    node->base.location.end = consequent->base.location.end;
-}
-
-// Set the end location for a CaseNode node.
-static void
-yp_case_node_end_keyword_loc_set(yp_case_node_t *node, const yp_token_t *end_keyword) {
-    node->base.location.end = end_keyword->end;
-    node->end_keyword_loc = YP_LOCATION_TOKEN_VALUE(end_keyword);
-}
-
-// Allocate a new ClassNode node.
-static yp_class_node_t *
-yp_class_node_create(yp_parser_t *parser, yp_constant_id_list_t *locals, const yp_token_t *class_keyword, yp_node_t *constant_path, const yp_token_t *name, const yp_token_t *inheritance_operator, yp_node_t *superclass, yp_node_t *body, const yp_token_t *end_keyword) {
-    yp_class_node_t *node = YP_ALLOC_NODE(parser, yp_class_node_t);
-    yp_constant_id_t name_constant = yp_parser_constant_id_token(parser, name);
-
-    *node = (yp_class_node_t) {
-        {
-            .type = YP_CLASS_NODE,
-            .location = { .start = class_keyword->start, .end = end_keyword->end },
-        },
-        .locals = *locals,
-        .class_keyword_loc = YP_LOCATION_TOKEN_VALUE(class_keyword),
-        .constant_path = constant_path,
-        .inheritance_operator_loc = YP_OPTIONAL_LOCATION_TOKEN_VALUE(inheritance_operator),
-        .superclass = superclass,
-        .body = body,
-        .end_keyword_loc = YP_LOCATION_TOKEN_VALUE(end_keyword),
-        .name = name_constant,
-        .name_constant = name_constant
-    };
-
-    return node;
-}
-
-// Allocate and initialize a new ClassVariableAndWriteNode node.
-static yp_class_variable_and_write_node_t *
-yp_class_variable_and_write_node_create(yp_parser_t *parser, yp_class_variable_read_node_t *target, const yp_token_t *operator, yp_node_t *value) {
-    assert(operator->type == YP_TOKEN_AMPERSAND_AMPERSAND_EQUAL);
-    yp_class_variable_and_write_node_t *node = YP_ALLOC_NODE(parser, yp_class_variable_and_write_node_t);
-
-    *node = (yp_class_variable_and_write_node_t) {
-        {
-            .type = YP_CLASS_VARIABLE_AND_WRITE_NODE,
-            .location = {
-                .start = target->base.location.start,
-                .end = value->location.end
-            }
-        },
-        .name = target->name,
-        .name_loc = target->base.location,
-        .operator_loc = YP_LOCATION_TOKEN_VALUE(operator),
-        .value = value
-    };
-
-    return node;
-}
-
-// Allocate and initialize a new ClassVariableOperatorWriteNode node.
-static yp_class_variable_operator_write_node_t *
-yp_class_variable_operator_write_node_create(yp_parser_t *parser, yp_class_variable_read_node_t *target, const yp_token_t *operator, yp_node_t *value) {
-    yp_class_variable_operator_write_node_t *node = YP_ALLOC_NODE(parser, yp_class_variable_operator_write_node_t);
-
-    *node = (yp_class_variable_operator_write_node_t) {
-        {
-            .type = YP_CLASS_VARIABLE_OPERATOR_WRITE_NODE,
-            .location = {
-                .start = target->base.location.start,
-                .end = value->location.end
-            }
-        },
-        .name = target->name,
-        .name_loc = target->base.location,
-        .operator_loc = YP_LOCATION_TOKEN_VALUE(operator),
-        .value = value,
-        .operator = yp_parser_constant_id_location(parser, operator->start, operator->end - 1)
-    };
-
-    return node;
-}
-
-// Allocate and initialize a new ClassVariableOrWriteNode node.
-static yp_class_variable_or_write_node_t *
-yp_class_variable_or_write_node_create(yp_parser_t *parser, yp_class_variable_read_node_t *target, const yp_token_t *operator, yp_node_t *value) {
-    assert(operator->type == YP_TOKEN_PIPE_PIPE_EQUAL);
-    yp_class_variable_or_write_node_t *node = YP_ALLOC_NODE(parser, yp_class_variable_or_write_node_t);
-
-    *node = (yp_class_variable_or_write_node_t) {
-        {
-            .type = YP_CLASS_VARIABLE_OR_WRITE_NODE,
-            .location = {
-                .start = target->base.location.start,
-                .end = value->location.end
-            }
-        },
-        .name = target->name,
-        .name_loc = target->base.location,
-        .operator_loc = YP_LOCATION_TOKEN_VALUE(operator),
-        .value = value
-    };
-
-    return node;
-}
-
-// Allocate and initialize a new ClassVariableReadNode node.
-static yp_class_variable_read_node_t *
-yp_class_variable_read_node_create(yp_parser_t *parser, const yp_token_t *token) {
-    assert(token->type == YP_TOKEN_CLASS_VARIABLE);
-    yp_class_variable_read_node_t *node = YP_ALLOC_NODE(parser, yp_class_variable_read_node_t);
-
-    *node = (yp_class_variable_read_node_t) {
-        {
-            .type = YP_CLASS_VARIABLE_READ_NODE,
-            .location = YP_LOCATION_TOKEN_VALUE(token)
-        },
-        .name = yp_parser_constant_id_token(parser, token)
-    };
-
-    return node;
-}
-
-// Initialize a new ClassVariableWriteNode node from a ClassVariableRead node.
-static yp_class_variable_write_node_t *
-yp_class_variable_write_node_create(yp_parser_t *parser, yp_class_variable_read_node_t *read_node, yp_token_t *operator, yp_node_t *value) {
-    yp_class_variable_write_node_t *node = YP_ALLOC_NODE(parser, yp_class_variable_write_node_t);
-
-    *node = (yp_class_variable_write_node_t) {
-        {
-            .type = YP_CLASS_VARIABLE_WRITE_NODE,
-            .location = {
-                .start = read_node->base.location.start,
-                .end = value->location.end
-            },
-        },
-        .name = read_node->name,
-        .name_loc = YP_LOCATION_NODE_VALUE((yp_node_t *) read_node),
-        .operator_loc = YP_OPTIONAL_LOCATION_TOKEN_VALUE(operator),
-        .value = value
-    };
-
-    return node;
-}
-
-// Allocate and initialize a new ConstantPathAndWriteNode node.
-static yp_constant_path_and_write_node_t *
-yp_constant_path_and_write_node_create(yp_parser_t *parser, yp_constant_path_node_t *target, const yp_token_t *operator, yp_node_t *value) {
-    assert(operator->type == YP_TOKEN_AMPERSAND_AMPERSAND_EQUAL);
-    yp_constant_path_and_write_node_t *node = YP_ALLOC_NODE(parser, yp_constant_path_and_write_node_t);
-
-    *node = (yp_constant_path_and_write_node_t) {
-        {
-            .type = YP_CONSTANT_PATH_AND_WRITE_NODE,
-            .location = {
-                .start = target->base.location.start,
-                .end = value->location.end
-            }
-        },
-        .target = target,
-        .operator_loc = YP_LOCATION_TOKEN_VALUE(operator),
-        .value = value
-    };
-
-    return node;
-}
-
-// Allocate and initialize a new ConstantPathOperatorWriteNode node.
-static yp_constant_path_operator_write_node_t *
-yp_constant_path_operator_write_node_create(yp_parser_t *parser, yp_constant_path_node_t *target, const yp_token_t *operator, yp_node_t *value) {
-    yp_constant_path_operator_write_node_t *node = YP_ALLOC_NODE(parser, yp_constant_path_operator_write_node_t);
-
-    *node = (yp_constant_path_operator_write_node_t) {
-        {
-            .type = YP_CONSTANT_PATH_OPERATOR_WRITE_NODE,
-            .location = {
-                .start = target->base.location.start,
-                .end = value->location.end
-            }
-        },
-        .target = target,
-        .operator_loc = YP_LOCATION_TOKEN_VALUE(operator),
-        .value = value,
-        .operator = yp_parser_constant_id_location(parser, operator->start, operator->end - 1)
-    };
-
-    return node;
-}
-
-// Allocate and initialize a new ConstantPathOrWriteNode node.
-static yp_constant_path_or_write_node_t *
-yp_constant_path_or_write_node_create(yp_parser_t *parser, yp_constant_path_node_t *target, const yp_token_t *operator, yp_node_t *value) {
-    assert(operator->type == YP_TOKEN_PIPE_PIPE_EQUAL);
-    yp_constant_path_or_write_node_t *node = YP_ALLOC_NODE(parser, yp_constant_path_or_write_node_t);
-
-    *node = (yp_constant_path_or_write_node_t) {
-        {
-            .type = YP_CONSTANT_PATH_OR_WRITE_NODE,
-            .location = {
-                .start = target->base.location.start,
-                .end = value->location.end
-            }
-        },
-        .target = target,
-        .operator_loc = YP_LOCATION_TOKEN_VALUE(operator),
-        .value = value
-    };
-
-    return node;
-}
-
-// Allocate and initialize a new ConstantPathNode node.
-static yp_constant_path_node_t *
-yp_constant_path_node_create(yp_parser_t *parser, yp_node_t *parent, const yp_token_t *delimiter, yp_node_t *child) {
-    yp_constant_path_node_t *node = YP_ALLOC_NODE(parser, yp_constant_path_node_t);
-
-    *node = (yp_constant_path_node_t) {
-        {
-            .type = YP_CONSTANT_PATH_NODE,
-            .location = {
-                .start = parent == NULL ? delimiter->start : parent->location.start,
-                .end = child->location.end
-            },
-        },
-        .parent = parent,
-        .child = child,
-        .delimiter_loc = YP_LOCATION_TOKEN_VALUE(delimiter)
-    };
-
-    return node;
-}
-
-// Allocate a new ConstantPathWriteNode node.
-static yp_constant_path_write_node_t *
-yp_constant_path_write_node_create(yp_parser_t *parser, yp_constant_path_node_t *target, const yp_token_t *operator, yp_node_t *value) {
-    yp_constant_path_write_node_t *node = YP_ALLOC_NODE(parser, yp_constant_path_write_node_t);
-
-    *node = (yp_constant_path_write_node_t) {
-        {
-            .type = YP_CONSTANT_PATH_WRITE_NODE,
-            .location = {
-                .start = target->base.location.start,
-                .end = value->location.end
-            },
-        },
-        .target = target,
-        .operator_loc = YP_OPTIONAL_LOCATION_TOKEN_VALUE(operator),
-        .value = value
-    };
-
-    return node;
-}
-
-// Allocate and initialize a new ConstantAndWriteNode node.
-static yp_constant_and_write_node_t *
-yp_constant_and_write_node_create(yp_parser_t *parser, yp_constant_read_node_t *target, const yp_token_t *operator, yp_node_t *value) {
-    assert(operator->type == YP_TOKEN_AMPERSAND_AMPERSAND_EQUAL);
-    yp_constant_and_write_node_t *node = YP_ALLOC_NODE(parser, yp_constant_and_write_node_t);
-
-    *node = (yp_constant_and_write_node_t) {
-        {
-            .type = YP_CONSTANT_AND_WRITE_NODE,
-            .location = {
-                .start = target->base.location.start,
-                .end = value->location.end
-            }
-        },
-        .name = target->name,
-        .name_loc = target->base.location,
-        .operator_loc = YP_LOCATION_TOKEN_VALUE(operator),
-        .value = value
-    };
-
-    return node;
-}
-
-// Allocate and initialize a new ConstantOperatorWriteNode node.
-static yp_constant_operator_write_node_t *
-yp_constant_operator_write_node_create(yp_parser_t *parser, yp_constant_read_node_t *target, const yp_token_t *operator, yp_node_t *value) {
-    yp_constant_operator_write_node_t *node = YP_ALLOC_NODE(parser, yp_constant_operator_write_node_t);
-
-    *node = (yp_constant_operator_write_node_t) {
-        {
-            .type = YP_CONSTANT_OPERATOR_WRITE_NODE,
-            .location = {
-                .start = target->base.location.start,
-                .end = value->location.end
-            }
-        },
-        .name = target->name,
-        .name_loc = target->base.location,
-        .operator_loc = YP_LOCATION_TOKEN_VALUE(operator),
-        .value = value,
-        .operator = yp_parser_constant_id_location(parser, operator->start, operator->end - 1)
-    };
-
-    return node;
-}
-
-// Allocate and initialize a new ConstantOrWriteNode node.
-static yp_constant_or_write_node_t *
-yp_constant_or_write_node_create(yp_parser_t *parser, yp_constant_read_node_t *target, const yp_token_t *operator, yp_node_t *value) {
-    assert(operator->type == YP_TOKEN_PIPE_PIPE_EQUAL);
-    yp_constant_or_write_node_t *node = YP_ALLOC_NODE(parser, yp_constant_or_write_node_t);
-
-    *node = (yp_constant_or_write_node_t) {
-        {
-            .type = YP_CONSTANT_OR_WRITE_NODE,
-            .location = {
-                .start = target->base.location.start,
-                .end = value->location.end
-            }
-        },
-        .name = target->name,
-        .name_loc = target->base.location,
-        .operator_loc = YP_LOCATION_TOKEN_VALUE(operator),
-        .value = value
-    };
-
-    return node;
-}
-
-// Allocate and initialize a new ConstantReadNode node.
-static yp_constant_read_node_t *
-yp_constant_read_node_create(yp_parser_t *parser, const yp_token_t *name) {
-    assert(name->type == YP_TOKEN_CONSTANT || name->type == YP_TOKEN_MISSING);
-    yp_constant_read_node_t *node = YP_ALLOC_NODE(parser, yp_constant_read_node_t);
-
-    *node = (yp_constant_read_node_t) {
-        {
-            .type = YP_CONSTANT_READ_NODE,
-            .location = YP_LOCATION_TOKEN_VALUE(name)
-        },
-        .name = yp_parser_constant_id_token(parser, name)
-    };
-
-    return node;
-}
-
-// Allocate a new ConstantWriteNode node.
-static yp_constant_write_node_t *
-yp_constant_write_node_create(yp_parser_t *parser, yp_constant_read_node_t *target, const yp_token_t *operator, yp_node_t *value) {
-    yp_constant_write_node_t *node = YP_ALLOC_NODE(parser, yp_constant_write_node_t);
-
-    *node = (yp_constant_write_node_t) {
-        {
-            .type = YP_CONSTANT_WRITE_NODE,
-            .location = {
-                .start = target->base.location.start,
-                .end = value->location.end
-            }
-        },
-        .name = target->name,
-        .name_loc = target->base.location,
-        .operator_loc = YP_OPTIONAL_LOCATION_TOKEN_VALUE(operator),
-        .value = value
-    };
-
-    return node;
-}
-
-// Allocate and initialize a new DefNode node.
-static yp_def_node_t *
-yp_def_node_create(
-    yp_parser_t *parser,
-    const yp_token_t *name,
-    yp_node_t *receiver,
-    yp_parameters_node_t *parameters,
-    yp_node_t *body,
-    yp_constant_id_list_t *locals,
-    const yp_token_t *def_keyword,
-    const yp_token_t *operator,
-    const yp_token_t *lparen,
-    const yp_token_t *rparen,
-    const yp_token_t *equal,
-    const yp_token_t *end_keyword
-) {
-    yp_def_node_t *node = YP_ALLOC_NODE(parser, yp_def_node_t);
-    const uint8_t *end;
-
-    if (end_keyword->type == YP_TOKEN_NOT_PROVIDED) {
-        end = body->location.end;
-    } else {
-        end = end_keyword->end;
-    }
-
-    *node = (yp_def_node_t) {
-        {
-            .type = YP_DEF_NODE,
-            .location = { .start = def_keyword->start, .end = end },
-        },
-        .name_loc = YP_LOCATION_TOKEN_VALUE(name),
-        .receiver = receiver,
-        .parameters = parameters,
-        .body = body,
-        .locals = *locals,
-        .def_keyword_loc = YP_LOCATION_TOKEN_VALUE(def_keyword),
-        .operator_loc = YP_OPTIONAL_LOCATION_TOKEN_VALUE(operator),
-        .lparen_loc = YP_OPTIONAL_LOCATION_TOKEN_VALUE(lparen),
-        .rparen_loc = YP_OPTIONAL_LOCATION_TOKEN_VALUE(rparen),
-        .equal_loc = YP_OPTIONAL_LOCATION_TOKEN_VALUE(equal),
-        .end_keyword_loc = YP_OPTIONAL_LOCATION_TOKEN_VALUE(end_keyword)
-    };
-
-    return node;
-}
-
-// Allocate a new DefinedNode node.
-static yp_defined_node_t *
-yp_defined_node_create(yp_parser_t *parser, const yp_token_t *lparen, yp_node_t *value, const yp_token_t *rparen, const yp_location_t *keyword_loc) {
-    yp_defined_node_t *node = YP_ALLOC_NODE(parser, yp_defined_node_t);
-
-    *node = (yp_defined_node_t) {
-        {
-            .type = YP_DEFINED_NODE,
-            .location = {
-                .start = keyword_loc->start,
-                .end = (rparen->type == YP_TOKEN_NOT_PROVIDED ? value->location.end : rparen->end)
-            },
-        },
-        .lparen_loc = YP_OPTIONAL_LOCATION_TOKEN_VALUE(lparen),
-        .value = value,
-        .rparen_loc = YP_OPTIONAL_LOCATION_TOKEN_VALUE(rparen),
-        .keyword_loc = *keyword_loc
-    };
-
-    return node;
-}
-
-// Allocate and initialize a new ElseNode node.
-static yp_else_node_t *
-yp_else_node_create(yp_parser_t *parser, const yp_token_t *else_keyword, yp_statements_node_t *statements, const yp_token_t *end_keyword) {
-    yp_else_node_t *node = YP_ALLOC_NODE(parser, yp_else_node_t);
-    const uint8_t *end = NULL;
-    if ((end_keyword->type == YP_TOKEN_NOT_PROVIDED) && (statements != NULL)) {
-        end = statements->base.location.end;
-    } else {
-        end = end_keyword->end;
-    }
-
-    *node = (yp_else_node_t) {
-        {
-            .type = YP_ELSE_NODE,
-            .location = {
-                .start = else_keyword->start,
-                .end = end,
-            },
-        },
-        .else_keyword_loc = YP_LOCATION_TOKEN_VALUE(else_keyword),
-        .statements = statements,
-        .end_keyword_loc = YP_OPTIONAL_LOCATION_TOKEN_VALUE(end_keyword)
-    };
-
-    return node;
-}
-
-// Allocate and initialize a new EmbeddedStatementsNode node.
-static yp_embedded_statements_node_t *
-yp_embedded_statements_node_create(yp_parser_t *parser, const yp_token_t *opening, yp_statements_node_t *statements, const yp_token_t *closing) {
-    yp_embedded_statements_node_t *node = YP_ALLOC_NODE(parser, yp_embedded_statements_node_t);
-
-    *node = (yp_embedded_statements_node_t) {
-        {
-            .type = YP_EMBEDDED_STATEMENTS_NODE,
-            .location = {
-                .start = opening->start,
-                .end = closing->end
-            }
-        },
-        .opening_loc = YP_LOCATION_TOKEN_VALUE(opening),
-        .statements = statements,
-        .closing_loc = YP_LOCATION_TOKEN_VALUE(closing)
-    };
-
-    return node;
-}
-
-// Allocate and initialize a new EmbeddedVariableNode node.
-static yp_embedded_variable_node_t *
-yp_embedded_variable_node_create(yp_parser_t *parser, const yp_token_t *operator, yp_node_t *variable) {
-    yp_embedded_variable_node_t *node = YP_ALLOC_NODE(parser, yp_embedded_variable_node_t);
-
-    *node = (yp_embedded_variable_node_t) {
-        {
-            .type = YP_EMBEDDED_VARIABLE_NODE,
-            .location = {
-                .start = operator->start,
-                .end = variable->location.end
-            }
-        },
-        .operator_loc = YP_LOCATION_TOKEN_VALUE(operator),
-        .variable = variable
-    };
-
-    return node;
-}
-
-// Allocate a new EnsureNode node.
-static yp_ensure_node_t *
-yp_ensure_node_create(yp_parser_t *parser, const yp_token_t *ensure_keyword, yp_statements_node_t *statements, const yp_token_t *end_keyword) {
-    yp_ensure_node_t *node = YP_ALLOC_NODE(parser, yp_ensure_node_t);
-
-    *node = (yp_ensure_node_t) {
-        {
-            .type = YP_ENSURE_NODE,
-            .location = {
-                .start = ensure_keyword->start,
-                .end = end_keyword->end
-            },
-        },
-        .ensure_keyword_loc = YP_LOCATION_TOKEN_VALUE(ensure_keyword),
-        .statements = statements,
-        .end_keyword_loc = YP_LOCATION_TOKEN_VALUE(end_keyword)
-    };
-
-    return node;
-}
-
-// Allocate and initialize a new FalseNode node.
-static yp_false_node_t *
-yp_false_node_create(yp_parser_t *parser, const yp_token_t *token) {
-    assert(token->type == YP_TOKEN_KEYWORD_FALSE);
-    yp_false_node_t *node = YP_ALLOC_NODE(parser, yp_false_node_t);
-    *node = (yp_false_node_t) {{ .type = YP_FALSE_NODE, .location = YP_LOCATION_TOKEN_VALUE(token) }};
-    return node;
-}
-
-// Allocate and initialize a new find pattern node. The node list given in the
-// nodes parameter is guaranteed to have at least two nodes.
-static yp_find_pattern_node_t *
-yp_find_pattern_node_create(yp_parser_t *parser, yp_node_list_t *nodes) {
-    yp_find_pattern_node_t *node = YP_ALLOC_NODE(parser, yp_find_pattern_node_t);
-
-    yp_node_t *left = nodes->nodes[0];
-    yp_node_t *right;
-
-    if (nodes->size == 1) {
-        right = (yp_node_t *) yp_missing_node_create(parser, left->location.end, left->location.end);
-    } else {
-        right = nodes->nodes[nodes->size - 1];
-    }
-
-    *node = (yp_find_pattern_node_t) {
-        {
-            .type = YP_FIND_PATTERN_NODE,
-            .location = {
-                .start = left->location.start,
-                .end = right->location.end,
-            },
-        },
-        .constant = NULL,
-        .left = left,
-        .right = right,
-        .requireds = YP_EMPTY_NODE_LIST,
-        .opening_loc = YP_OPTIONAL_LOCATION_NOT_PROVIDED_VALUE,
-        .closing_loc = YP_OPTIONAL_LOCATION_NOT_PROVIDED_VALUE
-    };
-
-    // For now we're going to just copy over each pointer manually. This could be
-    // much more efficient, as we could instead resize the node list to only point
-    // to 1...-1.
-    for (size_t index = 1; index < nodes->size - 1; index++) {
-        yp_node_list_append(&node->requireds, nodes->nodes[index]);
-    }
-
-    return node;
-}
-
-// Allocate and initialize a new FloatNode node.
-static yp_float_node_t *
-yp_float_node_create(yp_parser_t *parser, const yp_token_t *token) {
-    assert(token->type == YP_TOKEN_FLOAT);
-    yp_float_node_t *node = YP_ALLOC_NODE(parser, yp_float_node_t);
-    *node = (yp_float_node_t) {{ .type = YP_FLOAT_NODE, .location = YP_LOCATION_TOKEN_VALUE(token) }};
-    return node;
-}
-
-// Allocate and initialize a new FloatNode node from a FLOAT_IMAGINARY token.
-static yp_imaginary_node_t *
-yp_float_node_imaginary_create(yp_parser_t *parser, const yp_token_t *token) {
-    assert(token->type == YP_TOKEN_FLOAT_IMAGINARY);
-
-    yp_imaginary_node_t *node = YP_ALLOC_NODE(parser, yp_imaginary_node_t);
-    *node = (yp_imaginary_node_t) {
-        {
-            .type = YP_IMAGINARY_NODE,
-            .location = YP_LOCATION_TOKEN_VALUE(token)
-        },
-        .numeric = (yp_node_t *) yp_float_node_create(parser, &((yp_token_t) {
-            .type = YP_TOKEN_FLOAT,
-            .start = token->start,
-            .end = token->end - 1
-        }))
-    };
-
-    return node;
-}
-
-// Allocate and initialize a new FloatNode node from a FLOAT_RATIONAL token.
-static yp_rational_node_t *
-yp_float_node_rational_create(yp_parser_t *parser, const yp_token_t *token) {
-    assert(token->type == YP_TOKEN_FLOAT_RATIONAL);
-
-    yp_rational_node_t *node = YP_ALLOC_NODE(parser, yp_rational_node_t);
-    *node = (yp_rational_node_t) {
-        {
-            .type = YP_RATIONAL_NODE,
-            .location = YP_LOCATION_TOKEN_VALUE(token)
-        },
-        .numeric = (yp_node_t *) yp_float_node_create(parser, &((yp_token_t) {
-            .type = YP_TOKEN_FLOAT,
-            .start = token->start,
-            .end = token->end - 1
-        }))
-    };
-
-    return node;
-}
-
-// Allocate and initialize a new FloatNode node from a FLOAT_RATIONAL_IMAGINARY token.
-static yp_imaginary_node_t *
-yp_float_node_rational_imaginary_create(yp_parser_t *parser, const yp_token_t *token) {
-    assert(token->type == YP_TOKEN_FLOAT_RATIONAL_IMAGINARY);
-
-    yp_imaginary_node_t *node = YP_ALLOC_NODE(parser, yp_imaginary_node_t);
-    *node = (yp_imaginary_node_t) {
-        {
-            .type = YP_IMAGINARY_NODE,
-            .location = YP_LOCATION_TOKEN_VALUE(token)
-        },
-        .numeric = (yp_node_t *) yp_float_node_rational_create(parser, &((yp_token_t) {
-            .type = YP_TOKEN_FLOAT_RATIONAL,
-            .start = token->start,
-            .end = token->end - 1
-        }))
-    };
-
-    return node;
-}
-
-// Allocate and initialize a new ForNode node.
-static yp_for_node_t *
-yp_for_node_create(
-    yp_parser_t *parser,
-    yp_node_t *index,
-    yp_node_t *collection,
-    yp_statements_node_t *statements,
-    const yp_token_t *for_keyword,
-    const yp_token_t *in_keyword,
-    const yp_token_t *do_keyword,
-    const yp_token_t *end_keyword
-) {
-    yp_for_node_t *node = YP_ALLOC_NODE(parser, yp_for_node_t);
-
-    *node = (yp_for_node_t) {
-        {
-            .type = YP_FOR_NODE,
-            .location = {
-                .start = for_keyword->start,
-                .end = end_keyword->end
-            },
-        },
-        .index = index,
-        .collection = collection,
-        .statements = statements,
-        .for_keyword_loc = YP_LOCATION_TOKEN_VALUE(for_keyword),
-        .in_keyword_loc = YP_LOCATION_TOKEN_VALUE(in_keyword),
-        .do_keyword_loc = YP_OPTIONAL_LOCATION_TOKEN_VALUE(do_keyword),
-        .end_keyword_loc = YP_LOCATION_TOKEN_VALUE(end_keyword)
-    };
-
-    return node;
-}
-
-// Allocate and initialize a new ForwardingArgumentsNode node.
-static yp_forwarding_arguments_node_t *
-yp_forwarding_arguments_node_create(yp_parser_t *parser, const yp_token_t *token) {
-    assert(token->type == YP_TOKEN_UDOT_DOT_DOT);
-    yp_forwarding_arguments_node_t *node = YP_ALLOC_NODE(parser, yp_forwarding_arguments_node_t);
-    *node = (yp_forwarding_arguments_node_t) {{ .type = YP_FORWARDING_ARGUMENTS_NODE, .location = YP_LOCATION_TOKEN_VALUE(token) }};
-    return node;
-}
-
-// Allocate and initialize a new ForwardingParameterNode node.
-static yp_forwarding_parameter_node_t *
-yp_forwarding_parameter_node_create(yp_parser_t *parser, const yp_token_t *token) {
-    assert(token->type == YP_TOKEN_UDOT_DOT_DOT);
-    yp_forwarding_parameter_node_t *node = YP_ALLOC_NODE(parser, yp_forwarding_parameter_node_t);
-    *node = (yp_forwarding_parameter_node_t) {{ .type = YP_FORWARDING_PARAMETER_NODE, .location = YP_LOCATION_TOKEN_VALUE(token) }};
-    return node;
-}
-
-// Allocate and initialize a new ForwardingSuper node.
-static yp_forwarding_super_node_t *
-yp_forwarding_super_node_create(yp_parser_t *parser, const yp_token_t *token, yp_arguments_t *arguments) {
-    assert(token->type == YP_TOKEN_KEYWORD_SUPER);
-    yp_forwarding_super_node_t *node = YP_ALLOC_NODE(parser, yp_forwarding_super_node_t);
-
-    *node = (yp_forwarding_super_node_t) {
-        {
-            .type = YP_FORWARDING_SUPER_NODE,
-            .location = {
-                .start = token->start,
-                .end = arguments->block != NULL ? arguments->block->base.location.end : token->end
-            },
-        },
-        .block = arguments->block
-    };
-
-    return node;
-}
-
-// Allocate and initialize a new hash pattern node from an opening and closing
-// token.
-static yp_hash_pattern_node_t *
-yp_hash_pattern_node_empty_create(yp_parser_t *parser, const yp_token_t *opening, const yp_token_t *closing) {
-    yp_hash_pattern_node_t *node = YP_ALLOC_NODE(parser, yp_hash_pattern_node_t);
-
-    *node = (yp_hash_pattern_node_t) {
-        {
-            .type = YP_HASH_PATTERN_NODE,
-            .location = {
-                .start = opening->start,
-                .end = closing->end
-            },
-        },
-        .constant = NULL,
-        .kwrest = NULL,
-        .opening_loc = YP_LOCATION_TOKEN_VALUE(opening),
-        .closing_loc = YP_LOCATION_TOKEN_VALUE(closing),
-        .assocs = YP_EMPTY_NODE_LIST
-    };
-
-    return node;
-}
-
-// Allocate and initialize a new hash pattern node.
-static yp_hash_pattern_node_t *
-yp_hash_pattern_node_node_list_create(yp_parser_t *parser, yp_node_list_t *assocs) {
-    yp_hash_pattern_node_t *node = YP_ALLOC_NODE(parser, yp_hash_pattern_node_t);
-
-    *node = (yp_hash_pattern_node_t) {
-        {
-            .type = YP_HASH_PATTERN_NODE,
-            .location = {
-                .start = assocs->nodes[0]->location.start,
-                .end = assocs->nodes[assocs->size - 1]->location.end
-            },
-        },
-        .constant = NULL,
-        .kwrest = NULL,
-        .assocs = YP_EMPTY_NODE_LIST,
-        .opening_loc = YP_OPTIONAL_LOCATION_NOT_PROVIDED_VALUE,
-        .closing_loc = YP_OPTIONAL_LOCATION_NOT_PROVIDED_VALUE
-    };
-
-    for (size_t index = 0; index < assocs->size; index++) {
-        yp_node_t *assoc = assocs->nodes[index];
-        yp_node_list_append(&node->assocs, assoc);
-    }
-
-    return node;
-}
-
-// Retrieve the name from a node that will become a global variable write node.
-static yp_constant_id_t
-yp_global_variable_write_name(yp_parser_t *parser, yp_node_t *target) {
-    if (YP_NODE_TYPE_P(target, YP_GLOBAL_VARIABLE_READ_NODE)) {
-        return ((yp_global_variable_read_node_t *) target)->name;
-    }
-
-    assert(YP_NODE_TYPE_P(target, YP_BACK_REFERENCE_READ_NODE) || YP_NODE_TYPE_P(target, YP_NUMBERED_REFERENCE_READ_NODE));
-
-    // This will only ever happen in the event of a syntax error, but we
-    // still need to provide something for the node.
-    return yp_parser_constant_id_location(parser, target->location.start, target->location.end);
-}
-
-// Allocate and initialize a new GlobalVariableAndWriteNode node.
-static yp_global_variable_and_write_node_t *
-yp_global_variable_and_write_node_create(yp_parser_t *parser, yp_node_t *target, const yp_token_t *operator, yp_node_t *value) {
-    assert(operator->type == YP_TOKEN_AMPERSAND_AMPERSAND_EQUAL);
-    yp_global_variable_and_write_node_t *node = YP_ALLOC_NODE(parser, yp_global_variable_and_write_node_t);
-
-    *node = (yp_global_variable_and_write_node_t) {
-        {
-            .type = YP_GLOBAL_VARIABLE_AND_WRITE_NODE,
-            .location = {
-                .start = target->location.start,
-                .end = value->location.end
-            }
-        },
-        .name = yp_global_variable_write_name(parser, target),
-        .name_loc = target->location,
-        .operator_loc = YP_LOCATION_TOKEN_VALUE(operator),
-        .value = value
-    };
-
-    return node;
-}
-
-// Allocate and initialize a new GlobalVariableOperatorWriteNode node.
-static yp_global_variable_operator_write_node_t *
-yp_global_variable_operator_write_node_create(yp_parser_t *parser, yp_node_t *target, const yp_token_t *operator, yp_node_t *value) {
-    yp_global_variable_operator_write_node_t *node = YP_ALLOC_NODE(parser, yp_global_variable_operator_write_node_t);
-
-    *node = (yp_global_variable_operator_write_node_t) {
-        {
-            .type = YP_GLOBAL_VARIABLE_OPERATOR_WRITE_NODE,
-            .location = {
-                .start = target->location.start,
-                .end = value->location.end
-            }
-        },
-        .name = yp_global_variable_write_name(parser, target),
-        .name_loc = target->location,
-        .operator_loc = YP_LOCATION_TOKEN_VALUE(operator),
-        .value = value,
-        .operator = yp_parser_constant_id_location(parser, operator->start, operator->end - 1)
-    };
-
-    return node;
-}
-
-// Allocate and initialize a new GlobalVariableOrWriteNode node.
-static yp_global_variable_or_write_node_t *
-yp_global_variable_or_write_node_create(yp_parser_t *parser, yp_node_t *target, const yp_token_t *operator, yp_node_t *value) {
-    assert(operator->type == YP_TOKEN_PIPE_PIPE_EQUAL);
-    yp_global_variable_or_write_node_t *node = YP_ALLOC_NODE(parser, yp_global_variable_or_write_node_t);
-
-    *node = (yp_global_variable_or_write_node_t) {
-        {
-            .type = YP_GLOBAL_VARIABLE_OR_WRITE_NODE,
-            .location = {
-                .start = target->location.start,
-                .end = value->location.end
-            }
-        },
-        .name = yp_global_variable_write_name(parser, target),
-        .name_loc = target->location,
-        .operator_loc = YP_LOCATION_TOKEN_VALUE(operator),
-        .value = value
-    };
-
-    return node;
-}
-
-// Allocate a new GlobalVariableReadNode node.
-static yp_global_variable_read_node_t *
-yp_global_variable_read_node_create(yp_parser_t *parser, const yp_token_t *name) {
-    yp_global_variable_read_node_t *node = YP_ALLOC_NODE(parser, yp_global_variable_read_node_t);
-
-    *node = (yp_global_variable_read_node_t) {
-        {
-            .type = YP_GLOBAL_VARIABLE_READ_NODE,
-            .location = YP_LOCATION_TOKEN_VALUE(name),
-        },
-        .name = yp_parser_constant_id_token(parser, name)
-    };
-
-    return node;
-}
-
-// Allocate a new GlobalVariableWriteNode node.
-static yp_global_variable_write_node_t *
-yp_global_variable_write_node_create(yp_parser_t *parser, yp_node_t *target, const yp_token_t *operator, yp_node_t *value) {
-    yp_global_variable_write_node_t *node = YP_ALLOC_NODE(parser, yp_global_variable_write_node_t);
-
-    *node = (yp_global_variable_write_node_t) {
-        {
-            .type = YP_GLOBAL_VARIABLE_WRITE_NODE,
-            .location = {
-                .start = target->location.start,
-                .end = value->location.end
-            },
-        },
-        .name = yp_global_variable_write_name(parser, target),
-        .name_loc = YP_LOCATION_NODE_VALUE(target),
-        .operator_loc = YP_OPTIONAL_LOCATION_TOKEN_VALUE(operator),
-        .value = value
-    };
-
-    return node;
-}
-
-// Allocate a new HashNode node.
-static yp_hash_node_t *
-yp_hash_node_create(yp_parser_t *parser, const yp_token_t *opening) {
-    assert(opening != NULL);
-    yp_hash_node_t *node = YP_ALLOC_NODE(parser, yp_hash_node_t);
-
-    *node = (yp_hash_node_t) {
-        {
-            .type = YP_HASH_NODE,
-            .location = {
-                .start = opening->start,
-                .end = opening->end
-            },
-        },
-        .opening_loc = YP_LOCATION_TOKEN_VALUE(opening),
-        .closing_loc = YP_LOCATION_NULL_VALUE(parser),
-        .elements = YP_EMPTY_NODE_LIST
-    };
-
-    return node;
-}
-
-static inline void
-yp_hash_node_elements_append(yp_hash_node_t *hash, yp_node_t *element) {
-    yp_node_list_append(&hash->elements, element);
-}
-
-static inline void
-yp_hash_node_closing_loc_set(yp_hash_node_t *hash, yp_token_t *token) {
-    hash->base.location.end = token->end;
-    hash->closing_loc = YP_LOCATION_TOKEN_VALUE(token);
-}
-
-// Allocate a new IfNode node.
-static yp_if_node_t *
-yp_if_node_create(yp_parser_t *parser,
-    const yp_token_t *if_keyword,
-    yp_node_t *predicate,
-    yp_statements_node_t *statements,
-    yp_node_t *consequent,
-    const yp_token_t *end_keyword
-) {
-    yp_flip_flop(predicate);
-    yp_if_node_t *node = YP_ALLOC_NODE(parser, yp_if_node_t);
-
-    const uint8_t *end;
-    if (end_keyword->type != YP_TOKEN_NOT_PROVIDED) {
-        end = end_keyword->end;
-    } else if (consequent != NULL) {
-        end = consequent->location.end;
-    } else if ((statements != NULL) && (statements->body.size != 0)) {
-        end = statements->base.location.end;
-    } else {
-        end = predicate->location.end;
-    }
-
-    *node = (yp_if_node_t) {
-        {
-            .type = YP_IF_NODE,
-            .flags = YP_NODE_FLAG_NEWLINE,
-            .location = {
-                .start = if_keyword->start,
-                .end = end
-            },
-        },
-        .if_keyword_loc = YP_LOCATION_TOKEN_VALUE(if_keyword),
-        .predicate = predicate,
-        .statements = statements,
-        .consequent = consequent,
-        .end_keyword_loc = YP_OPTIONAL_LOCATION_TOKEN_VALUE(end_keyword)
-    };
-
-    return node;
-}
-
-// Allocate and initialize new IfNode node in the modifier form.
-static yp_if_node_t *
-yp_if_node_modifier_create(yp_parser_t *parser, yp_node_t *statement, const yp_token_t *if_keyword, yp_node_t *predicate) {
-    yp_flip_flop(predicate);
-    yp_if_node_t *node = YP_ALLOC_NODE(parser, yp_if_node_t);
-
-    yp_statements_node_t *statements = yp_statements_node_create(parser);
-    yp_statements_node_body_append(statements, statement);
-
-    *node = (yp_if_node_t) {
-        {
-            .type = YP_IF_NODE,
-            .flags = YP_NODE_FLAG_NEWLINE,
-            .location = {
-                .start = statement->location.start,
-                .end = predicate->location.end
-            },
-        },
-        .if_keyword_loc = YP_LOCATION_TOKEN_VALUE(if_keyword),
-        .predicate = predicate,
-        .statements = statements,
-        .consequent = NULL,
-        .end_keyword_loc = YP_OPTIONAL_LOCATION_NOT_PROVIDED_VALUE
-    };
-
-    return node;
-}
-
-// Allocate and initialize an if node from a ternary expression.
-static yp_if_node_t *
-yp_if_node_ternary_create(yp_parser_t *parser, yp_node_t *predicate, yp_node_t *true_expression, const yp_token_t *colon, yp_node_t *false_expression) {
-    yp_flip_flop(predicate);
-
-    yp_statements_node_t *if_statements = yp_statements_node_create(parser);
-    yp_statements_node_body_append(if_statements, true_expression);
-
-    yp_statements_node_t *else_statements = yp_statements_node_create(parser);
-    yp_statements_node_body_append(else_statements, false_expression);
-
-    yp_token_t end_keyword = not_provided(parser);
-    yp_else_node_t *else_node = yp_else_node_create(parser, colon, else_statements, &end_keyword);
-
-    yp_if_node_t *node = YP_ALLOC_NODE(parser, yp_if_node_t);
-
-    *node = (yp_if_node_t) {
-        {
-            .type = YP_IF_NODE,
-            .flags = YP_NODE_FLAG_NEWLINE,
-            .location = {
-                .start = predicate->location.start,
-                .end = false_expression->location.end,
-            },
-        },
-        .if_keyword_loc = YP_OPTIONAL_LOCATION_NOT_PROVIDED_VALUE,
-        .predicate = predicate,
-        .statements = if_statements,
-        .consequent = (yp_node_t *)else_node,
-        .end_keyword_loc = YP_OPTIONAL_LOCATION_NOT_PROVIDED_VALUE
-    };
-
-    return node;
-
-}
-
-static inline void
-yp_if_node_end_keyword_loc_set(yp_if_node_t *node, const yp_token_t *keyword) {
-    node->base.location.end = keyword->end;
-    node->end_keyword_loc = YP_LOCATION_TOKEN_VALUE(keyword);
-}
-
-static inline void
-yp_else_node_end_keyword_loc_set(yp_else_node_t *node, const yp_token_t *keyword) {
-    node->base.location.end = keyword->end;
-    node->end_keyword_loc = YP_LOCATION_TOKEN_VALUE(keyword);
-}
-
-// Allocate and initialize a new IntegerNode node.
-static yp_integer_node_t *
-yp_integer_node_create(yp_parser_t *parser, const yp_token_t *token) {
-    assert(token->type == YP_TOKEN_INTEGER);
-    yp_integer_node_t *node = YP_ALLOC_NODE(parser, yp_integer_node_t);
-    *node = (yp_integer_node_t) {{ .type = YP_INTEGER_NODE, .location = YP_LOCATION_TOKEN_VALUE(token) }};
-    return node;
-}
-
-// Allocate and initialize a new IntegerNode node from an INTEGER_IMAGINARY token.
-static yp_imaginary_node_t *
-yp_integer_node_imaginary_create(yp_parser_t *parser, const yp_token_t *token) {
-    assert(token->type == YP_TOKEN_INTEGER_IMAGINARY);
-
-    yp_imaginary_node_t *node = YP_ALLOC_NODE(parser, yp_imaginary_node_t);
-    *node = (yp_imaginary_node_t) {
-        {
-            .type = YP_IMAGINARY_NODE,
-            .location = YP_LOCATION_TOKEN_VALUE(token)
-        },
-        .numeric = (yp_node_t *) yp_integer_node_create(parser, &((yp_token_t) {
-            .type = YP_TOKEN_INTEGER,
-            .start = token->start,
-            .end = token->end - 1
-        }))
-    };
-
-    return node;
-}
-
-// Allocate and initialize a new IntegerNode node from an INTEGER_RATIONAL token.
-static yp_rational_node_t *
-yp_integer_node_rational_create(yp_parser_t *parser, const yp_token_t *token) {
-    assert(token->type == YP_TOKEN_INTEGER_RATIONAL);
-
-    yp_rational_node_t *node = YP_ALLOC_NODE(parser, yp_rational_node_t);
-    *node = (yp_rational_node_t) {
-        {
-            .type = YP_RATIONAL_NODE,
-            .location = YP_LOCATION_TOKEN_VALUE(token)
-        },
-        .numeric = (yp_node_t *) yp_integer_node_create(parser, &((yp_token_t) {
-            .type = YP_TOKEN_INTEGER,
-            .start = token->start,
-            .end = token->end - 1
-        }))
-    };
-
-    return node;
-}
-
-// Allocate and initialize a new IntegerNode node from an INTEGER_RATIONAL_IMAGINARY token.
-static yp_imaginary_node_t *
-yp_integer_node_rational_imaginary_create(yp_parser_t *parser, const yp_token_t *token) {
-    assert(token->type == YP_TOKEN_INTEGER_RATIONAL_IMAGINARY);
-
-    yp_imaginary_node_t *node = YP_ALLOC_NODE(parser, yp_imaginary_node_t);
-    *node = (yp_imaginary_node_t) {
-        {
-            .type = YP_IMAGINARY_NODE,
-            .location = YP_LOCATION_TOKEN_VALUE(token)
-        },
-        .numeric = (yp_node_t *) yp_integer_node_rational_create(parser, &((yp_token_t) {
-            .type = YP_TOKEN_INTEGER_RATIONAL,
-            .start = token->start,
-            .end = token->end - 1
-        }))
-    };
-
-    return node;
-}
-
-// Allocate and initialize a new InNode node.
-static yp_in_node_t *
-yp_in_node_create(yp_parser_t *parser, yp_node_t *pattern, yp_statements_node_t *statements, const yp_token_t *in_keyword, const yp_token_t *then_keyword) {
-    yp_in_node_t *node = YP_ALLOC_NODE(parser, yp_in_node_t);
-
-    const uint8_t *end;
-    if (statements != NULL) {
-        end = statements->base.location.end;
-    } else if (then_keyword->type != YP_TOKEN_NOT_PROVIDED) {
-        end = then_keyword->end;
-    } else {
-        end = pattern->location.end;
-    }
-
-    *node = (yp_in_node_t) {
-        {
-            .type = YP_IN_NODE,
-            .location = {
-                .start = in_keyword->start,
-                .end = end
-            },
-        },
-        .pattern = pattern,
-        .statements = statements,
-        .in_loc = YP_LOCATION_TOKEN_VALUE(in_keyword),
-        .then_loc = YP_OPTIONAL_LOCATION_TOKEN_VALUE(then_keyword)
-    };
-
-    return node;
-}
-
-// Allocate and initialize a new InstanceVariableAndWriteNode node.
-static yp_instance_variable_and_write_node_t *
-yp_instance_variable_and_write_node_create(yp_parser_t *parser, yp_instance_variable_read_node_t *target, const yp_token_t *operator, yp_node_t *value) {
-    assert(operator->type == YP_TOKEN_AMPERSAND_AMPERSAND_EQUAL);
-    yp_instance_variable_and_write_node_t *node = YP_ALLOC_NODE(parser, yp_instance_variable_and_write_node_t);
-
-    *node = (yp_instance_variable_and_write_node_t) {
-        {
-            .type = YP_INSTANCE_VARIABLE_AND_WRITE_NODE,
-            .location = {
-                .start = target->base.location.start,
-                .end = value->location.end
-            }
-        },
-        .name = target->name,
-        .name_loc = target->base.location,
-        .operator_loc = YP_LOCATION_TOKEN_VALUE(operator),
-        .value = value
-    };
-
-    return node;
-}
-
-// Allocate and initialize a new InstanceVariableOperatorWriteNode node.
-static yp_instance_variable_operator_write_node_t *
-yp_instance_variable_operator_write_node_create(yp_parser_t *parser, yp_instance_variable_read_node_t *target, const yp_token_t *operator, yp_node_t *value) {
-    yp_instance_variable_operator_write_node_t *node = YP_ALLOC_NODE(parser, yp_instance_variable_operator_write_node_t);
-
-    *node = (yp_instance_variable_operator_write_node_t) {
-        {
-            .type = YP_INSTANCE_VARIABLE_OPERATOR_WRITE_NODE,
-            .location = {
-                .start = target->base.location.start,
-                .end = value->location.end
-            }
-        },
-        .name = target->name,
-        .name_loc = target->base.location,
-        .operator_loc = YP_LOCATION_TOKEN_VALUE(operator),
-        .value = value,
-        .operator = yp_parser_constant_id_location(parser, operator->start, operator->end - 1)
-    };
-
-    return node;
-}
-
-// Allocate and initialize a new InstanceVariableOrWriteNode node.
-static yp_instance_variable_or_write_node_t *
-yp_instance_variable_or_write_node_create(yp_parser_t *parser, yp_instance_variable_read_node_t *target, const yp_token_t *operator, yp_node_t *value) {
-    assert(operator->type == YP_TOKEN_PIPE_PIPE_EQUAL);
-    yp_instance_variable_or_write_node_t *node = YP_ALLOC_NODE(parser, yp_instance_variable_or_write_node_t);
-
-    *node = (yp_instance_variable_or_write_node_t) {
-        {
-            .type = YP_INSTANCE_VARIABLE_OR_WRITE_NODE,
-            .location = {
-                .start = target->base.location.start,
-                .end = value->location.end
-            }
-        },
-        .name = target->name,
-        .name_loc = target->base.location,
-        .operator_loc = YP_LOCATION_TOKEN_VALUE(operator),
-        .value = value
-    };
-
-    return node;
-}
-
-// Allocate and initialize a new InstanceVariableReadNode node.
-static yp_instance_variable_read_node_t *
-yp_instance_variable_read_node_create(yp_parser_t *parser, const yp_token_t *token) {
-    assert(token->type == YP_TOKEN_INSTANCE_VARIABLE);
-    yp_instance_variable_read_node_t *node = YP_ALLOC_NODE(parser, yp_instance_variable_read_node_t);
-
-    *node = (yp_instance_variable_read_node_t) {
-        {
-            .type = YP_INSTANCE_VARIABLE_READ_NODE,
-            .location = YP_LOCATION_TOKEN_VALUE(token)
-        },
-        .name = yp_parser_constant_id_token(parser, token)
-    };
-
-    return node;
-}
-
-// Initialize a new InstanceVariableWriteNode node from an InstanceVariableRead node.
-static yp_instance_variable_write_node_t *
-yp_instance_variable_write_node_create(yp_parser_t *parser, yp_instance_variable_read_node_t *read_node, yp_token_t *operator, yp_node_t *value) {
-    yp_instance_variable_write_node_t *node = YP_ALLOC_NODE(parser, yp_instance_variable_write_node_t);
-    *node = (yp_instance_variable_write_node_t) {
-        {
-            .type = YP_INSTANCE_VARIABLE_WRITE_NODE,
-            .location = {
-                .start = read_node->base.location.start,
-                .end = value->location.end
-            }
-        },
-        .name = read_node->name,
-        .name_loc = YP_LOCATION_NODE_BASE_VALUE(read_node),
-        .operator_loc = YP_OPTIONAL_LOCATION_TOKEN_VALUE(operator),
-        .value = value
-    };
-
-    return node;
-}
-
-// Allocate a new InterpolatedRegularExpressionNode node.
-static yp_interpolated_regular_expression_node_t *
-yp_interpolated_regular_expression_node_create(yp_parser_t *parser, const yp_token_t *opening) {
-    yp_interpolated_regular_expression_node_t *node = YP_ALLOC_NODE(parser, yp_interpolated_regular_expression_node_t);
-
-    *node = (yp_interpolated_regular_expression_node_t) {
-        {
-            .type = YP_INTERPOLATED_REGULAR_EXPRESSION_NODE,
-            .location = {
-                .start = opening->start,
-                .end = NULL,
-            },
-        },
-        .opening_loc = YP_LOCATION_TOKEN_VALUE(opening),
-        .closing_loc = YP_LOCATION_TOKEN_VALUE(opening),
-        .parts = YP_EMPTY_NODE_LIST
-    };
-
-    return node;
-}
-
-static inline void
-yp_interpolated_regular_expression_node_append(yp_interpolated_regular_expression_node_t *node, yp_node_t *part) {
-    if (node->base.location.start > part->location.start) {
-        node->base.location.start = part->location.start;
-    }
-    if (node->base.location.end < part->location.end) {
-        node->base.location.end = part->location.end;
-    }
-    yp_node_list_append(&node->parts, part);
-}
-
-static inline void
-yp_interpolated_regular_expression_node_closing_set(yp_interpolated_regular_expression_node_t *node, const yp_token_t *closing) {
-    node->closing_loc = YP_LOCATION_TOKEN_VALUE(closing);
-    node->base.location.end = closing->end;
-    node->base.flags |= yp_regular_expression_flags_create(closing);
-}
-
-// Allocate and initialize a new InterpolatedStringNode node.
-static yp_interpolated_string_node_t *
-yp_interpolated_string_node_create(yp_parser_t *parser, const yp_token_t *opening, const yp_node_list_t *parts, const yp_token_t *closing) {
-    yp_interpolated_string_node_t *node = YP_ALLOC_NODE(parser, yp_interpolated_string_node_t);
-
-    *node = (yp_interpolated_string_node_t) {
-        {
-            .type = YP_INTERPOLATED_STRING_NODE,
-            .location = {
-                .start = opening->start,
-                .end = closing->end,
-            },
-        },
-        .opening_loc = YP_OPTIONAL_LOCATION_TOKEN_VALUE(opening),
-        .closing_loc = YP_OPTIONAL_LOCATION_TOKEN_VALUE(closing),
-        .parts = parts == NULL ? YP_EMPTY_NODE_LIST : *parts
-    };
-
-    return node;
-}
-
-// Append a part to an InterpolatedStringNode node.
-static inline void
-yp_interpolated_string_node_append(yp_interpolated_string_node_t *node, yp_node_t *part) {
-    if (node->parts.size == 0 && node->opening_loc.start == NULL) {
-        node->base.location.start = part->location.start;
-    }
-
-    yp_node_list_append(&node->parts, part);
-    node->base.location.end = part->location.end;
-}
-
-// Set the closing token of the given InterpolatedStringNode node.
-static void
-yp_interpolated_string_node_closing_set(yp_interpolated_string_node_t *node, const yp_token_t *closing) {
-    node->closing_loc = YP_OPTIONAL_LOCATION_TOKEN_VALUE(closing);
-    node->base.location.end = closing->end;
-}
-
-// Allocate and initialize a new InterpolatedSymbolNode node.
-static yp_interpolated_symbol_node_t *
-yp_interpolated_symbol_node_create(yp_parser_t *parser, const yp_token_t *opening, const yp_node_list_t *parts, const yp_token_t *closing) {
-    yp_interpolated_symbol_node_t *node = YP_ALLOC_NODE(parser, yp_interpolated_symbol_node_t);
-
-    *node = (yp_interpolated_symbol_node_t) {
-        {
-            .type = YP_INTERPOLATED_SYMBOL_NODE,
-            .location = {
-                .start = opening->start,
-                .end = closing->end,
-            },
-        },
-        .opening_loc = YP_OPTIONAL_LOCATION_TOKEN_VALUE(opening),
-        .closing_loc = YP_OPTIONAL_LOCATION_TOKEN_VALUE(closing),
-        .parts = parts == NULL ? YP_EMPTY_NODE_LIST : *parts
-    };
-
-    return node;
-}
-
-static inline void
-yp_interpolated_symbol_node_append(yp_interpolated_symbol_node_t *node, yp_node_t *part) {
-    if (node->parts.size == 0 && node->opening_loc.start == NULL) {
-        node->base.location.start = part->location.start;
-    }
-
-    yp_node_list_append(&node->parts, part);
-    node->base.location.end = part->location.end;
-}
-
-// Allocate a new InterpolatedXStringNode node.
-static yp_interpolated_x_string_node_t *
-yp_interpolated_xstring_node_create(yp_parser_t *parser, const yp_token_t *opening, const yp_token_t *closing) {
-    yp_interpolated_x_string_node_t *node = YP_ALLOC_NODE(parser, yp_interpolated_x_string_node_t);
-
-    *node = (yp_interpolated_x_string_node_t) {
-        {
-            .type = YP_INTERPOLATED_X_STRING_NODE,
-            .location = {
-                .start = opening->start,
-                .end = closing->end
-            },
-        },
-        .opening_loc = YP_OPTIONAL_LOCATION_TOKEN_VALUE(opening),
-        .closing_loc = YP_OPTIONAL_LOCATION_TOKEN_VALUE(closing),
-        .parts = YP_EMPTY_NODE_LIST
-    };
-
-    return node;
-}
-
-static inline void
-yp_interpolated_xstring_node_append(yp_interpolated_x_string_node_t *node, yp_node_t *part) {
-    yp_node_list_append(&node->parts, part);
-    node->base.location.end = part->location.end;
-}
-
-static inline void
-yp_interpolated_xstring_node_closing_set(yp_interpolated_x_string_node_t *node, const yp_token_t *closing) {
-    node->closing_loc = YP_OPTIONAL_LOCATION_TOKEN_VALUE(closing);
-    node->base.location.end = closing->end;
-}
-
-// Allocate a new KeywordHashNode node.
-static yp_keyword_hash_node_t *
-yp_keyword_hash_node_create(yp_parser_t *parser) {
-    yp_keyword_hash_node_t *node = YP_ALLOC_NODE(parser, yp_keyword_hash_node_t);
-
-    *node = (yp_keyword_hash_node_t) {
-        .base = {
-            .type = YP_KEYWORD_HASH_NODE,
-            .location = {
-                .start = NULL,
-                .end = NULL
-            },
-        },
-        .elements = YP_EMPTY_NODE_LIST
-    };
-
-    return node;
-}
-
-// Append an element to a KeywordHashNode node.
-static void
-yp_keyword_hash_node_elements_append(yp_keyword_hash_node_t *hash, yp_node_t *element) {
-    yp_node_list_append(&hash->elements, element);
-    if (hash->base.location.start == NULL) {
-        hash->base.location.start = element->location.start;
-    }
-    hash->base.location.end = element->location.end;
-}
-
-// Allocate a new KeywordParameterNode node.
-static yp_keyword_parameter_node_t *
-yp_keyword_parameter_node_create(yp_parser_t *parser, const yp_token_t *name, yp_node_t *value) {
-    yp_keyword_parameter_node_t *node = YP_ALLOC_NODE(parser, yp_keyword_parameter_node_t);
-
-    *node = (yp_keyword_parameter_node_t) {
-        {
-            .type = YP_KEYWORD_PARAMETER_NODE,
-            .location = {
-                .start = name->start,
-                .end = value == NULL ? name->end : value->location.end
-            },
-        },
-        .name_loc = YP_LOCATION_TOKEN_VALUE(name),
-        .value = value
-    };
-
-    return node;
-}
-
-// Allocate a new KeywordRestParameterNode node.
-static yp_keyword_rest_parameter_node_t *
-yp_keyword_rest_parameter_node_create(yp_parser_t *parser, const yp_token_t *operator, const yp_token_t *name) {
-    yp_keyword_rest_parameter_node_t *node = YP_ALLOC_NODE(parser, yp_keyword_rest_parameter_node_t);
-
-    *node = (yp_keyword_rest_parameter_node_t) {
-        {
-            .type = YP_KEYWORD_REST_PARAMETER_NODE,
-            .location = {
-                .start = operator->start,
-                .end = (name->type == YP_TOKEN_NOT_PROVIDED ? operator->end : name->end)
-            },
-        },
-        .operator_loc = YP_LOCATION_TOKEN_VALUE(operator),
-        .name_loc = YP_OPTIONAL_LOCATION_TOKEN_VALUE(name)
-    };
-
-    return node;
-}
-
-// Allocate a new LambdaNode node.
-static yp_lambda_node_t *
-yp_lambda_node_create(
-    yp_parser_t *parser,
-    yp_constant_id_list_t *locals,
-    const yp_token_t *operator,
-    const yp_token_t *opening,
-    const yp_token_t *closing,
-    yp_block_parameters_node_t *parameters,
-    yp_node_t *body
-) {
-    yp_lambda_node_t *node = YP_ALLOC_NODE(parser, yp_lambda_node_t);
-
-    *node = (yp_lambda_node_t) {
-        {
-            .type = YP_LAMBDA_NODE,
-            .location = {
-                .start = operator->start,
-                .end = closing->end
-            },
-        },
-        .locals = *locals,
-        .operator_loc = YP_LOCATION_TOKEN_VALUE(operator),
-        .opening_loc = YP_LOCATION_TOKEN_VALUE(opening),
-        .closing_loc = YP_LOCATION_TOKEN_VALUE(closing),
-        .parameters = parameters,
-        .body = body
-    };
-
-    return node;
-}
-
-// Allocate and initialize a new LocalVariableAndWriteNode node.
-static yp_local_variable_and_write_node_t *
-yp_local_variable_and_write_node_create(yp_parser_t *parser, yp_node_t *target, const yp_token_t *operator, yp_node_t *value, yp_constant_id_t name, uint32_t depth) {
-    assert(YP_NODE_TYPE_P(target, YP_LOCAL_VARIABLE_READ_NODE) || YP_NODE_TYPE_P(target, YP_CALL_NODE));
-    assert(operator->type == YP_TOKEN_AMPERSAND_AMPERSAND_EQUAL);
-    yp_local_variable_and_write_node_t *node = YP_ALLOC_NODE(parser, yp_local_variable_and_write_node_t);
-
-    *node = (yp_local_variable_and_write_node_t) {
-        {
-            .type = YP_LOCAL_VARIABLE_AND_WRITE_NODE,
-            .location = {
-                .start = target->location.start,
-                .end = value->location.end
-            }
-        },
-        .name_loc = target->location,
-        .operator_loc = YP_LOCATION_TOKEN_VALUE(operator),
-        .value = value,
-        .name = name,
-        .depth = depth
-    };
-
-    return node;
-}
-
-// Allocate and initialize a new LocalVariableOperatorWriteNode node.
-static yp_local_variable_operator_write_node_t *
-yp_local_variable_operator_write_node_create(yp_parser_t *parser, yp_node_t *target, const yp_token_t *operator, yp_node_t *value, yp_constant_id_t name, uint32_t depth) {
-    yp_local_variable_operator_write_node_t *node = YP_ALLOC_NODE(parser, yp_local_variable_operator_write_node_t);
-
-    *node = (yp_local_variable_operator_write_node_t) {
-        {
-            .type = YP_LOCAL_VARIABLE_OPERATOR_WRITE_NODE,
-            .location = {
-                .start = target->location.start,
-                .end = value->location.end
-            }
-        },
-        .name_loc = target->location,
-        .operator_loc = YP_LOCATION_TOKEN_VALUE(operator),
-        .value = value,
-        .name = name,
-        .operator = yp_parser_constant_id_location(parser, operator->start, operator->end - 1),
-        .depth = depth
-    };
-
-    return node;
-}
-
-// Allocate and initialize a new LocalVariableOrWriteNode node.
-static yp_local_variable_or_write_node_t *
-yp_local_variable_or_write_node_create(yp_parser_t *parser, yp_node_t *target, const yp_token_t *operator, yp_node_t *value, yp_constant_id_t name, uint32_t depth) {
-    assert(YP_NODE_TYPE_P(target, YP_LOCAL_VARIABLE_READ_NODE) || YP_NODE_TYPE_P(target, YP_CALL_NODE));
-    assert(operator->type == YP_TOKEN_PIPE_PIPE_EQUAL);
-    yp_local_variable_or_write_node_t *node = YP_ALLOC_NODE(parser, yp_local_variable_or_write_node_t);
-
-    *node = (yp_local_variable_or_write_node_t) {
-        {
-            .type = YP_LOCAL_VARIABLE_OR_WRITE_NODE,
-            .location = {
-                .start = target->location.start,
-                .end = value->location.end
-            }
-        },
-        .name_loc = target->location,
-        .operator_loc = YP_LOCATION_TOKEN_VALUE(operator),
-        .value = value,
-        .name = name,
-        .depth = depth
-    };
-
-    return node;
-}
-
-// Allocate a new LocalVariableReadNode node.
-static yp_local_variable_read_node_t *
-yp_local_variable_read_node_create(yp_parser_t *parser, const yp_token_t *name, uint32_t depth) {
-    yp_local_variable_read_node_t *node = YP_ALLOC_NODE(parser, yp_local_variable_read_node_t);
-
-    *node = (yp_local_variable_read_node_t) {
-        {
-            .type = YP_LOCAL_VARIABLE_READ_NODE,
-            .location = YP_LOCATION_TOKEN_VALUE(name)
-        },
-        .name = yp_parser_constant_id_token(parser, name),
-        .depth = depth
-    };
-
-    return node;
-}
-
-// Allocate and initialize a new LocalVariableWriteNode node.
-static yp_local_variable_write_node_t *
-yp_local_variable_write_node_create(yp_parser_t *parser, yp_constant_id_t name, uint32_t depth, yp_node_t *value, const yp_location_t *name_loc, const yp_token_t *operator) {
-    yp_local_variable_write_node_t *node = YP_ALLOC_NODE(parser, yp_local_variable_write_node_t);
-
-    *node = (yp_local_variable_write_node_t) {
-        {
-            .type = YP_LOCAL_VARIABLE_WRITE_NODE,
-            .location = {
-                .start = name_loc->start,
-                .end = value->location.end
-            }
-        },
-        .name = name,
-        .depth = depth,
-        .value = value,
-        .name_loc = *name_loc,
-        .operator_loc = YP_OPTIONAL_LOCATION_TOKEN_VALUE(operator)
-    };
-
-    return node;
-}
-
-// Allocate and initialize a new LocalVariableTargetNode node.
-static yp_local_variable_target_node_t *
-yp_local_variable_target_node_create(yp_parser_t *parser, const yp_token_t *name) {
-    yp_local_variable_target_node_t *node = YP_ALLOC_NODE(parser, yp_local_variable_target_node_t);
-
-    *node = (yp_local_variable_target_node_t) {
-        {
-            .type = YP_LOCAL_VARIABLE_TARGET_NODE,
-            .location = YP_LOCATION_TOKEN_VALUE(name)
-        },
-        .name = yp_parser_constant_id_token(parser, name),
-        .depth = 0
-    };
-
-    return node;
-}
-
-// Allocate and initialize a new MatchPredicateNode node.
-static yp_match_predicate_node_t *
-yp_match_predicate_node_create(yp_parser_t *parser, yp_node_t *value, yp_node_t *pattern, const yp_token_t *operator) {
-    yp_match_predicate_node_t *node = YP_ALLOC_NODE(parser, yp_match_predicate_node_t);
-
-    *node = (yp_match_predicate_node_t) {
-        {
-            .type = YP_MATCH_PREDICATE_NODE,
-            .location = {
-                .start = value->location.start,
-                .end = pattern->location.end
-            }
-        },
-        .value = value,
-        .pattern = pattern,
-        .operator_loc = YP_LOCATION_TOKEN_VALUE(operator)
-    };
-
-    return node;
-}
-
-// Allocate and initialize a new MatchRequiredNode node.
-static yp_match_required_node_t *
-yp_match_required_node_create(yp_parser_t *parser, yp_node_t *value, yp_node_t *pattern, const yp_token_t *operator) {
-    yp_match_required_node_t *node = YP_ALLOC_NODE(parser, yp_match_required_node_t);
-
-    *node = (yp_match_required_node_t) {
-        {
-            .type = YP_MATCH_REQUIRED_NODE,
-            .location = {
-                .start = value->location.start,
-                .end = pattern->location.end
-            }
-        },
-        .value = value,
-        .pattern = pattern,
-        .operator_loc = YP_LOCATION_TOKEN_VALUE(operator)
-    };
-
-    return node;
-}
-
-// Allocate a new ModuleNode node.
-static yp_module_node_t *
-yp_module_node_create(yp_parser_t *parser, yp_constant_id_list_t *locals, const yp_token_t *module_keyword, yp_node_t *constant_path, const yp_token_t *name, yp_node_t *body, const yp_token_t *end_keyword) {
-    yp_module_node_t *node = YP_ALLOC_NODE(parser, yp_module_node_t);
-    yp_constant_id_t name_constant = yp_parser_constant_id_token(parser, name);
-
-    *node = (yp_module_node_t) {
-        {
-            .type = YP_MODULE_NODE,
-            .location = {
-                .start = module_keyword->start,
-                .end = end_keyword->end
-            }
-        },
-        .locals = (locals == NULL ? ((yp_constant_id_list_t) { .ids = NULL, .size = 0, .capacity = 0 }) : *locals),
-        .module_keyword_loc = YP_LOCATION_TOKEN_VALUE(module_keyword),
-        .constant_path = constant_path,
-        .body = body,
-        .end_keyword_loc = YP_LOCATION_TOKEN_VALUE(end_keyword),
-        .name = name_constant,
-        .name_constant = name_constant
-    };
-
-    return node;
-}
-
-// Allocate a new MultiWriteNode node.
-static yp_multi_write_node_t *
-yp_multi_write_node_create(yp_parser_t *parser, const yp_token_t *operator, yp_node_t *value, const yp_location_t *lparen_loc, const yp_location_t *rparen_loc) {
-    yp_multi_write_node_t *node = YP_ALLOC_NODE(parser, yp_multi_write_node_t);
-
-    *node = (yp_multi_write_node_t) {
-        {
-            .type = YP_MULTI_WRITE_NODE,
-            .location = {
-                .start = lparen_loc->start,
-                .end = value == NULL ? rparen_loc->end : value->location.end
-            },
-        },
-        .operator_loc = YP_OPTIONAL_LOCATION_TOKEN_VALUE(operator),
-        .value = value,
-        .lparen_loc = *lparen_loc,
-        .rparen_loc = *rparen_loc,
-        .targets = YP_EMPTY_NODE_LIST
-    };
-
-    return node;
-}
-
-// Append a target to a MultiWriteNode node.
-static void
-yp_multi_write_node_targets_append(yp_multi_write_node_t *node, yp_node_t *target) {
-    yp_node_list_append(&node->targets, target);
-
-    if (node->base.location.start == NULL || (node->base.location.start > target->location.start)) {
-        node->base.location.start = target->location.start;
-    }
-
-    if (node->base.location.end == NULL || (node->base.location.end < target->location.end)) {
-        node->base.location.end = target->location.end;
-    }
-}
-
-static inline void
-yp_multi_write_node_operator_loc_set(yp_multi_write_node_t *node, const yp_token_t *operator) {
-    node->operator_loc = YP_OPTIONAL_LOCATION_TOKEN_VALUE(operator);
-}
-
-// Allocate and initialize a new NextNode node.
-static yp_next_node_t *
-yp_next_node_create(yp_parser_t *parser, const yp_token_t *keyword, yp_arguments_node_t *arguments) {
-    assert(keyword->type == YP_TOKEN_KEYWORD_NEXT);
-    yp_next_node_t *node = YP_ALLOC_NODE(parser, yp_next_node_t);
-
-    *node = (yp_next_node_t) {
-        {
-            .type = YP_NEXT_NODE,
-            .location = {
-                .start = keyword->start,
-                .end = (arguments == NULL ? keyword->end : arguments->base.location.end)
-            }
-        },
-        .keyword_loc = YP_LOCATION_TOKEN_VALUE(keyword),
-        .arguments = arguments
-    };
-
-    return node;
-}
-
-// Allocate and initialize a new NilNode node.
-static yp_nil_node_t *
-yp_nil_node_create(yp_parser_t *parser, const yp_token_t *token) {
-    assert(token->type == YP_TOKEN_KEYWORD_NIL);
-    yp_nil_node_t *node = YP_ALLOC_NODE(parser, yp_nil_node_t);
-
-    *node = (yp_nil_node_t) {{ .type = YP_NIL_NODE, .location = YP_LOCATION_TOKEN_VALUE(token) }};
-    return node;
-}
-
-// Allocate and initialize a new NoKeywordsParameterNode node.
-static yp_no_keywords_parameter_node_t *
-yp_no_keywords_parameter_node_create(yp_parser_t *parser, const yp_token_t *operator, const yp_token_t *keyword) {
-    assert(operator->type == YP_TOKEN_USTAR_STAR || operator->type == YP_TOKEN_STAR_STAR);
-    assert(keyword->type == YP_TOKEN_KEYWORD_NIL);
-    yp_no_keywords_parameter_node_t *node = YP_ALLOC_NODE(parser, yp_no_keywords_parameter_node_t);
-
-    *node = (yp_no_keywords_parameter_node_t) {
-        {
-            .type = YP_NO_KEYWORDS_PARAMETER_NODE,
-            .location = {
-                .start = operator->start,
-                .end = keyword->end
-            }
-        },
-        .operator_loc = YP_LOCATION_TOKEN_VALUE(operator),
-        .keyword_loc = YP_LOCATION_TOKEN_VALUE(keyword)
-    };
-
-    return node;
-}
-
-// Allocate a new NthReferenceReadNode node.
-static yp_numbered_reference_read_node_t *
-yp_numbered_reference_read_node_create(yp_parser_t *parser, const yp_token_t *name) {
-    assert(name->type == YP_TOKEN_NUMBERED_REFERENCE);
-    yp_numbered_reference_read_node_t *node = YP_ALLOC_NODE(parser, yp_numbered_reference_read_node_t);
-
-    *node = (yp_numbered_reference_read_node_t) {
-        {
-            .type = YP_NUMBERED_REFERENCE_READ_NODE,
-            .location = YP_LOCATION_TOKEN_VALUE(name),
-        },
-        .number = parse_decimal_number(parser, name->start + 1, name->end)
-    };
-
-    return node;
-}
-
-// Allocate a new OptionalParameterNode node.
-static yp_optional_parameter_node_t *
-yp_optional_parameter_node_create(yp_parser_t *parser, const yp_token_t *name, const yp_token_t *operator, yp_node_t *value) {
-    yp_optional_parameter_node_t *node = YP_ALLOC_NODE(parser, yp_optional_parameter_node_t);
-
-    *node = (yp_optional_parameter_node_t) {
-        {
-            .type = YP_OPTIONAL_PARAMETER_NODE,
-            .location = {
-                .start = name->start,
-                .end = value->location.end
-            }
-        },
-        .name = yp_parser_constant_id_token(parser, name),
-        .name_loc = YP_LOCATION_TOKEN_VALUE(name),
-        .operator_loc = YP_LOCATION_TOKEN_VALUE(operator),
-        .value = value
-    };
-
-    return node;
-}
-
-// Allocate and initialize a new OrNode node.
-static yp_or_node_t *
-yp_or_node_create(yp_parser_t *parser, yp_node_t *left, const yp_token_t *operator, yp_node_t *right) {
-    yp_or_node_t *node = YP_ALLOC_NODE(parser, yp_or_node_t);
-
-    *node = (yp_or_node_t) {
-        {
-            .type = YP_OR_NODE,
-            .location = {
-                .start = left->location.start,
-                .end = right->location.end
-            }
-        },
-        .left = left,
-        .right = right,
-        .operator_loc = YP_LOCATION_TOKEN_VALUE(operator)
-    };
-
-    return node;
-}
-
-// Allocate and initialize a new ParametersNode node.
-static yp_parameters_node_t *
-yp_parameters_node_create(yp_parser_t *parser) {
-    yp_parameters_node_t *node = YP_ALLOC_NODE(parser, yp_parameters_node_t);
-
-    *node = (yp_parameters_node_t) {
-        {
-            .type = YP_PARAMETERS_NODE,
-            .location = { .start = parser->current.start, .end = parser->current.start },
-        },
-        .rest = NULL,
-        .keyword_rest = NULL,
-        .block = NULL,
-        .requireds = YP_EMPTY_NODE_LIST,
-        .optionals = YP_EMPTY_NODE_LIST,
-        .posts = YP_EMPTY_NODE_LIST,
-        .keywords = YP_EMPTY_NODE_LIST
-    };
-
-    return node;
-}
-
-// Set the location properly for the parameters node.
-static void
-yp_parameters_node_location_set(yp_parameters_node_t *params, yp_node_t *param) {
-    if (params->base.location.start == NULL) {
-        params->base.location.start = param->location.start;
-    } else {
-        params->base.location.start = params->base.location.start < param->location.start ? params->base.location.start : param->location.start;
-    }
-
-    if (params->base.location.end == NULL) {
-        params->base.location.end = param->location.end;
-    } else {
-        params->base.location.end = params->base.location.end > param->location.end ? params->base.location.end : param->location.end;
-    }
-}
-
-// Append a required parameter to a ParametersNode node.
-static void
-yp_parameters_node_requireds_append(yp_parameters_node_t *params, yp_node_t *param) {
-    yp_parameters_node_location_set(params, param);
-    yp_node_list_append(&params->requireds, param);
-}
-
-// Append an optional parameter to a ParametersNode node.
-static void
-yp_parameters_node_optionals_append(yp_parameters_node_t *params, yp_optional_parameter_node_t *param) {
-    yp_parameters_node_location_set(params, (yp_node_t *) param);
-    yp_node_list_append(&params->optionals, (yp_node_t *) param);
-}
-
-// Append a post optional arguments parameter to a ParametersNode node.
-static void
-yp_parameters_node_posts_append(yp_parameters_node_t *params, yp_node_t *param) {
-    yp_parameters_node_location_set(params, param);
-    yp_node_list_append(&params->posts, param);
-}
-
-// Set the rest parameter on a ParametersNode node.
-static void
-yp_parameters_node_rest_set(yp_parameters_node_t *params, yp_rest_parameter_node_t *param) {
-    assert(params->rest == NULL);
-    yp_parameters_node_location_set(params, (yp_node_t *) param);
-    params->rest = param;
-}
-
-// Append a keyword parameter to a ParametersNode node.
-static void
-yp_parameters_node_keywords_append(yp_parameters_node_t *params, yp_node_t *param) {
-    yp_parameters_node_location_set(params, param);
-    yp_node_list_append(&params->keywords, param);
-}
-
-// Set the keyword rest parameter on a ParametersNode node.
-static void
-yp_parameters_node_keyword_rest_set(yp_parameters_node_t *params, yp_node_t *param) {
-    assert(params->keyword_rest == NULL);
-    yp_parameters_node_location_set(params, param);
-    params->keyword_rest = param;
-}
-
-// Set the block parameter on a ParametersNode node.
-static void
-yp_parameters_node_block_set(yp_parameters_node_t *params, yp_block_parameter_node_t *param) {
-    assert(params->block == NULL);
-    yp_parameters_node_location_set(params, (yp_node_t *) param);
-    params->block = param;
-}
-
-// Allocate a new ProgramNode node.
-static yp_program_node_t *
-yp_program_node_create(yp_parser_t *parser, yp_constant_id_list_t *locals, yp_statements_node_t *statements) {
-    yp_program_node_t *node = YP_ALLOC_NODE(parser, yp_program_node_t);
-
-    *node = (yp_program_node_t) {
-        {
-            .type = YP_PROGRAM_NODE,
-            .location = {
-                .start = statements == NULL ? parser->start : statements->base.location.start,
-                .end = statements == NULL ? parser->end : statements->base.location.end
-            }
-        },
-        .locals = *locals,
-        .statements = statements
-    };
-
-    return node;
-}
-
-// Allocate and initialize new ParenthesesNode node.
-static yp_parentheses_node_t *
-yp_parentheses_node_create(yp_parser_t *parser, const yp_token_t *opening, yp_node_t *body, const yp_token_t *closing) {
-    yp_parentheses_node_t *node = YP_ALLOC_NODE(parser, yp_parentheses_node_t);
-
-    *node = (yp_parentheses_node_t) {
-        {
-            .type = YP_PARENTHESES_NODE,
-            .location = {
-                .start = opening->start,
-                .end = closing->end
-            }
-        },
-        .body = body,
-        .opening_loc = YP_LOCATION_TOKEN_VALUE(opening),
-        .closing_loc = YP_LOCATION_TOKEN_VALUE(closing)
-    };
-
-    return node;
-}
-
-// Allocate and initialize a new PinnedExpressionNode node.
-static yp_pinned_expression_node_t *
-yp_pinned_expression_node_create(yp_parser_t *parser, yp_node_t *expression, const yp_token_t *operator, const yp_token_t *lparen, const yp_token_t *rparen) {
-    yp_pinned_expression_node_t *node = YP_ALLOC_NODE(parser, yp_pinned_expression_node_t);
-
-    *node = (yp_pinned_expression_node_t) {
-        {
-            .type = YP_PINNED_EXPRESSION_NODE,
-            .location = {
-                .start = operator->start,
-                .end = rparen->end
-            }
-        },
-        .expression = expression,
-        .operator_loc = YP_LOCATION_TOKEN_VALUE(operator),
-        .lparen_loc = YP_LOCATION_TOKEN_VALUE(lparen),
-        .rparen_loc = YP_LOCATION_TOKEN_VALUE(rparen)
-    };
-
-    return node;
-}
-
-// Allocate and initialize a new PinnedVariableNode node.
-static yp_pinned_variable_node_t *
-yp_pinned_variable_node_create(yp_parser_t *parser, const yp_token_t *operator, yp_node_t *variable) {
-    yp_pinned_variable_node_t *node = YP_ALLOC_NODE(parser, yp_pinned_variable_node_t);
-
-    *node = (yp_pinned_variable_node_t) {
-        {
-            .type = YP_PINNED_VARIABLE_NODE,
-            .location = {
-                .start = operator->start,
-                .end = variable->location.end
-            }
-        },
-        .variable = variable,
-        .operator_loc = YP_LOCATION_TOKEN_VALUE(operator)
-    };
-
-    return node;
-}
-
-// Allocate and initialize a new PostExecutionNode node.
-static yp_post_execution_node_t *
-yp_post_execution_node_create(yp_parser_t *parser, const yp_token_t *keyword, const yp_token_t *opening, yp_statements_node_t *statements, const yp_token_t *closing) {
-    yp_post_execution_node_t *node = YP_ALLOC_NODE(parser, yp_post_execution_node_t);
-
-    *node = (yp_post_execution_node_t) {
-        {
-            .type = YP_POST_EXECUTION_NODE,
-            .location = {
-                .start = keyword->start,
-                .end = closing->end
-            }
-        },
-        .statements = statements,
-        .keyword_loc = YP_LOCATION_TOKEN_VALUE(keyword),
-        .opening_loc = YP_LOCATION_TOKEN_VALUE(opening),
-        .closing_loc = YP_LOCATION_TOKEN_VALUE(closing)
-    };
-
-    return node;
-}
-
-// Allocate and initialize a new PreExecutionNode node.
-static yp_pre_execution_node_t *
-yp_pre_execution_node_create(yp_parser_t *parser, const yp_token_t *keyword, const yp_token_t *opening, yp_statements_node_t *statements, const yp_token_t *closing) {
-    yp_pre_execution_node_t *node = YP_ALLOC_NODE(parser, yp_pre_execution_node_t);
-
-    *node = (yp_pre_execution_node_t) {
-        {
-            .type = YP_PRE_EXECUTION_NODE,
-            .location = {
-                .start = keyword->start,
-                .end = closing->end
-            }
-        },
-        .statements = statements,
-        .keyword_loc = YP_LOCATION_TOKEN_VALUE(keyword),
-        .opening_loc = YP_LOCATION_TOKEN_VALUE(opening),
-        .closing_loc = YP_LOCATION_TOKEN_VALUE(closing)
-    };
-
-    return node;
-}
-
-// Allocate and initialize new RangeNode node.
-static yp_range_node_t *
-yp_range_node_create(yp_parser_t *parser, yp_node_t *left, const yp_token_t *operator, yp_node_t *right) {
-    yp_range_node_t *node = YP_ALLOC_NODE(parser, yp_range_node_t);
-
-    *node = (yp_range_node_t) {
-        {
-            .type = YP_RANGE_NODE,
-            .location = {
-                .start = (left == NULL ? operator->start : left->location.start),
-                .end = (right == NULL ? operator->end : right->location.end)
-            }
-        },
-        .left = left,
-        .right = right,
-        .operator_loc = YP_LOCATION_TOKEN_VALUE(operator)
-    };
-
-    switch (operator->type) {
-        case YP_TOKEN_DOT_DOT_DOT:
-        case YP_TOKEN_UDOT_DOT_DOT:
-            node->base.flags |= YP_RANGE_FLAGS_EXCLUDE_END;
-            break;
-        default:
-            break;
-    }
-
-    return node;
-}
-
-// Allocate and initialize a new RedoNode node.
-static yp_redo_node_t *
-yp_redo_node_create(yp_parser_t *parser, const yp_token_t *token) {
-    assert(token->type == YP_TOKEN_KEYWORD_REDO);
-    yp_redo_node_t *node = YP_ALLOC_NODE(parser, yp_redo_node_t);
-
-    *node = (yp_redo_node_t) {{ .type = YP_REDO_NODE, .location = YP_LOCATION_TOKEN_VALUE(token) }};
-    return node;
-}
-
-// Allocate a new RegularExpressionNode node.
-static yp_regular_expression_node_t *
-yp_regular_expression_node_create(yp_parser_t *parser, const yp_token_t *opening, const yp_token_t *content, const yp_token_t *closing) {
-    yp_regular_expression_node_t *node = YP_ALLOC_NODE(parser, yp_regular_expression_node_t);
-
-    *node = (yp_regular_expression_node_t) {
-        {
-            .type = YP_REGULAR_EXPRESSION_NODE,
-            .flags = yp_regular_expression_flags_create(closing),
-            .location = {
-                .start = MIN(opening->start, closing->start),
-                .end = MAX(opening->end, closing->end)
-            }
-        },
-        .opening_loc = YP_LOCATION_TOKEN_VALUE(opening),
-        .content_loc = YP_LOCATION_TOKEN_VALUE(content),
-        .closing_loc = YP_LOCATION_TOKEN_VALUE(closing),
-        .unescaped = YP_EMPTY_STRING
-    };
-
-    return node;
-}
-
-// Allocate a new RequiredDestructuredParameterNode node.
-static yp_required_destructured_parameter_node_t *
-yp_required_destructured_parameter_node_create(yp_parser_t *parser, const yp_token_t *opening) {
-    yp_required_destructured_parameter_node_t *node = YP_ALLOC_NODE(parser, yp_required_destructured_parameter_node_t);
-
-    *node = (yp_required_destructured_parameter_node_t) {
-        {
-            .type = YP_REQUIRED_DESTRUCTURED_PARAMETER_NODE,
-            .location = YP_LOCATION_TOKEN_VALUE(opening)
-        },
-        .opening_loc = YP_LOCATION_TOKEN_VALUE(opening),
-        .closing_loc = { .start = NULL, .end = NULL },
-        .parameters = YP_EMPTY_NODE_LIST
-    };
-
-    return node;
-}
-
-// Append a new parameter to the given RequiredDestructuredParameterNode node.
-static void
-yp_required_destructured_parameter_node_append_parameter(yp_required_destructured_parameter_node_t *node, yp_node_t *parameter) {
-    yp_node_list_append(&node->parameters, parameter);
-}
-
-// Set the closing token of the given RequiredDestructuredParameterNode node.
-static void
-yp_required_destructured_parameter_node_closing_set(yp_required_destructured_parameter_node_t *node, const yp_token_t *closing) {
-    node->closing_loc = YP_LOCATION_TOKEN_VALUE(closing);
-    node->base.location.end = closing->end;
-}
-
-// Allocate a new RequiredParameterNode node.
-static yp_required_parameter_node_t *
-yp_required_parameter_node_create(yp_parser_t *parser, const yp_token_t *token) {
-    yp_required_parameter_node_t *node = YP_ALLOC_NODE(parser, yp_required_parameter_node_t);
-
-    *node = (yp_required_parameter_node_t) {
-        {
-            .type = YP_REQUIRED_PARAMETER_NODE,
-            .location = YP_LOCATION_TOKEN_VALUE(token)
-        },
-        .name = yp_parser_constant_id_token(parser, token)
-    };
-
-    return node;
-}
-
-// Allocate a new RescueModifierNode node.
-static yp_rescue_modifier_node_t *
-yp_rescue_modifier_node_create(yp_parser_t *parser, yp_node_t *expression, const yp_token_t *keyword, yp_node_t *rescue_expression) {
-    yp_rescue_modifier_node_t *node = YP_ALLOC_NODE(parser, yp_rescue_modifier_node_t);
-
-    *node = (yp_rescue_modifier_node_t) {
-        {
-            .type = YP_RESCUE_MODIFIER_NODE,
-            .location = {
-                .start = expression->location.start,
-                .end = rescue_expression->location.end
-            }
-        },
-        .expression = expression,
-        .keyword_loc = YP_LOCATION_TOKEN_VALUE(keyword),
-        .rescue_expression = rescue_expression
-    };
-
-    return node;
-}
-
-// Allocate and initiliaze a new RescueNode node.
-static yp_rescue_node_t *
-yp_rescue_node_create(yp_parser_t *parser, const yp_token_t *keyword) {
-    yp_rescue_node_t *node = YP_ALLOC_NODE(parser, yp_rescue_node_t);
-
-    *node = (yp_rescue_node_t) {
-        {
-            .type = YP_RESCUE_NODE,
-            .location = {
-                .start = keyword->start,
-                .end = keyword->end
-            }
-        },
-        .keyword_loc = YP_LOCATION_TOKEN_VALUE(keyword),
-        .operator_loc = YP_OPTIONAL_LOCATION_NOT_PROVIDED_VALUE,
-        .reference = NULL,
-        .statements = NULL,
-        .consequent = NULL,
-        .exceptions = YP_EMPTY_NODE_LIST
-    };
-
-    return node;
-}
-
-static inline void
-yp_rescue_node_operator_set(yp_rescue_node_t *node, const yp_token_t *operator) {
-    node->operator_loc = YP_OPTIONAL_LOCATION_TOKEN_VALUE(operator);
-}
-
-// Set the reference of a rescue node, and update the location of the node.
-static void
-yp_rescue_node_reference_set(yp_rescue_node_t *node, yp_node_t *reference) {
-    node->reference = reference;
-    node->base.location.end = reference->location.end;
-}
-
-// Set the statements of a rescue node, and update the location of the node.
-static void
-yp_rescue_node_statements_set(yp_rescue_node_t *node, yp_statements_node_t *statements) {
-    node->statements = statements;
-    if ((statements != NULL) && (statements->body.size > 0)) {
-        node->base.location.end = statements->base.location.end;
-    }
-}
-
-// Set the consequent of a rescue node, and update the location.
-static void
-yp_rescue_node_consequent_set(yp_rescue_node_t *node, yp_rescue_node_t *consequent) {
-    node->consequent = consequent;
-    node->base.location.end = consequent->base.location.end;
-}
-
-// Append an exception node to a rescue node, and update the location.
-static void
-yp_rescue_node_exceptions_append(yp_rescue_node_t *node, yp_node_t *exception) {
-    yp_node_list_append(&node->exceptions, exception);
-    node->base.location.end = exception->location.end;
-}
-
-// Allocate a new RestParameterNode node.
-static yp_rest_parameter_node_t *
-yp_rest_parameter_node_create(yp_parser_t *parser, const yp_token_t *operator, const yp_token_t *name) {
-    yp_rest_parameter_node_t *node = YP_ALLOC_NODE(parser, yp_rest_parameter_node_t);
-
-    *node = (yp_rest_parameter_node_t) {
-        {
-            .type = YP_REST_PARAMETER_NODE,
-            .location = {
-                .start = operator->start,
-                .end = (name->type == YP_TOKEN_NOT_PROVIDED ? operator->end : name->end)
-            }
-        },
-        .operator_loc = YP_LOCATION_TOKEN_VALUE(operator),
-        .name_loc = YP_OPTIONAL_LOCATION_TOKEN_VALUE(name)
-    };
-
-    return node;
-}
-
-// Allocate and initialize a new RetryNode node.
-static yp_retry_node_t *
-yp_retry_node_create(yp_parser_t *parser, const yp_token_t *token) {
-    assert(token->type == YP_TOKEN_KEYWORD_RETRY);
-    yp_retry_node_t *node = YP_ALLOC_NODE(parser, yp_retry_node_t);
-
-    *node = (yp_retry_node_t) {{ .type = YP_RETRY_NODE, .location = YP_LOCATION_TOKEN_VALUE(token) }};
-    return node;
-}
-
-// Allocate a new ReturnNode node.
-static yp_return_node_t *
-yp_return_node_create(yp_parser_t *parser, const yp_token_t *keyword, yp_arguments_node_t *arguments) {
-    yp_return_node_t *node = YP_ALLOC_NODE(parser, yp_return_node_t);
-
-    *node = (yp_return_node_t) {
-        {
-            .type = YP_RETURN_NODE,
-            .location = {
-                .start = keyword->start,
-                .end = (arguments == NULL ? keyword->end : arguments->base.location.end)
-            }
-        },
-        .keyword_loc = YP_LOCATION_TOKEN_VALUE(keyword),
-        .arguments = arguments
-    };
-
-    return node;
-}
-
-// Allocate and initialize a new SelfNode node.
-static yp_self_node_t *
-yp_self_node_create(yp_parser_t *parser, const yp_token_t *token) {
-    assert(token->type == YP_TOKEN_KEYWORD_SELF);
-    yp_self_node_t *node = YP_ALLOC_NODE(parser, yp_self_node_t);
-
-    *node = (yp_self_node_t) {{ .type = YP_SELF_NODE, .location = YP_LOCATION_TOKEN_VALUE(token) }};
-    return node;
-}
-
-// Allocate a new SingletonClassNode node.
-static yp_singleton_class_node_t *
-yp_singleton_class_node_create(yp_parser_t *parser, yp_constant_id_list_t *locals, const yp_token_t *class_keyword, const yp_token_t *operator, yp_node_t *expression, yp_node_t *body, const yp_token_t *end_keyword) {
-    yp_singleton_class_node_t *node = YP_ALLOC_NODE(parser, yp_singleton_class_node_t);
-
-    *node = (yp_singleton_class_node_t) {
-        {
-            .type = YP_SINGLETON_CLASS_NODE,
-            .location = {
-                .start = class_keyword->start,
-                .end = end_keyword->end
-            }
-        },
-        .locals = *locals,
-        .class_keyword_loc = YP_LOCATION_TOKEN_VALUE(class_keyword),
-        .operator_loc = YP_LOCATION_TOKEN_VALUE(operator),
-        .expression = expression,
-        .body = body,
-        .end_keyword_loc = YP_LOCATION_TOKEN_VALUE(end_keyword)
-    };
-
-    return node;
-}
-
-// Allocate and initialize a new SourceEncodingNode node.
-static yp_source_encoding_node_t *
-yp_source_encoding_node_create(yp_parser_t *parser, const yp_token_t *token) {
-    assert(token->type == YP_TOKEN_KEYWORD___ENCODING__);
-    yp_source_encoding_node_t *node = YP_ALLOC_NODE(parser, yp_source_encoding_node_t);
-
-    *node = (yp_source_encoding_node_t) {{ .type = YP_SOURCE_ENCODING_NODE, .location = YP_LOCATION_TOKEN_VALUE(token) }};
-    return node;
-}
-
-// Allocate and initialize a new SourceFileNode node.
-static yp_source_file_node_t*
-yp_source_file_node_create(yp_parser_t *parser, const yp_token_t *file_keyword) {
-    yp_source_file_node_t *node = YP_ALLOC_NODE(parser, yp_source_file_node_t);
-    assert(file_keyword->type == YP_TOKEN_KEYWORD___FILE__);
-
-    *node = (yp_source_file_node_t) {
-        {
-            .type = YP_SOURCE_FILE_NODE,
-            .location = YP_LOCATION_TOKEN_VALUE(file_keyword),
-        },
-        .filepath = parser->filepath_string,
-    };
-
-    return node;
-}
-
-// Allocate and initialize a new SourceLineNode node.
-static yp_source_line_node_t *
-yp_source_line_node_create(yp_parser_t *parser, const yp_token_t *token) {
-    assert(token->type == YP_TOKEN_KEYWORD___LINE__);
-    yp_source_line_node_t *node = YP_ALLOC_NODE(parser, yp_source_line_node_t);
-
-    *node = (yp_source_line_node_t) {{ .type = YP_SOURCE_LINE_NODE, .location = YP_LOCATION_TOKEN_VALUE(token) }};
-    return node;
-}
-
-// Allocate a new SplatNode node.
-static yp_splat_node_t *
-yp_splat_node_create(yp_parser_t *parser, const yp_token_t *operator, yp_node_t *expression) {
-    yp_splat_node_t *node = YP_ALLOC_NODE(parser, yp_splat_node_t);
-
-    *node = (yp_splat_node_t) {
-        {
-            .type = YP_SPLAT_NODE,
-            .location = {
-                .start = operator->start,
-                .end = (expression == NULL ? operator->end : expression->location.end)
-            }
-        },
-        .operator_loc = YP_LOCATION_TOKEN_VALUE(operator),
-        .expression = expression
-    };
-
-    return node;
-}
-
-// Allocate and initialize a new StatementsNode node.
-static yp_statements_node_t *
-yp_statements_node_create(yp_parser_t *parser) {
-    yp_statements_node_t *node = YP_ALLOC_NODE(parser, yp_statements_node_t);
-
-    *node = (yp_statements_node_t) {
-        {
-            .type = YP_STATEMENTS_NODE,
-            .location = YP_LOCATION_NULL_VALUE(parser)
-        },
-        .body = YP_EMPTY_NODE_LIST
-    };
-
-    return node;
-}
-
-// Get the length of the given StatementsNode node's body.
-static size_t
-yp_statements_node_body_length(yp_statements_node_t *node) {
-    return node && node->body.size;
-}
-
-// Set the location of the given StatementsNode.
-static void
-yp_statements_node_location_set(yp_statements_node_t *node, const uint8_t *start, const uint8_t *end) {
-    node->base.location = (yp_location_t) { .start = start, .end = end };
-}
-
-// Append a new node to the given StatementsNode node's body.
-static void
-yp_statements_node_body_append(yp_statements_node_t *node, yp_node_t *statement) {
-    if (yp_statements_node_body_length(node) == 0 || statement->location.start < node->base.location.start) {
-        node->base.location.start = statement->location.start;
-    }
-    if (statement->location.end > node->base.location.end) {
-        node->base.location.end = statement->location.end;
-    }
-
-    yp_node_list_append(&node->body, statement);
-
-    // Every statement gets marked as a place where a newline can occur.
-    statement->flags |= YP_NODE_FLAG_NEWLINE;
-}
-
-// Allocate a new StringConcatNode node.
-static yp_string_concat_node_t *
-yp_string_concat_node_create(yp_parser_t *parser, yp_node_t *left, yp_node_t *right) {
-    yp_string_concat_node_t *node = YP_ALLOC_NODE(parser, yp_string_concat_node_t);
-
-    *node = (yp_string_concat_node_t) {
-        {
-            .type = YP_STRING_CONCAT_NODE,
-            .location = {
-                .start = left->location.start,
-                .end = right->location.end
-            }
-        },
-        .left = left,
-        .right = right
-    };
-
-    return node;
-}
-
-// Allocate a new StringNode node.
-static yp_string_node_t *
-yp_string_node_create(yp_parser_t *parser, const yp_token_t *opening, const yp_token_t *content, const yp_token_t *closing) {
-    yp_string_node_t *node = YP_ALLOC_NODE(parser, yp_string_node_t);
-
-    *node = (yp_string_node_t) {
-        {
-            .type = YP_STRING_NODE,
-            .location = {
-                .start = (opening->type == YP_TOKEN_NOT_PROVIDED ? content->start : opening->start),
-                .end = (closing->type == YP_TOKEN_NOT_PROVIDED ? content->end : closing->end)
-            }
-        },
-        .opening_loc = YP_OPTIONAL_LOCATION_TOKEN_VALUE(opening),
-        .content_loc = YP_LOCATION_TOKEN_VALUE(content),
-        .closing_loc = YP_OPTIONAL_LOCATION_TOKEN_VALUE(closing),
-        .unescaped = YP_EMPTY_STRING
-    };
-
-    return node;
-}
-
-// Allocate and initialize a new SuperNode node.
-static yp_super_node_t *
-yp_super_node_create(yp_parser_t *parser, const yp_token_t *keyword, yp_arguments_t *arguments) {
-    assert(keyword->type == YP_TOKEN_KEYWORD_SUPER);
-    yp_super_node_t *node = YP_ALLOC_NODE(parser, yp_super_node_t);
-
-    const uint8_t *end;
-    if (arguments->block != NULL) {
-        end = arguments->block->base.location.end;
-    } else if (arguments->closing_loc.start != NULL) {
-        end = arguments->closing_loc.end;
-    } else if (arguments->arguments != NULL) {
-        end = arguments->arguments->base.location.end;
-    } else {
-        assert(false && "unreachable");
-        end = NULL;
-    }
-
-    *node = (yp_super_node_t) {
-        {
-            .type = YP_SUPER_NODE,
-            .location = {
-                .start = keyword->start,
-                .end = end,
-            }
-        },
-        .keyword_loc = YP_LOCATION_TOKEN_VALUE(keyword),
-        .lparen_loc = arguments->opening_loc,
-        .arguments = arguments->arguments,
-        .rparen_loc = arguments->closing_loc,
-        .block = arguments->block
-    };
-
-    return node;
-}
-
-// Allocate a new SymbolNode node.
-static yp_symbol_node_t *
-yp_symbol_node_create(yp_parser_t *parser, const yp_token_t *opening, const yp_token_t *value, const yp_token_t *closing) {
-    yp_symbol_node_t *node = YP_ALLOC_NODE(parser, yp_symbol_node_t);
-
-    *node = (yp_symbol_node_t) {
-        {
-            .type = YP_SYMBOL_NODE,
-            .location = {
-                .start = (opening->type == YP_TOKEN_NOT_PROVIDED ? value->start : opening->start),
-                .end = (closing->type == YP_TOKEN_NOT_PROVIDED ? value->end : closing->end)
-            }
-        },
-        .opening_loc = YP_OPTIONAL_LOCATION_TOKEN_VALUE(opening),
-        .value_loc = YP_LOCATION_TOKEN_VALUE(value),
-        .closing_loc = YP_OPTIONAL_LOCATION_TOKEN_VALUE(closing),
-        .unescaped = YP_EMPTY_STRING
-    };
-
-    return node;
-}
-
-// Allocate and initialize a new SymbolNode node from a label.
-static yp_symbol_node_t *
-yp_symbol_node_label_create(yp_parser_t *parser, const yp_token_t *token) {
-    yp_symbol_node_t *node;
-
-    switch (token->type) {
-        case YP_TOKEN_LABEL: {
-            yp_token_t opening = not_provided(parser);
-            yp_token_t closing = { .type = YP_TOKEN_LABEL_END, .start = token->end - 1, .end = token->end };
-
-            yp_token_t label = { .type = YP_TOKEN_LABEL, .start = token->start, .end = token->end - 1 };
-            node = yp_symbol_node_create(parser, &opening, &label, &closing);
-
-            assert((label.end - label.start) >= 0);
-            yp_string_shared_init(&node->unescaped, label.start, label.end);
-
-            yp_unescape_manipulate_string(parser, &node->unescaped, YP_UNESCAPE_ALL);
-            break;
-        }
-        case YP_TOKEN_MISSING: {
-            yp_token_t opening = not_provided(parser);
-            yp_token_t closing = not_provided(parser);
-
-            yp_token_t label = { .type = YP_TOKEN_LABEL, .start = token->start, .end = token->end };
-            node = yp_symbol_node_create(parser, &opening, &label, &closing);
-            break;
-        }
-        default:
-            assert(false && "unreachable");
-            node = NULL;
-            break;
-    }
-
-    return node;
-}
-
-// Check if the given node is a label in a hash.
-static bool
-yp_symbol_node_label_p(yp_node_t *node) {
-    const uint8_t *end = NULL;
-
-    switch (YP_NODE_TYPE(node)) {
-        case YP_SYMBOL_NODE:
-            end = ((yp_symbol_node_t *) node)->closing_loc.end;
-            break;
-        case YP_INTERPOLATED_SYMBOL_NODE:
-            end = ((yp_interpolated_symbol_node_t *) node)->closing_loc.end;
-            break;
-        default:
-            return false;
-    }
-
-    return (end != NULL) && (end[-1] == ':');
-}
-
-// Convert the given StringNode node to a SymbolNode node.
-static yp_symbol_node_t *
-yp_string_node_to_symbol_node(yp_parser_t *parser, yp_string_node_t *node, const yp_token_t *opening, const yp_token_t *closing) {
-    yp_symbol_node_t *new_node = YP_ALLOC_NODE(parser, yp_symbol_node_t);
-
-    *new_node = (yp_symbol_node_t) {
-        {
-            .type = YP_SYMBOL_NODE,
-            .location = {
-                .start = opening->start,
-                .end = closing->end
-            }
-        },
-        .opening_loc = YP_OPTIONAL_LOCATION_TOKEN_VALUE(opening),
-        .value_loc = node->content_loc,
-        .closing_loc = YP_OPTIONAL_LOCATION_TOKEN_VALUE(closing),
-        .unescaped = node->unescaped
-    };
-
-    // We are explicitly _not_ using yp_node_destroy here because we don't want
-    // to trash the unescaped string. We could instead copy the string if we
-    // know that it is owned, but we're taking the fast path for now.
-    free(node);
-
-    return new_node;
-}
-
-// Convert the given SymbolNode node to a StringNode node.
-static yp_string_node_t *
-yp_symbol_node_to_string_node(yp_parser_t *parser, yp_symbol_node_t *node) {
-    yp_string_node_t *new_node = YP_ALLOC_NODE(parser, yp_string_node_t);
-
-    *new_node = (yp_string_node_t) {
-        {
-            .type = YP_STRING_NODE,
-            .location = node->base.location
-        },
-        .opening_loc = node->opening_loc,
-        .content_loc = node->value_loc,
-        .closing_loc = node->closing_loc,
-        .unescaped = node->unescaped
-    };
-
-    // We are explicitly _not_ using yp_node_destroy here because we don't want
-    // to trash the unescaped string. We could instead copy the string if we
-    // know that it is owned, but we're taking the fast path for now.
-    free(node);
-
-    return new_node;
-}
-
-// Allocate and initialize a new TrueNode node.
-static yp_true_node_t *
-yp_true_node_create(yp_parser_t *parser, const yp_token_t *token) {
-    assert(token->type == YP_TOKEN_KEYWORD_TRUE);
-    yp_true_node_t *node = YP_ALLOC_NODE(parser, yp_true_node_t);
-
-    *node = (yp_true_node_t) {{ .type = YP_TRUE_NODE, .location = YP_LOCATION_TOKEN_VALUE(token) }};
-    return node;
-}
-
-// Allocate and initialize a new UndefNode node.
-static yp_undef_node_t *
-yp_undef_node_create(yp_parser_t *parser, const yp_token_t *token) {
-    assert(token->type == YP_TOKEN_KEYWORD_UNDEF);
-    yp_undef_node_t *node = YP_ALLOC_NODE(parser, yp_undef_node_t);
-
-    *node = (yp_undef_node_t) {
-        {
-            .type = YP_UNDEF_NODE,
-            .location = YP_LOCATION_TOKEN_VALUE(token),
-        },
-        .keyword_loc = YP_LOCATION_TOKEN_VALUE(token),
-        .names = YP_EMPTY_NODE_LIST
-    };
-
-    return node;
-}
-
-// Append a name to an undef node.
-static void
-yp_undef_node_append(yp_undef_node_t *node, yp_node_t *name) {
-    node->base.location.end = name->location.end;
-    yp_node_list_append(&node->names, name);
-}
-
-// Allocate a new UnlessNode node.
-static yp_unless_node_t *
-yp_unless_node_create(yp_parser_t *parser, const yp_token_t *keyword, yp_node_t *predicate, yp_statements_node_t *statements) {
-    yp_flip_flop(predicate);
-    yp_unless_node_t *node = YP_ALLOC_NODE(parser, yp_unless_node_t);
-
-    const uint8_t *end;
-    if (statements != NULL) {
-        end = statements->base.location.end;
-    } else {
-        end = predicate->location.end;
-    }
-
-    *node = (yp_unless_node_t) {
-        {
-            .type = YP_UNLESS_NODE,
-            .flags = YP_NODE_FLAG_NEWLINE,
-            .location = {
-                .start = keyword->start,
-                .end = end
-            },
-        },
-        .keyword_loc = YP_LOCATION_TOKEN_VALUE(keyword),
-        .predicate = predicate,
-        .statements = statements,
-        .consequent = NULL,
-        .end_keyword_loc = YP_OPTIONAL_LOCATION_NOT_PROVIDED_VALUE
-    };
-
-    return node;
-}
-
-// Allocate and initialize new UnlessNode node in the modifier form.
-static yp_unless_node_t *
-yp_unless_node_modifier_create(yp_parser_t *parser, yp_node_t *statement, const yp_token_t *unless_keyword, yp_node_t *predicate) {
-    yp_flip_flop(predicate);
-    yp_unless_node_t *node = YP_ALLOC_NODE(parser, yp_unless_node_t);
-
-    yp_statements_node_t *statements = yp_statements_node_create(parser);
-    yp_statements_node_body_append(statements, statement);
-
-    *node = (yp_unless_node_t) {
-        {
-            .type = YP_UNLESS_NODE,
-            .flags = YP_NODE_FLAG_NEWLINE,
-            .location = {
-                .start = statement->location.start,
-                .end = predicate->location.end
-            },
-        },
-        .keyword_loc = YP_LOCATION_TOKEN_VALUE(unless_keyword),
-        .predicate = predicate,
-        .statements = statements,
-        .consequent = NULL,
-        .end_keyword_loc = YP_OPTIONAL_LOCATION_NOT_PROVIDED_VALUE
-    };
-
-    return node;
-}
-
-static inline void
-yp_unless_node_end_keyword_loc_set(yp_unless_node_t *node, const yp_token_t *end_keyword) {
-    node->end_keyword_loc = YP_LOCATION_TOKEN_VALUE(end_keyword);
-    node->base.location.end = end_keyword->end;
-}
-
-// Allocate a new UntilNode node.
-static yp_until_node_t *
-yp_until_node_create(yp_parser_t *parser, const yp_token_t *keyword, const yp_token_t *closing, yp_node_t *predicate, yp_statements_node_t *statements, yp_node_flags_t flags) {
-    yp_until_node_t *node = YP_ALLOC_NODE(parser, yp_until_node_t);
-
-    *node = (yp_until_node_t) {
-        {
-            .type = YP_UNTIL_NODE,
-            .flags = flags,
-            .location = {
-                .start = keyword->start,
-                .end = closing->end,
-            },
-        },
-        .keyword_loc = YP_LOCATION_TOKEN_VALUE(keyword),
-        .closing_loc = YP_OPTIONAL_LOCATION_TOKEN_VALUE(closing),
-        .predicate = predicate,
-        .statements = statements
-    };
-
-    return node;
-}
-
-// Allocate a new UntilNode node.
-static yp_until_node_t *
-yp_until_node_modifier_create(yp_parser_t *parser, const yp_token_t *keyword, yp_node_t *predicate, yp_statements_node_t *statements, yp_node_flags_t flags) {
-    yp_until_node_t *node = YP_ALLOC_NODE(parser, yp_until_node_t);
-
-    *node = (yp_until_node_t) {
-        {
-            .type = YP_UNTIL_NODE,
-            .flags = flags,
-            .location = {
-                .start = statements->base.location.start,
-                .end = predicate->location.end,
-            },
-        },
-        .keyword_loc = YP_LOCATION_TOKEN_VALUE(keyword),
-        .closing_loc = YP_OPTIONAL_LOCATION_NOT_PROVIDED_VALUE,
-        .predicate = predicate,
-        .statements = statements
-    };
-
-    return node;
-}
-
-// Allocate and initialize a new WhenNode node.
-static yp_when_node_t *
-yp_when_node_create(yp_parser_t *parser, const yp_token_t *keyword) {
-    yp_when_node_t *node = YP_ALLOC_NODE(parser, yp_when_node_t);
-
-    *node = (yp_when_node_t) {
-        {
-            .type = YP_WHEN_NODE,
-            .location = {
-                .start = keyword->start,
-                .end = NULL
-            }
-        },
-        .keyword_loc = YP_LOCATION_TOKEN_VALUE(keyword),
-        .statements = NULL,
-        .conditions = YP_EMPTY_NODE_LIST
-    };
-
-    return node;
-}
-
-// Append a new condition to a when node.
-static void
-yp_when_node_conditions_append(yp_when_node_t *node, yp_node_t *condition) {
-    node->base.location.end = condition->location.end;
-    yp_node_list_append(&node->conditions, condition);
-}
-
-// Set the statements list of a when node.
-static void
-yp_when_node_statements_set(yp_when_node_t *node, yp_statements_node_t *statements) {
-    if (statements->base.location.end > node->base.location.end) {
-        node->base.location.end = statements->base.location.end;
-    }
-
-    node->statements = statements;
-}
-
-// Allocate a new WhileNode node.
-static yp_while_node_t *
-yp_while_node_create(yp_parser_t *parser, const yp_token_t *keyword, const yp_token_t *closing, yp_node_t *predicate, yp_statements_node_t *statements, yp_node_flags_t flags) {
-    yp_while_node_t *node = YP_ALLOC_NODE(parser, yp_while_node_t);
-
-    *node = (yp_while_node_t) {
-        {
-            .type = YP_WHILE_NODE,
-            .flags = flags,
-            .location = {
-                .start = keyword->start,
-                .end = closing->end
-            },
-        },
-        .keyword_loc = YP_LOCATION_TOKEN_VALUE(keyword),
-        .closing_loc = YP_OPTIONAL_LOCATION_TOKEN_VALUE(closing),
-        .predicate = predicate,
-        .statements = statements
-    };
-
-    return node;
-}
-
-// Allocate a new WhileNode node.
-static yp_while_node_t *
-yp_while_node_modifier_create(yp_parser_t *parser, const yp_token_t *keyword, yp_node_t *predicate, yp_statements_node_t *statements, yp_node_flags_t flags) {
-    yp_while_node_t *node = YP_ALLOC_NODE(parser, yp_while_node_t);
-
-    *node = (yp_while_node_t) {
-        {
-            .type = YP_WHILE_NODE,
-            .flags = flags,
-            .location = {
-                .start = statements->base.location.start,
-                .end = predicate->location.end
-            },
-        },
-        .keyword_loc = YP_LOCATION_TOKEN_VALUE(keyword),
-        .closing_loc = YP_OPTIONAL_LOCATION_NOT_PROVIDED_VALUE,
-        .predicate = predicate,
-        .statements = statements
-    };
-
-    return node;
-}
-
-// Allocate and initialize a new XStringNode node.
-static yp_x_string_node_t *
-yp_xstring_node_create(yp_parser_t *parser, const yp_token_t *opening, const yp_token_t *content, const yp_token_t *closing) {
-    yp_x_string_node_t *node = YP_ALLOC_NODE(parser, yp_x_string_node_t);
-
-    *node = (yp_x_string_node_t) {
-        {
-            .type = YP_X_STRING_NODE,
-            .location = {
-                .start = opening->start,
-                .end = closing->end
-            },
-        },
-        .opening_loc = YP_LOCATION_TOKEN_VALUE(opening),
-        .content_loc = YP_LOCATION_TOKEN_VALUE(content),
-        .closing_loc = YP_LOCATION_TOKEN_VALUE(closing),
-        .unescaped = YP_EMPTY_STRING
-    };
-
-    return node;
-}
-
-// Allocate a new YieldNode node.
-static yp_yield_node_t *
-yp_yield_node_create(yp_parser_t *parser, const yp_token_t *keyword, const yp_location_t *lparen_loc, yp_arguments_node_t *arguments, const yp_location_t *rparen_loc) {
-    yp_yield_node_t *node = YP_ALLOC_NODE(parser, yp_yield_node_t);
-
-    const uint8_t *end;
-    if (rparen_loc->start != NULL) {
-        end = rparen_loc->end;
-    } else if (arguments != NULL) {
-        end = arguments->base.location.end;
-    } else if (lparen_loc->start != NULL) {
-        end = lparen_loc->end;
-    } else {
-        end = keyword->end;
-    }
-
-    *node = (yp_yield_node_t) {
-        {
-            .type = YP_YIELD_NODE,
-            .location = {
-                .start = keyword->start,
-                .end = end
-            },
-        },
-        .keyword_loc = YP_LOCATION_TOKEN_VALUE(keyword),
-        .lparen_loc = *lparen_loc,
-        .arguments = arguments,
-        .rparen_loc = *rparen_loc
-    };
-
-    return node;
-}
-
-
-#undef YP_EMPTY_STRING
-#undef YP_LOCATION_NULL_VALUE
-#undef YP_LOCATION_TOKEN_VALUE
-#undef YP_LOCATION_NODE_VALUE
-#undef YP_LOCATION_NODE_BASE_VALUE
-#undef YP_TOKEN_NOT_PROVIDED_VALUE
-#undef YP_ALLOC_NODE
-
-/******************************************************************************/
-/* Scope-related functions                                                    */
-/******************************************************************************/
-
-// Allocate and initialize a new scope. Push it onto the scope stack.
-static bool
-yp_parser_scope_push(yp_parser_t *parser, bool closed) {
-    yp_scope_t *scope = (yp_scope_t *) malloc(sizeof(yp_scope_t));
-    if (scope == NULL) return false;
-
-    *scope = (yp_scope_t) { .closed = closed, .previous = parser->current_scope };
-    yp_constant_id_list_init(&scope->locals);
-
-    parser->current_scope = scope;
-    return true;
-}
-
-// Check if the current scope has a given local variables.
-static int
-yp_parser_local_depth(yp_parser_t *parser, yp_token_t *token) {
-    yp_constant_id_t constant_id = yp_parser_constant_id_token(parser, token);
-    yp_scope_t *scope = parser->current_scope;
-    int depth = 0;
-
-    while (scope != NULL) {
-        if (yp_constant_id_list_includes(&scope->locals, constant_id)) return depth;
-        if (scope->closed) break;
-
-        scope = scope->previous;
-        depth++;
-    }
-
-    return -1;
-}
-
-// Add a local variable from a location to the current scope.
-static yp_constant_id_t
-yp_parser_local_add_location(yp_parser_t *parser, const uint8_t *start, const uint8_t *end) {
-    yp_constant_id_t constant_id = yp_parser_constant_id_location(parser, start, end);
-
-    if (!yp_constant_id_list_includes(&parser->current_scope->locals, constant_id)) {
-        yp_constant_id_list_append(&parser->current_scope->locals, constant_id);
-    }
-
-    return constant_id;
-}
-
-// Add a local variable from a token to the current scope.
-static inline void
-yp_parser_local_add_token(yp_parser_t *parser, yp_token_t *token) {
-    yp_parser_local_add_location(parser, token->start, token->end);
-}
-
-// Add a parameter name to the current scope and check whether the name of the
-// parameter is unique or not.
-static void
-yp_parser_parameter_name_check(yp_parser_t *parser, yp_token_t *name) {
-    // We want to ignore any parameter name that starts with an underscore.
-    if ((*name->start == '_')) return;
-
-    // Otherwise we'll fetch the constant id for the parameter name and check
-    // whether it's already in the current scope.
-    yp_constant_id_t constant_id = yp_parser_constant_id_token(parser, name);
-
-    if (yp_constant_id_list_includes(&parser->current_scope->locals, constant_id)) {
-        yp_diagnostic_list_append(&parser->error_list, name->start, name->end, "Duplicated parameter name.");
-    }
-}
-
-// Pop the current scope off the scope stack.
-static void
-yp_parser_scope_pop(yp_parser_t *parser) {
-    yp_scope_t *scope = parser->current_scope;
-    parser->current_scope = scope->previous;
-    free(scope);
-}
-
-/******************************************************************************/
-/* Basic character checks                                                     */
-/******************************************************************************/
-
-// This function is used extremely frequently to lex all of the identifiers in a
-// source file, so it's important that it be as fast as possible. For this
-// reason we have the encoding_changed boolean to check if we need to go through
-// the function pointer or can just directly use the UTF-8 functions.
-static inline size_t
-char_is_identifier_start(yp_parser_t *parser, const uint8_t *b) {
-    if (parser->encoding_changed) {
-        return parser->encoding.alpha_char(b, parser->end - b) || (*b == '_') || (*b >= 0x80);
-    } else if (*b < 0x80) {
-        return (yp_encoding_unicode_table[*b] & YP_ENCODING_ALPHABETIC_BIT ? 1 : 0) || (*b == '_');
-    } else {
-        return (size_t) (yp_encoding_utf_8_alpha_char(b, parser->end - b) || 1u);
-    }
-}
-
-// Like the above, this function is also used extremely frequently to lex all of
-// the identifiers in a source file once the first character has been found. So
-// it's important that it be as fast as possible.
-static inline size_t
-char_is_identifier(yp_parser_t *parser, const uint8_t *b) {
-    if (parser->encoding_changed) {
-        return parser->encoding.alnum_char(b, parser->end - b) || (*b == '_') || (*b >= 0x80);
-    } else if (*b < 0x80) {
-        return (yp_encoding_unicode_table[*b] & YP_ENCODING_ALPHANUMERIC_BIT ? 1 : 0) || (*b == '_');
-    } else {
-        return (size_t) (yp_encoding_utf_8_alnum_char(b, parser->end - b) || 1u);
-    }
-}
-
-// Here we're defining a perfect hash for the characters that are allowed in
-// global names. This is used to quickly check the next character after a $ to
-// see if it's a valid character for a global name.
-#define BIT(c, idx) (((c) / 32 - 1 == idx) ? (1U << ((c) % 32)) : 0)
-#define PUNCT(idx) ( \
-                BIT('~', idx) | BIT('*', idx) | BIT('$', idx) | BIT('?', idx) | \
-                BIT('!', idx) | BIT('@', idx) | BIT('/', idx) | BIT('\\', idx) | \
-                BIT(';', idx) | BIT(',', idx) | BIT('.', idx) | BIT('=', idx) | \
-                BIT(':', idx) | BIT('<', idx) | BIT('>', idx) | BIT('\"', idx) | \
-                BIT('&', idx) | BIT('`', idx) | BIT('\'', idx) | BIT('+', idx) | \
-                BIT('0', idx))
-
-const unsigned int yp_global_name_punctuation_hash[(0x7e - 0x20 + 31) / 32] = { PUNCT(0), PUNCT(1), PUNCT(2) };
-
-#undef BIT
-#undef PUNCT
-
-static inline bool
-char_is_global_name_punctuation(const uint8_t b) {
-    const unsigned int i = (const unsigned int) b;
-    if (i <= 0x20 || 0x7e < i) return false;
-
-    return (yp_global_name_punctuation_hash[(i - 0x20) / 32] >> (i % 32)) & 1;
-}
-
-static inline bool
-token_is_numbered_parameter(const uint8_t *start, const uint8_t *end) {
-    return (end - start == 2) && (start[0] == '_') && (start[1] != '0') && (yp_char_is_decimal_digit(start[1]));
-}
-
-static inline bool
-token_is_setter_name(yp_token_t *token) {
-    return (
-        (token->type == YP_TOKEN_IDENTIFIER) &&
-        (token->end - token->start >= 2) &&
-        (token->end[-1] == '=')
-    );
-}
-
-/******************************************************************************/
-/* Stack helpers                                                              */
-/******************************************************************************/
-
-static inline void
-yp_accepts_block_stack_push(yp_parser_t *parser, bool value) {
-    // Use the negation of the value to prevent stack overflow.
-    yp_state_stack_push(&parser->accepts_block_stack, !value);
-}
-
-static inline void
-yp_accepts_block_stack_pop(yp_parser_t *parser) {
-    yp_state_stack_pop(&parser->accepts_block_stack);
-}
-
-static inline bool
-yp_accepts_block_stack_p(yp_parser_t *parser) {
-    return !yp_state_stack_p(&parser->accepts_block_stack);
-}
-
-static inline void
-yp_do_loop_stack_push(yp_parser_t *parser, bool value) {
-    yp_state_stack_push(&parser->do_loop_stack, value);
-}
-
-static inline void
-yp_do_loop_stack_pop(yp_parser_t *parser) {
-    yp_state_stack_pop(&parser->do_loop_stack);
-}
-
-static inline bool
-yp_do_loop_stack_p(yp_parser_t *parser) {
-    return yp_state_stack_p(&parser->do_loop_stack);
-}
-
-/******************************************************************************/
-/* Lexer check helpers                                                        */
-/******************************************************************************/
-
-// Get the next character in the source starting from +cursor+. If that position
-// is beyond the end of the source then return '\0'.
-static inline uint8_t
-peek_at(yp_parser_t *parser, const uint8_t *cursor) {
-    if (cursor < parser->end) {
-        return *cursor;
-    } else {
-        return '\0';
-    }
-}
-
-// Get the next character in the source starting from parser->current.end and
-// adding the given offset. If that position is beyond the end of the source
-// then return '\0'.
-static inline uint8_t
-peek_offset(yp_parser_t *parser, ptrdiff_t offset) {
-    return peek_at(parser, parser->current.end + offset);
-}
-
-// Get the next character in the source starting from parser->current.end. If
-// that position is beyond the end of the source then return '\0'.
-static inline uint8_t
-peek(yp_parser_t *parser) {
-    return peek_at(parser, parser->current.end);
-}
-
-// Get the next string of length len in the source starting from parser->current.end.
-// If the string extends beyond the end of the source, return the empty string ""
-static inline const uint8_t *
-peek_string(yp_parser_t *parser, size_t len) {
-    if (parser->current.end + len <= parser->end) {
-        return parser->current.end;
-    } else {
-        return (const uint8_t *) "";
-    }
-}
-
-// If the character to be read matches the given value, then returns true and
-// advanced the current pointer.
-static inline bool
-match(yp_parser_t *parser, uint8_t value) {
-    if (peek(parser) == value) {
-        parser->current.end++;
-        return true;
-    }
-    return false;
-}
-
-// Return the length of the line ending string starting at +cursor+, or 0 if it
-// is not a line ending. This function is intended to be CRLF/LF agnostic.
-static inline size_t
-match_eol_at(yp_parser_t *parser, const uint8_t *cursor) {
-    if (peek_at(parser, cursor) == '\n') {
-        return 1;
-    }
-    if (peek_at(parser, cursor) == '\r' && peek_at(parser, cursor + 1) == '\n') {
-        return 2;
-    }
-    return 0;
-}
-
-// Return the length of the line ending string starting at
-// parser->current.end + offset, or 0 if it is not a line ending. This function
-// is intended to be CRLF/LF agnostic.
-static inline size_t
-match_eol_offset(yp_parser_t *parser, ptrdiff_t offset) {
-    return match_eol_at(parser, parser->current.end + offset);
-}
-
-// Return the length of the line ending string starting at parser->current.end,
-// or 0 if it is not a line ending. This function is intended to be CRLF/LF
-// agnostic.
-static inline size_t
-match_eol(yp_parser_t *parser) {
-    return match_eol_at(parser, parser->current.end);
-}
-
-// Skip to the next newline character or NUL byte.
-static inline const uint8_t *
-next_newline(const uint8_t *cursor, ptrdiff_t length) {
-    assert(length >= 0);
-
-    // Note that it's okay for us to use memchr here to look for \n because none
-    // of the encodings that we support have \n as a component of a multi-byte
-    // character.
-    return memchr(cursor, '\n', (size_t) length);
-}
-
-// Find the start of the encoding comment. This is effectively an inlined
-// version of strnstr with some modifications.
-static inline const uint8_t *
-parser_lex_encoding_comment_start(yp_parser_t *parser, const uint8_t *cursor, ptrdiff_t remaining) {
-    assert(remaining >= 0);
-    size_t length = (size_t) remaining;
-
-    size_t key_length = strlen("coding:");
-    if (key_length > length) return NULL;
-
-    const uint8_t *cursor_limit = cursor + length - key_length + 1;
-    while ((cursor = yp_memchr(cursor, 'c', (size_t) (cursor_limit - cursor), parser->encoding_changed, &parser->encoding)) != NULL) {
-        if (memcmp(cursor, "coding", key_length - 1) == 0) {
-            size_t whitespace_after_coding = yp_strspn_inline_whitespace(cursor + key_length - 1, parser->end - (cursor + key_length - 1));
-            size_t cur_pos = key_length + whitespace_after_coding;
-
-            if (cursor[cur_pos - 1] == ':' || cursor[cur_pos - 1] == '=') {
-                return cursor + cur_pos;
-            }
-        }
-
-        cursor++;
-    }
-
-    return NULL;
-}
-
-// Here we're going to check if this is a "magic" comment, and perform whatever
-// actions are necessary for it here.
-static void
-parser_lex_encoding_comment(yp_parser_t *parser) {
-    const uint8_t *start = parser->current.start + 1;
-    const uint8_t *end = next_newline(start, parser->end - start);
-    if (end == NULL) end = parser->end;
-
-    // These are the patterns we're going to match to find the encoding comment.
-    // This is definitely not complete or even really correct.
-    const uint8_t *encoding_start = parser_lex_encoding_comment_start(parser, start, end - start);
-
-    // If we didn't find anything that matched our patterns, then return. Note
-    // that this does a _very_ poor job of actually finding the encoding, and
-    // there is a lot of work to do here to better reflect actual magic comment
-    // parsing from CRuby, but this at least gets us part of the way there.
-    if (encoding_start == NULL) return;
-
-    // Skip any non-newline whitespace after the "coding:" or "coding=".
-    encoding_start += yp_strspn_inline_whitespace(encoding_start, end - encoding_start);
-
-    // Now determine the end of the encoding string. This is either the end of
-    // the line, the first whitespace character, or a punctuation mark.
-    const uint8_t *encoding_end = yp_strpbrk(parser, encoding_start, (const uint8_t *) " \t\f\r\v\n;,", end - encoding_start);
-    encoding_end = encoding_end == NULL ? end : encoding_end;
-
-    // Finally, we can determine the width of the encoding string.
-    size_t width = (size_t) (encoding_end - encoding_start);
-
-    // First, we're going to call out to a user-defined callback if one was
-    // provided. If they return an encoding struct that we can use, then we'll
-    // use that here.
-    if (parser->encoding_decode_callback != NULL) {
-        yp_encoding_t *encoding = parser->encoding_decode_callback(parser, encoding_start, width);
-
-        if (encoding != NULL) {
-            parser->encoding = *encoding;
-            return;
-        }
-    }
-
-    // Next, we're going to check for UTF-8. This is the most common encoding.
-    // Extensions like utf-8 can contain extra encoding details like,
-    // utf-8-dos, utf-8-linux, utf-8-mac. We treat these all as utf-8 should
-    // treat any encoding starting utf-8 as utf-8.
-    if ((encoding_start + 5 <= parser->end) && (yp_strncasecmp(encoding_start, (const uint8_t *) "utf-8", 5) == 0)) {
-        // We don't need to do anything here because the default encoding is
-        // already UTF-8. We'll just return.
-        return;
-    }
-
-    // Next, we're going to loop through each of the encodings that we handle
-    // explicitly. If we found one that we understand, we'll use that value.
-#define ENCODING(value, prebuilt) \
-    if (width == sizeof(value) - 1 && encoding_start + width <= parser->end && yp_strncasecmp(encoding_start, (const uint8_t *) value, width) == 0) { \
-        parser->encoding = prebuilt; \
-        parser->encoding_changed |= true; \
-        if (parser->encoding_changed_callback != NULL) parser->encoding_changed_callback(parser); \
-        return; \
-    }
-
-    // Check most common first. (This is pretty arbitrary.)
-    ENCODING("ascii", yp_encoding_ascii);
-    ENCODING("ascii-8bit", yp_encoding_ascii_8bit);
-    ENCODING("us-ascii", yp_encoding_ascii);
-    ENCODING("binary", yp_encoding_ascii_8bit);
-    ENCODING("shift_jis", yp_encoding_shift_jis);
-    ENCODING("euc-jp", yp_encoding_euc_jp);
-
-    // Then check all the others.
-    ENCODING("big5", yp_encoding_big5);
-    ENCODING("gbk", yp_encoding_gbk);
-    ENCODING("iso-8859-1", yp_encoding_iso_8859_1);
-    ENCODING("iso-8859-2", yp_encoding_iso_8859_2);
-    ENCODING("iso-8859-3", yp_encoding_iso_8859_3);
-    ENCODING("iso-8859-4", yp_encoding_iso_8859_4);
-    ENCODING("iso-8859-5", yp_encoding_iso_8859_5);
-    ENCODING("iso-8859-6", yp_encoding_iso_8859_6);
-    ENCODING("iso-8859-7", yp_encoding_iso_8859_7);
-    ENCODING("iso-8859-8", yp_encoding_iso_8859_8);
-    ENCODING("iso-8859-9", yp_encoding_iso_8859_9);
-    ENCODING("iso-8859-10", yp_encoding_iso_8859_10);
-    ENCODING("iso-8859-11", yp_encoding_iso_8859_11);
-    ENCODING("iso-8859-13", yp_encoding_iso_8859_13);
-    ENCODING("iso-8859-14", yp_encoding_iso_8859_14);
-    ENCODING("iso-8859-15", yp_encoding_iso_8859_15);
-    ENCODING("iso-8859-16", yp_encoding_iso_8859_16);
-    ENCODING("koi8-r", yp_encoding_koi8_r);
-    ENCODING("windows-31j", yp_encoding_windows_31j);
-    ENCODING("windows-1251", yp_encoding_windows_1251);
-    ENCODING("windows-1252", yp_encoding_windows_1252);
-    ENCODING("cp1251", yp_encoding_windows_1251);
-    ENCODING("cp1252", yp_encoding_windows_1252);
-    ENCODING("cp932", yp_encoding_windows_31j);
-    ENCODING("sjis", yp_encoding_windows_31j);
-    ENCODING("utf8-mac", yp_encoding_utf8_mac);
-
-#undef ENCODING
-
-    // If nothing was returned by this point, then we've got an issue because we
-    // didn't understand the encoding that the user was trying to use. In this
-    // case we'll keep using the default encoding but add an error to the
-    // parser to indicate an unsuccessful parse.
-    yp_diagnostic_list_append(&parser->error_list, encoding_start, encoding_end, "Could not understand the encoding specified in the magic comment.");
-}
-
-/******************************************************************************/
-/* Context manipulations                                                      */
-/******************************************************************************/
-
-static bool
-context_terminator(yp_context_t context, yp_token_t *token) {
-    switch (context) {
-        case YP_CONTEXT_MAIN:
-        case YP_CONTEXT_DEF_PARAMS:
-            return token->type == YP_TOKEN_EOF;
-        case YP_CONTEXT_DEFAULT_PARAMS:
-            return token->type == YP_TOKEN_COMMA || token->type == YP_TOKEN_PARENTHESIS_RIGHT;
-        case YP_CONTEXT_PREEXE:
-        case YP_CONTEXT_POSTEXE:
-            return token->type == YP_TOKEN_BRACE_RIGHT;
-        case YP_CONTEXT_MODULE:
-        case YP_CONTEXT_CLASS:
-        case YP_CONTEXT_SCLASS:
-        case YP_CONTEXT_LAMBDA_DO_END:
-        case YP_CONTEXT_DEF:
-        case YP_CONTEXT_BLOCK_KEYWORDS:
-            return token->type == YP_TOKEN_KEYWORD_END || token->type == YP_TOKEN_KEYWORD_RESCUE || token->type == YP_TOKEN_KEYWORD_ENSURE;
-        case YP_CONTEXT_WHILE:
-        case YP_CONTEXT_UNTIL:
-        case YP_CONTEXT_ELSE:
-        case YP_CONTEXT_FOR:
-        case YP_CONTEXT_ENSURE:
-            return token->type == YP_TOKEN_KEYWORD_END;
-        case YP_CONTEXT_CASE_WHEN:
-            return token->type == YP_TOKEN_KEYWORD_WHEN || token->type == YP_TOKEN_KEYWORD_END || token->type == YP_TOKEN_KEYWORD_ELSE;
-        case YP_CONTEXT_CASE_IN:
-            return token->type == YP_TOKEN_KEYWORD_IN || token->type == YP_TOKEN_KEYWORD_END || token->type == YP_TOKEN_KEYWORD_ELSE;
-        case YP_CONTEXT_IF:
-        case YP_CONTEXT_ELSIF:
-            return token->type == YP_TOKEN_KEYWORD_ELSE || token->type == YP_TOKEN_KEYWORD_ELSIF || token->type == YP_TOKEN_KEYWORD_END;
-        case YP_CONTEXT_UNLESS:
-            return token->type == YP_TOKEN_KEYWORD_ELSE || token->type == YP_TOKEN_KEYWORD_END;
-        case YP_CONTEXT_EMBEXPR:
-            return token->type == YP_TOKEN_EMBEXPR_END;
-        case YP_CONTEXT_BLOCK_BRACES:
-            return token->type == YP_TOKEN_BRACE_RIGHT;
-        case YP_CONTEXT_PARENS:
-            return token->type == YP_TOKEN_PARENTHESIS_RIGHT;
-        case YP_CONTEXT_BEGIN:
-        case YP_CONTEXT_RESCUE:
-            return token->type == YP_TOKEN_KEYWORD_ENSURE || token->type == YP_TOKEN_KEYWORD_RESCUE || token->type == YP_TOKEN_KEYWORD_ELSE || token->type == YP_TOKEN_KEYWORD_END;
-        case YP_CONTEXT_RESCUE_ELSE:
-            return token->type == YP_TOKEN_KEYWORD_ENSURE || token->type == YP_TOKEN_KEYWORD_END;
-        case YP_CONTEXT_LAMBDA_BRACES:
-            return token->type == YP_TOKEN_BRACE_RIGHT;
-        case YP_CONTEXT_PREDICATE:
-            return token->type == YP_TOKEN_KEYWORD_THEN || token->type == YP_TOKEN_NEWLINE || token->type == YP_TOKEN_SEMICOLON;
-    }
-
-    return false;
-}
-
-static bool
-context_recoverable(yp_parser_t *parser, yp_token_t *token) {
-    yp_context_node_t *context_node = parser->current_context;
-
-    while (context_node != NULL) {
-        if (context_terminator(context_node->context, token)) return true;
-        context_node = context_node->prev;
-    }
-
-    return false;
-}
-
-static bool
-context_push(yp_parser_t *parser, yp_context_t context) {
-    yp_context_node_t *context_node = (yp_context_node_t *) malloc(sizeof(yp_context_node_t));
-    if (context_node == NULL) return false;
-
-    *context_node = (yp_context_node_t) { .context = context, .prev = NULL };
-
-    if (parser->current_context == NULL) {
-        parser->current_context = context_node;
-    } else {
-        context_node->prev = parser->current_context;
-        parser->current_context = context_node;
-    }
-
-    return true;
-}
-
-static void
-context_pop(yp_parser_t *parser) {
-    yp_context_node_t *prev = parser->current_context->prev;
-    free(parser->current_context);
-    parser->current_context = prev;
-}
-
-static bool
-context_p(yp_parser_t *parser, yp_context_t context) {
-    yp_context_node_t *context_node = parser->current_context;
-
-    while (context_node != NULL) {
-        if (context_node->context == context) return true;
-        context_node = context_node->prev;
-    }
-
-    return false;
-}
-
-static bool
-context_def_p(yp_parser_t *parser) {
-    yp_context_node_t *context_node = parser->current_context;
-
-    while (context_node != NULL) {
-        switch (context_node->context) {
-            case YP_CONTEXT_DEF:
-                return true;
-            case YP_CONTEXT_CLASS:
-            case YP_CONTEXT_MODULE:
-            case YP_CONTEXT_SCLASS:
-                return false;
-            default:
-                context_node = context_node->prev;
-        }
-    }
-
-    return false;
-}
-
-/******************************************************************************/
-/* Specific token lexers                                                      */
-/******************************************************************************/
-
-static yp_token_type_t
-lex_optional_float_suffix(yp_parser_t *parser) {
-    yp_token_type_t type = YP_TOKEN_INTEGER;
-
-    // Here we're going to attempt to parse the optional decimal portion of a
-    // float. If it's not there, then it's okay and we'll just continue on.
-    if (peek(parser) == '.') {
-        if (yp_char_is_decimal_digit(peek_offset(parser, 1))) {
-            parser->current.end += 2;
-            parser->current.end += yp_strspn_decimal_number(parser->current.end, parser->end - parser->current.end);
-            type = YP_TOKEN_FLOAT;
-        } else {
-            // If we had a . and then something else, then it's not a float suffix on
-            // a number it's a method call or something else.
-            return type;
-        }
-    }
-
-    // Here we're going to attempt to parse the optional exponent portion of a
-    // float. If it's not there, it's okay and we'll just continue on.
-    if (match(parser, 'e') || match(parser, 'E')) {
-        (void) (match(parser, '+') || match(parser, '-'));
-
-        if (yp_char_is_decimal_digit(*parser->current.end)) {
-            parser->current.end++;
-            parser->current.end += yp_strspn_decimal_number(parser->current.end, parser->end - parser->current.end);
-            type = YP_TOKEN_FLOAT;
-        } else {
-            yp_diagnostic_list_append(&parser->error_list, parser->current.start, parser->current.end, "Missing exponent.");
-            type = YP_TOKEN_FLOAT;
-        }
-    }
-
-    return type;
-}
-
-static yp_token_type_t
-lex_numeric_prefix(yp_parser_t *parser) {
-    yp_token_type_t type = YP_TOKEN_INTEGER;
-
-    if (peek_offset(parser, -1) == '0') {
-        switch (*parser->current.end) {
-            // 0d1111 is a decimal number
-            case 'd':
-            case 'D':
-                parser->current.end++;
-                if (yp_char_is_decimal_digit(peek(parser))) {
-                    parser->current.end += yp_strspn_decimal_number(parser->current.end, parser->end - parser->current.end);
-                } else {
-                    yp_diagnostic_list_append(&parser->error_list, parser->current.start, parser->current.end, "Invalid decimal number.");
-                }
-
-                break;
-
-            // 0b1111 is a binary number
-            case 'b':
-            case 'B':
-                parser->current.end++;
-                if (yp_char_is_binary_digit(peek(parser))) {
-                    parser->current.end += yp_strspn_binary_number(parser->current.end, parser->end - parser->current.end);
-                } else {
-                    yp_diagnostic_list_append(&parser->error_list, parser->current.start, parser->current.end, "Invalid binary number.");
-                }
-
-                break;
-
-            // 0o1111 is an octal number
-            case 'o':
-            case 'O':
-                parser->current.end++;
-                if (yp_char_is_octal_digit(peek(parser))) {
-                    parser->current.end += yp_strspn_octal_number(parser->current.end, parser->end - parser->current.end);
-                } else {
-                    yp_diagnostic_list_append(&parser->error_list, parser->current.start, parser->current.end, "Invalid octal number.");
-                }
-
-                break;
-
-            // 01111 is an octal number
-            case '_':
-            case '0':
-            case '1':
-            case '2':
-            case '3':
-            case '4':
-            case '5':
-            case '6':
-            case '7':
-                parser->current.end += yp_strspn_octal_number(parser->current.end, parser->end - parser->current.end);
-                break;
-
-            // 0x1111 is a hexadecimal number
-            case 'x':
-            case 'X':
-                parser->current.end++;
-                if (yp_char_is_hexadecimal_digit(peek(parser))) {
-                    parser->current.end += yp_strspn_hexadecimal_number(parser->current.end, parser->end - parser->current.end);
-                } else {
-                    yp_diagnostic_list_append(&parser->error_list, parser->current.start, parser->current.end, "Invalid hexadecimal number.");
-                }
-
-                break;
-
-            // 0.xxx is a float
-            case '.': {
-                type = lex_optional_float_suffix(parser);
-                break;
-            }
-
-            // 0exxx is a float
-            case 'e':
-            case 'E': {
-                type = lex_optional_float_suffix(parser);
-                break;
-            }
-        }
-    } else {
-        // If it didn't start with a 0, then we'll lex as far as we can into a
-        // decimal number.
-        parser->current.end += yp_strspn_decimal_number(parser->current.end, parser->end - parser->current.end);
-
-        // Afterward, we'll lex as far as we can into an optional float suffix.
-        type = lex_optional_float_suffix(parser);
-    }
-
-    // If the last character that we consumed was an underscore, then this is
-    // actually an invalid integer value, and we should return an invalid token.
-    if (peek_offset(parser, -1) == '_') {
-        yp_diagnostic_list_append(&parser->error_list, parser->current.start, parser->current.end, "Number literal cannot end with a `_`.");
-    }
-
-    return type;
-}
-
-static yp_token_type_t
-lex_numeric(yp_parser_t *parser) {
-    yp_token_type_t type = YP_TOKEN_INTEGER;
-
-    if (parser->current.end < parser->end) {
-        type = lex_numeric_prefix(parser);
-
-        const uint8_t *end = parser->current.end;
-        yp_token_type_t suffix_type = type;
-
-        if (type == YP_TOKEN_INTEGER) {
-            if (match(parser, 'r')) {
-                suffix_type = YP_TOKEN_INTEGER_RATIONAL;
-
-                if (match(parser, 'i')) {
-                    suffix_type = YP_TOKEN_INTEGER_RATIONAL_IMAGINARY;
-                }
-            } else if (match(parser, 'i')) {
-                suffix_type = YP_TOKEN_INTEGER_IMAGINARY;
-            }
-        } else {
-            if (match(parser, 'r')) {
-                suffix_type = YP_TOKEN_FLOAT_RATIONAL;
-
-                if (match(parser, 'i')) {
-                    suffix_type = YP_TOKEN_FLOAT_RATIONAL_IMAGINARY;
-                }
-            } else if (match(parser, 'i')) {
-                suffix_type = YP_TOKEN_FLOAT_IMAGINARY;
-            }
-        }
-
-        const uint8_t b = peek(parser);
-        if (b != '\0' && (b >= 0x80 || ((b >= 'a' && b <= 'z') || (b >= 'A' && b <= 'Z')) || b == '_')) {
-            parser->current.end = end;
-        } else {
-            type = suffix_type;
-        }
-    }
-
-    return type;
-}
-
-static yp_token_type_t
-lex_global_variable(yp_parser_t *parser) {
-    if (parser->current.end >= parser->end) {
-        yp_diagnostic_list_append(&parser->error_list, parser->current.start, parser->current.end, "Invalid global variable.");
-        return YP_TOKEN_GLOBAL_VARIABLE;
-    }
-
-    switch (*parser->current.end) {
-        case '~':  // $~: match-data
-        case '*':  // $*: argv
-        case '$':  // $$: pid
-        case '?':  // $?: last status
-        case '!':  // $!: error string
-        case '@':  // $@: error position
-        case '/':  // $/: input record separator
-        case '\\': // $\: output record separator
-        case ';':  // $;: field separator
-        case ',':  // $,: output field separator
-        case '.':  // $.: last read line number
-        case '=':  // $=: ignorecase
-        case ':':  // $:: load path
-        case '<':  // $<: reading filename
-        case '>':  // $>: default output handle
-        case '\"': // $": already loaded files
-            parser->current.end++;
-            return YP_TOKEN_GLOBAL_VARIABLE;
-
-        case '&':  // $&: last match
-        case '`':  // $`: string before last match
-        case '\'': // $': string after last match
-        case '+':  // $+: string matches last paren.
-            parser->current.end++;
-            return lex_state_p(parser, YP_LEX_STATE_FNAME) ? YP_TOKEN_GLOBAL_VARIABLE : YP_TOKEN_BACK_REFERENCE;
-
-        case '0': {
-            parser->current.end++;
-            size_t width;
-
-            if (parser->current.end < parser->end && (width = char_is_identifier(parser, parser->current.end)) > 0) {
-                do {
-                    parser->current.end += width;
-                } while (parser->current.end < parser->end && (width = char_is_identifier(parser, parser->current.end)) > 0);
-
-                // $0 isn't allowed to be followed by anything.
-                yp_diagnostic_list_append(&parser->error_list, parser->current.start, parser->current.end, "Invalid global variable.");
-            }
-
-            return YP_TOKEN_GLOBAL_VARIABLE;
-        }
-
-        case '1':
-        case '2':
-        case '3':
-        case '4':
-        case '5':
-        case '6':
-        case '7':
-        case '8':
-        case '9':
-            parser->current.end += yp_strspn_decimal_digit(parser->current.end, parser->end - parser->current.end);
-            return lex_state_p(parser, YP_LEX_STATE_FNAME) ? YP_TOKEN_GLOBAL_VARIABLE : YP_TOKEN_NUMBERED_REFERENCE;
-
-        case '-':
-            parser->current.end++;
-            /* fallthrough */
-        default: {
-            size_t width;
-
-            if ((width = char_is_identifier(parser, parser->current.end)) > 0) {
-                do {
-                    parser->current.end += width;
-                } while (parser->current.end < parser->end && (width = char_is_identifier(parser, parser->current.end)) > 0);
-            } else {
-                // If we get here, then we have a $ followed by something that isn't
-                // recognized as a global variable.
-                yp_diagnostic_list_append(&parser->error_list, parser->current.start, parser->current.end, "Invalid global variable.");
-            }
-
-            return YP_TOKEN_GLOBAL_VARIABLE;
-        }
-    }
-}
-
-// This function checks if the current token matches a keyword. If it does, it
-// returns true. Otherwise, it returns false. The arguments are as follows:
-//
-// * `value` - the literal string that we're checking for
-// * `width` - the length of the token
-// * `state` - the state that we should transition to if the token matches
-//
-static yp_token_type_t
-lex_keyword(yp_parser_t *parser, const char *value, yp_lex_state_t state, yp_token_type_t type, yp_token_type_t modifier_type) {
-    yp_lex_state_t last_state = parser->lex_state;
-
-    const size_t vlen = strlen(value);
-    if (parser->current.start + vlen <= parser->end && memcmp(parser->current.start, value, vlen) == 0) {
-        if (parser->lex_state & YP_LEX_STATE_FNAME) {
-            lex_state_set(parser, YP_LEX_STATE_ENDFN);
-        } else {
-            lex_state_set(parser, state);
-            if (state == YP_LEX_STATE_BEG) {
-                parser->command_start = true;
-            }
-
-            if ((modifier_type != YP_TOKEN_EOF) && !(last_state & (YP_LEX_STATE_BEG | YP_LEX_STATE_LABELED | YP_LEX_STATE_CLASS))) {
-                lex_state_set(parser, YP_LEX_STATE_BEG | YP_LEX_STATE_LABEL);
-                return modifier_type;
-            }
-        }
-
-        return type;
-    }
-
-    return YP_TOKEN_EOF;
-}
-
-static yp_token_type_t
-lex_identifier(yp_parser_t *parser, bool previous_command_start) {
-    // Lex as far as we can into the current identifier.
-    size_t width;
-    while (parser->current.end < parser->end && (width = char_is_identifier(parser, parser->current.end)) > 0) {
-        parser->current.end += width;
-    }
-
-    // Now cache the length of the identifier so that we can quickly compare it
-    // against known keywords.
-    width = (size_t) (parser->current.end - parser->current.start);
-
-    if (parser->current.end < parser->end) {
-        if (((parser->current.end + 1 >= parser->end) || (parser->current.end[1] != '=')) && (match(parser, '!') || match(parser, '?'))) {
-            // First we'll attempt to extend the identifier by a ! or ?. Then we'll
-            // check if we're returning the defined? keyword or just an identifier.
-            width++;
-
-            if (
-                ((lex_state_p(parser, YP_LEX_STATE_LABEL | YP_LEX_STATE_ENDFN) && !previous_command_start) || lex_state_arg_p(parser)) &&
-                (peek(parser) == ':') && (peek_offset(parser, 1) != ':')
-            ) {
-                // If we're in a position where we can accept a : at the end of an
-                // identifier, then we'll optionally accept it.
-                lex_state_set(parser, YP_LEX_STATE_ARG | YP_LEX_STATE_LABELED);
-                (void) match(parser, ':');
-                return YP_TOKEN_LABEL;
-            }
-
-            if (parser->lex_state != YP_LEX_STATE_DOT) {
-                if (width == 8 && (lex_keyword(parser, "defined?", YP_LEX_STATE_ARG, YP_TOKEN_KEYWORD_DEFINED, YP_TOKEN_EOF) != YP_TOKEN_EOF)) {
-                    return YP_TOKEN_KEYWORD_DEFINED;
-                }
-            }
-
-            return YP_TOKEN_IDENTIFIER;
-        } else if (lex_state_p(parser, YP_LEX_STATE_FNAME) && peek_offset(parser, 1) != '~' && peek_offset(parser, 1) != '>' && (peek_offset(parser, 1) != '=' || peek_offset(parser, 2) == '>') && match(parser, '=')) {
-            // If we're in a position where we can accept a = at the end of an
-            // identifier, then we'll optionally accept it.
-            return YP_TOKEN_IDENTIFIER;
-        }
-
-        if (
-            ((lex_state_p(parser, YP_LEX_STATE_LABEL | YP_LEX_STATE_ENDFN) && !previous_command_start) || lex_state_arg_p(parser)) &&
-            peek(parser) == ':' && peek_offset(parser, 1) != ':'
-        ) {
-            // If we're in a position where we can accept a : at the end of an
-            // identifier, then we'll optionally accept it.
-            lex_state_set(parser, YP_LEX_STATE_ARG | YP_LEX_STATE_LABELED);
-            (void) match(parser, ':');
-            return YP_TOKEN_LABEL;
-        }
-    }
-
-    if (parser->lex_state != YP_LEX_STATE_DOT) {
-        yp_token_type_t type;
-
-        switch (width) {
-            case 2:
-                if (lex_keyword(parser, "do", YP_LEX_STATE_BEG, YP_TOKEN_KEYWORD_DO, YP_TOKEN_EOF) != YP_TOKEN_EOF) {
-                    if (yp_do_loop_stack_p(parser)) {
-                        return YP_TOKEN_KEYWORD_DO_LOOP;
-                    }
-                    return YP_TOKEN_KEYWORD_DO;
-                }
-
-                if ((type = lex_keyword(parser, "if", YP_LEX_STATE_BEG, YP_TOKEN_KEYWORD_IF, YP_TOKEN_KEYWORD_IF_MODIFIER)) != YP_TOKEN_EOF) return type;
-                if ((type = lex_keyword(parser, "in", YP_LEX_STATE_BEG, YP_TOKEN_KEYWORD_IN, YP_TOKEN_EOF)) != YP_TOKEN_EOF) return type;
-                if ((type = lex_keyword(parser, "or", YP_LEX_STATE_BEG, YP_TOKEN_KEYWORD_OR, YP_TOKEN_EOF)) != YP_TOKEN_EOF) return type;
-                break;
-            case 3:
-                if ((type = lex_keyword(parser, "and", YP_LEX_STATE_BEG, YP_TOKEN_KEYWORD_AND, YP_TOKEN_EOF)) != YP_TOKEN_EOF) return type;
-                if ((type = lex_keyword(parser, "def", YP_LEX_STATE_FNAME, YP_TOKEN_KEYWORD_DEF, YP_TOKEN_EOF)) != YP_TOKEN_EOF) return type;
-                if ((type = lex_keyword(parser, "end", YP_LEX_STATE_END, YP_TOKEN_KEYWORD_END, YP_TOKEN_EOF)) != YP_TOKEN_EOF) return type;
-                if ((type = lex_keyword(parser, "END", YP_LEX_STATE_END, YP_TOKEN_KEYWORD_END_UPCASE, YP_TOKEN_EOF)) != YP_TOKEN_EOF) return type;
-                if ((type = lex_keyword(parser, "for", YP_LEX_STATE_BEG, YP_TOKEN_KEYWORD_FOR, YP_TOKEN_EOF)) != YP_TOKEN_EOF) return type;
-                if ((type = lex_keyword(parser, "nil", YP_LEX_STATE_END, YP_TOKEN_KEYWORD_NIL, YP_TOKEN_EOF)) != YP_TOKEN_EOF) return type;
-                if ((type = lex_keyword(parser, "not", YP_LEX_STATE_ARG, YP_TOKEN_KEYWORD_NOT, YP_TOKEN_EOF)) != YP_TOKEN_EOF) return type;
-                break;
-            case 4:
-                if ((type = lex_keyword(parser, "case", YP_LEX_STATE_BEG, YP_TOKEN_KEYWORD_CASE, YP_TOKEN_EOF)) != YP_TOKEN_EOF) return type;
-                if ((type = lex_keyword(parser, "else", YP_LEX_STATE_BEG, YP_TOKEN_KEYWORD_ELSE, YP_TOKEN_EOF)) != YP_TOKEN_EOF) return type;
-                if ((type = lex_keyword(parser, "next", YP_LEX_STATE_MID, YP_TOKEN_KEYWORD_NEXT, YP_TOKEN_EOF)) != YP_TOKEN_EOF) return type;
-                if ((type = lex_keyword(parser, "redo", YP_LEX_STATE_END, YP_TOKEN_KEYWORD_REDO, YP_TOKEN_EOF)) != YP_TOKEN_EOF) return type;
-                if ((type = lex_keyword(parser, "self", YP_LEX_STATE_END, YP_TOKEN_KEYWORD_SELF, YP_TOKEN_EOF)) != YP_TOKEN_EOF) return type;
-                if ((type = lex_keyword(parser, "then", YP_LEX_STATE_BEG, YP_TOKEN_KEYWORD_THEN, YP_TOKEN_EOF)) != YP_TOKEN_EOF) return type;
-                if ((type = lex_keyword(parser, "true", YP_LEX_STATE_END, YP_TOKEN_KEYWORD_TRUE, YP_TOKEN_EOF)) != YP_TOKEN_EOF) return type;
-                if ((type = lex_keyword(parser, "when", YP_LEX_STATE_BEG, YP_TOKEN_KEYWORD_WHEN, YP_TOKEN_EOF)) != YP_TOKEN_EOF) return type;
-                break;
-            case 5:
-                if ((type = lex_keyword(parser, "alias", YP_LEX_STATE_FNAME | YP_LEX_STATE_FITEM, YP_TOKEN_KEYWORD_ALIAS, YP_TOKEN_EOF)) != YP_TOKEN_EOF) return type;
-                if ((type = lex_keyword(parser, "begin", YP_LEX_STATE_BEG, YP_TOKEN_KEYWORD_BEGIN, YP_TOKEN_EOF)) != YP_TOKEN_EOF) return type;
-                if ((type = lex_keyword(parser, "BEGIN", YP_LEX_STATE_END, YP_TOKEN_KEYWORD_BEGIN_UPCASE, YP_TOKEN_EOF)) != YP_TOKEN_EOF) return type;
-                if ((type = lex_keyword(parser, "break", YP_LEX_STATE_MID, YP_TOKEN_KEYWORD_BREAK, YP_TOKEN_EOF)) != YP_TOKEN_EOF) return type;
-                if ((type = lex_keyword(parser, "class", YP_LEX_STATE_CLASS, YP_TOKEN_KEYWORD_CLASS, YP_TOKEN_EOF)) != YP_TOKEN_EOF) return type;
-                if ((type = lex_keyword(parser, "elsif", YP_LEX_STATE_BEG, YP_TOKEN_KEYWORD_ELSIF, YP_TOKEN_EOF)) != YP_TOKEN_EOF) return type;
-                if ((type = lex_keyword(parser, "false", YP_LEX_STATE_END, YP_TOKEN_KEYWORD_FALSE, YP_TOKEN_EOF)) != YP_TOKEN_EOF) return type;
-                if ((type = lex_keyword(parser, "retry", YP_LEX_STATE_END, YP_TOKEN_KEYWORD_RETRY, YP_TOKEN_EOF)) != YP_TOKEN_EOF) return type;
-                if ((type = lex_keyword(parser, "super", YP_LEX_STATE_ARG, YP_TOKEN_KEYWORD_SUPER, YP_TOKEN_EOF)) != YP_TOKEN_EOF) return type;
-                if ((type = lex_keyword(parser, "undef", YP_LEX_STATE_FNAME | YP_LEX_STATE_FITEM, YP_TOKEN_KEYWORD_UNDEF, YP_TOKEN_EOF)) != YP_TOKEN_EOF) return type;
-                if ((type = lex_keyword(parser, "until", YP_LEX_STATE_BEG, YP_TOKEN_KEYWORD_UNTIL, YP_TOKEN_KEYWORD_UNTIL_MODIFIER)) != YP_TOKEN_EOF) return type;
-                if ((type = lex_keyword(parser, "while", YP_LEX_STATE_BEG, YP_TOKEN_KEYWORD_WHILE, YP_TOKEN_KEYWORD_WHILE_MODIFIER)) != YP_TOKEN_EOF) return type;
-                if ((type = lex_keyword(parser, "yield", YP_LEX_STATE_ARG, YP_TOKEN_KEYWORD_YIELD, YP_TOKEN_EOF)) != YP_TOKEN_EOF) return type;
-                break;
-            case 6:
-                if ((type = lex_keyword(parser, "ensure", YP_LEX_STATE_BEG, YP_TOKEN_KEYWORD_ENSURE, YP_TOKEN_EOF)) != YP_TOKEN_EOF) return type;
-                if ((type = lex_keyword(parser, "module", YP_LEX_STATE_BEG, YP_TOKEN_KEYWORD_MODULE, YP_TOKEN_EOF)) != YP_TOKEN_EOF) return type;
-                if ((type = lex_keyword(parser, "rescue", YP_LEX_STATE_MID, YP_TOKEN_KEYWORD_RESCUE, YP_TOKEN_KEYWORD_RESCUE_MODIFIER)) != YP_TOKEN_EOF) return type;
-                if ((type = lex_keyword(parser, "return", YP_LEX_STATE_MID, YP_TOKEN_KEYWORD_RETURN, YP_TOKEN_EOF)) != YP_TOKEN_EOF) return type;
-                if ((type = lex_keyword(parser, "unless", YP_LEX_STATE_BEG, YP_TOKEN_KEYWORD_UNLESS, YP_TOKEN_KEYWORD_UNLESS_MODIFIER)) != YP_TOKEN_EOF) return type;
-                break;
-            case 8:
-                if ((type = lex_keyword(parser, "__LINE__", YP_LEX_STATE_END, YP_TOKEN_KEYWORD___LINE__, YP_TOKEN_EOF)) != YP_TOKEN_EOF) return type;
-                if ((type = lex_keyword(parser, "__FILE__", YP_LEX_STATE_END, YP_TOKEN_KEYWORD___FILE__, YP_TOKEN_EOF)) != YP_TOKEN_EOF) return type;
-                break;
-            case 12:
-                if ((type = lex_keyword(parser, "__ENCODING__", YP_LEX_STATE_END, YP_TOKEN_KEYWORD___ENCODING__, YP_TOKEN_EOF)) != YP_TOKEN_EOF) return type;
-                break;
-        }
-    }
-
-    return parser->encoding.isupper_char(parser->current.start, parser->end - parser->current.start) ? YP_TOKEN_CONSTANT : YP_TOKEN_IDENTIFIER;
-}
-
-// Returns true if the current token that the parser is considering is at the
-// beginning of a line or the beginning of the source.
-static bool
-current_token_starts_line(yp_parser_t *parser) {
-    return (parser->current.start == parser->start) || (parser->current.start[-1] == '\n');
-}
-
-// When we hit a # while lexing something like a string, we need to potentially
-// handle interpolation. This function performs that check. It returns a token
-// type representing what it found. Those cases are:
-//
-// * YP_TOKEN_NOT_PROVIDED - No interpolation was found at this point. The
-//     caller should keep lexing.
-// * YP_TOKEN_STRING_CONTENT - No interpolation was found at this point. The
-//     caller should return this token type.
-// * YP_TOKEN_EMBEXPR_BEGIN - An embedded expression was found. The caller
-//     should return this token type.
-// * YP_TOKEN_EMBVAR - An embedded variable was found. The caller should return
-//     this token type.
-//
-static yp_token_type_t
-lex_interpolation(yp_parser_t *parser, const uint8_t *pound) {
-    // If there is no content following this #, then we're at the end of
-    // the string and we can safely return string content.
-    if (pound + 1 >= parser->end) {
-        parser->current.end = pound + 1;
-        return YP_TOKEN_STRING_CONTENT;
-    }
-
-    // Now we'll check against the character the follows the #. If it constitutes
-    // valid interplation, we'll handle that, otherwise we'll return
-    // YP_TOKEN_NOT_PROVIDED.
-    switch (pound[1]) {
-        case '@': {
-            // In this case we may have hit an embedded instance or class variable.
-            if (pound + 2 >= parser->end) {
-                parser->current.end = pound + 1;
-                return YP_TOKEN_STRING_CONTENT;
-            }
-
-            // If we're looking at a @ and there's another @, then we'll skip past the
-            // second @.
-            const uint8_t *variable = pound + 2;
-            if (*variable == '@' && pound + 3 < parser->end) variable++;
-
-            if (char_is_identifier_start(parser, variable)) {
-                // At this point we're sure that we've either hit an embedded instance
-                // or class variable. In this case we'll first need to check if we've
-                // already consumed content.
-                if (pound > parser->current.start) {
-                    parser->current.end = pound;
-                    return YP_TOKEN_STRING_CONTENT;
-                }
-
-                // Otherwise we need to return the embedded variable token
-                // and then switch to the embedded variable lex mode.
-                lex_mode_push(parser, (yp_lex_mode_t) { .mode = YP_LEX_EMBVAR });
-                parser->current.end = pound + 1;
-                return YP_TOKEN_EMBVAR;
-            }
-
-            // If we didn't get an valid interpolation, then this is just regular
-            // string content. This is like if we get "#@-". In this case the caller
-            // should keep lexing.
-            parser->current.end = variable;
-            return YP_TOKEN_NOT_PROVIDED;
-        }
-        case '$':
-            // In this case we may have hit an embedded global variable. If there's
-            // not enough room, then we'll just return string content.
-            if (pound + 2 >= parser->end) {
-                parser->current.end = pound + 1;
-                return YP_TOKEN_STRING_CONTENT;
-            }
-
-            // This is the character that we're going to check to see if it is the
-            // start of an identifier that would indicate that this is a global
-            // variable.
-            const uint8_t *check = pound + 2;
-
-            if (pound[2] == '-') {
-                if (pound + 3 >= parser->end) {
-                    parser->current.end = pound + 2;
-                    return YP_TOKEN_STRING_CONTENT;
-                }
-
-                check++;
-            }
-
-            // If the character that we're going to check is the start of an
-            // identifier, or we don't have a - and the character is a decimal number
-            // or a global name punctuation character, then we've hit an embedded
-            // global variable.
-            if (
-                char_is_identifier_start(parser, check) ||
-                (pound[2] != '-' && (yp_char_is_decimal_digit(pound[2]) || char_is_global_name_punctuation(pound[2])))
-            ) {
-                // In this case we've hit an embedded global variable. First check to
-                // see if we've already consumed content. If we have, then we need to
-                // return that content as string content first.
-                if (pound > parser->current.start) {
-                    parser->current.end = pound;
-                    return YP_TOKEN_STRING_CONTENT;
-                }
-
-                // Otherwise, we need to return the embedded variable token and switch
-                // to the embedded variable lex mode.
-                lex_mode_push(parser, (yp_lex_mode_t) { .mode = YP_LEX_EMBVAR });
-                parser->current.end = pound + 1;
-                return YP_TOKEN_EMBVAR;
-            }
-
-            // In this case we've hit a #$ that does not indicate a global variable.
-            // In this case we'll continue lexing past it.
-            parser->current.end = pound + 1;
-            return YP_TOKEN_NOT_PROVIDED;
-        case '{':
-            // In this case it's the start of an embedded expression. If we have
-            // already consumed content, then we need to return that content as string
-            // content first.
-            if (pound > parser->current.start) {
-                parser->current.end = pound;
-                return YP_TOKEN_STRING_CONTENT;
-            }
-
-            parser->enclosure_nesting++;
-
-            // Otherwise we'll skip past the #{ and begin lexing the embedded
-            // expression.
-            lex_mode_push(parser, (yp_lex_mode_t) { .mode = YP_LEX_EMBEXPR });
-            parser->current.end = pound + 2;
-            parser->command_start = true;
-            yp_do_loop_stack_push(parser, false);
-            return YP_TOKEN_EMBEXPR_BEGIN;
-        default:
-            // In this case we've hit a # that doesn't constitute interpolation. We'll
-            // mark that by returning the not provided token type. This tells the
-            // consumer to keep lexing forward.
-            parser->current.end = pound + 1;
-            return YP_TOKEN_NOT_PROVIDED;
-    }
-}
-
-// This function is responsible for lexing either a character literal or the ?
-// operator. The supported character literals are described below.
-//
-// \a             bell, ASCII 07h (BEL)
-// \b             backspace, ASCII 08h (BS)
-// \t             horizontal tab, ASCII 09h (TAB)
-// \n             newline (line feed), ASCII 0Ah (LF)
-// \v             vertical tab, ASCII 0Bh (VT)
-// \f             form feed, ASCII 0Ch (FF)
-// \r             carriage return, ASCII 0Dh (CR)
-// \e             escape, ASCII 1Bh (ESC)
-// \s             space, ASCII 20h (SPC)
-// \\             backslash
-// \nnn           octal bit pattern, where nnn is 1-3 octal digits ([0-7])
-// \xnn           hexadecimal bit pattern, where nn is 1-2 hexadecimal digits ([0-9a-fA-F])
-// \unnnn         Unicode character, where nnnn is exactly 4 hexadecimal digits ([0-9a-fA-F])
-// \u{nnnn ...}   Unicode character(s), where each nnnn is 1-6 hexadecimal digits ([0-9a-fA-F])
-// \cx or \C-x    control character, where x is an ASCII printable character
-// \M-x           meta character, where x is an ASCII printable character
-// \M-\C-x        meta control character, where x is an ASCII printable character
-// \M-\cx         same as above
-// \c\M-x         same as above
-// \c? or \C-?    delete, ASCII 7Fh (DEL)
-//
-static yp_token_type_t
-lex_question_mark(yp_parser_t *parser) {
-    if (lex_state_end_p(parser)) {
-        lex_state_set(parser, YP_LEX_STATE_BEG);
-        return YP_TOKEN_QUESTION_MARK;
-    }
-
-    if (parser->current.end >= parser->end) {
-        yp_diagnostic_list_append(&parser->error_list, parser->current.start, parser->current.end, "Incomplete character syntax.");
-        return YP_TOKEN_CHARACTER_LITERAL;
-    }
-
-    if (yp_char_is_whitespace(*parser->current.end)) {
-        lex_state_set(parser, YP_LEX_STATE_BEG);
-        return YP_TOKEN_QUESTION_MARK;
-    }
-
-    lex_state_set(parser, YP_LEX_STATE_BEG);
-
-    if (parser->current.start[1] == '\\') {
-        lex_state_set(parser, YP_LEX_STATE_END);
-        parser->current.end += yp_unescape_calculate_difference(parser, parser->current.start + 1, YP_UNESCAPE_ALL, true);
-        return YP_TOKEN_CHARACTER_LITERAL;
-    } else {
-        size_t encoding_width = parser->encoding.char_width(parser->current.end, parser->end - parser->current.end);
-
-        // Ternary operators can have a ? immediately followed by an identifier which starts with
-        // an underscore. We check for this case
-        if (
-            !(parser->encoding.alnum_char(parser->current.end, parser->end - parser->current.end) ||
-              peek(parser) == '_') ||
-            (
-                (parser->current.end + encoding_width >= parser->end) ||
-                !char_is_identifier(parser, parser->current.end + encoding_width)
-            )
-        ) {
-            lex_state_set(parser, YP_LEX_STATE_END);
-            parser->current.end += encoding_width;
-            return YP_TOKEN_CHARACTER_LITERAL;
-        }
-    }
-
-    return YP_TOKEN_QUESTION_MARK;
-}
-
-// Lex a variable that starts with an @ sign (either an instance or class
-// variable).
-static yp_token_type_t
-lex_at_variable(yp_parser_t *parser) {
-    yp_token_type_t type = match(parser, '@') ? YP_TOKEN_CLASS_VARIABLE : YP_TOKEN_INSTANCE_VARIABLE;
-    size_t width;
-
-    if (parser->current.end < parser->end && (width = char_is_identifier_start(parser, parser->current.end)) > 0) {
-        parser->current.end += width;
-
-        while (parser->current.end < parser->end && (width = char_is_identifier(parser, parser->current.end)) > 0) {
-            parser->current.end += width;
-        }
-    } else if (type == YP_TOKEN_CLASS_VARIABLE) {
-        yp_diagnostic_list_append(&parser->error_list, parser->current.start, parser->current.end, "Incomplete class variable.");
-    } else {
-        yp_diagnostic_list_append(&parser->error_list, parser->current.start, parser->current.end, "Incomplete instance variable.");
-    }
-
-    // If we're lexing an embedded variable, then we need to pop back into the
-    // parent lex context.
-    if (parser->lex_modes.current->mode == YP_LEX_EMBVAR) {
-        lex_mode_pop(parser);
-    }
-
-    return type;
-}
-
-// Optionally call out to the lex callback if one is provided.
-static inline void
-parser_lex_callback(yp_parser_t *parser) {
-    if (parser->lex_callback) {
-        parser->lex_callback->callback(parser->lex_callback->data, parser, &parser->current);
-    }
-}
-
-// Return a new comment node of the specified type.
-static inline yp_comment_t *
-parser_comment(yp_parser_t *parser, yp_comment_type_t type) {
-    yp_comment_t *comment = (yp_comment_t *) malloc(sizeof(yp_comment_t));
-    if (comment == NULL) return NULL;
-
-    *comment = (yp_comment_t) {
-        .type = type,
-        .start = parser->current.start,
-        .end = parser->current.end
-    };
-
-    return comment;
-}
-
-// Lex out embedded documentation, and return when we have either hit the end of
-// the file or the end of the embedded documentation. This calls the callback
-// manually because only the lexer should see these tokens, not the parser.
-static yp_token_type_t
-lex_embdoc(yp_parser_t *parser) {
-    // First, lex out the EMBDOC_BEGIN token.
-    const uint8_t *newline = next_newline(parser->current.end, parser->end - parser->current.end);
-
-    if (newline == NULL) {
-        parser->current.end = parser->end;
-    } else {
-        yp_newline_list_append(&parser->newline_list, newline);
-        parser->current.end = newline + 1;
-    }
-
-    parser->current.type = YP_TOKEN_EMBDOC_BEGIN;
-    parser_lex_callback(parser);
-
-    // Now, create a comment that is going to be attached to the parser.
-    yp_comment_t *comment = parser_comment(parser, YP_COMMENT_EMBDOC);
-    if (comment == NULL) return YP_TOKEN_EOF;
-
-    // Now, loop until we find the end of the embedded documentation or the end of
-    // the file.
-    while (parser->current.end + 4 <= parser->end) {
-        parser->current.start = parser->current.end;
-
-        // If we've hit the end of the embedded documentation then we'll return that
-        // token here.
-        if (memcmp(parser->current.end, "=end", 4) == 0 &&
-                (parser->current.end + 4 == parser->end || yp_char_is_whitespace(parser->current.end[4]))) {
-            const uint8_t *newline = next_newline(parser->current.end, parser->end - parser->current.end);
-
-            if (newline == NULL) {
-                parser->current.end = parser->end;
-            } else {
-                yp_newline_list_append(&parser->newline_list, newline);
-                parser->current.end = newline + 1;
-            }
-
-            parser->current.type = YP_TOKEN_EMBDOC_END;
-            parser_lex_callback(parser);
-
-            comment->end = parser->current.end;
-            yp_list_append(&parser->comment_list, (yp_list_node_t *) comment);
-
-            return YP_TOKEN_EMBDOC_END;
-        }
-
-        // Otherwise, we'll parse until the end of the line and return a line of
-        // embedded documentation.
-        const uint8_t *newline = next_newline(parser->current.end, parser->end - parser->current.end);
-
-        if (newline == NULL) {
-            parser->current.end = parser->end;
-        } else {
-            yp_newline_list_append(&parser->newline_list, newline);
-            parser->current.end = newline + 1;
-        }
-
-        parser->current.type = YP_TOKEN_EMBDOC_LINE;
-        parser_lex_callback(parser);
-    }
-
-    yp_diagnostic_list_append(&parser->error_list, parser->current.start, parser->current.end, "Unterminated embdoc");
-
-    comment->end = parser->current.end;
-    yp_list_append(&parser->comment_list, (yp_list_node_t *) comment);
-
-    return YP_TOKEN_EOF;
-}
-
-// Set the current type to an ignored newline and then call the lex callback.
-// This happens in a couple places depending on whether or not we have already
-// lexed a comment.
-static inline void
-parser_lex_ignored_newline(yp_parser_t *parser) {
-    parser->current.type = YP_TOKEN_IGNORED_NEWLINE;
-    parser_lex_callback(parser);
-}
-
-// This function will be called when a newline is encountered. In some newlines,
-// we need to check if there is a heredoc or heredocs that we have already lexed
-// the body of that we need to now skip past. That will be indicated by the
-// heredoc_end field on the parser.
-//
-// If it is set, then we need to skip past the heredoc body and then clear the
-// heredoc_end field.
-static inline void
-parser_flush_heredoc_end(yp_parser_t *parser) {
-    assert(parser->heredoc_end <= parser->end);
-    parser->next_start = parser->heredoc_end;
-    parser->heredoc_end = NULL;
-}
-
-// This is a convenience macro that will set the current token type, call the
-// lex callback, and then return from the parser_lex function.
-#define LEX(token_type) parser->current.type = token_type; parser_lex_callback(parser); return
-
-// Called when the parser requires a new token. The parser maintains a moving
-// window of two tokens at a time: parser.previous and parser.current. This
-// function will move the current token into the previous token and then
-// lex a new token into the current token.
-static void
-parser_lex(yp_parser_t *parser) {
-    assert(parser->current.end <= parser->end);
-    parser->previous = parser->current;
-
-    // This value mirrors cmd_state from CRuby.
-    bool previous_command_start = parser->command_start;
-    parser->command_start = false;
-
-    // This is used to communicate to the newline lexing function that we've
-    // already seen a comment.
-    bool lexed_comment = false;
-
-    switch (parser->lex_modes.current->mode) {
-        case YP_LEX_DEFAULT:
-        case YP_LEX_EMBEXPR:
-        case YP_LEX_EMBVAR:
-
-        // We have a specific named label here because we are going to jump back to
-        // this location in the event that we have lexed a token that should not be
-        // returned to the parser. This includes comments, ignored newlines, and
-        // invalid tokens of some form.
-        lex_next_token: {
-            // If we have the special next_start pointer set, then we're going to jump
-            // to that location and start lexing from there.
-            if (parser->next_start != NULL) {
-                parser->current.end = parser->next_start;
-                parser->next_start = NULL;
-            }
-
-            // This value mirrors space_seen from CRuby. It tracks whether or not
-            // space has been eaten before the start of the next token.
-            bool space_seen = false;
-
-            // First, we're going to skip past any whitespace at the front of the next
-            // token.
-            bool chomping = true;
-            while (parser->current.end < parser->end && chomping) {
-                switch (*parser->current.end) {
-                    case ' ':
-                    case '\t':
-                    case '\f':
-                    case '\v':
-                        parser->current.end++;
-                        space_seen = true;
-                        break;
-                    case '\r':
-                        if (match_eol_offset(parser, 1)) {
-                            chomping = false;
-                        } else {
-                            parser->current.end++;
-                            space_seen = true;
-                        }
-                        break;
-                    case '\\': {
-                        size_t eol_length = match_eol_offset(parser, 1);
-                        if (eol_length) {
-                            if (parser->heredoc_end) {
-                                parser->current.end = parser->heredoc_end;
-                                parser->heredoc_end = NULL;
-                            } else {
-                                parser->current.end += eol_length + 1;
-                                yp_newline_list_append(&parser->newline_list, parser->current.end - 1);
-                                space_seen = true;
-                            }
-                        } else if (yp_char_is_inline_whitespace(*parser->current.end)) {
-                            parser->current.end += 2;
-                        } else {
-                            chomping = false;
-                        }
-
-                        break;
-                    }
-                    default:
-                        chomping = false;
-                        break;
-                }
-            }
-
-            // Next, we'll set to start of this token to be the current end.
-            parser->current.start = parser->current.end;
-
-            // We'll check if we're at the end of the file. If we are, then we
-            // need to return the EOF token.
-            if (parser->current.end >= parser->end) {
-                LEX(YP_TOKEN_EOF);
-            }
-
-            // Finally, we'll check the current character to determine the next
-            // token.
-            switch (*parser->current.end++) {
-                case '\0':   // NUL or end of script
-                case '\004': // ^D
-                case '\032': // ^Z
-                    parser->current.end--;
-                    LEX(YP_TOKEN_EOF);
-
-                case '#': { // comments
-                    const uint8_t *ending = next_newline(parser->current.end, parser->end - parser->current.end);
-
-                    parser->current.end = ending == NULL ? parser->end : ending + 1;
-                    parser->current.type = YP_TOKEN_COMMENT;
-                    parser_lex_callback(parser);
-
-                    // If we found a comment while lexing, then we're going to
-                    // add it to the list of comments in the file and keep
-                    // lexing.
-                    yp_comment_t *comment = parser_comment(parser, YP_COMMENT_INLINE);
-                    yp_list_append(&parser->comment_list, (yp_list_node_t *) comment);
-
-                    if (parser->current.start == parser->encoding_comment_start) {
-                        parser_lex_encoding_comment(parser);
-                    }
-
-                    lexed_comment = true;
-                }
-                /* fallthrough */
-                case '\r':
-                case '\n': {
-                    size_t eol_length = match_eol_at(parser, parser->current.end - 1);
-                    if (eol_length) {
-                        // The only way you can have carriage returns in this
-                        // particular loop is if you have a carriage return
-                        // followed by a newline. In that case we'll just skip
-                        // over the carriage return and continue lexing, in
-                        // order to make it so that the newline token
-                        // encapsulates both the carriage return and the
-                        // newline. Note that we need to check that we haven't
-                        // already lexed a comment here because that falls
-                        // through into here as well.
-                        if (!lexed_comment) {
-                            parser->current.end += eol_length - 1; // skip CR
-                        }
-
-                        if (parser->heredoc_end == NULL) {
-                            yp_newline_list_append(&parser->newline_list, parser->current.end - 1);
-                        }
-                    }
-
-                    if (parser->heredoc_end) {
-                        parser_flush_heredoc_end(parser);
-                    }
-
-                    // If this is an ignored newline, then we can continue lexing after
-                    // calling the callback with the ignored newline token.
-                    switch (lex_state_ignored_p(parser)) {
-                        case YP_IGNORED_NEWLINE_NONE:
-                            break;
-                        case YP_IGNORED_NEWLINE_PATTERN:
-                            if (parser->pattern_matching_newlines || parser->in_keyword_arg) {
-                                if (!lexed_comment) parser_lex_ignored_newline(parser);
-                                lex_state_set(parser, YP_LEX_STATE_BEG);
-                                parser->command_start = true;
-                                parser->current.type = YP_TOKEN_NEWLINE;
-                                return;
-                            }
-                            /* fallthrough */
-                        case YP_IGNORED_NEWLINE_ALL:
-                            if (!lexed_comment) parser_lex_ignored_newline(parser);
-                            lexed_comment = false;
-                            goto lex_next_token;
-                    }
-
-                    // Here we need to look ahead and see if there is a call operator
-                    // (either . or &.) that starts the next line. If there is, then this
-                    // is going to become an ignored newline and we're going to instead
-                    // return the call operator.
-                    const uint8_t *next_content = parser->next_start == NULL ? parser->current.end : parser->next_start;
-                    next_content += yp_strspn_inline_whitespace(next_content, parser->end - next_content);
-
-                    if (next_content < parser->end) {
-                        // If we hit a comment after a newline, then we're going to check
-                        // if it's ignored or if it's followed by a method call ('.').
-                        // If it is, then we're going to call the
-                        // callback with an ignored newline and then continue lexing.
-                        // Otherwise we'll return a regular newline.
-                        if (next_content[0] == '#') {
-                            // Here we look for a "." or "&." following a "\n".
-                            const uint8_t *following = next_newline(next_content, parser->end - next_content);
-
-                            while (following && (following + 1 < parser->end)) {
-                                following++;
-                                following += yp_strspn_inline_whitespace(following, parser->end - following);
-
-                                // If this is not followed by a comment, then we can break out
-                                // of this loop.
-                                if (peek_at(parser, following) != '#') break;
-
-                                // If there is a comment, then we need to find the end of the
-                                // comment and continue searching from there.
-                                following = next_newline(following, parser->end - following);
-                            }
-
-                            // If the lex state was ignored, or we hit a '.' or a '&.',
-                            // we will lex the ignored newline
-                            if (
-                                lex_state_ignored_p(parser) ||
-                                (following && (
-                                    (peek_at(parser, following) == '.') ||
-                                    (peek_at(parser, following) == '&' && peek_at(parser, following + 1) == '.')
-                                ))
-                            ) {
-                                if (!lexed_comment) parser_lex_ignored_newline(parser);
-                                lexed_comment = false;
-                                goto lex_next_token;
-                            }
-                        }
-
-                        // If we hit a . after a newline, then we're in a call chain and
-                        // we need to return the call operator.
-                        if (next_content[0] == '.') {
-                            // To match ripper, we need to emit an ignored newline even though
-                            // its a real newline in the case that we have a beginless range
-                            // on a subsequent line.
-                            if (peek_at(parser, next_content + 1) == '.') {
-                                if (!lexed_comment) parser_lex_ignored_newline(parser);
-                                lex_state_set(parser, YP_LEX_STATE_BEG);
-                                parser->command_start = true;
-                                parser->current.type = YP_TOKEN_NEWLINE;
-                                return;
-                            }
-
-                            if (!lexed_comment) parser_lex_ignored_newline(parser);
-                            lex_state_set(parser, YP_LEX_STATE_DOT);
-                            parser->current.start = next_content;
-                            parser->current.end = next_content + 1;
-                            parser->next_start = NULL;
-                            LEX(YP_TOKEN_DOT);
-                        }
-
-                        // If we hit a &. after a newline, then we're in a call chain and
-                        // we need to return the call operator.
-                        if (peek_at(parser, next_content) == '&' && peek_at(parser, next_content + 1) == '.') {
-                            if (!lexed_comment) parser_lex_ignored_newline(parser);
-                            lex_state_set(parser, YP_LEX_STATE_DOT);
-                            parser->current.start = next_content;
-                            parser->current.end = next_content + 2;
-                            parser->next_start = NULL;
-                            LEX(YP_TOKEN_AMPERSAND_DOT);
-                        }
-                    }
-
-                    // At this point we know this is a regular newline, and we can set the
-                    // necessary state and return the token.
-                    lex_state_set(parser, YP_LEX_STATE_BEG);
-                    parser->command_start = true;
-                    parser->current.type = YP_TOKEN_NEWLINE;
-                    if (!lexed_comment) parser_lex_callback(parser);
-                    return;
-                }
-
-                // ,
-                case ',':
-                    lex_state_set(parser, YP_LEX_STATE_BEG | YP_LEX_STATE_LABEL);
-                    LEX(YP_TOKEN_COMMA);
-
-                // (
-                case '(': {
-                    yp_token_type_t type = YP_TOKEN_PARENTHESIS_LEFT;
-
-                    if (space_seen && (lex_state_arg_p(parser) || parser->lex_state == (YP_LEX_STATE_END | YP_LEX_STATE_LABEL))) {
-                        type = YP_TOKEN_PARENTHESIS_LEFT_PARENTHESES;
-                    }
-
-                    parser->enclosure_nesting++;
-                    lex_state_set(parser, YP_LEX_STATE_BEG | YP_LEX_STATE_LABEL);
-                    yp_do_loop_stack_push(parser, false);
-                    LEX(type);
-                }
-
-                // )
-                case ')':
-                    parser->enclosure_nesting--;
-                    lex_state_set(parser, YP_LEX_STATE_ENDFN);
-                    yp_do_loop_stack_pop(parser);
-                    LEX(YP_TOKEN_PARENTHESIS_RIGHT);
-
-                // ;
-                case ';':
-                    lex_state_set(parser, YP_LEX_STATE_BEG);
-                    parser->command_start = true;
-                    LEX(YP_TOKEN_SEMICOLON);
-
-                // [ [] []=
-                case '[':
-                    parser->enclosure_nesting++;
-                    yp_token_type_t type = YP_TOKEN_BRACKET_LEFT;
-
-                    if (lex_state_operator_p(parser)) {
-                        if (match(parser, ']')) {
-                            parser->enclosure_nesting--;
-                            lex_state_set(parser, YP_LEX_STATE_ARG);
-                            LEX(match(parser, '=') ? YP_TOKEN_BRACKET_LEFT_RIGHT_EQUAL : YP_TOKEN_BRACKET_LEFT_RIGHT);
-                        }
-
-                        lex_state_set(parser, YP_LEX_STATE_ARG | YP_LEX_STATE_LABEL);
-                        LEX(type);
-                    }
-
-                    if (lex_state_beg_p(parser) || (lex_state_arg_p(parser) && (space_seen || lex_state_p(parser, YP_LEX_STATE_LABELED)))) {
-                        type = YP_TOKEN_BRACKET_LEFT_ARRAY;
-                    }
-
-                    lex_state_set(parser, YP_LEX_STATE_BEG | YP_LEX_STATE_LABEL);
-                    yp_do_loop_stack_push(parser, false);
-                    LEX(type);
-
-                // ]
-                case ']':
-                    parser->enclosure_nesting--;
-                    lex_state_set(parser, YP_LEX_STATE_END);
-                    yp_do_loop_stack_pop(parser);
-                    LEX(YP_TOKEN_BRACKET_RIGHT);
-
-                // {
-                case '{': {
-                    yp_token_type_t type = YP_TOKEN_BRACE_LEFT;
-
-                    if (parser->enclosure_nesting == parser->lambda_enclosure_nesting) {
-                        // This { begins a lambda
-                        parser->command_start = true;
-                        lex_state_set(parser, YP_LEX_STATE_BEG);
-                        type = YP_TOKEN_LAMBDA_BEGIN;
-                    } else if (lex_state_p(parser, YP_LEX_STATE_LABELED)) {
-                        // This { begins a hash literal
-                        lex_state_set(parser, YP_LEX_STATE_BEG | YP_LEX_STATE_LABEL);
-                    } else if (lex_state_p(parser, YP_LEX_STATE_ARG_ANY | YP_LEX_STATE_END | YP_LEX_STATE_ENDFN)) {
-                        // This { begins a block
-                        parser->command_start = true;
-                        lex_state_set(parser, YP_LEX_STATE_BEG);
-                    } else if (lex_state_p(parser, YP_LEX_STATE_ENDARG)) {
-                        // This { begins a block on a command
-                        parser->command_start = true;
-                        lex_state_set(parser, YP_LEX_STATE_BEG);
-                    } else {
-                        // This { begins a hash literal
-                        lex_state_set(parser, YP_LEX_STATE_BEG | YP_LEX_STATE_LABEL);
-                    }
-
-                    parser->enclosure_nesting++;
-                    parser->brace_nesting++;
-                    yp_do_loop_stack_push(parser, false);
-
-                    LEX(type);
-                }
-
-                // }
-                case '}':
-                    parser->enclosure_nesting--;
-                    yp_do_loop_stack_pop(parser);
-
-                    if ((parser->lex_modes.current->mode == YP_LEX_EMBEXPR) && (parser->brace_nesting == 0)) {
-                        lex_mode_pop(parser);
-                        LEX(YP_TOKEN_EMBEXPR_END);
-                    }
-
-                    parser->brace_nesting--;
-                    lex_state_set(parser, YP_LEX_STATE_END);
-                    LEX(YP_TOKEN_BRACE_RIGHT);
-
-                // * ** **= *=
-                case '*': {
-                    if (match(parser, '*')) {
-                        if (match(parser, '=')) {
-                            lex_state_set(parser, YP_LEX_STATE_BEG);
-                            LEX(YP_TOKEN_STAR_STAR_EQUAL);
-                        }
-
-                        yp_token_type_t type = YP_TOKEN_STAR_STAR;
-
-                        if (lex_state_spcarg_p(parser, space_seen) || lex_state_beg_p(parser)) {
-                            type = YP_TOKEN_USTAR_STAR;
-                        }
-
-                        if (lex_state_operator_p(parser)) {
-                            lex_state_set(parser, YP_LEX_STATE_ARG);
-                        } else {
-                            lex_state_set(parser, YP_LEX_STATE_BEG);
-                        }
-
-                        LEX(type);
-                    }
-
-                    if (match(parser, '=')) {
-                        lex_state_set(parser, YP_LEX_STATE_BEG);
-                        LEX(YP_TOKEN_STAR_EQUAL);
-                    }
-
-                    yp_token_type_t type = YP_TOKEN_STAR;
-
-                    if (lex_state_spcarg_p(parser, space_seen)) {
-                        yp_diagnostic_list_append(&parser->warning_list, parser->current.start, parser->current.end, "`*' interpreted as argument prefix");
-                        type = YP_TOKEN_USTAR;
-                    } else if (lex_state_beg_p(parser)) {
-                        type = YP_TOKEN_USTAR;
-                    }
-
-                    if (lex_state_operator_p(parser)) {
-                        lex_state_set(parser, YP_LEX_STATE_ARG);
-                    } else {
-                        lex_state_set(parser, YP_LEX_STATE_BEG);
-                    }
-
-                    LEX(type);
-                }
-
-                // ! != !~ !@
-                case '!':
-                    if (lex_state_operator_p(parser)) {
-                        lex_state_set(parser, YP_LEX_STATE_ARG);
-                        if (match(parser, '@')) {
-                            LEX(YP_TOKEN_BANG);
-                        }
-                    } else {
-                        lex_state_set(parser, YP_LEX_STATE_BEG);
-                    }
-
-                    if (match(parser, '=')) {
-                        LEX(YP_TOKEN_BANG_EQUAL);
-                    }
-
-                    if (match(parser, '~')) {
-                        LEX(YP_TOKEN_BANG_TILDE);
-                    }
-
-                    LEX(YP_TOKEN_BANG);
-
-                // = => =~ == === =begin
-                case '=':
-                    if (current_token_starts_line(parser) && memcmp(peek_string(parser, 5), "begin", 5) == 0 && yp_char_is_whitespace(peek_offset(parser, 5))) {
-                        yp_token_type_t type = lex_embdoc(parser);
-
-                        if (type == YP_TOKEN_EOF) {
-                            LEX(type);
-                        }
-
-                        goto lex_next_token;
-                    }
-
-                    if (lex_state_operator_p(parser)) {
-                        lex_state_set(parser, YP_LEX_STATE_ARG);
-                    } else {
-                        lex_state_set(parser, YP_LEX_STATE_BEG);
-                    }
-
-                    if (match(parser, '>')) {
-                        LEX(YP_TOKEN_EQUAL_GREATER);
-                    }
-
-                    if (match(parser, '~')) {
-                        LEX(YP_TOKEN_EQUAL_TILDE);
-                    }
-
-                    if (match(parser, '=')) {
-                        LEX(match(parser, '=') ? YP_TOKEN_EQUAL_EQUAL_EQUAL : YP_TOKEN_EQUAL_EQUAL);
-                    }
-
-                    LEX(YP_TOKEN_EQUAL);
-
-                // < << <<= <= <=>
-                case '<':
-                    if (match(parser, '<')) {
-                        if (
-                            !lex_state_p(parser, YP_LEX_STATE_DOT | YP_LEX_STATE_CLASS) &&
-                            !lex_state_end_p(parser) &&
-                            (!lex_state_p(parser, YP_LEX_STATE_ARG_ANY) || lex_state_p(parser, YP_LEX_STATE_LABELED) || space_seen)
-                        ) {
-                            const uint8_t *end = parser->current.end;
-
-                            yp_heredoc_quote_t quote = YP_HEREDOC_QUOTE_NONE;
-                            yp_heredoc_indent_t indent = YP_HEREDOC_INDENT_NONE;
-
-                            if (match(parser, '-')) {
-                                indent = YP_HEREDOC_INDENT_DASH;
-                            }
-                            else if (match(parser, '~')) {
-                                indent = YP_HEREDOC_INDENT_TILDE;
-                            }
-
-                            if (match(parser, '`')) {
-                                quote = YP_HEREDOC_QUOTE_BACKTICK;
-                            }
-                            else if (match(parser, '"')) {
-                                quote = YP_HEREDOC_QUOTE_DOUBLE;
-                            }
-                            else if (match(parser, '\'')) {
-                                quote = YP_HEREDOC_QUOTE_SINGLE;
-                            }
-
-                            const uint8_t *ident_start = parser->current.end;
-                            size_t width = 0;
-
-                            if (parser->current.end >= parser->end) {
-                                parser->current.end = end;
-                            } else if (quote == YP_HEREDOC_QUOTE_NONE && (width = char_is_identifier(parser, parser->current.end)) == 0) {
-                                parser->current.end = end;
-                            } else {
-                                if (quote == YP_HEREDOC_QUOTE_NONE) {
-                                    parser->current.end += width;
-
-                                    while ((parser->current.end < parser->end) && (width = char_is_identifier(parser, parser->current.end))) {
-                                        parser->current.end += width;
-                                    }
-                                } else {
-                                    // If we have quotes, then we're going to go until we find the
-                                    // end quote.
-                                    while ((parser->current.end < parser->end) && quote != (yp_heredoc_quote_t) (*parser->current.end)) {
-                                        parser->current.end++;
-                                    }
-                                }
-
-                                size_t ident_length = (size_t) (parser->current.end - ident_start);
-                                if (quote != YP_HEREDOC_QUOTE_NONE && !match(parser, (uint8_t) quote)) {
-                                    // TODO: handle unterminated heredoc
-                                }
-
-                                lex_mode_push(parser, (yp_lex_mode_t) {
-                                    .mode = YP_LEX_HEREDOC,
-                                    .as.heredoc = {
-                                        .ident_start = ident_start,
-                                        .ident_length = ident_length,
-                                        .next_start = parser->current.end,
-                                        .quote = quote,
-                                        .indent = indent
-                                    }
-                                });
-
-                                if (parser->heredoc_end == NULL) {
-                                    const uint8_t *body_start = next_newline(parser->current.end, parser->end - parser->current.end);
-
-                                    if (body_start == NULL) {
-                                        // If there is no newline after the heredoc identifier, then
-                                        // this is not a valid heredoc declaration. In this case we
-                                        // will add an error, but we will still return a heredoc
-                                        // start.
-                                        yp_diagnostic_list_append(&parser->error_list, parser->current.start, parser->current.end, "Unterminated heredoc.");
-                                        body_start = parser->end;
-                                    } else {
-                                        // Otherwise, we want to indicate that the body of the
-                                        // heredoc starts on the character after the next newline.
-                                        yp_newline_list_append(&parser->newline_list, body_start);
-                                        body_start++;
-                                    }
-
-                                    parser->next_start = body_start;
-                                } else {
-                                    parser->next_start = parser->heredoc_end;
-                                }
-
-                                LEX(YP_TOKEN_HEREDOC_START);
-                            }
-                        }
-
-                        if (match(parser, '=')) {
-                            lex_state_set(parser, YP_LEX_STATE_BEG);
-                            LEX(YP_TOKEN_LESS_LESS_EQUAL);
-                        }
-
-                        if (lex_state_operator_p(parser)) {
-                            lex_state_set(parser, YP_LEX_STATE_ARG);
-                        } else {
-                            if (lex_state_p(parser, YP_LEX_STATE_CLASS)) parser->command_start = true;
-                            lex_state_set(parser, YP_LEX_STATE_BEG);
-                        }
-
-                        LEX(YP_TOKEN_LESS_LESS);
-                    }
-
-                    if (lex_state_operator_p(parser)) {
-                        lex_state_set(parser, YP_LEX_STATE_ARG);
-                    } else {
-                        if (lex_state_p(parser, YP_LEX_STATE_CLASS)) parser->command_start = true;
-                        lex_state_set(parser, YP_LEX_STATE_BEG);
-                    }
-
-                    if (match(parser, '=')) {
-                        if (match(parser, '>')) {
-                            LEX(YP_TOKEN_LESS_EQUAL_GREATER);
-                        }
-
-                        LEX(YP_TOKEN_LESS_EQUAL);
-                    }
-
-                    LEX(YP_TOKEN_LESS);
-
-                // > >> >>= >=
-                case '>':
-                    if (match(parser, '>')) {
-                        if (lex_state_operator_p(parser)) {
-                            lex_state_set(parser, YP_LEX_STATE_ARG);
-                        } else {
-                            lex_state_set(parser, YP_LEX_STATE_BEG);
-                        }
-                        LEX(match(parser, '=') ? YP_TOKEN_GREATER_GREATER_EQUAL : YP_TOKEN_GREATER_GREATER);
-                    }
-
-                    if (lex_state_operator_p(parser)) {
-                        lex_state_set(parser, YP_LEX_STATE_ARG);
-                    } else {
-                        lex_state_set(parser, YP_LEX_STATE_BEG);
-                    }
-
-                    LEX(match(parser, '=') ? YP_TOKEN_GREATER_EQUAL : YP_TOKEN_GREATER);
-
-                // double-quoted string literal
-                case '"': {
-                    bool label_allowed = (lex_state_p(parser, YP_LEX_STATE_LABEL | YP_LEX_STATE_ENDFN) && !previous_command_start) || lex_state_arg_p(parser);
-                    lex_mode_push_string(parser, true, label_allowed, '\0', '"');
-                    LEX(YP_TOKEN_STRING_BEGIN);
-                }
-
-                // xstring literal
-                case '`': {
-                    if (lex_state_p(parser, YP_LEX_STATE_FNAME)) {
-                        lex_state_set(parser, YP_LEX_STATE_ENDFN);
-                        LEX(YP_TOKEN_BACKTICK);
-                    }
-
-                    if (lex_state_p(parser, YP_LEX_STATE_DOT)) {
-                        if (previous_command_start) {
-                            lex_state_set(parser, YP_LEX_STATE_CMDARG);
-                        } else {
-                            lex_state_set(parser, YP_LEX_STATE_ARG);
-                        }
-
-                        LEX(YP_TOKEN_BACKTICK);
-                    }
-
-                    lex_mode_push_string(parser, true, false, '\0', '`');
-                    LEX(YP_TOKEN_BACKTICK);
-                }
-
-                // single-quoted string literal
-                case '\'': {
-                    bool label_allowed = (lex_state_p(parser, YP_LEX_STATE_LABEL | YP_LEX_STATE_ENDFN) && !previous_command_start) || lex_state_arg_p(parser);
-                    lex_mode_push_string(parser, false, label_allowed, '\0', '\'');
-                    LEX(YP_TOKEN_STRING_BEGIN);
-                }
-
-                // ? character literal
-                case '?':
-                    LEX(lex_question_mark(parser));
-
-                // & && &&= &=
-                case '&': {
-                    if (match(parser, '&')) {
-                        lex_state_set(parser, YP_LEX_STATE_BEG);
-
-                        if (match(parser, '=')) {
-                            LEX(YP_TOKEN_AMPERSAND_AMPERSAND_EQUAL);
-                        }
-
-                        LEX(YP_TOKEN_AMPERSAND_AMPERSAND);
-                    }
-
-                    if (match(parser, '=')) {
-                        lex_state_set(parser, YP_LEX_STATE_BEG);
-                        LEX(YP_TOKEN_AMPERSAND_EQUAL);
-                    }
-
-                    if (match(parser, '.')) {
-                        lex_state_set(parser, YP_LEX_STATE_DOT);
-                        LEX(YP_TOKEN_AMPERSAND_DOT);
-                    }
-
-                    yp_token_type_t type = YP_TOKEN_AMPERSAND;
-                    if (lex_state_spcarg_p(parser, space_seen) || lex_state_beg_p(parser)) {
-                        type = YP_TOKEN_UAMPERSAND;
-                    }
-
-                    if (lex_state_operator_p(parser)) {
-                        lex_state_set(parser, YP_LEX_STATE_ARG);
-                    } else {
-                        lex_state_set(parser, YP_LEX_STATE_BEG);
-                    }
-
-                    LEX(type);
-                }
-
-                // | || ||= |=
-                case '|':
-                    if (match(parser, '|')) {
-                        if (match(parser, '=')) {
-                            lex_state_set(parser, YP_LEX_STATE_BEG);
-                            LEX(YP_TOKEN_PIPE_PIPE_EQUAL);
-                        }
-
-                        if (lex_state_p(parser, YP_LEX_STATE_BEG)) {
-                            parser->current.end--;
-                            LEX(YP_TOKEN_PIPE);
-                        }
-
-                        lex_state_set(parser, YP_LEX_STATE_BEG);
-                        LEX(YP_TOKEN_PIPE_PIPE);
-                    }
-
-                    if (match(parser, '=')) {
-                        lex_state_set(parser, YP_LEX_STATE_BEG);
-                        LEX(YP_TOKEN_PIPE_EQUAL);
-                    }
-
-                    if (lex_state_operator_p(parser)) {
-                        lex_state_set(parser, YP_LEX_STATE_ARG);
-                    } else {
-                        lex_state_set(parser, YP_LEX_STATE_BEG | YP_LEX_STATE_LABEL);
-                    }
-
-                    LEX(YP_TOKEN_PIPE);
-
-                // + += +@
-                case '+': {
-                    if (lex_state_operator_p(parser)) {
-                        lex_state_set(parser, YP_LEX_STATE_ARG);
-
-                        if (match(parser, '@')) {
-                            LEX(YP_TOKEN_UPLUS);
-                        }
-
-                        LEX(YP_TOKEN_PLUS);
-                    }
-
-                    if (match(parser, '=')) {
-                        lex_state_set(parser, YP_LEX_STATE_BEG);
-                        LEX(YP_TOKEN_PLUS_EQUAL);
-                    }
-
-                    bool spcarg = lex_state_spcarg_p(parser, space_seen);
-                    if (spcarg) {
-                        yp_diagnostic_list_append(
-                            &parser->warning_list,
-                            parser->current.start,
-                            parser->current.end,
-                            "ambiguous first argument; put parentheses or a space even after `+` operator"
-                        );
-                    }
-
-                    if (lex_state_beg_p(parser) || spcarg) {
-                        lex_state_set(parser, YP_LEX_STATE_BEG);
-
-                        if (yp_char_is_decimal_digit(peek(parser))) {
-                            parser->current.end++;
-                            yp_token_type_t type = lex_numeric(parser);
-                            lex_state_set(parser, YP_LEX_STATE_END);
-                            LEX(type);
-                        }
-
-                        LEX(YP_TOKEN_UPLUS);
-                    }
-
-                    lex_state_set(parser, YP_LEX_STATE_BEG);
-                    LEX(YP_TOKEN_PLUS);
-                }
-
-                // - -= -@
-                case '-': {
-                    if (lex_state_operator_p(parser)) {
-                        lex_state_set(parser, YP_LEX_STATE_ARG);
-
-                        if (match(parser, '@')) {
-                            LEX(YP_TOKEN_UMINUS);
-                        }
-
-                        LEX(YP_TOKEN_MINUS);
-                    }
-
-                    if (match(parser, '=')) {
-                        lex_state_set(parser, YP_LEX_STATE_BEG);
-                        LEX(YP_TOKEN_MINUS_EQUAL);
-                    }
-
-                    if (match(parser, '>')) {
-                        lex_state_set(parser, YP_LEX_STATE_ENDFN);
-                        LEX(YP_TOKEN_MINUS_GREATER);
-                    }
-
-                    bool spcarg = lex_state_spcarg_p(parser, space_seen);
-                    if (spcarg) {
-                        yp_diagnostic_list_append(
-                            &parser->warning_list,
-                            parser->current.start,
-                            parser->current.end,
-                            "ambiguous first argument; put parentheses or a space even after `-` operator"
-                        );
-                    }
-
-                    if (lex_state_beg_p(parser) || spcarg) {
-                        lex_state_set(parser, YP_LEX_STATE_BEG);
-                        LEX(yp_char_is_decimal_digit(peek(parser)) ? YP_TOKEN_UMINUS_NUM : YP_TOKEN_UMINUS);
-                    }
-
-                    lex_state_set(parser, YP_LEX_STATE_BEG);
-                    LEX(YP_TOKEN_MINUS);
-                }
-
-                // . .. ...
-                case '.': {
-                    bool beg_p = lex_state_beg_p(parser);
-
-                    if (match(parser, '.')) {
-                        if (match(parser, '.')) {
-                            // If we're _not_ inside a range within default parameters
-                            if (
-                                !context_p(parser, YP_CONTEXT_DEFAULT_PARAMS) &&
-                                context_p(parser, YP_CONTEXT_DEF_PARAMS)
-                            ) {
-                                if (lex_state_p(parser, YP_LEX_STATE_END)) {
-                                    lex_state_set(parser, YP_LEX_STATE_BEG);
-                                } else {
-                                    lex_state_set(parser, YP_LEX_STATE_ENDARG);
-                                }
-                                LEX(YP_TOKEN_UDOT_DOT_DOT);
-                            }
-
-                            lex_state_set(parser, YP_LEX_STATE_BEG);
-                            LEX(beg_p ? YP_TOKEN_UDOT_DOT_DOT : YP_TOKEN_DOT_DOT_DOT);
-                        }
-
-                        lex_state_set(parser, YP_LEX_STATE_BEG);
-                        LEX(beg_p ? YP_TOKEN_UDOT_DOT : YP_TOKEN_DOT_DOT);
-                    }
-
-                    lex_state_set(parser, YP_LEX_STATE_DOT);
-                    LEX(YP_TOKEN_DOT);
-                }
-
-                // integer
-                case '0':
-                case '1':
-                case '2':
-                case '3':
-                case '4':
-                case '5':
-                case '6':
-                case '7':
-                case '8':
-                case '9': {
-                    yp_token_type_t type = lex_numeric(parser);
-                    lex_state_set(parser, YP_LEX_STATE_END);
-                    LEX(type);
-                }
-
-                // :: symbol
-                case ':':
-                    if (match(parser, ':')) {
-                        if (lex_state_beg_p(parser) || lex_state_p(parser, YP_LEX_STATE_CLASS) || (lex_state_p(parser, YP_LEX_STATE_ARG_ANY) && space_seen)) {
-                            lex_state_set(parser, YP_LEX_STATE_BEG);
-                            LEX(YP_TOKEN_UCOLON_COLON);
-                        }
-
-                        lex_state_set(parser, YP_LEX_STATE_DOT);
-                        LEX(YP_TOKEN_COLON_COLON);
-                    }
-
-                    if (lex_state_end_p(parser) || yp_char_is_whitespace(peek(parser)) || peek(parser) == '#') {
-                        lex_state_set(parser, YP_LEX_STATE_BEG);
-                        LEX(YP_TOKEN_COLON);
-                    }
-
-                    if (peek(parser) == '"' || peek(parser) == '\'') {
-                        lex_mode_push_string(parser, peek(parser) == '"', false, '\0', *parser->current.end);
-                        parser->current.end++;
-                    }
-
-                    lex_state_set(parser, YP_LEX_STATE_FNAME);
-                    LEX(YP_TOKEN_SYMBOL_BEGIN);
-
-                // / /=
-                case '/':
-                    if (lex_state_beg_p(parser)) {
-                        lex_mode_push_regexp(parser, '\0', '/');
-                        LEX(YP_TOKEN_REGEXP_BEGIN);
-                    }
-
-                    if (match(parser, '=')) {
-                        lex_state_set(parser, YP_LEX_STATE_BEG);
-                        LEX(YP_TOKEN_SLASH_EQUAL);
-                    }
-
-                    if (lex_state_spcarg_p(parser, space_seen)) {
-                        yp_diagnostic_list_append(&parser->warning_list, parser->current.start, parser->current.end, "ambiguity between regexp and two divisions: wrap regexp in parentheses or add a space after `/' operator");
-                        lex_mode_push_regexp(parser, '\0', '/');
-                        LEX(YP_TOKEN_REGEXP_BEGIN);
-                    }
-
-                    if (lex_state_operator_p(parser)) {
-                        lex_state_set(parser, YP_LEX_STATE_ARG);
-                    } else {
-                        lex_state_set(parser, YP_LEX_STATE_BEG);
-                    }
-
-                    LEX(YP_TOKEN_SLASH);
-
-                // ^ ^=
-                case '^':
-                    if (lex_state_operator_p(parser)) {
-                        lex_state_set(parser, YP_LEX_STATE_ARG);
-                    } else {
-                        lex_state_set(parser, YP_LEX_STATE_BEG);
-                    }
-                    LEX(match(parser, '=') ? YP_TOKEN_CARET_EQUAL : YP_TOKEN_CARET);
-
-                // ~ ~@
-                case '~':
-                    if (lex_state_operator_p(parser)) {
-                        (void) match(parser, '@');
-                        lex_state_set(parser, YP_LEX_STATE_ARG);
-                    } else {
-                        lex_state_set(parser, YP_LEX_STATE_BEG);
-                    }
-
-                    LEX(YP_TOKEN_TILDE);
-
-                // % %= %i %I %q %Q %w %W
-                case '%': {
-                    // If there is no subsequent character then we have an invalid token. We're
-                    // going to say it's the percent operator because we don't want to move into the
-                    // string lex mode unnecessarily.
-                    if ((lex_state_beg_p(parser) || lex_state_arg_p(parser)) && (parser->current.end >= parser->end)) {
-                        yp_diagnostic_list_append(&parser->error_list, parser->current.start, parser->current.end, "Unexpected end of input");
-                        LEX(YP_TOKEN_PERCENT);
-                    }
-
-                    if (!lex_state_beg_p(parser) && match(parser, '=')) {
-                        lex_state_set(parser, YP_LEX_STATE_BEG);
-                        LEX(YP_TOKEN_PERCENT_EQUAL);
-                    }
-                    else if(
-                        lex_state_beg_p(parser) ||
-                        (lex_state_p(parser, YP_LEX_STATE_FITEM) && (peek(parser) == 's')) ||
-                        lex_state_spcarg_p(parser, space_seen)
-                    ) {
-                        if (!parser->encoding.alnum_char(parser->current.end, parser->end - parser->current.end)) {
-                            lex_mode_push_string(parser, true, false, lex_mode_incrementor(*parser->current.end), lex_mode_terminator(*parser->current.end));
-
-                            size_t eol_length = match_eol(parser);
-                            if (eol_length) {
-                                parser->current.end += eol_length;
-                                yp_newline_list_append(&parser->newline_list, parser->current.end - 1);
-                            } else {
-                                parser->current.end++;
-                            }
-
-                            if (parser->current.end < parser->end) {
-                                LEX(YP_TOKEN_STRING_BEGIN);
-                            }
-                        }
-
-                        switch (peek(parser)) {
-                            case 'i': {
-                                parser->current.end++;
-
-                                if (parser->current.end < parser->end) {
-                                    lex_mode_push_list(parser, false, *parser->current.end++);
-                                }
-
-                                LEX(YP_TOKEN_PERCENT_LOWER_I);
-                            }
-                            case 'I': {
-                                parser->current.end++;
-
-                                if (parser->current.end < parser->end) {
-                                    lex_mode_push_list(parser, true, *parser->current.end++);
-                                }
-
-                                LEX(YP_TOKEN_PERCENT_UPPER_I);
-                            }
-                            case 'r': {
-                                parser->current.end++;
-
-                                if (parser->current.end < parser->end) {
-                                    lex_mode_push_regexp(parser, lex_mode_incrementor(*parser->current.end), lex_mode_terminator(*parser->current.end));
-                                    yp_newline_list_check_append(&parser->newline_list, parser->current.end);
-                                    parser->current.end++;
-                                }
-
-                                LEX(YP_TOKEN_REGEXP_BEGIN);
-                            }
-                            case 'q': {
-                                parser->current.end++;
-
-                                if (parser->current.end < parser->end) {
-                                    lex_mode_push_string(parser, false, false, lex_mode_incrementor(*parser->current.end), lex_mode_terminator(*parser->current.end));
-                                    yp_newline_list_check_append(&parser->newline_list, parser->current.end);
-                                    parser->current.end++;
-                                }
-
-                                LEX(YP_TOKEN_STRING_BEGIN);
-                            }
-                            case 'Q': {
-                                parser->current.end++;
-
-                                if (parser->current.end < parser->end) {
-                                    lex_mode_push_string(parser, true, false, lex_mode_incrementor(*parser->current.end), lex_mode_terminator(*parser->current.end));
-                                    yp_newline_list_check_append(&parser->newline_list, parser->current.end);
-                                    parser->current.end++;
-                                }
-
-                                LEX(YP_TOKEN_STRING_BEGIN);
-                            }
-                            case 's': {
-                                parser->current.end++;
-
-                                if (parser->current.end < parser->end) {
-                                    lex_mode_push_string(parser, false, false, lex_mode_incrementor(*parser->current.end), lex_mode_terminator(*parser->current.end));
-                                    lex_state_set(parser, YP_LEX_STATE_FNAME | YP_LEX_STATE_FITEM);
-                                    parser->current.end++;
-                                }
-
-                                LEX(YP_TOKEN_SYMBOL_BEGIN);
-                            }
-                            case 'w': {
-                                parser->current.end++;
-
-                                if (parser->current.end < parser->end) {
-                                    lex_mode_push_list(parser, false, *parser->current.end++);
-                                }
-
-                                LEX(YP_TOKEN_PERCENT_LOWER_W);
-                            }
-                            case 'W': {
-                                parser->current.end++;
-
-                                if (parser->current.end < parser->end) {
-                                    lex_mode_push_list(parser, true, *parser->current.end++);
-                                }
-
-                                LEX(YP_TOKEN_PERCENT_UPPER_W);
-                            }
-                            case 'x': {
-                                parser->current.end++;
-
-                                if (parser->current.end < parser->end) {
-                                    lex_mode_push_string(parser, true, false, lex_mode_incrementor(*parser->current.end), lex_mode_terminator(*parser->current.end));
-                                    parser->current.end++;
-                                }
-
-                                LEX(YP_TOKEN_PERCENT_LOWER_X);
-                            }
-                            default:
-                                // If we get to this point, then we have a % that is completely
-                                // unparseable. In this case we'll just drop it from the parser
-                                // and skip past it and hope that the next token is something
-                                // that we can parse.
-                                yp_diagnostic_list_append(&parser->error_list, parser->current.start, parser->current.end, "Invalid %% token");
-                                goto lex_next_token;
-                        }
-                    }
-
-                    lex_state_set(parser, lex_state_operator_p(parser) ? YP_LEX_STATE_ARG : YP_LEX_STATE_BEG);
-                    LEX(YP_TOKEN_PERCENT);
-                }
-
-                // global variable
-                case '$': {
-                    yp_token_type_t type = lex_global_variable(parser);
-
-                    // If we're lexing an embedded variable, then we need to pop back into
-                    // the parent lex context.
-                    if (parser->lex_modes.current->mode == YP_LEX_EMBVAR) {
-                        lex_mode_pop(parser);
-                    }
-
-                    lex_state_set(parser, YP_LEX_STATE_END);
-                    LEX(type);
-                }
-
-                // instance variable, class variable
-                case '@':
-                    lex_state_set(parser, parser->lex_state & YP_LEX_STATE_FNAME ? YP_LEX_STATE_ENDFN : YP_LEX_STATE_END);
-                    LEX(lex_at_variable(parser));
-
-                default: {
-                    if (*parser->current.start != '_') {
-                        size_t width = char_is_identifier_start(parser, parser->current.start);
-
-                        // If this isn't the beginning of an identifier, then it's an invalid
-                        // token as we've exhausted all of the other options. We'll skip past
-                        // it and return the next token.
-                        if (!width) {
-                            yp_diagnostic_list_append(&parser->error_list, parser->current.start, parser->current.end, "Invalid token.");
-                            goto lex_next_token;
-                        }
-
-                        parser->current.end = parser->current.start + width;
-                    }
-
-                    yp_token_type_t type = lex_identifier(parser, previous_command_start);
-
-                    // If we've hit a __END__ and it was at the start of the line or the
-                    // start of the file and it is followed by either a \n or a \r\n, then
-                    // this is the last token of the file.
-                    if (
-                        ((parser->current.end - parser->current.start) == 7) &&
-                        current_token_starts_line(parser) &&
-                        (memcmp(parser->current.start, "__END__", 7) == 0) &&
-                        (parser->current.end == parser->end || match_eol(parser))
-                        )
-                    {
-                        parser->current.end = parser->end;
-                        parser->current.type = YP_TOKEN___END__;
-                        parser_lex_callback(parser);
-
-                        yp_comment_t *comment = parser_comment(parser, YP_COMMENT___END__);
-                        yp_list_append(&parser->comment_list, (yp_list_node_t *) comment);
-
-                        LEX(YP_TOKEN_EOF);
-                    }
-
-                    yp_lex_state_t last_state = parser->lex_state;
-
-                    if (type == YP_TOKEN_IDENTIFIER || type == YP_TOKEN_CONSTANT) {
-                        if (lex_state_p(parser, YP_LEX_STATE_BEG_ANY | YP_LEX_STATE_ARG_ANY | YP_LEX_STATE_DOT)) {
-                            if (previous_command_start) {
-                                lex_state_set(parser, YP_LEX_STATE_CMDARG);
-                            } else {
-                                lex_state_set(parser, YP_LEX_STATE_ARG);
-                            }
-                        } else if (parser->lex_state == YP_LEX_STATE_FNAME) {
-                            lex_state_set(parser, YP_LEX_STATE_ENDFN);
-                        } else {
-                            lex_state_set(parser, YP_LEX_STATE_END);
-                        }
-                    }
-
-                    if (
-                        !(last_state & (YP_LEX_STATE_DOT | YP_LEX_STATE_FNAME)) &&
-                        (type == YP_TOKEN_IDENTIFIER) &&
-                        ((yp_parser_local_depth(parser, &parser->current) != -1) ||
-                         token_is_numbered_parameter(parser->current.start, parser->current.end))
-                    ) {
-                        lex_state_set(parser, YP_LEX_STATE_END | YP_LEX_STATE_LABEL);
-                    }
-
-                    LEX(type);
-                }
-            }
-        }
-        case YP_LEX_LIST:
-            if (parser->next_start != NULL) {
-                parser->current.end = parser->next_start;
-                parser->next_start = NULL;
-            }
-
-            // First we'll set the beginning of the token.
-            parser->current.start = parser->current.end;
-
-            // If there's any whitespace at the start of the list, then we're
-            // going to trim it off the beginning and create a new token.
-            size_t whitespace;
-
-            bool should_stop = parser->heredoc_end;
-
-            if ((whitespace = yp_strspn_whitespace_newlines(parser->current.end, parser->end - parser->current.end, &parser->newline_list, should_stop)) > 0) {
-                parser->current.end += whitespace;
-                if (peek_offset(parser, -1) == '\n') {
-                    // mutates next_start
-                    parser_flush_heredoc_end(parser);
-                }
-                LEX(YP_TOKEN_WORDS_SEP);
-            }
-
-            // We'll check if we're at the end of the file. If we are, then we
-            // need to return the EOF token.
-            if (parser->current.end >= parser->end) {
-                LEX(YP_TOKEN_EOF);
-            }
-
-            // Here we'll get a list of the places where strpbrk should break,
-            // and then find the first one.
-            yp_lex_mode_t *lex_mode = parser->lex_modes.current;
-            const uint8_t *breakpoints = lex_mode->as.list.breakpoints;
-            const uint8_t *breakpoint = yp_strpbrk(parser, parser->current.end, breakpoints, parser->end - parser->current.end);
-
-            while (breakpoint != NULL) {
-                // If we hit a null byte, skip directly past it.
-                if (*breakpoint == '\0') {
-                    breakpoint = yp_strpbrk(parser, breakpoint + 1, breakpoints, parser->end - (breakpoint + 1));
-                    continue;
-                }
-
-                // If we hit whitespace, then we must have received content by
-                // now, so we can return an element of the list.
-                if (yp_char_is_whitespace(*breakpoint)) {
-                    parser->current.end = breakpoint;
-                    LEX(YP_TOKEN_STRING_CONTENT);
-                }
-
-                //If we hit the terminator, we need to check which token to
-                // return.
-                if (*breakpoint == lex_mode->as.list.terminator) {
-                    // If this terminator doesn't actually close the list, then
-                    // we need to continue on past it.
-                    if (lex_mode->as.list.nesting > 0) {
-                        breakpoint = yp_strpbrk(parser, breakpoint + 1, breakpoints, parser->end - (breakpoint + 1));
-                        lex_mode->as.list.nesting--;
-                        continue;
-                    }
-
-                    // If we've hit the terminator and we've already skipped
-                    // past content, then we can return a list node.
-                    if (breakpoint > parser->current.start) {
-                        parser->current.end = breakpoint;
-                        LEX(YP_TOKEN_STRING_CONTENT);
-                    }
-
-                    // Otherwise, switch back to the default state and return
-                    // the end of the list.
-                    parser->current.end = breakpoint + 1;
-                    lex_mode_pop(parser);
-                    lex_state_set(parser, YP_LEX_STATE_END);
-                    LEX(YP_TOKEN_STRING_END);
-                }
-
-                // If we hit escapes, then we need to treat the next token
-                // literally. In this case we'll skip past the next character
-                // and find the next breakpoint.
-                if (*breakpoint == '\\') {
-                    yp_unescape_type_t unescape_type = lex_mode->as.list.interpolation ? YP_UNESCAPE_ALL : YP_UNESCAPE_MINIMAL;
-                    size_t difference = yp_unescape_calculate_difference(parser, breakpoint, unescape_type, false);
-                    if (difference == 0) {
-                        // we're at the end of the file
-                        breakpoint = NULL;
-                        continue;
-                    }
-
-                    // If the result is an escaped newline ...
-                    if (breakpoint[difference - 1] == '\n') {
-                        if (parser->heredoc_end) {
-                            // ... if we are on the same line as a heredoc, flush the heredoc and
-                            // continue parsing after heredoc_end.
-                            parser->current.end = breakpoint + difference;
-                            parser_flush_heredoc_end(parser);
-                            LEX(YP_TOKEN_STRING_CONTENT);
-                        } else {
-                            // ... else track the newline.
-                            yp_newline_list_append(&parser->newline_list, breakpoint + difference - 1);
-                        }
-                    }
-
-                    breakpoint = yp_strpbrk(parser, breakpoint + difference, breakpoints, parser->end - (breakpoint + difference));
-                    continue;
-                }
-
-                // If we hit a #, then we will attempt to lex interpolation.
-                if (*breakpoint == '#') {
-                    yp_token_type_t type = lex_interpolation(parser, breakpoint);
-                    if (type != YP_TOKEN_NOT_PROVIDED) {
-                        LEX(type);
-                    }
-
-                    // If we haven't returned at this point then we had something
-                    // that looked like an interpolated class or instance variable
-                    // like "#@" but wasn't actually. In this case we'll just skip
-                    // to the next breakpoint.
-                    breakpoint = yp_strpbrk(parser, parser->current.end, breakpoints, parser->end - parser->current.end);
-                    continue;
-                }
-
-                // If we've hit the incrementor, then we need to skip past it
-                // and find the next breakpoint.
-                assert(*breakpoint == lex_mode->as.list.incrementor);
-                breakpoint = yp_strpbrk(parser, breakpoint + 1, breakpoints, parser->end - (breakpoint + 1));
-                lex_mode->as.list.nesting++;
-                continue;
-            }
-
-            // If we were unable to find a breakpoint, then this token hits the end of
-            // the file.
-            LEX(YP_TOKEN_EOF);
-
-        case YP_LEX_REGEXP: {
-            // First, we'll set to start of this token to be the current end.
-            if (parser->next_start == NULL) {
-                parser->current.start = parser->current.end;
-            } else {
-                parser->current.start = parser->next_start;
-                parser->current.end = parser->next_start;
-                parser->next_start = NULL;
-            }
-
-            // We'll check if we're at the end of the file. If we are, then we need to
-            // return the EOF token.
-            if (parser->current.end >= parser->end) {
-                LEX(YP_TOKEN_EOF);
-            }
-
-            // Get a reference to the current mode.
-            yp_lex_mode_t *lex_mode = parser->lex_modes.current;
-
-            // These are the places where we need to split up the content of the
-            // regular expression. We'll use strpbrk to find the first of these
-            // characters.
-            const uint8_t *breakpoints = lex_mode->as.regexp.breakpoints;
-            const uint8_t *breakpoint = yp_strpbrk(parser, parser->current.end, breakpoints, parser->end - parser->current.end);
-
-            while (breakpoint != NULL) {
-                // If we hit a null byte, skip directly past it.
-                if (*breakpoint == '\0') {
-                    breakpoint = yp_strpbrk(parser, breakpoint + 1, breakpoints, parser->end - (breakpoint + 1));
-                    continue;
-                }
-
-                // If we've hit a newline, then we need to track that in the
-                // list of newlines.
-                if (*breakpoint == '\n') {
-                    // For the special case of a newline-terminated regular expression, we will pass
-                    // through this branch twice -- once with YP_TOKEN_REGEXP_BEGIN and then again
-                    // with YP_TOKEN_STRING_CONTENT. Let's avoid tracking the newline twice, by
-                    // tracking it only in the REGEXP_BEGIN case.
-                    if (
-                        !(lex_mode->as.regexp.terminator == '\n' && parser->current.type != YP_TOKEN_REGEXP_BEGIN)
-                        && parser->heredoc_end == NULL
-                    ) {
-                        yp_newline_list_append(&parser->newline_list, breakpoint);
-                    }
-
-                    if (lex_mode->as.regexp.terminator != '\n') {
-                        // If the terminator is not a newline, then we can set
-                        // the next breakpoint and continue.
-                        breakpoint = yp_strpbrk(parser, breakpoint + 1, breakpoints, parser->end - (breakpoint + 1));
-                        continue;
-                    }
-                }
-
-                // If we hit the terminator, we need to determine what kind of
-                // token to return.
-                if (*breakpoint == lex_mode->as.regexp.terminator) {
-                    if (lex_mode->as.regexp.nesting > 0) {
-                        breakpoint = yp_strpbrk(parser, breakpoint + 1, breakpoints, parser->end - (breakpoint + 1));
-                        lex_mode->as.regexp.nesting--;
-                        continue;
-                    }
-
-                    // Here we've hit the terminator. If we have already consumed
-                    // content then we need to return that content as string content
-                    // first.
-                    if (breakpoint > parser->current.start) {
-                        parser->current.end = breakpoint;
-                        LEX(YP_TOKEN_STRING_CONTENT);
-                    }
-
-                    // Since we've hit the terminator of the regular expression, we now
-                    // need to parse the options.
-                    parser->current.end = breakpoint + 1;
-                    parser->current.end += yp_strspn_regexp_option(parser->current.end, parser->end - parser->current.end);
-
-                    lex_mode_pop(parser);
-                    lex_state_set(parser, YP_LEX_STATE_END);
-                    LEX(YP_TOKEN_REGEXP_END);
-                }
-
-                // If we hit escapes, then we need to treat the next token
-                // literally. In this case we'll skip past the next character
-                // and find the next breakpoint.
-                if (*breakpoint == '\\') {
-                    size_t difference = yp_unescape_calculate_difference(parser, breakpoint, YP_UNESCAPE_ALL, false);
-                    if (difference == 0) {
-                        // we're at the end of the file
-                        breakpoint = NULL;
-                        continue;
-                    }
-
-                    // If the result is an escaped newline ...
-                    if (breakpoint[difference - 1] == '\n') {
-                        if (parser->heredoc_end) {
-                            // ... if we are on the same line as a heredoc, flush the heredoc and
-                            // continue parsing after heredoc_end.
-                            parser->current.end = breakpoint + difference;
-                            parser_flush_heredoc_end(parser);
-                            LEX(YP_TOKEN_STRING_CONTENT);
-                        } else {
-                            // ... else track the newline.
-                            yp_newline_list_append(&parser->newline_list, breakpoint + difference - 1);
-                        }
-                    }
-
-                    breakpoint = yp_strpbrk(parser, breakpoint + difference, breakpoints, parser->end - (breakpoint + difference));
-                    continue;
-                }
-
-                // If we hit a #, then we will attempt to lex interpolation.
-                if (*breakpoint == '#') {
-                    yp_token_type_t type = lex_interpolation(parser, breakpoint);
-                    if (type != YP_TOKEN_NOT_PROVIDED) {
-                        LEX(type);
-                    }
-
-                    // If we haven't returned at this point then we had
-                    // something that looked like an interpolated class or
-                    // instance variable like "#@" but wasn't actually. In this
-                    // case we'll just skip to the next breakpoint.
-                    breakpoint = yp_strpbrk(parser, parser->current.end, breakpoints, parser->end - parser->current.end);
-                    continue;
-                }
-
-                // If we've hit the incrementor, then we need to skip past it
-                // and find the next breakpoint.
-                assert(*breakpoint == lex_mode->as.regexp.incrementor);
-                breakpoint = yp_strpbrk(parser, breakpoint + 1, breakpoints, parser->end - (breakpoint + 1));
-                lex_mode->as.regexp.nesting++;
-                continue;
-            }
-
-            // At this point, the breakpoint is NULL which means we were unable to
-            // find anything before the end of the file.
-            LEX(YP_TOKEN_EOF);
-        }
-        case YP_LEX_STRING: {
-            // First, we'll set to start of this token to be the current end.
-            if (parser->next_start == NULL) {
-                parser->current.start = parser->current.end;
-            } else {
-                parser->current.start = parser->next_start;
-                parser->current.end = parser->next_start;
-                parser->next_start = NULL;
-            }
-
-            // We'll check if we're at the end of the file. If we are, then we need to
-            // return the EOF token.
-            if (parser->current.end >= parser->end) {
-                LEX(YP_TOKEN_EOF);
-            }
-
-            // These are the places where we need to split up the content of the
-            // string. We'll use strpbrk to find the first of these characters.
-            const uint8_t *breakpoints = parser->lex_modes.current->as.string.breakpoints;
-            const uint8_t *breakpoint = yp_strpbrk(parser, parser->current.end, breakpoints, parser->end - parser->current.end);
-
-            while (breakpoint != NULL) {
-                // If we hit the incrementor, then we'll increment then nesting and
-                // continue lexing.
-                if (
-                    parser->lex_modes.current->as.string.incrementor != '\0' &&
-                    *breakpoint == parser->lex_modes.current->as.string.incrementor
-                ) {
-                    parser->lex_modes.current->as.string.nesting++;
-                    breakpoint = yp_strpbrk(parser, breakpoint + 1, breakpoints, parser->end - (breakpoint + 1));
-                    continue;
-                }
-
-                // Note that we have to check the terminator here first because we could
-                // potentially be parsing a % string that has a # character as the
-                // terminator.
-                if (*breakpoint == parser->lex_modes.current->as.string.terminator) {
-                    // If this terminator doesn't actually close the string, then we need
-                    // to continue on past it.
-                    if (parser->lex_modes.current->as.string.nesting > 0) {
-                        breakpoint = yp_strpbrk(parser, breakpoint + 1, breakpoints, parser->end - (breakpoint + 1));
-                        parser->lex_modes.current->as.string.nesting--;
-                        continue;
-                    }
-
-                    // Here we've hit the terminator. If we have already consumed content
-                    // then we need to return that content as string content first.
-                    if (breakpoint > parser->current.start) {
-                        parser->current.end = breakpoint;
-                        LEX(YP_TOKEN_STRING_CONTENT);
-                    }
-
-                    // Otherwise we need to switch back to the parent lex mode and
-                    // return the end of the string.
-                    size_t eol_length = match_eol_at(parser, breakpoint);
-                    if (eol_length) {
-                        parser->current.end = breakpoint + eol_length;
-                        yp_newline_list_append(&parser->newline_list, parser->current.end - 1);
-                    } else {
-                        parser->current.end = breakpoint + 1;
-                    }
-
-                    if (
-                        parser->lex_modes.current->as.string.label_allowed &&
-                        (peek(parser) == ':') &&
-                        (peek_offset(parser, 1) != ':')
-                    ) {
-                        parser->current.end++;
-                        lex_state_set(parser, YP_LEX_STATE_ARG | YP_LEX_STATE_LABELED);
-                        lex_mode_pop(parser);
-                        LEX(YP_TOKEN_LABEL_END);
-                    }
-
-                    lex_state_set(parser, YP_LEX_STATE_END);
-                    lex_mode_pop(parser);
-                    LEX(YP_TOKEN_STRING_END);
-                }
-
-                // When we hit a newline, we need to flush any potential heredocs. Note
-                // that this has to happen after we check for the terminator in case the
-                // terminator is a newline character.
-                if (*breakpoint == '\n') {
-                    if (parser->heredoc_end == NULL) {
-                        yp_newline_list_append(&parser->newline_list, breakpoint);
-                        breakpoint = yp_strpbrk(parser, breakpoint + 1, breakpoints, parser->end - (breakpoint + 1));
-                        continue;
-                    } else {
-                        parser->current.end = breakpoint + 1;
-                        parser_flush_heredoc_end(parser);
-                        LEX(YP_TOKEN_STRING_CONTENT);
-                    }
-                }
-
-                switch (*breakpoint) {
-                    case '\0':
-                        // Skip directly past the null character.
-                        breakpoint = yp_strpbrk(parser, breakpoint + 1, breakpoints, parser->end - (breakpoint + 1));
-                        break;
-                    case '\\': {
-                        // If we hit escapes, then we need to treat the next token
-                        // literally. In this case we'll skip past the next character and
-                        // find the next breakpoint.
-                        yp_unescape_type_t unescape_type = parser->lex_modes.current->as.string.interpolation ? YP_UNESCAPE_ALL : YP_UNESCAPE_MINIMAL;
-                        size_t difference = yp_unescape_calculate_difference(parser, breakpoint, unescape_type, false);
-                        if (difference == 0) {
-                            // we're at the end of the file
-                            breakpoint = NULL;
-                            break;
-                        }
-
-                        // If the result is an escaped newline ...
-                        if (breakpoint[difference - 1] == '\n') {
-                            if (parser->heredoc_end) {
-                                // ... if we are on the same line as a heredoc, flush the heredoc and
-                                // continue parsing after heredoc_end.
-                                parser->current.end = breakpoint + difference;
-                                parser_flush_heredoc_end(parser);
-                                LEX(YP_TOKEN_STRING_CONTENT);
-                            } else {
-                                // ... else track the newline.
-                                yp_newline_list_append(&parser->newline_list, breakpoint + difference - 1);
-                            }
-                        }
-
-                        breakpoint = yp_strpbrk(parser, breakpoint + difference, breakpoints, parser->end - (breakpoint + difference));
-                        break;
-                    }
-                    case '#': {
-                        yp_token_type_t type = lex_interpolation(parser, breakpoint);
-                        if (type != YP_TOKEN_NOT_PROVIDED) {
-                            LEX(type);
-                        }
-
-                        // If we haven't returned at this point then we had something that
-                        // looked like an interpolated class or instance variable like "#@"
-                        // but wasn't actually. In this case we'll just skip to the next
-                        // breakpoint.
-                        breakpoint = yp_strpbrk(parser, parser->current.end, breakpoints, parser->end - parser->current.end);
-                        break;
-                    }
-                    default:
-                        assert(false && "unreachable");
-                }
-            }
-
-            // If we've hit the end of the string, then this is an unterminated
-            // string. In that case we'll return the EOF token.
-            parser->current.end = parser->end;
-            LEX(YP_TOKEN_EOF);
-        }
-        case YP_LEX_HEREDOC: {
-            // First, we'll set to start of this token.
-            if (parser->next_start == NULL) {
-                parser->current.start = parser->current.end;
-            } else {
-                parser->current.start = parser->next_start;
-                parser->current.end = parser->next_start;
-                parser->heredoc_end = NULL;
-                parser->next_start = NULL;
-            }
-
-            // We'll check if we're at the end of the file. If we are, then we need to
-            // return the EOF token.
-            if (parser->current.end >= parser->end) {
-                LEX(YP_TOKEN_EOF);
-            }
-
-            // Now let's grab the information about the identifier off of the current
-            // lex mode.
-            const uint8_t *ident_start = parser->lex_modes.current->as.heredoc.ident_start;
-            size_t ident_length = parser->lex_modes.current->as.heredoc.ident_length;
-
-            // If we are immediately following a newline and we have hit the
-            // terminator, then we need to return the ending of the heredoc.
-            if (current_token_starts_line(parser)) {
-                const uint8_t *start = parser->current.start;
-                if (parser->lex_modes.current->as.heredoc.indent != YP_HEREDOC_INDENT_NONE) {
-                    start += yp_strspn_inline_whitespace(start, parser->end - start);
-                }
-
-                if ((start + ident_length <= parser->end) && (memcmp(start, ident_start, ident_length) == 0)) {
-                    bool matched = true;
-                    bool at_end = false;
-
-                    size_t eol_length = match_eol_at(parser, start + ident_length);
-                    if (eol_length) {
-                        parser->current.end = start + ident_length + eol_length;
-                        yp_newline_list_append(&parser->newline_list, parser->current.end - 1);
-                    } else if (parser->end == (start + ident_length)) {
-                        parser->current.end = start + ident_length;
-                        at_end = true;
-                    } else {
-                        matched = false;
-                    }
-
-                    if (matched) {
-                        if (*parser->lex_modes.current->as.heredoc.next_start == '\\') {
-                            parser->next_start = NULL;
-                        } else {
-                            parser->next_start = parser->lex_modes.current->as.heredoc.next_start;
-                            parser->heredoc_end = parser->current.end;
-                        }
-
-                        lex_mode_pop(parser);
-                        if (!at_end) {
-                            lex_state_set(parser, YP_LEX_STATE_END);
-                        }
-                        LEX(YP_TOKEN_HEREDOC_END);
-                    }
-                }
-            }
-
-            // Otherwise we'll be parsing string content. These are the places where
-            // we need to split up the content of the heredoc. We'll use strpbrk to
-            // find the first of these characters.
-            uint8_t breakpoints[] = "\n\\#";
-
-            yp_heredoc_quote_t quote = parser->lex_modes.current->as.heredoc.quote;
-            if (quote == YP_HEREDOC_QUOTE_SINGLE) {
-                breakpoints[2] = '\0';
-            }
-
-            const uint8_t *breakpoint = yp_strpbrk(parser, parser->current.end, breakpoints, parser->end - parser->current.end);
-
-            while (breakpoint != NULL) {
-                switch (*breakpoint) {
-                    case '\0':
-                        // Skip directly past the null character.
-                        breakpoint = yp_strpbrk(parser, breakpoint + 1, breakpoints, parser->end - (breakpoint + 1));
-                        break;
-                    case '\n': {
-                        if (parser->heredoc_end != NULL && (parser->heredoc_end > breakpoint)) {
-                            parser_flush_heredoc_end(parser);
-                            parser->current.end = breakpoint + 1;
-                            LEX(YP_TOKEN_STRING_CONTENT);
-                        }
-
-                        yp_newline_list_append(&parser->newline_list, breakpoint);
-
-                        const uint8_t *start = breakpoint + 1;
-                        if (parser->lex_modes.current->as.heredoc.indent != YP_HEREDOC_INDENT_NONE) {
-                            start += yp_strspn_inline_whitespace(start, parser->end - start);
-                        }
-
-                        // If we have hit a newline that is followed by a valid terminator,
-                        // then we need to return the content of the heredoc here as string
-                        // content. Then, the next time a token is lexed, it will match
-                        // again and return the end of the heredoc.
-                        if (
-                            (start + ident_length <= parser->end) &&
-                            (memcmp(start, ident_start, ident_length) == 0)
-                        ) {
-                            // Heredoc terminators must be followed by a newline, CRLF, or EOF to be valid.
-                            if (
-                                start + ident_length == parser->end ||
-                                match_eol_at(parser, start + ident_length)
-                            ) {
-                                parser->current.end = breakpoint + 1;
-                                LEX(YP_TOKEN_STRING_CONTENT);
-                            }
-                        }
-
-                        // Otherwise we hit a newline and it wasn't followed by a
-                        // terminator, so we can continue parsing.
-                        breakpoint = yp_strpbrk(parser, breakpoint + 1, breakpoints, parser->end - (breakpoint + 1));
-                        break;
-                    }
-                    case '\\': {
-                        // If we hit an escape, then we need to skip past
-                        // however many characters the escape takes up. However
-                        // it's important that if \n or \r\n are escaped that we
-                        // stop looping before the newline and not after the
-                        // newline so that we can still potentially find the
-                        // terminator of the heredoc.
-                        size_t eol_length = match_eol_at(parser, breakpoint + 1);
-                        if (eol_length) {
-                            breakpoint += eol_length;
-                        } else {
-                            yp_unescape_type_t unescape_type = (quote == YP_HEREDOC_QUOTE_SINGLE) ? YP_UNESCAPE_MINIMAL : YP_UNESCAPE_ALL;
-                            size_t difference = yp_unescape_calculate_difference(parser, breakpoint, unescape_type, false);
-                            if (difference == 0) {
-                                // we're at the end of the file
-                                breakpoint = NULL;
-                                break;
-                            }
-
-                            yp_newline_list_check_append(&parser->newline_list, breakpoint + difference - 1);
-
-                            breakpoint = yp_strpbrk(parser, breakpoint + difference, breakpoints, parser->end - (breakpoint + difference));
-                        }
-
-                        break;
-                    }
-                    case '#': {
-                        yp_token_type_t type = lex_interpolation(parser, breakpoint);
-                        if (type != YP_TOKEN_NOT_PROVIDED) {
-                            LEX(type);
-                        }
-
-                        // If we haven't returned at this point then we had something
-                        // that looked like an interpolated class or instance variable
-                        // like "#@" but wasn't actually. In this case we'll just skip
-                        // to the next breakpoint.
-                        breakpoint = yp_strpbrk(parser, parser->current.end, breakpoints, parser->end - parser->current.end);
-                        break;
-                    }
-                    default:
-                        assert(false && "unreachable");
-                }
-            }
-
-            // If we've hit the end of the string, then this is an unterminated
-            // heredoc. In that case we'll return the EOF token.
-            parser->current.end = parser->end;
-            LEX(YP_TOKEN_EOF);
-        }
-    }
-
-    assert(false && "unreachable");
-}
-
-#undef LEX
-
-/******************************************************************************/
-/* Parse functions                                                            */
-/******************************************************************************/
-
-// When we are parsing certain content, we need to unescape the content to
-// provide to the consumers of the parser. The following functions accept a range
-// of characters from the source and unescapes into the provided type.
-//
-// We have functions for unescaping regular expression nodes, string nodes,
-// symbol nodes, and xstring nodes
-static yp_regular_expression_node_t *
-yp_regular_expression_node_create_and_unescape(yp_parser_t *parser, const yp_token_t *opening, const yp_token_t *content, const yp_token_t *closing, yp_unescape_type_t unescape_type) {
-    yp_regular_expression_node_t *node = yp_regular_expression_node_create(parser, opening, content, closing);
-
-    assert((content->end - content->start) >= 0);
-    yp_string_shared_init(&node->unescaped, content->start, content->end);
-
-    yp_unescape_manipulate_string(parser, &node->unescaped, unescape_type);
-    return node;
-}
-
-static yp_symbol_node_t *
-yp_symbol_node_create_and_unescape(yp_parser_t *parser, const yp_token_t *opening, const yp_token_t *content, const yp_token_t *closing, yp_unescape_type_t unescape_type) {
-    yp_symbol_node_t *node = yp_symbol_node_create(parser, opening, content, closing);
-
-    assert((content->end - content->start) >= 0);
-    yp_string_shared_init(&node->unescaped, content->start, content->end);
-
-    yp_unescape_manipulate_string(parser, &node->unescaped, unescape_type);
-    return node;
-}
-
-static yp_string_node_t *
-yp_char_literal_node_create_and_unescape(yp_parser_t *parser, const yp_token_t *opening, const yp_token_t *content, const yp_token_t *closing, yp_unescape_type_t unescape_type) {
-    yp_string_node_t *node = yp_string_node_create(parser, opening, content, closing);
-
-    assert((content->end - content->start) >= 0);
-    yp_string_shared_init(&node->unescaped, content->start, content->end);
-
-    yp_unescape_manipulate_char_literal(parser, &node->unescaped, unescape_type);
-    return node;
-}
-
-static yp_string_node_t *
-yp_string_node_create_and_unescape(yp_parser_t *parser, const yp_token_t *opening, const yp_token_t *content, const yp_token_t *closing, yp_unescape_type_t unescape_type) {
-    yp_string_node_t *node = yp_string_node_create(parser, opening, content, closing);
-
-    assert((content->end - content->start) >= 0);
-    yp_string_shared_init(&node->unescaped, content->start, content->end);
-
-    yp_unescape_manipulate_string(parser, &node->unescaped, unescape_type);
-    return node;
-}
-
-static yp_x_string_node_t *
-yp_xstring_node_create_and_unescape(yp_parser_t *parser, const yp_token_t *opening, const yp_token_t *content, const yp_token_t *closing) {
-    yp_x_string_node_t *node = yp_xstring_node_create(parser, opening, content, closing);
-
-    assert((content->end - content->start) >= 0);
-    yp_string_shared_init(&node->unescaped, content->start, content->end);
-
-    yp_unescape_manipulate_string(parser, &node->unescaped, YP_UNESCAPE_ALL);
-    return node;
-}
-
-// Returns true if the current token is of the specified type.
-static inline bool
-match_type_p(yp_parser_t *parser, yp_token_type_t type) {
-    return parser->current.type == type;
-}
-
-// Returns true if the current token is of any of the specified types.
-static bool
-match_any_type_p(yp_parser_t *parser, size_t count, ...) {
-    va_list types;
-    va_start(types, count);
-
-    for (size_t index = 0; index < count; index++) {
-        if (match_type_p(parser, va_arg(types, yp_token_type_t))) {
-            va_end(types);
-            return true;
-        }
-    }
-
-    va_end(types);
-    return false;
-}
-
-// These are the various precedence rules. Because we are using a Pratt parser,
-// they are named binding power to represent the manner in which nodes are bound
-// together in the stack.
-//
-// We increment by 2 because we want to leave room for the infix operators to
-// specify their associativity by adding or subtracting one.
-typedef enum {
-    YP_BINDING_POWER_UNSET =            0, // used to indicate this token cannot be used as an infix operator
-    YP_BINDING_POWER_STATEMENT =        2,
-    YP_BINDING_POWER_MODIFIER =         4, // if unless until while in
-    YP_BINDING_POWER_MODIFIER_RESCUE =  6, // rescue
-    YP_BINDING_POWER_COMPOSITION =      8, // and or
-    YP_BINDING_POWER_NOT =             10, // not
-    YP_BINDING_POWER_MATCH =           12, // =>
-    YP_BINDING_POWER_DEFINED =         14, // defined?
-    YP_BINDING_POWER_ASSIGNMENT =      16, // = += -= *= /= %= &= |= ^= &&= ||= <<= >>= **=
-    YP_BINDING_POWER_TERNARY =         18, // ?:
-    YP_BINDING_POWER_RANGE =           20, // .. ...
-    YP_BINDING_POWER_LOGICAL_OR =      22, // ||
-    YP_BINDING_POWER_LOGICAL_AND =     24, // &&
-    YP_BINDING_POWER_EQUALITY =        26, // <=> == === != =~ !~
-    YP_BINDING_POWER_COMPARISON =      28, // > >= < <=
-    YP_BINDING_POWER_BITWISE_OR =      30, // | ^
-    YP_BINDING_POWER_BITWISE_AND =     32, // &
-    YP_BINDING_POWER_SHIFT =           34, // << >>
-    YP_BINDING_POWER_TERM =            36, // + -
-    YP_BINDING_POWER_FACTOR =          38, // * / %
-    YP_BINDING_POWER_UMINUS =          40, // -@
-    YP_BINDING_POWER_EXPONENT =        42, // **
-    YP_BINDING_POWER_UNARY =           44, // ! ~ +@
-    YP_BINDING_POWER_INDEX =           46, // [] []=
-    YP_BINDING_POWER_CALL =            48, // :: .
-    YP_BINDING_POWER_MAX =             50
-} yp_binding_power_t;
-
-// This struct represents a set of binding powers used for a given token. They
-// are combined in this way to make it easier to represent associativity.
-typedef struct {
-    yp_binding_power_t left;
-    yp_binding_power_t right;
-    bool binary;
-} yp_binding_powers_t;
-
-#define BINDING_POWER_ASSIGNMENT { YP_BINDING_POWER_UNARY, YP_BINDING_POWER_ASSIGNMENT, true }
-#define LEFT_ASSOCIATIVE(precedence) { precedence, precedence + 1, true }
-#define RIGHT_ASSOCIATIVE(precedence) { precedence, precedence, true }
-#define RIGHT_ASSOCIATIVE_UNARY(precedence) { precedence, precedence, false }
-
-yp_binding_powers_t yp_binding_powers[YP_TOKEN_MAXIMUM] = {
-    // if unless until while in rescue
-    [YP_TOKEN_KEYWORD_IF_MODIFIER] = LEFT_ASSOCIATIVE(YP_BINDING_POWER_MODIFIER),
-    [YP_TOKEN_KEYWORD_UNLESS_MODIFIER] = LEFT_ASSOCIATIVE(YP_BINDING_POWER_MODIFIER),
-    [YP_TOKEN_KEYWORD_UNTIL_MODIFIER] = LEFT_ASSOCIATIVE(YP_BINDING_POWER_MODIFIER),
-    [YP_TOKEN_KEYWORD_WHILE_MODIFIER] = LEFT_ASSOCIATIVE(YP_BINDING_POWER_MODIFIER),
-    [YP_TOKEN_KEYWORD_IN] = LEFT_ASSOCIATIVE(YP_BINDING_POWER_MODIFIER),
-
-    // rescue modifier
-    [YP_TOKEN_KEYWORD_RESCUE_MODIFIER] = {
-        YP_BINDING_POWER_ASSIGNMENT,
-        YP_BINDING_POWER_MODIFIER_RESCUE + 1,
-        true
-    },
-
-    // and or
-    [YP_TOKEN_KEYWORD_AND] = LEFT_ASSOCIATIVE(YP_BINDING_POWER_COMPOSITION),
-    [YP_TOKEN_KEYWORD_OR] = LEFT_ASSOCIATIVE(YP_BINDING_POWER_COMPOSITION),
-
-    // =>
-    [YP_TOKEN_EQUAL_GREATER] = LEFT_ASSOCIATIVE(YP_BINDING_POWER_MATCH),
-
-    // &&= &= ^= = >>= <<= -= %= |= += /= *= **=
-    [YP_TOKEN_AMPERSAND_AMPERSAND_EQUAL] = BINDING_POWER_ASSIGNMENT,
-    [YP_TOKEN_AMPERSAND_EQUAL] = BINDING_POWER_ASSIGNMENT,
-    [YP_TOKEN_CARET_EQUAL] = BINDING_POWER_ASSIGNMENT,
-    [YP_TOKEN_EQUAL] = BINDING_POWER_ASSIGNMENT,
-    [YP_TOKEN_GREATER_GREATER_EQUAL] = BINDING_POWER_ASSIGNMENT,
-    [YP_TOKEN_LESS_LESS_EQUAL] = BINDING_POWER_ASSIGNMENT,
-    [YP_TOKEN_MINUS_EQUAL] = BINDING_POWER_ASSIGNMENT,
-    [YP_TOKEN_PERCENT_EQUAL] = BINDING_POWER_ASSIGNMENT,
-    [YP_TOKEN_PIPE_EQUAL] = BINDING_POWER_ASSIGNMENT,
-    [YP_TOKEN_PIPE_PIPE_EQUAL] = BINDING_POWER_ASSIGNMENT,
-    [YP_TOKEN_PLUS_EQUAL] = BINDING_POWER_ASSIGNMENT,
-    [YP_TOKEN_SLASH_EQUAL] = BINDING_POWER_ASSIGNMENT,
-    [YP_TOKEN_STAR_EQUAL] = BINDING_POWER_ASSIGNMENT,
-    [YP_TOKEN_STAR_STAR_EQUAL] = BINDING_POWER_ASSIGNMENT,
-
-    // ?:
-    [YP_TOKEN_QUESTION_MARK] = RIGHT_ASSOCIATIVE(YP_BINDING_POWER_TERNARY),
-
-    // .. ...
-    [YP_TOKEN_DOT_DOT] = LEFT_ASSOCIATIVE(YP_BINDING_POWER_RANGE),
-    [YP_TOKEN_DOT_DOT_DOT] = LEFT_ASSOCIATIVE(YP_BINDING_POWER_RANGE),
-
-    // ||
-    [YP_TOKEN_PIPE_PIPE] = LEFT_ASSOCIATIVE(YP_BINDING_POWER_LOGICAL_OR),
-
-    // &&
-    [YP_TOKEN_AMPERSAND_AMPERSAND] = LEFT_ASSOCIATIVE(YP_BINDING_POWER_LOGICAL_AND),
-
-    // != !~ == === =~ <=>
-    [YP_TOKEN_BANG_EQUAL] = RIGHT_ASSOCIATIVE(YP_BINDING_POWER_EQUALITY),
-    [YP_TOKEN_BANG_TILDE] = RIGHT_ASSOCIATIVE(YP_BINDING_POWER_EQUALITY),
-    [YP_TOKEN_EQUAL_EQUAL] = RIGHT_ASSOCIATIVE(YP_BINDING_POWER_EQUALITY),
-    [YP_TOKEN_EQUAL_EQUAL_EQUAL] = RIGHT_ASSOCIATIVE(YP_BINDING_POWER_EQUALITY),
-    [YP_TOKEN_EQUAL_TILDE] = RIGHT_ASSOCIATIVE(YP_BINDING_POWER_EQUALITY),
-    [YP_TOKEN_LESS_EQUAL_GREATER] = RIGHT_ASSOCIATIVE(YP_BINDING_POWER_EQUALITY),
-
-    // > >= < <=
-    [YP_TOKEN_GREATER] = RIGHT_ASSOCIATIVE(YP_BINDING_POWER_COMPARISON),
-    [YP_TOKEN_GREATER_EQUAL] = RIGHT_ASSOCIATIVE(YP_BINDING_POWER_COMPARISON),
-    [YP_TOKEN_LESS] = RIGHT_ASSOCIATIVE(YP_BINDING_POWER_COMPARISON),
-    [YP_TOKEN_LESS_EQUAL] = RIGHT_ASSOCIATIVE(YP_BINDING_POWER_COMPARISON),
-
-    // ^ |
-    [YP_TOKEN_CARET] = RIGHT_ASSOCIATIVE(YP_BINDING_POWER_BITWISE_OR),
-    [YP_TOKEN_PIPE] = RIGHT_ASSOCIATIVE(YP_BINDING_POWER_BITWISE_OR),
-
-    // &
-    [YP_TOKEN_AMPERSAND] = RIGHT_ASSOCIATIVE(YP_BINDING_POWER_BITWISE_AND),
-
-    // >> <<
-    [YP_TOKEN_GREATER_GREATER] = RIGHT_ASSOCIATIVE(YP_BINDING_POWER_SHIFT),
-    [YP_TOKEN_LESS_LESS] = RIGHT_ASSOCIATIVE(YP_BINDING_POWER_SHIFT),
-
-    // - +
-    [YP_TOKEN_MINUS] = LEFT_ASSOCIATIVE(YP_BINDING_POWER_TERM),
-    [YP_TOKEN_PLUS] = LEFT_ASSOCIATIVE(YP_BINDING_POWER_TERM),
-
-    // % / *
-    [YP_TOKEN_PERCENT] = LEFT_ASSOCIATIVE(YP_BINDING_POWER_FACTOR),
-    [YP_TOKEN_SLASH] = LEFT_ASSOCIATIVE(YP_BINDING_POWER_FACTOR),
-    [YP_TOKEN_STAR] = LEFT_ASSOCIATIVE(YP_BINDING_POWER_FACTOR),
-    [YP_TOKEN_USTAR] = LEFT_ASSOCIATIVE(YP_BINDING_POWER_FACTOR),
-
-    // -@
-    [YP_TOKEN_UMINUS] = RIGHT_ASSOCIATIVE_UNARY(YP_BINDING_POWER_UMINUS),
-    [YP_TOKEN_UMINUS_NUM] = RIGHT_ASSOCIATIVE_UNARY(YP_BINDING_POWER_UMINUS),
-
-    // **
-    [YP_TOKEN_STAR_STAR] = RIGHT_ASSOCIATIVE(YP_BINDING_POWER_EXPONENT),
-    [YP_TOKEN_USTAR_STAR] = RIGHT_ASSOCIATIVE_UNARY(YP_BINDING_POWER_UNARY),
-
-    // ! ~ +@
-    [YP_TOKEN_BANG] = RIGHT_ASSOCIATIVE_UNARY(YP_BINDING_POWER_UNARY),
-    [YP_TOKEN_TILDE] = RIGHT_ASSOCIATIVE_UNARY(YP_BINDING_POWER_UNARY),
-    [YP_TOKEN_UPLUS] = RIGHT_ASSOCIATIVE_UNARY(YP_BINDING_POWER_UNARY),
-
-    // [
-    [YP_TOKEN_BRACKET_LEFT] = LEFT_ASSOCIATIVE(YP_BINDING_POWER_INDEX),
-
-    // :: . &.
-    [YP_TOKEN_COLON_COLON] = RIGHT_ASSOCIATIVE(YP_BINDING_POWER_CALL),
-    [YP_TOKEN_DOT] = RIGHT_ASSOCIATIVE(YP_BINDING_POWER_CALL),
-    [YP_TOKEN_AMPERSAND_DOT] = RIGHT_ASSOCIATIVE(YP_BINDING_POWER_CALL)
-};
-
-#undef BINDING_POWER_ASSIGNMENT
-#undef LEFT_ASSOCIATIVE
-#undef RIGHT_ASSOCIATIVE
-#undef RIGHT_ASSOCIATIVE_UNARY
-
-// If the current token is of the specified type, lex forward by one token and
-// return true. Otherwise, return false. For example:
-//
-//     if (accept(parser, YP_TOKEN_COLON)) { ... }
-//
-static bool
-accept(yp_parser_t *parser, yp_token_type_t type) {
-    if (match_type_p(parser, type)) {
-        parser_lex(parser);
-        return true;
-    }
-    return false;
-}
-
-// If the current token is of any of the specified types, lex forward by one
-// token and return true. Otherwise, return false. For example:
-//
-//     if (accept_any(parser, 2, YP_TOKEN_COLON, YP_TOKEN_SEMICOLON)) { ... }
-//
-static bool
-accept_any(yp_parser_t *parser, size_t count, ...) {
-    va_list types;
-    va_start(types, count);
-
-    for (size_t index = 0; index < count; index++) {
-        if (match_type_p(parser, va_arg(types, yp_token_type_t))) {
-            parser_lex(parser);
-            va_end(types);
-            return true;
-        }
-    }
-
-    va_end(types);
-    return false;
-}
-
-// This function indicates that the parser expects a token in a specific
-// position. For example, if you're parsing a BEGIN block, you know that a { is
-// expected immediately after the keyword. In that case you would call this
-// function to indicate that that token should be found.
-//
-// If we didn't find the token that we were expecting, then we're going to add
-// an error to the parser's list of errors (to indicate that the tree is not
-// valid) and create an artificial token instead. This allows us to recover from
-// the fact that the token isn't present and continue parsing.
-static void
-expect(yp_parser_t *parser, yp_token_type_t type, const char *message) {
-    if (accept(parser, type)) return;
-
-    yp_diagnostic_list_append(&parser->error_list, parser->previous.end, parser->previous.end, message);
-
-    parser->previous =
-        (yp_token_t) { .type = YP_TOKEN_MISSING, .start = parser->previous.end, .end = parser->previous.end };
-}
-
-static void
-expect_any(yp_parser_t *parser, const char*message, size_t count, ...) {
-    va_list types;
-    va_start(types, count);
-
-    for (size_t index = 0; index < count; index++) {
-        if (accept(parser, va_arg(types, yp_token_type_t))) {
-            va_end(types);
-            return;
-        }
-    }
-
-    va_end(types);
-
-    yp_diagnostic_list_append(&parser->error_list, parser->previous.end, parser->previous.end, message);
-    parser->previous =
-        (yp_token_t) { .type = YP_TOKEN_MISSING, .start = parser->previous.end, .end = parser->previous.end };
-}
-
-static yp_node_t *
-parse_expression(yp_parser_t *parser, yp_binding_power_t binding_power, const char *message);
-
-// This function controls whether or not we will attempt to parse an expression
-// beginning at the subsequent token. It is used when we are in a context where
-// an expression is optional.
-//
-// For example, looking at a range object when we've already lexed the operator,
-// we need to know if we should attempt to parse an expression on the right.
-//
-// For another example, if we've parsed an identifier or a method call and we do
-// not have parentheses, then the next token may be the start of an argument or
-// it may not.
-//
-// CRuby parsers that are generated would resolve this by using a lookahead and
-// potentially backtracking. We attempt to do this by just looking at the next
-// token and making a decision based on that. I am not sure if this is going to
-// work in all cases, it may need to be refactored later. But it appears to work
-// for now.
-static inline bool
-token_begins_expression_p(yp_token_type_t type) {
-    switch (type) {
-        case YP_TOKEN_EQUAL_GREATER:
-        case YP_TOKEN_KEYWORD_IN:
-            // We need to special case this because it is a binary operator that
-            // should not be marked as beginning an expression.
-            return false;
-        case YP_TOKEN_BRACE_RIGHT:
-        case YP_TOKEN_BRACKET_RIGHT:
-        case YP_TOKEN_COLON:
-        case YP_TOKEN_COMMA:
-        case YP_TOKEN_EMBEXPR_END:
-        case YP_TOKEN_EOF:
-        case YP_TOKEN_LAMBDA_BEGIN:
-        case YP_TOKEN_KEYWORD_DO:
-        case YP_TOKEN_KEYWORD_DO_LOOP:
-        case YP_TOKEN_KEYWORD_END:
-        case YP_TOKEN_KEYWORD_ELSE:
-        case YP_TOKEN_KEYWORD_ELSIF:
-        case YP_TOKEN_KEYWORD_ENSURE:
-        case YP_TOKEN_KEYWORD_THEN:
-        case YP_TOKEN_KEYWORD_RESCUE:
-        case YP_TOKEN_KEYWORD_WHEN:
-        case YP_TOKEN_NEWLINE:
-        case YP_TOKEN_PARENTHESIS_RIGHT:
-        case YP_TOKEN_SEMICOLON:
-            // The reason we need this short-circuit is because we're using the
-            // binding powers table to tell us if the subsequent token could
-            // potentially be the start of an expression . If there _is_ a binding
-            // power for one of these tokens, then we should remove it from this list
-            // and let it be handled by the default case below.
-            assert(yp_binding_powers[type].left == YP_BINDING_POWER_UNSET);
-            return false;
-        case YP_TOKEN_UAMPERSAND:
-            // This is a special case because this unary operator cannot appear
-            // as a general operator, it only appears in certain circumstances.
-            return false;
-        case YP_TOKEN_UCOLON_COLON:
-        case YP_TOKEN_UMINUS:
-        case YP_TOKEN_UMINUS_NUM:
-        case YP_TOKEN_UPLUS:
-        case YP_TOKEN_BANG:
-        case YP_TOKEN_TILDE:
-        case YP_TOKEN_UDOT_DOT:
-        case YP_TOKEN_UDOT_DOT_DOT:
-            // These unary tokens actually do have binding power associated with them
-            // so that we can correctly place them into the precedence order. But we
-            // want them to be marked as beginning an expression, so we need to
-            // special case them here.
-            return true;
-        default:
-            return yp_binding_powers[type].left == YP_BINDING_POWER_UNSET;
-    }
-}
-
-// Parse an expression with the given binding power that may be optionally
-// prefixed by the * operator.
-static yp_node_t *
-parse_starred_expression(yp_parser_t *parser, yp_binding_power_t binding_power, const char *message) {
-    if (accept(parser, YP_TOKEN_USTAR)) {
-        yp_token_t operator = parser->previous;
-        yp_node_t *expression = parse_expression(parser, binding_power, "Expected expression after `*'.");
-        return (yp_node_t *) yp_splat_node_create(parser, &operator, expression);
-    }
-
-    return parse_expression(parser, binding_power, message);
-}
-
-// Convert the given node into a valid target node.
-static yp_node_t *
-parse_target(yp_parser_t *parser, yp_node_t *target) {
-    switch (YP_NODE_TYPE(target)) {
-        case YP_MISSING_NODE:
-            return target;
-        case YP_CLASS_VARIABLE_READ_NODE:
-            assert(sizeof(yp_class_variable_target_node_t) == sizeof(yp_class_variable_read_node_t));
-            target->type = YP_CLASS_VARIABLE_TARGET_NODE;
-            return target;
-        case YP_CONSTANT_PATH_NODE:
-            assert(sizeof(yp_constant_path_target_node_t) == sizeof(yp_constant_path_node_t));
-            target->type = YP_CONSTANT_PATH_TARGET_NODE;
-            return target;
-        case YP_CONSTANT_READ_NODE:
-            assert(sizeof(yp_constant_target_node_t) == sizeof(yp_constant_read_node_t));
-            target->type = YP_CONSTANT_TARGET_NODE;
-            return target;
-        case YP_BACK_REFERENCE_READ_NODE:
-            assert(sizeof(yp_global_variable_target_node_t) == sizeof(yp_back_reference_read_node_t));
-            /* fallthrough */
-        case YP_NUMBERED_REFERENCE_READ_NODE:
-            assert(sizeof(yp_global_variable_target_node_t) == sizeof(yp_numbered_reference_read_node_t));
-            yp_diagnostic_list_append(&parser->error_list, target->location.start, target->location.end, "Can't set variable");
-            /* fallthrough */
-        case YP_GLOBAL_VARIABLE_READ_NODE:
-            assert(sizeof(yp_global_variable_target_node_t) == sizeof(yp_global_variable_read_node_t));
-            target->type = YP_GLOBAL_VARIABLE_TARGET_NODE;
-            return target;
-        case YP_LOCAL_VARIABLE_READ_NODE:
-            assert(sizeof(yp_local_variable_target_node_t) == sizeof(yp_local_variable_read_node_t));
-            target->type = YP_LOCAL_VARIABLE_TARGET_NODE;
-            return target;
-        case YP_INSTANCE_VARIABLE_READ_NODE:
-            assert(sizeof(yp_instance_variable_target_node_t) == sizeof(yp_instance_variable_read_node_t));
-            target->type = YP_INSTANCE_VARIABLE_TARGET_NODE;
-            return target;
-        case YP_MULTI_WRITE_NODE:
-            return target;
-        case YP_SPLAT_NODE: {
-            yp_splat_node_t *splat = (yp_splat_node_t *) target;
-
-            if (splat->expression != NULL) {
-                splat->expression = parse_target(parser, splat->expression);
-            }
-
-            yp_token_t operator = not_provided(parser);
-            yp_location_t location = { .start = NULL, .end = NULL };
-
-            yp_multi_write_node_t *multi_write = yp_multi_write_node_create(parser, &operator, NULL, &location, &location);
-            yp_multi_write_node_targets_append(multi_write, (yp_node_t *) splat);
-
-            return (yp_node_t *) multi_write;
-        }
-        case YP_CALL_NODE: {
-            yp_call_node_t *call = (yp_call_node_t *) target;
-
-            // If we have no arguments to the call node and we need this to be a
-            // target then this is either a method call or a local variable write.
-            if (
-                (call->opening_loc.start == NULL) &&
-                (call->arguments == NULL) &&
-                (call->block == NULL)
-            ) {
-                if (call->receiver == NULL) {
-                    // When we get here, we have a local variable write, because it
-                    // was previously marked as a method call but now we have an =.
-                    // This looks like:
-                    //
-                    //     foo = 1
-                    //
-                    // When it was parsed in the prefix position, foo was seen as a
-                    // method call with no receiver and no arguments. Now we have an
-                    // =, so we know it's a local variable write.
-                    const yp_location_t message = call->message_loc;
-
-                    yp_parser_local_add_location(parser, message.start, message.end);
-                    yp_node_destroy(parser, target);
-
-                    const yp_token_t name = { .type = YP_TOKEN_IDENTIFIER, .start = message.start, .end = message.end };
-                    target = (yp_node_t *) yp_local_variable_read_node_create(parser, &name, 0);
-
-                    assert(sizeof(yp_local_variable_target_node_t) == sizeof(yp_local_variable_read_node_t));
-                    target->type = YP_LOCAL_VARIABLE_TARGET_NODE;
-
-                    if (token_is_numbered_parameter(message.start, message.end)) {
-                        yp_diagnostic_list_append(&parser->error_list, message.start, message.end, "reserved for numbered parameter");
-                    }
-
-                    return target;
-                }
-
-                // The method name needs to change. If we previously had foo, we now
-                // need foo=. In this case we'll allocate a new owned string, copy
-                // the previous method name in, and append an =.
-                size_t length = yp_string_length(&call->name);
-
-                uint8_t *name = calloc(length + 1, sizeof(uint8_t));
-                if (name == NULL) return NULL;
-
-                memcpy(name, yp_string_source(&call->name), length);
-                name[length] = '=';
-
-                // Now switch the name to the new string.
-                yp_string_free(&call->name);
-                yp_string_owned_init(&call->name, name, length + 1);
-
-                return target;
-            }
-
-            // If there is no call operator and the message is "[]" then this is
-            // an aref expression, and we can transform it into an aset
-            // expression.
-            if (
-                (call->call_operator_loc.start == NULL) &&
-                (call->message_loc.start[0] == '[') &&
-                (call->message_loc.end[-1] == ']') &&
-                (call->block == NULL)
-            ) {
-                // Free the previous name and replace it with "[]=".
-                yp_string_free(&call->name);
-                yp_string_constant_init(&call->name, "[]=", 3);
-                return target;
-            }
-        }
-        /* fallthrough */
-        default:
-            // In this case we have a node that we don't know how to convert
-            // into a target. We need to treat it as an error. For now, we'll
-            // mark it as an error and just skip right past it.
-            yp_diagnostic_list_append(&parser->error_list, target->location.start, target->location.end, "Unexpected write target.");
-            return target;
-    }
-}
-
-// Convert the given node into a valid write node.
-static yp_node_t *
-parse_write(yp_parser_t *parser, yp_node_t *target, yp_token_t *operator, yp_node_t *value) {
-    switch (YP_NODE_TYPE(target)) {
-        case YP_MISSING_NODE:
-            return target;
-        case YP_CLASS_VARIABLE_READ_NODE: {
-            yp_class_variable_write_node_t *node = yp_class_variable_write_node_create(parser, (yp_class_variable_read_node_t *) target, operator, value);
-            yp_node_destroy(parser, target);
-            return (yp_node_t *) node;
-        }
-        case YP_CONSTANT_PATH_NODE:
-            return (yp_node_t *) yp_constant_path_write_node_create(parser, (yp_constant_path_node_t *) target, operator, value);
-        case YP_CONSTANT_READ_NODE: {
-            yp_constant_write_node_t *node = yp_constant_write_node_create(parser, (yp_constant_read_node_t *) target, operator, value);
-            yp_node_destroy(parser, target);
-            return (yp_node_t *) node;
-        }
-        case YP_BACK_REFERENCE_READ_NODE:
-        case YP_NUMBERED_REFERENCE_READ_NODE:
-            yp_diagnostic_list_append(&parser->error_list, target->location.start, target->location.end, "Can't set variable");
-            /* fallthrough */
-        case YP_GLOBAL_VARIABLE_READ_NODE: {
-            yp_global_variable_write_node_t *node = yp_global_variable_write_node_create(parser, target, operator, value);
-            yp_node_destroy(parser, target);
-            return (yp_node_t *) node;
-        }
-        case YP_LOCAL_VARIABLE_READ_NODE: {
-            yp_local_variable_read_node_t *local_read = (yp_local_variable_read_node_t *) target;
-
-            yp_constant_id_t constant_id = local_read->name;
-            uint32_t depth = local_read->depth;
-
-            yp_location_t name_loc = target->location;
-            yp_node_destroy(parser, target);
-
-            return (yp_node_t *) yp_local_variable_write_node_create(parser, constant_id, depth, value, &name_loc, operator);
-        }
-        case YP_INSTANCE_VARIABLE_READ_NODE: {
-            yp_node_t *write_node = (yp_node_t *) yp_instance_variable_write_node_create(parser, (yp_instance_variable_read_node_t *) target, operator, value);
-            yp_node_destroy(parser, target);
-            return write_node;
-        }
-        case YP_MULTI_WRITE_NODE: {
-            yp_multi_write_node_t *multi_write = (yp_multi_write_node_t *) target;
-            yp_multi_write_node_operator_loc_set(multi_write, operator);
-
-            multi_write->value = value;
-            multi_write->base.location.end = value->location.end;
-            return (yp_node_t *) multi_write;
-        }
-        case YP_SPLAT_NODE: {
-            yp_splat_node_t *splat = (yp_splat_node_t *) target;
-
-            if (splat->expression != NULL) {
-                splat->expression = parse_write(parser, splat->expression, operator, value);
-            }
-
-            yp_location_t location = { .start = NULL, .end = NULL };
-            yp_multi_write_node_t *multi_write = yp_multi_write_node_create(parser, operator, value, &location, &location);
-            yp_multi_write_node_targets_append(multi_write, (yp_node_t *) splat);
-
-            return (yp_node_t *) multi_write;
-        }
-        case YP_CALL_NODE: {
-            yp_call_node_t *call = (yp_call_node_t *) target;
-            // If we have no arguments to the call node and we need this to be a
-            // target then this is either a method call or a local variable write.
-            if (
-                (call->opening_loc.start == NULL) &&
-                (call->arguments == NULL) &&
-                (call->block == NULL)
-            ) {
-                if (call->receiver == NULL) {
-                    // When we get here, we have a local variable write, because it
-                    // was previously marked as a method call but now we have an =.
-                    // This looks like:
-                    //
-                    //     foo = 1
-                    //
-                    // When it was parsed in the prefix position, foo was seen as a
-                    // method call with no receiver and no arguments. Now we have an
-                    // =, so we know it's a local variable write.
-                    const yp_location_t message = call->message_loc;
-
-                    yp_parser_local_add_location(parser, message.start, message.end);
-                    yp_node_destroy(parser, target);
-
-                    yp_constant_id_t constant_id = yp_parser_constant_id_location(parser, message.start, message.end);
-                    target = (yp_node_t *) yp_local_variable_write_node_create(parser, constant_id, 0, value, &message, operator);
-
-                    if (token_is_numbered_parameter(message.start, message.end)) {
-                        yp_diagnostic_list_append(&parser->error_list, message.start, message.end, "reserved for numbered parameter");
-                    }
-
-                    return target;
-                }
-
-                // When we get here, we have a method call, because it was
-                // previously marked as a method call but now we have an =. This
-                // looks like:
-                //
-                //     foo.bar = 1
-                //
-                // When it was parsed in the prefix position, foo.bar was seen as a
-                // method call with no arguments. Now we have an =, so we know it's
-                // a method call with an argument. In this case we will create the
-                // arguments node, parse the argument, and add it to the list.
-                yp_arguments_node_t *arguments = yp_arguments_node_create(parser);
-                call->arguments = arguments;
-                yp_arguments_node_arguments_append(arguments, value);
-                target->location.end = arguments->base.location.end;
-
-                // The method name needs to change. If we previously had foo, we now
-                // need foo=. In this case we'll allocate a new owned string, copy
-                // the previous method name in, and append an =.
-                size_t length = yp_string_length(&call->name);
-
-                uint8_t *name = calloc(length + 1, sizeof(uint8_t));
-                if (name == NULL) return NULL;
-
-                memcpy(name, yp_string_source(&call->name), length);
-                name[length] = '=';
-
-                // Now switch the name to the new string.
-                yp_string_free(&call->name);
-                yp_string_owned_init(&call->name, name, length + 1);
-
-                return target;
-            }
-
-            // If there is no call operator and the message is "[]" then this is
-            // an aref expression, and we can transform it into an aset
-            // expression.
-            if (
-                (call->call_operator_loc.start == NULL) &&
-                (call->message_loc.start[0] == '[') &&
-                (call->message_loc.end[-1] == ']') &&
-                (call->block == NULL)
-            ) {
-                if (call->arguments == NULL) {
-                    call->arguments = yp_arguments_node_create(parser);
-                }
-
-                yp_arguments_node_arguments_append(call->arguments, value);
-                target->location.end = value->location.end;
-
-                // Free the previous name and replace it with "[]=".
-                yp_string_free(&call->name);
-                yp_string_constant_init(&call->name, "[]=", 3);
-                return target;
-            }
-
-            // If there are arguments on the call node, then it can't be a method
-            // call ending with = or a local variable write, so it must be a
-            // syntax error. In this case we'll fall through to our default
-            // handling. We need to free the value that we parsed because there
-            // is no way for us to attach it to the tree at this point.
-            yp_node_destroy(parser, value);
-        }
-        /* fallthrough */
-        default:
-            // In this case we have a node that we don't know how to convert into a
-            // target. We need to treat it as an error. For now, we'll mark it as an
-            // error and just skip right past it.
-            yp_diagnostic_list_append(&parser->error_list, operator->start, operator->end, "Unexpected `='.");
-            return target;
-    }
-}
-
-// Parse a list of targets for assignment. This is used in the case of a for
-// loop or a multi-assignment. For example, in the following code:
-//
-//     for foo, bar in baz
-//         ^^^^^^^^
-//
-// The targets are `foo` and `bar`. This function will either return a single
-// target node or a multi-target node.
-static yp_node_t *
-parse_targets(yp_parser_t *parser, yp_node_t *first_target, yp_binding_power_t binding_power) {
-    yp_token_t operator = not_provided(parser);
-
-    // The first_target parameter can be NULL in the case that we're parsing a
-    // location that we know requires a multi write, as in the case of a for loop.
-    // In this case we will set up the parsing loop slightly differently.
-    if (first_target != NULL) {
-        first_target = parse_target(parser, first_target);
-
-        if (!match_type_p(parser, YP_TOKEN_COMMA)) {
-            return first_target;
-        }
-    }
-
-    yp_location_t lparen_loc = { .start = NULL, .end = NULL };
-    yp_multi_write_node_t *result = yp_multi_write_node_create(parser, &operator, NULL, &lparen_loc, &lparen_loc);
-
-    if (first_target != NULL) {
-        yp_multi_write_node_targets_append(result, first_target);
-    }
-
-    bool has_splat = false;
-
-    if (first_target == NULL || accept(parser, YP_TOKEN_COMMA)) {
-        do {
-            if (accept(parser, YP_TOKEN_USTAR)) {
-                // Here we have a splat operator. It can have a name or be anonymous. It
-                // can be the final target or be in the middle if there haven't been any
-                // others yet.
-
-                if (has_splat) {
-                    yp_diagnostic_list_append(&parser->error_list, parser->previous.start, parser->previous.end, "Multiple splats in multi-assignment.");
-                }
-
-                yp_token_t star_operator = parser->previous;
-                yp_node_t *name = NULL;
-
-                if (token_begins_expression_p(parser->current.type)) {
-                    name = parse_expression(parser, binding_power, "Expected an expression after '*'.");
-                    name = parse_target(parser, name);
-                }
-
-                yp_node_t *splat = (yp_node_t *) yp_splat_node_create(parser, &star_operator, name);
-                yp_multi_write_node_targets_append(result, splat);
-                has_splat = true;
-            } else if (accept(parser, YP_TOKEN_PARENTHESIS_LEFT)) {
-                // Here we have a parenthesized list of targets. We'll recurse down into
-                // the parentheses by calling parse_targets again and then finish out
-                // the node when it returns.
-
-                yp_token_t lparen = parser->previous;
-                yp_node_t *first_child_target = parse_expression(parser, YP_BINDING_POWER_STATEMENT, "Expected an expression after '('.");
-                yp_node_t *child_target = parse_targets(parser, first_child_target, YP_BINDING_POWER_STATEMENT);
-
-                expect(parser, YP_TOKEN_PARENTHESIS_RIGHT, "Expected an ')' after multi-assignment.");
-                yp_token_t rparen = parser->previous;
-
-                if (YP_NODE_TYPE_P(child_target, YP_MULTI_WRITE_NODE) && first_target == NULL && result->targets.size == 0) {
-                    yp_node_destroy(parser, (yp_node_t *) result);
-                    result = (yp_multi_write_node_t *) child_target;
-                    result->base.location.start = lparen.start;
-                    result->base.location.end = rparen.end;
-                    result->lparen_loc = (yp_location_t) { .start = lparen.start, .end = lparen.end };
-                    result->rparen_loc = (yp_location_t) { .start = rparen.start, .end = rparen.end };
-                } else {
-                    yp_multi_write_node_t *target;
-
-                    if (YP_NODE_TYPE_P(child_target, YP_MULTI_WRITE_NODE)) {
-                        target = (yp_multi_write_node_t *) child_target;
-                        target->base.location.start = lparen.start;
-                        target->base.location.end = rparen.end;
-                        target->lparen_loc = (yp_location_t) { .start = lparen.start, .end = lparen.end };
-                        target->rparen_loc = (yp_location_t) { .start = rparen.start, .end = rparen.end };
-                    } else {
-                        yp_token_t operator = not_provided(parser);
-
-                        target = yp_multi_write_node_create(
-                            parser,
-                            &operator,
-                            NULL,
-                            &(yp_location_t) { .start = lparen.start, .end = lparen.end },
-                            &(yp_location_t) { .start = rparen.start, .end = rparen.end }
-                        );
-
-                        yp_multi_write_node_targets_append(target, child_target);
-                    }
-
-                    target->base.location.start = lparen.start;
-                    target->base.location.end = rparen.end;
-                    yp_multi_write_node_targets_append(result, (yp_node_t *) target);
-                }
-            } else {
-                if (!token_begins_expression_p(parser->current.type) && !match_type_p(parser, YP_TOKEN_USTAR)) {
-                    if (first_target == NULL && result->targets.size == 0) {
-                        // If we get here, then we weren't able to parse anything at all, so
-                        // we need to return a missing node.
-                        yp_node_destroy(parser, (yp_node_t *) result);
-                        yp_diagnostic_list_append(&parser->error_list, operator.start, operator.end, "Expected index after for.");
-                        return (yp_node_t *) yp_missing_node_create(parser, operator.start, operator.end);
-                    }
-
-                    // If we get here, then we have a trailing , in a multi write node.
-                    // We need to indicate this somehow in the tree, so we'll add an
-                    // anonymous splat.
-                    yp_node_t *splat = (yp_node_t *) yp_splat_node_create(parser, &parser->previous, NULL);
-                    yp_multi_write_node_targets_append(result, splat);
-                    return (yp_node_t *) result;
-                }
-
-                yp_node_t *target = parse_expression(parser, binding_power, "Expected another expression after ','.");
-                target = parse_target(parser, target);
-
-                yp_multi_write_node_targets_append(result, target);
-            }
-        } while (accept(parser, YP_TOKEN_COMMA));
-    }
-
-    return (yp_node_t *) result;
-}
-
-// Parse a list of statements separated by newlines or semicolons.
-static yp_statements_node_t *
-parse_statements(yp_parser_t *parser, yp_context_t context) {
-    // First, skip past any optional terminators that might be at the beginning of
-    // the statements.
-    while (accept_any(parser, 2, YP_TOKEN_SEMICOLON, YP_TOKEN_NEWLINE));
-
-    // If we have a terminator, then we can just return NULL.
-    if (context_terminator(context, &parser->current)) return NULL;
-
-    yp_statements_node_t *statements = yp_statements_node_create(parser);
-
-    // At this point we know we have at least one statement, and that it
-    // immediately follows the current token.
-    context_push(parser, context);
-
-    while (true) {
-        yp_node_t *node = parse_expression(parser, YP_BINDING_POWER_STATEMENT, "Expected to be able to parse an expression.");
-        yp_statements_node_body_append(statements, node);
-
-        // If we're recovering from a syntax error, then we need to stop parsing the
-        // statements now.
-        if (parser->recovering) {
-            // If this is the level of context where the recovery has happened, then
-            // we can mark the parser as done recovering.
-            if (context_terminator(context, &parser->current)) parser->recovering = false;
-            break;
-        }
-
-        // If we have a terminator, then we will parse all consequtive terminators
-        // and then continue parsing the statements list.
-        if (accept_any(parser, 2, YP_TOKEN_NEWLINE, YP_TOKEN_SEMICOLON)) {
-            // If we have a terminator, then we will continue parsing the statements
-            // list.
-            while (accept_any(parser, 2, YP_TOKEN_NEWLINE, YP_TOKEN_SEMICOLON));
-            if (context_terminator(context, &parser->current)) break;
-
-            // Now we can continue parsing the list of statements.
-            continue;
-        }
-
-        // At this point we have a list of statements that are not terminated by a
-        // newline or semicolon. At this point we need to check if we're at the end
-        // of the statements list. If we are, then we should break out of the loop.
-        if (context_terminator(context, &parser->current)) break;
-
-        // At this point, we have a syntax error, because the statement was not
-        // terminated by a newline or semicolon, and we're not at the end of the
-        // statements list. Ideally we should scan forward to determine if we should
-        // insert a missing terminator or break out of parsing the statements list
-        // at this point.
-        //
-        // We don't have that yet, so instead we'll do a more naive approach. If we
-        // were unable to parse an expression, then we will skip past this token and
-        // continue parsing the statements list. Otherwise we'll add an error and
-        // continue parsing the statements list.
-        if (YP_NODE_TYPE_P(node, YP_MISSING_NODE)) {
-            parser_lex(parser);
-
-            while (accept_any(parser, 2, YP_TOKEN_NEWLINE, YP_TOKEN_SEMICOLON));
-            if (context_terminator(context, &parser->current)) break;
-        } else {
-            expect(parser, YP_TOKEN_NEWLINE, "Expected a newline or semicolon after statement.");
-        }
-    }
-
-    context_pop(parser);
-    return statements;
-}
-
-// Parse all of the elements of a hash.
-static void
-parse_assocs(yp_parser_t *parser, yp_node_t *node) {
-    assert(YP_NODE_TYPE_P(node, YP_HASH_NODE) || YP_NODE_TYPE_P(node, YP_KEYWORD_HASH_NODE));
-
-    while (true) {
-        yp_node_t *element;
-
-        switch (parser->current.type) {
-            case YP_TOKEN_USTAR_STAR: {
-                parser_lex(parser);
-                yp_token_t operator = parser->previous;
-                yp_node_t *value = NULL;
-
-                if (token_begins_expression_p(parser->current.type)) {
-                    value = parse_expression(parser, YP_BINDING_POWER_DEFINED, "Expected an expression after ** in hash.");
-                } else if (yp_parser_local_depth(parser, &operator) == -1) {
-                    yp_diagnostic_list_append(&parser->error_list, operator.start, operator.end, "Expected an expression after ** in hash.");
-                }
-
-                element = (yp_node_t *) yp_assoc_splat_node_create(parser, value, &operator);
-                break;
-            }
-            case YP_TOKEN_LABEL: {
-                parser_lex(parser);
-
-                yp_node_t *key = (yp_node_t *) yp_symbol_node_label_create(parser, &parser->previous);
-                yp_token_t operator = not_provided(parser);
-                yp_node_t *value = NULL;
-
-                if (token_begins_expression_p(parser->current.type)) {
-                    value = parse_expression(parser, YP_BINDING_POWER_DEFINED, "Expected an expression after the label in hash.");
-                }
-
-                element = (yp_node_t *) yp_assoc_node_create(parser, key, &operator, value);
-                break;
-            }
-            default: {
-                yp_node_t *key = parse_expression(parser, YP_BINDING_POWER_DEFINED, "Expected a key in the hash literal.");
-                yp_token_t operator;
-
-                if (yp_symbol_node_label_p(key)) {
-                    operator = not_provided(parser);
-                } else {
-                    expect(parser, YP_TOKEN_EQUAL_GREATER, "Expected a => between the key and the value in the hash.");
-                    operator = parser->previous;
-                }
-
-                yp_node_t *value = parse_expression(parser, YP_BINDING_POWER_DEFINED, "Expected a value in the hash literal.");
-                element = (yp_node_t *) yp_assoc_node_create(parser, key, &operator, value);
-                break;
-            }
-        }
-
-        if (YP_NODE_TYPE_P(node, YP_HASH_NODE)) {
-            yp_hash_node_elements_append((yp_hash_node_t *) node, element);
-        } else {
-            yp_keyword_hash_node_elements_append((yp_keyword_hash_node_t *) node, element);
-        }
-
-        // If there's no comma after the element, then we're done.
-        if (!accept(parser, YP_TOKEN_COMMA)) return;
-
-        // If the next element starts with a label or a **, then we know we have
-        // another element in the hash, so we'll continue parsing.
-        if (match_any_type_p(parser, 2, YP_TOKEN_USTAR_STAR, YP_TOKEN_LABEL)) continue;
-
-        // Otherwise we need to check if the subsequent token begins an expression.
-        // If it does, then we'll continue parsing.
-        if (token_begins_expression_p(parser->current.type)) continue;
-
-        // Otherwise by default we will exit out of this loop.
-        return;
-    }
-}
-
-// Parse a list of arguments.
-static void
-parse_arguments(yp_parser_t *parser, yp_arguments_t *arguments, bool accepts_forwarding, yp_token_type_t terminator) {
-    yp_binding_power_t binding_power = yp_binding_powers[parser->current.type].left;
-
-    // First we need to check if the next token is one that could be the start of
-    // an argument. If it's not, then we can just return.
-    if (
-        match_any_type_p(parser, 2, terminator, YP_TOKEN_EOF) ||
-        (binding_power != YP_BINDING_POWER_UNSET && binding_power < YP_BINDING_POWER_RANGE) ||
-        context_terminator(parser->current_context->context, &parser->current)
-    ) {
-        return;
-    }
-
-    bool parsed_bare_hash = false;
-    bool parsed_block_argument = false;
-
-    while (!match_type_p(parser, YP_TOKEN_EOF)) {
-        if (parsed_block_argument) {
-            yp_diagnostic_list_append(&parser->error_list, parser->current.start, parser->current.end, "Unexpected argument after block argument.");
-        }
-
-        yp_node_t *argument = NULL;
-
-        switch (parser->current.type) {
-            case YP_TOKEN_USTAR_STAR:
-            case YP_TOKEN_LABEL: {
-                if (parsed_bare_hash) {
-                    yp_diagnostic_list_append(&parser->error_list, parser->current.start, parser->current.end, "Unexpected bare hash.");
-                }
-
-                yp_keyword_hash_node_t *hash = yp_keyword_hash_node_create(parser);
-                argument = (yp_node_t *)hash;
-
-                if (!match_any_type_p(parser, 7, terminator, YP_TOKEN_NEWLINE, YP_TOKEN_SEMICOLON, YP_TOKEN_EOF, YP_TOKEN_BRACE_RIGHT, YP_TOKEN_KEYWORD_DO, YP_TOKEN_PARENTHESIS_RIGHT)) {
-                    parse_assocs(parser, (yp_node_t *) hash);
-                }
-
-                parsed_bare_hash = true;
-                break;
-            }
-            case YP_TOKEN_UAMPERSAND: {
-                parser_lex(parser);
-                yp_token_t operator = parser->previous;
-                yp_node_t *expression = NULL;
-
-                if (token_begins_expression_p(parser->current.type)) {
-                    expression = parse_expression(parser, YP_BINDING_POWER_DEFINED, "Expected to be able to parse an argument.");
-                } else if (yp_parser_local_depth(parser, &operator) == -1) {
-                    yp_diagnostic_list_append(&parser->error_list, operator.start, operator.end, "unexpected & when parent method is not forwarding.");
-                }
-
-                argument = (yp_node_t *)yp_block_argument_node_create(parser, &operator, expression);
-                parsed_block_argument = true;
-                arguments->implicit_block = true;
-                break;
-            }
-            case YP_TOKEN_USTAR: {
-                parser_lex(parser);
-                yp_token_t operator = parser->previous;
-
-                if (match_any_type_p(parser, 2, YP_TOKEN_PARENTHESIS_RIGHT, YP_TOKEN_COMMA)) {
-                    if (yp_parser_local_depth(parser, &parser->previous) == -1) {
-                        yp_diagnostic_list_append(&parser->error_list, operator.start, operator.end, "unexpected * when parent method is not forwarding.");
-                    }
-
-                    argument = (yp_node_t *) yp_splat_node_create(parser, &operator, NULL);
-                } else {
-                    yp_node_t *expression = parse_expression(parser, YP_BINDING_POWER_DEFINED, "Expected an expression after '*' in argument.");
-
-                    if (parsed_bare_hash) {
-                        yp_diagnostic_list_append(&parser->error_list, operator.start, expression->location.end, "Unexpected splat argument after double splat.");
-                    }
-
-                    argument = (yp_node_t *) yp_splat_node_create(parser, &operator, expression);
-                }
-
-                break;
-            }
-            case YP_TOKEN_UDOT_DOT_DOT: {
-                if (accepts_forwarding) {
-                    parser_lex(parser);
-
-                    if (token_begins_expression_p(parser->current.type)) {
-                        // If the token begins an expression then this ... was not actually
-                        // argument forwarding but was instead a range.
-                        yp_token_t operator = parser->previous;
-                        yp_node_t *right = parse_expression(parser, YP_BINDING_POWER_RANGE, "Expected a value after the operator.");
-                        argument = (yp_node_t *) yp_range_node_create(parser, NULL, &operator, right);
-                    } else {
-                        if (yp_parser_local_depth(parser, &parser->previous) == -1) {
-                            yp_diagnostic_list_append(&parser->error_list, parser->previous.start, parser->previous.end, "unexpected ... when parent method is not forwarding.");
-                        }
-
-                        argument = (yp_node_t *)yp_forwarding_arguments_node_create(parser, &parser->previous);
-                        break;
-                    }
-                }
-            }
-            /* fallthrough */
-            default: {
-                if (argument == NULL) {
-                    argument = parse_expression(parser, YP_BINDING_POWER_DEFINED, "Expected to be able to parse an argument.");
-                }
-
-                if (yp_symbol_node_label_p(argument) || accept(parser, YP_TOKEN_EQUAL_GREATER)) {
-                    if (parsed_bare_hash) {
-                        yp_diagnostic_list_append(&parser->error_list, parser->previous.start, parser->previous.end, "Unexpected bare hash argument.");
-                    }
-
-                    yp_token_t operator;
-                    if (parser->previous.type == YP_TOKEN_EQUAL_GREATER) {
-                        operator = parser->previous;
-                    } else {
-                        operator = not_provided(parser);
-                    }
-
-                    yp_keyword_hash_node_t *bare_hash = yp_keyword_hash_node_create(parser);
-
-                    // Finish parsing the one we are part way through
-                    yp_node_t *value = parse_expression(parser, YP_BINDING_POWER_DEFINED, "Expected a value in the hash literal.");
-
-                    argument = (yp_node_t *) yp_assoc_node_create(parser, argument, &operator, value);
-                    yp_keyword_hash_node_elements_append(bare_hash, argument);
-                    argument = (yp_node_t *) bare_hash;
-
-                    // Then parse more if we have a comma
-                    if (accept(parser, YP_TOKEN_COMMA) && (
-                        token_begins_expression_p(parser->current.type) ||
-                        match_any_type_p(parser, 2, YP_TOKEN_USTAR_STAR, YP_TOKEN_LABEL)
-                    )) {
-                        parse_assocs(parser, (yp_node_t *) bare_hash);
-                    }
-
-                    parsed_bare_hash = true;
-                }
-
-                break;
-            }
-        }
-
-        yp_arguments_node_arguments_append(arguments->arguments, argument);
-
-        // If parsing the argument failed, we need to stop parsing arguments.
-        if (YP_NODE_TYPE_P(argument, YP_MISSING_NODE) || parser->recovering) break;
-
-        // If the terminator of these arguments is not EOF, then we have a specific
-        // token we're looking for. In that case we can accept a newline here
-        // because it is not functioning as a statement terminator.
-        if (terminator != YP_TOKEN_EOF) accept(parser, YP_TOKEN_NEWLINE);
-
-        if (parser->previous.type == YP_TOKEN_COMMA && parsed_bare_hash) {
-            // If we previously were on a comma and we just parsed a bare hash, then
-            // we want to continue parsing arguments. This is because the comma was
-            // grabbed up by the hash parser.
-        } else {
-            // If there is no comma at the end of the argument list then we're done
-            // parsing arguments and can break out of this loop.
-            if (!accept(parser, YP_TOKEN_COMMA)) break;
-        }
-
-        // If we hit the terminator, then that means we have a trailing comma so we
-        // can accept that output as well.
-        if (match_type_p(parser, terminator)) break;
-    }
-}
-
-// Required parameters on method, block, and lambda declarations can be
-// destructured using parentheses. This looks like:
-//
-//     def foo((bar, baz))
-//     end
-//
-// It can recurse infinitely down, and splats are allowed to group arguments.
-static yp_required_destructured_parameter_node_t *
-parse_required_destructured_parameter(yp_parser_t *parser) {
-    expect(parser, YP_TOKEN_PARENTHESIS_LEFT, "Expected '(' to start a required parameter.");
-
-    yp_token_t opening = parser->previous;
-    yp_required_destructured_parameter_node_t *node = yp_required_destructured_parameter_node_create(parser, &opening);
-    bool parsed_splat = false;
-
-    do {
-        yp_node_t *param;
-
-        if (node->parameters.size > 0 && match_type_p(parser, YP_TOKEN_PARENTHESIS_RIGHT)) {
-            if (parsed_splat) {
-                yp_diagnostic_list_append(&parser->error_list, parser->previous.start, parser->previous.end, "Unexpected splat after splat.");
-            }
-
-            param = (yp_node_t *) yp_splat_node_create(parser, &parser->previous, NULL);
-            yp_required_destructured_parameter_node_append_parameter(node, param);
-            break;
-        }
-
-        if (match_type_p(parser, YP_TOKEN_PARENTHESIS_LEFT)) {
-            param = (yp_node_t *) parse_required_destructured_parameter(parser);
-        } else if (accept(parser, YP_TOKEN_USTAR)) {
-            if (parsed_splat) {
-                yp_diagnostic_list_append(&parser->error_list, parser->previous.start, parser->previous.end, "Unexpected splat after splat.");
-            }
-
-            yp_token_t star = parser->previous;
-            yp_node_t *value = NULL;
-
-            if (accept(parser, YP_TOKEN_IDENTIFIER)) {
-                yp_token_t name = parser->previous;
-                value = (yp_node_t *) yp_required_parameter_node_create(parser, &name);
-                yp_parser_local_add_token(parser, &name);
-            }
-
-            param = (yp_node_t *) yp_splat_node_create(parser, &star, value);
-            parsed_splat = true;
-        } else {
-            expect(parser, YP_TOKEN_IDENTIFIER, "Expected an identifier for a required parameter.");
-            yp_token_t name = parser->previous;
-
-            param = (yp_node_t *) yp_required_parameter_node_create(parser, &name);
-            yp_parser_local_add_token(parser, &name);
-        }
-
-        yp_required_destructured_parameter_node_append_parameter(node, param);
-    } while (accept(parser, YP_TOKEN_COMMA));
-
-    expect(parser, YP_TOKEN_PARENTHESIS_RIGHT, "Expected ')' to end a required parameter.");
-    yp_required_destructured_parameter_node_closing_set(node, &parser->previous);
-
-    return node;
-}
-
-// This represents the different order states we can be in when parsing
-// method parameters.
-typedef enum {
-    YP_PARAMETERS_NO_CHANGE = 0, // Extra state for tokens that should not change the state
-    YP_PARAMETERS_ORDER_NOTHING_AFTER = 1,
-    YP_PARAMETERS_ORDER_KEYWORDS_REST,
-    YP_PARAMETERS_ORDER_KEYWORDS,
-    YP_PARAMETERS_ORDER_REST,
-    YP_PARAMETERS_ORDER_AFTER_OPTIONAL,
-    YP_PARAMETERS_ORDER_OPTIONAL,
-    YP_PARAMETERS_ORDER_NAMED,
-    YP_PARAMETERS_ORDER_NONE,
-
-} yp_parameters_order_t;
-
-// This matches parameters tokens with parameters state.
-static yp_parameters_order_t parameters_ordering[YP_TOKEN_MAXIMUM] = {
-    [0] = YP_PARAMETERS_NO_CHANGE,
-    [YP_TOKEN_UAMPERSAND] = YP_PARAMETERS_ORDER_NOTHING_AFTER,
-    [YP_TOKEN_AMPERSAND] = YP_PARAMETERS_ORDER_NOTHING_AFTER,
-    [YP_TOKEN_UDOT_DOT_DOT] = YP_PARAMETERS_ORDER_NOTHING_AFTER,
-    [YP_TOKEN_IDENTIFIER] = YP_PARAMETERS_ORDER_NAMED,
-    [YP_TOKEN_PARENTHESIS_LEFT] = YP_PARAMETERS_ORDER_NAMED,
-    [YP_TOKEN_EQUAL] = YP_PARAMETERS_ORDER_OPTIONAL,
-    [YP_TOKEN_LABEL] = YP_PARAMETERS_ORDER_KEYWORDS,
-    [YP_TOKEN_USTAR] = YP_PARAMETERS_ORDER_AFTER_OPTIONAL,
-    [YP_TOKEN_STAR] = YP_PARAMETERS_ORDER_AFTER_OPTIONAL,
-    [YP_TOKEN_USTAR_STAR] = YP_PARAMETERS_ORDER_KEYWORDS_REST,
-    [YP_TOKEN_STAR_STAR] = YP_PARAMETERS_ORDER_KEYWORDS_REST
-};
-
-// Check if current parameter follows valid parameters ordering. If not it adds an
-// error to the list without stopping the parsing, otherwise sets the parameters state
-// to the one corresponding to the current parameter.
-static void
-update_parameter_state(yp_parser_t *parser, yp_token_t *token, yp_parameters_order_t *current) {
-    yp_parameters_order_t state = parameters_ordering[token->type];
-    if (state == YP_PARAMETERS_NO_CHANGE) return;
-
-    // If we see another ordered argument after a optional argument
-    // we only continue parsing ordered arguments until we stop seeing ordered arguments
-    if (*current == YP_PARAMETERS_ORDER_OPTIONAL && state == YP_PARAMETERS_ORDER_NAMED) {
-        *current = YP_PARAMETERS_ORDER_AFTER_OPTIONAL;
-        return;
-    } else if (*current == YP_PARAMETERS_ORDER_AFTER_OPTIONAL && state == YP_PARAMETERS_ORDER_NAMED) {
-        return;
-    }
-
-    if (token->type == YP_TOKEN_USTAR && *current == YP_PARAMETERS_ORDER_AFTER_OPTIONAL) {
-        yp_diagnostic_list_append(&parser->error_list, token->start, token->end, "Unexpected parameter *");
-    }
-
-    if (*current == YP_PARAMETERS_ORDER_NOTHING_AFTER || state > *current) {
-        // We know what transition we failed on, so we can provide a better error here.
-        yp_diagnostic_list_append(&parser->error_list, token->start, token->end, "Unexpected parameter order");
-    } else if (state < *current) {
-        *current = state;
-    }
-}
-
-// Parse a list of parameters on a method definition.
-static yp_parameters_node_t *
-parse_parameters(
-    yp_parser_t *parser,
-    yp_binding_power_t binding_power,
-    bool uses_parentheses,
-    bool allows_trailing_comma,
-    bool allows_forwarding_parameter
-) {
-    yp_parameters_node_t *params = yp_parameters_node_create(parser);
-    bool looping = true;
-
-    yp_do_loop_stack_push(parser, false);
-    yp_parameters_order_t order = YP_PARAMETERS_ORDER_NONE;
-
-    do {
-        switch (parser->current.type) {
-            case YP_TOKEN_PARENTHESIS_LEFT: {
-                update_parameter_state(parser, &parser->current, &order);
-                yp_node_t *param = (yp_node_t *) parse_required_destructured_parameter(parser);
-
-                if (order > YP_PARAMETERS_ORDER_AFTER_OPTIONAL) {
-                    yp_parameters_node_requireds_append(params, param);
-                } else {
-                    yp_parameters_node_posts_append(params, param);
-                }
-                break;
-            }
-            case YP_TOKEN_UAMPERSAND:
-            case YP_TOKEN_AMPERSAND: {
-                update_parameter_state(parser, &parser->current, &order);
-                parser_lex(parser);
-
-                yp_token_t operator = parser->previous;
-                yp_token_t name;
-
-                if (accept(parser, YP_TOKEN_IDENTIFIER)) {
-                    name = parser->previous;
-                    yp_parser_parameter_name_check(parser, &name);
-                    yp_parser_local_add_token(parser, &name);
-                } else {
-                    name = not_provided(parser);
-                    yp_parser_local_add_token(parser, &operator);
-                }
-
-                yp_block_parameter_node_t *param = yp_block_parameter_node_create(parser, &name, &operator);
-                if (params->block == NULL) {
-                    yp_parameters_node_block_set(params, param);
-                } else {
-                    yp_diagnostic_list_append(&parser->error_list, param->base.location.start, param->base.location.end, "Unexpected multiple block parameter");
-                    yp_parameters_node_posts_append(params, (yp_node_t *) param);
-                }
-
-                break;
-            }
-            case YP_TOKEN_UDOT_DOT_DOT: {
-                if (!allows_forwarding_parameter) {
-                    yp_diagnostic_list_append(&parser->error_list, parser->current.start, parser->current.end, "Unexpected ...");
-                }
-                if (order > YP_PARAMETERS_ORDER_NOTHING_AFTER) {
-                    update_parameter_state(parser, &parser->current, &order);
-                    parser_lex(parser);
-
-                    yp_parser_local_add_token(parser, &parser->previous);
-                    yp_forwarding_parameter_node_t *param = yp_forwarding_parameter_node_create(parser, &parser->previous);
-                    yp_parameters_node_keyword_rest_set(params, (yp_node_t *)param);
-                } else {
-                    update_parameter_state(parser, &parser->current, &order);
-                    parser_lex(parser);
-                }
-                break;
-            }
-            case YP_TOKEN_CLASS_VARIABLE:
-            case YP_TOKEN_IDENTIFIER:
-            case YP_TOKEN_CONSTANT:
-            case YP_TOKEN_INSTANCE_VARIABLE:
-            case YP_TOKEN_GLOBAL_VARIABLE: {
-                parser_lex(parser);
-                switch (parser->previous.type) {
-                    case YP_TOKEN_CONSTANT:
-                        yp_diagnostic_list_append(&parser->error_list, parser->previous.start, parser->previous.end, "Formal argument cannot be a constant");
-                        break;
-                    case YP_TOKEN_INSTANCE_VARIABLE:
-                        yp_diagnostic_list_append(&parser->error_list, parser->previous.start, parser->previous.end, "Formal argument cannot be an instance variable");
-                        break;
-                    case YP_TOKEN_GLOBAL_VARIABLE:
-                        yp_diagnostic_list_append(&parser->error_list, parser->previous.start, parser->previous.end, "Formal argument cannot be a global variable");
-                        break;
-                    case YP_TOKEN_CLASS_VARIABLE:
-                        yp_diagnostic_list_append(&parser->error_list, parser->previous.start, parser->previous.end, "Formal argument cannot be a class variable");
-                        break;
-                    default: break;
-                }
-
-                if (parser->current.type == YP_TOKEN_EQUAL) {
-                    update_parameter_state(parser, &parser->current, &order);
-                } else {
-                    update_parameter_state(parser, &parser->previous, &order);
-                }
-
-                yp_token_t name = parser->previous;
-                yp_parser_parameter_name_check(parser, &name);
-                yp_parser_local_add_token(parser, &name);
-
-                if (accept(parser, YP_TOKEN_EQUAL)) {
-                    yp_token_t operator = parser->previous;
-                    context_push(parser, YP_CONTEXT_DEFAULT_PARAMS);
-                    yp_node_t *value = parse_expression(parser, binding_power, "Expected to find a default value for the parameter.");
-
-                    yp_optional_parameter_node_t *param = yp_optional_parameter_node_create(parser, &name, &operator, value);
-                    yp_parameters_node_optionals_append(params, param);
-                    context_pop(parser);
-
-                    // If parsing the value of the parameter resulted in error recovery,
-                    // then we can put a missing node in its place and stop parsing the
-                    // parameters entirely now.
-                    if (parser->recovering) {
-                        looping = false;
-                        break;
-                    }
-                } else if (order > YP_PARAMETERS_ORDER_AFTER_OPTIONAL) {
-                    yp_required_parameter_node_t *param = yp_required_parameter_node_create(parser, &name);
-                    yp_parameters_node_requireds_append(params, (yp_node_t *) param);
-                } else {
-                    yp_required_parameter_node_t *param = yp_required_parameter_node_create(parser, &name);
-                    yp_parameters_node_posts_append(params, (yp_node_t *) param);
-                }
-
-                break;
-            }
-            case YP_TOKEN_LABEL: {
-                if (!uses_parentheses) parser->in_keyword_arg = true;
-                update_parameter_state(parser, &parser->current, &order);
-                parser_lex(parser);
-
-                yp_token_t name = parser->previous;
-                yp_token_t local = name;
-                local.end -= 1;
-
-                yp_parser_parameter_name_check(parser, &local);
-                yp_parser_local_add_token(parser, &local);
-
-                switch (parser->current.type) {
-                    case YP_TOKEN_COMMA:
-                    case YP_TOKEN_PARENTHESIS_RIGHT:
-                    case YP_TOKEN_PIPE: {
-                        yp_node_t *param = (yp_node_t *) yp_keyword_parameter_node_create(parser, &name, NULL);
-                        yp_parameters_node_keywords_append(params, param);
-                        break;
-                    }
-                    case YP_TOKEN_SEMICOLON:
-                    case YP_TOKEN_NEWLINE: {
-                        if (uses_parentheses) {
-                            looping = false;
-                            break;
-                        }
-
-                        yp_node_t *param = (yp_node_t *) yp_keyword_parameter_node_create(parser, &name, NULL);
-                        yp_parameters_node_keywords_append(params, param);
-                        break;
-                    }
-                    default: {
-                        yp_node_t *value = NULL;
-                        if (token_begins_expression_p(parser->current.type)) {
-                            context_push(parser, YP_CONTEXT_DEFAULT_PARAMS);
-                            value = parse_expression(parser, binding_power, "Expected to find a default value for the keyword parameter.");
-                            context_pop(parser);
-                        }
-
-                        yp_node_t *param = (yp_node_t *) yp_keyword_parameter_node_create(parser, &name, value);
-                        yp_parameters_node_keywords_append(params, param);
-
-                        // If parsing the value of the parameter resulted in error recovery,
-                        // then we can put a missing node in its place and stop parsing the
-                        // parameters entirely now.
-                        if (parser->recovering) {
-                            looping = false;
-                            break;
-                        }
-                    }
-                }
-
-                parser->in_keyword_arg = false;
-                break;
-            }
-            case YP_TOKEN_USTAR:
-            case YP_TOKEN_STAR: {
-                update_parameter_state(parser, &parser->current, &order);
-                parser_lex(parser);
-
-                yp_token_t operator = parser->previous;
-                yp_token_t name;
-
-                if (accept(parser, YP_TOKEN_IDENTIFIER)) {
-                    name = parser->previous;
-                    yp_parser_parameter_name_check(parser, &name);
-                    yp_parser_local_add_token(parser, &name);
-                } else {
-                    name = not_provided(parser);
-                    yp_parser_local_add_token(parser, &operator);
-                }
-
-                yp_rest_parameter_node_t *param = yp_rest_parameter_node_create(parser, &operator, &name);
-                if (params->rest == NULL) {
-                    yp_parameters_node_rest_set(params, param);
-                } else {
-                    yp_diagnostic_list_append(&parser->error_list, param->base.location.start, param->base.location.end, "Unexpected multiple splat parameters.");
-                    yp_parameters_node_posts_append(params, (yp_node_t *) param);
-                }
-
-                break;
-            }
-            case YP_TOKEN_STAR_STAR:
-            case YP_TOKEN_USTAR_STAR: {
-                update_parameter_state(parser, &parser->current, &order);
-                parser_lex(parser);
-
-                yp_token_t operator = parser->previous;
-                yp_node_t *param;
-
-                if (accept(parser, YP_TOKEN_KEYWORD_NIL)) {
-                    param = (yp_node_t *) yp_no_keywords_parameter_node_create(parser, &operator, &parser->previous);
-                } else {
-                    yp_token_t name;
-
-                    if (accept(parser, YP_TOKEN_IDENTIFIER)) {
-                        name = parser->previous;
-                        yp_parser_parameter_name_check(parser, &name);
-                        yp_parser_local_add_token(parser, &name);
-                    } else {
-                        name = not_provided(parser);
-                        yp_parser_local_add_token(parser, &operator);
-                    }
-
-                    param = (yp_node_t *) yp_keyword_rest_parameter_node_create(parser, &operator, &name);
-                }
-
-                if (params->keyword_rest == NULL) {
-                    yp_parameters_node_keyword_rest_set(params, param);
-                } else {
-                    yp_diagnostic_list_append(&parser->error_list, param->location.start, param->location.end, "Unexpected multiple double splat parameters.");
-                    yp_parameters_node_posts_append(params, param);
-                }
-
-                break;
-            }
-            default:
-                if (parser->previous.type == YP_TOKEN_COMMA) {
-                    if (allows_trailing_comma) {
-                        // If we get here, then we have a trailing comma in a block
-                        // parameter list. We need to create an anonymous rest parameter to
-                        // represent it.
-                        yp_token_t name = not_provided(parser);
-                        yp_rest_parameter_node_t *param = yp_rest_parameter_node_create(parser, &parser->previous, &name);
-
-                        if (params->rest == NULL) {
-                            yp_parameters_node_rest_set(params, param);
-                        } else {
-                            yp_diagnostic_list_append(&parser->error_list, param->base.location.start, param->base.location.end, "Unexpected multiple splat parameters.");
-                            yp_parameters_node_posts_append(params, (yp_node_t *) param);
-                        }
-                    } else {
-                        yp_diagnostic_list_append(&parser->error_list, parser->previous.start, parser->previous.end, "Unexpected ','.");
-                    }
-                }
-
-                looping = false;
-                break;
-        }
-
-        if (looping && uses_parentheses) {
-            accept(parser, YP_TOKEN_NEWLINE);
-        }
-    } while (looping && accept(parser, YP_TOKEN_COMMA));
-
-    yp_do_loop_stack_pop(parser);
-
-    // If we don't have any parameters, return `NULL` instead of an empty `ParametersNode`.
-    if (params->base.location.start == params->base.location.end) {
-        yp_node_destroy(parser, (yp_node_t *) params);
-        return NULL;
-    }
-
-    return params;
-}
-
-// Parse any number of rescue clauses. This will form a linked list of if
-// nodes pointing to each other from the top.
-static inline void
-parse_rescues(yp_parser_t *parser, yp_begin_node_t *parent_node) {
-    yp_rescue_node_t *current = NULL;
-
-    while (accept(parser, YP_TOKEN_KEYWORD_RESCUE)) {
-        yp_rescue_node_t *rescue = yp_rescue_node_create(parser, &parser->previous);
-
-        switch (parser->current.type) {
-            case YP_TOKEN_EQUAL_GREATER: {
-                // Here we have an immediate => after the rescue keyword, in which case
-                // we're going to have an empty list of exceptions to rescue (which
-                // implies StandardError).
-                parser_lex(parser);
-                yp_rescue_node_operator_set(rescue, &parser->previous);
-
-                yp_node_t *reference = parse_expression(parser, YP_BINDING_POWER_INDEX, "Expected an exception variable after `=>` in rescue statement.");
-                reference = parse_target(parser, reference);
-
-                yp_rescue_node_reference_set(rescue, reference);
-                break;
-            }
-            case YP_TOKEN_NEWLINE:
-            case YP_TOKEN_SEMICOLON:
-            case YP_TOKEN_KEYWORD_THEN:
-                // Here we have a terminator for the rescue keyword, in which case we're
-                // going to just continue on.
-                break;
-            default: {
-                if (token_begins_expression_p(parser->current.type) || match_type_p(parser, YP_TOKEN_USTAR)) {
-                    // Here we have something that could be an exception expression, so
-                    // we'll attempt to parse it here and any others delimited by commas.
-
-                    do {
-                        yp_node_t *expression = parse_starred_expression(parser, YP_BINDING_POWER_DEFINED, "Expected to find a rescued expression.");
-                        yp_rescue_node_exceptions_append(rescue, expression);
-
-                        // If we hit a newline, then this is the end of the rescue expression. We
-                        // can continue on to parse the statements.
-                        if (match_any_type_p(parser, 3, YP_TOKEN_NEWLINE, YP_TOKEN_SEMICOLON, YP_TOKEN_KEYWORD_THEN)) break;
-
-                        // If we hit a `=>` then we're going to parse the exception variable. Once
-                        // we've done that, we'll break out of the loop and parse the statements.
-                        if (accept(parser, YP_TOKEN_EQUAL_GREATER)) {
-                            yp_rescue_node_operator_set(rescue, &parser->previous);
-
-                            yp_node_t *reference = parse_expression(parser, YP_BINDING_POWER_INDEX, "Expected an exception variable after `=>` in rescue statement.");
-                            reference = parse_target(parser, reference);
-
-                            yp_rescue_node_reference_set(rescue, reference);
-                            break;
-                        }
-                    } while (accept(parser, YP_TOKEN_COMMA));
-                }
-            }
-        }
-
-        if (accept_any(parser, 2, YP_TOKEN_NEWLINE, YP_TOKEN_SEMICOLON)) {
-            accept(parser, YP_TOKEN_KEYWORD_THEN);
-        } else {
-            expect(parser, YP_TOKEN_KEYWORD_THEN, "Expected a terminator after rescue clause.");
-        }
-
-        if (!match_any_type_p(parser, 3, YP_TOKEN_KEYWORD_ELSE, YP_TOKEN_KEYWORD_ENSURE, YP_TOKEN_KEYWORD_END)) {
-            yp_accepts_block_stack_push(parser, true);
-            yp_statements_node_t *statements = parse_statements(parser, YP_CONTEXT_RESCUE);
-            if (statements) {
-                yp_rescue_node_statements_set(rescue, statements);
-            }
-            yp_accepts_block_stack_pop(parser);
-            accept_any(parser, 2, YP_TOKEN_NEWLINE, YP_TOKEN_SEMICOLON);
-        }
-
-        if (current == NULL) {
-            yp_begin_node_rescue_clause_set(parent_node, rescue);
-        } else {
-            yp_rescue_node_consequent_set(current, rescue);
-        }
-
-        current = rescue;
-    }
-
-    // The end node locations on rescue nodes will not be set correctly
-    // since we won't know the end until we've found all consequent
-    // clauses. This sets the end location on all rescues once we know it
-    if (current) {
-        const uint8_t *end_to_set = current->base.location.end;
-        current = parent_node->rescue_clause;
-        while (current) {
-            current->base.location.end = end_to_set;
-            current = current->consequent;
-        }
-    }
-
-    if (accept(parser, YP_TOKEN_KEYWORD_ELSE)) {
-        yp_token_t else_keyword = parser->previous;
-        accept_any(parser, 2, YP_TOKEN_NEWLINE, YP_TOKEN_SEMICOLON);
-
-        yp_statements_node_t *else_statements = NULL;
-        if (!match_any_type_p(parser, 2, YP_TOKEN_KEYWORD_END, YP_TOKEN_KEYWORD_ENSURE)) {
-            yp_accepts_block_stack_push(parser, true);
-            else_statements = parse_statements(parser, YP_CONTEXT_RESCUE_ELSE);
-            yp_accepts_block_stack_pop(parser);
-            accept_any(parser, 2, YP_TOKEN_NEWLINE, YP_TOKEN_SEMICOLON);
-        }
-
-        yp_else_node_t *else_clause = yp_else_node_create(parser, &else_keyword, else_statements, &parser->current);
-        yp_begin_node_else_clause_set(parent_node, else_clause);
-    }
-
-    if (accept(parser, YP_TOKEN_KEYWORD_ENSURE)) {
-        yp_token_t ensure_keyword = parser->previous;
-        accept_any(parser, 2, YP_TOKEN_NEWLINE, YP_TOKEN_SEMICOLON);
-
-        yp_statements_node_t *ensure_statements = NULL;
-        if (!match_type_p(parser, YP_TOKEN_KEYWORD_END)) {
-            yp_accepts_block_stack_push(parser, true);
-            ensure_statements = parse_statements(parser, YP_CONTEXT_ENSURE);
-            yp_accepts_block_stack_pop(parser);
-            accept_any(parser, 2, YP_TOKEN_NEWLINE, YP_TOKEN_SEMICOLON);
-        }
-
-        yp_ensure_node_t *ensure_clause = yp_ensure_node_create(parser, &ensure_keyword, ensure_statements, &parser->current);
-        yp_begin_node_ensure_clause_set(parent_node, ensure_clause);
-    }
-
-    if (parser->current.type == YP_TOKEN_KEYWORD_END) {
-        yp_begin_node_end_keyword_set(parent_node, &parser->current);
-    } else {
-        yp_token_t end_keyword = (yp_token_t) { .type = YP_TOKEN_MISSING, .start = parser->previous.end, .end = parser->previous.end };
-        yp_begin_node_end_keyword_set(parent_node, &end_keyword);
-    }
-}
-
-static inline yp_begin_node_t *
-parse_rescues_as_begin(yp_parser_t *parser, yp_statements_node_t *statements) {
-    yp_token_t no_begin_token = not_provided(parser);
-    yp_begin_node_t *begin_node = yp_begin_node_create(parser, &no_begin_token, statements);
-    parse_rescues(parser, begin_node);
-
-    // All nodes within a begin node are optional, so we look
-    // for the earliest possible node that we can use to set
-    // the BeginNode's start location
-    const uint8_t *start = begin_node->base.location.start;
-    if (begin_node->statements) {
-        start = begin_node->statements->base.location.start;
-    } else if (begin_node->rescue_clause) {
-        start = begin_node->rescue_clause->base.location.start;
-    } else if (begin_node->else_clause) {
-        start = begin_node->else_clause->base.location.start;
-    } else if (begin_node->ensure_clause) {
-        start = begin_node->ensure_clause->base.location.start;
-    }
-
-    begin_node->base.location.start = start;
-    return begin_node;
-}
-
-// Parse a list of parameters and local on a block definition.
-static yp_block_parameters_node_t *
-parse_block_parameters(
-    yp_parser_t *parser,
-    bool allows_trailing_comma,
-    const yp_token_t *opening,
-    bool is_lambda_literal
-) {
-    yp_parameters_node_t *parameters = NULL;
-    if (!match_type_p(parser, YP_TOKEN_SEMICOLON)) {
-        parameters = parse_parameters(
-            parser,
-            is_lambda_literal ? YP_BINDING_POWER_DEFINED : YP_BINDING_POWER_INDEX,
-            false,
-            allows_trailing_comma,
-            false
-        );
-    }
-
-    yp_block_parameters_node_t *block_parameters = yp_block_parameters_node_create(parser, parameters, opening);
-    if (accept(parser, YP_TOKEN_SEMICOLON)) {
-        do {
-            expect(parser, YP_TOKEN_IDENTIFIER, "Expected a local variable name.");
-            yp_parser_local_add_token(parser, &parser->previous);
-
-            yp_block_local_variable_node_t *local = yp_block_local_variable_node_create(parser, &parser->previous);
-            yp_block_parameters_node_append_local(block_parameters, local);
-        } while (accept(parser, YP_TOKEN_COMMA));
-    }
-
-    return block_parameters;
-}
-
-// Parse a block.
-static yp_block_node_t *
-parse_block(yp_parser_t *parser) {
-    yp_token_t opening = parser->previous;
-    accept(parser, YP_TOKEN_NEWLINE);
-
-    yp_accepts_block_stack_push(parser, true);
-    yp_parser_scope_push(parser, false);
-    yp_block_parameters_node_t *parameters = NULL;
-
-    if (accept(parser, YP_TOKEN_PIPE)) {
-        yp_token_t block_parameters_opening = parser->previous;
-
-        if (match_type_p(parser, YP_TOKEN_PIPE)) {
-            parameters = yp_block_parameters_node_create(parser, NULL, &block_parameters_opening);
-            parser->command_start = true;
-            parser_lex(parser);
-        } else {
-            parameters = parse_block_parameters(parser, true, &block_parameters_opening, false);
-            accept(parser, YP_TOKEN_NEWLINE);
-            parser->command_start = true;
-            expect(parser, YP_TOKEN_PIPE, "Expected block parameters to end with '|'.");
-        }
-
-        yp_block_parameters_node_closing_set(parameters, &parser->previous);
-    }
-
-    accept(parser, YP_TOKEN_NEWLINE);
-    yp_node_t *statements = NULL;
-
-    if (opening.type == YP_TOKEN_BRACE_LEFT) {
-        if (!match_type_p(parser, YP_TOKEN_BRACE_RIGHT)) {
-            statements = (yp_node_t *) parse_statements(parser, YP_CONTEXT_BLOCK_BRACES);
-        }
-
-        expect(parser, YP_TOKEN_BRACE_RIGHT, "Expected block beginning with '{' to end with '}'.");
-    } else {
-        if (!match_type_p(parser, YP_TOKEN_KEYWORD_END)) {
-            if (!match_any_type_p(parser, 3, YP_TOKEN_KEYWORD_RESCUE, YP_TOKEN_KEYWORD_ELSE, YP_TOKEN_KEYWORD_ENSURE)) {
-                yp_accepts_block_stack_push(parser, true);
-                statements = (yp_node_t *) parse_statements(parser, YP_CONTEXT_BLOCK_KEYWORDS);
-                yp_accepts_block_stack_pop(parser);
-            }
-
-            if (match_any_type_p(parser, 2, YP_TOKEN_KEYWORD_RESCUE, YP_TOKEN_KEYWORD_ENSURE)) {
-                assert(statements == NULL || YP_NODE_TYPE_P(statements, YP_STATEMENTS_NODE));
-                statements = (yp_node_t *) parse_rescues_as_begin(parser, (yp_statements_node_t *) statements);
-            }
-        }
-
-        expect(parser, YP_TOKEN_KEYWORD_END, "Expected block beginning with 'do' to end with 'end'.");
-    }
-
-    yp_constant_id_list_t locals = parser->current_scope->locals;
-    yp_parser_scope_pop(parser);
-    yp_accepts_block_stack_pop(parser);
-    return yp_block_node_create(parser, &locals, &opening, parameters, statements, &parser->previous);
-}
-
-// Parse a list of arguments and their surrounding parentheses if they are
-// present. It returns true if it found any pieces of arguments (parentheses,
-// arguments, or blocks).
-static bool
-parse_arguments_list(yp_parser_t *parser, yp_arguments_t *arguments, bool accepts_block) {
-    bool found = false;
-
-    if (accept(parser, YP_TOKEN_PARENTHESIS_LEFT)) {
-        found |= true;
-        arguments->opening_loc = ((yp_location_t) { .start = parser->previous.start, .end = parser->previous.end });
-
-        if (accept(parser, YP_TOKEN_PARENTHESIS_RIGHT)) {
-            arguments->closing_loc = ((yp_location_t) { .start = parser->previous.start, .end = parser->previous.end });
-        } else {
-            arguments->arguments = yp_arguments_node_create(parser);
-
-            yp_accepts_block_stack_push(parser, true);
-            parse_arguments(parser, arguments, true, YP_TOKEN_PARENTHESIS_RIGHT);
-            expect(parser, YP_TOKEN_PARENTHESIS_RIGHT, "Expected a ')' to close the argument list.");
-            yp_accepts_block_stack_pop(parser);
-
-            arguments->closing_loc = ((yp_location_t) { .start = parser->previous.start, .end = parser->previous.end });
-        }
-    } else if ((token_begins_expression_p(parser->current.type) || match_any_type_p(parser, 3, YP_TOKEN_USTAR, YP_TOKEN_USTAR_STAR, YP_TOKEN_UAMPERSAND)) && !match_type_p(parser, YP_TOKEN_BRACE_LEFT)) {
-        found |= true;
-        yp_accepts_block_stack_push(parser, false);
-
-        // If we get here, then the subsequent token cannot be used as an infix
-        // operator. In this case we assume the subsequent token is part of an
-        // argument to this method call.
-        arguments->arguments = yp_arguments_node_create(parser);
-        parse_arguments(parser, arguments, true, YP_TOKEN_EOF);
-
-        yp_accepts_block_stack_pop(parser);
-    }
-
-    // If we're at the end of the arguments, we can now check if there is a block
-    // node that starts with a {. If there is, then we can parse it and add it to
-    // the arguments.
-    if (accepts_block) {
-        if (accept(parser, YP_TOKEN_BRACE_LEFT)) {
-            found |= true;
-            arguments->block = parse_block(parser);
-        } else if (yp_accepts_block_stack_p(parser) && accept(parser, YP_TOKEN_KEYWORD_DO)) {
-            found |= true;
-            arguments->block = parse_block(parser);
-        }
-    }
-
-    yp_arguments_validate(parser, arguments);
-    return found;
-}
-
-static inline yp_node_t *
-parse_conditional(yp_parser_t *parser, yp_context_t context) {
-    yp_token_t keyword = parser->previous;
-
-    context_push(parser, YP_CONTEXT_PREDICATE);
-    yp_node_t *predicate = parse_expression(parser, YP_BINDING_POWER_MODIFIER, "Expected to find a predicate for the conditional.");
-
-    // Predicates are closed by a term, a "then", or a term and then a "then".
-    accept_any(parser, 2, YP_TOKEN_NEWLINE, YP_TOKEN_SEMICOLON);
-    accept(parser, YP_TOKEN_KEYWORD_THEN);
-
-    context_pop(parser);
-    yp_statements_node_t *statements = NULL;
-
-    if (!match_any_type_p(parser, 3, YP_TOKEN_KEYWORD_ELSIF, YP_TOKEN_KEYWORD_ELSE, YP_TOKEN_KEYWORD_END)) {
-        yp_accepts_block_stack_push(parser, true);
-        statements = parse_statements(parser, context);
-        yp_accepts_block_stack_pop(parser);
-        accept_any(parser, 2, YP_TOKEN_NEWLINE, YP_TOKEN_SEMICOLON);
-    }
-
-    yp_token_t end_keyword = not_provided(parser);
-    yp_node_t *parent = NULL;
-
-    switch (context) {
-        case YP_CONTEXT_IF:
-            parent = (yp_node_t *) yp_if_node_create(parser, &keyword, predicate, statements, NULL, &end_keyword);
-            break;
-        case YP_CONTEXT_UNLESS:
-            parent = (yp_node_t *) yp_unless_node_create(parser, &keyword, predicate, statements);
-            break;
-        default:
-            assert(false && "unreachable");
-            break;
-    }
-
-    yp_node_t *current = parent;
-
-    // Parse any number of elsif clauses. This will form a linked list of if
-    // nodes pointing to each other from the top.
-    if (context == YP_CONTEXT_IF) {
-        while (accept(parser, YP_TOKEN_KEYWORD_ELSIF)) {
-            yp_token_t elsif_keyword = parser->previous;
-            yp_node_t *predicate = parse_expression(parser, YP_BINDING_POWER_MODIFIER, "Expected to find a predicate for the elsif clause.");
-
-            // Predicates are closed by a term, a "then", or a term and then a "then".
-            accept_any(parser, 2, YP_TOKEN_NEWLINE, YP_TOKEN_SEMICOLON);
-            accept(parser, YP_TOKEN_KEYWORD_THEN);
-
-            yp_accepts_block_stack_push(parser, true);
-            yp_statements_node_t *statements = parse_statements(parser, YP_CONTEXT_ELSIF);
-            yp_accepts_block_stack_pop(parser);
-
-            accept_any(parser, 2, YP_TOKEN_NEWLINE, YP_TOKEN_SEMICOLON);
-
-            yp_node_t *elsif = (yp_node_t *) yp_if_node_create(parser, &elsif_keyword, predicate, statements, NULL, &end_keyword);
-            ((yp_if_node_t *) current)->consequent = elsif;
-            current = elsif;
-        }
-    }
-
-    if (match_type_p(parser, YP_TOKEN_KEYWORD_ELSE)) {
-        parser_lex(parser);
-        yp_token_t else_keyword = parser->previous;
-
-        yp_accepts_block_stack_push(parser, true);
-        yp_statements_node_t *else_statements = parse_statements(parser, YP_CONTEXT_ELSE);
-        yp_accepts_block_stack_pop(parser);
-
-        accept_any(parser, 2, YP_TOKEN_NEWLINE, YP_TOKEN_SEMICOLON);
-        expect(parser, YP_TOKEN_KEYWORD_END, "Expected `end` to close `else` clause.");
-
-        yp_else_node_t *else_node = yp_else_node_create(parser, &else_keyword, else_statements, &parser->previous);
-
-        switch (context) {
-            case YP_CONTEXT_IF:
-                ((yp_if_node_t *) current)->consequent = (yp_node_t *) else_node;
-                break;
-            case YP_CONTEXT_UNLESS:
-                ((yp_unless_node_t *) parent)->consequent = else_node;
-                break;
-            default:
-                assert(false && "unreachable");
-                break;
-        }
-    } else {
-        expect(parser, YP_TOKEN_KEYWORD_END, "Expected `end` to close conditional statement.");
-    }
-
-    // Set the appropriate end location for all of the nodes in the subtree.
-    switch (context) {
-        case YP_CONTEXT_IF: {
-            yp_node_t *current = parent;
-            bool recursing = true;
-
-            while (recursing) {
-                switch (YP_NODE_TYPE(current)) {
-                    case YP_IF_NODE:
-                        yp_if_node_end_keyword_loc_set((yp_if_node_t *) current, &parser->previous);
-                        current = ((yp_if_node_t *) current)->consequent;
-                        recursing = current != NULL;
-                        break;
-                    case YP_ELSE_NODE:
-                        yp_else_node_end_keyword_loc_set((yp_else_node_t *) current, &parser->previous);
-                        recursing = false;
-                        break;
-                    default: {
-                        recursing = false;
-                        break;
-                    }
-                }
-            }
-            break;
-        }
-        case YP_CONTEXT_UNLESS:
-            yp_unless_node_end_keyword_loc_set((yp_unless_node_t *) parent, &parser->previous);
-            break;
-        default:
-            assert(false && "unreachable");
-            break;
-    }
-
-    return parent;
-}
-
-// This macro allows you to define a case statement for all of the keywords.
-// It's meant to be used in a switch statement.
-#define YP_CASE_KEYWORD YP_TOKEN_KEYWORD___ENCODING__: case YP_TOKEN_KEYWORD___FILE__: case YP_TOKEN_KEYWORD___LINE__: \
-    case YP_TOKEN_KEYWORD_ALIAS: case YP_TOKEN_KEYWORD_AND: case YP_TOKEN_KEYWORD_BEGIN: case YP_TOKEN_KEYWORD_BEGIN_UPCASE: \
-    case YP_TOKEN_KEYWORD_BREAK: case YP_TOKEN_KEYWORD_CASE: case YP_TOKEN_KEYWORD_CLASS: case YP_TOKEN_KEYWORD_DEF: \
-    case YP_TOKEN_KEYWORD_DEFINED: case YP_TOKEN_KEYWORD_DO: case YP_TOKEN_KEYWORD_DO_LOOP: case YP_TOKEN_KEYWORD_ELSE: \
-    case YP_TOKEN_KEYWORD_ELSIF: case YP_TOKEN_KEYWORD_END: case YP_TOKEN_KEYWORD_END_UPCASE: case YP_TOKEN_KEYWORD_ENSURE: \
-    case YP_TOKEN_KEYWORD_FALSE: case YP_TOKEN_KEYWORD_FOR: case YP_TOKEN_KEYWORD_IF: case YP_TOKEN_KEYWORD_IN: \
-    case YP_TOKEN_KEYWORD_MODULE: case YP_TOKEN_KEYWORD_NEXT: case YP_TOKEN_KEYWORD_NIL: case YP_TOKEN_KEYWORD_NOT: \
-    case YP_TOKEN_KEYWORD_OR: case YP_TOKEN_KEYWORD_REDO: case YP_TOKEN_KEYWORD_RESCUE: case YP_TOKEN_KEYWORD_RETRY: \
-    case YP_TOKEN_KEYWORD_RETURN: case YP_TOKEN_KEYWORD_SELF: case YP_TOKEN_KEYWORD_SUPER: case YP_TOKEN_KEYWORD_THEN: \
-    case YP_TOKEN_KEYWORD_TRUE: case YP_TOKEN_KEYWORD_UNDEF: case YP_TOKEN_KEYWORD_UNLESS: case YP_TOKEN_KEYWORD_UNTIL: \
-    case YP_TOKEN_KEYWORD_WHEN: case YP_TOKEN_KEYWORD_WHILE: case YP_TOKEN_KEYWORD_YIELD
-
-
-// This macro allows you to define a case statement for all of the operators.
-// It's meant to be used in a switch statement.
-#define YP_CASE_OPERATOR YP_TOKEN_AMPERSAND: case YP_TOKEN_BACKTICK: case YP_TOKEN_BANG_EQUAL: \
-    case YP_TOKEN_BANG_TILDE: case YP_TOKEN_BANG: case YP_TOKEN_BRACKET_LEFT_RIGHT_EQUAL: \
-    case YP_TOKEN_BRACKET_LEFT_RIGHT: case YP_TOKEN_CARET: case YP_TOKEN_EQUAL_EQUAL_EQUAL: case YP_TOKEN_EQUAL_EQUAL: \
-    case YP_TOKEN_EQUAL_TILDE: case YP_TOKEN_GREATER_EQUAL: case YP_TOKEN_GREATER_GREATER: case YP_TOKEN_GREATER: \
-    case YP_TOKEN_LESS_EQUAL_GREATER: case YP_TOKEN_LESS_EQUAL: case YP_TOKEN_LESS_LESS: case YP_TOKEN_LESS: \
-    case YP_TOKEN_MINUS: case YP_TOKEN_PERCENT: case YP_TOKEN_PIPE: case YP_TOKEN_PLUS: case YP_TOKEN_SLASH: \
-    case YP_TOKEN_STAR_STAR: case YP_TOKEN_STAR: case YP_TOKEN_TILDE: case YP_TOKEN_UAMPERSAND: case YP_TOKEN_UMINUS: \
-    case YP_TOKEN_UMINUS_NUM: case YP_TOKEN_UPLUS: case YP_TOKEN_USTAR: case YP_TOKEN_USTAR_STAR
-
-// This macro allows you to define a case statement for all of the token types
-// that represent the beginning of nodes that are "primitives" in a pattern
-// matching expression.
-#define YP_CASE_PRIMITIVE YP_TOKEN_INTEGER: case YP_TOKEN_INTEGER_IMAGINARY: case YP_TOKEN_INTEGER_RATIONAL: \
-    case YP_TOKEN_INTEGER_RATIONAL_IMAGINARY: case YP_TOKEN_FLOAT: case YP_TOKEN_FLOAT_IMAGINARY: \
-    case YP_TOKEN_FLOAT_RATIONAL: case YP_TOKEN_FLOAT_RATIONAL_IMAGINARY: case YP_TOKEN_SYMBOL_BEGIN: \
-    case YP_TOKEN_REGEXP_BEGIN: case YP_TOKEN_BACKTICK: case YP_TOKEN_PERCENT_LOWER_X: case YP_TOKEN_PERCENT_LOWER_I: \
-    case YP_TOKEN_PERCENT_LOWER_W: case YP_TOKEN_PERCENT_UPPER_I: case YP_TOKEN_PERCENT_UPPER_W: \
-    case YP_TOKEN_STRING_BEGIN: case YP_TOKEN_KEYWORD_NIL: case YP_TOKEN_KEYWORD_SELF: case YP_TOKEN_KEYWORD_TRUE: \
-    case YP_TOKEN_KEYWORD_FALSE: case YP_TOKEN_KEYWORD___FILE__: case YP_TOKEN_KEYWORD___LINE__: \
-    case YP_TOKEN_KEYWORD___ENCODING__: case YP_TOKEN_MINUS_GREATER: case YP_TOKEN_HEREDOC_START: \
-    case YP_TOKEN_UMINUS_NUM: case YP_TOKEN_CHARACTER_LITERAL
-
-// This macro allows you to define a case statement for all of the token types
-// that could begin a parameter.
-#define YP_CASE_PARAMETER YP_TOKEN_UAMPERSAND: case YP_TOKEN_AMPERSAND: case YP_TOKEN_UDOT_DOT_DOT: \
-    case YP_TOKEN_IDENTIFIER: case YP_TOKEN_LABEL: case YP_TOKEN_USTAR: case YP_TOKEN_STAR: case YP_TOKEN_STAR_STAR: \
-    case YP_TOKEN_USTAR_STAR: case YP_TOKEN_CONSTANT: case YP_TOKEN_INSTANCE_VARIABLE: case YP_TOKEN_GLOBAL_VARIABLE: \
-    case YP_TOKEN_CLASS_VARIABLE
-
-// This macro allows you to define a case statement for all of the nodes that
-// can be transformed into write targets.
-#define YP_CASE_WRITABLE YP_CLASS_VARIABLE_READ_NODE: case YP_CONSTANT_PATH_NODE: \
-    case YP_CONSTANT_READ_NODE: case YP_GLOBAL_VARIABLE_READ_NODE: case YP_LOCAL_VARIABLE_READ_NODE: \
-    case YP_INSTANCE_VARIABLE_READ_NODE: case YP_MULTI_WRITE_NODE: case YP_BACK_REFERENCE_READ_NODE: \
-    case YP_NUMBERED_REFERENCE_READ_NODE
-
-// Parse a node that is part of a string. If the subsequent tokens cannot be
-// parsed as a string part, then NULL is returned.
-static yp_node_t *
-parse_string_part(yp_parser_t *parser) {
-    switch (parser->current.type) {
-        // Here the lexer has returned to us plain string content. In this case
-        // we'll create a string node that has no opening or closing and return that
-        // as the part. These kinds of parts look like:
-        //
-        //     "aaa #{bbb} #@ccc ddd"
-        //      ^^^^      ^     ^^^^
-        case YP_TOKEN_STRING_CONTENT: {
-            yp_unescape_type_t unescape_type = YP_UNESCAPE_ALL;
-
-            if (parser->lex_modes.current->mode == YP_LEX_HEREDOC) {
-                if (parser->lex_modes.current->as.heredoc.indent == YP_HEREDOC_INDENT_TILDE) {
-                    // If we're in a tilde heredoc, we want to unescape it later
-                    // because we don't want unescaped newlines to disappear
-                    // before we handle them in the dedent.
-                    unescape_type = YP_UNESCAPE_NONE;
-                } else if (parser->lex_modes.current->as.heredoc.quote == YP_HEREDOC_QUOTE_SINGLE) {
-                    unescape_type = YP_UNESCAPE_MINIMAL;
-                }
-            }
-
-            parser_lex(parser);
-
-            yp_token_t opening = not_provided(parser);
-            yp_token_t closing = not_provided(parser);
-
-            return (yp_node_t *) yp_string_node_create_and_unescape(parser, &opening, &parser->previous, &closing, unescape_type);
-        }
-        // Here the lexer has returned the beginning of an embedded expression. In
-        // that case we'll parse the inner statements and return that as the part.
-        // These kinds of parts look like:
-        //
-        //     "aaa #{bbb} #@ccc ddd"
-        //          ^^^^^^
-        case YP_TOKEN_EMBEXPR_BEGIN: {
-            yp_lex_state_t state = parser->lex_state;
-            int brace_nesting = parser->brace_nesting;
-
-            parser->brace_nesting = 0;
-            lex_state_set(parser, YP_LEX_STATE_BEG);
-            parser_lex(parser);
-
-            yp_token_t opening = parser->previous;
-            yp_statements_node_t *statements = NULL;
-
-            if (!match_type_p(parser, YP_TOKEN_EMBEXPR_END)) {
-                yp_accepts_block_stack_push(parser, true);
-                statements = parse_statements(parser, YP_CONTEXT_EMBEXPR);
-                yp_accepts_block_stack_pop(parser);
-            }
-
-            parser->brace_nesting = brace_nesting;
-            lex_state_set(parser, state);
-
-            expect(parser, YP_TOKEN_EMBEXPR_END, "Expected a closing delimiter for an embedded expression.");
-            yp_token_t closing = parser->previous;
-
-            return (yp_node_t *) yp_embedded_statements_node_create(parser, &opening, statements, &closing);
-        }
-
-        // Here the lexer has returned the beginning of an embedded variable.
-        // In that case we'll parse the variable and create an appropriate node
-        // for it and then return that node. These kinds of parts look like:
-        //
-        //     "aaa #{bbb} #@ccc ddd"
-        //                 ^^^^^
-        case YP_TOKEN_EMBVAR: {
-            lex_state_set(parser, YP_LEX_STATE_BEG);
-            parser_lex(parser);
-
-            yp_token_t operator = parser->previous;
-            yp_node_t *variable;
-
-            switch (parser->current.type) {
-                // In this case a back reference is being interpolated. We'll
-                // create a global variable read node.
-                case YP_TOKEN_BACK_REFERENCE:
-                    parser_lex(parser);
-                    variable = (yp_node_t *) yp_back_reference_read_node_create(parser, &parser->previous);
-                    break;
-                // In this case an nth reference is being interpolated. We'll
-                // create a global variable read node.
-                case YP_TOKEN_NUMBERED_REFERENCE:
-                    parser_lex(parser);
-                    variable = (yp_node_t *) yp_numbered_reference_read_node_create(parser, &parser->previous);
-                    break;
-                // In this case a global variable is being interpolated. We'll
-                // create a global variable read node.
-                case YP_TOKEN_GLOBAL_VARIABLE:
-                    parser_lex(parser);
-                    variable = (yp_node_t *) yp_global_variable_read_node_create(parser, &parser->previous);
-                    break;
-                // In this case an instance variable is being interpolated.
-                // We'll create an instance variable read node.
-                case YP_TOKEN_INSTANCE_VARIABLE:
-                    parser_lex(parser);
-                    variable = (yp_node_t *) yp_instance_variable_read_node_create(parser, &parser->previous);
-                    break;
-                // In this case a class variable is being interpolated. We'll
-                // create a class variable read node.
-                case YP_TOKEN_CLASS_VARIABLE:
-                    parser_lex(parser);
-                    variable = (yp_node_t *) yp_class_variable_read_node_create(parser, &parser->previous);
-                    break;
-                // We can hit here if we got an invalid token. In that case
-                // we'll not attempt to lex this token and instead just return a
-                // missing node.
-                default:
-                    expect(parser, YP_TOKEN_IDENTIFIER, "Expected a valid embedded variable.");
-                    variable = (yp_node_t *) yp_missing_node_create(parser, parser->current.start, parser->current.end);
-                    break;
-            }
-
-            return (yp_node_t *) yp_embedded_variable_node_create(parser, &operator, variable);
-        }
-        default:
-            parser_lex(parser);
-            yp_diagnostic_list_append(&parser->error_list, parser->previous.start, parser->previous.end, "Could not understand string part");
-            return NULL;
-    }
-}
-
-static yp_node_t *
-parse_symbol(yp_parser_t *parser, yp_lex_mode_t *lex_mode, yp_lex_state_t next_state) {
-    yp_token_t opening = parser->previous;
-
-    if (lex_mode->mode != YP_LEX_STRING) {
-        if (next_state != YP_LEX_STATE_NONE) lex_state_set(parser, next_state);
-        yp_token_t symbol;
-
-        switch (parser->current.type) {
-            case YP_TOKEN_IDENTIFIER:
-            case YP_TOKEN_CONSTANT:
-            case YP_TOKEN_INSTANCE_VARIABLE:
-            case YP_TOKEN_CLASS_VARIABLE:
-            case YP_TOKEN_GLOBAL_VARIABLE:
-            case YP_TOKEN_NUMBERED_REFERENCE:
-            case YP_TOKEN_BACK_REFERENCE:
-            case YP_CASE_KEYWORD:
-                parser_lex(parser);
-                symbol = parser->previous;
-                break;
-            case YP_CASE_OPERATOR:
-                lex_state_set(parser, next_state == YP_LEX_STATE_NONE ? YP_LEX_STATE_ENDFN : next_state);
-                parser_lex(parser);
-                symbol = parser->previous;
-                break;
-            default:
-                expect(parser, YP_TOKEN_IDENTIFIER, "Expected symbol.");
-                symbol = parser->previous;
-                break;
-        }
-
-        yp_token_t closing = not_provided(parser);
-        return (yp_node_t *) yp_symbol_node_create_and_unescape(parser, &opening, &symbol, &closing, YP_UNESCAPE_ALL);
-    }
-
-    if (lex_mode->as.string.interpolation) {
-        // If we have the end of the symbol, then we can return an empty symbol.
-        if (match_type_p(parser, YP_TOKEN_STRING_END)) {
-            if (next_state != YP_LEX_STATE_NONE) lex_state_set(parser, next_state);
-            parser_lex(parser);
-
-            yp_token_t content = not_provided(parser);
-            yp_token_t closing = parser->previous;
-            return (yp_node_t *) yp_symbol_node_create_and_unescape(parser, &opening, &content, &closing, YP_UNESCAPE_NONE);
-        }
-
-        // Now we can parse the first part of the symbol.
-        yp_node_t *part = parse_string_part(parser);
-
-        // If we got a string part, then it's possible that we could transform
-        // what looks like an interpolated symbol into a regular symbol.
-        if (part && YP_NODE_TYPE_P(part, YP_STRING_NODE) && match_any_type_p(parser, 2, YP_TOKEN_STRING_END, YP_TOKEN_EOF)) {
-            if (next_state != YP_LEX_STATE_NONE) lex_state_set(parser, next_state);
-            parser_lex(parser);
-
-            return (yp_node_t *) yp_string_node_to_symbol_node(parser, (yp_string_node_t *) part, &opening, &parser->previous);
-        }
-
-        // Create a node_list first. We'll use this to check if it should be an
-        // InterpolatedSymbolNode or a SymbolNode.
-        yp_node_list_t node_list = YP_EMPTY_NODE_LIST;
-        if (part) yp_node_list_append(&node_list, part);
-
-        while (!match_any_type_p(parser, 2, YP_TOKEN_STRING_END, YP_TOKEN_EOF)) {
-            if ((part = parse_string_part(parser)) != NULL) {
-                yp_node_list_append(&node_list, part);
-            }
-        }
-
-        if (next_state != YP_LEX_STATE_NONE) lex_state_set(parser, next_state);
-        expect(parser, YP_TOKEN_STRING_END, "Expected a closing delimiter for an interpolated symbol.");
-
-        return (yp_node_t *) yp_interpolated_symbol_node_create(parser, &opening, &node_list, &parser->previous);
-    }
-
-    yp_token_t content;
-    if (accept(parser, YP_TOKEN_STRING_CONTENT)) {
-        content = parser->previous;
-    } else {
-        content = (yp_token_t) { .type = YP_TOKEN_STRING_CONTENT, .start = parser->previous.end, .end = parser->previous.end };
-    }
-
-    if (next_state != YP_LEX_STATE_NONE) {
-        lex_state_set(parser, next_state);
-    }
-    expect(parser, YP_TOKEN_STRING_END, "Expected a closing delimiter for a dynamic symbol.");
-
-    return (yp_node_t *) yp_symbol_node_create_and_unescape(parser, &opening, &content, &parser->previous, YP_UNESCAPE_ALL);
-}
-
-// Parse an argument to undef which can either be a bare word, a
-// symbol, a constant, or an interpolated symbol.
-static inline yp_node_t *
-parse_undef_argument(yp_parser_t *parser) {
-    switch (parser->current.type) {
-        case YP_CASE_KEYWORD:
-        case YP_CASE_OPERATOR:
-        case YP_TOKEN_CONSTANT:
-        case YP_TOKEN_IDENTIFIER: {
-            parser_lex(parser);
-
-            yp_token_t opening = not_provided(parser);
-            yp_token_t closing = not_provided(parser);
-
-            return (yp_node_t *) yp_symbol_node_create_and_unescape(parser, &opening, &parser->previous, &closing, YP_UNESCAPE_ALL);
-        }
-        case YP_TOKEN_SYMBOL_BEGIN: {
-            yp_lex_mode_t lex_mode = *parser->lex_modes.current;
-            parser_lex(parser);
-
-            return parse_symbol(parser, &lex_mode, YP_LEX_STATE_NONE);
-        }
-        default:
-            yp_diagnostic_list_append(&parser->error_list, parser->current.start, parser->current.end, "Expected a bare word or symbol argument.");
-            return (yp_node_t *) yp_missing_node_create(parser, parser->current.start, parser->current.end);
-    }
-}
-
-// Parse an argument to alias which can either be a bare word, a symbol, an
-// interpolated symbol or a global variable. If this is the first argument, then
-// we need to set the lex state to YP_LEX_STATE_FNAME | YP_LEX_STATE_FITEM
-// between the first and second arguments.
-static inline yp_node_t *
-parse_alias_argument(yp_parser_t *parser, bool first) {
-    switch (parser->current.type) {
-        case YP_CASE_OPERATOR:
-        case YP_CASE_KEYWORD:
-        case YP_TOKEN_CONSTANT:
-        case YP_TOKEN_IDENTIFIER: {
-            if (first) {
-                lex_state_set(parser, YP_LEX_STATE_FNAME | YP_LEX_STATE_FITEM);
-            }
-
-            parser_lex(parser);
-            yp_token_t opening = not_provided(parser);
-            yp_token_t closing = not_provided(parser);
-
-            return (yp_node_t *) yp_symbol_node_create_and_unescape(parser, &opening, &parser->previous, &closing, YP_UNESCAPE_ALL);
-        }
-        case YP_TOKEN_SYMBOL_BEGIN: {
-            yp_lex_mode_t lex_mode = *parser->lex_modes.current;
-            parser_lex(parser);
-
-            return parse_symbol(parser, &lex_mode, first ? YP_LEX_STATE_FNAME | YP_LEX_STATE_FITEM : YP_LEX_STATE_NONE);
-        }
-        case YP_TOKEN_BACK_REFERENCE:
-            parser_lex(parser);
-            return (yp_node_t *) yp_back_reference_read_node_create(parser, &parser->previous);
-        case YP_TOKEN_NUMBERED_REFERENCE:
-            parser_lex(parser);
-            return (yp_node_t *) yp_numbered_reference_read_node_create(parser, &parser->previous);
-        case YP_TOKEN_GLOBAL_VARIABLE:
-            parser_lex(parser);
-            return (yp_node_t *) yp_global_variable_read_node_create(parser, &parser->previous);
-        default:
-            yp_diagnostic_list_append(&parser->error_list, parser->current.start, parser->current.end, "Expected a bare word, symbol or global variable argument.");
-            return (yp_node_t *) yp_missing_node_create(parser, parser->current.start, parser->current.end);
-    }
-}
-
-// Parse an identifier into either a local variable read or a call.
-static yp_node_t *
-parse_variable_call(yp_parser_t *parser) {
-    yp_node_flags_t flags = 0;
-
-    if (!match_type_p(parser, YP_TOKEN_PARENTHESIS_LEFT) && (parser->previous.end[-1] != '!') && (parser->previous.end[-1] != '?')) {
-        int depth;
-        if ((depth = yp_parser_local_depth(parser, &parser->previous)) != -1) {
-            return (yp_node_t *) yp_local_variable_read_node_create(parser, &parser->previous, (uint32_t) depth);
-        }
-
-        flags |= YP_CALL_NODE_FLAGS_VARIABLE_CALL;
-    }
-
-    yp_call_node_t *node = yp_call_node_variable_call_create(parser, &parser->previous);
-    node->base.flags |= flags;
-
-    return (yp_node_t *) node;
-}
-
-static inline yp_token_t
-parse_method_definition_name(yp_parser_t *parser) {
-    switch (parser->current.type) {
-        case YP_CASE_KEYWORD:
-        case YP_TOKEN_CONSTANT:
-        case YP_TOKEN_IDENTIFIER:
-            parser_lex(parser);
-            return parser->previous;
-        case YP_CASE_OPERATOR:
-            lex_state_set(parser, YP_LEX_STATE_ENDFN);
-            parser_lex(parser);
-            return parser->previous;
-        default:
-            return not_provided(parser);
-    }
-}
-
-// Calculate the common leading whitespace for each line in a heredoc.
-static int
-parse_heredoc_common_whitespace(yp_parser_t *parser, yp_node_list_t *nodes) {
-    int common_whitespace = -1;
-
-    for (size_t index = 0; index < nodes->size; index++) {
-        yp_node_t *node = nodes->nodes[index];
-
-        if (!YP_NODE_TYPE_P(node, YP_STRING_NODE)) continue;
-        const yp_location_t *content_loc = &((yp_string_node_t *) node)->content_loc;
-
-        // If the previous node wasn't a string node, we don't want to trim
-        // whitespace. This could happen after an interpolated expression or
-        // variable.
-        if (index == 0 || YP_NODE_TYPE_P(nodes->nodes[index - 1], YP_STRING_NODE)) {
-            int cur_whitespace;
-            const uint8_t *cur_char = content_loc->start;
-
-            while (cur_char && cur_char < content_loc->end) {
-                // Any empty newlines aren't included in the minimum whitespace
-                // calculation.
-                size_t eol_length;
-                while ((eol_length = match_eol_at(parser, cur_char))) {
-                    cur_char += eol_length;
-                }
-
-                if (cur_char == content_loc->end) break;
-
-                cur_whitespace = 0;
-
-                while (yp_char_is_inline_whitespace(*cur_char) && cur_char < content_loc->end) {
-                    if (cur_char[0] == '\t') {
-                        cur_whitespace = (cur_whitespace / YP_TAB_WHITESPACE_SIZE + 1) * YP_TAB_WHITESPACE_SIZE;
-                    } else {
-                        cur_whitespace++;
-                    }
-                    cur_char++;
-                }
-
-                // If we hit a newline, then we have encountered a line that
-                // contains only whitespace, and it shouldn't be considered in
-                // the calculation of common leading whitespace.
-                eol_length = match_eol_at(parser, cur_char);
-                if (eol_length) {
-                    cur_char += eol_length;
-                    continue;
-                }
-
-                if (cur_whitespace < common_whitespace || common_whitespace == -1) {
-                    common_whitespace = cur_whitespace;
-                }
-
-                cur_char = next_newline(cur_char + 1, parser->end - (cur_char + 1));
-                if (cur_char) cur_char++;
-            }
-        }
-    }
-
-    return common_whitespace;
-}
-
-// Take a heredoc node that is indented by a ~ and trim the leading whitespace.
-static void
-parse_heredoc_dedent(yp_parser_t *parser, yp_node_t *node, yp_heredoc_quote_t quote) {
-    yp_node_list_t *nodes;
-
-    if (quote == YP_HEREDOC_QUOTE_BACKTICK) {
-        nodes = &((yp_interpolated_x_string_node_t *) node)->parts;
-    } else {
-        nodes = &((yp_interpolated_string_node_t *) node)->parts;
-    }
-
-    // First, calculate how much common whitespace we need to trim. If there is
-    // none or it's 0, then we can return early.
-    int common_whitespace;
-    if ((common_whitespace = parse_heredoc_common_whitespace(parser, nodes)) <= 0) return;
-
-    // The next node should be dedented if it's the first node in the list or if
-    // if follows a string node.
-    bool dedent_next = true;
-
-    // Iterate over all nodes, and trim whitespace accordingly. We're going to
-    // keep around two indices: a read and a write. If we end up trimming all of
-    // the whitespace from a node, then we'll drop it from the list entirely.
-    size_t write_index = 0;
-
-    for (size_t read_index = 0; read_index < nodes->size; read_index++) {
-        yp_node_t *node = nodes->nodes[read_index];
-
-        // We're not manipulating child nodes that aren't strings. In this case
-        // we'll skip past it and indicate that the subsequent node should not
-        // be dedented.
-        if (!YP_NODE_TYPE_P(node, YP_STRING_NODE)) {
-            nodes->nodes[write_index++] = node;
-            dedent_next = false;
-            continue;
-        }
-
-        // Get a reference to the string struct that is being held by the string
-        // node. This is the value we're going to actual manipulate.
-        yp_string_t *string = &(((yp_string_node_t *) node)->unescaped);
-        yp_string_ensure_owned(string);
-
-        // Now get the bounds of the existing string. We'll use this as a
-        // destination to move bytes into. We'll also use it for bounds checking
-        // since we don't require that these strings be null terminated.
-        size_t dest_length = yp_string_length(string);
-        uint8_t *source_start = (uint8_t *) string->source;
-
-        const uint8_t *source_cursor = source_start;
-        const uint8_t *source_end = source_cursor + dest_length;
-
-        // We're going to move bytes backward in the string when we get leading
-        // whitespace, so we'll maintain a pointer to the current position in the
-        // string that we're writing to.
-        uint8_t *dest_cursor = source_start;
-
-        while (source_cursor < source_end) {
-            // If we need to dedent the next element within the heredoc or the next
-            // line within the string node, then we'll do it here.
-            if (dedent_next) {
-                int trimmed_whitespace = 0;
-
-                // While we haven't reached the amount of common whitespace that we need
-                // to trim and we haven't reached the end of the string, we'll keep
-                // trimming whitespace. Trimming in this context means skipping over
-                // these bytes such that they aren't copied into the new string.
-                while ((source_cursor < source_end) && yp_char_is_inline_whitespace(*source_cursor) && trimmed_whitespace < common_whitespace) {
-                    if (*source_cursor == '\t') {
-                        trimmed_whitespace = (trimmed_whitespace / YP_TAB_WHITESPACE_SIZE + 1) * YP_TAB_WHITESPACE_SIZE;
-                        if (trimmed_whitespace > common_whitespace) break;
-                    } else {
-                        trimmed_whitespace++;
-                    }
-
-                    source_cursor++;
-                    dest_length--;
-                }
-            }
-
-            // At this point we have dedented all that we need to, so we need to find
-            // the next newline.
-            const uint8_t *breakpoint = next_newline(source_cursor, source_end - source_cursor);
-
-            if (breakpoint == NULL) {
-                // If there isn't another newline, then we can just move the rest of the
-                // string and break from the loop.
-                memmove(dest_cursor, source_cursor, (size_t) (source_end - source_cursor));
-                break;
-            }
-
-            // Otherwise, we need to move everything including the newline, and
-            // then set the dedent_next flag to true.
-            if (breakpoint < source_end) breakpoint++;
-            memmove(dest_cursor, source_cursor, (size_t) (breakpoint - source_cursor));
-            dest_cursor += (breakpoint - source_cursor);
-            source_cursor = breakpoint;
-            dedent_next = true;
-        }
-
-        // We only want to write this node into the list if it has any content.
-        if (dest_length == 0) {
-            yp_node_destroy(parser, node);
-        } else {
-            string->length = dest_length;
-            yp_unescape_manipulate_string(parser, string, (quote == YP_HEREDOC_QUOTE_SINGLE) ? YP_UNESCAPE_MINIMAL : YP_UNESCAPE_ALL);
-            nodes->nodes[write_index++] = node;
-        }
-
-        // We always dedent the next node if it follows a string node.
-        dedent_next = true;
-    }
-
-    nodes->size = write_index;
-}
-
-static yp_node_t *
-parse_pattern(yp_parser_t *parser, bool top_pattern, const char *message);
-
-// Accept any number of constants joined by :: delimiters.
-static yp_node_t *
-parse_pattern_constant_path(yp_parser_t *parser, yp_node_t *node) {
-    // Now, if there are any :: operators that follow, parse them as constant
-    // path nodes.
-    while (accept(parser, YP_TOKEN_COLON_COLON)) {
-        yp_token_t delimiter = parser->previous;
-        expect(parser, YP_TOKEN_CONSTANT, "Expected a constant after the :: operator.");
-
-        yp_node_t *child = (yp_node_t *) yp_constant_read_node_create(parser, &parser->previous);
-        node = (yp_node_t *)yp_constant_path_node_create(parser, node, &delimiter, child);
-    }
-
-    // If there is a [ or ( that follows, then this is part of a larger pattern
-    // expression. We'll parse the inner pattern here, then modify the returned
-    // inner pattern with our constant path attached.
-    if (!match_any_type_p(parser, 2, YP_TOKEN_BRACKET_LEFT, YP_TOKEN_PARENTHESIS_LEFT)) {
-        return node;
-    }
-
-    yp_token_t opening;
-    yp_token_t closing;
-    yp_node_t *inner = NULL;
-
-    if (accept(parser, YP_TOKEN_BRACKET_LEFT)) {
-        opening = parser->previous;
-        accept(parser, YP_TOKEN_NEWLINE);
-
-        if (!accept(parser, YP_TOKEN_BRACKET_RIGHT)) {
-            inner = parse_pattern(parser, true, "Expected a pattern expression after the [ operator.");
-            accept(parser, YP_TOKEN_NEWLINE);
-            expect(parser, YP_TOKEN_BRACKET_RIGHT, "Expected a ] to close the pattern expression.");
-        }
-
-        closing = parser->previous;
-    } else {
-        parser_lex(parser);
-        opening = parser->previous;
-
-        if (!accept(parser, YP_TOKEN_PARENTHESIS_RIGHT)) {
-            inner = parse_pattern(parser, true, "Expected a pattern expression after the ( operator.");
-            expect(parser, YP_TOKEN_PARENTHESIS_RIGHT, "Expected a ) to close the pattern expression.");
-        }
-
-        closing = parser->previous;
-    }
-
-    if (!inner) {
-        // If there was no inner pattern, then we have something like Foo() or
-        // Foo[]. In that case we'll create an array pattern with no requireds.
-        return (yp_node_t *) yp_array_pattern_node_constant_create(parser, node, &opening, &closing);
-    }
-
-    // Now that we have the inner pattern, check to see if it's an array, find,
-    // or hash pattern. If it is, then we'll attach our constant path to it if
-    // it doesn't already have a constant. If it's not one of those node types
-    // or it does have a constant, then we'll create an array pattern.
-    switch (YP_NODE_TYPE(inner)) {
-        case YP_ARRAY_PATTERN_NODE: {
-            yp_array_pattern_node_t *pattern_node = (yp_array_pattern_node_t *) inner;
-
-            if (pattern_node->constant == NULL) {
-                pattern_node->base.location.start = node->location.start;
-                pattern_node->base.location.end = closing.end;
-
-                pattern_node->constant = node;
-                pattern_node->opening_loc = (yp_location_t) { .start = opening.start, .end = opening.end };
-                pattern_node->closing_loc = (yp_location_t) { .start = closing.start, .end = closing.end };
-
-                return (yp_node_t *) pattern_node;
-            }
-
-            break;
-        }
-        case YP_FIND_PATTERN_NODE: {
-            yp_find_pattern_node_t *pattern_node = (yp_find_pattern_node_t *) inner;
-
-            if (pattern_node->constant == NULL) {
-                pattern_node->base.location.start = node->location.start;
-                pattern_node->base.location.end = closing.end;
-
-                pattern_node->constant = node;
-                pattern_node->opening_loc = (yp_location_t) { .start = opening.start, .end = opening.end };
-                pattern_node->closing_loc = (yp_location_t) { .start = closing.start, .end = closing.end };
-
-                return (yp_node_t *) pattern_node;
-            }
-
-            break;
-        }
-        case YP_HASH_PATTERN_NODE: {
-            yp_hash_pattern_node_t *pattern_node = (yp_hash_pattern_node_t *) inner;
-
-            if (pattern_node->constant == NULL) {
-                pattern_node->base.location.start = node->location.start;
-                pattern_node->base.location.end = closing.end;
-
-                pattern_node->constant = node;
-                pattern_node->opening_loc = (yp_location_t) { .start = opening.start, .end = opening.end };
-                pattern_node->closing_loc = (yp_location_t) { .start = closing.start, .end = closing.end };
-
-                return (yp_node_t *) pattern_node;
-            }
-
-            break;
-        }
-        default:
-            break;
-    }
-
-    // If we got here, then we didn't return one of the inner patterns by
-    // attaching its constant. In this case we'll create an array pattern and
-    // attach our constant to it.
-    yp_array_pattern_node_t *pattern_node = yp_array_pattern_node_constant_create(parser, node, &opening, &closing);
-    yp_array_pattern_node_requireds_append(pattern_node, inner);
-    return (yp_node_t *) pattern_node;
-}
-
-// Parse a rest pattern.
-static yp_splat_node_t *
-parse_pattern_rest(yp_parser_t *parser) {
-    assert(parser->previous.type == YP_TOKEN_USTAR);
-    yp_token_t operator = parser->previous;
-    yp_node_t *name = NULL;
-
-    // Rest patterns don't necessarily have a name associated with them. So we
-    // will check for that here. If they do, then we'll add it to the local table
-    // since this pattern will cause it to become a local variable.
-    if (accept(parser, YP_TOKEN_IDENTIFIER)) {
-        yp_token_t identifier = parser->previous;
-        yp_parser_local_add_token(parser, &identifier);
-        name = (yp_node_t *) yp_local_variable_target_node_create(parser, &identifier);
-    }
-
-    // Finally we can return the created node.
-    return yp_splat_node_create(parser, &operator, name);
-}
-
-// Parse a keyword rest node.
-static yp_node_t *
-parse_pattern_keyword_rest(yp_parser_t *parser) {
-    assert(parser->current.type == YP_TOKEN_USTAR_STAR);
-    parser_lex(parser);
-
-    yp_token_t operator = parser->previous;
-    yp_node_t *value = NULL;
-
-    if (accept(parser, YP_TOKEN_KEYWORD_NIL)) {
-        return (yp_node_t *) yp_no_keywords_parameter_node_create(parser, &operator, &parser->previous);
-    }
-
-    if (accept(parser, YP_TOKEN_IDENTIFIER)) {
-        yp_parser_local_add_token(parser, &parser->previous);
-        value = (yp_node_t *) yp_local_variable_target_node_create(parser, &parser->previous);
-    }
-
-    return (yp_node_t *) yp_assoc_splat_node_create(parser, value, &operator);
-}
-
-// Parse a hash pattern.
-static yp_hash_pattern_node_t *
-parse_pattern_hash(yp_parser_t *parser, yp_node_t *first_assoc) {
-    if (YP_NODE_TYPE_P(first_assoc, YP_ASSOC_NODE)) {
-        if (!match_any_type_p(parser, 7, YP_TOKEN_COMMA, YP_TOKEN_KEYWORD_THEN, YP_TOKEN_BRACE_RIGHT, YP_TOKEN_BRACKET_RIGHT, YP_TOKEN_PARENTHESIS_RIGHT, YP_TOKEN_NEWLINE, YP_TOKEN_SEMICOLON)) {
-            // Here we have a value for the first assoc in the list, so we will parse it
-            // now and update the first assoc.
-            yp_node_t *value = parse_pattern(parser, false, "Expected a pattern expression after the key.");
-
-            yp_assoc_node_t *assoc = (yp_assoc_node_t *) first_assoc;
-            assoc->base.location.end = value->location.end;
-            assoc->value = value;
-        } else {
-            yp_node_t *key = ((yp_assoc_node_t *) first_assoc)->key;
-
-            if (YP_NODE_TYPE_P(key, YP_SYMBOL_NODE)) {
-                const yp_location_t *value_loc = &((yp_symbol_node_t *) key)->value_loc;
-                yp_parser_local_add_location(parser, value_loc->start, value_loc->end);
-            }
-        }
-    }
-
-    yp_node_list_t assocs = YP_EMPTY_NODE_LIST;
-    yp_node_list_append(&assocs, first_assoc);
-
-    // If there are any other assocs, then we'll parse them now.
-    while (accept(parser, YP_TOKEN_COMMA)) {
-        // Here we need to break to support trailing commas.
-        if (match_any_type_p(parser, 6, YP_TOKEN_KEYWORD_THEN, YP_TOKEN_BRACE_RIGHT, YP_TOKEN_BRACKET_RIGHT, YP_TOKEN_PARENTHESIS_RIGHT, YP_TOKEN_NEWLINE, YP_TOKEN_SEMICOLON)) {
-            break;
-        }
-
-        yp_node_t *assoc;
-
-        if (match_type_p(parser, YP_TOKEN_USTAR_STAR)) {
-            assoc = parse_pattern_keyword_rest(parser);
-        } else {
-            expect(parser, YP_TOKEN_LABEL, "Expected a label after the `,'.");
-            yp_node_t *key = (yp_node_t *) yp_symbol_node_label_create(parser, &parser->previous);
-            yp_node_t *value = NULL;
-
-            if (!match_any_type_p(parser, 7, YP_TOKEN_COMMA, YP_TOKEN_KEYWORD_THEN, YP_TOKEN_BRACE_RIGHT, YP_TOKEN_BRACKET_RIGHT, YP_TOKEN_PARENTHESIS_RIGHT, YP_TOKEN_NEWLINE, YP_TOKEN_SEMICOLON)) {
-                value = parse_pattern(parser, false, "Expected a pattern expression after the key.");
-            } else {
-                const yp_location_t *value_loc = &((yp_symbol_node_t *) key)->value_loc;
-                yp_parser_local_add_location(parser, value_loc->start, value_loc->end);
-            }
-
-            yp_token_t operator = not_provided(parser);
-            assoc = (yp_node_t *) yp_assoc_node_create(parser, key, &operator, value);
-        }
-
-        yp_node_list_append(&assocs, assoc);
-    }
-
-    yp_hash_pattern_node_t *node = yp_hash_pattern_node_node_list_create(parser, &assocs);
-    free(assocs.nodes);
-
-    return node;
-}
-
-// Parse a pattern expression primitive.
-static yp_node_t *
-parse_pattern_primitive(yp_parser_t *parser, const char *message) {
-    switch (parser->current.type) {
-        case YP_TOKEN_IDENTIFIER: {
-            parser_lex(parser);
-            yp_parser_local_add_token(parser, &parser->previous);
-            return (yp_node_t *) yp_local_variable_target_node_create(parser, &parser->previous);
-        }
-        case YP_TOKEN_BRACKET_LEFT_ARRAY: {
-            yp_token_t opening = parser->current;
-            parser_lex(parser);
-
-            if (accept(parser, YP_TOKEN_BRACKET_RIGHT)) {
-                // If we have an empty array pattern, then we'll just return a new
-                // array pattern node.
-                return (yp_node_t *)yp_array_pattern_node_empty_create(parser, &opening, &parser->previous);
-            }
-
-            // Otherwise, we'll parse the inner pattern, then deal with it depending
-            // on the type it returns.
-            yp_node_t *inner = parse_pattern(parser, true, "Expected a pattern expression after the [ operator.");
-
-            accept(parser, YP_TOKEN_NEWLINE);
-
-            expect(parser, YP_TOKEN_BRACKET_RIGHT, "Expected a ] to close the pattern expression.");
-            yp_token_t closing = parser->previous;
-
-            switch (YP_NODE_TYPE(inner)) {
-                case YP_ARRAY_PATTERN_NODE: {
-                    yp_array_pattern_node_t *pattern_node = (yp_array_pattern_node_t *) inner;
-                    if (pattern_node->opening_loc.start == NULL) {
-                        pattern_node->base.location.start = opening.start;
-                        pattern_node->base.location.end = closing.end;
-
-                        pattern_node->opening_loc = (yp_location_t) { .start = opening.start, .end = opening.end };
-                        pattern_node->closing_loc = (yp_location_t) { .start = closing.start, .end = closing.end };
-
-                        return (yp_node_t *) pattern_node;
-                    }
-
-                    break;
-                }
-                case YP_FIND_PATTERN_NODE: {
-                    yp_find_pattern_node_t *pattern_node = (yp_find_pattern_node_t *) inner;
-                    if (pattern_node->opening_loc.start == NULL) {
-                        pattern_node->base.location.start = opening.start;
-                        pattern_node->base.location.end = closing.end;
-
-                        pattern_node->opening_loc = (yp_location_t) { .start = opening.start, .end = opening.end };
-                        pattern_node->closing_loc = (yp_location_t) { .start = closing.start, .end = closing.end };
-
-                        return (yp_node_t *) pattern_node;
-                    }
-
-                    break;
-                }
-                default:
-                    break;
-            }
-
-            yp_array_pattern_node_t *node = yp_array_pattern_node_empty_create(parser, &opening, &closing);
-            yp_array_pattern_node_requireds_append(node, inner);
-            return (yp_node_t *) node;
-        }
-        case YP_TOKEN_BRACE_LEFT: {
-            bool previous_pattern_matching_newlines = parser->pattern_matching_newlines;
-            parser->pattern_matching_newlines = false;
-
-            yp_hash_pattern_node_t *node;
-            yp_token_t opening = parser->current;
-            parser_lex(parser);
-
-            if (accept(parser, YP_TOKEN_BRACE_RIGHT)) {
-                // If we have an empty hash pattern, then we'll just return a new hash
-                // pattern node.
-                node = yp_hash_pattern_node_empty_create(parser, &opening, &parser->previous);
-            } else {
-                yp_node_t *key;
-
-                switch (parser->current.type) {
-                    case YP_TOKEN_LABEL:
-                        parser_lex(parser);
-                        key = (yp_node_t *) yp_symbol_node_label_create(parser, &parser->previous);
-                        break;
-                    case YP_TOKEN_USTAR_STAR:
-                        key = parse_pattern_keyword_rest(parser);
-                        break;
-                    case YP_TOKEN_STRING_BEGIN:
-                        key = parse_expression(parser, YP_BINDING_POWER_MAX, "Expected a key in the hash pattern.");
-                        if (!yp_symbol_node_label_p(key)) {
-                            yp_diagnostic_list_append(&parser->error_list, key->location.start, key->location.end, "Expected a label as the key in the hash pattern.");
-                        }
-
-                        break;
-                    default:
-                        parser_lex(parser);
-                        yp_diagnostic_list_append(&parser->error_list, parser->previous.start, parser->previous.end, "Expected a key in the hash pattern.");
-                        key = (yp_node_t *) yp_missing_node_create(parser, parser->previous.start, parser->previous.end);
-                        break;
-                }
-
-                yp_token_t operator = not_provided(parser);
-                node = parse_pattern_hash(parser, (yp_node_t *) yp_assoc_node_create(parser, key, &operator, NULL));
-
-                accept(parser, YP_TOKEN_NEWLINE);
-                expect(parser, YP_TOKEN_BRACE_RIGHT, "Expected a } to close the pattern expression.");
-                yp_token_t closing = parser->previous;
-
-                node->base.location.start = opening.start;
-                node->base.location.end = closing.end;
-
-                node->opening_loc = (yp_location_t) { .start = opening.start, .end = opening.end };
-                node->closing_loc = (yp_location_t) { .start = closing.start, .end = closing.end };
-            }
-
-            parser->pattern_matching_newlines = previous_pattern_matching_newlines;
-            return (yp_node_t *) node;
-        }
-        case YP_TOKEN_UDOT_DOT:
-        case YP_TOKEN_UDOT_DOT_DOT: {
-            yp_token_t operator = parser->current;
-            parser_lex(parser);
-
-            // Since we have a unary range operator, we need to parse the subsequent
-            // expression as the right side of the range.
-            switch (parser->current.type) {
-                case YP_CASE_PRIMITIVE: {
-                    yp_node_t *right = parse_expression(parser, YP_BINDING_POWER_MAX, "Expected an expression after the range operator.");
-                    return (yp_node_t *) yp_range_node_create(parser, NULL, &operator, right);
-                }
-                default: {
-                    yp_diagnostic_list_append(&parser->error_list, operator.start, operator.end, "Expected an expression after the range operator.");
-                    yp_node_t *right = (yp_node_t *) yp_missing_node_create(parser, operator.start, operator.end);
-                    return (yp_node_t *) yp_range_node_create(parser, NULL, &operator, right);
-                }
-            }
-        }
-        case YP_CASE_PRIMITIVE: {
-            yp_node_t *node = parse_expression(parser, YP_BINDING_POWER_MAX, message);
-
-            // Now that we have a primitive, we need to check if it's part of a range.
-            if (accept_any(parser, 2, YP_TOKEN_DOT_DOT, YP_TOKEN_DOT_DOT_DOT)) {
-                yp_token_t operator = parser->previous;
-
-                // Now that we have the operator, we need to check if this is followed
-                // by another expression. If it is, then we will create a full range
-                // node. Otherwise, we'll create an endless range.
-                switch (parser->current.type) {
-                    case YP_CASE_PRIMITIVE: {
-                        yp_node_t *right = parse_expression(parser, YP_BINDING_POWER_MAX, "Expected an expression after the range operator.");
-                        return (yp_node_t *) yp_range_node_create(parser, node, &operator, right);
-                    }
-                    default:
-                        return (yp_node_t *) yp_range_node_create(parser, node, &operator, NULL);
-                }
-            }
-
-            return node;
-        }
-        case YP_TOKEN_CARET: {
-            parser_lex(parser);
-            yp_token_t operator = parser->previous;
-
-            // At this point we have a pin operator. We need to check the subsequent
-            // expression to determine if it's a variable or an expression.
-            switch (parser->current.type) {
-                case YP_TOKEN_IDENTIFIER: {
-                    parser_lex(parser);
-                    yp_node_t *variable = (yp_node_t *) yp_local_variable_read_node_create(parser, &parser->previous, 0);
-
-                    return (yp_node_t *) yp_pinned_variable_node_create(parser, &operator, variable);
-                }
-                case YP_TOKEN_INSTANCE_VARIABLE: {
-                    parser_lex(parser);
-                    yp_node_t *variable = (yp_node_t *) yp_instance_variable_read_node_create(parser, &parser->previous);
-
-                    return (yp_node_t *) yp_pinned_variable_node_create(parser, &operator, variable);
-                }
-                case YP_TOKEN_CLASS_VARIABLE: {
-                    parser_lex(parser);
-                    yp_node_t *variable = (yp_node_t *) yp_class_variable_read_node_create(parser, &parser->previous);
-
-                    return (yp_node_t *) yp_pinned_variable_node_create(parser, &operator, variable);
-                }
-                case YP_TOKEN_GLOBAL_VARIABLE: {
-                    parser_lex(parser);
-                    yp_node_t *variable = (yp_node_t *) yp_global_variable_read_node_create(parser, &parser->previous);
-
-                    return (yp_node_t *) yp_pinned_variable_node_create(parser, &operator, variable);
-                }
-                case YP_TOKEN_NUMBERED_REFERENCE: {
-                    parser_lex(parser);
-                    yp_node_t *variable = (yp_node_t *) yp_numbered_reference_read_node_create(parser, &parser->previous);
-
-                    return (yp_node_t *) yp_pinned_variable_node_create(parser, &operator, variable);
-                }
-                case YP_TOKEN_BACK_REFERENCE: {
-                    parser_lex(parser);
-                    yp_node_t *variable = (yp_node_t *) yp_back_reference_read_node_create(parser, &parser->previous);
-
-                    return (yp_node_t *) yp_pinned_variable_node_create(parser, &operator, variable);
-                }
-                case YP_TOKEN_PARENTHESIS_LEFT: {
-                    bool previous_pattern_matching_newlines = parser->pattern_matching_newlines;
-                    parser->pattern_matching_newlines = false;
-
-                    yp_token_t lparen = parser->current;
-                    parser_lex(parser);
-
-                    yp_node_t *expression = parse_expression(parser, YP_BINDING_POWER_STATEMENT, "Expected an expression after the pin operator.");
-                    parser->pattern_matching_newlines = previous_pattern_matching_newlines;
-
-                    accept(parser, YP_TOKEN_NEWLINE);
-                    expect(parser, YP_TOKEN_PARENTHESIS_RIGHT, "Expected a closing parenthesis after the expression.");
-                    return (yp_node_t *) yp_pinned_expression_node_create(parser, expression, &operator, &lparen, &parser->previous);
-                }
-                default: {
-                    // If we get here, then we have a pin operator followed by something
-                    // not understood. We'll create a missing node and return that.
-                    yp_diagnostic_list_append(&parser->error_list, operator.start, operator.end, "Expected a variable after the pin operator.");
-                    yp_node_t *variable = (yp_node_t *) yp_missing_node_create(parser, operator.start, operator.end);
-                    return (yp_node_t *) yp_pinned_variable_node_create(parser, &operator, variable);
-                }
-            }
-        }
-        case YP_TOKEN_UCOLON_COLON: {
-            yp_token_t delimiter = parser->current;
-            parser_lex(parser);
-
-            expect(parser, YP_TOKEN_CONSTANT, "Expected a constant after the :: operator.");
-            yp_node_t *child = (yp_node_t *) yp_constant_read_node_create(parser, &parser->previous);
-            yp_constant_path_node_t *node = yp_constant_path_node_create(parser, NULL, &delimiter, child);
-
-            return parse_pattern_constant_path(parser, (yp_node_t *)node);
-        }
-        case YP_TOKEN_CONSTANT: {
-            yp_token_t constant = parser->current;
-            parser_lex(parser);
-
-            yp_node_t *node = (yp_node_t *) yp_constant_read_node_create(parser, &constant);
-            return parse_pattern_constant_path(parser, node);
-        }
-        default:
-            yp_diagnostic_list_append(&parser->error_list, parser->current.start, parser->current.end, message);
-            return (yp_node_t *) yp_missing_node_create(parser, parser->current.start, parser->current.end);
-    }
-}
-
-// Parse any number of primitives joined by alternation and ended optionally by
-// assignment.
-static yp_node_t *
-parse_pattern_primitives(yp_parser_t *parser, const char *message) {
-    yp_node_t *node = NULL;
-
-    do {
-        yp_token_t operator = parser->previous;
-
-        switch (parser->current.type) {
-            case YP_TOKEN_IDENTIFIER:
-            case YP_TOKEN_BRACKET_LEFT_ARRAY:
-            case YP_TOKEN_BRACE_LEFT:
-            case YP_TOKEN_CARET:
-            case YP_TOKEN_CONSTANT:
-            case YP_TOKEN_UCOLON_COLON:
-            case YP_TOKEN_UDOT_DOT:
-            case YP_TOKEN_UDOT_DOT_DOT:
-            case YP_CASE_PRIMITIVE: {
-                if (node == NULL) {
-                    node = parse_pattern_primitive(parser, message);
-                } else {
-                    yp_node_t *right = parse_pattern_primitive(parser, "Expected to be able to parse a pattern after `|'.");
-                    node = (yp_node_t *) yp_alternation_pattern_node_create(parser, node, right, &operator);
-                }
-
-                break;
-            }
-            case YP_TOKEN_PARENTHESIS_LEFT: {
-                parser_lex(parser);
-                if (node != NULL) {
-                    yp_node_destroy(parser, node);
-                }
-                node = parse_pattern(parser, false, "Expected a pattern after the opening parenthesis.");
-
-                expect(parser, YP_TOKEN_PARENTHESIS_RIGHT, "Expected a closing parenthesis after the pattern.");
-                break;
-            }
-            default: {
-                yp_diagnostic_list_append(&parser->error_list, parser->current.start, parser->current.end, message);
-                yp_node_t *right = (yp_node_t *) yp_missing_node_create(parser, parser->current.start, parser->current.end);
-
-                if (node == NULL) {
-                    node = right;
-                } else {
-                    node = (yp_node_t *) yp_alternation_pattern_node_create(parser, node, right, &operator);
-                }
-
-                break;
-            }
-        }
-    } while (accept(parser, YP_TOKEN_PIPE));
-
-    // If we have an =>, then we are assigning this pattern to a variable.
-    // In this case we should create an assignment node.
-    while (accept(parser, YP_TOKEN_EQUAL_GREATER)) {
-        yp_token_t operator = parser->previous;
-
-        expect(parser, YP_TOKEN_IDENTIFIER, "Expected an identifier after the `=>' operator.");
-        yp_token_t identifier = parser->previous;
-        yp_parser_local_add_token(parser, &identifier);
-
-        yp_node_t *target = (yp_node_t *) yp_local_variable_target_node_create(parser, &identifier);
-        node = (yp_node_t *) yp_capture_pattern_node_create(parser, node, target, &operator);
-    }
-
-    return node;
-}
-
-// Parse a pattern matching expression.
-static yp_node_t *
-parse_pattern(yp_parser_t *parser, bool top_pattern, const char *message) {
-    yp_node_t *node = NULL;
-
-    bool leading_rest = false;
-    bool trailing_rest = false;
-
-    switch (parser->current.type) {
-        case YP_TOKEN_LABEL: {
-            parser_lex(parser);
-            yp_node_t *key = (yp_node_t *) yp_symbol_node_label_create(parser, &parser->previous);
-            yp_token_t operator = not_provided(parser);
-
-            return (yp_node_t *) parse_pattern_hash(parser, (yp_node_t *) yp_assoc_node_create(parser, key, &operator, NULL));
-        }
-        case YP_TOKEN_USTAR_STAR: {
-            node = parse_pattern_keyword_rest(parser);
-            return (yp_node_t *) parse_pattern_hash(parser, node);
-        }
-        case YP_TOKEN_USTAR: {
-            if (top_pattern) {
-                parser_lex(parser);
-                node = (yp_node_t *) parse_pattern_rest(parser);
-                leading_rest = true;
-                break;
-            }
-        }
-        /* fallthrough */
-        default:
-            node = parse_pattern_primitives(parser, message);
-            break;
-    }
-
-    // If we got a dynamic label symbol, then we need to treat it like the
-    // beginning of a hash pattern.
-    if (yp_symbol_node_label_p(node)) {
-        yp_token_t operator = not_provided(parser);
-        return (yp_node_t *) parse_pattern_hash(parser, (yp_node_t *) yp_assoc_node_create(parser, node, &operator, NULL));
-    }
-
-    if (top_pattern && match_type_p(parser, YP_TOKEN_COMMA)) {
-        // If we have a comma, then we are now parsing either an array pattern or a
-        // find pattern. We need to parse all of the patterns, put them into a big
-        // list, and then determine which type of node we have.
-        yp_node_list_t nodes = YP_EMPTY_NODE_LIST;
-        yp_node_list_append(&nodes, node);
-
-        // Gather up all of the patterns into the list.
-        while (accept(parser, YP_TOKEN_COMMA)) {
-            // Break early here in case we have a trailing comma.
-            if (match_any_type_p(parser, 5, YP_TOKEN_KEYWORD_THEN, YP_TOKEN_BRACE_RIGHT, YP_TOKEN_BRACKET_RIGHT, YP_TOKEN_NEWLINE, YP_TOKEN_SEMICOLON)) {
-                break;
-            }
-
-            if (accept(parser, YP_TOKEN_USTAR)) {
-                node = (yp_node_t *) parse_pattern_rest(parser);
-
-                // If we have already parsed a splat pattern, then this is an error. We
-                // will continue to parse the rest of the patterns, but we will indicate
-                // it as an error.
-                if (trailing_rest) {
-                    yp_diagnostic_list_append(&parser->error_list, parser->previous.start, parser->previous.end, "Unexpected rest pattern.");
-                }
-
-                trailing_rest = true;
-            } else {
-                node = parse_pattern_primitives(parser, "Expected a pattern after the comma.");
-            }
-
-            yp_node_list_append(&nodes, node);
-        }
-
-        // If the first pattern and the last pattern are rest patterns, then we will
-        // call this a find pattern, regardless of how many rest patterns are in
-        // between because we know we already added the appropriate errors.
-        // Otherwise we will create an array pattern.
-        if (YP_NODE_TYPE_P(nodes.nodes[0], YP_SPLAT_NODE) && YP_NODE_TYPE_P(nodes.nodes[nodes.size - 1], YP_SPLAT_NODE)) {
-            node = (yp_node_t *) yp_find_pattern_node_create(parser, &nodes);
-        } else {
-            node = (yp_node_t *) yp_array_pattern_node_node_list_create(parser, &nodes);
-        }
-
-        free(nodes.nodes);
-    } else if (leading_rest) {
-        // Otherwise, if we parsed a single splat pattern, then we know we have an
-        // array pattern, so we can go ahead and create that node.
-        node = (yp_node_t *) yp_array_pattern_node_rest_create(parser, node);
-    }
-
-    return node;
-}
-
-// Incorporate a negative sign into a numeric node by subtracting 1 character
-// from its start bounds. If it's a compound node, then we will recursively
-// apply this function to its value.
-static inline void
-parse_negative_numeric(yp_node_t *node) {
-    switch (YP_NODE_TYPE(node)) {
-        case YP_INTEGER_NODE:
-        case YP_FLOAT_NODE:
-            node->location.start--;
-            break;
-        case YP_RATIONAL_NODE:
-            node->location.start--;
-            parse_negative_numeric(((yp_rational_node_t *) node)->numeric);
-            break;
-        case YP_IMAGINARY_NODE:
-            node->location.start--;
-            parse_negative_numeric(((yp_imaginary_node_t *) node)->numeric);
-            break;
-        default:
-            assert(false && "unreachable");
-            break;
-    }
-}
-
-// Parse an expression that begins with the previous node that we just lexed.
-static inline yp_node_t *
-parse_expression_prefix(yp_parser_t *parser, yp_binding_power_t binding_power) {
-    switch (parser->current.type) {
-        case YP_TOKEN_BRACKET_LEFT_ARRAY: {
-            parser_lex(parser);
-
-            yp_array_node_t *array = yp_array_node_create(parser, &parser->previous);
-            yp_accepts_block_stack_push(parser, true);
-            bool parsed_bare_hash = false;
-
-            while (!match_any_type_p(parser, 2, YP_TOKEN_BRACKET_RIGHT, YP_TOKEN_EOF)) {
-                // Handle the case where we don't have a comma and we have a newline followed by a right bracket.
-                if (accept(parser, YP_TOKEN_NEWLINE) && match_type_p(parser, YP_TOKEN_BRACKET_RIGHT)) {
-                    break;
-                }
-
-                if (yp_array_node_size(array) != 0) {
-                    expect(parser, YP_TOKEN_COMMA, "Expected a separator for the elements in an array.");
-                }
-
-                // If we have a right bracket immediately following a comma, this is
-                // allowed since it's a trailing comma. In this case we can break out of
-                // the loop.
-                if (match_type_p(parser, YP_TOKEN_BRACKET_RIGHT)) break;
-
-                yp_node_t *element;
-
-                if (accept(parser, YP_TOKEN_USTAR)) {
-                    yp_token_t operator = parser->previous;
-                    yp_node_t *expression = parse_expression(parser, YP_BINDING_POWER_DEFINED, "Expected an expression after '*' in the array.");
-                    element = (yp_node_t *) yp_splat_node_create(parser, &operator, expression);
-                } else if (match_any_type_p(parser, 2, YP_TOKEN_LABEL, YP_TOKEN_USTAR_STAR)) {
-                    if (parsed_bare_hash) {
-                        yp_diagnostic_list_append(&parser->error_list, parser->current.start, parser->current.end, "Unexpected bare hash.");
-                    }
-
-                    yp_keyword_hash_node_t *hash = yp_keyword_hash_node_create(parser);
-                    element = (yp_node_t *)hash;
-
-                    if (!match_any_type_p(parser, 8, YP_TOKEN_EOF, YP_TOKEN_NEWLINE, YP_TOKEN_SEMICOLON, YP_TOKEN_EOF, YP_TOKEN_BRACE_RIGHT, YP_TOKEN_BRACKET_RIGHT, YP_TOKEN_KEYWORD_DO, YP_TOKEN_PARENTHESIS_RIGHT)) {
-                        parse_assocs(parser, (yp_node_t *) hash);
-                    }
-
-                    parsed_bare_hash = true;
-                } else {
-                    element = parse_expression(parser, YP_BINDING_POWER_DEFINED, "Expected an element for the array.");
-
-                    if (yp_symbol_node_label_p(element) || accept(parser, YP_TOKEN_EQUAL_GREATER)) {
-                        if (parsed_bare_hash) {
-                            yp_diagnostic_list_append(&parser->error_list, parser->previous.start, parser->previous.end, "Unexpected bare hash.");
-                        }
-
-                        yp_keyword_hash_node_t *hash = yp_keyword_hash_node_create(parser);
-
-                        yp_token_t operator;
-                        if (parser->previous.type == YP_TOKEN_EQUAL_GREATER) {
-                            operator = parser->previous;
-                        } else {
-                            operator = not_provided(parser);
-                        }
-
-                        yp_node_t *value = parse_expression(parser, YP_BINDING_POWER_DEFINED, "Expected a value in the hash literal.");
-                        yp_node_t *assoc = (yp_node_t *) yp_assoc_node_create(parser, element, &operator, value);
-                        yp_keyword_hash_node_elements_append(hash, assoc);
-
-                        element = (yp_node_t *)hash;
-                        if (accept(parser, YP_TOKEN_COMMA) && !match_type_p(parser, YP_TOKEN_BRACKET_RIGHT)) {
-                            parse_assocs(parser, (yp_node_t *) hash);
-                        }
-
-                        parsed_bare_hash = true;
-                    }
-                }
-
-                yp_array_node_elements_append(array, element);
-                if (YP_NODE_TYPE_P(element, YP_MISSING_NODE)) break;
-            }
-
-            accept(parser, YP_TOKEN_NEWLINE);
-            expect(parser, YP_TOKEN_BRACKET_RIGHT, "Expected a closing bracket for the array.");
-            yp_array_node_close_set(array, &parser->previous);
-            yp_accepts_block_stack_pop(parser);
-
-            return (yp_node_t *) array;
-        }
-        case YP_TOKEN_PARENTHESIS_LEFT:
-        case YP_TOKEN_PARENTHESIS_LEFT_PARENTHESES: {
-            yp_token_t opening = parser->current;
-            parser_lex(parser);
-            while (accept_any(parser, 2, YP_TOKEN_SEMICOLON, YP_TOKEN_NEWLINE));
-
-            // If this is the end of the file or we match a right parenthesis, then
-            // we have an empty parentheses node, and we can immediately return.
-            if (match_any_type_p(parser, 2, YP_TOKEN_PARENTHESIS_RIGHT, YP_TOKEN_EOF)) {
-                expect(parser, YP_TOKEN_PARENTHESIS_RIGHT, "Expected a closing parenthesis.");
-                return (yp_node_t *) yp_parentheses_node_create(parser, &opening, NULL, &parser->previous);
-            }
-
-            // Otherwise, we're going to parse the first statement in the list of
-            // statements within the parentheses.
-            yp_accepts_block_stack_push(parser, true);
-            yp_node_t *statement = parse_expression(parser, YP_BINDING_POWER_STATEMENT, "Expected to be able to parse an expression.");
-            while (accept_any(parser, 2, YP_TOKEN_NEWLINE, YP_TOKEN_SEMICOLON));
-
-            // If we hit a right parenthesis, then we're done parsing the parentheses
-            // node, and we can check which kind of node we should return.
-            if (match_type_p(parser, YP_TOKEN_PARENTHESIS_RIGHT)) {
-                if (opening.type == YP_TOKEN_PARENTHESIS_LEFT_PARENTHESES) {
-                    lex_state_set(parser, YP_LEX_STATE_ENDARG);
-                }
-                parser_lex(parser);
-                yp_accepts_block_stack_pop(parser);
-
-                // If we have a single statement and are ending on a right parenthesis,
-                // then we need to check if this is possibly a multiple assignment node.
-                if (binding_power == YP_BINDING_POWER_STATEMENT && YP_NODE_TYPE_P(statement, YP_MULTI_WRITE_NODE)) {
-                    yp_multi_write_node_t *multi_statement = (yp_multi_write_node_t *) statement;
-
-                    if (multi_statement->value == NULL) {
-                        yp_location_t lparen_loc = { .start = opening.start, .end = opening.end };
-                        yp_location_t rparen_loc = { .start = parser->previous.start, .end = parser->previous.end };
-                        yp_multi_write_node_t *multi_write;
-
-                        if (multi_statement->lparen_loc.start == NULL) {
-                            multi_write = (yp_multi_write_node_t *) statement;
-                            multi_write->base.location.start = lparen_loc.start;
-                            multi_write->base.location.end = rparen_loc.end;
-                            multi_write->lparen_loc = lparen_loc;
-                            multi_write->rparen_loc = rparen_loc;
-                        } else {
-                            yp_token_t operator = not_provided(parser);
-                            multi_write = yp_multi_write_node_create(parser, &operator, NULL, &lparen_loc, &rparen_loc);
-                            yp_multi_write_node_targets_append(multi_write, statement);
-                        }
-
-                        return parse_targets(parser, (yp_node_t *) multi_write, YP_BINDING_POWER_INDEX);
-                    }
-                }
-
-                // If we have a single statement and are ending on a right parenthesis
-                // and we didn't return a multiple assignment node, then we can return a
-                // regular parentheses node now.
-                yp_statements_node_t *statements = yp_statements_node_create(parser);
-                yp_statements_node_body_append(statements, statement);
-
-                return (yp_node_t *) yp_parentheses_node_create(parser, &opening, (yp_node_t *) statements, &parser->previous);
-            }
-
-            // If we have more than one statement in the set of parentheses, then we
-            // are going to parse all of them as a list of statements. We'll do that
-            // here.
-            context_push(parser, YP_CONTEXT_PARENS);
-            yp_statements_node_t *statements = yp_statements_node_create(parser);
-            yp_statements_node_body_append(statements, statement);
-
-            while (!match_type_p(parser, YP_TOKEN_PARENTHESIS_RIGHT)) {
-                // Ignore semicolon without statements before them
-                if (accept_any(parser, 2, YP_TOKEN_SEMICOLON, YP_TOKEN_NEWLINE)) continue;
-
-                yp_node_t *node = parse_expression(parser, YP_BINDING_POWER_STATEMENT, "Expected to be able to parse an expression.");
-                yp_statements_node_body_append(statements, node);
-
-                // If we're recovering from a syntax error, then we need to stop parsing the
-                // statements now.
-                if (parser->recovering) {
-                    // If this is the level of context where the recovery has happened, then
-                    // we can mark the parser as done recovering.
-                    if (match_type_p(parser, YP_TOKEN_PARENTHESIS_RIGHT)) parser->recovering = false;
-                    break;
-                }
-
-                if (!accept_any(parser, 2, YP_TOKEN_NEWLINE, YP_TOKEN_SEMICOLON)) break;
-            }
-
-            context_pop(parser);
-            yp_accepts_block_stack_pop(parser);
-            expect(parser, YP_TOKEN_PARENTHESIS_RIGHT, "Expected a closing parenthesis.");
-
-            return (yp_node_t *) yp_parentheses_node_create(parser, &opening, (yp_node_t *) statements, &parser->previous);
-        }
-        case YP_TOKEN_BRACE_LEFT: {
-            yp_accepts_block_stack_push(parser, true);
-            parser_lex(parser);
-            yp_hash_node_t *node = yp_hash_node_create(parser, &parser->previous);
-
-            if (!match_any_type_p(parser, 2, YP_TOKEN_BRACE_RIGHT, YP_TOKEN_EOF)) {
-                parse_assocs(parser, (yp_node_t *) node);
-                accept(parser, YP_TOKEN_NEWLINE);
-            }
-
-            yp_accepts_block_stack_pop(parser);
-            expect(parser, YP_TOKEN_BRACE_RIGHT, "Expected a closing delimiter for a hash literal.");
-            yp_hash_node_closing_loc_set(node, &parser->previous);
-
-            return (yp_node_t *) node;
-        }
-        case YP_TOKEN_CHARACTER_LITERAL: {
-            parser_lex(parser);
-
-            yp_token_t opening = parser->previous;
-            opening.type = YP_TOKEN_STRING_BEGIN;
-            opening.end = opening.start + 1;
-
-            yp_token_t content = parser->previous;
-            content.type = YP_TOKEN_STRING_CONTENT;
-            content.start = content.start + 1;
-
-            yp_token_t closing = not_provided(parser);
-
-            return (yp_node_t *) yp_char_literal_node_create_and_unescape(parser, &opening, &content, &closing, YP_UNESCAPE_ALL);
-        }
-        case YP_TOKEN_CLASS_VARIABLE: {
-            parser_lex(parser);
-            yp_node_t *node = (yp_node_t *) yp_class_variable_read_node_create(parser, &parser->previous);
-
-            if (binding_power == YP_BINDING_POWER_STATEMENT && match_type_p(parser, YP_TOKEN_COMMA)) {
-                node = parse_targets(parser, node, YP_BINDING_POWER_INDEX);
-            }
-
-            return node;
-        }
-        case YP_TOKEN_CONSTANT: {
-            parser_lex(parser);
-            yp_token_t constant = parser->previous;
-
-            // If a constant is immediately followed by parentheses, then this is in
-            // fact a method call, not a constant read.
-            if (
-                match_type_p(parser, YP_TOKEN_PARENTHESIS_LEFT) ||
-                (binding_power <= YP_BINDING_POWER_ASSIGNMENT && (token_begins_expression_p(parser->current.type) || match_any_type_p(parser, 3, YP_TOKEN_UAMPERSAND, YP_TOKEN_USTAR, YP_TOKEN_USTAR_STAR))) ||
-                (yp_accepts_block_stack_p(parser) && match_any_type_p(parser, 2, YP_TOKEN_KEYWORD_DO, YP_TOKEN_BRACE_LEFT))
-            ) {
-                yp_arguments_t arguments = YP_EMPTY_ARGUMENTS;
-                parse_arguments_list(parser, &arguments, true);
-                return (yp_node_t *) yp_call_node_fcall_create(parser, &constant, &arguments);
-            }
-
-            yp_node_t *node = (yp_node_t *) yp_constant_read_node_create(parser, &parser->previous);
-
-            if ((binding_power == YP_BINDING_POWER_STATEMENT) && match_type_p(parser, YP_TOKEN_COMMA)) {
-                // If we get here, then we have a comma immediately following a
-                // constant, so we're going to parse this as a multiple assignment.
-                node = parse_targets(parser, node, YP_BINDING_POWER_INDEX);
-            }
-
-            return node;
-        }
-        case YP_TOKEN_UCOLON_COLON: {
-            parser_lex(parser);
-
-            yp_token_t delimiter = parser->previous;
-            expect(parser, YP_TOKEN_CONSTANT, "Expected a constant after ::.");
-
-            yp_node_t *constant = (yp_node_t *) yp_constant_read_node_create(parser, &parser->previous);
-            yp_node_t *node = (yp_node_t *)yp_constant_path_node_create(parser, NULL, &delimiter, constant);
-
-            if ((binding_power == YP_BINDING_POWER_STATEMENT) && match_type_p(parser, YP_TOKEN_COMMA)) {
-                node = parse_targets(parser, node, YP_BINDING_POWER_INDEX);
-            }
-
-            return node;
-        }
-        case YP_TOKEN_UDOT_DOT:
-        case YP_TOKEN_UDOT_DOT_DOT: {
-            yp_token_t operator = parser->current;
-            parser_lex(parser);
-
-            yp_node_t *right = parse_expression(parser, binding_power, "Expected a value after the operator.");
-            return (yp_node_t *) yp_range_node_create(parser, NULL, &operator, right);
-        }
-        case YP_TOKEN_FLOAT:
-            parser_lex(parser);
-            return (yp_node_t *) yp_float_node_create(parser, &parser->previous);
-        case YP_TOKEN_FLOAT_IMAGINARY:
-            parser_lex(parser);
-            return (yp_node_t *) yp_float_node_imaginary_create(parser, &parser->previous);
-        case YP_TOKEN_FLOAT_RATIONAL:
-            parser_lex(parser);
-            return (yp_node_t *) yp_float_node_rational_create(parser, &parser->previous);
-        case YP_TOKEN_FLOAT_RATIONAL_IMAGINARY:
-            parser_lex(parser);
-            return (yp_node_t *) yp_float_node_rational_imaginary_create(parser, &parser->previous);
-        case YP_TOKEN_NUMBERED_REFERENCE: {
-            parser_lex(parser);
-            yp_node_t *node = (yp_node_t *) yp_numbered_reference_read_node_create(parser, &parser->previous);
-
-            if (binding_power == YP_BINDING_POWER_STATEMENT && match_type_p(parser, YP_TOKEN_COMMA)) {
-                node = parse_targets(parser, node, YP_BINDING_POWER_INDEX);
-            }
-
-            return node;
-        }
-        case YP_TOKEN_GLOBAL_VARIABLE: {
-            parser_lex(parser);
-            yp_node_t *node = (yp_node_t *) yp_global_variable_read_node_create(parser, &parser->previous);
-
-            if (binding_power == YP_BINDING_POWER_STATEMENT && match_type_p(parser, YP_TOKEN_COMMA)) {
-                node = parse_targets(parser, node, YP_BINDING_POWER_INDEX);
-            }
-
-            return node;
-        }
-        case YP_TOKEN_BACK_REFERENCE: {
-            parser_lex(parser);
-            yp_node_t *node = (yp_node_t *) yp_back_reference_read_node_create(parser, &parser->previous);
-
-            if (binding_power == YP_BINDING_POWER_STATEMENT && match_type_p(parser, YP_TOKEN_COMMA)) {
-                node = parse_targets(parser, node, YP_BINDING_POWER_INDEX);
-            }
-
-            return node;
-        }
-        case YP_TOKEN_IDENTIFIER: {
-            parser_lex(parser);
-            yp_token_t identifier = parser->previous;
-            yp_node_t *node = parse_variable_call(parser);
-
-            if (YP_NODE_TYPE_P(node, YP_CALL_NODE)) {
-                // If parse_variable_call returned with a call node, then we
-                // know the identifier is not in the local table. In that case
-                // we need to check if there are arguments following the
-                // identifier.
-                yp_call_node_t *call = (yp_call_node_t *) node;
-                yp_arguments_t arguments = YP_EMPTY_ARGUMENTS;
-
-                if (parse_arguments_list(parser, &arguments, true)) {
-                    // Since we found arguments, we need to turn off the
-                    // variable call bit in the flags.
-                    call->base.flags &= (yp_node_flags_t) ~YP_CALL_NODE_FLAGS_VARIABLE_CALL;
-
-                    call->opening_loc = arguments.opening_loc;
-                    call->arguments = arguments.arguments;
-                    call->closing_loc = arguments.closing_loc;
-                    call->block = arguments.block;
-
-                    if (arguments.block != NULL) {
-                        call->base.location.end = arguments.block->base.location.end;
-                    } else if (arguments.closing_loc.start == NULL) {
-                        if (arguments.arguments != NULL) {
-                            call->base.location.end = arguments.arguments->base.location.end;
-                        } else {
-                            call->base.location.end = call->message_loc.end;
-                        }
-                    } else {
-                        call->base.location.end = arguments.closing_loc.end;
-                    }
-                }
-            } else {
-                // Otherwise, we know the identifier is in the local table. This
-                // can still be a method call if it is followed by arguments or
-                // a block, so we need to check for that here.
-                if (
-                    (binding_power <= YP_BINDING_POWER_ASSIGNMENT && (token_begins_expression_p(parser->current.type) || match_any_type_p(parser, 3, YP_TOKEN_UAMPERSAND, YP_TOKEN_USTAR, YP_TOKEN_USTAR_STAR))) ||
-                    (yp_accepts_block_stack_p(parser) && match_any_type_p(parser, 2, YP_TOKEN_KEYWORD_DO, YP_TOKEN_BRACE_LEFT))
-                ) {
-                    yp_arguments_t arguments = YP_EMPTY_ARGUMENTS;
-                    parse_arguments_list(parser, &arguments, true);
-
-                    yp_call_node_t *fcall = yp_call_node_fcall_create(parser, &identifier, &arguments);
-                    yp_node_destroy(parser, node);
-                    return (yp_node_t *) fcall;
-                }
-            }
-
-            if ((binding_power == YP_BINDING_POWER_STATEMENT) && match_type_p(parser, YP_TOKEN_COMMA)) {
-                node = parse_targets(parser, node, YP_BINDING_POWER_INDEX);
-            }
-
-            return node;
-        }
-        case YP_TOKEN_HEREDOC_START: {
-            assert(parser->lex_modes.current->mode == YP_LEX_HEREDOC);
-            yp_heredoc_quote_t quote = parser->lex_modes.current->as.heredoc.quote;
-            yp_heredoc_indent_t indent = parser->lex_modes.current->as.heredoc.indent;
-
-            yp_node_t *node;
-            if (quote == YP_HEREDOC_QUOTE_BACKTICK) {
-                node = (yp_node_t *) yp_interpolated_xstring_node_create(parser, &parser->current, &parser->current);
-            } else {
-                node = (yp_node_t *) yp_interpolated_string_node_create(parser, &parser->current, NULL, &parser->current);
-            }
-
-            parser_lex(parser);
-            yp_node_t *part;
-
-            while (!match_any_type_p(parser, 2, YP_TOKEN_HEREDOC_END, YP_TOKEN_EOF)) {
-                if ((part = parse_string_part(parser)) == NULL) continue;
-
-                if (quote == YP_HEREDOC_QUOTE_BACKTICK) {
-                    yp_interpolated_xstring_node_append((yp_interpolated_x_string_node_t *) node, part);
-                } else {
-                    yp_interpolated_string_node_append((yp_interpolated_string_node_t *) node, part);
-                }
-            }
-
-            lex_state_set(parser, YP_LEX_STATE_END);
-            expect(parser, YP_TOKEN_HEREDOC_END, "Expected a closing delimiter for heredoc.");
-
-            if (quote == YP_HEREDOC_QUOTE_BACKTICK) {
-                assert(YP_NODE_TYPE_P(node, YP_INTERPOLATED_X_STRING_NODE));
-                yp_interpolated_xstring_node_closing_set(((yp_interpolated_x_string_node_t *) node), &parser->previous);
-                node->location = ((yp_interpolated_x_string_node_t *) node)->opening_loc;
-            } else {
-                assert(YP_NODE_TYPE_P(node, YP_INTERPOLATED_STRING_NODE));
-                yp_interpolated_string_node_closing_set((yp_interpolated_string_node_t *) node, &parser->previous);
-                node->location = ((yp_interpolated_string_node_t *) node)->opening_loc;
-            }
-
-            // If this is a heredoc that is indented with a ~, then we need to dedent
-            // each line by the common leading whitespace.
-            if (indent == YP_HEREDOC_INDENT_TILDE) {
-                parse_heredoc_dedent(parser, node, quote);
-            }
-
-            // If there's a string immediately following this heredoc, then it's a
-            // concatenatation. In this case we'll parse the next string and create a
-            // node in the tree that concatenates the two strings.
-            if (parser->current.type == YP_TOKEN_STRING_BEGIN) {
-                return (yp_node_t *) yp_string_concat_node_create(
-                    parser,
-                    node,
-                    parse_expression(parser, YP_BINDING_POWER_CALL, "Expected string on the right side of concatenation.")
-                );
-            } else {
-                return node;
-            }
-        }
-        case YP_TOKEN_INSTANCE_VARIABLE: {
-            parser_lex(parser);
-            yp_node_t *node = (yp_node_t *) yp_instance_variable_read_node_create(parser, &parser->previous);
-
-            if (binding_power == YP_BINDING_POWER_STATEMENT && match_type_p(parser, YP_TOKEN_COMMA)) {
-                node = parse_targets(parser, node, YP_BINDING_POWER_INDEX);
-            }
-
-            return node;
-        }
-        case YP_TOKEN_INTEGER:
-            parser_lex(parser);
-            return (yp_node_t *) yp_integer_node_create(parser, &parser->previous);
-        case YP_TOKEN_INTEGER_IMAGINARY:
-            parser_lex(parser);
-            return (yp_node_t *) yp_integer_node_imaginary_create(parser, &parser->previous);
-        case YP_TOKEN_INTEGER_RATIONAL:
-            parser_lex(parser);
-            return (yp_node_t *) yp_integer_node_rational_create(parser, &parser->previous);
-        case YP_TOKEN_INTEGER_RATIONAL_IMAGINARY:
-            parser_lex(parser);
-            return (yp_node_t *) yp_integer_node_rational_imaginary_create(parser, &parser->previous);
-        case YP_TOKEN_KEYWORD___ENCODING__:
-            parser_lex(parser);
-            return (yp_node_t *) yp_source_encoding_node_create(parser, &parser->previous);
-        case YP_TOKEN_KEYWORD___FILE__:
-            parser_lex(parser);
-            return (yp_node_t *) yp_source_file_node_create(parser, &parser->previous);
-        case YP_TOKEN_KEYWORD___LINE__:
-            parser_lex(parser);
-            return (yp_node_t *) yp_source_line_node_create(parser, &parser->previous);
-        case YP_TOKEN_KEYWORD_ALIAS: {
-            parser_lex(parser);
-            yp_token_t keyword = parser->previous;
-
-            yp_node_t *new_name = parse_alias_argument(parser, true);
-            yp_node_t *old_name = parse_alias_argument(parser, false);
-
-            switch (YP_NODE_TYPE(new_name)) {
-                case YP_SYMBOL_NODE:
-                case YP_INTERPOLATED_SYMBOL_NODE: {
-                    if (!YP_NODE_TYPE_P(old_name, YP_SYMBOL_NODE) && !YP_NODE_TYPE_P(old_name, YP_INTERPOLATED_SYMBOL_NODE)) {
-                        yp_diagnostic_list_append(&parser->error_list, old_name->location.start, old_name->location.end, "Expected a bare word or symbol argument.");
-                    }
-                    break;
-                }
-                case YP_BACK_REFERENCE_READ_NODE:
-                case YP_NUMBERED_REFERENCE_READ_NODE:
-                case YP_GLOBAL_VARIABLE_READ_NODE: {
-                    if (YP_NODE_TYPE_P(old_name, YP_BACK_REFERENCE_READ_NODE) || YP_NODE_TYPE_P(old_name, YP_NUMBERED_REFERENCE_READ_NODE) || YP_NODE_TYPE_P(old_name, YP_GLOBAL_VARIABLE_READ_NODE)) {
-                        if (YP_NODE_TYPE_P(old_name, YP_NUMBERED_REFERENCE_READ_NODE)) {
-                            yp_diagnostic_list_append(&parser->error_list, old_name->location.start, old_name->location.end, "Can't make alias for number variables.");
-                        }
-                    } else {
-                        yp_diagnostic_list_append(&parser->error_list, old_name->location.start, old_name->location.end, "Expected a global variable.");
-                    }
-                    break;
-                }
-                default:
-                    break;
-            }
-
-            return (yp_node_t *) yp_alias_node_create(parser, &keyword, new_name, old_name);
-        }
-        case YP_TOKEN_KEYWORD_CASE: {
-            parser_lex(parser);
-            yp_token_t case_keyword = parser->previous;
-            yp_node_t *predicate = NULL;
-
-            if (
-                accept_any(parser, 2, YP_TOKEN_NEWLINE, YP_TOKEN_SEMICOLON) ||
-                match_any_type_p(parser, 3, YP_TOKEN_KEYWORD_WHEN, YP_TOKEN_KEYWORD_IN, YP_TOKEN_KEYWORD_END) ||
-                !token_begins_expression_p(parser->current.type)
-            ) {
-                predicate = NULL;
-            } else {
-                predicate = parse_expression(parser, YP_BINDING_POWER_COMPOSITION, "Expected a value after case keyword.");
-                while (accept_any(parser, 2, YP_TOKEN_NEWLINE, YP_TOKEN_SEMICOLON));
-            }
-
-            if (accept(parser, YP_TOKEN_KEYWORD_END)) {
-                return (yp_node_t *) yp_case_node_create(parser, &case_keyword, predicate, NULL, &parser->previous);
-            }
-
-            // At this point we can create a case node, though we don't yet know if it
-            // is a case-in or case-when node.
-            yp_token_t end_keyword = not_provided(parser);
-            yp_case_node_t *case_node = yp_case_node_create(parser, &case_keyword, predicate, NULL, &end_keyword);
-
-            if (match_type_p(parser, YP_TOKEN_KEYWORD_WHEN)) {
-                // At this point we've seen a when keyword, so we know this is a
-                // case-when node. We will continue to parse the when nodes until we hit
-                // the end of the list.
-                while (accept(parser, YP_TOKEN_KEYWORD_WHEN)) {
-                    yp_token_t when_keyword = parser->previous;
-                    yp_when_node_t *when_node = yp_when_node_create(parser, &when_keyword);
-
-                    do {
-                        if (accept(parser, YP_TOKEN_USTAR)) {
-                            yp_token_t operator = parser->previous;
-                            yp_node_t *expression = parse_expression(parser, YP_BINDING_POWER_DEFINED, "Expected a value after `*' operator.");
-
-                            yp_splat_node_t *splat_node = yp_splat_node_create(parser, &operator, expression);
-                            yp_when_node_conditions_append(when_node, (yp_node_t *) splat_node);
-
-                            if (YP_NODE_TYPE_P(expression, YP_MISSING_NODE)) break;
-                        } else {
-                            yp_node_t *condition = parse_expression(parser, YP_BINDING_POWER_DEFINED, "Expected a value after when keyword.");
-                            yp_when_node_conditions_append(when_node, condition);
-
-                            if (YP_NODE_TYPE_P(condition, YP_MISSING_NODE)) break;
-                        }
-                    } while (accept(parser, YP_TOKEN_COMMA));
-
-                    if (accept_any(parser, 2, YP_TOKEN_NEWLINE, YP_TOKEN_SEMICOLON)) {
-                        accept(parser, YP_TOKEN_KEYWORD_THEN);
-                    } else {
-                        expect(parser, YP_TOKEN_KEYWORD_THEN, "Expected a delimiter after the predicates of a `when' clause.");
-                    }
-
-                    if (!match_any_type_p(parser, 3, YP_TOKEN_KEYWORD_WHEN, YP_TOKEN_KEYWORD_ELSE, YP_TOKEN_KEYWORD_END)) {
-                        yp_statements_node_t *statements = parse_statements(parser, YP_CONTEXT_CASE_WHEN);
-                        if (statements != NULL) {
-                            yp_when_node_statements_set(when_node, statements);
-                        }
-                    }
-
-                    yp_case_node_condition_append(case_node, (yp_node_t *) when_node);
-                }
-            } else {
-                // At this point we expect that we're parsing a case-in node. We will
-                // continue to parse the in nodes until we hit the end of the list.
-                while (match_type_p(parser, YP_TOKEN_KEYWORD_IN)) {
-                    bool previous_pattern_matching_newlines = parser->pattern_matching_newlines;
-                    parser->pattern_matching_newlines = true;
-
-                    lex_state_set(parser, YP_LEX_STATE_BEG | YP_LEX_STATE_LABEL);
-                    parser->command_start = false;
-                    parser_lex(parser);
-
-                    yp_token_t in_keyword = parser->previous;
-                    yp_node_t *pattern = parse_pattern(parser, true, "Expected a pattern after `in' keyword.");
-                    parser->pattern_matching_newlines = previous_pattern_matching_newlines;
-
-                    // Since we're in the top-level of the case-in node we need to check
-                    // for guard clauses in the form of `if` or `unless` statements.
-                    if (accept(parser, YP_TOKEN_KEYWORD_IF_MODIFIER)) {
-                        yp_token_t keyword = parser->previous;
-                        yp_node_t *predicate = parse_expression(parser, YP_BINDING_POWER_DEFINED, "Expected a value after guard keyword.");
-                        pattern = (yp_node_t *) yp_if_node_modifier_create(parser, pattern, &keyword, predicate);
-                    } else if (accept(parser, YP_TOKEN_KEYWORD_UNLESS_MODIFIER)) {
-                        yp_token_t keyword = parser->previous;
-                        yp_node_t *predicate = parse_expression(parser, YP_BINDING_POWER_DEFINED, "Expected a value after guard keyword.");
-                        pattern = (yp_node_t *) yp_unless_node_modifier_create(parser, pattern, &keyword, predicate);
-                    }
-
-                    // Now we need to check for the terminator of the in node's pattern.
-                    // It can be a newline or semicolon optionally followed by a `then`
-                    // keyword.
-                    yp_token_t then_keyword;
-                    if (accept_any(parser, 2, YP_TOKEN_NEWLINE, YP_TOKEN_SEMICOLON)) {
-                        if (accept(parser, YP_TOKEN_KEYWORD_THEN)) {
-                            then_keyword = parser->previous;
-                        } else {
-                            then_keyword = not_provided(parser);
-                        }
-                    } else {
-                        expect(parser, YP_TOKEN_KEYWORD_THEN, "Expected a delimiter after the predicates of an `in' clause.");
-                        then_keyword = parser->previous;
-                    }
-
-                    // Now we can actually parse the statements associated with the in
-                    // node.
-                    yp_statements_node_t *statements;
-                    if (match_any_type_p(parser, 3, YP_TOKEN_KEYWORD_IN, YP_TOKEN_KEYWORD_ELSE, YP_TOKEN_KEYWORD_END)) {
-                        statements = NULL;
-                    } else {
-                        statements = parse_statements(parser, YP_CONTEXT_CASE_IN);
-                    }
-
-                    // Now that we have the full pattern and statements, we can create the
-                    // node and attach it to the case node.
-                    yp_node_t *condition = (yp_node_t *) yp_in_node_create(parser, pattern, statements, &in_keyword, &then_keyword);
-                    yp_case_node_condition_append(case_node, condition);
-                }
-            }
-
-            accept_any(parser, 2, YP_TOKEN_NEWLINE, YP_TOKEN_SEMICOLON);
-            if (accept(parser, YP_TOKEN_KEYWORD_ELSE)) {
-                if (case_node->conditions.size < 1) {
-                    yp_diagnostic_list_append(&parser->error_list, parser->previous.start, parser->previous.end, "Unexpected else without no when clauses in case statement.");
-                }
-
-                yp_token_t else_keyword = parser->previous;
-                yp_else_node_t *else_node;
-
-                if (!match_type_p(parser, YP_TOKEN_KEYWORD_END)) {
-                    else_node = yp_else_node_create(parser, &else_keyword, parse_statements(parser, YP_CONTEXT_ELSE), &parser->current);
-                } else {
-                    else_node = yp_else_node_create(parser, &else_keyword, NULL, &parser->current);
-                }
-
-                yp_case_node_consequent_set(case_node, else_node);
-            }
-
-            expect(parser, YP_TOKEN_KEYWORD_END, "Expected case statement to end with an end keyword.");
-            yp_case_node_end_keyword_loc_set(case_node, &parser->previous);
-            return (yp_node_t *) case_node;
-        }
-        case YP_TOKEN_KEYWORD_BEGIN: {
-            parser_lex(parser);
-
-            yp_token_t begin_keyword = parser->previous;
-            accept_any(parser, 2, YP_TOKEN_NEWLINE, YP_TOKEN_SEMICOLON);
-            yp_statements_node_t *begin_statements = NULL;
-
-            if (!match_any_type_p(parser, 3, YP_TOKEN_KEYWORD_RESCUE, YP_TOKEN_KEYWORD_ENSURE, YP_TOKEN_KEYWORD_END)) {
-                yp_accepts_block_stack_push(parser, true);
-                begin_statements = parse_statements(parser, YP_CONTEXT_BEGIN);
-                yp_accepts_block_stack_pop(parser);
-                accept_any(parser, 2, YP_TOKEN_NEWLINE, YP_TOKEN_SEMICOLON);
-            }
-
-            yp_begin_node_t *begin_node = yp_begin_node_create(parser, &begin_keyword, begin_statements);
-            parse_rescues(parser, begin_node);
-
-            expect(parser, YP_TOKEN_KEYWORD_END, "Expected `end` to close `begin` statement.");
-            begin_node->base.location.end = parser->previous.end;
-            yp_begin_node_end_keyword_set(begin_node, &parser->previous);
-
-            if ((begin_node->else_clause != NULL) && (begin_node->rescue_clause == NULL)) {
-                yp_diagnostic_list_append(
-                    &parser->error_list,
-                    begin_node->else_clause->base.location.start,
-                    begin_node->else_clause->base.location.end,
-                    "else without rescue is useless"
-                );
-            }
-
-            return (yp_node_t *) begin_node;
-        }
-        case YP_TOKEN_KEYWORD_BEGIN_UPCASE: {
-            parser_lex(parser);
-            yp_token_t keyword = parser->previous;
-
-            expect(parser, YP_TOKEN_BRACE_LEFT, "Expected '{' after 'BEGIN'.");
-            yp_token_t opening = parser->previous;
-            yp_statements_node_t *statements = parse_statements(parser, YP_CONTEXT_PREEXE);
-
-            expect(parser, YP_TOKEN_BRACE_RIGHT, "Expected '}' after 'BEGIN' statements.");
-            return (yp_node_t *) yp_pre_execution_node_create(parser, &keyword, &opening, statements, &parser->previous);
-        }
-        case YP_TOKEN_KEYWORD_BREAK:
-        case YP_TOKEN_KEYWORD_NEXT:
-        case YP_TOKEN_KEYWORD_RETURN: {
-            parser_lex(parser);
-
-            yp_token_t keyword = parser->previous;
-            yp_arguments_t arguments = YP_EMPTY_ARGUMENTS;
-
-            if (
-                token_begins_expression_p(parser->current.type) ||
-                match_any_type_p(parser, 2, YP_TOKEN_USTAR, YP_TOKEN_USTAR_STAR)
-            ) {
-                yp_binding_power_t binding_power = yp_binding_powers[parser->current.type].left;
-
-                if (binding_power == YP_BINDING_POWER_UNSET || binding_power >= YP_BINDING_POWER_RANGE) {
-                    arguments.arguments = yp_arguments_node_create(parser);
-                    parse_arguments(parser, &arguments, false, YP_TOKEN_EOF);
-                }
-            }
-
-            switch (keyword.type) {
-                case YP_TOKEN_KEYWORD_BREAK:
-                    return (yp_node_t *) yp_break_node_create(parser, &keyword, arguments.arguments);
-                case YP_TOKEN_KEYWORD_NEXT:
-                    return (yp_node_t *) yp_next_node_create(parser, &keyword, arguments.arguments);
-                case YP_TOKEN_KEYWORD_RETURN: {
-                    if (
-                        (parser->current_context->context == YP_CONTEXT_CLASS) ||
-                        (parser->current_context->context == YP_CONTEXT_MODULE)
-                    ) {
-                        yp_diagnostic_list_append(&parser->error_list, parser->current.start, parser->current.end, "Invalid return in class/module body");
-                    }
-                    return (yp_node_t *) yp_return_node_create(parser, &keyword, arguments.arguments);
-                }
-                default:
-                    assert(false && "unreachable");
-                    return (yp_node_t *) yp_missing_node_create(parser, parser->previous.start, parser->previous.end);
-            }
-        }
-        case YP_TOKEN_KEYWORD_SUPER: {
-            parser_lex(parser);
-
-            yp_token_t keyword = parser->previous;
-            yp_arguments_t arguments = YP_EMPTY_ARGUMENTS;
-            parse_arguments_list(parser, &arguments, true);
-
-            if (arguments.opening_loc.start == NULL && arguments.arguments == NULL) {
-                return (yp_node_t *) yp_forwarding_super_node_create(parser, &keyword, &arguments);
-            }
-
-            return (yp_node_t *) yp_super_node_create(parser, &keyword, &arguments);
-        }
-        case YP_TOKEN_KEYWORD_YIELD: {
-            parser_lex(parser);
-
-            yp_token_t keyword = parser->previous;
-            yp_arguments_t arguments = YP_EMPTY_ARGUMENTS;
-            parse_arguments_list(parser, &arguments, false);
-
-            return (yp_node_t *) yp_yield_node_create(parser, &keyword, &arguments.opening_loc, arguments.arguments, &arguments.closing_loc);
-        }
-        case YP_TOKEN_KEYWORD_CLASS: {
-            parser_lex(parser);
-            yp_token_t class_keyword = parser->previous;
-            yp_do_loop_stack_push(parser, false);
-
-            if (accept(parser, YP_TOKEN_LESS_LESS)) {
-                yp_token_t operator = parser->previous;
-                yp_node_t *expression = parse_expression(parser, YP_BINDING_POWER_NOT, "Expected to find an expression after `<<`.");
-
-                yp_parser_scope_push(parser, true);
-                accept_any(parser, 2, YP_TOKEN_NEWLINE, YP_TOKEN_SEMICOLON);
-
-                yp_node_t *statements = NULL;
-                if (!match_any_type_p(parser, 3, YP_TOKEN_KEYWORD_RESCUE, YP_TOKEN_KEYWORD_ENSURE, YP_TOKEN_KEYWORD_END)) {
-                    yp_accepts_block_stack_push(parser, true);
-                    statements = (yp_node_t *) parse_statements(parser, YP_CONTEXT_SCLASS);
-                    yp_accepts_block_stack_pop(parser);
-                }
-
-                if (match_any_type_p(parser, 2, YP_TOKEN_KEYWORD_RESCUE, YP_TOKEN_KEYWORD_ENSURE)) {
-                    assert(statements == NULL || YP_NODE_TYPE_P(statements, YP_STATEMENTS_NODE));
-                    statements = (yp_node_t *) parse_rescues_as_begin(parser, (yp_statements_node_t *) statements);
-                }
-
-                expect(parser, YP_TOKEN_KEYWORD_END, "Expected `end` to close `class` statement.");
-
-                yp_constant_id_list_t locals = parser->current_scope->locals;
-                yp_parser_scope_pop(parser);
-                yp_do_loop_stack_pop(parser);
-                return (yp_node_t *) yp_singleton_class_node_create(parser, &locals, &class_keyword, &operator, expression, statements, &parser->previous);
-            }
-
-            yp_node_t *constant_path = parse_expression(parser, YP_BINDING_POWER_INDEX, "Expected to find a class name after `class`.");
-            yp_token_t name = parser->previous;
-            if (name.type != YP_TOKEN_CONSTANT) {
-                yp_diagnostic_list_append(&parser->error_list, name.start, name.end, "Expected a constant name after `class`.");
-            }
-
-            yp_token_t inheritance_operator;
-            yp_node_t *superclass;
-
-            if (match_type_p(parser, YP_TOKEN_LESS)) {
-                inheritance_operator = parser->current;
-                lex_state_set(parser, YP_LEX_STATE_BEG);
-
-                parser->command_start = true;
-                parser_lex(parser);
-
-                superclass = parse_expression(parser, YP_BINDING_POWER_COMPOSITION, "Expected to find a superclass after `<`.");
-            } else {
-                inheritance_operator = not_provided(parser);
-                superclass = NULL;
-            }
-
-            yp_parser_scope_push(parser, true);
-            accept_any(parser, 2, YP_TOKEN_NEWLINE, YP_TOKEN_SEMICOLON);
-            yp_node_t *statements = NULL;
-
-            if (!match_any_type_p(parser, 3, YP_TOKEN_KEYWORD_RESCUE, YP_TOKEN_KEYWORD_ENSURE, YP_TOKEN_KEYWORD_END)) {
-                yp_accepts_block_stack_push(parser, true);
-                statements = (yp_node_t *) parse_statements(parser, YP_CONTEXT_CLASS);
-                yp_accepts_block_stack_pop(parser);
-            }
-
-            if (match_any_type_p(parser, 2, YP_TOKEN_KEYWORD_RESCUE, YP_TOKEN_KEYWORD_ENSURE)) {
-                assert(statements == NULL || YP_NODE_TYPE_P(statements, YP_STATEMENTS_NODE));
-                statements = (yp_node_t *) parse_rescues_as_begin(parser, (yp_statements_node_t *) statements);
-            }
-
-            expect(parser, YP_TOKEN_KEYWORD_END, "Expected `end` to close `class` statement.");
-
-            if (context_def_p(parser)) {
-                yp_diagnostic_list_append(&parser->error_list, class_keyword.start, class_keyword.end, "Class definition in method body");
-            }
-
-            yp_constant_id_list_t locals = parser->current_scope->locals;
-            yp_parser_scope_pop(parser);
-            yp_do_loop_stack_pop(parser);
-            return (yp_node_t *) yp_class_node_create(parser, &locals, &class_keyword, constant_path, &name, &inheritance_operator, superclass, statements, &parser->previous);
-        }
-        case YP_TOKEN_KEYWORD_DEF: {
-            yp_token_t def_keyword = parser->current;
-
-            yp_node_t *receiver = NULL;
-            yp_token_t operator = not_provided(parser);
-            yp_token_t name = not_provided(parser);
-
-            context_push(parser, YP_CONTEXT_DEF_PARAMS);
-            parser_lex(parser);
-
-            switch (parser->current.type) {
-                case YP_CASE_OPERATOR:
-                    yp_parser_scope_push(parser, true);
-                    lex_state_set(parser, YP_LEX_STATE_ENDFN);
-                    parser_lex(parser);
-                    name = parser->previous;
-                    break;
-                case YP_TOKEN_IDENTIFIER: {
-                    yp_parser_scope_push(parser, true);
-                    parser_lex(parser);
-
-                    if (match_any_type_p(parser, 2, YP_TOKEN_DOT, YP_TOKEN_COLON_COLON)) {
-                        receiver = parse_variable_call(parser);
-
-                        lex_state_set(parser, YP_LEX_STATE_FNAME);
-                        parser_lex(parser);
-
-                        operator = parser->previous;
-                        name = parse_method_definition_name(parser);
-
-                        if (name.type == YP_TOKEN_MISSING) {
-                            yp_diagnostic_list_append(&parser->error_list, parser->previous.start, parser->previous.end, "Expected a method name after receiver.");
-                        }
-                    } else {
-                        name = parser->previous;
-                    }
-
-                    break;
-                }
-                case YP_TOKEN_CONSTANT:
-                case YP_TOKEN_INSTANCE_VARIABLE:
-                case YP_TOKEN_CLASS_VARIABLE:
-                case YP_TOKEN_GLOBAL_VARIABLE:
-                case YP_TOKEN_KEYWORD_NIL:
-                case YP_TOKEN_KEYWORD_SELF:
-                case YP_TOKEN_KEYWORD_TRUE:
-                case YP_TOKEN_KEYWORD_FALSE:
-                case YP_TOKEN_KEYWORD___FILE__:
-                case YP_TOKEN_KEYWORD___LINE__:
-                case YP_TOKEN_KEYWORD___ENCODING__: {
-                    yp_parser_scope_push(parser, true);
-                    parser_lex(parser);
-                    yp_token_t identifier = parser->previous;
-
-                    if (match_any_type_p(parser, 2, YP_TOKEN_DOT, YP_TOKEN_COLON_COLON)) {
-                        lex_state_set(parser, YP_LEX_STATE_FNAME);
-                        parser_lex(parser);
-                        operator = parser->previous;
-
-                        switch (identifier.type) {
-                            case YP_TOKEN_CONSTANT:
-                                receiver = (yp_node_t *) yp_constant_read_node_create(parser, &identifier);
-                                break;
-                            case YP_TOKEN_INSTANCE_VARIABLE:
-                                receiver = (yp_node_t *) yp_instance_variable_read_node_create(parser, &identifier);
-                                break;
-                            case YP_TOKEN_CLASS_VARIABLE:
-                                receiver = (yp_node_t *) yp_class_variable_read_node_create(parser, &identifier);
-                                break;
-                            case YP_TOKEN_GLOBAL_VARIABLE:
-                                receiver = (yp_node_t *) yp_global_variable_read_node_create(parser, &identifier);
-                                break;
-                            case YP_TOKEN_KEYWORD_NIL:
-                                receiver = (yp_node_t *) yp_nil_node_create(parser, &identifier);
-                                break;
-                            case YP_TOKEN_KEYWORD_SELF:
-                                receiver = (yp_node_t *) yp_self_node_create(parser, &identifier);
-                                break;
-                            case YP_TOKEN_KEYWORD_TRUE:
-                                receiver = (yp_node_t *) yp_true_node_create(parser, &identifier);
-                                break;
-                            case YP_TOKEN_KEYWORD_FALSE:
-                                receiver = (yp_node_t *)yp_false_node_create(parser, &identifier);
-                                break;
-                            case YP_TOKEN_KEYWORD___FILE__:
-                                receiver = (yp_node_t *) yp_source_file_node_create(parser, &identifier);
-                                break;
-                            case YP_TOKEN_KEYWORD___LINE__:
-                                receiver = (yp_node_t *) yp_source_line_node_create(parser, &identifier);
-                                break;
-                            case YP_TOKEN_KEYWORD___ENCODING__:
-                                receiver = (yp_node_t *) yp_source_encoding_node_create(parser, &identifier);
-                                break;
-                            default:
-                                break;
-                        }
-
-                        name = parse_method_definition_name(parser);
-                        if (name.type == YP_TOKEN_MISSING) {
-                            yp_diagnostic_list_append(&parser->error_list, parser->previous.start, parser->previous.end, "Expected a method name after receiver.");
-                        }
-                    } else {
-                        name = identifier;
-                    }
-                    break;
-                }
-                case YP_TOKEN_PARENTHESIS_LEFT: {
-                    parser_lex(parser);
-                    yp_token_t lparen = parser->previous;
-                    yp_node_t *expression = parse_expression(parser, YP_BINDING_POWER_STATEMENT, "Expected to be able to parse receiver.");
-
-                    expect(parser, YP_TOKEN_PARENTHESIS_RIGHT, "Expected closing ')' for receiver.");
-                    yp_token_t rparen = parser->previous;
-
-                    lex_state_set(parser, YP_LEX_STATE_FNAME);
-                    expect_any(parser, "Expected '.' or '::' after receiver", 2, YP_TOKEN_DOT, YP_TOKEN_COLON_COLON);
-
-                    operator = parser->previous;
-                    receiver = (yp_node_t *) yp_parentheses_node_create(parser, &lparen, expression, &rparen);
-
-                    yp_parser_scope_push(parser, true);
-                    name = parse_method_definition_name(parser);
-                    break;
-                }
-                default:
-                    yp_parser_scope_push(parser, true);
-                    name = parse_method_definition_name(parser);
-
-                    if (name.type == YP_TOKEN_MISSING) {
-                        yp_diagnostic_list_append(&parser->error_list, parser->previous.start, parser->previous.end, "Expected a method name after receiver.");
-                    }
-                    break;
-            }
-
-            yp_token_t lparen;
-            yp_token_t rparen;
-            yp_parameters_node_t *params;
-
-            switch (parser->current.type) {
-                case YP_TOKEN_PARENTHESIS_LEFT: {
-                    parser_lex(parser);
-                    lparen = parser->previous;
-
-                    if (match_type_p(parser, YP_TOKEN_PARENTHESIS_RIGHT)) {
-                        params = NULL;
-                    } else {
-                        params = parse_parameters(parser, YP_BINDING_POWER_DEFINED, true, false, true);
-                    }
-
-                    lex_state_set(parser, YP_LEX_STATE_BEG);
-                    parser->command_start = true;
-
-                    expect(parser, YP_TOKEN_PARENTHESIS_RIGHT, "Expected ')' after left parenthesis.");
-                    rparen = parser->previous;
-                    break;
-                }
-                case YP_CASE_PARAMETER: {
-                    // If we're about to lex a label, we need to add the label
-                    // state to make sure the next newline is ignored.
-                    if (parser->current.type == YP_TOKEN_LABEL) {
-                        lex_state_set(parser, parser->lex_state | YP_LEX_STATE_LABEL);
-                    }
-
-                    lparen = not_provided(parser);
-                    rparen = not_provided(parser);
-                    params = parse_parameters(parser, YP_BINDING_POWER_DEFINED, false, false, true);
-                    break;
-                }
-                default: {
-                    lparen = not_provided(parser);
-                    rparen = not_provided(parser);
-                    params = NULL;
-                    break;
-                }
-            }
-
-            context_pop(parser);
-            yp_node_t *statements = NULL;
-            yp_token_t equal;
-            yp_token_t end_keyword;
-
-            if (accept(parser, YP_TOKEN_EQUAL)) {
-                if (token_is_setter_name(&name)) {
-                    yp_diagnostic_list_append(&parser->error_list, name.start, name.end, "Setter method cannot be defined in an endless method definition");
-                }
-                equal = parser->previous;
-
-                context_push(parser, YP_CONTEXT_DEF);
-                statements = (yp_node_t *) yp_statements_node_create(parser);
-
-                yp_node_t *statement = parse_expression(parser, YP_BINDING_POWER_DEFINED + 1, "Expected to be able to parse body of endless method definition.");
-
-                if (accept(parser, YP_TOKEN_KEYWORD_RESCUE_MODIFIER)) {
-                    yp_token_t rescue_keyword = parser->previous;
-                    yp_node_t *value = parse_expression(parser, binding_power, "Expected a value after the rescue keyword.");
-                    yp_rescue_modifier_node_t *rescue_node = yp_rescue_modifier_node_create(parser, statement, &rescue_keyword, value);
-                    statement = (yp_node_t *)rescue_node;
-                }
-
-                yp_statements_node_body_append((yp_statements_node_t *) statements, statement);
-                context_pop(parser);
-                end_keyword = not_provided(parser);
-            } else {
-                equal = not_provided(parser);
-
-                if (lparen.type == YP_TOKEN_NOT_PROVIDED) {
-                    lex_state_set(parser, YP_LEX_STATE_BEG);
-                    parser->command_start = true;
-                    expect_any(parser, "Expected a terminator after the parameters", 2, YP_TOKEN_NEWLINE, YP_TOKEN_SEMICOLON);
-                } else {
-                    accept_any(parser, 2, YP_TOKEN_NEWLINE, YP_TOKEN_SEMICOLON);
-                }
-
-                yp_accepts_block_stack_push(parser, true);
-                yp_do_loop_stack_push(parser, false);
-
-                if (!match_any_type_p(parser, 3, YP_TOKEN_KEYWORD_RESCUE, YP_TOKEN_KEYWORD_ENSURE, YP_TOKEN_KEYWORD_END)) {
-                    yp_accepts_block_stack_push(parser, true);
-                    statements = (yp_node_t *) parse_statements(parser, YP_CONTEXT_DEF);
-                    yp_accepts_block_stack_pop(parser);
-                }
-
-                if (match_any_type_p(parser, 2, YP_TOKEN_KEYWORD_RESCUE, YP_TOKEN_KEYWORD_ENSURE)) {
-                    assert(statements == NULL || YP_NODE_TYPE_P(statements, YP_STATEMENTS_NODE));
-                    statements = (yp_node_t *) parse_rescues_as_begin(parser, (yp_statements_node_t *) statements);
-                }
-
-                yp_accepts_block_stack_pop(parser);
-                yp_do_loop_stack_pop(parser);
-                expect(parser, YP_TOKEN_KEYWORD_END, "Expected `end` to close `def` statement.");
-                end_keyword = parser->previous;
-            }
-
-            yp_constant_id_list_t locals = parser->current_scope->locals;
-            yp_parser_scope_pop(parser);
-
-            return (yp_node_t *) yp_def_node_create(
-                parser,
-                &name,
-                receiver,
-                params,
-                statements,
-                &locals,
-                &def_keyword,
-                &operator,
-                &lparen,
-                &rparen,
-                &equal,
-                &end_keyword
-            );
-        }
-        case YP_TOKEN_KEYWORD_DEFINED: {
-            parser_lex(parser);
-            yp_token_t keyword = parser->previous;
-
-            yp_token_t lparen;
-            yp_token_t rparen;
-            yp_node_t *expression;
-
-            if (accept(parser, YP_TOKEN_PARENTHESIS_LEFT)) {
-                lparen = parser->previous;
-                expression = parse_expression(parser, YP_BINDING_POWER_COMPOSITION, "Expected expression after `defined?`.");
-
-                if (parser->recovering) {
-                    rparen = not_provided(parser);
-                } else {
-                    expect(parser, YP_TOKEN_PARENTHESIS_RIGHT, "Expected ')' after 'defined?' expression.");
-                    rparen = parser->previous;
-                }
-            } else {
-                lparen = not_provided(parser);
-                rparen = not_provided(parser);
-                expression = parse_expression(parser, YP_BINDING_POWER_DEFINED, "Expected expression after `defined?`.");
-            }
-
-            return (yp_node_t *) yp_defined_node_create(
-                parser,
-                &lparen,
-                expression,
-                &rparen,
-                &(yp_location_t) { .start = keyword.start, .end = keyword.end }
-            );
-        }
-        case YP_TOKEN_KEYWORD_END_UPCASE: {
-            parser_lex(parser);
-            yp_token_t keyword = parser->previous;
-
-            expect(parser, YP_TOKEN_BRACE_LEFT, "Expected '{' after 'END'.");
-            yp_token_t opening = parser->previous;
-            yp_statements_node_t *statements = parse_statements(parser, YP_CONTEXT_POSTEXE);
-
-            expect(parser, YP_TOKEN_BRACE_RIGHT, "Expected '}' after 'END' statements.");
-            return (yp_node_t *) yp_post_execution_node_create(parser, &keyword, &opening, statements, &parser->previous);
-        }
-        case YP_TOKEN_KEYWORD_FALSE:
-            parser_lex(parser);
-            return (yp_node_t *)yp_false_node_create(parser, &parser->previous);
-        case YP_TOKEN_KEYWORD_FOR: {
-            parser_lex(parser);
-            yp_token_t for_keyword = parser->previous;
-
-            yp_node_t *index = parse_targets(parser, NULL, YP_BINDING_POWER_INDEX);
-            yp_do_loop_stack_push(parser, true);
-
-            expect(parser, YP_TOKEN_KEYWORD_IN, "Expected keyword in.");
-            yp_token_t in_keyword = parser->previous;
-
-            yp_node_t *collection = parse_expression(parser, YP_BINDING_POWER_COMPOSITION, "Expected collection.");
-            yp_do_loop_stack_pop(parser);
-
-            yp_token_t do_keyword;
-            if (accept(parser, YP_TOKEN_KEYWORD_DO_LOOP)) {
-                do_keyword = parser->previous;
-            } else {
-                do_keyword = not_provided(parser);
-            }
-
-            accept_any(parser, 2, YP_TOKEN_SEMICOLON, YP_TOKEN_NEWLINE);
-            yp_statements_node_t *statements = NULL;
-
-            if (!accept(parser, YP_TOKEN_KEYWORD_END)) {
-                statements = parse_statements(parser, YP_CONTEXT_FOR);
-                expect(parser, YP_TOKEN_KEYWORD_END, "Expected `end` to close for loop.");
-            }
-
-            return (yp_node_t *) yp_for_node_create(parser, index, collection, statements, &for_keyword, &in_keyword, &do_keyword, &parser->previous);
-        }
-        case YP_TOKEN_KEYWORD_IF:
-            parser_lex(parser);
-            return parse_conditional(parser, YP_CONTEXT_IF);
-        case YP_TOKEN_KEYWORD_UNDEF: {
-            parser_lex(parser);
-            yp_undef_node_t *undef = yp_undef_node_create(parser, &parser->previous);
-            yp_node_t *name = parse_undef_argument(parser);
-
-            if (YP_NODE_TYPE_P(name, YP_MISSING_NODE)) {
-                yp_node_destroy(parser, name);
-            } else {
-                yp_undef_node_append(undef, name);
-
-                while (match_type_p(parser, YP_TOKEN_COMMA)) {
-                    lex_state_set(parser, YP_LEX_STATE_FNAME | YP_LEX_STATE_FITEM);
-                    parser_lex(parser);
-                    name = parse_undef_argument(parser);
-
-                    if (YP_NODE_TYPE_P(name, YP_MISSING_NODE)) {
-                        yp_node_destroy(parser, name);
-                        break;
-                    }
-
-                    yp_undef_node_append(undef, name);
-                }
-            }
-
-            return (yp_node_t *) undef;
-        }
-        case YP_TOKEN_KEYWORD_NOT: {
-            parser_lex(parser);
-
-            yp_token_t message = parser->previous;
-            yp_arguments_t arguments = YP_EMPTY_ARGUMENTS;
-            yp_node_t *receiver = NULL;
-
-            accept(parser, YP_TOKEN_NEWLINE);
-
-            if (accept(parser, YP_TOKEN_PARENTHESIS_LEFT)) {
-                arguments.opening_loc = ((yp_location_t) { .start = parser->previous.start, .end = parser->previous.end });
-
-                if (accept(parser, YP_TOKEN_PARENTHESIS_RIGHT)) {
-                    arguments.closing_loc = ((yp_location_t) { .start = parser->previous.start, .end = parser->previous.end });
-                } else {
-                    receiver = parse_expression(parser, YP_BINDING_POWER_COMPOSITION, "Expected expression after `not`.");
-                    yp_flip_flop(receiver);
-
-                    if (!parser->recovering) {
-                        accept(parser, YP_TOKEN_NEWLINE);
-                        expect(parser, YP_TOKEN_PARENTHESIS_RIGHT, "Expected ')' after 'not' expression.");
-                        arguments.closing_loc = ((yp_location_t) { .start = parser->previous.start, .end = parser->previous.end });
-                    }
-                }
-            } else {
-                receiver = parse_expression(parser, YP_BINDING_POWER_DEFINED, "Expected expression after `not`.");
-                yp_flip_flop(receiver);
-            }
-
-            return (yp_node_t *) yp_call_node_not_create(parser, receiver, &message, &arguments);
-        }
-        case YP_TOKEN_KEYWORD_UNLESS:
-            parser_lex(parser);
-            return parse_conditional(parser, YP_CONTEXT_UNLESS);
-        case YP_TOKEN_KEYWORD_MODULE: {
-            parser_lex(parser);
-
-            yp_token_t module_keyword = parser->previous;
-            yp_node_t *constant_path = parse_expression(parser, YP_BINDING_POWER_INDEX, "Expected to find a module name after `module`.");
-            yp_token_t name;
-
-            // If we can recover from a syntax error that occurred while parsing
-            // the name of the module, then we'll handle that here.
-            if (YP_NODE_TYPE_P(constant_path, YP_MISSING_NODE)) {
-                yp_token_t missing = (yp_token_t) { .type = YP_TOKEN_MISSING, .start = parser->previous.end, .end = parser->previous.end };
-                return (yp_node_t *) yp_module_node_create(parser, NULL, &module_keyword, constant_path, &missing, NULL, &missing);
-            }
-
-            while (accept(parser, YP_TOKEN_COLON_COLON)) {
-                yp_token_t double_colon = parser->previous;
-
-                expect(parser, YP_TOKEN_CONSTANT, "Expected to find a module name after `::`.");
-                yp_node_t *constant = (yp_node_t *) yp_constant_read_node_create(parser, &parser->previous);
-
-                constant_path = (yp_node_t *) yp_constant_path_node_create(parser, constant_path, &double_colon, constant);
-            }
-
-            // Here we retrieve the name of the module. If it wasn't a constant,
-            // then it's possible that `module foo` was passed, which is a
-            // syntax error. We handle that here as well.
-            name = parser->previous;
-            if (name.type != YP_TOKEN_CONSTANT) {
-                yp_diagnostic_list_append(&parser->error_list, name.start, name.end, "Expected to find a module name after `module`.");
-            }
-
-            yp_parser_scope_push(parser, true);
-            accept_any(parser, 2, YP_TOKEN_SEMICOLON, YP_TOKEN_NEWLINE);
-            yp_node_t *statements = NULL;
-
-            if (!match_any_type_p(parser, 3, YP_TOKEN_KEYWORD_RESCUE, YP_TOKEN_KEYWORD_ENSURE, YP_TOKEN_KEYWORD_END)) {
-                yp_accepts_block_stack_push(parser, true);
-                statements = (yp_node_t *) parse_statements(parser, YP_CONTEXT_MODULE);
-                yp_accepts_block_stack_pop(parser);
-            }
-
-            if (match_any_type_p(parser, 2, YP_TOKEN_KEYWORD_RESCUE, YP_TOKEN_KEYWORD_ENSURE)) {
-                assert(statements == NULL || YP_NODE_TYPE_P(statements, YP_STATEMENTS_NODE));
-                statements = (yp_node_t *) parse_rescues_as_begin(parser, (yp_statements_node_t *) statements);
-            }
-
-            yp_constant_id_list_t locals = parser->current_scope->locals;
-            yp_parser_scope_pop(parser);
-
-            expect(parser, YP_TOKEN_KEYWORD_END, "Expected `end` to close `module` statement.");
-
-            if (context_def_p(parser)) {
-                yp_diagnostic_list_append(&parser->error_list, module_keyword.start, module_keyword.end, "Module definition in method body");
-            }
-
-            return (yp_node_t *) yp_module_node_create(parser, &locals, &module_keyword, constant_path, &name, statements, &parser->previous);
-        }
-        case YP_TOKEN_KEYWORD_NIL:
-            parser_lex(parser);
-            return (yp_node_t *) yp_nil_node_create(parser, &parser->previous);
-        case YP_TOKEN_KEYWORD_REDO:
-            parser_lex(parser);
-            return (yp_node_t *) yp_redo_node_create(parser, &parser->previous);
-        case YP_TOKEN_KEYWORD_RETRY:
-            parser_lex(parser);
-            return (yp_node_t *) yp_retry_node_create(parser, &parser->previous);
-        case YP_TOKEN_KEYWORD_SELF:
-            parser_lex(parser);
-            return (yp_node_t *) yp_self_node_create(parser, &parser->previous);
-        case YP_TOKEN_KEYWORD_TRUE:
-            parser_lex(parser);
-            return (yp_node_t *) yp_true_node_create(parser, &parser->previous);
-        case YP_TOKEN_KEYWORD_UNTIL: {
-            yp_do_loop_stack_push(parser, true);
-            parser_lex(parser);
-            yp_token_t keyword = parser->previous;
-
-            yp_node_t *predicate = parse_expression(parser, YP_BINDING_POWER_COMPOSITION, "Expected predicate expression after `until`.");
-            yp_do_loop_stack_pop(parser);
-
-            accept_any(parser, 3, YP_TOKEN_KEYWORD_DO_LOOP, YP_TOKEN_NEWLINE, YP_TOKEN_SEMICOLON);
-            yp_statements_node_t *statements = NULL;
-
-            if (!accept(parser, YP_TOKEN_KEYWORD_END)) {
-                yp_accepts_block_stack_push(parser, true);
-                statements = parse_statements(parser, YP_CONTEXT_UNTIL);
-                yp_accepts_block_stack_pop(parser);
-                accept_any(parser, 2, YP_TOKEN_NEWLINE, YP_TOKEN_SEMICOLON);
-                expect(parser, YP_TOKEN_KEYWORD_END, "Expected `end` to close `until` statement.");
-            }
-
-            return (yp_node_t *) yp_until_node_create(parser, &keyword, &parser->previous, predicate, statements, 0);
-        }
-        case YP_TOKEN_KEYWORD_WHILE: {
-            yp_do_loop_stack_push(parser, true);
-            parser_lex(parser);
-            yp_token_t keyword = parser->previous;
-
-            yp_node_t *predicate = parse_expression(parser, YP_BINDING_POWER_COMPOSITION, "Expected predicate expression after `while`.");
-            yp_do_loop_stack_pop(parser);
-
-            accept_any(parser, 3, YP_TOKEN_KEYWORD_DO_LOOP, YP_TOKEN_NEWLINE, YP_TOKEN_SEMICOLON);
-            yp_statements_node_t *statements = NULL;
-
-            if (!accept(parser, YP_TOKEN_KEYWORD_END)) {
-                yp_accepts_block_stack_push(parser, true);
-                statements = parse_statements(parser, YP_CONTEXT_WHILE);
-                yp_accepts_block_stack_pop(parser);
-                accept_any(parser, 2, YP_TOKEN_NEWLINE, YP_TOKEN_SEMICOLON);
-                expect(parser, YP_TOKEN_KEYWORD_END, "Expected `end` to close `while` statement.");
-            }
-
-            return (yp_node_t *) yp_while_node_create(parser, &keyword, &parser->previous, predicate, statements, 0);
-        }
-        case YP_TOKEN_PERCENT_LOWER_I: {
-            parser_lex(parser);
-            yp_array_node_t *array = yp_array_node_create(parser, &parser->previous);
-
-            while (!match_any_type_p(parser, 2, YP_TOKEN_STRING_END, YP_TOKEN_EOF)) {
-                accept(parser, YP_TOKEN_WORDS_SEP);
-                if (match_type_p(parser, YP_TOKEN_STRING_END)) break;
-
-                expect(parser, YP_TOKEN_STRING_CONTENT, "Expected a symbol in a `%i` list.");
-
-                yp_token_t opening = not_provided(parser);
-                yp_token_t closing = not_provided(parser);
-
-                yp_node_t *symbol = (yp_node_t *) yp_symbol_node_create_and_unescape(parser, &opening, &parser->previous, &closing, YP_UNESCAPE_MINIMAL);
-                yp_array_node_elements_append(array, symbol);
-            }
-
-            expect(parser, YP_TOKEN_STRING_END, "Expected a closing delimiter for a `%i` list.");
-            yp_array_node_close_set(array, &parser->previous);
-
-            return (yp_node_t *) array;
-        }
-        case YP_TOKEN_PERCENT_UPPER_I: {
-            parser_lex(parser);
-            yp_array_node_t *array = yp_array_node_create(parser, &parser->previous);
-
-            // This is the current node that we are parsing that will be added to the
-            // list of elements.
-            yp_node_t *current = NULL;
-
-            while (!match_any_type_p(parser, 2, YP_TOKEN_STRING_END, YP_TOKEN_EOF)) {
-                switch (parser->current.type) {
-                    case YP_TOKEN_WORDS_SEP: {
-                        if (current == NULL) {
-                            // If we hit a separator before we have any content, then we don't
-                            // need to do anything.
-                        } else {
-                            // If we hit a separator after we've hit content, then we need to
-                            // append that content to the list and reset the current node.
-                            yp_array_node_elements_append(array, current);
-                            current = NULL;
-                        }
-
-                        parser_lex(parser);
-                        break;
-                    }
-                    case YP_TOKEN_STRING_CONTENT: {
-                        yp_token_t opening = not_provided(parser);
-                        yp_token_t closing = not_provided(parser);
-
-                        if (current == NULL) {
-                            // If we hit content and the current node is NULL, then this is
-                            // the first string content we've seen. In that case we're going
-                            // to create a new string node and set that to the current.
-                            parser_lex(parser);
-                            current = (yp_node_t *) yp_symbol_node_create_and_unescape(parser, &opening, &parser->previous, &closing, YP_UNESCAPE_ALL);
-                        } else if (YP_NODE_TYPE_P(current, YP_INTERPOLATED_SYMBOL_NODE)) {
-                            // If we hit string content and the current node is an
-                            // interpolated string, then we need to append the string content
-                            // to the list of child nodes.
-                            yp_node_t *part = parse_string_part(parser);
-                            yp_interpolated_symbol_node_append((yp_interpolated_symbol_node_t *) current, part);
-                        } else if (YP_NODE_TYPE_P(current, YP_SYMBOL_NODE)) {
-                            // If we hit string content and the current node is a string node,
-                            // then we need to convert the current node into an interpolated
-                            // string and add the string content to the list of child nodes.
-                            yp_token_t opening = not_provided(parser);
-                            yp_token_t closing = not_provided(parser);
-                            yp_interpolated_symbol_node_t *interpolated =
-                                yp_interpolated_symbol_node_create(parser, &opening, NULL, &closing);
-                            yp_interpolated_symbol_node_append(interpolated, current);
-
-                            yp_node_t *part = parse_string_part(parser);
-                            yp_interpolated_symbol_node_append(interpolated, part);
-                            current = (yp_node_t *) interpolated;
-                        } else {
-                            assert(false && "unreachable");
-                        }
-
-                        break;
-                    }
-                    case YP_TOKEN_EMBVAR: {
-                        bool start_location_set = false;
-                        if (current == NULL) {
-                            // If we hit an embedded variable and the current node is NULL,
-                            // then this is the start of a new string. We'll set the current
-                            // node to a new interpolated string.
-                            yp_token_t opening = not_provided(parser);
-                            yp_token_t closing = not_provided(parser);
-                            current = (yp_node_t *) yp_interpolated_symbol_node_create(parser, &opening, NULL, &closing);
-                        } else if (YP_NODE_TYPE_P(current, YP_SYMBOL_NODE)) {
-                            // If we hit an embedded variable and the current node is a string
-                            // node, then we'll convert the current into an interpolated
-                            // string and add the string node to the list of parts.
-                            yp_token_t opening = not_provided(parser);
-                            yp_token_t closing = not_provided(parser);
-                            yp_interpolated_symbol_node_t *interpolated = yp_interpolated_symbol_node_create(parser, &opening, NULL, &closing);
-
-                            current = (yp_node_t *) yp_symbol_node_to_string_node(parser, (yp_symbol_node_t *) current);
-                            yp_interpolated_symbol_node_append(interpolated, current);
-                            interpolated->base.location.start = current->location.start;
-                            start_location_set = true;
-                            current = (yp_node_t *) interpolated;
-                        } else {
-                            // If we hit an embedded variable and the current node is an
-                            // interpolated string, then we'll just add the embedded variable.
-                        }
-
-                        yp_node_t *part = parse_string_part(parser);
-                        yp_interpolated_symbol_node_append((yp_interpolated_symbol_node_t *) current, part);
-                        if (!start_location_set) {
-                            current->location.start = part->location.start;
-                        }
-                        break;
-                    }
-                    case YP_TOKEN_EMBEXPR_BEGIN: {
-                        bool start_location_set = false;
-                        if (current == NULL) {
-                            // If we hit an embedded expression and the current node is NULL,
-                            // then this is the start of a new string. We'll set the current
-                            // node to a new interpolated string.
-                            yp_token_t opening = not_provided(parser);
-                            yp_token_t closing = not_provided(parser);
-                            current = (yp_node_t *) yp_interpolated_symbol_node_create(parser, &opening, NULL, &closing);
-                        } else if (YP_NODE_TYPE_P(current, YP_SYMBOL_NODE)) {
-                            // If we hit an embedded expression and the current node is a
-                            // string node, then we'll convert the current into an
-                            // interpolated string and add the string node to the list of
-                            // parts.
-                            yp_token_t opening = not_provided(parser);
-                            yp_token_t closing = not_provided(parser);
-                            yp_interpolated_symbol_node_t *interpolated = yp_interpolated_symbol_node_create(parser, &opening, NULL, &closing);
-
-                            current = (yp_node_t *) yp_symbol_node_to_string_node(parser, (yp_symbol_node_t *) current);
-                            yp_interpolated_symbol_node_append(interpolated, current);
-                            interpolated->base.location.start = current->location.start;
-                            start_location_set = true;
-                            current = (yp_node_t *) interpolated;
-                        } else if (YP_NODE_TYPE_P(current, YP_INTERPOLATED_SYMBOL_NODE)) {
-                            // If we hit an embedded expression and the current node is an
-                            // interpolated string, then we'll just continue on.
-                        } else {
-                            assert(false && "unreachable");
-                        }
-
-                        yp_node_t *part = parse_string_part(parser);
-                        yp_interpolated_symbol_node_append((yp_interpolated_symbol_node_t *) current, part);
-                        if (!start_location_set) {
-                            current->location.start = part->location.start;
-                        }
-                        break;
-                    }
-                    default:
-                        expect(parser, YP_TOKEN_STRING_CONTENT, "Expected a symbol in a `%I` list.");
-                        parser_lex(parser);
-                        break;
-                }
-            }
-
-            // If we have a current node, then we need to append it to the list.
-            if (current) {
-                yp_array_node_elements_append(array, current);
-            }
-
-            expect(parser, YP_TOKEN_STRING_END, "Expected a closing delimiter for a `%I` list.");
-            yp_array_node_close_set(array, &parser->previous);
-
-            return (yp_node_t *) array;
-        }
-        case YP_TOKEN_PERCENT_LOWER_W: {
-            parser_lex(parser);
-            yp_array_node_t *array = yp_array_node_create(parser, &parser->previous);
-
-            // skip all leading whitespaces
-            accept(parser, YP_TOKEN_WORDS_SEP);
-
-            while (!match_any_type_p(parser, 2, YP_TOKEN_STRING_END, YP_TOKEN_EOF)) {
-                accept(parser, YP_TOKEN_WORDS_SEP);
-                if (match_type_p(parser, YP_TOKEN_STRING_END)) break;
-
-                expect(parser, YP_TOKEN_STRING_CONTENT, "Expected a string in a `%w` list.");
-
-                yp_token_t opening = not_provided(parser);
-                yp_token_t closing = not_provided(parser);
-                yp_node_t *string = (yp_node_t *) yp_string_node_create_and_unescape(parser, &opening, &parser->previous, &closing, YP_UNESCAPE_MINIMAL);
-                yp_array_node_elements_append(array, string);
-            }
-
-            expect(parser, YP_TOKEN_STRING_END, "Expected a closing delimiter for a `%w` list.");
-            yp_array_node_close_set(array, &parser->previous);
-
-            return (yp_node_t *) array;
-        }
-        case YP_TOKEN_PERCENT_UPPER_W: {
-            parser_lex(parser);
-            yp_array_node_t *array = yp_array_node_create(parser, &parser->previous);
-
-            // This is the current node that we are parsing that will be added to the
-            // list of elements.
-            yp_node_t *current = NULL;
-
-            while (!match_any_type_p(parser, 2, YP_TOKEN_STRING_END, YP_TOKEN_EOF)) {
-                switch (parser->current.type) {
-                    case YP_TOKEN_WORDS_SEP: {
-                        if (current == NULL) {
-                            // If we hit a separator before we have any content, then we don't
-                            // need to do anything.
-                        } else {
-                            // If we hit a separator after we've hit content, then we need to
-                            // append that content to the list and reset the current node.
-                            yp_array_node_elements_append(array, current);
-                            current = NULL;
-                        }
-
-                        parser_lex(parser);
-                        break;
-                    }
-                    case YP_TOKEN_STRING_CONTENT: {
-                        if (current == NULL) {
-                            // If we hit content and the current node is NULL, then this is
-                            // the first string content we've seen. In that case we're going
-                            // to create a new string node and set that to the current.
-                            current = parse_string_part(parser);
-                        } else if (YP_NODE_TYPE_P(current, YP_INTERPOLATED_STRING_NODE)) {
-                            // If we hit string content and the current node is an
-                            // interpolated string, then we need to append the string content
-                            // to the list of child nodes.
-                            yp_node_t *part = parse_string_part(parser);
-                            yp_interpolated_string_node_append((yp_interpolated_string_node_t *) current, part);
-                        } else if (YP_NODE_TYPE_P(current, YP_STRING_NODE)) {
-                            // If we hit string content and the current node is a string node,
-                            // then we need to convert the current node into an interpolated
-                            // string and add the string content to the list of child nodes.
-                            yp_token_t opening = not_provided(parser);
-                            yp_token_t closing = not_provided(parser);
-                            yp_interpolated_string_node_t *interpolated =
-                                yp_interpolated_string_node_create(parser, &opening, NULL, &closing);
-                            yp_interpolated_string_node_append(interpolated, current);
-
-                            yp_node_t *part = parse_string_part(parser);
-                            yp_interpolated_string_node_append(interpolated, part);
-                            current = (yp_node_t *) interpolated;
-                        } else {
-                            assert(false && "unreachable");
-                        }
-
-                        break;
-                    }
-                    case YP_TOKEN_EMBVAR: {
-                        if (current == NULL) {
-                            // If we hit an embedded variable and the current node is NULL,
-                            // then this is the start of a new string. We'll set the current
-                            // node to a new interpolated string.
-                            yp_token_t opening = not_provided(parser);
-                            yp_token_t closing = not_provided(parser);
-                            current = (yp_node_t *) yp_interpolated_string_node_create(parser, &opening, NULL, &closing);
-                        } else if (YP_NODE_TYPE_P(current, YP_STRING_NODE)) {
-                            // If we hit an embedded variable and the current node is a string
-                            // node, then we'll convert the current into an interpolated
-                            // string and add the string node to the list of parts.
-                            yp_token_t opening = not_provided(parser);
-                            yp_token_t closing = not_provided(parser);
-                            yp_interpolated_string_node_t *interpolated = yp_interpolated_string_node_create(parser, &opening, NULL, &closing);
-                            yp_interpolated_string_node_append(interpolated, current);
-                            current = (yp_node_t *) interpolated;
-                        } else {
-                            // If we hit an embedded variable and the current node is an
-                            // interpolated string, then we'll just add the embedded variable.
-                        }
-
-                        yp_node_t *part = parse_string_part(parser);
-                        yp_interpolated_string_node_append((yp_interpolated_string_node_t *) current, part);
-                        break;
-                    }
-                    case YP_TOKEN_EMBEXPR_BEGIN: {
-                        if (current == NULL) {
-                            // If we hit an embedded expression and the current node is NULL,
-                            // then this is the start of a new string. We'll set the current
-                            // node to a new interpolated string.
-                            yp_token_t opening = not_provided(parser);
-                            yp_token_t closing = not_provided(parser);
-                            current = (yp_node_t *) yp_interpolated_string_node_create(parser, &opening, NULL, &closing);
-                        } else if (YP_NODE_TYPE_P(current, YP_STRING_NODE)) {
-                            // If we hit an embedded expression and the current node is a
-                            // string node, then we'll convert the current into an
-                            // interpolated string and add the string node to the list of
-                            // parts.
-                            yp_token_t opening = not_provided(parser);
-                            yp_token_t closing = not_provided(parser);
-                            yp_interpolated_string_node_t *interpolated = yp_interpolated_string_node_create(parser, &opening, NULL, &closing);
-                            yp_interpolated_string_node_append(interpolated, current);
-                            current = (yp_node_t *) interpolated;
-                        } else if (YP_NODE_TYPE_P(current, YP_INTERPOLATED_STRING_NODE)) {
-                            // If we hit an embedded expression and the current node is an
-                            // interpolated string, then we'll just continue on.
-                        } else {
-                            assert(false && "unreachable");
-                        }
-
-                        yp_node_t *part = parse_string_part(parser);
-                        yp_interpolated_string_node_append((yp_interpolated_string_node_t *) current, part);
-                        break;
-                    }
-                    default:
-                        expect(parser, YP_TOKEN_STRING_CONTENT, "Expected a string in a `%W` list.");
-                        parser_lex(parser);
-                        break;
-                }
-            }
-
-            // If we have a current node, then we need to append it to the list.
-            if (current) {
-                yp_array_node_elements_append(array, current);
-            }
-
-            expect(parser, YP_TOKEN_STRING_END, "Expected a closing delimiter for a `%W` list.");
-            yp_array_node_close_set(array, &parser->previous);
-
-            return (yp_node_t *) array;
-        }
-        case YP_TOKEN_REGEXP_BEGIN: {
-            yp_token_t opening = parser->current;
-            parser_lex(parser);
-
-            if (match_type_p(parser, YP_TOKEN_REGEXP_END)) {
-                // If we get here, then we have an end immediately after a start. In
-                // that case we'll create an empty content token and return an
-                // uninterpolated regular expression.
-                yp_token_t content = (yp_token_t) {
-                    .type = YP_TOKEN_STRING_CONTENT,
-                    .start = parser->previous.end,
-                    .end = parser->previous.end
-                };
-
-                parser_lex(parser);
-                return (yp_node_t *) yp_regular_expression_node_create_and_unescape(parser, &opening, &content, &parser->previous, YP_UNESCAPE_ALL);
-            }
-
-            yp_interpolated_regular_expression_node_t *node;
-
-            if (match_type_p(parser, YP_TOKEN_STRING_CONTENT)) {
-                // In this case we've hit string content so we know the regular
-                // expression at least has something in it. We'll need to check if the
-                // following token is the end (in which case we can return a plain
-                // regular expression) or if it's not then it has interpolation.
-                yp_token_t content = parser->current;
-                parser_lex(parser);
-
-                // If we hit an end, then we can create a regular expression node
-                // without interpolation, which can be represented more succinctly and
-                // more easily compiled.
-                if (accept(parser, YP_TOKEN_REGEXP_END)) {
-                    return (yp_node_t *) yp_regular_expression_node_create_and_unescape(parser, &opening, &content, &parser->previous, YP_UNESCAPE_ALL);
-                }
-
-                // If we get here, then we have interpolation so we'll need to create
-                // a regular expression node with interpolation.
-                node = yp_interpolated_regular_expression_node_create(parser, &opening);
-
-                yp_token_t opening = not_provided(parser);
-                yp_token_t closing = not_provided(parser);
-                yp_node_t *part = (yp_node_t *) yp_string_node_create_and_unescape(parser, &opening, &parser->previous, &closing, YP_UNESCAPE_ALL);
-                yp_interpolated_regular_expression_node_append(node, part);
-            } else {
-                // If the first part of the body of the regular expression is not a
-                // string content, then we have interpolation and we need to create an
-                // interpolated regular expression node.
-                node = yp_interpolated_regular_expression_node_create(parser, &opening);
-            }
-
-            // Now that we're here and we have interpolation, we'll parse all of the
-            // parts into the list.
-            while (!match_any_type_p(parser, 2, YP_TOKEN_REGEXP_END, YP_TOKEN_EOF)) {
-                yp_node_t *part = parse_string_part(parser);
-                if (part != NULL) {
-                    yp_interpolated_regular_expression_node_append(node, part);
-                }
-            }
-
-            expect(parser, YP_TOKEN_REGEXP_END, "Expected a closing delimiter for a regular expression.");
-            yp_interpolated_regular_expression_node_closing_set(node, &parser->previous);
-
-            return (yp_node_t *) node;
-        }
-        case YP_TOKEN_BACKTICK:
-        case YP_TOKEN_PERCENT_LOWER_X: {
-            parser_lex(parser);
-            yp_token_t opening = parser->previous;
-
-            // When we get here, we don't know if this string is going to have
-            // interpolation or not, even though it is allowed. Still, we want to be
-            // able to return a string node without interpolation if we can since
-            // it'll be faster.
-            if (match_type_p(parser, YP_TOKEN_STRING_END)) {
-                // If we get here, then we have an end immediately after a start. In
-                // that case we'll create an empty content token and return an
-                // uninterpolated string.
-                yp_token_t content = (yp_token_t) {
-                    .type = YP_TOKEN_STRING_CONTENT,
-                    .start = parser->previous.end,
-                    .end = parser->previous.end
-                };
-
-                parser_lex(parser);
-                return (yp_node_t *) yp_xstring_node_create(parser, &opening, &content, &parser->previous);
-            }
-
-            yp_interpolated_x_string_node_t *node;
-
-            if (match_type_p(parser, YP_TOKEN_STRING_CONTENT)) {
-                // In this case we've hit string content so we know the string at least
-                // has something in it. We'll need to check if the following token is
-                // the end (in which case we can return a plain string) or if it's not
-                // then it has interpolation.
-                yp_token_t content = parser->current;
-                parser_lex(parser);
-
-                if (accept(parser, YP_TOKEN_STRING_END)) {
-                    return (yp_node_t *) yp_xstring_node_create_and_unescape(parser, &opening, &content, &parser->previous);
-                }
-
-                // If we get here, then we have interpolation so we'll need to create
-                // a string node with interpolation.
-                node = yp_interpolated_xstring_node_create(parser, &opening, &opening);
-
-                yp_token_t opening = not_provided(parser);
-                yp_token_t closing = not_provided(parser);
-                yp_node_t *part = (yp_node_t *) yp_string_node_create_and_unescape(parser, &opening, &parser->previous, &closing, YP_UNESCAPE_ALL);
-                yp_interpolated_xstring_node_append(node, part);
-            } else {
-                // If the first part of the body of the string is not a string content,
-                // then we have interpolation and we need to create an interpolated
-                // string node.
-                node = yp_interpolated_xstring_node_create(parser, &opening, &opening);
-            }
-
-            while (!match_any_type_p(parser, 2, YP_TOKEN_STRING_END, YP_TOKEN_EOF)) {
-                yp_node_t *part = parse_string_part(parser);
-                if (part != NULL) {
-                    yp_interpolated_xstring_node_append(node, part);
-                }
-            }
-
-            expect(parser, YP_TOKEN_STRING_END, "Expected a closing delimiter for an xstring.");
-            yp_interpolated_xstring_node_closing_set(node, &parser->previous);
-            return (yp_node_t *) node;
-        }
-        case YP_TOKEN_USTAR: {
-            parser_lex(parser);
-
-            // * operators at the beginning of expressions are only valid in the
-            // context of a multiple assignment. We enforce that here. We'll still lex
-            // past it though and create a missing node place.
-            if (binding_power != YP_BINDING_POWER_STATEMENT) {
-                return (yp_node_t *) yp_missing_node_create(parser, parser->previous.start, parser->previous.end);
-            }
-
-            yp_token_t operator = parser->previous;
-            yp_node_t *name = NULL;
-
-            if (token_begins_expression_p(parser->current.type)) {
-                name = parse_expression(parser, YP_BINDING_POWER_INDEX, "Expected an expression after '*'.");
-            }
-
-            yp_node_t *splat = (yp_node_t *) yp_splat_node_create(parser, &operator, name);
-            return parse_targets(parser, splat, YP_BINDING_POWER_INDEX);
-        }
-        case YP_TOKEN_BANG: {
-            parser_lex(parser);
-
-            yp_token_t operator = parser->previous;
-            yp_node_t *receiver = parse_expression(parser, yp_binding_powers[parser->previous.type].right, "Expected a receiver after unary !.");
-            yp_call_node_t *node = yp_call_node_unary_create(parser, &operator, receiver, "!");
-
-            yp_flip_flop(receiver);
-            return (yp_node_t *) node;
-        }
-        case YP_TOKEN_TILDE: {
-            parser_lex(parser);
-
-            yp_token_t operator = parser->previous;
-            yp_node_t *receiver = parse_expression(parser, yp_binding_powers[parser->previous.type].right, "Expected a receiver after unary ~.");
-            yp_call_node_t *node = yp_call_node_unary_create(parser, &operator, receiver, "~");
-
-            return (yp_node_t *) node;
-        }
-        case YP_TOKEN_UMINUS: {
-            parser_lex(parser);
-
-            yp_token_t operator = parser->previous;
-            yp_node_t *receiver = parse_expression(parser, yp_binding_powers[parser->previous.type].right, "Expected a receiver after unary -.");
-            yp_call_node_t *node = yp_call_node_unary_create(parser, &operator, receiver, "-@");
-
-            return (yp_node_t *) node;
-        }
-        case YP_TOKEN_UMINUS_NUM: {
-            parser_lex(parser);
-
-            yp_token_t operator = parser->previous;
-            yp_node_t *node = parse_expression(parser, yp_binding_powers[parser->previous.type].right, "Expected a receiver after unary -.");
-
-            switch (YP_NODE_TYPE(node)) {
-                case YP_INTEGER_NODE:
-                case YP_FLOAT_NODE:
-                case YP_RATIONAL_NODE:
-                case YP_IMAGINARY_NODE:
-                    parse_negative_numeric(node);
-                    break;
-                default:
-                    node = (yp_node_t *) yp_call_node_unary_create(parser, &operator, node, "-@");
-                    break;
-            }
-
-            return node;
-        }
-        case YP_TOKEN_MINUS_GREATER: {
-            int previous_lambda_enclosure_nesting = parser->lambda_enclosure_nesting;
-            parser->lambda_enclosure_nesting = parser->enclosure_nesting;
-
-            yp_accepts_block_stack_push(parser, true);
-            parser_lex(parser);
-
-            yp_token_t operator = parser->previous;
-            yp_parser_scope_push(parser, false);
-            yp_block_parameters_node_t *params;
-
-            switch (parser->current.type) {
-                case YP_TOKEN_PARENTHESIS_LEFT: {
-                    yp_token_t opening = parser->current;
-                    parser_lex(parser);
-
-                    if (match_type_p(parser, YP_TOKEN_PARENTHESIS_RIGHT)) {
-                        params = yp_block_parameters_node_create(parser, NULL, &opening);
-                    } else {
-                        params = parse_block_parameters(parser, false, &opening, true);
-                    }
-
-                    accept(parser, YP_TOKEN_NEWLINE);
-                    expect(parser, YP_TOKEN_PARENTHESIS_RIGHT, "Expected ')' after left parenthesis.");
-
-                    yp_block_parameters_node_closing_set(params, &parser->previous);
-                    break;
-                }
-                case YP_CASE_PARAMETER: {
-                    yp_accepts_block_stack_push(parser, false);
-                    yp_token_t opening = not_provided(parser);
-                    params = parse_block_parameters(parser, false, &opening, true);
-                    yp_accepts_block_stack_pop(parser);
-                    break;
-                }
-                default: {
-                    params = NULL;
-                    break;
-                }
-            }
-
-            yp_token_t opening;
-            yp_node_t *body = NULL;
-            parser->lambda_enclosure_nesting = previous_lambda_enclosure_nesting;
-
-            if (accept(parser, YP_TOKEN_LAMBDA_BEGIN)) {
-                opening = parser->previous;
-
-                if (!accept(parser, YP_TOKEN_BRACE_RIGHT)) {
-                    body = (yp_node_t *) parse_statements(parser, YP_CONTEXT_LAMBDA_BRACES);
-                    expect(parser, YP_TOKEN_BRACE_RIGHT, "Expecting '}' to close lambda block.");
-                }
-            } else {
-                expect(parser, YP_TOKEN_KEYWORD_DO, "Expected a 'do' keyword or a '{' to open lambda block.");
-                opening = parser->previous;
-
-                if (!match_any_type_p(parser, 3, YP_TOKEN_KEYWORD_END, YP_TOKEN_KEYWORD_RESCUE, YP_TOKEN_KEYWORD_ENSURE)) {
-                    yp_accepts_block_stack_push(parser, true);
-                    body = (yp_node_t *) parse_statements(parser, YP_CONTEXT_LAMBDA_DO_END);
-                    yp_accepts_block_stack_pop(parser);
-                }
-
-                if (match_any_type_p(parser, 2, YP_TOKEN_KEYWORD_RESCUE, YP_TOKEN_KEYWORD_ENSURE)) {
-                    assert(body == NULL || YP_NODE_TYPE_P(body, YP_STATEMENTS_NODE));
-                    body = (yp_node_t *) parse_rescues_as_begin(parser, (yp_statements_node_t *) body);
-                }
-
-                expect(parser, YP_TOKEN_KEYWORD_END, "Expecting 'end' keyword to close lambda block.");
-            }
-
-            yp_constant_id_list_t locals = parser->current_scope->locals;
-            yp_parser_scope_pop(parser);
-            yp_accepts_block_stack_pop(parser);
-            return (yp_node_t *) yp_lambda_node_create(parser, &locals, &operator, &opening, &parser->previous, params, body);
-        }
-        case YP_TOKEN_UPLUS: {
-            parser_lex(parser);
-
-            yp_token_t operator = parser->previous;
-            yp_node_t *receiver = parse_expression(parser, yp_binding_powers[parser->previous.type].right, "Expected a receiver after unary +.");
-            yp_call_node_t *node = yp_call_node_unary_create(parser, &operator, receiver, "+@");
-
-            return (yp_node_t *) node;
-        }
-        case YP_TOKEN_STRING_BEGIN: {
-            yp_node_t *result = NULL;
-
-            while (match_type_p(parser, YP_TOKEN_STRING_BEGIN)) {
-                assert(parser->lex_modes.current->mode == YP_LEX_STRING);
-                bool lex_interpolation = parser->lex_modes.current->as.string.interpolation;
-
-                yp_node_t *node = NULL;
-                yp_token_t opening = parser->current;
-                parser_lex(parser);
-
-                if (accept(parser, YP_TOKEN_STRING_END)) {
-                    // If we get here, then we have an end immediately after a
-                    // start. In that case we'll create an empty content token
-                    // and return an uninterpolated string.
-                    yp_token_t content = (yp_token_t) {
-                        .type = YP_TOKEN_STRING_CONTENT,
-                        .start = parser->previous.start,
-                        .end = parser->previous.start
-                    };
-
-                    node = (yp_node_t *) yp_string_node_create_and_unescape(parser, &opening, &content, &parser->previous, YP_UNESCAPE_NONE);
-                } else if (accept(parser, YP_TOKEN_LABEL_END)) {
-                    // If we get here, then we have an end of a label
-                    // immediately after a start. In that case we'll create an
-                    // empty symbol node.
-                    yp_token_t opening = not_provided(parser);
-                    yp_token_t content = (yp_token_t) {
-                        .type = YP_TOKEN_STRING_CONTENT,
-                        .start = parser->previous.start,
-                        .end = parser->previous.start
-                    };
-
-                    node = (yp_node_t *) yp_symbol_node_create(parser, &opening, &content, &parser->previous);
-                } else if (!lex_interpolation) {
-                    // If we don't accept interpolation then we expect the
-                    // string to start with a single string content node.
-                    expect(parser, YP_TOKEN_STRING_CONTENT, "Expected string content after opening delimiter.");
-                    yp_token_t content = parser->previous;
-
-                    // It is unfortunately possible to have multiple string
-                    // content nodes in a row in the case that there's heredoc
-                    // content in the middle of the string, like this cursed
-                    // example:
-                    //
-                    // <<-END+'b
-                    //  a
-                    // END
-                    //  c'+'d'
-                    //
-                    // In that case we need to switch to an interpolated string
-                    // to be able to contain all of the parts.
-                    if (match_type_p(parser, YP_TOKEN_STRING_CONTENT)) {
-                        yp_node_list_t parts = YP_EMPTY_NODE_LIST;
-
-                        yp_token_t delimiters = not_provided(parser);
-                        yp_node_t *part = (yp_node_t *) yp_string_node_create_and_unescape(parser, &delimiters, &content, &delimiters, YP_UNESCAPE_MINIMAL);
-                        yp_node_list_append(&parts, part);
-
-                        while (accept(parser, YP_TOKEN_STRING_CONTENT)) {
-                            part = (yp_node_t *) yp_string_node_create_and_unescape(parser, &delimiters, &parser->previous, &delimiters, YP_UNESCAPE_MINIMAL);
-                            yp_node_list_append(&parts, part);
-                        }
-
-                        expect(parser, YP_TOKEN_STRING_END, "Expected a closing delimiter for a string literal.");
-                        node = (yp_node_t *) yp_interpolated_string_node_create(parser, &opening, &parts, &parser->previous);
-                    } else if (accept(parser, YP_TOKEN_LABEL_END)) {
-                        node = (yp_node_t *) yp_symbol_node_create_and_unescape(parser, &opening, &content, &parser->previous, YP_UNESCAPE_ALL);
-                    } else {
-                        expect(parser, YP_TOKEN_STRING_END, "Expected a closing delimiter for a string literal.");
-                        node = (yp_node_t *) yp_string_node_create_and_unescape(parser, &opening, &content, &parser->previous, YP_UNESCAPE_MINIMAL);
-                    }
-                } else if (match_type_p(parser, YP_TOKEN_STRING_CONTENT)) {
-                    // In this case we've hit string content so we know the string at
-                    // least has something in it. We'll need to check if the following
-                    // token is the end (in which case we can return a plain string) or if
-                    // it's not then it has interpolation.
-                    yp_token_t content = parser->current;
-                    parser_lex(parser);
-
-                    if (accept(parser, YP_TOKEN_STRING_END)) {
-                        node = (yp_node_t *) yp_string_node_create_and_unescape(parser, &opening, &content, &parser->previous, YP_UNESCAPE_ALL);
-                    } else if (accept(parser, YP_TOKEN_LABEL_END)) {
-                        node = (yp_node_t *) yp_symbol_node_create_and_unescape(parser, &opening, &content, &parser->previous, YP_UNESCAPE_ALL);
-                    } else {
-                        // If we get here, then we have interpolation so we'll need to create
-                        // a string or symbol node with interpolation.
-                        yp_node_list_t parts = YP_EMPTY_NODE_LIST;
-                        yp_token_t string_opening = not_provided(parser);
-                        yp_token_t string_closing = not_provided(parser);
-                        yp_node_t *part = (yp_node_t *) yp_string_node_create_and_unescape(parser, &string_opening, &parser->previous, &string_closing, YP_UNESCAPE_ALL);
-                        yp_node_list_append(&parts, part);
-
-                        while (!match_any_type_p(parser, 3, YP_TOKEN_STRING_END, YP_TOKEN_LABEL_END, YP_TOKEN_EOF)) {
-                            yp_node_t *part = parse_string_part(parser);
-                            if (part != NULL) yp_node_list_append(&parts, part);
-                        }
-
-                        if (accept(parser, YP_TOKEN_LABEL_END)) {
-                            node = (yp_node_t *) yp_interpolated_symbol_node_create(parser, &opening, &parts, &parser->previous);
-                        } else {
-                            expect(parser, YP_TOKEN_STRING_END, "Expected a closing delimiter for an interpolated string.");
-                            node = (yp_node_t *) yp_interpolated_string_node_create(parser, &opening, &parts, &parser->previous);
-                        }
-                    }
-                } else {
-                    // If we get here, then the first part of the string is not plain string
-                    // content, in which case we need to parse the string as an interpolated
-                    // string.
-                    yp_node_list_t parts = YP_EMPTY_NODE_LIST;
-
-                    while (!match_any_type_p(parser, 3, YP_TOKEN_STRING_END, YP_TOKEN_LABEL_END, YP_TOKEN_EOF)) {
-                        yp_node_t *part = parse_string_part(parser);
-                        if (part != NULL) yp_node_list_append(&parts, part);
-                    }
-
-                    if (accept(parser, YP_TOKEN_LABEL_END)) {
-                        node = (yp_node_t *) yp_interpolated_symbol_node_create(parser, &opening, &parts, &parser->previous);
-                    } else {
-                        expect(parser, YP_TOKEN_STRING_END, "Expected a closing delimiter for an interpolated string.");
-                        node = (yp_node_t *) yp_interpolated_string_node_create(parser, &opening, &parts, &parser->previous);
-                    }
-                }
-
-                if (result == NULL) {
-                    // If the node we just parsed is a symbol node, then we
-                    // can't concatenate it with anything else, so we can now
-                    // return that node.
-                    if (YP_NODE_TYPE_P(node, YP_SYMBOL_NODE) || YP_NODE_TYPE_P(node, YP_INTERPOLATED_SYMBOL_NODE)) {
-                        return node;
-                    }
-
-                    // If we don't already have a node, then it's fine and we
-                    // can just set the result to be the node we just parsed.
-                    result = node;
-                } else {
-                    // Otherwise we need to check the type of the node we just
-                    // parsed. If it cannot be concatenated with the previous
-                    // node, then we'll need to add a syntax error.
-                    if (!YP_NODE_TYPE_P(node, YP_STRING_NODE) && !YP_NODE_TYPE_P(node, YP_INTERPOLATED_STRING_NODE)) {
-                        yp_diagnostic_list_append(&parser->error_list, node->location.start, node->location.end, "Unexpected string concatenation.");
-                    }
-
-                    // Either way we will create a concat node to hold the
-                    // strings together.
-                    result = (yp_node_t *) yp_string_concat_node_create(parser, result, node);
-                }
-            }
-
-            return result;
-        }
-        case YP_TOKEN_SYMBOL_BEGIN: {
-            yp_lex_mode_t lex_mode = *parser->lex_modes.current;
-            parser_lex(parser);
-
-            return parse_symbol(parser, &lex_mode, YP_LEX_STATE_END);
-        }
-        default:
-            if (context_recoverable(parser, &parser->current)) {
-                parser->recovering = true;
-            }
-
-            return (yp_node_t *) yp_missing_node_create(parser, parser->previous.start, parser->previous.end);
-    }
-}
-
-static inline yp_node_t *
-parse_assignment_value(yp_parser_t *parser, yp_binding_power_t previous_binding_power, yp_binding_power_t binding_power, const char *message) {
-    yp_node_t *value = parse_starred_expression(parser, binding_power, message);
-
-    if (previous_binding_power == YP_BINDING_POWER_STATEMENT && (YP_NODE_TYPE_P(value, YP_SPLAT_NODE) || match_type_p(parser, YP_TOKEN_COMMA))) {
-        yp_token_t opening = not_provided(parser);
-        yp_array_node_t *array = yp_array_node_create(parser, &opening);
-
-        yp_array_node_elements_append(array, value);
-        value = (yp_node_t *) array;
-
-        while (accept(parser, YP_TOKEN_COMMA)) {
-            yp_node_t *element = parse_starred_expression(parser, binding_power, "Expected an element for the array.");
-            yp_array_node_elements_append(array, element);
-            if (YP_NODE_TYPE_P(element, YP_MISSING_NODE)) break;
-        }
-    }
-
-    return value;
-}
-
-static inline yp_node_t *
-parse_expression_infix(yp_parser_t *parser, yp_node_t *node, yp_binding_power_t previous_binding_power, yp_binding_power_t binding_power) {
-    yp_token_t token = parser->current;
-
-    switch (token.type) {
-        case YP_TOKEN_EQUAL: {
-            switch (YP_NODE_TYPE(node)) {
-                case YP_CALL_NODE: {
-                    // If we have no arguments to the call node and we need this
-                    // to be a target then this is either a method call or a
-                    // local variable write. This _must_ happen before the value
-                    // is parsed because it could be referenced in the value.
-                    yp_call_node_t *call_node = (yp_call_node_t *) node;
-                    if (yp_call_node_variable_call_p(call_node)) {
-                        yp_parser_local_add_location(parser, call_node->message_loc.start, call_node->message_loc.end);
-                    }
-                }
-                /* fallthrough */
-                case YP_CASE_WRITABLE: {
-                    parser_lex(parser);
-                    yp_node_t *value = parse_assignment_value(parser, previous_binding_power, binding_power, "Expected a value after =.");
-                    return parse_write(parser, node, &token, value);
-                }
-                case YP_SPLAT_NODE: {
-                    yp_splat_node_t *splat_node = (yp_splat_node_t *) node;
-
-                    switch (YP_NODE_TYPE(splat_node->expression)) {
-                        case YP_CASE_WRITABLE:
-                            parser_lex(parser);
-                            yp_node_t *value = parse_assignment_value(parser, previous_binding_power, binding_power, "Expected a value after =.");
-                            return parse_write(parser, (yp_node_t *) splat_node, &token, value);
-                        default:
-                            break;
-                    }
-                }
-                /* fallthrough */
-                default:
-                    parser_lex(parser);
-
-                    // In this case we have an = sign, but we don't know what it's for. We
-                    // need to treat it as an error. For now, we'll mark it as an error
-                    // and just skip right past it.
-                    yp_diagnostic_list_append(&parser->error_list, token.start, token.end, "Unexpected `='.");
-                    return node;
-            }
-        }
-        case YP_TOKEN_AMPERSAND_AMPERSAND_EQUAL: {
-            switch (YP_NODE_TYPE(node)) {
-                case YP_BACK_REFERENCE_READ_NODE:
-                case YP_NUMBERED_REFERENCE_READ_NODE:
-                    yp_diagnostic_list_append(&parser->error_list, node->location.start, node->location.end, "Can't set variable");
-                /* fallthrough */
-                case YP_GLOBAL_VARIABLE_READ_NODE: {
-                    parser_lex(parser);
-
-                    yp_node_t *value = parse_expression(parser, binding_power, "Expected a value after &&=");
-                    yp_node_t *result = (yp_node_t *) yp_global_variable_and_write_node_create(parser, node, &token, value);
-
-                    yp_node_destroy(parser, node);
-                    return result;
-                }
-                case YP_CLASS_VARIABLE_READ_NODE: {
-                    parser_lex(parser);
-
-                    yp_node_t *value = parse_expression(parser, binding_power, "Expected a value after &&=");
-                    yp_node_t *result = (yp_node_t *) yp_class_variable_and_write_node_create(parser, (yp_class_variable_read_node_t *) node, &token, value);
-
-                    yp_node_destroy(parser, node);
-                    return result;
-                }
-                case YP_CONSTANT_PATH_NODE: {
-                    parser_lex(parser);
-
-                    yp_node_t *value = parse_expression(parser, binding_power, "Expected a value after &&=");
-                    return (yp_node_t *) yp_constant_path_and_write_node_create(parser, (yp_constant_path_node_t *) node, &token, value);
-                }
-                case YP_CONSTANT_READ_NODE: {
-                    parser_lex(parser);
-
-                    yp_node_t *value = parse_expression(parser, binding_power, "Expected a value after &&=");
-                    yp_node_t *result = (yp_node_t *) yp_constant_and_write_node_create(parser, (yp_constant_read_node_t *) node, &token, value);
-
-                    yp_node_destroy(parser, node);
-                    return result;
-                }
-                case YP_INSTANCE_VARIABLE_READ_NODE: {
-                    parser_lex(parser);
-
-                    yp_node_t *value = parse_expression(parser, binding_power, "Expected a value after &&=");
-                    yp_node_t *result = (yp_node_t *) yp_instance_variable_and_write_node_create(parser, (yp_instance_variable_read_node_t *) node, &token, value);
-
-                    yp_node_destroy(parser, node);
-                    return result;
-                }
-                case YP_LOCAL_VARIABLE_READ_NODE: {
-                    yp_local_variable_read_node_t *cast = (yp_local_variable_read_node_t *) node;
-                    parser_lex(parser);
-
-                    yp_node_t *value = parse_expression(parser, binding_power, "Expected a value after &&=");
-                    yp_node_t *result = (yp_node_t *) yp_local_variable_and_write_node_create(parser, node, &token, value, cast->name, cast->depth);
-
-                    yp_node_destroy(parser, node);
-                    return result;
-                }
-                case YP_CALL_NODE: {
-                    yp_call_node_t *call_node = (yp_call_node_t *) node;
-
-                    // If we have a vcall (a method with no arguments and no
-                    // receiver that could have been a local variable) then we
-                    // will transform it into a local variable write.
-                    if (yp_call_node_variable_call_p(call_node)) {
-                        yp_location_t message_loc = call_node->message_loc;
-                        yp_constant_id_t constant_id = yp_parser_local_add_location(parser, message_loc.start, message_loc.end);
-
-                        if (token_is_numbered_parameter(message_loc.start, message_loc.end)) {
-                            yp_diagnostic_list_append(&parser->error_list, message_loc.start, message_loc.end, "reserved for numbered parameter");
-                        }
-
-                        parser_lex(parser);
-                        yp_node_t *value = parse_expression(parser, binding_power, "Expected a value after &&=");
-                        yp_node_t *result = (yp_node_t *) yp_local_variable_and_write_node_create(parser, node, &token, value, constant_id, 0);
-
-                        yp_node_destroy(parser, node);
-                        return result;
-                    }
-
-                    parser_lex(parser);
-                    node = parse_target(parser, node);
-
-                    yp_node_t *value = parse_expression(parser, binding_power, "Expected a value after &&=");
-                    return (yp_node_t *) yp_call_and_write_node_create(parser, (yp_call_node_t *) node, &token, value);
-                }
-                case YP_MULTI_WRITE_NODE: {
-                    parser_lex(parser);
-                    yp_diagnostic_list_append(&parser->error_list, token.start, token.end, "Cannot use `&&=' on a multi-write.");
-                    return node;
-                }
-                default:
-                    parser_lex(parser);
-
-                    // In this case we have an &&= sign, but we don't know what it's for.
-                    // We need to treat it as an error. For now, we'll mark it as an error
-                    // and just skip right past it.
-                    yp_diagnostic_list_append(&parser->error_list, token.start, token.end, "Unexpected `&&='.");
-                    return node;
-            }
-        }
-        case YP_TOKEN_PIPE_PIPE_EQUAL: {
-            switch (YP_NODE_TYPE(node)) {
-                case YP_BACK_REFERENCE_READ_NODE:
-                case YP_NUMBERED_REFERENCE_READ_NODE:
-                    yp_diagnostic_list_append(&parser->error_list, node->location.start, node->location.end, "Can't set variable");
-                /* fallthrough */
-                case YP_GLOBAL_VARIABLE_READ_NODE: {
-                    parser_lex(parser);
-
-                    yp_node_t *value = parse_expression(parser, binding_power, "Expected a value after ||=");
-                    yp_node_t *result = (yp_node_t *) yp_global_variable_or_write_node_create(parser, node, &token, value);
-
-                    yp_node_destroy(parser, node);
-                    return result;
-                }
-                case YP_CLASS_VARIABLE_READ_NODE: {
-                    parser_lex(parser);
-
-                    yp_node_t *value = parse_expression(parser, binding_power, "Expected a value after ||=");
-                    yp_node_t *result = (yp_node_t *) yp_class_variable_or_write_node_create(parser, (yp_class_variable_read_node_t *) node, &token, value);
-
-                    yp_node_destroy(parser, node);
-                    return result;
-                }
-                case YP_CONSTANT_PATH_NODE: {
-                    parser_lex(parser);
-
-                    yp_node_t *value = parse_expression(parser, binding_power, "Expected a value after ||=");
-                    return (yp_node_t *) yp_constant_path_or_write_node_create(parser, (yp_constant_path_node_t *) node, &token, value);
-                }
-                case YP_CONSTANT_READ_NODE: {
-                    parser_lex(parser);
-
-                    yp_node_t *value = parse_expression(parser, binding_power, "Expected a value after ||=");
-                    yp_node_t *result = (yp_node_t *) yp_constant_or_write_node_create(parser, (yp_constant_read_node_t *) node, &token, value);
-
-                    yp_node_destroy(parser, node);
-                    return result;
-                }
-                case YP_INSTANCE_VARIABLE_READ_NODE: {
-                    parser_lex(parser);
-
-                    yp_node_t *value = parse_expression(parser, binding_power, "Expected a value after ||=");
-                    yp_node_t *result = (yp_node_t *) yp_instance_variable_or_write_node_create(parser, (yp_instance_variable_read_node_t *) node, &token, value);
-
-                    yp_node_destroy(parser, node);
-                    return result;
-                }
-                case YP_LOCAL_VARIABLE_READ_NODE: {
-                    yp_local_variable_read_node_t *cast = (yp_local_variable_read_node_t *) node;
-                    parser_lex(parser);
-
-                    yp_node_t *value = parse_expression(parser, binding_power, "Expected a value after ||=");
-                    yp_node_t *result = (yp_node_t *) yp_local_variable_or_write_node_create(parser, node, &token, value, cast->name, cast->depth);
-
-                    yp_node_destroy(parser, node);
-                    return result;
-                }
-                case YP_CALL_NODE: {
-                    yp_call_node_t *call_node = (yp_call_node_t *) node;
-
-                    // If we have a vcall (a method with no arguments and no
-                    // receiver that could have been a local variable) then we
-                    // will transform it into a local variable write.
-                    if (yp_call_node_variable_call_p(call_node)) {
-                        yp_location_t message_loc = call_node->message_loc;
-                        yp_constant_id_t constant_id = yp_parser_local_add_location(parser, message_loc.start, message_loc.end);
-
-                        if (token_is_numbered_parameter(message_loc.start, message_loc.end)) {
-                            yp_diagnostic_list_append(&parser->error_list, message_loc.start, message_loc.end, "reserved for numbered parameter");
-                        }
-
-                        parser_lex(parser);
-                        yp_node_t *value = parse_expression(parser, binding_power, "Expected a value after ||=");
-                        yp_node_t *result = (yp_node_t *) yp_local_variable_or_write_node_create(parser, node, &token, value, constant_id, 0);
-
-                        yp_node_destroy(parser, node);
-                        return result;
-                    }
-
-                    parser_lex(parser);
-                    node = parse_target(parser, node);
-
-                    yp_node_t *value = parse_expression(parser, binding_power, "Expected a value after ||=");
-                    return (yp_node_t *) yp_call_or_write_node_create(parser, (yp_call_node_t *) node, &token, value);
-                }
-                case YP_MULTI_WRITE_NODE: {
-                    parser_lex(parser);
-                    yp_diagnostic_list_append(&parser->error_list, token.start, token.end, "Cannot use `||=' on a multi-write.");
-                    return node;
-                }
-                default:
-                    parser_lex(parser);
-
-                    // In this case we have an ||= sign, but we don't know what it's for.
-                    // We need to treat it as an error. For now, we'll mark it as an error
-                    // and just skip right past it.
-                    yp_diagnostic_list_append(&parser->error_list, token.start, token.end, "Unexpected `||='.");
-                    return node;
-            }
-        }
-        case YP_TOKEN_AMPERSAND_EQUAL:
-        case YP_TOKEN_CARET_EQUAL:
-        case YP_TOKEN_GREATER_GREATER_EQUAL:
-        case YP_TOKEN_LESS_LESS_EQUAL:
-        case YP_TOKEN_MINUS_EQUAL:
-        case YP_TOKEN_PERCENT_EQUAL:
-        case YP_TOKEN_PIPE_EQUAL:
-        case YP_TOKEN_PLUS_EQUAL:
-        case YP_TOKEN_SLASH_EQUAL:
-        case YP_TOKEN_STAR_EQUAL:
-        case YP_TOKEN_STAR_STAR_EQUAL: {
-            switch (YP_NODE_TYPE(node)) {
-                case YP_BACK_REFERENCE_READ_NODE:
-                case YP_NUMBERED_REFERENCE_READ_NODE:
-                    yp_diagnostic_list_append(&parser->error_list, node->location.start, node->location.end, "Can't set variable");
-                /* fallthrough */
-                case YP_GLOBAL_VARIABLE_READ_NODE: {
-                    parser_lex(parser);
-
-                    yp_node_t *value = parse_expression(parser, binding_power, "Expected a value after the operator.");
-                    yp_node_t *result = (yp_node_t *) yp_global_variable_operator_write_node_create(parser, node, &token, value);
-
-                    yp_node_destroy(parser, node);
-                    return result;
-                }
-                case YP_CLASS_VARIABLE_READ_NODE: {
-                    parser_lex(parser);
-
-                    yp_node_t *value = parse_expression(parser, binding_power, "Expected a value after the operator.");
-                    yp_node_t *result = (yp_node_t *) yp_class_variable_operator_write_node_create(parser, (yp_class_variable_read_node_t *) node, &token, value);
-
-                    yp_node_destroy(parser, node);
-                    return result;
-                }
-                case YP_CONSTANT_PATH_NODE: {
-                    parser_lex(parser);
-
-                    yp_node_t *value = parse_expression(parser, binding_power, "Expected a value after the operator.");
-                    return (yp_node_t *) yp_constant_path_operator_write_node_create(parser, (yp_constant_path_node_t *) node, &token, value);
-                }
-                case YP_CONSTANT_READ_NODE: {
-                    parser_lex(parser);
-
-                    yp_node_t *value = parse_expression(parser, binding_power, "Expected a value after the operator.");
-                    yp_node_t *result = (yp_node_t *) yp_constant_operator_write_node_create(parser, (yp_constant_read_node_t *) node, &token, value);
-
-                    yp_node_destroy(parser, node);
-                    return result;
-                }
-                case YP_INSTANCE_VARIABLE_READ_NODE: {
-                    parser_lex(parser);
-
-                    yp_node_t *value = parse_expression(parser, binding_power, "Expected a value after the operator.");
-                    yp_node_t *result = (yp_node_t *) yp_instance_variable_operator_write_node_create(parser, (yp_instance_variable_read_node_t *) node, &token, value);
-
-                    yp_node_destroy(parser, node);
-                    return result;
-                }
-                case YP_LOCAL_VARIABLE_READ_NODE: {
-                    yp_local_variable_read_node_t *cast = (yp_local_variable_read_node_t *) node;
-                    parser_lex(parser);
-
-                    yp_node_t *value = parse_expression(parser, binding_power, "Expected a value after the operator.");
-                    yp_node_t *result = (yp_node_t *) yp_local_variable_operator_write_node_create(parser, node, &token, value, cast->name, cast->depth);
-
-                    yp_node_destroy(parser, node);
-                    return result;
-                }
-                case YP_CALL_NODE: {
-                    yp_call_node_t *call_node = (yp_call_node_t *) node;
-
-                    // If we have a vcall (a method with no arguments and no
-                    // receiver that could have been a local variable) then we
-                    // will transform it into a local variable write.
-                    if (yp_call_node_variable_call_p(call_node)) {
-                        yp_location_t message_loc = call_node->message_loc;
-                        yp_constant_id_t constant_id = yp_parser_local_add_location(parser, message_loc.start, message_loc.end);
-
-                        if (token_is_numbered_parameter(message_loc.start, message_loc.end)) {
-                            yp_diagnostic_list_append(&parser->error_list, message_loc.start, message_loc.end, "reserved for numbered parameter");
-                        }
-
-                        parser_lex(parser);
-                        yp_node_t *value = parse_expression(parser, binding_power, "Expected a value after the operator.");
-                        yp_node_t *result = (yp_node_t *) yp_local_variable_operator_write_node_create(parser, node, &token, value, constant_id, 0);
-
-                        yp_node_destroy(parser, node);
-                        return result;
-                    }
-
-                    node = parse_target(parser, node);
-                    parser_lex(parser);
-
-                    yp_node_t *value = parse_expression(parser, binding_power, "Expected a value after the operator.");
-                    return (yp_node_t *) yp_call_operator_write_node_create(parser, (yp_call_node_t *) node, &token, value);
-                }
-                case YP_MULTI_WRITE_NODE: {
-                    parser_lex(parser);
-                    yp_diagnostic_list_append(&parser->error_list, token.start, token.end, "Unexpected operator.");
-                    return node;
-                }
-                default:
-                    parser_lex(parser);
-
-                    // In this case we have an operator but we don't know what it's for.
-                    // We need to treat it as an error. For now, we'll mark it as an error
-                    // and just skip right past it.
-                    yp_diagnostic_list_append(&parser->error_list, parser->previous.start, parser->previous.end, "Unexpected operator.");
-                    return node;
-            }
-        }
-        case YP_TOKEN_AMPERSAND_AMPERSAND:
-        case YP_TOKEN_KEYWORD_AND: {
-            parser_lex(parser);
-
-            yp_node_t *right = parse_expression(parser, binding_power, "Expected a value after the operator.");
-            return (yp_node_t *) yp_and_node_create(parser, node, &token, right);
-        }
-        case YP_TOKEN_KEYWORD_OR:
-        case YP_TOKEN_PIPE_PIPE: {
-            parser_lex(parser);
-
-            yp_node_t *right = parse_expression(parser, binding_power, "Expected a value after the operator.");
-            return (yp_node_t *) yp_or_node_create(parser, node, &token, right);
-        }
-        case YP_TOKEN_EQUAL_TILDE: {
-            // Note that we _must_ parse the value before adding the local variables
-            // in order to properly mirror the behavior of Ruby. For example,
-            //
-            //     /(?<foo>bar)/ =~ foo
-            //
-            // In this case, `foo` should be a method call and not a local yet.
-            parser_lex(parser);
-            yp_node_t *argument = parse_expression(parser, binding_power, "Expected a value after the operator.");
-
-            // If the receiver of this =~ is a regular expression node, then we need
-            // to introduce local variables for it based on its named capture groups.
-            if (YP_NODE_TYPE_P(node, YP_REGULAR_EXPRESSION_NODE)) {
-                yp_string_list_t named_captures;
-                yp_string_list_init(&named_captures);
-
-                const yp_location_t *content_loc = &((yp_regular_expression_node_t *) node)->content_loc;
-
-                if (yp_regexp_named_capture_group_names(content_loc->start, (size_t) (content_loc->end - content_loc->start), &named_captures, parser->encoding_changed, &parser->encoding)) {
-                    for (size_t index = 0; index < named_captures.length; index++) {
-                        yp_string_t *name = &named_captures.strings[index];
-                        assert(name->type == YP_STRING_SHARED);
-
-                        yp_parser_local_add_location(parser, name->source, name->source + name->length);
-                    }
-                }
-
-                yp_string_list_free(&named_captures);
-            }
-
-            return (yp_node_t *) yp_call_node_binary_create(parser, node, &token, argument);
-        }
-        case YP_TOKEN_UAMPERSAND:
-        case YP_TOKEN_USTAR:
-        case YP_TOKEN_USTAR_STAR:
-            // The only times this will occur are when we are in an error state,
-            // but we'll put them in here so that errors can propagate.
-        case YP_TOKEN_BANG_EQUAL:
-        case YP_TOKEN_BANG_TILDE:
-        case YP_TOKEN_EQUAL_EQUAL:
-        case YP_TOKEN_EQUAL_EQUAL_EQUAL:
-        case YP_TOKEN_LESS_EQUAL_GREATER:
-        case YP_TOKEN_GREATER:
-        case YP_TOKEN_GREATER_EQUAL:
-        case YP_TOKEN_LESS:
-        case YP_TOKEN_LESS_EQUAL:
-        case YP_TOKEN_CARET:
-        case YP_TOKEN_PIPE:
-        case YP_TOKEN_AMPERSAND:
-        case YP_TOKEN_GREATER_GREATER:
-        case YP_TOKEN_LESS_LESS:
-        case YP_TOKEN_MINUS:
-        case YP_TOKEN_PLUS:
-        case YP_TOKEN_PERCENT:
-        case YP_TOKEN_SLASH:
-        case YP_TOKEN_STAR:
-        case YP_TOKEN_STAR_STAR: {
-            parser_lex(parser);
-
-            yp_node_t *argument = parse_expression(parser, binding_power, "Expected a value after the operator.");
-            return (yp_node_t *) yp_call_node_binary_create(parser, node, &token, argument);
-        }
-        case YP_TOKEN_AMPERSAND_DOT:
-        case YP_TOKEN_DOT: {
-            parser_lex(parser);
-            yp_token_t operator = parser->previous;
-            yp_arguments_t arguments = YP_EMPTY_ARGUMENTS;
-
-            // This if statement handles the foo.() syntax.
-            if (match_type_p(parser, YP_TOKEN_PARENTHESIS_LEFT)) {
-                parse_arguments_list(parser, &arguments, true);
-                return (yp_node_t *) yp_call_node_shorthand_create(parser, node, &operator, &arguments);
-            }
-
-            yp_token_t message;
-
-            switch (parser->current.type) {
-                case YP_CASE_OPERATOR:
-                case YP_CASE_KEYWORD:
-                case YP_TOKEN_CONSTANT:
-                case YP_TOKEN_IDENTIFIER: {
-                    parser_lex(parser);
-                    message = parser->previous;
-                    break;
-                }
-                default: {
-                    yp_diagnostic_list_append(&parser->error_list, parser->current.start, parser->current.end, "Expected a valid method name");
-                    message = (yp_token_t) { .type = YP_TOKEN_MISSING, .start = parser->previous.end, .end = parser->previous.end };
-                }
-            }
-
-            parse_arguments_list(parser, &arguments, true);
-            yp_call_node_t *call = yp_call_node_call_create(parser, node, &operator, &message, &arguments);
-
-            if (
-                (previous_binding_power == YP_BINDING_POWER_STATEMENT) &&
-                arguments.arguments == NULL &&
-                arguments.opening_loc.start == NULL &&
-                match_type_p(parser, YP_TOKEN_COMMA)
-            ) {
-                return parse_targets(parser, (yp_node_t *) call, YP_BINDING_POWER_INDEX);
-            } else {
-                return (yp_node_t *) call;
-            }
-        }
-        case YP_TOKEN_DOT_DOT:
-        case YP_TOKEN_DOT_DOT_DOT: {
-            parser_lex(parser);
-
-            yp_node_t *right = NULL;
-            if (token_begins_expression_p(parser->current.type)) {
-                right = parse_expression(parser, binding_power, "Expected a value after the operator.");
-            }
-
-            return (yp_node_t *) yp_range_node_create(parser, node, &token, right);
-        }
-        case YP_TOKEN_KEYWORD_IF_MODIFIER: {
-            yp_token_t keyword = parser->current;
-            parser_lex(parser);
-
-            yp_node_t *predicate = parse_expression(parser, binding_power, "Expected a predicate after `if'.");
-            return (yp_node_t *) yp_if_node_modifier_create(parser, node, &keyword, predicate);
-        }
-        case YP_TOKEN_KEYWORD_UNLESS_MODIFIER: {
-            yp_token_t keyword = parser->current;
-            parser_lex(parser);
-
-            yp_node_t *predicate = parse_expression(parser, binding_power, "Expected a predicate after `unless'.");
-            return (yp_node_t *) yp_unless_node_modifier_create(parser, node, &keyword, predicate);
-        }
-        case YP_TOKEN_KEYWORD_UNTIL_MODIFIER: {
-            parser_lex(parser);
-            yp_statements_node_t *statements = yp_statements_node_create(parser);
-            yp_statements_node_body_append(statements, node);
-
-            yp_node_t *predicate = parse_expression(parser, binding_power, "Expected a predicate after 'until'");
-            return (yp_node_t *) yp_until_node_modifier_create(parser, &token, predicate, statements, YP_NODE_TYPE_P(node, YP_BEGIN_NODE) ? YP_LOOP_FLAGS_BEGIN_MODIFIER : 0);
-        }
-        case YP_TOKEN_KEYWORD_WHILE_MODIFIER: {
-            parser_lex(parser);
-            yp_statements_node_t *statements = yp_statements_node_create(parser);
-            yp_statements_node_body_append(statements, node);
-
-            yp_node_t *predicate = parse_expression(parser, binding_power, "Expected a predicate after 'while'");
-            return (yp_node_t *) yp_while_node_modifier_create(parser, &token, predicate, statements, YP_NODE_TYPE_P(node, YP_BEGIN_NODE) ? YP_LOOP_FLAGS_BEGIN_MODIFIER : 0);
-        }
-        case YP_TOKEN_QUESTION_MARK: {
-            parser_lex(parser);
-            yp_node_t *true_expression = parse_expression(parser, YP_BINDING_POWER_DEFINED, "Expected a value after '?'");
-
-            if (parser->recovering) {
-                // If parsing the true expression of this ternary resulted in a syntax
-                // error that we can recover from, then we're going to put missing nodes
-                // and tokens into the remaining places. We want to be sure to do this
-                // before the `expect` function call to make sure it doesn't
-                // accidentally move past a ':' token that occurs after the syntax
-                // error.
-                yp_token_t colon = (yp_token_t) { .type = YP_TOKEN_MISSING, .start = parser->previous.end, .end = parser->previous.end };
-                yp_node_t *false_expression = (yp_node_t *) yp_missing_node_create(parser, colon.start, colon.end);
-
-                return (yp_node_t *) yp_if_node_ternary_create(parser, node, true_expression, &colon, false_expression);
-            }
-
-            accept(parser, YP_TOKEN_NEWLINE);
-            expect(parser, YP_TOKEN_COLON, "Expected ':' after true expression in ternary operator.");
-
-            yp_token_t colon = parser->previous;
-            yp_node_t *false_expression = parse_expression(parser, YP_BINDING_POWER_DEFINED, "Expected a value after ':'");
-
-            return (yp_node_t *) yp_if_node_ternary_create(parser, node, true_expression, &colon, false_expression);
-        }
-        case YP_TOKEN_COLON_COLON: {
-            parser_lex(parser);
-            yp_token_t delimiter = parser->previous;
-
-            switch (parser->current.type) {
-                case YP_TOKEN_CONSTANT: {
-                    parser_lex(parser);
-                    yp_node_t *path;
-
-                    if (
-                        (parser->current.type == YP_TOKEN_PARENTHESIS_LEFT) ||
-                        (token_begins_expression_p(parser->current.type) || match_any_type_p(parser, 3, YP_TOKEN_UAMPERSAND, YP_TOKEN_USTAR, YP_TOKEN_USTAR_STAR))
-                    ) {
-                        // If we have a constant immediately following a '::' operator, then
-                        // this can either be a constant path or a method call, depending on
-                        // what follows the constant.
-                        //
-                        // If we have parentheses, then this is a method call. That would
-                        // look like Foo::Bar().
-                        yp_token_t message = parser->previous;
-                        yp_arguments_t arguments = YP_EMPTY_ARGUMENTS;
-
-                        parse_arguments_list(parser, &arguments, true);
-                        path = (yp_node_t *) yp_call_node_call_create(parser, node, &delimiter, &message, &arguments);
-                    } else {
-                        // Otherwise, this is a constant path. That would look like Foo::Bar.
-                        yp_node_t *child = (yp_node_t *) yp_constant_read_node_create(parser, &parser->previous);
-                        path = (yp_node_t *)yp_constant_path_node_create(parser, node, &delimiter, child);
-                    }
-
-                    // If this is followed by a comma then it is a multiple assignment.
-                    if (previous_binding_power == YP_BINDING_POWER_STATEMENT && match_type_p(parser, YP_TOKEN_COMMA)) {
-                        return parse_targets(parser, path, YP_BINDING_POWER_INDEX);
-                    }
-
-                    return path;
-                }
-                case YP_CASE_OPERATOR:
-                case YP_CASE_KEYWORD:
-                case YP_TOKEN_IDENTIFIER: {
-                    parser_lex(parser);
-                    yp_token_t message = parser->previous;
-
-                    // If we have an identifier following a '::' operator, then it is for
-                    // sure a method call.
-                    yp_arguments_t arguments = YP_EMPTY_ARGUMENTS;
-                    parse_arguments_list(parser, &arguments, true);
-                    yp_call_node_t *call = yp_call_node_call_create(parser, node, &delimiter, &message, &arguments);
-
-                    // If this is followed by a comma then it is a multiple assignment.
-                    if (previous_binding_power == YP_BINDING_POWER_STATEMENT && match_type_p(parser, YP_TOKEN_COMMA)) {
-                        return parse_targets(parser, (yp_node_t *) call, YP_BINDING_POWER_INDEX);
-                    }
-
-                    return (yp_node_t *) call;
-                }
-                case YP_TOKEN_PARENTHESIS_LEFT: {
-                    // If we have a parenthesis following a '::' operator, then it is the
-                    // method call shorthand. That would look like Foo::(bar).
-                    yp_arguments_t arguments = YP_EMPTY_ARGUMENTS;
-                    parse_arguments_list(parser, &arguments, true);
-
-                    return (yp_node_t *) yp_call_node_shorthand_create(parser, node, &delimiter, &arguments);
-                }
-                default: {
-                    yp_diagnostic_list_append(&parser->error_list, delimiter.start, delimiter.end, "Expected identifier or constant after '::'");
-                    yp_node_t *child = (yp_node_t *) yp_missing_node_create(parser, delimiter.start, delimiter.end);
-                    return (yp_node_t *)yp_constant_path_node_create(parser, node, &delimiter, child);
-                }
-            }
-        }
-        case YP_TOKEN_KEYWORD_RESCUE_MODIFIER: {
-            parser_lex(parser);
-            accept(parser, YP_TOKEN_NEWLINE);
-            yp_node_t *value = parse_expression(parser, binding_power, "Expected a value after the rescue keyword.");
-
-            return (yp_node_t *) yp_rescue_modifier_node_create(parser, node, &token, value);
-        }
-        case YP_TOKEN_BRACKET_LEFT: {
-            parser_lex(parser);
-
-            yp_arguments_t arguments = YP_EMPTY_ARGUMENTS;
-            arguments.opening_loc = ((yp_location_t) { .start = parser->previous.start, .end = parser->previous.end });
-
-            if (!accept(parser, YP_TOKEN_BRACKET_RIGHT)) {
-                yp_accepts_block_stack_push(parser, true);
-                arguments.arguments = yp_arguments_node_create(parser);
-
-                parse_arguments(parser, &arguments, false, YP_TOKEN_BRACKET_RIGHT);
-                yp_accepts_block_stack_pop(parser);
-
-                expect(parser, YP_TOKEN_BRACKET_RIGHT, "Expected ']' to close the bracket expression.");
-            }
-
-            arguments.closing_loc = ((yp_location_t) { .start = parser->previous.start, .end = parser->previous.end });
-
-            // If we have a comma after the closing bracket then this is a multiple
-            // assignment and we should parse the targets.
-            if (previous_binding_power == YP_BINDING_POWER_STATEMENT && match_type_p(parser, YP_TOKEN_COMMA)) {
-                yp_call_node_t *aref = yp_call_node_aref_create(parser, node, &arguments);
-                return parse_targets(parser, (yp_node_t *) aref, YP_BINDING_POWER_INDEX);
-            }
-
-            // If we're at the end of the arguments, we can now check if there is a
-            // block node that starts with a {. If there is, then we can parse it and
-            // add it to the arguments.
-            if (accept(parser, YP_TOKEN_BRACE_LEFT)) {
-                arguments.block = parse_block(parser);
-            } else if (yp_accepts_block_stack_p(parser) && accept(parser, YP_TOKEN_KEYWORD_DO)) {
-                arguments.block = parse_block(parser);
-            }
-
-            yp_arguments_validate(parser, &arguments);
-            return (yp_node_t *) yp_call_node_aref_create(parser, node, &arguments);
-        }
-        case YP_TOKEN_KEYWORD_IN: {
-            bool previous_pattern_matching_newlines = parser->pattern_matching_newlines;
-            parser->pattern_matching_newlines = true;
-
-            yp_token_t operator = parser->current;
-            parser->command_start = false;
-            lex_state_set(parser, YP_LEX_STATE_BEG | YP_LEX_STATE_LABEL);
-
-            parser_lex(parser);
-
-            yp_node_t *pattern = parse_pattern(parser, true, "Expected a pattern after `in'.");
-            parser->pattern_matching_newlines = previous_pattern_matching_newlines;
-
-            return (yp_node_t *) yp_match_predicate_node_create(parser, node, pattern, &operator);
-        }
-        case YP_TOKEN_EQUAL_GREATER: {
-            bool previous_pattern_matching_newlines = parser->pattern_matching_newlines;
-            parser->pattern_matching_newlines = true;
-
-            yp_token_t operator = parser->current;
-            parser->command_start = false;
-            lex_state_set(parser, YP_LEX_STATE_BEG | YP_LEX_STATE_LABEL);
-
-            parser_lex(parser);
-
-            yp_node_t *pattern = parse_pattern(parser, true, "Expected a pattern after `=>'.");
-            parser->pattern_matching_newlines = previous_pattern_matching_newlines;
-
-            return (yp_node_t *) yp_match_required_node_create(parser, node, pattern, &operator);
-        }
-        default:
-            assert(false && "unreachable");
-            return NULL;
-    }
-}
-
-// Parse an expression at the given point of the parser using the given binding
-// power to parse subsequent chains. If this function finds a syntax error, it
-// will append the error message to the parser's error list.
-//
-// Consumers of this function should always check parser->recovering to
-// determine if they need to perform additional cleanup.
-static yp_node_t *
-parse_expression(yp_parser_t *parser, yp_binding_power_t binding_power, const char *message) {
-    yp_token_t recovery = parser->previous;
-    yp_node_t *node = parse_expression_prefix(parser, binding_power);
-
-    // If we found a syntax error, then the type of node returned by
-    // parse_expression_prefix is going to be a missing node. In that case we need
-    // to add the error message to the parser's error list.
-    if (YP_NODE_TYPE_P(node, YP_MISSING_NODE)) {
-        yp_diagnostic_list_append(&parser->error_list, recovery.end, recovery.end, message);
-        return node;
-    }
-
-    // Otherwise we'll look and see if the next token can be parsed as an infix
-    // operator. If it can, then we'll parse it using parse_expression_infix.
-    yp_binding_powers_t current_binding_powers;
-    while (
-        current_binding_powers = yp_binding_powers[parser->current.type],
-        binding_power <= current_binding_powers.left &&
-        current_binding_powers.binary
-     ) {
-        node = parse_expression_infix(parser, node, binding_power, current_binding_powers.right);
-    }
-
-    return node;
-}
-
-static yp_node_t *
-parse_program(yp_parser_t *parser) {
-    yp_parser_scope_push(parser, !parser->current_scope);
-    parser_lex(parser);
-
-    yp_statements_node_t *statements = parse_statements(parser, YP_CONTEXT_MAIN);
-    if (!statements) {
-        statements = yp_statements_node_create(parser);
-    }
-    yp_constant_id_list_t locals = parser->current_scope->locals;
-    yp_parser_scope_pop(parser);
-
-    // If this is an empty file, then we're still going to parse all of the
-    // statements in order to gather up all of the comments and such. Here we'll
-    // correct the location information.
-    if (yp_statements_node_body_length(statements) == 0) {
-        yp_statements_node_location_set(statements, parser->start, parser->start);
-    }
-
-    return (yp_node_t *) yp_program_node_create(parser, &locals, statements);
-}
-
-// Read a 32-bit unsigned integer from a pointer. This function is used to read
-// the metadata that is passed into the parser from the Ruby implementation. It
-// handles aligned and unaligned reads.
-static uint32_t
-yp_metadata_read_u32(const char *ptr) {
-    if (((uintptr_t) ptr) % sizeof(uint32_t) == 0) {
-        return *((uint32_t *) ptr);
-    } else {
-        uint32_t value;
-        memcpy(&value, ptr, sizeof(uint32_t));
-        return value;
-    }
-}
-
-// Process any additional metadata being passed into a call to the parser via
-// the yp_parse_serialize function. Since the source of these calls will be from
-// Ruby implementation internals we assume it is from a trusted source.
-//
-// Currently, this is only passing in variable scoping surrounding an eval, but
-// eventually it will be extended to hold any additional metadata.  This data
-// is serialized to reduce the calling complexity for a foreign function call
-// vs a foreign runtime making a bindable in-memory version of a C structure.
-//
-// metadata is assumed to be a valid pointer pointing to well-formed data. The
-// format is described below:
-//
-// ```text
-// [
-//   filepath_size: uint32_t,
-//   filepath: char*,
-//   scopes_count: uint32_t,
-//   [
-//     locals_count: uint32_t,
-//     [local_size: uint32_t, local: char*]*
-//   ]*
-// ]
-// ```
-void
-yp_parser_metadata(yp_parser_t *parser, const char *metadata) {
-    uint32_t filepath_size = yp_metadata_read_u32(metadata);
-    metadata += 4;
-
-    if (filepath_size) {
-        yp_string_t filepath_string;
-        yp_string_constant_init(&filepath_string, metadata, filepath_size);
-
-        parser->filepath_string = filepath_string;
-        metadata += filepath_size;
-    }
-
-    uint32_t scopes_count = yp_metadata_read_u32(metadata);
-    metadata += 4;
-
-    for (size_t scope_index = 0; scope_index < scopes_count; scope_index++) {
-        uint32_t locals_count = yp_metadata_read_u32(metadata);
-        metadata += 4;
-
-        yp_parser_scope_push(parser, scope_index == 0);
-
-        for (size_t local_index = 0; local_index < locals_count; local_index++) {
-            uint32_t local_size = yp_metadata_read_u32(metadata);
-            metadata += 4;
-
-            yp_parser_local_add_location(parser, (const uint8_t *) metadata, (const uint8_t *) (metadata + local_size));
-            metadata += local_size;
-        }
-    }
-}
-
-/******************************************************************************/
-/* External functions                                                         */
-/******************************************************************************/
-
-// Initialize a parser with the given start and end pointers.
-YP_EXPORTED_FUNCTION void
-yp_parser_init(yp_parser_t *parser, const uint8_t *source, size_t size, const char *filepath) {
-    assert(source != NULL);
-
-    // Set filepath to the file that was passed
-    if (!filepath) filepath = "";
-    yp_string_t filepath_string;
-    yp_string_constant_init(&filepath_string, filepath, strlen(filepath));
-
-    *parser = (yp_parser_t) {
-        .lex_state = YP_LEX_STATE_BEG,
-        .command_start = true,
-        .enclosure_nesting = 0,
-        .lambda_enclosure_nesting = -1,
-        .brace_nesting = 0,
-        .do_loop_stack = YP_STATE_STACK_EMPTY,
-        .accepts_block_stack = YP_STATE_STACK_EMPTY,
-        .lex_modes = {
-            .index = 0,
-            .stack = {{ .mode = YP_LEX_DEFAULT }},
-            .current = &parser->lex_modes.stack[0],
-        },
-        .start = source,
-        .end = source + size,
-        .previous = { .type = YP_TOKEN_EOF, .start = source, .end = source },
-        .current = { .type = YP_TOKEN_EOF, .start = source, .end = source },
-        .next_start = NULL,
-        .heredoc_end = NULL,
-        .comment_list = YP_LIST_EMPTY,
-        .warning_list = YP_LIST_EMPTY,
-        .error_list = YP_LIST_EMPTY,
-        .current_scope = NULL,
-        .current_context = NULL,
-        .recovering = false,
-        .encoding = yp_encoding_utf_8,
-        .encoding_changed = false,
-        .encoding_changed_callback = NULL,
-        .encoding_decode_callback = NULL,
-        .encoding_comment_start = source,
-        .lex_callback = NULL,
-        .pattern_matching_newlines = false,
-        .in_keyword_arg = false,
-        .filepath_string = filepath_string,
-        .constant_pool = YP_CONSTANT_POOL_EMPTY,
-        .newline_list = YP_NEWLINE_LIST_EMPTY
-    };
-
-    yp_accepts_block_stack_push(parser, true);
-
-    // Initialize the constant pool. We're going to completely guess as to the
-    // number of constants that we'll need based on the size of the input. The
-    // ratio we chose here is actually less arbitrary than you might think.
-    //
-    // We took ~50K Ruby files and measured the size of the file versus the
-    // number of constants that were found in those files. Then we found the
-    // average and standard deviation of the ratios of constants/bytesize. Then
-    // we added 1.34 standard deviations to the average to get a ratio that
-    // would fit 75% of the files (for a two-tailed distribution). This works
-    // because there was about a 0.77 correlation and the distribution was
-    // roughly normal.
-    //
-    // This ratio will need to change if we add more constants to the constant
-    // pool for another node type.
-    size_t constant_size = size / 95;
-    yp_constant_pool_init(&parser->constant_pool, constant_size < 4 ? 4 : constant_size);
-
-    // Initialize the newline list. Similar to the constant pool, we're going to
-    // guess at the number of newlines that we'll need based on the size of the
-    // input.
-    size_t newline_size = size / 22;
-    yp_newline_list_init(&parser->newline_list, source, newline_size < 4 ? 4 : newline_size);
-
-    // Skip past the UTF-8 BOM if it exists.
-    if (size >= 3 && source[0] == 0xef && source[1] == 0xbb && source[2] == 0xbf) {
-        parser->current.end += 3;
-        parser->encoding_comment_start += 3;
-    }
-
-    // If the first two bytes of the source are a shebang, then we'll indicate
-    // that the encoding comment is at the end of the shebang.
-    if (peek(parser) == '#' && peek_offset(parser, 1) == '!') {
-        const uint8_t *encoding_comment_start = next_newline(source, (ptrdiff_t) size);
-        if (encoding_comment_start) {
-            parser->encoding_comment_start = encoding_comment_start + 1;
-        }
-    }
-}
-
-// Register a callback that will be called whenever YARP changes the encoding it
-// is using to parse based on the magic comment.
-YP_EXPORTED_FUNCTION void
-yp_parser_register_encoding_changed_callback(yp_parser_t *parser, yp_encoding_changed_callback_t callback) {
-    parser->encoding_changed_callback = callback;
-}
-
-// Register a callback that will be called when YARP encounters a magic comment
-// with an encoding referenced that it doesn't understand. The callback should
-// return NULL if it also doesn't understand the encoding or it should return a
-// pointer to a yp_encoding_t struct that contains the functions necessary to
-// parse identifiers.
-YP_EXPORTED_FUNCTION void
-yp_parser_register_encoding_decode_callback(yp_parser_t *parser, yp_encoding_decode_callback_t callback) {
-    parser->encoding_decode_callback = callback;
-}
-
-// Free all of the memory associated with the comment list.
-static inline void
-yp_comment_list_free(yp_list_t *list) {
-    yp_list_node_t *node, *next;
-
-    for (node = list->head; node != NULL; node = next) {
-        next = node->next;
-
-        yp_comment_t *comment = (yp_comment_t *) node;
-        free(comment);
-    }
-}
-
-// Free any memory associated with the given parser.
-YP_EXPORTED_FUNCTION void
-yp_parser_free(yp_parser_t *parser) {
-    yp_string_free(&parser->filepath_string);
-    yp_diagnostic_list_free(&parser->error_list);
-    yp_diagnostic_list_free(&parser->warning_list);
-    yp_comment_list_free(&parser->comment_list);
-    yp_constant_pool_free(&parser->constant_pool);
-    yp_newline_list_free(&parser->newline_list);
-
-    while (parser->lex_modes.index >= YP_LEX_STACK_SIZE) {
-        lex_mode_pop(parser);
-    }
-}
-
-// Parse the Ruby source associated with the given parser and return the tree.
-YP_EXPORTED_FUNCTION yp_node_t *
-yp_parse(yp_parser_t *parser) {
-    return parse_program(parser);
-}
-
-YP_EXPORTED_FUNCTION void
-yp_serialize(yp_parser_t *parser, yp_node_t *node, yp_buffer_t *buffer) {
-    yp_buffer_append_str(buffer, "YARP", 4);
-    yp_buffer_append_u8(buffer, YP_VERSION_MAJOR);
-    yp_buffer_append_u8(buffer, YP_VERSION_MINOR);
-    yp_buffer_append_u8(buffer, YP_VERSION_PATCH);
-
-    yp_serialize_content(parser, node, buffer);
-    yp_buffer_append_str(buffer, "\0", 1);
-}
-
-// Parse and serialize the AST represented by the given source to the given
-// buffer.
-YP_EXPORTED_FUNCTION void
-yp_parse_serialize(const uint8_t *source, size_t size, yp_buffer_t *buffer, const char *metadata) {
-    yp_parser_t parser;
-    yp_parser_init(&parser, source, size, NULL);
-    if (metadata) yp_parser_metadata(&parser, metadata);
-
-    yp_node_t *node = yp_parse(&parser);
-    yp_serialize(&parser, node, buffer);
-
-    yp_node_destroy(&parser, node);
-    yp_parser_free(&parser);
-}
-
-#undef YP_CASE_KEYWORD
-#undef YP_CASE_OPERATOR
-#undef YP_CASE_WRITABLE
diff --git a/yarp/yarp.h b/yarp/yarp.h
deleted file mode 100644
index 378efe0c93746d..00000000000000
--- a/yarp/yarp.h
+++ /dev/null
@@ -1,82 +0,0 @@
-#ifndef YARP_H
-#define YARP_H
-
-#include "yarp/defines.h"
-#include "yarp/ast.h"
-#include "yarp/diagnostic.h"
-#include "yarp/node.h"
-#include "yarp/pack.h"
-#include "yarp/parser.h"
-#include "yarp/regexp.h"
-#include "yarp/unescape.h"
-#include "yarp/util/yp_buffer.h"
-#include "yarp/util/yp_char.h"
-#include "yarp/util/yp_memchr.h"
-#include "yarp/util/yp_strpbrk.h"
-#include "yarp/version.h"
-
-#include <assert.h>
-#include <errno.h>
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#ifndef _WIN32
-#include <strings.h>
-#endif
-
-void yp_serialize_content(yp_parser_t *parser, yp_node_t *node, yp_buffer_t *buffer);
-
-void yp_print_node(yp_parser_t *parser, yp_node_t *node);
-
-void yp_parser_metadata(yp_parser_t *parser, const char *metadata);
-
-// Generate a scope node from the given node.
-void yp_scope_node_init(yp_node_t *node, yp_scope_node_t *dest);
-
-// The YARP version and the serialization format.
-YP_EXPORTED_FUNCTION const char * yp_version(void);
-
-// Initialize a parser with the given start and end pointers.
-YP_EXPORTED_FUNCTION void yp_parser_init(yp_parser_t *parser, const uint8_t *source, size_t size, const char *filepath);
-
-// Register a callback that will be called whenever YARP changes the encoding it
-// is using to parse based on the magic comment.
-YP_EXPORTED_FUNCTION void yp_parser_register_encoding_changed_callback(yp_parser_t *parser, yp_encoding_changed_callback_t callback);
-
-// Register a callback that will be called when YARP encounters a magic comment
-// with an encoding referenced that it doesn't understand. The callback should
-// return NULL if it also doesn't understand the encoding or it should return a
-// pointer to a yp_encoding_t struct that contains the functions necessary to
-// parse identifiers.
-YP_EXPORTED_FUNCTION void yp_parser_register_encoding_decode_callback(yp_parser_t *parser, yp_encoding_decode_callback_t callback);
-
-// Free any memory associated with the given parser.
-YP_EXPORTED_FUNCTION void yp_parser_free(yp_parser_t *parser);
-
-// Parse the Ruby source associated with the given parser and return the tree.
-YP_EXPORTED_FUNCTION yp_node_t * yp_parse(yp_parser_t *parser);
-
-// Pretty-prints the AST represented by the given node to the given buffer.
-YP_EXPORTED_FUNCTION void yp_prettyprint(yp_parser_t *parser, yp_node_t *node, yp_buffer_t *buffer);
-
-// Serialize the AST represented by the given node to the given buffer.
-YP_EXPORTED_FUNCTION void yp_serialize(yp_parser_t *parser, yp_node_t *node, yp_buffer_t *buffer);
-
-// Parse the given source to the AST and serialize the AST to the given buffer.
-YP_EXPORTED_FUNCTION void yp_parse_serialize(const uint8_t *source, size_t size, yp_buffer_t *buffer, const char *metadata);
-
-// Lex the given source and serialize to the given buffer.
-YP_EXPORTED_FUNCTION void yp_lex_serialize(const uint8_t *source, size_t size, const char *filepath, yp_buffer_t *buffer);
-
-// Parse and serialize both the AST and the tokens represented by the given
-// source to the given buffer.
-YP_EXPORTED_FUNCTION void yp_parse_lex_serialize(const uint8_t *source, size_t size, yp_buffer_t *buffer, const char *metadata);
-
-// Returns a string representation of the given token type.
-YP_EXPORTED_FUNCTION const char * yp_token_type_to_str(yp_token_type_t token_type);
-
-#endif
diff --git a/yarp/yarp_compiler.c b/yarp/yarp_compiler.c
deleted file mode 100644
index 10ef6a1e8c4d9f..00000000000000
--- a/yarp/yarp_compiler.c
+++ /dev/null
@@ -1,1948 +0,0 @@
-#include "yarp.h"
-
-#define OLD_ISEQ NEW_ISEQ
-#undef NEW_ISEQ
-
-#define NEW_ISEQ(node, name, type, line_no) \
-    yp_new_child_iseq(iseq, (node), parser, rb_fstring(name), 0, (type), (line_no))
-
-#define OLD_CHILD_ISEQ NEW_CHILD_ISEQ
-#undef NEW_CHILD_ISEQ
-
-#define NEW_CHILD_ISEQ(node, name, type, line_no) \
-    yp_new_child_iseq(iseq, (node), parser, rb_fstring(name), iseq, (type), (line_no))
-
-rb_iseq_t *
-yp_iseq_new_with_opt(yp_scope_node_t *node, yp_parser_t *parser, VALUE name, VALUE path, VALUE realpath,
-                     int first_lineno, const rb_iseq_t *parent, int isolated_depth,
-                     enum rb_iseq_type type, const rb_compile_option_t *option);
-
-static VALUE
-parse_number(const yp_node_t *node) {
-    const uint8_t *start = node->location.start;
-    const uint8_t *end = node->location.end;
-    size_t length = end - start;
-
-    char *buffer = malloc(length + 1);
-    memcpy(buffer, start, length);
-
-    buffer[length] = '\0';
-    VALUE number = rb_cstr_to_inum(buffer, -10, Qfalse);
-
-    free(buffer);
-    return number;
-}
-
-static inline VALUE
-parse_string(yp_string_t *string) {
-    return rb_str_new((const char *) yp_string_source(string), yp_string_length(string));
-}
-
-static inline ID
-parse_symbol(const uint8_t *start, const uint8_t *end) {
-    return rb_intern2((const char *) start, end - start);
-}
-
-static inline ID
-parse_node_symbol(yp_node_t *node) {
-    return parse_symbol(node->location.start, node->location.end);
-}
-
-static inline ID
-parse_string_symbol(yp_string_t *string) {
-    const uint8_t *start = yp_string_source(string);
-    return parse_symbol(start, start + yp_string_length(string));
-}
-
-static inline ID
-parse_location_symbol(yp_location_t *location) {
-    return parse_symbol(location->start, location->end);
-}
-
-static int
-yp_optimizable_range_item_p(yp_node_t *node)
-{
-    return (!node || node->type == YP_NODE_INTEGER_NODE || node->type == YP_NODE_NIL_NODE);
-}
-
-static bool
-yp_static_node_literal_p(yp_node_t *node)
-{
-    switch(node->type) {
-      case YP_NODE_FALSE_NODE:
-      case YP_NODE_FLOAT_NODE:
-      case YP_NODE_IMAGINARY_NODE:
-      case YP_NODE_INTEGER_NODE:
-      case YP_NODE_NIL_NODE:
-      case YP_NODE_RATIONAL_NODE:
-      case YP_NODE_SELF_NODE:
-      case YP_NODE_STRING_NODE:
-      case YP_NODE_SOURCE_ENCODING_NODE:
-      case YP_NODE_SOURCE_FILE_NODE:
-      case YP_NODE_SOURCE_LINE_NODE:
-      case YP_NODE_SYMBOL_NODE:
-      case YP_NODE_TRUE_NODE:
-        return true;
-      default:
-        return false;
-    }
-}
-
-static inline VALUE
-yp_static_literal_value(yp_node_t *node)
-{
-    switch(node->type) {
-      case YP_NODE_NIL_NODE:
-        return Qnil;
-      case YP_NODE_TRUE_NODE:
-        return Qtrue;
-      case YP_NODE_FALSE_NODE:
-        return Qfalse;
-        // TODO: Implement this method for the other literal nodes described above
-      default:
-        rb_bug("This node type doesn't have a literal value");
-    }
-}
-
-static void
-yp_compile_branch_condition(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const yp_node_t *cond,
-                         LABEL *then_label, LABEL *else_label, const uint8_t *src, bool popped, yp_compile_context_t *compile_context);
-
-static void
-yp_compile_logical(rb_iseq_t *iseq, LINK_ANCHOR *const ret, yp_node_t *cond,
-                LABEL *then_label, LABEL *else_label, const uint8_t *src, bool popped, yp_compile_context_t *compile_context)
-{
-    yp_parser_t *parser = compile_context->parser;
-    yp_newline_list_t newline_list = parser->newline_list;
-    int lineno = (int)yp_newline_list_line_column(&newline_list, cond->location.start).line;
-    NODE dummy_line_node = generate_dummy_line_node(lineno, lineno);
-
-    DECL_ANCHOR(seq);
-    INIT_ANCHOR(seq);
-    LABEL *label = NEW_LABEL(lineno);
-    if (!then_label) then_label = label;
-    else if (!else_label) else_label = label;
-
-    yp_compile_branch_condition(iseq, seq, cond, then_label, else_label, src, popped, compile_context);
-
-    if (LIST_INSN_SIZE_ONE(seq)) {
-        INSN *insn = (INSN *)ELEM_FIRST_INSN(FIRST_ELEMENT(seq));
-        if (insn->insn_id == BIN(jump) && (LABEL *)(insn->operands[0]) == label)
-            return;
-    }
-    if (!label->refcnt) {
-        ADD_INSN(seq, &dummy_line_node, putnil);
-    }
-    else {
-        ADD_LABEL(seq, label);
-    }
-    ADD_SEQ(ret, seq);
-    return;
-}
-
-static void yp_compile_node(rb_iseq_t *iseq, const yp_node_t *node, LINK_ANCHOR *const ret, const uint8_t *src, bool popped, yp_compile_context_t *context);
-
-static void
-yp_compile_branch_condition(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const yp_node_t *cond,
-                         LABEL *then_label, LABEL *else_label, const uint8_t *src, bool popped, yp_compile_context_t *compile_context)
-{
-    yp_parser_t *parser = compile_context->parser;
-    yp_newline_list_t newline_list = parser->newline_list;
-    int lineno = (int) yp_newline_list_line_column(&newline_list, cond->location.start).line;
-    NODE dummy_line_node = generate_dummy_line_node(lineno, lineno);
-
-again:
-    switch (YP_NODE_TYPE(cond)) {
-      case YP_NODE_AND_NODE: {
-          yp_and_node_t *and_node = (yp_and_node_t *)cond;
-          yp_compile_logical(iseq, ret, and_node->left, NULL, else_label, src, popped, compile_context);
-          cond = and_node->right;
-          goto again;
-      }
-      case YP_NODE_OR_NODE: {
-          yp_or_node_t *or_node = (yp_or_node_t *)cond;
-          yp_compile_logical(iseq, ret, or_node->left, then_label, NULL, src, popped, compile_context);
-          cond = or_node->right;
-          goto again;
-      }
-      case YP_NODE_FALSE_NODE:
-      case YP_NODE_NIL_NODE:
-        ADD_INSNL(ret, &dummy_line_node, jump, else_label);
-        return;
-      case YP_NODE_FLOAT_NODE:
-      case YP_NODE_IMAGINARY_NODE:
-      case YP_NODE_INTEGER_NODE:
-      case YP_NODE_LAMBDA_NODE:
-      case YP_NODE_RATIONAL_NODE:
-      case YP_NODE_REGULAR_EXPRESSION_NODE:
-      case YP_NODE_STRING_NODE:
-      case YP_NODE_SYMBOL_NODE:
-      case YP_NODE_TRUE_NODE:
-        ADD_INSNL(ret, &dummy_line_node, jump, then_label);
-        return;
-        // TODO: Several more nodes in this case statement
-      default:
-        {
-            DECL_ANCHOR(cond_seq);
-            INIT_ANCHOR(cond_seq);
-
-            yp_compile_node(iseq, cond, cond_seq, src, false, compile_context);
-            ADD_SEQ(ret, cond_seq);
-        }
-        break;
-    }
-    ADD_INSNL(ret, &dummy_line_node, branchunless, else_label);
-    ADD_INSNL(ret, &dummy_line_node, jump, then_label);
-    return;
-}
-
-static void
-yp_compile_if(rb_iseq_t *iseq, const int line, yp_statements_node_t *node_body, yp_node_t *node_else, yp_node_t *predicate, LINK_ANCHOR *const ret, const uint8_t *src, bool popped, yp_compile_context_t *compile_context) {
-    NODE line_node = generate_dummy_line_node(line, line);
-
-    DECL_ANCHOR(cond_seq);
-
-    LABEL *then_label, *else_label, *end_label;
-
-    INIT_ANCHOR(cond_seq);
-    then_label = NEW_LABEL(line);
-    else_label = NEW_LABEL(line);
-    end_label = 0;
-
-    yp_compile_branch_condition(iseq, cond_seq, predicate, then_label, else_label, src, popped, compile_context);
-    ADD_SEQ(ret, cond_seq);
-
-    if (then_label->refcnt) {
-        ADD_LABEL(ret, then_label);
-
-        DECL_ANCHOR(then_seq);
-        INIT_ANCHOR(then_seq);
-        if (node_body) {
-            yp_compile_node(iseq, (yp_node_t *)node_body, then_seq, src, popped, compile_context);
-        }
-        else {
-            if (!popped) {
-                ADD_INSN(ret, &line_node, putnil);
-            }
-        }
-
-        if (else_label->refcnt) {
-            end_label = NEW_LABEL(line);
-            ADD_INSNL(then_seq, &line_node, jump, end_label);
-            if (!popped) {
-                ADD_INSN(then_seq, &line_node, pop);
-            }
-        }
-        ADD_SEQ(ret, then_seq);
-    }
-
-    if (else_label->refcnt) {
-        ADD_LABEL(ret, else_label);
-
-        DECL_ANCHOR(else_seq);
-        INIT_ANCHOR(else_seq);
-        if (node_else) {
-            yp_compile_node(iseq, (yp_node_t *)(((yp_else_node_t *)node_else)->statements), else_seq, src, popped, compile_context);
-        }
-        else {
-            if (!popped) {
-                ADD_INSN(ret, &line_node, putnil);
-            }
-        }
-
-        ADD_SEQ(ret, else_seq);
-    }
-
-    if (end_label) {
-        ADD_LABEL(ret, end_label);
-    }
-
-    return;
-}
-
-static void
-yp_compile_while(rb_iseq_t *iseq, int lineno, yp_node_flags_t flags, enum yp_node_type type, yp_statements_node_t *statements, yp_node_t *predicate, LINK_ANCHOR *const ret, const uint8_t *src, bool popped, yp_compile_context_t *compile_context)
-{
-    NODE dummy_line_node = generate_dummy_line_node(lineno, lineno);
-
-    LABEL *prev_start_label = ISEQ_COMPILE_DATA(iseq)->start_label;
-    LABEL *prev_end_label = ISEQ_COMPILE_DATA(iseq)->end_label;
-    LABEL *prev_redo_label = ISEQ_COMPILE_DATA(iseq)->redo_label;
-
-    // TODO: Deal with ensures in here
-    LABEL *next_label = ISEQ_COMPILE_DATA(iseq)->start_label = NEW_LABEL(lineno); /* next  */
-    LABEL *redo_label = ISEQ_COMPILE_DATA(iseq)->redo_label = NEW_LABEL(lineno);  /* redo  */
-    LABEL *break_label = ISEQ_COMPILE_DATA(iseq)->end_label = NEW_LABEL(lineno);  /* break */
-    LABEL *end_label = NEW_LABEL(lineno);
-    LABEL *adjust_label = NEW_LABEL(lineno);
-
-    LABEL *next_catch_label = NEW_LABEL(lineno);
-    LABEL *tmp_label = NULL;
-
-    // begin; end while true
-    if (flags & YP_LOOP_FLAGS_BEGIN_MODIFIER) {
-        tmp_label = NEW_LABEL(lineno);
-        ADD_INSNL(ret, &dummy_line_node, jump, tmp_label);
-    }
-    else {
-        // while true; end
-        ADD_INSNL(ret, &dummy_line_node, jump, next_label);
-    }
-
-    ADD_LABEL(ret, adjust_label);
-    ADD_INSN(ret, &dummy_line_node, putnil);
-    ADD_LABEL(ret, next_catch_label);
-    ADD_INSN(ret, &dummy_line_node, pop);
-    ADD_INSNL(ret, &dummy_line_node, jump, next_label);
-    if (tmp_label) ADD_LABEL(ret, tmp_label);
-
-    ADD_LABEL(ret, redo_label);
-    if (statements) {
-        yp_compile_node(iseq, (yp_node_t *)statements, ret, src, true, compile_context);
-    }
-
-    ADD_LABEL(ret, next_label);
-
-    if (type == YP_NODE_WHILE_NODE) {
-        yp_compile_branch_condition(iseq, ret, predicate, redo_label, end_label, src, popped, compile_context);
-    }
-    else if (type == YP_NODE_UNTIL_NODE) {
-        yp_compile_branch_condition(iseq, ret, predicate, end_label, redo_label, src, popped, compile_context);
-    }
-
-    ADD_LABEL(ret, end_label);
-    ADD_ADJUST_RESTORE(ret, adjust_label);
-
-    ADD_INSN(ret, &dummy_line_node, putnil);
-
-    ADD_LABEL(ret, break_label);
-
-    if (popped) {
-        ADD_INSN(ret, &dummy_line_node, pop);
-    }
-
-    ADD_CATCH_ENTRY(CATCH_TYPE_BREAK, redo_label, break_label, NULL,
-            break_label);
-    ADD_CATCH_ENTRY(CATCH_TYPE_NEXT, redo_label, break_label, NULL,
-            next_catch_label);
-    ADD_CATCH_ENTRY(CATCH_TYPE_REDO, redo_label, break_label, NULL,
-            ISEQ_COMPILE_DATA(iseq)->redo_label);
-
-    ISEQ_COMPILE_DATA(iseq)->start_label = prev_start_label;
-    ISEQ_COMPILE_DATA(iseq)->end_label = prev_end_label;
-    ISEQ_COMPILE_DATA(iseq)->redo_label = prev_redo_label;
-    return;
-}
-
-static int
-yp_lookup_local_index(rb_iseq_t *iseq, yp_compile_context_t *compile_context, yp_constant_id_t constant_id)
-{
-    st_data_t local_index;
-
-    int num_params = ISEQ_BODY(iseq)->param.size;
-
-    if (!st_lookup(compile_context->index_lookup_table, constant_id, &local_index)) {
-        rb_bug("This local does not exist");
-    }
-
-    return num_params - (int)local_index;
-}
-
-static int
-yp_lookup_local_index_with_depth(rb_iseq_t *iseq, yp_compile_context_t *compile_context, yp_constant_id_t constant_id, uint32_t depth)
-{
-    for(uint32_t i = 0; i < depth; i++) {
-        compile_context = compile_context->previous;
-        iseq = (rb_iseq_t *)ISEQ_BODY(iseq)->parent_iseq;
-    }
-
-    return yp_lookup_local_index(iseq, compile_context, constant_id);
-}
-
-// This returns the CRuby ID which maps to the yp_constant_id_t
-//
-// Constant_ids in YARP are indexes of the constants in YARP's constant pool.
-// We add a constants mapping on the compile_context which is a mapping from
-// these constant_id indexes to the CRuby IDs that they represent.
-// This helper method allows easy access to those IDs
-static ID
-yp_constant_id_lookup(yp_compile_context_t *compile_context, yp_constant_id_t constant_id)
-{
-    return compile_context->constants[constant_id - 1];
-}
-
-static rb_iseq_t *
-yp_new_child_iseq(rb_iseq_t *iseq, yp_scope_node_t * node, yp_parser_t *parser,
-               VALUE name, const rb_iseq_t *parent, enum rb_iseq_type type, int line_no)
-{
-    debugs("[new_child_iseq]> ---------------------------------------\n");
-    int isolated_depth = ISEQ_COMPILE_DATA(iseq)->isolated_depth;
-    rb_iseq_t * ret_iseq = yp_iseq_new_with_opt(node, parser, name,
-            rb_iseq_path(iseq), rb_iseq_realpath(iseq),
-            line_no, parent,
-            isolated_depth ? isolated_depth + 1 : 0,
-            type, ISEQ_COMPILE_DATA(iseq)->option);
-    debugs("[new_child_iseq]< ---------------------------------------\n");
-    return ret_iseq;
-}
-
-
-static int
-yp_compile_class_path(LINK_ANCHOR *const ret, rb_iseq_t *iseq, const yp_node_t *constant_path_node, const NODE *line_node, const uint8_t * src, bool popped, yp_compile_context_t *compile_context)
-{
-    if (constant_path_node->type == YP_NODE_CONSTANT_PATH_NODE) {
-        yp_node_t *parent = ((yp_constant_path_node_t *)constant_path_node)->parent;
-        if (parent) {
-            /* Bar::Foo */
-            yp_compile_node(iseq, parent, ret, src, popped, compile_context);
-            return VM_DEFINECLASS_FLAG_SCOPED;
-        }
-        else {
-            /* toplevel class ::Foo */
-            ADD_INSN1(ret, line_node, putobject, rb_cObject);
-            return VM_DEFINECLASS_FLAG_SCOPED;
-        }
-    }
-    else {
-        /* class at cbase Foo */
-        ADD_INSN1(ret, line_node, putspecialobject,
-                INT2FIX(VM_SPECIAL_OBJECT_CONST_BASE));
-        return 0;
-    }
-}
-
-/*
- * Compiles a YARP node into instruction sequences
- *
- * iseq -            The current instruction sequence object (used for locals)
- * node -            The yarp node to compile
- * ret -             The linked list of instruction sequences to append instructions onto
- * popped -          True if compiling something with no side effects, so instructions don't
- *                   need to be added
- * compile_context - Stores parser and local information
- */
-static void
-yp_compile_node(rb_iseq_t *iseq, const yp_node_t *node, LINK_ANCHOR *const ret, const uint8_t *src, bool popped, yp_compile_context_t *compile_context)
-{
-    yp_parser_t *parser = compile_context->parser;
-    yp_newline_list_t newline_list = parser->newline_list;
-    int lineno = (int)yp_newline_list_line_column(&newline_list, node->location.start).line;
-    NODE dummy_line_node = generate_dummy_line_node(lineno, lineno);
-
-    switch (YP_NODE_TYPE(node)) {
-      case YP_NODE_ALIAS_NODE: {
-          yp_alias_node_t *alias_node = (yp_alias_node_t *) node;
-
-          ADD_INSN1(ret, &dummy_line_node, putspecialobject, INT2FIX(VM_SPECIAL_OBJECT_VMCORE));
-          ADD_INSN1(ret, &dummy_line_node, putspecialobject, INT2FIX(VM_SPECIAL_OBJECT_CBASE));
-
-          yp_compile_node(iseq, alias_node->new_name, ret, src, popped, compile_context);
-          yp_compile_node(iseq, alias_node->old_name, ret, src, popped, compile_context);
-
-          ADD_SEND(ret, &dummy_line_node, id_core_set_method_alias, INT2FIX(3));
-          return;
-      }
-      case YP_NODE_AND_NODE: {
-          yp_and_node_t *and_node = (yp_and_node_t *) node;
-
-          LABEL *end_label = NEW_LABEL(lineno);
-          yp_compile_node(iseq, and_node->left, ret, src, popped, compile_context);
-          if (!popped) {
-              ADD_INSN(ret, &dummy_line_node, dup);
-          }
-          ADD_INSNL(ret, &dummy_line_node, branchunless, end_label);
-
-          if (!popped) {
-              ADD_INSN(ret, &dummy_line_node, pop);
-          }
-          yp_compile_node(iseq, and_node->right, ret, src, popped, compile_context);
-          ADD_LABEL(ret, end_label);
-          return;
-      }
-      case YP_NODE_ARGUMENTS_NODE: {
-          yp_arguments_node_t *arguments_node = (yp_arguments_node_t *) node;
-          yp_node_list_t node_list = arguments_node->arguments;
-          for (size_t index = 0; index < node_list.size; index++) {
-              yp_compile_node(iseq, node_list.nodes[index], ret, src, popped, compile_context);
-          }
-          return;
-      }
-      case YP_NODE_ARRAY_NODE: {
-          yp_array_node_t *array_node = (yp_array_node_t *) node;
-          yp_node_list_t elements = array_node->elements;
-          if (elements.size == 1 && yp_static_node_literal_p(elements.nodes[0])) {
-              VALUE ary = rb_ary_hidden_new(1);
-              rb_ary_push(ary, yp_static_literal_value(elements.nodes[0]));
-              OBJ_FREEZE(ary);
-
-              ADD_INSN1(ret, &dummy_line_node, duparray, ary);
-          }
-          else {
-              for (size_t index = 0; index < elements.size; index++) {
-                  yp_compile_node(iseq, elements.nodes[index], ret, src, popped, compile_context);
-              }
-
-              if (!popped) {
-                  ADD_INSN1(ret, &dummy_line_node, newarray, INT2FIX(elements.size));
-              }
-          }
-
-          return;
-      }
-      case YP_NODE_ASSOC_NODE: {
-          yp_assoc_node_t *assoc_node = (yp_assoc_node_t *) node;
-          yp_compile_node(iseq, assoc_node->key, ret, src, popped, compile_context);
-          if (assoc_node->value) {
-              yp_compile_node(iseq, assoc_node->value, ret, src, popped, compile_context);
-          }
-          return;
-      }
-      case YP_NODE_ASSOC_SPLAT_NODE: {
-          yp_assoc_splat_node_t *assoc_splat_node = (yp_assoc_splat_node_t *)node;
-          yp_compile_node(iseq, assoc_splat_node->value, ret, src, popped, compile_context);
-
-          // TODO: Not sure this is accurate, look at FLUSH_CHUNK in the compiler
-          ADD_INSN1(ret, &dummy_line_node, newarraykwsplat, INT2FIX(0));
-
-          if (popped) {
-              ADD_INSN(ret, &dummy_line_node, pop);
-          }
-          return;
-      }
-      case YP_NODE_BACK_REFERENCE_READ_NODE: {
-          if (!popped) {
-              // Since a back reference is `$<char>`, ruby represents the ID as the
-              // an rb_intern on the value after the `$`.
-              char *char_ptr = (char *)(node->location.start) + 1;
-              ID backref_val = INT2FIX(rb_intern2(char_ptr, 1)) << 1 | 1;
-              ADD_INSN2(ret, &dummy_line_node, getspecial, INT2FIX(1), backref_val);
-          }
-          return;
-      }
-      case YP_NODE_BEGIN_NODE: {
-          yp_begin_node_t *begin_node = (yp_begin_node_t *) node;
-          if (begin_node->statements) {
-              yp_compile_node(iseq, (yp_node_t *)begin_node->statements, ret, src, popped, compile_context);
-          }
-          return;
-      }
-      case YP_NODE_BREAK_NODE: {
-          yp_break_node_t *break_node = (yp_break_node_t *) node;
-          if (break_node->arguments) {
-              yp_compile_node(iseq, (yp_node_t *)break_node->arguments, ret, src, Qfalse, compile_context);
-          }
-          else {
-              ADD_INSN(ret, &dummy_line_node, putnil);
-          }
-
-          ADD_INSNL(ret, &dummy_line_node, jump, ISEQ_COMPILE_DATA(iseq)->end_label);
-
-          return;
-      }
-      case YP_NODE_CALL_NODE: {
-          yp_call_node_t *call_node = (yp_call_node_t *) node;
-
-          ID method_id = parse_string_symbol(&call_node->name);
-          int flags = 0;
-          int orig_argc = 0;
-
-          if (call_node->receiver == NULL) {
-              ADD_INSN(ret, &dummy_line_node, putself);
-          } else {
-              yp_compile_node(iseq, call_node->receiver, ret, src, false, compile_context);
-          }
-
-          if (call_node->arguments == NULL) {
-              if (flags & VM_CALL_FCALL) {
-                  flags |= VM_CALL_VCALL;
-              }
-          } else {
-              yp_arguments_node_t *arguments = call_node->arguments;
-              yp_compile_node(iseq, (yp_node_t *) arguments, ret, src, false, compile_context);
-              orig_argc = (int)arguments->arguments.size;
-          }
-
-          VALUE block_iseq = Qnil;
-          if (call_node->block != NULL) {
-              // Scope associated with the block
-              yp_scope_node_t scope_node;
-              yp_scope_node_init((yp_node_t *)call_node->block, &scope_node);
-
-              const rb_iseq_t *block_iseq = NEW_CHILD_ISEQ(&scope_node, make_name_for_block(iseq), ISEQ_TYPE_BLOCK, lineno);
-              ISEQ_COMPILE_DATA(iseq)->current_block = block_iseq;
-              ADD_SEND_WITH_BLOCK(ret, &dummy_line_node, method_id, INT2FIX(orig_argc), block_iseq);
-          }
-          else {
-              if (block_iseq == Qnil && flags == 0) {
-                  flags |= VM_CALL_ARGS_SIMPLE;
-              }
-
-              if (call_node->receiver == NULL) {
-                  flags |= VM_CALL_FCALL;
-
-                  if (block_iseq == Qnil && call_node->arguments == NULL) {
-                      flags |= VM_CALL_VCALL;
-                  }
-              }
-
-              ADD_SEND_WITH_FLAG(ret, &dummy_line_node, method_id, INT2NUM(orig_argc), INT2FIX(flags));
-          }
-          if (popped) {
-              ADD_INSN(ret, &dummy_line_node, pop);
-          }
-          return;
-      }
-      case YP_NODE_CLASS_NODE: {
-          yp_class_node_t *class_node = (yp_class_node_t *)node;
-          yp_scope_node_t scope_node;
-          yp_scope_node_init((yp_node_t *)class_node, &scope_node);
-
-          ID class_id = yp_constant_id_lookup(compile_context, class_node->name_constant);
-
-          VALUE class_name = rb_str_freeze(rb_sprintf("<class:%"PRIsVALUE">", rb_id2str(class_id)));
-
-          const rb_iseq_t *class_iseq = NEW_CHILD_ISEQ(&scope_node, class_name, ISEQ_TYPE_CLASS, lineno);
-
-          // TODO: Once we merge constant path nodes correctly, fix this flag
-          const int flags = VM_DEFINECLASS_TYPE_CLASS |
-              (class_node->superclass ? VM_DEFINECLASS_FLAG_HAS_SUPERCLASS : 0) |
-              yp_compile_class_path(ret, iseq, class_node->constant_path, &dummy_line_node, src, popped, compile_context);
-
-          if (class_node->superclass) {
-              yp_compile_node(iseq, class_node->superclass, ret, src, popped, compile_context);
-          }
-          else {
-              ADD_INSN(ret, &dummy_line_node, putnil);
-          }
-
-          ADD_INSN3(ret, &dummy_line_node, defineclass, ID2SYM(class_id), class_iseq, INT2FIX(flags));
-          RB_OBJ_WRITTEN(iseq, Qundef, (VALUE)class_iseq);
-
-          if (popped) {
-              ADD_INSN(ret, &dummy_line_node, pop);
-          }
-          return;
-      }
-      case YP_NODE_CLASS_VARIABLE_AND_WRITE_NODE: {
-          yp_class_variable_and_write_node_t *class_variable_and_write_node = (yp_class_variable_and_write_node_t*) node;
-
-          LABEL *end_label = NEW_LABEL(lineno);
-
-          ID class_variable_name_id = yp_constant_id_lookup(compile_context, class_variable_and_write_node->name);
-          VALUE class_variable_name_val = ID2SYM(class_variable_name_id);
-
-          ADD_INSN2(ret, &dummy_line_node, getclassvariable,
-                  class_variable_name_val,
-                  get_cvar_ic_value(iseq, class_variable_name_id));
-
-          if (!popped) {
-              ADD_INSN(ret, &dummy_line_node, dup);
-          }
-
-          ADD_INSNL(ret, &dummy_line_node, branchunless, end_label);
-
-          if (!popped) {
-              ADD_INSN(ret, &dummy_line_node, pop);
-          }
-
-          yp_compile_node(iseq, class_variable_and_write_node->value, ret, src, false, compile_context);
-
-          if (!popped) {
-              ADD_INSN(ret, &dummy_line_node, dup);
-          }
-
-          ADD_INSN2(ret, &dummy_line_node, setclassvariable,
-                  class_variable_name_val,
-                  get_cvar_ic_value(iseq, class_variable_name_id));
-          ADD_LABEL(ret, end_label);
-
-          return;
-      }
-      case YP_NODE_CLASS_VARIABLE_OPERATOR_WRITE_NODE: {
-          yp_class_variable_operator_write_node_t *class_variable_operator_write_node = (yp_class_variable_operator_write_node_t*) node;
-
-          ID class_variable_name_id = yp_constant_id_lookup(compile_context, class_variable_operator_write_node->name);
-          VALUE class_variable_name_val = ID2SYM(class_variable_name_id);
-
-          ADD_INSN2(ret, &dummy_line_node, getclassvariable,
-                  class_variable_name_val,
-                  get_cvar_ic_value(iseq, class_variable_name_id));
-
-          yp_compile_node(iseq, class_variable_operator_write_node->value, ret, src, false, compile_context);
-          ID method_id = yp_constant_id_lookup(compile_context, class_variable_operator_write_node->operator);
-
-          int flags = VM_CALL_ARGS_SIMPLE;
-          ADD_SEND_WITH_FLAG(ret, &dummy_line_node, method_id, INT2NUM(1), INT2FIX(flags));
-
-          if (!popped) {
-              ADD_INSN(ret, &dummy_line_node, dup);
-          }
-
-          ADD_INSN2(ret, &dummy_line_node, setclassvariable,
-                  class_variable_name_val,
-                  get_cvar_ic_value(iseq, class_variable_name_id));
-
-          return;
-      }
-      case YP_NODE_CLASS_VARIABLE_OR_WRITE_NODE: {
-          yp_class_variable_or_write_node_t *class_variable_or_write_node = (yp_class_variable_or_write_node_t*) node;
-
-          LABEL *end_label = NEW_LABEL(lineno);
-
-          ID class_variable_name_id = yp_constant_id_lookup(compile_context, class_variable_or_write_node->name);
-          VALUE class_variable_name_val = ID2SYM(class_variable_name_id);
-
-          ADD_INSN2(ret, &dummy_line_node, getclassvariable,
-                  class_variable_name_val,
-                  get_cvar_ic_value(iseq, class_variable_name_id));
-
-          if (!popped) {
-              ADD_INSN(ret, &dummy_line_node, dup);
-          }
-
-          ADD_INSNL(ret, &dummy_line_node, branchif, end_label);
-
-          if (!popped) {
-              ADD_INSN(ret, &dummy_line_node, pop);
-          }
-
-          yp_compile_node(iseq, class_variable_or_write_node->value, ret, src, false, compile_context);
-
-          if (!popped) {
-              ADD_INSN(ret, &dummy_line_node, dup);
-          }
-
-          ADD_INSN2(ret, &dummy_line_node, setclassvariable,
-                  class_variable_name_val,
-                  get_cvar_ic_value(iseq, class_variable_name_id));
-          ADD_LABEL(ret, end_label);
-
-          return;
-      }
-      case YP_NODE_CLASS_VARIABLE_READ_NODE: {
-          if (!popped) {
-              yp_class_variable_read_node_t *class_variable_read_node = (yp_class_variable_read_node_t *) node;
-              ID cvar_name = yp_constant_id_lookup(compile_context, class_variable_read_node->name);
-              ADD_INSN2(
-                      ret,
-                      &dummy_line_node,
-                      getclassvariable,
-                      ID2SYM(cvar_name),
-                      get_cvar_ic_value(iseq, cvar_name)
-                      );
-          }
-          return;
-      }
-      case YP_NODE_CLASS_VARIABLE_WRITE_NODE: {
-          yp_class_variable_write_node_t *write_node = (yp_class_variable_write_node_t *) node;
-          yp_compile_node(iseq, write_node->value, ret, src, false, compile_context);
-          if (!popped) {
-              ADD_INSN(ret, &dummy_line_node, dup);
-          }
-
-          ID cvar_name = yp_constant_id_lookup(compile_context, write_node->name);
-          ADD_INSN2(ret, &dummy_line_node, setclassvariable, ID2SYM(cvar_name), get_cvar_ic_value(iseq, cvar_name));
-          return;
-      }
-      case YP_NODE_CONSTANT_PATH_NODE: {
-          yp_constant_path_node_t *constant_path_node = (yp_constant_path_node_t*) node;
-          if (constant_path_node->parent) {
-              yp_compile_node(iseq, constant_path_node->parent, ret, src, popped, compile_context);
-          }
-          ADD_INSN1(ret, &dummy_line_node, putobject, Qfalse);
-          ADD_INSN1(ret, &dummy_line_node, getconstant, ID2SYM(parse_node_symbol((yp_node_t *)constant_path_node->child)));
-          return;
-      }
-      case YP_NODE_CONSTANT_PATH_WRITE_NODE: {
-          yp_constant_path_write_node_t *constant_path_write_node = (yp_constant_path_write_node_t*) node;
-          yp_compile_node(iseq, constant_path_write_node->value, ret, src, popped, compile_context);
-          if (!popped) {
-              ADD_INSN(ret, &dummy_line_node, dup);
-          }
-
-          ID constant_var_name = parse_location_symbol(&constant_path_write_node->target->base.location);
-
-          ADD_INSN1(ret, &dummy_line_node, putspecialobject, INT2FIX(VM_SPECIAL_OBJECT_CONST_BASE));
-          ADD_INSN1(ret, &dummy_line_node, setconstant, ID2SYM(constant_var_name));
-          return;
-      }
-
-      case YP_NODE_CONSTANT_READ_NODE: {
-          yp_constant_read_node_t *constant_read_node = (yp_constant_read_node_t *) node;
-          ADD_INSN(ret, &dummy_line_node, putnil);
-          ADD_INSN1(ret, &dummy_line_node, putobject, Qtrue);
-          ADD_INSN1(ret, &dummy_line_node, getconstant, ID2SYM(parse_node_symbol((yp_node_t *)constant_read_node)));
-          if (popped) {
-              ADD_INSN(ret, &dummy_line_node, pop);
-          }
-          return;
-      }
-      case YP_NODE_CONSTANT_AND_WRITE_NODE: {
-          yp_constant_and_write_node_t *constant_and_write_node = (yp_constant_and_write_node_t*) node;
-
-          LABEL *end_label = NEW_LABEL(lineno);
-
-          VALUE constant_name = ID2SYM(parse_location_symbol(&constant_and_write_node->name_loc));
-
-          ADD_INSN(ret, &dummy_line_node, putnil);
-          ADD_INSN1(ret, &dummy_line_node, putobject, Qtrue);
-          ADD_INSN1(ret, &dummy_line_node, getconstant, constant_name);
-          if (!popped) {
-              ADD_INSN(ret, &dummy_line_node, dup);
-          }
-
-          ADD_INSNL(ret, &dummy_line_node, branchunless, end_label);
-
-          if (!popped) {
-              ADD_INSN(ret, &dummy_line_node, pop);
-          }
-
-          yp_compile_node(iseq, constant_and_write_node->value, ret, src, false, compile_context);
-
-          if (!popped) {
-              ADD_INSN(ret, &dummy_line_node, dup);
-          }
-
-          ADD_INSN1(ret, &dummy_line_node, putspecialobject, INT2FIX(VM_SPECIAL_OBJECT_CONST_BASE));
-          ADD_INSN1(ret, &dummy_line_node, setconstant, constant_name);
-          ADD_LABEL(ret, end_label);
-
-          return;
-      }
-      case YP_NODE_CONSTANT_OPERATOR_WRITE_NODE: {
-          yp_constant_operator_write_node_t *constant_operator_write_node = (yp_constant_operator_write_node_t*) node;
-
-          ID constant_name = parse_location_symbol(&constant_operator_write_node->name_loc);
-          ADD_INSN(ret, &dummy_line_node, putnil);
-          ADD_INSN1(ret, &dummy_line_node, putobject, Qtrue);
-          ADD_INSN1(ret, &dummy_line_node, getconstant, ID2SYM(constant_name));
-
-          yp_compile_node(iseq, constant_operator_write_node->value, ret, src, false, compile_context);
-          ID method_id = yp_constant_id_lookup(compile_context, constant_operator_write_node->operator);
-
-          int flags = VM_CALL_ARGS_SIMPLE;
-          ADD_SEND_WITH_FLAG(ret, &dummy_line_node, method_id, INT2NUM(1), INT2FIX(flags));
-
-
-          if (!popped) {
-              ADD_INSN(ret, &dummy_line_node, dup);
-          }
-
-          ADD_INSN1(ret, &dummy_line_node, putspecialobject, INT2FIX(VM_SPECIAL_OBJECT_CONST_BASE));
-          ADD_INSN1(ret, &dummy_line_node, setconstant, ID2SYM(constant_name));
-
-          return;
-      }
-      case YP_NODE_CONSTANT_OR_WRITE_NODE: {
-          yp_constant_or_write_node_t *constant_or_write_node = (yp_constant_or_write_node_t*) node;
-
-          LABEL *set_label= NEW_LABEL(lineno);
-          LABEL *end_label = NEW_LABEL(lineno);
-
-          ADD_INSN(ret, &dummy_line_node, putnil);
-          VALUE constant_name = ID2SYM(parse_location_symbol(&constant_or_write_node->name_loc));
-
-          ADD_INSN3(ret, &dummy_line_node, defined, INT2FIX(DEFINED_CONST), constant_name, Qtrue);
-
-          ADD_INSNL(ret, &dummy_line_node, branchunless, set_label);
-
-          ADD_INSN(ret, &dummy_line_node, putnil);
-          ADD_INSN1(ret, &dummy_line_node, putobject, Qtrue);
-          ADD_INSN1(ret, &dummy_line_node, getconstant, constant_name);
-
-          if (!popped) {
-              ADD_INSN(ret, &dummy_line_node, dup);
-          }
-
-          ADD_INSNL(ret, &dummy_line_node, branchif, end_label);
-
-          if (!popped) {
-              ADD_INSN(ret, &dummy_line_node, pop);
-          }
-
-          ADD_LABEL(ret, set_label);
-          yp_compile_node(iseq, constant_or_write_node->value, ret, src, false, compile_context);
-
-          if (!popped) {
-              ADD_INSN(ret, &dummy_line_node, dup);
-          }
-
-          ADD_INSN1(ret, &dummy_line_node, putspecialobject, INT2FIX(VM_SPECIAL_OBJECT_CONST_BASE));
-          ADD_INSN1(ret, &dummy_line_node, setconstant, constant_name);
-          ADD_LABEL(ret, end_label);
-
-          return;
-      }
-      case YP_NODE_CONSTANT_WRITE_NODE: {
-          yp_constant_write_node_t *constant_write_node = (yp_constant_write_node_t *) node;
-          yp_compile_node(iseq, constant_write_node->value, ret, src, false, compile_context);
-
-          if (!popped) {
-              ADD_INSN(ret, &dummy_line_node, dup);
-          }
-
-          ADD_INSN1(ret, &dummy_line_node, putspecialobject, INT2FIX(VM_SPECIAL_OBJECT_CONST_BASE));
-          ID constant_name = parse_location_symbol(&constant_write_node->name_loc);
-          ADD_INSN1(ret, &dummy_line_node, setconstant, ID2SYM(constant_name));
-          return;
-      }
-      case YP_NODE_DEF_NODE: {
-          yp_def_node_t *def_node = (yp_def_node_t *) node;
-          ID method_name = parse_location_symbol(&def_node->name_loc);
-          yp_scope_node_t scope_node;
-          yp_scope_node_init((yp_node_t *)def_node, &scope_node);
-          rb_iseq_t *method_iseq = NEW_ISEQ(&scope_node, rb_id2str(method_name), ISEQ_TYPE_METHOD, lineno);
-
-          ADD_INSN2(ret, &dummy_line_node, definemethod, ID2SYM(method_name), method_iseq);
-          RB_OBJ_WRITTEN(iseq, Qundef, (VALUE)method_iseq);
-
-          if (!popped) {
-              ADD_INSN1(ret, &dummy_line_node, putobject, ID2SYM(method_name));
-          }
-          return;
-      }
-      case YP_NODE_DEFINED_NODE: {
-          ADD_INSN(ret, &dummy_line_node, putself);
-          yp_defined_node_t *defined_node = (yp_defined_node_t *)node;
-          // TODO: Correct defined_type
-          enum defined_type dtype = DEFINED_CONST;
-          VALUE sym = parse_number(defined_node->value);
-
-          ADD_INSN3(ret, &dummy_line_node, defined, INT2FIX(dtype), sym, rb_iseq_defined_string(dtype));
-          return;
-      }
-      case YP_NODE_EMBEDDED_STATEMENTS_NODE: {
-          yp_embedded_statements_node_t *embedded_statements_node = (yp_embedded_statements_node_t *)node;
-
-          if (embedded_statements_node->statements)
-              yp_compile_node(iseq, (yp_node_t *) (embedded_statements_node->statements), ret, src, popped, compile_context);
-          // TODO: Concatenate the strings that exist here
-          return;
-      }
-      case YP_NODE_EMBEDDED_VARIABLE_NODE: {
-          yp_embedded_variable_node_t *embedded_node = (yp_embedded_variable_node_t *)node;
-          yp_compile_node(iseq, embedded_node->variable, ret, src, popped, compile_context);
-          return;
-      }
-      case YP_NODE_FALSE_NODE:
-        if (!popped) {
-            ADD_INSN1(ret, &dummy_line_node, putobject, Qfalse);
-        }
-        return;
-      case YP_NODE_FLIP_FLOP_NODE: {
-          // TODO: The labels here are wrong, figure out why.....
-          yp_flip_flop_node_t *flip_flop_node = (yp_flip_flop_node_t *)node;
-
-          LABEL *lend = NEW_LABEL(lineno);
-          LABEL *then_label = NEW_LABEL(lineno);
-          LABEL *else_label = NEW_LABEL(lineno);
-          //TODO:         int again = type == NODE_FLIP2;
-          int again = 0;
-
-          rb_num_t cnt = ISEQ_FLIP_CNT_INCREMENT(ISEQ_BODY(iseq)->local_iseq)
-              + VM_SVAR_FLIPFLOP_START;
-          VALUE key = INT2FIX(cnt);
-
-          ADD_INSN2(ret, &dummy_line_node, getspecial, key, INT2FIX(0));
-          ADD_INSNL(ret, &dummy_line_node, branchif, lend);
-
-          yp_compile_node(iseq, flip_flop_node->left, ret, src, popped, compile_context);
-          /* *flip == 0 */
-          ADD_INSNL(ret, &dummy_line_node, branchunless, else_label);
-          ADD_INSN1(ret, &dummy_line_node, putobject, Qtrue);
-          ADD_INSN1(ret, &dummy_line_node, setspecial, key);
-          if (!again) {
-              ADD_INSNL(ret, &dummy_line_node, jump, then_label);
-          }
-
-          /* *flip == 1 */
-          ADD_LABEL(ret, lend);
-          yp_compile_node(iseq, flip_flop_node->right, ret, src, popped, compile_context);
-          ADD_INSNL(ret, &dummy_line_node, branchunless, then_label);
-          ADD_INSN1(ret, &dummy_line_node, putobject, Qfalse);
-          ADD_INSN1(ret, &dummy_line_node, setspecial, key);
-          ADD_INSNL(ret, &dummy_line_node, jump, then_label);
-          ADD_LABEL(ret, then_label);
-          ADD_INSN1(ret, &dummy_line_node, putobject, Qtrue);
-          ADD_INSNL(ret, &dummy_line_node, jump, lend);
-          ADD_LABEL(ret, else_label);
-          ADD_INSN1(ret, &dummy_line_node, putobject, Qfalse);
-          ADD_LABEL(ret, lend);
-          return;
-      }
-      case YP_NODE_FLOAT_NODE: {
-          if (!popped) {
-              ADD_INSN1(ret, &dummy_line_node, putobject, parse_number(node));
-          }
-          return;
-      }
-      case YP_NODE_GLOBAL_VARIABLE_AND_WRITE_NODE: {
-          yp_global_variable_and_write_node_t *global_variable_and_write_node = (yp_global_variable_and_write_node_t*) node;
-
-          LABEL *end_label = NEW_LABEL(lineno);
-
-          VALUE global_variable_name = ID2SYM(yp_constant_id_lookup(compile_context, global_variable_and_write_node->name));
-
-          ADD_INSN1(ret, &dummy_line_node, getglobal, global_variable_name);
-
-          if (!popped) {
-              ADD_INSN(ret, &dummy_line_node, dup);
-          }
-
-          ADD_INSNL(ret, &dummy_line_node, branchunless, end_label);
-
-          if (!popped) {
-              ADD_INSN(ret, &dummy_line_node, pop);
-          }
-
-          yp_compile_node(iseq, global_variable_and_write_node->value, ret, src, false, compile_context);
-
-          if (!popped) {
-              ADD_INSN(ret, &dummy_line_node, dup);
-          }
-
-          ADD_INSN1(ret, &dummy_line_node, setglobal, global_variable_name);
-          ADD_LABEL(ret, end_label);
-
-          return;
-      }
-      case YP_NODE_GLOBAL_VARIABLE_OPERATOR_WRITE_NODE: {
-          yp_global_variable_operator_write_node_t *global_variable_operator_write_node = (yp_global_variable_operator_write_node_t*) node;
-
-          VALUE global_variable_name = ID2SYM(yp_constant_id_lookup(compile_context, global_variable_operator_write_node->name));
-          ADD_INSN1(ret, &dummy_line_node, getglobal, global_variable_name);
-
-          yp_compile_node(iseq, global_variable_operator_write_node->value, ret, src, false, compile_context);
-          ID method_id = yp_constant_id_lookup(compile_context, global_variable_operator_write_node->operator);
-
-          int flags = VM_CALL_ARGS_SIMPLE;
-          ADD_SEND_WITH_FLAG(ret, &dummy_line_node, method_id, INT2NUM(1), INT2FIX(flags));
-
-
-          if (!popped) {
-              ADD_INSN(ret, &dummy_line_node, dup);
-          }
-
-          ADD_INSN1(ret, &dummy_line_node, setglobal, global_variable_name);
-
-          return;
-      }
-      case YP_NODE_GLOBAL_VARIABLE_OR_WRITE_NODE: {
-          yp_global_variable_or_write_node_t *global_variable_or_write_node = (yp_global_variable_or_write_node_t*) node;
-
-          LABEL *set_label= NEW_LABEL(lineno);
-          LABEL *end_label = NEW_LABEL(lineno);
-
-          ADD_INSN(ret, &dummy_line_node, putnil);
-          VALUE global_variable_name = ID2SYM(yp_constant_id_lookup(compile_context, global_variable_or_write_node->name));
-
-          ADD_INSN3(ret, &dummy_line_node, defined, INT2FIX(DEFINED_GVAR), global_variable_name, Qtrue);
-
-          ADD_INSNL(ret, &dummy_line_node, branchunless, set_label);
-
-          ADD_INSN1(ret, &dummy_line_node, getglobal, global_variable_name);
-
-          if (!popped) {
-              ADD_INSN(ret, &dummy_line_node, dup);
-          }
-
-          ADD_INSNL(ret, &dummy_line_node, branchif, end_label);
-
-          if (!popped) {
-              ADD_INSN(ret, &dummy_line_node, pop);
-          }
-
-          ADD_LABEL(ret, set_label);
-          yp_compile_node(iseq, global_variable_or_write_node->value, ret, src, false, compile_context);
-
-          if (!popped) {
-              ADD_INSN(ret, &dummy_line_node, dup);
-          }
-
-          ADD_INSN1(ret, &dummy_line_node, setglobal, global_variable_name);
-          ADD_LABEL(ret, end_label);
-
-          return;
-      }
-      case YP_NODE_GLOBAL_VARIABLE_READ_NODE: {
-          yp_global_variable_read_node_t *global_variable_read_node = (yp_global_variable_read_node_t *)node;
-          VALUE global_variable_name = ID2SYM(yp_constant_id_lookup(compile_context, global_variable_read_node->name));
-          ADD_INSN1(ret, &dummy_line_node, getglobal, global_variable_name);
-          if (popped) {
-              ADD_INSN(ret, &dummy_line_node, pop);
-          }
-          return;
-      }
-      case YP_NODE_GLOBAL_VARIABLE_WRITE_NODE: {
-          yp_global_variable_write_node_t *write_node = (yp_global_variable_write_node_t *) node;
-          yp_compile_node(iseq, write_node->value, ret, src, false, compile_context);
-          if (!popped) {
-              ADD_INSN(ret, &dummy_line_node, dup);
-          }
-          ID ivar_name = yp_constant_id_lookup(compile_context, write_node->name);
-          ADD_INSN1(ret, &dummy_line_node, setglobal, ID2SYM(ivar_name));
-          return;
-      }
-      case YP_NODE_HASH_NODE: {
-          yp_hash_node_t *hash_node = (yp_hash_node_t *) node;
-          yp_node_list_t elements = hash_node->elements;
-
-          if (elements.size == 1) {
-              assert(elements.nodes[0]->type == YP_NODE_ASSOC_NODE);
-              yp_assoc_node_t *assoc_node = (yp_assoc_node_t *) elements.nodes[0];
-
-              if (yp_static_node_literal_p(assoc_node->key) &&
-                      yp_static_node_literal_p(assoc_node->value)) {
-                  VALUE hash = rb_hash_new_with_size(1);
-                  hash = rb_obj_hide(hash);
-                  OBJ_FREEZE(hash);
-                  ADD_INSN1(ret, &dummy_line_node, duphash, hash);
-                  return;
-              }
-          }
-
-          for (size_t index = 0; index < elements.size; index++) {
-              yp_compile_node(iseq, elements.nodes[index], ret, src, popped, compile_context);
-          }
-
-          if (!popped) {
-              ADD_INSN1(ret, &dummy_line_node, newhash, INT2FIX(elements.size * 2));
-          }
-          return;
-      }
-      case YP_NODE_IF_NODE: {
-          const int line = (int)yp_newline_list_line_column(&(parser->newline_list), node->location.start).line;
-          yp_if_node_t *if_node = (yp_if_node_t *)node;
-          yp_statements_node_t *node_body = if_node->statements;
-          yp_node_t *node_else = if_node->consequent;
-          yp_node_t *predicate = if_node->predicate;
-
-          yp_compile_if(iseq, line, node_body, node_else, predicate, ret, src, popped, compile_context);
-          return;
-      }
-      case YP_NODE_IMAGINARY_NODE: {
-          if (!popped) {
-              ADD_INSN1(ret, &dummy_line_node, putobject, parse_number(node));
-          }
-          return;
-      }
-      case YP_NODE_INSTANCE_VARIABLE_AND_WRITE_NODE: {
-          yp_instance_variable_and_write_node_t *instance_variable_and_write_node = (yp_instance_variable_and_write_node_t*) node;
-
-          LABEL *end_label = NEW_LABEL(lineno);
-
-          ID instance_variable_name_id = yp_constant_id_lookup(compile_context, instance_variable_and_write_node->name);
-
-          VALUE instance_variable_name_val = ID2SYM(instance_variable_name_id);
-
-          ADD_INSN2(ret, &dummy_line_node, getinstancevariable,
-                  instance_variable_name_val,
-                  get_ivar_ic_value(iseq, instance_variable_name_id));
-
-          if (!popped) {
-              ADD_INSN(ret, &dummy_line_node, dup);
-          }
-
-          ADD_INSNL(ret, &dummy_line_node, branchunless, end_label);
-
-          if (!popped) {
-              ADD_INSN(ret, &dummy_line_node, pop);
-          }
-
-          yp_compile_node(iseq, instance_variable_and_write_node->value, ret, src, false, compile_context);
-
-          if (!popped) {
-              ADD_INSN(ret, &dummy_line_node, dup);
-          }
-
-          ADD_INSN2(ret, &dummy_line_node, setinstancevariable,
-                  instance_variable_name_val,
-                  get_ivar_ic_value(iseq, instance_variable_name_id));
-          ADD_LABEL(ret, end_label);
-
-          return;
-      }
-      case YP_NODE_INSTANCE_VARIABLE_OPERATOR_WRITE_NODE: {
-          yp_instance_variable_operator_write_node_t *instance_variable_operator_write_node = (yp_instance_variable_operator_write_node_t*) node;
-
-          ID instance_variable_name_id = yp_constant_id_lookup(compile_context, instance_variable_operator_write_node->name);
-          VALUE instance_variable_name_val = ID2SYM(instance_variable_name_id);
-
-          ADD_INSN2(ret, &dummy_line_node, getinstancevariable,
-                  instance_variable_name_val,
-                  get_ivar_ic_value(iseq, instance_variable_name_id));
-
-          yp_compile_node(iseq, instance_variable_operator_write_node->value, ret, src, false, compile_context);
-          ID method_id = yp_constant_id_lookup(compile_context, instance_variable_operator_write_node->operator);
-
-          int flags = VM_CALL_ARGS_SIMPLE;
-          ADD_SEND_WITH_FLAG(ret, &dummy_line_node, method_id, INT2NUM(1), INT2FIX(flags));
-
-          if (!popped) {
-              ADD_INSN(ret, &dummy_line_node, dup);
-          }
-
-          ADD_INSN2(ret, &dummy_line_node, setinstancevariable,
-                  instance_variable_name_val,
-                  get_ivar_ic_value(iseq, instance_variable_name_id));
-
-          return;
-      }
-      case YP_NODE_INSTANCE_VARIABLE_OR_WRITE_NODE: {
-          yp_instance_variable_or_write_node_t *instance_variable_or_write_node = (yp_instance_variable_or_write_node_t*) node;
-
-          LABEL *end_label = NEW_LABEL(lineno);
-
-          ID instance_variable_name_id = yp_constant_id_lookup(compile_context, instance_variable_or_write_node->name);
-          VALUE instance_variable_name_val = ID2SYM(instance_variable_name_id);
-
-          ADD_INSN2(ret, &dummy_line_node, getinstancevariable,
-                  instance_variable_name_val,
-                  get_ivar_ic_value(iseq, instance_variable_name_id));
-
-
-          if (!popped) {
-              ADD_INSN(ret, &dummy_line_node, dup);
-          }
-
-          ADD_INSNL(ret, &dummy_line_node, branchif, end_label);
-
-          if (!popped) {
-              ADD_INSN(ret, &dummy_line_node, pop);
-          }
-
-          yp_compile_node(iseq, instance_variable_or_write_node->value, ret, src, false, compile_context);
-
-          if (!popped) {
-              ADD_INSN(ret, &dummy_line_node, dup);
-          }
-
-          ADD_INSN2(ret, &dummy_line_node, setinstancevariable,
-                  instance_variable_name_val,
-                  get_ivar_ic_value(iseq, instance_variable_name_id));
-          ADD_LABEL(ret, end_label);
-
-          return;
-      }
-      case YP_NODE_INSTANCE_VARIABLE_READ_NODE: {
-          if (!popped) {
-              yp_instance_variable_read_node_t *instance_variable_read_node = (yp_instance_variable_read_node_t *) node;
-              ID ivar_name = yp_constant_id_lookup(compile_context, instance_variable_read_node->name);
-              ADD_INSN2(ret, &dummy_line_node, getinstancevariable,
-                      ID2SYM(ivar_name),
-                      get_ivar_ic_value(iseq, ivar_name));
-          }
-          return;
-      }
-      case YP_NODE_INSTANCE_VARIABLE_WRITE_NODE: {
-          yp_instance_variable_write_node_t *write_node = (yp_instance_variable_write_node_t *) node;
-          yp_compile_node(iseq, write_node->value, ret, src, false, compile_context);
-
-          if (!popped) {
-              ADD_INSN(ret, &dummy_line_node, dup);
-          }
-
-          ID ivar_name = yp_constant_id_lookup(compile_context, write_node->name);
-          ADD_INSN2(ret, &dummy_line_node, setinstancevariable,
-                  ID2SYM(ivar_name),
-                  get_ivar_ic_value(iseq, ivar_name));
-          return;
-      }
-      case YP_NODE_INTEGER_NODE: {
-          if (!popped) {
-              ADD_INSN1(ret, &dummy_line_node, putobject, parse_number(node));
-          }
-          return;
-      }
-      case YP_NODE_INTERPOLATED_STRING_NODE: {
-          yp_interpolated_string_node_t *interp_string_node= (yp_interpolated_string_node_t *) node;
-
-          for (size_t index = 0; index < interp_string_node->parts.size; index++) {
-              yp_node_t *part = interp_string_node->parts.nodes[index];
-
-              switch (part->type) {
-                case YP_NODE_STRING_NODE: {
-                    yp_string_node_t *string_node = (yp_string_node_t *) part;
-                    ADD_INSN1(ret, &dummy_line_node, putobject,parse_string(&string_node->unescaped));
-                    break;
-                }
-                default:
-                  yp_compile_node(iseq, part, ret, src, popped, compile_context);
-                  ADD_INSN(ret, &dummy_line_node, dup);
-                  ADD_INSN1(ret, &dummy_line_node, objtostring, new_callinfo(iseq, idTo_s, 0, VM_CALL_FCALL | VM_CALL_ARGS_SIMPLE , NULL, FALSE));
-                  ADD_INSN(ret, &dummy_line_node, anytostring);
-                  break;
-              }
-          }
-
-          if (interp_string_node->parts.size > 1) {
-              ADD_INSN1(ret, &dummy_line_node, concatstrings, INT2FIX((int)(interp_string_node->parts.size)));
-          }
-          return;
-      }
-      case YP_NODE_INTERPOLATED_SYMBOL_NODE: {
-          yp_interpolated_symbol_node_t *interp_symbol_node= (yp_interpolated_symbol_node_t *) node;
-
-          for (size_t index = 0; index < interp_symbol_node->parts.size; index++) {
-              yp_node_t *part = interp_symbol_node->parts.nodes[index];
-
-              switch (part->type) {
-                case YP_NODE_STRING_NODE: {
-                    yp_string_node_t *string_node = (yp_string_node_t *) part;
-                    ADD_INSN1(ret, &dummy_line_node, putobject, parse_string(&string_node->unescaped));
-                    break;
-                }
-                default:
-                  yp_compile_node(iseq, part, ret, src, popped, compile_context);
-                  ADD_INSN(ret, &dummy_line_node, dup);
-                  ADD_INSN1(ret, &dummy_line_node, objtostring, new_callinfo(iseq, idTo_s, 0, VM_CALL_FCALL | VM_CALL_ARGS_SIMPLE, NULL, FALSE));
-                  ADD_INSN(ret, &dummy_line_node, anytostring);
-                  break;
-              }
-          }
-
-          if (interp_symbol_node->parts.size > 1) {
-              ADD_INSN1(ret, &dummy_line_node, concatstrings, INT2FIX((int)(interp_symbol_node->parts.size)));
-          }
-
-          if (!popped) {
-              ADD_INSN(ret, &dummy_line_node, intern);
-          }
-          else {
-              ADD_INSN(ret, &dummy_line_node, pop);
-          }
-
-          return;
-      }
-      case YP_NODE_KEYWORD_HASH_NODE: {
-          yp_keyword_hash_node_t *keyword_hash_node = (yp_keyword_hash_node_t *) node;
-          yp_node_list_t elements = keyword_hash_node->elements;
-
-          for (size_t index = 0; index < elements.size; index++) {
-              yp_compile_node(iseq, elements.nodes[index], ret, src, popped, compile_context);
-          }
-
-          ADD_INSN1(ret, &dummy_line_node, newhash, INT2FIX(elements.size * 2));
-          return;
-      }
-      case YP_NODE_LAMBDA_NODE: {
-          yp_scope_node_t scope_node;
-          yp_scope_node_init((yp_node_t *)node, &scope_node);
-
-          const rb_iseq_t *block = NEW_CHILD_ISEQ(&scope_node, make_name_for_block(iseq), ISEQ_TYPE_BLOCK, lineno);
-          VALUE argc = INT2FIX(0);
-
-          ADD_INSN1(ret, &dummy_line_node, putspecialobject, INT2FIX(VM_SPECIAL_OBJECT_VMCORE));
-          ADD_CALL_WITH_BLOCK(ret, &dummy_line_node, idLambda, argc, block);
-          RB_OBJ_WRITTEN(iseq, Qundef, (VALUE)block);
-
-          if (popped) {
-              ADD_INSN(ret, &dummy_line_node, pop);
-          }
-          return;
-      }
-      case YP_NODE_LOCAL_VARIABLE_AND_WRITE_NODE: {
-          yp_local_variable_and_write_node_t *local_variable_and_write_node = (yp_local_variable_and_write_node_t*) node;
-
-          LABEL *end_label = NEW_LABEL(lineno);
-
-          yp_constant_id_t constant_id = local_variable_and_write_node->name;
-          int depth = local_variable_and_write_node->depth;
-          int local_index = yp_lookup_local_index_with_depth(iseq, compile_context, constant_id, depth);
-          ADD_GETLOCAL(ret, &dummy_line_node, local_index, depth);
-
-          if (!popped) {
-              ADD_INSN(ret, &dummy_line_node, dup);
-          }
-
-          ADD_INSNL(ret, &dummy_line_node, branchunless, end_label);
-
-          if (!popped) {
-              ADD_INSN(ret, &dummy_line_node, pop);
-          }
-
-          yp_compile_node(iseq, local_variable_and_write_node->value, ret, src, false, compile_context);
-
-          if (!popped) {
-              ADD_INSN(ret, &dummy_line_node, dup);
-          }
-
-          ADD_SETLOCAL(ret, &dummy_line_node, local_index, depth);
-          ADD_LABEL(ret, end_label);
-
-          return;
-      }
-      case YP_NODE_LOCAL_VARIABLE_OPERATOR_WRITE_NODE: {
-          yp_local_variable_operator_write_node_t *local_variable_operator_write_node = (yp_local_variable_operator_write_node_t*) node;
-
-          yp_constant_id_t constant_id = local_variable_operator_write_node->name;
-
-          int depth = local_variable_operator_write_node->depth;
-          int local_index = yp_lookup_local_index_with_depth(iseq, compile_context, constant_id, depth);
-          ADD_GETLOCAL(ret, &dummy_line_node, local_index, depth);
-
-          yp_compile_node(iseq, local_variable_operator_write_node->value, ret, src, false, compile_context);
-          ID method_id = yp_constant_id_lookup(compile_context, local_variable_operator_write_node->operator);
-
-          int flags = VM_CALL_ARGS_SIMPLE | VM_CALL_FCALL | VM_CALL_VCALL;
-          ADD_SEND_WITH_FLAG(ret, &dummy_line_node, method_id, INT2NUM(1), INT2FIX(flags));
-
-          if (!popped) {
-              ADD_INSN(ret, &dummy_line_node, dup);
-          }
-
-          ADD_SETLOCAL(ret, &dummy_line_node, local_index, depth);
-
-          return;
-      }
-      case YP_NODE_LOCAL_VARIABLE_OR_WRITE_NODE: {
-          yp_local_variable_or_write_node_t *local_variable_or_write_node = (yp_local_variable_or_write_node_t*) node;
-
-          LABEL *set_label= NEW_LABEL(lineno);
-          LABEL *end_label = NEW_LABEL(lineno);
-
-          ADD_INSN1(ret, &dummy_line_node, putobject, Qtrue);
-          ADD_INSNL(ret, &dummy_line_node, branchunless, set_label);
-
-          yp_constant_id_t constant_id = local_variable_or_write_node->name;
-          int depth = local_variable_or_write_node->depth;
-          int local_index = yp_lookup_local_index_with_depth(iseq, compile_context, constant_id, depth);
-          ADD_GETLOCAL(ret, &dummy_line_node, local_index, depth);
-
-          if (!popped) {
-              ADD_INSN(ret, &dummy_line_node, dup);
-          }
-
-          ADD_INSNL(ret, &dummy_line_node, branchif, end_label);
-
-          if (!popped) {
-              ADD_INSN(ret, &dummy_line_node, pop);
-          }
-
-          ADD_LABEL(ret, set_label);
-          yp_compile_node(iseq, local_variable_or_write_node->value, ret, src, false, compile_context);
-
-          if (!popped) {
-              ADD_INSN(ret, &dummy_line_node, dup);
-          }
-
-          ADD_SETLOCAL(ret, &dummy_line_node, local_index, depth);
-          ADD_LABEL(ret, end_label);
-
-          return;
-      }
-      case YP_NODE_LOCAL_VARIABLE_READ_NODE: {
-          yp_local_variable_read_node_t *local_read_node = (yp_local_variable_read_node_t *) node;
-
-          if (!popped) {
-              int index = yp_lookup_local_index(iseq, compile_context, local_read_node->name);
-              ADD_GETLOCAL(ret, &dummy_line_node, index, local_read_node->depth);
-          }
-          return;
-      }
-      case YP_NODE_LOCAL_VARIABLE_WRITE_NODE: {
-          yp_local_variable_write_node_t *local_write_node = (yp_local_variable_write_node_t *) node;
-          yp_compile_node(iseq, local_write_node->value, ret, src, false, compile_context);
-
-          if (!popped) {
-              ADD_INSN(ret, &dummy_line_node, dup);
-          }
-
-          yp_constant_id_t constant_id = local_write_node->name;
-          int index = yp_lookup_local_index(iseq, compile_context, constant_id);
-
-          ADD_SETLOCAL(ret, &dummy_line_node, (int)index, local_write_node->depth);
-          return;
-      }
-      case YP_NODE_MISSING_NODE: {
-          rb_bug("A yp_missing_node_t should not exist in YARP's AST.");
-          return;
-      }
-      case YP_NODE_MODULE_NODE: {
-          yp_module_node_t *module_node = (yp_module_node_t *)node;
-          yp_scope_node_t scope_node;
-          yp_scope_node_init((yp_node_t *)module_node, &scope_node);
-
-          ID module_id = yp_constant_id_lookup(compile_context, module_node->name_constant);
-          VALUE module_name = rb_str_freeze(rb_sprintf("<module:%"PRIsVALUE">", rb_id2str(module_id)));
-
-          const rb_iseq_t *module_iseq = NEW_CHILD_ISEQ(&scope_node, module_name, ISEQ_TYPE_CLASS, lineno);
-
-          const int flags = VM_DEFINECLASS_TYPE_MODULE |
-              yp_compile_class_path(ret, iseq, module_node->constant_path, &dummy_line_node, src, popped, compile_context);
-
-          ADD_INSN(ret, &dummy_line_node, putnil);
-          ADD_INSN3(ret, &dummy_line_node, defineclass, ID2SYM(module_id), module_iseq, INT2FIX(flags));
-          RB_OBJ_WRITTEN(iseq, Qundef, (VALUE)module_iseq);
-
-          if (popped) {
-              ADD_INSN(ret, &dummy_line_node, pop);
-          }
-          return;
-      }
-      case YP_NODE_MULTI_WRITE_NODE: {
-          yp_multi_write_node_t *multi_write_node = (yp_multi_write_node_t *)node;
-          yp_compile_node(iseq, multi_write_node->value, ret, src, popped, compile_context);
-
-          // TODO: int flag = 0x02 | (NODE_NAMED_REST_P(restn) ? 0x01 : 0x00);
-          int flag = 0x00;
-
-          ADD_INSN(ret, &dummy_line_node, dup);
-          ADD_INSN2(ret, &dummy_line_node, expandarray, INT2FIX(multi_write_node->targets.size), INT2FIX(flag));
-          yp_node_list_t node_list = multi_write_node->targets;
-
-          for (size_t index = 0; index < node_list.size; index++) {
-              yp_compile_node(iseq, node_list.nodes[index], ret, src, popped, compile_context);
-          }
-
-          return;
-      }
-      case YP_NODE_NEXT_NODE: {
-          yp_next_node_t *next_node = (yp_next_node_t *) node;
-          if (next_node->arguments) {
-              yp_compile_node(iseq, (yp_node_t *)next_node->arguments, ret, src, Qfalse, compile_context);
-          }
-          else {
-              ADD_INSN(ret, &dummy_line_node, putnil);
-          }
-
-          ADD_INSN(ret, &dummy_line_node, pop);
-          ADD_INSNL(ret, &dummy_line_node, jump, ISEQ_COMPILE_DATA(iseq)->start_label);
-
-          return;
-      }
-      case YP_NODE_NIL_NODE:
-        if (!popped) {
-            ADD_INSN(ret, &dummy_line_node, putnil);
-        }
-        return;
-      case YP_NODE_NUMBERED_REFERENCE_READ_NODE: {
-          if (!popped) {
-              uint32_t reference_number = ((yp_numbered_reference_read_node_t *)node)->number;
-              ADD_INSN2(ret, &dummy_line_node, getspecial, INT2FIX(1), INT2FIX(reference_number << 1));
-          }
-          return;
-      }
-      case YP_NODE_OR_NODE: {
-          yp_or_node_t *or_node = (yp_or_node_t *) node;
-
-          LABEL *end_label = NEW_LABEL(lineno);
-          yp_compile_node(iseq, or_node->left, ret, src, popped, compile_context);
-
-          if (!popped) {
-              ADD_INSN(ret, &dummy_line_node, dup);
-          }
-          ADD_INSNL(ret, &dummy_line_node, branchif, end_label);
-
-          if (!popped) {
-              ADD_INSN(ret, &dummy_line_node, pop);
-          }
-          yp_compile_node(iseq, or_node->right, ret, src, popped, compile_context);
-          ADD_LABEL(ret, end_label);
-
-          return;
-      }
-      case YP_NODE_OPTIONAL_PARAMETER_NODE: {
-          yp_optional_parameter_node_t *optional_parameter_node = (yp_optional_parameter_node_t *)node;
-          yp_compile_node(iseq, optional_parameter_node->value, ret, src, false, compile_context);
-
-          int index = yp_lookup_local_index(iseq, compile_context, optional_parameter_node->name);
-
-          ADD_SETLOCAL(ret, &dummy_line_node, index, 0);
-
-          return;
-      }
-      case YP_NODE_PARENTHESES_NODE: {
-          yp_parentheses_node_t *parentheses_node = (yp_parentheses_node_t *) node;
-
-          if (parentheses_node->body == NULL) {
-              ADD_INSN(ret, &dummy_line_node, putnil);
-          } else {
-              yp_compile_node(iseq, parentheses_node->body, ret, src, popped, compile_context);
-          }
-
-          return;
-      }
-      case YP_NODE_PROGRAM_NODE: {
-          yp_program_node_t *program_node = (yp_program_node_t *) node;
-
-          yp_scope_node_t scope_node;
-          yp_scope_node_init((yp_node_t *)node, &scope_node);
-          if (program_node->statements->body.size == 0) {
-              ADD_INSN(ret, &dummy_line_node, putnil);
-          } else {
-              yp_scope_node_t *res_node = &scope_node;
-              yp_compile_node(iseq, (yp_node_t *) res_node, ret, src, popped, compile_context);
-          }
-
-          return;
-      }
-      case YP_NODE_RANGE_NODE: {
-          yp_range_node_t *range_node = (yp_range_node_t *) node;
-          bool exclusive = (range_node->operator_loc.end - range_node->operator_loc.start) == 3;
-
-          if (yp_optimizable_range_item_p(range_node->left) && yp_optimizable_range_item_p(range_node->right))  {
-              if (!popped) {
-                  yp_node_t *left = range_node->left;
-                  yp_node_t *right = range_node->right;
-                  VALUE val = rb_range_new(
-                          left && left->type == YP_NODE_INTEGER_NODE ? parse_number(left) : Qnil,
-                          right && right->type == YP_NODE_INTEGER_NODE ? parse_number(right) : Qnil,
-                          exclusive
-                          );
-                  ADD_INSN1(ret, &dummy_line_node, putobject, val);
-                  RB_OBJ_WRITTEN(iseq, Qundef, val);
-              }
-          }
-          else {
-              if (range_node->left == NULL) {
-                  ADD_INSN(ret, &dummy_line_node, putnil);
-              } else {
-                  yp_compile_node(iseq, range_node->left, ret, src, popped, compile_context);
-              }
-
-              if (range_node->right == NULL) {
-                  ADD_INSN(ret, &dummy_line_node, putnil);
-              } else {
-                  yp_compile_node(iseq, range_node->right, ret, src, popped, compile_context);
-              }
-
-              if (!popped) {
-                  ADD_INSN1(ret, &dummy_line_node, newrange, INT2FIX(exclusive));
-              }
-          }
-          return;
-      }
-      case YP_NODE_REDO_NODE: {
-          ADD_INSNL(ret, &dummy_line_node, jump, ISEQ_COMPILE_DATA(iseq)->redo_label);
-          return;
-      }
-      case YP_NODE_RETURN_NODE: {
-          yp_arguments_node_t *arguments = ((yp_return_node_t *)node)->arguments;
-
-          if (arguments) {
-              yp_compile_node(iseq, (yp_node_t *)arguments, ret, src, popped, compile_context);
-          }
-          else {
-              ADD_INSN(ret, &dummy_line_node, putnil);
-          }
-
-          ADD_TRACE(ret, RUBY_EVENT_RETURN);
-          ADD_INSN(ret, &dummy_line_node, leave);
-
-          if (!popped) {
-              ADD_INSN(ret, &dummy_line_node, putnil);
-          }
-          return;
-      }
-      case YP_NODE_SCOPE_NODE: {
-          yp_scope_node_t *scope_node = (yp_scope_node_t *)node;
-          yp_constant_id_list_t locals = scope_node->locals;
-
-          yp_parameters_node_t *parameters_node = (yp_parameters_node_t *)scope_node->parameters;
-          yp_node_list_t requireds_list = YP_EMPTY_NODE_LIST;
-          yp_node_list_t optionals_list = YP_EMPTY_NODE_LIST;
-
-
-          if (parameters_node) {
-              requireds_list = parameters_node->requireds;
-              optionals_list = parameters_node->optionals;
-          }
-
-          size_t size = locals.size;
-
-          // Index lookup table buffer size is only the number of the locals
-          st_table *index_lookup_table = st_init_numtable();
-
-          VALUE idtmp = 0;
-          rb_ast_id_table_t *tbl = ALLOCV(idtmp, sizeof(rb_ast_id_table_t) + size * sizeof(ID));
-          tbl->size = (int)size;
-
-          // First param gets 0, second param 1, param n...
-          // Calculate the local index for all locals
-          for (size_t i = 0; i < size; i++) {
-              yp_constant_id_t constant_id = locals.ids[i];
-              ID local = yp_constant_id_lookup(compile_context, constant_id);
-              tbl->ids[i] = local;
-              st_insert(index_lookup_table, constant_id, i);
-          }
-
-          yp_compile_context_t scope_compile_context = {
-              .parser = parser,
-              .previous = compile_context,
-              .constants = compile_context->constants,
-              .index_lookup_table = index_lookup_table
-          };
-
-          ISEQ_BODY(iseq)->param.lead_num = (int)requireds_list.size;
-          ISEQ_BODY(iseq)->param.opt_num = (int)optionals_list.size;
-          // TODO: Set all the other nums (good comment by lead_num illustrating what they are)
-          ISEQ_BODY(iseq)->param.size = (unsigned int)size;
-
-          if (optionals_list.size) {
-              LABEL **opt_table = (LABEL **)ALLOC_N(VALUE, optionals_list.size + 1);
-              LABEL *label;
-
-              // TODO: Should we make an api for NEW_LABEL where you can pass
-              // a pointer to the label it should fill out?  We already
-              // have a list of labels allocated above so it seems wasteful
-              // to do the copies.
-              for (size_t i = 0; i < optionals_list.size; i++) {
-                  label = NEW_LABEL(lineno);
-                  opt_table[i] = label;
-                  ADD_LABEL(ret, label);
-                  yp_node_t *optional_node = optionals_list.nodes[i];
-                  yp_compile_node(iseq, optional_node, ret, src, false, &scope_compile_context);
-              }
-
-              // Set the last label
-              label = NEW_LABEL(lineno);
-              opt_table[optionals_list.size] = label;
-              ADD_LABEL(ret, label);
-
-              ISEQ_BODY(iseq)->param.flags.has_opt = TRUE;
-              ISEQ_BODY(iseq)->param.opt_table = (const VALUE *)opt_table;
-          }
-
-          iseq_set_local_table(iseq, tbl);
-
-          switch (ISEQ_BODY(iseq)->type) {
-            case ISEQ_TYPE_BLOCK:
-              {
-                  LABEL *start = ISEQ_COMPILE_DATA(iseq)->start_label = NEW_LABEL(0);
-                  LABEL *end = ISEQ_COMPILE_DATA(iseq)->end_label = NEW_LABEL(0);
-
-                  start->rescued = LABEL_RESCUE_BEG;
-                  end->rescued = LABEL_RESCUE_END;
-
-                  ADD_TRACE(ret, RUBY_EVENT_B_CALL);
-                  NODE dummy_line_node = generate_dummy_line_node(ISEQ_BODY(iseq)->location.first_lineno, -1);
-                  ADD_INSN (ret, &dummy_line_node, nop);
-                  ADD_LABEL(ret, start);
-
-                  if (scope_node->body) {
-                      yp_compile_node(iseq, (yp_node_t *)(scope_node->body), ret, src, popped, &scope_compile_context);
-                  }
-
-                  ADD_LABEL(ret, end);
-                  ADD_TRACE(ret, RUBY_EVENT_B_RETURN);
-                  ISEQ_COMPILE_DATA(iseq)->last_line = ISEQ_BODY(iseq)->location.code_location.end_pos.lineno;
-
-                  /* wide range catch handler must put at last */
-                  ADD_CATCH_ENTRY(CATCH_TYPE_REDO, start, end, NULL, start);
-                  ADD_CATCH_ENTRY(CATCH_TYPE_NEXT, start, end, NULL, end);
-                  break;
-              }
-            default:
-              if (scope_node->body) {
-                  yp_compile_node(iseq, (yp_node_t *)(scope_node->body), ret, src, popped, &scope_compile_context);
-              }
-              else {
-                  ADD_INSN(ret, &dummy_line_node, putnil);
-              }
-          }
-
-          free(index_lookup_table);
-
-          ADD_INSN(ret, &dummy_line_node, leave);
-          return;
-      }
-      case YP_NODE_SELF_NODE:
-        ADD_INSN(ret, &dummy_line_node, putself);
-        return;
-      case YP_NODE_SINGLETON_CLASS_NODE: {
-          yp_singleton_class_node_t *singleton_class_node = (yp_singleton_class_node_t *)node;
-          yp_scope_node_t scope_node;
-          yp_scope_node_init((yp_node_t *)singleton_class_node, &scope_node);
-
-          const rb_iseq_t *singleton_class = NEW_ISEQ(&scope_node, rb_fstring_lit("singleton class"),
-                  ISEQ_TYPE_CLASS, lineno);
-
-          yp_compile_node(iseq, singleton_class_node->expression, ret, src, popped, compile_context);
-          ADD_INSN(ret, &dummy_line_node, putnil);
-          ID singletonclass;
-          CONST_ID(singletonclass, "singletonclass");
-
-          ADD_INSN3(ret, &dummy_line_node, defineclass,
-                  ID2SYM(singletonclass), singleton_class,
-                  INT2FIX(VM_DEFINECLASS_TYPE_SINGLETON_CLASS));
-          RB_OBJ_WRITTEN(iseq, Qundef, (VALUE)singleton_class);
-
-          if (popped) {
-              ADD_INSN(ret, &dummy_line_node, pop);
-          }
-
-          return;
-      }
-      case YP_NODE_SOURCE_ENCODING_NODE: {
-          const char *encoding = compile_context->parser->encoding.name;
-          if (!popped) {
-              rb_encoding *enc = rb_find_encoding(rb_str_new_cstr(encoding));
-              if (!enc) {
-                  rb_bug("Encoding not found!");
-              }
-              ADD_INSN1(ret, &dummy_line_node, putobject, rb_enc_from_encoding(enc));
-          }
-          return;
-      }
-      case YP_NODE_SOURCE_FILE_NODE: {
-          yp_source_file_node_t *source_file_node = (yp_source_file_node_t *)node;
-
-          if (!popped) {
-              VALUE filepath;
-              if (source_file_node->filepath.length == 0) {
-                  filepath = rb_fstring_lit("<compiled>");
-              }
-              else {
-                  filepath = parse_string(&source_file_node->filepath);
-              }
-
-              ADD_INSN1(ret, &dummy_line_node, putstring, filepath);
-          }
-          return;
-      }
-      case YP_NODE_SOURCE_LINE_NODE: {
-          if (!popped) {
-              ADD_INSN1(ret, &dummy_line_node, putobject, INT2FIX(lineno));
-          }
-          return;
-      }
-      case YP_NODE_SPLAT_NODE: {
-          yp_splat_node_t *splat_node = (yp_splat_node_t *)node;
-          yp_compile_node(iseq, splat_node->expression, ret, src, popped, compile_context);
-
-          ADD_INSN1(ret, &dummy_line_node, splatarray, Qtrue);
-
-          if (popped) {
-              ADD_INSN(ret, &dummy_line_node, pop);
-          }
-          return;
-      }
-      case YP_NODE_STATEMENTS_NODE: {
-          yp_statements_node_t *statements_node = (yp_statements_node_t *) node;
-          yp_node_list_t node_list = statements_node->body;
-          for (size_t index = 0; index < node_list.size - 1; index++) {
-              yp_compile_node(iseq, node_list.nodes[index], ret, src, true, compile_context);
-          }
-          yp_compile_node(iseq, node_list.nodes[node_list.size - 1], ret, src, false, compile_context);
-          return;
-      }
-      case YP_NODE_STRING_CONCAT_NODE: {
-          yp_string_concat_node_t *str_concat_node = (yp_string_concat_node_t *)node;
-          yp_compile_node(iseq, str_concat_node->left, ret, src, popped, compile_context);
-          yp_compile_node(iseq, str_concat_node->right, ret, src, popped, compile_context);
-          return;
-      }
-      case YP_NODE_STRING_NODE: {
-          if (!popped) {
-              yp_string_node_t *string_node = (yp_string_node_t *) node;
-              ADD_INSN1(ret, &dummy_line_node, putstring, parse_string(&string_node->unescaped));
-          }
-          return;
-      }
-      case YP_NODE_SYMBOL_NODE: {
-          yp_symbol_node_t *symbol_node = (yp_symbol_node_t *) node;
-          ADD_INSN1(ret, &dummy_line_node, putobject, ID2SYM(parse_string_symbol(&symbol_node->unescaped)));
-          return;
-      }
-      case YP_NODE_TRUE_NODE:
-        if (!popped) {
-            ADD_INSN1(ret, &dummy_line_node, putobject, Qtrue);
-        }
-        return;
-      case YP_NODE_UNDEF_NODE: {
-          yp_undef_node_t *undef_node = (yp_undef_node_t *) node;
-
-          for (size_t index = 0; index < undef_node->names.size; index++) {
-              ADD_INSN1(ret, &dummy_line_node, putspecialobject, VM_SPECIAL_OBJECT_VMCORE);
-              ADD_INSN1(ret, &dummy_line_node, putspecialobject, VM_SPECIAL_OBJECT_CBASE);
-
-              yp_compile_node(iseq, undef_node->names.nodes[index], ret, src, popped, compile_context);
-
-              ADD_SEND(ret, &dummy_line_node, rb_intern("core#undef_method"), INT2NUM(2));
-
-              if (index < undef_node->names.size - 1)
-                  ADD_INSN(ret, &dummy_line_node, pop);
-          }
-
-          return;
-      }
-      case YP_NODE_UNLESS_NODE: {
-          const int line = (int)yp_newline_list_line_column(&(parser->newline_list), node->location.start).line;
-          yp_unless_node_t *unless_node = (yp_unless_node_t *)node;
-          yp_statements_node_t *node_body = unless_node->statements;
-          yp_node_t *node_else = (yp_node_t *)(unless_node->consequent);
-          yp_node_t *predicate = unless_node->predicate;
-
-          yp_compile_if(iseq, line, node_body, node_else, predicate, ret, src, popped, compile_context);
-          return;
-      }
-      case YP_NODE_UNTIL_NODE: {
-          yp_until_node_t *until_node = (yp_until_node_t *)node;
-          yp_statements_node_t *statements = until_node->statements;
-          yp_node_t *predicate = until_node->predicate;
-          yp_node_flags_t flags = node->flags;
-
-          yp_compile_while(iseq, lineno, flags, node->type, statements, predicate, ret, src, popped, compile_context);
-          return;
-      }
-      case YP_NODE_WHILE_NODE: {
-          yp_while_node_t *while_node = (yp_while_node_t *)node;
-          yp_statements_node_t *statements = while_node->statements;
-          yp_node_t *predicate = while_node->predicate;
-          yp_node_flags_t flags = node->flags;
-
-          yp_compile_while(iseq, lineno, flags, node->type, statements, predicate, ret, src, popped, compile_context);
-          return;
-      }
-      case YP_NODE_X_STRING_NODE: {
-          yp_x_string_node_t *xstring_node = (yp_x_string_node_t *) node;
-          ADD_INSN(ret, &dummy_line_node, putself);
-          ADD_INSN1(ret, &dummy_line_node, putobject, parse_string(&xstring_node->unescaped));
-          ADD_SEND_WITH_FLAG(ret, &dummy_line_node, rb_intern("`"), INT2NUM(1), INT2FIX(VM_CALL_FCALL | VM_CALL_ARGS_SIMPLE));
-          return;
-      }
-      case YP_NODE_YIELD_NODE: {
-          unsigned int flag = 0;
-          struct rb_callinfo_kwarg *keywords = NULL;
-
-          VALUE argc = INT2FIX(0);
-
-          ADD_INSN1(ret, &dummy_line_node, invokeblock, new_callinfo(iseq, 0, FIX2INT(argc), flag, keywords, FALSE));
-
-          if (popped) {
-              ADD_INSN(ret, &dummy_line_node, pop);
-          }
-
-          int level = 0;
-          const rb_iseq_t *tmp_iseq = iseq;
-          for (; tmp_iseq != ISEQ_BODY(iseq)->local_iseq; level++ ) {
-              tmp_iseq = ISEQ_BODY(tmp_iseq)->parent_iseq;
-          }
-
-          if (level > 0) access_outer_variables(iseq, level, rb_intern("yield"), true);
-
-          return;
-      }
-      default:
-        rb_raise(rb_eNotImpError, "node type %s not implemented", yp_node_type_to_str(node->type));
-        return;
-    }
-}
-
-static VALUE
-rb_translate_yarp(rb_iseq_t *iseq, const yp_node_t *node, LINK_ANCHOR *const ret, yp_compile_context_t *compile_context)
-{
-    RUBY_ASSERT(ISEQ_COMPILE_DATA(iseq));
-    RUBY_ASSERT(node->type == YP_NODE_PROGRAM_NODE || node->type == YP_NODE_SCOPE_NODE);
-
-    yp_compile_node(iseq, node, ret, node->location.start, false, compile_context);
-    iseq_set_sequence(iseq, ret);
-    return Qnil;
-}
-
-#undef NEW_ISEQ
-#define NEW_ISEQ OLD_ISEQ
-
-#undef NEW_CHILD_ISEQ
-#define NEW_CHILD_ISEQ OLD_CHILD_ISEQ
diff --git a/yarp/yarp_init.c b/yarp/yarp_init.c
deleted file mode 100644
index 4684e99db65744..00000000000000
--- a/yarp/yarp_init.c
+++ /dev/null
@@ -1,9 +0,0 @@
-#include "yarp/extension.h"
-
-void ruby_init_ext(const char *name, void (*init)(void));
-
-void
-Init_YARP(void)
-{
-    ruby_init_ext("yarp/yarp.so", Init_yarp);
-}
diff --git a/yjit.c b/yjit.c
index badd46b99afebb..b3364ff6065515 100644
--- a/yjit.c
+++ b/yjit.c
@@ -29,6 +29,7 @@
 #include "iseq.h"
 #include "ruby/debug.h"
 #include "internal/cont.h"
+#include "zjit.h"
 
 // For mmapp(), sysconf()
 #ifndef _WIN32
@@ -40,8 +41,7 @@
 
 // Field offsets for the RObject struct
 enum robject_offsets {
-    ROBJECT_OFFSET_AS_HEAP_IVPTR = offsetof(struct RObject, as.heap.ivptr),
-    ROBJECT_OFFSET_AS_HEAP_IV_INDEX_TBL = offsetof(struct RObject, as.heap.iv_index_tbl),
+    ROBJECT_OFFSET_AS_HEAP_FIELDS = offsetof(struct RObject, as.heap.fields),
     ROBJECT_OFFSET_AS_ARY = offsetof(struct RObject, as.ary),
 };
 
@@ -272,7 +272,7 @@ rb_yjit_reserve_addr_space(uint32_t mem_size)
     // On Linux
     #if defined(MAP_FIXED_NOREPLACE) && defined(_SC_PAGESIZE)
         uint32_t const page_size = (uint32_t)sysconf(_SC_PAGESIZE);
-        uint8_t *const cfunc_sample_addr = (void *)&rb_yjit_reserve_addr_space;
+        uint8_t *const cfunc_sample_addr = (void *)(uintptr_t)&rb_yjit_reserve_addr_space;
         uint8_t *const probe_region_end = cfunc_sample_addr + INT32_MAX;
         // Align the requested address to page size
         uint8_t *req_addr = align_ptr(cfunc_sample_addr, page_size);
@@ -291,11 +291,15 @@ rb_yjit_reserve_addr_space(uint32_t mem_size)
 
             // If we succeeded, stop
             if (mem_block != MAP_FAILED) {
+                ruby_annotate_mmap(mem_block, mem_size, "Ruby:rb_yjit_reserve_addr_space");
                 break;
             }
 
-            // +4MB
-            req_addr += 4 * 1024 * 1024;
+            // -4MiB. Downwards to probe away from the heap. (On x86/A64 Linux
+            // main_code_addr < heap_addr, and in case we are in a shared
+            // library mapped higher than the heap, downwards is still better
+            // since it's towards the end of the heap rather than the stack.)
+            req_addr -= 4 * 1024 * 1024;
         } while (req_addr < probe_region_end);
 
     // On MacOS and other platforms
@@ -322,6 +326,10 @@ rb_yjit_reserve_addr_space(uint32_t mem_size)
             -1,
             0
         );
+
+        if (mem_block != MAP_FAILED) {
+            ruby_annotate_mmap(mem_block, mem_size, "Ruby:rb_yjit_reserve_addr_space:fallback");
+        }
     }
 
     // Check that the memory mapping was successful
@@ -389,12 +397,6 @@ rb_full_cfunc_return(rb_execution_context_t *ec, VALUE return_value)
     ec->cfp->sp++;
 }
 
-unsigned int
-rb_iseq_encoded_size(const rb_iseq_t *iseq)
-{
-    return iseq->body->iseq_size;
-}
-
 // TODO(alan): consider using an opaque pointer for the payload rather than a void pointer
 void *
 rb_iseq_get_yjit_payload(const rb_iseq_t *iseq)
@@ -430,40 +432,6 @@ rb_iseq_reset_jit_func(const rb_iseq_t *iseq)
     iseq->body->jit_exception_calls = 0;
 }
 
-// Get the PC for a given index in an iseq
-VALUE *
-rb_iseq_pc_at_idx(const rb_iseq_t *iseq, uint32_t insn_idx)
-{
-    RUBY_ASSERT_ALWAYS(IMEMO_TYPE_P(iseq, imemo_iseq));
-    RUBY_ASSERT_ALWAYS(insn_idx < iseq->body->iseq_size);
-    VALUE *encoded = iseq->body->iseq_encoded;
-    VALUE *pc = &encoded[insn_idx];
-    return pc;
-}
-
-// Get the opcode given a program counter. Can return trace opcode variants.
-int
-rb_iseq_opcode_at_pc(const rb_iseq_t *iseq, const VALUE *pc)
-{
-    // YJIT should only use iseqs after AST to bytecode compilation
-    RUBY_ASSERT_ALWAYS(FL_TEST_RAW((VALUE)iseq, ISEQ_TRANSLATED));
-
-    const VALUE at_pc = *pc;
-    return rb_vm_insn_addr2opcode((const void *)at_pc);
-}
-
-unsigned long
-rb_RSTRING_LEN(VALUE str)
-{
-    return RSTRING_LEN(str);
-}
-
-char *
-rb_RSTRING_PTR(VALUE str)
-{
-    return RSTRING_PTR(str);
-}
-
 rb_proc_t *
 rb_yjit_get_proc_ptr(VALUE procv)
 {
@@ -477,121 +445,8 @@ rb_yjit_get_proc_ptr(VALUE procv)
 // Bindgen's temp/anon name isn't guaranteed stable.
 typedef struct rb_iseq_param_keyword rb_seq_param_keyword_struct;
 
-const char *
-rb_insn_name(VALUE insn)
-{
-    return insn_name(insn);
-}
-
-unsigned int
-rb_vm_ci_argc(const struct rb_callinfo *ci)
-{
-    return vm_ci_argc(ci);
-}
-
-ID
-rb_vm_ci_mid(const struct rb_callinfo *ci)
-{
-    return vm_ci_mid(ci);
-}
-
-unsigned int
-rb_vm_ci_flag(const struct rb_callinfo *ci)
-{
-    return vm_ci_flag(ci);
-}
-
-const struct rb_callinfo_kwarg *
-rb_vm_ci_kwarg(const struct rb_callinfo *ci)
-{
-    return vm_ci_kwarg(ci);
-}
-
-int
-rb_get_cikw_keyword_len(const struct rb_callinfo_kwarg *cikw)
-{
-    return cikw->keyword_len;
-}
-
-VALUE
-rb_get_cikw_keywords_idx(const struct rb_callinfo_kwarg *cikw, int idx)
-{
-    return cikw->keywords[idx];
-}
-
-rb_method_visibility_t
-rb_METHOD_ENTRY_VISI(const rb_callable_method_entry_t *me)
-{
-    return METHOD_ENTRY_VISI(me);
-}
-
-rb_method_type_t
-rb_get_cme_def_type(const rb_callable_method_entry_t *cme)
-{
-    if (UNDEFINED_METHOD_ENTRY_P(cme)) {
-        return VM_METHOD_TYPE_UNDEF;
-    }
-    else {
-        return cme->def->type;
-    }
-}
-
-ID
-rb_get_cme_def_body_attr_id(const rb_callable_method_entry_t *cme)
-{
-    return cme->def->body.attr.id;
-}
-
 ID rb_get_symbol_id(VALUE namep);
 
-enum method_optimized_type
-rb_get_cme_def_body_optimized_type(const rb_callable_method_entry_t *cme)
-{
-    return cme->def->body.optimized.type;
-}
-
-unsigned int
-rb_get_cme_def_body_optimized_index(const rb_callable_method_entry_t *cme)
-{
-    return cme->def->body.optimized.index;
-}
-
-rb_method_cfunc_t *
-rb_get_cme_def_body_cfunc(const rb_callable_method_entry_t *cme)
-{
-    return UNALIGNED_MEMBER_PTR(cme->def, body.cfunc);
-}
-
-uintptr_t
-rb_get_def_method_serial(const rb_method_definition_t *def)
-{
-    return def->method_serial;
-}
-
-ID
-rb_get_def_original_id(const rb_method_definition_t *def)
-{
-    return def->original_id;
-}
-
-int
-rb_get_mct_argc(const rb_method_cfunc_t *mct)
-{
-    return mct->argc;
-}
-
-void *
-rb_get_mct_func(const rb_method_cfunc_t *mct)
-{
-    return (void*)mct->func; // this field is defined as type VALUE (*func)(ANYARGS)
-}
-
-const rb_iseq_t *
-rb_get_def_iseq_ptr(rb_method_definition_t *def)
-{
-    return def_iseq_ptr(def);
-}
-
 VALUE
 rb_get_def_bmethod_proc(rb_method_definition_t *def)
 {
@@ -599,126 +454,6 @@ rb_get_def_bmethod_proc(rb_method_definition_t *def)
     return def->body.bmethod.proc;
 }
 
-const rb_iseq_t *
-rb_get_iseq_body_local_iseq(const rb_iseq_t *iseq)
-{
-    return iseq->body->local_iseq;
-}
-
-const rb_iseq_t *
-rb_get_iseq_body_parent_iseq(const rb_iseq_t *iseq)
-{
-    return iseq->body->parent_iseq;
-}
-
-unsigned int
-rb_get_iseq_body_local_table_size(const rb_iseq_t *iseq)
-{
-    return iseq->body->local_table_size;
-}
-
-VALUE *
-rb_get_iseq_body_iseq_encoded(const rb_iseq_t *iseq)
-{
-    return iseq->body->iseq_encoded;
-}
-
-unsigned
-rb_get_iseq_body_stack_max(const rb_iseq_t *iseq)
-{
-    return iseq->body->stack_max;
-}
-
-bool
-rb_get_iseq_flags_has_lead(const rb_iseq_t *iseq)
-{
-    return iseq->body->param.flags.has_lead;
-}
-
-bool
-rb_get_iseq_flags_has_opt(const rb_iseq_t *iseq)
-{
-    return iseq->body->param.flags.has_opt;
-}
-
-bool
-rb_get_iseq_flags_has_kw(const rb_iseq_t *iseq)
-{
-    return iseq->body->param.flags.has_kw;
-}
-
-bool
-rb_get_iseq_flags_has_post(const rb_iseq_t *iseq)
-{
-    return iseq->body->param.flags.has_post;
-}
-
-bool
-rb_get_iseq_flags_has_kwrest(const rb_iseq_t *iseq)
-{
-    return iseq->body->param.flags.has_kwrest;
-}
-
-bool
-rb_get_iseq_flags_has_rest(const rb_iseq_t *iseq)
-{
-    return iseq->body->param.flags.has_rest;
-}
-
-bool
-rb_get_iseq_flags_ruby2_keywords(const rb_iseq_t *iseq)
-{
-    return iseq->body->param.flags.ruby2_keywords;
-}
-
-bool
-rb_get_iseq_flags_has_block(const rb_iseq_t *iseq)
-{
-    return iseq->body->param.flags.has_block;
-}
-
-bool
-rb_get_iseq_flags_ambiguous_param0(const rb_iseq_t *iseq)
-{
-    return iseq->body->param.flags.ambiguous_param0;
-}
-
-bool
-rb_get_iseq_flags_accepts_no_kwarg(const rb_iseq_t *iseq)
-{
-    return iseq->body->param.flags.accepts_no_kwarg;
-}
-
-const rb_seq_param_keyword_struct *
-rb_get_iseq_body_param_keyword(const rb_iseq_t *iseq)
-{
-    return iseq->body->param.keyword;
-}
-
-unsigned
-rb_get_iseq_body_param_size(const rb_iseq_t *iseq)
-{
-    return iseq->body->param.size;
-}
-
-int
-rb_get_iseq_body_param_lead_num(const rb_iseq_t *iseq)
-{
-    return iseq->body->param.lead_num;
-}
-
-int
-rb_get_iseq_body_param_opt_num(const rb_iseq_t *iseq)
-{
-    return iseq->body->param.opt_num;
-}
-
-const VALUE *
-rb_get_iseq_body_param_opt_table(const rb_iseq_t *iseq)
-{
-    return iseq->body->param.opt_table;
-}
-
 VALUE
 rb_optimized_call(VALUE *recv, rb_execution_context_t *ec, int argc, VALUE *argv, int kw_splat, VALUE block_handler)
 {
@@ -733,15 +468,17 @@ rb_yjit_iseq_builtin_attrs(const rb_iseq_t *iseq)
     return iseq->body->builtin_attrs;
 }
 
-// If true, the iseq has only opt_invokebuiltin_delegate_leave and leave insns.
+// If true, the iseq has only opt_invokebuiltin_delegate(_leave) and leave insns.
 static bool
 invokebuiltin_delegate_leave_p(const rb_iseq_t *iseq)
 {
-    unsigned int invokebuiltin_len = insn_len(BIN(opt_invokebuiltin_delegate_leave));
-    unsigned int leave_len = insn_len(BIN(leave));
-    return iseq->body->iseq_size == (invokebuiltin_len + leave_len) &&
-        rb_vm_insn_addr2opcode((void *)iseq->body->iseq_encoded[0]) == BIN(opt_invokebuiltin_delegate_leave) &&
-        rb_vm_insn_addr2opcode((void *)iseq->body->iseq_encoded[invokebuiltin_len]) == BIN(leave);
+    int insn1 = rb_vm_insn_addr2opcode((void *)iseq->body->iseq_encoded[0]);
+    if ((int)iseq->body->iseq_size != insn_len(insn1) + insn_len(BIN(leave))) {
+        return false;
+    }
+    int insn2 = rb_vm_insn_addr2opcode((void *)iseq->body->iseq_encoded[insn_len(insn1)]);
+    return (insn1 == BIN(opt_invokebuiltin_delegate) || insn1 == BIN(opt_invokebuiltin_delegate_leave)) &&
+            insn2 == BIN(leave);
 }
 
 // Return an rb_builtin_function if the iseq contains only that builtin function.
@@ -762,30 +499,6 @@ rb_yjit_str_simple_append(VALUE str1, VALUE str2)
     return rb_str_cat(str1, RSTRING_PTR(str2), RSTRING_LEN(str2));
 }
 
-struct rb_control_frame_struct *
-rb_get_ec_cfp(const rb_execution_context_t *ec)
-{
-    return ec->cfp;
-}
-
-const rb_iseq_t *
-rb_get_cfp_iseq(struct rb_control_frame_struct *cfp)
-{
-    return cfp->iseq;
-}
-
-VALUE *
-rb_get_cfp_pc(struct rb_control_frame_struct *cfp)
-{
-    return (VALUE*)cfp->pc;
-}
-
-VALUE *
-rb_get_cfp_sp(struct rb_control_frame_struct *cfp)
-{
-    return cfp->sp;
-}
-
 void
 rb_set_cfp_pc(struct rb_control_frame_struct *cfp, const VALUE *pc)
 {
@@ -798,44 +511,8 @@ rb_set_cfp_sp(struct rb_control_frame_struct *cfp, VALUE *sp)
     cfp->sp = sp;
 }
 
-rb_iseq_t *
-rb_cfp_get_iseq(struct rb_control_frame_struct *cfp)
-{
-    // TODO(alan) could assert frame type here to make sure that it's a ruby frame with an iseq.
-    return (rb_iseq_t*)cfp->iseq;
-}
-
-VALUE
-rb_get_cfp_self(struct rb_control_frame_struct *cfp)
-{
-    return cfp->self;
-}
-
-VALUE *
-rb_get_cfp_ep(struct rb_control_frame_struct *cfp)
-{
-    return (VALUE*)cfp->ep;
-}
-
-const VALUE *
-rb_get_cfp_ep_level(struct rb_control_frame_struct *cfp, uint32_t lv)
-{
-    uint32_t i;
-    const VALUE *ep = (VALUE*)cfp->ep;
-    for (i = 0; i < lv; i++) {
-        ep = VM_ENV_PREV_EP(ep);
-    }
-    return ep;
-}
-
 extern VALUE *rb_vm_base_ptr(struct rb_control_frame_struct *cfp);
 
-VALUE
-rb_yarv_class_of(VALUE obj)
-{
-    return rb_class_of(obj);
-}
-
 // YJIT needs this function to never allocate and never raise
 VALUE
 rb_yarv_str_eql_internal(VALUE str1, VALUE str2)
@@ -850,13 +527,6 @@ rb_str_neq_internal(VALUE str1, VALUE str2)
     return rb_str_eql_internal(str1, str2) == Qtrue ? Qfalse : Qtrue;
 }
 
-// YJIT needs this function to never allocate and never raise
-VALUE
-rb_yarv_ary_entry_internal(VALUE ary, long offset)
-{
-    return rb_ary_entry_internal(ary, offset);
-}
-
 extern VALUE rb_ary_unshift_m(int argc, VALUE *argv, VALUE ary);
 
 VALUE
@@ -878,10 +548,60 @@ rb_yjit_fix_mod_fix(VALUE recv, VALUE obj)
     return rb_fix_mod_fix(recv, obj);
 }
 
+// Return non-zero when `obj` is an array and its last item is a
+// `ruby2_keywords` hash. We don't support this kind of splat.
+size_t
+rb_yjit_ruby2_keywords_splat_p(VALUE obj)
+{
+    if (!RB_TYPE_P(obj, T_ARRAY)) return 0;
+    long len = RARRAY_LEN(obj);
+    if (len == 0) return 0;
+    VALUE last = RARRAY_AREF(obj, len - 1);
+    if (!RB_TYPE_P(last, T_HASH)) return 0;
+    return FL_TEST_RAW(last, RHASH_PASS_AS_KEYWORDS);
+}
+
+// Checks to establish preconditions for rb_yjit_splat_varg_cfunc()
 VALUE
-rb_yjit_fix_mul_fix(VALUE recv, VALUE obj)
+rb_yjit_splat_varg_checks(VALUE *sp, VALUE splat_array, rb_control_frame_t *cfp)
 {
-    return rb_fix_mul_fix(recv, obj);
+    // We inserted a T_ARRAY guard before this call
+    long len = RARRAY_LEN(splat_array);
+
+    // Large splat arrays need a separate allocation
+    if (len < 0 || len > VM_ARGC_STACK_MAX) return Qfalse;
+
+    // Would we overflow if we put the contents of the array onto the stack?
+    if (sp + len > (VALUE *)(cfp - 2)) return Qfalse;
+
+    // Reject keywords hash since that requires duping it sometimes
+    if (len > 0) {
+        VALUE last_hash = RARRAY_AREF(splat_array, len - 1);
+        if (RB_TYPE_P(last_hash, T_HASH) &&
+                FL_TEST_RAW(last_hash, RHASH_PASS_AS_KEYWORDS)) {
+            return Qfalse;
+        }
+    }
+
+    return Qtrue;
+}
+
+// Push array elements to the stack for a C method that has a variable number
+// of parameters. Returns the number of arguments the splat array contributes.
+int
+rb_yjit_splat_varg_cfunc(VALUE *stack_splat_array)
+{
+    VALUE splat_array = *stack_splat_array;
+    int len;
+
+    // We already checked that length fits in `int`
+    RUBY_ASSERT(RB_TYPE_P(splat_array, T_ARRAY));
+    len = (int)RARRAY_LEN(splat_array);
+
+    // Push the contents of the array onto the stack
+    MEMCPY(stack_splat_array, RARRAY_CONST_PTR(splat_array), VALUE, len);
+
+    return len;
 }
 
 // Print the Ruby source location of some ISEQ for debugging purposes
@@ -895,31 +615,28 @@ rb_yjit_dump_iseq_loc(const rb_iseq_t *iseq, uint32_t insn_idx)
     fprintf(stderr, "%s %.*s:%u\n", __func__, (int)len, ptr, rb_iseq_line_no(iseq, insn_idx));
 }
 
-// The FL_TEST() macro
-VALUE
-rb_FL_TEST(VALUE obj, VALUE flags)
-{
-    return RB_FL_TEST(obj, flags);
-}
-
-// The FL_TEST_RAW() macro, normally an internal implementation detail
-VALUE
-rb_FL_TEST_RAW(VALUE obj, VALUE flags)
+// Get the number of digits required to print an integer
+static int
+num_digits(int integer)
 {
-    return FL_TEST_RAW(obj, flags);
+    int num = 1;
+    while (integer /= 10) {
+        num++;
+    }
+    return num;
 }
 
-// The RB_TYPE_P macro
-bool
-rb_RB_TYPE_P(VALUE obj, enum ruby_value_type t)
+// Allocate a C string that formats an ISEQ label like iseq_inspect()
+char *
+rb_yjit_iseq_inspect(const rb_iseq_t *iseq)
 {
-    return RB_TYPE_P(obj, t);
-}
+    const char *label = RSTRING_PTR(iseq->body->location.label);
+    const char *path = RSTRING_PTR(rb_iseq_path(iseq));
+    int lineno = iseq->body->location.code_location.beg_pos.lineno;
 
-long
-rb_RSTRUCT_LEN(VALUE st)
-{
-    return RSTRUCT_LEN(st);
+    char *buf = ZALLOC_N(char, strlen(label) + strlen(path) + num_digits(lineno) + 3);
+    sprintf(buf, "%s@%s:%d", label, path, lineno);
+    return buf;
 }
 
 // There are RSTRUCT_SETs in ruby/internal/core/rstruct.h and internal/struct.h
@@ -931,24 +648,6 @@ rb_RSTRUCT_SET(VALUE st, int k, VALUE v)
     RSTRUCT_SET(st, k, v);
 }
 
-const struct rb_callinfo *
-rb_get_call_data_ci(const struct rb_call_data *cd)
-{
-    return cd->ci;
-}
-
-bool
-rb_BASIC_OP_UNREDEFINED_P(enum ruby_basic_operators bop, uint32_t klass)
-{
-    return BASIC_OP_UNREDEFINED_P(bop, klass);
-}
-
-VALUE
-rb_RCLASS_ORIGIN(VALUE c)
-{
-    return RCLASS_ORIGIN(c);
-}
-
 // Return the string encoding index
 int
 rb_ENCODING_GET(VALUE obj)
@@ -962,25 +661,10 @@ rb_yjit_multi_ractor_p(void)
     return rb_multi_ractor_p();
 }
 
-// For debug builds
-void
-rb_assert_iseq_handle(VALUE handle)
-{
-    RUBY_ASSERT_ALWAYS(rb_objspace_markable_object_p(handle));
-    RUBY_ASSERT_ALWAYS(IMEMO_TYPE_P(handle, imemo_iseq));
-}
-
-int
-rb_IMEMO_TYPE_P(VALUE imemo, enum imemo_type imemo_type)
-{
-    return IMEMO_TYPE_P(imemo, imemo_type);
-}
-
-void
-rb_assert_cme_handle(VALUE handle)
+bool
+rb_yjit_constcache_shareable(const struct iseq_inline_constant_cache_entry *ice)
 {
-    RUBY_ASSERT_ALWAYS(rb_objspace_markable_object_p(handle));
-    RUBY_ASSERT_ALWAYS(IMEMO_TYPE_P(handle, imemo_ment));
+    return (ice->flags & IMEMO_CONST_CACHE_SHAREABLE) != 0;
 }
 
 // Used for passing a callback and other data over rb_objspace_each_objects
@@ -996,8 +680,8 @@ for_each_iseq_i(void *vstart, void *vend, size_t stride, void *data)
     const struct iseq_callback_data *callback_data = (struct iseq_callback_data *)data;
     VALUE v = (VALUE)vstart;
     for (; v != (VALUE)vend; v += stride) {
-        void *ptr = asan_poisoned_object_p(v);
-        asan_unpoison_object(v, false);
+        void *ptr = rb_asan_poisoned_object_p(v);
+        rb_asan_unpoison_object(v, false);
 
         if (rb_obj_is_iseq(v)) {
             rb_iseq_t *iseq = (rb_iseq_t *)v;
@@ -1048,21 +732,20 @@ rb_yjit_vm_unlock(unsigned int *recursive_lock_level, const char *file, int line
 void
 rb_yjit_compile_iseq(const rb_iseq_t *iseq, rb_execution_context_t *ec, bool jit_exception)
 {
-    RB_VM_LOCK_ENTER();
-    rb_vm_barrier();
-
-    // Compile a block version starting at the current instruction
-    uint8_t *rb_yjit_iseq_gen_entry_point(const rb_iseq_t *iseq, rb_execution_context_t *ec, bool jit_exception); // defined in Rust
-    uint8_t *code_ptr = rb_yjit_iseq_gen_entry_point(iseq, ec, jit_exception);
+    RB_VM_LOCKING() {
+        rb_vm_barrier();
 
-    if (jit_exception) {
-        iseq->body->jit_exception = (rb_jit_func_t)code_ptr;
-    }
-    else {
-        iseq->body->jit_entry = (rb_jit_func_t)code_ptr;
-    }
+        // Compile a block version starting at the current instruction
+        uint8_t *rb_yjit_iseq_gen_entry_point(const rb_iseq_t *iseq, rb_execution_context_t *ec, bool jit_exception); // defined in Rust
+        uintptr_t code_ptr = (uintptr_t)rb_yjit_iseq_gen_entry_point(iseq, ec, jit_exception);
 
-    RB_VM_LOCK_LEAVE();
+        if (jit_exception) {
+            iseq->body->jit_exception = (rb_jit_func_t)code_ptr;
+        }
+        else {
+            iseq->body->jit_entry = (rb_jit_func_t)code_ptr;
+        }
+}
 }
 
 // GC root for interacting with the GC
@@ -1070,58 +753,44 @@ struct yjit_root_struct {
     bool unused; // empty structs are not legal in C99
 };
 
-static void
-yjit_root_free(void *ptr)
+// For dealing with refinements
+void
+rb_yjit_invalidate_all_method_lookup_assumptions(void)
 {
-    // Do nothing. The root lives as long as the process.
+    // It looks like Module#using actually doesn't need to invalidate all the
+    // method caches, so we do nothing here for now.
 }
 
-static size_t
-yjit_root_memsize(const void *ptr)
+// Number of object shapes, which might be useful for investigating YJIT exit reasons.
+VALUE
+rb_object_shape_count(void)
 {
-    // Count off-gc-heap allocation size of the dependency table
-    return 0; // TODO: more accurate accounting
+    // next_shape_id starts from 0, so it's the same as the count
+    return ULONG2NUM((unsigned long)rb_shapes_count());
 }
 
-// GC callback during compaction
-static void
-yjit_root_update_references(void *ptr)
+bool
+rb_yjit_shape_too_complex_p(shape_id_t shape_id)
 {
-    // Do nothing since we use rb_gc_mark(), which pins.
+    return rb_shape_too_complex_p(shape_id);
 }
 
-void rb_yjit_root_mark(void *ptr); // in Rust
-
-// Custom type for interacting with the GC
-// TODO: make this write barrier protected
-static const rb_data_type_t yjit_root_type = {
-    "yjit_root",
-    {rb_yjit_root_mark, yjit_root_free, yjit_root_memsize, yjit_root_update_references},
-    0, 0, RUBY_TYPED_FREE_IMMEDIATELY
-};
-
-// For dealing with refinements
-void
-rb_yjit_invalidate_all_method_lookup_assumptions(void)
+bool
+rb_yjit_shape_obj_too_complex_p(VALUE obj)
 {
-    // It looks like Module#using actually doesn't need to invalidate all the
-    // method caches, so we do nothing here for now.
+    return rb_shape_obj_too_complex_p(obj);
 }
 
-// Number of object shapes, which might be useful for investigating YJIT exit reasons.
-static VALUE
-object_shape_count(rb_execution_context_t *ec, VALUE self)
+attr_index_t
+rb_yjit_shape_capacity(shape_id_t shape_id)
 {
-    // next_shape_id starts from 0, so it's the same as the count
-    return ULONG2NUM((unsigned long)GET_SHAPE_TREE()->next_shape_id);
+    return RSHAPE_CAPACITY(shape_id);
 }
 
-// Assert that we have the VM lock. Relevant mostly for multi ractor situations.
-// The GC takes the lock before calling us, and this asserts that it indeed happens.
-void
-rb_yjit_assert_holding_vm_lock(void)
+attr_index_t
+rb_yjit_shape_index(shape_id_t shape_id)
 {
-    ASSERT_vm_locking();
+    return RSHAPE_INDEX(shape_id);
 }
 
 // The number of stack slots that vm_sendish() pops for send and invokesuper.
@@ -1170,29 +839,27 @@ rb_yjit_set_exception_return(rb_control_frame_t *cfp, void *leave_exit, void *le
 // Primitives used by yjit.rb
 VALUE rb_yjit_stats_enabled_p(rb_execution_context_t *ec, VALUE self);
 VALUE rb_yjit_print_stats_p(rb_execution_context_t *ec, VALUE self);
+VALUE rb_yjit_log_enabled_p(rb_execution_context_t *c, VALUE self);
+VALUE rb_yjit_print_log_p(rb_execution_context_t *c, VALUE self);
 VALUE rb_yjit_trace_exit_locations_enabled_p(rb_execution_context_t *ec, VALUE self);
-VALUE rb_yjit_get_stats(rb_execution_context_t *ec, VALUE self, VALUE context);
+VALUE rb_yjit_get_stats(rb_execution_context_t *ec, VALUE self, VALUE key);
 VALUE rb_yjit_reset_stats_bang(rb_execution_context_t *ec, VALUE self);
+VALUE rb_yjit_get_log(rb_execution_context_t *ec, VALUE self);
 VALUE rb_yjit_disasm_iseq(rb_execution_context_t *ec, VALUE self, VALUE iseq);
 VALUE rb_yjit_insns_compiled(rb_execution_context_t *ec, VALUE self, VALUE iseq);
 VALUE rb_yjit_code_gc(rb_execution_context_t *ec, VALUE self);
 VALUE rb_yjit_simulate_oom_bang(rb_execution_context_t *ec, VALUE self);
 VALUE rb_yjit_get_exit_locations(rb_execution_context_t *ec, VALUE self);
-VALUE rb_yjit_resume(rb_execution_context_t *ec, VALUE self);
+VALUE rb_yjit_enable(rb_execution_context_t *ec, VALUE self, VALUE gen_stats, VALUE print_stats, VALUE gen_compilation_log, VALUE print_compilation_log, VALUE mem_size, VALUE call_threshold);
+VALUE rb_yjit_c_builtin_p(rb_execution_context_t *ec, VALUE self);
+
+// Allow YJIT_C_BUILTIN macro to force --yjit-c-builtin
+#ifdef YJIT_C_BUILTIN
+static VALUE yjit_c_builtin_p(rb_execution_context_t *ec, VALUE self) { return Qtrue; }
+#else
+#define yjit_c_builtin_p rb_yjit_c_builtin_p
+#endif
 
 // Preprocessed yjit.rb generated during build
 #include "yjit.rbinc"
 
-// Can raise RuntimeError
-void
-rb_yjit_init(void)
-{
-    // Call the Rust initialization code
-    void rb_yjit_init_rust(void);
-    rb_yjit_init_rust();
-
-    // Initialize the GC hooks. Do this second as some code depend on Rust initialization.
-    struct yjit_root_struct *root;
-    VALUE yjit_root = TypedData_Make_Struct(0, struct yjit_root_struct, &yjit_root_type, root);
-    rb_gc_register_mark_object(yjit_root);
-}
diff --git a/yjit.h b/yjit.h
index d54bd7e0eab386..cb96ee78382c63 100644
--- a/yjit.h
+++ b/yjit.h
@@ -25,45 +25,57 @@
 #endif
 
 // Expose these as declarations since we are building YJIT.
-bool rb_yjit_enabled_p(void);
-bool rb_yjit_compile_new_iseqs(void);
-bool rb_yjit_threshold_hit(const rb_iseq_t *const iseq, unsigned long total_calls);
+extern uint64_t rb_yjit_call_threshold;
+extern uint64_t rb_yjit_cold_threshold;
+extern uint64_t rb_yjit_live_iseq_count;
+extern uint64_t rb_yjit_iseq_alloc_count;
+extern bool rb_yjit_enabled_p;
+void rb_yjit_incr_counter(const char *counter_name);
 void rb_yjit_invalidate_all_method_lookup_assumptions(void);
 void rb_yjit_cme_invalidate(rb_callable_method_entry_t *cme);
 void rb_yjit_collect_binding_alloc(void);
 void rb_yjit_collect_binding_set(void);
 void rb_yjit_compile_iseq(const rb_iseq_t *iseq, rb_execution_context_t *ec, bool jit_exception);
-void rb_yjit_init(void);
+void rb_yjit_init(bool yjit_enabled);
+void rb_yjit_free_at_exit(void);
 void rb_yjit_bop_redefined(int redefined_flag, enum ruby_basic_operators bop);
 void rb_yjit_constant_state_changed(ID id);
 void rb_yjit_iseq_mark(void *payload);
-void rb_yjit_iseq_update_references(void *payload);
-void rb_yjit_iseq_free(void *payload);
+void rb_yjit_iseq_update_references(const rb_iseq_t *iseq);
+void rb_yjit_iseq_free(const rb_iseq_t *iseq);
 void rb_yjit_before_ractor_spawn(void);
 void rb_yjit_constant_ic_update(const rb_iseq_t *const iseq, IC ic, unsigned insn_idx);
 void rb_yjit_tracing_invalidate_all(void);
+void rb_yjit_show_usage(int help, int highlight, unsigned int width, int columns);
+void rb_yjit_lazy_push_frame(const VALUE *pc);
+void rb_yjit_invalidate_no_singleton_class(VALUE klass);
+void rb_yjit_invalidate_ep_is_bp(const rb_iseq_t *iseq);
+void rb_yjit_mark_all_writeable(void);
+void rb_yjit_mark_all_executable(void);
 
 #else
 // !USE_YJIT
 // In these builds, YJIT could never be turned on. Provide dummy implementations.
 
-static inline bool rb_yjit_enabled_p(void) { return false; }
-static inline bool rb_yjit_compile_new_iseqs(void) { return false; }
-static inline bool rb_yjit_threshold_hit(const rb_iseq_t *const iseq, unsigned long total_calls) { return false; }
+#define rb_yjit_enabled_p false
+static inline void rb_yjit_incr_counter(const char *counter_name) {}
 static inline void rb_yjit_invalidate_all_method_lookup_assumptions(void) {}
 static inline void rb_yjit_cme_invalidate(rb_callable_method_entry_t *cme) {}
 static inline void rb_yjit_collect_binding_alloc(void) {}
 static inline void rb_yjit_collect_binding_set(void) {}
 static inline void rb_yjit_compile_iseq(const rb_iseq_t *iseq, rb_execution_context_t *ec, bool jit_exception) {}
-static inline void rb_yjit_init(void) {}
+static inline void rb_yjit_init(bool yjit_enabled) {}
 static inline void rb_yjit_bop_redefined(int redefined_flag, enum ruby_basic_operators bop) {}
 static inline void rb_yjit_constant_state_changed(ID id) {}
 static inline void rb_yjit_iseq_mark(void *payload) {}
-static inline void rb_yjit_iseq_update_references(void *payload) {}
-static inline void rb_yjit_iseq_free(void *payload) {}
+static inline void rb_yjit_iseq_update_references(const rb_iseq_t *iseq) {}
+static inline void rb_yjit_iseq_free(const rb_iseq_t *iseq) {}
 static inline void rb_yjit_before_ractor_spawn(void) {}
 static inline void rb_yjit_constant_ic_update(const rb_iseq_t *const iseq, IC ic, unsigned insn_idx) {}
 static inline void rb_yjit_tracing_invalidate_all(void) {}
+static inline void rb_yjit_lazy_push_frame(const VALUE *pc) {}
+static inline void rb_yjit_invalidate_no_singleton_class(VALUE klass) {}
+static inline void rb_yjit_invalidate_ep_is_bp(const rb_iseq_t *iseq) {}
 
 #endif // #if USE_YJIT
 
diff --git a/yjit.rb b/yjit.rb
index 57c4efff8b896d..e8ba3cdd28752a 100644
--- a/yjit.rb
+++ b/yjit.rb
@@ -1,44 +1,78 @@
 # frozen_string_literal: true
+# :markup: markdown
 
-# This module allows for introspection of YJIT, CRuby's in-process
-# just-in-time compiler. This module exists only to help develop YJIT, as such,
-# everything in the module is highly implementation specific and comes with no
-# API stability guarantee whatsoever.
+# This module allows for introspection of \YJIT, CRuby's just-in-time compiler.
+# Everything in the module is highly implementation specific and the API might
+# be less stable compared to the standard library.
 #
-# This module may not exist if YJIT does not support the particular platform
-# for which CRuby is built. There is also no API stability guarantee as to in
-# what situations this module is defined.
+# This module may not exist if \YJIT does not support the particular platform
+# for which CRuby is built.
 module RubyVM::YJIT
-  # Check if YJIT is enabled
+  # Check if \YJIT is enabled.
   def self.enabled?
-    Primitive.cexpr! 'RBOOL(rb_yjit_enabled_p())'
+    Primitive.cexpr! 'RBOOL(rb_yjit_enabled_p)'
   end
 
-  # Check if --yjit-stats is used.
+  # Check if `--yjit-stats` is used.
   def self.stats_enabled?
     Primitive.rb_yjit_stats_enabled_p
   end
 
+  # Check if `--yjit-log` is used.
+  def self.log_enabled?
+    Primitive.rb_yjit_log_enabled_p
+  end
+
   # Check if rb_yjit_trace_exit_locations_enabled_p is enabled.
-  def self.trace_exit_locations_enabled?
+  def self.trace_exit_locations_enabled? # :nodoc:
     Primitive.rb_yjit_trace_exit_locations_enabled_p
   end
 
-  # Discard statistics collected for --yjit-stats.
+  # Discard statistics collected for `--yjit-stats`.
   def self.reset_stats!
     Primitive.rb_yjit_reset_stats_bang
   end
 
-  # Resume YJIT compilation after paused on startup with --yjit-pause
-  def self.resume
-    Primitive.rb_yjit_resume
+  # Enable \YJIT compilation. `stats` option decides whether to enable \YJIT stats or not. `log` decides
+  # whether to enable \YJIT compilation logging or not. Optional `mem_size` and `call_threshold` can be
+  # provided to override default configuration.
+  #
+  # * `stats`:
+  #     * `false`: Don't enable stats.
+  #     * `true`: Enable stats. Print stats at exit.
+  #     * `:quiet`: Enable stats. Do not print stats at exit.
+  # * `log`:
+  #     * `false`: Don't enable the log.
+  #     * `true`: Enable the log. Print log at exit.
+  #     * `:quiet`: Enable the log. Do not print log at exit.
+  def self.enable(stats: false, log: false, mem_size: nil, call_threshold: nil)
+    return false if enabled?
+
+    if Primitive.cexpr! 'RBOOL(rb_zjit_enabled_p)'
+      warn("Only one JIT can be enabled at the same time.")
+      return false
+    end
+
+    if mem_size
+      raise ArgumentError, "mem_size must be a Integer" unless mem_size.is_a?(Integer)
+      raise ArgumentError, "mem_size must be between 1 and 2048 MB" unless (1..2048).include?(mem_size)
+    end
+
+    if call_threshold
+      raise ArgumentError, "call_threshold must be a Integer" unless call_threshold.is_a?(Integer)
+      raise ArgumentError, "call_threshold must be a positive integer" unless call_threshold.positive?
+    end
+
+    at_exit { print_and_dump_stats } if stats
+    call_yjit_hooks
+    Primitive.rb_yjit_enable(stats, stats != :quiet, log, log != :quiet, mem_size, call_threshold)
   end
 
   # If --yjit-trace-exits is enabled parse the hashes from
   # Primitive.rb_yjit_get_exit_locations into a format readable
   # by Stackprof. This will allow us to find the exact location of a
   # side exit in YJIT based on the instruction that is exiting.
-  def self.exit_locations
+  def self.exit_locations # :nodoc:
     return unless trace_exit_locations_enabled?
 
     results = Primitive.rb_yjit_get_exit_locations
@@ -130,13 +164,13 @@ def self.exit_locations
   #
   # In a script call:
   #
-  #   at_exit do
-  #     RubyVM::YJIT.dump_exit_locations("my_file.dump")
-  #   end
+  #     at_exit do
+  #       RubyVM::YJIT.dump_exit_locations("my_file.dump")
+  #     end
   #
   # Then run the file with the following options:
   #
-  #   ruby --yjit --yjit-trace-exits test.rb
+  #     ruby --yjit --yjit-trace-exits test.rb
   #
   # Once the code is done running, use Stackprof to read the dump file.
   # See Stackprof documentation for options.
@@ -148,41 +182,18 @@ def self.dump_exit_locations(filename)
     File.binwrite(filename, Marshal.dump(RubyVM::YJIT.exit_locations))
   end
 
-  # Return a hash for statistics generated for the --yjit-stats command line option.
-  # Return nil when option is not passed or unavailable.
-  def self.runtime_stats(context: false)
-    stats = Primitive.rb_yjit_get_stats(context)
-    return stats if stats.nil?
+  # Return a hash for statistics generated for the `--yjit-stats` command line option.
+  # Return `nil` when option is not passed or unavailable.
+  # If a symbol argument is provided, return only the value for the named stat.
+  # If any other type is provided, raises TypeError.
+  def self.runtime_stats(key = nil)
+    raise TypeError, "non-symbol given" unless key.nil? || Symbol === key
 
-    stats[:object_shape_count] = Primitive.object_shape_count
-    return stats unless Primitive.rb_yjit_stats_enabled_p
-
-    side_exits = total_exit_count(stats)
-    total_exits = side_exits + stats[:leave_interp_return]
-
-    # Number of instructions that finish executing in YJIT.
-    # See :count-placement: about the subtraction.
-    retired_in_yjit = stats[:yjit_insns_count] - side_exits
-
-    # Average length of instruction sequences executed by YJIT
-    avg_len_in_yjit = total_exits > 0 ? retired_in_yjit.to_f / total_exits : 0
-
-    # Proportion of instructions that retire in YJIT
-    total_insns_count = retired_in_yjit + stats[:vm_insns_count]
-    yjit_ratio_pct = 100.0 * retired_in_yjit.to_f / total_insns_count
-    stats[:total_insns_count] = total_insns_count
-    stats[:ratio_in_yjit] = yjit_ratio_pct
-
-    # Make those stats available in RubyVM::YJIT.runtime_stats as well
-    stats[:side_exit_count]  = side_exits
-    stats[:total_exit_count] = total_exits
-    stats[:avg_len_in_yjit]  = avg_len_in_yjit
-
-    stats
+    Primitive.rb_yjit_get_stats(key)
   end
 
   # Format and print out counters as a String. This returns a non-empty
-  # content only when --yjit-stats is enabled.
+  # content only when `--yjit-stats` is enabled.
   def self.stats_string
     # Lazily require StringIO to avoid breaking miniruby
     require 'stringio'
@@ -191,22 +202,46 @@ def self.stats_string
     strio.string
   end
 
-  # Produce disassembly for an iseq
-  def self.disasm(iseq)
+  # Return an array of log entries.
+  # Return `nil` when option is not passed or unavailable.
+  def self.log
+    return nil unless log_enabled?
+
+    Primitive.rb_yjit_get_log.map do |timestamp, path|
+      [Time.at(timestamp), path]
+    end
+  end
+
+  # Produce disassembly for an iseq. This requires a `--enable-yjit=dev` build.
+  def self.disasm(iseq) # :nodoc:
     # If a method or proc is passed in, get its iseq
     iseq = RubyVM::InstructionSequence.of(iseq)
 
-    if self.enabled?
-      # Produce the disassembly string
-      # Include the YARV iseq disasm in the string for additional context
-      iseq.disasm + "\n" + Primitive.rb_yjit_disasm_iseq(iseq)
-    else
-      iseq.disasm
+    if !self.enabled?
+      warn(
+        "YJIT needs to be enabled to produce disasm output, e.g.\n" +
+        "ruby --yjit-call-threshold=1 my_script.rb (see doc/yjit/yjit.md)"
+      )
+      return nil
     end
+
+    disasm_str = Primitive.rb_yjit_disasm_iseq(iseq)
+
+    if !disasm_str
+      warn(
+        "YJIT disasm is only available when YJIT is built in dev mode, i.e.\n" +
+        "./configure --enable-yjit=dev (see doc/yjit/yjit.md)\n"
+      )
+      return nil
+    end
+
+    # Produce the disassembly string
+    # Include the YARV iseq disasm in the string for additional context
+    iseq.disasm + "\n" + disasm_str
   end
 
   # Produce a list of instructions compiled by YJIT for an iseq
-  def self.insns_compiled(iseq)
+  def self.insns_compiled(iseq) # :nodoc:
     return nil unless self.enabled?
 
     # If a method or proc is passed in, get its iseq
@@ -214,7 +249,8 @@ def self.insns_compiled(iseq)
     Primitive.rb_yjit_insns_compiled(iseq)
   end
 
-  # Free and recompile all existing JIT code
+  # Discard existing compiled code to reclaim memory
+  # and allow for recompilations in the future.
   def self.code_gc
     Primitive.rb_yjit_code_gc
   end
@@ -223,18 +259,38 @@ def self.simulate_oom! # :nodoc:
     Primitive.rb_yjit_simulate_oom_bang
   end
 
-  # Avoid calling a method here to not interfere with compilation tests
+  # Avoid calling a Ruby method here to not interfere with compilation tests
   if Primitive.rb_yjit_stats_enabled_p
-    at_exit do
+    at_exit { print_and_dump_stats }
+  end
+
+  # Blocks that are called when YJIT is enabled
+  @yjit_hooks = []
+
+  class << self
+    # :stopdoc:
+    private
+
+    # Register a block to be called when YJIT is enabled
+    def add_yjit_hook(hook)
+      @yjit_hooks << hook
+    end
+
+    # Run YJIT hooks registered by RubyVM::YJIT.with_yjit
+    def call_yjit_hooks
+      # Skip using builtin methods in Ruby if --yjit-c-builtin is given
+      return if Primitive.yjit_c_builtin_p
+      @yjit_hooks.each(&:call)
+      @yjit_hooks.clear
+    end
+
+    # Print stats and dump exit locations
+    def print_and_dump_stats # :nodoc:
       if Primitive.rb_yjit_print_stats_p
         _print_stats
       end
       _dump_locations
     end
-  end
-
-  class << self
-    private
 
     def _dump_locations # :nodoc:
       return unless trace_exit_locations_enabled?
@@ -245,30 +301,56 @@ def _dump_locations # :nodoc:
       $stderr.puts("YJIT exit locations dumped to `#{filename}`.")
     end
 
-    # Format and print out counters
-    def _print_stats(out: $stderr) # :nodoc:
-      stats = runtime_stats(context: true)
-      return unless Primitive.rb_yjit_stats_enabled_p
-
-      out.puts("***YJIT: Printing YJIT statistics on exit***")
-
+    # Print a summary of reasons for adverse performance events (e.g. exits)
+    def _print_stats_reasons(stats, out) # :nodoc:
       print_counters(stats, out: out, prefix: 'send_', prompt: 'method call fallback reasons: ')
       print_counters(stats, out: out, prefix: 'invokeblock_', prompt: 'invokeblock fallback reasons: ')
       print_counters(stats, out: out, prefix: 'invokesuper_', prompt: 'invokesuper fallback reasons: ')
       print_counters(stats, out: out, prefix: 'guard_send_', prompt: 'method call exit reasons: ')
       print_counters(stats, out: out, prefix: 'guard_invokeblock_', prompt: 'invokeblock exit reasons: ')
       print_counters(stats, out: out, prefix: 'guard_invokesuper_', prompt: 'invokesuper exit reasons: ')
-      print_counters(stats, out: out, prefix: 'leave_', prompt: 'leave exit reasons: ')
       print_counters(stats, out: out, prefix: 'gbpp_', prompt: 'getblockparamproxy exit reasons: ')
       print_counters(stats, out: out, prefix: 'getivar_', prompt: 'getinstancevariable exit reasons:')
       print_counters(stats, out: out, prefix: 'setivar_', prompt: 'setinstancevariable exit reasons:')
-      print_counters(stats, out: out, prefix: 'definedivar_', prompt: 'definedivar exit reasons:')
-      print_counters(stats, out: out, prefix: 'opt_aref_', prompt: 'opt_aref exit reasons: ')
-      print_counters(stats, out: out, prefix: 'opt_aref_with_', prompt: 'opt_aref_with exit reasons: ')
-      print_counters(stats, out: out, prefix: 'expandarray_', prompt: 'expandarray exit reasons: ')
-      print_counters(stats, out: out, prefix: 'lshift_', prompt: 'left shift (ltlt) exit reasons: ')
-      print_counters(stats, out: out, prefix: 'opt_getconstant_path_', prompt: 'opt_getconstant_path exit reasons: ')
+      %w[
+        branchif
+        branchnil
+        branchunless
+        definedivar
+        expandarray
+        invokebuiltin
+        jump
+        leave
+        objtostring
+        opt_aref
+        opt_aref_with
+        opt_aset
+        opt_case_dispatch
+        opt_div
+        opt_getconstant_path
+        opt_minus
+        opt_mod
+        opt_mult
+        opt_plus
+        opt_succ
+        setlocal
+        splatkw
+      ].each do |insn|
+        print_counters(stats, out: out, prefix: "#{insn}_", prompt: "#{insn} exit reasons:", optional: true)
+      end
+      print_counters(stats, out: out, prefix: 'lshift_', prompt: 'left shift (opt_ltlt) exit reasons: ')
+      print_counters(stats, out: out, prefix: 'rshift_', prompt: 'right shift (>>) exit reasons: ')
       print_counters(stats, out: out, prefix: 'invalidate_', prompt: 'invalidation reasons: ')
+    end
+
+    # Format and print out counters
+    def _print_stats(out: $stderr) # :nodoc:
+      stats = runtime_stats()
+      return unless Primitive.rb_yjit_stats_enabled_p
+
+      out.puts("***YJIT: Printing YJIT statistics on exit***")
+
+      _print_stats_reasons(stats, out)
 
       # Number of failed compiler invocations
       compilation_failure = stats[:compilation_failure]
@@ -278,18 +360,28 @@ def _print_stats(out: $stderr) # :nodoc:
       out.puts "num_send:              " + format_number(13, stats[:num_send])
       out.puts "num_send_known_class:  " + format_number_pct(13, stats[:num_send_known_class], stats[:num_send])
       out.puts "num_send_polymorphic:  " + format_number_pct(13, stats[:num_send_polymorphic], stats[:num_send])
-      out.puts "num_send_megamorphic:  " + format_number_pct(13, stats[:num_send_megamorphic], stats[:num_send])
+      out.puts "num_send_megamorphic:  " + format_number_pct(13, stats[:send_megamorphic], stats[:num_send])
       out.puts "num_send_dynamic:      " + format_number_pct(13, stats[:num_send_dynamic], stats[:num_send])
+      out.puts "num_send_cfunc:        " + format_number_pct(13, stats[:num_send_cfunc], stats[:num_send])
+      out.puts "num_send_cfunc_inline: " + format_number_pct(13, stats[:num_send_cfunc_inline], stats[:num_send_cfunc])
+      out.puts "num_send_iseq:         " + format_number_pct(13, stats[:num_send_iseq], stats[:num_send])
+      out.puts "num_send_iseq_leaf:    " + format_number_pct(13, stats[:num_send_iseq_leaf], stats[:num_send_iseq])
+      out.puts "num_send_iseq_inline:  " + format_number_pct(13, stats[:num_send_iseq_inline], stats[:num_send_iseq])
       if stats[:num_send_x86_rel32] != 0 || stats[:num_send_x86_reg] != 0
         out.puts "num_send_x86_rel32:    " + format_number(13,  stats[:num_send_x86_rel32])
         out.puts "num_send_x86_reg:      " + format_number(13, stats[:num_send_x86_reg])
       end
-      out.puts "num_getivar_megamorphic: " + format_number(13, stats[:num_getivar_megamorphic])
-      out.puts "num_setivar_megamorphic: " + format_number(13, stats[:num_setivar_megamorphic])
+      out.puts "num_getivar_megamorphic: " + format_number(11, stats[:num_getivar_megamorphic])
+      out.puts "num_setivar_megamorphic: " + format_number(11, stats[:num_setivar_megamorphic])
+      out.puts "num_opt_case_megamorphic: " + format_number(10, stats[:num_opt_case_dispatch_megamorphic])
       out.puts "num_throw:             " + format_number(13, stats[:num_throw])
       out.puts "num_throw_break:       " + format_number_pct(13, stats[:num_throw_break], stats[:num_throw])
       out.puts "num_throw_retry:       " + format_number_pct(13, stats[:num_throw_retry], stats[:num_throw])
       out.puts "num_throw_return:      " + format_number_pct(13, stats[:num_throw_return], stats[:num_throw])
+      out.puts "num_lazy_frame_check:  " + format_number(13, stats[:num_lazy_frame_check])
+      out.puts "num_lazy_frame_push:   " + format_number_pct(13, stats[:num_lazy_frame_push], stats[:num_lazy_frame_check])
+      out.puts "lazy_frame_count:      " + format_number(13, stats[:lazy_frame_count])
+      out.puts "lazy_frame_failure:    " + format_number(13, stats[:lazy_frame_failure])
 
       out.puts "iseq_stack_too_large:  " + format_number(13, stats[:iseq_stack_too_large])
       out.puts "iseq_too_long:         " + format_number(13, stats[:iseq_too_long])
@@ -299,14 +391,23 @@ def _print_stats(out: $stderr) # :nodoc:
       out.puts "bindings_allocations:  " + format_number(13, stats[:binding_allocations])
       out.puts "bindings_set:          " + format_number(13, stats[:binding_set])
       out.puts "compilation_failure:   " + format_number(13, compilation_failure) if compilation_failure != 0
+      out.puts "live_iseq_count:       " + format_number(13, stats[:live_iseq_count])
+      out.puts "iseq_alloc_count:      " + format_number(13, stats[:iseq_alloc_count])
       out.puts "compiled_iseq_entry:   " + format_number(13, stats[:compiled_iseq_entry])
+      out.puts "cold_iseq_entry:       " + format_number_pct(13, stats[:cold_iseq_entry], stats[:compiled_iseq_entry] + stats[:cold_iseq_entry])
       out.puts "compiled_iseq_count:   " + format_number(13, stats[:compiled_iseq_count])
       out.puts "compiled_blockid_count:" + format_number(13, stats[:compiled_blockid_count])
       out.puts "compiled_block_count:  " + format_number(13, stats[:compiled_block_count])
+      out.puts "inline_block_count:    " + format_number_pct(13, stats[:inline_block_count], stats[:compiled_block_count])
+      out.puts "deleted_defer_block_count:" + format_number_pct(10, stats[:deleted_defer_block_count], stats[:compiled_block_count])
       if stats[:compiled_blockid_count] != 0
         out.puts "versions_per_block:    " + format_number(13, "%4.3f" % (stats[:compiled_block_count].fdiv(stats[:compiled_blockid_count])))
       end
+      out.puts "max_inline_versions:   " + format_number(13, stats[:max_inline_versions])
       out.puts "compiled_branch_count: " + format_number(13, stats[:compiled_branch_count])
+
+      out.puts "yjit_active_ms:        " + format_number(13, stats[:yjit_active_ns] / 10**6)
+      out.puts "compile_time_ms:       " + format_number_pct(13, stats[:compile_time_ns] / 10**6 , stats[:yjit_active_ns] / 10**6)
       out.puts "block_next_count:      " + format_number(13, stats[:block_next_count])
       out.puts "defer_count:           " + format_number(13, stats[:defer_count])
       out.puts "defer_empty_count:     " + format_number(13, stats[:defer_empty_count])
@@ -316,7 +417,6 @@ def _print_stats(out: $stderr) # :nodoc:
 
       out.puts "freed_iseq_count:      " + format_number(13, stats[:freed_iseq_count])
       out.puts "invalidation_count:    " + format_number(13, stats[:invalidation_count])
-      out.puts "constant_state_bumps:  " + format_number(13, stats[:constant_state_bumps])
       out.puts "inline_code_size:      " + format_number(13, stats[:inline_code_size])
       out.puts "outlined_code_size:    " + format_number(13, stats[:outlined_code_size])
       out.puts "code_region_size:      " + format_number(13, stats[:code_region_size])
@@ -324,8 +424,14 @@ def _print_stats(out: $stderr) # :nodoc:
 
       out.puts "freed_code_size:       " + format_number(13, stats[:freed_code_size])
       out.puts "yjit_alloc_size:       " + format_number(13, stats[:yjit_alloc_size]) if stats.key?(:yjit_alloc_size)
-      out.puts "live_context_size:     " + format_number(13, stats[:live_context_size])
-      out.puts "live_context_count:    " + format_number(13, stats[:live_context_count])
+
+      bytes_per_context = stats[:context_data_bytes].fdiv(stats[:num_contexts_encoded])
+      out.puts "context_data_bytes:    " + format_number(13, stats[:context_data_bytes])
+      out.puts "context_cache_bytes:   " + format_number(13, stats[:context_cache_bytes])
+      out.puts "num_contexts_encoded:  " + format_number(13, stats[:num_contexts_encoded])
+      out.puts "bytes_per_context:     " + ("%13.2f" % bytes_per_context)
+      out.puts "context_cache_hit_rate:" + format_number_pct(13, stats[:context_cache_hits], stats[:num_contexts_encoded])
+
       out.puts "live_page_count:       " + format_number(13, stats[:live_page_count])
       out.puts "freed_page_count:      " + format_number(13, stats[:freed_page_count])
       out.puts "code_gc_count:         " + format_number(13, stats[:code_gc_count])
@@ -333,17 +439,40 @@ def _print_stats(out: $stderr) # :nodoc:
       out.puts "object_shape_count:    " + format_number(13, stats[:object_shape_count])
       out.puts "side_exit_count:       " + format_number(13, stats[:side_exit_count])
       out.puts "total_exit_count:      " + format_number(13, stats[:total_exit_count])
-      out.puts "total_insns_count:     " + format_number(13, stats[:total_insns_count])
-      out.puts "vm_insns_count:        " + format_number(13, stats[:vm_insns_count])
+      out.puts "total_insns_count:     " + format_number(13, stats[:total_insns_count]) if stats[:total_insns_count]
+      out.puts "vm_insns_count:        " + format_number(13, stats[:vm_insns_count]) if stats[:vm_insns_count]
       out.puts "yjit_insns_count:      " + format_number(13, stats[:yjit_insns_count])
-      out.puts "ratio_in_yjit:         " + ("%12.1f" % stats[:ratio_in_yjit]) + "%"
+      out.puts "ratio_in_yjit:         " + ("%12.1f" % stats[:ratio_in_yjit]) + "%" if stats[:ratio_in_yjit]
       out.puts "avg_len_in_yjit:       " + ("%13.1f" % stats[:avg_len_in_yjit])
 
       print_sorted_exit_counts(stats, out: out, prefix: "exit_")
+
+      print_sorted_method_calls(stats[:cfunc_calls], stats[:num_send_cfunc], out: out, type: 'C')
+      print_sorted_method_calls(stats[:iseq_calls], stats[:num_send_iseq], out: out, type: 'ISEQ')
+    end
+
+    def print_sorted_method_calls(calls, num_calls, out:, type:, how_many: 20, left_pad: 4) # :nodoc:
+      return if calls.empty?
+
+      # Sort calls by decreasing frequency and keep the top N
+      pairs = calls.map { |k,v| [k, v] }
+      pairs.sort_by! {|pair| -pair[1] }
+      pairs = pairs[0...how_many]
+
+      top_n_total = pairs.sum { |name, count| count }
+      top_n_pct = 100.0 * top_n_total / num_calls
+
+      out.puts "Top-#{pairs.size} most frequent #{type} calls (#{"%.1f" % top_n_pct}% of #{type} calls):"
+
+      count_width = format_number(0, pairs[0][1]).length
+      pairs.each do |name, count|
+        padded_count = format_number_pct(count_width, count, num_calls)
+        out.puts("  #{padded_count}: #{name}")
+      end
     end
 
     def print_sorted_exit_counts(stats, out:, prefix:, how_many: 20, left_pad: 4) # :nodoc:
-      total_exits = total_exit_count(stats)
+      total_exits = stats[:side_exit_count]
 
       if total_exits > 0
         exits = []
@@ -360,35 +489,29 @@ def print_sorted_exit_counts(stats, out:, prefix:, how_many: 20, left_pad: 4) #
 
         out.puts "Top-#{exits.size} most frequent exit ops (#{"%.1f" % top_n_exit_pct}% of exits):"
 
-        longest_insn_name_len = exits.max_by { |name, count| name.length }.first.length
+        count_width = format_number(0, exits[0][1]).length
         exits.each do |name, count|
-          padding = longest_insn_name_len + left_pad
-          padded_name = "%#{padding}s" % name
-          padded_count = format_number_pct(10, count, total_exits)
-          out.puts("#{padded_name}: #{padded_count}")
+          padded_count = format_number_pct(count_width, count, total_exits)
+          out.puts("  #{padded_count}: #{name}")
         end
       else
-        out.puts "total_exits:           " + format_number(10, total_exits)
+        out.puts "total_exits:           " + format_number(13, total_exits)
       end
     end
 
-    def total_exit_count(stats, prefix: "exit_") # :nodoc:
-      total = 0
-      stats.each do |k,v|
-        total += v if k.start_with?(prefix)
-      end
-      total
-    end
-
-    def print_counters(counters, out:, prefix:, prompt:) # :nodoc:
-      out.puts(prompt)
+    def print_counters(counters, out:, prefix:, prompt:, optional: false) # :nodoc:
       counters = counters.filter { |key, _| key.start_with?(prefix) }
       counters.filter! { |_, value| value != 0 }
       counters.transform_keys! { |key| key.to_s.delete_prefix(prefix) }
 
       if counters.empty?
-        out.puts("    (all relevant counters are zero)")
+        unless optional
+          out.puts(prompt)
+          out.puts("    (all relevant counters are zero)")
+        end
         return
+      else
+        out.puts(prompt)
       end
 
       counters = counters.to_a
@@ -404,20 +527,26 @@ def print_counters(counters, out:, prefix:, prompt:) # :nodoc:
     end
 
     # Format large numbers with comma separators for readability
-    def format_number(pad, number)
-      integer, decimal = number.to_s.split(".")
-      d_groups = integer.chars.to_a.reverse.each_slice(3)
-      with_commas = d_groups.map(&:join).join(',').reverse
-      formatted = [with_commas, decimal].compact.join(".")
-      formatted.rjust(pad, ' ')
+    def format_number(pad, number) # :nodoc:
+      s = number.to_s
+      i = s.index('.') || s.size
+      s.insert(i -= 3, ',') while i > 3
+      s.rjust(pad, ' ')
     end
 
     # Format a number along with a percentage over a total value
-    def format_number_pct(pad, number, total)
+    def format_number_pct(pad, number, total) # :nodoc:
       padded_count = format_number(pad, number)
-      percentage = number.fdiv(total) * 100
-      formatted_pct = "%4.1f%%" % percentage
-      "#{padded_count} (#{formatted_pct})"
+
+      if total != 0
+        percentage = number.fdiv(total) * 100
+        formatted_pct = "%4.1f%%" % percentage
+        "#{padded_count} (#{formatted_pct})"
+      else
+        "#{padded_count}"
+      end
     end
+
+    # :startdoc:
   end
 end
diff --git a/yjit/Cargo.lock b/yjit/Cargo.lock
index 08ae1bd487fa84..8b6ac398065192 100644
--- a/yjit/Cargo.lock
+++ b/yjit/Cargo.lock
@@ -4,9 +4,9 @@ version = 3
 
 [[package]]
 name = "capstone"
-version = "0.10.0"
+version = "0.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "66b5d1f14c3539b6ff22fcb602fea5f1c4416148c8b7965a2e74860aa169b7b5"
+checksum = "015ef5d5ca1743e3f94af9509ba6bd2886523cfee46e48d15c2ef5216fd4ac9a"
 dependencies = [
  "capstone-sys",
  "libc",
@@ -14,9 +14,9 @@ dependencies = [
 
 [[package]]
 name = "capstone-sys"
-version = "0.14.0"
+version = "0.17.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "df653a22d0ad34b0d91cc92a6289d96e44aac1c9a96250a094c9aeec4a91084f"
+checksum = "2267cb8d16a1e4197863ec4284ffd1aec26fe7e57c58af46b02590a0235809a0"
 dependencies = [
  "cc",
  "libc",
@@ -34,16 +34,9 @@ version = "0.2.124"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "21a41fed9d98f27ab1c6d161da622a4fa35e8a54a8adc24bbf3ddd0ef70b0e50"
 
-[[package]]
-name = "stats_alloc"
-version = "0.1.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c0e04424e733e69714ca1bbb9204c1a57f09f5493439520f9f68c132ad25eec"
-
 [[package]]
 name = "yjit"
 version = "0.1.0"
 dependencies = [
  "capstone",
- "stats_alloc",
 ]
diff --git a/yjit/Cargo.toml b/yjit/Cargo.toml
index 8cd593e4eea3ec..ad7dd35ecfb173 100644
--- a/yjit/Cargo.toml
+++ b/yjit/Cargo.toml
@@ -9,41 +9,18 @@ edition = "2021"        # Rust 2021 edition to compile with
 rust-version = "1.58.0" # Minimally supported rust version
 publish = false         # Don't publish to crates.io
 
-[lib]
-crate-type = ["staticlib"]
-
 [dependencies]
 # No required dependencies to simplify build process. TODO: Link to yet to be
 # written rationale. Optional For development and testing purposes
-capstone = { version = "0.10.0", optional = true }
-stats_alloc = { version = "0.1.10", optional = true }
+capstone = { version = "0.13.0", optional = true }
 
-[features]
 # NOTE: Development builds select a set of these via configure.ac
 # For debugging, `make V=1` shows exact cargo invocation.
+[features]
+# Support --yjit-dump-disasm and RubyVM::YJIT.disasm using libcapstone.
 disasm = ["capstone"]
-stats = ["stats_alloc"]
-
-[profile.dev]
-opt-level = 0
-debug = true
-debug-assertions = true
-overflow-checks = true
-
-[profile.dev_nodebug]
-inherits = "dev"
-
-[profile.stats]
-inherits = "release"
-
-[profile.release]
-# NOTE: --enable-yjit builds use `rustc` without going through Cargo. You
-# might want to update the `rustc` invocation if you change this profile.
-opt-level = 3
-# The extra robustness that comes from checking for arithmetic overflow is
-# worth the performance cost for the compiler.
-overflow-checks = true
-# Generate debug info
-debug = true
-# Use ThinLTO. Much smaller output for a small amount of build time increase.
-lto = "thin"
+# Modify generated code for runtime checks, e.g. poison value in PC
+# for C method calls, and stack canary. This is managed separately
+# from cfg!(debug_assertions) so that we can see disasm of the code
+# that would run in the release mode.
+runtime_checks = []
diff --git a/yjit/bindgen/Cargo.lock b/yjit/bindgen/Cargo.lock
index 445ebfcddd1bcc..a58a7365991fc5 100644
--- a/yjit/bindgen/Cargo.lock
+++ b/yjit/bindgen/Cargo.lock
@@ -1,55 +1,90 @@
 # This file is automatically @generated by Cargo.
 # It is not intended for manual editing.
-version = 3
+version = 4
 
 [[package]]
 name = "aho-corasick"
-version = "0.7.20"
+version = "1.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cc936419f96fa211c1b9166887b38e5e40b19958e5b895be7c1f93adec7071ac"
+checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916"
 dependencies = [
  "memchr",
 ]
 
+[[package]]
+name = "anstream"
+version = "0.6.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "64e15c1ab1f89faffbf04a634d5e1962e9074f2741eef6d97f3c4e322426d526"
+dependencies = [
+ "anstyle",
+ "anstyle-parse",
+ "anstyle-query",
+ "anstyle-wincon",
+ "colorchoice",
+ "is_terminal_polyfill",
+ "utf8parse",
+]
+
+[[package]]
+name = "anstyle"
+version = "1.0.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1bec1de6f59aedf83baf9ff929c98f2ad654b97c9510f4e70cf6f661d49fd5b1"
+
+[[package]]
+name = "anstyle-parse"
+version = "0.2.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "eb47de1e80c2b463c735db5b217a0ddc39d612e7ac9e2e96a5aed1f57616c1cb"
+dependencies = [
+ "utf8parse",
+]
+
+[[package]]
+name = "anstyle-query"
+version = "1.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6d36fc52c7f6c869915e99412912f22093507da8d9e942ceaf66fe4b7c14422a"
+dependencies = [
+ "windows-sys",
+]
+
+[[package]]
+name = "anstyle-wincon"
+version = "3.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5bf74e1b6e971609db8ca7a9ce79fd5768ab6ae46441c572e46cf596f59e57f8"
+dependencies = [
+ "anstyle",
+ "windows-sys",
+]
+
 [[package]]
 name = "bindgen"
-version = "0.63.0"
+version = "0.70.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "36d860121800b2a9a94f9b5604b332d5cffb234ce17609ea479d723dbc9d3885"
+checksum = "f49d8fed880d473ea71efb9bf597651e77201bdd4893efe54c9e5d65ae04ce6f"
 dependencies = [
- "bitflags 1.3.2",
+ "bitflags",
  "cexpr",
  "clang-sys",
- "lazy_static",
- "lazycell",
+ "itertools",
  "log",
- "peeking_take_while",
+ "prettyplease",
  "proc-macro2",
  "quote",
  "regex",
  "rustc-hash",
  "shlex",
  "syn",
- "which",
 ]
 
 [[package]]
 name = "bitflags"
-version = "1.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
-
-[[package]]
-name = "bitflags"
-version = "2.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "630be753d4e58660abd17930c71b647fe46c27ea6b63cc59e1e3851406972e42"
-
-[[package]]
-name = "cc"
-version = "1.0.79"
+version = "2.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f"
+checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de"
 
 [[package]]
 name = "cexpr"
@@ -68,9 +103,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
 
 [[package]]
 name = "clang-sys"
-version = "1.4.0"
+version = "1.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa2e27ae6ab525c3d369ded447057bca5438d86dc3a68f6faafb8269ba82ebf3"
+checksum = "0b023947811758c97c59bf9d1c188fd619ad4718dcaa767947df1cadb14f39f4"
 dependencies = [
  "glob",
  "libc",
@@ -78,56 +113,45 @@ dependencies = [
 ]
 
 [[package]]
-name = "either"
-version = "1.8.0"
+name = "colorchoice"
+version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "90e5c1c8368803113bf0c9584fc495a58b86dc8a29edbf8fe877d21d9507e797"
+checksum = "d3fd119d74b830634cea2a0f58bbd0d54540518a14397557951e79340abc28c0"
 
 [[package]]
-name = "env_logger"
-version = "0.10.0"
+name = "either"
+version = "1.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "85cdab6a89accf66733ad5a1693a4dcced6aeff64602b634530dd73c1f3ee9f0"
-dependencies = [
- "humantime",
- "is-terminal",
- "log",
- "regex",
- "termcolor",
-]
+checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0"
 
 [[package]]
-name = "errno"
-version = "0.3.1"
+name = "env_filter"
+version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4bcfec3a70f97c962c307b2d2c56e358cf1d00b558d74262b5f929ee8cc7e73a"
+checksum = "4f2c92ceda6ceec50f43169f9ee8424fe2db276791afde7b2cd8bc084cb376ab"
 dependencies = [
- "errno-dragonfly",
- "libc",
- "windows-sys",
+ "log",
+ "regex",
 ]
 
 [[package]]
-name = "errno-dragonfly"
-version = "0.1.2"
+name = "env_logger"
+version = "0.11.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf"
+checksum = "e13fa619b91fb2381732789fc5de83b45675e882f66623b7d8cb4f643017018d"
 dependencies = [
- "cc",
- "libc",
+ "anstream",
+ "anstyle",
+ "env_filter",
+ "humantime",
+ "log",
 ]
 
 [[package]]
 name = "glob"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574"
-
-[[package]]
-name = "hermit-abi"
 version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fed44880c466736ef9a5c5b5facefb5ed0785676d0c02d612db14e54f0d84286"
+checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b"
 
 [[package]]
 name = "humantime"
@@ -136,64 +160,47 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4"
 
 [[package]]
-name = "is-terminal"
-version = "0.4.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "24fddda5af7e54bf7da53067d6e802dbcc381d0a8eef629df528e3ebf68755cb"
-dependencies = [
- "hermit-abi",
- "rustix",
- "windows-sys",
-]
-
-[[package]]
-name = "lazy_static"
-version = "1.4.0"
+name = "is_terminal_polyfill"
+version = "1.70.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
+checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf"
 
 [[package]]
-name = "lazycell"
-version = "1.3.0"
+name = "itertools"
+version = "0.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55"
+checksum = "413ee7dfc52ee1a4949ceeb7dbc8a33f2d6c088194d9f922fb8318faf1f01186"
+dependencies = [
+ "either",
+]
 
 [[package]]
 name = "libc"
-version = "0.2.147"
+version = "0.2.161"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3"
+checksum = "8e9489c2807c139ffd9c1794f4af0ebe86a828db53ecdc7fea2111d0fed085d1"
 
 [[package]]
 name = "libloading"
-version = "0.7.4"
+version = "0.8.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f"
+checksum = "4979f22fdb869068da03c9f7528f8297c6fd2606bc3a4affe42e6a823fdb8da4"
 dependencies = [
  "cfg-if",
- "winapi",
+ "windows-targets",
 ]
 
-[[package]]
-name = "linux-raw-sys"
-version = "0.4.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "09fc20d2ca12cb9f044c93e3bd6d32d523e6e2ec3db4f7b2939cd99026ecd3f0"
-
 [[package]]
 name = "log"
-version = "0.4.17"
+version = "0.4.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e"
-dependencies = [
- "cfg-if",
-]
+checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24"
 
 [[package]]
 name = "memchr"
-version = "2.5.0"
+version = "2.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d"
+checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3"
 
 [[package]]
 name = "minimal-lexical"
@@ -203,49 +210,59 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
 
 [[package]]
 name = "nom"
-version = "7.1.1"
+version = "7.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a8903e5a29a317527874d0402f867152a3d21c908bb0b933e416c65e301d4c36"
+checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a"
 dependencies = [
  "memchr",
  "minimal-lexical",
 ]
 
 [[package]]
-name = "once_cell"
-version = "1.16.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "86f0b0d4bf799edbc74508c1e8bf170ff5f41238e5f8225603ca7caaae2b7860"
-
-[[package]]
-name = "peeking_take_while"
-version = "0.1.2"
+name = "prettyplease"
+version = "0.2.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099"
+checksum = "479cf940fbbb3426c32c5d5176f62ad57549a0bb84773423ba8be9d089f5faba"
+dependencies = [
+ "proc-macro2",
+ "syn",
+]
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.47"
+version = "1.0.88"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5ea3d908b0e36316caf9e9e2c4625cdde190a7e6f440d794667ed17a1855e725"
+checksum = "7c3a7fc5db1e57d5a779a352c8cdb57b29aa4c40cc69c3a68a7fedc815fbf2f9"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.21"
+version = "1.0.37"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bbe448f377a7d6961e30f5955f9b8d106c3f5e449d493ee1b125c1d43c2b5179"
+checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af"
 dependencies = [
  "proc-macro2",
 ]
 
 [[package]]
 name = "regex"
-version = "1.7.0"
+version = "1.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "38200e5ee88914975b69f657f0801b6f6dccafd44fd9326302a4aaeecfacb1d8"
+dependencies = [
+ "aho-corasick",
+ "memchr",
+ "regex-automata",
+ "regex-syntax",
+]
+
+[[package]]
+name = "regex-automata"
+version = "0.4.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e076559ef8e241f2ae3479e36f97bd5741c0330689e217ad51ce2c76808b868a"
+checksum = "368758f23274712b504848e9d5a6f010445cc8b87a7cdb4d7cbee666c1288da3"
 dependencies = [
  "aho-corasick",
  "memchr",
@@ -254,9 +271,9 @@ dependencies = [
 
 [[package]]
 name = "regex-syntax"
-version = "0.6.28"
+version = "0.8.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "456c603be3e8d448b072f410900c09faf164fbce2d480456f50eea6e25f9c848"
+checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c"
 
 [[package]]
 name = "rustc-hash"
@@ -264,111 +281,54 @@ version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2"
 
-[[package]]
-name = "rustix"
-version = "0.38.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aabcb0461ebd01d6b79945797c27f8529082226cb630a9865a71870ff63532a4"
-dependencies = [
- "bitflags 2.3.3",
- "errno",
- "libc",
- "linux-raw-sys",
- "windows-sys",
-]
-
 [[package]]
 name = "shlex"
-version = "1.1.0"
+version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43b2853a4d09f215c24cc5489c992ce46052d359b5109343cbafbf26bc62f8a3"
+checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
 
 [[package]]
 name = "syn"
-version = "1.0.105"
+version = "2.0.79"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "60b9b43d45702de4c839cb9b51d9f529c5dd26a4aff255b42b1ebc03e88ee908"
+checksum = "89132cd0bf050864e1d38dc3bbc07a0eb8e7530af26344d3d2bbbef83499f590"
 dependencies = [
  "proc-macro2",
  "quote",
  "unicode-ident",
 ]
 
-[[package]]
-name = "termcolor"
-version = "1.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bab24d30b911b2376f3a13cc2cd443142f0c81dda04c118693e35b3835757755"
-dependencies = [
- "winapi-util",
-]
-
 [[package]]
 name = "unicode-ident"
-version = "1.0.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6ceab39d59e4c9499d4e5a8ee0e2735b891bb7308ac83dfb4e80cad195c9f6f3"
-
-[[package]]
-name = "which"
-version = "4.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1c831fbbee9e129a8cf93e7747a82da9d95ba8e16621cae60ec2cdc849bacb7b"
-dependencies = [
- "either",
- "libc",
- "once_cell",
-]
-
-[[package]]
-name = "winapi"
-version = "0.3.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
-dependencies = [
- "winapi-i686-pc-windows-gnu",
- "winapi-x86_64-pc-windows-gnu",
-]
-
-[[package]]
-name = "winapi-i686-pc-windows-gnu"
-version = "0.4.0"
+version = "1.0.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
+checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe"
 
 [[package]]
-name = "winapi-util"
-version = "0.1.5"
+name = "utf8parse"
+version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178"
-dependencies = [
- "winapi",
-]
-
-[[package]]
-name = "winapi-x86_64-pc-windows-gnu"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
+checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821"
 
 [[package]]
 name = "windows-sys"
-version = "0.48.0"
+version = "0.52.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9"
+checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
 dependencies = [
  "windows-targets",
 ]
 
 [[package]]
 name = "windows-targets"
-version = "0.48.1"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "05d4b17490f70499f20b9e791dcf6a299785ce8af4d709018206dc5b4953e95f"
+checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973"
 dependencies = [
  "windows_aarch64_gnullvm",
  "windows_aarch64_msvc",
  "windows_i686_gnu",
+ "windows_i686_gnullvm",
  "windows_i686_msvc",
  "windows_x86_64_gnu",
  "windows_x86_64_gnullvm",
@@ -377,45 +337,51 @@ dependencies = [
 
 [[package]]
 name = "windows_aarch64_gnullvm"
-version = "0.48.0"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc"
+checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3"
 
 [[package]]
 name = "windows_aarch64_msvc"
-version = "0.48.0"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3"
+checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469"
 
 [[package]]
 name = "windows_i686_gnu"
-version = "0.48.0"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b"
+
+[[package]]
+name = "windows_i686_gnullvm"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241"
+checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66"
 
 [[package]]
 name = "windows_i686_msvc"
-version = "0.48.0"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00"
+checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66"
 
 [[package]]
 name = "windows_x86_64_gnu"
-version = "0.48.0"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1"
+checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78"
 
 [[package]]
 name = "windows_x86_64_gnullvm"
-version = "0.48.0"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953"
+checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d"
 
 [[package]]
 name = "windows_x86_64_msvc"
-version = "0.48.0"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a"
+checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
 
 [[package]]
 name = "yjit-bindgen"
diff --git a/yjit/bindgen/Cargo.toml b/yjit/bindgen/Cargo.toml
index a85c04cf0e99c3..ba695e0ce62f6b 100644
--- a/yjit/bindgen/Cargo.toml
+++ b/yjit/bindgen/Cargo.toml
@@ -6,5 +6,7 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-bindgen = "0.63.0"
-env_logger = "0.10.0"
+bindgen = "0.70.1"
+env_logger = "0.11.5"
+
+[workspace]
diff --git a/yjit/bindgen/src/main.rs b/yjit/bindgen/src/main.rs
index baa71fc6cf3fc0..a0446ad17b6a91 100644
--- a/yjit/bindgen/src/main.rs
+++ b/yjit/bindgen/src/main.rs
@@ -38,6 +38,7 @@ fn main() {
         .clang_args(filtered_clang_args)
         .header("encindex.h")
         .header("internal.h")
+        .header("internal/object.h")
         .header("internal/re.h")
         .header("include/ruby/ruby.h")
         .header("shape.h")
@@ -46,6 +47,7 @@ fn main() {
 
         // Our C file for glue code
         .header(src_root.join("yjit.c").to_str().unwrap())
+        .header(src_root.join("jit.c").to_str().unwrap())
 
         // Don't want to copy over C comment
         .generate_comments(false)
@@ -60,9 +62,6 @@ fn main() {
         .blocklist_type("size_t")
         .blocklist_type("fpos_t")
 
-        // Prune these types since they are system dependant and we don't use them
-        .blocklist_type("__.*")
-
         // Import YARV bytecode instruction constants
         .allowlist_type("ruby_vminsn_type")
 
@@ -95,16 +94,15 @@ fn main() {
         .allowlist_function("rb_bug")
 
         // From shape.h
-        .allowlist_function("rb_shape_get_shape_id")
-        .allowlist_function("rb_shape_get_shape_by_id")
+        .allowlist_function("rb_obj_shape_id")
         .allowlist_function("rb_shape_id_offset")
         .allowlist_function("rb_shape_get_iv_index")
-        .allowlist_function("rb_shape_get_next")
-        .allowlist_function("rb_shape_id")
-        .allowlist_function("rb_shape_transition_shape_capa")
-        .allowlist_function("rb_shape_obj_too_complex")
+        .allowlist_function("rb_shape_transition_add_ivar_no_warnings")
+        .allowlist_function("rb_yjit_shape_obj_too_complex_p")
+        .allowlist_function("rb_yjit_shape_too_complex_p")
+        .allowlist_function("rb_yjit_shape_capacity")
+        .allowlist_function("rb_yjit_shape_index")
         .allowlist_var("SHAPE_ID_NUM_BITS")
-        .allowlist_var("OBJ_TOO_COMPLEX_SHAPE_ID")
 
         // From ruby/internal/intern/object.h
         .allowlist_function("rb_obj_is_kind_of")
@@ -120,6 +118,7 @@ fn main() {
         .allowlist_function("rb_hash_new_with_size")
         .allowlist_function("rb_hash_resurrect")
         .allowlist_function("rb_hash_stlike_foreach")
+        .allowlist_function("rb_to_hash_type")
 
         // From include/ruby/st.h
         .allowlist_type("st_retval")
@@ -134,6 +133,7 @@ fn main() {
         .allowlist_function("rb_ary_new_capa")
         .allowlist_function("rb_ary_store")
         .allowlist_function("rb_ary_resurrect")
+        .allowlist_function("rb_ary_cat")
         .allowlist_function("rb_ary_clear")
         .allowlist_function("rb_ary_dup")
         .allowlist_function("rb_ary_push")
@@ -168,10 +168,12 @@ fn main() {
         .allowlist_var("rb_cIO")
         .allowlist_var("rb_cSymbol")
         .allowlist_var("rb_cFloat")
+        .allowlist_var("rb_cNumeric")
         .allowlist_var("rb_cString")
         .allowlist_var("rb_cThread")
         .allowlist_var("rb_cArray")
         .allowlist_var("rb_cHash")
+        .allowlist_var("rb_cClass")
 
         // From include/ruby/internal/fl_type.h
         .allowlist_type("ruby_fl_type")
@@ -195,8 +197,6 @@ fn main() {
         .allowlist_type("rb_call_data")
         .blocklist_type("rb_callcache.*")      // Not used yet - opaque to make it easy to import rb_call_data
         .opaque_type("rb_callcache.*")
-        .blocklist_type("rb_callinfo_kwarg") // Contains a VALUE[] array of undefined size, so we don't import
-        .opaque_type("rb_callinfo_kwarg")
         .allowlist_type("rb_callinfo")
 
         // From vm_insnhelper.h
@@ -208,6 +208,7 @@ fn main() {
 
         // From include/ruby/internal/symbol.h
         .allowlist_function("rb_intern")
+        .allowlist_function("rb_intern2")
         .allowlist_function("rb_id2sym")
         .allowlist_function("rb_id2name")
         .allowlist_function("rb_sym2id")
@@ -215,11 +216,19 @@ fn main() {
 
         // From internal/numeric.h
         .allowlist_function("rb_fix_aref")
+        .allowlist_function("rb_float_plus")
+        .allowlist_function("rb_float_minus")
+        .allowlist_function("rb_float_mul")
+        .allowlist_function("rb_float_div")
 
         // From internal/string.h
+        .allowlist_type("ruby_rstring_private_flags")
         .allowlist_function("rb_ec_str_resurrect")
         .allowlist_function("rb_str_concat_literals")
         .allowlist_function("rb_obj_as_string_result")
+        .allowlist_function("rb_str_byte_substr")
+        .allowlist_function("rb_str_substr_two_fixnums")
+        .allowlist_function("rb_str_dup_m")
 
         // From include/ruby/internal/intern/parse.h
         .allowlist_function("rb_backref_get")
@@ -244,9 +253,6 @@ fn main() {
         // From include/ruby/internal/hash.h
         .allowlist_type("ruby_rhash_flags") // really old C extension API
 
-        // Autogenerated into id.h
-        .allowlist_type("ruby_method_ids")
-
         // From method.h
         .allowlist_type("rb_method_visibility_t")
         .allowlist_type("rb_method_type_t")
@@ -259,11 +265,15 @@ fn main() {
         .blocklist_type("rb_method_definition_.*") // Large struct with a bitfield and union of many types - don't import (yet?)
         .opaque_type("rb_method_definition_.*")
 
+        // From numeric.c
+        .allowlist_function("rb_float_new")
+
         // From vm_core.h
         .allowlist_var("rb_mRubyVMFrozenCore")
         .allowlist_var("VM_BLOCK_HANDLER_NONE")
         .allowlist_type("vm_frame_env_flags")
         .allowlist_type("rb_seq_param_keyword_struct")
+        .allowlist_type("rb_callinfo_kwarg")
         .allowlist_type("ruby_basic_operators")
         .allowlist_var(".*_REDEFINED_OP_FLAG")
         .allowlist_type("rb_num_t")
@@ -294,8 +304,11 @@ fn main() {
         .allowlist_type("ruby_tag_type")
         .allowlist_type("ruby_vm_throw_flags")
         .allowlist_type("vm_check_match_type")
+        .allowlist_type("vm_opt_newarray_send_type")
+        .allowlist_type("rb_iseq_type")
 
         // From yjit.c
+        .allowlist_function("rb_object_shape_count")
         .allowlist_function("rb_iseq_(get|set)_yjit_payload")
         .allowlist_function("rb_iseq_pc_at_idx")
         .allowlist_function("rb_iseq_opcode_at_pc")
@@ -305,9 +318,9 @@ fn main() {
         .allowlist_function("rb_yjit_mark_unused")
         .allowlist_function("rb_yjit_get_page_size")
         .allowlist_function("rb_yjit_iseq_builtin_attrs")
+        .allowlist_function("rb_yjit_iseq_inspect")
         .allowlist_function("rb_yjit_builtin_function")
         .allowlist_function("rb_set_cfp_(pc|sp)")
-        .allowlist_function("rb_cfp_get_iseq")
         .allowlist_function("rb_yjit_multi_ractor_p")
         .allowlist_function("rb_c_method_tracing_currently_enabled")
         .allowlist_function("rb_full_cfunc_return")
@@ -315,6 +328,7 @@ fn main() {
         .allowlist_function("rb_yjit_vm_unlock")
         .allowlist_function("rb_assert_(iseq|cme)_handle")
         .allowlist_function("rb_IMEMO_TYPE_P")
+        .allowlist_function("rb_yjit_constcache_shareable")
         .allowlist_function("rb_iseq_reset_jit_func")
         .allowlist_function("rb_yjit_dump_iseq_loc")
         .allowlist_function("rb_yjit_for_each_iseq")
@@ -327,13 +341,16 @@ fn main() {
         .allowlist_function("rb_yjit_exit_locations_dict")
         .allowlist_function("rb_yjit_icache_invalidate")
         .allowlist_function("rb_optimized_call")
-        .allowlist_function("rb_yjit_assert_holding_vm_lock")
         .allowlist_function("rb_yjit_sendish_sp_pops")
         .allowlist_function("rb_yjit_invokeblock_sp_pops")
         .allowlist_function("rb_yjit_set_exception_return")
+        .allowlist_function("rb_yjit_str_concat_codepoint")
         .allowlist_type("robject_offsets")
         .allowlist_type("rstring_offsets")
 
+        // From jit.c
+        .allowlist_function("rb_assert_holding_vm_lock")
+
         // from vm_sync.h
         .allowlist_function("rb_vm_barrier")
 
@@ -352,6 +369,7 @@ fn main() {
         .allowlist_function("rb_iseqw_to_iseq")
         .allowlist_function("rb_iseq_label")
         .allowlist_function("rb_iseq_line_no")
+        .allowlist_type("defined_type")
 
         // From builtin.h
         .allowlist_type("rb_builtin_function.*")
@@ -364,6 +382,7 @@ fn main() {
         .allowlist_function("rb_attr_get")
         .allowlist_function("rb_ivar_defined")
         .allowlist_function("rb_ivar_get")
+        .allowlist_function("rb_mod_name")
 
         // From internal/vm.h
         .allowlist_var("rb_vm_insns_count")
@@ -371,9 +390,15 @@ fn main() {
         // From include/ruby/internal/intern/vm.h
         .allowlist_function("rb_get_alloc_func")
 
-        // From gc.h and internal/gc.h
+        // From internal/object.h
         .allowlist_function("rb_class_allocate_instance")
+        .allowlist_function("rb_obj_equal")
+        .allowlist_function("rb_class_new_instance_pass_kw")
+        .allowlist_function("rb_obj_alloc")
+
+        // From gc.h and internal/gc.h
         .allowlist_function("rb_obj_info")
+        .allowlist_function("ruby_xfree")
 
         // From include/ruby/debug.h
         .allowlist_function("rb_profile_frames")
@@ -402,21 +427,23 @@ fn main() {
         .allowlist_function("rb_get_def_iseq_ptr")
         .allowlist_function("rb_get_def_bmethod_proc")
         .allowlist_function("rb_iseq_encoded_size")
-        .allowlist_function("rb_get_iseq_body_total_calls")
         .allowlist_function("rb_get_iseq_body_local_iseq")
         .allowlist_function("rb_get_iseq_body_parent_iseq")
         .allowlist_function("rb_get_iseq_body_iseq_encoded")
         .allowlist_function("rb_get_iseq_body_stack_max")
+        .allowlist_function("rb_get_iseq_body_type")
         .allowlist_function("rb_get_iseq_flags_has_lead")
         .allowlist_function("rb_get_iseq_flags_has_opt")
         .allowlist_function("rb_get_iseq_flags_has_kw")
         .allowlist_function("rb_get_iseq_flags_has_rest")
         .allowlist_function("rb_get_iseq_flags_has_post")
         .allowlist_function("rb_get_iseq_flags_has_kwrest")
+        .allowlist_function("rb_get_iseq_flags_anon_kwrest")
         .allowlist_function("rb_get_iseq_flags_has_block")
         .allowlist_function("rb_get_iseq_flags_ambiguous_param0")
         .allowlist_function("rb_get_iseq_flags_accepts_no_kwarg")
         .allowlist_function("rb_get_iseq_flags_ruby2_keywords")
+        .allowlist_function("rb_get_iseq_flags_forwardable")
         .allowlist_function("rb_get_iseq_body_local_table_size")
         .allowlist_function("rb_get_iseq_body_param_keyword")
         .allowlist_function("rb_get_iseq_body_param_size")
@@ -429,9 +456,9 @@ fn main() {
         .allowlist_function("rb_yarv_str_eql_internal")
         .allowlist_function("rb_str_neq_internal")
         .allowlist_function("rb_yarv_ary_entry_internal")
+        .allowlist_function("rb_yjit_ruby2_keywords_splat_p")
         .allowlist_function("rb_yjit_fix_div_fix")
         .allowlist_function("rb_yjit_fix_mod_fix")
-        .allowlist_function("rb_yjit_fix_mul_fix")
         .allowlist_function("rb_FL_TEST")
         .allowlist_function("rb_FL_TEST_RAW")
         .allowlist_function("rb_RB_TYPE_P")
@@ -449,6 +476,10 @@ fn main() {
         .allowlist_function("rb_obj_class")
         .allowlist_function("rb_obj_is_proc")
         .allowlist_function("rb_vm_base_ptr")
+        .allowlist_function("rb_ec_stack_check")
+        .allowlist_function("rb_vm_top_self")
+        .allowlist_function("rb_yjit_splat_varg_checks")
+        .allowlist_function("rb_yjit_splat_varg_cfunc")
 
         // We define VALUE manually, don't import it
         .blocklist_type("VALUE")
diff --git a/yjit/not_gmake.mk b/yjit/not_gmake.mk
index 8bb01d65be21de..3a2ca9281f9930 100644
--- a/yjit/not_gmake.mk
+++ b/yjit/not_gmake.mk
@@ -16,3 +16,17 @@ $(YJIT_LIBOBJ): $(YJIT_LIBS)
 	$(ECHO) 'partial linking $(YJIT_LIBS) into $@'
 	$(Q) $(LD) -r -o $@ --whole-archive $(YJIT_LIBS)
 	-$(Q) $(OBJCOPY) --wildcard --keep-global-symbol='$(SYMBOL_PREFIX)rb_*' $(@)
+
+.PHONY: zjit-static-lib
+$(ZJIT_LIBS): zjit-static-lib
+	$(empty)
+
+zjit-static-lib:
+	$(ECHO) 'building Rust ZJIT (release mode)'
+	$(Q) $(RUSTC) $(ZJIT_RUSTC_ARGS)
+
+# Assume GNU flavor LD and OBJCOPY. Works on FreeBSD 13, at least.
+$(ZJIT_LIBOBJ): $(ZJIT_LIBS)
+	$(ECHO) 'partial linking $(ZJIT_LIBS) into $@'
+	$(Q) $(LD) -r -o $@ --whole-archive $(ZJIT_LIBS)
+	-$(Q) $(OBJCOPY) --wildcard --keep-global-symbol='$(SYMBOL_PREFIX)rb_*' $(@)
diff --git a/yjit/src/asm/arm64/arg/bitmask_imm.rs b/yjit/src/asm/arm64/arg/bitmask_imm.rs
index ff9b2c8a2da6bf..70a439afd5b04f 100644
--- a/yjit/src/asm/arm64/arg/bitmask_imm.rs
+++ b/yjit/src/asm/arm64/arg/bitmask_imm.rs
@@ -42,7 +42,7 @@ impl TryFrom<u64> for BitmaskImmediate {
     /// Attempt to convert a u64 into a BitmaskImmediate.
     ///
     /// The implementation here is largely based on this blog post:
-    /// https://dougallj.wordpress.com/2021/10/30/bit-twiddling-optimising-aarch64-logical-immediate-encoding-and-decoding/
+    /// <https://dougallj.wordpress.com/2021/10/30/bit-twiddling-optimising-aarch64-logical-immediate-encoding-and-decoding/>
     fn try_from(value: u64) -> Result<Self, Self::Error> {
         if value == 0 || value == u64::MAX {
             return Err(());
@@ -106,7 +106,7 @@ mod tests {
 
     #[test]
     fn test_failures() {
-        vec![5, 9, 10, 11, 13, 17, 18, 19].iter().for_each(|&imm| {
+        [5, 9, 10, 11, 13, 17, 18, 19].iter().for_each(|&imm| {
             assert!(BitmaskImmediate::try_from(imm).is_err());
         });
     }
diff --git a/yjit/src/asm/arm64/arg/sys_reg.rs b/yjit/src/asm/arm64/arg/sys_reg.rs
index 41d71920cb74cc..6229d5c1fd296b 100644
--- a/yjit/src/asm/arm64/arg/sys_reg.rs
+++ b/yjit/src/asm/arm64/arg/sys_reg.rs
@@ -1,6 +1,6 @@
 /// The encoded representation of an A64 system register.
-/// https://developer.arm.com/documentation/ddi0601/2022-06/AArch64-Registers/
+/// <https://developer.arm.com/documentation/ddi0601/2022-06/AArch64-Registers/>
 pub enum SystemRegister {
-    /// https://developer.arm.com/documentation/ddi0601/2022-06/AArch64-Registers/NZCV--Condition-Flags?lang=en
+    /// <https://developer.arm.com/documentation/ddi0601/2022-06/AArch64-Registers/NZCV--Condition-Flags?lang=en>
     NZCV = 0b1_011_0100_0010_000
 }
diff --git a/yjit/src/asm/arm64/inst/atomic.rs b/yjit/src/asm/arm64/inst/atomic.rs
index 5ce497209ceb12..dce9affedf8838 100644
--- a/yjit/src/asm/arm64/inst/atomic.rs
+++ b/yjit/src/asm/arm64/inst/atomic.rs
@@ -43,13 +43,13 @@ pub struct Atomic {
 
 impl Atomic {
     /// LDADDAL
-    /// https://developer.arm.com/documentation/ddi0596/2021-12/Base-Instructions/LDADD--LDADDA--LDADDAL--LDADDL--Atomic-add-on-word-or-doubleword-in-memory-?lang=en
+    /// <https://developer.arm.com/documentation/ddi0596/2021-12/Base-Instructions/LDADD--LDADDA--LDADDAL--LDADDL--Atomic-add-on-word-or-doubleword-in-memory-?lang=en>
     pub fn ldaddal(rs: u8, rt: u8, rn: u8, num_bits: u8) -> Self {
         Self { rt, rn, rs, size: num_bits.into() }
     }
 }
 
-/// https://developer.arm.com/documentation/ddi0602/2022-03/Index-by-Encoding/Loads-and-Stores?lang=en
+/// <https://developer.arm.com/documentation/ddi0602/2022-03/Index-by-Encoding/Loads-and-Stores?lang=en>
 const FAMILY: u32 = 0b0100;
 
 impl From<Atomic> for u32 {
diff --git a/yjit/src/asm/arm64/inst/branch.rs b/yjit/src/asm/arm64/inst/branch.rs
index f15ef2a9b0fc23..14fcb2e9fd99f5 100644
--- a/yjit/src/asm/arm64/inst/branch.rs
+++ b/yjit/src/asm/arm64/inst/branch.rs
@@ -28,25 +28,25 @@ pub struct Branch {
 
 impl Branch {
     /// BR
-    /// https://developer.arm.com/documentation/ddi0602/2022-03/Base-Instructions/BR--Branch-to-Register-?lang=en
+    /// <https://developer.arm.com/documentation/ddi0602/2022-03/Base-Instructions/BR--Branch-to-Register-?lang=en>
     pub fn br(rn: u8) -> Self {
         Self { rn, op: Op::BR }
     }
 
     /// BLR
-    /// https://developer.arm.com/documentation/ddi0602/2022-03/Base-Instructions/BLR--Branch-with-Link-to-Register-?lang=en
+    /// <https://developer.arm.com/documentation/ddi0602/2022-03/Base-Instructions/BLR--Branch-with-Link-to-Register-?lang=en>
     pub fn blr(rn: u8) -> Self {
         Self { rn, op: Op::BLR }
     }
 
     /// RET
-    /// https://developer.arm.com/documentation/ddi0596/2021-12/Base-Instructions/RET--Return-from-subroutine-?lang=en
+    /// <https://developer.arm.com/documentation/ddi0596/2021-12/Base-Instructions/RET--Return-from-subroutine-?lang=en>
     pub fn ret(rn: u8) -> Self {
         Self { rn, op: Op::RET }
     }
 }
 
-/// https://developer.arm.com/documentation/ddi0602/2022-03/Index-by-Encoding/Branches--Exception-Generating-and-System-instructions?lang=en
+/// <https://developer.arm.com/documentation/ddi0602/2022-03/Index-by-Encoding/Branches--Exception-Generating-and-System-instructions?lang=en>
 const FAMILY: u32 = 0b101;
 
 impl From<Branch> for u32 {
diff --git a/yjit/src/asm/arm64/inst/branch_cond.rs b/yjit/src/asm/arm64/inst/branch_cond.rs
index fcc07f69aa1ade..266e9ccb318d69 100644
--- a/yjit/src/asm/arm64/inst/branch_cond.rs
+++ b/yjit/src/asm/arm64/inst/branch_cond.rs
@@ -19,13 +19,13 @@ pub struct BranchCond {
 
 impl BranchCond {
     /// B.cond
-    /// https://developer.arm.com/documentation/ddi0596/2020-12/Base-Instructions/B-cond--Branch-conditionally-
+    /// <https://developer.arm.com/documentation/ddi0596/2020-12/Base-Instructions/B-cond--Branch-conditionally->
     pub fn bcond(cond: u8, offset: InstructionOffset) -> Self {
         Self { cond, offset }
     }
 }
 
-/// https://developer.arm.com/documentation/ddi0602/2022-03/Index-by-Encoding/Branches--Exception-Generating-and-System-instructions?lang=en
+/// <https://developer.arm.com/documentation/ddi0602/2022-03/Index-by-Encoding/Branches--Exception-Generating-and-System-instructions?lang=en>
 const FAMILY: u32 = 0b101;
 
 impl From<BranchCond> for u32 {
diff --git a/yjit/src/asm/arm64/inst/breakpoint.rs b/yjit/src/asm/arm64/inst/breakpoint.rs
index be4920ac7656ed..d66a35c4c6c716 100644
--- a/yjit/src/asm/arm64/inst/breakpoint.rs
+++ b/yjit/src/asm/arm64/inst/breakpoint.rs
@@ -13,13 +13,13 @@ pub struct Breakpoint {
 
 impl Breakpoint {
     /// BRK
-    /// https://developer.arm.com/documentation/ddi0596/2020-12/Base-Instructions/BRK--Breakpoint-instruction-
+    /// <https://developer.arm.com/documentation/ddi0596/2020-12/Base-Instructions/BRK--Breakpoint-instruction->
     pub fn brk(imm16: u16) -> Self {
         Self { imm16 }
     }
 }
 
-/// https://developer.arm.com/documentation/ddi0602/2022-03/Index-by-Encoding/Branches--Exception-Generating-and-System-instructions?lang=en#control
+/// <https://developer.arm.com/documentation/ddi0602/2022-03/Index-by-Encoding/Branches--Exception-Generating-and-System-instructions?lang=en#control>
 const FAMILY: u32 = 0b101;
 
 impl From<Breakpoint> for u32 {
diff --git a/yjit/src/asm/arm64/inst/call.rs b/yjit/src/asm/arm64/inst/call.rs
index 74debac7f75bc8..fd26d09f8a1e6d 100644
--- a/yjit/src/asm/arm64/inst/call.rs
+++ b/yjit/src/asm/arm64/inst/call.rs
@@ -29,19 +29,19 @@ pub struct Call {
 
 impl Call {
     /// B
-    /// https://developer.arm.com/documentation/ddi0596/2021-12/Base-Instructions/B--Branch-
+    /// <https://developer.arm.com/documentation/ddi0596/2021-12/Base-Instructions/B--Branch->
     pub fn b(offset: InstructionOffset) -> Self {
         Self { offset, op: Op::Branch }
     }
 
     /// BL
-    /// https://developer.arm.com/documentation/ddi0596/2021-12/Base-Instructions/BL--Branch-with-Link-?lang=en
+    /// <https://developer.arm.com/documentation/ddi0596/2021-12/Base-Instructions/BL--Branch-with-Link-?lang=en>
     pub fn bl(offset: InstructionOffset) -> Self {
         Self { offset, op: Op::BranchWithLink }
     }
 }
 
-/// https://developer.arm.com/documentation/ddi0602/2022-03/Index-by-Encoding/Branches--Exception-Generating-and-System-instructions?lang=en
+/// <https://developer.arm.com/documentation/ddi0602/2022-03/Index-by-Encoding/Branches--Exception-Generating-and-System-instructions?lang=en>
 const FAMILY: u32 = 0b101;
 
 impl From<Call> for u32 {
diff --git a/yjit/src/asm/arm64/inst/conditional.rs b/yjit/src/asm/arm64/inst/conditional.rs
index e1950e95b428d3..1e26c7408b8ce5 100644
--- a/yjit/src/asm/arm64/inst/conditional.rs
+++ b/yjit/src/asm/arm64/inst/conditional.rs
@@ -28,13 +28,13 @@ pub struct Conditional {
 
 impl Conditional {
     /// CSEL
-    /// https://developer.arm.com/documentation/ddi0596/2021-12/Base-Instructions/CSEL--Conditional-Select-?lang=en
+    /// <https://developer.arm.com/documentation/ddi0596/2021-12/Base-Instructions/CSEL--Conditional-Select-?lang=en>
     pub fn csel(rd: u8, rn: u8, rm: u8, cond: u8, num_bits: u8) -> Self {
         Self { rd, rn, cond, rm, sf: num_bits.into() }
     }
 }
 
-/// https://developer.arm.com/documentation/ddi0602/2022-03/Index-by-Encoding/Data-Processing----Register?lang=en#condsel
+/// <https://developer.arm.com/documentation/ddi0602/2022-03/Index-by-Encoding/Data-Processing----Register?lang=en#condsel>
 const FAMILY: u32 = 0b101;
 
 impl From<Conditional> for u32 {
diff --git a/yjit/src/asm/arm64/inst/data_imm.rs b/yjit/src/asm/arm64/inst/data_imm.rs
index b474b00a527d10..ea717054788cdb 100644
--- a/yjit/src/asm/arm64/inst/data_imm.rs
+++ b/yjit/src/asm/arm64/inst/data_imm.rs
@@ -44,37 +44,37 @@ pub struct DataImm {
 
 impl DataImm {
     /// ADD (immediate)
-    /// https://developer.arm.com/documentation/ddi0596/2021-12/Base-Instructions/ADD--immediate---Add--immediate--?lang=en
+    /// <https://developer.arm.com/documentation/ddi0596/2021-12/Base-Instructions/ADD--immediate---Add--immediate--?lang=en>
     pub fn add(rd: u8, rn: u8, imm: ShiftedImmediate, num_bits: u8) -> Self {
         Self { rd, rn, imm, s: S::LeaveFlags, op: Op::Add, sf: num_bits.into() }
     }
 
     /// ADDS (immediate, set flags)
-    /// https://developer.arm.com/documentation/ddi0596/2021-12/Base-Instructions/ADDS--immediate---Add--immediate---setting-flags-?lang=en
+    /// <https://developer.arm.com/documentation/ddi0596/2021-12/Base-Instructions/ADDS--immediate---Add--immediate---setting-flags-?lang=en>
     pub fn adds(rd: u8, rn: u8, imm: ShiftedImmediate, num_bits: u8) -> Self {
         Self { rd, rn, imm, s: S::UpdateFlags, op: Op::Add, sf: num_bits.into() }
     }
 
     /// CMP (immediate)
-    /// https://developer.arm.com/documentation/ddi0596/2021-12/Base-Instructions/CMP--immediate---Compare--immediate---an-alias-of-SUBS--immediate--?lang=en
+    /// <https://developer.arm.com/documentation/ddi0596/2021-12/Base-Instructions/CMP--immediate---Compare--immediate---an-alias-of-SUBS--immediate--?lang=en>
     pub fn cmp(rn: u8, imm: ShiftedImmediate, num_bits: u8) -> Self {
         Self::subs(31, rn, imm, num_bits)
     }
 
     /// SUB (immediate)
-    /// https://developer.arm.com/documentation/ddi0596/2021-12/Base-Instructions/SUB--immediate---Subtract--immediate--?lang=en
+    /// <https://developer.arm.com/documentation/ddi0596/2021-12/Base-Instructions/SUB--immediate---Subtract--immediate--?lang=en>
     pub fn sub(rd: u8, rn: u8, imm: ShiftedImmediate, num_bits: u8) -> Self {
         Self { rd, rn, imm, s: S::LeaveFlags, op: Op::Sub, sf: num_bits.into() }
     }
 
     /// SUBS (immediate, set flags)
-    /// https://developer.arm.com/documentation/ddi0596/2021-12/Base-Instructions/SUBS--immediate---Subtract--immediate---setting-flags-?lang=en
+    /// <https://developer.arm.com/documentation/ddi0596/2021-12/Base-Instructions/SUBS--immediate---Subtract--immediate---setting-flags-?lang=en>
     pub fn subs(rd: u8, rn: u8, imm: ShiftedImmediate, num_bits: u8) -> Self {
         Self { rd, rn, imm, s: S::UpdateFlags, op: Op::Sub, sf: num_bits.into() }
     }
 }
 
-/// https://developer.arm.com/documentation/ddi0602/2022-03/Index-by-Encoding/Data-Processing----Immediate?lang=en
+/// <https://developer.arm.com/documentation/ddi0602/2022-03/Index-by-Encoding/Data-Processing----Immediate?lang=en>
 const FAMILY: u32 = 0b1000;
 
 impl From<DataImm> for u32 {
diff --git a/yjit/src/asm/arm64/inst/data_reg.rs b/yjit/src/asm/arm64/inst/data_reg.rs
index a742121f1fd172..ed4afa956b032d 100644
--- a/yjit/src/asm/arm64/inst/data_reg.rs
+++ b/yjit/src/asm/arm64/inst/data_reg.rs
@@ -57,7 +57,7 @@ pub struct DataReg {
 
 impl DataReg {
     /// ADD (shifted register)
-    /// https://developer.arm.com/documentation/ddi0596/2021-12/Base-Instructions/ADD--shifted-register---Add--shifted-register--?lang=en
+    /// <https://developer.arm.com/documentation/ddi0596/2021-12/Base-Instructions/ADD--shifted-register---Add--shifted-register--?lang=en>
     pub fn add(rd: u8, rn: u8, rm: u8, num_bits: u8) -> Self {
         Self {
             rd,
@@ -72,7 +72,7 @@ impl DataReg {
     }
 
     /// ADDS (shifted register, set flags)
-    /// https://developer.arm.com/documentation/ddi0596/2021-12/Base-Instructions/ADDS--shifted-register---Add--shifted-register---setting-flags-?lang=en
+    /// <https://developer.arm.com/documentation/ddi0596/2021-12/Base-Instructions/ADDS--shifted-register---Add--shifted-register---setting-flags-?lang=en>
     pub fn adds(rd: u8, rn: u8, rm: u8, num_bits: u8) -> Self {
         Self {
             rd,
@@ -87,13 +87,13 @@ impl DataReg {
     }
 
     /// CMP (shifted register)
-    /// https://developer.arm.com/documentation/ddi0596/2021-12/Base-Instructions/CMP--shifted-register---Compare--shifted-register---an-alias-of-SUBS--shifted-register--?lang=en
+    /// <https://developer.arm.com/documentation/ddi0596/2021-12/Base-Instructions/CMP--shifted-register---Compare--shifted-register---an-alias-of-SUBS--shifted-register--?lang=en>
     pub fn cmp(rn: u8, rm: u8, num_bits: u8) -> Self {
         Self::subs(31, rn, rm, num_bits)
     }
 
     /// SUB (shifted register)
-    /// https://developer.arm.com/documentation/ddi0596/2021-12/Base-Instructions/SUB--shifted-register---Subtract--shifted-register--?lang=en
+    /// <https://developer.arm.com/documentation/ddi0596/2021-12/Base-Instructions/SUB--shifted-register---Subtract--shifted-register--?lang=en>
     pub fn sub(rd: u8, rn: u8, rm: u8, num_bits: u8) -> Self {
         Self {
             rd,
@@ -108,7 +108,7 @@ impl DataReg {
     }
 
     /// SUBS (shifted register, set flags)
-    /// https://developer.arm.com/documentation/ddi0596/2021-12/Base-Instructions/SUBS--shifted-register---Subtract--shifted-register---setting-flags-?lang=en
+    /// <https://developer.arm.com/documentation/ddi0596/2021-12/Base-Instructions/SUBS--shifted-register---Subtract--shifted-register---setting-flags-?lang=en>
     pub fn subs(rd: u8, rn: u8, rm: u8, num_bits: u8) -> Self {
         Self {
             rd,
@@ -123,7 +123,7 @@ impl DataReg {
     }
 }
 
-/// https://developer.arm.com/documentation/ddi0602/2022-03/Index-by-Encoding/Data-Processing----Register?lang=en
+/// <https://developer.arm.com/documentation/ddi0602/2022-03/Index-by-Encoding/Data-Processing----Register?lang=en>
 const FAMILY: u32 = 0b0101;
 
 impl From<DataReg> for u32 {
diff --git a/yjit/src/asm/arm64/inst/halfword_imm.rs b/yjit/src/asm/arm64/inst/halfword_imm.rs
index 0ddae8e8de00ed..863ac947dd5324 100644
--- a/yjit/src/asm/arm64/inst/halfword_imm.rs
+++ b/yjit/src/asm/arm64/inst/halfword_imm.rs
@@ -53,43 +53,43 @@ pub struct HalfwordImm {
 
 impl HalfwordImm {
     /// LDRH
-    /// https://developer.arm.com/documentation/ddi0602/2022-06/Base-Instructions/LDRH--immediate---Load-Register-Halfword--immediate--
+    /// <https://developer.arm.com/documentation/ddi0602/2022-06/Base-Instructions/LDRH--immediate---Load-Register-Halfword--immediate-->
     pub fn ldrh(rt: u8, rn: u8, imm12: i16) -> Self {
         Self { rt, rn, index: Index::None, imm: imm12, op: Op::Load }
     }
 
     /// LDRH (pre-index)
-    /// https://developer.arm.com/documentation/ddi0602/2022-06/Base-Instructions/LDRH--immediate---Load-Register-Halfword--immediate--
+    /// <https://developer.arm.com/documentation/ddi0602/2022-06/Base-Instructions/LDRH--immediate---Load-Register-Halfword--immediate-->
     pub fn ldrh_pre(rt: u8, rn: u8, imm9: i16) -> Self {
         Self { rt, rn, index: Index::PreIndex, imm: imm9, op: Op::Load }
     }
 
     /// LDRH (post-index)
-    /// https://developer.arm.com/documentation/ddi0602/2022-06/Base-Instructions/LDRH--immediate---Load-Register-Halfword--immediate--
+    /// <https://developer.arm.com/documentation/ddi0602/2022-06/Base-Instructions/LDRH--immediate---Load-Register-Halfword--immediate-->
     pub fn ldrh_post(rt: u8, rn: u8, imm9: i16) -> Self {
         Self { rt, rn, index: Index::PostIndex, imm: imm9, op: Op::Load }
     }
 
     /// STRH
-    /// https://developer.arm.com/documentation/ddi0602/2022-06/Base-Instructions/STRH--immediate---Store-Register-Halfword--immediate--
+    /// <https://developer.arm.com/documentation/ddi0602/2022-06/Base-Instructions/STRH--immediate---Store-Register-Halfword--immediate-->
     pub fn strh(rt: u8, rn: u8, imm12: i16) -> Self {
         Self { rt, rn, index: Index::None, imm: imm12, op: Op::Store }
     }
 
     /// STRH (pre-index)
-    /// https://developer.arm.com/documentation/ddi0602/2022-06/Base-Instructions/STRH--immediate---Store-Register-Halfword--immediate--
+    /// <https://developer.arm.com/documentation/ddi0602/2022-06/Base-Instructions/STRH--immediate---Store-Register-Halfword--immediate-->
     pub fn strh_pre(rt: u8, rn: u8, imm9: i16) -> Self {
         Self { rt, rn, index: Index::PreIndex, imm: imm9, op: Op::Store }
     }
 
     /// STRH (post-index)
-    /// https://developer.arm.com/documentation/ddi0602/2022-06/Base-Instructions/STRH--immediate---Store-Register-Halfword--immediate--
+    /// <https://developer.arm.com/documentation/ddi0602/2022-06/Base-Instructions/STRH--immediate---Store-Register-Halfword--immediate-->
     pub fn strh_post(rt: u8, rn: u8, imm9: i16) -> Self {
         Self { rt, rn, index: Index::PostIndex, imm: imm9, op: Op::Store }
     }
 }
 
-/// https://developer.arm.com/documentation/ddi0602/2022-03/Index-by-Encoding/Loads-and-Stores?lang=en
+/// <https://developer.arm.com/documentation/ddi0602/2022-03/Index-by-Encoding/Loads-and-Stores?lang=en>
 const FAMILY: u32 = 0b111100;
 
 impl From<HalfwordImm> for u32 {
diff --git a/yjit/src/asm/arm64/inst/load_literal.rs b/yjit/src/asm/arm64/inst/load_literal.rs
index 3eade205c808fc..817e8935531b2b 100644
--- a/yjit/src/asm/arm64/inst/load_literal.rs
+++ b/yjit/src/asm/arm64/inst/load_literal.rs
@@ -40,13 +40,13 @@ pub struct LoadLiteral {
 
 impl LoadLiteral {
     /// LDR (load literal)
-    /// https://developer.arm.com/documentation/ddi0596/2021-12/Base-Instructions/LDR--literal---Load-Register--literal--?lang=en
+    /// <https://developer.arm.com/documentation/ddi0596/2021-12/Base-Instructions/LDR--literal---Load-Register--literal--?lang=en>
     pub fn ldr_literal(rt: u8, offset: InstructionOffset, num_bits: u8) -> Self {
         Self { rt, offset, opc: num_bits.into() }
     }
 }
 
-/// https://developer.arm.com/documentation/ddi0602/2022-03/Index-by-Encoding/Loads-and-Stores?lang=en
+/// <https://developer.arm.com/documentation/ddi0602/2022-03/Index-by-Encoding/Loads-and-Stores?lang=en>
 const FAMILY: u32 = 0b0100;
 
 impl From<LoadLiteral> for u32 {
diff --git a/yjit/src/asm/arm64/inst/load_register.rs b/yjit/src/asm/arm64/inst/load_register.rs
index 3426b9ba5f9be0..3d94e8da1f8f26 100644
--- a/yjit/src/asm/arm64/inst/load_register.rs
+++ b/yjit/src/asm/arm64/inst/load_register.rs
@@ -61,13 +61,13 @@ pub struct LoadRegister {
 
 impl LoadRegister {
     /// LDR
-    /// https://developer.arm.com/documentation/ddi0596/2021-12/Base-Instructions/LDR--register---Load-Register--register--?lang=en
+    /// <https://developer.arm.com/documentation/ddi0596/2021-12/Base-Instructions/LDR--register---Load-Register--register--?lang=en>
     pub fn ldr(rt: u8, rn: u8, rm: u8, num_bits: u8) -> Self {
         Self { rt, rn, s: S::NoShift, option: Option::LSL, rm, size: num_bits.into() }
     }
 }
 
-/// https://developer.arm.com/documentation/ddi0602/2022-03/Index-by-Encoding/Loads-and-Stores?lang=en
+/// <https://developer.arm.com/documentation/ddi0602/2022-03/Index-by-Encoding/Loads-and-Stores?lang=en>
 const FAMILY: u32 = 0b0100;
 
 impl From<LoadRegister> for u32 {
diff --git a/yjit/src/asm/arm64/inst/load_store.rs b/yjit/src/asm/arm64/inst/load_store.rs
index b5c8a3c29489e4..e27909ae355d10 100644
--- a/yjit/src/asm/arm64/inst/load_store.rs
+++ b/yjit/src/asm/arm64/inst/load_store.rs
@@ -66,67 +66,67 @@ pub struct LoadStore {
 
 impl LoadStore {
     /// LDR (immediate, post-index)
-    /// https://developer.arm.com/documentation/ddi0596/2020-12/Base-Instructions/LDR--immediate---Load-Register--immediate--
+    /// <https://developer.arm.com/documentation/ddi0596/2020-12/Base-Instructions/LDR--immediate---Load-Register--immediate-->
     pub fn ldr_post(rt: u8, rn: u8, imm9: i16, num_bits: u8) -> Self {
         Self { rt, rn, idx: Index::PostIndex, imm9, opc: Opc::LDR, size: num_bits.into() }
     }
 
     /// LDR (immediate, pre-index)
-    /// https://developer.arm.com/documentation/ddi0596/2020-12/Base-Instructions/LDR--immediate---Load-Register--immediate--
+    /// <https://developer.arm.com/documentation/ddi0596/2020-12/Base-Instructions/LDR--immediate---Load-Register--immediate-->
     pub fn ldr_pre(rt: u8, rn: u8, imm9: i16, num_bits: u8) -> Self {
         Self { rt, rn, idx: Index::PreIndex, imm9, opc: Opc::LDR, size: num_bits.into() }
     }
 
     /// LDUR (load register, unscaled)
-    /// https://developer.arm.com/documentation/ddi0596/2021-12/Base-Instructions/LDUR--Load-Register--unscaled--?lang=en
+    /// <https://developer.arm.com/documentation/ddi0596/2021-12/Base-Instructions/LDUR--Load-Register--unscaled--?lang=en>
     pub fn ldur(rt: u8, rn: u8, imm9: i16, num_bits: u8) -> Self {
         Self { rt, rn, idx: Index::None, imm9, opc: Opc::LDR, size: num_bits.into() }
     }
 
     /// LDURH Load Register Halfword (unscaled)
-    /// https://developer.arm.com/documentation/ddi0596/2021-12/Base-Instructions/LDURH--Load-Register-Halfword--unscaled--?lang=en
+    /// <https://developer.arm.com/documentation/ddi0596/2021-12/Base-Instructions/LDURH--Load-Register-Halfword--unscaled--?lang=en>
     pub fn ldurh(rt: u8, rn: u8, imm9: i16) -> Self {
         Self { rt, rn, idx: Index::None, imm9, opc: Opc::LDR, size: Size::Size16 }
     }
 
     /// LDURB (load register, byte, unscaled)
-    /// https://developer.arm.com/documentation/ddi0596/2021-12/Base-Instructions/LDURB--Load-Register-Byte--unscaled--?lang=en
+    /// <https://developer.arm.com/documentation/ddi0596/2021-12/Base-Instructions/LDURB--Load-Register-Byte--unscaled--?lang=en>
     pub fn ldurb(rt: u8, rn: u8, imm9: i16) -> Self {
         Self { rt, rn, idx: Index::None, imm9, opc: Opc::LDR, size: Size::Size8 }
     }
 
     /// LDURSW (load register, unscaled, signed)
-    /// https://developer.arm.com/documentation/ddi0596/2021-12/Base-Instructions/LDURSW--Load-Register-Signed-Word--unscaled--?lang=en
+    /// <https://developer.arm.com/documentation/ddi0596/2021-12/Base-Instructions/LDURSW--Load-Register-Signed-Word--unscaled--?lang=en>
     pub fn ldursw(rt: u8, rn: u8, imm9: i16) -> Self {
         Self { rt, rn, idx: Index::None, imm9, opc: Opc::LDURSW, size: Size::Size32 }
     }
 
     /// STR (immediate, post-index)
-    /// https://developer.arm.com/documentation/ddi0596/2020-12/Base-Instructions/STR--immediate---Store-Register--immediate--
+    /// <https://developer.arm.com/documentation/ddi0596/2020-12/Base-Instructions/STR--immediate---Store-Register--immediate-->
     pub fn str_post(rt: u8, rn: u8, imm9: i16, num_bits: u8) -> Self {
         Self { rt, rn, idx: Index::PostIndex, imm9, opc: Opc::STR, size: num_bits.into() }
     }
 
     /// STR (immediate, pre-index)
-    /// https://developer.arm.com/documentation/ddi0596/2020-12/Base-Instructions/STR--immediate---Store-Register--immediate--
+    /// <https://developer.arm.com/documentation/ddi0596/2020-12/Base-Instructions/STR--immediate---Store-Register--immediate-->
     pub fn str_pre(rt: u8, rn: u8, imm9: i16, num_bits: u8) -> Self {
         Self { rt, rn, idx: Index::PreIndex, imm9, opc: Opc::STR, size: num_bits.into() }
     }
 
     /// STUR (store register, unscaled)
-    /// https://developer.arm.com/documentation/ddi0596/2021-12/Base-Instructions/STUR--Store-Register--unscaled--?lang=en
+    /// <https://developer.arm.com/documentation/ddi0596/2021-12/Base-Instructions/STUR--Store-Register--unscaled--?lang=en>
     pub fn stur(rt: u8, rn: u8, imm9: i16, num_bits: u8) -> Self {
         Self { rt, rn, idx: Index::None, imm9, opc: Opc::STR, size: num_bits.into() }
     }
 
     /// STURH (store register, halfword, unscaled)
-    /// https://developer.arm.com/documentation/ddi0596/2021-12/Base-Instructions/STURH--Store-Register-Halfword--unscaled--?lang=en
+    /// <https://developer.arm.com/documentation/ddi0596/2021-12/Base-Instructions/STURH--Store-Register-Halfword--unscaled--?lang=en>
     pub fn sturh(rt: u8, rn: u8, imm9: i16) -> Self {
         Self { rt, rn, idx: Index::None, imm9, opc: Opc::STR, size: Size::Size16 }
     }
 }
 
-/// https://developer.arm.com/documentation/ddi0602/2022-03/Index-by-Encoding/Loads-and-Stores?lang=en
+/// <https://developer.arm.com/documentation/ddi0602/2022-03/Index-by-Encoding/Loads-and-Stores?lang=en>
 const FAMILY: u32 = 0b0100;
 
 impl From<LoadStore> for u32 {
diff --git a/yjit/src/asm/arm64/inst/load_store_exclusive.rs b/yjit/src/asm/arm64/inst/load_store_exclusive.rs
index 8216c2200af505..1106b4cb372eb1 100644
--- a/yjit/src/asm/arm64/inst/load_store_exclusive.rs
+++ b/yjit/src/asm/arm64/inst/load_store_exclusive.rs
@@ -52,19 +52,19 @@ pub struct LoadStoreExclusive {
 
 impl LoadStoreExclusive {
     /// LDAXR
-    /// https://developer.arm.com/documentation/ddi0602/2021-12/Base-Instructions/LDAXR--Load-Acquire-Exclusive-Register-
+    /// <https://developer.arm.com/documentation/ddi0602/2021-12/Base-Instructions/LDAXR--Load-Acquire-Exclusive-Register->
     pub fn ldaxr(rt: u8, rn: u8, num_bits: u8) -> Self {
         Self { rt, rn, rs: 31, op: Op::Load, size: num_bits.into() }
     }
 
     /// STLXR
-    /// https://developer.arm.com/documentation/ddi0602/2021-12/Base-Instructions/STLXR--Store-Release-Exclusive-Register-
+    /// <https://developer.arm.com/documentation/ddi0602/2021-12/Base-Instructions/STLXR--Store-Release-Exclusive-Register->
     pub fn stlxr(rs: u8, rt: u8, rn: u8, num_bits: u8) -> Self {
         Self { rt, rn, rs, op: Op::Store, size: num_bits.into() }
     }
 }
 
-/// https://developer.arm.com/documentation/ddi0602/2022-03/Index-by-Encoding/Loads-and-Stores?lang=en
+/// <https://developer.arm.com/documentation/ddi0602/2022-03/Index-by-Encoding/Loads-and-Stores?lang=en>
 const FAMILY: u32 = 0b0100;
 
 impl From<LoadStoreExclusive> for u32 {
diff --git a/yjit/src/asm/arm64/inst/logical_imm.rs b/yjit/src/asm/arm64/inst/logical_imm.rs
index b24916f8a51186..d57ad5f5b7f96f 100644
--- a/yjit/src/asm/arm64/inst/logical_imm.rs
+++ b/yjit/src/asm/arm64/inst/logical_imm.rs
@@ -44,43 +44,43 @@ pub struct LogicalImm {
 
 impl LogicalImm {
     /// AND (bitmask immediate)
-    /// https://developer.arm.com/documentation/ddi0596/2021-12/Base-Instructions/AND--immediate---Bitwise-AND--immediate--?lang=en
+    /// <https://developer.arm.com/documentation/ddi0596/2021-12/Base-Instructions/AND--immediate---Bitwise-AND--immediate--?lang=en>
     pub fn and(rd: u8, rn: u8, imm: BitmaskImmediate, num_bits: u8) -> Self {
         Self { rd, rn, imm, opc: Opc::And, sf: num_bits.into() }
     }
 
     /// ANDS (bitmask immediate)
-    /// https://developer.arm.com/documentation/ddi0596/2021-12/Base-Instructions/ANDS--immediate---Bitwise-AND--immediate---setting-flags-?lang=en
+    /// <https://developer.arm.com/documentation/ddi0596/2021-12/Base-Instructions/ANDS--immediate---Bitwise-AND--immediate---setting-flags-?lang=en>
     pub fn ands(rd: u8, rn: u8, imm: BitmaskImmediate, num_bits: u8) -> Self {
         Self { rd, rn, imm, opc: Opc::Ands, sf: num_bits.into() }
     }
 
     /// EOR (bitmask immediate)
-    /// https://developer.arm.com/documentation/ddi0596/2020-12/Base-Instructions/EOR--immediate---Bitwise-Exclusive-OR--immediate--
+    /// <https://developer.arm.com/documentation/ddi0596/2020-12/Base-Instructions/EOR--immediate---Bitwise-Exclusive-OR--immediate-->
     pub fn eor(rd: u8, rn: u8, imm: BitmaskImmediate, num_bits: u8) -> Self {
         Self { rd, rn, imm, opc: Opc::Eor, sf: num_bits.into() }
     }
 
     /// MOV (bitmask immediate)
-    /// https://developer.arm.com/documentation/ddi0596/2020-12/Base-Instructions/MOV--bitmask-immediate---Move--bitmask-immediate---an-alias-of-ORR--immediate--?lang=en
+    /// <https://developer.arm.com/documentation/ddi0596/2020-12/Base-Instructions/MOV--bitmask-immediate---Move--bitmask-immediate---an-alias-of-ORR--immediate--?lang=en>
     pub fn mov(rd: u8, imm: BitmaskImmediate, num_bits: u8) -> Self {
         Self { rd, rn: 0b11111, imm, opc: Opc::Orr, sf: num_bits.into() }
     }
 
     /// ORR (bitmask immediate)
-    /// https://developer.arm.com/documentation/ddi0596/2020-12/Base-Instructions/ORR--immediate---Bitwise-OR--immediate--
+    /// <https://developer.arm.com/documentation/ddi0596/2020-12/Base-Instructions/ORR--immediate---Bitwise-OR--immediate-->
     pub fn orr(rd: u8, rn: u8, imm: BitmaskImmediate, num_bits: u8) -> Self {
         Self { rd, rn, imm, opc: Opc::Orr, sf: num_bits.into() }
     }
 
     /// TST (bitmask immediate)
-    /// https://developer.arm.com/documentation/ddi0596/2021-12/Base-Instructions/TST--immediate---Test-bits--immediate---an-alias-of-ANDS--immediate--?lang=en
+    /// <https://developer.arm.com/documentation/ddi0596/2021-12/Base-Instructions/TST--immediate---Test-bits--immediate---an-alias-of-ANDS--immediate--?lang=en>
     pub fn tst(rn: u8, imm: BitmaskImmediate, num_bits: u8) -> Self {
         Self::ands(31, rn, imm, num_bits)
     }
 }
 
-/// https://developer.arm.com/documentation/ddi0602/2022-03/Index-by-Encoding/Data-Processing----Immediate?lang=en#log_imm
+/// <https://developer.arm.com/documentation/ddi0602/2022-03/Index-by-Encoding/Data-Processing----Immediate?lang=en#log_imm>
 const FAMILY: u32 = 0b1001;
 
 impl From<LogicalImm> for u32 {
diff --git a/yjit/src/asm/arm64/inst/logical_reg.rs b/yjit/src/asm/arm64/inst/logical_reg.rs
index a96805c9f961c0..18edff606f0bb6 100644
--- a/yjit/src/asm/arm64/inst/logical_reg.rs
+++ b/yjit/src/asm/arm64/inst/logical_reg.rs
@@ -70,55 +70,55 @@ pub struct LogicalReg {
 
 impl LogicalReg {
     /// AND (shifted register)
-    /// https://developer.arm.com/documentation/ddi0596/2021-12/Base-Instructions/AND--shifted-register---Bitwise-AND--shifted-register--?lang=en
+    /// <https://developer.arm.com/documentation/ddi0596/2021-12/Base-Instructions/AND--shifted-register---Bitwise-AND--shifted-register--?lang=en>
     pub fn and(rd: u8, rn: u8, rm: u8, num_bits: u8) -> Self {
         Self { rd, rn, imm6: 0, rm, n: N::No, shift: Shift::LSL, opc: Opc::And, sf: num_bits.into() }
     }
 
     /// ANDS (shifted register)
-    /// https://developer.arm.com/documentation/ddi0596/2021-12/Base-Instructions/ANDS--shifted-register---Bitwise-AND--shifted-register---setting-flags-?lang=en
+    /// <https://developer.arm.com/documentation/ddi0596/2021-12/Base-Instructions/ANDS--shifted-register---Bitwise-AND--shifted-register---setting-flags-?lang=en>
     pub fn ands(rd: u8, rn: u8, rm: u8, num_bits: u8) -> Self {
         Self { rd, rn, imm6: 0, rm, n: N::No, shift: Shift::LSL, opc: Opc::Ands, sf: num_bits.into() }
     }
 
     /// EOR (shifted register)
-    /// https://developer.arm.com/documentation/ddi0596/2020-12/Base-Instructions/EOR--shifted-register---Bitwise-Exclusive-OR--shifted-register--
+    /// <https://developer.arm.com/documentation/ddi0596/2020-12/Base-Instructions/EOR--shifted-register---Bitwise-Exclusive-OR--shifted-register-->
     pub fn eor(rd: u8, rn: u8, rm: u8, num_bits: u8) -> Self {
         Self { rd, rn, imm6: 0, rm, n: N::No, shift: Shift::LSL, opc: Opc::Eor, sf: num_bits.into() }
     }
 
     /// MOV (register)
-    /// https://developer.arm.com/documentation/ddi0596/2020-12/Base-Instructions/MOV--register---Move--register---an-alias-of-ORR--shifted-register--?lang=en
+    /// <https://developer.arm.com/documentation/ddi0596/2020-12/Base-Instructions/MOV--register---Move--register---an-alias-of-ORR--shifted-register--?lang=en>
     pub fn mov(rd: u8, rm: u8, num_bits: u8) -> Self {
         Self { rd, rn: 0b11111, imm6: 0, rm, n: N::No, shift: Shift::LSL, opc: Opc::Orr, sf: num_bits.into() }
     }
 
     /// MVN (shifted register)
-    /// https://developer.arm.com/documentation/ddi0596/2020-12/Base-Instructions/MVN--Bitwise-NOT--an-alias-of-ORN--shifted-register--?lang=en
+    /// <https://developer.arm.com/documentation/ddi0596/2020-12/Base-Instructions/MVN--Bitwise-NOT--an-alias-of-ORN--shifted-register--?lang=en>
     pub fn mvn(rd: u8, rm: u8, num_bits: u8) -> Self {
         Self { rd, rn: 0b11111, imm6: 0, rm, n: N::Yes, shift: Shift::LSL, opc: Opc::Orr, sf: num_bits.into() }
     }
 
     /// ORN (shifted register)
-    /// https://developer.arm.com/documentation/ddi0596/2020-12/Base-Instructions/ORN--shifted-register---Bitwise-OR-NOT--shifted-register--
+    /// <https://developer.arm.com/documentation/ddi0596/2020-12/Base-Instructions/ORN--shifted-register---Bitwise-OR-NOT--shifted-register-->
     pub fn orn(rd: u8, rn: u8, rm: u8, num_bits: u8) -> Self {
         Self { rd, rn, imm6: 0, rm, n: N::Yes, shift: Shift::LSL, opc: Opc::Orr, sf: num_bits.into() }
     }
 
     /// ORR (shifted register)
-    /// https://developer.arm.com/documentation/ddi0596/2020-12/Base-Instructions/ORR--shifted-register---Bitwise-OR--shifted-register--
+    /// <https://developer.arm.com/documentation/ddi0596/2020-12/Base-Instructions/ORR--shifted-register---Bitwise-OR--shifted-register-->
     pub fn orr(rd: u8, rn: u8, rm: u8, num_bits: u8) -> Self {
         Self { rd, rn, imm6: 0, rm, n: N::No, shift: Shift::LSL, opc: Opc::Orr, sf: num_bits.into() }
     }
 
     /// TST (shifted register)
-    /// https://developer.arm.com/documentation/ddi0596/2021-12/Base-Instructions/TST--shifted-register---Test--shifted-register---an-alias-of-ANDS--shifted-register--?lang=en
+    /// <https://developer.arm.com/documentation/ddi0596/2021-12/Base-Instructions/TST--shifted-register---Test--shifted-register---an-alias-of-ANDS--shifted-register--?lang=en>
     pub fn tst(rn: u8, rm: u8, num_bits: u8) -> Self {
         Self { rd: 31, rn, imm6: 0, rm, n: N::No, shift: Shift::LSL, opc: Opc::Ands, sf: num_bits.into() }
     }
 }
 
-/// https://developer.arm.com/documentation/ddi0602/2022-03/Index-by-Encoding/Data-Processing----Register?lang=en
+/// <https://developer.arm.com/documentation/ddi0602/2022-03/Index-by-Encoding/Data-Processing----Register?lang=en>
 const FAMILY: u32 = 0b0101;
 
 impl From<LogicalReg> for u32 {
diff --git a/yjit/src/asm/arm64/inst/madd.rs b/yjit/src/asm/arm64/inst/madd.rs
index 683e6431893130..71f2ab230a9adf 100644
--- a/yjit/src/asm/arm64/inst/madd.rs
+++ b/yjit/src/asm/arm64/inst/madd.rs
@@ -28,7 +28,7 @@ pub struct MAdd {
 
 impl MAdd {
     /// MUL
-    /// https://developer.arm.com/documentation/ddi0602/2023-06/Base-Instructions/MUL--Multiply--an-alias-of-MADD-
+    /// <https://developer.arm.com/documentation/ddi0602/2023-06/Base-Instructions/MUL--Multiply--an-alias-of-MADD->
     pub fn mul(rd: u8, rn: u8, rm: u8, num_bits: u8) -> Self {
         Self { rd, rn, ra: 0b11111, rm, sf: num_bits.into() }
     }
diff --git a/yjit/src/asm/arm64/inst/mov.rs b/yjit/src/asm/arm64/inst/mov.rs
index e7cb9215b0774f..eae4565c3ab0ce 100644
--- a/yjit/src/asm/arm64/inst/mov.rs
+++ b/yjit/src/asm/arm64/inst/mov.rs
@@ -56,19 +56,19 @@ pub struct Mov {
 
 impl Mov {
     /// MOVK
-    /// https://developer.arm.com/documentation/ddi0602/2022-03/Base-Instructions/MOVK--Move-wide-with-keep-?lang=en
+    /// <https://developer.arm.com/documentation/ddi0602/2022-03/Base-Instructions/MOVK--Move-wide-with-keep-?lang=en>
     pub fn movk(rd: u8, imm16: u16, hw: u8, num_bits: u8) -> Self {
         Self { rd, imm16, hw: hw.into(), op: Op::MOVK, sf: num_bits.into() }
     }
 
     /// MOVZ
-    /// https://developer.arm.com/documentation/ddi0602/2022-03/Base-Instructions/MOVZ--Move-wide-with-zero-?lang=en
+    /// <https://developer.arm.com/documentation/ddi0602/2022-03/Base-Instructions/MOVZ--Move-wide-with-zero-?lang=en>
     pub fn movz(rd: u8, imm16: u16, hw: u8, num_bits: u8) -> Self {
         Self { rd, imm16, hw: hw.into(), op: Op::MOVZ, sf: num_bits.into() }
     }
 }
 
-/// https://developer.arm.com/documentation/ddi0602/2022-03/Index-by-Encoding/Data-Processing----Immediate?lang=en
+/// <https://developer.arm.com/documentation/ddi0602/2022-03/Index-by-Encoding/Data-Processing----Immediate?lang=en>
 const FAMILY: u32 = 0b1000;
 
 impl From<Mov> for u32 {
diff --git a/yjit/src/asm/arm64/inst/nop.rs b/yjit/src/asm/arm64/inst/nop.rs
index d58b3574a92813..081d8558f5741e 100644
--- a/yjit/src/asm/arm64/inst/nop.rs
+++ b/yjit/src/asm/arm64/inst/nop.rs
@@ -10,7 +10,7 @@ pub struct Nop;
 
 impl Nop {
     /// NOP
-    /// https://developer.arm.com/documentation/ddi0602/2022-03/Base-Instructions/NOP--No-Operation-
+    /// <https://developer.arm.com/documentation/ddi0602/2022-03/Base-Instructions/NOP--No-Operation->
     pub fn nop() -> Self {
         Self {}
     }
diff --git a/yjit/src/asm/arm64/inst/pc_rel.rs b/yjit/src/asm/arm64/inst/pc_rel.rs
index bd1a2b93674b84..2ea586a77816c8 100644
--- a/yjit/src/asm/arm64/inst/pc_rel.rs
+++ b/yjit/src/asm/arm64/inst/pc_rel.rs
@@ -30,19 +30,19 @@ pub struct PCRelative {
 
 impl PCRelative {
     /// ADR
-    /// https://developer.arm.com/documentation/ddi0602/2022-03/Base-Instructions/ADR--Form-PC-relative-address-
+    /// <https://developer.arm.com/documentation/ddi0602/2022-03/Base-Instructions/ADR--Form-PC-relative-address->
     pub fn adr(rd: u8, imm: i32) -> Self {
         Self { rd, imm, op: Op::ADR }
     }
 
     /// ADRP
-    /// https://developer.arm.com/documentation/ddi0602/2022-03/Base-Instructions/ADRP--Form-PC-relative-address-to-4KB-page-
+    /// <https://developer.arm.com/documentation/ddi0602/2022-03/Base-Instructions/ADRP--Form-PC-relative-address-to-4KB-page->
     pub fn adrp(rd: u8, imm: i32) -> Self {
         Self { rd, imm: imm >> 12, op: Op::ADRP }
     }
 }
 
-/// https://developer.arm.com/documentation/ddi0602/2022-03/Index-by-Encoding/Data-Processing----Immediate?lang=en
+/// <https://developer.arm.com/documentation/ddi0602/2022-03/Index-by-Encoding/Data-Processing----Immediate?lang=en>
 const FAMILY: u32 = 0b1000;
 
 impl From<PCRelative> for u32 {
diff --git a/yjit/src/asm/arm64/inst/reg_pair.rs b/yjit/src/asm/arm64/inst/reg_pair.rs
index 87690e3b4ab0e1..9bffcd847925c1 100644
--- a/yjit/src/asm/arm64/inst/reg_pair.rs
+++ b/yjit/src/asm/arm64/inst/reg_pair.rs
@@ -68,49 +68,49 @@ impl RegisterPair {
     }
 
     /// LDP (signed offset)
-    /// LDP <Xt1>, <Xt2>, [<Xn|SP>{, #<imm>}]
-    /// https://developer.arm.com/documentation/ddi0596/2021-12/Base-Instructions/LDP--Load-Pair-of-Registers-?lang=en
+    /// `LDP <Xt1>, <Xt2>, [<Xn|SP>{, #<imm>}]`
+    /// <https://developer.arm.com/documentation/ddi0596/2021-12/Base-Instructions/LDP--Load-Pair-of-Registers-?lang=en>
     pub fn ldp(rt1: u8, rt2: u8, rn: u8, disp: i16, num_bits: u8) -> Self {
         Self::new(rt1, rt2, rn, disp, Index::LoadSignedOffset, num_bits)
     }
 
     /// LDP (pre-index)
-    /// LDP <Xt1>, <Xt2>, [<Xn|SP>, #<imm>]!
-    /// https://developer.arm.com/documentation/ddi0596/2021-12/Base-Instructions/LDP--Load-Pair-of-Registers-?lang=en
+    /// `LDP <Xt1>, <Xt2>, [<Xn|SP>, #<imm>]!`
+    /// <https://developer.arm.com/documentation/ddi0596/2021-12/Base-Instructions/LDP--Load-Pair-of-Registers-?lang=en>
     pub fn ldp_pre(rt1: u8, rt2: u8, rn: u8, disp: i16, num_bits: u8) -> Self {
         Self::new(rt1, rt2, rn, disp, Index::LoadPreIndex, num_bits)
     }
 
     /// LDP (post-index)
-    /// LDP <Xt1>, <Xt2>, [<Xn|SP>], #<imm>
-    /// https://developer.arm.com/documentation/ddi0596/2021-12/Base-Instructions/LDP--Load-Pair-of-Registers-?lang=en
+    /// `LDP <Xt1>, <Xt2>, [<Xn|SP>], #<imm>`
+    /// <https://developer.arm.com/documentation/ddi0596/2021-12/Base-Instructions/LDP--Load-Pair-of-Registers-?lang=en>
     pub fn ldp_post(rt1: u8, rt2: u8, rn: u8, disp: i16, num_bits: u8) -> Self {
         Self::new(rt1, rt2, rn, disp, Index::LoadPostIndex, num_bits)
     }
 
     /// STP (signed offset)
-    /// STP <Xt1>, <Xt2>, [<Xn|SP>{, #<imm>}]
-    /// https://developer.arm.com/documentation/ddi0596/2021-12/Base-Instructions/STP--Store-Pair-of-Registers-?lang=en
+    /// `STP <Xt1>, <Xt2>, [<Xn|SP>{, #<imm>}]`
+    /// <https://developer.arm.com/documentation/ddi0596/2021-12/Base-Instructions/STP--Store-Pair-of-Registers-?lang=en>
     pub fn stp(rt1: u8, rt2: u8, rn: u8, disp: i16, num_bits: u8) -> Self {
         Self::new(rt1, rt2, rn, disp, Index::StoreSignedOffset, num_bits)
     }
 
     /// STP (pre-index)
-    /// STP <Xt1>, <Xt2>, [<Xn|SP>, #<imm>]!
-    /// https://developer.arm.com/documentation/ddi0596/2021-12/Base-Instructions/STP--Store-Pair-of-Registers-?lang=en
+    /// `STP <Xt1>, <Xt2>, [<Xn|SP>, #<imm>]!`
+    /// <https://developer.arm.com/documentation/ddi0596/2021-12/Base-Instructions/STP--Store-Pair-of-Registers-?lang=en>
     pub fn stp_pre(rt1: u8, rt2: u8, rn: u8, disp: i16, num_bits: u8) -> Self {
         Self::new(rt1, rt2, rn, disp, Index::StorePreIndex, num_bits)
     }
 
     /// STP (post-index)
-    /// STP <Xt1>, <Xt2>, [<Xn|SP>], #<imm>
-    /// https://developer.arm.com/documentation/ddi0596/2021-12/Base-Instructions/STP--Store-Pair-of-Registers-?lang=en
+    /// `STP <Xt1>, <Xt2>, [<Xn|SP>], #<imm>`
+    /// <https://developer.arm.com/documentation/ddi0596/2021-12/Base-Instructions/STP--Store-Pair-of-Registers-?lang=en>
     pub fn stp_post(rt1: u8, rt2: u8, rn: u8, disp: i16, num_bits: u8) -> Self {
         Self::new(rt1, rt2, rn, disp, Index::StorePostIndex, num_bits)
     }
 }
 
-/// https://developer.arm.com/documentation/ddi0602/2022-03/Index-by-Encoding/Loads-and-Stores?lang=en
+/// <https://developer.arm.com/documentation/ddi0602/2022-03/Index-by-Encoding/Loads-and-Stores?lang=en>
 const FAMILY: u32 = 0b0100;
 
 impl From<RegisterPair> for u32 {
diff --git a/yjit/src/asm/arm64/inst/sbfm.rs b/yjit/src/asm/arm64/inst/sbfm.rs
index 860299898040fc..12944ba722923e 100644
--- a/yjit/src/asm/arm64/inst/sbfm.rs
+++ b/yjit/src/asm/arm64/inst/sbfm.rs
@@ -32,7 +32,7 @@ pub struct SBFM {
 
 impl SBFM {
     /// ASR
-    /// https://developer.arm.com/documentation/ddi0596/2020-12/Base-Instructions/ASR--immediate---Arithmetic-Shift-Right--immediate---an-alias-of-SBFM-?lang=en
+    /// <https://developer.arm.com/documentation/ddi0596/2020-12/Base-Instructions/ASR--immediate---Arithmetic-Shift-Right--immediate---an-alias-of-SBFM-?lang=en>
     pub fn asr(rd: u8, rn: u8, shift: u8, num_bits: u8) -> Self {
         let (imms, n) = if num_bits == 64 {
             (0b111111, true)
@@ -44,13 +44,13 @@ impl SBFM {
     }
 
     /// SXTW
-    /// https://developer.arm.com/documentation/ddi0596/2021-12/Base-Instructions/SXTW--Sign-Extend-Word--an-alias-of-SBFM-?lang=en
+    /// <https://developer.arm.com/documentation/ddi0596/2021-12/Base-Instructions/SXTW--Sign-Extend-Word--an-alias-of-SBFM-?lang=en>
     pub fn sxtw(rd: u8, rn: u8) -> Self {
         Self { rd, rn, immr: 0, imms: 31, n: true, sf: Sf::Sf64 }
     }
 }
 
-/// https://developer.arm.com/documentation/ddi0602/2022-03/Index-by-Encoding/Data-Processing----Immediate?lang=en#bitfield
+/// <https://developer.arm.com/documentation/ddi0602/2022-03/Index-by-Encoding/Data-Processing----Immediate?lang=en#bitfield>
 const FAMILY: u32 = 0b1001;
 
 impl From<SBFM> for u32 {
diff --git a/yjit/src/asm/arm64/inst/shift_imm.rs b/yjit/src/asm/arm64/inst/shift_imm.rs
index 3d2685a997b1a2..9dac9a14084ac8 100644
--- a/yjit/src/asm/arm64/inst/shift_imm.rs
+++ b/yjit/src/asm/arm64/inst/shift_imm.rs
@@ -38,13 +38,13 @@ pub struct ShiftImm {
 
 impl ShiftImm {
     /// LSL (immediate)
-    /// https://developer.arm.com/documentation/ddi0596/2020-12/Base-Instructions/LSL--immediate---Logical-Shift-Left--immediate---an-alias-of-UBFM-?lang=en
+    /// <https://developer.arm.com/documentation/ddi0596/2020-12/Base-Instructions/LSL--immediate---Logical-Shift-Left--immediate---an-alias-of-UBFM-?lang=en>
     pub fn lsl(rd: u8, rn: u8, shift: u8, num_bits: u8) -> Self {
         ShiftImm { rd, rn, shift, opc: Opc::LSL, sf: num_bits.into() }
     }
 
     /// LSR (immediate)
-    /// https://developer.arm.com/documentation/ddi0602/2021-12/Base-Instructions/LSR--immediate---Logical-Shift-Right--immediate---an-alias-of-UBFM-?lang=en
+    /// <https://developer.arm.com/documentation/ddi0602/2021-12/Base-Instructions/LSR--immediate---Logical-Shift-Right--immediate---an-alias-of-UBFM-?lang=en>
     pub fn lsr(rd: u8, rn: u8, shift: u8, num_bits: u8) -> Self {
         ShiftImm { rd, rn, shift, opc: Opc::LSR, sf: num_bits.into() }
     }
@@ -85,7 +85,7 @@ impl ShiftImm {
     }
 }
 
-/// https://developer.arm.com/documentation/ddi0602/2022-03/Index-by-Encoding/Data-Processing----Immediate?lang=en#bitfield
+/// <https://developer.arm.com/documentation/ddi0602/2022-03/Index-by-Encoding/Data-Processing----Immediate?lang=en#bitfield>
 const FAMILY: u32 = 0b10011;
 
 impl From<ShiftImm> for u32 {
diff --git a/yjit/src/asm/arm64/inst/smulh.rs b/yjit/src/asm/arm64/inst/smulh.rs
index 796a19433fb362..f355cb6531035e 100644
--- a/yjit/src/asm/arm64/inst/smulh.rs
+++ b/yjit/src/asm/arm64/inst/smulh.rs
@@ -1,4 +1,4 @@
-/// The struct that represents an A64 signed multipy high instruction
+/// The struct that represents an A64 signed multiply high instruction
 ///
 /// +-------------+-------------+-------------+-------------+-------------+-------------+-------------+-------------+
 /// | 31 30 29 28 | 27 26 25 24 | 23 22 21 20 | 19 18 17 16 | 15 14 13 12 | 11 10 09 08 | 07 06 05 04 | 03 02 01 00 |
@@ -22,7 +22,7 @@ pub struct SMulH {
 
 impl SMulH {
     /// SMULH
-    /// https://developer.arm.com/documentation/ddi0602/2023-06/Base-Instructions/SMULH--Signed-Multiply-High-
+    /// <https://developer.arm.com/documentation/ddi0602/2023-06/Base-Instructions/SMULH--Signed-Multiply-High->
     pub fn smulh(rd: u8, rn: u8, rm: u8) -> Self {
         Self { rd, rn, ra: 0b11111, rm }
     }
diff --git a/yjit/src/asm/arm64/inst/sys_reg.rs b/yjit/src/asm/arm64/inst/sys_reg.rs
index 108737a870a92f..7191dfbfd9ed33 100644
--- a/yjit/src/asm/arm64/inst/sys_reg.rs
+++ b/yjit/src/asm/arm64/inst/sys_reg.rs
@@ -32,19 +32,19 @@ pub struct SysReg {
 
 impl SysReg {
     /// MRS (register)
-    /// https://developer.arm.com/documentation/ddi0602/2022-03/Base-Instructions/MRS--Move-System-Register-?lang=en
+    /// <https://developer.arm.com/documentation/ddi0602/2022-03/Base-Instructions/MRS--Move-System-Register-?lang=en>
     pub fn mrs(rt: u8, systemreg: SystemRegister) -> Self {
         SysReg { rt, systemreg, l: L::MRS }
     }
 
     /// MSR (register)
-    /// https://developer.arm.com/documentation/ddi0596/2021-12/Base-Instructions/MSR--register---Move-general-purpose-register-to-System-Register-?lang=en
+    /// <https://developer.arm.com/documentation/ddi0596/2021-12/Base-Instructions/MSR--register---Move-general-purpose-register-to-System-Register-?lang=en>
     pub fn msr(systemreg: SystemRegister, rt: u8) -> Self {
         SysReg { rt, systemreg, l: L::MSR }
     }
 }
 
-/// https://developer.arm.com/documentation/ddi0602/2022-03/Index-by-Encoding/Branches--Exception-Generating-and-System-instructions?lang=en#systemmove
+/// <https://developer.arm.com/documentation/ddi0602/2022-03/Index-by-Encoding/Branches--Exception-Generating-and-System-instructions?lang=en#systemmove>
 const FAMILY: u32 = 0b110101010001;
 
 impl From<SysReg> for u32 {
diff --git a/yjit/src/asm/arm64/inst/test_bit.rs b/yjit/src/asm/arm64/inst/test_bit.rs
index c57a05ad2b83c6..f7aeca70fda8af 100644
--- a/yjit/src/asm/arm64/inst/test_bit.rs
+++ b/yjit/src/asm/arm64/inst/test_bit.rs
@@ -60,19 +60,19 @@ pub struct TestBit {
 
 impl TestBit {
     /// TBNZ
-    /// https://developer.arm.com/documentation/ddi0596/2021-12/Base-Instructions/TBNZ--Test-bit-and-Branch-if-Nonzero-?lang=en
+    /// <https://developer.arm.com/documentation/ddi0596/2021-12/Base-Instructions/TBNZ--Test-bit-and-Branch-if-Nonzero-?lang=en>
     pub fn tbnz(rt: u8, bit_num: u8, offset: i16) -> Self {
         Self { rt, imm14: offset, b40: bit_num & 0b11111, op: Op::TBNZ, b5: bit_num.into() }
     }
 
     /// TBZ
-    /// https://developer.arm.com/documentation/ddi0596/2021-12/Base-Instructions/TBZ--Test-bit-and-Branch-if-Zero-?lang=en
+    /// <https://developer.arm.com/documentation/ddi0596/2021-12/Base-Instructions/TBZ--Test-bit-and-Branch-if-Zero-?lang=en>
     pub fn tbz(rt: u8, bit_num: u8, offset: i16) -> Self {
         Self { rt, imm14: offset, b40: bit_num & 0b11111, op: Op::TBZ, b5: bit_num.into() }
     }
 }
 
-/// https://developer.arm.com/documentation/ddi0602/2022-03/Index-by-Encoding/Branches--Exception-Generating-and-System-instructions?lang=en
+/// <https://developer.arm.com/documentation/ddi0602/2022-03/Index-by-Encoding/Branches--Exception-Generating-and-System-instructions?lang=en>
 const FAMILY: u32 = 0b11011;
 
 impl From<TestBit> for u32 {
diff --git a/yjit/src/asm/arm64/mod.rs b/yjit/src/asm/arm64/mod.rs
index eb99c00ba7cba1..18b5270f9d0d05 100644
--- a/yjit/src/asm/arm64/mod.rs
+++ b/yjit/src/asm/arm64/mod.rs
@@ -215,6 +215,9 @@ pub const fn bcond_offset_fits_bits(offset: i64) -> bool {
     imm_fits_bits(offset, 19)
 }
 
+/// CBZ and CBNZ also have a limit of 19 bits for the branch offset.
+pub use bcond_offset_fits_bits as cmp_branch_offset_fits_bits;
+
 /// B.cond - branch to target if condition is true
 pub fn bcond(cb: &mut CodeBlock, cond: u8, offset: InstructionOffset) {
     assert!(bcond_offset_fits_bits(offset.into()), "The offset must be 19 bits or less.");
@@ -254,7 +257,7 @@ pub fn br(cb: &mut CodeBlock, rn: A64Opnd) {
 /// BRK - create a breakpoint
 pub fn brk(cb: &mut CodeBlock, imm16: A64Opnd) {
     let bytes: [u8; 4] = match imm16 {
-        A64Opnd::None => Breakpoint::brk(0).into(),
+        A64Opnd::None => Breakpoint::brk(0xf000).into(),
         A64Opnd::UImm(imm16) => {
             assert!(uimm_fits_bits(imm16, 16), "The immediate operand must be 16 bits or less.");
             Breakpoint::brk(imm16 as u16).into()
@@ -276,6 +279,9 @@ pub fn cmp(cb: &mut CodeBlock, rn: A64Opnd, rm: A64Opnd) {
 
             DataReg::cmp(rn.reg_no, rm.reg_no, rn.num_bits).into()
         },
+        (A64Opnd::Reg(rn), A64Opnd::Imm(imm12)) => {
+            DataImm::cmp(rn.reg_no, (imm12 as u64).try_into().unwrap(), rn.num_bits).into()
+        },
         (A64Opnd::Reg(rn), A64Opnd::UImm(imm12)) => {
             DataImm::cmp(rn.reg_no, imm12.try_into().unwrap(), rn.num_bits).into()
         },
@@ -1093,6 +1099,48 @@ pub fn tst(cb: &mut CodeBlock, rn: A64Opnd, rm: A64Opnd) {
     cb.write_bytes(&bytes);
 }
 
+/// CBZ - branch if a register is zero
+pub fn cbz(cb: &mut CodeBlock, rt: A64Opnd, offset: InstructionOffset) {
+    assert!(imm_fits_bits(offset.into(), 19), "jump offset for cbz must fit in 19 bits");
+    let bytes: [u8; 4] = if let A64Opnd::Reg(rt) = rt {
+        cbz_cbnz(rt.num_bits, false, offset, rt.reg_no)
+    } else {
+        panic!("Invalid operand combination to cbz instruction.")
+    };
+
+    cb.write_bytes(&bytes);
+}
+
+/// CBNZ - branch if a register is non-zero
+pub fn cbnz(cb: &mut CodeBlock, rt: A64Opnd, offset: InstructionOffset) {
+    assert!(imm_fits_bits(offset.into(), 19), "jump offset for cbz must fit in 19 bits");
+    let bytes: [u8; 4] = if let A64Opnd::Reg(rt) = rt {
+        cbz_cbnz(rt.num_bits, true, offset, rt.reg_no)
+    } else {
+        panic!("Invalid operand combination to cbnz instruction.")
+    };
+
+    cb.write_bytes(&bytes);
+}
+
+/// Encode Compare and Branch on Zero (CBZ) with `op=0` or Compare and Branch on Nonzero (CBNZ)
+/// with `op=1`.
+///
+/// <https://developer.arm.com/documentation/ddi0602/2024-03/Base-Instructions/CBZ--Compare-and-Branch-on-Zero->
+///
+/// +-------------+-------------+-------------+-------------+-------------+-------------+-------------+-------------+
+/// | 31 30 29 28 | 27 26 25 24 | 23 22 21 20 | 19 18 17 16 | 15 14 13 12 | 11 10 09 08 | 07 06 05 04 | 03 02 01 00 |
+/// | sf  0  1  1    0  1  0 op                                                                                     |
+/// |                             imm19........................................................... Rt.............. |
+/// +-------------+-------------+-------------+-------------+-------------+-------------+-------------+-------------+
+fn cbz_cbnz(num_bits: u8, op: bool, offset: InstructionOffset, rt: u8) -> [u8; 4] {
+    ((Sf::from(num_bits) as u32) << 31 |
+          0b11010 << 25 |
+          u32::from(op) << 24 |
+          truncate_imm::<_, 19>(offset) << 5 |
+          rt as u32).to_le_bytes()
+}
+
 #[cfg(test)]
 mod tests {
     use super::*;
@@ -1267,9 +1315,27 @@ mod tests {
         check_bytes("80021fd6", |cb| br(cb, X20));
     }
 
+    #[test]
+    fn test_cbz() {
+        let offset = InstructionOffset::from_insns(-1);
+        check_bytes("e0ffffb4e0ffff34", |cb| {
+            cbz(cb, X0, offset);
+            cbz(cb, W0, offset);
+        });
+    }
+
+    #[test]
+    fn test_cbnz() {
+        let offset = InstructionOffset::from_insns(2);
+        check_bytes("540000b554000035", |cb| {
+            cbnz(cb, X20, offset);
+            cbnz(cb, W20, offset);
+        });
+    }
+
     #[test]
     fn test_brk_none() {
-        check_bytes("000020d4", |cb| brk(cb, A64Opnd::None));
+        check_bytes("00003ed4", |cb| brk(cb, A64Opnd::None));
     }
 
     #[test]
diff --git a/yjit/src/asm/mod.rs b/yjit/src/asm/mod.rs
index 989fcd2a0fc94a..ebdc205da96518 100644
--- a/yjit/src/asm/mod.rs
+++ b/yjit/src/asm/mod.rs
@@ -1,17 +1,14 @@
-use std::cell::RefCell;
 use std::fmt;
 use std::mem;
 use std::rc::Rc;
+use std::collections::BTreeMap;
+
 use crate::core::IseqPayload;
 use crate::core::for_each_off_stack_iseq_payload;
 use crate::core::for_each_on_stack_iseq_payload;
 use crate::invariants::rb_yjit_tracing_invalidate_all;
 use crate::stats::incr_counter;
 use crate::virtualmem::WriteError;
-
-#[cfg(feature = "disasm")]
-use std::collections::BTreeMap;
-
 use crate::codegen::CodegenGlobals;
 use crate::virtualmem::{VirtualMem, CodePtr};
 
@@ -46,7 +43,7 @@ pub struct LabelRef {
 /// Block of memory into which instructions can be assembled
 pub struct CodeBlock {
     // Memory for storing the encoded instructions
-    mem_block: Rc<RefCell<VirtualMem>>,
+    mem_block: Rc<VirtualMem>,
 
     // Size of a code page in bytes. Each code page is split into an inlined and an outlined portion.
     // Code GC collects code memory at this granularity.
@@ -59,6 +56,9 @@ pub struct CodeBlock {
     // Current writing position
     write_pos: usize,
 
+    // The index of the last page with written bytes
+    last_page_idx: usize,
+
     // Total number of bytes written to past pages
     past_page_bytes: usize,
 
@@ -74,8 +74,10 @@ pub struct CodeBlock {
     // References to labels
     label_refs: Vec<LabelRef>,
 
+    // A switch for keeping comments. They take up memory.
+    keep_comments: bool,
+
     // Comments for assembly instructions, if that feature is enabled
-    #[cfg(feature = "disasm")]
     asm_comments: BTreeMap<usize, Vec<String>>,
 
     // True for OutlinedCb
@@ -104,27 +106,28 @@ impl CodeBlock {
     const PREFERRED_CODE_PAGE_SIZE: usize = 16 * 1024;
 
     /// Make a new CodeBlock
-    pub fn new(mem_block: Rc<RefCell<VirtualMem>>, outlined: bool, freed_pages: Rc<Option<Vec<usize>>>) -> Self {
+    pub fn new(mem_block: Rc<VirtualMem>, outlined: bool, freed_pages: Rc<Option<Vec<usize>>>, keep_comments: bool) -> Self {
         // Pick the code page size
-        let system_page_size = mem_block.borrow().system_page_size();
+        let system_page_size = mem_block.system_page_size();
         let page_size = if 0 == Self::PREFERRED_CODE_PAGE_SIZE % system_page_size {
             Self::PREFERRED_CODE_PAGE_SIZE
         } else {
             system_page_size
         };
 
-        let mem_size = mem_block.borrow().virtual_region_size();
+        let mem_size = mem_block.virtual_region_size();
         let mut cb = Self {
             mem_block,
             mem_size,
             page_size,
             write_pos: 0,
+            last_page_idx: 0,
             past_page_bytes: 0,
             page_end_reserve: 0,
             label_addrs: Vec::new(),
             label_names: Vec::new(),
             label_refs: Vec::new(),
-            #[cfg(feature = "disasm")]
+            keep_comments,
             asm_comments: BTreeMap::new(),
             outlined,
             dropped_bytes: false,
@@ -132,11 +135,16 @@ impl CodeBlock {
         };
         cb.page_end_reserve = cb.jmp_ptr_bytes();
         cb.write_pos = cb.page_start();
+
+        #[cfg(not(test))]
+        assert_eq!(0, mem_size % page_size, "partially in-bounds code pages should be impossible");
+
         cb
     }
 
     /// Move the CodeBlock to the next page. If it's on the furthest page,
     /// move the other CodeBlock to the next page as well.
+    #[must_use]
     pub fn next_page<F: Fn(&mut CodeBlock, CodePtr)>(&mut self, base_ptr: CodePtr, jmp_ptr: F) -> bool {
         let old_write_ptr = self.get_write_ptr();
         self.set_write_ptr(base_ptr);
@@ -185,29 +193,32 @@ impl CodeBlock {
         // but you need to waste some space for keeping write_pos for every single page.
         // It doesn't seem necessary for performance either. So we're currently not doing it.
         let dst_pos = self.get_page_pos(page_idx);
-        if self.page_size * page_idx < self.mem_size && self.write_pos < dst_pos {
+        if self.write_pos < dst_pos {
+            // Fail if next page is out of bounds
+            if dst_pos >= self.mem_size {
+                return false;
+            }
+
             // Reset dropped_bytes
             self.dropped_bytes = false;
 
-            // Convert dst_pos to dst_ptr
-            let src_pos = self.write_pos;
-            self.write_pos = dst_pos;
-            let dst_ptr = self.get_write_ptr();
-            self.write_pos = src_pos;
-            self.without_page_end_reserve(|cb| assert!(cb.has_capacity(cb.jmp_ptr_bytes())));
-
             // Generate jmp_ptr from src_pos to dst_pos
+            let dst_ptr = self.get_ptr(dst_pos);
             self.without_page_end_reserve(|cb| {
+                assert!(cb.has_capacity(cb.jmp_ptr_bytes()));
                 cb.add_comment("jump to next page");
                 jmp_ptr(cb, dst_ptr);
-                assert!(!cb.has_dropped_bytes());
             });
 
-            // Update past_page_bytes for code_size()
-            self.past_page_bytes += self.current_page_bytes();
+            // Update past_page_bytes for code_size() if this is a new page
+            if self.last_page_idx < page_idx {
+                self.past_page_bytes += self.current_page_bytes();
+            }
 
             // Start the next code from dst_pos
             self.write_pos = dst_pos;
+            // Update the last_page_idx if page_idx points to the furthest page
+            self.last_page_idx = usize::max(self.last_page_idx, page_idx);
         }
         !self.dropped_bytes
     }
@@ -226,9 +237,9 @@ impl CodeBlock {
             }
 
             // Free the grouped pages at once
-            let start_ptr = self.mem_block.borrow().start_ptr().add_bytes(page_idx * self.page_size);
+            let start_ptr = self.mem_block.start_ptr().add_bytes(page_idx * self.page_size);
             let batch_size = self.page_size * batch_idxs.len();
-            self.mem_block.borrow_mut().free_bytes(start_ptr, batch_size as u32);
+            self.mem_block.free_bytes(start_ptr, batch_size as u32);
         }
     }
 
@@ -237,13 +248,13 @@ impl CodeBlock {
     }
 
     pub fn mapped_region_size(&self) -> usize {
-        self.mem_block.borrow().mapped_region_size()
+        self.mem_block.mapped_region_size()
     }
 
     /// Size of the region in bytes where writes could be attempted.
     #[cfg(target_arch = "aarch64")]
     pub fn virtual_region_size(&self) -> usize {
-        self.mem_block.borrow().virtual_region_size()
+        self.mem_block.virtual_region_size()
     }
 
     /// Return the number of code pages that have been mapped by the VirtualMemory.
@@ -255,7 +266,7 @@ impl CodeBlock {
 
     /// Return the number of code pages that have been reserved by the VirtualMemory.
     pub fn num_virtual_pages(&self) -> usize {
-        let virtual_region_size = self.mem_block.borrow().virtual_region_size();
+        let virtual_region_size = self.mem_block.virtual_region_size();
         // CodeBlock's page size != VirtualMem's page size on Linux,
         // so mapped_region_size % self.page_size may not be 0
         ((virtual_region_size - 1) / self.page_size) + 1
@@ -315,13 +326,12 @@ impl CodeBlock {
     }
 
     /// Return the address ranges of a given address range that this CodeBlock can write.
-    #[cfg(any(feature = "disasm", target_arch = "aarch64"))]
     #[allow(dead_code)]
     pub fn writable_addrs(&self, start_ptr: CodePtr, end_ptr: CodePtr) -> Vec<(usize, usize)> {
-        let region_start = self.get_ptr(0).into_usize();
-        let region_end = self.get_ptr(self.get_mem_size()).into_usize();
-        let mut start = start_ptr.into_usize();
-        let end = std::cmp::min(end_ptr.into_usize(), region_end);
+        let region_start = self.get_ptr(0).raw_addr(self);
+        let region_end = self.get_ptr(self.get_mem_size()).raw_addr(self);
+        let mut start = start_ptr.raw_addr(self);
+        let end = std::cmp::min(end_ptr.raw_addr(self), region_end);
 
         let freed_pages = self.freed_pages.as_ref().as_ref();
         let mut addrs = vec![];
@@ -356,10 +366,12 @@ impl CodeBlock {
     }
 
     /// Add an assembly comment if the feature is on.
-    /// If not, this becomes an inline no-op.
-    #[cfg(feature = "disasm")]
     pub fn add_comment(&mut self, comment: &str) {
-        let cur_ptr = self.get_write_ptr().into_usize();
+        if !self.keep_comments {
+            return;
+        }
+
+        let cur_ptr = self.get_write_ptr().raw_addr(self);
 
         // If there's no current list of comments for this line number, add one.
         let this_line_comments = self.asm_comments.entry(cur_ptr).or_default();
@@ -369,28 +381,21 @@ impl CodeBlock {
             this_line_comments.push(comment.to_string());
         }
     }
-    #[cfg(not(feature = "disasm"))]
-    #[inline]
-    pub fn add_comment(&mut self, _: &str) {}
 
-    #[cfg(feature = "disasm")]
     pub fn comments_at(&self, pos: usize) -> Option<&Vec<String>> {
         self.asm_comments.get(&pos)
     }
 
-    #[allow(unused_variables)]
-    #[cfg(feature = "disasm")]
     pub fn remove_comments(&mut self, start_addr: CodePtr, end_addr: CodePtr) {
-        for addr in start_addr.into_usize()..end_addr.into_usize() {
+        if self.asm_comments.is_empty() {
+            return;
+        }
+        for addr in start_addr.raw_addr(self)..end_addr.raw_addr(self) {
             self.asm_comments.remove(&addr);
         }
     }
-    #[cfg(not(feature = "disasm"))]
-    #[inline]
-    pub fn remove_comments(&mut self, _: CodePtr, _: CodePtr) {}
 
     pub fn clear_comments(&mut self) {
-        #[cfg(feature = "disasm")]
         self.asm_comments.clear();
     }
 
@@ -403,7 +408,7 @@ impl CodeBlock {
     }
 
     pub fn write_mem(&self, write_ptr: CodePtr, byte: u8) -> Result<(), WriteError> {
-        self.mem_block.borrow_mut().write_byte(write_ptr, byte)
+        self.mem_block.write_byte(write_ptr, byte)
     }
 
     // Set the current write position
@@ -417,31 +422,31 @@ impl CodeBlock {
 
     // Set the current write position from a pointer
     pub fn set_write_ptr(&mut self, code_ptr: CodePtr) {
-        let pos = code_ptr.into_usize() - self.mem_block.borrow().start_ptr().into_usize();
-        self.set_pos(pos);
+        let pos = code_ptr.as_offset() - self.mem_block.start_ptr().as_offset();
+        self.set_pos(pos.try_into().unwrap());
     }
 
     /// Get a (possibly dangling) direct pointer into the executable memory block
     pub fn get_ptr(&self, offset: usize) -> CodePtr {
-        self.mem_block.borrow().start_ptr().add_bytes(offset)
+        self.mem_block.start_ptr().add_bytes(offset)
     }
 
     /// Convert an address range to memory page indexes against a num_pages()-sized array.
-    pub fn addrs_to_pages(&self, start_addr: CodePtr, end_addr: CodePtr) -> Vec<usize> {
-        let mem_start = self.mem_block.borrow().start_ptr().into_usize();
-        let mem_end = self.mem_block.borrow().mapped_end_ptr().into_usize();
-        assert!(mem_start <= start_addr.into_usize());
-        assert!(start_addr.into_usize() <= end_addr.into_usize());
-        assert!(end_addr.into_usize() <= mem_end);
+    pub fn addrs_to_pages(&self, start_addr: CodePtr, end_addr: CodePtr) -> impl Iterator<Item = usize> {
+        let mem_start = self.mem_block.start_ptr().raw_addr(self);
+        let mem_end = self.mem_block.mapped_end_ptr().raw_addr(self);
+        assert!(mem_start <= start_addr.raw_addr(self));
+        assert!(start_addr.raw_addr(self) <= end_addr.raw_addr(self));
+        assert!(end_addr.raw_addr(self) <= mem_end);
 
         // Ignore empty code ranges
         if start_addr == end_addr {
-            return vec![];
+            return (0..0).into_iter();
         }
 
-        let start_page = (start_addr.into_usize() - mem_start) / self.page_size;
-        let end_page = (end_addr.into_usize() - mem_start - 1) / self.page_size;
-        (start_page..=end_page).collect() // TODO: consider returning an iterator
+        let start_page = (start_addr.raw_addr(self) - mem_start) / self.page_size;
+        let end_page = (end_addr.raw_addr(self) - mem_start - 1) / self.page_size;
+        (start_page..end_page + 1).into_iter()
     }
 
     /// Get a (possibly dangling) direct pointer to the current write position
@@ -452,7 +457,7 @@ impl CodeBlock {
     /// Write a single byte at the current position.
     pub fn write_byte(&mut self, byte: u8) {
         let write_ptr = self.get_write_ptr();
-        if self.has_capacity(1) && self.mem_block.borrow_mut().write_byte(write_ptr, byte).is_ok() {
+        if self.has_capacity(1) && self.mem_block.write_byte(write_ptr, byte).is_ok() {
             self.write_pos += 1;
         } else {
             self.dropped_bytes = true;
@@ -584,8 +589,12 @@ impl CodeBlock {
         self.label_refs = state.label_refs;
     }
 
+    pub fn mark_all_writeable(&mut self) {
+        self.mem_block.mark_all_writeable();
+    }
+
     pub fn mark_all_executable(&mut self) {
-        self.mem_block.borrow_mut().mark_all_executable();
+        self.mem_block.mark_all_executable();
     }
 
     /// Code GC. Free code pages that are not on stack and reuse them.
@@ -681,9 +690,9 @@ impl CodeBlock {
 
         let alloc = TestingAllocator::new(mem_size);
         let mem_start: *const u8 = alloc.mem_start();
-        let virt_mem = VirtualMem::new(alloc, 1, NonNull::new(mem_start as *mut u8).unwrap(), mem_size);
+        let virt_mem = VirtualMem::new(alloc, 1, NonNull::new(mem_start as *mut u8).unwrap(), mem_size, 128 * 1024 * 1024);
 
-        Self::new(Rc::new(RefCell::new(virt_mem)), false, Rc::new(None))
+        Self::new(Rc::new(virt_mem), false, Rc::new(None), true)
     }
 
     /// Stubbed CodeBlock for testing conditions that can arise due to code GC. Can't execute generated code.
@@ -699,9 +708,9 @@ impl CodeBlock {
 
         let alloc = TestingAllocator::new(mem_size);
         let mem_start: *const u8 = alloc.mem_start();
-        let virt_mem = VirtualMem::new(alloc, 1, NonNull::new(mem_start as *mut u8).unwrap(), mem_size);
+        let virt_mem = VirtualMem::new(alloc, 1, NonNull::new(mem_start as *mut u8).unwrap(), mem_size, 128 * 1024 * 1024);
 
-        Self::new(Rc::new(RefCell::new(virt_mem)), false, Rc::new(Some(freed_pages)))
+        Self::new(Rc::new(virt_mem), false, Rc::new(Some(freed_pages)), true)
     }
 }
 
@@ -709,13 +718,20 @@ impl CodeBlock {
 impl fmt::LowerHex for CodeBlock {
     fn fmt(&self, fmtr: &mut fmt::Formatter) -> fmt::Result {
         for pos in 0..self.write_pos {
-            let byte = unsafe { self.mem_block.borrow().start_ptr().raw_ptr().add(pos).read() };
+            let mem_block = &*self.mem_block;
+            let byte = unsafe { mem_block.start_ptr().raw_ptr(mem_block).add(pos).read() };
             fmtr.write_fmt(format_args!("{:02x}", byte))?;
         }
         Ok(())
     }
 }
 
+impl crate::virtualmem::CodePtrBase for CodeBlock {
+    fn base_ptr(&self) -> std::ptr::NonNull<u8> {
+        self.mem_block.base_ptr()
+    }
+}
+
 /// Wrapper struct so we can use the type system to distinguish
 /// Between the inlined and outlined code blocks
 pub struct OutlinedCb {
@@ -805,15 +821,27 @@ mod tests
 
     #[test]
     fn test_code_size() {
+        // Write 4 bytes in the first page
         let mut cb = CodeBlock::new_dummy(CodeBlock::PREFERRED_CODE_PAGE_SIZE * 2);
         cb.write_bytes(&[0, 0, 0, 0]);
         assert_eq!(cb.code_size(), 4);
 
         // Moving to the next page should not increase code_size
-        cb.next_page(cb.get_write_ptr(), |_, _| {});
+        assert!(cb.next_page(cb.get_write_ptr(), |_, _| {}));
         assert_eq!(cb.code_size(), 4);
 
+        // Write 4 bytes in the second page
         cb.write_bytes(&[0, 0, 0, 0]);
         assert_eq!(cb.code_size(), 8);
+
+        // Rewrite 4 bytes in the first page
+        let old_write_pos = cb.get_write_pos();
+        cb.set_pos(0);
+        cb.write_bytes(&[1, 1, 1, 1]);
+
+        // Moving from an old page to the next page should not increase code_size
+        assert!(cb.next_page(cb.get_write_ptr(), |_, _| {}));
+        cb.set_pos(old_write_pos);
+        assert_eq!(cb.code_size(), 8);
     }
 }
diff --git a/yjit/src/asm/x86_64/mod.rs b/yjit/src/asm/x86_64/mod.rs
index 4a7c7e5a84474c..0ef5e92117377e 100644
--- a/yjit/src/asm/x86_64/mod.rs
+++ b/yjit/src/asm/x86_64/mod.rs
@@ -362,11 +362,6 @@ pub fn const_ptr_opnd(ptr: *const u8) -> X86Opnd
     uimm_opnd(ptr as u64)
 }
 
-pub fn code_ptr_opnd(code_ptr: CodePtr) -> X86Opnd
-{
-    uimm_opnd(code_ptr.raw_ptr() as u64)
-}
-
 /// Write the REX byte
 fn write_rex(cb: &mut CodeBlock, w_flag: bool, reg_no: u8, idx_reg_no: u8, rm_reg_no: u8) {
     // 0 1 0 0 w r x b
@@ -696,7 +691,7 @@ pub fn call_ptr(cb: &mut CodeBlock, scratch_opnd: X86Opnd, dst_ptr: *const u8) {
         let end_ptr = cb.get_ptr(cb.write_pos + 5);
 
         // Compute the jump offset
-        let rel64: i64 = dst_ptr as i64 - end_ptr.into_i64();
+        let rel64: i64 = dst_ptr as i64 - end_ptr.raw_ptr(cb) as i64;
 
         // If the offset fits in 32-bit
         if rel64 >= i32::MIN.into() && rel64 <= i32::MAX.into() {
@@ -897,7 +892,7 @@ fn write_jcc_ptr(cb: &mut CodeBlock, op0: u8, op1: u8, dst_ptr: CodePtr) {
     let end_ptr = cb.get_ptr(cb.write_pos + 4);
 
     // Compute the jump offset
-    let rel64 = dst_ptr.into_i64() - end_ptr.into_i64();
+    let rel64 = dst_ptr.as_offset() - end_ptr.as_offset();
 
     if rel64 >= i32::MIN.into() && rel64 <= i32::MAX.into() {
         // Write the relative 32-bit jump offset
@@ -957,6 +952,7 @@ pub fn jmp32(cb: &mut CodeBlock, offset: i32) {
 pub fn lea(cb: &mut CodeBlock, dst: X86Opnd, src: X86Opnd) {
     if let X86Opnd::Reg(reg) = dst {
         assert!(reg.num_bits == 64);
+        assert!(matches!(src, X86Opnd::Mem(_) | X86Opnd::IPRel(_)));
         write_rm(cb, false, true, dst, src, None, &[0x8d]);
     } else {
         unreachable!();
@@ -1031,7 +1027,10 @@ pub fn mov(cb: &mut CodeBlock, dst: X86Opnd, src: X86Opnd) {
             }
 
             let output_num_bits:u32 = if mem.num_bits > 32 { 32 } else { mem.num_bits.into() };
-            assert!(imm_num_bits(imm.value) <= (output_num_bits as u8));
+            assert!(
+                mem.num_bits < 64 || imm_num_bits(imm.value) <= (output_num_bits as u8),
+                "immediate value should be small enough to survive sign extension"
+            );
             cb.write_int(imm.value as u64, output_num_bits);
         },
         // M + UImm
@@ -1046,7 +1045,10 @@ pub fn mov(cb: &mut CodeBlock, dst: X86Opnd, src: X86Opnd) {
             }
 
             let output_num_bits = if mem.num_bits > 32 { 32 } else { mem.num_bits.into() };
-            assert!(imm_num_bits(uimm.value as i64) <= (output_num_bits as u8));
+            assert!(
+                mem.num_bits < 64 || imm_num_bits(uimm.value as i64) <= (output_num_bits as u8),
+                "immediate value should be small enough to survive sign extension"
+            );
             cb.write_int(uimm.value, output_num_bits);
         },
         // * + Imm/UImm
diff --git a/yjit/src/asm/x86_64/tests.rs b/yjit/src/asm/x86_64/tests.rs
index 8e9282e78418e4..eefcbfd52e130b 100644
--- a/yjit/src/asm/x86_64/tests.rs
+++ b/yjit/src/asm/x86_64/tests.rs
@@ -68,7 +68,7 @@ fn test_call_ptr() {
     // calling a lower address
     check_bytes("e8fbffffff", |cb| {
         let ptr = cb.get_write_ptr();
-        call_ptr(cb, RAX, ptr.raw_ptr());
+        call_ptr(cb, RAX, ptr.raw_ptr(cb));
     });
 }
 
@@ -193,6 +193,7 @@ fn test_mov() {
     check_bytes("48c7470801000000", |cb| mov(cb, mem_opnd(64, RDI, 8), imm_opnd(1)));
     //check_bytes("67c7400411000000", |cb| mov(cb, mem_opnd(32, EAX, 4), imm_opnd(0x34))); // We don't distinguish between EAX and RAX here - that's probably fine?
     check_bytes("c7400411000000", |cb| mov(cb, mem_opnd(32, RAX, 4), imm_opnd(17)));
+    check_bytes("c7400401000080", |cb| mov(cb, mem_opnd(32, RAX, 4), uimm_opnd(0x80000001)));
     check_bytes("41895814", |cb| mov(cb, mem_opnd(32, R8, 20), EBX));
     check_bytes("4d8913", |cb| mov(cb, mem_opnd(64, R11, 0), R10));
     check_bytes("48c742f8f4ffffff", |cb| mov(cb, mem_opnd(64, RDX, -8), imm_opnd(-12)));
@@ -442,15 +443,15 @@ fn basic_capstone_usage() -> std::result::Result<(), capstone::Error> {
 fn block_comments() {
     let mut cb = super::CodeBlock::new_dummy(4096);
 
-    let first_write_ptr = cb.get_write_ptr().into_usize();
+    let first_write_ptr = cb.get_write_ptr().raw_addr(&cb);
     cb.add_comment("Beginning");
     xor(&mut cb, EAX, EAX); // 2 bytes long
-    let second_write_ptr = cb.get_write_ptr().into_usize();
+    let second_write_ptr = cb.get_write_ptr().raw_addr(&cb);
     cb.add_comment("Two bytes in");
     cb.add_comment("Still two bytes in");
     cb.add_comment("Still two bytes in"); // Duplicate, should be ignored
     test(&mut cb, mem_opnd(64, RSI, 64), imm_opnd(!0x08)); // 8 bytes long
-    let third_write_ptr = cb.get_write_ptr().into_usize();
+    let third_write_ptr = cb.get_write_ptr().raw_addr(&cb);
     cb.add_comment("Ten bytes in");
 
     assert_eq!(&vec!( "Beginning".to_string() ), cb.comments_at(first_write_ptr).unwrap());
diff --git a/yjit/src/backend/arm64/mod.rs b/yjit/src/backend/arm64/mod.rs
index 1007df9cf8ee6d..66e333f867d451 100644
--- a/yjit/src/backend/arm64/mod.rs
+++ b/yjit/src/backend/arm64/mod.rs
@@ -1,18 +1,11 @@
-#![allow(dead_code)]
-#![allow(unused_variables)]
-#![allow(unused_imports)]
-
 use std::mem::take;
 
-use crate::asm::x86_64::jmp_ptr;
 use crate::asm::{CodeBlock, OutlinedCb};
 use crate::asm::arm64::*;
-use crate::codegen::{JITState, CodegenGlobals};
-use crate::core::Context;
 use crate::cruby::*;
 use crate::backend::ir::*;
 use crate::virtualmem::CodePtr;
-use crate::options::*;
+use crate::utils::*;
 
 // Use the arm64 register type for this platform
 pub type Reg = A64Reg;
@@ -105,14 +98,13 @@ fn emit_jmp_ptr_with_invalidation(cb: &mut CodeBlock, dst_ptr: CodePtr) {
     #[cfg(not(test))]
     {
         let end = cb.get_write_ptr();
-        use crate::cruby::rb_yjit_icache_invalidate;
-        unsafe { rb_yjit_icache_invalidate(start.raw_ptr() as _, end.raw_ptr() as _) };
+        unsafe { rb_yjit_icache_invalidate(start.raw_ptr(cb) as _, end.raw_ptr(cb) as _) };
     }
 }
 
 fn emit_jmp_ptr(cb: &mut CodeBlock, dst_ptr: CodePtr, padding: bool) {
-    let src_addr = cb.get_write_ptr().into_i64();
-    let dst_addr = dst_ptr.into_i64();
+    let src_addr = cb.get_write_ptr().as_offset();
+    let dst_addr = dst_ptr.as_offset();
 
     // If the offset is short enough, then we'll use the
     // branch instruction. Otherwise, we'll move the
@@ -184,6 +176,16 @@ fn emit_load_value(cb: &mut CodeBlock, rd: A64Opnd, value: u64) -> usize {
     }
 }
 
+/// List of registers that can be used for stack temps.
+/// These are caller-saved registers.
+pub static TEMP_REGS: [Reg; 5] = [X1_REG, X9_REG, X10_REG, X14_REG, X15_REG];
+
+#[derive(Debug, PartialEq)]
+enum EmitError {
+    RetryOnNextPage,
+    OutOfMemory,
+}
+
 impl Assembler
 {
     // Special scratch registers for intermediate processing.
@@ -192,10 +194,6 @@ impl Assembler
     const SCRATCH0: A64Opnd = A64Opnd::Reg(Assembler::SCRATCH_REG);
     const SCRATCH1: A64Opnd = A64Opnd::Reg(X17_REG);
 
-    /// List of registers that can be used for stack temps.
-    /// These are caller-saved registers.
-    pub const TEMP_REGS: [Reg; 5] = [X1_REG, X9_REG, X10_REG, X14_REG, X15_REG];
-
     /// Get the list of registers from which we will allocate on this platform
     /// These are caller-saved registers
     /// Note: we intentionally exclude C_RET_REG (X0) from this list
@@ -317,7 +315,11 @@ impl Assembler
             match opnd {
                 Opnd::Reg(_) | Opnd::CArg(_) | Opnd::InsnOut { .. } => opnd,
                 Opnd::Mem(_) => split_load_operand(asm, opnd),
-                Opnd::Imm(_) => asm.load(opnd),
+                Opnd::Imm(imm) => if ShiftedImmediate::try_from(imm as u64).is_ok() {
+                    opnd
+                } else {
+                    asm.load(opnd)
+                }
                 Opnd::UImm(uimm) => {
                     if ShiftedImmediate::try_from(uimm).is_ok() {
                         opnd
@@ -379,7 +381,7 @@ impl Assembler
         }
 
         let live_ranges: Vec<usize> = take(&mut self.live_ranges);
-        let mut asm_local = Assembler::new_with_label_names(take(&mut self.label_names), take(&mut self.side_exits));
+        let mut asm_local = Assembler::new_with_label_names(take(&mut self.label_names), take(&mut self.side_exits), self.num_locals);
         let asm = &mut asm_local;
         let mut iterator = self.into_draining_iter();
 
@@ -429,14 +431,62 @@ impl Assembler
                         }
                     }
                 },
-                Insn::And { left, right, .. } |
-                Insn::Or { left, right, .. } |
-                Insn::Xor { left, right, .. } => {
+                Insn::And { left, right, out } |
+                Insn::Or { left, right, out } |
+                Insn::Xor { left, right, out } => {
                     let (opnd0, opnd1) = split_boolean_operands(asm, *left, *right);
                     *left = opnd0;
                     *right = opnd1;
+
+                    // Since these instructions are lowered to an instruction that have 2 input
+                    // registers and an output register, look to merge with an `Insn::Mov` that
+                    // follows which puts the output in another register. For example:
+                    // `Add a, b => out` followed by `Mov c, out` becomes `Add a, b => c`.
+                    if let (Opnd::Reg(_), Opnd::Reg(_), Some(Insn::Mov { dest, src })) = (left, right, iterator.peek()) {
+                        if live_ranges[index] == index + 1 {
+                            // Check after potentially lowering a stack operand to a register operand
+                            let lowered_dest = if let Opnd::Stack { .. } = dest {
+                                asm.lower_stack_opnd(dest)
+                            } else {
+                                *dest
+                            };
+                            if out == src && matches!(lowered_dest, Opnd::Reg(_)) {
+                                *out = lowered_dest;
+                                iterator.map_insn_index(asm);
+                                iterator.next_unmapped(); // Pop merged Insn::Mov
+                            }
+                        }
+                    }
+
                     asm.push_insn(insn);
-                },
+                }
+                // Lower to Joz and Jonz for generating CBZ/CBNZ for compare-with-0-and-branch.
+                ref insn @ Insn::Cmp { ref left, right: ref right @ (Opnd::UImm(0) | Opnd::Imm(0)) } |
+                ref insn @ Insn::Test { ref left, right: ref right @ (Opnd::InsnOut { .. } | Opnd::Reg(_)) } if {
+                    let same_opnd_if_test = if let Insn::Test { .. } = insn {
+                        left == right
+                    } else {
+                        true
+                    };
+
+                    same_opnd_if_test && if let Some(
+                            Insn::Jz(target) | Insn::Je(target) | Insn::Jnz(target) | Insn::Jne(target)
+                        ) = iterator.peek() {
+                            matches!(target, Target::SideExit { .. })
+                        } else {
+                            false
+                        }
+                } => {
+                    let reg = split_load_operand(asm, *left);
+                    match iterator.peek() {
+                        Some(Insn::Jz(target) | Insn::Je(target))   => asm.push_insn(Insn::Joz(reg, *target)),
+                        Some(Insn::Jnz(target) | Insn::Jne(target)) => asm.push_insn(Insn::Jonz(reg, *target)),
+                        _ => ()
+                    }
+
+                    iterator.map_insn_index(asm);
+                    iterator.next_unmapped(); // Pop merged jump instruction
+                }
                 Insn::CCall { opnds, fptr, .. } => {
                     assert!(opnds.len() <= C_ARG_OPNDS.len());
 
@@ -566,6 +616,7 @@ impl Assembler
                         // If we're attempting to load into a memory operand, then
                         // we'll switch over to the store instruction.
                         (Opnd::Mem(_), _) => {
+                            let opnd0 = split_memory_address(asm, *dest);
                             let value = match *src {
                                 // If the first operand is zero, then we can just use
                                 // the zero register.
@@ -581,7 +632,6 @@ impl Assembler
                                 _ => split_bitmask_immediate(asm, *src, dest.rm_num_bits())
                             };
 
-                            let opnd0 = split_memory_address(asm, *dest);
                             asm.store(opnd0, value);
                         },
                         // If we're loading a memory operand into a register, then
@@ -612,9 +662,9 @@ impl Assembler
 
                     asm.not(opnd0);
                 },
-                Insn::LShift { opnd, shift, .. } |
-                Insn::RShift { opnd, shift, .. } |
-                Insn::URShift { opnd, shift, .. } => {
+                Insn::LShift { opnd, .. } |
+                Insn::RShift { opnd, .. } |
+                Insn::URShift { opnd, .. } => {
                     // The operand must be in a register, so
                     // if we get anything else we need to load it first.
                     let opnd0 = match opnd {
@@ -657,7 +707,7 @@ impl Assembler
                 },
                 Insn::Mul { left, right, .. } => {
                     let opnd0 = split_load_operand(asm, *left);
-                    let opnd1 = split_shifted_immediate(asm, *right);
+                    let opnd1 = split_load_operand(asm, *right);
                     asm.mul(opnd0, opnd1);
                 },
                 Insn::Test { left, right } => {
@@ -693,7 +743,7 @@ impl Assembler
 
     /// Emit platform-specific machine code
     /// Returns a list of GC offsets. Can return failure to signal caller to retry.
-    fn arm64_emit(&mut self, cb: &mut CodeBlock, ocb: &mut Option<&mut OutlinedCb>) -> Result<Vec<u32>, ()> {
+    fn arm64_emit(&mut self, cb: &mut CodeBlock, ocb: &mut Option<&mut OutlinedCb>) -> Result<Vec<u32>, EmitError> {
         /// Determine how many instructions it will take to represent moving
         /// this value into a register. Note that the return value of this
         /// function must correspond to how many instructions are used to
@@ -719,8 +769,8 @@ impl Assembler
         fn emit_conditional_jump<const CONDITION: u8>(cb: &mut CodeBlock, target: Target) {
             match target {
                 Target::CodePtr(dst_ptr) | Target::SideExitPtr(dst_ptr) => {
-                    let dst_addr = dst_ptr.into_i64();
-                    let src_addr = cb.get_write_ptr().into_i64();
+                    let dst_addr = dst_ptr.as_offset();
+                    let src_addr = cb.get_write_ptr().as_offset();
 
                     let num_insns = if bcond_offset_fits_bits((dst_addr - src_addr) / 4) {
                         // If the jump offset fits into the conditional jump as
@@ -749,7 +799,7 @@ impl Assembler
                     } else {
                         // Otherwise, we need to load the address into a
                         // register and use the branch register instruction.
-                        let dst_addr = dst_ptr.into_u64();
+                        let dst_addr = (dst_ptr.raw_ptr(cb) as usize).as_u64();
                         let load_insns: i32 = emit_load_size(dst_addr).into();
 
                         // We're going to write out the inverse condition so
@@ -789,6 +839,45 @@ impl Assembler
             };
         }
 
+        /// Emit a CBZ or CBNZ which branches when a register is zero or non-zero
+        fn emit_cmp_zero_jump(cb: &mut CodeBlock, reg: A64Opnd, branch_if_zero: bool, target: Target) {
+            if let Target::SideExitPtr(dst_ptr) = target {
+                let dst_addr = dst_ptr.as_offset();
+                let src_addr = cb.get_write_ptr().as_offset();
+
+                if cmp_branch_offset_fits_bits((dst_addr - src_addr) / 4) {
+                    // If the offset fits in one instruction, generate cbz or cbnz
+                    let bytes = (dst_addr - src_addr) as i32;
+                    if branch_if_zero {
+                        cbz(cb, reg, InstructionOffset::from_bytes(bytes));
+                    } else {
+                        cbnz(cb, reg, InstructionOffset::from_bytes(bytes));
+                    }
+                } else {
+                    // Otherwise, we load the address into a register and
+                    // use the branch register instruction. Note that because
+                    // side exits should always be close, this form should be
+                    // rare or impossible to see.
+                    let dst_addr = dst_ptr.raw_addr(cb) as u64;
+                    let load_insns: i32 = emit_load_size(dst_addr).into();
+
+                    // Write out the inverse condition so that if
+                    // it doesn't match it will skip over the
+                    // instructions used for branching.
+                    if branch_if_zero {
+                        cbnz(cb, reg, InstructionOffset::from_insns(load_insns + 2));
+                    } else {
+                        cbz(cb, reg, InstructionOffset::from_insns(load_insns + 2));
+                    }
+                    emit_load_value(cb, Assembler::SCRATCH0, dst_addr);
+                    br(cb, Assembler::SCRATCH0);
+
+                }
+            } else {
+                unreachable!("We should only generate Joz/Jonz with side-exit targets");
+            }
+        }
+
         /// Emit a push instruction for the given operand by adding to the stack
         /// pointer and then storing the given value.
         fn emit_push(cb: &mut CodeBlock, opnd: A64Opnd) {
@@ -806,12 +895,13 @@ impl Assembler
             target: Target,
             asm: &mut Assembler,
             ocb: &mut Option<&mut OutlinedCb>,
-        ) -> Target {
+        ) -> Result<Target, EmitError> {
             if let Target::SideExit { counter, context } = target {
-                let side_exit = asm.get_side_exit(&context.unwrap(), Some(counter), ocb.as_mut().unwrap());
-                Target::SideExitPtr(side_exit)
+                let side_exit = asm.get_side_exit(&context.unwrap(), Some(counter), ocb.as_mut().unwrap())
+                    .ok_or(EmitError::OutOfMemory)?;
+                Ok(Target::SideExitPtr(side_exit))
             } else {
-                target
+                Ok(target)
             }
         }
 
@@ -820,11 +910,13 @@ impl Assembler
         // List of GC offsets
         let mut gc_offsets: Vec<u32> = Vec::new();
 
+        // Buffered list of PosMarker callbacks to fire if codegen is successful
+        let mut pos_markers: Vec<(usize, CodePtr)> = vec![];
+
         // For each instruction
         let start_write_pos = cb.get_write_pos();
         let mut insn_idx: usize = 0;
         while let Some(insn) = self.insns.get(insn_idx) {
-            let mut next_insn_idx = insn_idx + 1;
             let src_ptr = cb.get_write_ptr();
             let had_dropped_bytes = cb.has_dropped_bytes();
             let old_label_state = cb.get_label_state();
@@ -832,16 +924,14 @@ impl Assembler
 
             match insn {
                 Insn::Comment(text) => {
-                    if cfg!(feature = "disasm") {
-                        cb.add_comment(text);
-                    }
+                    cb.add_comment(text);
                 },
                 Insn::Label(target) => {
                     cb.write_label(target.unwrap_label_idx());
                 },
                 // Report back the current position in the generated code
-                Insn::PosMarker(pos_marker) => {
-                    pos_marker(cb.get_write_ptr());
+                Insn::PosMarker(..) => {
+                    pos_markers.push((insn_idx, cb.get_write_ptr()))
                 }
                 Insn::BakeString(text) => {
                     for byte in text.as_bytes() {
@@ -878,8 +968,9 @@ impl Assembler
                 },
                 Insn::Mul { left, right, out } => {
                     // If the next instruction is jo (jump on overflow)
-                    match self.insns.get(insn_idx + 1) {
-                        Some(Insn::Jo(target)) => {
+                    match (self.insns.get(insn_idx + 1), self.insns.get(insn_idx + 2)) {
+                        (Some(Insn::JoMul(_)), _) |
+                        (Some(Insn::PosMarker(_)), Some(Insn::JoMul(_))) => {
                             // Compute the high 64 bits
                             smulh(cb, Self::SCRATCH0, left.into(), right.into());
 
@@ -895,9 +986,7 @@ impl Assembler
                             // If the high 64-bits are not all zeros or all ones,
                             // matching the sign bit, then we have an overflow
                             cmp(cb, Self::SCRATCH0, Self::SCRATCH1);
-                            emit_conditional_jump::<{Condition::NE}>(cb, compile_side_exit(*target, self, ocb));
-
-                            next_insn_idx += 1;
+                            // Insn::JoMul will emit_conditional_jump::<{Condition::NE}>
                         }
                         _ => {
                             mul(cb, out.into(), left.into(), right.into());
@@ -1027,14 +1116,20 @@ impl Assembler
                         }
                     };
                 },
-                Insn::LeaLabel { out, target, .. } => {
-                    let label_idx = target.unwrap_label_idx();
-
-                    cb.label_ref(label_idx, 4, |cb, end_addr, dst_addr| {
-                        adr(cb, Self::SCRATCH0, A64Opnd::new_imm(dst_addr - (end_addr - 4)));
-                    });
+                Insn::LeaJumpTarget { out, target, .. } => {
+                    if let Target::Label(label_idx) = target {
+                        // Set output to the raw address of the label
+                        cb.label_ref(*label_idx, 4, |cb, end_addr, dst_addr| {
+                            adr(cb, Self::SCRATCH0, A64Opnd::new_imm(dst_addr - (end_addr - 4)));
+                        });
 
-                    mov(cb, out.into(), Self::SCRATCH0);
+                        mov(cb, out.into(), Self::SCRATCH0);
+                    } else {
+                        // Set output to the jump target's raw address
+                        let target_code = target.unwrap_code_ptr();
+                        let target_addr = target_code.raw_addr(cb).as_u64();
+                        emit_load_value(cb, out.into(), target_addr);
+                    }
                 },
                 Insn::CPush(opnd) => {
                     emit_push(cb, opnd.into());
@@ -1069,7 +1164,7 @@ impl Assembler
                 },
                 Insn::CCall { fptr, .. } => {
                     // The offset to the call target in bytes
-                    let src_addr = cb.get_write_ptr().into_i64();
+                    let src_addr = cb.get_write_ptr().raw_ptr(cb) as i64;
                     let dst_addr = *fptr as i64;
 
                     // Use BL if the offset is short enough to encode as an immediate.
@@ -1094,7 +1189,7 @@ impl Assembler
                     br(cb, opnd.into());
                 },
                 Insn::Jmp(target) => {
-                    match compile_side_exit(*target, self, ocb) {
+                    match compile_side_exit(*target, self, ocb)? {
                         Target::CodePtr(dst_ptr) => {
                             emit_jmp_ptr(cb, dst_ptr, true);
                         },
@@ -1118,25 +1213,34 @@ impl Assembler
                     };
                 },
                 Insn::Je(target) | Insn::Jz(target) => {
-                    emit_conditional_jump::<{Condition::EQ}>(cb, compile_side_exit(*target, self, ocb));
+                    emit_conditional_jump::<{Condition::EQ}>(cb, compile_side_exit(*target, self, ocb)?);
                 },
-                Insn::Jne(target) | Insn::Jnz(target) => {
-                    emit_conditional_jump::<{Condition::NE}>(cb, compile_side_exit(*target, self, ocb));
+                Insn::Jne(target) | Insn::Jnz(target) | Insn::JoMul(target) => {
+                    emit_conditional_jump::<{Condition::NE}>(cb, compile_side_exit(*target, self, ocb)?);
                 },
                 Insn::Jl(target) => {
-                    emit_conditional_jump::<{Condition::LT}>(cb, compile_side_exit(*target, self, ocb));
+                    emit_conditional_jump::<{Condition::LT}>(cb, compile_side_exit(*target, self, ocb)?);
                 },
                 Insn::Jg(target) => {
-                    emit_conditional_jump::<{Condition::GT}>(cb, compile_side_exit(*target, self, ocb));
+                    emit_conditional_jump::<{Condition::GT}>(cb, compile_side_exit(*target, self, ocb)?);
+                },
+                Insn::Jge(target) => {
+                    emit_conditional_jump::<{Condition::GE}>(cb, compile_side_exit(*target, self, ocb)?);
                 },
                 Insn::Jbe(target) => {
-                    emit_conditional_jump::<{Condition::LS}>(cb, compile_side_exit(*target, self, ocb));
+                    emit_conditional_jump::<{Condition::LS}>(cb, compile_side_exit(*target, self, ocb)?);
                 },
                 Insn::Jb(target) => {
-                    emit_conditional_jump::<{Condition::CC}>(cb, compile_side_exit(*target, self, ocb));
+                    emit_conditional_jump::<{Condition::CC}>(cb, compile_side_exit(*target, self, ocb)?);
                 },
                 Insn::Jo(target) => {
-                    emit_conditional_jump::<{Condition::VS}>(cb, compile_side_exit(*target, self, ocb));
+                    emit_conditional_jump::<{Condition::VS}>(cb, compile_side_exit(*target, self, ocb)?);
+                },
+                Insn::Joz(opnd, target) => {
+                    emit_cmp_zero_jump(cb, opnd.into(), true, compile_side_exit(*target, self, ocb)?);
+                },
+                Insn::Jonz(opnd, target) => {
+                    emit_cmp_zero_jump(cb, opnd.into(), false, compile_side_exit(*target, self, ocb)?);
                 },
                 Insn::IncrCounter { mem, value } => {
                     let label = cb.new_label("incr_counter_loop".to_string());
@@ -1194,19 +1298,33 @@ impl Assembler
                 // We don't want label references to cross page boundaries. Signal caller for
                 // retry.
                 if !self.label_names.is_empty() {
-                    return Err(());
+                    return Err(EmitError::RetryOnNextPage);
                 }
             } else {
-                insn_idx = next_insn_idx;
+                insn_idx += 1;
                 gc_offsets.append(&mut insn_gc_offsets);
             }
         }
 
-        Ok(gc_offsets)
+        // Error if we couldn't write out everything
+        if cb.has_dropped_bytes() {
+            return Err(EmitError::OutOfMemory)
+        } else {
+            // No bytes dropped, so the pos markers point to valid code
+            for (insn_idx, pos) in pos_markers {
+                if let Insn::PosMarker(callback) = self.insns.get(insn_idx).unwrap() {
+                    callback(pos, &cb);
+                } else {
+                    panic!("non-PosMarker in pos_markers insn_idx={insn_idx} {self:?}");
+                }
+            }
+
+            return Ok(gc_offsets)
+        }
     }
 
     /// Optimize and compile the stored instructions
-    pub fn compile_with_regs(self, cb: &mut CodeBlock, ocb: Option<&mut OutlinedCb>, regs: Vec<Reg>) -> Vec<u32> {
+    pub fn compile_with_regs(self, cb: &mut CodeBlock, ocb: Option<&mut OutlinedCb>, regs: Vec<Reg>) -> Option<(CodePtr, Vec<u32>)> {
         let asm = self.arm64_split();
         let mut asm = asm.alloc_regs(regs);
 
@@ -1219,19 +1337,22 @@ impl Assembler
         let start_ptr = cb.get_write_ptr();
         let starting_label_state = cb.get_label_state();
         let mut ocb = ocb; // for &mut
-        let gc_offsets = asm.arm64_emit(cb, &mut ocb)
-            .unwrap_or_else(|_err| {
+        let emit_result = match asm.arm64_emit(cb, &mut ocb) {
+            Err(EmitError::RetryOnNextPage) => {
                 // we want to lower jumps to labels to b.cond instructions, which have a 1 MiB
                 // range limit. We can easily exceed the limit in case the jump straddles two pages.
-                // In this case, we retry with a fresh page.
+                // In this case, we retry with a fresh page once.
                 cb.set_label_state(starting_label_state);
-                cb.next_page(start_ptr, emit_jmp_ptr_with_invalidation);
-                asm.arm64_emit(cb, &mut ocb).expect("should not fail when writing to a fresh code page")
-            });
+                if cb.next_page(start_ptr, emit_jmp_ptr_with_invalidation) {
+                    asm.arm64_emit(cb, &mut ocb)
+                } else {
+                    Err(EmitError::OutOfMemory)
+                }
+            }
+            result => result
+        };
 
-        if cb.has_dropped_bytes() {
-            cb.clear_labels();
-        } else {
+        if let (Ok(gc_offsets), false) = (emit_result, cb.has_dropped_bytes()) {
             cb.link_labels();
 
             // Invalidate icache for newly written out region so we don't run stale code.
@@ -1243,9 +1364,13 @@ impl Assembler
                     unsafe { rb_yjit_icache_invalidate(start as _, end as _) };
                 }
             });
-        }
 
-        gc_offsets
+            Some((start_ptr, gc_offsets))
+        } else {
+            cb.clear_labels();
+
+            None
+        }
     }
 }
 
@@ -1255,7 +1380,7 @@ mod tests {
     use crate::disasm::*;
 
     fn setup_asm() -> (Assembler, CodeBlock) {
-        (Assembler::new(), CodeBlock::new_dummy(1024))
+        (Assembler::new(0), CodeBlock::new_dummy(1024))
     }
 
     #[test]
@@ -1311,8 +1436,7 @@ mod tests {
     fn test_emit_je_fits_into_bcond() {
         let (mut asm, mut cb) = setup_asm();
 
-        let offset = 80;
-        let target: CodePtr = ((cb.get_write_ptr().into_u64() + offset) as *mut u8).into();
+        let target: CodePtr = cb.get_write_ptr().add_bytes(80);
 
         asm.je(Target::CodePtr(target));
         asm.compile_with_num_regs(&mut cb, 0);
@@ -1323,7 +1447,7 @@ mod tests {
         let (mut asm, mut cb) = setup_asm();
 
         let offset = 1 << 21;
-        let target: CodePtr = ((cb.get_write_ptr().into_u64() + offset) as *mut u8).into();
+        let target: CodePtr = cb.get_write_ptr().add_bytes(offset);
 
         asm.je(Target::CodePtr(target));
         asm.compile_with_num_regs(&mut cb, 0);
@@ -1334,7 +1458,7 @@ mod tests {
         let (mut asm, mut cb) = setup_asm();
 
         let label = asm.new_label("label");
-        let opnd = asm.lea_label(label);
+        let opnd = asm.lea_jump_target(label);
 
         asm.write_label(label);
         asm.bake_string("Hello, world!");
@@ -1555,7 +1679,7 @@ mod tests {
     #[test]
     fn test_bcond_straddling_code_pages() {
         const LANDING_PAGE: usize = 65;
-        let mut asm = Assembler::new();
+        let mut asm = Assembler::new(0);
         let mut cb = CodeBlock::new_dummy_with_freed_pages(vec![0, LANDING_PAGE]);
 
         // Skip to near the end of the page. Room for two instructions.
@@ -1584,7 +1708,7 @@ mod tests {
         assert!(gap > 0b1111111111111111111);
 
         let instruction_at_starting_pos: [u8; 4] = unsafe {
-            std::slice::from_raw_parts(cb.get_ptr(starting_pos).raw_ptr(), 4)
+            std::slice::from_raw_parts(cb.get_ptr(starting_pos).raw_ptr(&cb), 4)
         }.try_into().unwrap();
         assert_eq!(
             0b000101 << 26_u32,
@@ -1636,7 +1760,7 @@ mod tests {
     fn test_replace_mov_with_ldur() {
         let (mut asm, mut cb) = setup_asm();
 
-        asm.mov(Opnd::Reg(Assembler::TEMP_REGS[0]), Opnd::mem(64, CFP, 8));
+        asm.mov(Opnd::Reg(TEMP_REGS[0]), Opnd::mem(64, CFP, 8));
         asm.compile_with_num_regs(&mut cb, 1);
 
         assert_disasm!(cb, "618240f8", {"
@@ -1648,8 +1772,8 @@ mod tests {
     fn test_not_split_mov() {
         let (mut asm, mut cb) = setup_asm();
 
-        asm.mov(Opnd::Reg(Assembler::TEMP_REGS[0]), Opnd::UImm(0xffff));
-        asm.mov(Opnd::Reg(Assembler::TEMP_REGS[0]), Opnd::UImm(0x10000));
+        asm.mov(Opnd::Reg(TEMP_REGS[0]), Opnd::UImm(0xffff));
+        asm.mov(Opnd::Reg(TEMP_REGS[0]), Opnd::UImm(0x10000));
         asm.compile_with_num_regs(&mut cb, 1);
 
         assert_disasm!(cb, "e1ff9fd2e10370b2", {"
@@ -1663,7 +1787,7 @@ mod tests {
         let (mut asm, mut cb) = setup_asm();
 
         let out = asm.csel_l(Qtrue.into(), Qfalse.into());
-        asm.mov(Opnd::Reg(Assembler::TEMP_REGS[0]), out);
+        asm.mov(Opnd::Reg(TEMP_REGS[0]), out);
         asm.compile_with_num_regs(&mut cb, 2);
 
         assert_disasm!(cb, "8b0280d20c0080d261b18c9a", {"
@@ -1672,4 +1796,35 @@ mod tests {
             0x8: csel x1, x11, x12, lt
         "});
     }
+
+    #[test]
+    fn test_add_with_immediate() {
+        let (mut asm, mut cb) = setup_asm();
+
+        let out = asm.add(Opnd::Reg(TEMP_REGS[1]), 1.into());
+        let out = asm.add(out, 1_usize.into());
+        asm.mov(Opnd::Reg(TEMP_REGS[0]), out);
+        asm.compile_with_num_regs(&mut cb, 2);
+
+        assert_disasm!(cb, "2b0500b16b0500b1e1030baa", {"
+            0x0: adds x11, x9, #1
+            0x4: adds x11, x11, #1
+            0x8: mov x1, x11
+        "});
+    }
+
+    #[test]
+    fn test_mul_with_immediate() {
+        let (mut asm, mut cb) = setup_asm();
+
+        let out = asm.mul(Opnd::Reg(TEMP_REGS[1]), 3.into());
+        asm.mov(Opnd::Reg(TEMP_REGS[0]), out);
+        asm.compile_with_num_regs(&mut cb, 2);
+
+        assert_disasm!(cb, "6b0080d22b7d0b9be1030baa", {"
+            0x0: mov x11, #3
+            0x4: mul x11, x9, x11
+            0x8: mov x1, x11
+        "});
+    }
 }
diff --git a/yjit/src/backend/ir.rs b/yjit/src/backend/ir.rs
index a6803f7a633193..1df151433a8025 100644
--- a/yjit/src/backend/ir.rs
+++ b/yjit/src/backend/ir.rs
@@ -1,26 +1,16 @@
-#![allow(dead_code)]
-#![allow(unused_variables)]
-#![allow(unused_imports)]
-
-use std::cell::Cell;
 use std::collections::HashMap;
 use std::fmt;
 use std::convert::From;
-use std::io::Write;
 use std::mem::take;
-use crate::codegen::{gen_outlined_exit, gen_counted_exit};
-use crate::cruby::{VALUE, SIZEOF_VALUE_I32};
-use crate::virtualmem::{CodePtr};
-use crate::asm::{CodeBlock, uimm_num_bits, imm_num_bits, OutlinedCb};
-use crate::core::{Context, Type, TempMapping, RegTemps, MAX_REG_TEMPS, MAX_TEMP_TYPES};
+use crate::codegen::{gen_counted_exit, gen_outlined_exit};
+use crate::cruby::{vm_stack_canary, SIZEOF_VALUE_I32, VALUE, VM_ENV_DATA_SIZE};
+use crate::virtualmem::CodePtr;
+use crate::asm::{CodeBlock, OutlinedCb};
+use crate::core::{Context, RegMapping, RegOpnd, MAX_CTX_TEMPS};
 use crate::options::*;
 use crate::stats::*;
 
-#[cfg(target_arch = "x86_64")]
-use crate::backend::x86_64::*;
-
-#[cfg(target_arch = "aarch64")]
-use crate::backend::arm64::*;
+use crate::backend::current::*;
 
 pub const EC: Opnd = _EC;
 pub const CFP: Opnd = _CFP;
@@ -28,6 +18,7 @@ pub const SP: Opnd = _SP;
 
 pub const C_ARG_OPNDS: [Opnd; 6] = _C_ARG_OPNDS;
 pub const C_RET_OPND: Opnd = _C_RET_OPND;
+pub use crate::backend::current::{Reg, C_RET_REG};
 
 // Memory operand base
 #[derive(Clone, Copy, PartialEq, Eq, Debug)]
@@ -86,10 +77,12 @@ pub enum Opnd
         num_bits: u8,
         /// ctx.stack_size when this operand is made. Used with idx for Opnd::Reg.
         stack_size: u8,
+        /// The number of local variables in the current ISEQ. Used only for locals.
+        num_locals: Option<u32>,
         /// ctx.sp_offset when this operand is made. Used with idx for Opnd::Mem.
         sp_offset: i8,
-        /// ctx.reg_temps when this operand is read. Used for register allocation.
-        reg_temps: Option<RegTemps>
+        /// ctx.reg_mapping when this operand is read. Used for register allocation.
+        reg_mapping: Option<RegMapping>
     },
 
     // Low-level operands, for lowering
@@ -157,13 +150,6 @@ impl Opnd
         }
     }
 
-    pub fn is_some(&self) -> bool {
-        match *self {
-            Opnd::None => false,
-            _ => true,
-        }
-    }
-
     /// Unwrap a register operand
     pub fn unwrap_reg(&self) -> Reg {
         match self {
@@ -188,7 +174,7 @@ impl Opnd
             Opnd::Reg(reg) => Some(Opnd::Reg(reg.with_num_bits(num_bits))),
             Opnd::Mem(Mem { base, disp, .. }) => Some(Opnd::Mem(Mem { base, disp, num_bits })),
             Opnd::InsnOut { idx, .. } => Some(Opnd::InsnOut { idx, num_bits }),
-            Opnd::Stack { idx, stack_size, sp_offset, reg_temps, .. } => Some(Opnd::Stack { idx, num_bits, stack_size, sp_offset, reg_temps }),
+            Opnd::Stack { idx, stack_size, num_locals, sp_offset, reg_mapping, .. } => Some(Opnd::Stack { idx, num_bits, stack_size, num_locals, sp_offset, reg_mapping }),
             _ => None,
         }
     }
@@ -243,23 +229,26 @@ impl Opnd
         Self::match_num_bits_iter(opnds.iter())
     }
 
-    /// Calculate Opnd::Stack's index from the stack bottom.
-    pub fn stack_idx(&self) -> u8 {
-        match self {
-            Opnd::Stack { idx, stack_size, .. } => {
-                (*stack_size as isize - *idx as isize - 1) as u8
-            },
-            _ => unreachable!(),
-        }
+    /// Convert Opnd::Stack into RegMapping
+    pub fn reg_opnd(&self) -> RegOpnd {
+        self.get_reg_opnd().unwrap()
     }
 
-    /// Get the index for stack temp registers.
-    pub fn reg_idx(&self) -> usize {
-        match self {
-            Opnd::Stack { .. } => {
-                self.stack_idx() as usize % get_option!(num_temp_regs)
-            },
-            _ => unreachable!(),
+    /// Convert an operand into RegMapping if it's Opnd::Stack
+    pub fn get_reg_opnd(&self) -> Option<RegOpnd> {
+        match *self {
+            Opnd::Stack { idx, stack_size, num_locals, .. } => Some(
+                if let Some(num_locals) = num_locals {
+                    let last_idx = stack_size as i32 + VM_ENV_DATA_SIZE as i32 - 1;
+                    assert!(last_idx <= idx, "Local index {} must be >= last local index {}", idx, last_idx);
+                    assert!(idx <= last_idx + num_locals as i32, "Local index {} must be < last local index {} + local size {}", idx, last_idx, num_locals);
+                    RegOpnd::Local((last_idx + num_locals as i32 - idx) as u8)
+                } else {
+                    assert!(idx < stack_size as i32);
+                    RegOpnd::Stack((stack_size as i32 - idx - 1) as u8)
+                }
+            ),
+            _ => None,
         }
     }
 }
@@ -343,7 +332,7 @@ impl From<CodePtr> for Target {
     }
 }
 
-type PosMarkerFn = Box<dyn Fn(CodePtr)>;
+type PosMarkerFn = Box<dyn Fn(CodePtr, &CodeBlock)>;
 
 /// YJIT IR instruction
 pub enum Insn {
@@ -358,6 +347,7 @@ pub enum Insn {
     BakeString(String),
 
     // Trigger a debugger breakpoint
+    #[allow(dead_code)]
     Breakpoint,
 
     /// Add a comment into the IR at the point that this instruction is added.
@@ -438,6 +428,9 @@ pub enum Insn {
     /// Jump if greater
     Jg(Target),
 
+    /// Jump if greater or equal
+    Jge(Target),
+
     // Unconditional jump to a branch target
     Jmp(Target),
 
@@ -453,15 +446,23 @@ pub enum Insn {
     /// Jump if overflow
     Jo(Target),
 
+    /// Jump if overflow in multiplication
+    JoMul(Target),
+
     /// Jump if zero
     Jz(Target),
 
+    /// Jump if operand is zero (only used during lowering at the moment)
+    Joz(Opnd, Target),
+
+    /// Jump if operand is non-zero (only used during lowering at the moment)
+    Jonz(Opnd, Target),
+
     // Add a label into the IR at the point that this instruction is added.
     Label(Target),
 
-    // Load effective address relative to the current instruction pointer. It
-    // accepts a single signed immediate operand.
-    LeaLabel { target: Target, out: Opnd },
+    /// Get the code address of a jump target
+    LeaJumpTarget { target: Target, out: Opnd },
 
     // Load effective address
     Lea { opnd: Opnd, out: Opnd },
@@ -545,13 +546,17 @@ impl Insn {
             Insn::Je(target) |
             Insn::Jl(target) |
             Insn::Jg(target) |
+            Insn::Jge(target) |
             Insn::Jmp(target) |
             Insn::Jne(target) |
             Insn::Jnz(target) |
             Insn::Jo(target) |
             Insn::Jz(target) |
             Insn::Label(target) |
-            Insn::LeaLabel { target, .. } => {
+            Insn::JoMul(target) |
+            Insn::Joz(_, target) |
+            Insn::Jonz(_, target) |
+            Insn::LeaJumpTarget { target, .. } => {
                 Some(target)
             }
             _ => None,
@@ -591,14 +596,18 @@ impl Insn {
             Insn::Je(_) => "Je",
             Insn::Jl(_) => "Jl",
             Insn::Jg(_) => "Jg",
+            Insn::Jge(_) => "Jge",
             Insn::Jmp(_) => "Jmp",
             Insn::JmpOpnd(_) => "JmpOpnd",
             Insn::Jne(_) => "Jne",
             Insn::Jnz(_) => "Jnz",
             Insn::Jo(_) => "Jo",
+            Insn::JoMul(_) => "JoMul",
             Insn::Jz(_) => "Jz",
+            Insn::Joz(..) => "Joz",
+            Insn::Jonz(..) => "Jonz",
             Insn::Label(_) => "Label",
-            Insn::LeaLabel { .. } => "LeaLabel",
+            Insn::LeaJumpTarget { .. } => "LeaJumpTarget",
             Insn::Lea { .. } => "Lea",
             Insn::LiveReg { .. } => "LiveReg",
             Insn::Load { .. } => "Load",
@@ -637,7 +646,7 @@ impl Insn {
             Insn::CSelNZ { out, .. } |
             Insn::CSelZ { out, .. } |
             Insn::Lea { out, .. } |
-            Insn::LeaLabel { out, .. } |
+            Insn::LeaJumpTarget { out, .. } |
             Insn::LiveReg { out, .. } |
             Insn::Load { out, .. } |
             Insn::LoadSExt { out, .. } |
@@ -670,7 +679,7 @@ impl Insn {
             Insn::CSelNZ { out, .. } |
             Insn::CSelZ { out, .. } |
             Insn::Lea { out, .. } |
-            Insn::LeaLabel { out, .. } |
+            Insn::LeaJumpTarget { out, .. } |
             Insn::LiveReg { out, .. } |
             Insn::Load { out, .. } |
             Insn::LoadSExt { out, .. } |
@@ -694,12 +703,13 @@ impl Insn {
             Insn::Je(target) |
             Insn::Jl(target) |
             Insn::Jg(target) |
+            Insn::Jge(target) |
             Insn::Jmp(target) |
             Insn::Jne(target) |
             Insn::Jnz(target) |
             Insn::Jo(target) |
             Insn::Jz(target) |
-            Insn::LeaLabel { target, .. } => Some(target),
+            Insn::LeaJumpTarget { target, .. } => Some(target),
             _ => None
         }
     }
@@ -745,15 +755,18 @@ impl<'a> Iterator for InsnOpndIterator<'a> {
             Insn::Je(_) |
             Insn::Jl(_) |
             Insn::Jg(_) |
+            Insn::Jge(_) |
             Insn::Jmp(_) |
             Insn::Jne(_) |
             Insn::Jnz(_) |
             Insn::Jo(_) |
+            Insn::JoMul(_) |
             Insn::Jz(_) |
             Insn::Label(_) |
-            Insn::LeaLabel { .. } |
+            Insn::LeaJumpTarget { .. } |
             Insn::PadInvalPatch |
             Insn::PosMarker(_) => None,
+
             Insn::CPopInto(opnd) |
             Insn::CPush(opnd) |
             Insn::CRet(opnd) |
@@ -762,6 +775,8 @@ impl<'a> Iterator for InsnOpndIterator<'a> {
             Insn::LiveReg { opnd, .. } |
             Insn::Load { opnd, .. } |
             Insn::LoadSExt { opnd, .. } |
+            Insn::Joz(opnd, _) |
+            Insn::Jonz(opnd, _) |
             Insn::Not { opnd, .. } => {
                 match self.idx {
                     0 => {
@@ -845,15 +860,18 @@ impl<'a> InsnOpndMutIterator<'a> {
             Insn::Je(_) |
             Insn::Jl(_) |
             Insn::Jg(_) |
+            Insn::Jge(_) |
             Insn::Jmp(_) |
             Insn::Jne(_) |
             Insn::Jnz(_) |
             Insn::Jo(_) |
+            Insn::JoMul(_) |
             Insn::Jz(_) |
             Insn::Label(_) |
-            Insn::LeaLabel { .. } |
+            Insn::LeaJumpTarget { .. } |
             Insn::PadInvalPatch |
             Insn::PosMarker(_) => None,
+
             Insn::CPopInto(opnd) |
             Insn::CPush(opnd) |
             Insn::CRet(opnd) |
@@ -862,6 +880,8 @@ impl<'a> InsnOpndMutIterator<'a> {
             Insn::LiveReg { opnd, .. } |
             Insn::Load { opnd, .. } |
             Insn::LoadSExt { opnd, .. } |
+            Insn::Joz(opnd, _) |
+            Insn::Jonz(opnd, _) |
             Insn::Not { opnd, .. } => {
                 match self.idx {
                     0 => {
@@ -954,7 +974,9 @@ pub struct SideExitContext {
     /// Context fields used by get_generic_ctx()
     pub stack_size: u8,
     pub sp_offset: i8,
-    pub reg_temps: RegTemps,
+    pub reg_mapping: RegMapping,
+    pub is_return_landing: bool,
+    pub is_deferred: bool,
 }
 
 impl SideExitContext {
@@ -964,7 +986,9 @@ impl SideExitContext {
             pc,
             stack_size: ctx.get_stack_size(),
             sp_offset: ctx.get_sp_offset(),
-            reg_temps: ctx.get_reg_temps(),
+            reg_mapping: ctx.get_reg_mapping(),
+            is_return_landing: ctx.is_return_landing(),
+            is_deferred: ctx.is_deferred(),
         };
         if cfg!(debug_assertions) {
             // Assert that we're not losing any mandatory metadata
@@ -978,11 +1002,20 @@ impl SideExitContext {
         let mut ctx = Context::default();
         ctx.set_stack_size(self.stack_size);
         ctx.set_sp_offset(self.sp_offset);
-        ctx.set_reg_temps(self.reg_temps);
+        ctx.set_reg_mapping(self.reg_mapping);
+        if self.is_return_landing {
+            ctx.set_as_return_landing();
+        }
+        if self.is_deferred {
+            ctx.mark_as_deferred();
+        }
         ctx
     }
 }
 
+/// Initial capacity for asm.insns vector
+const ASSEMBLER_INSNS_CAPACITY: usize = 256;
+
 /// Object into which we assemble instructions to be
 /// optimized and lowered
 pub struct Assembler {
@@ -998,6 +1031,13 @@ pub struct Assembler {
     /// Context for generating the current insn
     pub ctx: Context,
 
+    /// The current ISEQ's local table size. asm.local_opnd() uses this, and it's
+    /// sometimes hard to pass this value, e.g. asm.spill_regs() in asm.ccall().
+    ///
+    /// `None` means we're not assembling for an ISEQ, or that the local size is
+    /// not relevant.
+    pub(super) num_locals: Option<u32>,
+
     /// Side exit caches for each SideExitContext
     pub(super) side_exits: HashMap<SideExitContext, CodePtr>,
 
@@ -1006,31 +1046,54 @@ pub struct Assembler {
 
     /// Stack size for Target::SideExit
     side_exit_stack_size: Option<u8>,
+
+    /// If true, the next ccall() should verify its leafness
+    leaf_ccall: bool,
 }
 
 impl Assembler
 {
-    pub fn new() -> Self {
-        Self::new_with_label_names(Vec::default(), HashMap::default())
+    /// Create an Assembler for ISEQ-specific code.
+    /// It includes all inline code and some outlined code like side exits and stubs.
+    pub fn new(num_locals: u32) -> Self {
+        Self::new_with_label_names(Vec::default(), HashMap::default(), Some(num_locals))
     }
 
-    pub fn new_with_label_names(label_names: Vec<String>, side_exits: HashMap<SideExitContext, CodePtr>) -> Self {
+    /// Create an Assembler for outlined code that are not specific to any ISEQ,
+    /// e.g. trampolines that are shared globally.
+    pub fn new_without_iseq() -> Self {
+        Self::new_with_label_names(Vec::default(), HashMap::default(), None)
+    }
+
+    /// Create an Assembler with parameters that are populated by another Assembler instance.
+    /// This API is used for copying an Assembler for the next compiler pass.
+    pub fn new_with_label_names(
+        label_names: Vec<String>,
+        side_exits: HashMap<SideExitContext, CodePtr>,
+        num_locals: Option<u32>
+    ) -> Self {
         Self {
-            insns: Vec::default(),
-            live_ranges: Vec::default(),
+            insns: Vec::with_capacity(ASSEMBLER_INSNS_CAPACITY),
+            live_ranges: Vec::with_capacity(ASSEMBLER_INSNS_CAPACITY),
             label_names,
             ctx: Context::default(),
+            num_locals,
             side_exits,
             side_exit_pc: None,
             side_exit_stack_size: None,
+            leaf_ccall: false,
         }
     }
 
     /// Get the list of registers that can be used for stack temps.
-    pub fn get_temp_regs() -> Vec<Reg> {
+    pub fn get_temp_regs() -> &'static [Reg] {
         let num_regs = get_option!(num_temp_regs);
-        let mut regs = Self::TEMP_REGS.to_vec();
-        regs.drain(0..num_regs).collect()
+        &TEMP_REGS[0..num_regs]
+    }
+
+    /// Get the number of locals for the ISEQ being compiled
+    pub fn get_num_locals(&self) -> Option<u32> {
+        self.num_locals
     }
 
     /// Set a context for generating side exits
@@ -1048,32 +1111,38 @@ impl Assembler
     /// Append an instruction onto the current list of instructions and update
     /// the live ranges of any instructions whose outputs are being used as
     /// operands to this instruction.
-    pub(super) fn push_insn(&mut self, insn: Insn) {
+    pub fn push_insn(&mut self, mut insn: Insn) {
         // Index of this instruction
         let insn_idx = self.insns.len();
 
-        let mut insn = insn;
         let mut opnd_iter = insn.opnd_iter_mut();
         while let Some(opnd) = opnd_iter.next() {
-            match opnd {
+            match *opnd {
                 // If we find any InsnOut from previous instructions, we're going to update
                 // the live range of the previous instruction to point to this one.
                 Opnd::InsnOut { idx, .. } => {
-                    assert!(*idx < self.insns.len());
-                    self.live_ranges[*idx] = insn_idx;
+                    assert!(idx < self.insns.len());
+                    self.live_ranges[idx] = insn_idx;
                 }
                 Opnd::Mem(Mem { base: MemBase::InsnOut(idx), .. }) => {
-                    assert!(*idx < self.insns.len());
-                    self.live_ranges[*idx] = insn_idx;
+                    assert!(idx < self.insns.len());
+                    self.live_ranges[idx] = insn_idx;
                 }
-                // Set current ctx.reg_temps to Opnd::Stack.
-                Opnd::Stack { idx, num_bits, stack_size, sp_offset, reg_temps: None } => {
+                // Set current ctx.reg_mapping to Opnd::Stack.
+                Opnd::Stack { idx, num_bits, stack_size, num_locals, sp_offset, reg_mapping: None } => {
+                    assert_eq!(
+                        self.ctx.get_stack_size() as i16 - self.ctx.get_sp_offset() as i16,
+                        stack_size as i16 - sp_offset as i16,
+                        "Opnd::Stack (stack_size: {}, sp_offset: {}) expects a different SP position from asm.ctx (stack_size: {}, sp_offset: {})",
+                        stack_size, sp_offset, self.ctx.get_stack_size(), self.ctx.get_sp_offset(),
+                    );
                     *opnd = Opnd::Stack {
-                        idx: *idx,
-                        num_bits: *num_bits,
-                        stack_size: *stack_size,
-                        sp_offset: *sp_offset,
-                        reg_temps: Some(self.ctx.get_reg_temps()),
+                        idx,
+                        num_bits,
+                        stack_size,
+                        num_locals,
+                        sp_offset,
+                        reg_mapping: Some(self.ctx.get_reg_mapping()),
                     };
                 }
                 _ => {}
@@ -1081,7 +1150,6 @@ impl Assembler
         }
 
         // Set a side exit context to Target::SideExit
-        let mut insn = insn;
         if let Some(Target::SideExit { context, .. }) = insn.target_mut() {
             // We should skip this when this instruction is being copied from another Assembler.
             if context.is_none() {
@@ -1097,19 +1165,19 @@ impl Assembler
     }
 
     /// Get a cached side exit, wrapping a counter if specified
-    pub fn get_side_exit(&mut self, side_exit_context: &SideExitContext, counter: Option<Counter>, ocb: &mut OutlinedCb) -> CodePtr {
+    pub fn get_side_exit(&mut self, side_exit_context: &SideExitContext, counter: Option<Counter>, ocb: &mut OutlinedCb) -> Option<CodePtr> {
         // Get a cached side exit
         let side_exit = match self.side_exits.get(&side_exit_context) {
             None => {
-                let exit_code = gen_outlined_exit(side_exit_context.pc, &side_exit_context.get_ctx(), ocb);
-                self.side_exits.insert(side_exit_context.clone(), exit_code);
+                let exit_code = gen_outlined_exit(side_exit_context.pc, self.num_locals.unwrap(), &side_exit_context.get_ctx(), ocb)?;
+                self.side_exits.insert(*side_exit_context, exit_code);
                 exit_code
             }
             Some(code_ptr) => *code_ptr,
         };
 
         // Wrap a counter if needed
-        gen_counted_exit(side_exit, ocb, counter)
+        gen_counted_exit(side_exit_context.pc, side_exit, ocb, counter)
     }
 
     /// Create a new label instance that we can jump to
@@ -1135,20 +1203,20 @@ impl Assembler
         }
 
         // Convert Opnd::Stack to Opnd::Reg
-        fn reg_opnd(opnd: &Opnd) -> Opnd {
+        fn reg_opnd(opnd: &Opnd, reg_idx: usize) -> Opnd {
             let regs = Assembler::get_temp_regs();
             if let Opnd::Stack { num_bits, .. } = *opnd {
                 incr_counter!(temp_reg_opnd);
-                Opnd::Reg(regs[opnd.reg_idx()]).with_num_bits(num_bits).unwrap()
+                Opnd::Reg(regs[reg_idx]).with_num_bits(num_bits).unwrap()
             } else {
                 unreachable!()
             }
         }
 
         match opnd {
-            Opnd::Stack { idx, num_bits, stack_size, sp_offset, reg_temps } => {
-                if opnd.stack_idx() < MAX_REG_TEMPS && reg_temps.unwrap().get(opnd.stack_idx()) {
-                    reg_opnd(opnd)
+            Opnd::Stack { reg_mapping, .. } => {
+                if let Some(reg_idx) = reg_mapping.unwrap().get_reg(opnd.reg_opnd()) {
+                    reg_opnd(opnd, reg_idx)
                 } else {
                     mem_opnd(opnd)
                 }
@@ -1158,62 +1226,111 @@ impl Assembler
     }
 
     /// Allocate a register to a stack temp if available.
-    pub fn alloc_temp_reg(&mut self, stack_idx: u8) {
-        if get_option!(num_temp_regs) == 0 {
-            return;
+    pub fn alloc_reg(&mut self, mapping: RegOpnd) {
+        // Allocate a register if there's no conflict.
+        let mut reg_mapping = self.ctx.get_reg_mapping();
+        if reg_mapping.alloc_reg(mapping) {
+            self.set_reg_mapping(reg_mapping);
         }
+    }
 
-        // Allocate a register if there's no conflict.
-        let mut reg_temps = self.ctx.get_reg_temps();
-        if reg_temps.conflicts_with(stack_idx) {
-            assert!(!reg_temps.get(stack_idx));
-        } else {
-            reg_temps.set(stack_idx, true);
-            self.set_reg_temps(reg_temps);
+    /// Erase local variable type information
+    /// eg: because of a call we can't track
+    pub fn clear_local_types(&mut self) {
+        asm_comment!(self, "clear local variable types");
+        self.ctx.clear_local_types();
+    }
+
+    /// Repurpose stack temp registers to the corresponding locals for arguments
+    pub fn map_temp_regs_to_args(&mut self, callee_ctx: &mut Context, argc: i32) -> Vec<RegOpnd> {
+        let mut callee_reg_mapping = callee_ctx.get_reg_mapping();
+        let mut mapped_temps = vec![];
+
+        for arg_idx in 0..argc {
+            let stack_idx: u8 = (self.ctx.get_stack_size() as i32 - argc + arg_idx).try_into().unwrap();
+            let temp_opnd = RegOpnd::Stack(stack_idx);
+
+            // For each argument, if the stack temp for it has a register,
+            // let the callee use the register for the local variable.
+            if let Some(reg_idx) = self.ctx.get_reg_mapping().get_reg(temp_opnd) {
+                let local_opnd = RegOpnd::Local(arg_idx.try_into().unwrap());
+                callee_reg_mapping.set_reg(local_opnd, reg_idx);
+                mapped_temps.push(temp_opnd);
+            }
         }
+
+        asm_comment!(self, "local maps: {:?}", callee_reg_mapping);
+        callee_ctx.set_reg_mapping(callee_reg_mapping);
+        mapped_temps
     }
 
-    /// Spill all live stack temps from registers to the stack
-    pub fn spill_temps(&mut self) {
+    /// Spill all live registers to the stack
+    pub fn spill_regs(&mut self) {
+        self.spill_regs_except(&vec![]);
+    }
+
+    /// Spill all live registers except `ignored_temps` to the stack
+    pub fn spill_regs_except(&mut self, ignored_temps: &Vec<RegOpnd>) {
         // Forget registers above the stack top
-        let mut reg_temps = self.ctx.get_reg_temps();
-        for stack_idx in self.ctx.get_stack_size()..MAX_REG_TEMPS {
-            reg_temps.set(stack_idx, false);
+        let mut reg_mapping = self.ctx.get_reg_mapping();
+        for stack_idx in self.ctx.get_stack_size()..MAX_CTX_TEMPS as u8 {
+            reg_mapping.dealloc_reg(RegOpnd::Stack(stack_idx));
         }
-        self.set_reg_temps(reg_temps);
-
-        // Spill live stack temps
-        if self.ctx.get_reg_temps() != RegTemps::default() {
-            self.comment(&format!("spill_temps: {:08b} -> {:08b}", self.ctx.get_reg_temps().as_u8(), RegTemps::default().as_u8()));
-            for stack_idx in 0..u8::min(MAX_REG_TEMPS, self.ctx.get_stack_size()) {
-                if self.ctx.get_reg_temps().get(stack_idx) {
-                    let idx = self.ctx.get_stack_size() - 1 - stack_idx;
-                    self.spill_temp(self.stack_opnd(idx.into()));
-                    reg_temps.set(stack_idx, false);
-                }
+        self.set_reg_mapping(reg_mapping);
+
+        // If no registers are in use, skip all checks
+        if self.ctx.get_reg_mapping() == RegMapping::default() {
+            return;
+        }
+
+        // Collect stack temps to be spilled
+        let mut spilled_opnds = vec![];
+        for stack_idx in 0..u8::min(MAX_CTX_TEMPS as u8, self.ctx.get_stack_size()) {
+            let reg_opnd = RegOpnd::Stack(stack_idx);
+            if !ignored_temps.contains(&reg_opnd) && reg_mapping.dealloc_reg(reg_opnd) {
+                let idx = self.ctx.get_stack_size() - 1 - stack_idx;
+                let spilled_opnd = self.stack_opnd(idx.into());
+                spilled_opnds.push(spilled_opnd);
+                reg_mapping.dealloc_reg(spilled_opnd.reg_opnd());
+            }
+        }
+
+        // Collect locals to be spilled
+        for local_idx in 0..MAX_CTX_TEMPS as u8 {
+            if reg_mapping.dealloc_reg(RegOpnd::Local(local_idx)) {
+                let first_local_ep_offset = self.num_locals.unwrap() + VM_ENV_DATA_SIZE - 1;
+                let ep_offset = first_local_ep_offset - local_idx as u32;
+                let spilled_opnd = self.local_opnd(ep_offset);
+                spilled_opnds.push(spilled_opnd);
+                reg_mapping.dealloc_reg(spilled_opnd.reg_opnd());
             }
-            self.ctx.set_reg_temps(reg_temps);
         }
 
-        // Every stack temp should have been spilled
-        assert_eq!(self.ctx.get_reg_temps(), RegTemps::default());
+        // Spill stack temps and locals
+        if !spilled_opnds.is_empty() {
+            asm_comment!(self, "spill_regs: {:?} -> {:?}", self.ctx.get_reg_mapping(), reg_mapping);
+            for &spilled_opnd in spilled_opnds.iter() {
+                self.spill_reg(spilled_opnd);
+            }
+            self.ctx.set_reg_mapping(reg_mapping);
+        }
     }
 
     /// Spill a stack temp from a register to the stack
-    fn spill_temp(&mut self, opnd: Opnd) {
-        assert!(self.ctx.get_reg_temps().get(opnd.stack_idx()));
+    pub fn spill_reg(&mut self, opnd: Opnd) {
+        assert_ne!(self.ctx.get_reg_mapping().get_reg(opnd.reg_opnd()), None);
 
-        // Use different RegTemps for dest and src operands
-        let reg_temps = self.ctx.get_reg_temps();
-        let mut mem_temps = reg_temps;
-        mem_temps.set(opnd.stack_idx(), false);
+        // Use different RegMappings for dest and src operands
+        let reg_mapping = self.ctx.get_reg_mapping();
+        let mut mem_mappings = reg_mapping;
+        mem_mappings.dealloc_reg(opnd.reg_opnd());
 
         // Move the stack operand from a register to memory
         match opnd {
-            Opnd::Stack { idx, num_bits, stack_size, sp_offset, .. } => {
+            Opnd::Stack { idx, num_bits, stack_size, num_locals, sp_offset, .. } => {
                 self.mov(
-                    Opnd::Stack { idx, num_bits, stack_size, sp_offset, reg_temps: Some(mem_temps) },
-                    Opnd::Stack { idx, num_bits, stack_size, sp_offset, reg_temps: Some(reg_temps) },
+                    Opnd::Stack { idx, num_bits, stack_size, num_locals, sp_offset, reg_mapping: Some(mem_mappings) },
+                    Opnd::Stack { idx, num_bits, stack_size, num_locals, sp_offset, reg_mapping: Some(reg_mapping) },
                 );
             }
             _ => unreachable!(),
@@ -1222,21 +1339,47 @@ impl Assembler
     }
 
     /// Update which stack temps are in a register
-    pub fn set_reg_temps(&mut self, reg_temps: RegTemps) {
-        if self.ctx.get_reg_temps() != reg_temps {
-            self.comment(&format!("reg_temps: {:08b} -> {:08b}", self.ctx.get_reg_temps().as_u8(), reg_temps.as_u8()));
-            self.ctx.set_reg_temps(reg_temps);
-            self.verify_reg_temps();
+    pub fn set_reg_mapping(&mut self, reg_mapping: RegMapping) {
+        if self.ctx.get_reg_mapping() != reg_mapping {
+            asm_comment!(self, "reg_mapping: {:?} -> {:?}", self.ctx.get_reg_mapping(), reg_mapping);
+            self.ctx.set_reg_mapping(reg_mapping);
         }
     }
 
-    /// Assert there's no conflict in stack temp register allocation
-    fn verify_reg_temps(&self) {
-        for stack_idx in 0..MAX_REG_TEMPS {
-            if self.ctx.get_reg_temps().get(stack_idx) {
-                assert!(!self.ctx.get_reg_temps().conflicts_with(stack_idx));
+    // Shuffle register moves, sometimes adding extra moves using SCRATCH_REG,
+    // so that they will not rewrite each other before they are used.
+    pub fn reorder_reg_moves(old_moves: &Vec<(Reg, Opnd)>) -> Vec<(Reg, Opnd)> {
+        // Return the index of a move whose destination is not used as a source if any.
+        fn find_safe_move(moves: &Vec<(Reg, Opnd)>) -> Option<usize> {
+            moves.iter().enumerate().find(|(_, &(dest_reg, _))| {
+                moves.iter().all(|&(_, src_opnd)| src_opnd != Opnd::Reg(dest_reg))
+            }).map(|(index, _)| index)
+        }
+
+        // Remove moves whose source and destination are the same
+        let mut old_moves: Vec<(Reg, Opnd)> = old_moves.clone().into_iter()
+            .filter(|&(reg, opnd)| Opnd::Reg(reg) != opnd).collect();
+
+        let mut new_moves = vec![];
+        while old_moves.len() > 0 {
+            // Keep taking safe moves
+            while let Some(index) = find_safe_move(&old_moves) {
+                new_moves.push(old_moves.remove(index));
+            }
+
+            // No safe move. Load the source of one move into SCRATCH_REG, and
+            // then load SCRATCH_REG into the destination when it's safe.
+            if old_moves.len() > 0 {
+                // Make sure it's safe to use SCRATCH_REG
+                assert!(old_moves.iter().all(|&(_, opnd)| opnd != Opnd::Reg(Assembler::SCRATCH_REG)));
+
+                // Move SCRATCH <- opnd, and delay reg <- SCRATCH
+                let (reg, opnd) = old_moves.remove(0);
+                new_moves.push((Assembler::SCRATCH_REG, opnd));
+                old_moves.push((reg, Opnd::Reg(Assembler::SCRATCH_REG)));
             }
         }
+        new_moves
     }
 
     /// Sets the out field on the various instructions that require allocated
@@ -1284,42 +1427,6 @@ impl Assembler
             }
         }
 
-        // Reorder C argument moves, sometimes adding extra moves using SCRATCH_REG,
-        // so that they will not rewrite each other before they are used.
-        fn reorder_c_args(c_args: &Vec<(Reg, Opnd)>) -> Vec<(Reg, Opnd)> {
-            // Return the index of a move whose destination is not used as a source if any.
-            fn find_safe_arg(c_args: &Vec<(Reg, Opnd)>) -> Option<usize> {
-                c_args.iter().enumerate().find(|(_, &(dest_reg, _))| {
-                    c_args.iter().all(|&(_, src_opnd)| src_opnd != Opnd::Reg(dest_reg))
-                }).map(|(index, _)| index)
-            }
-
-            // Remove moves whose source and destination are the same
-            let mut c_args: Vec<(Reg, Opnd)> = c_args.clone().into_iter()
-                .filter(|&(reg, opnd)| Opnd::Reg(reg) != opnd).collect();
-
-            let mut moves = vec![];
-            while c_args.len() > 0 {
-                // Keep taking safe moves
-                while let Some(index) = find_safe_arg(&c_args) {
-                    moves.push(c_args.remove(index));
-                }
-
-                // No safe move. Load the source of one move into SCRATCH_REG, and
-                // then load SCRATCH_REG into the destination when it's safe.
-                if c_args.len() > 0 {
-                    // Make sure it's safe to use SCRATCH_REG
-                    assert!(c_args.iter().all(|&(_, opnd)| opnd != Opnd::Reg(Assembler::SCRATCH_REG)));
-
-                    // Move SCRATCH <- opnd, and delay reg <- SCRATCH
-                    let (reg, opnd) = c_args.remove(0);
-                    moves.push((Assembler::SCRATCH_REG, opnd));
-                    c_args.push((reg, Opnd::Reg(Assembler::SCRATCH_REG)));
-                }
-            }
-            moves
-        }
-
         // Adjust the number of entries in live_ranges so that it can be indexed by mapped indexes.
         fn shift_live_ranges(live_ranges: &mut Vec<usize>, start_index: usize, shift_offset: isize) {
             if shift_offset >= 0 {
@@ -1364,7 +1471,7 @@ impl Assembler
         let live_ranges: Vec<usize> = take(&mut self.live_ranges);
         // shifted_live_ranges is indexed by mapped indexes in insn operands.
         let mut shifted_live_ranges: Vec<usize> = live_ranges.clone();
-        let mut asm = Assembler::new_with_label_names(take(&mut self.label_names), take(&mut self.side_exits));
+        let mut asm = Assembler::new_with_label_names(take(&mut self.label_names), take(&mut self.side_exits), self.num_locals);
         let mut iterator = self.into_draining_iter();
 
         while let Some((index, mut insn)) = iterator.next_mapped() {
@@ -1495,7 +1602,7 @@ impl Assembler
                 if c_args.len() > 0 {
                     // Resolve C argument dependencies
                     let c_args_len = c_args.len() as isize;
-                    let moves = reorder_c_args(&c_args.drain(..).into_iter().collect());
+                    let moves = Self::reorder_reg_moves(&c_args.drain(..).into_iter().collect());
                     shift_live_ranges(&mut shifted_live_ranges, asm.insns.len(), moves.len() as isize - c_args_len);
 
                     // Push batched C arguments
@@ -1513,32 +1620,30 @@ impl Assembler
         asm
     }
 
-    /// Compile the instructions down to machine code
-    /// NOTE: should compile return a list of block labels to enable
-    ///       compiling multiple blocks at a time?
-    pub fn compile(self, cb: &mut CodeBlock, ocb: Option<&mut OutlinedCb>) -> Vec<u32>
+    /// Compile the instructions down to machine code.
+    /// Can fail due to lack of code memory and inopportune code placement, among other reasons.
+    #[must_use]
+    pub fn compile(self, cb: &mut CodeBlock, ocb: Option<&mut OutlinedCb>) -> Option<(CodePtr, Vec<u32>)>
     {
-        #[cfg(feature = "disasm")]
         let start_addr = cb.get_write_ptr();
-
         let alloc_regs = Self::get_alloc_regs();
-        let gc_offsets = self.compile_with_regs(cb, ocb, alloc_regs);
+        let ret = self.compile_with_regs(cb, ocb, alloc_regs);
 
-        #[cfg(feature = "disasm")]
         if let Some(dump_disasm) = get_option_ref!(dump_disasm) {
             use crate::disasm::dump_disasm_addr_range;
             let end_addr = cb.get_write_ptr();
             dump_disasm_addr_range(cb, start_addr, end_addr, dump_disasm)
         }
-        gc_offsets
+        ret
     }
 
     /// Compile with a limited number of registers. Used only for unit tests.
-    pub fn compile_with_num_regs(self, cb: &mut CodeBlock, num_regs: usize) -> Vec<u32>
+    #[cfg(test)]
+    pub fn compile_with_num_regs(self, cb: &mut CodeBlock, num_regs: usize) -> (CodePtr, Vec<u32>)
     {
         let mut alloc_regs = Self::get_alloc_regs();
         let alloc_regs = alloc_regs.drain(0..num_regs).collect();
-        self.compile_with_regs(cb, None, alloc_regs)
+        self.compile_with_regs(cb, None, alloc_regs).unwrap()
     }
 
     /// Consume the assembler by creating a new draining iterator.
@@ -1546,9 +1651,14 @@ impl Assembler
         AssemblerDrainingIterator::new(self)
     }
 
-    /// Consume the assembler by creating a new lookback iterator.
-    pub fn into_lookback_iter(self) -> AssemblerLookbackIterator {
-        AssemblerLookbackIterator::new(self)
+    /// Return true if the next ccall() is expected to be leaf.
+    pub fn get_leaf_ccall(&mut self) -> bool {
+        self.leaf_ccall
+    }
+
+    /// Assert that the next ccall() is going to be leaf.
+    pub fn expect_leaf_ccall(&mut self) {
+        self.leaf_ccall = true;
     }
 }
 
@@ -1565,7 +1675,7 @@ impl AssemblerDrainingIterator {
         Self {
             insns: asm.insns.into_iter().peekable(),
             index: 0,
-            indices: Vec::default()
+            indices: Vec::with_capacity(ASSEMBLER_INSNS_CAPACITY),
         }
     }
 
@@ -1581,6 +1691,7 @@ impl AssemblerDrainingIterator {
     }
 
     /// Map an operand by using this iterator's list of mapped indices.
+    #[cfg(target_arch = "x86_64")]
     pub fn map_opnd(&self, opnd: Opnd) -> Opnd {
         opnd.map_index(&self.indices)
     }
@@ -1612,52 +1723,6 @@ impl AssemblerDrainingIterator {
     }
 }
 
-/// A struct that allows iterating through references to an assembler's
-/// instructions without consuming them.
-pub struct AssemblerLookbackIterator {
-    asm: Assembler,
-    index: Cell<usize>
-}
-
-impl AssemblerLookbackIterator {
-    fn new(asm: Assembler) -> Self {
-        Self { asm, index: Cell::new(0) }
-    }
-
-    /// Fetches a reference to an instruction at a specific index.
-    pub fn get(&self, index: usize) -> Option<&Insn> {
-        self.asm.insns.get(index)
-    }
-
-    /// Fetches a reference to an instruction in the list relative to the
-    /// current cursor location of this iterator.
-    pub fn get_relative(&self, difference: i32) -> Option<&Insn> {
-        let index: Result<i32, _> = self.index.get().try_into();
-        let relative: Result<usize, _> = index.and_then(|value| (value + difference).try_into());
-        relative.ok().and_then(|value| self.asm.insns.get(value))
-    }
-
-    /// Fetches the previous instruction relative to the current cursor location
-    /// of this iterator.
-    pub fn get_previous(&self) -> Option<&Insn> {
-        self.get_relative(-1)
-    }
-
-    /// Fetches the next instruction relative to the current cursor location of
-    /// this iterator.
-    pub fn get_next(&self) -> Option<&Insn> {
-        self.get_relative(1)
-    }
-
-    /// Returns the next instruction in the list with the indices corresponding
-    /// to the previous list of instructions.
-    pub fn next_unmapped(&self) -> Option<(usize, &Insn)> {
-        let index = self.index.get();
-        self.index.set(index + 1);
-        self.asm.insns.get(index).map(|insn| (index, insn))
-    }
-}
-
 impl fmt::Debug for Assembler {
     fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result {
         writeln!(fmt, "Assembler")?;
@@ -1689,39 +1754,67 @@ impl Assembler {
         self.push_insn(Insn::BakeString(text.to_string()));
     }
 
+    #[allow(dead_code)]
     pub fn breakpoint(&mut self) {
         self.push_insn(Insn::Breakpoint);
     }
 
     pub fn ccall(&mut self, fptr: *const u8, opnds: Vec<Opnd>) -> Opnd {
-        let old_temps = self.ctx.get_reg_temps(); // with registers
+        // Let vm_check_canary() assert this ccall's leafness if leaf_ccall is set
+        let canary_opnd = self.set_stack_canary(&opnds);
+
+        let old_temps = self.ctx.get_reg_mapping(); // with registers
         // Spill stack temp registers since they are caller-saved registers.
         // Note that this doesn't spill stack temps that are already popped
         // but may still be used in the C arguments.
-        self.spill_temps();
-        let new_temps = self.ctx.get_reg_temps(); // all spilled
+        self.spill_regs();
+        let new_temps = self.ctx.get_reg_mapping(); // all spilled
 
-        // Temporarily manipulate RegTemps so that we can use registers
+        // Temporarily manipulate RegMappings so that we can use registers
         // to pass stack operands that are already spilled above.
-        self.ctx.set_reg_temps(old_temps);
+        self.ctx.set_reg_mapping(old_temps);
 
         // Call a C function
         let out = self.next_opnd_out(Opnd::match_num_bits(&opnds));
         self.push_insn(Insn::CCall { fptr, opnds, out });
 
         // Registers in old_temps may be clobbered by the above C call,
-        // so rollback the manipulated RegTemps to a spilled version.
-        self.ctx.set_reg_temps(new_temps);
+        // so rollback the manipulated RegMappings to a spilled version.
+        self.ctx.set_reg_mapping(new_temps);
+
+        // Clear the canary after use
+        if let Some(canary_opnd) = canary_opnd {
+            self.mov(canary_opnd, 0.into());
+        }
 
         out
     }
 
-    pub fn cmp(&mut self, left: Opnd, right: Opnd) {
-        self.push_insn(Insn::Cmp { left, right });
+    /// Let vm_check_canary() assert the leafness of this ccall if leaf_ccall is set
+    fn set_stack_canary(&mut self, opnds: &Vec<Opnd>) -> Option<Opnd> {
+        // Use the slot right above the stack top for verifying leafness.
+        let canary_opnd = self.stack_opnd(-1);
+
+        // If the slot is already used, which is a valid optimization to avoid spills,
+        // give up the verification.
+        let canary_opnd = if cfg!(feature = "runtime_checks") && self.leaf_ccall && opnds.iter().all(|opnd|
+            opnd.get_reg_opnd() != canary_opnd.get_reg_opnd()
+        ) {
+            asm_comment!(self, "set stack canary");
+            self.mov(canary_opnd, vm_stack_canary().into());
+            Some(canary_opnd)
+        } else {
+            None
+        };
+
+        // Avoid carrying the flag to the next instruction whether we verified it or not.
+        self.leaf_ccall = false;
+
+        canary_opnd
     }
 
-    pub fn comment(&mut self, text: &str) {
-        self.push_insn(Insn::Comment(text.to_string()));
+    pub fn cmp(&mut self, left: Opnd, right: Opnd) {
+        self.push_insn(Insn::Cmp { left, right });
     }
 
     #[must_use]
@@ -1734,9 +1827,9 @@ impl Assembler {
     pub fn cpop_all(&mut self) {
         self.push_insn(Insn::CPopAll);
 
-        // Re-enable ccall's RegTemps assertion disabled by cpush_all.
+        // Re-enable ccall's RegMappings assertion disabled by cpush_all.
         // cpush_all + cpop_all preserve all stack temp registers, so it's safe.
-        self.set_reg_temps(self.ctx.get_reg_temps());
+        self.set_reg_mapping(self.ctx.get_reg_mapping());
     }
 
     pub fn cpop_into(&mut self, opnd: Opnd) {
@@ -1753,8 +1846,8 @@ impl Assembler {
         // Mark all temps as not being in registers.
         // Temps will be marked back as being in registers by cpop_all.
         // We assume that cpush_all + cpop_all are used for C functions in utils.rs
-        // that don't require spill_temps for GC.
-        self.set_reg_temps(RegTemps::default());
+        // that don't require spill_regs for GC.
+        self.set_reg_mapping(RegMapping::default());
     }
 
     pub fn cret(&mut self, opnd: Opnd) {
@@ -1845,10 +1938,16 @@ impl Assembler {
         self.push_insn(Insn::Jl(target));
     }
 
+    #[allow(dead_code)]
     pub fn jg(&mut self, target: Target) {
         self.push_insn(Insn::Jg(target));
     }
 
+    #[allow(dead_code)]
+    pub fn jge(&mut self, target: Target) {
+        self.push_insn(Insn::Jge(target));
+    }
+
     pub fn jmp(&mut self, target: Target) {
         self.push_insn(Insn::Jmp(target));
     }
@@ -1869,6 +1968,10 @@ impl Assembler {
         self.push_insn(Insn::Jo(target));
     }
 
+    pub fn jo_mul(&mut self, target: Target) {
+        self.push_insn(Insn::JoMul(target));
+    }
+
     pub fn jz(&mut self, target: Target) {
         self.push_insn(Insn::Jz(target));
     }
@@ -1881,9 +1984,9 @@ impl Assembler {
     }
 
     #[must_use]
-    pub fn lea_label(&mut self, target: Target) -> Opnd {
+    pub fn lea_jump_target(&mut self, target: Target) -> Opnd {
         let out = self.next_opnd_out(Opnd::DEFAULT_NUM_BITS);
-        self.push_insn(Insn::LeaLabel { target, out });
+        self.push_insn(Insn::LeaJumpTarget { target, out });
         out
     }
 
@@ -1945,7 +2048,7 @@ impl Assembler {
     }
 
     //pub fn pos_marker<F: FnMut(CodePtr)>(&mut self, marker_fn: F)
-    pub fn pos_marker(&mut self, marker_fn: impl Fn(CodePtr) + 'static) {
+    pub fn pos_marker(&mut self, marker_fn: impl Fn(CodePtr, &CodeBlock) + 'static) {
         self.push_insn(Insn::PosMarker(Box::new(marker_fn)));
     }
 
@@ -1979,12 +2082,23 @@ impl Assembler {
     }
 
     #[must_use]
+    #[allow(dead_code)]
     pub fn urshift(&mut self, opnd: Opnd, shift: Opnd) -> Opnd {
         let out = self.next_opnd_out(Opnd::match_num_bits(&[opnd, shift]));
         self.push_insn(Insn::URShift { opnd, shift, out });
         out
     }
 
+    /// Verify the leafness of the given block
+    pub fn with_leaf_ccall<F, R>(&mut self, mut block: F) -> R
+    where F: FnMut(&mut Self) -> R {
+        let old_leaf_ccall = self.leaf_ccall;
+        self.leaf_ccall = true;
+        let ret = block(self);
+        self.leaf_ccall = old_leaf_ccall;
+        ret
+    }
+
     /// Add a label at the current position
     pub fn write_label(&mut self, target: Target) {
         assert!(target.unwrap_label_idx() < self.label_names.len());
@@ -1999,6 +2113,17 @@ impl Assembler {
     }
 }
 
+/// Macro to use format! for Insn::Comment, which skips a format! call
+/// when not dumping disassembly.
+macro_rules! asm_comment {
+    ($asm:expr, $($fmt:tt)*) => {
+        if $crate::options::get_option_ref!(dump_disasm).is_some() {
+            $asm.push_insn(Insn::Comment(format!($($fmt)*)));
+        }
+    };
+}
+pub(crate) use asm_comment;
+
 #[cfg(test)]
 mod tests {
     use super::*;
diff --git a/yjit/src/backend/mod.rs b/yjit/src/backend/mod.rs
index 47946950946438..6921244c72ac63 100644
--- a/yjit/src/backend/mod.rs
+++ b/yjit/src/backend/mod.rs
@@ -4,5 +4,11 @@ pub mod x86_64;
 #[cfg(target_arch = "aarch64")]
 pub mod arm64;
 
+#[cfg(target_arch = "x86_64")]
+pub use x86_64 as current;
+
+#[cfg(target_arch = "aarch64")]
+pub use arm64 as current;
+
 pub mod ir;
 mod tests;
diff --git a/yjit/src/backend/tests.rs b/yjit/src/backend/tests.rs
index 8ba9f61d251e63..ac2f35b3d9c9e4 100644
--- a/yjit/src/backend/tests.rs
+++ b/yjit/src/backend/tests.rs
@@ -1,19 +1,19 @@
 #![cfg(test)]
-use crate::asm::{CodeBlock};
+use crate::asm::CodeBlock;
 use crate::backend::ir::*;
 use crate::cruby::*;
 use crate::utils::c_callable;
 
 #[test]
 fn test_add() {
-    let mut asm = Assembler::new();
+    let mut asm = Assembler::new(0);
     let out = asm.add(SP, Opnd::UImm(1));
     let _ = asm.add(out, Opnd::UImm(2));
 }
 
 #[test]
 fn test_alloc_regs() {
-    let mut asm = Assembler::new();
+    let mut asm = Assembler::new(0);
 
     // Get the first output that we're going to reuse later.
     let out1 = asm.add(EC, Opnd::UImm(1));
@@ -62,7 +62,7 @@ fn test_alloc_regs() {
 
 fn setup_asm() -> (Assembler, CodeBlock) {
     return (
-        Assembler::new(),
+        Assembler::new(0),
         CodeBlock::new_dummy(1024)
     );
 }
@@ -87,7 +87,7 @@ fn test_mov_mem2mem()
 {
     let (mut asm, mut cb) = setup_asm();
 
-    asm.comment("check that comments work too");
+    asm_comment!(asm, "check that comments work too");
     asm.mov(Opnd::mem(64, SP, 0), Opnd::mem(64, SP, 8));
 
     asm.compile_with_num_regs(&mut cb, 1);
@@ -194,7 +194,7 @@ fn test_c_call()
 
 #[test]
 fn test_alloc_ccall_regs() {
-    let mut asm = Assembler::new();
+    let mut asm = Assembler::new(0);
     let out1 = asm.ccall(0 as *const u8, vec![]);
     let out2 = asm.ccall(0 as *const u8, vec![out1]);
     asm.mov(EC, out2);
@@ -231,7 +231,7 @@ fn test_jcc_ptr()
 {
     let (mut asm, mut cb) = setup_asm();
 
-    let side_exit = Target::CodePtr(((cb.get_write_ptr().raw_ptr() as usize + 4) as *mut u8).into());
+    let side_exit = Target::CodePtr(cb.get_write_ptr().add_bytes(4));
     let not_mask = asm.not(Opnd::mem(32, EC, RUBY_OFFSET_EC_INTERRUPT_MASK));
     asm.test(
         Opnd::mem(32, EC, RUBY_OFFSET_EC_INTERRUPT_FLAG),
@@ -248,7 +248,7 @@ fn test_jmp_ptr()
 {
     let (mut asm, mut cb) = setup_asm();
 
-    let stub = Target::CodePtr(((cb.get_write_ptr().raw_ptr() as usize + 4) as *mut u8).into());
+    let stub = Target::CodePtr(cb.get_write_ptr().add_bytes(4));
     asm.jmp(stub);
 
     asm.compile_with_num_regs(&mut cb, 0);
@@ -259,7 +259,7 @@ fn test_jo()
 {
     let (mut asm, mut cb) = setup_asm();
 
-    let side_exit = Target::CodePtr(((cb.get_write_ptr().raw_ptr() as usize + 4) as *mut u8).into());
+    let side_exit = Target::CodePtr(cb.get_write_ptr().add_bytes(4));
 
     let arg1 = Opnd::mem(64, SP, 0);
     let arg0 = Opnd::mem(64, SP, 8);
@@ -283,8 +283,7 @@ fn test_bake_string() {
 
 #[test]
 fn test_draining_iterator() {
-
-    let mut asm = Assembler::new();
+    let mut asm = Assembler::new(0);
 
     let _ = asm.load(Opnd::None);
     asm.store(Opnd::None, Opnd::None);
@@ -302,25 +301,6 @@ fn test_draining_iterator() {
     }
 }
 
-#[test]
-fn test_lookback_iterator() {
-    let mut asm = Assembler::new();
-
-    let _ = asm.load(Opnd::None);
-    asm.store(Opnd::None, Opnd::None);
-    asm.store(Opnd::None, Opnd::None);
-
-    let iter = asm.into_lookback_iter();
-
-    while let Some((index, insn)) = iter.next_unmapped() {
-        if index > 0 {
-            let opnd_iter = iter.get_previous().unwrap().opnd_iter();
-            assert_eq!(opnd_iter.take(1).next(), Some(&Opnd::None));
-            assert!(matches!(insn, Insn::Store { .. }));
-        }
-    }
-}
-
 #[test]
 fn test_cmp_8_bit() {
     let (mut asm, mut cb) = setup_asm();
@@ -329,3 +309,21 @@ fn test_cmp_8_bit() {
 
     asm.compile_with_num_regs(&mut cb, 1);
 }
+
+#[test]
+fn test_no_pos_marker_callback_when_compile_fails() {
+    // When compilation fails (e.g. when out of memory), the code written out is malformed.
+    // We don't want to invoke the pos_marker callbacks with positions of malformed code.
+    let mut asm = Assembler::new(0);
+
+    // Markers around code to exhaust memory limit
+    let fail_if_called = |_code_ptr, _cb: &_| panic!("pos_marker callback should not be called");
+    asm.pos_marker(fail_if_called);
+    let zero = asm.load(0.into());
+    let sum = asm.add(zero, 500.into());
+    asm.store(Opnd::mem(64, SP, 8), sum);
+    asm.pos_marker(fail_if_called);
+
+    let cb = &mut CodeBlock::new_dummy(8);
+    assert!(asm.compile(cb, None).is_none(), "should fail due to tiny size limit");
+}
diff --git a/yjit/src/backend/x86_64/mod.rs b/yjit/src/backend/x86_64/mod.rs
index 60d0e8bf8d9611..ef435bca7e5350 100644
--- a/yjit/src/backend/x86_64/mod.rs
+++ b/yjit/src/backend/x86_64/mod.rs
@@ -1,17 +1,12 @@
-#![allow(dead_code)]
-#![allow(unused_variables)]
-#![allow(unused_imports)]
-
 use std::mem::take;
 
 use crate::asm::*;
 use crate::asm::x86_64::*;
-use crate::codegen::{JITState};
-use crate::core::Context;
+use crate::codegen::CodePtr;
 use crate::cruby::*;
 use crate::backend::ir::*;
-use crate::codegen::CodegenGlobals;
 use crate::options::*;
+use crate::utils::*;
 
 // Use the x86 register type for this platform
 pub type Reg = X86Reg;
@@ -37,7 +32,7 @@ pub const _C_RET_OPND: Opnd = Opnd::Reg(RAX_REG);
 
 impl CodeBlock {
     // The number of bytes that are generated by jmp_ptr
-    pub fn jmp_ptr_bytes(&self) -> usize { 6 }
+    pub fn jmp_ptr_bytes(&self) -> usize { 5 }
 }
 
 /// Map Opnd to X86Opnd
@@ -84,6 +79,9 @@ impl From<&Opnd> for X86Opnd {
     }
 }
 
+/// List of registers that can be used for stack temps and locals.
+pub static TEMP_REGS: [Reg; 5] = [RSI_REG, RDI_REG, R8_REG, R9_REG, R10_REG];
+
 impl Assembler
 {
     // A special scratch register for intermediate processing.
@@ -91,8 +89,6 @@ impl Assembler
     pub const SCRATCH_REG: Reg = R11_REG;
     const SCRATCH0: X86Opnd = X86Opnd::Reg(Assembler::SCRATCH_REG);
 
-    /// List of registers that can be used for stack temps.
-    pub const TEMP_REGS: [Reg; 5] = [RSI_REG, RDI_REG, R8_REG, R9_REG, R10_REG];
 
     /// Get the list of registers from which we can allocate on this platform
     pub fn get_alloc_regs() -> Vec<Reg>
@@ -116,7 +112,7 @@ impl Assembler
     fn x86_split(mut self) -> Assembler
     {
         let live_ranges: Vec<usize> = take(&mut self.live_ranges);
-        let mut asm = Assembler::new_with_label_names(take(&mut self.label_names), take(&mut self.side_exits));
+        let mut asm = Assembler::new_with_label_names(take(&mut self.label_names), take(&mut self.side_exits), self.num_locals);
         let mut iterator = self.into_draining_iter();
 
         while let Some((index, mut insn)) = iterator.next_unmapped() {
@@ -139,7 +135,7 @@ impl Assembler
             // Opnd::Value operands into registers here because:
             //
             //   - Most instructions can't be encoded with 64-bit immediates.
-            //   - We look for Op::Load specifically when emiting to keep GC'ed
+            //   - We look for Op::Load specifically when emitting to keep GC'ed
             //     VALUEs alive. This is a sort of canonicalization.
             let mut unmapped_opnds: Vec<Opnd> = vec![];
 
@@ -185,6 +181,23 @@ impl Assembler
                             iterator.map_insn_index(&mut asm);
                             iterator.next_unmapped(); // Pop merged Insn::Mov
                         }
+                        (Opnd::Reg(_), Opnd::Reg(_), Some(Insn::Mov { dest, src }))
+                        if out == src && live_ranges[index] == index + 1 && {
+                            // We want to do `dest == left`, but `left` has already gone
+                            // through lower_stack_opnd() while `dest` has not. So we
+                            // lower `dest` before comparing.
+                            let lowered_dest = if let Opnd::Stack { .. } = dest {
+                                asm.lower_stack_opnd(dest)
+                            } else {
+                                *dest
+                            };
+                            lowered_dest == *left
+                        } => {
+                            *out = *dest;
+                            asm.push_insn(insn);
+                            iterator.map_insn_index(&mut asm);
+                            iterator.next_unmapped(); // Pop merged Insn::Mov
+                        }
                         _ => {
                             match (unmapped_opnds[0], unmapped_opnds[1]) {
                                 (Opnd::Mem(_), Opnd::Mem(_)) => {
@@ -275,7 +288,11 @@ impl Assembler
                                 *truthy = asm.load(*truthy);
                             }
                         },
-                        Opnd::UImm(_) | Opnd::Imm(_) | Opnd::Value(_) => {
+                        Opnd::UImm(_) | Opnd::Imm(_) => {
+                            *truthy = asm.load(*truthy);
+                        },
+                        // Opnd::Value could have already been split
+                        Opnd::Value(_) if !matches!(truthy, Opnd::InsnOut { .. }) => {
                             *truthy = asm.load(*truthy);
                         },
                         _ => {}
@@ -298,19 +315,24 @@ impl Assembler
                             let opnd1 = asm.load(*src);
                             asm.mov(*dest, opnd1);
                         },
-                        (Opnd::Mem(_), Opnd::UImm(value)) => {
-                            // 32-bit values will be sign-extended
-                            if imm_num_bits(*value as i64) > 32 {
+                        (Opnd::Mem(Mem { num_bits, .. }), Opnd::UImm(value)) => {
+                            // For 64 bit destinations, 32-bit values will be sign-extended
+                            if *num_bits == 64 && imm_num_bits(*value as i64) > 32 {
                                 let opnd1 = asm.load(*src);
                                 asm.mov(*dest, opnd1);
                             } else {
                                 asm.mov(*dest, *src);
                             }
                         },
-                        (Opnd::Mem(_), Opnd::Imm(value)) => {
-                            if imm_num_bits(*value) > 32 {
+                        (Opnd::Mem(Mem { num_bits, .. }), Opnd::Imm(value)) => {
+                            // For 64 bit destinations, 32-bit values will be sign-extended
+                            if *num_bits == 64 && imm_num_bits(*value) > 32 {
                                 let opnd1 = asm.load(*src);
                                 asm.mov(*dest, opnd1);
+                            } else if uimm_num_bits(*value as u64) <= *num_bits {
+                                // If the bit string is short enough for the destination, use the unsigned representation.
+                                // Note that 64-bit and negative values are ruled out.
+                                asm.mov(*dest, Opnd::UImm(*value as u64));
                             } else {
                                 asm.mov(*dest, *src);
                             }
@@ -385,7 +407,7 @@ impl Assembler
     }
 
     /// Emit platform-specific machine code
-    pub fn x86_emit(&mut self, cb: &mut CodeBlock, ocb: &mut Option<&mut OutlinedCb>) -> Vec<u32>
+    pub fn x86_emit(&mut self, cb: &mut CodeBlock, ocb: &mut Option<&mut OutlinedCb>) -> Option<Vec<u32>>
     {
         /// For some instructions, we want to be able to lower a 64-bit operand
         /// without requiring more registers to be available in the register
@@ -420,12 +442,12 @@ impl Assembler
             target: Target,
             asm: &mut Assembler,
             ocb: &mut Option<&mut OutlinedCb>,
-        ) -> Target {
+        ) -> Option<Target> {
             if let Target::SideExit { counter, context } = target {
                 let side_exit = asm.get_side_exit(&context.unwrap(), Some(counter), ocb.as_mut().unwrap());
-                Target::SideExitPtr(side_exit)
+                Some(Target::SideExitPtr(side_exit?))
             } else {
-                target
+                Some(target)
             }
         }
 
@@ -461,6 +483,9 @@ impl Assembler
         // List of GC offsets
         let mut gc_offsets: Vec<u32> = Vec::new();
 
+        // Buffered list of PosMarker callbacks to fire if codegen is successful
+        let mut pos_markers: Vec<(usize, CodePtr)> = vec![];
+
         // For each instruction
         let start_write_pos = cb.get_write_pos();
         let mut insn_idx: usize = 0;
@@ -472,9 +497,7 @@ impl Assembler
 
             match insn {
                 Insn::Comment(text) => {
-                    if cfg!(feature = "disasm") {
-                        cb.add_comment(text);
-                    }
+                    cb.add_comment(text);
                 },
 
                 // Write the label at the current position
@@ -483,8 +506,8 @@ impl Assembler
                 },
 
                 // Report back the current position in the generated code
-                Insn::PosMarker(pos_marker) => {
-                    pos_marker(cb.get_write_ptr());
+                Insn::PosMarker(..) => {
+                    pos_markers.push((insn_idx, cb.get_write_ptr()));
                 },
 
                 Insn::BakeString(text) => {
@@ -497,8 +520,21 @@ impl Assembler
                     cb.write_byte(0);
                 },
 
-                Insn::FrameSetup => {},
-                Insn::FrameTeardown => {},
+                // Set up RBP to work with frame pointer unwinding
+                // (e.g. with Linux `perf record --call-graph fp`)
+                Insn::FrameSetup => {
+                    if get_option!(frame_pointer) {
+                        push(cb, RBP);
+                        mov(cb, RBP, RSP);
+                        push(cb, RBP);
+                    }
+                },
+                Insn::FrameTeardown => {
+                    if get_option!(frame_pointer) {
+                        pop(cb, RBP);
+                        pop(cb, RBP);
+                    }
+                },
 
                 Insn::Add { left, right, .. } => {
                     let opnd1 = emit_64bit_immediate(cb, right);
@@ -578,16 +614,23 @@ impl Assembler
                     lea(cb, out.into(), opnd.into());
                 },
 
-                // Load relative address
-                Insn::LeaLabel { target, out } => {
-                    let label_idx = target.unwrap_label_idx();
-
-                    cb.label_ref(label_idx, 7, |cb, src_addr, dst_addr| {
-                        let disp = dst_addr - src_addr;
-                        lea(cb, Self::SCRATCH0, mem_opnd(8, RIP, disp.try_into().unwrap()));
-                    });
+                // Load address of jump target
+                Insn::LeaJumpTarget { target, out } => {
+                    if let Target::Label(label_idx) = target {
+                        // Set output to the raw address of the label
+                        cb.label_ref(*label_idx, 7, |cb, src_addr, dst_addr| {
+                            let disp = dst_addr - src_addr;
+                            lea(cb, Self::SCRATCH0, mem_opnd(8, RIP, disp.try_into().unwrap()));
+                        });
 
-                    mov(cb, out.into(), Self::SCRATCH0);
+                        mov(cb, out.into(), Self::SCRATCH0);
+                    } else {
+                        // Set output to the jump target's raw address
+                        let target_code = target.unwrap_code_ptr();
+                        let target_addr = target_code.raw_addr(cb).as_u64();
+                        // Constant encoded length important for patching
+                        movabs(cb, out.into(), target_addr);
+                    }
                 },
 
                 // Push and pop to/from the C stack
@@ -668,7 +711,7 @@ impl Assembler
 
                 // Conditional jump to a label
                 Insn::Jmp(target) => {
-                    match compile_side_exit(*target, self, ocb) {
+                    match compile_side_exit(*target, self, ocb)? {
                         Target::CodePtr(code_ptr) | Target::SideExitPtr(code_ptr) => jmp_ptr(cb, code_ptr),
                         Target::Label(label_idx) => jmp_label(cb, label_idx),
                         Target::SideExit { .. } => unreachable!("Target::SideExit should have been compiled by compile_side_exit"),
@@ -676,7 +719,7 @@ impl Assembler
                 }
 
                 Insn::Je(target) => {
-                    match compile_side_exit(*target, self, ocb) {
+                    match compile_side_exit(*target, self, ocb)? {
                         Target::CodePtr(code_ptr) | Target::SideExitPtr(code_ptr) => je_ptr(cb, code_ptr),
                         Target::Label(label_idx) => je_label(cb, label_idx),
                         Target::SideExit { .. } => unreachable!("Target::SideExit should have been compiled by compile_side_exit"),
@@ -684,7 +727,7 @@ impl Assembler
                 }
 
                 Insn::Jne(target) => {
-                    match compile_side_exit(*target, self, ocb) {
+                    match compile_side_exit(*target, self, ocb)? {
                         Target::CodePtr(code_ptr) | Target::SideExitPtr(code_ptr) => jne_ptr(cb, code_ptr),
                         Target::Label(label_idx) => jne_label(cb, label_idx),
                         Target::SideExit { .. } => unreachable!("Target::SideExit should have been compiled by compile_side_exit"),
@@ -692,7 +735,7 @@ impl Assembler
                 }
 
                 Insn::Jl(target) => {
-                    match compile_side_exit(*target, self, ocb) {
+                    match compile_side_exit(*target, self, ocb)? {
                         Target::CodePtr(code_ptr) | Target::SideExitPtr(code_ptr) => jl_ptr(cb, code_ptr),
                         Target::Label(label_idx) => jl_label(cb, label_idx),
                         Target::SideExit { .. } => unreachable!("Target::SideExit should have been compiled by compile_side_exit"),
@@ -700,15 +743,23 @@ impl Assembler
                 },
 
                 Insn::Jg(target) => {
-                    match compile_side_exit(*target, self, ocb) {
+                    match compile_side_exit(*target, self, ocb)? {
                         Target::CodePtr(code_ptr) | Target::SideExitPtr(code_ptr) => jg_ptr(cb, code_ptr),
                         Target::Label(label_idx) => jg_label(cb, label_idx),
                         Target::SideExit { .. } => unreachable!("Target::SideExit should have been compiled by compile_side_exit"),
                     }
                 },
 
+                Insn::Jge(target) => {
+                    match compile_side_exit(*target, self, ocb)? {
+                        Target::CodePtr(code_ptr) | Target::SideExitPtr(code_ptr) => jge_ptr(cb, code_ptr),
+                        Target::Label(label_idx) => jge_label(cb, label_idx),
+                        Target::SideExit { .. } => unreachable!("Target::SideExit should have been compiled by compile_side_exit"),
+                    }
+                },
+
                 Insn::Jbe(target) => {
-                    match compile_side_exit(*target, self, ocb) {
+                    match compile_side_exit(*target, self, ocb)? {
                         Target::CodePtr(code_ptr) | Target::SideExitPtr(code_ptr) => jbe_ptr(cb, code_ptr),
                         Target::Label(label_idx) => jbe_label(cb, label_idx),
                         Target::SideExit { .. } => unreachable!("Target::SideExit should have been compiled by compile_side_exit"),
@@ -716,7 +767,7 @@ impl Assembler
                 },
 
                 Insn::Jb(target) => {
-                    match compile_side_exit(*target, self, ocb) {
+                    match compile_side_exit(*target, self, ocb)? {
                         Target::CodePtr(code_ptr) | Target::SideExitPtr(code_ptr) => jb_ptr(cb, code_ptr),
                         Target::Label(label_idx) => jb_label(cb, label_idx),
                         Target::SideExit { .. } => unreachable!("Target::SideExit should have been compiled by compile_side_exit"),
@@ -724,7 +775,7 @@ impl Assembler
                 },
 
                 Insn::Jz(target) => {
-                    match compile_side_exit(*target, self, ocb) {
+                    match compile_side_exit(*target, self, ocb)? {
                         Target::CodePtr(code_ptr) | Target::SideExitPtr(code_ptr) => jz_ptr(cb, code_ptr),
                         Target::Label(label_idx) => jz_label(cb, label_idx),
                         Target::SideExit { .. } => unreachable!("Target::SideExit should have been compiled by compile_side_exit"),
@@ -732,21 +783,24 @@ impl Assembler
                 }
 
                 Insn::Jnz(target) => {
-                    match compile_side_exit(*target, self, ocb) {
+                    match compile_side_exit(*target, self, ocb)? {
                         Target::CodePtr(code_ptr) | Target::SideExitPtr(code_ptr) => jnz_ptr(cb, code_ptr),
                         Target::Label(label_idx) => jnz_label(cb, label_idx),
                         Target::SideExit { .. } => unreachable!("Target::SideExit should have been compiled by compile_side_exit"),
                     }
                 }
 
-                Insn::Jo(target) => {
-                    match compile_side_exit(*target, self, ocb) {
+                Insn::Jo(target) |
+                Insn::JoMul(target) => {
+                    match compile_side_exit(*target, self, ocb)? {
                         Target::CodePtr(code_ptr) | Target::SideExitPtr(code_ptr) => jo_ptr(cb, code_ptr),
                         Target::Label(label_idx) => jo_label(cb, label_idx),
                         Target::SideExit { .. } => unreachable!("Target::SideExit should have been compiled by compile_side_exit"),
                     }
                 }
 
+                Insn::Joz(..) | Insn::Jonz(..) => unreachable!("Joz/Jonz should be unused for now"),
+
                 // Atomically increment a counter at a given memory location
                 Insn::IncrCounter { mem, value } => {
                     assert!(matches!(mem, Opnd::Mem(_)));
@@ -800,11 +854,25 @@ impl Assembler
             }
         }
 
-        gc_offsets
+        // Error if we couldn't write out everything
+        if cb.has_dropped_bytes() {
+            return None
+        } else {
+            // No bytes dropped, so the pos markers point to valid code
+            for (insn_idx, pos) in pos_markers {
+                if let Insn::PosMarker(callback) = self.insns.get(insn_idx).unwrap() {
+                    callback(pos, &cb);
+                } else {
+                    panic!("non-PosMarker in pos_markers insn_idx={insn_idx} {self:?}");
+                }
+            }
+
+            return Some(gc_offsets)
+        }
     }
 
     /// Optimize and compile the stored instructions
-    pub fn compile_with_regs(self, cb: &mut CodeBlock, ocb: Option<&mut OutlinedCb>, regs: Vec<Reg>) -> Vec<u32> {
+    pub fn compile_with_regs(self, cb: &mut CodeBlock, ocb: Option<&mut OutlinedCb>, regs: Vec<Reg>) -> Option<(CodePtr, Vec<u32>)> {
         let asm = self.x86_split();
         let mut asm = asm.alloc_regs(regs);
 
@@ -815,28 +883,31 @@ impl Assembler
         }
 
         let mut ocb = ocb; // for &mut
+        let start_ptr = cb.get_write_ptr();
         let gc_offsets = asm.x86_emit(cb, &mut ocb);
 
-        if cb.has_dropped_bytes() {
-            cb.clear_labels();
-        } else {
+        if let (Some(gc_offsets), false) = (gc_offsets, cb.has_dropped_bytes()) {
             cb.link_labels();
-        }
 
-        gc_offsets
+            Some((start_ptr, gc_offsets))
+        } else {
+            cb.clear_labels();
+
+            None
+        }
     }
 }
 
 #[cfg(test)]
 mod tests {
-    use crate::disasm::{assert_disasm};
+    use crate::disasm::assert_disasm;
     #[cfg(feature = "disasm")]
     use crate::disasm::{unindent, disasm_addr_range};
 
     use super::*;
 
     fn setup_asm() -> (Assembler, CodeBlock) {
-        (Assembler::new(), CodeBlock::new_dummy(1024))
+        (Assembler::new(0), CodeBlock::new_dummy(1024))
     }
 
     #[test]
@@ -1233,4 +1304,37 @@ mod tests {
             0xe: mov qword ptr [rbx], rax
         "});
     }
+
+    #[test]
+    fn test_csel_split() {
+        let (mut asm, mut cb) = setup_asm();
+
+        let stack_top = Opnd::mem(64, SP, 0);
+        let elem_opnd = asm.csel_ne(VALUE(0x7f22c88d1930).into(), Qnil.into());
+        asm.mov(stack_top, elem_opnd);
+
+        asm.compile_with_num_regs(&mut cb, 3);
+
+        assert_disasm!(cb, "48b830198dc8227f0000b904000000480f44c1488903", {"
+            0x0: movabs rax, 0x7f22c88d1930
+            0xa: mov ecx, 4
+            0xf: cmove rax, rcx
+            0x13: mov qword ptr [rbx], rax
+        "});
+    }
+
+    #[test]
+    fn test_mov_m32_imm32() {
+        let (mut asm, mut cb) = setup_asm();
+
+        let shape_opnd = Opnd::mem(32, C_RET_OPND, 0);
+        asm.mov(shape_opnd, Opnd::UImm(0x8000_0001));
+        asm.mov(shape_opnd, Opnd::Imm(0x8000_0001));
+
+        asm.compile_with_num_regs(&mut cb, 0);
+        assert_disasm!(cb, "c70001000080c70001000080", {"
+            0x0: mov dword ptr [rax], 0x80000001
+            0x6: mov dword ptr [rax], 0x80000001
+        "});
+    }
 }
diff --git a/yjit/src/codegen.rs b/yjit/src/codegen.rs
index 92dd239c8b9f66..66932fd46cc961 100644
--- a/yjit/src/codegen.rs
+++ b/yjit/src/codegen.rs
@@ -1,8 +1,9 @@
-// We use the YARV bytecode constants which have a CRuby-style name
+// We use the YARV bytecode constants which have a CRuby-style name
 #![allow(non_upper_case_globals)]
 
 use crate::asm::*;
 use crate::backend::ir::*;
+use crate::backend::current::TEMP_REGS;
 use crate::core::*;
 use crate::cruby::*;
 use crate::invariants::*;
@@ -16,11 +17,13 @@ use std::cell::Cell;
 use std::cmp;
 use std::cmp::min;
 use std::collections::HashMap;
+use std::ffi::c_void;
 use std::ffi::CStr;
 use std::mem;
 use std::os::raw::c_int;
 use std::ptr;
 use std::rc::Rc;
+use std::cell::RefCell;
 use std::slice;
 
 pub use crate::virtualmem::CodePtr;
@@ -36,14 +39,13 @@ enum CodegenStatus {
 type InsnGenFn = fn(
     jit: &mut JITState,
     asm: &mut Assembler,
-    ocb: &mut OutlinedCb,
 ) -> Option<CodegenStatus>;
 
 /// Ephemeral code generation state.
-/// Represents a [core::Block] while we build it.
-pub struct JITState {
+/// Represents a [crate::core::Block] while we build it.
+pub struct JITState<'a> {
     /// Instruction sequence for the compiling block
-    iseq: IseqPtr,
+    pub iseq: IseqPtr,
 
     /// The iseq index of the first instruction in the block
     starting_insn_idx: IseqIdx,
@@ -70,6 +72,10 @@ pub struct JITState {
     /// This allows us to peek at run-time values
     ec: EcPtr,
 
+    /// The code block used for stubs, exits, and other code that are
+    /// not on the hot path.
+    outlined_code_block: &'a mut OutlinedCb,
+
     /// The outgoing branches the block will have
     pub pending_outgoing: Vec<PendingBranchRef>,
 
@@ -95,16 +101,37 @@ pub struct JITState {
     /// not been written to for the block to be valid.
     pub stable_constant_names_assumption: Option<*const ID>,
 
+    /// A list of classes that are not supposed to have a singleton class.
+    pub no_singleton_class_assumptions: Vec<VALUE>,
+
+    /// When true, the block is valid only when base pointer is equal to environment pointer.
+    pub no_ep_escape: bool,
+
     /// When true, the block is valid only when there is a total of one ractor running
     pub block_assumes_single_ractor: bool,
+
+    /// Address range for Linux perf's [JIT interface](https://github.com/torvalds/linux/blob/master/tools/perf/Documentation/jit-interface.txt)
+    perf_map: Rc::<RefCell::<Vec<(CodePtr, Option<CodePtr>, String)>>>,
+
+    /// Stack of symbol names for --yjit-perf
+    perf_stack: Vec<String>,
+
+    /// When true, this block is the first block compiled by gen_block_series().
+    first_block: bool,
+
+    /// A killswitch for bailing out of compilation. Used in rare situations where we need to fail
+    /// compilation deep in the stack (e.g. codegen failed for some jump target, but not due to
+    /// OOM). Because these situations are so rare it's not worth it to check and propogate at each
+    /// site. Instead, we check this once at the end.
+    block_abandoned: bool,
 }
 
-impl JITState {
-    pub fn new(blockid: BlockId, starting_ctx: Context, output_ptr: CodePtr, ec: EcPtr) -> Self {
+impl<'a> JITState<'a> {
+    pub fn new(blockid: BlockId, starting_ctx: Context, output_ptr: CodePtr, ec: EcPtr, ocb: &'a mut OutlinedCb, first_block: bool) -> Self {
         JITState {
             iseq: blockid.iseq,
             starting_insn_idx: blockid.idx,
-            starting_ctx: starting_ctx.clone(),
+            starting_ctx,
             output_ptr,
             insn_idx: 0,
             opcode: 0,
@@ -112,12 +139,19 @@ impl JITState {
             stack_size_for_pc: starting_ctx.get_stack_size(),
             pending_outgoing: vec![],
             ec,
+            outlined_code_block: ocb,
             record_boundary_patch_point: false,
             block_entry_exit: None,
             method_lookup_assumptions: vec![],
             bop_assumptions: vec![],
             stable_constant_names_assumption: None,
+            no_singleton_class_assumptions: vec![],
+            no_ep_escape: false,
             block_assumes_single_ractor: false,
+            perf_map: Rc::default(),
+            perf_stack: vec![],
+            first_block,
+            block_abandoned: false,
         }
     }
 
@@ -125,15 +159,15 @@ impl JITState {
         self.insn_idx
     }
 
-    pub fn get_iseq(self: &JITState) -> IseqPtr {
+    pub fn get_iseq(&self) -> IseqPtr {
         self.iseq
     }
 
-    pub fn get_opcode(self: &JITState) -> usize {
+    pub fn get_opcode(&self) -> usize {
         self.opcode
     }
 
-    pub fn get_pc(self: &JITState) -> *mut VALUE {
+    pub fn get_pc(&self) -> *mut VALUE {
         self.pc
     }
 
@@ -146,7 +180,7 @@ impl JITState {
     }
 
     pub fn get_starting_ctx(&self) -> Context {
-        self.starting_ctx.clone()
+        self.starting_ctx
     }
 
     pub fn get_arg(&self, arg_idx: isize) -> VALUE {
@@ -156,14 +190,89 @@ impl JITState {
         unsafe { *(self.pc.offset(arg_idx + 1)) }
     }
 
+    /// Get [Self::outlined_code_block]
+    pub fn get_ocb(&mut self) -> &mut OutlinedCb {
+        self.outlined_code_block
+    }
+
+    /// Leave a code stub to re-enter the compiler at runtime when the compiling program point is
+    /// reached. Should always be used in tail position like `return jit.defer_compilation(asm);`.
+    #[must_use]
+    fn defer_compilation(&mut self, asm: &mut Assembler) -> Option<CodegenStatus> {
+        if crate::core::defer_compilation(self, asm).is_err() {
+            // If we can't leave a stub, the block isn't usable and we have to bail.
+            self.block_abandoned = true;
+        }
+        Some(EndBlock)
+    }
+
+    /// Generate a branch with either end possibly stubbed out
+    fn gen_branch(
+        &mut self,
+        asm: &mut Assembler,
+        target0: BlockId,
+        ctx0: &Context,
+        target1: Option<BlockId>,
+        ctx1: Option<&Context>,
+        gen_fn: BranchGenFn,
+    ) {
+        if crate::core::gen_branch(self, asm, target0, ctx0, target1, ctx1, gen_fn).is_none() {
+            // If we can't meet the request for a branch, the code is
+            // essentially corrupt and we have to discard the block.
+            self.block_abandoned = true;
+        }
+    }
+
+    /// Wrapper for [self::gen_outlined_exit] with error handling.
+    fn gen_outlined_exit(&mut self, exit_pc: *mut VALUE, ctx: &Context) -> Option<CodePtr> {
+        let result = gen_outlined_exit(exit_pc, self.num_locals(), ctx, self.get_ocb());
+        if result.is_none() {
+            // When we can't have the exits, the code is incomplete and we have to bail.
+            self.block_abandoned = true;
+        }
+
+        result
+    }
+
+    /// Return true if the current ISEQ could escape an environment.
+    ///
+    /// As of vm_push_frame(), EP is always equal to BP. However, after pushing
+    /// a frame, some ISEQ setups call vm_bind_update_env(), which redirects EP.
+    /// Also, some method calls escape the environment to the heap.
+    fn escapes_ep(&self) -> bool {
+        match unsafe { get_iseq_body_type(self.iseq) } {
+            // <main> frame is always associated to TOPLEVEL_BINDING.
+            ISEQ_TYPE_MAIN |
+            // Kernel#eval uses a heap EP when a Binding argument is not nil.
+            ISEQ_TYPE_EVAL => true,
+            // If this ISEQ has previously escaped EP, give up the optimization.
+            _ if iseq_escapes_ep(self.iseq) => true,
+            _ => false,
+        }
+    }
+
     // Get the index of the next instruction
     fn next_insn_idx(&self) -> u16 {
         self.insn_idx + insn_len(self.get_opcode()) as u16
     }
 
-    // Check if we are compiling the instruction at the stub PC
+    /// Get the index of the next instruction of the next instruction
+    fn next_next_insn_idx(&self) -> u16 {
+        let next_pc = unsafe { rb_iseq_pc_at_idx(self.iseq, self.next_insn_idx().into()) };
+        let next_opcode: usize = unsafe { rb_iseq_opcode_at_pc(self.iseq, next_pc) }.try_into().unwrap();
+        self.next_insn_idx() + insn_len(next_opcode) as u16
+    }
+
+    // Check if we are compiling the instruction at the stub PC with the target Context
     // Meaning we are compiling the instruction that is next to execute
-    pub fn at_current_insn(&self) -> bool {
+    pub fn at_compile_target(&self) -> bool {
+        // If this is not the first block compiled by gen_block_series(),
+        // it might be compiling the same block again with a different Context.
+        // In that case, it should defer_compilation() and inspect the stack there.
+        if !self.first_block {
+            return false;
+        }
+
         let ec_pc: *mut VALUE = unsafe { get_cfp_pc(self.get_cfp()) };
         ec_pc == self.pc
     }
@@ -171,7 +280,7 @@ impl JITState {
     // Peek at the nth topmost value on the Ruby stack.
     // Returns the topmost value when n == 0.
     pub fn peek_at_stack(&self, ctx: &Context, n: isize) -> VALUE {
-        assert!(self.at_current_insn());
+        assert!(self.at_compile_target());
         assert!(n < ctx.get_stack_size() as isize);
 
         // Note: this does not account for ctx->sp_offset because
@@ -190,7 +299,7 @@ impl JITState {
     }
 
     fn peek_at_local(&self, n: i32) -> VALUE {
-        assert!(self.at_current_insn());
+        assert!(self.at_compile_target());
 
         let local_table_size: isize = unsafe { get_iseq_body_local_table_size(self.iseq) }
             .try_into()
@@ -206,7 +315,7 @@ impl JITState {
     }
 
     fn peek_at_block_handler(&self, level: u32) -> VALUE {
-        assert!(self.at_current_insn());
+        assert!(self.at_compile_target());
 
         unsafe {
             let ep = get_cfp_ep_level(self.get_cfp(), level);
@@ -214,26 +323,188 @@ impl JITState {
         }
     }
 
-    pub fn assume_method_lookup_stable(&mut self, asm: &mut Assembler, ocb: &mut OutlinedCb, cme: CmePtr) {
-        jit_ensure_block_entry_exit(self, asm, ocb);
+    pub fn assume_expected_cfunc(
+        &mut self,
+        asm: &mut Assembler,
+        class: VALUE,
+        method: ID,
+        cfunc: *mut c_void,
+    ) -> bool {
+        let cme = unsafe { rb_callable_method_entry(class, method) };
+
+        if cme.is_null() {
+            return false;
+        }
+
+        let def_type = unsafe { get_cme_def_type(cme) };
+        if def_type != VM_METHOD_TYPE_CFUNC {
+            return false;
+        }
+        if unsafe { get_mct_func(get_cme_def_body_cfunc(cme)) } != cfunc {
+            return false;
+        }
+
+        self.assume_method_lookup_stable(asm, cme);
+
+        true
+    }
+
+    pub fn assume_method_lookup_stable(&mut self, asm: &mut Assembler, cme: CmePtr) -> Option<()> {
+        jit_ensure_block_entry_exit(self, asm)?;
         self.method_lookup_assumptions.push(cme);
+
+        Some(())
+    }
+
+    /// Assume that objects of a given class will have no singleton class.
+    /// Return true if there has been no such singleton class since boot
+    /// and we can safely invalidate it.
+    pub fn assume_no_singleton_class(&mut self, asm: &mut Assembler, klass: VALUE) -> bool {
+        if jit_ensure_block_entry_exit(self, asm).is_none() {
+            return false; // out of space, give up
+        }
+        if has_singleton_class_of(klass) {
+            return false; // we've seen a singleton class. disable the optimization to avoid an invalidation loop.
+        }
+        self.no_singleton_class_assumptions.push(klass);
+        true
+    }
+
+    /// Assume that base pointer is equal to environment pointer in the current ISEQ.
+    /// Return true if it's safe to assume so.
+    fn assume_no_ep_escape(&mut self, asm: &mut Assembler) -> bool {
+        if jit_ensure_block_entry_exit(self, asm).is_none() {
+            return false; // out of space, give up
+        }
+        if self.escapes_ep() {
+            return false; // EP has been escaped in this ISEQ. disable the optimization to avoid an invalidation loop.
+        }
+        self.no_ep_escape = true;
+        true
     }
 
     fn get_cfp(&self) -> *mut rb_control_frame_struct {
         unsafe { get_ec_cfp(self.ec) }
     }
 
-    pub fn assume_stable_constant_names(&mut self, asm: &mut Assembler, ocb: &mut OutlinedCb, id: *const ID) {
-        jit_ensure_block_entry_exit(self, asm, ocb);
+    pub fn assume_stable_constant_names(&mut self, asm: &mut Assembler, id: *const ID) -> Option<()> {
+        jit_ensure_block_entry_exit(self, asm)?;
         self.stable_constant_names_assumption = Some(id);
+
+        Some(())
     }
 
     pub fn queue_outgoing_branch(&mut self, branch: PendingBranchRef) {
         self.pending_outgoing.push(branch)
     }
+
+    /// Push a symbol for --yjit-perf
+    fn perf_symbol_push(&mut self, asm: &mut Assembler, symbol_name: &str) {
+        if !self.perf_stack.is_empty() {
+            self.perf_symbol_range_end(asm);
+        }
+        self.perf_stack.push(symbol_name.to_string());
+        self.perf_symbol_range_start(asm, symbol_name);
+    }
+
+    /// Pop the stack-top symbol for --yjit-perf
+    fn perf_symbol_pop(&mut self, asm: &mut Assembler) {
+        self.perf_symbol_range_end(asm);
+        self.perf_stack.pop();
+        if let Some(symbol_name) = self.perf_stack.get(0) {
+            self.perf_symbol_range_start(asm, symbol_name);
+        }
+    }
+
+    /// Mark the start address of a symbol to be reported to perf
+    fn perf_symbol_range_start(&self, asm: &mut Assembler, symbol_name: &str) {
+        let symbol_name = format!("[JIT] {}", symbol_name);
+        let syms = self.perf_map.clone();
+        asm.pos_marker(move |start, _| syms.borrow_mut().push((start, None, symbol_name.clone())));
+    }
+
+    /// Mark the end address of a symbol to be reported to perf
+    fn perf_symbol_range_end(&self, asm: &mut Assembler) {
+        let syms = self.perf_map.clone();
+        asm.pos_marker(move |end, _| {
+            if let Some((_, ref mut end_store, _)) = syms.borrow_mut().last_mut() {
+                assert_eq!(None, *end_store);
+                *end_store = Some(end);
+            }
+        });
+    }
+
+    /// Flush addresses and symbols to /tmp/perf-{pid}.map
+    fn flush_perf_symbols(&self, cb: &CodeBlock) {
+        assert_eq!(0, self.perf_stack.len());
+        let path = format!("/tmp/perf-{}.map", std::process::id());
+        let mut f = std::fs::File::options().create(true).append(true).open(path).unwrap();
+        for sym in self.perf_map.borrow().iter() {
+            if let (start, Some(end), name) = sym {
+                // In case the code straddles two pages, part of it belongs to the symbol.
+                for (inline_start, inline_end) in cb.writable_addrs(*start, *end) {
+                    use std::io::Write;
+                    let code_size = inline_end - inline_start;
+                    writeln!(f, "{inline_start:x} {code_size:x} {name}").unwrap();
+                }
+            }
+        }
+    }
+
+    /// Return true if we're compiling a send-like instruction, not an opt_* instruction.
+    pub fn is_sendish(&self) -> bool {
+        match unsafe { rb_iseq_opcode_at_pc(self.iseq, self.pc) } as u32 {
+            YARVINSN_send |
+            YARVINSN_opt_send_without_block |
+            YARVINSN_invokesuper => true,
+            _ => false,
+        }
+    }
+
+    /// Return the number of locals in the current ISEQ
+    pub fn num_locals(&self) -> u32 {
+        unsafe { get_iseq_body_local_table_size(self.iseq) }
+    }
+}
+
+/// Macro to call jit.perf_symbol_push() without evaluating arguments when
+/// the option is turned off, which is useful for avoiding string allocation.
+macro_rules! jit_perf_symbol_push {
+    ($jit:expr, $asm:expr, $symbol_name:expr, $perf_map:expr) => {
+        if get_option!(perf_map) == Some($perf_map) {
+            $jit.perf_symbol_push($asm, $symbol_name);
+        }
+    };
+}
+
+/// Macro to call jit.perf_symbol_pop(), for consistency with jit_perf_symbol_push!().
+macro_rules! jit_perf_symbol_pop {
+    ($jit:expr, $asm:expr, $perf_map:expr) => {
+        if get_option!(perf_map) == Some($perf_map) {
+            $jit.perf_symbol_pop($asm);
+        }
+    };
+}
+
+/// Macro to push and pop a perf symbol around a function call.
+macro_rules! perf_call {
+    // perf_call!("prefix: ", func(...)) uses "prefix: func" as a symbol.
+    ($prefix:expr, $func_name:ident($jit:expr, $asm:expr$(, $arg:expr)*$(,)?) ) => {
+        {
+            jit_perf_symbol_push!($jit, $asm, &format!("{}{}", $prefix, stringify!($func_name)), PerfMap::Codegen);
+            let ret = $func_name($jit, $asm, $($arg),*);
+            jit_perf_symbol_pop!($jit, $asm, PerfMap::Codegen);
+            ret
+        }
+    };
+    // perf_call! { func(...) } uses "func" as a symbol.
+    { $func_name:ident($jit:expr, $asm:expr$(, $arg:expr)*$(,)?) } => {
+        perf_call!("", $func_name($jit, $asm, $($arg),*))
+    };
 }
 
 use crate::codegen::JCCKinds::*;
+use crate::log::Log;
 
 #[allow(non_camel_case_types, unused)]
 pub enum JCCKinds {
@@ -245,15 +516,39 @@ pub enum JCCKinds {
     JCC_JBE,
     JCC_JNA,
     JCC_JNAE,
+    JCC_JO_MUL,
+}
+
+/// Generate code to increment a given counter. With --yjit-trace-exits=counter,
+/// the counter is traced when it's incremented by this function.
+#[inline(always)]
+fn gen_counter_incr(jit: &JITState, asm: &mut Assembler, counter: Counter) {
+    gen_counter_incr_with_pc(asm, counter, jit.pc);
+}
+
+/// Same as gen_counter_incr(), but takes PC isntead of JITState.
+#[inline(always)]
+fn gen_counter_incr_with_pc(asm: &mut Assembler, counter: Counter, pc: *mut VALUE) {
+    gen_counter_incr_without_pc(asm, counter);
+
+    // Trace a counter if --yjit-trace-exits=counter is given.
+    // TraceExits::All is handled by gen_exit().
+    if get_option!(trace_exits) == Some(TraceExits::Counter(counter)) {
+        with_caller_saved_temp_regs(asm, |asm| {
+            asm.ccall(rb_yjit_record_exit_stack as *const u8, vec![Opnd::const_ptr(pc as *const u8)]);
+        });
+    }
 }
 
+/// Generate code to increment a given counter. Not traced by --yjit-trace-exits=counter
+/// unlike gen_counter_incr() or gen_counter_incr_with_pc().
 #[inline(always)]
-fn gen_counter_incr(asm: &mut Assembler, counter: Counter) {
+fn gen_counter_incr_without_pc(asm: &mut Assembler, counter: Counter) {
     // Assert that default counters are not incremented by generated code as this would impact performance
     assert!(!DEFAULT_COUNTERS.contains(&counter), "gen_counter_incr incremented {:?}", counter);
 
     if get_option!(gen_stats) {
-        asm.comment(&format!("increment counter {}", counter.get_name()));
+        asm_comment!(asm, "increment counter {}", counter.get_name());
         let ptr = get_counter_ptr(&counter.get_name());
         let ptr_reg = asm.load(Opnd::const_ptr(ptr as *const u8));
         let counter_opnd = Opnd::mem(64, ptr_reg, 0);
@@ -272,7 +567,7 @@ fn jit_save_pc(jit: &JITState, asm: &mut Assembler) {
         pc.offset(cur_insn_len)
     };
 
-    asm.comment("save PC to CFP");
+    asm_comment!(asm, "save PC to CFP");
     asm.mov(Opnd::mem(64, CFP, RUBY_OFFSET_CFP_PC), Opnd::const_ptr(ptr as *const u8));
 }
 
@@ -281,42 +576,115 @@ fn jit_save_pc(jit: &JITState, asm: &mut Assembler) {
 /// Note: this will change the current value of REG_SP,
 ///       which could invalidate memory operands
 fn gen_save_sp(asm: &mut Assembler) {
-    asm.spill_temps();
-    if asm.ctx.get_sp_offset() != 0 {
-        asm.comment("save SP to CFP");
-        let stack_pointer = asm.ctx.sp_opnd(0);
+    gen_save_sp_with_offset(asm, 0);
+}
+
+/// Save the current SP + offset on the CFP
+fn gen_save_sp_with_offset(asm: &mut Assembler, offset: i8) {
+    if asm.ctx.get_sp_offset() != -offset {
+        asm_comment!(asm, "save SP to CFP");
+        let stack_pointer = asm.ctx.sp_opnd(offset as i32);
         let sp_addr = asm.lea(stack_pointer);
         asm.mov(SP, sp_addr);
         let cfp_sp_opnd = Opnd::mem(64, CFP, RUBY_OFFSET_CFP_SP);
         asm.mov(cfp_sp_opnd, SP);
-        asm.ctx.set_sp_offset(0);
+        asm.ctx.set_sp_offset(-offset);
+    }
+}
+
+/// Basically jit_prepare_non_leaf_call(), but this registers the current PC
+/// to lazily push a C method frame when it's necessary.
+fn jit_prepare_lazy_frame_call(
+    jit: &mut JITState,
+    asm: &mut Assembler,
+    cme: *const rb_callable_method_entry_t,
+    recv_opnd: YARVOpnd,
+) -> bool {
+    // We can use this only when the receiver is on stack.
+    let recv_idx = match recv_opnd {
+        StackOpnd(recv_idx) => recv_idx,
+        _ => unreachable!("recv_opnd must be on stack, but got: {:?}", recv_opnd),
+    };
+
+    // Get the next PC. jit_save_pc() saves that PC.
+    let pc: *mut VALUE = unsafe {
+        let cur_insn_len = insn_len(jit.get_opcode()) as isize;
+        jit.get_pc().offset(cur_insn_len)
+    };
+
+    let pc_to_cfunc = CodegenGlobals::get_pc_to_cfunc();
+    match pc_to_cfunc.get(&pc) {
+        Some(&(other_cme, _)) if other_cme != cme => {
+            // Bail out if it's not the only cme on this callsite.
+            incr_counter!(lazy_frame_failure);
+            return false;
+        }
+        _ => {
+            // Let rb_yjit_lazy_push_frame() lazily push a C frame on this PC.
+            incr_counter!(lazy_frame_count);
+            pc_to_cfunc.insert(pc, (cme, recv_idx));
+        }
+    }
+
+    // Save the PC to trigger a lazy frame push, and save the SP to get the receiver.
+    // The C func may call a method that doesn't raise, so prepare for invalidation too.
+    jit_prepare_non_leaf_call(jit, asm);
+
+    // Make sure we're ready for calling rb_vm_push_cfunc_frame().
+    let cfunc_argc = unsafe { get_mct_argc(get_cme_def_body_cfunc(cme)) };
+    if cfunc_argc != -1 {
+        assert_eq!(recv_idx as i32, cfunc_argc); // verify the receiver index if possible
     }
+    assert!(asm.get_leaf_ccall()); // It checks the stack canary we set for known_cfunc_codegen.
+
+    true
 }
 
-/// jit_save_pc() + gen_save_sp(). Should be used before calling a routine that
-/// could:
+/// jit_save_pc() + gen_save_sp(). Should be used before calling a routine that could:
 ///  - Perform GC allocation
 ///  - Take the VM lock through RB_VM_LOCK_ENTER()
 ///  - Perform Ruby method call
-fn jit_prepare_routine_call(
+///
+/// If the routine doesn't call arbitrary methods, use jit_prepare_call_with_gc() instead.
+fn jit_prepare_non_leaf_call(
     jit: &mut JITState,
     asm: &mut Assembler
 ) {
-    jit.record_boundary_patch_point = true;
-    jit_save_pc(jit, asm);
-    gen_save_sp(asm);
+    // Prepare for GC. Setting PC also prepares for showing a backtrace.
+    jit.record_boundary_patch_point = true; // VM lock could trigger invalidation
+    jit_save_pc(jit, asm); // for allocation tracing
+    gen_save_sp(asm); // protect objects from GC
 
     // In case the routine calls Ruby methods, it can set local variables
-    // through Kernel#binding and other means.
-    asm.ctx.clear_local_types();
+    // through Kernel#binding, rb_debug_inspector API, and other means.
+    asm.clear_local_types();
+}
+
+/// jit_save_pc() + gen_save_sp(). Should be used before calling a routine that could:
+///  - Perform GC allocation
+///  - Take the VM lock through RB_VM_LOCK_ENTER()
+fn jit_prepare_call_with_gc(
+    jit: &mut JITState,
+    asm: &mut Assembler
+) {
+    jit.record_boundary_patch_point = true; // VM lock could trigger invalidation
+    jit_save_pc(jit, asm); // for allocation tracing
+    gen_save_sp(asm); // protect objects from GC
+
+    // Expect a leaf ccall(). You should use jit_prepare_non_leaf_call() if otherwise.
+    asm.expect_leaf_ccall();
 }
 
 /// Record the current codeblock write position for rewriting into a jump into
 /// the outlined block later. Used to implement global code invalidation.
 fn record_global_inval_patch(asm: &mut Assembler, outline_block_target_pos: CodePtr) {
+    // We add a padding before pos_marker so that the previous patch will not overlap this.
+    // jump_to_next_insn() puts a patch point at the end of the block in fallthrough cases.
+    // In the fallthrough case, the next block should start with the same Context, so the
+    // patch is fine, but it should not overlap another patch.
     asm.pad_inval_patch();
-    asm.pos_marker(move |code_ptr| {
-        CodegenGlobals::push_global_inval_patch(code_ptr, outline_block_target_pos);
+    asm.pos_marker(move |code_ptr, cb| {
+        CodegenGlobals::push_global_inval_patch(code_ptr, outline_block_target_pos, cb);
     });
 }
 
@@ -327,14 +695,36 @@ fn verify_ctx(jit: &JITState, ctx: &Context) {
         unsafe { CStr::from_ptr(rb_obj_info(val)).to_str().unwrap() }
     }
 
+    // Some types such as CString only assert the class field of the object
+    // when there has never been a singleton class created for objects of that class.
+    // Once there is a singleton class created they become their weaker
+    // `T*` variant, and we more objects should pass the verification.
+    fn relax_type_with_singleton_class_assumption(ty: Type) -> Type {
+        if let Type::CString | Type::CArray | Type::CHash = ty {
+            if has_singleton_class_of(ty.known_class().unwrap()) {
+                match ty {
+                    Type::CString => return Type::TString,
+                    Type::CArray => return Type::TArray,
+                    Type::CHash => return Type::THash,
+                    _ => (),
+                }
+            }
+        }
+
+        ty
+    }
+
     // Only able to check types when at current insn
-    assert!(jit.at_current_insn());
+    assert!(jit.at_compile_target());
 
     let self_val = jit.peek_at_self();
     let self_val_type = Type::from(self_val);
+    let learned_self_type = ctx.get_opnd_type(SelfOpnd);
+    let learned_self_type = relax_type_with_singleton_class_assumption(learned_self_type);
+
 
     // Verify self operand type
-    if self_val_type.diff(ctx.get_opnd_type(SelfOpnd)) == TypeDiff::Incompatible {
+    if self_val_type.diff(learned_self_type) == TypeDiff::Incompatible {
         panic!(
             "verify_ctx: ctx self type ({:?}) incompatible with actual value of self {}",
             ctx.get_opnd_type(SelfOpnd),
@@ -343,16 +733,17 @@ fn verify_ctx(jit: &JITState, ctx: &Context) {
     }
 
     // Verify stack operand types
-    let top_idx = cmp::min(ctx.get_stack_size(), MAX_TEMP_TYPES as u8);
+    let top_idx = cmp::min(ctx.get_stack_size(), MAX_CTX_TEMPS as u8);
     for i in 0..top_idx {
         let learned_mapping = ctx.get_opnd_mapping(StackOpnd(i));
         let learned_type = ctx.get_opnd_type(StackOpnd(i));
+        let learned_type = relax_type_with_singleton_class_assumption(learned_type);
 
         let stack_val = jit.peek_at_stack(ctx, i as isize);
         let val_type = Type::from(stack_val);
 
-        match learned_mapping.get_kind() {
-            TempMappingKind::MapToSelf => {
+        match learned_mapping {
+            TempMapping::MapToSelf => {
                 if self_val != stack_val {
                     panic!(
                         "verify_ctx: stack value was mapped to self, but values did not match!\n  stack: {}\n  self: {}",
@@ -361,8 +752,7 @@ fn verify_ctx(jit: &JITState, ctx: &Context) {
                     );
                 }
             }
-            TempMappingKind::MapToLocal => {
-                let local_idx: u8 = learned_mapping.get_local_idx().into();
+            TempMapping::MapToLocal(local_idx) => {
                 let local_val = jit.peek_at_local(local_idx.into());
                 if local_val != stack_val {
                     panic!(
@@ -373,7 +763,7 @@ fn verify_ctx(jit: &JITState, ctx: &Context) {
                     );
                 }
             }
-            TempMappingKind::MapToStack => {}
+            TempMapping::MapToStack(_) => {}
         }
 
         // If the actual type differs from the learned type
@@ -389,9 +779,10 @@ fn verify_ctx(jit: &JITState, ctx: &Context) {
 
     // Verify local variable types
     let local_table_size = unsafe { get_iseq_body_local_table_size(jit.iseq) };
-    let top_idx: usize = cmp::min(local_table_size as usize, MAX_TEMP_TYPES);
+    let top_idx: usize = cmp::min(local_table_size as usize, MAX_CTX_TEMPS);
     for i in 0..top_idx {
         let learned_type = ctx.get_local_type(i);
+        let learned_type = relax_type_with_singleton_class_assumption(learned_type);
         let local_val = jit.peek_at_local(i as i32);
         let local_type = Type::from(local_val);
 
@@ -410,14 +801,13 @@ fn verify_ctx(jit: &JITState, ctx: &Context) {
 // to the interpreter when it cannot service a stub by generating new code.
 // Before coming here, branch_stub_hit() takes care of fully reconstructing
 // interpreter state.
-fn gen_stub_exit(ocb: &mut OutlinedCb) -> CodePtr {
+fn gen_stub_exit(ocb: &mut OutlinedCb) -> Option<CodePtr> {
     let ocb = ocb.unwrap();
-    let code_ptr = ocb.get_write_ptr();
-    let mut asm = Assembler::new();
+    let mut asm = Assembler::new_without_iseq();
 
-    gen_counter_incr(&mut asm, Counter::exit_from_branch_stub);
+    gen_counter_incr_without_pc(&mut asm, Counter::exit_from_branch_stub);
 
-    asm.comment("exit from branch stub");
+    asm_comment!(asm, "exit from branch stub");
     asm.cpop_into(SP);
     asm.cpop_into(EC);
     asm.cpop_into(CFP);
@@ -426,9 +816,7 @@ fn gen_stub_exit(ocb: &mut OutlinedCb) -> CodePtr {
 
     asm.cret(Qundef.into());
 
-    asm.compile(ocb, None);
-
-    code_ptr
+    asm.compile(ocb, None).map(|(code_ptr, _)| code_ptr)
 }
 
 /// Generate an exit to return to the interpreter
@@ -436,11 +824,17 @@ fn gen_exit(exit_pc: *mut VALUE, asm: &mut Assembler) {
     #[cfg(all(feature = "disasm", not(test)))]
     {
         let opcode = unsafe { rb_vm_insn_addr2opcode((*exit_pc).as_ptr()) };
-        asm.comment(&format!("exit to interpreter on {}", insn_name(opcode as usize)));
+        asm_comment!(asm, "exit to interpreter on {}", insn_name(opcode as usize));
+    }
+
+    if asm.ctx.is_return_landing() {
+        asm.mov(SP, Opnd::mem(64, CFP, RUBY_OFFSET_CFP_SP));
+        let top = asm.stack_push(Type::Unknown);
+        asm.mov(top, C_RET_OPND);
     }
 
     // Spill stack temps before returning to the interpreter
-    asm.spill_temps();
+    asm.spill_regs();
 
     // Generate the code to exit to the interpreters
     // Write the adjusted SP back into the CFP
@@ -465,9 +859,9 @@ fn gen_exit(exit_pc: *mut VALUE, asm: &mut Assembler) {
             vec![Opnd::const_ptr(exit_pc as *const u8)]
         );
 
-        // If --yjit-trace-exits option is enabled, record the exit stack
-        // while recording the side exits.
-        if get_option!(gen_trace_exits) {
+        // If --yjit-trace-exits is enabled, record the exit stack while recording
+        // the side exits. TraceExits::Counter is handled by gen_counted_exit().
+        if get_option!(trace_exits) == Some(TraceExits::All) {
             asm.ccall(
                 rb_yjit_record_exit_stack as *const u8,
                 vec![Opnd::const_ptr(exit_pc as *const u8)]
@@ -496,56 +890,62 @@ fn gen_exit(exit_pc: *mut VALUE, asm: &mut Assembler) {
 /// moment, so there is one unique side exit for each context. Note that
 /// it's incorrect to jump to the side exit after any ctx stack push operations
 /// since they change the logic required for reconstructing interpreter state.
-pub fn gen_outlined_exit(exit_pc: *mut VALUE, ctx: &Context, ocb: &mut OutlinedCb) -> CodePtr {
+///
+/// If you're in [the codegen module][self], use [JITState::gen_outlined_exit]
+/// instead of calling this directly.
+#[must_use]
+pub fn gen_outlined_exit(exit_pc: *mut VALUE, num_locals: u32, ctx: &Context, ocb: &mut OutlinedCb) -> Option<CodePtr> {
     let mut cb = ocb.unwrap();
-    let exit_code = cb.get_write_ptr();
-    let mut asm = Assembler::new();
-    asm.ctx = ctx.clone();
-    asm.set_reg_temps(ctx.get_reg_temps());
+    let mut asm = Assembler::new(num_locals);
+    asm.ctx = *ctx;
+    asm.set_reg_mapping(ctx.get_reg_mapping());
 
     gen_exit(exit_pc, &mut asm);
 
-    asm.compile(&mut cb, None);
-
-    exit_code
+    asm.compile(&mut cb, None).map(|(code_ptr, _)| code_ptr)
 }
 
 /// Get a side exit. Increment a counter in it if --yjit-stats is enabled.
-pub fn gen_counted_exit(side_exit: CodePtr, ocb: &mut OutlinedCb, counter: Option<Counter>) -> CodePtr {
+pub fn gen_counted_exit(exit_pc: *mut VALUE, side_exit: CodePtr, ocb: &mut OutlinedCb, counter: Option<Counter>) -> Option<CodePtr> {
     // The counter is only incremented when stats are enabled
     if !get_option!(gen_stats) {
-        return side_exit;
+        return Some(side_exit);
     }
     let counter = match counter {
         Some(counter) => counter,
-        None => return side_exit,
+        None => return Some(side_exit),
     };
 
-    let ocb = ocb.unwrap();
-    let code_ptr = ocb.get_write_ptr();
-
-    let mut asm = Assembler::new();
+    let mut asm = Assembler::new_without_iseq();
 
-    // Load the pointer into a register
-    asm.comment(&format!("increment counter {}", counter.get_name()));
-    let ptr_reg = asm.load(Opnd::const_ptr(get_counter_ptr(&counter.get_name()) as *const u8));
-    let counter_opnd = Opnd::mem(64, ptr_reg, 0);
-
-    // Increment and store the updated value
-    asm.incr_counter(counter_opnd, Opnd::UImm(1));
+    // Increment a counter
+    gen_counter_incr_with_pc(&mut asm, counter, exit_pc);
 
     // Jump to the existing side exit
     asm.jmp(Target::CodePtr(side_exit));
-    asm.compile(ocb, None);
 
-    code_ptr
+    let ocb = ocb.unwrap();
+    asm.compile(ocb, None).map(|(code_ptr, _)| code_ptr)
+}
+
+/// Preserve caller-saved stack temp registers during the call of a given block
+fn with_caller_saved_temp_regs<F, R>(asm: &mut Assembler, block: F) -> R where F: FnOnce(&mut Assembler) -> R {
+    for &reg in caller_saved_temp_regs() {
+        asm.cpush(Opnd::Reg(reg)); // save stack temps
+    }
+    let ret = block(asm);
+    for &reg in caller_saved_temp_regs().rev() {
+        asm.cpop_into(Opnd::Reg(reg)); // restore stack temps
+    }
+    ret
 }
 
 // Ensure that there is an exit for the start of the block being compiled.
 // Block invalidation uses this exit.
-pub fn jit_ensure_block_entry_exit(jit: &mut JITState, asm: &mut Assembler, ocb: &mut OutlinedCb) {
+#[must_use]
+pub fn jit_ensure_block_entry_exit(jit: &mut JITState, asm: &mut Assembler) -> Option<()> {
     if jit.block_entry_exit.is_some() {
-        return;
+        return Some(());
     }
 
     let block_starting_context = &jit.get_starting_ctx();
@@ -553,32 +953,33 @@ pub fn jit_ensure_block_entry_exit(jit: &mut JITState, asm: &mut Assembler, ocb:
     // If we're compiling the first instruction in the block.
     if jit.insn_idx == jit.starting_insn_idx {
         // Generate the exit with the cache in Assembler.
-        let side_exit_context = SideExitContext::new(jit.pc, block_starting_context.clone());
-        let entry_exit = asm.get_side_exit(&side_exit_context, None, ocb);
-        jit.block_entry_exit = Some(entry_exit);
+        let side_exit_context = SideExitContext::new(jit.pc, *block_starting_context);
+        let entry_exit = asm.get_side_exit(&side_exit_context, None, jit.get_ocb());
+        jit.block_entry_exit = Some(entry_exit?);
     } else {
         let block_entry_pc = unsafe { rb_iseq_pc_at_idx(jit.iseq, jit.starting_insn_idx.into()) };
-        jit.block_entry_exit = Some(gen_outlined_exit(block_entry_pc, block_starting_context, ocb));
+        jit.block_entry_exit = Some(jit.gen_outlined_exit(block_entry_pc, block_starting_context)?);
     }
+
+    Some(())
 }
 
 // Landing code for when c_return tracing is enabled. See full_cfunc_return().
-fn gen_full_cfunc_return(ocb: &mut OutlinedCb) -> CodePtr {
+fn gen_full_cfunc_return(ocb: &mut OutlinedCb) -> Option<CodePtr> {
     let ocb = ocb.unwrap();
-    let code_ptr = ocb.get_write_ptr();
-    let mut asm = Assembler::new();
+    let mut asm = Assembler::new_without_iseq();
 
     // This chunk of code expects REG_EC to be filled properly and
     // RAX to contain the return value of the C method.
 
-    asm.comment("full cfunc return");
+    asm_comment!(asm, "full cfunc return");
     asm.ccall(
         rb_full_cfunc_return as *const u8,
         vec![EC, C_RET_OPND]
     );
 
     // Count the exit
-    gen_counter_incr(&mut asm, Counter::traced_cfunc_return);
+    gen_counter_incr_without_pc(&mut asm, Counter::traced_cfunc_return);
 
     // Return to the interpreter
     asm.cpop_into(SP);
@@ -589,26 +990,23 @@ fn gen_full_cfunc_return(ocb: &mut OutlinedCb) -> CodePtr {
 
     asm.cret(Qundef.into());
 
-    asm.compile(ocb, None);
-
-    return code_ptr;
+    asm.compile(ocb, None).map(|(code_ptr, _)| code_ptr)
 }
 
 /// Generate a continuation for leave that exits to the interpreter at REG_CFP->pc.
 /// This is used by gen_leave() and gen_entry_prologue()
-fn gen_leave_exit(ocb: &mut OutlinedCb) -> CodePtr {
+fn gen_leave_exit(ocb: &mut OutlinedCb) -> Option<CodePtr> {
     let ocb = ocb.unwrap();
-    let code_ptr = ocb.get_write_ptr();
-    let mut asm = Assembler::new();
+    let mut asm = Assembler::new_without_iseq();
 
     // gen_leave() fully reconstructs interpreter state and leaves the
     // return value in C_RET_OPND before coming here.
     let ret_opnd = asm.live_reg_opnd(C_RET_OPND);
 
     // Every exit to the interpreter should be counted
-    gen_counter_incr(&mut asm, Counter::leave_interp_return);
+    gen_counter_incr_without_pc(&mut asm, Counter::leave_interp_return);
 
-    asm.comment("exit from leave");
+    asm_comment!(asm, "exit from leave");
     asm.cpop_into(SP);
     asm.cpop_into(EC);
     asm.cpop_into(CFP);
@@ -617,29 +1015,31 @@ fn gen_leave_exit(ocb: &mut OutlinedCb) -> CodePtr {
 
     asm.cret(ret_opnd);
 
-    asm.compile(ocb, None);
-
-    return code_ptr;
+    asm.compile(ocb, None).map(|(code_ptr, _)| code_ptr)
 }
 
 // Increment SP and transfer the execution to the interpreter after jit_exec_exception().
 // On jit_exec_exception(), you need to return Qundef to keep executing caller non-FINISH
 // frames on the interpreter. You also need to increment SP to push the return value to
 // the caller's stack, which is different from gen_stub_exit().
-fn gen_leave_exception(ocb: &mut OutlinedCb) -> CodePtr {
+fn gen_leave_exception(ocb: &mut OutlinedCb) -> Option<CodePtr> {
     let ocb = ocb.unwrap();
-    let code_ptr = ocb.get_write_ptr();
-    let mut asm = Assembler::new();
+    let mut asm = Assembler::new_without_iseq();
+
+    // gen_leave() leaves the return value in C_RET_OPND before coming here.
+    let ruby_ret_val = asm.live_reg_opnd(C_RET_OPND);
 
     // Every exit to the interpreter should be counted
-    gen_counter_incr(&mut asm, Counter::leave_interp_return);
+    gen_counter_incr_without_pc(&mut asm, Counter::leave_interp_return);
 
-    asm.comment("increment SP of the caller");
-    let sp = Opnd::mem(64, CFP, RUBY_OFFSET_CFP_SP);
+    asm_comment!(asm, "push return value through cfp->sp");
+    let cfp_sp = Opnd::mem(64, CFP, RUBY_OFFSET_CFP_SP);
+    let sp = asm.load(cfp_sp);
+    asm.mov(Opnd::mem(64, sp, 0), ruby_ret_val);
     let new_sp = asm.add(sp, SIZEOF_VALUE.into());
-    asm.mov(sp, new_sp);
+    asm.mov(cfp_sp, new_sp);
 
-    asm.comment("exit from exception");
+    asm_comment!(asm, "exit from exception");
     asm.cpop_into(SP);
     asm.cpop_into(EC);
     asm.cpop_into(CFP);
@@ -649,9 +1049,7 @@ fn gen_leave_exception(ocb: &mut OutlinedCb) -> CodePtr {
     // Execute vm_exec_core
     asm.cret(Qundef.into());
 
-    asm.compile(ocb, None);
-
-    return code_ptr;
+    asm.compile(ocb, None).map(|(code_ptr, _)| code_ptr)
 }
 
 // Generate a runtime guard that ensures the PC is at the expected
@@ -663,17 +1061,16 @@ fn gen_leave_exception(ocb: &mut OutlinedCb) -> CodePtr {
 pub fn gen_entry_chain_guard(
     asm: &mut Assembler,
     ocb: &mut OutlinedCb,
-    iseq: IseqPtr,
-    insn_idx: u16,
+    blockid: BlockId,
 ) -> Option<PendingEntryRef> {
     let entry = new_pending_entry();
     let stub_addr = gen_entry_stub(entry.uninit_entry.as_ptr() as usize, ocb)?;
 
     let pc_opnd = Opnd::mem(64, CFP, RUBY_OFFSET_CFP_PC);
-    let expected_pc = unsafe { rb_iseq_pc_at_idx(iseq, insn_idx.into()) };
+    let expected_pc = unsafe { rb_iseq_pc_at_idx(blockid.iseq, blockid.idx.into()) };
     let expected_pc_opnd = Opnd::const_ptr(expected_pc as *const u8);
 
-    asm.comment("guard expected PC");
+    asm_comment!(asm, "guard expected PC");
     asm.cmp(pc_opnd, expected_pc_opnd);
 
     asm.mark_entry_start(&entry);
@@ -685,21 +1082,22 @@ pub fn gen_entry_chain_guard(
 /// Compile an interpreter entry block to be inserted into an iseq
 /// Returns None if compilation fails.
 /// If jit_exception is true, compile JIT code for handling exceptions.
-/// See [jit_compile_exception] for details.
+/// See jit_compile_exception() for details.
 pub fn gen_entry_prologue(
     cb: &mut CodeBlock,
     ocb: &mut OutlinedCb,
-    iseq: IseqPtr,
-    insn_idx: u16,
+    blockid: BlockId,
+    stack_size: u8,
     jit_exception: bool,
-) -> Option<CodePtr> {
+) -> Option<(CodePtr, RegMapping)> {
+    let iseq = blockid.iseq;
     let code_ptr = cb.get_write_ptr();
 
-    let mut asm = Assembler::new();
+    let mut asm = Assembler::new(unsafe { get_iseq_body_local_table_size(iseq) });
     if get_option_ref!(dump_disasm).is_some() {
-        asm.comment(&format!("YJIT entry point: {}", iseq_get_location(iseq, 0)));
+        asm_comment!(asm, "YJIT entry point: {}", iseq_get_location(iseq, 0));
     } else {
-        asm.comment("YJIT entry");
+        asm_comment!(asm, "YJIT entry");
     }
 
     asm.frame_setup();
@@ -726,8 +1124,8 @@ pub fn gen_entry_prologue(
             rb_yjit_set_exception_return as *mut u8,
             vec![
                 CFP,
-                Opnd::const_ptr(CodegenGlobals::get_leave_exit_code().raw_ptr()),
-                Opnd::const_ptr(CodegenGlobals::get_leave_exception_code().raw_ptr()),
+                Opnd::const_ptr(CodegenGlobals::get_leave_exit_code().raw_ptr(cb)),
+                Opnd::const_ptr(CodegenGlobals::get_leave_exception_code().raw_ptr(cb)),
             ],
         );
     } else {
@@ -735,7 +1133,7 @@ pub fn gen_entry_prologue(
         // on the entry frame. See [jit_compile] for details.
         asm.mov(
             Opnd::mem(64, CFP, RUBY_OFFSET_CFP_JIT_RETURN),
-            Opnd::const_ptr(CodegenGlobals::get_leave_exit_code().raw_ptr()),
+            Opnd::const_ptr(CodegenGlobals::get_leave_exit_code().raw_ptr(cb)),
         );
     }
 
@@ -747,12 +1145,13 @@ pub fn gen_entry_prologue(
     // If they don't match, then we'll jump to an entry stub and generate
     // another PC check and entry there.
     let pending_entry = if unsafe { get_iseq_flags_has_opt(iseq) } || jit_exception {
-        Some(gen_entry_chain_guard(&mut asm, ocb, iseq, insn_idx)?)
+        Some(gen_entry_chain_guard(&mut asm, ocb, blockid)?)
     } else {
         None
     };
+    let reg_mapping = gen_entry_reg_mapping(&mut asm, blockid, stack_size);
 
-    asm.compile(cb, Some(ocb));
+    asm.compile(cb, Some(ocb))?;
 
     if cb.has_dropped_bytes() {
         None
@@ -768,8 +1167,37 @@ pub fn gen_entry_prologue(
                 .ok().expect("PendingEntry should be unique");
             iseq_payload.entries.push(pending_entry.into_entry());
         }
-        Some(code_ptr)
+        Some((code_ptr, reg_mapping))
+    }
+}
+
+/// Generate code to load registers for a JIT entry. When the entry block is compiled for
+/// the first time, it loads no register. When it has been already compiled as a callee
+/// block, it loads some registers to reuse the block.
+pub fn gen_entry_reg_mapping(asm: &mut Assembler, blockid: BlockId, stack_size: u8) -> RegMapping {
+    // Find an existing callee block. If it's not found or uses no register, skip loading registers.
+    let mut ctx = Context::default();
+    ctx.set_stack_size(stack_size);
+    let reg_mapping = find_most_compatible_reg_mapping(blockid, &ctx).unwrap_or(RegMapping::default());
+    if reg_mapping == RegMapping::default() {
+        return reg_mapping;
+    }
+
+    // If found, load the same registers to reuse the block.
+    asm_comment!(asm, "reuse maps: {:?}", reg_mapping);
+    let local_table_size: u32 = unsafe { get_iseq_body_local_table_size(blockid.iseq) }.try_into().unwrap();
+    for &reg_opnd in reg_mapping.get_reg_opnds().iter() {
+        match reg_opnd {
+            RegOpnd::Local(local_idx) => {
+                let loaded_reg = TEMP_REGS[reg_mapping.get_reg(reg_opnd).unwrap()];
+                let loaded_temp = asm.local_opnd(local_table_size - local_idx as u32 + VM_ENV_DATA_SIZE - 1);
+                asm.load_into(Opnd::Reg(loaded_reg), loaded_temp);
+            }
+            RegOpnd::Stack(_) => unreachable!("find_most_compatible_reg_mapping should not leave {:?}", reg_opnd),
+        }
     }
+
+    reg_mapping
 }
 
 // Generate code to check for interrupts and take a side-exit.
@@ -780,7 +1208,7 @@ fn gen_check_ints(
 ) {
     // Check for interrupts
     // see RUBY_VM_CHECK_INTS(ec) macro
-    asm.comment("RUBY_VM_CHECK_INTS(ec)");
+    asm_comment!(asm, "RUBY_VM_CHECK_INTS(ec)");
 
     // Not checking interrupt_mask since it's zero outside finalize_deferred_heap_pages,
     // signal_exec, or rb_postponed_job_flush.
@@ -795,28 +1223,36 @@ fn gen_check_ints(
 fn jump_to_next_insn(
     jit: &mut JITState,
     asm: &mut Assembler,
-    ocb: &mut OutlinedCb,
-) {
-    // Reset the depth since in current usages we only ever jump to to
+) -> Option<CodegenStatus> {
+    end_block_with_jump(jit, asm, jit.next_insn_idx())
+}
+
+fn end_block_with_jump(
+    jit: &mut JITState,
+    asm: &mut Assembler,
+    continuation_insn_idx: u16,
+) -> Option<CodegenStatus> {
+    // Reset the depth since in current usages we only ever jump to
     // chain_depth > 0 from the same instruction.
-    let mut reset_depth = asm.ctx.clone();
-    reset_depth.reset_chain_depth();
+    let mut reset_depth = asm.ctx;
+    reset_depth.reset_chain_depth_and_defer();
 
     let jump_block = BlockId {
         iseq: jit.iseq,
-        idx: jit.next_insn_idx(),
+        idx: continuation_insn_idx,
     };
 
     // We are at the end of the current instruction. Record the boundary.
     if jit.record_boundary_patch_point {
-        let exit_pc = unsafe { jit.pc.offset(insn_len(jit.opcode).try_into().unwrap()) };
-        let exit_pos = gen_outlined_exit(exit_pc, &reset_depth, ocb);
-        record_global_inval_patch(asm, exit_pos);
         jit.record_boundary_patch_point = false;
+        let exit_pc = unsafe { rb_iseq_pc_at_idx(jit.iseq, continuation_insn_idx.into())};
+        let exit_pos = jit.gen_outlined_exit(exit_pc, &reset_depth);
+        record_global_inval_patch(asm, exit_pos?);
     }
 
     // Generate the jump instruction
     gen_direct_jump(jit, &reset_depth, jump_block, asm);
+    Some(EndBlock)
 }
 
 // Compile a sequence of bytecode instructions for a given basic block version.
@@ -829,6 +1265,7 @@ pub fn gen_single_block(
     ec: EcPtr,
     cb: &mut CodeBlock,
     ocb: &mut OutlinedCb,
+    first_block: bool,
 ) -> Result<BlockRef, ()> {
     // Limit the number of specialized versions for this block
     let ctx = limit_block_versions(blockid, start_ctx);
@@ -852,19 +1289,36 @@ pub fn gen_single_block(
     let mut insn_idx: IseqIdx = blockid.idx;
 
     // Initialize a JIT state object
-    let mut jit = JITState::new(blockid, ctx.clone(), cb.get_write_ptr(), ec);
+    let mut jit = JITState::new(blockid, ctx, cb.get_write_ptr(), ec, ocb, first_block);
     jit.iseq = blockid.iseq;
 
     // Create a backend assembler instance
-    let mut asm = Assembler::new();
+    let mut asm = Assembler::new(jit.num_locals());
     asm.ctx = ctx;
 
     #[cfg(feature = "disasm")]
     if get_option_ref!(dump_disasm).is_some() {
         let blockid_idx = blockid.idx;
         let chain_depth = if asm.ctx.get_chain_depth() > 0 { format!("(chain_depth: {})", asm.ctx.get_chain_depth()) } else { "".to_string() };
-        asm.comment(&format!("Block: {} {}", iseq_get_location(blockid.iseq, blockid_idx), chain_depth));
-        asm.comment(&format!("reg_temps: {:08b}", asm.ctx.get_reg_temps().as_u8()));
+        asm_comment!(asm, "Block: {} {}", iseq_get_location(blockid.iseq, blockid_idx), chain_depth);
+        asm_comment!(asm, "reg_mapping: {:?}", asm.ctx.get_reg_mapping());
+    }
+
+    Log::add_block_with_chain_depth(blockid, asm.ctx.get_chain_depth());
+
+    // Mark the start of an ISEQ for --yjit-perf
+    jit_perf_symbol_push!(jit, &mut asm, &get_iseq_name(iseq), PerfMap::ISEQ);
+
+    if asm.ctx.is_return_landing() {
+        // Continuation of the end of gen_leave().
+        // Reload REG_SP for the current frame and transfer the return value
+        // to the stack top.
+        asm.mov(SP, Opnd::mem(64, CFP, RUBY_OFFSET_CFP_SP));
+
+        let top = asm.stack_push(Type::Unknown);
+        asm.mov(top, C_RET_OPND);
+
+        asm.ctx.clear_return_landing();
     }
 
     // For each instruction to compile
@@ -881,7 +1335,7 @@ pub fn gen_single_block(
         // if we run into it. This is necessary because we want to invalidate based on the
         // instruction's index.
         if opcode == YARVINSN_opt_getconstant_path.as_usize() && insn_idx > jit.starting_insn_idx {
-            jump_to_next_insn(&mut jit, &mut asm, ocb);
+            jump_to_next_insn(&mut jit, &mut asm);
             break;
         }
 
@@ -894,33 +1348,33 @@ pub fn gen_single_block(
 
         // stack_pop doesn't immediately deallocate a register for stack temps,
         // but it's safe to do so at this instruction boundary.
-        for stack_idx in asm.ctx.get_stack_size()..MAX_REG_TEMPS {
-            asm.ctx.dealloc_temp_reg(stack_idx);
+        for stack_idx in asm.ctx.get_stack_size()..MAX_CTX_TEMPS as u8 {
+            asm.ctx.dealloc_reg(RegOpnd::Stack(stack_idx));
         }
 
         // If previous instruction requested to record the boundary
         if jit.record_boundary_patch_point {
             // Generate an exit to this instruction and record it
-            let exit_pos = gen_outlined_exit(jit.pc, &asm.ctx, ocb);
+            let exit_pos = jit.gen_outlined_exit(jit.pc, &asm.ctx).ok_or(())?;
             record_global_inval_patch(&mut asm, exit_pos);
             jit.record_boundary_patch_point = false;
         }
 
         // In debug mode, verify our existing assumption
-        if cfg!(debug_assertions) && get_option!(verify_ctx) && jit.at_current_insn() {
+        if cfg!(debug_assertions) && get_option!(verify_ctx) && jit.at_compile_target() {
             verify_ctx(&jit, &asm.ctx);
         }
 
         // :count-placement:
         // Count bytecode instructions that execute in generated code.
         // Note that the increment happens even when the output takes side exit.
-        gen_counter_incr(&mut asm, Counter::yjit_insns_count);
+        gen_counter_incr(&jit, &mut asm, Counter::yjit_insns_count);
 
         // Lookup the codegen function for this instruction
         let mut status = None;
         if let Some(gen_fn) = get_gen_fn(VALUE(opcode)) {
             // Add a comment for the name of the YARV instruction
-            asm.comment(&format!("Insn: {:04} {} (stack_size: {})", insn_idx, insn_name(opcode), asm.ctx.get_stack_size()));
+            asm_comment!(asm, "Insn: {:04} {} (stack_size: {})", insn_idx, insn_name(opcode), asm.ctx.get_stack_size());
 
             // If requested, dump instructions for debugging
             if get_option!(dump_insns) {
@@ -929,7 +1383,12 @@ pub fn gen_single_block(
             }
 
             // Call the code generation function
-            status = gen_fn(&mut jit, &mut asm, ocb);
+            jit_perf_symbol_push!(jit, &mut asm, &insn_name(opcode), PerfMap::Codegen);
+            status = gen_fn(&mut jit, &mut asm);
+            jit_perf_symbol_pop!(jit, &mut asm, PerfMap::Codegen);
+
+            #[cfg(debug_assertions)]
+            assert!(!asm.get_leaf_ccall(), "ccall() wasn't used after leaf_ccall was set in {}", insn_name(opcode));
         }
 
         // If we can't compile this instruction
@@ -955,7 +1414,7 @@ pub fn gen_single_block(
 
         // For now, reset the chain depth after each instruction as only the
         // first instruction in the block can concern itself with the depth.
-        asm.ctx.reset_chain_depth();
+        asm.ctx.reset_chain_depth_and_defer();
 
         // Move to the next instruction to compile
         insn_idx += insn_len(opcode) as u16;
@@ -971,17 +1430,31 @@ pub fn gen_single_block(
     // doesn't go to the next instruction in the same iseq.
     assert!(!jit.record_boundary_patch_point);
 
+    // Bail when requested to.
+    if jit.block_abandoned {
+        incr_counter!(abandoned_block_count);
+        return Err(());
+    }
+
     // Pad the block if it has the potential to be invalidated
     if jit.block_entry_exit.is_some() {
         asm.pad_inval_patch();
     }
 
+    // Mark the end of an ISEQ for --yjit-perf
+    jit_perf_symbol_pop!(jit, &mut asm, PerfMap::ISEQ);
+
     // Compile code into the code block
-    let gc_offsets = asm.compile(cb, Some(ocb));
+    let (_, gc_offsets) = asm.compile(cb, Some(jit.get_ocb())).ok_or(())?;
     let end_addr = cb.get_write_ptr();
 
+    // Flush perf symbols after asm.compile() writes addresses
+    if get_option!(perf_map).is_some() {
+        jit.flush_perf_symbols(cb);
+    }
+
     // If code for the block doesn't fit, fail
-    if cb.has_dropped_bytes() || ocb.unwrap().has_dropped_bytes() {
+    if cb.has_dropped_bytes() || jit.get_ocb().unwrap().has_dropped_bytes() {
         return Err(());
     }
 
@@ -992,7 +1465,6 @@ pub fn gen_single_block(
 fn gen_nop(
     _jit: &mut JITState,
     _asm: &mut Assembler,
-    _ocb: &mut OutlinedCb,
 ) -> Option<CodegenStatus> {
     // Do nothing
     Some(KeepCompiling)
@@ -1001,7 +1473,6 @@ fn gen_nop(
 fn gen_pop(
     _jit: &mut JITState,
     asm: &mut Assembler,
-    _ocb: &mut OutlinedCb,
 ) -> Option<CodegenStatus> {
     // Decrement SP
     asm.stack_pop(1);
@@ -1011,7 +1482,6 @@ fn gen_pop(
 fn gen_dup(
     _jit: &mut JITState,
     asm: &mut Assembler,
-    _ocb: &mut OutlinedCb,
 ) -> Option<CodegenStatus> {
     let dup_val = asm.stack_opnd(0);
     let mapping = asm.ctx.get_opnd_mapping(dup_val.into());
@@ -1026,7 +1496,6 @@ fn gen_dup(
 fn gen_dupn(
     jit: &mut JITState,
     asm: &mut Assembler,
-    _ocb: &mut OutlinedCb,
 ) -> Option<CodegenStatus> {
     let n = jit.get_arg(0).as_usize();
 
@@ -1050,11 +1519,22 @@ fn gen_dupn(
     Some(KeepCompiling)
 }
 
+// Reverse top X stack entries
+fn gen_opt_reverse(
+    jit: &mut JITState,
+    asm: &mut Assembler,
+) -> Option<CodegenStatus> {
+    let count = jit.get_arg(0).as_i32();
+    for n in 0..(count/2) {
+        stack_swap(asm, n, count - 1 - n);
+    }
+    Some(KeepCompiling)
+}
+
 // Swap top 2 stack entries
 fn gen_swap(
     _jit: &mut JITState,
     asm: &mut Assembler,
-    _ocb: &mut OutlinedCb,
 ) -> Option<CodegenStatus> {
     stack_swap(asm, 0, 1);
     Some(KeepCompiling)
@@ -1062,11 +1542,11 @@ fn gen_swap(
 
 fn stack_swap(
     asm: &mut Assembler,
-    offset0: u16,
-    offset1: u16,
+    offset0: i32,
+    offset1: i32,
 ) {
-    let stack0_mem = asm.stack_opnd(offset0 as i32);
-    let stack1_mem = asm.stack_opnd(offset1 as i32);
+    let stack0_mem = asm.stack_opnd(offset0);
+    let stack1_mem = asm.stack_opnd(offset1);
 
     let mapping0 = asm.ctx.get_opnd_mapping(stack0_mem.into());
     let mapping1 = asm.ctx.get_opnd_mapping(stack1_mem.into());
@@ -1083,7 +1563,6 @@ fn stack_swap(
 fn gen_putnil(
     _jit: &mut JITState,
     asm: &mut Assembler,
-    _ocb: &mut OutlinedCb,
 ) -> Option<CodegenStatus> {
     jit_putobject(asm, Qnil);
     Some(KeepCompiling)
@@ -1098,7 +1577,6 @@ fn jit_putobject(asm: &mut Assembler, arg: VALUE) {
 fn gen_putobject_int2fix(
     jit: &mut JITState,
     asm: &mut Assembler,
-    _ocb: &mut OutlinedCb,
 ) -> Option<CodegenStatus> {
     let opcode = jit.opcode;
     let cst_val: usize = if opcode == YARVINSN_putobject_INT2FIX_0_.as_usize() {
@@ -1106,26 +1584,85 @@ fn gen_putobject_int2fix(
     } else {
         1
     };
+    let cst_val = VALUE::fixnum_from_usize(cst_val);
+
+    if let Some(result) = fuse_putobject_opt_ltlt(jit, asm, cst_val) {
+        return Some(result);
+    }
 
-    jit_putobject(asm, VALUE::fixnum_from_usize(cst_val));
+    jit_putobject(asm, cst_val);
     Some(KeepCompiling)
 }
 
 fn gen_putobject(
     jit: &mut JITState,
     asm: &mut Assembler,
-    _ocb: &mut OutlinedCb,
 ) -> Option<CodegenStatus> {
     let arg: VALUE = jit.get_arg(0);
 
+    if let Some(result) = fuse_putobject_opt_ltlt(jit, asm, arg) {
+        return Some(result);
+    }
+
     jit_putobject(asm, arg);
     Some(KeepCompiling)
 }
 
+/// Combine `putobject` and `opt_ltlt` together if profitable, for example when
+/// left shifting an integer by a constant amount.
+fn fuse_putobject_opt_ltlt(
+    jit: &mut JITState,
+    asm: &mut Assembler,
+    constant_object: VALUE,
+) -> Option<CodegenStatus> {
+    let next_opcode = unsafe { rb_vm_insn_addr2opcode(jit.pc.add(insn_len(jit.opcode).as_usize()).read().as_ptr()) };
+    if next_opcode == YARVINSN_opt_ltlt as i32 && constant_object.fixnum_p() {
+        // Untag the fixnum shift amount
+        let shift_amt = constant_object.as_isize() >> 1;
+        if shift_amt > 63 || shift_amt < 0 {
+            return None;
+        }
+        if !jit.at_compile_target() {
+            return jit.defer_compilation(asm);
+        }
+
+        let lhs = jit.peek_at_stack(&asm.ctx, 0);
+        if !lhs.fixnum_p() {
+            return None;
+        }
+
+        if !assume_bop_not_redefined(jit, asm, INTEGER_REDEFINED_OP_FLAG, BOP_LTLT) {
+            return None;
+        }
+
+        asm_comment!(asm, "integer left shift with rhs={shift_amt}");
+        let lhs = asm.stack_opnd(0);
+
+        // Guard that lhs is a fixnum if necessary
+        let lhs_type = asm.ctx.get_opnd_type(lhs.into());
+        if lhs_type != Type::Fixnum {
+            asm_comment!(asm, "guard arg0 fixnum");
+            asm.test(lhs, Opnd::UImm(RUBY_FIXNUM_FLAG as u64));
+
+            jit_chain_guard(
+                JCC_JZ,
+                jit,
+                asm,
+                SEND_MAX_DEPTH,
+                Counter::guard_send_not_fixnums,
+            );
+        }
+
+        asm.stack_pop(1);
+        fixnum_left_shift_body(asm, lhs, shift_amt as u64);
+        return end_block_with_jump(jit, asm, jit.next_next_insn_idx());
+    }
+    return None;
+}
+
 fn gen_putself(
     _jit: &mut JITState,
     asm: &mut Assembler,
-    _ocb: &mut OutlinedCb,
 ) -> Option<CodegenStatus> {
 
     // Write it on the stack
@@ -1141,7 +1678,6 @@ fn gen_putself(
 fn gen_putspecialobject(
     jit: &mut JITState,
     asm: &mut Assembler,
-    _ocb: &mut OutlinedCb,
 ) -> Option<CodegenStatus> {
     let object_type = jit.get_arg(0).as_usize();
 
@@ -1161,7 +1697,6 @@ fn gen_putspecialobject(
 fn gen_setn(
     jit: &mut JITState,
     asm: &mut Assembler,
-    _ocb: &mut OutlinedCb,
 ) -> Option<CodegenStatus> {
     let n = jit.get_arg(0).as_usize();
 
@@ -1182,7 +1717,6 @@ fn gen_setn(
 fn gen_topn(
     jit: &mut JITState,
     asm: &mut Assembler,
-    _ocb: &mut OutlinedCb,
 ) -> Option<CodegenStatus> {
     let n = jit.get_arg(0).as_usize();
 
@@ -1198,7 +1732,6 @@ fn gen_topn(
 fn gen_adjuststack(
     jit: &mut JITState,
     asm: &mut Assembler,
-    _ocb: &mut OutlinedCb,
 ) -> Option<CodegenStatus> {
     let n = jit.get_arg(0).as_usize();
     asm.stack_pop(n);
@@ -1208,23 +1741,21 @@ fn gen_adjuststack(
 fn gen_opt_plus(
     jit: &mut JITState,
     asm: &mut Assembler,
-    ocb: &mut OutlinedCb,
 ) -> Option<CodegenStatus> {
     let two_fixnums = match asm.ctx.two_fixnums_on_stack(jit) {
         Some(two_fixnums) => two_fixnums,
         None => {
-            defer_compilation(jit, asm, ocb);
-            return Some(EndBlock);
+            return jit.defer_compilation(asm);
         }
     };
 
     if two_fixnums {
-        if !assume_bop_not_redefined(jit, asm, ocb, INTEGER_REDEFINED_OP_FLAG, BOP_PLUS) {
+        if !assume_bop_not_redefined(jit, asm, INTEGER_REDEFINED_OP_FLAG, BOP_PLUS) {
             return None;
         }
 
         // Check that both operands are fixnums
-        guard_two_fixnums(jit, asm, ocb);
+        guard_two_fixnums(jit, asm);
 
         // Get the operands from the stack
         let arg1 = asm.stack_pop(1);
@@ -1241,7 +1772,7 @@ fn gen_opt_plus(
 
         Some(KeepCompiling)
     } else {
-        gen_opt_send_without_block(jit, asm, ocb)
+        gen_opt_send_without_block(jit, asm)
     }
 }
 
@@ -1249,20 +1780,18 @@ fn gen_opt_plus(
 fn gen_newarray(
     jit: &mut JITState,
     asm: &mut Assembler,
-    _ocb: &mut OutlinedCb,
 ) -> Option<CodegenStatus> {
     let n = jit.get_arg(0).as_u32();
 
     // Save the PC and SP because we are allocating
-    jit_prepare_routine_call(jit, asm);
+    jit_prepare_call_with_gc(jit, asm);
 
     // If n is 0, then elts is never going to be read, so we can just pass null
     let values_ptr = if n == 0 {
         Opnd::UImm(0)
     } else {
-        asm.comment("load pointer to array elements");
-        let offset_magnitude = (SIZEOF_VALUE as u32) * n;
-        let values_opnd = asm.ctx.sp_opnd(-(offset_magnitude as isize));
+        asm_comment!(asm, "load pointer to array elements");
+        let values_opnd = asm.ctx.sp_opnd(-(n as i32));
         asm.lea(values_opnd)
     };
 
@@ -1277,7 +1806,7 @@ fn gen_newarray(
     );
 
     asm.stack_pop(n.as_usize());
-    let stack_ret = asm.stack_push(Type::TArray);
+    let stack_ret = asm.stack_push(Type::CArray);
     asm.mov(stack_ret, new_ary);
 
     Some(KeepCompiling)
@@ -1287,12 +1816,11 @@ fn gen_newarray(
 fn gen_duparray(
     jit: &mut JITState,
     asm: &mut Assembler,
-    _ocb: &mut OutlinedCb,
 ) -> Option<CodegenStatus> {
     let ary = jit.get_arg(0);
 
     // Save the PC and SP because we are allocating
-    jit_prepare_routine_call(jit, asm);
+    jit_prepare_call_with_gc(jit, asm);
 
     // call rb_ary_resurrect(VALUE ary);
     let new_ary = asm.ccall(
@@ -1300,7 +1828,7 @@ fn gen_duparray(
         vec![ary.into()],
     );
 
-    let stack_ret = asm.stack_push(Type::TArray);
+    let stack_ret = asm.stack_push(Type::CArray);
     asm.mov(stack_ret, new_ary);
 
     Some(KeepCompiling)
@@ -1310,17 +1838,16 @@ fn gen_duparray(
 fn gen_duphash(
     jit: &mut JITState,
     asm: &mut Assembler,
-    _ocb: &mut OutlinedCb,
 ) -> Option<CodegenStatus> {
     let hash = jit.get_arg(0);
 
     // Save the PC and SP because we are allocating
-    jit_prepare_routine_call(jit, asm);
+    jit_prepare_call_with_gc(jit, asm);
 
     // call rb_hash_resurrect(VALUE hash);
     let hash = asm.ccall(rb_hash_resurrect as *const u8, vec![hash.into()]);
 
-    let stack_ret = asm.stack_push(Type::Hash);
+    let stack_ret = asm.stack_push(Type::CHash);
     asm.mov(stack_ret, hash);
 
     Some(KeepCompiling)
@@ -1330,19 +1857,19 @@ fn gen_duphash(
 fn gen_splatarray(
     jit: &mut JITState,
     asm: &mut Assembler,
-    _ocb: &mut OutlinedCb,
 ) -> Option<CodegenStatus> {
     let flag = jit.get_arg(0).as_usize();
 
-    // Save the PC and SP because the callee may allocate
+    // Save the PC and SP because the callee may call #to_a
     // Note that this modifies REG_SP, which is why we do it first
-    jit_prepare_routine_call(jit, asm);
+    jit_prepare_non_leaf_call(jit, asm);
 
     // Get the operands from the stack
-    let ary_opnd = asm.stack_pop(1);
+    let ary_opnd = asm.stack_opnd(0);
 
     // Call rb_vm_splat_array(flag, ary)
     let ary = asm.ccall(rb_vm_splat_array as *const u8, vec![flag.into(), ary_opnd]);
+    asm.stack_pop(1); // Keep it on stack during ccall for GC
 
     let stack_ret = asm.stack_push(Type::TArray);
     asm.mov(stack_ret, ary);
@@ -1350,22 +1877,84 @@ fn gen_splatarray(
     Some(KeepCompiling)
 }
 
+// call to_hash on hash to keyword splat before converting block
+// e.g. foo(**object, &block)
+fn gen_splatkw(
+    jit: &mut JITState,
+    asm: &mut Assembler,
+) -> Option<CodegenStatus> {
+    // Defer compilation so we can specialize on a runtime hash operand
+    if !jit.at_compile_target() {
+        return jit.defer_compilation(asm);
+    }
+
+    let comptime_hash = jit.peek_at_stack(&asm.ctx, 1);
+    if comptime_hash.hash_p() {
+        // If a compile-time hash operand is T_HASH, just guard that it's T_HASH.
+        let hash_opnd = asm.stack_opnd(1);
+        guard_object_is_hash(asm, hash_opnd, hash_opnd.into(), Counter::splatkw_not_hash);
+    } else if comptime_hash.nil_p() {
+        // Speculate we'll see nil if compile-time hash operand is nil
+        let hash_opnd = asm.stack_opnd(1);
+        let hash_opnd_type = asm.ctx.get_opnd_type(hash_opnd.into());
+
+        if hash_opnd_type != Type::Nil {
+            asm.cmp(hash_opnd, Qnil.into());
+            asm.jne(Target::side_exit(Counter::splatkw_not_nil));
+
+            if Type::Nil.diff(hash_opnd_type) != TypeDiff::Incompatible {
+                asm.ctx.upgrade_opnd_type(hash_opnd.into(), Type::Nil);
+            }
+        }
+    } else {
+        // Otherwise, call #to_hash on the operand if it's not nil.
+
+        // Save the PC and SP because the callee may call #to_hash
+        jit_prepare_non_leaf_call(jit, asm);
+
+        // Get the operands from the stack
+        let block_opnd = asm.stack_opnd(0);
+        let block_type = asm.ctx.get_opnd_type(block_opnd.into());
+        let hash_opnd = asm.stack_opnd(1);
+
+        c_callable! {
+            fn to_hash_if_not_nil(mut obj: VALUE) -> VALUE {
+                if obj != Qnil {
+                    obj = unsafe { rb_to_hash_type(obj) };
+                }
+                obj
+            }
+        }
+
+        let hash = asm.ccall(to_hash_if_not_nil as _, vec![hash_opnd]);
+        asm.stack_pop(2); // Keep it on stack during ccall for GC
+
+        let stack_ret = asm.stack_push(Type::Unknown);
+        asm.mov(stack_ret, hash);
+        asm.stack_push(block_type);
+        // Leave block_opnd spilled by ccall as is
+        asm.ctx.dealloc_reg(RegOpnd::Stack(asm.ctx.get_stack_size() - 1));
+    }
+
+    Some(KeepCompiling)
+}
+
 // concat two arrays
 fn gen_concatarray(
     jit: &mut JITState,
     asm: &mut Assembler,
-    _ocb: &mut OutlinedCb,
 ) -> Option<CodegenStatus> {
-    // Save the PC and SP because the callee may allocate
+    // Save the PC and SP because the callee may call #to_a
     // Note that this modifies REG_SP, which is why we do it first
-    jit_prepare_routine_call(jit, asm);
+    jit_prepare_non_leaf_call(jit, asm);
 
     // Get the operands from the stack
-    let ary2st_opnd = asm.stack_pop(1);
-    let ary1_opnd = asm.stack_pop(1);
+    let ary2st_opnd = asm.stack_opnd(0);
+    let ary1_opnd = asm.stack_opnd(1);
 
     // Call rb_vm_concat_array(ary1, ary2st)
     let ary = asm.ccall(rb_vm_concat_array as *const u8, vec![ary1_opnd, ary2st_opnd]);
+    asm.stack_pop(2); // Keep them on stack during ccall for GC
 
     let stack_ret = asm.stack_push(Type::TArray);
     asm.mov(stack_ret, ary);
@@ -1373,16 +1962,61 @@ fn gen_concatarray(
     Some(KeepCompiling)
 }
 
-// new range initialized from top 2 values
-fn gen_newrange(
+// concat second array to first array.
+// first argument must already be an array.
+// attempts to convert second object to array using to_a.
+fn gen_concattoarray(
     jit: &mut JITState,
     asm: &mut Assembler,
-    _ocb: &mut OutlinedCb,
 ) -> Option<CodegenStatus> {
-    let flag = jit.get_arg(0).as_usize();
+    // Save the PC and SP because the callee may call #to_a
+    jit_prepare_non_leaf_call(jit, asm);
 
-    // rb_range_new() allocates and can raise
-    jit_prepare_routine_call(jit, asm);
+    // Get the operands from the stack
+    let ary2_opnd = asm.stack_opnd(0);
+    let ary1_opnd = asm.stack_opnd(1);
+
+    let ary = asm.ccall(rb_vm_concat_to_array as *const u8, vec![ary1_opnd, ary2_opnd]);
+    asm.stack_pop(2); // Keep them on stack during ccall for GC
+
+    let stack_ret = asm.stack_push(Type::TArray);
+    asm.mov(stack_ret, ary);
+
+    Some(KeepCompiling)
+}
+
+// push given number of objects to array directly before.
+fn gen_pushtoarray(
+    jit: &mut JITState,
+    asm: &mut Assembler,
+) -> Option<CodegenStatus> {
+    let num = jit.get_arg(0).as_u64();
+
+    // Save the PC and SP because the callee may allocate
+    jit_prepare_call_with_gc(jit, asm);
+
+    // Get the operands from the stack
+    let ary_opnd = asm.stack_opnd(num as i32);
+    let objp_opnd = asm.lea(asm.ctx.sp_opnd(-(num as i32)));
+
+    let ary = asm.ccall(rb_ary_cat as *const u8, vec![ary_opnd, objp_opnd, num.into()]);
+    asm.stack_pop(num as usize + 1); // Keep it on stack during ccall for GC
+
+    let stack_ret = asm.stack_push(Type::TArray);
+    asm.mov(stack_ret, ary);
+
+    Some(KeepCompiling)
+}
+
+// new range initialized from top 2 values
+fn gen_newrange(
+    jit: &mut JITState,
+    asm: &mut Assembler,
+) -> Option<CodegenStatus> {
+    let flag = jit.get_arg(0).as_usize();
+
+    // rb_range_new() allocates and can raise
+    jit_prepare_non_leaf_call(jit, asm);
 
     // val = rb_range_new(low, high, (int)flag);
     let range_opnd = asm.ccall(
@@ -1412,7 +2046,7 @@ fn guard_object_is_heap(
         return;
     }
 
-    asm.comment("guard object is heap");
+    asm_comment!(asm, "guard object is heap");
 
     // Test that the object is not an immediate
     asm.test(object, (RUBY_IMMEDIATE_MASK as u64).into());
@@ -1444,7 +2078,7 @@ fn guard_object_is_array(
     };
     guard_object_is_heap(asm, object_reg, object_opnd, counter);
 
-    asm.comment("guard object is array");
+    asm_comment!(asm, "guard object is array");
 
     // Pull out the type mask
     let flags_opnd = Opnd::mem(VALUE_BITS, object_reg, RUBY_OFFSET_RBASIC_FLAGS);
@@ -1454,11 +2088,83 @@ fn guard_object_is_array(
     asm.cmp(flags_opnd, (RUBY_T_ARRAY as u64).into());
     asm.jne(Target::side_exit(counter));
 
-    if Type::UnknownHeap.diff(object_type) != TypeDiff::Incompatible {
+    if Type::TArray.diff(object_type) != TypeDiff::Incompatible {
         asm.ctx.upgrade_opnd_type(object_opnd, Type::TArray);
     }
 }
 
+fn guard_object_is_hash(
+    asm: &mut Assembler,
+    object: Opnd,
+    object_opnd: YARVOpnd,
+    counter: Counter,
+) {
+    let object_type = asm.ctx.get_opnd_type(object_opnd);
+    if object_type.is_hash() {
+        return;
+    }
+
+    let object_reg = match object {
+        Opnd::InsnOut { .. } => object,
+        _ => asm.load(object),
+    };
+    guard_object_is_heap(asm, object_reg, object_opnd, counter);
+
+    asm_comment!(asm, "guard object is hash");
+
+    // Pull out the type mask
+    let flags_opnd = Opnd::mem(VALUE_BITS, object_reg, RUBY_OFFSET_RBASIC_FLAGS);
+    let flags_opnd = asm.and(flags_opnd, (RUBY_T_MASK as u64).into());
+
+    // Compare the result with T_HASH
+    asm.cmp(flags_opnd, (RUBY_T_HASH as u64).into());
+    asm.jne(Target::side_exit(counter));
+
+    if Type::THash.diff(object_type) != TypeDiff::Incompatible {
+        asm.ctx.upgrade_opnd_type(object_opnd, Type::THash);
+    }
+}
+
+fn guard_object_is_fixnum(
+    jit: &mut JITState,
+    asm: &mut Assembler,
+    object: Opnd,
+    object_opnd: YARVOpnd
+) {
+    let object_type = asm.ctx.get_opnd_type(object_opnd);
+    if object_type.is_heap() {
+        asm_comment!(asm, "arg is heap object");
+        asm.jmp(Target::side_exit(Counter::guard_send_not_fixnum));
+        return;
+    }
+
+    if object_type != Type::Fixnum && object_type.is_specific() {
+        asm_comment!(asm, "arg is not fixnum");
+        asm.jmp(Target::side_exit(Counter::guard_send_not_fixnum));
+        return;
+    }
+
+    assert!(!object_type.is_heap());
+    assert!(object_type == Type::Fixnum || object_type.is_unknown());
+
+    // If not fixnums at run-time, fall back
+    if object_type != Type::Fixnum {
+        asm_comment!(asm, "guard object fixnum");
+        asm.test(object, Opnd::UImm(RUBY_FIXNUM_FLAG as u64));
+
+        jit_chain_guard(
+            JCC_JZ,
+            jit,
+            asm,
+            SEND_MAX_DEPTH,
+            Counter::guard_send_not_fixnum,
+        );
+    }
+
+    // Set the stack type in the context.
+    asm.ctx.upgrade_opnd_type(object.into(), Type::Fixnum);
+}
+
 fn guard_object_is_string(
     asm: &mut Assembler,
     object: Opnd,
@@ -1476,7 +2182,7 @@ fn guard_object_is_string(
     };
     guard_object_is_heap(asm, object_reg, object_opnd, counter);
 
-    asm.comment("guard object is string");
+    asm_comment!(asm, "guard object is string");
 
     // Pull out the type mask
     let flags_reg = asm.load(Opnd::mem(VALUE_BITS, object_reg, RUBY_OFFSET_RBASIC_FLAGS));
@@ -1486,7 +2192,7 @@ fn guard_object_is_string(
     asm.cmp(flags_reg, Opnd::UImm(RUBY_T_STRING as u64));
     asm.jne(Target::side_exit(counter));
 
-    if Type::UnknownHeap.diff(object_type) != TypeDiff::Incompatible {
+    if Type::TString.diff(object_type) != TypeDiff::Incompatible {
         asm.ctx.upgrade_opnd_type(object_opnd, Type::TString);
     }
 }
@@ -1500,7 +2206,7 @@ fn guard_object_is_not_ruby2_keyword_hash(
     object_opnd: Opnd,
     counter: Counter,
 ) {
-    asm.comment("guard object is not ruby2 keyword hash");
+    asm_comment!(asm, "guard object is not ruby2 keyword hash");
 
     let not_ruby2_keyword = asm.new_label("not_ruby2_keyword");
     asm.test(object_opnd, (RUBY_IMMEDIATE_MASK as u64).into());
@@ -1531,7 +2237,6 @@ fn guard_object_is_not_ruby2_keyword_hash(
 fn gen_expandarray(
     jit: &mut JITState,
     asm: &mut Assembler,
-    ocb: &mut OutlinedCb,
 ) -> Option<CodegenStatus> {
     // Both arguments are rb_num_t which is unsigned
     let num = jit.get_arg(0).as_u32();
@@ -1539,42 +2244,70 @@ fn gen_expandarray(
 
     // If this instruction has the splat flag, then bail out.
     if flag & 0x01 != 0 {
-        gen_counter_incr(asm, Counter::expandarray_splat);
+        gen_counter_incr(jit, asm, Counter::expandarray_splat);
         return None;
     }
 
     // If this instruction has the postarg flag, then bail out.
     if flag & 0x02 != 0 {
-        gen_counter_incr(asm, Counter::expandarray_postarg);
+        gen_counter_incr(jit, asm, Counter::expandarray_postarg);
         return None;
     }
 
     let array_opnd = asm.stack_opnd(0);
 
-    // If the array operand is nil, just push on nils
-    if asm.ctx.get_opnd_type(array_opnd.into()) == Type::Nil {
-        asm.stack_pop(1); // pop after using the type info
-        // special case for a, b = nil pattern
-        // push N nils onto the stack
-        for _ in 0..num {
-            let push_opnd = asm.stack_push(Type::Nil);
-            asm.mov(push_opnd, Qnil.into());
-        }
-        return Some(KeepCompiling);
-    }
-
     // Defer compilation so we can specialize on a runtime `self`
-    if !jit.at_current_insn() {
-        defer_compilation(jit, asm, ocb);
-        return Some(EndBlock);
+    if !jit.at_compile_target() {
+        return jit.defer_compilation(asm);
     }
 
     let comptime_recv = jit.peek_at_stack(&asm.ctx, 0);
 
-    // If the comptime receiver is not an array, bail
-    if comptime_recv.class_of() != unsafe { rb_cArray } {
-        gen_counter_incr(asm, Counter::expandarray_comptime_not_array);
-        return None;
+    // If the comptime receiver is not an array
+    if !unsafe { RB_TYPE_P(comptime_recv, RUBY_T_ARRAY) } {
+        // at compile time, ensure to_ary is not defined
+        let target_cme = unsafe { rb_callable_method_entry_or_negative(comptime_recv.class_of(), ID!(to_ary)) };
+        let cme_def_type = unsafe { get_cme_def_type(target_cme) };
+
+        // if to_ary is defined, return can't compile so to_ary can be called
+        if cme_def_type != VM_METHOD_TYPE_UNDEF {
+            gen_counter_incr(jit, asm, Counter::expandarray_to_ary);
+            return None;
+        }
+
+        // invalidate compile block if to_ary is later defined
+        jit.assume_method_lookup_stable(asm, target_cme);
+
+        jit_guard_known_klass(
+            jit,
+            asm,
+            comptime_recv.class_of(),
+            array_opnd,
+            array_opnd.into(),
+            comptime_recv,
+            SEND_MAX_DEPTH,
+            Counter::expandarray_not_array,
+        );
+
+        let opnd = asm.stack_pop(1); // pop after using the type info
+
+        // If we don't actually want any values, then just keep going
+        if num == 0 {
+            return Some(KeepCompiling);
+        }
+
+        // load opnd to avoid a race because we are also pushing onto the stack
+        let opnd = asm.load(opnd);
+
+        for _ in 1..num {
+            let push_opnd = asm.stack_push(Type::Nil);
+            asm.mov(push_opnd, Qnil.into());
+        }
+
+        let push_opnd = asm.stack_push(Type::Unknown);
+        asm.mov(push_opnd, opnd);
+
+        return Some(KeepCompiling);
     }
 
     // Get the compile-time array length
@@ -1600,25 +2333,23 @@ fn gen_expandarray(
 
     // Guard on the comptime/expected array length
     if comptime_len >= num {
-        asm.comment(&format!("guard array length >= {}", num));
+        asm_comment!(asm, "guard array length >= {}", num);
         asm.cmp(array_len_opnd, num.into());
         jit_chain_guard(
             JCC_JB,
             jit,
             asm,
-            ocb,
             EXPANDARRAY_MAX_CHAIN_DEPTH,
             Counter::expandarray_chain_max_depth,
         );
 
     } else {
-        asm.comment(&format!("guard array length == {}", comptime_len));
+        asm_comment!(asm, "guard array length == {}", comptime_len);
         asm.cmp(array_len_opnd, comptime_len.into());
         jit_chain_guard(
             JCC_JNE,
             jit,
             asm,
-            ocb,
             EXPANDARRAY_MAX_CHAIN_DEPTH,
             Counter::expandarray_chain_max_depth,
         );
@@ -1640,7 +2371,7 @@ fn gen_expandarray(
         let offset = i32::try_from(i * (SIZEOF_VALUE as u32)).unwrap();
 
         // Missing elements are Qnil
-        asm.comment(&format!("load array[{}]", i));
+        asm_comment!(asm, "load array[{}]", i);
         let elem_opnd = if i < comptime_len { Opnd::mem(64, ary_opnd.unwrap(), offset) } else { Qnil.into() };
         asm.mov(top, elem_opnd);
     }
@@ -1694,7 +2425,7 @@ fn gen_get_ep(asm: &mut Assembler, level: u32) -> Opnd {
 
 // Gets the EP of the ISeq of the containing method, or "local level".
 // Equivalent of GET_LEP() macro.
-fn gen_get_lep(jit: &mut JITState, asm: &mut Assembler) -> Opnd {
+fn gen_get_lep(jit: &JITState, asm: &mut Assembler) -> Opnd {
     // Equivalent of get_lvar_level() in compile.c
     fn get_lvar_level(iseq: IseqPtr) -> u32 {
         if iseq == unsafe { rb_get_iseq_body_local_iseq(iseq) } {
@@ -1714,13 +2445,32 @@ fn gen_getlocal_generic(
     ep_offset: u32,
     level: u32,
 ) -> Option<CodegenStatus> {
-    // Load environment pointer EP (level 0) from CFP
-    let ep_opnd = gen_get_ep(asm, level);
+    // Split the block if we need to invalidate this instruction when EP escapes
+    if level == 0 && !jit.escapes_ep() && !jit.at_compile_target() {
+        return jit.defer_compilation(asm);
+    }
+
+    let local_opnd = if level == 0 && jit.assume_no_ep_escape(asm) {
+        // Load the local using SP register
+        asm.local_opnd(ep_offset)
+    } else {
+        // Load environment pointer EP (level 0) from CFP
+        let ep_opnd = gen_get_ep(asm, level);
+
+        // Load the local from the block
+        // val = *(vm_get_ep(GET_EP(), level) - idx);
+        let offs = -(SIZEOF_VALUE_I32 * ep_offset as i32);
+        let local_opnd = Opnd::mem(64, ep_opnd, offs);
+
+        // Write back an argument register to the stack. If the local variable
+        // is an argument, it might have an allocated register, but if this ISEQ
+        // is known to escape EP, the register shouldn't be used after this getlocal.
+        if level == 0 && asm.ctx.get_reg_mapping().get_reg(asm.local_opnd(ep_offset).reg_opnd()).is_some() {
+            asm.mov(local_opnd, asm.local_opnd(ep_offset));
+        }
 
-    // Load the local from the block
-    // val = *(vm_get_ep(GET_EP(), level) - idx);
-    let offs = -(SIZEOF_VALUE_I32 * ep_offset as i32);
-    let local_opnd = Opnd::mem(64, ep_opnd, offs);
+        local_opnd
+    };
 
     // Write the local at SP
     let stack_top = if level == 0 {
@@ -1738,7 +2488,6 @@ fn gen_getlocal_generic(
 fn gen_getlocal(
     jit: &mut JITState,
     asm: &mut Assembler,
-    _ocb: &mut OutlinedCb,
 ) -> Option<CodegenStatus> {
     let idx = jit.get_arg(0).as_u32();
     let level = jit.get_arg(1).as_u32();
@@ -1748,7 +2497,6 @@ fn gen_getlocal(
 fn gen_getlocal_wc0(
     jit: &mut JITState,
     asm: &mut Assembler,
-    _ocb: &mut OutlinedCb,
 ) -> Option<CodegenStatus> {
     let idx = jit.get_arg(0).as_u32();
     gen_getlocal_generic(jit, asm, idx, 0)
@@ -1757,7 +2505,6 @@ fn gen_getlocal_wc0(
 fn gen_getlocal_wc1(
     jit: &mut JITState,
     asm: &mut Assembler,
-    _ocb: &mut OutlinedCb,
 ) -> Option<CodegenStatus> {
     let idx = jit.get_arg(0).as_u32();
     gen_getlocal_generic(jit, asm, idx, 1)
@@ -1766,26 +2513,20 @@ fn gen_getlocal_wc1(
 fn gen_setlocal_generic(
     jit: &mut JITState,
     asm: &mut Assembler,
-    ocb: &mut OutlinedCb,
     ep_offset: u32,
     level: u32,
 ) -> Option<CodegenStatus> {
     let value_type = asm.ctx.get_opnd_type(StackOpnd(0));
 
-    // Load environment pointer EP at level
-    let ep_opnd = gen_get_ep(asm, level);
-
     // Fallback because of write barrier
-    if asm.ctx.get_chain_depth() > 0
-    {
-        // Save the PC and SP because it runs GC
-        jit_prepare_routine_call(jit, asm);
-
-        // Pop the value to write from the stack
-        let value_opnd = asm.stack_pop(1);
+    if asm.ctx.get_chain_depth() > 0 {
+        // Load environment pointer EP at level
+        let ep_opnd = gen_get_ep(asm, level);
 
+        // This function should not yield to the GC.
         // void rb_vm_env_write(const VALUE *ep, int index, VALUE v)
         let index = -(ep_offset as i64);
+        let value_opnd = asm.stack_opnd(0);
         asm.ccall(
             rb_vm_env_write as *const u8,
             vec![
@@ -1794,20 +2535,47 @@ fn gen_setlocal_generic(
                 value_opnd,
             ]
         );
+        asm.stack_pop(1);
 
         return Some(KeepCompiling);
     }
 
-    // Write barriers may be required when VM_ENV_FLAG_WB_REQUIRED is set, however write barriers
-    // only affect heap objects being written. If we know an immediate value is being written we
-    // can skip this check.
-    if !value_type.is_imm() {
-        // flags & VM_ENV_FLAG_WB_REQUIRED
+    // Split the block if we need to invalidate this instruction when EP escapes
+    if level == 0 && !jit.escapes_ep() && !jit.at_compile_target() {
+        return jit.defer_compilation(asm);
+    }
+
+    let (flags_opnd, local_opnd) = if level == 0 && jit.assume_no_ep_escape(asm) {
+        // Load flags and the local using SP register
+        let flags_opnd = asm.ctx.ep_opnd(VM_ENV_DATA_INDEX_FLAGS as i32);
+        let local_opnd = asm.local_opnd(ep_offset);
+
+        // Allocate a register to the new local operand
+        asm.alloc_reg(local_opnd.reg_opnd());
+        (flags_opnd, local_opnd)
+    } else {
+        // Make sure getlocal doesn't read a stale register. If the local variable
+        // is an argument, it might have an allocated register, but if this ISEQ
+        // is known to escape EP, the register shouldn't be used after this setlocal.
+        if level == 0 {
+            asm.ctx.dealloc_reg(asm.local_opnd(ep_offset).reg_opnd());
+        }
+
+        // Load flags and the local for the level
+        let ep_opnd = gen_get_ep(asm, level);
         let flags_opnd = Opnd::mem(
             64,
             ep_opnd,
             SIZEOF_VALUE_I32 * VM_ENV_DATA_INDEX_FLAGS as i32,
         );
+        (flags_opnd, Opnd::mem(64, ep_opnd, -SIZEOF_VALUE_I32 * ep_offset as i32))
+    };
+
+    // Write barriers may be required when VM_ENV_FLAG_WB_REQUIRED is set, however write barriers
+    // only affect heap objects being written. If we know an immediate value is being written we
+    // can skip this check.
+    if !value_type.is_imm() {
+        // flags & VM_ENV_FLAG_WB_REQUIRED
         asm.test(flags_opnd, VM_ENV_FLAG_WB_REQUIRED.into());
 
         // if (flags & VM_ENV_FLAG_WB_REQUIRED) != 0
@@ -1816,7 +2584,6 @@ fn gen_setlocal_generic(
             JCC_JNZ,
             jit,
             asm,
-            ocb,
             1,
             Counter::setlocal_wb_required,
         );
@@ -1831,8 +2598,7 @@ fn gen_setlocal_generic(
     let stack_top = asm.stack_pop(1);
 
     // Write the value at the environment pointer
-    let offs = -(SIZEOF_VALUE_I32 * ep_offset as i32);
-    asm.mov(Opnd::mem(64, ep_opnd, offs), stack_top);
+    asm.mov(local_opnd, stack_top);
 
     Some(KeepCompiling)
 }
@@ -1840,41 +2606,37 @@ fn gen_setlocal_generic(
 fn gen_setlocal(
     jit: &mut JITState,
     asm: &mut Assembler,
-    ocb: &mut OutlinedCb,
 ) -> Option<CodegenStatus> {
     let idx = jit.get_arg(0).as_u32();
     let level = jit.get_arg(1).as_u32();
-    gen_setlocal_generic(jit, asm, ocb, idx, level)
+    gen_setlocal_generic(jit, asm, idx, level)
 }
 
 fn gen_setlocal_wc0(
     jit: &mut JITState,
     asm: &mut Assembler,
-    ocb: &mut OutlinedCb,
 ) -> Option<CodegenStatus> {
     let idx = jit.get_arg(0).as_u32();
-    gen_setlocal_generic(jit, asm, ocb, idx, 0)
+    gen_setlocal_generic(jit, asm, idx, 0)
 }
 
 fn gen_setlocal_wc1(
     jit: &mut JITState,
     asm: &mut Assembler,
-    ocb: &mut OutlinedCb,
 ) -> Option<CodegenStatus> {
     let idx = jit.get_arg(0).as_u32();
-    gen_setlocal_generic(jit, asm, ocb, idx, 1)
+    gen_setlocal_generic(jit, asm, idx, 1)
 }
 
 // new hash initialized from top N values
 fn gen_newhash(
     jit: &mut JITState,
     asm: &mut Assembler,
-    _ocb: &mut OutlinedCb,
 ) -> Option<CodegenStatus> {
     let num: u64 = jit.get_arg(0).as_u64();
 
     // Save the PC and SP because we are allocating
-    jit_prepare_routine_call(jit, asm);
+    jit_prepare_call_with_gc(jit, asm);
 
     if num != 0 {
         // val = rb_hash_new_with_size(num / 2);
@@ -1904,12 +2666,12 @@ fn gen_newhash(
         asm.cpop_into(new_hash); // x86 alignment
 
         asm.stack_pop(num.try_into().unwrap());
-        let stack_ret = asm.stack_push(Type::Hash);
+        let stack_ret = asm.stack_push(Type::CHash);
         asm.mov(stack_ret, new_hash);
     } else {
         // val = rb_hash_new();
         let new_hash = asm.ccall(rb_hash_new as *const u8, vec![]);
-        let stack_ret = asm.stack_push(Type::Hash);
+        let stack_ret = asm.stack_push(Type::CHash);
         asm.mov(stack_ret, new_hash);
     }
 
@@ -1919,19 +2681,38 @@ fn gen_newhash(
 fn gen_putstring(
     jit: &mut JITState,
     asm: &mut Assembler,
-    _ocb: &mut OutlinedCb,
 ) -> Option<CodegenStatus> {
     let put_val = jit.get_arg(0);
 
     // Save the PC and SP because the callee will allocate
-    jit_prepare_routine_call(jit, asm);
+    jit_prepare_call_with_gc(jit, asm);
+
+    let str_opnd = asm.ccall(
+        rb_ec_str_resurrect as *const u8,
+        vec![EC, put_val.into(), 0.into()]
+    );
+
+    let stack_top = asm.stack_push(Type::CString);
+    asm.mov(stack_top, str_opnd);
+
+    Some(KeepCompiling)
+}
+
+fn gen_putchilledstring(
+    jit: &mut JITState,
+    asm: &mut Assembler,
+) -> Option<CodegenStatus> {
+    let put_val = jit.get_arg(0);
+
+    // Save the PC and SP because the callee will allocate
+    jit_prepare_call_with_gc(jit, asm);
 
     let str_opnd = asm.ccall(
         rb_ec_str_resurrect as *const u8,
-        vec![EC, put_val.into()]
+        vec![EC, put_val.into(), 1.into()]
     );
 
-    let stack_top = asm.stack_push(Type::TString);
+    let stack_top = asm.stack_push(Type::CString);
     asm.mov(stack_top, str_opnd);
 
     Some(KeepCompiling)
@@ -1940,23 +2721,23 @@ fn gen_putstring(
 fn gen_checkmatch(
     jit: &mut JITState,
     asm: &mut Assembler,
-    _ocb: &mut OutlinedCb,
 ) -> Option<CodegenStatus> {
     let flag = jit.get_arg(0).as_u32();
 
     // rb_vm_check_match is not leaf unless flag is VM_CHECKMATCH_TYPE_WHEN.
     // See also: leafness_of_checkmatch() and check_match()
     if flag != VM_CHECKMATCH_TYPE_WHEN {
-        jit_prepare_routine_call(jit, asm);
+        jit_prepare_non_leaf_call(jit, asm);
     }
 
-    let pattern = asm.stack_pop(1);
-    let target = asm.stack_pop(1);
+    let pattern = asm.stack_opnd(0);
+    let target = asm.stack_opnd(1);
 
     extern "C" {
         fn rb_vm_check_match(ec: EcPtr, target: VALUE, pattern: VALUE, num: u32) -> VALUE;
     }
     let result = asm.ccall(rb_vm_check_match as *const u8, vec![EC, target, pattern, flag.into()]);
+    asm.stack_pop(2); // Keep them on stack during ccall for GC
 
     let stack_ret = asm.stack_push(Type::Unknown);
     asm.mov(stack_ret, result);
@@ -1969,7 +2750,6 @@ fn gen_checkmatch(
 fn gen_checkkeyword(
     jit: &mut JITState,
     asm: &mut Assembler,
-    _ocb: &mut OutlinedCb,
 ) -> Option<CodegenStatus> {
     // When a keyword is unspecified past index 32, a hash will be used
     // instead. This can only happen in iseqs taking more than 32 keywords.
@@ -1983,11 +2763,11 @@ fn gen_checkkeyword(
     // The index of the keyword we want to check
     let index: i64 = jit.get_arg(1).as_i64();
 
-    // Load environment pointer EP
-    let ep_opnd = gen_get_ep(asm, 0);
-
-    // VALUE kw_bits = *(ep - bits);
-    let bits_opnd = Opnd::mem(64, ep_opnd, SIZEOF_VALUE_I32 * -bits_offset);
+    // `unspecified_bits` is a part of the local table. Therefore, we may allocate a register for
+    // that "local" when passing it as an argument. We must use such a register to avoid loading
+    // random bits from the stack if any. We assume that EP is not escaped as of entering a method
+    // with keyword arguments.
+    let bits_opnd = asm.local_opnd(bits_offset as u32);
 
     // unsigned int b = (unsigned int)FIX2ULONG(kw_bits);
     // if ((b & (0x01 << idx))) {
@@ -2009,8 +2789,7 @@ fn jit_chain_guard(
     jcc: JCCKinds,
     jit: &mut JITState,
     asm: &mut Assembler,
-    ocb: &mut OutlinedCb,
-    depth_limit: i32,
+    depth_limit: u8,
     counter: Counter,
 ) {
     let target0_gen_fn = match jcc {
@@ -2018,9 +2797,10 @@ fn jit_chain_guard(
         JCC_JZ | JCC_JE => BranchGenFn::JZToTarget0,
         JCC_JBE | JCC_JNA => BranchGenFn::JBEToTarget0,
         JCC_JB | JCC_JNAE => BranchGenFn::JBToTarget0,
+        JCC_JO_MUL => BranchGenFn::JOMulToTarget0,
     };
 
-    if (asm.ctx.get_chain_depth() as i32) < depth_limit {
+    if asm.ctx.get_chain_depth() < depth_limit {
         // Rewind Context to use the stack_size at the beginning of this instruction.
         let mut deeper = asm.ctx.with_stack_size(jit.stack_size_for_pc);
         deeper.increment_chain_depth();
@@ -2029,77 +2809,32 @@ fn jit_chain_guard(
             idx: jit.insn_idx,
         };
 
-        gen_branch(jit, asm, ocb, bid, &deeper, None, None, target0_gen_fn);
+        jit.gen_branch(asm, bid, &deeper, None, None, target0_gen_fn);
     } else {
         target0_gen_fn.call(asm, Target::side_exit(counter), None);
     }
 }
 
-// up to 5 different classes, and embedded or not for each
-pub const GET_IVAR_MAX_DEPTH: i32 = 10;
+// up to 8 different shapes for each
+pub const GET_IVAR_MAX_DEPTH: u8 = 8;
 
-// up to 5 different classes, and embedded or not for each
-pub const SET_IVAR_MAX_DEPTH: i32 = 10;
+// up to 8 different shapes for each
+pub const SET_IVAR_MAX_DEPTH: u8 = 8;
 
 // hashes and arrays
-pub const OPT_AREF_MAX_CHAIN_DEPTH: i32 = 2;
+pub const OPT_AREF_MAX_CHAIN_DEPTH: u8 = 2;
 
 // expandarray
-pub const EXPANDARRAY_MAX_CHAIN_DEPTH: i32 = 4;
-
-// up to 10 different classes
-pub const SEND_MAX_DEPTH: i32 = 20;
+pub const EXPANDARRAY_MAX_CHAIN_DEPTH: u8 = 4;
 
-// up to 20 different methods for send
-pub const SEND_MAX_CHAIN_DEPTH: i32 = 20;
+// up to 5 different methods for send
+pub const SEND_MAX_DEPTH: u8 = 5;
 
 // up to 20 different offsets for case-when
-pub const CASE_WHEN_MAX_DEPTH: i32 = 20;
+pub const CASE_WHEN_MAX_DEPTH: u8 = 20;
 
 pub const MAX_SPLAT_LENGTH: i32 = 127;
 
-// Codegen for setting an instance variable.
-// Preconditions:
-//   - receiver is in REG0
-//   - receiver has the same class as CLASS_OF(comptime_receiver)
-//   - no stack push or pops to ctx since the entry to the codegen of the instruction being compiled
-fn gen_set_ivar(
-    jit: &mut JITState,
-    asm: &mut Assembler,
-    ivar_name: ID,
-    flags: u32,
-    argc: i32,
-) -> Option<CodegenStatus> {
-
-    // This is a .send call and we need to adjust the stack
-    if flags & VM_CALL_OPT_SEND != 0 {
-        handle_opt_send_shift_stack(asm, argc);
-    }
-
-    // Save the PC and SP because the callee may allocate
-    // Note that this modifies REG_SP, which is why we do it first
-    jit_prepare_routine_call(jit, asm);
-
-    // Get the operands from the stack
-    let val_opnd = asm.stack_pop(1);
-    let recv_opnd = asm.stack_pop(1);
-
-    // Call rb_vm_set_ivar_id with the receiver, the ivar name, and the value
-    let val = asm.ccall(
-        rb_vm_set_ivar_id as *const u8,
-        vec![
-            recv_opnd,
-            Opnd::UImm(ivar_name),
-            val_opnd,
-        ],
-    );
-
-    let out_opnd = asm.stack_push(Type::Unknown);
-    asm.mov(out_opnd, val);
-
-    Some(KeepCompiling)
-}
-
 // Codegen for getting an instance variable.
 // Preconditions:
 //   - receiver has the same class as CLASS_OF(comptime_receiver)
@@ -2107,8 +2842,7 @@ fn gen_set_ivar(
 fn gen_get_ivar(
     jit: &mut JITState,
     asm: &mut Assembler,
-    ocb: &mut OutlinedCb,
-    max_chain_depth: i32,
+    max_chain_depth: u8,
     comptime_receiver: VALUE,
     ivar_name: ID,
     recv: Opnd,
@@ -2135,9 +2869,9 @@ fn gen_get_ivar(
     // Check if the comptime receiver is a T_OBJECT
     let receiver_t_object = unsafe { RB_TYPE_P(comptime_receiver, RUBY_T_OBJECT) };
     // Use a general C call at the last chain to avoid exits on megamorphic shapes
-    let megamorphic = asm.ctx.get_chain_depth() as i32 >= max_chain_depth;
+    let megamorphic = asm.ctx.get_chain_depth() >= max_chain_depth;
     if megamorphic {
-        gen_counter_incr(asm, Counter::num_getivar_megamorphic);
+        gen_counter_incr(jit, asm, Counter::num_getivar_megamorphic);
     }
 
     // If the class uses the default allocator, instances should all be T_OBJECT
@@ -2148,10 +2882,10 @@ fn gen_get_ivar(
     if !receiver_t_object || uses_custom_allocator || comptime_receiver.shape_too_complex() || megamorphic {
         // General case. Call rb_ivar_get().
         // VALUE rb_ivar_get(VALUE obj, ID id)
-        asm.comment("call rb_ivar_get()");
+        asm_comment!(asm, "call rb_ivar_get()");
 
-        // The function could raise exceptions.
-        jit_prepare_routine_call(jit, asm);
+        // The function could raise RactorIsolationError.
+        jit_prepare_non_leaf_call(jit, asm);
 
         let ivar_val = asm.ccall(rb_ivar_get as *const u8, vec![recv, Opnd::UImm(ivar_name)]);
 
@@ -2164,15 +2898,14 @@ fn gen_get_ivar(
         asm.mov(out_opnd, ivar_val);
 
         // Jump to next instruction. This allows guard chains to share the same successor.
-        jump_to_next_insn(jit, asm, ocb);
+        jump_to_next_insn(jit, asm);
         return Some(EndBlock);
     }
 
     let ivar_index = unsafe {
         let shape_id = comptime_receiver.shape_id_of();
-        let shape = rb_shape_get_shape_by_id(shape_id);
-        let mut ivar_index: u32 = 0;
-        if rb_shape_get_iv_index(shape, ivar_name, &mut ivar_index) {
+        let mut ivar_index: u16 = 0;
+        if rb_shape_get_iv_index(shape_id, ivar_name, &mut ivar_index) {
             Some(ivar_index as usize)
         } else {
             None
@@ -2185,17 +2918,16 @@ fn gen_get_ivar(
     // Compile time self is embedded and the ivar index lands within the object
     let embed_test_result = unsafe { FL_TEST_RAW(comptime_receiver, VALUE(ROBJECT_EMBED.as_usize())) != VALUE(0) };
 
-    let expected_shape = unsafe { rb_shape_get_shape_id(comptime_receiver) };
+    let expected_shape = unsafe { rb_obj_shape_id(comptime_receiver) };
     let shape_id_offset = unsafe { rb_shape_id_offset() };
     let shape_opnd = Opnd::mem(SHAPE_ID_NUM_BITS as u8, recv, shape_id_offset);
 
-    asm.comment("guard shape");
+    asm_comment!(asm, "guard shape");
     asm.cmp(shape_opnd, Opnd::UImm(expected_shape as u64));
     jit_chain_guard(
         JCC_JNE,
         jit,
         asm,
-        ocb,
         max_chain_depth,
         Counter::getivar_megamorphic,
     );
@@ -2215,7 +2947,7 @@ fn gen_get_ivar(
         }
         Some(ivar_index) => {
             if embed_test_result {
-                // See ROBJECT_IVPTR() from include/ruby/internal/core/robject.h
+                // See ROBJECT_FIELDS() from include/ruby/internal/core/robject.h
 
                 // Load the variable
                 let offs = ROBJECT_OFFSET_AS_ARY as i32 + (ivar_index * SIZEOF_VALUE) as i32;
@@ -2228,7 +2960,7 @@ fn gen_get_ivar(
                 // Compile time value is *not* embedded.
 
                 // Get a pointer to the extended table
-                let tbl_opnd = asm.load(Opnd::mem(64, recv, ROBJECT_OFFSET_AS_HEAP_IVPTR as i32));
+                let tbl_opnd = asm.load(Opnd::mem(64, recv, ROBJECT_OFFSET_AS_HEAP_FIELDS as i32));
 
                 // Read the ivar from the extended table
                 let ivar_opnd = Opnd::mem(64, tbl_opnd, (SIZEOF_VALUE * ivar_index) as i32);
@@ -2240,19 +2972,17 @@ fn gen_get_ivar(
     }
 
     // Jump to next instruction. This allows guard chains to share the same successor.
-    jump_to_next_insn(jit, asm, ocb);
+    jump_to_next_insn(jit, asm);
     Some(EndBlock)
 }
 
 fn gen_getinstancevariable(
     jit: &mut JITState,
     asm: &mut Assembler,
-    ocb: &mut OutlinedCb,
 ) -> Option<CodegenStatus> {
     // Defer compilation so we can specialize on a runtime `self`
-    if !jit.at_current_insn() {
-        defer_compilation(jit, asm, ocb);
-        return Some(EndBlock);
+    if !jit.at_compile_target() {
+        return jit.defer_compilation(asm);
     }
 
     let ivar_name = jit.get_arg(0).as_u64();
@@ -2265,7 +2995,6 @@ fn gen_getinstancevariable(
     gen_get_ivar(
         jit,
         asm,
-        ocb,
         GET_IVAR_MAX_DEPTH,
         comptime_val,
         ivar_name,
@@ -2294,18 +3023,18 @@ fn gen_write_iv(
         let ivar_opnd = Opnd::mem(64, recv, offs);
 
         // Write the IV
-        asm.comment("write IV");
+        asm_comment!(asm, "write IV");
         asm.mov(ivar_opnd, set_value);
     } else {
         // Compile time value is *not* embedded.
 
         // Get a pointer to the extended table
-        let tbl_opnd = asm.load(Opnd::mem(64, recv, ROBJECT_OFFSET_AS_HEAP_IVPTR as i32));
+        let tbl_opnd = asm.load(Opnd::mem(64, recv, ROBJECT_OFFSET_AS_HEAP_FIELDS as i32));
 
         // Write the ivar in to the extended table
         let ivar_opnd = Opnd::mem(64, tbl_opnd, (SIZEOF_VALUE * ivar_index) as i32);
 
-        asm.comment("write IV");
+        asm_comment!(asm, "write IV");
         asm.mov(ivar_opnd, set_value);
     }
 }
@@ -2313,22 +3042,43 @@ fn gen_write_iv(
 fn gen_setinstancevariable(
     jit: &mut JITState,
     asm: &mut Assembler,
-    ocb: &mut OutlinedCb,
 ) -> Option<CodegenStatus> {
     // Defer compilation so we can specialize on a runtime `self`
-    if !jit.at_current_insn() {
-        defer_compilation(jit, asm, ocb);
-        return Some(EndBlock);
+    if !jit.at_compile_target() {
+        return jit.defer_compilation(asm);
     }
 
     let ivar_name = jit.get_arg(0).as_u64();
+    let ic = jit.get_arg(1).as_ptr();
     let comptime_receiver = jit.peek_at_self();
+    gen_set_ivar(
+        jit,
+        asm,
+        comptime_receiver,
+        ivar_name,
+        SelfOpnd,
+        Some(ic),
+    )
+}
+
+/// Set an instance variable on setinstancevariable or attr_writer.
+/// It switches the behavior based on what recv_opnd is given.
+/// * SelfOpnd: setinstancevariable, which doesn't push a result onto the stack.
+/// * StackOpnd: attr_writer, which pushes a result onto the stack.
+fn gen_set_ivar(
+    jit: &mut JITState,
+    asm: &mut Assembler,
+    comptime_receiver: VALUE,
+    ivar_name: ID,
+    recv_opnd: YARVOpnd,
+    ic: Option<*const iseq_inline_iv_cache_entry>,
+) -> Option<CodegenStatus> {
     let comptime_val_klass = comptime_receiver.class_of();
 
     // If the comptime receiver is frozen, writing an IV will raise an exception
     // and we don't want to JIT code to deal with that situation.
     if comptime_receiver.is_frozen() {
-        gen_counter_incr(asm, Counter::setivar_frozen);
+        gen_counter_incr(jit, asm, Counter::setivar_frozen);
         return None;
     }
 
@@ -2347,18 +3097,17 @@ fn gen_setinstancevariable(
     // Check if the comptime receiver is a T_OBJECT
     let receiver_t_object = unsafe { RB_TYPE_P(comptime_receiver, RUBY_T_OBJECT) };
     // Use a general C call at the last chain to avoid exits on megamorphic shapes
-    let megamorphic = asm.ctx.get_chain_depth() as i32 >= SET_IVAR_MAX_DEPTH;
+    let megamorphic = asm.ctx.get_chain_depth() >= SET_IVAR_MAX_DEPTH;
     if megamorphic {
-        gen_counter_incr(asm, Counter::num_setivar_megamorphic);
+        gen_counter_incr(jit, asm, Counter::num_setivar_megamorphic);
     }
 
     // Get the iv index
     let shape_too_complex = comptime_receiver.shape_too_complex();
     let ivar_index = if !shape_too_complex {
         let shape_id = comptime_receiver.shape_id_of();
-        let shape = unsafe { rb_shape_get_shape_by_id(shape_id) };
-        let mut ivar_index: u32 = 0;
-        if unsafe { rb_shape_get_iv_index(shape, ivar_name, &mut ivar_index) } {
+        let mut ivar_index: u16 = 0;
+        if unsafe { rb_shape_get_iv_index(shape_id, ivar_name, &mut ivar_index) } {
             Some(ivar_index as usize)
         } else {
             None
@@ -2367,98 +3116,99 @@ fn gen_setinstancevariable(
         None
     };
 
-    // Get the next shape information if it needs transition
+    // The current shape doesn't contain this iv, we need to transition to another shape.
+    let mut new_shape_too_complex = false;
     let new_shape = if !shape_too_complex && receiver_t_object && ivar_index.is_none() {
-        let shape = comptime_receiver.shape_of();
-
-        let current_capacity = unsafe { (*shape).capacity };
-        let new_capacity = current_capacity * 2;
-
-        // If the object doesn't have the capacity to store the IV,
-        // then we'll need to allocate it.
-        let needs_extension = unsafe { (*shape).next_iv_index >= current_capacity };
-
-        // We can write to the object, but we need to transition the shape
-        let ivar_index = unsafe { (*shape).next_iv_index } as usize;
-
-        let capa_shape = if needs_extension {
-            // We need to add an extended table to the object
-            // First, create an outgoing transition that increases the
-            // capacity
-            Some(unsafe { rb_shape_transition_shape_capa(shape, new_capacity) })
+        let current_shape_id = comptime_receiver.shape_id_of();
+        let next_shape_id = unsafe { rb_shape_transition_add_ivar_no_warnings(comptime_receiver, ivar_name) };
+
+        // If the VM ran out of shapes, or this class generated too many leaf,
+        // it may be de-optimized into OBJ_TOO_COMPLEX_SHAPE (hash-table).
+        new_shape_too_complex = unsafe { rb_yjit_shape_too_complex_p(next_shape_id) };
+        if new_shape_too_complex {
+            Some((next_shape_id, None, 0_usize))
         } else {
-            None
-        };
+            let current_capacity = unsafe { rb_yjit_shape_capacity(current_shape_id) };
+            let next_capacity = unsafe { rb_yjit_shape_capacity(next_shape_id) };
 
-        let dest_shape = if let Some(capa_shape) = capa_shape {
-            unsafe { rb_shape_get_next(capa_shape, comptime_receiver, ivar_name) }
-        } else {
-            unsafe { rb_shape_get_next(shape, comptime_receiver, ivar_name) }
-        };
+            // If the new shape has a different capacity, or is TOO_COMPLEX, we'll have to
+            // reallocate it.
+            let needs_extension = next_capacity != current_capacity;
 
-        let new_shape_id = unsafe { rb_shape_id(dest_shape) };
-        let needs_extension = if needs_extension {
-            Some((current_capacity, new_capacity))
-        } else {
-            None
-        };
-        Some((new_shape_id, needs_extension, ivar_index))
+            // We can write to the object, but we need to transition the shape
+            let ivar_index = unsafe { rb_yjit_shape_index(next_shape_id) } as usize;
+
+            let needs_extension = if needs_extension {
+                Some((current_capacity, next_capacity))
+            } else {
+                None
+            };
+            Some((next_shape_id, needs_extension, ivar_index))
+        }
     } else {
         None
     };
-    let new_shape_too_complex = matches!(new_shape, Some((OBJ_TOO_COMPLEX_SHAPE_ID, _, _)));
 
     // If the receiver isn't a T_OBJECT, or uses a custom allocator,
     // then just write out the IV write as a function call.
     // too-complex shapes can't use index access, so we use rb_ivar_get for them too.
     if !receiver_t_object || uses_custom_allocator || shape_too_complex || new_shape_too_complex || megamorphic {
-        asm.comment("call rb_vm_setinstancevariable()");
-
-        let ic = jit.get_arg(1).as_u64(); // type IVC
-
-        // The function could raise exceptions.
+        // The function could raise FrozenError.
         // Note that this modifies REG_SP, which is why we do it first
-        jit_prepare_routine_call(jit, asm);
+        jit_prepare_non_leaf_call(jit, asm);
 
         // Get the operands from the stack
-        let val_opnd = asm.stack_pop(1);
+        let val_opnd = asm.stack_opnd(0);
 
-        // Call rb_vm_setinstancevariable(iseq, obj, id, val, ic);
-        asm.ccall(
-            rb_vm_setinstancevariable as *const u8,
-            vec![
-                Opnd::const_ptr(jit.iseq as *const u8),
-                Opnd::mem(64, CFP, RUBY_OFFSET_CFP_SELF),
-                ivar_name.into(),
-                val_opnd,
-                Opnd::const_ptr(ic as *const u8),
-            ]
-        );
+        if let StackOpnd(index) = recv_opnd { // attr_writer
+            let recv = asm.stack_opnd(index as i32);
+            asm_comment!(asm, "call rb_vm_set_ivar_id()");
+            asm.ccall(
+                rb_vm_set_ivar_id as *const u8,
+                vec![
+                    recv,
+                    Opnd::UImm(ivar_name),
+                    val_opnd,
+                ],
+            );
+        } else { // setinstancevariable
+            asm_comment!(asm, "call rb_vm_setinstancevariable()");
+            asm.ccall(
+                rb_vm_setinstancevariable as *const u8,
+                vec![
+                    Opnd::const_ptr(jit.iseq as *const u8),
+                    Opnd::mem(64, CFP, RUBY_OFFSET_CFP_SELF),
+                    ivar_name.into(),
+                    val_opnd,
+                    Opnd::const_ptr(ic.unwrap() as *const u8),
+                ],
+            );
+        }
     } else {
         // Get the receiver
-        let mut recv = asm.load(Opnd::mem(64, CFP, RUBY_OFFSET_CFP_SELF));
-
-        let recv_opnd = SelfOpnd;
+        let mut recv = asm.load(if let StackOpnd(index) = recv_opnd {
+            asm.stack_opnd(index as i32)
+        } else {
+            Opnd::mem(64, CFP, RUBY_OFFSET_CFP_SELF)
+        });
 
         // Upgrade type
         guard_object_is_heap(asm, recv, recv_opnd, Counter::setivar_not_heap);
 
-        let expected_shape = unsafe { rb_shape_get_shape_id(comptime_receiver) };
+        let expected_shape = unsafe { rb_obj_shape_id(comptime_receiver) };
         let shape_id_offset = unsafe { rb_shape_id_offset() };
         let shape_opnd = Opnd::mem(SHAPE_ID_NUM_BITS as u8, recv, shape_id_offset);
 
-        asm.comment("guard shape");
+        asm_comment!(asm, "guard shape");
         asm.cmp(shape_opnd, Opnd::UImm(expected_shape as u64));
         jit_chain_guard(
             JCC_JNE,
             jit,
             asm,
-            ocb,
             SET_IVAR_MAX_DEPTH,
             Counter::setivar_megamorphic,
         );
 
-        asm.spill_temps(); // for ccall (must be done before write_val is popped)
         let write_val;
 
         match ivar_index {
@@ -2469,11 +3219,11 @@ fn gen_setinstancevariable(
                 if let Some((current_capacity, new_capacity)) = needs_extension {
                     // Generate the C call so that runtime code will increase
                     // the capacity and set the buffer.
-                    asm.comment("call rb_ensure_iv_list_size");
+                    asm_comment!(asm, "call rb_ensure_iv_list_size");
 
                     // It allocates so can trigger GC, which takes the VM lock
                     // so could yield to a different ractor.
-                    jit_prepare_routine_call(jit, asm);
+                    jit_prepare_call_with_gc(jit, asm);
                     asm.ccall(rb_ensure_iv_list_size as *const u8,
                               vec![
                                   recv,
@@ -2483,13 +3233,17 @@ fn gen_setinstancevariable(
                     );
 
                     // Load the receiver again after the function call
-                    recv = asm.load(Opnd::mem(64, CFP, RUBY_OFFSET_CFP_SELF))
+                    recv = asm.load(if let StackOpnd(index) = recv_opnd {
+                        asm.stack_opnd(index as i32)
+                    } else {
+                        Opnd::mem(64, CFP, RUBY_OFFSET_CFP_SELF)
+                    });
                 }
 
-                write_val = asm.stack_pop(1);
+                write_val = asm.stack_opnd(0);
                 gen_write_iv(asm, comptime_receiver, recv, ivar_index, write_val, needs_extension.is_some());
 
-                asm.comment("write shape");
+                asm_comment!(asm, "write shape");
 
                 let shape_id_offset = unsafe { rb_shape_id_offset() };
                 let shape_opnd = Opnd::mem(SHAPE_ID_NUM_BITS as u8, recv, shape_id_offset);
@@ -2504,7 +3258,7 @@ fn gen_setinstancevariable(
                 // the iv index by searching up the shape tree.  If we've
                 // made the transition already, then there's no reason to
                 // update the shape on the object.  Just set the IV.
-                write_val = asm.stack_pop(1);
+                write_val = asm.stack_opnd(0);
                 gen_write_iv(asm, comptime_receiver, recv, ivar_index, write_val, false);
             },
         }
@@ -2512,6 +3266,7 @@ fn gen_setinstancevariable(
         // If we know the stack value is an immediate, there's no need to
         // generate WB code.
         if !stack_type.is_imm() {
+            asm.spill_regs(); // for ccall (unconditionally spill them for RegMappings consistency)
             let skip_wb = asm.new_label("skip_wb");
             // If the value we're writing is an immediate, we don't need to WB
             asm.test(write_val, (RUBY_IMMEDIATE_MASK as u64).into());
@@ -2521,7 +3276,7 @@ fn gen_setinstancevariable(
             asm.cmp(write_val, Qnil.into());
             asm.jbe(skip_wb);
 
-            asm.comment("write barrier");
+            asm_comment!(asm, "write barrier");
             asm.ccall(
                 rb_gc_writebarrier as *const u8,
                 vec![
@@ -2533,6 +3288,16 @@ fn gen_setinstancevariable(
             asm.write_label(skip_wb);
         }
     }
+    let write_val = asm.stack_pop(1); // Keep write_val on stack during ccall for GC
+
+    // If it's attr_writer, i.e. recv_opnd is StackOpnd, we need to pop
+    // the receiver and push the written value onto the stack.
+    if let StackOpnd(_) = recv_opnd {
+        asm.stack_pop(1); // Pop receiver
+
+        let out_opnd = asm.stack_push(Type::Unknown); // Push a return value
+        asm.mov(out_opnd, write_val);
+    }
 
     Some(KeepCompiling)
 }
@@ -2540,36 +3305,46 @@ fn gen_setinstancevariable(
 fn gen_defined(
     jit: &mut JITState,
     asm: &mut Assembler,
-    _ocb: &mut OutlinedCb,
 ) -> Option<CodegenStatus> {
     let op_type = jit.get_arg(0).as_u64();
     let obj = jit.get_arg(1);
     let pushval = jit.get_arg(2);
 
-    // Save the PC and SP because the callee may allocate
-    // Note that this modifies REG_SP, which is why we do it first
-    jit_prepare_routine_call(jit, asm);
+    match op_type as u32 {
+        DEFINED_YIELD => {
+            asm.stack_pop(1); // v operand is not used
+            let out_opnd = asm.stack_push(Type::Unknown); // nil or "yield"
 
-    // Get the operands from the stack
-    let v_opnd = asm.stack_pop(1);
+            gen_block_given(jit, asm, out_opnd, pushval.into(), Qnil.into());
+        }
+        _ => {
+            // Save the PC and SP because the callee may allocate or call #respond_to?
+            // Note that this modifies REG_SP, which is why we do it first
+            jit_prepare_non_leaf_call(jit, asm);
 
-    // Call vm_defined(ec, reg_cfp, op_type, obj, v)
-    let def_result = asm.ccall(rb_vm_defined as *const u8, vec![EC, CFP, op_type.into(), obj.into(), v_opnd]);
+            // Get the operands from the stack
+            let v_opnd = asm.stack_opnd(0);
 
-    // if (vm_defined(ec, GET_CFP(), op_type, obj, v)) {
-    //  val = pushval;
-    // }
-    asm.test(def_result, Opnd::UImm(255));
-    let out_value = asm.csel_nz(pushval.into(), Qnil.into());
+            // Call vm_defined(ec, reg_cfp, op_type, obj, v)
+            let def_result = asm.ccall(rb_vm_defined as *const u8, vec![EC, CFP, op_type.into(), obj.into(), v_opnd]);
+            asm.stack_pop(1); // Keep it on stack during ccall for GC
 
-    // Push the return value onto the stack
-    let out_type = if pushval.special_const_p() {
-        Type::UnknownImm
-    } else {
-        Type::Unknown
-    };
-    let stack_ret = asm.stack_push(out_type);
-    asm.mov(stack_ret, out_value);
+            // if (vm_defined(ec, GET_CFP(), op_type, obj, v)) {
+            //  val = pushval;
+            // }
+            asm.test(def_result, Opnd::UImm(255));
+            let out_value = asm.csel_nz(pushval.into(), Qnil.into());
+
+            // Push the return value onto the stack
+            let out_type = if pushval.special_const_p() {
+                Type::UnknownImm
+            } else {
+                Type::Unknown
+            };
+            let stack_ret = asm.stack_push(out_type);
+            asm.mov(stack_ret, out_value);
+        }
+    }
 
     Some(KeepCompiling)
 }
@@ -2577,12 +3352,10 @@ fn gen_defined(
 fn gen_definedivar(
     jit: &mut JITState,
     asm: &mut Assembler,
-    ocb: &mut OutlinedCb,
 ) -> Option<CodegenStatus> {
     // Defer compilation so we can specialize base on a runtime receiver
-    if !jit.at_current_insn() {
-        defer_compilation(jit, asm, ocb);
-        return Some(EndBlock);
+    if !jit.at_compile_target() {
+        return jit.defer_compilation(asm);
     }
 
     let ivar_name = jit.get_arg(0).as_u64();
@@ -2596,15 +3369,15 @@ fn gen_definedivar(
     // Specialize base on compile time values
     let comptime_receiver = jit.peek_at_self();
 
-    if comptime_receiver.shape_too_complex() || asm.ctx.get_chain_depth() as i32 >= GET_IVAR_MAX_DEPTH {
+    if comptime_receiver.shape_too_complex() || asm.ctx.get_chain_depth() >= GET_IVAR_MAX_DEPTH {
         // Fall back to calling rb_ivar_defined
 
         // Save the PC and SP because the callee may allocate
         // Note that this modifies REG_SP, which is why we do it first
-        jit_prepare_routine_call(jit, asm);
+        jit_prepare_call_with_gc(jit, asm);
 
         // Call rb_ivar_defined(recv, ivar_name)
-        let def_result = asm.ccall(rb_ivar_defined as *const u8, vec![recv.into(), ivar_name.into()]);
+        let def_result = asm.ccall(rb_ivar_defined as *const u8, vec![recv, ivar_name.into()]);
 
         // if (rb_ivar_defined(recv, ivar_name)) {
         //  val = pushval;
@@ -2622,9 +3395,8 @@ fn gen_definedivar(
 
     let shape_id = comptime_receiver.shape_id_of();
     let ivar_exists = unsafe {
-        let shape = rb_shape_get_shape_by_id(shape_id);
-        let mut ivar_index: u32 = 0;
-        rb_shape_get_iv_index(shape, ivar_name, &mut ivar_index)
+        let mut ivar_index: u16 = 0;
+        rb_shape_get_iv_index(shape_id, ivar_name, &mut ivar_index)
     };
 
     // Guard heap object (recv_opnd must be used before stack_pop)
@@ -2633,13 +3405,12 @@ fn gen_definedivar(
     let shape_id_offset = unsafe { rb_shape_id_offset() };
     let shape_opnd = Opnd::mem(SHAPE_ID_NUM_BITS as u8, recv, shape_id_offset);
 
-    asm.comment("guard shape");
+    asm_comment!(asm, "guard shape");
     asm.cmp(shape_opnd, Opnd::UImm(shape_id as u64));
     jit_chain_guard(
         JCC_JNE,
         jit,
         asm,
-        ocb,
         GET_IVAR_MAX_DEPTH,
         Counter::definedivar_megamorphic,
     );
@@ -2648,15 +3419,12 @@ fn gen_definedivar(
     jit_putobject(asm, result);
 
     // Jump to next instruction. This allows guard chains to share the same successor.
-    jump_to_next_insn(jit, asm, ocb);
-
-    return Some(EndBlock);
+    return jump_to_next_insn(jit, asm);
 }
 
 fn gen_checktype(
     jit: &mut JITState,
     asm: &mut Assembler,
-    _ocb: &mut OutlinedCb,
 ) -> Option<CodegenStatus> {
     let type_val = jit.get_arg(0).as_u32();
 
@@ -2664,7 +3432,6 @@ fn gen_checktype(
     if let RUBY_T_STRING | RUBY_T_ARRAY | RUBY_T_HASH = type_val {
         let val_type = asm.ctx.get_opnd_type(StackOpnd(0));
         let val = asm.stack_pop(1);
-        let val = asm.load(val);
 
         // Check if we know from type information
         match val_type.known_value_type() {
@@ -2682,6 +3449,7 @@ fn gen_checktype(
 
         let ret = asm.new_label("ret");
 
+        let val = asm.load(val);
         if !val_type.is_heap() {
             // if (SPECIAL_CONST_P(val)) {
             // Return Qfalse via REG1 if not on heap
@@ -2711,14 +3479,13 @@ fn gen_checktype(
 fn gen_concatstrings(
     jit: &mut JITState,
     asm: &mut Assembler,
-    _ocb: &mut OutlinedCb,
 ) -> Option<CodegenStatus> {
     let n = jit.get_arg(0).as_usize();
 
-    // Save the PC and SP because we are allocating
-    jit_prepare_routine_call(jit, asm);
+    // rb_str_concat_literals may raise Encoding::CompatibilityError
+    jit_prepare_non_leaf_call(jit, asm);
 
-    let values_ptr = asm.lea(asm.ctx.sp_opnd(-((SIZEOF_VALUE as isize) * n as isize)));
+    let values_ptr = asm.lea(asm.ctx.sp_opnd(-(n as i32)));
 
     // call rb_str_concat_literals(size_t n, const VALUE *strings);
     let return_value = asm.ccall(
@@ -2736,7 +3503,6 @@ fn gen_concatstrings(
 fn guard_two_fixnums(
     jit: &mut JITState,
     asm: &mut Assembler,
-    ocb: &mut OutlinedCb,
 ) {
     let counter = Counter::guard_send_not_fixnums;
 
@@ -2749,19 +3515,19 @@ fn guard_two_fixnums(
     let arg0_type = asm.ctx.get_opnd_type(arg0.into());
 
     if arg0_type.is_heap() || arg1_type.is_heap() {
-        asm.comment("arg is heap object");
+        asm_comment!(asm, "arg is heap object");
         asm.jmp(Target::side_exit(counter));
         return;
     }
 
     if arg0_type != Type::Fixnum && arg0_type.is_specific() {
-        asm.comment("arg0 not fixnum");
+        asm_comment!(asm, "arg0 not fixnum");
         asm.jmp(Target::side_exit(counter));
         return;
     }
 
     if arg1_type != Type::Fixnum && arg1_type.is_specific() {
-        asm.comment("arg1 not fixnum");
+        asm_comment!(asm, "arg1 not fixnum");
         asm.jmp(Target::side_exit(counter));
         return;
     }
@@ -2773,27 +3539,25 @@ fn guard_two_fixnums(
 
     // If not fixnums at run-time, fall back
     if arg0_type != Type::Fixnum {
-        asm.comment("guard arg0 fixnum");
+        asm_comment!(asm, "guard arg0 fixnum");
         asm.test(arg0, Opnd::UImm(RUBY_FIXNUM_FLAG as u64));
 
         jit_chain_guard(
             JCC_JZ,
             jit,
             asm,
-            ocb,
             SEND_MAX_DEPTH,
             counter,
         );
     }
     if arg1_type != Type::Fixnum {
-        asm.comment("guard arg1 fixnum");
+        asm_comment!(asm, "guard arg1 fixnum");
         asm.test(arg1, Opnd::UImm(RUBY_FIXNUM_FLAG as u64));
 
         jit_chain_guard(
             JCC_JZ,
             jit,
             asm,
-            ocb,
             SEND_MAX_DEPTH,
             counter,
         );
@@ -2810,7 +3574,6 @@ type CmovFn = fn(cb: &mut Assembler, opnd0: Opnd, opnd1: Opnd) -> Opnd;
 fn gen_fixnum_cmp(
     jit: &mut JITState,
     asm: &mut Assembler,
-    ocb: &mut OutlinedCb,
     cmov_op: CmovFn,
     bop: ruby_basic_operators,
 ) -> Option<CodegenStatus> {
@@ -2818,18 +3581,17 @@ fn gen_fixnum_cmp(
         Some(two_fixnums) => two_fixnums,
         None => {
             // Defer compilation so we can specialize based on a runtime receiver
-            defer_compilation(jit, asm, ocb);
-            return Some(EndBlock);
+            return jit.defer_compilation(asm);
         }
     };
 
     if two_fixnums {
-        if !assume_bop_not_redefined(jit, asm, ocb, INTEGER_REDEFINED_OP_FLAG, bop) {
+        if !assume_bop_not_redefined(jit, asm, INTEGER_REDEFINED_OP_FLAG, bop) {
             return None;
         }
 
         // Check that both operands are fixnums
-        guard_two_fixnums(jit, asm, ocb);
+        guard_two_fixnums(jit, asm);
 
         // Get the operands from the stack
         let arg1 = asm.stack_pop(1);
@@ -2845,40 +3607,36 @@ fn gen_fixnum_cmp(
 
         Some(KeepCompiling)
     } else {
-        gen_opt_send_without_block(jit, asm, ocb)
+        gen_opt_send_without_block(jit, asm)
     }
 }
 
 fn gen_opt_lt(
     jit: &mut JITState,
     asm: &mut Assembler,
-    ocb: &mut OutlinedCb,
 ) -> Option<CodegenStatus> {
-    gen_fixnum_cmp(jit, asm, ocb, Assembler::csel_l, BOP_LT)
+    gen_fixnum_cmp(jit, asm, Assembler::csel_l, BOP_LT)
 }
 
 fn gen_opt_le(
     jit: &mut JITState,
     asm: &mut Assembler,
-    ocb: &mut OutlinedCb,
 ) -> Option<CodegenStatus> {
-    gen_fixnum_cmp(jit, asm, ocb, Assembler::csel_le, BOP_LE)
+    gen_fixnum_cmp(jit, asm, Assembler::csel_le, BOP_LE)
 }
 
 fn gen_opt_ge(
     jit: &mut JITState,
     asm: &mut Assembler,
-    ocb: &mut OutlinedCb,
 ) -> Option<CodegenStatus> {
-    gen_fixnum_cmp(jit, asm, ocb, Assembler::csel_ge, BOP_GE)
+    gen_fixnum_cmp(jit, asm, Assembler::csel_ge, BOP_GE)
 }
 
 fn gen_opt_gt(
     jit: &mut JITState,
     asm: &mut Assembler,
-    ocb: &mut OutlinedCb,
 ) -> Option<CodegenStatus> {
-    gen_fixnum_cmp(jit, asm, ocb, Assembler::csel_g, BOP_GT)
+    gen_fixnum_cmp(jit, asm, Assembler::csel_g, BOP_GT)
 }
 
 // Implements specialized equality for either two fixnum or two strings
@@ -2887,7 +3645,6 @@ fn gen_opt_gt(
 fn gen_equality_specialized(
     jit: &mut JITState,
     asm: &mut Assembler,
-    ocb: &mut OutlinedCb,
     gen_eq: bool,
 ) -> Option<bool> {
     let a_opnd = asm.stack_opnd(1);
@@ -2899,12 +3656,12 @@ fn gen_equality_specialized(
     };
 
     if two_fixnums {
-        if !assume_bop_not_redefined(jit, asm, ocb, INTEGER_REDEFINED_OP_FLAG, BOP_EQ) {
+        if !assume_bop_not_redefined(jit, asm, INTEGER_REDEFINED_OP_FLAG, BOP_EQ) {
             // if overridden, emit the generic version
             return Some(false);
         }
 
-        guard_two_fixnums(jit, asm, ocb);
+        guard_two_fixnums(jit, asm);
 
         asm.cmp(a_opnd, b_opnd);
         let val = if gen_eq {
@@ -2921,14 +3678,14 @@ fn gen_equality_specialized(
         return Some(true);
     }
 
-    if !jit.at_current_insn() {
+    if !jit.at_compile_target() {
         return None;
     }
     let comptime_a = jit.peek_at_stack(&asm.ctx, 1);
     let comptime_b = jit.peek_at_stack(&asm.ctx, 0);
 
     if unsafe { comptime_a.class_of() == rb_cString && comptime_b.class_of() == rb_cString } {
-        if !assume_bop_not_redefined(jit, asm, ocb, STRING_REDEFINED_OP_FLAG, BOP_EQ) {
+        if !assume_bop_not_redefined(jit, asm, STRING_REDEFINED_OP_FLAG, BOP_EQ) {
             // if overridden, emit the generic version
             return Some(false);
         }
@@ -2937,7 +3694,6 @@ fn gen_equality_specialized(
         jit_guard_known_klass(
             jit,
             asm,
-            ocb,
             unsafe { rb_cString },
             a_opnd,
             a_opnd.into(),
@@ -2950,7 +3706,7 @@ fn gen_equality_specialized(
         let ret = asm.new_label("ret");
 
         // Spill for ccall. For safety, unconditionally spill temps before branching.
-        asm.spill_temps();
+        asm.spill_regs();
 
         // If they are equal by identity, return true
         asm.cmp(a_opnd, b_opnd);
@@ -2964,7 +3720,6 @@ fn gen_equality_specialized(
             jit_guard_known_klass(
                 jit,
                 asm,
-                ocb,
                 unsafe { rb_cString },
                 b_opnd,
                 b_opnd.into(),
@@ -3000,54 +3755,48 @@ fn gen_equality_specialized(
 fn gen_opt_eq(
     jit: &mut JITState,
     asm: &mut Assembler,
-    ocb: &mut OutlinedCb,
 ) -> Option<CodegenStatus> {
-    let specialized = match gen_equality_specialized(jit, asm, ocb, true) {
+    let specialized = match gen_equality_specialized(jit, asm, true) {
         Some(specialized) => specialized,
         None => {
             // Defer compilation so we can specialize base on a runtime receiver
-            defer_compilation(jit, asm, ocb);
-            return Some(EndBlock);
+            return jit.defer_compilation(asm);
         }
     };
 
     if specialized {
-        jump_to_next_insn(jit, asm, ocb);
-        Some(EndBlock)
+        jump_to_next_insn(jit, asm)
     } else {
-        gen_opt_send_without_block(jit, asm, ocb)
+        gen_opt_send_without_block(jit, asm)
     }
 }
 
 fn gen_opt_neq(
     jit: &mut JITState,
     asm: &mut Assembler,
-    ocb: &mut OutlinedCb,
 ) -> Option<CodegenStatus> {
     // opt_neq is passed two rb_call_data as arguments:
     // first for ==, second for !=
     let cd = jit.get_arg(1).as_ptr();
-    return gen_send_general(jit, asm, ocb, cd, None);
+    perf_call! { gen_send_general(jit, asm, cd, None) }
 }
 
 fn gen_opt_aref(
     jit: &mut JITState,
     asm: &mut Assembler,
-    ocb: &mut OutlinedCb,
 ) -> Option<CodegenStatus> {
     let cd: *const rb_call_data = jit.get_arg(0).as_ptr();
     let argc = unsafe { vm_ci_argc((*cd).ci) };
 
     // Only JIT one arg calls like `ary[6]`
     if argc != 1 {
-        gen_counter_incr(asm, Counter::opt_aref_argc_not_one);
+        gen_counter_incr(jit, asm, Counter::opt_aref_argc_not_one);
         return None;
     }
 
     // Defer compilation so we can specialize base on a runtime receiver
-    if !jit.at_current_insn() {
-        defer_compilation(jit, asm, ocb);
-        return Some(EndBlock);
+    if !jit.at_compile_target() {
+        return jit.defer_compilation(asm);
     }
 
     // Specialize base on compile time values
@@ -3055,7 +3804,7 @@ fn gen_opt_aref(
     let comptime_recv = jit.peek_at_stack(&asm.ctx, 1);
 
     if comptime_recv.class_of() == unsafe { rb_cArray } && comptime_idx.fixnum_p() {
-        if !assume_bop_not_redefined(jit, asm, ocb, ARRAY_REDEFINED_OP_FLAG, BOP_AREF) {
+        if !assume_bop_not_redefined(jit, asm, ARRAY_REDEFINED_OP_FLAG, BOP_AREF) {
             return None;
         }
 
@@ -3068,7 +3817,6 @@ fn gen_opt_aref(
         jit_guard_known_klass(
             jit,
             asm,
-            ocb,
             unsafe { rb_cArray },
             recv_opnd,
             recv_opnd.into(),
@@ -3097,10 +3845,9 @@ fn gen_opt_aref(
         }
 
         // Jump to next instruction. This allows guard chains to share the same successor.
-        jump_to_next_insn(jit, asm, ocb);
-        return Some(EndBlock);
+        return jump_to_next_insn(jit, asm);
     } else if comptime_recv.class_of() == unsafe { rb_cHash } {
-        if !assume_bop_not_redefined(jit, asm, ocb, HASH_REDEFINED_OP_FLAG, BOP_AREF) {
+        if !assume_bop_not_redefined(jit, asm, HASH_REDEFINED_OP_FLAG, BOP_AREF) {
             return None;
         }
 
@@ -3110,7 +3857,6 @@ fn gen_opt_aref(
         jit_guard_known_klass(
             jit,
             asm,
-            ocb,
             unsafe { rb_cHash },
             recv_opnd,
             recv_opnd.into(),
@@ -3120,7 +3866,7 @@ fn gen_opt_aref(
         );
 
         // Prepare to call rb_hash_aref(). It might call #hash on the key.
-        jit_prepare_routine_call(jit, asm);
+        jit_prepare_non_leaf_call(jit, asm);
 
         // Call rb_hash_aref
         let key_opnd = asm.stack_opnd(0);
@@ -3135,23 +3881,54 @@ fn gen_opt_aref(
         asm.mov(stack_ret, val);
 
         // Jump to next instruction. This allows guard chains to share the same successor.
-        jump_to_next_insn(jit, asm, ocb);
-        Some(EndBlock)
+        jump_to_next_insn(jit, asm)
     } else {
         // General case. Call the [] method.
-        gen_opt_send_without_block(jit, asm, ocb)
+        gen_opt_send_without_block(jit, asm)
+    }
+}
+
+fn gen_opt_aset_with(
+    jit: &mut JITState,
+    asm: &mut Assembler,
+) -> Option<CodegenStatus> {
+    // We might allocate or raise
+    jit_prepare_non_leaf_call(jit, asm);
+
+    let key_opnd = Opnd::Value(jit.get_arg(0));
+    let recv_opnd = asm.stack_opnd(1);
+    let value_opnd = asm.stack_opnd(0);
+
+    extern "C" {
+        fn rb_vm_opt_aset_with(recv: VALUE, key: VALUE, value: VALUE) -> VALUE;
     }
+
+    let val_opnd = asm.ccall(
+        rb_vm_opt_aset_with as *const u8,
+        vec![
+            recv_opnd,
+            key_opnd,
+            value_opnd,
+        ],
+    );
+    asm.stack_pop(2); // Keep it on stack during GC
+
+    asm.cmp(val_opnd, Qundef.into());
+    asm.je(Target::side_exit(Counter::opt_aset_with_qundef));
+
+    let top = asm.stack_push(Type::Unknown);
+    asm.mov(top, val_opnd);
+
+    return Some(KeepCompiling);
 }
 
 fn gen_opt_aset(
     jit: &mut JITState,
     asm: &mut Assembler,
-    ocb: &mut OutlinedCb,
 ) -> Option<CodegenStatus> {
     // Defer compilation so we can specialize on a runtime `self`
-    if !jit.at_current_insn() {
-        defer_compilation(jit, asm, ocb);
-        return Some(EndBlock);
+    if !jit.at_compile_target() {
+        return jit.defer_compilation(asm);
     }
 
     let comptime_recv = jit.peek_at_stack(&asm.ctx, 2);
@@ -3167,7 +3944,6 @@ fn gen_opt_aset(
         jit_guard_known_klass(
             jit,
             asm,
-            ocb,
             unsafe { rb_cArray },
             recv,
             recv.into(),
@@ -3180,7 +3956,6 @@ fn gen_opt_aset(
         jit_guard_known_klass(
             jit,
             asm,
-            ocb,
             unsafe { rb_cInteger },
             key,
             key.into(),
@@ -3190,7 +3965,7 @@ fn gen_opt_aset(
         );
 
         // We might allocate or raise
-        jit_prepare_routine_call(jit, asm);
+        jit_prepare_non_leaf_call(jit, asm);
 
         // Call rb_ary_store
         let recv = asm.stack_opnd(2);
@@ -3208,14 +3983,12 @@ fn gen_opt_aset(
         let stack_ret = asm.stack_push(Type::Unknown);
         asm.mov(stack_ret, val);
 
-        jump_to_next_insn(jit, asm, ocb);
-        return Some(EndBlock);
+        return jump_to_next_insn(jit, asm)
     } else if comptime_recv.class_of() == unsafe { rb_cHash } {
         // Guard receiver is a Hash
         jit_guard_known_klass(
             jit,
             asm,
-            ocb,
             unsafe { rb_cHash },
             recv,
             recv.into(),
@@ -3225,7 +3998,7 @@ fn gen_opt_aset(
         );
 
         // We might allocate or raise
-        jit_prepare_routine_call(jit, asm);
+        jit_prepare_non_leaf_call(jit, asm);
 
         // Call rb_hash_aset
         let recv = asm.stack_opnd(2);
@@ -3238,22 +4011,21 @@ fn gen_opt_aset(
         let stack_ret = asm.stack_push(Type::Unknown);
         asm.mov(stack_ret, ret);
 
-        jump_to_next_insn(jit, asm, ocb);
-        Some(EndBlock)
+        jump_to_next_insn(jit, asm)
     } else {
-        gen_opt_send_without_block(jit, asm, ocb)
+        gen_opt_send_without_block(jit, asm)
     }
 }
 
 fn gen_opt_aref_with(
     jit: &mut JITState,
     asm: &mut Assembler,
-    _ocb: &mut OutlinedCb,
 ) -> Option<CodegenStatus>{
-    jit_prepare_routine_call(jit, asm);
+    // We might allocate or raise
+    jit_prepare_non_leaf_call(jit, asm);
 
     let key_opnd = Opnd::Value(jit.get_arg(0));
-    let recv_opnd = asm.stack_pop(1);
+    let recv_opnd = asm.stack_opnd(0);
 
     extern "C" {
         fn rb_vm_opt_aref_with(recv: VALUE, key: VALUE) -> VALUE;
@@ -3266,6 +4038,7 @@ fn gen_opt_aref_with(
             key_opnd
         ],
     );
+    asm.stack_pop(1); // Keep it on stack during GC
 
     asm.cmp(val_opnd, Qundef.into());
     asm.je(Target::side_exit(Counter::opt_aref_with_qundef));
@@ -3279,24 +4052,22 @@ fn gen_opt_aref_with(
 fn gen_opt_and(
     jit: &mut JITState,
     asm: &mut Assembler,
-    ocb: &mut OutlinedCb,
 ) -> Option<CodegenStatus> {
     let two_fixnums = match asm.ctx.two_fixnums_on_stack(jit) {
         Some(two_fixnums) => two_fixnums,
         None => {
             // Defer compilation so we can specialize on a runtime `self`
-            defer_compilation(jit, asm, ocb);
-            return Some(EndBlock);
+            return jit.defer_compilation(asm);
         }
     };
 
     if two_fixnums {
-        if !assume_bop_not_redefined(jit, asm, ocb, INTEGER_REDEFINED_OP_FLAG, BOP_AND) {
+        if !assume_bop_not_redefined(jit, asm, INTEGER_REDEFINED_OP_FLAG, BOP_AND) {
             return None;
         }
 
         // Check that both operands are fixnums
-        guard_two_fixnums(jit, asm, ocb);
+        guard_two_fixnums(jit, asm);
 
         // Get the operands and destination from the stack
         let arg1 = asm.stack_pop(1);
@@ -3307,36 +4078,34 @@ fn gen_opt_and(
 
         // Push the output on the stack
         let dst = asm.stack_push(Type::Fixnum);
-        asm.store(dst, val);
+        asm.mov(dst, val);
 
         Some(KeepCompiling)
     } else {
         // Delegate to send, call the method on the recv
-        gen_opt_send_without_block(jit, asm, ocb)
+        gen_opt_send_without_block(jit, asm)
     }
 }
 
 fn gen_opt_or(
     jit: &mut JITState,
     asm: &mut Assembler,
-    ocb: &mut OutlinedCb,
 ) -> Option<CodegenStatus> {
     let two_fixnums = match asm.ctx.two_fixnums_on_stack(jit) {
         Some(two_fixnums) => two_fixnums,
         None => {
             // Defer compilation so we can specialize on a runtime `self`
-            defer_compilation(jit, asm, ocb);
-            return Some(EndBlock);
+            return jit.defer_compilation(asm);
         }
     };
 
     if two_fixnums {
-        if !assume_bop_not_redefined(jit, asm, ocb, INTEGER_REDEFINED_OP_FLAG, BOP_OR) {
+        if !assume_bop_not_redefined(jit, asm, INTEGER_REDEFINED_OP_FLAG, BOP_OR) {
             return None;
         }
 
         // Check that both operands are fixnums
-        guard_two_fixnums(jit, asm, ocb);
+        guard_two_fixnums(jit, asm);
 
         // Get the operands and destination from the stack
         let arg1 = asm.stack_pop(1);
@@ -3347,36 +4116,34 @@ fn gen_opt_or(
 
         // Push the output on the stack
         let dst = asm.stack_push(Type::Fixnum);
-        asm.store(dst, val);
+        asm.mov(dst, val);
 
         Some(KeepCompiling)
     } else {
         // Delegate to send, call the method on the recv
-        gen_opt_send_without_block(jit, asm, ocb)
+        gen_opt_send_without_block(jit, asm)
     }
 }
 
 fn gen_opt_minus(
     jit: &mut JITState,
     asm: &mut Assembler,
-    ocb: &mut OutlinedCb,
 ) -> Option<CodegenStatus> {
     let two_fixnums = match asm.ctx.two_fixnums_on_stack(jit) {
         Some(two_fixnums) => two_fixnums,
         None => {
             // Defer compilation so we can specialize on a runtime `self`
-            defer_compilation(jit, asm, ocb);
-            return Some(EndBlock);
+            return jit.defer_compilation(asm);
         }
     };
 
     if two_fixnums {
-        if !assume_bop_not_redefined(jit, asm, ocb, INTEGER_REDEFINED_OP_FLAG, BOP_MINUS) {
+        if !assume_bop_not_redefined(jit, asm, INTEGER_REDEFINED_OP_FLAG, BOP_MINUS) {
             return None;
         }
 
         // Check that both operands are fixnums
-        guard_two_fixnums(jit, asm, ocb);
+        guard_two_fixnums(jit, asm);
 
         // Get the operands and destination from the stack
         let arg1 = asm.stack_pop(1);
@@ -3389,35 +4156,34 @@ fn gen_opt_minus(
 
         // Push the output on the stack
         let dst = asm.stack_push(Type::Fixnum);
-        asm.store(dst, val);
+        asm.mov(dst, val);
 
         Some(KeepCompiling)
     } else {
         // Delegate to send, call the method on the recv
-        gen_opt_send_without_block(jit, asm, ocb)
+        gen_opt_send_without_block(jit, asm)
     }
 }
 
 fn gen_opt_mult(
     jit: &mut JITState,
     asm: &mut Assembler,
-    ocb: &mut OutlinedCb,
 ) -> Option<CodegenStatus> {
     let two_fixnums = match asm.ctx.two_fixnums_on_stack(jit) {
         Some(two_fixnums) => two_fixnums,
         None => {
-            defer_compilation(jit, asm, ocb);
-            return Some(EndBlock);
+            return jit.defer_compilation(asm);
         }
     };
 
-    if two_fixnums {
-        if !assume_bop_not_redefined(jit, asm, ocb, INTEGER_REDEFINED_OP_FLAG, BOP_MULT) {
+    // Fallback to a method call if it overflows
+    if two_fixnums && asm.ctx.get_chain_depth() == 0 {
+        if !assume_bop_not_redefined(jit, asm, INTEGER_REDEFINED_OP_FLAG, BOP_MULT) {
             return None;
         }
 
         // Check that both operands are fixnums
-        guard_two_fixnums(jit, asm, ocb);
+        guard_two_fixnums(jit, asm);
 
         // Get the operands from the stack
         let arg1 = asm.stack_pop(1);
@@ -3428,7 +4194,7 @@ fn gen_opt_mult(
         let arg0_untag = asm.rshift(arg0, Opnd::UImm(1));
         let arg1_untag = asm.sub(arg1, Opnd::UImm(1));
         let out_val = asm.mul(arg0_untag, arg1_untag);
-        asm.jo(Target::side_exit(Counter::opt_mult_overflow));
+        jit_chain_guard(JCC_JO_MUL, jit, asm, 1, Counter::opt_mult_overflow);
         let out_val = asm.add(out_val, Opnd::UImm(1));
 
         // Push the output on the stack
@@ -3437,40 +4203,37 @@ fn gen_opt_mult(
 
         Some(KeepCompiling)
     } else {
-        gen_opt_send_without_block(jit, asm, ocb)
+        gen_opt_send_without_block(jit, asm)
     }
 }
 
 fn gen_opt_div(
     jit: &mut JITState,
     asm: &mut Assembler,
-    ocb: &mut OutlinedCb,
 ) -> Option<CodegenStatus> {
     // Delegate to send, call the method on the recv
-    gen_opt_send_without_block(jit, asm, ocb)
+    gen_opt_send_without_block(jit, asm)
 }
 
 fn gen_opt_mod(
     jit: &mut JITState,
     asm: &mut Assembler,
-    ocb: &mut OutlinedCb,
 ) -> Option<CodegenStatus> {
     let two_fixnums = match asm.ctx.two_fixnums_on_stack(jit) {
         Some(two_fixnums) => two_fixnums,
         None => {
             // Defer compilation so we can specialize on a runtime `self`
-            defer_compilation(jit, asm, ocb);
-            return Some(EndBlock);
+            return jit.defer_compilation(asm);
         }
     };
 
     if two_fixnums {
-        if !assume_bop_not_redefined(jit, asm, ocb, INTEGER_REDEFINED_OP_FLAG, BOP_MOD) {
+        if !assume_bop_not_redefined(jit, asm, INTEGER_REDEFINED_OP_FLAG, BOP_MOD) {
             return None;
         }
 
         // Check that both operands are fixnums
-        guard_two_fixnums(jit, asm, ocb);
+        guard_two_fixnums(jit, asm);
 
         // Get the operands and destination from the stack
         let arg1 = asm.stack_pop(1);
@@ -3491,52 +4254,47 @@ fn gen_opt_mod(
         Some(KeepCompiling)
     } else {
         // Delegate to send, call the method on the recv
-        gen_opt_send_without_block(jit, asm, ocb)
+        gen_opt_send_without_block(jit, asm)
     }
 }
 
 fn gen_opt_ltlt(
     jit: &mut JITState,
     asm: &mut Assembler,
-    ocb: &mut OutlinedCb,
 ) -> Option<CodegenStatus> {
     // Delegate to send, call the method on the recv
-    gen_opt_send_without_block(jit, asm, ocb)
+    gen_opt_send_without_block(jit, asm)
 }
 
 fn gen_opt_nil_p(
     jit: &mut JITState,
     asm: &mut Assembler,
-    ocb: &mut OutlinedCb,
 ) -> Option<CodegenStatus> {
     // Delegate to send, call the method on the recv
-    gen_opt_send_without_block(jit, asm, ocb)
+    gen_opt_send_without_block(jit, asm)
 }
 
 fn gen_opt_empty_p(
     jit: &mut JITState,
     asm: &mut Assembler,
-    ocb: &mut OutlinedCb,
 ) -> Option<CodegenStatus> {
     // Delegate to send, call the method on the recv
-    gen_opt_send_without_block(jit, asm, ocb)
+    gen_opt_send_without_block(jit, asm)
 }
 
 fn gen_opt_succ(
     jit: &mut JITState,
     asm: &mut Assembler,
-    ocb: &mut OutlinedCb,
 ) -> Option<CodegenStatus> {
     // Delegate to send, call the method on the recv
-    gen_opt_send_without_block(jit, asm, ocb)
+    gen_opt_send_without_block(jit, asm)
 }
 
 fn gen_opt_str_freeze(
     jit: &mut JITState,
     asm: &mut Assembler,
-    ocb: &mut OutlinedCb,
 ) -> Option<CodegenStatus> {
-    if !assume_bop_not_redefined(jit, asm, ocb, STRING_REDEFINED_OP_FLAG, BOP_FREEZE) {
+    if !assume_bop_not_redefined(jit, asm, STRING_REDEFINED_OP_FLAG, BOP_FREEZE) {
         return None;
     }
 
@@ -3549,12 +4307,45 @@ fn gen_opt_str_freeze(
     Some(KeepCompiling)
 }
 
+fn gen_opt_ary_freeze(
+    jit: &mut JITState,
+    asm: &mut Assembler,
+) -> Option<CodegenStatus> {
+    if !assume_bop_not_redefined(jit, asm, ARRAY_REDEFINED_OP_FLAG, BOP_FREEZE) {
+        return None;
+    }
+
+    let str = jit.get_arg(0);
+
+    // Push the return value onto the stack
+    let stack_ret = asm.stack_push(Type::CArray);
+    asm.mov(stack_ret, str.into());
+
+    Some(KeepCompiling)
+}
+
+fn gen_opt_hash_freeze(
+    jit: &mut JITState,
+    asm: &mut Assembler,
+) -> Option<CodegenStatus> {
+    if !assume_bop_not_redefined(jit, asm, HASH_REDEFINED_OP_FLAG, BOP_FREEZE) {
+        return None;
+    }
+
+    let str = jit.get_arg(0);
+
+    // Push the return value onto the stack
+    let stack_ret = asm.stack_push(Type::CHash);
+    asm.mov(stack_ret, str.into());
+
+    Some(KeepCompiling)
+}
+
 fn gen_opt_str_uminus(
     jit: &mut JITState,
     asm: &mut Assembler,
-    ocb: &mut OutlinedCb,
 ) -> Option<CodegenStatus> {
-    if !assume_bop_not_redefined(jit, asm, ocb, STRING_REDEFINED_OP_FLAG, BOP_UMINUS) {
+    if !assume_bop_not_redefined(jit, asm, STRING_REDEFINED_OP_FLAG, BOP_UMINUS) {
         return None;
     }
 
@@ -3570,19 +4361,17 @@ fn gen_opt_str_uminus(
 fn gen_opt_newarray_max(
     jit: &mut JITState,
     asm: &mut Assembler,
-    _ocb: &mut OutlinedCb,
 ) -> Option<CodegenStatus> {
     let num = jit.get_arg(0).as_u32();
 
-    // Save the PC and SP because we may allocate
-    jit_prepare_routine_call(jit, asm);
+    // Save the PC and SP because we may call #max
+    jit_prepare_non_leaf_call(jit, asm);
 
     extern "C" {
         fn rb_vm_opt_newarray_max(ec: EcPtr, num: u32, elts: *const VALUE) -> VALUE;
     }
 
-    let offset_magnitude = (SIZEOF_VALUE as u32) * num;
-    let values_opnd = asm.ctx.sp_opnd(-(offset_magnitude as isize));
+    let values_opnd = asm.ctx.sp_opnd(-(num as i32));
     let values_ptr = asm.lea(values_opnd);
 
     let val_opnd = asm.ccall(
@@ -3601,41 +4390,134 @@ fn gen_opt_newarray_max(
     Some(KeepCompiling)
 }
 
+fn gen_opt_duparray_send(
+    jit: &mut JITState,
+    asm: &mut Assembler,
+) -> Option<CodegenStatus> {
+    let method = jit.get_arg(1).as_u64();
+
+    if method == ID!(include_p) {
+        gen_opt_duparray_send_include_p(jit, asm)
+    } else {
+        None
+    }
+}
+
+fn gen_opt_duparray_send_include_p(
+    jit: &mut JITState,
+    asm: &mut Assembler,
+) -> Option<CodegenStatus> {
+    asm_comment!(asm, "opt_duparray_send include_p");
+
+    let ary = jit.get_arg(0);
+    let argc = jit.get_arg(2).as_usize();
+
+    // Save the PC and SP because we may call #include?
+    jit_prepare_non_leaf_call(jit, asm);
+
+    extern "C" {
+        fn rb_vm_opt_duparray_include_p(ec: EcPtr, ary: VALUE, target: VALUE) -> VALUE;
+    }
+
+    let target = asm.ctx.sp_opnd(-1);
+
+    let val_opnd = asm.ccall(
+        rb_vm_opt_duparray_include_p as *const u8,
+        vec![
+            EC,
+            ary.into(),
+            target,
+        ],
+    );
+
+    asm.stack_pop(argc);
+    let stack_ret = asm.stack_push(Type::Unknown);
+    asm.mov(stack_ret, val_opnd);
+
+    Some(KeepCompiling)
+}
+
 fn gen_opt_newarray_send(
     jit: &mut JITState,
     asm: &mut Assembler,
-    _ocb: &mut OutlinedCb,
 ) -> Option<CodegenStatus> {
     let method = jit.get_arg(1).as_u32();
 
-    if method == idMin {
-        gen_opt_newarray_min(jit, asm, _ocb)
-    } else if method == idMax {
-        gen_opt_newarray_max(jit, asm, _ocb)
-    } else if method == idHash {
-        gen_opt_newarray_hash(jit, asm, _ocb)
+    if method == VM_OPT_NEWARRAY_SEND_MIN {
+        gen_opt_newarray_min(jit, asm)
+    } else if method == VM_OPT_NEWARRAY_SEND_MAX {
+        gen_opt_newarray_max(jit, asm)
+    } else if method == VM_OPT_NEWARRAY_SEND_HASH {
+        gen_opt_newarray_hash(jit, asm)
+    } else if method == VM_OPT_NEWARRAY_SEND_INCLUDE_P {
+        gen_opt_newarray_include_p(jit, asm)
+    } else if method == VM_OPT_NEWARRAY_SEND_PACK {
+        gen_opt_newarray_pack_buffer(jit, asm, 1, None)
+    } else if method == VM_OPT_NEWARRAY_SEND_PACK_BUFFER {
+        gen_opt_newarray_pack_buffer(jit, asm, 2, Some(1))
     } else {
         None
     }
 }
 
+fn gen_opt_newarray_pack_buffer(
+    jit: &mut JITState,
+    asm: &mut Assembler,
+    fmt_offset: u32,
+    buffer: Option<u32>,
+) -> Option<CodegenStatus> {
+    asm_comment!(asm, "opt_newarray_send pack");
+
+    let num = jit.get_arg(0).as_u32();
+
+    // Save the PC and SP because we may call #pack
+    jit_prepare_non_leaf_call(jit, asm);
+
+    extern "C" {
+        fn rb_vm_opt_newarray_pack_buffer(ec: EcPtr, num: u32, elts: *const VALUE, fmt: VALUE, buffer: VALUE) -> VALUE;
+    }
+
+    let values_opnd = asm.ctx.sp_opnd(-(num as i32));
+    let values_ptr = asm.lea(values_opnd);
+
+    let fmt_string = asm.ctx.sp_opnd(-(fmt_offset as i32));
+
+    let val_opnd = asm.ccall(
+        rb_vm_opt_newarray_pack_buffer as *const u8,
+        vec![
+            EC,
+            (num - fmt_offset).into(),
+            values_ptr,
+            fmt_string,
+            match buffer {
+                None => Qundef.into(),
+                Some(i) => asm.ctx.sp_opnd(-(i as i32)),
+            },
+        ],
+    );
+
+    asm.stack_pop(num.as_usize());
+    let stack_ret = asm.stack_push(Type::CString);
+    asm.mov(stack_ret, val_opnd);
+
+    Some(KeepCompiling)
+}
+
 fn gen_opt_newarray_hash(
     jit: &mut JITState,
     asm: &mut Assembler,
-    _ocb: &mut OutlinedCb,
 ) -> Option<CodegenStatus> {
 
     let num = jit.get_arg(0).as_u32();
 
-    // Save the PC and SP because we may allocate
-    jit_prepare_routine_call(jit, asm);
+    // Save the PC and SP because we may call #hash
+    jit_prepare_non_leaf_call(jit, asm);
 
     extern "C" {
         fn rb_vm_opt_newarray_hash(ec: EcPtr, num: u32, elts: *const VALUE) -> VALUE;
     }
 
-    let offset_magnitude = (SIZEOF_VALUE as u32) * num;
-    let values_opnd = asm.ctx.sp_opnd(-(offset_magnitude as isize));
+    let values_opnd = asm.ctx.sp_opnd(-(num as i32));
     let values_ptr = asm.lea(values_opnd);
 
     let val_opnd = asm.ccall(
@@ -3654,23 +4536,57 @@ fn gen_opt_newarray_hash(
     Some(KeepCompiling)
 }
 
+fn gen_opt_newarray_include_p(
+    jit: &mut JITState,
+    asm: &mut Assembler,
+) -> Option<CodegenStatus> {
+    asm_comment!(asm, "opt_newarray_send include?");
+
+    let num = jit.get_arg(0).as_u32();
+
+    // Save the PC and SP because we may call customized methods.
+    jit_prepare_non_leaf_call(jit, asm);
+
+    extern "C" {
+        fn rb_vm_opt_newarray_include_p(ec: EcPtr, num: u32, elts: *const VALUE, target: VALUE) -> VALUE;
+    }
+
+    let values_opnd = asm.ctx.sp_opnd(-(num as i32));
+    let values_ptr = asm.lea(values_opnd);
+    let target = asm.ctx.sp_opnd(-1);
+
+    let val_opnd = asm.ccall(
+        rb_vm_opt_newarray_include_p as *const u8,
+        vec![
+            EC,
+            (num - 1).into(),
+            values_ptr,
+            target
+        ],
+    );
+
+    asm.stack_pop(num.as_usize());
+    let stack_ret = asm.stack_push(Type::Unknown);
+    asm.mov(stack_ret, val_opnd);
+
+    Some(KeepCompiling)
+}
+
 fn gen_opt_newarray_min(
     jit: &mut JITState,
     asm: &mut Assembler,
-    _ocb: &mut OutlinedCb,
 ) -> Option<CodegenStatus> {
 
     let num = jit.get_arg(0).as_u32();
 
-    // Save the PC and SP because we may allocate
-    jit_prepare_routine_call(jit, asm);
+    // Save the PC and SP because we may call #min
+    jit_prepare_non_leaf_call(jit, asm);
 
     extern "C" {
         fn rb_vm_opt_newarray_min(ec: EcPtr, num: u32, elts: *const VALUE) -> VALUE;
     }
 
-    let offset_magnitude = (SIZEOF_VALUE as u32) * num;
-    let values_opnd = asm.ctx.sp_opnd(-(offset_magnitude as isize));
+    let values_opnd = asm.ctx.sp_opnd(-(num as i32));
     let values_ptr = asm.lea(values_opnd);
 
     let val_opnd = asm.ccall(
@@ -3692,39 +4608,34 @@ fn gen_opt_newarray_min(
 fn gen_opt_not(
     jit: &mut JITState,
     asm: &mut Assembler,
-    ocb: &mut OutlinedCb,
 ) -> Option<CodegenStatus> {
-    return gen_opt_send_without_block(jit, asm, ocb);
+    return gen_opt_send_without_block(jit, asm);
 }
 
 fn gen_opt_size(
     jit: &mut JITState,
     asm: &mut Assembler,
-    ocb: &mut OutlinedCb,
 ) -> Option<CodegenStatus> {
-    return gen_opt_send_without_block(jit, asm, ocb);
+    return gen_opt_send_without_block(jit, asm);
 }
 
 fn gen_opt_length(
     jit: &mut JITState,
     asm: &mut Assembler,
-    ocb: &mut OutlinedCb,
 ) -> Option<CodegenStatus> {
-    return gen_opt_send_without_block(jit, asm, ocb);
+    return gen_opt_send_without_block(jit, asm);
 }
 
 fn gen_opt_regexpmatch2(
     jit: &mut JITState,
     asm: &mut Assembler,
-    ocb: &mut OutlinedCb,
 ) -> Option<CodegenStatus> {
-    return gen_opt_send_without_block(jit, asm, ocb);
+    return gen_opt_send_without_block(jit, asm);
 }
 
 fn gen_opt_case_dispatch(
     jit: &mut JITState,
     asm: &mut Assembler,
-    ocb: &mut OutlinedCb,
 ) -> Option<CodegenStatus> {
     // Normally this instruction would lookup the key in a hash and jump to an
     // offset based on that.
@@ -3733,9 +4644,8 @@ fn gen_opt_case_dispatch(
     // We'd hope that our jitted code will be sufficiently fast without the
     // hash lookup, at least for small hashes, but it's worth revisiting this
     // assumption in the future.
-    if !jit.at_current_insn() {
-        defer_compilation(jit, asm, ocb);
-        return Some(EndBlock);
+    if !jit.at_compile_target() {
+        return jit.defer_compilation(asm);
     }
 
     let case_hash = jit.get_arg(0);
@@ -3765,8 +4675,14 @@ fn gen_opt_case_dispatch(
         all_fixnum
     }
 
-    if comptime_key.fixnum_p() && comptime_key.0 <= u32::MAX.as_usize() && case_hash_all_fixnum_p(case_hash) {
-        if !assume_bop_not_redefined(jit, asm, ocb, INTEGER_REDEFINED_OP_FLAG, BOP_EQQ) {
+    // If megamorphic, fallback to compiling branch instructions after opt_case_dispatch
+    let megamorphic = asm.ctx.get_chain_depth() >= CASE_WHEN_MAX_DEPTH;
+    if megamorphic {
+        gen_counter_incr(jit, asm, Counter::num_opt_case_dispatch_megamorphic);
+    }
+
+    if comptime_key.fixnum_p() && comptime_key.0 <= u32::MAX.as_usize() && case_hash_all_fixnum_p(case_hash) && !megamorphic {
+        if !assume_bop_not_redefined(jit, asm, INTEGER_REDEFINED_OP_FLAG, BOP_EQQ) {
             return None;
         }
 
@@ -3776,7 +4692,6 @@ fn gen_opt_case_dispatch(
             JCC_JNE,
             jit,
             asm,
-            ocb,
             CASE_WHEN_MAX_DEPTH,
             Counter::opt_case_dispatch_megamorphic,
         );
@@ -3806,7 +4721,6 @@ fn gen_opt_case_dispatch(
 fn gen_branchif(
     jit: &mut JITState,
     asm: &mut Assembler,
-    ocb: &mut OutlinedCb,
 ) -> Option<CodegenStatus> {
     let jump_offset = jit.get_arg(0).as_i32();
 
@@ -3842,11 +4756,9 @@ fn gen_branchif(
         asm.test(val_opnd, Opnd::Imm(!Qnil.as_i64()));
 
         // Generate the branch instructions
-        let ctx = asm.ctx.clone();
-        gen_branch(
-            jit,
+        let ctx = asm.ctx;
+        jit.gen_branch(
             asm,
-            ocb,
             jump_block,
             &ctx,
             Some(next_block),
@@ -3861,7 +4773,6 @@ fn gen_branchif(
 fn gen_branchunless(
     jit: &mut JITState,
     asm: &mut Assembler,
-    ocb: &mut OutlinedCb,
 ) -> Option<CodegenStatus> {
     let jump_offset = jit.get_arg(0).as_i32();
 
@@ -3898,11 +4809,9 @@ fn gen_branchunless(
         asm.test(val_opnd, not_qnil.into());
 
         // Generate the branch instructions
-        let ctx = asm.ctx.clone();
-        gen_branch(
-            jit,
+        let ctx = asm.ctx;
+        jit.gen_branch(
             asm,
-            ocb,
             jump_block,
             &ctx,
             Some(next_block),
@@ -3917,7 +4826,6 @@ fn gen_branchunless(
 fn gen_branchnil(
     jit: &mut JITState,
     asm: &mut Assembler,
-    ocb: &mut OutlinedCb,
 ) -> Option<CodegenStatus> {
     let jump_offset = jit.get_arg(0).as_i32();
 
@@ -3951,11 +4859,9 @@ fn gen_branchnil(
         // Test if the value is Qnil
         asm.cmp(val_opnd, Opnd::UImm(Qnil.into()));
         // Generate the branch instructions
-        let ctx = asm.ctx.clone();
-        gen_branch(
-            jit,
+        let ctx = asm.ctx;
+        jit.gen_branch(
             asm,
-            ocb,
             jump_block,
             &ctx,
             Some(next_block),
@@ -3970,23 +4876,22 @@ fn gen_branchnil(
 fn gen_throw(
     jit: &mut JITState,
     asm: &mut Assembler,
-    _ocb: &mut OutlinedCb,
 ) -> Option<CodegenStatus> {
     let throw_state = jit.get_arg(0).as_u64();
     let throwobj = asm.stack_pop(1);
     let throwobj = asm.load(throwobj);
 
     // Gather some statistics about throw
-    gen_counter_incr(asm, Counter::num_throw);
+    gen_counter_incr(jit, asm, Counter::num_throw);
     match (throw_state & VM_THROW_STATE_MASK as u64) as u32 {
-        RUBY_TAG_BREAK => gen_counter_incr(asm, Counter::num_throw_break),
-        RUBY_TAG_RETRY => gen_counter_incr(asm, Counter::num_throw_retry),
-        RUBY_TAG_RETURN => gen_counter_incr(asm, Counter::num_throw_return),
+        RUBY_TAG_BREAK => gen_counter_incr(jit, asm, Counter::num_throw_break),
+        RUBY_TAG_RETRY => gen_counter_incr(jit, asm, Counter::num_throw_retry),
+        RUBY_TAG_RETURN => gen_counter_incr(jit, asm, Counter::num_throw_return),
         _ => {},
     }
 
     // THROW_DATA_NEW allocates. Save SP for GC and PC for allocation tracing as
-    // well as handling the catch table. However, not using jit_prepare_routine_call
+    // well as handling the catch table. However, not using jit_prepare_call_with_gc
     // since we don't need a patch point for this implementation.
     jit_save_pc(jit, asm);
     gen_save_sp(asm);
@@ -3999,7 +4904,7 @@ fn gen_throw(
     }
     let val = asm.ccall(rb_vm_throw as *mut u8, vec![EC, CFP, throw_state.into(), throwobj]);
 
-    asm.comment("exit from throw");
+    asm_comment!(asm, "exit from throw");
     asm.cpop_into(SP);
     asm.cpop_into(EC);
     asm.cpop_into(CFP);
@@ -4010,81 +4915,153 @@ fn gen_throw(
     Some(EndBlock)
 }
 
-fn gen_jump(
+fn gen_opt_new(
     jit: &mut JITState,
     asm: &mut Assembler,
-    _ocb: &mut OutlinedCb,
 ) -> Option<CodegenStatus> {
-    let jump_offset = jit.get_arg(0).as_i32();
+    let cd = jit.get_arg(0).as_ptr();
+    let jump_offset = jit.get_arg(1).as_i32();
 
-    // Check for interrupts, but only on backward branches that may create loops
-    if jump_offset < 0 {
-        gen_check_ints(asm, Counter::jump_interrupted);
+    if !jit.at_compile_target() {
+        return jit.defer_compilation(asm);
     }
 
-    // Get the branch target instruction offsets
-    let jump_idx = jit.next_insn_idx() as i32 + jump_offset;
-    let jump_block = BlockId {
-        iseq: jit.iseq,
-        idx: jump_idx.try_into().unwrap(),
-    };
+    let ci = unsafe { get_call_data_ci(cd) }; // info about the call site
+    let mid = unsafe { vm_ci_mid(ci) };
+    let argc: i32 = unsafe { vm_ci_argc(ci) }.try_into().unwrap();
 
-    // Generate the jump instruction
-    gen_direct_jump(jit, &asm.ctx.clone(), jump_block, asm);
+    let recv_idx = argc;
+    let comptime_recv = jit.peek_at_stack(&asm.ctx, recv_idx as isize);
 
-    Some(EndBlock)
-}
+    // This is a singleton class
+    let comptime_recv_klass = comptime_recv.class_of();
 
-/// Guard that self or a stack operand has the same class as `known_klass`, using
-/// `sample_instance` to speculate about the shape of the runtime value.
-/// FIXNUM and on-heap integers are treated as if they have distinct classes, and
-/// the guard generated for one will fail for the other.
-///
-/// Recompile as contingency if possible, or take side exit a last resort.
-fn jit_guard_known_klass(
-    jit: &mut JITState,
-    asm: &mut Assembler,
-    ocb: &mut OutlinedCb,
-    known_klass: VALUE,
-    obj_opnd: Opnd,
-    insn_opnd: YARVOpnd,
+    let recv = asm.stack_opnd(recv_idx);
+
+    perf_call!("opt_new: ", jit_guard_known_klass(
+        jit,
+        asm,
+        comptime_recv_klass,
+        recv,
+        recv.into(),
+        comptime_recv,
+        SEND_MAX_DEPTH,
+        Counter::guard_send_klass_megamorphic,
+    ));
+
+    // We now know that it's always comptime_recv_klass
+    if jit.assume_expected_cfunc(asm, comptime_recv_klass, mid, rb_class_new_instance_pass_kw as _) {
+        // Fast path
+        // call rb_class_alloc to actually allocate
+        jit_prepare_non_leaf_call(jit, asm);
+        let obj = asm.ccall(rb_obj_alloc as _, vec![comptime_recv.into()]);
+
+        // Get a reference to the stack location where we need to save the
+        // return instance.
+        let result = asm.stack_opnd(recv_idx + 1);
+        let recv = asm.stack_opnd(recv_idx);
+
+        // Replace the receiver for the upcoming initialize call
+        asm.ctx.set_opnd_mapping(recv.into(), TempMapping::MapToStack(Type::UnknownHeap));
+        asm.mov(recv, obj);
+
+        // Save the allocated object for return
+        asm.ctx.set_opnd_mapping(result.into(), TempMapping::MapToStack(Type::UnknownHeap));
+        asm.mov(result, obj);
+
+        jump_to_next_insn(jit, asm)
+    } else {
+        // general case
+
+        // Get the branch target instruction offsets
+        let jump_idx = jit.next_insn_idx() as i32 + jump_offset;
+        return end_block_with_jump(jit, asm, jump_idx as u16);
+    }
+}
+
+fn gen_jump(
+    jit: &mut JITState,
+    asm: &mut Assembler,
+) -> Option<CodegenStatus> {
+    let jump_offset = jit.get_arg(0).as_i32();
+
+    // Check for interrupts, but only on backward branches that may create loops
+    if jump_offset < 0 {
+        gen_check_ints(asm, Counter::jump_interrupted);
+    }
+
+    // Get the branch target instruction offsets
+    let jump_idx = jit.next_insn_idx() as i32 + jump_offset;
+    let jump_block = BlockId {
+        iseq: jit.iseq,
+        idx: jump_idx.try_into().unwrap(),
+    };
+
+    // Generate the jump instruction
+    gen_direct_jump(jit, &asm.ctx.clone(), jump_block, asm);
+
+    Some(EndBlock)
+}
+
+/// Guard that self or a stack operand has the same class as `known_klass`, using
+/// `sample_instance` to speculate about the shape of the runtime value.
+/// FIXNUM and on-heap integers are treated as if they have distinct classes, and
+/// the guard generated for one will fail for the other.
+///
+/// Recompile as contingency if possible, or take side exit a last resort.
+fn jit_guard_known_klass(
+    jit: &mut JITState,
+    asm: &mut Assembler,
+    known_klass: VALUE,
+    obj_opnd: Opnd,
+    insn_opnd: YARVOpnd,
     sample_instance: VALUE,
-    max_chain_depth: i32,
+    max_chain_depth: u8,
     counter: Counter,
 ) {
     let val_type = asm.ctx.get_opnd_type(insn_opnd);
 
     if val_type.known_class() == Some(known_klass) {
-        // We already know from type information that this is a match
-        return;
+        // Unless frozen, Array, Hash, and String objects may change their RBASIC_CLASS
+        // when they get a singleton class. Those types need invalidations.
+        if unsafe { [rb_cArray, rb_cHash, rb_cString].contains(&known_klass) } {
+            if jit.assume_no_singleton_class(asm, known_klass) {
+                // Speculate that this object will not have a singleton class,
+                // and invalidate the block in case it does.
+                return;
+            }
+        } else {
+            // We already know from type information that this is a match
+            return;
+        }
     }
 
     if unsafe { known_klass == rb_cNilClass } {
         assert!(!val_type.is_heap());
         assert!(val_type.is_unknown());
 
-        asm.comment("guard object is nil");
+        asm_comment!(asm, "guard object is nil");
         asm.cmp(obj_opnd, Qnil.into());
-        jit_chain_guard(JCC_JNE, jit, asm, ocb, max_chain_depth, counter);
+        jit_chain_guard(JCC_JNE, jit, asm, max_chain_depth, counter);
 
         asm.ctx.upgrade_opnd_type(insn_opnd, Type::Nil);
     } else if unsafe { known_klass == rb_cTrueClass } {
         assert!(!val_type.is_heap());
         assert!(val_type.is_unknown());
 
-        asm.comment("guard object is true");
+        asm_comment!(asm, "guard object is true");
         asm.cmp(obj_opnd, Qtrue.into());
-        jit_chain_guard(JCC_JNE, jit, asm, ocb, max_chain_depth, counter);
+        jit_chain_guard(JCC_JNE, jit, asm, max_chain_depth, counter);
 
         asm.ctx.upgrade_opnd_type(insn_opnd, Type::True);
     } else if unsafe { known_klass == rb_cFalseClass } {
         assert!(!val_type.is_heap());
         assert!(val_type.is_unknown());
 
-        asm.comment("guard object is false");
+        asm_comment!(asm, "guard object is false");
         assert!(Qfalse.as_i32() == 0);
         asm.test(obj_opnd, obj_opnd);
-        jit_chain_guard(JCC_JNZ, jit, asm, ocb, max_chain_depth, counter);
+        jit_chain_guard(JCC_JNZ, jit, asm, max_chain_depth, counter);
 
         asm.ctx.upgrade_opnd_type(insn_opnd, Type::False);
     } else if unsafe { known_klass == rb_cInteger } && sample_instance.fixnum_p() {
@@ -4092,9 +5069,9 @@ fn jit_guard_known_klass(
         // BIGNUM can be handled by the general else case below
         assert!(val_type.is_unknown());
 
-        asm.comment("guard object is fixnum");
+        asm_comment!(asm, "guard object is fixnum");
         asm.test(obj_opnd, Opnd::Imm(RUBY_FIXNUM_FLAG as i64));
-        jit_chain_guard(JCC_JZ, jit, asm, ocb, max_chain_depth, counter);
+        jit_chain_guard(JCC_JZ, jit, asm, max_chain_depth, counter);
         asm.ctx.upgrade_opnd_type(insn_opnd, Type::Fixnum);
     } else if unsafe { known_klass == rb_cSymbol } && sample_instance.static_sym_p() {
         assert!(!val_type.is_heap());
@@ -4103,10 +5080,10 @@ fn jit_guard_known_klass(
         if val_type != Type::ImmSymbol || !val_type.is_imm() {
             assert!(val_type.is_unknown());
 
-            asm.comment("guard object is static symbol");
+            asm_comment!(asm, "guard object is static symbol");
             assert!(RUBY_SPECIAL_SHIFT == 8);
             asm.cmp(obj_opnd.with_num_bits(8).unwrap(), Opnd::UImm(RUBY_SYMBOL_FLAG as u64));
-            jit_chain_guard(JCC_JNE, jit, asm, ocb, max_chain_depth, counter);
+            jit_chain_guard(JCC_JNE, jit, asm, max_chain_depth, counter);
             asm.ctx.upgrade_opnd_type(insn_opnd, Type::ImmSymbol);
         }
     } else if unsafe { known_klass == rb_cFloat } && sample_instance.flonum_p() {
@@ -4115,10 +5092,10 @@ fn jit_guard_known_klass(
             assert!(val_type.is_unknown());
 
             // We will guard flonum vs heap float as though they were separate classes
-            asm.comment("guard object is flonum");
+            asm_comment!(asm, "guard object is flonum");
             let flag_bits = asm.and(obj_opnd, Opnd::UImm(RUBY_FLONUM_MASK as u64));
             asm.cmp(flag_bits, Opnd::UImm(RUBY_FLONUM_FLAG as u64));
-            jit_chain_guard(JCC_JNE, jit, asm, ocb, max_chain_depth, counter);
+            jit_chain_guard(JCC_JNE, jit, asm, max_chain_depth, counter);
             asm.ctx.upgrade_opnd_type(insn_opnd, Type::Flonum);
         }
     } else if unsafe {
@@ -4138,9 +5115,9 @@ fn jit_guard_known_klass(
         // this situation.
         // Also, guarding by identity is incorrect for IO objects because
         // IO#reopen can be used to change the class and singleton class of IO objects!
-        asm.comment("guard known object with singleton class");
+        asm_comment!(asm, "guard known object with singleton class");
         asm.cmp(obj_opnd, sample_instance.into());
-        jit_chain_guard(JCC_JNE, jit, asm, ocb, max_chain_depth, counter);
+        jit_chain_guard(JCC_JNE, jit, asm, max_chain_depth, counter);
     } else if val_type == Type::CString && unsafe { known_klass == rb_cString } {
         // guard elided because the context says we've already checked
         unsafe {
@@ -4152,11 +5129,11 @@ fn jit_guard_known_klass(
         // Check that the receiver is a heap object
         // Note: if we get here, the class doesn't have immediate instances.
         if !val_type.is_heap() {
-            asm.comment("guard not immediate");
+            asm_comment!(asm, "guard not immediate");
             asm.test(obj_opnd, (RUBY_IMMEDIATE_MASK as u64).into());
-            jit_chain_guard(JCC_JNZ, jit, asm, ocb, max_chain_depth, counter);
+            jit_chain_guard(JCC_JNZ, jit, asm, max_chain_depth, counter);
             asm.cmp(obj_opnd, Qfalse.into());
-            jit_chain_guard(JCC_JE, jit, asm, ocb, max_chain_depth, counter);
+            jit_chain_guard(JCC_JE, jit, asm, max_chain_depth, counter);
 
             asm.ctx.upgrade_opnd_type(insn_opnd, Type::UnknownHeap);
         }
@@ -4170,19 +5147,16 @@ fn jit_guard_known_klass(
 
         // Bail if receiver class is different from known_klass
         // TODO: jit_mov_gc_ptr keeps a strong reference, which leaks the class.
-        asm.comment("guard known class");
+        asm_comment!(asm, "guard known class");
         asm.cmp(klass_opnd, known_klass.into());
-        jit_chain_guard(JCC_JNE, jit, asm, ocb, max_chain_depth, counter);
+        jit_chain_guard(JCC_JNE, jit, asm, max_chain_depth, counter);
 
         if known_klass == unsafe { rb_cString } {
-            // Upgrading to Type::CString here is incorrect.
-            // The guard we put only checks RBASIC_CLASS(obj),
-            // which adding a singleton class can change. We
-            // additionally need to know the string is frozen
-            // to claim Type::CString.
-            asm.ctx.upgrade_opnd_type(insn_opnd, Type::TString);
+            asm.ctx.upgrade_opnd_type(insn_opnd, Type::CString);
         } else if known_klass == unsafe { rb_cArray } {
-            asm.ctx.upgrade_opnd_type(insn_opnd, Type::TArray);
+            asm.ctx.upgrade_opnd_type(insn_opnd, Type::CArray);
+        } else if known_klass == unsafe { rb_cHash } {
+            asm.ctx.upgrade_opnd_type(insn_opnd, Type::CHash);
         }
     }
 }
@@ -4215,25 +5189,24 @@ fn jit_protected_callee_ancestry_guard(
 fn jit_rb_obj_not(
     _jit: &mut JITState,
     asm: &mut Assembler,
-    _ocb: &mut OutlinedCb,
     _ci: *const rb_callinfo,
     _cme: *const rb_callable_method_entry_t,
     _block: Option<BlockHandler>,
     _argc: i32,
-    _known_recv_class: *const VALUE,
+    _known_recv_class: Option<VALUE>,
 ) -> bool {
     let recv_opnd = asm.ctx.get_opnd_type(StackOpnd(0));
 
     match recv_opnd.known_truthy() {
         Some(false) => {
-            asm.comment("rb_obj_not(nil_or_false)");
+            asm_comment!(asm, "rb_obj_not(nil_or_false)");
             asm.stack_pop(1);
             let out_opnd = asm.stack_push(Type::True);
             asm.mov(out_opnd, Qtrue.into());
         },
         Some(true) => {
             // Note: recv_opnd != Type::Nil && recv_opnd != Type::False.
-            asm.comment("rb_obj_not(truthy)");
+            asm_comment!(asm, "rb_obj_not(truthy)");
             asm.stack_pop(1);
             let out_opnd = asm.stack_push(Type::False);
             asm.mov(out_opnd, Qfalse.into());
@@ -4250,14 +5223,13 @@ fn jit_rb_obj_not(
 fn jit_rb_true(
     _jit: &mut JITState,
     asm: &mut Assembler,
-    _ocb: &mut OutlinedCb,
     _ci: *const rb_callinfo,
     _cme: *const rb_callable_method_entry_t,
     _block: Option<BlockHandler>,
     _argc: i32,
-    _known_recv_class: *const VALUE,
+    _known_recv_class: Option<VALUE>,
 ) -> bool {
-    asm.comment("nil? == true");
+    asm_comment!(asm, "nil? == true");
     asm.stack_pop(1);
     let stack_ret = asm.stack_push(Type::True);
     asm.mov(stack_ret, Qtrue.into());
@@ -4268,14 +5240,13 @@ fn jit_rb_true(
 fn jit_rb_false(
     _jit: &mut JITState,
     asm: &mut Assembler,
-    _ocb: &mut OutlinedCb,
     _ci: *const rb_callinfo,
     _cme: *const rb_callable_method_entry_t,
     _block: Option<BlockHandler>,
     _argc: i32,
-    _known_recv_class: *const VALUE,
+    _known_recv_class: Option<VALUE>,
 ) -> bool {
-    asm.comment("nil? == false");
+    asm_comment!(asm, "nil? == false");
     asm.stack_pop(1);
     let stack_ret = asm.stack_push(Type::False);
     asm.mov(stack_ret, Qfalse.into());
@@ -4286,19 +5257,18 @@ fn jit_rb_false(
 fn jit_rb_kernel_is_a(
     jit: &mut JITState,
     asm: &mut Assembler,
-    _ocb: &mut OutlinedCb,
     _ci: *const rb_callinfo,
     _cme: *const rb_callable_method_entry_t,
     _block: Option<BlockHandler>,
     argc: i32,
-    known_recv_class: *const VALUE,
+    known_recv_class: Option<VALUE>,
 ) -> bool {
     if argc != 1 {
         return false;
     }
 
     // If this is a super call we might not know the class
-    if known_recv_class.is_null() {
+    if known_recv_class.is_none() {
         return false;
     }
 
@@ -4313,13 +5283,13 @@ fn jit_rb_kernel_is_a(
     let sample_rhs = jit.peek_at_stack(&asm.ctx, 0);
     let sample_lhs = jit.peek_at_stack(&asm.ctx, 1);
 
-    // We are not allowing module here because the module hierachy can change at runtime.
+    // We are not allowing module here because the module hierarchy can change at runtime.
     if !unsafe { RB_TYPE_P(sample_rhs, RUBY_T_CLASS) } {
         return false;
     }
     let sample_is_a = unsafe { rb_obj_is_kind_of(sample_lhs, sample_rhs) == Qtrue };
 
-    asm.comment("Kernel#is_a?");
+    asm_comment!(asm, "Kernel#is_a?");
     asm.cmp(asm.stack_opnd(0), sample_rhs.into());
     asm.jne(Target::side_exit(Counter::guard_send_is_a_class_mismatch));
 
@@ -4339,19 +5309,18 @@ fn jit_rb_kernel_is_a(
 fn jit_rb_kernel_instance_of(
     jit: &mut JITState,
     asm: &mut Assembler,
-    ocb: &mut OutlinedCb,
     _ci: *const rb_callinfo,
     _cme: *const rb_callable_method_entry_t,
     _block: Option<BlockHandler>,
     argc: i32,
-    known_recv_class: *const VALUE,
+    known_recv_class: Option<VALUE>,
 ) -> bool {
     if argc != 1 {
         return false;
     }
 
     // If this is a super call we might not know the class
-    if known_recv_class.is_null() {
+    if known_recv_class.is_none() {
         return false;
     }
 
@@ -4378,14 +5347,13 @@ fn jit_rb_kernel_instance_of(
 
     let sample_instance_of = sample_lhs_real_class == sample_rhs;
 
-    asm.comment("Kernel#instance_of?");
+    asm_comment!(asm, "Kernel#instance_of?");
     asm.cmp(asm.stack_opnd(0), sample_rhs.into());
     jit_chain_guard(
         JCC_JNE,
         jit,
         asm,
-        ocb,
-        SEND_MAX_CHAIN_DEPTH,
+        SEND_MAX_DEPTH,
         Counter::guard_send_instance_of_class_mismatch,
     );
 
@@ -4404,21 +5372,20 @@ fn jit_rb_kernel_instance_of(
 fn jit_rb_mod_eqq(
     _jit: &mut JITState,
     asm: &mut Assembler,
-    _ocb: &mut OutlinedCb,
     _ci: *const rb_callinfo,
     _cme: *const rb_callable_method_entry_t,
     _block: Option<BlockHandler>,
     argc: i32,
-    _known_recv_class: *const VALUE,
+    _known_recv_class: Option<VALUE>,
 ) -> bool {
     if argc != 1 {
         return false;
     }
 
-    asm.comment("Module#===");
+    asm_comment!(asm, "Module#===");
     // By being here, we know that the receiver is a T_MODULE or a T_CLASS, because Module#=== can
     // only live on these objects. With that, we can call rb_obj_is_kind_of() without
-    // jit_prepare_routine_call() or a control frame push because it can't raise, allocate, or call
+    // jit_prepare_non_leaf_call() or a control frame push because it can't raise, allocate, or call
     // Ruby methods with these inputs.
     // Note the difference in approach from Kernel#is_a? because we don't get a free guard for the
     // right hand side.
@@ -4433,19 +5400,45 @@ fn jit_rb_mod_eqq(
     return true;
 }
 
+// Substitution for rb_mod_name(). Returns the name of a module/class.
+fn jit_rb_mod_name(
+    _jit: &mut JITState,
+    asm: &mut Assembler,
+    _ci: *const rb_callinfo,
+    _cme: *const rb_callable_method_entry_t,
+    _block: Option<BlockHandler>,
+    argc: i32,
+    _known_recv_class: Option<VALUE>,
+) -> bool {
+    if argc != 0 {
+        return false;
+    }
+
+    asm_comment!(asm, "Module#name");
+
+    // rb_mod_name() never allocates, so no preparation needed.
+    let name = asm.ccall(rb_mod_name as _, vec![asm.stack_opnd(0)]);
+
+    let _ = asm.stack_pop(1); // pop self
+    // call-seq: mod.name -> string or nil
+    let ret = asm.stack_push(Type::Unknown);
+    asm.mov(ret, name);
+
+    true
+}
+
 // Codegen for rb_obj_equal()
 // object identity comparison
 fn jit_rb_obj_equal(
     _jit: &mut JITState,
     asm: &mut Assembler,
-    _ocb: &mut OutlinedCb,
     _ci: *const rb_callinfo,
     _cme: *const rb_callable_method_entry_t,
     _block: Option<BlockHandler>,
     _argc: i32,
-    _known_recv_class: *const VALUE,
+    _known_recv_class: Option<VALUE>,
 ) -> bool {
-    asm.comment("equal?");
+    asm_comment!(asm, "equal?");
     let obj1 = asm.stack_pop(1);
     let obj2 = asm.stack_pop(1);
 
@@ -4462,32 +5455,30 @@ fn jit_rb_obj_equal(
 fn jit_rb_obj_not_equal(
     jit: &mut JITState,
     asm: &mut Assembler,
-    ocb: &mut OutlinedCb,
     _ci: *const rb_callinfo,
     _cme: *const rb_callable_method_entry_t,
     _block: Option<BlockHandler>,
     _argc: i32,
-    _known_recv_class: *const VALUE,
+    _known_recv_class: Option<VALUE>,
 ) -> bool {
-    gen_equality_specialized(jit, asm, ocb, false) == Some(true)
+    gen_equality_specialized(jit, asm, false) == Some(true)
 }
 
 // Codegen for rb_int_equal()
 fn jit_rb_int_equal(
     jit: &mut JITState,
     asm: &mut Assembler,
-    ocb: &mut OutlinedCb,
     _ci: *const rb_callinfo,
     _cme: *const rb_callable_method_entry_t,
     _block: Option<BlockHandler>,
     _argc: i32,
-    _known_recv_class: *const VALUE,
+    _known_recv_class: Option<VALUE>,
 ) -> bool {
     // Check that both operands are fixnums
-    guard_two_fixnums(jit, asm, ocb);
+    guard_two_fixnums(jit, asm);
 
     // Compare the arguments
-    asm.comment("rb_int_equal");
+    asm_comment!(asm, "rb_int_equal");
     let arg1 = asm.stack_pop(1);
     let arg0 = asm.stack_pop(1);
     asm.cmp(arg0, arg1);
@@ -4498,61 +5489,91 @@ fn jit_rb_int_equal(
     true
 }
 
-fn jit_rb_int_mul(
-    jit: &mut JITState,
+fn jit_rb_int_succ(
+    _jit: &mut JITState,
     asm: &mut Assembler,
-    ocb: &mut OutlinedCb,
     _ci: *const rb_callinfo,
     _cme: *const rb_callable_method_entry_t,
     _block: Option<BlockHandler>,
     _argc: i32,
-    _known_recv_class: *const VALUE,
+    _known_recv_class: Option<VALUE>,
 ) -> bool {
-    if asm.ctx.two_fixnums_on_stack(jit) != Some(true) {
-        return false;
+    // Guard the receiver is fixnum
+    let recv_type = asm.ctx.get_opnd_type(StackOpnd(0));
+    let recv = asm.stack_pop(1);
+    if recv_type != Type::Fixnum {
+        asm_comment!(asm, "guard object is fixnum");
+        asm.test(recv, Opnd::Imm(RUBY_FIXNUM_FLAG as i64));
+        asm.jz(Target::side_exit(Counter::opt_succ_not_fixnum));
     }
-    guard_two_fixnums(jit, asm, ocb);
 
-    // rb_fix_mul_fix may allocate memory for Bignum
-    jit_prepare_routine_call(jit, asm);
+    asm_comment!(asm, "Integer#succ");
+    let out_val = asm.add(recv, Opnd::Imm(2)); // 2 is untagged Fixnum 1
+    asm.jo(Target::side_exit(Counter::opt_succ_overflow));
 
-    asm.comment("Integer#*");
-    let obj = asm.stack_pop(1);
+    // Push the output onto the stack
+    let dst = asm.stack_push(Type::Fixnum);
+    asm.mov(dst, out_val);
+
+    true
+}
+
+fn jit_rb_int_pred(
+    _jit: &mut JITState,
+    asm: &mut Assembler,
+    _ci: *const rb_callinfo,
+    _cme: *const rb_callable_method_entry_t,
+    _block: Option<BlockHandler>,
+    _argc: i32,
+    _known_recv_class: Option<VALUE>,
+) -> bool {
+    // Guard the receiver is fixnum
+    let recv_type = asm.ctx.get_opnd_type(StackOpnd(0));
     let recv = asm.stack_pop(1);
-    let ret = asm.ccall(rb_fix_mul_fix as *const u8, vec![recv, obj]);
+    if recv_type != Type::Fixnum {
+        asm_comment!(asm, "guard object is fixnum");
+        asm.test(recv, Opnd::Imm(RUBY_FIXNUM_FLAG as i64));
+        asm.jz(Target::side_exit(Counter::send_pred_not_fixnum));
+    }
+
+    asm_comment!(asm, "Integer#pred");
+    let out_val = asm.sub(recv, Opnd::Imm(2)); // 2 is untagged Fixnum 1
+    asm.jo(Target::side_exit(Counter::send_pred_underflow));
+
+    // Push the output onto the stack
+    let dst = asm.stack_push(Type::Fixnum);
+    asm.mov(dst, out_val);
 
-    let ret_opnd = asm.stack_push(Type::Unknown);
-    asm.mov(ret_opnd, ret);
     true
 }
 
 fn jit_rb_int_div(
     jit: &mut JITState,
     asm: &mut Assembler,
-    ocb: &mut OutlinedCb,
     _ci: *const rb_callinfo,
     _cme: *const rb_callable_method_entry_t,
     _block: Option<BlockHandler>,
     _argc: i32,
-    _known_recv_class: *const VALUE,
+    _known_recv_class: Option<VALUE>,
 ) -> bool {
     if asm.ctx.two_fixnums_on_stack(jit) != Some(true) {
         return false;
     }
-    guard_two_fixnums(jit, asm, ocb);
+    guard_two_fixnums(jit, asm);
 
     // rb_fix_div_fix may GC-allocate for Bignum
-    jit_prepare_routine_call(jit, asm);
+    jit_prepare_call_with_gc(jit, asm);
 
-    asm.comment("Integer#/");
-    let obj = asm.stack_pop(1);
-    let recv = asm.stack_pop(1);
+    asm_comment!(asm, "Integer#/");
+    let obj = asm.stack_opnd(0);
+    let recv = asm.stack_opnd(1);
 
     // Check for arg0 % 0
     asm.cmp(obj, VALUE::fixnum_from_usize(0).as_i64().into());
     asm.je(Target::side_exit(Counter::opt_div_zero));
 
     let ret = asm.ccall(rb_fix_div_fix as *const u8, vec![recv, obj]);
+    asm.stack_pop(2); // Keep them during ccall for GC
 
     let ret_opnd = asm.stack_push(Type::Unknown);
     asm.mov(ret_opnd, ret);
@@ -4562,17 +5583,16 @@ fn jit_rb_int_div(
 fn jit_rb_int_lshift(
     jit: &mut JITState,
     asm: &mut Assembler,
-    ocb: &mut OutlinedCb,
     _ci: *const rb_callinfo,
     _cme: *const rb_callable_method_entry_t,
     _block: Option<BlockHandler>,
     _argc: i32,
-    _known_recv_class: *const VALUE,
+    _known_recv_class: Option<VALUE>,
 ) -> bool {
     if asm.ctx.two_fixnums_on_stack(jit) != Some(true) {
         return false;
     }
-    guard_two_fixnums(jit, asm, ocb);
+    guard_two_fixnums(jit, asm);
 
     let comptime_shift = jit.peek_at_stack(&asm.ctx, 0);
 
@@ -4582,20 +5602,37 @@ fn jit_rb_int_lshift(
 
     // Untag the fixnum shift amount
     let shift_amt = comptime_shift.as_isize() >> 1;
-
     if shift_amt > 63 || shift_amt < 0 {
         return false;
     }
 
+    // Fallback to a C call if the shift amount varies
+    // This check is needed because the chain guard will side-exit
+    // if its max depth is reached
+    if asm.ctx.get_chain_depth() > 0 {
+        return false;
+    }
+
     let rhs = asm.stack_pop(1);
     let lhs = asm.stack_pop(1);
 
-    // Guard on the shift value we speculated on
+    // Guard on the shift amount we speculated on
     asm.cmp(rhs, comptime_shift.into());
-    asm.jne(Target::side_exit(Counter::lshift_amt_changed));
+    jit_chain_guard(
+        JCC_JNE,
+        jit,
+        asm,
+        1,
+        Counter::lshift_amount_changed,
+    );
+
+    fixnum_left_shift_body(asm, lhs, shift_amt as u64);
+    true
+}
 
+fn fixnum_left_shift_body(asm: &mut Assembler, lhs: Opnd, shift_amt: u64) {
     let in_val = asm.sub(lhs, 1.into());
-    let shift_opnd = Opnd::UImm(shift_amt as u64);
+    let shift_opnd = Opnd::UImm(shift_amt);
     let out_val = asm.lshift(in_val, shift_opnd);
     let unshifted = asm.rshift(out_val, shift_opnd);
 
@@ -4608,190 +5645,753 @@ fn jit_rb_int_lshift(
 
     let ret_opnd = asm.stack_push(Type::Fixnum);
     asm.mov(ret_opnd, out_val);
-    true
 }
 
-fn jit_rb_int_aref(
+fn jit_rb_int_rshift(
     jit: &mut JITState,
     asm: &mut Assembler,
-    ocb: &mut OutlinedCb,
     _ci: *const rb_callinfo,
     _cme: *const rb_callable_method_entry_t,
     _block: Option<BlockHandler>,
-    argc: i32,
-    _known_recv_class: *const VALUE,
+    _argc: i32,
+    _known_recv_class: Option<VALUE>,
 ) -> bool {
-    if argc != 1 {
+    if asm.ctx.two_fixnums_on_stack(jit) != Some(true) {
         return false;
     }
-    if asm.ctx.two_fixnums_on_stack(jit) != Some(true) {
+    guard_two_fixnums(jit, asm);
+
+    let comptime_shift = jit.peek_at_stack(&asm.ctx, 0);
+
+    // Untag the fixnum shift amount
+    let shift_amt = comptime_shift.as_isize() >> 1;
+    if shift_amt > 63 || shift_amt < 0 {
         return false;
     }
-    guard_two_fixnums(jit, asm, ocb);
 
-    asm.comment("Integer#[]");
-    let obj = asm.stack_pop(1);
-    let recv = asm.stack_pop(1);
+    // Fallback to a C call if the shift amount varies
+    // This check is needed because the chain guard will side-exit
+    // if its max depth is reached
+    if asm.ctx.get_chain_depth() > 0 {
+        return false;
+    }
 
-    let ret = asm.ccall(rb_fix_aref as *const u8, vec![recv, obj]);
+    let rhs = asm.stack_pop(1);
+    let lhs = asm.stack_pop(1);
+
+    // Guard on the shift amount we speculated on
+    asm.cmp(rhs, comptime_shift.into());
+    jit_chain_guard(
+        JCC_JNE,
+        jit,
+        asm,
+        1,
+        Counter::rshift_amount_changed,
+    );
+
+    let shift_opnd = Opnd::UImm(shift_amt as u64);
+    let out_val = asm.rshift(lhs, shift_opnd);
+    let out_val = asm.or(out_val, 1.into());
 
     let ret_opnd = asm.stack_push(Type::Fixnum);
-    asm.mov(ret_opnd, ret);
+    asm.mov(ret_opnd, out_val);
     true
 }
 
-/// If string is frozen, duplicate it to get a non-frozen string. Otherwise, return it.
-fn jit_rb_str_uplus(
+fn jit_rb_int_xor(
     jit: &mut JITState,
     asm: &mut Assembler,
-    _ocb: &mut OutlinedCb,
     _ci: *const rb_callinfo,
     _cme: *const rb_callable_method_entry_t,
     _block: Option<BlockHandler>,
-    argc: i32,
-    _known_recv_class: *const VALUE,
-) -> bool
-{
-    if argc != 0 {
+    _argc: i32,
+    _known_recv_class: Option<VALUE>,
+) -> bool {
+    if asm.ctx.two_fixnums_on_stack(jit) != Some(true) {
         return false;
     }
+    guard_two_fixnums(jit, asm);
 
-    // We allocate when we dup the string
-    jit_prepare_routine_call(jit, asm);
-
-    asm.comment("Unary plus on string");
-    let recv_opnd = asm.stack_pop(1);
-    let recv_opnd = asm.load(recv_opnd);
-    let flags_opnd = asm.load(Opnd::mem(64, recv_opnd, RUBY_OFFSET_RBASIC_FLAGS));
-    asm.test(flags_opnd, Opnd::Imm(RUBY_FL_FREEZE as i64));
-
-    let ret_label = asm.new_label("stack_ret");
-
-    // String#+@ can only exist on T_STRING
-    let stack_ret = asm.stack_push(Type::TString);
-
-    // If the string isn't frozen, we just return it.
-    asm.mov(stack_ret, recv_opnd);
-    asm.jz(ret_label);
-
-    // Str is frozen - duplicate it
-    asm.spill_temps(); // for ccall
-    let ret_opnd = asm.ccall(rb_str_dup as *const u8, vec![recv_opnd]);
-    asm.mov(stack_ret, ret_opnd);
+    let rhs = asm.stack_pop(1);
+    let lhs = asm.stack_pop(1);
 
-    asm.write_label(ret_label);
+    // XOR and then re-tag the resulting fixnum
+    let out_val = asm.xor(lhs, rhs);
+    let out_val = asm.or(out_val, 1.into());
 
+    let ret_opnd = asm.stack_push(Type::Fixnum);
+    asm.mov(ret_opnd, out_val);
     true
 }
 
-fn jit_rb_str_bytesize(
-    _jit: &mut JITState,
+fn jit_rb_int_aref(
+    jit: &mut JITState,
     asm: &mut Assembler,
-    _ocb: &mut OutlinedCb,
     _ci: *const rb_callinfo,
     _cme: *const rb_callable_method_entry_t,
     _block: Option<BlockHandler>,
-    _argc: i32,
-    _known_recv_class: *const VALUE,
+    argc: i32,
+    _known_recv_class: Option<VALUE>,
 ) -> bool {
-    asm.comment("String#bytesize");
+    if argc != 1 {
+        return false;
+    }
+    if asm.ctx.two_fixnums_on_stack(jit) != Some(true) {
+        return false;
+    }
+    guard_two_fixnums(jit, asm);
 
+    asm_comment!(asm, "Integer#[]");
+    let obj = asm.stack_pop(1);
     let recv = asm.stack_pop(1);
-    let ret_opnd = asm.ccall(rb_str_bytesize as *const u8, vec![recv]);
 
-    let out_opnd = asm.stack_push(Type::Fixnum);
-    asm.mov(out_opnd, ret_opnd);
+    let ret = asm.ccall(rb_fix_aref as *const u8, vec![recv, obj]);
 
+    let ret_opnd = asm.stack_push(Type::Fixnum);
+    asm.mov(ret_opnd, ret);
     true
 }
 
-// Codegen for rb_str_to_s()
-// When String#to_s is called on a String instance, the method returns self and
-// most of the overhead comes from setting up the method call. We observed that
-// this situation happens a lot in some workloads.
-fn jit_rb_str_to_s(
-    _jit: &mut JITState,
+fn jit_rb_float_plus(
+    jit: &mut JITState,
     asm: &mut Assembler,
-    _ocb: &mut OutlinedCb,
     _ci: *const rb_callinfo,
     _cme: *const rb_callable_method_entry_t,
     _block: Option<BlockHandler>,
     _argc: i32,
-    known_recv_class: *const VALUE,
+    _known_recv_class: Option<VALUE>,
 ) -> bool {
-    if !known_recv_class.is_null() && unsafe { *known_recv_class == rb_cString } {
-        asm.comment("to_s on plain string");
-        // The method returns the receiver, which is already on the stack.
-        // No stack movement.
-        return true;
+    // Guard obj is Fixnum or Flonum to avoid rb_funcall on rb_num_coerce_bin
+    let comptime_obj = jit.peek_at_stack(&asm.ctx, 0);
+    if comptime_obj.fixnum_p() || comptime_obj.flonum_p() {
+        let obj = asm.stack_opnd(0);
+        jit_guard_known_klass(
+            jit,
+            asm,
+            comptime_obj.class_of(),
+            obj,
+            obj.into(),
+            comptime_obj,
+            SEND_MAX_DEPTH,
+            Counter::guard_send_not_fixnum_or_flonum,
+        );
+    } else {
+        return false;
     }
-    false
-}
 
-// Codegen for rb_str_empty_p()
-fn jit_rb_str_empty_p(
-    _jit: &mut JITState,
-    asm: &mut Assembler,
-    _ocb: &mut OutlinedCb,
-    _ci: *const rb_callinfo,
-    _cme: *const rb_callable_method_entry_t,
-    _block: Option<BlockHandler>,
-    _argc: i32,
-    _known_recv_class: *const VALUE,
-) -> bool {
-    let recv_opnd = asm.stack_pop(1);
+    // Save the PC and SP because the callee may allocate Float on heap
+    jit_prepare_call_with_gc(jit, asm);
 
-    asm.comment("get string length");
-    let str_len_opnd = Opnd::mem(
-        std::os::raw::c_long::BITS as u8,
-        asm.load(recv_opnd),
-        RUBY_OFFSET_RSTRING_LEN as i32,
-    );
+    asm_comment!(asm, "Float#+");
+    let obj = asm.stack_opnd(0);
+    let recv = asm.stack_opnd(1);
 
-    asm.cmp(str_len_opnd, Opnd::UImm(0));
-    let string_empty = asm.csel_e(Qtrue.into(), Qfalse.into());
-    let out_opnd = asm.stack_push(Type::UnknownImm);
-    asm.mov(out_opnd, string_empty);
+    let ret = asm.ccall(rb_float_plus as *const u8, vec![recv, obj]);
+    asm.stack_pop(2); // Keep recv during ccall for GC
 
-    return true;
+    let ret_opnd = asm.stack_push(Type::Unknown); // Flonum or heap Float
+    asm.mov(ret_opnd, ret);
+    true
 }
 
-// Codegen for rb_str_concat() -- *not* String#concat
-// Frequently strings are concatenated using "out_str << next_str".
-// This is common in Erb and similar templating languages.
-fn jit_rb_str_concat(
+fn jit_rb_float_minus(
     jit: &mut JITState,
     asm: &mut Assembler,
-    _ocb: &mut OutlinedCb,
     _ci: *const rb_callinfo,
     _cme: *const rb_callable_method_entry_t,
     _block: Option<BlockHandler>,
     _argc: i32,
-    _known_recv_class: *const VALUE,
+    _known_recv_class: Option<VALUE>,
 ) -> bool {
-    // The << operator can accept integer codepoints for characters
-    // as the argument. We only specially optimise string arguments.
-    // If the peeked-at compile time argument is something other than
-    // a string, assume it won't be a string later either.
-    let comptime_arg = jit.peek_at_stack(&asm.ctx, 0);
-    if ! unsafe { RB_TYPE_P(comptime_arg, RUBY_T_STRING) } {
+    // Guard obj is Fixnum or Flonum to avoid rb_funcall on rb_num_coerce_bin
+    let comptime_obj = jit.peek_at_stack(&asm.ctx, 0);
+    if comptime_obj.fixnum_p() || comptime_obj.flonum_p() {
+        let obj = asm.stack_opnd(0);
+        jit_guard_known_klass(
+            jit,
+            asm,
+            comptime_obj.class_of(),
+            obj,
+            obj.into(),
+            comptime_obj,
+            SEND_MAX_DEPTH,
+            Counter::guard_send_not_fixnum_or_flonum,
+        );
+    } else {
+        return false;
+    }
+
+    // Save the PC and SP because the callee may allocate Float on heap
+    jit_prepare_call_with_gc(jit, asm);
+
+    asm_comment!(asm, "Float#-");
+    let obj = asm.stack_opnd(0);
+    let recv = asm.stack_opnd(1);
+
+    let ret = asm.ccall(rb_float_minus as *const u8, vec![recv, obj]);
+    asm.stack_pop(2); // Keep recv during ccall for GC
+
+    let ret_opnd = asm.stack_push(Type::Unknown); // Flonum or heap Float
+    asm.mov(ret_opnd, ret);
+    true
+}
+
+fn jit_rb_float_mul(
+    jit: &mut JITState,
+    asm: &mut Assembler,
+    _ci: *const rb_callinfo,
+    _cme: *const rb_callable_method_entry_t,
+    _block: Option<BlockHandler>,
+    _argc: i32,
+    _known_recv_class: Option<VALUE>,
+) -> bool {
+    // Guard obj is Fixnum or Flonum to avoid rb_funcall on rb_num_coerce_bin
+    let comptime_obj = jit.peek_at_stack(&asm.ctx, 0);
+    if comptime_obj.fixnum_p() || comptime_obj.flonum_p() {
+        let obj = asm.stack_opnd(0);
+        jit_guard_known_klass(
+            jit,
+            asm,
+            comptime_obj.class_of(),
+            obj,
+            obj.into(),
+            comptime_obj,
+            SEND_MAX_DEPTH,
+            Counter::guard_send_not_fixnum_or_flonum,
+        );
+    } else {
+        return false;
+    }
+
+    // Save the PC and SP because the callee may allocate Float on heap
+    jit_prepare_call_with_gc(jit, asm);
+
+    asm_comment!(asm, "Float#*");
+    let obj = asm.stack_opnd(0);
+    let recv = asm.stack_opnd(1);
+
+    let ret = asm.ccall(rb_float_mul as *const u8, vec![recv, obj]);
+    asm.stack_pop(2); // Keep recv during ccall for GC
+
+    let ret_opnd = asm.stack_push(Type::Unknown); // Flonum or heap Float
+    asm.mov(ret_opnd, ret);
+    true
+}
+
+fn jit_rb_float_div(
+    jit: &mut JITState,
+    asm: &mut Assembler,
+    _ci: *const rb_callinfo,
+    _cme: *const rb_callable_method_entry_t,
+    _block: Option<BlockHandler>,
+    _argc: i32,
+    _known_recv_class: Option<VALUE>,
+) -> bool {
+    // Guard obj is Fixnum or Flonum to avoid rb_funcall on rb_num_coerce_bin
+    let comptime_obj = jit.peek_at_stack(&asm.ctx, 0);
+    if comptime_obj.fixnum_p() || comptime_obj.flonum_p() {
+        let obj = asm.stack_opnd(0);
+        jit_guard_known_klass(
+            jit,
+            asm,
+            comptime_obj.class_of(),
+            obj,
+            obj.into(),
+            comptime_obj,
+            SEND_MAX_DEPTH,
+            Counter::guard_send_not_fixnum_or_flonum,
+        );
+    } else {
+        return false;
+    }
+
+    // Save the PC and SP because the callee may allocate Float on heap
+    jit_prepare_call_with_gc(jit, asm);
+
+    asm_comment!(asm, "Float#/");
+    let obj = asm.stack_opnd(0);
+    let recv = asm.stack_opnd(1);
+
+    let ret = asm.ccall(rb_float_div as *const u8, vec![recv, obj]);
+    asm.stack_pop(2); // Keep recv during ccall for GC
+
+    let ret_opnd = asm.stack_push(Type::Unknown); // Flonum or heap Float
+    asm.mov(ret_opnd, ret);
+    true
+}
+
+/// If string is frozen, duplicate it to get a non-frozen string. Otherwise, return it.
+fn jit_rb_str_uplus(
+    jit: &mut JITState,
+    asm: &mut Assembler,
+    _ci: *const rb_callinfo,
+    _cme: *const rb_callable_method_entry_t,
+    _block: Option<BlockHandler>,
+    argc: i32,
+    _known_recv_class: Option<VALUE>,
+) -> bool
+{
+    if argc != 0 {
+        return false;
+    }
+
+    // We allocate when we dup the string
+    jit_prepare_call_with_gc(jit, asm);
+    asm.spill_regs(); // For ccall. Unconditionally spill them for RegMappings consistency.
+
+    asm_comment!(asm, "Unary plus on string");
+    let recv_opnd = asm.stack_pop(1);
+    let recv_opnd = asm.load(recv_opnd);
+    let flags_opnd = asm.load(Opnd::mem(64, recv_opnd, RUBY_OFFSET_RBASIC_FLAGS));
+    asm.test(flags_opnd, Opnd::Imm(RUBY_FL_FREEZE as i64 | RSTRING_CHILLED as i64));
+
+    let ret_label = asm.new_label("stack_ret");
+
+    // String#+@ can only exist on T_STRING
+    let stack_ret = asm.stack_push(Type::TString);
+
+    // If the string isn't frozen, we just return it.
+    asm.mov(stack_ret, recv_opnd);
+    asm.jz(ret_label);
+
+    // Str is frozen - duplicate it
+    asm.spill_regs(); // for ccall
+    let ret_opnd = asm.ccall(rb_str_dup as *const u8, vec![recv_opnd]);
+    asm.mov(stack_ret, ret_opnd);
+
+    asm.write_label(ret_label);
+
+    true
+}
+
+fn jit_rb_str_length(
+    _jit: &mut JITState,
+    asm: &mut Assembler,
+    _ci: *const rb_callinfo,
+    _cme: *const rb_callable_method_entry_t,
+    _block: Option<BlockHandler>,
+    _argc: i32,
+    _known_recv_class: Option<VALUE>,
+) -> bool {
+    asm_comment!(asm, "String#length");
+    extern "C" {
+        fn rb_str_length(str: VALUE) -> VALUE;
+    }
+
+    // This function cannot allocate or raise an exceptions
+    let recv = asm.stack_opnd(0);
+    let ret_opnd = asm.ccall(rb_str_length as *const u8, vec![recv]);
+    asm.stack_pop(1); // Keep recv on stack during ccall for GC
+
+    // Should be guaranteed to be a fixnum on 64-bit systems
+    let out_opnd = asm.stack_push(Type::Fixnum);
+    asm.mov(out_opnd, ret_opnd);
+
+    true
+}
+
+fn jit_rb_str_bytesize(
+    _jit: &mut JITState,
+    asm: &mut Assembler,
+    _ci: *const rb_callinfo,
+    _cme: *const rb_callable_method_entry_t,
+    _block: Option<BlockHandler>,
+    _argc: i32,
+    _known_recv_class: Option<VALUE>,
+) -> bool {
+    asm_comment!(asm, "String#bytesize");
+
+    let recv = asm.stack_pop(1);
+
+    asm_comment!(asm, "get string length");
+    let str_len_opnd = Opnd::mem(
+        std::os::raw::c_long::BITS as u8,
+        asm.load(recv),
+        RUBY_OFFSET_RSTRING_LEN as i32,
+    );
+
+    let len = asm.load(str_len_opnd);
+    let shifted_val = asm.lshift(len, Opnd::UImm(1));
+    let out_val = asm.or(shifted_val, Opnd::UImm(RUBY_FIXNUM_FLAG as u64));
+
+    let out_opnd = asm.stack_push(Type::Fixnum);
+
+    asm.mov(out_opnd, out_val);
+
+    true
+}
+
+fn jit_rb_str_byteslice(
+    jit: &mut JITState,
+    asm: &mut Assembler,
+    _ci: *const rb_callinfo,
+    cme: *const rb_callable_method_entry_t,
+    _block: Option<BlockHandler>,
+    argc: i32,
+    _known_recv_class: Option<VALUE>,
+) -> bool {
+    if argc != 2 {
+        return false
+    }
+
+    // rb_str_byte_substr should be leaf if indexes are fixnums
+    match (asm.ctx.get_opnd_type(StackOpnd(0)), asm.ctx.get_opnd_type(StackOpnd(1))) {
+        (Type::Fixnum, Type::Fixnum) => {},
+        // Raises when non-integers are passed in, which requires the method frame
+        // to be pushed for the backtrace
+        _ => if !jit_prepare_lazy_frame_call(jit, asm, cme, StackOpnd(2)) {
+            return false;
+        }
+    }
+    asm_comment!(asm, "String#byteslice");
+
+    // rb_str_byte_substr allocates a substring
+    jit_prepare_call_with_gc(jit, asm);
+
+    // Get stack operands after potential SP change
+    let len = asm.stack_opnd(0);
+    let beg = asm.stack_opnd(1);
+    let recv = asm.stack_opnd(2);
+
+    let ret_opnd = asm.ccall(rb_str_byte_substr as *const u8, vec![recv, beg, len]);
+    asm.stack_pop(3);
+
+    let out_opnd = asm.stack_push(Type::Unknown);
+    asm.mov(out_opnd, ret_opnd);
+
+    true
+}
+
+fn jit_rb_str_aref_m(
+    jit: &mut JITState,
+    asm: &mut Assembler,
+    _ci: *const rb_callinfo,
+    _cme: *const rb_callable_method_entry_t,
+    _block: Option<BlockHandler>,
+    argc: i32,
+    _known_recv_class: Option<VALUE>,
+) -> bool {
+    // In yjit-bench the most common usages by far are single fixnum or two fixnums.
+    // rb_str_substr should be leaf if indexes are fixnums
+    if argc == 2 {
+        match (asm.ctx.get_opnd_type(StackOpnd(0)), asm.ctx.get_opnd_type(StackOpnd(1))) {
+            (Type::Fixnum, Type::Fixnum) => {},
+            // There is a two-argument form of (RegExp, Fixnum) which needs a different c func.
+            // Other types will raise.
+            _ => { return false },
+        }
+    } else if argc == 1 {
+        match asm.ctx.get_opnd_type(StackOpnd(0)) {
+            Type::Fixnum => {},
+            // Besides Fixnum this could also be a Range or a RegExp which are handled by separate c funcs.
+            // Other types will raise.
+            _ => {
+                // If the context doesn't have the type info we try a little harder.
+                let comptime_arg = jit.peek_at_stack(&asm.ctx, 0);
+                let arg0 = asm.stack_opnd(0);
+                if comptime_arg.fixnum_p() {
+                    asm.test(arg0, Opnd::UImm(RUBY_FIXNUM_FLAG as u64));
+
+                    jit_chain_guard(
+                        JCC_JZ,
+                        jit,
+                        asm,
+                        SEND_MAX_DEPTH,
+                        Counter::guard_send_str_aref_not_fixnum,
+                    );
+                } else {
+                    return false
+                }
+            },
+        }
+    } else {
+        return false
+    }
+
+    asm_comment!(asm, "String#[]");
+
+    // rb_str_substr allocates a substring
+    jit_prepare_call_with_gc(jit, asm);
+
+    // Get stack operands after potential SP change
+
+    // The "empty" arg distinguishes between the normal "one arg" behavior
+    // and the "two arg" special case that returns an empty string
+    // when the begin index is the length of the string.
+    // See the usages of rb_str_substr in string.c for more information.
+    let (beg_idx, empty, len) = if argc == 2 {
+        (1, Opnd::Imm(1), asm.stack_opnd(0))
+    } else {
+        // If there is only one arg, the length will be 1.
+        (0, Opnd::Imm(0), VALUE::fixnum_from_usize(1).into())
+    };
+
+    let beg = asm.stack_opnd(beg_idx);
+    let recv = asm.stack_opnd(beg_idx + 1);
+
+    let ret_opnd = asm.ccall(rb_str_substr_two_fixnums as *const u8, vec![recv, beg, len, empty]);
+    asm.stack_pop(beg_idx as usize + 2);
+
+    let out_opnd = asm.stack_push(Type::Unknown);
+    asm.mov(out_opnd, ret_opnd);
+
+    true
+}
+
+fn jit_rb_str_getbyte(
+    jit: &mut JITState,
+    asm: &mut Assembler,
+    _ci: *const rb_callinfo,
+    _cme: *const rb_callable_method_entry_t,
+    _block: Option<BlockHandler>,
+    _argc: i32,
+    _known_recv_class: Option<VALUE>,
+) -> bool {
+    asm_comment!(asm, "String#getbyte");
+
+    // Don't pop since we may bail
+    let idx = asm.stack_opnd(0);
+    let recv = asm.stack_opnd(1);
+
+    let comptime_idx = jit.peek_at_stack(&asm.ctx, 0);
+    if comptime_idx.fixnum_p(){
+        jit_guard_known_klass(
+            jit,
+            asm,
+            comptime_idx.class_of(),
+            idx,
+            idx.into(),
+            comptime_idx,
+            SEND_MAX_DEPTH,
+            Counter::getbyte_idx_not_fixnum,
+        );
+    } else {
+        return false;
+    }
+
+    // Untag the index
+    let idx = asm.rshift(idx, Opnd::UImm(1));
+
+    // If index is negative, exit
+    asm.cmp(idx, Opnd::UImm(0));
+    asm.jl(Target::side_exit(Counter::getbyte_idx_negative));
+
+    asm_comment!(asm, "get string length");
+    let recv = asm.load(recv);
+    let str_len_opnd = Opnd::mem(
+        std::os::raw::c_long::BITS as u8,
+        asm.load(recv),
+        RUBY_OFFSET_RSTRING_LEN as i32,
+    );
+
+    // Exit if the index is out of bounds
+    asm.cmp(idx, str_len_opnd);
+    asm.jge(Target::side_exit(Counter::getbyte_idx_out_of_bounds));
+
+    let str_ptr = get_string_ptr(asm, recv);
+    // FIXME: could use SIB indexing here with proper support in backend
+    let str_ptr = asm.add(str_ptr, idx);
+    let byte = asm.load(Opnd::mem(8, str_ptr, 0));
+
+    // Zero-extend the byte to 64 bits
+    let byte = byte.with_num_bits(64).unwrap();
+    let byte = asm.and(byte, 0xFF.into());
+
+    // Tag the byte
+    let byte = asm.lshift(byte, Opnd::UImm(1));
+    let byte = asm.or(byte, Opnd::UImm(1));
+
+    asm.stack_pop(2); // Keep them on stack during ccall for GC
+    let out_opnd = asm.stack_push(Type::Fixnum);
+    asm.mov(out_opnd, byte);
+
+    true
+}
+
+fn jit_rb_str_setbyte(
+    jit: &mut JITState,
+    asm: &mut Assembler,
+    _ci: *const rb_callinfo,
+    cme: *const rb_callable_method_entry_t,
+    _block: Option<BlockHandler>,
+    _argc: i32,
+    _known_recv_class: Option<VALUE>,
+) -> bool {
+    // Raises when index is out of range. Lazily push a frame in that case.
+    if !jit_prepare_lazy_frame_call(jit, asm, cme, StackOpnd(2)) {
+        return false;
+    }
+    asm_comment!(asm, "String#setbyte");
+
+    let value = asm.stack_opnd(0);
+    let index = asm.stack_opnd(1);
+    let recv = asm.stack_opnd(2);
+
+    let ret_opnd = asm.ccall(rb_str_setbyte as *const u8, vec![recv, index, value]);
+    asm.stack_pop(3); // Keep them on stack during ccall for GC
+
+    let out_opnd = asm.stack_push(Type::UnknownImm);
+    asm.mov(out_opnd, ret_opnd);
+
+    true
+}
+
+// Codegen for rb_str_to_s()
+// When String#to_s is called on a String instance, the method returns self and
+// most of the overhead comes from setting up the method call. We observed that
+// this situation happens a lot in some workloads.
+fn jit_rb_str_to_s(
+    _jit: &mut JITState,
+    asm: &mut Assembler,
+    _ci: *const rb_callinfo,
+    _cme: *const rb_callable_method_entry_t,
+    _block: Option<BlockHandler>,
+    _argc: i32,
+    known_recv_class: Option<VALUE>,
+) -> bool {
+    if unsafe { known_recv_class == Some(rb_cString) } {
+        asm_comment!(asm, "to_s on plain string");
+        // The method returns the receiver, which is already on the stack.
+        // No stack movement.
+        return true;
+    }
+    false
+}
+
+fn jit_rb_str_dup(
+    jit: &mut JITState,
+    asm: &mut Assembler,
+    _ci: *const rb_callinfo,
+    _cme: *const rb_callable_method_entry_t,
+    _block: Option<BlockHandler>,
+    _argc: i32,
+    known_recv_class: Option<VALUE>,
+) -> bool {
+    // We specialize only the BARE_STRING_P case. Otherwise it's not leaf.
+    if unsafe { known_recv_class != Some(rb_cString) } {
+        return false;
+    }
+    asm_comment!(asm, "String#dup");
+
+    jit_prepare_call_with_gc(jit, asm);
+
+    let recv_opnd = asm.stack_pop(1);
+    let recv_opnd = asm.load(recv_opnd);
+
+    // Call rb_str_dup
+    let stack_ret = asm.stack_push(Type::CString);
+    let ret_opnd = asm.ccall(rb_str_dup_m as *const u8, vec![recv_opnd]);
+    asm.mov(stack_ret, ret_opnd);
+
+    true
+}
+
+// Codegen for rb_str_empty_p()
+fn jit_rb_str_empty_p(
+    _jit: &mut JITState,
+    asm: &mut Assembler,
+    _ci: *const rb_callinfo,
+    _cme: *const rb_callable_method_entry_t,
+    _block: Option<BlockHandler>,
+    _argc: i32,
+    _known_recv_class: Option<VALUE>,
+) -> bool {
+    let recv_opnd = asm.stack_pop(1);
+
+    asm_comment!(asm, "get string length");
+    let str_len_opnd = Opnd::mem(
+        std::os::raw::c_long::BITS as u8,
+        asm.load(recv_opnd),
+        RUBY_OFFSET_RSTRING_LEN as i32,
+    );
+
+    asm.cmp(str_len_opnd, Opnd::UImm(0));
+    let string_empty = asm.csel_e(Qtrue.into(), Qfalse.into());
+    let out_opnd = asm.stack_push(Type::UnknownImm);
+    asm.mov(out_opnd, string_empty);
+
+    return true;
+}
+
+// Codegen for rb_str_concat() with an integer argument -- *not* String#concat
+// Using strings as a byte buffer often includes appending byte values to the end of the string.
+fn jit_rb_str_concat_codepoint(
+    jit: &mut JITState,
+    asm: &mut Assembler,
+    _ci: *const rb_callinfo,
+    _cme: *const rb_callable_method_entry_t,
+    _block: Option<BlockHandler>,
+    _argc: i32,
+    _known_recv_class: Option<VALUE>,
+) -> bool {
+    asm_comment!(asm, "String#<< with codepoint argument");
+
+    // Either of the string concatenation functions we call will reallocate the string to grow its
+    // capacity if necessary. In extremely rare cases (i.e., string exceeds `LONG_MAX` bytes),
+    // either of the called functions will raise an exception.
+    jit_prepare_non_leaf_call(jit, asm);
+
+    let codepoint = asm.stack_opnd(0);
+    let recv = asm.stack_opnd(1);
+
+    guard_object_is_fixnum(jit, asm, codepoint, StackOpnd(0));
+
+    asm.ccall(rb_yjit_str_concat_codepoint as *const u8, vec![recv, codepoint]);
+
+    // The receiver is the return value, so we only need to pop the codepoint argument off the stack.
+    // We can reuse the receiver slot in the stack as the return value.
+    asm.stack_pop(1);
+
+    true
+}
+
+// Codegen for rb_str_concat() -- *not* String#concat
+// Frequently strings are concatenated using "out_str << next_str".
+// This is common in Erb and similar templating languages.
+fn jit_rb_str_concat(
+    jit: &mut JITState,
+    asm: &mut Assembler,
+    ci: *const rb_callinfo,
+    cme: *const rb_callable_method_entry_t,
+    block: Option<BlockHandler>,
+    argc: i32,
+    known_recv_class: Option<VALUE>,
+) -> bool {
+    // The << operator can accept integer codepoints for characters
+    // as the argument. We only specially optimise string arguments.
+    // If the peeked-at compile time argument is something other than
+    // a string, assume it won't be a string later either.
+    let comptime_arg = jit.peek_at_stack(&asm.ctx, 0);
+    if unsafe { RB_TYPE_P(comptime_arg, RUBY_T_FIXNUM) } {
+        return jit_rb_str_concat_codepoint(jit, asm, ci, cme, block, argc, known_recv_class);
+    }
+
+    if ! unsafe { RB_TYPE_P(comptime_arg, RUBY_T_STRING) } {
         return false;
     }
 
     // Guard that the concat argument is a string
     guard_object_is_string(asm, asm.stack_opnd(0), StackOpnd(0), Counter::guard_send_not_string);
 
-    // Guard buffers from GC since rb_str_buf_append may allocate. During the VM lock on GC,
-    // other Ractors may trigger global invalidation, so we need ctx.clear_local_types().
-    // PC is used on errors like Encoding::CompatibilityError raised by rb_str_buf_append.
-    jit_prepare_routine_call(jit, asm);
+    // Guard buffers from GC since rb_str_buf_append may allocate.
+    // rb_str_buf_append may raise Encoding::CompatibilityError, but we accept compromised
+    // backtraces on this method since the interpreter does the same thing on opt_ltlt.
+    jit_prepare_non_leaf_call(jit, asm);
+
+    // Explicitly spill temps before making any C calls. `ccall` will spill temps, but it does a
+    // check to only spill if it thinks it's necessary. That logic can't see through the runtime
+    // branching occurring in the code generated for this function. Consequently, the branch for
+    // the first `ccall` will spill registers but the second one will not. At run time, we may
+    // jump over that spill code when executing the second branch, leading situations that are
+    // quite hard to debug. If we spill up front we avoid diverging behavior.
+    asm.spill_regs();
 
     let concat_arg = asm.stack_pop(1);
     let recv = asm.stack_pop(1);
 
     // Test if string encodings differ. If different, use rb_str_append. If the same,
     // use rb_yjit_str_simple_append, which calls rb_str_cat.
-    asm.comment("<< on strings");
+    asm_comment!(asm, "<< on strings");
 
     // Take receiver's object flags XOR arg's flags. If any
     // string-encoding flags are different between the two,
@@ -4808,7 +6408,6 @@ fn jit_rb_str_concat(
     asm.jnz(enc_mismatch);
 
     // If encodings match, call the simple append function and jump to return
-    asm.spill_temps(); // for ccall
     let ret_opnd = asm.ccall(rb_yjit_str_simple_append as *const u8, vec![recv, concat_arg]);
     let ret_label = asm.new_label("func_return");
     let stack_ret = asm.stack_push(Type::TString);
@@ -4818,7 +6417,7 @@ fn jit_rb_str_concat(
 
     // If encodings are different, use a slower encoding-aware concatenate
     asm.write_label(enc_mismatch);
-    asm.spill_temps(); // for ccall
+    asm.spill_regs(); // Ignore the register for the other local branch
     let ret_opnd = asm.ccall(rb_str_buf_append as *const u8, vec![recv, concat_arg]);
     let stack_ret = asm.stack_push(Type::TString);
     asm.mov(stack_ret, ret_opnd);
@@ -4833,12 +6432,11 @@ fn jit_rb_str_concat(
 fn jit_rb_ary_empty_p(
     _jit: &mut JITState,
     asm: &mut Assembler,
-    _ocb: &mut OutlinedCb,
     _ci: *const rb_callinfo,
     _cme: *const rb_callable_method_entry_t,
     _block: Option<BlockHandler>,
     _argc: i32,
-    _known_recv_class: *const VALUE,
+    _known_recv_class: Option<VALUE>,
 ) -> bool {
     let array_opnd = asm.stack_pop(1);
     let array_reg = asm.load(array_opnd);
@@ -4853,50 +6451,94 @@ fn jit_rb_ary_empty_p(
     return true;
 }
 
+// Codegen for rb_ary_length()
+fn jit_rb_ary_length(
+    _jit: &mut JITState,
+    asm: &mut Assembler,
+    _ci: *const rb_callinfo,
+    _cme: *const rb_callable_method_entry_t,
+    _block: Option<BlockHandler>,
+    _argc: i32,
+    _known_recv_class: Option<VALUE>,
+) -> bool {
+    let array_opnd = asm.stack_pop(1);
+    let array_reg = asm.load(array_opnd);
+    let len_opnd = get_array_len(asm, array_reg);
+
+    // Convert the length to a fixnum
+    let shifted_val = asm.lshift(len_opnd, Opnd::UImm(1));
+    let out_val = asm.or(shifted_val, Opnd::UImm(RUBY_FIXNUM_FLAG as u64));
+
+    let out_opnd = asm.stack_push(Type::Fixnum);
+    asm.store(out_opnd, out_val);
+
+    return true;
+}
+
 fn jit_rb_ary_push(
     jit: &mut JITState,
     asm: &mut Assembler,
-    _ocb: &mut OutlinedCb,
     _ci: *const rb_callinfo,
     _cme: *const rb_callable_method_entry_t,
     _block: Option<BlockHandler>,
     _argc: i32,
-    _known_recv_class: *const VALUE,
+    _known_recv_class: Option<VALUE>,
 ) -> bool {
-    asm.comment("Array#<<");
+    asm_comment!(asm, "Array#<<");
 
-    // rb_ary_push allocates memory for buffer extension
-    jit_prepare_routine_call(jit, asm);
+    // rb_ary_push allocates memory for buffer extension and can raise FrozenError
+    // Not using a lazy frame here since the interpreter also has a truncated
+    // stack trace from opt_ltlt.
+    jit_prepare_non_leaf_call(jit, asm);
 
-    let item_opnd = asm.stack_pop(1);
-    let ary_opnd = asm.stack_pop(1);
+    let item_opnd = asm.stack_opnd(0);
+    let ary_opnd = asm.stack_opnd(1);
     let ret = asm.ccall(rb_ary_push as *const u8, vec![ary_opnd, item_opnd]);
+    asm.stack_pop(2); // Keep them on stack during ccall for GC
 
     let ret_opnd = asm.stack_push(Type::TArray);
     asm.mov(ret_opnd, ret);
     true
 }
 
+// Just a leaf method, but not using `Primitive.attr! :leaf` since BOP methods can't use it.
+fn jit_rb_hash_empty_p(
+    _jit: &mut JITState,
+    asm: &mut Assembler,
+    _ci: *const rb_callinfo,
+    _cme: *const rb_callable_method_entry_t,
+    _block: Option<BlockHandler>,
+    _argc: i32,
+    _known_recv_class: Option<VALUE>,
+) -> bool {
+    asm_comment!(asm, "Hash#empty?");
+
+    let hash_opnd = asm.stack_pop(1);
+    let ret = asm.ccall(rb_hash_empty_p as *const u8, vec![hash_opnd]);
+
+    let ret_opnd = asm.stack_push(Type::UnknownImm);
+    asm.mov(ret_opnd, ret);
+    true
+}
+
 fn jit_obj_respond_to(
     jit: &mut JITState,
     asm: &mut Assembler,
-    ocb: &mut OutlinedCb,
     _ci: *const rb_callinfo,
     _cme: *const rb_callable_method_entry_t,
     _block: Option<BlockHandler>,
     argc: i32,
-    known_recv_class: *const VALUE,
+    known_recv_class: Option<VALUE>,
 ) -> bool {
     // respond_to(:sym) or respond_to(:sym, true)
     if argc != 1 && argc != 2 {
         return false;
     }
 
-    if known_recv_class.is_null() {
-        return false;
-    }
-
-    let recv_class = unsafe { *known_recv_class };
+    let recv_class = match known_recv_class {
+        Some(class) => class,
+        None => return false,
+    };
 
     // Get the method_id from compile time. We will later add a guard against it.
     let mid_sym = jit.peek_at_stack(&asm.ctx, (argc - 1) as isize);
@@ -4935,7 +6577,7 @@ fn jit_obj_respond_to(
         (METHOD_VISI_UNDEF, _) => {
             // No method, we can return false given respond_to_missing? hasn't been overridden.
             // In the future, we might want to jit the call to respond_to_missing?
-            if !assume_method_basic_definition(jit, asm, ocb, recv_class, idRespond_to_missing.into()) {
+            if !assume_method_basic_definition(jit, asm, recv_class, ID!(respond_to_missing)) {
                 return false;
             }
             Qfalse
@@ -4957,7 +6599,7 @@ fn jit_obj_respond_to(
     // Invalidate this block if method lookup changes for the method being queried. This works
     // both for the case where a method does or does not exist, as for the latter we asked for a
     // "negative CME" earlier.
-    jit.assume_method_lookup_stable(asm, ocb, target_cme);
+    jit.assume_method_lookup_stable(asm, target_cme);
 
     if argc == 2 {
         // pop include_all argument (we only use its type info)
@@ -4968,14 +6610,13 @@ fn jit_obj_respond_to(
     let _recv_opnd = asm.stack_pop(1);
 
     // This is necessary because we have no guarantee that sym_opnd is a constant
-    asm.comment("guard known mid");
+    asm_comment!(asm, "guard known mid");
     asm.cmp(sym_opnd, mid_sym.into());
     jit_chain_guard(
         JCC_JNE,
         jit,
         asm,
-        ocb,
-        SEND_MAX_CHAIN_DEPTH,
+        SEND_MAX_DEPTH,
         Counter::guard_send_respond_to_mid_mismatch,
     );
 
@@ -4987,14 +6628,28 @@ fn jit_obj_respond_to(
 fn jit_rb_f_block_given_p(
     jit: &mut JITState,
     asm: &mut Assembler,
-    _ocb: &mut OutlinedCb,
     _ci: *const rb_callinfo,
     _cme: *const rb_callable_method_entry_t,
     _block: Option<BlockHandler>,
     _argc: i32,
-    _known_recv_class: *const VALUE,
+    _known_recv_class: Option<VALUE>,
 ) -> bool {
-    asm.comment("block_given?");
+    asm.stack_pop(1);
+    let out_opnd = asm.stack_push(Type::UnknownImm);
+
+    gen_block_given(jit, asm, out_opnd, Qtrue.into(), Qfalse.into());
+
+    true
+}
+
+fn gen_block_given(
+    jit: &mut JITState,
+    asm: &mut Assembler,
+    out_opnd: Opnd,
+    true_opnd: Opnd,
+    false_opnd: Opnd,
+) {
+    asm_comment!(asm, "block_given?");
 
     // Same as rb_vm_frame_block_handler
     let ep_opnd = gen_get_lep(jit, asm);
@@ -5002,13 +6657,65 @@ fn jit_rb_f_block_given_p(
         Opnd::mem(64, ep_opnd, SIZEOF_VALUE_I32 * VM_ENV_DATA_INDEX_SPECVAL)
     );
 
-    asm.stack_pop(1);
-    let out_opnd = asm.stack_push(Type::UnknownImm);
-
     // Return `block_handler != VM_BLOCK_HANDLER_NONE`
     asm.cmp(block_handler, VM_BLOCK_HANDLER_NONE.into());
-    let block_given = asm.csel_ne(Qtrue.into(), Qfalse.into());
+    let block_given = asm.csel_ne(true_opnd, false_opnd);
     asm.mov(out_opnd, block_given);
+}
+
+// Codegen for rb_class_superclass()
+fn jit_rb_class_superclass(
+    jit: &mut JITState,
+    asm: &mut Assembler,
+    _ci: *const rb_callinfo,
+    cme: *const rb_callable_method_entry_t,
+    _block: Option<crate::codegen::BlockHandler>,
+    _argc: i32,
+    _known_recv_class: Option<VALUE>,
+) -> bool {
+    extern "C" {
+        fn rb_class_superclass(klass: VALUE) -> VALUE;
+    }
+
+    // It may raise "uninitialized class"
+    if !jit_prepare_lazy_frame_call(jit, asm, cme, StackOpnd(0)) {
+        return false;
+    }
+
+    asm_comment!(asm, "Class#superclass");
+    let recv_opnd = asm.stack_opnd(0);
+    let ret = asm.ccall(rb_class_superclass as *const u8, vec![recv_opnd]);
+
+    asm.stack_pop(1);
+    let ret_opnd = asm.stack_push(Type::Unknown);
+    asm.mov(ret_opnd, ret);
+
+    true
+}
+
+fn jit_rb_case_equal(
+    jit: &mut JITState,
+    asm: &mut Assembler,
+    _ci: *const rb_callinfo,
+    _cme: *const rb_callable_method_entry_t,
+    _block: Option<BlockHandler>,
+    _argc: i32,
+    known_recv_class: Option<VALUE>,
+) -> bool {
+    if !jit.assume_expected_cfunc(asm, known_recv_class.unwrap(), ID!(eq), rb_obj_equal as _) {
+        return false;
+    }
+
+    asm_comment!(asm, "case_equal: {}#===", get_class_name(known_recv_class));
+
+    // Compare the arguments
+    let arg1 = asm.stack_pop(1);
+    let arg0 = asm.stack_pop(1);
+    asm.cmp(arg0, arg1);
+    let ret_opnd = asm.csel_e(Qtrue.into(), Qfalse.into());
+
+    let stack_ret = asm.stack_push(Type::UnknownImm);
+    asm.mov(stack_ret, ret_opnd);
 
     true
 }
@@ -5016,14 +6723,13 @@ fn jit_rb_f_block_given_p(
 fn jit_thread_s_current(
     _jit: &mut JITState,
     asm: &mut Assembler,
-    _ocb: &mut OutlinedCb,
     _ci: *const rb_callinfo,
     _cme: *const rb_callable_method_entry_t,
     _block: Option<BlockHandler>,
     _argc: i32,
-    _known_recv_class: *const VALUE,
+    _known_recv_class: Option<VALUE>,
 ) -> bool {
-    asm.comment("Thread.current");
+    asm_comment!(asm, "Thread.current");
     asm.stack_pop(1);
 
     // ec->thread_ptr
@@ -5037,11 +6743,38 @@ fn jit_thread_s_current(
     true
 }
 
-// Check if we know how to codegen for a particular cfunc method
+/// Specialization for rb_obj_dup() (Kernel#dup)
+fn jit_rb_obj_dup(
+    _jit: &mut JITState,
+    asm: &mut Assembler,
+    _ci: *const rb_callinfo,
+    _cme: *const rb_callable_method_entry_t,
+    _block: Option<BlockHandler>,
+    _argc: i32,
+    _known_recv_class: Option<VALUE>,
+) -> bool {
+    // Kernel#dup has arity=0, and caller already did argument count check.
+    let self_type = asm.ctx.get_opnd_type(StackOpnd(0));
+
+    if self_type.is_imm() {
+        // Method is no-op when receiver is an immediate value.
+        true
+    } else {
+        false
+    }
+}
+
+/// Check if we know how to codegen for a particular cfunc method
+/// See also: [reg_method_codegen].
 fn lookup_cfunc_codegen(def: *const rb_method_definition_t) -> Option<MethodGenFn> {
     let method_serial = unsafe { get_def_method_serial(def) };
+    let table = unsafe { METHOD_CODEGEN_TABLE.as_ref().unwrap() };
 
-    CodegenGlobals::look_up_codegen_method(method_serial)
+    let option_ref = table.get(&method_serial);
+    match option_ref {
+        None => None,
+        Some(&mgf) => Some(mgf), // Deref
+    }
 }
 
 // Is anyone listening for :c_call and :c_return event currently?
@@ -5114,18 +6847,17 @@ struct ControlFrame {
 //   * Provided sp should point to the new frame's sp, immediately following locals and the environment
 //   * At entry, CFP points to the caller (not callee) frame
 //   * At exit, ec->cfp is updated to the pushed CFP
-//   * CFP and SP registers are updated only if set_sp_cfp is set
+//   * SP register is updated only if frame.iseq is set
 //   * Stack overflow is not checked (should be done by the caller)
 //   * Interrupts are not checked (should be done by the caller)
 fn gen_push_frame(
     jit: &mut JITState,
     asm: &mut Assembler,
-    set_sp_cfp: bool, // if true CFP and SP will be switched to the callee
     frame: ControlFrame,
 ) {
     let sp = frame.sp;
 
-    asm.comment("push cme, specval, frame type");
+    asm_comment!(asm, "push cme, specval, frame type");
 
     // Write method entry at sp[-3]
     // sp[-3] = me;
@@ -5158,9 +6890,6 @@ fn gen_push_frame(
                     let block_handler = asm.load(
                         Opnd::mem(64, ep_opnd, SIZEOF_VALUE_I32 * VM_ENV_DATA_INDEX_SPECVAL)
                     );
-
-                    asm.store(Opnd::mem(64, CFP, RUBY_OFFSET_CFP_BLOCK_CODE), block_handler);
-
                     block_handler
                 }
                 BlockHandler::AlreadySet => 0.into(), // unused
@@ -5175,7 +6904,7 @@ fn gen_push_frame(
         }
     };
     if let SpecVal::BlockHandler(Some(BlockHandler::AlreadySet)) = frame.specval {
-        asm.comment("specval should have been set");
+        asm_comment!(asm, "specval should have been set");
     } else {
         asm.store(Opnd::mem(64, sp, SIZEOF_VALUE_I32 * -2), specval);
     }
@@ -5198,7 +6927,7 @@ fn gen_push_frame(
     //    .ep         = <sp - 1>,
     //    .block_code = 0,
     // };
-    asm.comment("push callee control frame");
+    asm_comment!(asm, "push callee control frame");
 
     // For an iseq call PC may be None, in which case we will not set PC and will allow jitted code
     // to set it as necessary.
@@ -5215,36 +6944,17 @@ fn gen_push_frame(
     asm.mov(cfp_opnd(RUBY_OFFSET_CFP_SELF), frame.recv);
     asm.mov(cfp_opnd(RUBY_OFFSET_CFP_BLOCK_CODE), 0.into());
 
-    // Spill stack temps to let the callee use them (must be done before changing SP)
-    asm.spill_temps();
-
-    if set_sp_cfp {
-        // Saving SP before calculating ep avoids a dependency on a register
-        // However this must be done after referencing frame.recv, which may be SP-relative
-        asm.mov(SP, sp);
-    }
     let ep = asm.sub(sp, SIZEOF_VALUE.into());
     asm.mov(cfp_opnd(RUBY_OFFSET_CFP_EP), ep);
-
-    let new_cfp = asm.lea(cfp_opnd(0));
-    if set_sp_cfp {
-        asm.comment("switch to new CFP");
-        asm.mov(CFP, new_cfp);
-        asm.store(Opnd::mem(64, EC, RUBY_OFFSET_EC_CFP), CFP);
-    } else {
-        asm.comment("set ec->cfp");
-        asm.store(Opnd::mem(64, EC, RUBY_OFFSET_EC_CFP), new_cfp);
-    }
 }
 
 fn gen_send_cfunc(
     jit: &mut JITState,
     asm: &mut Assembler,
-    ocb: &mut OutlinedCb,
     ci: *const rb_callinfo,
     cme: *const rb_callable_method_entry_t,
     block: Option<BlockHandler>,
-    recv_known_klass: *const VALUE,
+    recv_known_class: Option<VALUE>,
     flags: u32,
     argc: i32,
 ) -> Option<CodegenStatus> {
@@ -5252,38 +6962,18 @@ fn gen_send_cfunc(
     let cfunc_argc = unsafe { get_mct_argc(cfunc) };
     let mut argc = argc;
 
-    // If the function expects a Ruby array of arguments
-    if cfunc_argc < 0 && cfunc_argc != -1 {
-        gen_counter_incr(asm, Counter::send_cfunc_ruby_array_varg);
-        return None;
-    }
-
-    // We aren't handling a vararg cfuncs with splat currently.
-    if flags & VM_CALL_ARGS_SPLAT != 0 && cfunc_argc == -1 {
-        gen_counter_incr(asm, Counter::send_args_splat_cfunc_var_args);
-        return None;
-    }
+    // Splat call to a C method that takes `VALUE *` and `len`
+    let variable_splat = flags & VM_CALL_ARGS_SPLAT != 0 && cfunc_argc == -1;
+    let block_arg = flags & VM_CALL_ARGS_BLOCKARG != 0;
 
-    if flags & VM_CALL_ARGS_SPLAT != 0 && flags & VM_CALL_ZSUPER != 0 {
-        // zsuper methods are super calls without any arguments.
-        // They are also marked as splat, but don't actually have an array
-        // they pull arguments from, instead we need to change to call
-        // a different method with the current stack.
-        gen_counter_incr(asm, Counter::send_args_splat_cfunc_zuper);
+    // If it's a splat and the method expects a Ruby array of arguments
+    if cfunc_argc == -2 && flags & VM_CALL_ARGS_SPLAT != 0 {
+        gen_counter_incr(jit, asm, Counter::send_cfunc_splat_neg2);
         return None;
     }
 
-    // In order to handle backwards compatibility between ruby 3 and 2
-    // ruby2_keywords was introduced. It is called only on methods
-    // with splat and changes they way they handle them.
-    // We are just going to not compile these.
-    // https://docs.ruby-lang.org/en/3.2/Module.html#method-i-ruby2_keywords
-    if unsafe {
-        get_iseq_flags_ruby2_keywords(jit.iseq) && flags & VM_CALL_ARGS_SPLAT != 0
-    } {
-        gen_counter_incr(asm, Counter::send_args_splat_cfunc_ruby2_keywords);
-        return None;
-    }
+    exit_if_kwsplat_non_nil(jit, asm, flags, Counter::send_cfunc_kw_splat_non_nil)?;
+    let kw_splat = flags & VM_CALL_KW_SPLAT != 0;
 
     let kw_arg = unsafe { vm_ci_kwarg(ci) };
     let kw_arg_num = if kw_arg.is_null() {
@@ -5293,27 +6983,45 @@ fn gen_send_cfunc(
     };
 
     if kw_arg_num != 0 && flags & VM_CALL_ARGS_SPLAT != 0 {
-        gen_counter_incr(asm, Counter::send_cfunc_splat_with_kw);
+        gen_counter_incr(jit, asm, Counter::send_cfunc_splat_with_kw);
         return None;
     }
 
     if c_method_tracing_currently_enabled(jit) {
         // Don't JIT if tracing c_call or c_return
-        gen_counter_incr(asm, Counter::send_cfunc_tracing);
+        gen_counter_incr(jit, asm, Counter::send_cfunc_tracing);
         return None;
     }
 
-    // Delegate to codegen for C methods if we have it.
-    if kw_arg.is_null() && flags & VM_CALL_OPT_SEND == 0 && flags & VM_CALL_ARGS_SPLAT == 0 && (cfunc_argc == -1 || argc == cfunc_argc) {
-        let codegen_p = lookup_cfunc_codegen(unsafe { (*cme).def });
+    // Increment total cfunc send count
+    gen_counter_incr(jit, asm, Counter::num_send_cfunc);
+
+    // Delegate to codegen for C methods if we have it and the callsite is simple enough.
+    if kw_arg.is_null() &&
+            !kw_splat &&
+            flags & VM_CALL_OPT_SEND == 0 &&
+            flags & VM_CALL_ARGS_SPLAT == 0 &&
+            flags & VM_CALL_ARGS_BLOCKARG == 0 &&
+            (cfunc_argc == -1 || argc == cfunc_argc) {
         let expected_stack_after = asm.ctx.get_stack_size() as i32 - argc;
-        if let Some(known_cfunc_codegen) = codegen_p {
-            if known_cfunc_codegen(jit, asm, ocb, ci, cme, block, argc, recv_known_klass) {
+        if let Some(known_cfunc_codegen) = lookup_cfunc_codegen(unsafe { (*cme).def }) {
+            // We don't push a frame for specialized cfunc codegen, so the generated code must be leaf.
+            // However, the interpreter doesn't push a frame on opt_* instruction either, so we allow
+            // non-sendish instructions to break this rule as an exception.
+            let cfunc_codegen = if jit.is_sendish() {
+                asm.with_leaf_ccall(|asm|
+                    perf_call!("gen_send_cfunc: ", known_cfunc_codegen(jit, asm, ci, cme, block, argc, recv_known_class))
+                )
+            } else {
+                perf_call!("gen_send_cfunc: ", known_cfunc_codegen(jit, asm, ci, cme, block, argc, recv_known_class))
+            };
+
+            if cfunc_codegen {
                 assert_eq!(expected_stack_after, asm.ctx.get_stack_size() as i32);
+                gen_counter_incr(jit, asm, Counter::num_send_cfunc_inline);
                 // cfunc codegen generated code. Terminate the block so
                 // there isn't multiple calls in the same block.
-                jump_to_next_insn(jit, asm, ocb);
-                return Some(EndBlock);
+                return jump_to_next_insn(jit, asm);
             }
         }
     }
@@ -5324,11 +7032,31 @@ fn gen_send_cfunc(
     // Stack overflow check
     // #define CHECK_VM_STACK_OVERFLOW0(cfp, sp, margin)
     // REG_CFP <= REG_SP + 4 * SIZEOF_VALUE + sizeof(rb_control_frame_t)
-    asm.comment("stack overflow check");
-    let stack_limit = asm.lea(asm.ctx.sp_opnd((SIZEOF_VALUE * 4 + 2 * RUBY_SIZEOF_CONTROL_FRAME) as isize));
+    asm_comment!(asm, "stack overflow check");
+    const _: () = assert!(RUBY_SIZEOF_CONTROL_FRAME % SIZEOF_VALUE == 0, "sizeof(rb_control_frame_t) is a multiple of sizeof(VALUE)");
+    let stack_limit = asm.lea(asm.ctx.sp_opnd((4 + 2 * (RUBY_SIZEOF_CONTROL_FRAME / SIZEOF_VALUE)) as i32));
     asm.cmp(CFP, stack_limit);
     asm.jbe(Target::side_exit(Counter::guard_send_se_cf_overflow));
 
+    // Guard for variable length splat call before any modifications to the stack
+    if variable_splat {
+        let splat_array_idx = i32::from(kw_splat) + i32::from(block_arg);
+        let comptime_splat_array = jit.peek_at_stack(&asm.ctx, splat_array_idx as isize);
+        if unsafe { rb_yjit_ruby2_keywords_splat_p(comptime_splat_array) } != 0 {
+            gen_counter_incr(jit, asm, Counter::send_cfunc_splat_varg_ruby2_keywords);
+            return None;
+        }
+
+        let splat_array = asm.stack_opnd(splat_array_idx);
+        guard_object_is_array(asm, splat_array, splat_array.into(), Counter::guard_send_splat_not_array);
+
+        asm_comment!(asm, "guard variable length splat call servicable");
+        let sp = asm.ctx.sp_opnd(0);
+        let proceed = asm.ccall(rb_yjit_splat_varg_checks as _, vec![sp, splat_array, CFP]);
+        asm.cmp(proceed, Qfalse.into());
+        asm.je(Target::side_exit(Counter::guard_send_cfunc_bad_splat_vargs));
+    }
+
     // Number of args which will be passed through to the callee
     // This is adjusted by the kwargs being combined into a hash.
     let mut passed_argc = if kw_arg.is_null() {
@@ -5337,21 +7065,24 @@ fn gen_send_cfunc(
         argc - kw_arg_num + 1
     };
 
+    // Exclude the kw_splat hash from arity check
+    if kw_splat {
+        passed_argc -= 1;
+    }
 
     // If the argument count doesn't match
     if cfunc_argc >= 0 && cfunc_argc != passed_argc && flags & VM_CALL_ARGS_SPLAT == 0 {
-        gen_counter_incr(asm, Counter::send_cfunc_argc_mismatch);
+        gen_counter_incr(jit, asm, Counter::send_cfunc_argc_mismatch);
         return None;
     }
 
     // Don't JIT functions that need C stack arguments for now
     if cfunc_argc >= 0 && passed_argc + 1 > (C_ARG_OPNDS.len() as i32) {
-        gen_counter_incr(asm, Counter::send_cfunc_toomany_args);
+        gen_counter_incr(jit, asm, Counter::send_cfunc_toomany_args);
         return None;
     }
 
-    let block_arg = flags & VM_CALL_ARGS_BLOCKARG != 0;
-    let block_arg_type = if block_arg {
+    let mut block_arg_type = if block_arg {
         Some(asm.ctx.get_opnd_type(StackOpnd(0)))
     } else {
         None
@@ -5359,41 +7090,41 @@ fn gen_send_cfunc(
 
     match block_arg_type {
         Some(Type::Nil | Type::BlockParamProxy) => {
-            // We'll handle this later
-        }
-        None => {
-            // Nothing to do
-        }
-        _ => {
-            gen_counter_incr(asm, Counter::send_block_arg);
-            return None;
-        }
-    }
-
-    match block_arg_type {
-        Some(Type::Nil) => {
-            // We have a nil block arg, so let's pop it off the args
+            // We don't need the actual stack value for these
             asm.stack_pop(1);
         }
-        Some(Type::BlockParamProxy) => {
-            // We don't need the actual stack value
+        Some(Type::Unknown | Type::UnknownImm) if jit.peek_at_stack(&asm.ctx, 0).nil_p() => {
+            // The sample blockarg is nil, so speculate that's the case.
+            asm.cmp(asm.stack_opnd(0), Qnil.into());
+            asm.jne(Target::side_exit(Counter::guard_send_cfunc_block_not_nil));
+            block_arg_type = Some(Type::Nil);
             asm.stack_pop(1);
         }
         None => {
             // Nothing to do
         }
         _ => {
-            assert!(false);
+            gen_counter_incr(jit, asm, Counter::send_cfunc_block_arg);
+            return None;
         }
     }
+    let block_arg_type = block_arg_type; // drop `mut`
 
-    // push_splat_args does stack manipulation so we can no longer side exit
-    if flags & VM_CALL_ARGS_SPLAT != 0 {
-        assert!(cfunc_argc >= 0);
+    // Pop the empty kw_splat hash
+    if kw_splat {
+        // Only `**nil` is supported right now. Checked in exit_if_kwsplat_non_nil()
+        assert_eq!(Type::Nil, asm.ctx.get_opnd_type(StackOpnd(0)));
+        asm.stack_pop(1);
+        argc -= 1;
+    }
+
+    // Splat handling when C method takes a static number of arguments.
+    // push_splat_args() does stack manipulation so we can no longer side exit
+    if flags & VM_CALL_ARGS_SPLAT != 0 && cfunc_argc >= 0 {
         let required_args : u32 = (cfunc_argc as u32).saturating_sub(argc as u32 - 1);
         // + 1 because we pass self
         if required_args + 1 >= C_ARG_OPNDS.len() as u32 {
-            gen_counter_incr(asm, Counter::send_cfunc_toomany_args);
+            gen_counter_incr(jit, asm, Counter::send_cfunc_toomany_args);
             return None;
         }
 
@@ -5412,15 +7143,33 @@ fn gen_send_cfunc(
         handle_opt_send_shift_stack(asm, argc);
     }
 
+    // Push a dynamic number of items from the splat array to the stack when calling a vargs method
+    let dynamic_splat_size = if variable_splat {
+        asm_comment!(asm, "variable length splat");
+        let stack_splat_array = asm.lea(asm.stack_opnd(0));
+        Some(asm.ccall(rb_yjit_splat_varg_cfunc as _, vec![stack_splat_array]))
+    } else {
+        None
+    };
+
     // Points to the receiver operand on the stack
     let recv = asm.stack_opnd(argc);
 
     // Store incremented PC into current control frame in case callee raises.
     jit_save_pc(jit, asm);
 
-    // Increment the stack pointer by 3 (in the callee)
-    // sp += 3
-    let sp = asm.lea(asm.ctx.sp_opnd((SIZEOF_VALUE as isize) * 3));
+    // Find callee's SP with space for metadata.
+    // Usually sp+3.
+    let sp = if let Some(splat_size) = dynamic_splat_size {
+        // Compute the callee's SP at runtime in case we accept a variable size for the splat array
+        const _: () = assert!(SIZEOF_VALUE == 8, "opting for a shift since mul on A64 takes no immediates");
+        let splat_size_bytes = asm.lshift(splat_size, 3usize.into());
+        // 3 items for method metadata, minus one to remove the splat array
+        let static_stack_top = asm.lea(asm.ctx.sp_opnd(2));
+        asm.add(static_stack_top, splat_size_bytes)
+    } else {
+        asm.lea(asm.ctx.sp_opnd(3))
+    };
 
     let specval = if block_arg_type == Some(Type::BlockParamProxy) {
         SpecVal::BlockHandler(Some(BlockHandler::BlockParamProxy))
@@ -5433,23 +7182,27 @@ fn gen_send_cfunc(
         frame_type |= VM_FRAME_FLAG_CFRAME_KW
     }
 
-    gen_push_frame(jit, asm, false, ControlFrame {
+    perf_call!("gen_send_cfunc: ", gen_push_frame(jit, asm, ControlFrame {
         frame_type,
         specval,
         cme,
         recv,
         sp,
-        pc: if cfg!(debug_assertions) {
+        pc: if cfg!(feature = "runtime_checks") {
             Some(!0) // Poison value. Helps to fail fast.
         } else {
             None     // Leave PC uninitialized as cfuncs shouldn't read it
         },
         iseq: None,
-    });
+    }));
+
+    asm_comment!(asm, "set ec->cfp");
+    let new_cfp = asm.lea(Opnd::mem(64, CFP, -(RUBY_SIZEOF_CONTROL_FRAME as i32)));
+    asm.store(Opnd::mem(64, EC, RUBY_OFFSET_EC_CFP), new_cfp);
 
     if !kw_arg.is_null() {
         // Build a hash from all kwargs passed
-        asm.comment("build_kwhash");
+        asm_comment!(asm, "build_kwhash");
         let imemo_ci = VALUE(ci as usize);
         assert_ne!(0, unsafe { rb_IMEMO_TYPE_P(imemo_ci, imemo_callinfo) },
             "we assume all callinfos with kwargs are on the GC heap");
@@ -5461,35 +7214,51 @@ fn gen_send_cfunc(
         asm.mov(stack_opnd, kwargs);
     }
 
-    // Copy SP because REG_SP will get overwritten
-    let sp = asm.lea(asm.ctx.sp_opnd(0));
-
-    // Pop the C function arguments from the stack (in the caller)
-    asm.stack_pop((argc + 1).try_into().unwrap());
-
     // Write interpreter SP into CFP.
-    // Needed in case the callee yields to the block.
-    gen_save_sp(asm);
+    // We don't pop arguments yet to use registers for passing them, but we
+    // have to set cfp->sp below them for full_cfunc_return() invalidation.
+    gen_save_sp_with_offset(asm, -(argc + 1) as i8);
 
     // Non-variadic method
     let args = if cfunc_argc >= 0 {
         // Copy the arguments from the stack to the C argument registers
         // self is the 0th argument and is at index argc from the stack top
         (0..=passed_argc).map(|i|
-            Opnd::mem(64, sp, -(argc + 1 - i) * SIZEOF_VALUE_I32)
+            asm.stack_opnd(argc - i)
         ).collect()
     }
     // Variadic method
     else if cfunc_argc == -1 {
         // The method gets a pointer to the first argument
         // rb_f_puts(int argc, VALUE *argv, VALUE recv)
+
+        let passed_argc_opnd = if let Some(splat_size) = dynamic_splat_size {
+            // The final argc is the size of the splat, minus one for the splat array itself
+            asm.add(splat_size, (passed_argc - 1).into())
+        } else {
+            // Without a splat, passed_argc is static
+            Opnd::Imm(passed_argc.into())
+        };
+
         vec![
-            Opnd::Imm(passed_argc.into()),
-            asm.lea(Opnd::mem(64, sp, -(argc) * SIZEOF_VALUE_I32)),
-            Opnd::mem(64, sp, -(argc + 1) * SIZEOF_VALUE_I32),
+            passed_argc_opnd,
+            asm.lea(asm.ctx.sp_opnd(-argc)),
+            asm.stack_opnd(argc),
         ]
     }
-    else {
+    // Variadic method taking a Ruby array
+    else if cfunc_argc == -2 {
+        // Slurp up all the arguments into an array
+        let stack_args = asm.lea(asm.ctx.sp_opnd(-argc));
+        let args_array = asm.ccall(
+            rb_ec_ary_new_from_values as _,
+            vec![EC, passed_argc.into(), stack_args]
+        );
+
+        // Example signature:
+        // VALUE neg2_method(VALUE self, VALUE argv)
+        vec![asm.stack_opnd(argc), args_array]
+    } else {
         panic!("unexpected cfunc_args: {}", cfunc_argc)
     };
 
@@ -5497,8 +7266,9 @@ fn gen_send_cfunc(
     // VALUE ret = (cfunc->func)(recv, argv[0], argv[1]);
     // cfunc comes from compile-time cme->def, which we assume to be stable.
     // Invalidation logic is in yjit_method_lookup_change()
-    asm.comment("call C function");
+    asm_comment!(asm, "call C function");
     let ret = asm.ccall(unsafe { get_mct_func(cfunc) }.cast(), args);
+    asm.stack_pop((argc + 1).try_into().unwrap()); // Pop arguments after ccall to use registers for passing them.
 
     // Record code position for TracePoint patching. See full_cfunc_return().
     record_global_inval_patch(asm, CodegenGlobals::get_outline_full_cfunc_return_pos());
@@ -5507,6 +7277,20 @@ fn gen_send_cfunc(
     let stack_ret = asm.stack_push(Type::Unknown);
     asm.mov(stack_ret, ret);
 
+    // Log the name of the method we're calling to. We intentionally don't do this for inlined cfuncs.
+    // We also do this after the C call to minimize the impact of spill_temps() on asm.ccall().
+    if get_option!(gen_stats) {
+        // Assemble the method name string
+        let mid = unsafe { rb_get_def_original_id((*cme).def) };
+        let name_str = get_method_name(Some(unsafe { (*cme).owner }), mid);
+
+        // Get an index for this cfunc name
+        let cfunc_idx = get_cfunc_idx(&name_str);
+
+        // Increment the counter for this cfunc
+        asm.ccall(incr_cfunc_counter as *const u8, vec![cfunc_idx.into()]);
+    }
+
     // Pop the stack frame (ec->cfp++)
     // Instead of recalculating, we can reuse the previous CFP, which is stored in a callee-saved
     // register
@@ -5514,21 +7298,20 @@ fn gen_send_cfunc(
     asm.store(ec_cfp_opnd, CFP);
 
     // cfunc calls may corrupt types
-    asm.ctx.clear_local_types();
+    asm.clear_local_types();
 
     // Note: the return block of gen_send_iseq() has ctx->sp_offset == 1
     // which allows for sharing the same successor.
 
     // Jump (fall through) to the call continuation block
     // We do this to end the current block after the call
-    jump_to_next_insn(jit, asm, ocb);
-    Some(EndBlock)
+    jump_to_next_insn(jit, asm)
 }
 
 // Generate RARRAY_LEN. For array_opnd, use Opnd::Reg to reduce memory access,
 // and use Opnd::Mem to save registers.
 fn get_array_len(asm: &mut Assembler, array_opnd: Opnd) -> Opnd {
-    asm.comment("get array length for embedded or heap");
+    asm_comment!(asm, "get array length for embedded or heap");
 
     // Pull out the embed flag to check if it's an embedded array.
     let array_reg = match array_opnd {
@@ -5561,7 +7344,7 @@ fn get_array_len(asm: &mut Assembler, array_opnd: Opnd) -> Opnd {
 
 // Generate RARRAY_CONST_PTR (part of RARRAY_AREF)
 fn get_array_ptr(asm: &mut Assembler, array_reg: Opnd) -> Opnd {
-    asm.comment("get array pointer for embedded or heap");
+    asm_comment!(asm, "get array pointer for embedded or heap");
 
     let flags_opnd = Opnd::mem(VALUE_BITS, array_reg, RUBY_OFFSET_RBASIC_FLAGS);
     asm.test(flags_opnd, (RARRAY_EMBED_FLAG as u64).into());
@@ -5577,42 +7360,38 @@ fn get_array_ptr(asm: &mut Assembler, array_reg: Opnd) -> Opnd {
     asm.csel_nz(ary_opnd, heap_ptr_opnd)
 }
 
-/// Pushes arguments from an array to the stack. Differs from push splat because
-/// the array can have items left over.
-fn move_rest_args_to_stack(array: Opnd, num_args: u32, asm: &mut Assembler) {
-    asm.comment("move_rest_args_to_stack");
+// Generate RSTRING_PTR
+fn get_string_ptr(asm: &mut Assembler, string_reg: Opnd) -> Opnd {
+    asm_comment!(asm, "get string pointer for embedded or heap");
+
+    let flags_opnd = Opnd::mem(VALUE_BITS, string_reg, RUBY_OFFSET_RBASIC_FLAGS);
+    asm.test(flags_opnd, (RSTRING_NOEMBED as u64).into());
+    let heap_ptr_opnd = asm.load(Opnd::mem(
+        usize::BITS as u8,
+        string_reg,
+        RUBY_OFFSET_RSTRING_AS_HEAP_PTR,
+    ));
 
-    let array_len_opnd = get_array_len(asm, array);
+    // Load the address of the embedded array
+    // (struct RString *)(obj)->as.ary
+    let ary_opnd = asm.lea(Opnd::mem(VALUE_BITS, string_reg, RUBY_OFFSET_RSTRING_AS_ARY));
+    asm.csel_nz(heap_ptr_opnd, ary_opnd)
+}
 
-    asm.comment("Side exit if length is less than required");
-    asm.cmp(array_len_opnd, num_args.into());
-    asm.jl(Target::side_exit(Counter::guard_send_iseq_has_rest_and_splat_not_equal));
+/// Pushes arguments from an array to the stack. Differs from push splat because
+/// the array can have items left over. Array is assumed to be T_ARRAY without guards.
+fn copy_splat_args_for_rest_callee(array: Opnd, num_args: u32, asm: &mut Assembler) {
+    asm_comment!(asm, "copy_splat_args_for_rest_callee");
 
     // Unused operands cause the backend to panic
     if num_args == 0 {
         return;
     }
 
-    asm.comment("Push arguments from array");
+    asm_comment!(asm, "Push arguments from array");
 
-    // Load the address of the embedded array
-    // (struct RArray *)(obj)->as.ary
     let array_reg = asm.load(array);
-
-    // Conditionally load the address of the heap array
-    // (struct RArray *)(obj)->as.heap.ptr
-    let flags_opnd = Opnd::mem(VALUE_BITS, array_reg, RUBY_OFFSET_RBASIC_FLAGS);
-    asm.test(flags_opnd, Opnd::UImm(RARRAY_EMBED_FLAG as u64));
-    let heap_ptr_opnd = Opnd::mem(
-        usize::BITS as u8,
-        array_reg,
-        RUBY_OFFSET_RARRAY_AS_HEAP_PTR,
-    );
-    // Load the address of the embedded array
-    // (struct RArray *)(obj)->as.ary
-    let ary_opnd = asm.lea(Opnd::mem(VALUE_BITS, array_reg, RUBY_OFFSET_RARRAY_AS_ARY));
-    let ary_opnd = asm.csel_nz(ary_opnd, heap_ptr_opnd);
-
+    let ary_opnd = get_array_ptr(asm, array_reg);
     for i in 0..num_args {
         let top = asm.stack_push(Type::Unknown);
         asm.mov(top, Opnd::mem(64, ary_opnd, i as i32 * SIZEOF_VALUE_I32));
@@ -5623,96 +7402,56 @@ fn move_rest_args_to_stack(array: Opnd, num_args: u32, asm: &mut Assembler) {
 /// It optimistically compiles to a static size that is the exact number of arguments
 /// needed for the function.
 fn push_splat_args(required_args: u32, asm: &mut Assembler) {
-    asm.comment("push_splat_args");
+    asm_comment!(asm, "push_splat_args");
 
     let array_opnd = asm.stack_opnd(0);
-    let array_reg = asm.load(array_opnd);
-
     guard_object_is_array(
         asm,
-        array_reg,
+        array_opnd,
         array_opnd.into(),
         Counter::guard_send_splat_not_array,
     );
 
-    asm.comment("Get array length for embedded or heap");
-
-    // Pull out the embed flag to check if it's an embedded array.
-    let flags_opnd = Opnd::mem(VALUE_BITS, array_reg, RUBY_OFFSET_RBASIC_FLAGS);
-
-    // Get the length of the array
-    let emb_len_opnd = asm.and(flags_opnd, (RARRAY_EMBED_LEN_MASK as u64).into());
-    let emb_len_opnd = asm.rshift(emb_len_opnd, (RARRAY_EMBED_LEN_SHIFT as u64).into());
-
-    // Conditionally move the length of the heap array
-    let flags_opnd = Opnd::mem(VALUE_BITS, array_reg, RUBY_OFFSET_RBASIC_FLAGS);
-    asm.test(flags_opnd, (RARRAY_EMBED_FLAG as u64).into());
-
-    // Need to repeat this here to deal with register allocation
-    let array_opnd = asm.stack_opnd(0);
-    let array_reg = asm.load(array_opnd);
-
-    let array_len_opnd = Opnd::mem(
-        std::os::raw::c_long::BITS as u8,
-        array_reg,
-        RUBY_OFFSET_RARRAY_AS_HEAP_LEN,
-    );
-    let array_len_opnd = asm.csel_nz(emb_len_opnd, array_len_opnd);
+    let array_len_opnd = get_array_len(asm, array_opnd);
 
-    asm.comment("Guard for expected splat length");
+    asm_comment!(asm, "Guard for expected splat length");
     asm.cmp(array_len_opnd, required_args.into());
     asm.jne(Target::side_exit(Counter::guard_send_splatarray_length_not_equal));
 
-    asm.comment("Check last argument is not ruby2keyword hash");
-
-    // Need to repeat this here to deal with register allocation
-    let array_reg = asm.load(asm.stack_opnd(0));
-
-    let ary_opnd = get_array_ptr(asm, array_reg);
-
-    let last_array_value = asm.load(Opnd::mem(64, ary_opnd, (required_args as i32 - 1) * (SIZEOF_VALUE as i32)));
+    // Check last element of array if present
+    if required_args > 0 {
+        asm_comment!(asm, "Check last argument is not ruby2keyword hash");
 
-    guard_object_is_not_ruby2_keyword_hash(
-        asm,
-        last_array_value,
-        Counter::guard_send_splatarray_last_ruby_2_keywords,
-    );
+        // Need to repeat this here to deal with register allocation
+        let array_reg = asm.load(asm.stack_opnd(0));
+        let ary_opnd = get_array_ptr(asm, array_reg);
+        let last_array_value = asm.load(Opnd::mem(64, ary_opnd, (required_args as i32 - 1) * (SIZEOF_VALUE as i32)));
+        guard_object_is_not_ruby2_keyword_hash(
+            asm,
+            last_array_value,
+            Counter::guard_send_splatarray_last_ruby2_keywords,
+        );
+    }
 
-    asm.comment("Push arguments from array");
+    asm_comment!(asm, "Push arguments from array");
     let array_opnd = asm.stack_pop(1);
 
     if required_args > 0 {
-        // Load the address of the embedded array
-        // (struct RArray *)(obj)->as.ary
         let array_reg = asm.load(array_opnd);
-
-        // Conditionally load the address of the heap array
-        // (struct RArray *)(obj)->as.heap.ptr
-        let flags_opnd = Opnd::mem(VALUE_BITS, array_reg, RUBY_OFFSET_RBASIC_FLAGS);
-        asm.test(flags_opnd, Opnd::UImm(RARRAY_EMBED_FLAG as u64));
-        let heap_ptr_opnd = Opnd::mem(
-            usize::BITS as u8,
-            array_reg,
-            RUBY_OFFSET_RARRAY_AS_HEAP_PTR,
-        );
-        // Load the address of the embedded array
-        // (struct RArray *)(obj)->as.ary
-        let ary_opnd = asm.lea(Opnd::mem(VALUE_BITS, array_reg, RUBY_OFFSET_RARRAY_AS_ARY));
-        let ary_opnd = asm.csel_nz(ary_opnd, heap_ptr_opnd);
+        let ary_opnd = get_array_ptr(asm, array_reg);
 
         for i in 0..required_args {
             let top = asm.stack_push(Type::Unknown);
             asm.mov(top, Opnd::mem(64, ary_opnd, i as i32 * SIZEOF_VALUE_I32));
         }
 
-        asm.comment("end push_each");
+        asm_comment!(asm, "end push_each");
     }
 }
 
 fn gen_send_bmethod(
     jit: &mut JITState,
     asm: &mut Assembler,
-    ocb: &mut OutlinedCb,
     ci: *const rb_callinfo,
     cme: *const rb_callable_method_entry_t,
     block: Option<BlockHandler>,
@@ -5733,26 +7472,100 @@ fn gen_send_bmethod(
 
     // Optimize for single ractor mode and avoid runtime check for
     // "defined with an un-shareable Proc in a different Ractor"
-    if !assume_single_ractor_mode(jit, asm, ocb) {
-        gen_counter_incr(asm, Counter::send_bmethod_ractor);
+    if !assume_single_ractor_mode(jit, asm) {
+        gen_counter_incr(jit, asm, Counter::send_bmethod_ractor);
         return None;
     }
 
     // Passing a block to a block needs logic different from passing
     // a block to a method and sometimes requires allocation. Bail for now.
     if block.is_some() {
-        gen_counter_incr(asm, Counter::send_bmethod_block_arg);
+        gen_counter_incr(jit, asm, Counter::send_bmethod_block_arg);
         return None;
     }
 
     let frame_type = VM_FRAME_MAGIC_BLOCK | VM_FRAME_FLAG_BMETHOD | VM_FRAME_FLAG_LAMBDA;
-    gen_send_iseq(jit, asm, ocb, iseq, ci, frame_type, Some(capture.ep), cme, block, flags, argc, None)
+    perf_call! { gen_send_iseq(jit, asm, iseq, ci, frame_type, Some(capture.ep), cme, block, flags, argc, None) }
+}
+
+/// The kind of a value an ISEQ returns
+enum IseqReturn {
+    Value(VALUE),
+    LocalVariable(u32),
+    Receiver,
+}
+
+extern "C" {
+    fn rb_simple_iseq_p(iseq: IseqPtr) -> bool;
+    fn rb_iseq_only_kwparam_p(iseq: IseqPtr) -> bool;
+}
+
+/// Return the ISEQ's return value if it consists of one simple instruction and leave.
+fn iseq_get_return_value(iseq: IseqPtr, captured_opnd: Option<Opnd>, block: Option<BlockHandler>, ci_flags: u32) -> Option<IseqReturn> {
+    // Expect only two instructions and one possible operand
+    // NOTE: If an ISEQ has an optional keyword parameter with a default value that requires
+    // computation, the ISEQ will always have more than two instructions and won't be inlined.
+    let iseq_size = unsafe { get_iseq_encoded_size(iseq) };
+    if !(2..=3).contains(&iseq_size) {
+        return None;
+    }
+
+    // Get the first two instructions
+    let first_insn = iseq_opcode_at_idx(iseq, 0);
+    let second_insn = iseq_opcode_at_idx(iseq, insn_len(first_insn as usize));
+
+    // Extract the return value if known
+    if second_insn != YARVINSN_leave {
+        return None;
+    }
+    match first_insn {
+        YARVINSN_getlocal_WC_0  => {
+            // Accept only cases where only positional arguments are used by both the callee and the caller.
+            // Keyword arguments may be specified by the callee or the caller but not used.
+            // Reject block ISEQs to avoid autosplat and other block parameter complications.
+            if captured_opnd.is_some()
+                // Reject if block ISEQ is present
+                || block.is_some()
+                // Equivalent to `VM_CALL_ARGS_SIMPLE - VM_CALL_KWARG - has_block_iseq`
+                || ci_flags & (
+                      VM_CALL_ARGS_SPLAT
+                    | VM_CALL_KW_SPLAT
+                    | VM_CALL_ARGS_BLOCKARG
+                    | VM_CALL_FORWARDING
+                ) != 0
+                 {
+                return None;
+            }
+
+            let ep_offset = unsafe { *rb_iseq_pc_at_idx(iseq, 1) }.as_u32();
+            let local_idx = ep_offset_to_local_idx(iseq, ep_offset);
+
+            if unsafe { rb_simple_iseq_p(iseq) } {
+                return Some(IseqReturn::LocalVariable(local_idx));
+            } else if unsafe { rb_iseq_only_kwparam_p(iseq) } {
+                // Inline if only positional parameters are used
+                if let Ok(i) = i32::try_from(local_idx) {
+                    if i < unsafe { rb_get_iseq_body_param_lead_num(iseq) } {
+                        return Some(IseqReturn::LocalVariable(local_idx));
+                    }
+                }
+            }
+
+            return None;
+        }
+        YARVINSN_putnil => Some(IseqReturn::Value(Qnil)),
+        YARVINSN_putobject => Some(IseqReturn::Value(unsafe { *rb_iseq_pc_at_idx(iseq, 1) })),
+        YARVINSN_putobject_INT2FIX_0_ => Some(IseqReturn::Value(VALUE::fixnum_from_usize(0))),
+        YARVINSN_putobject_INT2FIX_1_ => Some(IseqReturn::Value(VALUE::fixnum_from_usize(1))),
+        // We don't support invokeblock for now. Such ISEQs are likely not used by blocks anyway.
+        YARVINSN_putself if captured_opnd.is_none() => Some(IseqReturn::Receiver),
+        _ => None,
+    }
 }
 
 fn gen_send_iseq(
     jit: &mut JITState,
     asm: &mut Assembler,
-    ocb: &mut OutlinedCb,
     iseq: *const rb_iseq_t,
     ci: *const rb_callinfo,
     frame_type: u32,
@@ -5777,13 +7590,28 @@ fn gen_send_iseq(
     // that the callee could use to know which keywords are unspecified
     // (see the `checkkeyword` instruction and check `ruby --dump=insn -e 'def foo(k:itself)=k'`).
     // We always need to set up this local if the call goes through.
-    let doing_kw_call = unsafe { get_iseq_flags_has_kw(iseq) };
+    let has_kwrest = unsafe { get_iseq_flags_has_kwrest(iseq) };
+    let doing_kw_call = unsafe { get_iseq_flags_has_kw(iseq) } || has_kwrest;
     let supplying_kws = unsafe { vm_ci_flag(ci) & VM_CALL_KWARG } != 0;
     let iseq_has_rest = unsafe { get_iseq_flags_has_rest(iseq) };
     let iseq_has_block_param = unsafe { get_iseq_flags_has_block(iseq) };
+    let arg_setup_block = captured_opnd.is_some(); // arg_setup_type: arg_setup_block (invokeblock)
+
+    // Is this iseq tagged as "forwardable"? Iseqs that take `...` as a
+    // parameter are tagged as forwardable (e.g. `def foo(...); end`)
+    let forwarding = unsafe { rb_get_iseq_flags_forwardable(iseq) };
+
+    // If a "forwardable" iseq has been called with a splat, then we _do not_
+    // want to expand the splat to the stack. So we'll only consider this
+    // a splat call if the callee iseq is not forwardable.  For example,
+    // we do not want to handle the following code:
+    //
+    // `def foo(...); end; foo(*blah)`
+    let splat_call = (flags & VM_CALL_ARGS_SPLAT != 0) && !forwarding;
+    let kw_splat = (flags & VM_CALL_KW_SPLAT != 0) && !forwarding;
 
     // For computing offsets to callee locals
-    let num_params = unsafe { get_iseq_body_param_size(iseq) };
+    let num_params = unsafe { get_iseq_body_param_size(iseq) as i32 };
     let num_locals = unsafe { get_iseq_body_local_table_size(iseq) as i32 };
 
     let mut start_pc_offset: u16 = 0;
@@ -5798,35 +7626,49 @@ fn gen_send_iseq(
         unsafe { get_cikw_keyword_len(kw_arg) }
     };
 
-    // Arity handling and optional parameter setup
-    let mut opts_filled = argc - required_num - kw_arg_num;
+    // Arity handling and optional parameter setup for positional arguments.
+    // Splats are handled later.
+    let mut opts_filled = argc - required_num - kw_arg_num - i32::from(kw_splat) - i32::from(splat_call);
     let opt_num = unsafe { get_iseq_body_param_opt_num(iseq) };
-    // We have a rest parameter so there could be more args
-    // than are required + optional. Those will go in rest.
+    // With a rest parameter or a yield to a block,
+    // callers can pass more than required + optional.
     // So we cap ops_filled at opt_num.
-    if iseq_has_rest {
+    if iseq_has_rest || arg_setup_block {
         opts_filled = min(opts_filled, opt_num);
     }
     let mut opts_missing: i32 = opt_num - opts_filled;
 
     let block_arg = flags & VM_CALL_ARGS_BLOCKARG != 0;
+    // Stack index of the splat array
+    let splat_pos = i32::from(block_arg) + i32::from(kw_splat) + kw_arg_num;
 
     exit_if_stack_too_large(iseq)?;
-    exit_if_tail_call(asm, ci)?;
-    exit_if_has_post(asm, iseq)?;
-    exit_if_has_kwrest(asm, iseq)?;
-    exit_if_splat_and_ruby2_keywords(asm, jit, flags)?;
-    exit_if_has_rest_and_captured(asm, iseq_has_rest, captured_opnd)?;
-    exit_if_has_rest_and_supplying_kws(asm, iseq_has_rest, iseq, supplying_kws)?;
-    exit_if_supplying_kw_and_has_no_kw(asm, supplying_kws, iseq)?;
-    exit_if_supplying_kws_and_accept_no_kwargs(asm, supplying_kws, iseq)?;
-    exit_if_splat_and_zsuper(asm, flags)?;
-    exit_if_doing_kw_and_splat(asm, doing_kw_call, flags)?;
-    exit_if_wrong_number_arguments(asm, opts_filled, flags, opt_num, iseq_has_rest)?;
-    exit_if_doing_kw_and_opts_missing(asm, doing_kw_call, opts_missing)?;
-    exit_if_has_rest_and_optional_and_block(asm, iseq_has_rest, opt_num, iseq, block_arg)?;
+    exit_if_tail_call(jit, asm, ci)?;
+    exit_if_has_post(jit, asm, iseq)?;
+    exit_if_kwsplat_non_nil(jit, asm, flags, Counter::send_iseq_kw_splat_non_nil)?;
+    exit_if_has_rest_and_captured(jit, asm, iseq_has_rest, captured_opnd)?;
+    exit_if_has_kwrest_and_captured(jit, asm, has_kwrest, captured_opnd)?;
+    exit_if_has_rest_and_supplying_kws(jit, asm, iseq_has_rest, supplying_kws)?;
+    exit_if_supplying_kw_and_has_no_kw(jit, asm, supplying_kws, doing_kw_call)?;
+    exit_if_supplying_kws_and_accept_no_kwargs(jit, asm, supplying_kws, iseq)?;
+    exit_if_doing_kw_and_splat(jit, asm, doing_kw_call, flags)?;
+    if !forwarding {
+        exit_if_wrong_number_arguments(jit, asm, arg_setup_block, opts_filled, flags, opt_num, iseq_has_rest)?;
+    }
+    exit_if_doing_kw_and_opts_missing(jit, asm, doing_kw_call, opts_missing)?;
+    exit_if_has_rest_and_optional_and_block(jit, asm, iseq_has_rest, opt_num, iseq, block_arg)?;
+    if forwarding && flags & VM_CALL_OPT_SEND != 0 {
+        gen_counter_incr(jit, asm, Counter::send_iseq_send_forwarding);
+        return None;
+    }
     let block_arg_type = exit_if_unsupported_block_arg_type(jit, asm, block_arg)?;
 
+    // Bail if we can't drop extra arguments for a yield by just popping them
+    if supplying_kws && arg_setup_block && argc > (kw_arg_num + required_num + opt_num) {
+        gen_counter_incr(jit, asm, Counter::send_iseq_complex_discard_extras);
+        return None;
+    }
+
     // Block parameter handling. This mirrors setup_parameters_complex().
     if iseq_has_block_param {
         if unsafe { get_iseq_body_local_iseq(iseq) == iseq } {
@@ -5835,135 +7677,48 @@ fn gen_send_iseq(
             // In this case (param.flags.has_block && local_iseq != iseq),
             // the block argument is setup as a local variable and requires
             // materialization (allocation). Bail.
-            gen_counter_incr(asm, Counter::send_iseq_materialized_block);
+            gen_counter_incr(jit, asm, Counter::send_iseq_materialized_block);
             return None;
         }
     }
 
+    // Check that required keyword arguments are supplied and find any extras
+    // that should go into the keyword rest parameter (**kw_rest).
     if doing_kw_call {
-        // Here we're calling a method with keyword arguments and specifying
-        // keyword arguments at this call site.
-
-        // This struct represents the metadata about the callee-specified
-        // keyword parameters.
-        let keyword = unsafe { get_iseq_body_param_keyword(iseq) };
-        let keyword_num: usize = unsafe { (*keyword).num }.try_into().unwrap();
-        let keyword_required_num: usize = unsafe { (*keyword).required_num }.try_into().unwrap();
-
-        let mut required_kwargs_filled = 0;
-
-        if keyword_num > 30 {
-            // We have so many keywords that (1 << num) encoded as a FIXNUM
-            // (which shifts it left one more) no longer fits inside a 32-bit
-            // immediate.
-            gen_counter_incr(asm, Counter::send_iseq_too_many_kwargs);
-            return None;
-        }
-
-        // Check that the kwargs being passed are valid
-        if supplying_kws {
-            // This is the list of keyword arguments that the callee specified
-            // in its initial declaration.
-            // SAFETY: see compile.c for sizing of this slice.
-            let callee_kwargs = unsafe { slice::from_raw_parts((*keyword).table, keyword_num) };
-
-            // Here we're going to build up a list of the IDs that correspond to
-            // the caller-specified keyword arguments. If they're not in the
-            // same order as the order specified in the callee declaration, then
-            // we're going to need to generate some code to swap values around
-            // on the stack.
-            let kw_arg_keyword_len: usize =
-                unsafe { get_cikw_keyword_len(kw_arg) }.try_into().unwrap();
-            let mut caller_kwargs: Vec<ID> = vec![0; kw_arg_keyword_len];
-            for kwarg_idx in 0..kw_arg_keyword_len {
-                let sym = unsafe { get_cikw_keywords_idx(kw_arg, kwarg_idx.try_into().unwrap()) };
-                caller_kwargs[kwarg_idx] = unsafe { rb_sym2id(sym) };
-            }
-
-            // First, we're going to be sure that the names of every
-            // caller-specified keyword argument correspond to a name in the
-            // list of callee-specified keyword parameters.
-            for caller_kwarg in caller_kwargs {
-                let search_result = callee_kwargs
-                    .iter()
-                    .enumerate() // inject element index
-                    .find(|(_, &kwarg)| kwarg == caller_kwarg);
-
-                match search_result {
-                    None => {
-                        // If the keyword was never found, then we know we have a
-                        // mismatch in the names of the keyword arguments, so we need to
-                        // bail.
-                        gen_counter_incr(asm, Counter::send_iseq_kwargs_mismatch);
-                        return None;
-                    }
-                    Some((callee_idx, _)) if callee_idx < keyword_required_num => {
-                        // Keep a count to ensure all required kwargs are specified
-                        required_kwargs_filled += 1;
-                    }
-                    _ => (),
-                }
-            }
-        }
-        assert!(required_kwargs_filled <= keyword_required_num);
-        if required_kwargs_filled != keyword_required_num {
-            gen_counter_incr(asm, Counter::send_iseq_kwargs_mismatch);
-            return None;
-        }
-    }
-
-    // Check if we need the arg0 splat handling of vm_callee_setup_block_arg()
-    // Also known as "autosplat" inside setup_parameters_complex()
-    let arg_setup_block = captured_opnd.is_some(); // arg_setup_type: arg_setup_block (invokeblock)
-    let block_arg0_splat = arg_setup_block && argc == 1 && unsafe {
-         (get_iseq_flags_has_lead(iseq) || opt_num > 1)
-             && !get_iseq_flags_ambiguous_param0(iseq)
-    };
-    if block_arg0_splat {
-        // If block_arg0_splat, we still need side exits after splat, but
-        // doing push_splat_args here disallows it. So bail out.
-        if flags & VM_CALL_ARGS_SPLAT != 0 && !iseq_has_rest {
-            gen_counter_incr(asm, Counter::invokeblock_iseq_arg0_args_splat);
-            return None;
-        }
-        // The block_arg0_splat implementation is for the rb_simple_iseq_p case,
-        // but doing_kw_call means it's not a simple ISEQ.
-        if doing_kw_call {
-            gen_counter_incr(asm, Counter::invokeblock_iseq_arg0_has_kw);
-            return None;
-        }
-        // The block_arg0_splat implementation cannot deal with optional parameters.
-        // This is a setup_parameters_complex() situation and interacts with the
-        // starting position of the callee.
-        if opt_num > 1 {
-            gen_counter_incr(asm, Counter::invokeblock_iseq_arg0_optional);
-            return None;
-        }
+        gen_iseq_kw_call_checks(jit, asm, iseq, kw_arg, has_kwrest, kw_arg_num)?;
     }
 
-    let splat_array_length = if flags & VM_CALL_ARGS_SPLAT != 0 {
-        let array = jit.peek_at_stack(&asm.ctx, if block_arg { 1 } else { 0 }) ;
+    let splat_array_length = if splat_call {
+        let array = jit.peek_at_stack(&asm.ctx, splat_pos as isize);
         let array_length = if array == Qnil {
             0
+        } else if unsafe { !RB_TYPE_P(array, RUBY_T_ARRAY) } {
+            gen_counter_incr(jit, asm, Counter::send_iseq_splat_not_array);
+            return None;
         } else {
             unsafe { rb_yjit_array_len(array) as u32}
         };
 
-        if opt_num == 0 && required_num != array_length as i32 + argc - 1 && !iseq_has_rest {
-            gen_counter_incr(asm, Counter::send_iseq_splat_arity_error);
-            return None;
+        // Arity check accounting for size of the splat. When callee has rest parameters, we insert
+        // runtime guards later in copy_splat_args_for_rest_callee()
+        if !iseq_has_rest {
+            let supplying = argc - 1 - i32::from(kw_splat) + array_length as i32;
+            if (required_num..=required_num + opt_num).contains(&supplying) == false {
+                gen_counter_incr(jit, asm, Counter::send_iseq_splat_arity_error);
+                return None;
+            }
         }
 
         if iseq_has_rest && opt_num > 0 {
-            // If we have a rest and option arugments
+            // If we have a rest and option arguments
             // we are going to set the pc_offset for where
             // to jump in the called method.
             // If the number of args change, that would need to
             // change and we don't change that dynmically so we side exit.
             // On a normal splat without rest and option args this is handled
             // elsewhere depending on the case
-            asm.comment("Side exit if length doesn't not equal compile time length");
-            let array_len_opnd = get_array_len(asm, asm.stack_opnd(if block_arg { 1 } else { 0 }));
+            asm_comment!(asm, "Side exit if length doesn't not equal compile time length");
+            let array_len_opnd = get_array_len(asm, asm.stack_opnd(splat_pos));
             asm.cmp(array_len_opnd, array_length.into());
             asm.jne(Target::side_exit(Counter::guard_send_splatarray_length_not_equal));
         }
@@ -5973,12 +7728,39 @@ fn gen_send_iseq(
         None
     };
 
+    // Check if we need the arg0 splat handling of vm_callee_setup_block_arg()
+    // Also known as "autosplat" inside setup_parameters_complex().
+    // Autosplat checks argc == 1 after splat and kwsplat processing, so make
+    // sure to amend this if we start support kw_splat.
+    let block_arg0_splat = arg_setup_block
+        && (argc == 1 || (argc == 2 && splat_array_length == Some(0)))
+        && !supplying_kws && !doing_kw_call
+        && unsafe {
+            (get_iseq_flags_has_lead(iseq) || opt_num > 1)
+                && !get_iseq_flags_ambiguous_param0(iseq)
+        };
+    if block_arg0_splat {
+        // If block_arg0_splat, we still need side exits after splat, but
+        // the splat modifies the stack which breaks side exits. So bail out.
+        if splat_call {
+            gen_counter_incr(jit, asm, Counter::invokeblock_iseq_arg0_args_splat);
+            return None;
+        }
+        // The block_arg0_splat implementation cannot deal with optional parameters.
+        // This is a setup_parameters_complex() situation and interacts with the
+        // starting position of the callee.
+        if opt_num > 1 {
+            gen_counter_incr(jit, asm, Counter::invokeblock_iseq_arg0_optional);
+            return None;
+        }
+    }
+
     // Adjust `opts_filled` and `opts_missing` taking
     // into account the size of the splat expansion.
     if let Some(len) = splat_array_length {
         assert_eq!(kw_arg_num, 0); // Due to exit_if_doing_kw_and_splat().
                                    // Simplifies calculation below.
-        let num_args = (argc - 1) + len as i32;
+        let num_args = argc - 1 - i32::from(kw_splat) + len as i32;
 
         opts_filled = if num_args >= required_num {
             min(num_args - required_num, opt_num)
@@ -5991,7 +7773,7 @@ fn gen_send_iseq(
     assert_eq!(opts_missing + opts_filled, opt_num);
     assert!(opts_filled >= 0);
 
-    // ISeq with optional paramters start at different
+    // ISeq with optional parameters start at different
     // locations depending on the number of optionals given.
     if opt_num > 0 {
         assert!(opts_filled >= 0);
@@ -6001,98 +7783,203 @@ fn gen_send_iseq(
         }
     }
 
-    // We will not have None from here. You can use stack_pop / stack_pop.
+    // Increment total ISEQ send count
+    gen_counter_incr(jit, asm, Counter::num_send_iseq);
+
+    // Shortcut for special `Primitive.attr! :leaf` builtins
+    let builtin_attrs = unsafe { rb_yjit_iseq_builtin_attrs(iseq) };
+    let builtin_func_raw = unsafe { rb_yjit_builtin_function(iseq) };
+    let builtin_func = if builtin_func_raw.is_null() { None } else { Some(builtin_func_raw) };
+    let opt_send_call = flags & VM_CALL_OPT_SEND != 0; // .send call is not currently supported for builtins
+    if let (None, Some(builtin_info), true, false, None | Some(0)) =
+           (block, builtin_func, builtin_attrs & BUILTIN_ATTR_LEAF != 0, opt_send_call, splat_array_length) {
+        let builtin_argc = unsafe { (*builtin_info).argc };
+        if builtin_argc + 1 < (C_ARG_OPNDS.len() as i32) {
+            // We pop the block arg without using it because:
+            //  - the builtin is leaf, so it promises to not `yield`.
+            //  - no leaf builtins have block param at the time of writing, and
+            //    adding one requires interpreter changes to support.
+            if block_arg_type.is_some() {
+                if iseq_has_block_param {
+                    gen_counter_incr(jit, asm, Counter::send_iseq_leaf_builtin_block_arg_block_param);
+                    return None;
+                }
+                asm.stack_pop(1);
+            }
+
+            // Pop empty kw_splat hash which passes nothing (exit_if_kwsplat_non_nil())
+            if kw_splat {
+                asm.stack_pop(1);
+            }
+
+            // Pop empty splat array which passes nothing
+            if let Some(0) = splat_array_length {
+                asm.stack_pop(1);
+            }
+
+            asm_comment!(asm, "inlined leaf builtin");
+            gen_counter_incr(jit, asm, Counter::num_send_iseq_leaf);
+
+            // The callee may allocate, e.g. Integer#abs on a Bignum.
+            // Save SP for GC, save PC for allocation tracing, and prepare
+            // for global invalidation after GC's VM lock contention.
+            jit_prepare_call_with_gc(jit, asm);
+
+            // Call the builtin func (ec, recv, arg1, arg2, ...)
+            let mut args = vec![EC];
+
+            // Copy self and arguments
+            for i in 0..=builtin_argc {
+                let stack_opnd = asm.stack_opnd(builtin_argc - i);
+                args.push(stack_opnd);
+            }
+            let val = asm.ccall(unsafe { (*builtin_info).func_ptr as *const u8 }, args);
+            asm.stack_pop((builtin_argc + 1).try_into().unwrap()); // Keep them on stack during ccall for GC
+
+            // Push the return value
+            let stack_ret = asm.stack_push(Type::Unknown);
+            asm.mov(stack_ret, val);
+
+            // Note: assuming that the leaf builtin doesn't change local variables here.
+            // Seems like a safe assumption.
+
+            // Let guard chains share the same successor
+            return jump_to_next_insn(jit, asm);
+        }
+    }
+
+    // Inline simple ISEQs whose return value is known at compile time
+    if let (Some(value), None, false) = (iseq_get_return_value(iseq, captured_opnd, block, flags), block_arg_type, opt_send_call) {
+        asm_comment!(asm, "inlined simple ISEQ");
+        gen_counter_incr(jit, asm, Counter::num_send_iseq_inline);
+
+        match value {
+            IseqReturn::LocalVariable(local_idx) => {
+                // Put the local variable at the return slot
+                let stack_local = asm.stack_opnd(argc - 1 - local_idx as i32);
+                let stack_return = asm.stack_opnd(argc);
+                asm.mov(stack_return, stack_local);
+
+                // Update the mapping for the return value
+                let mapping = asm.ctx.get_opnd_mapping(stack_local.into());
+                asm.ctx.set_opnd_mapping(stack_return.into(), mapping);
+
+                // Pop everything but the return value
+                asm.stack_pop(argc as usize);
+            }
+            IseqReturn::Value(value) => {
+                // Pop receiver and arguments
+                asm.stack_pop(argc as usize + if captured_opnd.is_some() { 0 } else { 1 });
+
+                // Push the return value
+                let stack_ret = asm.stack_push(Type::from(value));
+                asm.mov(stack_ret, value.into());
+            },
+            IseqReturn::Receiver => {
+                // Just pop arguments and leave the receiver on stack
+                asm.stack_pop(argc as usize);
+            }
+        }
+
+        // Let guard chains share the same successor
+        return jump_to_next_insn(jit, asm);
+    }
+
+    // Stack overflow check
+    // Note that vm_push_frame checks it against a decremented cfp, hence the multiply by 2.
+    // #define CHECK_VM_STACK_OVERFLOW0(cfp, sp, margin)
+    asm_comment!(asm, "stack overflow check");
+    const _: () = assert!(RUBY_SIZEOF_CONTROL_FRAME % SIZEOF_VALUE == 0, "sizeof(rb_control_frame_t) is a multiple of sizeof(VALUE)");
+    let stack_max: i32 = unsafe { get_iseq_body_stack_max(iseq) }.try_into().unwrap();
+    let locals_offs = (num_locals + stack_max) + 2 * (RUBY_SIZEOF_CONTROL_FRAME / SIZEOF_VALUE) as i32;
+    let stack_limit = asm.lea(asm.ctx.sp_opnd(locals_offs));
+    asm.cmp(CFP, stack_limit);
+    asm.jbe(Target::side_exit(Counter::guard_send_se_cf_overflow));
+
+    if iseq_has_rest && splat_call {
+        // Insert length guard for a call to copy_splat_args_for_rest_callee()
+        // that will come later. We will have made changes to
+        // the stack by spilling or handling __send__ shifting
+        // by the time we get to that code, so we need the
+        // guard here where we can still side exit.
+        let non_rest_arg_count = argc - i32::from(kw_splat) - 1;
+        if non_rest_arg_count < required_num + opt_num {
+            let take_count: u32 = (required_num - non_rest_arg_count + opts_filled)
+                .try_into().unwrap();
+
+            if take_count > 0 {
+                asm_comment!(asm, "guard splat_array_length >= {take_count}");
+
+                let splat_array = asm.stack_opnd(splat_pos);
+                let array_len_opnd = get_array_len(asm, splat_array);
+                asm.cmp(array_len_opnd, take_count.into());
+                asm.jl(Target::side_exit(Counter::guard_send_iseq_has_rest_and_splat_too_few));
+            }
+        }
+
+        // All splats need to guard for ruby2_keywords hash. Check with a function call when
+        // splatting into a rest param since the index for the last item in the array is dynamic.
+        asm_comment!(asm, "guard no ruby2_keywords hash in splat");
+        let bad_splat = asm.ccall(rb_yjit_ruby2_keywords_splat_p as _, vec![asm.stack_opnd(splat_pos)]);
+        asm.cmp(bad_splat, 0.into());
+        asm.jnz(Target::side_exit(Counter::guard_send_splatarray_last_ruby2_keywords));
+    }
 
     match block_arg_type {
-        Some(Type::Nil) => {
+        Some(BlockArg::Nil) => {
             // We have a nil block arg, so let's pop it off the args
             asm.stack_pop(1);
         }
-        Some(Type::BlockParamProxy) => {
+        Some(BlockArg::BlockParamProxy) => {
             // We don't need the actual stack value
             asm.stack_pop(1);
         }
-        Some(Type::TProc) => {
+        Some(BlockArg::TProc) => {
             // Place the proc as the block handler. We do this early because
             // the block arg being at the top of the stack gets in the way of
             // rest param handling later. Also, since there are C calls that
             // come later, we can't hold this value in a register and place it
             // near the end when we push a new control frame.
-            asm.comment("guard block arg is a proc");
-            // Simple predicate, no need for jit_prepare_routine_call().
+            asm_comment!(asm, "guard block arg is a proc");
+            // Simple predicate, no need for jit_prepare_non_leaf_call().
             let is_proc = asm.ccall(rb_obj_is_proc as _, vec![asm.stack_opnd(0)]);
             asm.cmp(is_proc, Qfalse.into());
             jit_chain_guard(
                 JCC_JE,
                 jit,
                 asm,
-                ocb,
-                SEND_MAX_CHAIN_DEPTH,
+                SEND_MAX_DEPTH,
                 Counter::guard_send_block_arg_type,
             );
 
-            let proc = asm.stack_pop(1);
-            let callee_ep = -argc + num_locals + VM_ENV_DATA_SIZE as i32 - 1;
+            // If this is a forwardable iseq, adjust the stack size accordingly
+            let callee_ep = if forwarding {
+                -1 + num_locals + VM_ENV_DATA_SIZE as i32
+            } else {
+                -argc + num_locals + VM_ENV_DATA_SIZE as i32 - 1
+            };
             let callee_specval = callee_ep + VM_ENV_DATA_INDEX_SPECVAL;
-            let callee_specval = asm.ctx.sp_opnd(callee_specval as isize * SIZEOF_VALUE as isize);
+            if callee_specval < 0 {
+                // Can't write to sp[-n] since that's where the arguments are
+                gen_counter_incr(jit, asm, Counter::send_iseq_clobbering_block_arg);
+                return None;
+            }
+            let proc = asm.stack_pop(1); // Pop first, as argc doesn't account for the block arg
+            let callee_specval = asm.ctx.sp_opnd(callee_specval);
             asm.store(callee_specval, proc);
         }
         None => {
             // Nothing to do
         }
-        _ => unreachable!(),
     }
 
-    let builtin_attrs = unsafe { rb_yjit_iseq_builtin_attrs(iseq) };
-    let builtin_func_raw = unsafe { rb_yjit_builtin_function(iseq) };
-    let builtin_func = if builtin_func_raw.is_null() { None } else { Some(builtin_func_raw) };
-    let opt_send_call = flags & VM_CALL_OPT_SEND != 0; // .send call is not currently supported for builtins
-    if let (None, Some(builtin_info), true, false) = (block, builtin_func, builtin_attrs & BUILTIN_ATTR_LEAF != 0, opt_send_call) {
-        let builtin_argc = unsafe { (*builtin_info).argc };
-        if builtin_argc + 1 < (C_ARG_OPNDS.len() as i32) {
-            asm.comment("inlined leaf builtin");
-
-            // Skip this if it doesn't trigger GC
-            if builtin_attrs & BUILTIN_ATTR_NO_GC == 0 {
-                // The callee may allocate, e.g. Integer#abs on a Bignum.
-                // Save SP for GC, save PC for allocation tracing, and prepare
-                // for global invalidation after GC's VM lock contention.
-                jit_prepare_routine_call(jit, asm);
-            }
-
-            // Call the builtin func (ec, recv, arg1, arg2, ...)
-            let mut args = vec![EC];
-
-            // Copy self and arguments
-            for i in 0..=builtin_argc {
-                let stack_opnd = asm.stack_opnd(builtin_argc - i);
-                args.push(stack_opnd);
-            }
-            asm.stack_pop((builtin_argc + 1).try_into().unwrap());
-            let val = asm.ccall(unsafe { (*builtin_info).func_ptr as *const u8 }, args);
-
-            // Push the return value
-            let stack_ret = asm.stack_push(Type::Unknown);
-            asm.mov(stack_ret, val);
-
-            // Note: assuming that the leaf builtin doesn't change local variables here.
-            // Seems like a safe assumption.
-
-            return Some(KeepCompiling);
-        }
+    if kw_splat {
+        // Only `**nil` is supported right now. Checked in exit_if_kwsplat_non_nil()
+        assert_eq!(Type::Nil, asm.ctx.get_opnd_type(StackOpnd(0)));
+        asm.stack_pop(1);
+        argc -= 1;
     }
 
-    // Stack overflow check
-    // Note that vm_push_frame checks it against a decremented cfp, hence the multiply by 2.
-    // #define CHECK_VM_STACK_OVERFLOW0(cfp, sp, margin)
-    asm.comment("stack overflow check");
-    let stack_max: i32 = unsafe { get_iseq_body_stack_max(iseq) }.try_into().unwrap();
-    let locals_offs =
-        SIZEOF_VALUE_I32 * (num_locals + stack_max) + 2 * (RUBY_SIZEOF_CONTROL_FRAME as i32);
-    let stack_limit = asm.lea(asm.ctx.sp_opnd(locals_offs as isize));
-    asm.cmp(CFP, stack_limit);
-    asm.jbe(Target::side_exit(Counter::guard_send_se_cf_overflow));
-
     // push_splat_args does stack manipulation so we can no longer side exit
     if let Some(array_length) = splat_array_length {
         if !iseq_has_rest {
@@ -6100,7 +7987,7 @@ fn gen_send_iseq(
             // an array that has the same length. We will insert guards.
             argc = argc - 1 + array_length as i32;
             if argc + asm.ctx.get_stack_size() as i32 > MAX_SPLAT_LENGTH {
-                gen_counter_incr(asm, Counter::send_splat_too_long);
+                gen_counter_incr(jit, asm, Counter::send_splat_too_long);
                 return None;
             }
             push_splat_args(array_length, asm);
@@ -6119,15 +8006,16 @@ fn gen_send_iseq(
         jit_save_pc(jit, asm);
         gen_save_sp(asm);
 
-        let rest_param_array = if flags & VM_CALL_ARGS_SPLAT != 0 {
+        let rest_param_array = if splat_call {
             let non_rest_arg_count = argc - 1;
             // We start by dupping the array because someone else might have
             // a reference to it. This also normalizes to an ::Array instance.
-            let array = asm.stack_pop(1);
+            let array = asm.stack_opnd(0);
             let array = asm.ccall(
                 rb_ary_dup as *const u8,
                 vec![array],
             );
+            asm.stack_pop(1); // Pop array after ccall to use a register for passing it.
 
             // This is the end stack state of all `non_rest_arg_count` situations below
             argc = required_num + opts_filled;
@@ -6139,12 +8027,11 @@ fn gen_send_iseq(
                     .try_into().unwrap();
 
                 // diff is >0 so no need to worry about null pointer
-                asm.comment("load pointer to array elements");
-                let offset_magnitude = SIZEOF_VALUE as u32 * diff;
-                let values_opnd = asm.ctx.sp_opnd(-(offset_magnitude as isize));
+                asm_comment!(asm, "load pointer to array elements");
+                let values_opnd = asm.ctx.sp_opnd(-(diff as i32));
                 let values_ptr = asm.lea(values_opnd);
 
-                asm.comment("prepend stack values to rest array");
+                asm_comment!(asm, "prepend stack values to rest array");
                 let array = asm.ccall(
                     rb_ary_unshift_m as *const u8,
                     vec![Opnd::UImm(diff as u64), values_ptr, array],
@@ -6155,27 +8042,27 @@ fn gen_send_iseq(
             } else if non_rest_arg_count < required_num + opt_num {
                 // If we have fewer arguments than required, we need to take some
                 // from the array and move them to the stack.
-                asm.comment("take items from splat array");
+                asm_comment!(asm, "take items from splat array");
 
-                let diff: u32 = (required_num - non_rest_arg_count + opts_filled)
+                let take_count: u32 = (required_num - non_rest_arg_count + opts_filled)
                     .try_into().unwrap();
 
-                // This moves the arguments onto the stack. But it doesn't modify the array.
-                move_rest_args_to_stack(array, diff, asm);
+                // Copy required arguments to the stack without modifying the array
+                copy_splat_args_for_rest_callee(array, take_count, asm);
 
                 // We will now slice the array to give us a new array of the correct size
-                let sliced = asm.ccall(rb_yjit_rb_ary_subseq_length as *const u8, vec![array, Opnd::UImm(diff as u64)]);
+                let sliced = asm.ccall(rb_yjit_rb_ary_subseq_length as *const u8, vec![array, Opnd::UImm(take_count.into())]);
 
                 sliced
             } else {
                 // The arguments are equal so we can just push to the stack
-                asm.comment("same length for splat array and rest param");
+                asm_comment!(asm, "same length for splat array and rest param");
                 assert!(non_rest_arg_count == required_num + opt_num);
 
                 array
             }
         } else {
-            asm.comment("rest parameter without splat");
+            asm_comment!(asm, "rest parameter without splat");
 
             assert!(argc >= required_num);
             let n = (argc - required_num - opts_filled) as u32;
@@ -6184,9 +8071,8 @@ fn gen_send_iseq(
             let values_ptr = if n == 0 {
                 Opnd::UImm(0)
             } else {
-                asm.comment("load pointer to array elements");
-                let offset_magnitude = SIZEOF_VALUE as u32 * n;
-                let values_opnd = asm.ctx.sp_opnd(-(offset_magnitude as isize));
+                asm_comment!(asm, "load pointer to array elements");
+                let values_opnd = asm.ctx.sp_opnd(-(n as i32));
                 asm.lea(values_opnd)
             };
 
@@ -6222,146 +8108,26 @@ fn gen_send_iseq(
         };
         // Store rest param to memory to avoid register shuffle as
         // we won't be reading it for the remainder of the block.
-        asm.ctx.dealloc_temp_reg(rest_param.stack_idx());
+        asm.ctx.dealloc_reg(rest_param.reg_opnd());
         asm.store(rest_param, rest_param_array);
     }
 
-    if doing_kw_call {
-        // Here we're calling a method with keyword arguments and specifying
-        // keyword arguments at this call site.
-
-        // Number of positional arguments the callee expects before the first
-        // keyword argument
-        let args_before_kw = required_num + opt_num;
-
-        // This struct represents the metadata about the caller-specified
-        // keyword arguments.
-        let ci_kwarg = unsafe { vm_ci_kwarg(ci) };
-        let caller_keyword_len: usize = if ci_kwarg.is_null() {
-            0
-        } else {
-            unsafe { get_cikw_keyword_len(ci_kwarg) }
-                .try_into()
-                .unwrap()
-        };
-
-        // This struct represents the metadata about the callee-specified
-        // keyword parameters.
-        let keyword = unsafe { get_iseq_body_param_keyword(iseq) };
-
-        asm.comment("keyword args");
-
-        // This is the list of keyword arguments that the callee specified
-        // in its initial declaration.
-        let callee_kwargs = unsafe { (*keyword).table };
-        let total_kwargs: usize = unsafe { (*keyword).num }.try_into().unwrap();
-
-        // Here we're going to build up a list of the IDs that correspond to
-        // the caller-specified keyword arguments. If they're not in the
-        // same order as the order specified in the callee declaration, then
-        // we're going to need to generate some code to swap values around
-        // on the stack.
-        let mut caller_kwargs: Vec<ID> = vec![0; total_kwargs];
-
-        for kwarg_idx in 0..caller_keyword_len {
-            let sym = unsafe { get_cikw_keywords_idx(ci_kwarg, kwarg_idx.try_into().unwrap()) };
-            caller_kwargs[kwarg_idx] = unsafe { rb_sym2id(sym) };
-        }
-        let mut kwarg_idx = caller_keyword_len;
-
-        let mut unspecified_bits = 0;
-
-        let keyword_required_num: usize = unsafe { (*keyword).required_num }.try_into().unwrap();
-        for callee_idx in keyword_required_num..total_kwargs {
-            let mut already_passed = false;
-            let callee_kwarg = unsafe { *(callee_kwargs.offset(callee_idx.try_into().unwrap())) };
-
-            for caller_idx in 0..caller_keyword_len {
-                if caller_kwargs[caller_idx] == callee_kwarg {
-                    already_passed = true;
-                    break;
-                }
-            }
-
-            if !already_passed {
-                // Reserve space on the stack for each default value we'll be
-                // filling in (which is done in the next loop). Also increments
-                // argc so that the callee's SP is recorded correctly.
-                argc += 1;
-                let default_arg = asm.stack_push(Type::Unknown);
-
-                // callee_idx - keyword->required_num is used in a couple of places below.
-                let req_num: isize = unsafe { (*keyword).required_num }.try_into().unwrap();
-                let callee_idx_isize: isize = callee_idx.try_into().unwrap();
-                let extra_args = callee_idx_isize - req_num;
-
-                //VALUE default_value = keyword->default_values[callee_idx - keyword->required_num];
-                let mut default_value = unsafe { *((*keyword).default_values.offset(extra_args)) };
-
-                if default_value == Qundef {
-                    // Qundef means that this value is not constant and must be
-                    // recalculated at runtime, so we record it in unspecified_bits
-                    // (Qnil is then used as a placeholder instead of Qundef).
-                    unspecified_bits |= 0x01 << extra_args;
-                    default_value = Qnil;
-                }
-
-                asm.mov(default_arg, default_value.into());
-
-                caller_kwargs[kwarg_idx] = callee_kwarg;
-                kwarg_idx += 1;
-            }
-        }
-
-        assert!(kwarg_idx == total_kwargs);
-
-        // Next, we're going to loop through every keyword that was
-        // specified by the caller and make sure that it's in the correct
-        // place. If it's not we're going to swap it around with another one.
-        for kwarg_idx in 0..total_kwargs {
-            let kwarg_idx_isize: isize = kwarg_idx.try_into().unwrap();
-            let callee_kwarg = unsafe { *(callee_kwargs.offset(kwarg_idx_isize)) };
-
-            // If the argument is already in the right order, then we don't
-            // need to generate any code since the expected value is already
-            // in the right place on the stack.
-            if callee_kwarg == caller_kwargs[kwarg_idx] {
-                continue;
-            }
-
-            // In this case the argument is not in the right place, so we
-            // need to find its position where it _should_ be and swap with
-            // that location.
-            for swap_idx in (kwarg_idx + 1)..total_kwargs {
-                if callee_kwarg == caller_kwargs[swap_idx] {
-                    // First we're going to generate the code that is going
-                    // to perform the actual swapping at runtime.
-                    let swap_idx_i32: i32 = swap_idx.try_into().unwrap();
-                    let kwarg_idx_i32: i32 = kwarg_idx.try_into().unwrap();
-                    let offset0: u16 = (argc - 1 - swap_idx_i32 - args_before_kw)
-                        .try_into()
-                        .unwrap();
-                    let offset1: u16 = (argc - 1 - kwarg_idx_i32 - args_before_kw)
-                        .try_into()
-                        .unwrap();
-                    stack_swap(asm, offset0, offset1);
-
-                    // Next we're going to do some bookkeeping on our end so
-                    // that we know the order that the arguments are
-                    // actually in now.
-                    caller_kwargs.swap(kwarg_idx, swap_idx);
+    // Pop surplus positional arguments when yielding
+    if arg_setup_block {
+        let extras = argc - required_num - opt_num - kw_arg_num;
+        if extras > 0 {
+            // Checked earlier. If there are keyword args, then
+            // the positional arguments are not at the stack top.
+            assert_eq!(0, kw_arg_num);
 
-                    break;
-                }
-            }
+            asm.stack_pop(extras as usize);
+            argc = required_num + opt_num + kw_arg_num;
         }
+    }
 
-        // Keyword arguments cause a special extra local variable to be
-        // pushed onto the stack that represents the parameters that weren't
-        // explicitly given a value and have a non-constant default.
-        let unspec_opnd = VALUE::fixnum_from_usize(unspecified_bits).as_u64();
-        asm.ctx.dealloc_temp_reg(asm.stack_opnd(-1).stack_idx()); // avoid using a register for unspecified_bits
-        asm.mov(asm.stack_opnd(-1), unspec_opnd.into());
+    // Keyword argument passing
+    if doing_kw_call {
+        argc = gen_iseq_kw_call(jit, asm, kw_arg, iseq, argc, has_kwrest);
     }
 
     // Same as vm_callee_setup_block_arg_arg0_check and vm_callee_setup_block_arg_arg0_splat
@@ -6384,7 +8150,7 @@ fn gen_send_iseq(
 
         let arg0_reg = asm.load(arg0_opnd);
         let array_opnd = get_array_ptr(asm, arg0_reg);
-        asm.comment("push splat arg0 onto the stack");
+        asm_comment!(asm, "push splat arg0 onto the stack");
         asm.stack_pop(argc.try_into().unwrap());
         for i in 0..lead_num {
             let stack_opnd = asm.stack_push(Type::Unknown);
@@ -6393,47 +8159,60 @@ fn gen_send_iseq(
         argc = lead_num;
     }
 
-    fn nil_fill(comment: &'static str, fill_range: std::ops::Range<isize>, asm: &mut Assembler) {
+    fn nil_fill(comment: &'static str, fill_range: std::ops::Range<i32>, asm: &mut Assembler) {
         if fill_range.is_empty() {
             return;
         }
 
-        asm.comment(comment);
+        asm_comment!(asm, "{}", comment);
         for i in fill_range {
-            let value_slot = asm.ctx.sp_opnd(i * SIZEOF_VALUE as isize);
+            let value_slot = asm.ctx.sp_opnd(i);
             asm.store(value_slot, Qnil.into());
         }
     }
 
-    // Nil-initialize missing optional parameters
-    nil_fill(
-        "nil-initialize missing optionals",
-        {
-            let begin = -(argc as isize) + required_num as isize + opts_filled as isize;
-            let end   = -(argc as isize) + required_num as isize + opt_num as isize;
+    if !forwarding {
+        // Nil-initialize missing optional parameters
+        nil_fill(
+            "nil-initialize missing optionals",
+            {
+                let begin = -argc + required_num + opts_filled;
+                let end   = -argc + required_num + opt_num;
 
-            begin..end
-        },
-        asm
-    );
-    // Nil-initialize the block parameter. It's the last parameter local
-    if iseq_has_block_param {
-        let block_param = asm.ctx.sp_opnd(
-            SIZEOF_VALUE as isize * (-(argc as isize) + num_params as isize - 1)
+                begin..end
+            },
+            asm
+        );
+        // Nil-initialize the block parameter. It's the last parameter local
+        if iseq_has_block_param {
+            let block_param = asm.ctx.sp_opnd(-argc + num_params - 1);
+            asm.store(block_param, Qnil.into());
+        }
+        // Nil-initialize non-parameter locals
+        nil_fill(
+            "nil-initialize locals",
+            {
+                let begin = -argc + num_params;
+                let end   = -argc + num_locals;
+
+                begin..end
+            },
+            asm
         );
-        asm.store(block_param, Qnil.into());
     }
-    // Nil-initialize non-parameter locals
-    nil_fill(
-        "nil-initialize locals",
-        {
-            let begin = -(argc as isize) + num_params as isize;
-            let end   = -(argc as isize) + num_locals as isize;
 
-            begin..end
-        },
-        asm
-    );
+    if forwarding {
+        assert_eq!(1, num_params);
+        // Write the CI in to the stack and ensure that it actually gets
+        // flushed to memory
+        asm_comment!(asm, "put call info for forwarding");
+        let ci_opnd = asm.stack_opnd(-1);
+        asm.ctx.dealloc_reg(ci_opnd.reg_opnd());
+        asm.mov(ci_opnd, VALUE(ci as usize).into());
+
+        // Nil-initialize other locals which are above the CI
+        nil_fill("nil-initialize locals", 1..num_locals, asm);
+    }
 
     // Points to the receiver operand on the stack unless a captured environment is used
     let recv = match captured_opnd {
@@ -6441,21 +8220,24 @@ fn gen_send_iseq(
         _ => asm.stack_opnd(argc),
     };
     let captured_self = captured_opnd.is_some();
-    let sp_offset = (argc as isize) + if captured_self { 0 } else { 1 };
+    let sp_offset = argc + if captured_self { 0 } else { 1 };
 
     // Store the updated SP on the current frame (pop arguments and receiver)
-    asm.comment("store caller sp");
-    let caller_sp = asm.lea(asm.ctx.sp_opnd((SIZEOF_VALUE as isize) * -sp_offset));
+    asm_comment!(asm, "store caller sp");
+    let caller_sp = asm.lea(asm.ctx.sp_opnd(-sp_offset));
     asm.store(Opnd::mem(64, CFP, RUBY_OFFSET_CFP_SP), caller_sp);
 
     // Store the next PC in the current frame
     jit_save_pc(jit, asm);
 
     // Adjust the callee's stack pointer
-    let offs = (SIZEOF_VALUE as isize) * (
-        -(argc as isize) + num_locals as isize + VM_ENV_DATA_SIZE as isize
-    );
-    let callee_sp = asm.lea(asm.ctx.sp_opnd(offs));
+    let callee_sp = if forwarding {
+        let offs = num_locals + VM_ENV_DATA_SIZE as i32;
+        asm.lea(asm.ctx.sp_opnd(offs))
+    } else {
+        let offs = -argc + num_locals + VM_ENV_DATA_SIZE as i32;
+        asm.lea(asm.ctx.sp_opnd(offs))
+    };
 
     let specval = if let Some(prev_ep) = prev_ep {
         // We've already side-exited if the callee expects a block, so we
@@ -6464,16 +8246,16 @@ fn gen_send_iseq(
     } else if let Some(captured_opnd) = captured_opnd {
         let ep_opnd = asm.load(Opnd::mem(64, captured_opnd, SIZEOF_VALUE_I32)); // captured->ep
         SpecVal::PrevEPOpnd(ep_opnd)
-    } else if let Some(Type::TProc) = block_arg_type {
+    } else if let Some(BlockArg::TProc) = block_arg_type {
         SpecVal::BlockHandler(Some(BlockHandler::AlreadySet))
-    } else if let Some(Type::BlockParamProxy) = block_arg_type {
+    } else if let Some(BlockArg::BlockParamProxy) = block_arg_type {
         SpecVal::BlockHandler(Some(BlockHandler::BlockParamProxy))
     } else {
         SpecVal::BlockHandler(block)
     };
 
     // Setup the new frame
-    gen_push_frame(jit, asm, true, ControlFrame {
+    perf_call!("gen_send_iseq: ", gen_push_frame(jit, asm, ControlFrame {
         frame_type,
         specval,
         cme,
@@ -6481,22 +8263,25 @@ fn gen_send_iseq(
         sp: callee_sp,
         iseq: Some(iseq),
         pc: None, // We are calling into jitted code, which will set the PC as necessary
-    });
+    }));
 
     // No need to set cfp->pc since the callee sets it whenever calling into routines
     // that could look at it through jit_save_pc().
     // mov(cb, REG0, const_ptr_opnd(start_pc));
     // mov(cb, member_opnd(REG_CFP, rb_control_frame_t, pc), REG0);
 
-    // Stub so we can return to JITted code
-    let return_block = BlockId {
-        iseq: jit.iseq,
-        idx: jit.next_insn_idx(),
-    };
+    // Create a blockid for the callee
+    let callee_blockid = BlockId { iseq, idx: start_pc_offset };
 
     // Create a context for the callee
     let mut callee_ctx = Context::default();
 
+    // If the callee has :inline_block annotation and the callsite has a block ISEQ,
+    // duplicate a callee block for each block ISEQ to make its `yield` monomorphic.
+    if let (Some(BlockHandler::BlockISeq(iseq)), true) = (block, builtin_attrs & BUILTIN_ATTR_INLINE_BLOCK != 0) {
+        callee_ctx.set_inline_block(iseq);
+    }
+
     // Set the argument types in the callee's context
     for arg_idx in 0..argc {
         let stack_offs: u8 = (argc - arg_idx - 1).try_into().unwrap();
@@ -6504,6 +8289,13 @@ fn gen_send_iseq(
         callee_ctx.set_local_type(arg_idx.try_into().unwrap(), arg_type);
     }
 
+    // If we're in a forwarding callee, there will be one unknown type
+    // written in to the local table (the caller's CI object)
+    if forwarding {
+        callee_ctx.set_local_type(0, Type::Unknown)
+    }
+
+    // Set the receiver type in the callee's context
     let recv_type = if captured_self {
         Type::Unknown // we don't track the type information of captured->self for now
     } else {
@@ -6511,26 +8303,113 @@ fn gen_send_iseq(
     };
     callee_ctx.upgrade_opnd_type(SelfOpnd, recv_type);
 
+    // Spill or preserve argument registers
+    if forwarding {
+        // When forwarding, the callee's local table has only a callinfo,
+        // so we can't map the actual arguments to the callee's locals.
+        asm.spill_regs();
+    } else {
+        // Discover stack temp registers that can be used as the callee's locals
+        let mapped_temps = asm.map_temp_regs_to_args(&mut callee_ctx, argc);
+
+        // Spill stack temps and locals that are not used by the callee.
+        // This must be done before changing the SP register.
+        asm.spill_regs_except(&mapped_temps);
+
+        // If the callee block has been compiled before, spill/move registers to reuse the existing block
+        // for minimizing the number of blocks we need to compile.
+        if let Some(existing_reg_mapping) = find_most_compatible_reg_mapping(callee_blockid, &callee_ctx) {
+            asm_comment!(asm, "reuse maps: {:?} -> {:?}", callee_ctx.get_reg_mapping(), existing_reg_mapping);
+
+            // Spill the registers that are not used in the existing block.
+            // When the same ISEQ is compiled as an entry block, it starts with no registers allocated.
+            for &reg_opnd in callee_ctx.get_reg_mapping().get_reg_opnds().iter() {
+                if existing_reg_mapping.get_reg(reg_opnd).is_none() {
+                    match reg_opnd {
+                        RegOpnd::Local(local_idx) => {
+                            let spilled_temp = asm.stack_opnd(argc - local_idx as i32 - 1);
+                            asm.spill_reg(spilled_temp);
+                            callee_ctx.dealloc_reg(reg_opnd);
+                        }
+                        RegOpnd::Stack(_) => unreachable!("callee {:?} should have been spilled", reg_opnd),
+                    }
+                }
+            }
+            assert!(callee_ctx.get_reg_mapping().get_reg_opnds().len() <= existing_reg_mapping.get_reg_opnds().len());
+
+            // Load the registers that are spilled in this block but used in the existing block.
+            // When there are multiple callsites, some registers spilled in this block may be used at other callsites.
+            for &reg_opnd in existing_reg_mapping.get_reg_opnds().iter() {
+                if callee_ctx.get_reg_mapping().get_reg(reg_opnd).is_none() {
+                    match reg_opnd {
+                        RegOpnd::Local(local_idx) => {
+                            callee_ctx.alloc_reg(reg_opnd);
+                            let loaded_reg = TEMP_REGS[callee_ctx.get_reg_mapping().get_reg(reg_opnd).unwrap()];
+                            let loaded_temp = asm.stack_opnd(argc - local_idx as i32 - 1);
+                            asm.load_into(Opnd::Reg(loaded_reg), loaded_temp);
+                        }
+                        RegOpnd::Stack(_) => unreachable!("find_most_compatible_reg_mapping should not leave {:?}", reg_opnd),
+                    }
+                }
+            }
+            assert_eq!(callee_ctx.get_reg_mapping().get_reg_opnds().len(), existing_reg_mapping.get_reg_opnds().len());
+
+            // Shuffle registers to make the register mappings compatible
+            let mut moves = vec![];
+            for &reg_opnd in callee_ctx.get_reg_mapping().get_reg_opnds().iter() {
+                let old_reg = TEMP_REGS[callee_ctx.get_reg_mapping().get_reg(reg_opnd).unwrap()];
+                let new_reg = TEMP_REGS[existing_reg_mapping.get_reg(reg_opnd).unwrap()];
+                moves.push((new_reg, Opnd::Reg(old_reg)));
+            }
+            for (reg, opnd) in Assembler::reorder_reg_moves(&moves) {
+                asm.load_into(Opnd::Reg(reg), opnd);
+            }
+            callee_ctx.set_reg_mapping(existing_reg_mapping);
+        }
+    }
+
+    // Update SP register for the callee. This must be done after referencing frame.recv,
+    // which may be SP-relative.
+    asm.mov(SP, callee_sp);
+
+    // Log the name of the method we're calling to. We intentionally don't do this for inlined ISEQs.
+    // We also do this after spill_regs() to avoid doubly spilling the same thing on asm.ccall().
+    if get_option!(gen_stats) {
+        // Protect caller-saved registers in case they're used for arguments
+        asm.cpush_all();
+
+        // Assemble the ISEQ name string
+        let name_str = get_iseq_name(iseq);
+
+        // Get an index for this ISEQ name
+        let iseq_idx = get_iseq_idx(&name_str);
+
+        // Increment the counter for this cfunc
+        asm.ccall(incr_iseq_counter as *const u8, vec![iseq_idx.into()]);
+        asm.cpop_all();
+    }
+
     // The callee might change locals through Kernel#binding and other means.
-    asm.ctx.clear_local_types();
+    asm.clear_local_types();
 
-    // Pop arguments and receiver in return context, push the return value
-    // After the return, sp_offset will be 1. The codegen for leave writes
-    // the return value in case of JIT-to-JIT return.
-    let mut return_asm = Assembler::new();
-    return_asm.ctx = asm.ctx.clone();
+    // Pop arguments and receiver in return context and
+    // mark it as a continuation of gen_leave()
+    let mut return_asm = Assembler::new(jit.num_locals());
+    return_asm.ctx = asm.ctx;
     return_asm.stack_pop(sp_offset.try_into().unwrap());
-    let return_val = return_asm.stack_push(Type::Unknown);
-    // The callee writes a return value on stack. Update reg_temps accordingly.
-    return_asm.ctx.dealloc_temp_reg(return_val.stack_idx());
-    return_asm.ctx.set_sp_offset(1);
-    return_asm.ctx.reset_chain_depth();
+    return_asm.ctx.set_sp_offset(0); // We set SP on the caller's frame above
+    return_asm.ctx.reset_chain_depth_and_defer();
+    return_asm.ctx.set_as_return_landing();
+
+    // Stub so we can return to JITted code
+    let return_block = BlockId {
+        iseq: jit.iseq,
+        idx: jit.next_insn_idx(),
+    };
 
     // Write the JIT return address on the callee frame
-    gen_branch(
-        jit,
+    jit.gen_branch(
         asm,
-        ocb,
         return_block,
         &return_asm.ctx,
         None,
@@ -6538,94 +8417,418 @@ fn gen_send_iseq(
         BranchGenFn::JITReturn,
     );
 
+    // ec->cfp is updated after cfp->jit_return for rb_profile_frames() safety
+    asm_comment!(asm, "switch to new CFP");
+    let new_cfp = asm.sub(CFP, RUBY_SIZEOF_CONTROL_FRAME.into());
+    asm.mov(CFP, new_cfp);
+    asm.store(Opnd::mem(64, EC, RUBY_OFFSET_EC_CFP), CFP);
+
     // Directly jump to the entry point of the callee
     gen_direct_jump(
         jit,
         &callee_ctx,
-        BlockId {
-            iseq: iseq,
-            idx: start_pc_offset,
-        },
+        callee_blockid,
         asm,
     );
 
     Some(EndBlock)
 }
 
+// Check if we can handle a keyword call
+fn gen_iseq_kw_call_checks(
+    jit: &JITState,
+    asm: &mut Assembler,
+    iseq: *const rb_iseq_t,
+    kw_arg: *const rb_callinfo_kwarg,
+    has_kwrest: bool,
+    caller_kw_num: i32
+) -> Option<()> {
+    // This struct represents the metadata about the callee-specified
+    // keyword parameters.
+    let keyword = unsafe { get_iseq_body_param_keyword(iseq) };
+    let keyword_num: usize = unsafe { (*keyword).num }.try_into().unwrap();
+    let keyword_required_num: usize = unsafe { (*keyword).required_num }.try_into().unwrap();
+
+    let mut required_kwargs_filled = 0;
+
+    if keyword_num > 30 || caller_kw_num > 64 {
+        // We have so many keywords that (1 << num) encoded as a FIXNUM
+        // (which shifts it left one more) no longer fits inside a 32-bit
+        // immediate. Similarly, we use a u64 in case of keyword rest parameter.
+        gen_counter_incr(jit, asm, Counter::send_iseq_too_many_kwargs);
+        return None;
+    }
+
+    // Check that the kwargs being passed are valid
+    if caller_kw_num > 0 {
+        // This is the list of keyword arguments that the callee specified
+        // in its initial declaration.
+        // SAFETY: see compile.c for sizing of this slice.
+        let callee_kwargs = if keyword_num == 0 {
+            &[]
+        } else {
+            unsafe { slice::from_raw_parts((*keyword).table, keyword_num) }
+        };
+
+        // Here we're going to build up a list of the IDs that correspond to
+        // the caller-specified keyword arguments. If they're not in the
+        // same order as the order specified in the callee declaration, then
+        // we're going to need to generate some code to swap values around
+        // on the stack.
+        let kw_arg_keyword_len = caller_kw_num as usize;
+        let mut caller_kwargs: Vec<ID> = vec![0; kw_arg_keyword_len];
+        for kwarg_idx in 0..kw_arg_keyword_len {
+            let sym = unsafe { get_cikw_keywords_idx(kw_arg, kwarg_idx.try_into().unwrap()) };
+            caller_kwargs[kwarg_idx] = unsafe { rb_sym2id(sym) };
+        }
+
+        // First, we're going to be sure that the names of every
+        // caller-specified keyword argument correspond to a name in the
+        // list of callee-specified keyword parameters.
+        for caller_kwarg in caller_kwargs {
+            let search_result = callee_kwargs
+                .iter()
+                .enumerate() // inject element index
+                .find(|(_, &kwarg)| kwarg == caller_kwarg);
+
+            match search_result {
+                None if !has_kwrest => {
+                    // If the keyword was never found, then we know we have a
+                    // mismatch in the names of the keyword arguments, so we need to
+                    // bail.
+                    gen_counter_incr(jit, asm, Counter::send_iseq_kwargs_mismatch);
+                    return None;
+                }
+                Some((callee_idx, _)) if callee_idx < keyword_required_num => {
+                    // Keep a count to ensure all required kwargs are specified
+                    required_kwargs_filled += 1;
+                }
+                _ => (),
+            }
+        }
+    }
+    assert!(required_kwargs_filled <= keyword_required_num);
+    if required_kwargs_filled != keyword_required_num {
+        gen_counter_incr(jit, asm, Counter::send_iseq_kwargs_mismatch);
+        return None;
+    }
+
+    Some(())
+}
+
+// Codegen for keyword argument handling. Essentially private to gen_send_iseq() since
+// there are a lot of preconditions to check before reaching this code.
+fn gen_iseq_kw_call(
+    jit: &mut JITState,
+    asm: &mut Assembler,
+    ci_kwarg: *const rb_callinfo_kwarg,
+    iseq: *const rb_iseq_t,
+    mut argc: i32,
+    has_kwrest: bool,
+) -> i32 {
+    let caller_keyword_len_i32: i32 = if ci_kwarg.is_null() {
+        0
+    } else {
+        unsafe { get_cikw_keyword_len(ci_kwarg) }
+    };
+    let caller_keyword_len: usize = caller_keyword_len_i32.try_into().unwrap();
+    let anon_kwrest = unsafe { rb_get_iseq_flags_anon_kwrest(iseq) && !get_iseq_flags_has_kw(iseq) };
+
+    // This struct represents the metadata about the callee-specified
+    // keyword parameters.
+    let keyword = unsafe { get_iseq_body_param_keyword(iseq) };
+
+    asm_comment!(asm, "keyword args");
+
+    // This is the list of keyword arguments that the callee specified
+    // in its initial declaration.
+    let callee_kwargs = unsafe { (*keyword).table };
+    let callee_kw_count_i32: i32 = unsafe { (*keyword).num };
+    let callee_kw_count: usize = callee_kw_count_i32.try_into().unwrap();
+    let keyword_required_num: usize = unsafe { (*keyword).required_num }.try_into().unwrap();
+
+    // Here we're going to build up a list of the IDs that correspond to
+    // the caller-specified keyword arguments. If they're not in the
+    // same order as the order specified in the callee declaration, then
+    // we're going to need to generate some code to swap values around
+    // on the stack.
+    let mut kwargs_order: Vec<ID> = vec![0; cmp::max(caller_keyword_len, callee_kw_count)];
+    for kwarg_idx in 0..caller_keyword_len {
+        let sym = unsafe { get_cikw_keywords_idx(ci_kwarg, kwarg_idx.try_into().unwrap()) };
+        kwargs_order[kwarg_idx] = unsafe { rb_sym2id(sym) };
+    }
+
+    let mut unspecified_bits = 0;
+
+    // The stack_opnd() index to the 0th keyword argument.
+    let kwargs_stack_base = caller_keyword_len_i32 - 1;
+
+    // Build the keyword rest parameter hash before we make any changes to the order of
+    // the supplied keyword arguments
+    let kwrest_type = if has_kwrest {
+        c_callable! {
+            fn build_kw_rest(rest_mask: u64, stack_kwargs: *const VALUE, keywords: *const rb_callinfo_kwarg) -> VALUE {
+                if keywords.is_null() {
+                    return unsafe { rb_hash_new() };
+                }
+
+                // Use the total number of supplied keywords as a size upper bound
+                let keyword_len = unsafe { (*keywords).keyword_len } as usize;
+                let hash = unsafe { rb_hash_new_with_size(keyword_len as u64) };
+
+                // Put pairs into the kwrest hash as the mask describes
+                for kwarg_idx in 0..keyword_len {
+                    if (rest_mask & (1 << kwarg_idx)) != 0 {
+                        unsafe {
+                            let keyword_symbol = (*keywords).keywords.as_ptr().add(kwarg_idx).read();
+                            let keyword_value = stack_kwargs.add(kwarg_idx).read();
+                            rb_hash_aset(hash, keyword_symbol, keyword_value);
+                        }
+                    }
+                }
+                return hash;
+            }
+        }
+
+        asm_comment!(asm, "build kwrest hash");
+
+        // Make a bit mask describing which keywords should go into kwrest.
+        let mut rest_mask: u64 = 0;
+        // Index for one argument that will go into kwrest.
+        let mut rest_collected_idx = None;
+        for (supplied_kw_idx, &supplied_kw) in kwargs_order.iter().take(caller_keyword_len).enumerate() {
+            let mut found = false;
+            for callee_idx in 0..callee_kw_count {
+                let callee_kw = unsafe { callee_kwargs.add(callee_idx).read() };
+                if callee_kw == supplied_kw {
+                    found = true;
+                    break;
+                }
+            }
+            if !found {
+                rest_mask |= 1 << supplied_kw_idx;
+                if rest_collected_idx.is_none() {
+                    rest_collected_idx = Some(supplied_kw_idx as i32);
+                }
+            }
+        }
+
+        let (kwrest, kwrest_type) = if rest_mask == 0 && anon_kwrest {
+            // In case the kwrest hash should be empty and is anonymous in the callee,
+            // we can pass nil instead of allocating. Anonymous kwrest can only be
+            // delegated, and nil is the same as an empty hash when delegating.
+            (Qnil.into(), Type::Nil)
+        } else {
+            // Save PC and SP before allocating
+            jit_save_pc(jit, asm);
+            gen_save_sp(asm);
+
+            // Build the kwrest hash. `struct rb_callinfo_kwarg` is malloc'd, so no GC concerns.
+            let kwargs_start = asm.lea(asm.ctx.sp_opnd(-caller_keyword_len_i32));
+            let hash = asm.ccall(
+                build_kw_rest as _,
+                vec![rest_mask.into(), kwargs_start, Opnd::const_ptr(ci_kwarg.cast())]
+            );
+            (hash, Type::THash)
+        };
+
+        // The kwrest parameter sits after `unspecified_bits` if the callee specifies any
+        // keywords.
+        let stack_kwrest_idx = kwargs_stack_base - callee_kw_count_i32 - i32::from(callee_kw_count > 0);
+        let stack_kwrest = asm.stack_opnd(stack_kwrest_idx);
+        // If `stack_kwrest` already has another argument there, we need to stow it elsewhere
+        // first before putting kwrest there. Use `rest_collected_idx` because that value went
+        // into kwrest so the slot is now free.
+        let kwrest_idx = callee_kw_count + usize::from(callee_kw_count > 0);
+        if let (Some(rest_collected_idx), true) = (rest_collected_idx, kwrest_idx < caller_keyword_len) {
+            let rest_collected = asm.stack_opnd(kwargs_stack_base - rest_collected_idx);
+            let mapping = asm.ctx.get_opnd_mapping(stack_kwrest.into());
+            asm.mov(rest_collected, stack_kwrest);
+            asm.ctx.set_opnd_mapping(rest_collected.into(), mapping);
+            // Update our bookkeeping to inform the reordering step later.
+            kwargs_order[rest_collected_idx as usize] = kwargs_order[kwrest_idx];
+            kwargs_order[kwrest_idx] = 0;
+        }
+        // Put kwrest straight into memory, since we might pop it later
+        asm.ctx.dealloc_reg(stack_kwrest.reg_opnd());
+        asm.mov(stack_kwrest, kwrest);
+        if stack_kwrest_idx >= 0 {
+            asm.ctx.set_opnd_mapping(stack_kwrest.into(), TempMapping::MapToStack(kwrest_type));
+        }
+
+        Some(kwrest_type)
+    } else {
+        None
+    };
+
+    // Ensure the stack is large enough for the callee
+    for _ in caller_keyword_len..callee_kw_count {
+        argc += 1;
+        asm.stack_push(Type::Unknown);
+    }
+    // Now this is the stack_opnd() index to the 0th keyword argument.
+    let kwargs_stack_base = kwargs_order.len() as i32 - 1;
+
+    // Next, we're going to loop through every keyword that was
+    // specified by the caller and make sure that it's in the correct
+    // place. If it's not we're going to swap it around with another one.
+    for kwarg_idx in 0..callee_kw_count {
+        let callee_kwarg = unsafe { callee_kwargs.add(kwarg_idx).read() };
+
+        // If the argument is already in the right order, then we don't
+        // need to generate any code since the expected value is already
+        // in the right place on the stack.
+        if callee_kwarg == kwargs_order[kwarg_idx] {
+            continue;
+        }
+
+        // In this case the argument is not in the right place, so we
+        // need to find its position where it _should_ be and swap with
+        // that location.
+        for swap_idx in 0..kwargs_order.len() {
+            if callee_kwarg == kwargs_order[swap_idx] {
+                // First we're going to generate the code that is going
+                // to perform the actual swapping at runtime.
+                let swap_idx_i32: i32 = swap_idx.try_into().unwrap();
+                let kwarg_idx_i32: i32 = kwarg_idx.try_into().unwrap();
+                let offset0 = kwargs_stack_base - swap_idx_i32;
+                let offset1 = kwargs_stack_base - kwarg_idx_i32;
+                stack_swap(asm, offset0, offset1);
+
+                // Next we're going to do some bookkeeping on our end so
+                // that we know the order that the arguments are
+                // actually in now.
+                kwargs_order.swap(kwarg_idx, swap_idx);
+
+                break;
+            }
+        }
+    }
+
+    // Now that every caller specified kwarg is in the right place, filling
+    // in unspecified default paramters won't overwrite anything.
+    for kwarg_idx in keyword_required_num..callee_kw_count {
+        if kwargs_order[kwarg_idx] != unsafe { callee_kwargs.add(kwarg_idx).read() } {
+            let default_param_idx = kwarg_idx - keyword_required_num;
+            let mut default_value = unsafe { (*keyword).default_values.add(default_param_idx).read() };
+
+            if default_value == Qundef {
+                // Qundef means that this value is not constant and must be
+                // recalculated at runtime, so we record it in unspecified_bits
+                // (Qnil is then used as a placeholder instead of Qundef).
+                unspecified_bits |= 0x01 << default_param_idx;
+                default_value = Qnil;
+            }
+
+            let default_param = asm.stack_opnd(kwargs_stack_base - kwarg_idx as i32);
+            let param_type = Type::from(default_value);
+            asm.mov(default_param, default_value.into());
+            asm.ctx.set_opnd_mapping(default_param.into(), TempMapping::MapToStack(param_type));
+        }
+    }
+
+    // Pop extra arguments that went into kwrest now that they're at stack top
+    if has_kwrest && caller_keyword_len > callee_kw_count {
+        let extra_kwarg_count = caller_keyword_len - callee_kw_count;
+        asm.stack_pop(extra_kwarg_count);
+        argc = argc - extra_kwarg_count as i32;
+    }
+
+    // Keyword arguments cause a special extra local variable to be
+    // pushed onto the stack that represents the parameters that weren't
+    // explicitly given a value and have a non-constant default.
+    if callee_kw_count > 0 {
+        let unspec_opnd = VALUE::fixnum_from_usize(unspecified_bits).as_u64();
+        let top = asm.stack_push(Type::Fixnum);
+        asm.mov(top, unspec_opnd.into());
+        argc += 1;
+    }
+
+    // The kwrest parameter sits after `unspecified_bits`
+    if let Some(kwrest_type) = kwrest_type {
+        let kwrest = asm.stack_push(kwrest_type);
+        // We put the kwrest parameter in memory earlier
+        asm.ctx.dealloc_reg(kwrest.reg_opnd());
+        argc += 1;
+    }
+
+    argc
+}
+
 /// This is a helper function to allow us to exit early
 /// during code generation if a predicate is true.
 /// We return Option<()> here because we will be able to
 /// short-circuit using the ? operator if we return None.
 /// It would be great if rust let you implement ? for your
 /// own types, but as of right now they don't.
-fn exit_if(asm: &mut Assembler, pred: bool, counter: Counter) -> Option<()> {
+fn exit_if(jit: &JITState, asm: &mut Assembler, pred: bool, counter: Counter) -> Option<()> {
     if pred {
-        gen_counter_incr(asm, counter);
+        gen_counter_incr(jit, asm, counter);
         return None
     }
     Some(())
 }
 
 #[must_use]
-fn exit_if_tail_call(asm: &mut Assembler, ci: *const rb_callinfo) -> Option<()> {
-    exit_if(asm, unsafe { vm_ci_flag(ci) } & VM_CALL_TAILCALL != 0, Counter::send_iseq_tailcall)
+fn exit_if_tail_call(jit: &JITState, asm: &mut Assembler, ci: *const rb_callinfo) -> Option<()> {
+    exit_if(jit, asm, unsafe { vm_ci_flag(ci) } & VM_CALL_TAILCALL != 0, Counter::send_iseq_tailcall)
 }
 
 #[must_use]
-fn exit_if_has_post(asm: &mut Assembler, iseq: *const rb_iseq_t) -> Option<()> {
-    exit_if(asm, unsafe { get_iseq_flags_has_post(iseq) }, Counter::send_iseq_has_post)
+fn exit_if_has_post(jit: &JITState, asm: &mut Assembler, iseq: *const rb_iseq_t) -> Option<()> {
+    exit_if(jit, asm, unsafe { get_iseq_flags_has_post(iseq) }, Counter::send_iseq_has_post)
 }
 
 #[must_use]
-fn exit_if_has_kwrest(asm: &mut Assembler, iseq: *const rb_iseq_t) -> Option<()> {
-    exit_if(asm, unsafe { get_iseq_flags_has_kwrest(iseq) }, Counter::send_iseq_has_kwrest)
+fn exit_if_kwsplat_non_nil(jit: &JITState, asm: &mut Assembler, flags: u32, counter: Counter) -> Option<()> {
+    let kw_splat = flags & VM_CALL_KW_SPLAT != 0;
+    let kw_splat_stack = StackOpnd((flags & VM_CALL_ARGS_BLOCKARG != 0).into());
+    exit_if(jit, asm, kw_splat && asm.ctx.get_opnd_type(kw_splat_stack) != Type::Nil, counter)
 }
 
 #[must_use]
-fn exit_if_splat_and_ruby2_keywords(asm: &mut Assembler, jit: &mut JITState, flags: u32) -> Option<()> {
-    // In order to handle backwards compatibility between ruby 3 and 2
-    // ruby2_keywords was introduced. It is called only on methods
-    // with splat and changes they way they handle them.
-    // We are just going to not compile these.
-    // https://www.rubydoc.info/stdlib/core/Proc:ruby2_keywords
-    exit_if(
-        asm,
-        unsafe { get_iseq_flags_ruby2_keywords(jit.iseq) } && flags & VM_CALL_ARGS_SPLAT != 0,
-        Counter::send_iseq_ruby2_keywords,
-    )
+fn exit_if_has_rest_and_captured(jit: &JITState, asm: &mut Assembler, iseq_has_rest: bool, captured_opnd: Option<Opnd>) -> Option<()> {
+    exit_if(jit, asm, iseq_has_rest && captured_opnd.is_some(), Counter::send_iseq_has_rest_and_captured)
 }
 
 #[must_use]
-fn exit_if_has_rest_and_captured(asm: &mut Assembler, iseq_has_rest: bool, captured_opnd: Option<Opnd>) -> Option<()> {
-    exit_if(asm, iseq_has_rest && captured_opnd.is_some(), Counter::send_iseq_has_rest_and_captured)
+fn exit_if_has_kwrest_and_captured(jit: &JITState, asm: &mut Assembler, iseq_has_kwrest: bool, captured_opnd: Option<Opnd>) -> Option<()> {
+    // We need to call a C function to allocate the kwrest hash, but also need to hold the captred
+    // block across the call, which we can't do.
+    exit_if(jit, asm, iseq_has_kwrest && captured_opnd.is_some(), Counter::send_iseq_has_kwrest_and_captured)
 }
 
 #[must_use]
-fn exit_if_has_rest_and_supplying_kws(asm: &mut Assembler, iseq_has_rest: bool, iseq: *const rb_iseq_t, supplying_kws: bool) -> Option<()> {
+fn exit_if_has_rest_and_supplying_kws(jit: &JITState, asm: &mut Assembler, iseq_has_rest: bool, supplying_kws: bool) -> Option<()> {
+    // There can be a gap between the rest parameter array and the supplied keywords, or
+    // no space to put the rest array (e.g. `def foo(*arr, k:) = arr; foo(k: 1)` 1 is
+    // sitting where the rest array should be).
     exit_if(
+        jit,
         asm,
-        iseq_has_rest && unsafe { get_iseq_flags_has_kw(iseq) } && supplying_kws,
+        iseq_has_rest && supplying_kws,
         Counter::send_iseq_has_rest_and_kw_supplied,
     )
 }
 
 #[must_use]
-fn exit_if_supplying_kw_and_has_no_kw(asm: &mut Assembler, supplying_kws: bool, iseq: *const rb_iseq_t) -> Option<()> {
-    // If we have keyword arguments being passed to a callee that only takes
-    // positionals, then we need to allocate a hash. For now we're going to
-    // call that too complex and bail.
+fn exit_if_supplying_kw_and_has_no_kw(jit: &JITState, asm: &mut Assembler, supplying_kws: bool, callee_kws: bool) -> Option<()> {
+    // Passing keyword arguments to a callee means allocating a hash and treating
+    // that as a positional argument. Bail for now.
     exit_if(
+        jit,
         asm,
-        supplying_kws && !unsafe { get_iseq_flags_has_kw(iseq) },
+        supplying_kws && !callee_kws,
         Counter::send_iseq_has_no_kw,
     )
 }
 
 #[must_use]
-fn exit_if_supplying_kws_and_accept_no_kwargs(asm: &mut Assembler, supplying_kws: bool, iseq: *const rb_iseq_t) -> Option<()> {
+fn exit_if_supplying_kws_and_accept_no_kwargs(jit: &JITState, asm: &mut Assembler, supplying_kws: bool, iseq: *const rb_iseq_t) -> Option<()> {
     // If we have a method accepting no kwargs (**nil), exit if we have passed
     // it any kwargs.
     exit_if(
+        jit,
         asm,
         supplying_kws && unsafe { get_iseq_flags_accepts_no_kwarg(iseq) },
         Counter::send_iseq_accepts_no_kwarg
@@ -6633,52 +8836,62 @@ fn exit_if_supplying_kws_and_accept_no_kwargs(asm: &mut Assembler, supplying_kws
 }
 
 #[must_use]
-fn exit_if_splat_and_zsuper(asm: &mut Assembler, flags: u32) -> Option<()> {
-    // zsuper methods are super calls without any arguments.
-    // They are also marked as splat, but don't actually have an array
-    // they pull arguments from, instead we need to change to call
-    // a different method with the current stack.
-    exit_if(asm, flags & VM_CALL_ARGS_SPLAT != 0 && flags & VM_CALL_ZSUPER != 0, Counter::send_iseq_zsuper)
-}
-
-#[must_use]
-fn exit_if_doing_kw_and_splat(asm: &mut Assembler, doing_kw_call: bool, flags: u32) -> Option<()> {
-    exit_if(asm, doing_kw_call && flags & VM_CALL_ARGS_SPLAT != 0, Counter::send_iseq_splat_with_kw)
+fn exit_if_doing_kw_and_splat(jit: &JITState, asm: &mut Assembler, doing_kw_call: bool, flags: u32) -> Option<()> {
+    exit_if(jit, asm, doing_kw_call && flags & VM_CALL_ARGS_SPLAT != 0, Counter::send_iseq_splat_with_kw)
 }
 
 #[must_use]
-fn exit_if_wrong_number_arguments(asm: &mut Assembler, opts_filled: i32, flags: u32, opt_num: i32, iseq_has_rest: bool) -> Option<()> {
+fn exit_if_wrong_number_arguments(
+    jit: &JITState,
+    asm: &mut Assembler,
+    args_setup_block: bool,
+    opts_filled: i32,
+    flags: u32,
+    opt_num: i32,
+    iseq_has_rest: bool,
+) -> Option<()> {
     // Too few arguments and no splat to make up for it
     let too_few = opts_filled < 0 && flags & VM_CALL_ARGS_SPLAT == 0;
-    // Too many arguments and no place to put them (i.e. rest arg)
-    let too_many = opts_filled > opt_num && !iseq_has_rest;
+    // Too many arguments and no sink that take them
+    let too_many = opts_filled > opt_num && !(iseq_has_rest || args_setup_block);
 
-    exit_if(asm, too_few || too_many, Counter::send_iseq_arity_error)
+    exit_if(jit, asm, too_few || too_many, Counter::send_iseq_arity_error)
 }
 
 #[must_use]
-fn exit_if_doing_kw_and_opts_missing(asm: &mut Assembler, doing_kw_call: bool, opts_missing: i32) -> Option<()> {
+fn exit_if_doing_kw_and_opts_missing(jit: &JITState, asm: &mut Assembler, doing_kw_call: bool, opts_missing: i32) -> Option<()> {
     // If we have unfilled optional arguments and keyword arguments then we
     // would need to adjust the arguments location to account for that.
     // For now we aren't handling this case.
-    exit_if(asm, doing_kw_call && opts_missing > 0, Counter::send_iseq_missing_optional_kw)
+    exit_if(jit, asm, doing_kw_call && opts_missing > 0, Counter::send_iseq_missing_optional_kw)
 }
 
 #[must_use]
-fn exit_if_has_rest_and_optional_and_block(asm: &mut Assembler, iseq_has_rest: bool, opt_num: i32, iseq: *const rb_iseq_t, block_arg: bool) -> Option<()> {
+fn exit_if_has_rest_and_optional_and_block(jit: &JITState, asm: &mut Assembler, iseq_has_rest: bool, opt_num: i32, iseq: *const rb_iseq_t, block_arg: bool) -> Option<()> {
     exit_if(
+        jit,
         asm,
         iseq_has_rest && opt_num != 0 && (unsafe { get_iseq_flags_has_block(iseq) } || block_arg),
         Counter::send_iseq_has_rest_opt_and_block
     )
 }
 
+#[derive(Clone, Copy)]
+enum BlockArg {
+    Nil,
+    /// A special sentinel value indicating the block parameter should be read from
+    /// the current surrounding cfp
+    BlockParamProxy,
+    /// A proc object. Could be an instance of a subclass of ::rb_cProc
+    TProc,
+}
+
 #[must_use]
 fn exit_if_unsupported_block_arg_type(
     jit: &mut JITState,
     asm: &mut Assembler,
     supplying_block_arg: bool
-) -> Option<Option<Type>> {
+) -> Option<Option<BlockArg>> {
     let block_arg_type = if supplying_block_arg {
         asm.ctx.get_opnd_type(StackOpnd(0))
     } else {
@@ -6687,19 +8900,18 @@ fn exit_if_unsupported_block_arg_type(
     };
 
     match block_arg_type {
-        Type::Nil | Type::BlockParamProxy => {
-            // We'll handle this later
-            Some(Some(block_arg_type))
-        }
+        // We'll handle Nil and BlockParamProxy later
+        Type::Nil => Some(Some(BlockArg::Nil)),
+        Type::BlockParamProxy => Some(Some(BlockArg::BlockParamProxy)),
         _ if {
             let sample_block_arg = jit.peek_at_stack(&asm.ctx, 0);
             unsafe { rb_obj_is_proc(sample_block_arg) }.test()
         } => {
             // Speculate that we'll have a proc as the block arg
-            Some(Some(Type::TProc))
+            Some(Some(BlockArg::TProc))
         }
         _ => {
-            gen_counter_incr(asm, Counter::send_block_arg);
+            gen_counter_incr(jit, asm, Counter::send_iseq_block_arg_type);
             None
         }
     }
@@ -6720,7 +8932,6 @@ fn exit_if_stack_too_large(iseq: *const rb_iseq_t) -> Option<()> {
 fn gen_struct_aref(
     jit: &mut JITState,
     asm: &mut Assembler,
-    ocb: &mut OutlinedCb,
     ci: *const rb_callinfo,
     cme: *const rb_callable_method_entry_t,
     comptime_recv: VALUE,
@@ -6749,6 +8960,13 @@ fn gen_struct_aref(
         }
     }
 
+    if c_method_tracing_currently_enabled(jit) {
+        // Struct accesses need fire c_call and c_return events, which we can't support
+        // See :attr-tracing:
+        gen_counter_incr(jit, asm, Counter::send_cfunc_tracing);
+        return None;
+    }
+
     // This is a .send call and we need to adjust the stack
     if flags & VM_CALL_OPT_SEND != 0 {
         handle_opt_send_shift_stack(asm, argc);
@@ -6760,7 +8978,7 @@ fn gen_struct_aref(
     // true of the converse.
     let embedded = unsafe { FL_TEST_RAW(comptime_recv, VALUE(RSTRUCT_EMBED_LEN_MASK)) };
 
-    asm.comment("struct aref");
+    asm_comment!(asm, "struct aref");
 
     let recv = asm.stack_pop(1);
     let recv = asm.load(recv);
@@ -6775,14 +8993,12 @@ fn gen_struct_aref(
     let ret = asm.stack_push(Type::Unknown);
     asm.mov(ret, val);
 
-    jump_to_next_insn(jit, asm, ocb);
-    Some(EndBlock)
+    jump_to_next_insn(jit, asm)
 }
 
 fn gen_struct_aset(
     jit: &mut JITState,
     asm: &mut Assembler,
-    ocb: &mut OutlinedCb,
     ci: *const rb_callinfo,
     cme: *const rb_callable_method_entry_t,
     comptime_recv: VALUE,
@@ -6793,6 +9009,13 @@ fn gen_struct_aset(
         return None;
     }
 
+    if c_method_tracing_currently_enabled(jit) {
+        // Struct accesses need fire c_call and c_return events, which we can't support
+        // See :attr-tracing:
+        gen_counter_incr(jit, asm, Counter::send_cfunc_tracing);
+        return None;
+    }
+
     // This is a .send call and we need to adjust the stack
     if flags & VM_CALL_OPT_SEND != 0 {
         handle_opt_send_shift_stack(asm, argc);
@@ -6806,7 +9029,7 @@ fn gen_struct_aset(
     assert!(unsafe { RB_TYPE_P(comptime_recv, RUBY_T_STRUCT) });
     assert!((off as i64) < unsafe { RSTRUCT_LEN(comptime_recv) });
 
-    asm.comment("struct aset");
+    asm_comment!(asm, "struct aset");
 
     let val = asm.stack_pop(1);
     let recv = asm.stack_pop(1);
@@ -6816,8 +9039,7 @@ fn gen_struct_aset(
     let ret = asm.stack_push(Type::Unknown);
     asm.mov(ret, val);
 
-    jump_to_next_insn(jit, asm, ocb);
-    Some(EndBlock)
+    jump_to_next_insn(jit, asm)
 }
 
 // Generate code that calls a method with dynamic dispatch
@@ -6832,16 +9054,21 @@ fn gen_send_dynamic<F: Fn(&mut Assembler) -> Opnd>(
     if unsafe { vm_ci_flag((*cd).ci) } & VM_CALL_TAILCALL != 0 {
         return None;
     }
+    jit_perf_symbol_push!(jit, asm, "gen_send_dynamic", PerfMap::Codegen);
 
-    // Save PC and SP to prepare for dynamic dispatch
-    jit_prepare_routine_call(jit, asm);
+    // Rewind stack_size using ctx.with_stack_size to allow stack_size changes
+    // before you return None.
+    asm.ctx = asm.ctx.with_stack_size(jit.stack_size_for_pc);
 
-    // Pop arguments and a receiver
-    asm.stack_pop(sp_pops);
+    // Save PC and SP to prepare for dynamic dispatch
+    jit_prepare_non_leaf_call(jit, asm);
 
     // Dispatch a method
     let ret = vm_sendish(asm);
 
+    // Pop arguments and a receiver
+    asm.stack_pop(sp_pops);
+
     // Push the return value
     let stack_ret = asm.stack_push(Type::Unknown);
     asm.mov(stack_ret, ret);
@@ -6849,14 +9076,17 @@ fn gen_send_dynamic<F: Fn(&mut Assembler) -> Opnd>(
     // Fix the interpreter SP deviated by vm_sendish
     asm.mov(Opnd::mem(64, CFP, RUBY_OFFSET_CFP_SP), SP);
 
-    gen_counter_incr(asm, Counter::num_send_dynamic);
-    Some(KeepCompiling)
+    gen_counter_incr(jit, asm, Counter::num_send_dynamic);
+
+    jit_perf_symbol_pop!(jit, asm, PerfMap::Codegen);
+
+    // End the current block for invalidationg and sharing the same successor
+    jump_to_next_insn(jit, asm)
 }
 
 fn gen_send_general(
     jit: &mut JITState,
     asm: &mut Assembler,
-    ocb: &mut OutlinedCb,
     cd: *const rb_call_data,
     block: Option<BlockHandler>,
 ) -> Option<CodegenStatus> {
@@ -6875,21 +9105,35 @@ fn gen_send_general(
     let mut mid = unsafe { vm_ci_mid(ci) };
     let mut flags = unsafe { vm_ci_flag(ci) };
 
-    // Don't JIT calls with keyword splat
-    if flags & VM_CALL_KW_SPLAT != 0 {
-        gen_counter_incr(asm, Counter::send_kw_splat);
-        return None;
+    // Defer compilation so we can specialize on class of receiver
+    if !jit.at_compile_target() {
+        return jit.defer_compilation(asm);
     }
 
-    // Defer compilation so we can specialize on class of receiver
-    if !jit.at_current_insn() {
-        defer_compilation(jit, asm, ocb);
-        return Some(EndBlock);
+    let ci_flags = unsafe { vm_ci_flag(ci) };
+
+    // Dynamic stack layout. No good way to support without inlining.
+    if ci_flags & VM_CALL_FORWARDING != 0 {
+        gen_counter_incr(jit, asm, Counter::send_forwarding);
+        return None;
     }
 
     let recv_idx = argc + if flags & VM_CALL_ARGS_BLOCKARG != 0 { 1 } else { 0 };
     let comptime_recv = jit.peek_at_stack(&asm.ctx, recv_idx as isize);
     let comptime_recv_klass = comptime_recv.class_of();
+    assert_eq!(RUBY_T_CLASS, comptime_recv_klass.builtin_type(),
+        "objects visible to ruby code should have a T_CLASS in their klass field");
+
+    // Don't compile calls through singleton classes to avoid retaining the receiver.
+    // Make an exception for class methods since classes tend to be retained anyways.
+    // Also compile calls on top_self to help tests.
+    if VALUE(0) != unsafe { FL_TEST(comptime_recv_klass, VALUE(RUBY_FL_SINGLETON as usize)) }
+        && comptime_recv != unsafe { rb_vm_top_self() }
+        && !unsafe { RB_TYPE_P(comptime_recv, RUBY_T_CLASS) }
+        && !unsafe { RB_TYPE_P(comptime_recv, RUBY_T_MODULE) } {
+        gen_counter_incr(jit, asm, Counter::send_singleton_class);
+        return None;
+    }
 
     // Points to the receiver operand on the stack
     let recv = asm.stack_opnd(recv_idx);
@@ -6897,50 +9141,44 @@ fn gen_send_general(
 
     // Log the name of the method we're calling to
     #[cfg(feature = "disasm")]
-    {
-        let class_name = unsafe { cstr_to_rust_string(rb_class2name(comptime_recv_klass)) };
-        let method_name = unsafe { cstr_to_rust_string(rb_id2name(mid)) };
-        match (class_name, method_name) {
-            (Some(class_name), Some(method_name)) => {
-                asm.comment(&format!("call to {}#{}", class_name, method_name))
-            }
-            _ => {}
-        }
-    }
+    asm_comment!(asm, "call to {}", get_method_name(Some(comptime_recv_klass), mid));
 
     // Gather some statistics about sends
-    gen_counter_incr(asm, Counter::num_send);
+    gen_counter_incr(jit, asm, Counter::num_send);
     if let Some(_known_klass) = asm.ctx.get_opnd_type(recv_opnd).known_class()  {
-        gen_counter_incr(asm, Counter::num_send_known_class);
+        gen_counter_incr(jit, asm, Counter::num_send_known_class);
     }
     if asm.ctx.get_chain_depth() > 1 {
-        gen_counter_incr(asm, Counter::num_send_polymorphic);
+        gen_counter_incr(jit, asm, Counter::num_send_polymorphic);
     }
     // If megamorphic, let the caller fallback to dynamic dispatch
-    if asm.ctx.get_chain_depth() as i32 >= SEND_MAX_DEPTH {
-        gen_counter_incr(asm, Counter::num_send_megamorphic);
+    if asm.ctx.get_chain_depth() >= SEND_MAX_DEPTH {
+        gen_counter_incr(jit, asm, Counter::send_megamorphic);
         return None;
     }
 
-    jit_guard_known_klass(
+    perf_call!("gen_send_general: ", jit_guard_known_klass(
         jit,
         asm,
-        ocb,
         comptime_recv_klass,
         recv,
         recv_opnd,
         comptime_recv,
         SEND_MAX_DEPTH,
         Counter::guard_send_klass_megamorphic,
-    );
+    ));
 
     // Do method lookup
     let mut cme = unsafe { rb_callable_method_entry(comptime_recv_klass, mid) };
     if cme.is_null() {
-        // TODO: counter
+        gen_counter_incr(jit, asm, Counter::send_cme_not_found);
         return None;
     }
 
+    // Load an overloaded cme if applicable. See vm_search_cc().
+    // It allows you to use a faster ISEQ if possible.
+    cme = unsafe { rb_check_overloaded_cme(cme, ci) };
+
     let visi = unsafe { METHOD_ENTRY_VISI(cme) };
     match visi {
         METHOD_VISI_PUBLIC => {
@@ -6950,6 +9188,7 @@ fn gen_send_general(
             if flags & VM_CALL_FCALL == 0 {
                 // Can only call private methods with FCALL callsites.
                 // (at the moment they are callsites without a receiver or an explicit `self` receiver)
+                gen_counter_incr(jit, asm, Counter::send_private_not_fcall);
                 return None;
             }
         }
@@ -6968,7 +9207,7 @@ fn gen_send_general(
 
     // Register block for invalidation
     //assert!(cme->called_id == mid);
-    jit.assume_method_lookup_stable(asm, ocb, cme);
+    jit.assume_method_lookup_stable(asm, cme);
 
     // To handle the aliased method case (VM_METHOD_TYPE_ALIAS)
     loop {
@@ -6978,37 +9217,58 @@ fn gen_send_general(
             VM_METHOD_TYPE_ISEQ => {
                 let iseq = unsafe { get_def_iseq_ptr((*cme).def) };
                 let frame_type = VM_FRAME_MAGIC_METHOD | VM_ENV_FLAG_LOCAL;
-                return gen_send_iseq(jit, asm, ocb, iseq, ci, frame_type, None, cme, block, flags, argc, None);
+                return perf_call! { gen_send_iseq(jit, asm, iseq, ci, frame_type, None, cme, block, flags, argc, None) };
             }
             VM_METHOD_TYPE_CFUNC => {
-                return gen_send_cfunc(
+                return perf_call! { gen_send_cfunc(
                     jit,
                     asm,
-                    ocb,
                     ci,
                     cme,
                     block,
-                    &comptime_recv_klass,
+                    Some(comptime_recv_klass),
                     flags,
                     argc,
-                );
+                ) };
             }
             VM_METHOD_TYPE_IVAR => {
-                if flags & VM_CALL_ARGS_SPLAT != 0 {
-                    gen_counter_incr(asm, Counter::send_args_splat_ivar);
+                // This is a .send call not supported right now for attr_reader
+                if flags & VM_CALL_OPT_SEND != 0 {
+                    gen_counter_incr(jit, asm, Counter::send_send_attr_reader);
                     return None;
                 }
 
-                if argc != 0 {
-                    // Argument count mismatch. Getters take no arguments.
-                    gen_counter_incr(asm, Counter::send_getter_arity);
-                    return None;
+                if flags & VM_CALL_ARGS_BLOCKARG != 0 {
+                    match asm.ctx.get_opnd_type(StackOpnd(0)) {
+                        Type::Nil | Type::BlockParamProxy => {
+                            // Getters ignore the block arg, and these types of block args can be
+                            // passed without side-effect (never any `to_proc` call).
+                            asm.stack_pop(1);
+                        }
+                        _ => {
+                            gen_counter_incr(jit, asm, Counter::send_getter_block_arg);
+                            return None;
+                        }
+                    }
                 }
 
-                // This is a .send call not supported right now for getters
-                if flags & VM_CALL_OPT_SEND != 0 {
-                    gen_counter_incr(asm, Counter::send_send_getter);
-                    return None;
+                if argc != 0 {
+                    // Guard for simple splat of empty array
+                    if VM_CALL_ARGS_SPLAT == flags & (VM_CALL_ARGS_SPLAT | VM_CALL_KWARG | VM_CALL_KW_SPLAT)
+                        && argc == 1 {
+                        // Not using chain guards since on failure these likely end up just raising
+                        // ArgumentError
+                        let splat = asm.stack_opnd(0);
+                        guard_object_is_array(asm, splat, splat.into(), Counter::guard_send_getter_splat_non_empty);
+                        let splat_len = get_array_len(asm, splat);
+                        asm.cmp(splat_len, 0.into());
+                        asm.jne(Target::side_exit(Counter::guard_send_getter_splat_non_empty));
+                        asm.stack_pop(1);
+                    } else {
+                        // Argument count mismatch. Getters take no arguments.
+                        gen_counter_incr(jit, asm, Counter::send_getter_arity);
+                        return None;
+                    }
                 }
 
                 if c_method_tracing_currently_enabled(jit) {
@@ -7017,63 +9277,61 @@ fn gen_send_general(
                     // Handling the C method tracing events for attr_accessor
                     // methods is easier than regular C methods as we know the
                     // "method" we are calling into never enables those tracing
-                    // events. Once global invalidation runs, the code for the
-                    // attr_accessor is invalidated and we exit at the closest
-                    // instruction boundary which is always outside of the body of
-                    // the attr_accessor code.
-                    gen_counter_incr(asm, Counter::send_cfunc_tracing);
+                    // events. We are never inside the code that needs to be
+                    // invalidated when invalidation happens.
+                    gen_counter_incr(jit, asm, Counter::send_cfunc_tracing);
                     return None;
                 }
 
+                let recv = asm.stack_opnd(0); // the receiver should now be the stack top
                 let ivar_name = unsafe { get_cme_def_body_attr_id(cme) };
 
-                if flags & VM_CALL_ARGS_BLOCKARG != 0 {
-                    gen_counter_incr(asm, Counter::send_block_arg);
-                    return None;
-                }
-
                 return gen_get_ivar(
                     jit,
                     asm,
-                    ocb,
                     SEND_MAX_DEPTH,
                     comptime_recv,
                     ivar_name,
                     recv,
-                    recv_opnd,
+                    recv.into(),
                 );
             }
             VM_METHOD_TYPE_ATTRSET => {
+                // This is a .send call not supported right now for attr_writer
+                if flags & VM_CALL_OPT_SEND != 0 {
+                    gen_counter_incr(jit, asm, Counter::send_send_attr_writer);
+                    return None;
+                }
                 if flags & VM_CALL_ARGS_SPLAT != 0 {
-                    gen_counter_incr(asm, Counter::send_args_splat_attrset);
+                    gen_counter_incr(jit, asm, Counter::send_args_splat_attrset);
                     return None;
                 }
                 if flags & VM_CALL_KWARG != 0 {
-                    gen_counter_incr(asm, Counter::send_attrset_kwargs);
+                    gen_counter_incr(jit, asm, Counter::send_attrset_kwargs);
                     return None;
                 } else if argc != 1 || unsafe { !RB_TYPE_P(comptime_recv, RUBY_T_OBJECT) } {
-                    gen_counter_incr(asm, Counter::send_ivar_set_method);
+                    gen_counter_incr(jit, asm, Counter::send_ivar_set_method);
                     return None;
                 } else if c_method_tracing_currently_enabled(jit) {
                     // Can't generate code for firing c_call and c_return events
                     // See :attr-tracing:
-                    gen_counter_incr(asm, Counter::send_cfunc_tracing);
+                    gen_counter_incr(jit, asm, Counter::send_cfunc_tracing);
                     return None;
                 } else if flags & VM_CALL_ARGS_BLOCKARG != 0 {
-                    gen_counter_incr(asm, Counter::send_block_arg);
+                    gen_counter_incr(jit, asm, Counter::send_attrset_block_arg);
                     return None;
                 } else {
                     let ivar_name = unsafe { get_cme_def_body_attr_id(cme) };
-                    return gen_set_ivar(jit, asm, ivar_name, flags, argc);
+                    return gen_set_ivar(jit, asm, comptime_recv, ivar_name, StackOpnd(1), None);
                 }
             }
             // Block method, e.g. define_method(:foo) { :my_block }
             VM_METHOD_TYPE_BMETHOD => {
                 if flags & VM_CALL_ARGS_SPLAT != 0 {
-                    gen_counter_incr(asm, Counter::send_args_splat_bmethod);
+                    gen_counter_incr(jit, asm, Counter::send_args_splat_bmethod);
                     return None;
                 }
-                return gen_send_bmethod(jit, asm, ocb, ci, cme, block, flags, argc);
+                return gen_send_bmethod(jit, asm, ci, cme, block, flags, argc);
             }
             VM_METHOD_TYPE_ALIAS => {
                 // Retrieve the aliased method and re-enter the switch
@@ -7083,7 +9341,7 @@ fn gen_send_general(
             // Send family of methods, e.g. call/apply
             VM_METHOD_TYPE_OPTIMIZED => {
                 if flags & VM_CALL_ARGS_BLOCKARG != 0 {
-                    gen_counter_incr(asm, Counter::send_block_arg);
+                    gen_counter_incr(jit, asm, Counter::send_optimized_block_arg);
                     return None;
                 }
 
@@ -7101,12 +9359,12 @@ fn gen_send_general(
                         // currently work, we can't do stack manipulation until we will no longer
                         // side exit.
                         if flags & VM_CALL_OPT_SEND != 0 {
-                            gen_counter_incr(asm, Counter::send_send_nested);
+                            gen_counter_incr(jit, asm, Counter::send_send_nested);
                             return None;
                         }
 
                         if argc == 0 {
-                            gen_counter_incr(asm, Counter::send_send_wrong_args);
+                            gen_counter_incr(jit, asm, Counter::send_send_wrong_args);
                             return None;
                         }
 
@@ -7114,69 +9372,39 @@ fn gen_send_general(
 
                         let compile_time_name = jit.peek_at_stack(&asm.ctx, argc as isize);
 
-                        if !compile_time_name.string_p() && !compile_time_name.static_sym_p()  {
-                            gen_counter_incr(asm, Counter::send_send_chain_not_string_or_sym);
-                            return None;
-                        }
-
                         mid = unsafe { rb_get_symbol_id(compile_time_name) };
                         if mid == 0 {
-                            gen_counter_incr(asm, Counter::send_send_null_mid);
+                            // This also rejects method names that need conversion
+                            gen_counter_incr(jit, asm, Counter::send_send_null_mid);
                             return None;
                         }
 
                         cme = unsafe { rb_callable_method_entry(comptime_recv_klass, mid) };
                         if cme.is_null() {
-                            gen_counter_incr(asm, Counter::send_send_null_cme);
+                            gen_counter_incr(jit, asm, Counter::send_send_null_cme);
                             return None;
                         }
 
                         flags |= VM_CALL_FCALL | VM_CALL_OPT_SEND;
 
-                        jit.assume_method_lookup_stable(asm, ocb, cme);
-
-                        let (known_class, type_mismatch_counter) = {
-                            if compile_time_name.string_p() {
-                                (
-                                    unsafe { rb_cString },
-                                    Counter::guard_send_send_chain_not_string,
-                                )
-                            } else {
-                                (
-                                    unsafe { rb_cSymbol },
-                                    Counter::guard_send_send_chain_not_sym,
-                                )
-                            }
-                        };
+                        jit.assume_method_lookup_stable(asm, cme);
 
-                        let name_opnd = asm.stack_opnd(argc);
-                        jit_guard_known_klass(
-                            jit,
+                        asm_comment!(
                             asm,
-                            ocb,
-                            known_class,
-                            name_opnd,
-                            name_opnd.into(),
-                            compile_time_name,
-                            2, // We have string or symbol, so max depth is 2
-                            type_mismatch_counter
+                            "guard sending method name \'{}\'",
+                            unsafe { cstr_to_rust_string(rb_id2name(mid)) }.unwrap_or_else(|| "<unknown>".to_owned()),
                         );
 
-                        // Need to do this here so we don't have too many live
-                        // values for the register allocator.
-                        let name_opnd = asm.load(name_opnd);
-
+                        let name_opnd = asm.stack_opnd(argc);
                         let symbol_id_opnd = asm.ccall(rb_get_symbol_id as *const u8, vec![name_opnd]);
 
-                        asm.comment("chain_guard_send");
                         asm.cmp(symbol_id_opnd, mid.into());
                         jit_chain_guard(
                             JCC_JNE,
                             jit,
                             asm,
-                            ocb,
-                            SEND_MAX_CHAIN_DEPTH,
-                            Counter::guard_send_send_chain,
+                            SEND_MAX_DEPTH,
+                            Counter::guard_send_send_name_chain,
                         );
 
                         // We have changed the argc, flags, mid, and cme, so we need to re-enter the match
@@ -7185,26 +9413,25 @@ fn gen_send_general(
 
                     }
                     OPTIMIZED_METHOD_TYPE_CALL => {
-
                         if block.is_some() {
-                            gen_counter_incr(asm, Counter::send_call_block);
+                            gen_counter_incr(jit, asm, Counter::send_call_block);
                             return None;
                         }
 
                         if flags & VM_CALL_KWARG != 0 {
-                            gen_counter_incr(asm, Counter::send_call_kwarg);
+                            gen_counter_incr(jit, asm, Counter::send_call_kwarg);
                             return None;
                         }
 
                         if flags & VM_CALL_ARGS_SPLAT != 0 {
-                            gen_counter_incr(asm, Counter::send_args_splat_opt_call);
+                            gen_counter_incr(jit, asm, Counter::send_args_splat_opt_call);
                             return None;
                         }
 
                         // Optimize for single ractor mode and avoid runtime check for
                         // "defined with an un-shareable Proc in a different Ractor"
-                        if !assume_single_ractor_mode(jit, asm, ocb) {
-                            gen_counter_incr(asm, Counter::send_call_multi_ractor);
+                        if !assume_single_ractor_mode(jit, asm) {
+                            gen_counter_incr(jit, asm, Counter::send_call_multi_ractor);
                             return None;
                         }
 
@@ -7219,7 +9446,7 @@ fn gen_send_general(
                         let sp = asm.lea(asm.ctx.sp_opnd(0));
 
                         // Save the PC and SP because the callee can make Ruby calls
-                        jit_prepare_routine_call(jit, asm);
+                        jit_prepare_non_leaf_call(jit, asm);
 
                         let kw_splat = flags & VM_CALL_KW_SPLAT;
                         let stack_argument_pointer = asm.lea(Opnd::mem(64, sp, -(argc) * SIZEOF_VALUE_I32));
@@ -7237,22 +9464,22 @@ fn gen_send_general(
 
                         let stack_ret = asm.stack_push(Type::Unknown);
                         asm.mov(stack_ret, ret);
-                        return Some(KeepCompiling);
 
+                        // End the block to allow invalidating the next instruction
+                        return jump_to_next_insn(jit, asm);
                     }
                     OPTIMIZED_METHOD_TYPE_BLOCK_CALL => {
-                        gen_counter_incr(asm, Counter::send_optimized_method_block_call);
+                        gen_counter_incr(jit, asm, Counter::send_optimized_method_block_call);
                         return None;
                     }
                     OPTIMIZED_METHOD_TYPE_STRUCT_AREF => {
                         if flags & VM_CALL_ARGS_SPLAT != 0 {
-                            gen_counter_incr(asm, Counter::send_args_splat_aref);
+                            gen_counter_incr(jit, asm, Counter::send_args_splat_aref);
                             return None;
                         }
                         return gen_struct_aref(
                             jit,
                             asm,
-                            ocb,
                             ci,
                             cme,
                             comptime_recv,
@@ -7262,13 +9489,12 @@ fn gen_send_general(
                     }
                     OPTIMIZED_METHOD_TYPE_STRUCT_ASET => {
                         if flags & VM_CALL_ARGS_SPLAT != 0 {
-                            gen_counter_incr(asm, Counter::send_args_splat_aset);
+                            gen_counter_incr(jit, asm, Counter::send_args_splat_aset);
                             return None;
                         }
                         return gen_struct_aset(
                             jit,
                             asm,
-                            ocb,
                             ci,
                             cme,
                             comptime_recv,
@@ -7282,23 +9508,23 @@ fn gen_send_general(
                 }
             }
             VM_METHOD_TYPE_ZSUPER => {
-                gen_counter_incr(asm, Counter::send_zsuper_method);
+                gen_counter_incr(jit, asm, Counter::send_zsuper_method);
                 return None;
             }
             VM_METHOD_TYPE_UNDEF => {
-                gen_counter_incr(asm, Counter::send_undef_method);
+                gen_counter_incr(jit, asm, Counter::send_undef_method);
                 return None;
             }
             VM_METHOD_TYPE_NOTIMPLEMENTED => {
-                gen_counter_incr(asm, Counter::send_not_implemented_method);
+                gen_counter_incr(jit, asm, Counter::send_not_implemented_method);
                 return None;
             }
             VM_METHOD_TYPE_MISSING => {
-                gen_counter_incr(asm, Counter::send_missing_method);
+                gen_counter_incr(jit, asm, Counter::send_missing_method);
                 return None;
             }
             VM_METHOD_TYPE_REFINED => {
-                gen_counter_incr(asm, Counter::send_refined_method);
+                gen_counter_incr(jit, asm, Counter::send_refined_method);
                 return None;
             }
             _ => {
@@ -7308,6 +9534,35 @@ fn gen_send_general(
     }
 }
 
+/// Get class name from a class pointer.
+fn get_class_name(class: Option<VALUE>) -> String {
+    class.filter(|&class| {
+        // type checks for rb_class2name()
+        unsafe { RB_TYPE_P(class, RUBY_T_MODULE) || RB_TYPE_P(class, RUBY_T_CLASS) }
+    }).and_then(|class| unsafe {
+        cstr_to_rust_string(rb_class2name(class))
+    }).unwrap_or_else(|| "Unknown".to_string())
+}
+
+/// Assemble "{class_name}#{method_name}" from a class pointer and a method ID
+fn get_method_name(class: Option<VALUE>, mid: u64) -> String {
+    let class_name = get_class_name(class);
+    let method_name = if mid != 0 {
+        unsafe { cstr_to_rust_string(rb_id2name(mid)) }
+    } else {
+        None
+    }.unwrap_or_else(|| "Unknown".to_string());
+    format!("{}#{}", class_name, method_name)
+}
+
+/// Assemble "{label}@{iseq_path}:{lineno}" (iseq_inspect() format) from an ISEQ
+fn get_iseq_name(iseq: IseqPtr) -> String {
+    let c_string = unsafe { rb_yjit_iseq_inspect(iseq) };
+    let string = unsafe { CStr::from_ptr(c_string) }.to_str()
+        .unwrap_or_else(|_| "not UTF-8").to_string();
+    unsafe { ruby_xfree(c_string as *mut c_void); }
+    string
+}
 
 /// Shifts the stack for send in order to remove the name of the method
 /// Comment below borrow from vm_call_opt_send in vm_insnhelper.c
@@ -7325,7 +9580,7 @@ fn gen_send_general(
 ///
 /// We do this for our compiletime context and the actual stack
 fn handle_opt_send_shift_stack(asm: &mut Assembler, argc: i32) {
-    asm.comment("shift_stack");
+    asm_comment!(asm, "shift_stack");
     for j in (0..argc).rev() {
         let opnd = asm.stack_opnd(j);
         let opnd2 = asm.stack_opnd(j + 1);
@@ -7337,11 +9592,10 @@ fn handle_opt_send_shift_stack(asm: &mut Assembler, argc: i32) {
 fn gen_opt_send_without_block(
     jit: &mut JITState,
     asm: &mut Assembler,
-    ocb: &mut OutlinedCb,
 ) -> Option<CodegenStatus> {
     // Generate specialized code if possible
     let cd = jit.get_arg(0).as_ptr();
-    if let Some(status) = gen_send_general(jit, asm, ocb, cd, None) {
+    if let Some(status) = perf_call! { gen_send_general(jit, asm, cd, None) } {
         return Some(status);
     }
 
@@ -7360,12 +9614,11 @@ fn gen_opt_send_without_block(
 fn gen_send(
     jit: &mut JITState,
     asm: &mut Assembler,
-    ocb: &mut OutlinedCb,
 ) -> Option<CodegenStatus> {
     // Generate specialized code if possible
     let cd = jit.get_arg(0).as_ptr();
     let block = jit.get_arg(1).as_optional_ptr().map(|iseq| BlockHandler::BlockISeq(iseq));
-    if let Some(status) = gen_send_general(jit, asm, ocb, cd, block) {
+    if let Some(status) = perf_call! { gen_send_general(jit, asm, cd, block) } {
         return Some(status);
     }
 
@@ -7382,14 +9635,20 @@ fn gen_send(
     })
 }
 
+fn gen_sendforward(
+    jit: &mut JITState,
+    asm: &mut Assembler,
+) -> Option<CodegenStatus> {
+    return gen_send(jit, asm);
+}
+
 fn gen_invokeblock(
     jit: &mut JITState,
     asm: &mut Assembler,
-    ocb: &mut OutlinedCb,
 ) -> Option<CodegenStatus> {
     // Generate specialized code if possible
     let cd = jit.get_arg(0).as_ptr();
-    if let Some(status) = gen_invokeblock_specialized(jit, asm, ocb, cd) {
+    if let Some(status) = gen_invokeblock_specialized(jit, asm, cd) {
         return Some(status);
     }
 
@@ -7408,17 +9667,15 @@ fn gen_invokeblock(
 fn gen_invokeblock_specialized(
     jit: &mut JITState,
     asm: &mut Assembler,
-    ocb: &mut OutlinedCb,
     cd: *const rb_call_data,
 ) -> Option<CodegenStatus> {
-    if !jit.at_current_insn() {
-        defer_compilation(jit, asm, ocb);
-        return Some(EndBlock);
+    if !jit.at_compile_target() {
+        return jit.defer_compilation(asm);
     }
 
     // Fallback to dynamic dispatch if this callsite is megamorphic
-    if asm.ctx.get_chain_depth() as i32 >= SEND_MAX_CHAIN_DEPTH {
-        gen_counter_incr(asm, Counter::invokeblock_megamorphic);
+    if asm.ctx.get_chain_depth() >= SEND_MAX_DEPTH {
+        gen_counter_incr(jit, asm, Counter::invokeblock_megamorphic);
         return None;
     }
 
@@ -7434,95 +9691,86 @@ fn gen_invokeblock_specialized(
 
     // Handle each block_handler type
     if comptime_handler.0 == VM_BLOCK_HANDLER_NONE as usize { // no block given
-        gen_counter_incr(asm, Counter::invokeblock_none);
+        gen_counter_incr(jit, asm, Counter::invokeblock_none);
         None
     } else if comptime_handler.0 & 0x3 == 0x1 { // VM_BH_ISEQ_BLOCK_P
-        asm.comment("get local EP");
+        asm_comment!(asm, "get local EP");
         let ep_opnd = gen_get_lep(jit, asm);
         let block_handler_opnd = asm.load(
             Opnd::mem(64, ep_opnd, SIZEOF_VALUE_I32 * VM_ENV_DATA_INDEX_SPECVAL)
         );
 
-        asm.comment("guard block_handler type");
+        asm_comment!(asm, "guard block_handler type");
         let tag_opnd = asm.and(block_handler_opnd, 0x3.into()); // block_handler is a tagged pointer
         asm.cmp(tag_opnd, 0x1.into()); // VM_BH_ISEQ_BLOCK_P
         jit_chain_guard(
             JCC_JNE,
             jit,
             asm,
-            ocb,
-            SEND_MAX_CHAIN_DEPTH,
+            SEND_MAX_DEPTH,
             Counter::guard_invokeblock_tag_changed,
         );
 
+        // If the current ISEQ is annotated to be inlined but it's not being inlined here,
+        // generate a dynamic dispatch to avoid making this yield megamorphic.
+        if unsafe { rb_yjit_iseq_builtin_attrs(jit.iseq) } & BUILTIN_ATTR_INLINE_BLOCK != 0 && !asm.ctx.inline() {
+            gen_counter_incr(jit, asm, Counter::invokeblock_iseq_not_inlined);
+            return None;
+        }
+
         let comptime_captured = unsafe { ((comptime_handler.0 & !0x3) as *const rb_captured_block).as_ref().unwrap() };
         let comptime_iseq = unsafe { *comptime_captured.code.iseq.as_ref() };
 
-        asm.comment("guard known ISEQ");
+        asm_comment!(asm, "guard known ISEQ");
         let captured_opnd = asm.and(block_handler_opnd, Opnd::Imm(!0x3));
         let iseq_opnd = asm.load(Opnd::mem(64, captured_opnd, SIZEOF_VALUE_I32 * 2));
-        asm.cmp(iseq_opnd, (comptime_iseq as usize).into());
+        asm.cmp(iseq_opnd, VALUE::from(comptime_iseq).into());
         jit_chain_guard(
             JCC_JNE,
             jit,
             asm,
-            ocb,
-            SEND_MAX_CHAIN_DEPTH,
+            SEND_MAX_DEPTH,
             Counter::guard_invokeblock_iseq_block_changed,
         );
 
-        gen_send_iseq(
-            jit,
-            asm,
-            ocb,
-            comptime_iseq,
-            ci,
-            VM_FRAME_MAGIC_BLOCK,
-            None,
-            0 as _,
-            None,
-            flags,
-            argc,
-            Some(captured_opnd),
-        )
+        perf_call! { gen_send_iseq(jit, asm, comptime_iseq, ci, VM_FRAME_MAGIC_BLOCK, None, 0 as _, None, flags, argc, Some(captured_opnd)) }
     } else if comptime_handler.0 & 0x3 == 0x3 { // VM_BH_IFUNC_P
         // We aren't handling CALLER_SETUP_ARG and CALLER_REMOVE_EMPTY_KW_SPLAT yet.
         if flags & VM_CALL_ARGS_SPLAT != 0 {
-            gen_counter_incr(asm, Counter::invokeblock_ifunc_args_splat);
+            gen_counter_incr(jit, asm, Counter::invokeblock_ifunc_args_splat);
             return None;
         }
         if flags & VM_CALL_KW_SPLAT != 0 {
-            gen_counter_incr(asm, Counter::invokeblock_ifunc_kw_splat);
+            gen_counter_incr(jit, asm, Counter::invokeblock_ifunc_kw_splat);
             return None;
         }
 
-        asm.comment("get local EP");
+        asm_comment!(asm, "get local EP");
         let ep_opnd = gen_get_lep(jit, asm);
         let block_handler_opnd = asm.load(
             Opnd::mem(64, ep_opnd, SIZEOF_VALUE_I32 * VM_ENV_DATA_INDEX_SPECVAL)
         );
 
-        asm.comment("guard block_handler type");
+        asm_comment!(asm, "guard block_handler type");
         let tag_opnd = asm.and(block_handler_opnd, 0x3.into()); // block_handler is a tagged pointer
         asm.cmp(tag_opnd, 0x3.into()); // VM_BH_IFUNC_P
         jit_chain_guard(
             JCC_JNE,
             jit,
             asm,
-            ocb,
-            SEND_MAX_CHAIN_DEPTH,
+            SEND_MAX_DEPTH,
             Counter::guard_invokeblock_tag_changed,
         );
 
         // The cfunc may not be leaf
-        jit_prepare_routine_call(jit, asm);
+        jit_prepare_non_leaf_call(jit, asm);
 
         extern "C" {
             fn rb_vm_yield_with_cfunc(ec: EcPtr, captured: *const rb_captured_block, argc: c_int, argv: *const VALUE) -> VALUE;
         }
-        asm.comment("call ifunc");
+        asm_comment!(asm, "call ifunc");
         let captured_opnd = asm.and(block_handler_opnd, Opnd::Imm(!0x3));
-        let argv = asm.lea(asm.ctx.sp_opnd((-argc * SIZEOF_VALUE_I32) as isize));
+        let argv = asm.lea(asm.ctx.sp_opnd(-argc));
         let ret = asm.ccall(
             rb_vm_yield_with_cfunc as *const u8,
             vec![EC, captured_opnd, argc.into(), argv],
@@ -7533,16 +9781,15 @@ fn gen_invokeblock_specialized(
         asm.mov(stack_ret, ret);
 
         // cfunc calls may corrupt types
-        asm.ctx.clear_local_types();
+        asm.clear_local_types();
 
         // Share the successor with other chains
-        jump_to_next_insn(jit, asm, ocb);
-        Some(EndBlock)
+        jump_to_next_insn(jit, asm)
     } else if comptime_handler.symbol_p() {
-        gen_counter_incr(asm, Counter::invokeblock_symbol);
+        gen_counter_incr(jit, asm, Counter::invokeblock_symbol);
         None
     } else { // Proc
-        gen_counter_incr(asm, Counter::invokeblock_proc);
+        gen_counter_incr(jit, asm, Counter::invokeblock_proc);
         None
     }
 }
@@ -7550,11 +9797,10 @@ fn gen_invokeblock_specialized(
 fn gen_invokesuper(
     jit: &mut JITState,
     asm: &mut Assembler,
-    ocb: &mut OutlinedCb,
 ) -> Option<CodegenStatus> {
     // Generate specialized code if possible
     let cd = jit.get_arg(0).as_ptr();
-    if let Some(status) = gen_invokesuper_specialized(jit, asm, ocb, cd) {
+    if let Some(status) = gen_invokesuper_specialized(jit, asm, cd) {
         return Some(status);
     }
 
@@ -7571,16 +9817,21 @@ fn gen_invokesuper(
     })
 }
 
+fn gen_invokesuperforward(
+    jit: &mut JITState,
+    asm: &mut Assembler,
+) -> Option<CodegenStatus> {
+    return gen_invokesuper(jit, asm);
+}
+
 fn gen_invokesuper_specialized(
     jit: &mut JITState,
     asm: &mut Assembler,
-    ocb: &mut OutlinedCb,
     cd: *const rb_call_data,
 ) -> Option<CodegenStatus> {
     // Defer compilation so we can specialize on class of receiver
-    if !jit.at_current_insn() {
-        defer_compilation(jit, asm, ocb);
-        return Some(EndBlock);
+    if !jit.at_compile_target() {
+        return jit.defer_compilation(asm);
     }
 
     // Handle the last two branches of vm_caller_setup_arg_block
@@ -7591,14 +9842,14 @@ fn gen_invokesuper_specialized(
     };
 
     // Fallback to dynamic dispatch if this callsite is megamorphic
-    if asm.ctx.get_chain_depth() as i32 >= SEND_MAX_CHAIN_DEPTH {
-        gen_counter_incr(asm, Counter::invokesuper_megamorphic);
+    if asm.ctx.get_chain_depth() >= SEND_MAX_DEPTH {
+        gen_counter_incr(jit, asm, Counter::invokesuper_megamorphic);
         return None;
     }
 
     let me = unsafe { rb_vm_frame_method_entry(jit.get_cfp()) };
     if me.is_null() {
-        gen_counter_incr(asm, Counter::invokesuper_no_me);
+        gen_counter_incr(jit, asm, Counter::invokesuper_no_me);
         return None;
     }
 
@@ -7611,7 +9862,7 @@ fn gen_invokesuper_specialized(
     if current_defined_class.builtin_type() == RUBY_T_ICLASS
         && unsafe { RB_TYPE_P((*rbasic_ptr).klass, RUBY_T_MODULE) && FL_TEST_RAW((*rbasic_ptr).klass, VALUE(RMODULE_IS_REFINEMENT.as_usize())) != VALUE(0) }
     {
-        gen_counter_incr(asm, Counter::invokesuper_refinement);
+        gen_counter_incr(jit, asm, Counter::invokesuper_refinement);
         return None;
     }
     let comptime_superclass =
@@ -7626,11 +9877,15 @@ fn gen_invokesuper_specialized(
     // Note, not using VM_CALL_ARGS_SIMPLE because sometimes we pass a block.
 
     if ci_flags & VM_CALL_KWARG != 0 {
-        gen_counter_incr(asm, Counter::invokesuper_kwarg);
+        gen_counter_incr(jit, asm, Counter::invokesuper_kwarg);
         return None;
     }
     if ci_flags & VM_CALL_KW_SPLAT != 0 {
-        gen_counter_incr(asm, Counter::invokesuper_kw_splat);
+        gen_counter_incr(jit, asm, Counter::invokesuper_kw_splat);
+        return None;
+    }
+    if ci_flags & VM_CALL_FORWARDING != 0 {
+        gen_counter_incr(jit, asm, Counter::invokesuper_forwarding);
         return None;
     }
 
@@ -7641,14 +9896,20 @@ fn gen_invokesuper_specialized(
     // check and side exit.
     let comptime_recv = jit.peek_at_stack(&asm.ctx, argc as isize);
     if unsafe { rb_obj_is_kind_of(comptime_recv, current_defined_class) } == VALUE(0) {
-        gen_counter_incr(asm, Counter::invokesuper_defined_class_mismatch);
+        gen_counter_incr(jit, asm, Counter::invokesuper_defined_class_mismatch);
+        return None;
+    }
+
+    // Don't compile `super` on objects with singleton class to avoid retaining the receiver.
+    if VALUE(0) != unsafe { FL_TEST(comptime_recv.class_of(), VALUE(RUBY_FL_SINGLETON as usize)) } {
+        gen_counter_incr(jit, asm, Counter::invokesuper_singleton_class);
         return None;
     }
 
     // Do method lookup
     let cme = unsafe { rb_callable_method_entry(comptime_superclass, mid) };
     if cme.is_null() {
-        gen_counter_incr(asm, Counter::invokesuper_no_cme);
+        gen_counter_incr(jit, asm, Counter::invokesuper_no_cme);
         return None;
     }
 
@@ -7656,11 +9917,11 @@ fn gen_invokesuper_specialized(
     let cme_def_type = unsafe { get_cme_def_type(cme) };
     if cme_def_type != VM_METHOD_TYPE_ISEQ && cme_def_type != VM_METHOD_TYPE_CFUNC {
         // others unimplemented
-        gen_counter_incr(asm, Counter::invokesuper_not_iseq_or_cfunc);
+        gen_counter_incr(jit, asm, Counter::invokesuper_not_iseq_or_cfunc);
         return None;
     }
 
-    asm.comment("guard known me");
+    asm_comment!(asm, "guard known me");
     let lep_opnd = gen_get_lep(jit, asm);
     let ep_me_opnd = Opnd::mem(
         64,
@@ -7674,27 +9935,26 @@ fn gen_invokesuper_specialized(
         JCC_JNE,
         jit,
         asm,
-        ocb,
-        SEND_MAX_CHAIN_DEPTH,
+        SEND_MAX_DEPTH,
         Counter::guard_invokesuper_me_changed,
     );
 
     // We need to assume that both our current method entry and the super
     // method entry we invoke remain stable
-    jit.assume_method_lookup_stable(asm, ocb, me);
-    jit.assume_method_lookup_stable(asm, ocb, cme);
+    jit.assume_method_lookup_stable(asm, me);
+    jit.assume_method_lookup_stable(asm, cme);
 
     // Method calls may corrupt types
-    asm.ctx.clear_local_types();
+    asm.clear_local_types();
 
     match cme_def_type {
         VM_METHOD_TYPE_ISEQ => {
             let iseq = unsafe { get_def_iseq_ptr((*cme).def) };
             let frame_type = VM_FRAME_MAGIC_METHOD | VM_ENV_FLAG_LOCAL;
-            gen_send_iseq(jit, asm, ocb, iseq, ci, frame_type, None, cme, Some(block), ci_flags, argc, None)
+            perf_call! { gen_send_iseq(jit, asm, iseq, ci, frame_type, None, cme, Some(block), ci_flags, argc, None) }
         }
         VM_METHOD_TYPE_CFUNC => {
-            gen_send_cfunc(jit, asm, ocb, ci, cme, Some(block), ptr::null(), ci_flags, argc)
+            perf_call! { gen_send_cfunc(jit, asm, ci, cme, Some(block), None, ci_flags, argc) }
         }
         _ => unreachable!(),
     }
@@ -7703,20 +9963,16 @@ fn gen_invokesuper_specialized(
 fn gen_leave(
     _jit: &mut JITState,
     asm: &mut Assembler,
-    ocb: &mut OutlinedCb,
 ) -> Option<CodegenStatus> {
     // Only the return value should be on the stack
     assert_eq!(1, asm.ctx.get_stack_size(), "leave instruction expects stack size 1, but was: {}", asm.ctx.get_stack_size());
 
-    let ocb_asm = Assembler::new();
-
     // Check for interrupts
     gen_check_ints(asm, Counter::leave_se_interrupt);
-    ocb_asm.compile(ocb.unwrap(), None);
 
     // Pop the current frame (ec->cfp++)
     // Note: the return PC is already in the previous CFP
-    asm.comment("pop stack frame");
+    asm_comment!(asm, "pop stack frame");
     let incr_cfp = asm.add(CFP, RUBY_SIZEOF_CONTROL_FRAME.into());
     asm.mov(CFP, incr_cfp);
     asm.mov(Opnd::mem(64, EC, RUBY_OFFSET_EC_CFP), CFP);
@@ -7724,15 +9980,15 @@ fn gen_leave(
     // Load the return value
     let retval_opnd = asm.stack_pop(1);
 
-    // Move the return value into the C return register for gen_leave_exit()
+    // Move the return value into the C return register
     asm.mov(C_RET_OPND, retval_opnd);
 
-    // Reload REG_SP for the caller and write the return value.
-    // Top of the stack is REG_SP[0] since the caller has sp_offset=1.
-    asm.mov(SP, Opnd::mem(64, CFP, RUBY_OFFSET_CFP_SP));
-    asm.mov(Opnd::mem(64, SP, 0), C_RET_OPND);
-
-    // Jump to the JIT return address on the frame that was just popped
+    // Jump to the JIT return address on the frame that was just popped.
+    // There are a few possible jump targets:
+    //   - gen_leave_exit() and gen_leave_exception(), for C callers
+    //   - Return context set up by gen_send_iseq()
+    // We don't write the return value to stack memory like the interpreter here.
+    // Each jump target do it as necessary.
     let offset_to_jit_return =
         -(RUBY_SIZEOF_CONTROL_FRAME as i32) + RUBY_OFFSET_CFP_JIT_RETURN;
     asm.jmp_opnd(Opnd::mem(64, CFP, offset_to_jit_return));
@@ -7743,12 +9999,11 @@ fn gen_leave(
 fn gen_getglobal(
     jit: &mut JITState,
     asm: &mut Assembler,
-    _ocb: &mut OutlinedCb,
 ) -> Option<CodegenStatus> {
     let gid = jit.get_arg(0).as_usize();
 
     // Save the PC and SP because we might make a Ruby call for warning
-    jit_prepare_routine_call(jit, asm);
+    jit_prepare_non_leaf_call(jit, asm);
 
     let val_opnd = asm.ccall(
         rb_gvar_get as *const u8,
@@ -7764,15 +10019,14 @@ fn gen_getglobal(
 fn gen_setglobal(
     jit: &mut JITState,
     asm: &mut Assembler,
-    _ocb: &mut OutlinedCb,
 ) -> Option<CodegenStatus> {
     let gid = jit.get_arg(0).as_usize();
 
     // Save the PC and SP because we might make a Ruby call for
     // Kernel#set_trace_var
-    jit_prepare_routine_call(jit, asm);
+    jit_prepare_non_leaf_call(jit, asm);
 
-    let val = asm.stack_pop(1);
+    let val = asm.stack_opnd(0);
     asm.ccall(
         rb_gvar_set as *const u8,
         vec![
@@ -7780,6 +10034,7 @@ fn gen_setglobal(
             val,
         ],
     );
+    asm.stack_pop(1); // Keep it during ccall for GC
 
     Some(KeepCompiling)
 }
@@ -7787,15 +10042,15 @@ fn gen_setglobal(
 fn gen_anytostring(
     jit: &mut JITState,
     asm: &mut Assembler,
-    _ocb: &mut OutlinedCb,
 ) -> Option<CodegenStatus> {
     // Save the PC and SP since we might call #to_s
-    jit_prepare_routine_call(jit, asm);
+    jit_prepare_non_leaf_call(jit, asm);
 
-    let str = asm.stack_pop(1);
-    let val = asm.stack_pop(1);
+    let str = asm.stack_opnd(0);
+    let val = asm.stack_opnd(1);
 
     let val = asm.ccall(rb_obj_as_string_result as *const u8, vec![str, val]);
+    asm.stack_pop(2); // Keep them during ccall for GC
 
     // Push the return value
     let stack_ret = asm.stack_push(Type::TString);
@@ -7807,11 +10062,9 @@ fn gen_anytostring(
 fn gen_objtostring(
     jit: &mut JITState,
     asm: &mut Assembler,
-    ocb: &mut OutlinedCb,
 ) -> Option<CodegenStatus> {
-    if !jit.at_current_insn() {
-        defer_compilation(jit, asm, ocb);
-        return Some(EndBlock);
+    if !jit.at_compile_target() {
+        return jit.defer_compilation(asm);
     }
 
     let recv = asm.stack_opnd(0);
@@ -7821,7 +10074,6 @@ fn gen_objtostring(
         jit_guard_known_klass(
             jit,
             asm,
-            ocb,
             comptime_recv.class_of(),
             recv,
             recv.into(),
@@ -7831,23 +10083,52 @@ fn gen_objtostring(
         );
 
         // No work needed. The string value is already on the top of the stack.
+        Some(KeepCompiling)
+    } else if unsafe { RB_TYPE_P(comptime_recv, RUBY_T_SYMBOL) } && assume_method_basic_definition(jit, asm, comptime_recv.class_of(), ID!(to_s)) {
+        jit_guard_known_klass(
+            jit,
+            asm,
+            comptime_recv.class_of(),
+            recv,
+            recv.into(),
+            comptime_recv,
+            SEND_MAX_DEPTH,
+            Counter::objtostring_not_string,
+        );
+
+        extern "C" {
+            fn rb_sym2str(sym: VALUE) -> VALUE;
+        }
+
+        // Same optimization done in the interpreter: rb_sym_to_s() allocates a mutable string, but since we are only
+        // going to use this string for interpolation, it's fine to use the
+        // frozen string.
+        // rb_sym2str does not allocate.
+        let sym = recv;
+        let str = asm.ccall(rb_sym2str as *const u8, vec![sym]);
+        asm.stack_pop(1);
+
+        // Push the return value
+        let stack_ret = asm.stack_push(Type::TString);
+        asm.mov(stack_ret, str);
+
         Some(KeepCompiling)
     } else {
         let cd = jit.get_arg(0).as_ptr();
-        gen_send_general(jit, asm, ocb, cd, None)
+        perf_call! { gen_send_general(jit, asm, cd, None) }
     }
 }
 
 fn gen_intern(
     jit: &mut JITState,
     asm: &mut Assembler,
-    _ocb: &mut OutlinedCb,
 ) -> Option<CodegenStatus> {
     // Save the PC and SP because we might allocate
-    jit_prepare_routine_call(jit, asm);
+    jit_prepare_call_with_gc(jit, asm);
 
-    let str = asm.stack_pop(1);
+    let str = asm.stack_opnd(0);
     let sym = asm.ccall(rb_str_intern as *const u8, vec![str]);
+    asm.stack_pop(1); // Keep it during ccall for GC
 
     // Push the return value
     let stack_ret = asm.stack_push(Type::Unknown);
@@ -7859,17 +10140,15 @@ fn gen_intern(
 fn gen_toregexp(
     jit: &mut JITState,
     asm: &mut Assembler,
-    _ocb: &mut OutlinedCb,
 ) -> Option<CodegenStatus> {
     let opt = jit.get_arg(0).as_i64();
     let cnt = jit.get_arg(1).as_usize();
 
     // Save the PC and SP because this allocates an object and could
     // raise an exception.
-    jit_prepare_routine_call(jit, asm);
+    jit_prepare_non_leaf_call(jit, asm);
 
-    let values_ptr = asm.lea(asm.ctx.sp_opnd(-((SIZEOF_VALUE as isize) * (cnt as isize))));
-    asm.stack_pop(cnt);
+    let values_ptr = asm.lea(asm.ctx.sp_opnd(-(cnt as i32)));
 
     let ary = asm.ccall(
         rb_ary_tmp_new_from_values as *const u8,
@@ -7879,6 +10158,7 @@ fn gen_toregexp(
             values_ptr,
         ]
     );
+    asm.stack_pop(cnt); // Let ccall spill them
 
     // Save the array so we can clear it later
     asm.cpush(ary);
@@ -7910,7 +10190,6 @@ fn gen_toregexp(
 fn gen_getspecial(
     jit: &mut JITState,
     asm: &mut Assembler,
-    _ocb: &mut OutlinedCb,
 ) -> Option<CodegenStatus> {
     // This takes two arguments, key and type
     // key is only used when type == 0
@@ -7925,28 +10204,28 @@ fn gen_getspecial(
         // Fetch a "special" backref based on a char encoded by shifting by 1
 
         // Can raise if matchdata uninitialized
-        jit_prepare_routine_call(jit, asm);
+        jit_prepare_non_leaf_call(jit, asm);
 
         // call rb_backref_get()
-        asm.comment("rb_backref_get");
+        asm_comment!(asm, "rb_backref_get");
         let backref = asm.ccall(rb_backref_get as *const u8, vec![]);
 
         let rt_u8: u8 = (rtype >> 1).try_into().unwrap();
         let val = match rt_u8.into() {
             '&' => {
-                asm.comment("rb_reg_last_match");
+                asm_comment!(asm, "rb_reg_last_match");
                 asm.ccall(rb_reg_last_match as *const u8, vec![backref])
             }
             '`' => {
-                asm.comment("rb_reg_match_pre");
+                asm_comment!(asm, "rb_reg_match_pre");
                 asm.ccall(rb_reg_match_pre as *const u8, vec![backref])
             }
             '\'' => {
-                asm.comment("rb_reg_match_post");
+                asm_comment!(asm, "rb_reg_match_post");
                 asm.ccall(rb_reg_match_post as *const u8, vec![backref])
             }
             '+' => {
-                asm.comment("rb_reg_match_last");
+                asm_comment!(asm, "rb_reg_match_last");
                 asm.ccall(rb_reg_match_last as *const u8, vec![backref])
             }
             _ => panic!("invalid back-ref"),
@@ -7960,14 +10239,14 @@ fn gen_getspecial(
         // Fetch the N-th match from the last backref based on type shifted by 1
 
         // Can raise if matchdata uninitialized
-        jit_prepare_routine_call(jit, asm);
+        jit_prepare_non_leaf_call(jit, asm);
 
         // call rb_backref_get()
-        asm.comment("rb_backref_get");
+        asm_comment!(asm, "rb_backref_get");
         let backref = asm.ccall(rb_backref_get as *const u8, vec![]);
 
         // rb_reg_nth_match((int)(type >> 1), backref);
-        asm.comment("rb_reg_nth_match");
+        asm_comment!(asm, "rb_reg_nth_match");
         let val = asm.ccall(
             rb_reg_nth_match as *const u8,
             vec![
@@ -7986,10 +10265,9 @@ fn gen_getspecial(
 fn gen_getclassvariable(
     jit: &mut JITState,
     asm: &mut Assembler,
-    _ocb: &mut OutlinedCb,
 ) -> Option<CodegenStatus> {
     // rb_vm_getclassvariable can raise exceptions.
-    jit_prepare_routine_call(jit, asm);
+    jit_prepare_non_leaf_call(jit, asm);
 
     let val_opnd = asm.ccall(
         rb_vm_getclassvariable as *const u8,
@@ -8010,12 +10288,11 @@ fn gen_getclassvariable(
 fn gen_setclassvariable(
     jit: &mut JITState,
     asm: &mut Assembler,
-    _ocb: &mut OutlinedCb,
 ) -> Option<CodegenStatus> {
     // rb_vm_setclassvariable can raise exceptions.
-    jit_prepare_routine_call(jit, asm);
+    jit_prepare_non_leaf_call(jit, asm);
 
-    let val = asm.stack_pop(1);
+    let val = asm.stack_opnd(0);
     asm.ccall(
         rb_vm_setclassvariable as *const u8,
         vec![
@@ -8026,6 +10303,7 @@ fn gen_setclassvariable(
             Opnd::UImm(jit.get_arg(1).as_u64()),
         ],
     );
+    asm.stack_pop(1); // Keep it during ccall for GC
 
     Some(KeepCompiling)
 }
@@ -8033,16 +10311,15 @@ fn gen_setclassvariable(
 fn gen_getconstant(
     jit: &mut JITState,
     asm: &mut Assembler,
-    _ocb: &mut OutlinedCb,
 ) -> Option<CodegenStatus> {
 
     let id = jit.get_arg(0).as_usize();
 
     // vm_get_ev_const can raise exceptions.
-    jit_prepare_routine_call(jit, asm);
+    jit_prepare_non_leaf_call(jit, asm);
 
-    let allow_nil_opnd = asm.stack_pop(1);
-    let klass_opnd = asm.stack_pop(1);
+    let allow_nil_opnd = asm.stack_opnd(0);
+    let klass_opnd = asm.stack_opnd(1);
 
     extern "C" {
         fn rb_vm_get_ev_const(ec: EcPtr, klass: VALUE, id: ID, allow_nil: VALUE) -> VALUE;
@@ -8057,6 +10334,7 @@ fn gen_getconstant(
             allow_nil_opnd
         ],
     );
+    asm.stack_pop(2); // Keep them during ccall for GC
 
     let top = asm.stack_push(Type::Unknown);
     asm.mov(top, val_opnd);
@@ -8067,30 +10345,47 @@ fn gen_getconstant(
 fn gen_opt_getconstant_path(
     jit: &mut JITState,
     asm: &mut Assembler,
-    ocb: &mut OutlinedCb,
 ) -> Option<CodegenStatus> {
     let const_cache_as_value = jit.get_arg(0);
     let ic: *const iseq_inline_constant_cache = const_cache_as_value.as_ptr();
     let idlist: *const ID = unsafe { (*ic).segments };
 
+    // Make sure there is an exit for this block as the interpreter might want
+    // to invalidate this block from yjit_constant_ic_update().
+    jit_ensure_block_entry_exit(jit, asm)?;
+
     // See vm_ic_hit_p(). The same conditions are checked in yjit_constant_ic_update().
+    // If a cache is not filled, fallback to the general C call.
     let ice = unsafe { (*ic).entry };
     if ice.is_null() {
-        // In this case, leave a block that unconditionally side exits
-        // for the interpreter to invalidate.
-        gen_counter_incr(asm, Counter::opt_getconstant_path_no_ic_entry);
-        return None;
+        // Prepare for const_missing
+        jit_prepare_non_leaf_call(jit, asm);
+
+        // If this does not trigger const_missing, vm_ic_update will invalidate this block.
+        extern "C" {
+            fn rb_vm_opt_getconstant_path(ec: EcPtr, cfp: CfpPtr, ic: *const u8) -> VALUE;
+        }
+        let val = asm.ccall(
+            rb_vm_opt_getconstant_path as *const u8,
+            vec![EC, CFP, Opnd::const_ptr(ic as *const u8)],
+        );
+
+        let stack_top = asm.stack_push(Type::Unknown);
+        asm.store(stack_top, val);
+
+        return jump_to_next_insn(jit, asm);
     }
 
-    // Make sure there is an exit for this block as the interpreter might want
-    // to invalidate this block from yjit_constant_ic_update().
-    jit_ensure_block_entry_exit(jit, asm, ocb);
+    let cref_sensitive = !unsafe { (*ice).ic_cref }.is_null();
+    let is_shareable = unsafe { rb_yjit_constcache_shareable(ice) };
+    let needs_checks = cref_sensitive || (!is_shareable && !assume_single_ractor_mode(jit, asm));
 
-    if !unsafe { (*ice).ic_cref }.is_null() {
+    if needs_checks {
         // Cache is keyed on a certain lexical scope. Use the interpreter's cache.
         let inline_cache = asm.load(Opnd::const_ptr(ic as *const u8));
 
         // Call function to verify the cache. It doesn't allocate or call methods.
+        // This includes a check for Ractor safety
         let ret_val = asm.ccall(
             rb_vm_ic_hit_p as *const u8,
             vec![inline_cache, Opnd::mem(64, CFP, RUBY_OFFSET_CFP_EP)]
@@ -8119,21 +10414,14 @@ fn gen_opt_getconstant_path(
         let stack_top = asm.stack_push(Type::Unknown);
         asm.store(stack_top, ic_entry_val);
     } else {
-        // Optimize for single ractor mode.
-        if !assume_single_ractor_mode(jit, asm, ocb) {
-            gen_counter_incr(asm, Counter::opt_getconstant_path_multi_ractor);
-            return None;
-        }
-
         // Invalidate output code on any constant writes associated with
         // constants referenced within the current block.
-        jit.assume_stable_constant_names(asm, ocb, idlist);
+        jit.assume_stable_constant_names(asm, idlist);
 
         jit_putobject(asm, unsafe { (*ice).value });
     }
 
-    jump_to_next_insn(jit, asm, ocb);
-    Some(EndBlock)
+    jump_to_next_insn(jit, asm)
 }
 
 // Push the explicit block parameter onto the temporary stack. Part of the
@@ -8142,11 +10430,9 @@ fn gen_opt_getconstant_path(
 fn gen_getblockparamproxy(
     jit: &mut JITState,
     asm: &mut Assembler,
-    ocb: &mut OutlinedCb,
 ) -> Option<CodegenStatus> {
-    if !jit.at_current_insn() {
-        defer_compilation(jit, asm, ocb);
-        return Some(EndBlock);
+    if !jit.at_compile_target() {
+        return jit.defer_compilation(asm);
     }
 
     // EP level
@@ -8162,7 +10448,7 @@ fn gen_getblockparamproxy(
             unsafe { rb_obj_is_proc(comptime_handler) }.test() // block is a Proc
         ) {
         // Missing the symbol case, where we basically need to call Symbol#to_proc at runtime
-        gen_counter_incr(asm, Counter::gbpp_unsupported_type);
+        gen_counter_incr(jit, asm, Counter::gbpp_unsupported_type);
         return None;
     }
 
@@ -8198,7 +10484,6 @@ fn gen_getblockparamproxy(
             JCC_JNZ,
             jit,
             asm,
-            ocb,
             SEND_MAX_DEPTH,
             Counter::gbpp_block_handler_not_none,
         );
@@ -8218,7 +10503,6 @@ fn gen_getblockparamproxy(
             JCC_JZ,
             jit,
             asm,
-            ocb,
             SEND_MAX_DEPTH,
             Counter::gbpp_block_handler_not_iseq,
         );
@@ -8243,7 +10527,7 @@ fn gen_getblockparamproxy(
             }
         }
 
-        // Simple predicate, no need to jit_prepare_routine_call()
+        // Simple predicate, no need to jit_prepare_non_leaf_call()
         let proc_or_false = asm.ccall(is_proc as _, vec![block_handler]);
 
         // Guard for proc
@@ -8252,7 +10536,6 @@ fn gen_getblockparamproxy(
             JCC_JE,
             jit,
             asm,
-            ocb,
             SEND_MAX_DEPTH,
             Counter::gbpp_block_handler_not_proc,
         );
@@ -8263,21 +10546,19 @@ fn gen_getblockparamproxy(
         unreachable!("absurd given initial filtering");
     }
 
-    jump_to_next_insn(jit, asm, ocb);
-
-    Some(EndBlock)
+    jump_to_next_insn(jit, asm)
 }
 
 fn gen_getblockparam(
     jit: &mut JITState,
     asm: &mut Assembler,
-    _ocb: &mut OutlinedCb,
 ) -> Option<CodegenStatus> {
     // EP level
     let level = jit.get_arg(1).as_u32();
 
     // Save the PC and SP because we might allocate
-    jit_prepare_routine_call(jit, asm);
+    jit_prepare_call_with_gc(jit, asm);
+    asm.spill_regs(); // For ccall. Unconditionally spill them for RegMappings consistency.
 
     // A mirror of the interpreter code. Checking for the case
     // where it's pushing rb_block_param_proxy.
@@ -8352,18 +10633,18 @@ fn gen_getblockparam(
 fn gen_invokebuiltin(
     jit: &mut JITState,
     asm: &mut Assembler,
-    _ocb: &mut OutlinedCb,
 ) -> Option<CodegenStatus> {
     let bf: *const rb_builtin_function = jit.get_arg(0).as_ptr();
     let bf_argc: usize = unsafe { (*bf).argc }.try_into().expect("non negative argc");
 
     // ec, self, and arguments
     if bf_argc + 2 > C_ARG_OPNDS.len() {
+        incr_counter!(invokebuiltin_too_many_args);
         return None;
     }
 
     // If the calls don't allocate, do they need up to date PC, SP?
-    jit_prepare_routine_call(jit, asm);
+    jit_prepare_non_leaf_call(jit, asm);
 
     // Call the builtin func (ec, recv, arg1, arg2, ...)
     let mut args = vec![EC, Opnd::mem(64, CFP, RUBY_OFFSET_CFP_SELF)];
@@ -8390,7 +10671,6 @@ fn gen_invokebuiltin(
 fn gen_opt_invokebuiltin_delegate(
     jit: &mut JITState,
     asm: &mut Assembler,
-    _ocb: &mut OutlinedCb,
 ) -> Option<CodegenStatus> {
     let bf: *const rb_builtin_function = jit.get_arg(0).as_ptr();
     let bf_argc = unsafe { (*bf).argc };
@@ -8398,11 +10678,12 @@ fn gen_opt_invokebuiltin_delegate(
 
     // ec, self, and arguments
     if bf_argc + 2 > (C_ARG_OPNDS.len() as i32) {
+        incr_counter!(invokebuiltin_too_many_args);
         return None;
     }
 
     // If the calls don't allocate, do they need up to date PC, SP?
-    jit_prepare_routine_call(jit, asm);
+    jit_prepare_non_leaf_call(jit, asm);
 
     // Call the builtin func (ec, recv, arg1, arg2, ...)
     let mut args = vec![EC, Opnd::mem(64, CFP, RUBY_OFFSET_CFP_SELF)];
@@ -8440,6 +10721,7 @@ fn get_gen_fn(opcode: VALUE) -> Option<InsnGenFn> {
         YARVINSN_dup => Some(gen_dup),
         YARVINSN_dupn => Some(gen_dupn),
         YARVINSN_swap => Some(gen_swap),
+        YARVINSN_opt_reverse => Some(gen_opt_reverse),
         YARVINSN_putnil => Some(gen_putnil),
         YARVINSN_putobject => Some(gen_putobject),
         YARVINSN_putobject_INT2FIX_0_ => Some(gen_putobject_int2fix),
@@ -8470,13 +10752,20 @@ fn get_gen_fn(opcode: VALUE) -> Option<InsnGenFn> {
         YARVINSN_opt_gt => Some(gen_opt_gt),
         YARVINSN_opt_ge => Some(gen_opt_ge),
         YARVINSN_opt_mod => Some(gen_opt_mod),
+        YARVINSN_opt_ary_freeze => Some(gen_opt_ary_freeze),
+        YARVINSN_opt_hash_freeze => Some(gen_opt_hash_freeze),
         YARVINSN_opt_str_freeze => Some(gen_opt_str_freeze),
         YARVINSN_opt_str_uminus => Some(gen_opt_str_uminus),
+        YARVINSN_opt_duparray_send => Some(gen_opt_duparray_send),
         YARVINSN_opt_newarray_send => Some(gen_opt_newarray_send),
         YARVINSN_splatarray => Some(gen_splatarray),
+        YARVINSN_splatkw => Some(gen_splatkw),
         YARVINSN_concatarray => Some(gen_concatarray),
+        YARVINSN_concattoarray => Some(gen_concattoarray),
+        YARVINSN_pushtoarray => Some(gen_pushtoarray),
         YARVINSN_newrange => Some(gen_newrange),
         YARVINSN_putstring => Some(gen_putstring),
+        YARVINSN_putchilledstring => Some(gen_putchilledstring),
         YARVINSN_expandarray => Some(gen_expandarray),
         YARVINSN_defined => Some(gen_defined),
         YARVINSN_definedivar => Some(gen_definedivar),
@@ -8491,6 +10780,7 @@ fn get_gen_fn(opcode: VALUE) -> Option<InsnGenFn> {
         YARVINSN_opt_aref => Some(gen_opt_aref),
         YARVINSN_opt_aset => Some(gen_opt_aset),
         YARVINSN_opt_aref_with => Some(gen_opt_aref_with),
+        YARVINSN_opt_aset_with => Some(gen_opt_aset_with),
         YARVINSN_opt_mult => Some(gen_opt_mult),
         YARVINSN_opt_div => Some(gen_opt_div),
         YARVINSN_opt_ltlt => Some(gen_opt_ltlt),
@@ -8512,13 +10802,16 @@ fn get_gen_fn(opcode: VALUE) -> Option<InsnGenFn> {
         YARVINSN_branchnil => Some(gen_branchnil),
         YARVINSN_throw => Some(gen_throw),
         YARVINSN_jump => Some(gen_jump),
+        YARVINSN_opt_new => Some(gen_opt_new),
 
         YARVINSN_getblockparamproxy => Some(gen_getblockparamproxy),
         YARVINSN_getblockparam => Some(gen_getblockparam),
         YARVINSN_opt_send_without_block => Some(gen_opt_send_without_block),
         YARVINSN_send => Some(gen_send),
+        YARVINSN_sendforward => Some(gen_sendforward),
         YARVINSN_invokeblock => Some(gen_invokeblock),
         YARVINSN_invokesuper => Some(gen_invokesuper),
+        YARVINSN_invokesuperforward => Some(gen_invokesuperforward),
         YARVINSN_leave => Some(gen_leave),
 
         YARVINSN_getglobal => Some(gen_getglobal),
@@ -8536,22 +10829,134 @@ fn get_gen_fn(opcode: VALUE) -> Option<InsnGenFn> {
     }
 }
 
-// Return true when the codegen function generates code.
-// known_recv_klass is non-NULL when the caller has used jit_guard_known_klass().
-// See yjit_reg_method().
+/// Return true when the codegen function generates code.
+/// known_recv_class has Some value when the caller has used jit_guard_known_klass().
+/// See [reg_method_codegen]
 type MethodGenFn = fn(
     jit: &mut JITState,
     asm: &mut Assembler,
-    ocb: &mut OutlinedCb,
     ci: *const rb_callinfo,
     cme: *const rb_callable_method_entry_t,
     block: Option<BlockHandler>,
     argc: i32,
-    known_recv_class: *const VALUE,
+    known_recv_class: Option<VALUE>,
 ) -> bool;
 
+/// Methods for generating code for hardcoded (usually C) methods
+static mut METHOD_CODEGEN_TABLE: Option<HashMap<usize, MethodGenFn>> = None;
+
+/// Register codegen functions for some Ruby core methods
+pub fn yjit_reg_method_codegen_fns() {
+    unsafe {
+        assert!(METHOD_CODEGEN_TABLE.is_none());
+        METHOD_CODEGEN_TABLE = Some(HashMap::default());
+
+        // Specialization for C methods. See the function's docs for details.
+        reg_method_codegen(rb_cBasicObject, "!", jit_rb_obj_not);
+
+        reg_method_codegen(rb_cNilClass, "nil?", jit_rb_true);
+        reg_method_codegen(rb_mKernel, "nil?", jit_rb_false);
+        reg_method_codegen(rb_mKernel, "is_a?", jit_rb_kernel_is_a);
+        reg_method_codegen(rb_mKernel, "kind_of?", jit_rb_kernel_is_a);
+        reg_method_codegen(rb_mKernel, "instance_of?", jit_rb_kernel_instance_of);
+
+        reg_method_codegen(rb_cBasicObject, "==", jit_rb_obj_equal);
+        reg_method_codegen(rb_cBasicObject, "equal?", jit_rb_obj_equal);
+        reg_method_codegen(rb_cBasicObject, "!=", jit_rb_obj_not_equal);
+        reg_method_codegen(rb_mKernel, "eql?", jit_rb_obj_equal);
+        reg_method_codegen(rb_cModule, "==", jit_rb_obj_equal);
+        reg_method_codegen(rb_cModule, "===", jit_rb_mod_eqq);
+        reg_method_codegen(rb_cModule, "name", jit_rb_mod_name);
+        reg_method_codegen(rb_cSymbol, "==", jit_rb_obj_equal);
+        reg_method_codegen(rb_cSymbol, "===", jit_rb_obj_equal);
+        reg_method_codegen(rb_cInteger, "==", jit_rb_int_equal);
+        reg_method_codegen(rb_cInteger, "===", jit_rb_int_equal);
+
+        reg_method_codegen(rb_cInteger, "succ", jit_rb_int_succ);
+        reg_method_codegen(rb_cInteger, "pred", jit_rb_int_pred);
+        reg_method_codegen(rb_cInteger, "/", jit_rb_int_div);
+        reg_method_codegen(rb_cInteger, "<<", jit_rb_int_lshift);
+        reg_method_codegen(rb_cInteger, ">>", jit_rb_int_rshift);
+        reg_method_codegen(rb_cInteger, "^", jit_rb_int_xor);
+        reg_method_codegen(rb_cInteger, "[]", jit_rb_int_aref);
+
+        reg_method_codegen(rb_cFloat, "+", jit_rb_float_plus);
+        reg_method_codegen(rb_cFloat, "-", jit_rb_float_minus);
+        reg_method_codegen(rb_cFloat, "*", jit_rb_float_mul);
+        reg_method_codegen(rb_cFloat, "/", jit_rb_float_div);
+
+        reg_method_codegen(rb_cString, "dup", jit_rb_str_dup);
+        reg_method_codegen(rb_cString, "empty?", jit_rb_str_empty_p);
+        reg_method_codegen(rb_cString, "to_s", jit_rb_str_to_s);
+        reg_method_codegen(rb_cString, "to_str", jit_rb_str_to_s);
+        reg_method_codegen(rb_cString, "length", jit_rb_str_length);
+        reg_method_codegen(rb_cString, "size", jit_rb_str_length);
+        reg_method_codegen(rb_cString, "bytesize", jit_rb_str_bytesize);
+        reg_method_codegen(rb_cString, "getbyte", jit_rb_str_getbyte);
+        reg_method_codegen(rb_cString, "setbyte", jit_rb_str_setbyte);
+        reg_method_codegen(rb_cString, "byteslice", jit_rb_str_byteslice);
+        reg_method_codegen(rb_cString, "[]", jit_rb_str_aref_m);
+        reg_method_codegen(rb_cString, "slice", jit_rb_str_aref_m);
+        reg_method_codegen(rb_cString, "<<", jit_rb_str_concat);
+        reg_method_codegen(rb_cString, "+@", jit_rb_str_uplus);
+
+        reg_method_codegen(rb_cNilClass, "===", jit_rb_case_equal);
+        reg_method_codegen(rb_cTrueClass, "===", jit_rb_case_equal);
+        reg_method_codegen(rb_cFalseClass, "===", jit_rb_case_equal);
+
+        reg_method_codegen(rb_cArray, "empty?", jit_rb_ary_empty_p);
+        reg_method_codegen(rb_cArray, "length", jit_rb_ary_length);
+        reg_method_codegen(rb_cArray, "size", jit_rb_ary_length);
+        reg_method_codegen(rb_cArray, "<<", jit_rb_ary_push);
+
+        reg_method_codegen(rb_cHash, "empty?", jit_rb_hash_empty_p);
+
+        reg_method_codegen(rb_mKernel, "respond_to?", jit_obj_respond_to);
+        reg_method_codegen(rb_mKernel, "block_given?", jit_rb_f_block_given_p);
+        reg_method_codegen(rb_mKernel, "dup", jit_rb_obj_dup);
+
+        reg_method_codegen(rb_cClass, "superclass", jit_rb_class_superclass);
+
+        reg_method_codegen(rb_singleton_class(rb_cThread), "current", jit_thread_s_current);
+    }
+}
+
+/// Register a specialized codegen function for a particular method. Note that
+/// if the function returns true, the code it generates runs without a
+/// control frame and without interrupt checks, completely substituting the
+/// original implementation of the method. To avoid creating observable
+/// behavior changes, prefer targeting simple code paths that do not allocate
+/// and do not make method calls.
+///
+/// See also: [lookup_cfunc_codegen].
+fn reg_method_codegen(klass: VALUE, method_name: &str, gen_fn: MethodGenFn) {
+    let mid = unsafe { rb_intern2(method_name.as_ptr().cast(), method_name.len().try_into().unwrap()) };
+    let me = unsafe { rb_method_entry_at(klass, mid) };
+
+    if me.is_null() {
+        panic!("undefined optimized method!: {method_name}");
+    }
+
+    // For now, only cfuncs are supported (me->cme cast fine since it's just me->def->type).
+    debug_assert_eq!(VM_METHOD_TYPE_CFUNC, unsafe { get_cme_def_type(me.cast()) });
+
+    let method_serial = unsafe {
+        let def = (*me).def;
+        get_def_method_serial(def)
+    };
+
+    unsafe { METHOD_CODEGEN_TABLE.as_mut().unwrap().insert(method_serial, gen_fn); }
+}
+
+pub fn yjit_shutdown_free_codegen_table() {
+    unsafe { METHOD_CODEGEN_TABLE = None; };
+}
+
 /// Global state needed for code generation
 pub struct CodegenGlobals {
+    /// Flat vector of bits to store compressed context data
+    context_data: BitVector,
+
     /// Inline code block (fast path)
     inline_cb: CodeBlock,
 
@@ -8580,11 +10985,12 @@ pub struct CodegenGlobals {
     /// For implementing global code invalidation
     global_inval_patches: Vec<CodepagePatch>,
 
-    // Methods for generating code for hardcoded (usually C) methods
-    method_codegen_table: HashMap<usize, MethodGenFn>,
-
     /// Page indexes for outlined code that are not associated to any ISEQ.
     ocb_pages: Vec<usize>,
+
+    /// Map of cfunc YARV PCs to CMEs and receiver indexes, used to lazily push
+    /// a frame when rb_yjit_lazy_push_frame() is called with a PC in this HashMap.
+    pc_to_cfunc: HashMap<*mut VALUE, (*const rb_callable_method_entry_t, u8)>,
 }
 
 /// For implementing global code invalidation. A position in the inline
@@ -8602,14 +11008,11 @@ impl CodegenGlobals {
     /// Initialize the codegen globals
     pub fn init() {
         // Executable memory and code page size in bytes
-        let mem_size = get_option!(exec_mem_size);
-
+        let exec_mem_size = get_option!(exec_mem_size).unwrap_or(get_option!(mem_size));
 
         #[cfg(not(test))]
         let (mut cb, mut ocb) = {
-            use std::cell::RefCell;
-
-            let virt_block: *mut u8 = unsafe { rb_yjit_reserve_addr_space(mem_size as u32) };
+            let virt_block: *mut u8 = unsafe { rb_yjit_reserve_addr_space(exec_mem_size as u32) };
 
             // Memory protection syscalls need page-aligned addresses, so check it here. Assuming
             // `virt_block` is page-aligned, `second_half` should be page-aligned as long as the
@@ -8631,13 +11034,16 @@ impl CodegenGlobals {
                 SystemAllocator {},
                 page_size,
                 NonNull::new(virt_block).unwrap(),
-                mem_size,
+                exec_mem_size,
+                get_option!(mem_size),
             );
-            let mem_block = Rc::new(RefCell::new(mem_block));
+            let mem_block = Rc::new(mem_block);
 
             let freed_pages = Rc::new(None);
-            let cb = CodeBlock::new(mem_block.clone(), false, freed_pages.clone());
-            let ocb = OutlinedCb::wrap(CodeBlock::new(mem_block, true, freed_pages));
+
+            let asm_comments = get_option_ref!(dump_disasm).is_some();
+            let cb = CodeBlock::new(mem_block.clone(), false, freed_pages.clone(), asm_comments);
+            let ocb = OutlinedCb::wrap(CodeBlock::new(mem_block, true, freed_pages, asm_comments));
 
             (cb, ocb)
         };
@@ -8645,32 +11051,33 @@ impl CodegenGlobals {
         // In test mode we're not linking with the C code
         // so we don't allocate executable memory
         #[cfg(test)]
-        let mut cb = CodeBlock::new_dummy(mem_size / 2);
+        let mut cb = CodeBlock::new_dummy(exec_mem_size / 2);
         #[cfg(test)]
-        let mut ocb = OutlinedCb::wrap(CodeBlock::new_dummy(mem_size / 2));
+        let mut ocb = OutlinedCb::wrap(CodeBlock::new_dummy(exec_mem_size / 2));
 
         let ocb_start_addr = ocb.unwrap().get_write_ptr();
-        let leave_exit_code = gen_leave_exit(&mut ocb);
-        let leave_exception_code = gen_leave_exception(&mut ocb);
+        let leave_exit_code = gen_leave_exit(&mut ocb).unwrap();
+        let leave_exception_code = gen_leave_exception(&mut ocb).unwrap();
 
-        let stub_exit_code = gen_stub_exit(&mut ocb);
+        let stub_exit_code = gen_stub_exit(&mut ocb).unwrap();
 
-        let branch_stub_hit_trampoline = gen_branch_stub_hit_trampoline(&mut ocb);
-        let entry_stub_hit_trampoline = gen_entry_stub_hit_trampoline(&mut ocb);
+        let branch_stub_hit_trampoline = gen_branch_stub_hit_trampoline(&mut ocb).unwrap();
+        let entry_stub_hit_trampoline = gen_entry_stub_hit_trampoline(&mut ocb).unwrap();
 
         // Generate full exit code for C func
-        let cfunc_exit_code = gen_full_cfunc_return(&mut ocb);
+        let cfunc_exit_code = gen_full_cfunc_return(&mut ocb).unwrap();
 
         let ocb_end_addr = ocb.unwrap().get_write_ptr();
-        let ocb_pages = ocb.unwrap().addrs_to_pages(ocb_start_addr, ocb_end_addr);
+        let ocb_pages = ocb.unwrap().addrs_to_pages(ocb_start_addr, ocb_end_addr).collect();
 
         // Mark all code memory as executable
         cb.mark_all_executable();
-        ocb.unwrap().mark_all_executable();
 
-        let mut codegen_globals = CodegenGlobals {
+        let codegen_globals = CodegenGlobals {
+            context_data: BitVector::new(),
             inline_cb: cb,
             outlined_cb: ocb,
+            ocb_pages,
             leave_exit_code,
             leave_exception_code,
             stub_exit_code,
@@ -8678,97 +11085,15 @@ impl CodegenGlobals {
             branch_stub_hit_trampoline,
             entry_stub_hit_trampoline,
             global_inval_patches: Vec::new(),
-            method_codegen_table: HashMap::new(),
-            ocb_pages,
+            pc_to_cfunc: HashMap::new(),
         };
 
-        // Register the method codegen functions
-        codegen_globals.reg_method_codegen_fns();
-
         // Initialize the codegen globals instance
         unsafe {
             CODEGEN_GLOBALS = Some(codegen_globals);
         }
     }
 
-    // Register a specialized codegen function for a particular method. Note that
-    // the if the function returns true, the code it generates runs without a
-    // control frame and without interrupt checks. To avoid creating observable
-    // behavior changes, the codegen function should only target simple code paths
-    // that do not allocate and do not make method calls.
-    fn yjit_reg_method(&mut self, klass: VALUE, mid_str: &str, gen_fn: MethodGenFn) {
-        let id_string = std::ffi::CString::new(mid_str).expect("couldn't convert to CString!");
-        let mid = unsafe { rb_intern(id_string.as_ptr()) };
-        let me = unsafe { rb_method_entry_at(klass, mid) };
-
-        if me.is_null() {
-            panic!("undefined optimized method!");
-        }
-
-        // For now, only cfuncs are supported
-        //RUBY_ASSERT(me && me->def);
-        //RUBY_ASSERT(me->def->type == VM_METHOD_TYPE_CFUNC);
-
-        let method_serial = unsafe {
-            let def = (*me).def;
-            get_def_method_serial(def)
-        };
-
-        self.method_codegen_table.insert(method_serial, gen_fn);
-    }
-
-    /// Register codegen functions for some Ruby core methods
-    fn reg_method_codegen_fns(&mut self) {
-        unsafe {
-            // Specialization for C methods. See yjit_reg_method() for details.
-            self.yjit_reg_method(rb_cBasicObject, "!", jit_rb_obj_not);
-
-            self.yjit_reg_method(rb_cNilClass, "nil?", jit_rb_true);
-            self.yjit_reg_method(rb_mKernel, "nil?", jit_rb_false);
-            self.yjit_reg_method(rb_mKernel, "is_a?", jit_rb_kernel_is_a);
-            self.yjit_reg_method(rb_mKernel, "kind_of?", jit_rb_kernel_is_a);
-            self.yjit_reg_method(rb_mKernel, "instance_of?", jit_rb_kernel_instance_of);
-
-            self.yjit_reg_method(rb_cBasicObject, "==", jit_rb_obj_equal);
-            self.yjit_reg_method(rb_cBasicObject, "equal?", jit_rb_obj_equal);
-            self.yjit_reg_method(rb_cBasicObject, "!=", jit_rb_obj_not_equal);
-            self.yjit_reg_method(rb_mKernel, "eql?", jit_rb_obj_equal);
-            self.yjit_reg_method(rb_cModule, "==", jit_rb_obj_equal);
-            self.yjit_reg_method(rb_cModule, "===", jit_rb_mod_eqq);
-            self.yjit_reg_method(rb_cSymbol, "==", jit_rb_obj_equal);
-            self.yjit_reg_method(rb_cSymbol, "===", jit_rb_obj_equal);
-            self.yjit_reg_method(rb_cInteger, "==", jit_rb_int_equal);
-            self.yjit_reg_method(rb_cInteger, "===", jit_rb_int_equal);
-
-            self.yjit_reg_method(rb_cInteger, "*", jit_rb_int_mul);
-            self.yjit_reg_method(rb_cInteger, "/", jit_rb_int_div);
-            self.yjit_reg_method(rb_cInteger, "<<", jit_rb_int_lshift);
-            self.yjit_reg_method(rb_cInteger, "[]", jit_rb_int_aref);
-
-            // rb_str_to_s() methods in string.c
-            self.yjit_reg_method(rb_cString, "empty?", jit_rb_str_empty_p);
-            self.yjit_reg_method(rb_cString, "to_s", jit_rb_str_to_s);
-            self.yjit_reg_method(rb_cString, "to_str", jit_rb_str_to_s);
-            self.yjit_reg_method(rb_cString, "bytesize", jit_rb_str_bytesize);
-            self.yjit_reg_method(rb_cString, "<<", jit_rb_str_concat);
-            self.yjit_reg_method(rb_cString, "+@", jit_rb_str_uplus);
-
-            // rb_ary_empty_p() method in array.c
-            self.yjit_reg_method(rb_cArray, "empty?", jit_rb_ary_empty_p);
-            self.yjit_reg_method(rb_cArray, "<<", jit_rb_ary_push);
-
-            self.yjit_reg_method(rb_mKernel, "respond_to?", jit_obj_respond_to);
-            self.yjit_reg_method(rb_mKernel, "block_given?", jit_rb_f_block_given_p);
-
-            // Thread.current
-            self.yjit_reg_method(
-                rb_singleton_class(rb_cThread),
-                "current",
-                jit_thread_s_current,
-            );
-        }
-    }
-
     /// Get a mutable reference to the codegen globals instance
     pub fn get_instance() -> &'static mut CodegenGlobals {
         unsafe { CODEGEN_GLOBALS.as_mut().unwrap() }
@@ -8778,6 +11103,11 @@ impl CodegenGlobals {
         unsafe { CODEGEN_GLOBALS.as_mut().is_some() }
     }
 
+    /// Get a mutable reference to the context data
+    pub fn get_context_data() -> &'static mut BitVector {
+        &mut CodegenGlobals::get_instance().context_data
+    }
+
     /// Get a mutable reference to the inline code block
     pub fn get_inline_cb() -> &'static mut CodeBlock {
         &mut CodegenGlobals::get_instance().inline_cb
@@ -8800,10 +11130,18 @@ impl CodegenGlobals {
         CodegenGlobals::get_instance().stub_exit_code
     }
 
-    pub fn push_global_inval_patch(i_pos: CodePtr, o_pos: CodePtr) {
+    pub fn push_global_inval_patch(inline_pos: CodePtr, outlined_pos: CodePtr, cb: &CodeBlock) {
+        if let Some(last_patch) = CodegenGlobals::get_instance().global_inval_patches.last() {
+            let patch_offset = inline_pos.as_offset() - last_patch.inline_patch_pos.as_offset();
+            assert!(
+                patch_offset < 0 || cb.jmp_ptr_bytes() as i64 <= patch_offset,
+                "patches should not overlap (patch_offset: {patch_offset})",
+            );
+        }
+
         let patch = CodepagePatch {
-            inline_patch_pos: i_pos,
-            outlined_target_pos: o_pos,
+            inline_patch_pos: inline_pos,
+            outlined_target_pos: outlined_pos,
         };
         CodegenGlobals::get_instance()
             .global_inval_patches
@@ -8828,42 +11166,41 @@ impl CodegenGlobals {
         CodegenGlobals::get_instance().entry_stub_hit_trampoline
     }
 
-    pub fn look_up_codegen_method(method_serial: usize) -> Option<MethodGenFn> {
-        let table = &CodegenGlobals::get_instance().method_codegen_table;
-
-        let option_ref = table.get(&method_serial);
-        match option_ref {
-            None => None,
-            Some(&mgf) => Some(mgf), // Deref
-        }
-    }
-
     pub fn get_ocb_pages() -> &'static Vec<usize> {
         &CodegenGlobals::get_instance().ocb_pages
     }
+
+    pub fn get_pc_to_cfunc() -> &'static mut HashMap<*mut VALUE, (*const rb_callable_method_entry_t, u8)> {
+        &mut CodegenGlobals::get_instance().pc_to_cfunc
+    }
 }
 
 #[cfg(test)]
 mod tests {
     use super::*;
 
-    fn setup_codegen() -> (JITState, Context, Assembler, CodeBlock, OutlinedCb) {
+    fn setup_codegen() -> (Context, Assembler, CodeBlock, OutlinedCb) {
         let cb = CodeBlock::new_dummy(256 * 1024);
 
         return (
-            JITState::new(
-                BlockId { iseq: std::ptr::null(), idx: 0 },
-                Context::default(),
-                cb.get_write_ptr(),
-                ptr::null(), // No execution context in tests. No peeking!
-            ),
             Context::default(),
-            Assembler::new(),
+            Assembler::new(0),
             cb,
             OutlinedCb::wrap(CodeBlock::new_dummy(256 * 1024)),
         );
     }
 
+    fn dummy_jit_state<'a>(cb: &mut CodeBlock, ocb: &'a mut OutlinedCb) -> JITState<'a> {
+        JITState::new(
+            BlockId { iseq: std::ptr::null(), idx: 0 },
+            Context::default(),
+            cb.get_write_ptr(),
+            ptr::null(), // No execution context in tests. No peeking!
+            ocb,
+            true,
+        )
+    }
+
     #[test]
     fn test_gen_leave_exit() {
         let mut ocb = OutlinedCb::wrap(CodeBlock::new_dummy(256 * 1024));
@@ -8873,15 +11210,15 @@ mod tests {
 
     #[test]
     fn test_gen_exit() {
-        let (_, _ctx, mut asm, mut cb, _) = setup_codegen();
+        let (_ctx, mut asm, mut cb, _) = setup_codegen();
         gen_exit(0 as *mut VALUE, &mut asm);
-        asm.compile(&mut cb, None);
+        asm.compile(&mut cb, None).unwrap();
         assert!(cb.get_write_pos() > 0);
     }
 
     #[test]
     fn test_get_side_exit() {
-        let (_jit, ctx, mut asm, _, mut ocb) = setup_codegen();
+        let (ctx, mut asm, _, mut ocb) = setup_codegen();
         let side_exit_context = SideExitContext::new(0 as _, ctx);
         asm.get_side_exit(&side_exit_context, None, &mut ocb);
         assert!(ocb.unwrap().get_write_pos() > 0);
@@ -8889,16 +11226,17 @@ mod tests {
 
     #[test]
     fn test_gen_check_ints() {
-        let (_jit, _ctx, mut asm, _cb, _ocb) = setup_codegen();
+        let (_ctx, mut asm, _cb, _ocb) = setup_codegen();
         asm.set_side_exit_context(0 as _, 0);
         gen_check_ints(&mut asm, Counter::guard_send_interrupted);
     }
 
     #[test]
     fn test_gen_nop() {
-        let (mut jit, context, mut asm, mut cb, mut ocb) = setup_codegen();
-        let status = gen_nop(&mut jit, &mut asm, &mut ocb);
-        asm.compile(&mut cb, None);
+        let (context, mut asm, mut cb, mut ocb) = setup_codegen();
+        let mut jit = dummy_jit_state(&mut cb, &mut ocb);
+        let status = gen_nop(&mut jit, &mut asm);
+        asm.compile(&mut cb, None).unwrap();
 
         assert_eq!(status, Some(KeepCompiling));
         assert_eq!(context.diff(&Context::default()), TypeDiff::Compatible(0));
@@ -8907,22 +11245,24 @@ mod tests {
 
     #[test]
     fn test_gen_pop() {
-        let (mut jit, _, mut asm, _cb, mut ocb) = setup_codegen();
+        let (_, mut asm, mut cb, mut ocb) = setup_codegen();
+        let mut jit = dummy_jit_state(&mut cb, &mut ocb);
         let context = Context::default();
         asm.stack_push(Type::Fixnum);
-        let status = gen_pop(&mut jit, &mut asm, &mut ocb);
+        let status = gen_pop(&mut jit, &mut asm);
 
         assert_eq!(status, Some(KeepCompiling));
         let mut default = Context::default();
-        default.set_reg_temps(context.get_reg_temps());
+        default.set_reg_mapping(context.get_reg_mapping());
         assert_eq!(context.diff(&default), TypeDiff::Compatible(0));
     }
 
     #[test]
     fn test_gen_dup() {
-        let (mut jit, _context, mut asm, mut cb, mut ocb) = setup_codegen();
+        let (_context, mut asm, mut cb, mut ocb) = setup_codegen();
+        let mut jit = dummy_jit_state(&mut cb, &mut ocb);
         asm.stack_push(Type::Fixnum);
-        let status = gen_dup(&mut jit, &mut asm, &mut ocb);
+        let status = gen_dup(&mut jit, &mut asm);
 
         assert_eq!(status, Some(KeepCompiling));
 
@@ -8930,13 +11270,14 @@ mod tests {
         assert_eq!(Type::Fixnum, asm.ctx.get_opnd_type(StackOpnd(0)));
         assert_eq!(Type::Fixnum, asm.ctx.get_opnd_type(StackOpnd(1)));
 
-        asm.compile(&mut cb, None);
+        asm.compile(&mut cb, None).unwrap();
         assert!(cb.get_write_pos() > 0); // Write some movs
     }
 
     #[test]
     fn test_gen_dupn() {
-        let (mut jit, _context, mut asm, mut cb, mut ocb) = setup_codegen();
+        let (_context, mut asm, mut cb, mut ocb) = setup_codegen();
+        let mut jit = dummy_jit_state(&mut cb, &mut ocb);
         asm.stack_push(Type::Fixnum);
         asm.stack_push(Type::Flonum);
 
@@ -8944,7 +11285,7 @@ mod tests {
         let pc: *mut VALUE = &mut value_array as *mut u64 as *mut VALUE;
         jit.pc = pc;
 
-        let status = gen_dupn(&mut jit, &mut asm, &mut ocb);
+        let status = gen_dupn(&mut jit, &mut asm);
 
         assert_eq!(status, Some(KeepCompiling));
 
@@ -8954,104 +11295,92 @@ mod tests {
         assert_eq!(Type::Flonum, asm.ctx.get_opnd_type(StackOpnd(0)));
 
         // TODO: this is writing zero bytes on x86. Why?
-        asm.compile(&mut cb, None);
+        asm.compile(&mut cb, None).unwrap();
         assert!(cb.get_write_pos() > 0); // Write some movs
     }
 
     #[test]
-    fn test_gen_swap() {
-        let (mut jit, _context, mut asm, _cb, mut ocb) = setup_codegen();
+    fn test_gen_opt_reverse() {
+        let (_context, mut asm, mut cb, mut ocb) = setup_codegen();
+        let mut jit = dummy_jit_state(&mut cb, &mut ocb);
+
+        // Odd number of elements
         asm.stack_push(Type::Fixnum);
         asm.stack_push(Type::Flonum);
+        asm.stack_push(Type::CString);
 
-        let status = gen_swap(&mut jit, &mut asm, &mut ocb);
+        let mut value_array: [u64; 2] = [0, 3];
+        let pc: *mut VALUE = &mut value_array as *mut u64 as *mut VALUE;
+        jit.pc = pc;
 
-        let tmp_type_top = asm.ctx.get_opnd_type(StackOpnd(0));
-        let tmp_type_next = asm.ctx.get_opnd_type(StackOpnd(1));
+        let mut status = gen_opt_reverse(&mut jit, &mut asm);
 
         assert_eq!(status, Some(KeepCompiling));
-        assert_eq!(tmp_type_top, Type::Fixnum);
-        assert_eq!(tmp_type_next, Type::Flonum);
-    }
 
-    #[test]
-    fn test_putnil() {
-        let (mut jit, _context, mut asm, mut cb, mut ocb) = setup_codegen();
-        let status = gen_putnil(&mut jit, &mut asm, &mut ocb);
+        assert_eq!(Type::CString, asm.ctx.get_opnd_type(StackOpnd(2)));
+        assert_eq!(Type::Flonum, asm.ctx.get_opnd_type(StackOpnd(1)));
+        assert_eq!(Type::Fixnum, asm.ctx.get_opnd_type(StackOpnd(0)));
 
-        let tmp_type_top = asm.ctx.get_opnd_type(StackOpnd(0));
+        // Try again with an even number of elements.
+        asm.stack_push(Type::Nil);
+        value_array[1] = 4;
+        status = gen_opt_reverse(&mut jit, &mut asm);
 
         assert_eq!(status, Some(KeepCompiling));
-        assert_eq!(tmp_type_top, Type::Nil);
-        asm.compile(&mut cb, None);
-        assert!(cb.get_write_pos() > 0);
-    }
-
-    #[test]
-    fn test_putobject_qtrue() {
-        // Test gen_putobject with Qtrue
-        let (mut jit, _context, mut asm, mut cb, mut ocb) = setup_codegen();
 
-        let mut value_array: [u64; 2] = [0, Qtrue.into()];
-        let pc: *mut VALUE = &mut value_array as *mut u64 as *mut VALUE;
-        jit.pc = pc;
-
-        let status = gen_putobject(&mut jit, &mut asm, &mut ocb);
-
-        let tmp_type_top = asm.ctx.get_opnd_type(StackOpnd(0));
-
-        assert_eq!(status, Some(KeepCompiling));
-        assert_eq!(tmp_type_top, Type::True);
-        asm.compile(&mut cb, None);
-        assert!(cb.get_write_pos() > 0);
+        assert_eq!(Type::Nil, asm.ctx.get_opnd_type(StackOpnd(3)));
+        assert_eq!(Type::Fixnum, asm.ctx.get_opnd_type(StackOpnd(2)));
+        assert_eq!(Type::Flonum, asm.ctx.get_opnd_type(StackOpnd(1)));
+        assert_eq!(Type::CString, asm.ctx.get_opnd_type(StackOpnd(0)));
     }
 
     #[test]
-    fn test_putobject_fixnum() {
-        // Test gen_putobject with a Fixnum to test another conditional branch
-        let (mut jit, _context, mut asm, mut cb, mut ocb) = setup_codegen();
-
-        // The Fixnum 7 is encoded as 7 * 2 + 1, or 15
-        let mut value_array: [u64; 2] = [0, 15];
-        let pc: *mut VALUE = &mut value_array as *mut u64 as *mut VALUE;
-        jit.pc = pc;
+    fn test_gen_swap() {
+        let (_context, mut asm, mut cb, mut ocb) = setup_codegen();
+        let mut jit = dummy_jit_state(&mut cb, &mut ocb);
+        asm.stack_push(Type::Fixnum);
+        asm.stack_push(Type::Flonum);
 
-        let status = gen_putobject(&mut jit, &mut asm, &mut ocb);
+        let status = gen_swap(&mut jit, &mut asm);
 
         let tmp_type_top = asm.ctx.get_opnd_type(StackOpnd(0));
+        let tmp_type_next = asm.ctx.get_opnd_type(StackOpnd(1));
 
         assert_eq!(status, Some(KeepCompiling));
         assert_eq!(tmp_type_top, Type::Fixnum);
-        asm.compile(&mut cb, None);
-        assert!(cb.get_write_pos() > 0);
+        assert_eq!(tmp_type_next, Type::Flonum);
     }
 
     #[test]
-    fn test_int2fix() {
-        let (mut jit, _context, mut asm, _cb, mut ocb) = setup_codegen();
-        jit.opcode = YARVINSN_putobject_INT2FIX_0_.as_usize();
-        let status = gen_putobject_int2fix(&mut jit, &mut asm, &mut ocb);
+    fn test_putnil() {
+        let (_context, mut asm, mut cb, mut ocb) = setup_codegen();
+        let mut jit = dummy_jit_state(&mut cb, &mut ocb);
+        let status = gen_putnil(&mut jit, &mut asm);
 
         let tmp_type_top = asm.ctx.get_opnd_type(StackOpnd(0));
 
-        // Right now we're not testing the generated machine code to make sure a literal 1 or 0 was pushed. I've checked locally.
         assert_eq!(status, Some(KeepCompiling));
-        assert_eq!(tmp_type_top, Type::Fixnum);
+        assert_eq!(tmp_type_top, Type::Nil);
+        asm.compile(&mut cb, None).unwrap();
+        assert!(cb.get_write_pos() > 0);
     }
 
+
     #[test]
     fn test_putself() {
-        let (mut jit, _context, mut asm, mut cb, mut ocb) = setup_codegen();
-        let status = gen_putself(&mut jit, &mut asm, &mut ocb);
+        let (_context, mut asm, mut cb, mut ocb) = setup_codegen();
+        let mut jit = dummy_jit_state(&mut cb, &mut ocb);
+        let status = gen_putself(&mut jit, &mut asm);
 
         assert_eq!(status, Some(KeepCompiling));
-        asm.compile(&mut cb, None);
+        asm.compile(&mut cb, None).unwrap();
         assert!(cb.get_write_pos() > 0);
     }
 
     #[test]
     fn test_gen_setn() {
-        let (mut jit, _context, mut asm, mut cb, mut ocb) = setup_codegen();
+        let (_context, mut asm, mut cb, mut ocb) = setup_codegen();
+        let mut jit = dummy_jit_state(&mut cb, &mut ocb);
         asm.stack_push(Type::Fixnum);
         asm.stack_push(Type::Flonum);
         asm.stack_push(Type::CString);
@@ -9060,7 +11389,7 @@ mod tests {
         let pc: *mut VALUE = &mut value_array as *mut u64 as *mut VALUE;
         jit.pc = pc;
 
-        let status = gen_setn(&mut jit, &mut asm, &mut ocb);
+        let status = gen_setn(&mut jit, &mut asm);
 
         assert_eq!(status, Some(KeepCompiling));
 
@@ -9068,13 +11397,14 @@ mod tests {
         assert_eq!(Type::Flonum, asm.ctx.get_opnd_type(StackOpnd(1)));
         assert_eq!(Type::CString, asm.ctx.get_opnd_type(StackOpnd(0)));
 
-        asm.compile(&mut cb, None);
+        asm.compile(&mut cb, None).unwrap();
         assert!(cb.get_write_pos() > 0);
     }
 
     #[test]
     fn test_gen_topn() {
-        let (mut jit, _context, mut asm, mut cb, mut ocb) = setup_codegen();
+        let (_context, mut asm, mut cb, mut ocb) = setup_codegen();
+        let mut jit = dummy_jit_state(&mut cb, &mut ocb);
         asm.stack_push(Type::Flonum);
         asm.stack_push(Type::CString);
 
@@ -9082,7 +11412,7 @@ mod tests {
         let pc: *mut VALUE = &mut value_array as *mut u64 as *mut VALUE;
         jit.pc = pc;
 
-        let status = gen_topn(&mut jit, &mut asm, &mut ocb);
+        let status = gen_topn(&mut jit, &mut asm);
 
         assert_eq!(status, Some(KeepCompiling));
 
@@ -9090,13 +11420,14 @@ mod tests {
         assert_eq!(Type::CString, asm.ctx.get_opnd_type(StackOpnd(1)));
         assert_eq!(Type::Flonum, asm.ctx.get_opnd_type(StackOpnd(0)));
 
-        asm.compile(&mut cb, None);
+        asm.compile(&mut cb, None).unwrap();
         assert!(cb.get_write_pos() > 0); // Write some movs
     }
 
     #[test]
     fn test_gen_adjuststack() {
-        let (mut jit, _context, mut asm, mut cb, mut ocb) = setup_codegen();
+        let (_context, mut asm, mut cb, mut ocb) = setup_codegen();
+        let mut jit = dummy_jit_state(&mut cb, &mut ocb);
         asm.stack_push(Type::Flonum);
         asm.stack_push(Type::CString);
         asm.stack_push(Type::Fixnum);
@@ -9105,22 +11436,23 @@ mod tests {
         let pc: *mut VALUE = &mut value_array as *mut u64 as *mut VALUE;
         jit.pc = pc;
 
-        let status = gen_adjuststack(&mut jit, &mut asm, &mut ocb);
+        let status = gen_adjuststack(&mut jit, &mut asm);
 
         assert_eq!(status, Some(KeepCompiling));
 
         assert_eq!(Type::Flonum, asm.ctx.get_opnd_type(StackOpnd(0)));
 
-        asm.compile(&mut cb, None);
+        asm.compile(&mut cb, None).unwrap();
         assert!(cb.get_write_pos() == 0); // No instructions written
     }
 
     #[test]
     fn test_gen_leave() {
-        let (mut jit, _context, mut asm, _cb, mut ocb) = setup_codegen();
+        let (_context, mut asm, mut cb, mut ocb) = setup_codegen();
+        let mut jit = dummy_jit_state(&mut cb, &mut ocb);
         // Push return value
         asm.stack_push(Type::Fixnum);
         asm.set_side_exit_context(0 as _, 0);
-        gen_leave(&mut jit, &mut asm, &mut ocb);
+        gen_leave(&mut jit, &mut asm);
     }
 }
diff --git a/yjit/src/core.rs b/yjit/src/core.rs
index 805b7dd68599ce..57756e86ced5f3 100644
--- a/yjit/src/core.rs
+++ b/yjit/src/core.rs
@@ -15,24 +15,26 @@ use crate::utils::*;
 use crate::disasm::*;
 use core::ffi::c_void;
 use std::cell::*;
-use std::collections::HashSet;
 use std::fmt;
 use std::mem;
 use std::mem::transmute;
 use std::ops::Range;
 use std::rc::Rc;
+use std::collections::HashSet;
+use std::collections::hash_map::DefaultHasher;
+use std::hash::{Hash, Hasher};
 use mem::MaybeUninit;
 use std::ptr;
 use ptr::NonNull;
 use YARVOpnd::*;
-use TempMappingKind::*;
+use TempMapping::*;
 use crate::invariants::*;
 
-// Maximum number of temp value types we keep track of
-pub const MAX_TEMP_TYPES: usize = 8;
+// Maximum number of temp value types or registers we keep track of
+pub const MAX_CTX_TEMPS: usize = 8;
 
-// Maximum number of local variable types we keep track of
-const MAX_LOCAL_TYPES: usize = 8;
+// Maximum number of local variable types or registers we keep track of
+const MAX_CTX_LOCALS: usize = 8;
 
 /// An index into `ISEQ_BODY(iseq)->iseq_encoded`. Points
 /// to a YARV instruction or an instruction operand.
@@ -42,7 +44,7 @@ pub type IseqIdx = u16;
 #[derive(Copy, Clone, Hash, PartialEq, Eq, Debug)]
 #[repr(u8)]
 pub enum Type {
-    Unknown,
+    Unknown = 0,
     UnknownImm,
     UnknownHeap,
     Nil,
@@ -50,20 +52,20 @@ pub enum Type {
     False,
     Fixnum,
     Flonum,
-    Hash,
     ImmSymbol,
 
-    #[allow(unused)]
-    HeapSymbol,
-
     TString, // An object with the T_STRING flag set, possibly an rb_cString
-    CString, // An un-subclassed string of type rb_cString (can have instance vars in some cases)
+    CString, // An object that at one point had its class field equal rb_cString (creating a singleton class changes it)
     TArray, // An object with the T_ARRAY flag set, possibly an rb_cArray
-
-    TProc, // A proc object. Could be an instance of a subclass of ::rb_cProc
+    CArray, // An object that at one point had its class field equal rb_cArray (creating a singleton class changes it)
+    THash, // An object with the T_HASH flag set, possibly an rb_cHash
+    CHash, // An object that at one point had its class field equal rb_cHash (creating a singleton class changes it)
 
     BlockParamProxy, // A special sentinel value indicating the block parameter should be read from
                      // the current surrounding cfp
+
+    // The context currently relies on types taking at most 4 bits (max value 15)
+    // to encode, so if we add any more, we will need to refactor the context.
 }
 
 // Default initialization
@@ -96,8 +98,11 @@ impl Type {
             // Core.rs can't reference rb_cString because it's linked by Rust-only tests.
             // But CString vs TString is only an optimisation and shouldn't affect correctness.
             #[cfg(not(test))]
-            if val.class_of() == unsafe { rb_cString } && val.is_frozen() {
-                return Type::CString;
+            match val.class_of() {
+                class if class == unsafe { rb_cArray }  => return Type::CArray,
+                class if class == unsafe { rb_cHash }   => return Type::CHash,
+                class if class == unsafe { rb_cString } => return Type::CString,
+                _ => {}
             }
             // We likewise can't reference rb_block_param_proxy, but it's again an optimisation;
             // we can just treat it as a normal Object.
@@ -107,10 +112,8 @@ impl Type {
             }
             match val.builtin_type() {
                 RUBY_T_ARRAY => Type::TArray,
-                RUBY_T_HASH => Type::Hash,
+                RUBY_T_HASH => Type::THash,
                 RUBY_T_STRING => Type::TString,
-                #[cfg(not(test))]
-                RUBY_T_DATA if unsafe { rb_obj_is_proc(val).test() } => Type::TProc,
                 _ => Type::UnknownHeap,
             }
         }
@@ -150,28 +153,29 @@ impl Type {
         match self {
             Type::UnknownHeap => true,
             Type::TArray => true,
-            Type::Hash => true,
-            Type::HeapSymbol => true,
+            Type::CArray => true,
+            Type::THash => true,
+            Type::CHash => true,
             Type::TString => true,
             Type::CString => true,
             Type::BlockParamProxy => true,
-            Type::TProc => true,
             _ => false,
         }
     }
 
     /// Check if it's a T_ARRAY object (both TArray and CArray are T_ARRAY)
     pub fn is_array(&self) -> bool {
-        matches!(self, Type::TArray)
+        matches!(self, Type::TArray | Type::CArray)
+    }
+
+    /// Check if it's a T_HASH object (both THash and CHash are T_HASH)
+    pub fn is_hash(&self) -> bool {
+        matches!(self, Type::THash | Type::CHash)
     }
 
     /// Check if it's a T_STRING object (both TString and CString are T_STRING)
     pub fn is_string(&self) -> bool {
-        match self {
-            Type::TString => true,
-            Type::CString => true,
-            _ => false,
-        }
+        matches!(self, Type::TString | Type::CString)
     }
 
     /// Returns an Option with the T_ value type if it is known, otherwise None
@@ -182,11 +186,10 @@ impl Type {
             Type::False => Some(RUBY_T_FALSE),
             Type::Fixnum => Some(RUBY_T_FIXNUM),
             Type::Flonum => Some(RUBY_T_FLOAT),
-            Type::TArray => Some(RUBY_T_ARRAY),
-            Type::Hash => Some(RUBY_T_HASH),
-            Type::ImmSymbol | Type::HeapSymbol => Some(RUBY_T_SYMBOL),
+            Type::TArray | Type::CArray => Some(RUBY_T_ARRAY),
+            Type::THash | Type::CHash => Some(RUBY_T_HASH),
+            Type::ImmSymbol => Some(RUBY_T_SYMBOL),
             Type::TString | Type::CString => Some(RUBY_T_STRING),
-            Type::TProc => Some(RUBY_T_DATA),
             Type::Unknown | Type::UnknownImm | Type::UnknownHeap => None,
             Type::BlockParamProxy => None,
         }
@@ -201,7 +204,9 @@ impl Type {
                 Type::False => Some(rb_cFalseClass),
                 Type::Fixnum => Some(rb_cInteger),
                 Type::Flonum => Some(rb_cFloat),
-                Type::ImmSymbol | Type::HeapSymbol => Some(rb_cSymbol),
+                Type::ImmSymbol => Some(rb_cSymbol),
+                Type::CArray => Some(rb_cArray),
+                Type::CHash => Some(rb_cHash),
                 Type::CString => Some(rb_cString),
                 _ => None,
             }
@@ -252,6 +257,16 @@ impl Type {
             return TypeDiff::Compatible(1);
         }
 
+        // A CArray is also a TArray.
+        if self == Type::CArray && dst == Type::TArray {
+            return TypeDiff::Compatible(1);
+        }
+
+        // A CHash is also a THash.
+        if self == Type::CHash && dst == Type::THash {
+            return TypeDiff::Compatible(1);
+        }
+
         // A CString is also a TString.
         if self == Type::CString && dst == Type::TString {
             return TypeDiff::Compatible(1);
@@ -289,91 +304,25 @@ pub enum TypeDiff {
 }
 
 #[derive(Copy, Clone, Eq, Hash, PartialEq, Debug)]
-#[repr(u8)]
-pub enum TempMappingKind
-{
-    MapToStack = 0,
-    MapToSelf = 1,
-    MapToLocal = 2,
+pub enum TempMapping {
+    MapToStack(Type),
+    MapToSelf,
+    MapToLocal(u8),
 }
 
-// Potential mapping of a value on the temporary stack to
-// self, a local variable or constant so that we can track its type
-//
-// The highest two bits represent TempMappingKind, and the rest of
-// the bits are used differently across different kinds.
-// * MapToStack: The lowest 5 bits are used for mapping Type.
-// * MapToSelf: The remaining bits are not used; the type is stored in self_type.
-// * MapToLocal: The lowest 3 bits store the index of a local variable.
-#[derive(Copy, Clone, Eq, Hash, PartialEq, Debug)]
-pub struct TempMapping(u8);
-
-impl TempMapping {
-    pub fn map_to_stack(t: Type) -> TempMapping
-    {
-        let kind_bits = TempMappingKind::MapToStack as u8;
-        let type_bits = t as u8;
-        assert!(type_bits <= 0b11111);
-        let bits = (kind_bits << 6) | (type_bits & 0b11111);
-        TempMapping(bits)
-    }
-
-    pub fn map_to_self() -> TempMapping
-    {
-        let kind_bits = TempMappingKind::MapToSelf as u8;
-        let bits = kind_bits << 6;
-        TempMapping(bits)
-    }
-
-    pub fn map_to_local(local_idx: u8) -> TempMapping
-    {
-        let kind_bits = TempMappingKind::MapToLocal as u8;
-        assert!(local_idx <= 0b111);
-        let bits = (kind_bits << 6) | (local_idx & 0b111);
-        TempMapping(bits)
-    }
-
-    pub fn without_type(&self) -> TempMapping
-    {
-        if self.get_kind() != TempMappingKind::MapToStack {
-            return *self;
-        }
-
-        TempMapping::map_to_stack(Type::Unknown)
-    }
-
-    pub fn get_kind(&self) -> TempMappingKind
-    {
-        // Take the two highest bits
-        let TempMapping(bits) = self;
-        let kind_bits = bits >> 6;
-        assert!(kind_bits <= 2);
-        unsafe { transmute::<u8, TempMappingKind>(kind_bits) }
-    }
-
-    pub fn get_type(&self) -> Type
-    {
-        assert!(self.get_kind() == TempMappingKind::MapToStack);
-
-        // Take the 5 lowest bits
-        let TempMapping(bits) = self;
-        let type_bits = bits & 0b11111;
-        unsafe { transmute::<u8, Type>(type_bits) }
-    }
-
-    pub fn get_local_idx(&self) -> u8
-    {
-        assert!(self.get_kind() == TempMappingKind::MapToLocal);
-
-        // Take the 3 lowest bits
-        let TempMapping(bits) = self;
-        bits & 0b111
+impl Default for TempMapping {
+    fn default() -> Self {
+        TempMapping::MapToStack(Type::default())
     }
 }
 
-impl Default for TempMapping {
-    fn default() -> Self {
-        TempMapping::map_to_stack(Type::Unknown)
+impl TempMapping {
+    /// Return TempMapping without type information in MapToStack
+    pub fn without_type(&self) -> TempMapping {
+        match self {
+            MapToStack(_) => TempMapping::MapToStack(Type::default()),
+            _ => *self,
+        }
     }
 }
 
@@ -396,49 +345,127 @@ impl From<Opnd> for YARVOpnd {
     }
 }
 
-/// Maximum index of stack temps that could be in a register
-pub const MAX_REG_TEMPS: u8 = 8;
-
-/// Bitmap of which stack temps are in a register
-#[derive(Copy, Clone, Default, Eq, Hash, PartialEq, Debug)]
-pub struct RegTemps(u8);
+/// Number of registers that can be used for stack temps or locals
+pub const MAX_MAPPED_REGS: usize = 5;
 
-impl RegTemps {
-    pub fn get(&self, index: u8) -> bool {
-        assert!(index < MAX_REG_TEMPS);
-        (self.0 >> index) & 1 == 1
-    }
+/// A stack slot or a local variable. u8 represents the index of it (<= 8).
+#[derive(Copy, Clone, Eq, Hash, PartialEq, Debug)]
+pub enum RegOpnd {
+    Stack(u8),
+    Local(u8),
+}
 
-    pub fn set(&mut self, index: u8, value: bool) {
-        assert!(index < MAX_REG_TEMPS);
-        if value {
-            self.0 = self.0 | (1 << index);
-        } else {
-            self.0 = self.0 & !(1 << index);
+/// RegMappings manages a set of registers used for stack temps and locals.
+/// Each element of the array represents each of the registers.
+/// If an element is Some, the stack temp or the local uses a register.
+///
+/// Note that Opnd::InsnOut uses a separate set of registers at the moment.
+#[derive(Copy, Clone, Default, Eq, Hash, PartialEq)]
+pub struct RegMapping([Option<RegOpnd>; MAX_MAPPED_REGS]);
+
+impl RegMapping {
+    /// Return the index of the register for a given operand if allocated.
+    pub fn get_reg(&self, opnd: RegOpnd) -> Option<usize> {
+        self.0.iter().enumerate()
+            .find(|(_, &reg_opnd)| reg_opnd == Some(opnd))
+            .map(|(reg_idx, _)| reg_idx)
+    }
+
+    /// Set a given operand to the register at a given index.
+    pub fn set_reg(&mut self, opnd: RegOpnd, reg_idx: usize) {
+        assert!(self.0[reg_idx].is_none());
+        self.0[reg_idx] = Some(opnd);
+    }
+
+    /// Allocate a register for a given operand if available.
+    /// Return true if self is updated.
+    pub fn alloc_reg(&mut self, opnd: RegOpnd) -> bool {
+        // If a given opnd already has a register, skip allocation.
+        if self.get_reg(opnd).is_some() {
+            return false;
         }
-    }
 
-    pub fn as_u8(&self) -> u8 {
-        self.0
+        // If the index is too large to encode with with 3 bits, give up.
+        match opnd {
+            RegOpnd::Stack(stack_idx) => if stack_idx >= MAX_CTX_TEMPS as u8 {
+                return false;
+            }
+            RegOpnd::Local(local_idx) => if local_idx >= MAX_CTX_LOCALS as u8 {
+                return false;
+            }
+        };
+
+        // Allocate a register if available.
+        if let Some(reg_idx) = self.find_unused_reg(opnd) {
+            self.0[reg_idx] = Some(opnd);
+            return true;
+        }
+        false
     }
 
-    /// Return true if there's a register that conflicts with a given stack_idx.
-    pub fn conflicts_with(&self, stack_idx: u8) -> bool {
-        let mut other_idx = stack_idx as isize - get_option!(num_temp_regs) as isize;
-        while other_idx >= 0 {
-            if self.get(other_idx as u8) {
+    /// Deallocate a register for a given operand if in use.
+    /// Return true if self is updated.
+    pub fn dealloc_reg(&mut self, opnd: RegOpnd) -> bool {
+        for reg_opnd in self.0.iter_mut() {
+            if *reg_opnd == Some(opnd) {
+                *reg_opnd = None;
                 return true;
             }
-            other_idx -= get_option!(num_temp_regs) as isize;
         }
         false
     }
+
+    /// Find an available register and return the index of it.
+    fn find_unused_reg(&self, opnd: RegOpnd) -> Option<usize> {
+        let num_regs = get_option!(num_temp_regs);
+        if num_regs == 0 {
+            return None;
+        }
+        assert!(num_regs <= MAX_MAPPED_REGS);
+
+        // If the default index for the operand is available, use that to minimize
+        // discrepancies among Contexts.
+        let default_idx = match opnd {
+            RegOpnd::Stack(stack_idx) => stack_idx.as_usize() % num_regs,
+            RegOpnd::Local(local_idx) => num_regs - (local_idx.as_usize() % num_regs) - 1,
+        };
+        if self.0[default_idx].is_none() {
+            return Some(default_idx);
+        }
+
+        // If not, pick any other available register. Like default indexes, prefer
+        // lower indexes for Stack, and higher indexes for Local.
+        let mut index_temps = self.0.iter().enumerate();
+        match opnd {
+            RegOpnd::Stack(_) => index_temps.find(|(_, reg_opnd)| reg_opnd.is_none()),
+            RegOpnd::Local(_) => index_temps.rev().find(|(_, reg_opnd)| reg_opnd.is_none()),
+        }.map(|(index, _)| index)
+    }
+
+    /// Return a vector of RegOpnds that have an allocated register
+    pub fn get_reg_opnds(&self) -> Vec<RegOpnd> {
+        self.0.iter().filter_map(|&reg_opnd| reg_opnd).collect()
+    }
+
+    /// Count the number of registers that store a different operand from `dst`.
+    pub fn diff(&self, dst: RegMapping) -> usize {
+        self.0.iter().enumerate().filter(|&(reg_idx, &reg)| reg != dst.0[reg_idx]).count()
+    }
+}
+
+impl fmt::Debug for RegMapping {
+    /// Print `[None, ...]` instead of the default `RegMappings([None, ...])`
+    fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result {
+        write!(fmt, "{:?}", self.0)
+    }
 }
 
+/// Maximum value of the chain depth (should fit in 5 bits)
+const CHAIN_DEPTH_MAX: u8 = 0b11111; // 31
+
 /// Code generation context
 /// Contains information we can use to specialize/optimize code
-/// There are a lot of context objects so we try to keep the size small.
-#[derive(Clone, Default, Eq, Hash, PartialEq, Debug)]
+#[derive(Copy, Clone, Default, Eq, Hash, PartialEq, Debug)]
 pub struct Context {
     // Number of values currently on the temporary stack
     stack_size: u8,
@@ -447,20 +474,742 @@ pub struct Context {
     // This represents how far the JIT's SP is from the "real" SP
     sp_offset: i8,
 
-    /// Bitmap of which stack temps are in a register
-    reg_temps: RegTemps,
+    /// Which stack temps or locals are in a register
+    reg_mapping: RegMapping,
 
     // Depth of this block in the sidechain (eg: inline-cache chain)
+    // 6 bits, max 63
     chain_depth: u8,
 
-    // Local variable types we keep track of
-    local_types: [Type; MAX_LOCAL_TYPES],
+    // Whether this code is the target of a JIT-to-JIT Ruby return ([Self::is_return_landing])
+    is_return_landing: bool,
+
+    // Whether the compilation of this code has been deferred ([Self::is_deferred])
+    is_deferred: bool,
 
     // Type we track for self
     self_type: Type,
 
-    // Mapping of temp stack entries to types we track
-    temp_mapping: [TempMapping; MAX_TEMP_TYPES],
+    // Local variable types we keep track of
+    local_types: [Type; MAX_CTX_LOCALS],
+
+    // Temp mapping type/local_idx we track
+    temp_mapping: [TempMapping; MAX_CTX_TEMPS],
+
+    /// A pointer to a block ISEQ supplied by the caller. 0 if not inlined.
+    inline_block: Option<IseqPtr>,
+}
+
+#[derive(Clone)]
+pub struct BitVector {
+    // Flat vector of bytes to write into
+    bytes: Vec<u8>,
+
+    // Number of bits taken out of bytes allocated
+    num_bits: usize,
+}
+
+impl BitVector {
+    pub fn new() -> Self {
+        Self {
+            bytes: Vec::with_capacity(4096),
+            num_bits: 0,
+        }
+    }
+
+    #[allow(unused)]
+    pub fn num_bits(&self) -> usize {
+        self.num_bits
+    }
+
+    // Total number of bytes taken
+    #[allow(unused)]
+    pub fn num_bytes(&self) -> usize {
+        (self.num_bits / 8) + if (self.num_bits % 8) != 0 { 1 } else { 0 }
+    }
+
+    // Write/append an unsigned integer value
+    fn push_uint(&mut self, mut val: u64, mut num_bits: usize) {
+        assert!(num_bits <= 64);
+
+        // Mask out bits above the number of bits requested
+        let mut val_bits = val;
+        if num_bits < 64 {
+            val_bits &= (1 << num_bits) - 1;
+            assert!(val == val_bits);
+        }
+
+        // Number of bits encoded in the last byte
+        let rem_bits = self.num_bits % 8;
+
+        // Encode as many bits as we can in this last byte
+        if rem_bits != 0 {
+            let num_enc = std::cmp::min(num_bits, 8 - rem_bits);
+            let bit_mask = (1 << num_enc) - 1;
+            let frac_bits = (val & bit_mask) << rem_bits;
+            let frac_bits: u8 = frac_bits.try_into().unwrap();
+            let last_byte_idx = self.bytes.len() - 1;
+            self.bytes[last_byte_idx] |= frac_bits;
+
+            self.num_bits += num_enc;
+            num_bits -= num_enc;
+            val >>= num_enc;
+        }
+
+        // While we have bits left to encode
+        while num_bits > 0 {
+            // Grow with a 1.2x growth factor instead of 2x
+            assert!(self.num_bits % 8 == 0);
+            let num_bytes = self.num_bits / 8;
+            if num_bytes == self.bytes.capacity() {
+                self.bytes.reserve_exact(self.bytes.len() / 5);
+            }
+
+            let bits = val & 0xFF;
+            let bits: u8 = bits.try_into().unwrap();
+            self.bytes.push(bits);
+
+            let bits_to_encode = std::cmp::min(num_bits, 8);
+            self.num_bits += bits_to_encode;
+            num_bits -= bits_to_encode;
+            val >>= bits_to_encode;
+        }
+    }
+
+    fn push_u8(&mut self, val: u8) {
+        self.push_uint(val as u64, 8);
+    }
+
+    fn push_u5(&mut self, val: u8) {
+        assert!(val <= 0b11111);
+        self.push_uint(val as u64, 5);
+    }
+
+    fn push_u4(&mut self, val: u8) {
+        assert!(val <= 0b1111);
+        self.push_uint(val as u64, 4);
+    }
+
+    fn push_u3(&mut self, val: u8) {
+        assert!(val <= 0b111);
+        self.push_uint(val as u64, 3);
+    }
+
+    fn push_u2(&mut self, val: u8) {
+        assert!(val <= 0b11);
+        self.push_uint(val as u64, 2);
+    }
+
+    fn push_u1(&mut self, val: u8) {
+        assert!(val <= 0b1);
+        self.push_uint(val as u64, 1);
+    }
+
+    fn push_bool(&mut self, val: bool) {
+        self.push_u1(if val { 1 } else { 0 });
+    }
+
+    // Push a context encoding opcode
+    fn push_op(&mut self, op: CtxOp) {
+        self.push_u4(op as u8);
+    }
+
+    // Read a uint value at a given bit index
+    // The bit index is incremented after the value is read
+    fn read_uint(&self, bit_idx: &mut usize, mut num_bits: usize) -> u64 {
+        let start_bit_idx = *bit_idx;
+        let mut cur_idx = *bit_idx;
+
+        // Read the bits in the first byte
+        let bit_mod = cur_idx % 8;
+        let bits_in_byte = self.bytes[cur_idx / 8] >> bit_mod;
+
+        let num_bits_in_byte = std::cmp::min(num_bits, 8 - bit_mod);
+        cur_idx += num_bits_in_byte;
+        num_bits -= num_bits_in_byte;
+
+        let mut out_bits = (bits_in_byte as u64) & ((1 << num_bits_in_byte) - 1);
+
+        // While we have bits left to read
+        while num_bits > 0 {
+            let num_bits_in_byte = std::cmp::min(num_bits, 8);
+            assert!(cur_idx % 8 == 0);
+            let byte = self.bytes[cur_idx / 8] as u64;
+
+            let bits_in_byte = byte & ((1 << num_bits) - 1);
+            out_bits |= bits_in_byte << (cur_idx - start_bit_idx);
+
+            // Move to the next byte/offset
+            cur_idx += num_bits_in_byte;
+            num_bits -= num_bits_in_byte;
+        }
+
+        // Update the read index
+        *bit_idx = cur_idx;
+
+        out_bits
+    }
+
+    fn read_u8(&self, bit_idx: &mut usize) -> u8 {
+        self.read_uint(bit_idx, 8) as u8
+    }
+
+    fn read_u5(&self, bit_idx: &mut usize) -> u8 {
+        self.read_uint(bit_idx, 5) as u8
+    }
+
+    fn read_u4(&self, bit_idx: &mut usize) -> u8 {
+        self.read_uint(bit_idx, 4) as u8
+    }
+
+    fn read_u3(&self, bit_idx: &mut usize) -> u8 {
+        self.read_uint(bit_idx, 3) as u8
+    }
+
+    fn read_u2(&self, bit_idx: &mut usize) -> u8 {
+        self.read_uint(bit_idx, 2) as u8
+    }
+
+    fn read_u1(&self, bit_idx: &mut usize) -> u8 {
+        self.read_uint(bit_idx, 1) as u8
+    }
+
+    fn read_bool(&self, bit_idx: &mut usize) -> bool {
+        self.read_u1(bit_idx) != 0
+    }
+
+    fn read_op(&self, bit_idx: &mut usize) -> CtxOp {
+        unsafe { std::mem::transmute(self.read_u4(bit_idx)) }
+    }
+}
+
+impl fmt::Debug for BitVector {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        // We print the higher bytes first
+        for (idx, byte) in self.bytes.iter().enumerate().rev() {
+            write!(f, "{:08b}", byte)?;
+
+            // Insert a separator between each byte
+            if idx > 0 {
+                write!(f, "|")?;
+            }
+        }
+
+        Ok(())
+    }
+}
+
+#[cfg(test)]
+mod bitvector_tests {
+    use super::*;
+
+    #[test]
+    fn write_3() {
+        let mut arr = BitVector::new();
+        arr.push_uint(3, 2);
+        assert!(arr.read_uint(&mut 0, 2) == 3);
+    }
+
+    #[test]
+    fn write_11() {
+        let mut arr = BitVector::new();
+        arr.push_uint(1, 1);
+        arr.push_uint(1, 1);
+        assert!(arr.read_uint(&mut 0, 2) == 3);
+    }
+
+    #[test]
+    fn write_11_overlap() {
+        let mut arr = BitVector::new();
+        arr.push_uint(0, 7);
+        arr.push_uint(3, 2);
+        arr.push_uint(1, 1);
+
+        //dbg!(arr.read_uint(7, 2));
+        assert!(arr.read_uint(&mut 7, 2) == 3);
+    }
+
+    #[test]
+    fn write_ff_0() {
+        let mut arr = BitVector::new();
+        arr.push_uint(0xFF, 8);
+        assert!(arr.read_uint(&mut 0, 8) == 0xFF);
+    }
+
+    #[test]
+    fn write_ff_3() {
+        // Write 0xFF at bit index 3
+        let mut arr = BitVector::new();
+        arr.push_uint(0, 3);
+        arr.push_uint(0xFF, 8);
+        assert!(arr.read_uint(&mut 3, 8) == 0xFF);
+    }
+
+    #[test]
+    fn write_ff_sandwich() {
+        // Write 0xFF sandwiched between zeros
+        let mut arr = BitVector::new();
+        arr.push_uint(0, 3);
+        arr.push_u8(0xFF);
+        arr.push_uint(0, 3);
+        assert!(arr.read_uint(&mut 3, 8) == 0xFF);
+    }
+
+    #[test]
+    fn write_read_u32_max() {
+        let mut arr = BitVector::new();
+        arr.push_uint(0xFF_FF_FF_FF, 32);
+        assert!(arr.read_uint(&mut 0, 32) == 0xFF_FF_FF_FF);
+    }
+
+    #[test]
+    fn write_read_u32_max_64b() {
+        let mut arr = BitVector::new();
+        arr.push_uint(0xFF_FF_FF_FF, 64);
+        assert!(arr.read_uint(&mut 0, 64) == 0xFF_FF_FF_FF);
+    }
+
+    #[test]
+    fn write_read_u64_max() {
+        let mut arr = BitVector::new();
+        arr.push_uint(u64::MAX, 64);
+        assert!(arr.read_uint(&mut 0, 64) == u64::MAX);
+    }
+
+    #[test]
+    fn encode_default() {
+        let mut bits = BitVector::new();
+        let ctx = Context::default();
+        let start_idx = ctx.encode_into(&mut bits);
+        assert!(start_idx == 0);
+        assert!(bits.num_bits() > 0);
+        assert!(bits.num_bytes() > 0);
+
+        // Make sure that the round trip matches the input
+        let ctx2 = Context::decode_from(&bits, 0);
+        assert!(ctx2 == ctx);
+    }
+
+    #[test]
+    fn encode_default_2x() {
+        let mut bits = BitVector::new();
+
+        let ctx0 = Context::default();
+        let idx0 = ctx0.encode_into(&mut bits);
+
+        let mut ctx1 = Context::default();
+        ctx1.reg_mapping = RegMapping([Some(RegOpnd::Stack(0)), None, None, None, None]);
+        let idx1 = ctx1.encode_into(&mut bits);
+
+        // Make sure that we can encode two contexts successively
+        let ctx0_dec = Context::decode_from(&bits, idx0);
+        let ctx1_dec = Context::decode_from(&bits, idx1);
+        assert!(ctx0_dec == ctx0);
+        assert!(ctx1_dec == ctx1);
+    }
+
+    #[test]
+    fn regress_reg_mapping() {
+        let mut bits = BitVector::new();
+        let mut ctx = Context::default();
+        ctx.reg_mapping = RegMapping([Some(RegOpnd::Stack(0)), None, None, None, None]);
+        ctx.encode_into(&mut bits);
+
+        let b0 = bits.read_u1(&mut 0);
+        assert!(b0 == 1);
+
+        // Make sure that the round trip matches the input
+        let ctx2 = Context::decode_from(&bits, 0);
+        assert!(ctx2 == ctx);
+    }
+}
+
+// Context encoding opcodes (4 bits)
+#[derive(Debug, Copy, Clone)]
+#[repr(u8)]
+enum CtxOp {
+    // Self type (4 bits)
+    SetSelfType = 0,
+
+    // Local idx (3 bits), temp type (4 bits)
+    SetLocalType,
+
+    // Map stack temp to self with known type
+    // Temp idx (3 bits), known type (4 bits)
+    SetTempType,
+
+    // Map stack temp to a local variable
+    // Temp idx (3 bits), local idx (3 bits)
+    MapTempLocal,
+
+    // Map a stack temp to self
+    // Temp idx (3 bits)
+    MapTempSelf,
+
+    // Set inline block pointer	(8 bytes)
+    SetInlineBlock,
+
+    // End of encoding
+    EndOfCode,
+}
+
+// Number of entries in the context cache
+const CTX_ENCODE_CACHE_SIZE: usize = 1024;
+const CTX_DECODE_CACHE_SIZE: usize = 1024;
+
+// Cache of the last contexts encoded/decoded
+// Empirically this saves a few percent of memory and speeds up compilation
+// We can experiment with varying the size of this cache
+pub type CtxEncodeCache = [(Context, u32); CTX_ENCODE_CACHE_SIZE];
+static mut CTX_ENCODE_CACHE: Option<Box<CtxEncodeCache>> = None;
+
+// Cache of the last contexts encoded/decoded
+// This speeds up compilation
+pub type CtxDecodeCache = [(Context, u32); CTX_DECODE_CACHE_SIZE];
+static mut CTX_DECODE_CACHE: Option<Box<CtxDecodeCache>> = None;
+
+// Size of the context cache in bytes
+pub const CTX_ENCODE_CACHE_BYTES: usize = std::mem::size_of::<CtxEncodeCache>();
+pub const CTX_DECODE_CACHE_BYTES: usize = std::mem::size_of::<CtxDecodeCache>();
+
+impl Context {
+    // Encode a context into the global context data, or return
+    // a cached previously encoded offset if one is found
+    pub fn encode(&self) -> u32 {
+        incr_counter!(num_contexts_encoded);
+
+        if *self == Context::default() {
+            incr_counter!(context_cache_hits);
+            return 0;
+        }
+
+        if let Some(idx) = Self::encode_cache_get(self) {
+            incr_counter!(context_cache_hits);
+            debug_assert!(Self::decode(idx) == *self);
+            return idx;
+        }
+
+        let context_data = CodegenGlobals::get_context_data();
+
+        // Make sure we don't use offset 0 because
+        // it's is reserved for the default context
+        if context_data.num_bits() == 0 {
+            context_data.push_u1(0);
+        }
+
+        let idx = self.encode_into(context_data);
+        let idx: u32 = idx.try_into().unwrap();
+
+        // Save this offset into the cache
+        Self::encode_cache_set(self, idx);
+        Self::decode_cache_set(self, idx);
+
+        // In debug mode, check that the round-trip decoding always matches
+        debug_assert!(Self::decode(idx) == *self);
+
+        idx
+    }
+
+    pub fn decode(start_idx: u32) -> Context {
+        if start_idx == 0 {
+            return Context::default();
+        };
+
+        if let Some(ctx) = Self::decode_cache_get(start_idx) {
+            return ctx;
+        }
+
+        let context_data = CodegenGlobals::get_context_data();
+        let ctx = Self::decode_from(context_data, start_idx as usize);
+
+        Self::encode_cache_set(&ctx, start_idx);
+        Self::decode_cache_set(&ctx, start_idx);
+
+        ctx
+    }
+
+    // Store an entry in a cache of recently encoded/decoded contexts for encoding
+    fn encode_cache_set(ctx: &Context, idx: u32)
+    {
+        // Compute the hash for this context
+        let mut hasher = DefaultHasher::new();
+        ctx.hash(&mut hasher);
+        let ctx_hash = hasher.finish() as usize;
+
+        unsafe {
+            // Lazily initialize the context cache
+            if CTX_ENCODE_CACHE == None {
+                // Here we use the vec syntax to avoid allocating the large table on the stack,
+                // as this can cause a stack overflow
+                let tbl = vec![(Context::default(), 0); CTX_ENCODE_CACHE_SIZE].into_boxed_slice().try_into().unwrap();
+                CTX_ENCODE_CACHE = Some(tbl);
+            }
+
+            // Write a cache entry for this context
+            let cache = CTX_ENCODE_CACHE.as_mut().unwrap();
+            cache[ctx_hash % CTX_ENCODE_CACHE_SIZE] = (*ctx, idx);
+        }
+    }
+
+    // Store an entry in a cache of recently encoded/decoded contexts for decoding
+    fn decode_cache_set(ctx: &Context, idx: u32) {
+        unsafe {
+            // Lazily initialize the context cache
+            if CTX_DECODE_CACHE == None {
+                // Here we use the vec syntax to avoid allocating the large table on the stack,
+                // as this can cause a stack overflow
+                let tbl = vec![(Context::default(), 0); CTX_DECODE_CACHE_SIZE].into_boxed_slice().try_into().unwrap();
+                CTX_DECODE_CACHE = Some(tbl);
+            }
+
+            // Write a cache entry for this context
+            let cache = CTX_DECODE_CACHE.as_mut().unwrap();
+            cache[idx as usize % CTX_DECODE_CACHE_SIZE] = (*ctx, idx);
+        }
+    }
+
+    // Lookup the context in a cache of recently encoded/decoded contexts for encoding
+    fn encode_cache_get(ctx: &Context) -> Option<u32>
+    {
+        // Compute the hash for this context
+        let mut hasher = DefaultHasher::new();
+        ctx.hash(&mut hasher);
+        let ctx_hash = hasher.finish() as usize;
+
+        unsafe {
+            if CTX_ENCODE_CACHE == None {
+                return None;
+            }
+
+            let cache = CTX_ENCODE_CACHE.as_mut().unwrap();
+
+            // Check that the context for this cache entry matches
+            let cache_entry = &cache[ctx_hash % CTX_ENCODE_CACHE_SIZE];
+            if cache_entry.0 == *ctx {
+                debug_assert!(cache_entry.1 != 0);
+                return Some(cache_entry.1);
+            }
+
+            return None;
+        }
+    }
+
+    // Lookup the context in a cache of recently encoded/decoded contexts for decoding
+    fn decode_cache_get(start_idx: u32) -> Option<Context> {
+        unsafe {
+            if CTX_DECODE_CACHE == None {
+                return None;
+            }
+
+            let cache = CTX_DECODE_CACHE.as_mut().unwrap();
+
+            // Check that the start_idx for this cache entry matches
+            let cache_entry = &cache[start_idx as usize % CTX_DECODE_CACHE_SIZE];
+            if cache_entry.1 == start_idx {
+                return Some(cache_entry.0);
+            }
+
+            return None;
+        }
+    }
+
+    // Encode into a compressed context representation in a bit vector
+    fn encode_into(&self, bits: &mut BitVector) -> usize {
+        let start_idx = bits.num_bits();
+
+        // Most of the time, the stack size is small and sp offset has the same value
+        if (self.stack_size as i64) == (self.sp_offset as i64) && self.stack_size < 4 {
+            // One single bit to signify a compact stack_size/sp_offset encoding
+            debug_assert!(self.sp_offset >= 0);
+            bits.push_u1(1);
+            bits.push_u2(self.stack_size);
+        } else {
+            // Full stack size encoding
+            bits.push_u1(0);
+
+            // Number of values currently on the temporary stack
+            bits.push_u8(self.stack_size);
+
+            // sp_offset: i8,
+            bits.push_u8(self.sp_offset as u8);
+        }
+
+        // Which stack temps or locals are in a register
+        for &temp in self.reg_mapping.0.iter() {
+            if let Some(temp) = temp {
+                bits.push_u1(1); // Some
+                match temp {
+                    RegOpnd::Stack(stack_idx) => {
+                        bits.push_u1(0); // Stack
+                        bits.push_u3(stack_idx);
+                    }
+                    RegOpnd::Local(local_idx) => {
+                        bits.push_u1(1); // Local
+                        bits.push_u3(local_idx);
+                    }
+                }
+            } else {
+                bits.push_u1(0); // None
+            }
+        }
+
+        bits.push_bool(self.is_deferred);
+        bits.push_bool(self.is_return_landing);
+
+        // The chain depth is most often 0 or 1
+        if self.chain_depth < 2 {
+            bits.push_u1(0);
+            bits.push_u1(self.chain_depth);
+
+        } else {
+            bits.push_u1(1);
+            bits.push_u5(self.chain_depth);
+        }
+
+        // Encode the self type if known
+        if self.self_type != Type::Unknown {
+            bits.push_op(CtxOp::SetSelfType);
+            bits.push_u4(self.self_type as u8);
+        }
+
+        // Encode the local types if known
+        for local_idx in 0..MAX_CTX_LOCALS {
+            let t = self.get_local_type(local_idx);
+            if t != Type::Unknown {
+                bits.push_op(CtxOp::SetLocalType);
+                bits.push_u3(local_idx as u8);
+                bits.push_u4(t as u8);
+            }
+        }
+
+        // Encode stack temps
+        for stack_idx in 0..MAX_CTX_TEMPS {
+            let mapping = self.get_temp_mapping(stack_idx);
+
+            match mapping {
+                MapToStack(temp_type) => {
+                    if temp_type != Type::Unknown {
+                        // Temp idx (3 bits), known type (4 bits)
+                        bits.push_op(CtxOp::SetTempType);
+                        bits.push_u3(stack_idx as u8);
+                        bits.push_u4(temp_type as u8);
+                    }
+                }
+
+                MapToLocal(local_idx) => {
+                    bits.push_op(CtxOp::MapTempLocal);
+                    bits.push_u3(stack_idx as u8);
+                    bits.push_u3(local_idx as u8);
+                }
+
+                MapToSelf => {
+                    // Temp idx (3 bits)
+                    bits.push_op(CtxOp::MapTempSelf);
+                    bits.push_u3(stack_idx as u8);
+                }
+            }
+        }
+
+        // Inline block pointer
+        if let Some(iseq) = self.inline_block {
+            bits.push_op(CtxOp::SetInlineBlock);
+            bits.push_uint(iseq as u64, 64);
+        }
+
+        // TODO: should we add an op for end-of-encoding,
+        // or store num ops at the beginning?
+        bits.push_op(CtxOp::EndOfCode);
+
+        start_idx
+    }
+
+    // Decode a compressed context representation from a bit vector
+    fn decode_from(bits: &BitVector, start_idx: usize) -> Context {
+        let mut ctx = Context::default();
+
+        let mut idx = start_idx;
+
+        // Small vs large stack size encoding
+        if bits.read_u1(&mut idx) == 1 {
+            ctx.stack_size = bits.read_u2(&mut idx);
+            ctx.sp_offset = ctx.stack_size as i8;
+        } else {
+            ctx.stack_size = bits.read_u8(&mut idx);
+            let sp_offset_bits = bits.read_u8(&mut idx);
+            ctx.sp_offset = sp_offset_bits as i8;
+
+            // If the top bit is set, then the sp offset must be negative
+            debug_assert!(!( (sp_offset_bits & 0x80) != 0 && ctx.sp_offset > 0 ));
+        }
+
+        // Which stack temps or locals are in a register
+        for index in 0..MAX_MAPPED_REGS {
+            if bits.read_u1(&mut idx) == 1 { // Some
+                let temp = if bits.read_u1(&mut idx) == 0 { // RegMapping::Stack
+                    RegOpnd::Stack(bits.read_u3(&mut idx))
+                } else {
+                    RegOpnd::Local(bits.read_u3(&mut idx))
+                };
+                ctx.reg_mapping.0[index] = Some(temp);
+            }
+        }
+
+        ctx.is_deferred = bits.read_bool(&mut idx);
+        ctx.is_return_landing = bits.read_bool(&mut idx);
+
+        if bits.read_u1(&mut idx) == 0 {
+            ctx.chain_depth = bits.read_u1(&mut idx)
+        } else {
+            ctx.chain_depth = bits.read_u5(&mut idx)
+        }
+
+        loop {
+            //println!("reading op");
+            let op = bits.read_op(&mut idx);
+            //println!("got op {:?}", op);
+
+            match op {
+                CtxOp::SetSelfType => {
+                    ctx.self_type = unsafe { transmute(bits.read_u4(&mut idx)) };
+                }
+
+                CtxOp::SetLocalType => {
+                    let local_idx = bits.read_u3(&mut idx) as usize;
+                    let t = unsafe { transmute(bits.read_u4(&mut idx)) };
+                    ctx.set_local_type(local_idx, t);
+                }
+
+                // Map temp to stack (known type)
+                CtxOp::SetTempType => {
+                    let temp_idx = bits.read_u3(&mut idx) as usize;
+                    let temp_type = unsafe { transmute(bits.read_u4(&mut idx)) };
+                    ctx.set_temp_mapping(temp_idx, TempMapping::MapToStack(temp_type));
+                }
+
+                // Map temp to local
+                CtxOp::MapTempLocal => {
+                    let temp_idx = bits.read_u3(&mut idx) as usize;
+                    let local_idx = bits.read_u3(&mut idx);
+                    ctx.set_temp_mapping(temp_idx, TempMapping::MapToLocal(local_idx));
+                }
+
+                // Map temp to self
+                CtxOp::MapTempSelf => {
+                    let temp_idx = bits.read_u3(&mut idx) as usize;
+                    ctx.set_temp_mapping(temp_idx, TempMapping::MapToSelf);
+                }
+
+                // Inline block pointer
+                CtxOp::SetInlineBlock => {
+                    ctx.inline_block = Some(bits.read_uint(&mut idx, 64) as IseqPtr);
+                }
+
+                CtxOp::EndOfCode => break,
+            }
+        }
+
+        ctx
+    }
 }
 
 /// Tuple of (iseq, idx) used to identify basic blocks
@@ -493,6 +1242,7 @@ pub enum BranchGenFn {
     JZToTarget0,
     JBEToTarget0,
     JBToTarget0,
+    JOMulToTarget0,
     JITReturn,
 }
 
@@ -504,8 +1254,8 @@ impl BranchGenFn {
                     BranchShape::Next0 => asm.jz(target1.unwrap()),
                     BranchShape::Next1 => asm.jnz(target0),
                     BranchShape::Default => {
-                        asm.jnz(target0.into());
-                        asm.jmp(target1.unwrap().into());
+                        asm.jnz(target0);
+                        asm.jmp(target1.unwrap());
                     }
                 }
             }
@@ -534,11 +1284,11 @@ impl BranchGenFn {
                     panic!("Branch shape Next1 not allowed in JumpToTarget0!");
                 }
                 if shape.get() == BranchShape::Default {
-                    asm.jmp(target0.into());
+                    asm.jmp(target0);
                 }
             }
             BranchGenFn::JNZToTarget0 => {
-                asm.jnz(target0.into())
+                asm.jnz(target0)
             }
             BranchGenFn::JZToTarget0 => {
                 asm.jz(target0)
@@ -549,9 +1299,14 @@ impl BranchGenFn {
             BranchGenFn::JBToTarget0 => {
                 asm.jb(target0)
             }
+            BranchGenFn::JOMulToTarget0 => {
+                asm.jo_mul(target0)
+            }
             BranchGenFn::JITReturn => {
-                asm.comment("update cfp->jit_return");
-                asm.mov(Opnd::mem(64, CFP, RUBY_OFFSET_CFP_JIT_RETURN), Opnd::const_ptr(target0.unwrap_code_ptr().raw_ptr()));
+                asm_comment!(asm, "update cfp->jit_return");
+                let jit_return = RUBY_OFFSET_CFP_JIT_RETURN - RUBY_SIZEOF_CONTROL_FRAME as i32;
+                let raw_ptr = asm.lea_jump_target(target0);
+                asm.mov(Opnd::mem(64, CFP, jit_return), raw_ptr);
             }
         }
     }
@@ -566,6 +1321,7 @@ impl BranchGenFn {
             BranchGenFn::JZToTarget0 |
             BranchGenFn::JBEToTarget0 |
             BranchGenFn::JBToTarget0 |
+            BranchGenFn::JOMulToTarget0 |
             BranchGenFn::JITReturn => BranchShape::Default,
         }
     }
@@ -587,6 +1343,7 @@ impl BranchGenFn {
             BranchGenFn::JZToTarget0 |
             BranchGenFn::JBEToTarget0 |
             BranchGenFn::JBToTarget0 |
+            BranchGenFn::JOMulToTarget0 |
             BranchGenFn::JITReturn => {
                 assert_eq!(new_shape, BranchShape::Default);
             }
@@ -616,10 +1373,10 @@ impl BranchTarget {
         }
     }
 
-    fn get_ctx(&self) -> Context {
+    fn get_ctx(&self) -> u32 {
         match self {
-            BranchTarget::Stub(stub) => stub.ctx.clone(),
-            BranchTarget::Block(blockref) => unsafe { blockref.as_ref() }.ctx.clone(),
+            BranchTarget::Stub(stub) => stub.ctx,
+            BranchTarget::Block(blockref) => unsafe { blockref.as_ref() }.ctx,
         }
     }
 
@@ -643,14 +1400,14 @@ struct BranchStub {
     address: Option<CodePtr>,
     iseq: Cell<IseqPtr>,
     iseq_idx: IseqIdx,
-    ctx: Context,
+    ctx: u32,
 }
 
 /// Store info about an outgoing branch in a code segment
 /// Note: care must be taken to minimize the size of branch objects
 pub struct Branch {
     // Block this is attached to
-    block: BlockRef,
+    block: Cell<BlockRef>,
 
     // Positions where the generated code starts and ends
     start_addr: CodePtr,
@@ -684,7 +1441,7 @@ pub struct PendingBranch {
 impl Branch {
     // Compute the size of the branch code
     fn code_size(&self) -> usize {
-        (self.end_addr.get().raw_ptr() as usize) - (self.start_addr.raw_ptr() as usize)
+        (self.end_addr.get().as_offset() - self.start_addr.as_offset()) as usize
     }
 
     /// Get the address of one of the branch destination
@@ -748,12 +1505,13 @@ impl std::fmt::Debug for Branch {
 impl PendingBranch {
     /// Set up a branch target at `target_idx`. Find an existing block to branch to
     /// or generate a stub for one.
+    #[must_use]
     fn set_target(
         &self,
         target_idx: u32,
         target: BlockId,
         ctx: &Context,
-        ocb: &mut OutlinedCb,
+        jit: &mut JITState,
     ) -> Option<CodePtr> {
         // If the block already exists
         if let Some(blockref) = find_block_version(target, ctx) {
@@ -765,10 +1523,13 @@ impl PendingBranch {
             return Some(block.start_addr);
         }
 
+        // Compress/encode the context
+        let ctx = Context::encode(ctx);
+
         // The branch struct is uninitialized right now but as a stable address.
         // We make sure the stub runs after the branch is initialized.
         let branch_struct_addr = self.uninit_branch.as_ptr() as usize;
-        let stub_addr = gen_branch_stub(ctx, ocb, branch_struct_addr, target_idx);
+        let stub_addr = gen_branch_stub(ctx, jit.iseq, jit.get_ocb(), branch_struct_addr, target_idx);
 
         if let Some(stub_addr) = stub_addr {
             // Fill the branch target with a stub
@@ -776,7 +1537,7 @@ impl PendingBranch {
                 address: Some(stub_addr),
                 iseq: Cell::new(target.iseq),
                 iseq_idx: target.idx,
-                ctx: ctx.clone(),
+                ctx,
             })))));
         }
 
@@ -787,7 +1548,7 @@ impl PendingBranch {
     fn into_branch(mut self, uninit_block: BlockRef) -> BranchRef {
         // Make the branch
         let branch = Branch {
-            block: uninit_block,
+            block: Cell::new(uninit_block),
             start_addr: self.start_addr.get().unwrap(),
             end_addr: Cell::new(self.end_addr.get().unwrap()),
             targets: self.targets,
@@ -818,6 +1579,7 @@ impl PendingBranch {
         }
 
         branch.assert_layout();
+        incr_counter!(compiled_branch_count);
 
         branchref
     }
@@ -869,21 +1631,18 @@ pub struct Block {
 
     // Context at the start of the block
     // This should never be mutated
-    ctx: Context,
+    ctx: u32,
 
     // Positions where the generated code starts and ends
     start_addr: CodePtr,
     end_addr: Cell<CodePtr>,
 
     // List of incoming branches (from predecessors)
-    // These are reference counted (ownership shared between predecessor and successors)
     incoming: MutableBranchList,
 
-    // NOTE: we might actually be able to store the branches here without refcounting
-    // however, using a RefCell makes it easy to get a pointer to Branch objects
-    //
     // List of outgoing branches (to successors)
-    outgoing: Box<[BranchRef]>,
+    // Infrequently mutated for control flow graph edits for saving memory.
+    outgoing: MutableBranchList,
 
     // FIXME: should these be code pointers instead?
     // Offsets for GC managed objects in the mainline code block
@@ -950,6 +1709,26 @@ impl MutableBranchList {
         current_list.push(branch);
         self.0.set(current_list.into_boxed_slice());
     }
+
+    /// Iterate through branches in the list by moving out of the cell
+    /// and then putting it back when done. Modifications to this cell
+    /// during iteration will be discarded.
+    ///
+    /// Assumes panic=abort since panic=unwind during iteration would
+    /// leave the cell empty.
+    fn for_each(&self, mut f: impl FnMut(BranchRef)) {
+        let list = self.0.take();
+        for branch in list.iter() {
+            f(*branch);
+        }
+        self.0.set(list);
+    }
+
+    /// Length of the list.
+    fn len(&self) -> usize {
+        // SAFETY: No cell mutation inside unsafe.
+        unsafe { self.0.ref_unchecked().len() }
+    }
 }
 
 impl fmt::Debug for MutableBranchList {
@@ -957,11 +1736,10 @@ impl fmt::Debug for MutableBranchList {
         // SAFETY: the derived Clone for boxed slices does not mutate this Cell
         let branches = unsafe { self.0.ref_unchecked().clone() };
 
-        formatter.debug_list().entries(branches.into_iter()).finish()
+        formatter.debug_list().entries(branches.iter()).finish()
     }
 }
 
-
 /// This is all the data YJIT stores on an iseq
 /// This will be dynamically allocated by C code
 /// C code should pass an &mut IseqPayload to us
@@ -971,7 +1749,7 @@ pub struct IseqPayload {
     // Basic block versions
     pub version_map: VersionMap,
 
-    // Indexes of code pages used by this this ISEQ
+    // Indexes of code pages used by this ISEQ
     pub pages: HashSet<usize>,
 
     // List of ISEQ entry codes
@@ -1043,15 +1821,6 @@ pub fn for_each_iseq<F: FnMut(IseqPtr)>(mut callback: F) {
     unsafe { rb_yjit_for_each_iseq(Some(callback_wrapper), (&mut data) as *mut _ as *mut c_void) };
 }
 
-/// Iterate over all ISEQ payloads
-pub fn for_each_iseq_payload<F: FnMut(&IseqPayload)>(mut callback: F) {
-    for_each_iseq(|iseq| {
-        if let Some(iseq_payload) = get_iseq_payload(iseq) {
-            callback(iseq_payload);
-        }
-    });
-}
-
 /// Iterate over all on-stack ISEQs
 pub fn for_each_on_stack_iseq<F: FnMut(IseqPtr)>(mut callback: F) {
     unsafe extern "C" fn callback_wrapper(iseq: IseqPtr, data: *mut c_void) {
@@ -1074,23 +1843,34 @@ pub fn for_each_on_stack_iseq_payload<F: FnMut(&IseqPayload)>(mut callback: F) {
 
 /// Iterate over all NOT on-stack ISEQ payloads
 pub fn for_each_off_stack_iseq_payload<F: FnMut(&mut IseqPayload)>(mut callback: F) {
-    let mut on_stack_iseqs: Vec<IseqPtr> = vec![];
-    for_each_on_stack_iseq(|iseq| {
-        on_stack_iseqs.push(iseq);
-    });
-    for_each_iseq(|iseq| {
+    // Get all ISEQs on the heap. Note that rb_objspace_each_objects() runs GC first,
+    // which could move ISEQ pointers when GC.auto_compact = true.
+    // So for_each_on_stack_iseq() must be called after this, which doesn't run GC.
+    let mut iseqs: Vec<IseqPtr> = vec![];
+    for_each_iseq(|iseq| iseqs.push(iseq));
+
+    // Get all ISEQs that are on a CFP of existing ECs.
+    let mut on_stack_iseqs: HashSet<IseqPtr> = HashSet::new();
+    for_each_on_stack_iseq(|iseq| { on_stack_iseqs.insert(iseq); });
+
+    // Invoke the callback for iseqs - on_stack_iseqs
+    for iseq in iseqs {
         if !on_stack_iseqs.contains(&iseq) {
             if let Some(iseq_payload) = get_iseq_payload(iseq) {
                 callback(iseq_payload);
             }
         }
-    })
+    }
 }
 
 /// Free the per-iseq payload
 #[no_mangle]
-pub extern "C" fn rb_yjit_iseq_free(payload: *mut c_void) {
+pub extern "C" fn rb_yjit_iseq_free(iseq: IseqPtr) {
+    // Free invariants for the ISEQ
+    iseq_free_invariants(iseq);
+
     let payload = {
+        let payload = unsafe { rb_iseq_get_yjit_payload(iseq) };
         if payload.is_null() {
             // Nothing to free.
             return;
@@ -1140,7 +1920,7 @@ pub extern "C" fn rb_yjit_iseq_mark(payload: *mut c_void) {
         // For aliasing, having the VM lock hopefully also implies that no one
         // else has an overlapping &mut IseqPayload.
         unsafe {
-            rb_yjit_assert_holding_vm_lock();
+            rb_assert_holding_vm_lock();
             &*(payload as *const IseqPayload)
         }
     };
@@ -1153,30 +1933,54 @@ pub extern "C" fn rb_yjit_iseq_mark(payload: *mut c_void) {
         for block in versions {
             // SAFETY: all blocks inside version_map are initialized.
             let block = unsafe { block.as_ref() };
+            mark_block(block, cb, false);
+        }
+    }
+    // Mark dead blocks, since there could be stubs pointing at them
+    for blockref in &payload.dead_blocks {
+        // SAFETY: dead blocks come from version_map, which only have initialized blocks
+        let block = unsafe { blockref.as_ref() };
+        mark_block(block, cb, true);
+    }
 
-            unsafe { rb_gc_mark_movable(block.iseq.get().into()) };
+    return;
 
-            // Mark method entry dependencies
-            for cme_dep in block.cme_dependencies.iter() {
-                unsafe { rb_gc_mark_movable(cme_dep.get().into()) };
-            }
+    fn mark_block(block: &Block, cb: &CodeBlock, dead: bool) {
+        unsafe { rb_gc_mark_movable(block.iseq.get().into()) };
 
-            // Mark outgoing branch entries
-            for branch in block.outgoing.iter() {
-                let branch = unsafe { branch.as_ref() };
-                for target in branch.targets.iter() {
-                    // SAFETY: no mutation inside unsafe
-                    let target_iseq = unsafe { target.ref_unchecked().as_ref().map(|target| target.get_blockid().iseq) };
+        // Mark method entry dependencies
+        for cme_dep in block.cme_dependencies.iter() {
+            unsafe { rb_gc_mark_movable(cme_dep.get().into()) };
+        }
 
-                    if let Some(target_iseq) = target_iseq {
-                        unsafe { rb_gc_mark_movable(target_iseq.into()) };
-                    }
+        // Mark outgoing branch entries
+        block.outgoing.for_each(|branch| {
+            let branch = unsafe { branch.as_ref() };
+            for target in branch.targets.iter() {
+                // SAFETY: no mutation inside unsafe
+                let target_iseq = unsafe {
+                    target.ref_unchecked().as_ref().and_then(|target| {
+                        // Avoid get_blockid() on blockref. Can be dangling on dead blocks,
+                        // and the iseq housing the block already naturally handles it.
+                        if target.get_block().is_some() {
+                            None
+                        } else {
+                            Some(target.get_blockid().iseq)
+                        }
+                    })
+                };
+
+                if let Some(target_iseq) = target_iseq {
+                    unsafe { rb_gc_mark_movable(target_iseq.into()) };
                 }
             }
+        });
 
-            // Walk over references to objects in generated code.
+        // Mark references to objects in generated code.
+        // Skip for dead blocks since they shouldn't run.
+        if !dead {
             for offset in block.gc_obj_offsets.iter() {
-                let value_address: *const u8 = cb.get_ptr(offset.as_usize()).raw_ptr();
+                let value_address: *const u8 = cb.get_ptr(offset.as_usize()).raw_ptr(cb);
                 // Creating an unaligned pointer is well defined unlike in C.
                 let value_address = value_address as *const VALUE;
 
@@ -1193,7 +1997,8 @@ pub extern "C" fn rb_yjit_iseq_mark(payload: *mut c_void) {
 /// GC callback for updating GC objects in the per-iseq payload.
 /// This is a mirror of [rb_yjit_iseq_mark].
 #[no_mangle]
-pub extern "C" fn rb_yjit_iseq_update_references(payload: *mut c_void) {
+pub extern "C" fn rb_yjit_iseq_update_references(iseq: IseqPtr) {
+    let payload = unsafe { rb_iseq_get_yjit_payload(iseq) };
     let payload = if payload.is_null() {
         // Nothing to update.
         return;
@@ -1204,7 +2009,7 @@ pub extern "C" fn rb_yjit_iseq_update_references(payload: *mut c_void) {
         // For aliasing, having the VM lock hopefully also implies that no one
         // else has an overlapping &mut IseqPayload.
         unsafe {
-            rb_yjit_assert_holding_vm_lock();
+            rb_assert_holding_vm_lock();
             &*(payload as *const IseqPayload)
         }
     };
@@ -1220,21 +2025,63 @@ pub extern "C" fn rb_yjit_iseq_update_references(payload: *mut c_void) {
         for version in versions {
             // SAFETY: all blocks inside version_map are initialized
             let block = unsafe { version.as_ref() };
+            block_update_references(block, cb, false);
+        }
+    }
+    // Update dead blocks, since there could be stubs pointing at them
+    for blockref in &payload.dead_blocks {
+        // SAFETY: dead blocks come from version_map, which only have initialized blocks
+        let block = unsafe { blockref.as_ref() };
+        block_update_references(block, cb, true);
+    }
+
+    return;
+
+    fn block_update_references(block: &Block, cb: &mut CodeBlock, dead: bool) {
+        block.iseq.set(unsafe { rb_gc_location(block.iseq.get().into()) }.as_iseq());
+
+        // Update method entry dependencies
+        for cme_dep in block.cme_dependencies.iter() {
+            let cur_cme: VALUE = cme_dep.get().into();
+            let new_cme = unsafe { rb_gc_location(cur_cme) }.as_cme();
+            cme_dep.set(new_cme);
+        }
 
-            block.iseq.set(unsafe { rb_gc_location(block.iseq.get().into()) }.as_iseq());
+        // Update outgoing branch entries
+        block.outgoing.for_each(|branch| {
+            let branch = unsafe { branch.as_ref() };
+            for target in branch.targets.iter() {
+                // SAFETY: no mutation inside unsafe
+                let current_iseq = unsafe {
+                    target.ref_unchecked().as_ref().and_then(|target| {
+                        // Avoid get_blockid() on blockref. Can be dangling on dead blocks,
+                        // and the iseq housing the block already naturally handles it.
+                        if target.get_block().is_some() {
+                            None
+                        } else {
+                            Some(target.get_blockid().iseq)
+                        }
+                    })
+                };
 
-            // Update method entry dependencies
-            for cme_dep in block.cme_dependencies.iter() {
-                let cur_cme: VALUE = cme_dep.get().into();
-                let new_cme = unsafe { rb_gc_location(cur_cme) }.as_cme();
-                cme_dep.set(new_cme);
+                if let Some(current_iseq) = current_iseq {
+                    let updated_iseq = unsafe { rb_gc_location(current_iseq.into()) }
+                        .as_iseq();
+                    // SAFETY: the Cell::set is not on the reference given out
+                    // by ref_unchecked.
+                    unsafe { target.ref_unchecked().as_ref().unwrap().set_iseq(updated_iseq) };
+                }
             }
+        });
 
-            // Walk over references to objects in generated code.
+        // Update references to objects in generated code.
+        // Skip for dead blocks since they shouldn't run and
+        // so there is no potential of writing over invalidation jumps
+        if !dead {
             for offset in block.gc_obj_offsets.iter() {
                 let offset_to_value = offset.as_usize();
                 let value_code_ptr = cb.get_ptr(offset_to_value);
-                let value_ptr: *const u8 = value_code_ptr.raw_ptr();
+                let value_ptr: *const u8 = value_code_ptr.raw_ptr(cb);
                 // Creating an unaligned pointer is well defined unlike in C.
                 let value_ptr = value_ptr as *mut VALUE;
 
@@ -1251,32 +2098,37 @@ pub extern "C" fn rb_yjit_iseq_update_references(payload: *mut c_void) {
                     }
                 }
             }
+        }
 
-            // Update outgoing branch entries
-            for branch in block.outgoing.iter() {
-                let branch = unsafe { branch.as_ref() };
-                for target in branch.targets.iter() {
-                    // SAFETY: no mutation inside unsafe
-                    let current_iseq = unsafe { target.ref_unchecked().as_ref().map(|target| target.get_blockid().iseq) };
+    }
+}
 
-                    if let Some(current_iseq) = current_iseq {
-                        let updated_iseq = unsafe { rb_gc_location(current_iseq.into()) }
-                            .as_iseq();
-                        // SAFETY: the Cell::set is not on the reference given out
-                        // by ref_unchecked.
-                        unsafe { target.ref_unchecked().as_ref().unwrap().set_iseq(updated_iseq) };
-                    }
-                }
-            }
-        }
+/// Mark all code memory as writable.
+/// This function is useful for garbage collectors that update references in JIT-compiled code in
+/// bulk.
+#[no_mangle]
+pub extern "C" fn rb_yjit_mark_all_writeable() {
+    if CodegenGlobals::has_instance() {
+        CodegenGlobals::get_inline_cb().mark_all_writeable();
+
+        CodegenGlobals::get_outlined_cb()
+            .unwrap()
+            .mark_all_writeable();
     }
+}
 
-    // Note that we would have returned already if YJIT is off.
-    cb.mark_all_executable();
+/// Mark all code memory as executable.
+/// This function is useful for garbage collectors that update references in JIT-compiled code in
+/// bulk.
+#[no_mangle]
+pub extern "C" fn rb_yjit_mark_all_executable() {
+    if CodegenGlobals::has_instance() {
+        CodegenGlobals::get_inline_cb().mark_all_executable();
 
-    CodegenGlobals::get_outlined_cb()
-        .unwrap()
-        .mark_all_executable();
+        CodegenGlobals::get_outlined_cb()
+            .unwrap()
+            .mark_all_executable();
+    }
 }
 
 /// Get all blocks for a particular place in an iseq.
@@ -1316,15 +2168,28 @@ pub fn take_version_list(blockid: BlockId) -> VersionList {
     }
 }
 
-/// Count the number of block versions matching a given blockid
-fn get_num_versions(blockid: BlockId) -> usize {
+/// Count the number of block versions that match a given BlockId and part of a Context
+fn get_num_versions(blockid: BlockId, ctx: &Context) -> usize {
     let insn_idx = blockid.idx.as_usize();
     match get_iseq_payload(blockid.iseq) {
+
+        // FIXME: this counting logic is going to be expensive.
+        // We should avoid it if possible
+
         Some(payload) => {
             payload
                 .version_map
                 .get(insn_idx)
-                .map(|versions| versions.len())
+                .map(|versions| {
+                    versions.iter().filter(|&&version| {
+                        let version_ctx = Context::decode(unsafe { version.as_ref() }.ctx);
+                        // Inline versions are counted separately towards MAX_INLINE_VERSIONS.
+                        version_ctx.inline() == ctx.inline() &&
+                            // find_block_versions() finds only blocks with compatible reg_mapping,
+                            // so count only versions with compatible reg_mapping.
+                            version_ctx.reg_mapping == ctx.reg_mapping
+                    }).count()
+                })
                 .unwrap_or(0)
         }
         None => 0,
@@ -1355,10 +2220,7 @@ pub fn get_or_create_iseq_block_list(iseq: IseqPtr) -> Vec<BlockRef> {
 /// Retrieve a basic block version for an (iseq, idx) tuple
 /// This will return None if no version is found
 fn find_block_version(blockid: BlockId, ctx: &Context) -> Option<BlockRef> {
-    let versions = match get_version_list(blockid) {
-        Some(versions) => versions,
-        None => return None,
-    };
+    let versions = get_version_list(blockid)?;
 
     // Best match found
     let mut best_version: Option<BlockRef> = None;
@@ -1367,10 +2229,11 @@ fn find_block_version(blockid: BlockId, ctx: &Context) -> Option<BlockRef> {
     // For each version matching the blockid
     for blockref in versions.iter() {
         let block = unsafe { blockref.as_ref() };
+        let block_ctx = Context::decode(block.ctx);
 
         // Note that we always prefer the first matching
         // version found because of inline-cache chains
-        match ctx.diff(&block.ctx) {
+        match ctx.diff(&block_ctx) {
             TypeDiff::Compatible(diff) if diff < best_diff => {
                 best_version = Some(*blockref);
                 best_diff = diff;
@@ -1379,41 +2242,82 @@ fn find_block_version(blockid: BlockId, ctx: &Context) -> Option<BlockRef> {
         }
     }
 
-    // If greedy versioning is enabled
-    if get_option!(greedy_versioning) {
-        // If we're below the version limit, don't settle for an imperfect match
-        if versions.len() + 1 < get_option!(max_versions) && best_diff > 0 {
-            return None;
+    return best_version;
+}
+
+/// Find the closest RegMapping among ones that have already been compiled.
+pub fn find_most_compatible_reg_mapping(blockid: BlockId, ctx: &Context) -> Option<RegMapping> {
+    let versions = get_version_list(blockid)?;
+
+    // Best match found
+    let mut best_mapping: Option<RegMapping> = None;
+    let mut best_diff = usize::MAX;
+
+    // For each version matching the blockid
+    for blockref in versions.iter() {
+        let block = unsafe { blockref.as_ref() };
+        let block_ctx = Context::decode(block.ctx);
+
+        // Discover the best block that is compatible if we load/spill registers
+        match ctx.diff_allowing_reg_mismatch(&block_ctx) {
+            TypeDiff::Compatible(diff) if diff < best_diff => {
+                best_mapping = Some(block_ctx.get_reg_mapping());
+                best_diff = diff;
+            }
+            _ => {}
         }
     }
 
-    return best_version;
+    best_mapping
 }
 
+/// Allow inlining a Block up to MAX_INLINE_VERSIONS times.
+const MAX_INLINE_VERSIONS: usize = 1000;
+
 /// Produce a generic context when the block version limit is hit for a blockid
 pub fn limit_block_versions(blockid: BlockId, ctx: &Context) -> Context {
     // Guard chains implement limits separately, do nothing
-    if ctx.chain_depth > 0 {
-        return ctx.clone();
+    if ctx.get_chain_depth() > 0 {
+        return *ctx;
     }
 
+    let next_versions = get_num_versions(blockid, ctx) + 1;
+    let max_versions = if ctx.inline() {
+        MAX_INLINE_VERSIONS
+    } else {
+        get_option!(max_versions)
+    };
+
     // If this block version we're about to add will hit the version limit
-    if get_num_versions(blockid) + 1 >= get_option!(max_versions) {
+    if next_versions >= max_versions {
         // Produce a generic context that stores no type information,
         // but still respects the stack_size and sp_offset constraints.
         // This new context will then match all future requests.
         let generic_ctx = ctx.get_generic_ctx();
 
-        debug_assert_ne!(
-            TypeDiff::Incompatible,
-            ctx.diff(&generic_ctx),
-            "should substitute a compatible context",
-        );
+        if cfg!(debug_assertions) {
+            let mut ctx = ctx.clone();
+            if ctx.inline() {
+                // Suppress TypeDiff::Incompatible from ctx.diff(). We return TypeDiff::Incompatible
+                // to keep inlining blocks until we hit the limit, but it's safe to give up inlining.
+                ctx.inline_block = None;
+                assert!(generic_ctx.inline_block == None);
+            }
+
+            assert_ne!(
+                TypeDiff::Incompatible,
+                ctx.diff(&generic_ctx),
+                "should substitute a compatible context",
+            );
+        }
 
         return generic_ctx;
     }
+    if ctx.inline() {
+        incr_counter_to!(max_inline_versions, next_versions);
+    }
 
-    return ctx.clone();
+    return *ctx;
 }
 
 /// Install a block version into its [IseqPayload], letting the GC track its
@@ -1439,7 +2343,7 @@ unsafe fn add_block_version(blockref: BlockRef, cb: &CodeBlock) {
     let block = unsafe { blockref.as_ref() };
 
     // Function entry blocks must have stack size 0
-    assert!(!(block.iseq_range.start == 0 && block.ctx.stack_size > 0));
+    debug_assert!(!(block.iseq_range.start == 0 && Context::decode(block.ctx).stack_size > 0));
 
     let version_list = get_or_create_version_list(block.get_blockid());
 
@@ -1460,7 +2364,7 @@ unsafe fn add_block_version(blockref: BlockRef, cb: &CodeBlock) {
 
     // Run write barriers for all objects in generated code.
     for offset in block.gc_obj_offsets.iter() {
-        let value_address: *const u8 = cb.get_ptr(offset.as_usize()).raw_ptr();
+        let value_address: *const u8 = cb.get_ptr(offset.as_usize()).raw_ptr(cb);
         // Creating an unaligned pointer is well defined unlike in C.
         let value_address: *const VALUE = value_address.cast();
 
@@ -1469,6 +2373,9 @@ unsafe fn add_block_version(blockref: BlockRef, cb: &CodeBlock) {
     }
 
     incr_counter!(compiled_block_count);
+    if Context::decode(block.ctx).inline() {
+        incr_counter!(inline_block_count);
+    }
 
     // Mark code pages for code GC
     let iseq_payload = get_iseq_payload(block.iseq.get()).unwrap();
@@ -1489,7 +2396,7 @@ fn remove_block_version(blockref: &BlockRef) {
     version_list.retain(|other| blockref != other);
 }
 
-impl JITState {
+impl<'a> JITState<'a> {
     // Finish compiling and turn a jit state into a block
     // note that the block is still not in shape.
     pub fn into_block(self, end_insn_idx: IseqIdx, start_addr: CodePtr, end_addr: CodePtr, gc_obj_offsets: Vec<u32>) -> BlockRef {
@@ -1498,23 +2405,25 @@ impl JITState {
 
         incr_counter_by!(num_gc_obj_refs, gc_obj_offsets.len());
 
+        let ctx = Context::encode(&self.get_starting_ctx());
+
         // Make the new block
         let block = MaybeUninit::new(Block {
             start_addr,
             iseq: Cell::new(self.get_iseq()),
             iseq_range: self.get_starting_insn_idx()..end_insn_idx,
-            ctx: self.get_starting_ctx(),
+            ctx,
             end_addr: Cell::new(end_addr),
             incoming: MutableBranchList(Cell::default()),
             gc_obj_offsets: gc_obj_offsets.into_boxed_slice(),
             entry_exit: self.get_block_entry_exit(),
             cme_dependencies: self.method_lookup_assumptions.into_iter().map(Cell::new).collect(),
             // Pending branches => actual branches
-            outgoing: self.pending_outgoing.into_iter().map(|pending_out| {
+            outgoing: MutableBranchList(Cell::new(self.pending_outgoing.into_iter().map(|pending_out| {
                 let pending_out = Rc::try_unwrap(pending_out)
                     .ok().expect("all PendingBranchRefs should be unique when ready to construct a Block");
                 pending_out.into_branch(NonNull::new(blockref as *mut Block).expect("no null from Box"))
-            }).collect()
+            }).collect()))
         });
         // Initialize it on the heap
         // SAFETY: allocated with Box above
@@ -1537,6 +2446,12 @@ impl JITState {
         if let Some(idlist) = self.stable_constant_names_assumption {
             track_stable_constant_names_assumption(blockref, idlist);
         }
+        for klass in self.no_singleton_class_assumptions {
+            track_no_singleton_class_assumption(blockref, klass);
+        }
+        if self.no_ep_escape {
+            track_no_ep_escape_assumption(blockref, self.iseq);
+        }
 
         blockref
     }
@@ -1553,10 +2468,10 @@ impl Block {
 
     pub fn get_ctx_count(&self) -> usize {
         let mut count = 1; // block.ctx
-        for branch in self.outgoing.iter() {
+        self.outgoing.for_each(|branch| {
             // SAFETY: &self implies it's initialized
             count += unsafe { branch.as_ref() }.get_stub_count();
-        }
+        });
         count
     }
 
@@ -1582,7 +2497,7 @@ impl Block {
 
     // Compute the size of the block code
     pub fn code_size(&self) -> usize {
-        (self.end_addr.get().into_usize()) - (self.start_addr.into_usize())
+        (self.end_addr.get().as_offset() - self.start_addr.as_offset()).try_into().unwrap()
     }
 }
 
@@ -1600,7 +2515,13 @@ impl Context {
         let mut generic_ctx = Context::default();
         generic_ctx.stack_size = self.stack_size;
         generic_ctx.sp_offset = self.sp_offset;
-        generic_ctx.reg_temps = self.reg_temps;
+        generic_ctx.reg_mapping = self.reg_mapping;
+        if self.is_return_landing() {
+            generic_ctx.set_as_return_landing();
+        }
+        if self.is_deferred() {
+            generic_ctx.mark_as_deferred();
+        }
         generic_ctx
     }
 
@@ -1608,7 +2529,7 @@ impl Context {
     /// accordingly. This is useful when you want to virtually rewind a stack_size for
     /// generating a side exit while considering past sp_offset changes on gen_save_sp.
     pub fn with_stack_size(&self, stack_size: u8) -> Context {
-        let mut ctx = self.clone();
+        let mut ctx = *self;
         ctx.sp_offset -= (ctx.get_stack_size() as isize - stack_size as isize) as i8;
         ctx.stack_size = stack_size;
         ctx
@@ -1622,41 +2543,78 @@ impl Context {
         self.sp_offset = offset;
     }
 
-    pub fn get_reg_temps(&self) -> RegTemps {
-        self.reg_temps
+    pub fn get_reg_mapping(&self) -> RegMapping {
+        self.reg_mapping
     }
 
-    pub fn set_reg_temps(&mut self, reg_temps: RegTemps) {
-        self.reg_temps = reg_temps;
+    pub fn set_reg_mapping(&mut self, reg_mapping: RegMapping) {
+        self.reg_mapping = reg_mapping;
     }
 
     pub fn get_chain_depth(&self) -> u8 {
         self.chain_depth
     }
 
-    pub fn reset_chain_depth(&mut self) {
+    pub fn reset_chain_depth_and_defer(&mut self) {
         self.chain_depth = 0;
+        self.is_deferred = false;
     }
 
     pub fn increment_chain_depth(&mut self) {
+        if self.get_chain_depth() == CHAIN_DEPTH_MAX {
+            panic!("max block version chain depth reached!");
+        }
         self.chain_depth += 1;
     }
 
+    pub fn set_as_return_landing(&mut self) {
+        self.is_return_landing = true;
+    }
+
+    pub fn clear_return_landing(&mut self) {
+        self.is_return_landing = false;
+    }
+
+    pub fn is_return_landing(&self) -> bool {
+        self.is_return_landing
+    }
+
+    pub fn mark_as_deferred(&mut self) {
+        self.is_deferred = true;
+    }
+
+    pub fn is_deferred(&self) -> bool {
+        self.is_deferred
+    }
+
     /// Get an operand for the adjusted stack pointer address
-    pub fn sp_opnd(&self, offset_bytes: isize) -> Opnd {
-        let offset = ((self.sp_offset as isize) * (SIZEOF_VALUE as isize)) + offset_bytes;
-        let offset = offset as i32;
+    pub fn sp_opnd(&self, offset: i32) -> Opnd {
+        let offset = (self.sp_offset as i32 + offset) * SIZEOF_VALUE_I32;
         return Opnd::mem(64, SP, offset);
     }
 
-    /// Stop using a register for a given stack temp.
+    /// Get an operand for the adjusted environment pointer address using SP register.
+    /// This is valid only when a Binding object hasn't been created for the frame.
+    pub fn ep_opnd(&self, offset: i32) -> Opnd {
+        let ep_offset = self.get_stack_size() as i32 + 1;
+        self.sp_opnd(-ep_offset + offset)
+    }
+
+    /// Start using a register for a given stack temp or a local.
+    pub fn alloc_reg(&mut self, opnd: RegOpnd) {
+        let mut reg_mapping = self.get_reg_mapping();
+        if reg_mapping.alloc_reg(opnd) {
+            self.set_reg_mapping(reg_mapping);
+        }
+    }
+
+    /// Stop using a register for a given stack temp or a local.
     /// This allows us to reuse the register for a value that we know is dead
     /// and will no longer be used (e.g. popped stack temp).
-    pub fn dealloc_temp_reg(&mut self, stack_idx: u8) {
-        if stack_idx < MAX_REG_TEMPS {
-            let mut reg_temps = self.get_reg_temps();
-            reg_temps.set(stack_idx, false);
-            self.set_reg_temps(reg_temps);
+    pub fn dealloc_reg(&mut self, opnd: RegOpnd) {
+        let mut reg_mapping = self.get_reg_mapping();
+        if reg_mapping.dealloc_reg(opnd) {
+            self.set_reg_mapping(reg_mapping);
         }
     }
 
@@ -1669,19 +2627,18 @@ impl Context {
                 let stack_idx: usize = (self.stack_size - 1 - idx).into();
 
                 // If outside of tracked range, do nothing
-                if stack_idx >= MAX_TEMP_TYPES {
+                if stack_idx >= MAX_CTX_TEMPS {
                     return Type::Unknown;
                 }
 
-                let mapping = self.temp_mapping[stack_idx];
+                let mapping = self.get_temp_mapping(stack_idx);
 
-                match mapping.get_kind() {
+                match mapping {
                     MapToSelf => self.self_type,
-                    MapToStack => mapping.get_type(),
-                    MapToLocal => {
-                        let idx = mapping.get_local_idx();
-                        assert!((idx as usize) < MAX_LOCAL_TYPES);
-                        return self.local_types[idx as usize];
+                    MapToStack(temp_type) => temp_type,
+                    MapToLocal(local_idx) => {
+                        assert!((local_idx as usize) < MAX_CTX_LOCALS);
+                        return self.get_local_type(local_idx.into());
                     }
                 }
             }
@@ -1689,8 +2646,24 @@ impl Context {
     }
 
     /// Get the currently tracked type for a local variable
-    pub fn get_local_type(&self, idx: usize) -> Type {
-        *self.local_types.get(idx).unwrap_or(&Type::Unknown)
+    pub fn get_local_type(&self, local_idx: usize) -> Type {
+        if local_idx >= MAX_CTX_LOCALS {
+            Type::Unknown
+        } else {
+            self.local_types[local_idx]
+        }
+    }
+
+    /// Get the current temp mapping for a given stack slot
+    fn get_temp_mapping(&self, temp_idx: usize) -> TempMapping {
+        assert!(temp_idx < MAX_CTX_TEMPS);
+        self.temp_mapping[temp_idx]
+    }
+
+    /// Set the current temp mapping for a given stack slot
+    fn set_temp_mapping(&mut self, temp_idx: usize, mapping: TempMapping) {
+        assert!(temp_idx < MAX_CTX_TEMPS);
+        self.temp_mapping[temp_idx] = mapping;
     }
 
     /// Upgrade (or "learn") the type of an instruction operand
@@ -1710,23 +2683,27 @@ impl Context {
                 let stack_idx = (self.stack_size - 1 - idx) as usize;
 
                 // If outside of tracked range, do nothing
-                if stack_idx >= MAX_TEMP_TYPES {
+                if stack_idx >= MAX_CTX_TEMPS {
                     return;
                 }
 
-                let mapping = self.temp_mapping[stack_idx];
+                let mapping = self.get_temp_mapping(stack_idx);
 
-                match mapping.get_kind() {
+                match mapping {
                     MapToSelf => self.self_type.upgrade(opnd_type),
-                    MapToStack => {
-                        let mut temp_type = mapping.get_type();
+                    MapToStack(mut temp_type) => {
                         temp_type.upgrade(opnd_type);
-                        self.temp_mapping[stack_idx] = TempMapping::map_to_stack(temp_type);
+                        self.set_temp_mapping(stack_idx, TempMapping::MapToStack(temp_type));
                     }
-                    MapToLocal => {
-                        let idx = mapping.get_local_idx() as usize;
-                        assert!(idx < MAX_LOCAL_TYPES);
-                        self.local_types[idx].upgrade(opnd_type);
+                    MapToLocal(local_idx) => {
+                        let idx = local_idx as usize;
+                        assert!(idx < MAX_CTX_LOCALS);
+                        let mut new_type = self.get_local_type(idx);
+                        new_type.upgrade(opnd_type);
+                        self.set_local_type(idx, new_type);
+                        // Re-attach MapToLocal for this StackOpnd(idx). set_local_type() detaches
+                        // all MapToLocal mappings, including the one we're upgrading here.
+                        self.set_opnd_mapping(opnd, mapping);
                     }
                 }
             }
@@ -1742,18 +2719,18 @@ impl Context {
         let opnd_type = self.get_opnd_type(opnd);
 
         match opnd {
-            SelfOpnd => TempMapping::map_to_self(),
+            SelfOpnd => TempMapping::MapToSelf,
             StackOpnd(idx) => {
                 assert!(idx < self.stack_size);
                 let stack_idx = (self.stack_size - 1 - idx) as usize;
 
-                if stack_idx < MAX_TEMP_TYPES {
-                    self.temp_mapping[stack_idx]
+                if stack_idx < MAX_CTX_TEMPS {
+                    self.get_temp_mapping(stack_idx)
                 } else {
                     // We can't know the source of this stack operand, so we assume it is
                     // a stack-only temporary. type will be UNKNOWN
                     assert!(opnd_type == Type::Unknown);
-                    TempMapping::map_to_stack(opnd_type)
+                    TempMapping::MapToStack(opnd_type)
                 }
             }
         }
@@ -1773,45 +2750,46 @@ impl Context {
                 }
 
                 // If outside of tracked range, do nothing
-                if stack_idx >= MAX_TEMP_TYPES {
+                if stack_idx >= MAX_CTX_TEMPS {
                     return;
                 }
 
-                self.temp_mapping[stack_idx] = mapping;
+                self.set_temp_mapping(stack_idx, mapping);
             }
         }
     }
 
     /// Set the type of a local variable
     pub fn set_local_type(&mut self, local_idx: usize, local_type: Type) {
-        let ctx = self;
-
         // If type propagation is disabled, store no types
         if get_option!(no_type_prop) {
             return;
         }
 
-        if local_idx >= MAX_LOCAL_TYPES {
-            return;
+        if local_idx >= MAX_CTX_LOCALS {
+            return
         }
 
         // If any values on the stack map to this local we must detach them
-        for mapping in ctx.temp_mapping.iter_mut() {
-            *mapping = match mapping.get_kind() {
-                MapToStack => *mapping,
-                MapToSelf => *mapping,
-                MapToLocal => {
-                    let idx = mapping.get_local_idx();
+        for mapping_idx in 0..MAX_CTX_TEMPS {
+            let mapping = self.get_temp_mapping(mapping_idx);
+            let tm = match mapping {
+                MapToStack(_) => mapping,
+                MapToSelf => mapping,
+                MapToLocal(idx) => {
                     if idx as usize == local_idx {
-                        TempMapping::map_to_stack(ctx.local_types[idx as usize])
+                        let local_type = self.get_local_type(local_idx);
+                        TempMapping::MapToStack(local_type)
                     } else {
-                        TempMapping::map_to_local(idx)
+                        TempMapping::MapToLocal(idx)
                     }
                 }
-            }
+            };
+            self.set_temp_mapping(mapping_idx, tm);
         }
 
-        ctx.local_types[local_idx] = local_type;
+        // Update the type
+        self.local_types[local_idx] = local_type;
     }
 
     /// Erase local variable type information
@@ -1819,15 +2797,27 @@ impl Context {
     pub fn clear_local_types(&mut self) {
         // When clearing local types we must detach any stack mappings to those
         // locals. Even if local values may have changed, stack values will not.
-        for mapping in self.temp_mapping.iter_mut() {
-            if mapping.get_kind() == MapToLocal {
-                let idx = mapping.get_local_idx();
-                *mapping = TempMapping::map_to_stack(self.local_types[idx as usize]);
+
+        for mapping_idx in 0..MAX_CTX_TEMPS {
+            let mapping = self.get_temp_mapping(mapping_idx);
+            if let MapToLocal(local_idx) = mapping {
+                let local_idx = local_idx as usize;
+                self.set_temp_mapping(mapping_idx, TempMapping::MapToStack(self.get_local_type(local_idx)));
             }
         }
 
         // Clear the local types
-        self.local_types = [Type::default(); MAX_LOCAL_TYPES];
+        self.local_types = [Type::default(); MAX_CTX_LOCALS];
+    }
+
+    /// Return true if the code is inlined by the caller
+    pub fn inline(&self) -> bool {
+        self.inline_block.is_some()
+    }
+
+    /// Set a block ISEQ given to the Block of this Context
+    pub fn set_inline_block(&mut self, iseq: IseqPtr) {
+        self.inline_block = Some(iseq);
     }
 
     /// Compute a difference score for two context objects
@@ -1836,13 +2826,21 @@ impl Context {
         let src = self;
 
         // Can only lookup the first version in the chain
-        if dst.chain_depth != 0 {
+        if dst.get_chain_depth() != 0 {
             return TypeDiff::Incompatible;
         }
 
         // Blocks with depth > 0 always produce new versions
         // Sidechains cannot overlap
-        if src.chain_depth != 0 {
+        if src.get_chain_depth() != 0 {
+            return TypeDiff::Incompatible;
+        }
+
+        if src.is_return_landing() != dst.is_return_landing() {
+            return TypeDiff::Incompatible;
+        }
+
+        if src.is_deferred() != dst.is_deferred() {
             return TypeDiff::Incompatible;
         }
 
@@ -1854,7 +2852,7 @@ impl Context {
             return TypeDiff::Incompatible;
         }
 
-        if dst.reg_temps != src.reg_temps {
+        if dst.reg_mapping != src.reg_mapping {
             return TypeDiff::Incompatible;
         }
 
@@ -1867,10 +2865,17 @@ impl Context {
             TypeDiff::Incompatible => return TypeDiff::Incompatible,
         };
 
+        // Check the block to inline
+        if src.inline_block != dst.inline_block {
+            // find_block_version should not find existing blocks with different
+            // inline_block so that their yield will not be megamorphic.
+            return TypeDiff::Incompatible;
+        }
+
         // For each local type we track
-        for i in 0..src.local_types.len() {
-            let t_src = src.local_types[i];
-            let t_dst = dst.local_types[i];
+        for i in 0.. MAX_CTX_LOCALS {
+            let t_src = src.get_local_type(i);
+            let t_dst = dst.get_local_type(i);
             diff += match t_src.diff(t_dst) {
                 TypeDiff::Compatible(diff) => diff,
                 TypeDiff::Incompatible => return TypeDiff::Incompatible,
@@ -1884,7 +2889,7 @@ impl Context {
 
             // If the two mappings aren't the same
             if src_mapping != dst_mapping {
-                if dst_mapping.get_kind() == MapToStack {
+                if matches!(dst_mapping, MapToStack(_)) {
                     // We can safely drop information about the source of the temp
                     // stack operand.
                     diff += 1;
@@ -1905,8 +2910,31 @@ impl Context {
         return TypeDiff::Compatible(diff);
     }
 
+    /// Basically diff() but allows RegMapping incompatibility that could be fixed by
+    /// spilling, loading, or shuffling registers.
+    pub fn diff_allowing_reg_mismatch(&self, dst: &Context) -> TypeDiff {
+        // We shuffle only RegOpnd::Local and spill any other RegOpnd::Stack.
+        // If dst has RegOpnd::Stack, we can't reuse the block as a callee.
+        for reg_opnd in dst.get_reg_mapping().get_reg_opnds() {
+            if matches!(reg_opnd, RegOpnd::Stack(_)) {
+                return TypeDiff::Incompatible;
+            }
+        }
+
+        // Prepare a Context with the same registers
+        let mut dst_with_same_regs = dst.clone();
+        dst_with_same_regs.set_reg_mapping(self.get_reg_mapping());
+
+        // Diff registers and other stuff separately, and merge them
+        if let TypeDiff::Compatible(ctx_diff) = self.diff(&dst_with_same_regs) {
+            TypeDiff::Compatible(ctx_diff + self.get_reg_mapping().diff(dst.get_reg_mapping()))
+        } else {
+            TypeDiff::Incompatible
+        }
+    }
+
     pub fn two_fixnums_on_stack(&self, jit: &mut JITState) -> Option<bool> {
-        if jit.at_current_insn() {
+        if jit.at_compile_target() {
             let comptime_recv = jit.peek_at_stack(self, 1);
             let comptime_arg = jit.peek_at_stack(self, 0);
             return Some(comptime_recv.fixnum_p() && comptime_arg.fixnum_p());
@@ -1934,44 +2962,42 @@ impl Assembler {
         let stack_size: usize = self.ctx.stack_size.into();
 
         // Keep track of the type and mapping of the value
-        if stack_size < MAX_TEMP_TYPES {
-            self.ctx.temp_mapping[stack_size] = mapping;
+        if stack_size < MAX_CTX_TEMPS {
+            self.ctx.set_temp_mapping(stack_size, mapping);
 
-            if mapping.get_kind() == MapToLocal {
-                let idx = mapping.get_local_idx();
-                assert!((idx as usize) < MAX_LOCAL_TYPES);
+            if let MapToLocal(local_idx) = mapping {
+                assert!((local_idx as usize) < MAX_CTX_LOCALS);
             }
         }
 
-        // Allocate a register to the stack operand
-        if self.ctx.stack_size < MAX_REG_TEMPS {
-            self.alloc_temp_reg(self.ctx.stack_size);
-        }
-
         self.ctx.stack_size += 1;
         self.ctx.sp_offset += 1;
 
-        return self.stack_opnd(0);
+        // Allocate a register to the new stack operand
+        let stack_opnd = self.stack_opnd(0);
+        self.alloc_reg(stack_opnd.reg_opnd());
+
+        stack_opnd
     }
 
     /// Push one new value on the temp stack
     /// Return a pointer to the new stack top
     pub fn stack_push(&mut self, val_type: Type) -> Opnd {
-        return self.stack_push_mapping(TempMapping::map_to_stack(val_type));
+        return self.stack_push_mapping(TempMapping::MapToStack(val_type));
     }
 
     /// Push the self value on the stack
     pub fn stack_push_self(&mut self) -> Opnd {
-        return self.stack_push_mapping(TempMapping::map_to_self());
+        return self.stack_push_mapping(TempMapping::MapToSelf);
     }
 
     /// Push a local variable on the stack
     pub fn stack_push_local(&mut self, local_idx: usize) -> Opnd {
-        if local_idx >= MAX_LOCAL_TYPES {
+        if local_idx >= MAX_CTX_LOCALS {
             return self.stack_push(Type::Unknown);
         }
 
-        return self.stack_push_mapping(TempMapping::map_to_local((local_idx as u8).into()));
+        return self.stack_push_mapping(TempMapping::MapToLocal(local_idx as u8));
     }
 
     // Pop N values off the stack
@@ -1985,8 +3011,8 @@ impl Assembler {
         for i in 0..n {
             let idx: usize = (self.ctx.stack_size as usize) - i - 1;
 
-            if idx < MAX_TEMP_TYPES {
-                self.ctx.temp_mapping[idx] = TempMapping::map_to_stack(Type::Unknown);
+            if idx < MAX_CTX_TEMPS {
+                self.ctx.set_temp_mapping(idx, TempMapping::MapToStack(Type::Unknown));
             }
         }
 
@@ -2000,11 +3026,16 @@ impl Assembler {
     pub fn shift_stack(&mut self, argc: usize) {
         assert!(argc < self.ctx.stack_size.into());
 
-        let method_name_index = (self.ctx.stack_size as usize) - (argc as usize) - 1;
+        let method_name_index = (self.ctx.stack_size as usize) - argc - 1;
 
         for i in method_name_index..(self.ctx.stack_size - 1) as usize {
-            if i + 1 < MAX_TEMP_TYPES {
-                self.ctx.temp_mapping[i] = self.ctx.temp_mapping[i + 1];
+            if i < MAX_CTX_TEMPS {
+                let next_arg_mapping = if i + 1 < MAX_CTX_TEMPS {
+                    self.ctx.get_temp_mapping(i + 1)
+                } else {
+                    TempMapping::MapToStack(Type::Unknown)
+                };
+                self.ctx.set_temp_mapping(i, next_arg_mapping);
             }
         }
         self.stack_pop(1);
@@ -2016,8 +3047,22 @@ impl Assembler {
             idx,
             num_bits: 64,
             stack_size: self.ctx.stack_size,
+            num_locals: None, // not needed for stack temps
+            sp_offset: self.ctx.sp_offset,
+            reg_mapping: None, // push_insn will set this
+        }
+    }
+
+    /// Get an operand pointing to a local variable
+    pub fn local_opnd(&self, ep_offset: u32) -> Opnd {
+        let idx = self.ctx.stack_size as i32 + ep_offset as i32;
+        Opnd::Stack {
+            idx,
+            num_bits: 64,
+            stack_size: self.ctx.stack_size,
+            num_locals: Some(self.get_num_locals().unwrap()), // this must exist for locals
             sp_offset: self.ctx.sp_offset,
-            reg_temps: None, // push_insn will set this
+            reg_mapping: None, // push_insn will set this
         }
     }
 }
@@ -2061,7 +3106,7 @@ fn gen_block_series_body(
     let mut batch = Vec::with_capacity(EXPECTED_BATCH_SIZE);
 
     // Generate code for the first block
-    let first_block = gen_single_block(blockid, start_ctx, ec, cb, ocb).ok()?;
+    let first_block = gen_single_block(blockid, start_ctx, ec, cb, ocb, true).ok()?;
     batch.push(first_block); // Keep track of this block version
 
     // Add the block version to the VersionMap for this ISEQ
@@ -2071,9 +3116,10 @@ fn gen_block_series_body(
     let mut last_blockref = first_block;
     loop {
         // Get the last outgoing branch from the previous block.
-        let last_branchref = {
-            let last_block = unsafe { last_blockref.as_ref() };
-            match last_block.outgoing.last() {
+        // SAFETY: No cell mutation inside unsafe. Copying out a BranchRef.
+        let last_branchref: BranchRef = unsafe {
+            let last_block = last_blockref.as_ref();
+            match last_block.outgoing.0.ref_unchecked().last() {
                 Some(branch) => *branch,
                 None => {
                     break;
@@ -2100,7 +3146,8 @@ fn gen_block_series_body(
         };
 
         // Generate new block using context from the last branch.
-        let result = gen_single_block(requested_blockid, &requested_ctx, ec, cb, ocb);
+        let requested_ctx = Context::decode(requested_ctx);
+        let result = gen_single_block(requested_blockid, &requested_ctx, ec, cb, ocb, false);
 
         // If the block failed to compile
         if result.is_err() {
@@ -2153,8 +3200,8 @@ fn gen_block_series_body(
 /// Generate a block version that is an entry point inserted into an iseq
 /// NOTE: this function assumes that the VM lock has been taken
 /// If jit_exception is true, compile JIT code for handling exceptions.
-/// See [jit_compile_exception] for details.
-pub fn gen_entry_point(iseq: IseqPtr, ec: EcPtr, jit_exception: bool) -> Option<CodePtr> {
+/// See jit_compile_exception() for details.
+pub fn gen_entry_point(iseq: IseqPtr, ec: EcPtr, jit_exception: bool) -> Option<*const u8> {
     // Compute the current instruction index based on the current PC
     let cfp = unsafe { get_ec_cfp(ec) };
     let insn_idx: u16 = unsafe {
@@ -2175,22 +3222,41 @@ pub fn gen_entry_point(iseq: IseqPtr, ec: EcPtr, jit_exception: bool) -> Option<
     let cb = CodegenGlobals::get_inline_cb();
     let ocb = CodegenGlobals::get_outlined_cb();
 
+    let code_ptr = gen_entry_point_body(blockid, stack_size, ec, jit_exception, cb, ocb);
+
+    cb.mark_all_executable();
+    ocb.unwrap().mark_all_executable();
+
+    code_ptr
+}
+
+fn gen_entry_point_body(blockid: BlockId, stack_size: u8, ec: EcPtr, jit_exception: bool, cb: &mut CodeBlock, ocb: &mut OutlinedCb) -> Option<*const u8> {
     // Write the interpreter entry prologue. Might be NULL when out of memory.
-    let code_ptr = gen_entry_prologue(cb, ocb, iseq, insn_idx, jit_exception);
+    let (code_ptr, reg_mapping) = gen_entry_prologue(cb, ocb, blockid, stack_size, jit_exception)?;
 
-    // Try to generate code for the entry block
+    // Find or compile a block version
     let mut ctx = Context::default();
     ctx.stack_size = stack_size;
-    let block = gen_block_series(blockid, &ctx, ec, cb, ocb);
-
-    cb.mark_all_executable();
-    ocb.unwrap().mark_all_executable();
+    ctx.reg_mapping = reg_mapping;
+    let block = match find_block_version(blockid, &ctx) {
+        // If an existing block is found, generate a jump to the block.
+        Some(blockref) => {
+            let mut asm = Assembler::new_without_iseq();
+            asm.jmp(unsafe { blockref.as_ref() }.start_addr.into());
+            asm.compile(cb, Some(ocb))?;
+            Some(blockref)
+        }
+        // If this block hasn't yet been compiled, generate blocks after the entry guard.
+        None => gen_block_series(blockid, &ctx, ec, cb, ocb),
+    };
 
     match block {
         // Compilation failed
         None => {
             // Trigger code GC. This entry point will be recompiled later.
-            cb.code_gc(ocb);
+            if get_option!(code_gc) {
+                cb.code_gc(ocb);
+            }
             return None;
         }
 
@@ -2207,13 +3273,13 @@ pub fn gen_entry_point(iseq: IseqPtr, ec: EcPtr, jit_exception: bool) -> Option<
     incr_counter!(compiled_iseq_entry);
 
     // Compilation successful and block not empty
-    return code_ptr;
+    Some(code_ptr.raw_ptr(cb))
 }
 
 // Change the entry's jump target from an entry stub to a next entry
 pub fn regenerate_entry(cb: &mut CodeBlock, entryref: &EntryRef, next_entry: CodePtr) {
-    let mut asm = Assembler::new();
-    asm.comment("regenerate_entry");
+    let mut asm = Assembler::new_without_iseq();
+    asm_comment!(asm, "regenerate_entry");
 
     // gen_entry_guard generates cmp + jne. We're rewriting only jne.
     asm.jne(next_entry.into());
@@ -2223,7 +3289,7 @@ pub fn regenerate_entry(cb: &mut CodeBlock, entryref: &EntryRef, next_entry: Cod
     let old_dropped_bytes = cb.has_dropped_bytes();
     cb.set_write_ptr(unsafe { entryref.as_ref() }.start_addr);
     cb.set_dropped_bytes(false);
-    asm.compile(cb, None);
+    asm.compile(cb, None).expect("can rewrite existing code");
 
     // Rewind write_pos to the original one
     assert_eq!(cb.get_write_ptr(), unsafe { entryref.as_ref() }.end_addr);
@@ -2245,84 +3311,93 @@ pub fn new_pending_entry() -> PendingEntryRef {
 
 c_callable! {
     /// Generated code calls this function with the SysV calling convention.
-    /// See [gen_call_entry_stub_hit].
+    /// See [gen_entry_stub].
     fn entry_stub_hit(entry_ptr: *const c_void, ec: EcPtr) -> *const u8 {
-        with_vm_lock(src_loc!(), || {
-            match entry_stub_hit_body(entry_ptr, ec) {
-                Some(addr) => addr,
-                // Failed to service the stub by generating a new block so now we
-                // need to exit to the interpreter at the stubbed location.
-                None => return CodegenGlobals::get_stub_exit_code().raw_ptr(),
-            }
+        with_compile_time(|| {
+            with_vm_lock(src_loc!(), || {
+                let cb = CodegenGlobals::get_inline_cb();
+                let ocb = CodegenGlobals::get_outlined_cb();
+
+                let addr = entry_stub_hit_body(entry_ptr, ec, cb, ocb)
+                    .unwrap_or_else(|| {
+                        // Trigger code GC (e.g. no space).
+                        // This entry point will be recompiled later.
+                        if get_option!(code_gc) {
+                            cb.code_gc(ocb);
+                        }
+                        CodegenGlobals::get_stub_exit_code().raw_ptr(cb)
+                    });
+
+                cb.mark_all_executable();
+                ocb.unwrap().mark_all_executable();
+
+                addr
+            })
         })
     }
 }
 
 /// Called by the generated code when an entry stub is executed
-fn entry_stub_hit_body(entry_ptr: *const c_void, ec: EcPtr) -> Option<*const u8> {
+fn entry_stub_hit_body(
+    entry_ptr: *const c_void,
+    ec: EcPtr,
+    cb: &mut CodeBlock,
+    ocb: &mut OutlinedCb
+) -> Option<*const u8> {
     // Get ISEQ and insn_idx from the current ec->cfp
     let cfp = unsafe { get_ec_cfp(ec) };
     let iseq = unsafe { get_cfp_iseq(cfp) };
     let insn_idx = iseq_pc_to_insn_idx(iseq, unsafe { get_cfp_pc(cfp) })?;
+    let blockid = BlockId { iseq, idx: insn_idx };
     let stack_size: u8 = unsafe {
         u8::try_from(get_cfp_sp(cfp).offset_from(get_cfp_bp(cfp))).ok()?
     };
 
-    let cb = CodegenGlobals::get_inline_cb();
-    let ocb = CodegenGlobals::get_outlined_cb();
-
     // Compile a new entry guard as a next entry
     let next_entry = cb.get_write_ptr();
-    let mut asm = Assembler::new();
-    let pending_entry = gen_entry_chain_guard(&mut asm, ocb, iseq, insn_idx)?;
-    asm.compile(cb, Some(ocb));
+    let mut asm = Assembler::new(unsafe { get_iseq_body_local_table_size(iseq) });
+    let pending_entry = gen_entry_chain_guard(&mut asm, ocb, blockid)?;
+    let reg_mapping = gen_entry_reg_mapping(&mut asm, blockid, stack_size);
+    asm.compile(cb, Some(ocb))?;
 
-    // Try to find an existing compiled version of this block
-    let blockid = BlockId { iseq, idx: insn_idx };
+    // Find or compile a block version
     let mut ctx = Context::default();
     ctx.stack_size = stack_size;
+    ctx.reg_mapping = reg_mapping;
     let blockref = match find_block_version(blockid, &ctx) {
         // If an existing block is found, generate a jump to the block.
         Some(blockref) => {
-            let mut asm = Assembler::new();
+            let mut asm = Assembler::new_without_iseq();
             asm.jmp(unsafe { blockref.as_ref() }.start_addr.into());
-            asm.compile(cb, Some(ocb));
-            blockref
+            asm.compile(cb, Some(ocb))?;
+            Some(blockref)
         }
         // If this block hasn't yet been compiled, generate blocks after the entry guard.
-        None => match gen_block_series(blockid, &ctx, ec, cb, ocb) {
-            Some(blockref) => blockref,
-            None => { // No space
-                // Trigger code GC. This entry point will be recompiled later.
-                cb.code_gc(ocb);
-                return None;
-            }
-        }
+        None => gen_block_series(blockid, &ctx, ec, cb, ocb),
     };
 
-    // Regenerate the previous entry
-    assert!(!entry_ptr.is_null());
-    let entryref = NonNull::<Entry>::new(entry_ptr as *mut Entry).expect("Entry should not be null");
-    regenerate_entry(cb, &entryref, next_entry);
-
-    // Write an entry to the heap and push it to the ISEQ
-    let pending_entry = Rc::try_unwrap(pending_entry).ok().expect("PendingEntry should be unique");
-    get_or_create_iseq_payload(iseq).entries.push(pending_entry.into_entry());
+    // Commit or retry the entry
+    if blockref.is_some() {
+        // Regenerate the previous entry
+        let entryref = NonNull::<Entry>::new(entry_ptr as *mut Entry).expect("Entry should not be null");
+        regenerate_entry(cb, &entryref, next_entry);
 
-    cb.mark_all_executable();
-    ocb.unwrap().mark_all_executable();
+        // Write an entry to the heap and push it to the ISEQ
+        let pending_entry = Rc::try_unwrap(pending_entry).ok().expect("PendingEntry should be unique");
+        get_or_create_iseq_payload(iseq).entries.push(pending_entry.into_entry());
+    }
 
-    // Let the stub jump to the block
-    Some(unsafe { blockref.as_ref() }.start_addr.raw_ptr())
+    // Return a code pointer if the block is successfully compiled. The entry stub needs
+    // to jump to the entry preceding the block to load the registers in reg_mapping.
+    blockref.map(|_block| next_entry.raw_ptr(cb))
 }
 
 /// Generate a stub that calls entry_stub_hit
 pub fn gen_entry_stub(entry_address: usize, ocb: &mut OutlinedCb) -> Option<CodePtr> {
     let ocb = ocb.unwrap();
-    let stub_addr = ocb.get_write_ptr();
 
-    let mut asm = Assembler::new();
-    asm.comment("entry stub hit");
+    let mut asm = Assembler::new_without_iseq();
+    asm_comment!(asm, "entry stub hit");
 
     asm.mov(C_ARG_OPNDS[0], entry_address.into());
 
@@ -2330,32 +3405,23 @@ pub fn gen_entry_stub(entry_address: usize, ocb: &mut OutlinedCb) -> Option<Code
     // Not really a side exit, just don't need a padded jump here.
     asm.jmp(CodegenGlobals::get_entry_stub_hit_trampoline().as_side_exit());
 
-    asm.compile(ocb, None);
-
-    if ocb.has_dropped_bytes() {
-        return None; // No space
-    } else {
-        return Some(stub_addr);
-    }
+    asm.compile(ocb, None).map(|(code_ptr, _)| code_ptr)
 }
 
 /// A trampoline used by gen_entry_stub. entry_stub_hit may issue Code GC, so
 /// it's useful for Code GC to call entry_stub_hit from a globally shared code.
-pub fn gen_entry_stub_hit_trampoline(ocb: &mut OutlinedCb) -> CodePtr {
+pub fn gen_entry_stub_hit_trampoline(ocb: &mut OutlinedCb) -> Option<CodePtr> {
     let ocb = ocb.unwrap();
-    let code_ptr = ocb.get_write_ptr();
-    let mut asm = Assembler::new();
+    let mut asm = Assembler::new_without_iseq();
 
     // See gen_entry_guard for how it's used.
-    asm.comment("entry_stub_hit() trampoline");
+    asm_comment!(asm, "entry_stub_hit() trampoline");
     let jump_addr = asm.ccall(entry_stub_hit as *mut u8, vec![C_ARG_OPNDS[0], EC]);
 
     // Jump to the address returned by the entry_stub_hit() call
     asm.jmp_opnd(jump_addr);
 
-    asm.compile(ocb, None);
-
-    code_ptr
+    asm.compile(ocb, None).map(|(code_ptr, _)| code_ptr)
 }
 
 /// Generate code for a branch, possibly rewriting and changing the size of it
@@ -2364,25 +3430,31 @@ fn regenerate_branch(cb: &mut CodeBlock, branch: &Branch) {
     cb.remove_comments(branch.start_addr, branch.end_addr.get());
 
     // SAFETY: having a &Branch implies branch.block is initialized.
-    let block = unsafe { branch.block.as_ref() };
+    let block = unsafe { branch.block.get().as_ref() };
 
     let branch_terminates_block = branch.end_addr.get() == block.get_end_addr();
 
     // Generate the branch
-    let mut asm = Assembler::new();
-    asm.comment("regenerate_branch");
+    let mut asm = Assembler::new_without_iseq();
+    asm_comment!(asm, "regenerate_branch");
     branch.gen_fn.call(
         &mut asm,
         Target::CodePtr(branch.get_target_address(0).unwrap()),
         branch.get_target_address(1).map(|addr| Target::CodePtr(addr)),
     );
 
+    // If the entire block is the branch and the block could be invalidated,
+    // we need to pad to ensure there is room for invalidation patching.
+    if branch.start_addr == block.start_addr && branch_terminates_block && block.entry_exit.is_some() {
+        asm.pad_inval_patch();
+    }
+
     // Rewrite the branch
     let old_write_pos = cb.get_write_pos();
     let old_dropped_bytes = cb.has_dropped_bytes();
     cb.set_write_ptr(branch.start_addr);
     cb.set_dropped_bytes(false);
-    asm.compile(cb, None);
+    asm.compile(cb, None).expect("can rewrite existing code");
     let new_end_addr = cb.get_write_ptr();
 
     branch.end_addr.set(new_end_addr);
@@ -2424,8 +3496,6 @@ fn new_pending_branch(jit: &mut JITState, gen_fn: BranchGenFn) -> PendingBranchR
         targets: [Cell::new(None), Cell::new(None)],
     });
 
-    incr_counter!(compiled_branch_count); // TODO not true. count at finalize time
-
     // Add to the list of outgoing branches for the block
     jit.queue_outgoing_branch(branch.clone());
 
@@ -2441,7 +3511,7 @@ c_callable! {
         ec: EcPtr,
     ) -> *const u8 {
         with_vm_lock(src_loc!(), || {
-            branch_stub_hit_body(branch_ptr, target_idx, ec)
+            with_compile_time(|| { branch_stub_hit_body(branch_ptr, target_idx, ec) })
         })
     }
 }
@@ -2458,9 +3528,11 @@ fn branch_stub_hit_body(branch_ptr: *const c_void, target_idx: u32, ec: EcPtr) -
 
     // SAFETY: We have the VM lock, and the branch is initialized by the time generated
     // code calls this function.
+    //
+    // Careful, don't make a `&Block` from `branch.block` here because we might
+    // delete it later in delete_empty_defer_block().
     let branch = unsafe { branch_ref.as_ref() };
     let branch_size_on_entry = branch.code_size();
-    let housing_block = unsafe { branch.block.as_ref() };
 
     let target_idx: usize = target_idx.as_usize();
     let target_branch_shape = match target_idx {
@@ -2469,6 +3541,9 @@ fn branch_stub_hit_body(branch_ptr: *const c_void, target_idx: u32, ec: EcPtr) -
         _ => unreachable!("target_idx < 2 must always hold"),
     };
 
+    let cb = CodegenGlobals::get_inline_cb();
+    let ocb = CodegenGlobals::get_outlined_cb();
+
     let (target_blockid, target_ctx): (BlockId, Context) = unsafe {
         // SAFETY: no mutation of the target's Cell. Just reading out data.
         let target = branch.targets[target_idx].ref_unchecked().as_ref().unwrap();
@@ -2476,24 +3551,25 @@ fn branch_stub_hit_body(branch_ptr: *const c_void, target_idx: u32, ec: EcPtr) -
         // If this branch has already been patched, return the dst address
         // Note: recursion can cause the same stub to be hit multiple times
         if let BranchTarget::Block(_) = target.as_ref() {
-            return target.get_address().unwrap().raw_ptr();
+            return target.get_address().unwrap().raw_ptr(cb);
         }
 
-        (target.get_blockid(), target.get_ctx())
+        let target_ctx = Context::decode(target.get_ctx());
+        (target.get_blockid(), target_ctx)
     };
 
-    let cb = CodegenGlobals::get_inline_cb();
-    let ocb = CodegenGlobals::get_outlined_cb();
-
     let (cfp, original_interp_sp) = unsafe {
         let cfp = get_ec_cfp(ec);
         let original_interp_sp = get_cfp_sp(cfp);
 
-        let running_iseq = rb_cfp_get_iseq(cfp);
+        let running_iseq = get_cfp_iseq(cfp);
+        assert_eq!(running_iseq, target_blockid.iseq as _, "each stub expects a particular iseq");
+
         let reconned_pc = rb_iseq_pc_at_idx(running_iseq, target_blockid.idx.into());
         let reconned_sp = original_interp_sp.offset(target_ctx.sp_offset.into());
-
-        assert_eq!(running_iseq, target_blockid.iseq as _, "each stub expects a particular iseq");
+        // Unlike in the interpreter, our `leave` doesn't write to the caller's
+        // SP -- we do it in the returned-to code. Account for this difference.
+        let reconned_sp = reconned_sp.add(target_ctx.is_return_landing().into());
 
         // Update the PC in the current CFP, because it may be out of sync in JITted code
         rb_set_cfp_pc(cfp, reconned_pc);
@@ -2506,6 +3582,17 @@ fn branch_stub_hit_body(branch_ptr: *const c_void, target_idx: u32, ec: EcPtr) -
         // So we do it here instead.
         rb_set_cfp_sp(cfp, reconned_sp);
 
+        // Bail if code GC is disabled and we've already run out of spaces.
+        if !get_option!(code_gc) && (cb.has_dropped_bytes() || ocb.unwrap().has_dropped_bytes()) {
+            return CodegenGlobals::get_stub_exit_code().raw_ptr(cb);
+        }
+
+        // Bail if we're about to run out of native stack space.
+        // We've just reconstructed interpreter state.
+        if rb_ec_stack_check(ec as _) != 0 {
+            return CodegenGlobals::get_stub_exit_code().raw_ptr(cb);
+        }
+
         (cfp, original_interp_sp)
     };
 
@@ -2516,11 +3603,10 @@ fn branch_stub_hit_body(branch_ptr: *const c_void, target_idx: u32, ec: EcPtr) -
     if block.is_none() {
         let branch_old_shape = branch.gen_fn.get_shape();
 
-
         // If the new block can be generated right after the branch (at cb->write_pos)
         if cb.get_write_ptr() == branch.end_addr.get() {
             // This branch should be terminating its block
-            assert!(branch.end_addr == housing_block.end_addr);
+            assert!(branch.end_addr == unsafe { branch.block.get().as_ref() }.end_addr);
 
             // Change the branch shape to indicate the target block will be placed next
             branch.gen_fn.set_shape(target_branch_shape);
@@ -2554,6 +3640,9 @@ fn branch_stub_hit_body(branch_ptr: *const c_void, target_idx: u32, ec: EcPtr) -
             // Branch shape should reflect layout
             assert!(!(branch.gen_fn.get_shape() == target_branch_shape && new_block.start_addr != branch.end_addr.get()));
 
+            // When block housing this branch is empty, try to free it
+            delete_empty_defer_block(branch, new_block, target_ctx, target_blockid);
+
             // Add this branch to the list of incoming branches for the target
             new_block.push_incoming(branch_ref);
 
@@ -2574,7 +3663,9 @@ fn branch_stub_hit_body(branch_ptr: *const c_void, target_idx: u32, ec: EcPtr) -
             // because incomplete code could be used when cb.dropped_bytes is flipped
             // by code GC. So this place, after all compilation, is the safest place
             // to hook code GC on branch_stub_hit.
-            cb.code_gc(ocb);
+            if get_option!(code_gc) {
+                cb.code_gc(ocb);
+            }
 
             // Failed to service the stub by generating a new block so now we
             // need to exit to the interpreter at the stubbed location. We are
@@ -2594,39 +3685,91 @@ fn branch_stub_hit_body(branch_ptr: *const c_void, target_idx: u32, ec: EcPtr) -
     assert!(
         new_branch_size <= branch_size_on_entry,
         "branch stubs should never enlarge branches (start_addr: {:?}, old_size: {}, new_size: {})",
-        branch.start_addr.raw_ptr(), branch_size_on_entry, new_branch_size,
+        branch.start_addr.raw_ptr(cb), branch_size_on_entry, new_branch_size,
     );
 
     // Return a pointer to the compiled block version
-    dst_addr.raw_ptr()
+    dst_addr.raw_ptr(cb)
+}
+
+/// Part of branch_stub_hit().
+/// If we've hit a deferred branch, and the housing block consists solely of the branch, rewire
+/// incoming branches to the new block and delete the housing block.
+fn delete_empty_defer_block(branch: &Branch, new_block: &Block, target_ctx: Context, target_blockid: BlockId)
+{
+    // This &Block should be unique, relying on the VM lock
+    let housing_block: &Block = unsafe { branch.block.get().as_ref() };
+    if target_ctx.is_deferred() &&
+        target_blockid == housing_block.get_blockid() &&
+        housing_block.outgoing.len() == 1 &&
+        {
+            // The block is empty when iseq_range is one instruction long.
+            let range = &housing_block.iseq_range;
+            let iseq = housing_block.iseq.get();
+            let start_opcode = iseq_opcode_at_idx(iseq, range.start.into()) as usize;
+            let empty_end = range.start + insn_len(start_opcode) as IseqIdx;
+            range.end == empty_end
+        }
+    {
+        // Divert incoming branches of housing_block to the new block
+        housing_block.incoming.for_each(|incoming| {
+            let incoming = unsafe { incoming.as_ref() };
+            for target in 0..incoming.targets.len() {
+                // SAFETY: No cell mutation; copying out a BlockRef.
+                if Some(BlockRef::from(housing_block)) == unsafe {
+                            incoming.targets[target]
+                                .ref_unchecked()
+                                .as_ref()
+                                .and_then(|target| target.get_block())
+                        } {
+                    incoming.targets[target].set(Some(Box::new(BranchTarget::Block(new_block.into()))));
+                }
+            }
+            new_block.push_incoming(incoming.into());
+        });
+
+        // Transplant the branch we've just hit to the new block
+        mem::drop(housing_block.outgoing.0.take());
+        new_block.outgoing.push(branch.into());
+        let housing_block: BlockRef = branch.block.replace(new_block.into());
+        // Free the old housing block; there should now be no live &Block.
+        remove_block_version(&housing_block);
+        unsafe { free_block(housing_block, false) };
+
+        incr_counter!(deleted_defer_block_count);
+    }
 }
 
 /// Generate a "stub", a piece of code that calls the compiler back when run.
 /// A piece of code that redeems for more code; a thunk for code.
 fn gen_branch_stub(
-    ctx: &Context,
+    ctx: u32,
+    iseq: IseqPtr,
     ocb: &mut OutlinedCb,
     branch_struct_address: usize,
     target_idx: u32,
 ) -> Option<CodePtr> {
     let ocb = ocb.unwrap();
 
-    // Generate an outlined stub that will call branch_stub_hit()
-    let stub_addr = ocb.get_write_ptr();
+    let mut asm = Assembler::new(unsafe { get_iseq_body_local_table_size(iseq) });
+    asm.ctx = Context::decode(ctx);
+    asm.set_reg_mapping(asm.ctx.reg_mapping);
+    asm_comment!(asm, "branch stub hit");
 
-    let mut asm = Assembler::new();
-    asm.ctx = ctx.clone();
-    asm.set_reg_temps(ctx.reg_temps);
-    asm.comment("branch stub hit");
+    if asm.ctx.is_return_landing() {
+        asm.mov(SP, Opnd::mem(64, CFP, RUBY_OFFSET_CFP_SP));
+        let top = asm.stack_push(Type::Unknown);
+        asm.mov(top, C_RET_OPND);
+    }
 
     // Save caller-saved registers before C_ARG_OPNDS get clobbered.
     // Spill all registers for consistency with the trampoline.
-    for &reg in caller_saved_temp_regs().iter() {
-        asm.cpush(reg);
+    for &reg in caller_saved_temp_regs() {
+        asm.cpush(Opnd::Reg(reg));
     }
 
     // Spill temps to the VM stack as well for jit.peek_at_stack()
-    asm.spill_temps();
+    asm.spill_regs();
 
     // Set up the arguments unique to this stub for:
     //
@@ -2641,20 +3784,12 @@ fn gen_branch_stub(
     // Not really a side exit, just don't need a padded jump here.
     asm.jmp(CodegenGlobals::get_branch_stub_hit_trampoline().as_side_exit());
 
-    asm.compile(ocb, None);
-
-    if ocb.has_dropped_bytes() {
-        // No space
-        None
-    } else {
-        Some(stub_addr)
-    }
+    asm.compile(ocb, None).map(|(code_ptr, _)| code_ptr)
 }
 
-pub fn gen_branch_stub_hit_trampoline(ocb: &mut OutlinedCb) -> CodePtr {
+pub fn gen_branch_stub_hit_trampoline(ocb: &mut OutlinedCb) -> Option<CodePtr> {
     let ocb = ocb.unwrap();
-    let code_ptr = ocb.get_write_ptr();
-    let mut asm = Assembler::new();
+    let mut asm = Assembler::new_without_iseq();
 
     // For `branch_stub_hit(branch_ptr, target_idx, ec)`,
     // `branch_ptr` and `target_idx` is different for each stub,
@@ -2662,8 +3797,8 @@ pub fn gen_branch_stub_hit_trampoline(ocb: &mut OutlinedCb) -> CodePtr {
     // is the unchanging part.
     // Since this trampoline is static, it allows code GC inside
     // branch_stub_hit() to free stubs without problems.
-    asm.comment("branch_stub_hit() trampoline");
-    let jump_addr = asm.ccall(
+    asm_comment!(asm, "branch_stub_hit() trampoline");
+    let stub_hit_ret = asm.ccall(
         branch_stub_hit as *mut u8,
         vec![
             C_ARG_OPNDS[0],
@@ -2671,28 +3806,39 @@ pub fn gen_branch_stub_hit_trampoline(ocb: &mut OutlinedCb) -> CodePtr {
             EC,
         ]
     );
+    let jump_addr = asm.load(stub_hit_ret);
 
     // Restore caller-saved registers for stack temps
-    for &reg in caller_saved_temp_regs().iter().rev() {
-        asm.cpop_into(reg);
+    for &reg in caller_saved_temp_regs().rev() {
+        asm.cpop_into(Opnd::Reg(reg));
     }
 
     // Jump to the address returned by the branch_stub_hit() call
     asm.jmp_opnd(jump_addr);
 
-    asm.compile(ocb, None);
+    // HACK: popping into C_RET_REG clobbers the return value of branch_stub_hit() we need to jump
+    // to, so we need a scratch register to preserve it. This extends the live range of the C
+    // return register so we get something else for the return value.
+    let _ = asm.live_reg_opnd(stub_hit_ret);
 
-    code_ptr
+    asm.compile(ocb, None).map(|(code_ptr, _)| code_ptr)
 }
 
 /// Return registers to be pushed and popped on branch_stub_hit.
-/// The return value may include an extra register for x86 alignment.
-fn caller_saved_temp_regs() -> Vec<Opnd> {
-    let mut regs = Assembler::get_temp_regs();
-    if regs.len() % 2 == 1 {
-        regs.push(*regs.last().unwrap()); // x86 alignment
+pub fn caller_saved_temp_regs() -> impl Iterator<Item = &'static Reg> + DoubleEndedIterator {
+    let temp_regs = Assembler::get_temp_regs().iter();
+    let len = temp_regs.len();
+    // The return value gen_leave() leaves in C_RET_REG
+    // needs to survive the branch_stub_hit() call.
+    let regs = temp_regs.chain(std::iter::once(&C_RET_REG));
+
+    // On x86_64, maintain 16-byte stack alignment
+    if cfg!(target_arch = "x86_64") && len % 2 == 0 {
+        static ONE_MORE: [Reg; 1] = [C_RET_REG];
+        regs.chain(ONE_MORE.iter())
+    } else {
+        regs.chain(&[])
     }
-    regs.iter().map(|&reg| Opnd::Reg(reg)).collect()
 }
 
 impl Assembler
@@ -2703,7 +3849,7 @@ impl Assembler
         // so that we can move the closure below
         let entryref = entryref.clone();
 
-        self.pos_marker(move |code_ptr| {
+        self.pos_marker(move |code_ptr, _| {
             entryref.start_addr.set(Some(code_ptr));
         });
     }
@@ -2714,7 +3860,7 @@ impl Assembler
         // so that we can move the closure below
         let entryref = entryref.clone();
 
-        self.pos_marker(move |code_ptr| {
+        self.pos_marker(move |code_ptr, _| {
             entryref.end_addr.set(Some(code_ptr));
         });
     }
@@ -2726,7 +3872,7 @@ impl Assembler
         // so that we can move the closure below
         let branchref = branchref.clone();
 
-        self.pos_marker(move |code_ptr| {
+        self.pos_marker(move |code_ptr, _| {
             branchref.start_addr.set(Some(code_ptr));
         });
     }
@@ -2738,32 +3884,32 @@ impl Assembler
         // so that we can move the closure below
         let branchref = branchref.clone();
 
-        self.pos_marker(move |code_ptr| {
+        self.pos_marker(move |code_ptr, _| {
             branchref.end_addr.set(Some(code_ptr));
         });
     }
 }
 
+#[must_use]
 pub fn gen_branch(
     jit: &mut JITState,
     asm: &mut Assembler,
-    ocb: &mut OutlinedCb,
     target0: BlockId,
     ctx0: &Context,
     target1: Option<BlockId>,
     ctx1: Option<&Context>,
     gen_fn: BranchGenFn,
-) {
+) -> Option<()> {
     let branch = new_pending_branch(jit, gen_fn);
 
     // Get the branch targets or stubs
-    let target0_addr = branch.set_target(0, target0, ctx0, ocb);
+    let target0_addr = branch.set_target(0, target0, ctx0, jit)?;
     let target1_addr = if let Some(ctx) = ctx1 {
-        let addr = branch.set_target(1, target1.unwrap(), ctx, ocb);
+        let addr = branch.set_target(1, target1.unwrap(), ctx, jit);
         if addr.is_none() {
             // target1 requested but we're out of memory.
             // Avoid unwrap() in gen_fn()
-            return;
+            return None;
         }
 
         addr
@@ -2771,10 +3917,10 @@ pub fn gen_branch(
 
     // Call the branch generation function
     asm.mark_branch_start(&branch);
-    if let Some(dst_addr) = target0_addr {
-        branch.gen_fn.call(asm, Target::CodePtr(dst_addr), target1_addr.map(|addr| Target::CodePtr(addr)));
-    }
+    branch.gen_fn.call(asm, Target::CodePtr(target0_addr), target1_addr.map(|addr| Target::CodePtr(addr)));
     asm.mark_branch_end(&branch);
+
+    Some(())
 }
 
 pub fn gen_direct_jump(jit: &mut JITState, ctx: &Context, target0: BlockId, asm: &mut Assembler) {
@@ -2787,7 +3933,7 @@ pub fn gen_direct_jump(jit: &mut JITState, ctx: &Context, target0: BlockId, asm:
         let block_addr = block.start_addr;
 
         // Call the branch generation function
-        asm.comment("gen_direct_jmp: existing block");
+        asm_comment!(asm, "gen_direct_jmp: existing block");
         asm.mark_branch_start(&branch);
         branch.gen_fn.call(asm, Target::CodePtr(block_addr), None);
         asm.mark_branch_end(&branch);
@@ -2795,7 +3941,7 @@ pub fn gen_direct_jump(jit: &mut JITState, ctx: &Context, target0: BlockId, asm:
         BranchTarget::Block(blockref)
     } else {
         // The branch is effectively empty (a noop)
-        asm.comment("gen_direct_jmp: fallthrough");
+        asm_comment!(asm, "gen_direct_jmp: fallthrough");
         asm.mark_branch_start(&branch);
         asm.mark_branch_end(&branch);
         branch.gen_fn.set_shape(BranchShape::Next0);
@@ -2804,7 +3950,7 @@ pub fn gen_direct_jump(jit: &mut JITState, ctx: &Context, target0: BlockId, asm:
         // compile the target block right after this one (fallthrough).
         BranchTarget::Stub(Box::new(BranchStub {
             address: None,
-            ctx: ctx.clone(),
+            ctx: Context::encode(ctx),
             iseq: Cell::new(target0.iseq),
             iseq_idx: target0.idx,
         }))
@@ -2814,21 +3960,14 @@ pub fn gen_direct_jump(jit: &mut JITState, ctx: &Context, target0: BlockId, asm:
 }
 
 /// Create a stub to force the code up to this point to be executed
-pub fn defer_compilation(
-    jit: &mut JITState,
-    asm: &mut Assembler,
-    ocb: &mut OutlinedCb,
-) {
-    if asm.ctx.chain_depth != 0 {
+pub fn defer_compilation(jit: &mut JITState, asm: &mut Assembler) -> Result<(), ()> {
+    if asm.ctx.is_deferred() {
         panic!("Double defer!");
     }
 
-    let mut next_ctx = asm.ctx.clone();
+    let mut next_ctx = asm.ctx;
 
-    if next_ctx.chain_depth == u8::MAX {
-        panic!("max block version chain depth reached!");
-    }
-    next_ctx.chain_depth += 1;
+    next_ctx.mark_as_deferred();
 
     let branch = new_pending_branch(jit, BranchGenFn::JumpToTarget0(Cell::new(BranchShape::Default)));
 
@@ -2837,15 +3976,19 @@ pub fn defer_compilation(
         idx: jit.get_insn_idx(),
     };
 
-    // Likely a stub due to the increased chain depth
-    let target0_address = branch.set_target(0, blockid, &next_ctx, ocb);
+    // Likely a stub since the context is marked as deferred().
+    let dst_addr = branch.set_target(0, blockid, &next_ctx, jit).ok_or(())?;
+
+    // Pad the block if it has the potential to be invalidated. This must be
+    // done before gen_fn() in case the jump is overwritten by a fallthrough.
+    if jit.block_entry_exit.is_some() {
+        asm.pad_inval_patch();
+    }
 
     // Call the branch generation function
-    asm.comment("defer_compilation");
+    asm_comment!(asm, "defer_compilation");
     asm.mark_branch_start(&branch);
-    if let Some(dst_addr) = target0_address {
-        branch.gen_fn.call(asm, Target::CodePtr(dst_addr), None);
-    }
+    branch.gen_fn.call(asm, Target::CodePtr(dst_addr), None);
     asm.mark_branch_end(&branch);
 
     // If the block we're deferring from is empty
@@ -2854,6 +3997,8 @@ pub fn defer_compilation(
     }
 
     incr_counter!(defer_count);
+
+    Ok(())
 }
 
 /// Remove a block from the live control flow graph.
@@ -2886,7 +4031,7 @@ unsafe fn remove_from_graph(blockref: BlockRef) {
     }
 
     // For each outgoing branch
-    for out_branchref in block.outgoing.iter() {
+    block.outgoing.for_each(|out_branchref| {
         let out_branch = unsafe { out_branchref.as_ref() };
         // For each successor block
         for out_target in out_branch.targets.iter() {
@@ -2902,16 +4047,16 @@ unsafe fn remove_from_graph(blockref: BlockRef) {
                 // Temporarily move out of succ_block.incoming.
                 let succ_incoming = succ_block.incoming.0.take();
                 let mut succ_incoming = succ_incoming.into_vec();
-                succ_incoming.retain(|branch| branch != out_branchref);
+                succ_incoming.retain(|branch| *branch != out_branchref);
                 succ_block.incoming.0.set(succ_incoming.into_boxed_slice()); // allocs. Rely on oom=abort
             }
         }
-    }
+    });
 }
 
 /// Tear down a block and deallocate it.
 /// Caller has to ensure that the code tracked by the block is not
-/// running, as running code may hit [branch_stub_hit] who exepcts
+/// running, as running code may hit [branch_stub_hit] who expects
 /// [Branch] to be live.
 ///
 /// We currently ensure this through the `jit_cont` system in cont.c
@@ -2940,7 +4085,7 @@ pub unsafe fn free_block(blockref: BlockRef, graph_intact: bool) {
 /// Caller must ensure that we have unique ownership for the referent block
 unsafe fn dealloc_block(blockref: BlockRef) {
     unsafe {
-        for outgoing in blockref.as_ref().outgoing.iter() {
+        for outgoing in blockref.as_ref().outgoing.0.take().iter() {
             // this Box::from_raw matches the Box::into_raw from PendingBranch::into_branch
             mem::drop(Box::from_raw(outgoing.as_ptr()));
         }
@@ -3016,16 +4161,17 @@ pub fn invalidate_block_version(blockref: &BlockRef) {
             let cur_dropped_bytes = cb.has_dropped_bytes();
             cb.set_write_ptr(block_start);
 
-            let mut asm = Assembler::new();
+            let mut asm = Assembler::new_without_iseq();
             asm.jmp(block_entry_exit.as_side_exit());
             cb.set_dropped_bytes(false);
-            asm.compile(&mut cb, Some(ocb));
+            asm.compile(&mut cb, Some(ocb)).expect("can rewrite existing code");
 
             assert!(
                 cb.get_write_ptr() <= block_end,
-                "invalidation wrote past end of block (code_size: {:?}, new_size: {})",
+                "invalidation wrote past end of block (code_size: {:?}, new_size: {}, start_addr: {:?})",
                 block.code_size(),
-                cb.get_write_ptr().into_i64() - block_start.into_i64(),
+                cb.get_write_ptr().as_offset() - block_start.as_offset(),
+                block.start_addr.raw_ptr(cb),
             );
             cb.set_write_ptr(cur_pos);
             cb.set_dropped_bytes(cur_dropped_bytes);
@@ -3033,7 +4179,23 @@ pub fn invalidate_block_version(blockref: &BlockRef) {
     }
 
     // For each incoming branch
-    for branchref in block.incoming.0.take().iter() {
+    let mut incoming_branches = block.incoming.0.take();
+
+    // An adjacent branch will write into the start of the block being invalidated, possibly
+    // overwriting the block's exit. If we run out of memory after doing this, any subsequent
+    // incoming branches we rewrite won't be able use the block's exit as a fallback when they
+    // are unable to generate a stub. To avoid this, if there's an incoming branch that's
+    // adjacent to the invalidated block, make sure we process it last.
+    let adjacent_branch_idx = incoming_branches.iter().position(|branchref| {
+        let branch = unsafe { branchref.as_ref() };
+        let target_next = block.start_addr == branch.end_addr.get();
+        target_next
+    });
+    if let Some(adjacent_branch_idx) = adjacent_branch_idx {
+        incoming_branches.swap(adjacent_branch_idx, incoming_branches.len() - 1)
+    }
+
+    for (i, branchref) in incoming_branches.iter().enumerate() {
         let branch = unsafe { branchref.as_ref() };
         let target_idx = if branch.get_target_address(0) == Some(block_start) {
             0
@@ -3052,7 +4214,7 @@ pub fn invalidate_block_version(blockref: &BlockRef) {
         }
 
         // Create a stub for this branch target
-        let stub_addr = gen_branch_stub(&block.ctx, ocb, branchref.as_ptr() as usize, target_idx as u32);
+        let stub_addr = gen_branch_stub(block.ctx, block.iseq.get(), ocb, branchref.as_ptr() as usize, target_idx as u32);
 
         // In case we were unable to generate a stub (e.g. OOM). Use the block's
         // exit instead of a stub for the block. It's important that we
@@ -3066,17 +4228,25 @@ pub fn invalidate_block_version(blockref: &BlockRef) {
             address: Some(stub_addr),
             iseq: block.iseq.clone(),
             iseq_idx: block.iseq_range.start,
-            ctx: block.ctx.clone(),
+            ctx: block.ctx,
         })))));
 
         // Check if the invalidated block immediately follows
         let target_next = block.start_addr == branch.end_addr.get();
 
         if target_next {
-            // The new block will no longer be adjacent.
-            // Note that we could be enlarging the branch and writing into the
-            // start of the block being invalidated.
-            branch.gen_fn.set_shape(BranchShape::Default);
+            if stub_addr != block.start_addr {
+                // The new block will no longer be adjacent.
+                // Note that we could be enlarging the branch and writing into the
+                // start of the block being invalidated.
+                branch.gen_fn.set_shape(BranchShape::Default);
+            } else {
+                // The branch target is still adjacent, so the branch must remain
+                // a fallthrough so we don't overwrite the target with a jump.
+                //
+                // This can happen if we're unable to generate a stub and the
+                // target block also exits on entry (block_start == block_entry_exit).
+            }
         }
 
         // Rewrite the branch with the new jump target address
@@ -3086,10 +4256,15 @@ pub fn invalidate_block_version(blockref: &BlockRef) {
         if target_next && branch.end_addr > block.end_addr {
             panic!("yjit invalidate rewrote branch past end of invalidated block: {:?} (code_size: {})", branch, block.code_size());
         }
+        let is_last_incoming_branch = i == incoming_branches.len() - 1;
+        if target_next && branch.end_addr.get() > block_entry_exit && !is_last_incoming_branch {
+            // We might still need to jump to this exit if we run out of memory when rewriting another incoming branch.
+            panic!("yjit invalidate rewrote branch over exit of invalidated block: {:?}", branch);
+        }
         if !target_next && branch.code_size() > old_branch_size {
             panic!(
                 "invalidated branch grew in size (start_addr: {:?}, old_size: {}, new_size: {})",
-                branch.start_addr.raw_ptr(), old_branch_size, branch.code_size()
+                branch.start_addr.raw_ptr(cb), old_branch_size, branch.code_size()
             );
         }
     }
@@ -3131,9 +4306,9 @@ pub fn invalidate_block_version(blockref: &BlockRef) {
 // invalidated branch pointers. Example:
 //   def foo(n)
 //     if n == 2
-//       # 1.times{} to use a cfunc to avoid exiting from the
-//       # frame which will use the retained return address
-//       return 1.times { Object.define_method(:foo) {} }
+//       # 1.times.each to create a cfunc frame to preserve the JIT frame
+//       # which will return to a stub housed in an invalidated block
+//       return 1.times.each { Object.define_method(:foo) {} }
 //     end
 //
 //     foo(n + 1)
@@ -3181,28 +4356,37 @@ mod tests {
     use crate::core::*;
 
     #[test]
-    fn tempmapping_size() {
-        assert_eq!(mem::size_of::<TempMapping>(), 1);
+    fn type_size() {
+        // Check that we can store types in 4 bits,
+        // and all local types in 32 bits
+        assert_eq!(mem::size_of::<Type>(), 1);
+        assert!(Type::BlockParamProxy as usize <= 0b1111);
+        assert!(MAX_CTX_LOCALS * 4 <= 32);
     }
 
     #[test]
-    fn tempmapping() {
-        let t = TempMapping::map_to_stack(Type::Unknown);
-        assert_eq!(t.get_kind(), MapToStack);
-        assert_eq!(t.get_type(), Type::Unknown);
-
-        let t = TempMapping::map_to_stack(Type::TString);
-        assert_eq!(t.get_kind(), MapToStack);
-        assert_eq!(t.get_type(), Type::TString);
+    fn local_types() {
+        let mut ctx = Context::default();
+
+        for i in 0..MAX_CTX_LOCALS {
+            ctx.set_local_type(i, Type::Fixnum);
+            assert_eq!(ctx.get_local_type(i), Type::Fixnum);
+            ctx.set_local_type(i, Type::BlockParamProxy);
+            assert_eq!(ctx.get_local_type(i), Type::BlockParamProxy);
+        }
 
-        let t = TempMapping::map_to_local(7);
-        assert_eq!(t.get_kind(), MapToLocal);
-        assert_eq!(t.get_local_idx(), 7);
-    }
+        ctx.set_local_type(0, Type::Fixnum);
+        ctx.clear_local_types();
+        assert!(ctx.get_local_type(0) == Type::Unknown);
 
-    #[test]
-    fn context_size() {
-        assert_eq!(mem::size_of::<Context>(), 21);
+        // Make sure we don't accidentally set bits incorrectly
+        let mut ctx = Context::default();
+        ctx.set_local_type(0, Type::Fixnum);
+        assert_eq!(ctx.get_local_type(0), Type::Fixnum);
+        ctx.set_local_type(2, Type::Fixnum);
+        ctx.set_local_type(1, Type::BlockParamProxy);
+        assert_eq!(ctx.get_local_type(0), Type::Fixnum);
+        assert_eq!(ctx.get_local_type(2), Type::Fixnum);
     }
 
     #[test]
@@ -3221,30 +4405,30 @@ mod tests {
     }
 
     #[test]
-    fn reg_temps() {
-        let mut reg_temps = RegTemps(0);
+    fn reg_mapping() {
+        let mut reg_mapping = RegMapping([None, None, None, None, None]);
 
         // 0 means every slot is not spilled
-        for stack_idx in 0..MAX_REG_TEMPS {
-            assert_eq!(reg_temps.get(stack_idx), false);
+        for stack_idx in 0..MAX_CTX_TEMPS as u8 {
+            assert_eq!(reg_mapping.get_reg(RegOpnd::Stack(stack_idx)), None);
         }
 
-        // Set 0, 2, 7
-        reg_temps.set(0, true);
-        reg_temps.set(2, true);
-        reg_temps.set(3, true);
-        reg_temps.set(3, false);
-        reg_temps.set(7, true);
+        // Set 0, 2, 6 (RegMapping: [Some(0), Some(6), Some(2), None, None])
+        reg_mapping.alloc_reg(RegOpnd::Stack(0));
+        reg_mapping.alloc_reg(RegOpnd::Stack(2));
+        reg_mapping.alloc_reg(RegOpnd::Stack(3));
+        reg_mapping.dealloc_reg(RegOpnd::Stack(3));
+        reg_mapping.alloc_reg(RegOpnd::Stack(6));
 
         // Get 0..8
-        assert_eq!(reg_temps.get(0), true);
-        assert_eq!(reg_temps.get(1), false);
-        assert_eq!(reg_temps.get(2), true);
-        assert_eq!(reg_temps.get(3), false);
-        assert_eq!(reg_temps.get(4), false);
-        assert_eq!(reg_temps.get(5), false);
-        assert_eq!(reg_temps.get(6), false);
-        assert_eq!(reg_temps.get(7), true);
+        assert_eq!(reg_mapping.get_reg(RegOpnd::Stack(0)), Some(0));
+        assert_eq!(reg_mapping.get_reg(RegOpnd::Stack(1)), None);
+        assert_eq!(reg_mapping.get_reg(RegOpnd::Stack(2)), Some(2));
+        assert_eq!(reg_mapping.get_reg(RegOpnd::Stack(3)), None);
+        assert_eq!(reg_mapping.get_reg(RegOpnd::Stack(4)), None);
+        assert_eq!(reg_mapping.get_reg(RegOpnd::Stack(5)), None);
+        assert_eq!(reg_mapping.get_reg(RegOpnd::Stack(6)), Some(1));
+        assert_eq!(reg_mapping.get_reg(RegOpnd::Stack(7)), None);
     }
 
     #[test]
@@ -3253,7 +4437,7 @@ mod tests {
         assert_eq!(Context::default().diff(&Context::default()), TypeDiff::Compatible(0));
 
         // Try pushing an operand and getting its type
-        let mut asm = Assembler::new();
+        let mut asm = Assembler::new(0);
         asm.stack_push(Type::Fixnum);
         let top_type = asm.ctx.get_opnd_type(StackOpnd(0));
         assert!(top_type == Type::Fixnum);
@@ -3261,6 +4445,60 @@ mod tests {
         // TODO: write more tests for Context type diff
     }
 
+    #[test]
+    fn context_upgrade_local() {
+        let mut asm = Assembler::new(0);
+        asm.stack_push_local(0);
+        asm.ctx.upgrade_opnd_type(StackOpnd(0), Type::Nil);
+        assert_eq!(Type::Nil, asm.ctx.get_opnd_type(StackOpnd(0)));
+    }
+
+    #[test]
+    fn context_chain_depth() {
+        let mut ctx = Context::default();
+        assert_eq!(ctx.get_chain_depth(), 0);
+        assert_eq!(ctx.is_return_landing(), false);
+        assert_eq!(ctx.is_deferred(), false);
+
+        for _ in 0..5 {
+            ctx.increment_chain_depth();
+        }
+        assert_eq!(ctx.get_chain_depth(), 5);
+
+        ctx.set_as_return_landing();
+        assert_eq!(ctx.is_return_landing(), true);
+
+        ctx.clear_return_landing();
+        assert_eq!(ctx.is_return_landing(), false);
+
+        ctx.mark_as_deferred();
+        assert_eq!(ctx.is_deferred(), true);
+
+        ctx.reset_chain_depth_and_defer();
+        assert_eq!(ctx.get_chain_depth(), 0);
+        assert_eq!(ctx.is_deferred(), false);
+    }
+
+    #[test]
+    fn shift_stack_for_send() {
+        let mut asm = Assembler::new(0);
+
+        // Push values to simulate send(:name, arg) with 6 items already on-stack
+        for _ in 0..6 {
+            asm.stack_push(Type::Fixnum);
+        }
+        asm.stack_push(Type::Unknown);
+        asm.stack_push(Type::ImmSymbol);
+        asm.stack_push(Type::Unknown);
+
+        // This method takes argc of the sendee, not argc of send
+        asm.shift_stack(1);
+
+        // The symbol should be gone
+        assert_eq!(Type::Unknown, asm.ctx.get_opnd_type(StackOpnd(0)));
+        assert_eq!(Type::Unknown, asm.ctx.get_opnd_type(StackOpnd(1)));
+    }
+
     #[test]
     fn test_miri_ref_unchecked() {
         let blockid = BlockId {
@@ -3268,8 +4506,9 @@ mod tests {
             idx: 0,
         };
         let cb = CodeBlock::new_dummy(1024);
+        let mut ocb = OutlinedCb::wrap(CodeBlock::new_dummy(1024));
         let dumm_addr = cb.get_write_ptr();
-        let block = JITState::new(blockid, Context::default(), dumm_addr, ptr::null())
+        let block = JITState::new(blockid, Context::default(), dumm_addr, ptr::null(), &mut ocb, true)
             .into_block(0, dumm_addr, dumm_addr, vec![]);
         let _dropper = BlockDropper(block);
 
@@ -3277,14 +4516,14 @@ mod tests {
         // we're always working with &Branch (a shared reference to a Branch).
         let branch: &Branch = &Branch {
             gen_fn: BranchGenFn::JZToTarget0,
-            block,
+            block: Cell::new(block),
             start_addr: dumm_addr,
             end_addr: Cell::new(dumm_addr),
             targets: [Cell::new(None), Cell::new(Some(Box::new(BranchTarget::Stub(Box::new(BranchStub {
                 iseq: Cell::new(ptr::null()),
                 iseq_idx: 0,
                 address: None,
-                ctx: Context::default(),
+                ctx: 0,
             })))))]
         };
         // For easier soundness reasoning, make sure the reference returned does not out live the
@@ -3317,7 +4556,7 @@ mod tests {
             iseq: Cell::new(ptr::null()),
             iseq_idx: 0,
             address: None,
-            ctx: Context::default(),
+            ctx: 0,
         })))));
         // Invalid ISeq; we never dereference it.
         let secret_iseq = NonNull::<rb_iseq_t>::dangling().as_ptr();
diff --git a/yjit/src/cruby.rs b/yjit/src/cruby.rs
index a8234e744aeae8..725a29fa70cf23 100644
--- a/yjit/src/cruby.rs
+++ b/yjit/src/cruby.rs
@@ -83,7 +83,8 @@
 #![allow(non_upper_case_globals)]
 
 use std::convert::From;
-use std::ffi::CString;
+use std::ffi::{CString, CStr};
+use std::fmt::{Debug, Formatter};
 use std::os::raw::{c_char, c_int, c_uint};
 use std::panic::{catch_unwind, UnwindSafe};
 
@@ -107,13 +108,26 @@ pub use autogened::*;
 // TODO: For #defines that affect memory layout, we need to check for them
 // on build and fail if they're wrong. e.g. USE_FLONUM *must* be true.
 
-// These are functions we expose from vm_insnhelper.c, not in any header.
+// These are functions we expose from C files, not in any header.
 // Parsing it would result in a lot of duplicate definitions.
 // Use bindgen for functions that are defined in headers or in yjit.c.
 #[cfg_attr(test, allow(unused))] // We don't link against C code when testing
 extern "C" {
+    pub fn rb_check_overloaded_cme(
+        me: *const rb_callable_method_entry_t,
+        ci: *const rb_callinfo,
+    ) -> *const rb_callable_method_entry_t;
+
+    // Floats within range will be encoded without creating objects in the heap.
+    // (Range is 0x3000000000000001 to 0x4fffffffffffffff (1.7272337110188893E-77 to 2.3158417847463237E+77).
+    pub fn rb_float_new(d: f64) -> VALUE;
+
+    pub fn rb_hash_empty_p(hash: VALUE) -> VALUE;
+    pub fn rb_yjit_str_concat_codepoint(str: VALUE, codepoint: VALUE);
+    pub fn rb_str_setbyte(str: VALUE, index: VALUE, value: VALUE) -> VALUE;
     pub fn rb_vm_splat_array(flag: VALUE, ary: VALUE) -> VALUE;
     pub fn rb_vm_concat_array(ary1: VALUE, ary2st: VALUE) -> VALUE;
+    pub fn rb_vm_concat_to_array(ary1: VALUE, ary2st: VALUE) -> VALUE;
     pub fn rb_vm_defined(
         ec: EcPtr,
         reg_cfp: CfpPtr,
@@ -135,13 +149,12 @@ extern "C" {
         ic: ICVARC,
     ) -> VALUE;
     pub fn rb_vm_ic_hit_p(ic: IC, reg_ep: *const VALUE) -> bool;
-    pub fn rb_str_bytesize(str: VALUE) -> VALUE;
+    pub fn rb_vm_stack_canary() -> VALUE;
+    pub fn rb_vm_push_cfunc_frame(cme: *const rb_callable_method_entry_t, recv_idx: c_int);
 }
 
 // Renames
 pub use rb_insn_name as raw_insn_name;
-pub use rb_insn_len as raw_insn_len;
-pub use rb_yarv_class_of as CLASS_OF;
 pub use rb_get_ec_cfp as get_ec_cfp;
 pub use rb_get_cfp_iseq as get_cfp_iseq;
 pub use rb_get_cfp_pc as get_cfp_pc;
@@ -164,11 +177,11 @@ pub use rb_iseq_encoded_size as get_iseq_encoded_size;
 pub use rb_get_iseq_body_local_iseq as get_iseq_body_local_iseq;
 pub use rb_get_iseq_body_iseq_encoded as get_iseq_body_iseq_encoded;
 pub use rb_get_iseq_body_stack_max as get_iseq_body_stack_max;
+pub use rb_get_iseq_body_type as get_iseq_body_type;
 pub use rb_get_iseq_flags_has_lead as get_iseq_flags_has_lead;
 pub use rb_get_iseq_flags_has_opt as get_iseq_flags_has_opt;
 pub use rb_get_iseq_flags_has_kw as get_iseq_flags_has_kw;
 pub use rb_get_iseq_flags_has_rest as get_iseq_flags_has_rest;
-pub use rb_get_iseq_flags_ruby2_keywords as get_iseq_flags_ruby2_keywords;
 pub use rb_get_iseq_flags_has_post as get_iseq_flags_has_post;
 pub use rb_get_iseq_flags_has_kwrest as get_iseq_flags_has_kwrest;
 pub use rb_get_iseq_flags_has_block as get_iseq_flags_has_block;
@@ -187,7 +200,6 @@ pub use rb_yarv_str_eql_internal as rb_str_eql_internal;
 pub use rb_yarv_ary_entry_internal as rb_ary_entry_internal;
 pub use rb_yjit_fix_div_fix as rb_fix_div_fix;
 pub use rb_yjit_fix_mod_fix as rb_fix_mod_fix;
-pub use rb_yjit_fix_mul_fix as rb_fix_mul_fix;
 pub use rb_FL_TEST as FL_TEST;
 pub use rb_FL_TEST_RAW as FL_TEST_RAW;
 pub use rb_RB_TYPE_P as RB_TYPE_P;
@@ -203,8 +215,6 @@ pub use rb_RCLASS_ORIGIN as RCLASS_ORIGIN;
 
 /// Helper so we can get a Rust string for insn_name()
 pub fn insn_name(opcode: usize) -> String {
-    use std::ffi::CStr;
-
     unsafe {
         // Look up Ruby's NULL-terminated insn name string
         let op_name = raw_insn_name(VALUE(opcode));
@@ -224,7 +234,7 @@ pub fn insn_len(opcode: usize) -> u32 {
 
     #[cfg(not(test))]
     unsafe {
-        raw_insn_len(VALUE(opcode)).try_into().unwrap()
+        rb_insn_len(VALUE(opcode)).try_into().unwrap()
     }
 }
 
@@ -253,6 +263,24 @@ pub fn iseq_pc_to_insn_idx(iseq: IseqPtr, pc: *mut VALUE) -> Option<u16> {
     unsafe { pc.offset_from(pc_zero) }.try_into().ok()
 }
 
+/// Given an ISEQ pointer and an instruction index, return an opcode.
+pub fn iseq_opcode_at_idx(iseq: IseqPtr, insn_idx: u32) -> u32 {
+    let pc = unsafe { rb_iseq_pc_at_idx(iseq, insn_idx) };
+    unsafe { rb_iseq_opcode_at_pc(iseq, pc) as u32 }
+}
+
+/// Return a poison value to be set above the stack top to verify leafness.
+#[cfg(not(test))]
+pub fn vm_stack_canary() -> u64 {
+    unsafe { rb_vm_stack_canary() }.as_u64()
+}
+
+/// Avoid linking the C function in `cargo test`
+#[cfg(test)]
+pub fn vm_stack_canary() -> u64 {
+    0
+}
+
 /// Opaque execution-context type from vm_core.h
 #[repr(C)]
 pub struct rb_execution_context_struct {
@@ -287,13 +315,6 @@ pub struct rb_callcache {
     _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
 }
 
-/// Opaque call-info type from vm_callinfo.h
-#[repr(C)]
-pub struct rb_callinfo_kwarg {
-    _data: [u8; 0],
-    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
-}
-
 /// Opaque control_frame (CFP) struct from vm_core.h
 #[repr(C)]
 pub struct rb_control_frame_struct {
@@ -377,6 +398,11 @@ impl VALUE {
         }
     }
 
+    /// Returns true if the value is T_HASH
+    pub fn hash_p(self) -> bool {
+        !self.special_const_p() && self.builtin_type() == RUBY_T_HASH
+    }
+
     /// Returns true or false depending on whether the value is nil
     pub fn nil_p(self) -> bool {
         self == Qnil
@@ -401,7 +427,13 @@ impl VALUE {
     }
 
     pub fn class_of(self) -> VALUE {
-        unsafe { CLASS_OF(self) }
+        if !self.special_const_p() {
+            let builtin_type = self.builtin_type();
+            assert_ne!(builtin_type, RUBY_T_NONE, "YJIT should only see live objects");
+            assert_ne!(builtin_type, RUBY_T_MOVED, "YJIT should only see live objects");
+        }
+
+        unsafe { rb_yarv_class_of(self) }
     }
 
     pub fn is_frozen(self) -> bool {
@@ -409,23 +441,11 @@ impl VALUE {
     }
 
     pub fn shape_too_complex(self) -> bool {
-        unsafe { rb_shape_obj_too_complex(self) }
+        unsafe { rb_yjit_shape_obj_too_complex_p(self) }
     }
 
     pub fn shape_id_of(self) -> u32 {
-        unsafe { rb_shape_get_shape_id(self) }
-    }
-
-    pub fn shape_of(self) -> *mut rb_shape {
-        unsafe {
-            let shape = rb_shape_get_shape_by_id(self.shape_id_of());
-
-            if shape.is_null() {
-                panic!("Shape should not be null");
-            } else {
-                shape
-            }
-        }
+        unsafe { rb_obj_shape_id(self) }
     }
 
     pub fn embedded_p(self) -> bool {
@@ -510,9 +530,7 @@ impl VALUE {
 
         ptr
     }
-}
 
-impl VALUE {
     pub fn fixnum_from_usize(item: usize) -> Self {
         assert!(item <= (RUBY_FIXNUM_MAX as usize)); // An unsigned will always be greater than RUBY_FIXNUM_MIN
         let k: usize = item.wrapping_add(item.wrapping_add(1));
@@ -534,6 +552,18 @@ impl From<*const rb_callable_method_entry_t> for VALUE {
     }
 }
 
+impl From<&str> for VALUE {
+    fn from(value: &str) -> Self {
+        rust_str_to_ruby(value)
+    }
+}
+
+impl From<String> for VALUE {
+    fn from(value: String) -> Self {
+        rust_str_to_ruby(&value)
+    }
+}
+
 impl From<VALUE> for u64 {
     fn from(value: VALUE) -> Self {
         let VALUE(uimm) = value;
@@ -565,7 +595,6 @@ impl From<VALUE> for u16 {
 }
 
 /// Produce a Ruby string from a Rust string slice
-#[cfg(feature = "disasm")]
 pub fn rust_str_to_ruby(str: &str) -> VALUE {
     unsafe { rb_utf8_str_new(str.as_ptr() as *const _, str.len() as i64) }
 }
@@ -578,11 +607,9 @@ pub fn rust_str_to_sym(str: &str) -> VALUE {
 }
 
 /// Produce an owned Rust String from a C char pointer
-#[cfg(feature = "disasm")]
 pub fn cstr_to_rust_string(c_char_ptr: *const c_char) -> Option<String> {
     assert!(c_char_ptr != std::ptr::null());
 
-    use std::ffi::CStr;
     let c_str: &CStr = unsafe { CStr::from_ptr(c_char_ptr) };
 
     match c_str.to_str() {
@@ -594,17 +621,26 @@ pub fn cstr_to_rust_string(c_char_ptr: *const c_char) -> Option<String> {
 /// A location in Rust code for integrating with debugging facilities defined in C.
 /// Use the [src_loc!] macro to crate an instance.
 pub struct SourceLocation {
-    pub file: CString,
+    pub file: &'static CStr,
     pub line: c_int,
 }
 
+impl Debug for SourceLocation {
+    fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
+        f.write_fmt(format_args!("{}:{}", self.file.to_string_lossy(), self.line))
+    }
+}
+
 /// Make a [SourceLocation] at the current spot.
 macro_rules! src_loc {
     () => {
-        // NOTE(alan): `CString::new` allocates so we might want to limit this to debug builds.
-        $crate::cruby::SourceLocation {
-            file: std::ffi::CString::new(file!()).unwrap(), // ASCII source file paths
-            line: line!().try_into().unwrap(),              // not that many lines
+        {
+            // Nul-terminated string with static lifetime, make a CStr out of it safely.
+            let file: &'static str = concat!(file!(), '\0');
+            $crate::cruby::SourceLocation {
+                file: unsafe { std::ffi::CStr::from_ptr(file.as_ptr().cast()) },
+                line: line!().try_into().unwrap(),
+            }
         }
     };
 }
@@ -642,17 +678,16 @@ where
         Err(_) => {
             // Theoretically we can recover from some of these panics,
             // but it's too late if the unwind reaches here.
-            use std::{process, str};
 
             let _ = catch_unwind(|| {
                 // IO functions can panic too.
                 eprintln!(
                     "YJIT panicked while holding VM lock acquired at {}:{}. Aborting...",
-                    str::from_utf8(loc.file.as_bytes()).unwrap_or("<not utf8>"),
+                    loc.file.to_string_lossy(),
                     line,
                 );
             });
-            process::abort();
+            std::process::abort();
         }
     };
 
@@ -686,8 +721,10 @@ mod manual_defs {
     pub const RUBY_FIXNUM_MAX: isize = RUBY_LONG_MAX / 2;
 
     // From vm_callinfo.h - uses calculation that seems to confuse bindgen
+    pub const VM_CALL_ARGS_SIMPLE: u32 = 1 << VM_CALL_ARGS_SIMPLE_bit;
     pub const VM_CALL_ARGS_SPLAT: u32 = 1 << VM_CALL_ARGS_SPLAT_bit;
     pub const VM_CALL_ARGS_BLOCKARG: u32 = 1 << VM_CALL_ARGS_BLOCKARG_bit;
+    pub const VM_CALL_FORWARDING: u32 = 1 << VM_CALL_FORWARDING_bit;
     pub const VM_CALL_FCALL: u32 = 1 << VM_CALL_FCALL_bit;
     pub const VM_CALL_KWARG: u32 = 1 << VM_CALL_KWARG_bit;
     pub const VM_CALL_KW_SPLAT: u32 = 1 << VM_CALL_KW_SPLAT_bit;
@@ -712,6 +749,9 @@ mod manual_defs {
     pub const RUBY_OFFSET_RSTRUCT_AS_HEAP_PTR: i32 = 24; // struct RStruct, subfield "as.heap.ptr"
     pub const RUBY_OFFSET_RSTRUCT_AS_ARY: i32 = 16; // struct RStruct, subfield "as.ary"
 
+    pub const RUBY_OFFSET_RSTRING_AS_HEAP_PTR: i32 = 24; // struct RString, subfield "as.heap.ptr"
+    pub const RUBY_OFFSET_RSTRING_AS_ARY: i32 = 24; // struct RString, subfield "as.embed.ary"
+
     // Constants from rb_control_frame_t vm_core.h
     pub const RUBY_OFFSET_CFP_PC: i32 = 0;
     pub const RUBY_OFFSET_CFP_SP: i32 = 8;
@@ -736,3 +776,51 @@ mod manual_defs {
     pub const RUBY_OFFSET_ICE_VALUE: i32 = 8;
 }
 pub use manual_defs::*;
+
+/// Interned ID values for Ruby symbols and method names.
+/// See [type@crate::cruby::ID] and usages outside of YJIT.
+pub(crate) mod ids {
+    use std::sync::atomic::AtomicU64;
+    /// Globals to cache IDs on boot. Atomic to use with relaxed ordering
+    /// so reads can happen without `unsafe`. Synchronization done through
+    /// the VM lock.
+    macro_rules! def_ids {
+        ($(name: $ident:ident content: $str:literal)*) => {
+            $(
+                #[doc = concat!("[type@crate::cruby::ID] for `", stringify!($str), "`")]
+                pub static $ident: AtomicU64 = AtomicU64::new(0);
+            )*
+
+            pub(crate) fn init() {
+                $(
+                    let content = &$str;
+                    let ptr: *const u8 = content.as_ptr();
+
+                    // Lookup and cache each ID
+                    $ident.store(
+                        unsafe { $crate::cruby::rb_intern2(ptr.cast(), content.len() as _) },
+                        std::sync::atomic::Ordering::Relaxed
+                    );
+                )*
+
+            }
+        }
+    }
+
+    def_ids! {
+        name: NULL               content: b""
+        name: respond_to_missing content: b"respond_to_missing?"
+        name: to_ary             content: b"to_ary"
+        name: to_s               content: b"to_s"
+        name: eq                 content: b"=="
+        name: include_p          content: b"include?"
+    }
+}
+
+/// Get an CRuby `ID` to an interned string, e.g. a particular method name.
+macro_rules! ID {
+    ($id_name:ident) => {
+        $crate::cruby::ids::$id_name.load(std::sync::atomic::Ordering::Relaxed)
+    }
+}
+pub(crate) use ID;
diff --git a/yjit/src/cruby_bindings.inc.rs b/yjit/src/cruby_bindings.inc.rs
index ccf5b530d6732e..e36b6f9f5f73c7 100644
--- a/yjit/src/cruby_bindings.inc.rs
+++ b/yjit/src/cruby_bindings.inc.rs
@@ -1,4 +1,4 @@
-/* automatically generated by rust-bindgen 0.63.0 */
+/* automatically generated by rust-bindgen 0.70.1 */
 
 #[repr(C)]
 #[derive(Copy, Clone, Debug, Default, Eq, Hash, Ord, PartialEq, PartialOrd)]
@@ -81,6 +81,36 @@ where
     }
 }
 #[repr(C)]
+#[derive(Default)]
+pub struct __IncompleteArrayField<T>(::std::marker::PhantomData<T>, [T; 0]);
+impl<T> __IncompleteArrayField<T> {
+    #[inline]
+    pub const fn new() -> Self {
+        __IncompleteArrayField(::std::marker::PhantomData, [])
+    }
+    #[inline]
+    pub fn as_ptr(&self) -> *const T {
+        self as *const _ as *const T
+    }
+    #[inline]
+    pub fn as_mut_ptr(&mut self) -> *mut T {
+        self as *mut _ as *mut T
+    }
+    #[inline]
+    pub unsafe fn as_slice(&self, len: usize) -> &[T] {
+        ::std::slice::from_raw_parts(self.as_ptr(), len)
+    }
+    #[inline]
+    pub unsafe fn as_mut_slice(&mut self, len: usize) -> &mut [T] {
+        ::std::slice::from_raw_parts_mut(self.as_mut_ptr(), len)
+    }
+}
+impl<T> ::std::fmt::Debug for __IncompleteArrayField<T> {
+    fn fmt(&self, fmt: &mut ::std::fmt::Formatter<'_>) -> ::std::fmt::Result {
+        fmt.write_str("__IncompleteArrayField")
+    }
+}
+#[repr(C)]
 pub struct __BindgenUnionField<T>(::std::marker::PhantomData<T>);
 impl<T> __BindgenUnionField<T> {
     #[inline]
@@ -105,7 +135,7 @@ impl<T> ::std::default::Default for __BindgenUnionField<T> {
 impl<T> ::std::clone::Clone for __BindgenUnionField<T> {
     #[inline]
     fn clone(&self) -> Self {
-        Self::new()
+        *self
     }
 }
 impl<T> ::std::marker::Copy for __BindgenUnionField<T> {}
@@ -141,7 +171,6 @@ pub const VM_ENV_DATA_INDEX_SPECVAL: i32 = -1;
 pub const VM_ENV_DATA_INDEX_FLAGS: u32 = 0;
 pub const VM_BLOCK_HANDLER_NONE: u32 = 0;
 pub const SHAPE_ID_NUM_BITS: u32 = 32;
-pub const OBJ_TOO_COMPLEX_SHAPE_ID: u32 = 11;
 pub type ID = ::std::os::raw::c_ulong;
 pub type rb_alloc_func_t = ::std::option::Option<unsafe extern "C" fn(klass: VALUE) -> VALUE>;
 pub const RUBY_Qfalse: ruby_special_consts = 0;
@@ -196,10 +225,11 @@ pub const RUBY_FL_PROMOTED: ruby_fl_type = 32;
 pub const RUBY_FL_UNUSED6: ruby_fl_type = 64;
 pub const RUBY_FL_FINALIZE: ruby_fl_type = 128;
 pub const RUBY_FL_TAINT: ruby_fl_type = 0;
+pub const RUBY_FL_EXIVAR: ruby_fl_type = 0;
 pub const RUBY_FL_SHAREABLE: ruby_fl_type = 256;
 pub const RUBY_FL_UNTRUSTED: ruby_fl_type = 0;
-pub const RUBY_FL_SEEN_OBJ_ID: ruby_fl_type = 512;
-pub const RUBY_FL_EXIVAR: ruby_fl_type = 1024;
+pub const RUBY_FL_UNUSED9: ruby_fl_type = 512;
+pub const RUBY_FL_UNUSED10: ruby_fl_type = 1024;
 pub const RUBY_FL_FREEZE: ruby_fl_type = 2048;
 pub const RUBY_FL_USER0: ruby_fl_type = 4096;
 pub const RUBY_FL_USER1: ruby_fl_type = 8192;
@@ -221,14 +251,41 @@ pub const RUBY_FL_USER16: ruby_fl_type = 268435456;
 pub const RUBY_FL_USER17: ruby_fl_type = 536870912;
 pub const RUBY_FL_USER18: ruby_fl_type = 1073741824;
 pub const RUBY_FL_USER19: ruby_fl_type = -2147483648;
-pub const RUBY_ELTS_SHARED: ruby_fl_type = 16384;
-pub const RUBY_FL_SINGLETON: ruby_fl_type = 4096;
+pub const RUBY_ELTS_SHARED: ruby_fl_type = 4096;
+pub const RUBY_FL_SINGLETON: ruby_fl_type = 8192;
 pub type ruby_fl_type = i32;
 pub const RSTRING_NOEMBED: ruby_rstring_flags = 8192;
 pub const RSTRING_FSTR: ruby_rstring_flags = 536870912;
 pub type ruby_rstring_flags = u32;
 pub type st_data_t = ::std::os::raw::c_ulong;
 pub type st_index_t = st_data_t;
+#[repr(C)]
+#[derive(Debug, Copy, Clone)]
+pub struct st_hash_type {
+    pub compare: ::std::option::Option<
+        unsafe extern "C" fn(arg1: st_data_t, arg2: st_data_t) -> ::std::os::raw::c_int,
+    >,
+    pub hash: ::std::option::Option<unsafe extern "C" fn(arg1: st_data_t) -> st_index_t>,
+}
+#[repr(C)]
+#[derive(Debug, Copy, Clone)]
+pub struct st_table_entry {
+    _unused: [u8; 0],
+}
+#[repr(C)]
+#[derive(Debug, Copy, Clone)]
+pub struct st_table {
+    pub entry_power: ::std::os::raw::c_uchar,
+    pub bin_power: ::std::os::raw::c_uchar,
+    pub size_ind: ::std::os::raw::c_uchar,
+    pub rebuilds_num: ::std::os::raw::c_uint,
+    pub type_: *const st_hash_type,
+    pub num_entries: st_index_t,
+    pub bins: *mut st_index_t,
+    pub entries_start: st_index_t,
+    pub entries_bound: st_index_t,
+    pub entries: *mut st_table_entry,
+}
 pub const ST_CONTINUE: st_retval = 0;
 pub const ST_STOP: st_retval = 1;
 pub const ST_DELETE: st_retval = 2;
@@ -247,7 +304,7 @@ pub const RARRAY_EMBED_LEN_MASK: ruby_rarray_flags = 4161536;
 pub type ruby_rarray_flags = u32;
 pub const RARRAY_EMBED_LEN_SHIFT: ruby_rarray_consts = 15;
 pub type ruby_rarray_consts = u32;
-pub const RMODULE_IS_REFINEMENT: ruby_rmodule_flags = 32768;
+pub const RMODULE_IS_REFINEMENT: ruby_rmodule_flags = 8192;
 pub type ruby_rmodule_flags = u32;
 pub const ROBJECT_EMBED: ruby_robject_flags = 8192;
 pub type ruby_robject_flags = u32;
@@ -280,219 +337,6 @@ pub const RUBY_ENCINDEX_EUC_JP: ruby_preserved_encindex = 10;
 pub const RUBY_ENCINDEX_Windows_31J: ruby_preserved_encindex = 11;
 pub const RUBY_ENCINDEX_BUILTIN_MAX: ruby_preserved_encindex = 12;
 pub type ruby_preserved_encindex = u32;
-pub const idDot2: ruby_method_ids = 128;
-pub const idDot3: ruby_method_ids = 129;
-pub const idUPlus: ruby_method_ids = 132;
-pub const idUMinus: ruby_method_ids = 133;
-pub const idPow: ruby_method_ids = 134;
-pub const idCmp: ruby_method_ids = 135;
-pub const idPLUS: ruby_method_ids = 43;
-pub const idMINUS: ruby_method_ids = 45;
-pub const idMULT: ruby_method_ids = 42;
-pub const idDIV: ruby_method_ids = 47;
-pub const idMOD: ruby_method_ids = 37;
-pub const idLTLT: ruby_method_ids = 136;
-pub const idGTGT: ruby_method_ids = 137;
-pub const idLT: ruby_method_ids = 60;
-pub const idLE: ruby_method_ids = 138;
-pub const idGT: ruby_method_ids = 62;
-pub const idGE: ruby_method_ids = 139;
-pub const idEq: ruby_method_ids = 140;
-pub const idEqq: ruby_method_ids = 141;
-pub const idNeq: ruby_method_ids = 142;
-pub const idNot: ruby_method_ids = 33;
-pub const idAnd: ruby_method_ids = 38;
-pub const idOr: ruby_method_ids = 124;
-pub const idBackquote: ruby_method_ids = 96;
-pub const idEqTilde: ruby_method_ids = 143;
-pub const idNeqTilde: ruby_method_ids = 144;
-pub const idAREF: ruby_method_ids = 145;
-pub const idASET: ruby_method_ids = 146;
-pub const idCOLON2: ruby_method_ids = 147;
-pub const idANDOP: ruby_method_ids = 148;
-pub const idOROP: ruby_method_ids = 149;
-pub const idANDDOT: ruby_method_ids = 150;
-pub const tPRESERVED_ID_BEGIN: ruby_method_ids = 150;
-pub const idNilP: ruby_method_ids = 151;
-pub const idNULL: ruby_method_ids = 152;
-pub const idEmptyP: ruby_method_ids = 153;
-pub const idEqlP: ruby_method_ids = 154;
-pub const idRespond_to: ruby_method_ids = 155;
-pub const idRespond_to_missing: ruby_method_ids = 156;
-pub const idIFUNC: ruby_method_ids = 157;
-pub const idCFUNC: ruby_method_ids = 158;
-pub const id_core_set_method_alias: ruby_method_ids = 159;
-pub const id_core_set_variable_alias: ruby_method_ids = 160;
-pub const id_core_undef_method: ruby_method_ids = 161;
-pub const id_core_define_method: ruby_method_ids = 162;
-pub const id_core_define_singleton_method: ruby_method_ids = 163;
-pub const id_core_set_postexe: ruby_method_ids = 164;
-pub const id_core_hash_merge_ptr: ruby_method_ids = 165;
-pub const id_core_hash_merge_kwd: ruby_method_ids = 166;
-pub const id_core_raise: ruby_method_ids = 167;
-pub const id_core_sprintf: ruby_method_ids = 168;
-pub const id_debug_created_info: ruby_method_ids = 169;
-pub const tPRESERVED_ID_END: ruby_method_ids = 170;
-pub const tTOKEN_LOCAL_BEGIN: ruby_method_ids = 169;
-pub const tMax: ruby_method_ids = 170;
-pub const tMin: ruby_method_ids = 171;
-pub const tHash: ruby_method_ids = 172;
-pub const tFreeze: ruby_method_ids = 173;
-pub const tInspect: ruby_method_ids = 174;
-pub const tIntern: ruby_method_ids = 175;
-pub const tObject_id: ruby_method_ids = 176;
-pub const tConst_added: ruby_method_ids = 177;
-pub const tConst_missing: ruby_method_ids = 178;
-pub const tMethodMissing: ruby_method_ids = 179;
-pub const tMethod_added: ruby_method_ids = 180;
-pub const tSingleton_method_added: ruby_method_ids = 181;
-pub const tMethod_removed: ruby_method_ids = 182;
-pub const tSingleton_method_removed: ruby_method_ids = 183;
-pub const tMethod_undefined: ruby_method_ids = 184;
-pub const tSingleton_method_undefined: ruby_method_ids = 185;
-pub const tLength: ruby_method_ids = 186;
-pub const tSize: ruby_method_ids = 187;
-pub const tGets: ruby_method_ids = 188;
-pub const tSucc: ruby_method_ids = 189;
-pub const tEach: ruby_method_ids = 190;
-pub const tProc: ruby_method_ids = 191;
-pub const tLambda: ruby_method_ids = 192;
-pub const tSend: ruby_method_ids = 193;
-pub const t__send__: ruby_method_ids = 194;
-pub const t__recursive_key__: ruby_method_ids = 195;
-pub const tInitialize: ruby_method_ids = 196;
-pub const tInitialize_copy: ruby_method_ids = 197;
-pub const tInitialize_clone: ruby_method_ids = 198;
-pub const tInitialize_dup: ruby_method_ids = 199;
-pub const tTo_int: ruby_method_ids = 200;
-pub const tTo_ary: ruby_method_ids = 201;
-pub const tTo_str: ruby_method_ids = 202;
-pub const tTo_sym: ruby_method_ids = 203;
-pub const tTo_hash: ruby_method_ids = 204;
-pub const tTo_proc: ruby_method_ids = 205;
-pub const tTo_io: ruby_method_ids = 206;
-pub const tTo_a: ruby_method_ids = 207;
-pub const tTo_s: ruby_method_ids = 208;
-pub const tTo_i: ruby_method_ids = 209;
-pub const tTo_f: ruby_method_ids = 210;
-pub const tTo_r: ruby_method_ids = 211;
-pub const tBt: ruby_method_ids = 212;
-pub const tBt_locations: ruby_method_ids = 213;
-pub const tCall: ruby_method_ids = 214;
-pub const tMesg: ruby_method_ids = 215;
-pub const tException: ruby_method_ids = 216;
-pub const tLocals: ruby_method_ids = 217;
-pub const tNOT: ruby_method_ids = 218;
-pub const tAND: ruby_method_ids = 219;
-pub const tOR: ruby_method_ids = 220;
-pub const tDiv: ruby_method_ids = 221;
-pub const tDivmod: ruby_method_ids = 222;
-pub const tFdiv: ruby_method_ids = 223;
-pub const tQuo: ruby_method_ids = 224;
-pub const tName: ruby_method_ids = 225;
-pub const tNil: ruby_method_ids = 226;
-pub const tPath: ruby_method_ids = 227;
-pub const tUScore: ruby_method_ids = 228;
-pub const tNUMPARAM_1: ruby_method_ids = 229;
-pub const tNUMPARAM_2: ruby_method_ids = 230;
-pub const tNUMPARAM_3: ruby_method_ids = 231;
-pub const tNUMPARAM_4: ruby_method_ids = 232;
-pub const tNUMPARAM_5: ruby_method_ids = 233;
-pub const tNUMPARAM_6: ruby_method_ids = 234;
-pub const tNUMPARAM_7: ruby_method_ids = 235;
-pub const tNUMPARAM_8: ruby_method_ids = 236;
-pub const tNUMPARAM_9: ruby_method_ids = 237;
-pub const tDefault: ruby_method_ids = 238;
-pub const tTOKEN_LOCAL_END: ruby_method_ids = 239;
-pub const tTOKEN_INSTANCE_BEGIN: ruby_method_ids = 238;
-pub const tTOKEN_INSTANCE_END: ruby_method_ids = 239;
-pub const tTOKEN_GLOBAL_BEGIN: ruby_method_ids = 238;
-pub const tLASTLINE: ruby_method_ids = 239;
-pub const tBACKREF: ruby_method_ids = 240;
-pub const tERROR_INFO: ruby_method_ids = 241;
-pub const tTOKEN_GLOBAL_END: ruby_method_ids = 242;
-pub const tTOKEN_CONST_BEGIN: ruby_method_ids = 241;
-pub const tTOKEN_CONST_END: ruby_method_ids = 242;
-pub const tTOKEN_CLASS_BEGIN: ruby_method_ids = 241;
-pub const tTOKEN_CLASS_END: ruby_method_ids = 242;
-pub const tTOKEN_ATTRSET_BEGIN: ruby_method_ids = 241;
-pub const tTOKEN_ATTRSET_END: ruby_method_ids = 242;
-pub const tNEXT_ID: ruby_method_ids = 242;
-pub const idMax: ruby_method_ids = 2721;
-pub const idMin: ruby_method_ids = 2737;
-pub const idHash: ruby_method_ids = 2753;
-pub const idFreeze: ruby_method_ids = 2769;
-pub const idInspect: ruby_method_ids = 2785;
-pub const idIntern: ruby_method_ids = 2801;
-pub const idObject_id: ruby_method_ids = 2817;
-pub const idConst_added: ruby_method_ids = 2833;
-pub const idConst_missing: ruby_method_ids = 2849;
-pub const idMethodMissing: ruby_method_ids = 2865;
-pub const idMethod_added: ruby_method_ids = 2881;
-pub const idSingleton_method_added: ruby_method_ids = 2897;
-pub const idMethod_removed: ruby_method_ids = 2913;
-pub const idSingleton_method_removed: ruby_method_ids = 2929;
-pub const idMethod_undefined: ruby_method_ids = 2945;
-pub const idSingleton_method_undefined: ruby_method_ids = 2961;
-pub const idLength: ruby_method_ids = 2977;
-pub const idSize: ruby_method_ids = 2993;
-pub const idGets: ruby_method_ids = 3009;
-pub const idSucc: ruby_method_ids = 3025;
-pub const idEach: ruby_method_ids = 3041;
-pub const idProc: ruby_method_ids = 3057;
-pub const idLambda: ruby_method_ids = 3073;
-pub const idSend: ruby_method_ids = 3089;
-pub const id__send__: ruby_method_ids = 3105;
-pub const id__recursive_key__: ruby_method_ids = 3121;
-pub const idInitialize: ruby_method_ids = 3137;
-pub const idInitialize_copy: ruby_method_ids = 3153;
-pub const idInitialize_clone: ruby_method_ids = 3169;
-pub const idInitialize_dup: ruby_method_ids = 3185;
-pub const idTo_int: ruby_method_ids = 3201;
-pub const idTo_ary: ruby_method_ids = 3217;
-pub const idTo_str: ruby_method_ids = 3233;
-pub const idTo_sym: ruby_method_ids = 3249;
-pub const idTo_hash: ruby_method_ids = 3265;
-pub const idTo_proc: ruby_method_ids = 3281;
-pub const idTo_io: ruby_method_ids = 3297;
-pub const idTo_a: ruby_method_ids = 3313;
-pub const idTo_s: ruby_method_ids = 3329;
-pub const idTo_i: ruby_method_ids = 3345;
-pub const idTo_f: ruby_method_ids = 3361;
-pub const idTo_r: ruby_method_ids = 3377;
-pub const idBt: ruby_method_ids = 3393;
-pub const idBt_locations: ruby_method_ids = 3409;
-pub const idCall: ruby_method_ids = 3425;
-pub const idMesg: ruby_method_ids = 3441;
-pub const idException: ruby_method_ids = 3457;
-pub const idLocals: ruby_method_ids = 3473;
-pub const idNOT: ruby_method_ids = 3489;
-pub const idAND: ruby_method_ids = 3505;
-pub const idOR: ruby_method_ids = 3521;
-pub const idDiv: ruby_method_ids = 3537;
-pub const idDivmod: ruby_method_ids = 3553;
-pub const idFdiv: ruby_method_ids = 3569;
-pub const idQuo: ruby_method_ids = 3585;
-pub const idName: ruby_method_ids = 3601;
-pub const idNil: ruby_method_ids = 3617;
-pub const idPath: ruby_method_ids = 3633;
-pub const idUScore: ruby_method_ids = 3649;
-pub const idNUMPARAM_1: ruby_method_ids = 3665;
-pub const idNUMPARAM_2: ruby_method_ids = 3681;
-pub const idNUMPARAM_3: ruby_method_ids = 3697;
-pub const idNUMPARAM_4: ruby_method_ids = 3713;
-pub const idNUMPARAM_5: ruby_method_ids = 3729;
-pub const idNUMPARAM_6: ruby_method_ids = 3745;
-pub const idNUMPARAM_7: ruby_method_ids = 3761;
-pub const idNUMPARAM_8: ruby_method_ids = 3777;
-pub const idNUMPARAM_9: ruby_method_ids = 3793;
-pub const idDefault: ruby_method_ids = 3809;
-pub const idLASTLINE: ruby_method_ids = 3831;
-pub const idBACKREF: ruby_method_ids = 3847;
-pub const idERROR_INFO: ruby_method_ids = 3863;
-pub const tLAST_OP_ID: ruby_method_ids = 169;
-pub const idLAST_OP_ID: ruby_method_ids = 10;
-pub type ruby_method_ids = u32;
 pub const BOP_PLUS: ruby_basic_operators = 0;
 pub const BOP_MINUS: ruby_basic_operators = 1;
 pub const BOP_MULT: ruby_basic_operators = 2;
@@ -525,8 +369,32 @@ pub const BOP_AND: ruby_basic_operators = 28;
 pub const BOP_OR: ruby_basic_operators = 29;
 pub const BOP_CMP: ruby_basic_operators = 30;
 pub const BOP_DEFAULT: ruby_basic_operators = 31;
-pub const BOP_LAST_: ruby_basic_operators = 32;
+pub const BOP_PACK: ruby_basic_operators = 32;
+pub const BOP_INCLUDE_P: ruby_basic_operators = 33;
+pub const BOP_LAST_: ruby_basic_operators = 34;
 pub type ruby_basic_operators = u32;
+#[repr(C)]
+pub struct rb_namespace_struct {
+    pub ns_object: VALUE,
+    pub ns_id: ::std::os::raw::c_long,
+    pub top_self: VALUE,
+    pub load_path: VALUE,
+    pub load_path_snapshot: VALUE,
+    pub load_path_check_cache: VALUE,
+    pub expanded_load_path: VALUE,
+    pub loaded_features: VALUE,
+    pub loaded_features_snapshot: VALUE,
+    pub loaded_features_realpaths: VALUE,
+    pub loaded_features_realpath_map: VALUE,
+    pub loaded_features_index: *mut st_table,
+    pub loading_table: *mut st_table,
+    pub ruby_dln_libmap: VALUE,
+    pub gvar_tbl: VALUE,
+    pub is_builtin: bool,
+    pub is_user: bool,
+    pub is_optional: bool,
+}
+pub type rb_namespace_t = rb_namespace_struct;
 pub type rb_serial_t = ::std::os::raw::c_ulonglong;
 pub const imemo_env: imemo_type = 0;
 pub const imemo_cref: imemo_type = 1;
@@ -542,6 +410,7 @@ pub const imemo_parser_strterm: imemo_type = 10;
 pub const imemo_callinfo: imemo_type = 11;
 pub const imemo_callcache: imemo_type = 12;
 pub const imemo_constcache: imemo_type = 13;
+pub const imemo_fields: imemo_type = 14;
 pub type imemo_type = u32;
 #[repr(C)]
 #[derive(Debug, Copy, Clone)]
@@ -594,10 +463,11 @@ pub const VM_METHOD_TYPE_OPTIMIZED: rb_method_type_t = 9;
 pub const VM_METHOD_TYPE_MISSING: rb_method_type_t = 10;
 pub const VM_METHOD_TYPE_REFINED: rb_method_type_t = 11;
 pub type rb_method_type_t = u32;
+pub type rb_cfunc_t = ::std::option::Option<unsafe extern "C" fn() -> VALUE>;
 #[repr(C)]
 #[derive(Debug, Copy, Clone)]
 pub struct rb_method_cfunc_struct {
-    pub func: ::std::option::Option<unsafe extern "C" fn() -> VALUE>,
+    pub func: rb_cfunc_t,
     pub invoker: ::std::option::Option<
         unsafe extern "C" fn(
             recv: VALUE,
@@ -615,11 +485,6 @@ pub const OPTIMIZED_METHOD_TYPE_STRUCT_AREF: method_optimized_type = 3;
 pub const OPTIMIZED_METHOD_TYPE_STRUCT_ASET: method_optimized_type = 4;
 pub const OPTIMIZED_METHOD_TYPE__MAX: method_optimized_type = 5;
 pub type method_optimized_type = u32;
-#[repr(C)]
-#[derive(Debug, Copy, Clone)]
-pub struct rb_id_table {
-    _unused: [u8; 0],
-}
 pub type rb_num_t = ::std::os::raw::c_ulong;
 pub const RUBY_TAG_NONE: ruby_tag_type = 0;
 pub const RUBY_TAG_RETURN: ruby_tag_type = 1;
@@ -652,7 +517,7 @@ pub struct iseq_inline_constant_cache {
 #[repr(C)]
 #[derive(Debug, Copy, Clone)]
 pub struct iseq_inline_iv_cache_entry {
-    pub value: usize,
+    pub value: u64,
     pub iv_set_name: ID,
 }
 #[repr(C)]
@@ -660,9 +525,20 @@ pub struct iseq_inline_iv_cache_entry {
 pub struct iseq_inline_cvar_cache_entry {
     pub entry: *mut rb_cvar_class_tbl_entry,
 }
+pub const ISEQ_TYPE_TOP: rb_iseq_type = 0;
+pub const ISEQ_TYPE_METHOD: rb_iseq_type = 1;
+pub const ISEQ_TYPE_BLOCK: rb_iseq_type = 2;
+pub const ISEQ_TYPE_CLASS: rb_iseq_type = 3;
+pub const ISEQ_TYPE_RESCUE: rb_iseq_type = 4;
+pub const ISEQ_TYPE_ENSURE: rb_iseq_type = 5;
+pub const ISEQ_TYPE_EVAL: rb_iseq_type = 6;
+pub const ISEQ_TYPE_MAIN: rb_iseq_type = 7;
+pub const ISEQ_TYPE_PLAIN: rb_iseq_type = 8;
+pub type rb_iseq_type = u32;
 pub const BUILTIN_ATTR_LEAF: rb_builtin_attr = 1;
-pub const BUILTIN_ATTR_NO_GC: rb_builtin_attr = 2;
-pub const BUILTIN_ATTR_SINGLE_NOARG_INLINE: rb_builtin_attr = 4;
+pub const BUILTIN_ATTR_SINGLE_NOARG_LEAF: rb_builtin_attr = 2;
+pub const BUILTIN_ATTR_INLINE_BLOCK: rb_builtin_attr = 4;
+pub const BUILTIN_ATTR_C_TRACE: rb_builtin_attr = 8;
 pub type rb_builtin_attr = u32;
 #[repr(C)]
 #[derive(Debug, Copy, Clone)]
@@ -708,6 +584,7 @@ pub type rb_control_frame_t = rb_control_frame_struct;
 #[repr(C)]
 pub struct rb_proc_t {
     pub block: rb_block,
+    pub ns: *const rb_namespace_t,
     pub _bitfield_align_1: [u8; 0],
     pub _bitfield_1: __BindgenBitfieldUnit<[u8; 1usize]>,
     pub __bindgen_padding_0: [u8; 7usize],
@@ -772,6 +649,13 @@ pub const VM_CHECKMATCH_TYPE_WHEN: vm_check_match_type = 1;
 pub const VM_CHECKMATCH_TYPE_CASE: vm_check_match_type = 2;
 pub const VM_CHECKMATCH_TYPE_RESCUE: vm_check_match_type = 3;
 pub type vm_check_match_type = u32;
+pub const VM_OPT_NEWARRAY_SEND_MAX: vm_opt_newarray_send_type = 1;
+pub const VM_OPT_NEWARRAY_SEND_MIN: vm_opt_newarray_send_type = 2;
+pub const VM_OPT_NEWARRAY_SEND_HASH: vm_opt_newarray_send_type = 3;
+pub const VM_OPT_NEWARRAY_SEND_PACK: vm_opt_newarray_send_type = 4;
+pub const VM_OPT_NEWARRAY_SEND_PACK_BUFFER: vm_opt_newarray_send_type = 5;
+pub const VM_OPT_NEWARRAY_SEND_INCLUDE_P: vm_opt_newarray_send_type = 6;
+pub type vm_opt_newarray_send_type = u32;
 pub const VM_SPECIAL_OBJECT_VMCORE: vm_special_object_type = 1;
 pub const VM_SPECIAL_OBJECT_CBASE: vm_special_object_type = 2;
 pub const VM_SPECIAL_OBJECT_CONST_BASE: vm_special_object_type = 3;
@@ -796,26 +680,16 @@ pub const VM_FRAME_FLAG_LAMBDA: vm_frame_env_flags = 256;
 pub const VM_FRAME_FLAG_MODIFIED_BLOCK_PARAM: vm_frame_env_flags = 512;
 pub const VM_FRAME_FLAG_CFRAME_KW: vm_frame_env_flags = 1024;
 pub const VM_FRAME_FLAG_PASSED: vm_frame_env_flags = 2048;
+pub const VM_FRAME_FLAG_NS_SWITCH: vm_frame_env_flags = 4096;
+pub const VM_FRAME_FLAG_LOAD_ISEQ: vm_frame_env_flags = 8192;
 pub const VM_ENV_FLAG_LOCAL: vm_frame_env_flags = 2;
 pub const VM_ENV_FLAG_ESCAPED: vm_frame_env_flags = 4;
 pub const VM_ENV_FLAG_WB_REQUIRED: vm_frame_env_flags = 8;
 pub const VM_ENV_FLAG_ISOLATED: vm_frame_env_flags = 16;
 pub type vm_frame_env_flags = u32;
-pub type attr_index_t = u32;
+pub type attr_index_t = u16;
 pub type shape_id_t = u32;
 #[repr(C)]
-#[derive(Debug, Copy, Clone)]
-pub struct rb_shape {
-    pub edges: *mut rb_id_table,
-    pub edge_name: ID,
-    pub next_iv_index: attr_index_t,
-    pub capacity: u32,
-    pub type_: u8,
-    pub size_pool_index: u8,
-    pub parent_id: shape_id_t,
-}
-pub type rb_shape_t = rb_shape;
-#[repr(C)]
 pub struct rb_cvar_class_tbl_entry {
     pub index: u32,
     pub global_cvar_state: rb_serial_t,
@@ -834,9 +708,17 @@ pub const VM_CALL_SUPER_bit: vm_call_flag_bits = 8;
 pub const VM_CALL_ZSUPER_bit: vm_call_flag_bits = 9;
 pub const VM_CALL_OPT_SEND_bit: vm_call_flag_bits = 10;
 pub const VM_CALL_KW_SPLAT_MUT_bit: vm_call_flag_bits = 11;
-pub const VM_CALL__END: vm_call_flag_bits = 12;
+pub const VM_CALL_ARGS_SPLAT_MUT_bit: vm_call_flag_bits = 12;
+pub const VM_CALL_FORWARDING_bit: vm_call_flag_bits = 13;
+pub const VM_CALL__END: vm_call_flag_bits = 14;
 pub type vm_call_flag_bits = u32;
 #[repr(C)]
+pub struct rb_callinfo_kwarg {
+    pub keyword_len: ::std::os::raw::c_int,
+    pub references: ::std::os::raw::c_int,
+    pub keywords: __IncompleteArrayField<VALUE>,
+}
+#[repr(C)]
 pub struct rb_callinfo {
     pub flags: VALUE,
     pub kwarg: *const rb_callinfo_kwarg,
@@ -850,6 +732,8 @@ pub struct rb_call_data {
     pub ci: *const rb_callinfo,
     pub cc: *const rb_callcache,
 }
+pub const RSTRING_CHILLED: ruby_rstring_private_flags = 49152;
+pub type ruby_rstring_private_flags = u32;
 pub const RHASH_PASS_AS_KEYWORDS: ruby_rhash_flags = 8192;
 pub const RHASH_PROC_DEFAULT: ruby_rhash_flags = 16384;
 pub const RHASH_ST_TABLE_FLAG: ruby_rhash_flags = 32768;
@@ -890,204 +774,245 @@ pub const YARVINSN_putself: ruby_vminsn_type = 18;
 pub const YARVINSN_putobject: ruby_vminsn_type = 19;
 pub const YARVINSN_putspecialobject: ruby_vminsn_type = 20;
 pub const YARVINSN_putstring: ruby_vminsn_type = 21;
-pub const YARVINSN_concatstrings: ruby_vminsn_type = 22;
-pub const YARVINSN_anytostring: ruby_vminsn_type = 23;
-pub const YARVINSN_toregexp: ruby_vminsn_type = 24;
-pub const YARVINSN_intern: ruby_vminsn_type = 25;
-pub const YARVINSN_newarray: ruby_vminsn_type = 26;
-pub const YARVINSN_newarraykwsplat: ruby_vminsn_type = 27;
-pub const YARVINSN_duparray: ruby_vminsn_type = 28;
-pub const YARVINSN_duphash: ruby_vminsn_type = 29;
-pub const YARVINSN_expandarray: ruby_vminsn_type = 30;
-pub const YARVINSN_concatarray: ruby_vminsn_type = 31;
-pub const YARVINSN_splatarray: ruby_vminsn_type = 32;
-pub const YARVINSN_newhash: ruby_vminsn_type = 33;
-pub const YARVINSN_newrange: ruby_vminsn_type = 34;
-pub const YARVINSN_pop: ruby_vminsn_type = 35;
-pub const YARVINSN_dup: ruby_vminsn_type = 36;
-pub const YARVINSN_dupn: ruby_vminsn_type = 37;
-pub const YARVINSN_swap: ruby_vminsn_type = 38;
-pub const YARVINSN_opt_reverse: ruby_vminsn_type = 39;
-pub const YARVINSN_topn: ruby_vminsn_type = 40;
-pub const YARVINSN_setn: ruby_vminsn_type = 41;
-pub const YARVINSN_adjuststack: ruby_vminsn_type = 42;
-pub const YARVINSN_defined: ruby_vminsn_type = 43;
-pub const YARVINSN_definedivar: ruby_vminsn_type = 44;
-pub const YARVINSN_checkmatch: ruby_vminsn_type = 45;
-pub const YARVINSN_checkkeyword: ruby_vminsn_type = 46;
-pub const YARVINSN_checktype: ruby_vminsn_type = 47;
-pub const YARVINSN_defineclass: ruby_vminsn_type = 48;
-pub const YARVINSN_definemethod: ruby_vminsn_type = 49;
-pub const YARVINSN_definesmethod: ruby_vminsn_type = 50;
-pub const YARVINSN_send: ruby_vminsn_type = 51;
-pub const YARVINSN_opt_send_without_block: ruby_vminsn_type = 52;
-pub const YARVINSN_objtostring: ruby_vminsn_type = 53;
-pub const YARVINSN_opt_str_freeze: ruby_vminsn_type = 54;
-pub const YARVINSN_opt_nil_p: ruby_vminsn_type = 55;
-pub const YARVINSN_opt_str_uminus: ruby_vminsn_type = 56;
-pub const YARVINSN_opt_newarray_send: ruby_vminsn_type = 57;
-pub const YARVINSN_invokesuper: ruby_vminsn_type = 58;
-pub const YARVINSN_invokeblock: ruby_vminsn_type = 59;
-pub const YARVINSN_leave: ruby_vminsn_type = 60;
-pub const YARVINSN_throw: ruby_vminsn_type = 61;
-pub const YARVINSN_jump: ruby_vminsn_type = 62;
-pub const YARVINSN_branchif: ruby_vminsn_type = 63;
-pub const YARVINSN_branchunless: ruby_vminsn_type = 64;
-pub const YARVINSN_branchnil: ruby_vminsn_type = 65;
-pub const YARVINSN_once: ruby_vminsn_type = 66;
-pub const YARVINSN_opt_case_dispatch: ruby_vminsn_type = 67;
-pub const YARVINSN_opt_plus: ruby_vminsn_type = 68;
-pub const YARVINSN_opt_minus: ruby_vminsn_type = 69;
-pub const YARVINSN_opt_mult: ruby_vminsn_type = 70;
-pub const YARVINSN_opt_div: ruby_vminsn_type = 71;
-pub const YARVINSN_opt_mod: ruby_vminsn_type = 72;
-pub const YARVINSN_opt_eq: ruby_vminsn_type = 73;
-pub const YARVINSN_opt_neq: ruby_vminsn_type = 74;
-pub const YARVINSN_opt_lt: ruby_vminsn_type = 75;
-pub const YARVINSN_opt_le: ruby_vminsn_type = 76;
-pub const YARVINSN_opt_gt: ruby_vminsn_type = 77;
-pub const YARVINSN_opt_ge: ruby_vminsn_type = 78;
-pub const YARVINSN_opt_ltlt: ruby_vminsn_type = 79;
-pub const YARVINSN_opt_and: ruby_vminsn_type = 80;
-pub const YARVINSN_opt_or: ruby_vminsn_type = 81;
-pub const YARVINSN_opt_aref: ruby_vminsn_type = 82;
-pub const YARVINSN_opt_aset: ruby_vminsn_type = 83;
-pub const YARVINSN_opt_aset_with: ruby_vminsn_type = 84;
-pub const YARVINSN_opt_aref_with: ruby_vminsn_type = 85;
-pub const YARVINSN_opt_length: ruby_vminsn_type = 86;
-pub const YARVINSN_opt_size: ruby_vminsn_type = 87;
-pub const YARVINSN_opt_empty_p: ruby_vminsn_type = 88;
-pub const YARVINSN_opt_succ: ruby_vminsn_type = 89;
-pub const YARVINSN_opt_not: ruby_vminsn_type = 90;
-pub const YARVINSN_opt_regexpmatch2: ruby_vminsn_type = 91;
-pub const YARVINSN_invokebuiltin: ruby_vminsn_type = 92;
-pub const YARVINSN_opt_invokebuiltin_delegate: ruby_vminsn_type = 93;
-pub const YARVINSN_opt_invokebuiltin_delegate_leave: ruby_vminsn_type = 94;
-pub const YARVINSN_getlocal_WC_0: ruby_vminsn_type = 95;
-pub const YARVINSN_getlocal_WC_1: ruby_vminsn_type = 96;
-pub const YARVINSN_setlocal_WC_0: ruby_vminsn_type = 97;
-pub const YARVINSN_setlocal_WC_1: ruby_vminsn_type = 98;
-pub const YARVINSN_putobject_INT2FIX_0_: ruby_vminsn_type = 99;
-pub const YARVINSN_putobject_INT2FIX_1_: ruby_vminsn_type = 100;
-pub const YARVINSN_trace_nop: ruby_vminsn_type = 101;
-pub const YARVINSN_trace_getlocal: ruby_vminsn_type = 102;
-pub const YARVINSN_trace_setlocal: ruby_vminsn_type = 103;
-pub const YARVINSN_trace_getblockparam: ruby_vminsn_type = 104;
-pub const YARVINSN_trace_setblockparam: ruby_vminsn_type = 105;
-pub const YARVINSN_trace_getblockparamproxy: ruby_vminsn_type = 106;
-pub const YARVINSN_trace_getspecial: ruby_vminsn_type = 107;
-pub const YARVINSN_trace_setspecial: ruby_vminsn_type = 108;
-pub const YARVINSN_trace_getinstancevariable: ruby_vminsn_type = 109;
-pub const YARVINSN_trace_setinstancevariable: ruby_vminsn_type = 110;
-pub const YARVINSN_trace_getclassvariable: ruby_vminsn_type = 111;
-pub const YARVINSN_trace_setclassvariable: ruby_vminsn_type = 112;
-pub const YARVINSN_trace_opt_getconstant_path: ruby_vminsn_type = 113;
-pub const YARVINSN_trace_getconstant: ruby_vminsn_type = 114;
-pub const YARVINSN_trace_setconstant: ruby_vminsn_type = 115;
-pub const YARVINSN_trace_getglobal: ruby_vminsn_type = 116;
-pub const YARVINSN_trace_setglobal: ruby_vminsn_type = 117;
-pub const YARVINSN_trace_putnil: ruby_vminsn_type = 118;
-pub const YARVINSN_trace_putself: ruby_vminsn_type = 119;
-pub const YARVINSN_trace_putobject: ruby_vminsn_type = 120;
-pub const YARVINSN_trace_putspecialobject: ruby_vminsn_type = 121;
-pub const YARVINSN_trace_putstring: ruby_vminsn_type = 122;
-pub const YARVINSN_trace_concatstrings: ruby_vminsn_type = 123;
-pub const YARVINSN_trace_anytostring: ruby_vminsn_type = 124;
-pub const YARVINSN_trace_toregexp: ruby_vminsn_type = 125;
-pub const YARVINSN_trace_intern: ruby_vminsn_type = 126;
-pub const YARVINSN_trace_newarray: ruby_vminsn_type = 127;
-pub const YARVINSN_trace_newarraykwsplat: ruby_vminsn_type = 128;
-pub const YARVINSN_trace_duparray: ruby_vminsn_type = 129;
-pub const YARVINSN_trace_duphash: ruby_vminsn_type = 130;
-pub const YARVINSN_trace_expandarray: ruby_vminsn_type = 131;
-pub const YARVINSN_trace_concatarray: ruby_vminsn_type = 132;
-pub const YARVINSN_trace_splatarray: ruby_vminsn_type = 133;
-pub const YARVINSN_trace_newhash: ruby_vminsn_type = 134;
-pub const YARVINSN_trace_newrange: ruby_vminsn_type = 135;
-pub const YARVINSN_trace_pop: ruby_vminsn_type = 136;
-pub const YARVINSN_trace_dup: ruby_vminsn_type = 137;
-pub const YARVINSN_trace_dupn: ruby_vminsn_type = 138;
-pub const YARVINSN_trace_swap: ruby_vminsn_type = 139;
-pub const YARVINSN_trace_opt_reverse: ruby_vminsn_type = 140;
-pub const YARVINSN_trace_topn: ruby_vminsn_type = 141;
-pub const YARVINSN_trace_setn: ruby_vminsn_type = 142;
-pub const YARVINSN_trace_adjuststack: ruby_vminsn_type = 143;
-pub const YARVINSN_trace_defined: ruby_vminsn_type = 144;
-pub const YARVINSN_trace_definedivar: ruby_vminsn_type = 145;
-pub const YARVINSN_trace_checkmatch: ruby_vminsn_type = 146;
-pub const YARVINSN_trace_checkkeyword: ruby_vminsn_type = 147;
-pub const YARVINSN_trace_checktype: ruby_vminsn_type = 148;
-pub const YARVINSN_trace_defineclass: ruby_vminsn_type = 149;
-pub const YARVINSN_trace_definemethod: ruby_vminsn_type = 150;
-pub const YARVINSN_trace_definesmethod: ruby_vminsn_type = 151;
-pub const YARVINSN_trace_send: ruby_vminsn_type = 152;
-pub const YARVINSN_trace_opt_send_without_block: ruby_vminsn_type = 153;
-pub const YARVINSN_trace_objtostring: ruby_vminsn_type = 154;
-pub const YARVINSN_trace_opt_str_freeze: ruby_vminsn_type = 155;
-pub const YARVINSN_trace_opt_nil_p: ruby_vminsn_type = 156;
-pub const YARVINSN_trace_opt_str_uminus: ruby_vminsn_type = 157;
-pub const YARVINSN_trace_opt_newarray_send: ruby_vminsn_type = 158;
-pub const YARVINSN_trace_invokesuper: ruby_vminsn_type = 159;
-pub const YARVINSN_trace_invokeblock: ruby_vminsn_type = 160;
-pub const YARVINSN_trace_leave: ruby_vminsn_type = 161;
-pub const YARVINSN_trace_throw: ruby_vminsn_type = 162;
-pub const YARVINSN_trace_jump: ruby_vminsn_type = 163;
-pub const YARVINSN_trace_branchif: ruby_vminsn_type = 164;
-pub const YARVINSN_trace_branchunless: ruby_vminsn_type = 165;
-pub const YARVINSN_trace_branchnil: ruby_vminsn_type = 166;
-pub const YARVINSN_trace_once: ruby_vminsn_type = 167;
-pub const YARVINSN_trace_opt_case_dispatch: ruby_vminsn_type = 168;
-pub const YARVINSN_trace_opt_plus: ruby_vminsn_type = 169;
-pub const YARVINSN_trace_opt_minus: ruby_vminsn_type = 170;
-pub const YARVINSN_trace_opt_mult: ruby_vminsn_type = 171;
-pub const YARVINSN_trace_opt_div: ruby_vminsn_type = 172;
-pub const YARVINSN_trace_opt_mod: ruby_vminsn_type = 173;
-pub const YARVINSN_trace_opt_eq: ruby_vminsn_type = 174;
-pub const YARVINSN_trace_opt_neq: ruby_vminsn_type = 175;
-pub const YARVINSN_trace_opt_lt: ruby_vminsn_type = 176;
-pub const YARVINSN_trace_opt_le: ruby_vminsn_type = 177;
-pub const YARVINSN_trace_opt_gt: ruby_vminsn_type = 178;
-pub const YARVINSN_trace_opt_ge: ruby_vminsn_type = 179;
-pub const YARVINSN_trace_opt_ltlt: ruby_vminsn_type = 180;
-pub const YARVINSN_trace_opt_and: ruby_vminsn_type = 181;
-pub const YARVINSN_trace_opt_or: ruby_vminsn_type = 182;
-pub const YARVINSN_trace_opt_aref: ruby_vminsn_type = 183;
-pub const YARVINSN_trace_opt_aset: ruby_vminsn_type = 184;
-pub const YARVINSN_trace_opt_aset_with: ruby_vminsn_type = 185;
-pub const YARVINSN_trace_opt_aref_with: ruby_vminsn_type = 186;
-pub const YARVINSN_trace_opt_length: ruby_vminsn_type = 187;
-pub const YARVINSN_trace_opt_size: ruby_vminsn_type = 188;
-pub const YARVINSN_trace_opt_empty_p: ruby_vminsn_type = 189;
-pub const YARVINSN_trace_opt_succ: ruby_vminsn_type = 190;
-pub const YARVINSN_trace_opt_not: ruby_vminsn_type = 191;
-pub const YARVINSN_trace_opt_regexpmatch2: ruby_vminsn_type = 192;
-pub const YARVINSN_trace_invokebuiltin: ruby_vminsn_type = 193;
-pub const YARVINSN_trace_opt_invokebuiltin_delegate: ruby_vminsn_type = 194;
-pub const YARVINSN_trace_opt_invokebuiltin_delegate_leave: ruby_vminsn_type = 195;
-pub const YARVINSN_trace_getlocal_WC_0: ruby_vminsn_type = 196;
-pub const YARVINSN_trace_getlocal_WC_1: ruby_vminsn_type = 197;
-pub const YARVINSN_trace_setlocal_WC_0: ruby_vminsn_type = 198;
-pub const YARVINSN_trace_setlocal_WC_1: ruby_vminsn_type = 199;
-pub const YARVINSN_trace_putobject_INT2FIX_0_: ruby_vminsn_type = 200;
-pub const YARVINSN_trace_putobject_INT2FIX_1_: ruby_vminsn_type = 201;
-pub const VM_INSTRUCTION_SIZE: ruby_vminsn_type = 202;
+pub const YARVINSN_putchilledstring: ruby_vminsn_type = 22;
+pub const YARVINSN_concatstrings: ruby_vminsn_type = 23;
+pub const YARVINSN_anytostring: ruby_vminsn_type = 24;
+pub const YARVINSN_toregexp: ruby_vminsn_type = 25;
+pub const YARVINSN_intern: ruby_vminsn_type = 26;
+pub const YARVINSN_newarray: ruby_vminsn_type = 27;
+pub const YARVINSN_pushtoarraykwsplat: ruby_vminsn_type = 28;
+pub const YARVINSN_duparray: ruby_vminsn_type = 29;
+pub const YARVINSN_duphash: ruby_vminsn_type = 30;
+pub const YARVINSN_expandarray: ruby_vminsn_type = 31;
+pub const YARVINSN_concatarray: ruby_vminsn_type = 32;
+pub const YARVINSN_concattoarray: ruby_vminsn_type = 33;
+pub const YARVINSN_pushtoarray: ruby_vminsn_type = 34;
+pub const YARVINSN_splatarray: ruby_vminsn_type = 35;
+pub const YARVINSN_splatkw: ruby_vminsn_type = 36;
+pub const YARVINSN_newhash: ruby_vminsn_type = 37;
+pub const YARVINSN_newrange: ruby_vminsn_type = 38;
+pub const YARVINSN_pop: ruby_vminsn_type = 39;
+pub const YARVINSN_dup: ruby_vminsn_type = 40;
+pub const YARVINSN_dupn: ruby_vminsn_type = 41;
+pub const YARVINSN_swap: ruby_vminsn_type = 42;
+pub const YARVINSN_opt_reverse: ruby_vminsn_type = 43;
+pub const YARVINSN_topn: ruby_vminsn_type = 44;
+pub const YARVINSN_setn: ruby_vminsn_type = 45;
+pub const YARVINSN_adjuststack: ruby_vminsn_type = 46;
+pub const YARVINSN_defined: ruby_vminsn_type = 47;
+pub const YARVINSN_definedivar: ruby_vminsn_type = 48;
+pub const YARVINSN_checkmatch: ruby_vminsn_type = 49;
+pub const YARVINSN_checkkeyword: ruby_vminsn_type = 50;
+pub const YARVINSN_checktype: ruby_vminsn_type = 51;
+pub const YARVINSN_defineclass: ruby_vminsn_type = 52;
+pub const YARVINSN_definemethod: ruby_vminsn_type = 53;
+pub const YARVINSN_definesmethod: ruby_vminsn_type = 54;
+pub const YARVINSN_send: ruby_vminsn_type = 55;
+pub const YARVINSN_sendforward: ruby_vminsn_type = 56;
+pub const YARVINSN_opt_send_without_block: ruby_vminsn_type = 57;
+pub const YARVINSN_opt_new: ruby_vminsn_type = 58;
+pub const YARVINSN_objtostring: ruby_vminsn_type = 59;
+pub const YARVINSN_opt_ary_freeze: ruby_vminsn_type = 60;
+pub const YARVINSN_opt_hash_freeze: ruby_vminsn_type = 61;
+pub const YARVINSN_opt_str_freeze: ruby_vminsn_type = 62;
+pub const YARVINSN_opt_nil_p: ruby_vminsn_type = 63;
+pub const YARVINSN_opt_str_uminus: ruby_vminsn_type = 64;
+pub const YARVINSN_opt_duparray_send: ruby_vminsn_type = 65;
+pub const YARVINSN_opt_newarray_send: ruby_vminsn_type = 66;
+pub const YARVINSN_invokesuper: ruby_vminsn_type = 67;
+pub const YARVINSN_invokesuperforward: ruby_vminsn_type = 68;
+pub const YARVINSN_invokeblock: ruby_vminsn_type = 69;
+pub const YARVINSN_leave: ruby_vminsn_type = 70;
+pub const YARVINSN_throw: ruby_vminsn_type = 71;
+pub const YARVINSN_jump: ruby_vminsn_type = 72;
+pub const YARVINSN_branchif: ruby_vminsn_type = 73;
+pub const YARVINSN_branchunless: ruby_vminsn_type = 74;
+pub const YARVINSN_branchnil: ruby_vminsn_type = 75;
+pub const YARVINSN_once: ruby_vminsn_type = 76;
+pub const YARVINSN_opt_case_dispatch: ruby_vminsn_type = 77;
+pub const YARVINSN_opt_plus: ruby_vminsn_type = 78;
+pub const YARVINSN_opt_minus: ruby_vminsn_type = 79;
+pub const YARVINSN_opt_mult: ruby_vminsn_type = 80;
+pub const YARVINSN_opt_div: ruby_vminsn_type = 81;
+pub const YARVINSN_opt_mod: ruby_vminsn_type = 82;
+pub const YARVINSN_opt_eq: ruby_vminsn_type = 83;
+pub const YARVINSN_opt_neq: ruby_vminsn_type = 84;
+pub const YARVINSN_opt_lt: ruby_vminsn_type = 85;
+pub const YARVINSN_opt_le: ruby_vminsn_type = 86;
+pub const YARVINSN_opt_gt: ruby_vminsn_type = 87;
+pub const YARVINSN_opt_ge: ruby_vminsn_type = 88;
+pub const YARVINSN_opt_ltlt: ruby_vminsn_type = 89;
+pub const YARVINSN_opt_and: ruby_vminsn_type = 90;
+pub const YARVINSN_opt_or: ruby_vminsn_type = 91;
+pub const YARVINSN_opt_aref: ruby_vminsn_type = 92;
+pub const YARVINSN_opt_aset: ruby_vminsn_type = 93;
+pub const YARVINSN_opt_aset_with: ruby_vminsn_type = 94;
+pub const YARVINSN_opt_aref_with: ruby_vminsn_type = 95;
+pub const YARVINSN_opt_length: ruby_vminsn_type = 96;
+pub const YARVINSN_opt_size: ruby_vminsn_type = 97;
+pub const YARVINSN_opt_empty_p: ruby_vminsn_type = 98;
+pub const YARVINSN_opt_succ: ruby_vminsn_type = 99;
+pub const YARVINSN_opt_not: ruby_vminsn_type = 100;
+pub const YARVINSN_opt_regexpmatch2: ruby_vminsn_type = 101;
+pub const YARVINSN_invokebuiltin: ruby_vminsn_type = 102;
+pub const YARVINSN_opt_invokebuiltin_delegate: ruby_vminsn_type = 103;
+pub const YARVINSN_opt_invokebuiltin_delegate_leave: ruby_vminsn_type = 104;
+pub const YARVINSN_getlocal_WC_0: ruby_vminsn_type = 105;
+pub const YARVINSN_getlocal_WC_1: ruby_vminsn_type = 106;
+pub const YARVINSN_setlocal_WC_0: ruby_vminsn_type = 107;
+pub const YARVINSN_setlocal_WC_1: ruby_vminsn_type = 108;
+pub const YARVINSN_putobject_INT2FIX_0_: ruby_vminsn_type = 109;
+pub const YARVINSN_putobject_INT2FIX_1_: ruby_vminsn_type = 110;
+pub const YARVINSN_trace_nop: ruby_vminsn_type = 111;
+pub const YARVINSN_trace_getlocal: ruby_vminsn_type = 112;
+pub const YARVINSN_trace_setlocal: ruby_vminsn_type = 113;
+pub const YARVINSN_trace_getblockparam: ruby_vminsn_type = 114;
+pub const YARVINSN_trace_setblockparam: ruby_vminsn_type = 115;
+pub const YARVINSN_trace_getblockparamproxy: ruby_vminsn_type = 116;
+pub const YARVINSN_trace_getspecial: ruby_vminsn_type = 117;
+pub const YARVINSN_trace_setspecial: ruby_vminsn_type = 118;
+pub const YARVINSN_trace_getinstancevariable: ruby_vminsn_type = 119;
+pub const YARVINSN_trace_setinstancevariable: ruby_vminsn_type = 120;
+pub const YARVINSN_trace_getclassvariable: ruby_vminsn_type = 121;
+pub const YARVINSN_trace_setclassvariable: ruby_vminsn_type = 122;
+pub const YARVINSN_trace_opt_getconstant_path: ruby_vminsn_type = 123;
+pub const YARVINSN_trace_getconstant: ruby_vminsn_type = 124;
+pub const YARVINSN_trace_setconstant: ruby_vminsn_type = 125;
+pub const YARVINSN_trace_getglobal: ruby_vminsn_type = 126;
+pub const YARVINSN_trace_setglobal: ruby_vminsn_type = 127;
+pub const YARVINSN_trace_putnil: ruby_vminsn_type = 128;
+pub const YARVINSN_trace_putself: ruby_vminsn_type = 129;
+pub const YARVINSN_trace_putobject: ruby_vminsn_type = 130;
+pub const YARVINSN_trace_putspecialobject: ruby_vminsn_type = 131;
+pub const YARVINSN_trace_putstring: ruby_vminsn_type = 132;
+pub const YARVINSN_trace_putchilledstring: ruby_vminsn_type = 133;
+pub const YARVINSN_trace_concatstrings: ruby_vminsn_type = 134;
+pub const YARVINSN_trace_anytostring: ruby_vminsn_type = 135;
+pub const YARVINSN_trace_toregexp: ruby_vminsn_type = 136;
+pub const YARVINSN_trace_intern: ruby_vminsn_type = 137;
+pub const YARVINSN_trace_newarray: ruby_vminsn_type = 138;
+pub const YARVINSN_trace_pushtoarraykwsplat: ruby_vminsn_type = 139;
+pub const YARVINSN_trace_duparray: ruby_vminsn_type = 140;
+pub const YARVINSN_trace_duphash: ruby_vminsn_type = 141;
+pub const YARVINSN_trace_expandarray: ruby_vminsn_type = 142;
+pub const YARVINSN_trace_concatarray: ruby_vminsn_type = 143;
+pub const YARVINSN_trace_concattoarray: ruby_vminsn_type = 144;
+pub const YARVINSN_trace_pushtoarray: ruby_vminsn_type = 145;
+pub const YARVINSN_trace_splatarray: ruby_vminsn_type = 146;
+pub const YARVINSN_trace_splatkw: ruby_vminsn_type = 147;
+pub const YARVINSN_trace_newhash: ruby_vminsn_type = 148;
+pub const YARVINSN_trace_newrange: ruby_vminsn_type = 149;
+pub const YARVINSN_trace_pop: ruby_vminsn_type = 150;
+pub const YARVINSN_trace_dup: ruby_vminsn_type = 151;
+pub const YARVINSN_trace_dupn: ruby_vminsn_type = 152;
+pub const YARVINSN_trace_swap: ruby_vminsn_type = 153;
+pub const YARVINSN_trace_opt_reverse: ruby_vminsn_type = 154;
+pub const YARVINSN_trace_topn: ruby_vminsn_type = 155;
+pub const YARVINSN_trace_setn: ruby_vminsn_type = 156;
+pub const YARVINSN_trace_adjuststack: ruby_vminsn_type = 157;
+pub const YARVINSN_trace_defined: ruby_vminsn_type = 158;
+pub const YARVINSN_trace_definedivar: ruby_vminsn_type = 159;
+pub const YARVINSN_trace_checkmatch: ruby_vminsn_type = 160;
+pub const YARVINSN_trace_checkkeyword: ruby_vminsn_type = 161;
+pub const YARVINSN_trace_checktype: ruby_vminsn_type = 162;
+pub const YARVINSN_trace_defineclass: ruby_vminsn_type = 163;
+pub const YARVINSN_trace_definemethod: ruby_vminsn_type = 164;
+pub const YARVINSN_trace_definesmethod: ruby_vminsn_type = 165;
+pub const YARVINSN_trace_send: ruby_vminsn_type = 166;
+pub const YARVINSN_trace_sendforward: ruby_vminsn_type = 167;
+pub const YARVINSN_trace_opt_send_without_block: ruby_vminsn_type = 168;
+pub const YARVINSN_trace_opt_new: ruby_vminsn_type = 169;
+pub const YARVINSN_trace_objtostring: ruby_vminsn_type = 170;
+pub const YARVINSN_trace_opt_ary_freeze: ruby_vminsn_type = 171;
+pub const YARVINSN_trace_opt_hash_freeze: ruby_vminsn_type = 172;
+pub const YARVINSN_trace_opt_str_freeze: ruby_vminsn_type = 173;
+pub const YARVINSN_trace_opt_nil_p: ruby_vminsn_type = 174;
+pub const YARVINSN_trace_opt_str_uminus: ruby_vminsn_type = 175;
+pub const YARVINSN_trace_opt_duparray_send: ruby_vminsn_type = 176;
+pub const YARVINSN_trace_opt_newarray_send: ruby_vminsn_type = 177;
+pub const YARVINSN_trace_invokesuper: ruby_vminsn_type = 178;
+pub const YARVINSN_trace_invokesuperforward: ruby_vminsn_type = 179;
+pub const YARVINSN_trace_invokeblock: ruby_vminsn_type = 180;
+pub const YARVINSN_trace_leave: ruby_vminsn_type = 181;
+pub const YARVINSN_trace_throw: ruby_vminsn_type = 182;
+pub const YARVINSN_trace_jump: ruby_vminsn_type = 183;
+pub const YARVINSN_trace_branchif: ruby_vminsn_type = 184;
+pub const YARVINSN_trace_branchunless: ruby_vminsn_type = 185;
+pub const YARVINSN_trace_branchnil: ruby_vminsn_type = 186;
+pub const YARVINSN_trace_once: ruby_vminsn_type = 187;
+pub const YARVINSN_trace_opt_case_dispatch: ruby_vminsn_type = 188;
+pub const YARVINSN_trace_opt_plus: ruby_vminsn_type = 189;
+pub const YARVINSN_trace_opt_minus: ruby_vminsn_type = 190;
+pub const YARVINSN_trace_opt_mult: ruby_vminsn_type = 191;
+pub const YARVINSN_trace_opt_div: ruby_vminsn_type = 192;
+pub const YARVINSN_trace_opt_mod: ruby_vminsn_type = 193;
+pub const YARVINSN_trace_opt_eq: ruby_vminsn_type = 194;
+pub const YARVINSN_trace_opt_neq: ruby_vminsn_type = 195;
+pub const YARVINSN_trace_opt_lt: ruby_vminsn_type = 196;
+pub const YARVINSN_trace_opt_le: ruby_vminsn_type = 197;
+pub const YARVINSN_trace_opt_gt: ruby_vminsn_type = 198;
+pub const YARVINSN_trace_opt_ge: ruby_vminsn_type = 199;
+pub const YARVINSN_trace_opt_ltlt: ruby_vminsn_type = 200;
+pub const YARVINSN_trace_opt_and: ruby_vminsn_type = 201;
+pub const YARVINSN_trace_opt_or: ruby_vminsn_type = 202;
+pub const YARVINSN_trace_opt_aref: ruby_vminsn_type = 203;
+pub const YARVINSN_trace_opt_aset: ruby_vminsn_type = 204;
+pub const YARVINSN_trace_opt_aset_with: ruby_vminsn_type = 205;
+pub const YARVINSN_trace_opt_aref_with: ruby_vminsn_type = 206;
+pub const YARVINSN_trace_opt_length: ruby_vminsn_type = 207;
+pub const YARVINSN_trace_opt_size: ruby_vminsn_type = 208;
+pub const YARVINSN_trace_opt_empty_p: ruby_vminsn_type = 209;
+pub const YARVINSN_trace_opt_succ: ruby_vminsn_type = 210;
+pub const YARVINSN_trace_opt_not: ruby_vminsn_type = 211;
+pub const YARVINSN_trace_opt_regexpmatch2: ruby_vminsn_type = 212;
+pub const YARVINSN_trace_invokebuiltin: ruby_vminsn_type = 213;
+pub const YARVINSN_trace_opt_invokebuiltin_delegate: ruby_vminsn_type = 214;
+pub const YARVINSN_trace_opt_invokebuiltin_delegate_leave: ruby_vminsn_type = 215;
+pub const YARVINSN_trace_getlocal_WC_0: ruby_vminsn_type = 216;
+pub const YARVINSN_trace_getlocal_WC_1: ruby_vminsn_type = 217;
+pub const YARVINSN_trace_setlocal_WC_0: ruby_vminsn_type = 218;
+pub const YARVINSN_trace_setlocal_WC_1: ruby_vminsn_type = 219;
+pub const YARVINSN_trace_putobject_INT2FIX_0_: ruby_vminsn_type = 220;
+pub const YARVINSN_trace_putobject_INT2FIX_1_: ruby_vminsn_type = 221;
+pub const VM_INSTRUCTION_SIZE: ruby_vminsn_type = 222;
 pub type ruby_vminsn_type = u32;
 pub type rb_iseq_callback = ::std::option::Option<
     unsafe extern "C" fn(arg1: *const rb_iseq_t, arg2: *mut ::std::os::raw::c_void),
 >;
-pub const ROBJECT_OFFSET_AS_HEAP_IVPTR: robject_offsets = 16;
-pub const ROBJECT_OFFSET_AS_HEAP_IV_INDEX_TBL: robject_offsets = 24;
+pub const DEFINED_NOT_DEFINED: defined_type = 0;
+pub const DEFINED_NIL: defined_type = 1;
+pub const DEFINED_IVAR: defined_type = 2;
+pub const DEFINED_LVAR: defined_type = 3;
+pub const DEFINED_GVAR: defined_type = 4;
+pub const DEFINED_CVAR: defined_type = 5;
+pub const DEFINED_CONST: defined_type = 6;
+pub const DEFINED_METHOD: defined_type = 7;
+pub const DEFINED_YIELD: defined_type = 8;
+pub const DEFINED_ZSUPER: defined_type = 9;
+pub const DEFINED_SELF: defined_type = 10;
+pub const DEFINED_TRUE: defined_type = 11;
+pub const DEFINED_FALSE: defined_type = 12;
+pub const DEFINED_ASGN: defined_type = 13;
+pub const DEFINED_EXPR: defined_type = 14;
+pub const DEFINED_REF: defined_type = 15;
+pub const DEFINED_FUNC: defined_type = 16;
+pub const DEFINED_CONST_FROM: defined_type = 17;
+pub type defined_type = u32;
+pub const ROBJECT_OFFSET_AS_HEAP_FIELDS: robject_offsets = 16;
 pub const ROBJECT_OFFSET_AS_ARY: robject_offsets = 16;
 pub type robject_offsets = u32;
 pub const RUBY_OFFSET_RSTRING_LEN: rstring_offsets = 16;
 pub type rstring_offsets = u32;
 pub type rb_seq_param_keyword_struct = rb_iseq_constant_body__bindgen_ty_1_rb_iseq_param_keyword;
+pub type rb_iseq_param_keyword_struct = rb_iseq_constant_body__bindgen_ty_1_rb_iseq_param_keyword;
 extern "C" {
+    pub fn ruby_xfree(ptr: *mut ::std::os::raw::c_void);
     pub fn rb_class_attached_object(klass: VALUE) -> VALUE;
     pub fn rb_singleton_class(obj: VALUE) -> VALUE;
     pub fn rb_get_alloc_func(klass: VALUE) -> rb_alloc_func_t;
     pub fn rb_method_basic_definition_p(klass: VALUE, mid: ID) -> ::std::os::raw::c_int;
     pub fn rb_bug(fmt: *const ::std::os::raw::c_char, ...) -> !;
+    pub fn rb_float_new(d: f64) -> VALUE;
     pub fn rb_gc_mark(obj: VALUE);
     pub fn rb_gc_mark_movable(obj: VALUE);
     pub fn rb_gc_location(obj: VALUE) -> VALUE;
@@ -1096,6 +1021,7 @@ extern "C" {
     pub static mut rb_mKernel: VALUE;
     pub static mut rb_cBasicObject: VALUE;
     pub static mut rb_cArray: VALUE;
+    pub static mut rb_cClass: VALUE;
     pub static mut rb_cFalseClass: VALUE;
     pub static mut rb_cFloat: VALUE;
     pub static mut rb_cHash: VALUE;
@@ -1103,6 +1029,7 @@ extern "C" {
     pub static mut rb_cInteger: VALUE;
     pub static mut rb_cModule: VALUE;
     pub static mut rb_cNilClass: VALUE;
+    pub static mut rb_cNumeric: VALUE;
     pub static mut rb_cString: VALUE;
     pub static mut rb_cSymbol: VALUE;
     pub static mut rb_cThread: VALUE;
@@ -1112,6 +1039,7 @@ extern "C" {
     pub fn rb_ary_store(ary: VALUE, key: ::std::os::raw::c_long, val: VALUE);
     pub fn rb_ary_dup(ary: VALUE) -> VALUE;
     pub fn rb_ary_resurrect(ary: VALUE) -> VALUE;
+    pub fn rb_ary_cat(ary: VALUE, train: *const VALUE, len: ::std::os::raw::c_long) -> VALUE;
     pub fn rb_ary_push(ary: VALUE, elem: VALUE) -> VALUE;
     pub fn rb_ary_clear(ary: VALUE) -> VALUE;
     pub fn rb_hash_new() -> VALUE;
@@ -1122,9 +1050,16 @@ extern "C" {
     pub fn rb_sym2id(obj: VALUE) -> ID;
     pub fn rb_id2sym(id: ID) -> VALUE;
     pub fn rb_intern(name: *const ::std::os::raw::c_char) -> ID;
+    pub fn rb_intern2(name: *const ::std::os::raw::c_char, len: ::std::os::raw::c_long) -> ID;
     pub fn rb_id2name(id: ID) -> *const ::std::os::raw::c_char;
     pub fn rb_class2name(klass: VALUE) -> *const ::std::os::raw::c_char;
+    pub fn rb_class_new_instance_pass_kw(
+        argc: ::std::os::raw::c_int,
+        argv: *const VALUE,
+        klass: VALUE,
+    ) -> VALUE;
     pub fn rb_obj_is_kind_of(obj: VALUE, klass: VALUE) -> VALUE;
+    pub fn rb_obj_alloc(klass: VALUE) -> VALUE;
     pub fn rb_obj_frozen_p(obj: VALUE) -> VALUE;
     pub fn rb_backref_get() -> VALUE;
     pub fn rb_range_new(beg: VALUE, end: VALUE, excl: ::std::os::raw::c_int) -> VALUE;
@@ -1140,10 +1075,13 @@ extern "C" {
     pub fn rb_str_buf_append(dst: VALUE, src: VALUE) -> VALUE;
     pub fn rb_str_dup(str_: VALUE) -> VALUE;
     pub fn rb_str_intern(str_: VALUE) -> VALUE;
+    pub fn rb_mod_name(mod_: VALUE) -> VALUE;
     pub fn rb_ivar_get(obj: VALUE, name: ID) -> VALUE;
     pub fn rb_ivar_defined(obj: VALUE, name: ID) -> VALUE;
     pub fn rb_attr_get(obj: VALUE, name: ID) -> VALUE;
     pub fn rb_obj_info_dump(obj: VALUE);
+    pub fn rb_class_allocate_instance(klass: VALUE) -> VALUE;
+    pub fn rb_obj_equal(obj1: VALUE, obj2: VALUE) -> VALUE;
     pub fn rb_reg_new_ary(ary: VALUE, options: ::std::os::raw::c_int) -> VALUE;
     pub fn rb_ary_tmp_new_from_values(
         arg1: VALUE,
@@ -1155,6 +1093,7 @@ extern "C" {
         n: ::std::os::raw::c_long,
         elts: *const VALUE,
     ) -> VALUE;
+    pub fn rb_vm_top_self() -> VALUE;
     pub static mut rb_vm_insns_count: u64;
     pub fn rb_method_entry_at(obj: VALUE, id: ID) -> *const rb_method_entry_t;
     pub fn rb_callable_method_entry(klass: VALUE, id: ID) -> *const rb_callable_method_entry_t;
@@ -1172,24 +1111,31 @@ extern "C" {
         cfp: *const rb_control_frame_t,
     ) -> *const rb_callable_method_entry_t;
     pub fn rb_obj_info(obj: VALUE) -> *const ::std::os::raw::c_char;
-    pub fn rb_class_allocate_instance(klass: VALUE) -> VALUE;
+    pub fn rb_ec_stack_check(ec: *mut rb_execution_context_struct) -> ::std::os::raw::c_int;
     pub fn rb_shape_id_offset() -> i32;
-    pub fn rb_shape_get_shape_by_id(shape_id: shape_id_t) -> *mut rb_shape_t;
-    pub fn rb_shape_get_shape_id(obj: VALUE) -> shape_id_t;
-    pub fn rb_shape_get_iv_index(shape: *mut rb_shape_t, id: ID, value: *mut attr_index_t) -> bool;
-    pub fn rb_shape_obj_too_complex(obj: VALUE) -> bool;
-    pub fn rb_shape_transition_shape_capa(
-        shape: *mut rb_shape_t,
-        new_capacity: u32,
-    ) -> *mut rb_shape_t;
-    pub fn rb_shape_get_next(shape: *mut rb_shape_t, obj: VALUE, id: ID) -> *mut rb_shape_t;
-    pub fn rb_shape_id(shape: *mut rb_shape_t) -> shape_id_t;
+    pub fn rb_obj_shape_id(obj: VALUE) -> shape_id_t;
+    pub fn rb_shape_get_iv_index(shape_id: shape_id_t, id: ID, value: *mut attr_index_t) -> bool;
+    pub fn rb_shape_transition_add_ivar_no_warnings(obj: VALUE, id: ID) -> shape_id_t;
     pub fn rb_gvar_get(arg1: ID) -> VALUE;
     pub fn rb_gvar_set(arg1: ID, arg2: VALUE) -> VALUE;
-    pub fn rb_ensure_iv_list_size(obj: VALUE, len: u32, newsize: u32);
+    pub fn rb_ensure_iv_list_size(obj: VALUE, current_len: u32, newsize: u32);
+    pub fn rb_vm_barrier();
+    pub fn rb_str_dup_m(str_: VALUE) -> VALUE;
+    pub fn rb_str_byte_substr(str_: VALUE, beg: VALUE, len: VALUE) -> VALUE;
+    pub fn rb_str_substr_two_fixnums(
+        str_: VALUE,
+        beg: VALUE,
+        len: VALUE,
+        empty: ::std::os::raw::c_int,
+    ) -> VALUE;
     pub fn rb_obj_as_string_result(str_: VALUE, obj: VALUE) -> VALUE;
     pub fn rb_str_concat_literals(num: usize, strary: *const VALUE) -> VALUE;
-    pub fn rb_ec_str_resurrect(ec: *mut rb_execution_context_struct, str_: VALUE) -> VALUE;
+    pub fn rb_ec_str_resurrect(
+        ec: *mut rb_execution_context_struct,
+        str_: VALUE,
+        chilled: bool,
+    ) -> VALUE;
+    pub fn rb_to_hash_type(obj: VALUE) -> VALUE;
     pub fn rb_hash_stlike_foreach(
         hash: VALUE,
         func: st_foreach_callback_func,
@@ -1204,12 +1150,15 @@ extern "C" {
     ) -> ::std::os::raw::c_int;
     pub fn rb_insn_len(insn: VALUE) -> ::std::os::raw::c_int;
     pub fn rb_vm_insn_decode(encoded: VALUE) -> ::std::os::raw::c_int;
+    pub fn rb_float_plus(x: VALUE, y: VALUE) -> VALUE;
+    pub fn rb_float_minus(x: VALUE, y: VALUE) -> VALUE;
+    pub fn rb_float_mul(x: VALUE, y: VALUE) -> VALUE;
+    pub fn rb_float_div(x: VALUE, y: VALUE) -> VALUE;
     pub fn rb_fix_aref(fix: VALUE, idx: VALUE) -> VALUE;
     pub fn rb_vm_insn_addr2opcode(addr: *const ::std::os::raw::c_void) -> ::std::os::raw::c_int;
     pub fn rb_iseq_line_no(iseq: *const rb_iseq_t, pos: usize) -> ::std::os::raw::c_uint;
     pub fn rb_iseqw_to_iseq(iseqw: VALUE) -> *const rb_iseq_t;
     pub fn rb_iseq_label(iseq: *const rb_iseq_t) -> VALUE;
-    pub fn rb_vm_barrier();
     pub fn rb_profile_frames(
         start: ::std::os::raw::c_int,
         limit: ::std::os::raw::c_int,
@@ -1234,15 +1183,79 @@ extern "C" {
     pub fn rb_yjit_reserve_addr_space(mem_size: u32) -> *mut u8;
     pub fn rb_c_method_tracing_currently_enabled(ec: *const rb_execution_context_t) -> bool;
     pub fn rb_full_cfunc_return(ec: *mut rb_execution_context_t, return_value: VALUE);
-    pub fn rb_iseq_encoded_size(iseq: *const rb_iseq_t) -> ::std::os::raw::c_uint;
     pub fn rb_iseq_get_yjit_payload(iseq: *const rb_iseq_t) -> *mut ::std::os::raw::c_void;
     pub fn rb_iseq_set_yjit_payload(iseq: *const rb_iseq_t, payload: *mut ::std::os::raw::c_void);
     pub fn rb_iseq_reset_jit_func(iseq: *const rb_iseq_t);
+    pub fn rb_yjit_get_proc_ptr(procv: VALUE) -> *mut rb_proc_t;
+    pub fn rb_get_symbol_id(namep: VALUE) -> ID;
+    pub fn rb_get_def_bmethod_proc(def: *mut rb_method_definition_t) -> VALUE;
+    pub fn rb_optimized_call(
+        recv: *mut VALUE,
+        ec: *mut rb_execution_context_t,
+        argc: ::std::os::raw::c_int,
+        argv: *mut VALUE,
+        kw_splat: ::std::os::raw::c_int,
+        block_handler: VALUE,
+    ) -> VALUE;
+    pub fn rb_yjit_iseq_builtin_attrs(iseq: *const rb_iseq_t) -> ::std::os::raw::c_uint;
+    pub fn rb_yjit_builtin_function(iseq: *const rb_iseq_t) -> *const rb_builtin_function;
+    pub fn rb_yjit_str_simple_append(str1: VALUE, str2: VALUE) -> VALUE;
+    pub fn rb_set_cfp_pc(cfp: *mut rb_control_frame_struct, pc: *const VALUE);
+    pub fn rb_set_cfp_sp(cfp: *mut rb_control_frame_struct, sp: *mut VALUE);
+    pub fn rb_vm_base_ptr(cfp: *mut rb_control_frame_struct) -> *mut VALUE;
+    pub fn rb_yarv_str_eql_internal(str1: VALUE, str2: VALUE) -> VALUE;
+    pub fn rb_str_neq_internal(str1: VALUE, str2: VALUE) -> VALUE;
+    pub fn rb_ary_unshift_m(argc: ::std::os::raw::c_int, argv: *mut VALUE, ary: VALUE) -> VALUE;
+    pub fn rb_yjit_rb_ary_subseq_length(ary: VALUE, beg: ::std::os::raw::c_long) -> VALUE;
+    pub fn rb_yjit_fix_div_fix(recv: VALUE, obj: VALUE) -> VALUE;
+    pub fn rb_yjit_fix_mod_fix(recv: VALUE, obj: VALUE) -> VALUE;
+    pub fn rb_yjit_ruby2_keywords_splat_p(obj: VALUE) -> usize;
+    pub fn rb_yjit_splat_varg_checks(
+        sp: *mut VALUE,
+        splat_array: VALUE,
+        cfp: *mut rb_control_frame_t,
+    ) -> VALUE;
+    pub fn rb_yjit_splat_varg_cfunc(stack_splat_array: *mut VALUE) -> ::std::os::raw::c_int;
+    pub fn rb_yjit_dump_iseq_loc(iseq: *const rb_iseq_t, insn_idx: u32);
+    pub fn rb_yjit_iseq_inspect(iseq: *const rb_iseq_t) -> *mut ::std::os::raw::c_char;
+    pub fn rb_RSTRUCT_SET(st: VALUE, k: ::std::os::raw::c_int, v: VALUE);
+    pub fn rb_ENCODING_GET(obj: VALUE) -> ::std::os::raw::c_int;
+    pub fn rb_yjit_multi_ractor_p() -> bool;
+    pub fn rb_yjit_constcache_shareable(ice: *const iseq_inline_constant_cache_entry) -> bool;
+    pub fn rb_yjit_for_each_iseq(callback: rb_iseq_callback, data: *mut ::std::os::raw::c_void);
+    pub fn rb_yjit_obj_written(
+        old: VALUE,
+        young: VALUE,
+        file: *const ::std::os::raw::c_char,
+        line: ::std::os::raw::c_int,
+    );
+    pub fn rb_yjit_vm_lock_then_barrier(
+        recursive_lock_level: *mut ::std::os::raw::c_uint,
+        file: *const ::std::os::raw::c_char,
+        line: ::std::os::raw::c_int,
+    );
+    pub fn rb_yjit_vm_unlock(
+        recursive_lock_level: *mut ::std::os::raw::c_uint,
+        file: *const ::std::os::raw::c_char,
+        line: ::std::os::raw::c_int,
+    );
+    pub fn rb_object_shape_count() -> VALUE;
+    pub fn rb_yjit_shape_too_complex_p(shape_id: shape_id_t) -> bool;
+    pub fn rb_yjit_shape_obj_too_complex_p(obj: VALUE) -> bool;
+    pub fn rb_yjit_shape_capacity(shape_id: shape_id_t) -> attr_index_t;
+    pub fn rb_yjit_shape_index(shape_id: shape_id_t) -> attr_index_t;
+    pub fn rb_yjit_sendish_sp_pops(ci: *const rb_callinfo) -> usize;
+    pub fn rb_yjit_invokeblock_sp_pops(ci: *const rb_callinfo) -> usize;
+    pub fn rb_yjit_set_exception_return(
+        cfp: *mut rb_control_frame_t,
+        leave_exit: *mut ::std::os::raw::c_void,
+        leave_exception: *mut ::std::os::raw::c_void,
+    );
+    pub fn rb_iseq_encoded_size(iseq: *const rb_iseq_t) -> ::std::os::raw::c_uint;
     pub fn rb_iseq_pc_at_idx(iseq: *const rb_iseq_t, insn_idx: u32) -> *mut VALUE;
     pub fn rb_iseq_opcode_at_pc(iseq: *const rb_iseq_t, pc: *const VALUE) -> ::std::os::raw::c_int;
     pub fn rb_RSTRING_LEN(str_: VALUE) -> ::std::os::raw::c_ulong;
     pub fn rb_RSTRING_PTR(str_: VALUE) -> *mut ::std::os::raw::c_char;
-    pub fn rb_yjit_get_proc_ptr(procv: VALUE) -> *mut rb_proc_t;
     pub fn rb_insn_name(insn: VALUE) -> *const ::std::os::raw::c_char;
     pub fn rb_vm_ci_argc(ci: *const rb_callinfo) -> ::std::os::raw::c_uint;
     pub fn rb_vm_ci_mid(ci: *const rb_callinfo) -> ID;
@@ -1256,7 +1269,6 @@ extern "C" {
     pub fn rb_METHOD_ENTRY_VISI(me: *const rb_callable_method_entry_t) -> rb_method_visibility_t;
     pub fn rb_get_cme_def_type(cme: *const rb_callable_method_entry_t) -> rb_method_type_t;
     pub fn rb_get_cme_def_body_attr_id(cme: *const rb_callable_method_entry_t) -> ID;
-    pub fn rb_get_symbol_id(namep: VALUE) -> ID;
     pub fn rb_get_cme_def_body_optimized_type(
         cme: *const rb_callable_method_entry_t,
     ) -> method_optimized_type;
@@ -1271,97 +1283,49 @@ extern "C" {
     pub fn rb_get_mct_argc(mct: *const rb_method_cfunc_t) -> ::std::os::raw::c_int;
     pub fn rb_get_mct_func(mct: *const rb_method_cfunc_t) -> *mut ::std::os::raw::c_void;
     pub fn rb_get_def_iseq_ptr(def: *mut rb_method_definition_t) -> *const rb_iseq_t;
-    pub fn rb_get_def_bmethod_proc(def: *mut rb_method_definition_t) -> VALUE;
     pub fn rb_get_iseq_body_local_iseq(iseq: *const rb_iseq_t) -> *const rb_iseq_t;
     pub fn rb_get_iseq_body_parent_iseq(iseq: *const rb_iseq_t) -> *const rb_iseq_t;
     pub fn rb_get_iseq_body_local_table_size(iseq: *const rb_iseq_t) -> ::std::os::raw::c_uint;
     pub fn rb_get_iseq_body_iseq_encoded(iseq: *const rb_iseq_t) -> *mut VALUE;
     pub fn rb_get_iseq_body_stack_max(iseq: *const rb_iseq_t) -> ::std::os::raw::c_uint;
+    pub fn rb_get_iseq_body_type(iseq: *const rb_iseq_t) -> rb_iseq_type;
     pub fn rb_get_iseq_flags_has_lead(iseq: *const rb_iseq_t) -> bool;
     pub fn rb_get_iseq_flags_has_opt(iseq: *const rb_iseq_t) -> bool;
     pub fn rb_get_iseq_flags_has_kw(iseq: *const rb_iseq_t) -> bool;
     pub fn rb_get_iseq_flags_has_post(iseq: *const rb_iseq_t) -> bool;
     pub fn rb_get_iseq_flags_has_kwrest(iseq: *const rb_iseq_t) -> bool;
+    pub fn rb_get_iseq_flags_anon_kwrest(iseq: *const rb_iseq_t) -> bool;
     pub fn rb_get_iseq_flags_has_rest(iseq: *const rb_iseq_t) -> bool;
     pub fn rb_get_iseq_flags_ruby2_keywords(iseq: *const rb_iseq_t) -> bool;
     pub fn rb_get_iseq_flags_has_block(iseq: *const rb_iseq_t) -> bool;
     pub fn rb_get_iseq_flags_ambiguous_param0(iseq: *const rb_iseq_t) -> bool;
     pub fn rb_get_iseq_flags_accepts_no_kwarg(iseq: *const rb_iseq_t) -> bool;
+    pub fn rb_get_iseq_flags_forwardable(iseq: *const rb_iseq_t) -> bool;
     pub fn rb_get_iseq_body_param_keyword(
         iseq: *const rb_iseq_t,
-    ) -> *const rb_seq_param_keyword_struct;
+    ) -> *const rb_iseq_param_keyword_struct;
     pub fn rb_get_iseq_body_param_size(iseq: *const rb_iseq_t) -> ::std::os::raw::c_uint;
     pub fn rb_get_iseq_body_param_lead_num(iseq: *const rb_iseq_t) -> ::std::os::raw::c_int;
     pub fn rb_get_iseq_body_param_opt_num(iseq: *const rb_iseq_t) -> ::std::os::raw::c_int;
     pub fn rb_get_iseq_body_param_opt_table(iseq: *const rb_iseq_t) -> *const VALUE;
-    pub fn rb_optimized_call(
-        recv: *mut VALUE,
-        ec: *mut rb_execution_context_t,
-        argc: ::std::os::raw::c_int,
-        argv: *mut VALUE,
-        kw_splat: ::std::os::raw::c_int,
-        block_handler: VALUE,
-    ) -> VALUE;
-    pub fn rb_yjit_iseq_builtin_attrs(iseq: *const rb_iseq_t) -> ::std::os::raw::c_uint;
-    pub fn rb_yjit_builtin_function(iseq: *const rb_iseq_t) -> *const rb_builtin_function;
-    pub fn rb_yjit_str_simple_append(str1: VALUE, str2: VALUE) -> VALUE;
     pub fn rb_get_ec_cfp(ec: *const rb_execution_context_t) -> *mut rb_control_frame_struct;
     pub fn rb_get_cfp_iseq(cfp: *mut rb_control_frame_struct) -> *const rb_iseq_t;
     pub fn rb_get_cfp_pc(cfp: *mut rb_control_frame_struct) -> *mut VALUE;
     pub fn rb_get_cfp_sp(cfp: *mut rb_control_frame_struct) -> *mut VALUE;
-    pub fn rb_set_cfp_pc(cfp: *mut rb_control_frame_struct, pc: *const VALUE);
-    pub fn rb_set_cfp_sp(cfp: *mut rb_control_frame_struct, sp: *mut VALUE);
-    pub fn rb_cfp_get_iseq(cfp: *mut rb_control_frame_struct) -> *mut rb_iseq_t;
     pub fn rb_get_cfp_self(cfp: *mut rb_control_frame_struct) -> VALUE;
     pub fn rb_get_cfp_ep(cfp: *mut rb_control_frame_struct) -> *mut VALUE;
     pub fn rb_get_cfp_ep_level(cfp: *mut rb_control_frame_struct, lv: u32) -> *const VALUE;
-    pub fn rb_vm_base_ptr(cfp: *mut rb_control_frame_struct) -> *mut VALUE;
     pub fn rb_yarv_class_of(obj: VALUE) -> VALUE;
-    pub fn rb_yarv_str_eql_internal(str1: VALUE, str2: VALUE) -> VALUE;
-    pub fn rb_str_neq_internal(str1: VALUE, str2: VALUE) -> VALUE;
-    pub fn rb_yarv_ary_entry_internal(ary: VALUE, offset: ::std::os::raw::c_long) -> VALUE;
-    pub fn rb_ary_unshift_m(argc: ::std::os::raw::c_int, argv: *mut VALUE, ary: VALUE) -> VALUE;
-    pub fn rb_yjit_rb_ary_subseq_length(ary: VALUE, beg: ::std::os::raw::c_long) -> VALUE;
-    pub fn rb_yjit_fix_div_fix(recv: VALUE, obj: VALUE) -> VALUE;
-    pub fn rb_yjit_fix_mod_fix(recv: VALUE, obj: VALUE) -> VALUE;
-    pub fn rb_yjit_fix_mul_fix(recv: VALUE, obj: VALUE) -> VALUE;
-    pub fn rb_yjit_dump_iseq_loc(iseq: *const rb_iseq_t, insn_idx: u32);
     pub fn rb_FL_TEST(obj: VALUE, flags: VALUE) -> VALUE;
     pub fn rb_FL_TEST_RAW(obj: VALUE, flags: VALUE) -> VALUE;
     pub fn rb_RB_TYPE_P(obj: VALUE, t: ruby_value_type) -> bool;
     pub fn rb_RSTRUCT_LEN(st: VALUE) -> ::std::os::raw::c_long;
-    pub fn rb_RSTRUCT_SET(st: VALUE, k: ::std::os::raw::c_int, v: VALUE);
     pub fn rb_get_call_data_ci(cd: *const rb_call_data) -> *const rb_callinfo;
     pub fn rb_BASIC_OP_UNREDEFINED_P(bop: ruby_basic_operators, klass: u32) -> bool;
     pub fn rb_RCLASS_ORIGIN(c: VALUE) -> VALUE;
-    pub fn rb_ENCODING_GET(obj: VALUE) -> ::std::os::raw::c_int;
-    pub fn rb_yjit_multi_ractor_p() -> bool;
     pub fn rb_assert_iseq_handle(handle: VALUE);
+    pub fn rb_assert_holding_vm_lock();
     pub fn rb_IMEMO_TYPE_P(imemo: VALUE, imemo_type: imemo_type) -> ::std::os::raw::c_int;
     pub fn rb_assert_cme_handle(handle: VALUE);
-    pub fn rb_yjit_for_each_iseq(callback: rb_iseq_callback, data: *mut ::std::os::raw::c_void);
-    pub fn rb_yjit_obj_written(
-        old: VALUE,
-        young: VALUE,
-        file: *const ::std::os::raw::c_char,
-        line: ::std::os::raw::c_int,
-    );
-    pub fn rb_yjit_vm_lock_then_barrier(
-        recursive_lock_level: *mut ::std::os::raw::c_uint,
-        file: *const ::std::os::raw::c_char,
-        line: ::std::os::raw::c_int,
-    );
-    pub fn rb_yjit_vm_unlock(
-        recursive_lock_level: *mut ::std::os::raw::c_uint,
-        file: *const ::std::os::raw::c_char,
-        line: ::std::os::raw::c_int,
-    );
-    pub fn rb_yjit_assert_holding_vm_lock();
-    pub fn rb_yjit_sendish_sp_pops(ci: *const rb_callinfo) -> usize;
-    pub fn rb_yjit_invokeblock_sp_pops(ci: *const rb_callinfo) -> usize;
-    pub fn rb_yjit_set_exception_return(
-        cfp: *mut rb_control_frame_t,
-        leave_exit: *mut ::std::os::raw::c_void,
-        leave_exception: *mut ::std::os::raw::c_void,
-    );
+    pub fn rb_yarv_ary_entry_internal(ary: VALUE, offset: ::std::os::raw::c_long) -> VALUE;
 }
diff --git a/yjit/src/disasm.rs b/yjit/src/disasm.rs
index 0b160c7cae32ce..4f85937ee9f0b7 100644
--- a/yjit/src/disasm.rs
+++ b/yjit/src/disasm.rs
@@ -1,16 +1,44 @@
 use crate::core::*;
 use crate::cruby::*;
 use crate::yjit::yjit_enabled_p;
-#[cfg(feature = "disasm")]
 use crate::asm::CodeBlock;
-#[cfg(feature = "disasm")]
 use crate::codegen::CodePtr;
-#[cfg(feature = "disasm")]
 use crate::options::DumpDisasm;
 
-#[cfg(feature = "disasm")]
 use std::fmt::Write;
 
+#[cfg_attr(not(feature = "disasm"), allow(dead_code))]
+#[derive(Copy, Clone, Debug)]
+pub struct TerminalColor {
+    pub blue_begin: &'static str,
+    pub blue_end: &'static str,
+    pub bold_begin: &'static str,
+    pub bold_end: &'static str,
+}
+
+pub static TTY_TERMINAL_COLOR: TerminalColor = TerminalColor {
+    blue_begin: "\x1b[34m",
+    blue_end: "\x1b[0m",
+    bold_begin: "\x1b[1m",
+    bold_end: "\x1b[22m",
+};
+
+pub static NON_TTY_TERMINAL_COLOR: TerminalColor = TerminalColor {
+    blue_begin: "",
+    blue_end: "",
+    bold_begin: "",
+    bold_end: "",
+};
+
+/// Terminal escape codes for colors, font weight, etc. Only enabled if stdout is a TTY.
+pub fn get_colors() -> &'static TerminalColor {
+    if crate::utils::stdout_supports_colors() {
+        &TTY_TERMINAL_COLOR
+    } else {
+        &NON_TTY_TERMINAL_COLOR
+    }
+}
+
 /// Primitive called in yjit.rb
 /// Produce a string representing the disassembly for an ISEQ
 #[no_mangle]
@@ -23,11 +51,6 @@ pub extern "C" fn rb_yjit_disasm_iseq(_ec: EcPtr, _ruby_self: VALUE, iseqw: VALU
 
     #[cfg(feature = "disasm")]
     {
-        // TODO:
-        //if unsafe { CLASS_OF(iseqw) != rb_cISeq } {
-        //    return Qnil;
-        //}
-
         if !yjit_enabled_p() {
             return Qnil;
         }
@@ -59,21 +82,7 @@ pub fn disasm_iseq_insn_range(iseq: IseqPtr, start_idx: u16, end_idx: u16) -> St
     let global_cb = crate::codegen::CodegenGlobals::get_inline_cb();
 
     // Sort the blocks by increasing start addresses
-    block_list.sort_by(|a, b| {
-        use std::cmp::Ordering;
-
-        // Get the start addresses for each block
-        let addr_a = a.get_start_addr().raw_ptr();
-        let addr_b = b.get_start_addr().raw_ptr();
-
-        if addr_a < addr_b {
-            Ordering::Less
-        } else if addr_a == addr_b {
-            Ordering::Equal
-        } else {
-            Ordering::Greater
-        }
-    });
+    block_list.sort_by_key(|block| block.get_start_addr().as_offset());
 
     // Compute total code size in bytes for all blocks in the function
     let mut total_code_size = 0;
@@ -116,7 +125,7 @@ pub fn disasm_iseq_insn_range(iseq: IseqPtr, start_idx: u16, end_idx: u16) -> St
                 // Compute the size of the gap between this block and the next
                 let next_block = block_list[block_idx + 1];
                 let next_start_addr = next_block.get_start_addr();
-                let gap_size = next_start_addr.into_usize() - end_addr.into_usize();
+                let gap_size = next_start_addr.as_offset() - end_addr.as_offset();
 
                 // Log the size of the gap between the blocks if nonzero
                 if gap_size > 0 {
@@ -129,19 +138,21 @@ pub fn disasm_iseq_insn_range(iseq: IseqPtr, start_idx: u16, end_idx: u16) -> St
     return out;
 }
 
-#[cfg(feature = "disasm")]
+/// Dump dissassembly for a range in a [CodeBlock]. VM lock required.
 pub fn dump_disasm_addr_range(cb: &CodeBlock, start_addr: CodePtr, end_addr: CodePtr, dump_disasm: &DumpDisasm) {
-    use std::fs::File;
-    use std::io::Write;
-
     for (start_addr, end_addr) in cb.writable_addrs(start_addr, end_addr) {
         let disasm = disasm_addr_range(cb, start_addr, end_addr);
         if disasm.len() > 0 {
             match dump_disasm {
                 DumpDisasm::Stdout => println!("{disasm}"),
-                DumpDisasm::File(path) => {
-                    let mut f = File::options().create(true).append(true).open(path).unwrap();
-                    f.write_all(disasm.as_bytes()).unwrap();
+                DumpDisasm::File(fd) => {
+                    use std::os::unix::io::{FromRawFd, IntoRawFd};
+                    use std::io::Write;
+
+                    // Write with the fd opened during boot
+                    let mut file = unsafe { std::fs::File::from_raw_fd(*fd) };
+                    file.write_all(disasm.as_bytes()).unwrap();
+                    let _ = file.into_raw_fd(); // keep the fd open
                 }
             };
         }
@@ -179,6 +190,7 @@ pub fn disasm_addr_range(cb: &CodeBlock, start_addr: usize, end_addr: usize) ->
     #[cfg(test)]
     let start_addr = 0;
     let insns = cs.disasm_all(code_slice, start_addr as u64).unwrap();
+    let colors = get_colors();
 
     // For each instruction in this block
     for insn in insns.as_ref() {
@@ -186,23 +198,63 @@ pub fn disasm_addr_range(cb: &CodeBlock, start_addr: usize, end_addr: usize) ->
         if let Some(comment_list) = cb.comments_at(insn.address() as usize) {
             for comment in comment_list {
                 if cb.outlined {
-                    write!(&mut out, "\x1b[34m").unwrap(); // Make outlined code blue
+                    write!(&mut out, "{}", colors.blue_begin).unwrap(); // Make outlined code blue
                 }
-                writeln!(&mut out, "  \x1b[1m# {comment}\x1b[22m").unwrap(); // Make comments bold
+                writeln!(&mut out, "  {}# {comment}{}", colors.bold_begin, colors.bold_end).unwrap(); // Make comments bold
             }
         }
         if cb.outlined {
-            write!(&mut out, "\x1b[34m").unwrap(); // Make outlined code blue
+            write!(&mut out, "{}", colors.blue_begin).unwrap(); // Make outlined code blue
         }
         writeln!(&mut out, "  {insn}").unwrap();
         if cb.outlined {
-            write!(&mut out, "\x1b[0m").unwrap(); // Disable blue
+            write!(&mut out, "{}", colors.blue_end).unwrap(); // Disable blue
         }
     }
 
     return out;
 }
 
+/// Fallback version without dependency on a disassembler which prints just bytes and comments.
+#[cfg(not(feature = "disasm"))]
+pub fn disasm_addr_range(cb: &CodeBlock, start_addr: usize, end_addr: usize) -> String {
+    let mut out = String::new();
+    let mut line_byte_idx = 0;
+    const MAX_BYTES_PER_LINE: usize = 16;
+    let colors = get_colors();
+
+    for addr in start_addr..end_addr {
+        if let Some(comment_list) = cb.comments_at(addr) {
+            // Start a new line if we're in the middle of one
+            if line_byte_idx != 0 {
+                writeln!(&mut out).unwrap();
+                line_byte_idx = 0;
+            }
+            for comment in comment_list {
+                writeln!(&mut out, "  {}# {comment}{}", colors.bold_begin, colors.bold_end).unwrap(); // Make comments bold
+            }
+        }
+        if line_byte_idx == 0 {
+            write!(&mut out, "  0x{addr:x}: ").unwrap();
+        } else {
+            write!(&mut out, " ").unwrap();
+        }
+        let byte = unsafe { (addr as *const u8).read() };
+        write!(&mut out, "{byte:02x}").unwrap();
+        line_byte_idx += 1;
+        if line_byte_idx == MAX_BYTES_PER_LINE - 1 {
+            writeln!(&mut out).unwrap();
+            line_byte_idx = 0;
+        }
+    }
+
+    if !out.is_empty() {
+        writeln!(&mut out).unwrap();
+    }
+
+    out
+}
+
 /// Assert that CodeBlock has the code specified with hex. In addition, if tested with
 /// `cargo test --all-features`, it also checks it generates the specified disasm.
 #[cfg(test)]
@@ -212,8 +264,8 @@ macro_rules! assert_disasm {
         {
             let disasm = disasm_addr_range(
                 &$cb,
-                $cb.get_ptr(0).raw_ptr() as usize,
-                $cb.get_write_ptr().raw_ptr() as usize,
+                $cb.get_ptr(0).raw_addr(&$cb),
+                $cb.get_write_ptr().raw_addr(&$cb),
             );
             assert_eq!(unindent(&disasm, false), unindent(&$disasm, true));
         }
@@ -275,43 +327,36 @@ pub fn unindent(string: &str, trim_lines: bool) -> String {
 /// Produce a list of instructions compiled for an isew
 #[no_mangle]
 pub extern "C" fn rb_yjit_insns_compiled(_ec: EcPtr, _ruby_self: VALUE, iseqw: VALUE) -> VALUE {
-    {
-        // TODO:
-        //if unsafe { CLASS_OF(iseqw) != rb_cISeq } {
-        //    return Qnil;
-        //}
-
-        if !yjit_enabled_p() {
-            return Qnil;
-        }
-
-        // Get the iseq pointer from the wrapper
-        let iseq = unsafe { rb_iseqw_to_iseq(iseqw) };
+    if !yjit_enabled_p() {
+        return Qnil;
+    }
 
-        // Get the list of instructions compiled
-        let insn_vec = insns_compiled(iseq);
+    // Get the iseq pointer from the wrapper
+    let iseq = unsafe { rb_iseqw_to_iseq(iseqw) };
 
-        unsafe {
-            let insn_ary = rb_ary_new_capa((insn_vec.len() * 2) as i64);
+    // Get the list of instructions compiled
+    let insn_vec = insns_compiled(iseq);
 
-            // For each instruction compiled
-            for idx in 0..insn_vec.len() {
-                let op_name = &insn_vec[idx].0;
-                let insn_idx = insn_vec[idx].1;
+    unsafe {
+        let insn_ary = rb_ary_new_capa((insn_vec.len() * 2) as i64);
 
-                let op_sym = rust_str_to_sym(&op_name);
+        // For each instruction compiled
+        for idx in 0..insn_vec.len() {
+            let op_name = &insn_vec[idx].0;
+            let insn_idx = insn_vec[idx].1;
 
-                // Store the instruction index and opcode symbol
-                rb_ary_store(
-                    insn_ary,
-                    (2 * idx + 0) as i64,
-                    VALUE::fixnum_from_usize(insn_idx as usize),
-                );
-                rb_ary_store(insn_ary, (2 * idx + 1) as i64, op_sym);
-            }
+            let op_sym = rust_str_to_sym(&op_name);
 
-            insn_ary
+            // Store the instruction index and opcode symbol
+            rb_ary_store(
+                insn_ary,
+                (2 * idx + 0) as i64,
+                VALUE::fixnum_from_usize(insn_idx as usize),
+            );
+            rb_ary_store(insn_ary, (2 * idx + 1) as i64, op_sym);
         }
+
+        insn_ary
     }
 }
 
diff --git a/yjit/src/invariants.rs b/yjit/src/invariants.rs
index 854ef6cf1484b0..a1a7d300aa13b3 100644
--- a/yjit/src/invariants.rs
+++ b/yjit/src/invariants.rs
@@ -1,7 +1,6 @@
 //! Code to track assumptions made during code generation and invalidate
 //! generated code if and when these assumptions are invalidated.
 
-use crate::asm::OutlinedCb;
 use crate::backend::ir::Assembler;
 use crate::codegen::*;
 use crate::core::*;
@@ -11,6 +10,7 @@ use crate::utils::IntoUsize;
 use crate::yjit::yjit_enabled_p;
 
 use std::collections::{HashMap, HashSet};
+use std::os::raw::c_void;
 use std::mem;
 
 // Invariants to track:
@@ -30,7 +30,6 @@ pub struct Invariants {
     /// quick access to all of the blocks that are making this assumption when
     /// the operator is redefined.
     basic_operator_blocks: HashMap<(RedefinitionFlag, ruby_basic_operators), HashSet<BlockRef>>,
-
     /// A map from a block to a set of classes and their associated basic
     /// operators that the block is assuming are not redefined. This is used for
     /// quick access to all of the assumptions that a block is making when it
@@ -48,10 +47,23 @@ pub struct Invariants {
     /// a constant `A::B` is redefined, then all blocks that are assuming that
     /// `A` and `B` have not be redefined must be invalidated.
     constant_state_blocks: HashMap<ID, HashSet<BlockRef>>,
-
     /// A map from a block to a set of IDs that it is assuming have not been
     /// redefined.
     block_constant_states: HashMap<BlockRef, HashSet<ID>>,
+
+    /// A map from a class to a set of blocks that assume objects of the class
+    /// will have no singleton class. When the set is empty, it means that
+    /// there has been a singleton class for the class after boot, so you cannot
+    /// assume no singleton class going forward.
+    /// For now, the key can be only Array, Hash, or String. Consider making
+    /// an inverted HashMap if we start using this for user-defined classes
+    /// to maintain the performance of block_assumptions_free().
+    no_singleton_classes: HashMap<VALUE, HashSet<BlockRef>>,
+
+    /// A map from an ISEQ to a set of blocks that assume base pointer is equal
+    /// to environment pointer. When the set is empty, it means that EP has been
+    /// escaped in the ISEQ.
+    no_ep_escape_iseqs: HashMap<IseqPtr, HashSet<BlockRef>>,
 }
 
 /// Private singleton instance of the invariants global struct.
@@ -68,6 +80,8 @@ impl Invariants {
                 single_ractor: HashSet::new(),
                 constant_state_blocks: HashMap::new(),
                 block_constant_states: HashMap::new(),
+                no_singleton_classes: HashMap::new(),
+                no_ep_escape_iseqs: HashMap::new(),
             });
         }
     }
@@ -84,12 +98,13 @@ impl Invariants {
 pub fn assume_bop_not_redefined(
     jit: &mut JITState,
     asm: &mut Assembler,
-    ocb: &mut OutlinedCb,
     klass: RedefinitionFlag,
     bop: ruby_basic_operators,
 ) -> bool {
     if unsafe { BASIC_OP_UNREDEFINED_P(bop, klass) } {
-        jit_ensure_block_entry_exit(jit, asm, ocb);
+        if jit_ensure_block_entry_exit(jit, asm).is_none() {
+            return false;
+        }
         jit.bop_assumptions.push((klass, bop));
 
         return true;
@@ -127,6 +142,48 @@ pub fn track_method_lookup_stability_assumption(
         .insert(uninit_block);
 }
 
+/// Track that a block will assume that `klass` objects will have no singleton class.
+pub fn track_no_singleton_class_assumption(uninit_block: BlockRef, klass: VALUE) {
+    Invariants::get_instance()
+        .no_singleton_classes
+        .entry(klass)
+        .or_default()
+        .insert(uninit_block);
+}
+
+/// Returns true if we've seen a singleton class of a given class since boot.
+pub fn has_singleton_class_of(klass: VALUE) -> bool {
+    Invariants::get_instance()
+        .no_singleton_classes
+        .get(&klass)
+        .map_or(false, |blocks| blocks.is_empty())
+}
+
+/// Track that a block will assume that base pointer is equal to environment pointer.
+pub fn track_no_ep_escape_assumption(uninit_block: BlockRef, iseq: IseqPtr) {
+    Invariants::get_instance()
+        .no_ep_escape_iseqs
+        .entry(iseq)
+        .or_default()
+        .insert(uninit_block);
+}
+
+/// Returns true if a given ISEQ has previously escaped an environment.
+pub fn iseq_escapes_ep(iseq: IseqPtr) -> bool {
+    Invariants::get_instance()
+        .no_ep_escape_iseqs
+        .get(&iseq)
+        .map_or(false, |blocks| blocks.is_empty())
+}
+
+/// Forget an ISEQ remembered in invariants
+pub fn iseq_free_invariants(iseq: IseqPtr) {
+    if unsafe { INVARIANTS.is_none() } {
+        return;
+    }
+    Invariants::get_instance().no_ep_escape_iseqs.remove(&iseq);
+}
+
 // Checks rb_method_basic_definition_p and registers the current block for invalidation if method
 // lookup changes.
 // A "basic method" is one defined during VM boot, so we can use this to check assumptions based on
@@ -134,13 +191,12 @@ pub fn track_method_lookup_stability_assumption(
 pub fn assume_method_basic_definition(
     jit: &mut JITState,
     asm: &mut Assembler,
-    ocb: &mut OutlinedCb,
     klass: VALUE,
     mid: ID
 ) -> bool {
     if unsafe { rb_method_basic_definition_p(klass, mid) } != 0 {
         let cme = unsafe { rb_callable_method_entry(klass, mid) };
-        jit.assume_method_lookup_stable(asm, ocb, cme);
+        jit.assume_method_lookup_stable(asm, cme);
         true
     } else {
         false
@@ -149,11 +205,13 @@ pub fn assume_method_basic_definition(
 
 /// Tracks that a block is assuming it is operating in single-ractor mode.
 #[must_use]
-pub fn assume_single_ractor_mode(jit: &mut JITState, asm: &mut Assembler, ocb: &mut OutlinedCb) -> bool {
+pub fn assume_single_ractor_mode(jit: &mut JITState, asm: &mut Assembler) -> bool {
     if unsafe { rb_yjit_multi_ractor_p() } {
         false
     } else {
-        jit_ensure_block_entry_exit(jit, asm, ocb);
+        if jit_ensure_block_entry_exit(jit, asm).is_none() {
+            return false;
+        }
         jit.block_assumes_single_ractor = true;
 
         true
@@ -174,7 +232,7 @@ pub fn track_stable_constant_names_assumption(uninit_block: BlockRef, idlist: *c
         uninit_block: BlockRef,
         id: ID,
     ) {
-        if id == idNULL as u64 {
+        if id == ID!(NULL) {
             // Used for :: prefix
             return;
         }
@@ -316,6 +374,23 @@ pub extern "C" fn rb_yjit_root_mark() {
     }
 }
 
+#[no_mangle]
+pub extern "C" fn rb_yjit_root_update_references() {
+    if unsafe { INVARIANTS.is_none() } {
+        return;
+    }
+    let no_ep_escape_iseqs = &mut Invariants::get_instance().no_ep_escape_iseqs;
+
+    // Make a copy of the table with updated ISEQ keys
+    let mut updated_copy = HashMap::with_capacity(no_ep_escape_iseqs.len());
+    for (iseq, blocks) in mem::take(no_ep_escape_iseqs) {
+        let new_iseq = unsafe { rb_gc_location(iseq.into()) }.as_iseq();
+        updated_copy.insert(new_iseq, blocks);
+    }
+
+    *no_ep_escape_iseqs = updated_copy;
+}
+
 /// Remove all invariant assumptions made by the block by removing the block as
 /// as a key in all of the relevant tables.
 /// For safety, the block has to be initialized and the vm lock must be held.
@@ -386,6 +461,19 @@ pub fn block_assumptions_free(blockref: BlockRef) {
     if invariants.constant_state_blocks.is_empty() {
         invariants.constant_state_blocks.shrink_to_fit();
     }
+
+    // Remove tracking for blocks assuming no singleton class
+    // NOTE: no_singleton_class has up to 3 keys (Array, Hash, or String) for now.
+    // This is effectively an O(1) access unless we start using it for more classes.
+    for (_, blocks) in invariants.no_singleton_classes.iter_mut() {
+        blocks.remove(&blockref);
+    }
+
+    // Remove tracking for blocks assuming EP doesn't escape
+    let iseq = unsafe { blockref.as_ref() }.get_blockid().iseq;
+    if let Some(blocks) = invariants.no_ep_escape_iseqs.get_mut(&iseq) {
+        blocks.remove(&blockref);
+    }
 }
 
 /// Callback from the opt_setinlinecache instruction in the interpreter.
@@ -402,7 +490,7 @@ pub extern "C" fn rb_yjit_constant_ic_update(iseq: *const rb_iseq_t, ic: IC, ins
     let insn_idx: IseqIdx = if let Ok(idx) = insn_idx.try_into() {
         idx
     } else {
-        // The index is too large, YJIT can't possibily have code for it,
+        // The index is too large, YJIT can't possibly have code for it,
         // so there is nothing to invalidate.
         return;
     };
@@ -452,6 +540,66 @@ pub extern "C" fn rb_yjit_constant_ic_update(iseq: *const rb_iseq_t, ic: IC, ins
     });
 }
 
+/// Invalidate blocks that assume objects of a given class will have no singleton class.
+#[no_mangle]
+pub extern "C" fn rb_yjit_invalidate_no_singleton_class(klass: VALUE) {
+    // Skip tracking singleton classes during boot. Such objects already have a singleton class
+    // before entering JIT code, so they get rejected when they're checked for the first time.
+    if unsafe { INVARIANTS.is_none() } {
+        return;
+    }
+
+    // We apply this optimization only to Array, Hash, and String for now.
+    if unsafe { [rb_cArray, rb_cHash, rb_cString].contains(&klass) } {
+        with_vm_lock(src_loc!(), || {
+            let no_singleton_classes = &mut Invariants::get_instance().no_singleton_classes;
+            match no_singleton_classes.get_mut(&klass) {
+                Some(blocks) => {
+                    // Invalidate existing blocks and let has_singleton_class_of()
+                    // return true when they are compiled again
+                    for block in mem::take(blocks) {
+                        invalidate_block_version(&block);
+                        incr_counter!(invalidate_no_singleton_class);
+                    }
+                }
+                None => {
+                    // Let has_singleton_class_of() return true for this class
+                    no_singleton_classes.insert(klass, HashSet::new());
+                }
+            }
+        });
+    }
+}
+
+/// Invalidate blocks for a given ISEQ that assumes environment pointer is
+/// equal to base pointer.
+#[no_mangle]
+pub extern "C" fn rb_yjit_invalidate_ep_is_bp(iseq: IseqPtr) {
+    // Skip tracking EP escapes on boot. We don't need to invalidate anything during boot.
+    if unsafe { INVARIANTS.is_none() } {
+        return;
+    }
+
+    with_vm_lock(src_loc!(), || {
+        // If an EP escape for this ISEQ is detected for the first time, invalidate all blocks
+        // associated to the ISEQ.
+        let no_ep_escape_iseqs = &mut Invariants::get_instance().no_ep_escape_iseqs;
+        match no_ep_escape_iseqs.get_mut(&iseq) {
+            Some(blocks) => {
+                // Invalidate existing blocks and make jit.ep_is_bp() return false
+                for block in mem::take(blocks) {
+                    invalidate_block_version(&block);
+                    incr_counter!(invalidate_ep_escape);
+                }
+            }
+            None => {
+                // Let jit.ep_is_bp() return false for this ISEQ
+                no_ep_escape_iseqs.insert(iseq, HashSet::new());
+            }
+        }
+    });
+}
+
 // Invalidate all generated code and patch C method return code to contain
 // logic for firing the c_return TracePoint event. Once rb_vm_barrier()
 // returns, all other ractors are pausing inside RB_VM_LOCK_ENTER(), which
@@ -478,6 +626,8 @@ pub extern "C" fn rb_yjit_tracing_invalidate_all() {
         return;
     }
 
+    incr_counter!(invalidate_everything);
+
     // Stop other ractors since we are going to patch machine code.
     with_vm_lock(src_loc!(), || {
         // Make it so all live block versions are no longer valid branch targets
@@ -513,22 +663,40 @@ pub extern "C" fn rb_yjit_tracing_invalidate_all() {
 
         let cb = CodegenGlobals::get_inline_cb();
 
+        // Prevent on-stack frames from jumping to the caller on jit_exec_exception
+        extern "C" {
+            fn rb_yjit_cancel_jit_return(leave_exit: *mut c_void, leave_exception: *mut c_void) -> VALUE;
+        }
+        unsafe {
+            rb_yjit_cancel_jit_return(
+                CodegenGlobals::get_leave_exit_code().raw_ptr(cb) as _,
+                CodegenGlobals::get_leave_exception_code().raw_ptr(cb) as _,
+            );
+        }
+
         // Apply patches
         let old_pos = cb.get_write_pos();
         let old_dropped_bytes = cb.has_dropped_bytes();
         let mut patches = CodegenGlobals::take_global_inval_patches();
-        patches.sort_by_cached_key(|patch| patch.inline_patch_pos.raw_ptr());
+        patches.sort_by_cached_key(|patch| patch.inline_patch_pos.raw_ptr(cb));
         let mut last_patch_end = std::ptr::null();
         for patch in &patches {
-            assert!(last_patch_end <= patch.inline_patch_pos.raw_ptr(), "patches should not overlap");
-
-            let mut asm = crate::backend::ir::Assembler::new();
-            asm.jmp(patch.outlined_target_pos.as_side_exit());
+            let patch_pos = patch.inline_patch_pos.raw_ptr(cb);
+            assert!(
+                last_patch_end <= patch_pos,
+                "patches should not overlap (last_patch_end: {last_patch_end:?}, patch_pos: {patch_pos:?})",
+            );
 
             cb.set_write_ptr(patch.inline_patch_pos);
             cb.set_dropped_bytes(false);
-            asm.compile(cb, None);
-            last_patch_end = cb.get_write_ptr().raw_ptr();
+            cb.without_page_end_reserve(|cb| {
+                let mut asm = crate::backend::ir::Assembler::new_without_iseq();
+                asm.jmp(patch.outlined_target_pos.as_side_exit());
+                if asm.compile(cb, None).is_none() {
+                    panic!("Failed to apply patch at {:?}", patch.inline_patch_pos);
+                }
+            });
+            last_patch_end = cb.get_write_ptr().raw_ptr(cb);
         }
         cb.set_pos(old_pos);
         cb.set_dropped_bytes(old_dropped_bytes);
diff --git a/yjit/src/lib.rs b/yjit/src/lib.rs
index ce87cc250acf18..f3247fbf1aab71 100644
--- a/yjit/src/lib.rs
+++ b/yjit/src/lib.rs
@@ -3,8 +3,20 @@
 #![allow(clippy::too_many_arguments)] // :shrug:
 #![allow(clippy::identity_op)] // Sometimes we do it for style
 
+// TODO(alan): This lint is right -- the way we use `static mut` is UB happy. We have many globals
+// and take `&mut` frequently, sometimes with a method that easily allows calling it twice.
+//
+// All of our globals rely on us running single threaded, which outside of boot-time relies on the
+// VM lock (which signals and waits for all other threads to pause). To fix this properly, we should
+// gather up all the globals into a struct to centralize the safety reasoning. That way we can also
+// check for re-entrance in one place.
+//
+// We're too close to release to do that, though, so disable the lint for now.
+#![allow(unknown_lints)]
+#![allow(static_mut_refs)]
+#![warn(unknown_lints)]
 
-mod asm;
+pub mod asm;
 mod backend;
 mod codegen;
 mod core;
@@ -16,3 +28,4 @@ mod stats;
 mod utils;
 mod yjit;
 mod virtualmem;
+mod log;
diff --git a/yjit/src/log.rs b/yjit/src/log.rs
new file mode 100644
index 00000000000000..c5a724f7e1df52
--- /dev/null
+++ b/yjit/src/log.rs
@@ -0,0 +1,179 @@
+use crate::core::BlockId;
+use crate::cruby::*;
+use crate::options::*;
+use crate::yjit::yjit_enabled_p;
+
+use std::fmt::{Display, Formatter};
+use std::os::raw::c_long;
+use crate::utils::iseq_get_location;
+
+type Timestamp = f64;
+
+#[derive(Clone, Debug)]
+pub struct LogEntry {
+    /// The time when the block was compiled.
+    pub timestamp: Timestamp,
+
+    /// The log message.
+    pub message: String,
+}
+
+impl Display for LogEntry {
+    fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
+        write!(f, "{:15.6}: {}", self.timestamp, self.message)
+    }
+}
+
+pub type Log = CircularBuffer<LogEntry, 1024>;
+static mut LOG: Option<Log> = None;
+
+impl Log {
+    pub fn init() {
+        unsafe {
+            LOG = Some(Log::new());
+        }
+    }
+
+    pub fn get_instance() -> &'static mut Log {
+        unsafe {
+            LOG.as_mut().unwrap()
+        }
+    }
+
+    pub fn has_instance() -> bool {
+        unsafe {
+            LOG.as_mut().is_some()
+        }
+    }
+
+    pub fn add_block_with_chain_depth(block_id: BlockId, chain_depth: u8) {
+        if !Self::has_instance() {
+            return;
+        }
+
+        let print_log = get_option!(log);
+        let timestamp = std::time::SystemTime::now().duration_since(std::time::UNIX_EPOCH).unwrap().as_secs_f64();
+
+        let location = iseq_get_location(block_id.iseq, block_id.idx);
+        let index = block_id.idx;
+        let message = if chain_depth > 0 {
+            format!("{} (index: {}, chain_depth: {})", location, index, chain_depth)
+        } else {
+            format!("{} (index: {})", location, index)
+        };
+
+        let entry = LogEntry {
+            timestamp,
+            message
+        };
+
+        if let Some(output) = print_log {
+            match output {
+                LogOutput::Stderr => {
+                    eprintln!("{}", entry);
+                }
+
+                LogOutput::File(fd) => {
+                    use std::os::unix::io::{FromRawFd, IntoRawFd};
+                    use std::io::Write;
+
+                    // Write with the fd opened during boot
+                    let mut file = unsafe { std::fs::File::from_raw_fd(fd) };
+                    writeln!(file, "{}", entry).unwrap();
+                    file.flush().unwrap();
+                    let _ = file.into_raw_fd(); // keep the fd open
+                }
+
+                LogOutput::MemoryOnly => () // Don't print or write anything
+            }
+        }
+
+        Self::get_instance().push(entry);
+    }
+}
+
+pub struct CircularBuffer<T, const N: usize> {
+    buffer: Vec<Option<T>>,
+    head: usize,
+    tail: usize,
+    size: usize
+}
+
+impl<T: Clone, const N: usize> CircularBuffer<T, N> {
+    pub fn new() -> Self {
+        Self {
+            buffer: vec![None; N],
+            head: 0,
+            tail: 0,
+            size: 0
+        }
+    }
+
+    pub fn push(&mut self, value: T) {
+        self.buffer[self.head] = Some(value);
+        self.head = (self.head + 1) % N;
+        if self.size == N {
+            self.tail = (self.tail + 1) % N;
+        } else {
+            self.size += 1;
+        }
+    }
+
+    pub fn pop(&mut self) -> Option<T> {
+        if self.size == 0 {
+            return None;
+        }
+
+        let value = self.buffer[self.tail].take();
+        self.tail = (self.tail + 1) % N;
+        self.size -= 1;
+        value
+    }
+
+    pub fn len(&self) -> usize {
+        self.size
+    }
+}
+
+
+//===========================================================================
+
+/// Primitive called in yjit.rb
+/// Check if log generation is enabled
+#[no_mangle]
+pub extern "C" fn rb_yjit_log_enabled_p(_ec: EcPtr, _ruby_self: VALUE) -> VALUE {
+    if get_option!(log).is_some() {
+        return Qtrue;
+    } else {
+        return Qfalse;
+    }
+}
+
+/// Primitive called in yjit.rb.
+/// Export all YJIT log entries as a Ruby array.
+#[no_mangle]
+pub extern "C" fn rb_yjit_get_log(_ec: EcPtr, _ruby_self: VALUE) -> VALUE {
+    with_vm_lock(src_loc!(), || rb_yjit_get_log_array())
+}
+
+fn rb_yjit_get_log_array() -> VALUE {
+    if !yjit_enabled_p() || get_option!(log).is_none() {
+        return Qnil;
+    }
+
+    let log = Log::get_instance();
+    let array = unsafe { rb_ary_new_capa(log.len() as c_long) };
+
+    while log.len() > 0 {
+        let entry = log.pop().unwrap();
+
+        unsafe {
+            let entry_array = rb_ary_new_capa(2);
+            rb_ary_push(entry_array, rb_float_new(entry.timestamp));
+            rb_ary_push(entry_array, entry.message.into());
+            rb_ary_push(array, entry_array);
+        }
+    }
+
+    return array;
+}
diff --git a/yjit/src/options.rs b/yjit/src/options.rs
index cbed2718195b0a..9f7c70536966a8 100644
--- a/yjit/src/options.rs
+++ b/yjit/src/options.rs
@@ -1,20 +1,40 @@
-use std::ffi::CStr;
-use crate::backend::ir::Assembler;
+use std::{ffi::{CStr, CString}, ptr::null, fs::File};
+use crate::{backend::current::TEMP_REGS, cruby::*, stats::Counter};
+use std::os::raw::{c_char, c_int, c_uint};
+
+// Call threshold for small deployments and command-line apps
+pub static SMALL_CALL_THRESHOLD: u64 = 30;
+
+// Call threshold for larger deployments and production-sized applications
+pub static LARGE_CALL_THRESHOLD: u64 = 120;
+
+// Number of live ISEQs after which we consider an app to be large
+pub static LARGE_ISEQ_COUNT: u64 = 40_000;
+
+// This option is exposed to the C side in a global variable for performance, see vm.c
+// Number of method calls after which to start generating code
+// Threshold==1 means compile on first execution
+#[no_mangle]
+pub static mut rb_yjit_call_threshold: u64 = SMALL_CALL_THRESHOLD;
+
+// This option is exposed to the C side in a global variable for performance, see vm.c
+// Number of execution requests after which a method is no longer
+// considered hot. Raising this results in more generated code.
+#[no_mangle]
+pub static mut rb_yjit_cold_threshold: u64 = 200_000;
 
 // Command-line options
-#[derive(Clone, PartialEq, Eq, Debug)]
+#[derive(Debug)]
 #[repr(C)]
 pub struct Options {
-    // Size of the executable memory block to allocate in bytes
-    // Note that the command line argument is expressed in MiB and not bytes
-    pub exec_mem_size: usize,
-
-    // Number of method calls after which to start generating code
-    // Threshold==1 means compile on first execution
-    pub call_threshold: usize,
+    /// Soft limit of all memory used by YJIT in bytes
+    /// VirtualMem avoids allocating new pages if code_region_size + yjit_alloc_size
+    /// is larger than this threshold. Rust may still allocate memory beyond this limit.
+    pub mem_size: usize,
 
-    // Generate versions greedily until the limit is hit
-    pub greedy_versioning: bool,
+    /// Hard limit of the executable memory block to allocate in bytes
+    /// Note that the command line argument is expressed in MiB and not bytes
+    pub exec_mem_size: Option<usize>,
 
     // Disable the propagation of type information
     pub no_type_prop: bool,
@@ -26,6 +46,9 @@ pub struct Options {
     // The number of registers allocated for stack temps
     pub num_temp_regs: usize,
 
+    // Disable Ruby builtin methods defined by `with_yjit` hooks, e.g. Array#each in Ruby
+    pub c_builtin: bool,
+
     // Capture stats
     pub gen_stats: bool,
 
@@ -33,14 +56,14 @@ pub struct Options {
     pub print_stats: bool,
 
     // Trace locations of exits
-    pub gen_trace_exits: bool,
+    pub trace_exits: Option<TraceExits>,
 
     // how often to sample exit trace data
     pub trace_exits_sample_rate: usize,
 
-    // Whether to start YJIT in paused state (initialize YJIT but don't
-    // compile anything)
-    pub pause: bool,
+    // Whether to enable YJIT at boot. This option prevents other
+    // YJIT tuning options from enabling YJIT at boot.
+    pub disable: bool,
 
     /// Dump compiled and executed instructions for debugging
     pub dump_insns: bool,
@@ -53,33 +76,92 @@ pub struct Options {
 
     /// Verify context objects (debug mode only)
     pub verify_ctx: bool,
+
+    /// Enable generating frame pointers (for x86. arm64 always does this)
+    pub frame_pointer: bool,
+
+    /// Run code GC when exec_mem_size is reached.
+    pub code_gc: bool,
+
+    /// Enable writing /tmp/perf-{pid}.map for Linux perf
+    pub perf_map: Option<PerfMap>,
+
+    // Where to store the log. `None` disables the log.
+    pub log: Option<LogOutput>,
 }
 
 // Initialize the options to default values
 pub static mut OPTIONS: Options = Options {
-    exec_mem_size: 128 * 1024 * 1024,
-    call_threshold: 30,
-    greedy_versioning: false,
+    mem_size: 128 * 1024 * 1024,
+    exec_mem_size: None,
     no_type_prop: false,
     max_versions: 4,
     num_temp_regs: 5,
+    c_builtin: false,
     gen_stats: false,
-    gen_trace_exits: false,
+    trace_exits: None,
     print_stats: true,
     trace_exits_sample_rate: 0,
-    pause: false,
+    disable: false,
     dump_insns: false,
     dump_disasm: None,
     verify_ctx: false,
     dump_iseq_disasm: None,
+    frame_pointer: false,
+    code_gc: false,
+    perf_map: None,
+    log: None,
 };
 
-#[derive(Clone, PartialEq, Eq, Debug)]
+/// YJIT option descriptions for `ruby --help`.
+/// Note that --help allows only 80 characters per line, including indentation.   80-character limit --> |
+pub const YJIT_OPTIONS: &'static [(&str, &str)] = &[
+    ("--yjit-mem-size=num",                "Soft limit on YJIT memory usage in MiB (default: 128)."),
+    ("--yjit-exec-mem-size=num",           "Hard limit on executable memory block in MiB."),
+    ("--yjit-call-threshold=num",          "Number of calls to trigger JIT."),
+    ("--yjit-cold-threshold=num",          "Global calls after which ISEQs not compiled (default: 200K)."),
+    ("--yjit-stats",                       "Enable collecting YJIT statistics."),
+    ("--yjit-log[=file|dir]",              "Enable logging of YJIT's compilation activity."),
+    ("--yjit-disable",                     "Disable YJIT for lazily enabling it with RubyVM::YJIT.enable."),
+    ("--yjit-code-gc",                     "Run code GC when the code size reaches the limit."),
+    ("--yjit-perf",                        "Enable frame pointers and perf profiling."),
+    ("--yjit-trace-exits",                 "Record Ruby source location when exiting from generated code."),
+    ("--yjit-trace-exits-sample-rate=num", "Trace exit locations only every Nth occurrence."),
+];
+
+#[derive(Clone, Copy, PartialEq, Eq, Debug)]
+pub enum TraceExits {
+    // Trace all exits
+    All,
+    // Trace a specific counter
+    Counter(Counter),
+}
+
+#[derive(Clone, Copy, PartialEq, Eq, Debug)]
+pub enum LogOutput {
+    // Dump to the log file as events occur.
+    File(std::os::unix::io::RawFd),
+    // Keep the log in memory only
+    MemoryOnly,
+    // Dump to stderr when the process exits
+    Stderr
+}
+
+#[derive(Debug)]
 pub enum DumpDisasm {
     // Dump to stdout
     Stdout,
     // Dump to "yjit_{pid}.log" file under the specified directory
-    File(String),
+    File(std::os::unix::io::RawFd),
+}
+
+/// Type of symbols to dump into /tmp/perf-{pid}.map
+#[derive(Clone, Copy, PartialEq, Eq, Debug)]
+pub enum PerfMap {
+    // Dump ISEQ symbols
+    ISEQ,
+    // Dump YJIT codegen symbols
+    Codegen,
 }
 
 /// Macro to get an option value by name
@@ -87,7 +169,12 @@ macro_rules! get_option {
     // Unsafe is ok here because options are initialized
     // once before any Ruby code executes
     ($option_name:ident) => {
-        unsafe { OPTIONS.$option_name }
+        {
+            // Make this a statement since attributes on expressions are experimental
+            #[allow(unused_unsafe)]
+            let ret = unsafe { crate::options::OPTIONS.$option_name };
+            ret
+        }
     };
 }
 pub(crate) use get_option;
@@ -101,6 +188,7 @@ macro_rules! get_option_ref {
     };
 }
 pub(crate) use get_option_ref;
+use crate::log::Log;
 
 /// Expected to receive what comes after the third dash in "--yjit-*".
 /// Empty string means user passed only "--yjit". C code rejects when
@@ -122,6 +210,20 @@ pub fn parse_option(str_ptr: *const std::os::raw::c_char) -> Option<()> {
     match (opt_name, opt_val) {
         ("", "") => (), // Simply --yjit
 
+        ("mem-size", _) => match opt_val.parse::<usize>() {
+            Ok(n) => {
+                if n == 0 || n > 2 * 1024 * 1024 {
+                    return None
+                }
+
+                // Convert from MiB to bytes internally for convenience
+                unsafe { OPTIONS.mem_size = n * 1024 * 1024 }
+            }
+            Err(_) => {
+                return None;
+            }
+        },
+
         ("exec-mem-size", _) => match opt_val.parse::<usize>() {
             Ok(n) => {
                 if n == 0 || n > 2 * 1024 * 1024 {
@@ -129,7 +231,7 @@ pub fn parse_option(str_ptr: *const std::os::raw::c_char) -> Option<()> {
                 }
 
                 // Convert from MiB to bytes internally for convenience
-                unsafe { OPTIONS.exec_mem_size = n * 1024 * 1024 }
+                unsafe { OPTIONS.exec_mem_size = Some(n * 1024 * 1024) }
             }
             Err(_) => {
                 return None;
@@ -137,7 +239,14 @@ pub fn parse_option(str_ptr: *const std::os::raw::c_char) -> Option<()> {
         },
 
         ("call-threshold", _) => match opt_val.parse() {
-            Ok(n) => unsafe { OPTIONS.call_threshold = n },
+            Ok(n) => unsafe { rb_yjit_call_threshold = n },
+            Err(_) => {
+                return None;
+            }
+        },
+
+        ("cold-threshold", _) => match opt_val.parse() {
+            Ok(n) => unsafe { rb_yjit_cold_threshold = n },
             Err(_) => {
                 return None;
             }
@@ -150,13 +259,13 @@ pub fn parse_option(str_ptr: *const std::os::raw::c_char) -> Option<()> {
             }
         },
 
-        ("pause", "") => unsafe {
-            OPTIONS.pause = true;
+        ("disable", "") => unsafe {
+            OPTIONS.disable = true;
         },
 
         ("temp-regs", _) => match opt_val.parse() {
             Ok(n) => {
-                assert!(n <= Assembler::TEMP_REGS.len(), "--yjit-temp-regs must be <= {}", Assembler::TEMP_REGS.len());
+                assert!(n <= TEMP_REGS.len(), "--yjit-temp-regs must be <= {}", TEMP_REGS.len());
                 unsafe { OPTIONS.num_temp_regs = n }
             }
             Err(_) => {
@@ -164,34 +273,111 @@ pub fn parse_option(str_ptr: *const std::os::raw::c_char) -> Option<()> {
             }
         },
 
-        ("dump-disasm", _) => match opt_val {
-            "" => unsafe { OPTIONS.dump_disasm = Some(DumpDisasm::Stdout) },
-            directory => {
-                let pid = std::process::id();
-                let path = format!("{directory}/yjit_{pid}.log");
-                println!("YJIT disasm dump: {path}");
-                unsafe { OPTIONS.dump_disasm = Some(DumpDisasm::File(path)) }
-            }
+        ("c-builtin", _) => unsafe {
+            OPTIONS.c_builtin = true;
+        },
+
+        ("code-gc", _) => unsafe {
+            OPTIONS.code_gc = true;
+        },
+
+        ("perf", _) => match opt_val {
+            "" => unsafe {
+                OPTIONS.frame_pointer = true;
+                OPTIONS.perf_map = Some(PerfMap::ISEQ);
+            },
+            "fp" => unsafe { OPTIONS.frame_pointer = true },
+            "iseq" => unsafe { OPTIONS.perf_map = Some(PerfMap::ISEQ) },
+            // Accept --yjit-perf=map for backward compatibility
+            "codegen" | "map" => unsafe { OPTIONS.perf_map = Some(PerfMap::Codegen) },
+            _ => return None,
          },
 
+        ("dump-disasm", _) => {
+            if !cfg!(feature = "disasm") {
+                eprintln!("WARNING: the {} option works best when YJIT is built in dev mode, i.e. ./configure --enable-yjit=dev", opt_name);
+            }
+
+            match opt_val {
+                "" => unsafe { OPTIONS.dump_disasm = Some(DumpDisasm::Stdout) },
+                directory => {
+                    let path = format!("{directory}/yjit_{}.log", std::process::id());
+                    match File::options().create(true).append(true).open(&path) {
+                        Ok(file) => {
+                            use std::os::unix::io::IntoRawFd;
+                            eprintln!("YJIT disasm dump: {path}");
+                            unsafe { OPTIONS.dump_disasm = Some(DumpDisasm::File(file.into_raw_fd())) }
+                        }
+                        Err(err) => eprintln!("Failed to create {path}: {err}"),
+                    }
+                }
+            }
+        },
+
         ("dump-iseq-disasm", _) => unsafe {
+            if !cfg!(feature = "disasm") {
+                eprintln!("WARNING: the {} option is only available when YJIT is built in dev mode, i.e. ./configure --enable-yjit=dev", opt_name);
+            }
+
             OPTIONS.dump_iseq_disasm = Some(opt_val.to_string());
         },
 
-        ("greedy-versioning", "") => unsafe { OPTIONS.greedy_versioning = true },
         ("no-type-prop", "") => unsafe { OPTIONS.no_type_prop = true },
         ("stats", _) => match opt_val {
             "" => unsafe { OPTIONS.gen_stats = true },
-            "quiet" => {
-                unsafe { OPTIONS.gen_stats = true }
-                unsafe { OPTIONS.print_stats = false }
+            "quiet" => unsafe {
+                OPTIONS.gen_stats = true;
+                OPTIONS.print_stats = false;
             },
             _ => {
                 return None;
             }
         },
-        ("trace-exits", "") => unsafe { OPTIONS.gen_trace_exits = true; OPTIONS.gen_stats = true; OPTIONS.trace_exits_sample_rate = 0 },
-        ("trace-exits-sample-rate", sample_rate) => unsafe { OPTIONS.gen_trace_exits = true; OPTIONS.gen_stats = true; OPTIONS.trace_exits_sample_rate = sample_rate.parse().unwrap(); },
+        ("log", _) => match opt_val {
+            "" => unsafe {
+                OPTIONS.log = Some(LogOutput::Stderr);
+                Log::init();
+            },
+            "quiet" => unsafe {
+                OPTIONS.log = Some(LogOutput::MemoryOnly);
+                Log::init();
+            },
+            arg_value => {
+                let log_file_path = if std::path::Path::new(arg_value).is_dir() {
+                    format!("{arg_value}/yjit_{}.log", std::process::id())
+                } else {
+                    arg_value.to_string()
+                };
+
+                match File::options().create(true).write(true).truncate(true).open(&log_file_path) {
+                    Ok(file) => {
+                        use std::os::unix::io::IntoRawFd;
+                        eprintln!("YJIT log: {log_file_path}");
+
+                        unsafe { OPTIONS.log = Some(LogOutput::File(file.into_raw_fd())) }
+                        Log::init()
+                    }
+                    Err(err) => panic!("Failed to create {log_file_path}: {err}"),
+                }
+            }
+        },
+        ("trace-exits", _) => unsafe {
+            OPTIONS.gen_stats = true;
+            OPTIONS.trace_exits = match opt_val {
+                "" => Some(TraceExits::All),
+                name => match Counter::get(name) {
+                    Some(counter) => Some(TraceExits::Counter(counter)),
+                    None => return None,
+                },
+            };
+        },
+        ("trace-exits-sample-rate", sample_rate) => unsafe {
+            OPTIONS.gen_stats = true;
+            if OPTIONS.trace_exits.is_none() {
+                OPTIONS.trace_exits = Some(TraceExits::All);
+            }
+            OPTIONS.trace_exits_sample_rate = sample_rate.parse().unwrap();
+        },
         ("dump-insns", "") => unsafe { OPTIONS.dump_insns = true },
         ("verify-ctx", "") => unsafe { OPTIONS.verify_ctx = true },
 
@@ -219,3 +405,28 @@ pub fn parse_option(str_ptr: *const std::os::raw::c_char) -> Option<()> {
     // Option successfully parsed
     return Some(());
 }
+
+/// Print YJIT options for `ruby --help`. `width` is width of option parts, and
+/// `columns` is indent width of descriptions.
+#[no_mangle]
+pub extern "C" fn rb_yjit_show_usage(help: c_int, highlight: c_int, width: c_uint, columns: c_int) {
+    for &(name, description) in YJIT_OPTIONS.iter() {
+        extern "C" {
+            fn ruby_show_usage_line(name: *const c_char, secondary: *const c_char, description: *const c_char,
+                                    help: c_int, highlight: c_int, width: c_uint, columns: c_int);
+        }
+        let name = CString::new(name).unwrap();
+        let description = CString::new(description).unwrap();
+        unsafe { ruby_show_usage_line(name.as_ptr(), null(), description.as_ptr(), help, highlight, width, columns) }
+    }
+}
+
+/// Return true if --yjit-c-builtin is given
+#[no_mangle]
+pub extern "C" fn rb_yjit_c_builtin_p(_ec: EcPtr, _self: VALUE) -> VALUE {
+    if get_option!(c_builtin) {
+        Qtrue
+    } else {
+        Qfalse
+    }
+}
diff --git a/yjit/src/stats.rs b/yjit/src/stats.rs
index a4f95db6ae15cb..ba84b7a5494e73 100644
--- a/yjit/src/stats.rs
+++ b/yjit/src/stats.rs
@@ -1,22 +1,128 @@
 //! Everything related to the collection of runtime stats in YJIT
-//! See the stats feature and the --yjit-stats command-line option
+//! See the --yjit-stats command-line option
 
-#![allow(dead_code)] // Counters are only used with the stats features
+use std::alloc::{GlobalAlloc, Layout, System};
+use std::ptr::addr_of_mut;
+use std::sync::atomic::{AtomicUsize, Ordering};
+use std::time::Instant;
+use std::collections::HashMap;
 
 use crate::codegen::CodegenGlobals;
-use crate::core::Context;
-use crate::core::for_each_iseq_payload;
 use crate::cruby::*;
 use crate::options::*;
-use crate::yjit::yjit_enabled_p;
+use crate::yjit::{yjit_enabled_p, YJIT_INIT_TIME};
 
-// stats_alloc is a middleware to instrument global allocations in Rust.
-#[cfg(feature="stats")]
+/// Running total of how many ISeqs are in the system.
+#[no_mangle]
+pub static mut rb_yjit_live_iseq_count: u64 = 0;
+
+/// Monotonically increasing total of how many ISEQs were allocated
+#[no_mangle]
+pub static mut rb_yjit_iseq_alloc_count: u64 = 0;
+
+/// A middleware to count Rust-allocated bytes as yjit_alloc_size.
 #[global_allocator]
-static GLOBAL_ALLOCATOR: &stats_alloc::StatsAlloc<std::alloc::System> = &stats_alloc::INSTRUMENTED_SYSTEM;
+static GLOBAL_ALLOCATOR: StatsAlloc = StatsAlloc { alloc_size: AtomicUsize::new(0) };
+
+pub struct StatsAlloc {
+    alloc_size: AtomicUsize,
+}
+
+unsafe impl GlobalAlloc for StatsAlloc {
+    unsafe fn alloc(&self, layout: Layout) -> *mut u8 {
+        self.alloc_size.fetch_add(layout.size(), Ordering::SeqCst);
+        System.alloc(layout)
+    }
+
+    unsafe fn dealloc(&self, ptr: *mut u8, layout: Layout) {
+        self.alloc_size.fetch_sub(layout.size(), Ordering::SeqCst);
+        System.dealloc(ptr, layout)
+    }
+
+    unsafe fn alloc_zeroed(&self, layout: Layout) -> *mut u8 {
+        self.alloc_size.fetch_add(layout.size(), Ordering::SeqCst);
+        System.alloc_zeroed(layout)
+    }
+
+    unsafe fn realloc(&self, ptr: *mut u8, layout: Layout, new_size: usize) -> *mut u8 {
+        if new_size > layout.size() {
+            self.alloc_size.fetch_add(new_size - layout.size(), Ordering::SeqCst);
+        } else if new_size < layout.size() {
+            self.alloc_size.fetch_sub(layout.size() - new_size, Ordering::SeqCst);
+        }
+        System.realloc(ptr, layout, new_size)
+    }
+}
+
+/// The number of bytes YJIT has allocated on the Rust heap.
+pub fn yjit_alloc_size() -> usize {
+    GLOBAL_ALLOCATOR.alloc_size.load(Ordering::SeqCst)
+}
+
+/// Mapping of C function / ISEQ name to integer indices
+/// This is accessed at compilation time only (protected by a lock)
+static mut CFUNC_NAME_TO_IDX: Option<HashMap<String, usize>> = None;
+static mut ISEQ_NAME_TO_IDX: Option<HashMap<String, usize>> = None;
+
+/// Vector of call counts for each C function / ISEQ index
+/// This is modified (but not resized) by JITted code
+static mut CFUNC_CALL_COUNT: Option<Vec<u64>> = None;
+static mut ISEQ_CALL_COUNT: Option<Vec<u64>> = None;
+
+/// Assign an index to a given cfunc name string
+pub fn get_cfunc_idx(name: &str) -> usize {
+    // SAFETY: We acquire a VM lock and don't create multiple &mut references to these static mut variables.
+    unsafe { get_method_idx(name, &mut *addr_of_mut!(CFUNC_NAME_TO_IDX), &mut *addr_of_mut!(CFUNC_CALL_COUNT)) }
+}
+
+/// Assign an index to a given ISEQ name string
+pub fn get_iseq_idx(name: &str) -> usize {
+    // SAFETY: We acquire a VM lock and don't create multiple &mut references to these static mut variables.
+    unsafe { get_method_idx(name, &mut *addr_of_mut!(ISEQ_NAME_TO_IDX), &mut *addr_of_mut!(ISEQ_CALL_COUNT)) }
+}
+
+fn get_method_idx(
+    name: &str,
+    method_name_to_idx: &mut Option<HashMap<String, usize>>,
+    method_call_count: &mut Option<Vec<u64>>,
+) -> usize {
+    //println!("{}", name);
+
+    let name_to_idx = method_name_to_idx.get_or_insert_with(HashMap::default);
+    let call_count = method_call_count.get_or_insert_with(Vec::default);
+
+    match name_to_idx.get(name) {
+        Some(idx) => *idx,
+        None => {
+            let idx = name_to_idx.len();
+            name_to_idx.insert(name.to_string(), idx);
+
+            // Resize the call count vector
+            if idx >= call_count.len() {
+                call_count.resize(idx + 1, 0);
+            }
+
+            idx
+        }
+    }
+}
+
+// Increment the counter for a C function
+pub extern "C" fn incr_cfunc_counter(idx: usize) {
+    let cfunc_call_count = unsafe { CFUNC_CALL_COUNT.as_mut().unwrap() };
+    assert!(idx < cfunc_call_count.len());
+    cfunc_call_count[idx] += 1;
+}
+
+// Increment the counter for an ISEQ
+pub extern "C" fn incr_iseq_counter(idx: usize) {
+    let iseq_call_count = unsafe { ISEQ_CALL_COUNT.as_mut().unwrap() };
+    assert!(idx < iseq_call_count.len());
+    iseq_call_count[idx] += 1;
+}
 
 // YJIT exit counts for each instruction type
-const VM_INSTRUCTION_SIZE_USIZE:usize = VM_INSTRUCTION_SIZE as usize;
+const VM_INSTRUCTION_SIZE_USIZE: usize = VM_INSTRUCTION_SIZE as usize;
 static mut EXIT_OP_COUNT: [u64; VM_INSTRUCTION_SIZE_USIZE] = [0; VM_INSTRUCTION_SIZE_USIZE];
 
 /// Global state needed for collecting backtraces of exits
@@ -37,13 +143,8 @@ static mut YJIT_EXIT_LOCATIONS: Option<YjitExitLocations> = None;
 impl YjitExitLocations {
     /// Initialize the yjit exit locations
     pub fn init() {
-        // Return if the stats feature is disabled
-        if !cfg!(feature = "stats") {
-            return;
-        }
-
         // Return if --yjit-trace-exits isn't enabled
-        if !get_option!(gen_trace_exits) {
+        if get_option!(trace_exits).is_none() {
             return;
         }
 
@@ -91,13 +192,8 @@ impl YjitExitLocations {
             return;
         }
 
-        // Return if the stats feature is disabled
-        if !cfg!(feature = "stats") {
-            return;
-        }
-
         // Return if --yjit-trace-exits isn't enabled
-        if !get_option!(gen_trace_exits) {
+        if get_option!(trace_exits).is_none() {
             return;
         }
 
@@ -139,6 +235,14 @@ macro_rules! make_counters {
         pub enum Counter { $($counter_name),+ }
 
         impl Counter {
+            /// Map a counter name string to a counter enum
+            pub fn get(name: &str) -> Option<Counter> {
+                match name {
+                    $( stringify!($counter_name) => { Some(Counter::$counter_name) } ),+
+                    _ => None,
+                }
+            }
+
             /// Get a counter name string
             pub fn get_name(&self) -> String {
                 match self {
@@ -165,13 +269,31 @@ macro_rules! make_counters {
 
 /// The list of counters that are available without --yjit-stats.
 /// They are incremented only by `incr_counter!` and don't use `gen_counter_incr`.
-pub const DEFAULT_COUNTERS: [Counter; 6] = [
+pub const DEFAULT_COUNTERS: &'static [Counter] = &[
     Counter::code_gc_count,
     Counter::compiled_iseq_entry,
+    Counter::cold_iseq_entry,
     Counter::compiled_iseq_count,
     Counter::compiled_blockid_count,
     Counter::compiled_block_count,
+    Counter::deleted_defer_block_count,
     Counter::compiled_branch_count,
+    Counter::compile_time_ns,
+    Counter::compilation_failure,
+    Counter::max_inline_versions,
+    Counter::inline_block_count,
+    Counter::num_contexts_encoded,
+    Counter::context_cache_hits,
+
+    Counter::invalidation_count,
+    Counter::invalidate_method_lookup,
+    Counter::invalidate_bop_redefined,
+    Counter::invalidate_ractor_spawn,
+    Counter::invalidate_constant_state_bump,
+    Counter::invalidate_constant_ic_fill,
+    Counter::invalidate_no_singleton_class,
+    Counter::invalidate_ep_escape,
+    Counter::invalidate_everything,
 ];
 
 /// Macro to increase a counter by name and count
@@ -187,6 +309,24 @@ macro_rules! incr_counter_by {
 }
 pub(crate) use incr_counter_by;
 
+/// Macro to increase a counter if the given value is larger
+macro_rules! incr_counter_to {
+    // Unsafe is ok here because options are initialized
+    // once before any Ruby code executes
+    ($counter_name:ident, $count:expr) => {
+        #[allow(unused_unsafe)]
+        {
+            unsafe {
+                $crate::stats::COUNTERS.$counter_name = u64::max(
+                    $crate::stats::COUNTERS.$counter_name,
+                    $count as u64,
+                )
+            }
+        }
+    };
+}
+pub(crate) use incr_counter_to;
+
 /// Macro to increment a counter by name
 macro_rules! incr_counter {
     // Unsafe is ok here because options are initialized
@@ -216,76 +356,76 @@ make_counters! {
     yjit_insns_count,
 
     // Method calls that fallback to dynamic dispatch
-    send_keywords,
-    send_kw_splat,
-    send_args_splat_super,
-    send_iseq_zsuper,
-    send_block_arg,
+    send_singleton_class,
+    send_forwarding,
     send_ivar_set_method,
     send_zsuper_method,
     send_undef_method,
-    send_optimized_method,
-    send_optimized_method_call,
     send_optimized_method_block_call,
     send_call_block,
     send_call_kwarg,
     send_call_multi_ractor,
+    send_cme_not_found,
+    send_megamorphic,
     send_missing_method,
     send_refined_method,
-    send_cfunc_ruby_array_varg,
+    send_private_not_fcall,
+    send_cfunc_kw_splat_non_nil,
+    send_cfunc_splat_neg2,
     send_cfunc_argc_mismatch,
+    send_cfunc_block_arg,
     send_cfunc_toomany_args,
     send_cfunc_tracing,
-    send_cfunc_kwargs,
     send_cfunc_splat_with_kw,
-    send_cfunc_splat_send,
+    send_cfunc_splat_varg_ruby2_keywords,
     send_attrset_kwargs,
+    send_attrset_block_arg,
     send_iseq_tailcall,
     send_iseq_arity_error,
-    send_iseq_only_keywords,
-    send_iseq_kwargs_req_and_opt_missing,
+    send_iseq_block_arg_type,
+    send_iseq_clobbering_block_arg,
+    send_iseq_complex_discard_extras,
+    send_iseq_leaf_builtin_block_arg_block_param,
+    send_iseq_kw_splat_non_nil,
     send_iseq_kwargs_mismatch,
     send_iseq_has_post,
-    send_iseq_has_kwrest,
     send_iseq_has_no_kw,
     send_iseq_accepts_no_kwarg,
     send_iseq_materialized_block,
-    send_iseq_splat_with_opt,
+    send_iseq_send_forwarding,
+    send_iseq_splat_not_array,
     send_iseq_splat_with_kw,
     send_iseq_missing_optional_kw,
     send_iseq_too_many_kwargs,
     send_not_implemented_method,
     send_getter_arity,
-    send_args_splat_non_iseq,
-    send_args_splat_ivar,
+    send_getter_block_arg,
     send_args_splat_attrset,
     send_args_splat_bmethod,
     send_args_splat_aref,
     send_args_splat_aset,
     send_args_splat_opt_call,
-    send_args_splat_cfunc_var_args,
-    send_args_splat_cfunc_zuper,
-    send_args_splat_cfunc_ruby2_keywords,
     send_iseq_splat_arity_error,
     send_splat_too_long,
-    send_iseq_ruby2_keywords,
-    send_send_not_imm,
     send_send_wrong_args,
     send_send_null_mid,
     send_send_null_cme,
     send_send_nested,
-    send_send_chain_string,
-    send_send_chain_not_string_or_sym,
-    send_send_getter,
-    send_send_builtin,
+    send_send_attr_reader,
+    send_send_attr_writer,
     send_iseq_has_rest_and_captured,
-    send_iseq_has_rest_and_splat,
+    send_iseq_has_kwrest_and_captured,
     send_iseq_has_rest_and_kw_supplied,
     send_iseq_has_rest_opt_and_block,
     send_bmethod_ractor,
     send_bmethod_block_arg,
+    send_optimized_block_arg,
+    send_pred_not_fixnum,
+    send_pred_underflow,
+    send_str_dup_exivar,
 
     invokesuper_defined_class_mismatch,
+    invokesuper_forwarding,
     invokesuper_kw_splat,
     invokesuper_kwarg,
     invokesuper_megamorphic,
@@ -293,14 +433,15 @@ make_counters! {
     invokesuper_no_me,
     invokesuper_not_iseq_or_cfunc,
     invokesuper_refinement,
+    invokesuper_singleton_class,
 
     invokeblock_megamorphic,
     invokeblock_none,
     invokeblock_iseq_arg0_optional,
-    invokeblock_iseq_arg0_has_kw,
     invokeblock_iseq_arg0_args_splat,
     invokeblock_iseq_arg0_not_array,
     invokeblock_iseq_arg0_wrong_len,
+    invokeblock_iseq_not_inlined,
     invokeblock_ifunc_args_splat,
     invokeblock_ifunc_kw_splat,
     invokeblock_proc,
@@ -308,22 +449,27 @@ make_counters! {
 
     // Method calls that exit to the interpreter
     guard_send_block_arg_type,
+    guard_send_getter_splat_non_empty,
     guard_send_klass_megamorphic,
     guard_send_se_cf_overflow,
     guard_send_se_protected_check_failed,
     guard_send_splatarray_length_not_equal,
-    guard_send_splatarray_last_ruby_2_keywords,
+    guard_send_splatarray_last_ruby2_keywords,
     guard_send_splat_not_array,
-    guard_send_send_chain,
-    guard_send_send_chain_not_string,
-    guard_send_send_chain_not_sym,
-    guard_send_iseq_has_rest_and_splat_not_equal,
+    guard_send_send_name_chain,
+    guard_send_iseq_has_rest_and_splat_too_few,
     guard_send_is_a_class_mismatch,
     guard_send_instance_of_class_mismatch,
     guard_send_interrupted,
     guard_send_not_fixnums,
+    guard_send_not_fixnum,
+    guard_send_not_fixnum_or_flonum,
     guard_send_not_string,
     guard_send_respond_to_mid_mismatch,
+    guard_send_str_aref_not_fixnum,
+
+    guard_send_cfunc_bad_splat_vargs,
+    guard_send_cfunc_block_not_nil,
 
     guard_invokesuper_me_changed,
 
@@ -335,15 +481,9 @@ make_counters! {
     leave_se_interrupt,
     leave_interp_return,
 
-    getivar_se_self_not_heap,
-    getivar_idx_out_of_range,
     getivar_megamorphic,
     getivar_not_heap,
 
-    setivar_se_self_not_heap,
-    setivar_idx_out_of_range,
-    setivar_val_heapobject,
-    setivar_name_not_mapped,
     setivar_not_heap,
     setivar_frozen,
     setivar_megamorphic,
@@ -353,16 +493,23 @@ make_counters! {
 
     setlocal_wb_required,
 
+    invokebuiltin_too_many_args,
+
     opt_plus_overflow,
     opt_minus_overflow,
     opt_mult_overflow,
 
+    opt_succ_not_fixnum,
+    opt_succ_overflow,
+
     opt_mod_zero,
     opt_div_zero,
 
-    lshift_amt_changed,
+    lshift_amount_changed,
     lshift_overflow,
 
+    rshift_amount_changed,
+
     opt_aref_argc_not_one,
     opt_aref_arg_not_fixnum,
     opt_aref_not_array,
@@ -373,17 +520,17 @@ make_counters! {
     opt_aset_not_hash,
 
     opt_aref_with_qundef,
+    opt_aset_with_qundef,
 
     opt_case_dispatch_megamorphic,
 
     opt_getconstant_path_ic_miss,
-    opt_getconstant_path_no_ic_entry,
     opt_getconstant_path_multi_ractor,
 
     expandarray_splat,
     expandarray_postarg,
     expandarray_not_array,
-    expandarray_comptime_not_array,
+    expandarray_to_ary,
     expandarray_chain_max_depth,
 
     // getblockparam
@@ -403,20 +550,34 @@ make_counters! {
 
     objtostring_not_string,
 
+    getbyte_idx_not_fixnum,
+    getbyte_idx_negative,
+    getbyte_idx_out_of_bounds,
+
+    splatkw_not_hash,
+    splatkw_not_nil,
+
     binding_allocations,
     binding_set,
 
     compiled_iseq_entry,
+    cold_iseq_entry,
     compiled_iseq_count,
     compiled_blockid_count,
     compiled_block_count,
     compiled_branch_count,
+    compile_time_ns,
     compilation_failure,
+    abandoned_block_count,
     block_next_count,
     defer_count,
     defer_empty_count,
+    deleted_defer_block_count,
     branch_insn_count,
     branch_known_count,
+    max_inline_versions,
+    inline_block_count,
+    num_contexts_encoded,
 
     freed_iseq_count,
 
@@ -428,8 +589,9 @@ make_counters! {
     invalidate_ractor_spawn,
     invalidate_constant_state_bump,
     invalidate_constant_ic_fill,
-
-    constant_state_bumps,
+    invalidate_no_singleton_class,
+    invalidate_ep_escape,
+    invalidate_everything,
 
     // Currently, it's out of the ordinary (might be impossible) for YJIT to leave gaps in
     // executable memory, so this should be 0.
@@ -441,26 +603,38 @@ make_counters! {
 
     num_send,
     num_send_known_class,
-    num_send_megamorphic,
     num_send_polymorphic,
     num_send_x86_rel32,
     num_send_x86_reg,
     num_send_dynamic,
+    num_send_cfunc,
+    num_send_cfunc_inline,
+    num_send_iseq,
+    num_send_iseq_leaf,
+    num_send_iseq_inline,
 
     num_getivar_megamorphic,
     num_setivar_megamorphic,
+    num_opt_case_dispatch_megamorphic,
 
     num_throw,
     num_throw_break,
     num_throw_retry,
     num_throw_return,
 
+    num_lazy_frame_check,
+    num_lazy_frame_push,
+    lazy_frame_count,
+    lazy_frame_failure,
+
     iseq_stack_too_large,
     iseq_too_long,
 
     temp_reg_opnd,
     temp_mem_opnd,
     temp_spill,
+
+    context_cache_hits,
 }
 
 //===========================================================================
@@ -481,7 +655,7 @@ pub extern "C" fn rb_yjit_stats_enabled_p(_ec: EcPtr, _ruby_self: VALUE) -> VALU
 /// Check if stats generation should print at exit
 #[no_mangle]
 pub extern "C" fn rb_yjit_print_stats_p(_ec: EcPtr, _ruby_self: VALUE) -> VALUE {
-    if get_option!(print_stats) {
+    if yjit_enabled_p() && get_option!(print_stats) {
         return Qtrue;
     } else {
         return Qfalse;
@@ -491,18 +665,16 @@ pub extern "C" fn rb_yjit_print_stats_p(_ec: EcPtr, _ruby_self: VALUE) -> VALUE
 /// Primitive called in yjit.rb.
 /// Export all YJIT statistics as a Ruby hash.
 #[no_mangle]
-pub extern "C" fn rb_yjit_get_stats(_ec: EcPtr, _ruby_self: VALUE, context: VALUE) -> VALUE {
-    with_vm_lock(src_loc!(), || rb_yjit_gen_stats_dict(context == Qtrue))
+pub extern "C" fn rb_yjit_get_stats(_ec: EcPtr, _ruby_self: VALUE, key: VALUE) -> VALUE {
+    with_vm_lock(src_loc!(), || rb_yjit_gen_stats_dict(key))
 }
 
 /// Primitive called in yjit.rb
 ///
-/// Check if trace_exits generation is enabled. Requires the stats feature
-/// to be enabled.
+/// Check if trace_exits generation is enabled.
 #[no_mangle]
 pub extern "C" fn rb_yjit_trace_exit_locations_enabled_p(_ec: EcPtr, _ruby_self: VALUE) -> VALUE {
-    #[cfg(feature = "stats")]
-    if get_option!(gen_trace_exits) {
+    if get_option!(trace_exits).is_some() {
         return Qtrue;
     }
 
@@ -518,17 +690,12 @@ pub extern "C" fn rb_yjit_get_exit_locations(_ec: EcPtr, _ruby_self: VALUE) -> V
         return Qnil;
     }
 
-    // Return if the stats feature is disabled
-    if !cfg!(feature = "stats") {
-        return Qnil;
-    }
-
     // Return if --yjit-trace-exits isn't enabled
-    if !get_option!(gen_trace_exits) {
+    if get_option!(trace_exits).is_none() {
         return Qnil;
     }
 
-    // If the stats feature is enabled, pass yjit_raw_samples and yjit_line_samples
+    // Pass yjit_raw_samples and yjit_line_samples
     // to the C function called rb_yjit_exit_locations_dict for parsing.
     let yjit_raw_samples = YjitExitLocations::get_raw_samples();
     let yjit_line_samples = YjitExitLocations::get_line_samples();
@@ -546,22 +713,51 @@ pub extern "C" fn rb_yjit_get_exit_locations(_ec: EcPtr, _ruby_self: VALUE) -> V
     }
 }
 
+/// Increment a counter by name from the CRuby side
+/// Warning: this is not fast because it requires a hash lookup, so don't use in tight loops
+#[no_mangle]
+pub extern "C" fn rb_yjit_incr_counter(counter_name: *const std::os::raw::c_char) {
+    use std::ffi::CStr;
+    let counter_name = unsafe { CStr::from_ptr(counter_name).to_str().unwrap() };
+    let counter_ptr = get_counter_ptr(counter_name);
+    unsafe { *counter_ptr += 1 };
+}
+
 /// Export all YJIT statistics as a Ruby hash.
-fn rb_yjit_gen_stats_dict(context: bool) -> VALUE {
+fn rb_yjit_gen_stats_dict(key: VALUE) -> VALUE {
     // If YJIT is not enabled, return Qnil
     if !yjit_enabled_p() {
         return Qnil;
     }
 
-    macro_rules! hash_aset_usize {
-        ($hash:ident, $counter_name:expr, $value:expr) => {
-            let key = rust_str_to_sym($counter_name);
-            let value = VALUE::fixnum_from_usize($value);
-            rb_hash_aset($hash, key, value);
+    let hash = if key == Qnil {
+        unsafe { rb_hash_new() }
+    } else {
+        Qnil
+    };
+
+    macro_rules! set_stat {
+        ($hash:ident, $name:expr, $value:expr) => {
+            let rb_key = rust_str_to_sym($name);
+            if key == rb_key {
+                return $value;
+            } else if hash != Qnil {
+                rb_hash_aset($hash, rb_key, $value);
+            }
+        }
+    }
+
+    macro_rules! set_stat_usize {
+        ($hash:ident, $name:expr, $value:expr) => {
+            set_stat!($hash, $name, VALUE::fixnum_from_usize($value));
         }
     }
 
-    let hash = unsafe { rb_hash_new() };
+    macro_rules! set_stat_double {
+        ($hash:ident, $name:expr, $value:expr) => {
+            set_stat!($hash, $name, rb_float_new($value));
+        }
+    }
 
     unsafe {
         // Get the inline and outlined code blocks
@@ -569,39 +765,45 @@ fn rb_yjit_gen_stats_dict(context: bool) -> VALUE {
         let ocb = CodegenGlobals::get_outlined_cb();
 
         // Inline code size
-        hash_aset_usize!(hash, "inline_code_size", cb.code_size());
+        set_stat_usize!(hash, "inline_code_size", cb.code_size());
 
         // Outlined code size
-        hash_aset_usize!(hash, "outlined_code_size", ocb.unwrap().code_size());
+        set_stat_usize!(hash, "outlined_code_size", ocb.unwrap().code_size());
 
         // GCed pages
         let freed_page_count = cb.num_freed_pages();
-        hash_aset_usize!(hash, "freed_page_count", freed_page_count);
+        set_stat_usize!(hash, "freed_page_count", freed_page_count);
 
         // GCed code size
-        hash_aset_usize!(hash, "freed_code_size", freed_page_count * cb.page_size());
+        set_stat_usize!(hash, "freed_code_size", freed_page_count * cb.page_size());
 
         // Live pages
-        hash_aset_usize!(hash, "live_page_count", cb.num_mapped_pages() - freed_page_count);
+        set_stat_usize!(hash, "live_page_count", cb.num_mapped_pages() - freed_page_count);
 
         // Size of memory region allocated for JIT code
-        hash_aset_usize!(hash, "code_region_size", cb.mapped_region_size());
+        set_stat_usize!(hash, "code_region_size", cb.mapped_region_size());
 
         // Rust global allocations in bytes
-        #[cfg(feature="stats")]
-        hash_aset_usize!(hash, "yjit_alloc_size", global_allocation_size());
-
-        // `context` is true at RubyVM::YJIT._print_stats for --yjit-stats. It's false by default
-        // for RubyVM::YJIT.runtime_stats because counting all Contexts could be expensive.
-        if context {
-            let live_context_count = get_live_context_count();
-            let context_size = std::mem::size_of::<Context>();
-            hash_aset_usize!(hash, "live_context_count", live_context_count);
-            hash_aset_usize!(hash, "live_context_size", live_context_count * context_size);
-        }
+        set_stat_usize!(hash, "yjit_alloc_size", yjit_alloc_size());
+
+        // How many bytes we are using to store context data
+        let context_data = CodegenGlobals::get_context_data();
+        set_stat_usize!(hash, "context_data_bytes", context_data.num_bytes());
+        set_stat_usize!(hash, "context_cache_bytes", crate::core::CTX_ENCODE_CACHE_BYTES + crate::core::CTX_DECODE_CACHE_BYTES);
 
         // VM instructions count
-        hash_aset_usize!(hash, "vm_insns_count", rb_vm_insns_count as usize);
+        if rb_vm_insns_count > 0 {
+            set_stat_usize!(hash, "vm_insns_count", rb_vm_insns_count as usize);
+        }
+
+        set_stat_usize!(hash, "live_iseq_count", rb_yjit_live_iseq_count as usize);
+        set_stat_usize!(hash, "iseq_alloc_count", rb_yjit_iseq_alloc_count as usize);
+
+        set_stat!(hash, "object_shape_count", rb_object_shape_count());
+
+        // Time since YJIT init in nanoseconds
+        let time_nanos = Instant::now().duration_since(YJIT_INIT_TIME.unwrap()).as_nanos();
+        set_stat_usize!(hash, "yjit_active_ns", time_nanos as usize);
     }
 
     // If we're not generating stats, put only default counters
@@ -612,62 +814,114 @@ fn rb_yjit_gen_stats_dict(context: bool) -> VALUE {
             let counter_val = unsafe { *counter_ptr };
 
             // Put counter into hash
-            let key = rust_str_to_sym(&counter.get_name());
+            let key = &counter.get_name();
             let value = VALUE::fixnum_from_usize(counter_val as usize);
-            unsafe { rb_hash_aset(hash, key, value); }
+            unsafe { set_stat!(hash, key, value); }
         }
 
         return hash;
     }
 
-    // If the stats feature is enabled
     unsafe {
         // Indicate that the complete set of stats is available
-        rb_hash_aset(hash, rust_str_to_sym("all_stats"), Qtrue);
+        set_stat!(hash, "all_stats", Qtrue);
 
         // For each counter we track
         for counter_name in COUNTER_NAMES {
             // Get the counter value
             let counter_ptr = get_counter_ptr(counter_name);
             let counter_val = *counter_ptr;
-
-            // Put counter into hash
-            let key = rust_str_to_sym(counter_name);
-            let value = VALUE::fixnum_from_usize(counter_val as usize);
-            rb_hash_aset(hash, key, value);
+            set_stat_usize!(hash, counter_name, counter_val as usize);
         }
 
+        let mut side_exits = 0;
+
         // For each entry in exit_op_count, add a stats entry with key "exit_INSTRUCTION_NAME"
         // and the value is the count of side exits for that instruction.
         for op_idx in 0..VM_INSTRUCTION_SIZE_USIZE {
             let op_name = insn_name(op_idx);
             let key_string = "exit_".to_owned() + &op_name;
-            let key = rust_str_to_sym(&key_string);
-            let value = VALUE::fixnum_from_usize(EXIT_OP_COUNT[op_idx] as usize);
-            rb_hash_aset(hash, key, value);
+            let count = EXIT_OP_COUNT[op_idx];
+            side_exits += count;
+            set_stat_usize!(hash, &key_string, count as usize);
         }
-    }
 
-    hash
-}
+        set_stat_usize!(hash, "side_exit_count", side_exits as usize);
 
-fn get_live_context_count() -> usize {
-    let mut count = 0;
-    for_each_iseq_payload(|iseq_payload| {
-        for blocks in iseq_payload.version_map.iter() {
-            for block in blocks.iter() {
-                count += unsafe { block.as_ref() }.get_ctx_count();
-            }
+        let total_exits = side_exits + *get_counter_ptr(&Counter::leave_interp_return.get_name());
+        set_stat_usize!(hash, "total_exit_count", total_exits as usize);
+
+        // Number of instructions that finish executing in YJIT.
+        // See :count-placement: about the subtraction.
+        let retired_in_yjit = *get_counter_ptr(&Counter::yjit_insns_count.get_name()) - side_exits;
+
+        // Average length of instruction sequences executed by YJIT
+        let avg_len_in_yjit: f64 = if total_exits > 0 {
+            retired_in_yjit as f64 / total_exits as f64
+        } else {
+            0_f64
+        };
+        set_stat_double!(hash, "avg_len_in_yjit", avg_len_in_yjit);
+
+        // Proportion of instructions that retire in YJIT
+        if rb_vm_insns_count > 0 {
+            let total_insns_count = retired_in_yjit + rb_vm_insns_count;
+            set_stat_usize!(hash, "total_insns_count", total_insns_count as usize);
+
+            let ratio_in_yjit: f64 = 100.0 * retired_in_yjit as f64 / total_insns_count as f64;
+            set_stat_double!(hash, "ratio_in_yjit", ratio_in_yjit);
         }
-        for block in iseq_payload.dead_blocks.iter() {
-            count += unsafe { block.as_ref() }.get_ctx_count();
+
+        // Set method call counts in a Ruby dict
+        fn set_call_counts(
+            calls_hash: VALUE,
+            method_name_to_idx: &mut Option<HashMap<String, usize>>,
+            method_call_count: &mut Option<Vec<u64>>,
+        ) {
+            if let (Some(name_to_idx), Some(call_counts)) = (method_name_to_idx, method_call_count) {
+                // Create a list of (name, call_count) pairs
+                let mut pairs = Vec::new();
+                for (name, idx) in name_to_idx {
+                    let count = call_counts[*idx];
+                    pairs.push((name, count));
+                }
+
+                // Sort the vectors by decreasing call counts
+                pairs.sort_by_key(|e| -(e.1 as i64));
+
+                // Cap the number of counts reported to avoid
+                // bloating log files, etc.
+                pairs.truncate(20);
+
+                // Add the pairs to the dict
+                for (name, call_count) in pairs {
+                    let key = rust_str_to_sym(name);
+                    let value = VALUE::fixnum_from_usize(call_count as usize);
+                    unsafe { rb_hash_aset(calls_hash, key, value); }
+                }
+            }
         }
-    });
-    count
+
+        // Create a hash for the cfunc call counts
+        set_stat!(hash, "cfunc_calls", {
+            let cfunc_calls = rb_hash_new();
+            set_call_counts(cfunc_calls, &mut *addr_of_mut!(CFUNC_NAME_TO_IDX), &mut *addr_of_mut!(CFUNC_CALL_COUNT));
+            cfunc_calls
+        });
+
+        // Create a hash for the ISEQ call counts
+        set_stat!(hash, "iseq_calls", {
+            let iseq_calls = rb_hash_new();
+            set_call_counts(iseq_calls, &mut *addr_of_mut!(ISEQ_NAME_TO_IDX), &mut *addr_of_mut!(ISEQ_CALL_COUNT));
+            iseq_calls
+        });
+    }
+
+    hash
 }
 
 /// Record the backtrace when a YJIT exit occurs. This functionality requires
-/// that the stats feature is enabled as well as the --yjit-trace-exits option.
+/// the --yjit-trace-exits option.
 ///
 /// This function will fill two Vec's in YjitExitLocations to record the raw samples
 /// and line samples. Their length should be the same, however the data stored in
@@ -680,13 +934,8 @@ pub extern "C" fn rb_yjit_record_exit_stack(_exit_pc: *const VALUE)
         return;
     }
 
-    // Return if the stats feature is disabled
-    if !cfg!(feature = "stats") {
-        return;
-    }
-
     // Return if --yjit-trace-exits isn't enabled
-    if !get_option!(gen_trace_exits) {
+    if get_option!(trace_exits).is_none() {
         return;
     }
 
@@ -833,9 +1082,11 @@ pub extern "C" fn rb_yjit_count_side_exit_op(exit_pc: *const VALUE) -> *const VA
     return exit_pc;
 }
 
-// Get the size of global allocations in Rust.
-#[cfg(feature="stats")]
-fn global_allocation_size() -> usize {
-    let stats = GLOBAL_ALLOCATOR.stats();
-    stats.bytes_allocated.saturating_sub(stats.bytes_deallocated)
+/// Measure the time taken by func() and add that to yjit_compile_time.
+pub fn with_compile_time<F, R>(func: F) -> R where F: FnOnce() -> R {
+    let start = Instant::now();
+    let ret = func();
+    let nanos = Instant::now().duration_since(start).as_nanos();
+    incr_counter_by!(compile_time_ns, nanos);
+    ret
 }
diff --git a/yjit/src/utils.rs b/yjit/src/utils.rs
index 3a8f0ef590a701..8c4133546d54c8 100644
--- a/yjit/src/utils.rs
+++ b/yjit/src/utils.rs
@@ -3,6 +3,7 @@
 use crate::backend::ir::*;
 use crate::cruby::*;
 use std::slice;
+use std::os::raw::c_int;
 
 /// Trait for casting to [usize] that allows you to say `.as_usize()`.
 /// Implementation conditional on the cast preserving the numeric value on
@@ -51,6 +52,20 @@ impl IntoUsize for u8 {
     }
 }
 
+/// The `Into<u64>` Rust does not provide.
+/// Convert to u64 with assurance that the value is preserved.
+/// Currently, `usize::BITS == 64` holds for all platforms we support.
+pub(crate) trait IntoU64 {
+    fn as_u64(self) -> u64;
+}
+
+#[cfg(target_pointer_width = "64")]
+impl IntoU64 for usize {
+    fn as_u64(self) -> u64 {
+        self as u64
+    }
+}
+
 /// Compute an offset in bytes of a given struct field
 #[allow(unused)]
 macro_rules! offset_of {
@@ -73,7 +88,7 @@ pub(crate) use offset_of;
 // Convert a CRuby UTF-8-encoded RSTRING into a Rust string.
 // This should work fine on ASCII strings and anything else
 // that is considered legal UTF-8, including embedded nulls.
-fn ruby_str_to_rust(v: VALUE) -> String {
+pub fn ruby_str_to_rust(v: VALUE) -> String {
     let str_ptr = unsafe { rb_RSTRING_PTR(v) } as *mut u8;
     let str_len: usize = unsafe { rb_RSTRING_LEN(v) }.try_into().unwrap();
     let str_slice: &[u8] = unsafe { slice::from_raw_parts(str_ptr, str_len) };
@@ -219,12 +234,20 @@ pub fn print_str(asm: &mut Assembler, str: &str) {
     asm.bake_string(str);
     asm.write_label(after_string);
 
-    let opnd = asm.lea_label(string_data);
+    let opnd = asm.lea_jump_target(string_data);
     asm.ccall(print_str_cfun as *const u8, vec![opnd, Opnd::UImm(str.len() as u64)]);
 
     asm.cpop_all();
 }
 
+pub fn stdout_supports_colors() -> bool {
+    // TODO(max): Use std::io::IsTerminal after upgrading Rust to 1.70
+    extern "C" { fn isatty(fd: c_int) -> c_int; }
+    let stdout = 1;
+    let is_terminal = unsafe { isatty(stdout) } == 1;
+    is_terminal
+}
+
 #[cfg(test)]
 mod tests {
     use super::*;
@@ -259,19 +282,19 @@ mod tests {
 
     #[test]
     fn test_print_int() {
-        let mut asm = Assembler::new();
+        let mut asm = Assembler::new_without_iseq();
         let mut cb = CodeBlock::new_dummy(1024);
 
         print_int(&mut asm, Opnd::Imm(42));
-        asm.compile(&mut cb, None);
+        asm.compile(&mut cb, None).unwrap();
     }
 
     #[test]
     fn test_print_str() {
-        let mut asm = Assembler::new();
+        let mut asm = Assembler::new_without_iseq();
         let mut cb = CodeBlock::new_dummy(1024);
 
         print_str(&mut asm, "Hello, world!");
-        asm.compile(&mut cb, None);
+        asm.compile(&mut cb, None).unwrap();
     }
 }
diff --git a/yjit/src/virtualmem.rs b/yjit/src/virtualmem.rs
index d6e5089dacfa5c..aa6d21f21035d4 100644
--- a/yjit/src/virtualmem.rs
+++ b/yjit/src/virtualmem.rs
@@ -3,9 +3,9 @@
 // usize->pointer casts is viable. It seems like a lot of work for us to participate for not much
 // benefit.
 
-use std::ptr::NonNull;
+use std::{cell::RefCell, ptr::NonNull};
 
-use crate::{utils::IntoUsize, backend::ir::Target};
+use crate::{backend::ir::Target, stats::yjit_alloc_size, utils::IntoUsize};
 
 #[cfg(not(test))]
 pub type VirtualMem = VirtualMemory<sys::SystemAllocator>;
@@ -26,13 +26,22 @@ pub struct VirtualMemory<A: Allocator> {
     /// Location of the virtual memory region.
     region_start: NonNull<u8>,
 
-    /// Size of the region in bytes.
+    /// Size of this virtual memory region in bytes.
     region_size_bytes: usize,
 
+    /// mapped_region_bytes + yjit_alloc_size may not increase beyond this limit.
+    memory_limit_bytes: usize,
+
     /// Number of bytes per "page", memory protection permission can only be controlled at this
     /// granularity.
     page_size_bytes: usize,
 
+    /// Mutable parts.
+    mutable: RefCell<VirtualMemoryMut<A>>,
+}
+
+/// Mutable parts of [`VirtualMemory`].
+pub struct VirtualMemoryMut<A: Allocator> {
     /// Number of bytes that have we have allocated physical memory for starting at
     /// [Self::region_start].
     mapped_region_bytes: usize,
@@ -57,14 +66,39 @@ pub trait Allocator {
     fn mark_unused(&mut self, ptr: *const u8, size: u32) -> bool;
 }
 
-/// Pointer into a [VirtualMemory].
-/// We may later change this to wrap an u32.
-/// Note: there is no NULL constant for CodePtr. You should use Option<CodePtr> instead.
+/// Pointer into a [VirtualMemory] represented as an offset from the base.
+/// Note: there is no NULL constant for [CodePtr]. You should use `Option<CodePtr>` instead.
 #[derive(Copy, Clone, PartialEq, Eq, PartialOrd, Debug)]
 #[repr(C, packed)]
-pub struct CodePtr(NonNull<u8>);
+pub struct CodePtr(u32);
 
 impl CodePtr {
+    /// Advance the CodePtr. Can return a dangling pointer.
+    pub fn add_bytes(self, bytes: usize) -> Self {
+        let CodePtr(raw) = self;
+        let bytes: u32 = bytes.try_into().unwrap();
+        CodePtr(raw + bytes)
+    }
+
+    /// Note that the raw pointer might be dangling if there hasn't
+    /// been any writes to it through the [VirtualMemory] yet.
+    pub fn raw_ptr(self, base: &impl CodePtrBase) -> *const u8 {
+        let CodePtr(offset) = self;
+        return base.base_ptr().as_ptr().wrapping_add(offset.as_usize())
+    }
+
+    /// Get the address of the code pointer.
+    pub fn raw_addr(self, base: &impl CodePtrBase) -> usize {
+        self.raw_ptr(base) as usize
+    }
+
+    /// Get the offset component for the code pointer. Useful finding the distance between two
+    /// code pointers that share the same [VirtualMem].
+    pub fn as_offset(self) -> i64 {
+        let CodePtr(offset) = self;
+        offset.into()
+    }
+
     pub fn as_side_exit(self) -> Target {
         Target::SideExitPtr(self)
     }
@@ -81,28 +115,37 @@ use WriteError::*;
 
 impl<A: Allocator> VirtualMemory<A> {
     /// Bring a part of the address space under management.
-    pub fn new(allocator: A, page_size: u32, virt_region_start: NonNull<u8>, size_bytes: usize) -> Self {
+    pub fn new(
+        allocator: A,
+        page_size: u32,
+        virt_region_start: NonNull<u8>,
+        region_size_bytes: usize,
+        memory_limit_bytes: usize,
+    ) -> Self {
         assert_ne!(0, page_size);
         let page_size_bytes = page_size.as_usize();
 
         Self {
             region_start: virt_region_start,
-            region_size_bytes: size_bytes,
+            region_size_bytes,
+            memory_limit_bytes,
             page_size_bytes,
-            mapped_region_bytes: 0,
-            current_write_page: None,
-            allocator,
+            mutable: RefCell::new(VirtualMemoryMut {
+                mapped_region_bytes: 0,
+                current_write_page: None,
+                allocator,
+            }),
         }
     }
 
     /// Return the start of the region as a raw pointer. Note that it could be a dangling
     /// pointer so be careful dereferencing it.
     pub fn start_ptr(&self) -> CodePtr {
-        CodePtr(self.region_start)
+        CodePtr(0)
     }
 
     pub fn mapped_end_ptr(&self) -> CodePtr {
-        self.start_ptr().add_bytes(self.mapped_region_bytes)
+        self.start_ptr().add_bytes(self.mutable.borrow().mapped_region_bytes)
     }
 
     pub fn virtual_end_ptr(&self) -> CodePtr {
@@ -111,7 +154,7 @@ impl<A: Allocator> VirtualMemory<A> {
 
     /// Size of the region in bytes that we have allocated physical memory for.
     pub fn mapped_region_size(&self) -> usize {
-        self.mapped_region_bytes
+        self.mutable.borrow().mapped_region_bytes
     }
 
     /// Size of the region in bytes where writes could be attempted.
@@ -126,19 +169,21 @@ impl<A: Allocator> VirtualMemory<A> {
     }
 
     /// Write a single byte. The first write to a page makes it readable.
-    pub fn write_byte(&mut self, write_ptr: CodePtr, byte: u8) -> Result<(), WriteError> {
+    pub fn write_byte(&self, write_ptr: CodePtr, byte: u8) -> Result<(), WriteError> {
+        let mut mutable = self.mutable.borrow_mut();
+
         let page_size = self.page_size_bytes;
-        let raw: *mut u8 = write_ptr.raw_ptr() as *mut u8;
+        let raw: *mut u8 = write_ptr.raw_ptr(self) as *mut u8;
         let page_addr = (raw as usize / page_size) * page_size;
 
-        if self.current_write_page == Some(page_addr) {
+        if mutable.current_write_page == Some(page_addr) {
             // Writing within the last written to page, nothing to do
         } else {
             // Switching to a different and potentially new page
             let start = self.region_start.as_ptr();
-            let mapped_region_end = start.wrapping_add(self.mapped_region_bytes);
+            let mapped_region_end = start.wrapping_add(mutable.mapped_region_bytes);
             let whole_region_end = start.wrapping_add(self.region_size_bytes);
-            let alloc = &mut self.allocator;
+            let alloc = &mut mutable.allocator;
 
             assert!((start..=whole_region_end).contains(&mapped_region_end));
 
@@ -150,8 +195,9 @@ impl<A: Allocator> VirtualMemory<A> {
                     return Err(FailedPageMapping);
                 }
 
-                self.current_write_page = Some(page_addr);
-            } else if (start..whole_region_end).contains(&raw) {
+                mutable.current_write_page = Some(page_addr);
+            } else if (start..whole_region_end).contains(&raw) &&
+                    (page_addr + page_size - start as usize) + yjit_alloc_size() < self.memory_limit_bytes {
                 // Writing to a brand new page
                 let mapped_region_end_addr = mapped_region_end as usize;
                 let alloc_size = page_addr - mapped_region_end_addr + page_size;
@@ -181,9 +227,9 @@ impl<A: Allocator> VirtualMemory<A> {
                         unreachable!("unknown arch");
                     }
                 }
-                self.mapped_region_bytes = self.mapped_region_bytes + alloc_size;
+                mutable.mapped_region_bytes = mutable.mapped_region_bytes + alloc_size;
 
-                self.current_write_page = Some(page_addr);
+                mutable.current_write_page = Some(page_addr);
             } else {
                 return Err(OutOfBounds);
             }
@@ -195,71 +241,66 @@ impl<A: Allocator> VirtualMemory<A> {
         Ok(())
     }
 
+    /// Make all the code in the region writeable.
+    /// Call this during GC before the phase of updating reference fields.
+    pub fn mark_all_writeable(&self) {
+        let mut mutable = self.mutable.borrow_mut();
+
+        mutable.current_write_page = None;
+
+        let region_start = self.region_start;
+        let mapped_region_bytes: u32 = mutable.mapped_region_bytes.try_into().unwrap();
+
+        // Make mapped region executable
+        if !mutable.allocator.mark_writable(region_start.as_ptr(), mapped_region_bytes) {
+            panic!("Cannot make memory region writable: {:?}-{:?}",
+                region_start.as_ptr(),
+                unsafe { region_start.as_ptr().add(mapped_region_bytes as usize)}
+            );
+        }
+    }
+
     /// Make all the code in the region executable. Call this at the end of a write session.
     /// See [Self] for usual usage flow.
-    pub fn mark_all_executable(&mut self) {
-        self.current_write_page = None;
+    pub fn mark_all_executable(&self) {
+        let mut mutable = self.mutable.borrow_mut();
+
+        mutable.current_write_page = None;
 
         let region_start = self.region_start;
-        let mapped_region_bytes: u32 = self.mapped_region_bytes.try_into().unwrap();
+        let mapped_region_bytes: u32 = mutable.mapped_region_bytes.try_into().unwrap();
 
         // Make mapped region executable
-        self.allocator.mark_executable(region_start.as_ptr(), mapped_region_bytes);
+        mutable.allocator.mark_executable(region_start.as_ptr(), mapped_region_bytes);
     }
 
     /// Free a range of bytes. start_ptr must be memory page-aligned.
-    pub fn free_bytes(&mut self, start_ptr: CodePtr, size: u32) {
-        assert_eq!(start_ptr.into_usize() % self.page_size_bytes, 0);
+    pub fn free_bytes(&self, start_ptr: CodePtr, size: u32) {
+        assert_eq!(start_ptr.raw_ptr(self) as usize % self.page_size_bytes, 0);
 
         // Bounds check the request. We should only free memory we manage.
-        let mapped_region = self.start_ptr().raw_ptr()..self.mapped_end_ptr().raw_ptr();
-        let virtual_region = self.start_ptr().raw_ptr()..self.virtual_end_ptr().raw_ptr();
-        let last_byte_to_free = start_ptr.add_bytes(size.saturating_sub(1).as_usize()).raw_ptr();
-        assert!(mapped_region.contains(&start_ptr.raw_ptr()));
+        let mapped_region = self.start_ptr().raw_ptr(self)..self.mapped_end_ptr().raw_ptr(self);
+        let virtual_region = self.start_ptr().raw_ptr(self)..self.virtual_end_ptr().raw_ptr(self);
+        let last_byte_to_free = start_ptr.add_bytes(size.saturating_sub(1).as_usize()).raw_ptr(self);
+        assert!(mapped_region.contains(&start_ptr.raw_ptr(self)));
         // On platforms where code page size != memory page size (e.g. Linux), we often need
         // to free code pages that contain unmapped memory pages. When it happens on the last
         // code page, it's more appropriate to check the last byte against the virtual region.
         assert!(virtual_region.contains(&last_byte_to_free));
 
-        self.allocator.mark_unused(start_ptr.0.as_ptr(), size);
+        let mut mutable = self.mutable.borrow_mut();
+        mutable.allocator.mark_unused(start_ptr.raw_ptr(self), size);
     }
 }
 
-impl CodePtr {
-    /// Note that the raw pointer might be dangling if there hasn't
-    /// been any writes to it through the [VirtualMemory] yet.
-    pub fn raw_ptr(self) -> *const u8 {
-        let CodePtr(ptr) = self;
-        return ptr.as_ptr();
-    }
-
-    /// Advance the CodePtr. Can return a dangling pointer.
-    pub fn add_bytes(self, bytes: usize) -> Self {
-        let CodePtr(raw) = self;
-        CodePtr(NonNull::new(raw.as_ptr().wrapping_add(bytes)).unwrap())
-    }
-
-    pub fn into_i64(self) -> i64 {
-        let CodePtr(ptr) = self;
-        ptr.as_ptr() as i64
-    }
-
-    #[cfg(target_arch = "aarch64")]
-    pub fn into_u64(self) -> u64 {
-        let CodePtr(ptr) = self;
-        ptr.as_ptr() as u64
-    }
-
-    pub fn into_usize(self) -> usize {
-        let CodePtr(ptr) = self;
-        ptr.as_ptr() as usize
-    }
+/// Something that could provide a base pointer to compute a raw pointer from a [CodePtr].
+pub trait CodePtrBase {
+    fn base_ptr(&self) -> NonNull<u8>;
 }
 
-impl From<*mut u8> for CodePtr {
-    fn from(value: *mut u8) -> Self {
-        assert!(value as usize != 0);
-        return CodePtr(NonNull::new(value).unwrap());
+impl<A: Allocator> CodePtrBase for VirtualMemory<A> {
+    fn base_ptr(&self) -> NonNull<u8> {
+        self.region_start
     }
 }
 
@@ -370,17 +411,18 @@ pub mod tests {
             PAGE_SIZE.try_into().unwrap(),
             NonNull::new(mem_start as *mut u8).unwrap(),
             mem_size,
+            128 * 1024 * 1024,
         )
     }
 
     #[test]
     #[cfg(target_arch = "x86_64")]
     fn new_memory_is_initialized() {
-        let mut virt = new_dummy_virt_mem();
+        let virt = new_dummy_virt_mem();
 
         virt.write_byte(virt.start_ptr(), 1).unwrap();
         assert!(
-            virt.allocator.memory[..PAGE_SIZE].iter().all(|&byte| byte != 0),
+            virt.mutable.borrow().allocator.memory[..PAGE_SIZE].iter().all(|&byte| byte != 0),
             "Entire page should be initialized",
         );
 
@@ -388,21 +430,21 @@ pub mod tests {
         let three_pages = 3 * PAGE_SIZE;
         virt.write_byte(virt.start_ptr().add_bytes(three_pages), 1).unwrap();
         assert!(
-            virt.allocator.memory[..three_pages].iter().all(|&byte| byte != 0),
+            virt.mutable.borrow().allocator.memory[..three_pages].iter().all(|&byte| byte != 0),
             "Gaps between write requests should be filled",
         );
     }
 
     #[test]
     fn no_redundant_syscalls_when_writing_to_the_same_page() {
-        let mut virt = new_dummy_virt_mem();
+        let virt = new_dummy_virt_mem();
 
         virt.write_byte(virt.start_ptr(), 1).unwrap();
         virt.write_byte(virt.start_ptr(), 0).unwrap();
 
         assert!(
             matches!(
-                virt.allocator.requests[..],
+                virt.mutable.borrow().allocator.requests[..],
                 [MarkWritable { start_idx: 0, length: PAGE_SIZE }],
             )
         );
@@ -411,12 +453,12 @@ pub mod tests {
     #[test]
     fn bounds_checking() {
         use super::WriteError::*;
-        let mut virt = new_dummy_virt_mem();
+        let virt = new_dummy_virt_mem();
 
         let one_past_end = virt.start_ptr().add_bytes(virt.virtual_region_size());
         assert_eq!(Err(OutOfBounds), virt.write_byte(one_past_end, 0));
 
-        let end_of_addr_space = CodePtr(NonNull::new(usize::MAX as _).unwrap());
+        let end_of_addr_space = CodePtr(u32::MAX);
         assert_eq!(Err(OutOfBounds), virt.write_byte(end_of_addr_space, 0));
     }
 
@@ -424,7 +466,7 @@ pub mod tests {
     fn only_written_to_regions_become_executable() {
         // ... so we catch attempts to read/write/execute never-written-to regions
         const THREE_PAGES: usize = PAGE_SIZE * 3;
-        let mut virt = new_dummy_virt_mem();
+        let virt = new_dummy_virt_mem();
         let page_two_start = virt.start_ptr().add_bytes(PAGE_SIZE * 2);
         virt.write_byte(page_two_start, 1).unwrap();
         virt.mark_all_executable();
@@ -432,7 +474,7 @@ pub mod tests {
         assert!(virt.virtual_region_size() > THREE_PAGES);
         assert!(
             matches!(
-                virt.allocator.requests[..],
+                virt.mutable.borrow().allocator.requests[..],
                 [
                     MarkWritable { start_idx: 0, length: THREE_PAGES },
                     MarkExecutable { start_idx: 0, length: THREE_PAGES },
diff --git a/yjit/src/yjit.rs b/yjit/src/yjit.rs
index 7f4cbbe18d017f..4b2b5214f4da13 100644
--- a/yjit/src/yjit.rs
+++ b/yjit/src/yjit.rs
@@ -5,56 +5,52 @@ use crate::invariants::*;
 use crate::options::*;
 use crate::stats::YjitExitLocations;
 use crate::stats::incr_counter;
+use crate::stats::with_compile_time;
 
-use std::os::raw;
-use std::sync::atomic::{AtomicBool, Ordering};
+use std::os::raw::{c_char, c_int};
+use std::time::Instant;
+use crate::log::Log;
 
-/// For tracking whether the user enabled YJIT through command line arguments or environment
-/// variables. AtomicBool to avoid `unsafe`. On x86 it compiles to simple movs.
-/// See <https://doc.rust-lang.org/std/sync/atomic/enum.Ordering.html>
-/// See [rb_yjit_enabled_p]
-static YJIT_ENABLED: AtomicBool = AtomicBool::new(false);
+/// Is YJIT on? The interpreter uses this variable to decide whether to trigger
+/// compilation. See jit_exec() and jit_compile().
+#[allow(non_upper_case_globals)]
+#[no_mangle]
+pub static mut rb_yjit_enabled_p: bool = false;
 
-/// When false, we don't compile new iseqs, but might still service existing branch stubs.
-static COMPILE_NEW_ISEQS: AtomicBool = AtomicBool::new(false);
+// Time when YJIT was yjit was initialized (see yjit_init)
+pub static mut YJIT_INIT_TIME: Option<Instant> = None;
 
 /// Parse one command-line option.
 /// This is called from ruby.c
 #[no_mangle]
-pub extern "C" fn rb_yjit_parse_option(str_ptr: *const raw::c_char) -> bool {
+pub extern "C" fn rb_yjit_parse_option(str_ptr: *const c_char) -> bool {
     return parse_option(str_ptr).is_some();
 }
 
-/// Is YJIT on? The interpreter uses this function to decide whether to increment
-/// ISEQ call counters. See jit_exec().
-/// This is used frequently since it's used on every method call in the interpreter.
 #[no_mangle]
-pub extern "C" fn rb_yjit_enabled_p() -> raw::c_int {
-    // Note that we might want to call this function from signal handlers so
-    // might need to ensure signal-safety(7).
-    YJIT_ENABLED.load(Ordering::Acquire).into()
-}
-
-#[no_mangle]
-pub extern "C" fn rb_yjit_compile_new_iseqs() -> bool {
-    COMPILE_NEW_ISEQS.load(Ordering::Acquire).into()
+pub extern "C" fn rb_yjit_option_disable() -> bool {
+    return get_option!(disable);
 }
 
 /// Like rb_yjit_enabled_p, but for Rust code.
 pub fn yjit_enabled_p() -> bool {
-    YJIT_ENABLED.load(Ordering::Acquire)
+    unsafe { rb_yjit_enabled_p }
 }
 
-/// Test whether we are ready to compile an ISEQ or not
+/// This function is called from C code
 #[no_mangle]
-pub extern "C" fn rb_yjit_threshold_hit(_iseq: IseqPtr, total_calls: u64) -> bool {
-    let call_threshold = get_option!(call_threshold) as u64;
-    return total_calls == call_threshold;
+pub extern "C" fn rb_yjit_init(yjit_enabled: bool) {
+    // Register the method codegen functions. This must be done at boot.
+    yjit_reg_method_codegen_fns();
+
+    // If --yjit-disable, yjit_init() will not be called until RubyVM::YJIT.enable.
+    if yjit_enabled {
+        yjit_init();
+    }
 }
 
-/// This function is called from C code
-#[no_mangle]
-pub extern "C" fn rb_yjit_init_rust() {
+/// Initialize and enable YJIT. You should call this at boot or with GVL.
+fn yjit_init() {
     // TODO: need to make sure that command-line options have been
     // initialized by CRuby
 
@@ -64,19 +60,36 @@ pub extern "C" fn rb_yjit_init_rust() {
         Invariants::init();
         CodegenGlobals::init();
         YjitExitLocations::init();
+        ids::init();
 
         rb_bug_panic_hook();
 
         // YJIT enabled and initialized successfully
-        YJIT_ENABLED.store(true, Ordering::Release);
-
-        COMPILE_NEW_ISEQS.store(!get_option!(pause), Ordering::Release);
+        assert!(unsafe{ !rb_yjit_enabled_p });
+        unsafe { rb_yjit_enabled_p = true; }
     });
 
     if let Err(_) = result {
-        println!("YJIT: rb_yjit_init_rust() panicked. Aborting.");
+        println!("YJIT: yjit_init() panicked. Aborting.");
         std::process::abort();
     }
+
+    // Make sure --yjit-perf doesn't append symbols to an old file
+    if get_option!(perf_map).is_some() {
+        let perf_map = format!("/tmp/perf-{}.map", std::process::id());
+        let _ = std::fs::remove_file(&perf_map);
+        println!("YJIT perf map: {perf_map}");
+    }
+
+    // Note the time when YJIT was initialized
+    unsafe {
+        YJIT_INIT_TIME = Some(Instant::now());
+    }
+}
+
+#[no_mangle]
+pub extern "C" fn rb_yjit_free_at_exit() {
+    yjit_shutdown_free_codegen_table();
 }
 
 /// At the moment, we abort in all cases we panic.
@@ -103,16 +116,24 @@ fn rb_bug_panic_hook() {
         env::set_var("RUST_BACKTRACE", "1");
         previous_hook(panic_info);
 
-        unsafe { rb_bug(b"YJIT panicked\0".as_ref().as_ptr() as *const raw::c_char); }
+        // Abort with rb_bug(). It has a length limit on the message.
+        let panic_message = &format!("{}", panic_info)[..];
+        let len = std::cmp::min(0x100, panic_message.len()) as c_int;
+        unsafe { rb_bug(b"YJIT: %*s\0".as_ref().as_ptr() as *const c_char, len, panic_message.as_ptr()); }
     }));
 }
 
 /// Called from C code to begin compiling a function
 /// NOTE: this should be wrapped in RB_VM_LOCK_ENTER(), rb_vm_barrier() on the C side
 /// If jit_exception is true, compile JIT code for handling exceptions.
-/// See [jit_compile_exception] for details.
+/// See jit_compile_exception() for details.
 #[no_mangle]
 pub extern "C" fn rb_yjit_iseq_gen_entry_point(iseq: IseqPtr, ec: EcPtr, jit_exception: bool) -> *const u8 {
+    // Don't compile when there is insufficient native stack space
+    if unsafe { rb_ec_stack_check(ec as _) } != 0 {
+        return std::ptr::null();
+    }
+
     // Reject ISEQs with very large temp stacks,
     // this will allow us to use u8/i8 values to track stack_size and sp_offset
     let stack_max = unsafe { rb_get_iseq_body_stack_max(iseq) };
@@ -130,10 +151,18 @@ pub extern "C" fn rb_yjit_iseq_gen_entry_point(iseq: IseqPtr, ec: EcPtr, jit_exc
         return std::ptr::null();
     }
 
-    let maybe_code_ptr = gen_entry_point(iseq, ec, jit_exception);
+    // If a custom call threshold was not specified on the command-line and
+    // this is a large application (has very many ISEQs), switch to
+    // using the call threshold for large applications after this entry point
+    use crate::stats::rb_yjit_live_iseq_count;
+    if unsafe { rb_yjit_call_threshold } == SMALL_CALL_THRESHOLD && unsafe { rb_yjit_live_iseq_count } > LARGE_ISEQ_COUNT {
+        unsafe { rb_yjit_call_threshold = LARGE_CALL_THRESHOLD; };
+    }
+
+    let maybe_code_ptr = with_compile_time(|| { gen_entry_point(iseq, ec, jit_exception) });
 
     match maybe_code_ptr {
-        Some(ptr) => ptr.raw_ptr(),
+        Some(ptr) => ptr,
         None => std::ptr::null(),
     }
 }
@@ -154,13 +183,56 @@ pub extern "C" fn rb_yjit_code_gc(_ec: EcPtr, _ruby_self: VALUE) -> VALUE {
     Qnil
 }
 
+/// Enable YJIT compilation, returning true if YJIT was previously disabled
 #[no_mangle]
-pub extern "C" fn rb_yjit_resume(_ec: EcPtr, _ruby_self: VALUE) -> VALUE {
-    if yjit_enabled_p() {
-        COMPILE_NEW_ISEQS.store(true, Ordering::Release);
-    }
+pub extern "C" fn rb_yjit_enable(_ec: EcPtr, _ruby_self: VALUE, gen_stats: VALUE, print_stats: VALUE, gen_log: VALUE, print_log: VALUE, mem_size: VALUE, call_threshold: VALUE) -> VALUE {
+    with_vm_lock(src_loc!(), || {
 
-    Qnil
+        if !mem_size.nil_p() {
+            let mem_size_mb = mem_size.as_isize() >> 1;
+            let mem_size_bytes = mem_size_mb * 1024 * 1024;
+            unsafe {
+                OPTIONS.mem_size = mem_size_bytes as usize;
+            }
+        }
+
+        if !call_threshold.nil_p() {
+            let threshold = call_threshold.as_isize() >> 1;
+            unsafe {
+                rb_yjit_call_threshold = threshold as u64;
+            }
+        }
+
+        // Initialize and enable YJIT
+        if gen_stats.test() {
+            unsafe {
+                OPTIONS.gen_stats = gen_stats.test();
+                OPTIONS.print_stats = print_stats.test();
+            }
+        }
+
+        if gen_log.test() {
+            unsafe {
+                if print_log.test() {
+                    OPTIONS.log = Some(LogOutput::Stderr);
+                } else {
+                    OPTIONS.log = Some(LogOutput::MemoryOnly);
+                }
+
+                Log::init();
+            }
+        }
+
+        yjit_init();
+
+        // Add "+YJIT" to RUBY_DESCRIPTION
+        extern "C" {
+            fn ruby_set_yjit_description();
+        }
+        unsafe { ruby_set_yjit_description(); }
+
+        Qtrue
+    })
 }
 
 /// Simulate a situation where we are out of executable memory
@@ -181,3 +253,19 @@ pub extern "C" fn rb_yjit_simulate_oom_bang(_ec: EcPtr, _ruby_self: VALUE) -> VA
 
     return Qnil;
 }
+
+/// Push a C method frame if the given PC is supposed to lazily push one.
+/// This is called from rb_raise() (at rb_exc_new_str()) and other functions
+/// that may make a method call (e.g. rb_to_int()).
+#[no_mangle]
+pub extern "C" fn rb_yjit_lazy_push_frame(pc: *mut VALUE) {
+    if !yjit_enabled_p() {
+        return;
+    }
+
+    incr_counter!(num_lazy_frame_check);
+    if let Some(&(cme, recv_idx)) = CodegenGlobals::get_pc_to_cfunc().get(&pc) {
+        incr_counter!(num_lazy_frame_push);
+        unsafe { rb_vm_push_cfunc_frame(cme, recv_idx as i32) }
+    }
+}
diff --git a/yjit/yjit.mk b/yjit/yjit.mk
index 16d7736714c01e..98e4ed319699a0 100644
--- a/yjit/yjit.mk
+++ b/yjit/yjit.mk
@@ -19,58 +19,21 @@ YJIT_SRC_FILES = $(wildcard \
 # rebuild at the next build.
 YJIT_LIB_TOUCH = touch $@
 
+# Absolute path to match RUST_LIB rules to avoid picking
+# the "target" dir in the source directory through VPATH.
+BUILD_YJIT_LIBS = $(TOP_BUILD_DIR)/$(YJIT_LIBS)
+
 # YJIT_SUPPORT=yes when `configure` gets `--enable-yjit`
 ifeq ($(YJIT_SUPPORT),yes)
-$(YJIT_LIBS): $(YJIT_SRC_FILES)
+yjit-libs: $(BUILD_YJIT_LIBS)
+$(BUILD_YJIT_LIBS): $(YJIT_SRC_FILES)
 	$(ECHO) 'building Rust YJIT (release mode)'
-	$(Q) $(RUSTC) $(YJIT_RUSTC_ARGS)
-	$(YJIT_LIB_TOUCH)
-else ifeq ($(YJIT_SUPPORT),no)
-$(YJIT_LIBS):
-	$(ECHO) 'Error: Tried to build YJIT without configuring it first. Check `make showconfig`?'
-	@false
-else ifeq ($(YJIT_SUPPORT),$(filter dev dev_nodebug stats,$(YJIT_SUPPORT)))
-$(YJIT_LIBS): $(YJIT_SRC_FILES)
-	$(ECHO) 'building Rust YJIT ($(YJIT_SUPPORT) mode)'
-	$(Q)$(CHDIR) $(top_srcdir)/yjit && \
-	        CARGO_TARGET_DIR='$(CARGO_TARGET_DIR)' \
-	        CARGO_TERM_PROGRESS_WHEN='never' \
-	        $(CARGO) $(CARGO_VERBOSE) build $(CARGO_BUILD_ARGS)
+	+$(Q) $(RUSTC) $(YJIT_RUSTC_ARGS)
 	$(YJIT_LIB_TOUCH)
-else
-endif
-
-yjit-libobj: $(YJIT_LIBOBJ)
-
-# Note, BSD handling is in yjit/not_gmake.mk
-YJIT_LIB_SYMBOLS = $(YJIT_LIBS:.a=).symbols
-$(YJIT_LIBOBJ): $(YJIT_LIBS)
-	$(ECHO) 'partial linking $(YJIT_LIBS) into $@'
-ifneq ($(findstring linux,$(target_os)),)
-	$(Q) $(LD) -r -o $@ --whole-archive $(YJIT_LIBS)
-	-$(Q) $(OBJCOPY) --wildcard --keep-global-symbol='$(SYMBOL_PREFIX)rb_*' $(@)
-else ifneq ($(findstring darwin,$(target_os)),)
-	$(Q) $(CC) -nodefaultlibs -r -o $@ -exported_symbols_list $(YJIT_LIB_SYMBOLS) $(YJIT_LIBS)
-else
-	false
 endif
 
-# For Darwin only: a list of symbols that we want the glommed Rust static lib to export.
-# Unfortunately, using wildcard like '_rb_*' with -exported-symbol does not work, at least
-# not on version 820.1. Assume llvm-nm, so XCode 8.0 (from 2016) or newer.
-#
-# The -exported_symbols_list pulls out the right archive members. Symbols not listed
-# in the list are made private extern, which are in turn made local as we're using `ld -r`.
-# Note, section about -keep_private_externs in ld's man page hints at this behavior on which
-# we rely.
-ifneq ($(findstring darwin,$(target_os)),)
-$(YJIT_LIB_SYMBOLS): $(YJIT_LIBS)
-	$(Q) $(tooldir)/darwin-ar $(NM) --defined-only --extern-only $(YJIT_LIBS) | \
-	sed -n -e 's/.* //' -e '/^$(SYMBOL_PREFIX)rb_/p' \
-	-e '/^$(SYMBOL_PREFIX)rust_eh_personality/p' \
-	> $@
-
-$(YJIT_LIBOBJ): $(YJIT_LIB_SYMBOLS)
+ifneq ($(YJIT_SUPPORT),no)
+$(RUST_LIB): $(YJIT_SRC_FILES)
 endif
 
 # By using YJIT_BENCH_OPTS instead of RUN_OPTS, you can skip passing the options to `make install`
@@ -92,7 +55,7 @@ RUST_VERSION = +1.58.0
 .PHONY: yjit-smoke-test
 yjit-smoke-test:
 ifneq ($(strip $(CARGO)),)
-	$(CARGO) $(RUST_VERSION) test --all-features -q --manifest-path='$(top_srcdir)/yjit/Cargo.toml'
+	$(CARGO) test --all-features -q --manifest-path='$(top_srcdir)/yjit/Cargo.toml'
 endif
 	$(MAKE) btest RUN_OPTS='--yjit-call-threshold=1' BTESTS=-j
 	$(MAKE) test-all TESTS='$(top_srcdir)/test/ruby/test_yjit.rb'
diff --git a/yjit_hook.rb b/yjit_hook.rb
new file mode 100644
index 00000000000000..8f0f38aaf1f535
--- /dev/null
+++ b/yjit_hook.rb
@@ -0,0 +1,9 @@
+# If YJIT is enabled, load the YJIT-only version of builtin methods
+if defined?(RubyVM::YJIT) && RubyVM::YJIT.enabled?
+  RubyVM::YJIT.send(:call_yjit_hooks)
+end
+
+# Remove the helper defined in kernel.rb
+class Module
+  undef :with_yjit
+end
diff --git a/zjit.c b/zjit.c
new file mode 100644
index 00000000000000..0c0c85d3a62bee
--- /dev/null
+++ b/zjit.c
@@ -0,0 +1,341 @@
+#include "internal.h"
+#include "internal/sanitizers.h"
+#include "internal/string.h"
+#include "internal/hash.h"
+#include "internal/variable.h"
+#include "internal/compile.h"
+#include "internal/class.h"
+#include "internal/fixnum.h"
+#include "internal/numeric.h"
+#include "internal/gc.h"
+#include "internal/vm.h"
+#include "yjit.h"
+#include "vm_core.h"
+#include "vm_callinfo.h"
+#include "builtin.h"
+#include "insns.inc"
+#include "insns_info.inc"
+#include "vm_sync.h"
+#include "vm_insnhelper.h"
+#include "probes.h"
+#include "probes_helper.h"
+#include "iseq.h"
+#include "ruby/debug.h"
+#include "internal/cont.h"
+#include "zjit.h"
+
+// For mmapp(), sysconf()
+#ifndef _WIN32
+#include <unistd.h>
+#include <sys/mman.h>
+#endif
+
+#include <errno.h>
+
+uint32_t
+rb_zjit_get_page_size(void)
+{
+#if defined(_SC_PAGESIZE)
+    long page_size = sysconf(_SC_PAGESIZE);
+    if (page_size <= 0) rb_bug("zjit: failed to get page size");
+
+    // 1 GiB limit. x86 CPUs with PDPE1GB can do this and anything larger is unexpected.
+    // Though our design sort of assume we have fine grained control over memory protection
+    // which require small page sizes.
+    if (page_size > 0x40000000l) rb_bug("zjit page size too large");
+
+    return (uint32_t)page_size;
+#else
+#error "ZJIT supports POSIX only for now"
+#endif
+}
+
+#if defined(MAP_FIXED_NOREPLACE) && defined(_SC_PAGESIZE)
+// Align the current write position to a multiple of bytes
+static uint8_t *
+align_ptr(uint8_t *ptr, uint32_t multiple)
+{
+    // Compute the pointer modulo the given alignment boundary
+    uint32_t rem = ((uint32_t)(uintptr_t)ptr) % multiple;
+
+    // If the pointer is already aligned, stop
+    if (rem == 0)
+        return ptr;
+
+    // Pad the pointer by the necessary amount to align it
+    uint32_t pad = multiple - rem;
+
+    return ptr + pad;
+}
+#endif
+
+// Address space reservation. Memory pages are mapped on an as needed basis.
+// See the Rust mm module for details.
+uint8_t *
+rb_zjit_reserve_addr_space(uint32_t mem_size)
+{
+#ifndef _WIN32
+    uint8_t *mem_block;
+
+    // On Linux
+    #if defined(MAP_FIXED_NOREPLACE) && defined(_SC_PAGESIZE)
+        uint32_t const page_size = (uint32_t)sysconf(_SC_PAGESIZE);
+        uint8_t *const cfunc_sample_addr = (void *)(uintptr_t)&rb_zjit_reserve_addr_space;
+        uint8_t *const probe_region_end = cfunc_sample_addr + INT32_MAX;
+        // Align the requested address to page size
+        uint8_t *req_addr = align_ptr(cfunc_sample_addr, page_size);
+
+        // Probe for addresses close to this function using MAP_FIXED_NOREPLACE
+        // to improve odds of being in range for 32-bit relative call instructions.
+        do {
+            mem_block = mmap(
+                req_addr,
+                mem_size,
+                PROT_NONE,
+                MAP_PRIVATE | MAP_ANONYMOUS | MAP_FIXED_NOREPLACE,
+                -1,
+                0
+            );
+
+            // If we succeeded, stop
+            if (mem_block != MAP_FAILED) {
+                ruby_annotate_mmap(mem_block, mem_size, "Ruby:rb_zjit_reserve_addr_space");
+                break;
+            }
+
+            // -4MiB. Downwards to probe away from the heap. (On x86/A64 Linux
+            // main_code_addr < heap_addr, and in case we are in a shared
+            // library mapped higher than the heap, downwards is still better
+            // since it's towards the end of the heap rather than the stack.)
+            req_addr -= 4 * 1024 * 1024;
+        } while (req_addr < probe_region_end);
+
+    // On MacOS and other platforms
+    #else
+        // Try to map a chunk of memory as executable
+        mem_block = mmap(
+            (void *)rb_zjit_reserve_addr_space,
+            mem_size,
+            PROT_NONE,
+            MAP_PRIVATE | MAP_ANONYMOUS,
+            -1,
+            0
+        );
+    #endif
+
+    // Fallback
+    if (mem_block == MAP_FAILED) {
+        // Try again without the address hint (e.g., valgrind)
+        mem_block = mmap(
+            NULL,
+            mem_size,
+            PROT_NONE,
+            MAP_PRIVATE | MAP_ANONYMOUS,
+            -1,
+            0
+        );
+
+        if (mem_block != MAP_FAILED) {
+            ruby_annotate_mmap(mem_block, mem_size, "Ruby:rb_zjit_reserve_addr_space:fallback");
+        }
+    }
+
+    // Check that the memory mapping was successful
+    if (mem_block == MAP_FAILED) {
+        perror("ruby: zjit: mmap:");
+        if(errno == ENOMEM) {
+            // No crash report if it's only insufficient memory
+            exit(EXIT_FAILURE);
+        }
+        rb_bug("mmap failed");
+    }
+
+    return mem_block;
+#else
+    // Windows not supported for now
+    return NULL;
+#endif
+}
+
+void rb_zjit_profile_disable(const rb_iseq_t *iseq);
+
+void
+rb_zjit_compile_iseq(const rb_iseq_t *iseq, rb_execution_context_t *ec, bool jit_exception)
+{
+    RB_VM_LOCKING() {
+        rb_vm_barrier();
+
+        // Convert ZJIT instructions back to bare instructions
+        rb_zjit_profile_disable(iseq);
+
+        // Compile a block version starting at the current instruction
+        uint8_t *rb_zjit_iseq_gen_entry_point(const rb_iseq_t *iseq, rb_execution_context_t *ec); // defined in Rust
+        uintptr_t code_ptr = (uintptr_t)rb_zjit_iseq_gen_entry_point(iseq, ec);
+
+        // TODO: support jit_exception
+        iseq->body->jit_entry = (rb_jit_func_t)code_ptr;
+}
+}
+
+extern VALUE *rb_vm_base_ptr(struct rb_control_frame_struct *cfp);
+
+bool
+rb_zjit_multi_ractor_p(void)
+{
+    return rb_multi_ractor_p();
+}
+
+bool
+rb_zjit_constcache_shareable(const struct iseq_inline_constant_cache_entry *ice)
+{
+    return (ice->flags & IMEMO_CONST_CACHE_SHAREABLE) != 0;
+}
+
+// Release the VM lock. The lock level must point to the same integer used to
+// acquire the lock.
+void
+rb_zjit_vm_unlock(unsigned int *recursive_lock_level, const char *file, int line)
+{
+    rb_vm_lock_leave(recursive_lock_level, file, line);
+}
+
+bool
+rb_zjit_mark_writable(void *mem_block, uint32_t mem_size)
+{
+    return mprotect(mem_block, mem_size, PROT_READ | PROT_WRITE) == 0;
+}
+
+void
+rb_zjit_mark_executable(void *mem_block, uint32_t mem_size)
+{
+    // Do not call mprotect when mem_size is zero. Some platforms may return
+    // an error for it. https://github.com/Shopify/ruby/issues/450
+    if (mem_size == 0) {
+        return;
+    }
+    if (mprotect(mem_block, mem_size, PROT_READ | PROT_EXEC)) {
+        rb_bug("Couldn't make JIT page (%p, %lu bytes) executable, errno: %s",
+            mem_block, (unsigned long)mem_size, strerror(errno));
+    }
+}
+
+// Free the specified memory block.
+bool
+rb_zjit_mark_unused(void *mem_block, uint32_t mem_size)
+{
+    // On Linux, you need to use madvise MADV_DONTNEED to free memory.
+    // We might not need to call this on macOS, but it's not really documented.
+    // We generally prefer to do the same thing on both to ease testing too.
+    madvise(mem_block, mem_size, MADV_DONTNEED);
+
+    // On macOS, mprotect PROT_NONE seems to reduce RSS.
+    // We also call this on Linux to avoid executing unused pages.
+    return mprotect(mem_block, mem_size, PROT_NONE) == 0;
+}
+
+// Invalidate icache for arm64.
+// `start` is inclusive and `end` is exclusive.
+void
+rb_zjit_icache_invalidate(void *start, void *end)
+{
+    // Clear/invalidate the instruction cache. Compiles to nothing on x86_64
+    // but required on ARM before running freshly written code.
+    // On Darwin it's the same as calling sys_icache_invalidate().
+#ifdef __GNUC__
+    __builtin___clear_cache(start, end);
+#elif defined(__aarch64__)
+#error No instruction cache clear available with this compiler on Aarch64!
+#endif
+}
+
+// Acquire the VM lock and then signal all other Ruby threads (ractors) to
+// contend for the VM lock, putting them to sleep. ZJIT uses this to evict
+// threads running inside generated code so among other things, it can
+// safely change memory protection of regions housing generated code.
+void
+rb_zjit_vm_lock_then_barrier(unsigned int *recursive_lock_level, const char *file, int line)
+{
+    rb_vm_lock_enter(recursive_lock_level, file, line);
+    rb_vm_barrier();
+}
+
+// Convert a given ISEQ's instructions to zjit_* instructions
+void
+rb_zjit_profile_enable(const rb_iseq_t *iseq)
+{
+    // This table encodes an opcode into the instruction's address
+    const void *const *insn_table = rb_vm_get_insns_address_table();
+
+    unsigned int insn_idx = 0;
+    while (insn_idx < iseq->body->iseq_size) {
+        int insn = rb_vm_insn_addr2opcode((void *)iseq->body->iseq_encoded[insn_idx]);
+        int zjit_insn = vm_bare_insn_to_zjit_insn(insn);
+        if (insn != zjit_insn) {
+            iseq->body->iseq_encoded[insn_idx] = (VALUE)insn_table[zjit_insn];
+        }
+        insn_idx += insn_len(insn);
+    }
+}
+
+// Convert a given ISEQ's ZJIT instructions to bare instructions
+void
+rb_zjit_profile_disable(const rb_iseq_t *iseq)
+{
+    // This table encodes an opcode into the instruction's address
+    const void *const *insn_table = rb_vm_get_insns_address_table();
+
+    unsigned int insn_idx = 0;
+    while (insn_idx < iseq->body->iseq_size) {
+        int insn = rb_vm_insn_addr2opcode((void *)iseq->body->iseq_encoded[insn_idx]);
+        int bare_insn = vm_zjit_insn_to_bare_insn(insn);
+        if (insn != bare_insn) {
+            iseq->body->iseq_encoded[insn_idx] = (VALUE)insn_table[bare_insn];
+        }
+        insn_idx += insn_len(insn);
+    }
+}
+
+// Get profiling information for ISEQ
+void *
+rb_iseq_get_zjit_payload(const rb_iseq_t *iseq)
+{
+    RUBY_ASSERT_ALWAYS(IMEMO_TYPE_P(iseq, imemo_iseq));
+    if (iseq->body) {
+        return iseq->body->zjit_payload;
+    }
+    else {
+        // Body is NULL when constructing the iseq.
+        return NULL;
+    }
+}
+
+// Set profiling information for ISEQ
+void
+rb_iseq_set_zjit_payload(const rb_iseq_t *iseq, void *payload)
+{
+    RUBY_ASSERT_ALWAYS(IMEMO_TYPE_P(iseq, imemo_iseq));
+    RUBY_ASSERT_ALWAYS(iseq->body);
+    RUBY_ASSERT_ALWAYS(NULL == iseq->body->zjit_payload);
+    iseq->body->zjit_payload = payload;
+}
+
+// Primitives used by zjit.rb
+VALUE rb_zjit_assert_compiles(rb_execution_context_t *ec, VALUE self);
+
+void
+rb_zjit_print_exception(void)
+{
+    VALUE exception = rb_errinfo();
+    rb_set_errinfo(Qnil);
+    assert(RTEST(exception));
+    rb_warn("Ruby error: %"PRIsVALUE"", rb_funcall(exception, rb_intern("full_message"), 0));
+}
+
+bool
+rb_zjit_shape_obj_too_complex_p(VALUE obj)
+{
+    return rb_shape_obj_too_complex_p(obj);
+}
+
+// Preprocessed zjit.rb generated during build
+#include "zjit.rbinc"
diff --git a/zjit.h b/zjit.h
new file mode 100644
index 00000000000000..84df6d009e91d1
--- /dev/null
+++ b/zjit.h
@@ -0,0 +1,27 @@
+#ifndef ZJIT_H
+#define ZJIT_H 1
+//
+// This file contains definitions ZJIT exposes to the CRuby codebase
+//
+
+#if USE_ZJIT
+extern bool rb_zjit_enabled_p;
+extern uint64_t rb_zjit_call_threshold;
+extern uint64_t rb_zjit_profile_threshold;
+void rb_zjit_compile_iseq(const rb_iseq_t *iseq, rb_execution_context_t *ec, bool jit_exception);
+void rb_zjit_profile_insn(enum ruby_vminsn_type insn, rb_execution_context_t *ec);
+void rb_zjit_profile_enable(const rb_iseq_t *iseq);
+void rb_zjit_bop_redefined(int redefined_flag, enum ruby_basic_operators bop);
+void rb_zjit_invalidate_ep_is_bp(const rb_iseq_t *iseq);
+void rb_zjit_iseq_mark(void *payload);
+void rb_zjit_iseq_update_references(void *payload);
+#else
+#define rb_zjit_enabled_p false
+static inline void rb_zjit_compile_iseq(const rb_iseq_t *iseq, rb_execution_context_t *ec, bool jit_exception) {}
+static inline void rb_zjit_profile_insn(enum ruby_vminsn_type insn, rb_execution_context_t *ec) {}
+static inline void rb_zjit_profile_enable(const rb_iseq_t *iseq) {}
+static inline void rb_zjit_bop_redefined(int redefined_flag, enum ruby_basic_operators bop) {}
+static inline void rb_zjit_invalidate_ep_is_bp(const rb_iseq_t *iseq) {}
+#endif // #if USE_YJIT
+
+#endif // #ifndef ZJIT_H
diff --git a/zjit.rb b/zjit.rb
new file mode 100644
index 00000000000000..fd58c1c94a097a
--- /dev/null
+++ b/zjit.rb
@@ -0,0 +1,6 @@
+module RubyVM::ZJIT
+  # Assert that any future ZJIT compilation will return a function pointer
+  def self.assert_compiles
+    Primitive.rb_zjit_assert_compiles
+  end
+end
diff --git a/zjit/.gitignore b/zjit/.gitignore
new file mode 100644
index 00000000000000..2f7896d1d1365e
--- /dev/null
+++ b/zjit/.gitignore
@@ -0,0 +1 @@
+target/
diff --git a/zjit/Cargo.lock b/zjit/Cargo.lock
new file mode 100644
index 00000000000000..57bfb31cd7012b
--- /dev/null
+++ b/zjit/Cargo.lock
@@ -0,0 +1,74 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+version = 4
+
+[[package]]
+name = "capstone"
+version = "0.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "015ef5d5ca1743e3f94af9509ba6bd2886523cfee46e48d15c2ef5216fd4ac9a"
+dependencies = [
+ "capstone-sys",
+ "libc",
+]
+
+[[package]]
+name = "capstone-sys"
+version = "0.17.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2267cb8d16a1e4197863ec4284ffd1aec26fe7e57c58af46b02590a0235809a0"
+dependencies = [
+ "cc",
+ "libc",
+]
+
+[[package]]
+name = "cc"
+version = "1.2.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "755717a7de9ec452bf7f3f1a3099085deabd7f2962b861dae91ecd7a365903d2"
+dependencies = [
+ "shlex",
+]
+
+[[package]]
+name = "dissimilar"
+version = "1.0.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8975ffdaa0ef3661bfe02dbdcc06c9f829dfafe6a3c474de366a8d5e44276921"
+
+[[package]]
+name = "expect-test"
+version = "1.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "63af43ff4431e848fb47472a920f14fa71c24de13255a5692e93d4e90302acb0"
+dependencies = [
+ "dissimilar",
+ "once_cell",
+]
+
+[[package]]
+name = "libc"
+version = "0.2.169"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b5aba8db14291edd000dfcc4d620c7ebfb122c613afb886ca8803fa4e128a20a"
+
+[[package]]
+name = "once_cell"
+version = "1.21.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d75b0bedcc4fe52caa0e03d9f1151a323e4aa5e2d78ba3580400cd3c9e2bc4bc"
+
+[[package]]
+name = "shlex"
+version = "1.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
+
+[[package]]
+name = "zjit"
+version = "0.0.1"
+dependencies = [
+ "capstone",
+ "expect-test",
+]
diff --git a/zjit/Cargo.toml b/zjit/Cargo.toml
new file mode 100644
index 00000000000000..a86117d6e2f08e
--- /dev/null
+++ b/zjit/Cargo.toml
@@ -0,0 +1,20 @@
+[package]
+name = "zjit"
+version = "0.0.1"
+edition = "2024"
+rust-version = "1.85.0" # Minimally supported rust version
+publish = false         # Don't publish to crates.io
+
+[dependencies]
+# No required dependencies to simplify build process. TODO: Link to yet to be
+# written rationale. Optional For development and testing purposes
+capstone = { version = "0.13.0", optional = true }
+
+[dev-dependencies]
+expect-test = "1.5.1"
+
+# NOTE: Development builds select a set of these via configure.ac
+# For debugging, `make V=1` shows exact cargo invocation.
+[features]
+# Support --yjit-dump-disasm and RubyVM::YJIT.disasm using libcapstone.
+disasm = ["capstone"]
diff --git a/zjit/bindgen/Cargo.lock b/zjit/bindgen/Cargo.lock
new file mode 100644
index 00000000000000..66b9bf5a20abdc
--- /dev/null
+++ b/zjit/bindgen/Cargo.lock
@@ -0,0 +1,392 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+version = 4
+
+[[package]]
+name = "aho-corasick"
+version = "1.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916"
+dependencies = [
+ "memchr",
+]
+
+[[package]]
+name = "anstream"
+version = "0.6.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "64e15c1ab1f89faffbf04a634d5e1962e9074f2741eef6d97f3c4e322426d526"
+dependencies = [
+ "anstyle",
+ "anstyle-parse",
+ "anstyle-query",
+ "anstyle-wincon",
+ "colorchoice",
+ "is_terminal_polyfill",
+ "utf8parse",
+]
+
+[[package]]
+name = "anstyle"
+version = "1.0.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1bec1de6f59aedf83baf9ff929c98f2ad654b97c9510f4e70cf6f661d49fd5b1"
+
+[[package]]
+name = "anstyle-parse"
+version = "0.2.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "eb47de1e80c2b463c735db5b217a0ddc39d612e7ac9e2e96a5aed1f57616c1cb"
+dependencies = [
+ "utf8parse",
+]
+
+[[package]]
+name = "anstyle-query"
+version = "1.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6d36fc52c7f6c869915e99412912f22093507da8d9e942ceaf66fe4b7c14422a"
+dependencies = [
+ "windows-sys",
+]
+
+[[package]]
+name = "anstyle-wincon"
+version = "3.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5bf74e1b6e971609db8ca7a9ce79fd5768ab6ae46441c572e46cf596f59e57f8"
+dependencies = [
+ "anstyle",
+ "windows-sys",
+]
+
+[[package]]
+name = "bindgen"
+version = "0.71.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5f58bf3d7db68cfbac37cfc485a8d711e87e064c3d0fe0435b92f7a407f9d6b3"
+dependencies = [
+ "bitflags",
+ "cexpr",
+ "clang-sys",
+ "itertools",
+ "log",
+ "prettyplease",
+ "proc-macro2",
+ "quote",
+ "regex",
+ "rustc-hash",
+ "shlex",
+ "syn",
+]
+
+[[package]]
+name = "bitflags"
+version = "2.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de"
+
+[[package]]
+name = "cexpr"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6fac387a98bb7c37292057cffc56d62ecb629900026402633ae9160df93a8766"
+dependencies = [
+ "nom",
+]
+
+[[package]]
+name = "cfg-if"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
+
+[[package]]
+name = "clang-sys"
+version = "1.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0b023947811758c97c59bf9d1c188fd619ad4718dcaa767947df1cadb14f39f4"
+dependencies = [
+ "glob",
+ "libc",
+ "libloading",
+]
+
+[[package]]
+name = "colorchoice"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d3fd119d74b830634cea2a0f58bbd0d54540518a14397557951e79340abc28c0"
+
+[[package]]
+name = "either"
+version = "1.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0"
+
+[[package]]
+name = "env_filter"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4f2c92ceda6ceec50f43169f9ee8424fe2db276791afde7b2cd8bc084cb376ab"
+dependencies = [
+ "log",
+ "regex",
+]
+
+[[package]]
+name = "env_logger"
+version = "0.11.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e13fa619b91fb2381732789fc5de83b45675e882f66623b7d8cb4f643017018d"
+dependencies = [
+ "anstream",
+ "anstyle",
+ "env_filter",
+ "humantime",
+ "log",
+]
+
+[[package]]
+name = "glob"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b"
+
+[[package]]
+name = "humantime"
+version = "2.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4"
+
+[[package]]
+name = "is_terminal_polyfill"
+version = "1.70.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf"
+
+[[package]]
+name = "itertools"
+version = "0.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "413ee7dfc52ee1a4949ceeb7dbc8a33f2d6c088194d9f922fb8318faf1f01186"
+dependencies = [
+ "either",
+]
+
+[[package]]
+name = "libc"
+version = "0.2.161"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8e9489c2807c139ffd9c1794f4af0ebe86a828db53ecdc7fea2111d0fed085d1"
+
+[[package]]
+name = "libloading"
+version = "0.8.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4979f22fdb869068da03c9f7528f8297c6fd2606bc3a4affe42e6a823fdb8da4"
+dependencies = [
+ "cfg-if",
+ "windows-targets",
+]
+
+[[package]]
+name = "log"
+version = "0.4.22"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24"
+
+[[package]]
+name = "memchr"
+version = "2.7.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3"
+
+[[package]]
+name = "minimal-lexical"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
+
+[[package]]
+name = "nom"
+version = "7.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a"
+dependencies = [
+ "memchr",
+ "minimal-lexical",
+]
+
+[[package]]
+name = "prettyplease"
+version = "0.2.22"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "479cf940fbbb3426c32c5d5176f62ad57549a0bb84773423ba8be9d089f5faba"
+dependencies = [
+ "proc-macro2",
+ "syn",
+]
+
+[[package]]
+name = "proc-macro2"
+version = "1.0.88"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7c3a7fc5db1e57d5a779a352c8cdb57b29aa4c40cc69c3a68a7fedc815fbf2f9"
+dependencies = [
+ "unicode-ident",
+]
+
+[[package]]
+name = "quote"
+version = "1.0.37"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af"
+dependencies = [
+ "proc-macro2",
+]
+
+[[package]]
+name = "regex"
+version = "1.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "38200e5ee88914975b69f657f0801b6f6dccafd44fd9326302a4aaeecfacb1d8"
+dependencies = [
+ "aho-corasick",
+ "memchr",
+ "regex-automata",
+ "regex-syntax",
+]
+
+[[package]]
+name = "regex-automata"
+version = "0.4.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "368758f23274712b504848e9d5a6f010445cc8b87a7cdb4d7cbee666c1288da3"
+dependencies = [
+ "aho-corasick",
+ "memchr",
+ "regex-syntax",
+]
+
+[[package]]
+name = "regex-syntax"
+version = "0.8.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c"
+
+[[package]]
+name = "rustc-hash"
+version = "2.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "357703d41365b4b27c590e3ed91eabb1b663f07c4c084095e60cbed4362dff0d"
+
+[[package]]
+name = "shlex"
+version = "1.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
+
+[[package]]
+name = "syn"
+version = "2.0.79"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "89132cd0bf050864e1d38dc3bbc07a0eb8e7530af26344d3d2bbbef83499f590"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "unicode-ident",
+]
+
+[[package]]
+name = "unicode-ident"
+version = "1.0.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe"
+
+[[package]]
+name = "utf8parse"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821"
+
+[[package]]
+name = "windows-sys"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
+dependencies = [
+ "windows-targets",
+]
+
+[[package]]
+name = "windows-targets"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973"
+dependencies = [
+ "windows_aarch64_gnullvm",
+ "windows_aarch64_msvc",
+ "windows_i686_gnu",
+ "windows_i686_gnullvm",
+ "windows_i686_msvc",
+ "windows_x86_64_gnu",
+ "windows_x86_64_gnullvm",
+ "windows_x86_64_msvc",
+]
+
+[[package]]
+name = "windows_aarch64_gnullvm"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3"
+
+[[package]]
+name = "windows_aarch64_msvc"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469"
+
+[[package]]
+name = "windows_i686_gnu"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b"
+
+[[package]]
+name = "windows_i686_gnullvm"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66"
+
+[[package]]
+name = "windows_i686_msvc"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66"
+
+[[package]]
+name = "windows_x86_64_gnu"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78"
+
+[[package]]
+name = "windows_x86_64_gnullvm"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d"
+
+[[package]]
+name = "windows_x86_64_msvc"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
+
+[[package]]
+name = "zjit-bindgen"
+version = "0.1.0"
+dependencies = [
+ "bindgen",
+ "env_logger",
+]
diff --git a/zjit/bindgen/Cargo.toml b/zjit/bindgen/Cargo.toml
new file mode 100644
index 00000000000000..2f20f180166004
--- /dev/null
+++ b/zjit/bindgen/Cargo.toml
@@ -0,0 +1,12 @@
+[package]
+name = "zjit-bindgen"
+version = "0.1.0"
+edition = "2024"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
+bindgen = "0.71.1"
+env_logger = "0.11.5"
+
+[workspace]
diff --git a/zjit/bindgen/src/main.rs b/zjit/bindgen/src/main.rs
new file mode 100644
index 00000000000000..91de6dcd8d4567
--- /dev/null
+++ b/zjit/bindgen/src/main.rs
@@ -0,0 +1,503 @@
+//! See https://docs.rs/bindgen/0.59.2/bindgen/struct.Builder.html
+//! This is the binding generation tool that the ZJIT cruby module talks about.
+//! More docs later once we have more experience with this, for now, check
+//! the output to make sure it looks reasonable and allowlist things you want
+//! to use in Rust.
+
+use std::env;
+use std::path::PathBuf;
+
+const SRC_ROOT_ENV: &str = "ZJIT_SRC_ROOT_PATH";
+const JIT_NAME: &str = "BINDGEN_JIT_NAME";
+
+fn main() {
+    // Path to repo is a required input for supporting running `configure`
+    // in a directory away from the code.
+    let src_root = env::var(SRC_ROOT_ENV).expect(
+        format!(
+            r#"The "{}" env var must be a path to the root of the Ruby repo"#,
+            SRC_ROOT_ENV
+        )
+        .as_ref(),
+    );
+    let src_root = PathBuf::from(src_root);
+
+    let jit_name = env::var(JIT_NAME).expect(JIT_NAME);
+    let c_file = format!("{}.c", jit_name);
+
+    assert!(
+        src_root.is_dir(),
+        "{} must be set to a path to a directory",
+        SRC_ROOT_ENV
+    );
+
+    // We want Bindgen warnings printed to console
+    env_logger::init();
+
+    // Remove this flag so rust-bindgen generates bindings
+    // that are internal functions not public in libruby
+    let filtered_clang_args = env::args().filter(|arg| arg != "-fvisibility=hidden");
+
+    let bindings = bindgen::builder()
+        .clang_args(filtered_clang_args)
+        .header("encindex.h")
+        .header("internal.h")
+        .header("internal/object.h")
+        .header("internal/re.h")
+        .header("include/ruby/ruby.h")
+        .header("shape.h")
+        .header("vm_core.h")
+        .header("vm_callinfo.h")
+
+        // Our C file for glue code
+        .header(src_root.join(c_file).to_str().unwrap())
+        .header(src_root.join("jit.c").to_str().unwrap())
+
+        // Don't want to copy over C comment
+        .generate_comments(false)
+
+        // Makes the output more compact
+        .merge_extern_blocks(true)
+
+        // Don't want layout tests as they are platform dependent
+        .layout_tests(false)
+
+        // Block for stability since output is different on Darwin and Linux
+        .blocklist_type("size_t")
+        .blocklist_type("fpos_t")
+
+        // Import YARV bytecode instruction constants
+        .allowlist_type("ruby_vminsn_type")
+
+        // From include/ruby/internal/special_consts.h
+        .allowlist_type("ruby_special_consts")
+
+        // From include/ruby/internal/intern/string.h
+        .allowlist_function("rb_utf8_str_new")
+        .allowlist_function("rb_str_buf_append")
+        .allowlist_function("rb_str_dup")
+
+        // From encindex.h
+        .allowlist_type("ruby_preserved_encindex")
+
+        // From include/ruby/ruby.h
+        .allowlist_function("rb_class2name")
+
+        // This struct is public to Ruby C extensions
+        // From include/ruby/internal/core/rbasic.h
+        .allowlist_type("RBasic")
+
+        // From include/ruby/internal/core/rstring.h
+        .allowlist_type("ruby_rstring_flags")
+
+        // From internal.h
+        // This function prints info about a value and is useful for debugging
+        .allowlist_function("rb_obj_info_dump")
+
+        // For testing
+        .allowlist_function("ruby_init")
+        .allowlist_function("ruby_init_stack")
+        .allowlist_function("ruby_options")
+        .allowlist_function("ruby_executable_node")
+        .allowlist_function("rb_funcallv")
+        .allowlist_function("rb_protect")
+        .allowlist_function("rb_zjit_profile_disable")
+
+        // For crashing
+        .allowlist_function("rb_bug")
+
+        // From shape.h
+        .allowlist_function("rb_obj_shape_id")
+        .allowlist_function("rb_shape_id_offset")
+        .allowlist_function("rb_shape_get_iv_index")
+        .allowlist_function("rb_shape_transition_add_ivar_no_warnings")
+        .allowlist_function("rb_zjit_shape_obj_too_complex_p")
+        .allowlist_var("SHAPE_ID_NUM_BITS")
+
+        // From ruby/internal/intern/object.h
+        .allowlist_function("rb_obj_is_kind_of")
+        .allowlist_function("rb_obj_frozen_p")
+        .allowlist_function("rb_class_inherited_p")
+
+        // From ruby/internal/encoding/encoding.h
+        .allowlist_type("ruby_encoding_consts")
+
+        // From include/hash.h
+        .allowlist_function("rb_hash_new")
+
+        // From internal/hash.h
+        .allowlist_function("rb_hash_new_with_size")
+        .allowlist_function("rb_hash_resurrect")
+        .allowlist_function("rb_hash_stlike_foreach")
+        .allowlist_function("rb_to_hash_type")
+
+        // From include/ruby/st.h
+        .allowlist_type("st_retval")
+
+        // From include/ruby/internal/intern/hash.h
+        .allowlist_function("rb_hash_aset")
+        .allowlist_function("rb_hash_aref")
+        .allowlist_function("rb_hash_bulk_insert")
+        .allowlist_function("rb_hash_stlike_lookup")
+
+        // From include/ruby/internal/intern/array.h
+        .allowlist_function("rb_ary_new_capa")
+        .allowlist_function("rb_ary_store")
+        .allowlist_function("rb_ary_resurrect")
+        .allowlist_function("rb_ary_cat")
+        .allowlist_function("rb_ary_clear")
+        .allowlist_function("rb_ary_dup")
+        .allowlist_function("rb_ary_push")
+        .allowlist_function("rb_ary_unshift_m")
+
+        // From internal/array.h
+        .allowlist_function("rb_ec_ary_new_from_values")
+        .allowlist_function("rb_ary_tmp_new_from_values")
+
+        // From include/ruby/internal/intern/class.h
+        .allowlist_function("rb_class_attached_object")
+        .allowlist_function("rb_singleton_class")
+        .allowlist_function("rb_define_class")
+
+        // From include/ruby/internal/core/rclass.h
+        .allowlist_function("rb_class_get_superclass")
+
+        // From include/ruby/internal/gc.h
+        .allowlist_function("rb_gc_mark")
+        .allowlist_function("rb_gc_mark_movable")
+        .allowlist_function("rb_gc_location")
+        .allowlist_function("rb_gc_writebarrier")
+
+        // VALUE variables for Ruby class objects
+        // From include/ruby/internal/globals.h
+        .allowlist_var("rb_cBasicObject")
+        .allowlist_var("rb_cObject")
+        .allowlist_var("rb_cModule")
+        .allowlist_var("rb_cNilClass")
+        .allowlist_var("rb_cTrueClass")
+        .allowlist_var("rb_cFalseClass")
+        .allowlist_var("rb_cInteger")
+        .allowlist_var("rb_cIO")
+        .allowlist_var("rb_cSymbol")
+        .allowlist_var("rb_cFloat")
+        .allowlist_var("rb_cNumeric")
+        .allowlist_var("rb_cRange")
+        .allowlist_var("rb_cString")
+        .allowlist_var("rb_cThread")
+        .allowlist_var("rb_cArray")
+        .allowlist_var("rb_cHash")
+        .allowlist_var("rb_cSet")
+        .allowlist_var("rb_cClass")
+        .allowlist_var("rb_cRegexp")
+        .allowlist_var("rb_cISeq")
+
+        // From include/ruby/internal/fl_type.h
+        .allowlist_type("ruby_fl_type")
+        .allowlist_type("ruby_fl_ushift")
+
+        // From include/ruby/internal/core/robject.h
+        .allowlist_type("ruby_robject_flags")
+
+        // From include/ruby/internal/core/rarray.h
+        .allowlist_type("ruby_rarray_flags")
+        .allowlist_type("ruby_rarray_consts")
+
+        // From include/ruby/internal/core/rclass.h
+        .allowlist_type("ruby_rmodule_flags")
+
+        // From ruby/internal/globals.h
+        .allowlist_var("rb_mKernel")
+
+        // From vm_callinfo.h
+        .allowlist_type("vm_call_flag_bits")
+        .allowlist_type("rb_call_data")
+        .blocklist_type("rb_callcache.*")      // Not used yet - opaque to make it easy to import rb_call_data
+        .opaque_type("rb_callcache.*")
+        .allowlist_type("rb_callinfo")
+
+        // From vm_insnhelper.h
+        .allowlist_var("VM_ENV_DATA_INDEX_ME_CREF")
+        .allowlist_var("rb_block_param_proxy")
+
+        // From include/ruby/internal/intern/range.h
+        .allowlist_function("rb_range_new")
+
+        // From include/ruby/internal/symbol.h
+        .allowlist_function("rb_intern")
+        .allowlist_function("rb_intern2")
+        .allowlist_function("rb_id2sym")
+        .allowlist_function("rb_sym2id")
+        .allowlist_function("rb_str_intern")
+        .allowlist_function("rb_id2str")
+        .allowlist_function("rb_sym2str")
+
+        // From internal/numeric.h
+        .allowlist_function("rb_fix_aref")
+        .allowlist_function("rb_float_plus")
+        .allowlist_function("rb_float_minus")
+        .allowlist_function("rb_float_mul")
+        .allowlist_function("rb_float_div")
+
+        // From internal/string.h
+        .allowlist_type("ruby_rstring_private_flags")
+        .allowlist_function("rb_ec_str_resurrect")
+        .allowlist_function("rb_str_concat_literals")
+        .allowlist_function("rb_obj_as_string_result")
+        .allowlist_function("rb_str_byte_substr")
+        .allowlist_function("rb_str_substr_two_fixnums")
+
+        // From include/ruby/internal/intern/parse.h
+        .allowlist_function("rb_backref_get")
+
+        // From include/ruby/internal/intern/re.h
+        .allowlist_function("rb_reg_last_match")
+        .allowlist_function("rb_reg_match_pre")
+        .allowlist_function("rb_reg_match_post")
+        .allowlist_function("rb_reg_match_last")
+        .allowlist_function("rb_reg_nth_match")
+
+        // From internal/re.h
+        .allowlist_function("rb_reg_new_ary")
+
+        // `ruby_value_type` is a C enum and this stops it from
+        // prefixing all the members with the name of the type
+        .prepend_enum_name(false)
+        .translate_enum_integer_types(true) // so we get fixed width Rust types for members
+        // From include/ruby/internal/value_type.h
+        .allowlist_type("ruby_value_type") // really old C extension API
+
+        // From include/ruby/internal/hash.h
+        .allowlist_type("ruby_rhash_flags") // really old C extension API
+
+        // From method.h
+        .allowlist_type("rb_method_visibility_t")
+        .allowlist_type("rb_method_type_t")
+        .allowlist_type("method_optimized_type")
+        .allowlist_type("rb_callable_method_entry_t")
+        .allowlist_type("rb_callable_method_entry_struct")
+        .allowlist_function("rb_method_entry_at")
+        .allowlist_type("rb_method_entry_t")
+        .blocklist_type("rb_method_cfunc_t")
+        .blocklist_type("rb_method_definition_.*") // Large struct with a bitfield and union of many types - don't import (yet?)
+        .opaque_type("rb_method_definition_.*")
+
+        // From numeric.c
+        .allowlist_function("rb_float_new")
+
+        // From vm_core.h
+        .allowlist_var("rb_mRubyVMFrozenCore")
+        .allowlist_var("VM_BLOCK_HANDLER_NONE")
+        .allowlist_type("vm_frame_env_flags")
+        .allowlist_type("rb_seq_param_keyword_struct")
+        .allowlist_type("rb_callinfo_kwarg")
+        .allowlist_type("ruby_basic_operators")
+        .allowlist_var(".*_REDEFINED_OP_FLAG")
+        .allowlist_type("rb_num_t")
+        .allowlist_function("rb_callable_method_entry")
+        .allowlist_function("rb_callable_method_entry_or_negative")
+        .allowlist_function("rb_vm_frame_method_entry")
+        .allowlist_type("IVC") // pointer to iseq_inline_iv_cache_entry
+        .allowlist_type("IC")  // pointer to iseq_inline_constant_cache
+        .allowlist_type("iseq_inline_constant_cache_entry")
+        .blocklist_type("rb_cref_t")         // don't need this directly, opaqued to allow IC import
+        .opaque_type("rb_cref_t")
+        .allowlist_type("iseq_inline_iv_cache_entry")
+        .allowlist_type("ICVARC") // pointer to iseq_inline_cvar_cache_entry
+        .allowlist_type("iseq_inline_cvar_cache_entry")
+        .blocklist_type("rb_execution_context_.*") // Large struct with various-type fields and an ifdef, so we don't import
+        .opaque_type("rb_execution_context_.*")
+        .blocklist_type("rb_control_frame_struct")
+        .opaque_type("rb_control_frame_struct")
+        .allowlist_function("rb_vm_bh_to_procval")
+        .allowlist_function("rb_vm_env_write")
+        .allowlist_function("rb_vm_ep_local_ep")
+        .allowlist_type("vm_special_object_type")
+        .allowlist_var("VM_ENV_DATA_INDEX_SPECVAL")
+        .allowlist_var("VM_ENV_DATA_INDEX_FLAGS")
+        .allowlist_var("VM_ENV_DATA_SIZE")
+        .allowlist_function("rb_iseq_path")
+        .allowlist_type("rb_builtin_attr")
+        .allowlist_type("ruby_tag_type")
+        .allowlist_type("ruby_vm_throw_flags")
+        .allowlist_type("vm_check_match_type")
+        .allowlist_type("vm_opt_newarray_send_type")
+        .allowlist_type("rb_iseq_type")
+
+        // From zjit.c
+        .allowlist_function("rb_object_shape_count")
+        .allowlist_function("rb_iseq_(get|set)_zjit_payload")
+        .allowlist_function("rb_iseq_pc_at_idx")
+        .allowlist_function("rb_iseq_opcode_at_pc")
+        .allowlist_function("rb_zjit_reserve_addr_space")
+        .allowlist_function("rb_zjit_mark_writable")
+        .allowlist_function("rb_zjit_mark_executable")
+        .allowlist_function("rb_zjit_mark_unused")
+        .allowlist_function("rb_zjit_get_page_size")
+        .allowlist_function("rb_zjit_iseq_builtin_attrs")
+        .allowlist_function("rb_zjit_iseq_inspect")
+        .allowlist_function("rb_set_cfp_(pc|sp)")
+        .allowlist_function("rb_c_method_tracing_currently_enabled")
+        .allowlist_function("rb_full_cfunc_return")
+        .allowlist_function("rb_zjit_vm_lock_then_barrier")
+        .allowlist_function("rb_zjit_vm_unlock")
+        .allowlist_function("rb_assert_(iseq|cme)_handle")
+        .allowlist_function("rb_IMEMO_TYPE_P")
+        .allowlist_function("rb_iseq_reset_jit_func")
+        .allowlist_function("rb_RSTRING_PTR")
+        .allowlist_function("rb_RSTRING_LEN")
+        .allowlist_function("rb_ENCODING_GET")
+        .allowlist_function("rb_optimized_call")
+        .allowlist_function("rb_zjit_icache_invalidate")
+        .allowlist_function("rb_zjit_print_exception")
+        .allowlist_type("robject_offsets")
+        .allowlist_type("rstring_offsets")
+
+        // From jit.c
+        .allowlist_function("rb_assert_holding_vm_lock")
+
+        // from vm_sync.h
+        .allowlist_function("rb_vm_barrier")
+
+        // Not sure why it's picking these up, but don't.
+        .blocklist_type("FILE")
+        .blocklist_type("_IO_.*")
+
+        // From internal/compile.h
+        .allowlist_function("rb_vm_insn_decode")
+
+        // from internal/cont.h
+        .allowlist_function("rb_jit_cont_each_iseq")
+
+        // From iseq.h
+        .allowlist_function("rb_vm_insn_addr2opcode")
+        .allowlist_function("rb_iseqw_to_iseq")
+        .allowlist_function("rb_iseq_label")
+        .allowlist_function("rb_iseq_line_no")
+        .allowlist_function("rb_iseq_defined_string")
+        .allowlist_type("defined_type")
+
+        // From builtin.h
+        .allowlist_type("rb_builtin_function.*")
+
+        // From internal/variable.h
+        .allowlist_function("rb_gvar_(get|set)")
+        .allowlist_function("rb_ensure_iv_list_size")
+
+        // From include/ruby/internal/intern/variable.h
+        .allowlist_function("rb_attr_get")
+        .allowlist_function("rb_ivar_defined")
+        .allowlist_function("rb_ivar_get")
+        .allowlist_function("rb_ivar_set")
+        .allowlist_function("rb_mod_name")
+
+        // From include/ruby/internal/intern/vm.h
+        .allowlist_function("rb_get_alloc_func")
+
+        // From internal/object.h
+        .allowlist_function("rb_class_allocate_instance")
+        .allowlist_function("rb_obj_equal")
+
+        // From gc.h and internal/gc.h
+        .allowlist_function("rb_obj_info")
+        .allowlist_function("ruby_xfree")
+
+        // From include/ruby/debug.h
+        .allowlist_function("rb_profile_frames")
+
+        // Functions used for code generation
+        .allowlist_function("rb_insn_name")
+        .allowlist_function("rb_insn_len")
+        .allowlist_function("rb_yarv_class_of")
+        .allowlist_function("rb_get_ec_cfp")
+        .allowlist_function("rb_get_cfp_iseq")
+        .allowlist_function("rb_get_cfp_pc")
+        .allowlist_function("rb_get_cfp_sp")
+        .allowlist_function("rb_get_cfp_self")
+        .allowlist_function("rb_get_cfp_ep")
+        .allowlist_function("rb_get_cfp_ep_level")
+        .allowlist_function("rb_get_cme_def_type")
+        .allowlist_function("rb_zjit_multi_ractor_p")
+        .allowlist_function("rb_zjit_constcache_shareable")
+        .allowlist_function("rb_get_cme_def_body_attr_id")
+        .allowlist_function("rb_get_symbol_id")
+        .allowlist_function("rb_get_cme_def_body_optimized_type")
+        .allowlist_function("rb_get_cme_def_body_optimized_index")
+        .allowlist_function("rb_get_cme_def_body_cfunc")
+        .allowlist_function("rb_get_def_method_serial")
+        .allowlist_function("rb_get_def_original_id")
+        .allowlist_function("rb_get_mct_argc")
+        .allowlist_function("rb_get_mct_func")
+        .allowlist_function("rb_get_def_iseq_ptr")
+        .allowlist_function("rb_get_def_bmethod_proc")
+        .allowlist_function("rb_iseq_encoded_size")
+        .allowlist_function("rb_get_iseq_body_total_calls")
+        .allowlist_function("rb_get_iseq_body_local_iseq")
+        .allowlist_function("rb_get_iseq_body_parent_iseq")
+        .allowlist_function("rb_get_iseq_body_iseq_encoded")
+        .allowlist_function("rb_get_iseq_body_stack_max")
+        .allowlist_function("rb_get_iseq_body_type")
+        .allowlist_function("rb_get_iseq_flags_has_lead")
+        .allowlist_function("rb_get_iseq_flags_has_opt")
+        .allowlist_function("rb_get_iseq_flags_has_kw")
+        .allowlist_function("rb_get_iseq_flags_has_rest")
+        .allowlist_function("rb_get_iseq_flags_has_post")
+        .allowlist_function("rb_get_iseq_flags_has_kwrest")
+        .allowlist_function("rb_get_iseq_flags_anon_kwrest")
+        .allowlist_function("rb_get_iseq_flags_has_block")
+        .allowlist_function("rb_get_iseq_flags_ambiguous_param0")
+        .allowlist_function("rb_get_iseq_flags_accepts_no_kwarg")
+        .allowlist_function("rb_get_iseq_flags_ruby2_keywords")
+        .allowlist_function("rb_get_iseq_flags_forwardable")
+        .allowlist_function("rb_get_iseq_body_local_table_size")
+        .allowlist_function("rb_get_iseq_body_param_keyword")
+        .allowlist_function("rb_get_iseq_body_param_size")
+        .allowlist_function("rb_get_iseq_body_param_lead_num")
+        .allowlist_function("rb_get_iseq_body_param_opt_num")
+        .allowlist_function("rb_get_iseq_body_param_opt_table")
+        .allowlist_function("rb_get_cikw_keyword_len")
+        .allowlist_function("rb_get_cikw_keywords_idx")
+        .allowlist_function("rb_get_call_data_ci")
+        .allowlist_function("rb_yarv_str_eql_internal")
+        .allowlist_function("rb_str_neq_internal")
+        .allowlist_function("rb_yarv_ary_entry_internal")
+        .allowlist_function("rb_FL_TEST")
+        .allowlist_function("rb_FL_TEST_RAW")
+        .allowlist_function("rb_RB_TYPE_P")
+        .allowlist_function("rb_BASIC_OP_UNREDEFINED_P")
+        .allowlist_function("rb_RSTRUCT_LEN")
+        .allowlist_function("rb_RSTRUCT_SET")
+        .allowlist_function("rb_vm_ci_argc")
+        .allowlist_function("rb_vm_ci_mid")
+        .allowlist_function("rb_vm_ci_flag")
+        .allowlist_function("rb_vm_ci_kwarg")
+        .allowlist_function("rb_METHOD_ENTRY_VISI")
+        .allowlist_function("rb_RCLASS_ORIGIN")
+        .allowlist_function("rb_method_basic_definition_p")
+        .allowlist_function("rb_obj_class")
+        .allowlist_function("rb_obj_is_proc")
+        .allowlist_function("rb_vm_base_ptr")
+        .allowlist_function("rb_ec_stack_check")
+        .allowlist_function("rb_vm_top_self")
+
+        // We define these manually, don't import them
+        .blocklist_type("VALUE")
+        .blocklist_type("ID")
+
+        // From iseq.h
+        .opaque_type("rb_iseq_t")
+        .blocklist_type("rb_iseq_t")
+
+        // Finish the builder and generate the bindings.
+        .generate()
+        // Unwrap the Result and panic on failure.
+        .expect("Unable to generate bindings");
+
+    let mut out_path: PathBuf = src_root;
+    out_path.push(jit_name);
+    out_path.push("src");
+    out_path.push("cruby_bindings.inc.rs");
+
+    bindings
+        .write_to_file(out_path)
+        .expect("Couldn't write bindings!");
+}
diff --git a/zjit/build.rs b/zjit/build.rs
new file mode 100644
index 00000000000000..6aec5407f62af7
--- /dev/null
+++ b/zjit/build.rs
@@ -0,0 +1,35 @@
+// This build script is only used for `make zjit-test` for building
+// the test binary; ruby builds don't use this.
+fn main() {
+    use std::env;
+
+    // option_env! automatically registers a rerun-if-env-changed
+    if let Some(ruby_build_dir) = option_env!("RUBY_BUILD_DIR") {
+        // Link against libminiruby
+        println!("cargo:rustc-link-search=native={ruby_build_dir}");
+        println!("cargo:rustc-link-lib=static:-bundle=miniruby");
+
+        // System libraries that libminiruby needs. Has to be
+        // ordered after -lminiruby above.
+        let link_flags = env::var("RUBY_LD_FLAGS").unwrap();
+
+        let mut split_iter = link_flags.split(" ");
+        while let Some(token) = split_iter.next() {
+            if token == "-framework" {
+                if let Some(framework) = split_iter.next() {
+                    println!("cargo:rustc-link-lib=framework={framework}");
+                }
+            } else if let Some(lib_name) = token.strip_prefix("-l") {
+                println!("cargo:rustc-link-lib={lib_name}");
+            }
+        }
+
+        // When doing a combo build, there is a copy of ZJIT symbols in libruby.a
+        // and Cargo builds another copy for the test binary. Tell the linker to
+        // not complaint about duplicate symbols. For some reason, darwin doesn't
+        // suffer the same issue.
+        if env::var("TARGET").unwrap().contains("linux") {
+            println!("cargo:rustc-link-arg=-Wl,--allow-multiple-definition");
+        }
+    }
+}
diff --git a/zjit/src/asm/arm64/README.md b/zjit/src/asm/arm64/README.md
new file mode 100644
index 00000000000000..6adfad804d3895
--- /dev/null
+++ b/zjit/src/asm/arm64/README.md
@@ -0,0 +1,16 @@
+# Arm64
+
+This module is responsible for encoding ZJIT operands into an appropriate Arm64 encoding.
+
+## Architecture
+
+Every instruction in the Arm64 instruction set is 32 bits wide and is represented in little-endian order. Because they're all going to the same size, we represent each instruction by a struct that implements `From<T> for u32`, which contains the mechanism for encoding each instruction. The encoding for each instruction is shown in the documentation for the struct that ends up being created.
+
+In general each set of bytes inside of the struct has either a direct value (usually a `u8`/`u16`) or some kind of `enum` that can be converted directly into a `u32`. For more complicated pieces of encoding (e.g., bitmask immediates) a corresponding module under the `arg` namespace is available.
+
+## Helpful links
+
+* [Arm A64 Instruction Set Architecture](https://developer.arm.com/documentation/ddi0596/2021-12?lang=en) Official documentation
+* [armconverter.com](https://armconverter.com/) A website that encodes Arm assembly syntax
+* [hatstone](https://github.com/tenderlove/hatstone) A wrapper around the Capstone disassembler written in Ruby
+* [onlinedisassembler.com](https://onlinedisassembler.com/odaweb/) A web-based disassembler
diff --git a/zjit/src/asm/arm64/arg/bitmask_imm.rs b/zjit/src/asm/arm64/arg/bitmask_imm.rs
new file mode 100644
index 00000000000000..70a439afd5b04f
--- /dev/null
+++ b/zjit/src/asm/arm64/arg/bitmask_imm.rs
@@ -0,0 +1,255 @@
+/// Immediates used by the logical immediate instructions are not actually the
+/// immediate value, but instead are encoded into a 13-bit wide mask of 3
+/// elements. This allows many more values to be represented than 13 bits would
+/// normally allow, at the expense of not being able to represent every possible
+/// value.
+///
+/// In order for a number to be encodeable in this form, the binary
+/// representation must consist of a single set of contiguous 1s. That pattern
+/// must then be replicatable across all of the bits either 1, 2, 4, 8, 16, or
+/// 32 times (rotated or not).
+///
+/// For example, 1 (0b1), 2 (0b10), 3 (0b11), and 4 (0b100) are all valid.
+/// However, 5 (0b101) is invalid, because it contains 2 sets of 1s and cannot
+/// be replicated across 64 bits.
+///
+/// Some more examples to illustrate the idea of replication:
+/// * 0x5555555555555555 is a valid value (0b0101...) because it consists of a
+///   single set of 1s which can be replicated across all of the bits 32 times.
+/// * 0xf0f0f0f0f0f0f0f0 is a valid value (0b1111000011110000...) because it
+///   consists of a single set of 1s which can be replicated across all of the
+///   bits 8 times (rotated by 4 bits).
+/// * 0x0ff00ff00ff00ff0 is a valid value (0000111111110000...) because it
+///   consists of a single set of 1s which can be replicated across all of the
+///   bits 4 times (rotated by 12 bits).
+///
+/// To encode the values, there are 3 elements:
+/// * n = 1 if the pattern is 64-bits wide, 0 otherwise
+/// * imms = the size of the pattern, a 0, and then one less than the number of
+///   sequential 1s
+/// * immr = the number of right rotations to apply to the pattern to get the
+///   target value
+///
+pub struct BitmaskImmediate {
+    n: u8,
+    imms: u8,
+    immr: u8
+}
+
+impl TryFrom<u64> for BitmaskImmediate {
+    type Error = ();
+
+    /// Attempt to convert a u64 into a BitmaskImmediate.
+    ///
+    /// The implementation here is largely based on this blog post:
+    /// <https://dougallj.wordpress.com/2021/10/30/bit-twiddling-optimising-aarch64-logical-immediate-encoding-and-decoding/>
+    fn try_from(value: u64) -> Result<Self, Self::Error> {
+        if value == 0 || value == u64::MAX {
+            return Err(());
+        }
+
+        fn rotate_right(value: u64, rotations: u32) -> u64 {
+            (value >> (rotations & 0x3F)) |
+            (value << (rotations.wrapping_neg() & 0x3F))
+        }
+
+        let rotations = (value & (value + 1)).trailing_zeros();
+        let normalized = rotate_right(value, rotations & 0x3F);
+
+        let zeroes = normalized.leading_zeros();
+        let ones = (!normalized).trailing_zeros();
+        let size = zeroes + ones;
+
+        if rotate_right(value, size & 0x3F) != value {
+            return Err(());
+        }
+
+        Ok(BitmaskImmediate {
+            n: ((size >> 6) & 1) as u8,
+            imms: (((size << 1).wrapping_neg() | (ones - 1)) & 0x3F) as u8,
+            immr: ((rotations.wrapping_neg() & (size - 1)) & 0x3F) as u8
+        })
+    }
+}
+
+impl BitmaskImmediate {
+    /// Attempt to make a BitmaskImmediate for a 32 bit register.
+    /// The result has N==0, which is required for some 32-bit instructions.
+    /// Note that the exact same BitmaskImmediate produces different values
+    /// depending on the size of the target register.
+    pub fn new_32b_reg(value: u32) -> Result<Self, ()> {
+        // The same bit pattern replicated to u64
+        let value = value as u64;
+        let replicated: u64 = (value << 32) | value;
+        let converted = Self::try_from(replicated);
+        if let Ok(ref imm) = converted {
+            assert_eq!(0, imm.n);
+        }
+
+        converted
+    }
+}
+
+impl BitmaskImmediate {
+    /// Encode a bitmask immediate into a 32-bit value.
+    pub fn encode(self) -> u32 {
+        0
+        | ((self.n as u32) << 12)
+        | ((self.immr as u32) << 6)
+        | (self.imms as u32)
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn test_failures() {
+        [5, 9, 10, 11, 13, 17, 18, 19].iter().for_each(|&imm| {
+            assert!(BitmaskImmediate::try_from(imm).is_err());
+        });
+    }
+
+    #[test]
+    fn test_negative() {
+        let bitmask: BitmaskImmediate = (-9_i64 as u64).try_into().unwrap();
+        let encoded: u32 = bitmask.encode();
+        assert_eq!(7998, encoded);
+    }
+
+    #[test]
+    fn test_size_2_minimum() {
+        let bitmask = BitmaskImmediate::try_from(0x5555555555555555);
+        assert!(matches!(bitmask, Ok(BitmaskImmediate { n: 0, immr: 0b000000, imms: 0b111100 })));
+    }
+
+    #[test]
+    fn test_size_2_maximum() {
+        let bitmask = BitmaskImmediate::try_from(0xaaaaaaaaaaaaaaaa);
+        assert!(matches!(bitmask, Ok(BitmaskImmediate { n: 0, immr: 0b000001, imms: 0b111100 })));
+    }
+
+    #[test]
+    fn test_size_4_minimum() {
+        let bitmask = BitmaskImmediate::try_from(0x1111111111111111);
+        assert!(matches!(bitmask, Ok(BitmaskImmediate { n: 0, immr: 0b000000, imms: 0b111000 })));
+    }
+
+    #[test]
+    fn test_size_4_rotated() {
+        let bitmask = BitmaskImmediate::try_from(0x6666666666666666);
+        assert!(matches!(bitmask, Ok(BitmaskImmediate { n: 0, immr: 0b000011, imms: 0b111001 })));
+    }
+
+    #[test]
+    fn test_size_4_maximum() {
+        let bitmask = BitmaskImmediate::try_from(0xeeeeeeeeeeeeeeee);
+        assert!(matches!(bitmask, Ok(BitmaskImmediate { n: 0, immr: 0b000011, imms: 0b111010 })));
+    }
+
+    #[test]
+    fn test_size_8_minimum() {
+        let bitmask = BitmaskImmediate::try_from(0x0101010101010101);
+        assert!(matches!(bitmask, Ok(BitmaskImmediate { n: 0, immr: 0b000000, imms: 0b110000 })));
+    }
+
+    #[test]
+    fn test_size_8_rotated() {
+        let bitmask = BitmaskImmediate::try_from(0x1818181818181818);
+        assert!(matches!(bitmask, Ok(BitmaskImmediate { n: 0, immr: 0b000101, imms: 0b110001 })));
+    }
+
+    #[test]
+    fn test_size_8_maximum() {
+        let bitmask = BitmaskImmediate::try_from(0xfefefefefefefefe);
+        assert!(matches!(bitmask, Ok(BitmaskImmediate { n: 0, immr: 0b000111, imms: 0b110110 })));
+    }
+
+    #[test]
+    fn test_size_16_minimum() {
+        let bitmask = BitmaskImmediate::try_from(0x0001000100010001);
+        assert!(matches!(bitmask, Ok(BitmaskImmediate { n: 0, immr: 0b000000, imms: 0b100000 })));
+    }
+
+    #[test]
+    fn test_size_16_rotated() {
+        let bitmask = BitmaskImmediate::try_from(0xff8fff8fff8fff8f);
+        assert!(matches!(bitmask, Ok(BitmaskImmediate { n: 0, immr: 0b001001, imms: 0b101100 })));
+    }
+
+    #[test]
+    fn test_size_16_maximum() {
+        let bitmask = BitmaskImmediate::try_from(0xfffefffefffefffe);
+        assert!(matches!(bitmask, Ok(BitmaskImmediate { n: 0, immr: 0b001111, imms: 0b101110 })));
+    }
+
+    #[test]
+    fn test_size_32_minimum() {
+        let bitmask = BitmaskImmediate::try_from(0x0000000100000001);
+        assert!(matches!(bitmask, Ok(BitmaskImmediate { n: 0, immr: 0b000000, imms: 0b000000 })));
+    }
+
+    #[test]
+    fn test_size_32_rotated() {
+        let bitmask = BitmaskImmediate::try_from(0x3fffff003fffff00);
+        assert!(matches!(bitmask, Ok(BitmaskImmediate { n: 0, immr: 0b011000, imms: 0b010101 })));
+    }
+
+    #[test]
+    fn test_size_32_maximum() {
+        let bitmask = BitmaskImmediate::try_from(0xfffffffefffffffe);
+        assert!(matches!(bitmask, Ok(BitmaskImmediate { n: 0, immr: 0b011111, imms: 0b011110 })));
+    }
+
+    #[test]
+    fn test_size_64_minimum() {
+        let bitmask = BitmaskImmediate::try_from(0x0000000000000001);
+        assert!(matches!(bitmask, Ok(BitmaskImmediate { n: 1, immr: 0b000000, imms: 0b000000 })));
+    }
+
+    #[test]
+    fn test_size_64_rotated() {
+        let bitmask = BitmaskImmediate::try_from(0x0000001fffff0000);
+        assert!(matches!(bitmask, Ok(BitmaskImmediate { n: 1, immr: 0b110000, imms: 0b010100 })));
+    }
+
+    #[test]
+    fn test_size_64_maximum() {
+        let bitmask = BitmaskImmediate::try_from(0xfffffffffffffffe);
+        assert!(matches!(bitmask, Ok(BitmaskImmediate { n: 1, immr: 0b111111, imms: 0b111110 })));
+    }
+
+    #[test]
+    fn test_size_64_invalid() {
+        let bitmask = BitmaskImmediate::try_from(u64::MAX);
+        assert!(matches!(bitmask, Err(())));
+    }
+
+    #[test]
+    fn test_all_valid_32b_pattern() {
+        let mut patterns = vec![];
+        for pattern_size in [2, 4, 8, 16, 32_u64] {
+            for ones_count in 1..pattern_size {
+                for rotation in 0..pattern_size {
+                    let ones = (1_u64 << ones_count) - 1;
+                    let rotated = (ones >> rotation) |
+                        ((ones & ((1 << rotation) - 1)) << (pattern_size - rotation));
+                    let mut replicated = rotated;
+                    let mut shift = pattern_size;
+                    while shift < 32 {
+                        replicated |= replicated << shift;
+                        shift *= 2;
+                    }
+                    let replicated: u32 = replicated.try_into().unwrap();
+                    assert!(BitmaskImmediate::new_32b_reg(replicated).is_ok());
+                    patterns.push(replicated);
+                }
+            }
+        }
+        patterns.sort();
+        patterns.dedup();
+        // Up to {size}-1 ones, and a total of {size} possible rotations.
+        assert_eq!(1*2 + 3*4 + 7*8 + 15*16 + 31*32, patterns.len());
+    }
+}
diff --git a/zjit/src/asm/arm64/arg/condition.rs b/zjit/src/asm/arm64/arg/condition.rs
new file mode 100644
index 00000000000000..f711b8b0d81385
--- /dev/null
+++ b/zjit/src/asm/arm64/arg/condition.rs
@@ -0,0 +1,52 @@
+/// Various instructions in A64 can have condition codes attached. This enum
+/// includes all of the various kinds of conditions along with their respective
+/// encodings.
+pub struct Condition;
+
+impl Condition {
+    pub const EQ: u8 = 0b0000; // equal to
+    pub const NE: u8 = 0b0001; // not equal to
+    pub const CS: u8 = 0b0010; // carry set (alias for HS)
+    pub const CC: u8 = 0b0011; // carry clear (alias for LO)
+    pub const MI: u8 = 0b0100; // minus, negative
+    pub const PL: u8 = 0b0101; // positive or zero
+    pub const VS: u8 = 0b0110; // signed overflow
+    pub const VC: u8 = 0b0111; // no signed overflow
+    pub const HI: u8 = 0b1000; // greater than (unsigned)
+    pub const LS: u8 = 0b1001; // less than or equal to (unsigned)
+    pub const GE: u8 = 0b1010; // greater than or equal to (signed)
+    pub const LT: u8 = 0b1011; // less than (signed)
+    pub const GT: u8 = 0b1100; // greater than (signed)
+    pub const LE: u8 = 0b1101; // less than or equal to (signed)
+    pub const AL: u8 = 0b1110; // always
+
+    pub const fn inverse(condition: u8) -> u8 {
+        match condition {
+            Condition::EQ => Condition::NE,
+            Condition::NE => Condition::EQ,
+
+            Condition::CS => Condition::CC,
+            Condition::CC => Condition::CS,
+
+            Condition::MI => Condition::PL,
+            Condition::PL => Condition::MI,
+
+            Condition::VS => Condition::VC,
+            Condition::VC => Condition::VS,
+
+            Condition::HI => Condition::LS,
+            Condition::LS => Condition::HI,
+
+            Condition::LT => Condition::GE,
+            Condition::GE => Condition::LT,
+
+            Condition::GT => Condition::LE,
+            Condition::LE => Condition::GT,
+
+            Condition::AL => Condition::AL,
+
+            _ => panic!("Unknown condition")
+
+        }
+    }
+}
diff --git a/zjit/src/asm/arm64/arg/inst_offset.rs b/zjit/src/asm/arm64/arg/inst_offset.rs
new file mode 100644
index 00000000000000..f4a6bc73a06711
--- /dev/null
+++ b/zjit/src/asm/arm64/arg/inst_offset.rs
@@ -0,0 +1,47 @@
+/// There are a lot of instructions in the AArch64 architectrue that take an
+/// offset in terms of number of instructions. Usually they are jump
+/// instructions or instructions that load a value relative to the current PC.
+///
+/// This struct is used to mark those locations instead of a generic operand in
+/// order to give better clarity to the developer when reading the AArch64
+/// backend code. It also helps to clarify that everything is in terms of a
+/// number of instructions and not a number of bytes (i.e., the offset is the
+/// number of bytes divided by 4).
+#[derive(Copy, Clone)]
+pub struct InstructionOffset(i32);
+
+impl InstructionOffset {
+    /// Create a new instruction offset.
+    pub fn from_insns(insns: i32) -> Self {
+        InstructionOffset(insns)
+    }
+
+    /// Create a new instruction offset from a number of bytes.
+    pub fn from_bytes(bytes: i32) -> Self {
+        assert_eq!(bytes % 4, 0, "Byte offset must be a multiple of 4");
+        InstructionOffset(bytes / 4)
+    }
+}
+
+impl From<i32> for InstructionOffset {
+    /// Convert an i64 into an instruction offset.
+    fn from(value: i32) -> Self {
+        InstructionOffset(value)
+    }
+}
+
+impl From<InstructionOffset> for i32 {
+    /// Convert an instruction offset into a number of instructions as an i32.
+    fn from(offset: InstructionOffset) -> Self {
+        offset.0
+    }
+}
+
+impl From<InstructionOffset> for i64 {
+    /// Convert an instruction offset into a number of instructions as an i64.
+    /// This is useful for when we're checking how many bits this offset fits
+    /// into.
+    fn from(offset: InstructionOffset) -> Self {
+        offset.0.into()
+    }
+}
diff --git a/zjit/src/asm/arm64/arg/mod.rs b/zjit/src/asm/arm64/arg/mod.rs
new file mode 100644
index 00000000000000..9aff99a81778af
--- /dev/null
+++ b/zjit/src/asm/arm64/arg/mod.rs
@@ -0,0 +1,19 @@
+// This module contains various A64 instruction arguments and the logic
+// necessary to encode them.
+
+mod bitmask_imm;
+mod condition;
+mod inst_offset;
+mod sf;
+mod shifted_imm;
+mod sys_reg;
+mod truncate;
+
+pub use bitmask_imm::BitmaskImmediate;
+#[cfg(target_arch = "aarch64")]
+pub use condition::Condition;
+pub use inst_offset::InstructionOffset;
+pub use sf::Sf;
+pub use shifted_imm::ShiftedImmediate;
+pub use sys_reg::SystemRegister;
+pub use truncate::{truncate_imm, truncate_uimm};
diff --git a/zjit/src/asm/arm64/arg/sf.rs b/zjit/src/asm/arm64/arg/sf.rs
new file mode 100644
index 00000000000000..c2fd33302c1ef8
--- /dev/null
+++ b/zjit/src/asm/arm64/arg/sf.rs
@@ -0,0 +1,19 @@
+/// This is commonly the top-most bit in the encoding of the instruction, and
+/// represents whether register operands should be treated as 64-bit registers
+/// or 32-bit registers.
+pub enum Sf {
+    Sf32 = 0b0,
+    Sf64 = 0b1
+}
+
+/// A convenience function so that we can convert the number of bits of an
+/// register operand directly into an Sf enum variant.
+impl From<u8> for Sf {
+    fn from(num_bits: u8) -> Self {
+        match num_bits {
+            64 => Sf::Sf64,
+            32 => Sf::Sf32,
+            _ => panic!("Invalid number of bits: {}", num_bits)
+        }
+    }
+}
diff --git a/zjit/src/asm/arm64/arg/shifted_imm.rs b/zjit/src/asm/arm64/arg/shifted_imm.rs
new file mode 100644
index 00000000000000..4602ac64ab9495
--- /dev/null
+++ b/zjit/src/asm/arm64/arg/shifted_imm.rs
@@ -0,0 +1,81 @@
+/// How much to shift the immediate by.
+pub enum Shift {
+    LSL0 = 0b0, // no shift
+    LSL12 = 0b1 // logical shift left by 12 bits
+}
+
+/// Some instructions accept a 12-bit immediate that has an optional shift
+/// attached to it. This allows encoding larger values than just fit into 12
+/// bits. We attempt to encode those here. If the values are too large we have
+/// to bail out.
+pub struct ShiftedImmediate {
+    shift: Shift,
+    value: u16
+}
+
+impl TryFrom<u64> for ShiftedImmediate {
+    type Error = ();
+
+    /// Attempt to convert a u64 into a BitmaskImm.
+    fn try_from(value: u64) -> Result<Self, Self::Error> {
+        let current = value;
+        if current < 2_u64.pow(12) {
+            return Ok(ShiftedImmediate { shift: Shift::LSL0, value: current as u16 });
+        }
+
+        if (current & (2_u64.pow(12) - 1) == 0) && ((current >> 12) < 2_u64.pow(12)) {
+            return Ok(ShiftedImmediate { shift: Shift::LSL12, value: (current >> 12) as u16 });
+        }
+
+        Err(())
+    }
+}
+
+impl From<ShiftedImmediate> for u32 {
+    /// Encode a bitmask immediate into a 32-bit value.
+    fn from(imm: ShiftedImmediate) -> Self {
+        0
+        | (((imm.shift as u32) & 1) << 12)
+        | (imm.value as u32)
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn test_no_shift() {
+        let expected_value = 256;
+        let result = ShiftedImmediate::try_from(expected_value);
+
+        match result {
+            Ok(ShiftedImmediate { shift: Shift::LSL0, value }) => assert_eq!(value as u64, expected_value),
+            _ => panic!("Unexpected shift value")
+        }
+    }
+
+    #[test]
+    fn test_maximum_no_shift() {
+        let expected_value = (1 << 12) - 1;
+        let result = ShiftedImmediate::try_from(expected_value);
+
+        match result {
+            Ok(ShiftedImmediate { shift: Shift::LSL0, value }) => assert_eq!(value as u64, expected_value),
+            _ => panic!("Unexpected shift value")
+        }
+    }
+
+    #[test]
+    fn test_with_shift() {
+        let result = ShiftedImmediate::try_from(256 << 12);
+
+        assert!(matches!(result, Ok(ShiftedImmediate { shift: Shift::LSL12, value: 256 })));
+    }
+
+    #[test]
+    fn test_unencodable() {
+        let result = ShiftedImmediate::try_from((256 << 12) + 1);
+        assert!(matches!(result, Err(())));
+    }
+}
diff --git a/zjit/src/asm/arm64/arg/sys_reg.rs b/zjit/src/asm/arm64/arg/sys_reg.rs
new file mode 100644
index 00000000000000..6229d5c1fd296b
--- /dev/null
+++ b/zjit/src/asm/arm64/arg/sys_reg.rs
@@ -0,0 +1,6 @@
+/// The encoded representation of an A64 system register.
+/// <https://developer.arm.com/documentation/ddi0601/2022-06/AArch64-Registers/>
+pub enum SystemRegister {
+    /// <https://developer.arm.com/documentation/ddi0601/2022-06/AArch64-Registers/NZCV--Condition-Flags?lang=en>
+    NZCV = 0b1_011_0100_0010_000
+}
diff --git a/zjit/src/asm/arm64/arg/truncate.rs b/zjit/src/asm/arm64/arg/truncate.rs
new file mode 100644
index 00000000000000..85d56ff202693e
--- /dev/null
+++ b/zjit/src/asm/arm64/arg/truncate.rs
@@ -0,0 +1,66 @@
+// There are many instances in AArch64 instruction encoding where you represent
+// an integer value with a particular bit width that isn't a power of 2. These
+// functions represent truncating those integer values down to the appropriate
+// number of bits.
+
+/// Truncate a signed immediate to fit into a compile-time known width. It is
+/// assumed before calling this function that the value fits into the correct
+/// size. If it doesn't, then this function will panic.
+///
+/// When the value is positive, this should effectively be a no-op since we're
+/// just dropping leading zeroes. When the value is negative we should only be
+/// dropping leading ones.
+pub fn truncate_imm<T: Into<i32>, const WIDTH: usize>(imm: T) -> u32 {
+    let value: i32 = imm.into();
+    let masked = (value as u32) & ((1 << WIDTH) - 1);
+
+    // Assert that we didn't drop any bits by truncating.
+    if value >= 0 {
+        assert_eq!(value as u32, masked);
+    } else {
+        assert_eq!(value as u32, masked | (u32::MAX << WIDTH));
+    }
+
+    masked
+}
+
+/// Truncate an unsigned immediate to fit into a compile-time known width. It is
+/// assumed before calling this function that the value fits into the correct
+/// size. If it doesn't, then this function will panic.
+///
+/// This should effectively be a no-op since we're just dropping leading zeroes.
+pub fn truncate_uimm<T: Into<u32>, const WIDTH: usize>(uimm: T) -> u32 {
+    let value: u32 = uimm.into();
+    let masked = value & ((1 << WIDTH) - 1);
+
+    // Assert that we didn't drop any bits by truncating.
+    assert_eq!(value, masked);
+
+    masked
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn test_truncate_imm_positive() {
+        let inst = truncate_imm::<i32, 4>(5);
+        let result: u32 = inst;
+        assert_eq!(0b0101, result);
+    }
+
+    #[test]
+    fn test_truncate_imm_negative() {
+        let inst = truncate_imm::<i32, 4>(-5);
+        let result: u32 = inst;
+        assert_eq!(0b1011, result);
+    }
+
+    #[test]
+    fn test_truncate_uimm() {
+        let inst = truncate_uimm::<u32, 4>(5);
+        let result: u32 = inst;
+        assert_eq!(0b0101, result);
+    }
+}
diff --git a/zjit/src/asm/arm64/inst/atomic.rs b/zjit/src/asm/arm64/inst/atomic.rs
new file mode 100644
index 00000000000000..dce9affedf8838
--- /dev/null
+++ b/zjit/src/asm/arm64/inst/atomic.rs
@@ -0,0 +1,86 @@
+/// The size of the register operands to this instruction.
+enum Size {
+    /// Using 32-bit registers.
+    Size32 = 0b10,
+
+    /// Using 64-bit registers.
+    Size64 = 0b11
+}
+
+/// A convenience function so that we can convert the number of bits of an
+/// register operand directly into a Size enum variant.
+impl From<u8> for Size {
+    fn from(num_bits: u8) -> Self {
+        match num_bits {
+            64 => Size::Size64,
+            32 => Size::Size32,
+            _ => panic!("Invalid number of bits: {}", num_bits)
+        }
+    }
+}
+
+/// The struct that represents an A64 atomic instruction that can be encoded.
+///
+/// +-------------+-------------+-------------+-------------+-------------+-------------+-------------+-------------+
+/// | 31 30 29 28 | 27 26 25 24 | 23 22 21 20 | 19 18 17 16 | 15 14 13 12 | 11 10 09 08 | 07 06 05 04 | 03 02 01 00 |
+/// |        1  1    1  0  0  0    1  1  1                     0  0  0  0    0  0                                   |
+/// | size                                 rs..............                       rn.............. rt.............. |
+/// +-------------+-------------+-------------+-------------+-------------+-------------+-------------+-------------+
+///
+pub struct Atomic {
+    /// The register holding the value to be loaded.
+    rt: u8,
+
+    /// The base register.
+    rn: u8,
+
+    /// The register holding the data value to be operated on.
+    rs: u8,
+
+    /// The size of the registers used in this instruction.
+    size: Size
+}
+
+impl Atomic {
+    /// LDADDAL
+    /// <https://developer.arm.com/documentation/ddi0596/2021-12/Base-Instructions/LDADD--LDADDA--LDADDAL--LDADDL--Atomic-add-on-word-or-doubleword-in-memory-?lang=en>
+    pub fn ldaddal(rs: u8, rt: u8, rn: u8, num_bits: u8) -> Self {
+        Self { rt, rn, rs, size: num_bits.into() }
+    }
+}
+
+/// <https://developer.arm.com/documentation/ddi0602/2022-03/Index-by-Encoding/Loads-and-Stores?lang=en>
+const FAMILY: u32 = 0b0100;
+
+impl From<Atomic> for u32 {
+    /// Convert an instruction into a 32-bit value.
+    fn from(inst: Atomic) -> Self {
+        0
+        | ((inst.size as u32) << 30)
+        | (0b11 << 28)
+        | (FAMILY << 25)
+        | (0b111 << 21)
+        | ((inst.rs as u32) << 16)
+        | ((inst.rn as u32) << 5)
+        | (inst.rt as u32)
+    }
+}
+
+impl From<Atomic> for [u8; 4] {
+    /// Convert an instruction into a 4 byte array.
+    fn from(inst: Atomic) -> [u8; 4] {
+        let result: u32 = inst.into();
+        result.to_le_bytes()
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn test_ldaddal() {
+        let result: u32 = Atomic::ldaddal(20, 21, 22, 64).into();
+        assert_eq!(0xf8f402d5, result);
+    }
+}
diff --git a/zjit/src/asm/arm64/inst/branch.rs b/zjit/src/asm/arm64/inst/branch.rs
new file mode 100644
index 00000000000000..14fcb2e9fd99f5
--- /dev/null
+++ b/zjit/src/asm/arm64/inst/branch.rs
@@ -0,0 +1,100 @@
+/// Which operation to perform.
+enum Op {
+    /// Perform a BR instruction.
+    BR = 0b00,
+
+    /// Perform a BLR instruction.
+    BLR = 0b01,
+
+    /// Perform a RET instruction.
+    RET = 0b10
+}
+
+/// The struct that represents an A64 branch instruction that can be encoded.
+///
+/// +-------------+-------------+-------------+-------------+-------------+-------------+-------------+-------------+
+/// | 31 30 29 28 | 27 26 25 24 | 23 22 21 20 | 19 18 17 16 | 15 14 13 12 | 11 10 09 08 | 07 06 05 04 | 03 02 01 00 |
+/// |  1  1  0  1    0  1  1  0    0        1    1  1  1  1    0  0  0  0    0  0                   0    0  0  0  0 |
+/// |                                op...                                        rn.............. rm.............. |
+/// +-------------+-------------+-------------+-------------+-------------+-------------+-------------+-------------+
+///
+pub struct Branch {
+    /// The register holding the address to be branched to.
+    rn: u8,
+
+    /// The operation to perform.
+    op: Op
+}
+
+impl Branch {
+    /// BR
+    /// <https://developer.arm.com/documentation/ddi0602/2022-03/Base-Instructions/BR--Branch-to-Register-?lang=en>
+    pub fn br(rn: u8) -> Self {
+        Self { rn, op: Op::BR }
+    }
+
+    /// BLR
+    /// <https://developer.arm.com/documentation/ddi0602/2022-03/Base-Instructions/BLR--Branch-with-Link-to-Register-?lang=en>
+    pub fn blr(rn: u8) -> Self {
+        Self { rn, op: Op::BLR }
+    }
+
+    /// RET
+    /// <https://developer.arm.com/documentation/ddi0596/2021-12/Base-Instructions/RET--Return-from-subroutine-?lang=en>
+    pub fn ret(rn: u8) -> Self {
+        Self { rn, op: Op::RET }
+    }
+}
+
+/// <https://developer.arm.com/documentation/ddi0602/2022-03/Index-by-Encoding/Branches--Exception-Generating-and-System-instructions?lang=en>
+const FAMILY: u32 = 0b101;
+
+impl From<Branch> for u32 {
+    /// Convert an instruction into a 32-bit value.
+    fn from(inst: Branch) -> Self {
+        0
+        | (0b11 << 30)
+        | (FAMILY << 26)
+        | (1 << 25)
+        | ((inst.op as u32) << 21)
+        | (0b11111 << 16)
+        | ((inst.rn as u32) << 5)
+    }
+}
+
+impl From<Branch> for [u8; 4] {
+    /// Convert an instruction into a 4 byte array.
+    fn from(inst: Branch) -> [u8; 4] {
+        let result: u32 = inst.into();
+        result.to_le_bytes()
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn test_br() {
+        let result: u32 = Branch::br(0).into();
+        assert_eq!(0xd61f0000, result);
+    }
+
+    #[test]
+    fn test_blr() {
+        let result: u32 = Branch::blr(0).into();
+        assert_eq!(0xd63f0000, result);
+    }
+
+    #[test]
+    fn test_ret() {
+        let result: u32 = Branch::ret(30).into();
+        assert_eq!(0xd65f03C0, result);
+    }
+
+    #[test]
+    fn test_ret_rn() {
+        let result: u32 = Branch::ret(20).into();
+        assert_eq!(0xd65f0280, result);
+    }
+}
diff --git a/zjit/src/asm/arm64/inst/branch_cond.rs b/zjit/src/asm/arm64/inst/branch_cond.rs
new file mode 100644
index 00000000000000..49f44c16689478
--- /dev/null
+++ b/zjit/src/asm/arm64/inst/branch_cond.rs
@@ -0,0 +1,80 @@
+use super::super::arg::{InstructionOffset, truncate_imm};
+
+/// The struct that represents an A64 conditional branch instruction that can be
+/// encoded.
+///
+/// +-------------+-------------+-------------+-------------+-------------+-------------+-------------+-------------+
+/// | 31 30 29 28 | 27 26 25 24 | 23 22 21 20 | 19 18 17 16 | 15 14 13 12 | 11 10 09 08 | 07 06 05 04 | 03 02 01 00 |
+/// |  0  1  0  1    0  1  0  0                                                                     0               |
+/// |                             imm19...........................................................      cond....... |
+/// +-------------+-------------+-------------+-------------+-------------+-------------+-------------+-------------+
+///
+pub struct BranchCond {
+    /// The kind of condition to check before branching.
+    cond: u8,
+
+    /// The instruction offset from this instruction to branch to.
+    offset: InstructionOffset
+}
+
+impl BranchCond {
+    /// B.cond
+    /// <https://developer.arm.com/documentation/ddi0596/2020-12/Base-Instructions/B-cond--Branch-conditionally->
+    pub fn bcond(cond: u8, offset: InstructionOffset) -> Self {
+        Self { cond, offset }
+    }
+}
+
+/// <https://developer.arm.com/documentation/ddi0602/2022-03/Index-by-Encoding/Branches--Exception-Generating-and-System-instructions?lang=en>
+const FAMILY: u32 = 0b101;
+
+impl From<BranchCond> for u32 {
+    /// Convert an instruction into a 32-bit value.
+    fn from(inst: BranchCond) -> Self {
+        0
+        | (1 << 30)
+        | (FAMILY << 26)
+        | (truncate_imm::<_, 19>(inst.offset) << 5)
+        | (inst.cond as u32)
+    }
+}
+
+impl From<BranchCond> for [u8; 4] {
+    /// Convert an instruction into a 4 byte array.
+    fn from(inst: BranchCond) -> [u8; 4] {
+        let result: u32 = inst.into();
+        result.to_le_bytes()
+    }
+}
+
+/*
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use super::super::super::arg::Condition;
+
+    #[test]
+    fn test_b_eq() {
+        let result: u32 = BranchCond::bcond(Condition::EQ, 32.into()).into();
+        assert_eq!(0x54000400, result);
+    }
+
+    #[test]
+    fn test_b_vs() {
+        let result: u32 = BranchCond::bcond(Condition::VS, 32.into()).into();
+        assert_eq!(0x54000406, result);
+    }
+
+    #[test]
+    fn test_b_eq_max() {
+        let result: u32 = BranchCond::bcond(Condition::EQ, ((1 << 18) - 1).into()).into();
+        assert_eq!(0x547fffe0, result);
+    }
+
+    #[test]
+    fn test_b_eq_min() {
+        let result: u32 = BranchCond::bcond(Condition::EQ, (-(1 << 18)).into()).into();
+        assert_eq!(0x54800000, result);
+    }
+}
+*/
diff --git a/zjit/src/asm/arm64/inst/breakpoint.rs b/zjit/src/asm/arm64/inst/breakpoint.rs
new file mode 100644
index 00000000000000..d66a35c4c6c716
--- /dev/null
+++ b/zjit/src/asm/arm64/inst/breakpoint.rs
@@ -0,0 +1,55 @@
+/// The struct that represents an A64 breakpoint instruction that can be encoded.
+///
+/// +-------------+-------------+-------------+-------------+-------------+-------------+-------------+-------------+
+/// | 31 30 29 28 | 27 26 25 24 | 23 22 21 20 | 19 18 17 16 | 15 14 13 12 | 11 10 09 08 | 07 06 05 04 | 03 02 01 00 |
+/// |  1  1  0  1    0  1  0  0    0  0  1                                                          0    0  0  0  0 |
+/// |                                      imm16..................................................                  |
+/// +-------------+-------------+-------------+-------------+-------------+-------------+-------------+-------------+
+///
+pub struct Breakpoint {
+    /// The value to be captured by ESR_ELx.ISS
+    imm16: u16
+}
+
+impl Breakpoint {
+    /// BRK
+    /// <https://developer.arm.com/documentation/ddi0596/2020-12/Base-Instructions/BRK--Breakpoint-instruction->
+    pub fn brk(imm16: u16) -> Self {
+        Self { imm16 }
+    }
+}
+
+/// <https://developer.arm.com/documentation/ddi0602/2022-03/Index-by-Encoding/Branches--Exception-Generating-and-System-instructions?lang=en#control>
+const FAMILY: u32 = 0b101;
+
+impl From<Breakpoint> for u32 {
+    /// Convert an instruction into a 32-bit value.
+    fn from(inst: Breakpoint) -> Self {
+        let imm16 = inst.imm16 as u32;
+
+        0
+        | (0b11 << 30)
+        | (FAMILY << 26)
+        | (1 << 21)
+        | (imm16 << 5)
+    }
+}
+
+impl From<Breakpoint> for [u8; 4] {
+    /// Convert an instruction into a 4 byte array.
+    fn from(inst: Breakpoint) -> [u8; 4] {
+        let result: u32 = inst.into();
+        result.to_le_bytes()
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn test_brk() {
+        let result: u32 = Breakpoint::brk(7).into();
+        assert_eq!(0xd42000e0, result);
+    }
+}
diff --git a/zjit/src/asm/arm64/inst/call.rs b/zjit/src/asm/arm64/inst/call.rs
new file mode 100644
index 00000000000000..fd26d09f8a1e6d
--- /dev/null
+++ b/zjit/src/asm/arm64/inst/call.rs
@@ -0,0 +1,104 @@
+use super::super::arg::{InstructionOffset, truncate_imm};
+
+/// The operation to perform for this instruction.
+enum Op {
+    /// Branch directly, with a hint that this is not a subroutine call or
+    /// return.
+    Branch = 0,
+
+    /// Branch directly, with a hint that this is a subroutine call or return.
+    BranchWithLink = 1
+}
+
+/// The struct that represents an A64 branch with our without link instruction
+/// that can be encoded.
+///
+/// +-------------+-------------+-------------+-------------+-------------+-------------+-------------+-------------+
+/// | 31 30 29 28 | 27 26 25 24 | 23 22 21 20 | 19 18 17 16 | 15 14 13 12 | 11 10 09 08 | 07 06 05 04 | 03 02 01 00 |
+/// |     0  0  1    0  1                                                                                           |
+/// | op                  imm26.................................................................................... |
+/// +-------------+-------------+-------------+-------------+-------------+-------------+-------------+-------------+
+///
+pub struct Call {
+    /// The PC-relative offset to jump to in terms of number of instructions.
+    offset: InstructionOffset,
+
+    /// The operation to perform for this instruction.
+    op: Op
+}
+
+impl Call {
+    /// B
+    /// <https://developer.arm.com/documentation/ddi0596/2021-12/Base-Instructions/B--Branch->
+    pub fn b(offset: InstructionOffset) -> Self {
+        Self { offset, op: Op::Branch }
+    }
+
+    /// BL
+    /// <https://developer.arm.com/documentation/ddi0596/2021-12/Base-Instructions/BL--Branch-with-Link-?lang=en>
+    pub fn bl(offset: InstructionOffset) -> Self {
+        Self { offset, op: Op::BranchWithLink }
+    }
+}
+
+/// <https://developer.arm.com/documentation/ddi0602/2022-03/Index-by-Encoding/Branches--Exception-Generating-and-System-instructions?lang=en>
+const FAMILY: u32 = 0b101;
+
+impl From<Call> for u32 {
+    /// Convert an instruction into a 32-bit value.
+    fn from(inst: Call) -> Self {
+        0
+        | ((inst.op as u32) << 31)
+        | (FAMILY << 26)
+        | truncate_imm::<_, 26>(inst.offset)
+    }
+}
+
+impl From<Call> for [u8; 4] {
+    /// Convert an instruction into a 4 byte array.
+    fn from(inst: Call) -> [u8; 4] {
+        let result: u32 = inst.into();
+        result.to_le_bytes()
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn test_bl() {
+        let result: u32 = Call::bl(0.into()).into();
+        assert_eq!(0x94000000, result);
+    }
+
+    #[test]
+    fn test_bl_positive() {
+        let result: u32 = Call::bl(256.into()).into();
+        assert_eq!(0x94000100, result);
+    }
+
+    #[test]
+    fn test_bl_negative() {
+        let result: u32 = Call::bl((-256).into()).into();
+        assert_eq!(0x97ffff00, result);
+    }
+
+    #[test]
+    fn test_b() {
+        let result: u32 = Call::b(0.into()).into();
+        assert_eq!(0x14000000, result);
+    }
+
+    #[test]
+    fn test_b_positive() {
+        let result: u32 = Call::b(((1 << 25) - 1).into()).into();
+        assert_eq!(0x15ffffff, result);
+    }
+
+    #[test]
+    fn test_b_negative() {
+        let result: u32 = Call::b((-(1 << 25)).into()).into();
+        assert_eq!(0x16000000, result);
+    }
+}
diff --git a/zjit/src/asm/arm64/inst/conditional.rs b/zjit/src/asm/arm64/inst/conditional.rs
new file mode 100644
index 00000000000000..90b5993cadf06b
--- /dev/null
+++ b/zjit/src/asm/arm64/inst/conditional.rs
@@ -0,0 +1,75 @@
+use super::super::arg::Sf;
+
+/// The struct that represents an A64 conditional instruction that can be
+/// encoded.
+///
+/// +-------------+-------------+-------------+-------------+-------------+-------------+-------------+-------------+
+/// | 31 30 29 28 | 27 26 25 24 | 23 22 21 20 | 19 18 17 16 | 15 14 13 12 | 11 10 09 08 | 07 06 05 04 | 03 02 01 00 |
+/// |     0  0  1    1  0  1  0    1  0  0                                   0  0                                   |
+/// | sf                                   rm..............   cond.......         rn.............. rd.............. |
+/// +-------------+-------------+-------------+-------------+-------------+-------------+-------------+-------------+
+///
+pub struct Conditional {
+    /// The number of the general-purpose destination register.
+    rd: u8,
+
+    /// The number of the first general-purpose source register.
+    rn: u8,
+
+    /// The condition to use for the conditional instruction.
+    cond: u8,
+
+    /// The number of the second general-purpose source register.
+    rm: u8,
+
+    /// The size of the registers of this instruction.
+    sf: Sf
+}
+
+impl Conditional {
+    /// CSEL
+    /// <https://developer.arm.com/documentation/ddi0596/2021-12/Base-Instructions/CSEL--Conditional-Select-?lang=en>
+    pub fn csel(rd: u8, rn: u8, rm: u8, cond: u8, num_bits: u8) -> Self {
+        Self { rd, rn, cond, rm, sf: num_bits.into() }
+    }
+}
+
+/// <https://developer.arm.com/documentation/ddi0602/2022-03/Index-by-Encoding/Data-Processing----Register?lang=en#condsel>
+const FAMILY: u32 = 0b101;
+
+impl From<Conditional> for u32 {
+    /// Convert an instruction into a 32-bit value.
+    fn from(inst: Conditional) -> Self {
+        0
+        | ((inst.sf as u32) << 31)
+        | (1 << 28)
+        | (FAMILY << 25)
+        | (1 << 23)
+        | ((inst.rm as u32) << 16)
+        | ((inst.cond as u32) << 12)
+        | ((inst.rn as u32) << 5)
+        | (inst.rd as u32)
+    }
+}
+
+impl From<Conditional> for [u8; 4] {
+    /// Convert an instruction into a 4 byte array.
+    fn from(inst: Conditional) -> [u8; 4] {
+        let result: u32 = inst.into();
+        result.to_le_bytes()
+    }
+}
+
+/*
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use super::super::super::arg::Condition;
+
+    #[test]
+    fn test_csel() {
+        let result: u32 = Conditional::csel(0, 1, 2, Condition::NE, 64).into();
+        assert_eq!(0x9a821020, result);
+    }
+}
+*/
diff --git a/zjit/src/asm/arm64/inst/data_imm.rs b/zjit/src/asm/arm64/inst/data_imm.rs
new file mode 100644
index 00000000000000..ea717054788cdb
--- /dev/null
+++ b/zjit/src/asm/arm64/inst/data_imm.rs
@@ -0,0 +1,143 @@
+use super::super::arg::{Sf, ShiftedImmediate};
+
+/// The operation being performed by this instruction.
+enum Op {
+    Add = 0b0,
+    Sub = 0b1
+}
+
+// Whether or not to update the flags when this instruction is performed.
+enum S {
+    LeaveFlags = 0b0,
+    UpdateFlags = 0b1
+}
+
+/// The struct that represents an A64 data processing -- immediate instruction
+/// that can be encoded.
+///
+/// Add/subtract (immediate)
+/// +-------------+-------------+-------------+-------------+-------------+-------------+-------------+-------------+
+/// | 31 30 29 28 | 27 26 25 24 | 23 22 21 20 | 19 18 17 16 | 15 14 13 12 | 11 10 09 08 | 07 06 05 04 | 03 02 01 00 |
+/// |           1    0  0  0  1    0                                                                                |
+/// | sf op  S                       sh imm12.................................... rn.............. rd.............. |
+/// +-------------+-------------+-------------+-------------+-------------+-------------+-------------+-------------+
+///
+pub struct DataImm {
+    /// The register number of the destination register.
+    rd: u8,
+
+    /// The register number of the first operand register.
+    rn: u8,
+
+    /// How much to shift the immediate by.
+    imm: ShiftedImmediate,
+
+    /// Whether or not to update the flags when this instruction is performed.
+    s: S,
+
+    /// The opcode for this instruction.
+    op: Op,
+
+    /// Whether or not this instruction is operating on 64-bit operands.
+    sf: Sf
+}
+
+impl DataImm {
+    /// ADD (immediate)
+    /// <https://developer.arm.com/documentation/ddi0596/2021-12/Base-Instructions/ADD--immediate---Add--immediate--?lang=en>
+    pub fn add(rd: u8, rn: u8, imm: ShiftedImmediate, num_bits: u8) -> Self {
+        Self { rd, rn, imm, s: S::LeaveFlags, op: Op::Add, sf: num_bits.into() }
+    }
+
+    /// ADDS (immediate, set flags)
+    /// <https://developer.arm.com/documentation/ddi0596/2021-12/Base-Instructions/ADDS--immediate---Add--immediate---setting-flags-?lang=en>
+    pub fn adds(rd: u8, rn: u8, imm: ShiftedImmediate, num_bits: u8) -> Self {
+        Self { rd, rn, imm, s: S::UpdateFlags, op: Op::Add, sf: num_bits.into() }
+    }
+
+    /// CMP (immediate)
+    /// <https://developer.arm.com/documentation/ddi0596/2021-12/Base-Instructions/CMP--immediate---Compare--immediate---an-alias-of-SUBS--immediate--?lang=en>
+    pub fn cmp(rn: u8, imm: ShiftedImmediate, num_bits: u8) -> Self {
+        Self::subs(31, rn, imm, num_bits)
+    }
+
+    /// SUB (immediate)
+    /// <https://developer.arm.com/documentation/ddi0596/2021-12/Base-Instructions/SUB--immediate---Subtract--immediate--?lang=en>
+    pub fn sub(rd: u8, rn: u8, imm: ShiftedImmediate, num_bits: u8) -> Self {
+        Self { rd, rn, imm, s: S::LeaveFlags, op: Op::Sub, sf: num_bits.into() }
+    }
+
+    /// SUBS (immediate, set flags)
+    /// <https://developer.arm.com/documentation/ddi0596/2021-12/Base-Instructions/SUBS--immediate---Subtract--immediate---setting-flags-?lang=en>
+    pub fn subs(rd: u8, rn: u8, imm: ShiftedImmediate, num_bits: u8) -> Self {
+        Self { rd, rn, imm, s: S::UpdateFlags, op: Op::Sub, sf: num_bits.into() }
+    }
+}
+
+/// <https://developer.arm.com/documentation/ddi0602/2022-03/Index-by-Encoding/Data-Processing----Immediate?lang=en>
+const FAMILY: u32 = 0b1000;
+
+impl From<DataImm> for u32 {
+    /// Convert an instruction into a 32-bit value.
+    fn from(inst: DataImm) -> Self {
+        let imm: u32 = inst.imm.into();
+
+        0
+        | ((inst.sf as u32) << 31)
+        | ((inst.op as u32) << 30)
+        | ((inst.s as u32) << 29)
+        | (FAMILY << 25)
+        | (1 << 24)
+        | (imm << 10)
+        | ((inst.rn as u32) << 5)
+        | inst.rd as u32
+    }
+}
+
+impl From<DataImm> for [u8; 4] {
+    /// Convert an instruction into a 4 byte array.
+    fn from(inst: DataImm) -> [u8; 4] {
+        let result: u32 = inst.into();
+        result.to_le_bytes()
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn test_add() {
+        let inst = DataImm::add(0, 1, 7.try_into().unwrap(), 64);
+        let result: u32 = inst.into();
+        assert_eq!(0x91001c20, result);
+    }
+
+    #[test]
+    fn test_adds() {
+        let inst = DataImm::adds(0, 1, 7.try_into().unwrap(), 64);
+        let result: u32 = inst.into();
+        assert_eq!(0xb1001c20, result);
+    }
+
+    #[test]
+    fn test_cmp() {
+        let inst = DataImm::cmp(0, 7.try_into().unwrap(), 64);
+        let result: u32 = inst.into();
+        assert_eq!(0xf1001c1f, result);
+    }
+
+    #[test]
+    fn test_sub() {
+        let inst = DataImm::sub(0, 1, 7.try_into().unwrap(), 64);
+        let result: u32 = inst.into();
+        assert_eq!(0xd1001c20, result);
+    }
+
+    #[test]
+    fn test_subs() {
+        let inst = DataImm::subs(0, 1, 7.try_into().unwrap(), 64);
+        let result: u32 = inst.into();
+        assert_eq!(0xf1001c20, result);
+    }
+}
diff --git a/zjit/src/asm/arm64/inst/data_reg.rs b/zjit/src/asm/arm64/inst/data_reg.rs
new file mode 100644
index 00000000000000..ed4afa956b032d
--- /dev/null
+++ b/zjit/src/asm/arm64/inst/data_reg.rs
@@ -0,0 +1,192 @@
+use super::super::arg::{Sf, truncate_uimm};
+
+/// The operation being performed by this instruction.
+enum Op {
+    Add = 0b0,
+    Sub = 0b1
+}
+
+// Whether or not to update the flags when this instruction is performed.
+enum S {
+    LeaveFlags = 0b0,
+    UpdateFlags = 0b1
+}
+
+/// The type of shift to perform on the second operand register.
+enum Shift {
+    LSL = 0b00, // logical shift left (unsigned)
+    LSR = 0b01, // logical shift right (unsigned)
+    ASR = 0b10  // arithmetic shift right (signed)
+}
+
+/// The struct that represents an A64 data processing -- register instruction
+/// that can be encoded.
+///
+/// Add/subtract (shifted register)
+/// +-------------+-------------+-------------+-------------+-------------+-------------+-------------+-------------+
+/// | 31 30 29 28 | 27 26 25 24 | 23 22 21 20 | 19 18 17 16 | 15 14 13 12 | 11 10 09 08 | 07 06 05 04 | 03 02 01 00 |
+/// |           0    1  0  1  1          0                                                                          |
+/// | sf op  S                    shift    rm..............   imm6............... rn.............. rd.............. |
+/// +-------------+-------------+-------------+-------------+-------------+-------------+-------------+-------------+
+///
+pub struct DataReg {
+    /// The register number of the destination register.
+    rd: u8,
+
+    /// The register number of the first operand register.
+    rn: u8,
+
+    /// The amount to shift the second operand register by.
+    imm6: u8,
+
+    /// The register number of the second operand register.
+    rm: u8,
+
+    /// The type of shift to perform on the second operand register.
+    shift: Shift,
+
+    /// Whether or not to update the flags when this instruction is performed.
+    s: S,
+
+    /// The opcode for this instruction.
+    op: Op,
+
+    /// Whether or not this instruction is operating on 64-bit operands.
+    sf: Sf
+}
+
+impl DataReg {
+    /// ADD (shifted register)
+    /// <https://developer.arm.com/documentation/ddi0596/2021-12/Base-Instructions/ADD--shifted-register---Add--shifted-register--?lang=en>
+    pub fn add(rd: u8, rn: u8, rm: u8, num_bits: u8) -> Self {
+        Self {
+            rd,
+            rn,
+            imm6: 0,
+            rm,
+            shift: Shift::LSL,
+            s: S::LeaveFlags,
+            op: Op::Add,
+            sf: num_bits.into()
+        }
+    }
+
+    /// ADDS (shifted register, set flags)
+    /// <https://developer.arm.com/documentation/ddi0596/2021-12/Base-Instructions/ADDS--shifted-register---Add--shifted-register---setting-flags-?lang=en>
+    pub fn adds(rd: u8, rn: u8, rm: u8, num_bits: u8) -> Self {
+        Self {
+            rd,
+            rn,
+            imm6: 0,
+            rm,
+            shift: Shift::LSL,
+            s: S::UpdateFlags,
+            op: Op::Add,
+            sf: num_bits.into()
+        }
+    }
+
+    /// CMP (shifted register)
+    /// <https://developer.arm.com/documentation/ddi0596/2021-12/Base-Instructions/CMP--shifted-register---Compare--shifted-register---an-alias-of-SUBS--shifted-register--?lang=en>
+    pub fn cmp(rn: u8, rm: u8, num_bits: u8) -> Self {
+        Self::subs(31, rn, rm, num_bits)
+    }
+
+    /// SUB (shifted register)
+    /// <https://developer.arm.com/documentation/ddi0596/2021-12/Base-Instructions/SUB--shifted-register---Subtract--shifted-register--?lang=en>
+    pub fn sub(rd: u8, rn: u8, rm: u8, num_bits: u8) -> Self {
+        Self {
+            rd,
+            rn,
+            imm6: 0,
+            rm,
+            shift: Shift::LSL,
+            s: S::LeaveFlags,
+            op: Op::Sub,
+            sf: num_bits.into()
+        }
+    }
+
+    /// SUBS (shifted register, set flags)
+    /// <https://developer.arm.com/documentation/ddi0596/2021-12/Base-Instructions/SUBS--shifted-register---Subtract--shifted-register---setting-flags-?lang=en>
+    pub fn subs(rd: u8, rn: u8, rm: u8, num_bits: u8) -> Self {
+        Self {
+            rd,
+            rn,
+            imm6: 0,
+            rm,
+            shift: Shift::LSL,
+            s: S::UpdateFlags,
+            op: Op::Sub,
+            sf: num_bits.into()
+        }
+    }
+}
+
+/// <https://developer.arm.com/documentation/ddi0602/2022-03/Index-by-Encoding/Data-Processing----Register?lang=en>
+const FAMILY: u32 = 0b0101;
+
+impl From<DataReg> for u32 {
+    /// Convert an instruction into a 32-bit value.
+    fn from(inst: DataReg) -> Self {
+        0
+        | ((inst.sf as u32) << 31)
+        | ((inst.op as u32) << 30)
+        | ((inst.s as u32) << 29)
+        | (FAMILY << 25)
+        | (1 << 24)
+        | ((inst.shift as u32) << 22)
+        | ((inst.rm as u32) << 16)
+        | (truncate_uimm::<_, 6>(inst.imm6) << 10)
+        | ((inst.rn as u32) << 5)
+        | inst.rd as u32
+    }
+}
+
+impl From<DataReg> for [u8; 4] {
+    /// Convert an instruction into a 4 byte array.
+    fn from(inst: DataReg) -> [u8; 4] {
+        let result: u32 = inst.into();
+        result.to_le_bytes()
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn test_add() {
+        let inst = DataReg::add(0, 1, 2, 64);
+        let result: u32 = inst.into();
+        assert_eq!(0x8b020020, result);
+    }
+
+    #[test]
+    fn test_adds() {
+        let inst = DataReg::adds(0, 1, 2, 64);
+        let result: u32 = inst.into();
+        assert_eq!(0xab020020, result);
+    }
+
+    #[test]
+    fn test_cmp() {
+        let inst = DataReg::cmp(0, 1, 64);
+        let result: u32 = inst.into();
+        assert_eq!(0xeb01001f, result);
+    }
+
+    #[test]
+    fn test_sub() {
+        let inst = DataReg::sub(0, 1, 2, 64);
+        let result: u32 = inst.into();
+        assert_eq!(0xcb020020, result);
+    }
+
+    #[test]
+    fn test_subs() {
+        let inst = DataReg::subs(0, 1, 2, 64);
+        let result: u32 = inst.into();
+        assert_eq!(0xeb020020, result);
+    }
+}
diff --git a/zjit/src/asm/arm64/inst/halfword_imm.rs b/zjit/src/asm/arm64/inst/halfword_imm.rs
new file mode 100644
index 00000000000000..863ac947dd5324
--- /dev/null
+++ b/zjit/src/asm/arm64/inst/halfword_imm.rs
@@ -0,0 +1,179 @@
+use super::super::arg::truncate_imm;
+
+/// Whether this is a load or a store.
+enum Op {
+    Load = 1,
+    Store = 0
+}
+
+/// The type of indexing to perform for this instruction.
+enum Index {
+    /// No indexing.
+    None = 0b00,
+
+    /// Mutate the register after the read.
+    PostIndex = 0b01,
+
+    /// Mutate the register before the read.
+    PreIndex = 0b11
+}
+
+/// The struct that represents an A64 halfword instruction that can be encoded.
+///
+/// LDRH/STRH
+/// +-------------+-------------+-------------+-------------+-------------+-------------+-------------+-------------+
+/// | 31 30 29 28 | 27 26 25 24 | 23 22 21 20 | 19 18 17 16 | 15 14 13 12 | 11 10 09 08 | 07 06 05 04 | 03 02 01 00 |
+/// |  0  1  1  1    1  0  0  1    0                                                                                |
+/// |                                op imm12.................................... rn.............. rt.............. |
+/// +-------------+-------------+-------------+-------------+-------------+-------------+-------------+-------------+
+///
+/// LDRH (pre-index/post-index)
+/// +-------------+-------------+-------------+-------------+-------------+-------------+-------------+-------------+
+/// | 31 30 29 28 | 27 26 25 24 | 23 22 21 20 | 19 18 17 16 | 15 14 13 12 | 11 10 09 08 | 07 06 05 04 | 03 02 01 00 |
+/// |  0  1  1  1    1  0  0  0    0     0                                                                          |
+/// |                                op    imm9..........................   index rn.............. rt.............. |
+/// +-------------+-------------+-------------+-------------+-------------+-------------+-------------+-------------+
+///
+pub struct HalfwordImm {
+    /// The number of the 32-bit register to be loaded.
+    rt: u8,
+
+    /// The number of the 64-bit base register to calculate the memory address.
+    rn: u8,
+
+    /// The type of indexing to perform for this instruction.
+    index: Index,
+
+    /// The immediate offset from the base register.
+    imm: i16,
+
+    /// The operation to perform.
+    op: Op
+}
+
+impl HalfwordImm {
+    /// LDRH
+    /// <https://developer.arm.com/documentation/ddi0602/2022-06/Base-Instructions/LDRH--immediate---Load-Register-Halfword--immediate-->
+    pub fn ldrh(rt: u8, rn: u8, imm12: i16) -> Self {
+        Self { rt, rn, index: Index::None, imm: imm12, op: Op::Load }
+    }
+
+    /// LDRH (pre-index)
+    /// <https://developer.arm.com/documentation/ddi0602/2022-06/Base-Instructions/LDRH--immediate---Load-Register-Halfword--immediate-->
+    pub fn ldrh_pre(rt: u8, rn: u8, imm9: i16) -> Self {
+        Self { rt, rn, index: Index::PreIndex, imm: imm9, op: Op::Load }
+    }
+
+    /// LDRH (post-index)
+    /// <https://developer.arm.com/documentation/ddi0602/2022-06/Base-Instructions/LDRH--immediate---Load-Register-Halfword--immediate-->
+    pub fn ldrh_post(rt: u8, rn: u8, imm9: i16) -> Self {
+        Self { rt, rn, index: Index::PostIndex, imm: imm9, op: Op::Load }
+    }
+
+    /// STRH
+    /// <https://developer.arm.com/documentation/ddi0602/2022-06/Base-Instructions/STRH--immediate---Store-Register-Halfword--immediate-->
+    pub fn strh(rt: u8, rn: u8, imm12: i16) -> Self {
+        Self { rt, rn, index: Index::None, imm: imm12, op: Op::Store }
+    }
+
+    /// STRH (pre-index)
+    /// <https://developer.arm.com/documentation/ddi0602/2022-06/Base-Instructions/STRH--immediate---Store-Register-Halfword--immediate-->
+    pub fn strh_pre(rt: u8, rn: u8, imm9: i16) -> Self {
+        Self { rt, rn, index: Index::PreIndex, imm: imm9, op: Op::Store }
+    }
+
+    /// STRH (post-index)
+    /// <https://developer.arm.com/documentation/ddi0602/2022-06/Base-Instructions/STRH--immediate---Store-Register-Halfword--immediate-->
+    pub fn strh_post(rt: u8, rn: u8, imm9: i16) -> Self {
+        Self { rt, rn, index: Index::PostIndex, imm: imm9, op: Op::Store }
+    }
+}
+
+/// <https://developer.arm.com/documentation/ddi0602/2022-03/Index-by-Encoding/Loads-and-Stores?lang=en>
+const FAMILY: u32 = 0b111100;
+
+impl From<HalfwordImm> for u32 {
+    /// Convert an instruction into a 32-bit value.
+    fn from(inst: HalfwordImm) -> Self {
+        let (opc, imm) = match inst.index {
+            Index::None => {
+                assert_eq!(inst.imm & 1, 0, "immediate offset must be even");
+                let imm12 = truncate_imm::<_, 12>(inst.imm / 2);
+                (0b100, imm12)
+            },
+            Index::PreIndex | Index::PostIndex => {
+                let imm9 = truncate_imm::<_, 9>(inst.imm);
+                (0b000, (imm9 << 2) | (inst.index as u32))
+            }
+        };
+
+        0
+        | (FAMILY << 25)
+        | ((opc | (inst.op as u32)) << 22)
+        | (imm << 10)
+        | ((inst.rn as u32) << 5)
+        | (inst.rt as u32)
+    }
+}
+
+impl From<HalfwordImm> for [u8; 4] {
+    /// Convert an instruction into a 4 byte array.
+    fn from(inst: HalfwordImm) -> [u8; 4] {
+        let result: u32 = inst.into();
+        result.to_le_bytes()
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn test_ldrh() {
+        let inst = HalfwordImm::ldrh(0, 1, 8);
+        let result: u32 = inst.into();
+        assert_eq!(0x79401020, result);
+    }
+
+    #[test]
+    fn test_ldrh_pre() {
+        let inst = HalfwordImm::ldrh_pre(0, 1, 16);
+        let result: u32 = inst.into();
+        assert_eq!(0x78410c20, result);
+    }
+
+    #[test]
+    fn test_ldrh_post() {
+        let inst = HalfwordImm::ldrh_post(0, 1, 24);
+        let result: u32 = inst.into();
+        assert_eq!(0x78418420, result);
+    }
+
+    #[test]
+    fn test_ldrh_post_negative() {
+        let inst = HalfwordImm::ldrh_post(0, 1, -24);
+        let result: u32 = inst.into();
+        assert_eq!(0x785e8420, result);
+    }
+
+    #[test]
+    fn test_strh() {
+        let inst = HalfwordImm::strh(0, 1, 0);
+        let result: u32 = inst.into();
+        assert_eq!(0x79000020, result);
+    }
+
+    #[test]
+    fn test_strh_pre() {
+        let inst = HalfwordImm::strh_pre(0, 1, 0);
+        let result: u32 = inst.into();
+        assert_eq!(0x78000c20, result);
+    }
+
+    #[test]
+    fn test_strh_post() {
+        let inst = HalfwordImm::strh_post(0, 1, 0);
+        let result: u32 = inst.into();
+        assert_eq!(0x78000420, result);
+    }
+}
diff --git a/zjit/src/asm/arm64/inst/load_literal.rs b/zjit/src/asm/arm64/inst/load_literal.rs
new file mode 100644
index 00000000000000..817e8935531b2b
--- /dev/null
+++ b/zjit/src/asm/arm64/inst/load_literal.rs
@@ -0,0 +1,89 @@
+use super::super::arg::{InstructionOffset, truncate_imm};
+
+/// The size of the operands being operated on.
+enum Opc {
+    Size32 = 0b00,
+    Size64 = 0b01,
+}
+
+/// A convenience function so that we can convert the number of bits of an
+/// register operand directly into an Sf enum variant.
+impl From<u8> for Opc {
+    fn from(num_bits: u8) -> Self {
+        match num_bits {
+            64 => Opc::Size64,
+            32 => Opc::Size32,
+            _ => panic!("Invalid number of bits: {}", num_bits)
+        }
+    }
+}
+
+/// The struct that represents an A64 load literal instruction that can be encoded.
+///
+/// LDR
+/// +-------------+-------------+-------------+-------------+-------------+-------------+-------------+-------------+
+/// | 31 30 29 28 | 27 26 25 24 | 23 22 21 20 | 19 18 17 16 | 15 14 13 12 | 11 10 09 08 | 07 06 05 04 | 03 02 01 00 |
+/// |        0  1    1  0  0  0                                                                                     |
+/// | opc..                       imm19........................................................... rt.............. |
+/// +-------------+-------------+-------------+-------------+-------------+-------------+-------------+-------------+
+///
+pub struct LoadLiteral {
+    /// The number of the register to load the value into.
+    rt: u8,
+
+    /// The PC-relative number of instructions to load the value from.
+    offset: InstructionOffset,
+
+    /// The size of the operands being operated on.
+    opc: Opc
+}
+
+impl LoadLiteral {
+    /// LDR (load literal)
+    /// <https://developer.arm.com/documentation/ddi0596/2021-12/Base-Instructions/LDR--literal---Load-Register--literal--?lang=en>
+    pub fn ldr_literal(rt: u8, offset: InstructionOffset, num_bits: u8) -> Self {
+        Self { rt, offset, opc: num_bits.into() }
+    }
+}
+
+/// <https://developer.arm.com/documentation/ddi0602/2022-03/Index-by-Encoding/Loads-and-Stores?lang=en>
+const FAMILY: u32 = 0b0100;
+
+impl From<LoadLiteral> for u32 {
+    /// Convert an instruction into a 32-bit value.
+    fn from(inst: LoadLiteral) -> Self {
+        0
+        | ((inst.opc as u32) << 30)
+        | (1 << 28)
+        | (FAMILY << 25)
+        | (truncate_imm::<_, 19>(inst.offset) << 5)
+        | (inst.rt as u32)
+    }
+}
+
+impl From<LoadLiteral> for [u8; 4] {
+    /// Convert an instruction into a 4 byte array.
+    fn from(inst: LoadLiteral) -> [u8; 4] {
+        let result: u32 = inst.into();
+        result.to_le_bytes()
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn test_ldr_positive() {
+        let inst = LoadLiteral::ldr_literal(0, 5.into(), 64);
+        let result: u32 = inst.into();
+        assert_eq!(0x580000a0, result);
+    }
+
+    #[test]
+    fn test_ldr_negative() {
+        let inst = LoadLiteral::ldr_literal(0, (-5).into(), 64);
+        let result: u32 = inst.into();
+        assert_eq!(0x58ffff60, result);
+    }
+}
diff --git a/zjit/src/asm/arm64/inst/load_register.rs b/zjit/src/asm/arm64/inst/load_register.rs
new file mode 100644
index 00000000000000..3d94e8da1f8f26
--- /dev/null
+++ b/zjit/src/asm/arm64/inst/load_register.rs
@@ -0,0 +1,108 @@
+/// Whether or not to shift the register.
+enum S {
+    Shift = 1,
+    NoShift = 0
+}
+
+/// The option for this instruction.
+enum Option {
+    UXTW = 0b010,
+    LSL = 0b011,
+    SXTW = 0b110,
+    SXTX = 0b111
+}
+
+/// The size of the operands of this instruction.
+enum Size {
+    Size32 = 0b10,
+    Size64 = 0b11
+}
+
+/// A convenience function so that we can convert the number of bits of an
+/// register operand directly into a Size enum variant.
+impl From<u8> for Size {
+    fn from(num_bits: u8) -> Self {
+        match num_bits {
+            64 => Size::Size64,
+            32 => Size::Size32,
+            _ => panic!("Invalid number of bits: {}", num_bits)
+        }
+    }
+}
+
+/// The struct that represents an A64 load instruction that can be encoded.
+///
+/// LDR
+/// +-------------+-------------+-------------+-------------+-------------+-------------+-------------+-------------+
+/// | 31 30 29 28 | 27 26 25 24 | 23 22 21 20 | 19 18 17 16 | 15 14 13 12 | 11 10 09 08 | 07 06 05 04 | 03 02 01 00 |
+/// |        1  1    1  0  0  0    0  1  1                                   1  0                                   |
+/// | size.                                rm..............   option.. S          rn.............. rt.............. |
+/// +-------------+-------------+-------------+-------------+-------------+-------------+-------------+-------------+
+///
+pub struct LoadRegister {
+    /// The number of the register to load the value into.
+    rt: u8,
+
+    /// The base register with which to form the address.
+    rn: u8,
+
+    /// Whether or not to shift the value of the register.
+    s: S,
+
+    /// The option associated with this instruction that controls the shift.
+    option: Option,
+
+    /// The number of the offset register.
+    rm: u8,
+
+    /// The size of the operands.
+    size: Size
+}
+
+impl LoadRegister {
+    /// LDR
+    /// <https://developer.arm.com/documentation/ddi0596/2021-12/Base-Instructions/LDR--register---Load-Register--register--?lang=en>
+    pub fn ldr(rt: u8, rn: u8, rm: u8, num_bits: u8) -> Self {
+        Self { rt, rn, s: S::NoShift, option: Option::LSL, rm, size: num_bits.into() }
+    }
+}
+
+/// <https://developer.arm.com/documentation/ddi0602/2022-03/Index-by-Encoding/Loads-and-Stores?lang=en>
+const FAMILY: u32 = 0b0100;
+
+impl From<LoadRegister> for u32 {
+    /// Convert an instruction into a 32-bit value.
+    fn from(inst: LoadRegister) -> Self {
+        0
+        | ((inst.size as u32) << 30)
+        | (0b11 << 28)
+        | (FAMILY << 25)
+        | (0b11 << 21)
+        | ((inst.rm as u32) << 16)
+        | ((inst.option as u32) << 13)
+        | ((inst.s as u32) << 12)
+        | (0b10 << 10)
+        | ((inst.rn as u32) << 5)
+        | (inst.rt as u32)
+    }
+}
+
+impl From<LoadRegister> for [u8; 4] {
+    /// Convert an instruction into a 4 byte array.
+    fn from(inst: LoadRegister) -> [u8; 4] {
+        let result: u32 = inst.into();
+        result.to_le_bytes()
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn test_ldr() {
+        let inst = LoadRegister::ldr(0, 1, 2, 64);
+        let result: u32 = inst.into();
+        assert_eq!(0xf8626820, result);
+    }
+}
diff --git a/zjit/src/asm/arm64/inst/load_store.rs b/zjit/src/asm/arm64/inst/load_store.rs
new file mode 100644
index 00000000000000..e27909ae355d10
--- /dev/null
+++ b/zjit/src/asm/arm64/inst/load_store.rs
@@ -0,0 +1,249 @@
+use super::super::arg::truncate_imm;
+
+/// The size of the operands being operated on.
+enum Size {
+    Size8 = 0b00,
+    Size16 = 0b01,
+    Size32 = 0b10,
+    Size64 = 0b11,
+}
+
+/// A convenience function so that we can convert the number of bits of an
+/// register operand directly into an Sf enum variant.
+impl From<u8> for Size {
+    fn from(num_bits: u8) -> Self {
+        match num_bits {
+            64 => Size::Size64,
+            32 => Size::Size32,
+            _ => panic!("Invalid number of bits: {}", num_bits)
+        }
+    }
+}
+
+/// The operation to perform for this instruction.
+enum Opc {
+    STR = 0b00,
+    LDR = 0b01,
+    LDURSW = 0b10
+}
+
+/// What kind of indexing to perform for this instruction.
+enum Index {
+    None = 0b00,
+    PostIndex = 0b01,
+    PreIndex = 0b11
+}
+
+/// The struct that represents an A64 load or store instruction that can be
+/// encoded.
+///
+/// LDR/LDUR/LDURSW/STR/STUR
+/// +-------------+-------------+-------------+-------------+-------------+-------------+-------------+-------------+
+/// | 31 30 29 28 | 27 26 25 24 | 23 22 21 20 | 19 18 17 16 | 15 14 13 12 | 11 10 09 08 | 07 06 05 04 | 03 02 01 00 |
+/// |        1  1    1  0  0  0          0                                                                          |
+/// | size.                       opc..    imm9..........................   idx.. rn.............. rt.............. |
+/// +-------------+-------------+-------------+-------------+-------------+-------------+-------------+-------------+
+///
+pub struct LoadStore {
+    /// The number of the register to load the value into.
+    rt: u8,
+
+    /// The base register with which to form the address.
+    rn: u8,
+
+    /// What kind of indexing to perform for this instruction.
+    idx: Index,
+
+    /// The optional signed immediate byte offset from the base register.
+    imm9: i16,
+
+    /// The operation to perform for this instruction.
+    opc: Opc,
+
+    /// The size of the operands being operated on.
+    size: Size
+}
+
+impl LoadStore {
+    /// LDR (immediate, post-index)
+    /// <https://developer.arm.com/documentation/ddi0596/2020-12/Base-Instructions/LDR--immediate---Load-Register--immediate-->
+    pub fn ldr_post(rt: u8, rn: u8, imm9: i16, num_bits: u8) -> Self {
+        Self { rt, rn, idx: Index::PostIndex, imm9, opc: Opc::LDR, size: num_bits.into() }
+    }
+
+    /// LDR (immediate, pre-index)
+    /// <https://developer.arm.com/documentation/ddi0596/2020-12/Base-Instructions/LDR--immediate---Load-Register--immediate-->
+    pub fn ldr_pre(rt: u8, rn: u8, imm9: i16, num_bits: u8) -> Self {
+        Self { rt, rn, idx: Index::PreIndex, imm9, opc: Opc::LDR, size: num_bits.into() }
+    }
+
+    /// LDUR (load register, unscaled)
+    /// <https://developer.arm.com/documentation/ddi0596/2021-12/Base-Instructions/LDUR--Load-Register--unscaled--?lang=en>
+    pub fn ldur(rt: u8, rn: u8, imm9: i16, num_bits: u8) -> Self {
+        Self { rt, rn, idx: Index::None, imm9, opc: Opc::LDR, size: num_bits.into() }
+    }
+
+    /// LDURH Load Register Halfword (unscaled)
+    /// <https://developer.arm.com/documentation/ddi0596/2021-12/Base-Instructions/LDURH--Load-Register-Halfword--unscaled--?lang=en>
+    pub fn ldurh(rt: u8, rn: u8, imm9: i16) -> Self {
+        Self { rt, rn, idx: Index::None, imm9, opc: Opc::LDR, size: Size::Size16 }
+    }
+
+    /// LDURB (load register, byte, unscaled)
+    /// <https://developer.arm.com/documentation/ddi0596/2021-12/Base-Instructions/LDURB--Load-Register-Byte--unscaled--?lang=en>
+    pub fn ldurb(rt: u8, rn: u8, imm9: i16) -> Self {
+        Self { rt, rn, idx: Index::None, imm9, opc: Opc::LDR, size: Size::Size8 }
+    }
+
+    /// LDURSW (load register, unscaled, signed)
+    /// <https://developer.arm.com/documentation/ddi0596/2021-12/Base-Instructions/LDURSW--Load-Register-Signed-Word--unscaled--?lang=en>
+    pub fn ldursw(rt: u8, rn: u8, imm9: i16) -> Self {
+        Self { rt, rn, idx: Index::None, imm9, opc: Opc::LDURSW, size: Size::Size32 }
+    }
+
+    /// STR (immediate, post-index)
+    /// <https://developer.arm.com/documentation/ddi0596/2020-12/Base-Instructions/STR--immediate---Store-Register--immediate-->
+    pub fn str_post(rt: u8, rn: u8, imm9: i16, num_bits: u8) -> Self {
+        Self { rt, rn, idx: Index::PostIndex, imm9, opc: Opc::STR, size: num_bits.into() }
+    }
+
+    /// STR (immediate, pre-index)
+    /// <https://developer.arm.com/documentation/ddi0596/2020-12/Base-Instructions/STR--immediate---Store-Register--immediate-->
+    pub fn str_pre(rt: u8, rn: u8, imm9: i16, num_bits: u8) -> Self {
+        Self { rt, rn, idx: Index::PreIndex, imm9, opc: Opc::STR, size: num_bits.into() }
+    }
+
+    /// STUR (store register, unscaled)
+    /// <https://developer.arm.com/documentation/ddi0596/2021-12/Base-Instructions/STUR--Store-Register--unscaled--?lang=en>
+    pub fn stur(rt: u8, rn: u8, imm9: i16, num_bits: u8) -> Self {
+        Self { rt, rn, idx: Index::None, imm9, opc: Opc::STR, size: num_bits.into() }
+    }
+
+    /// STURH (store register, halfword, unscaled)
+    /// <https://developer.arm.com/documentation/ddi0596/2021-12/Base-Instructions/STURH--Store-Register-Halfword--unscaled--?lang=en>
+    pub fn sturh(rt: u8, rn: u8, imm9: i16) -> Self {
+        Self { rt, rn, idx: Index::None, imm9, opc: Opc::STR, size: Size::Size16 }
+    }
+}
+
+/// <https://developer.arm.com/documentation/ddi0602/2022-03/Index-by-Encoding/Loads-and-Stores?lang=en>
+const FAMILY: u32 = 0b0100;
+
+impl From<LoadStore> for u32 {
+    /// Convert an instruction into a 32-bit value.
+    fn from(inst: LoadStore) -> Self {
+        0
+        | ((inst.size as u32) << 30)
+        | (0b11 << 28)
+        | (FAMILY << 25)
+        | ((inst.opc as u32) << 22)
+        | (truncate_imm::<_, 9>(inst.imm9) << 12)
+        | ((inst.idx as u32) << 10)
+        | ((inst.rn as u32) << 5)
+        | (inst.rt as u32)
+    }
+}
+
+impl From<LoadStore> for [u8; 4] {
+    /// Convert an instruction into a 4 byte array.
+    fn from(inst: LoadStore) -> [u8; 4] {
+        let result: u32 = inst.into();
+        result.to_le_bytes()
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn test_ldr_post() {
+        let inst = LoadStore::ldr_post(0, 1, 16, 64);
+        let result: u32 = inst.into();
+        assert_eq!(0xf8410420, result);
+    }
+
+    #[test]
+    fn test_ldr_pre() {
+        let inst = LoadStore::ldr_pre(0, 1, 16, 64);
+        let result: u32 = inst.into();
+        assert_eq!(0xf8410c20, result);
+    }
+
+    #[test]
+    fn test_ldur() {
+        let inst = LoadStore::ldur(0, 1, 0, 64);
+        let result: u32 = inst.into();
+        assert_eq!(0xf8400020, result);
+    }
+
+    #[test]
+    fn test_ldurb() {
+        let inst = LoadStore::ldurb(0, 1, 0);
+        let result: u32 = inst.into();
+        assert_eq!(0x38400020, result);
+    }
+
+    #[test]
+    fn test_ldurh() {
+        let inst = LoadStore::ldurh(0, 1, 0);
+        let result: u32 = inst.into();
+        assert_eq!(0x78400020, result);
+    }
+
+    #[test]
+    fn test_ldur_with_imm() {
+        let inst = LoadStore::ldur(0, 1, 123, 64);
+        let result: u32 = inst.into();
+        assert_eq!(0xf847b020, result);
+    }
+
+    #[test]
+    fn test_ldursw() {
+        let inst = LoadStore::ldursw(0, 1, 0);
+        let result: u32 = inst.into();
+        assert_eq!(0xb8800020, result);
+    }
+
+    #[test]
+    fn test_ldursw_with_imm() {
+        let inst = LoadStore::ldursw(0, 1, 123);
+        let result: u32 = inst.into();
+        assert_eq!(0xb887b020, result);
+    }
+
+    #[test]
+    fn test_str_post() {
+        let inst = LoadStore::str_post(0, 1, -16, 64);
+        let result: u32 = inst.into();
+        assert_eq!(0xf81f0420, result);
+    }
+
+    #[test]
+    fn test_str_pre() {
+        let inst = LoadStore::str_pre(0, 1, -16, 64);
+        let result: u32 = inst.into();
+        assert_eq!(0xf81f0c20, result);
+    }
+
+    #[test]
+    fn test_stur() {
+        let inst = LoadStore::stur(0, 1, 0, 64);
+        let result: u32 = inst.into();
+        assert_eq!(0xf8000020, result);
+    }
+
+    #[test]
+    fn test_stur_negative_offset() {
+        let inst = LoadStore::stur(0, 1, -1, 64);
+        let result: u32 = inst.into();
+        assert_eq!(0xf81ff020, result);
+    }
+
+    #[test]
+    fn test_stur_positive_offset() {
+        let inst = LoadStore::stur(0, 1, 255, 64);
+        let result: u32 = inst.into();
+        assert_eq!(0xf80ff020, result);
+    }
+}
diff --git a/zjit/src/asm/arm64/inst/load_store_exclusive.rs b/zjit/src/asm/arm64/inst/load_store_exclusive.rs
new file mode 100644
index 00000000000000..1106b4cb372eb1
--- /dev/null
+++ b/zjit/src/asm/arm64/inst/load_store_exclusive.rs
@@ -0,0 +1,109 @@
+/// The operation being performed for this instruction.
+enum Op {
+    Store = 0,
+    Load = 1
+}
+
+/// The size of the registers being operated on.
+enum Size {
+    Size32 = 0b10,
+    Size64 = 0b11
+}
+
+/// A convenience function so that we can convert the number of bits of an
+/// register operand directly into a Size enum variant.
+impl From<u8> for Size {
+    fn from(num_bits: u8) -> Self {
+        match num_bits {
+            64 => Size::Size64,
+            32 => Size::Size32,
+            _ => panic!("Invalid number of bits: {}", num_bits)
+        }
+    }
+}
+
+/// The struct that represents an A64 load or store exclusive instruction that
+/// can be encoded.
+///
+/// LDAXR/STLXR
+/// +-------------+-------------+-------------+-------------+-------------+-------------+-------------+-------------+
+/// | 31 30 29 28 | 27 26 25 24 | 23 22 21 20 | 19 18 17 16 | 15 14 13 12 | 11 10 09 08 | 07 06 05 04 | 03 02 01 00 |
+/// |  1     0  0    1  0  0  0    0     0                     1  1  1  1    1  1                                   |
+/// | size.                          op    rs..............                       rn.............. rt.............. |
+/// +-------------+-------------+-------------+-------------+-------------+-------------+-------------+-------------+
+///
+pub struct LoadStoreExclusive {
+    /// The number of the register to be loaded.
+    rt: u8,
+
+    /// The base register with which to form the address.
+    rn: u8,
+
+    /// The register to be used for the status result if it applies to this
+    /// operation. Otherwise it's the zero register.
+    rs: u8,
+
+    /// The operation being performed for this instruction.
+    op: Op,
+
+    /// The size of the registers being operated on.
+    size: Size
+}
+
+impl LoadStoreExclusive {
+    /// LDAXR
+    /// <https://developer.arm.com/documentation/ddi0602/2021-12/Base-Instructions/LDAXR--Load-Acquire-Exclusive-Register->
+    pub fn ldaxr(rt: u8, rn: u8, num_bits: u8) -> Self {
+        Self { rt, rn, rs: 31, op: Op::Load, size: num_bits.into() }
+    }
+
+    /// STLXR
+    /// <https://developer.arm.com/documentation/ddi0602/2021-12/Base-Instructions/STLXR--Store-Release-Exclusive-Register->
+    pub fn stlxr(rs: u8, rt: u8, rn: u8, num_bits: u8) -> Self {
+        Self { rt, rn, rs, op: Op::Store, size: num_bits.into() }
+    }
+}
+
+/// <https://developer.arm.com/documentation/ddi0602/2022-03/Index-by-Encoding/Loads-and-Stores?lang=en>
+const FAMILY: u32 = 0b0100;
+
+impl From<LoadStoreExclusive> for u32 {
+    /// Convert an instruction into a 32-bit value.
+    fn from(inst: LoadStoreExclusive) -> Self {
+        0
+        | ((inst.size as u32) << 30)
+        | (FAMILY << 25)
+        | ((inst.op as u32) << 22)
+        | ((inst.rs as u32) << 16)
+        | (0b111111 << 10)
+        | ((inst.rn as u32) << 5)
+        | (inst.rt as u32)
+    }
+}
+
+impl From<LoadStoreExclusive> for [u8; 4] {
+    /// Convert an instruction into a 4 byte array.
+    fn from(inst: LoadStoreExclusive) -> [u8; 4] {
+        let result: u32 = inst.into();
+        result.to_le_bytes()
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn test_ldaxr() {
+        let inst = LoadStoreExclusive::ldaxr(16, 0, 64);
+        let result: u32 = inst.into();
+        assert_eq!(0xc85ffc10, result);
+    }
+
+    #[test]
+    fn test_stlxr() {
+        let inst = LoadStoreExclusive::stlxr(17, 16, 0, 64);
+        let result: u32 = inst.into();
+        assert_eq!(0xc811fc10, result);
+    }
+}
diff --git a/zjit/src/asm/arm64/inst/logical_imm.rs b/zjit/src/asm/arm64/inst/logical_imm.rs
new file mode 100644
index 00000000000000..d57ad5f5b7f96f
--- /dev/null
+++ b/zjit/src/asm/arm64/inst/logical_imm.rs
@@ -0,0 +1,154 @@
+use super::super::arg::{BitmaskImmediate, Sf};
+
+// Which operation to perform.
+enum Opc {
+    /// The AND operation.
+    And = 0b00,
+
+    /// The ORR operation.
+    Orr = 0b01,
+
+    /// The EOR operation.
+    Eor = 0b10,
+
+    /// The ANDS operation.
+    Ands = 0b11
+}
+
+/// The struct that represents an A64 bitwise immediate instruction that can be
+/// encoded.
+///
+/// AND/ORR/ANDS (immediate)
+/// +-------------+-------------+-------------+-------------+-------------+-------------+-------------+-------------+
+/// | 31 30 29 28 | 27 26 25 24 | 23 22 21 20 | 19 18 17 16 | 15 14 13 12 | 11 10 09 08 | 07 06 05 04 | 03 02 01 00 |
+/// |           1    0  0  1  0    0                                                                                |
+/// | sf opc..                       N  immr...............   imms............... rn.............. rd.............. |
+/// +-------------+-------------+-------------+-------------+-------------+-------------+-------------+-------------+
+///
+pub struct LogicalImm {
+    /// The register number of the destination register.
+    rd: u8,
+
+    /// The register number of the first operand register.
+    rn: u8,
+
+    /// The immediate value to test.
+    imm: BitmaskImmediate,
+
+    /// The opcode for this instruction.
+    opc: Opc,
+
+    /// Whether or not this instruction is operating on 64-bit operands.
+    sf: Sf
+}
+
+impl LogicalImm {
+    /// AND (bitmask immediate)
+    /// <https://developer.arm.com/documentation/ddi0596/2021-12/Base-Instructions/AND--immediate---Bitwise-AND--immediate--?lang=en>
+    pub fn and(rd: u8, rn: u8, imm: BitmaskImmediate, num_bits: u8) -> Self {
+        Self { rd, rn, imm, opc: Opc::And, sf: num_bits.into() }
+    }
+
+    /// ANDS (bitmask immediate)
+    /// <https://developer.arm.com/documentation/ddi0596/2021-12/Base-Instructions/ANDS--immediate---Bitwise-AND--immediate---setting-flags-?lang=en>
+    pub fn ands(rd: u8, rn: u8, imm: BitmaskImmediate, num_bits: u8) -> Self {
+        Self { rd, rn, imm, opc: Opc::Ands, sf: num_bits.into() }
+    }
+
+    /// EOR (bitmask immediate)
+    /// <https://developer.arm.com/documentation/ddi0596/2020-12/Base-Instructions/EOR--immediate---Bitwise-Exclusive-OR--immediate-->
+    pub fn eor(rd: u8, rn: u8, imm: BitmaskImmediate, num_bits: u8) -> Self {
+        Self { rd, rn, imm, opc: Opc::Eor, sf: num_bits.into() }
+    }
+
+    /// MOV (bitmask immediate)
+    /// <https://developer.arm.com/documentation/ddi0596/2020-12/Base-Instructions/MOV--bitmask-immediate---Move--bitmask-immediate---an-alias-of-ORR--immediate--?lang=en>
+    pub fn mov(rd: u8, imm: BitmaskImmediate, num_bits: u8) -> Self {
+        Self { rd, rn: 0b11111, imm, opc: Opc::Orr, sf: num_bits.into() }
+    }
+
+    /// ORR (bitmask immediate)
+    /// <https://developer.arm.com/documentation/ddi0596/2020-12/Base-Instructions/ORR--immediate---Bitwise-OR--immediate-->
+    pub fn orr(rd: u8, rn: u8, imm: BitmaskImmediate, num_bits: u8) -> Self {
+        Self { rd, rn, imm, opc: Opc::Orr, sf: num_bits.into() }
+    }
+
+    /// TST (bitmask immediate)
+    /// <https://developer.arm.com/documentation/ddi0596/2021-12/Base-Instructions/TST--immediate---Test-bits--immediate---an-alias-of-ANDS--immediate--?lang=en>
+    pub fn tst(rn: u8, imm: BitmaskImmediate, num_bits: u8) -> Self {
+        Self::ands(31, rn, imm, num_bits)
+    }
+}
+
+/// <https://developer.arm.com/documentation/ddi0602/2022-03/Index-by-Encoding/Data-Processing----Immediate?lang=en#log_imm>
+const FAMILY: u32 = 0b1001;
+
+impl From<LogicalImm> for u32 {
+    /// Convert an instruction into a 32-bit value.
+    fn from(inst: LogicalImm) -> Self {
+        let imm: u32 = inst.imm.encode();
+
+        0
+        | ((inst.sf as u32) << 31)
+        | ((inst.opc as u32) << 29)
+        | (FAMILY << 25)
+        | (imm << 10)
+        | ((inst.rn as u32) << 5)
+        | inst.rd as u32
+    }
+}
+
+impl From<LogicalImm> for [u8; 4] {
+    /// Convert an instruction into a 4 byte array.
+    fn from(inst: LogicalImm) -> [u8; 4] {
+        let result: u32 = inst.into();
+        result.to_le_bytes()
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn test_and() {
+        let inst = LogicalImm::and(0, 1, 7.try_into().unwrap(), 64);
+        let result: u32 = inst.into();
+        assert_eq!(0x92400820, result);
+    }
+
+    #[test]
+    fn test_ands() {
+        let inst = LogicalImm::ands(0, 1, 7.try_into().unwrap(), 64);
+        let result: u32 = inst.into();
+        assert_eq!(0xf2400820, result);
+    }
+
+    #[test]
+    fn test_eor() {
+        let inst = LogicalImm::eor(0, 1, 7.try_into().unwrap(), 64);
+        let result: u32 = inst.into();
+        assert_eq!(0xd2400820, result);
+    }
+
+    #[test]
+    fn test_mov() {
+        let inst = LogicalImm::mov(0, 0x5555555555555555.try_into().unwrap(), 64);
+        let result: u32 = inst.into();
+        assert_eq!(0xb200f3e0, result);
+    }
+
+    #[test]
+    fn test_orr() {
+        let inst = LogicalImm::orr(0, 1, 7.try_into().unwrap(), 64);
+        let result: u32 = inst.into();
+        assert_eq!(0xb2400820, result);
+    }
+
+    #[test]
+    fn test_tst() {
+        let inst = LogicalImm::tst(1, 7.try_into().unwrap(), 64);
+        let result: u32 = inst.into();
+        assert_eq!(0xf240083f, result);
+    }
+}
diff --git a/zjit/src/asm/arm64/inst/logical_reg.rs b/zjit/src/asm/arm64/inst/logical_reg.rs
new file mode 100644
index 00000000000000..18edff606f0bb6
--- /dev/null
+++ b/zjit/src/asm/arm64/inst/logical_reg.rs
@@ -0,0 +1,207 @@
+use super::super::arg::{Sf, truncate_uimm};
+
+/// Whether or not this is a NOT instruction.
+enum N {
+    /// This is not a NOT instruction.
+    No = 0,
+
+    /// This is a NOT instruction.
+    Yes = 1
+}
+
+/// The type of shift to perform on the second operand register.
+enum Shift {
+    LSL = 0b00, // logical shift left (unsigned)
+    LSR = 0b01, // logical shift right (unsigned)
+    ASR = 0b10, // arithmetic shift right (signed)
+    ROR = 0b11  // rotate right (unsigned)
+}
+
+// Which operation to perform.
+enum Opc {
+    /// The AND operation.
+    And = 0b00,
+
+    /// The ORR operation.
+    Orr = 0b01,
+
+    /// The EOR operation.
+    Eor = 0b10,
+
+    /// The ANDS operation.
+    Ands = 0b11
+}
+
+/// The struct that represents an A64 logical register instruction that can be
+/// encoded.
+///
+/// AND/ORR/ANDS (shifted register)
+/// +-------------+-------------+-------------+-------------+-------------+-------------+-------------+-------------+
+/// | 31 30 29 28 | 27 26 25 24 | 23 22 21 20 | 19 18 17 16 | 15 14 13 12 | 11 10 09 08 | 07 06 05 04 | 03 02 01 00 |
+/// |           0    1  0  1  0                                                                                     |
+/// | sf opc..                    shift N  rm..............   imm6............... rn.............. rd.............. |
+/// +-------------+-------------+-------------+-------------+-------------+-------------+-------------+-------------+
+///
+pub struct LogicalReg {
+    /// The register number of the destination register.
+    rd: u8,
+
+    /// The register number of the first operand register.
+    rn: u8,
+
+    /// The amount to shift the second operand register.
+    imm6: u8,
+
+    /// The register number of the second operand register.
+    rm: u8,
+
+    /// Whether or not this is a NOT instruction.
+    n: N,
+
+    /// The type of shift to perform on the second operand register.
+    shift: Shift,
+
+    /// The opcode for this instruction.
+    opc: Opc,
+
+    /// Whether or not this instruction is operating on 64-bit operands.
+    sf: Sf
+}
+
+impl LogicalReg {
+    /// AND (shifted register)
+    /// <https://developer.arm.com/documentation/ddi0596/2021-12/Base-Instructions/AND--shifted-register---Bitwise-AND--shifted-register--?lang=en>
+    pub fn and(rd: u8, rn: u8, rm: u8, num_bits: u8) -> Self {
+        Self { rd, rn, imm6: 0, rm, n: N::No, shift: Shift::LSL, opc: Opc::And, sf: num_bits.into() }
+    }
+
+    /// ANDS (shifted register)
+    /// <https://developer.arm.com/documentation/ddi0596/2021-12/Base-Instructions/ANDS--shifted-register---Bitwise-AND--shifted-register---setting-flags-?lang=en>
+    pub fn ands(rd: u8, rn: u8, rm: u8, num_bits: u8) -> Self {
+        Self { rd, rn, imm6: 0, rm, n: N::No, shift: Shift::LSL, opc: Opc::Ands, sf: num_bits.into() }
+    }
+
+    /// EOR (shifted register)
+    /// <https://developer.arm.com/documentation/ddi0596/2020-12/Base-Instructions/EOR--shifted-register---Bitwise-Exclusive-OR--shifted-register-->
+    pub fn eor(rd: u8, rn: u8, rm: u8, num_bits: u8) -> Self {
+        Self { rd, rn, imm6: 0, rm, n: N::No, shift: Shift::LSL, opc: Opc::Eor, sf: num_bits.into() }
+    }
+
+    /// MOV (register)
+    /// <https://developer.arm.com/documentation/ddi0596/2020-12/Base-Instructions/MOV--register---Move--register---an-alias-of-ORR--shifted-register--?lang=en>
+    pub fn mov(rd: u8, rm: u8, num_bits: u8) -> Self {
+        Self { rd, rn: 0b11111, imm6: 0, rm, n: N::No, shift: Shift::LSL, opc: Opc::Orr, sf: num_bits.into() }
+    }
+
+    /// MVN (shifted register)
+    /// <https://developer.arm.com/documentation/ddi0596/2020-12/Base-Instructions/MVN--Bitwise-NOT--an-alias-of-ORN--shifted-register--?lang=en>
+    pub fn mvn(rd: u8, rm: u8, num_bits: u8) -> Self {
+        Self { rd, rn: 0b11111, imm6: 0, rm, n: N::Yes, shift: Shift::LSL, opc: Opc::Orr, sf: num_bits.into() }
+    }
+
+    /// ORN (shifted register)
+    /// <https://developer.arm.com/documentation/ddi0596/2020-12/Base-Instructions/ORN--shifted-register---Bitwise-OR-NOT--shifted-register-->
+    pub fn orn(rd: u8, rn: u8, rm: u8, num_bits: u8) -> Self {
+        Self { rd, rn, imm6: 0, rm, n: N::Yes, shift: Shift::LSL, opc: Opc::Orr, sf: num_bits.into() }
+    }
+
+    /// ORR (shifted register)
+    /// <https://developer.arm.com/documentation/ddi0596/2020-12/Base-Instructions/ORR--shifted-register---Bitwise-OR--shifted-register-->
+    pub fn orr(rd: u8, rn: u8, rm: u8, num_bits: u8) -> Self {
+        Self { rd, rn, imm6: 0, rm, n: N::No, shift: Shift::LSL, opc: Opc::Orr, sf: num_bits.into() }
+    }
+
+    /// TST (shifted register)
+    /// <https://developer.arm.com/documentation/ddi0596/2021-12/Base-Instructions/TST--shifted-register---Test--shifted-register---an-alias-of-ANDS--shifted-register--?lang=en>
+    pub fn tst(rn: u8, rm: u8, num_bits: u8) -> Self {
+        Self { rd: 31, rn, imm6: 0, rm, n: N::No, shift: Shift::LSL, opc: Opc::Ands, sf: num_bits.into() }
+    }
+}
+
+/// <https://developer.arm.com/documentation/ddi0602/2022-03/Index-by-Encoding/Data-Processing----Register?lang=en>
+const FAMILY: u32 = 0b0101;
+
+impl From<LogicalReg> for u32 {
+    /// Convert an instruction into a 32-bit value.
+    fn from(inst: LogicalReg) -> Self {
+        0
+        | ((inst.sf as u32) << 31)
+        | ((inst.opc as u32) << 29)
+        | (FAMILY << 25)
+        | ((inst.shift as u32) << 22)
+        | ((inst.n as u32) << 21)
+        | ((inst.rm as u32) << 16)
+        | (truncate_uimm::<_, 6>(inst.imm6) << 10)
+        | ((inst.rn as u32) << 5)
+        | inst.rd as u32
+    }
+}
+
+impl From<LogicalReg> for [u8; 4] {
+    /// Convert an instruction into a 4 byte array.
+    fn from(inst: LogicalReg) -> [u8; 4] {
+        let result: u32 = inst.into();
+        result.to_le_bytes()
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn test_and() {
+        let inst = LogicalReg::and(0, 1, 2, 64);
+        let result: u32 = inst.into();
+        assert_eq!(0x8a020020, result);
+    }
+
+    #[test]
+    fn test_ands() {
+        let inst = LogicalReg::ands(0, 1, 2, 64);
+        let result: u32 = inst.into();
+        assert_eq!(0xea020020, result);
+    }
+
+    #[test]
+    fn test_eor() {
+        let inst = LogicalReg::eor(0, 1, 2, 64);
+        let result: u32 = inst.into();
+        assert_eq!(0xca020020, result);
+    }
+
+    #[test]
+    fn test_mov() {
+        let inst = LogicalReg::mov(0, 1, 64);
+        let result: u32 = inst.into();
+        assert_eq!(0xaa0103e0, result);
+    }
+
+    #[test]
+    fn test_mvn() {
+        let inst = LogicalReg::mvn(0, 1, 64);
+        let result: u32 = inst.into();
+        assert_eq!(0xaa2103e0, result);
+    }
+
+    #[test]
+    fn test_orn() {
+        let inst = LogicalReg::orn(0, 1, 2, 64);
+        let result: u32 = inst.into();
+        assert_eq!(0xaa220020, result);
+    }
+
+    #[test]
+    fn test_orr() {
+        let inst = LogicalReg::orr(0, 1, 2, 64);
+        let result: u32 = inst.into();
+        assert_eq!(0xaa020020, result);
+    }
+
+    #[test]
+    fn test_tst() {
+        let inst = LogicalReg::tst(0, 1, 64);
+        let result: u32 = inst.into();
+        assert_eq!(0xea01001f, result);
+    }
+}
diff --git a/zjit/src/asm/arm64/inst/madd.rs b/zjit/src/asm/arm64/inst/madd.rs
new file mode 100644
index 00000000000000..71f2ab230a9adf
--- /dev/null
+++ b/zjit/src/asm/arm64/inst/madd.rs
@@ -0,0 +1,73 @@
+use super::super::arg::Sf;
+
+/// The struct that represents an A64 multiply-add instruction that can be
+/// encoded.
+///
+/// +-------------+-------------+-------------+-------------+-------------+-------------+-------------+-------------+
+/// | 31 30 29 28 | 27 26 25 24 | 23 22 21 20 | 19 18 17 16 | 15 14 13 12 | 11 10 09 08 | 07 06 05 04 | 03 02 01 00 |
+/// |     0  0  1    1  0  1  1    0  0  0                     0                                                    |
+/// | sf                                   rm..............      ra.............. rn.............. rd.............. |
+/// +-------------+-------------+-------------+-------------+-------------+-------------+-------------+-------------+
+///
+pub struct MAdd {
+    /// The number of the general-purpose destination register.
+    rd: u8,
+
+    /// The number of the first general-purpose source register.
+    rn: u8,
+
+    /// The number of the third general-purpose source register.
+    ra: u8,
+
+    /// The number of the second general-purpose source register.
+    rm: u8,
+
+    /// The size of the registers of this instruction.
+    sf: Sf
+}
+
+impl MAdd {
+    /// MUL
+    /// <https://developer.arm.com/documentation/ddi0602/2023-06/Base-Instructions/MUL--Multiply--an-alias-of-MADD->
+    pub fn mul(rd: u8, rn: u8, rm: u8, num_bits: u8) -> Self {
+        Self { rd, rn, ra: 0b11111, rm, sf: num_bits.into() }
+    }
+}
+
+impl From<MAdd> for u32 {
+    /// Convert an instruction into a 32-bit value.
+    fn from(inst: MAdd) -> Self {
+        0
+        | ((inst.sf as u32) << 31)
+        | (0b11011 << 24)
+        | ((inst.rm as u32) << 16)
+        | ((inst.ra as u32) << 10)
+        | ((inst.rn as u32) << 5)
+        | (inst.rd as u32)
+    }
+}
+
+impl From<MAdd> for [u8; 4] {
+    /// Convert an instruction into a 4 byte array.
+    fn from(inst: MAdd) -> [u8; 4] {
+        let result: u32 = inst.into();
+        result.to_le_bytes()
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn test_mul_32() {
+        let result: u32 = MAdd::mul(0, 1, 2, 32).into();
+        assert_eq!(0x1B027C20, result);
+    }
+
+    #[test]
+    fn test_mul_64() {
+        let result: u32 = MAdd::mul(0, 1, 2, 64).into();
+        assert_eq!(0x9B027C20, result);
+    }
+}
diff --git a/zjit/src/asm/arm64/inst/mod.rs b/zjit/src/asm/arm64/inst/mod.rs
new file mode 100644
index 00000000000000..bfffd914efe29a
--- /dev/null
+++ b/zjit/src/asm/arm64/inst/mod.rs
@@ -0,0 +1,54 @@
+// This module contains various A64 instructions and the logic necessary to
+// encode them into u32s.
+
+mod atomic;
+mod branch;
+mod branch_cond;
+mod breakpoint;
+mod call;
+mod conditional;
+mod data_imm;
+mod data_reg;
+mod halfword_imm;
+mod load_literal;
+mod load_register;
+mod load_store;
+mod load_store_exclusive;
+mod logical_imm;
+mod logical_reg;
+mod madd;
+mod smulh;
+mod mov;
+mod nop;
+mod pc_rel;
+mod reg_pair;
+mod sbfm;
+mod shift_imm;
+mod sys_reg;
+mod test_bit;
+
+pub use atomic::Atomic;
+pub use branch::Branch;
+pub use branch_cond::BranchCond;
+pub use breakpoint::Breakpoint;
+pub use call::Call;
+pub use conditional::Conditional;
+pub use data_imm::DataImm;
+pub use data_reg::DataReg;
+pub use halfword_imm::HalfwordImm;
+pub use load_literal::LoadLiteral;
+pub use load_register::LoadRegister;
+pub use load_store::LoadStore;
+pub use load_store_exclusive::LoadStoreExclusive;
+pub use logical_imm::LogicalImm;
+pub use logical_reg::LogicalReg;
+pub use madd::MAdd;
+pub use smulh::SMulH;
+pub use mov::Mov;
+pub use nop::Nop;
+pub use pc_rel::PCRelative;
+pub use reg_pair::RegisterPair;
+pub use sbfm::SBFM;
+pub use shift_imm::ShiftImm;
+pub use sys_reg::SysReg;
+pub use test_bit::TestBit;
diff --git a/zjit/src/asm/arm64/inst/mov.rs b/zjit/src/asm/arm64/inst/mov.rs
new file mode 100644
index 00000000000000..eae4565c3ab0ce
--- /dev/null
+++ b/zjit/src/asm/arm64/inst/mov.rs
@@ -0,0 +1,155 @@
+use super::super::arg::Sf;
+
+/// Which operation is being performed.
+enum Op {
+    /// A movz operation which zeroes out the other bits.
+    MOVZ = 0b10,
+
+    /// A movk operation which keeps the other bits in place.
+    MOVK = 0b11
+}
+
+/// How much to shift the immediate by.
+enum Hw {
+    LSL0 = 0b00,
+    LSL16 = 0b01,
+    LSL32 = 0b10,
+    LSL48 = 0b11
+}
+
+impl From<u8> for Hw {
+    fn from(shift: u8) -> Self {
+        match shift {
+            0 => Hw::LSL0,
+            16 => Hw::LSL16,
+            32 => Hw::LSL32,
+            48 => Hw::LSL48,
+            _ => panic!("Invalid value for shift: {}", shift)
+        }
+    }
+}
+
+/// The struct that represents a MOVK or MOVZ instruction.
+///
+/// +-------------+-------------+-------------+-------------+-------------+-------------+-------------+-------------+
+/// | 31 30 29 28 | 27 26 25 24 | 23 22 21 20 | 19 18 17 16 | 15 14 13 12 | 11 10 09 08 | 07 06 05 04 | 03 02 01 00 |
+/// |           1    0  0  1  0    1                                                                                |
+/// | sf op...                       hw... imm16.................................................. rd.............. |
+/// +-------------+-------------+-------------+-------------+-------------+-------------+-------------+-------------+
+///
+pub struct Mov {
+    /// The register number of the destination register.
+    rd: u8,
+
+    /// The value to move into the register.
+    imm16: u16,
+
+    /// The shift of the value to move.
+    hw: Hw,
+
+    /// Which operation is being performed.
+    op: Op,
+
+    /// Whether or not this instruction is operating on 64-bit operands.
+    sf: Sf
+}
+
+impl Mov {
+    /// MOVK
+    /// <https://developer.arm.com/documentation/ddi0602/2022-03/Base-Instructions/MOVK--Move-wide-with-keep-?lang=en>
+    pub fn movk(rd: u8, imm16: u16, hw: u8, num_bits: u8) -> Self {
+        Self { rd, imm16, hw: hw.into(), op: Op::MOVK, sf: num_bits.into() }
+    }
+
+    /// MOVZ
+    /// <https://developer.arm.com/documentation/ddi0602/2022-03/Base-Instructions/MOVZ--Move-wide-with-zero-?lang=en>
+    pub fn movz(rd: u8, imm16: u16, hw: u8, num_bits: u8) -> Self {
+        Self { rd, imm16, hw: hw.into(), op: Op::MOVZ, sf: num_bits.into() }
+    }
+}
+
+/// <https://developer.arm.com/documentation/ddi0602/2022-03/Index-by-Encoding/Data-Processing----Immediate?lang=en>
+const FAMILY: u32 = 0b1000;
+
+impl From<Mov> for u32 {
+    /// Convert an instruction into a 32-bit value.
+    fn from(inst: Mov) -> Self {
+        0
+        | ((inst.sf as u32) << 31)
+        | ((inst.op as u32) << 29)
+        | (FAMILY << 25)
+        | (0b101 << 23)
+        | ((inst.hw as u32) << 21)
+        | ((inst.imm16 as u32) << 5)
+        | inst.rd as u32
+    }
+}
+
+impl From<Mov> for [u8; 4] {
+    /// Convert an instruction into a 4 byte array.
+    fn from(inst: Mov) -> [u8; 4] {
+        let result: u32 = inst.into();
+        result.to_le_bytes()
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn test_movk_unshifted() {
+        let inst = Mov::movk(0, 123, 0, 64);
+        let result: u32 = inst.into();
+        assert_eq!(0xf2800f60, result);
+    }
+
+    #[test]
+    fn test_movk_shifted_16() {
+        let inst = Mov::movk(0, 123, 16, 64);
+        let result: u32 = inst.into();
+        assert_eq!(0xf2A00f60, result);
+    }
+
+    #[test]
+    fn test_movk_shifted_32() {
+        let inst = Mov::movk(0, 123, 32, 64);
+        let result: u32 = inst.into();
+        assert_eq!(0xf2C00f60, result);
+    }
+
+    #[test]
+    fn test_movk_shifted_48() {
+        let inst = Mov::movk(0, 123, 48, 64);
+        let result: u32 = inst.into();
+        assert_eq!(0xf2e00f60, result);
+    }
+
+    #[test]
+    fn test_movz_unshifted() {
+        let inst = Mov::movz(0, 123, 0, 64);
+        let result: u32 = inst.into();
+        assert_eq!(0xd2800f60, result);
+    }
+
+    #[test]
+    fn test_movz_shifted_16() {
+        let inst = Mov::movz(0, 123, 16, 64);
+        let result: u32 = inst.into();
+        assert_eq!(0xd2a00f60, result);
+    }
+
+    #[test]
+    fn test_movz_shifted_32() {
+        let inst = Mov::movz(0, 123, 32, 64);
+        let result: u32 = inst.into();
+        assert_eq!(0xd2c00f60, result);
+    }
+
+    #[test]
+    fn test_movz_shifted_48() {
+        let inst = Mov::movz(0, 123, 48, 64);
+        let result: u32 = inst.into();
+        assert_eq!(0xd2e00f60, result);
+    }
+}
diff --git a/zjit/src/asm/arm64/inst/nop.rs b/zjit/src/asm/arm64/inst/nop.rs
new file mode 100644
index 00000000000000..081d8558f5741e
--- /dev/null
+++ b/zjit/src/asm/arm64/inst/nop.rs
@@ -0,0 +1,44 @@
+/// The struct that represents an A64 nop instruction that can be encoded.
+///
+/// NOP
+/// +-------------+-------------+-------------+-------------+-------------+-------------+-------------+-------------+
+/// | 31 30 29 28 | 27 26 25 24 | 23 22 21 20 | 19 18 17 16 | 15 14 13 12 | 11 10 09 08 | 07 06 05 04 | 03 02 01 00 |
+/// |  1  1  0  1    0  1  0  1    0  0  0  0    0  0  1  1    0  0  1  0    0  0  0  0    0  0  0  1    1  1  1  1 |
+/// +-------------+-------------+-------------+-------------+-------------+-------------+-------------+-------------+
+///
+pub struct Nop;
+
+impl Nop {
+    /// NOP
+    /// <https://developer.arm.com/documentation/ddi0602/2022-03/Base-Instructions/NOP--No-Operation->
+    pub fn nop() -> Self {
+        Self {}
+    }
+}
+
+impl From<Nop> for u32 {
+    /// Convert an instruction into a 32-bit value.
+    fn from(_inst: Nop) -> Self {
+        0b11010101000000110010000000011111
+    }
+}
+
+impl From<Nop> for [u8; 4] {
+    /// Convert an instruction into a 4 byte array.
+    fn from(inst: Nop) -> [u8; 4] {
+        let result: u32 = inst.into();
+        result.to_le_bytes()
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn test_nop() {
+        let inst = Nop::nop();
+        let result: u32 = inst.into();
+        assert_eq!(0xd503201f, result);
+    }
+}
diff --git a/zjit/src/asm/arm64/inst/pc_rel.rs b/zjit/src/asm/arm64/inst/pc_rel.rs
new file mode 100644
index 00000000000000..2ea586a77816c8
--- /dev/null
+++ b/zjit/src/asm/arm64/inst/pc_rel.rs
@@ -0,0 +1,107 @@
+/// Which operation to perform for the PC-relative instruction.
+enum Op {
+    /// Form a PC-relative address.
+    ADR = 0,
+
+    /// Form a PC-relative address to a 4KB page.
+    ADRP = 1
+}
+
+/// The struct that represents an A64 PC-relative address instruction that can
+/// be encoded.
+///
+/// ADR
+/// +-------------+-------------+-------------+-------------+-------------+-------------+-------------+-------------+
+/// | 31 30 29 28 | 27 26 25 24 | 23 22 21 20 | 19 18 17 16 | 15 14 13 12 | 11 10 09 08 | 07 06 05 04 | 03 02 01 00 |
+/// |           1    0  0  0  0                                                                                     |
+/// | op immlo                    immhi........................................................... rd.............. |
+/// +-------------+-------------+-------------+-------------+-------------+-------------+-------------+-------------+
+///
+pub struct PCRelative {
+    /// The number for the general-purpose register to load the address into.
+    rd: u8,
+
+    /// The number of bytes to add to the PC to form the address.
+    imm: i32,
+
+    /// Which operation to perform for this instruction.
+    op: Op
+}
+
+impl PCRelative {
+    /// ADR
+    /// <https://developer.arm.com/documentation/ddi0602/2022-03/Base-Instructions/ADR--Form-PC-relative-address->
+    pub fn adr(rd: u8, imm: i32) -> Self {
+        Self { rd, imm, op: Op::ADR }
+    }
+
+    /// ADRP
+    /// <https://developer.arm.com/documentation/ddi0602/2022-03/Base-Instructions/ADRP--Form-PC-relative-address-to-4KB-page->
+    pub fn adrp(rd: u8, imm: i32) -> Self {
+        Self { rd, imm: imm >> 12, op: Op::ADRP }
+    }
+}
+
+/// <https://developer.arm.com/documentation/ddi0602/2022-03/Index-by-Encoding/Data-Processing----Immediate?lang=en>
+const FAMILY: u32 = 0b1000;
+
+impl From<PCRelative> for u32 {
+    /// Convert an instruction into a 32-bit value.
+    fn from(inst: PCRelative) -> Self {
+        let immlo = (inst.imm & 0b11) as u32;
+        let mut immhi = ((inst.imm >> 2) & ((1 << 18) - 1)) as u32;
+
+        // Toggle the sign bit if necessary.
+        if inst.imm < 0 {
+            immhi |= 1 << 18;
+        }
+
+        0
+        | ((inst.op as u32) << 31)
+        | (immlo << 29)
+        | (FAMILY << 25)
+        | (immhi << 5)
+        | inst.rd as u32
+    }
+}
+
+impl From<PCRelative> for [u8; 4] {
+    /// Convert an instruction into a 4 byte array.
+    fn from(inst: PCRelative) -> [u8; 4] {
+        let result: u32 = inst.into();
+        result.to_le_bytes()
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn test_adr_positive() {
+        let inst = PCRelative::adr(0, 5);
+        let result: u32 = inst.into();
+        assert_eq!(0x30000020, result);
+    }
+
+    #[test]
+    fn test_adr_negative() {
+        let inst = PCRelative::adr(0, -5);
+        let result: u32 = inst.into();
+        assert_eq!(0x70ffffc0, result);
+    }
+
+    #[test]
+    fn test_adrp_positive() {
+        let inst = PCRelative::adrp(0, 0x4000);
+        let result: u32 = inst.into();
+        assert_eq!(0x90000020, result);
+    }
+
+    #[test]
+    fn test_adrp_negative() {
+        let inst = PCRelative::adrp(0, -0x4000);
+        let result: u32 = inst.into();
+        assert_eq!(0x90ffffe0, result);
+    }
+}
diff --git a/zjit/src/asm/arm64/inst/reg_pair.rs b/zjit/src/asm/arm64/inst/reg_pair.rs
new file mode 100644
index 00000000000000..9bffcd847925c1
--- /dev/null
+++ b/zjit/src/asm/arm64/inst/reg_pair.rs
@@ -0,0 +1,212 @@
+use super::super::arg::truncate_imm;
+
+/// The operation to perform for this instruction.
+enum Opc {
+    /// When the registers are 32-bits wide.
+    Opc32 = 0b00,
+
+    /// When the registers are 64-bits wide.
+    Opc64 = 0b10
+}
+
+/// The kind of indexing to perform for this instruction.
+enum Index {
+    StorePostIndex = 0b010,
+    LoadPostIndex = 0b011,
+    StoreSignedOffset = 0b100,
+    LoadSignedOffset = 0b101,
+    StorePreIndex = 0b110,
+    LoadPreIndex = 0b111
+}
+
+/// A convenience function so that we can convert the number of bits of a
+/// register operand directly into an Opc variant.
+impl From<u8> for Opc {
+    fn from(num_bits: u8) -> Self {
+        match num_bits {
+            64 => Opc::Opc64,
+            32 => Opc::Opc32,
+            _ => panic!("Invalid number of bits: {}", num_bits)
+        }
+    }
+}
+
+/// The struct that represents an A64 register pair instruction that can be
+/// encoded.
+///
+/// STP/LDP
+/// +-------------+-------------+-------------+-------------+-------------+-------------+-------------+-------------+
+/// | 31 30 29 28 | 27 26 25 24 | 23 22 21 20 | 19 18 17 16 | 15 14 13 12 | 11 10 09 08 | 07 06 05 04 | 03 02 01 00 |
+/// |     0  1  0    1  0  0                                                                                        |
+/// | opc                    index..... imm7.................... rt2............. rn.............. rt1............. |
+/// +-------------+-------------+-------------+-------------+-------------+-------------+-------------+-------------+
+///
+pub struct RegisterPair {
+    /// The number of the first register to be transferred.
+    rt1: u8,
+
+    /// The number of the base register.
+    rn: u8,
+
+    /// The number of the second register to be transferred.
+    rt2: u8,
+
+    /// The signed immediate byte offset, a multiple of 8.
+    imm7: i16,
+
+    /// The kind of indexing to use for this instruction.
+    index: Index,
+
+    /// The operation to be performed (in terms of size).
+    opc: Opc
+}
+
+impl RegisterPair {
+    /// Create a register pair instruction with a given indexing mode.
+    fn new(rt1: u8, rt2: u8, rn: u8, disp: i16, index: Index, num_bits: u8) -> Self {
+        Self { rt1, rn, rt2, imm7: disp / 8, index, opc: num_bits.into() }
+    }
+
+    /// LDP (signed offset)
+    /// `LDP <Xt1>, <Xt2>, [<Xn|SP>{, #<imm>}]`
+    /// <https://developer.arm.com/documentation/ddi0596/2021-12/Base-Instructions/LDP--Load-Pair-of-Registers-?lang=en>
+    pub fn ldp(rt1: u8, rt2: u8, rn: u8, disp: i16, num_bits: u8) -> Self {
+        Self::new(rt1, rt2, rn, disp, Index::LoadSignedOffset, num_bits)
+    }
+
+    /// LDP (pre-index)
+    /// `LDP <Xt1>, <Xt2>, [<Xn|SP>, #<imm>]!`
+    /// <https://developer.arm.com/documentation/ddi0596/2021-12/Base-Instructions/LDP--Load-Pair-of-Registers-?lang=en>
+    pub fn ldp_pre(rt1: u8, rt2: u8, rn: u8, disp: i16, num_bits: u8) -> Self {
+        Self::new(rt1, rt2, rn, disp, Index::LoadPreIndex, num_bits)
+    }
+
+    /// LDP (post-index)
+    /// `LDP <Xt1>, <Xt2>, [<Xn|SP>], #<imm>`
+    /// <https://developer.arm.com/documentation/ddi0596/2021-12/Base-Instructions/LDP--Load-Pair-of-Registers-?lang=en>
+    pub fn ldp_post(rt1: u8, rt2: u8, rn: u8, disp: i16, num_bits: u8) -> Self {
+        Self::new(rt1, rt2, rn, disp, Index::LoadPostIndex, num_bits)
+    }
+
+    /// STP (signed offset)
+    /// `STP <Xt1>, <Xt2>, [<Xn|SP>{, #<imm>}]`
+    /// <https://developer.arm.com/documentation/ddi0596/2021-12/Base-Instructions/STP--Store-Pair-of-Registers-?lang=en>
+    pub fn stp(rt1: u8, rt2: u8, rn: u8, disp: i16, num_bits: u8) -> Self {
+        Self::new(rt1, rt2, rn, disp, Index::StoreSignedOffset, num_bits)
+    }
+
+    /// STP (pre-index)
+    /// `STP <Xt1>, <Xt2>, [<Xn|SP>, #<imm>]!`
+    /// <https://developer.arm.com/documentation/ddi0596/2021-12/Base-Instructions/STP--Store-Pair-of-Registers-?lang=en>
+    pub fn stp_pre(rt1: u8, rt2: u8, rn: u8, disp: i16, num_bits: u8) -> Self {
+        Self::new(rt1, rt2, rn, disp, Index::StorePreIndex, num_bits)
+    }
+
+    /// STP (post-index)
+    /// `STP <Xt1>, <Xt2>, [<Xn|SP>], #<imm>`
+    /// <https://developer.arm.com/documentation/ddi0596/2021-12/Base-Instructions/STP--Store-Pair-of-Registers-?lang=en>
+    pub fn stp_post(rt1: u8, rt2: u8, rn: u8, disp: i16, num_bits: u8) -> Self {
+        Self::new(rt1, rt2, rn, disp, Index::StorePostIndex, num_bits)
+    }
+}
+
+/// <https://developer.arm.com/documentation/ddi0602/2022-03/Index-by-Encoding/Loads-and-Stores?lang=en>
+const FAMILY: u32 = 0b0100;
+
+impl From<RegisterPair> for u32 {
+    /// Convert an instruction into a 32-bit value.
+    fn from(inst: RegisterPair) -> Self {
+        0
+        | ((inst.opc as u32) << 30)
+        | (1 << 29)
+        | (FAMILY << 25)
+        | ((inst.index as u32) << 22)
+        | (truncate_imm::<_, 7>(inst.imm7) << 15)
+        | ((inst.rt2 as u32) << 10)
+        | ((inst.rn as u32) << 5)
+        | (inst.rt1 as u32)
+    }
+}
+
+impl From<RegisterPair> for [u8; 4] {
+    /// Convert an instruction into a 4 byte array.
+    fn from(inst: RegisterPair) -> [u8; 4] {
+        let result: u32 = inst.into();
+        result.to_le_bytes()
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn test_ldp() {
+        let inst = RegisterPair::ldp(0, 1, 2, 0, 64);
+        let result: u32 = inst.into();
+        assert_eq!(0xa9400440, result);
+    }
+
+    #[test]
+    fn test_ldp_maximum_displacement() {
+        let inst = RegisterPair::ldp(0, 1, 2, 504, 64);
+        let result: u32 = inst.into();
+        assert_eq!(0xa95f8440, result);
+    }
+
+    #[test]
+    fn test_ldp_minimum_displacement() {
+        let inst = RegisterPair::ldp(0, 1, 2, -512, 64);
+        let result: u32 = inst.into();
+        assert_eq!(0xa9600440, result);
+    }
+
+    #[test]
+    fn test_ldp_pre() {
+        let inst = RegisterPair::ldp_pre(0, 1, 2, 256, 64);
+        let result: u32 = inst.into();
+        assert_eq!(0xa9d00440, result);
+    }
+
+    #[test]
+    fn test_ldp_post() {
+        let inst = RegisterPair::ldp_post(0, 1, 2, 256, 64);
+        let result: u32 = inst.into();
+        assert_eq!(0xa8d00440, result);
+    }
+
+    #[test]
+    fn test_stp() {
+        let inst = RegisterPair::stp(0, 1, 2, 0, 64);
+        let result: u32 = inst.into();
+        assert_eq!(0xa9000440, result);
+    }
+
+    #[test]
+    fn test_stp_maximum_displacement() {
+        let inst = RegisterPair::stp(0, 1, 2, 504, 64);
+        let result: u32 = inst.into();
+        assert_eq!(0xa91f8440, result);
+    }
+
+    #[test]
+    fn test_stp_minimum_displacement() {
+        let inst = RegisterPair::stp(0, 1, 2, -512, 64);
+        let result: u32 = inst.into();
+        assert_eq!(0xa9200440, result);
+    }
+
+    #[test]
+    fn test_stp_pre() {
+        let inst = RegisterPair::stp_pre(0, 1, 2, 256, 64);
+        let result: u32 = inst.into();
+        assert_eq!(0xa9900440, result);
+    }
+
+    #[test]
+    fn test_stp_post() {
+        let inst = RegisterPair::stp_post(0, 1, 2, 256, 64);
+        let result: u32 = inst.into();
+        assert_eq!(0xa8900440, result);
+    }
+}
diff --git a/zjit/src/asm/arm64/inst/sbfm.rs b/zjit/src/asm/arm64/inst/sbfm.rs
new file mode 100644
index 00000000000000..12944ba722923e
--- /dev/null
+++ b/zjit/src/asm/arm64/inst/sbfm.rs
@@ -0,0 +1,103 @@
+use super::super::arg::{Sf, truncate_uimm};
+
+/// The struct that represents an A64 signed bitfield move instruction that can
+/// be encoded.
+///
+/// SBFM
+/// +-------------+-------------+-------------+-------------+-------------+-------------+-------------+-------------+
+/// | 31 30 29 28 | 27 26 25 24 | 23 22 21 20 | 19 18 17 16 | 15 14 13 12 | 11 10 09 08 | 07 06 05 04 | 03 02 01 00 |
+/// |     0  0  1    0  0  1  1    0                                                                                |
+/// | sf                             N  immr...............   imms............... rn.............. rd.............. |
+/// +-------------+-------------+-------------+-------------+-------------+-------------+-------------+-------------+
+///
+pub struct SBFM {
+    /// The number for the general-purpose register to load the value into.
+    rd: u8,
+
+    /// The number for the general-purpose register to copy from.
+    rn: u8,
+
+    /// The leftmost bit number to be moved from the source.
+    imms: u8,
+
+    // The right rotate amount.
+    immr: u8,
+
+    /// Whether or not this is a 64-bit operation.
+    n: bool,
+
+    /// The size of this operation.
+    sf: Sf
+}
+
+impl SBFM {
+    /// ASR
+    /// <https://developer.arm.com/documentation/ddi0596/2020-12/Base-Instructions/ASR--immediate---Arithmetic-Shift-Right--immediate---an-alias-of-SBFM-?lang=en>
+    pub fn asr(rd: u8, rn: u8, shift: u8, num_bits: u8) -> Self {
+        let (imms, n) = if num_bits == 64 {
+            (0b111111, true)
+        } else {
+            (0b011111, false)
+        };
+
+        Self { rd, rn, immr: shift, imms, n, sf: num_bits.into() }
+    }
+
+    /// SXTW
+    /// <https://developer.arm.com/documentation/ddi0596/2021-12/Base-Instructions/SXTW--Sign-Extend-Word--an-alias-of-SBFM-?lang=en>
+    pub fn sxtw(rd: u8, rn: u8) -> Self {
+        Self { rd, rn, immr: 0, imms: 31, n: true, sf: Sf::Sf64 }
+    }
+}
+
+/// <https://developer.arm.com/documentation/ddi0602/2022-03/Index-by-Encoding/Data-Processing----Immediate?lang=en#bitfield>
+const FAMILY: u32 = 0b1001;
+
+impl From<SBFM> for u32 {
+    /// Convert an instruction into a 32-bit value.
+    fn from(inst: SBFM) -> Self {
+        0
+        | ((inst.sf as u32) << 31)
+        | (FAMILY << 25)
+        | (1 << 24)
+        | ((inst.n as u32) << 22)
+        | (truncate_uimm::<_, 6>(inst.immr) << 16)
+        | (truncate_uimm::<_, 6>(inst.imms) << 10)
+        | ((inst.rn as u32) << 5)
+        | inst.rd as u32
+    }
+}
+
+impl From<SBFM> for [u8; 4] {
+    /// Convert an instruction into a 4 byte array.
+    fn from(inst: SBFM) -> [u8; 4] {
+        let result: u32 = inst.into();
+        result.to_le_bytes()
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn test_asr_32_bits() {
+        let inst = SBFM::asr(0, 1, 2, 32);
+        let result: u32 = inst.into();
+        assert_eq!(0x13027c20, result);
+    }
+
+    #[test]
+    fn test_asr_64_bits() {
+        let inst = SBFM::asr(10, 11, 5, 64);
+        let result: u32 = inst.into();
+        assert_eq!(0x9345fd6a, result);
+    }
+
+    #[test]
+    fn test_sxtw() {
+        let inst = SBFM::sxtw(0, 1);
+        let result: u32 = inst.into();
+        assert_eq!(0x93407c20, result);
+    }
+}
diff --git a/zjit/src/asm/arm64/inst/shift_imm.rs b/zjit/src/asm/arm64/inst/shift_imm.rs
new file mode 100644
index 00000000000000..9dac9a14084ac8
--- /dev/null
+++ b/zjit/src/asm/arm64/inst/shift_imm.rs
@@ -0,0 +1,147 @@
+use super::super::arg::Sf;
+
+/// The operation to perform for this instruction.
+enum Opc {
+    /// Logical left shift
+    LSL,
+
+    /// Logical shift right
+    LSR
+}
+
+/// The struct that represents an A64 unsigned bitfield move instruction that
+/// can be encoded.
+///
+/// LSL (immediate)
+/// +-------------+-------------+-------------+-------------+-------------+-------------+-------------+-------------+
+/// | 31 30 29 28 | 27 26 25 24 | 23 22 21 20 | 19 18 17 16 | 15 14 13 12 | 11 10 09 08 | 07 06 05 04 | 03 02 01 00 |
+/// |     1  0  1    0  0  1  1    0                                                                                |
+/// | sf                             N  immr...............   imms............... rn.............. rd.............. |
+/// +-------------+-------------+-------------+-------------+-------------+-------------+-------------+-------------+
+///
+pub struct ShiftImm {
+    /// The register number of the destination register.
+    rd: u8,
+
+    /// The register number of the first operand register.
+    rn: u8,
+
+    /// The immediate value to shift by.
+    shift: u8,
+
+    /// The opcode for this instruction.
+    opc: Opc,
+
+    /// Whether or not this instruction is operating on 64-bit operands.
+    sf: Sf
+}
+
+impl ShiftImm {
+    /// LSL (immediate)
+    /// <https://developer.arm.com/documentation/ddi0596/2020-12/Base-Instructions/LSL--immediate---Logical-Shift-Left--immediate---an-alias-of-UBFM-?lang=en>
+    pub fn lsl(rd: u8, rn: u8, shift: u8, num_bits: u8) -> Self {
+        ShiftImm { rd, rn, shift, opc: Opc::LSL, sf: num_bits.into() }
+    }
+
+    /// LSR (immediate)
+    /// <https://developer.arm.com/documentation/ddi0602/2021-12/Base-Instructions/LSR--immediate---Logical-Shift-Right--immediate---an-alias-of-UBFM-?lang=en>
+    pub fn lsr(rd: u8, rn: u8, shift: u8, num_bits: u8) -> Self {
+        ShiftImm { rd, rn, shift, opc: Opc::LSR, sf: num_bits.into() }
+    }
+
+    /// Returns a triplet of (n, immr, imms) encoded in u32s for this
+    /// instruction. This mirrors how they will be encoded in the actual bits.
+    fn bitmask(&self) -> (u32, u32, u32) {
+        match self.opc {
+            // The key insight is a little buried in the docs, but effectively:
+            // LSL <Wd>, <Wn>, #<shift> == UBFM <Wd>, <Wn>, #(-<shift> MOD 32), #(31-<shift>)
+            // LSL <Xd>, <Xn>, #<shift> == UBFM <Xd>, <Xn>, #(-<shift> MOD 64), #(63-<shift>)
+            Opc::LSL => {
+                let shift = -(self.shift as i16);
+
+                match self.sf {
+                    Sf::Sf32 => (
+                        0,
+                        (shift.rem_euclid(32) & 0x3f) as u32,
+                        ((31 - self.shift) & 0x3f) as u32
+                    ),
+                    Sf::Sf64 => (
+                        1,
+                        (shift.rem_euclid(64) & 0x3f) as u32,
+                        ((63 - self.shift) & 0x3f) as u32
+                    )
+                }
+            },
+            // Similar to LSL:
+            // LSR <Wd>, <Wn>, #<shift> == UBFM <Wd>, <Wn>, #<shift>, #31
+            // LSR <Xd>, <Xn>, #<shift> == UBFM <Xd>, <Xn>, #<shift>, #63
+            Opc::LSR => {
+                match self.sf {
+                    Sf::Sf32 => (0, (self.shift & 0x3f) as u32, 31),
+                    Sf::Sf64 => (1, (self.shift & 0x3f) as u32, 63)
+                }
+            }
+        }
+    }
+}
+
+/// <https://developer.arm.com/documentation/ddi0602/2022-03/Index-by-Encoding/Data-Processing----Immediate?lang=en#bitfield>
+const FAMILY: u32 = 0b10011;
+
+impl From<ShiftImm> for u32 {
+    /// Convert an instruction into a 32-bit value.
+    fn from(inst: ShiftImm) -> Self {
+        let (n, immr, imms) = inst.bitmask();
+
+        0
+        | ((inst.sf as u32) << 31)
+        | (1 << 30)
+        | (FAMILY << 24)
+        | (n << 22)
+        | (immr << 16)
+        | (imms << 10)
+        | ((inst.rn as u32) << 5)
+        | inst.rd as u32
+    }
+}
+
+impl From<ShiftImm> for [u8; 4] {
+    /// Convert an instruction into a 4 byte array.
+    fn from(inst: ShiftImm) -> [u8; 4] {
+        let result: u32 = inst.into();
+        result.to_le_bytes()
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn test_lsl_32() {
+        let inst = ShiftImm::lsl(0, 1, 7, 32);
+        let result: u32 = inst.into();
+        assert_eq!(0x53196020, result);
+    }
+
+    #[test]
+    fn test_lsl_64() {
+        let inst = ShiftImm::lsl(0, 1, 7, 64);
+        let result: u32 = inst.into();
+        assert_eq!(0xd379e020, result);
+    }
+
+    #[test]
+    fn test_lsr_32() {
+        let inst = ShiftImm::lsr(0, 1, 7, 32);
+        let result: u32 = inst.into();
+        assert_eq!(0x53077c20, result);
+    }
+
+    #[test]
+    fn test_lsr_64() {
+        let inst = ShiftImm::lsr(0, 1, 7, 64);
+        let result: u32 = inst.into();
+        assert_eq!(0xd347fc20, result);
+    }
+}
diff --git a/zjit/src/asm/arm64/inst/smulh.rs b/zjit/src/asm/arm64/inst/smulh.rs
new file mode 100644
index 00000000000000..f355cb6531035e
--- /dev/null
+++ b/zjit/src/asm/arm64/inst/smulh.rs
@@ -0,0 +1,60 @@
+/// The struct that represents an A64 signed multiply high instruction
+///
+/// +-------------+-------------+-------------+-------------+-------------+-------------+-------------+-------------+
+/// | 31 30 29 28 | 27 26 25 24 | 23 22 21 20 | 19 18 17 16 | 15 14 13 12 | 11 10 09 08 | 07 06 05 04 | 03 02 01 00 |
+/// |  1  0  0  1    1  0  1  1    0  1  0                     0                                                    |
+/// |                                      rm..............      ra.............. rn.............. rd.............. |
+/// +-------------+-------------+-------------+-------------+-------------+-------------+-------------+-------------+
+///
+pub struct SMulH {
+    /// The number of the general-purpose destination register.
+    rd: u8,
+
+    /// The number of the first general-purpose source register.
+    rn: u8,
+
+    /// The number of the third general-purpose source register.
+    ra: u8,
+
+    /// The number of the second general-purpose source register.
+    rm: u8,
+}
+
+impl SMulH {
+    /// SMULH
+    /// <https://developer.arm.com/documentation/ddi0602/2023-06/Base-Instructions/SMULH--Signed-Multiply-High->
+    pub fn smulh(rd: u8, rn: u8, rm: u8) -> Self {
+        Self { rd, rn, ra: 0b11111, rm }
+    }
+}
+
+impl From<SMulH> for u32 {
+    /// Convert an instruction into a 32-bit value.
+    fn from(inst: SMulH) -> Self {
+        0
+        | (0b10011011010 << 21)
+        | ((inst.rm as u32) << 16)
+        | ((inst.ra as u32) << 10)
+        | ((inst.rn as u32) << 5)
+        | (inst.rd as u32)
+    }
+}
+
+impl From<SMulH> for [u8; 4] {
+    /// Convert an instruction into a 4 byte array.
+    fn from(inst: SMulH) -> [u8; 4] {
+        let result: u32 = inst.into();
+        result.to_le_bytes()
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn test_smulh() {
+        let result: u32 = SMulH::smulh(0, 1, 2).into();
+        assert_eq!(0x9b427c20, result);
+    }
+}
diff --git a/zjit/src/asm/arm64/inst/sys_reg.rs b/zjit/src/asm/arm64/inst/sys_reg.rs
new file mode 100644
index 00000000000000..7191dfbfd9ed33
--- /dev/null
+++ b/zjit/src/asm/arm64/inst/sys_reg.rs
@@ -0,0 +1,86 @@
+use super::super::arg::SystemRegister;
+
+/// Which operation to perform (loading or storing the system register value).
+enum L {
+    /// Store the value of a general-purpose register in a system register.
+    MSR = 0,
+
+    /// Store the value of a system register in a general-purpose register.
+    MRS = 1
+}
+
+/// The struct that represents an A64 system register instruction that can be
+/// encoded.
+///
+/// MSR/MRS (register)
+/// +-------------+-------------+-------------+-------------+-------------+-------------+-------------+-------------+
+/// | 31 30 29 28 | 27 26 25 24 | 23 22 21 20 | 19 18 17 16 | 15 14 13 12 | 11 10 09 08 | 07 06 05 04 | 03 02 01 00 |
+/// |  1  1  0  1    0  1  0  1    0  0     1                                                                       |
+/// |                                   L       o0 op1.....   CRn........   CRm........   op2..... rt.............. |
+/// +-------------+-------------+-------------+-------------+-------------+-------------+-------------+-------------+
+///
+pub struct SysReg {
+    /// The register to load the system register value into.
+    rt: u8,
+
+    /// Which system register to load or store.
+    systemreg: SystemRegister,
+
+    /// Which operation to perform (loading or storing the system register value).
+    l: L
+}
+
+impl SysReg {
+    /// MRS (register)
+    /// <https://developer.arm.com/documentation/ddi0602/2022-03/Base-Instructions/MRS--Move-System-Register-?lang=en>
+    pub fn mrs(rt: u8, systemreg: SystemRegister) -> Self {
+        SysReg { rt, systemreg, l: L::MRS }
+    }
+
+    /// MSR (register)
+    /// <https://developer.arm.com/documentation/ddi0596/2021-12/Base-Instructions/MSR--register---Move-general-purpose-register-to-System-Register-?lang=en>
+    pub fn msr(systemreg: SystemRegister, rt: u8) -> Self {
+        SysReg { rt, systemreg, l: L::MSR }
+    }
+}
+
+/// <https://developer.arm.com/documentation/ddi0602/2022-03/Index-by-Encoding/Branches--Exception-Generating-and-System-instructions?lang=en#systemmove>
+const FAMILY: u32 = 0b110101010001;
+
+impl From<SysReg> for u32 {
+    /// Convert an instruction into a 32-bit value.
+    fn from(inst: SysReg) -> Self {
+        0
+        | (FAMILY << 20)
+        | ((inst.l as u32) << 21)
+        | ((inst.systemreg as u32) << 5)
+        | inst.rt as u32
+    }
+}
+
+impl From<SysReg> for [u8; 4] {
+    /// Convert an instruction into a 4 byte array.
+    fn from(inst: SysReg) -> [u8; 4] {
+        let result: u32 = inst.into();
+        result.to_le_bytes()
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn test_mrs() {
+        let inst = SysReg::mrs(0, SystemRegister::NZCV);
+        let result: u32 = inst.into();
+        assert_eq!(0xd53b4200, result);
+    }
+
+    #[test]
+    fn test_msr() {
+        let inst = SysReg::msr(SystemRegister::NZCV, 0);
+        let result: u32 = inst.into();
+        assert_eq!(0xd51b4200, result);
+    }
+}
diff --git a/zjit/src/asm/arm64/inst/test_bit.rs b/zjit/src/asm/arm64/inst/test_bit.rs
new file mode 100644
index 00000000000000..f7aeca70fda8af
--- /dev/null
+++ b/zjit/src/asm/arm64/inst/test_bit.rs
@@ -0,0 +1,133 @@
+use super::super::arg::truncate_imm;
+
+/// The upper bit of the bit number to test.
+#[derive(Debug)]
+enum B5 {
+    /// When the bit number is below 32.
+    B532 = 0,
+
+    /// When the bit number is equal to or above 32.
+    B564 = 1
+}
+
+/// A convenience function so that we can convert the bit number directly into a
+/// B5 variant.
+impl From<u8> for B5 {
+    fn from(bit_num: u8) -> Self {
+        match bit_num {
+            0..=31 => B5::B532,
+            32..=63 => B5::B564,
+            _ => panic!("Invalid bit number: {}", bit_num)
+        }
+    }
+}
+
+/// The operation to perform for this instruction.
+enum Op {
+    /// The test bit zero operation.
+    TBZ = 0,
+
+    /// The test bit not zero operation.
+    TBNZ = 1
+}
+
+/// The struct that represents an A64 test bit instruction that can be encoded.
+///
+/// TBNZ/TBZ
+/// +-------------+-------------+-------------+-------------+-------------+-------------+-------------+-------------+
+/// | 31 30 29 28 | 27 26 25 24 | 23 22 21 20 | 19 18 17 16 | 15 14 13 12 | 11 10 09 08 | 07 06 05 04 | 03 02 01 00 |
+/// |     0  1  1    0  1  1                                                                                        |
+/// | b5                     op   b40............. imm14.......................................... rt.............. |
+/// +-------------+-------------+-------------+-------------+-------------+-------------+-------------+-------------+
+///
+pub struct TestBit {
+    /// The number of the register to test.
+    rt: u8,
+
+    /// The PC-relative offset to the target instruction in term of number of
+    /// instructions.
+    imm14: i16,
+
+    /// The lower 5 bits of the bit number to be tested.
+    b40: u8,
+
+    /// The operation to perform for this instruction.
+    op: Op,
+
+    /// The upper bit of the bit number to test.
+    b5: B5
+}
+
+impl TestBit {
+    /// TBNZ
+    /// <https://developer.arm.com/documentation/ddi0596/2021-12/Base-Instructions/TBNZ--Test-bit-and-Branch-if-Nonzero-?lang=en>
+    pub fn tbnz(rt: u8, bit_num: u8, offset: i16) -> Self {
+        Self { rt, imm14: offset, b40: bit_num & 0b11111, op: Op::TBNZ, b5: bit_num.into() }
+    }
+
+    /// TBZ
+    /// <https://developer.arm.com/documentation/ddi0596/2021-12/Base-Instructions/TBZ--Test-bit-and-Branch-if-Zero-?lang=en>
+    pub fn tbz(rt: u8, bit_num: u8, offset: i16) -> Self {
+        Self { rt, imm14: offset, b40: bit_num & 0b11111, op: Op::TBZ, b5: bit_num.into() }
+    }
+}
+
+/// <https://developer.arm.com/documentation/ddi0602/2022-03/Index-by-Encoding/Branches--Exception-Generating-and-System-instructions?lang=en>
+const FAMILY: u32 = 0b11011;
+
+impl From<TestBit> for u32 {
+    /// Convert an instruction into a 32-bit value.
+    fn from(inst: TestBit) -> Self {
+        let b40 = (inst.b40 & 0b11111) as u32;
+        let imm14 = truncate_imm::<_, 14>(inst.imm14);
+
+        0
+        | ((inst.b5 as u32) << 31)
+        | (FAMILY << 25)
+        | ((inst.op as u32) << 24)
+        | (b40 << 19)
+        | (imm14 << 5)
+        | inst.rt as u32
+    }
+}
+
+impl From<TestBit> for [u8; 4] {
+    /// Convert an instruction into a 4 byte array.
+    fn from(inst: TestBit) -> [u8; 4] {
+        let result: u32 = inst.into();
+        result.to_le_bytes()
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn test_tbnz() {
+        let inst = TestBit::tbnz(0, 0, 0);
+        let result: u32 = inst.into();
+        assert_eq!(0x37000000, result);
+    }
+
+    #[test]
+    fn test_tbnz_negative() {
+        let inst = TestBit::tbnz(0, 0, -1);
+        let result: u32 = inst.into();
+        assert_eq!(0x3707ffe0, result);
+    }
+
+    #[test]
+    fn test_tbz() {
+        let inst = TestBit::tbz(0, 0, 0);
+        let result: u32 = inst.into();
+        assert_eq!(0x36000000, result);
+    }
+
+    #[test]
+    fn test_tbz_negative() {
+        let inst = TestBit::tbz(0, 0, -1);
+        let result: u32 = inst.into();
+        assert_eq!(0x3607ffe0, result);
+    }
+}
diff --git a/zjit/src/asm/arm64/mod.rs b/zjit/src/asm/arm64/mod.rs
new file mode 100644
index 00000000000000..ef477821aa38a5
--- /dev/null
+++ b/zjit/src/asm/arm64/mod.rs
@@ -0,0 +1,1679 @@
+#![allow(dead_code)] // For instructions and operands we're not currently using.
+
+use crate::asm::CodeBlock;
+
+mod arg;
+mod inst;
+mod opnd;
+
+use inst::*;
+
+// We're going to make these public to make using these things easier in the
+// backend (so they don't have to have knowledge about the submodule).
+pub use arg::*;
+pub use opnd::*;
+
+/// Checks that a signed value fits within the specified number of bits.
+pub const fn imm_fits_bits(imm: i64, num_bits: u8) -> bool {
+    let minimum = if num_bits == 64 { i64::MIN } else { -(2_i64.pow((num_bits as u32) - 1)) };
+    let maximum = if num_bits == 64 { i64::MAX } else { 2_i64.pow((num_bits as u32) - 1) - 1 };
+
+    imm >= minimum && imm <= maximum
+}
+
+/// Checks that an unsigned value fits within the specified number of bits.
+pub const fn uimm_fits_bits(uimm: u64, num_bits: u8) -> bool {
+    let maximum = if num_bits == 64 { u64::MAX } else { 2_u64.pow(num_bits as u32) - 1 };
+
+    uimm <= maximum
+}
+
+/// ADD - add rn and rm, put the result in rd, don't update flags
+pub fn add(cb: &mut CodeBlock, rd: A64Opnd, rn: A64Opnd, rm: A64Opnd) {
+    let bytes: [u8; 4] = match (rd, rn, rm) {
+        (A64Opnd::Reg(rd), A64Opnd::Reg(rn), A64Opnd::Reg(rm)) => {
+            assert!(
+                rd.num_bits == rn.num_bits && rn.num_bits == rm.num_bits,
+                "All operands must be of the same size."
+            );
+
+            DataReg::add(rd.reg_no, rn.reg_no, rm.reg_no, rd.num_bits).into()
+        },
+        (A64Opnd::Reg(rd), A64Opnd::Reg(rn), A64Opnd::UImm(uimm12)) => {
+            assert!(rd.num_bits == rn.num_bits, "rd and rn must be of the same size.");
+
+            DataImm::add(rd.reg_no, rn.reg_no, uimm12.try_into().unwrap(), rd.num_bits).into()
+        },
+        (A64Opnd::Reg(rd), A64Opnd::Reg(rn), A64Opnd::Imm(imm12)) => {
+            assert!(rd.num_bits == rn.num_bits, "rd and rn must be of the same size.");
+
+            if imm12 < 0 {
+                DataImm::sub(rd.reg_no, rn.reg_no, (-imm12 as u64).try_into().unwrap(), rd.num_bits).into()
+            } else {
+                DataImm::add(rd.reg_no, rn.reg_no, (imm12 as u64).try_into().unwrap(), rd.num_bits).into()
+            }
+        },
+        _ => panic!("Invalid operand combination to add instruction."),
+    };
+
+    cb.write_bytes(&bytes);
+}
+
+/// ADDS - add rn and rm, put the result in rd, update flags
+pub fn adds(cb: &mut CodeBlock, rd: A64Opnd, rn: A64Opnd, rm: A64Opnd) {
+    let bytes: [u8; 4] = match (rd, rn, rm) {
+        (A64Opnd::Reg(rd), A64Opnd::Reg(rn), A64Opnd::Reg(rm)) => {
+            assert!(
+                rd.num_bits == rn.num_bits && rn.num_bits == rm.num_bits,
+                "All operands must be of the same size."
+            );
+
+            DataReg::adds(rd.reg_no, rn.reg_no, rm.reg_no, rd.num_bits).into()
+        },
+        (A64Opnd::Reg(rd), A64Opnd::Reg(rn), A64Opnd::UImm(imm12)) => {
+            assert!(rd.num_bits == rn.num_bits, "rd and rn must be of the same size.");
+
+            DataImm::adds(rd.reg_no, rn.reg_no, imm12.try_into().unwrap(), rd.num_bits).into()
+        },
+        (A64Opnd::Reg(rd), A64Opnd::Reg(rn), A64Opnd::Imm(imm12)) => {
+            assert!(rd.num_bits == rn.num_bits, "rd and rn must be of the same size.");
+
+            if imm12 < 0 {
+                DataImm::subs(rd.reg_no, rn.reg_no, (-imm12 as u64).try_into().unwrap(), rd.num_bits).into()
+            } else {
+                DataImm::adds(rd.reg_no, rn.reg_no, (imm12 as u64).try_into().unwrap(), rd.num_bits).into()
+            }
+        },
+        _ => panic!("Invalid operand combination to adds instruction."),
+    };
+
+    cb.write_bytes(&bytes);
+}
+
+/// ADR - form a PC-relative address and load it into a register
+pub fn adr(cb: &mut CodeBlock, rd: A64Opnd, imm: A64Opnd) {
+    let bytes: [u8; 4] = match (rd, imm) {
+        (A64Opnd::Reg(rd), A64Opnd::Imm(imm)) => {
+            assert!(rd.num_bits == 64, "The destination register must be 64 bits.");
+            assert!(imm_fits_bits(imm, 21), "The immediate operand must be 21 bits or less.");
+
+            PCRelative::adr(rd.reg_no, imm as i32).into()
+        },
+        _ => panic!("Invalid operand combination to adr instruction."),
+    };
+
+    cb.write_bytes(&bytes);
+}
+
+/// ADRP - form a PC-relative address to a 4KB page and load it into a register.
+/// This is effectively the same as ADR except that the immediate must be a
+/// multiple of 4KB.
+pub fn adrp(cb: &mut CodeBlock, rd: A64Opnd, imm: A64Opnd) {
+    let bytes: [u8; 4] = match (rd, imm) {
+        (A64Opnd::Reg(rd), A64Opnd::Imm(imm)) => {
+            assert!(rd.num_bits == 64, "The destination register must be 64 bits.");
+            assert!(imm_fits_bits(imm, 32), "The immediate operand must be 32 bits or less.");
+
+            PCRelative::adrp(rd.reg_no, imm as i32).into()
+        },
+        _ => panic!("Invalid operand combination to adr instruction."),
+    };
+
+    cb.write_bytes(&bytes);
+}
+
+/// AND - and rn and rm, put the result in rd, don't update flags
+pub fn and(cb: &mut CodeBlock, rd: A64Opnd, rn: A64Opnd, rm: A64Opnd) {
+    let bytes: [u8; 4] = match (rd, rn, rm) {
+        (A64Opnd::Reg(rd), A64Opnd::Reg(rn), A64Opnd::Reg(rm)) => {
+            assert!(
+                rd.num_bits == rn.num_bits && rn.num_bits == rm.num_bits,
+                "All operands must be of the same size."
+            );
+
+            LogicalReg::and(rd.reg_no, rn.reg_no, rm.reg_no, rd.num_bits).into()
+        },
+        (A64Opnd::Reg(rd), A64Opnd::Reg(rn), A64Opnd::UImm(imm)) => {
+            assert!(rd.num_bits == rn.num_bits, "rd and rn must be of the same size.");
+            let bitmask_imm = if rd.num_bits == 32 {
+                BitmaskImmediate::new_32b_reg(imm.try_into().unwrap())
+            } else {
+                imm.try_into()
+            }.unwrap();
+
+            LogicalImm::and(rd.reg_no, rn.reg_no, bitmask_imm, rd.num_bits).into()
+        },
+        _ => panic!("Invalid operand combination to and instruction."),
+    };
+
+    cb.write_bytes(&bytes);
+}
+
+/// ANDS - and rn and rm, put the result in rd, update flags
+pub fn ands(cb: &mut CodeBlock, rd: A64Opnd, rn: A64Opnd, rm: A64Opnd) {
+    let bytes: [u8; 4] = match (rd, rn, rm) {
+        (A64Opnd::Reg(rd), A64Opnd::Reg(rn), A64Opnd::Reg(rm)) => {
+            assert!(
+                rd.num_bits == rn.num_bits && rn.num_bits == rm.num_bits,
+                "All operands must be of the same size."
+            );
+
+            LogicalReg::ands(rd.reg_no, rn.reg_no, rm.reg_no, rd.num_bits).into()
+        },
+        (A64Opnd::Reg(rd), A64Opnd::Reg(rn), A64Opnd::UImm(imm)) => {
+            assert!(rd.num_bits == rn.num_bits, "rd and rn must be of the same size.");
+            let bitmask_imm = if rd.num_bits == 32 {
+                BitmaskImmediate::new_32b_reg(imm.try_into().unwrap())
+            } else {
+                imm.try_into()
+            }.unwrap();
+
+            LogicalImm::ands(rd.reg_no, rn.reg_no, bitmask_imm, rd.num_bits).into()
+        },
+        _ => panic!("Invalid operand combination to ands instruction."),
+    };
+
+    cb.write_bytes(&bytes);
+}
+
+/// ASR - arithmetic shift right rn by shift, put the result in rd, don't update
+/// flags
+pub fn asr(cb: &mut CodeBlock, rd: A64Opnd, rn: A64Opnd, shift: A64Opnd) {
+    let bytes: [u8; 4] = match (rd, rn, shift) {
+        (A64Opnd::Reg(rd), A64Opnd::Reg(rn), A64Opnd::UImm(shift)) => {
+            assert!(rd.num_bits == rn.num_bits, "rd and rn must be of the same size.");
+            assert!(uimm_fits_bits(shift, 6), "The shift operand must be 6 bits or less.");
+
+            SBFM::asr(rd.reg_no, rn.reg_no, shift.try_into().unwrap(), rd.num_bits).into()
+        },
+        _ => panic!("Invalid operand combination to asr instruction: asr {:?}, {:?}, {:?}", rd, rn, shift),
+    };
+
+    cb.write_bytes(&bytes);
+}
+
+/// Whether or not the offset between two instructions fits into the branch with
+/// or without link instruction. If it doesn't, then we have to load the value
+/// into a register first.
+pub const fn b_offset_fits_bits(offset: i64) -> bool {
+    imm_fits_bits(offset, 26)
+}
+
+/// B - branch without link (offset is number of instructions to jump)
+pub fn b(cb: &mut CodeBlock, offset: InstructionOffset) {
+    assert!(b_offset_fits_bits(offset.into()), "The immediate operand must be 26 bits or less.");
+    let bytes: [u8; 4] = Call::b(offset).into();
+
+    cb.write_bytes(&bytes);
+}
+
+/// Whether or not the offset in number of instructions between two instructions
+/// fits into the b.cond instruction. If it doesn't, then we have to load the
+/// value into a register first, then use the b.cond instruction to skip past a
+/// direct jump.
+pub const fn bcond_offset_fits_bits(offset: i64) -> bool {
+    imm_fits_bits(offset, 19)
+}
+
+/// B.cond - branch to target if condition is true
+pub fn bcond(cb: &mut CodeBlock, cond: u8, offset: InstructionOffset) {
+    assert!(bcond_offset_fits_bits(offset.into()), "The offset must be 19 bits or less.");
+    let bytes: [u8; 4] = BranchCond::bcond(cond, offset).into();
+
+    cb.write_bytes(&bytes);
+}
+
+/// BL - branch with link (offset is number of instructions to jump)
+pub fn bl(cb: &mut CodeBlock, offset: InstructionOffset) {
+    assert!(b_offset_fits_bits(offset.into()), "The offset must be 26 bits or less.");
+    let bytes: [u8; 4] = Call::bl(offset).into();
+
+    cb.write_bytes(&bytes);
+}
+
+/// BLR - branch with link to a register
+pub fn blr(cb: &mut CodeBlock, rn: A64Opnd) {
+    let bytes: [u8; 4] = match rn {
+        A64Opnd::Reg(rn) => Branch::blr(rn.reg_no).into(),
+        _ => panic!("Invalid operand to blr instruction."),
+    };
+
+    cb.write_bytes(&bytes);
+}
+
+/// BR - branch to a register
+pub fn br(cb: &mut CodeBlock, rn: A64Opnd) {
+    let bytes: [u8; 4] = match rn {
+        A64Opnd::Reg(rn) => Branch::br(rn.reg_no).into(),
+        _ => panic!("Invalid operand to br instruction."),
+    };
+
+    cb.write_bytes(&bytes);
+}
+
+/// BRK - create a breakpoint
+pub fn brk(cb: &mut CodeBlock, imm16: A64Opnd) {
+    let bytes: [u8; 4] = match imm16 {
+        A64Opnd::None => Breakpoint::brk(0xf000).into(),
+        A64Opnd::UImm(imm16) => {
+            assert!(uimm_fits_bits(imm16, 16), "The immediate operand must be 16 bits or less.");
+            Breakpoint::brk(imm16 as u16).into()
+        },
+        _ => panic!("Invalid operand combination to brk instruction.")
+    };
+
+    cb.write_bytes(&bytes);
+}
+
+/// CMP - compare rn and rm, update flags
+pub fn cmp(cb: &mut CodeBlock, rn: A64Opnd, rm: A64Opnd) {
+    let bytes: [u8; 4] = match (rn, rm) {
+        (A64Opnd::Reg(rn), A64Opnd::Reg(rm)) => {
+            assert!(
+                rn.num_bits == rm.num_bits,
+                "All operands must be of the same size."
+            );
+
+            DataReg::cmp(rn.reg_no, rm.reg_no, rn.num_bits).into()
+        },
+        (A64Opnd::Reg(rn), A64Opnd::Imm(imm12)) => {
+            DataImm::cmp(rn.reg_no, (imm12 as u64).try_into().unwrap(), rn.num_bits).into()
+        },
+        (A64Opnd::Reg(rn), A64Opnd::UImm(imm12)) => {
+            DataImm::cmp(rn.reg_no, imm12.try_into().unwrap(), rn.num_bits).into()
+        },
+        _ => panic!("Invalid operand combination to cmp instruction."),
+    };
+
+    cb.write_bytes(&bytes);
+}
+
+/// CSEL - conditionally select between two registers
+pub fn csel(cb: &mut CodeBlock, rd: A64Opnd, rn: A64Opnd, rm: A64Opnd, cond: u8) {
+    let bytes: [u8; 4] = match (rd, rn, rm) {
+        (A64Opnd::Reg(rd), A64Opnd::Reg(rn), A64Opnd::Reg(rm)) => {
+            assert!(
+                rd.num_bits == rn.num_bits && rn.num_bits == rm.num_bits,
+                "All operands must be of the same size."
+            );
+
+            Conditional::csel(rd.reg_no, rn.reg_no, rm.reg_no, cond, rd.num_bits).into()
+        },
+        _ => panic!("Invalid operand combination to csel instruction."),
+    };
+
+    cb.write_bytes(&bytes);
+}
+
+/// EOR - perform a bitwise XOR of rn and rm, put the result in rd, don't update flags
+pub fn eor(cb: &mut CodeBlock, rd: A64Opnd, rn: A64Opnd, rm: A64Opnd) {
+    let bytes: [u8; 4] = match (rd, rn, rm) {
+        (A64Opnd::Reg(rd), A64Opnd::Reg(rn), A64Opnd::Reg(rm)) => {
+            assert!(
+                rd.num_bits == rn.num_bits && rn.num_bits == rm.num_bits,
+                "All operands must be of the same size."
+            );
+
+            LogicalReg::eor(rd.reg_no, rn.reg_no, rm.reg_no, rd.num_bits).into()
+        },
+        (A64Opnd::Reg(rd), A64Opnd::Reg(rn), A64Opnd::UImm(imm)) => {
+            assert!(rd.num_bits == rn.num_bits, "rd and rn must be of the same size.");
+            let bitmask_imm = if rd.num_bits == 32 {
+                BitmaskImmediate::new_32b_reg(imm.try_into().unwrap())
+            } else {
+                imm.try_into()
+            }.unwrap();
+
+            LogicalImm::eor(rd.reg_no, rn.reg_no, bitmask_imm, rd.num_bits).into()
+        },
+        _ => panic!("Invalid operand combination to eor instruction."),
+    };
+
+    cb.write_bytes(&bytes);
+}
+
+/// LDADDAL - atomic add with acquire and release semantics
+pub fn ldaddal(cb: &mut CodeBlock, rs: A64Opnd, rt: A64Opnd, rn: A64Opnd) {
+    let bytes: [u8; 4] = match (rs, rt, rn) {
+        (A64Opnd::Reg(rs), A64Opnd::Reg(rt), A64Opnd::Reg(rn)) => {
+            assert!(
+                rs.num_bits == rt.num_bits && rt.num_bits == rn.num_bits,
+                "All operands must be of the same size."
+            );
+
+            Atomic::ldaddal(rs.reg_no, rt.reg_no, rn.reg_no, rs.num_bits).into()
+        },
+        _ => panic!("Invalid operand combination to ldaddal instruction."),
+    };
+
+    cb.write_bytes(&bytes);
+}
+
+/// LDAXR - atomic load with acquire semantics
+pub fn ldaxr(cb: &mut CodeBlock, rt: A64Opnd, rn: A64Opnd) {
+    let bytes: [u8; 4] = match (rt, rn) {
+        (A64Opnd::Reg(rt), A64Opnd::Reg(rn)) => {
+            assert_eq!(rn.num_bits, 64, "rn must be a 64-bit register.");
+
+            LoadStoreExclusive::ldaxr(rt.reg_no, rn.reg_no, rt.num_bits).into()
+        },
+        _ => panic!("Invalid operand combination to ldaxr instruction."),
+    };
+
+    cb.write_bytes(&bytes);
+}
+
+/// LDP (signed offset) - load a pair of registers from memory
+pub fn ldp(cb: &mut CodeBlock, rt1: A64Opnd, rt2: A64Opnd, rn: A64Opnd) {
+    let bytes: [u8; 4] = match (rt1, rt2, rn) {
+        (A64Opnd::Reg(rt1), A64Opnd::Reg(rt2), A64Opnd::Mem(rn)) => {
+            assert!(rt1.num_bits == rt2.num_bits, "Expected source registers to be the same size");
+            assert!(imm_fits_bits(rn.disp.into(), 10), "The displacement must be 10 bits or less.");
+            assert_ne!(rt1.reg_no, rt2.reg_no, "Behavior is unpredictable with pairs of the same register");
+
+            RegisterPair::ldp(rt1.reg_no, rt2.reg_no, rn.base_reg_no, rn.disp as i16, rt1.num_bits).into()
+        },
+        _ => panic!("Invalid operand combination to ldp instruction.")
+    };
+
+    cb.write_bytes(&bytes);
+}
+
+/// LDP (pre-index) - load a pair of registers from memory, update the base pointer before loading it
+pub fn ldp_pre(cb: &mut CodeBlock, rt1: A64Opnd, rt2: A64Opnd, rn: A64Opnd) {
+    let bytes: [u8; 4] = match (rt1, rt2, rn) {
+        (A64Opnd::Reg(rt1), A64Opnd::Reg(rt2), A64Opnd::Mem(rn)) => {
+            assert!(rt1.num_bits == rt2.num_bits, "Expected source registers to be the same size");
+            assert!(imm_fits_bits(rn.disp.into(), 10), "The displacement must be 10 bits or less.");
+            assert_ne!(rt1.reg_no, rt2.reg_no, "Behavior is unpredictable with pairs of the same register");
+
+            RegisterPair::ldp_pre(rt1.reg_no, rt2.reg_no, rn.base_reg_no, rn.disp as i16, rt1.num_bits).into()
+        },
+        _ => panic!("Invalid operand combination to ldp instruction.")
+    };
+
+    cb.write_bytes(&bytes);
+}
+
+/// LDP (post-index) - load a pair of registers from memory, update the base pointer after loading it
+pub fn ldp_post(cb: &mut CodeBlock, rt1: A64Opnd, rt2: A64Opnd, rn: A64Opnd) {
+    let bytes: [u8; 4] = match (rt1, rt2, rn) {
+        (A64Opnd::Reg(rt1), A64Opnd::Reg(rt2), A64Opnd::Mem(rn)) => {
+            assert!(rt1.num_bits == rt2.num_bits, "Expected source registers to be the same size");
+            assert!(imm_fits_bits(rn.disp.into(), 10), "The displacement must be 10 bits or less.");
+            assert_ne!(rt1.reg_no, rt2.reg_no, "Behavior is unpredictable with pairs of the same register");
+
+            RegisterPair::ldp_post(rt1.reg_no, rt2.reg_no, rn.base_reg_no, rn.disp as i16, rt1.num_bits).into()
+        },
+        _ => panic!("Invalid operand combination to ldp instruction.")
+    };
+
+    cb.write_bytes(&bytes);
+}
+
+/// LDR - load a memory address into a register with a register offset
+pub fn ldr(cb: &mut CodeBlock, rt: A64Opnd, rn: A64Opnd, rm: A64Opnd) {
+    let bytes: [u8; 4] = match (rt, rn, rm) {
+        (A64Opnd::Reg(rt), A64Opnd::Reg(rn), A64Opnd::Reg(rm)) => {
+            assert!(rt.num_bits == rn.num_bits, "Expected registers to be the same size");
+            assert!(rn.num_bits == rm.num_bits, "Expected registers to be the same size");
+
+            LoadRegister::ldr(rt.reg_no, rn.reg_no, rm.reg_no, rt.num_bits).into()
+        },
+        _ => panic!("Invalid operand combination to ldr instruction.")
+    };
+
+    cb.write_bytes(&bytes);
+}
+
+/// LDR - load a PC-relative memory address into a register
+pub fn ldr_literal(cb: &mut CodeBlock, rt: A64Opnd, rn: InstructionOffset) {
+    let bytes: [u8; 4] = match rt {
+        A64Opnd::Reg(rt) => {
+            LoadLiteral::ldr_literal(rt.reg_no, rn, rt.num_bits).into()
+        },
+        _ => panic!("Invalid operand combination to ldr instruction."),
+    };
+
+    cb.write_bytes(&bytes);
+}
+
+/// LDRH - load a halfword from memory
+pub fn ldrh(cb: &mut CodeBlock, rt: A64Opnd, rn: A64Opnd) {
+    let bytes: [u8; 4] = match (rt, rn) {
+        (A64Opnd::Reg(rt), A64Opnd::Mem(rn)) => {
+            assert_eq!(rt.num_bits, 32, "Expected to be loading a halfword");
+            assert!(imm_fits_bits(rn.disp.into(), 12), "The displacement must be 12 bits or less.");
+
+            HalfwordImm::ldrh(rt.reg_no, rn.base_reg_no, rn.disp as i16).into()
+        },
+        _ => panic!("Invalid operand combination to ldrh instruction.")
+    };
+
+    cb.write_bytes(&bytes);
+}
+
+/// LDRH (pre-index) - load a halfword from memory, update the base pointer before loading it
+pub fn ldrh_pre(cb: &mut CodeBlock, rt: A64Opnd, rn: A64Opnd) {
+    let bytes: [u8; 4] = match (rt, rn) {
+        (A64Opnd::Reg(rt), A64Opnd::Mem(rn)) => {
+            assert_eq!(rt.num_bits, 32, "Expected to be loading a halfword");
+            assert!(imm_fits_bits(rn.disp.into(), 9), "The displacement must be 9 bits or less.");
+
+            HalfwordImm::ldrh_pre(rt.reg_no, rn.base_reg_no, rn.disp as i16).into()
+        },
+        _ => panic!("Invalid operand combination to ldrh instruction.")
+    };
+
+    cb.write_bytes(&bytes);
+}
+
+/// LDRH (post-index) - load a halfword from memory, update the base pointer after loading it
+pub fn ldrh_post(cb: &mut CodeBlock, rt: A64Opnd, rn: A64Opnd) {
+    let bytes: [u8; 4] = match (rt, rn) {
+        (A64Opnd::Reg(rt), A64Opnd::Mem(rn)) => {
+            assert_eq!(rt.num_bits, 32, "Expected to be loading a halfword");
+            assert!(imm_fits_bits(rn.disp.into(), 9), "The displacement must be 9 bits or less.");
+
+            HalfwordImm::ldrh_post(rt.reg_no, rn.base_reg_no, rn.disp as i16).into()
+        },
+        _ => panic!("Invalid operand combination to ldrh instruction.")
+    };
+
+    cb.write_bytes(&bytes);
+}
+
+/// Whether or not a memory address displacement fits into the maximum number of
+/// bits such that it can be used without loading it into a register first.
+pub fn mem_disp_fits_bits(disp: i32) -> bool {
+    imm_fits_bits(disp.into(), 9)
+}
+
+/// LDR (post-index) - load a register from memory, update the base pointer after loading it
+pub fn ldr_post(cb: &mut CodeBlock, rt: A64Opnd, rn: A64Opnd) {
+    let bytes: [u8; 4] = match (rt, rn) {
+        (A64Opnd::Reg(rt), A64Opnd::Mem(rn)) => {
+            assert!(rt.num_bits == rn.num_bits, "All operands must be of the same size.");
+            assert!(mem_disp_fits_bits(rn.disp), "The displacement must be 9 bits or less.");
+
+            LoadStore::ldr_post(rt.reg_no, rn.base_reg_no, rn.disp as i16, rt.num_bits).into()
+        },
+        _ => panic!("Invalid operand combination to ldr instruction."),
+    };
+
+    cb.write_bytes(&bytes);
+}
+
+/// LDR (pre-index) - load a register from memory, update the base pointer before loading it
+pub fn ldr_pre(cb: &mut CodeBlock, rt: A64Opnd, rn: A64Opnd) {
+    let bytes: [u8; 4] = match (rt, rn) {
+        (A64Opnd::Reg(rt), A64Opnd::Mem(rn)) => {
+            assert!(rt.num_bits == rn.num_bits, "All operands must be of the same size.");
+            assert!(mem_disp_fits_bits(rn.disp), "The displacement must be 9 bits or less.");
+
+            LoadStore::ldr_pre(rt.reg_no, rn.base_reg_no, rn.disp as i16, rt.num_bits).into()
+        },
+        _ => panic!("Invalid operand combination to ldr instruction."),
+    };
+
+    cb.write_bytes(&bytes);
+}
+
+/// LDUR - load a memory address into a register
+pub fn ldur(cb: &mut CodeBlock, rt: A64Opnd, rn: A64Opnd) {
+    let bytes: [u8; 4] = match (rt, rn) {
+        (A64Opnd::Reg(rt), A64Opnd::Reg(rn)) => {
+            assert!(rt.num_bits == rn.num_bits, "All operands must be of the same size.");
+
+            LoadStore::ldur(rt.reg_no, rn.reg_no, 0, rt.num_bits).into()
+        },
+        (A64Opnd::Reg(rt), A64Opnd::Mem(rn)) => {
+            assert!(rt.num_bits == rn.num_bits, "Expected registers to be the same size");
+            assert!(mem_disp_fits_bits(rn.disp), "Expected displacement to be 9 bits or less");
+
+            LoadStore::ldur(rt.reg_no, rn.base_reg_no, rn.disp as i16, rt.num_bits).into()
+        },
+        _ => panic!("Invalid operands for LDUR")
+    };
+
+    cb.write_bytes(&bytes);
+}
+
+/// LDURH - load a byte from memory, zero-extend it, and write it to a register
+pub fn ldurh(cb: &mut CodeBlock, rt: A64Opnd, rn: A64Opnd) {
+    let bytes: [u8; 4] = match (rt, rn) {
+        (A64Opnd::Reg(rt), A64Opnd::Mem(rn)) => {
+            assert!(mem_disp_fits_bits(rn.disp), "Expected displacement to be 9 bits or less");
+
+            LoadStore::ldurh(rt.reg_no, rn.base_reg_no, rn.disp as i16).into()
+        },
+        _ => panic!("Invalid operands for LDURH")
+    };
+
+    cb.write_bytes(&bytes);
+}
+
+/// LDURB - load a byte from memory, zero-extend it, and write it to a register
+pub fn ldurb(cb: &mut CodeBlock, rt: A64Opnd, rn: A64Opnd) {
+    let bytes: [u8; 4] = match (rt, rn) {
+        (A64Opnd::Reg(rt), A64Opnd::Mem(rn)) => {
+            assert!(rt.num_bits == rn.num_bits, "Expected registers to be the same size");
+            assert!(rt.num_bits == 8, "Expected registers to have size 8");
+            assert!(mem_disp_fits_bits(rn.disp), "Expected displacement to be 9 bits or less");
+
+            LoadStore::ldurb(rt.reg_no, rn.base_reg_no, rn.disp as i16).into()
+        },
+        _ => panic!("Invalid operands for LDURB")
+    };
+
+    cb.write_bytes(&bytes);
+}
+
+/// LDURSW - load a 32-bit memory address into a register and sign-extend it
+pub fn ldursw(cb: &mut CodeBlock, rt: A64Opnd, rn: A64Opnd) {
+    let bytes: [u8; 4] = match (rt, rn) {
+        (A64Opnd::Reg(rt), A64Opnd::Mem(rn)) => {
+            assert!(rt.num_bits == rn.num_bits, "Expected registers to be the same size");
+            assert!(mem_disp_fits_bits(rn.disp), "Expected displacement to be 9 bits or less");
+
+            LoadStore::ldursw(rt.reg_no, rn.base_reg_no, rn.disp as i16).into()
+        },
+        _ => panic!("Invalid operand combination to ldursw instruction.")
+    };
+
+    cb.write_bytes(&bytes);
+}
+
+/// LSL - logical shift left a register by an immediate
+pub fn lsl(cb: &mut CodeBlock, rd: A64Opnd, rn: A64Opnd, shift: A64Opnd) {
+    let bytes: [u8; 4] = match (rd, rn, shift) {
+        (A64Opnd::Reg(rd), A64Opnd::Reg(rn), A64Opnd::UImm(uimm)) => {
+            assert!(rd.num_bits == rn.num_bits, "Expected registers to be the same size");
+            assert!(uimm_fits_bits(uimm, 6), "Expected shift to be 6 bits or less");
+
+            ShiftImm::lsl(rd.reg_no, rn.reg_no, uimm as u8, rd.num_bits).into()
+        },
+        _ => panic!("Invalid operands combination to lsl instruction")
+    };
+
+    cb.write_bytes(&bytes);
+}
+
+/// LSR - logical shift right a register by an immediate
+pub fn lsr(cb: &mut CodeBlock, rd: A64Opnd, rn: A64Opnd, shift: A64Opnd) {
+    let bytes: [u8; 4] = match (rd, rn, shift) {
+        (A64Opnd::Reg(rd), A64Opnd::Reg(rn), A64Opnd::UImm(uimm)) => {
+            assert!(rd.num_bits == rn.num_bits, "Expected registers to be the same size");
+            assert!(uimm_fits_bits(uimm, 6), "Expected shift to be 6 bits or less");
+
+            ShiftImm::lsr(rd.reg_no, rn.reg_no, uimm as u8, rd.num_bits).into()
+        },
+        _ => panic!("Invalid operands combination to lsr instruction")
+    };
+
+    cb.write_bytes(&bytes);
+}
+
+/// MOV - move a value in a register to another register
+pub fn mov(cb: &mut CodeBlock, rd: A64Opnd, rm: A64Opnd) {
+    let bytes: [u8; 4] = match (rd, rm) {
+        (A64Opnd::Reg(A64Reg { reg_no: 31, num_bits: 64 }), A64Opnd::Reg(rm)) => {
+            assert!(rm.num_bits == 64, "Expected rm to be 64 bits");
+
+            DataImm::add(31, rm.reg_no, 0.try_into().unwrap(), 64).into()
+        },
+        (A64Opnd::Reg(rd), A64Opnd::Reg(A64Reg { reg_no: 31, num_bits: 64 })) => {
+            assert!(rd.num_bits == 64, "Expected rd to be 64 bits");
+
+            DataImm::add(rd.reg_no, 31, 0.try_into().unwrap(), 64).into()
+        },
+        (A64Opnd::Reg(rd), A64Opnd::Reg(rm)) => {
+            assert!(rd.num_bits == rm.num_bits, "Expected registers to be the same size");
+
+            LogicalReg::mov(rd.reg_no, rm.reg_no, rd.num_bits).into()
+        },
+        (A64Opnd::Reg(rd), A64Opnd::UImm(0)) => {
+            LogicalReg::mov(rd.reg_no, XZR_REG.reg_no, rd.num_bits).into()
+        },
+        (A64Opnd::Reg(rd), A64Opnd::UImm(imm)) => {
+            let bitmask_imm = if rd.num_bits == 32 {
+                BitmaskImmediate::new_32b_reg(imm.try_into().unwrap())
+            } else {
+                imm.try_into()
+            }.unwrap();
+
+            LogicalImm::mov(rd.reg_no, bitmask_imm, rd.num_bits).into()
+        },
+        _ => panic!("Invalid operand combination to mov instruction: {rd:?}, {rm:?}")
+    };
+
+    cb.write_bytes(&bytes);
+}
+
+/// MOVK - move a 16 bit immediate into a register, keep the other bits in place
+pub fn movk(cb: &mut CodeBlock, rd: A64Opnd, imm16: A64Opnd, shift: u8) {
+    let bytes: [u8; 4] = match (rd, imm16) {
+        (A64Opnd::Reg(rd), A64Opnd::UImm(imm16)) => {
+            assert!(uimm_fits_bits(imm16, 16), "The immediate operand must be 16 bits or less.");
+
+            Mov::movk(rd.reg_no, imm16 as u16, shift, rd.num_bits).into()
+        },
+        _ => panic!("Invalid operand combination to movk instruction.")
+    };
+
+    cb.write_bytes(&bytes);
+}
+
+/// MOVZ - move a 16 bit immediate into a register, zero the other bits
+pub fn movz(cb: &mut CodeBlock, rd: A64Opnd, imm16: A64Opnd, shift: u8) {
+    let bytes: [u8; 4] = match (rd, imm16) {
+        (A64Opnd::Reg(rd), A64Opnd::UImm(imm16)) => {
+            assert!(uimm_fits_bits(imm16, 16), "The immediate operand must be 16 bits or less.");
+
+            Mov::movz(rd.reg_no, imm16 as u16, shift, rd.num_bits).into()
+        },
+        _ => panic!("Invalid operand combination to movz instruction.")
+    };
+
+    cb.write_bytes(&bytes);
+}
+
+/// MRS - move a system register into a general-purpose register
+pub fn mrs(cb: &mut CodeBlock, rt: A64Opnd, systemregister: SystemRegister) {
+    let bytes: [u8; 4] = match rt {
+        A64Opnd::Reg(rt) => {
+            SysReg::mrs(rt.reg_no, systemregister).into()
+        },
+        _ => panic!("Invalid operand combination to mrs instruction")
+    };
+
+    cb.write_bytes(&bytes);
+}
+
+/// MSR - move a general-purpose register into a system register
+pub fn msr(cb: &mut CodeBlock, systemregister: SystemRegister, rt: A64Opnd) {
+    let bytes: [u8; 4] = match rt {
+        A64Opnd::Reg(rt) => {
+            SysReg::msr(systemregister, rt.reg_no).into()
+        },
+        _ => panic!("Invalid operand combination to msr instruction")
+    };
+
+    cb.write_bytes(&bytes);
+}
+
+/// MUL - multiply two registers, put the result in a third register
+pub fn mul(cb: &mut CodeBlock, rd: A64Opnd, rn: A64Opnd, rm: A64Opnd) {
+    let bytes: [u8; 4] = match (rd, rn, rm) {
+        (A64Opnd::Reg(rd), A64Opnd::Reg(rn), A64Opnd::Reg(rm)) => {
+            assert!(rd.num_bits == rn.num_bits && rn.num_bits == rm.num_bits, "Expected registers to be the same size");
+
+            MAdd::mul(rd.reg_no, rn.reg_no, rm.reg_no, rd.num_bits).into()
+        },
+        _ => panic!("Invalid operand combination to mul instruction")
+    };
+
+    cb.write_bytes(&bytes);
+}
+
+/// SMULH - multiply two 64-bit registers to produce a 128-bit result, put the high 64-bits of the result into rd
+pub fn smulh(cb: &mut CodeBlock, rd: A64Opnd, rn: A64Opnd, rm: A64Opnd) {
+    let bytes: [u8; 4] = match (rd, rn, rm) {
+        (A64Opnd::Reg(rd), A64Opnd::Reg(rn), A64Opnd::Reg(rm)) => {
+            assert!(rd.num_bits == rn.num_bits && rn.num_bits == rm.num_bits, "Expected registers to be the same size");
+            assert!(rd.num_bits == 64, "smulh only applicable to 64-bit registers");
+
+            SMulH::smulh(rd.reg_no, rn.reg_no, rm.reg_no).into()
+        },
+        _ => panic!("Invalid operand combination to mul instruction")
+    };
+
+    cb.write_bytes(&bytes);
+}
+
+/// MVN - move a value in a register to another register, negating it
+pub fn mvn(cb: &mut CodeBlock, rd: A64Opnd, rm: A64Opnd) {
+    let bytes: [u8; 4] = match (rd, rm) {
+        (A64Opnd::Reg(rd), A64Opnd::Reg(rm)) => {
+            assert!(rd.num_bits == rm.num_bits, "Expected registers to be the same size");
+
+            LogicalReg::mvn(rd.reg_no, rm.reg_no, rd.num_bits).into()
+        },
+        _ => panic!("Invalid operand combination to mvn instruction")
+    };
+
+    cb.write_bytes(&bytes);
+}
+
+/// NOP - no-operation, used for alignment purposes
+pub fn nop(cb: &mut CodeBlock) {
+    let bytes: [u8; 4] = Nop::nop().into();
+
+    cb.write_bytes(&bytes);
+}
+
+/// ORN - perform a bitwise OR of rn and NOT rm, put the result in rd, don't update flags
+pub fn orn(cb: &mut CodeBlock, rd: A64Opnd, rn: A64Opnd, rm: A64Opnd) {
+    let bytes: [u8; 4] = match (rd, rn, rm) {
+        (A64Opnd::Reg(rd), A64Opnd::Reg(rn), A64Opnd::Reg(rm)) => {
+            assert!(rd.num_bits == rn.num_bits && rn.num_bits == rm.num_bits, "Expected registers to be the same size");
+
+            LogicalReg::orn(rd.reg_no, rn.reg_no, rm.reg_no, rd.num_bits).into()
+        },
+        _ => panic!("Invalid operand combination to orn instruction.")
+    };
+
+    cb.write_bytes(&bytes);
+}
+
+/// ORR - perform a bitwise OR of rn and rm, put the result in rd, don't update flags
+pub fn orr(cb: &mut CodeBlock, rd: A64Opnd, rn: A64Opnd, rm: A64Opnd) {
+    let bytes: [u8; 4] = match (rd, rn, rm) {
+        (A64Opnd::Reg(rd), A64Opnd::Reg(rn), A64Opnd::Reg(rm)) => {
+            assert!(
+                rd.num_bits == rn.num_bits && rn.num_bits == rm.num_bits,
+                "All operands must be of the same size."
+            );
+
+            LogicalReg::orr(rd.reg_no, rn.reg_no, rm.reg_no, rd.num_bits).into()
+        },
+        (A64Opnd::Reg(rd), A64Opnd::Reg(rn), A64Opnd::UImm(imm)) => {
+            assert!(rd.num_bits == rn.num_bits, "rd and rn must be of the same size.");
+            let bitmask_imm = if rd.num_bits == 32 {
+                BitmaskImmediate::new_32b_reg(imm.try_into().unwrap())
+            } else {
+                imm.try_into()
+            }.unwrap();
+
+            LogicalImm::orr(rd.reg_no, rn.reg_no, bitmask_imm, rd.num_bits).into()
+        },
+        _ => panic!("Invalid operand combination to orr instruction."),
+    };
+
+    cb.write_bytes(&bytes);
+}
+
+/// STLXR - store a value to memory, release exclusive access
+pub fn stlxr(cb: &mut CodeBlock, rs: A64Opnd, rt: A64Opnd, rn: A64Opnd) {
+    let bytes: [u8; 4] = match (rs, rt, rn) {
+        (A64Opnd::Reg(rs), A64Opnd::Reg(rt), A64Opnd::Reg(rn)) => {
+            assert_eq!(rs.num_bits, 32, "rs must be a 32-bit register.");
+            assert_eq!(rn.num_bits, 64, "rn must be a 64-bit register.");
+
+            LoadStoreExclusive::stlxr(rs.reg_no, rt.reg_no, rn.reg_no, rn.num_bits).into()
+        },
+        _ => panic!("Invalid operand combination to stlxr instruction.")
+    };
+
+    cb.write_bytes(&bytes);
+}
+
+/// STP (signed offset) - store a pair of registers to memory
+pub fn stp(cb: &mut CodeBlock, rt1: A64Opnd, rt2: A64Opnd, rn: A64Opnd) {
+    let bytes: [u8; 4] = match (rt1, rt2, rn) {
+        (A64Opnd::Reg(rt1), A64Opnd::Reg(rt2), A64Opnd::Mem(rn)) => {
+            assert!(rt1.num_bits == rt2.num_bits, "Expected source registers to be the same size");
+            assert!(imm_fits_bits(rn.disp.into(), 10), "The displacement must be 10 bits or less.");
+            assert_ne!(rt1.reg_no, rt2.reg_no, "Behavior is unpredictable with pairs of the same register");
+
+            RegisterPair::stp(rt1.reg_no, rt2.reg_no, rn.base_reg_no, rn.disp as i16, rt1.num_bits).into()
+        },
+        _ => panic!("Invalid operand combination to stp instruction.")
+    };
+
+    cb.write_bytes(&bytes);
+}
+
+/// STP (pre-index) - store a pair of registers to memory, update the base pointer before loading it
+pub fn stp_pre(cb: &mut CodeBlock, rt1: A64Opnd, rt2: A64Opnd, rn: A64Opnd) {
+    let bytes: [u8; 4] = match (rt1, rt2, rn) {
+        (A64Opnd::Reg(rt1), A64Opnd::Reg(rt2), A64Opnd::Mem(rn)) => {
+            assert!(rt1.num_bits == rt2.num_bits, "Expected source registers to be the same size");
+            assert!(imm_fits_bits(rn.disp.into(), 10), "The displacement must be 10 bits or less.");
+            assert_ne!(rt1.reg_no, rt2.reg_no, "Behavior is unpredictable with pairs of the same register");
+
+            RegisterPair::stp_pre(rt1.reg_no, rt2.reg_no, rn.base_reg_no, rn.disp as i16, rt1.num_bits).into()
+        },
+        _ => panic!("Invalid operand combination to stp instruction.")
+    };
+
+    cb.write_bytes(&bytes);
+}
+
+/// STP (post-index) - store a pair of registers to memory, update the base pointer after loading it
+pub fn stp_post(cb: &mut CodeBlock, rt1: A64Opnd, rt2: A64Opnd, rn: A64Opnd) {
+    let bytes: [u8; 4] = match (rt1, rt2, rn) {
+        (A64Opnd::Reg(rt1), A64Opnd::Reg(rt2), A64Opnd::Mem(rn)) => {
+            assert!(rt1.num_bits == rt2.num_bits, "Expected source registers to be the same size");
+            assert!(imm_fits_bits(rn.disp.into(), 10), "The displacement must be 10 bits or less.");
+            assert_ne!(rt1.reg_no, rt2.reg_no, "Behavior is unpredictable with pairs of the same register");
+
+            RegisterPair::stp_post(rt1.reg_no, rt2.reg_no, rn.base_reg_no, rn.disp as i16, rt1.num_bits).into()
+        },
+        _ => panic!("Invalid operand combination to stp instruction.")
+    };
+
+    cb.write_bytes(&bytes);
+}
+
+/// STR (post-index) - store a register to memory, update the base pointer after loading it
+pub fn str_post(cb: &mut CodeBlock, rt: A64Opnd, rn: A64Opnd) {
+    let bytes: [u8; 4] = match (rt, rn) {
+        (A64Opnd::Reg(rt), A64Opnd::Mem(rn)) => {
+            assert!(rt.num_bits == rn.num_bits, "All operands must be of the same size.");
+            assert!(mem_disp_fits_bits(rn.disp), "The displacement must be 9 bits or less.");
+
+            LoadStore::str_post(rt.reg_no, rn.base_reg_no, rn.disp as i16, rt.num_bits).into()
+        },
+        _ => panic!("Invalid operand combination to str instruction."),
+    };
+
+    cb.write_bytes(&bytes);
+}
+
+/// STR (pre-index) - store a register to memory, update the base pointer before loading it
+pub fn str_pre(cb: &mut CodeBlock, rt: A64Opnd, rn: A64Opnd) {
+    let bytes: [u8; 4] = match (rt, rn) {
+        (A64Opnd::Reg(rt), A64Opnd::Mem(rn)) => {
+            assert!(rt.num_bits == rn.num_bits, "All operands must be of the same size.");
+            assert!(mem_disp_fits_bits(rn.disp), "The displacement must be 9 bits or less.");
+
+            LoadStore::str_pre(rt.reg_no, rn.base_reg_no, rn.disp as i16, rt.num_bits).into()
+        },
+        _ => panic!("Invalid operand combination to str instruction."),
+    };
+
+    cb.write_bytes(&bytes);
+}
+
+/// STRH - store a halfword into memory
+pub fn strh(cb: &mut CodeBlock, rt: A64Opnd, rn: A64Opnd) {
+    let bytes: [u8; 4] = match (rt, rn) {
+        (A64Opnd::Reg(rt), A64Opnd::Mem(rn)) => {
+            assert_eq!(rt.num_bits, 32, "Expected to be loading a halfword");
+            assert!(imm_fits_bits(rn.disp.into(), 12), "The displacement must be 12 bits or less.");
+
+            HalfwordImm::strh(rt.reg_no, rn.base_reg_no, rn.disp as i16).into()
+        },
+        _ => panic!("Invalid operand combination to strh instruction.")
+    };
+
+    cb.write_bytes(&bytes);
+}
+
+/// STRH (pre-index) - store a halfword into memory, update the base pointer before loading it
+pub fn strh_pre(cb: &mut CodeBlock, rt: A64Opnd, rn: A64Opnd) {
+    let bytes: [u8; 4] = match (rt, rn) {
+        (A64Opnd::Reg(rt), A64Opnd::Mem(rn)) => {
+            assert_eq!(rt.num_bits, 32, "Expected to be loading a halfword");
+            assert!(imm_fits_bits(rn.disp.into(), 9), "The displacement must be 9 bits or less.");
+
+            HalfwordImm::strh_pre(rt.reg_no, rn.base_reg_no, rn.disp as i16).into()
+        },
+        _ => panic!("Invalid operand combination to strh instruction.")
+    };
+
+    cb.write_bytes(&bytes);
+}
+
+/// STRH (post-index) - store a halfword into memory, update the base pointer after loading it
+pub fn strh_post(cb: &mut CodeBlock, rt: A64Opnd, rn: A64Opnd) {
+    let bytes: [u8; 4] = match (rt, rn) {
+        (A64Opnd::Reg(rt), A64Opnd::Mem(rn)) => {
+            assert_eq!(rt.num_bits, 32, "Expected to be loading a halfword");
+            assert!(imm_fits_bits(rn.disp.into(), 9), "The displacement must be 9 bits or less.");
+
+            HalfwordImm::strh_post(rt.reg_no, rn.base_reg_no, rn.disp as i16).into()
+        },
+        _ => panic!("Invalid operand combination to strh instruction.")
+    };
+
+    cb.write_bytes(&bytes);
+}
+
+/// STUR - store a value in a register at a memory address
+pub fn stur(cb: &mut CodeBlock, rt: A64Opnd, rn: A64Opnd) {
+    let bytes: [u8; 4] = match (rt, rn) {
+        (A64Opnd::Reg(rt), A64Opnd::Mem(rn)) => {
+            assert!(rn.num_bits == 32 || rn.num_bits == 64);
+            assert!(mem_disp_fits_bits(rn.disp), "Expected displacement {} to be 9 bits or less", rn.disp);
+
+            LoadStore::stur(rt.reg_no, rn.base_reg_no, rn.disp as i16, rn.num_bits).into()
+        },
+        _ => panic!("Invalid operand combination to stur instruction: {rt:?}, {rn:?}")
+    };
+
+    cb.write_bytes(&bytes);
+}
+
+/// STURH - store a value in a register at a memory address
+pub fn sturh(cb: &mut CodeBlock, rt: A64Opnd, rn: A64Opnd) {
+    let bytes: [u8; 4] = match (rt, rn) {
+        (A64Opnd::Reg(rt), A64Opnd::Mem(rn)) => {
+            assert!(rn.num_bits == 16);
+            assert!(mem_disp_fits_bits(rn.disp), "Expected displacement to be 9 bits or less");
+
+            LoadStore::sturh(rt.reg_no, rn.base_reg_no, rn.disp as i16).into()
+        },
+        _ => panic!("Invalid operand combination to stur instruction.")
+    };
+
+    cb.write_bytes(&bytes);
+}
+
+/// SUB - subtract rm from rn, put the result in rd, don't update flags
+pub fn sub(cb: &mut CodeBlock, rd: A64Opnd, rn: A64Opnd, rm: A64Opnd) {
+    let bytes: [u8; 4] = match (rd, rn, rm) {
+        (A64Opnd::Reg(rd), A64Opnd::Reg(rn), A64Opnd::Reg(rm)) => {
+            assert!(
+                rd.num_bits == rn.num_bits && rn.num_bits == rm.num_bits,
+                "All operands must be of the same size."
+            );
+
+            DataReg::sub(rd.reg_no, rn.reg_no, rm.reg_no, rd.num_bits).into()
+        },
+        (A64Opnd::Reg(rd), A64Opnd::Reg(rn), A64Opnd::UImm(uimm12)) => {
+            assert!(rd.num_bits == rn.num_bits, "rd and rn must be of the same size.");
+
+            DataImm::sub(rd.reg_no, rn.reg_no, uimm12.try_into().unwrap(), rd.num_bits).into()
+        },
+        (A64Opnd::Reg(rd), A64Opnd::Reg(rn), A64Opnd::Imm(imm12)) => {
+            assert!(rd.num_bits == rn.num_bits, "rd and rn must be of the same size.");
+
+            if imm12 < 0 {
+                DataImm::add(rd.reg_no, rn.reg_no, (-imm12 as u64).try_into().unwrap(), rd.num_bits).into()
+            } else {
+                DataImm::sub(rd.reg_no, rn.reg_no, (imm12 as u64).try_into().unwrap(), rd.num_bits).into()
+            }
+        },
+        _ => panic!("Invalid operand combination to sub instruction."),
+    };
+
+    cb.write_bytes(&bytes);
+}
+
+/// SUBS - subtract rm from rn, put the result in rd, update flags
+pub fn subs(cb: &mut CodeBlock, rd: A64Opnd, rn: A64Opnd, rm: A64Opnd) {
+    let bytes: [u8; 4] = match (rd, rn, rm) {
+        (A64Opnd::Reg(rd), A64Opnd::Reg(rn), A64Opnd::Reg(rm)) => {
+            assert!(
+                rd.num_bits == rn.num_bits && rn.num_bits == rm.num_bits,
+                "All operands must be of the same size."
+            );
+
+            DataReg::subs(rd.reg_no, rn.reg_no, rm.reg_no, rd.num_bits).into()
+        },
+        (A64Opnd::Reg(rd), A64Opnd::Reg(rn), A64Opnd::UImm(uimm12)) => {
+            assert!(rd.num_bits == rn.num_bits, "rd and rn must be of the same size.");
+
+            DataImm::subs(rd.reg_no, rn.reg_no, uimm12.try_into().unwrap(), rd.num_bits).into()
+        },
+        (A64Opnd::Reg(rd), A64Opnd::Reg(rn), A64Opnd::Imm(imm12)) => {
+            assert!(rd.num_bits == rn.num_bits, "rd and rn must be of the same size.");
+
+            if imm12 < 0 {
+                DataImm::adds(rd.reg_no, rn.reg_no, (-imm12 as u64).try_into().unwrap(), rd.num_bits).into()
+            } else {
+                DataImm::subs(rd.reg_no, rn.reg_no, (imm12 as u64).try_into().unwrap(), rd.num_bits).into()
+            }
+        },
+        _ => panic!("Invalid operand combination to subs instruction."),
+    };
+
+    cb.write_bytes(&bytes);
+}
+
+/// SXTW - sign extend a 32-bit register into a 64-bit register
+pub fn sxtw(cb: &mut CodeBlock, rd: A64Opnd, rn: A64Opnd) {
+    let bytes: [u8; 4] = match (rd, rn) {
+        (A64Opnd::Reg(rd), A64Opnd::Reg(rn)) => {
+            assert_eq!(rd.num_bits, 64, "rd must be 64-bits wide.");
+            assert_eq!(rn.num_bits, 32, "rn must be 32-bits wide.");
+
+            SBFM::sxtw(rd.reg_no, rn.reg_no).into()
+        },
+        _ => panic!("Invalid operand combination to sxtw instruction."),
+    };
+
+    cb.write_bytes(&bytes);
+}
+
+/// RET - unconditionally return to a location in a register, defaults to X30
+pub fn ret(cb: &mut CodeBlock, rn: A64Opnd) {
+    let bytes: [u8; 4] = match rn {
+        A64Opnd::None => Branch::ret(30).into(),
+        A64Opnd::Reg(reg) => Branch::ret(reg.reg_no).into(),
+        _ => panic!("Invalid operand to ret instruction.")
+    };
+
+    cb.write_bytes(&bytes);
+}
+
+/// TBNZ - test bit and branch if not zero
+pub fn tbnz(cb: &mut CodeBlock, rt: A64Opnd, bit_num: A64Opnd, offset: A64Opnd) {
+    let bytes: [u8; 4] = match (rt, bit_num, offset) {
+        (A64Opnd::Reg(rt), A64Opnd::UImm(bit_num), A64Opnd::Imm(offset)) => {
+            TestBit::tbnz(rt.reg_no, bit_num.try_into().unwrap(), offset.try_into().unwrap()).into()
+        },
+        _ => panic!("Invalid operand combination to tbnz instruction.")
+    };
+
+    cb.write_bytes(&bytes);
+}
+
+/// TBZ - test bit and branch if zero
+pub fn tbz(cb: &mut CodeBlock, rt: A64Opnd, bit_num: A64Opnd, offset: A64Opnd) {
+    let bytes: [u8; 4] = match (rt, bit_num, offset) {
+        (A64Opnd::Reg(rt), A64Opnd::UImm(bit_num), A64Opnd::Imm(offset)) => {
+            TestBit::tbz(rt.reg_no, bit_num.try_into().unwrap(), offset.try_into().unwrap()).into()
+        },
+        _ => panic!("Invalid operand combination to tbz instruction.")
+    };
+
+    cb.write_bytes(&bytes);
+}
+
+/// TST - test the bits of a register against a mask, then update flags
+pub fn tst(cb: &mut CodeBlock, rn: A64Opnd, rm: A64Opnd) {
+    let bytes: [u8; 4] = match (rn, rm) {
+        (A64Opnd::Reg(rn), A64Opnd::Reg(rm)) => {
+            assert!(rn.num_bits == rm.num_bits, "All operands must be of the same size.");
+
+            LogicalReg::tst(rn.reg_no, rm.reg_no, rn.num_bits).into()
+        },
+        (A64Opnd::Reg(rn), A64Opnd::UImm(imm)) => {
+            let bitmask_imm = if rn.num_bits == 32 {
+                BitmaskImmediate::new_32b_reg(imm.try_into().unwrap())
+            } else {
+                imm.try_into()
+            }.unwrap();
+
+            LogicalImm::tst(rn.reg_no, bitmask_imm, rn.num_bits).into()
+        },
+        _ => panic!("Invalid operand combination to tst instruction."),
+    };
+
+    cb.write_bytes(&bytes);
+}
+
+/// CBZ - branch if a register is zero
+pub fn cbz(cb: &mut CodeBlock, rt: A64Opnd, offset: InstructionOffset) {
+    assert!(imm_fits_bits(offset.into(), 19), "jump offset for cbz must fit in 19 bits");
+    let bytes: [u8; 4] = if let A64Opnd::Reg(rt) = rt {
+        cbz_cbnz(rt.num_bits, false, offset, rt.reg_no)
+    } else {
+        panic!("Invalid operand combination to cbz instruction.")
+    };
+
+    cb.write_bytes(&bytes);
+}
+
+/// CBNZ - branch if a register is non-zero
+pub fn cbnz(cb: &mut CodeBlock, rt: A64Opnd, offset: InstructionOffset) {
+    assert!(imm_fits_bits(offset.into(), 19), "jump offset for cbz must fit in 19 bits");
+    let bytes: [u8; 4] = if let A64Opnd::Reg(rt) = rt {
+        cbz_cbnz(rt.num_bits, true, offset, rt.reg_no)
+    } else {
+        panic!("Invalid operand combination to cbnz instruction.")
+    };
+
+    cb.write_bytes(&bytes);
+}
+
+/// Encode Compare and Branch on Zero (CBZ) with `op=0` or Compare and Branch on Nonzero (CBNZ)
+/// with `op=1`.
+///
+/// <https://developer.arm.com/documentation/ddi0602/2024-03/Base-Instructions/CBZ--Compare-and-Branch-on-Zero->
+///
+/// +-------------+-------------+-------------+-------------+-------------+-------------+-------------+-------------+
+/// | 31 30 29 28 | 27 26 25 24 | 23 22 21 20 | 19 18 17 16 | 15 14 13 12 | 11 10 09 08 | 07 06 05 04 | 03 02 01 00 |
+/// | sf  0  1  1    0  1  0 op                                                                                     |
+/// |                             imm19........................................................... Rt.............. |
+/// +-------------+-------------+-------------+-------------+-------------+-------------+-------------+-------------+
+fn cbz_cbnz(num_bits: u8, op: bool, offset: InstructionOffset, rt: u8) -> [u8; 4] {
+    ((Sf::from(num_bits) as u32) << 31 |
+          0b11010 << 25 |
+          u32::from(op) << 24 |
+          truncate_imm::<_, 19>(offset) << 5 |
+          rt as u32).to_le_bytes()
+}
+
+/*
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    /// Check that the bytes for an instruction sequence match a hex string
+    fn check_bytes<R>(bytes: &str, run: R) where R: FnOnce(&mut super::CodeBlock) {
+        let mut cb = super::CodeBlock::new_dummy(128);
+        run(&mut cb);
+        assert_eq!(format!("{:x}", cb), bytes);
+    }
+
+    #[test]
+    fn test_imm_fits_bits() {
+        assert!(imm_fits_bits(i8::MAX.into(), 8));
+        assert!(imm_fits_bits(i8::MIN.into(), 8));
+
+        assert!(imm_fits_bits(i16::MAX.into(), 16));
+        assert!(imm_fits_bits(i16::MIN.into(), 16));
+
+        assert!(imm_fits_bits(i32::MAX.into(), 32));
+        assert!(imm_fits_bits(i32::MIN.into(), 32));
+
+        assert!(imm_fits_bits(i64::MAX, 64));
+        assert!(imm_fits_bits(i64::MIN, 64));
+    }
+
+    #[test]
+    fn test_uimm_fits_bits() {
+        assert!(uimm_fits_bits(u8::MAX.into(), 8));
+        assert!(uimm_fits_bits(u16::MAX.into(), 16));
+        assert!(uimm_fits_bits(u32::MAX.into(), 32));
+        assert!(uimm_fits_bits(u64::MAX, 64));
+    }
+
+    #[test]
+    fn test_add_reg() {
+        check_bytes("2000028b", |cb| add(cb, X0, X1, X2));
+    }
+
+    #[test]
+    fn test_add_uimm() {
+        check_bytes("201c0091", |cb| add(cb, X0, X1, A64Opnd::new_uimm(7)));
+    }
+
+    #[test]
+    fn test_add_imm_positive() {
+        check_bytes("201c0091", |cb| add(cb, X0, X1, A64Opnd::new_imm(7)));
+    }
+
+    #[test]
+    fn test_add_imm_negative() {
+        check_bytes("201c00d1", |cb| add(cb, X0, X1, A64Opnd::new_imm(-7)));
+    }
+
+    #[test]
+    fn test_adds_reg() {
+        check_bytes("200002ab", |cb| adds(cb, X0, X1, X2));
+    }
+
+    #[test]
+    fn test_adds_uimm() {
+        check_bytes("201c00b1", |cb| adds(cb, X0, X1, A64Opnd::new_uimm(7)));
+    }
+
+    #[test]
+    fn test_adds_imm_positive() {
+        check_bytes("201c00b1", |cb| adds(cb, X0, X1, A64Opnd::new_imm(7)));
+    }
+
+    #[test]
+    fn test_adds_imm_negative() {
+        check_bytes("201c00f1", |cb| adds(cb, X0, X1, A64Opnd::new_imm(-7)));
+    }
+
+    #[test]
+    fn test_adr() {
+        check_bytes("aa000010", |cb| adr(cb, X10, A64Opnd::new_imm(20)));
+    }
+
+    #[test]
+    fn test_adrp() {
+        check_bytes("4a000090", |cb| adrp(cb, X10, A64Opnd::new_imm(0x8000)));
+    }
+
+    #[test]
+    fn test_and_register() {
+        check_bytes("2000028a", |cb| and(cb, X0, X1, X2));
+    }
+
+    #[test]
+    fn test_and_immediate() {
+        check_bytes("20084092", |cb| and(cb, X0, X1, A64Opnd::new_uimm(7)));
+    }
+
+    #[test]
+    fn test_and_32b_immediate() {
+        check_bytes("404c0012", |cb| and(cb, W0, W2, A64Opnd::new_uimm(0xfffff)));
+    }
+
+    #[test]
+    fn test_ands_register() {
+        check_bytes("200002ea", |cb| ands(cb, X0, X1, X2));
+    }
+
+    #[test]
+    fn test_ands_immediate() {
+        check_bytes("200840f2", |cb| ands(cb, X0, X1, A64Opnd::new_uimm(7)));
+    }
+
+    #[test]
+    fn test_asr() {
+        check_bytes("b4fe4a93", |cb| asr(cb, X20, X21, A64Opnd::new_uimm(10)));
+    }
+
+    #[test]
+    fn test_bcond() {
+        let offset = InstructionOffset::from_insns(0x100);
+        check_bytes("01200054", |cb| bcond(cb, Condition::NE, offset));
+    }
+
+    #[test]
+    fn test_b() {
+        let offset = InstructionOffset::from_insns((1 << 25) - 1);
+        check_bytes("ffffff15", |cb| b(cb, offset));
+    }
+
+    #[test]
+    #[should_panic]
+    fn test_b_too_big() {
+        // There are 26 bits available
+        let offset = InstructionOffset::from_insns(1 << 25);
+        check_bytes("", |cb| b(cb, offset));
+    }
+
+    #[test]
+    #[should_panic]
+    fn test_b_too_small() {
+        // There are 26 bits available
+        let offset = InstructionOffset::from_insns(-(1 << 25) - 1);
+        check_bytes("", |cb| b(cb, offset));
+    }
+
+    #[test]
+    fn test_bl() {
+        let offset = InstructionOffset::from_insns(-(1 << 25));
+        check_bytes("00000096", |cb| bl(cb, offset));
+    }
+
+    #[test]
+    #[should_panic]
+    fn test_bl_too_big() {
+        // There are 26 bits available
+        let offset = InstructionOffset::from_insns(1 << 25);
+        check_bytes("", |cb| bl(cb, offset));
+    }
+
+    #[test]
+    #[should_panic]
+    fn test_bl_too_small() {
+        // There are 26 bits available
+        let offset = InstructionOffset::from_insns(-(1 << 25) - 1);
+        check_bytes("", |cb| bl(cb, offset));
+    }
+
+    #[test]
+    fn test_blr() {
+        check_bytes("80023fd6", |cb| blr(cb, X20));
+    }
+
+    #[test]
+    fn test_br() {
+        check_bytes("80021fd6", |cb| br(cb, X20));
+    }
+
+    #[test]
+    fn test_cbz() {
+        let offset = InstructionOffset::from_insns(-1);
+        check_bytes("e0ffffb4e0ffff34", |cb| {
+            cbz(cb, X0, offset);
+            cbz(cb, W0, offset);
+        });
+    }
+
+    #[test]
+    fn test_cbnz() {
+        let offset = InstructionOffset::from_insns(2);
+        check_bytes("540000b554000035", |cb| {
+            cbnz(cb, X20, offset);
+            cbnz(cb, W20, offset);
+        });
+    }
+
+    #[test]
+    fn test_brk_none() {
+        check_bytes("00003ed4", |cb| brk(cb, A64Opnd::None));
+    }
+
+    #[test]
+    fn test_brk_uimm() {
+        check_bytes("c00120d4", |cb| brk(cb, A64Opnd::new_uimm(14)));
+    }
+
+    #[test]
+    fn test_cmp_register() {
+        check_bytes("5f010beb", |cb| cmp(cb, X10, X11));
+    }
+
+    #[test]
+    fn test_cmp_immediate() {
+        check_bytes("5f3900f1", |cb| cmp(cb, X10, A64Opnd::new_uimm(14)));
+    }
+
+    #[test]
+    fn test_csel() {
+        check_bytes("6a018c9a", |cb| csel(cb, X10, X11, X12, Condition::EQ));
+    }
+
+    #[test]
+    fn test_eor_register() {
+        check_bytes("6a010cca", |cb| eor(cb, X10, X11, X12));
+    }
+
+    #[test]
+    fn test_eor_immediate() {
+        check_bytes("6a0940d2", |cb| eor(cb, X10, X11, A64Opnd::new_uimm(7)));
+    }
+
+    #[test]
+    fn test_eor_32b_immediate() {
+        check_bytes("29040152", |cb| eor(cb, W9, W1, A64Opnd::new_uimm(0x80000001)));
+    }
+
+    #[test]
+    fn test_ldaddal() {
+        check_bytes("8b01eaf8", |cb| ldaddal(cb, X10, X11, X12));
+    }
+
+    #[test]
+    fn test_ldaxr() {
+        check_bytes("6afd5fc8", |cb| ldaxr(cb, X10, X11));
+    }
+
+    #[test]
+    fn test_ldp() {
+        check_bytes("8a2d4da9", |cb| ldp(cb, X10, X11, A64Opnd::new_mem(64, X12, 208)));
+    }
+
+    #[test]
+    fn test_ldp_pre() {
+        check_bytes("8a2dcda9", |cb| ldp_pre(cb, X10, X11, A64Opnd::new_mem(64, X12, 208)));
+    }
+
+    #[test]
+    fn test_ldp_post() {
+        check_bytes("8a2dcda8", |cb| ldp_post(cb, X10, X11, A64Opnd::new_mem(64, X12, 208)));
+    }
+
+    #[test]
+    fn test_ldr() {
+        check_bytes("6a696cf8", |cb| ldr(cb, X10, X11, X12));
+    }
+
+    #[test]
+    fn test_ldr_literal() {
+        check_bytes("40010058", |cb| ldr_literal(cb, X0, 10.into()));
+    }
+
+    #[test]
+    fn test_ldr_post() {
+        check_bytes("6a0541f8", |cb| ldr_post(cb, X10, A64Opnd::new_mem(64, X11, 16)));
+    }
+
+    #[test]
+    fn test_ldr_pre() {
+        check_bytes("6a0d41f8", |cb| ldr_pre(cb, X10, A64Opnd::new_mem(64, X11, 16)));
+    }
+
+    #[test]
+    fn test_ldrh() {
+        check_bytes("6a194079", |cb| ldrh(cb, W10, A64Opnd::new_mem(64, X11, 12)));
+    }
+
+    #[test]
+    fn test_ldrh_pre() {
+        check_bytes("6acd4078", |cb| ldrh_pre(cb, W10, A64Opnd::new_mem(64, X11, 12)));
+    }
+
+    #[test]
+    fn test_ldrh_post() {
+        check_bytes("6ac54078", |cb| ldrh_post(cb, W10, A64Opnd::new_mem(64, X11, 12)));
+    }
+
+    #[test]
+    fn test_ldurh_memory() {
+        check_bytes("2a004078", |cb| ldurh(cb, W10, A64Opnd::new_mem(64, X1, 0)));
+        check_bytes("2ab04778", |cb| ldurh(cb, W10, A64Opnd::new_mem(64, X1, 123)));
+    }
+
+    #[test]
+    fn test_ldur_memory() {
+        check_bytes("20b047f8", |cb| ldur(cb, X0, A64Opnd::new_mem(64, X1, 123)));
+    }
+
+    #[test]
+    fn test_ldur_register() {
+        check_bytes("200040f8", |cb| ldur(cb, X0, X1));
+    }
+
+    #[test]
+    fn test_ldursw() {
+        check_bytes("6ab187b8", |cb| ldursw(cb, X10, A64Opnd::new_mem(64, X11, 123)));
+    }
+
+    #[test]
+    fn test_lsl() {
+        check_bytes("6ac572d3", |cb| lsl(cb, X10, X11, A64Opnd::new_uimm(14)));
+    }
+
+    #[test]
+    fn test_lsr() {
+        check_bytes("6afd4ed3", |cb| lsr(cb, X10, X11, A64Opnd::new_uimm(14)));
+    }
+
+    #[test]
+    fn test_mov_registers() {
+        check_bytes("ea030baa", |cb| mov(cb, X10, X11));
+    }
+
+    #[test]
+    fn test_mov_immediate() {
+        check_bytes("eaf300b2", |cb| mov(cb, X10, A64Opnd::new_uimm(0x5555555555555555)));
+    }
+
+    #[test]
+    fn test_mov_32b_immediate() {
+        check_bytes("ea070132", |cb| mov(cb, W10, A64Opnd::new_uimm(0x80000001)));
+    }
+    #[test]
+    fn test_mov_into_sp() {
+        check_bytes("1f000091", |cb| mov(cb, X31, X0));
+    }
+
+    #[test]
+    fn test_mov_from_sp() {
+        check_bytes("e0030091", |cb| mov(cb, X0, X31));
+    }
+
+    #[test]
+    fn test_movk() {
+        check_bytes("600fa0f2", |cb| movk(cb, X0, A64Opnd::new_uimm(123), 16));
+    }
+
+    #[test]
+    fn test_movz() {
+        check_bytes("600fa0d2", |cb| movz(cb, X0, A64Opnd::new_uimm(123), 16));
+    }
+
+    #[test]
+    fn test_mrs() {
+        check_bytes("0a423bd5", |cb| mrs(cb, X10, SystemRegister::NZCV));
+    }
+
+    #[test]
+    fn test_msr() {
+        check_bytes("0a421bd5", |cb| msr(cb, SystemRegister::NZCV, X10));
+    }
+
+    #[test]
+    fn test_mul() {
+        check_bytes("6a7d0c9b", |cb| mul(cb, X10, X11, X12));
+    }
+
+    #[test]
+    fn test_mvn() {
+        check_bytes("ea032baa", |cb| mvn(cb, X10, X11));
+    }
+
+    #[test]
+    fn test_nop() {
+        check_bytes("1f2003d5", |cb| nop(cb));
+    }
+
+    #[test]
+    fn test_orn() {
+        check_bytes("6a012caa", |cb| orn(cb, X10, X11, X12));
+    }
+
+    #[test]
+    fn test_orr_register() {
+        check_bytes("6a010caa", |cb| orr(cb, X10, X11, X12));
+    }
+
+    #[test]
+    fn test_orr_immediate() {
+        check_bytes("6a0940b2", |cb| orr(cb, X10, X11, A64Opnd::new_uimm(7)));
+    }
+
+    #[test]
+    fn test_orr_32b_immediate() {
+        check_bytes("6a010032", |cb| orr(cb, W10, W11, A64Opnd::new_uimm(1)));
+    }
+
+    #[test]
+    fn test_ret_none() {
+        check_bytes("c0035fd6", |cb| ret(cb, A64Opnd::None));
+    }
+
+    #[test]
+    fn test_ret_register() {
+        check_bytes("80025fd6", |cb| ret(cb, X20));
+    }
+
+    #[test]
+    fn test_stlxr() {
+        check_bytes("8bfd0ac8", |cb| stlxr(cb, W10, X11, X12));
+    }
+
+    #[test]
+    fn test_stp() {
+        check_bytes("8a2d0da9", |cb| stp(cb, X10, X11, A64Opnd::new_mem(64, X12, 208)));
+    }
+
+    #[test]
+    fn test_stp_pre() {
+        check_bytes("8a2d8da9", |cb| stp_pre(cb, X10, X11, A64Opnd::new_mem(64, X12, 208)));
+    }
+
+    #[test]
+    fn test_stp_post() {
+        check_bytes("8a2d8da8", |cb| stp_post(cb, X10, X11, A64Opnd::new_mem(64, X12, 208)));
+    }
+
+    #[test]
+    fn test_str_post() {
+        check_bytes("6a051ff8", |cb| str_post(cb, X10, A64Opnd::new_mem(64, X11, -16)));
+    }
+
+    #[test]
+    fn test_str_pre() {
+        check_bytes("6a0d1ff8", |cb| str_pre(cb, X10, A64Opnd::new_mem(64, X11, -16)));
+    }
+
+    #[test]
+    fn test_strh() {
+        check_bytes("6a190079", |cb| strh(cb, W10, A64Opnd::new_mem(64, X11, 12)));
+    }
+
+    #[test]
+    fn test_strh_pre() {
+        check_bytes("6acd0078", |cb| strh_pre(cb, W10, A64Opnd::new_mem(64, X11, 12)));
+    }
+
+    #[test]
+    fn test_strh_post() {
+        check_bytes("6ac50078", |cb| strh_post(cb, W10, A64Opnd::new_mem(64, X11, 12)));
+    }
+
+    #[test]
+    fn test_stur_64_bits() {
+        check_bytes("6a0108f8", |cb| stur(cb, X10, A64Opnd::new_mem(64, X11, 128)));
+    }
+
+    #[test]
+    fn test_stur_32_bits() {
+        check_bytes("6a0108b8", |cb| stur(cb, X10, A64Opnd::new_mem(32, X11, 128)));
+    }
+
+    #[test]
+    fn test_sub_reg() {
+        check_bytes("200002cb", |cb| sub(cb, X0, X1, X2));
+    }
+
+    #[test]
+    fn test_sub_uimm() {
+        check_bytes("201c00d1", |cb| sub(cb, X0, X1, A64Opnd::new_uimm(7)));
+    }
+
+    #[test]
+    fn test_sub_imm_positive() {
+        check_bytes("201c00d1", |cb| sub(cb, X0, X1, A64Opnd::new_imm(7)));
+    }
+
+    #[test]
+    fn test_sub_imm_negative() {
+        check_bytes("201c0091", |cb| sub(cb, X0, X1, A64Opnd::new_imm(-7)));
+    }
+
+    #[test]
+    fn test_subs_reg() {
+        check_bytes("200002eb", |cb| subs(cb, X0, X1, X2));
+    }
+
+    #[test]
+    fn test_subs_imm_positive() {
+        check_bytes("201c00f1", |cb| subs(cb, X0, X1, A64Opnd::new_imm(7)));
+    }
+
+    #[test]
+    fn test_subs_imm_negative() {
+        check_bytes("201c00b1", |cb| subs(cb, X0, X1, A64Opnd::new_imm(-7)));
+    }
+
+    #[test]
+    fn test_subs_uimm() {
+        check_bytes("201c00f1", |cb| subs(cb, X0, X1, A64Opnd::new_uimm(7)));
+    }
+
+    #[test]
+    fn test_sxtw() {
+        check_bytes("6a7d4093", |cb| sxtw(cb, X10, W11));
+    }
+
+    #[test]
+    fn test_tbnz() {
+        check_bytes("4a005037", |cb| tbnz(cb, X10, A64Opnd::UImm(10), A64Opnd::Imm(2)));
+    }
+
+    #[test]
+    fn test_tbz() {
+        check_bytes("4a005036", |cb| tbz(cb, X10, A64Opnd::UImm(10), A64Opnd::Imm(2)));
+    }
+
+    #[test]
+    fn test_tst_register() {
+        check_bytes("1f0001ea", |cb| tst(cb, X0, X1));
+    }
+
+    #[test]
+    fn test_tst_immediate() {
+        check_bytes("3f0840f2", |cb| tst(cb, X1, A64Opnd::new_uimm(7)));
+    }
+
+    #[test]
+    fn test_tst_32b_immediate() {
+        check_bytes("1f3c0072", |cb| tst(cb, W0, A64Opnd::new_uimm(0xffff)));
+    }
+}
+*/
diff --git a/zjit/src/asm/arm64/opnd.rs b/zjit/src/asm/arm64/opnd.rs
new file mode 100644
index 00000000000000..28422b747652d8
--- /dev/null
+++ b/zjit/src/asm/arm64/opnd.rs
@@ -0,0 +1,198 @@
+
+
+/// This operand represents a register.
+#[derive(Clone, Copy, Debug, Eq, Hash, PartialEq)]
+pub struct A64Reg
+{
+    // Size in bits
+    pub num_bits: u8,
+
+    // Register index number
+    pub reg_no: u8,
+}
+
+impl A64Reg {
+    pub fn with_num_bits(&self, num_bits: u8) -> Self {
+        assert!(num_bits == 8 || num_bits == 16 || num_bits == 32 || num_bits == 64);
+        Self { num_bits, reg_no: self.reg_no }
+    }
+}
+
+#[derive(Clone, Copy, Debug)]
+pub struct A64Mem
+{
+    // Size in bits
+    pub num_bits: u8,
+
+    /// Base register number
+    pub base_reg_no: u8,
+
+    /// Constant displacement from the base, not scaled
+    pub disp: i32,
+}
+
+impl A64Mem {
+    pub fn new(num_bits: u8, reg: A64Opnd, disp: i32) -> Self {
+        match reg {
+            A64Opnd::Reg(reg) => {
+                Self { num_bits, base_reg_no: reg.reg_no, disp }
+            },
+            _ => panic!("Expected register operand")
+        }
+    }
+}
+
+#[derive(Clone, Copy, Debug)]
+pub enum A64Opnd
+{
+    // Dummy operand
+    None,
+
+    // Immediate value
+    Imm(i64),
+
+    // Unsigned immediate
+    UImm(u64),
+
+    // Register
+    Reg(A64Reg),
+
+    // Memory
+    Mem(A64Mem)
+}
+
+impl A64Opnd {
+    /// Create a new immediate value operand.
+    pub fn new_imm(value: i64) -> Self {
+        A64Opnd::Imm(value)
+    }
+
+    /// Create a new unsigned immediate value operand.
+    pub fn new_uimm(value: u64) -> Self {
+        A64Opnd::UImm(value)
+    }
+
+    /// Creates a new memory operand.
+    pub fn new_mem(num_bits: u8, reg: A64Opnd, disp: i32) -> Self {
+        A64Opnd::Mem(A64Mem::new(num_bits, reg, disp))
+    }
+
+    /// Convenience function to check if this operand is a register.
+    pub fn is_reg(&self) -> bool {
+        match self {
+            A64Opnd::Reg(_) => true,
+            _ => false
+        }
+    }
+
+    /// Unwrap a register from an operand.
+    pub fn unwrap_reg(&self) -> A64Reg {
+        match self {
+            A64Opnd::Reg(reg) => *reg,
+            _ => panic!("Expected register operand")
+        }
+    }
+}
+
+// argument registers
+pub const X0_REG: A64Reg = A64Reg { num_bits: 64, reg_no: 0 };
+pub const X1_REG: A64Reg = A64Reg { num_bits: 64, reg_no: 1 };
+pub const X2_REG: A64Reg = A64Reg { num_bits: 64, reg_no: 2 };
+pub const X3_REG: A64Reg = A64Reg { num_bits: 64, reg_no: 3 };
+pub const X4_REG: A64Reg = A64Reg { num_bits: 64, reg_no: 4 };
+pub const X5_REG: A64Reg = A64Reg { num_bits: 64, reg_no: 5 };
+
+// caller-save registers
+pub const X9_REG: A64Reg = A64Reg { num_bits: 64, reg_no: 9 };
+pub const X10_REG: A64Reg = A64Reg { num_bits: 64, reg_no: 10 };
+pub const X11_REG: A64Reg = A64Reg { num_bits: 64, reg_no: 11 };
+pub const X12_REG: A64Reg = A64Reg { num_bits: 64, reg_no: 12 };
+pub const X13_REG: A64Reg = A64Reg { num_bits: 64, reg_no: 13 };
+pub const X14_REG: A64Reg = A64Reg { num_bits: 64, reg_no: 14 };
+pub const X15_REG: A64Reg = A64Reg { num_bits: 64, reg_no: 15 };
+pub const X16_REG: A64Reg = A64Reg { num_bits: 64, reg_no: 16 };
+pub const X17_REG: A64Reg = A64Reg { num_bits: 64, reg_no: 17 };
+
+// callee-save registers
+pub const X19_REG: A64Reg = A64Reg { num_bits: 64, reg_no: 19 };
+pub const X20_REG: A64Reg = A64Reg { num_bits: 64, reg_no: 20 };
+pub const X21_REG: A64Reg = A64Reg { num_bits: 64, reg_no: 21 };
+pub const X22_REG: A64Reg = A64Reg { num_bits: 64, reg_no: 22 };
+
+// link register
+pub const X30_REG: A64Reg = A64Reg { num_bits: 64, reg_no: 30 };
+
+// zero register
+pub const XZR_REG: A64Reg = A64Reg { num_bits: 64, reg_no: 31 };
+
+// 64-bit registers
+pub const X0: A64Opnd = A64Opnd::Reg(X0_REG);
+pub const X1: A64Opnd = A64Opnd::Reg(X1_REG);
+pub const X2: A64Opnd = A64Opnd::Reg(X2_REG);
+pub const X3: A64Opnd = A64Opnd::Reg(X3_REG);
+pub const X4: A64Opnd = A64Opnd::Reg(X4_REG);
+pub const X5: A64Opnd = A64Opnd::Reg(X5_REG);
+pub const X6: A64Opnd = A64Opnd::Reg(A64Reg { num_bits: 64, reg_no: 6 });
+pub const X7: A64Opnd = A64Opnd::Reg(A64Reg { num_bits: 64, reg_no: 7 });
+pub const X8: A64Opnd = A64Opnd::Reg(A64Reg { num_bits: 64, reg_no: 8 });
+pub const X9: A64Opnd = A64Opnd::Reg(X9_REG);
+pub const X10: A64Opnd = A64Opnd::Reg(X10_REG);
+pub const X11: A64Opnd = A64Opnd::Reg(X11_REG);
+pub const X12: A64Opnd = A64Opnd::Reg(X12_REG);
+pub const X13: A64Opnd = A64Opnd::Reg(X13_REG);
+pub const X14: A64Opnd = A64Opnd::Reg(X14_REG);
+pub const X15: A64Opnd = A64Opnd::Reg(X15_REG);
+pub const X16: A64Opnd = A64Opnd::Reg(A64Reg { num_bits: 64, reg_no: 16 });
+pub const X17: A64Opnd = A64Opnd::Reg(A64Reg { num_bits: 64, reg_no: 17 });
+pub const X18: A64Opnd = A64Opnd::Reg(A64Reg { num_bits: 64, reg_no: 18 });
+pub const X19: A64Opnd = A64Opnd::Reg(X19_REG);
+pub const X20: A64Opnd = A64Opnd::Reg(X20_REG);
+pub const X21: A64Opnd = A64Opnd::Reg(X21_REG);
+pub const X22: A64Opnd = A64Opnd::Reg(X22_REG);
+pub const X23: A64Opnd = A64Opnd::Reg(A64Reg { num_bits: 64, reg_no: 23 });
+pub const X24: A64Opnd = A64Opnd::Reg(A64Reg { num_bits: 64, reg_no: 24 });
+pub const X25: A64Opnd = A64Opnd::Reg(A64Reg { num_bits: 64, reg_no: 25 });
+pub const X26: A64Opnd = A64Opnd::Reg(A64Reg { num_bits: 64, reg_no: 26 });
+pub const X27: A64Opnd = A64Opnd::Reg(A64Reg { num_bits: 64, reg_no: 27 });
+pub const X28: A64Opnd = A64Opnd::Reg(A64Reg { num_bits: 64, reg_no: 28 });
+pub const X29: A64Opnd = A64Opnd::Reg(A64Reg { num_bits: 64, reg_no: 29 });
+pub const X30: A64Opnd = A64Opnd::Reg(X30_REG);
+pub const X31: A64Opnd = A64Opnd::Reg(XZR_REG);
+
+// 32-bit registers
+pub const W0: A64Opnd = A64Opnd::Reg(A64Reg { num_bits: 32, reg_no: 0 });
+pub const W1: A64Opnd = A64Opnd::Reg(A64Reg { num_bits: 32, reg_no: 1 });
+pub const W2: A64Opnd = A64Opnd::Reg(A64Reg { num_bits: 32, reg_no: 2 });
+pub const W3: A64Opnd = A64Opnd::Reg(A64Reg { num_bits: 32, reg_no: 3 });
+pub const W4: A64Opnd = A64Opnd::Reg(A64Reg { num_bits: 32, reg_no: 4 });
+pub const W5: A64Opnd = A64Opnd::Reg(A64Reg { num_bits: 32, reg_no: 5 });
+pub const W6: A64Opnd = A64Opnd::Reg(A64Reg { num_bits: 32, reg_no: 6 });
+pub const W7: A64Opnd = A64Opnd::Reg(A64Reg { num_bits: 32, reg_no: 7 });
+pub const W8: A64Opnd = A64Opnd::Reg(A64Reg { num_bits: 32, reg_no: 8 });
+pub const W9: A64Opnd = A64Opnd::Reg(A64Reg { num_bits: 32, reg_no: 9 });
+pub const W10: A64Opnd = A64Opnd::Reg(A64Reg { num_bits: 32, reg_no: 10 });
+pub const W11: A64Opnd = A64Opnd::Reg(A64Reg { num_bits: 32, reg_no: 11 });
+pub const W12: A64Opnd = A64Opnd::Reg(A64Reg { num_bits: 32, reg_no: 12 });
+pub const W13: A64Opnd = A64Opnd::Reg(A64Reg { num_bits: 32, reg_no: 13 });
+pub const W14: A64Opnd = A64Opnd::Reg(A64Reg { num_bits: 32, reg_no: 14 });
+pub const W15: A64Opnd = A64Opnd::Reg(A64Reg { num_bits: 32, reg_no: 15 });
+pub const W16: A64Opnd = A64Opnd::Reg(A64Reg { num_bits: 32, reg_no: 16 });
+pub const W17: A64Opnd = A64Opnd::Reg(A64Reg { num_bits: 32, reg_no: 17 });
+pub const W18: A64Opnd = A64Opnd::Reg(A64Reg { num_bits: 32, reg_no: 18 });
+pub const W19: A64Opnd = A64Opnd::Reg(A64Reg { num_bits: 32, reg_no: 19 });
+pub const W20: A64Opnd = A64Opnd::Reg(A64Reg { num_bits: 32, reg_no: 20 });
+pub const W21: A64Opnd = A64Opnd::Reg(A64Reg { num_bits: 32, reg_no: 21 });
+pub const W22: A64Opnd = A64Opnd::Reg(A64Reg { num_bits: 32, reg_no: 22 });
+pub const W23: A64Opnd = A64Opnd::Reg(A64Reg { num_bits: 32, reg_no: 23 });
+pub const W24: A64Opnd = A64Opnd::Reg(A64Reg { num_bits: 32, reg_no: 24 });
+pub const W25: A64Opnd = A64Opnd::Reg(A64Reg { num_bits: 32, reg_no: 25 });
+pub const W26: A64Opnd = A64Opnd::Reg(A64Reg { num_bits: 32, reg_no: 26 });
+pub const W27: A64Opnd = A64Opnd::Reg(A64Reg { num_bits: 32, reg_no: 27 });
+pub const W28: A64Opnd = A64Opnd::Reg(A64Reg { num_bits: 32, reg_no: 28 });
+pub const W29: A64Opnd = A64Opnd::Reg(A64Reg { num_bits: 32, reg_no: 29 });
+pub const W30: A64Opnd = A64Opnd::Reg(A64Reg { num_bits: 32, reg_no: 30 });
+pub const W31: A64Opnd = A64Opnd::Reg(A64Reg { num_bits: 32, reg_no: 31 });
+
+// C argument registers
+pub const C_ARG_REGS: [A64Opnd; 4] = [X0, X1, X2, X3];
+pub const C_ARG_REGREGS: [A64Reg; 4] = [X0_REG, X1_REG, X2_REG, X3_REG];
diff --git a/zjit/src/asm/mod.rs b/zjit/src/asm/mod.rs
new file mode 100644
index 00000000000000..3b9b8a26f7778f
--- /dev/null
+++ b/zjit/src/asm/mod.rs
@@ -0,0 +1,405 @@
+use std::collections::BTreeMap;
+use std::fmt;
+use std::rc::Rc;
+use std::cell::RefCell;
+use std::mem;
+use crate::virtualmem::*;
+
+// Lots of manual vertical alignment in there that rustfmt doesn't handle well.
+#[rustfmt::skip]
+pub mod x86_64;
+pub mod arm64;
+
+/// Index to a label created by cb.new_label()
+#[derive(Copy, Clone, Debug, Eq, PartialEq)]
+pub struct Label(pub usize);
+
+/// Reference to an ASM label
+#[derive(Clone)]
+pub struct LabelRef {
+    // Position in the code block where the label reference exists
+    pos: usize,
+
+    // Label which this refers to
+    label: Label,
+
+    /// The number of bytes that this label reference takes up in the memory.
+    /// It's necessary to know this ahead of time so that when we come back to
+    /// patch it it takes the same amount of space.
+    num_bytes: usize,
+
+    /// The object that knows how to encode the branch instruction.
+    encode: fn(&mut CodeBlock, i64, i64)
+}
+
+/// Block of memory into which instructions can be assembled
+pub struct CodeBlock {
+    // Memory for storing the encoded instructions
+    mem_block: Rc<RefCell<VirtualMem>>,
+
+    // Memory block size
+    mem_size: usize,
+
+    // Current writing position
+    write_pos: usize,
+
+    // Table of registered label addresses
+    label_addrs: Vec<usize>,
+
+    // Table of registered label names
+    label_names: Vec<String>,
+
+    // References to labels
+    label_refs: Vec<LabelRef>,
+
+    // A switch for keeping comments. They take up memory.
+    keep_comments: bool,
+
+    // Comments for assembly instructions, if that feature is enabled
+    asm_comments: BTreeMap<usize, Vec<String>>,
+
+    // Set if the CodeBlock is unable to output some instructions,
+    // for example, when there is not enough space or when a jump
+    // target is too far away.
+    dropped_bytes: bool,
+}
+
+impl CodeBlock {
+    /// Make a new CodeBlock
+    pub fn new(mem_block: Rc<RefCell<VirtualMem>>, keep_comments: bool) -> Self {
+        let mem_size = mem_block.borrow().virtual_region_size();
+        Self {
+            mem_block,
+            mem_size,
+            write_pos: 0,
+            label_addrs: Vec::new(),
+            label_names: Vec::new(),
+            label_refs: Vec::new(),
+            keep_comments,
+            asm_comments: BTreeMap::new(),
+            dropped_bytes: false,
+        }
+    }
+
+    /// Add an assembly comment if the feature is on.
+    pub fn add_comment(&mut self, comment: &str) {
+        if !self.keep_comments {
+            return;
+        }
+
+        let cur_ptr = self.get_write_ptr().raw_addr(self);
+
+        // If there's no current list of comments for this line number, add one.
+        let this_line_comments = self.asm_comments.entry(cur_ptr).or_default();
+
+        // Unless this comment is the same as the last one at this same line, add it.
+        if this_line_comments.last().map(String::as_str) != Some(comment) {
+            this_line_comments.push(comment.to_string());
+        }
+    }
+
+    pub fn comments_at(&self, pos: usize) -> Option<&Vec<String>> {
+        self.asm_comments.get(&pos)
+    }
+
+    pub fn get_write_pos(&self) -> usize {
+        self.write_pos
+    }
+
+    pub fn write_mem(&self, write_ptr: CodePtr, byte: u8) -> Result<(), WriteError> {
+        self.mem_block.borrow_mut().write_byte(write_ptr, byte)
+    }
+
+    /// Get a (possibly dangling) direct pointer to the current write position
+    pub fn get_write_ptr(&self) -> CodePtr {
+        self.get_ptr(self.write_pos)
+    }
+
+    /// Set the current write position from a pointer
+    pub fn set_write_ptr(&mut self, code_ptr: CodePtr) {
+        let pos = code_ptr.as_offset() - self.mem_block.borrow().start_ptr().as_offset();
+        self.write_pos = pos.try_into().unwrap();
+    }
+
+    /// Invoke a callback with write_ptr temporarily adjusted to a given address
+    pub fn with_write_ptr(&mut self, code_ptr: CodePtr, callback: impl Fn(&mut CodeBlock)) {
+        // Temporarily update the write_pos. Ignore the dropped_bytes flag at the old address.
+        let old_write_pos = self.write_pos;
+        let old_dropped_bytes = self.dropped_bytes;
+        self.set_write_ptr(code_ptr);
+        self.dropped_bytes = false;
+
+        // Invoke the callback
+        callback(self);
+
+        // Restore the original write_pos and dropped_bytes flag.
+        self.dropped_bytes = old_dropped_bytes;
+        self.write_pos = old_write_pos;
+    }
+
+    /// Get a (possibly dangling) direct pointer into the executable memory block
+    pub fn get_ptr(&self, offset: usize) -> CodePtr {
+        self.mem_block.borrow().start_ptr().add_bytes(offset)
+    }
+
+    /// Write a single byte at the current position.
+    pub fn write_byte(&mut self, byte: u8) {
+        let write_ptr = self.get_write_ptr();
+        // TODO: check has_capacity()
+        if self.mem_block.borrow_mut().write_byte(write_ptr, byte).is_ok() {
+            self.write_pos += 1;
+        } else {
+            self.dropped_bytes = true;
+        }
+    }
+
+    /// Write multiple bytes starting from the current position.
+    pub fn write_bytes(&mut self, bytes: &[u8]) {
+        for byte in bytes {
+            self.write_byte(*byte);
+        }
+    }
+
+    /// Write an integer over the given number of bits at the current position.
+    pub fn write_int(&mut self, val: u64, num_bits: u32) {
+        assert!(num_bits > 0);
+        assert!(num_bits % 8 == 0);
+
+        // Switch on the number of bits
+        match num_bits {
+            8 => self.write_byte(val as u8),
+            16 => self.write_bytes(&[(val & 0xff) as u8, ((val >> 8) & 0xff) as u8]),
+            32 => self.write_bytes(&[
+                (val & 0xff) as u8,
+                ((val >> 8) & 0xff) as u8,
+                ((val >> 16) & 0xff) as u8,
+                ((val >> 24) & 0xff) as u8,
+            ]),
+            _ => {
+                let mut cur = val;
+
+                // Write out the bytes
+                for _byte in 0..(num_bits / 8) {
+                    self.write_byte((cur & 0xff) as u8);
+                    cur >>= 8;
+                }
+            }
+        }
+    }
+
+    /// Check if bytes have been dropped (unwritten because of insufficient space)
+    pub fn has_dropped_bytes(&self) -> bool {
+        self.dropped_bytes
+    }
+
+    /// Allocate a new label with a given name
+    pub fn new_label(&mut self, name: String) -> Label {
+        assert!(!name.contains(' '), "use underscores in label names, not spaces");
+
+        // This label doesn't have an address yet
+        self.label_addrs.push(0);
+        self.label_names.push(name);
+
+        Label(self.label_addrs.len() - 1)
+    }
+
+    /// Write a label at the current address
+    pub fn write_label(&mut self, label: Label) {
+        self.label_addrs[label.0] = self.write_pos;
+    }
+
+    // Add a label reference at the current write position
+    pub fn label_ref(&mut self, label: Label, num_bytes: usize, encode: fn(&mut CodeBlock, i64, i64)) {
+        assert!(label.0 < self.label_addrs.len());
+
+        // Keep track of the reference
+        self.label_refs.push(LabelRef { pos: self.write_pos, label, num_bytes, encode });
+
+        // Move past however many bytes the instruction takes up
+        if self.write_pos + num_bytes < self.mem_size {
+            self.write_pos += num_bytes;
+        } else {
+            self.dropped_bytes = true; // retry emitting the Insn after next_page
+        }
+    }
+
+    // Link internal label references
+    pub fn link_labels(&mut self) {
+        let orig_pos = self.write_pos;
+
+        // For each label reference
+        for label_ref in mem::take(&mut self.label_refs) {
+            let ref_pos = label_ref.pos;
+            let label_idx = label_ref.label.0;
+            assert!(ref_pos < self.mem_size);
+
+            let label_addr = self.label_addrs[label_idx];
+            assert!(label_addr < self.mem_size);
+
+            self.write_pos = ref_pos;
+            (label_ref.encode)(self, (ref_pos + label_ref.num_bytes) as i64, label_addr as i64);
+
+            // Assert that we've written the same number of bytes that we
+            // expected to have written.
+            assert!(self.write_pos == ref_pos + label_ref.num_bytes);
+        }
+
+        self.write_pos = orig_pos;
+
+        // Clear the label positions and references
+        self.label_addrs.clear();
+        self.label_names.clear();
+        assert!(self.label_refs.is_empty());
+    }
+
+    /// Convert a Label to CodePtr
+    pub fn resolve_label(&self, label: Label) -> CodePtr {
+        self.get_ptr(self.label_addrs[label.0])
+    }
+
+    pub fn clear_labels(&mut self) {
+        self.label_addrs.clear();
+        self.label_names.clear();
+        self.label_refs.clear();
+    }
+
+    /// Make all the code in the region executable. Call this at the end of a write session.
+    pub fn mark_all_executable(&mut self) {
+        self.mem_block.borrow_mut().mark_all_executable();
+    }
+}
+
+/// Produce hex string output from the bytes in a code block
+impl fmt::LowerHex for CodeBlock {
+    fn fmt(&self, fmtr: &mut fmt::Formatter) -> fmt::Result {
+        for pos in 0..self.write_pos {
+            let mem_block = &*self.mem_block.borrow();
+            let byte = unsafe { mem_block.start_ptr().raw_ptr(mem_block).add(pos).read() };
+            fmtr.write_fmt(format_args!("{:02x}", byte))?;
+        }
+        Ok(())
+    }
+}
+
+#[cfg(test)]
+impl CodeBlock {
+    /// Stubbed CodeBlock for testing. Can't execute generated code.
+    pub fn new_dummy() -> Self {
+        use std::ptr::NonNull;
+        use crate::virtualmem::*;
+        use crate::virtualmem::tests::TestingAllocator;
+
+        let mem_size = 1024;
+        let alloc = TestingAllocator::new(mem_size);
+        let mem_start: *const u8 = alloc.mem_start();
+        let virt_mem = VirtualMem::new(alloc, 1, NonNull::new(mem_start as *mut u8).unwrap(), mem_size, 128 * 1024 * 1024);
+
+        Self::new(Rc::new(RefCell::new(virt_mem)), false)
+    }
+}
+
+impl crate::virtualmem::CodePtrBase for CodeBlock {
+    fn base_ptr(&self) -> std::ptr::NonNull<u8> {
+        self.mem_block.borrow().base_ptr()
+    }
+}
+
+/// Compute the number of bits needed to encode a signed value
+pub fn imm_num_bits(imm: i64) -> u8
+{
+    // Compute the smallest size this immediate fits in
+    if imm >= i8::MIN.into() && imm <= i8::MAX.into() {
+        return 8;
+    }
+    if imm >= i16::MIN.into() && imm <= i16::MAX.into() {
+        return 16;
+    }
+    if imm >= i32::MIN.into() && imm <= i32::MAX.into() {
+        return 32;
+    }
+
+    return 64;
+}
+
+/// Compute the number of bits needed to encode an unsigned value
+pub fn uimm_num_bits(uimm: u64) -> u8
+{
+    // Compute the smallest size this immediate fits in
+    if uimm <= u8::MAX.into() {
+        return 8;
+    }
+    else if uimm <= u16::MAX.into() {
+        return 16;
+    }
+    else if uimm <= u32::MAX.into() {
+        return 32;
+    }
+
+    return 64;
+}
+
+/*
+#[cfg(test)]
+mod tests
+{
+    use super::*;
+
+    #[test]
+    fn test_imm_num_bits()
+    {
+        assert_eq!(imm_num_bits(i8::MIN.into()), 8);
+        assert_eq!(imm_num_bits(i8::MAX.into()), 8);
+
+        assert_eq!(imm_num_bits(i16::MIN.into()), 16);
+        assert_eq!(imm_num_bits(i16::MAX.into()), 16);
+
+        assert_eq!(imm_num_bits(i32::MIN.into()), 32);
+        assert_eq!(imm_num_bits(i32::MAX.into()), 32);
+
+        assert_eq!(imm_num_bits(i64::MIN), 64);
+        assert_eq!(imm_num_bits(i64::MAX), 64);
+    }
+
+    #[test]
+    fn test_uimm_num_bits() {
+        assert_eq!(uimm_num_bits(u8::MIN.into()), 8);
+        assert_eq!(uimm_num_bits(u8::MAX.into()), 8);
+
+        assert_eq!(uimm_num_bits(((u8::MAX as u16) + 1).into()), 16);
+        assert_eq!(uimm_num_bits(u16::MAX.into()), 16);
+
+        assert_eq!(uimm_num_bits(((u16::MAX as u32) + 1).into()), 32);
+        assert_eq!(uimm_num_bits(u32::MAX.into()), 32);
+
+        assert_eq!(uimm_num_bits((u32::MAX as u64) + 1), 64);
+        assert_eq!(uimm_num_bits(u64::MAX), 64);
+    }
+
+    #[test]
+    fn test_code_size() {
+        // Write 4 bytes in the first page
+        let mut cb = CodeBlock::new_dummy(CodeBlock::PREFERRED_CODE_PAGE_SIZE * 2);
+        cb.write_bytes(&[0, 0, 0, 0]);
+        assert_eq!(cb.code_size(), 4);
+
+        // Moving to the next page should not increase code_size
+        cb.next_page(cb.get_write_ptr(), |_, _| {});
+        assert_eq!(cb.code_size(), 4);
+
+        // Write 4 bytes in the second page
+        cb.write_bytes(&[0, 0, 0, 0]);
+        assert_eq!(cb.code_size(), 8);
+
+        // Rewrite 4 bytes in the first page
+        let old_write_pos = cb.get_write_pos();
+        cb.set_pos(0);
+        cb.write_bytes(&[1, 1, 1, 1]);
+
+        // Moving from an old page to the next page should not increase code_size
+        cb.next_page(cb.get_write_ptr(), |_, _| {});
+        cb.set_pos(old_write_pos);
+        assert_eq!(cb.code_size(), 8);
+    }
+}
+
+*/
diff --git a/zjit/src/asm/x86_64/mod.rs b/zjit/src/asm/x86_64/mod.rs
new file mode 100644
index 00000000000000..fea66c8a3b6e0e
--- /dev/null
+++ b/zjit/src/asm/x86_64/mod.rs
@@ -0,0 +1,1453 @@
+#![allow(dead_code)] // For instructions we don't currently generate
+
+use crate::asm::*;
+
+// Import the assembler tests module
+mod tests;
+
+#[derive(Clone, Copy, Debug, Eq, PartialEq)]
+pub struct X86Imm
+{
+    // Size in bits
+    pub num_bits: u8,
+
+    // The value of the immediate
+    pub value: i64
+}
+
+#[derive(Clone, Copy, Debug, Eq, PartialEq)]
+pub struct X86UImm
+{
+    // Size in bits
+    pub num_bits: u8,
+
+    // The value of the immediate
+    pub value: u64
+}
+
+#[derive(Clone, Copy, Debug, Eq, Hash, PartialEq)]
+pub enum RegType
+{
+    GP,
+    //FP,
+    //XMM,
+    IP,
+}
+
+#[derive(Clone, Copy, Debug, Eq, Hash, PartialEq)]
+pub struct X86Reg
+{
+    // Size in bits
+    pub num_bits: u8,
+
+    // Register type
+    pub reg_type: RegType,
+
+    // Register index number
+    pub reg_no: u8,
+}
+
+#[derive(Clone, Copy, Debug)]
+pub struct X86Mem
+{
+    // Size in bits
+    pub num_bits: u8,
+
+    /// Base register number
+    pub base_reg_no: u8,
+
+    /// Index register number
+    pub idx_reg_no: Option<u8>,
+
+    /// SIB scale exponent value (power of two, two bits)
+    pub scale_exp: u8,
+
+    /// Constant displacement from the base, not scaled
+    pub disp: i32,
+}
+
+#[derive(Clone, Copy, Debug)]
+pub enum X86Opnd
+{
+    // Dummy operand
+    None,
+
+    // Immediate value
+    Imm(X86Imm),
+
+    // Unsigned immediate
+    UImm(X86UImm),
+
+    // General-purpose register
+    Reg(X86Reg),
+
+    // Memory location
+    Mem(X86Mem),
+
+    // IP-relative memory location
+    IPRel(i32)
+}
+
+impl X86Reg {
+    pub fn with_num_bits(&self, num_bits: u8) -> Self {
+        assert!(
+            num_bits == 8 ||
+            num_bits == 16 ||
+            num_bits == 32 ||
+            num_bits == 64
+        );
+        Self {
+            num_bits,
+            reg_type: self.reg_type,
+            reg_no: self.reg_no
+        }
+    }
+}
+
+impl X86Opnd {
+    fn rex_needed(&self) -> bool {
+        match self {
+            X86Opnd::None => false,
+            X86Opnd::Imm(_) => false,
+            X86Opnd::UImm(_) => false,
+            X86Opnd::Reg(reg) => reg.reg_no > 7 || reg.num_bits == 8 && reg.reg_no >= 4,
+            X86Opnd::Mem(mem) => mem.base_reg_no > 7 || (mem.idx_reg_no.unwrap_or(0) > 7),
+            X86Opnd::IPRel(_) => false
+        }
+    }
+
+    // Check if an SIB byte is needed to encode this operand
+    fn sib_needed(&self) -> bool {
+        match self {
+            X86Opnd::Mem(mem) => {
+                mem.idx_reg_no.is_some() ||
+                mem.base_reg_no == RSP_REG_NO ||
+                mem.base_reg_no == R12_REG_NO
+            },
+            _ => false
+        }
+    }
+
+    fn disp_size(&self) -> u32 {
+        match self {
+            X86Opnd::IPRel(_) => 32,
+            X86Opnd::Mem(mem) => {
+                if mem.disp != 0 {
+                    // Compute the required displacement size
+                    let num_bits = imm_num_bits(mem.disp.into());
+                    if num_bits > 32 {
+                        panic!("displacement does not fit in 32 bits");
+                    }
+
+                    // x86 can only encode 8-bit and 32-bit displacements
+                    if num_bits == 16 { 32 } else { 8 }
+                } else if mem.base_reg_no == RBP_REG_NO || mem.base_reg_no == R13_REG_NO {
+                    // If EBP or RBP or R13 is used as the base, displacement must be encoded
+                    8
+                } else {
+                    0
+                }
+            },
+            _ => 0
+        }
+    }
+
+    pub fn num_bits(&self) -> u8 {
+        match self {
+            X86Opnd::Reg(reg) => reg.num_bits,
+            X86Opnd::Imm(imm) => imm.num_bits,
+            X86Opnd::UImm(uimm) => uimm.num_bits,
+            X86Opnd::Mem(mem) => mem.num_bits,
+            _ => unreachable!()
+        }
+    }
+
+    pub fn is_some(&self) -> bool {
+        match self {
+            X86Opnd::None => false,
+            _ => true
+        }
+    }
+
+}
+
+// Instruction pointer
+pub const RIP: X86Opnd = X86Opnd::Reg(X86Reg { num_bits: 64, reg_type: RegType::IP, reg_no: 5 });
+
+// 64-bit GP registers
+const RAX_REG_NO: u8 = 0;
+const RSP_REG_NO: u8 = 4;
+const RBP_REG_NO: u8 = 5;
+const R12_REG_NO: u8 = 12;
+const R13_REG_NO: u8 = 13;
+
+pub const RAX_REG: X86Reg = X86Reg { num_bits: 64, reg_type: RegType::GP, reg_no: RAX_REG_NO };
+pub const RCX_REG: X86Reg = X86Reg { num_bits: 64, reg_type: RegType::GP, reg_no: 1 };
+pub const RDX_REG: X86Reg = X86Reg { num_bits: 64, reg_type: RegType::GP, reg_no: 2 };
+pub const RBX_REG: X86Reg = X86Reg { num_bits: 64, reg_type: RegType::GP, reg_no: 3 };
+pub const RSP_REG: X86Reg = X86Reg { num_bits: 64, reg_type: RegType::GP, reg_no: RSP_REG_NO };
+pub const RBP_REG: X86Reg = X86Reg { num_bits: 64, reg_type: RegType::GP, reg_no: RBP_REG_NO };
+pub const RSI_REG: X86Reg = X86Reg { num_bits: 64, reg_type: RegType::GP, reg_no: 6 };
+pub const RDI_REG: X86Reg = X86Reg { num_bits: 64, reg_type: RegType::GP, reg_no: 7 };
+pub const R8_REG:  X86Reg = X86Reg { num_bits: 64, reg_type: RegType::GP, reg_no: 8 };
+pub const R9_REG:  X86Reg = X86Reg { num_bits: 64, reg_type: RegType::GP, reg_no: 9 };
+pub const R10_REG: X86Reg = X86Reg { num_bits: 64, reg_type: RegType::GP, reg_no: 10 };
+pub const R11_REG: X86Reg = X86Reg { num_bits: 64, reg_type: RegType::GP, reg_no: 11 };
+pub const R12_REG: X86Reg = X86Reg { num_bits: 64, reg_type: RegType::GP, reg_no: R12_REG_NO };
+pub const R13_REG: X86Reg = X86Reg { num_bits: 64, reg_type: RegType::GP, reg_no: R13_REG_NO };
+pub const R14_REG: X86Reg = X86Reg { num_bits: 64, reg_type: RegType::GP, reg_no: 14 };
+pub const R15_REG: X86Reg = X86Reg { num_bits: 64, reg_type: RegType::GP, reg_no: 15 };
+
+pub const RAX: X86Opnd  = X86Opnd::Reg(RAX_REG);
+pub const RCX: X86Opnd  = X86Opnd::Reg(RCX_REG);
+pub const RDX: X86Opnd  = X86Opnd::Reg(RDX_REG);
+pub const RBX: X86Opnd  = X86Opnd::Reg(RBX_REG);
+pub const RSP: X86Opnd  = X86Opnd::Reg(RSP_REG);
+pub const RBP: X86Opnd  = X86Opnd::Reg(RBP_REG);
+pub const RSI: X86Opnd  = X86Opnd::Reg(RSI_REG);
+pub const RDI: X86Opnd  = X86Opnd::Reg(RDI_REG);
+pub const R8:  X86Opnd  = X86Opnd::Reg(R8_REG);
+pub const R9:  X86Opnd  = X86Opnd::Reg(R9_REG);
+pub const R10: X86Opnd  = X86Opnd::Reg(R10_REG);
+pub const R11: X86Opnd  = X86Opnd::Reg(R11_REG);
+pub const R12: X86Opnd  = X86Opnd::Reg(R12_REG);
+pub const R13: X86Opnd  = X86Opnd::Reg(R13_REG);
+pub const R14: X86Opnd  = X86Opnd::Reg(R14_REG);
+pub const R15: X86Opnd  = X86Opnd::Reg(R15_REG);
+
+// 32-bit GP registers
+pub const EAX: X86Opnd  = X86Opnd::Reg(X86Reg { num_bits: 32, reg_type: RegType::GP, reg_no: 0 });
+pub const ECX: X86Opnd  = X86Opnd::Reg(X86Reg { num_bits: 32, reg_type: RegType::GP, reg_no: 1 });
+pub const EDX: X86Opnd  = X86Opnd::Reg(X86Reg { num_bits: 32, reg_type: RegType::GP, reg_no: 2 });
+pub const EBX: X86Opnd  = X86Opnd::Reg(X86Reg { num_bits: 32, reg_type: RegType::GP, reg_no: 3 });
+pub const ESP: X86Opnd  = X86Opnd::Reg(X86Reg { num_bits: 32, reg_type: RegType::GP, reg_no: 4 });
+pub const EBP: X86Opnd  = X86Opnd::Reg(X86Reg { num_bits: 32, reg_type: RegType::GP, reg_no: 5 });
+pub const ESI: X86Opnd  = X86Opnd::Reg(X86Reg { num_bits: 32, reg_type: RegType::GP, reg_no: 6 });
+pub const EDI: X86Opnd  = X86Opnd::Reg(X86Reg { num_bits: 32, reg_type: RegType::GP, reg_no: 7 });
+pub const R8D: X86Opnd  = X86Opnd::Reg(X86Reg { num_bits: 32, reg_type: RegType::GP, reg_no: 8 });
+pub const R9D: X86Opnd  = X86Opnd::Reg(X86Reg { num_bits: 32, reg_type: RegType::GP, reg_no: 9 });
+pub const R10D: X86Opnd = X86Opnd::Reg(X86Reg { num_bits: 32, reg_type: RegType::GP, reg_no: 10 });
+pub const R11D: X86Opnd = X86Opnd::Reg(X86Reg { num_bits: 32, reg_type: RegType::GP, reg_no: 11 });
+pub const R12D: X86Opnd = X86Opnd::Reg(X86Reg { num_bits: 32, reg_type: RegType::GP, reg_no: 12 });
+pub const R13D: X86Opnd = X86Opnd::Reg(X86Reg { num_bits: 32, reg_type: RegType::GP, reg_no: 13 });
+pub const R14D: X86Opnd = X86Opnd::Reg(X86Reg { num_bits: 32, reg_type: RegType::GP, reg_no: 14 });
+pub const R15D: X86Opnd = X86Opnd::Reg(X86Reg { num_bits: 32, reg_type: RegType::GP, reg_no: 15 });
+
+// 16-bit GP registers
+pub const AX:   X86Opnd = X86Opnd::Reg(X86Reg { num_bits: 16, reg_type: RegType::GP, reg_no: 0 });
+pub const CX:   X86Opnd = X86Opnd::Reg(X86Reg { num_bits: 16, reg_type: RegType::GP, reg_no: 1 });
+pub const DX:   X86Opnd = X86Opnd::Reg(X86Reg { num_bits: 16, reg_type: RegType::GP, reg_no: 2 });
+pub const BX:   X86Opnd = X86Opnd::Reg(X86Reg { num_bits: 16, reg_type: RegType::GP, reg_no: 3 });
+//pub const SP:   X86Opnd = X86Opnd::Reg(X86Reg { num_bits: 16, reg_type: RegType::GP, reg_no: 4 });
+pub const BP:   X86Opnd = X86Opnd::Reg(X86Reg { num_bits: 16, reg_type: RegType::GP, reg_no: 5 });
+pub const SI:   X86Opnd = X86Opnd::Reg(X86Reg { num_bits: 16, reg_type: RegType::GP, reg_no: 6 });
+pub const DI:   X86Opnd = X86Opnd::Reg(X86Reg { num_bits: 16, reg_type: RegType::GP, reg_no: 7 });
+pub const R8W:  X86Opnd = X86Opnd::Reg(X86Reg { num_bits: 16, reg_type: RegType::GP, reg_no: 8 });
+pub const R9W:  X86Opnd = X86Opnd::Reg(X86Reg { num_bits: 16, reg_type: RegType::GP, reg_no: 9 });
+pub const R10W: X86Opnd = X86Opnd::Reg(X86Reg { num_bits: 16, reg_type: RegType::GP, reg_no: 10 });
+pub const R11W: X86Opnd = X86Opnd::Reg(X86Reg { num_bits: 16, reg_type: RegType::GP, reg_no: 11 });
+pub const R12W: X86Opnd = X86Opnd::Reg(X86Reg { num_bits: 16, reg_type: RegType::GP, reg_no: 12 });
+pub const R13W: X86Opnd = X86Opnd::Reg(X86Reg { num_bits: 16, reg_type: RegType::GP, reg_no: 13 });
+pub const R14W: X86Opnd = X86Opnd::Reg(X86Reg { num_bits: 16, reg_type: RegType::GP, reg_no: 14 });
+pub const R15W: X86Opnd = X86Opnd::Reg(X86Reg { num_bits: 16, reg_type: RegType::GP, reg_no: 15 });
+
+// 8-bit GP registers
+pub const AL:   X86Opnd = X86Opnd::Reg(X86Reg { num_bits: 8, reg_type: RegType::GP, reg_no: 0 });
+pub const CL:   X86Opnd = X86Opnd::Reg(X86Reg { num_bits: 8, reg_type: RegType::GP, reg_no: 1 });
+pub const DL:   X86Opnd = X86Opnd::Reg(X86Reg { num_bits: 8, reg_type: RegType::GP, reg_no: 2 });
+pub const BL:   X86Opnd = X86Opnd::Reg(X86Reg { num_bits: 8, reg_type: RegType::GP, reg_no: 3 });
+pub const SPL:  X86Opnd = X86Opnd::Reg(X86Reg { num_bits: 8, reg_type: RegType::GP, reg_no: 4 });
+pub const BPL:  X86Opnd = X86Opnd::Reg(X86Reg { num_bits: 8, reg_type: RegType::GP, reg_no: 5 });
+pub const SIL:  X86Opnd = X86Opnd::Reg(X86Reg { num_bits: 8, reg_type: RegType::GP, reg_no: 6 });
+pub const DIL:  X86Opnd = X86Opnd::Reg(X86Reg { num_bits: 8, reg_type: RegType::GP, reg_no: 7 });
+pub const R8B:  X86Opnd = X86Opnd::Reg(X86Reg { num_bits: 8, reg_type: RegType::GP, reg_no: 8 });
+pub const R9B:  X86Opnd = X86Opnd::Reg(X86Reg { num_bits: 8, reg_type: RegType::GP, reg_no: 9 });
+pub const R10B: X86Opnd = X86Opnd::Reg(X86Reg { num_bits: 8, reg_type: RegType::GP, reg_no: 10 });
+pub const R11B: X86Opnd = X86Opnd::Reg(X86Reg { num_bits: 8, reg_type: RegType::GP, reg_no: 11 });
+pub const R12B: X86Opnd = X86Opnd::Reg(X86Reg { num_bits: 8, reg_type: RegType::GP, reg_no: 12 });
+pub const R13B: X86Opnd = X86Opnd::Reg(X86Reg { num_bits: 8, reg_type: RegType::GP, reg_no: 13 });
+pub const R14B: X86Opnd = X86Opnd::Reg(X86Reg { num_bits: 8, reg_type: RegType::GP, reg_no: 14 });
+pub const R15B: X86Opnd = X86Opnd::Reg(X86Reg { num_bits: 8, reg_type: RegType::GP, reg_no: 15 });
+
+//===========================================================================
+
+/// Shorthand for memory operand with base register and displacement
+pub fn mem_opnd(num_bits: u8, base_reg: X86Opnd, disp: i32) -> X86Opnd
+{
+    let base_reg = match base_reg {
+        X86Opnd::Reg(reg) => reg,
+        _ => unreachable!()
+    };
+
+    if base_reg.reg_type == RegType::IP {
+        X86Opnd::IPRel(disp)
+    } else {
+        X86Opnd::Mem(
+            X86Mem {
+                num_bits: num_bits,
+                base_reg_no: base_reg.reg_no,
+                idx_reg_no: None,
+                scale_exp: 0,
+                disp: disp,
+            }
+        )
+    }
+}
+
+/// Memory operand with SIB (Scale Index Base) indexing
+pub fn mem_opnd_sib(num_bits: u8, base_opnd: X86Opnd, index_opnd: X86Opnd, scale: i32, disp: i32) -> X86Opnd {
+    if let (X86Opnd::Reg(base_reg), X86Opnd::Reg(index_reg)) = (base_opnd, index_opnd) {
+        let scale_exp: u8 = match scale {
+            8 => 3,
+            4 => 2,
+            2 => 1,
+            1 => 0,
+            _ => unreachable!()
+        };
+
+        X86Opnd::Mem(X86Mem {
+            num_bits,
+            base_reg_no: base_reg.reg_no,
+            idx_reg_no: Some(index_reg.reg_no),
+            scale_exp,
+            disp
+        })
+    } else {
+        unreachable!()
+    }
+}
+
+/*
+// Struct member operand
+#define member_opnd(base_reg, struct_type, member_name) mem_opnd( \
+    8 * sizeof(((struct_type*)0)->member_name), \
+    base_reg,                                   \
+    offsetof(struct_type, member_name)          \
+)
+
+// Struct member operand with an array index
+#define member_opnd_idx(base_reg, struct_type, member_name, idx) mem_opnd( \
+    8 * sizeof(((struct_type*)0)->member_name[0]),     \
+    base_reg,                                       \
+    (offsetof(struct_type, member_name) +           \
+     sizeof(((struct_type*)0)->member_name[0]) * idx)  \
+)
+*/
+
+/*
+// TODO: this should be a method, X86Opnd.resize() or X86Opnd.subreg()
+static x86opnd_t resize_opnd(x86opnd_t opnd, uint32_t num_bits)
+{
+    assert (num_bits % 8 == 0);
+    x86opnd_t sub = opnd;
+    sub.num_bits = num_bits;
+    return sub;
+}
+*/
+
+pub fn imm_opnd(value: i64) -> X86Opnd
+{
+    X86Opnd::Imm(X86Imm { num_bits: imm_num_bits(value), value })
+}
+
+pub fn uimm_opnd(value: u64) -> X86Opnd
+{
+    X86Opnd::UImm(X86UImm { num_bits: uimm_num_bits(value), value })
+}
+
+pub fn const_ptr_opnd(ptr: *const u8) -> X86Opnd
+{
+    uimm_opnd(ptr as u64)
+}
+
+/// Write the REX byte
+fn write_rex(cb: &mut CodeBlock, w_flag: bool, reg_no: u8, idx_reg_no: u8, rm_reg_no: u8) {
+    // 0 1 0 0 w r x b
+    // w - 64-bit operand size flag
+    // r - MODRM.reg extension
+    // x - SIB.index extension
+    // b - MODRM.rm or SIB.base extension
+    let w: u8 = if w_flag { 1 } else { 0 };
+    let r: u8 = if (reg_no & 8) > 0 { 1 } else { 0 };
+    let x: u8 = if (idx_reg_no & 8) > 0 { 1 } else { 0 };
+    let b: u8 = if (rm_reg_no & 8) > 0 { 1 } else { 0 };
+
+    // Encode and write the REX byte
+    cb.write_byte(0x40 + (w << 3) + (r << 2) + (x << 1) + (b));
+}
+
+/// Write an opcode byte with an embedded register operand
+fn write_opcode(cb: &mut CodeBlock, opcode: u8, reg: X86Reg) {
+    let op_byte: u8 = opcode | (reg.reg_no & 7);
+    cb.write_byte(op_byte);
+}
+
+/// Encode an RM instruction
+fn write_rm(cb: &mut CodeBlock, sz_pref: bool, rex_w: bool, r_opnd: X86Opnd, rm_opnd: X86Opnd, op_ext: Option<u8>, bytes: &[u8]) {
+    let op_len = bytes.len();
+    assert!(op_len > 0 && op_len <= 3);
+    assert!(matches!(r_opnd, X86Opnd::Reg(_) | X86Opnd::None), "Can only encode an RM instruction with a register or a none");
+
+    // Flag to indicate the REX prefix is needed
+    let need_rex = rex_w || r_opnd.rex_needed() || rm_opnd.rex_needed();
+
+    // Flag to indicate SIB byte is needed
+    let need_sib = r_opnd.sib_needed() || rm_opnd.sib_needed();
+
+    // Add the operand-size prefix, if needed
+    if sz_pref {
+        cb.write_byte(0x66);
+    }
+
+    // Add the REX prefix, if needed
+    if need_rex {
+        // 0 1 0 0 w r x b
+        // w - 64-bit operand size flag
+        // r - MODRM.reg extension
+        // x - SIB.index extension
+        // b - MODRM.rm or SIB.base extension
+
+        let w = if rex_w { 1 } else { 0 };
+        let r = match r_opnd {
+            X86Opnd::None => 0,
+            X86Opnd::Reg(reg) => if (reg.reg_no & 8) > 0 { 1 } else { 0 },
+            _ => unreachable!()
+        };
+
+        let x = match (need_sib, rm_opnd) {
+            (true, X86Opnd::Mem(mem)) => if (mem.idx_reg_no.unwrap_or(0) & 8) > 0 { 1 } else { 0 },
+            _ => 0
+        };
+
+        let b = match rm_opnd {
+            X86Opnd::Reg(reg) => if (reg.reg_no & 8) > 0 { 1 } else { 0 },
+            X86Opnd::Mem(mem) => if (mem.base_reg_no & 8) > 0 { 1 } else { 0 },
+            _ => 0
+        };
+
+        // Encode and write the REX byte
+        let rex_byte: u8 = 0x40 + (w << 3) + (r << 2) + (x << 1) + (b);
+        cb.write_byte(rex_byte);
+    }
+
+    // Write the opcode bytes to the code block
+    for byte in bytes {
+        cb.write_byte(*byte)
+    }
+
+    // MODRM.mod (2 bits)
+    // MODRM.reg (3 bits)
+    // MODRM.rm  (3 bits)
+
+    assert!(
+        !(op_ext.is_some() && r_opnd.is_some()),
+        "opcode extension and register operand present"
+    );
+
+    // Encode the mod field
+    let rm_mod = match rm_opnd {
+        X86Opnd::Reg(_) => 3,
+        X86Opnd::IPRel(_) => 0,
+        X86Opnd::Mem(_mem) => {
+            match rm_opnd.disp_size() {
+                0 => 0,
+                8 => 1,
+                32 => 2,
+                _ => unreachable!()
+            }
+        },
+        _ => unreachable!()
+    };
+
+    // Encode the reg field
+    let reg: u8;
+    if let Some(val) = op_ext {
+        reg = val;
+    } else {
+        reg = match r_opnd {
+            X86Opnd::Reg(reg) => reg.reg_no & 7,
+            _ => 0
+        };
+    }
+
+    // Encode the rm field
+    let rm = match rm_opnd {
+        X86Opnd::Reg(reg) => reg.reg_no & 7,
+        X86Opnd::Mem(mem) => if need_sib { 4 } else { mem.base_reg_no & 7 },
+        X86Opnd::IPRel(_) => 0b101,
+        _ => unreachable!()
+    };
+
+    // Encode and write the ModR/M byte
+    let rm_byte: u8 = (rm_mod << 6) + (reg << 3) + (rm);
+    cb.write_byte(rm_byte);
+
+    // Add the SIB byte, if needed
+    if need_sib {
+        // SIB.scale (2 bits)
+        // SIB.index (3 bits)
+        // SIB.base  (3 bits)
+
+        match rm_opnd {
+            X86Opnd::Mem(mem) => {
+                // Encode the scale value
+                let scale = mem.scale_exp;
+
+                // Encode the index value
+                let index = mem.idx_reg_no.map(|no| no & 7).unwrap_or(4);
+
+                // Encode the base register
+                let base = mem.base_reg_no & 7;
+
+                // Encode and write the SIB byte
+                let sib_byte: u8 = (scale << 6) + (index << 3) + (base);
+                cb.write_byte(sib_byte);
+            },
+            _ => panic!("Expected mem operand")
+        }
+    }
+
+    // Add the displacement
+    match rm_opnd {
+        X86Opnd::Mem(mem) => {
+            let disp_size = rm_opnd.disp_size();
+            if disp_size > 0 {
+                cb.write_int(mem.disp as u64, disp_size);
+            }
+        },
+        X86Opnd::IPRel(rel) => {
+            cb.write_int(rel as u64, 32);
+        },
+        _ => ()
+    };
+}
+
+// Encode a mul-like single-operand RM instruction
+fn write_rm_unary(cb: &mut CodeBlock, op_mem_reg_8: u8, op_mem_reg_pref: u8, op_ext: Option<u8>, opnd: X86Opnd) {
+    assert!(matches!(opnd, X86Opnd::Reg(_) | X86Opnd::Mem(_)));
+
+    let opnd_size = opnd.num_bits();
+    assert!(opnd_size == 8 || opnd_size == 16 || opnd_size == 32 || opnd_size == 64);
+
+    if opnd_size == 8 {
+        write_rm(cb, false, false, X86Opnd::None, opnd, op_ext, &[op_mem_reg_8]);
+    } else {
+        let sz_pref = opnd_size == 16;
+        let rex_w = opnd_size == 64;
+        write_rm(cb, sz_pref, rex_w, X86Opnd::None, opnd, op_ext, &[op_mem_reg_pref]);
+    }
+}
+
+// Encode an add-like RM instruction with multiple possible encodings
+fn write_rm_multi(cb: &mut CodeBlock, op_mem_reg8: u8, op_mem_reg_pref: u8, op_reg_mem8: u8, op_reg_mem_pref: u8, op_mem_imm8: u8, op_mem_imm_sml: u8, op_mem_imm_lrg: u8, op_ext_imm: Option<u8>, opnd0: X86Opnd, opnd1: X86Opnd) {
+    assert!(matches!(opnd0, X86Opnd::Reg(_) | X86Opnd::Mem(_)));
+
+    // Check the size of opnd0
+    let opnd_size = opnd0.num_bits();
+    assert!(opnd_size == 8 || opnd_size == 16 || opnd_size == 32 || opnd_size == 64);
+
+    // Check the size of opnd1
+    match opnd1 {
+        X86Opnd::Reg(reg) => assert_eq!(reg.num_bits, opnd_size),
+        X86Opnd::Mem(mem) => assert_eq!(mem.num_bits, opnd_size),
+        X86Opnd::Imm(imm) => assert!(imm.num_bits <= opnd_size),
+        X86Opnd::UImm(uimm) => assert!(uimm.num_bits <= opnd_size),
+        _ => ()
+    };
+
+    let sz_pref = opnd_size == 16;
+    let rex_w = opnd_size == 64;
+
+    match (opnd0, opnd1) {
+        // R/M + Reg
+        (X86Opnd::Mem(_), X86Opnd::Reg(_)) | (X86Opnd::Reg(_), X86Opnd::Reg(_)) => {
+            if opnd_size == 8 {
+                write_rm(cb, false, false, opnd1, opnd0, None, &[op_mem_reg8]);
+            } else {
+                write_rm(cb, sz_pref, rex_w, opnd1, opnd0, None, &[op_mem_reg_pref]);
+            }
+        },
+        // Reg + R/M/IPRel
+        (X86Opnd::Reg(_), X86Opnd::Mem(_) | X86Opnd::IPRel(_)) => {
+            if opnd_size == 8 {
+                write_rm(cb, false, false, opnd0, opnd1, None, &[op_reg_mem8]);
+            } else {
+                write_rm(cb, sz_pref, rex_w, opnd0, opnd1, None, &[op_reg_mem_pref]);
+            }
+        },
+        // R/M + Imm
+        (_, X86Opnd::Imm(imm)) => {
+            if imm.num_bits <= 8 {
+                // 8-bit immediate
+
+                if opnd_size == 8 {
+                    write_rm(cb, false, false, X86Opnd::None, opnd0, op_ext_imm, &[op_mem_imm8]);
+                } else {
+                    write_rm(cb, sz_pref, rex_w, X86Opnd::None, opnd0, op_ext_imm, &[op_mem_imm_sml]);
+                }
+
+                cb.write_int(imm.value as u64, 8);
+            } else if imm.num_bits <= 32 {
+                // 32-bit immediate
+
+                assert!(imm.num_bits <= opnd_size);
+                write_rm(cb, sz_pref, rex_w, X86Opnd::None, opnd0, op_ext_imm, &[op_mem_imm_lrg]);
+                cb.write_int(imm.value as u64, if opnd_size > 32 { 32 } else { opnd_size.into() });
+            } else {
+                panic!("immediate value too large");
+            }
+        },
+        // R/M + UImm
+        (_, X86Opnd::UImm(uimm)) => {
+            // If the size of left hand operand equals the number of bits
+            // required to represent the right hand immediate, then we
+            // don't care about sign extension when calculating the immediate
+            let num_bits = if opnd0.num_bits() == uimm_num_bits(uimm.value) {
+                uimm_num_bits(uimm.value)
+            } else {
+                imm_num_bits(uimm.value.try_into().unwrap())
+            };
+
+            if num_bits <= 8 {
+                // 8-bit immediate
+
+                if opnd_size == 8 {
+                    write_rm(cb, false, false, X86Opnd::None, opnd0, op_ext_imm, &[op_mem_imm8]);
+                } else {
+                    write_rm(cb, sz_pref, rex_w, X86Opnd::None, opnd0, op_ext_imm, &[op_mem_imm_sml]);
+                }
+
+                cb.write_int(uimm.value, 8);
+            } else if num_bits <= 32 {
+                // 32-bit immediate
+
+                assert!(num_bits <= opnd_size);
+                write_rm(cb, sz_pref, rex_w, X86Opnd::None, opnd0, op_ext_imm, &[op_mem_imm_lrg]);
+                cb.write_int(uimm.value, if opnd_size > 32 { 32 } else { opnd_size.into() });
+            } else {
+                panic!("immediate value too large (num_bits={}, num={uimm:?})", num_bits);
+            }
+        },
+        _ => panic!("unknown encoding combo: {opnd0:?} {opnd1:?}")
+    };
+}
+
+// LOCK - lock prefix for atomic shared memory operations
+pub fn write_lock_prefix(cb: &mut CodeBlock) {
+    cb.write_byte(0xf0);
+}
+
+/// add - Integer addition
+pub fn add(cb: &mut CodeBlock, opnd0: X86Opnd, opnd1: X86Opnd) {
+    write_rm_multi(
+        cb,
+        0x00, // opMemReg8
+        0x01, // opMemRegPref
+        0x02, // opRegMem8
+        0x03, // opRegMemPref
+        0x80, // opMemImm8
+        0x83, // opMemImmSml
+        0x81, // opMemImmLrg
+        Some(0x00), // opExtImm
+        opnd0,
+        opnd1
+    );
+}
+
+/// and - Bitwise AND
+pub fn and(cb: &mut CodeBlock, opnd0: X86Opnd, opnd1: X86Opnd) {
+    write_rm_multi(
+        cb,
+        0x20, // opMemReg8
+        0x21, // opMemRegPref
+        0x22, // opRegMem8
+        0x23, // opRegMemPref
+        0x80, // opMemImm8
+        0x83, // opMemImmSml
+        0x81, // opMemImmLrg
+        Some(0x04), // opExtImm
+        opnd0,
+        opnd1
+    );
+}
+
+/// call - Call to a pointer with a 32-bit displacement offset
+pub fn call_rel32(cb: &mut CodeBlock, rel32: i32) {
+    // Write the opcode
+    cb.write_byte(0xe8);
+
+    // Write the relative 32-bit jump offset
+    cb.write_bytes(&rel32.to_le_bytes());
+}
+
+/// call - Call a pointer, encode with a 32-bit offset if possible
+pub fn call_ptr(cb: &mut CodeBlock, scratch_opnd: X86Opnd, dst_ptr: *const u8) {
+    if let X86Opnd::Reg(_scratch_reg) = scratch_opnd {
+        // TODO: implement a counter
+
+        // Pointer to the end of this call instruction
+        let end_ptr = cb.get_ptr(cb.write_pos + 5);
+
+        // Compute the jump offset
+        let rel64: i64 = dst_ptr as i64 - end_ptr.raw_ptr(cb) as i64;
+
+        // If the offset fits in 32-bit
+        if rel64 >= i32::MIN.into() && rel64 <= i32::MAX.into() {
+            call_rel32(cb, rel64.try_into().unwrap());
+            return;
+        }
+
+        // Move the pointer into the scratch register and call
+        mov(cb, scratch_opnd, const_ptr_opnd(dst_ptr));
+        call(cb, scratch_opnd);
+    } else {
+        unreachable!();
+    }
+}
+
+/// call - Call to label with 32-bit offset
+pub fn call_label(cb: &mut CodeBlock, label: Label) {
+    cb.label_ref(label, 5, |cb, src_addr, dst_addr| {
+        cb.write_byte(0xE8);
+        cb.write_int((dst_addr - src_addr) as u64, 32);
+    });
+}
+
+/// call - Indirect call with an R/M operand
+pub fn call(cb: &mut CodeBlock, opnd: X86Opnd) {
+    write_rm(cb, false, false, X86Opnd::None, opnd, Some(2), &[0xff]);
+}
+
+/// Encode a conditional move instruction
+fn write_cmov(cb: &mut CodeBlock, opcode1: u8, dst: X86Opnd, src: X86Opnd) {
+    if let X86Opnd::Reg(reg) = dst {
+        match src {
+            X86Opnd::Reg(_) => (),
+            X86Opnd::Mem(_) => (),
+            _ => unreachable!()
+        };
+
+        assert!(reg.num_bits >= 16);
+        let sz_pref = reg.num_bits == 16;
+        let rex_w = reg.num_bits == 64;
+
+        write_rm(cb, sz_pref, rex_w, dst, src, None, &[0x0f, opcode1]);
+    } else {
+        unreachable!()
+    }
+}
+
+// cmovcc - Conditional move
+pub fn cmova(cb: &mut CodeBlock, dst: X86Opnd, src: X86Opnd) { write_cmov(cb, 0x47, dst, src); }
+pub fn cmovae(cb: &mut CodeBlock, dst: X86Opnd, src: X86Opnd) { write_cmov(cb, 0x43, dst, src); }
+pub fn cmovb(cb: &mut CodeBlock, dst: X86Opnd, src: X86Opnd) { write_cmov(cb, 0x42, dst, src); }
+pub fn cmovbe(cb: &mut CodeBlock, dst: X86Opnd, src: X86Opnd) { write_cmov(cb, 0x46, dst, src); }
+pub fn cmovc(cb: &mut CodeBlock, dst: X86Opnd, src: X86Opnd) { write_cmov(cb, 0x42, dst, src); }
+pub fn cmove(cb: &mut CodeBlock, dst: X86Opnd, src: X86Opnd) { write_cmov(cb, 0x44, dst, src); }
+pub fn cmovg(cb: &mut CodeBlock, dst: X86Opnd, src: X86Opnd) { write_cmov(cb, 0x4f, dst, src); }
+pub fn cmovge(cb: &mut CodeBlock, dst: X86Opnd, src: X86Opnd) { write_cmov(cb, 0x4d, dst, src); }
+pub fn cmovl(cb: &mut CodeBlock, dst: X86Opnd, src: X86Opnd) { write_cmov(cb, 0x4c, dst, src); }
+pub fn cmovle(cb: &mut CodeBlock, dst: X86Opnd, src: X86Opnd) { write_cmov(cb, 0x4e, dst, src); }
+pub fn cmovna(cb: &mut CodeBlock, dst: X86Opnd, src: X86Opnd) { write_cmov(cb, 0x46, dst, src); }
+pub fn cmovnae(cb: &mut CodeBlock, dst: X86Opnd, src: X86Opnd) { write_cmov(cb, 0x42, dst, src); }
+pub fn cmovnb(cb: &mut CodeBlock, dst: X86Opnd, src: X86Opnd) { write_cmov(cb, 0x43, dst, src); }
+pub fn cmovnbe(cb: &mut CodeBlock, dst: X86Opnd, src: X86Opnd) { write_cmov(cb, 0x47, dst, src); }
+pub fn cmovnc(cb: &mut CodeBlock, dst: X86Opnd, src: X86Opnd) { write_cmov(cb, 0x43, dst, src); }
+pub fn cmovne(cb: &mut CodeBlock, dst: X86Opnd, src: X86Opnd) { write_cmov(cb, 0x45, dst, src); }
+pub fn cmovng(cb: &mut CodeBlock, dst: X86Opnd, src: X86Opnd) { write_cmov(cb, 0x4e, dst, src); }
+pub fn cmovnge(cb: &mut CodeBlock, dst: X86Opnd, src: X86Opnd) { write_cmov(cb, 0x4c, dst, src); }
+pub fn cmovnl(cb: &mut CodeBlock, dst: X86Opnd, src: X86Opnd) { write_cmov(cb,  0x4d, dst, src); }
+pub fn cmovnle(cb: &mut CodeBlock, dst: X86Opnd, src: X86Opnd) { write_cmov(cb, 0x4f, dst, src); }
+pub fn cmovno(cb: &mut CodeBlock, dst: X86Opnd, src: X86Opnd) { write_cmov(cb, 0x41, dst, src); }
+pub fn cmovnp(cb: &mut CodeBlock, dst: X86Opnd, src: X86Opnd) { write_cmov(cb, 0x4b, dst, src); }
+pub fn cmovns(cb: &mut CodeBlock, dst: X86Opnd, src: X86Opnd) { write_cmov(cb, 0x49, dst, src); }
+pub fn cmovnz(cb: &mut CodeBlock, dst: X86Opnd, src: X86Opnd) { write_cmov(cb, 0x45, dst, src); }
+pub fn cmovo(cb: &mut CodeBlock, dst: X86Opnd, src: X86Opnd) { write_cmov(cb, 0x40, dst, src); }
+pub fn cmovp(cb: &mut CodeBlock, dst: X86Opnd, src: X86Opnd) { write_cmov(cb, 0x4a, dst, src); }
+pub fn cmovpe(cb: &mut CodeBlock, dst: X86Opnd, src: X86Opnd) { write_cmov(cb, 0x4a, dst, src); }
+pub fn cmovpo(cb: &mut CodeBlock, dst: X86Opnd, src: X86Opnd) { write_cmov(cb, 0x4b, dst, src); }
+pub fn cmovs(cb: &mut CodeBlock, dst: X86Opnd, src: X86Opnd) { write_cmov(cb, 0x48, dst, src); }
+pub fn cmovz(cb: &mut CodeBlock, dst: X86Opnd, src: X86Opnd) { write_cmov(cb, 0x44, dst, src); }
+
+/// cmp - Compare and set flags
+pub fn cmp(cb: &mut CodeBlock, opnd0: X86Opnd, opnd1: X86Opnd) {
+    write_rm_multi(
+        cb,
+        0x38, // opMemReg8
+        0x39, // opMemRegPref
+        0x3A, // opRegMem8
+        0x3B, // opRegMemPref
+        0x80, // opMemImm8
+        0x83, // opMemImmSml
+        0x81, // opMemImmLrg
+        Some(0x07), // opExtImm
+        opnd0,
+        opnd1
+    );
+}
+
+/// cdq - Convert doubleword to quadword
+pub fn cdq(cb: &mut CodeBlock) {
+    cb.write_byte(0x99);
+}
+
+/// cqo - Convert quadword to octaword
+pub fn cqo(cb: &mut CodeBlock) {
+    cb.write_bytes(&[0x48, 0x99]);
+}
+
+/// imul - signed integer multiply
+pub fn imul(cb: &mut CodeBlock, opnd0: X86Opnd, opnd1: X86Opnd) {
+    assert!(opnd0.num_bits() == 64);
+    assert!(opnd1.num_bits() == 64);
+    assert!(matches!(opnd0, X86Opnd::Reg(_) | X86Opnd::Mem(_)));
+    assert!(matches!(opnd1, X86Opnd::Reg(_) | X86Opnd::Mem(_)));
+
+    match (opnd0, opnd1) {
+        (X86Opnd::Reg(_), X86Opnd::Reg(_) | X86Opnd::Mem(_)) => {
+            //REX.W + 0F AF /rIMUL r64, r/m64
+            // Quadword register := Quadword register * r/m64.
+            write_rm(cb, false, true, opnd0, opnd1, None, &[0x0F, 0xAF]);
+        }
+
+        // Flip the operands to handle this case. This instruction has weird encoding restrictions.
+        (X86Opnd::Mem(_), X86Opnd::Reg(_)) => {
+            //REX.W + 0F AF /rIMUL r64, r/m64
+            // Quadword register := Quadword register * r/m64.
+            write_rm(cb, false, true, opnd1, opnd0, None, &[0x0F, 0xAF]);
+        }
+
+        _ => unreachable!()
+    }
+}
+
+/// Interrupt 3 - trap to debugger
+pub fn int3(cb: &mut CodeBlock) {
+    cb.write_byte(0xcc);
+}
+
+// Encode a conditional relative jump to a label
+// Note: this always encodes a 32-bit offset
+fn write_jcc<const OP: u8>(cb: &mut CodeBlock, label: Label) {
+    cb.label_ref(label, 6, |cb, src_addr, dst_addr| {
+        cb.write_byte(0x0F);
+        cb.write_byte(OP);
+        cb.write_int((dst_addr - src_addr) as u64, 32);
+    });
+}
+
+/// jcc - relative jumps to a label
+pub fn ja_label  (cb: &mut CodeBlock, label: Label) { write_jcc::<0x87>(cb, label); }
+pub fn jae_label (cb: &mut CodeBlock, label: Label) { write_jcc::<0x83>(cb, label); }
+pub fn jb_label  (cb: &mut CodeBlock, label: Label) { write_jcc::<0x82>(cb, label); }
+pub fn jbe_label (cb: &mut CodeBlock, label: Label) { write_jcc::<0x86>(cb, label); }
+pub fn jc_label  (cb: &mut CodeBlock, label: Label) { write_jcc::<0x82>(cb, label); }
+pub fn je_label  (cb: &mut CodeBlock, label: Label) { write_jcc::<0x84>(cb, label); }
+pub fn jg_label  (cb: &mut CodeBlock, label: Label) { write_jcc::<0x8F>(cb, label); }
+pub fn jge_label (cb: &mut CodeBlock, label: Label) { write_jcc::<0x8D>(cb, label); }
+pub fn jl_label  (cb: &mut CodeBlock, label: Label) { write_jcc::<0x8C>(cb, label); }
+pub fn jle_label (cb: &mut CodeBlock, label: Label) { write_jcc::<0x8E>(cb, label); }
+pub fn jna_label (cb: &mut CodeBlock, label: Label) { write_jcc::<0x86>(cb, label); }
+pub fn jnae_label(cb: &mut CodeBlock, label: Label) { write_jcc::<0x82>(cb, label); }
+pub fn jnb_label (cb: &mut CodeBlock, label: Label) { write_jcc::<0x83>(cb, label); }
+pub fn jnbe_label(cb: &mut CodeBlock, label: Label) { write_jcc::<0x87>(cb, label); }
+pub fn jnc_label (cb: &mut CodeBlock, label: Label) { write_jcc::<0x83>(cb, label); }
+pub fn jne_label (cb: &mut CodeBlock, label: Label) { write_jcc::<0x85>(cb, label); }
+pub fn jng_label (cb: &mut CodeBlock, label: Label) { write_jcc::<0x8E>(cb, label); }
+pub fn jnge_label(cb: &mut CodeBlock, label: Label) { write_jcc::<0x8C>(cb, label); }
+pub fn jnl_label (cb: &mut CodeBlock, label: Label) { write_jcc::<0x8D>(cb, label); }
+pub fn jnle_label(cb: &mut CodeBlock, label: Label) { write_jcc::<0x8F>(cb, label); }
+pub fn jno_label (cb: &mut CodeBlock, label: Label) { write_jcc::<0x81>(cb, label); }
+pub fn jnp_label (cb: &mut CodeBlock, label: Label) { write_jcc::<0x8b>(cb, label); }
+pub fn jns_label (cb: &mut CodeBlock, label: Label) { write_jcc::<0x89>(cb, label); }
+pub fn jnz_label (cb: &mut CodeBlock, label: Label) { write_jcc::<0x85>(cb, label); }
+pub fn jo_label  (cb: &mut CodeBlock, label: Label) { write_jcc::<0x80>(cb, label); }
+pub fn jp_label  (cb: &mut CodeBlock, label: Label) { write_jcc::<0x8A>(cb, label); }
+pub fn jpe_label (cb: &mut CodeBlock, label: Label) { write_jcc::<0x8A>(cb, label); }
+pub fn jpo_label (cb: &mut CodeBlock, label: Label) { write_jcc::<0x8B>(cb, label); }
+pub fn js_label  (cb: &mut CodeBlock, label: Label) { write_jcc::<0x88>(cb, label); }
+pub fn jz_label  (cb: &mut CodeBlock, label: Label) { write_jcc::<0x84>(cb, label); }
+
+pub fn jmp_label(cb: &mut CodeBlock, label: Label) {
+    cb.label_ref(label, 5, |cb, src_addr, dst_addr| {
+        cb.write_byte(0xE9);
+        cb.write_int((dst_addr - src_addr) as u64, 32);
+    });
+}
+
+/// Encode a relative jump to a pointer at a 32-bit offset (direct or conditional)
+fn write_jcc_ptr(cb: &mut CodeBlock, op0: u8, op1: u8, dst_ptr: CodePtr) {
+    // Write the opcode
+    if op0 != 0xFF {
+        cb.write_byte(op0);
+    }
+
+    cb.write_byte(op1);
+
+    // Pointer to the end of this jump instruction
+    let end_ptr = cb.get_ptr(cb.write_pos + 4);
+
+    // Compute the jump offset
+    let rel64 = dst_ptr.as_offset() - end_ptr.as_offset();
+
+    if rel64 >= i32::MIN.into() && rel64 <= i32::MAX.into() {
+        // Write the relative 32-bit jump offset
+        cb.write_int(rel64 as u64, 32);
+    }
+    else {
+        // Offset doesn't fit in 4 bytes. Report error.
+        //cb.dropped_bytes = true;
+        panic!("we should refactor to avoid dropped_bytes");
+    }
+}
+
+/// jcc - relative jumps to a pointer (32-bit offset)
+pub fn ja_ptr  (cb: &mut CodeBlock, ptr: CodePtr) { write_jcc_ptr(cb, 0x0F, 0x87, ptr); }
+pub fn jae_ptr (cb: &mut CodeBlock, ptr: CodePtr) { write_jcc_ptr(cb, 0x0F, 0x83, ptr); }
+pub fn jb_ptr  (cb: &mut CodeBlock, ptr: CodePtr) { write_jcc_ptr(cb, 0x0F, 0x82, ptr); }
+pub fn jbe_ptr (cb: &mut CodeBlock, ptr: CodePtr) { write_jcc_ptr(cb, 0x0F, 0x86, ptr); }
+pub fn jc_ptr  (cb: &mut CodeBlock, ptr: CodePtr) { write_jcc_ptr(cb, 0x0F, 0x82, ptr); }
+pub fn je_ptr  (cb: &mut CodeBlock, ptr: CodePtr) { write_jcc_ptr(cb, 0x0F, 0x84, ptr); }
+pub fn jg_ptr  (cb: &mut CodeBlock, ptr: CodePtr) { write_jcc_ptr(cb, 0x0F, 0x8F, ptr); }
+pub fn jge_ptr (cb: &mut CodeBlock, ptr: CodePtr) { write_jcc_ptr(cb, 0x0F, 0x8D, ptr); }
+pub fn jl_ptr  (cb: &mut CodeBlock, ptr: CodePtr) { write_jcc_ptr(cb, 0x0F, 0x8C, ptr); }
+pub fn jle_ptr (cb: &mut CodeBlock, ptr: CodePtr) { write_jcc_ptr(cb, 0x0F, 0x8E, ptr); }
+pub fn jna_ptr (cb: &mut CodeBlock, ptr: CodePtr) { write_jcc_ptr(cb, 0x0F, 0x86, ptr); }
+pub fn jnae_ptr(cb: &mut CodeBlock, ptr: CodePtr) { write_jcc_ptr(cb, 0x0F, 0x82, ptr); }
+pub fn jnb_ptr (cb: &mut CodeBlock, ptr: CodePtr) { write_jcc_ptr(cb, 0x0F, 0x83, ptr); }
+pub fn jnbe_ptr(cb: &mut CodeBlock, ptr: CodePtr) { write_jcc_ptr(cb, 0x0F, 0x87, ptr); }
+pub fn jnc_ptr (cb: &mut CodeBlock, ptr: CodePtr) { write_jcc_ptr(cb, 0x0F, 0x83, ptr); }
+pub fn jne_ptr (cb: &mut CodeBlock, ptr: CodePtr) { write_jcc_ptr(cb, 0x0F, 0x85, ptr); }
+pub fn jng_ptr (cb: &mut CodeBlock, ptr: CodePtr) { write_jcc_ptr(cb, 0x0F, 0x8E, ptr); }
+pub fn jnge_ptr(cb: &mut CodeBlock, ptr: CodePtr) { write_jcc_ptr(cb, 0x0F, 0x8C, ptr); }
+pub fn jnl_ptr (cb: &mut CodeBlock, ptr: CodePtr) { write_jcc_ptr(cb, 0x0F, 0x8D, ptr); }
+pub fn jnle_ptr(cb: &mut CodeBlock, ptr: CodePtr) { write_jcc_ptr(cb, 0x0F, 0x8F, ptr); }
+pub fn jno_ptr (cb: &mut CodeBlock, ptr: CodePtr) { write_jcc_ptr(cb, 0x0F, 0x81, ptr); }
+pub fn jnp_ptr (cb: &mut CodeBlock, ptr: CodePtr) { write_jcc_ptr(cb, 0x0F, 0x8b, ptr); }
+pub fn jns_ptr (cb: &mut CodeBlock, ptr: CodePtr) { write_jcc_ptr(cb, 0x0F, 0x89, ptr); }
+pub fn jnz_ptr (cb: &mut CodeBlock, ptr: CodePtr) { write_jcc_ptr(cb, 0x0F, 0x85, ptr); }
+pub fn jo_ptr  (cb: &mut CodeBlock, ptr: CodePtr) { write_jcc_ptr(cb, 0x0F, 0x80, ptr); }
+pub fn jp_ptr  (cb: &mut CodeBlock, ptr: CodePtr) { write_jcc_ptr(cb, 0x0F, 0x8A, ptr); }
+pub fn jpe_ptr (cb: &mut CodeBlock, ptr: CodePtr) { write_jcc_ptr(cb, 0x0F, 0x8A, ptr); }
+pub fn jpo_ptr (cb: &mut CodeBlock, ptr: CodePtr) { write_jcc_ptr(cb, 0x0F, 0x8B, ptr); }
+pub fn js_ptr  (cb: &mut CodeBlock, ptr: CodePtr) { write_jcc_ptr(cb, 0x0F, 0x88, ptr); }
+pub fn jz_ptr  (cb: &mut CodeBlock, ptr: CodePtr) { write_jcc_ptr(cb, 0x0F, 0x84, ptr); }
+pub fn jmp_ptr (cb: &mut CodeBlock, ptr: CodePtr) { write_jcc_ptr(cb, 0xFF, 0xE9, ptr); }
+
+/// jmp - Indirect jump near to an R/M operand.
+pub fn jmp_rm(cb: &mut CodeBlock, opnd: X86Opnd) {
+    write_rm(cb, false, false, X86Opnd::None, opnd, Some(4), &[0xff]);
+}
+
+// jmp - Jump with relative 32-bit offset
+pub fn jmp32(cb: &mut CodeBlock, offset: i32) {
+    cb.write_byte(0xE9);
+    cb.write_int(offset as u64, 32);
+}
+
+/// lea - Load Effective Address
+pub fn lea(cb: &mut CodeBlock, dst: X86Opnd, src: X86Opnd) {
+    if let X86Opnd::Reg(reg) = dst {
+        assert!(reg.num_bits == 64);
+        assert!(matches!(src, X86Opnd::Mem(_) | X86Opnd::IPRel(_)));
+        write_rm(cb, false, true, dst, src, None, &[0x8d]);
+    } else {
+        unreachable!();
+    }
+}
+
+/// mov - Data move operation
+pub fn mov(cb: &mut CodeBlock, dst: X86Opnd, src: X86Opnd) {
+    match (dst, src) {
+        // R + Imm
+        (X86Opnd::Reg(reg), X86Opnd::Imm(imm)) => {
+            assert!(imm.num_bits <= reg.num_bits);
+
+            // In case the source immediate could be zero extended to be 64
+            // bit, we can use the 32-bit operands version of the instruction.
+            // For example, we can turn mov(rax, 0x34) into the equivalent
+            // mov(eax, 0x34).
+            if (reg.num_bits == 64) && (imm.value > 0) && (imm.num_bits <= 32) {
+                if dst.rex_needed() {
+                    write_rex(cb, false, 0, 0, reg.reg_no);
+                }
+                write_opcode(cb, 0xB8, reg);
+                cb.write_int(imm.value as u64, 32);
+            } else {
+                if reg.num_bits == 16 {
+                    cb.write_byte(0x66);
+                }
+
+                if dst.rex_needed() || reg.num_bits == 64 {
+                    write_rex(cb, reg.num_bits == 64, 0, 0, reg.reg_no);
+                }
+
+                write_opcode(cb, if reg.num_bits == 8 { 0xb0 } else { 0xb8 }, reg);
+                cb.write_int(imm.value as u64, reg.num_bits.into());
+            }
+        },
+        // R + UImm
+        (X86Opnd::Reg(reg), X86Opnd::UImm(uimm)) => {
+            assert!(uimm.num_bits <= reg.num_bits);
+
+            // In case the source immediate could be zero extended to be 64
+            // bit, we can use the 32-bit operands version of the instruction.
+            // For example, we can turn mov(rax, 0x34) into the equivalent
+            // mov(eax, 0x34).
+            if (reg.num_bits == 64) && (uimm.value <= u32::MAX.into()) {
+                if dst.rex_needed() {
+                    write_rex(cb, false, 0, 0, reg.reg_no);
+                }
+                write_opcode(cb, 0xB8, reg);
+                cb.write_int(uimm.value, 32);
+            } else {
+                if reg.num_bits == 16 {
+                    cb.write_byte(0x66);
+                }
+
+                if dst.rex_needed() || reg.num_bits == 64 {
+                    write_rex(cb, reg.num_bits == 64, 0, 0, reg.reg_no);
+                }
+
+                write_opcode(cb, if reg.num_bits == 8 { 0xb0 } else { 0xb8 }, reg);
+                cb.write_int(uimm.value, reg.num_bits.into());
+            }
+        },
+        // M + Imm
+        (X86Opnd::Mem(mem), X86Opnd::Imm(imm)) => {
+            assert!(imm.num_bits <= mem.num_bits);
+
+            if mem.num_bits == 8 {
+                write_rm(cb, false, false, X86Opnd::None, dst, None, &[0xc6]);
+            } else {
+                write_rm(cb, mem.num_bits == 16, mem.num_bits == 64, X86Opnd::None, dst, Some(0), &[0xc7]);
+            }
+
+            let output_num_bits:u32 = if mem.num_bits > 32 { 32 } else { mem.num_bits.into() };
+            assert!(
+                mem.num_bits < 64 || imm_num_bits(imm.value) <= (output_num_bits as u8),
+                "immediate value should be small enough to survive sign extension"
+            );
+            cb.write_int(imm.value as u64, output_num_bits);
+        },
+        // M + UImm
+        (X86Opnd::Mem(mem), X86Opnd::UImm(uimm)) => {
+            assert!(uimm.num_bits <= mem.num_bits);
+
+            if mem.num_bits == 8 {
+                write_rm(cb, false, false, X86Opnd::None, dst, None, &[0xc6]);
+            }
+            else {
+                write_rm(cb, mem.num_bits == 16, mem.num_bits == 64, X86Opnd::None, dst, Some(0), &[0xc7]);
+            }
+
+            let output_num_bits = if mem.num_bits > 32 { 32 } else { mem.num_bits.into() };
+            assert!(
+                mem.num_bits < 64 || imm_num_bits(uimm.value as i64) <= (output_num_bits as u8),
+                "immediate value should be small enough to survive sign extension"
+            );
+            cb.write_int(uimm.value, output_num_bits);
+        },
+        // * + Imm/UImm
+        (_, X86Opnd::Imm(_) | X86Opnd::UImm(_)) => unreachable!(),
+        // * + *
+        (_, _) => {
+            write_rm_multi(
+                cb,
+                0x88, // opMemReg8
+                0x89, // opMemRegPref
+                0x8A, // opRegMem8
+                0x8B, // opRegMemPref
+                0xC6, // opMemImm8
+                0xFF, // opMemImmSml (not available)
+                0xFF, // opMemImmLrg
+                None, // opExtImm
+                dst,
+                src
+            );
+        }
+    };
+}
+
+/// A variant of mov used for always writing the value in 64 bits for GC offsets.
+pub fn movabs(cb: &mut CodeBlock, dst: X86Opnd, value: u64) {
+    match dst {
+        X86Opnd::Reg(reg) => {
+            assert_eq!(reg.num_bits, 64);
+            write_rex(cb, true, 0, 0, reg.reg_no);
+
+            write_opcode(cb, 0xb8, reg);
+            cb.write_int(value, 64);
+        },
+        _ => unreachable!()
+    }
+}
+
+/// movsx - Move with sign extension (signed integers)
+pub fn movsx(cb: &mut CodeBlock, dst: X86Opnd, src: X86Opnd) {
+    if let X86Opnd::Reg(_dst_reg) = dst {
+        assert!(matches!(src, X86Opnd::Reg(_) | X86Opnd::Mem(_)));
+
+        let src_num_bits = src.num_bits();
+        let dst_num_bits = dst.num_bits();
+        assert!(src_num_bits < dst_num_bits);
+
+        match src_num_bits {
+            8 => write_rm(cb, dst_num_bits == 16, dst_num_bits == 64, dst, src, None, &[0x0f, 0xbe]),
+            16 => write_rm(cb, dst_num_bits == 16, dst_num_bits == 64, dst, src, None, &[0x0f, 0xbf]),
+            32 => write_rm(cb, false, true, dst, src, None, &[0x63]),
+            _ => unreachable!()
+        };
+    } else {
+        unreachable!();
+    }
+}
+
+/*
+/// movzx - Move with zero extension (unsigned values)
+void movzx(codeblock_t *cb, x86opnd_t dst, x86opnd_t src)
+{
+    cb.writeASM("movzx", dst, src);
+
+    uint32_t dstSize;
+    if (dst.isReg)
+        dstSize = dst.reg.size;
+    else
+        assert (false, "movzx dst must be a register");
+
+    uint32_t srcSize;
+    if (src.isReg)
+        srcSize = src.reg.size;
+    else if (src.isMem)
+        srcSize = src.mem.size;
+    else
+        assert (false);
+
+    assert (
+        srcSize < dstSize,
+        "movzx: srcSize >= dstSize"
+    );
+
+    if (srcSize is 8)
+    {
+        cb.writeRMInstr!('r', 0xFF, 0x0F, 0xB6)(dstSize is 16, dstSize is 64, dst, src);
+    }
+    else if (srcSize is 16)
+    {
+        cb.writeRMInstr!('r', 0xFF, 0x0F, 0xB7)(dstSize is 16, dstSize is 64, dst, src);
+    }
+    else
+    {
+        assert (false, "invalid src operand size for movxz");
+    }
+}
+*/
+
+/// nop - Noop, one or multiple bytes long
+pub fn nop(cb: &mut CodeBlock, length: u32) {
+    match length {
+        0 => {},
+        1 => cb.write_byte(0x90),
+        2 => cb.write_bytes(&[0x66, 0x90]),
+        3 => cb.write_bytes(&[0x0f, 0x1f, 0x00]),
+        4 => cb.write_bytes(&[0x0f, 0x1f, 0x40, 0x00]),
+        5 => cb.write_bytes(&[0x0f, 0x1f, 0x44, 0x00, 0x00]),
+        6 => cb.write_bytes(&[0x66, 0x0f, 0x1f, 0x44, 0x00, 0x00]),
+        7 => cb.write_bytes(&[0x0f, 0x1f, 0x80, 0x00, 0x00, 0x00, 0x00]),
+        8 => cb.write_bytes(&[0x0f, 0x1f, 0x84, 0x00, 0x00, 0x00, 0x00, 0x00]),
+        9 => cb.write_bytes(&[0x66, 0x0f, 0x1f, 0x84, 0x00, 0x00, 0x00, 0x00, 0x00]),
+        _ => {
+            let mut written: u32 = 0;
+            while written + 9 <= length {
+                nop(cb, 9);
+                written += 9;
+            }
+            nop(cb, length - written);
+        }
+    };
+}
+
+/// not - Bitwise NOT
+pub fn not(cb: &mut CodeBlock, opnd: X86Opnd) {
+    write_rm_unary(
+        cb,
+        0xf6, // opMemReg8
+        0xf7, // opMemRegPref
+        Some(0x02), // opExt
+        opnd
+    );
+}
+
+/// or - Bitwise OR
+pub fn or(cb: &mut CodeBlock, opnd0: X86Opnd, opnd1: X86Opnd) {
+    write_rm_multi(
+        cb,
+        0x08, // opMemReg8
+        0x09, // opMemRegPref
+        0x0A, // opRegMem8
+        0x0B, // opRegMemPref
+        0x80, // opMemImm8
+        0x83, // opMemImmSml
+        0x81, // opMemImmLrg
+        Some(0x01), // opExtImm
+        opnd0,
+        opnd1
+    );
+}
+
+/// pop - Pop a register off the stack
+pub fn pop(cb: &mut CodeBlock, opnd: X86Opnd) {
+    match opnd {
+        X86Opnd::Reg(reg) => {
+            assert!(reg.num_bits == 64);
+
+            if opnd.rex_needed() {
+                write_rex(cb, false, 0, 0, reg.reg_no);
+            }
+            write_opcode(cb, 0x58, reg);
+        },
+        X86Opnd::Mem(mem) => {
+            assert!(mem.num_bits == 64);
+
+            write_rm(cb, false, false, X86Opnd::None, opnd, Some(0), &[0x8f]);
+        },
+        _ => unreachable!()
+    };
+}
+
+/// popfq - Pop the flags register (64-bit)
+pub fn popfq(cb: &mut CodeBlock) {
+    // REX.W + 0x9D
+    cb.write_bytes(&[0x48, 0x9d]);
+}
+
+/// push - Push an operand on the stack
+pub fn push(cb: &mut CodeBlock, opnd: X86Opnd) {
+    match opnd {
+        X86Opnd::Reg(reg) => {
+            if opnd.rex_needed() {
+                write_rex(cb, false, 0, 0, reg.reg_no);
+            }
+            write_opcode(cb, 0x50, reg);
+        },
+        X86Opnd::Mem(_mem) => {
+            write_rm(cb, false, false, X86Opnd::None, opnd, Some(6), &[0xff]);
+        },
+        _ => unreachable!()
+    }
+}
+
+/// pushfq - Push the flags register (64-bit)
+pub fn pushfq(cb: &mut CodeBlock) {
+    cb.write_byte(0x9C);
+}
+
+/// ret - Return from call, popping only the return address
+pub fn ret(cb: &mut CodeBlock) {
+    cb.write_byte(0xC3);
+}
+
+// Encode a bitwise shift instruction
+fn write_shift(cb: &mut CodeBlock, op_mem_one_pref: u8, op_mem_cl_pref: u8, op_mem_imm_pref: u8, op_ext: u8, opnd0: X86Opnd, opnd1: X86Opnd) {
+    assert!(matches!(opnd0, X86Opnd::Reg(_) | X86Opnd::Mem(_)));
+
+    // Check the size of opnd0
+    let opnd_size = opnd0.num_bits();
+    assert!(opnd_size == 16 || opnd_size == 32 || opnd_size == 64);
+
+    let sz_pref = opnd_size == 16;
+    let rex_w = opnd_size == 64;
+
+    match opnd1 {
+        X86Opnd::UImm(imm) => {
+            if imm.value == 1 {
+                write_rm(cb, sz_pref, rex_w, X86Opnd::None, opnd0, Some(op_ext), &[op_mem_one_pref]);
+            } else {
+                assert!(imm.num_bits <= 8);
+                write_rm(cb, sz_pref, rex_w, X86Opnd::None, opnd0, Some(op_ext), &[op_mem_imm_pref]);
+                cb.write_byte(imm.value as u8);
+            }
+        }
+
+        X86Opnd::Reg(reg) => {
+            // We can only use CL/RCX as the shift amount
+            assert!(reg.reg_no == RCX_REG.reg_no);
+            write_rm(cb, sz_pref, rex_w, X86Opnd::None, opnd0, Some(op_ext), &[op_mem_cl_pref]);
+        }
+
+        _ => {
+            unreachable!("unsupported operands: {:?}, {:?}", opnd0, opnd1);
+        }
+    }
+}
+
+// sal - Shift arithmetic left
+pub fn sal(cb: &mut CodeBlock, opnd0: X86Opnd, opnd1: X86Opnd) {
+    write_shift(
+        cb,
+        0xD1, // opMemOnePref,
+        0xD3, // opMemClPref,
+        0xC1, // opMemImmPref,
+        0x04,
+        opnd0,
+        opnd1
+    );
+}
+
+/// sar - Shift arithmetic right (signed)
+pub fn sar(cb: &mut CodeBlock, opnd0: X86Opnd, opnd1: X86Opnd) {
+    write_shift(
+        cb,
+        0xD1, // opMemOnePref,
+        0xD3, // opMemClPref,
+        0xC1, // opMemImmPref,
+        0x07,
+        opnd0,
+        opnd1
+    );
+}
+
+// shl - Shift logical left
+pub fn shl(cb: &mut CodeBlock, opnd0: X86Opnd, opnd1: X86Opnd) {
+    write_shift(
+        cb,
+        0xD1, // opMemOnePref,
+        0xD3, // opMemClPref,
+        0xC1, // opMemImmPref,
+        0x04,
+        opnd0,
+        opnd1
+    );
+}
+
+/// shr - Shift logical right (unsigned)
+pub fn shr(cb: &mut CodeBlock, opnd0: X86Opnd, opnd1: X86Opnd) {
+    write_shift(
+        cb,
+        0xD1, // opMemOnePref,
+        0xD3, // opMemClPref,
+        0xC1, // opMemImmPref,
+        0x05,
+        opnd0,
+        opnd1
+    );
+}
+
+/// sub - Integer subtraction
+pub fn sub(cb: &mut CodeBlock, opnd0: X86Opnd, opnd1: X86Opnd) {
+    write_rm_multi(
+        cb,
+        0x28, // opMemReg8
+        0x29, // opMemRegPref
+        0x2A, // opRegMem8
+        0x2B, // opRegMemPref
+        0x80, // opMemImm8
+        0x83, // opMemImmSml
+        0x81, // opMemImmLrg
+        Some(0x05), // opExtImm
+        opnd0,
+        opnd1
+    );
+}
+
+fn resize_opnd(opnd: X86Opnd, num_bits: u8) -> X86Opnd {
+    match opnd {
+        X86Opnd::Reg(reg) => {
+            let mut cloned = reg;
+            cloned.num_bits = num_bits;
+            X86Opnd::Reg(cloned)
+        },
+        X86Opnd::Mem(mem) => {
+            let mut cloned = mem;
+            cloned.num_bits = num_bits;
+            X86Opnd::Mem(cloned)
+        },
+        _ => unreachable!()
+    }
+}
+
+/// test - Logical Compare
+pub fn test(cb: &mut CodeBlock, rm_opnd: X86Opnd, test_opnd: X86Opnd) {
+    assert!(matches!(rm_opnd, X86Opnd::Reg(_) | X86Opnd::Mem(_)));
+    let rm_num_bits = rm_opnd.num_bits();
+
+    match test_opnd {
+        X86Opnd::UImm(uimm) => {
+            assert!(uimm.num_bits <= 32);
+            assert!(uimm.num_bits <= rm_num_bits);
+
+            // Use the smallest operand size possible
+            assert!(rm_num_bits % 8 == 0);
+            let rm_resized = resize_opnd(rm_opnd, uimm.num_bits);
+
+            if uimm.num_bits == 8 {
+                write_rm(cb, false, false, X86Opnd::None, rm_resized, Some(0x00), &[0xf6]);
+                cb.write_int(uimm.value, uimm.num_bits.into());
+            } else {
+                write_rm(cb, uimm.num_bits == 16, false, X86Opnd::None, rm_resized, Some(0x00), &[0xf7]);
+                cb.write_int(uimm.value, uimm.num_bits.into());
+            }
+        },
+        X86Opnd::Imm(imm) => {
+            // This mode only applies to 64-bit R/M operands with 32-bit signed immediates
+            assert!(imm.num_bits <= 32);
+            assert!(rm_num_bits == 64);
+
+            write_rm(cb, false, true, X86Opnd::None, rm_opnd, Some(0x00), &[0xf7]);
+            cb.write_int(imm.value as u64, 32);
+        },
+        X86Opnd::Reg(reg) => {
+            assert!(reg.num_bits == rm_num_bits);
+
+            if rm_num_bits == 8 {
+                write_rm(cb, false, false, test_opnd, rm_opnd, None, &[0x84]);
+            } else {
+                write_rm(cb, rm_num_bits == 16, rm_num_bits == 64, test_opnd, rm_opnd, None, &[0x85]);
+            }
+        },
+        _ => unreachable!()
+    };
+}
+
+/// Undefined opcode
+pub fn ud2(cb: &mut CodeBlock) {
+    cb.write_bytes(&[0x0f, 0x0b]);
+}
+
+/// xchg - Exchange Register/Memory with Register
+pub fn xchg(cb: &mut CodeBlock, rm_opnd: X86Opnd, r_opnd: X86Opnd) {
+    if let (X86Opnd::Reg(rm_reg), X86Opnd::Reg(r_reg)) = (rm_opnd, r_opnd) {
+        assert!(rm_reg.num_bits == 64);
+        assert!(r_reg.num_bits == 64);
+
+        // If we're exchanging with RAX
+        if rm_reg.reg_no == RAX_REG_NO {
+            // Write the REX byte
+            write_rex(cb, true, 0, 0, r_reg.reg_no);
+
+            // Write the opcode and register number
+            cb.write_byte(0x90 + (r_reg.reg_no & 7));
+        } else {
+            write_rm(cb, false, true, r_opnd, rm_opnd, None, &[0x87]);
+        }
+    } else {
+        unreachable!();
+    }
+}
+
+/// xor - Exclusive bitwise OR
+pub fn xor(cb: &mut CodeBlock, opnd0: X86Opnd, opnd1: X86Opnd) {
+    write_rm_multi(
+        cb,
+        0x30, // opMemReg8
+        0x31, // opMemRegPref
+        0x32, // opRegMem8
+        0x33, // opRegMemPref
+        0x80, // opMemImm8
+        0x83, // opMemImmSml
+        0x81, // opMemImmLrg
+        Some(0x06), // opExtImm
+        opnd0,
+        opnd1
+    );
+}
diff --git a/zjit/src/asm/x86_64/tests.rs b/zjit/src/asm/x86_64/tests.rs
new file mode 100644
index 00000000000000..ec490fd3301333
--- /dev/null
+++ b/zjit/src/asm/x86_64/tests.rs
@@ -0,0 +1,461 @@
+#![cfg(test)]
+
+use crate::asm::x86_64::*;
+
+/// Check that the bytes for an instruction sequence match a hex string
+fn check_bytes<R>(bytes: &str, run: R) where R: FnOnce(&mut super::CodeBlock) {
+    let mut cb = super::CodeBlock::new_dummy();
+    run(&mut cb);
+    assert_eq!(format!("{:x}", cb), bytes);
+}
+
+#[test]
+fn test_add() {
+    check_bytes("80c103", |cb| add(cb, CL, imm_opnd(3)));
+    check_bytes("00d9", |cb| add(cb, CL, BL));
+    check_bytes("4000e1", |cb| add(cb, CL, SPL));
+    check_bytes("6601d9", |cb| add(cb, CX, BX));
+    check_bytes("4801d8", |cb| add(cb, RAX, RBX));
+    check_bytes("01d1", |cb| add(cb, ECX, EDX));
+    check_bytes("4c01f2", |cb| add(cb, RDX, R14));
+    check_bytes("480110", |cb| add(cb, mem_opnd(64, RAX, 0), RDX));
+    check_bytes("480310", |cb| add(cb, RDX, mem_opnd(64, RAX, 0)));
+    check_bytes("48035008", |cb| add(cb, RDX, mem_opnd(64, RAX, 8)));
+    check_bytes("480390ff000000", |cb| add(cb, RDX, mem_opnd(64, RAX, 255)));
+    check_bytes("4881407fff000000", |cb| add(cb, mem_opnd(64, RAX, 127), imm_opnd(255)));
+    check_bytes("0110", |cb| add(cb, mem_opnd(32, RAX, 0), EDX));
+    check_bytes("4883c408", |cb| add(cb, RSP, imm_opnd(8)));
+    check_bytes("83c108", |cb| add(cb, ECX, imm_opnd(8)));
+    check_bytes("81c1ff000000", |cb| add(cb, ECX, imm_opnd(255)));
+}
+
+#[test]
+fn test_add_unsigned() {
+    // ADD r/m8, imm8
+    check_bytes("4180c001", |cb| add(cb, R8B, uimm_opnd(1)));
+    check_bytes("4180c07f", |cb| add(cb, R8B, imm_opnd(i8::MAX.try_into().unwrap())));
+
+    // ADD r/m16, imm16
+    check_bytes("664183c001", |cb| add(cb, R8W, uimm_opnd(1)));
+    check_bytes("664181c0ff7f", |cb| add(cb, R8W, uimm_opnd(i16::MAX.try_into().unwrap())));
+
+    // ADD r/m32, imm32
+    check_bytes("4183c001", |cb| add(cb, R8D, uimm_opnd(1)));
+    check_bytes("4181c0ffffff7f", |cb| add(cb, R8D, uimm_opnd(i32::MAX.try_into().unwrap())));
+
+    // ADD r/m64, imm32
+    check_bytes("4983c001", |cb| add(cb, R8, uimm_opnd(1)));
+    check_bytes("4981c0ffffff7f", |cb| add(cb, R8, uimm_opnd(i32::MAX.try_into().unwrap())));
+}
+
+#[test]
+fn test_and() {
+    check_bytes("4421e5", |cb| and(cb, EBP, R12D));
+    check_bytes("48832008", |cb| and(cb, mem_opnd(64, RAX, 0), imm_opnd(0x08)));
+}
+
+#[test]
+fn test_call_label() {
+    check_bytes("e8fbffffff", |cb| {
+        let label_idx = cb.new_label("fn".to_owned());
+        call_label(cb, label_idx);
+        cb.link_labels();
+    });
+}
+
+#[test]
+fn test_call_ptr() {
+    // calling a lower address
+    check_bytes("e8fbffffff", |cb| {
+        let ptr = cb.get_write_ptr();
+        call_ptr(cb, RAX, ptr.raw_ptr(cb));
+    });
+}
+
+#[test]
+fn test_call_reg() {
+    check_bytes("ffd0", |cb| call(cb, RAX));
+}
+
+#[test]
+fn test_call_mem() {
+    check_bytes("ff542408", |cb| call(cb, mem_opnd(64, RSP, 8)));
+}
+
+#[test]
+fn test_cmovcc() {
+    check_bytes("0f4ff7", |cb| cmovg(cb, ESI, EDI));
+    check_bytes("0f4f750c", |cb| cmovg(cb, ESI, mem_opnd(32, RBP, 12)));
+    check_bytes("0f4cc1", |cb| cmovl(cb, EAX, ECX));
+    check_bytes("480f4cdd", |cb| cmovl(cb, RBX, RBP));
+    check_bytes("0f4e742404", |cb| cmovle(cb, ESI, mem_opnd(32, RSP, 4)));
+}
+
+#[test]
+fn test_cmp() {
+    check_bytes("38d1", |cb| cmp(cb, CL, DL));
+    check_bytes("39f9", |cb| cmp(cb, ECX, EDI));
+    check_bytes("493b1424", |cb| cmp(cb, RDX, mem_opnd(64, R12, 0)));
+    check_bytes("4883f802", |cb| cmp(cb, RAX, imm_opnd(2)));
+    check_bytes("81f900000080", |cb| cmp(cb, ECX, uimm_opnd(0x8000_0000)));
+}
+
+#[test]
+fn test_cqo() {
+    check_bytes("4899", |cb| cqo(cb));
+}
+
+#[test]
+fn test_imul() {
+    check_bytes("480fafc3", |cb| imul(cb, RAX, RBX));
+    check_bytes("480faf10", |cb| imul(cb, RDX, mem_opnd(64, RAX, 0)));
+
+    // Operands flipped for encoding since multiplication is commutative
+    check_bytes("480faf10", |cb| imul(cb, mem_opnd(64, RAX, 0), RDX));
+}
+
+#[test]
+fn test_jge_label() {
+    check_bytes("0f8dfaffffff", |cb| {
+        let label_idx = cb.new_label("loop".to_owned());
+        jge_label(cb, label_idx);
+        cb.link_labels();
+    });
+}
+
+#[test]
+fn test_jmp_label() {
+    // Forward jump
+    check_bytes("e900000000", |cb| {
+        let label_idx = cb.new_label("next".to_owned());
+        jmp_label(cb, label_idx);
+        cb.write_label(label_idx);
+        cb.link_labels();
+    });
+
+    // Backwards jump
+    check_bytes("e9fbffffff", |cb| {
+        let label_idx = cb.new_label("loop".to_owned());
+        cb.write_label(label_idx);
+        jmp_label(cb, label_idx);
+        cb.link_labels();
+    });
+}
+
+#[test]
+fn test_jmp_rm() {
+    check_bytes("41ffe4", |cb| jmp_rm(cb, R12));
+}
+
+#[test]
+fn test_jo_label() {
+    check_bytes("0f80faffffff", |cb| {
+        let label_idx = cb.new_label("loop".to_owned());
+        jo_label(cb, label_idx);
+        cb.link_labels();
+    });
+}
+
+#[test]
+fn test_lea() {
+    check_bytes("488d5108", |cb| lea(cb, RDX, mem_opnd(64, RCX, 8)));
+    check_bytes("488d0500000000", |cb| lea(cb, RAX, mem_opnd(8, RIP, 0)));
+    check_bytes("488d0505000000", |cb| lea(cb, RAX, mem_opnd(8, RIP, 5)));
+    check_bytes("488d3d05000000", |cb| lea(cb, RDI, mem_opnd(8, RIP, 5)));
+}
+
+#[test]
+fn test_mov() {
+    check_bytes("b807000000", |cb| mov(cb, EAX, imm_opnd(7)));
+    check_bytes("b8fdffffff", |cb| mov(cb, EAX, imm_opnd(-3)));
+    check_bytes("41bf03000000", |cb| mov(cb, R15, imm_opnd(3)));
+    check_bytes("89d8", |cb| mov(cb, EAX, EBX));
+    check_bytes("89c8", |cb| mov(cb, EAX, ECX));
+    check_bytes("8b9380000000", |cb| mov(cb, EDX, mem_opnd(32, RBX, 128)));
+    check_bytes("488b442404", |cb| mov(cb, RAX, mem_opnd(64, RSP, 4)));
+
+    // Test `mov rax, 3` => `mov eax, 3` optimization
+    check_bytes("41b834000000", |cb| mov(cb, R8, imm_opnd(0x34)));
+    check_bytes("49b80000008000000000", |cb| mov(cb, R8, imm_opnd(0x80000000)));
+    check_bytes("49b8ffffffffffffffff", |cb| mov(cb, R8, imm_opnd(-1)));
+
+    check_bytes("b834000000", |cb| mov(cb, RAX, imm_opnd(0x34)));
+    check_bytes("48b8020000000000c0ff", |cb| mov(cb, RAX, imm_opnd(-18014398509481982)));
+    check_bytes("48b80000008000000000", |cb| mov(cb, RAX, imm_opnd(0x80000000)));
+    check_bytes("48b8ccffffffffffffff", |cb| mov(cb, RAX, imm_opnd(-52))); // yasm thinks this could use a dword immediate instead of qword
+    check_bytes("48b8ffffffffffffffff", |cb| mov(cb, RAX, imm_opnd(-1))); // yasm thinks this could use a dword immediate instead of qword
+    check_bytes("4488c9", |cb| mov(cb, CL, R9B));
+    check_bytes("4889c3", |cb| mov(cb, RBX, RAX));
+    check_bytes("4889df", |cb| mov(cb, RDI, RBX));
+    check_bytes("40b60b", |cb| mov(cb, SIL, imm_opnd(11)));
+
+    check_bytes("c60424fd", |cb| mov(cb, mem_opnd(8, RSP, 0), imm_opnd(-3)));
+    check_bytes("48c7470801000000", |cb| mov(cb, mem_opnd(64, RDI, 8), imm_opnd(1)));
+    //check_bytes("67c7400411000000", |cb| mov(cb, mem_opnd(32, EAX, 4), imm_opnd(0x34))); // We don't distinguish between EAX and RAX here - that's probably fine?
+    check_bytes("c7400411000000", |cb| mov(cb, mem_opnd(32, RAX, 4), imm_opnd(17)));
+    check_bytes("c7400401000080", |cb| mov(cb, mem_opnd(32, RAX, 4), uimm_opnd(0x80000001)));
+    check_bytes("41895814", |cb| mov(cb, mem_opnd(32, R8, 20), EBX));
+    check_bytes("4d8913", |cb| mov(cb, mem_opnd(64, R11, 0), R10));
+    check_bytes("48c742f8f4ffffff", |cb| mov(cb, mem_opnd(64, RDX, -8), imm_opnd(-12)));
+}
+
+#[test]
+fn test_movabs() {
+    check_bytes("49b83400000000000000", |cb| movabs(cb, R8, 0x34));
+    check_bytes("49b80000008000000000", |cb| movabs(cb, R8, 0x80000000));
+}
+
+#[test]
+fn test_mov_unsigned() {
+    // MOV AL, imm8
+    check_bytes("b001", |cb| mov(cb, AL, uimm_opnd(1)));
+    check_bytes("b0ff", |cb| mov(cb, AL, uimm_opnd(u8::MAX.into())));
+
+    // MOV AX, imm16
+    check_bytes("66b80100", |cb| mov(cb, AX, uimm_opnd(1)));
+    check_bytes("66b8ffff", |cb| mov(cb, AX, uimm_opnd(u16::MAX.into())));
+
+    // MOV EAX, imm32
+    check_bytes("b801000000", |cb| mov(cb, EAX, uimm_opnd(1)));
+    check_bytes("b8ffffffff", |cb| mov(cb, EAX, uimm_opnd(u32::MAX.into())));
+    check_bytes("41b800000000", |cb| mov(cb, R8, uimm_opnd(0)));
+    check_bytes("41b8ffffffff", |cb| mov(cb, R8, uimm_opnd(0xFF_FF_FF_FF)));
+
+    // MOV RAX, imm64, will move down into EAX since it fits into 32 bits
+    check_bytes("b801000000", |cb| mov(cb, RAX, uimm_opnd(1)));
+    check_bytes("b8ffffffff", |cb| mov(cb, RAX, uimm_opnd(u32::MAX.into())));
+
+    // MOV RAX, imm64, will not move down into EAX since it does not fit into 32 bits
+    check_bytes("48b80000000001000000", |cb| mov(cb, RAX, uimm_opnd(u32::MAX as u64 + 1)));
+    check_bytes("48b8ffffffffffffffff", |cb| mov(cb, RAX, uimm_opnd(u64::MAX)));
+    check_bytes("49b8ffffffffffffffff", |cb| mov(cb, R8, uimm_opnd(u64::MAX)));
+
+    // MOV r8, imm8
+    check_bytes("41b001", |cb| mov(cb, R8B, uimm_opnd(1)));
+    check_bytes("41b0ff", |cb| mov(cb, R8B, uimm_opnd(u8::MAX.into())));
+
+    // MOV r16, imm16
+    check_bytes("6641b80100", |cb| mov(cb, R8W, uimm_opnd(1)));
+    check_bytes("6641b8ffff", |cb| mov(cb, R8W, uimm_opnd(u16::MAX.into())));
+
+    // MOV r32, imm32
+    check_bytes("41b801000000", |cb| mov(cb, R8D, uimm_opnd(1)));
+    check_bytes("41b8ffffffff", |cb| mov(cb, R8D, uimm_opnd(u32::MAX.into())));
+
+    // MOV r64, imm64, will move down into 32 bit since it fits into 32 bits
+    check_bytes("41b801000000", |cb| mov(cb, R8, uimm_opnd(1)));
+
+    // MOV r64, imm64, will not move down into 32 bit since it does not fit into 32 bits
+    check_bytes("49b8ffffffffffffffff", |cb| mov(cb, R8, uimm_opnd(u64::MAX)));
+}
+
+#[test]
+fn test_mov_iprel() {
+    check_bytes("8b0500000000", |cb| mov(cb, EAX, mem_opnd(32, RIP, 0)));
+    check_bytes("8b0505000000", |cb| mov(cb, EAX, mem_opnd(32, RIP, 5)));
+
+    check_bytes("488b0500000000", |cb| mov(cb, RAX, mem_opnd(64, RIP, 0)));
+    check_bytes("488b0505000000", |cb| mov(cb, RAX, mem_opnd(64, RIP, 5)));
+    check_bytes("488b3d05000000", |cb| mov(cb, RDI, mem_opnd(64, RIP, 5)));
+}
+
+#[test]
+fn test_movsx() {
+    check_bytes("660fbec0", |cb| movsx(cb, AX, AL));
+    check_bytes("0fbed0", |cb| movsx(cb, EDX, AL));
+    check_bytes("480fbec3", |cb| movsx(cb, RAX, BL));
+    check_bytes("0fbfc8", |cb| movsx(cb, ECX, AX));
+    check_bytes("4c0fbed9", |cb| movsx(cb, R11, CL));
+    check_bytes("4c6354240c", |cb| movsx(cb, R10, mem_opnd(32, RSP, 12)));
+    check_bytes("480fbe0424", |cb| movsx(cb, RAX, mem_opnd(8, RSP, 0)));
+    check_bytes("490fbf5504", |cb| movsx(cb, RDX, mem_opnd(16, R13, 4)));
+}
+
+#[test]
+fn test_nop() {
+    check_bytes("90", |cb| nop(cb, 1));
+    check_bytes("6690", |cb| nop(cb, 2));
+    check_bytes("0f1f00", |cb| nop(cb, 3));
+    check_bytes("0f1f4000", |cb| nop(cb, 4));
+    check_bytes("0f1f440000", |cb| nop(cb, 5));
+    check_bytes("660f1f440000", |cb| nop(cb, 6));
+    check_bytes("0f1f8000000000", |cb| nop(cb, 7));
+    check_bytes("0f1f840000000000", |cb| nop(cb, 8));
+    check_bytes("660f1f840000000000", |cb| nop(cb, 9));
+    check_bytes("660f1f84000000000090", |cb| nop(cb, 10));
+    check_bytes("660f1f8400000000006690", |cb| nop(cb, 11));
+    check_bytes("660f1f8400000000000f1f00", |cb| nop(cb, 12));
+}
+
+#[test]
+fn test_not() {
+    check_bytes("66f7d0", |cb| not(cb, AX));
+    check_bytes("f7d0", |cb| not(cb, EAX));
+    check_bytes("49f71424", |cb| not(cb, mem_opnd(64, R12, 0)));
+    check_bytes("f794242d010000", |cb| not(cb, mem_opnd(32, RSP, 301)));
+    check_bytes("f71424", |cb| not(cb, mem_opnd(32, RSP, 0)));
+    check_bytes("f7542403", |cb| not(cb, mem_opnd(32, RSP, 3)));
+    check_bytes("f75500", |cb| not(cb, mem_opnd(32, RBP, 0)));
+    check_bytes("f7550d", |cb| not(cb, mem_opnd(32, RBP, 13)));
+    check_bytes("48f7d0", |cb| not(cb, RAX));
+    check_bytes("49f7d3", |cb| not(cb, R11));
+    check_bytes("f710", |cb| not(cb, mem_opnd(32, RAX, 0)));
+    check_bytes("f716", |cb| not(cb, mem_opnd(32, RSI, 0)));
+    check_bytes("f717", |cb| not(cb, mem_opnd(32, RDI, 0)));
+    check_bytes("f75237", |cb| not(cb, mem_opnd(32, RDX, 55)));
+    check_bytes("f79239050000", |cb| not(cb, mem_opnd(32, RDX, 1337)));
+    check_bytes("f752c9", |cb| not(cb, mem_opnd(32, RDX, -55)));
+    check_bytes("f792d5fdffff", |cb| not(cb, mem_opnd(32, RDX, -555)));
+}
+
+#[test]
+fn test_or() {
+    check_bytes("09f2", |cb| or(cb, EDX, ESI));
+}
+
+#[test]
+fn test_pop() {
+    check_bytes("58", |cb| pop(cb, RAX));
+    check_bytes("5b", |cb| pop(cb, RBX));
+    check_bytes("5c", |cb| pop(cb, RSP));
+    check_bytes("5d", |cb| pop(cb, RBP));
+    check_bytes("415c", |cb| pop(cb, R12));
+    check_bytes("8f00", |cb| pop(cb, mem_opnd(64, RAX, 0)));
+    check_bytes("418f00", |cb| pop(cb, mem_opnd(64, R8, 0)));
+    check_bytes("418f4003", |cb| pop(cb, mem_opnd(64, R8, 3)));
+    check_bytes("8f44c803", |cb| pop(cb, mem_opnd_sib(64, RAX, RCX, 8, 3)));
+    check_bytes("418f44c803", |cb| pop(cb, mem_opnd_sib(64, R8, RCX, 8, 3)));
+}
+
+#[test]
+fn test_push() {
+    check_bytes("50", |cb| push(cb, RAX));
+    check_bytes("53", |cb| push(cb, RBX));
+    check_bytes("4154", |cb| push(cb, R12));
+    check_bytes("ff30", |cb| push(cb, mem_opnd(64, RAX, 0)));
+    check_bytes("41ff30", |cb| push(cb, mem_opnd(64, R8, 0)));
+    check_bytes("41ff7003", |cb| push(cb, mem_opnd(64, R8, 3)));
+    check_bytes("ff74c803", |cb| push(cb, mem_opnd_sib(64, RAX, RCX, 8, 3)));
+    check_bytes("41ff74c803", |cb| push(cb, mem_opnd_sib(64, R8, RCX, 8, 3)));
+}
+
+#[test]
+fn test_ret() {
+    check_bytes("c3", |cb| ret(cb));
+}
+
+#[test]
+fn test_sal() {
+    check_bytes("66d1e1", |cb| sal(cb, CX, uimm_opnd(1)));
+    check_bytes("d1e1", |cb| sal(cb, ECX, uimm_opnd(1)));
+    check_bytes("c1e505", |cb| sal(cb, EBP, uimm_opnd(5)));
+    check_bytes("d1642444", |cb| sal(cb, mem_opnd(32, RSP, 68), uimm_opnd(1)));
+    check_bytes("48d3e1", |cb| sal(cb, RCX, CL));
+}
+
+#[test]
+fn test_sar() {
+    check_bytes("d1fa", |cb| sar(cb, EDX, uimm_opnd(1)));
+}
+
+#[test]
+fn test_shr() {
+    check_bytes("49c1ee07", |cb| shr(cb, R14, uimm_opnd(7)));
+}
+
+#[test]
+fn test_sub() {
+    check_bytes("83e801", |cb| sub(cb, EAX, imm_opnd(1)));
+    check_bytes("4883e802", |cb| sub(cb, RAX, imm_opnd(2)));
+}
+
+#[test]
+#[should_panic]
+fn test_sub_uimm_too_large() {
+    // This immediate becomes a different value after
+    // sign extension, so not safe to encode.
+    check_bytes("ff", |cb| sub(cb, RCX, uimm_opnd(0x8000_0000)));
+}
+
+#[test]
+fn test_test() {
+    check_bytes("84c0", |cb| test(cb, AL, AL));
+    check_bytes("6685c0", |cb| test(cb, AX, AX));
+    check_bytes("f6c108", |cb| test(cb, CL, uimm_opnd(8)));
+    check_bytes("f6c207", |cb| test(cb, DL, uimm_opnd(7)));
+    check_bytes("f6c108", |cb| test(cb, RCX, uimm_opnd(8)));
+    check_bytes("f6420808", |cb| test(cb, mem_opnd(8, RDX, 8), uimm_opnd(8)));
+    check_bytes("f64208ff", |cb| test(cb, mem_opnd(8, RDX, 8), uimm_opnd(255)));
+    check_bytes("66f7c2ffff", |cb| test(cb, DX, uimm_opnd(0xffff)));
+    check_bytes("66f74208ffff", |cb| test(cb, mem_opnd(16, RDX, 8), uimm_opnd(0xffff)));
+    check_bytes("f60601", |cb| test(cb, mem_opnd(8, RSI, 0), uimm_opnd(1)));
+    check_bytes("f6461001", |cb| test(cb, mem_opnd(8, RSI, 16), uimm_opnd(1)));
+    check_bytes("f646f001", |cb| test(cb, mem_opnd(8, RSI, -16), uimm_opnd(1)));
+    check_bytes("854640", |cb| test(cb, mem_opnd(32, RSI, 64), EAX));
+    check_bytes("4885472a", |cb| test(cb, mem_opnd(64, RDI, 42), RAX));
+    check_bytes("4885c0", |cb| test(cb, RAX, RAX));
+    check_bytes("4885f0", |cb| test(cb, RAX, RSI));
+    check_bytes("48f74640f7ffffff", |cb| test(cb, mem_opnd(64, RSI, 64), imm_opnd(!0x08)));
+    check_bytes("48f7464008000000", |cb| test(cb, mem_opnd(64, RSI, 64), imm_opnd(0x08)));
+    check_bytes("48f7c108000000", |cb| test(cb, RCX, imm_opnd(0x08)));
+    //check_bytes("48a9f7ffff0f", |cb| test(cb, RAX, imm_opnd(0x0FFFFFF7)));
+}
+
+#[test]
+fn test_xchg() {
+    check_bytes("4891", |cb| xchg(cb, RAX, RCX));
+    check_bytes("4995", |cb| xchg(cb, RAX, R13));
+    check_bytes("4887d9", |cb| xchg(cb, RCX, RBX));
+    check_bytes("4d87f9", |cb| xchg(cb, R9, R15));
+}
+
+#[test]
+fn test_xor() {
+    check_bytes("31c0", |cb| xor(cb, EAX, EAX));
+}
+
+#[test]
+#[cfg(feature = "disasm")]
+fn basic_capstone_usage() -> std::result::Result<(), capstone::Error> {
+    // Test drive Capstone with simple input
+    use capstone::prelude::*;
+    let cs = Capstone::new()
+        .x86()
+        .mode(arch::x86::ArchMode::Mode64)
+        .syntax(arch::x86::ArchSyntax::Intel)
+        .build()?;
+
+    let insns = cs.disasm_all(&[0xCC], 0x1000)?;
+
+    match insns.as_ref() {
+        [insn] => {
+            assert_eq!(Some("int3"), insn.mnemonic());
+            Ok(())
+        }
+        _ => Err(capstone::Error::CustomError(
+            "expected to disassemble to int3",
+        )),
+    }
+}
+
+#[test]
+#[ignore]
+#[cfg(feature = "disasm")]
+fn block_comments() {
+    let mut cb = super::CodeBlock::new_dummy();
+
+    let first_write_ptr = cb.get_write_ptr().raw_addr(&cb);
+    cb.add_comment("Beginning");
+    xor(&mut cb, EAX, EAX); // 2 bytes long
+    let second_write_ptr = cb.get_write_ptr().raw_addr(&cb);
+    cb.add_comment("Two bytes in");
+    cb.add_comment("Still two bytes in");
+    cb.add_comment("Still two bytes in"); // Duplicate, should be ignored
+    test(&mut cb, mem_opnd(64, RSI, 64), imm_opnd(!0x08)); // 8 bytes long
+    let third_write_ptr = cb.get_write_ptr().raw_addr(&cb);
+    cb.add_comment("Ten bytes in");
+
+    assert_eq!(&vec!( "Beginning".to_string() ), cb.comments_at(first_write_ptr).unwrap());
+    assert_eq!(&vec!( "Two bytes in".to_string(), "Still two bytes in".to_string() ), cb.comments_at(second_write_ptr).unwrap());
+    assert_eq!(&vec!( "Ten bytes in".to_string() ), cb.comments_at(third_write_ptr).unwrap());
+}
diff --git a/zjit/src/assertions.rs b/zjit/src/assertions.rs
new file mode 100644
index 00000000000000..0dacc938fc5724
--- /dev/null
+++ b/zjit/src/assertions.rs
@@ -0,0 +1,21 @@
+/// Assert that CodeBlock has the code specified with hex. In addition, if tested with
+/// `cargo test --all-features`, it also checks it generates the specified disasm.
+#[cfg(test)]
+macro_rules! assert_disasm {
+    ($cb:expr, $hex:expr, $disasm:expr) => {
+        #[cfg(feature = "disasm")]
+        {
+            use $crate::disasm::disasm_addr_range;
+            use $crate::cruby::unindent;
+            let disasm = disasm_addr_range(
+                &$cb,
+                $cb.get_ptr(0).raw_addr(&$cb),
+                $cb.get_write_ptr().raw_addr(&$cb),
+            );
+            assert_eq!(unindent(&disasm, false), unindent(&$disasm, true));
+        }
+        assert_eq!(format!("{:x}", $cb), $hex);
+    };
+}
+#[cfg(test)]
+pub(crate) use assert_disasm;
diff --git a/zjit/src/backend/arm64/mod.rs b/zjit/src/backend/arm64/mod.rs
new file mode 100644
index 00000000000000..4f804a3406ce84
--- /dev/null
+++ b/zjit/src/backend/arm64/mod.rs
@@ -0,0 +1,1802 @@
+use std::mem::take;
+
+use crate::asm::{CodeBlock, Label};
+use crate::asm::arm64::*;
+use crate::cruby::*;
+use crate::backend::lir::*;
+use crate::virtualmem::CodePtr;
+use crate::cast::*;
+
+// Use the arm64 register type for this platform
+pub type Reg = A64Reg;
+
+// Callee-saved registers
+pub const _CFP: Opnd = Opnd::Reg(X19_REG);
+pub const _EC: Opnd = Opnd::Reg(X20_REG);
+pub const _SP: Opnd = Opnd::Reg(X21_REG);
+
+// C argument registers on this platform
+pub const _C_ARG_OPNDS: [Opnd; 6] = [
+    Opnd::Reg(X0_REG),
+    Opnd::Reg(X1_REG),
+    Opnd::Reg(X2_REG),
+    Opnd::Reg(X3_REG),
+    Opnd::Reg(X4_REG),
+    Opnd::Reg(X5_REG)
+];
+
+// C return value register on this platform
+pub const C_RET_REG: Reg = X0_REG;
+pub const _C_RET_OPND: Opnd = Opnd::Reg(X0_REG);
+pub const _NATIVE_STACK_PTR: Opnd = Opnd::Reg(XZR_REG);
+
+// These constants define the way we work with Arm64's stack pointer. The stack
+// pointer always needs to be aligned to a 16-byte boundary.
+pub const C_SP_REG: A64Opnd = X31;
+pub const C_SP_STEP: i32 = 16;
+
+impl CodeBlock {
+    // The maximum number of bytes that can be generated by emit_jmp_ptr.
+    pub fn jmp_ptr_bytes(&self) -> usize {
+        // b instruction's offset is encoded as imm26 times 4. It can jump to
+        // +/-128MiB, so this can be used when --yjit-exec-mem-size <= 128.
+        /*
+        let num_insns = if b_offset_fits_bits(self.virtual_region_size() as i64 / 4) {
+            1 // b instruction
+        } else {
+            5 // 4 instructions to load a 64-bit absolute address + br instruction
+        };
+        */
+        let num_insns = 5; // TODO: support virtual_region_size() check
+        num_insns * 4
+    }
+
+    // The maximum number of instructions that can be generated by emit_conditional_jump.
+    fn conditional_jump_insns(&self) -> i32 {
+        // The worst case is instructions for a jump + bcond.
+        self.jmp_ptr_bytes() as i32 / 4 + 1
+    }
+}
+
+/// Map Opnd to A64Opnd
+impl From<Opnd> for A64Opnd {
+    fn from(opnd: Opnd) -> Self {
+        match opnd {
+            Opnd::UImm(value) => A64Opnd::new_uimm(value),
+            Opnd::Imm(value) => A64Opnd::new_imm(value),
+            Opnd::Reg(reg) => A64Opnd::Reg(reg),
+            Opnd::Mem(Mem { base: MemBase::Reg(reg_no), num_bits, disp }) => {
+                A64Opnd::new_mem(num_bits, A64Opnd::Reg(A64Reg { num_bits, reg_no }), disp)
+            },
+            Opnd::Mem(Mem { base: MemBase::VReg(_), .. }) => {
+                panic!("attempted to lower an Opnd::Mem with a MemBase::VReg base")
+            },
+            Opnd::VReg { .. } => panic!("attempted to lower an Opnd::VReg"),
+            Opnd::Value(_) => panic!("attempted to lower an Opnd::Value"),
+            Opnd::None => panic!(
+                "Attempted to lower an Opnd::None. This often happens when an out operand was not allocated for an instruction because the output of the instruction was not used. Please ensure you are using the output."
+            ),
+
+        }
+    }
+}
+
+/// Also implement going from a reference to an operand for convenience.
+impl From<&Opnd> for A64Opnd {
+    fn from(opnd: &Opnd) -> Self {
+        A64Opnd::from(*opnd)
+    }
+}
+
+/// Call emit_jmp_ptr and immediately invalidate the written range.
+/// This is needed when next_page also moves other_cb that is not invalidated
+/// by compile_with_regs. Doing it here allows you to avoid invalidating a lot
+/// more than necessary when other_cb jumps from a position early in the page.
+/// This invalidates a small range of cb twice, but we accept the small cost.
+fn emit_jmp_ptr_with_invalidation(cb: &mut CodeBlock, dst_ptr: CodePtr) {
+    let start = cb.get_write_ptr();
+    emit_jmp_ptr(cb, dst_ptr, true);
+    let end = cb.get_write_ptr();
+    unsafe { rb_zjit_icache_invalidate(start.raw_ptr(cb) as _, end.raw_ptr(cb) as _) };
+}
+
+fn emit_jmp_ptr(cb: &mut CodeBlock, dst_ptr: CodePtr, padding: bool) {
+    let src_addr = cb.get_write_ptr().as_offset();
+    let dst_addr = dst_ptr.as_offset();
+
+    // If the offset is short enough, then we'll use the
+    // branch instruction. Otherwise, we'll move the
+    // destination into a register and use the branch
+    // register instruction.
+    let num_insns = if b_offset_fits_bits((dst_addr - src_addr) / 4) {
+        b(cb, InstructionOffset::from_bytes((dst_addr - src_addr) as i32));
+        1
+    } else {
+        let num_insns = emit_load_value(cb, Assembler::SCRATCH0, dst_addr as u64);
+        br(cb, Assembler::SCRATCH0);
+        num_insns + 1
+    };
+
+    if padding {
+        // Make sure it's always a consistent number of
+        // instructions in case it gets patched and has to
+        // use the other branch.
+        assert!(num_insns * 4 <= cb.jmp_ptr_bytes());
+        for _ in num_insns..(cb.jmp_ptr_bytes() / 4) {
+            nop(cb);
+        }
+    }
+}
+
+/// Emit the required instructions to load the given value into the
+/// given register. Our goal here is to use as few instructions as
+/// possible to get this value into the register.
+fn emit_load_value(cb: &mut CodeBlock, rd: A64Opnd, value: u64) -> usize {
+    let mut current = value;
+
+    if current <= 0xffff {
+        // If the value fits into a single movz
+        // instruction, then we'll use that.
+        movz(cb, rd, A64Opnd::new_uimm(current), 0);
+        return 1;
+    } else if BitmaskImmediate::try_from(current).is_ok() {
+        // Otherwise, if the immediate can be encoded
+        // with the special bitmask immediate encoding,
+        // we'll use that.
+        mov(cb, rd, A64Opnd::new_uimm(current));
+        return 1;
+    } else {
+        // Finally we'll fall back to encoding the value
+        // using movz for the first 16 bits and movk for
+        // each subsequent set of 16 bits as long we
+        // they are necessary.
+        movz(cb, rd, A64Opnd::new_uimm(current & 0xffff), 0);
+        let mut num_insns = 1;
+
+        // (We're sure this is necessary since we
+        // checked if it only fit into movz above).
+        current >>= 16;
+        movk(cb, rd, A64Opnd::new_uimm(current & 0xffff), 16);
+        num_insns += 1;
+
+        if current > 0xffff {
+            current >>= 16;
+            movk(cb, rd, A64Opnd::new_uimm(current & 0xffff), 32);
+            num_insns += 1;
+        }
+
+        if current > 0xffff {
+            current >>= 16;
+            movk(cb, rd, A64Opnd::new_uimm(current & 0xffff), 48);
+            num_insns += 1;
+        }
+        return num_insns;
+    }
+}
+
+/// List of registers that can be used for register allocation.
+/// This has the same number of registers for x86_64 and arm64.
+/// SCRATCH0 and SCRATCH1 are excluded.
+pub const ALLOC_REGS: &'static [Reg] = &[
+    X0_REG,
+    X1_REG,
+    X2_REG,
+    X3_REG,
+    X4_REG,
+    X5_REG,
+    X11_REG,
+    X12_REG,
+];
+
+impl Assembler
+{
+    // Special scratch registers for intermediate processing.
+    // This register is caller-saved (so we don't have to save it before using it)
+    pub const SCRATCH_REG: Reg = X16_REG;
+    const SCRATCH0: A64Opnd = A64Opnd::Reg(Assembler::SCRATCH_REG);
+    const SCRATCH1: A64Opnd = A64Opnd::Reg(X17_REG);
+
+    /// Get the list of registers from which we will allocate on this platform
+    pub fn get_alloc_regs() -> Vec<Reg> {
+        ALLOC_REGS.to_vec()
+    }
+
+    /// Get a list of all of the caller-saved registers
+    pub fn get_caller_save_regs() -> Vec<Reg> {
+        vec![X1_REG, X9_REG, X10_REG, X11_REG, X12_REG, X13_REG, X14_REG, X15_REG]
+    }
+
+    /// Split platform-specific instructions
+    /// The transformations done here are meant to make our lives simpler in later
+    /// stages of the compilation pipeline.
+    /// Here we may want to make sure that all instructions (except load and store)
+    /// have no memory operands.
+    fn arm64_split(mut self) -> Assembler
+    {
+        /// When we're attempting to load a memory address into a register, the
+        /// displacement must fit into the maximum number of bits for an Op::Add
+        /// immediate. If it doesn't, we have to load the displacement into a
+        /// register first.
+        fn split_lea_operand(asm: &mut Assembler, opnd: Opnd) -> Opnd {
+            match opnd {
+                Opnd::Mem(Mem { base, disp, num_bits }) => {
+                    if disp >= 0 && ShiftedImmediate::try_from(disp as u64).is_ok() {
+                        asm.lea(opnd)
+                    } else {
+                        let disp = asm.load(Opnd::Imm(disp.into()));
+                        let reg = match base {
+                            MemBase::Reg(reg_no) => Opnd::Reg(Reg { reg_no, num_bits }),
+                            MemBase::VReg(idx) => Opnd::VReg { idx, num_bits }
+                        };
+
+                        asm.add(reg, disp)
+                    }
+                },
+                _ => unreachable!("Op::Lea only accepts Opnd::Mem operands.")
+            }
+        }
+
+        /// When you're storing a register into a memory location or loading a
+        /// memory location into a register, the displacement from the base
+        /// register of the memory location must fit into 9 bits. If it doesn't,
+        /// then we need to load that memory address into a register first.
+        fn split_memory_address(asm: &mut Assembler, opnd: Opnd) -> Opnd {
+            match opnd {
+                Opnd::Mem(mem) => {
+                    if mem_disp_fits_bits(mem.disp) {
+                        opnd
+                    } else {
+                        let base = split_lea_operand(asm, opnd);
+                        Opnd::mem(64, base, 0)
+                    }
+                },
+                _ => unreachable!("Can only split memory addresses.")
+            }
+        }
+
+        /// Any memory operands you're sending into an Op::Load instruction need
+        /// to be split in case their displacement doesn't fit into 9 bits.
+        fn split_load_operand(asm: &mut Assembler, opnd: Opnd) -> Opnd {
+            match opnd {
+                Opnd::Reg(_) | Opnd::VReg { .. } => opnd,
+                Opnd::Mem(_) => {
+                    let split_opnd = split_memory_address(asm, opnd);
+                    let out_opnd = asm.load(split_opnd);
+                    // Many Arm insns support only 32-bit or 64-bit operands. asm.load with fewer
+                    // bits zero-extends the value, so it's safe to recognize it as a 32-bit value.
+                    if out_opnd.rm_num_bits() < 32 {
+                        out_opnd.with_num_bits(32).unwrap()
+                    } else {
+                        out_opnd
+                    }
+                },
+                _ => asm.load(opnd)
+            }
+        }
+
+        /// Operands that take the place of bitmask immediates must follow a
+        /// certain encoding. In this function we ensure that those operands
+        /// do follow that encoding, and if they don't then we load them first.
+        fn split_bitmask_immediate(asm: &mut Assembler, opnd: Opnd, dest_num_bits: u8) -> Opnd {
+            match opnd {
+                Opnd::Reg(_) | Opnd::VReg { .. } => opnd,
+                Opnd::Mem(_) => split_load_operand(asm, opnd),
+                Opnd::Imm(imm) => {
+                    if imm == 0 {
+                        Opnd::Reg(XZR_REG)
+                    } else if (dest_num_bits == 64 &&
+                                BitmaskImmediate::try_from(imm as u64).is_ok()) ||
+                            (dest_num_bits == 32 &&
+                                u32::try_from(imm).is_ok() &&
+                                BitmaskImmediate::new_32b_reg(imm as u32).is_ok()) {
+                        Opnd::UImm(imm as u64)
+                    } else {
+                        asm.load(opnd).with_num_bits(dest_num_bits).unwrap()
+                    }
+                },
+                Opnd::UImm(uimm) => {
+                    if (dest_num_bits == 64 && BitmaskImmediate::try_from(uimm).is_ok()) ||
+                        (dest_num_bits == 32 &&
+                            u32::try_from(uimm).is_ok() &&
+                            BitmaskImmediate::new_32b_reg(uimm as u32).is_ok()) {
+                        opnd
+                    } else {
+                        asm.load(opnd).with_num_bits(dest_num_bits).unwrap()
+                    }
+                },
+                Opnd::None | Opnd::Value(_) => unreachable!()
+            }
+        }
+
+        /// Operands that take the place of a shifted immediate must fit within
+        /// a certain size. If they don't then we need to load them first.
+        fn split_shifted_immediate(asm: &mut Assembler, opnd: Opnd) -> Opnd {
+            match opnd {
+                Opnd::Reg(_) | Opnd::VReg { .. } => opnd,
+                Opnd::Mem(_) => split_load_operand(asm, opnd),
+                Opnd::Imm(imm) => if ShiftedImmediate::try_from(imm as u64).is_ok() {
+                    opnd
+                } else {
+                    asm.load(opnd)
+                }
+                Opnd::UImm(uimm) => {
+                    if ShiftedImmediate::try_from(uimm).is_ok() {
+                        opnd
+                    } else {
+                        asm.load(opnd)
+                    }
+                },
+                Opnd::None | Opnd::Value(_) /*| Opnd::Stack { .. }*/ => unreachable!()
+            }
+        }
+
+        /// Returns the operands that should be used for a boolean logic
+        /// instruction.
+        fn split_boolean_operands(asm: &mut Assembler, opnd0: Opnd, opnd1: Opnd) -> (Opnd, Opnd) {
+            match (opnd0, opnd1) {
+                (Opnd::Reg(_), Opnd::Reg(_)) => {
+                    (opnd0, opnd1)
+                },
+                (reg_opnd @ Opnd::Reg(_), other_opnd) |
+                (other_opnd, reg_opnd @ Opnd::Reg(_)) => {
+                    let opnd1 = split_bitmask_immediate(asm, other_opnd, reg_opnd.rm_num_bits());
+                    (reg_opnd, opnd1)
+                },
+                _ => {
+                    let opnd0 = split_load_operand(asm, opnd0);
+                    let opnd1 = split_bitmask_immediate(asm, opnd1, opnd0.rm_num_bits());
+                    (opnd0, opnd1)
+                }
+            }
+        }
+
+        /// Returns the operands that should be used for a csel instruction.
+        fn split_csel_operands(asm: &mut Assembler, opnd0: Opnd, opnd1: Opnd) -> (Opnd, Opnd) {
+            let opnd0 = match opnd0 {
+                Opnd::Reg(_) | Opnd::VReg { .. } => opnd0,
+                _ => split_load_operand(asm, opnd0)
+            };
+
+            let opnd1 = match opnd1 {
+                Opnd::Reg(_) | Opnd::VReg { .. } => opnd1,
+                _ => split_load_operand(asm, opnd1)
+            };
+
+            (opnd0, opnd1)
+        }
+
+        fn split_less_than_32_cmp(asm: &mut Assembler, opnd0: Opnd) -> Opnd {
+            match opnd0 {
+                Opnd::Reg(_) | Opnd::VReg { .. } => {
+                    match opnd0.rm_num_bits() {
+                        8 => asm.and(opnd0.with_num_bits(64).unwrap(), Opnd::UImm(0xff)),
+                        16 => asm.and(opnd0.with_num_bits(64).unwrap(), Opnd::UImm(0xffff)),
+                        32 | 64 => opnd0,
+                        bits => unreachable!("Invalid number of bits. {}", bits)
+                    }
+                }
+                _ => opnd0
+            }
+        }
+
+        let live_ranges: Vec<LiveRange> = take(&mut self.live_ranges);
+        let mut iterator = self.insns.into_iter().enumerate().peekable();
+        let mut asm_local = Assembler::new_with_label_names(take(&mut self.label_names), live_ranges.len());
+        let asm = &mut asm_local;
+
+        while let Some((index, mut insn)) = iterator.next() {
+            // Here we're going to map the operands of the instruction to load
+            // any Opnd::Value operands into registers if they are heap objects
+            // such that only the Op::Load instruction needs to handle that
+            // case. If the values aren't heap objects then we'll treat them as
+            // if they were just unsigned integer.
+            let is_load = matches!(insn, Insn::Load { .. } | Insn::LoadInto { .. });
+            let mut opnd_iter = insn.opnd_iter_mut();
+
+            while let Some(opnd) = opnd_iter.next() {
+                match opnd {
+                    Opnd::Value(value) => {
+                        if value.special_const_p() {
+                            *opnd = Opnd::UImm(value.as_u64());
+                        } else if !is_load {
+                            *opnd = asm.load(*opnd);
+                        }
+                    },
+                    _ => {}
+                };
+            }
+
+            // We are replacing instructions here so we know they are already
+            // being used. It is okay not to use their output here.
+            #[allow(unused_must_use)]
+            match &mut insn {
+                Insn::Sub { left, right, out } |
+                Insn::Add { left, right, out } => {
+                    match (*left, *right) {
+                        (Opnd::Reg(_) | Opnd::VReg { .. }, Opnd::Reg(_) | Opnd::VReg { .. }) => {
+                            merge_three_reg_mov(&live_ranges, &mut iterator, left, right, out);
+                            asm.push_insn(insn);
+                        },
+                        (reg_opnd @ (Opnd::Reg(_) | Opnd::VReg { .. }), other_opnd) |
+                        (other_opnd, reg_opnd @ (Opnd::Reg(_) | Opnd::VReg { .. })) => {
+                            *left = reg_opnd;
+                            *right = split_shifted_immediate(asm, other_opnd);
+                            asm.push_insn(insn);
+                        },
+                        _ => {
+                            *left = split_load_operand(asm, *left);
+                            *right = split_shifted_immediate(asm, *right);
+                            asm.push_insn(insn);
+                        }
+                    }
+                },
+                Insn::And { left, right, out } |
+                Insn::Or { left, right, out } |
+                Insn::Xor { left, right, out } => {
+                    let (opnd0, opnd1) = split_boolean_operands(asm, *left, *right);
+                    *left = opnd0;
+                    *right = opnd1;
+
+                    merge_three_reg_mov(&live_ranges, &mut iterator, left, right, out);
+
+                    asm.push_insn(insn);
+                }
+                /*
+                // Lower to Joz and Jonz for generating CBZ/CBNZ for compare-with-0-and-branch.
+                ref insn @ Insn::Cmp { ref left, right: ref right @ (Opnd::UImm(0) | Opnd::Imm(0)) } |
+                ref insn @ Insn::Test { ref left, right: ref right @ (Opnd::InsnOut { .. } | Opnd::Reg(_)) } if {
+                    let same_opnd_if_test = if let Insn::Test { .. } = insn {
+                        left == right
+                    } else {
+                        true
+                    };
+
+                    same_opnd_if_test && if let Some(
+                            Insn::Jz(target) | Insn::Je(target) | Insn::Jnz(target) | Insn::Jne(target)
+                        ) = iterator.peek() {
+                            matches!(target, Target::SideExit { .. })
+                        } else {
+                            false
+                        }
+                } => {
+                    let reg = split_load_operand(asm, *left);
+                    match iterator.peek() {
+                        Some(Insn::Jz(target) | Insn::Je(target))   => asm.push_insn(Insn::Joz(reg, *target)),
+                        Some(Insn::Jnz(target) | Insn::Jne(target)) => asm.push_insn(Insn::Jonz(reg, *target)),
+                        _ => ()
+                    }
+
+                    iterator.map_insn_index(asm);
+                    iterator.next_unmapped(); // Pop merged jump instruction
+                }
+                */
+                Insn::CCall { opnds, .. } => {
+                    assert!(opnds.len() <= C_ARG_OPNDS.len());
+
+                    // Load each operand into the corresponding argument
+                    // register.
+                    // Note: the iteration order is reversed to avoid corrupting x0,
+                    // which is both the return value and first argument register
+                    if !opnds.is_empty() {
+                        let mut args: Vec<(Reg, Opnd)> = vec![];
+                        for (idx, opnd) in opnds.into_iter().enumerate().rev() {
+                            // If the value that we're sending is 0, then we can use
+                            // the zero register, so in this case we'll just send
+                            // a UImm of 0 along as the argument to the move.
+                            let value = match opnd {
+                                Opnd::UImm(0) | Opnd::Imm(0) => Opnd::UImm(0),
+                                Opnd::Mem(_) => split_memory_address(asm, *opnd),
+                                _ => *opnd
+                            };
+                            args.push((C_ARG_OPNDS[idx].unwrap_reg(), value));
+                        }
+                        asm.parallel_mov(args);
+                    }
+
+                    // Now we push the CCall without any arguments so that it
+                    // just performs the call.
+                    *opnds = vec![];
+                    asm.push_insn(insn);
+                },
+                Insn::Cmp { left, right } => {
+                    let opnd0 = split_load_operand(asm, *left);
+                    let opnd0 = split_less_than_32_cmp(asm, opnd0);
+                    let split_right = split_shifted_immediate(asm, *right);
+                    let opnd1 = match split_right {
+                        Opnd::VReg { .. } if opnd0.num_bits() != split_right.num_bits() => {
+                            split_right.with_num_bits(opnd0.num_bits().unwrap()).unwrap()
+                        },
+                        _ => split_right
+                    };
+
+                    asm.cmp(opnd0, opnd1);
+                },
+                Insn::CRet(opnd) => {
+                    match opnd {
+                        // If the value is already in the return register, then
+                        // we don't need to do anything.
+                        Opnd::Reg(C_RET_REG) => {},
+
+                        // If the value is a memory address, we need to first
+                        // make sure the displacement isn't too large and then
+                        // load it into the return register.
+                        Opnd::Mem(_) => {
+                            let split = split_memory_address(asm, *opnd);
+                            asm.load_into(C_RET_OPND, split);
+                        },
+
+                        // Otherwise we just need to load the value into the
+                        // return register.
+                        _ => {
+                            asm.load_into(C_RET_OPND, *opnd);
+                        }
+                    }
+                    asm.cret(C_RET_OPND);
+                },
+                Insn::CSelZ { truthy, falsy, out } |
+                Insn::CSelNZ { truthy, falsy, out } |
+                Insn::CSelE { truthy, falsy, out } |
+                Insn::CSelNE { truthy, falsy, out } |
+                Insn::CSelL { truthy, falsy, out } |
+                Insn::CSelLE { truthy, falsy, out } |
+                Insn::CSelG { truthy, falsy, out } |
+                Insn::CSelGE { truthy, falsy, out } => {
+                    let (opnd0, opnd1) = split_csel_operands(asm, *truthy, *falsy);
+                    *truthy = opnd0;
+                    *falsy = opnd1;
+                    // Merge `csel` and `mov` into a single `csel` when possible
+                    match iterator.peek().map(|(_, insn)| insn) {
+                        Some(Insn::Mov { dest: Opnd::Reg(reg), src })
+                        if matches!(out, Opnd::VReg { .. }) && *out == *src && live_ranges[out.vreg_idx()].end() == index + 1 => {
+                            *out = Opnd::Reg(*reg);
+                            asm.push_insn(insn);
+                            iterator.next(); // Pop merged Insn::Mov
+                        }
+                        _ => {
+                            asm.push_insn(insn);
+                        }
+                    }
+                },
+                Insn::IncrCounter { mem, value } => {
+                    let counter_addr = match mem {
+                        Opnd::Mem(_) => split_lea_operand(asm, *mem),
+                        _ => *mem
+                    };
+
+                    asm.incr_counter(counter_addr, *value);
+                },
+                Insn::JmpOpnd(opnd) => {
+                    if let Opnd::Mem(_) = opnd {
+                        let opnd0 = split_load_operand(asm, *opnd);
+                        asm.jmp_opnd(opnd0);
+                    } else {
+                        asm.jmp_opnd(*opnd);
+                    }
+                },
+                Insn::Load { opnd, .. } |
+                Insn::LoadInto { opnd, .. } => {
+                    *opnd = match opnd {
+                        Opnd::Mem(_) => split_memory_address(asm, *opnd),
+                        _ => *opnd
+                    };
+                    asm.push_insn(insn);
+                },
+                Insn::LoadSExt { opnd, out } => {
+                    match opnd {
+                        // We only want to sign extend if the operand is a
+                        // register, instruction output, or memory address that
+                        // is 32 bits. Otherwise we'll just load the value
+                        // directly since there's no need to sign extend.
+                        Opnd::Reg(Reg { num_bits: 32, .. }) |
+                        Opnd::VReg { num_bits: 32, .. } |
+                        Opnd::Mem(Mem { num_bits: 32, .. }) => {
+                            asm.push_insn(insn);
+                        },
+                        _ => {
+                            asm.push_insn(Insn::Load { opnd: *opnd, out: *out });
+                        }
+                    };
+                },
+                Insn::Mov { dest, src } => {
+                    match (&dest, &src) {
+                        // If we're attempting to load into a memory operand, then
+                        // we'll switch over to the store instruction.
+                        (Opnd::Mem(_), _) => {
+                            let opnd0 = split_memory_address(asm, *dest);
+                            let value = match *src {
+                                // If the first operand is zero, then we can just use
+                                // the zero register.
+                                Opnd::UImm(0) | Opnd::Imm(0) => Opnd::Reg(XZR_REG),
+                                // If the first operand is a memory operand, we're going
+                                // to transform this into a store instruction, so we'll
+                                // need to load this anyway.
+                                Opnd::UImm(_) => asm.load(*src),
+                                // The value that is being moved must be either a
+                                // register or an immediate that can be encoded as a
+                                // bitmask immediate. Otherwise, we'll need to split the
+                                // move into multiple instructions.
+                                _ => split_bitmask_immediate(asm, *src, dest.rm_num_bits())
+                            };
+
+                            asm.store(opnd0, value);
+                        },
+                        // If we're loading a memory operand into a register, then
+                        // we'll switch over to the load instruction.
+                        (Opnd::Reg(_) | Opnd::VReg { .. }, Opnd::Mem(_)) => {
+                            let value = split_memory_address(asm, *src);
+                            asm.load_into(*dest, value);
+                        },
+                        // Otherwise we'll use the normal mov instruction.
+                        (Opnd::Reg(_), _) => {
+                            let value = match *src {
+                                // Unlike other instructions, we can avoid splitting this case, using movz.
+                                Opnd::UImm(uimm) if uimm <= 0xffff => *src,
+                                _ => split_bitmask_immediate(asm, *src, dest.rm_num_bits()),
+                            };
+                            asm.mov(*dest, value);
+                        },
+                        _ => unreachable!("unexpected combination of operands in Insn::Mov: {dest:?}, {src:?}")
+                    };
+                },
+                Insn::Not { opnd, .. } => {
+                    // The value that is being negated must be in a register, so
+                    // if we get anything else we need to load it first.
+                    *opnd = match opnd {
+                        Opnd::Mem(_) => split_load_operand(asm, *opnd),
+                        _ => *opnd
+                    };
+                    asm.push_insn(insn);
+                },
+                Insn::LShift { opnd, .. } |
+                Insn::RShift { opnd, .. } |
+                Insn::URShift { opnd, .. } => {
+                    // The operand must be in a register, so
+                    // if we get anything else we need to load it first.
+                    let opnd0 = match opnd {
+                        Opnd::Mem(_) => split_load_operand(asm, *opnd),
+                        _ => *opnd
+                    };
+
+                    *opnd = opnd0;
+                    asm.push_insn(insn);
+                },
+                Insn::Store { dest, src } => {
+                    // The value being stored must be in a register, so if it's
+                    // not already one we'll load it first.
+                    let opnd1 = match src {
+                         // If the first operand is zero, then we can just use
+                        // the zero register.
+                        Opnd::UImm(0) | Opnd::Imm(0) => Opnd::Reg(XZR_REG),
+                        // Otherwise we'll check if we need to load it first.
+                        _ => split_load_operand(asm, *src)
+                    };
+
+                    match dest {
+                        Opnd::Reg(_) => {
+                            // Store does not support a register as a dest operand.
+                            asm.mov(*dest, opnd1);
+                        }
+                        _ => {
+                            // The displacement for the STUR instruction can't be more
+                            // than 9 bits long. If it's longer, we need to load the
+                            // memory address into a register first.
+                            let opnd0 = split_memory_address(asm, *dest);
+                            asm.store(opnd0, opnd1);
+                        }
+                    }
+                },
+                Insn::Mul { left, right, .. } => {
+                    *left = split_load_operand(asm, *left);
+                    *right = split_load_operand(asm, *right);
+                    asm.push_insn(insn);
+                },
+                Insn::Test { left, right } => {
+                    // The value being tested must be in a register, so if it's
+                    // not already one we'll load it first.
+                    let opnd0 = split_load_operand(asm, *left);
+
+                    // The second value must be either a register or an
+                    // unsigned immediate that can be encoded as a bitmask
+                    // immediate. If it's not one of those, we'll need to load
+                    // it first.
+                    let opnd1 = split_bitmask_immediate(asm, *right, opnd0.rm_num_bits());
+                    asm.test(opnd0, opnd1);
+                },
+                _ => {
+                    asm.push_insn(insn);
+                }
+            }
+        }
+
+        asm_local
+    }
+
+    /// Emit platform-specific machine code
+    /// Returns a list of GC offsets. Can return failure to signal caller to retry.
+    fn arm64_emit(&mut self, cb: &mut CodeBlock) -> Option<Vec<CodePtr>> {
+        /// Determine how many instructions it will take to represent moving
+        /// this value into a register. Note that the return value of this
+        /// function must correspond to how many instructions are used to
+        /// represent this load in the emit_load_value function.
+        fn emit_load_size(value: u64) -> u8 {
+            if BitmaskImmediate::try_from(value).is_ok() {
+                return 1;
+            }
+
+            if value < (1 << 16) {
+                1
+            } else if value < (1 << 32) {
+                2
+            } else if value < (1 << 48) {
+                3
+            } else {
+                4
+            }
+        }
+
+        /// Emit a conditional jump instruction to a specific target. This is
+        /// called when lowering any of the conditional jump instructions.
+        fn emit_conditional_jump<const CONDITION: u8>(cb: &mut CodeBlock, target: Target) {
+            match target {
+                Target::CodePtr(dst_ptr) => {
+                    let dst_addr = dst_ptr.as_offset();
+                    let src_addr = cb.get_write_ptr().as_offset();
+
+                    let num_insns = if bcond_offset_fits_bits((dst_addr - src_addr) / 4) {
+                        // If the jump offset fits into the conditional jump as
+                        // an immediate value and it's properly aligned, then we
+                        // can use the b.cond instruction directly. We're safe
+                        // to use as i32 here since we already checked that it
+                        // fits.
+                        let bytes = (dst_addr - src_addr) as i32;
+                        bcond(cb, CONDITION, InstructionOffset::from_bytes(bytes));
+
+                        // Here we're going to return 1 because we've only
+                        // written out 1 instruction.
+                        1
+                    } else if b_offset_fits_bits((dst_addr - (src_addr + 4)) / 4) { // + 4 for bcond
+                        // If the jump offset fits into the unconditional jump as
+                        // an immediate value, we can use inverse b.cond + b.
+                        //
+                        // We're going to write out the inverse condition so
+                        // that if it doesn't match it will skip over the
+                        // instruction used for branching.
+                        bcond(cb, Condition::inverse(CONDITION), 2.into());
+                        b(cb, InstructionOffset::from_bytes((dst_addr - (src_addr + 4)) as i32)); // + 4 for bcond
+
+                        // We've only written out 2 instructions.
+                        2
+                    } else {
+                        // Otherwise, we need to load the address into a
+                        // register and use the branch register instruction.
+                        let dst_addr = (dst_ptr.raw_ptr(cb) as usize).as_u64();
+                        let load_insns: i32 = emit_load_size(dst_addr).into();
+
+                        // We're going to write out the inverse condition so
+                        // that if it doesn't match it will skip over the
+                        // instructions used for branching.
+                        bcond(cb, Condition::inverse(CONDITION), (load_insns + 2).into());
+                        emit_load_value(cb, Assembler::SCRATCH0, dst_addr);
+                        br(cb, Assembler::SCRATCH0);
+
+                        // Here we'll return the number of instructions that it
+                        // took to write out the destination address + 1 for the
+                        // b.cond and 1 for the br.
+                        load_insns + 2
+                    };
+
+                    if let Target::CodePtr(_) = target {
+                        // We need to make sure we have at least 6 instructions for
+                        // every kind of jump for invalidation purposes, so we're
+                        // going to write out padding nop instructions here.
+                        assert!(num_insns <= cb.conditional_jump_insns());
+                        for _ in num_insns..cb.conditional_jump_insns() { nop(cb); }
+                    }
+                },
+                Target::Label(label_idx) => {
+                    // Here we're going to save enough space for ourselves and
+                    // then come back and write the instruction once we know the
+                    // offset. We're going to assume we can fit into a single
+                    // b.cond instruction. It will panic otherwise.
+                    cb.label_ref(label_idx, 4, |cb, src_addr, dst_addr| {
+                        let bytes: i32 = (dst_addr - (src_addr - 4)).try_into().unwrap();
+                        bcond(cb, CONDITION, InstructionOffset::from_bytes(bytes));
+                    });
+                },
+                Target::SideExit { .. } => {
+                    unreachable!("Target::SideExit should have been compiled by compile_side_exits")
+                },
+            };
+        }
+
+        /// Emit a CBZ or CBNZ which branches when a register is zero or non-zero
+        fn emit_cmp_zero_jump(_cb: &mut CodeBlock, _reg: A64Opnd, _branch_if_zero: bool, target: Target) {
+            if let Target::Label(_) = target {
+                unimplemented!("this should be re-implemented with Label for side exits");
+                /*
+                let dst_addr = dst_ptr.as_offset();
+                let src_addr = cb.get_write_ptr().as_offset();
+
+                if bcond_offset_fits_bits((dst_addr - src_addr) / 4) {
+                    // If the offset fits in one instruction, generate cbz or cbnz
+                    let bytes = (dst_addr - src_addr) as i32;
+                    if branch_if_zero {
+                        cbz(cb, reg, InstructionOffset::from_bytes(bytes));
+                    } else {
+                        cbnz(cb, reg, InstructionOffset::from_bytes(bytes));
+                    }
+                } else {
+                    // Otherwise, we load the address into a register and
+                    // use the branch register instruction. Note that because
+                    // side exits should always be close, this form should be
+                    // rare or impossible to see.
+                    let dst_addr = dst_ptr.raw_addr(cb) as u64;
+                    let load_insns: i32 = emit_load_size(dst_addr).into();
+
+                    // Write out the inverse condition so that if
+                    // it doesn't match it will skip over the
+                    // instructions used for branching.
+                    if branch_if_zero {
+                        cbnz(cb, reg, InstructionOffset::from_insns(load_insns + 2));
+                    } else {
+                        cbz(cb, reg, InstructionOffset::from_insns(load_insns + 2));
+                    }
+                    emit_load_value(cb, Assembler::SCRATCH0, dst_addr);
+                    br(cb, Assembler::SCRATCH0);
+
+                }
+                */
+            } else {
+                unreachable!("We should only generate Joz/Jonz with side-exit targets");
+            }
+        }
+
+        /// Emit a push instruction for the given operand by adding to the stack
+        /// pointer and then storing the given value.
+        fn emit_push(cb: &mut CodeBlock, opnd: A64Opnd) {
+            str_pre(cb, opnd, A64Opnd::new_mem(64, C_SP_REG, -C_SP_STEP));
+        }
+
+        /// Emit a pop instruction into the given operand by loading the value
+        /// and then subtracting from the stack pointer.
+        fn emit_pop(cb: &mut CodeBlock, opnd: A64Opnd) {
+            ldr_post(cb, opnd, A64Opnd::new_mem(64, C_SP_REG, C_SP_STEP));
+        }
+
+        // List of GC offsets
+        let mut gc_offsets: Vec<CodePtr> = Vec::new();
+
+        // Buffered list of PosMarker callbacks to fire if codegen is successful
+        let mut pos_markers: Vec<(usize, CodePtr)> = vec![];
+
+        // The write_pos for the last Insn::PatchPoint, if any
+        let mut last_patch_pos: Option<usize> = None;
+
+        // For each instruction
+        let mut insn_idx: usize = 0;
+        while let Some(insn) = self.insns.get(insn_idx) {
+            match insn {
+                Insn::Comment(text) => {
+                    cb.add_comment(text);
+                },
+                Insn::Label(target) => {
+                    cb.write_label(target.unwrap_label());
+                },
+                // Report back the current position in the generated code
+                Insn::PosMarker(..) => {
+                    pos_markers.push((insn_idx, cb.get_write_ptr()))
+                }
+                Insn::BakeString(text) => {
+                    for byte in text.as_bytes() {
+                        cb.write_byte(*byte);
+                    }
+
+                    // Add a null-terminator byte for safety (in case we pass
+                    // this to C code)
+                    cb.write_byte(0);
+
+                    // Pad out the string to the next 4-byte boundary so that
+                    // it's easy to jump past.
+                    for _ in 0..(4 - ((text.len() + 1) % 4)) {
+                        cb.write_byte(0);
+                    }
+                },
+                Insn::FrameSetup => {
+                    stp_pre(cb, X29, X30, A64Opnd::new_mem(128, C_SP_REG, -16));
+
+                    // X29 (frame_pointer) = SP
+                    mov(cb, X29, C_SP_REG);
+                },
+                Insn::FrameTeardown => {
+                    // SP = X29 (frame pointer)
+                    mov(cb, C_SP_REG, X29);
+
+                    ldp_post(cb, X29, X30, A64Opnd::new_mem(128, C_SP_REG, 16));
+                },
+                Insn::Add { left, right, out } => {
+                    adds(cb, out.into(), left.into(), right.into());
+                },
+                Insn::Sub { left, right, out } => {
+                    subs(cb, out.into(), left.into(), right.into());
+                },
+                Insn::Mul { left, right, out } => {
+                    // If the next instruction is jo (jump on overflow)
+                    match (self.insns.get(insn_idx + 1), self.insns.get(insn_idx + 2)) {
+                        (Some(Insn::JoMul(_)), _) |
+                        (Some(Insn::PosMarker(_)), Some(Insn::JoMul(_))) => {
+                            // Compute the high 64 bits
+                            smulh(cb, Self::SCRATCH0, left.into(), right.into());
+
+                            // Compute the low 64 bits
+                            // This may clobber one of the input registers,
+                            // so we do it after smulh
+                            mul(cb, out.into(), left.into(), right.into());
+
+                            // Produce a register that is all zeros or all ones
+                            // Based on the sign bit of the 64-bit mul result
+                            asr(cb, Self::SCRATCH1, out.into(), A64Opnd::UImm(63));
+
+                            // If the high 64-bits are not all zeros or all ones,
+                            // matching the sign bit, then we have an overflow
+                            cmp(cb, Self::SCRATCH0, Self::SCRATCH1);
+                            // Insn::JoMul will emit_conditional_jump::<{Condition::NE}>
+                        }
+                        _ => {
+                            mul(cb, out.into(), left.into(), right.into());
+                        }
+                    }
+                },
+                Insn::And { left, right, out } => {
+                    and(cb, out.into(), left.into(), right.into());
+                },
+                Insn::Or { left, right, out } => {
+                    orr(cb, out.into(), left.into(), right.into());
+                },
+                Insn::Xor { left, right, out } => {
+                    eor(cb, out.into(), left.into(), right.into());
+                },
+                Insn::Not { opnd, out } => {
+                    mvn(cb, out.into(), opnd.into());
+                },
+                Insn::RShift { opnd, shift, out } => {
+                    asr(cb, out.into(), opnd.into(), shift.into());
+                },
+                Insn::URShift { opnd, shift, out } => {
+                    lsr(cb, out.into(), opnd.into(), shift.into());
+                },
+                Insn::LShift { opnd, shift, out } => {
+                    lsl(cb, out.into(), opnd.into(), shift.into());
+                },
+                Insn::Store { dest, src } => {
+                    // This order may be surprising but it is correct. The way
+                    // the Arm64 assembler works, the register that is going to
+                    // be stored is first and the address is second. However in
+                    // our IR we have the address first and the register second.
+                    match dest.rm_num_bits() {
+                        64 | 32 => stur(cb, src.into(), dest.into()),
+                        16 => sturh(cb, src.into(), dest.into()),
+                        num_bits => panic!("unexpected dest num_bits: {} (src: {:#?}, dest: {:#?})", num_bits, src, dest),
+                    }
+                },
+                Insn::Load { opnd, out } |
+                Insn::LoadInto { opnd, dest: out } => {
+                    match *opnd {
+                        Opnd::Reg(_) | Opnd::VReg { .. } => {
+                            mov(cb, out.into(), opnd.into());
+                        },
+                        Opnd::UImm(uimm) => {
+                            emit_load_value(cb, out.into(), uimm);
+                        },
+                        Opnd::Imm(imm) => {
+                            emit_load_value(cb, out.into(), imm as u64);
+                        },
+                        Opnd::Mem(_) => {
+                            match opnd.rm_num_bits() {
+                                64 | 32 => ldur(cb, out.into(), opnd.into()),
+                                16 => ldurh(cb, out.into(), opnd.into()),
+                                8 => ldurb(cb, out.into(), opnd.into()),
+                                num_bits => panic!("unexpected num_bits: {}", num_bits)
+                            };
+                        },
+                        Opnd::Value(value) => {
+                            // We dont need to check if it's a special const
+                            // here because we only allow these operands to hit
+                            // this point if they're not a special const.
+                            assert!(!value.special_const_p());
+
+                            // This assumes only load instructions can contain
+                            // references to GC'd Value operands. If the value
+                            // being loaded is a heap object, we'll report that
+                            // back out to the gc_offsets list.
+                            ldr_literal(cb, out.into(), 2.into());
+                            b(cb, InstructionOffset::from_bytes(4 + (SIZEOF_VALUE as i32)));
+                            cb.write_bytes(&value.as_u64().to_le_bytes());
+
+                            let ptr_offset = cb.get_write_ptr().sub_bytes(SIZEOF_VALUE);
+                            gc_offsets.push(ptr_offset);
+                        },
+                        Opnd::None => {
+                            unreachable!("Attempted to load from None operand");
+                        }
+                    };
+                },
+                Insn::LoadSExt { opnd, out } => {
+                    match *opnd {
+                        Opnd::Reg(Reg { num_bits: 32, .. }) |
+                        Opnd::VReg { num_bits: 32, .. } => {
+                            sxtw(cb, out.into(), opnd.into());
+                        },
+                        Opnd::Mem(Mem { num_bits: 32, .. }) => {
+                            ldursw(cb, out.into(), opnd.into());
+                        },
+                        _ => unreachable!()
+                    };
+                },
+                Insn::ParallelMov { .. } => unreachable!("{insn:?} should have been lowered at alloc_regs()"),
+                Insn::Mov { dest, src } => {
+                    // This supports the following two kinds of immediates:
+                    //   * The value fits into a single movz instruction
+                    //   * It can be encoded with the special bitmask immediate encoding
+                    // arm64_split() should have split other immediates that require multiple instructions.
+                    match src {
+                        Opnd::UImm(uimm) if *uimm <= 0xffff => {
+                            movz(cb, dest.into(), A64Opnd::new_uimm(*uimm), 0);
+                        },
+                        _ => {
+                            mov(cb, dest.into(), src.into());
+                        }
+                    }
+                },
+                Insn::Lea { opnd, out } => {
+                    let opnd: A64Opnd = opnd.into();
+
+                    match opnd {
+                        A64Opnd::Mem(mem) => {
+                            add(
+                                cb,
+                                out.into(),
+                                A64Opnd::Reg(A64Reg { reg_no: mem.base_reg_no, num_bits: 64 }),
+                                A64Opnd::new_imm(mem.disp.into())
+                            );
+                        },
+                        _ => {
+                            panic!("Op::Lea only accepts Opnd::Mem operands.");
+                        }
+                    };
+                },
+                Insn::LeaJumpTarget { out, target, .. } => {
+                    if let Target::Label(label_idx) = target {
+                        // Set output to the raw address of the label
+                        cb.label_ref(*label_idx, 4, |cb, end_addr, dst_addr| {
+                            adr(cb, Self::SCRATCH0, A64Opnd::new_imm(dst_addr - (end_addr - 4)));
+                        });
+
+                        mov(cb, out.into(), Self::SCRATCH0);
+                    } else {
+                        // Set output to the jump target's raw address
+                        let target_code = target.unwrap_code_ptr();
+                        let target_addr = target_code.raw_addr(cb).as_u64();
+                        emit_load_value(cb, out.into(), target_addr);
+                    }
+                },
+                Insn::CPush(opnd) => {
+                    emit_push(cb, opnd.into());
+                },
+                Insn::CPop { out } => {
+                    emit_pop(cb, out.into());
+                },
+                Insn::CPopInto(opnd) => {
+                    emit_pop(cb, opnd.into());
+                },
+                Insn::CPushAll => {
+                    let regs = Assembler::get_caller_save_regs();
+
+                    for reg in regs {
+                        emit_push(cb, A64Opnd::Reg(reg));
+                    }
+
+                    // Push the flags/state register
+                    mrs(cb, Self::SCRATCH0, SystemRegister::NZCV);
+                    emit_push(cb, Self::SCRATCH0);
+                },
+                Insn::CPopAll => {
+                    let regs = Assembler::get_caller_save_regs();
+
+                    // Pop the state/flags register
+                    msr(cb, SystemRegister::NZCV, Self::SCRATCH0);
+                    emit_pop(cb, Self::SCRATCH0);
+
+                    for reg in regs.into_iter().rev() {
+                        emit_pop(cb, A64Opnd::Reg(reg));
+                    }
+                },
+                Insn::CCall { fptr, .. } => {
+                    // The offset to the call target in bytes
+                    let src_addr = cb.get_write_ptr().raw_ptr(cb) as i64;
+                    let dst_addr = *fptr as i64;
+
+                    // Use BL if the offset is short enough to encode as an immediate.
+                    // Otherwise, use BLR with a register.
+                    if b_offset_fits_bits((dst_addr - src_addr) / 4) {
+                        bl(cb, InstructionOffset::from_bytes((dst_addr - src_addr) as i32));
+                    } else {
+                        emit_load_value(cb, Self::SCRATCH0, dst_addr as u64);
+                        blr(cb, Self::SCRATCH0);
+                    }
+                },
+                Insn::CRet { .. } => {
+                    ret(cb, A64Opnd::None);
+                },
+                Insn::Cmp { left, right } => {
+                    cmp(cb, left.into(), right.into());
+                },
+                Insn::Test { left, right } => {
+                    tst(cb, left.into(), right.into());
+                },
+                Insn::JmpOpnd(opnd) => {
+                    br(cb, opnd.into());
+                },
+                Insn::Jmp(target) => {
+                    match *target {
+                        Target::CodePtr(dst_ptr) => {
+                            emit_jmp_ptr(cb, dst_ptr, true);
+                        },
+                        Target::Label(label_idx) => {
+                            // Here we're going to save enough space for
+                            // ourselves and then come back and write the
+                            // instruction once we know the offset. We're going
+                            // to assume we can fit into a single b instruction.
+                            // It will panic otherwise.
+                            cb.label_ref(label_idx, 4, |cb, src_addr, dst_addr| {
+                                let bytes: i32 = (dst_addr - (src_addr - 4)).try_into().unwrap();
+                                b(cb, InstructionOffset::from_bytes(bytes));
+                            });
+                        },
+                        Target::SideExit { .. } => {
+                            unreachable!("Target::SideExit should have been compiled by compile_side_exits")
+                        },
+                    };
+                },
+                Insn::Je(target) | Insn::Jz(target) => {
+                    emit_conditional_jump::<{Condition::EQ}>(cb, target.clone());
+                },
+                Insn::Jne(target) | Insn::Jnz(target) | Insn::JoMul(target) => {
+                    emit_conditional_jump::<{Condition::NE}>(cb, target.clone());
+                },
+                Insn::Jl(target) => {
+                    emit_conditional_jump::<{Condition::LT}>(cb, target.clone());
+                },
+                Insn::Jg(target) => {
+                    emit_conditional_jump::<{Condition::GT}>(cb, target.clone());
+                },
+                Insn::Jge(target) => {
+                    emit_conditional_jump::<{Condition::GE}>(cb, target.clone());
+                },
+                Insn::Jbe(target) => {
+                    emit_conditional_jump::<{Condition::LS}>(cb, target.clone());
+                },
+                Insn::Jb(target) => {
+                    emit_conditional_jump::<{Condition::CC}>(cb, target.clone());
+                },
+                Insn::Jo(target) => {
+                    emit_conditional_jump::<{Condition::VS}>(cb, target.clone());
+                },
+                Insn::Joz(opnd, target) => {
+                    emit_cmp_zero_jump(cb, opnd.into(), true, target.clone());
+                },
+                Insn::Jonz(opnd, target) => {
+                    emit_cmp_zero_jump(cb, opnd.into(), false, target.clone());
+                },
+                Insn::PatchPoint(_) |
+                Insn::PadPatchPoint => {
+                    // If patch points are too close to each other or the end of the block, fill nop instructions
+                    if let Some(last_patch_pos) = last_patch_pos {
+                        while cb.get_write_pos().saturating_sub(last_patch_pos) < cb.jmp_ptr_bytes() && !cb.has_dropped_bytes() {
+                            nop(cb);
+                        }
+                    }
+                    last_patch_pos = Some(cb.get_write_pos());
+                },
+                Insn::IncrCounter { mem: _, value: _ } => {
+                    /*
+                    let label = cb.new_label("incr_counter_loop".to_string());
+                    cb.write_label(label);
+
+                    ldaxr(cb, Self::SCRATCH0, mem.into());
+                    add(cb, Self::SCRATCH0, Self::SCRATCH0, value.into());
+
+                    // The status register that gets used to track whether or
+                    // not the store was successful must be 32 bytes. Since we
+                    // store the SCRATCH registers as their 64-bit versions, we
+                    // need to rewrap it here.
+                    let status = A64Opnd::Reg(Self::SCRATCH1.unwrap_reg().with_num_bits(32));
+                    stlxr(cb, status, Self::SCRATCH0, mem.into());
+
+                    cmp(cb, Self::SCRATCH1, A64Opnd::new_uimm(0));
+                    emit_conditional_jump::<{Condition::NE}>(cb, Target::Label(label));
+                    */
+                    unimplemented!("labels are not supported yet");
+                },
+                Insn::Breakpoint => {
+                    brk(cb, A64Opnd::None);
+                },
+                Insn::CSelZ { truthy, falsy, out } |
+                Insn::CSelE { truthy, falsy, out } => {
+                    csel(cb, out.into(), truthy.into(), falsy.into(), Condition::EQ);
+                },
+                Insn::CSelNZ { truthy, falsy, out } |
+                Insn::CSelNE { truthy, falsy, out } => {
+                    csel(cb, out.into(), truthy.into(), falsy.into(), Condition::NE);
+                },
+                Insn::CSelL { truthy, falsy, out } => {
+                    csel(cb, out.into(), truthy.into(), falsy.into(), Condition::LT);
+                },
+                Insn::CSelLE { truthy, falsy, out } => {
+                    csel(cb, out.into(), truthy.into(), falsy.into(), Condition::LE);
+                },
+                Insn::CSelG { truthy, falsy, out } => {
+                    csel(cb, out.into(), truthy.into(), falsy.into(), Condition::GT);
+                },
+                Insn::CSelGE { truthy, falsy, out } => {
+                    csel(cb, out.into(), truthy.into(), falsy.into(), Condition::GE);
+                }
+                Insn::LiveReg { .. } => (), // just a reg alloc signal, no code
+            };
+
+            insn_idx += 1;
+        }
+
+        // Error if we couldn't write out everything
+        if cb.has_dropped_bytes() {
+            None
+        } else {
+            // No bytes dropped, so the pos markers point to valid code
+            for (insn_idx, pos) in pos_markers {
+                if let Insn::PosMarker(callback) = self.insns.get(insn_idx).unwrap() {
+                    callback(pos, cb);
+                } else {
+                    panic!("non-PosMarker in pos_markers insn_idx={insn_idx} {self:?}");
+                }
+            }
+
+            Some(gc_offsets)
+        }
+    }
+
+    /// Optimize and compile the stored instructions
+    pub fn compile_with_regs(self, cb: &mut CodeBlock, regs: Vec<Reg>) -> Option<(CodePtr, Vec<CodePtr>)> {
+        let asm = self.arm64_split();
+        let mut asm = asm.alloc_regs(regs)?;
+        asm.compile_side_exits()?;
+
+        // Create label instances in the code block
+        for (idx, name) in asm.label_names.iter().enumerate() {
+            let label = cb.new_label(name.to_string());
+            assert_eq!(label, Label(idx));
+        }
+
+        let start_ptr = cb.get_write_ptr();
+        let gc_offsets = asm.arm64_emit(cb);
+
+        if let (Some(gc_offsets), false) = (gc_offsets, cb.has_dropped_bytes()) {
+            cb.link_labels();
+
+            // Invalidate icache for newly written out region so we don't run stale code.
+            unsafe { rb_zjit_icache_invalidate(start_ptr.raw_ptr(cb) as _, cb.get_write_ptr().raw_ptr(cb) as _) };
+
+            Some((start_ptr, gc_offsets))
+        } else {
+            cb.clear_labels();
+
+            None
+        }
+    }
+}
+
+/// LIR Instructions that are lowered to an instruction that have 2 input registers and an output
+/// register can look to merge with a succeeding `Insn::Mov`.
+/// For example:
+///
+///     Add out, a, b
+///     Mov c, out
+///
+/// Can become:
+///
+///     Add c, a, b
+///
+/// If a, b, and c are all registers.
+fn merge_three_reg_mov(
+    live_ranges: &Vec<LiveRange>,
+    iterator: &mut std::iter::Peekable<impl Iterator<Item = (usize, Insn)>>,
+    left: &Opnd,
+    right: &Opnd,
+    out: &mut Opnd,
+) {
+    if let (Opnd::Reg(_) | Opnd::VReg{..},
+            Opnd::Reg(_) | Opnd::VReg{..},
+            Some((mov_idx, Insn::Mov { dest, src })))
+            = (left, right, iterator.peek()) {
+        if out == src && live_ranges[out.vreg_idx()].end() == *mov_idx && matches!(*dest, Opnd::Reg(_) | Opnd::VReg{..}) {
+            *out = *dest;
+            iterator.next(); // Pop merged Insn::Mov
+        }
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use crate::assertions::assert_disasm;
+
+    static TEMP_REGS: [Reg; 5] = [X1_REG, X9_REG, X10_REG, X14_REG, X15_REG];
+
+    fn setup_asm() -> (Assembler, CodeBlock) {
+        (Assembler::new(), CodeBlock::new_dummy())
+    }
+
+    #[test]
+    fn test_mul_with_immediate() {
+        let (mut asm, mut cb) = setup_asm();
+
+        let out = asm.mul(Opnd::Reg(TEMP_REGS[1]), 3.into());
+        asm.mov(Opnd::Reg(TEMP_REGS[0]), out);
+        asm.compile_with_num_regs(&mut cb, 2);
+
+        assert_disasm!(cb, "600080d2207d009be10300aa", {"
+            0x0: mov x0, #3
+            0x4: mul x0, x9, x0
+            0x8: mov x1, x0
+        "});
+    }
+
+    #[test]
+    fn sp_movements_are_single_instruction() {
+        let (mut asm, mut cb) = setup_asm();
+
+        let sp = Opnd::Reg(XZR_REG);
+        let new_sp = asm.add(sp, 0x20.into());
+        asm.mov(sp, new_sp);
+        let new_sp = asm.sub(sp, 0x20.into());
+        asm.mov(sp, new_sp);
+        asm.compile_with_num_regs(&mut cb, 2);
+
+        assert_disasm!(cb, "e08300b11f000091e08300f11f000091", {"
+            0x0: add sp, sp, #0x20
+            0x4: sub sp, sp, #0x20
+        "});
+    }
+
+    #[test]
+    fn test_emit_add() {
+        let (mut asm, mut cb) = setup_asm();
+
+        let opnd = asm.add(Opnd::Reg(X0_REG), Opnd::Reg(X1_REG));
+        asm.store(Opnd::mem(64, Opnd::Reg(X2_REG), 0), opnd);
+        asm.compile_with_regs(&mut cb, vec![X3_REG]);
+
+        // Assert that only 2 instructions were written.
+        assert_eq!(8, cb.get_write_pos());
+    }
+
+    #[test]
+    fn test_emit_bake_string() {
+        let (mut asm, mut cb) = setup_asm();
+
+        asm.bake_string("Hello, world!");
+        asm.compile_with_num_regs(&mut cb, 0);
+
+        // Testing that we pad the string to the nearest 4-byte boundary to make
+        // it easier to jump over.
+        assert_eq!(16, cb.get_write_pos());
+    }
+
+    #[test]
+    fn test_emit_cpush_all() {
+        let (mut asm, mut cb) = setup_asm();
+
+        asm.cpush_all();
+        asm.compile_with_num_regs(&mut cb, 0);
+    }
+
+    #[test]
+    fn test_emit_cpop_all() {
+        let (mut asm, mut cb) = setup_asm();
+
+        asm.cpop_all();
+        asm.compile_with_num_regs(&mut cb, 0);
+    }
+
+    #[test]
+    fn test_emit_frame() {
+        let (mut asm, mut cb) = setup_asm();
+
+        asm.frame_setup();
+        asm.frame_teardown();
+        asm.compile_with_num_regs(&mut cb, 0);
+    }
+
+    #[test]
+    fn test_emit_je_fits_into_bcond() {
+        let (mut asm, mut cb) = setup_asm();
+
+        let target: CodePtr = cb.get_write_ptr().add_bytes(80);
+
+        asm.je(Target::CodePtr(target));
+        asm.compile_with_num_regs(&mut cb, 0);
+    }
+
+    #[test]
+    fn test_emit_je_does_not_fit_into_bcond() {
+        let (mut asm, mut cb) = setup_asm();
+
+        let offset = 1 << 21;
+        let target: CodePtr = cb.get_write_ptr().add_bytes(offset);
+
+        asm.je(Target::CodePtr(target));
+        asm.compile_with_num_regs(&mut cb, 0);
+    }
+
+    /*
+    #[test]
+    fn test_emit_lea_label() {
+        let (mut asm, mut cb) = setup_asm();
+
+        let label = asm.new_label("label");
+        let opnd = asm.lea_jump_target(label);
+
+        asm.write_label(label);
+        asm.bake_string("Hello, world!");
+        asm.store(Opnd::mem(64, SP, 0), opnd);
+
+        asm.compile_with_num_regs(&mut cb, 1);
+    }
+    */
+
+    #[test]
+    fn test_emit_load_mem_disp_fits_into_load() {
+        let (mut asm, mut cb) = setup_asm();
+
+        let opnd = asm.load(Opnd::mem(64, SP, 0));
+        asm.store(Opnd::mem(64, SP, 0), opnd);
+        asm.compile_with_num_regs(&mut cb, 1);
+
+        // Assert that two instructions were written: LDUR and STUR.
+        assert_eq!(8, cb.get_write_pos());
+    }
+
+    #[test]
+    fn test_emit_load_mem_disp_fits_into_add() {
+        let (mut asm, mut cb) = setup_asm();
+
+        let opnd = asm.load(Opnd::mem(64, SP, 1 << 10));
+        asm.store(Opnd::mem(64, SP, 0), opnd);
+        asm.compile_with_num_regs(&mut cb, 1);
+
+        // Assert that three instructions were written: ADD, LDUR, and STUR.
+        assert_eq!(12, cb.get_write_pos());
+    }
+
+    #[test]
+    fn test_emit_load_mem_disp_does_not_fit_into_add() {
+        let (mut asm, mut cb) = setup_asm();
+
+        let opnd = asm.load(Opnd::mem(64, SP, 1 << 12 | 1));
+        asm.store(Opnd::mem(64, SP, 0), opnd);
+        asm.compile_with_num_regs(&mut cb, 1);
+
+        // Assert that three instructions were written: MOVZ, ADD, LDUR, and STUR.
+        assert_eq!(16, cb.get_write_pos());
+    }
+
+    #[test]
+    fn test_emit_load_value_immediate() {
+        let (mut asm, mut cb) = setup_asm();
+
+        let opnd = asm.load(Opnd::Value(Qnil));
+        asm.store(Opnd::mem(64, SP, 0), opnd);
+        asm.compile_with_num_regs(&mut cb, 1);
+
+        // Assert that only two instructions were written since the value is an
+        // immediate.
+        assert_eq!(8, cb.get_write_pos());
+    }
+
+    #[test]
+    fn test_emit_load_value_non_immediate() {
+        let (mut asm, mut cb) = setup_asm();
+
+        let opnd = asm.load(Opnd::Value(VALUE(0xCAFECAFECAFE0000)));
+        asm.store(Opnd::mem(64, SP, 0), opnd);
+        asm.compile_with_num_regs(&mut cb, 1);
+
+        // Assert that five instructions were written since the value is not an
+        // immediate and needs to be loaded into a register.
+        assert_eq!(20, cb.get_write_pos());
+    }
+
+    #[test]
+    fn test_emit_test_32b_reg_not_bitmask_imm() {
+        let (mut asm, mut cb) = setup_asm();
+        let w0 = Opnd::Reg(X0_REG).with_num_bits(32).unwrap();
+        asm.test(w0, Opnd::UImm(u32::MAX.into()));
+        // All ones is not encodable with a bitmask immediate,
+        // so this needs one register
+        asm.compile_with_num_regs(&mut cb, 1);
+    }
+
+    #[test]
+    fn test_emit_test_32b_reg_bitmask_imm() {
+        let (mut asm, mut cb) = setup_asm();
+        let w0 = Opnd::Reg(X0_REG).with_num_bits(32).unwrap();
+        asm.test(w0, Opnd::UImm(0x80000001));
+        asm.compile_with_num_regs(&mut cb, 0);
+    }
+
+    #[test]
+    fn test_emit_or() {
+        let (mut asm, mut cb) = setup_asm();
+
+        let opnd = asm.or(Opnd::Reg(X0_REG), Opnd::Reg(X1_REG));
+        asm.store(Opnd::mem(64, Opnd::Reg(X2_REG), 0), opnd);
+        asm.compile_with_num_regs(&mut cb, 1);
+    }
+
+    #[test]
+    fn test_emit_lshift() {
+        let (mut asm, mut cb) = setup_asm();
+
+        let opnd = asm.lshift(Opnd::Reg(X0_REG), Opnd::UImm(5));
+        asm.store(Opnd::mem(64, Opnd::Reg(X2_REG), 0), opnd);
+        asm.compile_with_num_regs(&mut cb, 1);
+    }
+
+    #[test]
+    fn test_emit_rshift() {
+        let (mut asm, mut cb) = setup_asm();
+
+        let opnd = asm.rshift(Opnd::Reg(X0_REG), Opnd::UImm(5));
+        asm.store(Opnd::mem(64, Opnd::Reg(X2_REG), 0), opnd);
+        asm.compile_with_num_regs(&mut cb, 1);
+    }
+
+    #[test]
+    fn test_emit_urshift() {
+        let (mut asm, mut cb) = setup_asm();
+
+        let opnd = asm.urshift(Opnd::Reg(X0_REG), Opnd::UImm(5));
+        asm.store(Opnd::mem(64, Opnd::Reg(X2_REG), 0), opnd);
+        asm.compile_with_num_regs(&mut cb, 1);
+    }
+
+    #[test]
+    fn test_emit_test() {
+        let (mut asm, mut cb) = setup_asm();
+
+        asm.test(Opnd::Reg(X0_REG), Opnd::Reg(X1_REG));
+        asm.compile_with_num_regs(&mut cb, 0);
+
+        // Assert that only one instruction was written.
+        assert_eq!(4, cb.get_write_pos());
+    }
+
+    #[test]
+    fn test_emit_test_with_encodable_unsigned_immediate() {
+        let (mut asm, mut cb) = setup_asm();
+
+        asm.test(Opnd::Reg(X0_REG), Opnd::UImm(7));
+        asm.compile_with_num_regs(&mut cb, 0);
+
+        // Assert that only one instruction was written.
+        assert_eq!(4, cb.get_write_pos());
+    }
+
+    #[test]
+    fn test_emit_test_with_unencodable_unsigned_immediate() {
+        let (mut asm, mut cb) = setup_asm();
+
+        asm.test(Opnd::Reg(X0_REG), Opnd::UImm(5));
+        asm.compile_with_num_regs(&mut cb, 1);
+
+        // Assert that a load and a test instruction were written.
+        assert_eq!(8, cb.get_write_pos());
+    }
+
+    #[test]
+    fn test_emit_test_with_encodable_signed_immediate() {
+        let (mut asm, mut cb) = setup_asm();
+
+        asm.test(Opnd::Reg(X0_REG), Opnd::Imm(7));
+        asm.compile_with_num_regs(&mut cb, 0);
+
+        // Assert that only one instruction was written.
+        assert_eq!(4, cb.get_write_pos());
+    }
+
+    #[test]
+    fn test_emit_test_with_unencodable_signed_immediate() {
+        let (mut asm, mut cb) = setup_asm();
+
+        asm.test(Opnd::Reg(X0_REG), Opnd::Imm(5));
+        asm.compile_with_num_regs(&mut cb, 1);
+
+        // Assert that a load and a test instruction were written.
+        assert_eq!(8, cb.get_write_pos());
+    }
+
+    #[test]
+    fn test_emit_test_with_negative_signed_immediate() {
+        let (mut asm, mut cb) = setup_asm();
+
+        asm.test(Opnd::Reg(X0_REG), Opnd::Imm(-7));
+        asm.compile_with_num_regs(&mut cb, 1);
+
+        // Assert that a test instruction is written.
+        assert_eq!(4, cb.get_write_pos());
+    }
+
+    #[test]
+    fn test_32_bit_register_with_some_number() {
+        let (mut asm, mut cb) = setup_asm();
+
+        let shape_opnd = Opnd::mem(32, Opnd::Reg(X0_REG), 6);
+        asm.cmp(shape_opnd, Opnd::UImm(4097));
+        asm.compile_with_num_regs(&mut cb, 2);
+    }
+
+    #[test]
+    fn test_16_bit_register_store_some_number() {
+        let (mut asm, mut cb) = setup_asm();
+
+        let shape_opnd = Opnd::mem(16, Opnd::Reg(X0_REG), 0);
+        asm.store(shape_opnd, Opnd::UImm(4097));
+        asm.compile_with_num_regs(&mut cb, 2);
+    }
+
+    #[test]
+    fn test_32_bit_register_store_some_number() {
+        let (mut asm, mut cb) = setup_asm();
+
+        let shape_opnd = Opnd::mem(32, Opnd::Reg(X0_REG), 6);
+        asm.store(shape_opnd, Opnd::UImm(4097));
+        asm.compile_with_num_regs(&mut cb, 2);
+    }
+
+    /*
+    #[test]
+    fn test_bcond_straddling_code_pages() {
+        const LANDING_PAGE: usize = 65;
+        let mut asm = Assembler::new(0);
+        let mut cb = CodeBlock::new_dummy_with_freed_pages(vec![0, LANDING_PAGE]);
+
+        // Skip to near the end of the page. Room for two instructions.
+        cb.set_pos(cb.page_start_pos() + cb.page_end() - 8);
+
+        let end = asm.new_label("end");
+        // Start with a conditional jump...
+        asm.jz(end);
+
+        // A few instructions, enough to cause a page switch.
+        let sum = asm.add(399.into(), 111.into());
+        let xorred = asm.xor(sum, 859.into());
+        asm.store(Opnd::mem(64, Opnd::Reg(X2_REG), 0), xorred);
+        asm.store(Opnd::mem(64, Opnd::Reg(X0_REG), 0), xorred);
+
+        // The branch target. It should be in the landing page.
+        asm.write_label(end);
+        asm.cret(xorred);
+
+        // [Bug #19385]
+        // This used to panic with "The offset must be 19 bits or less."
+        // due to attempting to lower the `asm.jz` above to a `b.e` with an offset that's > 1 MiB.
+        let starting_pos = cb.get_write_pos();
+        asm.compile_with_num_regs(&mut cb, 2);
+        let gap = cb.get_write_pos() - starting_pos;
+        assert!(gap > 0b1111111111111111111);
+
+        let instruction_at_starting_pos: [u8; 4] = unsafe {
+            std::slice::from_raw_parts(cb.get_ptr(starting_pos).raw_ptr(&cb), 4)
+        }.try_into().unwrap();
+        assert_eq!(
+            0b000101 << 26_u32,
+            u32::from_le_bytes(instruction_at_starting_pos) & (0b111111 << 26_u32),
+            "starting instruction should be an unconditional branch to the new page (B)"
+        );
+    }
+
+    #[test]
+    fn test_emit_xor() {
+        let (mut asm, mut cb) = setup_asm();
+
+        let opnd = asm.xor(Opnd::Reg(X0_REG), Opnd::Reg(X1_REG));
+        asm.store(Opnd::mem(64, Opnd::Reg(X2_REG), 0), opnd);
+
+        asm.compile_with_num_regs(&mut cb, 1);
+
+        assert_disasm!(cb, "0b0001ca4b0000f8", "
+            0x0: eor x11, x0, x1
+            0x4: stur x11, [x2]
+        ");
+    }
+
+    #[test]
+    #[cfg(feature = "disasm")]
+    fn test_simple_disasm() -> std::result::Result<(), capstone::Error> {
+        // Test drive Capstone with simple input
+        use capstone::prelude::*;
+
+        let cs = Capstone::new()
+            .arm64()
+            .mode(arch::arm64::ArchMode::Arm)
+            .build()?;
+
+        let insns = cs.disasm_all(&[0x60, 0x0f, 0x80, 0xF2], 0x1000)?;
+
+        match insns.as_ref() {
+            [insn] => {
+                assert_eq!(Some("movk"), insn.mnemonic());
+                Ok(())
+            }
+            _ => Err(capstone::Error::CustomError(
+                "expected to disassemble to movk",
+            )),
+        }
+    }
+
+    #[test]
+    fn test_replace_mov_with_ldur() {
+        let (mut asm, mut cb) = setup_asm();
+
+        asm.mov(Opnd::Reg(TEMP_REGS[0]), Opnd::mem(64, CFP, 8));
+        asm.compile_with_num_regs(&mut cb, 1);
+
+        assert_disasm!(cb, "618240f8", {"
+            0x0: ldur x1, [x19, #8]
+        "});
+    }
+
+    #[test]
+    fn test_not_split_mov() {
+        let (mut asm, mut cb) = setup_asm();
+
+        asm.mov(Opnd::Reg(TEMP_REGS[0]), Opnd::UImm(0xffff));
+        asm.mov(Opnd::Reg(TEMP_REGS[0]), Opnd::UImm(0x10000));
+        asm.compile_with_num_regs(&mut cb, 1);
+
+        assert_disasm!(cb, "e1ff9fd2e10370b2", {"
+            0x0: mov x1, #0xffff
+            0x4: orr x1, xzr, #0x10000
+        "});
+    }
+
+    #[test]
+    fn test_merge_csel_mov() {
+        let (mut asm, mut cb) = setup_asm();
+
+        let out = asm.csel_l(Qtrue.into(), Qfalse.into());
+        asm.mov(Opnd::Reg(TEMP_REGS[0]), out);
+        asm.compile_with_num_regs(&mut cb, 2);
+
+        assert_disasm!(cb, "8b0280d20c0080d261b18c9a", {"
+            0x0: mov x11, #0x14
+            0x4: mov x12, #0
+            0x8: csel x1, x11, x12, lt
+        "});
+    }
+
+    #[test]
+    fn test_add_with_immediate() {
+        let (mut asm, mut cb) = setup_asm();
+
+        let out = asm.add(Opnd::Reg(TEMP_REGS[1]), 1.into());
+        let out = asm.add(out, 1_usize.into());
+        asm.mov(Opnd::Reg(TEMP_REGS[0]), out);
+        asm.compile_with_num_regs(&mut cb, 2);
+
+        assert_disasm!(cb, "2b0500b16b0500b1e1030baa", {"
+            0x0: adds x11, x9, #1
+            0x4: adds x11, x11, #1
+            0x8: mov x1, x11
+        "});
+    }
+    */
+}
diff --git a/zjit/src/backend/lir.rs b/zjit/src/backend/lir.rs
new file mode 100644
index 00000000000000..694c95a37f7a40
--- /dev/null
+++ b/zjit/src/backend/lir.rs
@@ -0,0 +1,2307 @@
+use std::collections::HashMap;
+use std::fmt;
+use std::mem::take;
+use crate::codegen::local_size_and_idx_to_ep_offset;
+use crate::cruby::{Qundef, RUBY_OFFSET_CFP_PC, RUBY_OFFSET_CFP_SP, SIZEOF_VALUE_I32};
+use crate::hir::SideExitReason;
+use crate::options::{debug, get_option};
+use crate::{cruby::VALUE};
+use crate::backend::current::*;
+use crate::virtualmem::CodePtr;
+use crate::asm::{CodeBlock, Label};
+
+pub const EC: Opnd = _EC;
+pub const CFP: Opnd = _CFP;
+pub const SP: Opnd = _SP;
+
+pub const C_ARG_OPNDS: [Opnd; 6] = _C_ARG_OPNDS;
+pub const C_RET_OPND: Opnd = _C_RET_OPND;
+pub const NATIVE_STACK_PTR: Opnd = _NATIVE_STACK_PTR;
+pub use crate::backend::current::{Reg, C_RET_REG};
+
+// Memory operand base
+#[derive(Clone, Copy, PartialEq, Eq, Debug)]
+pub enum MemBase
+{
+    Reg(u8),
+    VReg(usize),
+}
+
+// Memory location
+#[derive(Copy, Clone, PartialEq, Eq)]
+pub struct Mem
+{
+    // Base register number or instruction index
+    pub(super) base: MemBase,
+
+    // Offset relative to the base pointer
+    pub(super) disp: i32,
+
+    // Size in bits
+    pub(super) num_bits: u8,
+}
+
+impl fmt::Debug for Mem {
+    fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result {
+        write!(fmt, "Mem{}[{:?}", self.num_bits, self.base)?;
+        if self.disp != 0 {
+            let sign = if self.disp > 0 { '+' } else { '-' };
+            write!(fmt, " {sign} {}", self.disp.abs())?;
+        }
+
+        write!(fmt, "]")
+    }
+}
+
+/// Operand to an IR instruction
+#[derive(Clone, Copy, PartialEq, Eq)]
+pub enum Opnd
+{
+    None,               // For insns with no output
+
+    // Immediate Ruby value, may be GC'd, movable
+    Value(VALUE),
+
+    /// Virtual register. Lowered to Reg or Mem in Assembler::alloc_regs().
+    VReg{ idx: usize, num_bits: u8 },
+
+    // Low-level operands, for lowering
+    Imm(i64),           // Raw signed immediate
+    UImm(u64),          // Raw unsigned immediate
+    Mem(Mem),           // Memory location
+    Reg(Reg),           // Machine register
+}
+
+impl fmt::Debug for Opnd {
+    fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result {
+        use Opnd::*;
+        match self {
+            Self::None => write!(fmt, "None"),
+            Value(val) => write!(fmt, "Value({val:?})"),
+            VReg { idx, num_bits } if *num_bits == 64 => write!(fmt, "VReg({idx})"),
+            VReg { idx, num_bits } => write!(fmt, "VReg{num_bits}({idx})"),
+            Imm(signed) => write!(fmt, "{signed:x}_i64"),
+            UImm(unsigned) => write!(fmt, "{unsigned:x}_u64"),
+            // Say Mem and Reg only once
+            Mem(mem) => write!(fmt, "{mem:?}"),
+            Reg(reg) => write!(fmt, "{reg:?}"),
+        }
+    }
+}
+
+impl Opnd
+{
+    /// Convenience constructor for memory operands
+    pub fn mem(num_bits: u8, base: Opnd, disp: i32) -> Self {
+        match base {
+            Opnd::Reg(base_reg) => {
+                assert!(base_reg.num_bits == 64);
+                Opnd::Mem(Mem {
+                    base: MemBase::Reg(base_reg.reg_no),
+                    disp: disp,
+                    num_bits: num_bits,
+                })
+            },
+
+            Opnd::VReg{idx, num_bits: out_num_bits } => {
+                assert!(num_bits <= out_num_bits);
+                Opnd::Mem(Mem {
+                    base: MemBase::VReg(idx),
+                    disp: disp,
+                    num_bits: num_bits,
+                })
+            },
+
+            _ => unreachable!("memory operand with non-register base")
+        }
+    }
+
+    /// Constructor for constant pointer operand
+    pub fn const_ptr(ptr: *const u8) -> Self {
+        Opnd::UImm(ptr as u64)
+    }
+
+    /// Unwrap a register operand
+    pub fn unwrap_reg(&self) -> Reg {
+        match self {
+            Opnd::Reg(reg) => *reg,
+            _ => unreachable!("trying to unwrap {:?} into reg", self)
+        }
+    }
+
+    /// Unwrap the index of a VReg
+    pub fn vreg_idx(&self) -> usize {
+        match self {
+            Opnd::VReg { idx, .. } => *idx,
+            _ => unreachable!("trying to unwrap {self:?} into VReg"),
+        }
+    }
+
+    /// Get the size in bits for this operand if there is one.
+    pub fn num_bits(&self) -> Option<u8> {
+        match *self {
+            Opnd::Reg(Reg { num_bits, .. }) => Some(num_bits),
+            Opnd::Mem(Mem { num_bits, .. }) => Some(num_bits),
+            Opnd::VReg { num_bits, .. } => Some(num_bits),
+            _ => None
+        }
+    }
+
+    pub fn with_num_bits(&self, num_bits: u8) -> Option<Opnd> {
+        assert!(num_bits == 8 || num_bits == 16 || num_bits == 32 || num_bits == 64);
+        match *self {
+            Opnd::Reg(reg) => Some(Opnd::Reg(reg.with_num_bits(num_bits))),
+            Opnd::Mem(Mem { base, disp, .. }) => Some(Opnd::Mem(Mem { base, disp, num_bits })),
+            Opnd::VReg { idx, .. } => Some(Opnd::VReg { idx, num_bits }),
+            //Opnd::Stack { idx, stack_size, num_locals, sp_offset, reg_mapping, .. } => Some(Opnd::Stack { idx, num_bits, stack_size, num_locals, sp_offset, reg_mapping }),
+            _ => None,
+        }
+    }
+
+    /// Get the size in bits for register/memory operands.
+    pub fn rm_num_bits(&self) -> u8 {
+        self.num_bits().unwrap()
+    }
+
+    /// Maps the indices from a previous list of instructions to a new list of
+    /// instructions.
+    pub fn map_index(self, indices: &[usize]) -> Opnd {
+        match self {
+            Opnd::VReg { idx, num_bits } => {
+                Opnd::VReg { idx: indices[idx], num_bits }
+            }
+            Opnd::Mem(Mem { base: MemBase::VReg(idx), disp, num_bits }) => {
+                Opnd::Mem(Mem { base: MemBase::VReg(indices[idx]), disp, num_bits })
+            },
+            _ => self
+        }
+    }
+
+    /// When there aren't any operands to check against, this is the number of
+    /// bits that should be used for any given output variable.
+    const DEFAULT_NUM_BITS: u8 = 64;
+
+    /// Determine the size in bits from the iterator of operands. If any of them
+    /// are different sizes this will panic.
+    pub fn match_num_bits_iter<'a>(opnds: impl Iterator<Item = &'a Opnd>) -> u8 {
+        let mut value: Option<u8> = None;
+
+        for opnd in opnds {
+            if let Some(num_bits) = opnd.num_bits() {
+                match value {
+                    None => {
+                        value = Some(num_bits);
+                    },
+                    Some(value) => {
+                        assert_eq!(value, num_bits, "operands of incompatible sizes");
+                    }
+                };
+            }
+        }
+
+        value.unwrap_or(Self::DEFAULT_NUM_BITS)
+    }
+
+    /// Determine the size in bits of the slice of the given operands. If any of
+    /// them are different sizes this will panic.
+    pub fn match_num_bits(opnds: &[Opnd]) -> u8 {
+        Self::match_num_bits_iter(opnds.iter())
+    }
+
+    /*
+    /// Convert Opnd::Stack into RegMapping
+    pub fn reg_opnd(&self) -> RegOpnd {
+        self.get_reg_opnd().unwrap()
+    }
+
+    /// Convert an operand into RegMapping if it's Opnd::Stack
+    pub fn get_reg_opnd(&self) -> Option<RegOpnd> {
+        match *self {
+            Opnd::Stack { idx, stack_size, num_locals, .. } => Some(
+                if let Some(num_locals) = num_locals {
+                    let last_idx = stack_size as i32 + VM_ENV_DATA_SIZE as i32 - 1;
+                    assert!(last_idx <= idx, "Local index {} must be >= last local index {}", idx, last_idx);
+                    assert!(idx <= last_idx + num_locals as i32, "Local index {} must be < last local index {} + local size {}", idx, last_idx, num_locals);
+                    RegOpnd::Local((last_idx + num_locals as i32 - idx) as u8)
+                } else {
+                    assert!(idx < stack_size as i32);
+                    RegOpnd::Stack((stack_size as i32 - idx - 1) as u8)
+                }
+            ),
+            _ => None,
+        }
+    }
+    */
+}
+
+impl From<usize> for Opnd {
+    fn from(value: usize) -> Self {
+        Opnd::UImm(value.try_into().unwrap())
+    }
+}
+
+impl From<u64> for Opnd {
+    fn from(value: u64) -> Self {
+        Opnd::UImm(value)
+    }
+}
+
+impl From<i64> for Opnd {
+    fn from(value: i64) -> Self {
+        Opnd::Imm(value)
+    }
+}
+
+impl From<i32> for Opnd {
+    fn from(value: i32) -> Self {
+        Opnd::Imm(value.into())
+    }
+}
+
+impl From<u32> for Opnd {
+    fn from(value: u32) -> Self {
+        Opnd::UImm(value as u64)
+    }
+}
+
+impl From<VALUE> for Opnd {
+    fn from(value: VALUE) -> Self {
+        Opnd::Value(value)
+    }
+}
+
+/// Branch target (something that we can jump to)
+/// for branch instructions
+#[derive(Clone, Debug)]
+pub enum Target
+{
+    /// Pointer to a piece of ZJIT-generated code
+    CodePtr(CodePtr),
+    /// A label within the generated code
+    Label(Label),
+    /// Side exit to the interpreter
+    SideExit {
+        pc: *const VALUE,
+        stack: Vec<Opnd>,
+        locals: Vec<Opnd>,
+        c_stack_bytes: usize,
+        reason: SideExitReason,
+        // Some if the side exit should write this label. We use it for patch points.
+        label: Option<Label>,
+    },
+}
+
+impl Target
+{
+    pub fn unwrap_label(&self) -> Label {
+        match self {
+            Target::Label(label) => *label,
+            _ => unreachable!("trying to unwrap {:?} into label", self)
+        }
+    }
+
+    pub fn unwrap_code_ptr(&self) -> CodePtr {
+        match self {
+            Target::CodePtr(ptr) => *ptr,
+            _ => unreachable!("trying to unwrap {:?} into code ptr", self)
+        }
+    }
+}
+
+impl From<CodePtr> for Target {
+    fn from(code_ptr: CodePtr) -> Self {
+        Target::CodePtr(code_ptr)
+    }
+}
+
+type PosMarkerFn = Box<dyn Fn(CodePtr, &CodeBlock)>;
+
+/// ZJIT Low-level IR instruction
+pub enum Insn {
+    /// Add two operands together, and return the result as a new operand.
+    Add { left: Opnd, right: Opnd, out: Opnd },
+
+    /// This is the same as the OP_ADD instruction, except that it performs the
+    /// binary AND operation.
+    And { left: Opnd, right: Opnd, out: Opnd },
+
+    /// Bake a string directly into the instruction stream.
+    BakeString(String),
+
+    // Trigger a debugger breakpoint
+    #[allow(dead_code)]
+    Breakpoint,
+
+    /// Add a comment into the IR at the point that this instruction is added.
+    /// It won't have any impact on that actual compiled code.
+    Comment(String),
+
+    /// Compare two operands
+    Cmp { left: Opnd, right: Opnd },
+
+    /// Pop a register from the C stack
+    CPop { out: Opnd },
+
+    /// Pop all of the caller-save registers and the flags from the C stack
+    CPopAll,
+
+    /// Pop a register from the C stack and store it into another register
+    CPopInto(Opnd),
+
+    /// Push a register onto the C stack
+    CPush(Opnd),
+
+    /// Push all of the caller-save registers and the flags to the C stack
+    CPushAll,
+
+    // C function call with N arguments (variadic)
+    CCall {
+        opnds: Vec<Opnd>,
+        fptr: *const u8,
+        /// Optional PosMarker to remember the start address of the C call.
+        /// It's embedded here to insert the PosMarker after push instructions
+        /// that are split from this CCall on alloc_regs().
+        start_marker: Option<PosMarkerFn>,
+        /// Optional PosMarker to remember the end address of the C call.
+        /// It's embedded here to insert the PosMarker before pop instructions
+        /// that are split from this CCall on alloc_regs().
+        end_marker: Option<PosMarkerFn>,
+        out: Opnd,
+    },
+
+    // C function return
+    CRet(Opnd),
+
+    /// Conditionally select if equal
+    CSelE { truthy: Opnd, falsy: Opnd, out: Opnd },
+
+    /// Conditionally select if greater
+    CSelG { truthy: Opnd, falsy: Opnd, out: Opnd },
+
+    /// Conditionally select if greater or equal
+    CSelGE { truthy: Opnd, falsy: Opnd, out: Opnd },
+
+    /// Conditionally select if less
+    CSelL { truthy: Opnd, falsy: Opnd, out: Opnd },
+
+    /// Conditionally select if less or equal
+    CSelLE { truthy: Opnd, falsy: Opnd, out: Opnd },
+
+    /// Conditionally select if not equal
+    CSelNE { truthy: Opnd, falsy: Opnd, out: Opnd },
+
+    /// Conditionally select if not zero
+    CSelNZ { truthy: Opnd, falsy: Opnd, out: Opnd },
+
+    /// Conditionally select if zero
+    CSelZ { truthy: Opnd, falsy: Opnd, out: Opnd },
+
+    /// Set up the frame stack as necessary per the architecture.
+    FrameSetup,
+
+    /// Tear down the frame stack as necessary per the architecture.
+    FrameTeardown,
+
+    // Atomically increment a counter
+    // Input: memory operand, increment value
+    // Produces no output
+    IncrCounter { mem: Opnd, value: Opnd },
+
+    /// Jump if below or equal (unsigned)
+    Jbe(Target),
+
+    /// Jump if below (unsigned)
+    Jb(Target),
+
+    /// Jump if equal
+    Je(Target),
+
+    /// Jump if lower
+    Jl(Target),
+
+    /// Jump if greater
+    Jg(Target),
+
+    /// Jump if greater or equal
+    Jge(Target),
+
+    // Unconditional jump to a branch target
+    Jmp(Target),
+
+    // Unconditional jump which takes a reg/mem address operand
+    JmpOpnd(Opnd),
+
+    /// Jump if not equal
+    Jne(Target),
+
+    /// Jump if not zero
+    Jnz(Target),
+
+    /// Jump if overflow
+    Jo(Target),
+
+    /// Jump if overflow in multiplication
+    JoMul(Target),
+
+    /// Jump if zero
+    Jz(Target),
+
+    /// Jump if operand is zero (only used during lowering at the moment)
+    Joz(Opnd, Target),
+
+    /// Jump if operand is non-zero (only used during lowering at the moment)
+    Jonz(Opnd, Target),
+
+    // Add a label into the IR at the point that this instruction is added.
+    Label(Target),
+
+    /// Get the code address of a jump target
+    LeaJumpTarget { target: Target, out: Opnd },
+
+    // Load effective address
+    Lea { opnd: Opnd, out: Opnd },
+
+    /// Take a specific register. Signal the register allocator to not use it.
+    LiveReg { opnd: Opnd, out: Opnd },
+
+    // A low-level instruction that loads a value into a register.
+    Load { opnd: Opnd, out: Opnd },
+
+    // A low-level instruction that loads a value into a specified register.
+    LoadInto { dest: Opnd, opnd: Opnd },
+
+    // A low-level instruction that loads a value into a register and
+    // sign-extends it to a 64-bit value.
+    LoadSExt { opnd: Opnd, out: Opnd },
+
+    /// Shift a value left by a certain amount.
+    LShift { opnd: Opnd, shift: Opnd, out: Opnd },
+
+    /// A set of parallel moves into registers.
+    /// The backend breaks cycles if there are any cycles between moves.
+    ParallelMov { moves: Vec<(Reg, Opnd)> },
+
+    // A low-level mov instruction. It accepts two operands.
+    Mov { dest: Opnd, src: Opnd },
+
+    // Perform the NOT operation on an individual operand, and return the result
+    // as a new operand. This operand can then be used as the operand on another
+    // instruction.
+    Not { opnd: Opnd, out: Opnd },
+
+    // This is the same as the OP_ADD instruction, except that it performs the
+    // binary OR operation.
+    Or { left: Opnd, right: Opnd, out: Opnd },
+
+    /// Patch point that will be rewritten to a jump to a side exit on invalidation.
+    PatchPoint(Target),
+
+    /// Make sure the last PatchPoint has enough space to insert a jump.
+    /// We insert this instruction at the end of each block so that the jump
+    /// will not overwrite the next block or a side exit.
+    PadPatchPoint,
+
+    // Mark a position in the generated code
+    PosMarker(PosMarkerFn),
+
+    /// Shift a value right by a certain amount (signed).
+    RShift { opnd: Opnd, shift: Opnd, out: Opnd },
+
+    // Low-level instruction to store a value to memory.
+    Store { dest: Opnd, src: Opnd },
+
+    // This is the same as the add instruction, except for subtraction.
+    Sub { left: Opnd, right: Opnd, out: Opnd },
+
+    // Integer multiplication
+    Mul { left: Opnd, right: Opnd, out: Opnd },
+
+    // Bitwise AND test instruction
+    Test { left: Opnd, right: Opnd },
+
+    /// Shift a value right by a certain amount (unsigned).
+    URShift { opnd: Opnd, shift: Opnd, out: Opnd },
+
+    // This is the same as the OP_ADD instruction, except that it performs the
+    // binary XOR operation.
+    Xor { left: Opnd, right: Opnd, out: Opnd }
+}
+
+impl Insn {
+    /// Create an iterator that will yield a non-mutable reference to each
+    /// operand in turn for this instruction.
+    pub(super) fn opnd_iter(&self) -> InsnOpndIterator {
+        InsnOpndIterator::new(self)
+    }
+
+    /// Create an iterator that will yield a mutable reference to each operand
+    /// in turn for this instruction.
+    pub(super) fn opnd_iter_mut(&mut self) -> InsnOpndMutIterator {
+        InsnOpndMutIterator::new(self)
+    }
+
+    /// Get a mutable reference to a Target if it exists.
+    pub(super) fn target_mut(&mut self) -> Option<&mut Target> {
+        match self {
+            Insn::Jbe(target) |
+            Insn::Jb(target) |
+            Insn::Je(target) |
+            Insn::Jl(target) |
+            Insn::Jg(target) |
+            Insn::Jge(target) |
+            Insn::Jmp(target) |
+            Insn::Jne(target) |
+            Insn::Jnz(target) |
+            Insn::Jo(target) |
+            Insn::JoMul(target) |
+            Insn::Jz(target) |
+            Insn::Joz(_, target) |
+            Insn::Jonz(_, target) |
+            Insn::Label(target) |
+            Insn::LeaJumpTarget { target, .. } |
+            Insn::PatchPoint(target) => {
+                Some(target)
+            }
+            _ => None,
+        }
+    }
+
+    /// Returns a string that describes which operation this instruction is
+    /// performing. This is used for debugging.
+    fn op(&self) -> &'static str {
+        match self {
+            Insn::Add { .. } => "Add",
+            Insn::And { .. } => "And",
+            Insn::BakeString(_) => "BakeString",
+            Insn::Breakpoint => "Breakpoint",
+            Insn::Comment(_) => "Comment",
+            Insn::Cmp { .. } => "Cmp",
+            Insn::CPop { .. } => "CPop",
+            Insn::CPopAll => "CPopAll",
+            Insn::CPopInto(_) => "CPopInto",
+            Insn::CPush(_) => "CPush",
+            Insn::CPushAll => "CPushAll",
+            Insn::CCall { .. } => "CCall",
+            Insn::CRet(_) => "CRet",
+            Insn::CSelE { .. } => "CSelE",
+            Insn::CSelG { .. } => "CSelG",
+            Insn::CSelGE { .. } => "CSelGE",
+            Insn::CSelL { .. } => "CSelL",
+            Insn::CSelLE { .. } => "CSelLE",
+            Insn::CSelNE { .. } => "CSelNE",
+            Insn::CSelNZ { .. } => "CSelNZ",
+            Insn::CSelZ { .. } => "CSelZ",
+            Insn::FrameSetup => "FrameSetup",
+            Insn::FrameTeardown => "FrameTeardown",
+            Insn::IncrCounter { .. } => "IncrCounter",
+            Insn::Jbe(_) => "Jbe",
+            Insn::Jb(_) => "Jb",
+            Insn::Je(_) => "Je",
+            Insn::Jl(_) => "Jl",
+            Insn::Jg(_) => "Jg",
+            Insn::Jge(_) => "Jge",
+            Insn::Jmp(_) => "Jmp",
+            Insn::JmpOpnd(_) => "JmpOpnd",
+            Insn::Jne(_) => "Jne",
+            Insn::Jnz(_) => "Jnz",
+            Insn::Jo(_) => "Jo",
+            Insn::JoMul(_) => "JoMul",
+            Insn::Jz(_) => "Jz",
+            Insn::Joz(..) => "Joz",
+            Insn::Jonz(..) => "Jonz",
+            Insn::Label(_) => "Label",
+            Insn::LeaJumpTarget { .. } => "LeaJumpTarget",
+            Insn::Lea { .. } => "Lea",
+            Insn::LiveReg { .. } => "LiveReg",
+            Insn::Load { .. } => "Load",
+            Insn::LoadInto { .. } => "LoadInto",
+            Insn::LoadSExt { .. } => "LoadSExt",
+            Insn::LShift { .. } => "LShift",
+            Insn::ParallelMov { .. } => "ParallelMov",
+            Insn::Mov { .. } => "Mov",
+            Insn::Not { .. } => "Not",
+            Insn::Or { .. } => "Or",
+            Insn::PatchPoint(_) => "PatchPoint",
+            Insn::PadPatchPoint => "PadPatchPoint",
+            Insn::PosMarker(_) => "PosMarker",
+            Insn::RShift { .. } => "RShift",
+            Insn::Store { .. } => "Store",
+            Insn::Sub { .. } => "Sub",
+            Insn::Mul { .. } => "Mul",
+            Insn::Test { .. } => "Test",
+            Insn::URShift { .. } => "URShift",
+            Insn::Xor { .. } => "Xor"
+        }
+    }
+
+    /// Return a non-mutable reference to the out operand for this instruction
+    /// if it has one.
+    pub fn out_opnd(&self) -> Option<&Opnd> {
+        match self {
+            Insn::Add { out, .. } |
+            Insn::And { out, .. } |
+            Insn::CCall { out, .. } |
+            Insn::CPop { out, .. } |
+            Insn::CSelE { out, .. } |
+            Insn::CSelG { out, .. } |
+            Insn::CSelGE { out, .. } |
+            Insn::CSelL { out, .. } |
+            Insn::CSelLE { out, .. } |
+            Insn::CSelNE { out, .. } |
+            Insn::CSelNZ { out, .. } |
+            Insn::CSelZ { out, .. } |
+            Insn::Lea { out, .. } |
+            Insn::LeaJumpTarget { out, .. } |
+            Insn::LiveReg { out, .. } |
+            Insn::Load { out, .. } |
+            Insn::LoadSExt { out, .. } |
+            Insn::LShift { out, .. } |
+            Insn::Not { out, .. } |
+            Insn::Or { out, .. } |
+            Insn::RShift { out, .. } |
+            Insn::Sub { out, .. } |
+            Insn::Mul { out, .. } |
+            Insn::URShift { out, .. } |
+            Insn::Xor { out, .. } => Some(out),
+            _ => None
+        }
+    }
+
+    /// Return a mutable reference to the out operand for this instruction if it
+    /// has one.
+    pub fn out_opnd_mut(&mut self) -> Option<&mut Opnd> {
+        match self {
+            Insn::Add { out, .. } |
+            Insn::And { out, .. } |
+            Insn::CCall { out, .. } |
+            Insn::CPop { out, .. } |
+            Insn::CSelE { out, .. } |
+            Insn::CSelG { out, .. } |
+            Insn::CSelGE { out, .. } |
+            Insn::CSelL { out, .. } |
+            Insn::CSelLE { out, .. } |
+            Insn::CSelNE { out, .. } |
+            Insn::CSelNZ { out, .. } |
+            Insn::CSelZ { out, .. } |
+            Insn::Lea { out, .. } |
+            Insn::LeaJumpTarget { out, .. } |
+            Insn::LiveReg { out, .. } |
+            Insn::Load { out, .. } |
+            Insn::LoadSExt { out, .. } |
+            Insn::LShift { out, .. } |
+            Insn::Not { out, .. } |
+            Insn::Or { out, .. } |
+            Insn::RShift { out, .. } |
+            Insn::Sub { out, .. } |
+            Insn::Mul { out, .. } |
+            Insn::URShift { out, .. } |
+            Insn::Xor { out, .. } => Some(out),
+            _ => None
+        }
+    }
+
+    /// Returns the target for this instruction if there is one.
+    pub fn target(&self) -> Option<&Target> {
+        match self {
+            Insn::Jbe(target) |
+            Insn::Jb(target) |
+            Insn::Je(target) |
+            Insn::Jl(target) |
+            Insn::Jg(target) |
+            Insn::Jge(target) |
+            Insn::Jmp(target) |
+            Insn::Jne(target) |
+            Insn::Jnz(target) |
+            Insn::Jo(target) |
+            Insn::JoMul(target) |
+            Insn::Jz(target) |
+            Insn::Joz(_, target) |
+            Insn::Jonz(_, target) |
+            Insn::Label(target) |
+            Insn::LeaJumpTarget { target, .. } |
+            Insn::PatchPoint(target) => Some(target),
+            _ => None
+        }
+    }
+
+    /// Returns the text associated with this instruction if there is some.
+    pub fn text(&self) -> Option<&String> {
+        match self {
+            Insn::BakeString(text) |
+            Insn::Comment(text) => Some(text),
+            _ => None
+        }
+    }
+}
+
+/// An iterator that will yield a non-mutable reference to each operand in turn
+/// for the given instruction.
+pub(super) struct InsnOpndIterator<'a> {
+    insn: &'a Insn,
+    idx: usize,
+}
+
+impl<'a> InsnOpndIterator<'a> {
+    fn new(insn: &'a Insn) -> Self {
+        Self { insn, idx: 0 }
+    }
+}
+
+impl<'a> Iterator for InsnOpndIterator<'a> {
+    type Item = &'a Opnd;
+
+    fn next(&mut self) -> Option<Self::Item> {
+        match self.insn {
+            Insn::Jbe(target) |
+            Insn::Jb(target) |
+            Insn::Je(target) |
+            Insn::Jl(target) |
+            Insn::Jg(target) |
+            Insn::Jge(target) |
+            Insn::Jmp(target) |
+            Insn::Jne(target) |
+            Insn::Jnz(target) |
+            Insn::Jo(target) |
+            Insn::JoMul(target) |
+            Insn::Jz(target) |
+            Insn::Label(target) |
+            Insn::LeaJumpTarget { target, .. } |
+            Insn::PatchPoint(target) => {
+                if let Target::SideExit { stack, locals, .. } = target {
+                    let stack_idx = self.idx;
+                    if stack_idx < stack.len() {
+                        let opnd = &stack[stack_idx];
+                        self.idx += 1;
+                        return Some(opnd);
+                    }
+
+                    let local_idx = self.idx - stack.len();
+                    if local_idx < locals.len() {
+                        let opnd = &locals[local_idx];
+                        self.idx += 1;
+                        return Some(opnd);
+                    }
+                }
+                None
+            }
+
+            Insn::Joz(opnd, target) |
+            Insn::Jonz(opnd, target) => {
+                if self.idx == 0 {
+                    self.idx += 1;
+                    return Some(opnd);
+                }
+
+                if let Target::SideExit { stack, locals, .. } = target {
+                    let stack_idx = self.idx - 1;
+                    if stack_idx < stack.len() {
+                        let opnd = &stack[stack_idx];
+                        self.idx += 1;
+                        return Some(opnd);
+                    }
+
+                    let local_idx = stack_idx - stack.len();
+                    if local_idx < locals.len() {
+                        let opnd = &locals[local_idx];
+                        self.idx += 1;
+                        return Some(opnd);
+                    }
+                }
+                None
+            }
+
+            Insn::BakeString(_) |
+            Insn::Breakpoint |
+            Insn::Comment(_) |
+            Insn::CPop { .. } |
+            Insn::CPopAll |
+            Insn::CPushAll |
+            Insn::FrameSetup |
+            Insn::FrameTeardown |
+            Insn::PadPatchPoint |
+            Insn::PosMarker(_) => None,
+
+            Insn::CPopInto(opnd) |
+            Insn::CPush(opnd) |
+            Insn::CRet(opnd) |
+            Insn::JmpOpnd(opnd) |
+            Insn::Lea { opnd, .. } |
+            Insn::LiveReg { opnd, .. } |
+            Insn::Load { opnd, .. } |
+            Insn::LoadSExt { opnd, .. } |
+            Insn::Not { opnd, .. } => {
+                match self.idx {
+                    0 => {
+                        self.idx += 1;
+                        Some(opnd)
+                    },
+                    _ => None
+                }
+            },
+            Insn::Add { left: opnd0, right: opnd1, .. } |
+            Insn::And { left: opnd0, right: opnd1, .. } |
+            Insn::Cmp { left: opnd0, right: opnd1 } |
+            Insn::CSelE { truthy: opnd0, falsy: opnd1, .. } |
+            Insn::CSelG { truthy: opnd0, falsy: opnd1, .. } |
+            Insn::CSelGE { truthy: opnd0, falsy: opnd1, .. } |
+            Insn::CSelL { truthy: opnd0, falsy: opnd1, .. } |
+            Insn::CSelLE { truthy: opnd0, falsy: opnd1, .. } |
+            Insn::CSelNE { truthy: opnd0, falsy: opnd1, .. } |
+            Insn::CSelNZ { truthy: opnd0, falsy: opnd1, .. } |
+            Insn::CSelZ { truthy: opnd0, falsy: opnd1, .. } |
+            Insn::IncrCounter { mem: opnd0, value: opnd1, .. } |
+            Insn::LoadInto { dest: opnd0, opnd: opnd1 } |
+            Insn::LShift { opnd: opnd0, shift: opnd1, .. } |
+            Insn::Mov { dest: opnd0, src: opnd1 } |
+            Insn::Or { left: opnd0, right: opnd1, .. } |
+            Insn::RShift { opnd: opnd0, shift: opnd1, .. } |
+            Insn::Store { dest: opnd0, src: opnd1 } |
+            Insn::Sub { left: opnd0, right: opnd1, .. } |
+            Insn::Mul { left: opnd0, right: opnd1, .. } |
+            Insn::Test { left: opnd0, right: opnd1 } |
+            Insn::URShift { opnd: opnd0, shift: opnd1, .. } |
+            Insn::Xor { left: opnd0, right: opnd1, .. } => {
+                match self.idx {
+                    0 => {
+                        self.idx += 1;
+                        Some(opnd0)
+                    }
+                    1 => {
+                        self.idx += 1;
+                        Some(opnd1)
+                    }
+                    _ => None
+                }
+            },
+            Insn::CCall { opnds, .. } => {
+                if self.idx < opnds.len() {
+                    let opnd = &opnds[self.idx];
+                    self.idx += 1;
+                    Some(opnd)
+                } else {
+                    None
+                }
+            },
+            Insn::ParallelMov { moves } => {
+                if self.idx < moves.len() {
+                    let opnd = &moves[self.idx].1;
+                    self.idx += 1;
+                    Some(opnd)
+                } else {
+                    None
+                }
+            },
+        }
+    }
+}
+
+/// An iterator that will yield each operand in turn for the given instruction.
+pub(super) struct InsnOpndMutIterator<'a> {
+    insn: &'a mut Insn,
+    idx: usize,
+}
+
+impl<'a> InsnOpndMutIterator<'a> {
+    fn new(insn: &'a mut Insn) -> Self {
+        Self { insn, idx: 0 }
+    }
+
+    pub(super) fn next(&mut self) -> Option<&mut Opnd> {
+        match self.insn {
+            Insn::Jbe(target) |
+            Insn::Jb(target) |
+            Insn::Je(target) |
+            Insn::Jl(target) |
+            Insn::Jg(target) |
+            Insn::Jge(target) |
+            Insn::Jmp(target) |
+            Insn::Jne(target) |
+            Insn::Jnz(target) |
+            Insn::Jo(target) |
+            Insn::JoMul(target) |
+            Insn::Jz(target) |
+            Insn::Label(target) |
+            Insn::LeaJumpTarget { target, .. } |
+            Insn::PatchPoint(target) => {
+                if let Target::SideExit { stack, locals, .. } = target {
+                    let stack_idx = self.idx;
+                    if stack_idx < stack.len() {
+                        let opnd = &mut stack[stack_idx];
+                        self.idx += 1;
+                        return Some(opnd);
+                    }
+
+                    let local_idx = self.idx - stack.len();
+                    if local_idx < locals.len() {
+                        let opnd = &mut locals[local_idx];
+                        self.idx += 1;
+                        return Some(opnd);
+                    }
+                }
+                None
+            }
+
+            Insn::Joz(opnd, target) |
+            Insn::Jonz(opnd, target) => {
+                if self.idx == 0 {
+                    self.idx += 1;
+                    return Some(opnd);
+                }
+
+                if let Target::SideExit { stack, locals, .. } = target {
+                    let stack_idx = self.idx - 1;
+                    if stack_idx < stack.len() {
+                        let opnd = &mut stack[stack_idx];
+                        self.idx += 1;
+                        return Some(opnd);
+                    }
+
+                    let local_idx = stack_idx - stack.len();
+                    if local_idx < locals.len() {
+                        let opnd = &mut locals[local_idx];
+                        self.idx += 1;
+                        return Some(opnd);
+                    }
+                }
+                None
+            }
+
+            Insn::BakeString(_) |
+            Insn::Breakpoint |
+            Insn::Comment(_) |
+            Insn::CPop { .. } |
+            Insn::CPopAll |
+            Insn::CPushAll |
+            Insn::FrameSetup |
+            Insn::FrameTeardown |
+            Insn::PadPatchPoint |
+            Insn::PosMarker(_) => None,
+
+            Insn::CPopInto(opnd) |
+            Insn::CPush(opnd) |
+            Insn::CRet(opnd) |
+            Insn::JmpOpnd(opnd) |
+            Insn::Lea { opnd, .. } |
+            Insn::LiveReg { opnd, .. } |
+            Insn::Load { opnd, .. } |
+            Insn::LoadSExt { opnd, .. } |
+            Insn::Not { opnd, .. } => {
+                match self.idx {
+                    0 => {
+                        self.idx += 1;
+                        Some(opnd)
+                    },
+                    _ => None
+                }
+            },
+            Insn::Add { left: opnd0, right: opnd1, .. } |
+            Insn::And { left: opnd0, right: opnd1, .. } |
+            Insn::Cmp { left: opnd0, right: opnd1 } |
+            Insn::CSelE { truthy: opnd0, falsy: opnd1, .. } |
+            Insn::CSelG { truthy: opnd0, falsy: opnd1, .. } |
+            Insn::CSelGE { truthy: opnd0, falsy: opnd1, .. } |
+            Insn::CSelL { truthy: opnd0, falsy: opnd1, .. } |
+            Insn::CSelLE { truthy: opnd0, falsy: opnd1, .. } |
+            Insn::CSelNE { truthy: opnd0, falsy: opnd1, .. } |
+            Insn::CSelNZ { truthy: opnd0, falsy: opnd1, .. } |
+            Insn::CSelZ { truthy: opnd0, falsy: opnd1, .. } |
+            Insn::IncrCounter { mem: opnd0, value: opnd1, .. } |
+            Insn::LoadInto { dest: opnd0, opnd: opnd1 } |
+            Insn::LShift { opnd: opnd0, shift: opnd1, .. } |
+            Insn::Mov { dest: opnd0, src: opnd1 } |
+            Insn::Or { left: opnd0, right: opnd1, .. } |
+            Insn::RShift { opnd: opnd0, shift: opnd1, .. } |
+            Insn::Store { dest: opnd0, src: opnd1 } |
+            Insn::Sub { left: opnd0, right: opnd1, .. } |
+            Insn::Mul { left: opnd0, right: opnd1, .. } |
+            Insn::Test { left: opnd0, right: opnd1 } |
+            Insn::URShift { opnd: opnd0, shift: opnd1, .. } |
+            Insn::Xor { left: opnd0, right: opnd1, .. } => {
+                match self.idx {
+                    0 => {
+                        self.idx += 1;
+                        Some(opnd0)
+                    }
+                    1 => {
+                        self.idx += 1;
+                        Some(opnd1)
+                    }
+                    _ => None
+                }
+            },
+            Insn::CCall { opnds, .. } => {
+                if self.idx < opnds.len() {
+                    let opnd = &mut opnds[self.idx];
+                    self.idx += 1;
+                    Some(opnd)
+                } else {
+                    None
+                }
+            },
+            Insn::ParallelMov { moves } => {
+                if self.idx < moves.len() {
+                    let opnd = &mut moves[self.idx].1;
+                    self.idx += 1;
+                    Some(opnd)
+                } else {
+                    None
+                }
+            },
+        }
+    }
+}
+
+impl fmt::Debug for Insn {
+    fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result {
+        write!(fmt, "{}(", self.op())?;
+
+        // Print list of operands
+        let mut opnd_iter = self.opnd_iter();
+        if let Some(first_opnd) = opnd_iter.next() {
+            write!(fmt, "{first_opnd:?}")?;
+        }
+        for opnd in opnd_iter {
+            write!(fmt, ", {opnd:?}")?;
+        }
+        write!(fmt, ")")?;
+
+        // Print text, target, and pos if they are present
+        if let Some(text) = self.text() {
+            write!(fmt, " {text:?}")?
+        }
+        if let Some(target) = self.target() {
+            write!(fmt, " target={target:?}")?;
+        }
+
+        write!(fmt, " -> {:?}", self.out_opnd().unwrap_or(&Opnd::None))
+    }
+}
+
+/// Live range of a VReg
+/// TODO: Consider supporting lifetime holes
+#[derive(Clone, Debug, PartialEq)]
+pub struct LiveRange {
+    /// Index of the first instruction that used the VReg (inclusive)
+    pub start: Option<usize>,
+    /// Index of the last instruction that used the VReg (inclusive)
+    pub end: Option<usize>,
+}
+
+impl LiveRange {
+    /// Shorthand for self.start.unwrap()
+    pub fn start(&self) -> usize {
+        self.start.unwrap()
+    }
+
+    /// Shorthand for self.end.unwrap()
+    pub fn end(&self) -> usize {
+        self.end.unwrap()
+    }
+}
+
+/// RegisterPool manages which registers are used by which VReg
+struct RegisterPool {
+    /// List of registers that can be allocated
+    regs: Vec<Reg>,
+
+    /// Some(vreg_idx) if the register at the index in `pool` is used by the VReg.
+    /// None if the register is not in use.
+    pool: Vec<Option<usize>>,
+
+    /// The number of live registers.
+    /// Provides a quick way to query `pool.filter(|r| r.is_some()).count()`
+    live_regs: usize,
+}
+
+impl RegisterPool {
+    /// Initialize a register pool
+    fn new(regs: Vec<Reg>) -> Self {
+        let pool = vec![None; regs.len()];
+        RegisterPool {
+            regs,
+            pool,
+            live_regs: 0,
+        }
+    }
+
+    /// Mutate the pool to indicate that the register at the index
+    /// has been allocated and is live.
+    fn alloc_reg(&mut self, vreg_idx: usize) -> Option<Reg> {
+        for (reg_idx, reg) in self.regs.iter().enumerate() {
+            if self.pool[reg_idx].is_none() {
+                self.pool[reg_idx] = Some(vreg_idx);
+                self.live_regs += 1;
+                return Some(*reg);
+            }
+        }
+        None
+    }
+
+    /// Allocate a specific register
+    fn take_reg(&mut self, reg: &Reg, vreg_idx: usize) -> Reg {
+        let reg_idx = self.regs.iter().position(|elem| elem.reg_no == reg.reg_no)
+            .unwrap_or_else(|| panic!("Unable to find register: {}", reg.reg_no));
+        assert_eq!(self.pool[reg_idx], None, "register already allocated for VReg({:?})", self.pool[reg_idx]);
+        self.pool[reg_idx] = Some(vreg_idx);
+        self.live_regs += 1;
+        *reg
+    }
+
+    // Mutate the pool to indicate that the given register is being returned
+    // as it is no longer used by the instruction that previously held it.
+    fn dealloc_reg(&mut self, reg: &Reg) {
+        let reg_idx = self.regs.iter().position(|elem| elem.reg_no == reg.reg_no)
+            .unwrap_or_else(|| panic!("Unable to find register: {}", reg.reg_no));
+        if self.pool[reg_idx].is_some() {
+            self.pool[reg_idx] = None;
+            self.live_regs -= 1;
+        }
+    }
+
+    /// Return a list of (Reg, vreg_idx) tuples for all live registers
+    fn live_regs(&self) -> Vec<(Reg, usize)> {
+        let mut live_regs = Vec::with_capacity(self.live_regs);
+        for (reg_idx, &reg) in self.regs.iter().enumerate() {
+            if let Some(vreg_idx) = self.pool[reg_idx] {
+                live_regs.push((reg, vreg_idx));
+            }
+        }
+        live_regs
+    }
+
+    /// Return vreg_idx if a given register is already in use
+    fn vreg_for(&self, reg: &Reg) -> Option<usize> {
+        let reg_idx = self.regs.iter().position(|elem| elem.reg_no == reg.reg_no).unwrap();
+        self.pool[reg_idx]
+    }
+
+    /// Return true if no register is in use
+    fn is_empty(&self) -> bool {
+        self.live_regs == 0
+    }
+}
+
+/// Initial capacity for asm.insns vector
+const ASSEMBLER_INSNS_CAPACITY: usize = 256;
+
+/// Object into which we assemble instructions to be
+/// optimized and lowered
+pub struct Assembler {
+    pub(super) insns: Vec<Insn>,
+
+    /// Live range for each VReg indexed by its `idx``
+    pub(super) live_ranges: Vec<LiveRange>,
+
+    /// Names of labels
+    pub(super) label_names: Vec<String>,
+
+    /*
+    /// Context for generating the current insn
+    pub ctx: Context,
+
+    /// The current ISEQ's local table size. asm.local_opnd() uses this, and it's
+    /// sometimes hard to pass this value, e.g. asm.spill_regs() in asm.ccall().
+    ///
+    /// `None` means we're not assembling for an ISEQ, or that the local size is
+    /// not relevant.
+    pub(super) num_locals: Option<u32>,
+
+    /// Side exit caches for each SideExitContext
+    pub(super) side_exits: HashMap<SideExitContext, CodePtr>,
+
+    /// PC for Target::SideExit
+    side_exit_pc: Option<*mut VALUE>,
+
+    /// Stack size for Target::SideExit
+    side_exit_stack_size: Option<u8>,
+
+    /// If true, the next ccall() should verify its leafness
+    leaf_ccall: bool,
+    */
+}
+
+impl Assembler
+{
+    /// Create an Assembler
+    pub fn new() -> Self {
+        Self::new_with_label_names(Vec::default(), 0)
+    }
+
+    /*
+    /// Create an Assembler for ISEQ-specific code.
+    /// It includes all inline code and some outlined code like side exits and stubs.
+    pub fn new(num_locals: u32) -> Self {
+        Self::new_with_label_names(Vec::default(), HashMap::default(), Some(num_locals))
+    }
+
+    /// Create an Assembler for outlined code that are not specific to any ISEQ,
+    /// e.g. trampolines that are shared globally.
+    pub fn new_without_iseq() -> Self {
+        Self::new_with_label_names(Vec::default(), HashMap::default(), None)
+    }
+    */
+
+    /// Create an Assembler with parameters that are populated by another Assembler instance.
+    /// This API is used for copying an Assembler for the next compiler pass.
+    pub fn new_with_label_names(label_names: Vec<String>, num_vregs: usize) -> Self {
+        let mut live_ranges = Vec::with_capacity(ASSEMBLER_INSNS_CAPACITY);
+        live_ranges.resize(num_vregs, LiveRange { start: None, end: None });
+
+        Self {
+            insns: Vec::with_capacity(ASSEMBLER_INSNS_CAPACITY),
+            live_ranges,
+            label_names,
+        }
+    }
+
+    /*
+    /// Get the list of registers that can be used for stack temps.
+    pub fn get_temp_regs2() -> &'static [Reg] {
+        let num_regs = get_option!(num_temp_regs);
+        &TEMP_REGS[0..num_regs]
+    }
+
+    /// Get the number of locals for the ISEQ being compiled
+    pub fn get_num_locals(&self) -> Option<u32> {
+        self.num_locals
+    }
+
+    /// Set a context for generating side exits
+    pub fn set_side_exit_context(&mut self, pc: *mut VALUE, stack_size: u8) {
+        self.side_exit_pc = Some(pc);
+        self.side_exit_stack_size = Some(stack_size);
+    }
+    */
+
+    /// Build an Opnd::VReg and initialize its LiveRange
+    pub(super) fn new_vreg(&mut self, num_bits: u8) -> Opnd {
+        let vreg = Opnd::VReg { idx: self.live_ranges.len(), num_bits };
+        self.live_ranges.push(LiveRange { start: None, end: None });
+        vreg
+    }
+
+    /// Append an instruction onto the current list of instructions and update
+    /// the live ranges of any instructions whose outputs are being used as
+    /// operands to this instruction.
+    pub fn push_insn(&mut self, mut insn: Insn) {
+        // Index of this instruction
+        let insn_idx = self.insns.len();
+
+        // Initialize the live range of the output VReg to insn_idx..=insn_idx
+        if let Some(Opnd::VReg { idx, .. }) = insn.out_opnd() {
+            assert!(*idx < self.live_ranges.len());
+            assert_eq!(self.live_ranges[*idx], LiveRange { start: None, end: None });
+            self.live_ranges[*idx] = LiveRange { start: Some(insn_idx), end: Some(insn_idx) };
+        }
+
+        // If we find any VReg from previous instructions, extend the live range to insn_idx
+        let mut opnd_iter = insn.opnd_iter_mut();
+        while let Some(opnd) = opnd_iter.next() {
+            match *opnd {
+                Opnd::VReg { idx, .. } |
+                Opnd::Mem(Mem { base: MemBase::VReg(idx), .. }) => {
+                    assert!(idx < self.live_ranges.len());
+                    assert_ne!(self.live_ranges[idx].end, None);
+                    self.live_ranges[idx].end = Some(self.live_ranges[idx].end().max(insn_idx));
+                }
+                _ => {}
+            }
+        }
+
+        self.insns.push(insn);
+    }
+
+    /*
+    /// Get a cached side exit, wrapping a counter if specified
+    pub fn get_side_exit(&mut self, side_exit_context: &SideExitContext, counter: Option<Counter>, ocb: &mut OutlinedCb) -> Option<CodePtr> {
+        // Get a cached side exit
+        let side_exit = match self.side_exits.get(&side_exit_context) {
+            None => {
+                let exit_code = gen_outlined_exit(side_exit_context.pc, self.num_locals.unwrap(), &side_exit_context.get_ctx(), ocb)?;
+                self.side_exits.insert(*side_exit_context, exit_code);
+                exit_code
+            }
+            Some(code_ptr) => *code_ptr,
+        };
+
+        // Wrap a counter if needed
+        gen_counted_exit(side_exit_context.pc, side_exit, ocb, counter)
+    }
+    */
+
+    /// Create a new label instance that we can jump to
+    pub fn new_label(&mut self, name: &str) -> Target
+    {
+        assert!(!name.contains(' '), "use underscores in label names, not spaces");
+
+        let label = Label(self.label_names.len());
+        self.label_names.push(name.to_string());
+        Target::Label(label)
+    }
+
+    /*
+    /// Convert Opnd::Stack to Opnd::Mem or Opnd::Reg
+    pub fn lower_stack_opnd(&self, opnd: &Opnd) -> Opnd {
+        // Convert Opnd::Stack to Opnd::Mem
+        fn mem_opnd(opnd: &Opnd) -> Opnd {
+            if let Opnd::Stack { idx, sp_offset, num_bits, .. } = *opnd {
+                incr_counter!(temp_mem_opnd);
+                Opnd::mem(num_bits, SP, (sp_offset as i32 - idx - 1) * SIZEOF_VALUE_I32)
+            } else {
+                unreachable!()
+            }
+        }
+
+        // Convert Opnd::Stack to Opnd::Reg
+        fn reg_opnd(opnd: &Opnd, reg_idx: usize) -> Opnd {
+            let regs = Assembler::get_temp_regs2();
+            if let Opnd::Stack { num_bits, .. } = *opnd {
+                incr_counter!(temp_reg_opnd);
+                Opnd::Reg(regs[reg_idx]).with_num_bits(num_bits).unwrap()
+            } else {
+                unreachable!()
+            }
+        }
+
+        match opnd {
+            Opnd::Stack { reg_mapping, .. } => {
+                if let Some(reg_idx) = reg_mapping.unwrap().get_reg(opnd.reg_opnd()) {
+                    reg_opnd(opnd, reg_idx)
+                } else {
+                    mem_opnd(opnd)
+                }
+            }
+            _ => unreachable!(),
+        }
+    }
+
+    /// Allocate a register to a stack temp if available.
+    pub fn alloc_reg(&mut self, mapping: RegOpnd) {
+        // Allocate a register if there's no conflict.
+        let mut reg_mapping = self.ctx.get_reg_mapping();
+        if reg_mapping.alloc_reg(mapping) {
+            self.set_reg_mapping(reg_mapping);
+        }
+    }
+
+    /// Erase local variable type information
+    /// eg: because of a call we can't track
+    pub fn clear_local_types(&mut self) {
+        asm_comment!(self, "clear local variable types");
+        self.ctx.clear_local_types();
+    }
+
+    /// Repurpose stack temp registers to the corresponding locals for arguments
+    pub fn map_temp_regs_to_args(&mut self, callee_ctx: &mut Context, argc: i32) -> Vec<RegOpnd> {
+        let mut callee_reg_mapping = callee_ctx.get_reg_mapping();
+        let mut mapped_temps = vec![];
+
+        for arg_idx in 0..argc {
+            let stack_idx: u8 = (self.ctx.get_stack_size() as i32 - argc + arg_idx).try_into().unwrap();
+            let temp_opnd = RegOpnd::Stack(stack_idx);
+
+            // For each argument, if the stack temp for it has a register,
+            // let the callee use the register for the local variable.
+            if let Some(reg_idx) = self.ctx.get_reg_mapping().get_reg(temp_opnd) {
+                let local_opnd = RegOpnd::Local(arg_idx.try_into().unwrap());
+                callee_reg_mapping.set_reg(local_opnd, reg_idx);
+                mapped_temps.push(temp_opnd);
+            }
+        }
+
+        asm_comment!(self, "local maps: {:?}", callee_reg_mapping);
+        callee_ctx.set_reg_mapping(callee_reg_mapping);
+        mapped_temps
+    }
+
+    /// Spill all live registers to the stack
+    pub fn spill_regs(&mut self) {
+        self.spill_regs_except(&vec![]);
+    }
+
+    /// Spill all live registers except `ignored_temps` to the stack
+    pub fn spill_regs_except(&mut self, ignored_temps: &Vec<RegOpnd>) {
+        // Forget registers above the stack top
+        let mut reg_mapping = self.ctx.get_reg_mapping();
+        for stack_idx in self.ctx.get_stack_size()..MAX_CTX_TEMPS as u8 {
+            reg_mapping.dealloc_reg(RegOpnd::Stack(stack_idx));
+        }
+        self.set_reg_mapping(reg_mapping);
+
+        // If no registers are in use, skip all checks
+        if self.ctx.get_reg_mapping() == RegMapping::default() {
+            return;
+        }
+
+        // Collect stack temps to be spilled
+        let mut spilled_opnds = vec![];
+        for stack_idx in 0..u8::min(MAX_CTX_TEMPS as u8, self.ctx.get_stack_size()) {
+            let reg_opnd = RegOpnd::Stack(stack_idx);
+            if !ignored_temps.contains(&reg_opnd) && reg_mapping.dealloc_reg(reg_opnd) {
+                let idx = self.ctx.get_stack_size() - 1 - stack_idx;
+                let spilled_opnd = self.stack_opnd(idx.into());
+                spilled_opnds.push(spilled_opnd);
+                reg_mapping.dealloc_reg(spilled_opnd.reg_opnd());
+            }
+        }
+
+        // Collect locals to be spilled
+        for local_idx in 0..MAX_CTX_TEMPS as u8 {
+            if reg_mapping.dealloc_reg(RegOpnd::Local(local_idx)) {
+                let first_local_ep_offset = self.num_locals.unwrap() + VM_ENV_DATA_SIZE - 1;
+                let ep_offset = first_local_ep_offset - local_idx as u32;
+                let spilled_opnd = self.local_opnd(ep_offset);
+                spilled_opnds.push(spilled_opnd);
+                reg_mapping.dealloc_reg(spilled_opnd.reg_opnd());
+            }
+        }
+
+        // Spill stack temps and locals
+        if !spilled_opnds.is_empty() {
+            asm_comment!(self, "spill_regs: {:?} -> {:?}", self.ctx.get_reg_mapping(), reg_mapping);
+            for &spilled_opnd in spilled_opnds.iter() {
+                self.spill_reg(spilled_opnd);
+            }
+            self.ctx.set_reg_mapping(reg_mapping);
+        }
+    }
+
+    /// Spill a stack temp from a register to the stack
+    pub fn spill_reg(&mut self, opnd: Opnd) {
+        assert_ne!(self.ctx.get_reg_mapping().get_reg(opnd.reg_opnd()), None);
+
+        // Use different RegMappings for dest and src operands
+        let reg_mapping = self.ctx.get_reg_mapping();
+        let mut mem_mappings = reg_mapping;
+        mem_mappings.dealloc_reg(opnd.reg_opnd());
+
+        // Move the stack operand from a register to memory
+        match opnd {
+            Opnd::Stack { idx, num_bits, stack_size, num_locals, sp_offset, .. } => {
+                self.mov(
+                    Opnd::Stack { idx, num_bits, stack_size, num_locals, sp_offset, reg_mapping: Some(mem_mappings) },
+                    Opnd::Stack { idx, num_bits, stack_size, num_locals, sp_offset, reg_mapping: Some(reg_mapping) },
+                );
+            }
+            _ => unreachable!(),
+        }
+        incr_counter!(temp_spill);
+    }
+
+    /// Update which stack temps are in a register
+    pub fn set_reg_mapping(&mut self, reg_mapping: RegMapping) {
+        if self.ctx.get_reg_mapping() != reg_mapping {
+            asm_comment!(self, "reg_mapping: {:?} -> {:?}", self.ctx.get_reg_mapping(), reg_mapping);
+            self.ctx.set_reg_mapping(reg_mapping);
+        }
+    }
+    */
+
+    // Shuffle register moves, sometimes adding extra moves using SCRATCH_REG,
+    // so that they will not rewrite each other before they are used.
+    pub fn resolve_parallel_moves(old_moves: &Vec<(Reg, Opnd)>) -> Vec<(Reg, Opnd)> {
+        // Return the index of a move whose destination is not used as a source if any.
+        fn find_safe_move(moves: &Vec<(Reg, Opnd)>) -> Option<usize> {
+            moves.iter().enumerate().find(|&(_, &(dest_reg, _))| {
+                moves.iter().all(|&(_, src_opnd)| src_opnd != Opnd::Reg(dest_reg))
+            }).map(|(index, _)| index)
+        }
+
+        // Remove moves whose source and destination are the same
+        let mut old_moves: Vec<(Reg, Opnd)> = old_moves.clone().into_iter()
+            .filter(|&(reg, opnd)| Opnd::Reg(reg) != opnd).collect();
+
+        let mut new_moves = vec![];
+        while !old_moves.is_empty() {
+            // Keep taking safe moves
+            while let Some(index) = find_safe_move(&old_moves) {
+                new_moves.push(old_moves.remove(index));
+            }
+
+            // No safe move. Load the source of one move into SCRATCH_REG, and
+            // then load SCRATCH_REG into the destination when it's safe.
+            if !old_moves.is_empty() {
+                // Make sure it's safe to use SCRATCH_REG
+                assert!(old_moves.iter().all(|&(_, opnd)| opnd != Opnd::Reg(Assembler::SCRATCH_REG)));
+
+                // Move SCRATCH <- opnd, and delay reg <- SCRATCH
+                let (reg, opnd) = old_moves.remove(0);
+                new_moves.push((Assembler::SCRATCH_REG, opnd));
+                old_moves.push((reg, Opnd::Reg(Assembler::SCRATCH_REG)));
+            }
+        }
+        new_moves
+    }
+
+    /// Sets the out field on the various instructions that require allocated
+    /// registers because their output is used as the operand on a subsequent
+    /// instruction. This is our implementation of the linear scan algorithm.
+    pub(super) fn alloc_regs(mut self, regs: Vec<Reg>) -> Option<Assembler> {
+        // Dump live registers for register spill debugging.
+        fn dump_live_regs(insns: Vec<Insn>, live_ranges: Vec<LiveRange>, num_regs: usize, spill_index: usize) {
+            // Convert live_ranges to live_regs: the number of live registers at each index
+            let mut live_regs: Vec<usize> = vec![];
+            for insn_idx in 0..insns.len() {
+                let live_count = live_ranges.iter().filter(|range|
+                    match (range.start, range.end) {
+                        (Some(start), Some(end)) => start <= insn_idx && insn_idx <= end,
+                        _ => false,
+                    }
+                ).count();
+                live_regs.push(live_count);
+            }
+
+            // Dump insns along with live registers
+            for (insn_idx, insn) in insns.iter().enumerate() {
+                eprint!("{:3} ", if spill_index == insn_idx { "==>" } else { "" });
+                for reg in 0..=num_regs {
+                    eprint!("{:1}", if reg < live_regs[insn_idx] { "|" } else { "" });
+                }
+                eprintln!(" [{:3}] {:?}", insn_idx, insn);
+            }
+        }
+
+        // First, create the pool of registers.
+        let mut pool = RegisterPool::new(regs.clone());
+
+        // Mapping between VReg and allocated VReg for each VReg index.
+        // None if no register has been allocated for the VReg.
+        let mut reg_mapping: Vec<Option<Reg>> = vec![None; self.live_ranges.len()];
+
+        // List of registers saved before a C call, paired with the VReg index.
+        let mut saved_regs: Vec<(Reg, usize)> = vec![];
+
+        // live_ranges is indexed by original `index` given by the iterator.
+        let live_ranges: Vec<LiveRange> = take(&mut self.live_ranges);
+        let mut iterator = self.insns.into_iter().enumerate().peekable();
+        let mut asm = Assembler::new_with_label_names(take(&mut self.label_names), live_ranges.len());
+
+        while let Some((index, mut insn)) = iterator.next() {
+            let before_ccall = match (&insn, iterator.peek().map(|(_, insn)| insn)) {
+                (Insn::ParallelMov { .. }, Some(Insn::CCall { .. })) |
+                (Insn::CCall { .. }, _) if !pool.is_empty() => {
+                    // If C_RET_REG is in use, move it to another register.
+                    // This must happen before last-use registers are deallocated.
+                    if let Some(vreg_idx) = pool.vreg_for(&C_RET_REG) {
+                        let new_reg = if let Some(new_reg) = pool.alloc_reg(vreg_idx) {
+                            new_reg
+                        } else {
+                            debug!("spilling VReg is not implemented yet, can't evacuate C_RET_REG on CCall");
+                            return None;
+                        };
+                        asm.mov(Opnd::Reg(new_reg), C_RET_OPND);
+                        pool.dealloc_reg(&C_RET_REG);
+                        reg_mapping[vreg_idx] = Some(new_reg);
+                    }
+
+                    true
+                },
+                _ => false,
+            };
+
+            // Check if this is the last instruction that uses an operand that
+            // spans more than one instruction. In that case, return the
+            // allocated register to the pool.
+            for opnd in insn.opnd_iter() {
+                match *opnd {
+                    Opnd::VReg { idx, .. } |
+                    Opnd::Mem(Mem { base: MemBase::VReg(idx), .. }) => {
+                        // We're going to check if this is the last instruction that
+                        // uses this operand. If it is, we can return the allocated
+                        // register to the pool.
+                        if live_ranges[idx].end() == index {
+                            if let Some(reg) = reg_mapping[idx] {
+                                pool.dealloc_reg(&reg);
+                            } else {
+                                unreachable!("no register allocated for insn {:?}", insn);
+                            }
+                        }
+                    }
+                    _ => {}
+                }
+            }
+
+            // Save caller-saved registers on a C call.
+            if before_ccall {
+                // Find all live registers
+                saved_regs = pool.live_regs();
+
+                // Save live registers
+                for &(reg, _) in saved_regs.iter() {
+                    asm.cpush(Opnd::Reg(reg));
+                    pool.dealloc_reg(&reg);
+                }
+                // On x86_64, maintain 16-byte stack alignment
+                if cfg!(target_arch = "x86_64") && saved_regs.len() % 2 == 1 {
+                    asm.cpush(Opnd::Reg(saved_regs.last().unwrap().0));
+                }
+            }
+
+            // If the output VReg of this instruction is used by another instruction,
+            // we need to allocate a register to it
+            let vreg_idx = match insn.out_opnd() {
+                Some(Opnd::VReg { idx, .. }) => Some(*idx),
+                _ => None,
+            };
+            if vreg_idx.is_some() && live_ranges[vreg_idx.unwrap()].end() != index {
+                // This is going to be the output operand that we will set on the
+                // instruction. CCall and LiveReg need to use a specific register.
+                let mut out_reg = match insn {
+                    Insn::CCall { .. } => {
+                        Some(pool.take_reg(&C_RET_REG, vreg_idx.unwrap()))
+                    }
+                    Insn::LiveReg { opnd, .. } => {
+                        let reg = opnd.unwrap_reg();
+                        Some(pool.take_reg(&reg, vreg_idx.unwrap()))
+                    }
+                    _ => None
+                };
+
+                // If this instruction's first operand maps to a register and
+                // this is the last use of the register, reuse the register
+                // We do this to improve register allocation on x86
+                // e.g. out  = add(reg0, reg1)
+                //      reg0 = add(reg0, reg1)
+                if out_reg.is_none() {
+                    let mut opnd_iter = insn.opnd_iter();
+
+                    if let Some(Opnd::VReg{ idx, .. }) = opnd_iter.next() {
+                        if live_ranges[*idx].end() == index {
+                            if let Some(reg) = reg_mapping[*idx] {
+                                out_reg = Some(pool.take_reg(&reg, vreg_idx.unwrap()));
+                            }
+                        }
+                    }
+                }
+
+                // Allocate a new register for this instruction if one is not
+                // already allocated.
+                if out_reg.is_none() {
+                    out_reg = match &insn {
+                        _ => match pool.alloc_reg(vreg_idx.unwrap()) {
+                            Some(reg) => Some(reg),
+                            None => {
+                                if get_option!(debug) {
+                                    let mut insns = asm.insns;
+                                    insns.push(insn);
+                                    while let Some((_, insn)) = iterator.next() {
+                                        insns.push(insn);
+                                    }
+                                    dump_live_regs(insns, live_ranges, regs.len(), index);
+                                }
+                                debug!("Register spill not supported");
+                                return None;
+                            }
+                        }
+                    };
+                }
+
+                // Set the output operand on the instruction
+                let out_num_bits = Opnd::match_num_bits_iter(insn.opnd_iter());
+
+                // If we have gotten to this point, then we're sure we have an
+                // output operand on this instruction because the live range
+                // extends beyond the index of the instruction.
+                let out = insn.out_opnd_mut().unwrap();
+                let reg = out_reg.unwrap().with_num_bits(out_num_bits);
+                reg_mapping[out.vreg_idx()] = Some(reg);
+                *out = Opnd::Reg(reg);
+            }
+
+            // Replace VReg and Param operands by their corresponding register
+            let mut opnd_iter = insn.opnd_iter_mut();
+            while let Some(opnd) = opnd_iter.next() {
+                match *opnd {
+                    Opnd::VReg { idx, num_bits } => {
+                        *opnd = Opnd::Reg(reg_mapping[idx].unwrap()).with_num_bits(num_bits).unwrap();
+                    },
+                    Opnd::Mem(Mem { base: MemBase::VReg(idx), disp, num_bits }) => {
+                        let base = MemBase::Reg(reg_mapping[idx].unwrap().reg_no);
+                        *opnd = Opnd::Mem(Mem { base, disp, num_bits });
+                    }
+                    _ => {},
+                }
+            }
+
+            // Push instruction(s)
+            let is_ccall = matches!(insn, Insn::CCall { .. });
+            match insn {
+                Insn::ParallelMov { moves } => {
+                    // Now that register allocation is done, it's ready to resolve parallel moves.
+                    for (reg, opnd) in Self::resolve_parallel_moves(&moves) {
+                        asm.load_into(Opnd::Reg(reg), opnd);
+                    }
+                }
+                Insn::CCall { opnds, fptr, start_marker, end_marker, out } => {
+                    // Split start_marker and end_marker here to avoid inserting push/pop between them.
+                    if let Some(start_marker) = start_marker {
+                        asm.push_insn(Insn::PosMarker(start_marker));
+                    }
+                    asm.push_insn(Insn::CCall { opnds, fptr, start_marker: None, end_marker: None, out });
+                    if let Some(end_marker) = end_marker {
+                        asm.push_insn(Insn::PosMarker(end_marker));
+                    }
+                }
+                _ => asm.push_insn(insn),
+            }
+
+            // After a C call, restore caller-saved registers
+            if is_ccall {
+                // On x86_64, maintain 16-byte stack alignment
+                if cfg!(target_arch = "x86_64") && saved_regs.len() % 2 == 1 {
+                    asm.cpop_into(Opnd::Reg(saved_regs.last().unwrap().0.clone()));
+                }
+                // Restore saved registers
+                for &(reg, vreg_idx) in saved_regs.iter().rev() {
+                    asm.cpop_into(Opnd::Reg(reg));
+                    pool.take_reg(&reg, vreg_idx);
+                }
+                saved_regs.clear();
+            }
+        }
+
+        assert!(pool.is_empty(), "Expected all registers to be returned to the pool");
+        Some(asm)
+    }
+
+    /// Compile the instructions down to machine code.
+    /// Can fail due to lack of code memory and inopportune code placement, among other reasons.
+    #[must_use]
+    pub fn compile(self, cb: &mut CodeBlock) -> Option<(CodePtr, Vec<CodePtr>)> {
+        #[cfg(feature = "disasm")]
+        let start_addr = cb.get_write_ptr();
+        let alloc_regs = Self::get_alloc_regs();
+        let ret = self.compile_with_regs(cb, alloc_regs);
+
+        #[cfg(feature = "disasm")]
+        if get_option!(dump_disasm) {
+            let end_addr = cb.get_write_ptr();
+            let disasm = crate::disasm::disasm_addr_range(cb, start_addr.raw_ptr(cb) as usize, end_addr.raw_ptr(cb) as usize);
+            println!("{}", disasm);
+        }
+        ret
+    }
+
+    /// Compile with a limited number of registers. Used only for unit tests.
+    #[cfg(test)]
+    pub fn compile_with_num_regs(self, cb: &mut CodeBlock, num_regs: usize) -> (CodePtr, Vec<CodePtr>) {
+        let mut alloc_regs = Self::get_alloc_regs();
+        let alloc_regs = alloc_regs.drain(0..num_regs).collect();
+        self.compile_with_regs(cb, alloc_regs).unwrap()
+    }
+
+    /// Compile Target::SideExit and convert it into Target::CodePtr for all instructions
+    #[must_use]
+    pub fn compile_side_exits(&mut self) -> Option<()> {
+        let mut targets = HashMap::new();
+        for (idx, insn) in self.insns.iter().enumerate() {
+            if let Some(target @ Target::SideExit { .. }) = insn.target() {
+                targets.insert(idx, target.clone());
+            }
+        }
+
+        for (idx, target) in targets {
+            // Compile a side exit. Note that this is past the split pass and alloc_regs(),
+            // so you can't use a VReg or an instruction that needs to be split.
+            if let Target::SideExit { pc, stack, locals, c_stack_bytes, reason, label } = target {
+                asm_comment!(self, "Exit: {reason}");
+                let side_exit_label = if let Some(label) = label {
+                    Target::Label(label)
+                } else {
+                    self.new_label("side_exit".into())
+                };
+                self.write_label(side_exit_label.clone());
+
+                // Load an operand that cannot be used as a source of Insn::Store
+                fn split_store_source(asm: &mut Assembler, opnd: Opnd) -> Opnd {
+                    if matches!(opnd, Opnd::Mem(_) | Opnd::Value(_)) ||
+                        (cfg!(target_arch = "aarch64") && matches!(opnd, Opnd::UImm(_))) {
+                        asm.load_into(Opnd::Reg(Assembler::SCRATCH_REG), opnd);
+                        Opnd::Reg(Assembler::SCRATCH_REG)
+                    } else {
+                        opnd
+                    }
+                }
+
+                asm_comment!(self, "write stack slots: {stack:?}");
+                for (idx, &opnd) in stack.iter().enumerate() {
+                    let opnd = split_store_source(self, opnd);
+                    self.store(Opnd::mem(64, SP, idx as i32 * SIZEOF_VALUE_I32), opnd);
+                }
+
+                asm_comment!(self, "write locals: {locals:?}");
+                for (idx, &opnd) in locals.iter().enumerate() {
+                    let opnd = split_store_source(self, opnd);
+                    self.store(Opnd::mem(64, SP, (-local_size_and_idx_to_ep_offset(locals.len(), idx) - 1) * SIZEOF_VALUE_I32), opnd);
+                }
+
+                asm_comment!(self, "save cfp->pc");
+                self.load_into(Opnd::Reg(Assembler::SCRATCH_REG), Opnd::const_ptr(pc as *const u8));
+                self.store(Opnd::mem(64, CFP, RUBY_OFFSET_CFP_PC), Opnd::Reg(Assembler::SCRATCH_REG));
+
+                asm_comment!(self, "save cfp->sp");
+                self.lea_into(Opnd::Reg(Assembler::SCRATCH_REG), Opnd::mem(64, SP, stack.len() as i32 * SIZEOF_VALUE_I32));
+                let cfp_sp = Opnd::mem(64, CFP, RUBY_OFFSET_CFP_SP);
+                self.store(cfp_sp, Opnd::Reg(Assembler::SCRATCH_REG));
+
+                if c_stack_bytes > 0 {
+                    asm_comment!(self, "restore C stack pointer");
+                    self.add_into(NATIVE_STACK_PTR, c_stack_bytes.into());
+                }
+
+                asm_comment!(self, "exit to the interpreter");
+                self.frame_teardown();
+                self.mov(C_RET_OPND, Opnd::UImm(Qundef.as_u64()));
+                self.cret(C_RET_OPND);
+
+                *self.insns[idx].target_mut().unwrap() = side_exit_label;
+            }
+        }
+        Some(())
+    }
+}
+
+impl fmt::Debug for Assembler {
+    fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result {
+        writeln!(fmt, "Assembler")?;
+
+        for (idx, insn) in self.insns.iter().enumerate() {
+            writeln!(fmt, "    {idx:03} {insn:?}")?;
+        }
+
+        Ok(())
+    }
+}
+
+impl Assembler {
+    #[must_use]
+    pub fn add(&mut self, left: Opnd, right: Opnd) -> Opnd {
+        let out = self.new_vreg(Opnd::match_num_bits(&[left, right]));
+        self.push_insn(Insn::Add { left, right, out });
+        out
+    }
+
+    pub fn add_into(&mut self, left: Opnd, right: Opnd) -> Opnd {
+        self.push_insn(Insn::Add { left, right, out: left });
+        left
+    }
+
+    #[must_use]
+    pub fn and(&mut self, left: Opnd, right: Opnd) -> Opnd {
+        let out = self.new_vreg(Opnd::match_num_bits(&[left, right]));
+        self.push_insn(Insn::And { left, right, out });
+        out
+    }
+
+    pub fn bake_string(&mut self, text: &str) {
+        self.push_insn(Insn::BakeString(text.to_string()));
+    }
+
+    #[allow(dead_code)]
+    pub fn breakpoint(&mut self) {
+        self.push_insn(Insn::Breakpoint);
+    }
+
+    /// Call a C function without PosMarkers
+    pub fn ccall(&mut self, fptr: *const u8, opnds: Vec<Opnd>) -> Opnd {
+        let out = self.new_vreg(Opnd::match_num_bits(&opnds));
+        self.push_insn(Insn::CCall { fptr, opnds, start_marker: None, end_marker: None, out });
+        out
+    }
+
+    /// Call a C function with PosMarkers. This is used for recording the start and end
+    /// addresses of the C call and rewriting it with a different function address later.
+    pub fn ccall_with_pos_markers(
+        &mut self,
+        fptr: *const u8,
+        opnds: Vec<Opnd>,
+        start_marker: impl Fn(CodePtr, &CodeBlock) + 'static,
+        end_marker: impl Fn(CodePtr, &CodeBlock) + 'static,
+    ) -> Opnd {
+        let out = self.new_vreg(Opnd::match_num_bits(&opnds));
+        self.push_insn(Insn::CCall {
+            fptr,
+            opnds,
+            start_marker: Some(Box::new(start_marker)),
+            end_marker: Some(Box::new(end_marker)),
+            out,
+        });
+        out
+    }
+
+    /*
+    /// Let vm_check_canary() assert the leafness of this ccall if leaf_ccall is set
+    fn set_stack_canary(&mut self, opnds: &Vec<Opnd>) -> Option<Opnd> {
+        // Use the slot right above the stack top for verifying leafness.
+        let canary_opnd = self.stack_opnd(-1);
+
+        // If the slot is already used, which is a valid optimization to avoid spills,
+        // give up the verification.
+        let canary_opnd = if cfg!(feature = "runtime_checks") && self.leaf_ccall && opnds.iter().all(|opnd|
+            opnd.get_reg_opnd() != canary_opnd.get_reg_opnd()
+        ) {
+            asm_comment!(self, "set stack canary");
+            self.mov(canary_opnd, vm_stack_canary().into());
+            Some(canary_opnd)
+        } else {
+            None
+        };
+
+        // Avoid carrying the flag to the next instruction whether we verified it or not.
+        self.leaf_ccall = false;
+
+        canary_opnd
+    }
+    */
+
+    pub fn cmp(&mut self, left: Opnd, right: Opnd) {
+        self.push_insn(Insn::Cmp { left, right });
+    }
+
+    #[must_use]
+    pub fn cpop(&mut self) -> Opnd {
+        let out = self.new_vreg(Opnd::DEFAULT_NUM_BITS);
+        self.push_insn(Insn::CPop { out });
+        out
+    }
+
+    pub fn cpop_all(&mut self) {
+        self.push_insn(Insn::CPopAll);
+
+        // Re-enable ccall's RegMappings assertion disabled by cpush_all.
+        // cpush_all + cpop_all preserve all stack temp registers, so it's safe.
+        //self.set_reg_mapping(self.ctx.get_reg_mapping());
+    }
+
+    pub fn cpop_into(&mut self, opnd: Opnd) {
+        self.push_insn(Insn::CPopInto(opnd));
+    }
+
+    pub fn cpush(&mut self, opnd: Opnd) {
+        self.push_insn(Insn::CPush(opnd));
+    }
+
+    pub fn cpush_all(&mut self) {
+        self.push_insn(Insn::CPushAll);
+
+        // Mark all temps as not being in registers.
+        // Temps will be marked back as being in registers by cpop_all.
+        // We assume that cpush_all + cpop_all are used for C functions in utils.rs
+        // that don't require spill_regs for GC.
+        //self.set_reg_mapping(RegMapping::default());
+    }
+
+    pub fn cret(&mut self, opnd: Opnd) {
+        self.push_insn(Insn::CRet(opnd));
+    }
+
+    #[must_use]
+    pub fn csel_e(&mut self, truthy: Opnd, falsy: Opnd) -> Opnd {
+        let out = self.new_vreg(Opnd::match_num_bits(&[truthy, falsy]));
+        self.push_insn(Insn::CSelE { truthy, falsy, out });
+        out
+    }
+
+    #[must_use]
+    pub fn csel_g(&mut self, truthy: Opnd, falsy: Opnd) -> Opnd {
+        let out = self.new_vreg(Opnd::match_num_bits(&[truthy, falsy]));
+        self.push_insn(Insn::CSelG { truthy, falsy, out });
+        out
+    }
+
+    #[must_use]
+    pub fn csel_ge(&mut self, truthy: Opnd, falsy: Opnd) -> Opnd {
+        let out = self.new_vreg(Opnd::match_num_bits(&[truthy, falsy]));
+        self.push_insn(Insn::CSelGE { truthy, falsy, out });
+        out
+    }
+
+    #[must_use]
+    pub fn csel_l(&mut self, truthy: Opnd, falsy: Opnd) -> Opnd {
+        let out = self.new_vreg(Opnd::match_num_bits(&[truthy, falsy]));
+        self.push_insn(Insn::CSelL { truthy, falsy, out });
+        out
+    }
+
+    #[must_use]
+    pub fn csel_le(&mut self, truthy: Opnd, falsy: Opnd) -> Opnd {
+        let out = self.new_vreg(Opnd::match_num_bits(&[truthy, falsy]));
+        self.push_insn(Insn::CSelLE { truthy, falsy, out });
+        out
+    }
+
+    #[must_use]
+    pub fn csel_ne(&mut self, truthy: Opnd, falsy: Opnd) -> Opnd {
+        let out = self.new_vreg(Opnd::match_num_bits(&[truthy, falsy]));
+        self.push_insn(Insn::CSelNE { truthy, falsy, out });
+        out
+    }
+
+    #[must_use]
+    pub fn csel_nz(&mut self, truthy: Opnd, falsy: Opnd) -> Opnd {
+        let out = self.new_vreg(Opnd::match_num_bits(&[truthy, falsy]));
+        self.push_insn(Insn::CSelNZ { truthy, falsy, out });
+        out
+    }
+
+    #[must_use]
+    pub fn csel_z(&mut self, truthy: Opnd, falsy: Opnd) -> Opnd {
+        let out = self.new_vreg(Opnd::match_num_bits(&[truthy, falsy]));
+        self.push_insn(Insn::CSelZ { truthy, falsy, out });
+        out
+    }
+
+    pub fn frame_setup(&mut self) {
+        self.push_insn(Insn::FrameSetup);
+    }
+
+    pub fn frame_teardown(&mut self) {
+        self.push_insn(Insn::FrameTeardown);
+    }
+
+    pub fn incr_counter(&mut self, mem: Opnd, value: Opnd) {
+        self.push_insn(Insn::IncrCounter { mem, value });
+    }
+
+    pub fn jbe(&mut self, target: Target) {
+        self.push_insn(Insn::Jbe(target));
+    }
+
+    pub fn jb(&mut self, target: Target) {
+        self.push_insn(Insn::Jb(target));
+    }
+
+    pub fn je(&mut self, target: Target) {
+        self.push_insn(Insn::Je(target));
+    }
+
+    pub fn jl(&mut self, target: Target) {
+        self.push_insn(Insn::Jl(target));
+    }
+
+    #[allow(dead_code)]
+    pub fn jg(&mut self, target: Target) {
+        self.push_insn(Insn::Jg(target));
+    }
+
+    #[allow(dead_code)]
+    pub fn jge(&mut self, target: Target) {
+        self.push_insn(Insn::Jge(target));
+    }
+
+    pub fn jmp(&mut self, target: Target) {
+        self.push_insn(Insn::Jmp(target));
+    }
+
+    pub fn jmp_opnd(&mut self, opnd: Opnd) {
+        self.push_insn(Insn::JmpOpnd(opnd));
+    }
+
+    pub fn jne(&mut self, target: Target) {
+        self.push_insn(Insn::Jne(target));
+    }
+
+    pub fn jnz(&mut self, target: Target) {
+        self.push_insn(Insn::Jnz(target));
+    }
+
+    pub fn jo(&mut self, target: Target) {
+        self.push_insn(Insn::Jo(target));
+    }
+
+    pub fn jo_mul(&mut self, target: Target) {
+        self.push_insn(Insn::JoMul(target));
+    }
+
+    pub fn jz(&mut self, target: Target) {
+        self.push_insn(Insn::Jz(target));
+    }
+
+    #[must_use]
+    pub fn lea(&mut self, opnd: Opnd) -> Opnd {
+        let out = self.new_vreg(Opnd::match_num_bits(&[opnd]));
+        self.push_insn(Insn::Lea { opnd, out });
+        out
+    }
+
+    pub fn lea_into(&mut self, out: Opnd, opnd: Opnd) {
+        self.push_insn(Insn::Lea { opnd, out });
+    }
+
+    #[must_use]
+    pub fn lea_jump_target(&mut self, target: Target) -> Opnd {
+        let out = self.new_vreg(Opnd::DEFAULT_NUM_BITS);
+        self.push_insn(Insn::LeaJumpTarget { target, out });
+        out
+    }
+
+    #[must_use]
+    pub fn live_reg_opnd(&mut self, opnd: Opnd) -> Opnd {
+        let out = self.new_vreg(Opnd::match_num_bits(&[opnd]));
+        self.push_insn(Insn::LiveReg { opnd, out });
+        out
+    }
+
+    #[must_use]
+    pub fn load(&mut self, opnd: Opnd) -> Opnd {
+        let out = self.new_vreg(Opnd::match_num_bits(&[opnd]));
+        self.push_insn(Insn::Load { opnd, out });
+        out
+    }
+
+    pub fn load_into(&mut self, dest: Opnd, opnd: Opnd) {
+        match (dest, opnd) {
+            (Opnd::Reg(dest), Opnd::Reg(opnd)) if dest == opnd => {}, // skip if noop
+            _ => self.push_insn(Insn::LoadInto { dest, opnd }),
+        }
+    }
+
+    #[must_use]
+    pub fn load_sext(&mut self, opnd: Opnd) -> Opnd {
+        let out = self.new_vreg(Opnd::match_num_bits(&[opnd]));
+        self.push_insn(Insn::LoadSExt { opnd, out });
+        out
+    }
+
+    #[must_use]
+    pub fn lshift(&mut self, opnd: Opnd, shift: Opnd) -> Opnd {
+        let out = self.new_vreg(Opnd::match_num_bits(&[opnd, shift]));
+        self.push_insn(Insn::LShift { opnd, shift, out });
+        out
+    }
+
+    pub fn parallel_mov(&mut self, moves: Vec<(Reg, Opnd)>) {
+        self.push_insn(Insn::ParallelMov { moves });
+    }
+
+    pub fn mov(&mut self, dest: Opnd, src: Opnd) {
+        self.push_insn(Insn::Mov { dest, src });
+    }
+
+    #[must_use]
+    pub fn not(&mut self, opnd: Opnd) -> Opnd {
+        let out = self.new_vreg(Opnd::match_num_bits(&[opnd]));
+        self.push_insn(Insn::Not { opnd, out });
+        out
+    }
+
+    #[must_use]
+    pub fn or(&mut self, left: Opnd, right: Opnd) -> Opnd {
+        let out = self.new_vreg(Opnd::match_num_bits(&[left, right]));
+        self.push_insn(Insn::Or { left, right, out });
+        out
+    }
+
+    pub fn patch_point(&mut self, target: Target) {
+        self.push_insn(Insn::PatchPoint(target));
+    }
+
+    pub fn pad_patch_point(&mut self) {
+        self.push_insn(Insn::PadPatchPoint);
+    }
+
+    pub fn pos_marker(&mut self, marker_fn: impl Fn(CodePtr, &CodeBlock) + 'static) {
+        self.push_insn(Insn::PosMarker(Box::new(marker_fn)));
+    }
+
+    #[must_use]
+    pub fn rshift(&mut self, opnd: Opnd, shift: Opnd) -> Opnd {
+        let out = self.new_vreg(Opnd::match_num_bits(&[opnd, shift]));
+        self.push_insn(Insn::RShift { opnd, shift, out });
+        out
+    }
+
+    pub fn store(&mut self, dest: Opnd, src: Opnd) {
+        self.push_insn(Insn::Store { dest, src });
+    }
+
+    #[must_use]
+    pub fn sub(&mut self, left: Opnd, right: Opnd) -> Opnd {
+        let out = self.new_vreg(Opnd::match_num_bits(&[left, right]));
+        self.push_insn(Insn::Sub { left, right, out });
+        out
+    }
+
+    #[must_use]
+    pub fn mul(&mut self, left: Opnd, right: Opnd) -> Opnd {
+        let out = self.new_vreg(Opnd::match_num_bits(&[left, right]));
+        self.push_insn(Insn::Mul { left, right, out });
+        out
+    }
+
+    pub fn test(&mut self, left: Opnd, right: Opnd) {
+        self.push_insn(Insn::Test { left, right });
+    }
+
+    #[must_use]
+    #[allow(dead_code)]
+    pub fn urshift(&mut self, opnd: Opnd, shift: Opnd) -> Opnd {
+        let out = self.new_vreg(Opnd::match_num_bits(&[opnd, shift]));
+        self.push_insn(Insn::URShift { opnd, shift, out });
+        out
+    }
+
+    /*
+    /// Verify the leafness of the given block
+    pub fn with_leaf_ccall<F, R>(&mut self, mut block: F) -> R
+    where F: FnMut(&mut Self) -> R {
+        let old_leaf_ccall = self.leaf_ccall;
+        self.leaf_ccall = true;
+        let ret = block(self);
+        self.leaf_ccall = old_leaf_ccall;
+        ret
+    }
+    */
+
+    /// Add a label at the current position
+    pub fn write_label(&mut self, target: Target) {
+        assert!(target.unwrap_label().0 < self.label_names.len());
+        self.push_insn(Insn::Label(target));
+    }
+
+    #[must_use]
+    pub fn xor(&mut self, left: Opnd, right: Opnd) -> Opnd {
+        let out = self.new_vreg(Opnd::match_num_bits(&[left, right]));
+        self.push_insn(Insn::Xor { left, right, out });
+        out
+    }
+}
+
+/// Macro to use format! for Insn::Comment, which skips a format! call
+/// when not dumping disassembly.
+macro_rules! asm_comment {
+    ($asm:expr, $($fmt:tt)*) => {
+        if $crate::options::get_option!(dump_disasm) {
+            $asm.push_insn(crate::backend::lir::Insn::Comment(format!($($fmt)*)));
+        }
+    };
+}
+pub(crate) use asm_comment;
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn test_opnd_iter() {
+        let insn = Insn::Add { left: Opnd::None, right: Opnd::None, out: Opnd::None };
+
+        let mut opnd_iter = insn.opnd_iter();
+        assert!(matches!(opnd_iter.next(), Some(Opnd::None)));
+        assert!(matches!(opnd_iter.next(), Some(Opnd::None)));
+
+        assert!(matches!(opnd_iter.next(), None));
+    }
+
+    #[test]
+    fn test_opnd_iter_mut() {
+        let mut insn = Insn::Add { left: Opnd::None, right: Opnd::None, out: Opnd::None };
+
+        let mut opnd_iter = insn.opnd_iter_mut();
+        assert!(matches!(opnd_iter.next(), Some(Opnd::None)));
+        assert!(matches!(opnd_iter.next(), Some(Opnd::None)));
+
+        assert!(matches!(opnd_iter.next(), None));
+    }
+}
+
diff --git a/zjit/src/backend/mod.rs b/zjit/src/backend/mod.rs
new file mode 100644
index 00000000000000..4922421f18f6dd
--- /dev/null
+++ b/zjit/src/backend/mod.rs
@@ -0,0 +1,13 @@
+#[cfg(target_arch = "x86_64")]
+pub mod x86_64;
+
+#[cfg(target_arch = "aarch64")]
+pub mod arm64;
+
+#[cfg(target_arch = "x86_64")]
+pub use x86_64 as current;
+
+#[cfg(target_arch = "aarch64")]
+pub use arm64 as current;
+
+pub mod lir;
diff --git a/zjit/src/backend/tests.rs b/zjit/src/backend/tests.rs
new file mode 100644
index 00000000000000..b3918a05f9be0e
--- /dev/null
+++ b/zjit/src/backend/tests.rs
@@ -0,0 +1,332 @@
+/*
+#![cfg(test)]
+use crate::asm::CodeBlock;
+use crate::backend::*;
+use crate::cruby::*;
+use crate::utils::c_callable;
+
+#[test]
+fn test_add() {
+    let mut asm = Assembler::new(0);
+    let out = asm.add(SP, Opnd::UImm(1));
+    let _ = asm.add(out, Opnd::UImm(2));
+}
+
+#[test]
+fn test_alloc_regs() {
+    let mut asm = Assembler::new(0);
+
+    // Get the first output that we're going to reuse later.
+    let out1 = asm.add(EC, Opnd::UImm(1));
+
+    // Pad some instructions in to make sure it can handle that.
+    let _ = asm.add(EC, Opnd::UImm(2));
+
+    // Get the second output we're going to reuse.
+    let out2 = asm.add(EC, Opnd::UImm(3));
+
+    // Pad another instruction.
+    let _ =  asm.add(EC, Opnd::UImm(4));
+
+    // Reuse both the previously captured outputs.
+    let _ = asm.add(out1, out2);
+
+    // Now get a third output to make sure that the pool has registers to
+    // allocate now that the previous ones have been returned.
+    let out3 = asm.add(EC, Opnd::UImm(5));
+    let _ = asm.add(out3, Opnd::UImm(6));
+
+    // Here we're going to allocate the registers.
+    let result = asm.alloc_regs(Assembler::get_alloc_regs());
+
+    // Now we're going to verify that the out field has been appropriately
+    // updated for each of the instructions that needs it.
+    let regs = Assembler::get_alloc_regs();
+    let reg0 = regs[0];
+    let reg1 = regs[1];
+
+    match result.insns[0].out_opnd() {
+        Some(Opnd::Reg(value)) => assert_eq!(value, &reg0),
+        val => panic!("Unexpected register value {:?}", val),
+    }
+
+    match result.insns[2].out_opnd() {
+        Some(Opnd::Reg(value)) => assert_eq!(value, &reg1),
+        val => panic!("Unexpected register value {:?}", val),
+    }
+
+    match result.insns[5].out_opnd() {
+        Some(Opnd::Reg(value)) => assert_eq!(value, &reg0),
+        val => panic!("Unexpected register value {:?}", val),
+    }
+}
+
+fn setup_asm() -> (Assembler, CodeBlock) {
+    return (
+        Assembler::new(0),
+        CodeBlock::new_dummy(1024)
+    );
+}
+
+// Test full codegen pipeline
+#[test]
+fn test_compile()
+{
+    let (mut asm, mut cb) = setup_asm();
+    let regs = Assembler::get_alloc_regs();
+
+    let out = asm.add(Opnd::Reg(regs[0]), Opnd::UImm(2));
+    let out2 = asm.add(out, Opnd::UImm(2));
+    asm.store(Opnd::mem(64, SP, 0), out2);
+
+    asm.compile_with_num_regs(&mut cb, 1);
+}
+
+// Test memory-to-memory move
+#[test]
+fn test_mov_mem2mem()
+{
+    let (mut asm, mut cb) = setup_asm();
+
+    asm_comment!(asm, "check that comments work too");
+    asm.mov(Opnd::mem(64, SP, 0), Opnd::mem(64, SP, 8));
+
+    asm.compile_with_num_regs(&mut cb, 1);
+}
+
+// Test load of register into new register
+#[test]
+fn test_load_reg()
+{
+    let (mut asm, mut cb) = setup_asm();
+
+    let out = asm.load(SP);
+    asm.mov(Opnd::mem(64, SP, 0), out);
+
+    asm.compile_with_num_regs(&mut cb, 1);
+}
+
+// Test load of a GC'd value
+#[test]
+fn test_load_value()
+{
+    let (mut asm, mut cb) = setup_asm();
+
+    let gcd_value = VALUE(0xFFFFFFFFFFFF00);
+    assert!(!gcd_value.special_const_p());
+
+    let out = asm.load(Opnd::Value(gcd_value));
+    asm.mov(Opnd::mem(64, SP, 0), out);
+
+    asm.compile_with_num_regs(&mut cb, 1);
+}
+
+// Multiple registers needed and register reuse
+#[test]
+fn test_reuse_reg()
+{
+    let (mut asm, mut cb) = setup_asm();
+
+    let v0 = asm.add(Opnd::mem(64, SP, 0), Opnd::UImm(1));
+    let v1 = asm.add(Opnd::mem(64, SP, 8), Opnd::UImm(1));
+
+    let v2 = asm.add(v1, Opnd::UImm(1)); // Reuse v1 register
+    let v3 = asm.add(v0, v2);
+
+    asm.store(Opnd::mem(64, SP, 0), v2);
+    asm.store(Opnd::mem(64, SP, 8), v3);
+
+    asm.compile_with_num_regs(&mut cb, 2);
+}
+
+// 64-bit values can't be written directly to memory,
+// need to be split into one or more register movs first
+#[test]
+fn test_store_u64()
+{
+    let (mut asm, mut cb) = setup_asm();
+    asm.store(Opnd::mem(64, SP, 0), u64::MAX.into());
+
+    asm.compile_with_num_regs(&mut cb, 1);
+}
+
+// Use instruction output as base register for memory operand
+#[test]
+fn test_base_insn_out()
+{
+    let (mut asm, mut cb) = setup_asm();
+
+    // Forced register to be reused
+    // This also causes the insn sequence to change length
+    asm.mov(
+        Opnd::mem(64, SP, 8),
+        Opnd::mem(64, SP, 0)
+    );
+
+    // Load the pointer into a register
+    let ptr_reg = asm.load(Opnd::const_ptr(4351776248 as *const u8));
+    let counter_opnd = Opnd::mem(64, ptr_reg, 0);
+
+    // Increment and store the updated value
+    asm.incr_counter(counter_opnd, 1.into());
+
+    asm.compile_with_num_regs(&mut cb, 2);
+}
+
+#[test]
+fn test_c_call()
+{
+    c_callable! {
+        fn dummy_c_fun(_v0: usize, _v1: usize) {}
+    }
+
+    let (mut asm, mut cb) = setup_asm();
+
+    let ret_val = asm.ccall(
+        dummy_c_fun as *const u8,
+        vec![Opnd::mem(64, SP, 0), Opnd::UImm(1)]
+    );
+
+    // Make sure that the call's return value is usable
+    asm.mov(Opnd::mem(64, SP, 0), ret_val);
+
+    asm.compile_with_num_regs(&mut cb, 1);
+}
+
+#[test]
+fn test_alloc_ccall_regs() {
+    let mut asm = Assembler::new(0);
+    let out1 = asm.ccall(0 as *const u8, vec![]);
+    let out2 = asm.ccall(0 as *const u8, vec![out1]);
+    asm.mov(EC, out2);
+    let mut cb = CodeBlock::new_dummy(1024);
+    asm.compile_with_regs(&mut cb, None, Assembler::get_alloc_regs());
+}
+
+#[test]
+fn test_lea_ret()
+{
+    let (mut asm, mut cb) = setup_asm();
+
+    let addr = asm.lea(Opnd::mem(64, SP, 0));
+    asm.cret(addr);
+
+    asm.compile_with_num_regs(&mut cb, 1);
+}
+
+#[test]
+fn test_jcc_label()
+{
+    let (mut asm, mut cb) = setup_asm();
+
+    let label = asm.new_label("foo");
+    asm.cmp(EC, EC);
+    asm.je(label);
+    asm.write_label(label);
+
+    asm.compile_with_num_regs(&mut cb, 1);
+}
+
+#[test]
+fn test_jcc_ptr()
+{
+    let (mut asm, mut cb) = setup_asm();
+
+    let side_exit = Target::CodePtr(cb.get_write_ptr().add_bytes(4));
+    let not_mask = asm.not(Opnd::mem(32, EC, RUBY_OFFSET_EC_INTERRUPT_MASK));
+    asm.test(
+        Opnd::mem(32, EC, RUBY_OFFSET_EC_INTERRUPT_FLAG),
+        not_mask,
+    );
+    asm.jnz(side_exit);
+
+    asm.compile_with_num_regs(&mut cb, 2);
+}
+
+/// Direct jump to a stub e.g. for deferred compilation
+#[test]
+fn test_jmp_ptr()
+{
+    let (mut asm, mut cb) = setup_asm();
+
+    let stub = Target::CodePtr(cb.get_write_ptr().add_bytes(4));
+    asm.jmp(stub);
+
+    asm.compile_with_num_regs(&mut cb, 0);
+}
+
+#[test]
+fn test_jo()
+{
+    let (mut asm, mut cb) = setup_asm();
+
+    let side_exit = Target::CodePtr(cb.get_write_ptr().add_bytes(4));
+
+    let arg1 = Opnd::mem(64, SP, 0);
+    let arg0 = Opnd::mem(64, SP, 8);
+
+    let arg0_untag = asm.sub(arg0, Opnd::Imm(1));
+    let out_val = asm.add(arg0_untag, arg1);
+    asm.jo(side_exit);
+
+    asm.mov(Opnd::mem(64, SP, 0), out_val);
+
+    asm.compile_with_num_regs(&mut cb, 2);
+}
+
+#[test]
+fn test_bake_string() {
+    let (mut asm, mut cb) = setup_asm();
+
+    asm.bake_string("Hello, world!");
+    asm.compile_with_num_regs(&mut cb, 0);
+}
+
+#[test]
+fn test_draining_iterator() {
+    let mut asm = Assembler::new(0);
+
+    let _ = asm.load(Opnd::None);
+    asm.store(Opnd::None, Opnd::None);
+    let _ = asm.add(Opnd::None, Opnd::None);
+
+    let mut iter = asm.into_draining_iter();
+
+    while let Some((index, insn)) = iter.next_unmapped() {
+        match index {
+            0 => assert!(matches!(insn, Insn::Load { .. })),
+            1 => assert!(matches!(insn, Insn::Store { .. })),
+            2 => assert!(matches!(insn, Insn::Add { .. })),
+            _ => panic!("Unexpected instruction index"),
+        };
+    }
+}
+
+#[test]
+fn test_cmp_8_bit() {
+    let (mut asm, mut cb) = setup_asm();
+    let reg = Assembler::get_alloc_regs()[0];
+    asm.cmp(Opnd::Reg(reg).with_num_bits(8).unwrap(), Opnd::UImm(RUBY_SYMBOL_FLAG as u64));
+
+    asm.compile_with_num_regs(&mut cb, 1);
+}
+
+#[test]
+fn test_no_pos_marker_callback_when_compile_fails() {
+    // When compilation fails (e.g. when out of memory), the code written out is malformed.
+    // We don't want to invoke the pos_marker callbacks with positions of malformed code.
+    let mut asm = Assembler::new(0);
+
+    // Markers around code to exhaust memory limit
+    let fail_if_called = |_code_ptr, _cb: &_| panic!("pos_marker callback should not be called");
+    asm.pos_marker(fail_if_called);
+    let zero = asm.load(0.into());
+    let sum = asm.add(zero, 500.into());
+    asm.store(Opnd::mem(64, SP, 8), sum);
+    asm.pos_marker(fail_if_called);
+
+    let cb = &mut CodeBlock::new_dummy(8);
+    assert!(asm.compile(cb, None).is_none(), "should fail due to tiny size limit");
+}
+
+*/
diff --git a/zjit/src/backend/x86_64/mod.rs b/zjit/src/backend/x86_64/mod.rs
new file mode 100644
index 00000000000000..85a6a0f5b47755
--- /dev/null
+++ b/zjit/src/backend/x86_64/mod.rs
@@ -0,0 +1,1303 @@
+use std::mem::take;
+
+use crate::asm::*;
+use crate::asm::x86_64::*;
+use crate::virtualmem::CodePtr;
+use crate::cruby::*;
+use crate::backend::lir::*;
+use crate::cast::*;
+
+// Use the x86 register type for this platform
+pub type Reg = X86Reg;
+
+// Callee-saved registers
+pub const _CFP: Opnd = Opnd::Reg(R13_REG);
+pub const _EC: Opnd = Opnd::Reg(R12_REG);
+pub const _SP: Opnd = Opnd::Reg(RBX_REG);
+
+// C argument registers on this platform
+pub const _C_ARG_OPNDS: [Opnd; 6] = [
+    Opnd::Reg(RDI_REG),
+    Opnd::Reg(RSI_REG),
+    Opnd::Reg(RDX_REG),
+    Opnd::Reg(RCX_REG),
+    Opnd::Reg(R8_REG),
+    Opnd::Reg(R9_REG)
+];
+
+// C return value register on this platform
+pub const C_RET_REG: Reg = RAX_REG;
+pub const _C_RET_OPND: Opnd = Opnd::Reg(RAX_REG);
+pub const _NATIVE_STACK_PTR: Opnd = Opnd::Reg(RSP_REG);
+
+impl CodeBlock {
+    // The number of bytes that are generated by jmp_ptr
+    pub fn jmp_ptr_bytes(&self) -> usize { 5 }
+}
+
+/// Map Opnd to X86Opnd
+impl From<Opnd> for X86Opnd {
+    fn from(opnd: Opnd) -> Self {
+        match opnd {
+            // NOTE: these operand types need to be lowered first
+            //Value(VALUE),       // Immediate Ruby value, may be GC'd, movable
+            //VReg(usize),     // Output of a preceding instruction in this block
+
+            Opnd::VReg{..} => panic!("VReg operand made it past register allocation"),
+
+            Opnd::UImm(val) => uimm_opnd(val),
+            Opnd::Imm(val) => imm_opnd(val),
+            Opnd::Value(VALUE(uimm)) => uimm_opnd(uimm as u64),
+
+            // General-purpose register
+            Opnd::Reg(reg) => X86Opnd::Reg(reg),
+
+            // Memory operand with displacement
+            Opnd::Mem(Mem{ base: MemBase::Reg(reg_no), num_bits, disp }) => {
+                let reg = X86Reg {
+                    reg_no,
+                    num_bits: 64,
+                    reg_type: RegType::GP
+                };
+
+                mem_opnd(num_bits, X86Opnd::Reg(reg), disp)
+            }
+
+            Opnd::None => panic!(
+                "Attempted to lower an Opnd::None. This often happens when an out operand was not allocated for an instruction because the output of the instruction was not used. Please ensure you are using the output."
+            ),
+
+            _ => panic!("unsupported x86 operand type")
+        }
+    }
+}
+
+/// Also implement going from a reference to an operand for convenience.
+impl From<&Opnd> for X86Opnd {
+    fn from(opnd: &Opnd) -> Self {
+        X86Opnd::from(*opnd)
+    }
+}
+
+/// List of registers that can be used for register allocation.
+/// This has the same number of registers for x86_64 and arm64.
+/// SCRATCH_REG is excluded.
+pub const ALLOC_REGS: &'static [Reg] = &[
+    RDI_REG,
+    RSI_REG,
+    RDX_REG,
+    RCX_REG,
+    R8_REG,
+    R9_REG,
+    R10_REG,
+    RAX_REG,
+];
+
+impl Assembler
+{
+    // A special scratch register for intermediate processing.
+    // This register is caller-saved (so we don't have to save it before using it)
+    pub const SCRATCH_REG: Reg = R11_REG;
+    const SCRATCH0: X86Opnd = X86Opnd::Reg(Assembler::SCRATCH_REG);
+
+    /// Get the list of registers from which we can allocate on this platform
+    pub fn get_alloc_regs() -> Vec<Reg> {
+        ALLOC_REGS.to_vec()
+    }
+
+    /// Get a list of all of the caller-save registers
+    pub fn get_caller_save_regs() -> Vec<Reg> {
+        vec![RAX_REG, RCX_REG, RDX_REG, RSI_REG, RDI_REG, R8_REG, R9_REG, R10_REG, R11_REG]
+    }
+
+    // These are the callee-saved registers in the x86-64 SysV ABI
+    // RBX, RSP, RBP, and R12–R15
+
+    /// Split IR instructions for the x86 platform
+    fn x86_split(mut self) -> Assembler
+    {
+        let live_ranges: Vec<LiveRange> = take(&mut self.live_ranges);
+        let mut iterator = self.insns.into_iter().enumerate().peekable();
+        let mut asm = Assembler::new_with_label_names(take(&mut self.label_names), live_ranges.len());
+
+        while let Some((index, mut insn)) = iterator.next() {
+            let is_load = matches!(insn, Insn::Load { .. } | Insn::LoadInto { .. });
+            let mut opnd_iter = insn.opnd_iter_mut();
+
+            while let Some(opnd) = opnd_iter.next() {
+                // Lower Opnd::Value to Opnd::VReg or Opnd::UImm
+                match opnd {
+                    Opnd::Value(value) if !is_load => {
+                        // Since mov(mem64, imm32) sign extends, as_i64() makes sure
+                        // we split when the extended value is different.
+                        *opnd = if !value.special_const_p() || imm_num_bits(value.as_i64()) > 32 {
+                            asm.load(*opnd)
+                        } else {
+                            Opnd::UImm(value.as_u64())
+                        }
+                    }
+                    _ => {},
+                };
+            }
+
+            // We are replacing instructions here so we know they are already
+            // being used. It is okay not to use their output here.
+            #[allow(unused_must_use)]
+            match &mut insn {
+                Insn::Add { left, right, out } |
+                Insn::Sub { left, right, out } |
+                Insn::Mul { left, right, out } |
+                Insn::And { left, right, out } |
+                Insn::Or { left, right, out } |
+                Insn::Xor { left, right, out } => {
+                    match (&left, &right, iterator.peek().map(|(_, insn)| insn)) {
+                        // Merge this insn, e.g. `add REG, right -> out`, and `mov REG, out` if possible
+                        (Opnd::Reg(_), Opnd::UImm(value), Some(Insn::Mov { dest, src }))
+                        if out == src && left == dest && live_ranges[out.vreg_idx()].end() == index + 1 && uimm_num_bits(*value) <= 32 => {
+                            *out = *dest;
+                            asm.push_insn(insn);
+                            iterator.next(); // Pop merged Insn::Mov
+                        }
+                        (Opnd::Reg(_), Opnd::Reg(_), Some(Insn::Mov { dest, src }))
+                        if out == src && live_ranges[out.vreg_idx()].end() == index + 1 && *dest == *left => {
+                            *out = *dest;
+                            asm.push_insn(insn);
+                            iterator.next(); // Pop merged Insn::Mov
+                        }
+                        _ => {
+                            match (*left, *right) {
+                                (Opnd::Mem(_), Opnd::Mem(_)) => {
+                                    *left = asm.load(*left);
+                                    *right = asm.load(*right);
+                                },
+                                (Opnd::Mem(_), Opnd::UImm(_) | Opnd::Imm(_)) => {
+                                    *left = asm.load(*left);
+                                },
+                                // Instruction output whose live range spans beyond this instruction
+                                (Opnd::VReg { idx, .. }, _) => {
+                                    if live_ranges[idx].end() > index {
+                                        *left = asm.load(*left);
+                                    }
+                                },
+                                // We have to load memory operands to avoid corrupting them
+                                (Opnd::Mem(_) | Opnd::Reg(_), _) => {
+                                    *left = asm.load(*left);
+                                },
+                                // The first operand can't be an immediate value
+                                (Opnd::UImm(_), _) => {
+                                    *left = asm.load(*left);
+                                }
+                                _ => {}
+                            }
+                            asm.push_insn(insn);
+                        }
+                    }
+                },
+                Insn::Cmp { left, right } => {
+                    // Replace `cmp REG, 0` (4 bytes) with `test REG, REG` (3 bytes)
+                    // when next IR is `je`, `jne`, `csel_e`, or `csel_ne`
+                    match (&left, &right, iterator.peek().map(|(_, insn)| insn)) {
+                        (Opnd::VReg { .. },
+                         Opnd::UImm(0) | Opnd::Imm(0),
+                         Some(Insn::Je(_) | Insn::Jne(_) | Insn::CSelE { .. } | Insn::CSelNE { .. })) => {
+                            asm.push_insn(Insn::Test { left: *left, right: *left });
+                        }
+                        _ => {
+                            // Split the instruction if `cmp` can't be encoded with given operands
+                            match (&left, &right) {
+                                // One of the operands should not be a memory operand
+                                (Opnd::Mem(_), Opnd::Mem(_)) => {
+                                    *right = asm.load(*right);
+                                }
+                                // The left operand needs to be either a register or a memory operand
+                                (Opnd::UImm(_) | Opnd::Imm(_), _) => {
+                                    *left = asm.load(*left);
+                                }
+                                _ => {},
+                            }
+                            asm.push_insn(insn);
+                        }
+                    }
+                },
+                Insn::Test { left, right } => {
+                    match (&left, &right) {
+                        (Opnd::Mem(_), Opnd::Mem(_)) => {
+                            *right = asm.load(*right);
+                        }
+                        // The first operand can't be an immediate value
+                        (Opnd::UImm(_) | Opnd::Imm(_), _) => {
+                            *left = asm.load(*left);
+                        }
+                        _ => {}
+                    }
+                    asm.push_insn(insn);
+                },
+                // These instructions modify their input operand in-place, so we
+                // may need to load the input value to preserve it
+                Insn::LShift { opnd, .. } |
+                Insn::RShift { opnd, .. } |
+                Insn::URShift { opnd, .. } => {
+                    match opnd {
+                        // Instruction output whose live range spans beyond this instruction
+                        Opnd::VReg { idx, .. } => {
+                            if live_ranges[*idx].end() > index {
+                                *opnd = asm.load(*opnd);
+                            }
+                        },
+                        // We have to load memory operands to avoid corrupting them
+                        Opnd::Mem(_) | Opnd::Reg(_) => {
+                            *opnd = asm.load(*opnd);
+                        },
+                        _ => {}
+                    }
+                    asm.push_insn(insn);
+                },
+                Insn::CSelZ { truthy, falsy, .. } |
+                Insn::CSelNZ { truthy, falsy, .. } |
+                Insn::CSelE { truthy, falsy, .. } |
+                Insn::CSelNE { truthy, falsy, .. } |
+                Insn::CSelL { truthy, falsy, .. } |
+                Insn::CSelLE { truthy, falsy, .. } |
+                Insn::CSelG { truthy, falsy, .. } |
+                Insn::CSelGE { truthy, falsy, .. } => {
+                    match *truthy {
+                        // If we have an instruction output whose live range
+                        // spans beyond this instruction, we have to load it.
+                        Opnd::VReg { idx, .. } => {
+                            if live_ranges[idx].end() > index {
+                                *truthy = asm.load(*truthy);
+                            }
+                        },
+                        Opnd::UImm(_) | Opnd::Imm(_) => {
+                            *truthy = asm.load(*truthy);
+                        },
+                        // Opnd::Value could have already been split
+                        Opnd::Value(_) if !matches!(truthy, Opnd::VReg { .. }) => {
+                            *truthy = asm.load(*truthy);
+                        },
+                        _ => {}
+                    }
+
+                    match falsy {
+                        Opnd::UImm(_) | Opnd::Imm(_) => {
+                            *falsy = asm.load(*falsy);
+                        },
+                        _ => {}
+                    }
+
+                    asm.push_insn(insn);
+                },
+                Insn::Mov { dest, src } | Insn::Store { dest, src } => {
+                    match (&dest, &src) {
+                        (Opnd::Mem(_), Opnd::Mem(_)) => {
+                            // We load opnd1 because for mov, opnd0 is the output
+                            let opnd1 = asm.load(*src);
+                            asm.mov(*dest, opnd1);
+                        },
+                        (Opnd::Mem(Mem { num_bits, .. }), Opnd::UImm(value)) => {
+                            // For 64 bit destinations, 32-bit values will be sign-extended
+                            if *num_bits == 64 && imm_num_bits(*value as i64) > 32 {
+                                let opnd1 = asm.load(*src);
+                                asm.mov(*dest, opnd1);
+                            } else {
+                                asm.mov(*dest, *src);
+                            }
+                        },
+                        (Opnd::Mem(Mem { num_bits, .. }), Opnd::Imm(value)) => {
+                            // For 64 bit destinations, 32-bit values will be sign-extended
+                            if *num_bits == 64 && imm_num_bits(*value) > 32 {
+                                let opnd1 = asm.load(*src);
+                                asm.mov(*dest, opnd1);
+                            } else if uimm_num_bits(*value as u64) <= *num_bits {
+                                // If the bit string is short enough for the destination, use the unsigned representation.
+                                // Note that 64-bit and negative values are ruled out.
+                                asm.mov(*dest, Opnd::UImm(*value as u64));
+                            } else {
+                                asm.mov(*dest, *src);
+                            }
+                        },
+                        _ => {
+                            asm.mov(*dest, *src);
+                        }
+                    }
+                },
+                Insn::Not { opnd, .. } => {
+                    match *opnd {
+                        // If we have an instruction output whose live range
+                        // spans beyond this instruction, we have to load it.
+                        Opnd::VReg { idx, .. } => {
+                            if live_ranges[idx].end() > index {
+                                *opnd = asm.load(*opnd);
+                            }
+                        },
+                        // We have to load memory and register operands to avoid
+                        // corrupting them.
+                        Opnd::Mem(_) | Opnd::Reg(_) => {
+                            *opnd = asm.load(*opnd);
+                        },
+                        // Otherwise we can just reuse the existing operand.
+                        _ => {},
+                    };
+                    asm.push_insn(insn);
+                },
+                Insn::CCall { opnds, .. } => {
+                    assert!(opnds.len() <= C_ARG_OPNDS.len());
+
+                    // Load each operand into the corresponding argument register.
+                    if !opnds.is_empty() {
+                        let mut args: Vec<(Reg, Opnd)> = vec![];
+                        for (idx, opnd) in opnds.into_iter().enumerate() {
+                            args.push((C_ARG_OPNDS[idx].unwrap_reg(), *opnd));
+                        }
+                        asm.parallel_mov(args);
+                    }
+
+                    // Now we push the CCall without any arguments so that it
+                    // just performs the call.
+                    *opnds = vec![];
+                    asm.push_insn(insn);
+                },
+                Insn::Lea { .. } => {
+                    // Merge `lea` and `mov` into a single `lea` when possible
+                    match (&insn, iterator.peek().map(|(_, insn)| insn)) {
+                        (Insn::Lea { opnd, out }, Some(Insn::Mov { dest: Opnd::Reg(reg), src }))
+                        if matches!(out, Opnd::VReg { .. }) && out == src && live_ranges[out.vreg_idx()].end() == index + 1 => {
+                            asm.push_insn(Insn::Lea { opnd: *opnd, out: Opnd::Reg(*reg) });
+                            iterator.next(); // Pop merged Insn::Mov
+                        }
+                        _ => asm.push_insn(insn),
+                    }
+                },
+                _ => {
+                    asm.push_insn(insn);
+                }
+            }
+        }
+
+        asm
+    }
+
+    /// Emit platform-specific machine code
+    pub fn x86_emit(&mut self, cb: &mut CodeBlock) -> Option<Vec<CodePtr>> {
+        /// For some instructions, we want to be able to lower a 64-bit operand
+        /// without requiring more registers to be available in the register
+        /// allocator. So we just use the SCRATCH0 register temporarily to hold
+        /// the value before we immediately use it.
+        fn emit_64bit_immediate(cb: &mut CodeBlock, opnd: &Opnd) -> X86Opnd {
+            match opnd {
+                Opnd::Imm(value) => {
+                    // 32-bit values will be sign-extended
+                    if imm_num_bits(*value) > 32 {
+                        mov(cb, Assembler::SCRATCH0, opnd.into());
+                        Assembler::SCRATCH0
+                    } else {
+                        opnd.into()
+                    }
+                },
+                Opnd::UImm(value) => {
+                    // 32-bit values will be sign-extended
+                    if imm_num_bits(*value as i64) > 32 {
+                        mov(cb, Assembler::SCRATCH0, opnd.into());
+                        Assembler::SCRATCH0
+                    } else {
+                        opnd.into()
+                    }
+                },
+                _ => opnd.into()
+            }
+        }
+
+        fn emit_csel(
+            cb: &mut CodeBlock,
+            truthy: Opnd,
+            falsy: Opnd,
+            out: Opnd,
+            cmov_fn: fn(&mut CodeBlock, X86Opnd, X86Opnd),
+            cmov_neg: fn(&mut CodeBlock, X86Opnd, X86Opnd)){
+
+            // Assert that output is a register
+            out.unwrap_reg();
+
+            // If the truthy value is a memory operand
+            if let Opnd::Mem(_) = truthy {
+                if out != falsy {
+                    mov(cb, out.into(), falsy.into());
+                }
+
+                cmov_fn(cb, out.into(), truthy.into());
+            } else {
+                if out != truthy {
+                    mov(cb, out.into(), truthy.into());
+                }
+
+                cmov_neg(cb, out.into(), falsy.into());
+            }
+        }
+
+        // List of GC offsets
+        let mut gc_offsets: Vec<CodePtr> = Vec::new();
+
+        // Buffered list of PosMarker callbacks to fire if codegen is successful
+        let mut pos_markers: Vec<(usize, CodePtr)> = vec![];
+
+        // The write_pos for the last Insn::PatchPoint, if any
+        let mut last_patch_pos: Option<usize> = None;
+
+        // For each instruction
+        let mut insn_idx: usize = 0;
+        while let Some(insn) = self.insns.get(insn_idx) {
+            match insn {
+                Insn::Comment(text) => {
+                    cb.add_comment(text);
+                },
+
+                // Write the label at the current position
+                Insn::Label(target) => {
+                    cb.write_label(target.unwrap_label());
+                },
+
+                // Report back the current position in the generated code
+                Insn::PosMarker(..) => {
+                    pos_markers.push((insn_idx, cb.get_write_ptr()));
+                },
+
+                Insn::BakeString(text) => {
+                    for byte in text.as_bytes() {
+                        cb.write_byte(*byte);
+                    }
+
+                    // Add a null-terminator byte for safety (in case we pass
+                    // this to C code)
+                    cb.write_byte(0);
+                },
+
+                // Set up RBP to work with frame pointer unwinding
+                // (e.g. with Linux `perf record --call-graph fp`)
+                Insn::FrameSetup => {
+                    if false { // We don't support --zjit-perf yet
+                        push(cb, RBP);
+                        mov(cb, RBP, RSP);
+                        push(cb, RBP);
+                    }
+                },
+                Insn::FrameTeardown => {
+                    if false { // We don't support --zjit-perf yet
+                        pop(cb, RBP);
+                        pop(cb, RBP);
+                    }
+                },
+
+                Insn::Add { left, right, .. } => {
+                    let opnd1 = emit_64bit_immediate(cb, right);
+                    add(cb, left.into(), opnd1);
+                },
+
+                Insn::Sub { left, right, .. } => {
+                    let opnd1 = emit_64bit_immediate(cb, right);
+                    sub(cb, left.into(), opnd1);
+                },
+
+                Insn::Mul { left, right, .. } => {
+                    let opnd1 = emit_64bit_immediate(cb, right);
+                    imul(cb, left.into(), opnd1);
+                },
+
+                Insn::And { left, right, .. } => {
+                    let opnd1 = emit_64bit_immediate(cb, right);
+                    and(cb, left.into(), opnd1);
+                },
+
+                Insn::Or { left, right, .. } => {
+                    let opnd1 = emit_64bit_immediate(cb, right);
+                    or(cb, left.into(), opnd1);
+                },
+
+                Insn::Xor { left, right, .. } => {
+                    let opnd1 = emit_64bit_immediate(cb, right);
+                    xor(cb, left.into(), opnd1);
+                },
+
+                Insn::Not { opnd, .. } => {
+                    not(cb, opnd.into());
+                },
+
+                Insn::LShift { opnd, shift , ..} => {
+                    shl(cb, opnd.into(), shift.into())
+                },
+
+                Insn::RShift { opnd, shift , ..} => {
+                    sar(cb, opnd.into(), shift.into())
+                },
+
+                Insn::URShift { opnd, shift, .. } => {
+                    shr(cb, opnd.into(), shift.into())
+                },
+
+                Insn::Store { dest, src } => {
+                    mov(cb, dest.into(), src.into());
+                },
+
+                // This assumes only load instructions can contain references to GC'd Value operands
+                Insn::Load { opnd, out } |
+                Insn::LoadInto { dest: out, opnd } => {
+                    match opnd {
+                        Opnd::Value(val) if val.heap_object_p() => {
+                            // Using movabs because mov might write value in 32 bits
+                            movabs(cb, out.into(), val.0 as _);
+                            // The pointer immediate is encoded as the last part of the mov written out
+                            let ptr_offset = cb.get_write_ptr().sub_bytes(SIZEOF_VALUE);
+                            gc_offsets.push(ptr_offset);
+                        }
+                        _ => mov(cb, out.into(), opnd.into())
+                    }
+                },
+
+                Insn::LoadSExt { opnd, out } => {
+                    movsx(cb, out.into(), opnd.into());
+                },
+
+                Insn::ParallelMov { .. } => unreachable!("{insn:?} should have been lowered at alloc_regs()"),
+
+                Insn::Mov { dest, src } => {
+                    mov(cb, dest.into(), src.into());
+                },
+
+                // Load effective address
+                Insn::Lea { opnd, out } => {
+                    lea(cb, out.into(), opnd.into());
+                },
+
+                // Load address of jump target
+                Insn::LeaJumpTarget { target, out } => {
+                    if let Target::Label(label) = target {
+                        // Set output to the raw address of the label
+                        cb.label_ref(*label, 7, |cb, src_addr, dst_addr| {
+                            let disp = dst_addr - src_addr;
+                            lea(cb, Self::SCRATCH0, mem_opnd(8, RIP, disp.try_into().unwrap()));
+                        });
+
+                        mov(cb, out.into(), Self::SCRATCH0);
+                    } else {
+                        // Set output to the jump target's raw address
+                        let target_code = target.unwrap_code_ptr();
+                        let target_addr = target_code.raw_addr(cb).as_u64();
+                        // Constant encoded length important for patching
+                        movabs(cb, out.into(), target_addr);
+                    }
+                },
+
+                // Push and pop to/from the C stack
+                Insn::CPush(opnd) => {
+                    push(cb, opnd.into());
+                },
+                Insn::CPop { out } => {
+                    pop(cb, out.into());
+                },
+                Insn::CPopInto(opnd) => {
+                    pop(cb, opnd.into());
+                },
+
+                // Push and pop to the C stack all caller-save registers and the
+                // flags
+                Insn::CPushAll => {
+                    let regs = Assembler::get_caller_save_regs();
+
+                    for reg in regs {
+                        push(cb, X86Opnd::Reg(reg));
+                    }
+                    pushfq(cb);
+                },
+                Insn::CPopAll => {
+                    let regs = Assembler::get_caller_save_regs();
+
+                    popfq(cb);
+                    for reg in regs.into_iter().rev() {
+                        pop(cb, X86Opnd::Reg(reg));
+                    }
+                },
+
+                // C function call
+                Insn::CCall { fptr, .. } => {
+                    call_ptr(cb, RAX, *fptr);
+                },
+
+                Insn::CRet(opnd) => {
+                    // TODO: bias allocation towards return register
+                    if *opnd != Opnd::Reg(C_RET_REG) {
+                        mov(cb, RAX, opnd.into());
+                    }
+
+                    ret(cb);
+                },
+
+                // Compare
+                Insn::Cmp { left, right } => {
+                    let num_bits = match right {
+                        Opnd::Imm(value) => Some(imm_num_bits(*value)),
+                        Opnd::UImm(value) => Some(uimm_num_bits(*value)),
+                        _ => None
+                    };
+
+                    // If the immediate is less than 64 bits (like 32, 16, 8), and the operand
+                    // sizes match, then we can represent it as an immediate in the instruction
+                    // without moving it to a register first.
+                    // IOW, 64 bit immediates must always be moved to a register
+                    // before comparisons, where other sizes may be encoded
+                    // directly in the instruction.
+                    if num_bits.is_some() && left.num_bits() == num_bits && num_bits.unwrap() < 64 {
+                        cmp(cb, left.into(), right.into());
+                    } else {
+                        let emitted = emit_64bit_immediate(cb, right);
+                        cmp(cb, left.into(), emitted);
+                    }
+                }
+
+                // Test and set flags
+                Insn::Test { left, right } => {
+                    let emitted = emit_64bit_immediate(cb, right);
+                    test(cb, left.into(), emitted);
+                }
+
+                Insn::JmpOpnd(opnd) => {
+                    jmp_rm(cb, opnd.into());
+                }
+
+                // Conditional jump to a label
+                Insn::Jmp(target) => {
+                    match *target {
+                        Target::CodePtr(code_ptr) => jmp_ptr(cb, code_ptr),
+                        Target::Label(label) => jmp_label(cb, label),
+                        Target::SideExit { .. } => unreachable!("Target::SideExit should have been compiled by compile_side_exits"),
+                    }
+                }
+
+                Insn::Je(target) => {
+                    match *target {
+                        Target::CodePtr(code_ptr) => je_ptr(cb, code_ptr),
+                        Target::Label(label) => je_label(cb, label),
+                        Target::SideExit { .. } => unreachable!("Target::SideExit should have been compiled by compile_side_exits"),
+                    }
+                }
+
+                Insn::Jne(target) => {
+                    match *target {
+                        Target::CodePtr(code_ptr) => jne_ptr(cb, code_ptr),
+                        Target::Label(label) => jne_label(cb, label),
+                        Target::SideExit { .. } => unreachable!("Target::SideExit should have been compiled by compile_side_exits"),
+                    }
+                }
+
+                Insn::Jl(target) => {
+                    match *target {
+                        Target::CodePtr(code_ptr) => jl_ptr(cb, code_ptr),
+                        Target::Label(label) => jl_label(cb, label),
+                        Target::SideExit { .. } => unreachable!("Target::SideExit should have been compiled by compile_side_exits"),
+                    }
+                },
+
+                Insn::Jg(target) => {
+                    match *target {
+                        Target::CodePtr(code_ptr) => jg_ptr(cb, code_ptr),
+                        Target::Label(label) => jg_label(cb, label),
+                        Target::SideExit { .. } => unreachable!("Target::SideExit should have been compiled by compile_side_exits"),
+                    }
+                },
+
+                Insn::Jge(target) => {
+                    match *target {
+                        Target::CodePtr(code_ptr) => jge_ptr(cb, code_ptr),
+                        Target::Label(label) => jge_label(cb, label),
+                        Target::SideExit { .. } => unreachable!("Target::SideExit should have been compiled by compile_side_exits"),
+                    }
+                },
+
+                Insn::Jbe(target) => {
+                    match *target {
+                        Target::CodePtr(code_ptr) => jbe_ptr(cb, code_ptr),
+                        Target::Label(label) => jbe_label(cb, label),
+                        Target::SideExit { .. } => unreachable!("Target::SideExit should have been compiled by compile_side_exits"),
+                    }
+                },
+
+                Insn::Jb(target) => {
+                    match *target {
+                        Target::CodePtr(code_ptr) => jb_ptr(cb, code_ptr),
+                        Target::Label(label) => jb_label(cb, label),
+                        Target::SideExit { .. } => unreachable!("Target::SideExit should have been compiled by compile_side_exits"),
+                    }
+                },
+
+                Insn::Jz(target) => {
+                    match *target {
+                        Target::CodePtr(code_ptr) => jz_ptr(cb, code_ptr),
+                        Target::Label(label) => jz_label(cb, label),
+                        Target::SideExit { .. } => unreachable!("Target::SideExit should have been compiled by compile_side_exits"),
+                    }
+                }
+
+                Insn::Jnz(target) => {
+                    match *target {
+                        Target::CodePtr(code_ptr) => jnz_ptr(cb, code_ptr),
+                        Target::Label(label) => jnz_label(cb, label),
+                        Target::SideExit { .. } => unreachable!("Target::SideExit should have been compiled by compile_side_exits"),
+                    }
+                }
+
+                Insn::Jo(target) |
+                Insn::JoMul(target) => {
+                    match *target {
+                        Target::CodePtr(code_ptr) => jo_ptr(cb, code_ptr),
+                        Target::Label(label) => jo_label(cb, label),
+                        Target::SideExit { .. } => unreachable!("Target::SideExit should have been compiled by compile_side_exits"),
+                    }
+                }
+
+                Insn::Joz(..) | Insn::Jonz(..) => unreachable!("Joz/Jonz should be unused for now"),
+
+                Insn::PatchPoint(_) |
+                Insn::PadPatchPoint => {
+                    // If patch points are too close to each other or the end of the block, fill nop instructions
+                    if let Some(last_patch_pos) = last_patch_pos {
+                        let code_size = cb.get_write_pos().saturating_sub(last_patch_pos);
+                        if code_size < cb.jmp_ptr_bytes() {
+                            nop(cb, (cb.jmp_ptr_bytes() - code_size) as u32);
+                        }
+                    }
+                    last_patch_pos = Some(cb.get_write_pos());
+                },
+
+                // Atomically increment a counter at a given memory location
+                Insn::IncrCounter { mem, value } => {
+                    assert!(matches!(mem, Opnd::Mem(_)));
+                    assert!(matches!(value, Opnd::UImm(_) | Opnd::Imm(_) ) );
+                    write_lock_prefix(cb);
+                    add(cb, mem.into(), value.into());
+                },
+
+                Insn::Breakpoint => int3(cb),
+
+                Insn::CSelZ { truthy, falsy, out } => {
+                    emit_csel(cb, *truthy, *falsy, *out, cmovz, cmovnz);
+                },
+                Insn::CSelNZ { truthy, falsy, out } => {
+                    emit_csel(cb, *truthy, *falsy, *out, cmovnz, cmovz);
+                },
+                Insn::CSelE { truthy, falsy, out } => {
+                    emit_csel(cb, *truthy, *falsy, *out, cmove, cmovne);
+                },
+                Insn::CSelNE { truthy, falsy, out } => {
+                    emit_csel(cb, *truthy, *falsy, *out, cmovne, cmove);
+                },
+                Insn::CSelL { truthy, falsy, out } => {
+                    emit_csel(cb, *truthy, *falsy, *out, cmovl, cmovge);
+                },
+                Insn::CSelLE { truthy, falsy, out } => {
+                    emit_csel(cb, *truthy, *falsy, *out, cmovle, cmovg);
+                },
+                Insn::CSelG { truthy, falsy, out } => {
+                    emit_csel(cb, *truthy, *falsy, *out, cmovg, cmovle);
+                },
+                Insn::CSelGE { truthy, falsy, out } => {
+                    emit_csel(cb, *truthy, *falsy, *out, cmovge, cmovl);
+                }
+                Insn::LiveReg { .. } => (), // just a reg alloc signal, no code
+            };
+
+            insn_idx += 1;
+        }
+
+        // Error if we couldn't write out everything
+        if cb.has_dropped_bytes() {
+            return None
+        } else {
+            // No bytes dropped, so the pos markers point to valid code
+            for (insn_idx, pos) in pos_markers {
+                if let Insn::PosMarker(callback) = self.insns.get(insn_idx).unwrap() {
+                    callback(pos, &cb);
+                } else {
+                    panic!("non-PosMarker in pos_markers insn_idx={insn_idx} {self:?}");
+                }
+            }
+
+            return Some(gc_offsets)
+        }
+    }
+
+    /// Optimize and compile the stored instructions
+    pub fn compile_with_regs(self, cb: &mut CodeBlock, regs: Vec<Reg>) -> Option<(CodePtr, Vec<CodePtr>)> {
+        let asm = self.x86_split();
+        let mut asm = asm.alloc_regs(regs)?;
+        asm.compile_side_exits()?;
+
+        // Create label instances in the code block
+        for (idx, name) in asm.label_names.iter().enumerate() {
+            let label = cb.new_label(name.to_string());
+            assert_eq!(label, Label(idx));
+        }
+
+        let start_ptr = cb.get_write_ptr();
+        let gc_offsets = asm.x86_emit(cb);
+
+        if let (Some(gc_offsets), false) = (gc_offsets, cb.has_dropped_bytes()) {
+            cb.link_labels();
+
+            Some((start_ptr, gc_offsets))
+        } else {
+            cb.clear_labels();
+
+            None
+        }
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use crate::assertions::assert_disasm;
+    use super::*;
+
+    fn setup_asm() -> (Assembler, CodeBlock) {
+        (Assembler::new(), CodeBlock::new_dummy())
+    }
+
+    #[test]
+    #[ignore]
+    fn test_emit_add_lt_32_bits() {
+        let (mut asm, mut cb) = setup_asm();
+
+        let _ = asm.add(Opnd::Reg(RAX_REG), Opnd::UImm(0xFF));
+        asm.compile_with_num_regs(&mut cb, 1);
+
+        assert_eq!(format!("{:x}", cb), "4889c04881c0ff000000");
+    }
+
+    #[test]
+    #[ignore]
+    fn test_emit_add_gt_32_bits() {
+        let (mut asm, mut cb) = setup_asm();
+
+        let _ = asm.add(Opnd::Reg(RAX_REG), Opnd::UImm(0xFFFF_FFFF_FFFF));
+        asm.compile_with_num_regs(&mut cb, 1);
+
+        assert_eq!(format!("{:x}", cb), "4889c049bbffffffffffff00004c01d8");
+    }
+
+    #[test]
+    #[ignore]
+    fn test_emit_and_lt_32_bits() {
+        let (mut asm, mut cb) = setup_asm();
+
+        let _ = asm.and(Opnd::Reg(RAX_REG), Opnd::UImm(0xFF));
+        asm.compile_with_num_regs(&mut cb, 1);
+
+        assert_eq!(format!("{:x}", cb), "4889c04881e0ff000000");
+    }
+
+    #[test]
+    #[ignore]
+    fn test_emit_and_gt_32_bits() {
+        let (mut asm, mut cb) = setup_asm();
+
+        let _ = asm.and(Opnd::Reg(RAX_REG), Opnd::UImm(0xFFFF_FFFF_FFFF));
+        asm.compile_with_num_regs(&mut cb, 1);
+
+        assert_eq!(format!("{:x}", cb), "4889c049bbffffffffffff00004c21d8");
+    }
+
+    #[test]
+    fn test_emit_cmp_lt_32_bits() {
+        let (mut asm, mut cb) = setup_asm();
+
+        asm.cmp(Opnd::Reg(RAX_REG), Opnd::UImm(0xFF));
+        asm.compile_with_num_regs(&mut cb, 0);
+
+        assert_eq!(format!("{:x}", cb), "4881f8ff000000");
+    }
+
+    #[test]
+    fn test_emit_cmp_gt_32_bits() {
+        let (mut asm, mut cb) = setup_asm();
+
+        asm.cmp(Opnd::Reg(RAX_REG), Opnd::UImm(0xFFFF_FFFF_FFFF));
+        asm.compile_with_num_regs(&mut cb, 0);
+
+        assert_eq!(format!("{:x}", cb), "49bbffffffffffff00004c39d8");
+    }
+
+    #[test]
+    fn test_emit_cmp_mem_16_bits_with_imm_16() {
+        let (mut asm, mut cb) = setup_asm();
+
+        let shape_opnd = Opnd::mem(16, Opnd::Reg(RAX_REG), 6);
+
+        asm.cmp(shape_opnd, Opnd::UImm(0xF000));
+        asm.compile_with_num_regs(&mut cb, 0);
+
+        assert_eq!(format!("{:x}", cb), "6681780600f0");
+    }
+
+    #[test]
+    fn test_emit_cmp_mem_32_bits_with_imm_32() {
+        let (mut asm, mut cb) = setup_asm();
+
+        let shape_opnd = Opnd::mem(32, Opnd::Reg(RAX_REG), 4);
+
+        asm.cmp(shape_opnd, Opnd::UImm(0xF000_0000));
+        asm.compile_with_num_regs(&mut cb, 0);
+
+        assert_eq!(format!("{:x}", cb), "817804000000f0");
+    }
+
+    #[test]
+    #[ignore]
+    fn test_emit_or_lt_32_bits() {
+        let (mut asm, mut cb) = setup_asm();
+
+        let _ = asm.or(Opnd::Reg(RAX_REG), Opnd::UImm(0xFF));
+        asm.compile_with_num_regs(&mut cb, 1);
+
+        assert_eq!(format!("{:x}", cb), "4889c04881c8ff000000");
+    }
+
+    #[test]
+    #[ignore]
+    fn test_emit_or_gt_32_bits() {
+        let (mut asm, mut cb) = setup_asm();
+
+        let _ = asm.or(Opnd::Reg(RAX_REG), Opnd::UImm(0xFFFF_FFFF_FFFF));
+        asm.compile_with_num_regs(&mut cb, 1);
+
+        assert_eq!(format!("{:x}", cb), "4889c049bbffffffffffff00004c09d8");
+    }
+
+    #[test]
+    #[ignore]
+    fn test_emit_sub_lt_32_bits() {
+        let (mut asm, mut cb) = setup_asm();
+
+        let _ = asm.sub(Opnd::Reg(RAX_REG), Opnd::UImm(0xFF));
+        asm.compile_with_num_regs(&mut cb, 1);
+
+        assert_eq!(format!("{:x}", cb), "4889c04881e8ff000000");
+    }
+
+    #[test]
+    #[ignore]
+    fn test_emit_sub_gt_32_bits() {
+        let (mut asm, mut cb) = setup_asm();
+
+        let _ = asm.sub(Opnd::Reg(RAX_REG), Opnd::UImm(0xFFFF_FFFF_FFFF));
+        asm.compile_with_num_regs(&mut cb, 1);
+
+        assert_eq!(format!("{:x}", cb), "4889c049bbffffffffffff00004c29d8");
+    }
+
+    #[test]
+    fn test_emit_test_lt_32_bits() {
+        let (mut asm, mut cb) = setup_asm();
+
+        asm.test(Opnd::Reg(RAX_REG), Opnd::UImm(0xFF));
+        asm.compile_with_num_regs(&mut cb, 0);
+
+        assert_eq!(format!("{:x}", cb), "f6c0ff");
+    }
+
+    #[test]
+    fn test_emit_test_gt_32_bits() {
+        let (mut asm, mut cb) = setup_asm();
+
+        asm.test(Opnd::Reg(RAX_REG), Opnd::UImm(0xFFFF_FFFF_FFFF));
+        asm.compile_with_num_regs(&mut cb, 0);
+
+        assert_eq!(format!("{:x}", cb), "49bbffffffffffff00004c85d8");
+    }
+
+    #[test]
+    #[ignore]
+    fn test_emit_xor_lt_32_bits() {
+        let (mut asm, mut cb) = setup_asm();
+
+        let _ = asm.xor(Opnd::Reg(RAX_REG), Opnd::UImm(0xFF));
+        asm.compile_with_num_regs(&mut cb, 1);
+
+        assert_eq!(format!("{:x}", cb), "4889c04881f0ff000000");
+    }
+
+    #[test]
+    #[ignore]
+    fn test_emit_xor_gt_32_bits() {
+        let (mut asm, mut cb) = setup_asm();
+
+        let _ = asm.xor(Opnd::Reg(RAX_REG), Opnd::UImm(0xFFFF_FFFF_FFFF));
+        asm.compile_with_num_regs(&mut cb, 1);
+
+        assert_eq!(format!("{:x}", cb), "4889c049bbffffffffffff00004c31d8");
+    }
+
+    #[test]
+    fn test_merge_lea_reg() {
+        let (mut asm, mut cb) = setup_asm();
+
+        let sp = asm.lea(Opnd::mem(64, SP, 8));
+        asm.mov(SP, sp); // should be merged to lea
+        asm.compile_with_num_regs(&mut cb, 1);
+
+        assert_disasm!(cb, "488d5b08", {"
+            0x0: lea rbx, [rbx + 8]
+        "});
+    }
+
+    #[test]
+    #[ignore]
+    fn test_merge_lea_mem() {
+        let (mut asm, mut cb) = setup_asm();
+
+        let sp = asm.lea(Opnd::mem(64, SP, 8));
+        asm.mov(Opnd::mem(64, SP, 0), sp); // should NOT be merged to lea
+        asm.compile_with_num_regs(&mut cb, 1);
+
+        assert_disasm!(cb, "488d4308488903", {"
+            0x0: lea rax, [rbx + 8]
+            0x4: mov qword ptr [rbx], rax
+        "});
+    }
+
+    #[test]
+    #[ignore]
+    fn test_replace_cmp_0() {
+        let (mut asm, mut cb) = setup_asm();
+
+        let val = asm.load(Opnd::mem(64, SP, 8));
+        asm.cmp(val, 0.into());
+        let result = asm.csel_e(Qtrue.into(), Qfalse.into());
+        asm.mov(Opnd::Reg(RAX_REG), result);
+        asm.compile_with_num_regs(&mut cb, 2);
+
+        assert_eq!(format!("{:x}", cb), "488b43084885c0b814000000b900000000480f45c14889c0");
+    }
+
+    #[test]
+    fn test_merge_add_mov() {
+        let (mut asm, mut cb) = setup_asm();
+
+        let sp = asm.add(CFP, Opnd::UImm(0x40));
+        asm.mov(CFP, sp); // should be merged to add
+        asm.compile_with_num_regs(&mut cb, 1);
+
+        assert_eq!(format!("{:x}", cb), "4983c540");
+    }
+
+    #[test]
+    fn test_merge_sub_mov() {
+        let (mut asm, mut cb) = setup_asm();
+
+        let sp = asm.sub(CFP, Opnd::UImm(0x40));
+        asm.mov(CFP, sp); // should be merged to add
+        asm.compile_with_num_regs(&mut cb, 1);
+
+        assert_eq!(format!("{:x}", cb), "4983ed40");
+    }
+
+    #[test]
+    fn test_merge_and_mov() {
+        let (mut asm, mut cb) = setup_asm();
+
+        let sp = asm.and(CFP, Opnd::UImm(0x40));
+        asm.mov(CFP, sp); // should be merged to add
+        asm.compile_with_num_regs(&mut cb, 1);
+
+        assert_eq!(format!("{:x}", cb), "4983e540");
+    }
+
+    #[test]
+    fn test_merge_or_mov() {
+        let (mut asm, mut cb) = setup_asm();
+
+        let sp = asm.or(CFP, Opnd::UImm(0x40));
+        asm.mov(CFP, sp); // should be merged to add
+        asm.compile_with_num_regs(&mut cb, 1);
+
+        assert_eq!(format!("{:x}", cb), "4983cd40");
+    }
+
+    #[test]
+    fn test_merge_xor_mov() {
+        let (mut asm, mut cb) = setup_asm();
+
+        let sp = asm.xor(CFP, Opnd::UImm(0x40));
+        asm.mov(CFP, sp); // should be merged to add
+        asm.compile_with_num_regs(&mut cb, 1);
+
+        assert_eq!(format!("{:x}", cb), "4983f540");
+    }
+
+    #[test]
+    fn test_reorder_c_args_no_cycle() {
+        let (mut asm, mut cb) = setup_asm();
+
+        asm.ccall(0 as _, vec![
+            C_ARG_OPNDS[0], // mov rdi, rdi (optimized away)
+            C_ARG_OPNDS[1], // mov rsi, rsi (optimized away)
+        ]);
+        asm.compile_with_num_regs(&mut cb, 0);
+
+        assert_disasm!(cb, "b800000000ffd0", {"
+            0x0: mov eax, 0
+            0x5: call rax
+        "});
+    }
+
+    #[test]
+    fn test_reorder_c_args_single_cycle() {
+        let (mut asm, mut cb) = setup_asm();
+
+        // rdi and rsi form a cycle
+        asm.ccall(0 as _, vec![
+            C_ARG_OPNDS[1], // mov rdi, rsi
+            C_ARG_OPNDS[0], // mov rsi, rdi
+            C_ARG_OPNDS[2], // mov rdx, rdx (optimized away)
+        ]);
+        asm.compile_with_num_regs(&mut cb, 0);
+
+        assert_disasm!(cb, "4989f34889fe4c89dfb800000000ffd0", {"
+            0x0: mov r11, rsi
+            0x3: mov rsi, rdi
+            0x6: mov rdi, r11
+            0x9: mov eax, 0
+            0xe: call rax
+        "});
+    }
+
+    #[test]
+    fn test_reorder_c_args_two_cycles() {
+        let (mut asm, mut cb) = setup_asm();
+
+        // rdi and rsi form a cycle, and rdx and rcx form another cycle
+        asm.ccall(0 as _, vec![
+            C_ARG_OPNDS[1], // mov rdi, rsi
+            C_ARG_OPNDS[0], // mov rsi, rdi
+            C_ARG_OPNDS[3], // mov rdx, rcx
+            C_ARG_OPNDS[2], // mov rcx, rdx
+        ]);
+        asm.compile_with_num_regs(&mut cb, 0);
+
+        assert_disasm!(cb, "4989f34889fe4c89df4989cb4889d14c89dab800000000ffd0", {"
+            0x0: mov r11, rsi
+            0x3: mov rsi, rdi
+            0x6: mov rdi, r11
+            0x9: mov r11, rcx
+            0xc: mov rcx, rdx
+            0xf: mov rdx, r11
+            0x12: mov eax, 0
+            0x17: call rax
+        "});
+    }
+
+    #[test]
+    fn test_reorder_c_args_large_cycle() {
+        let (mut asm, mut cb) = setup_asm();
+
+        // rdi, rsi, and rdx form a cycle
+        asm.ccall(0 as _, vec![
+            C_ARG_OPNDS[1], // mov rdi, rsi
+            C_ARG_OPNDS[2], // mov rsi, rdx
+            C_ARG_OPNDS[0], // mov rdx, rdi
+        ]);
+        asm.compile_with_num_regs(&mut cb, 0);
+
+        assert_disasm!(cb, "4989f34889d64889fa4c89dfb800000000ffd0", {"
+            0x0: mov r11, rsi
+            0x3: mov rsi, rdx
+            0x6: mov rdx, rdi
+            0x9: mov rdi, r11
+            0xc: mov eax, 0
+            0x11: call rax
+        "});
+    }
+
+    #[test]
+    #[ignore]
+    fn test_reorder_c_args_with_insn_out() {
+        let (mut asm, mut cb) = setup_asm();
+
+        let rax = asm.load(Opnd::UImm(1));
+        let rcx = asm.load(Opnd::UImm(2));
+        let rdx = asm.load(Opnd::UImm(3));
+        // rcx and rdx form a cycle
+        asm.ccall(0 as _, vec![
+            rax, // mov rdi, rax
+            rcx, // mov rsi, rcx
+            rcx, // mov rdx, rcx
+            rdx, // mov rcx, rdx
+        ]);
+        asm.compile_with_num_regs(&mut cb, 3);
+
+        assert_disasm!(cb, "b801000000b902000000ba030000004889c74889ce4989cb4889d14c89dab800000000ffd0", {"
+            0x0: mov eax, 1
+            0x5: mov ecx, 2
+            0xa: mov edx, 3
+            0xf: mov rdi, rax
+            0x12: mov rsi, rcx
+            0x15: mov r11, rcx
+            0x18: mov rcx, rdx
+            0x1b: mov rdx, r11
+            0x1e: mov eax, 0
+            0x23: call rax
+        "});
+    }
+
+    #[test]
+    fn test_cmov_mem() {
+        let (mut asm, mut cb) = setup_asm();
+
+        let top = Opnd::mem(64, SP, 0);
+        let ary_opnd = SP;
+        let array_len_opnd = Opnd::mem(64, SP, 16);
+
+        asm.cmp(array_len_opnd, 1.into());
+        let elem_opnd = asm.csel_g(Opnd::mem(64, ary_opnd, 0), Qnil.into());
+        asm.mov(top, elem_opnd);
+
+        asm.compile_with_num_regs(&mut cb, 1);
+
+        assert_disasm!(cb, "48837b1001bf04000000480f4f3b48893b", {"
+            0x0: cmp qword ptr [rbx + 0x10], 1
+            0x5: mov edi, 4
+            0xa: cmovg rdi, qword ptr [rbx]
+            0xe: mov qword ptr [rbx], rdi
+        "});
+    }
+
+    #[test]
+    #[ignore]
+    fn test_csel_split() {
+        let (mut asm, mut cb) = setup_asm();
+
+        let stack_top = Opnd::mem(64, SP, 0);
+        let elem_opnd = asm.csel_ne(VALUE(0x7f22c88d1930).into(), Qnil.into());
+        asm.mov(stack_top, elem_opnd);
+
+        asm.compile_with_num_regs(&mut cb, 3);
+
+        assert_disasm!(cb, "48b830198dc8227f0000b904000000480f44c1488903", {"
+            0x0: movabs rax, 0x7f22c88d1930
+            0xa: mov ecx, 4
+            0xf: cmove rax, rcx
+            0x13: mov qword ptr [rbx], rax
+        "});
+    }
+
+    #[test]
+    fn test_mov_m32_imm32() {
+        let (mut asm, mut cb) = setup_asm();
+
+        let shape_opnd = Opnd::mem(32, C_RET_OPND, 0);
+        asm.mov(shape_opnd, Opnd::UImm(0x8000_0001));
+        asm.mov(shape_opnd, Opnd::Imm(0x8000_0001));
+
+        asm.compile_with_num_regs(&mut cb, 0);
+        assert_disasm!(cb, "c70001000080c70001000080", {"
+            0x0: mov dword ptr [rax], 0x80000001
+            0x6: mov dword ptr [rax], 0x80000001
+        "});
+    }
+}
diff --git a/zjit/src/bitset.rs b/zjit/src/bitset.rs
new file mode 100644
index 00000000000000..895bac8e33232a
--- /dev/null
+++ b/zjit/src/bitset.rs
@@ -0,0 +1,124 @@
+type Entry = u128;
+
+const ENTRY_NUM_BITS: usize = Entry::BITS as usize;
+
+// TODO(max): Make a `SmallBitSet` and `LargeBitSet` and switch between them if `num_bits` fits in
+// `Entry`.
+#[derive(Clone)]
+pub struct BitSet<T: Into<usize> + Copy> {
+    entries: Vec<Entry>,
+    num_bits: usize,
+    phantom: std::marker::PhantomData<T>,
+}
+
+impl<T: Into<usize> + Copy> BitSet<T> {
+    pub fn with_capacity(num_bits: usize) -> Self {
+        let num_entries = num_bits.div_ceil(ENTRY_NUM_BITS);
+        Self { entries: vec![0; num_entries], num_bits, phantom: Default::default() }
+    }
+
+    /// Returns whether the value was newly inserted: true if the set did not originally contain
+    /// the bit, and false otherwise.
+    pub fn insert(&mut self, idx: T) -> bool {
+        debug_assert!(idx.into() < self.num_bits);
+        let entry_idx = idx.into() / ENTRY_NUM_BITS;
+        let bit_idx = idx.into() % ENTRY_NUM_BITS;
+        let newly_inserted = (self.entries[entry_idx] & (1 << bit_idx)) == 0;
+        self.entries[entry_idx] |= 1 << bit_idx;
+        newly_inserted
+    }
+
+    /// Set all bits to 1.
+    pub fn insert_all(&mut self) {
+        for i in 0..self.entries.len() {
+            self.entries[i] = !0;
+        }
+    }
+
+    pub fn get(&self, idx: T) -> bool {
+        debug_assert!(idx.into() < self.num_bits);
+        let entry_idx = idx.into() / ENTRY_NUM_BITS;
+        let bit_idx = idx.into() % ENTRY_NUM_BITS;
+        (self.entries[entry_idx] & (1 << bit_idx)) != 0
+    }
+
+    /// Modify `self` to only have bits set if they are also set in `other`. Returns true if `self`
+    /// was modified, and false otherwise.
+    /// `self` and `other` must have the same number of bits.
+    pub fn intersect_with(&mut self, other: &Self) -> bool {
+        assert_eq!(self.num_bits, other.num_bits);
+        let mut changed = false;
+        for i in 0..self.entries.len() {
+            let before = self.entries[i];
+            self.entries[i] &= other.entries[i];
+            changed |= self.entries[i] != before;
+        }
+        changed
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::BitSet;
+
+    #[test]
+    #[should_panic]
+    fn get_over_capacity_panics() {
+        let set = BitSet::with_capacity(0);
+        assert_eq!(set.get(0usize), false);
+    }
+
+    #[test]
+    fn with_capacity_defaults_to_zero() {
+        let set = BitSet::with_capacity(4);
+        assert_eq!(set.get(0usize), false);
+        assert_eq!(set.get(1usize), false);
+        assert_eq!(set.get(2usize), false);
+        assert_eq!(set.get(3usize), false);
+    }
+
+    #[test]
+    fn insert_sets_bit() {
+        let mut set = BitSet::with_capacity(4);
+        assert_eq!(set.insert(1usize), true);
+        assert_eq!(set.get(1usize), true);
+    }
+
+    #[test]
+    fn insert_with_set_bit_returns_false() {
+        let mut set = BitSet::with_capacity(4);
+        assert_eq!(set.insert(1usize), true);
+        assert_eq!(set.insert(1usize), false);
+    }
+
+    #[test]
+    fn insert_all_sets_all_bits() {
+        let mut set = BitSet::with_capacity(4);
+        set.insert_all();
+        assert_eq!(set.get(0usize), true);
+        assert_eq!(set.get(1usize), true);
+        assert_eq!(set.get(2usize), true);
+        assert_eq!(set.get(3usize), true);
+    }
+
+    #[test]
+    #[should_panic]
+    fn intersect_with_panics_with_different_num_bits() {
+        let mut left: BitSet<usize> = BitSet::with_capacity(3);
+        let right = BitSet::with_capacity(4);
+        left.intersect_with(&right);
+    }
+    #[test]
+    fn intersect_with_keeps_only_common_bits() {
+        let mut left = BitSet::with_capacity(3);
+        let mut right = BitSet::with_capacity(3);
+        left.insert(0usize);
+        left.insert(1usize);
+        right.insert(1usize);
+        right.insert(2usize);
+        left.intersect_with(&right);
+        assert_eq!(left.get(0usize), false);
+        assert_eq!(left.get(1usize), true);
+        assert_eq!(left.get(2usize), false);
+    }
+}
diff --git a/zjit/src/cast.rs b/zjit/src/cast.rs
new file mode 100644
index 00000000000000..bacc7245f378a9
--- /dev/null
+++ b/zjit/src/cast.rs
@@ -0,0 +1,60 @@
+/// Trait for casting to [usize] that allows you to say `.as_usize()`.
+/// Implementation conditional on the cast preserving the numeric value on
+/// all inputs and being inexpensive.
+///
+/// [usize] is only guaranteed to be more than 16-bit wide, so we can't use
+/// `.into()` to cast an `u32` or an `u64` to a `usize` even though in all
+/// the platforms we support these casts are pretty much no-ops.
+/// We could say `as usize` or `.try_convert().unwrap()` everywhere for these
+/// casts but both options have undesirable consequences if and when we decide to
+/// support 32-bit platforms. Unfortunately we can't implement [::core::convert::From]
+/// for [usize] since both the trait and the type are external. Also, naming
+/// the method `into()` also causes a name conflict.
+pub(crate) trait IntoUsize {
+    /// Convert to usize. Implementation conditional on width of [usize].
+    fn as_usize(self) -> usize;
+}
+
+#[cfg(target_pointer_width = "64")]
+impl IntoUsize for u64 {
+    fn as_usize(self) -> usize {
+        self as usize
+    }
+}
+
+#[cfg(target_pointer_width = "64")]
+impl IntoUsize for u32 {
+    fn as_usize(self) -> usize {
+        self as usize
+    }
+}
+
+impl IntoUsize for u16 {
+    /// Alias for `.into()`. For convenience so you could use the trait for
+    /// all unsgined types.
+    fn as_usize(self) -> usize {
+        self.into()
+    }
+}
+
+impl IntoUsize for u8 {
+    /// Alias for `.into()`. For convenience so you could use the trait for
+    /// all unsgined types.
+    fn as_usize(self) -> usize {
+        self.into()
+    }
+}
+
+/// The `Into<u64>` Rust does not provide.
+/// Convert to u64 with assurance that the value is preserved.
+/// Currently, `usize::BITS == 64` holds for all platforms we support.
+pub(crate) trait IntoU64 {
+    fn as_u64(self) -> u64;
+}
+
+#[cfg(target_pointer_width = "64")]
+impl IntoU64 for usize {
+    fn as_u64(self) -> u64 {
+        self as u64
+    }
+}
diff --git a/zjit/src/codegen.rs b/zjit/src/codegen.rs
new file mode 100644
index 00000000000000..79460ccdfb249b
--- /dev/null
+++ b/zjit/src/codegen.rs
@@ -0,0 +1,1244 @@
+use std::cell::Cell;
+use std::rc::Rc;
+
+use crate::asm::Label;
+use crate::backend::current::{Reg, ALLOC_REGS};
+use crate::invariants::track_bop_assumption;
+use crate::gc::get_or_create_iseq_payload;
+use crate::state::ZJITState;
+use crate::{asm::CodeBlock, cruby::*, options::debug, virtualmem::CodePtr};
+use crate::backend::lir::{self, asm_comment, Assembler, Opnd, Target, CFP, C_ARG_OPNDS, C_RET_OPND, EC, NATIVE_STACK_PTR, SP};
+use crate::hir::{iseq_to_hir, Block, BlockId, BranchEdge, CallInfo, Invariant, RangeType, SideExitReason, SideExitReason::*, SpecialObjectType, SELF_PARAM_IDX};
+use crate::hir::{Const, FrameState, Function, Insn, InsnId};
+use crate::hir_type::{types::Fixnum, Type};
+use crate::options::get_option;
+
+/// Ephemeral code generation state
+struct JITState {
+    /// Instruction sequence for the method being compiled
+    iseq: IseqPtr,
+
+    /// Low-level IR Operands indexed by High-level IR's Instruction ID
+    opnds: Vec<Option<Opnd>>,
+
+    /// Labels for each basic block indexed by the BlockId
+    labels: Vec<Option<Target>>,
+
+    /// Branches to an ISEQ that need to be compiled later
+    branch_iseqs: Vec<(Rc<Branch>, IseqPtr)>,
+
+    /// The number of bytes allocated for basic block arguments spilled onto the C stack
+    c_stack_bytes: usize,
+}
+
+impl JITState {
+    /// Create a new JITState instance
+    fn new(iseq: IseqPtr, num_insns: usize, num_blocks: usize, c_stack_bytes: usize) -> Self {
+        JITState {
+            iseq,
+            opnds: vec![None; num_insns],
+            labels: vec![None; num_blocks],
+            branch_iseqs: Vec::default(),
+            c_stack_bytes,
+        }
+    }
+
+    /// Retrieve the output of a given instruction that has been compiled
+    fn get_opnd(&self, insn_id: InsnId) -> Option<lir::Opnd> {
+        let opnd = self.opnds[insn_id.0];
+        if opnd.is_none() {
+            debug!("Failed to get_opnd({insn_id})");
+        }
+        opnd
+    }
+
+    /// Find or create a label for a given BlockId
+    fn get_label(&mut self, asm: &mut Assembler, block_id: BlockId) -> Target {
+        match &self.labels[block_id.0] {
+            Some(label) => label.clone(),
+            None => {
+                let label = asm.new_label(&format!("{block_id}"));
+                self.labels[block_id.0] = Some(label.clone());
+                label
+            }
+        }
+    }
+}
+
+/// CRuby API to compile a given ISEQ
+#[unsafe(no_mangle)]
+pub extern "C" fn rb_zjit_iseq_gen_entry_point(iseq: IseqPtr, _ec: EcPtr) -> *const u8 {
+    // Do not test the JIT code in HIR tests
+    if cfg!(test) {
+        return std::ptr::null();
+    }
+
+    // Reject ISEQs with very large temp stacks.
+    // We cannot encode too large offsets to access locals in arm64.
+    let stack_max = unsafe { rb_get_iseq_body_stack_max(iseq) };
+    if stack_max >= i8::MAX as u32 {
+        debug!("ISEQ stack too large: {stack_max}");
+        return std::ptr::null();
+    }
+
+    // Take a lock to avoid writing to ISEQ in parallel with Ractors.
+    // with_vm_lock() does nothing if the program doesn't use Ractors.
+    let code_ptr = with_vm_lock(src_loc!(), || {
+        gen_iseq_entry_point(iseq)
+    });
+
+    // Assert that the ISEQ compiles if RubyVM::ZJIT.assert_compiles is enabled
+    if ZJITState::assert_compiles_enabled() && code_ptr.is_null() {
+        let iseq_location = iseq_get_location(iseq, 0);
+        panic!("Failed to compile: {iseq_location}");
+    }
+
+    code_ptr
+}
+
+/// Compile an entry point for a given ISEQ
+fn gen_iseq_entry_point(iseq: IseqPtr) -> *const u8 {
+    // Compile ISEQ into High-level IR
+    let function = match compile_iseq(iseq) {
+        Some(function) => function,
+        None => return std::ptr::null(),
+    };
+
+    // Compile the High-level IR
+    let cb = ZJITState::get_code_block();
+    let (start_ptr, mut branch_iseqs) = match gen_function(cb, iseq, &function) {
+        Some((start_ptr, gc_offsets, branch_iseqs)) => {
+            // Remember the block address to reuse it later
+            let payload = get_or_create_iseq_payload(iseq);
+            payload.start_ptr = Some(start_ptr);
+            payload.gc_offsets.extend(gc_offsets);
+
+            // Compile an entry point to the JIT code
+            (gen_entry(cb, iseq, &function, start_ptr), branch_iseqs)
+        },
+        None => (None, vec![]),
+    };
+
+    // Recursively compile callee ISEQs
+    while let Some((branch, iseq)) = branch_iseqs.pop() {
+        // Disable profiling. This will be the last use of the profiling information for the ISEQ.
+        unsafe { rb_zjit_profile_disable(iseq); }
+
+        // Compile the ISEQ
+        if let Some((callee_ptr, callee_branch_iseqs)) = gen_iseq(cb, iseq) {
+            let callee_addr = callee_ptr.raw_ptr(cb);
+            branch.regenerate(cb, |asm| {
+                asm.ccall(callee_addr, vec![]);
+            });
+            branch_iseqs.extend(callee_branch_iseqs);
+        } else {
+            // Failed to compile the callee. Bail out of compiling this graph of ISEQs.
+            return std::ptr::null();
+        }
+    }
+
+    // Always mark the code region executable if asm.compile() has been used
+    cb.mark_all_executable();
+
+    // Return a JIT code address or a null pointer
+    start_ptr.map(|start_ptr| start_ptr.raw_ptr(cb)).unwrap_or(std::ptr::null())
+}
+
+/// Compile a JIT entry
+fn gen_entry(cb: &mut CodeBlock, iseq: IseqPtr, function: &Function, function_ptr: CodePtr) -> Option<CodePtr> {
+    // Set up registers for CFP, EC, SP, and basic block arguments
+    let mut asm = Assembler::new();
+    gen_entry_prologue(&mut asm, iseq);
+    gen_entry_params(&mut asm, iseq, function.block(BlockId(0)));
+
+    // Jump to the first block using a call instruction
+    asm.ccall(function_ptr.raw_ptr(cb) as *const u8, vec![]);
+
+    // Restore registers for CFP, EC, and SP after use
+    asm_comment!(asm, "exit to the interpreter");
+    // On x86_64, maintain 16-byte stack alignment
+    if cfg!(target_arch = "x86_64") {
+        asm.cpop_into(SP);
+    }
+    asm.cpop_into(SP);
+    asm.cpop_into(EC);
+    asm.cpop_into(CFP);
+    asm.frame_teardown();
+    asm.cret(C_RET_OPND);
+
+    asm.compile(cb).map(|(start_ptr, _)| start_ptr)
+}
+
+/// Compile an ISEQ into machine code
+fn gen_iseq(cb: &mut CodeBlock, iseq: IseqPtr) -> Option<(CodePtr, Vec<(Rc<Branch>, IseqPtr)>)> {
+    // Return an existing pointer if it's already compiled
+    let payload = get_or_create_iseq_payload(iseq);
+    if let Some(start_ptr) = payload.start_ptr {
+        return Some((start_ptr, vec![]));
+    }
+
+    // Convert ISEQ into High-level IR and optimize HIR
+    let function = match compile_iseq(iseq) {
+        Some(function) => function,
+        None => return None,
+    };
+
+    // Compile the High-level IR
+    let result = gen_function(cb, iseq, &function);
+    if let Some((start_ptr, gc_offsets, branch_iseqs)) = result {
+        payload.start_ptr = Some(start_ptr);
+        payload.gc_offsets.extend(gc_offsets);
+        Some((start_ptr, branch_iseqs))
+    } else {
+        None
+    }
+}
+
+/// Compile a function
+fn gen_function(cb: &mut CodeBlock, iseq: IseqPtr, function: &Function) -> Option<(CodePtr, Vec<CodePtr>, Vec<(Rc<Branch>, IseqPtr)>)> {
+    let c_stack_bytes = aligned_stack_bytes(max_num_params(function).saturating_sub(ALLOC_REGS.len()));
+    let mut jit = JITState::new(iseq, function.num_insns(), function.num_blocks(), c_stack_bytes);
+    let mut asm = Assembler::new();
+
+    // Compile each basic block
+    let reverse_post_order = function.rpo();
+    for &block_id in reverse_post_order.iter() {
+        let block = function.block(block_id);
+        asm_comment!(asm, "Block: {block_id}({})", block.params().map(|param| format!("{param}")).collect::<Vec<_>>().join(", "));
+
+        // Write a label to jump to the basic block
+        let label = jit.get_label(&mut asm, block_id);
+        asm.write_label(label);
+
+        // Set up the frame at the first block
+        if block_id == BlockId(0) {
+            asm.frame_setup();
+
+            // Bump the C stack pointer for basic block arguments
+            if jit.c_stack_bytes > 0 {
+                asm_comment!(asm, "bump C stack pointer");
+                let new_sp = asm.sub(NATIVE_STACK_PTR, jit.c_stack_bytes.into());
+                asm.mov(NATIVE_STACK_PTR, new_sp);
+            }
+        }
+
+        // Compile all parameters
+        for &insn_id in block.params() {
+            match function.find(insn_id) {
+                Insn::Param { idx } => {
+                    jit.opnds[insn_id.0] = Some(gen_param(&mut asm, idx));
+                },
+                insn => unreachable!("Non-param insn found in block.params: {insn:?}"),
+            }
+        }
+
+        // Compile all instructions
+        for &insn_id in block.insns() {
+            let insn = function.find(insn_id);
+            if gen_insn(cb, &mut jit, &mut asm, function, insn_id, &insn).is_none() {
+                debug!("Failed to compile insn: {insn_id} {insn}");
+                return None;
+            }
+        }
+        // Make sure the last patch point has enough space to insert a jump
+        asm.pad_patch_point();
+    }
+
+    if get_option!(dump_lir) {
+        println!("LIR:\nfn {}:\n{:?}", iseq_name(iseq), asm);
+    }
+
+    // Generate code if everything can be compiled
+    asm.compile(cb).map(|(start_ptr, gc_offsets)| (start_ptr, gc_offsets, jit.branch_iseqs))
+}
+
+/// Compile an instruction
+fn gen_insn(cb: &mut CodeBlock, jit: &mut JITState, asm: &mut Assembler, function: &Function, insn_id: InsnId, insn: &Insn) -> Option<()> {
+    // Convert InsnId to lir::Opnd
+    macro_rules! opnd {
+        ($insn_id:ident) => {
+            jit.get_opnd(*$insn_id)?
+        };
+    }
+
+    macro_rules! opnds {
+        ($insn_ids:ident) => {
+            {
+                Option::from_iter($insn_ids.iter().map(|insn_id| jit.get_opnd(*insn_id)))?
+            }
+        };
+    }
+
+    if !matches!(*insn, Insn::Snapshot { .. }) {
+        asm_comment!(asm, "Insn: {insn_id} {insn}");
+    }
+
+    let out_opnd = match insn {
+        Insn::Const { val: Const::Value(val) } => gen_const(*val),
+        Insn::NewArray { elements, state } => gen_new_array(asm, opnds!(elements), &function.frame_state(*state)),
+        Insn::NewRange { low, high, flag, state } => gen_new_range(asm, opnd!(low), opnd!(high), *flag, &function.frame_state(*state)),
+        Insn::ArrayDup { val, state } => gen_array_dup(asm, opnd!(val), &function.frame_state(*state)),
+        Insn::StringCopy { val, chilled } => gen_string_copy(asm, opnd!(val), *chilled),
+        Insn::Param { idx } => unreachable!("block.insns should not have Insn::Param({idx})"),
+        Insn::Snapshot { .. } => return Some(()), // we don't need to do anything for this instruction at the moment
+        Insn::Jump(branch) => return gen_jump(jit, asm, branch),
+        Insn::IfTrue { val, target } => return gen_if_true(jit, asm, opnd!(val), target),
+        Insn::IfFalse { val, target } => return gen_if_false(jit, asm, opnd!(val), target),
+        Insn::SendWithoutBlock { call_info, cd, state, self_val, args, .. } => gen_send_without_block(jit, asm, call_info, *cd, &function.frame_state(*state), opnd!(self_val), opnds!(args))?,
+        Insn::SendWithoutBlockDirect { cme, iseq, self_val, args, state, .. } => gen_send_without_block_direct(cb, jit, asm, *cme, *iseq, opnd!(self_val), opnds!(args), &function.frame_state(*state))?,
+        Insn::InvokeBuiltin { bf, args, state } => gen_invokebuiltin(asm, &function.frame_state(*state), bf, opnds!(args))?,
+        Insn::Return { val } => return Some(gen_return(jit, asm, opnd!(val))?),
+        Insn::FixnumAdd { left, right, state } => gen_fixnum_add(jit, asm, opnd!(left), opnd!(right), &function.frame_state(*state))?,
+        Insn::FixnumSub { left, right, state } => gen_fixnum_sub(jit, asm, opnd!(left), opnd!(right), &function.frame_state(*state))?,
+        Insn::FixnumMult { left, right, state } => gen_fixnum_mult(jit, asm, opnd!(left), opnd!(right), &function.frame_state(*state))?,
+        Insn::FixnumEq { left, right } => gen_fixnum_eq(asm, opnd!(left), opnd!(right))?,
+        Insn::FixnumNeq { left, right } => gen_fixnum_neq(asm, opnd!(left), opnd!(right))?,
+        Insn::FixnumLt { left, right } => gen_fixnum_lt(asm, opnd!(left), opnd!(right))?,
+        Insn::FixnumLe { left, right } => gen_fixnum_le(asm, opnd!(left), opnd!(right))?,
+        Insn::FixnumGt { left, right } => gen_fixnum_gt(asm, opnd!(left), opnd!(right))?,
+        Insn::FixnumGe { left, right } => gen_fixnum_ge(asm, opnd!(left), opnd!(right))?,
+        Insn::FixnumAnd { left, right } => gen_fixnum_and(asm, opnd!(left), opnd!(right))?,
+        Insn::FixnumOr { left, right } => gen_fixnum_or(asm, opnd!(left), opnd!(right))?,
+        Insn::IsNil { val } => gen_isnil(asm, opnd!(val))?,
+        Insn::Test { val } => gen_test(asm, opnd!(val))?,
+        Insn::GuardType { val, guard_type, state } => gen_guard_type(jit, asm, opnd!(val), *guard_type, &function.frame_state(*state))?,
+        Insn::GuardBitEquals { val, expected, state } => gen_guard_bit_equals(jit, asm, opnd!(val), *expected, &function.frame_state(*state))?,
+        Insn::PatchPoint { invariant, state } => return gen_patch_point(jit, asm, invariant, &function.frame_state(*state)),
+        Insn::CCall { cfun, args, name: _, return_type: _, elidable: _ } => gen_ccall(asm, *cfun, opnds!(args))?,
+        Insn::GetIvar { self_val, id, state: _ } => gen_getivar(asm, opnd!(self_val), *id),
+        Insn::SetGlobal { id, val, state: _ } => return Some(gen_setglobal(asm, *id, opnd!(val))),
+        Insn::GetGlobal { id, state: _ } => gen_getglobal(asm, *id),
+        &Insn::GetLocal { ep_offset, level } => gen_getlocal_with_ep(asm, ep_offset, level)?,
+        Insn::SetLocal { val, ep_offset, level } => return gen_setlocal_with_ep(asm, opnd!(val), *ep_offset, *level),
+        Insn::GetConstantPath { ic, state } => gen_get_constant_path(asm, *ic, &function.frame_state(*state)),
+        Insn::SetIvar { self_val, id, val, state: _ } => return gen_setivar(asm, opnd!(self_val), *id, opnd!(val)),
+        Insn::SideExit { state, reason } => return gen_side_exit(jit, asm, reason, &function.frame_state(*state)),
+        Insn::PutSpecialObject { value_type } => gen_putspecialobject(asm, *value_type),
+        Insn::AnyToString { val, str, state } => gen_anytostring(asm, opnd!(val), opnd!(str), &function.frame_state(*state))?,
+        Insn::Defined { op_type, obj, pushval, v } => gen_defined(jit, asm, *op_type, *obj, *pushval, opnd!(v))?,
+        _ => {
+            debug!("ZJIT: gen_function: unexpected insn {insn}");
+            return None;
+        }
+    };
+
+    assert!(insn.has_output(), "Cannot write LIR output of HIR instruction with no output: {insn}");
+
+    // If the instruction has an output, remember it in jit.opnds
+    jit.opnds[insn_id.0] = Some(out_opnd);
+
+    Some(())
+}
+
+/// Gets the EP of the ISeq of the containing method, or "local level".
+/// Equivalent of GET_LEP() macro.
+fn gen_get_lep(jit: &JITState, asm: &mut Assembler) -> Opnd {
+    // Equivalent of get_lvar_level() in compile.c
+    fn get_lvar_level(mut iseq: IseqPtr) -> u32 {
+        let local_iseq = unsafe { rb_get_iseq_body_local_iseq(iseq) };
+        let mut level = 0;
+        while iseq != local_iseq {
+            iseq = unsafe { rb_get_iseq_body_parent_iseq(iseq) };
+            level += 1;
+        }
+
+        level
+    }
+
+    let level = get_lvar_level(jit.iseq);
+    gen_get_ep(asm, level)
+}
+
+// Get EP at `level` from CFP
+fn gen_get_ep(asm: &mut Assembler, level: u32) -> Opnd {
+    // Load environment pointer EP from CFP into a register
+    let ep_opnd = Opnd::mem(64, CFP, RUBY_OFFSET_CFP_EP);
+    let mut ep_opnd = asm.load(ep_opnd);
+
+    for _ in 0..level {
+        // Get the previous EP from the current EP
+        // See GET_PREV_EP(ep) macro
+        // VALUE *prev_ep = ((VALUE *)((ep)[VM_ENV_DATA_INDEX_SPECVAL] & ~0x03))
+        const UNTAGGING_MASK: Opnd = Opnd::Imm(!0x03);
+        let offset = SIZEOF_VALUE_I32 * VM_ENV_DATA_INDEX_SPECVAL;
+        ep_opnd = asm.load(Opnd::mem(64, ep_opnd, offset));
+        ep_opnd = asm.and(ep_opnd, UNTAGGING_MASK);
+    }
+
+    ep_opnd
+}
+
+fn gen_defined(jit: &JITState, asm: &mut Assembler, op_type: usize, _obj: VALUE, pushval: VALUE, _tested_value: Opnd) -> Option<Opnd> {
+    match op_type as defined_type {
+        DEFINED_YIELD => {
+            // `yield` goes to the block handler stowed in the "local" iseq which is
+            // the current iseq or a parent. Only the "method" iseq type can be passed a
+            // block handler. (e.g. `yield` in the top level script is a syntax error.)
+            let local_iseq = unsafe { rb_get_iseq_body_local_iseq(jit.iseq) };
+            if unsafe { rb_get_iseq_body_type(local_iseq) } == ISEQ_TYPE_METHOD {
+                let lep = gen_get_lep(jit, asm);
+                let block_handler = asm.load(Opnd::mem(64, lep, SIZEOF_VALUE_I32 * VM_ENV_DATA_INDEX_SPECVAL));
+                let pushval = asm.load(pushval.into());
+                asm.cmp(block_handler, VM_BLOCK_HANDLER_NONE.into());
+                Some(asm.csel_e(Qnil.into(), pushval.into()))
+            } else {
+                Some(Qnil.into())
+            }
+        }
+        _ => None
+    }
+}
+
+/// Get a local variable from a higher scope or the heap. `local_ep_offset` is in number of VALUEs.
+/// We generate this instruction with level=0 only when the local variable is on the heap, so we
+/// can't optimize the level=0 case using the SP register.
+fn gen_getlocal_with_ep(asm: &mut Assembler, local_ep_offset: u32, level: u32) -> Option<lir::Opnd> {
+    let ep = gen_get_ep(asm, level);
+    let offset = -(SIZEOF_VALUE_I32 * i32::try_from(local_ep_offset).ok()?);
+    Some(asm.load(Opnd::mem(64, ep, offset)))
+}
+
+/// Set a local variable from a higher scope or the heap. `local_ep_offset` is in number of VALUEs.
+/// We generate this instruction with level=0 only when the local variable is on the heap, so we
+/// can't optimize the level=0 case using the SP register.
+fn gen_setlocal_with_ep(asm: &mut Assembler, val: Opnd, local_ep_offset: u32, level: u32) -> Option<()> {
+    let ep = gen_get_ep(asm, level);
+    let offset = -(SIZEOF_VALUE_I32 * i32::try_from(local_ep_offset).ok()?);
+    asm.mov(Opnd::mem(64, ep, offset), val);
+    Some(())
+}
+
+fn gen_get_constant_path(asm: &mut Assembler, ic: *const iseq_inline_constant_cache, state: &FrameState) -> Opnd {
+    unsafe extern "C" {
+        fn rb_vm_opt_getconstant_path(ec: EcPtr, cfp: CfpPtr, ic: *const iseq_inline_constant_cache) -> VALUE;
+    }
+
+    // Save PC since the call can allocate an IC
+    gen_save_pc(asm, state);
+
+    let val = asm.ccall(
+        rb_vm_opt_getconstant_path as *const u8,
+        vec![EC, CFP, Opnd::const_ptr(ic as *const u8)],
+    );
+    val
+}
+
+fn gen_invokebuiltin(asm: &mut Assembler, state: &FrameState, bf: &rb_builtin_function, args: Vec<Opnd>) -> Option<lir::Opnd> {
+    // Ensure we have enough room fit ec, self, and arguments
+    // TODO remove this check when we have stack args (we can use Time.new to test it)
+    if bf.argc + 2 > (C_ARG_OPNDS.len() as i32) {
+        return None;
+    }
+
+    gen_save_pc(asm, state);
+
+    let mut cargs = vec![EC];
+    cargs.extend(args);
+
+    let val = asm.ccall(bf.func_ptr as *const u8, cargs);
+
+    Some(val)
+}
+
+/// Record a patch point that should be invalidated on a given invariant
+fn gen_patch_point(jit: &mut JITState, asm: &mut Assembler, invariant: &Invariant, state: &FrameState) -> Option<()> {
+    let label = asm.new_label("patch_point").unwrap_label();
+    let invariant = invariant.clone();
+
+    // Compile a side exit. Fill nop instructions if the last patch point is too close.
+    asm.patch_point(build_side_exit(jit, state, PatchPoint(invariant), Some(label))?);
+
+    // Remember the current address as a patch point
+    asm.pos_marker(move |code_ptr, cb| {
+        match invariant {
+            Invariant::BOPRedefined { klass, bop } => {
+                let side_exit_ptr = cb.resolve_label(label);
+                track_bop_assumption(klass, bop, code_ptr, side_exit_ptr);
+            }
+            _ => {
+                debug!("ZJIT: gen_patch_point: unimplemented invariant {invariant:?}");
+                return;
+            }
+        }
+    });
+    Some(())
+}
+
+/// Lowering for [`Insn::CCall`]. This is a low-level raw call that doesn't know
+/// anything about the callee, so handling for e.g. GC safety is dealt with elsewhere.
+fn gen_ccall(asm: &mut Assembler, cfun: *const u8, args: Vec<Opnd>) -> Option<lir::Opnd> {
+    Some(asm.ccall(cfun, args))
+}
+
+/// Emit an uncached instance variable lookup
+fn gen_getivar(asm: &mut Assembler, recv: Opnd, id: ID) -> Opnd {
+    asm_comment!(asm, "call rb_ivar_get");
+    asm.ccall(
+        rb_ivar_get as *const u8,
+        vec![recv, Opnd::UImm(id.0)],
+    )
+}
+
+/// Emit an uncached instance variable store
+fn gen_setivar(asm: &mut Assembler, recv: Opnd, id: ID, val: Opnd) -> Option<()> {
+    asm_comment!(asm, "call rb_ivar_set");
+    asm.ccall(
+        rb_ivar_set as *const u8,
+        vec![recv, Opnd::UImm(id.0), val],
+    );
+    Some(())
+}
+
+/// Look up global variables
+fn gen_getglobal(asm: &mut Assembler, id: ID) -> Opnd {
+    asm_comment!(asm, "call rb_gvar_get");
+    asm.ccall(
+        rb_gvar_get as *const u8,
+        vec![Opnd::UImm(id.0)],
+    )
+}
+
+/// Set global variables
+fn gen_setglobal(asm: &mut Assembler, id: ID, val: Opnd) {
+    asm_comment!(asm, "call rb_gvar_set");
+    asm.ccall(rb_gvar_set as *const u8, vec![Opnd::UImm(id.0), val]);
+}
+
+/// Side-exit into the interpreter
+fn gen_side_exit(jit: &mut JITState, asm: &mut Assembler, reason: &SideExitReason, state: &FrameState) -> Option<()> {
+    asm.jmp(side_exit(jit, state, *reason)?);
+    Some(())
+}
+
+/// Emit a special object lookup
+fn gen_putspecialobject(asm: &mut Assembler, value_type: SpecialObjectType) -> Opnd {
+    // Get the EP of the current CFP and load it into a register
+    let ep_opnd = Opnd::mem(64, CFP, RUBY_OFFSET_CFP_EP);
+    let ep_reg = asm.load(ep_opnd);
+
+    asm_comment!(asm, "call rb_vm_get_special_object");
+    asm.ccall(
+        rb_vm_get_special_object as *const u8,
+        vec![ep_reg, Opnd::UImm(u64::from(value_type))],
+    )
+}
+
+/// Compile an interpreter entry block to be inserted into an ISEQ
+fn gen_entry_prologue(asm: &mut Assembler, iseq: IseqPtr) {
+    asm_comment!(asm, "ZJIT entry point: {}", iseq_get_location(iseq, 0));
+    asm.frame_setup();
+
+    // Save the registers we'll use for CFP, EP, SP
+    asm.cpush(CFP);
+    asm.cpush(EC);
+    asm.cpush(SP);
+    // On x86_64, maintain 16-byte stack alignment
+    if cfg!(target_arch = "x86_64") {
+        asm.cpush(SP);
+    }
+
+    // EC and CFP are passed as arguments
+    asm.mov(EC, C_ARG_OPNDS[0]);
+    asm.mov(CFP, C_ARG_OPNDS[1]);
+
+    // Load the current SP from the CFP into REG_SP
+    asm.mov(SP, Opnd::mem(64, CFP, RUBY_OFFSET_CFP_SP));
+
+    // TODO: Support entry chain guard when ISEQ has_opt
+}
+
+/// Assign method arguments to basic block arguments at JIT entry
+fn gen_entry_params(asm: &mut Assembler, iseq: IseqPtr, entry_block: &Block) {
+    let self_param = gen_param(asm, SELF_PARAM_IDX);
+    asm.mov(self_param, Opnd::mem(VALUE_BITS, CFP, RUBY_OFFSET_CFP_SELF));
+
+    let num_params = entry_block.params().len() - 1; // -1 to exclude self
+    if num_params > 0 {
+        asm_comment!(asm, "set method params: {num_params}");
+
+        // Allocate registers for basic block arguments
+        let params: Vec<Opnd> = (0..num_params).map(|idx|
+            gen_param(asm, idx + 1) // +1 for self
+        ).collect();
+
+        // Assign local variables to the basic block arguments
+        for (idx, &param) in params.iter().enumerate() {
+            let local = gen_entry_param(asm, iseq, idx);
+            asm.load_into(param, local);
+        }
+    }
+}
+
+/// Set branch params to basic block arguments
+fn gen_branch_params(jit: &mut JITState, asm: &mut Assembler, branch: &BranchEdge) -> Option<()> {
+    if !branch.args.is_empty() {
+        asm_comment!(asm, "set branch params: {}", branch.args.len());
+        let mut moves: Vec<(Reg, Opnd)> = vec![];
+        for (idx, &arg) in branch.args.iter().enumerate() {
+            match param_opnd(idx) {
+                Opnd::Reg(reg) => {
+                    // If a parameter is a register, we need to parallel-move it
+                    moves.push((reg, jit.get_opnd(arg)?));
+                },
+                param => {
+                    // If a parameter is memory, we set it beforehand
+                    asm.mov(param, jit.get_opnd(arg)?);
+                }
+            }
+        }
+        asm.parallel_mov(moves);
+    }
+    Some(())
+}
+
+/// Get a method parameter on JIT entry. As of entry, whether EP is escaped or not solely
+/// depends on the ISEQ type.
+fn gen_entry_param(asm: &mut Assembler, iseq: IseqPtr, local_idx: usize) -> lir::Opnd {
+    let ep_offset = local_idx_to_ep_offset(iseq, local_idx);
+
+    // If the ISEQ does not escape EP, we can optimize the local variable access using the SP register.
+    if !iseq_entry_escapes_ep(iseq) {
+        // Create a reference to the local variable using the SP register. We assume EP == BP.
+        // TODO: Implement the invalidation in rb_zjit_invalidate_ep_is_bp()
+        let offs = -(SIZEOF_VALUE_I32 * (ep_offset + 1));
+        Opnd::mem(64, SP, offs)
+    } else {
+        // Get the EP of the current CFP
+        let ep_opnd = Opnd::mem(64, CFP, RUBY_OFFSET_CFP_EP);
+        let ep_reg = asm.load(ep_opnd);
+
+        // Create a reference to the local variable using cfp->ep
+        let offs = -(SIZEOF_VALUE_I32 * ep_offset);
+        Opnd::mem(64, ep_reg, offs)
+    }
+}
+
+/// Compile a constant
+fn gen_const(val: VALUE) -> lir::Opnd {
+    // Just propagate the constant value and generate nothing
+    Opnd::Value(val)
+}
+
+/// Compile a basic block argument
+fn gen_param(asm: &mut Assembler, idx: usize) -> lir::Opnd {
+    // Allocate a register or a stack slot
+    match param_opnd(idx) {
+        // If it's a register, insert LiveReg instruction to reserve the register
+        // in the register pool for register allocation.
+        param @ Opnd::Reg(_) => asm.live_reg_opnd(param),
+        param => param,
+    }
+}
+
+/// Compile a jump to a basic block
+fn gen_jump(jit: &mut JITState, asm: &mut Assembler, branch: &BranchEdge) -> Option<()> {
+    // Set basic block arguments
+    gen_branch_params(jit, asm, branch);
+
+    // Jump to the basic block
+    let target = jit.get_label(asm, branch.target);
+    asm.jmp(target);
+    Some(())
+}
+
+/// Compile a conditional branch to a basic block
+fn gen_if_true(jit: &mut JITState, asm: &mut Assembler, val: lir::Opnd, branch: &BranchEdge) -> Option<()> {
+    // If val is zero, move on to the next instruction.
+    let if_false = asm.new_label("if_false");
+    asm.test(val, val);
+    asm.jz(if_false.clone());
+
+    // If val is not zero, set basic block arguments and jump to the branch target.
+    // TODO: Consider generating the loads out-of-line
+    let if_true = jit.get_label(asm, branch.target);
+    gen_branch_params(jit, asm, branch);
+    asm.jmp(if_true);
+
+    asm.write_label(if_false);
+
+    Some(())
+}
+
+/// Compile a conditional branch to a basic block
+fn gen_if_false(jit: &mut JITState, asm: &mut Assembler, val: lir::Opnd, branch: &BranchEdge) -> Option<()> {
+    // If val is not zero, move on to the next instruction.
+    let if_true = asm.new_label("if_true");
+    asm.test(val, val);
+    asm.jnz(if_true.clone());
+
+    // If val is zero, set basic block arguments and jump to the branch target.
+    // TODO: Consider generating the loads out-of-line
+    let if_false = jit.get_label(asm, branch.target);
+    gen_branch_params(jit, asm, branch);
+    asm.jmp(if_false);
+
+    asm.write_label(if_true);
+
+    Some(())
+}
+
+/// Compile a dynamic dispatch without block
+fn gen_send_without_block(
+    jit: &mut JITState,
+    asm: &mut Assembler,
+    call_info: &CallInfo,
+    cd: *const rb_call_data,
+    state: &FrameState,
+    self_val: Opnd,
+    args: Vec<Opnd>,
+) -> Option<lir::Opnd> {
+    // Spill locals onto the stack.
+    // TODO: Don't spill locals eagerly; lazily reify frames
+    asm_comment!(asm, "spill locals");
+    for (idx, &insn_id) in state.locals().enumerate() {
+        asm.mov(Opnd::mem(64, SP, (-local_idx_to_ep_offset(jit.iseq, idx) - 1) * SIZEOF_VALUE_I32), jit.get_opnd(insn_id)?);
+    }
+    // Spill the receiver and the arguments onto the stack.
+    // They need to be on the interpreter stack to let the interpreter access them.
+    // TODO: Avoid spilling operands that have been spilled before.
+    asm_comment!(asm, "spill receiver and arguments");
+    for (idx, &val) in [self_val].iter().chain(args.iter()).enumerate() {
+        // Currently, we don't move the SP register. So it's equal to the base pointer.
+        let stack_opnd = Opnd::mem(64, SP, idx as i32  * SIZEOF_VALUE_I32);
+        asm.mov(stack_opnd, val);
+    }
+
+    // Save PC and SP
+    gen_save_pc(asm, state);
+    gen_save_sp(asm, 1 + args.len()); // +1 for receiver
+
+    asm_comment!(asm, "call #{} with dynamic dispatch", call_info.method_name);
+    unsafe extern "C" {
+        fn rb_vm_opt_send_without_block(ec: EcPtr, cfp: CfpPtr, cd: VALUE) -> VALUE;
+    }
+    let ret = asm.ccall(
+        rb_vm_opt_send_without_block as *const u8,
+        vec![EC, CFP, (cd as usize).into()],
+    );
+    // TODO(max): Add a PatchPoint here that can side-exit the function if the callee messed with
+    // the frame's locals
+
+    Some(ret)
+}
+
+/// Compile a direct jump to an ISEQ call without block
+fn gen_send_without_block_direct(
+    cb: &mut CodeBlock,
+    jit: &mut JITState,
+    asm: &mut Assembler,
+    cme: *const rb_callable_method_entry_t,
+    iseq: IseqPtr,
+    recv: Opnd,
+    args: Vec<Opnd>,
+    state: &FrameState,
+) -> Option<lir::Opnd> {
+    // Save cfp->pc and cfp->sp for the caller frame
+    gen_save_pc(asm, state);
+    gen_save_sp(asm, state.stack().len() - args.len() - 1); // -1 for receiver
+
+    // Spill the virtual stack and the locals of the caller onto the stack
+    // TODO: Lazily materialize caller frames on side exits or when needed
+    asm_comment!(asm, "spill locals and stack");
+    for (idx, &insn_id) in state.locals().enumerate() {
+        asm.mov(Opnd::mem(64, SP, (-local_idx_to_ep_offset(jit.iseq, idx) - 1) * SIZEOF_VALUE_I32), jit.get_opnd(insn_id)?);
+    }
+    for (idx, &insn_id) in state.stack().enumerate() {
+        asm.mov(Opnd::mem(64, SP, idx as i32 * SIZEOF_VALUE_I32), jit.get_opnd(insn_id)?);
+    }
+
+    // Set up the new frame
+    // TODO: Lazily materialize caller frames on side exits or when needed
+    gen_push_frame(asm, args.len(), state, ControlFrame {
+        recv,
+        iseq,
+        cme,
+        frame_type: VM_FRAME_MAGIC_METHOD | VM_ENV_FLAG_LOCAL,
+    });
+
+    asm_comment!(asm, "switch to new SP register");
+    let local_size = unsafe { get_iseq_body_local_table_size(iseq) } as usize;
+    let sp_offset = (state.stack().len() + local_size - args.len() + VM_ENV_DATA_SIZE as usize) * SIZEOF_VALUE;
+    let new_sp = asm.add(SP, sp_offset.into());
+    asm.mov(SP, new_sp);
+
+    asm_comment!(asm, "switch to new CFP");
+    let new_cfp = asm.sub(CFP, RUBY_SIZEOF_CONTROL_FRAME.into());
+    asm.mov(CFP, new_cfp);
+    asm.store(Opnd::mem(64, EC, RUBY_OFFSET_EC_CFP), CFP);
+
+    // Set up arguments
+    let mut c_args = vec![recv];
+    c_args.extend(args);
+
+    // Make a method call. The target address will be rewritten once compiled.
+    let branch = Branch::new();
+    let dummy_ptr = cb.get_write_ptr().raw_ptr(cb);
+    jit.branch_iseqs.push((branch.clone(), iseq));
+    // TODO(max): Add a PatchPoint here that can side-exit the function if the callee messed with
+    // the frame's locals
+    let ret = asm.ccall_with_branch(dummy_ptr, c_args, &branch);
+
+    // If a callee side-exits, i.e. returns Qundef, propagate the return value to the caller.
+    // The caller will side-exit the callee into the interpreter.
+    // TODO: Let side exit code pop all JIT frames to optimize away this cmp + je.
+    asm_comment!(asm, "side-exit if callee side-exits");
+    asm.cmp(ret, Qundef.into());
+    asm.je(ZJITState::get_exit_trampoline().into());
+
+    asm_comment!(asm, "restore SP register for the caller");
+    let new_sp = asm.sub(SP, sp_offset.into());
+    asm.mov(SP, new_sp);
+
+    Some(ret)
+}
+
+/// Compile a string resurrection
+fn gen_string_copy(asm: &mut Assembler, recv: Opnd, chilled: bool) -> Opnd {
+    asm_comment!(asm, "call rb_ec_str_resurrect");
+    // TODO: split rb_ec_str_resurrect into separate functions
+    let chilled = if chilled { Opnd::Imm(1) } else { Opnd::Imm(0) };
+    asm.ccall(
+        rb_ec_str_resurrect as *const u8,
+        vec![EC, recv, chilled],
+    )
+}
+
+/// Compile an array duplication instruction
+fn gen_array_dup(
+    asm: &mut Assembler,
+    val: lir::Opnd,
+    state: &FrameState,
+) -> lir::Opnd {
+    // Save PC
+    gen_save_pc(asm, state);
+
+    asm_comment!(asm, "call rb_ary_resurrect");
+    asm.ccall(
+        rb_ary_resurrect as *const u8,
+        vec![val],
+    )
+}
+
+/// Compile a new array instruction
+fn gen_new_array(
+    asm: &mut Assembler,
+    elements: Vec<Opnd>,
+    state: &FrameState,
+) -> lir::Opnd {
+    // Save PC
+    gen_save_pc(asm, state);
+
+    let length: ::std::os::raw::c_long = elements.len().try_into().expect("Unable to fit length of elements into c_long");
+
+    asm_comment!(asm, "call rb_ary_new");
+    let new_array = asm.ccall(
+        rb_ary_new_capa as *const u8,
+        vec![lir::Opnd::Imm(length)],
+    );
+
+    for i in 0..elements.len() {
+        let val = *elements.get(i as usize).expect("Element should exist at index");
+        asm_comment!(asm, "call rb_ary_push");
+        asm.ccall(
+            rb_ary_push as *const u8,
+            vec![new_array, val]
+        );
+    }
+
+    new_array
+}
+
+/// Compile a new range instruction
+fn gen_new_range(
+    asm: &mut Assembler,
+    low: lir::Opnd,
+    high: lir::Opnd,
+    flag: RangeType,
+    state: &FrameState,
+) -> lir::Opnd {
+    // Save PC
+    gen_save_pc(asm, state);
+
+    asm_comment!(asm, "call rb_range_new");
+    // Call rb_range_new(low, high, flag)
+    let new_range = asm.ccall(
+        rb_range_new as *const u8,
+        vec![low, high, lir::Opnd::Imm(flag as i64)],
+    );
+
+    new_range
+}
+
+/// Compile code that exits from JIT code with a return value
+fn gen_return(jit: &JITState, asm: &mut Assembler, val: lir::Opnd) -> Option<()> {
+    // Pop the current frame (ec->cfp++)
+    // Note: the return PC is already in the previous CFP
+    asm_comment!(asm, "pop stack frame");
+    let incr_cfp = asm.add(CFP, RUBY_SIZEOF_CONTROL_FRAME.into());
+    asm.mov(CFP, incr_cfp);
+    asm.mov(Opnd::mem(64, EC, RUBY_OFFSET_EC_CFP), CFP);
+
+    // Restore the C stack pointer bumped for basic block arguments
+    if jit.c_stack_bytes > 0 {
+        asm_comment!(asm, "restore C stack pointer");
+        let new_sp = asm.add(NATIVE_STACK_PTR, jit.c_stack_bytes.into());
+        asm.mov(NATIVE_STACK_PTR, new_sp);
+    }
+
+    asm.frame_teardown();
+
+    // Return from the function
+    asm.cret(val);
+    Some(())
+}
+
+/// Compile Fixnum + Fixnum
+fn gen_fixnum_add(jit: &mut JITState, asm: &mut Assembler, left: lir::Opnd, right: lir::Opnd, state: &FrameState) -> Option<lir::Opnd> {
+    // Add left + right and test for overflow
+    let left_untag = asm.sub(left, Opnd::Imm(1));
+    let out_val = asm.add(left_untag, right);
+    asm.jo(side_exit(jit, state, FixnumAddOverflow)?);
+
+    Some(out_val)
+}
+
+/// Compile Fixnum - Fixnum
+fn gen_fixnum_sub(jit: &mut JITState, asm: &mut Assembler, left: lir::Opnd, right: lir::Opnd, state: &FrameState) -> Option<lir::Opnd> {
+    // Subtract left - right and test for overflow
+    let val_untag = asm.sub(left, right);
+    asm.jo(side_exit(jit, state, FixnumSubOverflow)?);
+    let out_val = asm.add(val_untag, Opnd::Imm(1));
+
+    Some(out_val)
+}
+
+/// Compile Fixnum * Fixnum
+fn gen_fixnum_mult(jit: &mut JITState, asm: &mut Assembler, left: lir::Opnd, right: lir::Opnd, state: &FrameState) -> Option<lir::Opnd> {
+    // Do some bitwise gymnastics to handle tag bits
+    // x * y is translated to (x >> 1) * (y - 1) + 1
+    let left_untag = asm.rshift(left, Opnd::UImm(1));
+    let right_untag = asm.sub(right, Opnd::UImm(1));
+    let out_val = asm.mul(left_untag, right_untag);
+
+    // Test for overflow
+    asm.jo_mul(side_exit(jit, state, FixnumMultOverflow)?);
+    let out_val = asm.add(out_val, Opnd::UImm(1));
+
+    Some(out_val)
+}
+
+/// Compile Fixnum == Fixnum
+fn gen_fixnum_eq(asm: &mut Assembler, left: lir::Opnd, right: lir::Opnd) -> Option<lir::Opnd> {
+    asm.cmp(left, right);
+    Some(asm.csel_e(Qtrue.into(), Qfalse.into()))
+}
+
+/// Compile Fixnum != Fixnum
+fn gen_fixnum_neq(asm: &mut Assembler, left: lir::Opnd, right: lir::Opnd) -> Option<lir::Opnd> {
+    asm.cmp(left, right);
+    Some(asm.csel_ne(Qtrue.into(), Qfalse.into()))
+}
+
+/// Compile Fixnum < Fixnum
+fn gen_fixnum_lt(asm: &mut Assembler, left: lir::Opnd, right: lir::Opnd) -> Option<lir::Opnd> {
+    asm.cmp(left, right);
+    Some(asm.csel_l(Qtrue.into(), Qfalse.into()))
+}
+
+/// Compile Fixnum <= Fixnum
+fn gen_fixnum_le(asm: &mut Assembler, left: lir::Opnd, right: lir::Opnd) -> Option<lir::Opnd> {
+    asm.cmp(left, right);
+    Some(asm.csel_le(Qtrue.into(), Qfalse.into()))
+}
+
+/// Compile Fixnum > Fixnum
+fn gen_fixnum_gt(asm: &mut Assembler, left: lir::Opnd, right: lir::Opnd) -> Option<lir::Opnd> {
+    asm.cmp(left, right);
+    Some(asm.csel_g(Qtrue.into(), Qfalse.into()))
+}
+
+/// Compile Fixnum >= Fixnum
+fn gen_fixnum_ge(asm: &mut Assembler, left: lir::Opnd, right: lir::Opnd) -> Option<lir::Opnd> {
+    asm.cmp(left, right);
+    Some(asm.csel_ge(Qtrue.into(), Qfalse.into()))
+}
+
+/// Compile Fixnum & Fixnum
+fn gen_fixnum_and(asm: &mut Assembler, left: lir::Opnd, right: lir::Opnd) -> Option<lir::Opnd> {
+    Some(asm.and(left, right))
+}
+
+/// Compile Fixnum | Fixnum
+fn gen_fixnum_or(asm: &mut Assembler, left: lir::Opnd, right: lir::Opnd) -> Option<lir::Opnd> {
+    Some(asm.or(left, right))
+}
+
+// Compile val == nil
+fn gen_isnil(asm: &mut Assembler, val: lir::Opnd) -> Option<lir::Opnd> {
+    asm.cmp(val, Qnil.into());
+    // TODO: Implement and use setcc
+    Some(asm.csel_e(Opnd::Imm(1), Opnd::Imm(0)))
+}
+
+fn gen_anytostring(asm: &mut Assembler, val: lir::Opnd, str: lir::Opnd, state: &FrameState) -> Option<lir::Opnd> {
+    // Save PC
+    gen_save_pc(asm, state);
+
+    asm_comment!(asm, "call rb_obj_as_string_result");
+    Some(asm.ccall(
+        rb_obj_as_string_result as *const u8,
+        vec![str, val],
+    ))
+}
+
+/// Evaluate if a value is truthy
+/// Produces a CBool type (0 or 1)
+/// In Ruby, only nil and false are falsy
+/// Everything else evaluates to true
+fn gen_test(asm: &mut Assembler, val: lir::Opnd) -> Option<lir::Opnd> {
+    // Test if any bit (outside of the Qnil bit) is on
+    // See RB_TEST(), include/ruby/internal/special_consts.h
+    asm.test(val, Opnd::Imm(!Qnil.as_i64()));
+    Some(asm.csel_e(0.into(), 1.into()))
+}
+
+/// Compile a type check with a side exit
+fn gen_guard_type(jit: &mut JITState, asm: &mut Assembler, val: lir::Opnd, guard_type: Type, state: &FrameState) -> Option<lir::Opnd> {
+    if guard_type.is_subtype(Fixnum) {
+        // Check if opnd is Fixnum
+        asm.test(val, Opnd::UImm(RUBY_FIXNUM_FLAG as u64));
+        asm.jz(side_exit(jit, state, GuardType(guard_type))?);
+    } else if let Some(expected_class) = guard_type.runtime_exact_ruby_class() {
+        asm_comment!(asm, "guard exact class");
+
+        // Get the class of the value
+        let klass = asm.ccall(rb_yarv_class_of as *const u8, vec![val]);
+
+        asm.cmp(klass, Opnd::Value(expected_class));
+        asm.jne(side_exit(jit, state, GuardType(guard_type))?);
+    } else {
+        unimplemented!("unsupported type: {guard_type}");
+    }
+    Some(val)
+}
+
+/// Compile an identity check with a side exit
+fn gen_guard_bit_equals(jit: &mut JITState, asm: &mut Assembler, val: lir::Opnd, expected: VALUE, state: &FrameState) -> Option<lir::Opnd> {
+    asm.cmp(val, Opnd::UImm(expected.into()));
+    asm.jnz(side_exit(jit, state, GuardBitEquals(expected))?);
+    Some(val)
+}
+
+/// Save the incremented PC on the CFP.
+/// This is necessary when callees can raise or allocate.
+fn gen_save_pc(asm: &mut Assembler, state: &FrameState) {
+    let opcode: usize = state.get_opcode().try_into().unwrap();
+    let next_pc: *const VALUE = unsafe { state.pc.offset(insn_len(opcode) as isize) };
+
+    asm_comment!(asm, "save PC to CFP");
+    asm.mov(Opnd::mem(64, CFP, RUBY_OFFSET_CFP_PC), Opnd::const_ptr(next_pc as *const u8));
+}
+
+/// Save the current SP on the CFP
+fn gen_save_sp(asm: &mut Assembler, stack_size: usize) {
+    // Update cfp->sp which will be read by the interpreter. We also have the SP register in JIT
+    // code, and ZJIT's codegen currently assumes the SP register doesn't move, e.g. gen_param().
+    // So we don't update the SP register here. We could update the SP register to avoid using
+    // an extra register for asm.lea(), but you'll need to manage the SP offset like YJIT does.
+    asm_comment!(asm, "save SP to CFP: {}", stack_size);
+    let sp_addr = asm.lea(Opnd::mem(64, SP, stack_size as i32 * SIZEOF_VALUE_I32));
+    let cfp_sp = Opnd::mem(64, CFP, RUBY_OFFSET_CFP_SP);
+    asm.mov(cfp_sp, sp_addr);
+}
+
+/// Frame metadata written by gen_push_frame()
+struct ControlFrame {
+    recv: Opnd,
+    iseq: IseqPtr,
+    cme: *const rb_callable_method_entry_t,
+    frame_type: u32,
+}
+
+/// Compile an interpreter frame
+fn gen_push_frame(asm: &mut Assembler, argc: usize, state: &FrameState, frame: ControlFrame) {
+    // Locals are written by the callee frame on side-exits or non-leaf calls
+
+    // See vm_push_frame() for details
+    asm_comment!(asm, "push cme, specval, frame type");
+    // ep[-2]: cref of cme
+    let local_size = unsafe { get_iseq_body_local_table_size(frame.iseq) } as i32;
+    let ep_offset = state.stack().len() as i32 + local_size - argc as i32 + VM_ENV_DATA_SIZE as i32 - 1;
+    asm.store(Opnd::mem(64, SP, (ep_offset - 2) * SIZEOF_VALUE_I32), VALUE::from(frame.cme).into());
+    // ep[-1]: block_handler or prev EP
+    // block_handler is not supported for now
+    asm.store(Opnd::mem(64, SP, (ep_offset - 1) * SIZEOF_VALUE_I32), VM_BLOCK_HANDLER_NONE.into());
+    // ep[0]: ENV_FLAGS
+    asm.store(Opnd::mem(64, SP, ep_offset * SIZEOF_VALUE_I32), frame.frame_type.into());
+
+    // Write to the callee CFP
+    fn cfp_opnd(offset: i32) -> Opnd {
+        Opnd::mem(64, CFP, offset - (RUBY_SIZEOF_CONTROL_FRAME as i32))
+    }
+
+    asm_comment!(asm, "push callee control frame");
+    // cfp_opnd(RUBY_OFFSET_CFP_PC): written by the callee frame on side-exits or non-leaf calls
+    // cfp_opnd(RUBY_OFFSET_CFP_SP): written by the callee frame on side-exits or non-leaf calls
+    asm.mov(cfp_opnd(RUBY_OFFSET_CFP_ISEQ), VALUE::from(frame.iseq).into());
+    asm.mov(cfp_opnd(RUBY_OFFSET_CFP_SELF), frame.recv);
+    let ep = asm.lea(Opnd::mem(64, SP, ep_offset * SIZEOF_VALUE_I32));
+    asm.mov(cfp_opnd(RUBY_OFFSET_CFP_EP), ep);
+    asm.mov(cfp_opnd(RUBY_OFFSET_CFP_BLOCK_CODE), 0.into());
+}
+
+/// Return an operand we use for the basic block argument at a given index
+fn param_opnd(idx: usize) -> Opnd {
+    // To simplify the implementation, allocate a fixed register or a stack slot for each basic block argument for now.
+    // TODO: Allow allocating arbitrary registers for basic block arguments
+    if idx < ALLOC_REGS.len() {
+        Opnd::Reg(ALLOC_REGS[idx])
+    } else {
+        Opnd::mem(64, NATIVE_STACK_PTR, -((idx - ALLOC_REGS.len() + 1) as i32) * SIZEOF_VALUE_I32)
+    }
+}
+
+/// Inverse of ep_offset_to_local_idx(). See ep_offset_to_local_idx() for details.
+fn local_idx_to_ep_offset(iseq: IseqPtr, local_idx: usize) -> i32 {
+    let local_size = unsafe { get_iseq_body_local_table_size(iseq) };
+    local_size_and_idx_to_ep_offset(local_size as usize, local_idx)
+}
+
+/// Convert the number of locals and a local index to an offset in the EP
+pub fn local_size_and_idx_to_ep_offset(local_size: usize, local_idx: usize) -> i32 {
+    local_size as i32 - local_idx as i32 - 1 + VM_ENV_DATA_SIZE as i32
+}
+
+/// Convert ISEQ into High-level IR
+fn compile_iseq(iseq: IseqPtr) -> Option<Function> {
+    let mut function = match iseq_to_hir(iseq) {
+        Ok(function) => function,
+        Err(err) => {
+            debug!("ZJIT: iseq_to_hir: {err:?}");
+            return None;
+        }
+    };
+    function.optimize();
+    if let Err(err) = function.validate() {
+        debug!("ZJIT: compile_iseq: {err:?}");
+        return None;
+    }
+    Some(function)
+}
+
+/// Build a Target::SideExit for non-PatchPoint instructions
+fn side_exit(jit: &mut JITState, state: &FrameState, reason: SideExitReason) -> Option<Target> {
+    build_side_exit(jit, state, reason, None)
+}
+
+/// Build a Target::SideExit out of a FrameState
+fn build_side_exit(jit: &mut JITState, state: &FrameState, reason: SideExitReason, label: Option<Label>) -> Option<Target> {
+    let mut stack = Vec::new();
+    for &insn_id in state.stack() {
+        stack.push(jit.get_opnd(insn_id)?);
+    }
+
+    let mut locals = Vec::new();
+    for &insn_id in state.locals() {
+        locals.push(jit.get_opnd(insn_id)?);
+    }
+
+    let target = Target::SideExit {
+        pc: state.pc,
+        stack,
+        locals,
+        c_stack_bytes: jit.c_stack_bytes,
+        reason,
+        label,
+    };
+    Some(target)
+}
+
+/// Return true if a given ISEQ is known to escape EP to the heap on entry.
+///
+/// As of vm_push_frame(), EP is always equal to BP. However, after pushing
+/// a frame, some ISEQ setups call vm_bind_update_env(), which redirects EP.
+fn iseq_entry_escapes_ep(iseq: IseqPtr) -> bool {
+    match unsafe { get_iseq_body_type(iseq) } {
+        // <main> frame is always associated to TOPLEVEL_BINDING.
+        ISEQ_TYPE_MAIN |
+        // Kernel#eval uses a heap EP when a Binding argument is not nil.
+        ISEQ_TYPE_EVAL => true,
+        _ => false,
+    }
+}
+
+/// Returne the maximum number of arguments for a block in a given function
+fn max_num_params(function: &Function) -> usize {
+    let reverse_post_order = function.rpo();
+    reverse_post_order.iter().map(|&block_id| {
+        let block = function.block(block_id);
+        block.params().len()
+    }).max().unwrap_or(0)
+}
+
+/// Given the number of spill slots needed for a function, return the number of bytes
+/// the function needs to allocate on the stack for the stack frame.
+fn aligned_stack_bytes(num_slots: usize) -> usize {
+    // Both x86_64 and arm64 require the stack to be aligned to 16 bytes.
+    // Since SIZEOF_VALUE is 8 bytes, we need to round up the size to the nearest even number.
+    let num_slots = if num_slots % 2 == 0 {
+        num_slots
+    } else {
+        num_slots + 1
+    };
+    num_slots * SIZEOF_VALUE
+}
+
+impl Assembler {
+    /// Make a C call while marking the start and end positions of it
+    fn ccall_with_branch(&mut self, fptr: *const u8, opnds: Vec<Opnd>, branch: &Rc<Branch>) -> Opnd {
+        // We need to create our own branch rc objects so that we can move the closure below
+        let start_branch = branch.clone();
+        let end_branch = branch.clone();
+
+        self.ccall_with_pos_markers(
+            fptr,
+            opnds,
+            move |code_ptr, _| {
+                start_branch.start_addr.set(Some(code_ptr));
+            },
+            move |code_ptr, _| {
+                end_branch.end_addr.set(Some(code_ptr));
+            },
+        )
+    }
+}
+
+/// Store info about an outgoing branch in a code segment
+#[derive(Debug)]
+struct Branch {
+    /// Position where the generated code starts
+    start_addr: Cell<Option<CodePtr>>,
+
+    /// Position where the generated code ends (exclusive)
+    end_addr: Cell<Option<CodePtr>>,
+}
+
+impl Branch {
+    /// Allocate a new branch
+    fn new() -> Rc<Self> {
+        Rc::new(Branch {
+            start_addr: Cell::new(None),
+            end_addr: Cell::new(None),
+        })
+    }
+
+    /// Regenerate a branch with a given callback
+    fn regenerate(&self, cb: &mut CodeBlock, callback: impl Fn(&mut Assembler)) {
+        cb.with_write_ptr(self.start_addr.get().unwrap(), |cb| {
+            let mut asm = Assembler::new();
+            callback(&mut asm);
+            asm.compile(cb).unwrap();
+            assert_eq!(self.end_addr.get().unwrap(), cb.get_write_ptr());
+        });
+    }
+}
diff --git a/zjit/src/cruby.rs b/zjit/src/cruby.rs
new file mode 100644
index 00000000000000..2557e2e913dc51
--- /dev/null
+++ b/zjit/src/cruby.rs
@@ -0,0 +1,1225 @@
+//! This module deals with making relevant C functions available to Rust ZJIT.
+//! Some C functions we use we maintain, some are public C extension APIs,
+//! some are internal CRuby APIs.
+//!
+//! ## General notes about linking
+//!
+//! The ZJIT crate compiles to a native static library, which for our purposes
+//! we can understand as a collection of object files. On ELF platforms at least,
+//! object files can refer to "external symbols" which we could take some
+//! liberty and understand as assembly labels that refer to code defined in other
+//! object files resolved when linking. When we are linking, say to produce miniruby,
+//! the linker resolves and put concrete addresses for each usage of C function in
+//! the Rust static library.
+//!
+//! By declaring external functions and using them, we are asserting the symbols
+//! we use have definition in one of the object files we pass to the linker. Declaring
+//! a function here that has no definition anywhere causes a linking error.
+//!
+//! There are more things going on during linking and this section makes a lot of
+//! simplifications but hopefully this gives a good enough working mental model.
+//!
+//! ## Difference from example in the Rustonomicon
+//!
+//! You might be wondering about why this is different from the [FFI example]
+//! in the Nomicon, an official book about Unsafe Rust.
+//!
+//! There is no `#[link]` attribute because we are not linking against an external
+//! library, but rather implicitly asserting that we'll supply a concrete definition
+//! for all C functions we call, similar to how pure C projects put functions
+//! across different compilation units and link them together.
+//!
+//! TODO(alan): is the model different enough on Windows that this setup is unworkable?
+//!             Seems prudent to at least learn more about Windows binary tooling before
+//!             committing to a design.
+//!
+//! Alan recommends reading the Nomicon cover to cover as he thinks the book is
+//! not very long in general and especially for something that can save hours of
+//! debugging Undefined Behavior (UB) down the road.
+//!
+//! UBs can cause Safe Rust to crash, at which point it's hard to tell which
+//! usage of `unsafe` in the codebase invokes UB. Providing safe Rust interface
+//! wrapping `unsafe` Rust is a good technique, but requires practice and knowledge
+//! about what's well defined and what's undefined.
+//!
+//! For an extremely advanced example of building safe primitives using Unsafe Rust,
+//! see the [GhostCell] paper. Some parts of the paper assume less background knowledge
+//! than other parts, so there should be learning opportunities in it for all experience
+//! levels.
+//!
+//! ## Binding generation
+//!
+//! For the moment declarations on the Rust side are hand written. The code is boilerplate
+//! and could be generated automatically with a custom tooling that depend on
+//! rust-lang/rust-bindgen. The output Rust code could be checked in to version control
+//! and verified on CI like `make update-deps`.
+//!
+//! Upsides for this design:
+//!  - the ZJIT static lib that links with miniruby and friends will not need bindgen
+//!    as a dependency at all. This is an important property so Ruby end users can
+//!    build a ZJIT enabled Ruby with no internet connection using a release tarball
+//!  - Less hand-typed boilerplate
+//!  - Helps reduce risk of C definitions and Rust declaration going out of sync since
+//!    CI verifies synchronicity
+//!
+//! Downsides and known unknowns:
+//!  - Using rust-bindgen this way seems unusual. We might be depending on parts
+//!    that the project is not committed to maintaining
+//!  - This setup assumes rust-bindgen gives deterministic output, which can't be taken
+//!    for granted
+//!  - ZJIT contributors will need to install libclang on their system to get rust-bindgen
+//!    to work if they want to run the generation tool locally
+//!
+//! The elephant in the room is that we'll still need to use Unsafe Rust to call C functions,
+//! and the binding generation can't magically save us from learning Unsafe Rust.
+//!
+//!
+//! [FFI example]: https://doc.rust-lang.org/nomicon/ffi.html
+//! [GhostCell]: http://plv.mpi-sws.org/rustbelt/ghostcell/
+
+// CRuby types use snake_case. Allow them so we use one name across languages.
+#![allow(non_camel_case_types)]
+// A lot of imported CRuby globals aren't all-caps
+#![allow(non_upper_case_globals)]
+
+// Some of this code may not be used yet
+#![allow(dead_code)]
+#![allow(unused_macros)]
+#![allow(unused_imports)]
+
+use std::convert::From;
+use std::ffi::{CString, CStr};
+use std::fmt::{Debug, Formatter};
+use std::os::raw::{c_char, c_int, c_uint};
+use std::panic::{catch_unwind, UnwindSafe};
+
+// We check that we can do this with the configure script and a couple of
+// static asserts. u64 and not usize to play nice with lowering to x86.
+pub type size_t = u64;
+
+/// A type alias for the redefinition flags coming from CRuby. These are just
+/// shifted 1s but not explicitly an enum.
+pub type RedefinitionFlag = u32;
+
+#[allow(unsafe_op_in_unsafe_fn)]
+#[allow(dead_code)]
+#[allow(clippy::all)] // warning meant to help with reading; not useful for generated code
+mod autogened {
+    use super::*;
+    // Textually include output from rust-bindgen as suggested by its user guide.
+    include!("cruby_bindings.inc.rs");
+}
+pub use autogened::*;
+
+// TODO: For #defines that affect memory layout, we need to check for them
+// on build and fail if they're wrong. e.g. USE_FLONUM *must* be true.
+
+// These are functions we expose from C files, not in any header.
+// Parsing it would result in a lot of duplicate definitions.
+// Use bindgen for functions that are defined in headers or in zjit.c.
+#[cfg_attr(test, allow(unused))] // We don't link against C code when testing
+unsafe extern "C" {
+    pub fn rb_check_overloaded_cme(
+        me: *const rb_callable_method_entry_t,
+        ci: *const rb_callinfo,
+    ) -> *const rb_callable_method_entry_t;
+
+    // Floats within range will be encoded without creating objects in the heap.
+    // (Range is 0x3000000000000001 to 0x4fffffffffffffff (1.7272337110188893E-77 to 2.3158417847463237E+77).
+    pub fn rb_float_new(d: f64) -> VALUE;
+
+    pub fn rb_hash_empty_p(hash: VALUE) -> VALUE;
+    pub fn rb_yjit_str_concat_codepoint(str: VALUE, codepoint: VALUE);
+    pub fn rb_str_setbyte(str: VALUE, index: VALUE, value: VALUE) -> VALUE;
+    pub fn rb_vm_splat_array(flag: VALUE, ary: VALUE) -> VALUE;
+    pub fn rb_vm_concat_array(ary1: VALUE, ary2st: VALUE) -> VALUE;
+    pub fn rb_vm_get_special_object(reg_ep: *const VALUE, value_type: vm_special_object_type) -> VALUE;
+    pub fn rb_vm_concat_to_array(ary1: VALUE, ary2st: VALUE) -> VALUE;
+    pub fn rb_vm_defined(
+        ec: EcPtr,
+        reg_cfp: CfpPtr,
+        op_type: rb_num_t,
+        obj: VALUE,
+        v: VALUE,
+    ) -> bool;
+    pub fn rb_vm_set_ivar_id(obj: VALUE, idx: u32, val: VALUE) -> VALUE;
+    pub fn rb_vm_setinstancevariable(iseq: IseqPtr, obj: VALUE, id: ID, val: VALUE, ic: IVC);
+    pub fn rb_aliased_callable_method_entry(
+        me: *const rb_callable_method_entry_t,
+    ) -> *const rb_callable_method_entry_t;
+    pub fn rb_vm_getclassvariable(iseq: IseqPtr, cfp: CfpPtr, id: ID, ic: ICVARC) -> VALUE;
+    pub fn rb_vm_setclassvariable(
+        iseq: IseqPtr,
+        cfp: CfpPtr,
+        id: ID,
+        val: VALUE,
+        ic: ICVARC,
+    ) -> VALUE;
+    pub fn rb_vm_ic_hit_p(ic: IC, reg_ep: *const VALUE) -> bool;
+    pub fn rb_vm_stack_canary() -> VALUE;
+    pub fn rb_vm_push_cfunc_frame(cme: *const rb_callable_method_entry_t, recv_idx: c_int);
+    pub fn rb_obj_class(klass: VALUE) -> VALUE;
+}
+
+// Renames
+pub use rb_insn_name as raw_insn_name;
+pub use rb_get_ec_cfp as get_ec_cfp;
+pub use rb_get_cfp_iseq as get_cfp_iseq;
+pub use rb_get_cfp_pc as get_cfp_pc;
+pub use rb_get_cfp_sp as get_cfp_sp;
+pub use rb_get_cfp_self as get_cfp_self;
+pub use rb_get_cfp_ep as get_cfp_ep;
+pub use rb_get_cfp_ep_level as get_cfp_ep_level;
+pub use rb_vm_base_ptr as get_cfp_bp;
+pub use rb_get_cme_def_type as get_cme_def_type;
+pub use rb_get_cme_def_body_attr_id as get_cme_def_body_attr_id;
+pub use rb_get_cme_def_body_optimized_type as get_cme_def_body_optimized_type;
+pub use rb_get_cme_def_body_optimized_index as get_cme_def_body_optimized_index;
+pub use rb_get_cme_def_body_cfunc as get_cme_def_body_cfunc;
+pub use rb_get_def_method_serial as get_def_method_serial;
+pub use rb_get_def_original_id as get_def_original_id;
+pub use rb_get_mct_argc as get_mct_argc;
+pub use rb_get_mct_func as get_mct_func;
+pub use rb_get_def_iseq_ptr as get_def_iseq_ptr;
+pub use rb_iseq_encoded_size as get_iseq_encoded_size;
+pub use rb_get_iseq_body_local_iseq as get_iseq_body_local_iseq;
+pub use rb_get_iseq_body_iseq_encoded as get_iseq_body_iseq_encoded;
+pub use rb_get_iseq_body_stack_max as get_iseq_body_stack_max;
+pub use rb_get_iseq_body_type as get_iseq_body_type;
+pub use rb_get_iseq_flags_has_lead as get_iseq_flags_has_lead;
+pub use rb_get_iseq_flags_has_opt as get_iseq_flags_has_opt;
+pub use rb_get_iseq_flags_has_kw as get_iseq_flags_has_kw;
+pub use rb_get_iseq_flags_has_rest as get_iseq_flags_has_rest;
+pub use rb_get_iseq_flags_has_post as get_iseq_flags_has_post;
+pub use rb_get_iseq_flags_has_kwrest as get_iseq_flags_has_kwrest;
+pub use rb_get_iseq_flags_has_block as get_iseq_flags_has_block;
+pub use rb_get_iseq_flags_ambiguous_param0 as get_iseq_flags_ambiguous_param0;
+pub use rb_get_iseq_flags_accepts_no_kwarg as get_iseq_flags_accepts_no_kwarg;
+pub use rb_get_iseq_body_local_table_size as get_iseq_body_local_table_size;
+pub use rb_get_iseq_body_param_keyword as get_iseq_body_param_keyword;
+pub use rb_get_iseq_body_param_size as get_iseq_body_param_size;
+pub use rb_get_iseq_body_param_lead_num as get_iseq_body_param_lead_num;
+pub use rb_get_iseq_body_param_opt_num as get_iseq_body_param_opt_num;
+pub use rb_get_iseq_body_param_opt_table as get_iseq_body_param_opt_table;
+pub use rb_get_cikw_keyword_len as get_cikw_keyword_len;
+pub use rb_get_cikw_keywords_idx as get_cikw_keywords_idx;
+pub use rb_get_call_data_ci as get_call_data_ci;
+pub use rb_FL_TEST as FL_TEST;
+pub use rb_FL_TEST_RAW as FL_TEST_RAW;
+pub use rb_RB_TYPE_P as RB_TYPE_P;
+pub use rb_BASIC_OP_UNREDEFINED_P as BASIC_OP_UNREDEFINED_P;
+pub use rb_RSTRUCT_LEN as RSTRUCT_LEN;
+pub use rb_vm_ci_argc as vm_ci_argc;
+pub use rb_vm_ci_mid as vm_ci_mid;
+pub use rb_vm_ci_flag as vm_ci_flag;
+pub use rb_vm_ci_kwarg as vm_ci_kwarg;
+pub use rb_METHOD_ENTRY_VISI as METHOD_ENTRY_VISI;
+pub use rb_RCLASS_ORIGIN as RCLASS_ORIGIN;
+pub use rb_vm_get_special_object as vm_get_special_object;
+
+/// Helper so we can get a Rust string for insn_name()
+pub fn insn_name(opcode: usize) -> String {
+    if opcode >= VM_INSTRUCTION_SIZE.try_into().unwrap() {
+        return "<unknown>".into();
+    }
+    unsafe {
+        // Look up Ruby's NULL-terminated insn name string
+        let op_name = raw_insn_name(VALUE(opcode));
+
+        // Convert the op name C string to a Rust string and concat
+        let op_name = CStr::from_ptr(op_name).to_str().unwrap();
+
+        // Convert into an owned string
+        op_name.to_string()
+    }
+}
+
+pub fn insn_len(opcode: usize) -> u32 {
+    unsafe {
+        rb_insn_len(VALUE(opcode)).try_into().unwrap()
+    }
+}
+
+/// Opaque iseq type for opaque iseq pointers from vm_core.h
+/// See: <https://doc.rust-lang.org/nomicon/ffi.html#representing-opaque-structs>
+#[repr(C)]
+pub struct rb_iseq_t {
+    _data: [u8; 0],
+    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
+}
+
+/// An object handle similar to VALUE in the C code. Our methods assume
+/// that this is a handle. Sometimes the C code briefly uses VALUE as
+/// an unsigned integer type and don't necessarily store valid handles but
+/// thankfully those cases are rare and don't cross the FFI boundary.
+#[derive(Copy, Clone, PartialEq, Eq, Debug, Hash)]
+#[repr(transparent)] // same size and alignment as simply `usize`
+pub struct VALUE(pub usize);
+
+/// An interned string. See [ids] and methods this type.
+/// `0` is a sentinal value for IDs.
+#[repr(transparent)]
+#[derive(Clone, Copy, PartialEq, Eq, Debug)]
+pub struct ID(pub ::std::os::raw::c_ulong);
+
+/// Pointer to an ISEQ
+pub type IseqPtr = *const rb_iseq_t;
+
+// Given an ISEQ pointer, convert PC to insn_idx
+pub fn iseq_pc_to_insn_idx(iseq: IseqPtr, pc: *mut VALUE) -> Option<u16> {
+    let pc_zero = unsafe { rb_iseq_pc_at_idx(iseq, 0) };
+    unsafe { pc.offset_from(pc_zero) }.try_into().ok()
+}
+
+/// Given an ISEQ pointer and an instruction index, return an opcode.
+pub fn iseq_opcode_at_idx(iseq: IseqPtr, insn_idx: u32) -> u32 {
+    let pc = unsafe { rb_iseq_pc_at_idx(iseq, insn_idx) };
+    unsafe { rb_iseq_opcode_at_pc(iseq, pc) as u32 }
+}
+
+/// Return a poison value to be set above the stack top to verify leafness.
+#[cfg(not(test))]
+pub fn vm_stack_canary() -> u64 {
+    unsafe { rb_vm_stack_canary() }.as_u64()
+}
+
+/// Avoid linking the C function in `cargo test`
+#[cfg(test)]
+pub fn vm_stack_canary() -> u64 {
+    0
+}
+
+/// Opaque execution-context type from vm_core.h
+#[repr(C)]
+pub struct rb_execution_context_struct {
+    _data: [u8; 0],
+    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
+}
+/// Alias for rb_execution_context_struct used by CRuby sometimes
+pub type rb_execution_context_t = rb_execution_context_struct;
+
+/// Pointer to an execution context (rb_execution_context_struct)
+pub type EcPtr = *const rb_execution_context_struct;
+
+// From method.h
+#[repr(C)]
+pub struct rb_method_definition_t {
+    _data: [u8; 0],
+    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
+}
+type rb_method_definition_struct = rb_method_definition_t;
+
+/// Opaque cfunc type from method.h
+#[repr(C)]
+pub struct rb_method_cfunc_t {
+    _data: [u8; 0],
+    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
+}
+
+/// Opaque call-cache type from vm_callinfo.h
+#[repr(C)]
+pub struct rb_callcache {
+    _data: [u8; 0],
+    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
+}
+
+/// Opaque control_frame (CFP) struct from vm_core.h
+#[repr(C)]
+pub struct rb_control_frame_struct {
+    _data: [u8; 0],
+    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
+}
+
+/// Pointer to a control frame pointer (CFP)
+pub type CfpPtr = *mut rb_control_frame_struct;
+
+/// Opaque struct from vm_core.h
+#[repr(C)]
+pub struct rb_cref_t {
+    _data: [u8; 0],
+    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
+}
+
+#[derive(PartialEq)]
+pub enum ClassRelationship {
+    Subclass,
+    Superclass,
+    NoRelation,
+}
+
+impl VALUE {
+    /// Dump info about the value to the console similarly to rp(VALUE)
+    pub fn dump_info(self) {
+        unsafe { rb_obj_info_dump(self) }
+    }
+
+    /// Return whether the value is truthy or falsy in Ruby -- only nil and false are falsy.
+    pub fn test(self) -> bool {
+        let VALUE(cval) = self;
+        let VALUE(qnilval) = Qnil;
+        (cval & !qnilval) != 0
+    }
+
+    /// Return true if the number is an immediate integer, flonum or static symbol
+    fn immediate_p(self) -> bool {
+        let VALUE(cval) = self;
+        let mask = RUBY_IMMEDIATE_MASK as usize;
+        (cval & mask) != 0
+    }
+
+    /// Return true if the value is a Ruby immediate integer, flonum, static symbol, nil or false
+    pub fn special_const_p(self) -> bool {
+        self.immediate_p() || !self.test()
+    }
+
+    /// Return true if the value is a heap object
+    pub fn heap_object_p(self) -> bool {
+        !self.special_const_p()
+    }
+
+    /// Return true if the value is a Ruby Fixnum (immediate-size integer)
+    pub fn fixnum_p(self) -> bool {
+        let VALUE(cval) = self;
+        let flag = RUBY_FIXNUM_FLAG as usize;
+        (cval & flag) == flag
+    }
+
+    /// Return true if the value is an immediate Ruby floating-point number (flonum)
+    pub fn flonum_p(self) -> bool {
+        let VALUE(cval) = self;
+        let mask = RUBY_FLONUM_MASK as usize;
+        let flag = RUBY_FLONUM_FLAG as usize;
+        (cval & mask) == flag
+    }
+
+    /// Return true if the value is a Ruby symbol (RB_SYMBOL_P)
+    pub fn symbol_p(self) -> bool {
+        self.static_sym_p() || self.dynamic_sym_p()
+    }
+
+    /// Return true for a static (non-heap) Ruby symbol (RB_STATIC_SYM_P)
+    pub fn static_sym_p(self) -> bool {
+        let VALUE(cval) = self;
+        let flag = RUBY_SYMBOL_FLAG as usize;
+        (cval & 0xff) == flag
+    }
+
+    /// Return true for a dynamic Ruby symbol (RB_DYNAMIC_SYM_P)
+    fn dynamic_sym_p(self) -> bool {
+        if self.special_const_p() {
+            false
+        } else {
+            self.builtin_type() == RUBY_T_SYMBOL
+        }
+    }
+
+    /// Returns true if the value is T_HASH
+    pub fn hash_p(self) -> bool {
+        !self.special_const_p() && self.builtin_type() == RUBY_T_HASH
+    }
+
+    /// Returns true or false depending on whether the value is nil
+    pub fn nil_p(self) -> bool {
+        self == Qnil
+    }
+
+    pub fn string_p(self) -> bool {
+        self.class_of() == unsafe { rb_cString }
+    }
+
+    /// Read the flags bits from the RBasic object, then return a Ruby type enum (e.g. RUBY_T_ARRAY)
+    pub fn builtin_type(self) -> ruby_value_type {
+        (self.builtin_flags() & (RUBY_T_MASK as usize)) as ruby_value_type
+    }
+
+    pub fn builtin_flags(self) -> usize {
+        assert!(!self.special_const_p());
+
+        let VALUE(cval) = self;
+        let rbasic_ptr = cval as *const RBasic;
+        let flags_bits: usize = unsafe { (*rbasic_ptr).flags }.as_usize();
+        flags_bits
+    }
+
+    pub fn class_of(self) -> VALUE {
+        if !self.special_const_p() {
+            let builtin_type = self.builtin_type();
+            assert_ne!(builtin_type, RUBY_T_NONE, "ZJIT should only see live objects");
+            assert_ne!(builtin_type, RUBY_T_MOVED, "ZJIT should only see live objects");
+        }
+
+        unsafe { rb_yarv_class_of(self) }
+    }
+
+    /// Check if `self` is a subclass of `other`. Assumes both `self` and `other` are class
+    /// objects. Returns [`ClassRelationship::Subclass`] if `self <= other`,
+    /// [`ClassRelationship::Superclass`] if `other < self`, and [`ClassRelationship::NoRelation`]
+    /// otherwise.
+    pub fn is_subclass_of(self, other: VALUE) -> ClassRelationship {
+        assert!(unsafe { RB_TYPE_P(self, RUBY_T_CLASS) });
+        assert!(unsafe { RB_TYPE_P(other, RUBY_T_CLASS) });
+        match unsafe { rb_class_inherited_p(self, other) } {
+            Qtrue => ClassRelationship::Subclass,
+            Qfalse => ClassRelationship::Superclass,
+            Qnil => ClassRelationship::NoRelation,
+            // The API specifies that it will return Qnil in this case
+            _ => panic!("Unexpected return value from rb_class_inherited_p"),
+        }
+    }
+
+    /// Borrow the string contents of `self`. Rust unsafe because of possible mutation and GC
+    /// interactions.
+    pub unsafe fn as_rstring_byte_slice<'a>(self) -> Option<&'a [u8]> {
+        if !unsafe { RB_TYPE_P(self, RUBY_T_STRING) } {
+            None
+        } else {
+            let str_ptr = unsafe { rb_RSTRING_PTR(self) } as *const u8;
+            let str_len: usize = unsafe { rb_RSTRING_LEN(self) }.try_into().ok()?;
+            Some(unsafe { std::slice::from_raw_parts(str_ptr, str_len) })
+        }
+    }
+
+    pub fn is_frozen(self) -> bool {
+        unsafe { rb_obj_frozen_p(self) != VALUE(0) }
+    }
+
+    pub fn shape_too_complex(self) -> bool {
+        unsafe { rb_zjit_shape_obj_too_complex_p(self) }
+    }
+
+    pub fn shape_id_of(self) -> u32 {
+        unsafe { rb_obj_shape_id(self) }
+    }
+
+    pub fn embedded_p(self) -> bool {
+        unsafe {
+            FL_TEST_RAW(self, VALUE(ROBJECT_EMBED as usize)) != VALUE(0)
+        }
+    }
+
+    pub fn as_fixnum(self) -> i64 {
+        assert!(self.fixnum_p());
+        (self.0 as i64) >> 1
+    }
+
+    pub fn as_isize(self) -> isize {
+        let VALUE(is) = self;
+        is as isize
+    }
+
+    pub fn as_i32(self) -> i32 {
+        self.as_i64().try_into().unwrap()
+    }
+
+    pub fn as_u32(self) -> u32 {
+        let VALUE(i) = self;
+        i.try_into().unwrap()
+    }
+
+    pub fn as_i64(self) -> i64 {
+        let VALUE(i) = self;
+        i as i64
+    }
+
+    pub fn as_u64(self) -> u64 {
+        let VALUE(i) = self;
+        i.try_into().unwrap()
+    }
+
+    pub fn as_usize(self) -> usize {
+        let VALUE(us) = self;
+        us
+    }
+
+    pub fn as_ptr<T>(self) -> *const T {
+        let VALUE(us) = self;
+        us as *const T
+    }
+
+    pub fn as_mut_ptr<T>(self) -> *mut T {
+        let VALUE(us) = self;
+        us as *mut T
+    }
+
+    /// For working with opaque pointers and encoding null check.
+    /// Similar to [std::ptr::NonNull], but for `*const T`. `NonNull<T>`
+    /// is for `*mut T` while our C functions are setup to use `*const T`.
+    /// Casting from `NonNull<T>` to `*const T` is too noisy.
+    pub fn as_optional_ptr<T>(self) -> Option<*const T> {
+        let ptr: *const T = self.as_ptr();
+
+        if ptr.is_null() {
+            None
+        } else {
+            Some(ptr)
+        }
+    }
+
+    /// Assert that `self` is an iseq in debug builds
+    pub fn as_iseq(self) -> IseqPtr {
+        let ptr: IseqPtr = self.as_ptr();
+
+        #[cfg(debug_assertions)]
+        if !ptr.is_null() {
+            unsafe { rb_assert_iseq_handle(self) }
+        }
+
+        ptr
+    }
+
+    pub fn cme_p(self) -> bool {
+        if self == VALUE(0) { return false; }
+        unsafe { rb_IMEMO_TYPE_P(self, imemo_ment) == 1 }
+    }
+
+    /// Assert that `self` is a method entry in debug builds
+    pub fn as_cme(self) -> *const rb_callable_method_entry_t {
+        let ptr: *const rb_callable_method_entry_t = self.as_ptr();
+
+        #[cfg(debug_assertions)]
+        if !ptr.is_null() {
+            unsafe { rb_assert_cme_handle(self) }
+        }
+
+        ptr
+    }
+
+    pub const fn fixnum_from_usize(item: usize) -> Self {
+        assert!(item <= (RUBY_FIXNUM_MAX as usize)); // An unsigned will always be greater than RUBY_FIXNUM_MIN
+        let k: usize = item.wrapping_add(item.wrapping_add(1));
+        VALUE(k)
+    }
+
+    pub const fn fixnum_from_isize(item: isize) -> Self {
+        assert!(item >= RUBY_FIXNUM_MIN);
+        assert!(item <= RUBY_FIXNUM_MAX);
+        let k: isize = item.wrapping_add(item.wrapping_add(1));
+        VALUE(k as usize)
+    }
+}
+
+impl From<IseqPtr> for VALUE {
+    /// For `.into()` convenience
+    fn from(iseq: IseqPtr) -> Self {
+        VALUE(iseq as usize)
+    }
+}
+
+impl From<*const rb_callable_method_entry_t> for VALUE {
+    /// For `.into()` convenience
+    fn from(cme: *const rb_callable_method_entry_t) -> Self {
+        VALUE(cme as usize)
+    }
+}
+
+impl From<&str> for VALUE {
+    fn from(value: &str) -> Self {
+        rust_str_to_ruby(value)
+    }
+}
+
+impl From<String> for VALUE {
+    fn from(value: String) -> Self {
+        rust_str_to_ruby(&value)
+    }
+}
+
+impl From<VALUE> for u64 {
+    fn from(value: VALUE) -> Self {
+        let VALUE(uimm) = value;
+        uimm as u64
+    }
+}
+
+impl From<VALUE> for i64 {
+    fn from(value: VALUE) -> Self {
+        let VALUE(uimm) = value;
+        assert!(uimm <= (i64::MAX as usize));
+        uimm as i64
+    }
+}
+
+impl From<VALUE> for i32 {
+    fn from(value: VALUE) -> Self {
+        let VALUE(uimm) = value;
+        assert!(uimm <= (i32::MAX as usize));
+        uimm.try_into().unwrap()
+    }
+}
+
+impl From<VALUE> for u16 {
+    fn from(value: VALUE) -> Self {
+        let VALUE(uimm) = value;
+        uimm.try_into().unwrap()
+    }
+}
+
+impl ID {
+    // Get a debug representation of the contents of the ID. Since `str` is UTF-8
+    // and IDs have encodings that are not, this is a lossy representation.
+    pub fn contents_lossy(&self) -> std::borrow::Cow<'_, str> {
+        use std::borrow::Cow;
+        if self.0 == 0 {
+            Cow::Borrowed("ID(0)")
+        } else {
+            // Get the contents as a byte slice. IDs can have internal NUL bytes so rb_id2name,
+            // which returns a C string is more lossy than this approach.
+            let contents = unsafe { rb_id2str(*self) };
+            if contents == Qfalse {
+                Cow::Borrowed("ID(0)")
+            } else {
+                let slice = unsafe { contents.as_rstring_byte_slice() }
+                    .expect("rb_id2str() returned truthy non-string");
+                String::from_utf8_lossy(slice)
+            }
+        }
+    }
+}
+
+/// Produce a Ruby string from a Rust string slice
+pub fn rust_str_to_ruby(str: &str) -> VALUE {
+    unsafe { rb_utf8_str_new(str.as_ptr() as *const _, str.len() as i64) }
+}
+
+/// Produce a Ruby symbol from a Rust string slice
+pub fn rust_str_to_sym(str: &str) -> VALUE {
+    let c_str = CString::new(str).unwrap();
+    let c_ptr: *const c_char = c_str.as_ptr();
+    unsafe { rb_id2sym(rb_intern(c_ptr)) }
+}
+
+/// Produce an owned Rust String from a C char pointer
+pub fn cstr_to_rust_string(c_char_ptr: *const c_char) -> Option<String> {
+    assert!(c_char_ptr != std::ptr::null());
+
+    let c_str: &CStr = unsafe { CStr::from_ptr(c_char_ptr) };
+
+    match c_str.to_str() {
+        Ok(rust_str) => Some(rust_str.to_string()),
+        Err(_) => None
+    }
+}
+
+pub fn iseq_name(iseq: IseqPtr) -> String {
+    if iseq.is_null() {
+        return "<NULL>".to_string();
+    }
+    let iseq_label = unsafe { rb_iseq_label(iseq) };
+    if iseq_label == Qnil {
+        "None".to_string()
+    } else {
+        ruby_str_to_rust_string(iseq_label)
+    }
+}
+
+// Location is the file defining the method, colon, method name.
+// Filenames are sometimes internal strings supplied to eval,
+// so be careful with them.
+pub fn iseq_get_location(iseq: IseqPtr, pos: u16) -> String {
+    let iseq_path = unsafe { rb_iseq_path(iseq) };
+    let iseq_lineno = unsafe { rb_iseq_line_no(iseq, pos as usize) };
+
+    let mut s = iseq_name(iseq);
+    s.push_str("@");
+    if iseq_path == Qnil {
+        s.push_str("None");
+    } else {
+        s.push_str(&ruby_str_to_rust_string(iseq_path));
+    }
+    s.push_str(":");
+    s.push_str(&iseq_lineno.to_string());
+    s
+}
+
+
+// Convert a CRuby UTF-8-encoded RSTRING into a Rust string.
+// This should work fine on ASCII strings and anything else
+// that is considered legal UTF-8, including embedded nulls.
+fn ruby_str_to_rust_string(v: VALUE) -> String {
+    let str_ptr = unsafe { rb_RSTRING_PTR(v) } as *mut u8;
+    let str_len: usize = unsafe { rb_RSTRING_LEN(v) }.try_into().unwrap();
+    let str_slice: &[u8] = unsafe { std::slice::from_raw_parts(str_ptr, str_len) };
+    match String::from_utf8(str_slice.to_vec()) {
+        Ok(utf8) => utf8,
+        Err(_) => String::new(),
+    }
+}
+
+pub fn ruby_sym_to_rust_string(v: VALUE) -> String {
+    let ruby_str = unsafe { rb_sym2str(v) };
+    ruby_str_to_rust_string(ruby_str)
+}
+
+/// A location in Rust code for integrating with debugging facilities defined in C.
+/// Use the [src_loc!] macro to crate an instance.
+pub struct SourceLocation {
+    pub file: &'static CStr,
+    pub line: c_int,
+}
+
+impl Debug for SourceLocation {
+    fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
+        f.write_fmt(format_args!("{}:{}", self.file.to_string_lossy(), self.line))
+    }
+}
+
+/// Make a [SourceLocation] at the current spot.
+macro_rules! src_loc {
+    () => {
+        {
+            // Nul-terminated string with static lifetime, make a CStr out of it safely.
+            let file: &'static str = concat!(file!(), '\0');
+            $crate::cruby::SourceLocation {
+                file: unsafe { std::ffi::CStr::from_ptr(file.as_ptr().cast()) },
+                line: line!().try_into().unwrap(),
+            }
+        }
+    };
+}
+
+pub(crate) use src_loc;
+
+/// Run GC write barrier. Required after making a new edge in the object reference
+/// graph from `old` to `young`.
+macro_rules! obj_written {
+    ($old: expr, $young: expr) => {
+        let (old, young): (VALUE, VALUE) = ($old, $young);
+        let src_loc = $crate::cruby::src_loc!();
+        unsafe { rb_yjit_obj_written(old, young, src_loc.file.as_ptr(), src_loc.line) };
+    };
+}
+pub(crate) use obj_written;
+
+/// Acquire the VM lock, make sure all other Ruby threads are asleep then run
+/// some code while holding the lock. Returns whatever `func` returns.
+/// Use with [src_loc!].
+///
+/// Required for code patching in the presence of ractors.
+pub fn with_vm_lock<F, R>(loc: SourceLocation, func: F) -> R
+where
+    F: FnOnce() -> R + UnwindSafe,
+{
+    let file = loc.file.as_ptr();
+    let line = loc.line;
+    let mut recursive_lock_level: c_uint = 0;
+
+    unsafe { rb_zjit_vm_lock_then_barrier(&mut recursive_lock_level, file, line) };
+
+    let ret = match catch_unwind(func) {
+        Ok(result) => result,
+        Err(_) => {
+            // Theoretically we can recover from some of these panics,
+            // but it's too late if the unwind reaches here.
+
+            let _ = catch_unwind(|| {
+                // IO functions can panic too.
+                eprintln!(
+                    "ZJIT panicked while holding VM lock acquired at {}:{}. Aborting...",
+                    loc.file.to_string_lossy(),
+                    line,
+                );
+            });
+            std::process::abort();
+        }
+    };
+
+    unsafe { rb_zjit_vm_unlock(&mut recursive_lock_level, file, line) };
+
+    ret
+}
+
+/// At the moment, we abort in all cases we panic.
+/// To aid with getting diagnostics in the wild without requiring people to set
+/// RUST_BACKTRACE=1, register a panic hook that crash using rb_bug() for release builds.
+/// rb_bug() might not be as good at printing a call trace as Rust's stdlib, but
+/// it dumps some other info that might be relevant.
+///
+/// In case we want to start doing fancier exception handling with panic=unwind,
+/// we can revisit this later. For now, this helps to get us good bug reports.
+pub fn rb_bug_panic_hook() {
+    use std::env;
+    use std::panic;
+    use std::io::{stderr, Write};
+
+    // Probably the default hook. We do this very early during process boot.
+    let previous_hook = panic::take_hook();
+
+    panic::set_hook(Box::new(move |panic_info| {
+        // Not using `eprintln` to avoid double panic.
+        let _ = stderr().write_all(b"ruby: ZJIT has panicked. More info to follow...\n");
+
+        // Always show a Rust backtrace for release builds.
+        // You should set RUST_BACKTRACE=1 for dev builds.
+        let release_build = cfg!(not(debug_assertions));
+        if release_build {
+            unsafe { env::set_var("RUST_BACKTRACE", "1"); }
+        }
+        previous_hook(panic_info);
+
+        // Dump information about the interpreter for release builds.
+        // You may also use ZJIT_RB_BUG=1 to trigger this on dev builds.
+        if release_build || env::var("ZJIT_RB_BUG").is_ok() {
+            // Abort with rb_bug(). It has a length limit on the message.
+            let panic_message = &format!("{}", panic_info)[..];
+            let len = std::cmp::min(0x100, panic_message.len()) as c_int;
+            unsafe { rb_bug(b"ZJIT: %*s\0".as_ref().as_ptr() as *const c_char, len, panic_message.as_ptr()); }
+        } else {
+            eprintln!("note: run with `ZJIT_RB_BUG=1` environment variable to display a Ruby backtrace");
+        }
+    }));
+}
+
+// Non-idiomatic capitalization for consistency with CRuby code
+#[allow(non_upper_case_globals)]
+pub const Qfalse: VALUE = VALUE(RUBY_Qfalse as usize);
+#[allow(non_upper_case_globals)]
+pub const Qnil: VALUE = VALUE(RUBY_Qnil as usize);
+#[allow(non_upper_case_globals)]
+pub const Qtrue: VALUE = VALUE(RUBY_Qtrue as usize);
+#[allow(non_upper_case_globals)]
+pub const Qundef: VALUE = VALUE(RUBY_Qundef as usize);
+
+#[allow(unused)]
+mod manual_defs {
+    use super::*;
+
+    pub const SIZEOF_VALUE: usize = 8;
+    pub const SIZEOF_VALUE_I32: i32 = SIZEOF_VALUE as i32;
+    pub const VALUE_BITS: u8 = 8 * SIZEOF_VALUE as u8;
+
+    pub const RUBY_LONG_MIN: isize = std::os::raw::c_long::MIN as isize;
+    pub const RUBY_LONG_MAX: isize = std::os::raw::c_long::MAX as isize;
+
+    pub const RUBY_FIXNUM_MIN: isize = RUBY_LONG_MIN / 2;
+    pub const RUBY_FIXNUM_MAX: isize = RUBY_LONG_MAX / 2;
+
+    // From vm_callinfo.h - uses calculation that seems to confuse bindgen
+    pub const VM_CALL_ARGS_SIMPLE: u32 = 1 << VM_CALL_ARGS_SIMPLE_bit;
+    pub const VM_CALL_ARGS_SPLAT: u32 = 1 << VM_CALL_ARGS_SPLAT_bit;
+    pub const VM_CALL_ARGS_SPLAT_MUT: u32 = 1 << VM_CALL_ARGS_SPLAT_MUT_bit;
+    pub const VM_CALL_ARGS_BLOCKARG: u32 = 1 << VM_CALL_ARGS_BLOCKARG_bit;
+    pub const VM_CALL_FORWARDING: u32 = 1 << VM_CALL_FORWARDING_bit;
+    pub const VM_CALL_FCALL: u32 = 1 << VM_CALL_FCALL_bit;
+    pub const VM_CALL_KWARG: u32 = 1 << VM_CALL_KWARG_bit;
+    pub const VM_CALL_KW_SPLAT: u32 = 1 << VM_CALL_KW_SPLAT_bit;
+    pub const VM_CALL_KW_SPLAT_MUT: u32 = 1 << VM_CALL_KW_SPLAT_MUT_bit;
+    pub const VM_CALL_TAILCALL: u32 = 1 << VM_CALL_TAILCALL_bit;
+    pub const VM_CALL_SUPER : u32 = 1 << VM_CALL_SUPER_bit;
+    pub const VM_CALL_ZSUPER : u32 = 1 << VM_CALL_ZSUPER_bit;
+    pub const VM_CALL_OPT_SEND : u32 = 1 << VM_CALL_OPT_SEND_bit;
+
+    // From internal/struct.h - in anonymous enum, so we can't easily import it
+    pub const RSTRUCT_EMBED_LEN_MASK: usize = (RUBY_FL_USER7 | RUBY_FL_USER6 | RUBY_FL_USER5 | RUBY_FL_USER4 | RUBY_FL_USER3 |RUBY_FL_USER2 | RUBY_FL_USER1) as usize;
+
+    // From iseq.h - via a different constant, which seems to confuse bindgen
+    pub const ISEQ_TRANSLATED: usize = RUBY_FL_USER7 as usize;
+
+    // We'll need to encode a lot of Ruby struct/field offsets as constants unless we want to
+    // redeclare all the Ruby C structs and write our own offsetof macro. For now, we use constants.
+    pub const RUBY_OFFSET_RBASIC_FLAGS: i32 = 0; // struct RBasic, field "flags"
+    pub const RUBY_OFFSET_RBASIC_KLASS: i32 = 8; // struct RBasic, field "klass"
+    pub const RUBY_OFFSET_RARRAY_AS_HEAP_LEN: i32 = 16; // struct RArray, subfield "as.heap.len"
+    pub const RUBY_OFFSET_RARRAY_AS_HEAP_PTR: i32 = 32; // struct RArray, subfield "as.heap.ptr"
+    pub const RUBY_OFFSET_RARRAY_AS_ARY: i32 = 16; // struct RArray, subfield "as.ary"
+
+    pub const RUBY_OFFSET_RSTRUCT_AS_HEAP_PTR: i32 = 24; // struct RStruct, subfield "as.heap.ptr"
+    pub const RUBY_OFFSET_RSTRUCT_AS_ARY: i32 = 16; // struct RStruct, subfield "as.ary"
+
+    pub const RUBY_OFFSET_RSTRING_AS_HEAP_PTR: i32 = 24; // struct RString, subfield "as.heap.ptr"
+    pub const RUBY_OFFSET_RSTRING_AS_ARY: i32 = 24; // struct RString, subfield "as.embed.ary"
+
+    // Constants from rb_control_frame_t vm_core.h
+    pub const RUBY_OFFSET_CFP_PC: i32 = 0;
+    pub const RUBY_OFFSET_CFP_SP: i32 = 8;
+    pub const RUBY_OFFSET_CFP_ISEQ: i32 = 16;
+    pub const RUBY_OFFSET_CFP_SELF: i32 = 24;
+    pub const RUBY_OFFSET_CFP_EP: i32 = 32;
+    pub const RUBY_OFFSET_CFP_BLOCK_CODE: i32 = 40;
+    pub const RUBY_OFFSET_CFP_JIT_RETURN: i32 = 48;
+    pub const RUBY_SIZEOF_CONTROL_FRAME: usize = 56;
+
+    // Constants from rb_execution_context_t vm_core.h
+    pub const RUBY_OFFSET_EC_CFP: i32 = 16;
+    pub const RUBY_OFFSET_EC_INTERRUPT_FLAG: i32 = 32; // rb_atomic_t (u32)
+    pub const RUBY_OFFSET_EC_INTERRUPT_MASK: i32 = 36; // rb_atomic_t (u32)
+    pub const RUBY_OFFSET_EC_THREAD_PTR: i32 = 48;
+
+    // Constants from rb_thread_t in vm_core.h
+    pub const RUBY_OFFSET_THREAD_SELF: i32 = 16;
+
+    // Constants from iseq_inline_constant_cache (IC) and iseq_inline_constant_cache_entry (ICE) in vm_core.h
+    pub const RUBY_OFFSET_IC_ENTRY: i32 = 0;
+    pub const RUBY_OFFSET_ICE_VALUE: i32 = 8;
+}
+pub use manual_defs::*;
+
+#[cfg(test)]
+pub mod test_utils {
+    use std::{ptr::null, sync::Once};
+
+    use crate::{options::init_options, state::rb_zjit_enabled_p, state::ZJITState};
+
+    use super::*;
+
+    static RUBY_VM_INIT: Once = Once::new();
+
+    /// Boot and initialize the Ruby VM for Rust testing
+    fn boot_rubyvm() {
+        // Boot the VM
+        unsafe {
+            // TODO(alan): this init_stack call is incorrect. It sets the stack bottom, but
+            // when we return from this function will be be deeper in the stack.
+            // The callback for with_rubyvm() should run on a frame higher than this frame
+            // so the GC scans all the VALUEs on the stack.
+            // Consequently with_rubyvm() can only be used once per process, i.e. you can't
+            // boot and then run a few callbacks, because that risks putting VALUE outside
+            // the marked stack memory range.
+            //
+            // Need to also address the ergnomic issues addressed by
+            // <https://github.com/Shopify/zjit/pull/37>, though
+            let mut var: VALUE = Qnil;
+            ruby_init_stack(&mut var as *mut VALUE as *mut _);
+            ruby_init();
+
+            // Pass command line options so the VM loads core library methods defined in
+            // ruby such as from `kernel.rb`.
+            // We drive ZJIT manually in tests, so disable heuristic compilation triggers.
+            // (Also, pass this in case we offer a -DFORCE_ENABLE_ZJIT option which turns
+            // ZJIT on by default.)
+            let cmdline = [c"--disable-all".as_ptr().cast_mut(), c"-e0".as_ptr().cast_mut()];
+            let options_ret = ruby_options(2, cmdline.as_ptr().cast_mut());
+            assert_ne!(0, ruby_executable_node(options_ret, std::ptr::null_mut()), "command-line parsing failed");
+
+            crate::cruby::ids::init(); // for ID! usages in tests
+        }
+
+        // Set up globals for convenience
+        ZJITState::init(init_options());
+
+        // Enable zjit_* instructions
+        unsafe { rb_zjit_enabled_p = true; }
+    }
+
+    /// Make sure the Ruby VM is set up and run a given callback with rb_protect()
+    pub fn with_rubyvm<T>(mut func: impl FnMut() -> T) -> T {
+        RUBY_VM_INIT.call_once(|| boot_rubyvm());
+
+        // Set up a callback wrapper to store a return value
+        let mut result: Option<T> = None;
+        let mut data: &mut dyn FnMut() = &mut || {
+            // Store the result externally
+            result.replace(func());
+        };
+
+        // Invoke callback through rb_protect() so exceptions don't crash the process.
+        // "Fun" double pointer dance to get a thin function pointer to pass through C
+        unsafe extern "C" fn callback_wrapper(data: VALUE) -> VALUE {
+            // SAFETY: shorter lifetime than the data local in the caller frame
+            let callback: &mut &mut dyn FnMut() = unsafe { std::mem::transmute(data) };
+            callback();
+            Qnil
+        }
+
+        let mut state: c_int = 0;
+        unsafe { super::rb_protect(Some(callback_wrapper), VALUE((&mut data) as *mut _ as usize), &mut state) };
+        if state != 0 {
+            unsafe { rb_zjit_print_exception(); }
+            assert_eq!(0, state, "Exceptional unwind in callback. Ruby exception?");
+        }
+
+        result.expect("Callback did not set result")
+    }
+
+    /// Compile an ISeq via `RubyVM::InstructionSequence.compile`.
+    pub fn compile_to_iseq(program: &str) -> *const rb_iseq_t {
+        with_rubyvm(|| {
+            let wrapped_iseq = compile_to_wrapped_iseq(program);
+            unsafe { rb_iseqw_to_iseq(wrapped_iseq) }
+        })
+    }
+
+    pub fn define_class(name: &str, superclass: VALUE) -> VALUE {
+        let name = CString::new(name).unwrap();
+        unsafe { rb_define_class(name.as_ptr(), superclass) }
+    }
+
+    /// Evaluate a given Ruby program
+    pub fn eval(program: &str) -> VALUE {
+        with_rubyvm(|| {
+            let wrapped_iseq = compile_to_wrapped_iseq(&unindent(program, false));
+            unsafe { rb_funcallv(wrapped_iseq, ID!(eval), 0, null()) }
+        })
+    }
+
+    /// Get the ISeq of a specified method
+    pub fn get_method_iseq(recv: &str, name: &str) -> *const rb_iseq_t {
+        let wrapped_iseq = eval(&format!("RubyVM::InstructionSequence.of({}.method(:{}))", recv, name));
+        unsafe { rb_iseqw_to_iseq(wrapped_iseq) }
+    }
+
+    /// Remove the minimum indent from every line, skipping the first and last lines if `trim_lines`.
+    pub fn unindent(string: &str, trim_lines: bool) -> String {
+        // Break up a string into multiple lines
+        let mut lines: Vec<String> = string.split_inclusive("\n").map(|s| s.to_string()).collect();
+        if trim_lines { // raw string literals come with extra lines
+            lines.remove(0);
+            lines.remove(lines.len() - 1);
+        }
+
+        // Count the minimum number of spaces
+        let spaces = lines.iter().filter_map(|line| {
+            for (i, ch) in line.as_bytes().iter().enumerate() {
+                if *ch != b' ' {
+                    return Some(i);
+                }
+            }
+            None
+        }).min().unwrap_or(0);
+
+        // Join lines, removing spaces
+        let mut unindented: Vec<u8> = vec![];
+        for line in lines.iter() {
+            if line.len() > spaces {
+                unindented.extend_from_slice(&line.as_bytes()[spaces..]);
+            } else {
+                unindented.extend_from_slice(&line.as_bytes());
+            }
+        }
+        String::from_utf8(unindented).unwrap()
+    }
+
+    /// Compile a program into a RubyVM::InstructionSequence object
+    fn compile_to_wrapped_iseq(program: &str) -> VALUE {
+        let bytes = program.as_bytes().as_ptr() as *const c_char;
+        unsafe {
+            let program_str = rb_utf8_str_new(bytes, program.len().try_into().unwrap());
+            rb_funcallv(rb_cISeq, ID!(compile), 1, &program_str)
+        }
+    }
+
+    #[test]
+    fn boot_vm() {
+        // Test that we loaded kernel.rb and have Kernel#class
+        eval("1.class");
+    }
+
+    #[test]
+    #[should_panic]
+    fn ruby_exception_causes_panic() {
+        eval("raise");
+    }
+
+    #[test]
+    fn value_from_fixnum_in_range() {
+        assert_eq!(VALUE::fixnum_from_usize(2), VALUE(5));
+        assert_eq!(VALUE::fixnum_from_usize(0), VALUE(1));
+        assert_eq!(VALUE::fixnum_from_isize(-1), VALUE(0xffffffffffffffff));
+        assert_eq!(VALUE::fixnum_from_isize(-2), VALUE(0xfffffffffffffffd));
+        assert_eq!(VALUE::fixnum_from_usize(RUBY_FIXNUM_MAX as usize), VALUE(0x7fffffffffffffff));
+        assert_eq!(VALUE::fixnum_from_isize(RUBY_FIXNUM_MAX), VALUE(0x7fffffffffffffff));
+        assert_eq!(VALUE::fixnum_from_isize(RUBY_FIXNUM_MIN), VALUE(0x8000000000000001));
+    }
+
+    #[test]
+    fn value_as_fixnum() {
+        assert_eq!(VALUE::fixnum_from_usize(2).as_fixnum(), 2);
+        assert_eq!(VALUE::fixnum_from_usize(0).as_fixnum(), 0);
+        assert_eq!(VALUE::fixnum_from_isize(-1).as_fixnum(), -1);
+        assert_eq!(VALUE::fixnum_from_isize(-2).as_fixnum(), -2);
+        assert_eq!(VALUE::fixnum_from_usize(RUBY_FIXNUM_MAX as usize).as_fixnum(), RUBY_FIXNUM_MAX.try_into().unwrap());
+        assert_eq!(VALUE::fixnum_from_isize(RUBY_FIXNUM_MAX).as_fixnum(), RUBY_FIXNUM_MAX.try_into().unwrap());
+        assert_eq!(VALUE::fixnum_from_isize(RUBY_FIXNUM_MIN).as_fixnum(), RUBY_FIXNUM_MIN.try_into().unwrap());
+    }
+
+    #[test]
+    #[should_panic]
+    fn value_from_fixnum_too_big_usize() {
+        assert_eq!(VALUE::fixnum_from_usize((RUBY_FIXNUM_MAX+1) as usize), VALUE(1));
+    }
+
+    #[test]
+    #[should_panic]
+    fn value_from_fixnum_too_big_isize() {
+        assert_eq!(VALUE::fixnum_from_isize(RUBY_FIXNUM_MAX+1), VALUE(1));
+    }
+
+    #[test]
+    #[should_panic]
+    fn value_from_fixnum_too_small_usize() {
+        assert_eq!(VALUE::fixnum_from_usize((RUBY_FIXNUM_MIN-1) as usize), VALUE(1));
+    }
+
+    #[test]
+    #[should_panic]
+    fn value_from_fixnum_too_small_isize() {
+        assert_eq!(VALUE::fixnum_from_isize(RUBY_FIXNUM_MIN-1), VALUE(1));
+    }
+}
+#[cfg(test)]
+pub use test_utils::*;
+
+/// Get class name from a class pointer.
+pub fn get_class_name(class: VALUE) -> String {
+    // type checks for rb_class2name()
+    if unsafe { RB_TYPE_P(class, RUBY_T_MODULE) || RB_TYPE_P(class, RUBY_T_CLASS) } {
+        Some(class)
+    } else {
+        None
+    }.and_then(|class| unsafe {
+        cstr_to_rust_string(rb_class2name(class))
+    }).unwrap_or_else(|| "Unknown".to_string())
+}
+
+/// Interned ID values for Ruby symbols and method names.
+/// See [type@crate::cruby::ID] and usages outside of ZJIT.
+pub(crate) mod ids {
+    use std::sync::atomic::AtomicU64;
+    /// Globals to cache IDs on boot. Atomic to use with relaxed ordering
+    /// so reads can happen without `unsafe`. Synchronization done through
+    /// the VM lock.
+    macro_rules! def_ids {
+        ($(name: $name:ident $(content: $content:literal)?)*) => {
+            $(
+                pub static $name: AtomicU64 = AtomicU64::new(0);
+            )*
+
+            pub(crate) fn init() {
+                $(
+                    let content = stringify!($name);
+                    _ = content;
+                    $(let content = &$content;)?
+                    let ptr: *const u8 = content.as_ptr();
+
+                    // Lookup and cache each ID
+                    $name.store(
+                        unsafe { $crate::cruby::rb_intern2(ptr.cast(), content.len() as _) }.0,
+                        std::sync::atomic::Ordering::Relaxed
+                    );
+                )*
+
+            }
+        }
+    }
+
+    def_ids! {
+        name: NULL               content: b""
+        name: respond_to_missing content: b"respond_to_missing?"
+        name: eq                 content: b"=="
+        name: include_p          content: b"include?"
+        name: to_ary
+        name: to_s
+        name: compile
+        name: eval
+    }
+
+    /// Get an CRuby `ID` to an interned string, e.g. a particular method name.
+    macro_rules! ID {
+        ($id_name:ident) => {{
+            let id = $crate::cruby::ids::$id_name.load(std::sync::atomic::Ordering::Relaxed);
+            debug_assert_ne!(0, id, "ids module should be initialized");
+            ID(id)
+        }}
+    }
+    pub(crate) use ID;
+}
+pub(crate) use ids::ID;
diff --git a/zjit/src/cruby_bindings.inc.rs b/zjit/src/cruby_bindings.inc.rs
new file mode 100644
index 00000000000000..6ba13f9b2747fc
--- /dev/null
+++ b/zjit/src/cruby_bindings.inc.rs
@@ -0,0 +1,1013 @@
+/* automatically generated by rust-bindgen 0.71.1 */
+
+#[repr(C)]
+#[derive(Default)]
+pub struct __IncompleteArrayField<T>(::std::marker::PhantomData<T>, [T; 0]);
+impl<T> __IncompleteArrayField<T> {
+    #[inline]
+    pub const fn new() -> Self {
+        __IncompleteArrayField(::std::marker::PhantomData, [])
+    }
+    #[inline]
+    pub fn as_ptr(&self) -> *const T {
+        self as *const _ as *const T
+    }
+    #[inline]
+    pub fn as_mut_ptr(&mut self) -> *mut T {
+        self as *mut _ as *mut T
+    }
+    #[inline]
+    pub unsafe fn as_slice(&self, len: usize) -> &[T] {
+        ::std::slice::from_raw_parts(self.as_ptr(), len)
+    }
+    #[inline]
+    pub unsafe fn as_mut_slice(&mut self, len: usize) -> &mut [T] {
+        ::std::slice::from_raw_parts_mut(self.as_mut_ptr(), len)
+    }
+}
+impl<T> ::std::fmt::Debug for __IncompleteArrayField<T> {
+    fn fmt(&self, fmt: &mut ::std::fmt::Formatter<'_>) -> ::std::fmt::Result {
+        fmt.write_str("__IncompleteArrayField")
+    }
+}
+pub const INTEGER_REDEFINED_OP_FLAG: u32 = 1;
+pub const FLOAT_REDEFINED_OP_FLAG: u32 = 2;
+pub const STRING_REDEFINED_OP_FLAG: u32 = 4;
+pub const ARRAY_REDEFINED_OP_FLAG: u32 = 8;
+pub const HASH_REDEFINED_OP_FLAG: u32 = 16;
+pub const SYMBOL_REDEFINED_OP_FLAG: u32 = 64;
+pub const TIME_REDEFINED_OP_FLAG: u32 = 128;
+pub const REGEXP_REDEFINED_OP_FLAG: u32 = 256;
+pub const NIL_REDEFINED_OP_FLAG: u32 = 512;
+pub const TRUE_REDEFINED_OP_FLAG: u32 = 1024;
+pub const FALSE_REDEFINED_OP_FLAG: u32 = 2048;
+pub const PROC_REDEFINED_OP_FLAG: u32 = 4096;
+pub const VM_ENV_DATA_SIZE: u32 = 3;
+pub const VM_ENV_DATA_INDEX_ME_CREF: i32 = -2;
+pub const VM_ENV_DATA_INDEX_SPECVAL: i32 = -1;
+pub const VM_ENV_DATA_INDEX_FLAGS: u32 = 0;
+pub const VM_BLOCK_HANDLER_NONE: u32 = 0;
+pub const SHAPE_ID_NUM_BITS: u32 = 32;
+pub type rb_alloc_func_t = ::std::option::Option<unsafe extern "C" fn(klass: VALUE) -> VALUE>;
+pub const RUBY_Qfalse: ruby_special_consts = 0;
+pub const RUBY_Qnil: ruby_special_consts = 4;
+pub const RUBY_Qtrue: ruby_special_consts = 20;
+pub const RUBY_Qundef: ruby_special_consts = 36;
+pub const RUBY_IMMEDIATE_MASK: ruby_special_consts = 7;
+pub const RUBY_FIXNUM_FLAG: ruby_special_consts = 1;
+pub const RUBY_FLONUM_MASK: ruby_special_consts = 3;
+pub const RUBY_FLONUM_FLAG: ruby_special_consts = 2;
+pub const RUBY_SYMBOL_FLAG: ruby_special_consts = 12;
+pub const RUBY_SPECIAL_SHIFT: ruby_special_consts = 8;
+pub type ruby_special_consts = u32;
+#[repr(C)]
+pub struct RBasic {
+    pub flags: VALUE,
+    pub klass: VALUE,
+}
+pub const RUBY_T_NONE: ruby_value_type = 0;
+pub const RUBY_T_OBJECT: ruby_value_type = 1;
+pub const RUBY_T_CLASS: ruby_value_type = 2;
+pub const RUBY_T_MODULE: ruby_value_type = 3;
+pub const RUBY_T_FLOAT: ruby_value_type = 4;
+pub const RUBY_T_STRING: ruby_value_type = 5;
+pub const RUBY_T_REGEXP: ruby_value_type = 6;
+pub const RUBY_T_ARRAY: ruby_value_type = 7;
+pub const RUBY_T_HASH: ruby_value_type = 8;
+pub const RUBY_T_STRUCT: ruby_value_type = 9;
+pub const RUBY_T_BIGNUM: ruby_value_type = 10;
+pub const RUBY_T_FILE: ruby_value_type = 11;
+pub const RUBY_T_DATA: ruby_value_type = 12;
+pub const RUBY_T_MATCH: ruby_value_type = 13;
+pub const RUBY_T_COMPLEX: ruby_value_type = 14;
+pub const RUBY_T_RATIONAL: ruby_value_type = 15;
+pub const RUBY_T_NIL: ruby_value_type = 17;
+pub const RUBY_T_TRUE: ruby_value_type = 18;
+pub const RUBY_T_FALSE: ruby_value_type = 19;
+pub const RUBY_T_SYMBOL: ruby_value_type = 20;
+pub const RUBY_T_FIXNUM: ruby_value_type = 21;
+pub const RUBY_T_UNDEF: ruby_value_type = 22;
+pub const RUBY_T_IMEMO: ruby_value_type = 26;
+pub const RUBY_T_NODE: ruby_value_type = 27;
+pub const RUBY_T_ICLASS: ruby_value_type = 28;
+pub const RUBY_T_ZOMBIE: ruby_value_type = 29;
+pub const RUBY_T_MOVED: ruby_value_type = 30;
+pub const RUBY_T_MASK: ruby_value_type = 31;
+pub type ruby_value_type = u32;
+pub const RUBY_FL_USHIFT: ruby_fl_ushift = 12;
+pub type ruby_fl_ushift = u32;
+pub const RUBY_FL_WB_PROTECTED: ruby_fl_type = 32;
+pub const RUBY_FL_PROMOTED: ruby_fl_type = 32;
+pub const RUBY_FL_UNUSED6: ruby_fl_type = 64;
+pub const RUBY_FL_FINALIZE: ruby_fl_type = 128;
+pub const RUBY_FL_TAINT: ruby_fl_type = 0;
+pub const RUBY_FL_EXIVAR: ruby_fl_type = 0;
+pub const RUBY_FL_SHAREABLE: ruby_fl_type = 256;
+pub const RUBY_FL_UNTRUSTED: ruby_fl_type = 0;
+pub const RUBY_FL_UNUSED9: ruby_fl_type = 512;
+pub const RUBY_FL_UNUSED10: ruby_fl_type = 1024;
+pub const RUBY_FL_FREEZE: ruby_fl_type = 2048;
+pub const RUBY_FL_USER0: ruby_fl_type = 4096;
+pub const RUBY_FL_USER1: ruby_fl_type = 8192;
+pub const RUBY_FL_USER2: ruby_fl_type = 16384;
+pub const RUBY_FL_USER3: ruby_fl_type = 32768;
+pub const RUBY_FL_USER4: ruby_fl_type = 65536;
+pub const RUBY_FL_USER5: ruby_fl_type = 131072;
+pub const RUBY_FL_USER6: ruby_fl_type = 262144;
+pub const RUBY_FL_USER7: ruby_fl_type = 524288;
+pub const RUBY_FL_USER8: ruby_fl_type = 1048576;
+pub const RUBY_FL_USER9: ruby_fl_type = 2097152;
+pub const RUBY_FL_USER10: ruby_fl_type = 4194304;
+pub const RUBY_FL_USER11: ruby_fl_type = 8388608;
+pub const RUBY_FL_USER12: ruby_fl_type = 16777216;
+pub const RUBY_FL_USER13: ruby_fl_type = 33554432;
+pub const RUBY_FL_USER14: ruby_fl_type = 67108864;
+pub const RUBY_FL_USER15: ruby_fl_type = 134217728;
+pub const RUBY_FL_USER16: ruby_fl_type = 268435456;
+pub const RUBY_FL_USER17: ruby_fl_type = 536870912;
+pub const RUBY_FL_USER18: ruby_fl_type = 1073741824;
+pub const RUBY_FL_USER19: ruby_fl_type = -2147483648;
+pub const RUBY_ELTS_SHARED: ruby_fl_type = 4096;
+pub const RUBY_FL_SINGLETON: ruby_fl_type = 8192;
+pub type ruby_fl_type = i32;
+pub const RSTRING_NOEMBED: ruby_rstring_flags = 8192;
+pub const RSTRING_FSTR: ruby_rstring_flags = 536870912;
+pub type ruby_rstring_flags = u32;
+pub type st_data_t = ::std::os::raw::c_ulong;
+pub type st_index_t = st_data_t;
+pub const ST_CONTINUE: st_retval = 0;
+pub const ST_STOP: st_retval = 1;
+pub const ST_DELETE: st_retval = 2;
+pub const ST_CHECK: st_retval = 3;
+pub const ST_REPLACE: st_retval = 4;
+pub type st_retval = u32;
+pub type st_foreach_callback_func = ::std::option::Option<
+    unsafe extern "C" fn(
+        arg1: st_data_t,
+        arg2: st_data_t,
+        arg3: st_data_t,
+    ) -> ::std::os::raw::c_int,
+>;
+pub const RARRAY_EMBED_FLAG: ruby_rarray_flags = 8192;
+pub const RARRAY_EMBED_LEN_MASK: ruby_rarray_flags = 4161536;
+pub type ruby_rarray_flags = u32;
+pub const RARRAY_EMBED_LEN_SHIFT: ruby_rarray_consts = 15;
+pub type ruby_rarray_consts = u32;
+pub const RMODULE_IS_REFINEMENT: ruby_rmodule_flags = 8192;
+pub type ruby_rmodule_flags = u32;
+pub const ROBJECT_EMBED: ruby_robject_flags = 8192;
+pub type ruby_robject_flags = u32;
+pub const RUBY_ENCODING_INLINE_MAX: ruby_encoding_consts = 127;
+pub const RUBY_ENCODING_SHIFT: ruby_encoding_consts = 22;
+pub const RUBY_ENCODING_MASK: ruby_encoding_consts = 532676608;
+pub const RUBY_ENCODING_MAXNAMELEN: ruby_encoding_consts = 42;
+pub type ruby_encoding_consts = u32;
+pub const RUBY_ENCINDEX_ASCII_8BIT: ruby_preserved_encindex = 0;
+pub const RUBY_ENCINDEX_UTF_8: ruby_preserved_encindex = 1;
+pub const RUBY_ENCINDEX_US_ASCII: ruby_preserved_encindex = 2;
+pub const RUBY_ENCINDEX_UTF_16BE: ruby_preserved_encindex = 3;
+pub const RUBY_ENCINDEX_UTF_16LE: ruby_preserved_encindex = 4;
+pub const RUBY_ENCINDEX_UTF_32BE: ruby_preserved_encindex = 5;
+pub const RUBY_ENCINDEX_UTF_32LE: ruby_preserved_encindex = 6;
+pub const RUBY_ENCINDEX_UTF_16: ruby_preserved_encindex = 7;
+pub const RUBY_ENCINDEX_UTF_32: ruby_preserved_encindex = 8;
+pub const RUBY_ENCINDEX_UTF8_MAC: ruby_preserved_encindex = 9;
+pub const RUBY_ENCINDEX_EUC_JP: ruby_preserved_encindex = 10;
+pub const RUBY_ENCINDEX_Windows_31J: ruby_preserved_encindex = 11;
+pub const RUBY_ENCINDEX_BUILTIN_MAX: ruby_preserved_encindex = 12;
+pub type ruby_preserved_encindex = u32;
+pub const BOP_PLUS: ruby_basic_operators = 0;
+pub const BOP_MINUS: ruby_basic_operators = 1;
+pub const BOP_MULT: ruby_basic_operators = 2;
+pub const BOP_DIV: ruby_basic_operators = 3;
+pub const BOP_MOD: ruby_basic_operators = 4;
+pub const BOP_EQ: ruby_basic_operators = 5;
+pub const BOP_EQQ: ruby_basic_operators = 6;
+pub const BOP_LT: ruby_basic_operators = 7;
+pub const BOP_LE: ruby_basic_operators = 8;
+pub const BOP_LTLT: ruby_basic_operators = 9;
+pub const BOP_AREF: ruby_basic_operators = 10;
+pub const BOP_ASET: ruby_basic_operators = 11;
+pub const BOP_LENGTH: ruby_basic_operators = 12;
+pub const BOP_SIZE: ruby_basic_operators = 13;
+pub const BOP_EMPTY_P: ruby_basic_operators = 14;
+pub const BOP_NIL_P: ruby_basic_operators = 15;
+pub const BOP_SUCC: ruby_basic_operators = 16;
+pub const BOP_GT: ruby_basic_operators = 17;
+pub const BOP_GE: ruby_basic_operators = 18;
+pub const BOP_NOT: ruby_basic_operators = 19;
+pub const BOP_NEQ: ruby_basic_operators = 20;
+pub const BOP_MATCH: ruby_basic_operators = 21;
+pub const BOP_FREEZE: ruby_basic_operators = 22;
+pub const BOP_UMINUS: ruby_basic_operators = 23;
+pub const BOP_MAX: ruby_basic_operators = 24;
+pub const BOP_MIN: ruby_basic_operators = 25;
+pub const BOP_HASH: ruby_basic_operators = 26;
+pub const BOP_CALL: ruby_basic_operators = 27;
+pub const BOP_AND: ruby_basic_operators = 28;
+pub const BOP_OR: ruby_basic_operators = 29;
+pub const BOP_CMP: ruby_basic_operators = 30;
+pub const BOP_DEFAULT: ruby_basic_operators = 31;
+pub const BOP_PACK: ruby_basic_operators = 32;
+pub const BOP_INCLUDE_P: ruby_basic_operators = 33;
+pub const BOP_LAST_: ruby_basic_operators = 34;
+pub type ruby_basic_operators = u32;
+pub type rb_serial_t = ::std::os::raw::c_ulonglong;
+pub const imemo_env: imemo_type = 0;
+pub const imemo_cref: imemo_type = 1;
+pub const imemo_svar: imemo_type = 2;
+pub const imemo_throw_data: imemo_type = 3;
+pub const imemo_ifunc: imemo_type = 4;
+pub const imemo_memo: imemo_type = 5;
+pub const imemo_ment: imemo_type = 6;
+pub const imemo_iseq: imemo_type = 7;
+pub const imemo_tmpbuf: imemo_type = 8;
+pub const imemo_ast: imemo_type = 9;
+pub const imemo_parser_strterm: imemo_type = 10;
+pub const imemo_callinfo: imemo_type = 11;
+pub const imemo_callcache: imemo_type = 12;
+pub const imemo_constcache: imemo_type = 13;
+pub const imemo_fields: imemo_type = 14;
+pub type imemo_type = u32;
+pub const METHOD_VISI_UNDEF: rb_method_visibility_t = 0;
+pub const METHOD_VISI_PUBLIC: rb_method_visibility_t = 1;
+pub const METHOD_VISI_PRIVATE: rb_method_visibility_t = 2;
+pub const METHOD_VISI_PROTECTED: rb_method_visibility_t = 3;
+pub const METHOD_VISI_MASK: rb_method_visibility_t = 3;
+pub type rb_method_visibility_t = u32;
+#[repr(C)]
+pub struct rb_method_entry_struct {
+    pub flags: VALUE,
+    pub defined_class: VALUE,
+    pub def: *mut rb_method_definition_struct,
+    pub called_id: ID,
+    pub owner: VALUE,
+}
+pub type rb_method_entry_t = rb_method_entry_struct;
+#[repr(C)]
+pub struct rb_callable_method_entry_struct {
+    pub flags: VALUE,
+    pub defined_class: VALUE,
+    pub def: *mut rb_method_definition_struct,
+    pub called_id: ID,
+    pub owner: VALUE,
+}
+pub type rb_callable_method_entry_t = rb_callable_method_entry_struct;
+pub const VM_METHOD_TYPE_ISEQ: rb_method_type_t = 0;
+pub const VM_METHOD_TYPE_CFUNC: rb_method_type_t = 1;
+pub const VM_METHOD_TYPE_ATTRSET: rb_method_type_t = 2;
+pub const VM_METHOD_TYPE_IVAR: rb_method_type_t = 3;
+pub const VM_METHOD_TYPE_BMETHOD: rb_method_type_t = 4;
+pub const VM_METHOD_TYPE_ZSUPER: rb_method_type_t = 5;
+pub const VM_METHOD_TYPE_ALIAS: rb_method_type_t = 6;
+pub const VM_METHOD_TYPE_UNDEF: rb_method_type_t = 7;
+pub const VM_METHOD_TYPE_NOTIMPLEMENTED: rb_method_type_t = 8;
+pub const VM_METHOD_TYPE_OPTIMIZED: rb_method_type_t = 9;
+pub const VM_METHOD_TYPE_MISSING: rb_method_type_t = 10;
+pub const VM_METHOD_TYPE_REFINED: rb_method_type_t = 11;
+pub type rb_method_type_t = u32;
+pub type rb_cfunc_t = ::std::option::Option<unsafe extern "C" fn() -> VALUE>;
+#[repr(C)]
+#[derive(Debug, Copy, Clone)]
+pub struct rb_method_cfunc_struct {
+    pub func: rb_cfunc_t,
+    pub invoker: ::std::option::Option<
+        unsafe extern "C" fn(
+            recv: VALUE,
+            argc: ::std::os::raw::c_int,
+            argv: *const VALUE,
+            func: ::std::option::Option<unsafe extern "C" fn() -> VALUE>,
+        ) -> VALUE,
+    >,
+    pub argc: ::std::os::raw::c_int,
+}
+pub const OPTIMIZED_METHOD_TYPE_SEND: method_optimized_type = 0;
+pub const OPTIMIZED_METHOD_TYPE_CALL: method_optimized_type = 1;
+pub const OPTIMIZED_METHOD_TYPE_BLOCK_CALL: method_optimized_type = 2;
+pub const OPTIMIZED_METHOD_TYPE_STRUCT_AREF: method_optimized_type = 3;
+pub const OPTIMIZED_METHOD_TYPE_STRUCT_ASET: method_optimized_type = 4;
+pub const OPTIMIZED_METHOD_TYPE__MAX: method_optimized_type = 5;
+pub type method_optimized_type = u32;
+pub type rb_num_t = ::std::os::raw::c_ulong;
+pub const RUBY_TAG_NONE: ruby_tag_type = 0;
+pub const RUBY_TAG_RETURN: ruby_tag_type = 1;
+pub const RUBY_TAG_BREAK: ruby_tag_type = 2;
+pub const RUBY_TAG_NEXT: ruby_tag_type = 3;
+pub const RUBY_TAG_RETRY: ruby_tag_type = 4;
+pub const RUBY_TAG_REDO: ruby_tag_type = 5;
+pub const RUBY_TAG_RAISE: ruby_tag_type = 6;
+pub const RUBY_TAG_THROW: ruby_tag_type = 7;
+pub const RUBY_TAG_FATAL: ruby_tag_type = 8;
+pub const RUBY_TAG_MASK: ruby_tag_type = 15;
+pub type ruby_tag_type = u32;
+pub const VM_THROW_NO_ESCAPE_FLAG: ruby_vm_throw_flags = 32768;
+pub const VM_THROW_STATE_MASK: ruby_vm_throw_flags = 255;
+pub type ruby_vm_throw_flags = u32;
+#[repr(C)]
+pub struct iseq_inline_constant_cache_entry {
+    pub flags: VALUE,
+    pub value: VALUE,
+    pub _unused1: VALUE,
+    pub _unused2: VALUE,
+    pub ic_cref: *const rb_cref_t,
+}
+#[repr(C)]
+#[derive(Debug, Copy, Clone)]
+pub struct iseq_inline_constant_cache {
+    pub entry: *mut iseq_inline_constant_cache_entry,
+    pub segments: *const ID,
+}
+#[repr(C)]
+pub struct iseq_inline_iv_cache_entry {
+    pub value: u64,
+    pub iv_set_name: ID,
+}
+#[repr(C)]
+#[derive(Debug, Copy, Clone)]
+pub struct iseq_inline_cvar_cache_entry {
+    pub entry: *mut rb_cvar_class_tbl_entry,
+}
+pub const ISEQ_TYPE_TOP: rb_iseq_type = 0;
+pub const ISEQ_TYPE_METHOD: rb_iseq_type = 1;
+pub const ISEQ_TYPE_BLOCK: rb_iseq_type = 2;
+pub const ISEQ_TYPE_CLASS: rb_iseq_type = 3;
+pub const ISEQ_TYPE_RESCUE: rb_iseq_type = 4;
+pub const ISEQ_TYPE_ENSURE: rb_iseq_type = 5;
+pub const ISEQ_TYPE_EVAL: rb_iseq_type = 6;
+pub const ISEQ_TYPE_MAIN: rb_iseq_type = 7;
+pub const ISEQ_TYPE_PLAIN: rb_iseq_type = 8;
+pub type rb_iseq_type = u32;
+pub const BUILTIN_ATTR_LEAF: rb_builtin_attr = 1;
+pub const BUILTIN_ATTR_SINGLE_NOARG_LEAF: rb_builtin_attr = 2;
+pub const BUILTIN_ATTR_INLINE_BLOCK: rb_builtin_attr = 4;
+pub const BUILTIN_ATTR_C_TRACE: rb_builtin_attr = 8;
+pub type rb_builtin_attr = u32;
+#[repr(C)]
+#[derive(Debug, Copy, Clone)]
+pub struct rb_iseq_constant_body__bindgen_ty_1_rb_iseq_param_keyword {
+    pub num: ::std::os::raw::c_int,
+    pub required_num: ::std::os::raw::c_int,
+    pub bits_start: ::std::os::raw::c_int,
+    pub rest_start: ::std::os::raw::c_int,
+    pub table: *const ID,
+    pub default_values: *mut VALUE,
+}
+pub type rb_control_frame_t = rb_control_frame_struct;
+pub const VM_CHECKMATCH_TYPE_WHEN: vm_check_match_type = 1;
+pub const VM_CHECKMATCH_TYPE_CASE: vm_check_match_type = 2;
+pub const VM_CHECKMATCH_TYPE_RESCUE: vm_check_match_type = 3;
+pub type vm_check_match_type = u32;
+pub const VM_OPT_NEWARRAY_SEND_MAX: vm_opt_newarray_send_type = 1;
+pub const VM_OPT_NEWARRAY_SEND_MIN: vm_opt_newarray_send_type = 2;
+pub const VM_OPT_NEWARRAY_SEND_HASH: vm_opt_newarray_send_type = 3;
+pub const VM_OPT_NEWARRAY_SEND_PACK: vm_opt_newarray_send_type = 4;
+pub const VM_OPT_NEWARRAY_SEND_PACK_BUFFER: vm_opt_newarray_send_type = 5;
+pub const VM_OPT_NEWARRAY_SEND_INCLUDE_P: vm_opt_newarray_send_type = 6;
+pub type vm_opt_newarray_send_type = u32;
+pub const VM_SPECIAL_OBJECT_VMCORE: vm_special_object_type = 1;
+pub const VM_SPECIAL_OBJECT_CBASE: vm_special_object_type = 2;
+pub const VM_SPECIAL_OBJECT_CONST_BASE: vm_special_object_type = 3;
+pub type vm_special_object_type = u32;
+pub type IC = *mut iseq_inline_constant_cache;
+pub type IVC = *mut iseq_inline_iv_cache_entry;
+pub type ICVARC = *mut iseq_inline_cvar_cache_entry;
+pub const VM_FRAME_MAGIC_METHOD: vm_frame_env_flags = 286326785;
+pub const VM_FRAME_MAGIC_BLOCK: vm_frame_env_flags = 572653569;
+pub const VM_FRAME_MAGIC_CLASS: vm_frame_env_flags = 858980353;
+pub const VM_FRAME_MAGIC_TOP: vm_frame_env_flags = 1145307137;
+pub const VM_FRAME_MAGIC_CFUNC: vm_frame_env_flags = 1431633921;
+pub const VM_FRAME_MAGIC_IFUNC: vm_frame_env_flags = 1717960705;
+pub const VM_FRAME_MAGIC_EVAL: vm_frame_env_flags = 2004287489;
+pub const VM_FRAME_MAGIC_RESCUE: vm_frame_env_flags = 2022178817;
+pub const VM_FRAME_MAGIC_DUMMY: vm_frame_env_flags = 2040070145;
+pub const VM_FRAME_MAGIC_MASK: vm_frame_env_flags = 2147418113;
+pub const VM_FRAME_FLAG_FINISH: vm_frame_env_flags = 32;
+pub const VM_FRAME_FLAG_BMETHOD: vm_frame_env_flags = 64;
+pub const VM_FRAME_FLAG_CFRAME: vm_frame_env_flags = 128;
+pub const VM_FRAME_FLAG_LAMBDA: vm_frame_env_flags = 256;
+pub const VM_FRAME_FLAG_MODIFIED_BLOCK_PARAM: vm_frame_env_flags = 512;
+pub const VM_FRAME_FLAG_CFRAME_KW: vm_frame_env_flags = 1024;
+pub const VM_FRAME_FLAG_PASSED: vm_frame_env_flags = 2048;
+pub const VM_FRAME_FLAG_NS_SWITCH: vm_frame_env_flags = 4096;
+pub const VM_FRAME_FLAG_LOAD_ISEQ: vm_frame_env_flags = 8192;
+pub const VM_ENV_FLAG_LOCAL: vm_frame_env_flags = 2;
+pub const VM_ENV_FLAG_ESCAPED: vm_frame_env_flags = 4;
+pub const VM_ENV_FLAG_WB_REQUIRED: vm_frame_env_flags = 8;
+pub const VM_ENV_FLAG_ISOLATED: vm_frame_env_flags = 16;
+pub type vm_frame_env_flags = u32;
+pub type attr_index_t = u16;
+pub type shape_id_t = u32;
+#[repr(C)]
+pub struct rb_cvar_class_tbl_entry {
+    pub index: u32,
+    pub global_cvar_state: rb_serial_t,
+    pub cref: *const rb_cref_t,
+    pub class_value: VALUE,
+}
+pub const VM_CALL_ARGS_SPLAT_bit: vm_call_flag_bits = 0;
+pub const VM_CALL_ARGS_BLOCKARG_bit: vm_call_flag_bits = 1;
+pub const VM_CALL_FCALL_bit: vm_call_flag_bits = 2;
+pub const VM_CALL_VCALL_bit: vm_call_flag_bits = 3;
+pub const VM_CALL_ARGS_SIMPLE_bit: vm_call_flag_bits = 4;
+pub const VM_CALL_KWARG_bit: vm_call_flag_bits = 5;
+pub const VM_CALL_KW_SPLAT_bit: vm_call_flag_bits = 6;
+pub const VM_CALL_TAILCALL_bit: vm_call_flag_bits = 7;
+pub const VM_CALL_SUPER_bit: vm_call_flag_bits = 8;
+pub const VM_CALL_ZSUPER_bit: vm_call_flag_bits = 9;
+pub const VM_CALL_OPT_SEND_bit: vm_call_flag_bits = 10;
+pub const VM_CALL_KW_SPLAT_MUT_bit: vm_call_flag_bits = 11;
+pub const VM_CALL_ARGS_SPLAT_MUT_bit: vm_call_flag_bits = 12;
+pub const VM_CALL_FORWARDING_bit: vm_call_flag_bits = 13;
+pub const VM_CALL__END: vm_call_flag_bits = 14;
+pub type vm_call_flag_bits = u32;
+#[repr(C)]
+pub struct rb_callinfo_kwarg {
+    pub keyword_len: ::std::os::raw::c_int,
+    pub references: ::std::os::raw::c_int,
+    pub keywords: __IncompleteArrayField<VALUE>,
+}
+#[repr(C)]
+pub struct rb_callinfo {
+    pub flags: VALUE,
+    pub kwarg: *const rb_callinfo_kwarg,
+    pub mid: VALUE,
+    pub flag: VALUE,
+    pub argc: VALUE,
+}
+#[repr(C)]
+#[derive(Debug, Copy, Clone)]
+pub struct rb_call_data {
+    pub ci: *const rb_callinfo,
+    pub cc: *const rb_callcache,
+}
+pub const RSTRING_CHILLED: ruby_rstring_private_flags = 49152;
+pub type ruby_rstring_private_flags = u32;
+pub const RHASH_PASS_AS_KEYWORDS: ruby_rhash_flags = 8192;
+pub const RHASH_PROC_DEFAULT: ruby_rhash_flags = 16384;
+pub const RHASH_ST_TABLE_FLAG: ruby_rhash_flags = 32768;
+pub const RHASH_AR_TABLE_SIZE_MASK: ruby_rhash_flags = 983040;
+pub const RHASH_AR_TABLE_SIZE_SHIFT: ruby_rhash_flags = 16;
+pub const RHASH_AR_TABLE_BOUND_MASK: ruby_rhash_flags = 15728640;
+pub const RHASH_AR_TABLE_BOUND_SHIFT: ruby_rhash_flags = 20;
+pub const RHASH_LEV_SHIFT: ruby_rhash_flags = 25;
+pub const RHASH_LEV_MAX: ruby_rhash_flags = 127;
+pub type ruby_rhash_flags = u32;
+#[repr(C)]
+#[derive(Debug, Copy, Clone)]
+pub struct rb_builtin_function {
+    pub func_ptr: *const ::std::os::raw::c_void,
+    pub argc: ::std::os::raw::c_int,
+    pub index: ::std::os::raw::c_int,
+    pub name: *const ::std::os::raw::c_char,
+}
+pub const YARVINSN_nop: ruby_vminsn_type = 0;
+pub const YARVINSN_getlocal: ruby_vminsn_type = 1;
+pub const YARVINSN_setlocal: ruby_vminsn_type = 2;
+pub const YARVINSN_getblockparam: ruby_vminsn_type = 3;
+pub const YARVINSN_setblockparam: ruby_vminsn_type = 4;
+pub const YARVINSN_getblockparamproxy: ruby_vminsn_type = 5;
+pub const YARVINSN_getspecial: ruby_vminsn_type = 6;
+pub const YARVINSN_setspecial: ruby_vminsn_type = 7;
+pub const YARVINSN_getinstancevariable: ruby_vminsn_type = 8;
+pub const YARVINSN_setinstancevariable: ruby_vminsn_type = 9;
+pub const YARVINSN_getclassvariable: ruby_vminsn_type = 10;
+pub const YARVINSN_setclassvariable: ruby_vminsn_type = 11;
+pub const YARVINSN_opt_getconstant_path: ruby_vminsn_type = 12;
+pub const YARVINSN_getconstant: ruby_vminsn_type = 13;
+pub const YARVINSN_setconstant: ruby_vminsn_type = 14;
+pub const YARVINSN_getglobal: ruby_vminsn_type = 15;
+pub const YARVINSN_setglobal: ruby_vminsn_type = 16;
+pub const YARVINSN_putnil: ruby_vminsn_type = 17;
+pub const YARVINSN_putself: ruby_vminsn_type = 18;
+pub const YARVINSN_putobject: ruby_vminsn_type = 19;
+pub const YARVINSN_putspecialobject: ruby_vminsn_type = 20;
+pub const YARVINSN_putstring: ruby_vminsn_type = 21;
+pub const YARVINSN_putchilledstring: ruby_vminsn_type = 22;
+pub const YARVINSN_concatstrings: ruby_vminsn_type = 23;
+pub const YARVINSN_anytostring: ruby_vminsn_type = 24;
+pub const YARVINSN_toregexp: ruby_vminsn_type = 25;
+pub const YARVINSN_intern: ruby_vminsn_type = 26;
+pub const YARVINSN_newarray: ruby_vminsn_type = 27;
+pub const YARVINSN_pushtoarraykwsplat: ruby_vminsn_type = 28;
+pub const YARVINSN_duparray: ruby_vminsn_type = 29;
+pub const YARVINSN_duphash: ruby_vminsn_type = 30;
+pub const YARVINSN_expandarray: ruby_vminsn_type = 31;
+pub const YARVINSN_concatarray: ruby_vminsn_type = 32;
+pub const YARVINSN_concattoarray: ruby_vminsn_type = 33;
+pub const YARVINSN_pushtoarray: ruby_vminsn_type = 34;
+pub const YARVINSN_splatarray: ruby_vminsn_type = 35;
+pub const YARVINSN_splatkw: ruby_vminsn_type = 36;
+pub const YARVINSN_newhash: ruby_vminsn_type = 37;
+pub const YARVINSN_newrange: ruby_vminsn_type = 38;
+pub const YARVINSN_pop: ruby_vminsn_type = 39;
+pub const YARVINSN_dup: ruby_vminsn_type = 40;
+pub const YARVINSN_dupn: ruby_vminsn_type = 41;
+pub const YARVINSN_swap: ruby_vminsn_type = 42;
+pub const YARVINSN_opt_reverse: ruby_vminsn_type = 43;
+pub const YARVINSN_topn: ruby_vminsn_type = 44;
+pub const YARVINSN_setn: ruby_vminsn_type = 45;
+pub const YARVINSN_adjuststack: ruby_vminsn_type = 46;
+pub const YARVINSN_defined: ruby_vminsn_type = 47;
+pub const YARVINSN_definedivar: ruby_vminsn_type = 48;
+pub const YARVINSN_checkmatch: ruby_vminsn_type = 49;
+pub const YARVINSN_checkkeyword: ruby_vminsn_type = 50;
+pub const YARVINSN_checktype: ruby_vminsn_type = 51;
+pub const YARVINSN_defineclass: ruby_vminsn_type = 52;
+pub const YARVINSN_definemethod: ruby_vminsn_type = 53;
+pub const YARVINSN_definesmethod: ruby_vminsn_type = 54;
+pub const YARVINSN_send: ruby_vminsn_type = 55;
+pub const YARVINSN_sendforward: ruby_vminsn_type = 56;
+pub const YARVINSN_opt_send_without_block: ruby_vminsn_type = 57;
+pub const YARVINSN_opt_new: ruby_vminsn_type = 58;
+pub const YARVINSN_objtostring: ruby_vminsn_type = 59;
+pub const YARVINSN_opt_ary_freeze: ruby_vminsn_type = 60;
+pub const YARVINSN_opt_hash_freeze: ruby_vminsn_type = 61;
+pub const YARVINSN_opt_str_freeze: ruby_vminsn_type = 62;
+pub const YARVINSN_opt_nil_p: ruby_vminsn_type = 63;
+pub const YARVINSN_opt_str_uminus: ruby_vminsn_type = 64;
+pub const YARVINSN_opt_duparray_send: ruby_vminsn_type = 65;
+pub const YARVINSN_opt_newarray_send: ruby_vminsn_type = 66;
+pub const YARVINSN_invokesuper: ruby_vminsn_type = 67;
+pub const YARVINSN_invokesuperforward: ruby_vminsn_type = 68;
+pub const YARVINSN_invokeblock: ruby_vminsn_type = 69;
+pub const YARVINSN_leave: ruby_vminsn_type = 70;
+pub const YARVINSN_throw: ruby_vminsn_type = 71;
+pub const YARVINSN_jump: ruby_vminsn_type = 72;
+pub const YARVINSN_branchif: ruby_vminsn_type = 73;
+pub const YARVINSN_branchunless: ruby_vminsn_type = 74;
+pub const YARVINSN_branchnil: ruby_vminsn_type = 75;
+pub const YARVINSN_once: ruby_vminsn_type = 76;
+pub const YARVINSN_opt_case_dispatch: ruby_vminsn_type = 77;
+pub const YARVINSN_opt_plus: ruby_vminsn_type = 78;
+pub const YARVINSN_opt_minus: ruby_vminsn_type = 79;
+pub const YARVINSN_opt_mult: ruby_vminsn_type = 80;
+pub const YARVINSN_opt_div: ruby_vminsn_type = 81;
+pub const YARVINSN_opt_mod: ruby_vminsn_type = 82;
+pub const YARVINSN_opt_eq: ruby_vminsn_type = 83;
+pub const YARVINSN_opt_neq: ruby_vminsn_type = 84;
+pub const YARVINSN_opt_lt: ruby_vminsn_type = 85;
+pub const YARVINSN_opt_le: ruby_vminsn_type = 86;
+pub const YARVINSN_opt_gt: ruby_vminsn_type = 87;
+pub const YARVINSN_opt_ge: ruby_vminsn_type = 88;
+pub const YARVINSN_opt_ltlt: ruby_vminsn_type = 89;
+pub const YARVINSN_opt_and: ruby_vminsn_type = 90;
+pub const YARVINSN_opt_or: ruby_vminsn_type = 91;
+pub const YARVINSN_opt_aref: ruby_vminsn_type = 92;
+pub const YARVINSN_opt_aset: ruby_vminsn_type = 93;
+pub const YARVINSN_opt_aset_with: ruby_vminsn_type = 94;
+pub const YARVINSN_opt_aref_with: ruby_vminsn_type = 95;
+pub const YARVINSN_opt_length: ruby_vminsn_type = 96;
+pub const YARVINSN_opt_size: ruby_vminsn_type = 97;
+pub const YARVINSN_opt_empty_p: ruby_vminsn_type = 98;
+pub const YARVINSN_opt_succ: ruby_vminsn_type = 99;
+pub const YARVINSN_opt_not: ruby_vminsn_type = 100;
+pub const YARVINSN_opt_regexpmatch2: ruby_vminsn_type = 101;
+pub const YARVINSN_invokebuiltin: ruby_vminsn_type = 102;
+pub const YARVINSN_opt_invokebuiltin_delegate: ruby_vminsn_type = 103;
+pub const YARVINSN_opt_invokebuiltin_delegate_leave: ruby_vminsn_type = 104;
+pub const YARVINSN_getlocal_WC_0: ruby_vminsn_type = 105;
+pub const YARVINSN_getlocal_WC_1: ruby_vminsn_type = 106;
+pub const YARVINSN_setlocal_WC_0: ruby_vminsn_type = 107;
+pub const YARVINSN_setlocal_WC_1: ruby_vminsn_type = 108;
+pub const YARVINSN_putobject_INT2FIX_0_: ruby_vminsn_type = 109;
+pub const YARVINSN_putobject_INT2FIX_1_: ruby_vminsn_type = 110;
+pub const YARVINSN_trace_nop: ruby_vminsn_type = 111;
+pub const YARVINSN_trace_getlocal: ruby_vminsn_type = 112;
+pub const YARVINSN_trace_setlocal: ruby_vminsn_type = 113;
+pub const YARVINSN_trace_getblockparam: ruby_vminsn_type = 114;
+pub const YARVINSN_trace_setblockparam: ruby_vminsn_type = 115;
+pub const YARVINSN_trace_getblockparamproxy: ruby_vminsn_type = 116;
+pub const YARVINSN_trace_getspecial: ruby_vminsn_type = 117;
+pub const YARVINSN_trace_setspecial: ruby_vminsn_type = 118;
+pub const YARVINSN_trace_getinstancevariable: ruby_vminsn_type = 119;
+pub const YARVINSN_trace_setinstancevariable: ruby_vminsn_type = 120;
+pub const YARVINSN_trace_getclassvariable: ruby_vminsn_type = 121;
+pub const YARVINSN_trace_setclassvariable: ruby_vminsn_type = 122;
+pub const YARVINSN_trace_opt_getconstant_path: ruby_vminsn_type = 123;
+pub const YARVINSN_trace_getconstant: ruby_vminsn_type = 124;
+pub const YARVINSN_trace_setconstant: ruby_vminsn_type = 125;
+pub const YARVINSN_trace_getglobal: ruby_vminsn_type = 126;
+pub const YARVINSN_trace_setglobal: ruby_vminsn_type = 127;
+pub const YARVINSN_trace_putnil: ruby_vminsn_type = 128;
+pub const YARVINSN_trace_putself: ruby_vminsn_type = 129;
+pub const YARVINSN_trace_putobject: ruby_vminsn_type = 130;
+pub const YARVINSN_trace_putspecialobject: ruby_vminsn_type = 131;
+pub const YARVINSN_trace_putstring: ruby_vminsn_type = 132;
+pub const YARVINSN_trace_putchilledstring: ruby_vminsn_type = 133;
+pub const YARVINSN_trace_concatstrings: ruby_vminsn_type = 134;
+pub const YARVINSN_trace_anytostring: ruby_vminsn_type = 135;
+pub const YARVINSN_trace_toregexp: ruby_vminsn_type = 136;
+pub const YARVINSN_trace_intern: ruby_vminsn_type = 137;
+pub const YARVINSN_trace_newarray: ruby_vminsn_type = 138;
+pub const YARVINSN_trace_pushtoarraykwsplat: ruby_vminsn_type = 139;
+pub const YARVINSN_trace_duparray: ruby_vminsn_type = 140;
+pub const YARVINSN_trace_duphash: ruby_vminsn_type = 141;
+pub const YARVINSN_trace_expandarray: ruby_vminsn_type = 142;
+pub const YARVINSN_trace_concatarray: ruby_vminsn_type = 143;
+pub const YARVINSN_trace_concattoarray: ruby_vminsn_type = 144;
+pub const YARVINSN_trace_pushtoarray: ruby_vminsn_type = 145;
+pub const YARVINSN_trace_splatarray: ruby_vminsn_type = 146;
+pub const YARVINSN_trace_splatkw: ruby_vminsn_type = 147;
+pub const YARVINSN_trace_newhash: ruby_vminsn_type = 148;
+pub const YARVINSN_trace_newrange: ruby_vminsn_type = 149;
+pub const YARVINSN_trace_pop: ruby_vminsn_type = 150;
+pub const YARVINSN_trace_dup: ruby_vminsn_type = 151;
+pub const YARVINSN_trace_dupn: ruby_vminsn_type = 152;
+pub const YARVINSN_trace_swap: ruby_vminsn_type = 153;
+pub const YARVINSN_trace_opt_reverse: ruby_vminsn_type = 154;
+pub const YARVINSN_trace_topn: ruby_vminsn_type = 155;
+pub const YARVINSN_trace_setn: ruby_vminsn_type = 156;
+pub const YARVINSN_trace_adjuststack: ruby_vminsn_type = 157;
+pub const YARVINSN_trace_defined: ruby_vminsn_type = 158;
+pub const YARVINSN_trace_definedivar: ruby_vminsn_type = 159;
+pub const YARVINSN_trace_checkmatch: ruby_vminsn_type = 160;
+pub const YARVINSN_trace_checkkeyword: ruby_vminsn_type = 161;
+pub const YARVINSN_trace_checktype: ruby_vminsn_type = 162;
+pub const YARVINSN_trace_defineclass: ruby_vminsn_type = 163;
+pub const YARVINSN_trace_definemethod: ruby_vminsn_type = 164;
+pub const YARVINSN_trace_definesmethod: ruby_vminsn_type = 165;
+pub const YARVINSN_trace_send: ruby_vminsn_type = 166;
+pub const YARVINSN_trace_sendforward: ruby_vminsn_type = 167;
+pub const YARVINSN_trace_opt_send_without_block: ruby_vminsn_type = 168;
+pub const YARVINSN_trace_opt_new: ruby_vminsn_type = 169;
+pub const YARVINSN_trace_objtostring: ruby_vminsn_type = 170;
+pub const YARVINSN_trace_opt_ary_freeze: ruby_vminsn_type = 171;
+pub const YARVINSN_trace_opt_hash_freeze: ruby_vminsn_type = 172;
+pub const YARVINSN_trace_opt_str_freeze: ruby_vminsn_type = 173;
+pub const YARVINSN_trace_opt_nil_p: ruby_vminsn_type = 174;
+pub const YARVINSN_trace_opt_str_uminus: ruby_vminsn_type = 175;
+pub const YARVINSN_trace_opt_duparray_send: ruby_vminsn_type = 176;
+pub const YARVINSN_trace_opt_newarray_send: ruby_vminsn_type = 177;
+pub const YARVINSN_trace_invokesuper: ruby_vminsn_type = 178;
+pub const YARVINSN_trace_invokesuperforward: ruby_vminsn_type = 179;
+pub const YARVINSN_trace_invokeblock: ruby_vminsn_type = 180;
+pub const YARVINSN_trace_leave: ruby_vminsn_type = 181;
+pub const YARVINSN_trace_throw: ruby_vminsn_type = 182;
+pub const YARVINSN_trace_jump: ruby_vminsn_type = 183;
+pub const YARVINSN_trace_branchif: ruby_vminsn_type = 184;
+pub const YARVINSN_trace_branchunless: ruby_vminsn_type = 185;
+pub const YARVINSN_trace_branchnil: ruby_vminsn_type = 186;
+pub const YARVINSN_trace_once: ruby_vminsn_type = 187;
+pub const YARVINSN_trace_opt_case_dispatch: ruby_vminsn_type = 188;
+pub const YARVINSN_trace_opt_plus: ruby_vminsn_type = 189;
+pub const YARVINSN_trace_opt_minus: ruby_vminsn_type = 190;
+pub const YARVINSN_trace_opt_mult: ruby_vminsn_type = 191;
+pub const YARVINSN_trace_opt_div: ruby_vminsn_type = 192;
+pub const YARVINSN_trace_opt_mod: ruby_vminsn_type = 193;
+pub const YARVINSN_trace_opt_eq: ruby_vminsn_type = 194;
+pub const YARVINSN_trace_opt_neq: ruby_vminsn_type = 195;
+pub const YARVINSN_trace_opt_lt: ruby_vminsn_type = 196;
+pub const YARVINSN_trace_opt_le: ruby_vminsn_type = 197;
+pub const YARVINSN_trace_opt_gt: ruby_vminsn_type = 198;
+pub const YARVINSN_trace_opt_ge: ruby_vminsn_type = 199;
+pub const YARVINSN_trace_opt_ltlt: ruby_vminsn_type = 200;
+pub const YARVINSN_trace_opt_and: ruby_vminsn_type = 201;
+pub const YARVINSN_trace_opt_or: ruby_vminsn_type = 202;
+pub const YARVINSN_trace_opt_aref: ruby_vminsn_type = 203;
+pub const YARVINSN_trace_opt_aset: ruby_vminsn_type = 204;
+pub const YARVINSN_trace_opt_aset_with: ruby_vminsn_type = 205;
+pub const YARVINSN_trace_opt_aref_with: ruby_vminsn_type = 206;
+pub const YARVINSN_trace_opt_length: ruby_vminsn_type = 207;
+pub const YARVINSN_trace_opt_size: ruby_vminsn_type = 208;
+pub const YARVINSN_trace_opt_empty_p: ruby_vminsn_type = 209;
+pub const YARVINSN_trace_opt_succ: ruby_vminsn_type = 210;
+pub const YARVINSN_trace_opt_not: ruby_vminsn_type = 211;
+pub const YARVINSN_trace_opt_regexpmatch2: ruby_vminsn_type = 212;
+pub const YARVINSN_trace_invokebuiltin: ruby_vminsn_type = 213;
+pub const YARVINSN_trace_opt_invokebuiltin_delegate: ruby_vminsn_type = 214;
+pub const YARVINSN_trace_opt_invokebuiltin_delegate_leave: ruby_vminsn_type = 215;
+pub const YARVINSN_trace_getlocal_WC_0: ruby_vminsn_type = 216;
+pub const YARVINSN_trace_getlocal_WC_1: ruby_vminsn_type = 217;
+pub const YARVINSN_trace_setlocal_WC_0: ruby_vminsn_type = 218;
+pub const YARVINSN_trace_setlocal_WC_1: ruby_vminsn_type = 219;
+pub const YARVINSN_trace_putobject_INT2FIX_0_: ruby_vminsn_type = 220;
+pub const YARVINSN_trace_putobject_INT2FIX_1_: ruby_vminsn_type = 221;
+pub const YARVINSN_zjit_opt_send_without_block: ruby_vminsn_type = 222;
+pub const YARVINSN_zjit_opt_nil_p: ruby_vminsn_type = 223;
+pub const YARVINSN_zjit_opt_plus: ruby_vminsn_type = 224;
+pub const YARVINSN_zjit_opt_minus: ruby_vminsn_type = 225;
+pub const YARVINSN_zjit_opt_mult: ruby_vminsn_type = 226;
+pub const YARVINSN_zjit_opt_div: ruby_vminsn_type = 227;
+pub const YARVINSN_zjit_opt_mod: ruby_vminsn_type = 228;
+pub const YARVINSN_zjit_opt_eq: ruby_vminsn_type = 229;
+pub const YARVINSN_zjit_opt_neq: ruby_vminsn_type = 230;
+pub const YARVINSN_zjit_opt_lt: ruby_vminsn_type = 231;
+pub const YARVINSN_zjit_opt_le: ruby_vminsn_type = 232;
+pub const YARVINSN_zjit_opt_gt: ruby_vminsn_type = 233;
+pub const YARVINSN_zjit_opt_ge: ruby_vminsn_type = 234;
+pub const YARVINSN_zjit_opt_and: ruby_vminsn_type = 235;
+pub const YARVINSN_zjit_opt_or: ruby_vminsn_type = 236;
+pub const VM_INSTRUCTION_SIZE: ruby_vminsn_type = 237;
+pub type ruby_vminsn_type = u32;
+pub type rb_iseq_callback = ::std::option::Option<
+    unsafe extern "C" fn(arg1: *const rb_iseq_t, arg2: *mut ::std::os::raw::c_void),
+>;
+pub const DEFINED_NOT_DEFINED: defined_type = 0;
+pub const DEFINED_NIL: defined_type = 1;
+pub const DEFINED_IVAR: defined_type = 2;
+pub const DEFINED_LVAR: defined_type = 3;
+pub const DEFINED_GVAR: defined_type = 4;
+pub const DEFINED_CVAR: defined_type = 5;
+pub const DEFINED_CONST: defined_type = 6;
+pub const DEFINED_METHOD: defined_type = 7;
+pub const DEFINED_YIELD: defined_type = 8;
+pub const DEFINED_ZSUPER: defined_type = 9;
+pub const DEFINED_SELF: defined_type = 10;
+pub const DEFINED_TRUE: defined_type = 11;
+pub const DEFINED_FALSE: defined_type = 12;
+pub const DEFINED_ASGN: defined_type = 13;
+pub const DEFINED_EXPR: defined_type = 14;
+pub const DEFINED_REF: defined_type = 15;
+pub const DEFINED_FUNC: defined_type = 16;
+pub const DEFINED_CONST_FROM: defined_type = 17;
+pub type defined_type = u32;
+pub type rb_iseq_param_keyword_struct = rb_iseq_constant_body__bindgen_ty_1_rb_iseq_param_keyword;
+unsafe extern "C" {
+    pub fn ruby_xfree(ptr: *mut ::std::os::raw::c_void);
+    pub fn rb_class_attached_object(klass: VALUE) -> VALUE;
+    pub fn rb_singleton_class(obj: VALUE) -> VALUE;
+    pub fn rb_get_alloc_func(klass: VALUE) -> rb_alloc_func_t;
+    pub fn rb_method_basic_definition_p(klass: VALUE, mid: ID) -> ::std::os::raw::c_int;
+    pub fn rb_bug(fmt: *const ::std::os::raw::c_char, ...) -> !;
+    pub fn rb_float_new(d: f64) -> VALUE;
+    pub fn rb_gc_mark(obj: VALUE);
+    pub fn rb_gc_mark_movable(obj: VALUE);
+    pub fn rb_gc_location(obj: VALUE) -> VALUE;
+    pub fn rb_gc_writebarrier(old: VALUE, young: VALUE);
+    pub fn rb_class_get_superclass(klass: VALUE) -> VALUE;
+    pub static mut rb_cObject: VALUE;
+    pub fn rb_funcallv(
+        recv: VALUE,
+        mid: ID,
+        argc: ::std::os::raw::c_int,
+        argv: *const VALUE,
+    ) -> VALUE;
+    pub static mut rb_mKernel: VALUE;
+    pub static mut rb_cBasicObject: VALUE;
+    pub static mut rb_cArray: VALUE;
+    pub static mut rb_cClass: VALUE;
+    pub static mut rb_cFalseClass: VALUE;
+    pub static mut rb_cFloat: VALUE;
+    pub static mut rb_cHash: VALUE;
+    pub static mut rb_cIO: VALUE;
+    pub static mut rb_cInteger: VALUE;
+    pub static mut rb_cModule: VALUE;
+    pub static mut rb_cNilClass: VALUE;
+    pub static mut rb_cNumeric: VALUE;
+    pub static mut rb_cRange: VALUE;
+    pub static mut rb_cRegexp: VALUE;
+    pub static mut rb_cSet: VALUE;
+    pub static mut rb_cString: VALUE;
+    pub static mut rb_cSymbol: VALUE;
+    pub static mut rb_cThread: VALUE;
+    pub static mut rb_cTrueClass: VALUE;
+    pub fn ruby_init();
+    pub fn ruby_options(
+        argc: ::std::os::raw::c_int,
+        argv: *mut *mut ::std::os::raw::c_char,
+    ) -> *mut ::std::os::raw::c_void;
+    pub fn ruby_executable_node(
+        n: *mut ::std::os::raw::c_void,
+        status: *mut ::std::os::raw::c_int,
+    ) -> ::std::os::raw::c_int;
+    pub fn ruby_init_stack(addr: *mut ::std::os::raw::c_void);
+    pub fn rb_define_class(name: *const ::std::os::raw::c_char, super_: VALUE) -> VALUE;
+    pub fn rb_obj_class(obj: VALUE) -> VALUE;
+    pub fn rb_ary_new_capa(capa: ::std::os::raw::c_long) -> VALUE;
+    pub fn rb_ary_store(ary: VALUE, key: ::std::os::raw::c_long, val: VALUE);
+    pub fn rb_ary_dup(ary: VALUE) -> VALUE;
+    pub fn rb_ary_resurrect(ary: VALUE) -> VALUE;
+    pub fn rb_ary_cat(ary: VALUE, train: *const VALUE, len: ::std::os::raw::c_long) -> VALUE;
+    pub fn rb_ary_push(ary: VALUE, elem: VALUE) -> VALUE;
+    pub fn rb_ary_clear(ary: VALUE) -> VALUE;
+    pub fn rb_hash_new() -> VALUE;
+    pub fn rb_hash_aref(hash: VALUE, key: VALUE) -> VALUE;
+    pub fn rb_hash_aset(hash: VALUE, key: VALUE, val: VALUE) -> VALUE;
+    pub fn rb_hash_bulk_insert(argc: ::std::os::raw::c_long, argv: *const VALUE, hash: VALUE);
+    pub fn rb_obj_is_proc(recv: VALUE) -> VALUE;
+    pub fn rb_protect(
+        func: ::std::option::Option<unsafe extern "C" fn(args: VALUE) -> VALUE>,
+        args: VALUE,
+        state: *mut ::std::os::raw::c_int,
+    ) -> VALUE;
+    pub fn rb_sym2id(obj: VALUE) -> ID;
+    pub fn rb_id2sym(id: ID) -> VALUE;
+    pub fn rb_intern(name: *const ::std::os::raw::c_char) -> ID;
+    pub fn rb_intern2(name: *const ::std::os::raw::c_char, len: ::std::os::raw::c_long) -> ID;
+    pub fn rb_id2str(id: ID) -> VALUE;
+    pub fn rb_sym2str(symbol: VALUE) -> VALUE;
+    pub fn rb_class2name(klass: VALUE) -> *const ::std::os::raw::c_char;
+    pub fn rb_obj_is_kind_of(obj: VALUE, klass: VALUE) -> VALUE;
+    pub fn rb_obj_frozen_p(obj: VALUE) -> VALUE;
+    pub fn rb_class_inherited_p(scion: VALUE, ascendant: VALUE) -> VALUE;
+    pub fn rb_backref_get() -> VALUE;
+    pub fn rb_range_new(beg: VALUE, end: VALUE, excl: ::std::os::raw::c_int) -> VALUE;
+    pub fn rb_reg_nth_match(n: ::std::os::raw::c_int, md: VALUE) -> VALUE;
+    pub fn rb_reg_last_match(md: VALUE) -> VALUE;
+    pub fn rb_reg_match_pre(md: VALUE) -> VALUE;
+    pub fn rb_reg_match_post(md: VALUE) -> VALUE;
+    pub fn rb_reg_match_last(md: VALUE) -> VALUE;
+    pub fn rb_utf8_str_new(
+        ptr: *const ::std::os::raw::c_char,
+        len: ::std::os::raw::c_long,
+    ) -> VALUE;
+    pub fn rb_str_buf_append(dst: VALUE, src: VALUE) -> VALUE;
+    pub fn rb_str_dup(str_: VALUE) -> VALUE;
+    pub fn rb_str_intern(str_: VALUE) -> VALUE;
+    pub fn rb_mod_name(mod_: VALUE) -> VALUE;
+    pub fn rb_ivar_get(obj: VALUE, name: ID) -> VALUE;
+    pub fn rb_ivar_set(obj: VALUE, name: ID, val: VALUE) -> VALUE;
+    pub fn rb_ivar_defined(obj: VALUE, name: ID) -> VALUE;
+    pub fn rb_attr_get(obj: VALUE, name: ID) -> VALUE;
+    pub fn rb_obj_info_dump(obj: VALUE);
+    pub fn rb_class_allocate_instance(klass: VALUE) -> VALUE;
+    pub fn rb_obj_equal(obj1: VALUE, obj2: VALUE) -> VALUE;
+    pub fn rb_reg_new_ary(ary: VALUE, options: ::std::os::raw::c_int) -> VALUE;
+    pub fn rb_ary_tmp_new_from_values(
+        arg1: VALUE,
+        arg2: ::std::os::raw::c_long,
+        arg3: *const VALUE,
+    ) -> VALUE;
+    pub fn rb_ec_ary_new_from_values(
+        ec: *mut rb_execution_context_struct,
+        n: ::std::os::raw::c_long,
+        elts: *const VALUE,
+    ) -> VALUE;
+    pub fn rb_vm_top_self() -> VALUE;
+    pub fn rb_method_entry_at(obj: VALUE, id: ID) -> *const rb_method_entry_t;
+    pub fn rb_callable_method_entry(klass: VALUE, id: ID) -> *const rb_callable_method_entry_t;
+    pub fn rb_callable_method_entry_or_negative(
+        klass: VALUE,
+        id: ID,
+    ) -> *const rb_callable_method_entry_t;
+    pub static mut rb_cISeq: VALUE;
+    pub static mut rb_mRubyVMFrozenCore: VALUE;
+    pub static mut rb_block_param_proxy: VALUE;
+    pub fn rb_vm_ep_local_ep(ep: *const VALUE) -> *const VALUE;
+    pub fn rb_iseq_path(iseq: *const rb_iseq_t) -> VALUE;
+    pub fn rb_vm_env_write(ep: *const VALUE, index: ::std::os::raw::c_int, v: VALUE);
+    pub fn rb_vm_bh_to_procval(ec: *const rb_execution_context_t, block_handler: VALUE) -> VALUE;
+    pub fn rb_vm_frame_method_entry(
+        cfp: *const rb_control_frame_t,
+    ) -> *const rb_callable_method_entry_t;
+    pub fn rb_obj_info(obj: VALUE) -> *const ::std::os::raw::c_char;
+    pub fn rb_ec_stack_check(ec: *mut rb_execution_context_struct) -> ::std::os::raw::c_int;
+    pub fn rb_shape_id_offset() -> i32;
+    pub fn rb_obj_shape_id(obj: VALUE) -> shape_id_t;
+    pub fn rb_shape_get_iv_index(shape_id: shape_id_t, id: ID, value: *mut attr_index_t) -> bool;
+    pub fn rb_shape_transition_add_ivar_no_warnings(obj: VALUE, id: ID) -> shape_id_t;
+    pub fn rb_gvar_get(arg1: ID) -> VALUE;
+    pub fn rb_gvar_set(arg1: ID, arg2: VALUE) -> VALUE;
+    pub fn rb_ensure_iv_list_size(obj: VALUE, current_len: u32, newsize: u32);
+    pub fn rb_vm_barrier();
+    pub fn rb_str_byte_substr(str_: VALUE, beg: VALUE, len: VALUE) -> VALUE;
+    pub fn rb_str_substr_two_fixnums(
+        str_: VALUE,
+        beg: VALUE,
+        len: VALUE,
+        empty: ::std::os::raw::c_int,
+    ) -> VALUE;
+    pub fn rb_obj_as_string_result(str_: VALUE, obj: VALUE) -> VALUE;
+    pub fn rb_str_concat_literals(num: usize, strary: *const VALUE) -> VALUE;
+    pub fn rb_ec_str_resurrect(
+        ec: *mut rb_execution_context_struct,
+        str_: VALUE,
+        chilled: bool,
+    ) -> VALUE;
+    pub fn rb_to_hash_type(obj: VALUE) -> VALUE;
+    pub fn rb_hash_stlike_foreach(
+        hash: VALUE,
+        func: st_foreach_callback_func,
+        arg: st_data_t,
+    ) -> ::std::os::raw::c_int;
+    pub fn rb_hash_new_with_size(size: st_index_t) -> VALUE;
+    pub fn rb_hash_resurrect(hash: VALUE) -> VALUE;
+    pub fn rb_hash_stlike_lookup(
+        hash: VALUE,
+        key: st_data_t,
+        pval: *mut st_data_t,
+    ) -> ::std::os::raw::c_int;
+    pub fn rb_insn_len(insn: VALUE) -> ::std::os::raw::c_int;
+    pub fn rb_vm_insn_decode(encoded: VALUE) -> ::std::os::raw::c_int;
+    pub fn rb_float_plus(x: VALUE, y: VALUE) -> VALUE;
+    pub fn rb_float_minus(x: VALUE, y: VALUE) -> VALUE;
+    pub fn rb_float_mul(x: VALUE, y: VALUE) -> VALUE;
+    pub fn rb_float_div(x: VALUE, y: VALUE) -> VALUE;
+    pub fn rb_fix_aref(fix: VALUE, idx: VALUE) -> VALUE;
+    pub fn rb_vm_insn_addr2opcode(addr: *const ::std::os::raw::c_void) -> ::std::os::raw::c_int;
+    pub fn rb_iseq_line_no(iseq: *const rb_iseq_t, pos: usize) -> ::std::os::raw::c_uint;
+    pub fn rb_iseqw_to_iseq(iseqw: VALUE) -> *const rb_iseq_t;
+    pub fn rb_iseq_label(iseq: *const rb_iseq_t) -> VALUE;
+    pub fn rb_iseq_defined_string(type_: defined_type) -> VALUE;
+    pub fn rb_profile_frames(
+        start: ::std::os::raw::c_int,
+        limit: ::std::os::raw::c_int,
+        buff: *mut VALUE,
+        lines: *mut ::std::os::raw::c_int,
+    ) -> ::std::os::raw::c_int;
+    pub fn rb_jit_cont_each_iseq(callback: rb_iseq_callback, data: *mut ::std::os::raw::c_void);
+    pub fn rb_zjit_get_page_size() -> u32;
+    pub fn rb_zjit_reserve_addr_space(mem_size: u32) -> *mut u8;
+    pub fn rb_zjit_profile_disable(iseq: *const rb_iseq_t);
+    pub fn rb_vm_base_ptr(cfp: *mut rb_control_frame_struct) -> *mut VALUE;
+    pub fn rb_zjit_multi_ractor_p() -> bool;
+    pub fn rb_zjit_constcache_shareable(ice: *const iseq_inline_constant_cache_entry) -> bool;
+    pub fn rb_zjit_vm_unlock(
+        recursive_lock_level: *mut ::std::os::raw::c_uint,
+        file: *const ::std::os::raw::c_char,
+        line: ::std::os::raw::c_int,
+    );
+    pub fn rb_zjit_mark_writable(mem_block: *mut ::std::os::raw::c_void, mem_size: u32) -> bool;
+    pub fn rb_zjit_mark_executable(mem_block: *mut ::std::os::raw::c_void, mem_size: u32);
+    pub fn rb_zjit_mark_unused(mem_block: *mut ::std::os::raw::c_void, mem_size: u32) -> bool;
+    pub fn rb_zjit_icache_invalidate(
+        start: *mut ::std::os::raw::c_void,
+        end: *mut ::std::os::raw::c_void,
+    );
+    pub fn rb_zjit_vm_lock_then_barrier(
+        recursive_lock_level: *mut ::std::os::raw::c_uint,
+        file: *const ::std::os::raw::c_char,
+        line: ::std::os::raw::c_int,
+    );
+    pub fn rb_iseq_get_zjit_payload(iseq: *const rb_iseq_t) -> *mut ::std::os::raw::c_void;
+    pub fn rb_iseq_set_zjit_payload(iseq: *const rb_iseq_t, payload: *mut ::std::os::raw::c_void);
+    pub fn rb_zjit_print_exception();
+    pub fn rb_zjit_shape_obj_too_complex_p(obj: VALUE) -> bool;
+    pub fn rb_iseq_encoded_size(iseq: *const rb_iseq_t) -> ::std::os::raw::c_uint;
+    pub fn rb_iseq_pc_at_idx(iseq: *const rb_iseq_t, insn_idx: u32) -> *mut VALUE;
+    pub fn rb_iseq_opcode_at_pc(iseq: *const rb_iseq_t, pc: *const VALUE) -> ::std::os::raw::c_int;
+    pub fn rb_RSTRING_LEN(str_: VALUE) -> ::std::os::raw::c_ulong;
+    pub fn rb_RSTRING_PTR(str_: VALUE) -> *mut ::std::os::raw::c_char;
+    pub fn rb_insn_name(insn: VALUE) -> *const ::std::os::raw::c_char;
+    pub fn rb_vm_ci_argc(ci: *const rb_callinfo) -> ::std::os::raw::c_uint;
+    pub fn rb_vm_ci_mid(ci: *const rb_callinfo) -> ID;
+    pub fn rb_vm_ci_flag(ci: *const rb_callinfo) -> ::std::os::raw::c_uint;
+    pub fn rb_vm_ci_kwarg(ci: *const rb_callinfo) -> *const rb_callinfo_kwarg;
+    pub fn rb_get_cikw_keyword_len(cikw: *const rb_callinfo_kwarg) -> ::std::os::raw::c_int;
+    pub fn rb_get_cikw_keywords_idx(
+        cikw: *const rb_callinfo_kwarg,
+        idx: ::std::os::raw::c_int,
+    ) -> VALUE;
+    pub fn rb_METHOD_ENTRY_VISI(me: *const rb_callable_method_entry_t) -> rb_method_visibility_t;
+    pub fn rb_get_cme_def_type(cme: *const rb_callable_method_entry_t) -> rb_method_type_t;
+    pub fn rb_get_cme_def_body_attr_id(cme: *const rb_callable_method_entry_t) -> ID;
+    pub fn rb_get_cme_def_body_optimized_type(
+        cme: *const rb_callable_method_entry_t,
+    ) -> method_optimized_type;
+    pub fn rb_get_cme_def_body_optimized_index(
+        cme: *const rb_callable_method_entry_t,
+    ) -> ::std::os::raw::c_uint;
+    pub fn rb_get_cme_def_body_cfunc(
+        cme: *const rb_callable_method_entry_t,
+    ) -> *mut rb_method_cfunc_t;
+    pub fn rb_get_def_method_serial(def: *const rb_method_definition_t) -> usize;
+    pub fn rb_get_def_original_id(def: *const rb_method_definition_t) -> ID;
+    pub fn rb_get_mct_argc(mct: *const rb_method_cfunc_t) -> ::std::os::raw::c_int;
+    pub fn rb_get_mct_func(mct: *const rb_method_cfunc_t) -> *mut ::std::os::raw::c_void;
+    pub fn rb_get_def_iseq_ptr(def: *mut rb_method_definition_t) -> *const rb_iseq_t;
+    pub fn rb_get_iseq_body_local_iseq(iseq: *const rb_iseq_t) -> *const rb_iseq_t;
+    pub fn rb_get_iseq_body_parent_iseq(iseq: *const rb_iseq_t) -> *const rb_iseq_t;
+    pub fn rb_get_iseq_body_local_table_size(iseq: *const rb_iseq_t) -> ::std::os::raw::c_uint;
+    pub fn rb_get_iseq_body_iseq_encoded(iseq: *const rb_iseq_t) -> *mut VALUE;
+    pub fn rb_get_iseq_body_stack_max(iseq: *const rb_iseq_t) -> ::std::os::raw::c_uint;
+    pub fn rb_get_iseq_body_type(iseq: *const rb_iseq_t) -> rb_iseq_type;
+    pub fn rb_get_iseq_flags_has_lead(iseq: *const rb_iseq_t) -> bool;
+    pub fn rb_get_iseq_flags_has_opt(iseq: *const rb_iseq_t) -> bool;
+    pub fn rb_get_iseq_flags_has_kw(iseq: *const rb_iseq_t) -> bool;
+    pub fn rb_get_iseq_flags_has_post(iseq: *const rb_iseq_t) -> bool;
+    pub fn rb_get_iseq_flags_has_kwrest(iseq: *const rb_iseq_t) -> bool;
+    pub fn rb_get_iseq_flags_anon_kwrest(iseq: *const rb_iseq_t) -> bool;
+    pub fn rb_get_iseq_flags_has_rest(iseq: *const rb_iseq_t) -> bool;
+    pub fn rb_get_iseq_flags_ruby2_keywords(iseq: *const rb_iseq_t) -> bool;
+    pub fn rb_get_iseq_flags_has_block(iseq: *const rb_iseq_t) -> bool;
+    pub fn rb_get_iseq_flags_ambiguous_param0(iseq: *const rb_iseq_t) -> bool;
+    pub fn rb_get_iseq_flags_accepts_no_kwarg(iseq: *const rb_iseq_t) -> bool;
+    pub fn rb_get_iseq_flags_forwardable(iseq: *const rb_iseq_t) -> bool;
+    pub fn rb_get_iseq_body_param_keyword(
+        iseq: *const rb_iseq_t,
+    ) -> *const rb_iseq_param_keyword_struct;
+    pub fn rb_get_iseq_body_param_size(iseq: *const rb_iseq_t) -> ::std::os::raw::c_uint;
+    pub fn rb_get_iseq_body_param_lead_num(iseq: *const rb_iseq_t) -> ::std::os::raw::c_int;
+    pub fn rb_get_iseq_body_param_opt_num(iseq: *const rb_iseq_t) -> ::std::os::raw::c_int;
+    pub fn rb_get_iseq_body_param_opt_table(iseq: *const rb_iseq_t) -> *const VALUE;
+    pub fn rb_get_ec_cfp(ec: *const rb_execution_context_t) -> *mut rb_control_frame_struct;
+    pub fn rb_get_cfp_iseq(cfp: *mut rb_control_frame_struct) -> *const rb_iseq_t;
+    pub fn rb_get_cfp_pc(cfp: *mut rb_control_frame_struct) -> *mut VALUE;
+    pub fn rb_get_cfp_sp(cfp: *mut rb_control_frame_struct) -> *mut VALUE;
+    pub fn rb_get_cfp_self(cfp: *mut rb_control_frame_struct) -> VALUE;
+    pub fn rb_get_cfp_ep(cfp: *mut rb_control_frame_struct) -> *mut VALUE;
+    pub fn rb_get_cfp_ep_level(cfp: *mut rb_control_frame_struct, lv: u32) -> *const VALUE;
+    pub fn rb_yarv_class_of(obj: VALUE) -> VALUE;
+    pub fn rb_FL_TEST(obj: VALUE, flags: VALUE) -> VALUE;
+    pub fn rb_FL_TEST_RAW(obj: VALUE, flags: VALUE) -> VALUE;
+    pub fn rb_RB_TYPE_P(obj: VALUE, t: ruby_value_type) -> bool;
+    pub fn rb_RSTRUCT_LEN(st: VALUE) -> ::std::os::raw::c_long;
+    pub fn rb_get_call_data_ci(cd: *const rb_call_data) -> *const rb_callinfo;
+    pub fn rb_BASIC_OP_UNREDEFINED_P(bop: ruby_basic_operators, klass: u32) -> bool;
+    pub fn rb_RCLASS_ORIGIN(c: VALUE) -> VALUE;
+    pub fn rb_assert_iseq_handle(handle: VALUE);
+    pub fn rb_assert_holding_vm_lock();
+    pub fn rb_IMEMO_TYPE_P(imemo: VALUE, imemo_type: imemo_type) -> ::std::os::raw::c_int;
+    pub fn rb_assert_cme_handle(handle: VALUE);
+    pub fn rb_yarv_ary_entry_internal(ary: VALUE, offset: ::std::os::raw::c_long) -> VALUE;
+}
diff --git a/zjit/src/cruby_methods.rs b/zjit/src/cruby_methods.rs
new file mode 100644
index 00000000000000..51ecb1c787f9ec
--- /dev/null
+++ b/zjit/src/cruby_methods.rs
@@ -0,0 +1,89 @@
+/*! This module contains assertions we make about runtime properties of core library methods.
+ * Some properties that influence codegen:
+ *  - Whether the method has been redefined since boot
+ *  - Whether the C method can yield to the GC
+ *  - Whether the C method makes any method calls
+ *
+ * For Ruby methods, many of these properties can be inferred through analyzing the
+ * bytecode, but for C methods we resort to annotation and validation in debug builds.
+ */
+
+use crate::cruby::*;
+use std::collections::HashMap;
+use std::ffi::c_void;
+use crate::hir_type::{types, Type};
+
+pub struct Annotations {
+    cfuncs: HashMap<*mut c_void, FnProperties>,
+}
+
+/// Runtime behaviors of C functions that implement a Ruby method
+#[derive(Clone, Copy)]
+pub struct FnProperties {
+    /// Whether it's possible for the function to yield to the GC
+    pub no_gc: bool,
+    /// Whether it's possible for the function to make a ruby call
+    pub leaf: bool,
+    /// What Type the C function returns
+    pub return_type: Type,
+    /// Whether it's legal to remove the call if the result is unused
+    pub elidable: bool,
+}
+
+impl Annotations {
+    /// Query about properties of a C method
+    pub fn get_cfunc_properties(&self, method: *const rb_callable_method_entry_t) -> Option<FnProperties> {
+        let fn_ptr = unsafe {
+            if VM_METHOD_TYPE_CFUNC != get_cme_def_type(method) {
+                return None;
+            }
+            get_mct_func(get_cme_def_body_cfunc(method.cast()))
+        };
+        self.cfuncs.get(&fn_ptr).copied()
+    }
+}
+
+fn annotate_c_method(props_map: &mut HashMap<*mut c_void, FnProperties>, class: VALUE, method_name: &'static str, props: FnProperties) {
+    // Lookup function pointer of the C method
+    let fn_ptr = unsafe {
+        // TODO(alan): (side quest) make rust methods and clean up glue code for rb_method_cfunc_t and
+        // rb_method_definition_t.
+        let method_id = rb_intern2(method_name.as_ptr().cast(), method_name.len() as _);
+        let method = rb_method_entry_at(class, method_id);
+        assert!(!method.is_null());
+        // ME-to-CME cast is fine due to identical layout
+        debug_assert_eq!(VM_METHOD_TYPE_CFUNC, get_cme_def_type(method.cast()));
+        get_mct_func(get_cme_def_body_cfunc(method.cast()))
+    };
+
+    props_map.insert(fn_ptr, props);
+}
+
+/// Gather annotations. Run this right after boot since the annotations
+/// are about the stock versions of methods.
+pub fn init() -> Annotations {
+    let cfuncs = &mut HashMap::new();
+
+    macro_rules! annotate {
+        ($module:ident, $method_name:literal, $return_type:expr, $($properties:ident),+) => {
+            let mut props = FnProperties { no_gc: false, leaf: false, elidable: false, return_type: $return_type };
+            $(
+                props.$properties = true;
+            )+
+            annotate_c_method(cfuncs, unsafe { $module }, $method_name, props);
+        }
+    }
+
+    annotate!(rb_mKernel, "itself", types::BasicObject, no_gc, leaf, elidable);
+    annotate!(rb_cString, "bytesize", types::Fixnum, no_gc, leaf);
+    annotate!(rb_cModule, "name", types::StringExact.union(types::NilClassExact), no_gc, leaf, elidable);
+    annotate!(rb_cModule, "===", types::BoolExact, no_gc, leaf);
+    annotate!(rb_cArray, "length", types::Fixnum, no_gc, leaf, elidable);
+    annotate!(rb_cArray, "size", types::Fixnum, no_gc, leaf, elidable);
+    annotate!(rb_cNilClass, "nil?", types::TrueClassExact, no_gc, leaf, elidable);
+    annotate!(rb_mKernel, "nil?", types::FalseClassExact, no_gc, leaf, elidable);
+
+    Annotations {
+        cfuncs: std::mem::take(cfuncs)
+    }
+}
diff --git a/zjit/src/disasm.rs b/zjit/src/disasm.rs
new file mode 100644
index 00000000000000..5c7a7be7047ebc
--- /dev/null
+++ b/zjit/src/disasm.rs
@@ -0,0 +1,51 @@
+use crate::asm::CodeBlock;
+
+pub const BOLD_BEGIN: &str = "\x1b[1m";
+pub const BOLD_END: &str = "\x1b[22m";
+
+pub fn disasm_addr_range(cb: &CodeBlock, start_addr: usize, end_addr: usize) -> String {
+    use std::fmt::Write;
+
+    let mut out = String::from("");
+
+    // Initialize capstone
+    use capstone::prelude::*;
+
+    #[cfg(target_arch = "x86_64")]
+    let mut cs = Capstone::new()
+        .x86()
+        .mode(arch::x86::ArchMode::Mode64)
+        .syntax(arch::x86::ArchSyntax::Intel)
+        .build()
+        .unwrap();
+    #[cfg(target_arch = "aarch64")]
+    let mut cs = Capstone::new()
+        .arm64()
+        .mode(arch::arm64::ArchMode::Arm)
+        .detail(true)
+        .build()
+        .unwrap();
+
+    cs.set_skipdata(true).unwrap();
+
+    // Disassemble the instructions
+    let code_size = end_addr - start_addr;
+    let code_slice = unsafe { std::slice::from_raw_parts(start_addr as _, code_size) };
+    // Stabilize output for cargo test
+    #[cfg(test)]
+    let start_addr = 0;
+    let insns = cs.disasm_all(code_slice, start_addr as u64).unwrap();
+
+    // For each instruction in this block
+    for insn in insns.as_ref() {
+        // Comments for this block
+        if let Some(comment_list) = cb.comments_at(insn.address() as usize) {
+            for comment in comment_list {
+                writeln!(&mut out, "  {BOLD_BEGIN}# {comment}{BOLD_END}").unwrap();
+            }
+        }
+        writeln!(&mut out, "  {insn}").unwrap();
+    }
+
+    return out;
+}
diff --git a/zjit/src/gc.rs b/zjit/src/gc.rs
new file mode 100644
index 00000000000000..23e2003661c54d
--- /dev/null
+++ b/zjit/src/gc.rs
@@ -0,0 +1,135 @@
+// This module is responsible for marking/moving objects on GC.
+
+use std::ffi::c_void;
+use crate::{cruby::*, profile::IseqProfile, state::ZJITState, virtualmem::CodePtr};
+
+/// This is all the data ZJIT stores on an ISEQ. We mark objects in this struct on GC.
+#[derive(Debug)]
+pub struct IseqPayload {
+    /// Type information of YARV instruction operands
+    pub profile: IseqProfile,
+
+    /// JIT code address of the first block
+    pub start_ptr: Option<CodePtr>,
+
+    /// GC offsets of the JIT code. These are the addresses of objects that need to be marked.
+    pub gc_offsets: Vec<CodePtr>,
+}
+
+impl IseqPayload {
+    fn new(iseq_size: u32) -> Self {
+        Self {
+            profile: IseqProfile::new(iseq_size),
+            start_ptr: None,
+            gc_offsets: vec![],
+        }
+    }
+}
+
+/// Get the payload object associated with an iseq. Create one if none exists.
+pub fn get_or_create_iseq_payload(iseq: IseqPtr) -> &'static mut IseqPayload {
+    type VoidPtr = *mut c_void;
+
+    let payload_non_null = unsafe {
+        let payload = rb_iseq_get_zjit_payload(iseq);
+        if payload.is_null() {
+            // Allocate a new payload with Box and transfer ownership to the GC.
+            // We drop the payload with Box::from_raw when the GC frees the iseq and calls us.
+            // NOTE(alan): Sometimes we read from an iseq without ever writing to it.
+            // We allocate in those cases anyways.
+            let iseq_size = get_iseq_encoded_size(iseq);
+            let new_payload = IseqPayload::new(iseq_size);
+            let new_payload = Box::into_raw(Box::new(new_payload));
+            rb_iseq_set_zjit_payload(iseq, new_payload as VoidPtr);
+
+            new_payload
+        } else {
+            payload as *mut IseqPayload
+        }
+    };
+
+    // SAFETY: we should have the VM lock and all other Ruby threads should be asleep. So we have
+    // exclusive mutable access.
+    // Hmm, nothing seems to stop calling this on the same
+    // iseq twice, though, which violates aliasing rules.
+    unsafe { payload_non_null.as_mut() }.unwrap()
+}
+
+#[unsafe(no_mangle)]
+pub extern "C" fn rb_zjit_iseq_mark(payload: *mut c_void) {
+    let payload = if payload.is_null() {
+        return; // nothing to mark
+    } else {
+        // SAFETY: The GC takes the VM lock while marking, which
+        // we assert, so we should be synchronized and data race free.
+        //
+        // For aliasing, having the VM lock hopefully also implies that no one
+        // else has an overlapping &mut IseqPayload.
+        unsafe {
+            rb_assert_holding_vm_lock();
+            &*(payload as *const IseqPayload)
+        }
+    };
+
+    // Mark objects retained by profiling instructions
+    payload.profile.each_object(|object| {
+        unsafe { rb_gc_mark_movable(object); }
+    });
+
+    // Mark objects baked in JIT code
+    let cb = ZJITState::get_code_block();
+    for &offset in payload.gc_offsets.iter() {
+        let value_ptr: *const u8 = offset.raw_ptr(cb);
+        // Creating an unaligned pointer is well defined unlike in C.
+        let value_ptr = value_ptr as *const VALUE;
+
+        unsafe {
+            let object = value_ptr.read_unaligned();
+            rb_gc_mark_movable(object);
+        }
+    }
+}
+
+/// GC callback for updating GC objects in the per-iseq payload.
+/// This is a mirror of [rb_zjit_iseq_mark].
+#[unsafe(no_mangle)]
+pub extern "C" fn rb_zjit_iseq_update_references(payload: *mut c_void) {
+    let payload = if payload.is_null() {
+        return; // nothing to mark
+    } else {
+        // SAFETY: The GC takes the VM lock while marking, which
+        // we assert, so we should be synchronized and data race free.
+        //
+        // For aliasing, having the VM lock hopefully also implies that no one
+        // else has an overlapping &mut IseqPayload.
+        unsafe {
+            rb_assert_holding_vm_lock();
+            &mut *(payload as *mut IseqPayload)
+        }
+    };
+
+    // Move objects retained by profiling instructions
+    payload.profile.each_object_mut(|object| {
+        *object = unsafe { rb_gc_location(*object) };
+    });
+
+    // Move objects baked in JIT code
+    let cb = ZJITState::get_code_block();
+    for &offset in payload.gc_offsets.iter() {
+        let value_ptr: *const u8 = offset.raw_ptr(cb);
+        // Creating an unaligned pointer is well defined unlike in C.
+        let value_ptr = value_ptr as *const VALUE;
+
+        let object = unsafe { value_ptr.read_unaligned() };
+        let new_addr = unsafe { rb_gc_location(object) };
+
+        // Only write when the VALUE moves, to be copy-on-write friendly.
+        if new_addr != object {
+            for (byte_idx, &byte) in new_addr.as_u64().to_le_bytes().iter().enumerate() {
+                let byte_code_ptr = offset.add_bytes(byte_idx);
+                cb.write_mem(byte_code_ptr, byte).expect("patching existing code should be within bounds");
+            }
+        }
+    }
+    cb.mark_all_executable();
+}
diff --git a/zjit/src/hir.rs b/zjit/src/hir.rs
new file mode 100644
index 00000000000000..0fee728b1223da
--- /dev/null
+++ b/zjit/src/hir.rs
@@ -0,0 +1,7112 @@
+//! High-level intermediary representation (IR) in static single-assignment (SSA) form.
+
+// We use the YARV bytecode constants which have a CRuby-style name
+#![allow(non_upper_case_globals)]
+
+use crate::{
+    cast::IntoUsize, cruby::*, options::{get_option, DumpHIR}, gc::{get_or_create_iseq_payload, IseqPayload}, state::ZJITState
+};
+use std::{
+    cell::RefCell, collections::{HashMap, HashSet, VecDeque}, ffi::{c_int, c_void, CStr}, fmt::Display, mem::{align_of, size_of}, ptr, slice::Iter
+};
+use crate::hir_type::{Type, types};
+use crate::bitset::BitSet;
+
+/// An index of an [`Insn`] in a [`Function`]. This is a popular
+/// type since this effectively acts as a pointer to an [`Insn`].
+/// See also: [`Function::find`].
+#[derive(Copy, Clone, Ord, PartialOrd, Eq, PartialEq, Hash, Debug)]
+pub struct InsnId(pub usize);
+
+impl Into<usize> for InsnId {
+    fn into(self) -> usize {
+        self.0
+    }
+}
+
+impl std::fmt::Display for InsnId {
+    fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
+        write!(f, "v{}", self.0)
+    }
+}
+
+/// The index of a [`Block`], which effectively acts like a pointer.
+#[derive(Copy, Clone, Eq, PartialEq, Hash, Debug)]
+pub struct BlockId(pub usize);
+
+impl Into<usize> for BlockId {
+    fn into(self) -> usize {
+        self.0
+    }
+}
+
+impl std::fmt::Display for BlockId {
+    fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
+        write!(f, "bb{}", self.0)
+    }
+}
+
+type InsnSet = BitSet<InsnId>;
+type BlockSet = BitSet<BlockId>;
+
+fn write_vec<T: std::fmt::Display>(f: &mut std::fmt::Formatter, objs: &Vec<T>) -> std::fmt::Result {
+    write!(f, "[")?;
+    let mut prefix = "";
+    for obj in objs {
+        write!(f, "{prefix}{obj}")?;
+        prefix = ", ";
+    }
+    write!(f, "]")
+}
+
+impl std::fmt::Display for VALUE {
+    fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
+        self.print(&PtrPrintMap::identity()).fmt(f)
+    }
+}
+
+impl VALUE {
+    pub fn print(self, ptr_map: &PtrPrintMap) -> VALUEPrinter {
+        VALUEPrinter { inner: self, ptr_map }
+    }
+}
+
+/// Print adaptor for [`VALUE`]. See [`PtrPrintMap`].
+pub struct VALUEPrinter<'a> {
+    inner: VALUE,
+    ptr_map: &'a PtrPrintMap,
+}
+
+impl<'a> std::fmt::Display for VALUEPrinter<'a> {
+    fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
+        match self.inner {
+            val if val.fixnum_p() => write!(f, "{}", val.as_fixnum()),
+            Qnil => write!(f, "nil"),
+            Qtrue => write!(f, "true"),
+            Qfalse => write!(f, "false"),
+            val => write!(f, "VALUE({:p})", self.ptr_map.map_ptr(val.as_ptr::<VALUE>())),
+        }
+    }
+}
+
+#[derive(Debug, PartialEq, Clone)]
+pub struct BranchEdge {
+    pub target: BlockId,
+    pub args: Vec<InsnId>,
+}
+
+impl std::fmt::Display for BranchEdge {
+    fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
+        write!(f, "{}(", self.target)?;
+        let mut prefix = "";
+        for arg in &self.args {
+            write!(f, "{prefix}{arg}")?;
+            prefix = ", ";
+        }
+        write!(f, ")")
+    }
+}
+
+#[derive(Debug, PartialEq, Clone)]
+pub struct CallInfo {
+    pub method_name: String,
+}
+
+/// Invalidation reasons
+#[derive(Debug, Clone, Copy)]
+pub enum Invariant {
+    /// Basic operation is redefined
+    BOPRedefined {
+        /// {klass}_REDEFINED_OP_FLAG
+        klass: RedefinitionFlag,
+        /// BOP_{bop}
+        bop: ruby_basic_operators,
+    },
+    MethodRedefined {
+        /// The class object whose method we want to assume unchanged
+        klass: VALUE,
+        /// The method ID of the method we want to assume unchanged
+        method: ID,
+    },
+    /// A list of constant expression path segments that must have not been written to for the
+    /// following code to be valid.
+    StableConstantNames {
+        idlist: *const ID,
+    },
+    /// There is one ractor running. If a non-root ractor gets spawned, this is invalidated.
+    SingleRactorMode,
+}
+
+impl Invariant {
+    pub fn print(self, ptr_map: &PtrPrintMap) -> InvariantPrinter {
+        InvariantPrinter { inner: self, ptr_map }
+    }
+}
+
+impl Display for Invariant {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        self.print(&PtrPrintMap::identity()).fmt(f)
+    }
+}
+
+#[derive(Debug, Clone, Copy, PartialEq)]
+pub enum SpecialObjectType {
+    VMCore = 1,
+    CBase = 2,
+    ConstBase = 3,
+}
+
+impl From<u32> for SpecialObjectType {
+    fn from(value: u32) -> Self {
+        match value {
+            VM_SPECIAL_OBJECT_VMCORE => SpecialObjectType::VMCore,
+            VM_SPECIAL_OBJECT_CBASE => SpecialObjectType::CBase,
+            VM_SPECIAL_OBJECT_CONST_BASE => SpecialObjectType::ConstBase,
+            _ => panic!("Invalid special object type: {}", value),
+        }
+    }
+}
+
+impl From<SpecialObjectType> for u64 {
+    fn from(special_type: SpecialObjectType) -> Self {
+        special_type as u64
+    }
+}
+
+impl std::fmt::Display for SpecialObjectType {
+    fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
+        match self {
+            SpecialObjectType::VMCore => write!(f, "VMCore"),
+            SpecialObjectType::CBase => write!(f, "CBase"),
+            SpecialObjectType::ConstBase => write!(f, "ConstBase"),
+        }
+    }
+}
+
+/// Print adaptor for [`Invariant`]. See [`PtrPrintMap`].
+pub struct InvariantPrinter<'a> {
+    inner: Invariant,
+    ptr_map: &'a PtrPrintMap,
+}
+
+impl<'a> std::fmt::Display for InvariantPrinter<'a> {
+    fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
+        match self.inner {
+            Invariant::BOPRedefined { klass, bop } => {
+                write!(f, "BOPRedefined(")?;
+                match klass {
+                    INTEGER_REDEFINED_OP_FLAG => write!(f, "INTEGER_REDEFINED_OP_FLAG")?,
+                    STRING_REDEFINED_OP_FLAG => write!(f, "STRING_REDEFINED_OP_FLAG")?,
+                    ARRAY_REDEFINED_OP_FLAG => write!(f, "ARRAY_REDEFINED_OP_FLAG")?,
+                    HASH_REDEFINED_OP_FLAG => write!(f, "HASH_REDEFINED_OP_FLAG")?,
+                    _ => write!(f, "{klass}")?,
+                }
+                write!(f, ", ")?;
+                match bop {
+                    BOP_PLUS  => write!(f, "BOP_PLUS")?,
+                    BOP_MINUS => write!(f, "BOP_MINUS")?,
+                    BOP_MULT  => write!(f, "BOP_MULT")?,
+                    BOP_DIV   => write!(f, "BOP_DIV")?,
+                    BOP_MOD   => write!(f, "BOP_MOD")?,
+                    BOP_EQ    => write!(f, "BOP_EQ")?,
+                    BOP_NEQ   => write!(f, "BOP_NEQ")?,
+                    BOP_LT    => write!(f, "BOP_LT")?,
+                    BOP_LE    => write!(f, "BOP_LE")?,
+                    BOP_GT    => write!(f, "BOP_GT")?,
+                    BOP_GE    => write!(f, "BOP_GE")?,
+                    BOP_FREEZE => write!(f, "BOP_FREEZE")?,
+                    BOP_UMINUS => write!(f, "BOP_UMINUS")?,
+                    BOP_MAX    => write!(f, "BOP_MAX")?,
+                    BOP_AREF   => write!(f, "BOP_AREF")?,
+                    _ => write!(f, "{bop}")?,
+                }
+                write!(f, ")")
+            }
+            Invariant::MethodRedefined { klass, method } => {
+                let class_name = get_class_name(klass);
+                write!(f, "MethodRedefined({class_name}@{:p}, {}@{:p})",
+                    self.ptr_map.map_ptr(klass.as_ptr::<VALUE>()),
+                    method.contents_lossy(),
+                    self.ptr_map.map_id(method.0)
+                )
+            }
+            Invariant::StableConstantNames { idlist } => {
+                write!(f, "StableConstantNames({:p}, ", self.ptr_map.map_ptr(idlist))?;
+                let mut idx = 0;
+                let mut sep = "";
+                loop {
+                    let id = unsafe { *idlist.wrapping_add(idx) };
+                    if id.0 == 0 {
+                        break;
+                    }
+                    write!(f, "{sep}{}", id.contents_lossy())?;
+                    sep = "::";
+                    idx += 1;
+                }
+                write!(f, ")")
+            }
+            Invariant::SingleRactorMode => write!(f, "SingleRactorMode"),
+        }
+    }
+}
+
+#[derive(Debug, Clone, PartialEq)]
+pub enum Const {
+    Value(VALUE),
+    CBool(bool),
+    CInt8(i8),
+    CInt16(i16),
+    CInt32(i32),
+    CInt64(i64),
+    CUInt8(u8),
+    CUInt16(u16),
+    CUInt32(u32),
+    CUInt64(u64),
+    CPtr(*mut u8),
+    CDouble(f64),
+}
+
+impl std::fmt::Display for Const {
+    fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
+        self.print(&PtrPrintMap::identity()).fmt(f)
+    }
+}
+
+impl Const {
+    fn print<'a>(&'a self, ptr_map: &'a PtrPrintMap) -> ConstPrinter<'a> {
+        ConstPrinter { inner: self, ptr_map }
+    }
+}
+
+pub enum RangeType {
+    Inclusive = 0, // include the end value
+    Exclusive = 1, // exclude the end value
+}
+
+impl std::fmt::Display for RangeType {
+    fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
+        write!(f, "{}", match self {
+            RangeType::Inclusive => "NewRangeInclusive",
+            RangeType::Exclusive => "NewRangeExclusive",
+        })
+    }
+}
+
+impl std::fmt::Debug for RangeType {
+    fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
+        write!(f, "{}", self.to_string())
+    }
+}
+
+impl Clone for RangeType {
+    fn clone(&self) -> Self {
+        *self
+    }
+}
+
+impl Copy for RangeType {}
+
+impl From<u32> for RangeType {
+    fn from(flag: u32) -> Self {
+        match flag {
+            0 => RangeType::Inclusive,
+            1 => RangeType::Exclusive,
+            _ => panic!("Invalid range flag: {}", flag),
+        }
+    }
+}
+
+impl From<RangeType> for u32 {
+    fn from(range_type: RangeType) -> Self {
+        range_type as u32
+    }
+}
+
+/// Print adaptor for [`Const`]. See [`PtrPrintMap`].
+struct ConstPrinter<'a> {
+    inner: &'a Const,
+    ptr_map: &'a PtrPrintMap,
+}
+
+impl<'a> std::fmt::Display for ConstPrinter<'a> {
+    fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
+        match self.inner {
+            Const::Value(val) => write!(f, "Value({})", val.print(self.ptr_map)),
+            Const::CPtr(val) => write!(f, "CPtr({:p})", self.ptr_map.map_ptr(val)),
+            _ => write!(f, "{:?}", self.inner),
+        }
+    }
+}
+
+/// For output stability in tests, we assign each pointer with a stable
+/// address the first time we see it. This mapping is off by default;
+/// set [`PtrPrintMap::map_ptrs`] to switch it on.
+///
+/// Because this is extra state external to any pointer being printed, a
+/// printing adapter struct that wraps the pointer along with this map is
+/// required to make use of this effectly. The [`std::fmt::Display`]
+/// implementation on the adapter struct can then be reused to implement
+/// `Display` on the inner type with a default [`PtrPrintMap`], which
+/// does not perform any mapping.
+pub struct PtrPrintMap {
+    inner: RefCell<PtrPrintMapInner>,
+    map_ptrs: bool,
+}
+
+struct PtrPrintMapInner {
+    map: HashMap<*const c_void, *const c_void>,
+    next_ptr: *const c_void,
+}
+
+impl PtrPrintMap {
+    /// Return a mapper that maps the pointer to itself.
+    pub fn identity() -> Self {
+        Self {
+            map_ptrs: false,
+            inner: RefCell::new(PtrPrintMapInner {
+                map: HashMap::default(), next_ptr:
+                ptr::without_provenance(0x1000) // Simulate 4 KiB zero page
+            })
+        }
+    }
+}
+
+impl PtrPrintMap {
+    /// Map a pointer for printing
+    fn map_ptr<T>(&self, ptr: *const T) -> *const T {
+        // When testing, address stability is not a concern so print real address to enable code
+        // reuse
+        if !self.map_ptrs {
+            return ptr;
+        }
+
+        use std::collections::hash_map::Entry::*;
+        let ptr = ptr.cast();
+        let inner = &mut *self.inner.borrow_mut();
+        match inner.map.entry(ptr) {
+            Occupied(entry) => entry.get().cast(),
+            Vacant(entry) => {
+                // Pick a fake address that is suitably aligns for T and remember it in the map
+                let mapped = inner.next_ptr.wrapping_add(inner.next_ptr.align_offset(align_of::<T>()));
+                entry.insert(mapped);
+
+                // Bump for the next pointer
+                inner.next_ptr = mapped.wrapping_add(size_of::<T>());
+                mapped.cast()
+            }
+        }
+    }
+
+    /// Map a Ruby ID (index into intern table) for printing
+    fn map_id(&self, id: u64) -> *const c_void {
+        self.map_ptr(id as *const c_void)
+    }
+}
+
+#[derive(Debug, Clone, Copy)]
+pub enum SideExitReason {
+    UnknownNewarraySend(vm_opt_newarray_send_type),
+    UnknownCallType,
+    UnknownOpcode(u32),
+    FixnumAddOverflow,
+    FixnumSubOverflow,
+    FixnumMultOverflow,
+    GuardType(Type),
+    GuardBitEquals(VALUE),
+    PatchPoint(Invariant),
+}
+
+impl std::fmt::Display for SideExitReason {
+    fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
+        match self {
+            SideExitReason::UnknownOpcode(opcode) => write!(f, "UnknownOpcode({})", insn_name(*opcode as usize)),
+            SideExitReason::UnknownNewarraySend(VM_OPT_NEWARRAY_SEND_MAX) => write!(f, "UnknownNewarraySend(MAX)"),
+            SideExitReason::UnknownNewarraySend(VM_OPT_NEWARRAY_SEND_MIN) => write!(f, "UnknownNewarraySend(MIN)"),
+            SideExitReason::UnknownNewarraySend(VM_OPT_NEWARRAY_SEND_HASH) => write!(f, "UnknownNewarraySend(HASH)"),
+            SideExitReason::UnknownNewarraySend(VM_OPT_NEWARRAY_SEND_PACK) => write!(f, "UnknownNewarraySend(PACK)"),
+            SideExitReason::UnknownNewarraySend(VM_OPT_NEWARRAY_SEND_PACK_BUFFER) => write!(f, "UnknownNewarraySend(PACK_BUFFER)"),
+            SideExitReason::UnknownNewarraySend(VM_OPT_NEWARRAY_SEND_INCLUDE_P) => write!(f, "UnknownNewarraySend(INCLUDE_P)"),
+            SideExitReason::GuardType(guard_type) => write!(f, "GuardType({guard_type})"),
+            SideExitReason::GuardBitEquals(value) => write!(f, "GuardBitEquals({})", value.print(&PtrPrintMap::identity())),
+            SideExitReason::PatchPoint(invariant) => write!(f, "PatchPoint({invariant})"),
+            _ => write!(f, "{self:?}"),
+        }
+    }
+}
+
+/// An instruction in the SSA IR. The output of an instruction is referred to by the index of
+/// the instruction ([`InsnId`]). SSA form enables this, and [`UnionFind`] ([`Function::find`])
+/// helps with editing.
+#[derive(Debug, Clone)]
+pub enum Insn {
+    Const { val: Const },
+    /// SSA block parameter. Also used for function parameters in the function's entry block.
+    Param { idx: usize },
+
+    StringCopy { val: InsnId, chilled: bool },
+    StringIntern { val: InsnId },
+
+    /// Put special object (VMCORE, CBASE, etc.) based on value_type
+    PutSpecialObject { value_type: SpecialObjectType },
+
+    /// Call `to_a` on `val` if the method is defined, or make a new array `[val]` otherwise.
+    ToArray { val: InsnId, state: InsnId },
+    /// Call `to_a` on `val` if the method is defined, or make a new array `[val]` otherwise. If we
+    /// called `to_a`, duplicate the returned array.
+    ToNewArray { val: InsnId, state: InsnId },
+    NewArray { elements: Vec<InsnId>, state: InsnId },
+    /// NewHash contains a vec of (key, value) pairs
+    NewHash { elements: Vec<(InsnId,InsnId)>, state: InsnId },
+    NewRange { low: InsnId, high: InsnId, flag: RangeType, state: InsnId },
+    ArraySet { array: InsnId, idx: usize, val: InsnId },
+    ArrayDup { val: InsnId, state: InsnId },
+    ArrayMax { elements: Vec<InsnId>, state: InsnId },
+    /// Extend `left` with the elements from `right`. `left` and `right` must both be `Array`.
+    ArrayExtend { left: InsnId, right: InsnId, state: InsnId },
+    /// Push `val` onto `array`, where `array` is already `Array`.
+    ArrayPush { array: InsnId, val: InsnId, state: InsnId },
+
+    HashDup { val: InsnId, state: InsnId },
+
+    /// Check if the value is truthy and "return" a C boolean. In reality, we will likely fuse this
+    /// with IfTrue/IfFalse in the backend to generate jcc.
+    Test { val: InsnId },
+    /// Return C `true` if `val` is `Qnil`, else `false`.
+    IsNil { val: InsnId },
+    Defined { op_type: usize, obj: VALUE, pushval: VALUE, v: InsnId },
+    GetConstantPath { ic: *const iseq_inline_constant_cache, state: InsnId },
+
+    /// Get a global variable named `id`
+    GetGlobal { id: ID, state: InsnId },
+    /// Set a global variable named `id` to `val`
+    SetGlobal { id: ID, val: InsnId, state: InsnId },
+
+    //NewObject?
+    /// Get an instance variable `id` from `self_val`
+    GetIvar { self_val: InsnId, id: ID, state: InsnId },
+    /// Set `self_val`'s instance variable `id` to `val`
+    SetIvar { self_val: InsnId, id: ID, val: InsnId, state: InsnId },
+    /// Check whether an instance variable exists on `self_val`
+    DefinedIvar { self_val: InsnId, id: ID, pushval: VALUE, state: InsnId },
+
+    /// Get a local variable from a higher scope or the heap
+    GetLocal { level: u32, ep_offset: u32 },
+    /// Set a local variable in a higher scope or the heap
+    SetLocal { level: u32, ep_offset: u32, val: InsnId },
+
+    /// Own a FrameState so that instructions can look up their dominating FrameState when
+    /// generating deopt side-exits and frame reconstruction metadata. Does not directly generate
+    /// any code.
+    Snapshot { state: FrameState },
+
+    /// Unconditional jump
+    Jump(BranchEdge),
+
+    /// Conditional branch instructions
+    IfTrue { val: InsnId, target: BranchEdge },
+    IfFalse { val: InsnId, target: BranchEdge },
+
+    /// Call a C function
+    /// `name` is for printing purposes only
+    CCall { cfun: *const u8, args: Vec<InsnId>, name: ID, return_type: Type, elidable: bool },
+
+    /// Send without block with dynamic dispatch
+    /// Ignoring keyword arguments etc for now
+    SendWithoutBlock { self_val: InsnId, call_info: CallInfo, cd: *const rb_call_data, args: Vec<InsnId>, state: InsnId },
+    Send { self_val: InsnId, call_info: CallInfo, cd: *const rb_call_data, blockiseq: IseqPtr, args: Vec<InsnId>, state: InsnId },
+    SendWithoutBlockDirect {
+        self_val: InsnId,
+        call_info: CallInfo,
+        cd: *const rb_call_data,
+        cme: *const rb_callable_method_entry_t,
+        iseq: IseqPtr,
+        args: Vec<InsnId>,
+        state: InsnId,
+    },
+
+    // Invoke a builtin function
+    InvokeBuiltin { bf: rb_builtin_function, args: Vec<InsnId>, state: InsnId },
+
+    /// Control flow instructions
+    Return { val: InsnId },
+    /// Non-local control flow. See the throw YARV instruction
+    Throw { throw_state: u32, val: InsnId },
+
+    /// Fixnum +, -, *, /, %, ==, !=, <, <=, >, >=, &, |
+    FixnumAdd  { left: InsnId, right: InsnId, state: InsnId },
+    FixnumSub  { left: InsnId, right: InsnId, state: InsnId },
+    FixnumMult { left: InsnId, right: InsnId, state: InsnId },
+    FixnumDiv  { left: InsnId, right: InsnId, state: InsnId },
+    FixnumMod  { left: InsnId, right: InsnId, state: InsnId },
+    FixnumEq   { left: InsnId, right: InsnId },
+    FixnumNeq  { left: InsnId, right: InsnId },
+    FixnumLt   { left: InsnId, right: InsnId },
+    FixnumLe   { left: InsnId, right: InsnId },
+    FixnumGt   { left: InsnId, right: InsnId },
+    FixnumGe   { left: InsnId, right: InsnId },
+    FixnumAnd  { left: InsnId, right: InsnId },
+    FixnumOr   { left: InsnId, right: InsnId },
+
+    // Distinct from `SendWithoutBlock` with `mid:to_s` because does not have a patch point for String to_s being redefined
+    ObjToString { val: InsnId, call_info: CallInfo, cd: *const rb_call_data, state: InsnId },
+    AnyToString { val: InsnId, str: InsnId, state: InsnId },
+
+    /// Side-exit if val doesn't have the expected type.
+    GuardType { val: InsnId, guard_type: Type, state: InsnId },
+    /// Side-exit if val is not the expected VALUE.
+    GuardBitEquals { val: InsnId, expected: VALUE, state: InsnId },
+
+    /// Generate no code (or padding if necessary) and insert a patch point
+    /// that can be rewritten to a side exit when the Invariant is broken.
+    PatchPoint { invariant: Invariant, state: InsnId },
+
+    /// Side-exit into the interpreter.
+    SideExit { state: InsnId, reason: SideExitReason },
+}
+
+impl Insn {
+    /// Not every instruction returns a value. Return true if the instruction does and false otherwise.
+    pub fn has_output(&self) -> bool {
+        match self {
+            Insn::ArraySet { .. } | Insn::Jump(_)
+            | Insn::IfTrue { .. } | Insn::IfFalse { .. } | Insn::Return { .. }
+            | Insn::PatchPoint { .. } | Insn::SetIvar { .. } | Insn::ArrayExtend { .. }
+            | Insn::ArrayPush { .. } | Insn::SideExit { .. } | Insn::SetGlobal { .. }
+            | Insn::SetLocal { .. } | Insn::Throw { .. } => false,
+            _ => true,
+        }
+    }
+
+    /// Return true if the instruction ends a basic block and false otherwise.
+    pub fn is_terminator(&self) -> bool {
+        match self {
+            Insn::Jump(_) | Insn::Return { .. } | Insn::SideExit { .. } | Insn::Throw { .. } => true,
+            _ => false,
+        }
+    }
+
+    pub fn print<'a>(&self, ptr_map: &'a PtrPrintMap) -> InsnPrinter<'a> {
+        InsnPrinter { inner: self.clone(), ptr_map }
+    }
+
+    /// Return true if the instruction needs to be kept around. For example, if the instruction
+    /// might have a side effect, or if the instruction may raise an exception.
+    fn has_effects(&self) -> bool {
+        match self {
+            Insn::Const { .. } => false,
+            Insn::Param { .. } => false,
+            Insn::StringCopy { .. } => false,
+            Insn::NewArray { .. } => false,
+            Insn::NewHash { .. } => false,
+            Insn::NewRange { .. } => false,
+            Insn::ArrayDup { .. } => false,
+            Insn::HashDup { .. } => false,
+            Insn::Test { .. } => false,
+            Insn::Snapshot { .. } => false,
+            Insn::FixnumAdd  { .. } => false,
+            Insn::FixnumSub  { .. } => false,
+            Insn::FixnumMult { .. } => false,
+            // TODO(max): Consider adding a Guard that the rhs is non-zero before Div and Mod
+            // Div *is* critical unless we can prove the right hand side != 0
+            // Mod *is* critical unless we can prove the right hand side != 0
+            Insn::FixnumEq   { .. } => false,
+            Insn::FixnumNeq  { .. } => false,
+            Insn::FixnumLt   { .. } => false,
+            Insn::FixnumLe   { .. } => false,
+            Insn::FixnumGt   { .. } => false,
+            Insn::FixnumGe   { .. } => false,
+            Insn::FixnumAnd  { .. } => false,
+            Insn::FixnumOr   { .. } => false,
+            Insn::GetLocal   { .. } => false,
+            Insn::IsNil      { .. } => false,
+            Insn::CCall { elidable, .. } => !elidable,
+            _ => true,
+        }
+    }
+}
+
+/// Print adaptor for [`Insn`]. See [`PtrPrintMap`].
+pub struct InsnPrinter<'a> {
+    inner: Insn,
+    ptr_map: &'a PtrPrintMap,
+}
+
+impl<'a> std::fmt::Display for InsnPrinter<'a> {
+    fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
+        match &self.inner {
+            Insn::Const { val } => { write!(f, "Const {}", val.print(self.ptr_map)) }
+            Insn::Param { idx } => { write!(f, "Param {idx}") }
+            Insn::NewArray { elements, .. } => {
+                write!(f, "NewArray")?;
+                let mut prefix = " ";
+                for element in elements {
+                    write!(f, "{prefix}{element}")?;
+                    prefix = ", ";
+                }
+                Ok(())
+            }
+            Insn::NewHash { elements, .. } => {
+                write!(f, "NewHash")?;
+                let mut prefix = " ";
+                for (key, value) in elements {
+                    write!(f, "{prefix}{key}: {value}")?;
+                    prefix = ", ";
+                }
+                Ok(())
+            }
+            Insn::NewRange { low, high, flag, .. } => {
+                write!(f, "NewRange {low} {flag} {high}")
+            }
+            Insn::ArrayMax { elements, .. } => {
+                write!(f, "ArrayMax")?;
+                let mut prefix = " ";
+                for element in elements {
+                    write!(f, "{prefix}{element}")?;
+                    prefix = ", ";
+                }
+                Ok(())
+            }
+            Insn::ArraySet { array, idx, val } => { write!(f, "ArraySet {array}, {idx}, {val}") }
+            Insn::ArrayDup { val, .. } => { write!(f, "ArrayDup {val}") }
+            Insn::HashDup { val, .. } => { write!(f, "HashDup {val}") }
+            Insn::StringCopy { val, .. } => { write!(f, "StringCopy {val}") }
+            Insn::Test { val } => { write!(f, "Test {val}") }
+            Insn::IsNil { val } => { write!(f, "IsNil {val}") }
+            Insn::Jump(target) => { write!(f, "Jump {target}") }
+            Insn::IfTrue { val, target } => { write!(f, "IfTrue {val}, {target}") }
+            Insn::IfFalse { val, target } => { write!(f, "IfFalse {val}, {target}") }
+            Insn::SendWithoutBlock { self_val, call_info, args, .. } => {
+                write!(f, "SendWithoutBlock {self_val}, :{}", call_info.method_name)?;
+                for arg in args {
+                    write!(f, ", {arg}")?;
+                }
+                Ok(())
+            }
+            Insn::SendWithoutBlockDirect { self_val, call_info, iseq, args, .. } => {
+                write!(f, "SendWithoutBlockDirect {self_val}, :{} ({:?})", call_info.method_name, self.ptr_map.map_ptr(iseq))?;
+                for arg in args {
+                    write!(f, ", {arg}")?;
+                }
+                Ok(())
+            }
+            Insn::Send { self_val, call_info, args, blockiseq, .. } => {
+                // For tests, we want to check HIR snippets textually. Addresses change
+                // between runs, making tests fail. Instead, pick an arbitrary hex value to
+                // use as a "pointer" so we can check the rest of the HIR.
+                write!(f, "Send {self_val}, {:p}, :{}", self.ptr_map.map_ptr(blockiseq), call_info.method_name)?;
+                for arg in args {
+                    write!(f, ", {arg}")?;
+                }
+                Ok(())
+            }
+            Insn::InvokeBuiltin { bf, args, .. } => {
+                write!(f, "InvokeBuiltin {}", unsafe { CStr::from_ptr(bf.name) }.to_str().unwrap())?;
+                for arg in args {
+                    write!(f, ", {arg}")?;
+                }
+                Ok(())
+            }
+            Insn::Return { val } => { write!(f, "Return {val}") }
+            Insn::FixnumAdd  { left, right, .. } => { write!(f, "FixnumAdd {left}, {right}") },
+            Insn::FixnumSub  { left, right, .. } => { write!(f, "FixnumSub {left}, {right}") },
+            Insn::FixnumMult { left, right, .. } => { write!(f, "FixnumMult {left}, {right}") },
+            Insn::FixnumDiv  { left, right, .. } => { write!(f, "FixnumDiv {left}, {right}") },
+            Insn::FixnumMod  { left, right, .. } => { write!(f, "FixnumMod {left}, {right}") },
+            Insn::FixnumEq   { left, right, .. } => { write!(f, "FixnumEq {left}, {right}") },
+            Insn::FixnumNeq  { left, right, .. } => { write!(f, "FixnumNeq {left}, {right}") },
+            Insn::FixnumLt   { left, right, .. } => { write!(f, "FixnumLt {left}, {right}") },
+            Insn::FixnumLe   { left, right, .. } => { write!(f, "FixnumLe {left}, {right}") },
+            Insn::FixnumGt   { left, right, .. } => { write!(f, "FixnumGt {left}, {right}") },
+            Insn::FixnumGe   { left, right, .. } => { write!(f, "FixnumGe {left}, {right}") },
+            Insn::FixnumAnd  { left, right, .. } => { write!(f, "FixnumAnd {left}, {right}") },
+            Insn::FixnumOr   { left, right, .. } => { write!(f, "FixnumOr {left}, {right}") },
+            Insn::GuardType { val, guard_type, .. } => { write!(f, "GuardType {val}, {}", guard_type.print(self.ptr_map)) },
+            Insn::GuardBitEquals { val, expected, .. } => { write!(f, "GuardBitEquals {val}, {}", expected.print(self.ptr_map)) },
+            Insn::PatchPoint { invariant, .. } => { write!(f, "PatchPoint {}", invariant.print(self.ptr_map)) },
+            Insn::GetConstantPath { ic, .. } => { write!(f, "GetConstantPath {:p}", self.ptr_map.map_ptr(ic)) },
+            Insn::CCall { cfun, args, name, return_type: _, elidable: _ } => {
+                write!(f, "CCall {}@{:p}", name.contents_lossy(), self.ptr_map.map_ptr(cfun))?;
+                for arg in args {
+                    write!(f, ", {arg}")?;
+                }
+                Ok(())
+            },
+            Insn::Snapshot { state } => write!(f, "Snapshot {}", state),
+            Insn::Defined { op_type, v, .. } => {
+                // op_type (enum defined_type) printing logic from iseq.c.
+                // Not sure why rb_iseq_defined_string() isn't exhaustive.
+                use std::borrow::Cow;
+                let op_type = *op_type as u32;
+                let op_type = if op_type == DEFINED_FUNC {
+                    Cow::Borrowed("func")
+                } else if op_type == DEFINED_REF {
+                    Cow::Borrowed("ref")
+                } else if op_type == DEFINED_CONST_FROM {
+                    Cow::Borrowed("constant-from")
+                } else {
+                    String::from_utf8_lossy(unsafe { rb_iseq_defined_string(op_type).as_rstring_byte_slice().unwrap() })
+                };
+                write!(f, "Defined {op_type}, {v}")
+            }
+            Insn::DefinedIvar { self_val, id, .. } => write!(f, "DefinedIvar {self_val}, :{}", id.contents_lossy().into_owned()),
+            Insn::GetIvar { self_val, id, .. } => write!(f, "GetIvar {self_val}, :{}", id.contents_lossy().into_owned()),
+            Insn::SetIvar { self_val, id, val, .. } => write!(f, "SetIvar {self_val}, :{}, {val}", id.contents_lossy().into_owned()),
+            Insn::GetGlobal { id, .. } => write!(f, "GetGlobal :{}", id.contents_lossy().into_owned()),
+            Insn::SetGlobal { id, val, .. } => write!(f, "SetGlobal :{}, {val}", id.contents_lossy().into_owned()),
+            Insn::GetLocal { level, ep_offset } => write!(f, "GetLocal l{level}, EP@{ep_offset}"),
+            Insn::SetLocal { val, level, ep_offset } => write!(f, "SetLocal l{level}, EP@{ep_offset}, {val}"),
+            Insn::ToArray { val, .. } => write!(f, "ToArray {val}"),
+            Insn::ToNewArray { val, .. } => write!(f, "ToNewArray {val}"),
+            Insn::ArrayExtend { left, right, .. } => write!(f, "ArrayExtend {left}, {right}"),
+            Insn::ArrayPush { array, val, .. } => write!(f, "ArrayPush {array}, {val}"),
+            Insn::ObjToString { val, .. } => { write!(f, "ObjToString {val}") },
+            Insn::AnyToString { val, str, .. } => { write!(f, "AnyToString {val}, str: {str}") },
+            Insn::SideExit { reason, .. } => write!(f, "SideExit {reason}"),
+            Insn::PutSpecialObject { value_type } => write!(f, "PutSpecialObject {value_type}"),
+            Insn::Throw { throw_state, val } => {
+                let mut state_string = match throw_state & VM_THROW_STATE_MASK {
+                    RUBY_TAG_NONE => "TAG_NONE".to_string(),
+                    RUBY_TAG_RETURN => "TAG_RETURN".to_string(),
+                    RUBY_TAG_BREAK => "TAG_BREAK".to_string(),
+                    RUBY_TAG_NEXT => "TAG_NEXT".to_string(),
+                    RUBY_TAG_RETRY => "TAG_RETRY".to_string(),
+                    RUBY_TAG_REDO => "TAG_REDO".to_string(),
+                    RUBY_TAG_RAISE => "TAG_RAISE".to_string(),
+                    RUBY_TAG_THROW => "TAG_THROW".to_string(),
+                    RUBY_TAG_FATAL => "TAG_FATAL".to_string(),
+                    tag => format!("{tag}")
+                };
+                if throw_state & VM_THROW_NO_ESCAPE_FLAG != 0 {
+                    use std::fmt::Write;
+                    write!(state_string, "|NO_ESCAPE")?;
+                }
+                write!(f, "Throw {state_string}, {val}")
+            }
+            insn => { write!(f, "{insn:?}") }
+        }
+    }
+}
+
+impl std::fmt::Display for Insn {
+    fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
+        self.print(&PtrPrintMap::identity()).fmt(f)
+    }
+}
+
+/// An extended basic block in a [`Function`].
+#[derive(Default, Debug)]
+pub struct Block {
+    params: Vec<InsnId>,
+    insns: Vec<InsnId>,
+}
+
+impl Block {
+    /// Return an iterator over params
+    pub fn params(&self) -> Iter<InsnId> {
+        self.params.iter()
+    }
+
+    /// Return an iterator over insns
+    pub fn insns(&self) -> Iter<InsnId> {
+        self.insns.iter()
+    }
+}
+
+/// Pretty printer for [`Function`].
+pub struct FunctionPrinter<'a> {
+    fun: &'a Function,
+    display_snapshot: bool,
+    ptr_map: PtrPrintMap,
+}
+
+impl<'a> FunctionPrinter<'a> {
+    pub fn without_snapshot(fun: &'a Function) -> Self {
+        let mut ptr_map = PtrPrintMap::identity();
+        if cfg!(test) {
+            ptr_map.map_ptrs = true;
+        }
+        Self { fun, display_snapshot: false, ptr_map }
+    }
+
+    pub fn with_snapshot(fun: &'a Function) -> FunctionPrinter<'a> {
+        let mut printer = Self::without_snapshot(fun);
+        printer.display_snapshot = true;
+        printer
+    }
+}
+
+/// Union-Find (Disjoint-Set) is a data structure for managing disjoint sets that has an interface
+/// of two operations:
+///
+/// * find (what set is this item part of?)
+/// * union (join these two sets)
+///
+/// Union-Find identifies sets by their *representative*, which is some chosen element of the set.
+/// This is implemented by structuring each set as its own graph component with the representative
+/// pointing at nothing. For example:
+///
+/// * A -> B -> C
+/// * D -> E
+///
+/// This represents two sets `C` and `E`, with three and two members, respectively. In this
+/// example, `find(A)=C`, `find(C)=C`, `find(D)=E`, and so on.
+///
+/// To union sets, call `make_equal_to` on any set element. That is, `make_equal_to(A, D)` and
+/// `make_equal_to(B, E)` have the same result: the two sets are joined into the same graph
+/// component. After this operation, calling `find` on any element will return `E`.
+///
+/// This is a useful data structure in compilers because it allows in-place rewriting without
+/// linking/unlinking instructions and without replacing all uses. When calling `make_equal_to` on
+/// any instruction, all of its uses now implicitly point to the replacement.
+///
+/// This does mean that pattern matching and analysis of the instruction graph must be careful to
+/// call `find` whenever it is inspecting an instruction (or its operands). If not, this may result
+/// in missing optimizations.
+#[derive(Debug)]
+struct UnionFind<T: Copy + Into<usize>> {
+    forwarded: Vec<Option<T>>,
+}
+
+impl<T: Copy + Into<usize> + PartialEq> UnionFind<T> {
+    fn new() -> UnionFind<T> {
+        UnionFind { forwarded: vec![] }
+    }
+
+    /// Private. Return the internal representation of the forwarding pointer for a given element.
+    fn at(&self, idx: T) -> Option<T> {
+        self.forwarded.get(idx.into()).map(|x| *x).flatten()
+    }
+
+    /// Private. Set the internal representation of the forwarding pointer for the given element
+    /// `idx`. Extend the internal vector if necessary.
+    fn set(&mut self, idx: T, value: T) {
+        if idx.into() >= self.forwarded.len() {
+            self.forwarded.resize(idx.into()+1, None);
+        }
+        self.forwarded[idx.into()] = Some(value);
+    }
+
+    /// Find the set representative for `insn`. Perform path compression at the same time to speed
+    /// up further find operations. For example, before:
+    ///
+    /// `A -> B -> C`
+    ///
+    /// and after `find(A)`:
+    ///
+    /// ```
+    /// A -> C
+    /// B ---^
+    /// ```
+    pub fn find(&mut self, insn: T) -> T {
+        let result = self.find_const(insn);
+        if result != insn {
+            // Path compression
+            self.set(insn, result);
+        }
+        result
+    }
+
+    /// Find the set representative for `insn` without doing path compression.
+    fn find_const(&self, insn: T) -> T {
+        let mut result = insn;
+        loop {
+            match self.at(result) {
+                None => return result,
+                Some(insn) => result = insn,
+            }
+        }
+    }
+
+    /// Union the two sets containing `insn` and `target` such that every element in `insn`s set is
+    /// now part of `target`'s. Neither argument must be the representative in its set.
+    pub fn make_equal_to(&mut self, insn: T, target: T) {
+        let found = self.find(insn);
+        self.set(found, target);
+    }
+}
+
+#[derive(Debug, PartialEq)]
+pub enum ValidationError {
+    BlockHasNoTerminator(BlockId),
+    // The terminator and its actual position
+    TerminatorNotAtEnd(BlockId, InsnId, usize),
+    /// Expected length, actual length
+    MismatchedBlockArity(BlockId, usize, usize),
+    JumpTargetNotInRPO(BlockId),
+    // The offending instruction, and the operand
+    OperandNotDefined(BlockId, InsnId, InsnId),
+    /// The offending block and instruction
+    DuplicateInstruction(BlockId, InsnId),
+}
+
+
+/// A [`Function`], which is analogous to a Ruby ISeq, is a control-flow graph of [`Block`]s
+/// containing instructions.
+#[derive(Debug)]
+pub struct Function {
+    // ISEQ this function refers to
+    iseq: *const rb_iseq_t,
+    // The types for the parameters of this function
+    param_types: Vec<Type>,
+
+    // TODO: get method name and source location from the ISEQ
+
+    insns: Vec<Insn>,
+    union_find: std::cell::RefCell<UnionFind<InsnId>>,
+    insn_types: Vec<Type>,
+    blocks: Vec<Block>,
+    entry_block: BlockId,
+    profiles: Option<ProfileOracle>,
+}
+
+impl Function {
+    fn new(iseq: *const rb_iseq_t) -> Function {
+        Function {
+            iseq,
+            insns: vec![],
+            insn_types: vec![],
+            union_find: UnionFind::new().into(),
+            blocks: vec![Block::default()],
+            entry_block: BlockId(0),
+            param_types: vec![],
+            profiles: None,
+        }
+    }
+
+    // Add an instruction to the function without adding it to any block
+    fn new_insn(&mut self, insn: Insn) -> InsnId {
+        let id = InsnId(self.insns.len());
+        if insn.has_output() {
+            self.insn_types.push(types::Any);
+        } else {
+            self.insn_types.push(types::Empty);
+        }
+        self.insns.push(insn);
+        id
+    }
+
+    // Add an instruction to an SSA block
+    fn push_insn(&mut self, block: BlockId, insn: Insn) -> InsnId {
+        let is_param = matches!(insn, Insn::Param { .. });
+        let id = self.new_insn(insn);
+        if is_param {
+            self.blocks[block.0].params.push(id);
+        } else {
+            self.blocks[block.0].insns.push(id);
+        }
+        id
+    }
+
+    // Add an instruction to an SSA block
+    fn push_insn_id(&mut self, block: BlockId, insn_id: InsnId) -> InsnId {
+        self.blocks[block.0].insns.push(insn_id);
+        insn_id
+    }
+
+    /// Return the number of instructions
+    pub fn num_insns(&self) -> usize {
+        self.insns.len()
+    }
+
+    /// Return a FrameState at the given instruction index.
+    pub fn frame_state(&self, insn_id: InsnId) -> FrameState {
+        match self.find(insn_id) {
+            Insn::Snapshot { state } => state,
+            insn => panic!("Unexpected non-Snapshot {insn} when looking up FrameState"),
+        }
+    }
+
+    fn new_block(&mut self) -> BlockId {
+        let id = BlockId(self.blocks.len());
+        self.blocks.push(Block::default());
+        id
+    }
+
+    /// Return a reference to the Block at the given index.
+    pub fn block(&self, block_id: BlockId) -> &Block {
+        &self.blocks[block_id.0]
+    }
+
+    /// Return the number of blocks
+    pub fn num_blocks(&self) -> usize {
+        self.blocks.len()
+    }
+
+    /// Return a copy of the instruction where the instruction and its operands have been read from
+    /// the union-find table (to find the current most-optimized version of this instruction). See
+    /// [`UnionFind`] for more.
+    ///
+    /// This is _the_ function for reading [`Insn`]. Use frequently. Example:
+    ///
+    /// ```rust
+    /// match func.find(insn_id) {
+    ///   IfTrue { val, target } if func.is_truthy(val) => {
+    ///     let jump = self.new_insn(Insn::Jump(target));
+    ///     func.make_equal_to(insn_id, jump);
+    ///   }
+    ///   _ => {}
+    /// }
+    /// ```
+    pub fn find(&self, insn_id: InsnId) -> Insn {
+        macro_rules! find {
+            ( $x:expr ) => {
+                {
+                    // TODO(max): Figure out why borrow_mut().find() causes `already borrowed:
+                    // BorrowMutError`
+                    self.union_find.borrow().find_const($x)
+                }
+            };
+        }
+        macro_rules! find_vec {
+            ( $x:expr ) => {
+                {
+                    $x.iter().map(|arg| find!(*arg)).collect()
+                }
+            };
+        }
+        macro_rules! find_branch_edge {
+            ( $edge:ident ) => {
+                {
+                    BranchEdge {
+                        target: $edge.target,
+                        args: find_vec!($edge.args),
+                    }
+                }
+            };
+        }
+        let insn_id = find!(insn_id);
+        use Insn::*;
+        match &self.insns[insn_id.0] {
+            result@(Const {..}
+                    | Param {..}
+                    | GetConstantPath {..}
+                    | PatchPoint {..}
+                    | PutSpecialObject {..}
+                    | GetGlobal {..}
+                    | GetLocal {..}
+                    | SideExit {..}) => result.clone(),
+            Snapshot { state: FrameState { iseq, insn_idx, pc, stack, locals } } =>
+                Snapshot {
+                    state: FrameState {
+                        iseq: *iseq,
+                        insn_idx: *insn_idx,
+                        pc: *pc,
+                        stack: find_vec!(stack),
+                        locals: find_vec!(locals),
+                    }
+                },
+            Return { val } => Return { val: find!(*val) },
+            &Throw { throw_state, val } => Throw { throw_state, val: find!(val) },
+            StringCopy { val, chilled } => StringCopy { val: find!(*val), chilled: *chilled },
+            StringIntern { val } => StringIntern { val: find!(*val) },
+            Test { val } => Test { val: find!(*val) },
+            &IsNil { val } => IsNil { val: find!(val) },
+            Jump(target) => Jump(find_branch_edge!(target)),
+            IfTrue { val, target } => IfTrue { val: find!(*val), target: find_branch_edge!(target) },
+            IfFalse { val, target } => IfFalse { val: find!(*val), target: find_branch_edge!(target) },
+            GuardType { val, guard_type, state } => GuardType { val: find!(*val), guard_type: *guard_type, state: *state },
+            GuardBitEquals { val, expected, state } => GuardBitEquals { val: find!(*val), expected: *expected, state: *state },
+            FixnumAdd { left, right, state } => FixnumAdd { left: find!(*left), right: find!(*right), state: *state },
+            FixnumSub { left, right, state } => FixnumSub { left: find!(*left), right: find!(*right), state: *state },
+            FixnumMult { left, right, state } => FixnumMult { left: find!(*left), right: find!(*right), state: *state },
+            FixnumDiv { left, right, state } => FixnumDiv { left: find!(*left), right: find!(*right), state: *state },
+            FixnumMod { left, right, state } => FixnumMod { left: find!(*left), right: find!(*right), state: *state },
+            FixnumNeq { left, right } => FixnumNeq { left: find!(*left), right: find!(*right) },
+            FixnumEq { left, right } => FixnumEq { left: find!(*left), right: find!(*right) },
+            FixnumGt { left, right } => FixnumGt { left: find!(*left), right: find!(*right) },
+            FixnumGe { left, right } => FixnumGe { left: find!(*left), right: find!(*right) },
+            FixnumLt { left, right } => FixnumLt { left: find!(*left), right: find!(*right) },
+            FixnumLe { left, right } => FixnumLe { left: find!(*left), right: find!(*right) },
+            FixnumAnd { left, right } => FixnumAnd { left: find!(*left), right: find!(*right) },
+            FixnumOr { left, right } => FixnumOr { left: find!(*left), right: find!(*right) },
+            ObjToString { val, call_info, cd, state } => ObjToString {
+                val: find!(*val),
+                call_info: call_info.clone(),
+                cd: *cd,
+                state: *state,
+            },
+            AnyToString { val, str, state } => AnyToString {
+                val: find!(*val),
+                str: find!(*str),
+                state: *state,
+            },
+            SendWithoutBlock { self_val, call_info, cd, args, state } => SendWithoutBlock {
+                self_val: find!(*self_val),
+                call_info: call_info.clone(),
+                cd: *cd,
+                args: find_vec!(args),
+                state: *state,
+            },
+            SendWithoutBlockDirect { self_val, call_info, cd, cme, iseq, args, state } => SendWithoutBlockDirect {
+                self_val: find!(*self_val),
+                call_info: call_info.clone(),
+                cd: *cd,
+                cme: *cme,
+                iseq: *iseq,
+                args: find_vec!(args),
+                state: *state,
+            },
+            Send { self_val, call_info, cd, blockiseq, args, state } => Send {
+                self_val: find!(*self_val),
+                call_info: call_info.clone(),
+                cd: *cd,
+                blockiseq: *blockiseq,
+                args: find_vec!(args),
+                state: *state,
+            },
+            InvokeBuiltin { bf, args, state } => InvokeBuiltin { bf: *bf, args: find_vec!(*args), state: *state },
+            ArraySet { array, idx, val } => ArraySet { array: find!(*array), idx: *idx, val: find!(*val) },
+            ArrayDup { val , state } => ArrayDup { val: find!(*val), state: *state },
+            &HashDup { val , state } => HashDup { val: find!(val), state },
+            &CCall { cfun, ref args, name, return_type, elidable } => CCall { cfun, args: find_vec!(args), name, return_type, elidable },
+            &Defined { op_type, obj, pushval, v } => Defined { op_type, obj, pushval, v: find!(v) },
+            &DefinedIvar { self_val, pushval, id, state } => DefinedIvar { self_val: find!(self_val), pushval, id, state },
+            NewArray { elements, state } => NewArray { elements: find_vec!(*elements), state: find!(*state) },
+            &NewHash { ref elements, state } => {
+                let mut found_elements = vec![];
+                for &(key, value) in elements {
+                    found_elements.push((find!(key), find!(value)));
+                }
+                NewHash { elements: found_elements, state: find!(state) }
+            }
+            &NewRange { low, high, flag, state } => NewRange { low: find!(low), high: find!(high), flag, state: find!(state) },
+            ArrayMax { elements, state } => ArrayMax { elements: find_vec!(*elements), state: find!(*state) },
+            &SetGlobal { id, val, state } => SetGlobal { id, val: find!(val), state },
+            &GetIvar { self_val, id, state } => GetIvar { self_val: find!(self_val), id, state },
+            &SetIvar { self_val, id, val, state } => SetIvar { self_val: find!(self_val), id, val: find!(val), state },
+            &SetLocal { val, ep_offset, level } => SetLocal { val: find!(val), ep_offset, level },
+            &ToArray { val, state } => ToArray { val: find!(val), state },
+            &ToNewArray { val, state } => ToNewArray { val: find!(val), state },
+            &ArrayExtend { left, right, state } => ArrayExtend { left: find!(left), right: find!(right), state },
+            &ArrayPush { array, val, state } => ArrayPush { array: find!(array), val: find!(val), state },
+        }
+    }
+
+    /// Replace `insn` with the new instruction `replacement`, which will get appended to `insns`.
+    fn make_equal_to(&mut self, insn: InsnId, replacement: InsnId) {
+        // Don't push it to the block
+        self.union_find.borrow_mut().make_equal_to(insn, replacement);
+    }
+
+    fn type_of(&self, insn: InsnId) -> Type {
+        assert!(self.insns[insn.0].has_output());
+        self.insn_types[self.union_find.borrow_mut().find(insn).0]
+    }
+
+    /// Check if the type of `insn` is a subtype of `ty`.
+    fn is_a(&self, insn: InsnId, ty: Type) -> bool {
+        self.type_of(insn).is_subtype(ty)
+    }
+
+    fn infer_type(&self, insn: InsnId) -> Type {
+        assert!(self.insns[insn.0].has_output());
+        match &self.insns[insn.0] {
+            Insn::Param { .. } => unimplemented!("params should not be present in block.insns"),
+            Insn::SetGlobal { .. } | Insn::ArraySet { .. } | Insn::Jump(_)
+            | Insn::IfTrue { .. } | Insn::IfFalse { .. } | Insn::Return { .. } | Insn::Throw { .. }
+            | Insn::PatchPoint { .. } | Insn::SetIvar { .. } | Insn::ArrayExtend { .. }
+            | Insn::ArrayPush { .. } | Insn::SideExit { .. } | Insn::SetLocal { .. } =>
+                panic!("Cannot infer type of instruction with no output: {}", self.insns[insn.0]),
+            Insn::Const { val: Const::Value(val) } => Type::from_value(*val),
+            Insn::Const { val: Const::CBool(val) } => Type::from_cbool(*val),
+            Insn::Const { val: Const::CInt8(val) } => Type::from_cint(types::CInt8, *val as i64),
+            Insn::Const { val: Const::CInt16(val) } => Type::from_cint(types::CInt16, *val as i64),
+            Insn::Const { val: Const::CInt32(val) } => Type::from_cint(types::CInt32, *val as i64),
+            Insn::Const { val: Const::CInt64(val) } => Type::from_cint(types::CInt64, *val),
+            Insn::Const { val: Const::CUInt8(val) } => Type::from_cint(types::CUInt8, *val as i64),
+            Insn::Const { val: Const::CUInt16(val) } => Type::from_cint(types::CUInt16, *val as i64),
+            Insn::Const { val: Const::CUInt32(val) } => Type::from_cint(types::CUInt32, *val as i64),
+            Insn::Const { val: Const::CUInt64(val) } => Type::from_cint(types::CUInt64, *val as i64),
+            Insn::Const { val: Const::CPtr(val) } => Type::from_cint(types::CPtr, *val as i64),
+            Insn::Const { val: Const::CDouble(val) } => Type::from_double(*val),
+            Insn::Test { val } if self.type_of(*val).is_known_falsy() => Type::from_cbool(false),
+            Insn::Test { val } if self.type_of(*val).is_known_truthy() => Type::from_cbool(true),
+            Insn::Test { .. } => types::CBool,
+            Insn::IsNil { val } if self.is_a(*val, types::NilClassExact) => Type::from_cbool(true),
+            Insn::IsNil { val } if !self.type_of(*val).could_be(types::NilClassExact) => Type::from_cbool(false),
+            Insn::IsNil { .. } => types::CBool,
+            Insn::StringCopy { .. } => types::StringExact,
+            Insn::StringIntern { .. } => types::StringExact,
+            Insn::NewArray { .. } => types::ArrayExact,
+            Insn::ArrayDup { .. } => types::ArrayExact,
+            Insn::NewHash { .. } => types::HashExact,
+            Insn::HashDup { .. } => types::HashExact,
+            Insn::NewRange { .. } => types::RangeExact,
+            Insn::CCall { return_type, .. } => *return_type,
+            Insn::GuardType { val, guard_type, .. } => self.type_of(*val).intersection(*guard_type),
+            Insn::GuardBitEquals { val, expected, .. } => self.type_of(*val).intersection(Type::from_value(*expected)),
+            Insn::FixnumAdd  { .. } => types::Fixnum,
+            Insn::FixnumSub  { .. } => types::Fixnum,
+            Insn::FixnumMult { .. } => types::Fixnum,
+            Insn::FixnumDiv  { .. } => types::Fixnum,
+            Insn::FixnumMod  { .. } => types::Fixnum,
+            Insn::FixnumEq   { .. } => types::BoolExact,
+            Insn::FixnumNeq  { .. } => types::BoolExact,
+            Insn::FixnumLt   { .. } => types::BoolExact,
+            Insn::FixnumLe   { .. } => types::BoolExact,
+            Insn::FixnumGt   { .. } => types::BoolExact,
+            Insn::FixnumGe   { .. } => types::BoolExact,
+            Insn::FixnumAnd  { .. } => types::Fixnum,
+            Insn::FixnumOr   { .. } => types::Fixnum,
+            Insn::PutSpecialObject { .. } => types::BasicObject,
+            Insn::SendWithoutBlock { .. } => types::BasicObject,
+            Insn::SendWithoutBlockDirect { .. } => types::BasicObject,
+            Insn::Send { .. } => types::BasicObject,
+            Insn::InvokeBuiltin { .. } => types::BasicObject,
+            Insn::Defined { .. } => types::BasicObject,
+            Insn::DefinedIvar { .. } => types::BasicObject,
+            Insn::GetConstantPath { .. } => types::BasicObject,
+            Insn::ArrayMax { .. } => types::BasicObject,
+            Insn::GetGlobal { .. } => types::BasicObject,
+            Insn::GetIvar { .. } => types::BasicObject,
+            Insn::ToNewArray { .. } => types::ArrayExact,
+            Insn::ToArray { .. } => types::ArrayExact,
+            Insn::ObjToString { .. } => types::BasicObject,
+            Insn::AnyToString { .. } => types::String,
+            Insn::GetLocal { .. } => types::BasicObject,
+            // The type of Snapshot doesn't really matter; it's never materialized. It's used only
+            // as a reference for FrameState, which we use to generate side-exit code.
+            Insn::Snapshot { .. } => types::Any,
+        }
+    }
+
+    fn infer_types(&mut self) {
+        // Reset all types
+        self.insn_types.fill(types::Empty);
+
+        // Fill parameter types
+        let entry_params = self.blocks[self.entry_block.0].params.iter();
+        let param_types = self.param_types.iter();
+        assert_eq!(
+            entry_params.len(),
+            entry_params.len(),
+            "param types should be initialized before type inference"
+        );
+        for (param, param_type) in std::iter::zip(entry_params, param_types) {
+            // We know that function parameters are BasicObject or some subclass
+            self.insn_types[param.0] = *param_type;
+        }
+        let rpo = self.rpo();
+        // Walk the graph, computing types until fixpoint
+        let mut reachable = BlockSet::with_capacity(self.blocks.len());
+        reachable.insert(self.entry_block);
+        loop {
+            let mut changed = false;
+            for &block in &rpo {
+                if !reachable.get(block) { continue; }
+                for insn_id in &self.blocks[block.0].insns {
+                    let insn_type = match self.find(*insn_id) {
+                        Insn::IfTrue { val, target: BranchEdge { target, args } } => {
+                            assert!(!self.type_of(val).bit_equal(types::Empty));
+                            if self.type_of(val).could_be(Type::from_cbool(true)) {
+                                reachable.insert(target);
+                                for (idx, arg) in args.iter().enumerate() {
+                                    let param = self.blocks[target.0].params[idx];
+                                    self.insn_types[param.0] = self.type_of(param).union(self.type_of(*arg));
+                                }
+                            }
+                            continue;
+                        }
+                        Insn::IfFalse { val, target: BranchEdge { target, args } } => {
+                            assert!(!self.type_of(val).bit_equal(types::Empty));
+                            if self.type_of(val).could_be(Type::from_cbool(false)) {
+                                reachable.insert(target);
+                                for (idx, arg) in args.iter().enumerate() {
+                                    let param = self.blocks[target.0].params[idx];
+                                    self.insn_types[param.0] = self.type_of(param).union(self.type_of(*arg));
+                                }
+                            }
+                            continue;
+                        }
+                        Insn::Jump(BranchEdge { target, args }) => {
+                            reachable.insert(target);
+                            for (idx, arg) in args.iter().enumerate() {
+                                let param = self.blocks[target.0].params[idx];
+                                self.insn_types[param.0] = self.type_of(param).union(self.type_of(*arg));
+                            }
+                            continue;
+                        }
+                        insn if insn.has_output() => self.infer_type(*insn_id),
+                        _ => continue,
+                    };
+                    if !self.type_of(*insn_id).bit_equal(insn_type) {
+                        self.insn_types[insn_id.0] = insn_type;
+                        changed = true;
+                    }
+                }
+            }
+            if !changed {
+                break;
+            }
+        }
+    }
+
+    /// Return the interpreter-profiled type of the HIR instruction at the given ISEQ instruction
+    /// index, if it is known. This historical type record is not a guarantee and must be checked
+    /// with a GuardType or similar.
+    fn profiled_type_of_at(&self, insn: InsnId, iseq_insn_idx: usize) -> Option<Type> {
+        let Some(ref profiles) = self.profiles else { return None };
+        let Some(entries) = profiles.types.get(&iseq_insn_idx) else { return None };
+        for &(entry_insn, entry_type) in entries {
+            if self.union_find.borrow().find_const(entry_insn) == self.union_find.borrow().find_const(insn) {
+                return Some(entry_type);
+            }
+        }
+        None
+    }
+
+    fn likely_is_fixnum(&self, val: InsnId, profiled_type: Type) -> bool {
+        return self.is_a(val, types::Fixnum) || profiled_type.is_subtype(types::Fixnum);
+    }
+
+    fn coerce_to_fixnum(&mut self, block: BlockId, val: InsnId, state: InsnId) -> InsnId {
+        if self.is_a(val, types::Fixnum) { return val; }
+        return self.push_insn(block, Insn::GuardType { val, guard_type: types::Fixnum, state });
+    }
+
+    fn arguments_likely_fixnums(&mut self, left: InsnId, right: InsnId, state: InsnId) -> bool {
+        let frame_state = self.frame_state(state);
+        let iseq_insn_idx = frame_state.insn_idx as usize;
+        let left_profiled_type = self.profiled_type_of_at(left, iseq_insn_idx).unwrap_or(types::BasicObject);
+        let right_profiled_type = self.profiled_type_of_at(right, iseq_insn_idx).unwrap_or(types::BasicObject);
+        self.likely_is_fixnum(left, left_profiled_type) && self.likely_is_fixnum(right, right_profiled_type)
+    }
+
+    fn try_rewrite_fixnum_op(&mut self, block: BlockId, orig_insn_id: InsnId, f: &dyn Fn(InsnId, InsnId) -> Insn, bop: u32, left: InsnId, right: InsnId, state: InsnId) {
+        if self.arguments_likely_fixnums(left, right, state) {
+            if bop == BOP_NEQ {
+                // For opt_neq, the interpreter checks that both neq and eq are unchanged.
+                self.push_insn(block, Insn::PatchPoint { invariant: Invariant::BOPRedefined { klass: INTEGER_REDEFINED_OP_FLAG, bop: BOP_EQ }, state });
+            }
+            self.push_insn(block, Insn::PatchPoint { invariant: Invariant::BOPRedefined { klass: INTEGER_REDEFINED_OP_FLAG, bop }, state });
+            let left = self.coerce_to_fixnum(block, left, state);
+            let right = self.coerce_to_fixnum(block, right, state);
+            let result = self.push_insn(block, f(left, right));
+            self.make_equal_to(orig_insn_id, result);
+            self.insn_types[result.0] = self.infer_type(result);
+        } else {
+            self.push_insn_id(block, orig_insn_id);
+        }
+    }
+
+    fn rewrite_if_frozen(&mut self, block: BlockId, orig_insn_id: InsnId, self_val: InsnId, klass: u32, bop: u32, state: InsnId) {
+        let self_type = self.type_of(self_val);
+        if let Some(obj) = self_type.ruby_object() {
+            if obj.is_frozen() {
+                self.push_insn(block, Insn::PatchPoint { invariant: Invariant::BOPRedefined { klass, bop }, state });
+                self.make_equal_to(orig_insn_id, self_val);
+                return;
+            }
+        }
+        self.push_insn_id(block, orig_insn_id);
+    }
+
+    fn try_rewrite_freeze(&mut self, block: BlockId, orig_insn_id: InsnId, self_val: InsnId, state: InsnId) {
+        if self.is_a(self_val, types::StringExact) {
+            self.rewrite_if_frozen(block, orig_insn_id, self_val, STRING_REDEFINED_OP_FLAG, BOP_FREEZE, state);
+        } else if self.is_a(self_val, types::ArrayExact) {
+            self.rewrite_if_frozen(block, orig_insn_id, self_val, ARRAY_REDEFINED_OP_FLAG, BOP_FREEZE, state);
+        } else if self.is_a(self_val, types::HashExact) {
+            self.rewrite_if_frozen(block, orig_insn_id, self_val, HASH_REDEFINED_OP_FLAG, BOP_FREEZE, state);
+        } else {
+            self.push_insn_id(block, orig_insn_id);
+        }
+    }
+
+    fn try_rewrite_uminus(&mut self, block: BlockId, orig_insn_id: InsnId, self_val: InsnId, state: InsnId) {
+        if self.is_a(self_val, types::StringExact) {
+            self.rewrite_if_frozen(block, orig_insn_id, self_val, STRING_REDEFINED_OP_FLAG, BOP_UMINUS, state);
+        } else {
+            self.push_insn_id(block, orig_insn_id);
+        }
+    }
+
+    fn try_rewrite_aref(&mut self, block: BlockId, orig_insn_id: InsnId, self_val: InsnId, idx_val: InsnId, state: InsnId) {
+        let self_type = self.type_of(self_val);
+        let idx_type = self.type_of(idx_val);
+        if self_type.is_subtype(types::ArrayExact) {
+            if let Some(array_obj) = self_type.ruby_object() {
+                if array_obj.is_frozen() {
+                    if let Some(idx) = idx_type.fixnum_value() {
+                        self.push_insn(block, Insn::PatchPoint { invariant: Invariant::BOPRedefined { klass: ARRAY_REDEFINED_OP_FLAG, bop: BOP_AREF }, state });
+                        let val = unsafe { rb_yarv_ary_entry_internal(array_obj, idx) };
+                        let const_insn = self.push_insn(block, Insn::Const { val: Const::Value(val) });
+                        self.make_equal_to(orig_insn_id, const_insn);
+                        return;
+                    }
+                }
+            }
+        }
+        self.push_insn_id(block, orig_insn_id);
+    }
+
+    /// Rewrite SendWithoutBlock opcodes into SendWithoutBlockDirect opcodes if we know the target
+    /// ISEQ statically. This removes run-time method lookups and opens the door for inlining.
+    fn optimize_direct_sends(&mut self) {
+        for block in self.rpo() {
+            let old_insns = std::mem::take(&mut self.blocks[block.0].insns);
+            assert!(self.blocks[block.0].insns.is_empty());
+            for insn_id in old_insns {
+                match self.find(insn_id) {
+                    Insn::SendWithoutBlock { self_val, call_info: CallInfo { method_name }, args, state, .. } if method_name == "+" && args.len() == 1 =>
+                        self.try_rewrite_fixnum_op(block, insn_id, &|left, right| Insn::FixnumAdd { left, right, state }, BOP_PLUS, self_val, args[0], state),
+                    Insn::SendWithoutBlock { self_val, call_info: CallInfo { method_name }, args, state, .. } if method_name == "-" && args.len() == 1 =>
+                        self.try_rewrite_fixnum_op(block, insn_id, &|left, right| Insn::FixnumSub { left, right, state }, BOP_MINUS, self_val, args[0], state),
+                    Insn::SendWithoutBlock { self_val, call_info: CallInfo { method_name }, args, state, .. } if method_name == "*" && args.len() == 1 =>
+                        self.try_rewrite_fixnum_op(block, insn_id, &|left, right| Insn::FixnumMult { left, right, state }, BOP_MULT, self_val, args[0], state),
+                    Insn::SendWithoutBlock { self_val, call_info: CallInfo { method_name }, args, state, .. } if method_name == "/" && args.len() == 1 =>
+                        self.try_rewrite_fixnum_op(block, insn_id, &|left, right| Insn::FixnumDiv { left, right, state }, BOP_DIV, self_val, args[0], state),
+                    Insn::SendWithoutBlock { self_val, call_info: CallInfo { method_name }, args, state, .. } if method_name == "%" && args.len() == 1 =>
+                        self.try_rewrite_fixnum_op(block, insn_id, &|left, right| Insn::FixnumMod { left, right, state }, BOP_MOD, self_val, args[0], state),
+                    Insn::SendWithoutBlock { self_val, call_info: CallInfo { method_name }, args, state, .. } if method_name == "==" && args.len() == 1 =>
+                        self.try_rewrite_fixnum_op(block, insn_id, &|left, right| Insn::FixnumEq { left, right }, BOP_EQ, self_val, args[0], state),
+                    Insn::SendWithoutBlock { self_val, call_info: CallInfo { method_name }, args, state, .. } if method_name == "!=" && args.len() == 1 =>
+                        self.try_rewrite_fixnum_op(block, insn_id, &|left, right| Insn::FixnumNeq { left, right }, BOP_NEQ, self_val, args[0], state),
+                    Insn::SendWithoutBlock { self_val, call_info: CallInfo { method_name }, args, state, .. } if method_name == "<" && args.len() == 1 =>
+                        self.try_rewrite_fixnum_op(block, insn_id, &|left, right| Insn::FixnumLt { left, right }, BOP_LT, self_val, args[0], state),
+                    Insn::SendWithoutBlock { self_val, call_info: CallInfo { method_name }, args, state, .. } if method_name == "<=" && args.len() == 1 =>
+                        self.try_rewrite_fixnum_op(block, insn_id, &|left, right| Insn::FixnumLe { left, right }, BOP_LE, self_val, args[0], state),
+                    Insn::SendWithoutBlock { self_val, call_info: CallInfo { method_name }, args, state, .. } if method_name == ">" && args.len() == 1 =>
+                        self.try_rewrite_fixnum_op(block, insn_id, &|left, right| Insn::FixnumGt { left, right }, BOP_GT, self_val, args[0], state),
+                    Insn::SendWithoutBlock { self_val, call_info: CallInfo { method_name }, args, state, .. } if method_name == ">=" && args.len() == 1 =>
+                        self.try_rewrite_fixnum_op(block, insn_id, &|left, right| Insn::FixnumGe { left, right }, BOP_GE, self_val, args[0], state),
+                    Insn::SendWithoutBlock { self_val, call_info: CallInfo { method_name }, args, state, .. } if method_name == "&" && args.len() == 1 =>
+                        self.try_rewrite_fixnum_op(block, insn_id, &|left, right| Insn::FixnumAnd { left, right }, BOP_AND, self_val, args[0], state),
+                    Insn::SendWithoutBlock { self_val, call_info: CallInfo { method_name }, args, state, .. } if method_name == "|" && args.len() == 1 =>
+                        self.try_rewrite_fixnum_op(block, insn_id, &|left, right| Insn::FixnumOr { left, right }, BOP_OR, self_val, args[0], state),
+                    Insn::SendWithoutBlock { self_val, call_info: CallInfo { method_name }, args, state, .. } if method_name == "freeze" && args.len() == 0 =>
+                        self.try_rewrite_freeze(block, insn_id, self_val, state),
+                    Insn::SendWithoutBlock { self_val, call_info: CallInfo { method_name }, args, state, .. } if method_name == "-@" && args.len() == 0 =>
+                        self.try_rewrite_uminus(block, insn_id, self_val, state),
+                    Insn::SendWithoutBlock { self_val, call_info: CallInfo { method_name }, args, state, .. } if method_name == "[]" && args.len() == 1 =>
+                        self.try_rewrite_aref(block, insn_id, self_val, args[0], state),
+                    Insn::SendWithoutBlock { mut self_val, call_info, cd, args, state } => {
+                        let frame_state = self.frame_state(state);
+                        let (klass, guard_equal_to) = if let Some(klass) = self.type_of(self_val).runtime_exact_ruby_class() {
+                            // If we know the class statically, use it to fold the lookup at compile-time.
+                            (klass, None)
+                        } else {
+                            // If we know that self is top-self from profile information, guard and use it to fold the lookup at compile-time.
+                            match self.profiled_type_of_at(self_val, frame_state.insn_idx) {
+                                Some(self_type) if self_type.is_top_self() => (self_type.exact_ruby_class().unwrap(), self_type.ruby_object()),
+                                _ => { self.push_insn_id(block, insn_id); continue; }
+                            }
+                        };
+                        let ci = unsafe { get_call_data_ci(cd) }; // info about the call site
+                        let mid = unsafe { vm_ci_mid(ci) };
+                        // Do method lookup
+                        let mut cme = unsafe { rb_callable_method_entry(klass, mid) };
+                        if cme.is_null() {
+                            self.push_insn_id(block, insn_id); continue;
+                        }
+                        // Load an overloaded cme if applicable. See vm_search_cc().
+                        // It allows you to use a faster ISEQ if possible.
+                        cme = unsafe { rb_check_overloaded_cme(cme, ci) };
+                        let def_type = unsafe { get_cme_def_type(cme) };
+                        if def_type != VM_METHOD_TYPE_ISEQ {
+                            // TODO(max): Allow non-iseq; cache cme
+                            self.push_insn_id(block, insn_id); continue;
+                        }
+                        self.push_insn(block, Insn::PatchPoint { invariant: Invariant::MethodRedefined { klass, method: mid }, state });
+                        let iseq = unsafe { get_def_iseq_ptr((*cme).def) };
+                        if let Some(expected) = guard_equal_to {
+                            self_val = self.push_insn(block, Insn::GuardBitEquals { val: self_val, expected, state });
+                        }
+                        let send_direct = self.push_insn(block, Insn::SendWithoutBlockDirect { self_val, call_info, cd, cme, iseq, args, state });
+                        self.make_equal_to(insn_id, send_direct);
+                    }
+                    Insn::GetConstantPath { ic, state, .. } => {
+                        let idlist: *const ID = unsafe { (*ic).segments };
+                        let ice = unsafe { (*ic).entry };
+                        if ice.is_null() {
+                            self.push_insn_id(block, insn_id); continue;
+                        }
+                        let cref_sensitive = !unsafe { (*ice).ic_cref }.is_null();
+                        let multi_ractor_mode = unsafe { rb_zjit_multi_ractor_p() };
+                        if cref_sensitive || multi_ractor_mode {
+                            self.push_insn_id(block, insn_id); continue;
+                        }
+                        // Assume single-ractor mode.
+                        self.push_insn(block, Insn::PatchPoint { invariant: Invariant::SingleRactorMode, state });
+                        // Invalidate output code on any constant writes associated with constants
+                        // referenced after the PatchPoint.
+                        self.push_insn(block, Insn::PatchPoint { invariant: Invariant::StableConstantNames { idlist }, state });
+                        let replacement = self.push_insn(block, Insn::Const { val: Const::Value(unsafe { (*ice).value }) });
+                        self.make_equal_to(insn_id, replacement);
+                    }
+                    Insn::ObjToString { val, call_info, cd, state, .. } => {
+                        if self.is_a(val, types::String) {
+                            // behaves differently from `SendWithoutBlock` with `mid:to_s` because ObjToString should not have a patch point for String to_s being redefined
+                            self.make_equal_to(insn_id, val);
+                        } else {
+                            let replacement = self.push_insn(block, Insn::SendWithoutBlock { self_val: val, call_info, cd, args: vec![], state });
+                            self.make_equal_to(insn_id, replacement)
+                        }
+                    }
+                    Insn::AnyToString { str, .. } => {
+                        if self.is_a(str, types::String) {
+                            self.make_equal_to(insn_id, str);
+                        } else {
+                            self.push_insn_id(block, insn_id);
+                        }
+                    }
+                    _ => { self.push_insn_id(block, insn_id); }
+                }
+            }
+        }
+        self.infer_types();
+    }
+
+    /// Optimize SendWithoutBlock that land in a C method to a direct CCall without
+    /// runtime lookup.
+    fn optimize_c_calls(&mut self) {
+        // Try to reduce one SendWithoutBlock to a CCall
+        fn reduce_to_ccall(
+            fun: &mut Function,
+            block: BlockId,
+            self_type: Type,
+            send: Insn,
+            send_insn_id: InsnId,
+        ) -> Result<(), ()> {
+            let Insn::SendWithoutBlock { mut self_val, cd, mut args, state, .. } = send else {
+                return Err(());
+            };
+
+            let call_info = unsafe { (*cd).ci };
+            let argc = unsafe { vm_ci_argc(call_info) };
+            let method_id = unsafe { rb_vm_ci_mid(call_info) };
+
+            // If we have info about the class of the receiver
+            //
+            // TODO(alan): there was a seemingly a miscomp here if you swap with
+            // `inexact_ruby_class`. Theoretically it can call a method too general
+            // for the receiver. Confirm and add a test.
+            let (recv_class, guard_type) = if let Some(klass) = self_type.runtime_exact_ruby_class() {
+                (klass, None)
+            } else {
+                let iseq_insn_idx = fun.frame_state(state).insn_idx;
+                let Some(recv_type) = fun.profiled_type_of_at(self_val, iseq_insn_idx) else { return Err(()) };
+                let Some(recv_class) = recv_type.runtime_exact_ruby_class() else { return Err(()) };
+                (recv_class, Some(recv_type.unspecialized()))
+            };
+
+            // Do method lookup
+            let method = unsafe { rb_callable_method_entry(recv_class, method_id) };
+            if method.is_null() {
+                return Err(());
+            }
+
+            // Filter for C methods
+            let def_type = unsafe { get_cme_def_type(method) };
+            if def_type != VM_METHOD_TYPE_CFUNC {
+                return Err(());
+            }
+
+            // Find the `argc` (arity) of the C method, which describes the parameters it expects
+            let cfunc = unsafe { get_cme_def_body_cfunc(method) };
+            let cfunc_argc = unsafe { get_mct_argc(cfunc) };
+            match cfunc_argc {
+                0.. => {
+                    // (self, arg0, arg1, ..., argc) form
+                    //
+                    // Bail on argc mismatch
+                    if argc != cfunc_argc as u32 {
+                        return Err(());
+                    }
+
+                    // Filter for a leaf and GC free function
+                    use crate::cruby_methods::FnProperties;
+                    let Some(FnProperties { leaf: true, no_gc: true, return_type, elidable }) =
+                        ZJITState::get_method_annotations().get_cfunc_properties(method)
+                    else {
+                        return Err(());
+                    };
+
+                    let ci_flags = unsafe { vm_ci_flag(call_info) };
+                    // Filter for simple call sites (i.e. no splats etc.)
+                    if ci_flags & VM_CALL_ARGS_SIMPLE != 0 {
+                        // Commit to the replacement. Put PatchPoint.
+                        fun.push_insn(block, Insn::PatchPoint { invariant: Invariant::MethodRedefined { klass: recv_class, method: method_id }, state });
+                        if let Some(guard_type) = guard_type {
+                            // Guard receiver class
+                            self_val = fun.push_insn(block, Insn::GuardType { val: self_val, guard_type, state });
+                        }
+                        let cfun = unsafe { get_mct_func(cfunc) }.cast();
+                        let mut cfunc_args = vec![self_val];
+                        cfunc_args.append(&mut args);
+                        let ccall = fun.push_insn(block, Insn::CCall { cfun, args: cfunc_args, name: method_id, return_type, elidable });
+                        fun.make_equal_to(send_insn_id, ccall);
+                        return Ok(());
+                    }
+                }
+                -1 => {
+                    // (argc, argv, self) parameter form
+                    // Falling through for now
+                }
+                -2 => {
+                    // (self, args_ruby_array) parameter form
+                    // Falling through for now
+                }
+                _ => unreachable!("unknown cfunc kind: argc={argc}")
+            }
+
+            Err(())
+        }
+
+        for block in self.rpo() {
+            let old_insns = std::mem::take(&mut self.blocks[block.0].insns);
+            assert!(self.blocks[block.0].insns.is_empty());
+            for insn_id in old_insns {
+                if let send @ Insn::SendWithoutBlock { self_val, .. } = self.find(insn_id) {
+                    let self_type = self.type_of(self_val);
+                    if reduce_to_ccall(self, block, self_type, send, insn_id).is_ok() {
+                        continue;
+                    }
+                }
+                self.push_insn_id(block, insn_id);
+            }
+        }
+        self.infer_types();
+    }
+
+    /// Fold a binary operator on fixnums.
+    fn fold_fixnum_bop(&mut self, insn_id: InsnId, left: InsnId, right: InsnId, f: impl FnOnce(Option<i64>, Option<i64>) -> Option<i64>) -> InsnId {
+        f(self.type_of(left).fixnum_value(), self.type_of(right).fixnum_value())
+            .filter(|&n| n >= (RUBY_FIXNUM_MIN as i64) && n <= RUBY_FIXNUM_MAX as i64)
+            .map(|n| self.new_insn(Insn::Const { val: Const::Value(VALUE::fixnum_from_usize(n as usize)) }))
+            .unwrap_or(insn_id)
+    }
+
+    /// Fold a binary predicate on fixnums.
+    fn fold_fixnum_pred(&mut self, insn_id: InsnId, left: InsnId, right: InsnId, f: impl FnOnce(Option<i64>, Option<i64>) -> Option<bool>) -> InsnId {
+        f(self.type_of(left).fixnum_value(), self.type_of(right).fixnum_value())
+            .map(|b| if b { Qtrue } else { Qfalse })
+            .map(|b| self.new_insn(Insn::Const { val: Const::Value(b) }))
+            .unwrap_or(insn_id)
+    }
+
+    /// Use type information left by `infer_types` to fold away operations that can be evaluated at compile-time.
+    ///
+    /// It can fold fixnum math, truthiness tests, and branches with constant conditionals.
+    fn fold_constants(&mut self) {
+        // TODO(max): Determine if it's worth it for us to reflow types after each branch
+        // simplification. This means that we can have nice cascading optimizations if what used to
+        // be a union of two different basic block arguments now has a single value.
+        //
+        // This would require 1) fixpointing, 2) worklist, or 3) (slightly less powerful) calling a
+        // function-level infer_types after each pruned branch.
+        for block in self.rpo() {
+            let old_insns = std::mem::take(&mut self.blocks[block.0].insns);
+            let mut new_insns = vec![];
+            for insn_id in old_insns {
+                let replacement_id = match self.find(insn_id) {
+                    Insn::GuardType { val, guard_type, .. } if self.is_a(val, guard_type) => {
+                        self.make_equal_to(insn_id, val);
+                        // Don't bother re-inferring the type of val; we already know it.
+                        continue;
+                    }
+                    Insn::FixnumAdd { left, right, .. } => {
+                        self.fold_fixnum_bop(insn_id, left, right, |l, r| match (l, r) {
+                            (Some(l), Some(r)) => l.checked_add(r),
+                            _ => None,
+                        })
+                    }
+                    Insn::FixnumSub { left, right, .. } => {
+                        self.fold_fixnum_bop(insn_id, left, right, |l, r| match (l, r) {
+                            (Some(l), Some(r)) => l.checked_sub(r),
+                            _ => None,
+                        })
+                    }
+                    Insn::FixnumMult { left, right, .. } => {
+                        self.fold_fixnum_bop(insn_id, left, right, |l, r| match (l, r) {
+                            (Some(l), Some(r)) => l.checked_mul(r),
+                            (Some(0), _) | (_, Some(0)) => Some(0),
+                            _ => None,
+                        })
+                    }
+                    Insn::FixnumEq { left, right, .. } => {
+                        self.fold_fixnum_pred(insn_id, left, right, |l, r| match (l, r) {
+                            (Some(l), Some(r)) => Some(l == r),
+                            _ => None,
+                        })
+                    }
+                    Insn::FixnumNeq { left, right, .. } => {
+                        self.fold_fixnum_pred(insn_id, left, right, |l, r| match (l, r) {
+                            (Some(l), Some(r)) => Some(l != r),
+                            _ => None,
+                        })
+                    }
+                    Insn::FixnumLt { left, right, .. } => {
+                        self.fold_fixnum_pred(insn_id, left, right, |l, r| match (l, r) {
+                            (Some(l), Some(r)) => Some(l < r),
+                            _ => None,
+                        })
+                    }
+                    Insn::FixnumLe { left, right, .. } => {
+                        self.fold_fixnum_pred(insn_id, left, right, |l, r| match (l, r) {
+                            (Some(l), Some(r)) => Some(l <= r),
+                            _ => None,
+                        })
+                    }
+                    Insn::FixnumGt { left, right, .. } => {
+                        self.fold_fixnum_pred(insn_id, left, right, |l, r| match (l, r) {
+                            (Some(l), Some(r)) => Some(l > r),
+                            _ => None,
+                        })
+                    }
+                    Insn::FixnumGe { left, right, .. } => {
+                        self.fold_fixnum_pred(insn_id, left, right, |l, r| match (l, r) {
+                            (Some(l), Some(r)) => Some(l >= r),
+                            _ => None,
+                        })
+                    }
+                    Insn::Test { val } if self.type_of(val).is_known_falsy() => {
+                        self.new_insn(Insn::Const { val: Const::CBool(false) })
+                    }
+                    Insn::Test { val } if self.type_of(val).is_known_truthy() => {
+                        self.new_insn(Insn::Const { val: Const::CBool(true) })
+                    }
+                    Insn::IfTrue { val, target } if self.is_a(val, Type::from_cbool(true)) => {
+                        self.new_insn(Insn::Jump(target))
+                    }
+                    Insn::IfFalse { val, target } if self.is_a(val, Type::from_cbool(false)) => {
+                        self.new_insn(Insn::Jump(target))
+                    }
+                    // If we know that the branch condition is never going to cause a branch,
+                    // completely drop the branch from the block.
+                    Insn::IfTrue { val, .. } if self.is_a(val, Type::from_cbool(false)) => continue,
+                    Insn::IfFalse { val, .. } if self.is_a(val, Type::from_cbool(true)) => continue,
+                    _ => insn_id,
+                };
+                // If we're adding a new instruction, mark the two equivalent in the union-find and
+                // do an incremental flow typing of the new instruction.
+                if insn_id != replacement_id {
+                    self.make_equal_to(insn_id, replacement_id);
+                    if self.insns[replacement_id.0].has_output() {
+                        self.insn_types[replacement_id.0] = self.infer_type(replacement_id);
+                    }
+                }
+                new_insns.push(replacement_id);
+                // If we've just folded an IfTrue into a Jump, for example, don't bother copying
+                // over unreachable instructions afterward.
+                if self.insns[replacement_id.0].is_terminator() {
+                    break;
+                }
+            }
+            self.blocks[block.0].insns = new_insns;
+        }
+    }
+
+    fn worklist_traverse_single_insn(&self, insn: &Insn, worklist: &mut VecDeque<InsnId>) {
+        match insn {
+            &Insn::Const { .. }
+            | &Insn::Param { .. }
+            | &Insn::GetLocal { .. }
+            | &Insn::PutSpecialObject { .. } =>
+                {}
+            &Insn::PatchPoint { state, .. }
+            | &Insn::GetConstantPath { ic: _, state } => {
+                worklist.push_back(state);
+            }
+            &Insn::ArrayMax { ref elements, state }
+            | &Insn::NewArray { ref elements, state } => {
+                worklist.extend(elements);
+                worklist.push_back(state);
+            }
+            &Insn::NewHash { ref elements, state } => {
+                for &(key, value) in elements {
+                    worklist.push_back(key);
+                    worklist.push_back(value);
+                }
+                worklist.push_back(state);
+            }
+            &Insn::NewRange { low, high, state, .. } => {
+                worklist.push_back(low);
+                worklist.push_back(high);
+                worklist.push_back(state);
+            }
+            &Insn::StringCopy { val, .. }
+            | &Insn::StringIntern { val }
+            | &Insn::Return { val }
+            | &Insn::Throw { val, .. }
+            | &Insn::Defined { v: val, .. }
+            | &Insn::Test { val }
+            | &Insn::SetLocal { val, .. }
+            | &Insn::IsNil { val } =>
+                worklist.push_back(val),
+            &Insn::SetGlobal { val, state, .. }
+            | &Insn::GuardType { val, state, .. }
+            | &Insn::GuardBitEquals { val, state, .. }
+            | &Insn::ToArray { val, state }
+            | &Insn::ToNewArray { val, state } => {
+                worklist.push_back(val);
+                worklist.push_back(state);
+            }
+            &Insn::ArraySet { array, val, .. } => {
+                worklist.push_back(array);
+                worklist.push_back(val);
+            }
+            &Insn::Snapshot { ref state } => {
+                worklist.extend(&state.stack);
+                worklist.extend(&state.locals);
+            }
+            &Insn::FixnumAdd { left, right, state }
+            | &Insn::FixnumSub { left, right, state }
+            | &Insn::FixnumMult { left, right, state }
+            | &Insn::FixnumDiv { left, right, state }
+            | &Insn::FixnumMod { left, right, state }
+            | &Insn::ArrayExtend { left, right, state }
+            => {
+                worklist.push_back(left);
+                worklist.push_back(right);
+                worklist.push_back(state);
+            }
+            &Insn::FixnumLt { left, right }
+            | &Insn::FixnumLe { left, right }
+            | &Insn::FixnumGt { left, right }
+            | &Insn::FixnumGe { left, right }
+            | &Insn::FixnumEq { left, right }
+            | &Insn::FixnumNeq { left, right }
+            | &Insn::FixnumAnd { left, right }
+            | &Insn::FixnumOr { left, right }
+            => {
+                worklist.push_back(left);
+                worklist.push_back(right);
+            }
+            &Insn::Jump(BranchEdge { ref args, .. }) => worklist.extend(args),
+            &Insn::IfTrue { val, target: BranchEdge { ref args, .. } } | &Insn::IfFalse { val, target: BranchEdge { ref args, .. } } => {
+                worklist.push_back(val);
+                worklist.extend(args);
+            }
+            &Insn::ArrayDup { val, state } | &Insn::HashDup { val, state } => {
+                worklist.push_back(val);
+                worklist.push_back(state);
+            }
+            &Insn::Send { self_val, ref args, state, .. }
+            | &Insn::SendWithoutBlock { self_val, ref args, state, .. }
+            | &Insn::SendWithoutBlockDirect { self_val, ref args, state, .. } => {
+                worklist.push_back(self_val);
+                worklist.extend(args);
+                worklist.push_back(state);
+            }
+            &Insn::InvokeBuiltin { ref args, state, .. } => {
+                worklist.extend(args);
+                worklist.push_back(state)
+            }
+            &Insn::CCall { ref args, .. } => worklist.extend(args),
+            &Insn::GetIvar { self_val, state, .. } | &Insn::DefinedIvar { self_val, state, .. } => {
+                worklist.push_back(self_val);
+                worklist.push_back(state);
+            }
+            &Insn::SetIvar { self_val, val, state, .. } => {
+                worklist.push_back(self_val);
+                worklist.push_back(val);
+                worklist.push_back(state);
+            }
+            &Insn::ArrayPush { array, val, state } => {
+                worklist.push_back(array);
+                worklist.push_back(val);
+                worklist.push_back(state);
+            }
+            &Insn::ObjToString { val, state, .. } => {
+                worklist.push_back(val);
+                worklist.push_back(state);
+            }
+            &Insn::AnyToString { val, str, state, .. } => {
+                worklist.push_back(val);
+                worklist.push_back(str);
+                worklist.push_back(state);
+            }
+            &Insn::GetGlobal { state, .. } |
+            &Insn::SideExit { state, .. } => worklist.push_back(state),
+        }
+    }
+
+    /// Remove instructions that do not have side effects and are not referenced by any other
+    /// instruction.
+    fn eliminate_dead_code(&mut self) {
+        let rpo = self.rpo();
+        let mut worklist = VecDeque::new();
+        // Find all of the instructions that have side effects, are control instructions, or are
+        // otherwise necessary to keep around
+        for block_id in &rpo {
+            for insn_id in &self.blocks[block_id.0].insns {
+                let insn = &self.insns[insn_id.0];
+                if insn.has_effects() {
+                    worklist.push_back(*insn_id);
+                }
+            }
+        }
+        let mut necessary = InsnSet::with_capacity(self.insns.len());
+        // Now recursively traverse their data dependencies and mark those as necessary
+        while let Some(insn_id) = worklist.pop_front() {
+            if necessary.get(insn_id) { continue; }
+            necessary.insert(insn_id);
+            self.worklist_traverse_single_insn(&self.find(insn_id), &mut worklist);
+        }
+        // Now remove all unnecessary instructions
+        for block_id in &rpo {
+            self.blocks[block_id.0].insns.retain(|&insn_id| necessary.get(insn_id));
+        }
+    }
+
+    fn absorb_dst_block(&mut self, num_in_edges: &Vec<u32>, block: BlockId) -> bool {
+        let Some(terminator_id) = self.blocks[block.0].insns.last()
+            else { return false };
+        let Insn::Jump(BranchEdge { target, args }) = self.find(*terminator_id)
+            else { return false };
+        if target == block {
+            // Can't absorb self
+            return false;
+        }
+        if num_in_edges[target.0] != 1 {
+            // Can't absorb block if it's the target of more than one branch
+            return false;
+        }
+        // Link up params with block args
+        let params = std::mem::take(&mut self.blocks[target.0].params);
+        assert_eq!(args.len(), params.len());
+        for (arg, param) in args.iter().zip(params) {
+            self.make_equal_to(param, *arg);
+        }
+        // Remove branch instruction
+        self.blocks[block.0].insns.pop();
+        // Move target instructions into block
+        let target_insns = std::mem::take(&mut self.blocks[target.0].insns);
+        self.blocks[block.0].insns.extend(target_insns);
+        true
+    }
+
+    /// Clean up linked lists of blocks A -> B -> C into A (with B's and C's instructions).
+    fn clean_cfg(&mut self) {
+        // num_in_edges is invariant throughout cleaning the CFG:
+        // * we don't allocate new blocks
+        // * blocks that get absorbed are not in RPO anymore
+        // * blocks pointed to by blocks that get absorbed retain the same number of in-edges
+        let mut num_in_edges = vec![0; self.blocks.len()];
+        for block in self.rpo() {
+            for &insn in &self.blocks[block.0].insns {
+                if let Insn::IfTrue { target, .. } | Insn::IfFalse { target, .. } | Insn::Jump(target) = self.find(insn) {
+                    num_in_edges[target.target.0] += 1;
+                }
+            }
+        }
+        let mut changed = false;
+        loop {
+            let mut iter_changed = false;
+            for block in self.rpo() {
+                // Ignore transient empty blocks
+                if self.blocks[block.0].insns.is_empty() { continue; }
+                loop {
+                    let absorbed = self.absorb_dst_block(&num_in_edges, block);
+                    if !absorbed { break; }
+                    iter_changed = true;
+                }
+            }
+            if !iter_changed { break; }
+            changed = true;
+        }
+        if changed {
+            self.infer_types();
+        }
+    }
+
+    /// Return a traversal of the `Function`'s `BlockId`s in reverse post-order.
+    pub fn rpo(&self) -> Vec<BlockId> {
+        let mut result = self.po_from(self.entry_block);
+        result.reverse();
+        result
+    }
+
+    fn po_from(&self, start: BlockId) -> Vec<BlockId> {
+        #[derive(PartialEq)]
+        enum Action {
+            VisitEdges,
+            VisitSelf,
+        }
+        let mut result = vec![];
+        let mut seen = BlockSet::with_capacity(self.blocks.len());
+        let mut stack = vec![(start, Action::VisitEdges)];
+        while let Some((block, action)) = stack.pop() {
+            if action == Action::VisitSelf {
+                result.push(block);
+                continue;
+            }
+            if !seen.insert(block) { continue; }
+            stack.push((block, Action::VisitSelf));
+            for insn_id in &self.blocks[block.0].insns {
+                let insn = self.find(*insn_id);
+                if let Insn::IfTrue { target, .. } | Insn::IfFalse { target, .. } | Insn::Jump(target) = insn {
+                    stack.push((target.target, Action::VisitEdges));
+                }
+            }
+        }
+        result
+    }
+
+    fn assert_validates(&self) {
+        if let Err(err) = self.validate() {
+            eprintln!("Function failed validation.");
+            eprintln!("Err: {err:?}");
+            eprintln!("{}", FunctionPrinter::with_snapshot(self));
+            panic!("Aborting...");
+        }
+    }
+
+    /// Run all the optimization passes we have.
+    pub fn optimize(&mut self) {
+        // Function is assumed to have types inferred already
+        self.optimize_direct_sends();
+        #[cfg(debug_assertions)] self.assert_validates();
+        self.optimize_c_calls();
+        #[cfg(debug_assertions)] self.assert_validates();
+        self.fold_constants();
+        #[cfg(debug_assertions)] self.assert_validates();
+        self.clean_cfg();
+        #[cfg(debug_assertions)] self.assert_validates();
+        self.eliminate_dead_code();
+        #[cfg(debug_assertions)] self.assert_validates();
+
+        // Dump HIR after optimization
+        match get_option!(dump_hir_opt) {
+            Some(DumpHIR::WithoutSnapshot) => println!("Optimized HIR:\n{}", FunctionPrinter::without_snapshot(&self)),
+            Some(DumpHIR::All) => println!("Optimized HIR:\n{}", FunctionPrinter::with_snapshot(&self)),
+            Some(DumpHIR::Debug) => println!("Optimized HIR:\n{:#?}", &self),
+            None => {},
+        }
+    }
+
+
+    /// Validates the following:
+    /// 1. Basic block jump args match parameter arity.
+    /// 2. Every terminator must be in the last position.
+    /// 3. Every block must have a terminator.
+    fn validate_block_terminators_and_jumps(&self) -> Result<(), ValidationError> {
+        for block_id in self.rpo() {
+            let mut block_has_terminator = false;
+            let insns = &self.blocks[block_id.0].insns;
+            for (idx, insn_id) in insns.iter().enumerate() {
+                let insn = self.find(*insn_id);
+                match &insn {
+                    Insn::Jump(BranchEdge{target, args})
+                    | Insn::IfTrue { val: _, target: BranchEdge{target, args} }
+                    | Insn::IfFalse { val: _, target: BranchEdge{target, args}} => {
+                        let target_block = &self.blocks[target.0];
+                        let target_len = target_block.params.len();
+                        let args_len = args.len();
+                        if target_len != args_len {
+                            return Err(ValidationError::MismatchedBlockArity(block_id, target_len, args_len))
+                        }
+                    }
+                    _ => {}
+                }
+                if !insn.is_terminator() {
+                    continue;
+                }
+                block_has_terminator = true;
+                if idx != insns.len() - 1 {
+                    return Err(ValidationError::TerminatorNotAtEnd(block_id, *insn_id, idx));
+                }
+            }
+            if !block_has_terminator {
+                return Err(ValidationError::BlockHasNoTerminator(block_id));
+            }
+        }
+        Ok(())
+    }
+
+    // This performs a dataflow def-analysis over the entire CFG to detect any
+    // possibly undefined instruction operands.
+    fn validate_definite_assignment(&self) -> Result<(), ValidationError> {
+        // Map of block ID -> InsnSet
+        // Initialize with all missing values at first, to catch if a jump target points to a
+        // missing location.
+        let mut assigned_in = vec![None; self.num_blocks()];
+        let rpo = self.rpo();
+        // Begin with every block having every variable defined, except for the entry block, which
+        // starts with nothing defined.
+        assigned_in[self.entry_block.0] = Some(InsnSet::with_capacity(self.insns.len()));
+        for &block in &rpo {
+            if block != self.entry_block {
+                let mut all_ones = InsnSet::with_capacity(self.insns.len());
+                all_ones.insert_all();
+                assigned_in[block.0] = Some(all_ones);
+            }
+        }
+        let mut worklist = VecDeque::with_capacity(self.num_blocks());
+        worklist.push_back(self.entry_block);
+        while let Some(block) = worklist.pop_front() {
+            let mut assigned = assigned_in[block.0].clone().unwrap();
+            for &param in &self.blocks[block.0].params {
+                assigned.insert(param);
+            }
+            for &insn_id in &self.blocks[block.0].insns {
+                let insn_id = self.union_find.borrow().find_const(insn_id);
+                match self.find(insn_id) {
+                    Insn::Jump(target) | Insn::IfTrue { target, .. } | Insn::IfFalse { target, .. } => {
+                        let Some(block_in) = assigned_in[target.target.0].as_mut() else {
+                            return Err(ValidationError::JumpTargetNotInRPO(target.target));
+                        };
+                        // jump target's block_in was modified, we need to queue the block for processing.
+                        if block_in.intersect_with(&assigned) {
+                            worklist.push_back(target.target);
+                        }
+                    }
+                    insn if insn.has_output() => {
+                        assigned.insert(insn_id);
+                    }
+                    _ => {}
+                }
+            }
+        }
+        // Check that each instruction's operands are assigned
+        for &block in &rpo {
+            let mut assigned = assigned_in[block.0].clone().unwrap();
+            for &param in &self.blocks[block.0].params {
+                assigned.insert(param);
+            }
+            for &insn_id in &self.blocks[block.0].insns {
+                let insn_id = self.union_find.borrow().find_const(insn_id);
+                let mut operands = VecDeque::new();
+                let insn = self.find(insn_id);
+                self.worklist_traverse_single_insn(&insn, &mut operands);
+                for operand in operands {
+                    if !assigned.get(operand) {
+                        return Err(ValidationError::OperandNotDefined(block, insn_id, operand));
+                    }
+                }
+                if insn.has_output() {
+                    assigned.insert(insn_id);
+                }
+            }
+        }
+        Ok(())
+    }
+
+    /// Checks that each instruction('s representative) appears only once in the CFG.
+    fn validate_insn_uniqueness(&self) -> Result<(), ValidationError> {
+        let mut seen = InsnSet::with_capacity(self.insns.len());
+        for block_id in self.rpo() {
+            for &insn_id in &self.blocks[block_id.0].insns {
+                let insn_id = self.union_find.borrow().find_const(insn_id);
+                if !seen.insert(insn_id) {
+                    return Err(ValidationError::DuplicateInstruction(block_id, insn_id));
+                }
+            }
+        }
+        Ok(())
+    }
+
+    /// Run all validation passes we have.
+    pub fn validate(&self) -> Result<(), ValidationError> {
+        self.validate_block_terminators_and_jumps()?;
+        self.validate_definite_assignment()?;
+        self.validate_insn_uniqueness()?;
+        Ok(())
+    }
+}
+
+impl<'a> std::fmt::Display for FunctionPrinter<'a> {
+    fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
+        let fun = &self.fun;
+        let iseq_name = iseq_get_location(fun.iseq, 0);
+        writeln!(f, "fn {iseq_name}:")?;
+        for block_id in fun.rpo() {
+            write!(f, "{block_id}(")?;
+            if !fun.blocks[block_id.0].params.is_empty() {
+                let mut sep = "";
+                for param in &fun.blocks[block_id.0].params {
+                    write!(f, "{sep}{param}")?;
+                    let insn_type = fun.type_of(*param);
+                    if !insn_type.is_subtype(types::Empty) {
+                        write!(f, ":{}", insn_type.print(&self.ptr_map))?;
+                    }
+                    sep = ", ";
+                }
+            }
+            writeln!(f, "):")?;
+            for insn_id in &fun.blocks[block_id.0].insns {
+                let insn = fun.find(*insn_id);
+                if !self.display_snapshot && matches!(insn, Insn::Snapshot {..}) {
+                    continue;
+                }
+                write!(f, "  ")?;
+                if insn.has_output() {
+                    let insn_type = fun.type_of(*insn_id);
+                    if insn_type.is_subtype(types::Empty) {
+                        write!(f, "{insn_id} = ")?;
+                    } else {
+                        write!(f, "{insn_id}:{} = ", insn_type.print(&self.ptr_map))?;
+                    }
+                }
+                writeln!(f, "{}", insn.print(&self.ptr_map))?;
+            }
+        }
+        Ok(())
+    }
+}
+
+#[derive(Debug, Clone, PartialEq)]
+pub struct FrameState {
+    iseq: IseqPtr,
+    insn_idx: usize,
+    // Ruby bytecode instruction pointer
+    pub pc: *const VALUE,
+
+    stack: Vec<InsnId>,
+    locals: Vec<InsnId>,
+}
+
+impl FrameState {
+    /// Get the opcode for the current instruction
+    pub fn get_opcode(&self) -> i32 {
+        unsafe { rb_iseq_opcode_at_pc(self.iseq, self.pc) }
+    }
+}
+
+/// Compute the index of a local variable from its slot index
+fn ep_offset_to_local_idx(iseq: IseqPtr, ep_offset: u32) -> usize {
+    // Layout illustration
+    // This is an array of VALUE
+    //                                           | VM_ENV_DATA_SIZE |
+    //                                           v                  v
+    // low addr <+-------+-------+-------+-------+------------------+
+    //           |local 0|local 1|  ...  |local n|       ....       |
+    //           +-------+-------+-------+-------+------------------+
+    //           ^       ^                       ^                  ^
+    //           +-------+---local_table_size----+         cfp->ep--+
+    //                   |                                          |
+    //                   +------------------ep_offset---------------+
+    //
+    // See usages of local_var_name() from iseq.c for similar calculation.
+
+    // Equivalent of iseq->body->local_table_size
+    let local_table_size: i32 = unsafe { get_iseq_body_local_table_size(iseq) }
+        .try_into()
+        .unwrap();
+    let op = (ep_offset - VM_ENV_DATA_SIZE) as i32;
+    let local_idx = local_table_size - op - 1;
+    assert!(local_idx >= 0 && local_idx < local_table_size);
+    local_idx.try_into().unwrap()
+}
+
+impl FrameState {
+    fn new(iseq: IseqPtr) -> FrameState {
+        FrameState { iseq, pc: std::ptr::null::<VALUE>(), insn_idx: 0, stack: vec![], locals: vec![] }
+    }
+
+    /// Get the number of stack operands
+    pub fn stack_size(&self) -> usize {
+        self.stack.len()
+    }
+
+    /// Iterate over all stack slots
+    pub fn stack(&self) -> Iter<InsnId> {
+        self.stack.iter()
+    }
+
+    /// Iterate over all local variables
+    pub fn locals(&self) -> Iter<InsnId> {
+        self.locals.iter()
+    }
+
+    /// Push a stack operand
+    fn stack_push(&mut self, opnd: InsnId) {
+        self.stack.push(opnd);
+    }
+
+    /// Pop a stack operand
+    fn stack_pop(&mut self) -> Result<InsnId, ParseError> {
+        self.stack.pop().ok_or_else(|| ParseError::StackUnderflow(self.clone()))
+    }
+
+    /// Get a stack-top operand
+    fn stack_top(&self) -> Result<InsnId, ParseError> {
+        self.stack.last().ok_or_else(|| ParseError::StackUnderflow(self.clone())).copied()
+    }
+
+    /// Set a stack operand at idx
+    fn stack_setn(&mut self, idx: usize, opnd: InsnId) {
+        let idx = self.stack.len() - idx - 1;
+        self.stack[idx] = opnd;
+    }
+
+    /// Get a stack operand at idx
+    fn stack_topn(&self, idx: usize) -> Result<InsnId, ParseError> {
+        let idx = self.stack.len() - idx - 1;
+        self.stack.get(idx).ok_or_else(|| ParseError::StackUnderflow(self.clone())).copied()
+    }
+
+    fn setlocal(&mut self, ep_offset: u32, opnd: InsnId) {
+        let idx = ep_offset_to_local_idx(self.iseq, ep_offset);
+        self.locals[idx] = opnd;
+    }
+
+    fn getlocal(&mut self, ep_offset: u32) -> InsnId {
+        let idx = ep_offset_to_local_idx(self.iseq, ep_offset);
+        self.locals[idx]
+    }
+
+    fn as_args(&self, self_param: InsnId) -> Vec<InsnId> {
+        // We're currently passing around the self parameter as a basic block
+        // argument because the register allocator uses a fixed register based
+        // on the basic block argument index, which would cause a conflict if
+        // we reuse an argument from another basic block.
+        // TODO: Modify the register allocator to allow reusing an argument
+        // of another basic block.
+        let mut args = vec![self_param];
+        args.extend(self.locals.iter().chain(self.stack.iter()).map(|op| *op));
+        args
+    }
+}
+
+impl std::fmt::Display for FrameState {
+    fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
+        write!(f, "FrameState {{ pc: {:?}, stack: ", self.pc)?;
+        write_vec(f, &self.stack)?;
+        write!(f, ", locals: ")?;
+        write_vec(f, &self.locals)?;
+        write!(f, " }}")
+    }
+}
+
+/// Get YARV instruction argument
+fn get_arg(pc: *const VALUE, arg_idx: isize) -> VALUE {
+    unsafe { *(pc.offset(arg_idx + 1)) }
+}
+
+/// Compute YARV instruction index at relative offset
+fn insn_idx_at_offset(idx: u32, offset: i64) -> u32 {
+    ((idx as isize) + (offset as isize)) as u32
+}
+
+fn compute_jump_targets(iseq: *const rb_iseq_t) -> Vec<u32> {
+    let iseq_size = unsafe { get_iseq_encoded_size(iseq) };
+    let mut insn_idx = 0;
+    let mut jump_targets = HashSet::new();
+    while insn_idx < iseq_size {
+        // Get the current pc and opcode
+        let pc = unsafe { rb_iseq_pc_at_idx(iseq, insn_idx) };
+
+        // try_into() call below is unfortunate. Maybe pick i32 instead of usize for opcodes.
+        let opcode: u32 = unsafe { rb_iseq_opcode_at_pc(iseq, pc) }
+            .try_into()
+            .unwrap();
+        insn_idx += insn_len(opcode as usize);
+        match opcode {
+            YARVINSN_branchunless | YARVINSN_jump | YARVINSN_branchif | YARVINSN_branchnil => {
+                let offset = get_arg(pc, 0).as_i64();
+                jump_targets.insert(insn_idx_at_offset(insn_idx, offset));
+            }
+            YARVINSN_opt_new => {
+                let offset = get_arg(pc, 1).as_i64();
+                jump_targets.insert(insn_idx_at_offset(insn_idx, offset));
+            }
+            YARVINSN_leave | YARVINSN_opt_invokebuiltin_delegate_leave => {
+                if insn_idx < iseq_size {
+                    jump_targets.insert(insn_idx);
+                }
+            }
+            _ => {}
+        }
+    }
+    let mut result = jump_targets.into_iter().collect::<Vec<_>>();
+    result.sort();
+    result
+}
+
+#[derive(Debug, PartialEq)]
+pub enum CallType {
+    Splat,
+    BlockArg,
+    Kwarg,
+    KwSplat,
+    Tailcall,
+    Super,
+    Zsuper,
+    OptSend,
+    KwSplatMut,
+    SplatMut,
+    Forwarding,
+}
+
+#[derive(Debug, PartialEq)]
+pub enum ParameterType {
+    Optional,
+}
+
+#[derive(Debug, PartialEq)]
+pub enum ParseError {
+    StackUnderflow(FrameState),
+    UnknownParameterType(ParameterType),
+    MalformedIseq(u32), // insn_idx into iseq_encoded
+    Validation(ValidationError),
+}
+
+/// Return the number of locals in the current ISEQ (includes parameters)
+fn num_locals(iseq: *const rb_iseq_t) -> usize {
+    (unsafe { get_iseq_body_local_table_size(iseq) }).as_usize()
+}
+
+/// If we can't handle the type of send (yet), bail out.
+fn unknown_call_type(flag: u32) -> bool {
+    if (flag & VM_CALL_KW_SPLAT_MUT) != 0 { return true; }
+    if (flag & VM_CALL_ARGS_SPLAT_MUT) != 0 { return true; }
+    if (flag & VM_CALL_ARGS_SPLAT) != 0 { return true; }
+    if (flag & VM_CALL_KW_SPLAT) != 0 { return true; }
+    if (flag & VM_CALL_ARGS_BLOCKARG) != 0 { return true; }
+    if (flag & VM_CALL_KWARG) != 0 { return true; }
+    if (flag & VM_CALL_TAILCALL) != 0 { return true; }
+    if (flag & VM_CALL_SUPER) != 0 { return true; }
+    if (flag & VM_CALL_ZSUPER) != 0 { return true; }
+    if (flag & VM_CALL_OPT_SEND) != 0 { return true; }
+    if (flag & VM_CALL_FORWARDING) != 0 { return true; }
+    false
+}
+
+/// We have IseqPayload, which keeps track of HIR Types in the interpreter, but this is not useful
+/// or correct to query from inside the optimizer. Instead, ProfileOracle provides an API to look
+/// up profiled type information by HIR InsnId at a given ISEQ instruction.
+#[derive(Debug)]
+struct ProfileOracle {
+    payload: &'static IseqPayload,
+    /// types is a map from ISEQ instruction indices -> profiled type information at that ISEQ
+    /// instruction index. At a given ISEQ instruction, the interpreter has profiled the stack
+    /// operands to a given ISEQ instruction, and this list of pairs of (InsnId, Type) map that
+    /// profiling information into HIR instructions.
+    types: HashMap<usize, Vec<(InsnId, Type)>>,
+}
+
+impl ProfileOracle {
+    fn new(payload: &'static IseqPayload) -> Self {
+        Self { payload, types: Default::default() }
+    }
+
+    /// Map the interpreter-recorded types of the stack onto the HIR operands on our compile-time virtual stack
+    fn profile_stack(&mut self, state: &FrameState) {
+        let iseq_insn_idx = state.insn_idx;
+        let Some(operand_types) = self.payload.profile.get_operand_types(iseq_insn_idx) else { return };
+        let entry = self.types.entry(iseq_insn_idx).or_insert_with(|| vec![]);
+        // operand_types is always going to be <= stack size (otherwise it would have an underflow
+        // at run-time) so use that to drive iteration.
+        for (idx, &insn_type) in operand_types.iter().rev().enumerate() {
+            let insn = state.stack_topn(idx).expect("Unexpected stack underflow in profiling");
+            entry.push((insn, insn_type))
+        }
+    }
+}
+
+/// The index of the self parameter in the HIR function
+pub const SELF_PARAM_IDX: usize = 0;
+
+fn filter_unknown_parameter_type(iseq: *const rb_iseq_t) -> Result<(), ParseError> {
+    if unsafe { rb_get_iseq_body_param_opt_num(iseq) } != 0 { return Err(ParseError::UnknownParameterType(ParameterType::Optional)); }
+    Ok(())
+}
+
+/// Compile ISEQ into High-level IR
+pub fn iseq_to_hir(iseq: *const rb_iseq_t) -> Result<Function, ParseError> {
+    filter_unknown_parameter_type(iseq)?;
+    let payload = get_or_create_iseq_payload(iseq);
+    let mut profiles = ProfileOracle::new(payload);
+    let mut fun = Function::new(iseq);
+    // Compute a map of PC->Block by finding jump targets
+    let jump_targets = compute_jump_targets(iseq);
+    let mut insn_idx_to_block = HashMap::new();
+    for insn_idx in jump_targets {
+        if insn_idx == 0 {
+            todo!("Separate entry block for param/self/...");
+        }
+        insn_idx_to_block.insert(insn_idx, fun.new_block());
+    }
+
+    // Iteratively fill out basic blocks using a queue
+    // TODO(max): Basic block arguments at edges
+    let mut queue = std::collections::VecDeque::new();
+    // Index of the rest parameter for comparison below
+    let rest_param_idx = if !iseq.is_null() && unsafe { get_iseq_flags_has_rest(iseq) } {
+        let opt_num = unsafe { get_iseq_body_param_opt_num(iseq) };
+        let lead_num = unsafe { get_iseq_body_param_lead_num(iseq) };
+        opt_num + lead_num
+    } else {
+        -1
+    };
+    // The HIR function will have the same number of parameter as the iseq so
+    // we properly handle calls from the interpreter. Roughly speaking, each
+    // item between commas in the source increase the parameter count by one,
+    // regardless of parameter kind.
+    let mut entry_state = FrameState::new(iseq);
+    fun.push_insn(fun.entry_block, Insn::Param { idx: SELF_PARAM_IDX });
+    fun.param_types.push(types::BasicObject); // self
+    for local_idx in 0..num_locals(iseq) {
+        if local_idx < unsafe { get_iseq_body_param_size(iseq) }.as_usize() {
+            entry_state.locals.push(fun.push_insn(fun.entry_block, Insn::Param { idx: local_idx + 1 })); // +1 for self
+        } else {
+            entry_state.locals.push(fun.push_insn(fun.entry_block, Insn::Const { val: Const::Value(Qnil) }));
+        }
+
+        let mut param_type = types::BasicObject;
+        // Rest parameters are always ArrayExact
+        if let Ok(true) = c_int::try_from(local_idx).map(|idx| idx == rest_param_idx) {
+            param_type = types::ArrayExact;
+        }
+        fun.param_types.push(param_type);
+    }
+    queue.push_back((entry_state, fun.entry_block, /*insn_idx=*/0_u32));
+
+    let mut visited = HashSet::new();
+
+    let iseq_size = unsafe { get_iseq_encoded_size(iseq) };
+    let iseq_type = unsafe { get_iseq_body_type(iseq) };
+    while let Some((incoming_state, block, mut insn_idx)) = queue.pop_front() {
+        if visited.contains(&block) { continue; }
+        visited.insert(block);
+        let (self_param, mut state) = if insn_idx == 0 {
+            (fun.blocks[fun.entry_block.0].params[SELF_PARAM_IDX], incoming_state.clone())
+        } else {
+            let self_param = fun.push_insn(block, Insn::Param { idx: SELF_PARAM_IDX });
+            let mut result = FrameState::new(iseq);
+            let mut idx = 1;
+            for _ in 0..incoming_state.locals.len() {
+                result.locals.push(fun.push_insn(block, Insn::Param { idx }));
+                idx += 1;
+            }
+            for _ in incoming_state.stack {
+                result.stack.push(fun.push_insn(block, Insn::Param { idx }));
+                idx += 1;
+            }
+            (self_param, result)
+        };
+        // Start the block off with a Snapshot so that if we need to insert a new Guard later on
+        // and we don't have a Snapshot handy, we can just iterate backward (at the earliest, to
+        // the beginning of the block).
+        fun.push_insn(block, Insn::Snapshot { state: state.clone() });
+        while insn_idx < iseq_size {
+            state.insn_idx = insn_idx as usize;
+            // Get the current pc and opcode
+            let pc = unsafe { rb_iseq_pc_at_idx(iseq, insn_idx) };
+            state.pc = pc;
+            let exit_state = state.clone();
+            profiles.profile_stack(&exit_state);
+
+            // try_into() call below is unfortunate. Maybe pick i32 instead of usize for opcodes.
+            let opcode: u32 = unsafe { rb_iseq_opcode_at_pc(iseq, pc) }
+                .try_into()
+                .unwrap();
+            // Move to the next instruction to compile
+            insn_idx += insn_len(opcode as usize);
+
+            match opcode {
+                YARVINSN_nop => {},
+                YARVINSN_putnil => { state.stack_push(fun.push_insn(block, Insn::Const { val: Const::Value(Qnil) })); },
+                YARVINSN_putobject => { state.stack_push(fun.push_insn(block, Insn::Const { val: Const::Value(get_arg(pc, 0)) })); },
+                YARVINSN_putspecialobject => {
+                    let value_type = SpecialObjectType::from(get_arg(pc, 0).as_u32());
+                    let insn = if value_type == SpecialObjectType::VMCore {
+                        Insn::Const { val: Const::Value(unsafe { rb_mRubyVMFrozenCore }) }
+                    } else {
+                        Insn::PutSpecialObject { value_type }
+                    };
+                    state.stack_push(fun.push_insn(block, insn));
+                }
+                YARVINSN_putstring => {
+                    let val = fun.push_insn(block, Insn::Const { val: Const::Value(get_arg(pc, 0)) });
+                    let insn_id = fun.push_insn(block, Insn::StringCopy { val, chilled: false });
+                    state.stack_push(insn_id);
+                }
+                YARVINSN_putchilledstring => {
+                    let val = fun.push_insn(block, Insn::Const { val: Const::Value(get_arg(pc, 0)) });
+                    let insn_id = fun.push_insn(block, Insn::StringCopy { val, chilled: true });
+                    state.stack_push(insn_id);
+                }
+                YARVINSN_putself => { state.stack_push(self_param); }
+                YARVINSN_intern => {
+                    let val = state.stack_pop()?;
+                    let insn_id = fun.push_insn(block, Insn::StringIntern { val });
+                    state.stack_push(insn_id);
+                }
+                YARVINSN_newarray => {
+                    let count = get_arg(pc, 0).as_usize();
+                    let exit_id = fun.push_insn(block, Insn::Snapshot { state: exit_state });
+                    let mut elements = vec![];
+                    for _ in 0..count {
+                        elements.push(state.stack_pop()?);
+                    }
+                    elements.reverse();
+                    state.stack_push(fun.push_insn(block, Insn::NewArray { elements, state: exit_id }));
+                }
+                YARVINSN_opt_newarray_send => {
+                    let count = get_arg(pc, 0).as_usize();
+                    let method = get_arg(pc, 1).as_u32();
+                    let mut elements = vec![];
+                    for _ in 0..count {
+                        elements.push(state.stack_pop()?);
+                    }
+                    elements.reverse();
+                    let exit_id = fun.push_insn(block, Insn::Snapshot { state: exit_state });
+                    let (bop, insn) = match method {
+                        VM_OPT_NEWARRAY_SEND_MAX => (BOP_MAX, Insn::ArrayMax { elements, state: exit_id }),
+                        _ => {
+                            // Unknown opcode; side-exit into the interpreter
+                            fun.push_insn(block, Insn::SideExit { state: exit_id, reason: SideExitReason::UnknownNewarraySend(method) });
+                            break;  // End the block
+                        },
+                    };
+                    fun.push_insn(block, Insn::PatchPoint { invariant: Invariant::BOPRedefined { klass: ARRAY_REDEFINED_OP_FLAG, bop }, state: exit_id });
+                    state.stack_push(fun.push_insn(block, insn));
+                }
+                YARVINSN_duparray => {
+                    let val = fun.push_insn(block, Insn::Const { val: Const::Value(get_arg(pc, 0)) });
+                    let exit_id = fun.push_insn(block, Insn::Snapshot { state: exit_state });
+                    let insn_id = fun.push_insn(block, Insn::ArrayDup { val, state: exit_id });
+                    state.stack_push(insn_id);
+                }
+                YARVINSN_newhash => {
+                    let count = get_arg(pc, 0).as_usize();
+                    assert!(count % 2 == 0, "newhash count should be even");
+                    let exit_id = fun.push_insn(block, Insn::Snapshot { state: exit_state });
+                    let mut elements = vec![];
+                    for _ in 0..(count/2) {
+                        let value = state.stack_pop()?;
+                        let key = state.stack_pop()?;
+                        elements.push((key, value));
+                    }
+                    elements.reverse();
+                    state.stack_push(fun.push_insn(block, Insn::NewHash { elements, state: exit_id }));
+                }
+                YARVINSN_duphash => {
+                    let val = fun.push_insn(block, Insn::Const { val: Const::Value(get_arg(pc, 0)) });
+                    let exit_id = fun.push_insn(block, Insn::Snapshot { state: exit_state });
+                    let insn_id = fun.push_insn(block, Insn::HashDup { val, state: exit_id });
+                    state.stack_push(insn_id);
+                }
+                YARVINSN_splatarray => {
+                    let flag = get_arg(pc, 0);
+                    let result_must_be_mutable = flag.test();
+                    let val = state.stack_pop()?;
+                    let exit_id = fun.push_insn(block, Insn::Snapshot { state: exit_state });
+                    let obj = if result_must_be_mutable {
+                        fun.push_insn(block, Insn::ToNewArray { val, state: exit_id })
+                    } else {
+                        fun.push_insn(block, Insn::ToArray { val, state: exit_id })
+                    };
+                    state.stack_push(obj);
+                }
+                YARVINSN_concattoarray => {
+                    let right = state.stack_pop()?;
+                    let left = state.stack_pop()?;
+                    let exit_id = fun.push_insn(block, Insn::Snapshot { state: exit_state });
+                    let right_array = fun.push_insn(block, Insn::ToArray { val: right, state: exit_id });
+                    fun.push_insn(block, Insn::ArrayExtend { left, right: right_array, state: exit_id });
+                    state.stack_push(left);
+                }
+                YARVINSN_pushtoarray => {
+                    let count = get_arg(pc, 0).as_usize();
+                    let mut vals = vec![];
+                    for _ in 0..count {
+                        vals.push(state.stack_pop()?);
+                    }
+                    let array = state.stack_pop()?;
+                    let exit_id = fun.push_insn(block, Insn::Snapshot { state: exit_state });
+                    for val in vals.into_iter().rev() {
+                        fun.push_insn(block, Insn::ArrayPush { array, val, state: exit_id });
+                    }
+                    state.stack_push(array);
+                }
+                YARVINSN_putobject_INT2FIX_0_ => {
+                    state.stack_push(fun.push_insn(block, Insn::Const { val: Const::Value(VALUE::fixnum_from_usize(0)) }));
+                }
+                YARVINSN_putobject_INT2FIX_1_ => {
+                    state.stack_push(fun.push_insn(block, Insn::Const { val: Const::Value(VALUE::fixnum_from_usize(1)) }));
+                }
+                YARVINSN_defined => {
+                    // (rb_num_t op_type, VALUE obj, VALUE pushval)
+                    let op_type = get_arg(pc, 0).as_usize();
+                    let obj = get_arg(pc, 1);
+                    let pushval = get_arg(pc, 2);
+                    let v = state.stack_pop()?;
+                    state.stack_push(fun.push_insn(block, Insn::Defined { op_type, obj, pushval, v }));
+                }
+                YARVINSN_definedivar => {
+                    // (ID id, IVC ic, VALUE pushval)
+                    let id = ID(get_arg(pc, 0).as_u64());
+                    let pushval = get_arg(pc, 2);
+                    let exit_id = fun.push_insn(block, Insn::Snapshot { state: exit_state });
+                    state.stack_push(fun.push_insn(block, Insn::DefinedIvar { self_val: self_param, id, pushval, state: exit_id }));
+                }
+                YARVINSN_opt_getconstant_path => {
+                    let ic = get_arg(pc, 0).as_ptr();
+                    let snapshot = fun.push_insn(block, Insn::Snapshot { state: exit_state });
+                    state.stack_push(fun.push_insn(block, Insn::GetConstantPath { ic, state: snapshot }));
+                }
+                YARVINSN_branchunless => {
+                    let offset = get_arg(pc, 0).as_i64();
+                    let val = state.stack_pop()?;
+                    let test_id = fun.push_insn(block, Insn::Test { val });
+                    // TODO(max): Check interrupts
+                    let target_idx = insn_idx_at_offset(insn_idx, offset);
+                    let target = insn_idx_to_block[&target_idx];
+                    let _branch_id = fun.push_insn(block, Insn::IfFalse {
+                        val: test_id,
+                        target: BranchEdge { target, args: state.as_args(self_param) }
+                    });
+                    queue.push_back((state.clone(), target, target_idx));
+                }
+                YARVINSN_branchif => {
+                    let offset = get_arg(pc, 0).as_i64();
+                    let val = state.stack_pop()?;
+                    let test_id = fun.push_insn(block, Insn::Test { val });
+                    // TODO(max): Check interrupts
+                    let target_idx = insn_idx_at_offset(insn_idx, offset);
+                    let target = insn_idx_to_block[&target_idx];
+                    let _branch_id = fun.push_insn(block, Insn::IfTrue {
+                        val: test_id,
+                        target: BranchEdge { target, args: state.as_args(self_param) }
+                    });
+                    queue.push_back((state.clone(), target, target_idx));
+                }
+                YARVINSN_branchnil => {
+                    let offset = get_arg(pc, 0).as_i64();
+                    let val = state.stack_pop()?;
+                    let test_id = fun.push_insn(block, Insn::IsNil { val });
+                    // TODO(max): Check interrupts
+                    let target_idx = insn_idx_at_offset(insn_idx, offset);
+                    let target = insn_idx_to_block[&target_idx];
+                    let _branch_id = fun.push_insn(block, Insn::IfTrue {
+                        val: test_id,
+                        target: BranchEdge { target, args: state.as_args(self_param) }
+                    });
+                    queue.push_back((state.clone(), target, target_idx));
+                }
+                YARVINSN_opt_new => {
+                    let offset = get_arg(pc, 1).as_i64();
+                    // TODO(max): Check interrupts
+                    let target_idx = insn_idx_at_offset(insn_idx, offset);
+                    let target = insn_idx_to_block[&target_idx];
+                    // Skip the fast-path and go straight to the fallback code. We will let the
+                    // optimizer take care of the converting Class#new->alloc+initialize instead.
+                    fun.push_insn(block, Insn::Jump(BranchEdge { target, args: state.as_args(self_param) }));
+                    queue.push_back((state.clone(), target, target_idx));
+                    break;  // Don't enqueue the next block as a successor
+                }
+                YARVINSN_jump => {
+                    let offset = get_arg(pc, 0).as_i64();
+                    // TODO(max): Check interrupts
+                    let target_idx = insn_idx_at_offset(insn_idx, offset);
+                    let target = insn_idx_to_block[&target_idx];
+                    let _branch_id = fun.push_insn(block, Insn::Jump(
+                        BranchEdge { target, args: state.as_args(self_param) }
+                    ));
+                    queue.push_back((state.clone(), target, target_idx));
+                    break;  // Don't enqueue the next block as a successor
+                }
+                YARVINSN_getlocal_WC_0 => {
+                    let ep_offset = get_arg(pc, 0).as_u32();
+                    if iseq_type == ISEQ_TYPE_EVAL {
+                        // On eval, the locals are always on the heap, so read the local using EP.
+                        state.stack_push(fun.push_insn(block, Insn::GetLocal { ep_offset, level: 0 }));
+                    } else {
+                        // TODO(alan): This implementation doesn't read from EP, so will miss writes
+                        // from nested ISeqs. This will need to be amended when we add codegen for
+                        // Send.
+                        let val = state.getlocal(ep_offset);
+                        state.stack_push(val);
+                    }
+                }
+                YARVINSN_setlocal_WC_0 => {
+                    // TODO(alan): This implementation doesn't write to EP, where nested scopes
+                    // read, so they'll miss these writes. This will need to be amended when we
+                    // add codegen for Send.
+                    let ep_offset = get_arg(pc, 0).as_u32();
+                    let val = state.stack_pop()?;
+                    state.setlocal(ep_offset, val);
+                    if iseq_type == ISEQ_TYPE_EVAL {
+                        // On eval, the locals are always on the heap, so write the local using EP.
+                        fun.push_insn(block, Insn::SetLocal { val, ep_offset, level: 0 });
+                    }
+                }
+                YARVINSN_getlocal_WC_1 => {
+                    let ep_offset = get_arg(pc, 0).as_u32();
+                    state.stack_push(fun.push_insn(block, Insn::GetLocal { ep_offset, level: 1 }));
+                }
+                YARVINSN_setlocal_WC_1 => {
+                    let ep_offset = get_arg(pc, 0).as_u32();
+                    fun.push_insn(block, Insn::SetLocal { val: state.stack_pop()?, ep_offset, level: 1 });
+                }
+                YARVINSN_getlocal => {
+                    let ep_offset = get_arg(pc, 0).as_u32();
+                    let level = get_arg(pc, 1).as_u32();
+                    state.stack_push(fun.push_insn(block, Insn::GetLocal { ep_offset, level }));
+                }
+                YARVINSN_setlocal => {
+                    let ep_offset = get_arg(pc, 0).as_u32();
+                    let level = get_arg(pc, 1).as_u32();
+                    fun.push_insn(block, Insn::SetLocal { val: state.stack_pop()?, ep_offset, level });
+                }
+                YARVINSN_pop => { state.stack_pop()?; }
+                YARVINSN_dup => { state.stack_push(state.stack_top()?); }
+                YARVINSN_dupn => {
+                    // Duplicate the top N element of the stack. As we push, n-1 naturally
+                    // points higher in the original stack.
+                    let n = get_arg(pc, 0).as_usize();
+                    for _ in 0..n {
+                        state.stack_push(state.stack_topn(n-1)?);
+                    }
+                }
+                YARVINSN_swap => {
+                    let right = state.stack_pop()?;
+                    let left = state.stack_pop()?;
+                    state.stack_push(right);
+                    state.stack_push(left);
+                }
+                YARVINSN_setn => {
+                    let n = get_arg(pc, 0).as_usize();
+                    let top = state.stack_top()?;
+                    state.stack_setn(n, top);
+                }
+                YARVINSN_topn => {
+                    let n = get_arg(pc, 0).as_usize();
+                    let top = state.stack_topn(n)?;
+                    state.stack_push(top);
+                }
+                YARVINSN_adjuststack => {
+                    let mut n = get_arg(pc, 0).as_usize();
+                    while n > 0 {
+                        state.stack_pop()?;
+                        n -= 1;
+                    }
+                }
+                YARVINSN_opt_aref_with => {
+                    // NB: opt_aref_with has an instruction argument for the call at get_arg(0)
+                    let cd: *const rb_call_data = get_arg(pc, 1).as_ptr();
+                    let call_info = unsafe { rb_get_call_data_ci(cd) };
+                    if unknown_call_type(unsafe { rb_vm_ci_flag(call_info) }) {
+                        // Unknown call type; side-exit into the interpreter
+                        let exit_id = fun.push_insn(block, Insn::Snapshot { state: exit_state });
+                        fun.push_insn(block, Insn::SideExit { state: exit_id, reason: SideExitReason::UnknownCallType });
+                        break;  // End the block
+                    }
+                    let argc = unsafe { vm_ci_argc((*cd).ci) };
+
+                    let method_name = unsafe {
+                        let mid = rb_vm_ci_mid(call_info);
+                        mid.contents_lossy().into_owned()
+                    };
+
+                    assert_eq!(1, argc, "opt_aref_with should only be emitted for argc=1");
+                    let aref_arg = fun.push_insn(block, Insn::Const { val: Const::Value(get_arg(pc, 0)) });
+                    let args = vec![aref_arg];
+
+                    let recv = state.stack_pop()?;
+                    let exit_id = fun.push_insn(block, Insn::Snapshot { state: exit_state });
+                    let send = fun.push_insn(block, Insn::SendWithoutBlock { self_val: recv, call_info: CallInfo { method_name }, cd, args, state: exit_id });
+                    state.stack_push(send);
+                }
+                YARVINSN_opt_neq => {
+                    // NB: opt_neq has two cd; get_arg(0) is for eq and get_arg(1) is for neq
+                    let cd: *const rb_call_data = get_arg(pc, 1).as_ptr();
+                    let call_info = unsafe { rb_get_call_data_ci(cd) };
+                    if unknown_call_type(unsafe { rb_vm_ci_flag(call_info) }) {
+                        // Unknown call type; side-exit into the interpreter
+                        let exit_id = fun.push_insn(block, Insn::Snapshot { state: exit_state });
+                        fun.push_insn(block, Insn::SideExit { state: exit_id, reason: SideExitReason::UnknownCallType });
+                        break;  // End the block
+                    }
+                    let argc = unsafe { vm_ci_argc((*cd).ci) };
+
+
+                    let method_name = unsafe {
+                        let mid = rb_vm_ci_mid(call_info);
+                        mid.contents_lossy().into_owned()
+                    };
+                    let mut args = vec![];
+                    for _ in 0..argc {
+                        args.push(state.stack_pop()?);
+                    }
+                    args.reverse();
+
+                    let recv = state.stack_pop()?;
+                    let exit_id = fun.push_insn(block, Insn::Snapshot { state: exit_state });
+                    let send = fun.push_insn(block, Insn::SendWithoutBlock { self_val: recv, call_info: CallInfo { method_name }, cd, args, state: exit_id });
+                    state.stack_push(send);
+                }
+                YARVINSN_opt_hash_freeze |
+                YARVINSN_opt_ary_freeze |
+                YARVINSN_opt_str_freeze |
+                YARVINSN_opt_str_uminus => {
+                    // NB: these instructions have the recv for the call at get_arg(0)
+                    let cd: *const rb_call_data = get_arg(pc, 1).as_ptr();
+                    let call_info = unsafe { rb_get_call_data_ci(cd) };
+                    if unknown_call_type(unsafe { rb_vm_ci_flag(call_info) }) {
+                        // Unknown call type; side-exit into the interpreter
+                        let exit_id = fun.push_insn(block, Insn::Snapshot { state: exit_state });
+                        fun.push_insn(block, Insn::SideExit { state: exit_id, reason: SideExitReason::UnknownCallType });
+                        break;  // End the block
+                    }
+                    let argc = unsafe { vm_ci_argc((*cd).ci) };
+                    let name = insn_name(opcode as usize);
+                    assert_eq!(0, argc, "{name} should not have args");
+                    let args = vec![];
+
+                    let method_name = unsafe {
+                        let mid = rb_vm_ci_mid(call_info);
+                        mid.contents_lossy().into_owned()
+                    };
+
+                    let exit_id = fun.push_insn(block, Insn::Snapshot { state: exit_state });
+                    let recv = fun.push_insn(block, Insn::Const { val: Const::Value(get_arg(pc, 0)) });
+                    let send = fun.push_insn(block, Insn::SendWithoutBlock { self_val: recv, call_info: CallInfo { method_name }, cd, args, state: exit_id });
+                    state.stack_push(send);
+                }
+
+                YARVINSN_leave => {
+                    fun.push_insn(block, Insn::Return { val: state.stack_pop()? });
+                    break;  // Don't enqueue the next block as a successor
+                }
+                YARVINSN_throw => {
+                    fun.push_insn(block, Insn::Throw { throw_state: get_arg(pc, 0).as_u32(), val: state.stack_pop()? });
+                    break;  // Don't enqueue the next block as a successor
+                }
+
+                // These are opt_send_without_block and all the opt_* instructions
+                // specialized to a certain method that could also be serviced
+                // using the general send implementation. The optimizer start from
+                // a general send for all of these later in the pipeline.
+                YARVINSN_opt_nil_p |
+                YARVINSN_opt_plus |
+                YARVINSN_opt_minus |
+                YARVINSN_opt_mult |
+                YARVINSN_opt_div |
+                YARVINSN_opt_mod |
+                YARVINSN_opt_eq |
+                YARVINSN_opt_lt |
+                YARVINSN_opt_le |
+                YARVINSN_opt_gt |
+                YARVINSN_opt_ge |
+                YARVINSN_opt_ltlt |
+                YARVINSN_opt_aset |
+                YARVINSN_opt_length |
+                YARVINSN_opt_size |
+                YARVINSN_opt_aref |
+                YARVINSN_opt_empty_p |
+                YARVINSN_opt_succ |
+                YARVINSN_opt_and |
+                YARVINSN_opt_or |
+                YARVINSN_opt_not |
+                YARVINSN_opt_regexpmatch2 |
+                YARVINSN_opt_send_without_block => {
+                    let cd: *const rb_call_data = get_arg(pc, 0).as_ptr();
+                    let call_info = unsafe { rb_get_call_data_ci(cd) };
+                    if unknown_call_type(unsafe { rb_vm_ci_flag(call_info) }) {
+                        // Unknown call type; side-exit into the interpreter
+                        let exit_id = fun.push_insn(block, Insn::Snapshot { state: exit_state });
+                        fun.push_insn(block, Insn::SideExit { state: exit_id, reason: SideExitReason::UnknownCallType });
+                        break;  // End the block
+                    }
+                    let argc = unsafe { vm_ci_argc((*cd).ci) };
+
+
+                    let method_name = unsafe {
+                        let mid = rb_vm_ci_mid(call_info);
+                        mid.contents_lossy().into_owned()
+                    };
+                    let mut args = vec![];
+                    for _ in 0..argc {
+                        args.push(state.stack_pop()?);
+                    }
+                    args.reverse();
+
+                    let recv = state.stack_pop()?;
+                    let exit_id = fun.push_insn(block, Insn::Snapshot { state: exit_state });
+                    let send = fun.push_insn(block, Insn::SendWithoutBlock { self_val: recv, call_info: CallInfo { method_name }, cd, args, state: exit_id });
+                    state.stack_push(send);
+                }
+                YARVINSN_send => {
+                    let cd: *const rb_call_data = get_arg(pc, 0).as_ptr();
+                    let blockiseq: IseqPtr = get_arg(pc, 1).as_iseq();
+                    let call_info = unsafe { rb_get_call_data_ci(cd) };
+                    if unknown_call_type(unsafe { rb_vm_ci_flag(call_info) }) {
+                        // Unknown call type; side-exit into the interpreter
+                        let exit_id = fun.push_insn(block, Insn::Snapshot { state: exit_state });
+                        fun.push_insn(block, Insn::SideExit { state: exit_id, reason: SideExitReason::UnknownCallType });
+                        break;  // End the block
+                    }
+                    let argc = unsafe { vm_ci_argc((*cd).ci) };
+
+                    let method_name = unsafe {
+                        let mid = rb_vm_ci_mid(call_info);
+                        mid.contents_lossy().into_owned()
+                    };
+                    let mut args = vec![];
+                    for _ in 0..argc {
+                        args.push(state.stack_pop()?);
+                    }
+                    args.reverse();
+
+                    let recv = state.stack_pop()?;
+                    let exit_id = fun.push_insn(block, Insn::Snapshot { state: exit_state });
+                    let send = fun.push_insn(block, Insn::Send { self_val: recv, call_info: CallInfo { method_name }, cd, blockiseq, args, state: exit_id });
+                    state.stack_push(send);
+                }
+                YARVINSN_getglobal => {
+                    let id = ID(get_arg(pc, 0).as_u64());
+                    let exit_id = fun.push_insn(block, Insn::Snapshot { state: exit_state });
+                    let result = fun.push_insn(block, Insn::GetGlobal { id, state: exit_id });
+                    state.stack_push(result);
+                }
+                YARVINSN_setglobal => {
+                    let id = ID(get_arg(pc, 0).as_u64());
+                    let exit_id = fun.push_insn(block, Insn::Snapshot { state: exit_state });
+                    let val = state.stack_pop()?;
+                    fun.push_insn(block, Insn::SetGlobal { id, val, state: exit_id });
+                }
+                YARVINSN_getinstancevariable => {
+                    let id = ID(get_arg(pc, 0).as_u64());
+                    // ic is in arg 1
+                    let exit_id = fun.push_insn(block, Insn::Snapshot { state: exit_state });
+                    let result = fun.push_insn(block, Insn::GetIvar { self_val: self_param, id, state: exit_id });
+                    state.stack_push(result);
+                }
+                YARVINSN_setinstancevariable => {
+                    let id = ID(get_arg(pc, 0).as_u64());
+                    // ic is in arg 1
+                    let exit_id = fun.push_insn(block, Insn::Snapshot { state: exit_state });
+                    let val = state.stack_pop()?;
+                    fun.push_insn(block, Insn::SetIvar { self_val: self_param, id, val, state: exit_id });
+                }
+                YARVINSN_opt_reverse => {
+                    // Reverse the order of the top N stack items.
+                    let n = get_arg(pc, 0).as_usize();
+                    for i in 0..n/2 {
+                        let bottom = state.stack_topn(n - 1 - i)?;
+                        let top = state.stack_topn(i)?;
+                        state.stack_setn(i, bottom);
+                        state.stack_setn(n - 1 - i, top);
+                    }
+                }
+                YARVINSN_newrange => {
+                    let flag = RangeType::from(get_arg(pc, 0).as_u32());
+                    let high = state.stack_pop()?;
+                    let low = state.stack_pop()?;
+                    let exit_id = fun.push_insn(block, Insn::Snapshot { state: exit_state });
+                    let insn_id = fun.push_insn(block, Insn::NewRange { low, high, flag, state: exit_id });
+                    state.stack_push(insn_id);
+                }
+                YARVINSN_invokebuiltin => {
+                    let bf: rb_builtin_function = unsafe { *get_arg(pc, 0).as_ptr() };
+
+                    let mut args = vec![];
+                    for _ in 0..bf.argc {
+                        args.push(state.stack_pop()?);
+                    }
+                    args.push(self_param);
+                    args.reverse();
+
+                    let exit_id = fun.push_insn(block, Insn::Snapshot { state: exit_state });
+                    let insn_id = fun.push_insn(block, Insn::InvokeBuiltin { bf, args, state: exit_id });
+                    state.stack_push(insn_id);
+                }
+                YARVINSN_opt_invokebuiltin_delegate |
+                YARVINSN_opt_invokebuiltin_delegate_leave => {
+                    let bf: rb_builtin_function = unsafe { *get_arg(pc, 0).as_ptr() };
+                    let index = get_arg(pc, 1).as_usize();
+                    let argc = bf.argc as usize;
+
+                    let mut args = vec![self_param];
+                    for &local in state.locals().skip(index).take(argc) {
+                        args.push(local);
+                    }
+
+                    let exit_id = fun.push_insn(block, Insn::Snapshot { state: exit_state });
+                    let insn_id = fun.push_insn(block, Insn::InvokeBuiltin { bf, args, state: exit_id });
+                    state.stack_push(insn_id);
+                }
+                YARVINSN_objtostring => {
+                    let cd: *const rb_call_data = get_arg(pc, 0).as_ptr();
+                    let call_info = unsafe { rb_get_call_data_ci(cd) };
+
+                    if unknown_call_type(unsafe { rb_vm_ci_flag(call_info) }) {
+                        assert!(false, "objtostring should not have unknown call type");
+                    }
+                    let argc = unsafe { vm_ci_argc((*cd).ci) };
+                    assert_eq!(0, argc, "objtostring should not have args");
+
+                    let method_name: String = unsafe {
+                        let mid = rb_vm_ci_mid(call_info);
+                        mid.contents_lossy().into_owned()
+                    };
+
+                    let recv = state.stack_pop()?;
+                    let exit_id = fun.push_insn(block, Insn::Snapshot { state: exit_state });
+                    let objtostring = fun.push_insn(block, Insn::ObjToString { val: recv, call_info: CallInfo { method_name }, cd, state: exit_id });
+                    state.stack_push(objtostring)
+                }
+                YARVINSN_anytostring => {
+                    let str = state.stack_pop()?;
+                    let val = state.stack_pop()?;
+
+                    let exit_id = fun.push_insn(block, Insn::Snapshot { state: exit_state });
+                    let anytostring = fun.push_insn(block, Insn::AnyToString { val, str, state: exit_id });
+                    state.stack_push(anytostring);
+                }
+                _ => {
+                    // Unknown opcode; side-exit into the interpreter
+                    let exit_id = fun.push_insn(block, Insn::Snapshot { state: exit_state });
+                    fun.push_insn(block, Insn::SideExit { state: exit_id, reason: SideExitReason::UnknownOpcode(opcode) });
+                    break;  // End the block
+                }
+            }
+
+            if insn_idx_to_block.contains_key(&insn_idx) {
+                let target = insn_idx_to_block[&insn_idx];
+                fun.push_insn(block, Insn::Jump(BranchEdge { target, args: state.as_args(self_param) }));
+                queue.push_back((state, target, insn_idx));
+                break;  // End the block
+            }
+        }
+    }
+
+    fun.infer_types();
+
+    match get_option!(dump_hir_init) {
+        Some(DumpHIR::WithoutSnapshot) => println!("Initial HIR:\n{}", FunctionPrinter::without_snapshot(&fun)),
+        Some(DumpHIR::All) => println!("Initial HIR:\n{}", FunctionPrinter::with_snapshot(&fun)),
+        Some(DumpHIR::Debug) => println!("Initial HIR:\n{:#?}", &fun),
+        None => {},
+    }
+
+    fun.profiles = Some(profiles);
+    if let Err(e) = fun.validate() {
+        return Err(ParseError::Validation(e));
+    }
+    Ok(fun)
+}
+
+#[cfg(test)]
+mod union_find_tests {
+    use super::UnionFind;
+
+    #[test]
+    fn test_find_returns_self() {
+        let mut uf = UnionFind::new();
+        assert_eq!(uf.find(3usize), 3);
+    }
+
+    #[test]
+    fn test_find_returns_target() {
+        let mut uf = UnionFind::new();
+        uf.make_equal_to(3, 4);
+        assert_eq!(uf.find(3usize), 4);
+    }
+
+    #[test]
+    fn test_find_returns_transitive_target() {
+        let mut uf = UnionFind::new();
+        uf.make_equal_to(3, 4);
+        uf.make_equal_to(4, 5);
+        assert_eq!(uf.find(3usize), 5);
+        assert_eq!(uf.find(4usize), 5);
+    }
+
+    #[test]
+    fn test_find_compresses_path() {
+        let mut uf = UnionFind::new();
+        uf.make_equal_to(3, 4);
+        uf.make_equal_to(4, 5);
+        assert_eq!(uf.at(3usize), Some(4));
+        assert_eq!(uf.find(3usize), 5);
+        assert_eq!(uf.at(3usize), Some(5));
+    }
+}
+
+#[cfg(test)]
+mod rpo_tests {
+    use super::*;
+
+    #[test]
+    fn one_block() {
+        let mut function = Function::new(std::ptr::null());
+        let entry = function.entry_block;
+        let val = function.push_insn(entry, Insn::Const { val: Const::Value(Qnil) });
+        function.push_insn(entry, Insn::Return { val });
+        assert_eq!(function.rpo(), vec![entry]);
+    }
+
+    #[test]
+    fn jump() {
+        let mut function = Function::new(std::ptr::null());
+        let entry = function.entry_block;
+        let exit = function.new_block();
+        function.push_insn(entry, Insn::Jump(BranchEdge { target: exit, args: vec![] }));
+        let val = function.push_insn(entry, Insn::Const { val: Const::Value(Qnil) });
+        function.push_insn(entry, Insn::Return { val });
+        assert_eq!(function.rpo(), vec![entry, exit]);
+    }
+
+    #[test]
+    fn diamond_iftrue() {
+        let mut function = Function::new(std::ptr::null());
+        let entry = function.entry_block;
+        let side = function.new_block();
+        let exit = function.new_block();
+        function.push_insn(side, Insn::Jump(BranchEdge { target: exit, args: vec![] }));
+        let val = function.push_insn(entry, Insn::Const { val: Const::Value(Qnil) });
+        function.push_insn(entry, Insn::IfTrue { val, target: BranchEdge { target: side, args: vec![] } });
+        function.push_insn(entry, Insn::Jump(BranchEdge { target: exit, args: vec![] }));
+        let val = function.push_insn(entry, Insn::Const { val: Const::Value(Qnil) });
+        function.push_insn(entry, Insn::Return { val });
+        assert_eq!(function.rpo(), vec![entry, side, exit]);
+    }
+
+    #[test]
+    fn diamond_iffalse() {
+        let mut function = Function::new(std::ptr::null());
+        let entry = function.entry_block;
+        let side = function.new_block();
+        let exit = function.new_block();
+        function.push_insn(side, Insn::Jump(BranchEdge { target: exit, args: vec![] }));
+        let val = function.push_insn(entry, Insn::Const { val: Const::Value(Qnil) });
+        function.push_insn(entry, Insn::IfFalse { val, target: BranchEdge { target: side, args: vec![] } });
+        function.push_insn(entry, Insn::Jump(BranchEdge { target: exit, args: vec![] }));
+        let val = function.push_insn(entry, Insn::Const { val: Const::Value(Qnil) });
+        function.push_insn(entry, Insn::Return { val });
+        assert_eq!(function.rpo(), vec![entry, side, exit]);
+    }
+
+    #[test]
+    fn a_loop() {
+        let mut function = Function::new(std::ptr::null());
+        let entry = function.entry_block;
+        function.push_insn(entry, Insn::Jump(BranchEdge { target: entry, args: vec![] }));
+        assert_eq!(function.rpo(), vec![entry]);
+    }
+}
+
+#[cfg(test)]
+mod validation_tests {
+    use super::*;
+
+    #[track_caller]
+    fn assert_matches_err(res: Result<(), ValidationError>, expected: ValidationError) {
+        match res {
+            Err(validation_err) => {
+                assert_eq!(validation_err, expected);
+            }
+            Ok(_) => assert!(false, "Expected validation error"),
+        }
+    }
+
+    #[test]
+    fn one_block_no_terminator() {
+        let mut function = Function::new(std::ptr::null());
+        let entry = function.entry_block;
+        function.push_insn(entry, Insn::Const { val: Const::Value(Qnil) });
+        assert_matches_err(function.validate(), ValidationError::BlockHasNoTerminator(entry));
+    }
+
+    #[test]
+    fn one_block_terminator_not_at_end() {
+        let mut function = Function::new(std::ptr::null());
+        let entry = function.entry_block;
+        let val = function.push_insn(entry, Insn::Const { val: Const::Value(Qnil) });
+        let insn_id = function.push_insn(entry, Insn::Return { val });
+        function.push_insn(entry, Insn::Const { val: Const::Value(Qnil) });
+        assert_matches_err(function.validate(), ValidationError::TerminatorNotAtEnd(entry, insn_id, 1));
+    }
+
+    #[test]
+    fn iftrue_mismatch_args() {
+        let mut function = Function::new(std::ptr::null());
+        let entry = function.entry_block;
+        let side = function.new_block();
+        let val = function.push_insn(entry, Insn::Const { val: Const::Value(Qnil) });
+        function.push_insn(entry, Insn::IfTrue { val, target: BranchEdge { target: side, args: vec![val, val, val] } });
+        assert_matches_err(function.validate(), ValidationError::MismatchedBlockArity(entry, 0, 3));
+    }
+
+    #[test]
+    fn iffalse_mismatch_args() {
+        let mut function = Function::new(std::ptr::null());
+        let entry = function.entry_block;
+        let side = function.new_block();
+        let val = function.push_insn(entry, Insn::Const { val: Const::Value(Qnil) });
+        function.push_insn(entry, Insn::IfFalse { val, target: BranchEdge { target: side, args: vec![val, val, val] } });
+        assert_matches_err(function.validate(), ValidationError::MismatchedBlockArity(entry, 0, 3));
+    }
+
+    #[test]
+    fn jump_mismatch_args() {
+        let mut function = Function::new(std::ptr::null());
+        let entry = function.entry_block;
+        let side = function.new_block();
+        let val = function.push_insn(entry, Insn::Const { val: Const::Value(Qnil) });
+        function.push_insn(entry, Insn::Jump ( BranchEdge { target: side, args: vec![val, val, val] } ));
+        assert_matches_err(function.validate(), ValidationError::MismatchedBlockArity(entry, 0, 3));
+    }
+
+    #[test]
+    fn not_defined_within_bb() {
+        let mut function = Function::new(std::ptr::null());
+        let entry = function.entry_block;
+        // Create an instruction without making it belong to anything.
+        let dangling = function.new_insn(Insn::Const{val: Const::CBool(true)});
+        let val = function.push_insn(function.entry_block, Insn::ArrayDup { val: dangling, state: InsnId(0usize) });
+        assert_matches_err(function.validate_definite_assignment(), ValidationError::OperandNotDefined(entry, val, dangling));
+    }
+
+    #[test]
+    fn using_non_output_insn() {
+        let mut function = Function::new(std::ptr::null());
+        let entry = function.entry_block;
+        let const_ = function.push_insn(function.entry_block, Insn::Const{val: Const::CBool(true)});
+        // Ret is a non-output instruction.
+        let ret = function.push_insn(function.entry_block, Insn::Return { val: const_ });
+        let val = function.push_insn(function.entry_block, Insn::ArrayDup { val: ret, state: InsnId(0usize) });
+        assert_matches_err(function.validate_definite_assignment(), ValidationError::OperandNotDefined(entry, val, ret));
+    }
+
+    #[test]
+    fn not_dominated_by_diamond() {
+        // This tests that one branch is missing a definition which fails.
+        let mut function = Function::new(std::ptr::null());
+        let entry = function.entry_block;
+        let side = function.new_block();
+        let exit = function.new_block();
+        let v0 = function.push_insn(side, Insn::Const { val: Const::Value(VALUE::fixnum_from_usize(3)) });
+        function.push_insn(side, Insn::Jump(BranchEdge { target: exit, args: vec![] }));
+        let val1 = function.push_insn(entry, Insn::Const { val: Const::CBool(false) });
+        function.push_insn(entry, Insn::IfFalse { val: val1, target: BranchEdge { target: side, args: vec![] } });
+        function.push_insn(entry, Insn::Jump(BranchEdge { target: exit, args: vec![] }));
+        let val2 = function.push_insn(exit, Insn::ArrayDup { val: v0, state: v0 });
+        crate::cruby::with_rubyvm(|| {
+            function.infer_types();
+            assert_matches_err(function.validate_definite_assignment(), ValidationError::OperandNotDefined(exit, val2, v0));
+        });
+    }
+
+    #[test]
+    fn dominated_by_diamond() {
+        // This tests that both branches with a definition succeeds.
+        let mut function = Function::new(std::ptr::null());
+        let entry = function.entry_block;
+        let side = function.new_block();
+        let exit = function.new_block();
+        let v0 = function.push_insn(entry, Insn::Const { val: Const::Value(VALUE::fixnum_from_usize(3)) });
+        function.push_insn(side, Insn::Jump(BranchEdge { target: exit, args: vec![] }));
+        let val = function.push_insn(entry, Insn::Const { val: Const::CBool(false) });
+        function.push_insn(entry, Insn::IfFalse { val, target: BranchEdge { target: side, args: vec![] } });
+        function.push_insn(entry, Insn::Jump(BranchEdge { target: exit, args: vec![] }));
+        let _val = function.push_insn(exit, Insn::ArrayDup { val: v0, state: v0 });
+        crate::cruby::with_rubyvm(|| {
+            function.infer_types();
+            // Just checking that we don't panic.
+            assert!(function.validate_definite_assignment().is_ok());
+        });
+    }
+
+    #[test]
+    fn instruction_appears_twice_in_same_block() {
+        let mut function = Function::new(std::ptr::null());
+        let entry = function.entry_block;
+        let val = function.push_insn(entry, Insn::Const { val: Const::Value(Qnil) });
+        function.push_insn_id(entry, val);
+        function.push_insn(entry, Insn::Return { val });
+        assert_matches_err(function.validate(), ValidationError::DuplicateInstruction(entry, val));
+    }
+
+    #[test]
+    fn instruction_appears_twice_with_different_ids() {
+        let mut function = Function::new(std::ptr::null());
+        let entry = function.entry_block;
+        let val0 = function.push_insn(entry, Insn::Const { val: Const::Value(Qnil) });
+        let val1 = function.push_insn(entry, Insn::Const { val: Const::Value(Qnil) });
+        function.make_equal_to(val1, val0);
+        function.push_insn(entry, Insn::Return { val: val0 });
+        assert_matches_err(function.validate(), ValidationError::DuplicateInstruction(entry, val0));
+    }
+
+    #[test]
+    fn instruction_appears_twice_in_different_blocks() {
+        let mut function = Function::new(std::ptr::null());
+        let entry = function.entry_block;
+        let val = function.push_insn(entry, Insn::Const { val: Const::Value(Qnil) });
+        let exit = function.new_block();
+        function.push_insn(entry, Insn::Jump(BranchEdge { target: exit, args: vec![] }));
+        function.push_insn_id(exit, val);
+        function.push_insn(exit, Insn::Return { val });
+        assert_matches_err(function.validate(), ValidationError::DuplicateInstruction(exit, val));
+    }
+}
+
+#[cfg(test)]
+mod infer_tests {
+    use super::*;
+
+    #[track_caller]
+    fn assert_subtype(left: Type, right: Type) {
+        assert!(left.is_subtype(right), "{left} is not a subtype of {right}");
+    }
+
+    #[track_caller]
+    fn assert_bit_equal(left: Type, right: Type) {
+        assert!(left.bit_equal(right), "{left} != {right}");
+    }
+
+    #[test]
+    fn test_const() {
+        let mut function = Function::new(std::ptr::null());
+        let val = function.push_insn(function.entry_block, Insn::Const { val: Const::Value(Qnil) });
+        assert_bit_equal(function.infer_type(val), types::NilClassExact);
+    }
+
+    #[test]
+    fn test_nil() {
+        crate::cruby::with_rubyvm(|| {
+            let mut function = Function::new(std::ptr::null());
+            let nil = function.push_insn(function.entry_block, Insn::Const { val: Const::Value(Qnil) });
+            let val = function.push_insn(function.entry_block, Insn::Test { val: nil });
+            function.infer_types();
+            assert_bit_equal(function.type_of(val), Type::from_cbool(false));
+        });
+    }
+
+    #[test]
+    fn test_false() {
+        crate::cruby::with_rubyvm(|| {
+            let mut function = Function::new(std::ptr::null());
+            let false_ = function.push_insn(function.entry_block, Insn::Const { val: Const::Value(Qfalse) });
+            let val = function.push_insn(function.entry_block, Insn::Test { val: false_ });
+            function.infer_types();
+            assert_bit_equal(function.type_of(val), Type::from_cbool(false));
+        });
+    }
+
+    #[test]
+    fn test_truthy() {
+        crate::cruby::with_rubyvm(|| {
+            let mut function = Function::new(std::ptr::null());
+            let true_ = function.push_insn(function.entry_block, Insn::Const { val: Const::Value(Qtrue) });
+            let val = function.push_insn(function.entry_block, Insn::Test { val: true_ });
+            function.infer_types();
+            assert_bit_equal(function.type_of(val), Type::from_cbool(true));
+        });
+    }
+
+    #[test]
+    fn test_unknown() {
+        crate::cruby::with_rubyvm(|| {
+            let mut function = Function::new(std::ptr::null());
+            let param = function.push_insn(function.entry_block, Insn::Param { idx: SELF_PARAM_IDX });
+            function.param_types.push(types::BasicObject); // self
+            let val = function.push_insn(function.entry_block, Insn::Test { val: param });
+            function.infer_types();
+            assert_bit_equal(function.type_of(val), types::CBool);
+        });
+    }
+
+    #[test]
+    fn newarray() {
+        let mut function = Function::new(std::ptr::null());
+        // Fake FrameState index of 0usize
+        let val = function.push_insn(function.entry_block, Insn::NewArray { elements: vec![], state: InsnId(0usize) });
+        assert_bit_equal(function.infer_type(val), types::ArrayExact);
+    }
+
+    #[test]
+    fn arraydup() {
+        let mut function = Function::new(std::ptr::null());
+        // Fake FrameState index of 0usize
+        let arr = function.push_insn(function.entry_block, Insn::NewArray { elements: vec![], state: InsnId(0usize) });
+        let val = function.push_insn(function.entry_block, Insn::ArrayDup { val: arr, state: InsnId(0usize) });
+        assert_bit_equal(function.infer_type(val), types::ArrayExact);
+    }
+
+    #[test]
+    fn diamond_iffalse_merge_fixnum() {
+        let mut function = Function::new(std::ptr::null());
+        let entry = function.entry_block;
+        let side = function.new_block();
+        let exit = function.new_block();
+        let v0 = function.push_insn(side, Insn::Const { val: Const::Value(VALUE::fixnum_from_usize(3)) });
+        function.push_insn(side, Insn::Jump(BranchEdge { target: exit, args: vec![v0] }));
+        let val = function.push_insn(entry, Insn::Const { val: Const::CBool(false) });
+        function.push_insn(entry, Insn::IfFalse { val, target: BranchEdge { target: side, args: vec![] } });
+        let v1 = function.push_insn(entry, Insn::Const { val: Const::Value(VALUE::fixnum_from_usize(4)) });
+        function.push_insn(entry, Insn::Jump(BranchEdge { target: exit, args: vec![v1] }));
+        let param = function.push_insn(exit, Insn::Param { idx: 0 });
+        crate::cruby::with_rubyvm(|| {
+            function.infer_types();
+        });
+        assert_bit_equal(function.type_of(param), types::Fixnum);
+    }
+
+    #[test]
+    fn diamond_iffalse_merge_bool() {
+        let mut function = Function::new(std::ptr::null());
+        let entry = function.entry_block;
+        let side = function.new_block();
+        let exit = function.new_block();
+        let v0 = function.push_insn(side, Insn::Const { val: Const::Value(Qtrue) });
+        function.push_insn(side, Insn::Jump(BranchEdge { target: exit, args: vec![v0] }));
+        let val = function.push_insn(entry, Insn::Const { val: Const::CBool(false) });
+        function.push_insn(entry, Insn::IfFalse { val, target: BranchEdge { target: side, args: vec![] } });
+        let v1 = function.push_insn(entry, Insn::Const { val: Const::Value(Qfalse) });
+        function.push_insn(entry, Insn::Jump(BranchEdge { target: exit, args: vec![v1] }));
+        let param = function.push_insn(exit, Insn::Param { idx: 0 });
+        crate::cruby::with_rubyvm(|| {
+            function.infer_types();
+            assert_bit_equal(function.type_of(param), types::TrueClassExact.union(types::FalseClassExact));
+        });
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use expect_test::{expect, Expect};
+
+    #[macro_export]
+    macro_rules! assert_matches {
+        ( $x:expr, $pat:pat ) => {
+            {
+                let val = $x;
+                if (!matches!(val, $pat)) {
+                    eprintln!("{} ({:?}) does not match pattern {}", stringify!($x), val, stringify!($pat));
+                    assert!(false);
+                }
+            }
+        };
+    }
+
+
+    #[track_caller]
+    fn assert_matches_value(insn: Option<&Insn>, val: VALUE) {
+        match insn {
+            Some(Insn::Const { val: Const::Value(spec) }) => {
+                assert_eq!(*spec, val);
+            }
+            _ => assert!(false, "Expected Const {val}, found {insn:?}"),
+        }
+    }
+
+    #[track_caller]
+    fn assert_matches_const(insn: Option<&Insn>, expected: Const) {
+        match insn {
+            Some(Insn::Const { val }) => {
+                assert_eq!(*val, expected, "{val:?} does not match {expected:?}");
+            }
+            _ => assert!(false, "Expected Const {expected:?}, found {insn:?}"),
+        }
+    }
+
+    #[track_caller]
+    fn assert_method_hir(method: &str, hir: Expect) {
+        let iseq = crate::cruby::with_rubyvm(|| get_method_iseq("self", method));
+        unsafe { crate::cruby::rb_zjit_profile_disable(iseq) };
+        let function = iseq_to_hir(iseq).unwrap();
+        assert_function_hir(function, hir);
+    }
+
+    fn iseq_contains_opcode(iseq: IseqPtr, expected_opcode: u32) -> bool {
+        let iseq_size = unsafe { get_iseq_encoded_size(iseq) };
+        let mut insn_idx = 0;
+        while insn_idx < iseq_size {
+            // Get the current pc and opcode
+            let pc = unsafe { rb_iseq_pc_at_idx(iseq, insn_idx) };
+
+            // try_into() call below is unfortunate. Maybe pick i32 instead of usize for opcodes.
+            let opcode: u32 = unsafe { rb_iseq_opcode_at_pc(iseq, pc) }
+                .try_into()
+                .unwrap();
+            if opcode == expected_opcode {
+                return true;
+            }
+            insn_idx += insn_len(opcode as usize);
+        }
+        false
+    }
+
+    #[track_caller]
+    fn assert_method_hir_with_opcodes(method: &str, opcodes: &[u32], hir: Expect) {
+        let iseq = crate::cruby::with_rubyvm(|| get_method_iseq("self", method));
+        unsafe { crate::cruby::rb_zjit_profile_disable(iseq) };
+        for &opcode in opcodes {
+            assert!(iseq_contains_opcode(iseq, opcode), "iseq {method} does not contain {}", insn_name(opcode as usize));
+        }
+        let function = iseq_to_hir(iseq).unwrap();
+        assert_function_hir(function, hir);
+    }
+
+    #[track_caller]
+    fn assert_method_hir_with_opcode(method: &str, opcode: u32, hir: Expect) {
+        assert_method_hir_with_opcodes(method, &[opcode], hir)
+    }
+
+    #[track_caller]
+    pub fn assert_function_hir(function: Function, expected_hir: Expect) {
+        let actual_hir = format!("{}", FunctionPrinter::without_snapshot(&function));
+        expected_hir.assert_eq(&actual_hir);
+    }
+
+    #[track_caller]
+    fn assert_compile_fails(method: &str, reason: ParseError) {
+        let iseq = crate::cruby::with_rubyvm(|| get_method_iseq("self", method));
+        unsafe { crate::cruby::rb_zjit_profile_disable(iseq) };
+        let result = iseq_to_hir(iseq);
+        assert!(result.is_err(), "Expected an error but successfully compiled to HIR: {}", FunctionPrinter::without_snapshot(&result.unwrap()));
+        assert_eq!(result.unwrap_err(), reason);
+    }
+
+    #[test]
+    fn test_cant_compile_optional() {
+        eval("def test(x=1) = 123");
+        assert_compile_fails("test", ParseError::UnknownParameterType(ParameterType::Optional));
+    }
+
+    #[test]
+    fn test_putobject() {
+        eval("def test = 123");
+        assert_method_hir_with_opcode("test", YARVINSN_putobject, expect![[r#"
+            fn test@<compiled>:1:
+            bb0(v0:BasicObject):
+              v2:Fixnum[123] = Const Value(123)
+              Return v2
+        "#]]);
+    }
+
+    #[test]
+    fn test_new_array() {
+        eval("def test = []");
+        assert_method_hir_with_opcode("test", YARVINSN_newarray, expect![[r#"
+            fn test@<compiled>:1:
+            bb0(v0:BasicObject):
+              v3:ArrayExact = NewArray
+              Return v3
+        "#]]);
+    }
+
+    #[test]
+    fn test_new_array_with_element() {
+        eval("def test(a) = [a]");
+        assert_method_hir_with_opcode("test", YARVINSN_newarray, expect![[r#"
+            fn test@<compiled>:1:
+            bb0(v0:BasicObject, v1:BasicObject):
+              v4:ArrayExact = NewArray v1
+              Return v4
+        "#]]);
+    }
+
+    #[test]
+    fn test_new_array_with_elements() {
+        eval("def test(a, b) = [a, b]");
+        assert_method_hir_with_opcode("test", YARVINSN_newarray, expect![[r#"
+            fn test@<compiled>:1:
+            bb0(v0:BasicObject, v1:BasicObject, v2:BasicObject):
+              v5:ArrayExact = NewArray v1, v2
+              Return v5
+        "#]]);
+    }
+
+    #[test]
+    fn test_new_range_inclusive_with_one_element() {
+        eval("def test(a) = (a..10)");
+        assert_method_hir_with_opcode("test", YARVINSN_newrange, expect![[r#"
+            fn test@<compiled>:1:
+            bb0(v0:BasicObject, v1:BasicObject):
+              v3:Fixnum[10] = Const Value(10)
+              v5:RangeExact = NewRange v1 NewRangeInclusive v3
+              Return v5
+        "#]]);
+    }
+
+    #[test]
+    fn test_new_range_inclusive_with_two_elements() {
+        eval("def test(a, b) = (a..b)");
+        assert_method_hir_with_opcode("test", YARVINSN_newrange, expect![[r#"
+            fn test@<compiled>:1:
+            bb0(v0:BasicObject, v1:BasicObject, v2:BasicObject):
+              v5:RangeExact = NewRange v1 NewRangeInclusive v2
+              Return v5
+        "#]]);
+    }
+
+    #[test]
+    fn test_new_range_exclusive_with_one_element() {
+        eval("def test(a) = (a...10)");
+        assert_method_hir_with_opcode("test", YARVINSN_newrange, expect![[r#"
+            fn test@<compiled>:1:
+            bb0(v0:BasicObject, v1:BasicObject):
+              v3:Fixnum[10] = Const Value(10)
+              v5:RangeExact = NewRange v1 NewRangeExclusive v3
+              Return v5
+        "#]]);
+    }
+
+    #[test]
+    fn test_new_range_exclusive_with_two_elements() {
+        eval("def test(a, b) = (a...b)");
+        assert_method_hir_with_opcode("test", YARVINSN_newrange, expect![[r#"
+            fn test@<compiled>:1:
+            bb0(v0:BasicObject, v1:BasicObject, v2:BasicObject):
+              v5:RangeExact = NewRange v1 NewRangeExclusive v2
+              Return v5
+        "#]]);
+    }
+
+    #[test]
+    fn test_array_dup() {
+        eval("def test = [1, 2, 3]");
+        assert_method_hir_with_opcode("test", YARVINSN_duparray, expect![[r#"
+            fn test@<compiled>:1:
+            bb0(v0:BasicObject):
+              v2:ArrayExact[VALUE(0x1000)] = Const Value(VALUE(0x1000))
+              v4:ArrayExact = ArrayDup v2
+              Return v4
+        "#]]);
+    }
+
+    #[test]
+    fn test_hash_dup() {
+        eval("def test = {a: 1, b: 2}");
+        assert_method_hir_with_opcode("test", YARVINSN_duphash, expect![[r#"
+            fn test@<compiled>:1:
+            bb0(v0:BasicObject):
+              v2:HashExact[VALUE(0x1000)] = Const Value(VALUE(0x1000))
+              v4:HashExact = HashDup v2
+              Return v4
+        "#]]);
+    }
+
+    #[test]
+    fn test_new_hash_empty() {
+        eval("def test = {}");
+        assert_method_hir_with_opcode("test", YARVINSN_newhash, expect![[r#"
+            fn test@<compiled>:1:
+            bb0(v0:BasicObject):
+              v3:HashExact = NewHash
+              Return v3
+        "#]]);
+    }
+
+    #[test]
+    fn test_new_hash_with_elements() {
+        eval("def test(aval, bval) = {a: aval, b: bval}");
+        assert_method_hir_with_opcode("test", YARVINSN_newhash, expect![[r#"
+            fn test@<compiled>:1:
+            bb0(v0:BasicObject, v1:BasicObject, v2:BasicObject):
+              v4:StaticSymbol[:a] = Const Value(VALUE(0x1000))
+              v5:StaticSymbol[:b] = Const Value(VALUE(0x1008))
+              v7:HashExact = NewHash v4: v1, v5: v2
+              Return v7
+        "#]]);
+    }
+
+    #[test]
+    fn test_string_copy() {
+        eval("def test = \"hello\"");
+        assert_method_hir_with_opcode("test", YARVINSN_putchilledstring, expect![[r#"
+            fn test@<compiled>:1:
+            bb0(v0:BasicObject):
+              v2:StringExact[VALUE(0x1000)] = Const Value(VALUE(0x1000))
+              v3:StringExact = StringCopy v2
+              Return v3
+        "#]]);
+    }
+
+    #[test]
+    fn test_bignum() {
+        eval("def test = 999999999999999999999999999999999999");
+        assert_method_hir_with_opcode("test", YARVINSN_putobject, expect![[r#"
+            fn test@<compiled>:1:
+            bb0(v0:BasicObject):
+              v2:Bignum[VALUE(0x1000)] = Const Value(VALUE(0x1000))
+              Return v2
+        "#]]);
+    }
+
+    #[test]
+    fn test_flonum() {
+        eval("def test = 1.5");
+        assert_method_hir_with_opcode("test", YARVINSN_putobject, expect![[r#"
+            fn test@<compiled>:1:
+            bb0(v0:BasicObject):
+              v2:Flonum[VALUE(0x1000)] = Const Value(VALUE(0x1000))
+              Return v2
+        "#]]);
+    }
+
+    #[test]
+    fn test_heap_float() {
+        eval("def test = 1.7976931348623157e+308");
+        assert_method_hir_with_opcode("test", YARVINSN_putobject, expect![[r#"
+            fn test@<compiled>:1:
+            bb0(v0:BasicObject):
+              v2:HeapFloat[VALUE(0x1000)] = Const Value(VALUE(0x1000))
+              Return v2
+        "#]]);
+    }
+
+    #[test]
+    fn test_static_sym() {
+        eval("def test = :foo");
+        assert_method_hir_with_opcode("test", YARVINSN_putobject, expect![[r#"
+            fn test@<compiled>:1:
+            bb0(v0:BasicObject):
+              v2:StaticSymbol[:foo] = Const Value(VALUE(0x1000))
+              Return v2
+        "#]]);
+    }
+
+    #[test]
+    fn test_opt_plus() {
+        eval("def test = 1+2");
+        assert_method_hir_with_opcode("test", YARVINSN_opt_plus, expect![[r#"
+            fn test@<compiled>:1:
+            bb0(v0:BasicObject):
+              v2:Fixnum[1] = Const Value(1)
+              v3:Fixnum[2] = Const Value(2)
+              v5:BasicObject = SendWithoutBlock v2, :+, v3
+              Return v5
+        "#]]);
+    }
+
+    #[test]
+    fn test_opt_hash_freeze() {
+        eval("
+            def test = {}.freeze
+        ");
+        assert_method_hir_with_opcode("test", YARVINSN_opt_hash_freeze, expect![[r#"
+            fn test@<compiled>:2:
+            bb0(v0:BasicObject):
+              v3:HashExact[VALUE(0x1000)] = Const Value(VALUE(0x1000))
+              v4:BasicObject = SendWithoutBlock v3, :freeze
+              Return v4
+        "#]]);
+    }
+
+    #[test]
+    fn test_opt_ary_freeze() {
+        eval("
+            def test = [].freeze
+        ");
+        assert_method_hir_with_opcode("test", YARVINSN_opt_ary_freeze, expect![[r#"
+            fn test@<compiled>:2:
+            bb0(v0:BasicObject):
+              v3:ArrayExact[VALUE(0x1000)] = Const Value(VALUE(0x1000))
+              v4:BasicObject = SendWithoutBlock v3, :freeze
+              Return v4
+        "#]]);
+    }
+
+    #[test]
+    fn test_opt_str_freeze() {
+        eval("
+            def test = ''.freeze
+        ");
+        assert_method_hir_with_opcode("test", YARVINSN_opt_str_freeze, expect![[r#"
+            fn test@<compiled>:2:
+            bb0(v0:BasicObject):
+              v3:StringExact[VALUE(0x1000)] = Const Value(VALUE(0x1000))
+              v4:BasicObject = SendWithoutBlock v3, :freeze
+              Return v4
+        "#]]);
+    }
+
+    #[test]
+    fn test_opt_str_uminus() {
+        eval("
+            def test = -''
+        ");
+        assert_method_hir_with_opcode("test", YARVINSN_opt_str_uminus, expect![[r#"
+            fn test@<compiled>:2:
+            bb0(v0:BasicObject):
+              v3:StringExact[VALUE(0x1000)] = Const Value(VALUE(0x1000))
+              v4:BasicObject = SendWithoutBlock v3, :-@
+              Return v4
+        "#]]);
+    }
+
+    #[test]
+    fn test_setlocal_getlocal() {
+        eval("
+            def test
+              a = 1
+              a
+            end
+        ");
+        assert_method_hir_with_opcodes("test", &[YARVINSN_getlocal_WC_0, YARVINSN_setlocal_WC_0], expect![[r#"
+            fn test@<compiled>:3:
+            bb0(v0:BasicObject):
+              v1:NilClassExact = Const Value(nil)
+              v3:Fixnum[1] = Const Value(1)
+              Return v3
+        "#]]);
+    }
+
+    #[test]
+    fn test_nested_setlocal_getlocal() {
+        eval("
+          l3 = 3
+          _unused = _unused1 = nil
+          1.times do |l2|
+            _ = nil
+            l2 = 2
+            1.times do |l1|
+              l1 = 1
+              define_method(:test) do
+                l1 = l2
+                l2 = l1 + l2
+                l3 = l2 + l3
+              end
+            end
+          end
+        ");
+        assert_method_hir_with_opcodes(
+            "test",
+            &[YARVINSN_getlocal_WC_1, YARVINSN_setlocal_WC_1,
+              YARVINSN_getlocal, YARVINSN_setlocal],
+            expect![[r#"
+                fn block (3 levels) in <compiled>@<compiled>:10:
+                bb0(v0:BasicObject):
+                  v2:BasicObject = GetLocal l2, EP@4
+                  SetLocal l1, EP@3, v2
+                  v4:BasicObject = GetLocal l1, EP@3
+                  v5:BasicObject = GetLocal l2, EP@4
+                  v7:BasicObject = SendWithoutBlock v4, :+, v5
+                  SetLocal l2, EP@4, v7
+                  v9:BasicObject = GetLocal l2, EP@4
+                  v10:BasicObject = GetLocal l3, EP@5
+                  v12:BasicObject = SendWithoutBlock v9, :+, v10
+                  SetLocal l3, EP@5, v12
+                  Return v12
+            "#]]
+        );
+    }
+
+    #[test]
+    fn defined_ivar() {
+        eval("
+            def test = defined?(@foo)
+        ");
+        assert_method_hir_with_opcode("test", YARVINSN_definedivar, expect![[r#"
+            fn test@<compiled>:2:
+            bb0(v0:BasicObject):
+              v3:BasicObject = DefinedIvar v0, :@foo
+              Return v3
+        "#]]);
+    }
+
+    #[test]
+    fn defined() {
+        eval("
+            def test = return defined?(SeaChange), defined?(favourite), defined?($ruby)
+        ");
+        assert_method_hir_with_opcode("test", YARVINSN_defined, expect![[r#"
+            fn test@<compiled>:2:
+            bb0(v0:BasicObject):
+              v2:NilClassExact = Const Value(nil)
+              v3:BasicObject = Defined constant, v2
+              v4:BasicObject = Defined func, v0
+              v5:NilClassExact = Const Value(nil)
+              v6:BasicObject = Defined global-variable, v5
+              v8:ArrayExact = NewArray v3, v4, v6
+              Return v8
+        "#]]);
+    }
+
+    #[test]
+    fn test_return_const() {
+        eval("
+            def test(cond)
+              if cond
+                3
+              else
+                4
+              end
+            end
+        ");
+        assert_method_hir_with_opcode("test", YARVINSN_leave, expect![[r#"
+            fn test@<compiled>:3:
+            bb0(v0:BasicObject, v1:BasicObject):
+              v3:CBool = Test v1
+              IfFalse v3, bb1(v0, v1)
+              v5:Fixnum[3] = Const Value(3)
+              Return v5
+            bb1(v7:BasicObject, v8:BasicObject):
+              v10:Fixnum[4] = Const Value(4)
+              Return v10
+        "#]]);
+    }
+
+    #[test]
+    fn test_merge_const() {
+        eval("
+            def test(cond)
+              if cond
+                result = 3
+              else
+                result = 4
+              end
+              result
+            end
+        ");
+        assert_method_hir("test", expect![[r#"
+            fn test@<compiled>:3:
+            bb0(v0:BasicObject, v1:BasicObject):
+              v2:NilClassExact = Const Value(nil)
+              v4:CBool = Test v1
+              IfFalse v4, bb1(v0, v1, v2)
+              v6:Fixnum[3] = Const Value(3)
+              Jump bb2(v0, v1, v6)
+            bb1(v8:BasicObject, v9:BasicObject, v10:NilClassExact):
+              v12:Fixnum[4] = Const Value(4)
+              Jump bb2(v8, v9, v12)
+            bb2(v14:BasicObject, v15:BasicObject, v16:Fixnum):
+              Return v16
+        "#]]);
+    }
+
+    #[test]
+    fn test_opt_plus_fixnum() {
+        eval("
+            def test(a, b) = a + b
+            test(1, 2); test(1, 2)
+        ");
+        assert_method_hir("test", expect![[r#"
+            fn test@<compiled>:2:
+            bb0(v0:BasicObject, v1:BasicObject, v2:BasicObject):
+              v5:BasicObject = SendWithoutBlock v1, :+, v2
+              Return v5
+        "#]]);
+    }
+
+    #[test]
+    fn test_opt_minus_fixnum() {
+        eval("
+            def test(a, b) = a - b
+            test(1, 2); test(1, 2)
+        ");
+        assert_method_hir_with_opcode("test", YARVINSN_opt_minus, expect![[r#"
+            fn test@<compiled>:2:
+            bb0(v0:BasicObject, v1:BasicObject, v2:BasicObject):
+              v5:BasicObject = SendWithoutBlock v1, :-, v2
+              Return v5
+        "#]]);
+    }
+
+    #[test]
+    fn test_opt_mult_fixnum() {
+        eval("
+            def test(a, b) = a * b
+            test(1, 2); test(1, 2)
+        ");
+        assert_method_hir_with_opcode("test", YARVINSN_opt_mult, expect![[r#"
+            fn test@<compiled>:2:
+            bb0(v0:BasicObject, v1:BasicObject, v2:BasicObject):
+              v5:BasicObject = SendWithoutBlock v1, :*, v2
+              Return v5
+        "#]]);
+    }
+
+    #[test]
+    fn test_opt_div_fixnum() {
+        eval("
+            def test(a, b) = a / b
+            test(1, 2); test(1, 2)
+        ");
+        assert_method_hir_with_opcode("test", YARVINSN_opt_div, expect![[r#"
+            fn test@<compiled>:2:
+            bb0(v0:BasicObject, v1:BasicObject, v2:BasicObject):
+              v5:BasicObject = SendWithoutBlock v1, :/, v2
+              Return v5
+        "#]]);
+    }
+
+    #[test]
+    fn test_opt_mod_fixnum() {
+        eval("
+            def test(a, b) = a % b
+            test(1, 2); test(1, 2)
+        ");
+        assert_method_hir_with_opcode("test", YARVINSN_opt_mod, expect![[r#"
+            fn test@<compiled>:2:
+            bb0(v0:BasicObject, v1:BasicObject, v2:BasicObject):
+              v5:BasicObject = SendWithoutBlock v1, :%, v2
+              Return v5
+        "#]]);
+    }
+
+    #[test]
+    fn test_opt_eq_fixnum() {
+        eval("
+            def test(a, b) = a == b
+            test(1, 2); test(1, 2)
+        ");
+        assert_method_hir_with_opcode("test", YARVINSN_opt_eq, expect![[r#"
+            fn test@<compiled>:2:
+            bb0(v0:BasicObject, v1:BasicObject, v2:BasicObject):
+              v5:BasicObject = SendWithoutBlock v1, :==, v2
+              Return v5
+        "#]]);
+    }
+
+    #[test]
+    fn test_opt_neq_fixnum() {
+        eval("
+            def test(a, b) = a != b
+            test(1, 2); test(1, 2)
+        ");
+        assert_method_hir_with_opcode("test", YARVINSN_opt_neq, expect![[r#"
+            fn test@<compiled>:2:
+            bb0(v0:BasicObject, v1:BasicObject, v2:BasicObject):
+              v5:BasicObject = SendWithoutBlock v1, :!=, v2
+              Return v5
+        "#]]);
+    }
+
+    #[test]
+    fn test_opt_lt_fixnum() {
+        eval("
+            def test(a, b) = a < b
+            test(1, 2); test(1, 2)
+        ");
+        assert_method_hir_with_opcode("test", YARVINSN_opt_lt, expect![[r#"
+            fn test@<compiled>:2:
+            bb0(v0:BasicObject, v1:BasicObject, v2:BasicObject):
+              v5:BasicObject = SendWithoutBlock v1, :<, v2
+              Return v5
+        "#]]);
+    }
+
+    #[test]
+    fn test_opt_le_fixnum() {
+        eval("
+            def test(a, b) = a <= b
+            test(1, 2); test(1, 2)
+        ");
+        assert_method_hir_with_opcode("test", YARVINSN_opt_le, expect![[r#"
+            fn test@<compiled>:2:
+            bb0(v0:BasicObject, v1:BasicObject, v2:BasicObject):
+              v5:BasicObject = SendWithoutBlock v1, :<=, v2
+              Return v5
+        "#]]);
+    }
+
+    #[test]
+    fn test_opt_gt_fixnum() {
+        eval("
+            def test(a, b) = a > b
+            test(1, 2); test(1, 2)
+        ");
+        assert_method_hir_with_opcode("test", YARVINSN_opt_gt, expect![[r#"
+            fn test@<compiled>:2:
+            bb0(v0:BasicObject, v1:BasicObject, v2:BasicObject):
+              v5:BasicObject = SendWithoutBlock v1, :>, v2
+              Return v5
+        "#]]);
+    }
+
+    #[test]
+    fn test_loop() {
+        eval("
+            def test
+              result = 0
+              times = 10
+              while times > 0
+                result = result + 1
+                times = times - 1
+              end
+              result
+            end
+            test
+        ");
+        assert_method_hir("test",  expect![[r#"
+            fn test@<compiled>:3:
+            bb0(v0:BasicObject):
+              v1:NilClassExact = Const Value(nil)
+              v2:NilClassExact = Const Value(nil)
+              v4:Fixnum[0] = Const Value(0)
+              v5:Fixnum[10] = Const Value(10)
+              Jump bb2(v0, v4, v5)
+            bb2(v7:BasicObject, v8:BasicObject, v9:BasicObject):
+              v11:Fixnum[0] = Const Value(0)
+              v13:BasicObject = SendWithoutBlock v9, :>, v11
+              v14:CBool = Test v13
+              IfTrue v14, bb1(v7, v8, v9)
+              v16:NilClassExact = Const Value(nil)
+              Return v8
+            bb1(v18:BasicObject, v19:BasicObject, v20:BasicObject):
+              v22:Fixnum[1] = Const Value(1)
+              v24:BasicObject = SendWithoutBlock v19, :+, v22
+              v25:Fixnum[1] = Const Value(1)
+              v27:BasicObject = SendWithoutBlock v20, :-, v25
+              Jump bb2(v18, v24, v27)
+        "#]]);
+    }
+
+    #[test]
+    fn test_opt_ge_fixnum() {
+        eval("
+            def test(a, b) = a >= b
+            test(1, 2); test(1, 2)
+        ");
+        assert_method_hir_with_opcode("test", YARVINSN_opt_ge, expect![[r#"
+            fn test@<compiled>:2:
+            bb0(v0:BasicObject, v1:BasicObject, v2:BasicObject):
+              v5:BasicObject = SendWithoutBlock v1, :>=, v2
+              Return v5
+        "#]]);
+    }
+
+    #[test]
+    fn test_display_types() {
+        eval("
+            def test
+              cond = true
+              if cond
+                3
+              else
+                4
+              end
+            end
+        ");
+        assert_method_hir("test", expect![[r#"
+            fn test@<compiled>:3:
+            bb0(v0:BasicObject):
+              v1:NilClassExact = Const Value(nil)
+              v3:TrueClassExact = Const Value(true)
+              v4:CBool[true] = Test v3
+              IfFalse v4, bb1(v0, v3)
+              v6:Fixnum[3] = Const Value(3)
+              Return v6
+            bb1(v8, v9):
+              v11 = Const Value(4)
+              Return v11
+        "#]]);
+    }
+
+    #[test]
+    fn test_send_without_block() {
+        eval("
+            def bar(a, b)
+              a+b
+            end
+            def test
+              bar(2, 3)
+            end
+        ");
+        assert_method_hir_with_opcode("test", YARVINSN_opt_send_without_block, expect![[r#"
+            fn test@<compiled>:6:
+            bb0(v0:BasicObject):
+              v2:Fixnum[2] = Const Value(2)
+              v3:Fixnum[3] = Const Value(3)
+              v5:BasicObject = SendWithoutBlock v0, :bar, v2, v3
+              Return v5
+        "#]]);
+    }
+
+    #[test]
+    fn test_send_with_block() {
+        eval("
+            def test(a)
+              a.each {|item|
+                item
+              }
+            end
+            test([1,2,3])
+        ");
+        assert_method_hir_with_opcode("test", YARVINSN_send, expect![[r#"
+            fn test@<compiled>:3:
+            bb0(v0:BasicObject, v1:BasicObject):
+              v4:BasicObject = Send v1, 0x1000, :each
+              Return v4
+        "#]]);
+    }
+
+    #[test]
+    fn different_objects_get_addresses() {
+        eval("def test = unknown_method([0], [1], '2', '2')");
+
+        // The 2 string literals have the same address because they're deduped.
+        assert_method_hir("test",  expect![[r#"
+            fn test@<compiled>:1:
+            bb0(v0:BasicObject):
+              v2:ArrayExact[VALUE(0x1000)] = Const Value(VALUE(0x1000))
+              v4:ArrayExact = ArrayDup v2
+              v5:ArrayExact[VALUE(0x1008)] = Const Value(VALUE(0x1008))
+              v7:ArrayExact = ArrayDup v5
+              v8:StringExact[VALUE(0x1010)] = Const Value(VALUE(0x1010))
+              v9:StringExact = StringCopy v8
+              v10:StringExact[VALUE(0x1010)] = Const Value(VALUE(0x1010))
+              v11:StringExact = StringCopy v10
+              v13:BasicObject = SendWithoutBlock v0, :unknown_method, v4, v7, v9, v11
+              Return v13
+        "#]]);
+    }
+
+    #[test]
+    fn test_cant_compile_splat() {
+        eval("
+            def test(a) = foo(*a)
+        ");
+        assert_method_hir("test",  expect![[r#"
+            fn test@<compiled>:2:
+            bb0(v0:BasicObject, v1:BasicObject):
+              v4:ArrayExact = ToArray v1
+              SideExit UnknownCallType
+        "#]]);
+    }
+
+    #[test]
+    fn test_cant_compile_block_arg() {
+        eval("
+            def test(a) = foo(&a)
+        ");
+        assert_method_hir("test",  expect![[r#"
+            fn test@<compiled>:2:
+            bb0(v0:BasicObject, v1:BasicObject):
+              SideExit UnknownCallType
+        "#]]);
+    }
+
+    #[test]
+    fn test_cant_compile_kwarg() {
+        eval("
+            def test(a) = foo(a: 1)
+        ");
+        assert_method_hir("test",  expect![[r#"
+            fn test@<compiled>:2:
+            bb0(v0:BasicObject, v1:BasicObject):
+              v3:Fixnum[1] = Const Value(1)
+              SideExit UnknownCallType
+        "#]]);
+    }
+
+    #[test]
+    fn test_cant_compile_kw_splat() {
+        eval("
+            def test(a) = foo(**a)
+        ");
+        assert_method_hir("test",  expect![[r#"
+            fn test@<compiled>:2:
+            bb0(v0:BasicObject, v1:BasicObject):
+              SideExit UnknownCallType
+        "#]]);
+    }
+
+    // TODO(max): Figure out how to generate a call with TAILCALL flag
+
+    #[test]
+    fn test_cant_compile_super() {
+        eval("
+            def test = super()
+        ");
+        assert_method_hir("test",  expect![[r#"
+            fn test@<compiled>:2:
+            bb0(v0:BasicObject):
+              SideExit UnknownOpcode(invokesuper)
+        "#]]);
+    }
+
+    #[test]
+    fn test_cant_compile_zsuper() {
+        eval("
+            def test = super
+        ");
+        assert_method_hir("test",  expect![[r#"
+            fn test@<compiled>:2:
+            bb0(v0:BasicObject):
+              SideExit UnknownOpcode(invokesuper)
+        "#]]);
+    }
+
+    #[test]
+    fn test_cant_compile_super_forward() {
+        eval("
+            def test(...) = super(...)
+        ");
+        assert_method_hir("test",  expect![[r#"
+            fn test@<compiled>:2:
+            bb0(v0:BasicObject, v1:BasicObject):
+              SideExit UnknownOpcode(invokesuperforward)
+        "#]]);
+    }
+
+    // TODO(max): Figure out how to generate a call with OPT_SEND flag
+
+    #[test]
+    fn test_cant_compile_kw_splat_mut() {
+        eval("
+            def test(a) = foo **a, b: 1
+        ");
+        assert_method_hir("test",  expect![[r#"
+            fn test@<compiled>:2:
+            bb0(v0:BasicObject, v1:BasicObject):
+              v3:Class[VMFrozenCore] = Const Value(VALUE(0x1000))
+              v5:HashExact = NewHash
+              v7:BasicObject = SendWithoutBlock v3, :core#hash_merge_kwd, v5, v1
+              v8:Class[VMFrozenCore] = Const Value(VALUE(0x1000))
+              v9:StaticSymbol[:b] = Const Value(VALUE(0x1008))
+              v10:Fixnum[1] = Const Value(1)
+              v12:BasicObject = SendWithoutBlock v8, :core#hash_merge_ptr, v7, v9, v10
+              SideExit UnknownCallType
+        "#]]);
+    }
+
+    #[test]
+    fn test_cant_compile_splat_mut() {
+        eval("
+            def test(*) = foo *, 1
+        ");
+        assert_method_hir("test",  expect![[r#"
+            fn test@<compiled>:2:
+            bb0(v0:BasicObject, v1:ArrayExact):
+              v4:ArrayExact = ToNewArray v1
+              v5:Fixnum[1] = Const Value(1)
+              ArrayPush v4, v5
+              SideExit UnknownCallType
+        "#]]);
+    }
+
+    #[test]
+    fn test_cant_compile_forwarding() {
+        eval("
+            def test(...) = foo(...)
+        ");
+        assert_method_hir("test",  expect![[r#"
+            fn test@<compiled>:2:
+            bb0(v0:BasicObject, v1:BasicObject):
+              SideExit UnknownOpcode(sendforward)
+        "#]]);
+    }
+
+    #[test]
+    fn test_opt_new() {
+        eval("
+            class C; end
+            def test = C.new
+        ");
+        assert_method_hir_with_opcode("test", YARVINSN_opt_new, expect![[r#"
+            fn test@<compiled>:3:
+            bb0(v0:BasicObject):
+              v3:BasicObject = GetConstantPath 0x1000
+              v4:NilClassExact = Const Value(nil)
+              Jump bb1(v0, v4, v3)
+            bb1(v6:BasicObject, v7:NilClassExact, v8:BasicObject):
+              v11:BasicObject = SendWithoutBlock v8, :new
+              Jump bb2(v6, v11, v7)
+            bb2(v13:BasicObject, v14:BasicObject, v15:NilClassExact):
+              Return v14
+        "#]]);
+    }
+
+    #[test]
+    fn test_opt_newarray_send_max_no_elements() {
+        eval("
+            def test = [].max
+        ");
+        // TODO(max): Rewrite to nil
+        assert_method_hir_with_opcode("test", YARVINSN_opt_newarray_send, expect![[r#"
+            fn test@<compiled>:2:
+            bb0(v0:BasicObject):
+              PatchPoint BOPRedefined(ARRAY_REDEFINED_OP_FLAG, BOP_MAX)
+              v4:BasicObject = ArrayMax
+              Return v4
+        "#]]);
+    }
+
+    #[test]
+    fn test_opt_newarray_send_max() {
+        eval("
+            def test(a,b) = [a,b].max
+        ");
+        assert_method_hir_with_opcode("test", YARVINSN_opt_newarray_send, expect![[r#"
+            fn test@<compiled>:2:
+            bb0(v0:BasicObject, v1:BasicObject, v2:BasicObject):
+              PatchPoint BOPRedefined(ARRAY_REDEFINED_OP_FLAG, BOP_MAX)
+              v6:BasicObject = ArrayMax v1, v2
+              Return v6
+        "#]]);
+    }
+
+    #[test]
+    fn test_opt_newarray_send_min() {
+        eval("
+            def test(a,b)
+              sum = a+b
+              result = [a,b].min
+              puts [1,2,3]
+              result
+            end
+        ");
+        assert_method_hir_with_opcode("test", YARVINSN_opt_newarray_send, expect![[r#"
+            fn test@<compiled>:3:
+            bb0(v0:BasicObject, v1:BasicObject, v2:BasicObject):
+              v3:NilClassExact = Const Value(nil)
+              v4:NilClassExact = Const Value(nil)
+              v7:BasicObject = SendWithoutBlock v1, :+, v2
+              SideExit UnknownNewarraySend(MIN)
+        "#]]);
+    }
+
+    #[test]
+    fn test_opt_newarray_send_hash() {
+        eval("
+            def test(a,b)
+              sum = a+b
+              result = [a,b].hash
+              puts [1,2,3]
+              result
+            end
+        ");
+        assert_method_hir_with_opcode("test", YARVINSN_opt_newarray_send, expect![[r#"
+            fn test@<compiled>:3:
+            bb0(v0:BasicObject, v1:BasicObject, v2:BasicObject):
+              v3:NilClassExact = Const Value(nil)
+              v4:NilClassExact = Const Value(nil)
+              v7:BasicObject = SendWithoutBlock v1, :+, v2
+              SideExit UnknownNewarraySend(HASH)
+        "#]]);
+    }
+
+    #[test]
+    fn test_opt_newarray_send_pack() {
+        eval("
+            def test(a,b)
+              sum = a+b
+              result = [a,b].pack 'C'
+              puts [1,2,3]
+              result
+            end
+        ");
+        assert_method_hir_with_opcode("test", YARVINSN_opt_newarray_send, expect![[r#"
+            fn test@<compiled>:3:
+            bb0(v0:BasicObject, v1:BasicObject, v2:BasicObject):
+              v3:NilClassExact = Const Value(nil)
+              v4:NilClassExact = Const Value(nil)
+              v7:BasicObject = SendWithoutBlock v1, :+, v2
+              v8:StringExact[VALUE(0x1000)] = Const Value(VALUE(0x1000))
+              v9:StringExact = StringCopy v8
+              SideExit UnknownNewarraySend(PACK)
+        "#]]);
+    }
+
+    // TODO(max): Add a test for VM_OPT_NEWARRAY_SEND_PACK_BUFFER
+
+    #[test]
+    fn test_opt_newarray_send_include_p() {
+        eval("
+            def test(a,b)
+              sum = a+b
+              result = [a,b].include? b
+              puts [1,2,3]
+              result
+            end
+        ");
+        assert_method_hir_with_opcode("test", YARVINSN_opt_newarray_send, expect![[r#"
+            fn test@<compiled>:3:
+            bb0(v0:BasicObject, v1:BasicObject, v2:BasicObject):
+              v3:NilClassExact = Const Value(nil)
+              v4:NilClassExact = Const Value(nil)
+              v7:BasicObject = SendWithoutBlock v1, :+, v2
+              SideExit UnknownNewarraySend(INCLUDE_P)
+        "#]]);
+    }
+
+    #[test]
+    fn test_opt_length() {
+        eval("
+            def test(a,b) = [a,b].length
+        ");
+        assert_method_hir_with_opcode("test", YARVINSN_opt_length, expect![[r#"
+            fn test@<compiled>:2:
+            bb0(v0:BasicObject, v1:BasicObject, v2:BasicObject):
+              v5:ArrayExact = NewArray v1, v2
+              v7:BasicObject = SendWithoutBlock v5, :length
+              Return v7
+        "#]]);
+    }
+
+    #[test]
+    fn test_opt_size() {
+        eval("
+            def test(a,b) = [a,b].size
+        ");
+        assert_method_hir_with_opcode("test", YARVINSN_opt_size, expect![[r#"
+            fn test@<compiled>:2:
+            bb0(v0:BasicObject, v1:BasicObject, v2:BasicObject):
+              v5:ArrayExact = NewArray v1, v2
+              v7:BasicObject = SendWithoutBlock v5, :size
+              Return v7
+        "#]]);
+    }
+
+    #[test]
+    fn test_getinstancevariable() {
+        eval("
+            def test = @foo
+            test
+        ");
+        assert_method_hir_with_opcode("test", YARVINSN_getinstancevariable, expect![[r#"
+            fn test@<compiled>:2:
+            bb0(v0:BasicObject):
+              v3:BasicObject = GetIvar v0, :@foo
+              Return v3
+        "#]]);
+    }
+
+    #[test]
+    fn test_setinstancevariable() {
+        eval("
+            def test = @foo = 1
+            test
+        ");
+        assert_method_hir_with_opcode("test", YARVINSN_setinstancevariable, expect![[r#"
+            fn test@<compiled>:2:
+            bb0(v0:BasicObject):
+              v2:Fixnum[1] = Const Value(1)
+              SetIvar v0, :@foo, v2
+              Return v2
+        "#]]);
+    }
+
+    #[test]
+    fn test_setglobal() {
+        eval("
+            def test = $foo = 1
+            test
+        ");
+        assert_method_hir_with_opcode("test", YARVINSN_setglobal, expect![[r#"
+            fn test@<compiled>:2:
+            bb0(v0:BasicObject):
+              v2:Fixnum[1] = Const Value(1)
+              SetGlobal :$foo, v2
+              Return v2
+        "#]]);
+    }
+
+    #[test]
+    fn test_getglobal() {
+        eval("
+            def test = $foo
+            test
+        ");
+        assert_method_hir_with_opcode("test", YARVINSN_getglobal, expect![[r#"
+            fn test@<compiled>:2:
+            bb0(v0:BasicObject):
+              v3:BasicObject = GetGlobal :$foo
+              Return v3
+        "#]]);
+    }
+
+    #[test]
+    fn test_splatarray_mut() {
+        eval("
+            def test(a) = [*a]
+        ");
+        assert_method_hir_with_opcode("test", YARVINSN_splatarray, expect![[r#"
+            fn test@<compiled>:2:
+            bb0(v0:BasicObject, v1:BasicObject):
+              v4:ArrayExact = ToNewArray v1
+              Return v4
+        "#]]);
+    }
+
+    #[test]
+    fn test_concattoarray() {
+        eval("
+            def test(a) = [1, *a]
+        ");
+        assert_method_hir_with_opcode("test", YARVINSN_concattoarray, expect![[r#"
+            fn test@<compiled>:2:
+            bb0(v0:BasicObject, v1:BasicObject):
+              v3:Fixnum[1] = Const Value(1)
+              v5:ArrayExact = NewArray v3
+              v7:ArrayExact = ToArray v1
+              ArrayExtend v5, v7
+              Return v5
+        "#]]);
+    }
+
+    #[test]
+    fn test_pushtoarray_one_element() {
+        eval("
+            def test(a) = [*a, 1]
+        ");
+        assert_method_hir_with_opcode("test", YARVINSN_pushtoarray, expect![[r#"
+            fn test@<compiled>:2:
+            bb0(v0:BasicObject, v1:BasicObject):
+              v4:ArrayExact = ToNewArray v1
+              v5:Fixnum[1] = Const Value(1)
+              ArrayPush v4, v5
+              Return v4
+        "#]]);
+    }
+
+    #[test]
+    fn test_pushtoarray_multiple_elements() {
+        eval("
+            def test(a) = [*a, 1, 2, 3]
+        ");
+        assert_method_hir_with_opcode("test", YARVINSN_pushtoarray, expect![[r#"
+            fn test@<compiled>:2:
+            bb0(v0:BasicObject, v1:BasicObject):
+              v4:ArrayExact = ToNewArray v1
+              v5:Fixnum[1] = Const Value(1)
+              v6:Fixnum[2] = Const Value(2)
+              v7:Fixnum[3] = Const Value(3)
+              ArrayPush v4, v5
+              ArrayPush v4, v6
+              ArrayPush v4, v7
+              Return v4
+        "#]]);
+    }
+
+    #[test]
+    fn test_aset() {
+        eval("
+            def test(a, b) = a[b] = 1
+        ");
+        assert_method_hir_with_opcode("test", YARVINSN_opt_aset, expect![[r#"
+            fn test@<compiled>:2:
+            bb0(v0:BasicObject, v1:BasicObject, v2:BasicObject):
+              v4:NilClassExact = Const Value(nil)
+              v5:Fixnum[1] = Const Value(1)
+              v7:BasicObject = SendWithoutBlock v1, :[]=, v2, v5
+              Return v5
+        "#]]);
+    }
+
+    #[test]
+    fn test_aref() {
+        eval("
+            def test(a, b) = a[b]
+        ");
+        assert_method_hir_with_opcode("test", YARVINSN_opt_aref, expect![[r#"
+            fn test@<compiled>:2:
+            bb0(v0:BasicObject, v1:BasicObject, v2:BasicObject):
+              v5:BasicObject = SendWithoutBlock v1, :[], v2
+              Return v5
+        "#]]);
+    }
+
+    #[test]
+    fn test_aref_with() {
+        eval("
+            def test(a) = a['string lit triggers aref_with']
+        ");
+        assert_method_hir("test",  expect![[r#"
+            fn test@<compiled>:2:
+            bb0(v0:BasicObject, v1:BasicObject):
+              v3:StringExact[VALUE(0x1000)] = Const Value(VALUE(0x1000))
+              v5:BasicObject = SendWithoutBlock v1, :[], v3
+              Return v5
+        "#]]);
+    }
+
+    #[test]
+    fn opt_empty_p() {
+        eval("
+            def test(x) = x.empty?
+        ");
+        assert_method_hir_with_opcode("test", YARVINSN_opt_empty_p, expect![[r#"
+            fn test@<compiled>:2:
+            bb0(v0:BasicObject, v1:BasicObject):
+              v4:BasicObject = SendWithoutBlock v1, :empty?
+              Return v4
+        "#]]);
+    }
+
+    #[test]
+    fn opt_succ() {
+        eval("
+            def test(x) = x.succ
+        ");
+        assert_method_hir_with_opcode("test", YARVINSN_opt_succ, expect![[r#"
+            fn test@<compiled>:2:
+            bb0(v0:BasicObject, v1:BasicObject):
+              v4:BasicObject = SendWithoutBlock v1, :succ
+              Return v4
+        "#]]);
+    }
+
+    #[test]
+    fn opt_and() {
+        eval("
+            def test(x, y) = x & y
+        ");
+        assert_method_hir_with_opcode("test", YARVINSN_opt_and, expect![[r#"
+            fn test@<compiled>:2:
+            bb0(v0:BasicObject, v1:BasicObject, v2:BasicObject):
+              v5:BasicObject = SendWithoutBlock v1, :&, v2
+              Return v5
+        "#]]);
+    }
+
+    #[test]
+    fn opt_or() {
+        eval("
+            def test(x, y) = x | y
+        ");
+        assert_method_hir_with_opcode("test", YARVINSN_opt_or, expect![[r#"
+            fn test@<compiled>:2:
+            bb0(v0:BasicObject, v1:BasicObject, v2:BasicObject):
+              v5:BasicObject = SendWithoutBlock v1, :|, v2
+              Return v5
+        "#]]);
+    }
+
+    #[test]
+    fn opt_not() {
+        eval("
+            def test(x) = !x
+        ");
+        assert_method_hir_with_opcode("test", YARVINSN_opt_not, expect![[r#"
+            fn test@<compiled>:2:
+            bb0(v0:BasicObject, v1:BasicObject):
+              v4:BasicObject = SendWithoutBlock v1, :!
+              Return v4
+        "#]]);
+    }
+
+    #[test]
+    fn opt_regexpmatch2() {
+        eval("
+            def test(regexp, matchee) = regexp =~ matchee
+        ");
+        assert_method_hir_with_opcode("test", YARVINSN_opt_regexpmatch2, expect![[r#"
+            fn test@<compiled>:2:
+            bb0(v0:BasicObject, v1:BasicObject, v2:BasicObject):
+              v5:BasicObject = SendWithoutBlock v1, :=~, v2
+              Return v5
+        "#]]);
+    }
+
+    #[test]
+    // Tests for ConstBase requires either constant or class definition, both
+    // of which can't be performed inside a method.
+    fn test_putspecialobject_vm_core_and_cbase() {
+        eval("
+            def test
+              alias aliased __callee__
+            end
+        ");
+        assert_method_hir_with_opcode("test", YARVINSN_putspecialobject, expect![[r#"
+            fn test@<compiled>:3:
+            bb0(v0:BasicObject):
+              v2:Class[VMFrozenCore] = Const Value(VALUE(0x1000))
+              v3:BasicObject = PutSpecialObject CBase
+              v4:StaticSymbol[:aliased] = Const Value(VALUE(0x1008))
+              v5:StaticSymbol[:__callee__] = Const Value(VALUE(0x1010))
+              v7:BasicObject = SendWithoutBlock v2, :core#set_method_alias, v3, v4, v5
+              Return v7
+        "#]]);
+    }
+
+    #[test]
+    fn opt_reverse() {
+        eval("
+            def reverse_odd
+              a, b, c = @a, @b, @c
+              [a, b, c]
+            end
+
+            def reverse_even
+              a, b, c, d = @a, @b, @c, @d
+              [a, b, c, d]
+            end
+        ");
+        assert_method_hir_with_opcode("reverse_odd", YARVINSN_opt_reverse, expect![[r#"
+            fn reverse_odd@<compiled>:3:
+            bb0(v0:BasicObject):
+              v1:NilClassExact = Const Value(nil)
+              v2:NilClassExact = Const Value(nil)
+              v3:NilClassExact = Const Value(nil)
+              v6:BasicObject = GetIvar v0, :@a
+              v8:BasicObject = GetIvar v0, :@b
+              v10:BasicObject = GetIvar v0, :@c
+              v12:ArrayExact = NewArray v6, v8, v10
+              Return v12
+        "#]]);
+        assert_method_hir_with_opcode("reverse_even", YARVINSN_opt_reverse, expect![[r#"
+            fn reverse_even@<compiled>:8:
+            bb0(v0:BasicObject):
+              v1:NilClassExact = Const Value(nil)
+              v2:NilClassExact = Const Value(nil)
+              v3:NilClassExact = Const Value(nil)
+              v4:NilClassExact = Const Value(nil)
+              v7:BasicObject = GetIvar v0, :@a
+              v9:BasicObject = GetIvar v0, :@b
+              v11:BasicObject = GetIvar v0, :@c
+              v13:BasicObject = GetIvar v0, :@d
+              v15:ArrayExact = NewArray v7, v9, v11, v13
+              Return v15
+        "#]]);
+    }
+
+    #[test]
+    fn test_branchnil() {
+        eval("
+        def test(x) = x&.itself
+        ");
+        assert_method_hir_with_opcode("test", YARVINSN_branchnil, expect![[r#"
+            fn test@<compiled>:2:
+            bb0(v0:BasicObject, v1:BasicObject):
+              v3:CBool = IsNil v1
+              IfTrue v3, bb1(v0, v1, v1)
+              v6:BasicObject = SendWithoutBlock v1, :itself
+              Jump bb1(v0, v1, v6)
+            bb1(v8:BasicObject, v9:BasicObject, v10:BasicObject):
+              Return v10
+        "#]]);
+    }
+
+    #[test]
+    fn test_invokebuiltin_delegate_with_args() {
+        assert_method_hir_with_opcode("Float", YARVINSN_opt_invokebuiltin_delegate_leave, expect![[r#"
+            fn Float@<internal:kernel>:197:
+            bb0(v0:BasicObject, v1:BasicObject, v2:BasicObject, v3:BasicObject):
+              v6:BasicObject = InvokeBuiltin rb_f_float, v0, v1, v2
+              Jump bb1(v0, v1, v2, v3, v6)
+            bb1(v8:BasicObject, v9:BasicObject, v10:BasicObject, v11:BasicObject, v12:BasicObject):
+              Return v12
+        "#]]);
+    }
+
+    #[test]
+    fn test_invokebuiltin_delegate_without_args() {
+        assert_method_hir_with_opcode("class", YARVINSN_opt_invokebuiltin_delegate_leave, expect![[r#"
+            fn class@<internal:kernel>:20:
+            bb0(v0:BasicObject):
+              v3:BasicObject = InvokeBuiltin _bi20, v0
+              Jump bb1(v0, v3)
+            bb1(v5:BasicObject, v6:BasicObject):
+              Return v6
+        "#]]);
+    }
+
+    #[test]
+    fn test_invokebuiltin_with_args() {
+        let iseq = crate::cruby::with_rubyvm(|| get_method_iseq("GC", "start"));
+        assert!(iseq_contains_opcode(iseq, YARVINSN_invokebuiltin), "iseq GC.start does not contain invokebuiltin");
+        let function = iseq_to_hir(iseq).unwrap();
+        assert_function_hir(function, expect![[r#"
+            fn start@<internal:gc>:36:
+            bb0(v0:BasicObject, v1:BasicObject, v2:BasicObject, v3:BasicObject, v4:BasicObject):
+              v6:FalseClassExact = Const Value(false)
+              v8:BasicObject = InvokeBuiltin gc_start_internal, v0, v1, v2, v3, v6
+              Return v8
+        "#]]);
+    }
+
+    #[test]
+    fn dupn() {
+        eval("
+            def test(x) = (x[0, 1] ||= 2)
+        ");
+        assert_method_hir_with_opcode("test", YARVINSN_dupn, expect![[r#"
+            fn test@<compiled>:2:
+            bb0(v0:BasicObject, v1:BasicObject):
+              v3:NilClassExact = Const Value(nil)
+              v4:Fixnum[0] = Const Value(0)
+              v5:Fixnum[1] = Const Value(1)
+              v7:BasicObject = SendWithoutBlock v1, :[], v4, v5
+              v8:CBool = Test v7
+              IfTrue v8, bb1(v0, v1, v3, v1, v4, v5, v7)
+              v10:Fixnum[2] = Const Value(2)
+              v12:BasicObject = SendWithoutBlock v1, :[]=, v4, v5, v10
+              Return v10
+            bb1(v14:BasicObject, v15:BasicObject, v16:NilClassExact, v17:BasicObject, v18:Fixnum[0], v19:Fixnum[1], v20:BasicObject):
+              Return v20
+        "#]]);
+    }
+
+    #[test]
+    fn test_objtostring_anytostring() {
+        eval("
+            def test = \"#{1}\"
+        ");
+        assert_method_hir_with_opcode("test", YARVINSN_objtostring, expect![[r#"
+            fn test@<compiled>:2:
+            bb0(v0:BasicObject):
+              v2:StringExact[VALUE(0x1000)] = Const Value(VALUE(0x1000))
+              v3:Fixnum[1] = Const Value(1)
+              v5:BasicObject = ObjToString v3
+              v7:String = AnyToString v3, str: v5
+              SideExit UnknownOpcode(concatstrings)
+        "#]]);
+    }
+
+    #[test]
+    fn throw() {
+        eval("
+            define_method(:throw_return) { return 1 }
+            define_method(:throw_break) { break 2 }
+        ");
+        assert_method_hir_with_opcode("throw_return", YARVINSN_throw, expect![[r#"
+            fn block in <compiled>@<compiled>:2:
+            bb0(v0:BasicObject):
+              v2:Fixnum[1] = Const Value(1)
+              Throw TAG_RETURN, v2
+        "#]]);
+        assert_method_hir_with_opcode("throw_break", YARVINSN_throw, expect![[r#"
+            fn block in <compiled>@<compiled>:3:
+            bb0(v0:BasicObject):
+              v2:Fixnum[2] = Const Value(2)
+              Throw TAG_BREAK, v2
+        "#]]);
+    }
+}
+
+#[cfg(test)]
+mod opt_tests {
+    use super::*;
+    use super::tests::assert_function_hir;
+    use expect_test::{expect, Expect};
+
+    #[track_caller]
+    fn assert_optimized_method_hir(method: &str, hir: Expect) {
+        let iseq = crate::cruby::with_rubyvm(|| get_method_iseq("self", method));
+        unsafe { crate::cruby::rb_zjit_profile_disable(iseq) };
+        let mut function = iseq_to_hir(iseq).unwrap();
+        function.optimize();
+        function.validate().unwrap();
+        assert_function_hir(function, hir);
+    }
+
+    #[test]
+    fn test_fold_iftrue_away() {
+        eval("
+            def test
+              cond = true
+              if cond
+                3
+              else
+                4
+              end
+            end
+        ");
+        assert_optimized_method_hir("test", expect![[r#"
+            fn test@<compiled>:3:
+            bb0(v0:BasicObject):
+              v6:Fixnum[3] = Const Value(3)
+              Return v6
+        "#]]);
+    }
+
+    #[test]
+    fn test_fold_iftrue_into_jump() {
+        eval("
+            def test
+              cond = false
+              if cond
+                3
+              else
+                4
+              end
+            end
+        ");
+        assert_optimized_method_hir("test", expect![[r#"
+            fn test@<compiled>:3:
+            bb0(v0:BasicObject):
+              v11:Fixnum[4] = Const Value(4)
+              Return v11
+        "#]]);
+    }
+
+    #[test]
+    fn test_fold_fixnum_add() {
+        eval("
+            def test
+              1 + 2 + 3
+            end
+        ");
+        assert_optimized_method_hir("test", expect![[r#"
+            fn test@<compiled>:3:
+            bb0(v0:BasicObject):
+              v2:Fixnum[1] = Const Value(1)
+              v3:Fixnum[2] = Const Value(2)
+              PatchPoint BOPRedefined(INTEGER_REDEFINED_OP_FLAG, BOP_PLUS)
+              v14:Fixnum[3] = Const Value(3)
+              v6:Fixnum[3] = Const Value(3)
+              PatchPoint BOPRedefined(INTEGER_REDEFINED_OP_FLAG, BOP_PLUS)
+              v15:Fixnum[6] = Const Value(6)
+              Return v15
+        "#]]);
+    }
+
+    #[test]
+    fn test_fold_fixnum_sub() {
+        eval("
+            def test
+              5 - 3 - 1
+            end
+        ");
+        assert_optimized_method_hir("test", expect![[r#"
+            fn test@<compiled>:3:
+            bb0(v0:BasicObject):
+              v2:Fixnum[5] = Const Value(5)
+              v3:Fixnum[3] = Const Value(3)
+              PatchPoint BOPRedefined(INTEGER_REDEFINED_OP_FLAG, BOP_MINUS)
+              v14:Fixnum[2] = Const Value(2)
+              v6:Fixnum[1] = Const Value(1)
+              PatchPoint BOPRedefined(INTEGER_REDEFINED_OP_FLAG, BOP_MINUS)
+              v15:Fixnum[1] = Const Value(1)
+              Return v15
+        "#]]);
+    }
+
+    #[test]
+    fn test_fold_fixnum_mult() {
+        eval("
+            def test
+              6 * 7
+            end
+        ");
+        assert_optimized_method_hir("test", expect![[r#"
+            fn test@<compiled>:3:
+            bb0(v0:BasicObject):
+              v2:Fixnum[6] = Const Value(6)
+              v3:Fixnum[7] = Const Value(7)
+              PatchPoint BOPRedefined(INTEGER_REDEFINED_OP_FLAG, BOP_MULT)
+              v9:Fixnum[42] = Const Value(42)
+              Return v9
+        "#]]);
+    }
+
+    #[test]
+    fn test_fold_fixnum_mult_zero() {
+        eval("
+            def test(n)
+              0 * n + n * 0
+            end
+            test 1; test 2
+        ");
+        assert_optimized_method_hir("test", expect![[r#"
+            fn test@<compiled>:3:
+            bb0(v0:BasicObject, v1:BasicObject):
+              v3:Fixnum[0] = Const Value(0)
+              PatchPoint BOPRedefined(INTEGER_REDEFINED_OP_FLAG, BOP_MULT)
+              v13:Fixnum = GuardType v1, Fixnum
+              v20:Fixnum[0] = Const Value(0)
+              v6:Fixnum[0] = Const Value(0)
+              PatchPoint BOPRedefined(INTEGER_REDEFINED_OP_FLAG, BOP_MULT)
+              v16:Fixnum = GuardType v1, Fixnum
+              v21:Fixnum[0] = Const Value(0)
+              PatchPoint BOPRedefined(INTEGER_REDEFINED_OP_FLAG, BOP_PLUS)
+              v22:Fixnum[0] = Const Value(0)
+              Return v22
+        "#]]);
+    }
+
+    #[test]
+    fn test_fold_fixnum_less() {
+        eval("
+            def test
+              if 1 < 2
+                3
+              else
+                4
+              end
+            end
+        ");
+        assert_optimized_method_hir("test", expect![[r#"
+            fn test@<compiled>:3:
+            bb0(v0:BasicObject):
+              v2:Fixnum[1] = Const Value(1)
+              v3:Fixnum[2] = Const Value(2)
+              PatchPoint BOPRedefined(INTEGER_REDEFINED_OP_FLAG, BOP_LT)
+              v8:Fixnum[3] = Const Value(3)
+              Return v8
+        "#]]);
+    }
+
+    #[test]
+    fn test_fold_fixnum_less_equal() {
+        eval("
+            def test
+              if 1 <= 2 && 2 <= 2
+                3
+              else
+                4
+              end
+            end
+        ");
+        assert_optimized_method_hir("test", expect![[r#"
+            fn test@<compiled>:3:
+            bb0(v0:BasicObject):
+              v2:Fixnum[1] = Const Value(1)
+              v3:Fixnum[2] = Const Value(2)
+              PatchPoint BOPRedefined(INTEGER_REDEFINED_OP_FLAG, BOP_LE)
+              v8:Fixnum[2] = Const Value(2)
+              v9:Fixnum[2] = Const Value(2)
+              PatchPoint BOPRedefined(INTEGER_REDEFINED_OP_FLAG, BOP_LE)
+              v14:Fixnum[3] = Const Value(3)
+              Return v14
+        "#]]);
+    }
+
+    #[test]
+    fn test_fold_fixnum_greater() {
+        eval("
+            def test
+              if 2 > 1
+                3
+              else
+                4
+              end
+            end
+        ");
+        assert_optimized_method_hir("test", expect![[r#"
+            fn test@<compiled>:3:
+            bb0(v0:BasicObject):
+              v2:Fixnum[2] = Const Value(2)
+              v3:Fixnum[1] = Const Value(1)
+              PatchPoint BOPRedefined(INTEGER_REDEFINED_OP_FLAG, BOP_GT)
+              v8:Fixnum[3] = Const Value(3)
+              Return v8
+        "#]]);
+    }
+
+    #[test]
+    fn test_fold_fixnum_greater_equal() {
+        eval("
+            def test
+              if 2 >= 1 && 2 >= 2
+                3
+              else
+                4
+              end
+            end
+        ");
+        assert_optimized_method_hir("test", expect![[r#"
+            fn test@<compiled>:3:
+            bb0(v0:BasicObject):
+              v2:Fixnum[2] = Const Value(2)
+              v3:Fixnum[1] = Const Value(1)
+              PatchPoint BOPRedefined(INTEGER_REDEFINED_OP_FLAG, BOP_GE)
+              v8:Fixnum[2] = Const Value(2)
+              v9:Fixnum[2] = Const Value(2)
+              PatchPoint BOPRedefined(INTEGER_REDEFINED_OP_FLAG, BOP_GE)
+              v14:Fixnum[3] = Const Value(3)
+              Return v14
+        "#]]);
+    }
+
+    #[test]
+    fn test_fold_fixnum_eq_false() {
+        eval("
+            def test
+              if 1 == 2
+                3
+              else
+                4
+              end
+            end
+        ");
+        assert_optimized_method_hir("test", expect![[r#"
+            fn test@<compiled>:3:
+            bb0(v0:BasicObject):
+              v2:Fixnum[1] = Const Value(1)
+              v3:Fixnum[2] = Const Value(2)
+              PatchPoint BOPRedefined(INTEGER_REDEFINED_OP_FLAG, BOP_EQ)
+              v12:Fixnum[4] = Const Value(4)
+              Return v12
+        "#]]);
+    }
+
+    #[test]
+    fn test_fold_fixnum_eq_true() {
+        eval("
+            def test
+              if 2 == 2
+                3
+              else
+                4
+              end
+            end
+        ");
+        assert_optimized_method_hir("test", expect![[r#"
+            fn test@<compiled>:3:
+            bb0(v0:BasicObject):
+              v2:Fixnum[2] = Const Value(2)
+              v3:Fixnum[2] = Const Value(2)
+              PatchPoint BOPRedefined(INTEGER_REDEFINED_OP_FLAG, BOP_EQ)
+              v8:Fixnum[3] = Const Value(3)
+              Return v8
+        "#]]);
+    }
+
+    #[test]
+    fn test_fold_fixnum_neq_true() {
+        eval("
+            def test
+              if 1 != 2
+                3
+              else
+                4
+              end
+            end
+        ");
+        assert_optimized_method_hir("test", expect![[r#"
+            fn test@<compiled>:3:
+            bb0(v0:BasicObject):
+              v2:Fixnum[1] = Const Value(1)
+              v3:Fixnum[2] = Const Value(2)
+              PatchPoint BOPRedefined(INTEGER_REDEFINED_OP_FLAG, BOP_EQ)
+              PatchPoint BOPRedefined(INTEGER_REDEFINED_OP_FLAG, BOP_NEQ)
+              v8:Fixnum[3] = Const Value(3)
+              Return v8
+        "#]]);
+    }
+
+    #[test]
+    fn test_fold_fixnum_neq_false() {
+        eval("
+            def test
+              if 2 != 2
+                3
+              else
+                4
+              end
+            end
+        ");
+        assert_optimized_method_hir("test", expect![[r#"
+            fn test@<compiled>:3:
+            bb0(v0:BasicObject):
+              v2:Fixnum[2] = Const Value(2)
+              v3:Fixnum[2] = Const Value(2)
+              PatchPoint BOPRedefined(INTEGER_REDEFINED_OP_FLAG, BOP_EQ)
+              PatchPoint BOPRedefined(INTEGER_REDEFINED_OP_FLAG, BOP_NEQ)
+              v12:Fixnum[4] = Const Value(4)
+              Return v12
+        "#]]);
+    }
+
+    #[test]
+    fn test_replace_guard_if_known_fixnum() {
+        eval("
+            def test(a)
+              a + 1
+            end
+            test(2); test(3)
+        ");
+        assert_optimized_method_hir("test", expect![[r#"
+            fn test@<compiled>:3:
+            bb0(v0:BasicObject, v1:BasicObject):
+              v3:Fixnum[1] = Const Value(1)
+              PatchPoint BOPRedefined(INTEGER_REDEFINED_OP_FLAG, BOP_PLUS)
+              v8:Fixnum = GuardType v1, Fixnum
+              v9:Fixnum = FixnumAdd v8, v3
+              Return v9
+        "#]]);
+    }
+
+    #[test]
+    fn test_param_forms_get_bb_param() {
+        eval("
+            def rest(*array) = array
+            def kw(k:) = k
+            def kw_rest(**k) = k
+            def post(*rest, post) = post
+            def block(&b) = nil
+            def forwardable(...) = nil
+        ");
+
+        assert_optimized_method_hir("rest", expect![[r#"
+            fn rest@<compiled>:2:
+            bb0(v0:BasicObject, v1:ArrayExact):
+              Return v1
+        "#]]);
+        // extra hidden param for the set of specified keywords
+        assert_optimized_method_hir("kw", expect![[r#"
+            fn kw@<compiled>:3:
+            bb0(v0:BasicObject, v1:BasicObject, v2:BasicObject):
+              Return v1
+        "#]]);
+        assert_optimized_method_hir("kw_rest", expect![[r#"
+            fn kw_rest@<compiled>:4:
+            bb0(v0:BasicObject, v1:BasicObject):
+              Return v1
+        "#]]);
+        assert_optimized_method_hir("block", expect![[r#"
+            fn block@<compiled>:6:
+            bb0(v0:BasicObject, v1:BasicObject):
+              v3:NilClassExact = Const Value(nil)
+              Return v3
+        "#]]);
+        assert_optimized_method_hir("post", expect![[r#"
+            fn post@<compiled>:5:
+            bb0(v0:BasicObject, v1:ArrayExact, v2:BasicObject):
+              Return v2
+        "#]]);
+        assert_optimized_method_hir("forwardable", expect![[r#"
+            fn forwardable@<compiled>:7:
+            bb0(v0:BasicObject, v1:BasicObject):
+              v3:NilClassExact = Const Value(nil)
+              Return v3
+        "#]]);
+    }
+
+    #[test]
+    fn test_optimize_top_level_call_into_send_direct() {
+        eval("
+            def foo
+            end
+            def test
+              foo
+            end
+            test; test
+        ");
+        assert_optimized_method_hir("test", expect![[r#"
+            fn test@<compiled>:5:
+            bb0(v0:BasicObject):
+              PatchPoint MethodRedefined(Object@0x1000, foo@0x1008)
+              v6:BasicObject[VALUE(0x1010)] = GuardBitEquals v0, VALUE(0x1010)
+              v7:BasicObject = SendWithoutBlockDirect v6, :foo (0x1018)
+              Return v7
+        "#]]);
+    }
+
+    #[test]
+    fn test_optimize_nonexistent_top_level_call() {
+        eval("
+            def foo
+            end
+            def test
+              foo
+            end
+            test; test
+            undef :foo
+        ");
+        assert_optimized_method_hir("test", expect![[r#"
+            fn test@<compiled>:5:
+            bb0(v0:BasicObject):
+              v3:BasicObject = SendWithoutBlock v0, :foo
+              Return v3
+        "#]]);
+    }
+
+    #[test]
+    fn test_optimize_private_top_level_call() {
+        eval("
+            def foo
+            end
+            private :foo
+            def test
+              foo
+            end
+            test; test
+        ");
+        assert_optimized_method_hir("test", expect![[r#"
+            fn test@<compiled>:6:
+            bb0(v0:BasicObject):
+              PatchPoint MethodRedefined(Object@0x1000, foo@0x1008)
+              v6:BasicObject[VALUE(0x1010)] = GuardBitEquals v0, VALUE(0x1010)
+              v7:BasicObject = SendWithoutBlockDirect v6, :foo (0x1018)
+              Return v7
+        "#]]);
+    }
+
+    #[test]
+    fn test_optimize_top_level_call_with_overloaded_cme() {
+        eval("
+            def test
+              Integer(3)
+            end
+            test; test
+        ");
+        assert_optimized_method_hir("test", expect![[r#"
+            fn test@<compiled>:3:
+            bb0(v0:BasicObject):
+              v2:Fixnum[3] = Const Value(3)
+              PatchPoint MethodRedefined(Object@0x1000, Integer@0x1008)
+              v7:BasicObject[VALUE(0x1010)] = GuardBitEquals v0, VALUE(0x1010)
+              v8:BasicObject = SendWithoutBlockDirect v7, :Integer (0x1018), v2
+              Return v8
+        "#]]);
+    }
+
+    #[test]
+    fn test_optimize_top_level_call_with_args_into_send_direct() {
+        eval("
+            def foo a, b
+            end
+            def test
+              foo 1, 2
+            end
+            test; test
+        ");
+        assert_optimized_method_hir("test", expect![[r#"
+            fn test@<compiled>:5:
+            bb0(v0:BasicObject):
+              v2:Fixnum[1] = Const Value(1)
+              v3:Fixnum[2] = Const Value(2)
+              PatchPoint MethodRedefined(Object@0x1000, foo@0x1008)
+              v8:BasicObject[VALUE(0x1010)] = GuardBitEquals v0, VALUE(0x1010)
+              v9:BasicObject = SendWithoutBlockDirect v8, :foo (0x1018), v2, v3
+              Return v9
+        "#]]);
+    }
+
+    #[test]
+    fn test_optimize_top_level_sends_into_send_direct() {
+        eval("
+            def foo
+            end
+            def bar
+            end
+            def test
+              foo
+              bar
+            end
+            test; test
+        ");
+        assert_optimized_method_hir("test", expect![[r#"
+            fn test@<compiled>:7:
+            bb0(v0:BasicObject):
+              PatchPoint MethodRedefined(Object@0x1000, foo@0x1008)
+              v8:BasicObject[VALUE(0x1010)] = GuardBitEquals v0, VALUE(0x1010)
+              v9:BasicObject = SendWithoutBlockDirect v8, :foo (0x1018)
+              PatchPoint MethodRedefined(Object@0x1000, bar@0x1020)
+              v11:BasicObject[VALUE(0x1010)] = GuardBitEquals v0, VALUE(0x1010)
+              v12:BasicObject = SendWithoutBlockDirect v11, :bar (0x1018)
+              Return v12
+        "#]]);
+    }
+
+    #[test]
+    fn test_optimize_send_into_fixnum_add_both_profiled() {
+        eval("
+            def test(a, b) = a + b
+            test(1,2); test(3,4)
+        ");
+        assert_optimized_method_hir("test", expect![[r#"
+            fn test@<compiled>:2:
+            bb0(v0:BasicObject, v1:BasicObject, v2:BasicObject):
+              PatchPoint BOPRedefined(INTEGER_REDEFINED_OP_FLAG, BOP_PLUS)
+              v8:Fixnum = GuardType v1, Fixnum
+              v9:Fixnum = GuardType v2, Fixnum
+              v10:Fixnum = FixnumAdd v8, v9
+              Return v10
+        "#]]);
+    }
+
+    #[test]
+    fn test_optimize_send_into_fixnum_add_left_profiled() {
+        eval("
+            def test(a) = a + 1
+            test(1); test(3)
+        ");
+        assert_optimized_method_hir("test", expect![[r#"
+            fn test@<compiled>:2:
+            bb0(v0:BasicObject, v1:BasicObject):
+              v3:Fixnum[1] = Const Value(1)
+              PatchPoint BOPRedefined(INTEGER_REDEFINED_OP_FLAG, BOP_PLUS)
+              v8:Fixnum = GuardType v1, Fixnum
+              v9:Fixnum = FixnumAdd v8, v3
+              Return v9
+        "#]]);
+    }
+
+    #[test]
+    fn test_optimize_send_into_fixnum_add_right_profiled() {
+        eval("
+            def test(a) = 1 + a
+            test(1); test(3)
+        ");
+        assert_optimized_method_hir("test", expect![[r#"
+            fn test@<compiled>:2:
+            bb0(v0:BasicObject, v1:BasicObject):
+              v3:Fixnum[1] = Const Value(1)
+              PatchPoint BOPRedefined(INTEGER_REDEFINED_OP_FLAG, BOP_PLUS)
+              v8:Fixnum = GuardType v1, Fixnum
+              v9:Fixnum = FixnumAdd v3, v8
+              Return v9
+        "#]]);
+    }
+
+    #[test]
+    fn test_optimize_send_into_fixnum_lt_both_profiled() {
+        eval("
+            def test(a, b) = a < b
+            test(1,2); test(3,4)
+        ");
+        assert_optimized_method_hir("test", expect![[r#"
+            fn test@<compiled>:2:
+            bb0(v0:BasicObject, v1:BasicObject, v2:BasicObject):
+              PatchPoint BOPRedefined(INTEGER_REDEFINED_OP_FLAG, BOP_LT)
+              v8:Fixnum = GuardType v1, Fixnum
+              v9:Fixnum = GuardType v2, Fixnum
+              v10:BoolExact = FixnumLt v8, v9
+              Return v10
+        "#]]);
+    }
+
+    #[test]
+    fn test_optimize_send_into_fixnum_lt_left_profiled() {
+        eval("
+            def test(a) = a < 1
+            test(1); test(3)
+        ");
+        assert_optimized_method_hir("test", expect![[r#"
+            fn test@<compiled>:2:
+            bb0(v0:BasicObject, v1:BasicObject):
+              v3:Fixnum[1] = Const Value(1)
+              PatchPoint BOPRedefined(INTEGER_REDEFINED_OP_FLAG, BOP_LT)
+              v8:Fixnum = GuardType v1, Fixnum
+              v9:BoolExact = FixnumLt v8, v3
+              Return v9
+        "#]]);
+    }
+
+    #[test]
+    fn test_optimize_send_into_fixnum_lt_right_profiled() {
+        eval("
+            def test(a) = 1 < a
+            test(1); test(3)
+        ");
+        assert_optimized_method_hir("test", expect![[r#"
+            fn test@<compiled>:2:
+            bb0(v0:BasicObject, v1:BasicObject):
+              v3:Fixnum[1] = Const Value(1)
+              PatchPoint BOPRedefined(INTEGER_REDEFINED_OP_FLAG, BOP_LT)
+              v8:Fixnum = GuardType v1, Fixnum
+              v9:BoolExact = FixnumLt v3, v8
+              Return v9
+        "#]]);
+    }
+
+    #[test]
+    fn test_eliminate_new_array() {
+        eval("
+            def test()
+              c = []
+              5
+            end
+            test; test
+        ");
+        assert_optimized_method_hir("test", expect![[r#"
+            fn test@<compiled>:3:
+            bb0(v0:BasicObject):
+              v5:Fixnum[5] = Const Value(5)
+              Return v5
+        "#]]);
+    }
+
+    #[test]
+    fn test_eliminate_new_range() {
+        eval("
+            def test()
+              c = (1..2)
+              5
+            end
+            test; test
+        ");
+        assert_optimized_method_hir("test", expect![[r#"
+            fn test@<compiled>:3:
+            bb0(v0:BasicObject):
+              v4:Fixnum[5] = Const Value(5)
+              Return v4
+        "#]]);
+    }
+
+    #[test]
+    fn test_eliminate_new_array_with_elements() {
+        eval("
+            def test(a)
+              c = [a]
+              5
+            end
+            test(1); test(2)
+        ");
+        assert_optimized_method_hir("test", expect![[r#"
+            fn test@<compiled>:3:
+            bb0(v0:BasicObject, v1:BasicObject):
+              v6:Fixnum[5] = Const Value(5)
+              Return v6
+        "#]]);
+    }
+
+    #[test]
+    fn test_eliminate_new_hash() {
+        eval("
+            def test()
+              c = {}
+              5
+            end
+        ");
+        assert_optimized_method_hir("test", expect![[r#"
+            fn test@<compiled>:3:
+            bb0(v0:BasicObject):
+              v5:Fixnum[5] = Const Value(5)
+              Return v5
+        "#]]);
+    }
+
+    #[test]
+    fn test_eliminate_new_hash_with_elements() {
+        eval("
+            def test(aval, bval)
+              c = {a: aval, b: bval}
+              5
+            end
+        ");
+        assert_optimized_method_hir("test", expect![[r#"
+            fn test@<compiled>:3:
+            bb0(v0:BasicObject, v1:BasicObject, v2:BasicObject):
+              v9:Fixnum[5] = Const Value(5)
+              Return v9
+        "#]]);
+    }
+
+    #[test]
+    fn test_eliminate_array_dup() {
+        eval("
+            def test
+              c = [1, 2]
+              5
+            end
+            test; test
+        ");
+        assert_optimized_method_hir("test", expect![[r#"
+            fn test@<compiled>:3:
+            bb0(v0:BasicObject):
+              v6:Fixnum[5] = Const Value(5)
+              Return v6
+        "#]]);
+    }
+
+    #[test]
+    fn test_eliminate_hash_dup() {
+        eval("
+            def test
+              c = {a: 1, b: 2}
+              5
+            end
+        ");
+        assert_optimized_method_hir("test", expect![[r#"
+            fn test@<compiled>:3:
+            bb0(v0:BasicObject):
+              v6:Fixnum[5] = Const Value(5)
+              Return v6
+        "#]]);
+    }
+
+    #[test]
+    fn test_eliminate_putself() {
+        eval("
+            def test()
+              c = self
+              5
+            end
+            test; test
+        ");
+        assert_optimized_method_hir("test", expect![[r#"
+            fn test@<compiled>:3:
+            bb0(v0:BasicObject):
+              v3:Fixnum[5] = Const Value(5)
+              Return v3
+        "#]]);
+    }
+
+    #[test]
+    fn test_eliminate_string_copy() {
+        eval(r#"
+            def test()
+              c = "abc"
+              5
+            end
+            test; test
+        "#);
+        assert_optimized_method_hir("test", expect![[r#"
+            fn test@<compiled>:3:
+            bb0(v0:BasicObject):
+              v5:Fixnum[5] = Const Value(5)
+              Return v5
+        "#]]);
+    }
+
+    #[test]
+    fn test_eliminate_fixnum_add() {
+        eval("
+            def test(a, b)
+              a + b
+              5
+            end
+            test(1, 2); test(3, 4)
+        ");
+        assert_optimized_method_hir("test", expect![[r#"
+            fn test@<compiled>:3:
+            bb0(v0:BasicObject, v1:BasicObject, v2:BasicObject):
+              PatchPoint BOPRedefined(INTEGER_REDEFINED_OP_FLAG, BOP_PLUS)
+              v9:Fixnum = GuardType v1, Fixnum
+              v10:Fixnum = GuardType v2, Fixnum
+              v6:Fixnum[5] = Const Value(5)
+              Return v6
+        "#]]);
+    }
+
+    #[test]
+    fn test_eliminate_fixnum_sub() {
+        eval("
+            def test(a, b)
+              a - b
+              5
+            end
+            test(1, 2); test(3, 4)
+        ");
+        assert_optimized_method_hir("test", expect![[r#"
+            fn test@<compiled>:3:
+            bb0(v0:BasicObject, v1:BasicObject, v2:BasicObject):
+              PatchPoint BOPRedefined(INTEGER_REDEFINED_OP_FLAG, BOP_MINUS)
+              v9:Fixnum = GuardType v1, Fixnum
+              v10:Fixnum = GuardType v2, Fixnum
+              v6:Fixnum[5] = Const Value(5)
+              Return v6
+        "#]]);
+    }
+
+    #[test]
+    fn test_eliminate_fixnum_mul() {
+        eval("
+            def test(a, b)
+              a * b
+              5
+            end
+            test(1, 2); test(3, 4)
+        ");
+        assert_optimized_method_hir("test", expect![[r#"
+            fn test@<compiled>:3:
+            bb0(v0:BasicObject, v1:BasicObject, v2:BasicObject):
+              PatchPoint BOPRedefined(INTEGER_REDEFINED_OP_FLAG, BOP_MULT)
+              v9:Fixnum = GuardType v1, Fixnum
+              v10:Fixnum = GuardType v2, Fixnum
+              v6:Fixnum[5] = Const Value(5)
+              Return v6
+        "#]]);
+    }
+
+    #[test]
+    fn test_do_not_eliminate_fixnum_div() {
+        eval("
+            def test(a, b)
+              a / b
+              5
+            end
+            test(1, 2); test(3, 4)
+        ");
+        assert_optimized_method_hir("test", expect![[r#"
+            fn test@<compiled>:3:
+            bb0(v0:BasicObject, v1:BasicObject, v2:BasicObject):
+              PatchPoint BOPRedefined(INTEGER_REDEFINED_OP_FLAG, BOP_DIV)
+              v9:Fixnum = GuardType v1, Fixnum
+              v10:Fixnum = GuardType v2, Fixnum
+              v11:Fixnum = FixnumDiv v9, v10
+              v6:Fixnum[5] = Const Value(5)
+              Return v6
+        "#]]);
+    }
+
+    #[test]
+    fn test_do_not_eliminate_fixnum_mod() {
+        eval("
+            def test(a, b)
+              a % b
+              5
+            end
+            test(1, 2); test(3, 4)
+        ");
+        assert_optimized_method_hir("test", expect![[r#"
+            fn test@<compiled>:3:
+            bb0(v0:BasicObject, v1:BasicObject, v2:BasicObject):
+              PatchPoint BOPRedefined(INTEGER_REDEFINED_OP_FLAG, BOP_MOD)
+              v9:Fixnum = GuardType v1, Fixnum
+              v10:Fixnum = GuardType v2, Fixnum
+              v11:Fixnum = FixnumMod v9, v10
+              v6:Fixnum[5] = Const Value(5)
+              Return v6
+        "#]]);
+    }
+
+    #[test]
+    fn test_eliminate_fixnum_lt() {
+        eval("
+            def test(a, b)
+              a < b
+              5
+            end
+            test(1, 2); test(3, 4)
+        ");
+        assert_optimized_method_hir("test", expect![[r#"
+            fn test@<compiled>:3:
+            bb0(v0:BasicObject, v1:BasicObject, v2:BasicObject):
+              PatchPoint BOPRedefined(INTEGER_REDEFINED_OP_FLAG, BOP_LT)
+              v9:Fixnum = GuardType v1, Fixnum
+              v10:Fixnum = GuardType v2, Fixnum
+              v6:Fixnum[5] = Const Value(5)
+              Return v6
+        "#]]);
+    }
+
+    #[test]
+    fn test_eliminate_fixnum_le() {
+        eval("
+            def test(a, b)
+              a <= b
+              5
+            end
+            test(1, 2); test(3, 4)
+        ");
+        assert_optimized_method_hir("test", expect![[r#"
+            fn test@<compiled>:3:
+            bb0(v0:BasicObject, v1:BasicObject, v2:BasicObject):
+              PatchPoint BOPRedefined(INTEGER_REDEFINED_OP_FLAG, BOP_LE)
+              v9:Fixnum = GuardType v1, Fixnum
+              v10:Fixnum = GuardType v2, Fixnum
+              v6:Fixnum[5] = Const Value(5)
+              Return v6
+        "#]]);
+    }
+
+    #[test]
+    fn test_eliminate_fixnum_gt() {
+        eval("
+            def test(a, b)
+              a > b
+              5
+            end
+            test(1, 2); test(3, 4)
+        ");
+        assert_optimized_method_hir("test", expect![[r#"
+            fn test@<compiled>:3:
+            bb0(v0:BasicObject, v1:BasicObject, v2:BasicObject):
+              PatchPoint BOPRedefined(INTEGER_REDEFINED_OP_FLAG, BOP_GT)
+              v9:Fixnum = GuardType v1, Fixnum
+              v10:Fixnum = GuardType v2, Fixnum
+              v6:Fixnum[5] = Const Value(5)
+              Return v6
+        "#]]);
+    }
+
+    #[test]
+    fn test_eliminate_fixnum_ge() {
+        eval("
+            def test(a, b)
+              a >= b
+              5
+            end
+            test(1, 2); test(3, 4)
+        ");
+        assert_optimized_method_hir("test", expect![[r#"
+            fn test@<compiled>:3:
+            bb0(v0:BasicObject, v1:BasicObject, v2:BasicObject):
+              PatchPoint BOPRedefined(INTEGER_REDEFINED_OP_FLAG, BOP_GE)
+              v9:Fixnum = GuardType v1, Fixnum
+              v10:Fixnum = GuardType v2, Fixnum
+              v6:Fixnum[5] = Const Value(5)
+              Return v6
+        "#]]);
+    }
+
+    #[test]
+    fn test_eliminate_fixnum_eq() {
+        eval("
+            def test(a, b)
+              a == b
+              5
+            end
+            test(1, 2); test(3, 4)
+        ");
+        assert_optimized_method_hir("test", expect![[r#"
+            fn test@<compiled>:3:
+            bb0(v0:BasicObject, v1:BasicObject, v2:BasicObject):
+              PatchPoint BOPRedefined(INTEGER_REDEFINED_OP_FLAG, BOP_EQ)
+              v9:Fixnum = GuardType v1, Fixnum
+              v10:Fixnum = GuardType v2, Fixnum
+              v6:Fixnum[5] = Const Value(5)
+              Return v6
+        "#]]);
+    }
+
+    #[test]
+    fn test_eliminate_fixnum_neq() {
+        eval("
+            def test(a, b)
+              a != b
+              5
+            end
+            test(1, 2); test(3, 4)
+        ");
+        assert_optimized_method_hir("test", expect![[r#"
+            fn test@<compiled>:3:
+            bb0(v0:BasicObject, v1:BasicObject, v2:BasicObject):
+              PatchPoint BOPRedefined(INTEGER_REDEFINED_OP_FLAG, BOP_EQ)
+              PatchPoint BOPRedefined(INTEGER_REDEFINED_OP_FLAG, BOP_NEQ)
+              v10:Fixnum = GuardType v1, Fixnum
+              v11:Fixnum = GuardType v2, Fixnum
+              v6:Fixnum[5] = Const Value(5)
+              Return v6
+        "#]]);
+    }
+
+    #[test]
+    fn test_do_not_eliminate_get_constant_path() {
+        eval("
+            def test()
+              C
+              5
+            end
+        ");
+        assert_optimized_method_hir("test", expect![[r#"
+            fn test@<compiled>:3:
+            bb0(v0:BasicObject):
+              v3:BasicObject = GetConstantPath 0x1000
+              v4:Fixnum[5] = Const Value(5)
+              Return v4
+        "#]]);
+    }
+
+    #[test]
+    fn kernel_itself_const() {
+        eval("
+            def test(x) = x.itself
+            test(0) # profile
+            test(1)
+        ");
+        assert_optimized_method_hir("test", expect![[r#"
+            fn test@<compiled>:2:
+            bb0(v0:BasicObject, v1:BasicObject):
+              PatchPoint MethodRedefined(Integer@0x1000, itself@0x1008)
+              v7:Fixnum = GuardType v1, Fixnum
+              v8:BasicObject = CCall itself@0x1010, v7
+              Return v8
+        "#]]);
+    }
+
+    #[test]
+    fn kernel_itself_known_type() {
+        eval("
+            def test = [].itself
+        ");
+        assert_optimized_method_hir("test", expect![[r#"
+            fn test@<compiled>:2:
+            bb0(v0:BasicObject):
+              v3:ArrayExact = NewArray
+              PatchPoint MethodRedefined(Array@0x1000, itself@0x1008)
+              v8:BasicObject = CCall itself@0x1010, v3
+              Return v8
+        "#]]);
+    }
+
+    #[test]
+    fn eliminate_kernel_itself() {
+        eval("
+            def test
+              x = [].itself
+              1
+            end
+        ");
+        assert_optimized_method_hir("test", expect![[r#"
+            fn test@<compiled>:3:
+            bb0(v0:BasicObject):
+              v1:NilClassExact = Const Value(nil)
+              v4:ArrayExact = NewArray
+              PatchPoint MethodRedefined(Array@0x1000, itself@0x1008)
+              v7:Fixnum[1] = Const Value(1)
+              Return v7
+        "#]]);
+    }
+
+    #[test]
+    fn eliminate_module_name() {
+        eval("
+            module M; end
+            def test
+              x = M.name
+              1
+            end
+            test
+        ");
+        assert_optimized_method_hir("test", expect![[r#"
+            fn test@<compiled>:4:
+            bb0(v0:BasicObject):
+              v1:NilClassExact = Const Value(nil)
+              PatchPoint SingleRactorMode
+              PatchPoint StableConstantNames(0x1000, M)
+              v11:ModuleExact[VALUE(0x1008)] = Const Value(VALUE(0x1008))
+              PatchPoint MethodRedefined(Module@0x1010, name@0x1018)
+              v7:Fixnum[1] = Const Value(1)
+              Return v7
+        "#]]);
+    }
+
+    #[test]
+    fn eliminate_array_length() {
+        eval("
+            def test
+              x = [].length
+              5
+            end
+        ");
+        assert_optimized_method_hir("test", expect![[r#"
+            fn test@<compiled>:3:
+            bb0(v0:BasicObject):
+              v1:NilClassExact = Const Value(nil)
+              v4:ArrayExact = NewArray
+              PatchPoint MethodRedefined(Array@0x1000, length@0x1008)
+              v7:Fixnum[5] = Const Value(5)
+              Return v7
+        "#]]);
+    }
+
+    #[test]
+    fn normal_class_type_inference() {
+        eval("
+            class C; end
+            def test = C
+            test # Warm the constant cache
+        ");
+        assert_optimized_method_hir("test", expect![[r#"
+            fn test@<compiled>:3:
+            bb0(v0:BasicObject):
+              PatchPoint SingleRactorMode
+              PatchPoint StableConstantNames(0x1000, C)
+              v7:Class[VALUE(0x1008)] = Const Value(VALUE(0x1008))
+              Return v7
+        "#]]);
+    }
+
+    #[test]
+    fn core_classes_type_inference() {
+        eval("
+            def test = [String, Class, Module, BasicObject]
+            test # Warm the constant cache
+        ");
+        assert_optimized_method_hir("test", expect![[r#"
+            fn test@<compiled>:2:
+            bb0(v0:BasicObject):
+              PatchPoint SingleRactorMode
+              PatchPoint StableConstantNames(0x1000, String)
+              v15:Class[VALUE(0x1008)] = Const Value(VALUE(0x1008))
+              PatchPoint SingleRactorMode
+              PatchPoint StableConstantNames(0x1010, Class)
+              v18:Class[VALUE(0x1018)] = Const Value(VALUE(0x1018))
+              PatchPoint SingleRactorMode
+              PatchPoint StableConstantNames(0x1020, Module)
+              v21:Class[VALUE(0x1028)] = Const Value(VALUE(0x1028))
+              PatchPoint SingleRactorMode
+              PatchPoint StableConstantNames(0x1030, BasicObject)
+              v24:Class[VALUE(0x1038)] = Const Value(VALUE(0x1038))
+              v11:ArrayExact = NewArray v15, v18, v21, v24
+              Return v11
+        "#]]);
+    }
+
+    #[test]
+    fn module_instances_are_module_exact() {
+        eval("
+            def test = [Enumerable, Kernel]
+            test # Warm the constant cache
+        ");
+        assert_optimized_method_hir("test", expect![[r#"
+            fn test@<compiled>:2:
+            bb0(v0:BasicObject):
+              PatchPoint SingleRactorMode
+              PatchPoint StableConstantNames(0x1000, Enumerable)
+              v11:ModuleExact[VALUE(0x1008)] = Const Value(VALUE(0x1008))
+              PatchPoint SingleRactorMode
+              PatchPoint StableConstantNames(0x1010, Kernel)
+              v14:ModuleExact[VALUE(0x1018)] = Const Value(VALUE(0x1018))
+              v7:ArrayExact = NewArray v11, v14
+              Return v7
+        "#]]);
+    }
+
+    #[test]
+    fn module_subclasses_are_not_module_exact() {
+        eval("
+            class ModuleSubclass < Module; end
+            MY_MODULE = ModuleSubclass.new
+            def test = MY_MODULE
+            test # Warm the constant cache
+        ");
+        assert_optimized_method_hir("test", expect![[r#"
+            fn test@<compiled>:4:
+            bb0(v0:BasicObject):
+              PatchPoint SingleRactorMode
+              PatchPoint StableConstantNames(0x1000, MY_MODULE)
+              v7:BasicObject[VALUE(0x1008)] = Const Value(VALUE(0x1008))
+              Return v7
+        "#]]);
+    }
+
+    #[test]
+    fn eliminate_array_size() {
+        eval("
+            def test
+              x = [].size
+              5
+            end
+        ");
+        assert_optimized_method_hir("test", expect![[r#"
+            fn test@<compiled>:3:
+            bb0(v0:BasicObject):
+              v1:NilClassExact = Const Value(nil)
+              v4:ArrayExact = NewArray
+              PatchPoint MethodRedefined(Array@0x1000, size@0x1008)
+              v7:Fixnum[5] = Const Value(5)
+              Return v7
+        "#]]);
+    }
+
+    #[test]
+    fn kernel_itself_argc_mismatch() {
+        eval("
+            def test = 1.itself(0)
+            test rescue 0
+            test rescue 0
+        ");
+        // Not specialized
+        assert_optimized_method_hir("test", expect![[r#"
+            fn test@<compiled>:2:
+            bb0(v0:BasicObject):
+              v2:Fixnum[1] = Const Value(1)
+              v3:Fixnum[0] = Const Value(0)
+              v5:BasicObject = SendWithoutBlock v2, :itself, v3
+              Return v5
+        "#]]);
+    }
+
+    #[test]
+    fn const_send_direct_integer() {
+        eval("
+            def test(x) = 1.zero?
+        ");
+        assert_optimized_method_hir("test", expect![[r#"
+            fn test@<compiled>:2:
+            bb0(v0:BasicObject, v1:BasicObject):
+              v3:Fixnum[1] = Const Value(1)
+              PatchPoint MethodRedefined(Integer@0x1000, zero?@0x1008)
+              v8:BasicObject = SendWithoutBlockDirect v3, :zero? (0x1010)
+              Return v8
+        "#]]);
+    }
+
+    #[test]
+    fn class_known_send_direct_array() {
+        eval("
+            def test(x)
+              a = [1,2,3]
+              a.first
+            end
+        ");
+        assert_optimized_method_hir("test", expect![[r#"
+            fn test@<compiled>:3:
+            bb0(v0:BasicObject, v1:BasicObject):
+              v2:NilClassExact = Const Value(nil)
+              v4:ArrayExact[VALUE(0x1000)] = Const Value(VALUE(0x1000))
+              v6:ArrayExact = ArrayDup v4
+              PatchPoint MethodRedefined(Array@0x1008, first@0x1010)
+              v11:BasicObject = SendWithoutBlockDirect v6, :first (0x1018)
+              Return v11
+        "#]]);
+    }
+
+    #[test]
+    fn string_bytesize_simple() {
+        eval("
+            def test = 'abc'.bytesize
+            test
+            test
+        ");
+        assert_optimized_method_hir("test", expect![[r#"
+            fn test@<compiled>:2:
+            bb0(v0:BasicObject):
+              v2:StringExact[VALUE(0x1000)] = Const Value(VALUE(0x1000))
+              v3:StringExact = StringCopy v2
+              PatchPoint MethodRedefined(String@0x1008, bytesize@0x1010)
+              v8:Fixnum = CCall bytesize@0x1018, v3
+              Return v8
+        "#]]);
+    }
+
+    #[test]
+    fn dont_replace_get_constant_path_with_empty_ic() {
+        eval("
+            def test = Kernel
+        ");
+        assert_optimized_method_hir("test", expect![[r#"
+            fn test@<compiled>:2:
+            bb0(v0:BasicObject):
+              v3:BasicObject = GetConstantPath 0x1000
+              Return v3
+        "#]]);
+    }
+
+    #[test]
+    fn dont_replace_get_constant_path_with_invalidated_ic() {
+        eval("
+            def test = Kernel
+            test
+            Kernel = 5
+        ");
+        assert_optimized_method_hir("test", expect![[r#"
+            fn test@<compiled>:2:
+            bb0(v0:BasicObject):
+              v3:BasicObject = GetConstantPath 0x1000
+              Return v3
+        "#]]);
+    }
+
+    #[test]
+    fn replace_get_constant_path_with_const() {
+        eval("
+            def test = Kernel
+            test
+        ");
+        assert_optimized_method_hir("test", expect![[r#"
+            fn test@<compiled>:2:
+            bb0(v0:BasicObject):
+              PatchPoint SingleRactorMode
+              PatchPoint StableConstantNames(0x1000, Kernel)
+              v7:ModuleExact[VALUE(0x1008)] = Const Value(VALUE(0x1008))
+              Return v7
+        "#]]);
+    }
+
+    #[test]
+    fn replace_nested_get_constant_path_with_const() {
+        eval("
+            module Foo
+              module Bar
+                class C
+                end
+              end
+            end
+            def test = Foo::Bar::C
+            test
+        ");
+        assert_optimized_method_hir("test", expect![[r#"
+            fn test@<compiled>:8:
+            bb0(v0:BasicObject):
+              PatchPoint SingleRactorMode
+              PatchPoint StableConstantNames(0x1000, Foo::Bar::C)
+              v7:Class[VALUE(0x1008)] = Const Value(VALUE(0x1008))
+              Return v7
+        "#]]);
+    }
+
+    #[test]
+    fn test_opt_new_no_initialize() {
+        eval("
+            class C; end
+            def test = C.new
+            test
+        ");
+        assert_optimized_method_hir("test",  expect![[r#"
+            fn test@<compiled>:3:
+            bb0(v0:BasicObject):
+              PatchPoint SingleRactorMode
+              PatchPoint StableConstantNames(0x1000, C)
+              v20:Class[VALUE(0x1008)] = Const Value(VALUE(0x1008))
+              v4:NilClassExact = Const Value(nil)
+              v11:BasicObject = SendWithoutBlock v20, :new
+              Return v11
+        "#]]);
+    }
+
+    #[test]
+    fn test_opt_new_initialize() {
+        eval("
+            class C
+              def initialize x
+                @x = x
+              end
+            end
+            def test = C.new 1
+            test
+        ");
+        assert_optimized_method_hir("test",  expect![[r#"
+            fn test@<compiled>:7:
+            bb0(v0:BasicObject):
+              PatchPoint SingleRactorMode
+              PatchPoint StableConstantNames(0x1000, C)
+              v22:Class[VALUE(0x1008)] = Const Value(VALUE(0x1008))
+              v4:NilClassExact = Const Value(nil)
+              v5:Fixnum[1] = Const Value(1)
+              v13:BasicObject = SendWithoutBlock v22, :new, v5
+              Return v13
+        "#]]);
+    }
+
+    #[test]
+    fn test_opt_length() {
+        eval("
+            def test(a,b) = [a,b].length
+        ");
+        assert_optimized_method_hir("test",  expect![[r#"
+            fn test@<compiled>:2:
+            bb0(v0:BasicObject, v1:BasicObject, v2:BasicObject):
+              v5:ArrayExact = NewArray v1, v2
+              PatchPoint MethodRedefined(Array@0x1000, length@0x1008)
+              v10:Fixnum = CCall length@0x1010, v5
+              Return v10
+        "#]]);
+    }
+
+    #[test]
+    fn test_opt_size() {
+        eval("
+            def test(a,b) = [a,b].size
+        ");
+        assert_optimized_method_hir("test",  expect![[r#"
+            fn test@<compiled>:2:
+            bb0(v0:BasicObject, v1:BasicObject, v2:BasicObject):
+              v5:ArrayExact = NewArray v1, v2
+              PatchPoint MethodRedefined(Array@0x1000, size@0x1008)
+              v10:Fixnum = CCall size@0x1010, v5
+              Return v10
+        "#]]);
+    }
+
+    #[test]
+    fn test_getinstancevariable() {
+        eval("
+            def test = @foo
+        ");
+        assert_optimized_method_hir("test",  expect![[r#"
+            fn test@<compiled>:2:
+            bb0(v0:BasicObject):
+              v3:BasicObject = GetIvar v0, :@foo
+              Return v3
+        "#]]);
+    }
+
+    #[test]
+    fn test_setinstancevariable() {
+        eval("
+            def test = @foo = 1
+        ");
+        assert_optimized_method_hir("test",  expect![[r#"
+            fn test@<compiled>:2:
+            bb0(v0:BasicObject):
+              v2:Fixnum[1] = Const Value(1)
+              SetIvar v0, :@foo, v2
+              Return v2
+        "#]]);
+    }
+
+    #[test]
+    fn test_elide_freeze_with_frozen_hash() {
+        eval("
+            def test = {}.freeze
+        ");
+        assert_optimized_method_hir("test",  expect![[r#"
+            fn test@<compiled>:2:
+            bb0(v0:BasicObject):
+              v3:HashExact[VALUE(0x1000)] = Const Value(VALUE(0x1000))
+              PatchPoint BOPRedefined(HASH_REDEFINED_OP_FLAG, BOP_FREEZE)
+              Return v3
+        "#]]);
+    }
+
+    #[test]
+    fn test_elide_freeze_with_refrozen_hash() {
+        eval("
+            def test = {}.freeze.freeze
+        ");
+        assert_optimized_method_hir("test",  expect![[r#"
+            fn test@<compiled>:2:
+            bb0(v0:BasicObject):
+              v3:HashExact[VALUE(0x1000)] = Const Value(VALUE(0x1000))
+              PatchPoint BOPRedefined(HASH_REDEFINED_OP_FLAG, BOP_FREEZE)
+              PatchPoint BOPRedefined(HASH_REDEFINED_OP_FLAG, BOP_FREEZE)
+              Return v3
+        "#]]);
+    }
+
+    #[test]
+    fn test_no_elide_freeze_with_unfrozen_hash() {
+        eval("
+            def test = {}.dup.freeze
+        ");
+        assert_optimized_method_hir("test",  expect![[r#"
+            fn test@<compiled>:2:
+            bb0(v0:BasicObject):
+              v3:HashExact = NewHash
+              v5:BasicObject = SendWithoutBlock v3, :dup
+              v7:BasicObject = SendWithoutBlock v5, :freeze
+              Return v7
+        "#]]);
+    }
+
+    #[test]
+    fn test_no_elide_freeze_hash_with_args() {
+        eval("
+            def test = {}.freeze(nil)
+        ");
+        assert_optimized_method_hir("test",  expect![[r#"
+            fn test@<compiled>:2:
+            bb0(v0:BasicObject):
+              v3:HashExact = NewHash
+              v4:NilClassExact = Const Value(nil)
+              v6:BasicObject = SendWithoutBlock v3, :freeze, v4
+              Return v6
+        "#]]);
+    }
+
+    #[test]
+    fn test_elide_freeze_with_frozen_ary() {
+        eval("
+            def test = [].freeze
+        ");
+        assert_optimized_method_hir("test",  expect![[r#"
+            fn test@<compiled>:2:
+            bb0(v0:BasicObject):
+              v3:ArrayExact[VALUE(0x1000)] = Const Value(VALUE(0x1000))
+              PatchPoint BOPRedefined(ARRAY_REDEFINED_OP_FLAG, BOP_FREEZE)
+              Return v3
+        "#]]);
+    }
+
+    #[test]
+    fn test_elide_freeze_with_refrozen_ary() {
+        eval("
+            def test = [].freeze.freeze
+        ");
+        assert_optimized_method_hir("test",  expect![[r#"
+            fn test@<compiled>:2:
+            bb0(v0:BasicObject):
+              v3:ArrayExact[VALUE(0x1000)] = Const Value(VALUE(0x1000))
+              PatchPoint BOPRedefined(ARRAY_REDEFINED_OP_FLAG, BOP_FREEZE)
+              PatchPoint BOPRedefined(ARRAY_REDEFINED_OP_FLAG, BOP_FREEZE)
+              Return v3
+        "#]]);
+    }
+
+    #[test]
+    fn test_no_elide_freeze_with_unfrozen_ary() {
+        eval("
+            def test = [].dup.freeze
+        ");
+        assert_optimized_method_hir("test",  expect![[r#"
+            fn test@<compiled>:2:
+            bb0(v0:BasicObject):
+              v3:ArrayExact = NewArray
+              v5:BasicObject = SendWithoutBlock v3, :dup
+              v7:BasicObject = SendWithoutBlock v5, :freeze
+              Return v7
+        "#]]);
+    }
+
+    #[test]
+    fn test_no_elide_freeze_ary_with_args() {
+        eval("
+            def test = [].freeze(nil)
+        ");
+        assert_optimized_method_hir("test",  expect![[r#"
+            fn test@<compiled>:2:
+            bb0(v0:BasicObject):
+              v3:ArrayExact = NewArray
+              v4:NilClassExact = Const Value(nil)
+              v6:BasicObject = SendWithoutBlock v3, :freeze, v4
+              Return v6
+        "#]]);
+    }
+
+    #[test]
+    fn test_elide_freeze_with_frozen_str() {
+        eval("
+            def test = ''.freeze
+        ");
+        assert_optimized_method_hir("test",  expect![[r#"
+            fn test@<compiled>:2:
+            bb0(v0:BasicObject):
+              v3:StringExact[VALUE(0x1000)] = Const Value(VALUE(0x1000))
+              PatchPoint BOPRedefined(STRING_REDEFINED_OP_FLAG, BOP_FREEZE)
+              Return v3
+        "#]]);
+    }
+
+    #[test]
+    fn test_elide_freeze_with_refrozen_str() {
+        eval("
+            def test = ''.freeze.freeze
+        ");
+        assert_optimized_method_hir("test",  expect![[r#"
+            fn test@<compiled>:2:
+            bb0(v0:BasicObject):
+              v3:StringExact[VALUE(0x1000)] = Const Value(VALUE(0x1000))
+              PatchPoint BOPRedefined(STRING_REDEFINED_OP_FLAG, BOP_FREEZE)
+              PatchPoint BOPRedefined(STRING_REDEFINED_OP_FLAG, BOP_FREEZE)
+              Return v3
+        "#]]);
+    }
+
+    #[test]
+    fn test_no_elide_freeze_with_unfrozen_str() {
+        eval("
+            def test = ''.dup.freeze
+        ");
+        assert_optimized_method_hir("test",  expect![[r#"
+            fn test@<compiled>:2:
+            bb0(v0:BasicObject):
+              v2:StringExact[VALUE(0x1000)] = Const Value(VALUE(0x1000))
+              v3:StringExact = StringCopy v2
+              v5:BasicObject = SendWithoutBlock v3, :dup
+              v7:BasicObject = SendWithoutBlock v5, :freeze
+              Return v7
+        "#]]);
+    }
+
+    #[test]
+    fn test_no_elide_freeze_str_with_args() {
+        eval("
+            def test = ''.freeze(nil)
+        ");
+        assert_optimized_method_hir("test",  expect![[r#"
+            fn test@<compiled>:2:
+            bb0(v0:BasicObject):
+              v2:StringExact[VALUE(0x1000)] = Const Value(VALUE(0x1000))
+              v3:StringExact = StringCopy v2
+              v4:NilClassExact = Const Value(nil)
+              v6:BasicObject = SendWithoutBlock v3, :freeze, v4
+              Return v6
+        "#]]);
+    }
+
+    #[test]
+    fn test_elide_uminus_with_frozen_str() {
+        eval("
+            def test = -''
+        ");
+        assert_optimized_method_hir("test",  expect![[r#"
+            fn test@<compiled>:2:
+            bb0(v0:BasicObject):
+              v3:StringExact[VALUE(0x1000)] = Const Value(VALUE(0x1000))
+              PatchPoint BOPRedefined(STRING_REDEFINED_OP_FLAG, BOP_UMINUS)
+              Return v3
+        "#]]);
+    }
+
+    #[test]
+    fn test_elide_uminus_with_refrozen_str() {
+        eval("
+            def test = -''.freeze
+        ");
+        assert_optimized_method_hir("test",  expect![[r#"
+            fn test@<compiled>:2:
+            bb0(v0:BasicObject):
+              v3:StringExact[VALUE(0x1000)] = Const Value(VALUE(0x1000))
+              PatchPoint BOPRedefined(STRING_REDEFINED_OP_FLAG, BOP_FREEZE)
+              PatchPoint BOPRedefined(STRING_REDEFINED_OP_FLAG, BOP_UMINUS)
+              Return v3
+        "#]]);
+    }
+
+    #[test]
+    fn test_no_elide_uminus_with_unfrozen_str() {
+        eval("
+            def test = -''.dup
+        ");
+        assert_optimized_method_hir("test",  expect![[r#"
+            fn test@<compiled>:2:
+            bb0(v0:BasicObject):
+              v2:StringExact[VALUE(0x1000)] = Const Value(VALUE(0x1000))
+              v3:StringExact = StringCopy v2
+              v5:BasicObject = SendWithoutBlock v3, :dup
+              v7:BasicObject = SendWithoutBlock v5, :-@
+              Return v7
+        "#]]);
+    }
+
+    #[test]
+    fn test_objtostring_anytostring_string() {
+        eval(r##"
+            def test = "#{('foo')}"
+        "##);
+        assert_optimized_method_hir("test", expect![[r#"
+            fn test@<compiled>:2:
+            bb0(v0:BasicObject):
+              v2:StringExact[VALUE(0x1000)] = Const Value(VALUE(0x1000))
+              v3:StringExact[VALUE(0x1008)] = Const Value(VALUE(0x1008))
+              v4:StringExact = StringCopy v3
+              SideExit UnknownOpcode(concatstrings)
+        "#]]);
+    }
+
+    #[test]
+    fn test_objtostring_anytostring_with_non_string() {
+        eval(r##"
+            def test = "#{1}"
+        "##);
+        assert_optimized_method_hir("test", expect![[r#"
+            fn test@<compiled>:2:
+            bb0(v0:BasicObject):
+              v2:StringExact[VALUE(0x1000)] = Const Value(VALUE(0x1000))
+              v3:Fixnum[1] = Const Value(1)
+              v10:BasicObject = SendWithoutBlock v3, :to_s
+              v7:String = AnyToString v3, str: v10
+              SideExit UnknownOpcode(concatstrings)
+        "#]]);
+    }
+
+    #[test]
+    fn test_branchnil_nil() {
+        eval("
+            def test
+              x = nil
+              x&.itself
+            end
+        ");
+
+        assert_optimized_method_hir("test", expect![[r#"
+            fn test@<compiled>:3:
+            bb0(v0:BasicObject):
+              v3:NilClassExact = Const Value(nil)
+              Return v3
+        "#]]);
+    }
+
+    #[test]
+    fn test_branchnil_truthy() {
+        eval("
+            def test
+              x = 1
+              x&.itself
+            end
+        ");
+
+        assert_optimized_method_hir("test", expect![[r#"
+            fn test@<compiled>:3:
+            bb0(v0:BasicObject):
+              v3:Fixnum[1] = Const Value(1)
+              PatchPoint MethodRedefined(Integer@0x1000, itself@0x1008)
+              v15:BasicObject = CCall itself@0x1010, v3
+              Return v15
+        "#]]);
+    }
+
+    #[test]
+    fn test_eliminate_load_from_frozen_array_in_bounds() {
+        eval(r##"
+            def test = [4,5,6].freeze[1]
+        "##);
+        assert_optimized_method_hir("test", expect![[r#"
+            fn test@<compiled>:2:
+            bb0(v0:BasicObject):
+              v3:ArrayExact[VALUE(0x1000)] = Const Value(VALUE(0x1000))
+              PatchPoint BOPRedefined(ARRAY_REDEFINED_OP_FLAG, BOP_FREEZE)
+              v5:Fixnum[1] = Const Value(1)
+              PatchPoint BOPRedefined(ARRAY_REDEFINED_OP_FLAG, BOP_AREF)
+              v11:Fixnum[5] = Const Value(5)
+              Return v11
+        "#]]);
+    }
+
+    #[test]
+    fn test_eliminate_load_from_frozen_array_negative() {
+        eval(r##"
+            def test = [4,5,6].freeze[-3]
+        "##);
+        assert_optimized_method_hir("test", expect![[r#"
+            fn test@<compiled>:2:
+            bb0(v0:BasicObject):
+              v3:ArrayExact[VALUE(0x1000)] = Const Value(VALUE(0x1000))
+              PatchPoint BOPRedefined(ARRAY_REDEFINED_OP_FLAG, BOP_FREEZE)
+              v5:Fixnum[-3] = Const Value(-3)
+              PatchPoint BOPRedefined(ARRAY_REDEFINED_OP_FLAG, BOP_AREF)
+              v11:Fixnum[4] = Const Value(4)
+              Return v11
+        "#]]);
+    }
+
+    #[test]
+    fn test_eliminate_load_from_frozen_array_negative_out_of_bounds() {
+        eval(r##"
+            def test = [4,5,6].freeze[-10]
+        "##);
+        assert_optimized_method_hir("test", expect![[r#"
+            fn test@<compiled>:2:
+            bb0(v0:BasicObject):
+              v3:ArrayExact[VALUE(0x1000)] = Const Value(VALUE(0x1000))
+              PatchPoint BOPRedefined(ARRAY_REDEFINED_OP_FLAG, BOP_FREEZE)
+              v5:Fixnum[-10] = Const Value(-10)
+              PatchPoint BOPRedefined(ARRAY_REDEFINED_OP_FLAG, BOP_AREF)
+              v11:NilClassExact = Const Value(nil)
+              Return v11
+        "#]]);
+    }
+
+    #[test]
+    fn test_eliminate_load_from_frozen_array_out_of_bounds() {
+        eval(r##"
+            def test = [4,5,6].freeze[10]
+        "##);
+        assert_optimized_method_hir("test", expect![[r#"
+            fn test@<compiled>:2:
+            bb0(v0:BasicObject):
+              v3:ArrayExact[VALUE(0x1000)] = Const Value(VALUE(0x1000))
+              PatchPoint BOPRedefined(ARRAY_REDEFINED_OP_FLAG, BOP_FREEZE)
+              v5:Fixnum[10] = Const Value(10)
+              PatchPoint BOPRedefined(ARRAY_REDEFINED_OP_FLAG, BOP_AREF)
+              v11:NilClassExact = Const Value(nil)
+              Return v11
+        "#]]);
+    }
+
+    #[test]
+    fn test_set_type_from_constant() {
+        eval("
+            MY_SET = Set.new
+
+            def test = MY_SET
+
+            test
+            test
+        ");
+        assert_optimized_method_hir("test", expect![[r#"
+            fn test@<compiled>:4:
+            bb0(v0:BasicObject):
+              PatchPoint SingleRactorMode
+              PatchPoint StableConstantNames(0x1000, MY_SET)
+              v7:SetExact[VALUE(0x1008)] = Const Value(VALUE(0x1008))
+              Return v7
+        "#]]);
+    }
+
+    #[test]
+    fn test_regexp_type() {
+        eval("
+            def test = /a/
+        ");
+        assert_optimized_method_hir("test", expect![[r#"
+            fn test@<compiled>:2:
+            bb0(v0:BasicObject):
+              v2:RegexpExact[VALUE(0x1000)] = Const Value(VALUE(0x1000))
+              Return v2
+        "#]]);
+    }
+
+    #[test]
+    fn test_nil_nil_specialized_to_ccall() {
+        eval("
+            def test = nil.nil?
+        ");
+        assert_optimized_method_hir("test", expect![[r#"
+            fn test@<compiled>:2:
+            bb0(v0:BasicObject):
+              v2:NilClassExact = Const Value(nil)
+              PatchPoint MethodRedefined(NilClass@0x1000, nil?@0x1008)
+              v7:TrueClassExact = CCall nil?@0x1010, v2
+              Return v7
+        "#]]);
+    }
+
+    #[test]
+    fn test_eliminate_nil_nil_specialized_to_ccall() {
+        eval("
+            def test
+              nil.nil?
+              1
+            end
+        ");
+        assert_optimized_method_hir("test", expect![[r#"
+            fn test@<compiled>:3:
+            bb0(v0:BasicObject):
+              v2:NilClassExact = Const Value(nil)
+              PatchPoint MethodRedefined(NilClass@0x1000, nil?@0x1008)
+              v5:Fixnum[1] = Const Value(1)
+              Return v5
+        "#]]);
+    }
+
+    #[test]
+    fn test_non_nil_nil_specialized_to_ccall() {
+        eval("
+            def test = 1.nil?
+        ");
+        assert_optimized_method_hir("test", expect![[r#"
+            fn test@<compiled>:2:
+            bb0(v0:BasicObject):
+              v2:Fixnum[1] = Const Value(1)
+              PatchPoint MethodRedefined(Integer@0x1000, nil?@0x1008)
+              v7:FalseClassExact = CCall nil?@0x1010, v2
+              Return v7
+        "#]]);
+    }
+
+    #[test]
+    fn test_eliminate_non_nil_nil_specialized_to_ccall() {
+        eval("
+            def test
+              1.nil?
+              2
+            end
+        ");
+        assert_optimized_method_hir("test", expect![[r#"
+            fn test@<compiled>:3:
+            bb0(v0:BasicObject):
+              v2:Fixnum[1] = Const Value(1)
+              PatchPoint MethodRedefined(Integer@0x1000, nil?@0x1008)
+              v5:Fixnum[2] = Const Value(2)
+              Return v5
+        "#]]);
+    }
+
+    #[test]
+    fn test_guard_nil_for_nil_opt() {
+        eval("
+            def test(val) = val.nil?
+
+            test(nil)
+        ");
+        assert_optimized_method_hir("test", expect![[r#"
+            fn test@<compiled>:2:
+            bb0(v0:BasicObject, v1:BasicObject):
+              PatchPoint MethodRedefined(NilClass@0x1000, nil?@0x1008)
+              v7:NilClassExact = GuardType v1, NilClassExact
+              v8:TrueClassExact = CCall nil?@0x1010, v7
+              Return v8
+        "#]]);
+    }
+
+    #[test]
+    fn test_guard_false_for_nil_opt() {
+        eval("
+            def test(val) = val.nil?
+
+            test(false)
+        ");
+        assert_optimized_method_hir("test", expect![[r#"
+            fn test@<compiled>:2:
+            bb0(v0:BasicObject, v1:BasicObject):
+              PatchPoint MethodRedefined(FalseClass@0x1000, nil?@0x1008)
+              v7:FalseClassExact = GuardType v1, FalseClassExact
+              v8:FalseClassExact = CCall nil?@0x1010, v7
+              Return v8
+        "#]]);
+    }
+
+    #[test]
+    fn test_guard_true_for_nil_opt() {
+        eval("
+            def test(val) = val.nil?
+
+            test(true)
+        ");
+        assert_optimized_method_hir("test", expect![[r#"
+            fn test@<compiled>:2:
+            bb0(v0:BasicObject, v1:BasicObject):
+              PatchPoint MethodRedefined(TrueClass@0x1000, nil?@0x1008)
+              v7:TrueClassExact = GuardType v1, TrueClassExact
+              v8:FalseClassExact = CCall nil?@0x1010, v7
+              Return v8
+        "#]]);
+    }
+
+    #[test]
+    fn test_guard_symbol_for_nil_opt() {
+        eval("
+            def test(val) = val.nil?
+
+            test(:foo)
+        ");
+        assert_optimized_method_hir("test", expect![[r#"
+            fn test@<compiled>:2:
+            bb0(v0:BasicObject, v1:BasicObject):
+              PatchPoint MethodRedefined(Symbol@0x1000, nil?@0x1008)
+              v7:StaticSymbol = GuardType v1, StaticSymbol
+              v8:FalseClassExact = CCall nil?@0x1010, v7
+              Return v8
+        "#]]);
+    }
+
+    #[test]
+    fn test_guard_fixnum_for_nil_opt() {
+        eval("
+            def test(val) = val.nil?
+
+            test(1)
+        ");
+        assert_optimized_method_hir("test", expect![[r#"
+            fn test@<compiled>:2:
+            bb0(v0:BasicObject, v1:BasicObject):
+              PatchPoint MethodRedefined(Integer@0x1000, nil?@0x1008)
+              v7:Fixnum = GuardType v1, Fixnum
+              v8:FalseClassExact = CCall nil?@0x1010, v7
+              Return v8
+        "#]]);
+    }
+
+    #[test]
+    fn test_guard_float_for_nil_opt() {
+        eval("
+            def test(val) = val.nil?
+
+            test(1.0)
+        ");
+        assert_optimized_method_hir("test", expect![[r#"
+            fn test@<compiled>:2:
+            bb0(v0:BasicObject, v1:BasicObject):
+              PatchPoint MethodRedefined(Float@0x1000, nil?@0x1008)
+              v7:Flonum = GuardType v1, Flonum
+              v8:FalseClassExact = CCall nil?@0x1010, v7
+              Return v8
+        "#]]);
+    }
+
+    #[test]
+    fn test_guard_string_for_nil_opt() {
+        eval("
+            def test(val) = val.nil?
+
+            test('foo')
+        ");
+        assert_optimized_method_hir("test", expect![[r#"
+            fn test@<compiled>:2:
+            bb0(v0:BasicObject, v1:BasicObject):
+              PatchPoint MethodRedefined(String@0x1000, nil?@0x1008)
+              v7:StringExact = GuardType v1, StringExact
+              v8:FalseClassExact = CCall nil?@0x1010, v7
+              Return v8
+        "#]]);
+    }
+
+    #[test]
+    fn test_guard_fixnum_and_fixnum() {
+        eval("
+            def test(x, y) = x & y
+
+            test(1, 2)
+        ");
+        assert_optimized_method_hir("test", expect![[r#"
+            fn test@<compiled>:2:
+            bb0(v0:BasicObject, v1:BasicObject, v2:BasicObject):
+              PatchPoint BOPRedefined(INTEGER_REDEFINED_OP_FLAG, 28)
+              v8:Fixnum = GuardType v1, Fixnum
+              v9:Fixnum = GuardType v2, Fixnum
+              v10:Fixnum = FixnumAnd v8, v9
+              Return v10
+        "#]]);
+    }
+
+    #[test]
+    fn test_guard_fixnum_or_fixnum() {
+        eval("
+            def test(x, y) = x | y
+
+            test(1, 2)
+        ");
+        assert_optimized_method_hir("test", expect![[r#"
+            fn test@<compiled>:2:
+            bb0(v0:BasicObject, v1:BasicObject, v2:BasicObject):
+              PatchPoint BOPRedefined(INTEGER_REDEFINED_OP_FLAG, 29)
+              v8:Fixnum = GuardType v1, Fixnum
+              v9:Fixnum = GuardType v2, Fixnum
+              v10:Fixnum = FixnumOr v8, v9
+              Return v10
+        "#]]);
+    }
+}
diff --git a/zjit/src/hir_type/gen_hir_type.rb b/zjit/src/hir_type/gen_hir_type.rb
new file mode 100644
index 00000000000000..361026e101a939
--- /dev/null
+++ b/zjit/src/hir_type/gen_hir_type.rb
@@ -0,0 +1,177 @@
+# Generate hir_type.inc.rs. To do this, we build up a DAG that
+# represents a slice of the Ruby type hierarchy that we care about optimizing.
+# This also includes cvalue values such as C booleans, int32, and so on.
+
+require 'set'
+
+# Type represents not just a Ruby class but a named union of other types.
+class Type
+  attr_accessor :name, :subtypes
+
+  def initialize name, subtypes=nil
+    @name = name
+    @subtypes = subtypes || []
+  end
+
+  def all_subtypes
+    subtypes.flat_map { |subtype| subtype.all_subtypes } + subtypes
+  end
+
+  def subtype name
+    result = Type.new name
+    @subtypes << result
+    result
+  end
+end
+
+# Helper to generate graphviz.
+def to_graphviz_rec type
+  type.subtypes.each {|subtype|
+    puts type.name + "->" + subtype.name + ";"
+  }
+  type.subtypes.each {|subtype|
+    to_graphviz_rec subtype
+  }
+end
+
+# Generate graphviz.
+def to_graphviz type
+  puts "digraph G {"
+  to_graphviz_rec type
+  puts "}"
+end
+
+# ===== Start generating the type DAG =====
+
+# Start at Any. All types are subtypes of Any.
+any = Type.new "Any"
+# Build the Ruby object universe.
+value = any.subtype "RubyValue"
+undef_ = value.subtype "Undef"
+value.subtype "CallableMethodEntry"  # rb_callable_method_entry_t*
+basic_object = value.subtype "BasicObject"
+basic_object_exact = basic_object.subtype "BasicObjectExact"
+basic_object_subclass = basic_object.subtype "BasicObjectSubclass"
+$object = basic_object.subtype "Object"
+object_exact = $object.subtype "ObjectExact"
+object_subclass = $object.subtype "ObjectSubclass"
+$subclass = [basic_object_subclass.name, object_subclass.name]
+$builtin_exact = [basic_object_exact.name, object_exact.name]
+
+# Define a new type that can be subclassed (most of them).
+def base_type name
+  type = $object.subtype name
+  exact = type.subtype(name+"Exact")
+  subclass = type.subtype(name+"Subclass")
+  $builtin_exact << exact.name
+  $subclass << subclass.name
+  [type, exact]
+end
+
+base_type "String"
+base_type "Array"
+base_type "Hash"
+base_type "Range"
+base_type "Set"
+base_type "Regexp"
+module_class, _ = base_type "Module"
+module_class.subtype "Class"
+
+_, integer_exact = base_type "Integer"
+# CRuby partitions Integer into immediate and non-immediate variants.
+fixnum = integer_exact.subtype "Fixnum"
+integer_exact.subtype "Bignum"
+
+_, float_exact = base_type "Float"
+# CRuby partitions Float into immediate and non-immediate variants.
+flonum = float_exact.subtype "Flonum"
+float_exact.subtype "HeapFloat"
+
+_, symbol_exact = base_type "Symbol"
+# CRuby partitions Symbol into immediate and non-immediate variants.
+static_sym = symbol_exact.subtype "StaticSymbol"
+symbol_exact.subtype "DynamicSymbol"
+
+_, nil_exact = base_type "NilClass"
+_, true_exact = base_type "TrueClass"
+_, false_exact = base_type "FalseClass"
+
+# Build the cvalue object universe. This is for C-level types that may be
+# passed around when calling into the Ruby VM or after some strength reduction
+# of HIR.
+cvalue = any.subtype "CValue"
+cvalue.subtype "CBool"
+cvalue.subtype "CPtr"
+cvalue.subtype "CDouble"
+cvalue.subtype "CNull"
+cvalue_int = cvalue.subtype "CInt"
+signed = cvalue_int.subtype "CSigned"
+unsigned = cvalue_int.subtype "CUnsigned"
+[8, 16, 32, 64].each {|width|
+  signed.subtype "CInt#{width}"
+  unsigned.subtype "CUInt#{width}"
+}
+
+# Assign individual bits to type leaves and union bit patterns to nodes with subtypes
+num_bits = 0
+$bits = {"Empty" => ["0u64"]}
+$numeric_bits = {"Empty" => 0}
+Set[any, *any.all_subtypes].sort_by(&:name).each {|type|
+  subtypes = type.subtypes
+  if subtypes.empty?
+    # Assign bits for leaves
+    $bits[type.name] = ["1u64 << #{num_bits}"]
+    $numeric_bits[type.name] = 1 << num_bits
+    num_bits += 1
+  else
+    # Assign bits for unions
+    $bits[type.name] = subtypes.map(&:name).sort
+  end
+}
+[*any.all_subtypes, any].each {|type|
+  subtypes = type.subtypes
+  unless subtypes.empty?
+    $numeric_bits[type.name] = subtypes.map {|ty| $numeric_bits[ty.name]}.reduce(&:|)
+  end
+}
+
+# Unions are for names of groups of type bit patterns that don't fit neatly
+# into the Ruby class hierarchy. For example, we might want to refer to a union
+# of TrueClassExact|FalseClassExact by the name BoolExact even though a "bool"
+# doesn't exist as a class in Ruby.
+def add_union name, type_names
+  type_names = type_names.sort
+  $bits[name] = type_names
+  $numeric_bits[name] = type_names.map {|type_name| $numeric_bits[type_name]}.reduce(&:|)
+end
+
+add_union "BuiltinExact", $builtin_exact
+add_union "Subclass", $subclass
+add_union "BoolExact", [true_exact.name, false_exact.name]
+add_union "Immediate", [fixnum.name, flonum.name, static_sym.name, nil_exact.name, true_exact.name, false_exact.name, undef_.name]
+
+# ===== Finished generating the DAG; write Rust code =====
+
+puts "// This file is @generated by src/hir_type/gen_hir_type.rb."
+puts "mod bits {"
+$bits.keys.sort.map {|type_name|
+  subtypes = $bits[type_name].join(" | ")
+  puts "  pub const #{type_name}: u64 = #{subtypes};"
+}
+puts "  pub const AllBitPatterns: [(&'static str, u64); #{$bits.size}] = ["
+# Sort the bit patterns by decreasing value so that we can print the densest
+# possible to-string representation of a Type. For example, CSigned instead of
+# CInt8|CInt16|...
+$numeric_bits.sort_by {|key, val| -val}.each {|type_name, _|
+  puts "    (\"#{type_name}\", #{type_name}),"
+}
+puts "  ];"
+puts "  pub const NumTypeBits: u64 = #{num_bits};
+}"
+
+puts "pub mod types {
+  use super::*;"
+$bits.keys.sort.map {|type_name|
+    puts "  pub const #{type_name}: Type = Type::from_bits(bits::#{type_name});"
+}
+puts "}"
diff --git a/zjit/src/hir_type/hir_type.inc.rs b/zjit/src/hir_type/hir_type.inc.rs
new file mode 100644
index 00000000000000..21ef8c8bdd4a03
--- /dev/null
+++ b/zjit/src/hir_type/hir_type.inc.rs
@@ -0,0 +1,240 @@
+// This file is @generated by src/hir_type/gen_hir_type.rb.
+mod bits {
+  pub const Any: u64 = CValue | RubyValue;
+  pub const Array: u64 = ArrayExact | ArraySubclass;
+  pub const ArrayExact: u64 = 1u64 << 0;
+  pub const ArraySubclass: u64 = 1u64 << 1;
+  pub const BasicObject: u64 = BasicObjectExact | BasicObjectSubclass | Object;
+  pub const BasicObjectExact: u64 = 1u64 << 2;
+  pub const BasicObjectSubclass: u64 = 1u64 << 3;
+  pub const Bignum: u64 = 1u64 << 4;
+  pub const BoolExact: u64 = FalseClassExact | TrueClassExact;
+  pub const BuiltinExact: u64 = ArrayExact | BasicObjectExact | FalseClassExact | FloatExact | HashExact | IntegerExact | ModuleExact | NilClassExact | ObjectExact | RangeExact | RegexpExact | SetExact | StringExact | SymbolExact | TrueClassExact;
+  pub const CBool: u64 = 1u64 << 5;
+  pub const CDouble: u64 = 1u64 << 6;
+  pub const CInt: u64 = CSigned | CUnsigned;
+  pub const CInt16: u64 = 1u64 << 7;
+  pub const CInt32: u64 = 1u64 << 8;
+  pub const CInt64: u64 = 1u64 << 9;
+  pub const CInt8: u64 = 1u64 << 10;
+  pub const CNull: u64 = 1u64 << 11;
+  pub const CPtr: u64 = 1u64 << 12;
+  pub const CSigned: u64 = CInt16 | CInt32 | CInt64 | CInt8;
+  pub const CUInt16: u64 = 1u64 << 13;
+  pub const CUInt32: u64 = 1u64 << 14;
+  pub const CUInt64: u64 = 1u64 << 15;
+  pub const CUInt8: u64 = 1u64 << 16;
+  pub const CUnsigned: u64 = CUInt16 | CUInt32 | CUInt64 | CUInt8;
+  pub const CValue: u64 = CBool | CDouble | CInt | CNull | CPtr;
+  pub const CallableMethodEntry: u64 = 1u64 << 17;
+  pub const Class: u64 = 1u64 << 18;
+  pub const DynamicSymbol: u64 = 1u64 << 19;
+  pub const Empty: u64 = 0u64;
+  pub const FalseClass: u64 = FalseClassExact | FalseClassSubclass;
+  pub const FalseClassExact: u64 = 1u64 << 20;
+  pub const FalseClassSubclass: u64 = 1u64 << 21;
+  pub const Fixnum: u64 = 1u64 << 22;
+  pub const Float: u64 = FloatExact | FloatSubclass;
+  pub const FloatExact: u64 = Flonum | HeapFloat;
+  pub const FloatSubclass: u64 = 1u64 << 23;
+  pub const Flonum: u64 = 1u64 << 24;
+  pub const Hash: u64 = HashExact | HashSubclass;
+  pub const HashExact: u64 = 1u64 << 25;
+  pub const HashSubclass: u64 = 1u64 << 26;
+  pub const HeapFloat: u64 = 1u64 << 27;
+  pub const Immediate: u64 = FalseClassExact | Fixnum | Flonum | NilClassExact | StaticSymbol | TrueClassExact | Undef;
+  pub const Integer: u64 = IntegerExact | IntegerSubclass;
+  pub const IntegerExact: u64 = Bignum | Fixnum;
+  pub const IntegerSubclass: u64 = 1u64 << 28;
+  pub const Module: u64 = Class | ModuleExact | ModuleSubclass;
+  pub const ModuleExact: u64 = 1u64 << 29;
+  pub const ModuleSubclass: u64 = 1u64 << 30;
+  pub const NilClass: u64 = NilClassExact | NilClassSubclass;
+  pub const NilClassExact: u64 = 1u64 << 31;
+  pub const NilClassSubclass: u64 = 1u64 << 32;
+  pub const Object: u64 = Array | FalseClass | Float | Hash | Integer | Module | NilClass | ObjectExact | ObjectSubclass | Range | Regexp | Set | String | Symbol | TrueClass;
+  pub const ObjectExact: u64 = 1u64 << 33;
+  pub const ObjectSubclass: u64 = 1u64 << 34;
+  pub const Range: u64 = RangeExact | RangeSubclass;
+  pub const RangeExact: u64 = 1u64 << 35;
+  pub const RangeSubclass: u64 = 1u64 << 36;
+  pub const Regexp: u64 = RegexpExact | RegexpSubclass;
+  pub const RegexpExact: u64 = 1u64 << 37;
+  pub const RegexpSubclass: u64 = 1u64 << 38;
+  pub const RubyValue: u64 = BasicObject | CallableMethodEntry | Undef;
+  pub const Set: u64 = SetExact | SetSubclass;
+  pub const SetExact: u64 = 1u64 << 39;
+  pub const SetSubclass: u64 = 1u64 << 40;
+  pub const StaticSymbol: u64 = 1u64 << 41;
+  pub const String: u64 = StringExact | StringSubclass;
+  pub const StringExact: u64 = 1u64 << 42;
+  pub const StringSubclass: u64 = 1u64 << 43;
+  pub const Subclass: u64 = ArraySubclass | BasicObjectSubclass | FalseClassSubclass | FloatSubclass | HashSubclass | IntegerSubclass | ModuleSubclass | NilClassSubclass | ObjectSubclass | RangeSubclass | RegexpSubclass | SetSubclass | StringSubclass | SymbolSubclass | TrueClassSubclass;
+  pub const Symbol: u64 = SymbolExact | SymbolSubclass;
+  pub const SymbolExact: u64 = DynamicSymbol | StaticSymbol;
+  pub const SymbolSubclass: u64 = 1u64 << 44;
+  pub const TrueClass: u64 = TrueClassExact | TrueClassSubclass;
+  pub const TrueClassExact: u64 = 1u64 << 45;
+  pub const TrueClassSubclass: u64 = 1u64 << 46;
+  pub const Undef: u64 = 1u64 << 47;
+  pub const AllBitPatterns: [(&'static str, u64); 77] = [
+    ("Any", Any),
+    ("RubyValue", RubyValue),
+    ("Immediate", Immediate),
+    ("Undef", Undef),
+    ("BasicObject", BasicObject),
+    ("Object", Object),
+    ("TrueClass", TrueClass),
+    ("Subclass", Subclass),
+    ("TrueClassSubclass", TrueClassSubclass),
+    ("BuiltinExact", BuiltinExact),
+    ("BoolExact", BoolExact),
+    ("TrueClassExact", TrueClassExact),
+    ("Symbol", Symbol),
+    ("SymbolSubclass", SymbolSubclass),
+    ("String", String),
+    ("StringSubclass", StringSubclass),
+    ("StringExact", StringExact),
+    ("SymbolExact", SymbolExact),
+    ("StaticSymbol", StaticSymbol),
+    ("Set", Set),
+    ("SetSubclass", SetSubclass),
+    ("SetExact", SetExact),
+    ("Regexp", Regexp),
+    ("RegexpSubclass", RegexpSubclass),
+    ("RegexpExact", RegexpExact),
+    ("Range", Range),
+    ("RangeSubclass", RangeSubclass),
+    ("RangeExact", RangeExact),
+    ("ObjectSubclass", ObjectSubclass),
+    ("ObjectExact", ObjectExact),
+    ("NilClass", NilClass),
+    ("NilClassSubclass", NilClassSubclass),
+    ("NilClassExact", NilClassExact),
+    ("Module", Module),
+    ("ModuleSubclass", ModuleSubclass),
+    ("ModuleExact", ModuleExact),
+    ("Integer", Integer),
+    ("IntegerSubclass", IntegerSubclass),
+    ("Float", Float),
+    ("FloatExact", FloatExact),
+    ("HeapFloat", HeapFloat),
+    ("Hash", Hash),
+    ("HashSubclass", HashSubclass),
+    ("HashExact", HashExact),
+    ("Flonum", Flonum),
+    ("FloatSubclass", FloatSubclass),
+    ("IntegerExact", IntegerExact),
+    ("Fixnum", Fixnum),
+    ("FalseClass", FalseClass),
+    ("FalseClassSubclass", FalseClassSubclass),
+    ("FalseClassExact", FalseClassExact),
+    ("DynamicSymbol", DynamicSymbol),
+    ("Class", Class),
+    ("CallableMethodEntry", CallableMethodEntry),
+    ("CValue", CValue),
+    ("CInt", CInt),
+    ("CUnsigned", CUnsigned),
+    ("CUInt8", CUInt8),
+    ("CUInt64", CUInt64),
+    ("CUInt32", CUInt32),
+    ("CUInt16", CUInt16),
+    ("CPtr", CPtr),
+    ("CNull", CNull),
+    ("CSigned", CSigned),
+    ("CInt8", CInt8),
+    ("CInt64", CInt64),
+    ("CInt32", CInt32),
+    ("CInt16", CInt16),
+    ("CDouble", CDouble),
+    ("CBool", CBool),
+    ("Bignum", Bignum),
+    ("BasicObjectSubclass", BasicObjectSubclass),
+    ("BasicObjectExact", BasicObjectExact),
+    ("Array", Array),
+    ("ArraySubclass", ArraySubclass),
+    ("ArrayExact", ArrayExact),
+    ("Empty", Empty),
+  ];
+  pub const NumTypeBits: u64 = 48;
+}
+pub mod types {
+  use super::*;
+  pub const Any: Type = Type::from_bits(bits::Any);
+  pub const Array: Type = Type::from_bits(bits::Array);
+  pub const ArrayExact: Type = Type::from_bits(bits::ArrayExact);
+  pub const ArraySubclass: Type = Type::from_bits(bits::ArraySubclass);
+  pub const BasicObject: Type = Type::from_bits(bits::BasicObject);
+  pub const BasicObjectExact: Type = Type::from_bits(bits::BasicObjectExact);
+  pub const BasicObjectSubclass: Type = Type::from_bits(bits::BasicObjectSubclass);
+  pub const Bignum: Type = Type::from_bits(bits::Bignum);
+  pub const BoolExact: Type = Type::from_bits(bits::BoolExact);
+  pub const BuiltinExact: Type = Type::from_bits(bits::BuiltinExact);
+  pub const CBool: Type = Type::from_bits(bits::CBool);
+  pub const CDouble: Type = Type::from_bits(bits::CDouble);
+  pub const CInt: Type = Type::from_bits(bits::CInt);
+  pub const CInt16: Type = Type::from_bits(bits::CInt16);
+  pub const CInt32: Type = Type::from_bits(bits::CInt32);
+  pub const CInt64: Type = Type::from_bits(bits::CInt64);
+  pub const CInt8: Type = Type::from_bits(bits::CInt8);
+  pub const CNull: Type = Type::from_bits(bits::CNull);
+  pub const CPtr: Type = Type::from_bits(bits::CPtr);
+  pub const CSigned: Type = Type::from_bits(bits::CSigned);
+  pub const CUInt16: Type = Type::from_bits(bits::CUInt16);
+  pub const CUInt32: Type = Type::from_bits(bits::CUInt32);
+  pub const CUInt64: Type = Type::from_bits(bits::CUInt64);
+  pub const CUInt8: Type = Type::from_bits(bits::CUInt8);
+  pub const CUnsigned: Type = Type::from_bits(bits::CUnsigned);
+  pub const CValue: Type = Type::from_bits(bits::CValue);
+  pub const CallableMethodEntry: Type = Type::from_bits(bits::CallableMethodEntry);
+  pub const Class: Type = Type::from_bits(bits::Class);
+  pub const DynamicSymbol: Type = Type::from_bits(bits::DynamicSymbol);
+  pub const Empty: Type = Type::from_bits(bits::Empty);
+  pub const FalseClass: Type = Type::from_bits(bits::FalseClass);
+  pub const FalseClassExact: Type = Type::from_bits(bits::FalseClassExact);
+  pub const FalseClassSubclass: Type = Type::from_bits(bits::FalseClassSubclass);
+  pub const Fixnum: Type = Type::from_bits(bits::Fixnum);
+  pub const Float: Type = Type::from_bits(bits::Float);
+  pub const FloatExact: Type = Type::from_bits(bits::FloatExact);
+  pub const FloatSubclass: Type = Type::from_bits(bits::FloatSubclass);
+  pub const Flonum: Type = Type::from_bits(bits::Flonum);
+  pub const Hash: Type = Type::from_bits(bits::Hash);
+  pub const HashExact: Type = Type::from_bits(bits::HashExact);
+  pub const HashSubclass: Type = Type::from_bits(bits::HashSubclass);
+  pub const HeapFloat: Type = Type::from_bits(bits::HeapFloat);
+  pub const Immediate: Type = Type::from_bits(bits::Immediate);
+  pub const Integer: Type = Type::from_bits(bits::Integer);
+  pub const IntegerExact: Type = Type::from_bits(bits::IntegerExact);
+  pub const IntegerSubclass: Type = Type::from_bits(bits::IntegerSubclass);
+  pub const Module: Type = Type::from_bits(bits::Module);
+  pub const ModuleExact: Type = Type::from_bits(bits::ModuleExact);
+  pub const ModuleSubclass: Type = Type::from_bits(bits::ModuleSubclass);
+  pub const NilClass: Type = Type::from_bits(bits::NilClass);
+  pub const NilClassExact: Type = Type::from_bits(bits::NilClassExact);
+  pub const NilClassSubclass: Type = Type::from_bits(bits::NilClassSubclass);
+  pub const Object: Type = Type::from_bits(bits::Object);
+  pub const ObjectExact: Type = Type::from_bits(bits::ObjectExact);
+  pub const ObjectSubclass: Type = Type::from_bits(bits::ObjectSubclass);
+  pub const Range: Type = Type::from_bits(bits::Range);
+  pub const RangeExact: Type = Type::from_bits(bits::RangeExact);
+  pub const RangeSubclass: Type = Type::from_bits(bits::RangeSubclass);
+  pub const Regexp: Type = Type::from_bits(bits::Regexp);
+  pub const RegexpExact: Type = Type::from_bits(bits::RegexpExact);
+  pub const RegexpSubclass: Type = Type::from_bits(bits::RegexpSubclass);
+  pub const RubyValue: Type = Type::from_bits(bits::RubyValue);
+  pub const Set: Type = Type::from_bits(bits::Set);
+  pub const SetExact: Type = Type::from_bits(bits::SetExact);
+  pub const SetSubclass: Type = Type::from_bits(bits::SetSubclass);
+  pub const StaticSymbol: Type = Type::from_bits(bits::StaticSymbol);
+  pub const String: Type = Type::from_bits(bits::String);
+  pub const StringExact: Type = Type::from_bits(bits::StringExact);
+  pub const StringSubclass: Type = Type::from_bits(bits::StringSubclass);
+  pub const Subclass: Type = Type::from_bits(bits::Subclass);
+  pub const Symbol: Type = Type::from_bits(bits::Symbol);
+  pub const SymbolExact: Type = Type::from_bits(bits::SymbolExact);
+  pub const SymbolSubclass: Type = Type::from_bits(bits::SymbolSubclass);
+  pub const TrueClass: Type = Type::from_bits(bits::TrueClass);
+  pub const TrueClassExact: Type = Type::from_bits(bits::TrueClassExact);
+  pub const TrueClassSubclass: Type = Type::from_bits(bits::TrueClassSubclass);
+  pub const Undef: Type = Type::from_bits(bits::Undef);
+}
diff --git a/zjit/src/hir_type/mod.rs b/zjit/src/hir_type/mod.rs
new file mode 100644
index 00000000000000..35d8866844d167
--- /dev/null
+++ b/zjit/src/hir_type/mod.rs
@@ -0,0 +1,805 @@
+#![allow(non_upper_case_globals)]
+use crate::cruby::{Qfalse, Qnil, Qtrue, VALUE, RUBY_T_ARRAY, RUBY_T_STRING, RUBY_T_HASH, RUBY_T_CLASS, RUBY_T_MODULE};
+use crate::cruby::{rb_cInteger, rb_cFloat, rb_cArray, rb_cHash, rb_cString, rb_cSymbol, rb_cObject, rb_cTrueClass, rb_cFalseClass, rb_cNilClass, rb_cRange, rb_cSet, rb_cRegexp, rb_cClass, rb_cModule};
+use crate::cruby::ClassRelationship;
+use crate::cruby::get_class_name;
+use crate::cruby::ruby_sym_to_rust_string;
+use crate::cruby::rb_mRubyVMFrozenCore;
+use crate::cruby::rb_obj_class;
+use crate::hir::PtrPrintMap;
+
+#[derive(Copy, Clone, Debug, PartialEq)]
+/// Specialization of the type. If we know additional information about the object, we put it here.
+/// This includes information about its value as a cvalue. For Ruby objects, type specialization
+/// is split into three sub-cases:
+///
+/// * Object, where we know exactly what object (pointer) the Type corresponds to
+/// * Type exact, where we know exactly what class the Type represents (which could be because we
+///   have an instance of it; includes Object specialization)
+/// * Type, where we know that the Type could represent the given class or any of its subclasses
+///
+/// It is also a lattice but a much shallower one. It is not meant to be used directly, just by
+/// Type internals.
+pub enum Specialization {
+    /// We know nothing about the specialization of this Type.
+    Any,
+    /// We know that this Type is an instance of the given Ruby class in the VALUE or any of its subclasses.
+    Type(VALUE),
+    /// We know that this Type is an instance of exactly the Ruby class in the VALUE.
+    TypeExact(VALUE),
+    /// We know that this Type is exactly the Ruby object in the VALUE.
+    Object(VALUE),
+    /// We know that this Type is exactly the given cvalue/C integer value (use the type bits to
+    /// inform how we should interpret the u64, e.g. as CBool or CInt32).
+    Int(u64),
+    /// We know that this Type is exactly the given cvalue/C double.
+    Double(f64),
+    /// We know that the Type is [`types::Empty`] and therefore the instruction that produces this
+    /// value never returns.
+    Empty,
+}
+
+// NOTE: Type very intentionally does not support Eq or PartialEq; we almost never want to check
+// bit equality of types in the compiler but instead check subtyping, intersection, union, etc.
+#[derive(Copy, Clone, Debug)]
+/// The main work horse of intraprocedural type inference and specialization. The main interfaces
+/// will look like:
+///
+/// * is type A a subset of type B
+/// * union/meet type A and type B
+///
+/// Most questions can be rewritten in terms of these operations.
+pub struct Type {
+    /// A bitset representing type information about the object. Specific bits are assigned for
+    /// leaf types (for example, static symbols) and union-ing bitsets together represents
+    /// union-ing sets of types. These sets form a lattice (with Any as "could be anything" and
+    /// Empty as "can be nothing").
+    ///
+    /// Capable of also representing cvalue types (bool, i32, etc).
+    ///
+    /// This field should not be directly read or written except by internal `Type` APIs.
+    bits: u64,
+    /// Specialization of the type. See [`Specialization`].
+    ///
+    /// This field should not be directly read or written except by internal `Type` APIs.
+    spec: Specialization
+}
+
+include!("hir_type.inc.rs");
+
+fn write_spec(f: &mut std::fmt::Formatter, printer: &TypePrinter) -> std::fmt::Result {
+    let ty = printer.inner;
+    match ty.spec {
+        Specialization::Any | Specialization::Empty => { Ok(()) },
+        Specialization::Object(val) if val == unsafe { rb_mRubyVMFrozenCore } => write!(f, "[VMFrozenCore]"),
+        Specialization::Object(val) if ty.is_subtype(types::SymbolExact) => write!(f, "[:{}]", ruby_sym_to_rust_string(val)),
+        Specialization::Object(val) => write!(f, "[{}]", val.print(printer.ptr_map)),
+        Specialization::Type(val) => write!(f, "[class:{}]", get_class_name(val)),
+        Specialization::TypeExact(val) => write!(f, "[class_exact:{}]", get_class_name(val)),
+        Specialization::Int(val) if ty.is_subtype(types::CBool) => write!(f, "[{}]", val != 0),
+        Specialization::Int(val) if ty.is_subtype(types::CInt8) => write!(f, "[{}]", (val as i64) >> 56),
+        Specialization::Int(val) if ty.is_subtype(types::CInt16) => write!(f, "[{}]", (val as i64) >> 48),
+        Specialization::Int(val) if ty.is_subtype(types::CInt32) => write!(f, "[{}]", (val as i64) >> 32),
+        Specialization::Int(val) if ty.is_subtype(types::CInt64) => write!(f, "[{}]", val as i64),
+        Specialization::Int(val) if ty.is_subtype(types::CUInt8) => write!(f, "[{}]", val >> 56),
+        Specialization::Int(val) if ty.is_subtype(types::CUInt16) => write!(f, "[{}]", val >> 48),
+        Specialization::Int(val) if ty.is_subtype(types::CUInt32) => write!(f, "[{}]", val >> 32),
+        Specialization::Int(val) if ty.is_subtype(types::CUInt64) => write!(f, "[{}]", val),
+        Specialization::Int(val) => write!(f, "[{val}]"),
+        Specialization::Double(val) => write!(f, "[{val}]"),
+    }
+}
+
+/// Print adaptor for [`Type`]. See [`PtrPrintMap`].
+pub struct TypePrinter<'a> {
+    inner: Type,
+    ptr_map: &'a PtrPrintMap,
+}
+
+impl<'a> std::fmt::Display for TypePrinter<'a> {
+    fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
+        let ty = self.inner;
+        for (name, pattern) in bits::AllBitPatterns {
+            if ty.bits == pattern {
+                write!(f, "{name}")?;
+                return write_spec(f, self);
+            }
+        }
+        assert!(bits::AllBitPatterns.is_sorted_by(|(_, left), (_, right)| left > right));
+        let mut bits = ty.bits;
+        let mut sep = "";
+        for (name, pattern) in bits::AllBitPatterns {
+            if bits == 0 { break; }
+            if (bits & pattern) == pattern {
+                write!(f, "{sep}{name}")?;
+                sep = "|";
+                bits &= !pattern;
+            }
+        }
+        assert_eq!(bits, 0, "Should have eliminated all bits by iterating over all patterns");
+        write_spec(f, self)
+    }
+}
+
+impl std::fmt::Display for Type {
+    fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
+        self.print(&PtrPrintMap::identity()).fmt(f)
+    }
+}
+
+fn is_array_exact(val: VALUE) -> bool {
+    // Prism hides array values in the constant pool from the GC, so class_of will return 0
+    val.class_of() == unsafe { rb_cArray } || (val.class_of() == VALUE(0) && val.builtin_type() == RUBY_T_ARRAY)
+}
+
+fn is_string_exact(val: VALUE) -> bool {
+    // Prism hides string values in the constant pool from the GC, so class_of will return 0
+    val.class_of() == unsafe { rb_cString } || (val.class_of() == VALUE(0) && val.builtin_type() == RUBY_T_STRING)
+}
+
+fn is_hash_exact(val: VALUE) -> bool {
+    // Prism hides hash values in the constant pool from the GC, so class_of will return 0
+    val.class_of() == unsafe { rb_cHash } || (val.class_of() == VALUE(0) && val.builtin_type() == RUBY_T_HASH)
+}
+
+fn is_range_exact(val: VALUE) -> bool {
+    val.class_of() == unsafe { rb_cRange }
+}
+
+fn is_module_exact(val: VALUE) -> bool {
+    if val.builtin_type() != RUBY_T_MODULE {
+        return false;
+    }
+
+    // For Class and Module instances, `class_of` will return the singleton class of the object.
+    // Using `rb_obj_class` will give us the actual class of the module so we can check if the
+    // object is an instance of Module, or an instance of Module subclass.
+    let klass = unsafe { rb_obj_class(val) };
+    klass == unsafe { rb_cModule }
+}
+
+impl Type {
+    /// Create a `Type` from the given integer.
+    pub const fn fixnum(val: i64) -> Type {
+        Type {
+            bits: bits::Fixnum,
+            spec: Specialization::Object(VALUE::fixnum_from_usize(val as usize)),
+        }
+    }
+
+    /// Create a `Type` from a Ruby `VALUE`. The type is not guaranteed to have object
+    /// specialization in its `specialization` field (for example, `Qnil` will just be
+    /// `types::NilClassExact`), but will be available via `ruby_object()`.
+    pub fn from_value(val: VALUE) -> Type {
+        if val.fixnum_p() {
+            Type { bits: bits::Fixnum, spec: Specialization::Object(val) }
+        }
+        else if val.flonum_p() {
+            Type { bits: bits::Flonum, spec: Specialization::Object(val) }
+        }
+        else if val.static_sym_p() {
+            Type { bits: bits::StaticSymbol, spec: Specialization::Object(val) }
+        }
+        // Singleton objects; don't specialize
+        else if val == Qnil { types::NilClassExact }
+        else if val == Qtrue { types::TrueClassExact }
+        else if val == Qfalse { types::FalseClassExact }
+        else if val.cme_p() {
+            // NB: Checking for CME has to happen before looking at class_of because that's not
+            // valid on imemo.
+            Type { bits: bits::CallableMethodEntry, spec: Specialization::Object(val) }
+        }
+        else if val.class_of() == unsafe { rb_cInteger } {
+            Type { bits: bits::Bignum, spec: Specialization::Object(val) }
+        }
+        else if val.class_of() == unsafe { rb_cFloat } {
+            Type { bits: bits::HeapFloat, spec: Specialization::Object(val) }
+        }
+        else if val.class_of() == unsafe { rb_cSymbol } {
+            Type { bits: bits::DynamicSymbol, spec: Specialization::Object(val) }
+        }
+        else if is_array_exact(val) {
+            Type { bits: bits::ArrayExact, spec: Specialization::Object(val) }
+        }
+        else if is_hash_exact(val) {
+            Type { bits: bits::HashExact, spec: Specialization::Object(val) }
+        }
+        else if is_range_exact(val) {
+            Type { bits: bits::RangeExact, spec: Specialization::Object(val) }
+        }
+        else if is_string_exact(val) {
+            Type { bits: bits::StringExact, spec: Specialization::Object(val) }
+        }
+        else if is_module_exact(val) {
+            Type { bits: bits::ModuleExact, spec: Specialization::Object(val) }
+        }
+        else if val.builtin_type() == RUBY_T_CLASS {
+            Type { bits: bits::Class, spec: Specialization::Object(val) }
+        }
+        else if val.class_of() == unsafe { rb_cRegexp } {
+            Type { bits: bits::RegexpExact, spec: Specialization::Object(val) }
+        }
+        else if val.class_of() == unsafe { rb_cSet } {
+            Type { bits: bits::SetExact, spec: Specialization::Object(val) }
+        }
+        else if val.class_of() == unsafe { rb_cObject } {
+            Type { bits: bits::ObjectExact, spec: Specialization::Object(val) }
+        }
+        else {
+            // TODO(max): Add more cases for inferring type bits from built-in types
+            Type { bits: bits::BasicObject, spec: Specialization::Object(val) }
+        }
+    }
+
+    /// Private. Only for creating type globals.
+    const fn from_bits(bits: u64) -> Type {
+        Type {
+            bits,
+            spec: if bits == bits::Empty {
+                Specialization::Empty
+            } else {
+                Specialization::Any
+            },
+        }
+    }
+
+    /// Create a `Type` from a cvalue integer. Use the `ty` given to specify what size the
+    /// `specialization` represents. For example, `Type::from_cint(types::CBool, 1)` or
+    /// `Type::from_cint(types::CUInt16, 12)`.
+    pub fn from_cint(ty: Type, val: i64) -> Type {
+        assert_eq!(ty.spec, Specialization::Any);
+        assert!((ty.is_subtype(types::CUnsigned) || ty.is_subtype(types::CSigned)) &&
+                ty.bits != types::CUnsigned.bits && ty.bits != types::CSigned.bits,
+                "ty must be a specific int size");
+        Type { bits: ty.bits, spec: Specialization::Int(val as u64) }
+    }
+
+    /// Create a `Type` (a `CDouble` with double specialization) from a f64.
+    pub fn from_double(val: f64) -> Type {
+        Type { bits: bits::CDouble, spec: Specialization::Double(val) }
+    }
+
+    /// Create a `Type` from a cvalue boolean.
+    pub fn from_cbool(val: bool) -> Type {
+        Type { bits: bits::CBool, spec: Specialization::Int(val as u64) }
+    }
+
+    /// Return true if the value with this type is definitely truthy.
+    pub fn is_known_truthy(&self) -> bool {
+        !self.could_be(types::NilClassExact) && !self.could_be(types::FalseClassExact)
+    }
+
+    /// Return true if the value with this type is definitely falsy.
+    pub fn is_known_falsy(&self) -> bool {
+        self.is_subtype(types::NilClassExact) || self.is_subtype(types::FalseClassExact)
+    }
+
+    /// Top self is the Ruby global object, where top-level method definitions go. Return true if
+    /// this Type has a Ruby object specialization that is the top-level self.
+    pub fn is_top_self(&self) -> bool {
+        self.ruby_object() == Some(unsafe { crate::cruby::rb_vm_top_self() })
+    }
+
+    /// Return the object specialization, if any.
+    pub fn ruby_object(&self) -> Option<VALUE> {
+        match self.spec {
+            Specialization::Object(val) => Some(val),
+            _ => None,
+        }
+    }
+
+    /// Return a Ruby object that needs to be marked on GC.
+    /// This covers Type and TypeExact unlike ruby_object().
+    pub fn gc_object(&self) -> Option<VALUE> {
+        match self.spec {
+            Specialization::Type(val) |
+            Specialization::TypeExact(val) |
+            Specialization::Object(val) => Some(val),
+            _ => None,
+        }
+    }
+
+    /// Mutable version of gc_object().
+    pub fn gc_object_mut(&mut self) -> Option<&mut VALUE> {
+        match &mut self.spec {
+            Specialization::Type(val) |
+            Specialization::TypeExact(val) |
+            Specialization::Object(val) => Some(val),
+            _ => None,
+        }
+    }
+
+    pub fn unspecialized(&self) -> Self {
+        Type { spec: Specialization::Any, ..*self }
+    }
+
+    pub fn fixnum_value(&self) -> Option<i64> {
+        if self.is_subtype(types::Fixnum) {
+            self.ruby_object().map(|val| val.as_fixnum())
+        } else {
+            None
+        }
+    }
+
+    /// Return true if the Type has object specialization and false otherwise.
+    pub fn ruby_object_known(&self) -> bool {
+        matches!(self.spec, Specialization::Object(_))
+    }
+
+    fn is_builtin(class: VALUE) -> bool {
+        if class == unsafe { rb_cArray } { return true; }
+        if class == unsafe { rb_cClass } { return true; }
+        if class == unsafe { rb_cFalseClass } { return true; }
+        if class == unsafe { rb_cFloat } { return true; }
+        if class == unsafe { rb_cHash } { return true; }
+        if class == unsafe { rb_cInteger } { return true; }
+        if class == unsafe { rb_cModule } { return true; }
+        if class == unsafe { rb_cNilClass } { return true; }
+        if class == unsafe { rb_cObject } { return true; }
+        if class == unsafe { rb_cRange } { return true; }
+        if class == unsafe { rb_cRegexp } { return true; }
+        if class == unsafe { rb_cString } { return true; }
+        if class == unsafe { rb_cSymbol } { return true; }
+        if class == unsafe { rb_cTrueClass } { return true; }
+        false
+    }
+
+    /// Union both types together, preserving specialization if possible.
+    pub fn union(&self, other: Type) -> Type {
+        // Easy cases first
+        if self.is_subtype(other) { return other; }
+        if other.is_subtype(*self) { return *self; }
+        let bits = self.bits | other.bits;
+        let result = Type::from_bits(bits);
+        // If one type isn't type specialized, we can't return a specialized Type
+        if !self.type_known() || !other.type_known() { return result; }
+        let self_class = self.inexact_ruby_class().unwrap();
+        let other_class = other.inexact_ruby_class().unwrap();
+        // Pick one of self/other as the least upper bound. This is not the most specific (there
+        // could be intermediate classes in the inheritance hierarchy) but it is fast to compute.
+        let super_class = match self_class.is_subclass_of(other_class) {
+            ClassRelationship::Subclass => other_class,
+            ClassRelationship::Superclass => self_class,
+            ClassRelationship::NoRelation => return result,
+        };
+        // Don't specialize built-in types; we can represent them perfectly with type bits.
+        if Type::is_builtin(super_class) { return result; }
+        // Supertype specialization can be exact only if the exact type specializations are identical
+        if let Some(self_class) = self.exact_ruby_class() {
+            if let Some(other_class) = other.exact_ruby_class() {
+                if self_class == other_class {
+                    return Type { bits, spec: Specialization::TypeExact(self_class) };
+                }
+            }
+        }
+        Type { bits, spec: Specialization::Type(super_class) }
+    }
+
+    /// Intersect both types, preserving specialization if possible.
+    pub fn intersection(&self, other: Type) -> Type {
+        let bits = self.bits & other.bits;
+        if bits == bits::Empty { return types::Empty; }
+        if self.spec_is_subtype_of(other) { return Type { bits, spec: self.spec }; }
+        if other.spec_is_subtype_of(*self) { return Type { bits, spec: other.spec }; }
+        types::Empty
+    }
+
+    pub fn could_be(&self, other: Type) -> bool {
+        !self.intersection(other).bit_equal(types::Empty)
+    }
+
+    /// Check if the type field of `self` is a subtype of the type field of `other` and also check
+    /// if the specialization of `self` is a subtype of the specialization of `other`.
+    pub fn is_subtype(&self, other: Type) -> bool {
+        (self.bits & other.bits) == self.bits && self.spec_is_subtype_of(other)
+    }
+
+    /// Return the type specialization, if any. Type specialization asks if we know the Ruby type
+    /// (including potentially its subclasses) corresponding to a `Type`, including knowing exactly
+    /// what object is is.
+    pub fn type_known(&self) -> bool {
+        matches!(self.spec, Specialization::TypeExact(_) | Specialization::Type(_) | Specialization::Object(_))
+    }
+
+    /// Return the exact type specialization, if any. Type specialization asks if we know the
+    /// *exact* Ruby type corresponding to a `Type`, including knowing exactly what object is is.
+    pub fn exact_class_known(&self) -> bool {
+        matches!(self.spec, Specialization::TypeExact(_) | Specialization::Object(_))
+    }
+
+    /// Return the exact type specialization, if any. Type specialization asks if we know the exact
+    /// Ruby type corresponding to a `Type` (no subclasses), including knowing exactly what object
+    /// it is.
+    pub fn exact_ruby_class(&self) -> Option<VALUE> {
+        match self.spec {
+            // If we're looking at a precise object, we can pull out its class.
+            Specialization::Object(val) => Some(val.class_of()),
+            Specialization::TypeExact(val) => Some(val),
+            _ => None,
+        }
+    }
+
+    /// Return the type specialization, if any. Type specialization asks if we know the inexact
+    /// Ruby type corresponding to a `Type`, including knowing exactly what object is is.
+    pub fn inexact_ruby_class(&self) -> Option<VALUE> {
+        match self.spec {
+            // If we're looking at a precise object, we can pull out its class.
+            Specialization::Object(val) => Some(val.class_of()),
+            Specialization::TypeExact(val) | Specialization::Type(val) => Some(val),
+            _ => None,
+        }
+    }
+
+    /// Return a pointer to the Ruby class that an object of this Type would have at run-time, if
+    /// known. This includes classes for HIR types such as ArrayExact or NilClassExact, which have
+    /// canonical Type representations that lack an explicit specialization in their `spec` fields.
+    pub fn runtime_exact_ruby_class(&self) -> Option<VALUE> {
+        if let Some(val) = self.exact_ruby_class() {
+            return Some(val);
+        }
+        if self.is_subtype(types::ArrayExact) { return Some(unsafe { rb_cArray }); }
+        if self.is_subtype(types::Class) { return Some(unsafe { rb_cClass }); }
+        if self.is_subtype(types::FalseClassExact) { return Some(unsafe { rb_cFalseClass }); }
+        if self.is_subtype(types::FloatExact) { return Some(unsafe { rb_cFloat }); }
+        if self.is_subtype(types::HashExact) { return Some(unsafe { rb_cHash }); }
+        if self.is_subtype(types::IntegerExact) { return Some(unsafe { rb_cInteger }); }
+        if self.is_subtype(types::ModuleExact) { return Some(unsafe { rb_cModule }); }
+        if self.is_subtype(types::NilClassExact) { return Some(unsafe { rb_cNilClass }); }
+        if self.is_subtype(types::ObjectExact) { return Some(unsafe { rb_cObject }); }
+        if self.is_subtype(types::RangeExact) { return Some(unsafe { rb_cRange }); }
+        if self.is_subtype(types::RegexpExact) { return Some(unsafe { rb_cRegexp }); }
+        if self.is_subtype(types::SetExact) { return Some(unsafe { rb_cSet }); }
+        if self.is_subtype(types::StringExact) { return Some(unsafe { rb_cString }); }
+        if self.is_subtype(types::SymbolExact) { return Some(unsafe { rb_cSymbol }); }
+        if self.is_subtype(types::TrueClassExact) { return Some(unsafe { rb_cTrueClass }); }
+        None
+    }
+
+    /// Check bit equality of two `Type`s. Do not use! You are probably looking for [`Type::is_subtype`].
+    pub fn bit_equal(&self, other: Type) -> bool {
+        self.bits == other.bits && self.spec == other.spec
+    }
+
+    /// Check *only* if `self`'s specialization is a subtype of `other`'s specialization. Private.
+    /// You probably want [`Type::is_subtype`] instead.
+    fn spec_is_subtype_of(&self, other: Type) -> bool {
+        match (self.spec, other.spec) {
+            // Empty is a subtype of everything; Any is a supertype of everything
+            (Specialization::Empty, _) | (_, Specialization::Any) => true,
+            // Other is not Any from the previous case, so Any is definitely not a subtype
+            (Specialization::Any, _) | (_, Specialization::Empty) => false,
+            // Int and double specialization requires exact equality
+            (Specialization::Int(_), _) | (_, Specialization::Int(_)) |
+            (Specialization::Double(_), _) | (_, Specialization::Double(_)) =>
+                self.bits == other.bits && self.spec == other.spec,
+            // Check other's specialization type in decreasing order of specificity
+            (_, Specialization::Object(_)) =>
+                self.ruby_object_known() && self.ruby_object() == other.ruby_object(),
+            (_, Specialization::TypeExact(_)) =>
+                self.exact_class_known() && self.inexact_ruby_class() == other.inexact_ruby_class(),
+            (_, Specialization::Type(other_class)) =>
+                self.inexact_ruby_class().unwrap().is_subclass_of(other_class) == ClassRelationship::Subclass,
+        }
+    }
+
+    fn is_immediate(&self) -> bool {
+        self.is_subtype(types::Immediate)
+    }
+
+    pub fn print(self, ptr_map: &PtrPrintMap) -> TypePrinter {
+        TypePrinter { inner: self, ptr_map }
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use crate::cruby::rust_str_to_ruby;
+    use crate::cruby::rust_str_to_sym;
+    use crate::cruby::rb_ary_new_capa;
+    use crate::cruby::rb_hash_new;
+    use crate::cruby::rb_float_new;
+    use crate::cruby::define_class;
+
+    #[track_caller]
+    fn assert_bit_equal(left: Type, right: Type) {
+        assert_eq!(left.bits, right.bits, "{left} bits are not equal to {right} bits");
+        assert_eq!(left.spec, right.spec, "{left} spec is not equal to {right} spec");
+    }
+
+    #[track_caller]
+    fn assert_subtype(left: Type, right: Type) {
+        assert!(left.is_subtype(right), "{left} is not a subtype of {right}");
+    }
+
+    #[track_caller]
+    fn assert_not_subtype(left: Type, right: Type) {
+        assert!(!left.is_subtype(right), "{left} is a subtype of {right}");
+    }
+
+    #[test]
+    fn empty_is_subtype_of_everything() {
+        // Spot check a few cases
+        assert_subtype(types::Empty, types::NilClassExact);
+        assert_subtype(types::Empty, types::Array);
+        assert_subtype(types::Empty, types::Object);
+        assert_subtype(types::Empty, types::CUInt16);
+        assert_subtype(types::Empty, Type::from_cint(types::CInt32, 10));
+        assert_subtype(types::Empty, types::Any);
+        assert_subtype(types::Empty, types::Empty);
+    }
+
+    #[test]
+    fn everything_is_a_subtype_of_any() {
+        // Spot check a few cases
+        assert_subtype(types::NilClassExact, types::Any);
+        assert_subtype(types::Array, types::Any);
+        assert_subtype(types::Object, types::Any);
+        assert_subtype(types::CUInt16, types::Any);
+        assert_subtype(Type::from_cint(types::CInt32, 10), types::Any);
+        assert_subtype(types::Empty, types::Any);
+        assert_subtype(types::Any, types::Any);
+    }
+
+    #[test]
+    fn integer() {
+        assert_subtype(Type::fixnum(123), types::Fixnum);
+        assert_subtype(Type::fixnum(123), Type::fixnum(123));
+        assert_not_subtype(Type::fixnum(123), Type::fixnum(200));
+        assert_subtype(Type::from_value(VALUE::fixnum_from_usize(123)), types::Fixnum);
+        assert_subtype(types::Fixnum, types::IntegerExact);
+        assert_subtype(types::Bignum, types::IntegerExact);
+        assert_subtype(types::IntegerExact, types::Integer);
+        assert_subtype(types::IntegerSubclass, types::Integer);
+    }
+
+    #[test]
+    fn float() {
+        assert_subtype(types::Flonum, types::FloatExact);
+        assert_subtype(types::HeapFloat, types::FloatExact);
+        assert_subtype(types::FloatExact, types::Float);
+        assert_subtype(types::FloatSubclass, types::Float);
+    }
+
+    #[test]
+    fn symbol() {
+        assert_subtype(types::StaticSymbol, types::SymbolExact);
+        assert_subtype(types::DynamicSymbol, types::SymbolExact);
+        assert_subtype(types::SymbolExact, types::Symbol);
+        assert_subtype(types::SymbolSubclass, types::Symbol);
+    }
+
+    #[test]
+    fn immediate() {
+        assert_subtype(Type::fixnum(123), types::Immediate);
+        assert_subtype(types::Fixnum, types::Immediate);
+        assert_not_subtype(types::Bignum, types::Immediate);
+        assert_subtype(types::NilClassExact, types::Immediate);
+        assert_subtype(types::TrueClassExact, types::Immediate);
+        assert_subtype(types::FalseClassExact, types::Immediate);
+        assert_not_subtype(types::NilClassSubclass, types::Immediate);
+        assert_not_subtype(types::TrueClassSubclass, types::Immediate);
+        assert_not_subtype(types::FalseClassSubclass, types::Immediate);
+        assert_subtype(types::StaticSymbol, types::Immediate);
+        assert_not_subtype(types::DynamicSymbol, types::Immediate);
+        assert_subtype(types::Flonum, types::Immediate);
+        assert_not_subtype(types::HeapFloat, types::Immediate);
+    }
+
+    #[test]
+    fn fixnum_has_ruby_object() {
+        assert_eq!(Type::fixnum(3).ruby_object(), Some(VALUE::fixnum_from_usize(3)));
+        assert_eq!(types::Fixnum.ruby_object(), None);
+        assert_eq!(types::IntegerExact.ruby_object(), None);
+        assert_eq!(types::Integer.ruby_object(), None);
+    }
+
+    #[test]
+    fn singletons_do_not_have_ruby_object() {
+        assert_eq!(Type::from_value(Qnil).ruby_object(), None);
+        assert_eq!(types::NilClassExact.ruby_object(), None);
+        assert_eq!(Type::from_value(Qtrue).ruby_object(), None);
+        assert_eq!(types::TrueClassExact.ruby_object(), None);
+        assert_eq!(Type::from_value(Qfalse).ruby_object(), None);
+        assert_eq!(types::FalseClassExact.ruby_object(), None);
+    }
+
+    #[test]
+    fn integer_has_exact_ruby_class() {
+        assert_eq!(Type::fixnum(3).exact_ruby_class(), Some(unsafe { rb_cInteger }.into()));
+        assert_eq!(types::Fixnum.exact_ruby_class(), None);
+        assert_eq!(types::IntegerExact.exact_ruby_class(), None);
+        assert_eq!(types::Integer.exact_ruby_class(), None);
+    }
+
+    #[test]
+    fn singletons_do_not_have_exact_ruby_class() {
+        assert_eq!(Type::from_value(Qnil).exact_ruby_class(), None);
+        assert_eq!(types::NilClassExact.exact_ruby_class(), None);
+        assert_eq!(Type::from_value(Qtrue).exact_ruby_class(), None);
+        assert_eq!(types::TrueClassExact.exact_ruby_class(), None);
+        assert_eq!(Type::from_value(Qfalse).exact_ruby_class(), None);
+        assert_eq!(types::FalseClassExact.exact_ruby_class(), None);
+    }
+
+    #[test]
+    fn singletons_do_not_have_ruby_class() {
+        assert_eq!(Type::from_value(Qnil).inexact_ruby_class(), None);
+        assert_eq!(types::NilClassExact.inexact_ruby_class(), None);
+        assert_eq!(Type::from_value(Qtrue).inexact_ruby_class(), None);
+        assert_eq!(types::TrueClassExact.inexact_ruby_class(), None);
+        assert_eq!(Type::from_value(Qfalse).inexact_ruby_class(), None);
+        assert_eq!(types::FalseClassExact.inexact_ruby_class(), None);
+    }
+
+    #[test]
+    fn integer_has_ruby_class() {
+        assert_eq!(Type::fixnum(3).inexact_ruby_class(), Some(unsafe { rb_cInteger }.into()));
+        assert_eq!(types::Fixnum.inexact_ruby_class(), None);
+        assert_eq!(types::IntegerExact.inexact_ruby_class(), None);
+        assert_eq!(types::Integer.inexact_ruby_class(), None);
+    }
+
+    #[test]
+    fn set() {
+        assert_subtype(types::SetExact, types::Set);
+        assert_subtype(types::SetSubclass, types::Set);
+    }
+
+    #[test]
+    fn set_has_ruby_class() {
+        crate::cruby::with_rubyvm(|| {
+            assert_eq!(types::SetExact.runtime_exact_ruby_class(), Some(unsafe { rb_cSet }));
+            assert_eq!(types::Set.runtime_exact_ruby_class(), None);
+            assert_eq!(types::SetSubclass.runtime_exact_ruby_class(), None);
+        });
+    }
+
+    #[test]
+    fn display_exact_bits_match() {
+        assert_eq!(format!("{}", Type::fixnum(4)), "Fixnum[4]");
+        assert_eq!(format!("{}", Type::from_cint(types::CInt8, -1)), "CInt8[-1]");
+        assert_eq!(format!("{}", Type::from_cint(types::CUInt8, -1)), "CUInt8[255]");
+        assert_eq!(format!("{}", Type::from_cint(types::CInt16, -1)), "CInt16[-1]");
+        assert_eq!(format!("{}", Type::from_cint(types::CUInt16, -1)), "CUInt16[65535]");
+        assert_eq!(format!("{}", Type::from_cint(types::CInt32, -1)), "CInt32[-1]");
+        assert_eq!(format!("{}", Type::from_cint(types::CUInt32, -1)), "CUInt32[4294967295]");
+        assert_eq!(format!("{}", Type::from_cint(types::CInt64, -1)), "CInt64[-1]");
+        assert_eq!(format!("{}", Type::from_cint(types::CUInt64, -1)), "CUInt64[18446744073709551615]");
+        assert_eq!(format!("{}", Type::from_cbool(true)), "CBool[true]");
+        assert_eq!(format!("{}", Type::from_cbool(false)), "CBool[false]");
+        assert_eq!(format!("{}", types::Fixnum), "Fixnum");
+        assert_eq!(format!("{}", types::Integer), "Integer");
+        assert_eq!(format!("{}", types::IntegerExact), "IntegerExact");
+    }
+
+    #[test]
+    fn display_multiple_bits() {
+        assert_eq!(format!("{}", types::CSigned), "CSigned");
+        assert_eq!(format!("{}", types::CUInt8.union(types::CInt32)), "CUInt8|CInt32");
+        assert_eq!(format!("{}", types::HashExact.union(types::HashSubclass)), "Hash");
+    }
+
+    #[test]
+    fn union_equal() {
+        assert_bit_equal(types::Fixnum.union(types::Fixnum), types::Fixnum);
+        assert_bit_equal(Type::fixnum(3).union(Type::fixnum(3)), Type::fixnum(3));
+    }
+
+    #[test]
+    fn union_bits_subtype() {
+        assert_bit_equal(types::Fixnum.union(types::IntegerExact), types::IntegerExact);
+        assert_bit_equal(types::Fixnum.union(types::Integer), types::Integer);
+        assert_bit_equal(types::Fixnum.union(types::Object), types::Object);
+        assert_bit_equal(Type::fixnum(3).union(types::Fixnum), types::Fixnum);
+
+        assert_bit_equal(types::IntegerExact.union(types::Fixnum), types::IntegerExact);
+        assert_bit_equal(types::Integer.union(types::Fixnum), types::Integer);
+        assert_bit_equal(types::Object.union(types::Fixnum), types::Object);
+        assert_bit_equal(types::Fixnum.union(Type::fixnum(3)), types::Fixnum);
+    }
+
+    #[test]
+    fn union_bits_unions_bits() {
+        assert_bit_equal(types::Fixnum.union(types::StaticSymbol), Type { bits: bits::Fixnum | bits::StaticSymbol, spec: Specialization::Any });
+    }
+
+    #[test]
+    fn union_int_specialized() {
+        assert_bit_equal(Type::from_cbool(true).union(Type::from_cbool(true)), Type::from_cbool(true));
+        assert_bit_equal(Type::from_cbool(true).union(Type::from_cbool(false)), types::CBool);
+        assert_bit_equal(Type::from_cbool(true).union(types::CBool), types::CBool);
+
+        assert_bit_equal(Type::from_cbool(false).union(Type::from_cbool(true)), types::CBool);
+        assert_bit_equal(types::CBool.union(Type::from_cbool(true)), types::CBool);
+    }
+
+    #[test]
+    fn union_one_type_specialized_returns_unspecialized() {
+        crate::cruby::with_rubyvm(|| {
+            let specialized = Type::from_value(unsafe { rb_ary_new_capa(0) });
+            let unspecialized = types::StringExact;
+            assert_bit_equal(specialized.union(unspecialized), Type { bits: bits::ArrayExact | bits::StringExact, spec: Specialization::Any });
+            assert_bit_equal(unspecialized.union(specialized), Type { bits: bits::ArrayExact | bits::StringExact, spec: Specialization::Any });
+        });
+    }
+
+    #[test]
+    fn union_specialized_builtin_subtype_returns_unspecialized() {
+        crate::cruby::with_rubyvm(|| {
+            let hello = Type::from_value(rust_str_to_ruby("hello"));
+            let world = Type::from_value(rust_str_to_ruby("world"));
+            assert_bit_equal(hello.union(world), types::StringExact);
+        });
+        crate::cruby::with_rubyvm(|| {
+            let hello = Type::from_value(rust_str_to_sym("hello"));
+            let world = Type::from_value(rust_str_to_sym("world"));
+            assert_bit_equal(hello.union(world), types::StaticSymbol);
+        });
+        crate::cruby::with_rubyvm(|| {
+            let left = Type::from_value(rust_str_to_ruby("hello"));
+            let right = Type::from_value(rust_str_to_ruby("hello"));
+            assert_bit_equal(left.union(right), types::StringExact);
+        });
+        crate::cruby::with_rubyvm(|| {
+            let left = Type::from_value(rust_str_to_sym("hello"));
+            let right = Type::from_value(rust_str_to_sym("hello"));
+            assert_bit_equal(left.union(right), left);
+        });
+        crate::cruby::with_rubyvm(|| {
+            let left = Type::from_value(unsafe { rb_ary_new_capa(0) });
+            let right = Type::from_value(unsafe { rb_ary_new_capa(0) });
+            assert_bit_equal(left.union(right), types::ArrayExact);
+        });
+        crate::cruby::with_rubyvm(|| {
+            let left = Type::from_value(unsafe { rb_hash_new() });
+            let right = Type::from_value(unsafe { rb_hash_new() });
+            assert_bit_equal(left.union(right), types::HashExact);
+        });
+        crate::cruby::with_rubyvm(|| {
+            let left = Type::from_value(unsafe { rb_float_new(1.0) });
+            let right = Type::from_value(unsafe { rb_float_new(2.0) });
+            assert_bit_equal(left.union(right), types::Flonum);
+        });
+        crate::cruby::with_rubyvm(|| {
+            let left = Type::from_value(unsafe { rb_float_new(1.7976931348623157e+308) });
+            let right = Type::from_value(unsafe { rb_float_new(1.7976931348623157e+308) });
+            assert_bit_equal(left.union(right), types::HeapFloat);
+        });
+    }
+
+    #[test]
+    fn cme() {
+        use crate::cruby::{rb_callable_method_entry, ID};
+        crate::cruby::with_rubyvm(|| {
+            let cme = unsafe { rb_callable_method_entry(rb_cInteger, ID!(to_s)) };
+            assert!(!cme.is_null());
+            let cme_value: VALUE = cme.into();
+            let ty = Type::from_value(cme_value);
+            assert_subtype(ty, types::CallableMethodEntry);
+            assert!(ty.ruby_object_known());
+        });
+    }
+
+    #[test]
+    fn union_specialized_with_no_relation_returns_unspecialized() {
+        crate::cruby::with_rubyvm(|| {
+            let string = Type::from_value(rust_str_to_ruby("hello"));
+            let array = Type::from_value(unsafe { rb_ary_new_capa(0) });
+            assert_bit_equal(string.union(array), Type { bits: bits::ArrayExact | bits::StringExact, spec: Specialization::Any });
+        });
+    }
+
+    #[test]
+    fn union_specialized_with_subclass_relationship_returns_superclass() {
+        crate::cruby::with_rubyvm(|| {
+            let c_class = define_class("C", unsafe { rb_cObject });
+            let d_class = define_class("D", c_class);
+            let c_instance = Type { bits: bits::ObjectSubclass, spec: Specialization::TypeExact(c_class) };
+            let d_instance = Type { bits: bits::ObjectSubclass, spec: Specialization::TypeExact(d_class) };
+            assert_bit_equal(c_instance.union(c_instance), Type { bits: bits::ObjectSubclass, spec: Specialization::TypeExact(c_class)});
+            assert_bit_equal(c_instance.union(d_instance), Type { bits: bits::ObjectSubclass, spec: Specialization::Type(c_class)});
+            assert_bit_equal(d_instance.union(c_instance), Type { bits: bits::ObjectSubclass, spec: Specialization::Type(c_class)});
+        });
+    }
+}
diff --git a/zjit/src/invariants.rs b/zjit/src/invariants.rs
new file mode 100644
index 00000000000000..62b38054857896
--- /dev/null
+++ b/zjit/src/invariants.rs
@@ -0,0 +1,101 @@
+use std::{collections::{HashMap, HashSet}};
+
+use crate::{backend::lir::{asm_comment, Assembler}, cruby::{ruby_basic_operators, src_loc, with_vm_lock, IseqPtr, RedefinitionFlag}, hir::Invariant, options::debug, state::{zjit_enabled_p, ZJITState}, virtualmem::CodePtr};
+
+#[derive(Debug, Eq, Hash, PartialEq)]
+struct Jump {
+    from: CodePtr,
+    to: CodePtr,
+}
+
+/// Used to track all of the various block references that contain assumptions
+/// about the state of the virtual machine.
+#[derive(Default)]
+pub struct Invariants {
+    /// Set of ISEQs that are known to escape EP
+    ep_escape_iseqs: HashSet<IseqPtr>,
+
+    /// Set of ISEQs whose JIT code assumes that it doesn't escape EP
+    no_ep_escape_iseqs: HashSet<IseqPtr>,
+
+    /// Map from a class and its associated basic operator to a set of patch points
+    bop_patch_points: HashMap<(RedefinitionFlag, ruby_basic_operators), HashSet<Jump>>,
+}
+
+/// Called when a basic operator is redefined. Note that all the blocks assuming
+/// the stability of different operators are invalidated together and we don't
+/// do fine-grained tracking.
+#[unsafe(no_mangle)]
+pub extern "C" fn rb_zjit_bop_redefined(klass: RedefinitionFlag, bop: ruby_basic_operators) {
+    // If ZJIT isn't enabled, do nothing
+    if !zjit_enabled_p() {
+        return;
+    }
+
+    with_vm_lock(src_loc!(), || {
+        let invariants = ZJITState::get_invariants();
+        if let Some(jumps) = invariants.bop_patch_points.get(&(klass, bop)) {
+            let cb = ZJITState::get_code_block();
+            let bop = Invariant::BOPRedefined { klass, bop };
+            debug!("BOP is redefined: {}", bop);
+
+            // Invalidate all patch points for this BOP
+            for jump in jumps {
+                cb.with_write_ptr(jump.from, |cb| {
+                    let mut asm = Assembler::new();
+                    asm_comment!(asm, "BOP is redefined: {}", bop);
+                    asm.jmp(jump.to.into());
+                    asm.compile(cb).expect("can write existing code");
+                });
+            }
+
+            cb.mark_all_executable();
+        }
+    });
+}
+
+/// Invalidate blocks for a given ISEQ that assumes environment pointer is
+/// equal to base pointer.
+#[unsafe(no_mangle)]
+pub extern "C" fn rb_zjit_invalidate_ep_is_bp(iseq: IseqPtr) {
+    // Skip tracking EP escapes on boot. We don't need to invalidate anything during boot.
+    if !ZJITState::has_instance() {
+        return;
+    }
+
+    // Remember that this ISEQ may escape EP
+    let invariants = ZJITState::get_invariants();
+    invariants.ep_escape_iseqs.insert(iseq);
+
+    // If the ISEQ has been compiled assuming it doesn't escape EP, invalidate the JIT code.
+    // Note: Nobody calls track_no_ep_escape_assumption() for now, so this is always false.
+    // TODO: Add a PatchPoint that assumes EP == BP in HIR and invalidate it here.
+    if invariants.no_ep_escape_iseqs.contains(&iseq) {
+        unimplemented!("Invalidation on EP escape is not implemented yet");
+    }
+}
+
+/// Track that JIT code for a ISEQ will assume that base pointer is equal to environment pointer.
+pub fn track_no_ep_escape_assumption(iseq: IseqPtr) {
+    let invariants = ZJITState::get_invariants();
+    invariants.no_ep_escape_iseqs.insert(iseq);
+}
+
+/// Returns true if a given ISEQ has previously escaped environment pointer.
+pub fn iseq_escapes_ep(iseq: IseqPtr) -> bool {
+    ZJITState::get_invariants().ep_escape_iseqs.contains(&iseq)
+}
+
+/// Track a patch point for a basic operator in a given class.
+pub fn track_bop_assumption(
+    klass: RedefinitionFlag,
+    bop: ruby_basic_operators,
+    patch_point_ptr: CodePtr,
+    side_exit_ptr: CodePtr
+) {
+    let invariants = ZJITState::get_invariants();
+    invariants.bop_patch_points.entry((klass, bop)).or_default().insert(Jump {
+        from: patch_point_ptr,
+        to: side_exit_ptr,
+    });
+}
diff --git a/zjit/src/lib.rs b/zjit/src/lib.rs
new file mode 100644
index 00000000000000..d5ca2b74ba8773
--- /dev/null
+++ b/zjit/src/lib.rs
@@ -0,0 +1,27 @@
+#![allow(dead_code)]
+#![allow(static_mut_refs)]
+
+// Add std docs to cargo doc.
+#[doc(inline)]
+pub use std;
+
+mod state;
+mod cruby;
+mod cruby_methods;
+mod hir;
+mod hir_type;
+mod codegen;
+mod stats;
+mod cast;
+mod virtualmem;
+mod asm;
+mod backend;
+#[cfg(feature = "disasm")]
+mod disasm;
+mod options;
+mod profile;
+mod invariants;
+#[cfg(test)]
+mod assertions;
+mod bitset;
+mod gc;
diff --git a/zjit/src/options.rs b/zjit/src/options.rs
new file mode 100644
index 00000000000000..476640d11feb0b
--- /dev/null
+++ b/zjit/src/options.rs
@@ -0,0 +1,189 @@
+use std::{ffi::{CStr, CString}, ptr::null};
+use std::os::raw::{c_char, c_int, c_uint};
+
+/// Number of calls to start profiling YARV instructions.
+/// They are profiled `rb_zjit_call_threshold - rb_zjit_profile_threshold` times,
+/// which is equal to --zjit-num-profiles.
+#[unsafe(no_mangle)]
+#[allow(non_upper_case_globals)]
+pub static mut rb_zjit_profile_threshold: u64 = 1;
+
+/// Number of calls to compile ISEQ with ZJIT at jit_compile() in vm.c.
+/// --zjit-call-threshold=1 compiles on first execution without profiling information.
+#[unsafe(no_mangle)]
+#[allow(non_upper_case_globals)]
+pub static mut rb_zjit_call_threshold: u64 = 2;
+
+#[derive(Clone, Copy, Debug)]
+pub struct Options {
+    /// Number of times YARV instructions should be profiled.
+    pub num_profiles: u64,
+
+    /// Enable debug logging
+    pub debug: bool,
+
+    /// Dump initial High-level IR before optimization
+    pub dump_hir_init: Option<DumpHIR>,
+
+    /// Dump High-level IR after optimization, right before codegen.
+    pub dump_hir_opt: Option<DumpHIR>,
+
+    /// Dump low-level IR
+    pub dump_lir: bool,
+
+    /// Dump all compiled machine code.
+    pub dump_disasm: bool,
+}
+
+/// Return an Options with default values
+pub fn init_options() -> Options {
+    Options {
+        num_profiles: 1,
+        debug: false,
+        dump_hir_init: None,
+        dump_hir_opt: None,
+        dump_lir: false,
+        dump_disasm: false,
+    }
+}
+
+/// `ruby --help` descriptions for user-facing options. Do not add options for ZJIT developers.
+/// Note that --help allows only 80 chars per line, including indentation.    80-char limit --> |
+pub const ZJIT_OPTIONS: &'static [(&str, &str)] = &[
+    ("--zjit-call-threshold=num", "Number of calls to trigger JIT (default: 2)."),
+    ("--zjit-num-profiles=num",   "Number of profiled calls before JIT (default: 1)."),
+];
+
+#[derive(Clone, Copy, Debug)]
+pub enum DumpHIR {
+    // Dump High-level IR without Snapshot
+    WithoutSnapshot,
+    // Dump High-level IR with Snapshot
+    All,
+    // Pretty-print bare High-level IR structs
+    Debug,
+}
+
+/// Macro to get an option value by name
+macro_rules! get_option {
+    // Unsafe is ok here because options are initialized
+    // once before any Ruby code executes
+    ($option_name:ident) => {
+        {
+            use crate::state::ZJITState;
+            ZJITState::get_options().$option_name
+        }
+    };
+}
+pub(crate) use get_option;
+
+/// Allocate Options on the heap, initialize it, and return the address of it.
+/// The return value will be modified by rb_zjit_parse_option() and then
+/// passed to rb_zjit_init() for initialization.
+#[unsafe(no_mangle)]
+pub extern "C" fn rb_zjit_init_options() -> *const u8 {
+    let options = init_options();
+    Box::into_raw(Box::new(options)) as *const u8
+}
+
+/// Parse a --zjit* command-line flag
+#[unsafe(no_mangle)]
+pub extern "C" fn rb_zjit_parse_option(options: *const u8, str_ptr: *const c_char) -> bool {
+    let options = unsafe { &mut *(options as *mut Options) };
+    parse_option(options, str_ptr).is_some()
+}
+
+/// Expected to receive what comes after the third dash in "--zjit-*".
+/// Empty string means user passed only "--zjit". C code rejects when
+/// they pass exact "--zjit-".
+fn parse_option(options: &mut Options, str_ptr: *const std::os::raw::c_char) -> Option<()> {
+    let c_str: &CStr = unsafe { CStr::from_ptr(str_ptr) };
+    let opt_str: &str = c_str.to_str().ok()?;
+
+    // Split the option name and value strings
+    // Note that some options do not contain an assignment
+    let parts = opt_str.split_once('=');
+    let (opt_name, opt_val) = match parts {
+        Some((before_eq, after_eq)) => (before_eq, after_eq),
+        None => (opt_str, ""),
+    };
+
+    // Match on the option name and value strings
+    match (opt_name, opt_val) {
+        ("", "") => {}, // Simply --zjit
+
+        ("call-threshold", _) => match opt_val.parse() {
+            Ok(n) => {
+                unsafe { rb_zjit_call_threshold = n; }
+                update_profile_threshold(options);
+            },
+            Err(_) => return None,
+        },
+
+        ("num-profiles", _) => match opt_val.parse() {
+            Ok(n) => {
+                options.num_profiles = n;
+                update_profile_threshold(options);
+            },
+            Err(_) => return None,
+        },
+
+        ("debug", "") => options.debug = true,
+
+        // --zjit-dump-hir dumps the actual input to the codegen, which is currently the same as --zjit-dump-hir-opt.
+        ("dump-hir" | "dump-hir-opt", "") => options.dump_hir_opt = Some(DumpHIR::WithoutSnapshot),
+        ("dump-hir" | "dump-hir-opt", "all") => options.dump_hir_opt = Some(DumpHIR::All),
+        ("dump-hir" | "dump-hir-opt", "debug") => options.dump_hir_opt = Some(DumpHIR::Debug),
+
+        ("dump-hir-init", "") => options.dump_hir_init = Some(DumpHIR::WithoutSnapshot),
+        ("dump-hir-init", "all") => options.dump_hir_init = Some(DumpHIR::All),
+        ("dump-hir-init", "debug") => options.dump_hir_init = Some(DumpHIR::Debug),
+
+        ("dump-lir", "") => options.dump_lir = true,
+
+        ("dump-disasm", "") => options.dump_disasm = true,
+
+        _ => return None, // Option name not recognized
+    }
+
+    // Option successfully parsed
+    Some(())
+}
+
+/// Update rb_zjit_profile_threshold based on rb_zjit_call_threshold and options.num_profiles
+fn update_profile_threshold(options: &Options) {
+    unsafe {
+        if rb_zjit_call_threshold == 1 {
+            // If --zjit-call-threshold=1, never rewrite ISEQs to profile instructions.
+            rb_zjit_profile_threshold = 0;
+        } else {
+            // Otherwise, profile instructions at least once.
+            rb_zjit_profile_threshold = rb_zjit_call_threshold.saturating_sub(options.num_profiles).max(1);
+        }
+    }
+}
+
+/// Print YJIT options for `ruby --help`. `width` is width of option parts, and
+/// `columns` is indent width of descriptions.
+#[unsafe(no_mangle)]
+pub extern "C" fn rb_zjit_show_usage(help: c_int, highlight: c_int, width: c_uint, columns: c_int) {
+    for &(name, description) in ZJIT_OPTIONS.iter() {
+        unsafe extern "C" {
+            fn ruby_show_usage_line(name: *const c_char, secondary: *const c_char, description: *const c_char,
+                                    help: c_int, highlight: c_int, width: c_uint, columns: c_int);
+        }
+        let name = CString::new(name).unwrap();
+        let description = CString::new(description).unwrap();
+        unsafe { ruby_show_usage_line(name.as_ptr(), null(), description.as_ptr(), help, highlight, width, columns) }
+    }
+}
+
+/// Macro to print a message only when --zjit-debug is given
+macro_rules! debug {
+    ($($msg:tt)*) => {
+        if $crate::options::get_option!(debug) {
+            eprintln!($($msg)*);
+        }
+    };
+}
+pub(crate) use debug;
diff --git a/zjit/src/profile.rs b/zjit/src/profile.rs
new file mode 100644
index 00000000000000..de1455f788673f
--- /dev/null
+++ b/zjit/src/profile.rs
@@ -0,0 +1,133 @@
+// We use the YARV bytecode constants which have a CRuby-style name
+#![allow(non_upper_case_globals)]
+
+use crate::{cruby::*, gc::get_or_create_iseq_payload, hir_type::{types::{Empty, Fixnum}, Type}};
+
+/// Ephemeral state for profiling runtime information
+struct Profiler {
+    cfp: CfpPtr,
+    iseq: IseqPtr,
+    insn_idx: usize,
+}
+
+impl Profiler {
+    fn new(ec: EcPtr) -> Self {
+        let cfp = unsafe { get_ec_cfp(ec) };
+        let iseq = unsafe { get_cfp_iseq(cfp) };
+        Profiler {
+            cfp,
+            iseq,
+            insn_idx: unsafe { get_cfp_pc(cfp).offset_from(get_iseq_body_iseq_encoded(iseq)) as usize },
+        }
+    }
+
+    // Get an instruction operand that sits next to the opcode at PC.
+    fn insn_opnd(&self, idx: usize) -> VALUE {
+        unsafe { get_cfp_pc(self.cfp).add(1 + idx).read() }
+    }
+
+    // Peek at the nth topmost value on the Ruby stack.
+    // Returns the topmost value when n == 0.
+    fn peek_at_stack(&self, n: isize) -> VALUE {
+        unsafe {
+            let sp: *mut VALUE = get_cfp_sp(self.cfp);
+            *(sp.offset(-1 - n))
+        }
+    }
+}
+
+/// API called from zjit_* instruction. opcode is the bare (non-zjit_*) instruction.
+#[unsafe(no_mangle)]
+pub extern "C" fn rb_zjit_profile_insn(opcode: ruby_vminsn_type, ec: EcPtr) {
+    with_vm_lock(src_loc!(), || {
+        let mut profiler = Profiler::new(ec);
+        profile_insn(&mut profiler, opcode);
+    });
+}
+
+/// Profile a YARV instruction
+fn profile_insn(profiler: &mut Profiler, opcode: ruby_vminsn_type) {
+    match opcode {
+        YARVINSN_opt_nil_p => profile_operands(profiler, 1),
+        YARVINSN_opt_plus  => profile_operands(profiler, 2),
+        YARVINSN_opt_minus => profile_operands(profiler, 2),
+        YARVINSN_opt_mult  => profile_operands(profiler, 2),
+        YARVINSN_opt_div   => profile_operands(profiler, 2),
+        YARVINSN_opt_mod   => profile_operands(profiler, 2),
+        YARVINSN_opt_eq    => profile_operands(profiler, 2),
+        YARVINSN_opt_neq   => profile_operands(profiler, 2),
+        YARVINSN_opt_lt    => profile_operands(profiler, 2),
+        YARVINSN_opt_le    => profile_operands(profiler, 2),
+        YARVINSN_opt_gt    => profile_operands(profiler, 2),
+        YARVINSN_opt_ge    => profile_operands(profiler, 2),
+        YARVINSN_opt_and   => profile_operands(profiler, 2),
+        YARVINSN_opt_or    => profile_operands(profiler, 2),
+        YARVINSN_opt_send_without_block => {
+            let cd: *const rb_call_data = profiler.insn_opnd(0).as_ptr();
+            let argc = unsafe { vm_ci_argc((*cd).ci) };
+            // Profile all the arguments and self (+1).
+            profile_operands(profiler, (argc + 1) as usize);
+        }
+        _ => {}
+    }
+}
+
+/// Profile the Type of top-`n` stack operands
+fn profile_operands(profiler: &mut Profiler, n: usize) {
+    let profile = &mut get_or_create_iseq_payload(profiler.iseq).profile;
+    let types = &mut profile.opnd_types[profiler.insn_idx];
+    if types.len() <= n {
+        types.resize(n, Empty);
+    }
+    for i in 0..n {
+        let opnd_type = Type::from_value(profiler.peek_at_stack((n - i - 1) as isize));
+        types[i] = types[i].union(opnd_type);
+    }
+}
+
+#[derive(Debug)]
+pub struct IseqProfile {
+    /// Type information of YARV instruction operands, indexed by the instruction index
+    opnd_types: Vec<Vec<Type>>,
+}
+
+impl IseqProfile {
+    pub fn new(iseq_size: u32) -> Self {
+        Self { opnd_types: vec![vec![]; iseq_size as usize] }
+    }
+
+    /// Get profiled operand types for a given instruction index
+    pub fn get_operand_types(&self, insn_idx: usize) -> Option<&[Type]> {
+        self.opnd_types.get(insn_idx).map(|v| &**v)
+    }
+
+    /// Return true if top-two stack operands are Fixnums
+    pub fn have_two_fixnums(&self, insn_idx: usize) -> bool {
+        match self.get_operand_types(insn_idx) {
+            Some([left, right]) => left.is_subtype(Fixnum) && right.is_subtype(Fixnum),
+            _ => false,
+        }
+    }
+
+    /// Run a given callback with every object in IseqProfile
+    pub fn each_object(&self, callback: impl Fn(VALUE)) {
+        for types in &self.opnd_types {
+            for opnd_type in types {
+                if let Some(object) = opnd_type.gc_object() {
+                    callback(object);
+                }
+            }
+        }
+    }
+
+    /// Run a given callback with a mutable reference to every object in IseqProfile
+    pub fn each_object_mut(&mut self, callback: impl Fn(&mut VALUE)) {
+        for types in self.opnd_types.iter_mut() {
+            for opnd_type in types.iter_mut() {
+                if let Some(object) = opnd_type.gc_object_mut() {
+                    callback(object);
+                }
+            }
+        }
+    }
+}
diff --git a/zjit/src/state.rs b/zjit/src/state.rs
new file mode 100644
index 00000000000000..cb68f8a8effb93
--- /dev/null
+++ b/zjit/src/state.rs
@@ -0,0 +1,186 @@
+use crate::cruby::{self, rb_bug_panic_hook, EcPtr, Qnil, VALUE};
+use crate::cruby_methods;
+use crate::invariants::Invariants;
+use crate::options::Options;
+use crate::asm::CodeBlock;
+use crate::backend::lir::{asm_comment, Assembler, C_RET_OPND};
+use crate::virtualmem::CodePtr;
+
+#[allow(non_upper_case_globals)]
+#[unsafe(no_mangle)]
+pub static mut rb_zjit_enabled_p: bool = false;
+
+/// Like rb_zjit_enabled_p, but for Rust code.
+pub fn zjit_enabled_p() -> bool {
+    unsafe { rb_zjit_enabled_p }
+}
+
+/// Global state needed for code generation
+pub struct ZJITState {
+    /// Inline code block (fast path)
+    code_block: CodeBlock,
+
+    /// ZJIT command-line options
+    options: Options,
+
+    /// Assumptions that require invalidation
+    invariants: Invariants,
+
+    /// Assert successful compilation if set to true
+    assert_compiles: bool,
+
+    /// Properties of core library methods
+    method_annotations: cruby_methods::Annotations,
+
+    /// Trampoline to propagate a callee's side exit to the caller
+    exit_trampoline: Option<CodePtr>,
+}
+
+/// Private singleton instance of the codegen globals
+static mut ZJIT_STATE: Option<ZJITState> = None;
+
+impl ZJITState {
+    /// Initialize the ZJIT globals, given options allocated by rb_zjit_init_options()
+    pub fn init(options: Options) {
+        #[cfg(not(test))]
+        let cb = {
+            use crate::cruby::*;
+
+            let exec_mem_size: usize = 64 * 1024 * 1024; // TODO: implement the option
+            let virt_block: *mut u8 = unsafe { rb_zjit_reserve_addr_space(64 * 1024 * 1024) };
+
+            // Memory protection syscalls need page-aligned addresses, so check it here. Assuming
+            // `virt_block` is page-aligned, `second_half` should be page-aligned as long as the
+            // page size in bytes is a power of two 2¹⁹ or smaller. This is because the user
+            // requested size is half of mem_option × 2²⁰ as it's in MiB.
+            //
+            // Basically, we don't support x86-64 2MiB and 1GiB pages. ARMv8 can do up to 64KiB
+            // (2¹⁶ bytes) pages, which should be fine. 4KiB pages seem to be the most popular though.
+            let page_size = unsafe { rb_zjit_get_page_size() };
+            assert_eq!(
+                virt_block as usize % page_size as usize, 0,
+                "Start of virtual address block should be page-aligned",
+            );
+
+            use crate::virtualmem::*;
+            use std::ptr::NonNull;
+            use std::rc::Rc;
+            use std::cell::RefCell;
+
+            let mem_block = VirtualMem::new(
+                crate::virtualmem::sys::SystemAllocator {},
+                page_size,
+                NonNull::new(virt_block).unwrap(),
+                exec_mem_size,
+                64 * 1024 * 1024, // TODO: support the option
+            );
+            let mem_block = Rc::new(RefCell::new(mem_block));
+
+            CodeBlock::new(mem_block.clone(), options.dump_disasm)
+        };
+        #[cfg(test)]
+        let cb = CodeBlock::new_dummy();
+
+        // Initialize the codegen globals instance
+        let zjit_state = ZJITState {
+            code_block: cb,
+            options,
+            invariants: Invariants::default(),
+            assert_compiles: false,
+            method_annotations: cruby_methods::init(),
+            exit_trampoline: None,
+        };
+        unsafe { ZJIT_STATE = Some(zjit_state); }
+
+        // Generate trampolines after initializing ZJITState, which Assembler will use
+        let cb = ZJITState::get_code_block();
+        let exit_trampoline = Self::gen_exit_trampoline(cb).unwrap();
+        ZJITState::get_instance().exit_trampoline = Some(exit_trampoline);
+    }
+
+    /// Return true if zjit_state has been initialized
+    pub fn has_instance() -> bool {
+        unsafe { ZJIT_STATE.as_mut().is_some() }
+    }
+
+    /// Get a mutable reference to the codegen globals instance
+    fn get_instance() -> &'static mut ZJITState {
+        unsafe { ZJIT_STATE.as_mut().unwrap() }
+    }
+
+    /// Get a mutable reference to the inline code block
+    pub fn get_code_block() -> &'static mut CodeBlock {
+        &mut ZJITState::get_instance().code_block
+    }
+
+    /// Get a mutable reference to the options
+    pub fn get_options() -> &'static mut Options {
+        &mut ZJITState::get_instance().options
+    }
+
+    /// Get a mutable reference to the invariants
+    pub fn get_invariants() -> &'static mut Invariants {
+        &mut ZJITState::get_instance().invariants
+    }
+
+    pub fn get_method_annotations() -> &'static cruby_methods::Annotations {
+        &ZJITState::get_instance().method_annotations
+    }
+
+    /// Return true if successful compilation should be asserted
+    pub fn assert_compiles_enabled() -> bool {
+        ZJITState::get_instance().assert_compiles
+    }
+
+    /// Start asserting successful compilation
+    pub fn enable_assert_compiles() {
+        let instance = ZJITState::get_instance();
+        instance.assert_compiles = true;
+    }
+
+    /// Generate a trampoline to propagate a callee's side exit to the caller
+    fn gen_exit_trampoline(cb: &mut CodeBlock) -> Option<CodePtr> {
+        let mut asm = Assembler::new();
+        asm_comment!(asm, "ZJIT exit trampoline");
+        asm.frame_teardown();
+        asm.cret(C_RET_OPND);
+        asm.compile(cb).map(|(start_ptr, _)| start_ptr)
+    }
+
+    /// Get the trampoline to propagate a callee's side exit to the caller
+    pub fn get_exit_trampoline() -> CodePtr {
+        ZJITState::get_instance().exit_trampoline.unwrap()
+    }
+}
+
+/// Initialize ZJIT, given options allocated by rb_zjit_init_options()
+#[unsafe(no_mangle)]
+pub extern "C" fn rb_zjit_init(options: *const u8) {
+    // Catch panics to avoid UB for unwinding into C frames.
+    // See https://doc.rust-lang.org/nomicon/exception-safety.html
+    let result = std::panic::catch_unwind(|| {
+        cruby::ids::init();
+
+        let options = unsafe { Box::from_raw(options as *mut Options) };
+        ZJITState::init(*options);
+        std::mem::drop(options);
+
+        rb_bug_panic_hook();
+
+        // ZJIT enabled and initialized successfully
+        assert!(unsafe{ !rb_zjit_enabled_p });
+        unsafe { rb_zjit_enabled_p = true; }
+    });
+
+    if result.is_err() {
+        println!("ZJIT: zjit_init() panicked. Aborting.");
+        std::process::abort();
+    }
+}
+
+/// Assert that any future ZJIT compilation will return a function pointer (not fail to compile)
+#[unsafe(no_mangle)]
+pub extern "C" fn rb_zjit_assert_compiles(_ec: EcPtr, _self: VALUE) -> VALUE {
+    ZJITState::enable_assert_compiles();
+    Qnil
+}
diff --git a/zjit/src/stats.rs b/zjit/src/stats.rs
new file mode 100644
index 00000000000000..06913522c4d45b
--- /dev/null
+++ b/zjit/src/stats.rs
@@ -0,0 +1,9 @@
+// Maxime would like to rebuild an improved stats system
+// Individual stats should be tagged as always available, or only available in stats mode
+// We could also tag which stats are fallback or exit counters, etc. Maybe even tag units?
+//
+// Comptime vs Runtime stats?
+
+pub fn zjit_alloc_size() -> usize {
+    0 // TODO: report the actual memory usage
+}
diff --git a/zjit/src/virtualmem.rs b/zjit/src/virtualmem.rs
new file mode 100644
index 00000000000000..42ce525fde7a6c
--- /dev/null
+++ b/zjit/src/virtualmem.rs
@@ -0,0 +1,452 @@
+//! Memory management stuff for ZJIT's code storage. Deals with virtual memory.
+// I'm aware that there is an experiment in Rust Nightly right now for to see if banning
+// usize->pointer casts is viable. It seems like a lot of work for us to participate for not much
+// benefit.
+
+use std::ptr::NonNull;
+
+use crate::stats::zjit_alloc_size;
+
+#[cfg(not(test))]
+pub type VirtualMem = VirtualMemory<sys::SystemAllocator>;
+
+#[cfg(test)]
+pub type VirtualMem = VirtualMemory<tests::TestingAllocator>;
+
+/// Memory for generated executable machine code. When not testing, we reserve address space for
+/// the entire region upfront and map physical memory into the reserved address space as needed. On
+/// Linux, this is basically done using an `mmap` with `PROT_NONE` upfront and gradually using
+/// `mprotect` with `PROT_READ|PROT_WRITE` as needed. The WIN32 equivalent seems to be
+/// `VirtualAlloc` with `MEM_RESERVE` then later with `MEM_COMMIT`.
+///
+/// This handles ["W^X"](https://en.wikipedia.org/wiki/W%5EX) semi-automatically. Writes
+/// are always accepted and once writes are done a call to [Self::mark_all_executable] makes
+/// the code in the region executable.
+pub struct VirtualMemory<A: Allocator> {
+    /// Location of the virtual memory region.
+    region_start: NonNull<u8>,
+
+    /// Size of this virtual memory region in bytes.
+    region_size_bytes: usize,
+
+    /// mapped_region_bytes + zjit_alloc_size may not increase beyond this limit.
+    memory_limit_bytes: usize,
+
+    /// Number of bytes per "page", memory protection permission can only be controlled at this
+    /// granularity.
+    page_size_bytes: usize,
+
+    /// Number of bytes that have we have allocated physical memory for starting at
+    /// [Self::region_start].
+    mapped_region_bytes: usize,
+
+    /// Keep track of the address of the last written to page.
+    /// Used for changing protection to implement W^X.
+    current_write_page: Option<usize>,
+
+    /// Zero size member for making syscalls to get physical memory during normal operation.
+    /// When testing this owns some memory.
+    allocator: A,
+}
+
+/// Groups together the two syscalls to get get new physical memory and to change
+/// memory protection. See [VirtualMemory] for details.
+pub trait Allocator {
+    #[must_use]
+    fn mark_writable(&mut self, ptr: *const u8, size: u32) -> bool;
+
+    fn mark_executable(&mut self, ptr: *const u8, size: u32);
+
+    fn mark_unused(&mut self, ptr: *const u8, size: u32) -> bool;
+}
+
+/// Pointer into a [VirtualMemory] represented as an offset from the base.
+/// Note: there is no NULL constant for [CodePtr]. You should use `Option<CodePtr>` instead.
+#[derive(Copy, Clone, PartialEq, Eq, Hash, PartialOrd, Debug)]
+#[repr(C, packed)]
+pub struct CodePtr(u32);
+
+impl CodePtr {
+    /// Advance the CodePtr. Can return a dangling pointer.
+    pub fn add_bytes(self, bytes: usize) -> Self {
+        let CodePtr(raw) = self;
+        let bytes: u32 = bytes.try_into().unwrap();
+        CodePtr(raw + bytes)
+    }
+
+    /// Subtract bytes from the CodePtr
+    pub fn sub_bytes(self, bytes: usize) -> Self {
+        let CodePtr(raw) = self;
+        let bytes: u32 = bytes.try_into().unwrap();
+        CodePtr(raw.saturating_sub(bytes))
+    }
+
+    /// Note that the raw pointer might be dangling if there hasn't
+    /// been any writes to it through the [VirtualMemory] yet.
+    pub fn raw_ptr(self, base: &impl CodePtrBase) -> *const u8 {
+        let CodePtr(offset) = self;
+        base.base_ptr().as_ptr().wrapping_add(offset as usize)
+    }
+
+    /// Get the address of the code pointer.
+    pub fn raw_addr(self, base: &impl CodePtrBase) -> usize {
+        self.raw_ptr(base) as usize
+    }
+
+    /// Get the offset component for the code pointer. Useful finding the distance between two
+    /// code pointers that share the same [VirtualMem].
+    pub fn as_offset(self) -> i64 {
+        let CodePtr(offset) = self;
+        offset.into()
+    }
+}
+
+/// Errors that can happen when writing to [VirtualMemory]
+#[derive(Debug, PartialEq)]
+pub enum WriteError {
+    OutOfBounds,
+    FailedPageMapping,
+}
+
+use WriteError::*;
+
+impl<A: Allocator> VirtualMemory<A> {
+    /// Bring a part of the address space under management.
+    pub fn new(
+        allocator: A,
+        page_size: u32,
+        virt_region_start: NonNull<u8>,
+        region_size_bytes: usize,
+        memory_limit_bytes: usize,
+    ) -> Self {
+        assert_ne!(0, page_size);
+        let page_size_bytes = page_size as usize;
+
+        Self {
+            region_start: virt_region_start,
+            region_size_bytes,
+            memory_limit_bytes,
+            page_size_bytes,
+            mapped_region_bytes: 0,
+            current_write_page: None,
+            allocator,
+        }
+    }
+
+    /// Return the start of the region as a raw pointer. Note that it could be a dangling
+    /// pointer so be careful dereferencing it.
+    pub fn start_ptr(&self) -> CodePtr {
+        CodePtr(0)
+    }
+
+    pub fn mapped_end_ptr(&self) -> CodePtr {
+        self.start_ptr().add_bytes(self.mapped_region_bytes)
+    }
+
+    pub fn virtual_end_ptr(&self) -> CodePtr {
+        self.start_ptr().add_bytes(self.region_size_bytes)
+    }
+
+    /// Size of the region in bytes that we have allocated physical memory for.
+    pub fn mapped_region_size(&self) -> usize {
+        self.mapped_region_bytes
+    }
+
+    /// Size of the region in bytes where writes could be attempted.
+    pub fn virtual_region_size(&self) -> usize {
+        self.region_size_bytes
+    }
+
+    /// The granularity at which we can control memory permission.
+    /// On Linux, this is the page size that mmap(2) talks about.
+    pub fn system_page_size(&self) -> usize {
+        self.page_size_bytes
+    }
+
+    /// Write a single byte. The first write to a page makes it readable.
+    pub fn write_byte(&mut self, write_ptr: CodePtr, byte: u8) -> Result<(), WriteError> {
+        let page_size = self.page_size_bytes;
+        let raw: *mut u8 = write_ptr.raw_ptr(self) as *mut u8;
+        let page_addr = (raw as usize / page_size) * page_size;
+
+        if self.current_write_page == Some(page_addr) {
+            // Writing within the last written to page, nothing to do
+        } else {
+            // Switching to a different and potentially new page
+            let start = self.region_start.as_ptr();
+            let mapped_region_end = start.wrapping_add(self.mapped_region_bytes);
+            let whole_region_end = start.wrapping_add(self.region_size_bytes);
+            let alloc = &mut self.allocator;
+
+            assert!((start..=whole_region_end).contains(&mapped_region_end));
+
+            if (start..mapped_region_end).contains(&raw) {
+                // Writing to a previously written to page.
+                // Need to make page writable, but no need to fill.
+                let page_size: u32 = page_size.try_into().unwrap();
+                if !alloc.mark_writable(page_addr as *const _, page_size) {
+                    return Err(FailedPageMapping);
+                }
+
+                self.current_write_page = Some(page_addr);
+            } else if (start..whole_region_end).contains(&raw) &&
+                    (page_addr + page_size - start as usize) + zjit_alloc_size() < self.memory_limit_bytes {
+                // Writing to a brand new page
+                let mapped_region_end_addr = mapped_region_end as usize;
+                let alloc_size = page_addr - mapped_region_end_addr + page_size;
+
+                assert_eq!(0, alloc_size % page_size, "allocation size should be page aligned");
+                assert_eq!(0, mapped_region_end_addr % page_size, "pointer should be page aligned");
+
+                if alloc_size > page_size {
+                    // This is unusual for the current setup, so keep track of it.
+                    //crate::stats::incr_counter!(exec_mem_non_bump_alloc); // TODO
+                }
+
+                // Allocate new chunk
+                let alloc_size_u32: u32 = alloc_size.try_into().unwrap();
+                unsafe {
+                    if !alloc.mark_writable(mapped_region_end.cast(), alloc_size_u32) {
+                        return Err(FailedPageMapping);
+                    }
+                    if cfg!(target_arch = "x86_64") {
+                        // Fill new memory with PUSH DS (0x1E) so that executing uninitialized memory
+                        // will fault with #UD in 64-bit mode. On Linux it becomes SIGILL and use the
+                        // usual Ruby crash reporter.
+                        std::slice::from_raw_parts_mut(mapped_region_end, alloc_size).fill(0x1E);
+                    } else if cfg!(target_arch = "aarch64") {
+                        // In aarch64, all zeros encodes UDF, so it's already what we want.
+                    } else {
+                        unreachable!("unknown arch");
+                    }
+                }
+                self.mapped_region_bytes += alloc_size;
+
+                self.current_write_page = Some(page_addr);
+            } else {
+                return Err(OutOfBounds);
+            }
+        }
+
+        // We have permission to write if we get here
+        unsafe { raw.write(byte) };
+
+        Ok(())
+    }
+
+    /// Make all the code in the region executable. Call this at the end of a write session.
+    /// See [Self] for usual usage flow.
+    pub fn mark_all_executable(&mut self) {
+        self.current_write_page = None;
+
+        let region_start = self.region_start;
+        let mapped_region_bytes: u32 = self.mapped_region_bytes.try_into().unwrap();
+
+        // Make mapped region executable
+        self.allocator.mark_executable(region_start.as_ptr(), mapped_region_bytes);
+    }
+
+    /// Free a range of bytes. start_ptr must be memory page-aligned.
+    pub fn free_bytes(&mut self, start_ptr: CodePtr, size: u32) {
+        assert_eq!(start_ptr.raw_ptr(self) as usize % self.page_size_bytes, 0);
+
+        // Bounds check the request. We should only free memory we manage.
+        let mapped_region = self.start_ptr().raw_ptr(self)..self.mapped_end_ptr().raw_ptr(self);
+        let virtual_region = self.start_ptr().raw_ptr(self)..self.virtual_end_ptr().raw_ptr(self);
+        let last_byte_to_free = start_ptr.add_bytes(size.saturating_sub(1) as usize).raw_ptr(self);
+        assert!(mapped_region.contains(&start_ptr.raw_ptr(self)));
+        // On platforms where code page size != memory page size (e.g. Linux), we often need
+        // to free code pages that contain unmapped memory pages. When it happens on the last
+        // code page, it's more appropriate to check the last byte against the virtual region.
+        assert!(virtual_region.contains(&last_byte_to_free));
+
+        self.allocator.mark_unused(start_ptr.raw_ptr(self), size);
+    }
+}
+
+/// Something that could provide a base pointer to compute a raw pointer from a [CodePtr].
+pub trait CodePtrBase {
+    fn base_ptr(&self) -> NonNull<u8>;
+}
+
+impl<A: Allocator> CodePtrBase for VirtualMemory<A> {
+    fn base_ptr(&self) -> NonNull<u8> {
+        self.region_start
+    }
+}
+
+/// Requires linking with CRuby to work
+#[cfg(not(test))]
+pub mod sys {
+    use crate::cruby::*;
+
+    /// Zero size! This just groups together syscalls that require linking with CRuby.
+    pub struct SystemAllocator;
+
+    type VoidPtr = *mut std::os::raw::c_void;
+
+    impl super::Allocator for SystemAllocator {
+        fn mark_writable(&mut self, ptr: *const u8, size: u32) -> bool {
+            unsafe { rb_zjit_mark_writable(ptr as VoidPtr, size) }
+        }
+
+        fn mark_executable(&mut self, ptr: *const u8, size: u32) {
+            unsafe { rb_zjit_mark_executable(ptr as VoidPtr, size) }
+        }
+
+        fn mark_unused(&mut self, ptr: *const u8, size: u32) -> bool {
+            unsafe { rb_zjit_mark_unused(ptr as VoidPtr, size) }
+        }
+    }
+}
+
+
+#[cfg(test)]
+pub mod tests {
+    use super::*;
+
+    // Track allocation requests and owns some fixed size backing memory for requests.
+    // While testing we don't execute generated code.
+    pub struct TestingAllocator {
+        requests: Vec<AllocRequest>,
+        memory: Vec<u8>,
+    }
+
+    #[derive(Debug)]
+    enum AllocRequest {
+        MarkWritable{ start_idx: usize, length: usize },
+        MarkExecutable{ start_idx: usize, length: usize },
+        MarkUnused,
+    }
+    use AllocRequest::*;
+
+    impl TestingAllocator {
+        pub fn new(mem_size: usize) -> Self {
+            Self { requests: Vec::default(), memory: vec![0; mem_size] }
+        }
+
+        pub fn mem_start(&self) -> *const u8 {
+            self.memory.as_ptr()
+        }
+
+        // Verify that write_byte() bounds checks. Return `ptr` as an index.
+        fn bounds_check_request(&self, ptr: *const u8, size: u32) -> usize {
+            let mem_start = self.memory.as_ptr() as usize;
+            let index = ptr as usize - mem_start;
+
+            assert!(index < self.memory.len());
+            assert!(index + size as usize <= self.memory.len());
+
+            index
+        }
+    }
+
+    // Bounds check and then record the request
+    impl super::Allocator for TestingAllocator {
+        fn mark_writable(&mut self, ptr: *const u8, length: u32) -> bool {
+            let index = self.bounds_check_request(ptr, length);
+            self.requests.push(MarkWritable { start_idx: index, length: length as usize });
+
+            true
+        }
+
+        fn mark_executable(&mut self, ptr: *const u8, length: u32) {
+            let index = self.bounds_check_request(ptr, length);
+            self.requests.push(MarkExecutable { start_idx: index, length: length as usize });
+
+            // We don't try to execute generated code in cfg(test)
+            // so no need to actually request executable memory.
+        }
+
+        fn mark_unused(&mut self, ptr: *const u8, length: u32) -> bool {
+            self.bounds_check_request(ptr, length);
+            self.requests.push(MarkUnused);
+
+            true
+        }
+    }
+
+    // Fictional architecture where each page is 4 bytes long
+    const PAGE_SIZE: usize = 4;
+    fn new_dummy_virt_mem() -> VirtualMemory<TestingAllocator> {
+        let mem_size = PAGE_SIZE * 10;
+        let alloc = TestingAllocator::new(mem_size);
+        let mem_start: *const u8 = alloc.mem_start();
+
+        VirtualMemory::new(
+            alloc,
+            PAGE_SIZE.try_into().unwrap(),
+            NonNull::new(mem_start as *mut u8).unwrap(),
+            mem_size,
+            128 * 1024 * 1024,
+        )
+    }
+
+    #[test]
+    #[cfg(target_arch = "x86_64")]
+    fn new_memory_is_initialized() {
+        let mut virt = new_dummy_virt_mem();
+
+        virt.write_byte(virt.start_ptr(), 1).unwrap();
+        assert!(
+            virt.allocator.memory[..PAGE_SIZE].iter().all(|&byte| byte != 0),
+            "Entire page should be initialized",
+        );
+
+        // Skip a few page
+        let three_pages = 3 * PAGE_SIZE;
+        virt.write_byte(virt.start_ptr().add_bytes(three_pages), 1).unwrap();
+        assert!(
+            virt.allocator.memory[..three_pages].iter().all(|&byte| byte != 0),
+            "Gaps between write requests should be filled",
+        );
+    }
+
+    #[test]
+    fn no_redundant_syscalls_when_writing_to_the_same_page() {
+        let mut virt = new_dummy_virt_mem();
+
+        virt.write_byte(virt.start_ptr(), 1).unwrap();
+        virt.write_byte(virt.start_ptr(), 0).unwrap();
+
+        assert!(
+            matches!(
+                virt.allocator.requests[..],
+                [MarkWritable { start_idx: 0, length: PAGE_SIZE }],
+            )
+        );
+    }
+
+    #[test]
+    fn bounds_checking() {
+        use super::WriteError::*;
+        let mut virt = new_dummy_virt_mem();
+
+        let one_past_end = virt.start_ptr().add_bytes(virt.virtual_region_size());
+        assert_eq!(Err(OutOfBounds), virt.write_byte(one_past_end, 0));
+
+        let end_of_addr_space = CodePtr(u32::MAX);
+        assert_eq!(Err(OutOfBounds), virt.write_byte(end_of_addr_space, 0));
+    }
+
+    #[test]
+    fn only_written_to_regions_become_executable() {
+        // ... so we catch attempts to read/write/execute never-written-to regions
+        const THREE_PAGES: usize = PAGE_SIZE * 3;
+        let mut virt = new_dummy_virt_mem();
+        let page_two_start = virt.start_ptr().add_bytes(PAGE_SIZE * 2);
+        virt.write_byte(page_two_start, 1).unwrap();
+        virt.mark_all_executable();
+
+        assert!(virt.virtual_region_size() > THREE_PAGES);
+        assert!(
+            matches!(
+                virt.allocator.requests[..],
+                [
+                    MarkWritable { start_idx: 0, length: THREE_PAGES },
+                    MarkExecutable { start_idx: 0, length: THREE_PAGES },
+                ]
+            ),
+        );
+    }
+}
diff --git a/zjit/zjit.mk b/zjit/zjit.mk
new file mode 100644
index 00000000000000..9107c158097f1f
--- /dev/null
+++ b/zjit/zjit.mk
@@ -0,0 +1,105 @@
+# -*- mode: makefile-gmake; indent-tabs-mode: t -*-
+
+# Show Cargo progress when doing `make V=1`
+CARGO_VERBOSE_0 = -q
+CARGO_VERBOSE_1 =
+CARGO_VERBOSE = $(CARGO_VERBOSE_$(V))
+
+ZJIT_SRC_FILES = $(wildcard \
+	$(top_srcdir)/zjit/Cargo.* \
+	$(top_srcdir)/zjit/src/*.rs \
+	$(top_srcdir)/zjit/src/*/*.rs \
+	$(top_srcdir)/zjit/src/*/*/*.rs \
+	$(top_srcdir)/zjit/src/*/*/*/*.rs \
+	)
+
+# Because of Cargo cache, if the actual binary is not changed from the
+# previous build, the mtime is preserved as the cached file.
+# This means the target is not updated actually, and it will need to
+# rebuild at the next build.
+ZJIT_LIB_TOUCH = touch $@
+
+# Absolute path to match RUST_LIB rules to avoid picking
+# the "target" dir in the source directory through VPATH.
+BUILD_ZJIT_LIBS = $(TOP_BUILD_DIR)/$(ZJIT_LIBS)
+
+# ZJIT_SUPPORT=yes when `configure` gets `--enable-zjit`
+ifeq ($(ZJIT_SUPPORT),yes)
+$(BUILD_ZJIT_LIBS): $(ZJIT_SRC_FILES)
+	$(ECHO) 'building Rust ZJIT (release mode)'
+	+$(Q) $(RUSTC) $(ZJIT_RUSTC_ARGS)
+	$(ZJIT_LIB_TOUCH)
+endif
+
+ifneq ($(ZJIT_SUPPORT),no)
+$(RUST_LIB): $(ZJIT_SRC_FILES)
+endif
+
+# By using ZJIT_BENCH_OPTS instead of RUN_OPTS, you can skip passing the options to `make install`
+ZJIT_BENCH_OPTS = $(RUN_OPTS) --enable-gems
+ZJIT_BENCH = benchmarks/railsbench/benchmark.rb
+
+# Run zjit-bench's ./run_once.sh for CI
+zjit-bench: install update-zjit-bench PHONY
+	$(Q) cd $(srcdir)/zjit-bench && PATH=$(prefix)/bin:$$PATH \
+		./run_once.sh $(ZJIT_BENCH_OPTS) $(ZJIT_BENCH)
+
+update-zjit-bench:
+	$(Q) $(tooldir)/git-refresh -C $(srcdir) --branch main \
+		https://github.com/Shopify/zjit-bench zjit-bench $(GIT_OPTS)
+
+# Gives quick feedback about ZJIT. Not a replacement for a full test run.
+.PHONY: zjit-test-all
+zjit-test-all:
+	$(MAKE) zjit-test
+	$(MAKE) test-all TESTS='$(top_srcdir)/test/ruby/test_zjit.rb'
+
+ZJIT_BINDGEN_DIFF_OPTS =
+
+# Generate Rust bindings. See source for details.
+# Needs `./configure --enable-zjit=dev` and Clang.
+ifneq ($(strip $(CARGO)),) # if configure found Cargo
+.PHONY: zjit-bindgen zjit-bindgen-show-unused zjit-test zjit-test-lldb
+zjit-bindgen: zjit.$(OBJEXT)
+	ZJIT_SRC_ROOT_PATH='$(top_srcdir)' BINDGEN_JIT_NAME=zjit $(CARGO) run --manifest-path '$(top_srcdir)/zjit/bindgen/Cargo.toml' -- $(CFLAGS) $(XCFLAGS) $(CPPFLAGS)
+	$(Q) if [ 'x$(HAVE_GIT)' = xyes ]; then $(GIT) -C "$(top_srcdir)" diff $(ZJIT_BINDGEN_DIFF_OPTS) zjit/src/cruby_bindings.inc.rs; fi
+
+# We need `cargo nextest` for its one-process-per execution execution model
+# since we can only boot the VM once per process. Normal `cargo test`
+# runs tests in threads and can't handle this.
+#
+# On darwin, it's available through `brew install cargo-nextest`. See
+# https://nexte.st/docs/installation/pre-built-binaries/ otherwise.
+zjit-test: libminiruby.a
+	RUBY_BUILD_DIR='$(TOP_BUILD_DIR)' \
+	    RUBY_LD_FLAGS='$(LDFLAGS) $(XLDFLAGS) $(MAINLIBS)' \
+	    CARGO_TARGET_DIR='$(CARGO_TARGET_DIR)' \
+	    $(CARGO) nextest run --manifest-path '$(top_srcdir)/zjit/Cargo.toml' $(ZJIT_TESTS)
+
+# Run a ZJIT test written with Rust #[test] under LLDB
+zjit-test-lldb: libminiruby.a
+	$(Q)set -eu; \
+	    if [ -z '$(ZJIT_TESTS)' ]; then \
+		echo "Please pass a ZJIT_TESTS=... filter to make."; \
+		echo "Many tests only work when it's the only test in the process."; \
+		exit 1; \
+	    fi; \
+	    exe_path=`RUBY_BUILD_DIR='$(TOP_BUILD_DIR)' \
+	    RUBY_LD_FLAGS='$(LDFLAGS) $(XLDFLAGS) $(MAINLIBS)' \
+	    CARGO_TARGET_DIR='$(CARGO_TARGET_DIR)' \
+	    $(CARGO) nextest list --manifest-path '$(top_srcdir)/zjit/Cargo.toml' --message-format json --list-type=binaries-only | \
+	    $(BASERUBY) -rjson -e 'puts JSON.load(STDIN.read).dig("rust-binaries", "zjit", "binary-path")'`; \
+	    exec lldb $$exe_path -- --test-threads=1 $(ZJIT_TESTS)
+
+# A library for booting miniruby in tests.
+# Why not use libruby-static.a for this?
+#  - Initialization of the full ruby involves dynamic linking for e.g. transcoding implementations
+#    our tests don't need these functionalities so good to avoid their complexity.
+#  - By being mini, it's faster to build
+#  - Less likely to break since later stages of the build process also rely on miniruby.
+libminiruby.a: miniruby$(EXEEXT)
+	$(ECHO) linking static-library $@
+	$(Q) $(AR) $(ARFLAGS) $@ $(MINIOBJS) $(COMMONOBJS)
+
+libminiruby: libminiruby.a
+endif